summaryrefslogtreecommitdiff
path: root/spec/ruby/core/thread/shared/start.rb
diff options
context:
space:
mode:
Diffstat (limited to 'spec/ruby/core/thread/shared/start.rb')
-rw-r--r--spec/ruby/core/thread/shared/start.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/spec/ruby/core/thread/shared/start.rb b/spec/ruby/core/thread/shared/start.rb
index 2ba926bf00..c5d62ab098 100644
--- a/spec/ruby/core/thread/shared/start.rb
+++ b/spec/ruby/core/thread/shared/start.rb
@@ -6,22 +6,22 @@ describe :thread_start, shared: true do
it "raises an ArgumentError if not passed a block" do
-> {
Thread.send(@method)
- }.should raise_error(ArgumentError)
+ }.should.raise(ArgumentError)
end
it "spawns a new Thread running the block" do
run = false
t = Thread.send(@method) { run = true }
- t.should be_kind_of(Thread)
+ t.should.is_a?(Thread)
t.join
- run.should be_true
+ run.should == true
end
it "respects Thread subclasses" do
c = Class.new(Thread)
t = c.send(@method) { }
- t.should be_kind_of(c)
+ t.should.is_a?(c)
t.join
end
'graph'>
-rw-r--r--README10
-rw-r--r--README.EXT469
-rw-r--r--README.EXT.ja539
-rw-r--r--README.ja27
-rw-r--r--ToDo14
-rw-r--r--array.c2805
-rw-r--r--bcc32/Makefile.sub205
-rw-r--r--bcc32/README.bcc3225
-rwxr-xr-xbcc32/configure.bat13
-rwxr-xr-xbcc32/mkexports.rb39
-rw-r--r--bcc32/setup.mak18
-rw-r--r--benchmark/bm_app_answer.rb15
-rw-r--r--benchmark/bm_app_erb.rb26
-rw-r--r--benchmark/bm_app_factorial.rb11
-rw-r--r--benchmark/bm_app_fib.rb10
-rw-r--r--benchmark/bm_app_mandelbrot.rb23
-rw-r--r--benchmark/bm_app_pentomino.rb259
-rw-r--r--benchmark/bm_app_raise.rb8
-rw-r--r--benchmark/bm_app_strconcat.rb5
-rw-r--r--benchmark/bm_app_tak.rb13
-rw-r--r--benchmark/bm_app_tarai.rb10
-rw-r--r--benchmark/bm_app_uri.rb8
-rw-r--r--benchmark/bm_io_file_create.rb13
-rw-r--r--benchmark/bm_io_file_read.rb15
-rw-r--r--benchmark/bm_io_file_write.rb14
-rw-r--r--benchmark/bm_loop_for.rb3
-rw-r--r--benchmark/bm_loop_generator.rb14
-rw-r--r--benchmark/bm_loop_times.rb1
-rw-r--r--benchmark/bm_loop_whileloop.rb4
-rw-r--r--benchmark/bm_loop_whileloop2.rb4
-rw-r--r--benchmark/bm_so_ackermann.rb19
-rw-r--r--benchmark/bm_so_array.rb23
-rw-r--r--benchmark/bm_so_binary_trees.rb57
-rw-r--r--benchmark/bm_so_concatenate.rb18
-rw-r--r--benchmark/bm_so_count_words.rb19
-rw-r--r--benchmark/bm_so_exception.rb61
-rw-r--r--benchmark/bm_so_fannkuch.rb45
-rw-r--r--benchmark/bm_so_fasta.rb81
-rw-r--r--benchmark/bm_so_k_nucleotide.rb48
-rw-r--r--benchmark/bm_so_lists.rb47
-rw-r--r--benchmark/bm_so_mandelbrot.rb57
-rw-r--r--benchmark/bm_so_matrix.rb48
-rw-r--r--benchmark/bm_so_meteor_contest.rb564
-rw-r--r--benchmark/bm_so_nbody.rb148
-rw-r--r--benchmark/bm_so_nested_loop.rb24
-rw-r--r--benchmark/bm_so_nsieve.rb35
-rw-r--r--benchmark/bm_so_nsieve_bits.rb42
-rw-r--r--benchmark/bm_so_object.rb56
-rw-r--r--benchmark/bm_so_partial_sums.rb31
-rw-r--r--benchmark/bm_so_pidigits.rb92
-rw-r--r--benchmark/bm_so_random.rb20
-rw-r--r--benchmark/bm_so_reverse_complement.rb30
-rw-r--r--benchmark/bm_so_sieve.rb24
-rw-r--r--benchmark/bm_so_spectralnorm.rb50
-rw-r--r--benchmark/bm_vm1_block.rb10
-rw-r--r--benchmark/bm_vm1_const.rb8
-rw-r--r--benchmark/bm_vm1_ensure.rb11
-rw-r--r--benchmark/bm_vm1_ivar.rb8
-rw-r--r--benchmark/bm_vm1_ivar_set.rb6
-rw-r--r--benchmark/bm_vm1_length.rb9
-rw-r--r--benchmark/bm_vm1_neq.rb8
-rw-r--r--benchmark/bm_vm1_not.rb7
-rw-r--r--benchmark/bm_vm1_rescue.rb7
-rw-r--r--benchmark/bm_vm1_simplereturn.rb9
-rw-r--r--benchmark/bm_vm1_swap.rb8
-rw-r--r--benchmark/bm_vm2_array.rb5
-rw-r--r--benchmark/bm_vm2_case.rb14
-rw-r--r--benchmark/bm_vm2_eval.rb6
-rw-r--r--benchmark/bm_vm2_method.rb9
-rw-r--r--benchmark/bm_vm2_mutex.rb9
-rw-r--r--benchmark/bm_vm2_poly_method.rb20
-rw-r--r--benchmark/bm_vm2_poly_method_ov.rb20
-rw-r--r--benchmark/bm_vm2_proc.rb14
-rw-r--r--benchmark/bm_vm2_regexp.rb6
-rw-r--r--benchmark/bm_vm2_send.rb12
-rw-r--r--benchmark/bm_vm2_super.rb20
-rw-r--r--benchmark/bm_vm2_unif1.rb8
-rw-r--r--benchmark/bm_vm2_zsuper.rb20
-rwxr-xr-xbenchmark/bm_vm3_gc.rb7
-rw-r--r--benchmark/bm_vm3_thread_create_join.rb6
-rw-r--r--benchmark/bm_vm3_thread_mutex.rb18
-rw-r--r--benchmark/bmx_temp.rb9
-rw-r--r--benchmark/driver.rb251
-rw-r--r--benchmark/make_fasta_output.rb19
-rw-r--r--benchmark/other-lang/ack.pl11
-rw-r--r--benchmark/other-lang/ack.py16
-rw-r--r--benchmark/other-lang/ack.rb12
-rw-r--r--benchmark/other-lang/ack.scm7
-rw-r--r--benchmark/other-lang/eval.rb66
-rw-r--r--benchmark/other-lang/fact.pl13
-rw-r--r--benchmark/other-lang/fact.py18
-rw-r--r--benchmark/other-lang/fact.rb13
-rw-r--r--benchmark/other-lang/fact.scm8
-rw-r--r--benchmark/other-lang/fib.pl11
-rw-r--r--benchmark/other-lang/fib.py7
-rw-r--r--benchmark/other-lang/fib.rb9
-rw-r--r--benchmark/other-lang/fib.scm7
-rw-r--r--benchmark/other-lang/loop.pl3
-rw-r--r--benchmark/other-lang/loop.py2
-rw-r--r--benchmark/other-lang/loop.rb4
-rw-r--r--benchmark/other-lang/loop.scm1
-rw-r--r--benchmark/other-lang/loop2.rb1
-rw-r--r--benchmark/other-lang/tak.pl11
-rw-r--r--benchmark/other-lang/tak.py8
-rw-r--r--benchmark/other-lang/tak.rb13
-rw-r--r--benchmark/other-lang/tak.scm10
-rw-r--r--benchmark/prepare_so_count_words.rb15
-rw-r--r--benchmark/prepare_so_k_nucleotide.rb2
-rw-r--r--benchmark/prepare_so_reverse_complement.rb2
-rw-r--r--benchmark/report.rb81
-rw-r--r--benchmark/run.rb127
-rw-r--r--benchmark/runc.rb29
-rw-r--r--benchmark/wc.input.base25
-rw-r--r--bignum.c2369
-rwxr-xr-xbin/erb64
-rwxr-xr-xbin/gem25
-rw-r--r--[-rwxr-xr-x]bin/irb5
-rwxr-xr-xbin/rake31
-rw-r--r--[-rwxr-xr-x]bin/rdoc57
-rwxr-xr-xbin/ri48
-rwxr-xr-xbin/testrb15
-rw-r--r--blockinlining.c464
-rw-r--r--bootstraptest/pending.rb39
-rwxr-xr-xbootstraptest/runner.rb379
-rw-r--r--bootstraptest/test_attr.rb36
-rw-r--r--bootstraptest/test_autoload.rb78
-rw-r--r--bootstraptest/test_block.rb567
-rw-r--r--bootstraptest/test_class.rb152
-rw-r--r--bootstraptest/test_eval.rb310
-rw-r--r--bootstraptest/test_exception.rb416
-rw-r--r--bootstraptest/test_finalizer.rb8
-rw-r--r--bootstraptest/test_flip.rb1
-rw-r--r--bootstraptest/test_flow.rb504
-rw-r--r--bootstraptest/test_fork.rb28
-rw-r--r--bootstraptest/test_io.rb103
-rw-r--r--bootstraptest/test_jump.rb261
-rw-r--r--bootstraptest/test_literal.rb202
-rw-r--r--bootstraptest/test_load.rb27
-rw-r--r--bootstraptest/test_marshal.rb5
-rw-r--r--bootstraptest/test_massign.rb183
-rw-r--r--bootstraptest/test_method.rb1163
-rw-r--r--bootstraptest/test_objectspace.rb34
-rw-r--r--bootstraptest/test_proc.rb431
-rw-r--r--bootstraptest/test_struct.rb5
-rw-r--r--bootstraptest/test_syntax.rb838
-rw-r--r--bootstraptest/test_thread.rb387
-rw-r--r--class.c1098
-rw-r--r--common.mk745
-rw-r--r--compar.c88
-rw-r--r--compile.c5435
-rw-r--r--complex.c2021
-rw-r--r--config.guess1459
-rw-r--r--config.sub1537
-rw-r--r--configure.in2107
-rw-r--r--cont.c1050
-rw-r--r--cygwin/GNUmakefile.in27
-rw-r--r--debug.c164
-rw-r--r--debug.h36
-rw-r--r--defines.h273
-rw-r--r--defs/keywords53
-rw-r--r--defs/known_errors.def122
-rw-r--r--defs/lex.c.src53
-rw-r--r--defs/opt_insn_unif.def29
-rw-r--r--defs/opt_operand.def59
-rw-r--r--dir.c900
-rw-r--r--distruby.rb59
-rw-r--r--djgpp/GNUmakefile.in2
-rw-r--r--djgpp/README.djgpp21
-rw-r--r--djgpp/config.hin114
-rw-r--r--djgpp/config.sed128
-rwxr-xr-xdjgpp/configure.bat20
-rw-r--r--djgpp/mkver.sed1
-rw-r--r--dln.c493
-rw-r--r--dln.h11
-rw-r--r--dmyencoding.c2
-rw-r--r--dmyext.c2
-rw-r--r--doc/ChangeLog-1.8.05
-rw-r--r--doc/ChangeLog-YARV6917
-rw-r--r--doc/NEWS-1.8.0837
-rw-r--r--doc/NEWS-1.8.7648
-rw-r--r--doc/NEWS-1.9.1420
-rw-r--r--doc/forwardable.rd1
-rw-r--r--doc/forwardable.rd.ja1
-rw-r--r--doc/images/boottime-classes.pngbin28677 -> 0 bytes-rw-r--r--doc/irb/irb-tools.rd.ja1
-rw-r--r--doc/irb/irb.rd1
-rw-r--r--doc/irb/irb.rd.ja1
-rw-r--r--doc/shell.rd1
-rw-r--r--doc/shell.rd.ja1
-rw-r--r--enc/Makefile.in63
-rw-r--r--enc/ascii.c93
-rw-r--r--enc/big5.c302
-rw-r--r--enc/cp949.c219
-rw-r--r--enc/depend143
-rw-r--r--enc/emacs_mule.c340
-rw-r--r--enc/encdb.c27
-rw-r--r--enc/euc_jp.c388
-rw-r--r--enc/euc_kr.c192
-rw-r--r--enc/euc_tw.c234
-rw-r--r--enc/gb18030.c596
-rw-r--r--enc/gb2312.c13
-rw-r--r--enc/gbk.c222
-rw-r--r--enc/iso_2022_jp.h24
-rw-r--r--enc/iso_8859_1.c285
-rw-r--r--enc/iso_8859_10.c244
-rw-r--r--enc/iso_8859_11.c111
-rw-r--r--enc/iso_8859_13.c243
-rw-r--r--enc/iso_8859_14.c246
-rw-r--r--enc/iso_8859_15.c240
-rw-r--r--enc/iso_8859_16.c242
-rw-r--r--enc/iso_8859_2.c250
-rw-r--r--enc/iso_8859_3.c240
-rw-r--r--enc/iso_8859_4.c242
-rw-r--r--enc/iso_8859_5.c230
-rw-r--r--enc/iso_8859_6.c107
-rw-r--r--enc/iso_8859_7.c237
-rw-r--r--enc/iso_8859_8.c107
-rw-r--r--enc/iso_8859_9.c243
-rw-r--r--enc/koi8_r.c219
-rw-r--r--enc/koi8_u.c221
-rw-r--r--enc/make_encmake.rb50
-rw-r--r--enc/prelude.rb6
-rw-r--r--enc/shift_jis.c399
-rw-r--r--enc/trans/CP/CP932UDA%UCS.src1912
-rw-r--r--enc/trans/CP/CP932VDC@IBM%UCS.src420
-rw-r--r--enc/trans/CP/CP932VDC@NEC_IBM%UCS.src406
-rw-r--r--enc/trans/CP/UCS%CP932UDA.src1912
-rw-r--r--enc/trans/CP/UCS%CP932VDC@IBM.src420
-rw-r--r--enc/trans/CP/UCS%CP932VDC@NEC_IBM.src406
-rw-r--r--enc/trans/GB/GB12345%UCS.src7618
-rw-r--r--enc/trans/GB/GB2312%UCS.src7535
-rw-r--r--enc/trans/GB/UCS%GB12345.src7620
-rw-r--r--enc/trans/GB/UCS%GB2312.src7531
-rw-r--r--enc/trans/JIS/JISX0201-KANA%UCS.src127
-rw-r--r--enc/trans/JIS/JISX0208@1990%UCS.src6972
-rw-r--r--enc/trans/JIS/JISX0208@MS%UCS.src6893
-rw-r--r--enc/trans/JIS/JISX0208UDC%UCS.src954
-rw-r--r--enc/trans/JIS/JISX0208VDC@NEC%UCS.src97
-rw-r--r--enc/trans/JIS/JISX0212%UCS.src6167
-rw-r--r--enc/trans/JIS/JISX0212@MS%UCS.src6081
-rw-r--r--enc/trans/JIS/JISX0212UDC%UCS.src954
-rw-r--r--enc/trans/JIS/JISX0212VDC@IBM%UCS.src120
-rw-r--r--enc/trans/JIS/UCS%JISX0201-KANA.src127
-rw-r--r--enc/trans/JIS/UCS%JISX0208@1990.src6974
-rw-r--r--enc/trans/JIS/UCS%JISX0208@MS.src6894
-rw-r--r--enc/trans/JIS/UCS%JISX0208UDC.src955
-rw-r--r--enc/trans/JIS/UCS%JISX0208VDC@NEC.src98
-rw-r--r--enc/trans/JIS/UCS%JISX0212.src6170
-rw-r--r--enc/trans/JIS/UCS%JISX0212@MS.src6082
-rw-r--r--enc/trans/JIS/UCS%JISX0212UDC.src955
-rw-r--r--enc/trans/JIS/UCS%JISX0212VDC@IBM.src121
-rw-r--r--enc/trans/big5-hkscs-tbl.rb18385
-rw-r--r--enc/trans/big5-tbl.rb13705
-rw-r--r--enc/trans/big5.trans20
-rw-r--r--enc/trans/chinese.trans30
-rw-r--r--enc/trans/cp850-tbl.rb130
-rw-r--r--enc/trans/cp852-tbl.rb130
-rw-r--r--enc/trans/cp855-tbl.rb130
-rw-r--r--enc/trans/cp949-tbl.rb8831
-rw-r--r--enc/trans/escape.trans94
-rw-r--r--enc/trans/euckr-tbl.rb8228
-rw-r--r--enc/trans/gb18030-tbl.rb63330
-rw-r--r--enc/trans/gb18030.trans84
-rw-r--r--enc/trans/gbk-tbl.rb21793
-rw-r--r--enc/trans/gbk.trans16
-rw-r--r--enc/trans/ibm437-tbl.rb130
-rw-r--r--enc/trans/ibm775-tbl.rb130
-rw-r--r--enc/trans/ibm852-tbl.rb130
-rw-r--r--enc/trans/ibm855-tbl.rb130
-rw-r--r--enc/trans/ibm857-tbl.rb127
-rw-r--r--enc/trans/ibm860-tbl.rb130
-rw-r--r--enc/trans/ibm861-tbl.rb130
-rw-r--r--enc/trans/ibm862-tbl.rb130
-rw-r--r--enc/trans/ibm863-tbl.rb130
-rw-r--r--enc/trans/ibm865-tbl.rb130
-rw-r--r--enc/trans/ibm866-tbl.rb130
-rw-r--r--enc/trans/ibm869-tbl.rb121
-rw-r--r--enc/trans/iso-8859-1-tbl.rb98
-rw-r--r--enc/trans/iso-8859-10-tbl.rb98
-rw-r--r--enc/trans/iso-8859-11-tbl.rb90
-rw-r--r--enc/trans/iso-8859-13-tbl.rb98
-rw-r--r--enc/trans/iso-8859-14-tbl.rb98
-rw-r--r--enc/trans/iso-8859-15-tbl.rb98
-rw-r--r--enc/trans/iso-8859-2-tbl.rb98
-rw-r--r--enc/trans/iso-8859-3-tbl.rb91
-rw-r--r--enc/trans/iso-8859-4-tbl.rb98
-rw-r--r--enc/trans/iso-8859-5-tbl.rb98
-rw-r--r--enc/trans/iso-8859-6-tbl.rb53
-rw-r--r--enc/trans/iso-8859-7-tbl.rb95
-rw-r--r--enc/trans/iso-8859-8-tbl.rb62
-rw-r--r--enc/trans/iso-8859-9-tbl.rb98
-rw-r--r--enc/trans/iso2022.trans438
-rw-r--r--enc/trans/japanese.trans98
-rw-r--r--enc/trans/japanese_euc.trans46
-rw-r--r--enc/trans/japanese_sjis.trans34
-rw-r--r--enc/trans/koi8-r-tbl.rb130
-rw-r--r--enc/trans/koi8-u-tbl.rb130
-rw-r--r--enc/trans/korean.trans19
-rw-r--r--enc/trans/maccroatian-tbl.rb129
-rw-r--r--enc/trans/maccyrillic-tbl.rb130
-rw-r--r--enc/trans/macgreek-tbl.rb129
-rw-r--r--enc/trans/maciceland-tbl.rb129
-rw-r--r--enc/trans/macroman-tbl.rb129
-rw-r--r--enc/trans/macromania-tbl.rb129
-rw-r--r--enc/trans/macturkish-tbl.rb128
-rw-r--r--enc/trans/macukraine-tbl.rb130
-rw-r--r--enc/trans/newline.trans131
-rw-r--r--enc/trans/single_byte.trans91
-rw-r--r--enc/trans/tis-620-tbl.rb89
-rw-r--r--enc/trans/transdb.c18
-rw-r--r--enc/trans/utf8_mac-tbl.rb945
-rw-r--r--enc/trans/utf8_mac.trans242
-rw-r--r--enc/trans/utf_16_32.trans369
-rw-r--r--enc/trans/windows-1250-tbl.rb125
-rw-r--r--enc/trans/windows-1251-tbl.rb129
-rw-r--r--enc/trans/windows-1252-tbl.rb125
-rw-r--r--enc/trans/windows-1253-tbl.rb113
-rw-r--r--enc/trans/windows-1254-tbl.rb123
-rw-r--r--enc/trans/windows-1255-tbl.rb141
-rw-r--r--enc/trans/windows-1256-tbl.rb130
-rw-r--r--enc/trans/windows-1257-tbl.rb118
-rw-r--r--enc/trans/windows-874-tbl.rb99
-rw-r--r--enc/unicode.c2610
-rw-r--r--enc/unicode/Scripts.txt1747
-rw-r--r--enc/unicode/UnicodeData.txt19336
-rw-r--r--enc/unicode/name2ctype.h9967
-rw-r--r--enc/unicode/name2ctype.h.blt9967
-rw-r--r--enc/unicode/name2ctype.kwd9473
-rw-r--r--enc/unicode/name2ctype.src9473
-rw-r--r--enc/us_ascii.c31
-rw-r--r--enc/utf_16be.c258
-rw-r--r--enc/utf_16le.c249
-rw-r--r--enc/utf_32be.c195
-rw-r--r--enc/utf_32le.c194
-rw-r--r--enc/utf_7.h5
-rw-r--r--enc/utf_8.c455
-rw-r--r--enc/windows_1251.c208
-rw-r--r--encoding.c1502
-rw-r--r--enum.c836
-rw-r--r--enumerator.c993
-rw-r--r--env.h60
-rw-r--r--error.c1051
-rw-r--r--eval.c13387
-rw-r--r--eval_error.c274
-rw-r--r--eval_intern.h232
-rw-r--r--eval_jump.c152
-rw-r--r--ext/.document65
-rw-r--r--ext/Setup6
-rw-r--r--ext/Setup.atheos5
-rw-r--r--ext/Setup.dj34
-rw-r--r--ext/Setup.emx5
-rw-r--r--ext/Setup.nt5
-rw-r--r--ext/Setup.x6834
-rw-r--r--ext/Win32API/.cvsignore3
-rw-r--r--ext/Win32API/Win32API.c215
-rw-r--r--ext/Win32API/depend1
-rw-r--r--ext/Win32API/extconf.rb6
-rw-r--r--ext/Win32API/getch.rb5
-rw-r--r--ext/Win32API/lib/win32/registry.rb831
-rw-r--r--ext/Win32API/lib/win32/resolv.rb366
-rw-r--r--ext/Win32API/point.rb18
-rw-r--r--ext/bigdecimal/.cvsignore1
-rw-r--r--ext/bigdecimal/bigdecimal.c341
-rw-r--r--ext/bigdecimal/bigdecimal.h8
-rw-r--r--ext/bigdecimal/lib/bigdecimal/jacobian.rb2
-rw-r--r--ext/bigdecimal/lib/bigdecimal/ludcmp.rb2
-rw-r--r--ext/bigdecimal/lib/bigdecimal/math.rb8
-rw-r--r--ext/bigdecimal/lib/bigdecimal/newton.rb4
-rw-r--r--ext/bigdecimal/lib/bigdecimal/util.rb12
-rw-r--r--ext/continuation/continuation.c8
-rw-r--r--ext/continuation/extconf.rb3
-rw-r--r--ext/coverage/coverage.c101
-rw-r--r--ext/coverage/extconf.rb2
-rw-r--r--ext/curses/.cvsignore1
-rw-r--r--ext/curses/curses.c855
-rw-r--r--ext/curses/extconf.rb13
-rw-r--r--ext/curses/view.rb10
-rw-r--r--ext/dbm/.cvsignore1
-rw-r--r--ext/dbm/dbm.c282
-rw-r--r--ext/dbm/extconf.rb2
-rw-r--r--ext/digest/.cvsignore1
-rw-r--r--ext/digest/bubblebabble/.cvsignore1
-rw-r--r--ext/digest/defs.h14
-rw-r--r--ext/digest/digest.c6
-rw-r--r--ext/digest/extconf.rb2
-rw-r--r--ext/digest/lib/digest.rb2
-rw-r--r--ext/digest/lib/digest/hmac.rb274
-rw-r--r--ext/digest/lib/md5.rb23
-rw-r--r--ext/digest/lib/sha1.rb23
-rw-r--r--ext/digest/md5/.cvsignore1
-rw-r--r--ext/digest/md5/extconf.rb4
-rw-r--r--ext/digest/md5/md5.c2
-rw-r--r--ext/digest/md5/md5init.c4
-rw-r--r--ext/digest/rmd160/.cvsignore1
-rw-r--r--ext/digest/rmd160/extconf.rb4
-rw-r--r--ext/digest/rmd160/rmd160init.c4
-rw-r--r--ext/digest/sha1/.cvsignore1
-rw-r--r--ext/digest/sha1/extconf.rb4
-rw-r--r--ext/digest/sha1/sha1init.c4
-rw-r--r--ext/digest/sha2/.cvsignore1
-rw-r--r--ext/digest/sha2/extconf.rb4
-rw-r--r--ext/digest/sha2/lib/sha2.rb1
-rw-r--r--ext/digest/sha2/sha2.c280
-rw-r--r--ext/digest/sha2/sha2.h197
-rw-r--r--ext/digest/sha2/sha2init.c4
-rw-r--r--ext/dl/.cvsignore2
-rw-r--r--ext/dl/callback/depend15
-rw-r--r--ext/dl/callback/extconf.rb14
-rw-r--r--ext/dl/callback/mkcallback.rb238
-rw-r--r--ext/dl/cfunc.c532
-rw-r--r--ext/dl/cptr.c491
-rw-r--r--ext/dl/depend47
-rw-r--r--ext/dl/dl.c796
-rw-r--r--ext/dl/dl.def59
-rw-r--r--ext/dl/dl.h397
-rw-r--r--ext/dl/doc/dl.txt266
-rw-r--r--ext/dl/extconf.rb198
-rw-r--r--ext/dl/h2rb500
-rw-r--r--ext/dl/handle.c357
-rw-r--r--ext/dl/install.rb49
-rw-r--r--ext/dl/lib/dl/callback.rb69
-rw-r--r--ext/dl/lib/dl/cparser.rb109
-rw-r--r--ext/dl/lib/dl/func.rb151
-rw-r--r--ext/dl/lib/dl/import.rb422
-rw-r--r--ext/dl/lib/dl/pack.rb128
-rw-r--r--ext/dl/lib/dl/stack.rb116
-rw-r--r--ext/dl/lib/dl/struct.rb346
-rw-r--r--ext/dl/lib/dl/types.rb273
-rw-r--r--ext/dl/lib/dl/value.rb112
-rw-r--r--ext/dl/lib/dl/win32.rb25
-rw-r--r--ext/dl/mkcall.rb62
-rw-r--r--ext/dl/mkcallback.rb56
-rw-r--r--ext/dl/mkcbtable.rb18
-rw-r--r--ext/dl/ptr.c1058
-rw-r--r--ext/dl/sample/c++sample.C35
-rw-r--r--ext/dl/sample/c++sample.rb60
-rw-r--r--ext/dl/sample/drives.rb70
-rw-r--r--ext/dl/sample/getch.rb5
-rw-r--r--ext/dl/sample/libc.rb69
-rw-r--r--ext/dl/sample/msgbox.rb19
-rw-r--r--ext/dl/sample/msgbox2.rb18
-rw-r--r--ext/dl/sample/stream.rb87
-rw-r--r--ext/dl/sym.c992
-rw-r--r--ext/dl/test/libtest.def28
-rw-r--r--ext/dl/test/test.c247
-rw-r--r--ext/dl/test/test.rb306
-rw-r--r--ext/dl/type.rb115
-rw-r--r--ext/dl/win32/extconf.rb3
-rw-r--r--ext/dl/win32/lib/Win32API.rb30
-rw-r--r--ext/dl/win32/lib/win32/registry.rb839
-rw-r--r--ext/dl/win32/lib/win32/resolv.rb379
-rw-r--r--ext/dl/win32/lib/win32/sspi.rb330
-rw-r--r--ext/etc/etc.c210
-rw-r--r--ext/etc/extconf.rb15
-rw-r--r--ext/extmk.rb160
-rw-r--r--ext/fcntl/.cvsignore1
-rw-r--r--ext/fiber/extconf.rb3
-rw-r--r--ext/fiber/fiber.c8
-rw-r--r--ext/gdbm/.cvsignore1
-rw-r--r--ext/gdbm/gdbm.c425
-rw-r--r--ext/iconv/.cvsignore1
-rw-r--r--ext/iconv/charset_alias.rb4
-rw-r--r--ext/iconv/depend2
-rw-r--r--ext/iconv/extconf.rb2
-rw-r--r--ext/iconv/iconv.c774
-rw-r--r--ext/iconv/mkwrapper.rb53
-rw-r--r--ext/io/nonblock/extconf.rb8
-rw-r--r--ext/io/nonblock/nonblock.c108
-rw-r--r--ext/io/wait/.cvsignore1
-rw-r--r--ext/io/wait/extconf.rb5
-rw-r--r--ext/io/wait/lib/nonblock.rb23
-rw-r--r--ext/io/wait/wait.c134
-rw-r--r--ext/json/ext/generator/extconf.rb9
-rw-r--r--ext/json/ext/generator/generator.c919
-rw-r--r--ext/json/ext/generator/unicode.c180
-rw-r--r--ext/json/ext/generator/unicode.h53
-rw-r--r--ext/json/ext/parser/extconf.rb9
-rw-r--r--ext/json/ext/parser/parser.c1829
-rw-r--r--ext/json/ext/parser/parser.rl686
-rw-r--r--ext/json/ext/parser/unicode.c154
-rw-r--r--ext/json/ext/parser/unicode.h58
-rw-r--r--ext/json/extconf.rb3
-rwxr-xr-xext/json/lib/json.rb10
-rw-r--r--ext/json/lib/json/add/core.rb135
-rw-r--r--ext/json/lib/json/add/rails.rb58
-rwxr-xr-xext/json/lib/json/common.rb355
-rwxr-xr-xext/json/lib/json/editor.rb1371
-rw-r--r--ext/json/lib/json/ext.rb15
-rw-r--r--ext/json/lib/json/version.rb8
-rw-r--r--ext/mathn/complex/complex.c7
-rw-r--r--ext/mathn/complex/extconf.rb3
-rw-r--r--ext/mathn/rational/extconf.rb3
-rw-r--r--ext/mathn/rational/rational.c7
-rw-r--r--ext/nkf/.cvsignore1
-rw-r--r--ext/nkf/lib/kconv.rb275
-rw-r--r--ext/nkf/nkf-utf8/config.h77
-rw-r--r--ext/nkf/nkf-utf8/nkf.c9473
-rw-r--r--ext/nkf/nkf-utf8/nkf.h192
-rw-r--r--ext/nkf/nkf-utf8/utf8tbl.c1472
-rw-r--r--ext/nkf/nkf-utf8/utf8tbl.h27
-rw-r--r--ext/nkf/nkf.c394
-rw-r--r--ext/objspace/extconf.rb2
-rw-r--r--ext/objspace/objspace.c552
-rw-r--r--ext/openssl/extconf.rb5
-rw-r--r--ext/openssl/lib/net/ftptls.rb53
-rw-r--r--ext/openssl/lib/net/telnets.rb251
-rw-r--r--ext/openssl/lib/openssl.rb5
-rw-r--r--ext/openssl/lib/openssl/buffering.rb110
-rw-r--r--ext/openssl/lib/openssl/digest.rb2
-rw-r--r--ext/openssl/lib/openssl/pkcs7.rb25
-rw-r--r--ext/openssl/lib/openssl/ssl-internal.rb177
-rw-r--r--ext/openssl/lib/openssl/ssl.rb180
-rw-r--r--ext/openssl/lib/openssl/x509-internal.rb153
-rw-r--r--ext/openssl/lib/openssl/x509.rb155
-rw-r--r--ext/openssl/openssl_missing.h31
-rw-r--r--ext/openssl/ossl.c40
-rw-r--r--ext/openssl/ossl.h15
-rw-r--r--ext/openssl/ossl_asn1.c82
-rw-r--r--ext/openssl/ossl_bn.c74
-rw-r--r--ext/openssl/ossl_cipher.c61
-rw-r--r--ext/openssl/ossl_config.c27
-rw-r--r--ext/openssl/ossl_digest.c6
-rw-r--r--ext/openssl/ossl_engine.c16
-rw-r--r--ext/openssl/ossl_hmac.c32
-rw-r--r--ext/openssl/ossl_ns_spki.c8
-rw-r--r--ext/openssl/ossl_ocsp.c34
-rw-r--r--ext/openssl/ossl_pkcs12.c8
-rw-r--r--ext/openssl/ossl_pkcs5.c16
-rw-r--r--ext/openssl/ossl_pkcs7.c12
-rw-r--r--ext/openssl/ossl_pkey.c8
-rw-r--r--ext/openssl/ossl_pkey_dh.c14
-rw-r--r--ext/openssl/ossl_pkey_dsa.c29
-rw-r--r--ext/openssl/ossl_pkey_ec.c31
-rw-r--r--ext/openssl/ossl_pkey_rsa.c44
-rw-r--r--ext/openssl/ossl_rand.c4
-rw-r--r--ext/openssl/ossl_ssl.c278
-rw-r--r--ext/openssl/ossl_ssl_session.c10
-rw-r--r--ext/openssl/ossl_version.h2
-rw-r--r--ext/openssl/ossl_x509attr.c17
-rw-r--r--ext/openssl/ossl_x509cert.c14
-rw-r--r--ext/openssl/ossl_x509crl.c10
-rw-r--r--ext/openssl/ossl_x509ext.c25
-rw-r--r--ext/openssl/ossl_x509name.c15
-rw-r--r--ext/openssl/ossl_x509req.c12
-rw-r--r--ext/openssl/ossl_x509store.c5
-rw-r--r--ext/pty/.cvsignore1
-rw-r--r--ext/pty/depend2
-rw-r--r--ext/pty/expect_sample.rb8
-rw-r--r--ext/pty/extconf.rb6
-rw-r--r--ext/pty/pty.c566
-rw-r--r--ext/pty/script.rb2
-rw-r--r--ext/purelib.rb9
-rw-r--r--ext/racc/cparse/.cvsignore1
-rw-r--r--ext/racc/cparse/README10
-rw-r--r--ext/racc/cparse/cparse.c70
-rw-r--r--ext/racc/cparse/extconf.rb1
-rw-r--r--ext/readline/.cvsignore1
-rw-r--r--ext/readline/README68
-rw-r--r--ext/readline/README.ja444
-rw-r--r--ext/readline/extconf.rb35
-rw-r--r--ext/readline/readline.c1131
-rw-r--r--ext/ripper/.cvsignore8
-rw-r--r--ext/ripper/README30
-rw-r--r--ext/ripper/depend41
-rw-r--r--ext/ripper/eventids2.c279
-rw-r--r--ext/ripper/extconf.rb22
-rw-r--r--ext/ripper/lib/ripper.rb4
-rw-r--r--ext/ripper/lib/ripper/core.rb70
-rw-r--r--ext/ripper/lib/ripper/filter.rb70
-rw-r--r--ext/ripper/lib/ripper/lexer.rb179
-rw-r--r--ext/ripper/lib/ripper/sexp.rb99
-rwxr-xr-xext/ripper/tools/generate-param-macros.rb14
-rwxr-xr-xext/ripper/tools/generate.rb152
-rwxr-xr-xext/ripper/tools/preproc.rb91
-rwxr-xr-xext/ripper/tools/strip.rb12
-rw-r--r--ext/sdbm/.cvsignore1
-rw-r--r--ext/sdbm/_sdbm.c106
-rw-r--r--ext/sdbm/init.c357
-rw-r--r--ext/sdbm/sdbm.h2
-rw-r--r--ext/socket/.cvsignore2
-rw-r--r--ext/socket/addrinfo.h8
-rw-r--r--ext/socket/ancdata.c1808
-rw-r--r--ext/socket/basicsocket.c723
-rw-r--r--ext/socket/constants.c146
-rw-r--r--ext/socket/depend28
-rw-r--r--ext/socket/extconf.rb108
-rw-r--r--ext/socket/getaddrinfo.c59
-rw-r--r--ext/socket/getnameinfo.c26
-rw-r--r--ext/socket/init.c558
-rw-r--r--ext/socket/ipsocket.c252
-rw-r--r--ext/socket/lib/socket.rb729
-rw-r--r--ext/socket/mkconstants.rb683
-rw-r--r--ext/socket/option.c688
-rw-r--r--ext/socket/raddrinfo.c2171
-rw-r--r--ext/socket/rubysocket.h278
-rw-r--r--ext/socket/socket.c4340
-rw-r--r--ext/socket/sockport.h18
-rw-r--r--ext/socket/sockssocket.c56
-rw-r--r--ext/socket/tcpserver.c142
-rw-r--r--ext/socket/tcpsocket.c67
-rw-r--r--ext/socket/udpsocket.c260
-rw-r--r--ext/socket/unixserver.c151
-rw-r--r--ext/socket/unixsocket.c505
-rw-r--r--ext/stringio/.cvsignore1
-rw-r--r--ext/stringio/README1
-rw-r--r--ext/stringio/depend5
-rw-r--r--ext/stringio/stringio.c682
-rw-r--r--ext/strscan/.cvsignore1
-rw-r--r--ext/strscan/depend3
-rw-r--r--ext/strscan/strscan.c165
-rw-r--r--ext/syck/.cvsignore1
-rw-r--r--ext/syck/bytecode.c7
-rw-r--r--ext/syck/emitter.c81
-rw-r--r--ext/syck/handler.c17
-rw-r--r--ext/syck/implicit.c18
-rw-r--r--ext/syck/node.c15
-rw-r--r--ext/syck/rubyext.c368
-rw-r--r--ext/syck/syck.c44
-rw-r--r--ext/syck/syck.h70
-rw-r--r--ext/syck/token.c7
-rw-r--r--ext/syck/yaml2byte.c18
-rw-r--r--ext/syslog/.cvsignore1
-rw-r--r--ext/syslog/syslog.c19
-rw-r--r--ext/syslog/test.rb164
-rw-r--r--ext/thread/extconf.rb9
-rw-r--r--ext/thread/lib/thread.rb5
-rw-r--r--ext/thread/thread.c1182
-rw-r--r--ext/tk/.cvsignore2
-rw-r--r--ext/tk/ChangeLog.tkextlib25
-rw-r--r--ext/tk/MANUAL_tcltklib.eng8
-rw-r--r--ext/tk/MANUAL_tcltklib.eucj9
-rw-r--r--ext/tk/README.ActiveTcl13
-rw-r--r--ext/tk/README.tcltklib44
-rw-r--r--ext/tk/config_list.in37
-rw-r--r--ext/tk/depend4
-rw-r--r--ext/tk/extconf.rb1371
-rw-r--r--ext/tk/lib/multi-tk.rb687
-rw-r--r--ext/tk/lib/remote-tk.rb34
-rw-r--r--ext/tk/lib/tcltk.rb20
-rw-r--r--ext/tk/lib/tk.rb681
-rw-r--r--ext/tk/lib/tk/autoload.rb492
-rw-r--r--ext/tk/lib/tk/bindtag.rb2
-rw-r--r--ext/tk/lib/tk/busy.rb118
-rw-r--r--ext/tk/lib/tk/button.rb5
-rw-r--r--ext/tk/lib/tk/canvas.rb77
-rw-r--r--ext/tk/lib/tk/canvastag.rb33
-rw-r--r--ext/tk/lib/tk/checkbutton.rb8
-rw-r--r--ext/tk/lib/tk/composite.rb48
-rw-r--r--ext/tk/lib/tk/console.rb6
-rw-r--r--ext/tk/lib/tk/dialog.rb30
-rw-r--r--ext/tk/lib/tk/encodedstr.rb6
-rw-r--r--ext/tk/lib/tk/entry.rb5
-rw-r--r--ext/tk/lib/tk/event.rb222
-rw-r--r--ext/tk/lib/tk/font.rb139
-rw-r--r--ext/tk/lib/tk/fontchooser.rb176
-rw-r--r--ext/tk/lib/tk/frame.rb5
-rw-r--r--ext/tk/lib/tk/grid.rb34
-rw-r--r--ext/tk/lib/tk/image.rb8
-rw-r--r--ext/tk/lib/tk/itemconfig.rb151
-rw-r--r--ext/tk/lib/tk/itemfont.rb36
-rw-r--r--ext/tk/lib/tk/kinput.rb6
-rw-r--r--ext/tk/lib/tk/label.rb5
-rw-r--r--ext/tk/lib/tk/labelframe.rb6
-rw-r--r--ext/tk/lib/tk/listbox.rb38
-rw-r--r--ext/tk/lib/tk/macpkg.rb4
-rw-r--r--ext/tk/lib/tk/menu.rb117
-rw-r--r--ext/tk/lib/tk/menubar.rb44
-rw-r--r--ext/tk/lib/tk/menuspec.rb235
-rw-r--r--ext/tk/lib/tk/message.rb6
-rw-r--r--ext/tk/lib/tk/mngfocus.rb4
-rw-r--r--ext/tk/lib/tk/msgcat.rb58
-rw-r--r--ext/tk/lib/tk/namespace.rb28
-rw-r--r--ext/tk/lib/tk/optiondb.rb48
-rw-r--r--ext/tk/lib/tk/optionobj.rb18
-rw-r--r--ext/tk/lib/tk/palette.rb4
-rw-r--r--ext/tk/lib/tk/panedwindow.rb44
-rw-r--r--ext/tk/lib/tk/place.rb12
-rw-r--r--ext/tk/lib/tk/radiobutton.rb8
-rw-r--r--ext/tk/lib/tk/root.rb10
-rw-r--r--ext/tk/lib/tk/scale.rb13
-rw-r--r--ext/tk/lib/tk/scrollbar.rb22
-rw-r--r--ext/tk/lib/tk/selection.rb6
-rw-r--r--ext/tk/lib/tk/spinbox.rb45
-rw-r--r--ext/tk/lib/tk/text.rb168
-rw-r--r--ext/tk/lib/tk/textimage.rb10
-rw-r--r--ext/tk/lib/tk/textmark.rb12
-rw-r--r--ext/tk/lib/tk/texttag.rb27
-rw-r--r--ext/tk/lib/tk/textwindow.rb20
-rw-r--r--ext/tk/lib/tk/timer.rb42
-rw-r--r--ext/tk/lib/tk/toplevel.rb22
-rw-r--r--ext/tk/lib/tk/ttk_selector.rb94
-rw-r--r--ext/tk/lib/tk/validation.rb28
-rw-r--r--ext/tk/lib/tk/variable.rb140
-rw-r--r--ext/tk/lib/tk/virtevent.rb12
-rw-r--r--ext/tk/lib/tk/winfo.rb10
-rw-r--r--ext/tk/lib/tk/winpkg.rb11
-rw-r--r--ext/tk/lib/tk/wm.rb10
-rw-r--r--ext/tk/lib/tk/xim.rb4
-rw-r--r--ext/tk/lib/tkextlib/ICONS/icons.rb8
-rw-r--r--ext/tk/lib/tkextlib/ICONS/setup.rb4
-rw-r--r--ext/tk/lib/tkextlib/SUPPORT_STATUS24
-rw-r--r--ext/tk/lib/tkextlib/blt.rb6
-rw-r--r--ext/tk/lib/tkextlib/blt/barchart.rb6
-rw-r--r--ext/tk/lib/tkextlib/blt/bitmap.rb2
-rw-r--r--ext/tk/lib/tkextlib/blt/busy.rb1
-rw-r--r--ext/tk/lib/tkextlib/blt/component.rb173
-rw-r--r--ext/tk/lib/tkextlib/blt/container.rb2
-rw-r--r--ext/tk/lib/tkextlib/blt/dragdrop.rb23
-rw-r--r--ext/tk/lib/tkextlib/blt/graph.rb4
-rw-r--r--ext/tk/lib/tkextlib/blt/htext.rb3
-rw-r--r--ext/tk/lib/tkextlib/blt/setup.rb4
-rw-r--r--ext/tk/lib/tkextlib/blt/stripchart.rb6
-rw-r--r--ext/tk/lib/tkextlib/blt/table.rb15
-rw-r--r--ext/tk/lib/tkextlib/blt/tabnotebook.rb93
-rw-r--r--ext/tk/lib/tkextlib/blt/tabset.rb110
-rw-r--r--ext/tk/lib/tkextlib/blt/ted.rb5
-rw-r--r--ext/tk/lib/tkextlib/blt/tile.rb4
-rw-r--r--ext/tk/lib/tkextlib/blt/tree.rb56
-rw-r--r--ext/tk/lib/tkextlib/blt/treeview.rb61
-rw-r--r--ext/tk/lib/tkextlib/blt/unix_dnd.rb8
-rw-r--r--ext/tk/lib/tkextlib/blt/vector.rb12
-rw-r--r--ext/tk/lib/tkextlib/blt/watch.rb2
-rw-r--r--ext/tk/lib/tkextlib/blt/winop.rb12
-rw-r--r--ext/tk/lib/tkextlib/bwidget.rb2
-rw-r--r--ext/tk/lib/tkextlib/bwidget/arrowbutton.rb2
-rw-r--r--ext/tk/lib/tkextlib/bwidget/button.rb2
-rw-r--r--ext/tk/lib/tkextlib/bwidget/buttonbox.rb2
-rw-r--r--ext/tk/lib/tkextlib/bwidget/combobox.rb13
-rw-r--r--ext/tk/lib/tkextlib/bwidget/dialog.rb18
-rw-r--r--ext/tk/lib/tkextlib/bwidget/entry.rb2
-rw-r--r--ext/tk/lib/tkextlib/bwidget/label.rb2
-rw-r--r--ext/tk/lib/tkextlib/bwidget/labelentry.rb2
-rw-r--r--ext/tk/lib/tkextlib/bwidget/labelframe.rb2
-rw-r--r--ext/tk/lib/tkextlib/bwidget/listbox.rb27
-rw-r--r--ext/tk/lib/tkextlib/bwidget/mainframe.rb6
-rw-r--r--ext/tk/lib/tkextlib/bwidget/messagedlg.rb4
-rw-r--r--ext/tk/lib/tkextlib/bwidget/notebook.rb8
-rw-r--r--ext/tk/lib/tkextlib/bwidget/pagesmanager.rb2
-rw-r--r--ext/tk/lib/tkextlib/bwidget/panedwindow.rb7
-rw-r--r--ext/tk/lib/tkextlib/bwidget/panelframe.rb14
-rw-r--r--ext/tk/lib/tkextlib/bwidget/passwddlg.rb8
-rw-r--r--ext/tk/lib/tkextlib/bwidget/progressbar.rb2
-rw-r--r--ext/tk/lib/tkextlib/bwidget/progressdlg.rb2
-rw-r--r--ext/tk/lib/tkextlib/bwidget/scrollableframe.rb2
-rw-r--r--ext/tk/lib/tkextlib/bwidget/scrolledwindow.rb12
-rw-r--r--ext/tk/lib/tkextlib/bwidget/scrollview.rb2
-rw-r--r--ext/tk/lib/tkextlib/bwidget/selectcolor.rb6
-rw-r--r--ext/tk/lib/tkextlib/bwidget/selectfont.rb9
-rw-r--r--ext/tk/lib/tkextlib/bwidget/separator.rb2
-rw-r--r--ext/tk/lib/tkextlib/bwidget/setup.rb4
-rw-r--r--ext/tk/lib/tkextlib/bwidget/spinbox.rb2
-rw-r--r--ext/tk/lib/tkextlib/bwidget/statusbar.rb18
-rw-r--r--ext/tk/lib/tkextlib/bwidget/titleframe.rb2
-rw-r--r--ext/tk/lib/tkextlib/bwidget/tree.rb81
-rw-r--r--ext/tk/lib/tkextlib/itcl/incr_tcl.rb4
-rw-r--r--ext/tk/lib/tkextlib/itcl/setup.rb4
-rw-r--r--ext/tk/lib/tkextlib/itk/incr_tk.rb10
-rw-r--r--ext/tk/lib/tkextlib/itk/setup.rb4
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/buttonbox.rb5
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/calendar.rb4
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/canvasprintbox.rb2
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/canvasprintdialog.rb2
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/checkbox.rb5
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/combobox.rb2
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/dateentry.rb2
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/datefield.rb2
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/dialog.rb2
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/dialogshell.rb5
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/disjointlistbox.rb2
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/entryfield.rb18
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/extbutton.rb2
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/extfileselectionbox.rb4
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/extfileselectiondialog.rb2
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/feedback.rb2
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/fileselectionbox.rb4
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/fileselectiondialog.rb2
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/finddialog.rb4
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/hierarchy.rb22
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/hyperhelp.rb2
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/labeledframe.rb2
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/labeledwidget.rb2
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/mainwindow.rb2
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/menubar.rb5
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/messagebox.rb5
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/messagedialog.rb2
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/notebook.rb5
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/optionmenu.rb2
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/panedwindow.rb5
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/promptdialog.rb2
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/pushbutton.rb2
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/radiobox.rb5
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/scopedobject.rb2
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/scrolledcanvas.rb12
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/scrolledframe.rb2
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/scrolledhtml.rb2
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/scrolledlistbox.rb4
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/scrolledtext.rb64
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/scrolledwidget.rb2
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/selectionbox.rb2
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/selectiondialog.rb2
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/setup.rb4
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/shell.rb2
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/spindate.rb2
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/spinint.rb2
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/spinner.rb18
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/spintime.rb2
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/tabnotebook.rb5
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/tabset.rb17
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/timeentry.rb2
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/timefield.rb2
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/toolbar.rb4
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/watch.rb4
-rwxr-xr-xext/tk/lib/tkextlib/pkg_checker.rb4
-rw-r--r--ext/tk/lib/tkextlib/setup.rb8
-rw-r--r--ext/tk/lib/tkextlib/tcllib.rb29
-rw-r--r--ext/tk/lib/tkextlib/tcllib/autoscroll.rb24
-rw-r--r--ext/tk/lib/tkextlib/tcllib/calendar.rb55
-rw-r--r--ext/tk/lib/tkextlib/tcllib/canvas_sqmap.rb36
-rw-r--r--ext/tk/lib/tkextlib/tcllib/canvas_zoom.rb21
-rw-r--r--ext/tk/lib/tkextlib/tcllib/chatwidget.rb151
-rw-r--r--ext/tk/lib/tkextlib/tcllib/crosshair.rb117
-rw-r--r--ext/tk/lib/tkextlib/tcllib/ctext.rb12
-rw-r--r--ext/tk/lib/tkextlib/tcllib/cursor.rb14
-rw-r--r--ext/tk/lib/tkextlib/tcllib/dateentry.rb62
-rw-r--r--ext/tk/lib/tkextlib/tcllib/datefield.rb12
-rw-r--r--ext/tk/lib/tkextlib/tcllib/diagrams.rb224
-rw-r--r--ext/tk/lib/tkextlib/tcllib/dialog.rb2
-rw-r--r--ext/tk/lib/tkextlib/tcllib/getstring.rb4
-rw-r--r--ext/tk/lib/tkextlib/tcllib/ico.rb46
-rw-r--r--ext/tk/lib/tkextlib/tcllib/ip_entry.rb15
-rw-r--r--ext/tk/lib/tkextlib/tcllib/khim.rb68
-rw-r--r--ext/tk/lib/tkextlib/tcllib/menuentry.rb47
-rw-r--r--ext/tk/lib/tkextlib/tcllib/ntext.rb146
-rw-r--r--ext/tk/lib/tkextlib/tcllib/panelframe.rb10
-rw-r--r--ext/tk/lib/tkextlib/tcllib/plotchart.rb708
-rw-r--r--ext/tk/lib/tkextlib/tcllib/ruler.rb2
-rw-r--r--ext/tk/lib/tkextlib/tcllib/screenruler.rb2
-rw-r--r--ext/tk/lib/tkextlib/tcllib/scrolledwindow.rb57
-rw-r--r--ext/tk/lib/tkextlib/tcllib/scrollwin.rb2
-rw-r--r--ext/tk/lib/tkextlib/tcllib/setup.rb4
-rw-r--r--ext/tk/lib/tkextlib/tcllib/statusbar.rb79
-rw-r--r--ext/tk/lib/tkextlib/tcllib/superframe.rb2
-rw-r--r--ext/tk/lib/tkextlib/tcllib/swaplist.rb10
-rw-r--r--ext/tk/lib/tkextlib/tcllib/tablelist.rb7
-rw-r--r--ext/tk/lib/tkextlib/tcllib/tablelist_core.rb328
-rw-r--r--ext/tk/lib/tkextlib/tcllib/tablelist_tile.rb20
-rw-r--r--ext/tk/lib/tkextlib/tcllib/tkpiechart.rb22
-rw-r--r--ext/tk/lib/tkextlib/tcllib/toolbar.rb175
-rw-r--r--ext/tk/lib/tkextlib/tcllib/tooltip.rb13
-rw-r--r--ext/tk/lib/tkextlib/tcllib/widget.rb34
-rw-r--r--ext/tk/lib/tkextlib/tclx/setup.rb4
-rw-r--r--ext/tk/lib/tkextlib/tile.rb76
-rw-r--r--ext/tk/lib/tkextlib/tile/dialog.rb6
-rw-r--r--ext/tk/lib/tkextlib/tile/setup.rb4
-rw-r--r--ext/tk/lib/tkextlib/tile/sizegrip.rb11
-rw-r--r--ext/tk/lib/tkextlib/tile/style.rb46
-rw-r--r--ext/tk/lib/tkextlib/tile/tbutton.rb9
-rw-r--r--ext/tk/lib/tkextlib/tile/tcheckbutton.rb12
-rw-r--r--ext/tk/lib/tkextlib/tile/tcombobox.rb9
-rw-r--r--ext/tk/lib/tkextlib/tile/tentry.rb9
-rw-r--r--ext/tk/lib/tkextlib/tile/tframe.rb9
-rw-r--r--ext/tk/lib/tkextlib/tile/tlabel.rb9
-rw-r--r--ext/tk/lib/tkextlib/tile/tlabelframe.rb12
-rw-r--r--ext/tk/lib/tkextlib/tile/tmenubutton.rb12
-rw-r--r--ext/tk/lib/tkextlib/tile/tnotebook.rb22
-rw-r--r--ext/tk/lib/tkextlib/tile/tpaned.rb46
-rw-r--r--ext/tk/lib/tkextlib/tile/tprogressbar.rb9
-rw-r--r--ext/tk/lib/tkextlib/tile/tradiobutton.rb12
-rw-r--r--ext/tk/lib/tkextlib/tile/treeview.rb110
-rw-r--r--ext/tk/lib/tkextlib/tile/tscale.rb13
-rw-r--r--ext/tk/lib/tkextlib/tile/tscrollbar.rb21
-rw-r--r--ext/tk/lib/tkextlib/tile/tseparator.rb9
-rw-r--r--ext/tk/lib/tkextlib/tile/tspinbox.rb107
-rw-r--r--ext/tk/lib/tkextlib/tile/tsquare.rb2
-rw-r--r--ext/tk/lib/tkextlib/tkDND/setup.rb4
-rw-r--r--ext/tk/lib/tkextlib/tkDND/tkdnd.rb52
-rw-r--r--ext/tk/lib/tkextlib/tkHTML/htmlwidget.rb8
-rw-r--r--ext/tk/lib/tkextlib/tkHTML/setup.rb4
-rw-r--r--ext/tk/lib/tkextlib/tkimg/setup.rb4
-rw-r--r--ext/tk/lib/tkextlib/tktable/setup.rb4
-rw-r--r--ext/tk/lib/tkextlib/tktable/tktable.rb125
-rw-r--r--ext/tk/lib/tkextlib/tktrans/setup.rb4
-rw-r--r--ext/tk/lib/tkextlib/treectrl/setup.rb4
-rw-r--r--ext/tk/lib/tkextlib/treectrl/tktreectrl.rb241
-rw-r--r--ext/tk/lib/tkextlib/trofs/setup.rb4
-rw-r--r--ext/tk/lib/tkextlib/version.rb2
-rw-r--r--ext/tk/lib/tkextlib/vu/bargraph.rb10
-rw-r--r--ext/tk/lib/tkextlib/vu/charts.rb2
-rw-r--r--ext/tk/lib/tkextlib/vu/dial.rb2
-rw-r--r--ext/tk/lib/tkextlib/vu/pie.rb8
-rw-r--r--ext/tk/lib/tkextlib/vu/setup.rb4
-rw-r--r--ext/tk/lib/tkextlib/vu/spinbox.rb2
-rw-r--r--ext/tk/lib/tkextlib/winico/setup.rb4
-rw-r--r--ext/tk/lib/tkextlib/winico/winico.rb32
-rw-r--r--ext/tk/old-extconf.rb440
-rw-r--r--ext/tk/sample/24hr_clock.rb130
-rw-r--r--ext/tk/sample/binding_sample.rb8
-rw-r--r--ext/tk/sample/bindtag_sample.rb38
-rw-r--r--ext/tk/sample/binstr_usage.rb2
-rw-r--r--ext/tk/sample/cd_timer.rb16
-rw-r--r--ext/tk/sample/cmd_res_test.rb2
-rw-r--r--ext/tk/sample/demos-en/anilabel.rb14
-rw-r--r--ext/tk/sample/demos-en/aniwave.rb10
-rw-r--r--ext/tk/sample/demos-en/arrow.rb66
-rw-r--r--ext/tk/sample/demos-en/bind.rb34
-rw-r--r--ext/tk/sample/demos-en/bitmap.rb8
-rw-r--r--ext/tk/sample/demos-en/button.rb10
-rw-r--r--ext/tk/sample/demos-en/check.rb10
-rw-r--r--ext/tk/sample/demos-en/check2.rb34
-rw-r--r--ext/tk/sample/demos-en/clrpick.rb8
-rw-r--r--ext/tk/sample/demos-en/colors.rb2
-rw-r--r--ext/tk/sample/demos-en/combo.rb40
-rw-r--r--ext/tk/sample/demos-en/cscroll.rb26
-rw-r--r--ext/tk/sample/demos-en/ctext.rb44
-rw-r--r--ext/tk/sample/demos-en/entry1.rb6
-rw-r--r--ext/tk/sample/demos-en/entry2.rb4
-rw-r--r--ext/tk/sample/demos-en/entry3.rb28
-rw-r--r--ext/tk/sample/demos-en/filebox.rb32
-rw-r--r--ext/tk/sample/demos-en/floor.rb550
-rw-r--r--ext/tk/sample/demos-en/floor2.rb550
-rw-r--r--ext/tk/sample/demos-en/form.rb6
-rw-r--r--ext/tk/sample/demos-en/goldberg.rb402
-rw-r--r--ext/tk/sample/demos-en/icon.rb4
-rw-r--r--ext/tk/sample/demos-en/image1.rb2
-rw-r--r--ext/tk/sample/demos-en/image2.rb6
-rw-r--r--ext/tk/sample/demos-en/image3.rb16
-rw-r--r--ext/tk/sample/demos-en/items.rb86
-rw-r--r--ext/tk/sample/demos-en/knightstour.rb32
-rw-r--r--ext/tk/sample/demos-en/label.rb16
-rw-r--r--ext/tk/sample/demos-en/labelframe.rb14
-rw-r--r--ext/tk/sample/demos-en/mclist.rb56
-rw-r--r--ext/tk/sample/demos-en/menu.rb48
-rw-r--r--ext/tk/sample/demos-en/menu84.rb60
-rw-r--r--ext/tk/sample/demos-en/menubu.rb4
-rw-r--r--ext/tk/sample/demos-en/msgbox.rb24
-rw-r--r--ext/tk/sample/demos-en/msgbox2.rb28
-rw-r--r--ext/tk/sample/demos-en/paned1.rb8
-rw-r--r--ext/tk/sample/demos-en/paned2.rb46
-rw-r--r--ext/tk/sample/demos-en/pendulum.rb32
-rw-r--r--ext/tk/sample/demos-en/plot.rb30
-rw-r--r--ext/tk/sample/demos-en/puzzle.rb6
-rw-r--r--ext/tk/sample/demos-en/radio.rb12
-rw-r--r--ext/tk/sample/demos-en/radio2.rb28
-rw-r--r--ext/tk/sample/demos-en/radio3.rb50
-rw-r--r--ext/tk/sample/demos-en/ruler.rb36
-rw-r--r--ext/tk/sample/demos-en/sayings.rb8
-rw-r--r--ext/tk/sample/demos-en/search.rb32
-rw-r--r--ext/tk/sample/demos-en/spin.rb16
-rw-r--r--ext/tk/sample/demos-en/states.rb22
-rw-r--r--ext/tk/sample/demos-en/style.rb38
-rw-r--r--ext/tk/sample/demos-en/text.rb6
-rw-r--r--ext/tk/sample/demos-en/textpeer.rb8
-rw-r--r--ext/tk/sample/demos-en/toolbar.rb34
-rw-r--r--ext/tk/sample/demos-en/tree.rb26
-rw-r--r--ext/tk/sample/demos-en/ttkbut.rb48
-rw-r--r--ext/tk/sample/demos-en/ttkmenu.rb18
-rw-r--r--ext/tk/sample/demos-en/ttknote.rb22
-rw-r--r--ext/tk/sample/demos-en/ttkpane.rb46
-rw-r--r--ext/tk/sample/demos-en/ttkprogress.rb22
-rw-r--r--ext/tk/sample/demos-en/twind.rb60
-rw-r--r--ext/tk/sample/demos-en/twind2.rb130
-rw-r--r--ext/tk/sample/demos-en/unicodeout.rb40
-rw-r--r--ext/tk/sample/demos-en/widget7
-rw-r--r--ext/tk/sample/demos-jp/anilabel.rb14
-rw-r--r--ext/tk/sample/demos-jp/aniwave.rb10
-rw-r--r--ext/tk/sample/demos-jp/arrow.rb62
-rw-r--r--ext/tk/sample/demos-jp/bind.rb26
-rw-r--r--ext/tk/sample/demos-jp/bitmap.rb6
-rw-r--r--ext/tk/sample/demos-jp/button.rb2
-rw-r--r--ext/tk/sample/demos-jp/check.rb4
-rw-r--r--ext/tk/sample/demos-jp/check2.rb34
-rw-r--r--ext/tk/sample/demos-jp/clrpick.rb6
-rw-r--r--ext/tk/sample/demos-jp/colors.rb2
-rw-r--r--ext/tk/sample/demos-jp/combo.rb40
-rw-r--r--ext/tk/sample/demos-jp/cscroll.rb24
-rw-r--r--ext/tk/sample/demos-jp/ctext.rb38
-rw-r--r--ext/tk/sample/demos-jp/entry1.rb2
-rw-r--r--ext/tk/sample/demos-jp/entry2.rb2
-rw-r--r--ext/tk/sample/demos-jp/entry3.rb36
-rw-r--r--ext/tk/sample/demos-jp/filebox.rb32
-rw-r--r--ext/tk/sample/demos-jp/floor.rb546
-rw-r--r--ext/tk/sample/demos-jp/floor2.rb546
-rw-r--r--ext/tk/sample/demos-jp/form.rb2
-rw-r--r--ext/tk/sample/demos-jp/goldberg.rb408
-rw-r--r--ext/tk/sample/demos-jp/icon.rb2
-rw-r--r--ext/tk/sample/demos-jp/image1.rb2
-rw-r--r--ext/tk/sample/demos-jp/image2.rb2
-rw-r--r--ext/tk/sample/demos-jp/image3.rb16
-rw-r--r--ext/tk/sample/demos-jp/items.rb80
-rw-r--r--ext/tk/sample/demos-jp/knightstour.rb32
-rw-r--r--ext/tk/sample/demos-jp/label.rb6
-rw-r--r--ext/tk/sample/demos-jp/labelframe.rb22
-rw-r--r--ext/tk/sample/demos-jp/mclist.rb56
-rw-r--r--ext/tk/sample/demos-jp/menu.rb48
-rw-r--r--ext/tk/sample/demos-jp/menu84.rb58
-rw-r--r--ext/tk/sample/demos-jp/menu8x.rb56
-rw-r--r--ext/tk/sample/demos-jp/menubu.rb4
-rw-r--r--ext/tk/sample/demos-jp/msgbox.rb24
-rw-r--r--ext/tk/sample/demos-jp/msgbox2.rb30
-rw-r--r--ext/tk/sample/demos-jp/paned1.rb8
-rw-r--r--ext/tk/sample/demos-jp/paned2.rb48
-rw-r--r--ext/tk/sample/demos-jp/pendulum.rb32
-rw-r--r--ext/tk/sample/demos-jp/plot.rb24
-rw-r--r--ext/tk/sample/demos-jp/puzzle.rb8
-rw-r--r--ext/tk/sample/demos-jp/radio.rb2
-rw-r--r--ext/tk/sample/demos-jp/radio2.rb28
-rw-r--r--ext/tk/sample/demos-jp/radio3.rb50
-rw-r--r--ext/tk/sample/demos-jp/ruler.rb32
-rw-r--r--ext/tk/sample/demos-jp/sayings.rb8
-rw-r--r--ext/tk/sample/demos-jp/search.rb34
-rw-r--r--ext/tk/sample/demos-jp/spin.rb18
-rw-r--r--ext/tk/sample/demos-jp/states.rb2
-rw-r--r--ext/tk/sample/demos-jp/style.rb38
-rw-r--r--ext/tk/sample/demos-jp/text.rb2
-rw-r--r--ext/tk/sample/demos-jp/textpeer.rb12
-rw-r--r--ext/tk/sample/demos-jp/toolbar.rb32
-rw-r--r--ext/tk/sample/demos-jp/tree.rb26
-rw-r--r--ext/tk/sample/demos-jp/ttkbut.rb48
-rw-r--r--ext/tk/sample/demos-jp/ttkmenu.rb18
-rw-r--r--ext/tk/sample/demos-jp/ttknote.rb22
-rw-r--r--ext/tk/sample/demos-jp/ttkpane.rb48
-rw-r--r--ext/tk/sample/demos-jp/ttkprogress.rb22
-rw-r--r--ext/tk/sample/demos-jp/twind.rb58
-rw-r--r--ext/tk/sample/demos-jp/twind2.rb108
-rw-r--r--ext/tk/sample/demos-jp/unicodeout.rb38
-rw-r--r--ext/tk/sample/demos-jp/widget31
-rw-r--r--ext/tk/sample/editable_listbox.rb135
-rw-r--r--ext/tk/sample/encstr_usage.rb4
-rw-r--r--ext/tk/sample/figmemo_sample.rb96
-rw-r--r--ext/tk/sample/irbtk.rb4
-rw-r--r--ext/tk/sample/irbtkw.rbw16
-rw-r--r--ext/tk/sample/menubar1.rb20
-rw-r--r--ext/tk/sample/menubar2.rb24
-rw-r--r--ext/tk/sample/menubar3.rb72
-rw-r--r--ext/tk/sample/msgs_rb/README2
-rw-r--r--ext/tk/sample/multi-ip_sample.rb7
-rw-r--r--ext/tk/sample/multi-ip_sample2.rb2
-rw-r--r--ext/tk/sample/optobj_sample.rb30
-rw-r--r--ext/tk/sample/propagate.rb2
-rw-r--r--ext/tk/sample/remote-ip_sample.rb10
-rw-r--r--ext/tk/sample/remote-ip_sample2.rb20
-rw-r--r--ext/tk/sample/safe-tk.rb57
-rw-r--r--ext/tk/sample/scrollframe.rb28
-rw-r--r--ext/tk/sample/tcltklib/sample1.rb2
-rw-r--r--ext/tk/sample/tcltklib/sample2.rb104
-rw-r--r--ext/tk/sample/tkalignbox.rb102
-rw-r--r--ext/tk/sample/tkballoonhelp.rb104
-rw-r--r--ext/tk/sample/tkbiff.rb6
-rw-r--r--ext/tk/sample/tkbrowse.rb2
-rw-r--r--ext/tk/sample/tkcombobox.rb133
-rw-r--r--ext/tk/sample/tkdialog.rb2
-rw-r--r--ext/tk/sample/tkextlib/ICONS/viewIcons.rb38
-rw-r--r--ext/tk/sample/tkextlib/blt/barchart5.rb22
-rw-r--r--ext/tk/sample/tkextlib/blt/calendar.rb54
-rw-r--r--ext/tk/sample/tkextlib/blt/graph6.rb4056
-rw-r--r--ext/tk/sample/tkextlib/blt/graph7.rb8
-rw-r--r--ext/tk/sample/tkextlib/blt/graph7a.rb10
-rw-r--r--ext/tk/sample/tkextlib/blt/graph7b.rb8
-rw-r--r--ext/tk/sample/tkextlib/blt/graph7c.rb8
-rw-r--r--ext/tk/sample/tkextlib/blt/pareto.rb34
-rw-r--r--ext/tk/sample/tkextlib/blt/plot1b.rb2
-rw-r--r--ext/tk/sample/tkextlib/blt/winop1.rb8
-rw-r--r--ext/tk/sample/tkextlib/blt/winop2.rb2
-rw-r--r--ext/tk/sample/tkextlib/bwidget/basic.rb96
-rw-r--r--ext/tk/sample/tkextlib/bwidget/demo.rb84
-rw-r--r--ext/tk/sample/tkextlib/bwidget/dnd.rb16
-rw-r--r--ext/tk/sample/tkextlib/bwidget/manager.rb28
-rw-r--r--ext/tk/sample/tkextlib/bwidget/select.rb56
-rw-r--r--ext/tk/sample/tkextlib/bwidget/tmpldlg.rb162
-rw-r--r--ext/tk/sample/tkextlib/bwidget/tree.rb96
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/calendar.rb8
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/combobox.rb8
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/dialogshell.rb2
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/disjointlistbox.rb2
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/entryfield-1.rb12
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/entryfield-2.rb16
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/entryfield-3.rb10
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/extbutton.rb12
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/extfileselectionbox.rb2
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/fileselectionbox.rb2
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/hierarchy.rb16
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/labeledwidget.rb4
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/mainwindow.rb36
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/menubar.rb66
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/menubar2.rb12
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/messagebox1.rb6
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/messagebox2.rb6
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/messagedialog.rb8
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/notebook.rb2
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/notebook2.rb2
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/optionmenu.rb2
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/panedwindow.rb2
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/panedwindow2.rb2
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/promptdialog.rb2
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/pushbutton.rb4
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/scrolledframe.rb2
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/scrolledhtml.rb2
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/scrolledlistbox.rb6
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/scrolledtext.rb2
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/selectionbox.rb4
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/selectiondialog.rb2
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/shell.rb8
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/spinint.rb2
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/spinner.rb8
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/tabnotebook.rb2
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/tabnotebook2.rb2
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/toolbar.rb32
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/watch.rb2
-rw-r--r--ext/tk/sample/tkextlib/tcllib/datefield.rb4
-rw-r--r--ext/tk/sample/tkextlib/tcllib/plotdemos1.rb22
-rw-r--r--ext/tk/sample/tkextlib/tcllib/plotdemos2.rb8
-rw-r--r--ext/tk/sample/tkextlib/tcllib/plotdemos3.rb20
-rw-r--r--ext/tk/sample/tkextlib/tcllib/xyplot.rb2
-rw-r--r--ext/tk/sample/tkextlib/tile/demo.rb174
-rw-r--r--ext/tk/sample/tkextlib/tile/themes/kroc.rb108
-rw-r--r--ext/tk/sample/tkextlib/tkHTML/hv.rb48
-rw-r--r--ext/tk/sample/tkextlib/tkHTML/ss.rb82
-rw-r--r--ext/tk/sample/tkextlib/tkimg/demo.rb10
-rw-r--r--ext/tk/sample/tkextlib/tktable/basic.rb14
-rw-r--r--ext/tk/sample/tkextlib/tktable/buttons.rb12
-rw-r--r--ext/tk/sample/tkextlib/tktable/command.rb22
-rw-r--r--ext/tk/sample/tkextlib/tktable/debug.rb16
-rw-r--r--ext/tk/sample/tkextlib/tktable/dynarows.rb14
-rw-r--r--ext/tk/sample/tkextlib/tktable/maxsize.rb14
-rw-r--r--ext/tk/sample/tkextlib/tktable/spreadsheet.rb16
-rwxr-xr-x[-rw-r--r--]ext/tk/sample/tkextlib/tktable/tcllogo.gifbin2341 -> 2341 bytes-rw-r--r--ext/tk/sample/tkextlib/tktable/valid.rb12
-rw-r--r--ext/tk/sample/tkextlib/treectrl/bitmaps.rb32
-rw-r--r--ext/tk/sample/tkextlib/treectrl/demo.rb342
-rw-r--r--ext/tk/sample/tkextlib/treectrl/explorer.rb126
-rw-r--r--ext/tk/sample/tkextlib/treectrl/help.rb106
-rw-r--r--ext/tk/sample/tkextlib/treectrl/imovie.rb30
-rw-r--r--ext/tk/sample/tkextlib/treectrl/layout.rb26
-rw-r--r--ext/tk/sample/tkextlib/treectrl/mailwasher.rb100
-rw-r--r--ext/tk/sample/tkextlib/treectrl/outlook-folders.rb52
-rw-r--r--ext/tk/sample/tkextlib/treectrl/outlook-newgroup.rb102
-rw-r--r--ext/tk/sample/tkextlib/treectrl/random.rb68
-rw-r--r--ext/tk/sample/tkextlib/treectrl/www-options.rb72
-rw-r--r--ext/tk/sample/tkextlib/vu/canvItems.rb68
-rw-r--r--ext/tk/sample/tkextlib/vu/canvSticker.rb4
-rw-r--r--ext/tk/sample/tkextlib/vu/canvSticker2.rb4
-rw-r--r--ext/tk/sample/tkextlib/vu/dial_demo.rb62
-rw-r--r--ext/tk/sample/tkextlib/vu/oscilloscope.rb16
-rw-r--r--ext/tk/sample/tkextlib/vu/pie.rb10
-rw-r--r--ext/tk/sample/tkextlib/vu/vu_demo.rb14
-rw-r--r--ext/tk/sample/tkfrom.rb2
-rw-r--r--ext/tk/sample/tkhello.rb2
-rw-r--r--ext/tk/sample/tkmenubutton.rb56
-rw-r--r--ext/tk/sample/tkmsgcat-load_rb.rb16
-rw-r--r--ext/tk/sample/tkmsgcat-load_rb2.rb16
-rw-r--r--ext/tk/sample/tkmsgcat-load_tk.rb22
-rw-r--r--ext/tk/sample/tkmulticolumnlist.rb114
-rw-r--r--ext/tk/sample/tkmultilistbox.rb96
-rw-r--r--ext/tk/sample/tkmultilistframe.rb168
-rw-r--r--ext/tk/sample/tkoptdb-safeTk.rb28
-rw-r--r--ext/tk/sample/tkoptdb.rb32
-rw-r--r--ext/tk/sample/tkrttimer.rb12
-rw-r--r--ext/tk/sample/tktextframe.rb267
-rw-r--r--ext/tk/sample/tktextio.rb56
-rw-r--r--ext/tk/sample/tktimer2.rb8
-rw-r--r--ext/tk/sample/tktimer3.rb8
-rw-r--r--ext/tk/sample/tktree.rb26
-rw-r--r--ext/tk/sample/ttk_wrapper.rb12
-rw-r--r--ext/tk/stubs.c24
-rw-r--r--ext/tk/tcltklib.c1292
-rw-r--r--ext/tk/tkutil/extconf.rb5
-rw-r--r--ext/tk/tkutil/tkutil.c106
-rw-r--r--ext/win32ole/doc/win32ole.rd294
-rw-r--r--ext/win32ole/extconf.rb9
-rw-r--r--ext/win32ole/sample/excel1.rb15
-rw-r--r--ext/win32ole/sample/excel2.rb10
-rw-r--r--ext/win32ole/sample/ieconst.rb2
-rw-r--r--ext/win32ole/sample/ienavi.rb2
-rw-r--r--ext/win32ole/sample/ienavi2.rb40
-rw-r--r--ext/win32ole/sample/oledirs.rb2
-rw-r--r--ext/win32ole/sample/olegen.rb25
-rw-r--r--ext/win32ole/sample/xml.rb36
-rw-r--r--ext/win32ole/tests/oleserver.rb10
-rw-r--r--ext/win32ole/tests/testNIL2VTEMPTY.rb28
-rw-r--r--ext/win32ole/tests/testOLEEVENT.rb91
-rw-r--r--ext/win32ole/tests/testOLEMETHOD.rb92
-rw-r--r--ext/win32ole/tests/testOLEPARAM.rb65
-rw-r--r--ext/win32ole/tests/testOLETYPE.rb96
-rw-r--r--ext/win32ole/tests/testOLEVARIABLE.rb49
-rw-r--r--ext/win32ole/tests/testVARIANT.rb32
-rw-r--r--ext/win32ole/tests/testWIN32OLE.rb372
-rw-r--r--ext/win32ole/tests/test_ole_methods.rb36
-rw-r--r--ext/win32ole/tests/test_propertyputref.rb19
-rw-r--r--ext/win32ole/tests/test_word.rb37
-rw-r--r--ext/win32ole/tests/testall.rb15
-rw-r--r--ext/win32ole/win32ole.c5407
-rw-r--r--ext/zlib/.cvsignore1
-rw-r--r--ext/zlib/doc/zlib.rd6
-rw-r--r--ext/zlib/zlib.c1373
-rw-r--r--file.c2494
-rw-r--r--gc.c2933
-rw-r--r--gc.h75
-rw-r--r--gem_prelude.rb310
-rw-r--r--golf_prelude.rb114
-rw-r--r--goruby.c24
-rw-r--r--hash.c1465
-rw-r--r--ia64.s9
-rw-r--r--id.c50
-rw-r--r--include/ruby.h34
-rw-r--r--include/ruby/backward/rubyio.h6
-rw-r--r--include/ruby/backward/rubysig.h48
-rw-r--r--include/ruby/backward/st.h6
-rw-r--r--include/ruby/backward/util.h6
-rw-r--r--include/ruby/defines.h305
-rw-r--r--include/ruby/encoding.h303
-rw-r--r--include/ruby/intern.h830
-rw-r--r--include/ruby/io.h176
-rw-r--r--include/ruby/missing.h178
-rw-r--r--include/ruby/oniguruma.h793
-rw-r--r--include/ruby/re.h66
-rw-r--r--include/ruby/regex.h42
-rw-r--r--include/ruby/ruby.h1320
-rw-r--r--include/ruby/st.h119
-rw-r--r--include/ruby/util.h96
-rw-r--r--include/ruby/version.h61
-rw-r--r--include/ruby/vm.h22
-rw-r--r--include/ruby/win32.h580
-rw-r--r--inits.c119
-rw-r--r--insns.def2133
-rw-r--r--[-rwxr-xr-x]install-sh (renamed from tool/install-sh)0
-rwxr-xr-xinstruby.rb411
-rw-r--r--intern.h529
-rw-r--r--io.c8955
-rw-r--r--iseq.c1493
-rw-r--r--iseq.h103
-rw-r--r--keywords42
-rw-r--r--lex.c136
-rw-r--r--lex.c.blt219
-rw-r--r--lib/.document7
-rw-r--r--lib/English.rb10
-rw-r--r--lib/Env.rb18
-rw-r--r--lib/README43
-rw-r--r--lib/base64.rb142
-rw-r--r--lib/benchmark.rb163
-rw-r--r--lib/cgi-lib.rb272
-rw-r--r--lib/cgi.rb2124
-rw-r--r--lib/cgi/.document3
-rw-r--r--lib/cgi/cookie.rb137
-rw-r--r--lib/cgi/core.rb792
-rw-r--r--lib/cgi/html.rb1021
-rw-r--r--lib/cgi/session.rb225
-rw-r--r--lib/cgi/session/pstore.rb58
-rw-r--r--lib/cgi/util.rb181
-rw-r--r--lib/cmath.rb254
-rw-r--r--lib/complex.rb663
-rw-r--r--lib/csv.rb3014
-rw-r--r--lib/date.rb1077
-rw-r--r--lib/date/delta.rb400
-rw-r--r--lib/date/delta/parser.rb301
-rw-r--r--lib/date/delta/parser.ry84
-rw-r--r--lib/date/format.rb327
-rw-r--r--lib/date2.rb5
-rw-r--r--lib/debug.rb124
-rw-r--r--lib/delegate.rb210
-rw-r--r--lib/drb/drb.rb196
-rw-r--r--lib/drb/extserv.rb21
-rw-r--r--lib/drb/extservm.rb12
-rw-r--r--lib/drb/invokemethod.rb4
-rw-r--r--lib/drb/observer.rb20
-rw-r--r--lib/drb/ssl.rb22
-rw-r--r--lib/drb/timeridconv.rb8
-rw-r--r--lib/drb/unix.rb4
-rw-r--r--lib/e2mmap.rb43
-rw-r--r--lib/erb.rb213
-rw-r--r--lib/eregex.rb37
-rw-r--r--lib/fileutils.rb257
-rw-r--r--lib/finalize.rb193
-rw-r--r--lib/find.rb6
-rw-r--r--lib/forwardable.rb186
-rw-r--r--lib/ftools.rb261
-rw-r--r--lib/gauntlet_rubygems.rb50
-rw-r--r--lib/generator.rb418
-rw-r--r--lib/getoptlong.rb102
-rw-r--r--lib/getopts.rb127
-rw-r--r--lib/gserver.rb12
-rw-r--r--lib/importenv.rb33
-rw-r--r--lib/ipaddr.rb60
-rw-r--r--lib/irb.rb44
-rw-r--r--lib/irb/cmd/chws.rb7
-rw-r--r--lib/irb/cmd/fork.rb9
-rw-r--r--lib/irb/cmd/help.rb20
-rw-r--r--lib/irb/cmd/load.rb11
-rw-r--r--lib/irb/cmd/nop.rb9
-rw-r--r--lib/irb/cmd/pushws.rb7
-rw-r--r--lib/irb/cmd/subirb.rb9
-rw-r--r--lib/irb/completion.rb66
-rw-r--r--lib/irb/context.rb63
-rw-r--r--lib/irb/ext/change-ws.rb15
-rw-r--r--lib/irb/ext/history.rb11
-rw-r--r--lib/irb/ext/loader.rb13
-rw-r--r--lib/irb/ext/math-mode.rb7
-rw-r--r--lib/irb/ext/multi-irb.rb23
-rw-r--r--lib/irb/ext/save-history.rb66
-rw-r--r--lib/irb/ext/tracer.rb11
-rw-r--r--lib/irb/ext/use-loader.rb9
-rw-r--r--lib/irb/ext/workspaces.rb7
-rw-r--r--lib/irb/extend-command.rb28
-rw-r--r--lib/irb/frame.rb5
-rw-r--r--lib/irb/help.rb32
-rw-r--r--lib/irb/init.rb75
-rw-r--r--lib/irb/input-method.rb46
-rw-r--r--lib/irb/inspector.rb109
-rw-r--r--lib/irb/lc/error.rb9
-rw-r--r--lib/irb/lc/help-message7
-rw-r--r--lib/irb/lc/ja/encoding_aliases.rb8
-rw-r--r--lib/irb/lc/ja/error.rb30
-rw-r--r--lib/irb/lc/ja/help-message53
-rw-r--r--lib/irb/locale.rb121
-rw-r--r--lib/irb/magic-file.rb36
-rw-r--r--lib/irb/notifier.rb17
-rw-r--r--lib/irb/output-method.rb32
-rw-r--r--lib/irb/ruby-lex.rb161
-rw-r--r--lib/irb/ruby-token.rb25
-rw-r--r--lib/irb/slex.rb41
-rw-r--r--lib/irb/src_encoding.rb4
-rw-r--r--lib/irb/version.rb9
-rw-r--r--lib/irb/workspace.rb21
-rw-r--r--lib/irb/ws-for-case-2.rb7
-rw-r--r--lib/irb/xmp.rb15
-rw-r--r--lib/jcode.rb220
-rw-r--r--lib/logger.rb49
-rw-r--r--lib/mailread.rb62
-rw-r--r--lib/mathn.rb214
-rw-r--r--lib/matrix.rb512
-rw-r--r--lib/minitest/autorun.rb11
-rw-r--r--lib/minitest/mock.rb37
-rw-r--r--lib/minitest/spec.rb114
-rw-r--r--lib/minitest/unit.rb536
-rw-r--r--lib/mkmf.rb742
-rw-r--r--lib/monitor.rb187
-rw-r--r--lib/mutex_m.rb101
-rw-r--r--lib/net/.document8
-rw-r--r--lib/net/ftp.rb344
-rw-r--r--lib/net/http.rb422
-rw-r--r--lib/net/https.rb61
-rw-r--r--lib/net/imap.rb949
-rw-r--r--lib/net/pop.rb113
-rw-r--r--lib/net/protocol.rb42
-rw-r--r--lib/net/smtp.rb118
-rw-r--r--lib/net/telnet.rb213
-rw-r--r--lib/observer.rb33
-rw-r--r--lib/open-uri.rb196
-rw-r--r--lib/open3.rb730
-rw-r--r--lib/optparse.rb188
-rw-r--r--lib/optparse/version.rb10
-rw-r--r--lib/ostruct.rb59
-rw-r--r--lib/parsearg.rb87
-rw-r--r--lib/parsedate.rb53
-rw-r--r--lib/pathname.rb240
-rw-r--r--lib/ping.rb64
-rw-r--r--lib/pp.rb315
-rw-r--r--lib/prettyprint.rb533
-rw-r--r--lib/prime.rb468
-rw-r--r--lib/profile.rb4
-rw-r--r--lib/profiler.rb2
-rw-r--r--lib/pstore.rb382
-rw-r--r--lib/racc/parser.rb5
-rw-r--r--lib/rake.rb2471
-rw-r--r--lib/rake/classic_namespace.rb8
-rw-r--r--lib/rake/clean.rb31
-rw-r--r--lib/rake/gempackagetask.rb95
-rw-r--r--lib/rake/loaders/makefile.rb38
-rw-r--r--lib/rake/packagetask.rb182
-rw-r--r--lib/rake/rake_test_loader.rb5
-rw-r--r--lib/rake/rdoctask.rb207
-rw-r--r--lib/rake/runtest.rb21
-rw-r--r--lib/rake/tasklib.rb21
-rw-r--r--lib/rake/testtask.rb159
-rw-r--r--lib/rake/win32.rb34
-rw-r--r--lib/rational.rb557
-rw-r--r--lib/rbconfig/datadir.rb20
-rw-r--r--lib/rdoc.rb395
-rw-r--r--lib/rdoc/README605
-rw-r--r--lib/rdoc/code_objects.rb580
-rw-r--r--lib/rdoc/diagram.rb225
-rw-r--r--lib/rdoc/dot.rb249
-rw-r--r--lib/rdoc/dot/dot.rb255
-rw-r--r--lib/rdoc/generator.rb1082
-rw-r--r--lib/rdoc/generator/chm.rb113
-rw-r--r--lib/rdoc/generator/chm/chm.rb100
-rw-r--r--lib/rdoc/generator/html.rb445
-rw-r--r--lib/rdoc/generator/html/common.rb24
-rw-r--r--lib/rdoc/generator/html/frameless.rb92
-rw-r--r--lib/rdoc/generator/html/hefss.rb150
-rw-r--r--lib/rdoc/generator/html/html.rb769
-rw-r--r--lib/rdoc/generator/html/kilmer.rb151
-rw-r--r--lib/rdoc/generator/html/kilmerfactory.rb427
-rw-r--r--lib/rdoc/generator/html/one_page_html.rb122
-rw-r--r--lib/rdoc/generator/ri.rb226
-rw-r--r--lib/rdoc/generator/texinfo.rb81
-rw-r--r--lib/rdoc/generator/texinfo/class.texinfo.erb44
-rw-r--r--lib/rdoc/generator/texinfo/file.texinfo.erb6
-rw-r--r--lib/rdoc/generator/texinfo/method.texinfo.erb6
-rw-r--r--lib/rdoc/generator/texinfo/texinfo.erb28
-rw-r--r--lib/rdoc/generator/xml.rb117
-rw-r--r--lib/rdoc/generator/xml/rdf.rb113
-rw-r--r--lib/rdoc/generator/xml/xml.rb123
-rw-r--r--lib/rdoc/generators/chm_generator.rb112
-rw-r--r--lib/rdoc/generators/html_generator.rb1509
-rw-r--r--lib/rdoc/generators/ri_generator.rb268
-rw-r--r--lib/rdoc/generators/template/chm/chm.rb87
-rw-r--r--lib/rdoc/generators/template/html/hefss.rb418
-rw-r--r--lib/rdoc/generators/template/html/html.rb711
-rw-r--r--lib/rdoc/generators/template/html/kilmer.rb435
-rw-r--r--lib/rdoc/generators/template/html/old_html.rb728
-rw-r--r--lib/rdoc/generators/template/html/one_page_html.rb122
-rw-r--r--lib/rdoc/generators/template/xml/rdf.rb112
-rw-r--r--lib/rdoc/generators/template/xml/xml.rb112
-rw-r--r--lib/rdoc/generators/xml_generator.rb130
-rw-r--r--lib/rdoc/known_classes.rb68
-rw-r--r--lib/rdoc/markup.rb378
-rw-r--r--lib/rdoc/markup/.document2
-rw-r--r--lib/rdoc/markup/attribute_manager.rb265
-rw-r--r--lib/rdoc/markup/formatter.rb14
-rw-r--r--lib/rdoc/markup/fragments.rb337
-rw-r--r--lib/rdoc/markup/inline.rb101
-rw-r--r--lib/rdoc/markup/lines.rb152
-rw-r--r--lib/rdoc/markup/preprocess.rb75
-rw-r--r--lib/rdoc/markup/sample/rdoc2latex.rb16
-rw-r--r--lib/rdoc/markup/sample/sample.rb42
-rw-r--r--lib/rdoc/markup/simple_markup.rb476
-rw-r--r--lib/rdoc/markup/simple_markup/fragments.rb328
-rw-r--r--lib/rdoc/markup/simple_markup/inline.rb340
-rw-r--r--lib/rdoc/markup/simple_markup/lines.rb151
-rw-r--r--lib/rdoc/markup/simple_markup/preprocess.rb73
-rw-r--r--lib/rdoc/markup/simple_markup/to_flow.rb188
-rw-r--r--lib/rdoc/markup/simple_markup/to_html.rb289
-rw-r--r--lib/rdoc/markup/simple_markup/to_latex.rb333
-rw-r--r--lib/rdoc/markup/test/AllTests.rb2
-rw-r--r--lib/rdoc/markup/test/TestInline.rb154
-rw-r--r--lib/rdoc/markup/test/TestParse.rb503
-rw-r--r--lib/rdoc/markup/to_flow.rb185
-rw-r--r--lib/rdoc/markup/to_html.rb403
-rw-r--r--lib/rdoc/markup/to_html_crossref.rb148
-rw-r--r--lib/rdoc/markup/to_latex.rb328
-rw-r--r--lib/rdoc/markup/to_test.rb50
-rw-r--r--lib/rdoc/markup/to_texinfo.rb69
-rw-r--r--lib/rdoc/options.rb972
-rw-r--r--lib/rdoc/parser.rb136
-rw-r--r--lib/rdoc/parser/c.rb661
-rw-r--r--lib/rdoc/parser/f95.rb1835
-rw-r--r--lib/rdoc/parser/perl.rb165
-rw-r--r--lib/rdoc/parser/ruby.rb2829
-rw-r--r--lib/rdoc/parser/simple.rb38
-rw-r--r--lib/rdoc/parsers/parse_c.rb773
-rw-r--r--lib/rdoc/parsers/parse_f95.rb1841
-rw-r--r--lib/rdoc/parsers/parse_rb.rb2609
-rw-r--r--lib/rdoc/parsers/parse_simple.rb41
-rw-r--r--lib/rdoc/parsers/parserfactory.rb99
-rw-r--r--lib/rdoc/rdoc.rb289
-rw-r--r--lib/rdoc/ri.rb8
-rw-r--r--lib/rdoc/ri/cache.rb187
-rw-r--r--lib/rdoc/ri/descriptions.rb156
-rw-r--r--lib/rdoc/ri/display.rb392
-rw-r--r--lib/rdoc/ri/driver.rb669
-rw-r--r--lib/rdoc/ri/formatter.rb616
-rw-r--r--lib/rdoc/ri/gemdirs.rb28
-rw-r--r--lib/rdoc/ri/paths.rb78
-rw-r--r--lib/rdoc/ri/reader.rb106
-rw-r--r--lib/rdoc/ri/ri_cache.rb187
-rw-r--r--lib/rdoc/ri/ri_descriptions.rb154
-rw-r--r--lib/rdoc/ri/ri_display.rb255
-rw-r--r--lib/rdoc/ri/ri_driver.rb143
-rw-r--r--lib/rdoc/ri/ri_formatter.rb672
-rw-r--r--lib/rdoc/ri/ri_options.rb319
-rw-r--r--lib/rdoc/ri/ri_paths.rb101
-rw-r--r--lib/rdoc/ri/ri_reader.rb100
-rw-r--r--lib/rdoc/ri/ri_util.rb75
-rw-r--r--lib/rdoc/ri/ri_writer.rb62
-rw-r--r--lib/rdoc/ri/util.rb79
-rw-r--r--lib/rdoc/ri/writer.rb68
-rw-r--r--lib/rdoc/stats.rb115
-rw-r--r--lib/rdoc/template.rb252
-rw-r--r--lib/rdoc/tokenstream.rb24
-rw-r--r--lib/rdoc/usage.rb210
-rw-r--r--lib/readbytes.rb41
-rw-r--r--lib/resolv-replace.rb3
-rw-r--r--lib/resolv.rb366
-rw-r--r--lib/rexml/attlistdecl.rb112
-rw-r--r--lib/rexml/attribute.rb301
-rw-r--r--lib/rexml/cdata.rb96
-rw-r--r--lib/rexml/child.rb164
-rw-r--r--lib/rexml/comment.rb118
-rw-r--r--lib/rexml/doctype.rb37
-rw-r--r--lib/rexml/document.rb235
-rw-r--r--lib/rexml/dtd/attlistdecl.rb14
-rw-r--r--lib/rexml/dtd/dtd.rb82
-rw-r--r--lib/rexml/dtd/elementdecl.rb26
-rw-r--r--lib/rexml/dtd/entitydecl.rb98
-rw-r--r--lib/rexml/dtd/notationdecl.rb64
-rw-r--r--lib/rexml/element.rb175
-rw-r--r--lib/rexml/encoding.rb8
-rw-r--r--lib/rexml/encodings/CP-1252.rb14
-rw-r--r--lib/rexml/encodings/ISO-8859-15.rb8
-rw-r--r--lib/rexml/encodings/UNILE.rb2
-rw-r--r--lib/rexml/encodings/UTF-16.rb2
-rw-r--r--lib/rexml/entity.rb287
-rw-r--r--lib/rexml/formatters/default.rb6
-rw-r--r--lib/rexml/formatters/pretty.rb4
-rw-r--r--lib/rexml/formatters/transitive.rb6
-rw-r--r--lib/rexml/functions.rb46
-rw-r--r--lib/rexml/instruction.rb98
-rw-r--r--lib/rexml/light/node.rb380
-rw-r--r--lib/rexml/namespace.rb78
-rw-r--r--lib/rexml/node.rb64
-rw-r--r--lib/rexml/output.rb24
-rw-r--r--lib/rexml/parent.rb50
-rw-r--r--lib/rexml/parseexception.rb6
-rw-r--r--lib/rexml/parsers/baseparser.rb75
-rw-r--r--lib/rexml/parsers/lightparser.rb84
-rw-r--r--lib/rexml/parsers/pullparser.rb2
-rw-r--r--lib/rexml/parsers/sax2parser.rb403
-rw-r--r--lib/rexml/parsers/streamparser.rb4
-rw-r--r--lib/rexml/parsers/treeparser.rb9
-rw-r--r--lib/rexml/parsers/ultralightparser.rb80
-rw-r--r--lib/rexml/parsers/xpathparser.rb96
-rw-r--r--lib/rexml/quickpath.rb493
-rw-r--r--lib/rexml/rexml.rb19
-rw-r--r--lib/rexml/sax2listener.rb184
-rw-r--r--lib/rexml/source.rb43
-rw-r--r--lib/rexml/streamlistener.rb180
-rw-r--r--lib/rexml/syncenumerator.rb7
-rw-r--r--lib/rexml/text.rb198
-rw-r--r--lib/rexml/validation/relaxng.rb36
-rw-r--r--lib/rexml/validation/validation.rb10
-rw-r--r--lib/rexml/xmldecl.rb116
-rw-r--r--lib/rexml/xmltokens.rb28
-rw-r--r--lib/rexml/xpath.rb117
-rw-r--r--lib/rexml/xpath_parser.rb72
-rw-r--r--lib/rinda/.document3
-rw-r--r--lib/rinda/rinda.rb18
-rw-r--r--lib/rinda/ring.rb22
-rw-r--r--lib/rinda/tuplespace.rb20
-rw-r--r--lib/rss/0.9.rb40
-rw-r--r--lib/rss/1.0.rb48
-rw-r--r--lib/rss/2.0.rb6
-rw-r--r--lib/rss/atom.rb5
-rw-r--r--lib/rss/content/1.0.rb1
-rw-r--r--lib/rss/content/2.0.rb1
-rw-r--r--lib/rss/converter.rb36
-rw-r--r--lib/rss/dublincore.rb16
-rw-r--r--lib/rss/dublincore/1.0.rb1
-rw-r--r--lib/rss/dublincore/2.0.rb1
-rw-r--r--lib/rss/dublincore/atom.rb1
-rw-r--r--lib/rss/image.rb18
-rw-r--r--lib/rss/maker.rb20
-rw-r--r--lib/rss/maker/0.9.rb83
-rw-r--r--lib/rss/maker/1.0.rb11
-rw-r--r--lib/rss/maker/2.0.rb22
-rw-r--r--lib/rss/maker/base.rb103
-rw-r--r--lib/rss/maker/dublincore.rb2
-rw-r--r--lib/rss/maker/entry.rb2
-rw-r--r--lib/rss/maker/feed.rb9
-rw-r--r--lib/rss/maker/image.rb2
-rw-r--r--lib/rss/maker/itunes.rb2
-rw-r--r--lib/rss/maker/taxonomy.rb8
-rw-r--r--lib/rss/maker/trackback.rb2
-rw-r--r--lib/rss/parser.rb77
-rw-r--r--lib/rss/rexmlparser.rb10
-rw-r--r--lib/rss/rss.rb21
-rw-r--r--lib/rss/syndication.rb6
-rw-r--r--lib/rss/taxonomy.rb18
-rw-r--r--lib/rss/trackback.rb36
-rw-r--r--lib/rss/utils.rb4
-rw-r--r--lib/rss/xml-stylesheet.rb4
-rw-r--r--lib/rss/xmlparser.rb14
-rw-r--r--lib/rss/xmlscanner.rb10
-rw-r--r--lib/rubygems.rb1121
-rw-r--r--lib/rubygems/builder.rb90
-rw-r--r--lib/rubygems/command.rb511
-rw-r--r--lib/rubygems/command_manager.rb174
-rw-r--r--lib/rubygems/commands/build_command.rb53
-rw-r--r--lib/rubygems/commands/cert_command.rb86
-rw-r--r--lib/rubygems/commands/check_command.rb80
-rw-r--r--lib/rubygems/commands/cleanup_command.rb106
-rw-r--r--lib/rubygems/commands/contents_command.rb98
-rw-r--r--lib/rubygems/commands/dependency_command.rb188
-rw-r--r--lib/rubygems/commands/environment_command.rb128
-rw-r--r--lib/rubygems/commands/fetch_command.rb62
-rw-r--r--lib/rubygems/commands/generate_index_command.rb133
-rw-r--r--lib/rubygems/commands/help_command.rb172
-rw-r--r--lib/rubygems/commands/install_command.rb174
-rw-r--r--lib/rubygems/commands/list_command.rb35
-rw-r--r--lib/rubygems/commands/lock_command.rb110
-rw-r--r--lib/rubygems/commands/mirror_command.rb111
-rw-r--r--lib/rubygems/commands/outdated_command.rb33
-rw-r--r--lib/rubygems/commands/pristine_command.rb93
-rw-r--r--lib/rubygems/commands/query_command.rb264
-rw-r--r--lib/rubygems/commands/rdoc_command.rb76
-rw-r--r--lib/rubygems/commands/search_command.rb31
-rw-r--r--lib/rubygems/commands/server_command.rb70
-rw-r--r--lib/rubygems/commands/setup_command.rb353
-rw-r--r--lib/rubygems/commands/sources_command.rb157
-rw-r--r--lib/rubygems/commands/specification_command.rb124
-rw-r--r--lib/rubygems/commands/stale_command.rb27
-rw-r--r--lib/rubygems/commands/uninstall_command.rb83
-rw-r--r--lib/rubygems/commands/unpack_command.rb97
-rw-r--r--lib/rubygems/commands/update_command.rb202
-rw-r--r--lib/rubygems/commands/which_command.rb87
-rw-r--r--lib/rubygems/config_file.rb266
-rw-r--r--lib/rubygems/custom_require.rb46
-rw-r--r--lib/rubygems/defaults.rb106
-rw-r--r--lib/rubygems/dependency.rb148
-rw-r--r--lib/rubygems/dependency_installer.rb261
-rw-r--r--lib/rubygems/dependency_list.rb185
-rw-r--r--lib/rubygems/digest/md5.rb13
-rw-r--r--lib/rubygems/digest/sha1.rb11
-rw-r--r--lib/rubygems/digest/sha2.rb11
-rw-r--r--lib/rubygems/doc_manager.rb230
-rw-r--r--lib/rubygems/exceptions.rb82
-rw-r--r--lib/rubygems/ext.rb18
-rw-r--r--lib/rubygems/ext/builder.rb54
-rw-r--r--lib/rubygems/ext/configure_builder.rb25
-rw-r--r--lib/rubygems/ext/ext_conf_builder.rb24
-rw-r--r--lib/rubygems/ext/rake_builder.rb31
-rw-r--r--lib/rubygems/format.rb87
-rw-r--r--lib/rubygems/gem_openssl.rb94
-rw-r--r--lib/rubygems/gem_path_searcher.rb102
-rw-r--r--lib/rubygems/gem_runner.rb78
-rw-r--r--lib/rubygems/indexer.rb712
-rw-r--r--lib/rubygems/indexer/abstract_index_builder.rb88
-rw-r--r--lib/rubygems/indexer/latest_index_builder.rb35
-rw-r--r--lib/rubygems/indexer/marshal_index_builder.rb17
-rw-r--r--lib/rubygems/indexer/master_index_builder.rb54
-rw-r--r--lib/rubygems/indexer/quick_index_builder.rb50
-rw-r--r--lib/rubygems/install_update_options.rb125
-rw-r--r--lib/rubygems/installer.rb589
-rw-r--r--lib/rubygems/local_remote_options.rb135
-rw-r--r--lib/rubygems/old_format.rb152
-rw-r--r--lib/rubygems/package.rb95
-rw-r--r--lib/rubygems/package/f_sync_dir.rb22
-rw-r--r--lib/rubygems/package/tar_header.rb265
-rw-r--r--lib/rubygems/package/tar_input.rb217
-rw-r--r--lib/rubygems/package/tar_output.rb143
-rw-r--r--lib/rubygems/package/tar_reader.rb105
-rw-r--r--lib/rubygems/package/tar_reader/entry.rb140
-rw-r--r--lib/rubygems/package/tar_writer.rb240
-rw-r--r--lib/rubygems/package_task.rb118
-rw-r--r--lib/rubygems/platform.rb180
-rw-r--r--lib/rubygems/remote_fetcher.rb367
-rw-r--r--lib/rubygems/require_paths_builder.rb17
-rw-r--r--lib/rubygems/requirement.rb170
-rw-r--r--lib/rubygems/rubygems_version.rb19
-rw-r--r--lib/rubygems/security.rb786
-rw-r--r--lib/rubygems/server.rb813
-rw-r--r--lib/rubygems/source_index.rb591
-rw-r--r--lib/rubygems/source_info_cache.rb393
-rw-r--r--lib/rubygems/source_info_cache_entry.rb56
-rw-r--r--lib/rubygems/spec_fetcher.rb271
-rw-r--r--lib/rubygems/specification.rb1444
-rw-r--r--lib/rubygems/test_utilities.rb131
-rw-r--r--lib/rubygems/text.rb30
-rw-r--r--lib/rubygems/timer.rb28
-rw-r--r--lib/rubygems/uninstaller.rb262
-rw-r--r--lib/rubygems/user_interaction.rb390
-rw-r--r--lib/rubygems/validator.rb242
-rw-r--r--lib/rubygems/version.rb251
-rw-r--r--lib/rubygems/version_option.rb49
-rw-r--r--lib/rubyunit.rb6
-rw-r--r--lib/runit/assert.rb73
-rw-r--r--lib/runit/cui/testrunner.rb51
-rw-r--r--lib/runit/error.rb9
-rw-r--r--lib/runit/testcase.rb45
-rw-r--r--lib/runit/testresult.rb44
-rw-r--r--lib/runit/testsuite.rb26
-rw-r--r--lib/runit/topublic.rb8
-rw-r--r--lib/scanf.rb29
-rw-r--r--lib/securerandom.rb129
-rw-r--r--lib/set.rb157
-rw-r--r--lib/shell.rb129
-rw-r--r--lib/shell/builtin-command.rb38
-rw-r--r--lib/shell/command-processor.rb149
-rw-r--r--lib/shell/error.rb9
-rw-r--r--lib/shell/filter.rb11
-rw-r--r--lib/shell/process-controller.rb165
-rw-r--r--lib/shell/system-command.rb71
-rw-r--r--lib/shell/version.rb11
-rw-r--r--lib/shellwords.rb32
-rw-r--r--lib/singleton.rb129
-rw-r--r--lib/soap/attachment.rb107
-rw-r--r--lib/soap/baseData.rb942
-rw-r--r--lib/soap/element.rb258
-rw-r--r--lib/soap/encodingstyle/aspDotNetHandler.rb213
-rw-r--r--lib/soap/encodingstyle/handler.rb100
-rw-r--r--lib/soap/encodingstyle/literalHandler.rb226
-rw-r--r--lib/soap/encodingstyle/soapHandler.rb582
-rw-r--r--lib/soap/generator.rb268
-rw-r--r--lib/soap/header/handler.rb57
-rw-r--r--lib/soap/header/handlerset.rb70
-rw-r--r--lib/soap/header/simplehandler.rb44
-rw-r--r--lib/soap/httpconfigloader.rb119
-rw-r--r--lib/soap/mapping.rb10
-rw-r--r--lib/soap/mapping/factory.rb355
-rw-r--r--lib/soap/mapping/mapping.rb381
-rw-r--r--lib/soap/mapping/registry.rb541
-rw-r--r--lib/soap/mapping/rubytypeFactory.rb475
-rw-r--r--lib/soap/mapping/typeMap.rb50
-rw-r--r--lib/soap/mapping/wsdlencodedregistry.rb280
-rw-r--r--lib/soap/mapping/wsdlliteralregistry.rb418
-rw-r--r--lib/soap/marshal.rb59
-rw-r--r--lib/soap/mimemessage.rb240
-rw-r--r--lib/soap/netHttpClient.rb190
-rw-r--r--lib/soap/parser.rb251
-rw-r--r--lib/soap/processor.rb66
-rw-r--r--lib/soap/property.rb333
-rw-r--r--lib/soap/rpc/cgistub.rb206
-rw-r--r--lib/soap/rpc/driver.rb254
-rw-r--r--lib/soap/rpc/element.rb325
-rw-r--r--lib/soap/rpc/httpserver.rb129
-rw-r--r--lib/soap/rpc/proxy.rb497
-rw-r--r--lib/soap/rpc/router.rb594
-rw-r--r--lib/soap/rpc/rpc.rb25
-rw-r--r--lib/soap/rpc/soaplet.rb162
-rw-r--r--lib/soap/rpc/standaloneServer.rb43
-rw-r--r--lib/soap/soap.rb140
-rw-r--r--lib/soap/streamHandler.rb229
-rw-r--r--lib/soap/wsdlDriver.rb575
-rw-r--r--lib/sync.rb224
-rw-r--r--[-rwxr-xr-x]lib/tempfile.rb287
-rw-r--r--lib/test/unit.rb330
-rw-r--r--lib/test/unit/assertionfailederror.rb14
-rw-r--r--lib/test/unit/assertions.rb681
-rw-r--r--lib/test/unit/autorunner.rb220
-rw-r--r--lib/test/unit/collector.rb43
-rw-r--r--lib/test/unit/collector/dir.rb107
-rw-r--r--lib/test/unit/collector/objectspace.rb34
-rw-r--r--lib/test/unit/error.rb56
-rw-r--r--lib/test/unit/failure.rb51
-rw-r--r--lib/test/unit/testcase.rb155
-rw-r--r--lib/test/unit/testresult.rb80
-rw-r--r--lib/test/unit/testsuite.rb76
-rw-r--r--lib/test/unit/ui/console/testrunner.rb127
-rw-r--r--lib/test/unit/ui/fox/testrunner.rb268
-rw-r--r--lib/test/unit/ui/gtk/testrunner.rb416
-rw-r--r--lib/test/unit/ui/gtk2/testrunner.rb465
-rw-r--r--lib/test/unit/ui/testrunnermediator.rb68
-rw-r--r--lib/test/unit/ui/testrunnerutilities.rb46
-rw-r--r--lib/test/unit/ui/tk/testrunner.rb260
-rw-r--r--lib/test/unit/util/backtracefilter.rb40
-rw-r--r--lib/test/unit/util/observable.rb90
-rw-r--r--lib/test/unit/util/procwrapper.rb48
-rw-r--r--lib/thread.rb288
-rw-r--r--lib/thwait.rb27
-rw-r--r--lib/time.rb448
-rw-r--r--lib/timeout.rb70
-rw-r--r--lib/tmpdir.rb28
-rw-r--r--lib/tracer.rb106
-rw-r--r--lib/tsort.rb68
-rw-r--r--lib/ubygems.rb10
-rw-r--r--lib/un.rb111
-rw-r--r--lib/uri.rb4
-rw-r--r--lib/uri/.document7
-rw-r--r--lib/uri/common.rb566
-rw-r--r--lib/uri/ftp.rb36
-rw-r--r--lib/uri/generic.rb133
-rw-r--r--lib/uri/http.rb26
-rw-r--r--lib/uri/ldap.rb6
-rw-r--r--lib/uri/mailto.rb36
-rw-r--r--lib/weakref.rb70
-rw-r--r--lib/webrick/cgi.rb53
-rw-r--r--lib/webrick/config.rb9
-rw-r--r--lib/webrick/httpauth/authenticator.rb10
-rw-r--r--lib/webrick/httpauth/basicauth.rb2
-rw-r--r--lib/webrick/httpauth/digestauth.rb15
-rw-r--r--lib/webrick/httpauth/htpasswd.rb2
-rw-r--r--lib/webrick/httpauth/userdb.rb2
-rw-r--r--lib/webrick/httpproxy.rb252
-rw-r--r--lib/webrick/httprequest.rb91
-rw-r--r--lib/webrick/httpresponse.rb39
-rw-r--r--lib/webrick/httpserver.rb19
-rw-r--r--lib/webrick/httpservlet/abstract.rb5
-rw-r--r--lib/webrick/httpservlet/cgi_runner.rb2
-rw-r--r--lib/webrick/httpservlet/cgihandler.rb34
-rw-r--r--lib/webrick/httpservlet/erbhandler.rb8
-rw-r--r--lib/webrick/httpservlet/filehandler.rb14
-rw-r--r--lib/webrick/httpservlet/prochandler.rb8
-rw-r--r--lib/webrick/httpstatus.rb84
-rw-r--r--lib/webrick/httputils.rb37
-rw-r--r--lib/webrick/log.rb2
-rw-r--r--lib/webrick/server.rb20
-rw-r--r--lib/webrick/ssl.rb6
-rw-r--r--lib/webrick/utils.rb83
-rw-r--r--lib/wsdl/binding.rb65
-rw-r--r--lib/wsdl/data.rb64
-rw-r--r--lib/wsdl/definitions.rb250
-rw-r--r--lib/wsdl/documentation.rb32
-rw-r--r--lib/wsdl/import.rb80
-rw-r--r--lib/wsdl/importer.rb38
-rw-r--r--lib/wsdl/info.rb39
-rw-r--r--lib/wsdl/message.rb54
-rw-r--r--lib/wsdl/operation.rb130
-rw-r--r--lib/wsdl/operationBinding.rb108
-rw-r--r--lib/wsdl/param.rb85
-rw-r--r--lib/wsdl/parser.rb163
-rw-r--r--lib/wsdl/part.rb52
-rw-r--r--lib/wsdl/port.rb84
-rw-r--r--lib/wsdl/portType.rb73
-rw-r--r--lib/wsdl/service.rb61
-rw-r--r--lib/wsdl/soap/address.rb40
-rw-r--r--lib/wsdl/soap/binding.rb49
-rw-r--r--lib/wsdl/soap/body.rb56
-rw-r--r--lib/wsdl/soap/cgiStubCreator.rb76
-rw-r--r--lib/wsdl/soap/classDefCreator.rb314
-rw-r--r--lib/wsdl/soap/classDefCreatorSupport.rb126
-rw-r--r--lib/wsdl/soap/clientSkeltonCreator.rb78
-rw-r--r--lib/wsdl/soap/complexType.rb161
-rw-r--r--lib/wsdl/soap/data.rb42
-rw-r--r--lib/wsdl/soap/definitions.rb149
-rw-r--r--lib/wsdl/soap/driverCreator.rb95
-rw-r--r--lib/wsdl/soap/element.rb28
-rw-r--r--lib/wsdl/soap/fault.rb56
-rw-r--r--lib/wsdl/soap/header.rb86
-rw-r--r--lib/wsdl/soap/headerfault.rb56
-rw-r--r--lib/wsdl/soap/mappingRegistryCreator.rb92
-rw-r--r--lib/wsdl/soap/methodDefCreator.rb228
-rw-r--r--lib/wsdl/soap/operation.rb122
-rw-r--r--lib/wsdl/soap/servantSkeltonCreator.rb67
-rw-r--r--lib/wsdl/soap/standaloneServerStubCreator.rb85
-rw-r--r--lib/wsdl/soap/wsdl2ruby.rb176
-rw-r--r--lib/wsdl/types.rb43
-rw-r--r--lib/wsdl/wsdl.rb23
-rw-r--r--lib/wsdl/xmlSchema/all.rb69
-rw-r--r--lib/wsdl/xmlSchema/annotation.rb34
-rw-r--r--lib/wsdl/xmlSchema/any.rb56
-rw-r--r--lib/wsdl/xmlSchema/attribute.rb127
-rw-r--r--lib/wsdl/xmlSchema/choice.rb69
-rw-r--r--lib/wsdl/xmlSchema/complexContent.rb92
-rw-r--r--lib/wsdl/xmlSchema/complexType.rb139
-rw-r--r--lib/wsdl/xmlSchema/content.rb96
-rw-r--r--lib/wsdl/xmlSchema/data.rb80
-rw-r--r--lib/wsdl/xmlSchema/element.rb154
-rw-r--r--lib/wsdl/xmlSchema/enumeration.rb36
-rw-r--r--lib/wsdl/xmlSchema/import.rb65
-rw-r--r--lib/wsdl/xmlSchema/importer.rb87
-rw-r--r--lib/wsdl/xmlSchema/include.rb54
-rw-r--r--lib/wsdl/xmlSchema/length.rb35
-rw-r--r--lib/wsdl/xmlSchema/parser.rb166
-rw-r--r--lib/wsdl/xmlSchema/pattern.rb36
-rw-r--r--lib/wsdl/xmlSchema/schema.rb143
-rw-r--r--lib/wsdl/xmlSchema/sequence.rb69
-rw-r--r--lib/wsdl/xmlSchema/simpleContent.rb65
-rw-r--r--lib/wsdl/xmlSchema/simpleExtension.rb54
-rw-r--r--lib/wsdl/xmlSchema/simpleRestriction.rb73
-rw-r--r--lib/wsdl/xmlSchema/simpleType.rb73
-rw-r--r--lib/wsdl/xmlSchema/unique.rb34
-rw-r--r--lib/wsdl/xmlSchema/xsd2ruby.rb107
-rw-r--r--lib/xmlrpc/README.rdoc300
-rw-r--r--lib/xmlrpc/base64.rb22
-rw-r--r--lib/xmlrpc/client.rb153
-rw-r--r--lib/xmlrpc/config.rb8
-rw-r--r--lib/xmlrpc/create.rb200
-rw-r--r--lib/xmlrpc/datetime.rb20
-rw-r--r--lib/xmlrpc/httpserver.rb46
-rw-r--r--lib/xmlrpc/marshal.rb6
-rw-r--r--lib/xmlrpc/parser.rb420
-rw-r--r--lib/xmlrpc/server.rb200
-rw-r--r--lib/xmlrpc/utils.rb34
-rw-r--r--lib/xsd/charset.rb187
-rw-r--r--lib/xsd/codegen.rb12
-rw-r--r--lib/xsd/codegen/classdef.rb203
-rw-r--r--lib/xsd/codegen/commentdef.rb34
-rw-r--r--lib/xsd/codegen/gensupport.rb166
-rw-r--r--lib/xsd/codegen/methoddef.rb63
-rw-r--r--lib/xsd/codegen/moduledef.rb191
-rw-r--r--lib/xsd/datatypes.rb1269
-rw-r--r--lib/xsd/datatypes1999.rb20
-rw-r--r--lib/xsd/iconvcharset.rb33
-rw-r--r--lib/xsd/mapping.rb42
-rw-r--r--lib/xsd/namedelements.rb95
-rw-r--r--lib/xsd/ns.rb140
-rw-r--r--lib/xsd/qname.rb78
-rw-r--r--lib/xsd/xmlparser.rb61
-rw-r--r--lib/xsd/xmlparser/parser.rb96
-rw-r--r--lib/xsd/xmlparser/rexmlparser.rb54
-rw-r--r--lib/xsd/xmlparser/xmlparser.rb50
-rw-r--r--lib/xsd/xmlparser/xmlscanner.rb147
-rw-r--r--lib/yaml.rb48
-rw-r--r--lib/yaml/baseemitter.rb427
-rw-r--r--lib/yaml/constants.rb4
-rw-r--r--lib/yaml/dbm.rb4
-rw-r--r--lib/yaml/encoding.rb4
-rw-r--r--lib/yaml/error.rb2
-rw-r--r--lib/yaml/rubytypes.rb46
-rw-r--r--lib/yaml/stream.rb2
-rw-r--r--lib/yaml/stringio.rb2
-rw-r--r--lib/yaml/tag.rb8
-rw-r--r--lib/yaml/types.rb6
-rw-r--r--lib/yaml/yamlnode.rb6
-rw-r--r--load.c737
-rw-r--r--main.c44
-rw-r--r--man/erb.1158
-rw-r--r--man/goruby.139
-rw-r--r--man/irb.1173
-rw-r--r--man/rake.1169
-rw-r--r--man/ri.1180
-rw-r--r--man/ruby.1511
-rw-r--r--marshal.c998
-rw-r--r--math.c547
-rwxr-xr-xmdoc2man.rb465
-rw-r--r--method.h87
-rw-r--r--misc/inf-ruby.el217
-rw-r--r--misc/ruby-electric.el82
-rw-r--r--misc/ruby-mode.el1630
-rw-r--r--misc/ruby-style.el33
-rw-r--r--misc/rubydb3x.el42
-rw-r--r--missing.h142
-rw-r--r--missing/acosh.c19
-rw-r--r--missing/alloca.c5
-rw-r--r--missing/cbrt.c10
-rw-r--r--missing/crypt.c18
-rw-r--r--missing/dup2.c5
-rw-r--r--missing/erf.c12
-rw-r--r--missing/finite.c3
-rw-r--r--missing/flock.c14
-rw-r--r--missing/hypot.c3
-rw-r--r--missing/isinf.c17
-rw-r--r--missing/isnan.c8
-rw-r--r--missing/langinfo.c147
-rw-r--r--missing/lgamma_r.c68
-rw-r--r--missing/memcmp.c9
-rw-r--r--missing/memmove.c17
-rw-r--r--missing/os2.c25
-rw-r--r--missing/strcasecmp.c16
-rw-r--r--missing/strchr.c18
-rw-r--r--missing/strerror.c3
-rw-r--r--missing/strftime.c903
-rw-r--r--missing/strlcat.c73
-rw-r--r--missing/strlcpy.c69
-rw-r--r--missing/strncasecmp.c21
-rw-r--r--missing/strstr.c11
-rw-r--r--missing/strtod.c271
-rw-r--r--missing/strtol.c9
-rw-r--r--missing/strtoul.c184
-rw-r--r--missing/tgamma.c92
-rw-r--r--missing/vsnprintf.c321
-rw-r--r--missing/x68.c40
-rwxr-xr-xmkconfig.rb195
-rw-r--r--node.h359
-rw-r--r--numeric.c1816
-rw-r--r--object.c1638
-rw-r--r--pack.c594
-rw-r--r--parse.y8059
-rw-r--r--prec.c141
-rw-r--r--prelude.rb35
-rw-r--r--proc.c2097
-rw-r--r--process.c3717
-rw-r--r--random.c1084
-rw-r--r--range.c770
-rw-r--r--rational.c2370
-rw-r--r--re.c3301
-rw-r--r--re.h42
-rw-r--r--regcomp.c6327
-rw-r--r--regenc.c933
-rw-r--r--regenc.h207
-rw-r--r--regerror.c389
-rw-r--r--regex.c4667
-rw-r--r--regex.h221
-rw-r--r--regexec.c3822
-rw-r--r--regint.h842
-rw-r--r--regparse.c5645
-rw-r--r--regparse.h354
-rw-r--r--regsyntax.c315
-rw-r--r--ruby.1351
-rw-r--r--ruby.c1800
-rw-r--r--ruby.h776
-rw-r--r--rubyio.h91
-rw-r--r--rubysig.h105
-rwxr-xr-xrubytest.rb49
-rwxr-xr-xrunruby.rb71
-rw-r--r--safe.c135
-rw-r--r--sample/README4
-rw-r--r--sample/biorhythm.rb116
-rw-r--r--sample/coverage.rb60
-rw-r--r--sample/dbmtest.rb14
-rw-r--r--sample/drb/darrayc.rb12
-rw-r--r--sample/drb/dhasenc.rb1
-rw-r--r--sample/dualstack-httpd.rb2
-rw-r--r--sample/erb/erb4html.rb60
-rw-r--r--sample/exyacc.rb32
-rw-r--r--sample/from.rb161
-rw-r--r--sample/getopts.test36
-rw-r--r--sample/mine.rb1
-rw-r--r--sample/mrshtest.rb13
-rw-r--r--sample/occur.rb4
-rw-r--r--sample/openssl/cert_store_view.rb911
-rw-r--r--sample/openssl/cipher.rb73
-rw-r--r--sample/openssl/echo_cli.rb21
-rw-r--r--sample/openssl/echo_svr.rb15
-rw-r--r--sample/openssl/gen_csr.rb13
-rw-r--r--sample/openssl/smime_read.rb10
-rw-r--r--sample/openssl/smime_write.rb10
-rw-r--r--sample/openssl/wget.rb17
-rw-r--r--sample/optparse/opttest.rb30
-rw-r--r--sample/rdoc/markup/rdoc2latex.rb15
-rw-r--r--sample/rdoc/markup/sample.rb40
-rw-r--r--sample/regx.rb23
-rw-r--r--sample/ripper/ruby2html.rb112
-rw-r--r--sample/ripper/strip-comment.rb19
-rwxr-xr-xsample/rss/list_description.rb4
-rwxr-xr-xsample/rss/rss_recent.rb4
-rw-r--r--sample/svr.rb2
-rw-r--r--sample/test.rb751
-rw-r--r--sample/tsvr.rb2
-rw-r--r--signal.c856
-rw-r--r--spec/README30
-rw-r--r--spec/default.mspec22
-rw-r--r--sprintf.c895
-rw-r--r--st.c817
-rw-r--r--st.h72
-rw-r--r--strftime.c1205
-rw-r--r--string.c6451
-rw-r--r--struct.c574
-rw-r--r--symbian/README.SYMBIAN100
-rw-r--r--symbian/configure.bat121
-rw-r--r--symbian/missing-aeabi.c18
-rw-r--r--symbian/missing-pips.c106
-rw-r--r--symbian/pre-build78
-rw-r--r--symbian/setup408
-rw-r--r--template/Doxyfile.tmpl267
-rw-r--r--template/encdb.h.tmpl83
-rw-r--r--template/fake.rb.in15
-rw-r--r--template/id.h.tmpl136
-rw-r--r--template/insns.inc.tmpl20
-rw-r--r--template/insns_info.inc.tmpl95
-rw-r--r--template/known_errors.inc.tmpl14
-rw-r--r--template/minsns.inc.tmpl14
-rw-r--r--template/opt_sc.inc.tmpl32
-rw-r--r--template/optinsn.inc.tmpl30
-rw-r--r--template/optunifs.inc.tmpl35
-rw-r--r--template/transdb.h.tmpl59
-rw-r--r--template/vm.inc.tmpl29
-rw-r--r--template/vmtc.inc.tmpl18
-rw-r--r--template/yarvarch.en7
-rw-r--r--template/yarvarch.ja454
-rw-r--r--template/yasmdata.rb.tmpl20
-rw-r--r--test/base64/test_base64.rb99
-rw-r--r--test/bigdecimal/test_bigdecimal.rb694
-rw-r--r--test/cgi/test_cgi_cookie.rb110
-rw-r--r--test/cgi/test_cgi_core.rb363
-rw-r--r--test/cgi/test_cgi_header.rb177
-rw-r--r--test/cgi/test_cgi_modruby.rb145
-rw-r--r--test/cgi/test_cgi_multipart.rb322
-rw-r--r--test/cgi/test_cgi_session.rb173
-rw-r--r--test/cgi/test_cgi_tag_helper.rb341
-rw-r--r--test/cgi/test_cgi_util.rb37
-rw-r--r--test/cgi/testdata/file1.html10
-rw-r--r--test/cgi/testdata/large.pngbin156414 -> 0 bytes-rw-r--r--test/cgi/testdata/small.pngbin82 -> 0 bytes-rw-r--r--test/csv/line_endings.gzbin59 -> 0 bytes-rw-r--r--test/csv/test_csv.rb1753
-rw-r--r--test/csv/test_csv_parsing.rb192
-rw-r--r--test/csv/test_csv_writing.rb97
-rw-r--r--test/csv/test_data_converters.rb261
-rw-r--r--test/csv/test_encodings.rb260
-rw-r--r--test/csv/test_features.rb267
-rw-r--r--test/csv/test_headers.rb288
-rw-r--r--test/csv/test_interface.rb304
-rw-r--r--test/csv/test_row.rb312
-rw-r--r--test/csv/test_serialization.rb156
-rw-r--r--test/csv/test_table.rb408
-rw-r--r--test/csv/ts_all.rb21
-rw-r--r--test/date/test_date.rb144
-rw-r--r--test/date/test_date_arith.rb286
-rw-r--r--test/date/test_date_attr.rb109
-rw-r--r--test/date/test_date_base.rb435
-rw-r--r--test/date/test_date_compat.rb21
-rw-r--r--test/date/test_date_conv.rb137
-rw-r--r--test/date/test_date_marshal.rb29
-rw-r--r--test/date/test_date_new.rb278
-rw-r--r--test/date/test_date_parse.rb988
-rw-r--r--test/date/test_date_strftime.rb388
-rw-r--r--test/date/test_date_strptime.rb469
-rw-r--r--test/dbm/test_dbm.rb94
-rw-r--r--test/digest/test_digest_hmac.rb3
-rw-r--r--test/dl/test_base.rb87
-rw-r--r--test/dl/test_dl2.rb111
-rw-r--r--test/dl/test_func.rb62
-rw-r--r--test/dl/test_import.rb154
-rw-r--r--test/dl/test_win32.rb54
-rw-r--r--test/drb/drbtest.rb45
-rw-r--r--test/drb/test_acl.rb2
-rw-r--r--test/drb/test_drb.rb38
-rw-r--r--test/drb/ut_large.rb2
-rw-r--r--test/drb/ut_safe1.rb2
-rw-r--r--test/drb/ut_timerholder.rb2
-rw-r--r--test/erb/test_erb.rb66
-rw-r--r--test/erb/test_erb_m17n.rb123
-rw-r--r--test/etc/test_etc.rb101
-rw-r--r--test/fileutils/fileasserts.rb39
-rw-r--r--test/fileutils/test_fileutils.rb54
-rw-r--r--test/gdbm/test_gdbm.rb119
-rw-r--r--test/iconv/test_basic.rb7
-rw-r--r--test/iconv/test_option.rb12
-rw-r--r--test/inlinetest.rb55
-rw-r--r--test/io/nonblock/test_flush.rb28
-rw-r--r--test/json/fixtures/fail1.json1
-rw-r--r--test/json/fixtures/fail10.json1
-rw-r--r--test/json/fixtures/fail11.json1
-rw-r--r--test/json/fixtures/fail12.json1
-rw-r--r--test/json/fixtures/fail13.json1
-rw-r--r--test/json/fixtures/fail14.json1
-rw-r--r--test/json/fixtures/fail18.json1
-rw-r--r--test/json/fixtures/fail19.json1
-rw-r--r--test/json/fixtures/fail2.json1
-rw-r--r--test/json/fixtures/fail20.json1
-rw-r--r--test/json/fixtures/fail21.json1
-rw-r--r--test/json/fixtures/fail22.json1
-rw-r--r--test/json/fixtures/fail23.json1
-rw-r--r--test/json/fixtures/fail24.json1
-rw-r--r--test/json/fixtures/fail25.json1
-rw-r--r--test/json/fixtures/fail27.json2
-rw-r--r--test/json/fixtures/fail28.json2
-rw-r--r--test/json/fixtures/fail3.json1
-rw-r--r--test/json/fixtures/fail4.json1
-rw-r--r--test/json/fixtures/fail5.json1
-rw-r--r--test/json/fixtures/fail6.json1
-rw-r--r--test/json/fixtures/fail7.json1
-rw-r--r--test/json/fixtures/fail8.json1
-rw-r--r--test/json/fixtures/fail9.json1
-rw-r--r--test/json/fixtures/pass1.json56
-rw-r--r--test/json/fixtures/pass15.json1
-rw-r--r--test/json/fixtures/pass16.json1
-rw-r--r--test/json/fixtures/pass17.json1
-rw-r--r--test/json/fixtures/pass2.json1
-rw-r--r--test/json/fixtures/pass26.json1
-rw-r--r--test/json/fixtures/pass3.json6
-rwxr-xr-xtest/json/test_json.rb312
-rwxr-xr-xtest/json/test_json_addition.rb164
-rwxr-xr-xtest/json/test_json_fixtures.rb34
-rw-r--r--test/json/test_json_generate.rb106
-rw-r--r--test/json/test_json_rails.rb146
-rwxr-xr-xtest/json/test_json_unicode.rb62
-rw-r--r--test/logger/test_logger.rb10
-rw-r--r--test/matrix/test_matrix.rb49
-rw-r--r--test/matrix/test_vector.rb49
-rw-r--r--test/minitest/test_mini_mock.rb83
-rw-r--r--test/minitest/test_mini_spec.rb169
-rw-r--r--test/minitest/test_mini_test.rb986
-rw-r--r--test/mkmf/base.rb35
-rw-r--r--test/mkmf/test_sizeof.rb12
-rw-r--r--test/monitor/test_monitor.rb2
-rw-r--r--test/net/http/test_http.rb320
-rw-r--r--test/net/http/test_httpheader.rb2
-rw-r--r--test/net/http/test_https.rb97
-rw-r--r--test/net/http/test_https_proxy.rb2
-rw-r--r--test/net/http/utils.rb96
-rw-r--r--test/net/imap/cacert.pem62
-rw-r--r--test/net/imap/server.crt12
-rw-r--r--test/net/imap/server.key15
-rw-r--r--test/net/imap/test_imap.rb352
-rw-r--r--test/net/pop/test_pop.rb132
-rw-r--r--test/nkf/test_kconv.rb97
-rw-r--r--test/nkf/test_nkf.rb6
-rw-r--r--test/openssl/ssl_server.rb2
-rw-r--r--test/openssl/test_asn1.rb2
-rw-r--r--test/openssl/test_cipher.rb2
-rw-r--r--test/openssl/test_ec.rb4
-rw-r--r--test/openssl/test_pair.rb109
-rw-r--r--test/openssl/test_pkcs7.rb16
-rw-r--r--test/openssl/test_ssl.rb129
-rw-r--r--test/openssl/test_x509cert.rb36
-rw-r--r--test/openssl/test_x509crl.rb6
-rw-r--r--test/openssl/test_x509store.rb4
-rw-r--r--test/openssl/utils.rb6
-rw-r--r--test/optparse/test_noarg.rb12
-rw-r--r--test/optparse/test_optparse.rb2
-rw-r--r--test/optparse/test_placearg.rb8
-rw-r--r--test/optparse/test_reqarg.rb18
-rw-r--r--test/optparse/test_summary.rb23
-rw-r--r--test/ostruct/test_ostruct.rb28
-rw-r--r--test/pathname/test_pathname.rb138
-rw-r--r--test/rdoc/binary.datbin1024 -> 0 bytes-rw-r--r--test/rdoc/parsers/test_parse_c.rb261
-rw-r--r--test/rdoc/rdoc_markup_to_html_crossref_reference.rb31
-rw-r--r--test/rdoc/test_attribute_manager.rb76
-rw-r--r--test/rdoc/test_rdoc_info_formatting.rb179
-rw-r--r--test/rdoc/test_rdoc_info_sections.rb139
-rw-r--r--test/rdoc/test_rdoc_markup.rb615
-rw-r--r--test/rdoc/test_rdoc_markup_attribute_manager.rb234
-rw-r--r--test/rdoc/test_rdoc_markup_to_html.rb45
-rw-r--r--test/rdoc/test_rdoc_markup_to_html_crossref.rb299
-rw-r--r--test/rdoc/test_rdoc_parser.rb25
-rw-r--r--test/rdoc/test_rdoc_parser_c.rb287
-rw-r--r--test/rdoc/test_rdoc_parser_perl.rb74
-rw-r--r--test/rdoc/test_rdoc_parser_ruby.rb751
-rw-r--r--test/rdoc/test_rdoc_ri_attribute_formatter.rb44
-rw-r--r--test/rdoc/test_rdoc_ri_default_display.rb301
-rw-r--r--test/rdoc/test_rdoc_ri_driver.rb94
-rw-r--r--test/rdoc/test_rdoc_ri_formatter.rb320
-rw-r--r--test/rdoc/test_rdoc_ri_overstrike_formatter.rb71
-rw-r--r--test/readline/test_readline.rb310
-rw-r--r--test/readline/test_readline_history.rb327
-rw-r--r--test/rexml/test_document.rb66
-rw-r--r--test/rinda/test_rinda.rb69
-rw-r--r--test/rinda/test_tuplebag.rb172
-rw-r--r--test/ripper/dummyparser.rb571
-rw-r--r--test/ripper/test_files.rb28
-rw-r--r--test/ripper/test_filter.rb54
-rw-r--r--test/ripper/test_parser_events.rb498
-rw-r--r--test/ripper/test_scanner_events.rb812
-rw-r--r--test/rss/dot.pngbin111 -> 0 bytes-rw-r--r--test/rss/rss-assertions.rb96
-rw-r--r--test/rss/rss-testcase.rb10
-rw-r--r--test/rss/test_1.0.rb90
-rw-r--r--test/rss/test_2.0.rb60
-rw-r--r--test/rss/test_accessor.rb32
-rw-r--r--test/rss/test_atom.rb17
-rw-r--r--test/rss/test_content.rb8
-rw-r--r--test/rss/test_maker_0.9.rb51
-rw-r--r--test/rss/test_maker_1.0.rb76
-rw-r--r--test/rss/test_maker_2.0.rb138
-rw-r--r--test/rss/test_maker_atom_entry.rb26
-rw-r--r--test/rss/test_maker_atom_feed.rb65
-rw-r--r--test/rss/test_maker_content.rb2
-rw-r--r--test/rss/test_maker_dc.rb13
-rw-r--r--test/rss/test_maker_image.rb4
-rw-r--r--test/rss/test_maker_itunes.rb2
-rw-r--r--test/rss/test_maker_sy.rb4
-rw-r--r--test/rss/test_maker_taxo.rb6
-rw-r--r--test/rss/test_maker_trackback.rb2
-rw-r--r--test/rss/test_maker_xml-stylesheet.rb6
-rw-r--r--test/rss/test_parser_1.0.rb19
-rw-r--r--test/rss/test_setup_maker_0.9.rb24
-rw-r--r--test/rss/test_setup_maker_1.0.rb84
-rw-r--r--test/rss/test_setup_maker_2.0.rb42
-rw-r--r--test/rss/test_setup_maker_atom_feed.rb2
-rw-r--r--test/rss/test_syndication.rb36
-rw-r--r--test/rss/test_taxonomy.rb14
-rw-r--r--test/rss/test_to_s.rb56
-rw-r--r--test/rss/test_trackback.rb28
-rw-r--r--test/rss/test_version.rb2
-rw-r--r--test/rss/test_xml-stylesheet.rb12
-rw-r--r--test/ruby/allpairs.rb103
-rw-r--r--test/ruby/beginmainend.rb2
-rw-r--r--test/ruby/enc/test_big5.rb28
-rw-r--r--test/ruby/enc/test_cp949.rb28
-rw-r--r--test/ruby/enc/test_euc_jp.rb24
-rw-r--r--test/ruby/enc/test_euc_kr.rb28
-rw-r--r--test/ruby/enc/test_euc_tw.rb28
-rw-r--r--test/ruby/enc/test_gb18030.rb125
-rw-r--r--test/ruby/enc/test_gbk.rb28
-rw-r--r--test/ruby/enc/test_iso_8859.rb163
-rw-r--r--test/ruby/enc/test_koi8.rb22
-rw-r--r--test/ruby/enc/test_shift_jis.rb27
-rw-r--r--test/ruby/enc/test_utf16.rb384
-rw-r--r--test/ruby/enc/test_utf32.rb93
-rw-r--r--test/ruby/enc/test_windows_1251.rb16
-rw-r--r--test/ruby/endblockwarn.rb (renamed from test/ruby/endblockwarn_rb)0
-rw-r--r--test/ruby/envutil.rb154
-rw-r--r--test/ruby/lbtest.rb48
-rw-r--r--test/ruby/marshaltestlib.rb44
-rw-r--r--test/ruby/sentence.rb668
-rw-r--r--test/ruby/suicide.rb2
-rw-r--r--test/ruby/test_alias.rb72
-rw-r--r--test/ruby/test_argf.rb688
-rw-r--r--test/ruby/test_array.rb543
-rw-r--r--test/ruby/test_assignment.rb702
-rw-r--r--test/ruby/test_basicinstructions.rb680
-rw-r--r--test/ruby/test_beginendblock.rb59
-rw-r--r--test/ruby/test_bignum.rb324
-rw-r--r--test/ruby/test_call.rb4
-rw-r--r--test/ruby/test_case.rb11
-rw-r--r--test/ruby/test_class.rb154
-rw-r--r--test/ruby/test_clone.rb2
-rw-r--r--test/ruby/test_comparable.rb66
-rw-r--r--test/ruby/test_complex.rb1084
-rw-r--r--test/ruby/test_complex2.rb735
-rw-r--r--test/ruby/test_complexrational.rb407
-rw-r--r--test/ruby/test_const.rb27
-rw-r--r--test/ruby/test_continuation.rb81
-rw-r--r--test/ruby/test_defined.rb42
-rw-r--r--test/ruby/test_dir.rb150
-rw-r--r--test/ruby/test_econv.rb889
-rw-r--r--test/ruby/test_encoding.rb78
-rw-r--r--test/ruby/test_enum.rb60
-rw-r--r--test/ruby/test_enumerator.rb242
-rw-r--r--test/ruby/test_env.rb303
-rw-r--r--test/ruby/test_eval.rb333
-rw-r--r--test/ruby/test_exception.rb62
-rw-r--r--test/ruby/test_fiber.rb182
-rw-r--r--test/ruby/test_file.rb160
-rw-r--r--test/ruby/test_file_exhaustive.rb753
-rw-r--r--test/ruby/test_fixnum.rb206
-rw-r--r--test/ruby/test_float.rb323
-rw-r--r--test/ruby/test_fnmatch.rb104
-rw-r--r--test/ruby/test_gc.rb24
-rw-r--r--test/ruby/test_hash.rb289
-rw-r--r--test/ruby/test_integer.rb700
-rw-r--r--test/ruby/test_integer_comb.rb620
-rw-r--r--test/ruby/test_io.rb1467
-rw-r--r--test/ruby/test_io_m17n.rb1709
-rw-r--r--test/ruby/test_iterator.rb110
-rw-r--r--test/ruby/test_lambda.rb68
-rw-r--r--test/ruby/test_literal.rb245
-rw-r--r--test/ruby/test_m17n.rb1324
-rw-r--r--test/ruby/test_m17n_comb.rb1634
-rw-r--r--test/ruby/test_marshal.rb177
-rw-r--r--test/ruby/test_math.rb251
-rw-r--r--test/ruby/test_metaclass.rb167
-rw-r--r--test/ruby/test_method.rb265
-rw-r--r--test/ruby/test_mixed_unicode_escapes.rb25
-rw-r--r--test/ruby/test_module.rb758
-rw-r--r--test/ruby/test_notimp.rb64
-rw-r--r--test/ruby/test_numeric.rb222
-rw-r--r--test/ruby/test_object.rb452
-rw-r--r--test/ruby/test_objectspace.rb31
-rw-r--r--test/ruby/test_optimization.rb140
-rw-r--r--test/ruby/test_pack.rb450
-rw-r--r--test/ruby/test_parse.rb826
-rw-r--r--test/ruby/test_path.rb29
-rw-r--r--test/ruby/test_pipe.rb4
-rw-r--r--test/ruby/test_primitive.rb397
-rw-r--r--test/ruby/test_proc.rb690
-rw-r--r--test/ruby/test_process.rb1129
-rw-r--r--test/ruby/test_rand.rb419
-rw-r--r--test/ruby/test_range.rb279
-rw-r--r--test/ruby/test_rational.rb1088
-rw-r--r--test/ruby/test_rational2.rb1386
-rw-r--r--test/ruby/test_readpartial.rb14
-rw-r--r--test/ruby/test_regexp.rb789
-rw-r--r--test/ruby/test_require.rb247
-rw-r--r--test/ruby/test_rubyoptions.rb294
-rw-r--r--test/ruby/test_settracefunc.rb384
-rw-r--r--test/ruby/test_signal.rb138
-rw-r--r--test/ruby/test_sleep.rb13
-rw-r--r--test/ruby/test_sprintf.rb282
-rw-r--r--test/ruby/test_sprintf_comb.rb553
-rw-r--r--test/ruby/test_string.rb1790
-rw-r--r--test/ruby/test_stringchar.rb10
-rw-r--r--test/ruby/test_struct.rb198
-rw-r--r--test/ruby/test_super.rb14
-rw-r--r--test/ruby/test_symbol.rb45
-rw-r--r--test/ruby/test_system.rb118
-rw-r--r--test/ruby/test_thread.rb529
-rw-r--r--test/ruby/test_time.rb450
-rw-r--r--test/ruby/test_trace.rb34
-rw-r--r--test/ruby/test_transcode.rb1877
-rw-r--r--test/ruby/test_unicode_escape.rb267
-rw-r--r--test/ruby/test_variable.rb39
-rw-r--r--test/ruby/test_whileuntil.rb111
-rw-r--r--test/ruby/test_yield.rb366
-rw-r--r--test/ruby/ut_eof.rb12
-rw-r--r--test/rubygems/bogussources.rb8
-rw-r--r--test/rubygems/data/gem-private_key.pem27
-rw-r--r--test/rubygems/data/gem-public_cert.pem20
-rw-r--r--test/rubygems/fake_certlib/openssl.rb7
-rw-r--r--test/rubygems/functional.rb99
-rw-r--r--test/rubygems/gem_installer_test_case.rb97
-rw-r--r--test/rubygems/gem_package_tar_test_case.rb132
-rw-r--r--test/rubygems/gemutilities.rb580
-rw-r--r--test/rubygems/insure_session.rb51
-rw-r--r--test/rubygems/mockgemui.rb64
-rw-r--r--test/rubygems/private_key.pem27
-rw-r--r--test/rubygems/public_cert.pem20
-rw-r--r--test/rubygems/rubygems_plugin.rb16
-rw-r--r--test/rubygems/simple_gem.rb72
-rw-r--r--test/rubygems/test_config.rb19
-rw-r--r--test/rubygems/test_gem.rb673
-rw-r--r--test/rubygems/test_gem_builder.rb33
-rw-r--r--test/rubygems/test_gem_command.rb185
-rw-r--r--test/rubygems/test_gem_command_manager.rb199
-rw-r--r--test/rubygems/test_gem_commands_build_command.rb74
-rw-r--r--test/rubygems/test_gem_commands_cert_command.rb125
-rw-r--r--test/rubygems/test_gem_commands_check_command.rb24
-rw-r--r--test/rubygems/test_gem_commands_contents_command.rb154
-rw-r--r--test/rubygems/test_gem_commands_dependency_command.rb226
-rw-r--r--test/rubygems/test_gem_commands_environment_command.rb133
-rw-r--r--test/rubygems/test_gem_commands_fetch_command.rb54
-rw-r--r--test/rubygems/test_gem_commands_generate_index_command.rb135
-rw-r--r--test/rubygems/test_gem_commands_install_command.rb264
-rw-r--r--test/rubygems/test_gem_commands_list_command.rb36
-rw-r--r--test/rubygems/test_gem_commands_lock_command.rb68
-rw-r--r--test/rubygems/test_gem_commands_mirror_command.rb60
-rw-r--r--test/rubygems/test_gem_commands_outdated_command.rb42
-rw-r--r--test/rubygems/test_gem_commands_pristine_command.rb108
-rw-r--r--test/rubygems/test_gem_commands_query_command.rb432
-rw-r--r--test/rubygems/test_gem_commands_server_command.rb52
-rw-r--r--test/rubygems/test_gem_commands_sources_command.rb278
-rw-r--r--test/rubygems/test_gem_commands_specification_command.rb140
-rw-r--r--test/rubygems/test_gem_commands_stale_command.rb38
-rw-r--r--test/rubygems/test_gem_commands_uninstall_command.rb62
-rw-r--r--test/rubygems/test_gem_commands_unpack_command.rb115
-rw-r--r--test/rubygems/test_gem_commands_update_command.rb169
-rw-r--r--test/rubygems/test_gem_config_file.rb279
-rw-r--r--test/rubygems/test_gem_dependency.rb190
-rw-r--r--test/rubygems/test_gem_dependency_installer.rb651
-rw-r--r--test/rubygems/test_gem_dependency_list.rb209
-rwxr-xr-xtest/rubygems/test_gem_digest.rb46
-rw-r--r--test/rubygems/test_gem_doc_manager.rb37
-rw-r--r--test/rubygems/test_gem_ext_configure_builder.rb84
-rw-r--r--test/rubygems/test_gem_ext_ext_conf_builder.rb127
-rw-r--r--test/rubygems/test_gem_ext_rake_builder.rb81
-rw-r--r--test/rubygems/test_gem_format.rb67
-rw-r--r--test/rubygems/test_gem_gem_path_searcher.rb67
-rw-r--r--test/rubygems/test_gem_gem_runner.rb45
-rw-r--r--test/rubygems/test_gem_indexer.rb641
-rw-r--r--test/rubygems/test_gem_install_update_options.rb74
-rw-r--r--test/rubygems/test_gem_installer.rb917
-rw-r--r--test/rubygems/test_gem_local_remote_options.rb97
-rw-r--r--test/rubygems/test_gem_package_tar_header.rb137
-rw-r--r--test/rubygems/test_gem_package_tar_input.rb119
-rw-r--r--test/rubygems/test_gem_package_tar_output.rb104
-rw-r--r--test/rubygems/test_gem_package_tar_reader.rb53
-rw-r--r--test/rubygems/test_gem_package_tar_reader_entry.rb116
-rw-r--r--test/rubygems/test_gem_package_tar_writer.rb151
-rw-r--r--test/rubygems/test_gem_package_task.rb70
-rw-r--r--test/rubygems/test_gem_platform.rb245
-rw-r--r--test/rubygems/test_gem_remote_fetcher.rb730
-rw-r--r--test/rubygems/test_gem_requirement.rb222
-rw-r--r--test/rubygems/test_gem_server.rb310
-rw-r--r--test/rubygems/test_gem_source_index.rb469
-rw-r--r--test/rubygems/test_gem_source_info_cache.rb447
-rw-r--r--test/rubygems/test_gem_source_info_cache_entry.rb78
-rw-r--r--test/rubygems/test_gem_spec_fetcher.rb384
-rw-r--r--test/rubygems/test_gem_specification.rb1257
-rw-r--r--test/rubygems/test_gem_stream_ui.rb116
-rw-r--r--test/rubygems/test_gem_uninstaller.rb147
-rw-r--r--test/rubygems/test_gem_validator.rb69
-rw-r--r--test/rubygems/test_gem_version.rb316
-rw-r--r--test/rubygems/test_gem_version_option.rb89
-rw-r--r--test/rubygems/test_kernel.rb65
-rw-r--r--test/runner.rb26
-rw-r--r--test/scanf/data.txt6
-rw-r--r--test/scanf/test_scanf.rb320
-rw-r--r--test/scanf/test_scanfblocks.rb81
-rw-r--r--test/scanf/test_scanfio.rb19
-rw-r--r--test/sdbm/test_sdbm.rb92
-rw-r--r--test/soap/asp.net/hello.wsdl96
-rw-r--r--test/soap/asp.net/test_aspdotnet.rb111
-rw-r--r--test/soap/calc/calc.rb17
-rw-r--r--test/soap/calc/calc2.rb29
-rw-r--r--test/soap/calc/server.cgi13
-rw-r--r--test/soap/calc/server.rb17
-rw-r--r--test/soap/calc/server2.rb20
-rw-r--r--test/soap/calc/test_calc.rb49
-rw-r--r--test/soap/calc/test_calc2.rb53
-rw-r--r--test/soap/calc/test_calc_cgi.rb69
-rw-r--r--test/soap/fault/test_customfault.rb58
-rw-r--r--test/soap/header/server.cgi119
-rw-r--r--test/soap/header/test_authheader.rb240
-rw-r--r--test/soap/header/test_authheader_cgi.rb121
-rw-r--r--test/soap/header/test_simplehandler.rb116
-rw-r--r--test/soap/helloworld/hw_s.rb16
-rw-r--r--test/soap/helloworld/test_helloworld.rb40
-rw-r--r--test/soap/marshal/test_digraph.rb56
-rw-r--r--test/soap/marshal/test_marshal.rb26
-rw-r--r--test/soap/marshal/test_struct.rb47
-rw-r--r--test/soap/ssl/README1
-rw-r--r--test/soap/ssl/ca.cert23
-rw-r--r--test/soap/ssl/client.cert19
-rw-r--r--test/soap/ssl/client.key15
-rw-r--r--test/soap/ssl/server.cert19
-rw-r--r--test/soap/ssl/server.key15
-rw-r--r--test/soap/ssl/sslsvr.rb57
-rw-r--r--test/soap/ssl/subca.cert21
-rw-r--r--test/soap/ssl/test_ssl.rb204
-rw-r--r--test/soap/struct/test_struct.rb77
-rw-r--r--test/soap/swa/test_file.rb73
-rw-r--r--test/soap/test_basetype.rb970
-rw-r--r--test/soap/test_envelopenamespace.rb92
-rw-r--r--test/soap/test_httpconfigloader.rb39
-rw-r--r--test/soap/test_mapping.rb59
-rw-r--r--test/soap/test_no_indent.rb86
-rw-r--r--test/soap/test_property.rb424
-rw-r--r--test/soap/test_soapelement.rb122
-rw-r--r--test/soap/test_streamhandler.rb209
-rw-r--r--test/soap/test_styleuse.rb333
-rw-r--r--test/soap/wsdlDriver/README.txt2
-rw-r--r--test/soap/wsdlDriver/calc.wsdl126
-rw-r--r--test/soap/wsdlDriver/document.wsdl54
-rw-r--r--test/soap/wsdlDriver/echo_version.rb20
-rw-r--r--test/soap/wsdlDriver/simpletype.wsdl63
-rw-r--r--test/soap/wsdlDriver/test_calc.rb100
-rw-r--r--test/soap/wsdlDriver/test_document.rb78
-rw-r--r--test/soap/wsdlDriver/test_simpletype.rb87
-rw-r--r--test/socket/test_addrinfo.rb615
-rw-r--r--test/socket/test_ancdata.rb66
-rw-r--r--test/socket/test_basicsocket.rb88
-rw-r--r--test/socket/test_nonblock.rb149
-rw-r--r--test/socket/test_socket.rb425
-rw-r--r--test/socket/test_sockopt.rb33
-rw-r--r--test/socket/test_tcp.rb42
-rw-r--r--test/socket/test_udp.rb39
-rw-r--r--test/socket/test_unix.rb337
-rw-r--r--test/stringio/test_stringio.rb397
-rw-r--r--test/strscan/test_stringscanner.rb214
-rw-r--r--test/test_delegate.rb32
-rw-r--r--test/test_ipaddr.rb4
-rw-r--r--test/test_open3.rb243
-rw-r--r--test/test_pp.rb180
-rw-r--r--test/test_prettyprint.rb515
-rw-r--r--test/test_prime.rb146
-rw-r--r--test/test_pstore.rb74
-rw-r--r--test/test_pty.rb109
-rw-r--r--test/test_set.rb4
-rw-r--r--test/test_shellwords.rb39
-rw-r--r--test/test_singleton.rb15
-rw-r--r--test/test_syslog.rb166
-rw-r--r--test/test_tempfile.rb288
-rw-r--r--test/test_time.rb389
-rw-r--r--test/test_timeout.rb26
-rw-r--r--test/test_tsort.rb44
-rw-r--r--test/testunit/collector/test_dir.rb406
-rw-r--r--test/testunit/collector/test_objectspace.rb98
-rw-r--r--test/testunit/runit/test_assert.rb402
-rw-r--r--test/testunit/runit/test_testcase.rb91
-rw-r--r--test/testunit/runit/test_testresult.rb144
-rw-r--r--test/testunit/runit/test_testsuite.rb49
-rw-r--r--test/testunit/test_assertions.rb528
-rw-r--r--test/testunit/test_error.rb26
-rw-r--r--test/testunit/test_failure.rb33
-rw-r--r--test/testunit/test_testcase.rb275
-rw-r--r--test/testunit/test_testresult.rb104
-rw-r--r--test/testunit/test_testsuite.rb129
-rw-r--r--test/testunit/util/test_backtracefilter.rb41
-rw-r--r--test/testunit/util/test_observable.rb102
-rw-r--r--test/testunit/util/test_procwrapper.rb36
-rwxr-xr-xtest/thread/lbtest.rb51
-rw-r--r--test/thread/test_thread.rb81
-rw-r--r--test/uri/test_common.rb14
-rw-r--r--test/uri/test_ftp.rb16
-rw-r--r--test/uri/test_generic.rb64
-rw-r--r--test/uri/test_http.rb4
-rw-r--r--test/uri/test_ldap.rb26
-rw-r--r--test/uri/test_mailto.rb26
-rw-r--r--test/uri/test_parser.rb41
-rw-r--r--test/webrick/test_cgi.rb66
-rw-r--r--test/webrick/test_filehandler.rb68
-rw-r--r--test/webrick/test_httpauth.rb24
-rw-r--r--test/webrick/test_httpproxy.rb281
-rw-r--r--test/webrick/test_httprequest.rb83
-rw-r--r--test/webrick/test_httpserver.rb26
-rw-r--r--test/webrick/test_httputils.rb36
-rw-r--r--test/webrick/test_server.rb20
-rw-r--r--test/webrick/test_utils.rb64
-rw-r--r--test/webrick/utils.rb23
-rw-r--r--test/win32ole/err_in_callback.rb9
-rw-r--r--test/win32ole/orig_data.csv5
-rw-r--r--test/win32ole/test_err_in_callback.rb44
-rw-r--r--test/win32ole/test_folderitem2_invokeverb.rb89
-rw-r--r--test/win32ole/test_nil2vtempty.rb36
-rw-r--r--test/win32ole/test_ole_methods.rb36
-rw-r--r--test/win32ole/test_propertyputref.rb30
-rw-r--r--test/win32ole/test_win32ole.rb509
-rw-r--r--test/win32ole/test_win32ole_event.rb334
-rw-r--r--test/win32ole/test_win32ole_method.rb141
-rw-r--r--test/win32ole/test_win32ole_param.rb91
-rw-r--r--test/win32ole/test_win32ole_type.rb249
-rw-r--r--test/win32ole/test_win32ole_typelib.rb110
-rw-r--r--test/win32ole/test_win32ole_variable.rb61
-rw-r--r--test/win32ole/test_win32ole_variant.rb661
-rw-r--r--test/win32ole/test_win32ole_variant_m.rb35
-rw-r--r--test/win32ole/test_win32ole_variant_outarg.rb69
-rw-r--r--test/win32ole/test_word.rb72
-rw-r--r--test/wsdl/any/any.wsdl50
-rw-r--r--test/wsdl/any/expectedDriver.rb54
-rw-r--r--test/wsdl/any/expectedEcho.rb14
-rw-r--r--test/wsdl/any/expectedService.rb52
-rw-r--r--test/wsdl/any/test_any.rb58
-rw-r--r--test/wsdl/axisArray/axisArray.wsdl60
-rw-r--r--test/wsdl/axisArray/itemList.rb27
-rw-r--r--test/wsdl/axisArray/test_axisarray.rb69
-rw-r--r--test/wsdl/datetime/DatetimeService.rb44
-rw-r--r--test/wsdl/datetime/datetime.rb (renamed from test/rdoc/empty.dat)0
-rw-r--r--test/wsdl/datetime/datetime.wsdl45
-rw-r--r--test/wsdl/datetime/datetimeServant.rb21
-rw-r--r--test/wsdl/datetime/test_datetime.rb82
-rw-r--r--test/wsdl/document/document.wsdl74
-rw-r--r--test/wsdl/document/echo.rb92
-rw-r--r--test/wsdl/document/number.wsdl54
-rw-r--r--test/wsdl/document/ping_nosoapaction.wsdl66
-rw-r--r--test/wsdl/document/test_nosoapaction.rb109
-rw-r--r--test/wsdl/document/test_number.rb99
-rw-r--r--test/wsdl/document/test_rpc.rb177
-rw-r--r--test/wsdl/emptycomplextype.wsdl31
-rw-r--r--test/wsdl/map/map.wsdl92
-rw-r--r--test/wsdl/map/map.xml43
-rw-r--r--test/wsdl/map/test_map.rb99
-rw-r--r--test/wsdl/marshal/person.wsdl21
-rw-r--r--test/wsdl/marshal/person_org.rb22
-rw-r--r--test/wsdl/marshal/test_wsdlmarshal.rb80
-rw-r--r--test/wsdl/multiplefault.wsdl68
-rw-r--r--test/wsdl/qualified/lp.rb (renamed from test/rubygems/foo/discover.rb)0
-rw-r--r--test/wsdl/qualified/lp.wsdl47
-rw-r--r--test/wsdl/qualified/lp.xsd26
-rw-r--r--test/wsdl/qualified/np.wsdl50
-rw-r--r--test/wsdl/qualified/test_qualified.rb154
-rw-r--r--test/wsdl/qualified/test_unqualified.rb143
-rw-r--r--test/wsdl/raa/RAA.rb243
-rw-r--r--test/wsdl/raa/RAAServant.rb99
-rw-r--r--test/wsdl/raa/RAAService.rb100
-rw-r--r--test/wsdl/raa/README.txt8
-rw-r--r--test/wsdl/raa/raa.wsdl264
-rw-r--r--test/wsdl/raa/server.rb103
-rw-r--r--test/wsdl/raa/test_raa.rb71
-rw-r--r--test/wsdl/ref/expectedProduct.rb90
-rw-r--r--test/wsdl/ref/product.wsdl86
-rw-r--r--test/wsdl/ref/test_ref.rb54
-rw-r--r--test/wsdl/rpc/echoDriver.rb55
-rw-r--r--test/wsdl/rpc/echo_serviceClient.rb23
-rw-r--r--test/wsdl/rpc/rpc.wsdl75
-rw-r--r--test/wsdl/rpc/test-rpc-lit.wsdl364
-rw-r--r--test/wsdl/rpc/test-rpc-lit12.wsdl455
-rw-r--r--test/wsdl/rpc/test_rpc.rb118
-rw-r--r--test/wsdl/rpc/test_rpc_lit.rb399
-rw-r--r--test/wsdl/simpletype/rpc/expectedClient.rb34
-rw-r--r--test/wsdl/simpletype/rpc/expectedDriver.rb62
-rw-r--r--test/wsdl/simpletype/rpc/expectedEchoVersion.rb23
-rw-r--r--test/wsdl/simpletype/rpc/expectedServant.rb32
-rw-r--r--test/wsdl/simpletype/rpc/expectedService.rb60
-rw-r--r--test/wsdl/simpletype/rpc/rpc.wsdl80
-rw-r--r--test/wsdl/simpletype/rpc/test_rpc.rb62
-rw-r--r--test/wsdl/simpletype/simpletype.wsdl95
-rw-r--r--test/wsdl/simpletype/test_simpletype.rb99
-rw-r--r--test/wsdl/soap/soapbodyparts.wsdl103
-rw-r--r--test/wsdl/soap/test_soapbodyparts.rb79
-rw-r--r--test/wsdl/test_emptycomplextype.rb21
-rw-r--r--test/wsdl/test_fault.rb51
-rw-r--r--test/wsdl/test_multiplefault.rb39
-rw-r--r--test/xmlrpc/test_datetime.rb64
-rw-r--r--test/xmlrpc/test_features.rb6
-rw-r--r--test/xmlrpc/test_marshal.rb6
-rw-r--r--test/xmlrpc/test_parser.rb12
-rw-r--r--test/xmlrpc/test_webrick_server.rb10
-rw-r--r--test/xmlrpc/webrick_testing.rb13
-rw-r--r--test/xsd/codegen/test_classdef.rb214
-rw-r--r--test/xsd/noencoding.xml4
-rw-r--r--test/xsd/test_noencoding.rb32
-rw-r--r--test/xsd/test_xmlschemaparser.rb22
-rw-r--r--test/xsd/test_xsd.rb1511
-rw-r--r--test/xsd/xmlschema.xml12
-rw-r--r--test/yaml/test_yaml.rb120
-rw-r--r--test/yaml/test_yamlstore.rb12
-rw-r--r--test/zlib/test_zlib.rb645
-rw-r--r--thread.c4108
-rw-r--r--thread_pthread.c857
-rw-r--r--thread_pthread.h24
-rw-r--r--thread_win32.c573
-rw-r--r--thread_win32.h33
-rw-r--r--time.c3856
-rw-r--r--timev.h21
-rwxr-xr-xtool/asm_parse.rb51
-rwxr-xr-xtool/build-transcode16
-rwxr-xr-xtool/compile_prelude.rb120
-rwxr-xr-xtool/config.guess1532
-rwxr-xr-xtool/config.sub1658
-rwxr-xr-xtool/enc-unicode.rb230
-rwxr-xr-xtool/eval.rb161
-rwxr-xr-xtool/file2lastrev.rb92
-rwxr-xr-xtool/generic_erb.rb34
-rwxr-xr-xtool/ifchange48
-rwxr-xr-xtool/insns2vm.rb15
-rwxr-xr-xtool/instruction.rb1388
-rwxr-xr-xtool/make-snapshot218
-rwxr-xr-xtool/mdoc2man.rb465
-rwxr-xr-xtool/mkconfig.rb226
-rwxr-xr-xtool/node_name.rb4
-rwxr-xr-xtool/parse.rb13
-rwxr-xr-xtool/rbinstall.rb551
-rwxr-xr-xtool/rmdirs11
-rwxr-xr-xtool/rubytest.rb28
-rwxr-xr-xtool/runruby.rb95
-rwxr-xr-xtool/strip-rdoc.rb22
-rwxr-xr-xtool/transcode-tblgen.rb854
-rwxr-xr-xtool/vtlh.rb15
-rwxr-xr-xtool/ytab.sed31
-rw-r--r--transcode.c4218
-rw-r--r--transcode_data.h106
-rw-r--r--util.c565
-rw-r--r--util.h67
-rw-r--r--variable.c1378
-rw-r--r--version.c84
-rw-r--r--version.h73
-rw-r--r--vm.c2108
-rw-r--r--vm_core.h656
-rw-r--r--vm_dump.c613
-rw-r--r--vm_eval.c1583
-rw-r--r--vm_exec.c156
-rw-r--r--vm_exec.h184
-rw-r--r--vm_insnhelper.c1648
-rw-r--r--vm_insnhelper.h207
-rw-r--r--vm_method.c1215
-rw-r--r--vm_opts.h51
-rw-r--r--vms/config.h102
-rw-r--r--vms/vms.h10
-rw-r--r--vms/vmsruby_private.c52
-rw-r--r--vms/vmsruby_private.h7
-rw-r--r--win32/Makefile.sub500
-rw-r--r--win32/README.win3257
-rwxr-xr-xwin32/configure.bat87
-rw-r--r--win32/dir.h12
-rw-r--r--win32/enc-setup.mak10
-rwxr-xr-xwin32/ifchange.bat59
-rwxr-xr-xwin32/mkexports.rb178
-rwxr-xr-xwin32/resource.rb30
-rwxr-xr-xwin32/rm.bat11
-rwxr-xr-xwin32/rmdirs.bat29
-rw-r--r--win32/setup.mak100
-rw-r--r--win32/win32.c3247
-rw-r--r--win32/win32.h556
-rw-r--r--win32/winmain.c4
-rw-r--r--wince/Makefile.sub46
-rw-r--r--wince/README.wince121
-rw-r--r--wince/assert.c11
-rw-r--r--wince/assert.h6
-rwxr-xr-xwince/configure.bat102
-rw-r--r--wince/direct.c54
-rw-r--r--wince/direct.h22
-rw-r--r--wince/errno.c11
-rw-r--r--wince/errno.h55
-rw-r--r--wince/fcntl.h42
-rw-r--r--wince/io.h76
-rw-r--r--wince/io_wce.c230
-rw-r--r--wince/process.h46
-rw-r--r--wince/process_wce.c47
-rw-r--r--wince/setup.mak245
-rw-r--r--wince/signal.h71
-rw-r--r--wince/signal_wce.c26
-rw-r--r--wince/stddef.h5
-rw-r--r--wince/stdio.c36
-rw-r--r--wince/stdlib.c57
-rw-r--r--wince/string_wce.c89
-rw-r--r--wince/sys/stat.c102
-rw-r--r--wince/sys/stat.h68
-rw-r--r--wince/sys/timeb.c25
-rw-r--r--wince/sys/timeb.h26
-rw-r--r--wince/sys/types.h60
-rw-r--r--wince/sys/utime.c44
-rw-r--r--wince/sys/utime.h27
-rw-r--r--wince/time.h63
-rw-r--r--wince/time_wce.c301
-rw-r--r--wince/varargs.h34
-rw-r--r--wince/wince.c583
-rw-r--r--wince/wince.h191
-rw-r--r--wince/wincemain.c19
-rw-r--r--wince/wincon.h7
-rw-r--r--wince/winsock2.c338
-rw-r--r--x68/_dtos18.c250
-rw-r--r--x68/_round.c45
-rw-r--r--x68/fconvert.c81
-rw-r--r--x68/select.c167
2755 files changed, 177875 insertions, 700795 deletions
diff --git a/.cvsignore b/.cvsignore
index 76c9bc0b78..a72211d03f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -14,7 +14,6 @@
COPYING.LIB
ChangeLog.pre-alpha
ChangeLog.pre1_1
-ChangeLog-1.8.0
Makefile
README.fat-patch
README.v6
@@ -35,12 +34,9 @@ newdate.rb
newver.rb
parse.c
patches
-patches-master
-pitest.rb
ppack
preview
rbconfig.rb
-rename2.h
repack
riscos
rubicon
diff --git a/.gdbinit b/.gdbinit
deleted file mode 100644
index a542b71ba0..0000000000
--- a/.gdbinit
+++ /dev/null
@@ -1,654 +0,0 @@
-define rp
- if ruby_dummy_gdb_enums.special_consts
- end
- if (VALUE)($arg0) & RUBY_FIXNUM_FLAG
- printf "FIXNUM: %ld\n", (long)($arg0) >> 1
- else
- if ((VALUE)($arg0) & ~(~(VALUE)0<<RUBY_SPECIAL_SHIFT)) == RUBY_SYMBOL_FLAG
- set $id = (($arg0) >> RUBY_SPECIAL_SHIFT)
- if $id == '!' || $id == '+' || $id == '-' || $id == '*' || $id == '/' || $id == '%' || $id == '<' || $id == '>' || $id == '`'
- printf "SYMBOL(:%c)\n", $id
- else
- if $id == idDot2
- echo SYMBOL(:..)\n
- else
- if $id == idDot3
- echo SYMBOL(:...)\n
- else
- if $id == idUPlus
- echo SYMBOL(:+@)\n
- else
- if $id == idUMinus
- echo SYMBOL(:-@)\n
- else
- if $id == idPow
- echo SYMBOL(:**)\n
- else
- if $id == idCmp
- echo SYMBOL(:<=>)\n
- else
- if $id == idLTLT
- echo SYMBOL(:<<)\n
- else
- if $id == idLE
- echo SYMBOL(:<=)\n
- else
- if $id == idGE
- echo SYMBOL(:>=)\n
- else
- if $id == idEq
- echo SYMBOL(:==)\n
- else
- if $id == idEqq
- echo SYMBOL(:===)\n
- else
- if $id == idNeq
- echo SYMBOL(:!=)\n
- else
- if $id == idEqTilde
- echo SYMBOL(:=~)\n
- else
- if $id == idNeqTilde
- echo SYMBOL(:!~)\n
- else
- if $id == idAREF
- echo SYMBOL(:[])\n
- else
- if $id == idASET
- echo SYMBOL(:[]=)\n
- else
- printf "SYMBOL(%ld)\n", $id
- end
- end
- end
- end
- end
- end
- end
- end
- end
- end
- end
- end
- end
- end
- end
- end
- end
- else
- if ($arg0) == RUBY_Qfalse
- echo false\n
- else
- if ($arg0) == RUBY_Qtrue
- echo true\n
- else
- if ($arg0) == RUBY_Qnil
- echo nil\n
- else
- if ($arg0) == RUBY_Qundef
- echo undef\n
- else
- if (VALUE)($arg0) & RUBY_IMMEDIATE_MASK
- echo immediate\n
- else
- set $flags = ((struct RBasic*)($arg0))->flags
- if ($flags & RUBY_T_MASK) == RUBY_T_NONE
- printf "T_NONE: "
- print (struct RBasic *)($arg0)
- else
- if ($flags & RUBY_T_MASK) == RUBY_T_NIL
- printf "T_NIL: "
- print (struct RBasic *)($arg0)
- else
- if ($flags & RUBY_T_MASK) == RUBY_T_OBJECT
- printf "T_OBJECT: "
- print (struct RObject *)($arg0)
- else
- if ($flags & RUBY_T_MASK) == RUBY_T_CLASS
- printf "T_CLASS: "
- print (struct RClass *)($arg0)
- else
- if ($flags & RUBY_T_MASK) == RUBY_T_ICLASS
- printf "T_ICLASS: "
- print (struct RClass *)($arg0)
- else
- if ($flags & RUBY_T_MASK) == RUBY_T_MODULE
- printf "T_MODULE: "
- print (struct RClass *)($arg0)
- else
- if ($flags & RUBY_T_MASK) == RUBY_T_FLOAT
- printf "T_FLOAT: %.16g ", (((struct RFloat*)($arg0))->float_value)
- print (struct RFloat *)($arg0)
- else
- if ($flags & RUBY_T_MASK) == RUBY_T_STRING
- printf "T_STRING: "
- set print address off
- output (char *)(($flags & RUBY_FL_USER1) ? \
- ((struct RString*)($arg0))->as.heap.ptr : \
- ((struct RString*)($arg0))->as.ary)
- set print address on
- printf " bytesize:%ld ", ($flags & RUBY_FL_USER1) ? \
- ((struct RString*)($arg0))->as.heap.len : \
- (($flags & (RUBY_FL_USER2|RUBY_FL_USER3|RUBY_FL_USER4|RUBY_FL_USER5|RUBY_FL_USER6)) >> RUBY_FL_USHIFT+2)
- if !($flags & RUBY_FL_USER1)
- printf "(embed) "
- else
- if ($flags & RUBY_FL_USER2)
- printf "(shared) "
- end
- if ($flags & RUBY_FL_USER3)
- printf "(assoc) "
- end
- end
- printf "encoding:%d ", ($flags & RUBY_ENCODING_MASK) >> RUBY_ENCODING_SHIFT
- if ($flags & RUBY_ENC_CODERANGE_MASK) == 0
- printf "coderange:unknown "
- else
- if ($flags & RUBY_ENC_CODERANGE_MASK) == RUBY_ENC_CODERANGE_7BIT
- printf "coderange:7bit "
- else
- if ($flags & RUBY_ENC_CODERANGE_MASK) == RUBY_ENC_CODERANGE_VALID
- printf "coderange:valid "
- else
- printf "coderange:broken "
- end
- end
- end
- print (struct RString *)($arg0)
- else
- if ($flags & RUBY_T_MASK) == RUBY_T_REGEXP
- set $regsrc = ((struct RRegexp*)($arg0))->src
- set $rsflags = ((struct RBasic*)$regsrc)->flags
- printf "T_REGEXP: "
- set print address off
- output (char *)(($rsflags & RUBY_FL_USER1) ? \
- ((struct RString*)$regsrc)->as.heap.ptr : \
- ((struct RString*)$regsrc)->as.ary)
- set print address on
- printf " len:%ld ", ($rsflags & RUBY_FL_USER1) ? \
- ((struct RString*)$regsrc)->as.heap.len : \
- (($rsflags & (RUBY_FL_USER2|RUBY_FL_USER3|RUBY_FL_USER4|RUBY_FL_USER5|RUBY_FL_USER6)) >> RUBY_FL_USHIFT+2)
- if $flags & RUBY_FL_USER6
- printf "(none) "
- end
- if $flags & RUBY_FL_USER5
- printf "(literal) "
- end
- if $flags & RUBY_FL_USER4
- printf "(fixed) "
- end
- printf "encoding:%d ", ($flags & RUBY_ENCODING_MASK) >> RUBY_ENCODING_SHIFT
- print (struct RRegexp *)($arg0)
- else
- if ($flags & RUBY_T_MASK) == RUBY_T_ARRAY
- if ($flags & RUBY_FL_USER1)
- set $len = (($flags & (RUBY_FL_USER3|RUBY_FL_USER4)) >> (RUBY_FL_USHIFT+3))
- printf "T_ARRAY: len=%ld ", $len
- printf "(embed) "
- if ($len == 0)
- printf "{(empty)} "
- else
- output/x *((VALUE*)((struct RArray*)($arg0))->as.ary) @ $len
- printf " "
- end
- else
- set $len = ((struct RArray*)($arg0))->as.heap.len
- printf "T_ARRAY: len=%ld ", $len
- if ($flags & RUBY_FL_USER2)
- printf "(shared) shared="
- output/x ((struct RArray*)($arg0))->as.heap.aux.shared
- printf " "
- else
- printf "(ownership) capa=%ld ", ((struct RArray*)($arg0))->as.heap.aux.capa
- end
- if ($len == 0)
- printf "{(empty)} "
- else
- output/x *((VALUE*)((struct RArray*)($arg0))->as.heap.ptr) @ $len
- printf " "
- end
- end
- print (struct RArray *)($arg0)
- else
- if ($flags & RUBY_T_MASK) == RUBY_T_FIXNUM
- printf "T_FIXNUM: "
- print (struct RBasic *)($arg0)
- else
- if ($flags & RUBY_T_MASK) == RUBY_T_HASH
- printf "T_HASH: ",
- if ((struct RHash *)($arg0))->ntbl
- printf "len=%ld ", ((struct RHash *)($arg0))->ntbl->num_entries
- end
- print (struct RHash *)($arg0)
- else
- if ($flags & RUBY_T_MASK) == RUBY_T_STRUCT
- printf "T_STRUCT: len=%ld ", \
- (($flags & (RUBY_FL_USER1|RUBY_FL_USER2)) ? \
- ($flags & (RUBY_FL_USER1|RUBY_FL_USER2)) >> (RUBY_FL_USHIFT+1) : \
- ((struct RStruct *)($arg0))->as.heap.len)
- print (struct RStruct *)($arg0)
- x/xw (($flags & (RUBY_FL_USER1|RUBY_FL_USER2)) ? \
- ((struct RStruct *)($arg0))->as.ary : \
- ((struct RStruct *)($arg0))->as.heap.ptr)
- else
- if ($flags & RUBY_T_MASK) == RUBY_T_BIGNUM
- printf "T_BIGNUM: sign=%d len=%ld ", \
- (($flags & RUBY_FL_USER1) != 0), \
- (($flags & RUBY_FL_USER2) ? \
- ($flags & (RUBY_FL_USER5|RUBY_FL_USER4|RUBY_FL_USER3)) >> (RUBY_FL_USHIFT+3) : \
- ((struct RBignum*)($arg0))->as.heap.len)
- if $flags & RUBY_FL_USER2
- printf "(embed) "
- end
- print (struct RBignum *)($arg0)
- x/xw (($flags & RUBY_FL_USER2) ? \
- ((struct RBignum*)($arg0))->as.ary : \
- ((struct RBignum*)($arg0))->as.heap.digits)
- else
- if ($flags & RUBY_T_MASK) == RUBY_T_RATIONAL
- printf "T_RATIONAL: "
- print (struct RRational *)($arg0)
- else
- if ($flags & RUBY_T_MASK) == RUBY_T_COMPLEX
- printf "T_COMPLEX: "
- print (struct RComplex *)($arg0)
- else
- if ($flags & RUBY_T_MASK) == RUBY_T_FILE
- printf "T_FILE: "
- print (struct RFile *)($arg0)
- output *((struct RFile *)($arg0))->fptr
- printf "\n"
- else
- if ($flags & RUBY_T_MASK) == RUBY_T_TRUE
- printf "T_TRUE: "
- print (struct RBasic *)($arg0)
- else
- if ($flags & RUBY_T_MASK) == RUBY_T_FALSE
- printf "T_FALSE: "
- print (struct RBasic *)($arg0)
- else
- if ($flags & RUBY_T_MASK) == RUBY_T_DATA
- printf "T_DATA: "
- print (struct RData *)($arg0)
- else
- if ($flags & RUBY_T_MASK) == RUBY_T_MATCH
- printf "T_MATCH: "
- print (struct RMatch *)($arg0)
- else
- if ($flags & RUBY_T_MASK) == RUBY_T_SYMBOL
- printf "T_SYMBOL: "
- print (struct RBasic *)($arg0)
- else
- if ($flags & RUBY_T_MASK) == RUBY_T_UNDEF
- printf "T_UNDEF: "
- print (struct RBasic *)($arg0)
- else
- if ($flags & RUBY_T_MASK) == RUBY_T_NODE
- printf "T_NODE("
- output (enum node_type)(($flags&RUBY_NODE_TYPEMASK)>>RUBY_NODE_TYPESHIFT)
- printf "): "
- print *(NODE *)($arg0)
- else
- if ($flags & RUBY_T_MASK) == RUBY_T_ZOMBIE
- printf "T_ZOMBIE: "
- print (struct RData *)($arg0)
- else
- printf "unknown: "
- print (struct RBasic *)($arg0)
- end
- end
- end
- end
- end
- end
- end
- end
- end
- end
- end
- end
- end
- end
- end
- end
- end
- end
- end
- end
- end
- end
- end
- end
- end
- end
- end
- end
- end
- end
- end
- end
-end
-document rp
- Print a Ruby's VALUE.
-end
-
-define nd_type
- print (enum node_type)((((NODE*)($arg0))->flags&RUBY_NODE_TYPEMASK)>>RUBY_NODE_TYPESHIFT)
-end
-document nd_type
- Print a Ruby' node type.
-end
-
-define nd_file
- print ((NODE*)($arg0))->nd_file
-end
-document nd_file
- Print the source file name of a node.
-end
-
-define nd_line
- print ((unsigned int)((((NODE*)($arg0))->flags>>RUBY_NODE_LSHIFT)&RUBY_NODE_LMASK))
-end
-document nd_line
- Print the source line number of a node.
-end
-
-# Print members of ruby node.
-
-define nd_head
- printf "u1.node: "
- rp ($arg0).u1.node
-end
-
-define nd_alen
- printf "u2.argc: "
- p ($arg0).u2.argc
-end
-
-define nd_next
- printf "u3.node: "
- rp ($arg0).u3.node
-end
-
-
-define nd_cond
- printf "u1.node: "
- rp ($arg0).u1.node
-end
-
-define nd_body
- printf "u2.node: "
- rp ($arg0).u2.node
-end
-
-define nd_else
- printf "u3.node: "
- rp ($arg0).u3.node
-end
-
-
-define nd_orig
- printf "u3.value: "
- rp ($arg0).u3.value
-end
-
-
-define nd_resq
- printf "u2.node: "
- rp ($arg0).u2.node
-end
-
-define nd_ensr
- printf "u3.node: "
- rp ($arg0).u3.node
-end
-
-
-define nd_1st
- printf "u1.node: "
- rp ($arg0).u1.node
-end
-
-define nd_2nd
- printf "u2.node: "
- rp ($arg0).u2.node
-end
-
-
-define nd_stts
- printf "u1.node: "
- rp ($arg0).u1.node
-end
-
-
-define nd_entry
- printf "u3.entry: "
- p ($arg0).u3.entry
-end
-
-define nd_vid
- printf "u1.id: "
- p ($arg0).u1.id
-end
-
-define nd_cflag
- printf "u2.id: "
- p ($arg0).u2.id
-end
-
-define nd_cval
- printf "u3.value: "
- rp ($arg0).u3.value
-end
-
-
-define nd_cnt
- printf "u3.cnt: "
- p ($arg0).u3.cnt
-end
-
-define nd_tbl
- printf "u1.tbl: "
- p ($arg0).u1.tbl
-end
-
-
-define nd_var
- printf "u1.node: "
- rp ($arg0).u1.node
-end
-
-define nd_ibdy
- printf "u2.node: "
- rp ($arg0).u2.node
-end
-
-define nd_iter
- printf "u3.node: "
- rp ($arg0).u3.node
-end
-
-
-define nd_value
- printf "u2.node: "
- rp ($arg0).u2.node
-end
-
-define nd_aid
- printf "u3.id: "
- p ($arg0).u3.id
-end
-
-
-define nd_lit
- printf "u1.value: "
- rp ($arg0).u1.value
-end
-
-
-define nd_frml
- printf "u1.node: "
- rp ($arg0).u1.node
-end
-
-define nd_rest
- printf "u2.argc: "
- p ($arg0).u2.argc
-end
-
-define nd_opt
- printf "u1.node: "
- rp ($arg0).u1.node
-end
-
-
-define nd_recv
- printf "u1.node: "
- rp ($arg0).u1.node
-end
-
-define nd_mid
- printf "u2.id: "
- p ($arg0).u2.id
-end
-
-define nd_args
- printf "u3.node: "
- rp ($arg0).u3.node
-end
-
-
-define nd_noex
- printf "u1.id: "
- p ($arg0).u1.id
-end
-
-define nd_defn
- printf "u3.node: "
- rp ($arg0).u3.node
-end
-
-
-define nd_old
- printf "u1.id: "
- p ($arg0).u1.id
-end
-
-define nd_new
- printf "u2.id: "
- p ($arg0).u2.id
-end
-
-
-define nd_cfnc
- printf "u1.cfunc: "
- p ($arg0).u1.cfunc
-end
-
-define nd_argc
- printf "u2.argc: "
- p ($arg0).u2.argc
-end
-
-
-define nd_cname
- printf "u1.id: "
- p ($arg0).u1.id
-end
-
-define nd_super
- printf "u3.node: "
- rp ($arg0).u3.node
-end
-
-
-define nd_modl
- printf "u1.id: "
- p ($arg0).u1.id
-end
-
-define nd_clss
- printf "u1.value: "
- rp ($arg0).u1.value
-end
-
-
-define nd_beg
- printf "u1.node: "
- rp ($arg0).u1.node
-end
-
-define nd_end
- printf "u2.node: "
- rp ($arg0).u2.node
-end
-
-define nd_state
- printf "u3.state: "
- p ($arg0).u3.state
-end
-
-define nd_rval
- printf "u2.value: "
- rp ($arg0).u2.value
-end
-
-
-define nd_nth
- printf "u2.argc: "
- p ($arg0).u2.argc
-end
-
-
-define nd_tag
- printf "u1.id: "
- p ($arg0).u1.id
-end
-
-define nd_tval
- printf "u2.value: "
- rp ($arg0).u2.value
-end
-
-define rb_p
- call rb_p($arg0)
-end
-
-define rb_id2name
- call rb_id2name($arg0)
-end
-
-define rb_classname
- call classname($arg0)
- rb_p $
- print *(struct RClass*)($arg0)
-end
-
-define rb_backtrace
- call rb_backtrace()
-end
-
-define iseq
- if dummy_gdb_enums.special_consts
- end
- if ($arg0)->type == ISEQ_ELEMENT_NONE
- echo [none]\n
- end
- if ($arg0)->type == ISEQ_ELEMENT_LABEL
- print *(LABEL*)($arg0)
- end
- if ($arg0)->type == ISEQ_ELEMENT_INSN
- print *(INSN*)($arg0)
- if ((INSN*)($arg0))->insn_id != YARVINSN_jump
- set $i = 0
- set $operand_size = ((INSN*)($arg0))->operand_size
- set $operands = ((INSN*)($arg0))->operands
- while $i < $operand_size
- rp $operands[$i++]
- end
- end
- end
- if ($arg0)->type == ISEQ_ELEMENT_ADJUST
- print *(ADJUST*)($arg0)
- end
-end
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index ff509d4ffc..0000000000
--- a/.gitignore
+++ /dev/null
@@ -1,399 +0,0 @@
-# /
-*.bak
-*.dylib
-*.inc
-*.orig
-*.rej
-*.sav
-*.swp
-*~
-.*-*
-.*.list
-.*.time
-.DS_Store
-.ccmalloc
-.ext
-.pc
-.ppack
-.svn
-/.git
-/*_prelude.c
-/COPYING.LIB
-/ChangeLog-1.8.0
-/ChangeLog.pre-alpha
-/ChangeLog.pre1_1
-/Doxyfile
-/GNUmakefile
-/Makefile
-/README.atheos
-/README.fat-patch
-/README.v6
-/TAGS
-/archive
-/autom4te*.cache
-/automake
-/beos
-/breakpoints.gdb
-/config.cache
-/config.h
-/config.h.in
-/config.log
-/config.status
-/config.status.lineno
-/configure
-/enc.mk
-/enc/trans/*.c
-/encdb.h
-/ext/win32ole/.document
-/largefile.h
-/lex.c
-/libruby*.*
-/miniprelude.c
-/miniruby
-/newdate.rb
-/newline.c
-/newver.rb
-/parse.c
-/parse.h
-/patches
-/patches-master
-/pitest.rb
-/ppack
-/prelude.c
-/preview
-/rbconfig.rb
-/rename2.h
-/repack
-/revision.h
-/riscos
-/rubicon
-/ruby
-/ruby-man.rd.gz
-/test.rb
-/tmp
-/transdb.h
-/uncommon.mk
-/web
-/y.output
-/y.tab.c
-/yasmdata.rb
-
-# /benchmark/
-/benchmark/bmx_*.rb
-
-# /enc/trans/
-/enc/trans/*.c
-
-# /ext/
-/ext/extinit.c
-/ext/*.log
-
-# /ext/bigdecimal/
-/ext/bigdecimal/*.def
-/ext/bigdecimal/Makefile
-/ext/bigdecimal/bigdecimal.a
-/ext/bigdecimal/extconf.h
-/ext/bigdecimal/mkmf.log
-/ext/bigdecimal/conftest.dSYM
-
-# /ext/continuation/
-/ext/continuation/extconf.h
-/ext/continuation/Makefile
-
-# /ext/coverage/
-/ext/coverage/extconf.h
-/ext/coverage/Makefile
-
-# /ext/curses/
-/ext/curses/*.def
-/ext/curses/Makefile
-/ext/curses/curses.a
-/ext/curses/extconf.h
-/ext/curses/mkmf.log
-/ext/curses/conftest.dSYM
-
-# /ext/dbm/
-/ext/dbm/Makefile
-/ext/dbm/mkmf.log
-/ext/dbm/*.def
-/ext/dbm/extconf.h
-/ext/dbm/conftest.dSYM
-
-# /ext/digest/
-/ext/digest/*.def
-/ext/digest/Makefile
-/ext/digest/digest.a
-/ext/digest/extconf.h
-/ext/digest/mkmf.log
-
-# /ext/digest/bubblebabble/
-/ext/digest/bubblebabble/Makefile
-/ext/digest/bubblebabble/mkmf.log
-/ext/digest/bubblebabble/*.def
-/ext/digest/bubblebabble/extconf.h
-
-# /ext/digest/md5/
-/ext/digest/md5/*.def
-/ext/digest/md5/Makefile
-/ext/digest/md5/extconf.h
-/ext/digest/md5/md5.a
-/ext/digest/md5/mkmf.log
-/ext/digest/md5/conftest.dSYM
-
-# /ext/digest/rmd160/
-/ext/digest/rmd160/*.def
-/ext/digest/rmd160/Makefile
-/ext/digest/rmd160/extconf.h
-/ext/digest/rmd160/mkmf.log
-/ext/digest/rmd160/rmd160.a
-/ext/digest/rmd160/conftest.dSYM
-
-# /ext/digest/sha1/
-/ext/digest/sha1/*.def
-/ext/digest/sha1/Makefile
-/ext/digest/sha1/extconf.h
-/ext/digest/sha1/mkmf.log
-/ext/digest/sha1/sha1.a
-/ext/digest/sha1/conftest.dSYM
-
-# /ext/digest/sha2/
-/ext/digest/sha2/*.def
-/ext/digest/sha2/Makefile
-/ext/digest/sha2/extconf.h
-/ext/digest/sha2/mkmf.log
-/ext/digest/sha2/sha2.a
-
-# /ext/dl/
-/ext/dl/*.def
-/ext/dl/*.func
-/ext/dl/*.o
-/ext/dl/*~
-/ext/dl/Makefile
-/ext/dl/dl.a
-/ext/dl/extconf.h
-/ext/dl/mkmf.log
-/ext/dl/conftest.dSYM
-
-# /ext/dl/callback/
-/ext/dl/callback/*.def
-/ext/dl/callback/*.func
-/ext/dl/callback/*.o
-/ext/dl/callback/*~
-/ext/dl/callback/Makefile
-/ext/dl/callback/callback-*.c
-/ext/dl/callback/callback.a
-/ext/dl/callback/callback.c
-/ext/dl/callback/extconf.h
-/ext/dl/callback/mkmf.log
-/ext/dl/callback/conftest.dSYM
-
-# /ext/dl/win32/
-/ext/dl/win32/Makefile
-
-# /ext/etc/
-/ext/etc/*.def
-/ext/etc/Makefile
-/ext/etc/etc.a
-/ext/etc/extconf.h
-/ext/etc/mkmf.log
-/ext/etc/conftest.dSYM
-
-# /ext/fcntl/
-/ext/fcntl/*.def
-/ext/fcntl/Makefile
-/ext/fcntl/extconf.h
-/ext/fcntl/fcntl.a
-/ext/fcntl/mkmf.log
-
-# /ext/fiber/
-/ext/fiber/extconf.h
-/ext/fiber/Makefile
-
-# /ext/gdbm/
-/ext/gdbm/Makefile
-/ext/gdbm/mkmf.log
-/ext/gdbm/*.def
-/ext/gdbm/extconf.h
-/ext/gdbm/conftest.dSYM
-
-# /ext/iconv/
-/ext/iconv/*.def
-/ext/iconv/Makefile
-/ext/iconv/config.charset
-/ext/iconv/extconf.h
-/ext/iconv/iconv.a
-/ext/iconv/iconv.rb
-/ext/iconv/mkmf.log
-/ext/iconv/conftest.dSYM
-
-# /ext/io/wait/
-/ext/io/wait/Makefile
-/ext/io/wait/extconf.h
-/ext/io/wait/mkmf.log
-/ext/io/wait/wait.a
-
-# /ext/json/
-/ext/json/Makefile
-/ext/json/extconf.h
-
-# /ext/json/ext/generator/
-/ext/json/ext/generator/*.def
-/ext/json/ext/generator/Makefile
-/ext/json/ext/generator/extconf.h
-/ext/json/ext/generator/mkmf.log
-/ext/json/ext/generator/generator.a
-
-# /ext/json/ext/parser/
-/ext/json/ext/parser/*.def
-/ext/json/ext/parser/Makefile
-/ext/json/ext/parser/extconf.h
-/ext/json/ext/parser/mkmf.log
-/ext/json/ext/parser/parser.a
-
-# /ext/mathn/complex/
-/ext/mathn/complex/Makefile
-/ext/mathn/complex/extconf.h
-
-# /ext/mathn/rational/
-/ext/mathn/rational/Makefile
-/ext/mathn/rational/extconf.h
-
-# /ext/nkf/
-/ext/nkf/*.def
-/ext/nkf/Makefile
-/ext/nkf/extconf.h
-/ext/nkf/mkmf.log
-/ext/nkf/nkf.a
-
-# /ext/objspace/
-/ext/objspace/Makefile
-/ext/objspace/extconf.h
-
-# /ext/openssl/
-/ext/openssl/GNUmakefile
-/ext/openssl/Makefile
-/ext/openssl/dep
-/ext/openssl/extconf.h
-/ext/openssl/mkmf.log
-/ext/openssl/openssl.a
-/ext/openssl/conftest.dSYM
-
-# /ext/pty/
-/ext/pty/*.def
-/ext/pty/Makefile
-/ext/pty/extconf.h
-/ext/pty/mkmf.log
-/ext/pty/pty.a
-/ext/pty/conftest.dSYM
-
-# /ext/racc/cparse/
-/ext/racc/cparse/*.def
-/ext/racc/cparse/Makefile
-/ext/racc/cparse/cparse.a
-/ext/racc/cparse/extconf.h
-/ext/racc/cparse/mkmf.log
-/ext/racc/cparse/conftest.dSYM
-
-# /ext/readline/
-/ext/readline/*.def
-/ext/readline/Makefile
-/ext/readline/extconf.h
-/ext/readline/mkmf.log
-/ext/readline/readline.a
-/ext/readline/conftest.dSYM
-
-# /ext/ripper/
-/ext/ripper/Makefile
-/ext/ripper/mkmf.log
-/ext/ripper/eventids1.c
-/ext/ripper/eventids2table.c
-/ext/ripper/ripper.*
-/ext/ripper/ids1
-/ext/ripper/ids2
-/ext/ripper/extconf.h
-/ext/ripper/y.output
-
-# /ext/sdbm/
-/ext/sdbm/*.def
-/ext/sdbm/Makefile
-/ext/sdbm/extconf.h
-/ext/sdbm/mkmf.log
-/ext/sdbm/sdbm.a
-
-# /ext/socket/
-/ext/socket/*.def
-/ext/socket/Makefile
-/ext/socket/constants.h
-/ext/socket/constdefs.h
-/ext/socket/constdefs.c
-/ext/socket/extconf.h
-/ext/socket/mkmf.log
-/ext/socket/socket.a
-/ext/socket/conftest.dSYM
-
-# /ext/stringio/
-/ext/stringio/*.def
-/ext/stringio/Makefile
-/ext/stringio/extconf.h
-/ext/stringio/mkmf.log
-/ext/stringio/stringio.a
-
-# /ext/strscan/
-/ext/strscan/*.def
-/ext/strscan/Makefile
-/ext/strscan/extconf.h
-/ext/strscan/mkmf.log
-/ext/strscan/strscan.a
-
-# /ext/syck/
-/ext/syck/*.def
-/ext/syck/Makefile
-/ext/syck/extconf.h
-/ext/syck/mkmf.log
-/ext/syck/syck.a
-
-# /ext/syslog/
-/ext/syslog/*.def
-/ext/syslog/Makefile
-/ext/syslog/extconf.h
-/ext/syslog/mkmf.log
-/ext/syslog/syslog.a
-/ext/syslog/conftest.dSYM
-
-# /ext/tk/
-/ext/tk/Makefile
-/ext/tk/*.log
-/ext/tk/*.def
-/ext/tk/conftest.dSYM
-/ext/tk/extconf.h
-/ext/tk/config_list
-
-# /ext/tk/tkutil/
-/ext/tk/tkutil/Makefile
-/ext/tk/tkutil/*.log
-/ext/tk/tkutil/*.def
-/ext/tk/tkutil/conftest.dSYM
-/ext/tk/tkutil/extconf.h
-
-# /ext/win32ole/
-/ext/win32ole/Makefile
-/ext/win32ole/mkmf.log
-/ext/win32ole/*.log
-/ext/win32ole/.document
-
-# /ext/zlib/
-/ext/zlib/*.def
-/ext/zlib/Makefile
-/ext/zlib/extconf.h
-/ext/zlib/mkmf.log
-/ext/zlib/zlib.a
-/ext/zlib/conftest.dSYM
-
-# /lib/rexml/
-
-# /spec/
-/spec/mspec
-/spec/rubyspec
-
-# /win32/
-/win32/*.ico
diff --git a/COPYING.ja b/COPYING.ja
index aa2a163848..933cc7cb9a 100644
--- a/COPYING.ja
+++ b/COPYING.ja
@@ -1,6 +1,6 @@
-$BK\%W%m%0%i%`$O%U%j!<%=%U%H%&%'%"$G$9!%(BGPL (the GNU General
-Public License)$B%P!<%8%g%s(B2$B$^$?$O0J2<$K<($9>r7o$GK\%W%m%0%i%`(B
-$B$r:FG[I[$G$-$^$9!%(BGPL$B$K$D$$$F$O(BGPL$B%U%!%$%k$r;2>H$7$F2<$5$$!%(B
+$BK\%W%m%0%i%`$O%U%j!<%=%U%H%&%'%"$G$9!%(BGPL(the GNU General
+Public License)$B$^$?$O0J2<$K<($9>r7o$GK\%W%m%0%i%`$r:FG[I[$G(B
+$B$-$^$9!%(BGPL$B$K$D$$$F$O(BGPL$B%U%!%$%k$r;2>H$7$F2<$5$$!%(B
1. $BJ#@=$O@)8B$J$/<+M3$G$9!%(B
diff --git a/ChangeLog b/ChangeLog
index 1c99e620c9..1de5184dda 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,23813 +1,85 @@
-Mon Sep 7 17:22:59 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (rb_io_tell): adjustment for ungotten data.
-
-Mon Sep 7 17:13:53 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (io_encname_bom_p): removed magic number.
-
-Mon Sep 7 12:26:04 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/irb/inspector.rb (IRB::INSPECTORS.def_inspector): support
- object without #inspect defined. a patch from Daniel
- Bovensiepen. [ruby-core:25200]
-
-Mon Sep 7 05:38:34 2009 Koichi Sasada <ko1@atdot.net>
-
- * insns.def (opt_*): add IC operands.
-
- * vm_insnhelper.h (CALL_SIMPLE_METHOD): add a version which
- use an inline cache. USE_IC_FOR_SPECIALIZED_METHOD macro
- switchs the behaviour. This change also removes
- CALL_SIMPLE_METHOD_IC() macro.
-
- * tool/instruction.rb: fix elimination process to ignore
- variable "ic".
-
-Mon Sep 7 05:21:09 2009 Koichi Sasada <ko1@atdot.net>
-
- * Makefile.in, common.mk: move a id.h generation rule.
-
-Mon Sep 7 05:07:59 2009 Koichi Sasada <ko1@atdot.net>
-
- * benchmark/driver.rb: remove RUBY_VERSION output.
-
-Mon Sep 7 05:06:16 2009 Koichi Sasada <ko1@atdot.net>
-
- * vm_insnhelper.c: rename macro name ENABLE_IC_FOR_IVAR
- to USE_IC_FOR_IVAR.
-
-Mon Sep 7 03:21:40 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/uri/common.rb (URI.escape): obsoleted.
-
- * lib/uri/common.rb (URI,unescape): ditto.
-
-Sun Sep 6 18:13:54 2009 Koichi Sasada <ko1@atdot.net>
-
- * vm_insnhelper.h (CALL_SIMPLE_METHOD_IC): make a macro
- invoke simple method with inline cache entry.
-
- * insns.def (opt_length, opt_size): fix to use inline method cache.
-
-Sun Sep 6 17:47:21 2009 Koichi Sasada <ko1@atdot.net>
-
- * template/id.h.tmpl: fix this.
-
- * id.h: removed. Because this file is generated automatically.
-
-Sun Sep 6 17:31:28 2009 Koichi Sasada <ko1@atdot.net>
-
- * compile.c (iseq_specialized_instruction), insns.def (opt_size):
- optimize #size methods (by specialized instruction).
-
- * id.c, id.h, vm.c, vm_insnhelper.h: ditto.
-
-Sun Sep 6 16:13:06 2009 Koichi Sasada <ko1@atdot.net>
-
- * insns.def (setinstancevariable), vm_insnhelper.c (vm_setivar):
- fix to use inline cache (trivial optimization).
-
-Sun Sep 6 10:34:19 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c: fixed rdoc, a patch from Nobuhiro IMAI at [ruby-core:25433].
-
-Sun Sep 6 05:19:09 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * io.c: Add rdoc for ARGF.
- contributed by Run Paint Run Run. [ruby-core:23854]
-
-Sat Sep 5 15:21:13 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * compile.c (iseq_compile_each): op_asgn to aref should return rhs.
- [ruby-core:25387]
-
-Sat Sep 5 10:38:46 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * compile.c (iseq_compile_each): &&= and ||= should return rhs.
- [ruby-dev:39163] (#1996), [ruby-core:25143]
-
-Sat Sep 5 08:51:43 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * re.c (update_char_offset): position should be long.
-
- * re.c (match_hash, match_equal): new methods. [ruby-core:24748]
-
- * re.c (reg_match_pos, rb_reg_eqq, rb_reg_s_quote): get rid of use
- VALUE as int.
-
-Fri Sep 4 20:40:57 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * numeric.c (round): added declaration. [ruby-dev:39222]
-
-Fri Sep 4 06:15:39 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * dir.c (Init_Dir): alias Dir#path to Dir#to_path. [ruby-core:25326]
-
-Fri Sep 4 04:49:39 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * random.c (random_rand): fixed rdoc. [ruby-core:25332]
-
-Fri Sep 4 04:46:08 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/webrick/httpservlet/abstract.rb (do_OPTIONS): method names
- are symbols now. [ruby-core:24580]
-
-Thu Sep 3 17:56:40 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (literal_concat_gen): concat body from dstr instead of
- nd_next. [ruby-core:25284]
-
-Wed Sep 2 16:49:53 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * math.c (math_gamma): get rid of direct comparison between too
- big double and integer, with gcc on x86_64. [ruby-core:25257]
-
-Wed Sep 2 13:47:30 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * math.c (domain_check): simplified.
-
-Wed Sep 2 11:32:24 2009 Koichi Sasada <ko1@atdot.net>
-
- * gc.c (obj_free): fix to free method table (fix memory leak).
-
-Wed Sep 2 07:42:15 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * tool/instruction.rb (RubyVM::InstructionsLoader#make_stackcaching_insns):
- simplified.
-
-Wed Sep 2 02:32:46 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/json/lib/json/common.rb (NaN): Change definition
- of NaN to 0.0/0 for 1.8/1.9 compatibility.
-
-Wed Sep 2 01:16:32 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/json: Update to JSON 1.1.9.
-
-Tue Sep 1 19:56:28 2009 Koichi Sasada <ko1@atdot.net>
-
- * vm_eval.c (eval_string_with_cref): fix to check local_table_size.
- [ruby-dev:39205] [Bug #2024]
-
-Mon Aug 31 16:20:41 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * class.c (make_singleton_class): variable name changed.
- removed an unnecessary conditional.
-
-Mon Aug 31 14:17:09 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * class.c: refactored singleton class related matters.
- Handles eigenclasses and plain classes transparently.
-
- (make_metaclass): renamed from make_metametaclass.
- (METACLASS_OF): new utility macro
- (META_CLASS_OF_CLASS_CLASS): ditto.
- (ENSURE_EIGENCLASS): ditto.
- (make_singleton_class): extracted from rb_singleton_class.
- (boot_defclass): moved from object.c
- (Init_class_hierarchy): extracted from Init_Object.
- (rb_make_metaclass): refactored.
- (singleton_class_of): extracted from rb_singleton_class.
- (rb_singleton_class): refactored.
- (rb_define_singleton_method): it needs a metaclass only
- but not its metametaclass.
-
- * object.c: booting class hierarchy was moved to class.c
- for keeping dependency between compilation units least.
- (Init_Object): extracting the booting into
- Init_class_hierarchy.
- (boot_defclass): moved to class.c.
-
-Sun Aug 30 23:44:09 2009 Tanaka Akira <akr@fsij.org>
-
- * time.c (find_time_t): use mktime for the first guess.
-
-Sun Aug 30 16:38:56 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (rb_enc_symname2_p): not depend on nul terminator.
-
-Sun Aug 30 14:11:45 2009 Tanaka Akira <akr@fsij.org>
-
- * common.mk: dependencies updated.
-
-Sun Aug 30 13:00:11 2009 Tanaka Akira <akr@fsij.org>
-
- * time.c (add): shortcut implemented for fixnums.
- (sub): ditto.
- (mul): ditto.
-
-Sun Aug 30 10:24:43 2009 Tanaka Akira <akr@fsij.org>
-
- * time.c (eq): apply RTEST.
- (ne): ditto.
- (add): avoid method dispatch for bignums.
- (sub): ditto.
- (mul): ditto.
- (mod): ditto.
-
-Sun Aug 30 09:45:11 2009 Tanaka Akira <akr@fsij.org>
-
- * bignum.c (bigmul1_single): new function specialized respect to
- multiply two single digit bignums.
- (bigmul0): use bigmul1_single.
-
-Sun Aug 30 03:59:43 2009 Tanaka Akira <akr@fsij.org>
-
- * timev.h (TIME_SCALE): defined as 1000000000.
- (struct vtm): subsec is replaced by subsecx.
- subsec * TIME_SCALE == subsecx.
-
- * time.c: avoid rational in most cases.
- (struct time_object): timev is replaced by timexv.
- timev * TIME_SCALE == timexv.
-
-Sun Aug 30 03:17:25 2009 Tanaka Akira <akr@fsij.org>
-
- * time.c (init_leap_second_info): use TIMET_MAX.
-
-Sun Aug 30 01:15:31 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/zlib/zlib.c (gzfile_read_all): use gzfile_newstr;
- set and convert its encoding. [ruby-dev:38304]
-
-Sat Aug 29 20:40:02 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * vm_eval.c (rb_call0): gets rid of checking method cache twice.
-
- * method.h (rb_get_method_entry): added a prototype of the function.
- (rb_method_entry_without_cache): more friendly name.
-
-Sat Aug 29 12:16:47 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/tmpdir.rb (Dir.mktmpdir): rolled back r24699. [ruby-dev:39193]
-
-Sat Aug 29 03:27:17 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/tempfile.rb (Tempfile#make_tmpname): removed thread race
- condition.
-
- * lib/tmpdir.rb (Dir.mktmpdir): ditto.
-
-Fri Aug 28 20:29:34 2009 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/tempfile.rb (Tempfile#callback): Debug information should be
- output to stderr, not stdout; pointed out by akira yamada.
- cf. [ruby-dev:39072]
-
-Fri Aug 28 20:34:24 2009 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c: use SafeStringValue instead of
- Check_SafeStr.
-
-Fri Aug 28 13:30:43 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * thread.c (do_select): rollback r24680. void struct initializer is
- invalid.
-
-Fri Aug 28 11:45:33 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * method.h (rb_method_definition_t): split from rb_method_entry_
- to deal aliases. [ruby-dev:39165]
-
- * proc.c (struct METHOD): contains rb_method_entry_t copy.
-
-Fri Aug 28 10:21:30 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * iseq.c (iseq_mark): skip outdated cache entries.
-
- * vm_core.h ({GET,INC}_VM_STATE_VERSION): moved from
- vm_insnhelper.h.
-
-Fri Aug 28 07:25:25 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enumerator.c (next_i): typo fixed (reached at end -> reached an
- end). pointed out by James Edward Gray II at LoneStar RubyConf.
-
-Thu Aug 27 18:31:07 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm_method.c (rb_remove_method_id): exported.
-
- * numeric.c (num_sadded): fix for non-ascii method name.
-
-Thu Aug 27 14:32:31 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * re.c (rb_reg_preprocess_dregexp): set encoding as ASCII-8BIT
- when /n is specified and the embedded string is escaped text.
-
-Thu Aug 27 13:51:12 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * random.c (random_rand): random integer can be a fixnum for
- bignum range. [ruby-dev:39173]
-
-Thu Aug 27 08:16:34 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/strscan/strscan.c (strscan_set_string): set string should not be
- duped or frozen, because freezing it causes #concat method failure,
- and unnecessary to dup without freezing. a patch from Aaron
- Patterson at [ruby-core:25145].
-
-Thu Aug 27 02:06:11 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * Makefile.in (enc/unicode/name2ctype.kwd):
- remove rules to generate name2ctype.kwd from
- UnicodeData.txt and Scripts.txt.
- if you want to generate, use tool/enc-unicode.rb.
-
-Thu Aug 27 02:00:09 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * unicode.c (PROPERTY_NAME_MAX_SIZE): use MAX_WORD_LENGTH.
-
-Wed Aug 26 23:59:56 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * random.c (random_rand): refined error message.
-
- * random.c (random_rand): fixed for edge cases of ranges.
- [ruby-dev:39166]
-
-Wed Aug 26 21:49:23 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/tempfile.rb: add documents from Hongli Lai's fork.
- cf [ruby-core:25131].
-
-Wed Aug 26 19:51:13 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * tool/mkconfig.rb (program_transform_name): fix for multiple trans
- rules for autoconf 2.61 or earlier.
-
- * tool/rbinstall.rb (program_transform_name): ditto.
-
-Wed Aug 26 19:20:26 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * random.c (random_rand): unified random_int and random_float.
- [ruby-dev:39158]. and fixes [ruby-core:24655], [ruby-core:24677],
- [ruby-core:24679].
-
-Wed Aug 26 18:59:59 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/test_tempfile.rb: merged from Hongli Lai's fork.
- cf [ruby-core:25131].
-
-Wed Aug 26 18:49:22 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/tempfile.rb (Tempfile#close!): should not undefine finalizer
- by just unlink.
-
-Wed Aug 26 17:00:31 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * tool/mkconfig.rb (program_transform_name): fix for autoconf 2.61
- or earlier.
-
-Wed Aug 26 14:34:39 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/tempfile.rb (Tempfile#close!, Tempfile#path): added side
- notes from Hongli Lai's fork.
-
- * lib/tempfile.rb (Tempfile#unlink, Tempfile.callback): do nothing
- any more once unlinked.
-
-Wed Aug 26 13:48:33 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/tempfile.rb (Tempfile#unlink): reverted r23494, since the
- usage in RubyInline is considered wrong.
-
-Wed Aug 26 12:36:58 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm.c (collect_local_variables_in_env): skips internal variables.
- [ruby-core:25125]
-
-Tue Aug 25 23:51:07 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * tool/enc-unicode.rb: added for generate name2ctype.kwd.
- contributed by Run Paint Run Run [ruby-core:24775]
-
- * enc/unicode.c (CodeRanges): move definitions to name2ctype.h.
-
- * enc/unicode/name2ctype.h.blt, enc/unicode/name2ctype.kwd,
- enc/unicode/name2ctype.src: updated to v5.1.
-
- * enc/unicode/UnicodeData.txt, enc/unicode/Scripts.txt: added v5.1.
-
- * Makefile.in: add rule to generate name2ctype.kwd from
- UnicodeData.txt and Scripts.txt.
-
-Tue Aug 25 22:31:51 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * configure.in (MKDIR_P): Set 'mkdir -p' to MKDIR_P
- when AC_PROG_MKDIR_P doesn't set MKDIR_P.
-
-Tue Aug 25 17:38:22 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * bignum.c (rb_big_clone, bigmul1_normal, bigdivrem): trivial
- optimization.
-
- * bignum.c (big2dbl): truncates zero digits to get rid of possible
- underflow.
-
-Tue Aug 25 12:22:25 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * Makefile.in (enc/unicode/name2ctype.h): explicitly ignores the
- result of diff and turns -e option off, because *BSD make passes
- it by default.
-
-Tue Aug 25 02:16:37 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (DLDFLAGS): use linker_flag and changed undefined
- and multiply_defined behaviors. cf [ruby-core:25086].
-
-Mon Aug 24 21:31:37 2009 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/maker/base.rb, test/rss/test_maker_2.0.rb: fix a bug
- that RSS Maker doesn't accept 'false' as guid's isPermaLink.
- Reported by Joe Holt. Thanks!!!
-
-Mon Aug 24 18:58:56 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * include/ruby/missing.h (vsnprintf): rollback a part of r24179, because
- it's meaningless.
-
-Mon Aug 24 16:35:57 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * st.c (st_delete_safe): deals with packed entries.
- [ruby-core:25080]
-
- * st.c (st_cleanup_safe): ditto. [ruby-core:25081]
-
-Mon Aug 24 13:24:07 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/Makefile.sub (MAKEDIRS): define.
-
- * common.mk (capi): using $(MAKEDIRS), so depends on $(PREP).
-
-Mon Aug 24 13:14:06 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (RUBY_CHECK_SIZEOF): set cross_compiling only when
- universal binary.
-
-Mon Aug 24 12:55:19 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/Makefile.sub (enc/unicode/name2ctype.h): use md instead of
- $(MAKEDIRS).
-
-Sun Aug 23 15:22:45 2009 Tanaka Akira <akr@fsij.org>
-
- * bootstraptest/runner.rb (main): "usage" description updated.
-
-Sun Aug 23 15:12:22 2009 Tanaka Akira <akr@fsij.org>
-
- * bootstraptest/runner.rb (Dir.mktmpdir): updated to latest.
- (in_temporary_working_directory): temporary directory name changed.
-
-Sun Aug 23 00:56:13 2009 Tanaka Akira <akr@fsij.org>
-
- * thread.c (rb_thread_schedule): don't recur infinitely.
- (rb_threadptr_execute_interrupts): ditto.
- [ruby-dev:38060]
-
-Sat Aug 22 15:07:23 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/syck/rubyext.c (id_hash_new): new function to create a hash
- which key is compared by object id.
- (syck_emitter_reset): use id_hash_new for bonus->data.
-
- * lib/yaml.rb (YAML.quick_emit): give the object itself to emitter.
- don't use object_id and hash.
-
-Sat Aug 22 13:05:22 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * Makefile.in: use CP and MV macros.
-
-Sat Aug 22 01:29:29 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb (rm_f, rm_rf): pass the last hash through if exists.
- [ruby-dev:39153]
-
-Sat Aug 22 00:48:08 2009 Tanaka Akira <akr@fsij.org>
-
- * enumerator.c (ary2sv): add dup argument.
- (enumerator_next): call ary2sv with dup=0.
- (enumerator_peek): call ary2sv with dup=1 to return duplicated array.
- (enumerator_peek_values_m): new function to return duplicated array.
- (Init_Enumerator): use enumerator_peek_values_m as
- Enumerator#peek_value.
-
-Sat Aug 22 00:03:19 2009 Yusuke Endoh <mame@tsg.ne.jp>
-
- * thread.c (rb_check_deadlock): decrease number of sleepers before
- deadlock detection because the deadlock exception makes main thread
- run. [ruby-dev:39142]
-
-Fri Aug 21 22:34:58 2009 Tanaka Akira <akr@fsij.org>
-
- * enumerator.c (get_next_values): extracted from
- enumerator_next_values.
- (enumerator_next_values): use get_next_values.
- (enumerator_peek_values): ditto.
-
-Fri Aug 21 17:01:04 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * enc/unicode/name2ctype.h: split from enc/unicode.c and made a
- perfect hash.
-
-Fri Aug 21 15:13:08 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * include/ruby/io.h, io.c (FMODE_SETENC_BY_BOM):
- renamed from FMODE_STRIP_BOM.
-
-Thu Aug 20 01:24:55 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * io.c (rb_io_fmode_modestr): change modestr syntax for BOM
- to "BOM|UTF-*". [ruby-dev:39106]
-
- * io.c (parse_mode_enc): ditto.
-
-Fri Aug 21 15:01:35 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/readline/readline.c (readline_readline): use rb_prep_terminal
- only on Windows.
-
-Fri Aug 21 07:25:45 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/rdoc/ri/gemdirs.rb: split from lib/rdoc/ri/paths.rb to ge
- rid of loading rubygems and searching all gems always.
-
-Fri Aug 21 07:14:52 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (RUBY_PROGRAM_VERSION, RUBY_RELEASE_DATE): extracts
- from version.h for cross-compiling.
-
- * template/fake.rb.in (RUBY_VERSION, RUBY_DESCRIPTION): use above.
-
-Fri Aug 21 00:08:01 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/rdoc/ri/paths.rb (RDoc::RI::Paths): Gem::Enable has been obsolete.
-
-Thu Aug 20 23:56:15 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (rb_sysopen): moved sysopen_struct from rb_sysopen_internal.
-
-Thu Aug 20 23:39:51 2009 Yusuke Endoh <mame@tsg.ne.jp>
-
- * parse.y (reduce_nodes_gen): preserve NODE_FL_NEWLINE flag during
- node reducing. [ruby-core:24463]
-
-Thu Aug 20 14:39:47 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/readline/readline.c (readline_get): add rl_prep_terminal(1).
- incited by jitte [ruby-list:43546]
-
-Thu Aug 20 12:09:01 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (ivar2_hash_type): disabled for now.
-
-Thu Aug 20 08:39:50 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * thread.c (rb_thread_terminate_all): do not ignore interrupt when
- reaping threads on termination. [ruby-dev:39107]
-
-Thu Aug 20 02:32:08 2009 Tanaka Akira <akr@fsij.org>
-
- * enumerator.c (next_init): don't clear feedvalue.
-
-Thu Aug 20 01:28:42 2009 Tanaka Akira <akr@fsij.org>
-
- * enumerator.c: implement Enumerator#{next_values,peek_values,feed}
- and StopIteration#result. [ruby-dev:39109]
- (struct enumerator): replace no_next by stop_exc.
- new field feedvalue.
- (enumerator_mark): mark feedvalue and stop_exc.
- (enumerator_init): initialize feedvalue and stop_exc.
- (enumerator_init_copy): initialize feedvalue.
- (next_ii): send yield arguments as an array. return feedvalue.
- (next_i): generate StopIteration exception here. set result.
- (next_init): initialize feedvalue.
- (enumerator_next_values): new method Enumerator#next_values.
- (ary2sv): new function.
- (enumerator_peek_values): new method Enumerator#peek_values.
- (enumerator_feed): new method Enumerator#feed.
- (yielder_yield): return the yield value.
- (generator_each): return the iterator value.
- (stop_result): new method StopIteration#result.
-
-Thu Aug 20 01:06:48 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * dir.c (DEFINE_STRUCT_DIRENT): use union to allocate sufficient
- memory space for Solaris. a patch from Naohisa GOTO
- <ngoto at gen-info.osaka-u.ac.jp> in [ruby-dev:39132].
- [ruby-dev:39062]
-
- * configure.in (SIZEOF_STRUCT_DIRENT_TOO_SMALL): Solaris dirent
- check.
-
-Wed Aug 19 11:32:43 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * enc/unicode.c (CodeRanges): initialized statically.
-
-Wed Aug 19 02:54:01 2009 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_settracefunc.rb (test_return, test_return2): add two
- tests for [ruby-dev:38701] and [ruby-core:24463].
-
-Wed Aug 19 01:08:34 2009 Yusuke Endoh <mame@tsg.ne.jp>
-
- * compile.c (NODE_RETURN): fire return event at explicit return.
- [ruby-dev:38701]
-
-Tue Aug 18 21:00:26 2009 Tanaka Akira <akr@fsij.org>
-
- * enumerator.c (enumerator_peek): new method Enumerator#peek.
- (enumerator_next): don't rewind at end.
- [ruby-dev:38932]
-
-Tue Aug 18 13:46:14 2009 TAKANO Mitsuhiro (takano32) <tak@no32.tk>
-
- * touch test/rdoc/empty.dat to run test_rdoc_parser.rb
-
-Tue Aug 18 11:37:24 2009 wanabe <s.wanabe@gmail.com>
-
- * vm_insnhelper.c (vm_call_cfunc): ensure hook c-return.
- [Bug #1588]
-
- * test/ruby/test_settracefunc.rb (TestSetTraceFunc#test_raise):
- follow above.
-
-Tue Aug 18 01:57:00 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * range.c (range_step): treat symbols specially so that iterating
- over symbols should work like strings. [ruby-core:24780]
-
- * range.c (range_each): ditto.
-
-Tue Aug 18 01:21:31 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * range.c (range_each): should honor to_str conversion.
-
-Mon Aug 17 23:45:40 2009 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date/delta.rb: removed require 'date'. added to_c.
-
-Mon Aug 17 14:35:03 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (lex_get_str, lex_io_gets, rb_parser_compile_string):
- must be ascii compatible.
-
-Mon Aug 17 10:37:41 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * regparse.c (add_code_range_to_buf0): added with checkdup argument.
-
- * regparse.c (add_code_range_to_buf): use above.
-
- * regparse.c (add_code_range0): added with checkdup argument.
-
- * regparse.c (add_code_range): use above.
-
- * regparse.c (i_apply_case_fold): don't warn if the duplicate is
- caused by case folding.
-
-Mon Aug 17 08:31:56 2009 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date/delta.rb: merged from date4. [experimental]
-
- * lib/date/delta/parser.*: ditto.
-
- * lib/date.rb: followed the above changes.
-
-Mon Aug 17 08:19:03 2009 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date/format.rb (strptime): removed \v; since \s includes \v.
-
-Mon Aug 17 08:14:26 2009 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c (nucomp_rationalize) added. [experimental]
-
- * rational.c ({nurat,nilclass,integer,float}_rationalize) ditto.
-
-Mon Aug 17 08:11:53 2009 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/cmath.rb: use num#i.
-
-Mon Aug 17 07:59:00 2009 Tadayoshi Funaba <tadf@dotrb.org>
-
- * numeric.c (flo_pow,fix_pow): may return complex number.
-
- * bignum.c (rb_big_pow): ditto.
-
-Mon Aug 17 07:16:10 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * numeric.c (num_imaginary): num#i to return imaginary counterpart
- of the given numeric.
-
- * complex.c (Init_Complex): undef #i for complex numbers.
-
-Mon Aug 17 00:17:33 2009 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/complex.rb, lib/rational.rb: added warning messages.
-
-Sun Aug 16 23:58:22 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (yylex): should dispatch scan-event even when follows
- just after delayed-token. [ruby-dev:37855] [Bug #1071]
-
-Sun Aug 16 22:20:16 2009 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date/format.rb: reverted.
-
-Sun Aug 16 21:31:21 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/date/format.rb: suppressed a warning.
-
- * lib/irb/ruby-lex.rb: ditto.
-
-Sun Aug 16 15:25:26 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/csv.rb: Change magic comment to US-ASCII in order to
- make literals as US-ASCII.
-
-Sun Aug 16 10:45:10 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * regparse.c (parse_char_class, parse_exp, parse_branch),
- (parse_subexp): fixed memory leak. a patch from Ralf Junker
- <ralfjunker AT gmx.de> at [ruby-core:24921].
-
-Sun Aug 16 10:38:23 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm.c (vm_backtrace_each, vm_backtrace_push),
- vm_eval.c (print_backtrace), vm_dump.c (bugreport_backtrace):
- rb_backtrace_iter_func now takes VALUE as file and method names.
-
-Sun Aug 16 03:06:59 2009 Koichi Sasada <ko1@atdot.net>
-
- * vm_insnhelper.c (opt_eq_func): fix optimization bug. This issue
- was found out and debugged with Takuto Hayashi at Security and
- Programming camp 2009.
-
-Sun Aug 16 01:10:00 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * regparse.c (add_ctype_to_cc_by_range): fix the first
- character bigger than sb_out was dropped.
-
- * test/ruby/test_regexp.rb (TestRegexp#test_posix_bracket):
- add tests for above.
-
-Sun Aug 16 00:30:33 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * include/ruby/oniguruma.h
- (ONIGENC_CTYPE_SPECIAL_MASK): added.
- (ONIGENC_CTYPE_D): ditto.
- (ONIGENC_CTYPE_S): ditto.
- (ONIGENC_CTYPE_W): ditto.
-
- * regparse.c: \d, \s and \w are now non Unicode class.
- [ruby-dev:39026]
- (fetch_token_in_cc): use ONIGENC_CTYPE_[DSW] for \d/\s/\w.
- (fetch_token): ditto.
- (add_ctype_to_cc): add routines for ONIGENC_CTYPE_[DSW].
- (parse_exp): ditto.
-
- * test/ruby/test_regexp.rb (TestRegexp#test_char_class):
- add tests for above.
-
-Sat Aug 15 10:39:53 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (fname, string_dvar, sym, dsym, f_arglist): removed
- duplications.
-
-Fri Aug 14 20:03:10 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/ruby.h (rb_check_safe_str): deprecated.
-
- * ext/openssl/ossl_x509store.c (ossl_x509store_add_{file,path}):
- replaced deprecated function.
-
-Fri Aug 14 17:59:12 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * re.c (rb_reg_preprocess_dregexp): change Exception class to
- RegexpError.
-
- * test/ruby/test_m17n.rb (test_regexp_usascii): follow above.
-
- * test/ruby/test_m17n.rb (test_regexp_embed): ditto.
-
-Fri Aug 14 17:17:42 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/Makefile.in (MKDIRS): revert r24525.
-
-Fri Aug 14 16:28:19 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/digest/lib/digest/hmac.rb (Digest::HMAC#initialize): faster
- code.
-
-Fri Aug 14 14:31:33 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (rubyhdrdir): fixed typo. [ruby-dev:39079]
-
-Fri Aug 14 00:29:22 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * doc/ChangeLog-1.8.0: add forgotten entry contributed by
- TAKAHASHI Kaoru. [ruby-dev:39065]
-
-Fri Aug 14 00:19:49 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/delegate.rb (Delegator#method_missing): __FILE__ may contain
- multi-byte characters. a patch from Kenta Murata in [ruby-dev:39066].
-
-Thu Aug 13 21:01:03 2009 wanabe <s.wanabe@gmail.com>
-
- * vm.c (vm_exec): returning from lambda runs ensure section.
- [Bug #1729]
-
-Thu Aug 13 18:40:07 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (RUBY_CHECK_SIZEOF): set cross_compiling to yes
- only when AC_COMPUTE_INT, and inverted the arguments.
-
-Thu Aug 13 18:22:08 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (RUBY_CHECK_SIZEOF): use AC_COMPUTE_INT instead of
- _AC_COMPUTE_INT_COMPILE with cross compiling, since its arguments
- have been changed at autoconf 2.64.
-
-Thu Aug 13 16:31:10 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * insns.def (opt_case_dispatch): suppressed a warning.
-
- * vm_insnhelper.c (opt_case_dispatch_i): ditto.
-
-Thu Aug 13 16:20:07 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in, Makefile.in (MAKEDIRS): used MKDIR_P instead of
- as_mkdir_p. [ruby-dev:39063]
-
-Thu Aug 13 15:37:33 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * regenc.c (onigenc_strlen_null, onigenc_str_bytelen_null): fixed
- infinite loop for wide encodings. reported by Ralf Junker a
- [ruby-core:24892]. [ruby-core:24904]
-
-Wed Aug 12 21:07:46 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/socket/extconf.rb: if ipv6 is enabled, the version of Windows
- must be XP or later.
- [ruby-core:24601]
-
-Wed Aug 12 15:59:29 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * common.mk (yes-test-knownbug): use RUNRUBY instead of MINIRUBY.
-
-Wed Aug 12 15:52:04 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * class.c (rb_define_module_id_under): fix the name.
-
- * class.c (rb_define_module_under): fix for previous changes.
-
-Wed Aug 12 15:32:16 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * class.c (rb_define_class_id_under, rb_define_module_id_under):
- new functions to define a nested class/module with non-ascii
- name.
-
- * struct.c (make_struct): use name with encoding.
-
- * struct.c (inspect_struct): ditto. [ruby-core:24849]
-
-Wed Aug 12 Wed Aug 12 14:54:34 2009 Koichi Sasada <ko1@atdot.net>
-
- * insns.def, vm.c, vm_insnhelper.c, vm_insnhelper.h: check
- definition of (classes)#=== for case/when optimization.
- Fix Bug #1376 [ruby-core:23190].
-
- * string.c (Init_String), bignum.c (Init_Bignum),
- numeric.c (Init_Numeric): define String#===, Symbol#===,
- Bignum#===, Fixnum#===, Float#=== as same as (classes)#==.
-
-Wed Aug 12 14:14:42 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (readdir_internal): free old temporary filename.
- [ruby-core:24820]
-
-Wed Aug 12 12:59:51 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_str_new_frozen): must not change encoding of frozen
- shared string. [ruby-dev:39068]
-
-Wed Aug 12 11:51:51 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (rb_cv_broken_crypt): needs more checks.
-
-Wed Aug 12 07:41:31 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * encoding.c (rb_enc_compatible): If a string is empty and
- other's encoding is US-ASCII, returns the empty string's encoding.
- [ruby-list:46274]
-
-Wed Aug 12 07:38:12 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * encoding.c (is_data_encoding): fix condition.
-
- * encoding.c (enc_capable): ditto.
-
-Tue Aug 11 23:12:31 2009 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date.rb (complete_frags): Monday must be suitable for %W's
- default day.
-
-Tue Aug 11 21:42:46 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * numeric.c (num_divmod): fixed rdoc. [ruby-core:24862]
-
-Mon Aug 10 21:45:26 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/intern.h (rb_path2class): no deprecation.
-
-Mon Aug 10 10:57:59 2009 Narihiro Nakamura <authorNari@gmail.com>
-
- * gc.c: reject unused longlife gc. longlife gc target is longlife
- NODE by method table and vm inline cache. but, fixed it at
- r24085, r24128. so I rejected longlife gc.
-
- * debug.c: ditto.
-
- * include/ruby/intern.h: ditto.
-
- * include/ruby/ruby.h: ditto.
-
- * iseq.c: ditto.
-
- * node.h: ditto.
-
- * vm_insnhelper.c: ditto.
-
- * vm_insnhelper.h: ditto.
-
-Mon Aug 10 06:55:45 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * marshal.c (class2path, w_unique, w_extended, w_class, w_uclass):
- deal with non-ascii class path. [ruby-core:24790]
-
- * marshal.c (r_unique, path2class, path2module, obj_alloc_by_path),
- (r_object0): ditto.
-
- * variable.c (rb_path_to_class): new encoding-aware function to
- get a class from its name.
-
-Sun Aug 9 21:14:03 2009 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/extconf.rb (search_tclConfig): last change isn't enough.
- fixed it.
-
-Sun Aug 9 16:36:51 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (ruby.imp): excluded prelude.o to get rid of circular
- dependency. [ruby-dev:39052]
-
-Sun Aug 9 14:49:24 2009 Yusuke Endoh <mame@tsg.ne.jp>
-
- * bignum.c (rb_big_cmp, bigsub, big_real_len, bigmul1_normal,
- bigmul1_balance, big_split): remove BDIGITS() inside of the loops.
- same as r24444.
-
-Sat Aug 8 17:03:21 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * encoding.c (enc_ascii_compatible_p): added. [ruby-core:24793]
- (Init_Encoding): New API Encoding#ascii_compatible?.
-
-Sun Aug 9 07:25:07 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/ripper/eventids2.c (token_to_eventid): added
- keyword_do_LAMBDA. [ruby-dev:39049]
-
-Sun Aug 9 02:07:41 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * tool/compile_prelude.rb: fixes a regexp pattern for require.
- It had matched 'require("foo"('.
-
-Sat Aug 8 11:42:44 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bignum.c (bigzero_p): removing BDIGITS() inside of the
- loop. inspired by Masahiro Kanai's blog entry
- <http://d.hatena.ne.jp/CanI/20090807/1249657492>.
-
-Sat Aug 8 06:18:29 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * marshal.c (w_symbol r_symlink, r_symbol, r_object0): fix for
- non-ascii symbols. loading such symbols can cause segfaults in
- older versions. [ruby-core:24788]
-
-Fri Aug 7 03:25:06 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval_error.c (error_print): removed an extra argument.
-
-Fri Aug 7 03:22:50 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_exc_raise, rb_exc_fatal): nil is used to reraise.
-
-Fri Aug 7 01:49:41 2009 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/digest/sha2/sha2.c: The ULL suffix is not supported by
- pre-C99 compilers, so resurrect the ULL() macro to regain
- portability. [ruby-dev:39032]
-
-Fri Aug 7 01:35:26 2009 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/digest/*/extconf.rb: inttypes.h and unistd.h need not be
- checked here. [ruby-dev:39032]
-
-Fri Aug 7 01:04:17 2009 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/extconf.rb (search_tclConfig): fix logic bug.
-
-Thu Aug 6 21:18:15 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/digest/sha2/lib/sha2.rb: should require sha2.so.
-
-Thu Aug 6 21:11:40 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/digest/sha2/sha2.c (*_Final): typos.
-
-Thu Aug 6 19:46:56 2009 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/digest/sha2/sha2.h (BYTE_ORDER): Define BYTE_ORDER as
- necessary. [ruby-dev:39029]
-
-Thu Aug 6 16:36:25 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * encoding.c (valid_encoding_name_p): rejects too long encoding
- names.
-
- * encoding.c (encoding_data_type): typed data.
-
- * encoding.c (enc_capable, rb_enc_get_index): Symbol is encoding
- capable.
-
- * encoding.c (rb_enc_associate_index): cannot set encoding on
- special constants.
-
-Thu Aug 6 15:44:04 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm_method.c (rb_method_entry_eq): deals with optimized method
- properly. [ruby-core:24789]
-
-Thu Aug 6 13:30:11 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/mkmf/base.rb (TestMkmf): was turned into a class, because
- MiniUnit doesn't complain even if a testcase has no tests.
-
-Thu Aug 6 13:00:30 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb (check_sizeof): added optional compiler option
- argument. [ruby-core:24785]
-
- * lib/mkmf.rb (create_makefile): suppressed shadowing outer local
- variable warnings.
-
-Thu Aug 6 12:05:06 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/test/unit/testcase.rb (Test::Unit): removes silly TestCase
- class.
-
-Thu Aug 6 01:37:20 2009 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/digest/sha2/sha2.[ch]: Update to 1.0 RELEASE which fixes an
- off-by-one bug in SHA-256 hashing. Reduce differences from
- the original while at it. [Bug #1799]
-
-Thu Aug 6 00:09:56 2009 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/ipaddr.rb (IPAddr#hash): Take account of netmask; submitted
- by Nobuhiro IMAI in [ruby-dev:39011]
-
-Wed Aug 5 19:19:13 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (load_file_internal): assumes -x flag if no "ruby" is in
- the shebang line. [ruby-dev:39015]
-
-Wed Aug 5 19:11:01 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ruby.c (rb_stdio_set_default_encoding): declared.
-
-Wed Aug 5 18:46:01 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * debug.c (ruby_dummy_gdb_enums): made public. [ruby-dev:39001]
-
-Wed Aug 5 13:49:09 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_upto): generate numerical sequence when
- characters in both edges are all digits. [ruby-talk:343186]
-
-Wed Aug 5 12:54:00 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_exc_raise, rb_exc_fatal): require exception object.
- [ruby-core:24767]
-
-Wed Aug 5 12:39:23 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_longjmp): reset raised flag before fatal error.
-
-Wed Aug 5 10:20:39 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * re.c (rb_reg_preprocess_dregexp): add options to arguments.
-
- * re.c (rb_reg_new_ary): follow above.
-
- * re.c (rb_reg_preprocess_dregexp): change error message when
- /.../n has a non escaped non ASCII character in non ASCII-8BIT
- script. [ruby-dev:38524]
-
-Wed Aug 5 03:28:41 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/test/unit.rb (Test::Unit.setup_argv): expands paths before
- requiring. [ruby-dev:39012]
-
-Wed Aug 5 01:38:27 2009 Yusuke Endoh <mame@tsg.ne.jp>
-
- * lib/pp.rb (guard_inspect_key): untrust internal hash to prevent
- unexpected SecurityError.
-
- * test/ruby/test_object.rb: add a test for [ruby-dev:38982].
-
-Wed Aug 5 00:33:05 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/rdoc/parser/c.rb: fixed a small error in the documentation.
- [ruby-core:24744]
-
-Tue Aug 4 22:10:34 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (has_redirection): need to execute shell if commandline
- includes newline. cf. [ruby-core:24560]
-
-Tue Aug 4 15:06:58 2009 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/ipaddr.rb (IPAddr#{eql?,hash}): Add IPAddr#{eql?,hash} so
- that an IPAddr object can be used as a hash key, a set element,
- etc.; suggested by Nick Brown <nick@nick-brown.com>.
-
-Tue Aug 4 13:07:10 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * include/ruby/oniguruma.h (ONIG_SYN_WARN_CC_DUP): defined.
- * regparse.h (ScanEnv): add warnings_flag.
- * regparse.c (CC_DUP_WARN): defined for warn duplicated characters in
- character class of regexp. [ruby-core:24593]
- (add_code_range_to_buf): add CC_DUP_WARN.
- (next_state_val): add CC_DUP_WARN.
- (OnigSyntaxRuby): add ONIG_SYN_WARN_CC_DUP.
- (SET_ALL_MULTI_BYTE_RANGE): add env to arguments.
- (add_code_range): ditto.
- (add_code_range_to_buf): ditto.
- (not_code_range_buf): ditto.
- (or_code_range_buf): ditto.
- (and_code_range1): ditto.
- (and_code_range_buf): ditto.
- (and_cclass): ditto.
- (or_cclass): ditto.
- (add_ctype_to_cc_by_range): ditto.
- (add_ctype_to_cc): ditto.
- (parse_char_class): ditto.
-
-Tue Aug 4 12:40:45 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/encdb.c (ENC_SET_BASE): fix typo.
- patch by ujihisa [ruby-dev:39004]
-
-Tue Aug 4 11:57:39 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * range.c (range_eql, range_eq): fixed equality to work for
- subclasses of Range. a patch from Marc-Andre Lafortune.
- [ruby-core:22190]
-
- * test/ruby/test_range.rb: add assertions for above.
-
-Tue Aug 4 09:41:11 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/big5.c (EncLen_Big5): back to original Big5 table.
- (EncLen_Big5_HKSCS): for Big5-HKSCS.
- (trans): add the lead byte table for Big5-HKSCS.
- (big5_mbc_enc_len): abstract function for Big5 series.
- (big5_mbc_enc_len): for Big5.
- (big5_hkscs_mbc_enc_len): for Big5-HKSCS.
- (BIG5_HKSCS_P): added.
- (BIG5_ISMB_FIRST): add routine for Big5-HKSCS.
- (big5_hkscs): add for Big5-HKSCS.
-
-Tue Aug 4 09:33:54 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * encoding.c (rb_enc_set_base): Add for setting base encoding
- with their names. this is internal function.
-
- * template/encdb.h.tmpl: specify ENC_SET_BASE for second encodings in
- each encoding files.
-
- * enc/encdb.c (rb_enc_set_base): add a declaration.
- (ENC_SET_BASE): ditto.
-
-Tue Aug 4 06:30:01 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * hash.c (rb_hash_replace): should copy compare_by_identity status as well.
- [ruby-core:24728]
-
-Tue Aug 4 05:43:03 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * thread.c (recursive_push): need to set UNTRUST. [ruby-dev:38997]
-
-Tue Aug 4 03:56:51 2009 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tcltklib.c: fix trouble on old-style C function
- declarations [ruby-core:22871].
-
- * ext/tk/lib/tcltklib.c: (ruby_1_8) fix warning about RUBY_RELEASE_DATE
-
- * ext/tk/lib/tk/multi-tk.rb: kill zombie threads.
-
- * ext/tk/lib/tk/fontchooser.rb: fix typo and support OptionObj.
-
- * ext/tk/lib/tk/{canvas.rb,virtevent.rb,image.rb,timer.rb}:
- don't create unnecessary array.
-
-Mon Aug 3 22:19:24 2009 Yusuke Endoh <mame@tsg.ne.jp>
-
- * eval.c (rb_mod_include): fix document. [ruby-core:24675]
-
-Mon Aug 3 18:25:08 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * sample/svr.rb: obsolete TCPserver renamed. [ruby-core:24712]
-
- * sample/tsvr.rb: ditto.
-
- * sample/dualstack-httpd.rb: ditto.
-
-Mon Aug 3 18:12:54 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * thread.c (recursive_push): untrust internal hash to prevent
- unexpected SecurityError. a patch from Kazuhiro NISHIYAMA.
- Fix: #1864 [ruby-dev:38982]
-
-Mon Aug 3 17:06:05 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/README: updated. a patch from Daniel Bovensiepen.
- [ruby-core:24693]
-
-Mon Aug 3 16:28:09 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (rb_w32_connect): return value was broken when some
- error occurred.
- [ruby-core:24234]
-
-Mon Aug 3 15:56:52 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * array.c (permute0): use chars for boolean array.
-
- * array.c (rb_ary_{permutation,combination}): disallow reentrance
- with continuation since work-buffers cannot restore.
-
- * array.c (rb_ary_{permutation,combination,product}): must not use
- ary_discard on strings.
-
-Mon Aug 3 06:43:25 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * numeric.c (flo_hash): normalize -0.0 to 0.0. [ruby-core:24577]
-
-Mon Aug 3 00:32:00 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * random.c (rb_random_int): arguments have to be converted to
- integer. [ruby-core:24679]
-
-Sun Aug 2 21:04:37 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (literal_concat0): tail can be nil. [ruby-dev:38980]
-
-Sun Aug 2 20:09:07 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * array.c (rb_ary_combination, rb_ary_product): prevent from GC.
-
-Sun Aug 2 16:53:19 2009 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_rand.rb: add tests for Random#float's rejection
- against Infinity and NaN.
-
-Sun Aug 2 14:20:43 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * random.c (rand_int): prevent from GC.
-
-Sat Aug 1 19:23:27 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (tr_trans): change condition of singlebyte
- optimization.
-
-Sat Aug 1 18:50:53 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * random.c (random_float): rejects Infinity and NaN.
- [ruby-core:24651]
-
-Sat Aug 1 18:34:52 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * tool/rbinstall.rb (gem): suppressed warnings.
- cf: [ruby-dev:38975]
-
-Sat Aug 1 05:18:36 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (tr_trans): can't use singlebyte optimization when
- the replacement is multibyte. [ruby-core:24612]
-
-Fri Jul 31 18:01:34 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * lib/securerandom.rb (SecureRandom.random_bytes): return string should
- be ASCII-8BIT. [ruby-core:24640]
-
-Fri Jul 31 16:28:33 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * io.c (rb_stdio_set_default_encoding): added.
-
- * ruby.c (process_options): call rb_stdio_set_default_encoding
- after setting default internal and external.
-
-Fri Jul 31 15:06:33 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * tool/compile_prelude.rb: too long string literal causes compile error
- on some platforms.
-
-Fri Jul 31 13:15:27 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * transcode.c (str_encode_bang): C99ism.
-
-Fri Jul 31 11:48:03 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * compile.c (iseq_compile_each): used more appropriate construct.
-
-Fri Jul 31 10:54:08 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (literal_concat_gen): reduced unnecessary node at string
- literal concatenation with empty head dstr. [ruby-dev:38968]
-
-Fri Jul 31 02:57:39 2009 Yusuke Endoh <mame@tsg.ne.jp>
-
- * parse.y (literal_concat_gen): NODE_DSTR was incorrectly handled as
- NODE_STR. [ruby-dev:38968]
-
- * bootstraptest/test_syntax.rb: add a test for above.
-
-Fri Jul 31 00:55:48 2009 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_module.rb (test_ancestors, test_included_modules):
- ignore rake mixins.
-
-Fri Jul 31 00:30:54 2009 Yusuke Endoh <mame@tsg.ne.jp>
-
- * vm_insnhelper.c (vm_call_cfunc): let set_trace_func use called_id
- instead of original_id.
-
-Thu Jul 30 23:04:32 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * gem_prelude.rb (Gem.path): uses Gem.default_path as a default value
- so that ruby finds gems in ~/.gem/.
- (Gem.user_home): reduced version of lib/rubygems.rb's.
- Gem.default_path needs it.
-
-Thu Jul 30 22:28:04 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * tool/compile_prelude.rb: replaces "require" with in-place evaluation
- so that copy & paste for lib/rubygems/default.rb is not necessary.
-
- * gem_prelude.rb: removes copied codes from lib/rubygems/defaults.rb.
- uses require instead.
-
- * common.mk (prelude.c): adds dependency for lib/rubygems/defaults.rb.
-
-Thu Jul 30 21:56:18 2009 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_rand.rb: add tests for Random class.
-
-Thu Jul 30 21:48:56 2009 Yusuke Endoh <mame@tsg.ne.jp>
-
- * random.c (init_genrand): ensure invariant of mt->next and mt->left.
- mt->next should always equal mt->state + N + 1 - mt->left.
- In fact, 'r = Random.new(0); r == r.dup' has returned false.
-
-Thu Jul 30 21:43:41 2009 Yusuke Endoh <mame@tsg.ne.jp>
-
- * random.c (random_bytes): use NUM2LONG instead of FIX2LONG because
- Random#bytes may receive bignum.
-
-Thu Jul 30 21:39:42 2009 Yusuke Endoh <mame@tsg.ne.jp>
-
- * compile.c (iseq_compile_each): fix stack consistency error.
- [ruby-core:24611]
-
- * bootstraptest/test_method.rb: add tests for above.
-
-Thu Jul 30 18:39:39 2009 Martin Duerst <duerst@it.aoyama.ac.jp>
-
- * transcode.c: added check for frozen string for encode! (see Bug #1836)
-
- * test/ruby/test_transcode.rb: added tests for the above
-
-Thu Jul 30 16:45:39 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * insns.def (defineclass): preserve encoding of class/module
- names. [ruby-core:24600]
-
- * variable.c (rb_set_class_path_string): set class path with a
- string value.
-
-Thu Jul 30 16:12:48 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * variable.c (Init_var_tables): initializes __classid__ ID.
-
- * variable.c: use st_data_t for st functions.
-
-Thu Jul 29 14:25:14 2009 Takeyuki FUJIOKA <xibbar@ruby-lang.org>
-
- * lib/cgi/util.rb (CGI::unescape): support encoding option.
-
- * lib/cgi/cookie.rb (CGI::Cookie.parse): fix for the encoded value.
-
-Wed Jul 29 08:08:07 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * parse.y (regexp): regexp literal at the top of dstr is still needed
- even if it is empty.
-
-Wed Jul 29 03:36:24 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/json/lib/json/common.rb (JSON#recurse_proc): remove
- unnecessary private specifier. [ruby-dev:38929]
-
-Wed Jul 29 03:34:46 2009 Koichi Sasada <ko1@atdot.net>
-
- * vm_core.h, vm_insnhelper.c (vm_call_method): revive
- VM_CALL_OPT_SEND_BIT and use it to recognize "send" method.
-
-Wed Jul 29 03:11:59 2009 Koichi Sasada <ko1@atdot.net>
-
- * proc.c (rb_method_entry_arity): support not_implemented method.
- (I have no idea to test it)
-
-Tue Jul 28 19:36:26 2009 Koichi Sasada <ko1@atdot.net>
-
- * proc.c (rb_method_entry_arity): support optimized method (send).
-
- * test/ruby/test_method.rb: add a test for above.
-
-Tue Jul 28 04:34:05 2009 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/extconf.rb: bug fix and ignore invalid Tcl/Tk libraries.
-
- * ext/tk/lib/config_list.in: bug fix and add a new option.
-
- * ext/tk/lib/README.tcltklib: update for a new option.
-
-Mon Jul 27 19:03:07 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/intern.h (rb_*str_new_cstr, rb_str_buf_new_cstr),
- (rb_str_buf_cat2, rb_str_cat2, rb_exc_new2): suppress warnings.
-
-Mon Jul 27 10:24:50 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/rdoc/parser.rb (RDoc::Parser.binary?): fix for empty files.
- [ruby-dev:38848]
-
-Mon Jul 27 06:51:41 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (argf_eof): should call next_argv() before testing.
- [ruby-core:24561]
-
-Sun Jul 26 19:17:33 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (argf_eof): go to the next file if called after ARGF.close
- or ARGF.skip. a patch from Mike Kasick at [ruby-core:24561].
-
-Sun Jul 26 18:30:02 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm_insnhelper.c (vm_call_method): __send__ can call protected
- methods. [ruby-core:24500]
-
-Sun Jul 26 01:09:14 2009 Alexander Zavorine <alexandre.zavorine@nokia.com>
-
- * ext/bigdecimal.c: moved BASE_FIG definition before it is used
- first time.
-
- * include/ruby/defines.h [__SYMBIAN32__]: defined TRUE and FALSE to match
- changes in bignum.c and array.c.
-
-Sat Jul 25 17:49:03 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (argf_eof): should not have reached EOF before trying to
- read. based on a patch by Heesob Park <phasis AT gmail.com> a
- [ruby-core:24559]. [ruby-core:24557]
-
-Sat Jul 25 13:44:28 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * complex.c (nucomp_hash), rational.c (nurat_hash): not to use
- hash value of class so that equality against subclasses can
- work. [ruby-dev:38850]
-
-Sat Jul 25 01:05:59 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/big5.c: Fix EncLen_BIG5 for Big5-HKSCS. see [ruby-core:24390]
-
-Fri Jul 24 19:19:19 2009 Martin Duerst <duerst@it.aoyama.ac.jp>
-
- * enc/trans/big5.trans, big5-hkscs-tbl.rb:
- new Chinese BIG5-HKSCS transcoding (with Tatsuya Mizuno)
- see [ruby-core:24390]
-
- * test/ruby/test_transcode.rb: added tests for the above
- (with Tatsuya Mizuno)
-
- * enc/big5.c: Added BIG5-HKSCS as a replicate encoding of BIG5
- (short term solution, needs more work; with Tatsuya Mizuno)
-
- * tool/transcode-tblgen.rb: made 'pat' directly accessible in
- class StrSet
-
-Fri Jul 24 18:03:01 2009 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/net/imap.rb (idle): leaves IDLE in a ensure clause. a patch
- from Eric Hodel.
-
- * test/net/imap/test_imap.rb (setup, teardown): turn on
- Socket.do_not_reverse_lookup in tests.
-
-Fri Jul 24 00:13:41 2009 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/net/imap.rb (resp_text_code): accepts response codes without
- text. [ruby-core:24194]
-
- * lib/net/imap.rb (idle, idle_done): new methods for the IMAP4 IDLE
- command (RFC 2177). Thanks, Eric Hodel.
-
- * lib/net/imap.rb (format_date, format_datetime): new method to
- format IMAP-style date/datetime. Thanks, Eric Hodel.
-
-Thu Jul 23 17:31:02 2009 Keiju Ishitsuka <keiju@ruby-lang.org>
-
- * lib/irb/ruby-lex.rb: make irb be able to parse
- string_dvar. [ruby-core: 24051]
-
-Thu Jul 23 17:26:51 2009 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/extconf.rb: should not create "config_list" in a $srcdir.
-
-Thu Jul 23 14:35:02 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (rb_w32_{open,wopen}): fixed typos. these conditions
- mean to call runtime's open() if textmode.
-
-Thu Jul 23 08:53:24 2009 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc/markup/simple_markup/: Remove useless directory.
- [Bug #1343]
-
-Thu Jul 23 08:52:12 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * random.c (random_{state,left}): internal/debug use.
-
-Wed Jul 22 19:29:26 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * test/ruby/test_module.rb (TestModule#test_alias): warning
- message updated.
-
-Thu Jul 23 00:39:25 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (class.o): depends on vm_core.h.
-
-Thu Jul 23 00:10:02 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * time.c (init_leap_second_info): checks the result of gmtime to
- suppress warnings.
-
-Wed Jul 22 22:23:24 2009 Yusuke Endoh <mame@tsg.ne.jp>
-
- * vm_core.h (struct rb_iseq_t): add a new field line_no. This field
- represents line number from which the original code of the iseq
- starts. [ruby-dev:38698]
-
- * iseq.c, compile.c: ditto.
-
- * parse.y: line number hack (for Proc#source_location) is no longer
- needed.
-
- * test/ruby/test_settracefunc.rb: line number of set_trace_func is now
- compatible with 1.8's.
-
-Wed Jul 22 22:16:48 2009 URABE Shyouhei <shyouhei@ruby-lang.org>
-
- * method.h: Commas at end of enum list not allowed as of C89
-
- * vm_method.c (rb_add_method): avoid C++ comment
-
- * vm_insnhelper.c (vm_call_cfunc): ditto.
-
-Wed Jul 22 20:42:52 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/socket/extconf.rb: define IPPROTO_IPV6 macro for recent Windows
- SDK.
-
-Wed Jul 22 19:32:10 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/socket/mkconstants.rb: define IPV6_* constants only when INET6
- is defined.
-
-Wed Jul 22 19:23:04 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/socket/extconf.rb: ipv6 support is disabled by default on mswin.
-
-Wed Jul 22 17:41:08 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/socket/ipsocket.c (init_inetsock_internal): drop IPv6 addresses
- if INET6 is not defined.
-
-Wed Jul 22 17:29:59 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/socket/extconf.rb: enable ipv6 support for win32.
-
-Wed Jul 22 16:38:39 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * hash.c (Hash::[]): rdoc. patch by Marc-Andre Lafortune.
- #1385.
-
-Wed Jul 22 10:00:53 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (WSAMSG): get rid of compile error on VC9 and mingw.
-
-Wed Jul 22 06:35:56 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * test/ruby/test_enum.rb (TestEnumerable#each): recursive join now
- raises ArgumentError.
-
-Wed Jul 22 02:33:57 2009 Keiju Ishitsuka <keiju@ruby-lang.org>
-
- * lib/irb.rb: forget svn commit.
-
-Wed Jul 22 01:20:54 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bootstraptest/test_io.rb: block write may block for long time.
-
-Wed Jul 22 00:34:39 2009 Keiju Ishitsuka <keiju@ruby-lang.org>
-
- * lib/irb.rb, lib/irb/init.rb, lib/irb/ext/save-history.rb: add
- IRB::irb_at_exit. no use finalizer saving history. [ruby-dev-38563]
-
-Tue Jul 21 23:47:38 2009 Yusuke Endoh <mame@tsg.ne.jp>
-
- * random.c (rand_init): array length of random seed was broken, which
- causes memory error with srand(2**1000000-1).
-
- * test/ruby/test_rand.c: test for above.
-
-Tue Jul 21 21:37:19 2009 Keiju Ishitsuka <keiju@ruby-lang.org>
-
- * lib/irb/cmd/help.rb: fixed irb's "help" command. [ruby-core:22310].
-
- * lib/tracer.rb: no show lines unknown line number. [ruby-core:22096],
- no trace display c-call and c-return as default.
-
-Tue Jul 21 16:24:41 2009 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (vtdate2rbtime): VT_DATE variant object
- is converted to Time object now.
-
- * test/win32ole/test_win32ole_variant.rb (test_s_new_with_nil,
- test_conversion_time2date, test_conversion_str2date,
- test_conversion_vt_date, test_set_value): ditto.
-
- * ext/win32ole/win32ole.c (rbtime2vtdate): refactoring.
-
-Tue Jul 21 16:07:57 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/tracer.rb: toplevel caller exists now. [ruby-core:24454]
-
-Tue Jul 21 13:36:20 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.[ch] (recvmsg, sendmsg): new functions to support recvmsg/
- sendmsg like UNIX. these functions are experimental and not tested
- well. bug reports are welcome.
-
-Tue Jul 21 13:35:21 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/Makefile.sub (TEST_RUNNABLE): follow r24209.
-
-Tue Jul 21 12:45:31 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * gc.c (rb_gc_enable, rb_gc_disable): should return Qtrue/Qfalse.
-
-Tue Jul 21 12:38:07 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * variable.c (rb_generic_ivar_memsize): should not remove generic
- instance variable table.
-
-Mon Jul 20 20:35:55 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * io.c (rb_f_open): add rdoc about specifying ext_enc as *-bom.
-
-Mon Jul 20 19:00:58 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * compile.c (compile_dstr_fragments): reduced needless literal.
-
- * parse.y (xstring, regexp, dsym, literal_concat, evstr2dstr):
- literal at the top of dstr is no longer needed if it is empty,
- since concatstrings and toregexp always create new strings.
-
-Mon Jul 20 12:51:39 2009 wanabe <s.wanabe@gmail.com>
-
- * lib/matrix.rb (Matrix#rank): revert a part of r20859 to avoid
- infinite loop. [Bug #1020]
-
-Mon Jul 20 11:12:54 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in, Makefile.in (TEST_RUNNABLE): tests are no
- runnable if cross-compiling.
-
- * common.mk (btest*, test*): ditto.
-
-Mon Jul 20 10:55:18 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/lib/socket.rb (Addrinfo#family_addrinfo): fix a typo in
- error message. patch by Nobuhiro IMAI. [ruby-dev:38828]
-
-Sun Jul 19 22:22:54 2009 Tadayoshi Funaba <tadf@dotrb.org>
-
- * rational.c (float_to_r): an improvement.
-
-Sun Jul 19 20:41:24 2009 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c (make_patterns): do not use \d.
-
- * rational.c (make_patterns): ditto.
-
-Sun Jul 19 17:32:37 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (io_read): should taint the result. [ruby-dev:38826]
-
-Sun Jul 19 11:00:14 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm_method.c (me_opts): fixed optimized method aliasing.
- [ruby-dev:38824]
-
-Sun Jul 19 10:54:56 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/lib/socket.rb (Socket.accept_loop): rescue
- IO::WaitReadable instead of Errno::EWOULDBLOCK.
- (Socket.udp_server_loop_on): ditto.
-
-Sat Jul 18 23:44:59 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * re.c (reg_enc_error): use rb_enc_get to get the encoding of
- a Regexp object. REGEXP(re)->ptr->enc is the encoding of the
- regexp engine for patterns and target strings.
- [ruby-core:23208]
-
-Sat Jul 18 17:43:12 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_str_hash_cmp): got rid of overflow.
-
-Sat Jul 18 16:03:01 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/defines.h (TRUE, FALSE): for internal use.
-
-Sat Jul 18 11:39:49 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * random.c: workaround for VC++ 6.0.
-
-Sat Jul 18 09:16:18 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * random.c (rb_random_{int32,real,bytes,int}): added functions for
- extension libraries.
-
-Sat Jul 18 09:07:00 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * random.c (fill_random_seed): use cryptographic service on Windows.
-
-Sat Jul 18 07:56:00 2009 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb: fail to create a widget object for an unknown
- widget path.
-
-Sat Jul 18 07:06:31 2009 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb,ext/tk/lib/tk/grid.rb: Bug fix on grid_slaves().
- Extend usage pattern of grid_column()/grid_row().
-
-Sat Jul 18 06:30:35 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * include/ruby/win32.h: include winsock headers in extern "C++" for
- C++ extension libraries.
-
- * include/ruby/missing.h (vsnprintf): workaround for VC++.
- [ruby-core:23096]
-
-Sat Jul 18 00:23:47 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * ext/readline/readline.c (Init_readline): rl_catch_signals does
- not exist on some platform like Mac OS X 10.5.
-
- * ext/readline/extconf.rb: checks existence of rl_catch_signals.
-
-Fri Jul 17 22:37:22 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/socket/socket.c (socket_s_ip_address_list): drop inactive
- adapters.
-
- * test/socket/test_{nonblock,addrinfo,socket}.rb: skip some tests on
- Windows.
- [ruby-core:23051]
-
-Fri Jul 17 22:29:21 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/readline/readline.c (Init_readline): use rl_catch_sigwinch only
- when existing.
-
- * ext/readline/extconf.rb: check existence of rl_catch_sigwinch, and
- workaround for native Win32 readline port.
-
-Fri Jul 17 18:18:23 2009 Tanaka Akira <akr@fsij.org>
-
- * range.c (recursive_hash): extracted from range_hash. reject
- recursive key.
- (range_hash): use recursive_hash.
-
-Fri Jul 17 18:11:32 2009 Tanaka Akira <akr@fsij.org>
-
- * struct.c (recursive_hash): extracted from rb_struct_hash. reject
- recursive key.
- (rb_struct_hash): use recursive_hash.
-
-Fri Jul 17 16:45:22 2009 Tanaka Akira <akr@fsij.org>
-
- * array.c (recursive_hash): reject recursive key.
-
-Fri Jul 17 15:20:53 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * random.c (DIGSPERINT): fix for LP64.
-
- * random.c (fill_random_seed): /dev/urandom is not available on
- DOSISH systems.
-
- * random.c (random_equal): new method Random#==.
-
-Fri Jul 17 13:35:47 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/init.c (rsock_getfamily): return AF_UNSPEC if getsockname
- is failed. [ruby-core:24383]
-
-Fri Jul 17 01:22:57 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (recursive_join): raise ArgumentError for joining
- recursive array.
-
- * array.c (ary_join_1): ditto.
-
- * test/ruby/test_array.rb (TestArray#test_join2): test updated for
- recursive join.
-
-Thu Jul 16 23:32:16 2009 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/extconf.rb,ext/tk/config_list.in: ignore paths which includes
- white space characters on Windows.[ruby-dev:38794]
-
- * ext/tk/lib/tk.rb: works on Cygwin (limitation:: Tk.mainloop works on
- the main thread only).
-
-Thu Jul 16 20:58:18 2009 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * test/win32ole/test_win32ole.rb (test_s_codepage_changed,
- test_s_locale_set, test_s_locale_change): skip test if Japanese
- locale is not installed. [ruby-core:23806]
-
- * test/win32ole/test_win32ole_variant.rb (test_conversion_str2cy):
- ditto.
-
-Thu Jul 16 19:02:28 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/socket/lib/socket.rb (Socket.tcp_server_sockets_port0): servers
- is nil if an error occurs before setting it.
-
-Thu Jul 16 18:42:56 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * random.c (fill_random_seed): suppress a warning.
-
-Thu Jul 16 18:30:20 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * hash.c (rb_hash_aset, recursive_hash): rejects recursive hash.
- [ruby-core:22921]
-
-Thu Jul 16 18:28:09 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * id.c (Init_id), vm.c (vm_exec): @#__ThrowState__ is no longer
- used. [ruby-dev:38760]
-
-Thu Jul 16 17:41:28 2009 Koichi Sasada <ko1@atdot.net>
-
- * vm_method.c (rb_alias): fix a case which try non-existing method alias.
-
- * test/ruby/test_alias.rb: add a test.
-
-Thu Jul 16 16:00:23 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (io_reopen): discards read buffer. [ruby-core:24240]
-
-Thu Jul 16 15:52:25 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * bignum.c (rb_big_new, rb_bigzero_p), range.c (rb_range_values):
- added for random.c.
-
- * random.c (rb_random_t): objectified. [EXPERIMENTAL]
- [ruby-dev:30954]
-
-Thu Jul 16 14:08:44 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_sample): RDoc update. a patch from Florian
- Frank. [ruby-core:24347]
-
-Thu Jul 16 12:42:10 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/readline/readline.c (readline_readline): rl_free_line_state
- before rl_cleanup_after_signal.
-
- * ext/readline/readline.c (Init_readline): set rl_catch_signals and
- rl_catch_sigwinch as 0. [ruby-core:21884]
-
-Thu Jul 16 08:59:22 2009 Koichi Sasada <ko1@atdot.net>
-
- * node.h, vm_core.h, variable.c: rename global_entry to rb_global_entry.
-
- * compile.c, insns.def, iseq.c, vm_insnhelper.h: ditto.
-
-Thu Jul 16 08:57:44 2009 Koichi Sasada <ko1@atdot.net>
-
- * vm_method.c: separate clearing cache entry code.
-
-Thu Jul 16 08:56:32 2009 Koichi Sasada <ko1@atdot.net>
-
- * dir.c (push_glob): re-fix GC problem.
-
-Thu Jul 16 08:55:27 2009 Koichi Sasada <ko1@atdot.net>
-
- * common.mk: add method.h.
-
-Thu Jul 16 08:53:26 2009 Koichi Sasada <ko1@atdot.net>
-
- * io.c (argf_free): free data body.
-
-Wed Jul 15 23:46:55 2009 Koichi Sasada <ko1@atdot.net>
-
- * method.h, vm_core.h: add rb_method_entry_t. Remove nodes around
- method management. This change affect some VM control stack structure.
-
- * vm.c, vm_insnhelper.c, vm_method.c, vm_eval.c: ditto. and make some
- refactoring.
-
- * insns.def, class.c, eval.c, proc.c, vm_dump.c : ditto.
-
- * vm_core.h, compile.c (iseq_specialized_instruction): remove
- VM_CALL_SEND_BIT. use another optimization tech for Kernel#send.
-
- * node.h: remove unused node types.
-
- * ext/objspace/objspace.c (count_nodes): ditto.
-
- * gc.c: add mark/free functions for method entry.
-
- * include/ruby/intern.h: remove decl of
- rb_define_notimplement_method_id(). nobody can use it
- because noex is not opened.
-
- * iseq.c (iseq_mark): fix to check ic_method is available.
-
- * iseq.c (rb_iseq_disasm): fix to use rb_method_get_iseq().
-
-Wed Jul 15 23:45:11 2009 Koichi Sasada <ko1@atdot.net>
-
- * dir.c (push_glob): fix GC problem.
-
-Wed Jul 15 17:33:52 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * ext/purelib.rb: translates a fake path to rubygems in $" into
- an alternative in $: so that Kernel.#require does not load
- more rubygems.rb.
- Resolves many failures in test/rubygems/*.
-
- * gem_prelude.rb (Gem.load_full_rubygems_library): supports case
- the rubygems to load is not in $(rubylibprefix).
- (Gem.path_to_full_rubygems_library): new method for the changes in
- purelib.rb and Gem.load_full_rubygems_library.
- (Gem.fake_rubygems_as_loaded): new method.
-
-Wed Jul 15 16:29:35 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/Makefile.sub (LIBPATHFLAG): path is already quoted in mkmf.rb.
-
-Wed Jul 15 06:21:50 2009 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/extconf.rb: --with-{tcl,tk}-dir doesn't work.[ruby-dev:38782]
-
-Wed Jul 15 04:22:54 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * test/cgi/test_cgi_multipart.rb (CGIMultipartTest#_prepare):
- set tempfile name with literal.
-
-Tue Jul 14 21:53:18 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/io/nonblock: moved from ext/io/wait/lib.
-
-Tue Jul 14 17:29:20 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (rb_str_index_m): return nil if pos is out of string.
- [ruby-core:23660]
-
-Tue Jul 14 16:13:04 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (rb_io_initialize): check if the descriptor can be accessed
- in the specified open mode. [ruby-dev:38571]
-
-Tue Jul 14 09:26:14 2009 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/multi-tk.rb: Long-term-callback support isn't stable yet.
- So, disable the feature and waiting for improvement in the future.
-
-Tue Jul 14 01:28:17 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * test/ruby/test_m17n.rb (TestM17N#test_env): the encoding of
- ENV is now locale encoding.
-
-Tue Jul 14 01:24:56 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * marshal.c (r_object0): should return real object.
-
-Tue Jul 14 01:06:31 2009 Yusuke Endoh <mame@tsg.ne.jp>
-
- * enumerator.c (yielder_yield_i): use rb_proc_new instead of
- rb_iterate. [ruby-dev:38518]
-
- * README.EXT: rb_iterate is obsolete since 1.9; use rb_block_call
- instead.
-
- * README.EXT.ja: ditto.
-
-Tue Jul 14 00:45:41 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * test/ruby/test_case.rb (TestCase#test_deoptimization):
- test for [ruby-core:23190].
-
-Mon Jul 13 22:49:50 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * lib/prime.rb (Prime#prime_division): now decomposes
- negative integer into a decomposition with element [-1, 1].
-
- * test/test_prime.rb: test for it.
-
-Mon Jul 13 22:28:03 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * io.c (pipe_open): handles leaked on win32 when an error occurs.
-
-Mon Jul 13 20:21:51 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * marshal.c (r_object0): should not shadow outer variable not to
- return Qnil always.
-
-Mon Jul 13 19:41:05 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * marshal.c (r_object0): copy instance variables to new regexp.
-
-Mon Jul 13 17:49:11 2009 Koichi Sasada <ko1@atdot.net>
-
- * vm_core.h, compile.c: declare struct iseq_inline_cache_entry.
- Inline cache (IC) entries are no longer GC managed object.
- IC entries are freed when ISeq is freed.
-
- * iseq.c: fix mark, free, memsize functions for above change.
-
- * insns.def: remove rb_gc_write_barrier().
-
- * vm_insnhelper.c (vm_method_search): ditto.
-
- * tool/instruction.rb, template/insns_info.inc.tmpl (insn_iclen):
- added.
-
-Mon Jul 13 13:35:08 2009 Koichi Sasada <ko1@atdot.net>
-
- * insns.def, vm_insnhelper.c (getinstancevariable):
- fix to use inline cache.
-
- * compile.c: fix to skip inline cache entry (IC). IC is added
- automatically by compiler.
-
- * insns.def, vm_insnhelper.h: fix IC positions.
-
- * iseq.c: increment minor_version of ISeq because of above change.
-
-Mon Jul 13 08:01:00 2009 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/extconf.rb: New strategy for searching Tcl/Tk libraries.
-
- * ext/tk/*: Support new features of Tcl/Tk8.6b1 and minor bug fixes.
- ( [KNOWN BUG] Ruby/Tk on Ruby 1.9 will not work on Cygwin. )
-
- * ext/tk/*: Unify sources between Ruby 1.8 & 1.9.
- Improve default_widget_set handling.
-
- * ext/tk/*: Multi-TkInterpreter (multi-tk.rb) works on Ruby 1.8 & 1.9.
- ( [KNOWN BUG] On Ruby 1.8, join to a long term Thread on Tk
- callbacks may freeze. On Ruby 1.9, cannot create a second
- master interpreter (creating slaves are OK); supported master
- interpreter is the default master interpreter only. )
-
- * ext/tk/lib/tkextlib/*: Update supported versions of Tk extensions.
- Tcllib 1.8/Tklib 0.4.1 ==> Tcllib 1.11.1/Tklib 0.5
- BWidgets 1.7 ==> BWidgets 1.8
- TkTable 2.9 ==> TkTable 2.10
- TkTreeCtrl 2005-12-02 ==> TkTreeCtrl 2.2.9
- Tile 0.8.0/8.5.1 ==> Tile 0.8.3/8.6b1
- IncrTcl 2005-02-14 ==> IncrTcl 2008-12-15
- TclX 2005-02-07 ==> TclX 2008-12-15
- Trofs 0.4.3 ==> Trofs 0.4.4
-
-Mon Jul 13 01:18:13 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * time.c (time_timespec): rounds subsecond toward zero.
-
-Sun Jul 12 23:51:39 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * hash.c (env_str_new): use rb_locale_str_new instead of
- rb_tainted_str_new. rb_locale_str_new set string locale
- encoding and tainted.
-
-Sun Jul 12 23:56:40 2009 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c: added some shortcuts.
-
- * rational.c: ditto.
-
-Sun Jul 12 23:30:26 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * object.c (rb_to_integer, rb_check_to_integer): return Bignum
- as-is.
-
-Sun Jul 12 21:07:46 2009 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c: use k_exact_{zero,one}_p macro.
-
- * rational.c: ditto.
-
-Sun Jul 12 20:42:58 2009 Tadayoshi Funaba <tadf@dotrb.org>
-
- * numeric.c (fix_divide): added an entry to rational.
-
- * rational.c (rb_rational_reciprocal): added.
-
- * complex.c (f_reciprocal): added.
-
-Sun Jul 12 02:24:42 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * random.c (rand_init): use fixed buffer for small numbers.
-
-Sat Jul 11 14:43:34 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * test/ruby/test_io_m17n.rb (test_strip_bom): added.
-
-Sat Jul 11 07:11:59 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/readline/readline.c (readline_attempted_completion_function):
- array length is long.
-
- * ext/readline/readline.c (readline_s_get_filename_quote_characters):
- missing type of self.
-
-Sat Jul 11 02:37:37 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * random.c (limited_rand): expands to long before shift so that
- the result does not overflow.
-
-Sat Jul 11 00:16:27 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * random.c (rand_init): got rid of buffer overflow.
-
-Sat Jul 11 00:11:38 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * array.c (ary_join_1): should recurse for element array.
-
-Fri Jul 10 23:10:11 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * io.c (io_strip_bom): ungetbyte third byte when UTF-16LE.
-
-Fri Jul 10 23:04:16 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * io.c (io_strip_bom): Fix condition of second byte of
- UTF-16LE/UTF-32LE.
-
-Fri Jul 10 21:45:30 2009 TAKAO Kouji <kouji@takao7.net>
-
- * ext/readline/extconf.rb: checked rl_refresh_line in readline.
-
- * ext/readline/readline.c (readline_s_refresh_line): add new
- method, a patch from Koichiro Ohba. see [ruby-list:45922].
-
-Fri Jul 10 21:00:05 2009 TAKAO Kouji <kouji@takao7.net>
-
- * ext/readline/extconf.rb: checked rl_line_buffer and rl_point in
- readline.
-
- * ext/readline/readline.c (readline_s_get_line_buffer): new method.
- (readline_s_get_point): new method.
-
-Fri Jul 10 16:30:03 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * array.c (recursive_join): use obj to tell if recursion occurs.
- [ruby-core:24150]
-
- * enum.c (enum_join): reverted r23966. [ruby-core:24196]
-
-Fri Jul 10 14:41:34 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * marshal.c (r_object0): set encoding only if the encoding
- is not US-ASCII.
-
-Fri Jul 10 14:44:03 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * random.c (struct MT): ruby already assumes int has 32bit a
- least, so no needs to use long.
-
- * random.c (rand_init): copies data to be used really only.
-
-Fri Jul 10 11:41:39 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/ruby.h (rb_obj_{untrust,untrusted,trust}): added
- prototypes. [ruby-dev:38756]
-
-Fri Jul 10 10:25:19 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm_insnhelper.c (vm_search_superclass): checks for implicit
- argument passing before method search. [ruby-core:24244]
-
-Fri Jul 10 07:22:29 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (parser_data_type): typed.
-
-Thu Jul 9 23:28:48 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * include/ruby/io.h (FMODE_STRIP_BOM): new constant.
-
- * io.c (io_encname_bom_p): judge whether the encoding name
- is *-bom or not.
- (parse_mode_enc): drop "-bom".
- (rb_io_modestr_fmode): set FMODE_STRIP_BOM if needed.
- (rb_io_extract_modeenc): ditto.
- (io_strip_bom): strip bom if exists.
- (io_set_encoding_by_bom): set encoding if there is bom.
- Set encoding and strip bom when modeenc string is "r:foo-bom"
- [ruby-dev:37236]
-
-Thu Jul 9 21:56:59 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * marshal.c (r_object0): replace \u by u when the regexp is
- made by Ruby 1.8. [ruby-dev:36750]
-
-Wed Jul 8 23:13:54 2009 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c (nucomp_div): omitted zero division check.
-
-Wed Jul 8 21:00:37 2009 Keiju Ishitsuka <keiju@ruby-lang.org>
-
- * lib/irb/inspector.rb: forget svn add.
-
-Wed Jul 8 19:10:22 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * error.c (rb_check_type): rejects typed data.
-
-Wed Jul 8 18:28:04 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * proc.c ({proc,binding,method}_data_type): typed.
-
-Wed Jul 8 16:47:03 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (rb_file_s_basename): returns new string instead of
- shared string from FilePathStringValue(). [ruby-core:24199]
-
-Wed Jul 8 04:28:16 2009 Eric Hodel <drbrain@segment7.net>
-
- * ext/.document: Update with extensions that appear to have
- documentation. [ruby-core:24181]
-
-Wed Jul 8 04:28:16 2009 Koichi Sasada <ko1@atdot.net>
-
- * include/ruby/ruby.h:
- rename
- "...TypeStruct" and "typed_struct" to
- "TypedData..." and "typeddata", respectively.
- rename
- rb_data_type_t#name to
- rb_data_type_t#wrap_struct_name.
-
- * error.c, gc.c, iseq.c, vm.c: ditto.
-
-Tue Jul 7 20:23:27 2009 Keiju Ishitsuka <keiju@ruby-lang.org>
-
- * bin/irb, lib/irb.rb lib/irb/*: irb-0.9.6, extend inspect-mode
-
-Tue Jul 7 17:00:38 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * gc.c (rb_gc_call_finalizer_at_exit): deal with typed struct like
- as obj_free().
-
- * error.c (rb_typed_struct_is_kind_of): new function to see if the
- given typed struct.
-
- * error.c (rb_check_typed_struct): new function to check typed
- struct.
-
- * include/ruby/ruby.h (Check_TypedStruct, Data_Get_TypedStruct):
- new macro to check typed struct.
-
-Tue Jul 7 13:36:46 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * enum.c (DEFINE_ENUMFUNCS): included function signature.
-
- * enum.c (rb_enum_join): non-nil separator must be convertible to
- String. [ruby-core:24172]
-
-Tue Jul 7 12:47:28 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enum.c (rb_enum_join): should propagate taint to the return
- value. the change was overridden by r23967. [ruby-core:24176]
-
-Tue Jul 7 11:56:52 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * gc.c (GC_PROF_SET_MALLOC_INFO, GC_PROF_SET_HEAP_INFO): simplified.
-
-Tue Jul 7 10:12:37 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * io.c (rb_io_ext_int_to_encs): Set external encoding if
- ext==intern. [ruby-dev:38278]
-
-Mon Jul 6 09:31:50 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * proc.c (make_curry_proc): should propagate lambda-ness.
- [ruby-core:24127]
-
- * proc.c (proc_hash): use long.
-
-Mon Jul 6 09:06:49 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * test/ruby/test_module.rb (TestModule#test_undef): adjust to
- message change.
-
- * test/ruby/test_object.rb (TestObject#test_redefine_method_which_may_case_serious_problem): ditto.
-
- * test/ruby/test_object.rb (TestObject#test_remove_method): ditto.
-
-Mon Jul 6 09:04:45 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * enum.c (enum_join): deals with self recursive objects to get rid
- of infinite recursion. [ruby-core:24150]
-
-Mon Jul 6 08:00:10 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enum.c (enum_to_a): should propagate taint to the return value.
- [ruby-core:24152]
-
- * enum.c (enum_sort_by): ditto.
-
-Mon Jul 6 00:41:41 2009 Tadayoshi Funaba <tadf@dotrb.org>
-
- * rational.c: edited rdoc.
-
-Sun Jul 5 23:55:57 2009 Tanaka Akira <akr@fsij.org>
-
- * time.c (find_time_t): fix Time.local(2009,2,31) failure on 64bit
- time_t environment.
-
-Sun Jul 5 22:43:13 2009 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c (nucomp_s_polar): now arg is optional.
-
-Sun Jul 5 20:40:35 2009 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c (float_arg): returns PI for -0.0.
-
-Sun Jul 5 14:04:36 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread.c (rb_threadptr_exec_event_hooks): new function to
- execute event hooks, with preserving errinfo. [ruby-core:24118]
-
-Sun Jul 5 08:14:38 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm_method.c (rb_add_method, remove_method, rb_undef): fixed
- minor grammatical errors in warnings. a patch from Run Pain
- Run Run at [ruby-core:24141].
-
- * vm_method.c (Init_eval_method): registers notimplement_body as a
- mark-object.
-
- * vm_insnhelper.c (vm_yield_setup_block_args): restores the firs
- arg where is overwritten at funcall. [ruby-core:24139]
-
-Sat Jul 4 08:20:03 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * numeric.c (dbl2ival): should raise FloatDomainError on Infinity
- and NaN as 1.8 does. [ruby-dev:38726]
-
-Fri Jul 3 22:48:45 2009 Tanaka Akira <akr@fsij.org>
-
- * time.c (find_time_t): less number of guesses for hh:mm:60.
-
-Fri Jul 3 21:30:14 2009 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c (nucomp_equal_p): removed.
-
-Fri Jul 3 21:07:29 2009 Tadayoshi Funaba <tadf@dotrb.org>
-
- * rational.c: renamed equal_p to eqeq_p.
-
- * complex.c: ditto.
-
- * complex.c (nucomp_equal_p): added.
- Complex(NaN).equal?(Complex(NaN)) should return true.
-
-Fri Jul 3 19:48:40 2009 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c: undef-ed shome methods. [ruby-core:24110]
-
- * complex.c (Numeric#arg): NaN for NaN. [ruby-core:24116]
-
-Fri Jul 3 18:35:06 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm_core.h (struct rb_iseq_struct): fixed types.
-
- * vm_core.h (ic_vmstat): VM state version is VALUE.
-
-Fri Jul 3 02:52:20 2009 Tanaka Akira <akr@fsij.org>
-
- * time.c (find_time_t): time guess strategy refined again.
-
-Fri Jul 3 00:36:16 2009 Tanaka Akira <akr@fsij.org>
-
- * time.c (find_time_t): time guess strategy refined.
-
-Thu Jul 2 11:16:25 2009 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/net/imap.rb: added response to Net::IMAP::ResponseError.
- a patch from Eric Hodel in [ruby-core:24111].
-
-Thu Jul 2 08:04:39 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * time.c (num_exact): rb_check_to_integer() can deal with both of
- Fixnum and Bignum together.
-
-Thu Jul 2 07:53:44 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (parser_yylex): fixed wrong variable.
-
-Thu Jul 2 05:37:38 2009 Tanaka Akira <akr@fsij.org>
-
- * time.c (num_exact): use to_r for T_FLOAT.
-
-Thu Jul 2 05:15:54 2009 Tanaka Akira <akr@fsij.org>
-
- * time.c (quo): return an integer if possible.
-
-Wed Jul 1 21:09:25 2009 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/intern.h (rb_time_num_new): declared.
-
- * time.c (nsec2timev): extracted from time_new_internal.
- (time_new_internal): change argument to VALUE.
- (rb_time_new): follow the argument change.
- (rb_time_nano_new): ditto.
- (rb_time_num_new): new function.
-
- * ext/socket/ancdata.c (ancillary_timestamp): use rb_time_num_new to
- represent struct bintime preciously.
-
-Wed Jul 1 08:46:11 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * marshal.c (w_encoding): encodings need extra depth.
- [ruby-core:24100]
-
-Wed Jul 1 06:47:09 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * enum.c (enum_grep): gets rid of type-punning calls.
-
-Wed Jul 1 06:36:28 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enum.c (enum_join): add Enumerable#join.
-
- * array.c (ary_join_1): recursive join for Enumerators (and
- objects with #to_a).
-
- * array.c (rb_ary_join): performance tune.
-
-Tue Jun 30 18:19:07 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * hash.c (rb_hash_hash): documentation fix. a patch from
- Marc-Andre Lafortune. [ruby-core:23943]
-
- * object.c (rb_mod_cmp): ditto.
-
- * range.c (range_eq): ditto.
-
- * string.c (rb_str_partition, rb_str_rpartition): ditto.
-
- * struct.c (rb_struct_s_def): ditto.
-
-Tue Jun 30 17:44:24 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * re.c (reg_match_pos): adjust offset based on characters, not
- bytes. [ruby-dev:38722]
-
- * string.c (rb_str_offset): new function.
-
- * string.c (rb_str_index_m): no call to rb_reg_adjust_startpos().
-
-Tue Jun 30 16:57:07 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * tool/rbinstall.rb: renamed to get rid of collision against
- instruction.rb on command line completion of shell.
-
- * tool/mkconfig.rb (RbConfig.expand): get rid of exceptions on
- frozen strings unless really changed.
-
- * tool/file2lastrev.rb: get rid of global variables.
-
- * tool/compile_prelude.rb: use US-ASCII name.
-
-Tue Jun 30 16:46:40 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * insns.def, tool/instruction.rb: fixed types.
-
-Tue Jun 30 11:08:49 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/oniguruma.h, include/ruby/re.h, re.c, regcomp.c,
- regenc.c, regerror.c, regexec.c, regint.h, regparse.c: use long.
-
-Tue Jun 30 11:05:59 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * dln.c (dln_find_1): fixed index overrun.
-
-Tue Jun 30 08:42:34 2009 Eric Hodel <drbrain@segment7.net>
-
- * tool/instruby.rb: summary is required in a .gemspec.
-
-Tue Jun 30 01:35:12 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * tool/strip-rdocs.rb: supports QT style doxy-comments.
-
-Tue Jun 30 01:24:10 2009 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/cmath.rb (log2, cbrt): added. [experimental]
-
-Tue Jun 30 01:19:53 2009 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c (nucomp_expt): do not use rb_fexpt.
-
-Mon Jun 29 22:50:10 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * Doxyfile.in: removed. merged into template/Doxyfile.template
-
- * configure.in: new checking for dot and doxygen.
-
- * template/Doxyfile.template: merged with Doxyfile.in.
- configured some options.
-
- * common.mk (capi): use $(DOXYGEN) instead of "doxygen".
- (Doxyfile): removed a duplicate entry in the dependency.
-
-Mon Jun 29 21:01:31 2009 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c (nucomp_expt): checks exactness.
-
-Mon Jun 29 20:29:11 2009 Tadayoshi Funaba <tadf@dotrb.org>
-
- * rational.c (float_to_r): always returns rational.
-
-Mon Jun 29 18:55:55 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * dln.c (dln_find_1): fix for files with dots. [ruby-dev:38588]
-
-Mon Jun 29 17:14:31 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (file_expand_path): should copy original encoding.
- [ruby-dev:38612]
-
-Sun Jun 28 23:10:55 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * gem_prelude.c (Gem.default_dir): follows the change on
- lib/rubygems/default.rb in r23879
-
-Sun Jun 28 23:32:11 2009 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c (nucomp_div): raises ZeroDivisionError immediately
- when the given second argument is zero.
-
- * rational.c (nurat_fdiv): never raise even if the given second
- argument is zero.
-
- * rational.c (rb_raise_zerodiv): changed the message (zero to 0).
-
-Sun Jun 28 22:25:07 2009 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c (nucomp_expt): convert to a float when the given power
- is a bignum.
-
- * rational.c (nurat_expt): ditto.
-
-Sun Jun 28 21:16:48 2009 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/cmath.rb (sqrt): fixed an issue [ruby-list:45852].
-
-Sun Jun 28 19:48:29 2009 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c (nucomp_expt): some improvements.
-
- * rational.c (nurat_expt): ditto.
-
-Sun Jun 28 19:03:46 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * tool/instruby.rb (:gem): registers the bundled version
- of minitest as a gem as rdoc or rake.
- c.f. [ruby-dev:38692].
-
-Sun Jun 28 19:02:07 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * lib/rubygems.rb (ConfigMap[:rubylibprefix]): new entry.
-
- * lib/rubygems/defaults.rb (Gem.default_dir): considers
- "--with-rubylibprefix" configure option.
-
-Sun Jun 28 09:21:00 2009 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c: renamed some static functions.
-
- * rational.c: ditto.
-
-Sat Jun 27 19:06:22 2009 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c (nucomp_addsub): new
-
- * complex.c (nucomp_{add,sub}): use nucomp_addsub.
-
- * complex.c (nucomp_divide): changed the algorithm.
-
- * complex.c (nucomp_abs): added shortcuts.
-
-Sat Jun 27 16:56:33 2009 Tadayoshi Funaba <tadf@dotrb.org>
-
- * rational.c (nurat_cmp): use rb_num_coerce_cmp.
-
-Sat Jun 27 16:45:10 2009 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c: revised rdoc.
-
- * rational.c: ditto.
-
- * numeric.c: ditto.
-
-Sat Jun 27 13:44:48 2009 Kouhei Sutou <kou@cozmixng.org>
-
- * NEWS, lib/rss/maker/base.rb, test/rss/test_maker_2.0.rb: add
- item.guid.permanent_link? and item.guid.permanent_link=.
-
-Sat Jun 27 13:41:00 2009 Kouhei Sutou <kou@cozmixng.org>
-
- * NEWS: rss: 0.2.5 -> 0.2.7.
-
- * lib/rss/rss.rb, test/rss/test_version.rb: 0.2.6 -> 0.2.7.
-
-Sat Jun 27 03:16:56 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * numeric.c (int_chr): use default_internal encoding as default
- destination encoding if set. [ruby-core:23997]
-
-Sat Jun 27 03:09:04 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (argf_rewind): need to rewind $. and ARGF.lineno.
- [ruby-core:24046]
-
- * io.c (struct argf): refactoring on $. and ARGF.lineno behavior.
-
-Fri Jun 26 21:48:30 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/pty/pty.c (pty_getpty): check dup failure.
-
-Fri Jun 26 17:33:46 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * test/ruby/test_rubyoptions.rb (TestRubyOptions#test_rubyopt):
- test suite add '.' to RUBYLIB. remove checks.
-
- * test/ruby/test_require.rb (TestRequire#test_tainted_loadpath):
- the default tempdir directory /tmp is world writable, so
- SecurityError would be raised. check removed.
-
-Fri Jun 26 16:32:59 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * common.mk (COMPILE_PRELUDE): need -I. before -rrbconfig.
- [ruby-dev:38714]
-
-Thu Jun 25 18:41:51 2009 Ryan Davis <ryand-ruby@zenspider.com>
-
- * lib/minitest/*.rb: Imported minitest 1.4.2 r5269.
- * test/minitest/*.rb: ditto.
-
-Thu Jun 25 17:58:39 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (argf_binmode_m): should call rb_io_ascii8bit_binmode() to
- set its encoding to ASCII-8BIT. [ruby-core:24029]
-
-Thu Jun 25 13:04:58 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * instruby.rb: '&' in sed s command's replacement is '\&' in ruby.
- [ruby-dev:38713]
-
-Thu Jun 25 06:50:23 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_io_each_codepoint): uninitialized local variable enc.
-
-Thu Jun 25 06:25:49 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enum.c (first_i): wrong condition for no argument #first.
- [ruby-core:24017]
-
-Wed Jun 24 20:19:11 2009 Tanaka Akira <akr@fsij.org>
-
- * time.c (time_s_now): new function. Time.now don't take arguments.
-
-Wed Jun 24 16:08:03 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/resource.rb: CONFIG["TEENY"] is not ruby's version but API's
- one. So need to use RUBY_VERSION instead.
-
-Wed Jun 24 16:07:04 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/mkexports.rb: rbconfig.rb exists at ".".
-
-Wed Jun 24 15:02:29 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (parser_set_encode): show the erred file name instead of
- the file that requires it. [ruby-core:24006]
-
-Wed Jun 24 11:41:20 2009 Akinori MUSHA <knu@iDaemons.org>
-
- * misc/ruby-style.el: It is too late to set c-file-style in
- c-mode-hook (at least on Emacs 23). Call c-set-style instead.
-
-Tue Jun 23 21:28:16 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (rb_get_path_check): check with given safe level.
-
- * file.c (rb_find_file_ext_safe, rb_find_file_safe): ditto.
-
- * safe.c (rb_insecure_operation): function to raise security
- error.
-
-Tue Jun 23 20:32:43 2009 Yusuke Endoh <mame@tsg.ne.jp>
-
- * gc.c: remove the definition of GC_DEBUG (debugging macro).
-
-Tue Jun 23 16:16:12 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (ruby_version): defaults revision to 0 when no
- revision.h exists.
-
-Tue Jun 23 16:04:59 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (rb_find_file_ext, rb_find_file): no needs to expand
- paths with tilde twice.
-
- * load.c (rb_f_load): load the given path directly if not found in
- load_path.
-
- * load.c (search_required): search file in specified safe level.
-
- * load.c (rb_require_safe): path to load is already searched in
- search_required().
-
-Tue Jun 23 12:43:56 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in: remove PACKAGE_* macros generated by autotools.
- [ruby-core:20938]
-
-Tue Jun 23 01:17:38 2009 Tanaka Akira <akr@fsij.org>
-
- * ruby.c (process_options): don't specify .so for encdb here.
- "." is replaced by "_" in load_encoding.
-
- * encoding.c (load_encoding): add .so here.
-
-Mon Jun 22 23:24:22 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * variable.c (rb_generic_ivar_memsize): typo fixed. a patch from
- Kazuhiro NISHIYAMA. [ruby-dev:38700]
-
- * ext/objspace/objspace.c (memsize_of): ditto.
-
-Mon Jun 22 21:21:59 2009 Tanaka Akira <akr@fsij.org>
-
- * io.c: remove __CHECKER__ test.
-
- * dir.c: ditto.
-
- * dln.c: ditto.
-
- * file.c: ditto.
-
- * process.c: ditto.
-
-Mon Jun 22 17:15:38 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/stringio/stringio.c (strio_each_codepoint): new method.
- [ruby-core:23949]
-
- * ext/stringio/stringio.c (strio_each_codepoint): ditto.
-
-Mon Jun 22 16:26:11 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (ruby_init_loadpath_safe): removed "." from load_path.
-
-Mon Jun 22 16:14:30 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * compile.c (iseq_set_arguments, iseq_compile_each): internal
- arrays must be hidden. [ruby-dev:38613]
-
- * vm.c (Init_top_self): ditto.
-
-Mon Jun 22 14:41:47 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (process_options), enc/prelude.rb: encdb and transdb are
- extension libraries.
-
- * ruby.c (process_options): set progname earlier.
-
-Mon Jun 22 13:50:23 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (rb_io_fdatasync): new method IO#fdatasync.
-
-Sun Jun 21 22:33:05 2009 Yusuke Endoh <mame@tsg.ne.jp>
-
- * load.c (Init_load): $: must be readonly. [ruby-dev:38690]
-
- * ruby.c (ruby_prog_init): $-W must be readonly. [ruby-dev:38691]
-
-Sun Jun 21 10:47:21 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/fileutils.rb (FileUtils::Entry_#copy_file): open with
- default umask. [ruby-core:23952]
-
-Sun Jun 21 10:46:32 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * transcode.c (enc_arg): default internal encoding may not be set.
- [ruby-core:23932]
-
-Sat Jun 20 21:11:43 2009 Tadayoshi Funaba <tadf@dotrb.org>
-
- * numeric.c (num_div): don't use num_floor which is actually
- flo_floor.
-
- * numeric.c (num_modulo): don't call '%'.
-
- * numeric.c (num_divmod): use num_modulo.
-
- * numeric.c: defined '%'.
-
- * rational.c (nurat_idiv,nurat_mod,nurat_divmod,nurat_rem): removed.
-
-Sat Jun 20 20:28:44 2009 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c: edited rdoc.
-
- * numeric.c: ditto.
-
-Sat Jun 20 08:56:47 2009 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c: edited rdoc.
-
- * rational.c: ditto.
-
- * numeric.c: ditto.
-
-Sat Jun 20 07:17:52 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/monitor.rb (MonitorMixin::extend_object): should use
- #__send__ instead of #send to avoid possible name conflict.
- [ruby-core:23907]
-
-Sat Jun 20 06:56:31 2009 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c: edited rdoc.
-
- * rational.c: ditto.
-
-Sat Jun 20 05:08:59 2009 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c: edited rdoc.
-
- * rational.c: ditto.
-
-Sat Jun 20 04:30:35 2009 Tadayoshi Funaba <tadf@dotrb.org>
-
- * rational.c (nurat_abs): removed.
-
-Sat Jun 20 03:34:16 2009 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c: added rdoc.
-
-Fri Jun 19 23:43:38 2009 Tadayoshi Funaba <tadf@dotrb.org>
-
- * numeric.c: edited rdoc.
-
-Fri Jun 19 22:58:16 2009 Tadayoshi Funaba <tadf@dotrb.org>
-
- * rational.c: edited rdoc.
-
-Fri Jun 19 22:21:17 2009 Tadayoshi Funaba <tadf@dotrb.org>
-
- * numeric.c: edited rdoc.
-
-Fri Jun 19 21:56:01 2009 Tadayoshi Funaba <tadf@dotrb.org>
-
- * rational.c (nurat_expt): delegates to complex when self is
- negative. because Float#** does not produce complex.
-
-Fri Jun 19 21:40:58 2009 Tadayoshi Funaba <tadf@dotrb.org>
-
- * numeric.c: edited rdoc.
-
- * rational.c: ditto.
-
-Fri Jun 19 20:53:54 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * encoding.c (rb_enc_name_list): update RDoc. [ruby-core:23926]
-
-Fri Jun 19 20:44:45 2009 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c: constant COMPLEX_NAME has been removed.
-
- * rational.c: constant RATIONAL_NAME has been removed.
-
-Fri Jun 19 20:39:46 2009 Tadayoshi Funaba <tadf@dotrb.org>
-
- * rational.c: added rdoc. a patch from Run Paint Run Run.
-
-Fri Jun 19 17:04:59 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * numeric.c (flo_cmp): should always return nil for NaN.
-
- * numeric.c (flo_cmp): handle infinite value specially using
- infinite? method internally. [ruby-dev:38681]
-
-Fri Jun 19 09:28:45 2009 Tadayoshi Funaba <tadf@dotrb.org>
-
- * numeric.c (*_numerator,*_denominator): moved to rational.c.
-
- * rational.c (*_numerator,*_denominator): moved from numeric.c.
-
-Fri Jun 19 08:14:07 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * bignum.c (big_lshift, big_rshift): return Bignum always without
- normalization. [ruby-dev:38679]
-
-Thu Jun 18 22:31:38 2009 Tadayoshi Funaba <tadf@dotrb.org>
-
- * rational.c (nurat_s_convert): calls to_r when the given argument
- is non-integer.
-
- * rational.c (nurat_s_convert): raises TypeError when the given
- argument is nil.
-
- * complex.c (nucomp_s_convert): ditto.
-
-Thu Jun 18 20:32:11 2009 Tadayoshi Funaba <tadf@dotrb.org>
-
- * numeric.c (num_numerator, num_denominator): use
- to_r [ruby-core:23910].
-
-Thu Jun 18 16:21:05 2009 Ryan Davis <ryand-ruby@zenspider.com>
-
- * lib/minitest/*.rb: Imported minitest 1.4.0 r5083.
- * test/minitest/*.rb: ditto.
-
-Thu Jun 18 10:12:49 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/bigdecimal/bigdecimal.c (BigDecimal_to_f): went infinity too
- early. add BASE_FIG margin. [ruby-dev:38673]
-
-Thu Jun 18 01:35:51 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * numeric.c (flo_cmp): Infinity is greater than any bignum
- number. [ruby-dev:38672]
-
- * bignum.c (rb_big_cmp): ditto.
-
-Thu Jun 18 01:29:16 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (file_expand_path): drive letter is ascii only.
- [ruby-dev:38612]
-
-Thu Jun 18 01:09:27 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (ridir, RI_BASE_NAME): fixed for path expansion.
- [ruby-core:23876]
-
-Wed Jun 17 23:46:08 2009 Tadayoshi Funaba <tadf@dotrb.org>
-
- * rational.c (nurat_coerce): accepts Complex when the imag is
- exact zero.
-
-Wed Jun 17 21:25:54 2009 Tadayoshi Funaba <tadf@dotrb.org>
-
- * bignum.c (rb_big_fdiv): checks whether the given second argument
- can be converted to float properly.
-
- * numeric.c (fix_fdiv): calls rb_big_fdiv when the given second
- argument is a bignum.
-
- * rational.c (nurat_fdiv): should calculate Float(x/y), not
- Float(x)/Float(y).
-
-Wed Jun 17 16:57:40 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * load.c (rb_f_require): RDoc updated. a patch from Run Paint Run
- Run in [ruby-core:23833].
-
- * load.c (rb_mod_autoload): ditto. [ruby-core:23835]
-
-Wed Jun 17 14:37:18 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * sample/test.rb (valid_syntax?): skips BOM. [ruby-dev:38666]
-
- * test/ruby/test_system.rb (TestSystem#valid_syntax?): ditto.
-
-Wed Jun 17 13:54:18 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/strscan/strscan.c (Init_strscan): remove obsolete
- matchedsize method, use matched_size instead. [ruby-dev:38591]
-
-Wed Jun 17 12:37:37 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * thread.c (ruby_thread_stack_overflow): call rb_exc_raise() on
- stack overflows in the signal handler, if sigaltstack is
- available. On stack overflow (and with sigaltstack), the signal
- handler is more likely to have room to create an exception
- object. [ruby-core:23813]
-
-Wed Jun 17 08:10:38 2009 Koichi Sasada <ko1@atdot.net>
-
- * ext/objspace: added. objspace library extends some methods to
- ObjectSpace module.
-
-Wed Jun 17 08:14:01 2009 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c (nucomp_coerce): accepts Complex instances.
-
- * rational.c (nurat_coerce): accepts Rational
- instances. [ruby-core:23859]
-
-Wed Jun 17 07:36:22 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/webrick/httputils.rb (parse_form_data): escape boundary of
- multipart/form-data when embed in regexp.
-
-Wed Jun 17 07:24:26 2009 Koichi Sasada <ko1@atdot.net>
-
- * array.c (rb_ary_memsize): added.
-
- * io.c (rb_io_memsize): added.
-
- * regcomp.c (onig_memsize): added.
-
- * string.c (rb_str_memsize): added.
-
- * transcode.c (rb_transcoding_memsize, rb_econv_memsize): added.
-
- * variable.c (rb_geneic_ivar_memsize): added.
-
-Wed Jun 17 07:04:33 2009 Koichi Sasada <ko1@atdot.net>
-
- * iseq.c (iseq_memsize): added. Use RTypedData instead of RData
- for ISeq.
-
- * vm.c (env_memsize, vm_memsize, thread_memsize): added. Use
- RTypedData instead of RData for Env, VM, Thread.
-
-Wed Jun 17 06:48:28 2009 Koichi Sasada <ko1@atdot.net>
-
- * st.c, include/ruby/st.h (st_memsize): added. This function returns
- the memory usage of st_table.
-
-Wed Jun 17 06:19:06 2009 Koichi Sasada <ko1@atdot.net>
-
- * include/ruby/ruby.h: New structure RTypedData, added.
- This structure includes more explicit type information for
- T_DATA objects. If RData(obj)->dfree is immediate value `1' on
- T_DATA object obj, obj is needed to be accessed with RTYPEDDATA(obj)
- instead of RDATA(obj). A RTypedData structure points the structure
- rb_typed_data_t. rb_typed_data_t includes information such as the
- type name of this data, mark and free function what RData includes,
- and memsize function show how data consuming the memory size.
- Note that you do not need any change existing T_DATA objects.
- If you use RDataType instead of RData on T_DATA object,
- you can specify explicit type information.
-
- * gc.c (rb_data_typed_object_alloc, rb_objspace_data_type_memsize,
- rb_objspace_data_type_name): added.
-
-Wed Jun 17 06:14:23 2009 Koichi Sasada <ko1@atdot.net>
-
- * gc.c: fix indent.
-
-Wed Jun 17 06:05:03 2009 Koichi Sasada <ko1@atdot.net>
-
- * gc.c (rb_objspace_each_objects): New C API, added.
-
-Wed Jun 17 00:31:30 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * test/ruby/test_argf.rb (TestArgf#test_skip): updated test
- according to clarified behavior.
-
-Tue Jun 16 22:47:37 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (fptr_finalize): revert last change. [ruby-dev:38648]
-
- * io.c (fptr_finalize): skip close(2) for fd 0,1,2.
-
-Tue Jun 16 20:07:09 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * transcode.c (transcode_restartable0): refix can't build with VC9.
-
-Tue Jun 16 16:09:59 2009 TAKANO Mitsuhiro (takano32) <tak@no32.tk>
-
- * parse.y (parser_read_escape, parser_tokadd_escape):
- replace scan_oct as ruby_scan_oct.
-
-Tue Jun 16 06:40:31 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (fptr_finalize): should close stdin/stdout/stderr when
- closed explicitly. [ruby-core:23853]
-
- * io.c (argf_skip): should close only when current_file is available.
-
-Tue Jun 16 01:50:02 2009 Tanaka Akira <akr@fsij.org>
-
- * vm_eval.c (rb_call0): refine exception message for hidden objects.
-
-Mon Jun 15 22:35:31 2009 Tadayoshi Funaba <tadf@dotrb.org>
-
- * bignum.c (rb_big2db): (-Float::MAX.to_i*2).to_f should return
- -HUGE_VAL (-Infinity).
-
-Mon Jun 15 18:48:41 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (argf_each_line): should return self. [ruby-core:23852]
-
- * io.c (argf_each_byte, argf_each_char): ditto.
-
-Mon Jun 15 17:48:42 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * gc.c (os_obj_of): invoke garbage collection before iteration, to
- avoid accessing half recycled object references. [ruby-dev:38613]
-
-Mon Jun 15 11:04:30 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * .gdbinit (rp, iseq): load dummy_gdb_enums on demand.
- [ruby-dev:38606]
-
-Sun Jun 14 14:57:57 2009 Koichi Sasada <ko1@atdot.net>
-
- * thread.c, vm_eval.c: add Thread.backtrace.
-
- * test/ruby/test_thread.rb: add a test.
-
-Sun Jun 14 13:58:32 2009 Koichi Sasada <ko1@atdot.net>
-
- * transcode.c (transcode_restartable0): revert last commit because
- this change cause SEGV at test-all.
-
-Sun Jun 14 10:49:18 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (rb_find_file_ext, rb_find_file): canonicalize absolute
- paths. [ruby-core:23845]
-
- * file.c (rb_file_size): added rdoc. a patch from Run Paint Run
- Run at [ruby-core:23839].
-
-Sun Jun 14 07:53:26 2009 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c (nucomp_fdiv): use fdiv recursively.
-
- * complex.c (nucomp_expt): reduced code.
-
-Sun Jun 14 03:37:09 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/trans/utf8_mac.trans: remove wrong optimization.
-
-Sun Jun 14 01:53:00 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * transcode.c (transcode_restartable0): can't build with VC9.
-
-Sun Jun 14 01:23:41 2009 Tadayoshi Funaba <tadf@dotrb.org>
-
- * rational.c (nurat_to_f): use fdiv.
-
-Sat Jun 13 15:03:41 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * load.c (load_lock): show backtrace at circular require.
-
- * load.c (rb_provide): assumes us-ascii only.
-
- * load.c (rb_require_safe): FilePathValue() implies rb_str_new4().
-
- * load.c (rb_mod_autoload): try conversion to path like as
- require. [ruby-core:23834]
-
-Sat Jun 13 09:58:26 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * marshal.c (r_ivar): should not set internal encoding ivar as an
- ordinary ivar. [ruby-dev:38596]
-
-Sat Jun 13 07:08:40 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm_eval.c (rb_f_local_variables): now returns symbols. a patch from
- Run Paint Run Run at [ruby-core:23828].
-
-Sat Jun 13 07:06:54 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm_eval.c (rb_f_catch): updated rdoc about generalized argument,
- and the case without arguments. [ruby-core:23827]
-
-Sat Jun 13 06:50:31 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/net/protocol.rb (Net::BufferedIO#rbuf_fill): TimeoutError is
- obsolete, use Timeout::Error instead. [ruby-core:23821]
-
-Sat Jun 13 06:45:46 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm_eval.c (rb_f_throw): fixed rdoc about exception.
- [ruby-core:23824]
-
-Fri Jun 12 14:56:50 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (file_expand_path): associate the input encoding when
- copying an absolute path. [ruby-dev:38594]
-
-Fri Jun 12 02:41:21 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (str_replace_shared): shared target must be frozen.
- [ruby-core:23727]
-
-Thu Jun 11 21:05:09 2009 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/cmath.rb (exp): omitted redundant function call.
-
-Thu Jun 11 17:49:33 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/bigdecimal/bigdecimal.c (gfCheckVal): never used.
-
- * ext/bigdecimal/bigdecimal.c (VpInit): fixed format modifiers.
-
- * ext/bigdecimal/bigdecimal.c (VPrint): constified.
-
-Thu Jun 11 15:27:17 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/prime.rb: documentation typo fixed. a patch from okkez.
- [ruby-dev:38586]
-
-Wed Jun 10 18:15:17 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * dir.c (dir_s_getwd): directory path's encoding should be filesystem's
- one.
-
- * lib/tmpdir.rb: ditto (but not finished yet.)
-
-Wed Jun 10 06:28:15 2009 Eric Hodel <drbrain@segment7.net>
-
- * lib/rubygems*: Upgrade to RubyGems 1.3.4 r2223.
-
-Tue Jun 9 22:38:09 2009 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/cmath.rb (log10): raised exception when the given number is
- a negative real.
-
-Tue Jun 9 15:13:14 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * dir.c (dir_s_glob): fixed rdoc. a patch from Joseph Pecoraro a
- [ruby-core:23767].
-
- * dir.c (sys_warning): get rid of type-punning function cast.
-
- * dir.c (ruby_glob0): get rid of possible overflow.
-
-Tue Jun 9 10:58:48 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * Makefile.in, win32/Makefile.sub (RMALL): need for distclean-rdoc.
-
-Tue Jun 9 01:07:33 2009 Koichi Sasada <ko1@atdot.net>
-
- * thread.c: rename functions which require a parameter
- "rb_thread_t *", the prefix to be rb_threadptr_ instead of
- rb_thread_.
-
- * thread.c (rb_thread_add_event_hook(), rb_thread_remove_event_hook):
- change the parameter type from rb_thread_t * to VALUE.
-
- * eval.c, eval_error.c, eval_intern.h, signal.c, vm_core.h, vm_eval.c:
- ditto.
-
- * include/ruby/intern.h: remove decl of rb_thread_signal_raise() and
- rb_thread_signal_exit().
-
-Mon Jun 8 05:07:41 2009 Koichi Sasada <ko1@atdot.net>
-
- * thread_pthread.c (rb_thread_create_timer_thread): print fatal error
- message to stderr instead of using rb_bug().
-
- * KNOWNBUGS.rb, bootstraptest/test_fork.rb: move a fixed test.
-
-Sun Jun 7 22:44:20 2009 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/cmath.rb (log): avoided redundant expression.
-
-Sat Jun 6 02:49:05 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * hash.c (rb_hash_reject_bang): always check frozen status.
- [ruby-core:23715]
-
- * hash.c (rb_hash_update): ditto.
-
- * hash.c (rb_hash_reject_bang): call rb_hash_foreach() directly.
-
- * hash.c (rb_hash_update_i): call st_insert() directly.
-
- * hash.c (rb_hash_update_block_i): ditto.
-
-Fri Jun 5 07:12:32 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/mkmf.rb (#link_command): should dup CONFTEST_C which is
- frozen. ref [ruby-core:23675]. [ruby-core:23702]
-
-Thu Jun 4 02:25:51 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/base64.rb: typo fixed. a patch from okkez. [ruby-dev:38564]
-
-Wed Jun 3 09:03:23 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enum.c (enum_first): should check negative length.
-
-Tue Jun 2 17:32:40 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enum.c (first_i): Enumerator#first should consume only what is
- needed. a patch from Marc-Andre Lafortune. [ruby-core:23661]
-
- * enum.c (enum_first): call to_int once for an argument. based on
- a patch from Marc-Andre Lafortune.
-
-Tue Jun 2 13:27:21 2009 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * test/ripper/test_filter.rb: add tests. see [ruby-dev:37856]
-
-Tue Jun 2 07:44:43 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_gsub_bang): modify check at the beginning.
- [ruby-core:23662] ref [ruby-core:23657]
-
- * string.c (rb_str_rstrip_bang): ditto. [ruby-core:23657]
-
- * string.c (rb_str_chop_bang): ditto.
-
- * string.c (rb_str_chomp_bang): ditto.
-
- * string.c (rb_str_reverse_bang): modify check added. [ruby-core:23671]
-
-Mon Jun 1 11:21:29 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * cont.c (cont_capture, fiber_store): reraise transferred error.
-
- * cont.c (fiber_switch): transfers dead fiber error to the previous
- or root fiber if the current fiber is dead. [ruby-core:23651]
-
-Mon Jun 1 10:41:41 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/intern.h (rb_exc_new2): optimization for literal.
-
-Mon Jun 1 07:20:02 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/bigdecimal/bigdecimal.c (BigDecimal_to_f): returns Inf if
- exp is bigger than DBL_MANT_DIG.
-
-Sun May 31 23:28:00 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb (create_makefile): checks for duplication of source
- files.
-
-Sun May 31 23:26:36 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (istrailinggarbage): fixed typo.
-
-Fri May 29 17:10:08 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * struct.c (Init_Struct): made #to_s an alias to #inspect to
- reduce the result of recursive struct. a patch from ujihisa a
- [ruby-dev:38554].
-
-Fri May 29 17:08:23 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * hash.c (Init_Hash): made #to_s an alias to #inspect to reduce
- the result of recursive hash. a patch from ujihisa a
- [ruby-core:23601]. [ruby-dev:38555]
-
-Fri May 29 09:30:00 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * enum.c (collect_all): checks interrupts. [ruby-core:23594]
-
-Thu May 28 07:39:22 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (THREAD_MODEL): reject unknown value and checks
- pthread.h only when pthread. [ruby-core:23577]
-
-Thu May 28 03:47:46 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * sample/optparse/opttest.rb: typo fixed. [ruby-dev:38544]
-
-Thu May 28 03:43:10 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * time.c (time_strftime): update RDoc according to info from
- Marc-Andre Lafortune in [ruby-core:23575]. [ruby-core:23564]
-
-Thu May 28 02:40:54 2009 Tanaka Akira <akr@fsij.org>
-
- * lib/uri: don't set @parser if it is DEFAULT_PARSER for marshaling
- URI objects between Ruby 1.8 and Ruby 1.9.
- [ruby-dev:38377]
-
-Wed May 27 23:00:38 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (struct parser_params): lex_gets_ptr should be long.
-
-Wed May 27 18:00:15 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bignum.c (bigand_int): new function to calculate bignum and
- fixnum without allocating internal bignum.
-
- * bignum.c (bigor_int): ditto.
-
- * bignum.c (bigxor_int): ditto.
-
- * bignum.c (bigand_int): even less object allocation.
-
-Wed May 27 14:29:55 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * marshal.c (w_encoding): more compact encoding information for
- US-ASCII and UTF-8. [incompatible] [experimental]
-
- * marshal.c (r_ivar): restore :E encoding information.
-
-Wed May 27 14:08:39 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * st.c (st_insert2): new function with processing new key,
- e.g. copy.
-
- * hash.c (rb_hash_aset): use st_insert2() to reduce redundant
- st_lookup calls.
-
-Wed May 27 02:31:38 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/readline/readline.c (readline_getc): the function for
- rl_getc_function must be a byte function.
- so use getbyte method. [ruby-dev:38535]
-
-Tue May 26 14:24:17 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * gc.c: fixed types.
-
- * common.mk (bignum.o, numeric.o): depend on util.h.
-
- * bignum.c, marshal.c: fixed types.
-
- * numeric.c (infinite_value): use ruby_div0.
-
- * include/ruby/util.h (ruby_div0): moved from marshal.c.
-
-Tue May 26 11:01:41 2009 TAKANO Mitsuhiro (takano32) <tak@no32.tk>
-
- * lib/mkmf.rb: use map! to replace strings in $objs array.
-
-Tue May 26 10:12:08 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bignum.c (bignew_1): inline memory allocation.
-
- * bignum.c (bigtrunc): call rb_big_resize() only when needed.
-
- * bignum.c (bigfixize): declare inline.
-
-Tue May 26 05:39:28 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/ruby.h (FilePathValue): prevent from GC.
-
- * include/ruby/ruby.h (NUM2LONG): added GCC specific optimization.
-
-Tue May 26 03:41:29 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * time.c (rb_gmtime, rb_localtime): gmtime and localtime return
- NULL on error. [ruby-core:23551]
-
-Tue May 26 03:38:37 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_str_each_char, rb_str_each_codepoint): string
- length must be long.
-
-Mon May 25 13:27:32 2009 TAKANO Mitsuhiro (takano32) <tak@no32.tk>
-
- * lib/mkmf.rb: dont use gsub! method for frozen string.
-
-Mon May 25 11:47:06 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * tool/mkconfig.rb, tool/instruby.rb: removed redundant code.
-
-Mon May 25 09:34:09 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_hash): avoid calling rb_enc_str_asciionly_p().
-
- * string.c (rb_str_replace): avoid redundant calling rb_str_new4().
-
- * string.c (str_replace): factor out replacement from
- rb_str_replace() without type check nor discarding the
- destination contents.
-
-Mon May 25 08:06:52 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_str_partition): should use the converted result. a
- patch from Marc-Andre Lafortune at [ruby-core:23540].
-
- * string.c (rb_str_rpartition): ditto.
-
-Mon May 25 06:25:38 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * test/ruby/test_hash.rb (TestHash::test_equal2): recursive hashes
- are handled properly now. ref: [ruby-core:23402]
-
- * test/ruby/test_m17n.rb (TestM17N#test_sprintf_p): test fixed
-
-Mon May 25 05:32:19 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/cgi/core.rb (CGI::HTTP_STATUS): typo fixed. a patch from
- Nobuhiro IMAI. [ruby-dev:38538]
-
-Sun May 24 22:48:17 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread.c (rb_exec_recursive_paired): new function for proper
- handling of recursive arrays. [EXPERIMENTAL] [ruby-core:23402]
-
- * array.c (rb_ary_equal, rb_ary_eql, rb_ary_cmp): use above.
-
- * hash.c (hash_equal): ditto.
-
-Sun May 24 22:39:33 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * error.c (syserr_initialize): errno is int.
-
-Sun May 24 00:52:54 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * configure.in ($ridir): new configuration. [ruby-core:23520].
- c.f. [ruby-core:23519].
-
- (--with-ridir): new configure option.
-
- * tool/instruby.rb (:doc, :rdoc): uses $ridir instead of
- a fixed path.
-
- * lib/rdoc/ri/paths.rb: follows $ridir.
-
- * Makefile.in: removes RIDATADIR which is no longer used.
-
- * bcc32/Makefile.sub: generates the 'ridir' entry for RbConfig.
- removes RIDATADIR which is no longer used.
-
- * win32/Makefile.sub: ditto.
-
-Sat May 23 23:52:33 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_each_char): return original string.
- [ruby-core:23499]
-
- * string.c (rb_str_each_codepoint): protect string from
- modification.
-
-Sat May 23 21:48:58 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/dl/handle.c (rb_dlhandle_s_sym): added a method to access
- using RTLD_NEXT. [ruby-dev:38152]
-
- * ext/dl/handle.c (Init_dlhandle): added constants DEFAULT and
- NEXT which correspond to RTLD_DEFAULT and RTLD_NEXT.
-
-Sat May 23 18:53:13 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/dl/lib/dl/cparser.rb (DL::CParser#parse_struct_signature):
- splitting with regexp source string is obsolete. a patch from
- Minwoo Lee at [ruby-core:23494].
-
- * ext/dl/cptr.c (rb_dlptr_cmp): return signed value, and restrict
- to Fixnum. [ruby-dev:38533]
-
-Fri May 22 23:22:53 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * missing/vsnprintf.c (errno): [BUG] fixes a compilation
- error on SIZEOF_LONG > SIZEOF_INT.
- (BSD_vfprintf): ditto.
-
-Fri May 22 23:20:48 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * spec/default.mspec: follows runruby.rb's move at r23542.
-
-Fri May 22 21:38:55 2009 Yusuke Endoh <mame@tsg.ne.jp>
-
- * NEWS: add Time#to_r.
-
-Fri May 22 20:29:01 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * config.guess: moved into tool/.
-
- * config.sub: ditto.
-
- * install-sh: ditto
-
- * configure.in: follows the moves.
-
- * LEGAL: ditto.
-
-Fri May 22 20:10:18 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * instruby.rb: moved into tool/.
-
- * mkconfig.rb: ditto.
-
- * rubytest.rb: ditto.
-
- * runruby.rb: ditto.
-
- * common.mk: follows the moves.
-
- * configure.in: ditto.
-
- * win32/Makefile.sub: ditto.
-
-Fri May 22 05:09:43 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_slice_bang): avoid call of rb_scan_args() unless
- it's really necessary.
-
-Thu May 21 22:17:52 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * template/id.h.tmpl, id.h (enum ruby_method_ids): added some IDs.
-
- * debug.c (dummy_gdb_enums): added enum ruby_method_ids.
-
- * .gdbinit (rp): improved output of Symbol.
-
-Thu May 21 21:07:22 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * missing/vsnprintf.c (BSD_vfprintf): support for 'z' modifier.
-
-Thu May 21 18:55:33 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * gem_prelude.rb (Gem.default_dir and misc.): use rubylibprefix.
- follows the change in r23368.
-
-Thu May 21 12:07:43 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/ruby.h (RB_EVENT_HOOKS_HAVE_CALLBACK_DATA):
- new macro for compatibility check.
-
-Thu May 21 01:43:40 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/ruby.h (rb_long2int, RARRAY_LENINT): check long to
- cast to int. [ruby-dev:38508]
-
- * struct.c, vm_eval.c, vm_insnhelper.c: use RARRAY_LENINT.
-
-Wed May 20 21:00:27 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * rb_enc_get_index: allows an arbitrary RData as the argument but not
- only what points a rb_encoding.
-
-Wed May 20 20:54:37 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * spec/.gitignore: ignores rubyspec/ and mspec/.
-
-Wed May 20 19:41:44 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * struct.c (rb_struct_new): get rid of too large alloca.
-
- * struct.c (rb_struct_hash): use long.
-
-Wed May 20 18:58:27 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm_eval.c, vm_insnhelper.c: argument number is restricted to
- int, and fixed overflow.
-
-Wed May 20 18:34:30 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * enum.c (zip_ary): should use long.
-
- * enumerator.c (inspect_enumerator): should use long.
-
-Wed May 20 09:18:44 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_count): optimized for 1byte string count by
- avoiding tr_setup_table().
-
-Wed May 20 06:25:29 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * encoding.c (rb_enc_fast_mbclen): faster mbclen for strings known
- to be valid.
-
- * string.c (enc_strlen): coderange specified version of
- rb_enc_strlen(). use rb_enc_fast_mbclen() if coderange is 7bit
- or valid.
-
- * string.c (str_gsub): use rb_enc_fast_mbclen().
-
- * string.c (rb_str_reverse, rb_str_split_m, rb_str_each_char,
- scan_once): ditto.
-
-Wed May 20 06:20:05 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/tempfile.rb (Tempfile#unlink): close first for Windows. a
- patch from Florian Frank. [ruby-core:23505]
-
-Wed May 20 00:13:38 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * encoding.c (rb_enc_codepoint_len): combine rb_enc_codepoint()
- and rb_enc_codelen() in one function to reduce calls.
-
- * encoding.c (rb_enc_codepoint): compatibility function.
-
- * sprintf.c (rb_str_format): use rb_enc_codepoint_len().
-
- * string.c (rb_str_inspect, rb_str_upcase_bang,
- rb_str_downcase_bang, rb_str_capitalize_bang,
- rb_str_swapcase_bang, trnext, tr_trans, rb_str_delete_bang,
- rb_str_squeeze_bang, rb_str_count, rb_str_split_m,
- rb_str_each_line, rb_str_each_codepoint, rb_str_lstrip_bang,
- sym_printable): ditto.
-
- * transcode.c (make_econv_exception): use rb_enc_mbc_to_codepoint()
-
-Wed May 20 00:05:52 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * vm_method.c (rb_attr): should preserve encoding info.
- [ruby-dev:38498]
-
-Tue May 19 22:54:35 2009 Yusuke Endoh <mame@tsg.ne.jp>
-
- * time.c (time_minus): always return a Float. [ruby-dev:38446]
-
- * time.c (time_to_r): new method. [ruby-dev:38461]
-
-Tue May 19 13:59:35 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * class.c (clone_method): add cast to remove warning from
- rb_gc_write_barrier().
-
-Tue May 19 13:54:15 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * struct.c (struct_ivar_get): new function to avoid repeated
- rb_intern() calls.
-
- * struct.c (rb_struct_iv_get): use struct_ivar_get()
-
- * struct.c (num_members): ditto.
-
- * struct.c (rb_struct_s_members): ditto.
-
- * class.c (rb_singleton_class): cache symbol to reduce calls to
- rb_intern().
-
-Tue May 19 07:52:05 2009 Tanaka Akira <akr@fsij.org>
-
- * test/test_time.rb: make tests timezone independent.
- reported by zunda. [ruby-dev:38492]
-
-Mon May 18 21:40:11 2009 Tanaka Akira <akr@fsij.org>
-
- * lib/pathname.rb (Pathname#sub): suppress a warning. [ruby-dev:38488]
-
-Sun May 17 23:23:14 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb (SRC_EXT): should be flat.
- http://twitter.com/_tad_/status/1825862632
-
-Sun May 17 23:05:05 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (ruby_init_loadpath_safe): VARIABLE_LIBPATH is always
- defined, see its value instead.
-
-Sun May 17 18:59:45 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * node.h (nd_line): NODE_LMASK is not needed.
-
- * node.h (NOEX_SAFE): made int.
-
-Sun May 17 14:23:08 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * compile.c (rb_parse_in_eval): returns true in true eval, not in
- main. [ruby-dev:38382]
-
- * parse.y (program): inherits dvars in eval or main.
-
-Sun May 17 14:02:56 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (ruby_script): sets also VM toplevel program name.
-
- * ruby.c (process_options): no longer needs additional frame.
-
- * vm.c (rb_vm_get_sourceline): should not access out of bound.
-
-Sun May 17 09:47:48 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (cmdline_options_init): initialize encodings.
-
- * ruby.c (add_modules, require_libraries, process_sflag):
-
- * ruby.c (process_sflag): not process twice.
-
- * ruby.c (moreswitches): get rid of possible overflow.
-
-Sun May 17 09:31:05 2009 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (foletypelib_name): should return
- encoded name corresponding to WIN32OLE.codepage.
-
-Sun May 17 09:02:56 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (ruby_init_loadpath_safe): support for cygwin 1.7. see
- [ruby-core:23241].
- gets rid of possible buffer overflow with realpath().
-
- * ruby.c (set_arg0): get rids of overrun.
-
-Sat May 16 18:38:32 2009 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/parser.rb: add nil check.
-
-Sat May 16 18:36:01 2009 Kouhei Sutou <kou@cozmixng.org>
-
- * test/rss/test_maker_atom_feed.rb: suppress warnings.
-
-Sat May 16 18:33:15 2009 Kouhei Sutou <kou@cozmixng.org>
-
- * NEWS: add RSS::Maker.supported?(version).
-
-Sat May 16 18:26:42 2009 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/parser.rb, test/test_parser_1.0.rb: fix foaf:Image
- element causes parse error even if ignore_unknown_element mode.
-
-Sat May 16 18:14:19 2009 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/maker.rb, lib/rss/maker/0.9.rb,
- test/test_maker_*.rb: add RSS::Maker.supported?
-
-Sat May 16 18:12:39 2009 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/content/*, lib/rss/dublincore/*: fix circular require.
- * test/test_maker_atom_feed.rb,
- test/test_maker_atom_entry.rb: suppress warnings.
-
-Sat May 16 18:07:17 2009 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/maker/feed.rb, test/test_maker_atom_feed.rb:
- remove needless codes.
-
-Sat May 16 18:05:07 2009 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/maker/entry.rb: fix a typo.
-
-Sat May 16 18:02:57 2009 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/maker/feed.rb, test/test_maker_atom_entry.rb,
- test/test_maker_atom_feed.rb: fix duplicated dc:date.
- Reported by Kazuhiro NISHIYAMA. Thanks!!! [ruby-list:46014]
-
-Sat May 16 18:02:16 2009 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/maker/base.rb, lib/rss/maker/1.0.rb, lib/rss/maker/feed.rb,
- test/rss/test_maker_1.0.rb, test/rss/test_maker_atom_feed.rb:
- RSS 1.0 and Atom feed maker treat maker.channel.language as
- maker.channel.dc_language.
-
-Sat May 16 17:57:39 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/dl/lib/dl/callback.rb (DL#remove_callback_internal): ignore
- unbound function. [ruby-dev:38474]
-
-Sat May 16 17:51:11 2009 Kouhei Sutou <kou@cozmixng.org>
-
- * sample/rss/rss_recent.rb, sample/rss/list_description.rb: use
- UTF-8.
-
-Sat May 16 17:47:55 2009 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/rss.rb, test/rss/test_version.rb (RSS::VERSION):
- 0.2.5 -> 0.2.6.
-
-Sat May 16 17:26:04 2009 Narihiro Nakamura <authorNari@gmail.com>
-
- * iseq.c (rb_iseq_clone): use longlife object and insert write barrier.
-
- * vm_insnhelper.c (vm_cref_push): ditto.
-
- * vm_insnhelper.h (COPY_CREF): insert write barrier.
-
-Sat May 16 13:49:24 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * variable.c (rb_autoload_load): gets rid of false warning.
- [ruby-core:23466]
-
-Sat May 16 10:59:54 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * sample/drb/dhasenc.rb: add magic comment for encoding.
-
- * sample/mine.rb: ditto.
-
- * ext/tk/sample/tcltklib/sample1.rb: ditto.
-
-Sat May 16 09:49:05 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (magic_comment_encoding): ignores unused emacs-style
- encoding comment, as like Vim styles. [ruby-core:23470]
-
-Sat May 16 09:30:14 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * defs/keywords (reserved_word): made inline function static.
- [ruby-core:23210]
-
- * parse.y (rb_reserved_word): ordinary function for ripper.
-
-Sat May 16 09:19:16 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (magic_comment_encoding): use rb_compile_warning() to
- show the currently parsing file name. [ruby-core:23469]
-
-Sat May 16 09:03:29 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (ruby_version): now version.h includes
- include/ruby/version.h, so need to tell to cpp to see
- $(srcdir)/include. [ruby-core:23468]
-
-Fri May 15 17:35:33 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * array.c (rb_ary_shift, rb_ary_shift_m): clears unused elements.
- [ruby-dev:38448]
-
-Fri May 15 15:15:12 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * variable.c (rb_autoload_load): checks if iv_tbl is valid.
- [ruby-dev:38456]
-
-Fri May 15 11:17:48 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/setup.mak (-version-): now version.h includes
- include/ruby/version.h, so need to tell to cpp to check
- $(srcdir)/include.
- reported by KIMURA Koichi at http://www.kt.rim.or.jp/%7ekbk/zakkicho/09/zakkicho0905b.html#D20090514-6
-
-Thu May 14 16:13:32 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/etc/etc.c (etc_getpwuid): use rb_uid_t. [ruby-dev:38443]
-
- * ext/stringio/stringio.c (strio_ungetbyte): encoding should no
- be effective.
-
-Thu May 14 10:17:45 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * sample/test.rb (valid_syntax?): defaults to us-ascii.
-
-Wed May 13 22:34:31 2009 Narihiro Nakamura <authorNari@gmail.com>
-
- * gc.c: add longlife garbage collection. [ruby-dev:38423]
- (NORMAL_HEAPS_USED): new macro.
- (LONGLIFE_ALLOCATE_HEAPS_MIN): ditto.
- (add_longlife_heaps_slot): new function.
- (rb_newobj_from_longlife_heap): ditto.
- (rb_newobj_longlife): ditto.
- (rb_node_newnode_longlife): ditto.
- (rb_gc_write_barrier): ditto.
- (remembered_set_recycle): ditto.
- (rb_gc_mark_remembered_set): ditto.
- (clear_mark_longlife_heaps): ditto.
- (gc_sweep_for_longlife): ditto.
- (assign_heap_slot): new argument to longlife heaps slot.
- (add_freelist): ditto.
- (gc_sweep): avoid longlife heap slot. set longlife_collection
- flag at add heap.
- (rb_gc_force_recycle): avoid mark object and remembered_set
- object.
- (garbage_collect): add longlife collection.
- (rb_gc_start): invoke longlife collection.
- (gc_profile_record_get): for longlife collection profile.
- (gc_profile_result): ditto.
-
- * include/ruby/intern.h (rb_gc_write_barrier): declared.
-
- * include/ruby/ruby.h (FL_REMEMBERED_SET): renamed from FL_RESERVED.
-
- * debug.c (FL_REMEMBERED_SET): ditto.
-
- * insns.def (setinlinecache): insert write barrier.
-
- * vm_insnhelper.c (vm_method_search): ditto.
-
- * set_relation (set_relation): use longlife object.
-
- * vm.c (vm_define_method): ditto.
-
- * vm_core.h (NEW_INLINE_CACHE_ENTRY): ditto.
-
- * vm_method.c (rb_add_method): ditto.
-
- * class.c (rb_add_method): ditto.
-
- * node.h (NEW_NODE_LONGLIFE): new macro.
- (rb_node_newnode_longlife): declared.
-
-Wed May 13 15:23:18 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/version.h: extracted the extensions interface and
- the never-changeable info.
-
-Wed May 13 03:20:47 2009 Tanaka Akira <akr@fsij.org>
-
- * time.c (time_init_1): unused variable removed.
-
-Tue May 12 21:03:02 2009 Tanaka Akira <akr@fsij.org>
-
- * time.c: support fixed UTC offset. [ruby-dev:38326]
- (leap_year_v_p): new macro.
- (TIME_FIXOFF_P): new macro.
- (TIME_SET_FIXOFF): new macro.
- (time_init_0): renamed from time_init.
- (time_set_utc_offset): new function.
- (vtm_add_offset): new function.
- (utc_offset_arg): new function.
- (time_init_1): new function.
- (time_init): call time_init_0 or time_init_1 according argc.
- (validate_utc_offset): new function.
- (time_localtime_m): new function.
- (time_fixoff): new function.
- (time_getlocaltime): take optional UTC offset argument.
- (time_get_tm): support fixed UTC offset time.
- (Init_Time): make Time#{initialize,localtime,getlocal} varargs.
-
- * strftime.c (rb_strftime): vtm->zone can be NULL now.
-
-Tue May 12 18:23:40 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * yarvtest: removed because it's outdated.
-
-Mon May 11 21:46:20 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y: add semicolons to some grammar rules not terminated
- with them. a patch from Dave B in [ruby-core:23422].
-
-Mon May 11 20:08:33 2009 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * io.c (Init_IO): add constant File::NOATIME. [ruby-core:23194]
-
-Mon May 11 13:08:30 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * mkconfig.rb (rubylibdir): use rubylibprefix. [ruby-dev:38426]
-
-Mon May 11 08:37:04 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/bigdecimal/bigdecimal.c (BigDecimal_coerce): support
- coercing into Rational. [ruby-core:23415]
-
-Mon May 11 04:39:45 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/net/smtp.rb (Net::SMTP#check_auth_args): should not change
- number of methods for the sake of compatibility.
-
-Sun May 10 11:36:11 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/dl/cfunc.c (rb_dlcfunc_instance_p): new function to check if
- the argument is an instance of DL::CFunc.
-
- * ext/dl/cptr.c (rb_dlptr_initialize, rb_dlptr_s_malloc): checks
- if DL::CFunc. [ruby-dev:38403].
-
- * ext/dl/lib/dl/cparser.rb (DL::CParser#parse_signature): strips
- spaces. based on a patch from Takashi Tamura in [ruby-dev:38398].
-
- * ext/dl/lib/dl/value.rb (DL::ValueUtil#wrap_arg): block must be
- given if arg is not bound. [ruby-dev:38404]
-
- * ext/dl/cfunc.c (rb_dlcfunc_instance_p): new function to check if
- the argument is an instance of DL::CFunc.
-
-Sat May 9 19:57:00 2009 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * test/ruby/test_float.rb (TestFloat#test_sleep_with_Float): add a
- test. see [ruby-core:23282]
-
-Sat May 9 19:23:46 2009 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date.rb: use subsec instead of nsec.
-
-Sat May 9 12:19:49 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * hash.c: 3rd argument of rb_hash_foreach() is VALUE.
-
- * hash.c (rb_any_hash, recursive_hash): use VALUE for hash.
-
-Sat May 9 11:14:50 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm_eval.c (rb_f_catch): gets rid of issue with gcc 4.4. a patch
- from Alexey Froloff in [ruby-core:23398]. [ruby-core:22924]
-
-Fri May 8 19:38:54 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb (try_link0): removes waste dSYM directories left
- when debug and universal-binary are enabled.
-
- * lib/mkmf.rb (check_sizeof): fixed wrong recurring result for
- intrinsic types.
-
-Fri May 8 10:14:08 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * Makefile.in, configure.in, win32/Makefile.sub (RUBY_BASE_NAME):
- program base name. [ruby-dev:38241]
-
- * configure.in (--with-soname): base name of shared library.
- [ruby-dev:38290]
-
-Fri May 8 10:07:02 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * array.c (rb_ary_flatten_bang): clears temporary array.
-
-Fri May 8 02:30:14 2009 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/set.rb (SortedSet#add): Do not require each newly added
- element to be Comparable but to respond to <=>. [ruby-dev:38371]
-
-Thu May 7 21:42:51 2009 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_rubyoptions.rb (test_indentation_check): add a test
- for indentation check. [ruby-dev:38382]
-
-Thu May 7 16:40:09 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * array.c (rb_ary_flatten_bang): returns nil if nothing changed.
- a patch from Marc-Andre Lafortune in [ruby-core:23382].
-
-Thu May 7 14:26:14 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * array.c (rb_ary_sample): negative sample number is invalid.
- [ruby-core:23374]
-
-Thu May 7 14:16:24 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c, include/ruby/encoding.h: fixed types.
-
- * include/ruby/encoding.h (rb_enc_nth): long is used for index.
-
-Thu May 7 14:01:55 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * range.c (r_le): fixed types.
-
- * range.c (range_eql): fixed rdoc.
-
-Thu May 7 13:10:25 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (pipe_open): should be rb_pid_t.
-
-Wed May 6 16:50:20 2009 Tanaka Akira <akr@fsij.org>
-
- * math.c (math_gamma): use a table for positive small integers.
-
-Wed May 6 09:27:04 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * README.ja: code for THINK_C does not exist already. [Bug #1435]
-
-Wed May 6 05:33:59 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (CFLAGS, CXXFLAGS): strips extra spaces.
-
-Tue May 5 11:29:07 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * tool/ifchange: Fix: arguments which begin with minus sign may
- parsed as options. Because of older systems, don't use --
- but use parentheses.
-
-Tue May 5 10:42:28 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/json: Update to JSON 1.1.4.
-
-Tue May 5 07:22:37 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * transcode.c: NOMAP is now multibyte direct map.
-
- * transcode.c: remove ASIS.
-
- * transcode_data.h: ditto.
-
- * tool/transcode-tb (ActionMap#generate_info): remove :asis.
-
- * tool/transcode-tb (ActionMap#generate_info): add :nomap0.
-
- * enc/trans/utf8_mac.trans: replace :asis by :nomap0.
-
-Sat May 2 22:53:02 2009 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/set.rb (SortedSet): Fix document. [Bug #1429]
-
-Sat May 2 10:34:29 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/trans/utf8_mac-tbl.rb: don't use Unicode escape.
-
- * enc/trans/utf8_mac.trans: follow above.
-
-Sat May 2 09:19:40 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * array.c (Init_Array): made #to_s an alias to #inspect to reduce
- the result of recursive array. a patch from ujihisa at
- [ruby-dev:38362]
-
-Fri May 1 16:50:05 2009 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/set.rb (Set#merge): Only directly use the passed objects
- @hash instance variable when self and the passed object are
- instances of the same class. [Bug #118]
-
-Fri May 1 16:44:11 2009 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/set.rb (SortedSet#add): Do not let an incomparable object
- in. [Bug #118]
-
-Fri May 1 13:18:01 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval_intern.h (_longjmp): never return. see [ruby-core:23241]
-
-Fri May 1 01:31:19 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/extmk.rb: use RbConfig instead of Config.
-
- * instruby.rb: ditto.
-
- * lib/rubygems.rb: ditto.
-
- * test/rubygems/test_config.rb: ditto.
-
-Thu Apr 30 21:23:30 2009 Tanaka Akira <akr@fsij.org>
-
- * runruby.rb: use RbConfig::CONFIG instead of Config::CONFIG.
-
- * spec/default.mspec: ditto.
-
- * yarvtest/yarvtest.rb: ditto.
-
- * instruby.rb: ditto.
-
- * benchmark/report.rb: ditto.
-
- * benchmark/runc.rb: ditto.
-
- * tool/eval.rb: ditto.
-
- * test/rubygems/test_gem.rb: ditto.
-
- * test/rubygems/test_config.rb: ditto.
-
- * test/rubygems/test_gem_platform.rb: ditto.
-
-Thu Apr 30 18:18:13 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/net/http.rb: documentation typo fixed. [ruby-core:23335]
-
-Thu Apr 30 15:27:49 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * enc/trans/utf8_mac.trans: get rid of a 1.9 feature for cross
- compile.
-
-Thu Apr 30 11:35:30 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * encoding.c (rb_filesystem_encoding): Change filesystem_encoding of
- Mac OS X to UTF-8.
-
-Wed Apr 29 21:23:40 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/iso_2022_jp.h: add CP50221.
-
- * enc/trans/iso2022.trans: add converter for CP50221.
-
-Wed Apr 29 15:22:26 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (rb_file_join): recursive array has no meaning as path
- name. [ruby-core:23329]
-
-Tue Apr 28 19:09:45 2009 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * test/test_timeout.rb (TestTimeout#test_timeout): add a test.
-
-Tue Apr 28 07:13:48 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/pp.rb (Struct#pretty_print): coerce to a string since
- anonymous class has name no longer. [ruby-dev:38349]
-
-Mon Apr 27 16:47:12 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (ruby_version): uses sed instead of grep if the
- result is need, to get rid of GREP_OPTIONS. [ruby-dev:38336]
-
-Mon Apr 27 01:25:11 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/readline/readline.c (readline_getc): use rl_getc_function if
- possible, to get rid of hang up at EOF without a newline.
-
-Sun Apr 26 23:19:32 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/trans/utf8_mac.trans: Add converter for UTF8-MAC.
-
- * enc/trans/utf8_mac-tbl.rb: ditto.
-
- * test/ruby/test_econv.rb: tests for above.
-
-Sun Apr 26 22:17:02 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * tool/transcode-tb (ActionMap#each_firstbyte):
- if :asis collides other mappings, use another.
-
- * tool/transcode-tb (ActionMap#generate_info):
- add :asis for ASIS.
-
-Sun Apr 26 21:59:43 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * transcode.c (ASIS): added for multi byte direct map.
-
- * transcode.c (transcode_restartable0): ditto.
-
-Sun Apr 26 20:33:12 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * tool/transcode-tb (ActionMap#generate_node):
- Use ActionMap#gennode instead of generate_node
- because of initialization.
-
-Sun Apr 26 20:21:39 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * .gitignore: added.
-
-Sun Apr 26 20:17:24 2009 Tanaka Akira <akr@fsij.org>
-
- * lib/rake.rb: use RbConfig::CONFIG instead of Config::CONFIG.
-
- * lib/rbconfig/datadir.rb: ditto.
-
-Sun Apr 26 19:30:29 2009 Tanaka Akira <akr@fsij.org>
-
- * time.c (time_arg): unused variable removed.
-
-Sun Apr 26 18:35:32 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (io_reopen): keeps pathv for prep_stdio. [ruby-dev:38131]
-
-Sun Apr 26 15:13:09 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/optparse.rb (OptionParser#parse_in_order): do not make an
- option from non-option argument. [ruby-dev:38333]
-
-Sat Apr 25 19:11:13 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (ac_cv_func_daemon): use daemon(3) only on *BSD.
-
- * process.c (proc_daemon): double fork to ensure not having ctty.
- [ruby-core:23305]
-
-Sat Apr 25 16:19:48 2009 Tanaka Akira <akr@fsij.org>
-
- * time.c (month_arg): extracted from time_arg.
- (validate_vtm): ditto.
-
-Sat Apr 25 16:03:21 2009 Tanaka Akira <akr@fsij.org>
-
- * time.c (TIME_COPY_GMT): new macro.
- (time_s_at): use TIME_COPY_GMT.
- (time_succ): ditto.
-
-Sat Apr 25 15:54:04 2009 Tanaka Akira <akr@fsij.org>
-
- * time.c (time_mload): use TIME_SET_UTC.
-
-Sat Apr 25 15:47:54 2009 Tanaka Akira <akr@fsij.org>
-
- * time.c (time_get_tm): take time_object instead of gmt.
-
-Sat Apr 25 15:39:44 2009 Tanaka Akira <akr@fsij.org>
-
- * time.c (time_succ): refactored to avoid gmt variable.
- (strftimev): use TIME_UTC_P.
- (time_strftime): ditto.
-
-Sat Apr 25 15:21:33 2009 Tanaka Akira <akr@fsij.org>
-
- * time.c (TIME_UTC_P): new macro.
- (TIME_SET_UTC): ditto.
- (TIME_LOCALTIME_P): ditto.
- (TIME_SET_LOCALTIME): ditto.
- (time_utc_p): use the above macro.
- (time_localtime): ditto.
- (time_localtime): ditto.
- (time_gmtime): ditto.
- (time_to_s): ditto.
- (time_add): ditto.
- (time_sec): ditto.
- (time_min): ditto.
- (time_hour): ditto.
- (time_mday): ditto.
- (time_mon): ditto.
- (time_year): ditto.
- (time_wday): ditto.
- (wday_p): ditto.
- (time_yday): ditto.
- (time_isdst): ditto.
- (time_zone): ditto.
- (time_utc_offset): ditto.
- (time_to_a): ditto.
- (strftimev): ditto.
- (time_strftime): ditto.
- (time_mdump): ditto.
-
-Thu Apr 23 01:30:37 2009 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/zlib/zlib.c (Zlib::GzipFile#path): New method.
-
-Wed Apr 22 20:25:24 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * time.c (time_timespec): check out-of-range. [ruby-core:23282]
- [Bug #1396]
-
-Wed Apr 22 19:33:13 2009 Tanaka Akira <akr@fsij.org>
-
- * lib/time.rb (Time.parse): use year completion in Date._parse.
-
-Wed Apr 22 11:12:15 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * time.c (GMTIME, LOCALTIME): should set result if not have *_r().
-
- * time.c (localtime_with_gmtoff): now always needed tmbuf.
-
-Wed Apr 22 10:38:47 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * dir.c (glob_helper): C99(gcc)-ism.
-
- * time.c (find_time_t): GUESS macro needs the variable named ``result''
- always.
-
-Wed Apr 22 09:27:31 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * time.c (localtime_with_gmtoff): fixed cross function jump.
-
-Wed Apr 22 03:06:56 2009 Tanaka Akira <akr@fsij.org>
-
- * lib/time.rb (Time#rfc2822): pad leading zeros for year.
- (Time#httpdate): ditto.
- (Time#xmlschema): ditto.
-
-Wed Apr 22 02:10:48 2009 Tanaka Akira <akr@fsij.org>
-
- * lib/time.rb (Time#xmlschema): use subsec instead of nsec.
-
-Wed Apr 22 01:27:38 2009 Tanaka Akira <akr@fsij.org>
-
- * time.c (time_arg): use the year argument as-is. [ruby-dev:38194]
-
- * lib/time.rb (Time.parse): interpret small year 0..99 as 1950..2049.
-
-Wed Apr 22 00:32:16 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * time.c (find_time_t): constified.
-
-Wed Apr 22 00:11:19 2009 Tanaka Akira <akr@fsij.org>
-
- * time.c (leap_year_v_p): removed.
-
-Tue Apr 21 23:52:45 2009 Tanaka Akira <akr@fsij.org>
-
- * time.c: remove time_t restriction from Time class.
-
- * timev.h: new file to define struct vtm.
-
- * strftime.c: format struct vtm instead of struct tm.
-
- * ext/syck/rubyext.c (mktime_do): don't use time_t;
-
- [ruby-dev:38191]
-
-Tue Apr 21 09:25:41 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * dir.c (dir_path, dir_each, glob_helper): use readdir_r() if
- available.
-
-Tue Apr 21 09:20:21 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb (init_mkmf): needs default library path even if
- cross compiling.
-
-Tue Apr 21 07:07:45 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_push): bypass rb_ary_store().
-
-Tue Apr 21 01:25:16 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bignum.c (bigsub_int): subtraction without making internal
- bignum values.
-
- * bignum.c (bigadd_int): ditto for addition.
-
- * bignum.c (bigtrunc): declare inline.
-
- * bignum.c (rb_quad_pack): fix condition.
-
-Tue Apr 21 01:13:42 2009 Alexander Zavorine <alexandre.zavorine@nokia.com>
-
- * symbian/setup (config.h): added TIMET2NUM and NUM2TIMET to match
- the change in time.c
-
-Mon Apr 20 20:29:04 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_split_m): faster processing on 7bit strings.
-
- * string.c (ascii_isspace): faster isspace() for 7bit strings.
-
-Sun Apr 19 14:43:18 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (ruby_cleanup): the order of local variables on stack is
- undefined. should use outermost VALUE for ruby_init_stack.
-
- * gc.c (ruby_get_stack_grow_direction, Init_stack): allows volatile
- pointer.
-
- * thread_*.c (ruby_init_stack): ditto.
-
-Sun Apr 19 13:17:25 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * gem_prelude.rb (Gem::QuickLoader#push_gem_version_on_load_path):
- check for requirement if the gem is installed. a patch from
- Kyosuke MOROHASHI at [ruby-dev:38020].
-
-Sun Apr 19 01:39:17 2009 Tanaka Akira <akr@fsij.org>
-
- * process.c (proc_seteuid_m): defined to use rb_f_notimplement if not
- implemented.
- (proc_setegid_m): ditto.
-
-Sun Apr 19 01:03:56 2009 Tanaka Akira <akr@fsij.org>
-
- * process.c (proc_setuid): use rb_f_notimplement if not implemented.
- (proc_setgid): ditto.
-
-Sat Apr 18 23:07:18 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/readline/readline.c: use rb_f_notimplement for methods not
- implemented.
-
- * ext/openssl/ossl_engine.c: ditto.
-
- * ext/openssl/ossl_config.c: ditto.
-
- * ext/openssl/ossl_cipher.c: ditto.
-
- * ext/openssl/ossl_pkcs5.c: ditto.
-
- * ext/openssl/ossl_x509ext.c: ditto.
-
- * ext/socket/socket.c: ditto.
-
- * ext/socket/basicsocket.c: ditto.
-
- * ext/socket/ancdata.c: ditto.
-
- * ext/socket/unixsocket.c: ditto.
-
- * ext/iconv/iconv.c: ditto.
-
-Sat Apr 18 21:07:34 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/curses/curses.c: use rb_f_notimplement for methods not
- implemented.
-
-Fri Apr 17 01:51:17 2009 Tanaka Akira <akr@fsij.org>
-
- * node.h (rb_notimplement_body_p): declared.
-
- * vm_method.c (Init_eval_method): suppress a warning.
-
- * io.c (rb_io_fsync): use rb_f_notimplement if not implemented.
- (rb_io_close_on_exec_p): ditto.
- (rb_io_set_close_on_exec): ditto.
- (rb_io_fcntl): ditto.
- (rb_f_syscall): ditto.
-
- * dir.c (dir_tell): ditto.
- (dir_seek): ditto.
- (dir_s_chroot): ditto.
-
- * process.c (proc_getpgrp): ditto.
- (proc_setpgrp): ditto.
- (proc_getpgid): ditto.
- (proc_setpgid): ditto.
- (proc_setsid): ditto.
- (proc_getpriority): ditto.
- (proc_setpriority): ditto.
- (proc_getrlimit): ditto.
- (proc_setrlimit): ditto.
- (p_sys_setuid): ditto.
- (p_sys_setruid): ditto.
- (p_sys_seteuid): ditto.
- (p_sys_setreuid): ditto.
- (p_sys_setresuid): ditto.
- (p_sys_setgid): ditto.
- (p_sys_setrgid): ditto.
- (p_sys_setegid): ditto.
- (p_sys_setregid): ditto.
- (p_sys_setreuid): ditto.
- (p_sys_setresgid): ditto.
- (p_sys_issetugid): ditto.
- (proc_getgroups): ditto.
- (proc_setgroups): ditto.
- (proc_initgroups): ditto.
- (proc_daemon): ditto.
- (rb_proc_times): ditto.
-
- * file.c (rb_file_s_lchown): ditto.
- (rb_file_s_link): ditto.
- (rb_file_s_symlink): ditto.
- (rb_file_s_readlink): ditto.
- (rb_file_s_truncate): ditto.
- (rb_file_truncate): ditto.
-
-Fri Apr 17 00:53:47 2009 Yusuke Endoh <mame@tsg.ne.jp>
-
- * lib/cgi/core.rb (read_multipart): When path is not defined,
- define local_path as a method always returning nil instead of
- aliasing. This is because StringIO#path no longer exists.
-
-Fri Apr 17 00:45:09 2009 Yusuke Endoh <mame@tsg.ne.jp>
-
- * dir.c (bracket): fix escape handling for range character in bracket
- of fnmatch pattern. e.g., '[a\-c]' should not match 'b'.
-
-Thu Apr 16 23:09:03 2009 Tanaka Akira <akr@fsij.org>
-
- * class.c (rb_define_method_id): use rb_define_notimplement_method_id
- if rb_f_notimplement is given.
- (rb_define_protected_method): ditto.
- (rb_define_private_method): ditto.
- (rb_define_method): use rb_define_method_id.
-
- * include/ruby/intern.h (rb_f_notimplement): declared.
- (rb_define_notimplement_method_id): declared.
-
- * proc.c (method_inspect): show not-implemented.
-
- * vm_method.c (notimplement_body): new variable.
- (rb_notimplement_body_p): new function.
- (rb_method_boundp): return false if not implemented.
- (rb_f_notimplement): new function.
- (rb_define_notimplement_method_id): new function.
-
- * process.c (rb_f_fork): use rb_f_notimplement if not implemented.
-
- * file.c (rb_file_s_lchmod): use rb_f_notimplement if not implemented.
-
-Wed Apr 15 20:24:49 2009 Yusuke Endoh <mame@tsg.ne.jp>
-
- * array.c (rb_ary_flatten): flatten(0) works as Array#dup.
- [ruby-core:23168]
-
- * test/ruby/test_array.rb: add a test for above.
-
-Wed Apr 15 11:53:35 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * dir.c (fnmatch_helper): use rb_enc_precise_mbclen and
- fail if bytes are invalid. [ruby-dev:38307]
-
-Tue Apr 14 18:11:26 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * dir.c (bracket): if same in bytes, path is matching.
- [ruby-dev:38305]
-
-Mon Apr 13 17:21:40 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * sprintf.c (rb_str_format): scan coderange incrementally.
-
-Mon Apr 13 11:35:55 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * sprintf.c (rb_str_format): optimize previous commit.
- [ruby-list:45954]
-
-Mon Apr 13 10:58:54 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * sprintf.c (rb_str_format): check encoding compatibility only on
- real parts.
-
-Sun Apr 12 19:54:56 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * dir.c (bracket, fnmatch_helper): compare bytewise first, to get
- rid of invalid byte sequence. [ruby-dev:38303]
-
-Sat Apr 11 08:45:57 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (Makefile): phony ruby target needs empty command.
-
-Fri Apr 10 11:32:14 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (up): updates timestamp file.
-
-Fri Apr 10 04:54:01 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (Makefile): info-program needs common.mk.
-
-Fri Apr 10 03:46:44 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (RUBY_INSTALL_NAME): use --program-transform-name.
-
- * instruby.rb, mkconfig.rb: deal with --program-transform-name
- better. now supports s, y commands and single addressing.
-
-Thu Apr 9 23:59:11 2009 Tanaka Akira <akr@fsij.org>
-
- * configure.in: don't override the rule for ruby.
-
-Wed Apr 8 21:58:12 2009 Yusuke Endoh <mame@tsg.ne.jp>
-
- * string.c (rb_str_dump): buffer length plus one byte for null
- terminator. [ruby-dev:38294]
-
- * test/ruby/test_m17n.rb (test_str_dump): add a test for above.
-
-Wed Apr 8 20:08:16 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_str_rstrip_bang): should not sign-expand non-ascii.
- [ruby-core:23158]
-
-Wed Apr 8 17:29:29 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (rb_str_chop_bang): reset coderange. [ruby-core:23155]
-
-Wed Apr 8 14:00:04 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb (what_type?): fixed typo, and refined for member of
- aggregation types.
-
- * lib/mkmf.rb (Logging.postpone): copy postponed output always.
-
-Wed Apr 8 09:45:58 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (LIBRUBY_SO): removed redundant additional version
- numbers.
-
-Tue Apr 7 13:35:22 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (info): shows configured names.
-
- * configure.in (Makefile): works even if RUBY_INSTALL_NAME
- contains macro.
-
- * configure.in (LIBRUBY_DLDFLAGS): compatibility version is
- ruby_version.
-
- * configure.in (RUBY_REPLACE_TYPE): defines type modifier prefix
- for printf.
-
-Tue Apr 7 02:27:49 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (RUBY_DEFINT): should pass includes to
- AC_CHECK_SIZEOF and RUBY_CHECK_SIZEOF.
-
- * configure.in (CFLAGS, CXXFLAGS): need ARCH_FLAG for universal
- binary.
-
-Tue Apr 7 01:08:21 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * numeric.c (flo_to_s): reduce fragments if no precision lost.
- c.f. [ruby-core:23075]
-
-Mon Apr 6 23:16:08 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (CFLAGS, CXXFLAGS): override with $cflags and
- $cxxflags if not given. [ruby-core:23130]
-
-Mon Apr 6 19:26:18 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (utime_failed): refined the error message for EINVAL on
- DOSISH platforms, where it may fail depending on filesystems.
- see [ruby-dev:38277].
-
-Mon Apr 6 16:38:50 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (sys_fail2, rb_file_s_readlink, BUFCHECK, rmext),
- (rb_file_s_basename): get rid of overflow.
-
-Mon Apr 6 15:11:56 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * numeric.c (int_chr): checks overflow.
-
-Mon Apr 6 10:49:47 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/stringio/test_stringio.rb (test_path): StringIO#path is no
- longer defined. [ruby-dev:38254]
-
-Mon Apr 6 10:47:13 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/stringio/stringio.c (strio_path): removed. [ruby-dev:38254]
-
-Sun Apr 5 18:02:54 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/intern.h (rb_fd_resize): does nothing on Win32.
-
-Sat Apr 4 17:05:15 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/intern.h (RB_NUM_COERCE_FUNCS_NEED_OPID): macro to
- check compatibility. [ruby-dev:38162]
-
-Sat Apr 4 07:38:52 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * mkconfig.rb (sitearch): default to arch.
-
-Fri Apr 3 14:02:42 2009 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/irb/completion.rb (IRB::InputCompletor::Operators): Add
- overloadable negative operators.
-
- * lib/irb/ruby-lex.rb (RubyLex#lex_init): Support overloadable
- negative operators.
-
- * lib/irb/ruby-lex.rb (RubyLex#identify_identifier): Minus signs
- need to be escaped in regexp character class.
-
- * misc/ruby-mode.el (ruby-font-lock-keywords, ruby-parse-partial):
- Support overloadable negative operators.
-
-Fri Apr 3 12:45:55 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/extmk.rb: quotes arguments with spaces always.
-
-Thu Apr 2 14:50:06 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/getoptlong.rb: remove unused rdoc/usage from example.
- [ruby-core:23098]
-
-Thu Apr 2 07:42:27 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/Makefile.sub (config.h): updated.
-
-Wed Apr 1 20:37:49 2009 Tanaka Akira <akr@fsij.org>
-
- * configure.in (rb_cv_fork_with_pthread): fail if the child process
- fail.
-
-Wed Apr 1 19:46:46 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb (create_makefile): support for parallel make. a
- patch from Takuto Matsuu at [ruby-dev:38220].
-
-Wed Apr 1 19:39:25 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (LIBRUBY_LDSHARED): use $(CC) instead of cc.
- a patch from Wataru Kimura at [ruby-dev:38225].
-
-Wed Apr 1 18:53:51 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm_dump.c (rb_vm_bugreport): should not #include inside a
- function, since headers may have declarations.
- c.f. [ruby-core:23095]
-
-Wed Apr 1 18:44:53 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * mkconfig.rb: ignores version numbers in config.status. replaces
- all $$s in program_transform_name.
-
-Wed Apr 1 15:12:21 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * Makefile.in (.c.i): use CPP instead of CC, since gcc -E can'
- work with multiple -arch options.
-
-Wed Apr 1 13:46:20 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * thread.c (rb_thread_fd_select): new function to call select
- using rb_fdset_t.
-
- * io.c (select_internal): use rb_thread_fd_select instead of
- rb_thread_select. based on the patch from Kengo Matsuyama.
- [ruby-dev:38221]
-
-Wed Apr 1 13:16:19 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * process.c (rb_f_sleep): RDoc disambiguation. [ruby-talk:332632]
-
-Tue Mar 31 15:17:37 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in: fixed the help strings for the header and library
- dir switches, and updated to use AS_HELP_STRING. patches from
- Richard Brown, c.f. [ruby-core:23067].
-
-Mon Mar 31 08:18:57 2009 James Edward Gray II <jeg2@ruby-lang.org>
-
- * test/csv/test_interface.rb, test/csv/test_serialization.rb:
- Trying more fixes some failing tests on Windows.
-
-Mon Mar 30 19:04:25 2009 Tanaka Akira <akr@fsij.org>
-
- * .gdbinit (rp): show negative fixnum correctly.
-
-Mon Mar 30 12:12:46 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm_eval.c (eval_string_with_cref): replaces the message if
- frozen. [ruby-dev:38208]
-
-Mon Mar 30 01:00:20 2009 James Edward Gray II <jeg2@ruby-lang.org>
-
- * test/csv/test_interface.rb: Trying a fix for some failing tests
- on Windows.
-
-Sun Mar 29 08:59:26 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/pathname.rb (Pathname#relative_path_from): compares path
- components according to system default case-sensitiveness.
- [ruby-core:22829]
-
-Sat Mar 28 11:10:32 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (ruby.imp): all symbols in static library need to be
- exported, so that encoding-extensions can be loaded. based on a
- patch from Yutaka Kanemoto <kinpoco AT gmail.com> a
- [ruby-talk:332282].
-
-Sat Mar 28 08:49:47 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * sprintf.c (rb_str_format): checks if named argument given twice.
-
- * sprintf.c (GETNAMEARG): remembers named arg is used, to get rid
- of too many arguments warning.
-
-Sat Mar 28 03:16:59 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb (link_command, cc_command, cpp_command): should no
- override extout defined in extmk.rb.
-
-Fri Mar 27 12:56:44 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb (what_type?): checks more restrictively, and
- supports universal binary.
-
-Fri Mar 27 01:33:37 2009 Tanaka Akira <akr@fsij.org>
-
- * time.c (time_cmp): negate the result of reverse comparison.
-
-Fri Mar 27 01:19:50 2009 Tanaka Akira <akr@fsij.org>
-
- * bignum.c (rb_cmpint): FIX2INT may fail on LP64 platforms.
-
-Thu Mar 26 12:22:06 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/yaml/rubytypes.rb (String#is_binary_data?): TAB would be
- usually considered to be included in text data.
-
- * lib/rdoc/parser.rb (RDoc::Parser.binary?): blksize may be nil
- and is irrelevant to whether a file is binary. copied from
- above since TAB and newlines would be usually considered to be
- included in text data.
-
-Thu Mar 26 11:33:13 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/rdoc/ri/paths.rb (RDoc::RI::Paths): considers
- --program-prefix and --program-suffix. reapplied r19923.
-
-Wed Mar 25 07:45:12 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (target_alias): replaces cpu with universal too.
-
- * configure.in (target): replaces cpu with arch by --with-arch.
-
- * mkconfig.rb (TOPDIR): chops arch in config instead of
- RUBY_PLATFORM which varies on universal_binary.
-
- * mkconfig.rb (MAJOR, MINOR, TEENY): reads from version.h always.
-
-Tue Mar 24 19:23:44 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (RUBY_CHECK_SIZEOF): need to include $4.
-
-Tue Mar 24 17:08:52 2009 Akinori MUSHA <knu@iDaemons.org>
-
- * io.c (rb_io_inspect): Cannot access fptr->fd if fptr is NULL.
- This fixes a coredump caused by: ruby -e "class X < IO; def
- initialize; end; end; p X.new.inspect"
-
-Mon Mar 23 22:01:00 2009 Tanaka Akira <akr@fsij.org>
-
- * time.c (time_timespec): use NUM2TIMET.
- (time_s_at): ditto.
-
-Mon Mar 23 21:52:26 2009 Akinori MUSHA <knu@iDaemons.org>
-
- * process.c (Init_process): Better patch for eliminating an
- "unused variable".
-
-Mon Mar 23 21:41:14 2009 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/dbm/dbm.c (fdbm_initialize): Make the file variable
- volatile, because FilePathValue() currently does not protect the
- given variable from GC. (Probably it should)
-
- * ext/sdbm/init.c (fsdbm_initialize): Ditto.
-
-Mon Mar 23 19:22:14 2009 Akinori MUSHA <knu@iDaemons.org>
-
- * file.c (rb_file_s_lstat): Back out.
-
-Mon Mar 23 18:54:57 2009 Akinori MUSHA <knu@iDaemons.org>
-
- * file.c (rb_file_s_stat, rb_file_s_lstat): Remove repeated type
- checks.
-
-Mon Mar 23 14:57:48 2009 Narihiro Nakamura <authorNari@gmail.com>
-
- * gc.c (init_heap): set default to heap slots length
- if HEAP_OBJ_LIMIT is larger than HEAP_MIN_SLOTS. [Bug #1310]
- (set_heaps_increment): increment next_heaps_length if
- next_heaps_length and heaps_used are same.
-
-Mon Mar 23 14:32:23 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/win32.c (rb_w32_spawn): use original command if not found.
-
-Mon Mar 23 06:51:16 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * enc/depend (link_so): replaces $(TARGET) with basename of the
- target. [ruby-talk:330286]
-
-Sun Mar 22 14:51:55 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/win32.c (rb_w32_spawn, rb_w32_aspawn): use NULL as
- application name for batch files.
-
-Sat Mar 21 15:54:41 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/openssl/ossl_ssl.c (write_would_block): defined.
- (read_would_block): defined.
- (ossl_start_ssl): add nonblock argument.
- (ossl_ssl_connect): follow ossl_start_ssl change.
- (ossl_ssl_connect_nonblock): new method.
- (ossl_ssl_accept): follow ossl_start_ssl change.
- (ossl_ssl_accept_nonblock): new method.
- (ossl_ssl_read_internal): use write_would_block and
- read_would_block.
- (ossl_ssl_write_internal): ditto.
-
-Sat Mar 21 08:19:52 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * process.c (rb_exec): prints error message only on platforms
- neither close-on-exec nor spawnv is supported.
-
-Sat Mar 21 08:17:41 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/win32.c (rb_w32_spawn, rb_w32_aspawn): omit program name
- if actual program path is found. [ruby-core:22960]
-
-Sat Mar 21 07:25:56 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (pipe_open): should pass program name even if multiple
- arguments are given. fix for TestProcess::test_argv0.
-
-Sat Mar 21 02:37:07 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/openssl/lib/openssl/buffering.rb
- (OpenSSL::Buffering#write_nonblock): new method.
-
- * ext/openssl/ossl_ssl.c (ossl_ssl_write_nonblock): new method.
- (ossl_ssl_write_internal): defined.
- (ossl_ssl_write): use ossl_ssl_write_internal.
-
-Fri Mar 20 18:25:25 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/win32.c (errmap): added ERROR_MOD_NOT_FOUND.
-
-Fri Mar 20 09:22:59 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (libprefix): must not append "lib" after $(libdir),
- when load_relative is not used on darwin. a patch from Kenta
- Murata at [ruby-dev:38182].
-
-Thu Mar 19 20:29:40 2009 Tanaka Akira <akr@fsij.org>
-
- * io.c (rb_mWaitReadable): defined.
- (rb_mWaitWritable): defined.
- (io_getpartial): extend IO::WaitReadable on EWOULDBLOCK and EAGAIN.
- (rb_io_write_nonblock): extend IO::WaitWritable on EWOULDBLOCK and
- EAGAIN.
-
- * error.c (make_errno_exc): extracted from rb_sys_fail.
- (rb_mod_sys_fail): new function.
-
- * include/ruby/ruby.h (rb_mod_sys_fail): declared.
- (rb_mWaitReadable): declared.
- (rb_mWaitWritable): declared.
-
- * ext/socket/init.c (rsock_s_recvfrom_nonblock): extend
- IO::WaitReadable on EWOULDBLOCK and EAGAIN.
- (rsock_s_accept_nonblock): extend IO::WaitReadable on EWOULDBLOCK,
- EAGAIN, ECONNABORTED and EPROTO.
-
- * ext/socket/socket.c (sock_connect_nonblock): extend IO::WaitWritable
- on EINPROGRESS.
-
- * ext/socket/ancdata.c (bsock_sendmsg_internal): extend
- IO::WaitWritable on EWOULDBLOCK and EAGAIN.
- (bsock_recvmsg_internal): extend IO::WaitReadable on EWOULDBLOCK and
- EAGAIN.
-
- * ext/openssl/ossl_ssl.c (ossl_ssl_read_internal): raise SSLError
- extended by IO::WaitReadable/IO::WaitWritable on
- SSL_ERROR_WANT_READ/SSL_ERROR_WANT_WRITE.
-
- * ext/openssl/ossl.c (ossl_make_error): extracted from ossl_raise.
- (ossl_exc_new): new function.
-
- * ext/openssl/ossl.h (ossl_exc_new): declared.
-
- * lib/net/protocol.rb (rbuf_fill): rescue IO::WaitReadable and
- IO::WaitWritable.
-
- [ruby-core:22539], [ruby-dev:38140]
-
-Thu Mar 19 18:49:49 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (RUBY_CHECK_SIZEOF): allows qualified name.
-
- * configure.in (RUBY_REPLACE_TYPE): checks more strictly.
-
- * configure.in (struct stat.st_size, struct stat.st_blocks),
- (struct stat.st_ino): check for size.
-
- * lib/mkmf.rb (check_sizeof): allows qualified name.
-
- * file.c (rb_stat_ino, rb_stat_blocks): check by size.
-
-Wed Mar 18 16:59:48 2009 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * test/test_syslog.rb (TestSyslog#test_open): check
- param after block again. because detect not to call block.
-
-Wed Mar 18 16:54:04 2009 TAKANO Mitsuhiro (takano32) <tak@no32.tk>
-
- * ext/socket/ancdata.c: not use pktinfo.ipi_spec_dst if not defined
- * ext/socket/extconf.rb: define HAVE_IPI_SPEC_DST
-
-Wed Mar 18 16:38:11 2009 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * test/test_syslog.rb (TestSyslog#test_open): check
- block parameter in block. [ruby-dev:38180]
-
-Wed Mar 18 12:48:01 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * error.c (report_bug): rb_bug can be caused by extension
- libraries.
-
-Wed Mar 18 02:41:33 2009 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-
- * lib/drb/drb.rb (open_server_inaddr_any): fixed multiple network
- families problem. a patch from Charl Matthee at [ruby-core:21033].
-
-Tue Mar 17 21:42:54 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * tool/make-snapshot (package): creates .revision.time and passes
- CHDIR to create prerequisite files.
-
-Tue Mar 17 18:00:55 2009 Akinori MUSHA <knu@iDaemons.org>
-
- * enumerator.c (Enumerator#{each_,}{with_index,with_object}): Fix
- a bug where any parameter but the first one is dropped even if
- multiple values are yielded with. [Bug #1198]
-
-Tue Mar 17 14:25:16 2009 Tanaka Akira <akr@fsij.org>
-
- * lib/pathname.rb (Pathname#sub): set $~ in block.binding.
- [ruby-dev:38173]
-
-Tue Mar 17 13:48:08 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/Makefile.sub (config.h): added RUBY_COREDLL.
-
- * ext/dl/handle.c (rb_dlhandle_initialize): returns msvcrt if libc
- or RUBY_COREDLL is given. [ruby-core:22828]
-
-Tue Mar 17 10:29:22 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * dir.c, dln.c, parse.y, re.c, ruby.c, sprintf.c, strftime.c,
- string.c, util.c, variable.c: use strlcpy, memcpy and snprintf
- instead of strcpy, strncpy and sprintf.
-
-Mon Mar 16 17:15:16 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/dl/test_win32.rb (Win32API): enclosed by DL::TestWin32.
- [ruby-core:22827]
-
-Mon Mar 16 16:37:22 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/tk/tcltklib.c (eventloop_sleep, lib_eventloop_core),
- (lib_watchdog_core): tv_usec is not time_t.
-
-Mon Mar 16 12:30:07 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (REVISION_H): keeps timestamp of revision.h.
- [ruby-core:22900]
-
- * tool/ifchange, win32/ifchange.bat: extended --timestamp option.
-
-Mon Mar 16 09:28:58 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * Makefile.in, common.mk, win32/Makefile.sub: added preprocessing rules.
-
-Sun Mar 15 12:34:17 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/minitest/test_mini_test.rb: fixed tests depending on the
- detail of floating point representation.
-
-Sun Mar 15 12:01:36 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/rubygems/installer.rb (Gem::Installer#shebang): fix for env
- shebang.
-
-Sun Mar 15 11:15:18 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/ruby.h ({RSTRING,RBIGNUM}_EMBED_LEN_MAX): made int.
-
- * include/ruby/ruby.h (OBJ_{TAINTED,UNTRUSTED,FROZEN}): return int.
-
- * include/ruby/encoding.h (ENC_CODERANGE): ditto.
-
-Sun Mar 15 11:11:44 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_hash_uint, rb_hash_start, rb_hash_end): use VALUE
- rather than unsigned int.
-
-Sun Mar 15 11:00:14 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (load_file_internal): stop the timer thread before exec.
-
-Sun Mar 15 09:17:26 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (.y.c): use SRC_FILE which contains slashes instead of
- backslashes. [ruby-core:22891]
-
-Sun Mar 15 08:26:16 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (srcs-ext): creates ext/dl/callback/callback.c also.
-
-Sun Mar 15 03:29:51 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * process.c (SAVED_GROUP_ID, p_gid_switch): should be rb_gid_t.
-
-Sun Mar 15 02:53:13 2009 Tanaka Akira <akr@fsij.org>
-
- * string.c (rb_str_subpat): accept capture name.
- (rb_str_aref): follow above change.
- (rb_str_aref_m): pass the 2nd argument to rb_str_subpat.
- (rb_str_subpat_set): accept capture name.
- (rb_str_aset): follow above change.
- (rb_str_partition): ditto.
- (rb_str_aset_m): pass the 2nd argument to rb_str_subpat_set.
-
- * include/ruby/intern.h (rb_reg_backref_number): declared.
-
- * re.c (rb_reg_backref_number): defined.
-
- [ruby-core:21057]
-
-Sun Mar 15 02:09:31 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * proc.c (bmcall): should not uninitialized variable. a patch from
- pegacorn at [ruby-dev:38169].
-
-Sat Mar 14 18:25:18 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * util.c (ruby_scan_oct, ruby_scan_hex): use size_t.
-
-Sat Mar 14 18:18:08 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * proc.c (rb_proc_call, rb_node_arity, bmcall, curry): checks
- overflow.
-
- * proc.c (rb_proc_parameters): unnamed_parameters() expects in
- not VALUE.
-
-Sat Mar 14 17:54:19 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * util.c (ruby_each_words): assume no string exceeds INT_MAX.
-
-Sat Mar 14 15:59:04 2009 Tanaka Akira <akr@fsij.org>
-
- * process.c (rb_spawn_internal): use int variable for status.
-
-Sat Mar 14 14:45:51 2009 Tanaka Akira <akr@fsij.org>
-
- * process.c (rb_f_system): use rb_pid_t for pid.
- (rb_spawn_internal): local variable renamed.
-
-Sat Mar 14 14:16:02 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * util.c (ruby_strdup, Balloc, rv_alloc): use size_t.
-
-Sat Mar 14 13:53:11 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * util.c (ruby_qsort): the result of cmp must be signed, so ge
- rid of reuse of a variable.
-
-Sat Mar 14 10:56:13 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * dln.c (init_funcname_len, dln_find_exe_r, dln_find_file_r): use
- size_t.
-
- * file.c (rb_stat_inspect, file_expand_path): ditto.
-
- * util.c (ruby_qsort): ditto.
-
-Sat Mar 14 10:39:13 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb (CXX_EXT): checks for case-sensitive filesystem with
- FNM_SYSCASE rather than build_os.
-
-Fri Mar 13 23:03:40 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/init.c (wait_connectable0): remove unreachable code.
-
-Fri Mar 13 23:00:02 2009 Tanaka Akira <akr@fsij.org>
-
- * configure.in (RUBY_CHECK_SIZEOF): pass [include] to AC_CHECK_SIZEOF.
-
-Fri Mar 13 20:58:11 2009 Tanaka Akira <akr@fsij.org>
-
- * dln.c (dln_find_1): compare fspace in size_t world.
-
-Fri Mar 13 18:58:04 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (CFLAGS, CXXFLAGS): moved after warnflags.
-
-Fri Mar 13 18:10:06 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm_eval.c (rb_throw_obj): inverted call flow. [ruby-core:22872]
-
-Fri Mar 13 17:04:09 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/ruby.h (bool): not define to get rid of conflict
- against curses.
-
-Fri Mar 13 16:45:33 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/openssl/openssl_missing.h (i2d_of_void): cast for callbacks.
- [ruby-core:22860]
-
- * ext/openssl/ossl_engine.c (ossl_engine_s_by_id): suppress a
- warning.
-
- * ext/openssl/ossl_ssl.c (ossl_sslctx_flush_sessions): time_t may
- be larger than long.
-
- * ext/openssl/ossl_ssl_session.c (ossl_ssl_session_get_time),
- (ossl_ssl_session_get_timeout): use TIMET2NUM() to convert
- time_t.
-
-Fri Mar 13 15:10:43 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/openssl/ossl_x509ext.c (ossl_x509ext_set_value): should use
- OPENSSL_free instead of free. a patch from Charlie Savage at
- [ruby-core:22858].
-
-Fri Mar 13 21:11:51 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/sdbm/_sdbm.c: should include "ruby/defines.h" as well for
- prototypes of compatibility functions on Win32 platform.
- [ruby-core:22870]
-
-Fri Mar 13 10:42:19 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (AC_HEADER_STDBOOL): added.
-
- * include/ruby/ruby.h (NUM2INT, rb_special_const_p): returns true
- and false instead of Qtrue and Qfalse for platforms where VALUE
- is bigger than int.
-
- * gc.c (gc_stress_set), ext/openssl/ossl_asn1.c (decode_bool): go
- rid of variables named `bool'.
-
-Fri Mar 13 10:16:36 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (struct stat.st_size): may be huge.
-
-Fri Mar 13 09:30:12 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * bignum.c (bigfixize): zero length Bignum is 0.
-
-Fri Mar 13 09:17:12 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/fileutils.rb (FileUtils#fu_get_gid): stringify group
- argument before making regexp match. [ruby-dev:38155]
-
-Fri Mar 13 08:06:48 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * util.c (rv_strdup): macro to duplicate nul-terminated string.
- [ruby-core:22852]
-
-Thu Mar 12 22:41:41 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/openssl: suppress warnings.
-
- * ext/openssl/ossl.h (OSSL_Debug): don't use gcc extension for
- variadic macro.
-
-Thu Mar 12 22:29:36 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/Makefile.sub (WARNFLAGS): warning 4996 is only in VC++8 or
- later.
-
-Thu Mar 12 22:14:01 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/openssl/ossl_ssl.c (ossl_ssl_def_const): use INT2NUM because
- OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG doesn't fit into Fixnum.
-
-Thu Mar 12 18:16:12 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * array.c, bignum.c, dln.c, error.c, gc.c, io.c, marshal.c,
- numeric.c, pack.c, strftime.c, string.c, thread.c, transcode.c,
- transcode_data.h, util.c, variable.c, vm_dump.c,
- include/ruby/encoding.h, missing/crypt.c, missing/vsnprintf.c:
- suppress VC type warnings. [ruby-core:22726]
-
- * marshal.c (div0), numeric.c (infinite_value): new functions to
- get rid of VC division by 0 warnings.
-
- * st.c: use st_index_t for indexes instead of int.
-
- * vm.c (rb_vm_get_sourceline), vm_insnhelper.c (vm_throw): use
- rb_num_t.
-
-Thu Mar 12 09:30:54 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (RUBY_CHECK_SIZEOF): if same size type is found, no
- more calculation is needed.
-
- * configure.in (RUBY_DEFINT): falls back to RUBY_CHECK_SIZEOF if
- size is not immediate.
-
-Thu Mar 12 09:24:24 2009 Tanaka Akira <akr@fsij.org>
-
- * transcode_data.h: suppress warnings of overflow.
-
-Thu Mar 12 09:15:14 2009 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/encoding.h: suppress warnings of overflow.
-
-Thu Mar 12 05:49:05 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (warnflags): added some default flags,
- pointer-arith, write-strings and shorten-64-to-32, but suppress
- unused-parameter and missing-field-initializers, if possible.
-
- * configure.in (RUBY_CHECK_HUGE): checks whether a value range is
- larger than long.
-
- * file.c (rb_stat_blocks): struct stat.st_blocks may be larger
- than long.
-
- * io.c (copy_stream_fallback_body): off_t may be larger than long.
-
- * iseq.c (rb_iseq_disasm): RSTRING_LEN() returns long.
-
- * process.c (rb_f_sleep): time() needs time_t.
-
- * random.c (fill_random_seed): enclosed conditionally used
- variables.
-
- * thread_pthread.c (ruby_init_stack): range of rlim_cur may be
- larger than int.
-
- * missing/vsnprintf.c (BSD_vfprintf): commented out code which has
- no effect at all.
-
-Thu Mar 12 02:10:57 2009 Tanaka Akira <akr@fsij.org>
-
- * configure.in: strip spaces from ruby_version.
- Sun C 5.9 SunOS_i386 Build47_dlight 2007/05/22 generates
- `ruby_version= 1 "." 9 "." 1'.
-
-Thu Mar 12 01:18:09 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * dir.c (dir_seek): use long for seekdir().
-
-Thu Mar 12 01:08:27 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * tool/ytab.sed: replaces backslashes with slash for nmake.
-
-Wed Mar 11 21:23:06 2009 Tanaka Akira <akr@fsij.org>
-
- * time.c (time_mload): don't clear tm_mday.
-
-Wed Mar 11 20:13:38 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/dl/handle.c (rb_dlhandle_sym): RTLD_NEXT is not for symbol
- name. [ruby-dev:38150]
-
-Wed Mar 11 17:26:38 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/dl/win32/lib/Win32API.rb: call by :stdcall as default.
- [ruby-core:22826]
-
-Wed Mar 11 13:27:14 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (stack_type): uses VALUE which is able to be stored
- parser stack.
-
-Wed Mar 11 13:22:41 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/win32.c (init_env): set TMPDIR if none of TMPDIR, TMP,
- TEMP is set.
-
- * win32/win32.c (rb_w32_telldir, rb_w32_seekdir): should use long,
- as defined by SUSv3.
-
-Wed Mar 11 13:03:12 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/dl/handle.c (rb_dlhandle_sym): fixed heap corruption.
- [ruby-core:22822]
-
-Wed Mar 11 06:12:47 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (ruby_init_loadpath_safe): expands libpath and removes
- last /lib.
-
-Wed Mar 11 04:47:47 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * time.c (time_to_i, time_hash): time_t may be bigger than long
- and int.
-
- * time.c (time_timeval, rb_time_timeval, obj2nsec, time_strftime),
- (time_mdump, time_mload): suppress warnings.
-
- * win32/Makefile.sub (config.h): added TIMET2NUM and NUM2TIMET.
-
-Wed Mar 11 04:29:52 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/win32.c: suppress warnings. based on a patch from Charlie
- Savage at [ruby-core:22804].
-
-Wed Mar 11 04:22:12 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * signal.c (sig_trap): suppress warnings.
-
-Tue Mar 10 20:07:45 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/Makefile.sub (WARNFLAGS): uses -wd4996 instead of
- CRTDEFFLAGS. cf. [ruby-core:22725]
-
-Tue Mar 10 19:58:52 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/win32.h (strcasecmp, strncasecmp): use _ prefixed
- versions to suppress warnings.
-
- * ext/dl/callback/mkcallback.rb (DLTYPE[FLOAT]): cast to suppress
- warnings. [ruby-core:22792]
-
- * array.c, bignum.c, gc.c, numeric.c, string.c, util.c, insns.def,
- missing/crypt.c, missing/vsnprintf.c, : suppress warnings.
- [ruby-core:22792]
-
-Tue Mar 10 13:45:54 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/Makefile.sub (LDFLAGS): moved -link to TRY_LINK, LINK_SO
- and so on. based on a patch by Charlie Savage at
- [ruby-core:22794]
-
- * win32/Makefile.sub (config.h): passes LDFLAGS to rbconfig.rb so
- that extconf.rb could refer it. [ruby-core:22725]
-
-Tue Mar 10 11:36:32 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * iseq.c (prepare_iseq_build): too few arguments to function
- rb_ary_tmp_new().
-
-Tue Mar 10 10:53:59 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * iseq.c (rb_iseq_compile_with_option): argument may be converted.
-
-Tue Mar 10 04:56:44 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (MINIRUBY): keep macro into Makefile.
-
- * configure.in (RUBY_CHECK_SIZEOF): fix for fallback.
-
- * configure.in (MANGLED_PATH): defines for RUBYLIB_PREFIX.
-
- * ruby.c (ruby_init_loadpath_safe): uses string as buffer.
-
- * symbian/setup (config_h): defines MANGLED_PATH.
-
-Tue Mar 10 03:48:27 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/dl/callback/depend: fix for parallel build.
-
- * ext/dl/callback/extconf.rb: callback.h is no longer created.
-
- * ext/dl/callback/mkcallback.rb: creates main source first.
-
- * ext/dl/callback/extconf.rb ($distcleanfiles): added callback.c.
-
-Tue Mar 10 00:06:21 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (load_relative): new option to enable load path
- relative to libruby_so.
-
- * ruby.c (ruby_init_loadpath_safe): added the case using dladdr().
-
-Mon Mar 9 16:49:13 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/rake: updated to rake code to rake-0.8.4 source code base.
-
-Mon Mar 9 16:03:37 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/rubygems/installer.rb (Gem::Installer#initialize): env may
- not be under /usr/bin.
-
- * lib/rubygems/installer.rb (Gem::Installer#shebang): uses /bin/sh
- if shebang has any options, since env shebang trick does no
- work with options.
-
-Mon Mar 9 15:19:55 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * instruby.rb (manpages): use basename to compare and for Tempfile.
-
-Mon Mar 9 14:55:27 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * instruby.rb (default gems): installs default gemspecs.
-
-Mon Mar 9 14:48:08 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/Makefile.sub (OPTFLAGS): simplified. see [ruby-core:22725]
-
-Mon Mar 9 14:33:57 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * instruby.rb: prints names of the directories where files are
- installed to.
-
-Mon Mar 9 02:25:54 2009 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_proc.rb: add some tests.
-
-Mon Mar 9 01:38:00 2009 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_enum.rb: add some tests.
-
-Mon Mar 9 01:12:37 2009 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_object.rb: add a test for Object#method_missing.
-
-Mon Mar 9 01:11:17 2009 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_file_exhaustive.rb: add tests for File#size and
- File.absolute_path.
-
-Sun Mar 8 23:02:50 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/Makefile.sub (LDFLAGS): always prepends -link.
-
-Sun Mar 8 11:39:57 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (RUBY_CHECK_SIZEOF): dirty hack to compute multiple
- sizeof, for apple's universal binary.
-
-Sat Mar 7 22:06:03 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (universal_binary): checks if sizes are same on all
- architectures.
-
-Sat Mar 7 18:45:56 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in: checks if cd really succeeded.
-
-Sat Mar 7 14:24:47 2009 Tanaka Akira <akr@fsij.org>
-
- * configure.in: don't use CONFIG_SHELL for testing shell feature in
- Makefile.
-
-Sat Mar 7 14:07:31 2009 Tanaka Akira <akr@fsij.org>
-
- * configure.in: fix the location of cdcmd.
-
-Sat Mar 7 13:52:01 2009 Tanaka Akira <akr@fsij.org>
-
- * configure.in: the shell which runs configure may be different from
- the shell for make. configure likes bash but Makefile specifies
- SHELL=/bin/sh.
-
-Sat Mar 7 12:31:30 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/erb/test_erb.rb: reverted space sensitive test results.
-
- * test/rdoc/test_rdoc_parser_c.rb: ditto.
-
- * test/rdoc/test_rdoc_ri_default_display.rb: ditto.
-
-Fri Mar 6 23:35:59 2009 Tanaka Akira <akr@fsij.org>
-
- * lib/securerandom.rb (SecureRandom.urlsafe_base64): add optional
- argument to add padding.
-
-Fri Mar 6 19:25:40 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (RUBY_LIB_VERSION_STYLE): sets full or minor style
- not to show RUBY_VERSION_MAJOR and so on.
-
- * version.h (RUBY_LIB_VERSION): makes from RUBY_LIB_VERSION_STYLE.
-
- * configure.in, Makefile.in, win32/Makefile.sub (CHDIR): cd using
- physical directory.
-
- * Makefile.in (update-mspec): split from update-rubyspec.
-
- * win32/Makefile.sub (update-{rubyspec,mspec}): added.
-
-Fri Mar 6 14:28:36 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * Makefile.in, win32/Makefile.sub (INSNS): moved variable
- definition before rule.
-
-Fri Mar 6 13:47:10 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/rake/loaders/makefile.rb (Rake::MakefileLoader#load): deals with
- escaped spaces. incorporated from rake 0.8.4.
-
- * lib/rake/testtask.rb (Rake::TestTask#define): passes each libs
- as each arguments with expanded. incorporated from rake 0.8.4.
-
-Thu Mar 5 18:36:38 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * numeric.c (flo_to_s): keeps enough precision for round trip.
- [ruby-core:22325]
-
-Thu Mar 5 17:42:06 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_fill): doc for Array#fill misses indication
- about negative value for the start argument. [ruby-core:22497]
-
-Thu Mar 5 16:56:14 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/tmpdir.rb (Dir.tmpdir): not use USERPROFILE, and ignores
- non-existent directory.
-
-Thu Mar 5 14:52:46 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/win32.c (rb_w32_sysinit): initializes version info first.
-
- * win32/win32.c (rb_w32_osid): always define for binary compatibility.
-
-Thu Mar 5 11:52:16 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/Makefile.sub (make_insns_rules): rule to make rules for insns.
-
-Thu Mar 5 11:27:16 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/Makefile.sub (miniruby.exe): workaround for a failure of
- mt.exe on Windows 7 beta. [ruby-talk:330284]
-
-Thu Mar 5 10:32:17 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * test/dl/test_base.rb: Add dragonfly to libc and libm switch.
-
-Thu Mar 5 10:29:10 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (str_eql): extracted from rb_str_equal and rb_str_eql.
-
- * string.c (rb_str_chomp_bang): keeps 7bit coderange.
-
-Thu Mar 5 10:10:40 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/encoding.h (enc_initialized_p): ENC_UNINITIALIZED
- is not defined already.
-
- * include/ruby/encoding.h (ENC_FROM_ENCINDEX): removed because
- depending on a static variable.
-
-Thu Mar 5 04:42:52 2009 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_array.rb: fix wrong test, and add a test for
- sort_by!.
-
-Thu Mar 5 04:32:38 2009 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_array.rb: add some tests for coverage.
-
-Thu Mar 5 00:06:37 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/README.win32 (Requirement): added unicows.lib and dll.
-
-Wed Mar 4 23:29:56 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in, win32/configure.bat (--enable-win95): new option
- to enable/disable win95 support.
-
-Wed Mar 4 21:21:51 2009 Yusuke Endoh <mame@tsg.ne.jp>
-
- * lib/thread.rb (SizedQueue#push): fix limit condition.
- [ruby-dev:38135]
-
-Wed Mar 4 20:27:10 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (mingw): checks if unicows.lib is available.
-
- * include/ruby/win32.h (WIN95): moved to config.h
-
- * win32/Makefile.sub (LIBS): links unicows.lib if available.
-
- * win32/Makefile.sub (config.h): defines WIN95 only if unicows.lib
- is available.
-
- * win32/setup.mak (-unicows-): checks if unicows.lib is available.
-
-Tue Mar 3 17:10:09 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/extmk.rb (extmake): removes object files no longer used and
- files to be removed by old distclean.
-
-Tue Mar 3 16:51:51 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/dl/win32/lib/win32/resolv.rb: get rid of warning.
-
- * ext/dl/lib/dl/func.rb: ditto.
-
-Tue Mar 3 16:25:43 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/extmk.rb (extmake), lib/mkmf.rb (create_makefile): $objs and
- $srcs are always Array or nil now.
-
-Tue Mar 3 15:54:11 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/dl/win32/lib/win32/{registry,resolv}.rb: use dl/import instead
- of Win32API.
-
-Tue Mar 3 15:53:20 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/dl/lib/dl/func.rb (DL::Function.name): delegate to @cfunc.
-
-Tue Mar 3 15:40:38 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/dl/dl.c (rb_dl_init_callbacks): autoloads callbacks.
-
- * ext/dl/callback: split from dl.
-
- * ext/dl/lib/dl/cparser.rb (DL::CParser::parse_signature): fixed
- variable name.
-
- * ext/dl/lib/dl/pack.rb (DL::PackInfo): reduced redundant
- initialization.
-
- * ext/dl/lib/dl/stack.rb (DL::Stack): ditto.
-
- * ext/dl/lib/dl/value.rb (DL::ValueUtil#wrap_arg): NULL for nil.
-
- * test/dl: moved from ext/dl/test.
-
-Tue Mar 3 14:57:28 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (main): passes $(MAKE) to mkmain_cmd
-
- * ext/extmk.rb (command_output): uses arguments to invoke make.
-
-Tue Mar 3 01:56:03 2009 Tanaka Akira <akr@fsij.org>
-
- * lib/securerandom.rb (SecureRandom.urlsafe_base64): delete padding.
-
-Mon Mar 2 21:39:08 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/sockport.h (SS_LEN): defined unconditionally.
-
-Mon Mar 2 21:26:42 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/ancdata.c (anc_inspect_socket_creds): suppress warnings.
-
-Mon Mar 2 21:13:42 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/ancdata.c (rsock_discard_cmsg_resource): defined
- unconditionally.
-
-Mon Mar 2 21:06:40 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/raddrinfo.c (addrinfo_mload): don't use "sun" variable
- for Solaris.
-
-Mon Mar 2 21:01:36 2009 Tanaka Akira <akr@fsij.org>
-
- * file.c: include fcntl.h for O_RDONLY on Solaris.
-
-Mon Mar 2 19:43:02 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/uri/common.rb (URI::Parser#escape): escaped string is ascii
- only.
-
- * lib/uri/common.rb (URI::Parser#unescape): converts bytewise.
- [ruby-dev:38005], [ruby-dev:38110]
-
-Mon Mar 2 16:40:11 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * README.EXT, README.EXT.ja (Macros): added HAVE_RUBY_*_H.
-
-Mon Mar 2 12:22:12 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/win32.c (init_env): keeps wide chars as wide chars.
-
-Mon Mar 2 11:01:45 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/dl/dl.h (dlerror): fixed on Windows.
-
- * ext/dl/handle.c (rb_dlhandle_initialize): returns handle to
- libruby if nil is given on Windows as dlopen.
-
- * ext/dl/handle.c (rb_dlhandle_sym): get rid of buffer overrun,
- and try ASCII WINAPI versions too.
-
-Mon Mar 2 10:29:17 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_longjmp), include/ruby/intern.h (ruby_cleanup): fixed
- prototypes.
-
-Mon Mar 2 00:56:45 2009 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-
- * lib/drb/observer.rb: The module observable uses now a hash to
- store listeners. merged a patch from Alessandro Di Maria in
- [ruby-core:22560].
-
-Sun Mar 1 22:59:41 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/raddrinfo.c: suppress warnings.
-
- * ext/socket/socket.c: ditto.
-
- * ext/socket/unixsocket.c: ditto.
-
-Sun Mar 1 20:57:41 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/ (rsock_getfamily): renamed from rb_sock_getfamily.
-
-Sun Mar 1 19:52:46 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/dl/win32/lib/Win32API.rb (initialize): passes res
- arguments to DL.
-
-Sun Mar 1 19:38:59 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/zlib/zlib.c (zstream_run): suppress a warning. a patch from
- Charlie Savage at [ruby-core:22607].
-
-Sun Mar 1 19:36:18 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * util.c (ruby_dtoa): allocates one more byte to get rid of buffer
- overrun. a patch from Charlie Savage at [ruby-core:22604].
-
-Sun Mar 1 19:10:59 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (.y.c): removed extra backslash. [ruby-core:22602]
-
-Sun Mar 1 19:02:03 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/dl/cfunc.c (rb_dlcfunc_call): fix for stdcall and missing
- argument numbers. [ruby-core:22601]
-
- * ext/dl/dl.h (DLSTACK_PROTO0_): added.
-
- * ext/dl/mkcallback.rb (gencallback, gen_callback_file),
- (rb_dl_init_callbacks): omit stdcall functions unless supported.
-
- * lib/rubygems/config_file.rb (SHGetFolderPath): stdcall.
-
-Sun Mar 1 17:27:14 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/bigdecimal/bigdecimal.c (gfDebug): uncommented out.
- [ruby-core:22600]
-
-Sun Mar 1 16:15:31 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * process.c (rb_waitpid): use wait_each() on no waitpid platforms.
- [ruby-dev:38054]
-
-Sun Mar 1 16:01:01 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * process.c (proc_daemon): stops and restarts timer thread because
- daemon(3) implies fork(2). [ruby-dev:38055]
-
-Sun Mar 1 15:45:49 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/ (rsock_make_hostent): renamed from sock_make_hostent.
- (rsock_addrinfo): renamed from sock_addrinfo.
- (rsock_getaddrinfo): renamed from sock_getaddrinfo.
- (rsock_socket): renamed from ruby_socket.
- (rsock_sock_s_socketpair): renamed from sock_s_socketpair.
- (rsock_connect): renamed from ruby_connect.
-
- * ext/socket/socket.c (sock_listen): make it static.
-
-Sun Mar 1 15:29:31 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket: add rsock_ prefix.
-
-Sat Feb 28 21:52:37 2009 Tanaka Akira <akr@fsij.org>
-
- * vm_eval.c (rb_iterate): use volatile to suppress warnings.
-
- * eval.c (ruby_cleanup): ditto.
-
-Sat Feb 28 20:09:40 2009 Tanaka Akira <akr@fsij.org>
-
- * eval_error.c (error_print): use volatile to suppress warnings.
-
- * vm_eval.c (eval_string_with_cref): ditto.
-
- * thread.c (rb_exec_recursive): ditto.
-
- * eval_jump.c (rb_exec_end_proc): ditto.
-
- * eval.c (ruby_exec_node): ditto.
- (rb_longjmp): ditto.
-
-Sat Feb 28 18:28:58 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/ancdata.c (ancillary_unix_rights): check message type.
-
-Sat Feb 28 16:18:39 2009 Tanaka Akira <akr@fsij.org>
-
- * lib/net/http.rb: suppress warnings of non-existing instance variable
- access for SSL.
-
-Sat Feb 28 14:50:47 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/lib/socket.rb (BasicSocket#connect_address): returns ::1
- if the address is IPv4-mapped IPv6 address for 0.0.0.0 for MacOS X.
-
-Sat Feb 28 00:18:40 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/raddrinfo.c: suppress strict-aliasing warning with
- gcc version 4.4.0 20090219 (Red Hat 4.4.0-0.21) on Fedora 11 Alpha.
-
- * ext/socket/socket.c: ditto.
-
- * ext/socket/unixsocket.c: ditto.
-
- * ext/socket/sockport.h (SS_LEN): defined.
- (SET_SS_LEN): ditto.
-
-Fri Feb 27 22:30:18 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/ancdata.c (bsock_recvmsg_internal): close FDs passed by
- SCM_RIGHTS unless :scm_rights=>true is given.
- (discard_cmsg): extracted from rsock_discard_cmsg_resource.
-
-Fri Feb 27 22:14:22 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/openssl/lib/openssl/buffering.rb: define Buffering module under
- OpenSSL. [ruby-dev:37906]
-
-Fri Feb 27 22:09:24 2009 Tanaka Akira <akr@fsij.org>
-
- * lib/test/unit/assertions.rb: don't define assert_not_* if already
- overridden.
-
-Fri Feb 27 22:02:34 2009 Tanaka Akira <akr@fsij.org>
-
- * util.c: fix SEGV by test_time.rb with
- gcc version 4.4.0 20090219 (Red Hat 4.4.0-0.21) on Fedora 11 Alpha.
-
-Fri Feb 27 18:30:51 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * compile.c (cdhash_type, iseq_set_sequence): should not call
- methods of the argument of case, to keep the semantics of
- case/when. [ruby-dev:38079]
-
-Fri Feb 27 18:01:20 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * gc.c (ruby_get_stack_grow_direction): no needs to use thread
- here, and not initialized yet. [ruby-core:22439]
-
-Fri Feb 27 17:45:25 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (file_load_ok): checks if regular file, except for the
- platform disallows to open directories, e.g. dosish.
- [ruby-dev:38097], [Bug #1221]
-
-Fri Feb 27 14:39:40 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * numeric.c (flo_eq, flo_gt, flo_ge, flo_lt, flo_le, flo_eql): revert
- isnan() checks for VC++6.
-
- * insns.def (opt_lt, opt_gt): ditto.
-
-Fri Feb 27 14:23:09 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/ostruct.rb (modifiable): check if really frozen.
- [ruby-core:22559]
-
-Thu Feb 26 23:14:46 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/lib/socket.rb (BasicSocket#connect_address): new method.
-
-Thu Feb 26 19:29:10 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * hash.c (hash_foreach_iter): fix for prototype.
-
-Thu Feb 26 18:36:09 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (INSNS, newline.c, miniprelude.c, prelude.c),
- (node_name.inc, known_errors.inc): unified from Makefile.in and
- win32/Makefile.sub.
-
-Thu Feb 26 13:30:34 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * util.c (valid_filename): use our own implementation of open(),
- close() and unlink().
-
-Thu Feb 26 13:23:20 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * iseq.c (cdhash_each): resurrects internal literals.
-
-Thu Feb 26 10:56:48 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * include/ruby/win32.h (rb_w32_wopen): prototype forgotten.
-
- * io.c (rb_sysopen_internal): shouldn't replace undefined chars in this
- case.
-
-Thu Feb 26 01:34:38 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/mkconstants.rb: more MSG_* constants.
-
-Thu Feb 26 00:21:21 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/option.c (sockopt_level): extracted from sockopt_level_m.
- (sockopt_optname): extracted from sockopt_optname_m.
- (sockopt_data): apply StringValue.
- (sockopt_s_linger): new method.
- (sockopt_linger): new method.
- (inspect_linger): show onoff value if it is neither 0 nor 1.
-
-Wed Feb 25 23:23:03 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/ancdata.c (ancillary_unix_rights): raise
- NotImplementedError if no fd passing feature.
- (ancillary_timestamp): raise NotImplementedError if no timestamp
- feature.
-
-Wed Feb 25 23:18:53 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/ancdata.c (ancillary_s_unix_rights): new method.
-
-Wed Feb 25 23:01:26 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/unixsocket.c (unix_recv_io): prevent FD leak when 2 fd is
- sent on LP64 platform.
-
- * ext/socket/rubysocket.h (rsock_discard_cmsg_resource): declared.
-
- * ext/socket/ancdata.c (rsock_discard_cmsg_resource): renamed from
- discard_cmsg_resource. export it.
-
-Wed Feb 25 17:31:32 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * io.c (sysopen_func, rb_sysopen_internal, rb_sysopen): open file
- by UTF-16'ed filename on Windows.
-
- * io.c (rb_file_open_generic, rb_io_s_sysopen, rb_io_reopen,
- argf_next_argv): follow above change.
-
- * io.c (rb_scan_open_args): no longer need to convert filepath here on
- Windows.
-
- * win32/wio32.c (rb_w32_wopen): new function to open file by UTF-16'ed
- filename.
-
- * win32/win32.c (rb_w32_open): call rb_w32_open().
-
-Wed Feb 25 15:05:35 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/Makefile.sub (config.status): use un.rb as cp instead of
- cmd.exe's copy command.
-
- * lib/mkmf.rb (create_makefile): no longer need to convert path
- separator when copying file.
-
-Wed Feb 25 12:27:59 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_str_force_encoding): should clear coderange at changing
- encoding. [ruby-core:22437]
-
-Wed Feb 25 12:06:09 2009 <nobu@ruby-lang.org>
-
- * io.c (rb_io_getline_1): enables limit even if rs is given.
- [ruby-core:22434]
-
-Wed Feb 25 02:28:51 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_str_chomp_bang): coderange may change.
- [ruby-core:22414]
-
-Wed Feb 25 02:17:30 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_str_delete_bang): should recalculate coderange.
- [ruby-talk:329267]
-
-Wed Feb 25 00:41:21 2009 Akinori MUSHA <knu@iDaemons.org>
-
- * class.c (rb_scan_args): Allow specifying the number of trailing
- mandatory arguments right after the number of optional arguments
- only if the number of leading mandatory arguments is not omitted.
-
- * ext/socket/tcpserver.c (tcp_svr_init): Make use of it.
-
-Wed Feb 25 00:28:25 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * file.c (rb_file_size): new method added. [ruby-core:22088]
-
-Wed Feb 25 00:15:15 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/curses/curses.c (curses_colors): new method added. a patch
- from Alexander Beisig in [ruby-core:22331].
-
- * ext/curses/curses.c (curses_color_pairs): ditto.
-
-Wed Feb 25 00:05:13 2009 Akinori MUSHA <knu@iDaemons.org>
-
- * class.c (rb_scan_args): Revamp rb_scan_args() to compute the
- number of required and optional arguments precisely to prepare
- for a more informative error message.
-
-Tue Feb 24 23:58:52 2009 Akinori MUSHA <knu@iDaemons.org>
-
- * array.c (rb_ary_index, rb_ary_rindex): Emit a warning that a
- given block is unused when an argument is specified.
-
-Tue Feb 24 22:00:37 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/socket.c (sockaddr_obj): convert fe80:1::1 to fe80::1%1.
-
-Tue Feb 24 19:56:11 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/ancdata.c (ancillary_timestamp): support SCM_BINTIME.
-
-Tue Feb 24 19:45:15 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/ancdata.c (ancillary_timestamp): new method.
-
-Tue Feb 24 19:01:05 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (main): split from exts and makes main program after
- building exts with miniruby, to get rid of overwriting running
- program. [ruby-core:22339]
-
- * Makefile.in, win32/Makefile.sub (RUNCMD, MKMAIN_CMD): macros to
- run script file.
-
- * ext/extmk.rb (parse_args): added --command-output option which
- creates script file to make main program.
-
-Tue Feb 24 17:58:07 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (ripper.c): exec can't work on Windows.
-
- * ext/ripper/depend (.SUFFIXES): nmake doesn't have .y by default.
-
- * Makefile.in (id.h): overwrites unconditionally.
-
-Tue Feb 24 13:13:49 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * missing/vsnprintf.c (BSD_vfprintf): ptrdiff_t may be larger than
- long.
-
-Tue Feb 24 11:21:50 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * signal.c (rb_disable_interrupt, rb_enable_interrupt): see
- USE_TRAP_MASK.
-
-Tue Feb 24 10:49:37 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * process.c (rb_waitpid): last argument was missing.
-
- * process.c (waitall_each): fixed typo. a patch from shinichiro.h
- <shinichiro.hamaji AT gmail.com> at [ruby-dev:38054].
-
-Tue Feb 24 01:53:40 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * numeric.c (flo_eq): remove unnecessary NaN check using isnan().
- comparison regarding NaN is false anyway.
-
- * numeric.c (flo_gt, flo_ge, flo_lt, flo_le, flo_eql): ditto.
-
-Tue Feb 24 01:22:19 2009 Yusuke Endoh <mame@tsg.ne.jp>
-
- * bootstraptest/test_thread.rb: fix for environment where fork is not
- available.
-
-Tue Feb 24 01:19:38 2009 Yusuke Endoh <mame@tsg.ne.jp>
-
- * thread.c (thread_cleanup_func): unlock all locked mutexes even when
- forking. [ruby-core:22269]
-
-Tue Feb 24 00:54:16 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * insns.def (opt_minus): inline float operation.
-
- * insns.def (opt_lt, opt_gt): ditto.
-
-Tue Feb 24 00:24:13 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * range.c (range_each): check #succ only when it is really
- needed. small performance improvement.
-
- * math.c (Need_Float): call rb_to_float() only when it is really
- needed. small performance improvement.
-
-Tue Feb 24 00:19:33 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/pathname.rb (Pathname#foreachline): removed wrongly
- resurrected method. [ruby-dev:38065]
-
-Mon Feb 23 20:39:21 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/ancdata.c (inspect_timespec_as_abstime): new function to
- show struct timespec.
- (ancillary_inspect): use it for SCM_TIMESTAMPNS on GNU/Linux.
-
-Mon Feb 23 20:30:06 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/ancdata.c (inspect_bintime_as_abstime): new function to
- show struct bintime.
- (ancillary_inspect): use it for SCM_BINTIME on FreeBSD.
-
- * ext/socket/mkconstants.rb: define SCM_BINTIME.
-
-Mon Feb 23 20:18:49 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/ancdata.c (inspect_timeval_as_abstime): use time_t
- variable to avoid a warning on environments which use long as
- tv_sec as NetBSD.
-
-Mon Feb 23 15:53:30 2009 Akinori MUSHA <knu@iDaemons.org>
-
- * array.c (rb_ary_index, rb_ary_rindex): We know that argc is not
- zero when we reach here.
-
- * array.c (rb_ary_initialize, rb_ary_index): Shrink a double
- space. (NFC)
-
-Mon Feb 23 14:47:04 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/fileutils.rb (mv): added description for the case of
- different partitions. [ruby-talk:329072]
-
-Mon Feb 23 10:19:41 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/ruby.h (USE_SYMBOL_AS_METHOD_NAME): Module#methods,
- #singleton_methods and so on return Symbols. [ruby-talk:328775]
-
-Mon Feb 23 10:15:35 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * README.EXT, README.EXT.ja: added macros for the Compatibilities.
-
-Mon Feb 23 03:19:37 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/mkconstants.rb: define SO_TIMESTAMPNS and SCM_TIMESTAMPNS
- if available.
-
-Mon Feb 23 02:54:31 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/ancdata.c (ancillary_inspect): use SCM_TIMESTAMP instead
- of SO_TIMESTAMP. SCM_TIMESTAMP != SO_TIMESTAMP on MacOS X.
-
-Mon Feb 23 02:44:42 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/ancdata.c (inspect_timeval_as_abstime): new function.
- (ancillary_inspect): use it for SO_TIMESTAMP.
-
-Mon Feb 23 02:26:44 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/option.c (inspect_timeval_as_interval): renamed from
- inspect_timeval.
-
-Mon Feb 23 02:10:09 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/option.c (inspect_timeval): fix the size test.
-
-Sun Feb 22 22:42:20 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (tr_trans): should recalculate coderange.
- [ruby-core:22326] (reopened at [ruby-core:22328])
-
-Sun Feb 22 20:09:29 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/option.c (inspect_linger): message refined.
-
-Sun Feb 22 19:28:08 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/init.c (s_recvfrom): use rb_io_wait_readable after
- recvfrom.
-
-Sun Feb 22 18:40:04 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/option.c (inspect_errno): new function.
- (sockopt_inspect): use inspect_errno for SO_ERROR.
-
-Sun Feb 22 15:11:51 2009 Tanaka Akira <akr@fsij.org>
-
- * re.c (Init_Regexp): define Regexp::FIXEDENCODING. [ruby-dev:38066]
-
-Sun Feb 22 14:33:06 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (tr_trans): should not be affected by the encoding of
- replacement unless actually modified. [ruby-talk:328967]
- [ruby-core:22326]
-
-Sun Feb 22 13:38:44 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/socket/init.c (s_recvfrom_nonblock): handles EAGAIN too.
-
- * ext/socket/init.c (s_accept_nonblock): ditto, and EPROTO depends
- on platforms.
-
-Sun Feb 22 13:03:12 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * eval.c (ruby_options): the evaluator now expects iseq instead of tree.
-
- * ruby.c (ruby_process_options): ditto.
-
-Sun Feb 22 13:03:14 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * Makefile.in (configure): unset PWD to use symlink to building
- directory.
-
- * Makefile.in (up): cd doesn't need LC_TIME, VCS needs.
-
-Sun Feb 22 10:43:57 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm_eval.c (method_missing): should not pop cfp if missing method
- is method_missing. [ruby-core:22298]
-
- * vm_eval.c (rb_raise_method_missing): new function to directly
- raise NoMethodError.
-
- * vm_insnhelper.c (vm_call_method): fixed the case method_missing
- is missing.
-
-Sun Feb 22 02:15:40 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/ancdata.c (bsock_recvmsg_internal): handle EMSGSIZE as
- well.
-
-Sun Feb 22 02:03:46 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/ancdata.c (bsock_recvmsg_internal): check max length
- overflow.
-
-Sun Feb 22 01:52:30 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/ancdata.c (bsock_recvmsg_internal): don't call
- discard_cmsg_resource when EMFILE.
-
-Sun Feb 22 01:48:51 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/ancdata.c (bsock_recvmsg_internal): gc when SCM_RIGHTS
- hit the file descriptor limit.
-
-Sun Feb 22 00:51:58 2009 Tanaka Akira <akr@fsij.org>
-
- * io.c (io_getpartial): error message describes what should be
- waited after nonblocking error.
- (rb_io_write_nonblock): ditto.
-
- * ext/socket/init.c (s_recvfrom_nonblock): ditto.
- (s_accept_nonblock): ditto.
-
- * ext/socket/socket.c (sock_connect_nonblock): ditto.
-
- * ext/socket/ancdata.c (bsock_sendmsg_internal): ditto.
- (bsock_recvmsg_internal): ditto.
-
-Sun Feb 22 00:31:42 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/ancdata.c (bsock_recvmsg_internal): check recvmsg error
- earlier.
-
-Fri Feb 20 23:28:11 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * util.c (rv_alloc, freedtoa): use our normal xmalloc()/xfree() because
- couldn't free the returned pointer from ruby_dtoa().
-
- * missing/vsnprintf.c (cvt): receive buffer and use/return it instead
- of returning the pointer returned from BSD__dtoa().
-
- * missing/vsnprintf.c (BSD_vfprintf): pass buf to cvt() as the buffer.
- [ruby-core:22184]
-
-Thu Feb 19 22:59:09 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/ancdata.c (make_io_for_unix_rights): cmsg_len may be
- bigger than msg_controllen on 4.4BSD at least.
- freeze unix_rights array.
-
-Thu Feb 19 22:17:38 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/ancdata.c (bsock_recvmsg_internal): fix exception.
-
-Thu Feb 19 21:13:03 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/ancdata.c (ancillary_unix_rights): method renamed.
-
-Thu Feb 19 15:47:11 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * template/fake.rb.in: extracted from Makefile.in.
-
- * configure.in (fake.rb): prefixed with $(arch)-.
-
-Thu Feb 19 15:39:50 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/openssl/ossl_ocsp.c (ossl_ocspbres_verify): OCSP_basic_verify
- returns positive value on success, not non-zero. [ruby-core:21762]
-
-Thu Feb 19 15:17:00 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/tmpdir.rb (@@systmpdir): File.expand_path also joins paths.
-
-Thu Feb 19 15:14:25 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/etc/etc.c (etc_each_group): defines only when Etc::Group is
- available.
-
-Thu Feb 19 15:11:40 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval_intern.h (translit_char): moved from ruby.c.
-
- * load.c (load_ext): transliterates file separators and back if
- needed.
-
- * symbian/setup (DLN_NEEDS_ALT_SEPARATOR): defined.
-
-Thu Feb 19 14:48:12 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in, */Makefile.sub (LOAD_RELATIVE): moved from ruby.c
-
-Thu Feb 19 14:39:53 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (darwin): uses -unexported_symbol option of ld instead
- of objcopy
-
- * configure.in (darwin): makes dylib instead of so.
-
-Thu Feb 19 14:22:02 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb (create_makefile): added phony targets.
-
- * lib/mkmf.rb (create_makefile): creates target directories before
- copying. [ruby-core:21958]
-
- * lib/mkmf.rb (create_makefile): removes directories in the depth
- order.
-
-Thu Feb 19 13:56:00 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (rb_home_dir): checks if HAVE_PWD_H. [ruby-dev:38049]
-
-Thu Feb 19 08:45:48 2009 TAKANO Mitsuhiro (takano32) <tak@no32.tk>
-
- * ext/socket/rubysocket.h: add "#include <sys/stat.h>"
-
-Thu Feb 19 03:42:48 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/ancdata.c (ancillary_rights): new method.
- (make_io_for_rights): new function to allocate
- IOs for FDs in SCM_RIGHTS message.
- (bsock_recvmsg_internal): use make_io_for_rights. So the FDs can be
- closed by GC.
-
-Thu Feb 19 03:28:59 2009 Akinori MUSHA <knu@iDaemons.org>
-
- * README.EXT, README.EXT.ja: Improve the document about
- rb_scan_args() even more.
-
-Thu Feb 19 03:12:51 2009 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_file_exhaustive.rb: skip some tests if euid == 0.
- a patch from Lucas Nussbaum in [ruby-core:22209].
-
-Thu Feb 19 03:00:49 2009 Akinori MUSHA <knu@iDaemons.org>
-
- * README.EXT, README.EXT.ja: Improve the document about
- rb_scan_args().
-
-Wed Feb 18 22:47:01 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/ancdata.c (discard_cmsg_resource): new function to close
- file descriptors in control message.
- (bsock_recvmsg_internal): call discard_cmsg_resource before retrying
- recvmsg.
-
-Wed Feb 18 21:47:37 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/ancdata.c (bsock_recvmsg_internal): prevent misalignment.
-
-Wed Feb 18 21:34:30 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/ancdata.c (bsock_sendmsg_internal): prevent misalignment.
-
-Wed Feb 18 21:09:43 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/ancdata.c (bsock_recvmsg_internal): reduce code on
- environments which have no control message.
-
-Wed Feb 18 20:27:16 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (OBJCOPY): set ac_cv_prog_ac_ct_OBJCOPY to do nothing
- on cygwin and mingw because symbols are exported by def file.
-
-Wed Feb 18 15:35:36 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (rb_file_chown): use chown unless HAVE_FCHOWN.
-
- * io.c (pipe_open): sarg is always used unless HAVE_FORK.
-
-Wed Feb 18 15:23:34 2009 Akinori MUSHA <knu@iDaemons.org>
-
- * bootstraptest/runner.rb: Use RUBY_DESCRIPTION if defined.
-
-Wed Feb 18 14:33:35 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * array.c (rb_ary_resurrect), string.c (rb_str_resurrect): new
- functions based on [ruby-dev:37983]
-
- * insns.def (putstring, duparray): use rb_{ary,str}_resurrect().
-
- * iseq.c (iseq_data_to_ary): needs to result TS_VALUE.
-
-Wed Feb 18 12:35:31 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (rb_file_s_extname): fix for spaces before extension.
- [ruby-dev:38044]
-
-Wed Feb 18 12:00:58 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (file_expand_path): suppress a warning. named magic
- numbers.
-
-Wed Feb 18 10:29:12 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread.c (thread_start_func_2): do not delete main thread from
- living_threads. [ruby-core:19385], [ruby-core:22158]
-
-Wed Feb 18 01:05:05 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/openssl: avoid cyclic require.
-
- * ext/openssl/lib/openssl/ssl-internal.rb: renamed from ssl.rb
-
- * ext/openssl/lib/openssl/x509-internal.rb: renamed from x509.rb.
-
- * lib/net/imap.rb: require openssl, instead of openssl/ssl.
-
- * lib/net/pop.rb: require openssl, instead of openssl/ssl.
-
- [ruby-dev:38018]
-
-Wed Feb 18 00:55:47 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/etc/etc.c (Etc::Passwd.each, Etc::Group.each): new methods.
- [ruby-dev:37999]
-
-Tue Feb 17 23:25:01 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/ancdata.c (bsock_sendmsg_internal): make the padding
- removing only on NetBSD.
-
-Tue Feb 17 19:39:04 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/ancdata.c (bsock_sendmsg_internal): should not remove the
- last padding of control messages, basically.
-
-Tue Feb 17 12:50:57 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_str_shared_replace): no need for
- str_make_independent.
-
-Tue Feb 17 05:41:08 2009 Koichi Sasada <ko1@atdot.net>
-
- * compile.c: fix to add "ensure" codes across "while" clause
- before "return" expression. [ruby-dev:37967]
-
- * bootstraptest/test_flow.rb: add a test.
-
-Tue Feb 17 01:53:35 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/mkconstants.rb: generate rb_define_const directly for
- rdoc.
-
- * ext/.document: add socket/constdefs.c.
-
- * ext/socket/constants.c (sock_define_const): removed.
- (sock_define_uconst): ditto.
- (rb_mSockConst): new static variable.
-
-Mon Feb 16 23:14:51 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/ancdata.c (bsock_sendmsg_internal) [OpenBSD]: don't remove
- the last padding to prevent sendmsg failure in test_udp_server in
- test/socket/test_socket.rb on OpenBSD 4.4.
-
-Mon Feb 16 21:59:32 2009 Alexander Zavorine <alexandre.zavorine@nokia.com>
-
- * symbian/setup: Update Symbian config to match recent changes in missing/alloca.c
-
-Mon Feb 16 17:04:14 2009 Akinori MUSHA <knu@iDaemons.org>
-
- * class.c (rb_scan_args), README.EXT, README.EXT.ja: Add support
- for specifying the number of the trailing mandatory arguments.
- Update the documents accordingly. [ruby-dev:37995]
-
-Mon Feb 16 16:46:14 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * debug.c (set_debug_option): added rtc_error option.
-
- * win32/Makefile.sub (CRTDEFFLAGS): separated from DEFS.
-
- * win32/win32.c (rtc_error_handler): ignores RTC errors unless
- rtc_error debug option is given.
-
- * win32/win32.c (rb_w32_sysinit): suppress useless CRT assertions.
- [ruby-core:22116]
-
-Sun Feb 15 21:43:44 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/ostruct.rb (OpenStruct#new_ostruct_member): checks if frozen.
- [ruby-talk:328195], [ruby-core:22142]
-
-Sun Feb 15 21:22:48 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/test/unit/assertions.rb (Test::Unit::Assertions): aliases
- assert_not_ methods.
-
-Sun Feb 15 16:57:35 2009 Tanaka Akira <akr@fsij.org>
-
- * lib/securerandom.rb (SecureRandom.urlsafe_base64): new method.
-
-Sun Feb 15 14:58:07 2009 Tanaka Akira <akr@fsij.org>
-
- * hash.c (hash_i): use Murmurhash.
-
-Sun Feb 15 11:45:29 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * variable.c (rb_define_hooked_variable): suppress false assertion
- with VC9. [ruby-core:22115]
-
-Sun Feb 15 08:35:33 2009 Tanaka Akira <akr@fsij.org>
-
- * test/test_pp.rb: extract from lib/pp.rb.
-
- * test/test_prettyprint.rb: extract from lib/prettyprint.rb.
-
- * test/test_tsort.rb: extract from lib/tsort.rb.
-
-Sun Feb 15 06:34:22 2009 Tanaka Akira <akr@fsij.org>
-
- * lib/time.rb (Time.parse): raise ArgumentError if Date._parse don't
- extract date information. [ruby-core:20912]
-
-Sun Feb 15 04:48:08 2009 Yusuke Endoh <mame@tsg.ne.jp>
-
- * string.c (rb_hash_uint32, rb_hash_uint, rb_hash_start, rb_hash_end),
- include/ruby/intern.h: add Murmurhash API. [ruby-dev:37784]
-
- * complex.c (nucomp_hash), array.c (rb_ary_hash), time.c (time_hash),
- string.c (rb_str_hash), object.c (rb_obj_hash), range.c
- (range_hash), struct.c (rb_struct_hash), hash.c (rb_any_hash),
- rational.c (nurat_hash): use Murmurhash. [ruby-dev:37784]
-
-Sun Feb 15 03:50:21 2009 Yusuke Endoh <mame@tsg.ne.jp>
-
- * hash.c (rb_hash): always return a fixnum value because a return
- value of rb_hash may be used as a hash value itself and bignums have
- no unique VALUE.
-
- * test/ruby/test_hash.rb: add a test for above.
-
-Sun Feb 15 00:45:41 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * array.c (rb_ary_uniq_bang, rb_ary_uniq): unique by the result of
- given block. [ruby-dev:37998]
-
-Sun Feb 15 00:39:44 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * array.c (ary_resize_capa): should not overwrite outside embedded
- array.
-
-Sat Feb 14 20:18:19 2009 Tanaka Akira <akr@fsij.org>
-
- * test/test_time.rb: extracted from lib/time.rb.
-
-Sat Feb 14 19:20:15 2009 Tanaka Akira <akr@fsij.org>
-
- * lib/pathname.rb: obsolete methods removed.
- [ruby-core:21564]
-
-Sat Feb 14 15:46:01 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/pathname.rb (Pathname#binread): added. [ruby-dev:37952]
-
-Sat Feb 14 13:14:18 2009 TAKANO Mitsuhiro (takano32) <tak@no32.tk>
-
- * iseq.c: remove nil parameter from Proc#parameters
- after rest appeared.
-
-Sat Feb 14 07:23:52 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (rb_external_str_new_with_enc): change evaluation order
- for speed.
-
-Sat Feb 14 02:20:04 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/sockport.h (SET_SA_LEN): cast to void for suppressing a
- warning.
-
-Fri Feb 13 23:37:10 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/dl/win32/lib/Win32API.rb (Win32API#initialize): DL.dlopen
- raises DLError.
-
-Fri Feb 13 21:13:19 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/socket.c (Init_socket): define TCPServer#listen and
- UNIXServer#listen here for rdoc.
-
-Fri Feb 13 20:59:48 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/ancdata.c (extract_ipv6_pktinfo): set sa_len for 4.4BSD.
-
-Fri Feb 13 15:34:18 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * iseq.c (simple_default_value): removed. default values of optional
- parameters are not available still now. [ruby-dev:37980]
-
-Fri Feb 13 15:11:11 2009 Koichi Sasada <ko1@atdot.net>
-
- * vm_eval.c (eval_string_with_cref): use rb_vm_get_ruby_level_next_cfp()
- instead of vm_get_ruby_level_caller_cfp(). checking a upper frame
- is not enough. [ruby-dev:37984]
-
- * proc.c, vm_core.h: declare rb_vm_get_ruby_level_next_cfp()
- on vm_core.h.
-
-Fri Feb 13 15:01:40 2009 Koichi Sasada <ko1@atdot.net>
-
- * cont.c (rb_fiber_alive_p): fix to return true instead of 0.
- [ruby-dev:37991]
-
- * test/ruby/test_fiber.rb: add a test for Fiber#alive?
-
-Fri Feb 13 09:43:19 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (ac_cv_func_flock): using flock defined in
- win32/win32.c on mingw.
-
-Fri Feb 13 01:45:17 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * compile.c (iseq_set_sequence, compile_dstr_fragments),
- (iseq_compile_each): hides other internal objects.
-
- * compile.c (iseq_compile_each): just freeze xstr.
-
-Fri Feb 13 00:48:42 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * insns.def (defineclass): try to autoload const to be overridden.
-
-Thu Feb 12 23:22:29 2009 Tanaka Akira <akr@fsij.org>
-
- * test/socket/test_socket.rb (test_udp_server): filter out unreachable
- addresses. [ruby-dev:37970]
-
-Thu Feb 12 22:51:18 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * compile.c (hide_obj): OBJ_FREEZE() is not an expression. a patch
- from nagachika <nagachika00 AT gmail.com> at [ruby-dev:37977].
-
- * compile.c (insn_set_sc_state): fixed typo.
-
-Thu Feb 12 12:36:35 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/basicsocket.c (bsock_getpeereid): implemented for Solaris
- using getpeerucred.
-
- * ext/socket/extconf.rb: check ucred.h and getpeerucred.
-
- * ext/socket/rubysocket.h: include ucred.h if available.
-
-Thu Feb 12 19:42:33 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * compile.c (compile_array_, defined_expr, iseq_compile_each): hide
- and freeze internal literal objects, to prevent from modifying.
- [ruby-dev:37959]
-
- * iseq.c (insn_operand_intern): copy internal literal objects.
-
- * insns.def (putstring, duparray): ditto.
-
- * string.c (rb_str_replace): exported.
-
-Thu Feb 12 17:17:51 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/stringio/stringio.c (strio_ungetc): calculates new position
- before reallocation. [Bug#1099]
-
-Thu Feb 12 16:50:27 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in: a patch to build on GNU/kOpenSolaris from Rober
- Millan at [ruby-core:21888].
-
-Thu Feb 12 15:28:04 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * iseq.c (simple_default_value): allow plain strings as default
- values.
-
-Wed Feb 11 18:09:41 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * gc.c (define_final, undefine_final): shouldn't add/remove finalizer
- of frozen objects.
-
- * gc.c (undefine_final): should remove FL_FINALIZE flag.
- [ruby-dev:37964] (also see [ruby-dev:37959])
-
-Wed Feb 11 17:37:41 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/lib/socket.rb (Socket.udp_server_sockets): call the block
- if given. close the sockets when the block exits.
- (Socket.udp_server_loop): use udp_server_sockets in block form.
-
-Wed Feb 11 17:34:16 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/lib/socket.rb (Socket.tcp_server_sockets): call the block
- if given. close the sockets when the block exits.
- (Socket.tcp_server_loop): use tcp_server_sockets in block form.
-
-Wed Feb 11 17:01:52 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/lib/socket.rb (Socket.unix_server_loop): use
- unix_server_socket with a block.
-
-Wed Feb 11 16:54:26 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/lib/socket.rb (Socket.unix_server_socket): close the
- socket when the block exits.
-
-Wed Feb 11 16:50:59 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/lib/socket.rb (Socket.unix_server_socket): call the block
- if given. remove the socket file when the block exits.
-
-Wed Feb 11 16:44:20 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/ancdata.c (ancillary_s_ip_pktinfo): make 3rd argument
- optional.
-
-Wed Feb 11 15:47:10 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * array.c (ary_make_shared): returns shared root array itself, and
- frozen array can be shared.
-
-Wed Feb 11 14:46:16 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * insns.def (setspecial, putstring): fixed typos in rdoc.
-
- * insns.def (toregexp): uses rb_ary_tmp_new(), and clears it after
- used.
-
-Wed Feb 11 14:08:23 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/ancdata.c (anc_inspect_socket_rights): return 1 on
- success. 0 on failure.
- (anc_inspect_passcred_credentials): ditto.
- (anc_inspect_socket_creds): ditto.
- (anc_inspect_socket_creds): ditto.
- (anc_inspect_socket_creds): ditto.
- (anc_inspect_ip_recvdstaddr): ditto.
- (anc_inspect_ip_pktinfo): ditto.
- (anc_inspect_ipv6_pktinfo): ditto.
- (ancillary_inspect): check family.
-
-Wed Feb 11 12:55:07 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/ancdata.c (anc_inspect_ip_pktinfo): make result bit
- succinct.
- (Init_ancdata): fix number of arguments.
-
-Wed Feb 11 11:47:41 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/ipsocket.c (Init_ipsocket): undef getpeereid at IPSocket.
-
-Wed Feb 11 10:16:34 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/extconf.rb: check getpeereid.
-
- * ext/socket/basicsocket.c (bsock_getpeereid): new method.
-
-Wed Feb 11 09:58:59 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/lib/socket.rb (Socket::UDPSource#inspect): fix variable
- name.
-
-Wed Feb 11 00:38:16 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/socket.c (sock_gethostname): use HOST_NAME_MAX.
-
- * ext/socket/raddrinfo.c (make_ipaddr): local variable renamed.
-
-Tue Feb 10 23:44:53 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/init.c (struct recvfrom_arg): use struct
- sockaddr_storage.
- (recvfrom_blocking): follow struct recvfrom_arg change.
- (s_recvfrom): ditto.
- (s_recvfrom_nonblock): use struct sockaddr_storage.
-
- * ext/socket/socket.c (sock_accept): use struct sockaddr_storage.
- (sock_accept_nonblock): ditto.
- (sock_sysaccept): ditto.
-
- * ext/socket/ancdata.c (bsock_recvmsg_internal): use struct
- sockaddr_storage.
-
-Tue Feb 10 23:30:32 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/basicsocket.c (bsock_getpeername): use struct
- sockaddr_storage.
- (bsock_local_address): ditto.
- (bsock_remote_address): ditto.
-
-Tue Feb 10 21:26:33 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/lib/socket.rb (Socket.udp_server_sockets): new method.
- (Socket.udp_server_loop_on): new method.
- (Socket.udp_server_loop): new method
- (Socket.ip_sockets_port0): extracted from tcp_server_sockets_port0.
- (Socket::UDPSource): new class.
-
-Tue Feb 10 21:14:43 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/socket.c (sockaddr_obj): fill pfamily.
-
-Tue Feb 10 21:09:23 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/option.c (sockopt_s_bool): new method.
- (sockopt_bool): new method.
-
-Tue Feb 10 20:58:47 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/option.c (sockopt_family_m): renamed from sockopt_family.
- (sockopt_level_m): renamed from sockopt_level.
- (sockopt_optname_m): renamed from sockopt_optname.
- (inspect_local_peercred): follow the renaming.
- (Init_sockopt): ditto.
-
-Tue Feb 10 20:56:07 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/ancdata.c (anc_inspect_socket_creds): refactored to avoid
- a rb_str_cat2 call.
-
-Tue Feb 10 04:34:38 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (when): makes parentheses balanced.
-
-Tue Feb 10 01:28:49 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/ancdata.c (ip_cmsg_type_to_sym): renamed from
- cmsg_type_to_sym.
-
-Tue Feb 10 01:22:56 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/option.c (sockopt_inspect): refactored.
-
-Tue Feb 10 01:02:16 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/mkconstants.rb: generate intern_family_noprefix.
-
- * ext/socket/option.c (sockopt_inspect): use intern_family_noprefix
- not to show AF_ prefix.
-
- * ext/socket/ancdata.c (ancillary_inspect): ditto.
-
-Mon Feb 9 23:21:29 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/constants.c (level_arg): use unknown_level_to_int for
- non internet protocol.
- (optname_arg): use only so_optname_to_int for non internet protocol.
- (cmsg_type_arg): use only scm_optname_to_int for non internet
- protocol.
-
- * ext/socket/mkconstants.rb: generate unknown_level_to_int.
- rename iplevel_to_int to ip_level_to_int.
-
-Mon Feb 9 23:04:27 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/mkconstants.rb: rename level_to_int to iplevel_to_int.
- rename intern_level to intern_iplevel.
-
- * ext/socket/constants.c: follow the renaming.
-
- * ext/socket/option.c: ditto.
-
- * ext/socket/ancdata.c: ditto.
-
-Mon Feb 9 22:52:13 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/rubysocket.h (level_arg): add family argument.
- (optname_arg): ditto.
- (cmsg_type_arg): ditto.
- (rb_sock_getfamily): declared.
-
- * ext/socket/constants.c (level_arg): add family argument.
- (optname_arg): ditto.
- (cmsg_type_arg): ditto.
-
- * ext/socket/init.c (rb_sock_getfamily): defined.
-
- * ext/socket/option.c (sockopt_initialize): give family for level_arg
- and optname_arg.
- (sockopt_s_int): ditto.
-
- * ext/socket/basicsocket.c (bsock_setsockopt): ditto.
- (bsock_getsockopt): ditto.
-
- * ext/socket/ancdata.c (ancillary_initialize): ditto.
- (ancillary_s_int): ditto.
- (ancillary_cmsg_is_p): ditto.
- (bsock_sendmsg_internal): ditto.
- (bsock_recvmsg_internal): use rb_sock_getfamily.
-
-Mon Feb 9 21:48:59 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/ancdata.c (ancillary_inspect): show address family.
-
-Mon Feb 9 20:19:36 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/basicsocket.c (bsock_getsockname): use sockaddr_storage.
-
-Mon Feb 9 20:11:55 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/win32ole/win32ole.c (load_conv_function51932): fixed for the
- case IMultiLanguage is not available. [ruby-dev:37950]
-
-Mon Feb 9 20:04:35 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/option.c (inspect_int): return 1/0 on success/failure.
- (inspect_uint): ditto.
- (inspect_linger): ditto.
- (inspect_socktype): ditto.
- (inspect_timeval): ditto.
- (inspect_peercred): ditto.
- (inspect_local_peercred): ditto.
- (sockopt_inspect): refactored.
-
-Mon Feb 9 20:00:26 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/mkconstants.rb: more constants for Solaris.
-
-Mon Feb 9 19:59:18 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/basicsocket.c (bsock_getsockopt): refine address family
- examination.
-
-Mon Feb 9 19:52:32 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/option.c (sockopt_initialize): argument conversion
- reordered.
-
-Mon Feb 9 19:46:22 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/ancdata.c (ancillary_initialize): add family argument.
- (ancdata_new): ditto.
- (ancillary_s_int): ditto.
- (ancillary_family): new function.
- (ancillary_family_m): new method.
- (ancillary_s_ip_pktinfo): follow ancdata_new change.
- (ancillary_s_ipv6_pktinfo): ditto.
- (bsock_recvmsg_internal): examine the socket address family.
-
-Mon Feb 9 11:31:09 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * io.c (io_encoding_set): ignore second argument when external and
- internal are same. [ruby-dev:37939]
-
-Mon Feb 9 09:05:12 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/option.c (inspect_local_peercred): check version.
- (sockopt_inspect): suppress warning.
-
-Mon Feb 9 02:04:03 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/option.c (inspect_peercred): struct ucred contains
- effective uid/gid.
-
-Mon Feb 9 00:44:45 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/option.c (sockopt_inspect): add ifdef guard for
- LOCAL_PEERCRED.
-
-Mon Feb 9 00:37:06 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/option.c (inspect_local_peercred): cr_uid is a effective
- uid, not a real uid.
-
-Mon Feb 9 00:30:56 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/extconf.rb: check sys/param.h and sys/ucred.h.
-
- * ext/socket/rubysocket.h: include sys/param.h and sys/ucred.h.
-
- * ext/socket/option.c (inspect_local_peercred): new function to show
- LOCAL_PEERCRED socket option on FreeBSD.
- (sockopt_inspect): show as LOCAL_* socket option if AF_UNIX and level
- is 0.
-
-Mon Feb 9 00:01:47 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/rubysocket.h (sockopt_new): add family argument.
-
- * ext/socket/option.c (sockopt_initialize): add vfamily argument.
- (sockopt_new): add family argument and record it in the object.
- (sockopt_family): new method.
- (sockopt_s_int): add vfamily argument.
- (sockopt_inspect): show family.
-
- * ext/socket/basicsocket.c (bsock_getsockopt): check address family
- using getsockname.
-
-Sun Feb 8 23:37:17 2009 Yusuke Endoh <mame@tsg.ne.jp>
-
- * enumerator.c (enumerator_with_index): receives one argument which
- represents a start offset. [ruby-dev:37921]
-
-Sun Feb 8 23:28:05 2009 Yusuke Endoh <mame@tsg.ne.jp>
-
- * include/ruby/st.h, st.c: order entries by a linked list instead of
- a loop to fix iteration miss when hash is modified during iteration.
- [ruby-dev:37910]
-
-Sun Feb 8 23:22:35 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/option.c (inspect_peercred): new function to show
- SO_PEERCRED socket option on GNU/Linux.
-
-Sun Feb 8 22:44:20 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/backward/rubysig.h (rb_thread_blocking_region_begin),
- (rb_thread_blocking_region_end): marked as deprecated.
-
- * include/ruby/backward/rubysig.h (TRAP_BEG): fix for C++. a
- patch from Aman Gupta at [ruby-core:21934]
-
-Sun Feb 8 21:47:50 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/extconf.rb: check struct cmsgcred.
-
- * ext/socket/ancdata.c (anc_inspect_passcred_credentials): add
- "(ucred)".
- (anc_inspect_socket_creds): show struct cmsgcred too, for FreeBSD.
-
-Sun Feb 8 21:05:35 2009 Tanaka Akira <akr@fsij.org>
-
- * lib/drb/extservm.rb (DRb::ExtServManager#invoke_service_command):
- detach spawned process. [ruby-dev:37936]
-
-Sun Feb 8 20:30:29 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/extconf.rb: check struct sockcred.
-
- * ext/socket/ancdata.c (anc_inspect_socket_creds): new function to
- show SCM_CREDS on NetBSD.
-
-Sun Feb 8 19:05:24 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/backward/rubysig.h: extern "C" was missing.
- [ruby-core:21929]
-
-Sun Feb 8 18:46:15 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/ancdata.c (anc_inspect_passcred_credentials): new
- function to show SCM_CREDENTIALS on GNU/Linux.
-
-Sun Feb 8 18:34:43 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (rb_io_s_binread): ensures file path. [ruby-dev:37940]
-
-Sun Feb 8 13:52:02 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/raddrinfo.c (init_unix_addrinfo): add socktype argument.
- (addrinfo_initialize): follow init_unix_addrinfo change.
- (addrinfo_s_unix): add optional argument: socktype
-
-Sun Feb 8 13:09:32 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (RUBY_APPEND_OPTION, RUBY_APPEND_OPTIONS),
- (RUBY_PREPEND_OPTION, RUBY_PREPEND_OPTIONS): add option(s)
- without duplication.
-
- * configure.in (RUBY_DEFINE_IF): changed parameter order, now
- condition comes first.
-
- * configure.in (universal_binary): checks architecture macros, and
- improved thin load paths.
-
-Sun Feb 8 09:41:47 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * runruby.rb: gets extout and arch from rbconfig.rb.
-
-Sat Feb 7 21:26:15 2009 Tanaka Akira <akr@fsij.org>
-
- * test/socket/test_addrinfo.rb (test_family_addrinfo): don't use
- www.ruby-lang.org.
- http://d.hatena.ne.jp/nagachika/20090204/working_for_0f0e
-
-Sat Feb 7 18:02:48 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (--with-arch): added new option to support
- universal binary. replaced --enable-fat-binary option which
- didn't work actually.
-
- * configure.in (RUBY_FUNC_ATTRIBUTE): added conditional test.
-
- * configure.in (ac_cv_type_getgroups): declared because getgroups()
- fills rest of the buffer with garbage on Rosetta.
-
- * configure.in (alloca): defines only for powerpc, but always
- create empty object to suppress ld warning.
-
- * configure.in (LIBRUBY_DLDFLAGS): set compatibility version with
- TEENY.
-
- * configure.in (CFLAGS, LDFLAGS): separates ARCH_FLAG.
-
- * configure.in (arch): renamed to "universal" from "fat".
-
- * Makefile.in (ARCH_FLAG): added.
-
- * include/ruby/defines.h (WORDS_BIGENDIAN): uses
- AC_APPLE_UNIVERSAL_BUILD.
-
- * missing/alloca.c (alloca): defines only if C_ALLOCA is defined.
-
-Sat Feb 7 12:31:03 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * runruby.rb: added --precommand and --show options.
-
- * runruby.rb: added --cpu option.
-
- * runruby.rb: skips version check in rbconfig.rb.
-
-Sat Feb 7 11:44:06 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb (have_header): needs dependent headers if trying to
- compile.
-
- * ext/socket/extconf.rb: net/if.h depends on other headers.
-
-Sat Feb 7 04:02:37 2009 Tanaka Akira <akr@fsij.org>
-
- * dir.c (dir_read): don't disable rdoc.
-
-Fri Feb 6 23:28:33 2009 Tanaka Akira <akr@fsij.org>
-
- * io.c (io_fread): use rb_io_wait_readable for retry
- avoid Errno::EINTR on ruby -e 'trap(:CHLD) {}; spawn("sleep 1"); STDIN.read'
-
-Fri Feb 6 22:36:11 2009 Alexander Zavorine <alexandre.zavorine@nokia.com>
-
- * thread_pthread.c (native_thread_create) [__SYMBIAN32__]: reduced pthread stack size.
-
- * thread_pthread.c (thread_timer) [__SYMBIAN32__]: compiled out unsupported yet signal-related functionality.
-
- * io.c (pipe_open) [__SYMBIAN32__]: fixed compile time error.
-
-Fri Feb 6 22:11:46 2009 Alexander Zavorine <alexandre.zavorine@nokia.com>
-
- * include/ruby/defines.h [__SYMBIAN32__]: included <sys/select.h> for fd_set definition
-
-Fri Feb 6 21:58:24 2009 Alexander Zavorine <alexandre.zavorine@nokia.com>
-
- * symbian/missing-pips.c: added a stub for missing PIPS function execl.
-
- * process.c (rb_proc_exec) [__SYMBIAN32__]: removed conditional around execl function call.
-
-Fri Feb 6 20:37:42 2009 Tanaka Akira <akr@fsij.org>
-
- * signal.c (register_sigaltstack): ignore sigaltstack error.
- It fails on OpenBSD 4.4 when pthread library is linked.
-
-Fri Feb 6 18:18:07 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (rb_w32_readdir_with_enc): fallback to OS's conversion
- when ASCII-8BIT is passed.
-
-Fri Feb 6 17:19:23 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/{dir.h, win32.c} (rb_w32_readdir_with_enc): new function to
- read entry with specified enc.
-
- * win32/win32.c (readdir_internal): extract from rb_w32_opendir().
-
- * win32/win32.c (opendir_internal): extract from rb_w32_readdir().
-
- * dir.c (dir_read, dir_each): use new READDIR macro instead of readdir()
- to pass enc for special version of readdir, such as above.
-
-Fri Feb 6 12:11:24 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ruby.c (process_options): set initial default_external before -r.
-
-Fri Feb 6 12:03:47 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ruby.c (process_options): -K and -E in shebang should be reflect to
- default_external. [ruby-dev:37920]
-
-Fri Feb 6 07:52:57 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/pty/pty.c (chfunc): type fixed.
-
-Fri Feb 6 02:51:59 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_each_codepoint): update RDoc for
- String#codepoints. a patch from Radoslaw Bulat in
- [ruby-core:21835]
-
-Fri Feb 6 01:09:13 2009 Yusuke Endoh <mame@tsg.ne.jp>
-
- * cont.c (cont_mark, cont_capture, cont_restore_1): use #else instead
- of #elif. a patch from NISHIMATSU Takeshi <t_nissie at yahoo.co.jp>
- in [ruby-list:45856].
-
-Thu Feb 5 20:28:27 2009 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/intern.h (rb_run_exec_options_err): renamed from
- rb_run_exec_options.
- (rb_exec_err): renamed from rb_exec.
- (rb_fork_err): renamed from rb_fork.
- (rb_spawn_err): renamed from rb_spawn.
- (rb_run_exec_options): declared with 1.9.1 compatible signature.
- (rb_exec): ditto.
- (rb_fork): ditto.
- (rb_spawn): ditto.
-
- * process.c (rb_run_exec_options_err): renamed from
- rb_run_exec_options.
- (rb_exec_err): renamed from rb_exec.
- (rb_fork_err): renamed from rb_fork.
- (rb_spawn_err): renamed from rb_spawn.
- (rb_run_exec_options): defined.
- (rb_exec): ditto.
- (rb_fork): ditto.
- (rb_spawn): ditto.
-
- * io.c: follow above change.
-
- * ext/pty/pty.c: follow above change.
-
- [ruby-dev:37893]
-
-Thu Feb 5 19:58:40 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket: AddrInfo is renamed to Addrinfo. [ruby-dev:37876]
-
-Thu Feb 5 16:18:13 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (RUBY_SITE_LIB_PATH, RUBY_VENDOR_LIB_PATH): fix for
- NetBSD.
-
-Thu Feb 5 16:04:29 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/Makefile.sub (config.h): follow recent changes about paths.
-
-Thu Feb 5 14:26:16 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (MAJOR, MINOR, TEENY): uses RUBY_VERSION_*.
-
- * mkconfig.rb (prefix): uses ruby_version in config.status.
-
-Thu Feb 5 12:24:18 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * array.c (rb_ary_uniq): gets rid of copying.
-
-Thu Feb 5 12:01:53 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * array.c (ary_add_hash): split from ary_make_hash().
-
- * array.c (ary_make_hash): hide a Hash used internally.
-
- * array.c (ary_recycle_hash): clears internally used hash. this
- name came from [ruby-dev:37908].
-
- * array.c (rb_ary_diff, rb_ary_and, rb_ary_or, rb_ary_uniq_bang):
- recycle hashes.
-
-Thu Feb 5 11:21:35 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (RUBY_LIB_VERSION): added for library version, to
- split from core version. [ruby-dev:37748]
-
- * configure.in (RUBY_LIB_PATH, etc): moved actual version
- dependent stuff to version.c.
-
- * ruby.c (ruby_init_loadpath_safe): ditto.
-
- * version.c (ruby_initial_load_paths): moved initial load path
- version depending on version from ruby.c.
-
- * version.h (RUBY_VERSION_{MAJOR,MINOR,TEENY}): now mean library
- and API version, and reverted to 1.9.1. [ruby-dev:37889]
-
-Thu Feb 5 07:39:33 2009 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * ext/readline/readline.c (Init_readline): remove_history(0) may be
- NULL. [ruby-dev:37891]
-
-Thu Feb 5 03:55:22 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * time.c (LOCALTIME): should call tzset() before localtime_r().
- [ruby-dev:37896]
-
-Thu Feb 5 02:12:35 2009 Alexander Zavorine <alexandre.zavorine@nokia.com>
-
- * symbian/configure.bat: Updated Symbian configuration procedure to
- avoid creating files outside build directory
-
- * symbian/pre-build: ditto
-
- * symbian/setup: ditto
-
- * symbian/rubyu.def: removed
-
-Thu Feb 5 01:44:02 2009 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (make_econv_exception): refine error message for
- undefined conversion. [ruby-core:21828]
-
-Thu Feb 5 01:18:25 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/socket.c (sock_s_socketpair): make 3rd argument optional.
-
- * ext/socket/unixsocket.c (unix_s_socketpair): follow the above
- change.
-
- * ext/socket/rubysocket.h (sock_s_socketpair): ditto.
-
-Thu Feb 5 00:09:39 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/raddrinfo.c (addrinfo_ipv6_to_ipv4): new method.
-
-Wed Feb 4 21:59:31 2009 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (make_econv_exception): show U+XXXX form for undefined
- conversion error from UTF-8.
-
-Wed Feb 4 21:57:37 2009 Tanaka Akira <akr@fsij.org>
-
- * string.c (rb_str_dump): use MBCLEN_CHARFOUND_P properly.
-
-Wed Feb 4 21:55:38 2009 Tanaka Akira <akr@fsij.org>
-
- * bootstraptest/runner.rb: refine success message.
-
-Wed Feb 4 19:10:42 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * Makefile.in (id.h): updates from parse.h.
-
-Wed Feb 4 11:45:06 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/mkexports.rb: shouldn't export DllMain.
- reported at http://pc11.2ch.net/test/read.cgi/tech/1233686068/21
-
-Wed Feb 4 10:12:05 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * missing/vsnprintf.c (BSD_vfprintf): should support 't' format
- modifier to handle PRIdPTRDIFF. thanks for the info from
- Kazuhiro NISHIYAMA. [ruby-core:21807]
-
-Wed Feb 4 01:28:46 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/extconf.rb: fix struct in_pktinfo and struct in6_pktinfo
- detection.
-
-Wed Feb 4 00:32:59 2009 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/etc/test_etc.rb(test_getpwnam, test_getgrgid, test_getgrnam):
- support an environment that has duplicative entries. a patch from
- Tomoyuki Chikanaga <chikanag at nippon-control-system.co.jp> in
- [ruby-dev:37882].
-
-Wed Feb 4 00:17:52 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/lib/socket.rb (Socket.tcp_server_sockets_port0): skip
- socket creation error.
-
-Tue Feb 3 23:37:08 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (load_file_internal): resets EOF flag after parse.
-
-Tue Feb 3 23:13:34 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm.c (vm_backtrace): always returns non-nil array if lev is
- negative. [ruby-core:21795]
-
-Tue Feb 3 21:19:06 2009 TAKAO Kouji <kouji@takao7.net>
-
- * ext/readline/extconf.rb: checked rl_set_screen_size and
- rl_get_screen_size.
-
- * ext/readline/readline.c (readline_s_set_screen_size): added
- Readline.set_screen_size.
-
- * ext/readline/readline.c (readline_s_get_screen_size): added
- Readline.get_screen_size.
-
-Tue Feb 3 21:07:19 2009 TAKAO Kouji <kouji@takao7.net>
-
- * ext/readline/readline.c (readline_s_set_completion_proc): set
- default if proc is nil. fix #1095
-
-Tue Feb 3 16:36:06 2009 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * array.c (rb_ary_sort_by_bang): RDoc update.
-
- * NEWS: add Array#sort_by!.
-
-Tue Feb 3 16:23:16 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/lib/socket.rb (Socket.tcp_server_sockets_port0): new
- private function for allocating same port both IPv4 and IPv6.
- (Socket.tcp_server_sockets): use tcp_server_sockets_port0 for port 0.
-
-Tue Feb 3 14:12:10 2009 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/net/imap.rb: validate data before sending to a server.
- [ruby-core:20320]
-
-Tue Feb 3 12:35:41 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * re.c (match_array): replace match_check().
-
- * re.c (match_values_at): ditto.
-
-Tue Feb 3 12:09:08 2009 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/net/imap.rb (hmac_md5): should use String#ord to get ascii
- code from the one-character string.
-
-Tue Feb 3 11:25:41 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * load.c (load_lock): warn for circular require. [ruby-core:20794],
- [ruby-core:20797]
-
-Tue Feb 3 08:35:12 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/lib/socket.rb (Socket.tcp_server_sockets): extracted from
- Socket.tcp_server_loop.
- (Socket.accept_loop): ditto.
- (Socket.unix_server_socket): extracted from Socket.unix_server_loop.
- (Socket.unix_server_loop): use Socket.accept_loop.
-
-Tue Feb 3 08:21:05 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/ruby/test_readpartial.rb (make_pipe): readpartial does not
- work in text mode.
-
-Tue Feb 3 08:18:26 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * cygwin/GNUmakefile.in (RUBYDEF): uses mkexports.rb on cygwin too.
-
- * win32/mkexports.rb (Exports::Cygwin): added.
-
-Tue Feb 3 08:10:23 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (Doxyfile): moved from Makefile.in.
-
- * template/Doxyfile.tmpl: split from Doxyfile.in.
-
-Tue Feb 3 08:01:38 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/win32.c (rb_w32_write): use of cast expressions as lvalues
- is deprecated.
-
-Tue Feb 3 07:57:58 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/socket/extconf.rb (in_pktinfo, in6_pktinfo),
- ext/socket/ancdata.c: defined in w32api/ws2tcpip.h on cygwin but
- cannot compile for some reason.
-
-Tue Feb 3 07:02:11 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * missing/langinfo.c (nl_langinfo_codeset): accepts iso-8859
- fragment. [ruby-core:21757]
-
-Tue Feb 3 07:01:21 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * mkconfig.rb (patchlevel): config.status may not contain
- PATCHLEVEL even if other version numbers exist.
-
-Mon Feb 2 23:43:00 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/raddrinfo.c (Init_addrinfo): add AddrInfo#to_s as an
- alias of AddrInfo#to_sockaddr.
-
- * ext/socket/option.c (Init_sockopt): add Socket::Option#to_s as an
- alias of Socket::Option#data.
-
- [ruby-dev:37873]
-
-Mon Feb 2 21:04:13 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_sort_by_bang): RDoc update. [ruby-core:21742]
-
-Mon Feb 2 20:49:24 2009 Akinori MUSHA <knu@iDaemons.org>
-
- * enumerator.c: Introduce id_each to save rb_intern() and SYM2ID()
- calls.
-
-Mon Feb 2 19:55:51 2009 Tanaka Akira <akr@fsij.org>
-
- * test/socket/test_addrinfo.rb: use AddrInfo.getaddrinfo to generate
- IPv6 address. AddrInfo.ip generates IPv4 address for IPv4 mapped
- IPv6 address if --with-lookup-order-hack=INET.
- [ruby-dev:37868]
-
-Mon Feb 2 19:17:16 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * doc/NEWS-1.9.1: typo fixed: collect_all -> collect.
- [ruby-core:21706]
-
-Mon Feb 2 17:23:14 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * cygwin/GNUmakefile.in (dir.o, win32.o): depend on win32/dir.h.
-
-Mon Feb 2 17:13:46 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * mkconfig.rb: patchlevel is sometimes minus.
-
- * win32/resource.rb: ditto.
-
-Mon Feb 2 17:11:23 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/ancdata.c (cmsg_type_to_sym): add #ifdef for no IPv6
- environment.
-
-Mon Feb 2 17:05:55 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (rb_find_file_ext): should not be infected from other
- load paths.
-
-Mon Feb 2 16:33:06 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * dir.c (dir_s_home): new method. [ruby-core:21454]
-
-Mon Feb 2 16:06:10 2009 Tanaka Akira <akr@fsij.org>
-
- * version.h: bump up to 1.9.2 patchlevel -1.
- yugui recommend "-1" strongly.
-
- * lib/rubygems/version.rb: accept negative patchlevel.
-
-Mon Feb 2 14:53:35 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/socket.c (sock_initialize): make 3rd argument, protocol,
- optional.
-
-Mon Feb 2 14:47:53 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_sort_by_bang): new method. requested in
- [ruby-core:21709]
-
-Mon Feb 2 14:22:56 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/socket/constants.c (cmsg_type_arg): INET6 check.
-
-Mon Feb 2 14:18:20 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/option.c: use INET6 instead of IPV6.
-
-Mon Feb 2 12:47:47 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/socket/{options,raddrinfo}.c: use INET6 instead of AF_INET6 for
- VC++6.
-
-Mon Feb 2 12:41:52 2009 Shugo Maeda <shugo@ruby-lang.org>
-
- * complex.c (f_signbit): regard NaN as a positive value.
- [ruby-dev:37861].
-
-Mon Feb 2 12:39:00 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * sample/test.rb (valid_syntax?), test/ruby/test_system.rb
- (TestSystem::valid_syntax?): use catch and throw instead of
- return inside BEGIN block.
-
-Mon Feb 2 11:45:10 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/rubysocket.h (cmsg_type_arg): declared.
- (Init_ancdata): ditto.
-
- * ext/socket/init.c (Init_socket_init): call Init_ancdata.
-
- * ext/socket/constants.c (cmsg_type_arg): defined.
-
- * ext/socket/depend: add dependency for ancdata.o.
-
- * ext/socket/mkconstants.rb: generate scm_optname_to_int.
- more constants.
-
- * ext/socket/extconf.rb: add ancdata.o.
-
- * ext/socket/ancdata.c: new file. new method
- BasicSocket#{sendmsg,sendmsg_nonblock,recvmsg,recvmsg_nonblock}
-
-Mon Feb 2 10:57:27 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c, win32/dir.h (open_dir_handle, rb_w32_opendir,
- move_to_next_entry, rb_w32_readdir, check_valid_dir): change backend
- API from A to W.
-
-Mon Feb 2 10:48:38 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/basicsocket.c (bsock_setsockopt): accept Socket::Option
- object.
- (bsock_getsockopt): return Socket::Option object.
-
- * ext/socket/option.c: new file.
-
- * ext/socket/rubysocket.h (rb_cSockOpt): declared.
- (sockopt_new): ditto.
- (Init_sockopt): ditto.
-
- * ext/socket/init.c (Init_socket_init): call Init_sockopt.
-
- * ext/socket/depend: add dependency for option.o
-
- * ext/socket/mkconstants.rb: generate intern_level, intern_so_optname,
- intern_ip_optname, intern_ipv6_optname, intern_tcp_optname,
- intern_udp_optname and intern_scm_optname.
-
- * ext/socket/extconf.rb: add option.o.
-
-Mon Feb 2 09:49:39 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm.c (vm_backtrace_each): progname is not available at
- initializing phase.
-
-Mon Feb 2 08:12:50 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/xmlrpc/server.rb (Server#serve): gets rid of hardcoded
- platform names.
-
- * lib/resolv.rb (Resolv::Hosts::DefaultFileName),
- (Resolv::DNS::Config.default_config_hash): tries win32/resolv on
- mswin64 too.
-
- * lib/rubygems/specification.rb (Gem::Specification#ruby_code):
- added mswin64.
-
- * lib/drb/extservm.rb (DRb::ExtServManager#invoke_service_command):
- spawn is better to start a process in background.
-
- * ext/extmk.rb: uses FNM_SYSCASE.
-
- * instruby.rb: installs win32.h on mswin64 platform.
- [ruby-core:21722]
-
-Mon Feb 2 07:36:13 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm.c (vm_backtrace_each): now takes an iterator function.
-
- * vm_core.h (rb_make_backtrace, rb_backtrace_each): added
- prototypes.
-
- * vm_dump.c (rb_vm_bugreport), vm_eval.c (rb_backtrace): gets rid
- of allocating objects. [ruby-core:21619]
-
- * vm_eval.c (rb_backtrace_each): new function which iterates over
- each backtrace info.
-
-Mon Feb 2 06:51:36 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * encoding.c (rb_filesystem_encoding): Windows' filesystem encoding is
- sometimes ANSI code page and sometimes OEM code page. we should check
- whether code page is used.
-
-Sun Feb 1 21:27:55 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/raddrinfo.c (addrinfo_ipv4_private_p): new method.
- (addrinfo_ipv4_loopback_p): ditto.
- (addrinfo_ipv4_multicast_p): ditto.
-
-Sun Feb 1 16:10:06 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/optparse.rb (Switch#summarize): strips an equal sign from
- short option, and fills right sides in shorter lines.
- [ruby-talk:326414]
-
-Sun Feb 1 05:19:43 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * variable.c (rb_const_get_0), vm_insnhelper.c (vm_get_ev_const):
- avoids infinite self recursion autoload. [ruby-core:21696]
-
-Sat Jan 31 22:50:38 2009 Tanaka Akira <akr@fsij.org>
-
- * lib/test/unit/assertions.rb (assert_equal): show class in failure
- message if meaningful.
-
-Sat Jan 31 22:38:46 2009 Tanaka Akira <akr@fsij.org>
-
- * lib/resolv.rb (Resolv::DNS#each_address): don't query IPv6 address
- if the host has no global IPv6 address.
-
-Sat Jan 31 22:29:05 2009 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/ruby.h (STR2CSTR): removed.
- (rb_str2cstr): removed.
-
- * object.c (rb_str2cstr): removed.
-
-Sat Jan 31 20:07:59 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/raddrinfo.c (addrinfo_ipv6_unspecified_p): new method.
- (addrinfo_ipv6_loopback_p): ditto.
- (addrinfo_ipv6_multicast_p): ditto.
- (addrinfo_ipv6_linklocal_p): ditto.
- (addrinfo_ipv6_sitelocal_p): ditto.
- (addrinfo_ipv6_v4mapped_p): ditto.
- (addrinfo_ipv6_v4compat_p): ditto.
- (addrinfo_ipv6_mc_nodelocal_p): ditto.
- (addrinfo_ipv6_mc_linklocal_p): ditto.
- (addrinfo_ipv6_mc_sitelocal_p): ditto.
- (addrinfo_ipv6_mc_orglocal_p): ditto.
- (addrinfo_ipv6_mc_global_p): ditto.
-
-Sat Jan 31 19:09:30 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * load.c (rb_require_safe): raises when the path to be loaded is
- tainted. [ruby-dev:37843]
-
-Sat Jan 31 18:08:59 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (optflags): defaulted to -O3 to get rid of slug of
- gcc 4.3.
-
-Sat Jan 31 18:03:41 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/optparse.rb (List#accept, parse_in_order): n option is no
- longer needed.
-
-Sat Jan 31 14:12:43 2009 Tanaka Akira <akr@fsij.org>
-
- * lib/pathname.rb (Pathname#each_child): new method.
-
-Sat Jan 31 00:07:49 2009 Tanaka Akira <akr@fsij.org>
-
- * lib/test/unit/assertions.rb
- (Test::Unit::Assertions#assert_nothing_raised): suppress warning.
- [ruby-core:21312]
-
-Fri Jan 30 21:49:32 2009 Tanaka Akira <akr@fsij.org>
-
- * lib/pathname.rb (Pathname#realdirpath): new method based on the
- patch in [ruby-dev:36560] by Akinori MUSHA.
- [ruby-dev:36290]
-
-Fri Jan 30 18:04:23 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (rb_w32_write): limit write size to 32KB if the file
- seems to be console. [ruby-core:21613]
-
-Fri Jan 30 16:12:32 2009 TAKAO Kouji <kouji@takao7.net>
-
- * ext/curses/curses.c (Init_curses): Curses#crmode and
- Curses#nocrmode changes to the module function.
- fix #916
-
-Fri Jan 30 14:31:14 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * tool/make-snapshot (prereq): remove enc.mk from tarball because
- BSD make checks $(srcdir)/enc.mk and try to run $(builddir)/enc.mk.
-
-Fri Jan 30 14:11:48 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * enc/depend: extract compile rules to each target for nmake.
-
-Fri Jan 30 12:59:49 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * cygwin/GNUmakefile.in (RUBYDEF): depends on makefiles.
-
- * cygwin/GNUmakefile.in (RUBYDEF): adds DATA to non-function symbols
- which is not marked as T.
-
-Fri Jan 30 11:03:31 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/test/unit/assertions.rb (assert_respond_to): gets rid of
- overcounting. [ruby-dev:37703]
-
-Fri Jan 30 02:55:56 2009 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (rb_econv_init_by_convpath_i): make it static.
-
-Thu Jan 29 16:22:41 2009 Shugo Maeda <shugo@ruby-lang.org>
-
- * load.c (rb_feature_provided): should not calculate len by pointer
- subtraction because feature may be a expanded path.
- [ruby-core:21267]
-
-Thu Jan 29 14:12:15 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (BASERUBY): erases RUBYOPT at the test.
-
- * configure.in (OBJCOPY): not used on Windows.
-
-Thu Jan 29 13:16:11 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/securerandom.rb (SecureRandom.uuid): uses unpacked array
- instead of string, because String#[] returns one length string.
-
-Thu Jan 29 12:29:51 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/rake.rb (FileUtils#rake_system): no longer needs workaround
- on Windows. [ruby-core:21339]
-
- * lib/rake/win32.rb (Rake::Win32#rake_system): ditto.
-
- * lib/rake/win32.rb (Rake::Win32#win32_system_dir): no longer
- needs environment variables other than APPDATA now.
-
- * lib/rake.rb (Rake::Application#standard_system_dir): uses
- platform specific definition on Windows system.
-
-Thu Jan 29 12:18:54 2009 Technorama Ltd. <oss-ruby@technorama.net>
-
- * lib/securerandom.rb: new method SecureRandom#uuid
-
-Thu Jan 29 11:22:19 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/socket/raddrinfo.c (inspect_sockaddr): if defined AF_INET6,
- perhaps can inspect IPv6 addresses if not defined INET6.
-
- * ext/socket/socket.c (socket_s_ip_address_list): support Windows XP
- or later. (Win2k or earlier is still not supported)
-
-Thu Jan 29 00:24:48 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/zlib/zlib.c (zstream_run): previous change didn't resolve the
- problem.
-
-Wed Jan 28 22:51:12 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/zlib/zlib.c (zstream_run): desperately guard the variable.
- [ruby-core:20576]
-
-Wed Jan 28 15:24:11 2009 TAKANO Mitsuhiro (takano32) <tak@no32.tk>
-
- * math.c: SEGV is caused by implicit rb_to_float declaration
- test_complexrational.rb: [BUG] in IA-64 architecture
-
-Tue Jan 27 20:02:07 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/init.c (socks_connect_blocking): moved from
- sockssocket.c. [ruby-dev:37834]
-
- * sockssocket.c (socks_init): don't omit "int" type.
-
-Tue Jan 27 14:41:33 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * cygwin/GNUmakefile.in (RUBYDEF): needs DATA marks to export
- non-function symbols. [ruby-core:21582]
-
- * win32/mkexports.rb (Exports::Mingw#each_export): ditto.
-
-Tue Jan 27 12:59:55 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/ripper/depend: use VPATH.
- If a platform doesn't support VPATH, Ruby doesn't support it:
- for example MSYS. [ruby-core:21570]
-
-Tue Jan 27 12:21:17 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/ripper/depend: lex.c's correct path is ../../lex.c.
-
-Tue Jan 27 11:09:45 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb (try_header): checks the header depending on
- platform.
-
- * lib/mkmf.rb (have_header, find_header): use try_header.
-
- * win32/Makefile.sub (try_header): uses try_compile to get rid of
- slow -E option of VC.
-
-Tue Jan 27 11:03:52 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (distclean-enc, realclean-enc): do not call clean of
- enc.mk twice or more.
-
- * enc/depend (cleanobjs): added deffile.
-
- * lib/mkmf.rb (create_makefile): removes deffile at clean instead
- of distclean.
-
- * win32/Makefile.sub (miniruby, LIBRUBY_SO): removes lib and exp
- files.
-
- * win32/Makefile.sub (clean, distclean): have moved to common.mk.
-
- * win32/rmdirs.bat: omits `not empty' message.
-
-Tue Jan 27 10:15:33 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * transcode.c (struct rb_transcoding): added ary member for debug.
-
-Tue Jan 27 10:10:14 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * Doxyfile.in (FILE_VERSION_FILTER, INPUT_FILTER): should not use
- ./miniruby directly for cross compiling.
-
-Tue Jan 27 04:02:53 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/ripper/depend: fixed dependency path to lex.c.
- [ruby-core:21570]
-
-Tue Jan 27 03:43:34 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * hash.c (rb_any_hash): fixed performance issues with nil, true,
- false as hash keys. a patch from Matthias Waechter.
- [ruby-core:21568]
-
-Tue Jan 27 03:23:43 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/mkmf.rb (create_makefile): should point correct path to
- ruby.h and defines.h. [ruby-core:21569]
-
-Mon Jan 26 16:00:40 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * array.c (rb_ary_aset): fixed arguments evaluation order.
-
-Mon Jan 26 15:49:42 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/pathname.rb (chop_basename, prepend_prefix): use o option.
-
-Sun Jan 25 16:35:44 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/socket.c (socket_s_ip_address_list): renamed from
- socket_s_list_ip_address. [ruby-dev:37806]
-
-Sun Jan 25 12:17:21 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * cygwin/GNUmakefile.in (RUBYDEF): needs read-only section too.
-
-Sun Jan 25 12:02:56 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/Makefile.sub (clean-ext): condition of EXTS was inverted.
-
-Sun Jan 25 11:50:20 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb (create_makefile): fixed the variables order because
- converter proc refers the separator.
-
-Sun Jan 25 11:25:10 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * Makefile.in, win32/Makefile.sub (RMDIRS): remove directory and
- parents.
-
- * Makefile.in, win32/Makefile.sub (distclean-rdoc): added to remove
- temporary rdoc.
-
- * Makefile.in, win32/Makefile.sub (clean-ext): skips non-existent
- directories.
-
- * common.mk (clean, distclean): cleans rdoc.
-
- * common.mk (clean-extout): removes extout directory.
-
- * configure.in (RMDIRS, RMALL): added to clean extout.
-
- * lib/fileutils.rb (FileUtils#rmdir): added :parents option.
-
- * lib/mkmf.rb (create_makefile): cleans installed files at clean
- instead of distclean.
-
- * lib/mkmf.rb (create_makefile): added clean-so and clean-rb.
-
- * lib/mkmf.rb (def init_mkmf): added DISTCLEANDIRS.
-
- * lib/un.rb (rmdir): added -p option.
-
- * tool/rmdirs, win32/rmdirs.bat: removes directory and the parents.
-
- * win32/rm.bat: added -r option.
-
-Sun Jan 25 09:09:29 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * dir.c (join_path): use strlcat() to force link.
-
- * dir.c (glob_helper): no strcpy() is needed since len is known.
-
-Sun Jan 25 06:44:58 2009 Technorama Ltd. <oss-ruby@technorama.net>
-
- * ext/openssl/ossl_ssl.c: Server Name Indication support.
- new methods SSLContext#server_name_cb=, SSLSocket#hostname=.
-
- * test/openssl/test_ssl.rb: Tests for above.
-
-Sat Jan 24 08:22:35 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb (configuration): tools under the top source
- directory are not installed, so unusable outside extmk.rb.
-
-Fri Jan 23 17:24:31 2009 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * golf_prelude.rb (Enumerator#inspect): avoid warning.
-
-Fri Jan 23 15:12:52 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb (mkintpath): new function which converts native path
- to format acceptable in Makefile.
-
- * lib/mkmf.rb (configuration): leaves PATH_SEPARATOR unchanged.
-
- * lib/mkmf.rb (configuration): converts srcdir, topdir and hdrdir.
- a patch by Alexey Borzenkov <snaury AT gmail.com> at
- [ruby-core:21448].
-
- * lib/mkmf.rb (try_func): got rid of c-mode confusion.
-
-Fri Jan 23 13:26:45 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * signal.c (trap_handler): also accepts symbols. [ruby-dev:37823]
-
-Thu Jan 22 18:14:04 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb (create_makefile): removes installed files under
- extout at distclean.
-
-Thu Jan 22 17:12:37 2009 Takeyuki FUJIOKA <xibbar@ruby-lang.org>
-
- * lib/cgi/core.rb (CGI.parse): generate only key on params hash
- if request have only key uri parameters.
- (ex. index.cgi?aaa&bbb=1 # params=>{:aaa=>[],:bbb=>["1"]})
-
- * test/cgi/test_cgi_core.rb: fix test for key only params.
-
-Thu Jan 22 16:29:50 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/rubygems/installer.rb (Gem::Installer#initialize): fixed
- typos.
-
- * test/rubygems/test_gem.rb (test_self_dir): removed false
- assertions.
-
- * test/rubygems/test_gem.rb (test_self_set_paths): checks if paths
- are included.
-
- * test/rubygems/test_gem_commands_install_command.rb
- (test_execute_remote): checks diagnostic message too.
-
- * test/rubygems/test_gem_installer.rb (load): uses Gem.ruby.
-
- * test/rubygems/gemutilities.rb (Gem.ruby): initializes from the
- environment variable to run without installation.
-
- * test/rubygems/gemutilities.rb (RubyGemTestCase#util_build_gem):
- creates cache directory.
-
-Thu Jan 22 16:12:51 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * revert previous revision. it's already out-of-date.
-
-Thu Jan 22 15:54:02 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * include/ruby/win32.h, win32/win32.c (rb_w32_is_valid_fd): new function
- to validate fd.
-
- * io.c (rb_io_initialize): check fd with above function.
-
-Thu Jan 22 14:53:29 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/ruby/test_process.rb (MANDATORY_ENVS): needs RUBYLIB to run
- tests without install.
-
-Thu Jan 22 12:19:29 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * gc.c (define_final): cannot define finalizer for immediate
- values. [ruby-core:21500]
-
- * gc.c (define_final): freezes or hides internal values.
-
-Thu Jan 22 11:33:08 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread.c (rb_time_timeval): made a real prototype. a patch from
- Marcus Rueckert <darix AT opensu.se> at [ruby-core:21492].
-
-Wed Jan 21 21:43:50 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (rb_io_ungetbyte, rb_io_ungetc): allows nil to reset EOF
- flag with ungetting nothing.
-
- * ruby.c (load_file_internal): rests EOF flag to make possible to
- load from stdin after reading data.
-
-Wed Jan 21 17:17:18 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (ary_double_capa): a new function to expand array more
- aggressively. [ruby-core:21460]
-
- * array.c (rb_ary_store): use ary_double_capa().
-
- * array.c (rb_ary_unshift_m): ditto.
-
- * array.c (rb_ary_splice): ditto.
-
-Wed Jan 21 15:32:15 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (rb_io_ungetbyte, rb_io_ungetc): clears EOF flag.
-
-Wed Jan 21 14:41:48 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * array.c (take_items): to_ary() raises ArgumentError if cannot to
- convert to Array. [ruby-dev:37797]
-
-Wed Jan 21 14:32:02 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (debug_lines): calls rb_intern() once.
-
-Wed Jan 21 13:58:17 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/io.h (FMODE_EOF): EOF flag on TTY.
-
- * io.c (io_set_eof): sets EOF flag for TTY.
-
- * io.c (io_seek): clears EOF flag.
-
- * io.c (io_fillbuf): returns EOF if already met EOF. [ruby-dev:37798]
-
- * io.c (io_fillbuf, io_fread, io_getpartial): sets EOF.
-
-Wed Jan 21 08:22:04 2009 Ryan Davis <ryand-ruby@zenspider.com>
-
- * lib/minitest/*.rb: Imported minitest 1.3.1 r4532.
- * test/minitest/*.rb: ditto.
-
-Tue Jan 20 20:16:21 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/socket.c (socket_s_list_ip_address): new method.
- (sockaddr_obj): new function.
-
- * ext/socket/rubysocket.h: include ifaddrs.h, sys/ioctl.h,
- sys/sockio.h, net/if.h if available.
- (addrinfo_new): declared.
-
- * ext/socket/raddrinfo.c (addrinfo_new): exported.
-
- * ext/socket/extconf.rb: check ifaddrs.h, sys/ioctl.h, sys/sockio.h,
- net/if.h and getifaddrs.
-
-Tue Jan 20 20:05:21 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/rubysocket.h (pseudo_AF_FTIP): moved from mkconstants.rb.
-
- * ext/socket/mkconstants.rb: prepend header if -H is not given.
-
-Tue Jan 20 17:50:00 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/nkf/nkf-utf8/nkf.c (nkf_buf): use nkf_char.
-
-Tue Jan 20 16:17:12 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * cont.c (ruby_Init_{Continuation_body,Fiber_as_Coroutine}): prefixed
- with ruby_ to export.
-
- * ext/continuation/continuation.c, ext/fiber/fiber.c: ditto.
-
-Tue Jan 20 15:32:29 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * Makefile.in (miniruby): renames and then removes, to get rid of
- EPERM on cygwin and mingw.
-
- * Makefile.in ($(LIBRUBY_SO)): use wildcard option of objcopy.
-
- * configure.in (DLDFLAGS): do not export all symbols.
-
- * cygwin/GNUmakefile.in (RUBYDEF): rejects symbols prefixed with
- Init_.
-
- * win32/mkexports.rb (Exports::Mingw): includes all symbols as
- well as mswin32, except for prefixed with Init_.
-
-Tue Jan 20 13:03:50 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (hash): fixed the tail bytes handling in the aligned
- access case.
-
-Tue Jan 20 09:26:05 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/nkf/nkf-utf8/nkf.c (nkf_buf_push): maybe a bug.
-
- * ext/nkf/nkf-utf8/nkf.c (options): no need to support help option.
-
-Tue Jan 20 06:48:56 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * array.c (take_items), enum.c (enum_zip): tries to convert to
- array first. [ruby-core:21442]
-
-Tue Jan 20 03:50:37 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/nkf/nkf-utf8/nkf.c: Update nkf to 2.0.9.
- revert -s meaning as Shift_JIS, etc.
-
-Tue Jan 20 03:42:32 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (hash): fixed typo. [ruby-dev:37791]
-
-Tue Jan 20 01:15:27 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/mkconstants.rb (SOMAXCONN): defined.
-
-Mon Jan 19 22:31:35 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/mkconstants.rb: use erb for generating code.
-
-Mon Jan 19 17:33:47 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (hash): defaulted to MurmurHash 2.0.
-
-Mon Jan 19 17:29:34 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/defines.h (RUBY_ALIAS_FUNCTION_TYPE): added.
-
-Mon Jan 19 17:24:05 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm_dump.c (vm_stack_dump_each): used only if debug mode.
-
-Mon Jan 19 16:32:35 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (hash): added MurmurHash 2.0.
-
-Mon Jan 19 14:31:59 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread.c (rb_thread_execute_interrupts): needs
- rb_signal_buff_size to be declared.
-
-Mon Jan 19 13:34:25 2009 Koichi Sasada <ko1@atdot.net>
-
- * ruby.c (require_libraries): reset th->parse_in_eval while
- loading libraries. fixes [ruby-dev:37780]
-
-Mon Jan 19 11:46:39 2009 Koichi Sasada <ko1@atdot.net>
-
- * vm_eval.c, eval.c (rb_f_block_given_p): move definition of
- "iterator?" and "block_given?" to make static.
-
- * vm.c (vm_get_ruby_level_caller_cfp): make it static.
-
- * eval_intern.h, vm_insnhelper.c: move decl. of
- vm_get_ruby_level_caller_cfp()
- from eval_intern.h to vm_insnhelper.c.
-
-Mon Jan 19 11:27:39 2009 Koichi Sasada <ko1@atdot.net>
-
- * vm.c: add a prefix "rb_" to exposed functions
- vm_get_ruby_level_next_cfp(), rb_vm_make_env_object(),
- vm_stack_to_heap(), vm_make_proc(), vm_invoke_proc(),
- vm_get_sourceline(), vm_cref(), vm_localjump_error(),
- vm_make_jump_tag_but_local_jump(), vm_jump_tag_but_local_jump().
- This changes may affect only core because most of renamed functions
- require a pointer of not-exposed struct such as rb_thread_t or NODE.
- In short, they are core functions.
-
- * cont.c, eval.c, eval_intern.h, load.c, proc.c, thread.c,
- vm_core.h, vm_dump.c, vm_eval.c, vm_exec.c, vm_insnhelper.c:
- ditto.
-
-Mon Jan 19 11:22:51 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/socket/rubysocket.h (rb_cUNIXSocket, rb_cUNIXServer),
- (unixpath, unixaddr): UNIX domain sockets depend on sys/un.h.
-
-Mon Jan 19 11:02:30 2009 Koichi Sasada <ko1@atdot.net>
-
- * vm_dump.c: add a prefix "rb_vmdebug_" to
- vm_stack_dump_raw(), vm_stack_dump_raw_current(),
- vm_env_dump_raw(), vm_proc_dump_raw(), vm_stack_dump_th(),
- vm_debug_print_register(), vm_thread_dump_regs(),
- vm_debug_print_pre(), vm_debug_print_post(),
- vm_thread_dump_state().
- This change also may affect core (in fact, user of
- above functions may be only ko1).
-
- * vm_core.h: ditto.
-
- * vm_exec.h (SDR2): remove duplicate definition.
-
-Mon Jan 19 11:00:44 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/socket/raddrinfo.c (addrinfo_ip_port): use AF_INET6 only when
- defined, as well as addrinfo_ipv6_p().
-
-Mon Jan 19 10:43:38 2009 Koichi Sasada <ko1@atdot.net>
-
- * gc.c (garbage_collect_with_gvl): suppress warnings.
-
-Mon Jan 19 10:34:32 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/socket/depend: workaround for nmake. files in depend without
- paths should converted by RULE_SUBST, but mkmf.rb cannot recognize
- macros currently.
-
-Mon Jan 19 09:53:43 2009 Koichi Sasada <ko1@atdot.net>
-
- * iseq.c:
- rename ruby_iseq_disasm_insn() -> rb_iseq_disasm_insn().
- rename ruby_iseq_disasm() -> rb_iseq_disasm().
-
- * compile.c:
- rename ruby_iseq_compile() -> rb_iseq_compile_node().
- rename ruby_iseq_translate_threaded_code() ->
- rb_iseq_translate_threaded_code().
- rename ruby_insns_name_array() -> rb_insns_name_array().
- rename ruby_iseq_build_from_ary() -> rb_iseq_build_from_ary().
-
- * iseq.c, compile.c: remove ruby_insn_make_insn_table() and make
- static function insn_make_insn_table().
-
- * iseq.h, ruby.c, vm.c, vm_core.h, vm_eval.c, vm_dump.c,
- blockinlining.c: ditto.
- Rename strange "ruby_" prefix to "rb_" prefix.
- This changes may affect only core because renamed functions
- require a pointer of rb_iseq_t which is not exposed.
-
-Mon Jan 19 09:21:04 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/socket/mkconstants.rb: define macros with default value in
- constdefs.h if not exist them.
-
- * ext/socket/raddrinfo.c (addrinfo_mdump, addrinfo_mload): support
- UNIX socket only on platforms which support it.
-
-Mon Jan 19 08:56:53 2009 Koichi Sasada <ko1@atdot.net>
-
- * eval.c, vm_eval.c (rb_f_local_variables): move definition from eval.c
- to vm_eval.c because vm_collect_local_variables_in_heap() should
- be static function.
-
- * vm.c (vm_collect_local_variables_in_heap): make it static.
-
-Mon Jan 19 04:06:10 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * iseq.c (rb_iseq_load): renamed from ruby_iseq_load, since it is
- for C extensions or the ruby core. [ruby-core:21407]
-
-Mon Jan 19 03:06:22 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * transcode.c (str_transcode0): fix: :xml option doesn't
- work on str.encode([options]) form without default_internal.
-
-Sun Jan 18 16:56:46 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/raddrinfo.c (addrinfo_inspect_sockaddr): new
- method AddrInfo#inspect_sockaddr.
- (inspect_sockaddr): extracted from addrinfo_inspect.
- (addrinfo_inspect): use inspect_sockaddr.
- (Init_addrinfo): define the new method.
-
-Sun Jan 18 16:46:37 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/raddrinfo.c (addrinfo_ip_address): new method
- AddrInfo#ip_address.
- (addrinfo_ip_port): new method AddrInfo#ip_port.
- (Init_addrinfo): define the methods above.
-
-Sun Jan 18 14:29:52 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/unixsocket.c: redundant #ifdef removed.
-
-Sun Jan 18 03:33:23 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/raddrinfo.c (addrinfo_mdump): don't use symbol.
- (addrinfo_mload): ditto.
-
-Sun Jan 18 03:05:20 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/raddrinfo.c (addrinfo_mdump): new method.
- (addrinfo_mload): new method.
- (Init_addrinfo): define the method above.
-
- * ext/socket/constants.c (constant_arg): str_to_int's first argument
- constified.
-
- * ext/socket/mkconstants.rb (gen_name_to_int_decl): generated
- function's first argument constified.
- (gen_name_to_int_func_in_guard): ditto.
- (ipproto_to_int): generated.
-
- * ext/socket/rubysocket.h (IS_IP_FAMILY): moved from raddrinfo.c.
-
-Sun Jan 18 01:37:50 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/socket.c (sock_s_getnameinfo): accept AddrInfo object.
-
- * ext/socket/raddrinfo.c (rb_check_sockaddr_string_type): defined.
-
- * ext/socket/rubysocket.h (rb_check_sockaddr_string_type): declared.
-
-Sat Jan 17 22:01:15 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/lib/socket.rb: new file.
-
-Sat Jan 17 19:33:48 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * configure.in (VCSUP): fixed the cases for git-svn or git.
-
- * win32/Makefile.sub (VCSUP): ditto.
-
- * Makefile.in (up): `cd' is necessary for git and git-svn.
-
-Sat Jan 17 19:16:16 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/mkconstants.rb: generate a header file for generated
- functions.
-
- * ext/socket/rubysocket.h: include constdefs.h. don't declare
- generated functions.
-
- * ext/socket/constants.c: include constdefs.c instead of constants.h.
-
- * ext/socket/depend: dependency updated.
-
-Sat Jan 17 17:58:22 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * lib/irb/xmp.rb: multilingualizes XMP::StringInputMethod.
- [ruby-core:21383].
-
-Sat Jan 17 15:01:22 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/raddrinfo.c (make_inspectname): add a res argument to
- suppress numeric inspectname.
- (init_addrinfo_getaddrinfo): call make_inspectname here.
- (addrinfo_firstonly_new): follow make_inspectname change.
- (addrinfo_list_new): ditto.
- (addrinfo_initialize): follow init_addrinfo_getaddrinfo change.
-
-Sat Jan 17 14:52:27 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/mkconstants.rb: don't cause an error for duplicate names.
-
-Sat Jan 17 12:46:17 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket: split files for each class.
-
- * ext/socket/rubysocket.h: common header.
-
- * ext/socket/basicsocket.c: new file for BasicSocket.
-
- * ext/socket/ipsocket.c: new file for IPSocket.
-
- * ext/socket/tcpsocket.c: new file for TCPSocket.
-
- * ext/socket/tcpserver.c: new file for TCPServer.
-
- * ext/socket/sockssocket.c: new file for SOCKSSocket.
-
- * ext/socket/udpsocket.c: new file for UDPSocket.
-
- * ext/socket/unixsocket.c: new file for UNIXSocket.
-
- * ext/socket/unixserver.c: new file for UNIXServer.
-
- * ext/socket/socket.c: now for Socket.
-
- * ext/socket/raddrinfo.c: new file for AddrInfo and name resolution.
-
- * ext/socket/constants.c: new file for constants.
-
- * ext/socket/init.c: new file for utilities.
-
- * ext/socket/mkconstants.rb: export *_to_int.
-
- * ext/socket/extconf.rb: add new object files.
-
- * ext/socket/depend: add dependencies for new files.
-
- * ext/.document: add new files.
-
-Sat Jan 17 11:12:37 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * cont.c (cont_restore_0): padding size doesn't need to be large
- if alloca is used. suppress warnings.
-
-Sat Jan 17 11:12:21 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm_dump.c (vm_stack_dump_each): initialized at declarations.
-
- * vm_dump.c (rb_vm_bugreport): constified to suppress a warning.
-
-Fri Jan 16 22:30:27 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/socket.c: move addrinfo code.
-
-Fri Jan 16 18:51:11 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/Makefile.sub (up): tell nmake that need to run command via
- shell.
-
-Fri Jan 16 18:43:30 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * tool/make-snapshot (package): includes all rules and expand
- configured values from the environment to create *.inc, sets RM
- for ripper.c, and needs chdir if absolute path is given with
- -exported option.
-
-Fri Jan 16 18:26:47 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/ruby.h (VALUE): use unsigned long or long long
- instead of uintptr_t, since many %lx and so on are still used.
-
-Fri Jan 16 17:33:59 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (Makefile): set VCS and VCSUP to support `git svn'
- and git.
-
- * Makefile.in, win32/Makefile.sub (up): split from common.mk.
-
-Fri Jan 16 12:24:39 2009 Koichi Sasada <ko1@atdot.net>
-
- * thread.c (thread_start_func_2): call ruby_cleanup() if thread is
- main thread. [ruby-dev:37624]
-
-Fri Jan 16 12:27:50 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/Makefile.sub ($(INSNS), node_name.inc, known_errors.inc,
- miniprelude.c, newline.c): if dependencies is newer than targets or
- targets don't exist, try to create targets with BASERUBY. no need to
- detect errors there because the absence of BASERUBY is not abnormal.
- after the try, if the targets still don't exist, copy them from
- $(srcdir).
-
-Fri Jan 16 12:15:07 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * include/ruby/ruby.h (PRI_PTRDIFF_PREFIX): must define as string.
- if not, cause compile error in using PRI?VALUE.
-
- * win32/Makefile.sub (config.h): add SIZEOF_INTPTR_T and
- SIZEOF_UINTPTR_T for SIZEOF_VALUE.
-
-Fri Jan 16 11:51:20 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * symbian/pre-build (COMSPEC): should not overridden.
-
-Fri Jan 16 11:47:56 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (rb_parse_in_main): fixed typo.
-
-Fri Jan 16 11:41:23 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (RUBY_REPLACE_TYPE): does not define rb_ prefixed
- name if no default type is given.
-
- * configure.in (RUBY_DEFINT): checks size.
-
- * include/ruby/ruby.h (PRI_PTRDIFF_PREFIX, PRI_SIZE_PREFIX):
- assumes usable if PRIdPTR is defined.
-
-Fri Jan 16 02:25:46 2009 Yusuke Endoh <mame@tsg.ne.jp>
-
- * thread.c (rb_thread_execute_interrupts): if signal is already
- buffered, main thread should wait until timer thread delivers it.
-
- * thread.c (timer_thread_function): should defer delivery of a signal
- if main thread does not yet trap a previous one. [ruby-dev:37676]
-
-Fri Jan 16 02:05:55 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/socket.c (addrinfo_s_ip): new method AddrInfo.ip.
-
-Fri Jan 16 01:42:50 2009 Koichi Sasada <ko1@atdot.net>
-
- * thread.c (call_trace_proc): as Matz said ([ruby-core:21183]),
- should skip rb_str_new2() if rb_sourcefile() returns NULL.
- rb_sourcefile() returns NULL if frame is toplevel of Fiber.
- [ruby-core:21161] [Bug #985]
-
-Fri Jan 16 01:09:37 2009 Koichi Sasada <ko1@atdot.net>
-
- * ruby.c (process_options): decrement parse_in_eval to recognize
- parsing main or normal eval script.
-
- * compile.c (rb_parse_in_main): return 1 if parsing main script.
- (if parse_in_eval is negative value, it means main script)
-
- * parse.y (yycompile0): check rb_parse_in_main() to accumulate
- script text. Bug #848 [ruby-core:20450]
-
-Fri Jan 16 00:57:34 2009 Koichi Sasada <ko1@atdot.net>
-
- * lib/debug.rb: as wanabe-san pointed out,
- set_trace_func should be completely final task in debug.rb.
- Bug #847 [ruby-core:20449]
-
-Fri Jan 16 00:27:03 2009 Koichi Sasada <ko1@atdot.net>
-
- * vm.c (rb_vm_inc_const_missing_count, ruby_vm_const_missing_count):
- added.
-
- * vm_insnhelper.h: ditto.
-
- * variable.c (rb_const_get_0), insns.def: Constants should not be
- cached if const_missing is called. [ruby-core:21059] [Bug #967]
-
- * bootstraptest/test_class.rb: add a test.
-
-Fri Jan 16 00:25:09 2009 Koichi Sasada <ko1@atdot.net>
-
- * common.mk: btest-ruby should receive option with OPTS.
-
-Fri Jan 16 00:21:10 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/Makefile.sub ($(INSNS), node_name.inc, known_errors.inc,
- miniprelude.c, newline.c): shouldn't copy when $(srcdir) != ".", too.
- (this is a workaround. we need more strict check.)
-
- * win32/Makefile.sub ($(INSNS)): shouldn't remove BASERUBY.
-
-Fri Jan 16 00:19:55 2009 Koichi Sasada <ko1@atdot.net>
-
- * gc.c (gc_with_gvl): suppress warnings.
-
-Thu Jan 15 20:44:30 2009 Tanaka Akira <akr@fsij.org>
-
- * tool/file2lastrev.rb: RUBY_REVISION must be an integer.
-
-Thu Jan 15 15:55:31 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * encoding.c (enc_set_default_encoding): should not treat US-ASCII
- special here. a patch from Yui NARUSE in [ruby-dev:37769].
- [ruby-dev:37699]
-
-Thu Jan 15 14:27:27 2009 Martin Duerst <duerst@it.aoyama.ac.jp>
-
- * LEGAL: Added information for missing/langinfo.c
-
-Thu Jan 15 14:17:57 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (stmt): explicit error for "Object::Far += foo 1" just
- as "Object::Far += 1".
-
- * parse.y (command): moved return/break/next from command_call for
- better error message.
-
- * parse.y (call_args): void value check added.
-
-Thu Jan 15 13:10:58 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/Makefile.sub (COMPILERFLAG): for enc/trans/gb18030.c.
-
-Thu Jan 15 13:10:09 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in, win32/Makefile.sub (MISSING): added langinfo on mingw
- and mswin.
-
- * encoding.c (rb_locale_charmap): use environments on mingw and mswin.
-
- * missing/langinfo.c (nl_langinfo_codeset): MS-Windows Japanese
- environment uses Windows-31J derived from Shift_JIS, not EUC-JP.
-
-Thu Jan 15 12:10:39 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/Makefile.sub ($(INSNS), node_name.inc, known_errors.inc,
- miniprelude.c, newline.c): copy only when $(srcdir) != pwd.
-
-Thu Jan 15 11:40:44 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * io.c (pipe_open): revert a part of previous commit. it may be a
- mistake.
-
-Thu Jan 15 10:45:52 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * symbian/README.SYMBIAN: symbian support added. great appreciate
- to <alexandre.zavorine at symbian.com>.
-
-Thu Jan 15 00:06:12 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * enc/trans/gb18030.trans: get rid of a 1.9 feature for cross
- compile. [ruby-core:21345]
-
-Wed Jan 14 23:57:28 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * encoding.c (rb_locale_charmap): fallback to codepage if no
- locale is found. [ruby-core:21110]
-
- * missing/langinfo.c (nl_langinfo_codeset): returns NULL if no
- locale is found.
-
-Wed Jan 14 22:38:30 2009 Tanaka Akira <akr@fsij.org>
-
- * gc.c (negative_size_allocation_error_with_gvl): abolish a warning.
- (negative_size_allocation_error): ditto.
-
- * ext/openssl/ossl.c (ossl_raise): ditto.
-
-Wed Jan 14 20:05:05 2009 Martin Duerst <duerst@it.aoyama.ac.jp>
-
- * enc/trans/gb18030.trans, gb18030-tbl.rb:
- new Chinese GB18030 transcoding (from Yoshihiro Kambayashi)
-
- * test/ruby/test_transcode.rb: added tests for the above
- (from Yoshihiro Kambayashi)
-
- * transcode_data.h, transcode.c, tool/transcode_tblgen.rb:
- added support for GB18030-specific 4-byte sequences
- (with Yoshihiro Kambayashi)
-
-Wed Jan 14 16:16:19 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/curses/extconf.rb: check ncursesw earlier than ncurses to
- support UTF-8 strings. non UTF-8 strings should be converted
- explicitly. [ruby-core:21094]
-
-Wed Jan 14 14:42:30 2009 TAKANO Mitsuhiro (takano32) <tak@no32.tk>
-
- * cont.c: fix prototype declare of register_stack_extend
-
-Wed Jan 14 13:19:21 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/win32.c (rb_w32_aspawn): should not escape with caret
- unless using cmd.exe.
-
-Wed Jan 14 13:09:00 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/socket/extconf.rb (gai_strerror): checks if available and if
- returns const pointer.
-
- * ext/socket/getaddrinfo.c (gai_strerror): defines only if non
- available. [ruby-core:21328]
-
-Wed Jan 14 12:39:16 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (rb_io_wait_readable, rb_io_wait_writable): need rb_fd_ptr.
-
- * io.c (appendline): reformed.
-
- * io.c (rb_io_s_pipe): reduced nest of rb_ensure of main block.
-
-Tue Jan 13 22:56:57 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/addrinfo.h (AI_NUMERICSERV): defined.
- (AI_MASK): add AI_NUMERICSERV.
-
- * ext/socket/getaddrinfo.c (getaddrinfo): support AI_NUMERICSERV.
-
-Tue Jan 13 21:45:53 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * lib/ostruct.rb (OpenStruct#inspect): fixed the recursion check.
- Patch by Kornelius Kalnbach. [ruby-core:20992].
-
- * test/ostruct/test_ostruct.rb: test for inspect.
- Patch by Kornelius Kalnbach. [ruby-core:20992].
-
-Tue Jan 13 21:44:30 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * io.c (io_reopen, rb_io_init_copy): should register fptr to pipe_list
- when copying pipe fptr.
-
-Tue Jan 13 21:38:07 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/socket.c (rb_getaddrinfo): use getaddrinfo with GVL if
- getaddrinfo.c/getnameinfo.c is used. They are not thread safe
- because gethostbyname/gethostbyaddr is used.
- (rb_getnameinfo): ditto.
-
- * extconf.rb: define GETADDRINFO_EMU if getaddrinfo.c/getnameinfo.c is
- used.
-
-Tue Jan 13 21:28:14 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * object.c (rb_obj_not_match): rdoc.
- Patch by Kornelius Kalnbach. [ruby-core:20991]
-
-Tue Jan 13 18:21:44 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * io.c (rb_io_close_read): call rb_io_fptr_cleanup() instead of
- fptr_finalize() because the fptr has special finalizer if it is a
- pipe. [ruby-dev:37757] (3)
-
-Tue Jan 13 18:19:49 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * io.c (rb_io_initialize): workaround for Windows. [ruby-dev:37686]
- (also see [ruby-dev:37721])
-
-Tue Jan 13 17:29:02 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * enc/trans/make_transdb.rb (converters): should not depend on the
- hash order for cross compile.
-
-Tue Jan 13 16:39:11 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * include/ruby/intern.h, thread.c, win32/Makefile.sub (rb_fdset_t,
- rb_fd_init, rb_fd_term, rb_fd_zero, rb_fd_set, rb_fd_clr, rb_fd_isset,
- rb_fd_select, rb_fd_ptr, rb_fd_max, HAVE_RB_FD_INIT): new type,
- functions, and macros for Windows.
-
- * win32/win32.c (extract_fd, rb_w32_select): use rb_fdset_t to expand
- fd_array if needed. [ruby-core:19946]
-
- * win32/win32.c (copy_fd): new function for rb_w32_select().
-
-Tue Jan 13 12:31:54 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * tool/file2lastrev.rb (get_revisions): fixes problem with
- svn on cygwin. [ruby-dev:37702].
- Patch by Kouhei Sutou.
-
-Tue Jan 13 11:58:04 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * lib/irb/input-method.rb: IRB did not prompt for MSwin32.
- [ruby-dev:37686].
- Patch by arton <artonx AT yahoo.co.jp>.
-
-Tue Jan 13 12:10:42 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/socket/{getaddrinfo,getnameinfo}.c: need to include ws2tcpip.h
- on Windows.
-
-Tue Jan 13 09:49:49 2009 Martin Duerst <duerst@it.aoyama.ac.jp>
-
- * ext/socket/socket.c: removed warning about unused variable 'rai'.
-
-Tue Jan 13 03:07:28 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * instruby.rb: require "tool/mdoc2man.rb" before chdir if needed.
-
-Tue Jan 13 02:54:54 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/socket/extconf.rb: use headers instead of "netdb.h" in checking
- getnameinfo() and getaddrinfo() because Windows doesn't have it.
- [ruby-dev:37757] (1)
-
- * ext/socket/sockport.h (SA_LEN): use sockaddr_in6 when defined AF_INET6
- if INET6 is not defined. winsock2's getaddrinfo() returns
- sockaddr_in6 if ipv6 is available.
-
-Tue Jan 13 02:21:43 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/win32.c (internal_cmd_match): extracted from
- is_internal_cmd.
-
- * win32/win32.c (argv_size, join_argv): escapes redirection, pipe
- and caret punctuations with carets.
-
- * win32/win32.c (rb_w32_aspawn): ditto, and redirections and pipe
- have no meanings.
-
-Tue Jan 13 02:07:38 2009 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb: use Encoding.find("locale") instead of
- Encoding.locale_charmap
-
-Tue Jan 13 00:57:56 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/socket.c (sock_s_unpack_sockaddr_in): check too short
- sockaddr.
- (sock_s_unpack_sockaddr_un): ditto.
-
-Mon Jan 12 23:55:19 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/socket.c (addrinfo_ip_unpack): new method
- AddrInfo#ip_unpack.
- (addrinfo_unix_path): new method AddrInfo#unix_path.
- (Init_socket): define above methods.
-
-Mon Jan 12 23:31:42 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/socket.c (IS_IP_FAMILY): defined.
- (addrinfo_ip_p): use it.
-
-Mon Jan 12 17:23:05 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/test/unit/assertions.rb (assert_nothing_raised): removes the
- current trace to get rid of an issue of MiniTest::Unit#location.
-
-Mon Jan 12 16:49:20 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * instruby.rb (install): erased a garbage.
-
-Mon Jan 12 16:45:28 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/win32.c (open_dir_handle): extracted from rb_w32_opendir.
-
- * win32/win32.c (winnt_stat): gets rid of strange behavior of
- GetFileAttributes(). [ruby-core:21269]
-
-Mon Jan 12 12:43:55 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * instruby.rb (parse_args, install): added --strip option.
-
- * instruby.rb (install_recursive): skips the directory if matched
- to a no_install pattern ending with a file separator.
-
-Mon Jan 12 12:33:56 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/mkconstants.rb: don't use bytesize because 1.9 dependent.
- [ruby-core:21266]
-
-Mon Jan 12 11:59:19 2009 Koichi Sasada <ko1@atdot.net>
-
- * gc.c (ruby_xmalloc, ruby_xrealloc, ruby_xfree):
- enable to use them without GVL.
- if GC is invoked, acquire GVL during GC.
- if NoMemoryError is raised, acquire GVL and raise it.
-
-Mon Jan 12 10:39:19 2009 Koichi Sasada <ko1@atdot.net>
-
- * thread.c: fix comment (terminology: Global VM Lock).
-
- * thread.c (blocking_region_begin, blocking_region_end):
- save and clear th->blocking_region_buffer.
-
- * thread.c (rb_thread_call_with_gvl): check if it has GVL.
-
- * thread.c (ruby_thread_has_gvl_p): added.
-
- * vm_core.h: add decls.
-
-Mon Jan 12 10:21:11 2009 Koichi Sasada <ko1@atdot.net>
-
- * eval.c: remove unused decl.
-
-Sun Jan 11 16:53:14 2009 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-
- * lib/erb.rb (PercentScanner): remove PercentScanner. fixed % after
- %> bug. [ruby-dev:37751] [Bug #997]
-
- * test/erb/test_erb.rb: ditto
-
-Sun Jan 11 09:53:01 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/socket/mkconstants.rb (c_str): get rid of a 1.9 feature for
- cross compile. [ruby-core:21243]
-
-Sun Jan 11 09:47:30 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * hash.c (rb_hash_s_create): set nil as the value if assoc length
- is not enough. [ruby-core:21249]
-
-Sat Jan 10 21:17:28 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/mkconstants.rb: don't generate unintended newlines.
-
-Sat Jan 10 20:50:02 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/mkconstants.rb: refactored to nest properly in statically
- and dynamically.
-
-Sat Jan 10 20:26:17 2009 Tanaka Akira <akr@fsij.org>
-
- * version.h: make version string succinct:
- "ruby 1.9.1p5000 (2009-01-10 trunk 21414) [i686-linux]".
-
-Sat Jan 10 19:05:13 2009 Koichi Sasada <ko1@atdot.net>
-
- * cont.c (cont_restore_1): should not be inlined.
-
-Fri Jan 9 21:52:47 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/socket.c (sock_define_const): use INT2NUM.
-
-Fri Jan 9 15:40:07 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/socket/mkconstants.rb: define macro if default_value is passed.
-
-Fri Jan 9 13:20:08 2009 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb: rescue abnormal Encoding.locale_charmap value.
-
-Fri Jan 9 12:29:46 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (test-sample), rubytest.rb: use runruby.rb
-
-Fri Jan 9 10:40:52 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/ruby/test_process.rb (TestProcess::MANDATORY_ENVS): some
- platforms need environments for shared objects.
-
-Thu Jan 8 23:19:38 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/socket.c (bsock_shutdown): accept symbol/string as how.
- (shutdown_how_arg): new function.
-
- * ext/socket/mkconstants.rb: generate shutdown_how_to_int.
-
-Thu Jan 8 23:16:37 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * instruby.rb: easy code contains fewer bugs.
-
-Thu Jan 8 22:59:30 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/mkconstants.rb (gen_name_to_int_func): generate
- name_to_int functions, not only body.
-
-Thu Jan 8 22:44:10 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/socket.c: don't use AI_NUMERICSERV for platforms which
- not define it as old Windows.
- [ruby-dev:37736]
-
-Thu Jan 8 17:32:51 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * instruby.rb: should not depend on a library which does not exist
- in 1.8.
-
-Thu Jan 8 07:52:55 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/socket.c (init_unix_addrinfo): don't return a value.
-
-Thu Jan 8 07:30:52 2009 Tanaka Akira <akr@fsij.org>
-
- * lib/open-uri.rb (OpenURI.redirectable?): reverted https redirection.
-
-Thu Jan 8 00:31:58 2009 Tanaka Akira <akr@fsij.org>
-
- * lib/test/unit/assertions.rb (assert_no_match): don't count up as two
- assertions.
-
-Thu Jan 8 00:26:35 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/socket.c (addrinfo_getnameinfo): use NI_DGRAM if socktype
- is SOCK_DGRAM.
-
-Thu Jan 8 00:16:22 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/socket.c (host_str): add flags_ptr argument to specify
- AI_NUMERICHOST if host is numeric form.
- (port_str): add flags_ptr argument to specify AI_NUMERICSERV if port
- is numeric form.
-
-Wed Jan 7 22:24:12 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/socket.c (rb_cAddrInfo): new class AddrInfo.
- (s_recvfrom): return AddrInfo as address.
- (s_recvfrom_nonblock): ditto.
- (sock_accept): ditto.
- (sock_accept_nonblock): ditto.
- (sock_sysaccept): ditto.
- (bsock_send): accept AddrInfo as address argument.
- (sock_connect): ditto.
- (sock_connect_nonblock): ditto.
- (sock_bind): ditto.
- (sock_s_unpack_sockaddr_in): ditto.
- (sock_s_unpack_sockaddr_un): ditto.
- (bsock_local_address): new method BasicSocket#local_address.
- (bsock_remote_address): new method BasicSocket#remote_address.
- (addrinfo_initialize): new method AddrInfo#initialize.
- (addrinfo_inspect): new method AddrInfo#inspect.
- (addrinfo_afamily): new method AddrInfo#afamily.
- (addrinfo_pfamily): new method AddrInfo#pfamily.
- (addrinfo_socktype): new method AddrInfo#socktype.
- (addrinfo_protocol): new method AddrInfo#protocol.
- (addrinfo_to_sockaddr): new method AddrInfo#to_sockaddr.
- (addrinfo_canonname): new method AddrInfo#canonname.
- (addrinfo_ip_p): new method AddrInfo#ip?.
- (addrinfo_ipv4_p): new method AddrInfo#ipv4?.
- (addrinfo_ipv6_p): new method AddrInfo#ipv6?.
- (addrinfo_unix_p): new method AddrInfo#unix?.
- (addrinfo_getnameinfo): new method AddrInfo#getnameinfo.
- (addrinfo_s_getaddrinfo): new method AddrInfo.getaddrinfo.
- (addrinfo_s_tcp): new method AddrInfo.tcp.
- (addrinfo_s_udp): new method AddrInfo.udp.
- (addrinfo_s_unix): new method AddrInfo.unix.
- (Init_socket): define new class and methods.
- (sock_getaddrinfo): apply socktype hack regardless of ai_flags.
- (addrinfo_new): defined.
- (get_afamily): ditto.
- (fd_socket_addrinfo): ditto.
- (io_socket_addrinfo): ditto.
- (SockAddrStringValue): ditto.
- (SockAddrStringValuePtr): ditto.
- (sockaddr_string_value): ditto.
- (sockaddr_string_value_ptr): ditto.
- (rb_addrinfo_t): ditto.
- (addrinfo_mark): ditto.
- (addrinfo_free): ditto.
- (addrinfo_s_allocate): ditto.
- (IS_ADDRINFO): ditto.
- (check_addrinfo): ditto.
- (get_addrinfo): ditto.
- (alloc_addrinfo): ditto.
- (init_addrinfo): ditto.
- (addrinfo_new): ditto.
- (call_getaddrinfo): ditto.
- (init_addrinfo_getaddrinfo): ditto.
- (make_inspectname): ditto.
- (addrinfo_firstonly_new): ditto.
- (addrinfo_list_new): ditto.
- (init_unix_addrinfo): ditto.
- (ai_get_afamily): ditto.
-
- * ext/socket/mkconstants.rb: generate intern_protocol_family,
- intern_socktype and intern_ipproto.
-
- [ruby-dev:37692]
-
-Wed Jan 7 22:13:03 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * instruby.rb (man, gem): fixed errors.
-
-Wed Jan 7 17:14:40 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * instruby.rb: use installed libraries. [ruby-core:21006]
-
- * instruby.rb (gem), lib/rubygems/defaults.rb (Gem.default_dir):
- use version invariant configuration.
-
-Tue Jan 6 19:09:51 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * cont.c (cont_restore_0): streamlined to ensure O(1) time. based on
- a patch by Brent Roman <brent AT mbari.org>.
-
-Tue Jan 6 00:34:25 2009 Tanaka Akira <akr@fsij.org>
-
- * io.c (rb_close_before_exec): more heuristics to detect maximum fd.
-
-Mon Jan 5 17:59:43 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (cygwin): needs properly implemented nl_langinfo().
- [ruby-core:21110]
-
- * missing/langinfo.c: added as suggested at [ruby-core:21015], from
- http://www.cl.cam.ac.uk/~mgk25/ucs/langinfo.c.
-
- * missing/langinfo.c (nl_langinfo_0): fixed typos for SJIS.
-
-Mon Jan 5 17:38:40 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * encoding.c (rb_locale_charmap): use GetConsoleCP() instead of
- GetACP() because external encoding should be console's one.
-
- * encoding.c (rb_filesystem_encoding): use GetOEMCP() instead of
- GetACP() because VFAT/FAT32 uses OEM CP.
-
-Mon Jan 5 16:26:48 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * encoding.c (rb_filesystem_encoding): use ANSI codepage for file
- system on cygwin.
-
- * encoding.c (rb_locale_charmap): reverted. [ruby-core:21110]
-
-Mon Jan 5 16:15:00 2009 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * ext/curses/curses.c (free_window): use xfree instead of free.
- [ruby-dev:37200]
-
-Mon Jan 5 15:49:45 2009 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * ext/gdbm/gdbm.c (rb_gdbm_fetch): remove needless cast.
-
-Mon Jan 5 12:52:08 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/win32.c (init_env): use user profile folder than personal
- folder.
-
-Mon Jan 5 08:41:13 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * file.c (rb_file_s_stat): need type check for non string values.
- [ruby-dev:37673] fix: #964
-
- * file.c (rb_file_s_size, rb_file_s_atime, rb_file_s_mtime,
- rb_file_s_ctime, rb_f_test): ditto.
-
-Mon Jan 5 08:17:56 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * range.c (range_step): should not add up errors on loops.
- [ruby-dev:37691]
-
-Mon Jan 5 07:58:37 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * random.c (rb_f_srand): update RDoc. [ruby-core:21113]
-
-Mon Jan 5 06:39:56 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * range.c (range_max): max value from ... not defined for non
- Integer Numeric end values. [ruby-dev:37690] fix: #974
-
-Sun Jan 4 22:37:19 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/socket.c (rb_getaddrinfo): defined for address lookup without GVL.
- (struct getaddrinfo_arg): defined.
- (nogvl_getaddrinfo): defined.
- (rb_getnameinfo): defined for name lookup without GVL.
- (getnameinfo_arg): defined.
- (nogvl_getnameinfo): defined.
-
-Sun Jan 4 18:10:10 2009 Martin Duerst <duerst@it.aoyama.ac.jp>
-
- * enc/trans/gbk.trans, gbk-tbl.rb:
- new Chinese GBK transcoding (from Yoshihiro Kambayashi)
-
- * test/ruby/test_transcode.rb: added tests for the above
- (from Yoshihiro Kambayashi)
-
-Sun Jan 4 17:55:55 2009 Martin Duerst <duerst@it.aoyama.ac.jp>
-
- * test/ruby/test_transcode.rb: added tests for GB2312
- (from Yoshihiro Kambayashi)
-
- * enc/trans/chinese.trans: set valid byte patterns for
- GB2312 and GB12345
-
-Sun Jan 4 17:39:39 2009 Martin Duerst <duerst@it.aoyama.ac.jp>
-
- * enc/trans/big5.trans, big5-tbl.rb:
- new Chinese Big5 transcoding (from Yoshihiro Kambayashi)
-
- * test/ruby/test_transcode.rb: added tests for the above
- (from Yoshihiro Kambayashi)
-
-Sun Jan 4 17:07:45 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/rubygems.rb (Gem.set_home, Gem.set_paths): should not create
- directories stealthily. [ruby-core:20990]
-
- * lib/rubygems.rb (Gem.find_home): expand_path deals with platform
- dependent environments.
-
- * lib/rdoc/ri/paths.rb (RDoc::HOMEDIR): ditto.
-
- * instruby.rb (gem): creates gem directories at installation.
-
-Sun Jan 4 15:41:37 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * encoding.c (rb_filesystem_encoding, rb_locale_charmap): uses
- codepage on cygwin. [ruby-core:20994]
-
-Sun Jan 4 11:58:43 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * numeric.c (ruby_float_step): extracted from num_step().
-
- * range.c (range_step): uses ruby_float_step() for float range.
- [ruby-dev:37691]
-
-Sun Jan 4 11:11:31 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/extmk.rb (extmake): does not use both of makefile.rb and
- extconf.rb at the same time.
-
- * lib/mkmf.rb (DLLIB): depends on Makefile. [ruby-core:21096]
-
-Sun Jan 4 09:27:41 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/socket/socket.c (constant_arg): constified.
-
- * ext/socket/socket.c (optname_arg): cygwin does not have
- IPPROTO_IPV6.
-
- * ext/socket/mkconstants.rb (ipv6_optname_to_int): ditto.
-
-Sun Jan 4 04:33:14 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/socket.c: redundant #ifdef removed.
-
-Sun Jan 4 03:30:18 2009 Tanaka Akira <akr@fsij.org>
-
- * io.c (maygvl_copy_stream_wait_read): renamed to add prefix to
- express GVL state.
- (nogvl_copy_stream_wait_write): ditto.
- (nogvl_copy_stream_sendfile): ditto.
- (maygvl_copy_stream_read): ditto.
- (nogvl_copy_stream_write): ditto.
- (nogvl_copy_stream_read_write): ditto.
- (nogvl_copy_stream_func): ditto.
-
-Sun Jan 4 00:30:50 2009 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-
- * lib/erb.rb: merged r20850, r17881, r16811, r16763, r16748, r15829,
- r15794 and r15698 from ruby_1_8.
-
- * test/erb/test_erb.rb: ditto.
-
-Sat Jan 3 22:24:36 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * common.mk, Makefile.in, win32/Makefile.sub (INSNS): move the macro
- definition from common.mk to {Makefile.in,win32/Makefile.sub}.
- [ruby-dev:37678]
-
-Sat Jan 3 15:30:09 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/trans/chinese.trans: added for transcoding EUC-CN and GB12345.
-
- * enc/trans/GB/: ditto.
-
-Sat Jan 3 15:26:30 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/trans/euc-cn.c: renamed from gb2312.c because GB2312 is
- the name of a CSS. it's encoding name is "EUC-CN".
-
-Sat Jan 3 03:00:42 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * common.mk, Makefile.in, win32/Makefile.sub ($(INSNS), node_name.inc,
- known_errors.inc, miniprelude.c, newline.c): move rules from common.mk
- to {Makefile.in,win32/Makefile.sub} for nmake.
- [ruby-core:20993]
-
-Fri Jan 2 23:51:41 2009 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_sleep.rb (test_sleep_5sec): stop gc.
-
-Fri Jan 2 23:36:10 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/socket.c: don't apply socktype hack [ruby-core:184] for
- sock_s_getaddrinfo.
- (sock_getaddrinfo): add socktype_hack argument.
- (sock_addrinfo): call sock_getaddrinfo with socktype_hack.
- (sock_s_getaddrinfo): call sock_getaddrinfo without socktype_hack.
- [ruby-dev:37674]
-
-Fri Jan 2 23:33:38 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * include/ruby/missing.h, sprintf.c: get rid of a warning of VC++.
-
-Fri Jan 2 22:25:46 2009 Yusuke Endoh <mame@tsg.ne.jp>
-
- * process.c: use sigaction instead of sigset. [ruby-core:21021]
-
-Fri Jan 2 22:22:04 2009 Yusuke Endoh <mame@tsg.ne.jp>
-
- * bootstraptest/test_proc.rb: suppress error message.
-
-Fri Jan 2 22:20:46 2009 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_process.rb (test_wait_and_sigchild): remove debug
- output.
-
-Fri Jan 2 17:45:19 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/mkconstants.rb: rename family_to_str to intern_family.
- it returns ID now.
-
- * ext/socket/socket.c (ipaddr): use intern_family.
-
-Fri Jan 2 17:20:31 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/mkconstants.rb: use ID in the values of
- family_to_str_hash. family_to_str returns a VALUE.
-
- * ext/socket/socket.c (ipaddr): follow family_to_str change.
-
-Fri Jan 2 17:01:51 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/mkconstants.rb: refactored to gather stringizer
- description.
-
-Fri Jan 2 15:30:57 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/mkconstants.rb: make common prefix optional.
-
-Fri Jan 2 14:59:52 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/mkconstants.rb: use hash for family_to_str to avoid
- linear search. lenp argument removed.
-
- * ext/socket/socket.c (ipaddr): call family_to_str without lenp
- argument.
-
-Fri Jan 2 14:33:12 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/mkconstants.rb (gen_int_to_name): don't compare constants
- in preprocessor because the constants may be enum.
-
-Fri Jan 2 14:11:07 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/mkconstants.rb (gen_int_to_name): add lenp argument.
-
- * ext/socket/socket.c (ipaddr): follow argument change.
-
-Fri Jan 2 10:20:24 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/singleton.rb: fix documentation. [ruby-core:21038]
-
-Fri Jan 2 06:43:58 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * signal.c (rb_signal_buff_size): defined for check whether signal
- is in the buffer or not.
-
- * thread_pthread.c (thread_timer): don't exit the loop when signal
- is in the buffer. [ruby-dev:37637]
-
-Fri Jan 2 04:40:00 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/mkconstants.rb: check duplicates.
-
-Fri Jan 2 02:39:08 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/socket.c (optname_arg): defined.
- (bsock_setsockopt): use optname_arg.
- (bsock_getsockopt): ditto.
-
- * ext/socket/mkconstants.rb: generate so_optname_to_int,
- ip_optname_to_int, ipv6_optname_to_int, tcp_optname_to_int and
- udp_optname_to_int.
- more constants.
-
-Fri Jan 2 02:08:36 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/socket.c (constant_arg): extracted from family_arg.
- (family_arg): use constant_arg.
- (socktype_arg): ditto.
- (level_arg): ditto.
-
-Fri Jan 2 01:15:11 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/socket.c (level_arg): defined.
- (bsock_setsockopt): use level_arg.
- (bsock_getsockopt): ditto.
-
- * ext/socket/mkconstants.rb: generate level_to_int.
-
-Fri Jan 2 00:58:40 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/socket.c (family_arg): accept symbols as well.
- (socktype_arg): ditto.
-
-Fri Jan 2 00:49:44 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/socket.c (sock_s_getaddrinfo): use socktype_arg.
-
-Fri Jan 2 00:12:27 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/socket.c (family_arg): extracted from
- setup_domain_and_type.
- (socktype_arg): ditto.
- (udp_init): use family_arg.
- (sock_s_gethostbyaddr): ditto.
- (sock_s_getaddrinfo): ditto.
- (sock_s_getnameinfo): ditto.
-
-Thu Jan 1 22:27:55 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * spec/default.mspec: fix for builddir != srcdir
-
- * Makefile.in: ditto.
-
-Thu Jan 1 21:26:05 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/socket.c (sock_s_getnameinfo): use family_to_int.
-
-Thu Jan 1 21:08:34 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/mkconstants.rb: check all alias possibility.
-
-Thu Jan 1 20:59:55 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/mkconstants.rb: more possible aliases.
-
-Thu Jan 1 20:54:02 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/mkconstants.rb: AF_ISO and AF_OSI may be aliased.
-
-Thu Jan 1 20:50:09 2009 URABE Shyouhei <shyouhei@ruby-lang.org>
-
- * process.c (before_exec): it makes no sense for a conditional
- expression to return a void value.
-
-Thu Jan 1 20:47:09 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/socket.c (sock_s_getaddrinfo): use family_to_int.
-
-Thu Jan 1 20:17:47 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/socket.c: include constants.h at top.
-
-Thu Jan 1 19:53:33 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/mkconstants.rb: add valp argument for family_to_int and
- socktype_to_int.
-
- * ext/socket/socket.c (setup_domain_and_type): use valp argument.
-
-Thu Jan 1 19:36:57 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/mkconstants.rb: generate family_to_str.
-
- * ext/socket/socket.c (ipaddr): use family_to_str.
-
-Thu Jan 1 17:37:12 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/mkconstants.rb: generate socktype_to_int.
-
- * ext/socket/socket.c (setup_domain_and_type): use socktype_to_int.
-
-Thu Jan 1 17:26:47 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/socket.c (setup_domain_and_type): initialize ptr.
-
-Thu Jan 1 17:01:50 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/mkconstants.rb: refine family_to_int.
-
-Thu Jan 1 16:48:07 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/mkconstants.rb: generate family_to_int().
-
- * ext/socket/socket.c (setup_domain_and_type): use family_to_int.
-
-Thu Jan 1 15:08:46 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * tool/file2lastrev.rb: supports git repositories which are cloned
- from a git-svn gateway.
- Patch by Hongli Lai. [ruby-core:21020]
-
-Thu Jan 1 16:08:11 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/mkconstants.rb: generate init_constants function.
-
- * ext/socket/socket.c (Init_socket): call init_constants.
-
-Thu Jan 1 16:03:04 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/mkconstants.rb (Socket::AF_INET6): moved from socket.c.
- (Socket::PF_INET6): ditto.
-
-Thu Jan 1 15:27:07 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/mkconstants.rb: use erb.
-
-Thu Jan 1 15:07:56 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/mkconstants.rb: add -o option.
-
- * ext/socket/depend: use mkconstants.rb with -o option.
-
-Thu Jan 1 07:42:36 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/singleton.rb: fix indentation of RDoc text. [ruby-core:21029]
-
-Thu Jan 1 07:16:44 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * Makefile.in (distclean-ext, realclean-ext): use EXTS as default.
-
- * win32/Makefile.sub (distclean-ext, realclean-ext): try to remove ext
- directory.
-
-Thu Jan 1 06:56:28 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * tool/file2lastrev.rb: unset PWD.
-
-Wed Dec 31 23:37:17 2008 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/socket.c (sock_s_socketpair): yield if a block is given.
- (io_call_close): defined.
- (io_close): defined.
- (pair_yield): defined.
-
-Wed Dec 31 19:35:57 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * spec/README: follows the change of directory structure in rubyspec.
-
- * spec/default.mspec: ditto. Also follows change of mspec command.
-
- * Makefile.in: ditto.
-
-Wed Dec 31 17:16:46 2008 Tanaka Akira <akr@fsij.org>
-
- * ext/openssl/ossl_ssl.c (ossl_ssl_read_internal): show openssl error
- code in EWOULDBLOCK error.
-
-Wed Dec 31 15:45:18 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (copy_stream_body): don't check to_io because
- Zlib::GzipWriter#to_io returns the underlying IO.
-
-Wed Dec 31 14:52:33 2008 Tanaka Akira <akr@fsij.org>
-
- * ext/openssl/ossl_digest.c (GetDigestPtr): use StringValueCStr
- instead of STR2CSTR.
-
- * ext/openssl/ossl_pkey_ec.c (ossl_ec_key_initialize): ditto.
- (ossl_ec_group_initialize): ditto.
-
-Wed Dec 31 14:12:35 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (rb_to_float): replaced by to_flo definition from
- math.c [ruby-dev:37668]
-
- * math.c (Need_Float): use rb_to_float().
-
-Wed Dec 31 13:49:06 2008 Tanaka Akira <akr@fsij.org>
-
- * ext/openssl/lib/openssl/buffering.rb (Buffering#read_nonblock):
- implemented.
-
- * ext/openssl/ossl_ssl.c (rb_sys_fail_path): removed.
- (fcntl.h): don't include.
- (ossl_ssl_read_internal): defined.
- (ossl_ssl_read): use ossl_ssl_read_internal.
- (ossl_ssl_read_nonblock): use ossl_ssl_read_internal.
- (Init_ossl_ssl): define sysread_nonblock, instead of read_nonblock.
-
-Wed Dec 31 00:27:54 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (rb_to_float): prohibit conversion from nil to float.
- [ruby-dev:37663]
-
- * pack.c (pack_pack): replace all rb_Float() to rb_to_float().
- [ruby-dev:37663]
-
-Tue Dec 30 21:17:00 2008 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/mkconstants.rb: use sock_define_uconst for INADDR_*
- constants because Socket::INADDR_LOOPBACK should be 0x7f000001
- instead of -0xffffff.
-
- * ext/socket/socket.c (sock_define_uconst): defined.
-
-Tue Dec 30 18:23:10 2008 Ryan Davis <ryand-ruby@zenspider.com>
-
- * lib/minitest/*.rb: Imported minitest 1.3.1 r4506.
- * test/minitest/*.rb: ditto.
-
-Tue Dec 30 17:59:59 2008 Martin Duerst <duerst@it.aoyama.ac.jp>
-
- * transcode.c: Minor fixes and tweaks in documentation.
-
-Tue Dec 30 17:03:51 2008 Koichi Sasada <ko1@atdot.net>
-
- * ext/dl/test/test_import.rb: fix a prototype decl.
- pointed out by Takehiro Kubo [ruby-core:20971].
-
-Tue Dec 30 16:56:09 2008 Koichi Sasada <ko1@atdot.net>
-
- * thread.c (rb_thread_blocking_region): add a comment.
-
- * thread.c (rb_thread_call_without_gvl): added as a alias of
- rb_thread_blocking_region().
-
- * thread.c (rb_thread_call_with_gvl): added.
-
- * vm_core.h (rb_thread_t#blocking_region_buffer): added for
- rb_thread_call_with_gvl().
-
-Mon Dec 29 23:41:42 2008 Koichi Sasada <ko1@atdot.net>
-
- * ext/dl/test/test_base.rb: add libc search logic.
- this patch is written by Takehiro Kubo.
- [ruby-core:20963] [Bug #932]
-
- * ext/dl/dl.h: Add ",..." as the last argument.
- this patch is written by Takehiro Kubo.
- Bug #633 [ruby-core:19289]
-
- * ext/dl/lib/dl/stack.rb: add add_padding() to calculate
- alignment. this patch is written by Takehiro Kubo.
- Bug #633 [ruby-core:19289]
-
- * ext/dl/test/test_func.rb: atof()'s return value is double.
- this patch is written by Takehiro Kubo.
- Bug #633 [ruby-core:19289]
-
- * ext/dl/test/test_import.rb:
- - atof()'s return value is double.
- - The types of qsort's second and third argument are size_t.
- - fprintf()'s return value is int.
- this patch is written by Takehiro Kubo.
- Bug #633 [ruby-core:19289]
-
-Mon Dec 29 22:37:17 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * process.c (rb_waitpid): retries waitpid when EINTR.
- [ruby-core:19744].
-
-Mon Dec 29 23:18:52 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * bignum.c (rb_cstr_to_inum): changed an error message.
-
- * complex.c (string_to_c_strict): ditto.
-
- * rational.c (string_to_r_strict): ditto.
-
-Mon Dec 29 22:37:57 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * pack.c (pack_pack): template f should not accept non float
- values. [ruby-dev:37656]
-
- * object.c (rb_to_float): new function to type check floats.
-
-Mon Dec 29 22:27:11 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * random.c (rb_f_rand): type check simplified. strings are no
- longer allowed for argument. [ruby-dev:37655]
-
- * test/ruby/test_rand.rb (TestRand::o.to_int): need override
- to_int.
-
-Mon Dec 29 21:22:31 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * numeric.c: Infinity.numerator returns self. [experimental]
-
- * numeric.c: Infinity.denominator returns 1. [experimental]
-
-Mon Dec 29 20:57:14 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * man/ri.1: new manpage.
-
-Mon Dec 29 20:45:25 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * rational.c: floor, ceil, truncate and round accept an extra
- argument like Float#round. [experimental]
-
-Mon Dec 29 18:24:49 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * Makefile.in (distclean-local): removes Doxyfile and
- run.gdb at distclean'ing.
-
-Mon Dec 29 17:53:24 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * bin/erb: accepts options in more flexible styles.
-
-Mon Dec 29 17:25:17 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * lib/erb.rb (ERB): m17n of ERB. adds rdoc.
- fixes #712. c.f. [ruby-dev:37516].
-
- * lib/erb.rb (ERB::Compiler#compile): recognizes magic comments.
- returns a pair of compiled script and its script encoding.
-
- * lib/erb.rb (ERB#set_eoutvar): make generated scripts return a
- string in correct encoding.
-
- * lib/erb.rb (ERB#def_method): use Kernel#eval for encoding-awareness
- of the evaluated string.
-
- * bin/erb.rb (ERB::Main.run): adds -E and -U options.
- String is no longer Enumerable.
-
- * man/erb.1: new manpage.
-
- * test/erb/test_erb_m17n.rb: new test case for m17n features.
-
-Mon Dec 29 18:02:45 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/io/wait/wait.c (io_nread): returns number of bytes available
- for read. response to feature request #936 in [ruby-core:20917].
-
-Mon Dec 29 17:52:16 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/io/wait/wait.c (io_ready_p): updated to follow RDoc.
-
-Mon Dec 29 16:52:15 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/socket/socket.c (s_recvfrom_nonblock): revert r21162.
-
-Mon Dec 29 16:16:20 2008 Koichi Sasada <ko1@atdot.net>
-
- * vm.c (vm_set_eval_stack, vm_set_main_stack, vm_set_top_stack):
- check stack overflow. [ruby-dev:37646]
-
-Sun Dec 28 18:36:33 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * test/rubygems/test_gem_command.rb
- (test_add_option_overlapping_common_and_local_options):
- follows r21066.
-
-Mon Dec 29 14:50:19 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * Makefile.in (ext-clean): ext-clean always fails.
-
- * ext/dl/ripper/extconf.rb: adds y.output into the clean list.
-
-Mon Dec 29 11:58:39 2008 Koichi Sasada <ko1@atdot.net>
-
- * thread.c (rb_mutex_trylock): return false if Mutex owned
- by current thread. [ruby-core:20943]
-
- * thread.c (rb_mutex_lock): check dead lock (recursive lock) here.
-
- * test/ruby/test_thread.rb: add a test.
-
-Mon Dec 29 10:58:54 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * file.c (rb_get_path): move encoding conversion of file path
- from rb_scan_open_args.
-
- * io.c (rb_scan_open_args): ditto.
-
-Mon Dec 29 07:15:16 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * cont.c: small RDoc fix mentioned from <radek.bulat at gmail.com>
- in [ruby-core:20921].
-
-Mon Dec 29 03:43:25 2008 Koichi Sasada <ko1@atdot.net>
-
- * ruby.c (process_options): set th->base_block only while
- it is needed. [ruby-dev:37634] [Bug #939]
-
- * ruby.c (require_libraries): clear th->base_block before
- require libraries.
-
-Sun Dec 28 21:33:52 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * test/ext/dl/test_base.rb: add BSD's case.
-
-Sun Dec 28 21:09:12 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * ext/dl/lib/dl/import.rb (DL::Importer#sizeof): follows
- a feature change in 1.9.
-
-Sun Dec 28 21:03:07 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * ext/dl/lib/dl/import.rb (DL::Importer#extern): adds filename and
- line number to module_eval'ing for readability of backtrace.
- (DL::Importer#bind): ditto.
-
- * ext/dl/lib/dl/struct.rb (DL::CStructBuilder#create): ditto.
-
-Sun Dec 28 19:11:03 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/Makefile.sub (config.h): do not use snprintf/vsnprintf in
- msvcrt.
-
- * sprintf.c: not force to override snprintf/vsnprintf.
- [ruby-core:20824]
-
-Sun Dec 28 17:21:36 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * test/rubygems/test_ext_configure_builder.rb (test_self_build_fail):
- Extends pattern for FreeBSD's error message.
-
-Sun Dec 28 17:10:13 2008 TAKANO Mitsuhiro (takano32) <tak@no32.tk>
-
- * ext/dl/test/test_dl2.rb: modify strncpy, strcpy, qsort, types.
- Patch by Takehiro Kubo.
- Bug #633 [ruby-core:19289]
- * ext/dl/test/test_base.rb: /lib/libc.so is x86_64 binary in x86_64 architecture.
-
-Sun Dec 28 12:53:10 2008 TAKANO Mitsuhiro (takano32) <tak@no32.tk>
-
- * ext/dl/test/test_base.rb: use libc.dylib when the platform is darwin.
-
-Sun Dec 28 12:24:14 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * thread.c (mutex_free, mutex_unlock): add qualifiers.
-
-Sun Dec 28 10:28:04 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * thread.c (mutex_free): GC thread (main thread) has failed to unlock
- a mutex that is locked by another thread, which makes the mutex
- dangling in keeping_mutexes and causes [BUG] or stuck finally.
- Now unlocking is performed as locking thread.
-
- * thread.c (mutex_unlock, rb_mutex_unlock, rb_mutex_unlock_all):
- mutex_unlock receives a thread.
-
-Sun Dec 28 05:44:44 2008 Ryan Davis <ryand-ruby@zenspider.com>
-
- * lib/minitest/*.rb: Imported minitest 1.3.1 r4505.
- * test/minitest/*.rb: ditto.
-
-Sun Dec 28 00:43:33 2008 Tanaka Akira <akr@fsij.org>
-
- * runruby.rb: refactored to modify ENV as once.
-
-Sat Dec 27 22:41:02 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/rdoc/test_rdoc_info_formatting.rb (setup, teardown): uses
- mktmpdir and removes it after the test.
-
- * test/cgi/test_cgi_session.rb (setup, teardown): ditto.
-
-Sat Dec 27 21:46:10 2008 TAKANO Mitsuhiro (takano32) <tak@no32.tk>
-
- * ext/dl/test/test_base.rb: use lib64 when the architecture is x86_64.
-
-Sat Dec 27 20:26:59 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (rb_w32_argv_size): if an argument is empty, it's size
- is 2, not 0, because it will be converted to "".
-
-Sat Dec 27 19:40:56 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * process.c (after_exec): needs to reset before restart timer
- thread.
-
- * thread.c (thread_start_func_2): stops timer thread if forked in
- the new thread. [ruby-core:19385]
-
- * thread.c (rb_thread_atfork, rb_thread_atfork_before_exec): DRY.
-
-Sat Dec 27 18:25:09 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * vm_eval.c (rb_f_loop): return enumerator if no block given.
- [ruby-list:45747]
-
-Sat Dec 27 17:08:43 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * .gdbinit (dummy_gdb_enums.special_consts): forces to load debug
- info on Mac OS X.
-
- * .gdbinit (rp): added T_ZOMBIE.
-
-Sat Dec 27 16:18:02 2008 Koichi Sasada <ko1@atdot.net>
-
- * eval.c (rb_frame_callee, rb_frame_caller): rb_frame_callee()
- should return method id on current frame.
- add rb_frame_caller() to get method id on parent frame.
- Bug #884 [ruby-dev:37446]
-
- * eval.c (rb_f_method_name): use rb_frame_caller()
- instead of rb_frame_callee().
-
-Sat Dec 27 15:28:12 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (make_econv_exception): show source and destination
- encoding. [ruby-dev:37285]
-
-Sat Dec 27 15:23:38 2008 Koichi Sasada <ko1@atdot.net>
-
- * vm_insnhelper.c (vm_yield_with_cfunc): rename parameter name
- "blockptr" to "blockargptr".
-
-Sat Dec 27 15:15:56 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * common.mk (revision.h): ignores failure of file2lastrev.
-
-Sat Dec 27 15:02:38 2008 Koichi Sasada <ko1@atdot.net>
-
- * ruby.c (process_options): fix to untouch th->mild_compile_error.
- [ruby-dev:37621], [ruby-dev:37620]
-
-Sat Dec 27 14:48:26 2008 Koichi Sasada <ko1@atdot.net>
-
- * iseq.h, iseq.c (rb_iseq_new_main): add a type ISEQ_TYPE_MAIN.
- [ruby-dev:37619]
-
- * compile.c (rb_dvar_defined, ruby_iseq_compile): ditto.
-
- * iseq.c (iseq_data_to_ary, iseq_load): ditto.
-
- * compile.c (iseq_compile_each): fix to check ip->compile_data.
-
-Sat Dec 27 14:29:33 2008 Tanaka Akira <akr@fsij.org>
-
- * lib/open-uri.rb (OpenURI.redirectable?): permit https redirection.
- patch from Roman Shterenzon. [ruby-core:20485]
-
-Sat Dec 27 13:36:55 2008 Koichi Sasada <ko1@atdot.net>
-
- * eval.c (get_errinfo): return th->errinfo value
- if normal errinfo place (dynamic local variable) is not found.
- fixes Bug #732 [ruby-dev:37046].
-
- * bootstraptest/test_proc.rb: add a test.
-
-Sat Dec 27 13:10:43 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * man/irb.1: adds -v, -h, -E and -U.
-
-Sat Dec 27 11:41:45 2008 Koichi Sasada <ko1@atdot.net>
-
- * vm_insnhelper.c (vm_call_method, vm_call_cfunc): use original id instead of
- calling id when NODE_CFUNC or NODE_BMETHOD.
- fixes Bug #632 [ruby-core:19282].
-
- * vm_eval.c (vm_call0, vm_call_super): ditto.
-
- * vm_method.c (rb_add_method, rb_alias): store original id
- in nd_file field of NODE_METHOD.
-
- * test/stringio/test_stringio.rb: add a test.
-
-Sat Dec 27 09:48:54 2008 Koichi Sasada <ko1@atdot.net>
-
- * vm.c (Init_VM): create and define TOPLEVEL_BINDING at first.
-
- * vm.c (vm_set_main_stack, rb_iseq_eval_main): added.
-
- * parse.y (rb_parser_compile_file): fix to check parse_in_eval flag.
-
- * eval.c (ruby_exec_node): use rb_iseq_eval_main()
- instead of rb_iseq_eval().
-
- * iseq.c (rb_iseq_new_main), vm_core.h: added.
- main script (specified by -e or script name) should be run
- under TOPLEVEL_BINDING using Kernel#eval. Above changes
- simulate Kernel#eval behaviour. [ruby-dev:37240]
-
- * compile.c (make_name_for_block): skip iseq except block type.
- this fix is needed for [ruby-dev:37240], and also fixes
- [ruby-dev:35392].
-
-Sat Dec 27 09:14:17 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * cont.c: rdoc for Fiber. patch by Muhammad Ali.
- [ruby-core:20894]
-
-Sat Dec 27 05:38:59 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * process.c (after_fork): ignores a termination request in the
- parent process. [ruby-dev:37447]
-
-Sat Dec 27 01:52:39 2008 James Edward Gray II <jeg2@ruby-lang.org>
-
- * lib/csv.rb: Using a more robust transcoding scheme to produce
- ASCII compatible inspect() messages. [ruby-dev:37591]
-
-Fri Dec 26 18:04:10 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (fptr_finalize): don't allocate objects if noraise.
- (finish_writeconv): add noalloc argument to be able to avoid
- object allocation.
- (finish_writeconv_arg): introduced again.
- (finish_writeconv_sync): follow the above change.
-
-Fri Dec 26 17:04:14 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * lib/irb/input-method.rb (IRB::StdioInputMethod#initialize):
- removed a 'p' for debugging.
-
-Fri Dec 26 15:50:45 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/optparse.rb (OptionParser::List#summarize): gives priority
- to latter switches. [ruby-dev:36692]
-
- * lib/optparse.rb (OptionParser#summarize): do not append
- unnecessary line terminator.
-
-Fri Dec 26 14:01:38 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (fptr_finalize): close the IO object even if finish_writeconv or
- flush is failed.
- (finish_writeconv): don't raise. return errno or exception.
- (finish_writeconv_arg): removed.
- (finish_writeconv_sync): follow finish_writeconv change.
-
- * transcode.c (rb_econv_make_exception): new function.
-
- * include/ruby/encoding.h (rb_econv_make_exception): declared.
-
-Thu Dec 25 20:57:01 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * transcode.c (str_transcode0): set encoding when String#encode was
- given explicit but the same destination and source encoding.
-
-Thu Dec 25 20:01:50 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (rb_io_s_pipe): unused variable removed.
-
-Thu Dec 25 19:35:51 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * transcode.c (sym_ignore): remove useless symbol.
-
-Thu Dec 25 18:36:04 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (pipe_close): removed.
- (pipe_yield): defined.
- (rb_io_s_pipe): use pipe_yield.
-
-Thu Dec 25 17:49:45 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * transcode.c (decorate_convpath): show type of escaping for
- xml_attr_quote or some conversions.
-
-Thu Dec 25 17:06:13 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (rb_io_initialize): check fd validity. [ruby-dev:36646]
-
-Thu Dec 25 16:23:31 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (flush_before_seek): check io_fflush result.
- (rb_io_check_readable): ditto.
- (rb_io_flush): ditto.
- (rb_io_fsync): ditto.
- (remain_size): ditto.
- (rb_io_write_nonblock): ditto.
- (finish_writeconv): ditto.
- (fptr_finalize): ditto.
- (io_reopen): ditto.
- (rb_io_reopen): ditto.
- (copy_stream_body): ditto.
-
-Thu Dec 25 15:54:00 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (io_fflush): flush write buffer without write lock in
- finalizers. [ruby-dev:37572]
-
- * io.c (rb_io_fptr_finalize): clear write lock before finalizing.
-
-Thu Dec 25 15:07:22 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (fptr_finalize): close the IO object even if close(2) is failed.
-
-Thu Dec 25 14:51:43 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * lib/rdoc/parser.rb (RDoc::Parser.binary?): should read in binary mode.
-
-Thu Dec 25 14:32:23 2008 Koichi Sasada <ko1@atdot.net>
-
- * vm_insnhelper.c (vm_method_search): fix control flow bug.
- (commited at r20981)
-
-Thu Dec 25 13:28:20 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * io.c (rb_io_flush): fsync() after buffer is flushed on win32.
- [ruby-core:20043]
-
-Thu Dec 25 13:13:00 2008 Koichi Sasada <ko1@atdot.net>
-
- * vm_insnhelper.c (vm_method_search): return rb_cObject if there is no
- super class. [ruby-dev:37587]
-
- * bootstraptest/test_method.rb: add tests for above.
-
-Thu Dec 25 12:49:12 2008 Koichi Sasada <ko1@atdot.net>
-
- * proc.c (proc_new): should use proc_dup() if block has Proc.
-
- * vm.c (vm_make_proc_from_block): should use rb_cProc for block.
-
- * vm.c (vm_make_proc): add an assertion.
-
- * bootstraptest/test_proc.rb: add a test.
-
-Thu Dec 25 12:44:27 2008 Koichi Sasada <ko1@atdot.net>
-
- * vm_insnhelper.c (vm_yield_with_cfunc): check block has Proc.
-
-Thu Dec 25 05:53:01 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * template/id.h.tmpl, id.h (ruby_method_ids): not depend on if
- token are defined as macros. [ruby-dev:37553]
-
- * template/id.h.tmpl, id.h (ruby_method_ids_check): enclosed in a
- struct.
-
-Thu Dec 25 01:52:34 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread.c (thread_start_func_2): sets native thread key.
-
-Thu Dec 25 01:09:23 2008 TAKAO Kouji <kouji@takao7.net>
-
- * test/readline/test_readline_history.rb: check the encoding that
- is in the Readline::HISTORY.
-
-Thu Dec 25 00:59:06 2008 TAKAO Kouji <kouji@takao7.net>
-
- * test/readline/test_readline_history.rb: did not check the
- encoding that is in the Readline::HISTORY. I will fix it.
-
-Wed Dec 24 22:36:06 2008 Koichi Sasada <ko1@atdot.net>
-
- * error.c, vm_dump.c: change message by rb_bug().
-
-Wed Dec 24 21:57:39 2008 Koichi Sasada <ko1@atdot.net>
-
- * compile.c (iseq_peephole_optimize): fix typo.
-
-Sun Dec 21 13:38:04 2008 Koichi Sasada <ko1@atdot.net>
-
- * vm.c (invoke_block_from_c): fix to point right cfp.
-
- * vm.c (vm_make_proc, vm_make_proc_from_block), vm_core.h:
- remove unused parameter cfp.
-
- * vm_insnhelper.c, proc.c (proc_new): ditto.
-
-Wed Dec 24 20:59:12 2008 Koichi Sasada <ko1@atdot.net>
-
- * error.c (exc_equal): == method should not raise Exception.
- [ruby-dev:37519]
-
- * sample/test.rb: fix test.
-
-Wed Dec 24 20:33:45 2008 Koichi Sasada <ko1@atdot.net>
-
- * vm_insnhelper.c (vm_call_method): use class of method defined
- instead of receiver's class on bmethod. fixes [ruby-core:20786]
-
- * bootstraptest/test_method.rb: add a test for above.
-
- * vm_insnhelper.c (vm_setup_method): remove unused parameter klass.
-
- * vm_insnhelper.h (CALL_METHOD): ditto.
-
- * insns.def, vm_eval.c: ditto.
-
-Wed Dec 24 20:15:50 2008 Koichi Sasada <ko1@atdot.net>
-
- * tool/file2lastrev.rb (get_revisions): fix to ignore end of line.
-
-Wed Dec 24 13:33:38 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (HAVE_LONG_LONG, HAVE_OFF_T): revised for autoconf
- 2.62 or later.
-
-Wed Dec 24 06:29:32 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (OBJDUMP, OBJCOPY): autoconf list is not comma
- separated.
-
- * configure.in (AC_HEADER_STDC, AC_CHECK_HEADERS, AC_CHECK_FUNCS):
- removed duplicated checks.
-
-Wed Dec 24 03:21:21 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * misc/ruby-mode.el: added comment to mention newer version
- bundled with Emacs 23 or later. a patch from Phil Hagelberg
- <phil at hagelb.org> in [ruby-core:20838].
-
-Tue Dec 23 23:49:37 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (rb_io_init_copy): call io_seek only if io_tell succeeds.
-
-Tue Dec 23 22:57:48 2008 Tanaka Akira <akr@fsij.org>
-
- * process.c (rb_fork): don't propagate an error message if error
- buffer not given.
-
-Tue Dec 23 21:55:05 2008 Tanaka Akira <akr@fsij.org>
-
- * process.c (rb_fork): propagate an error message from child to parent.
- (rb_f_exec): show details of error in child process on
- exception.
- (save_redirect_fd): add error message arguments.
- (run_exec_dup2): ditto.
- (run_exec_close): ditto.
- (run_exec_open): ditto.
- (run_exec_dup2_child): ditto.
- (run_exec_pgroup): ditto.
- (run_exec_rlimit): ditto.
- (rb_run_exec_options): ditto.
- (rb_exec): ditto.
- (rb_exec_atfork): ditto.
- (rb_spawn_internal): ditto.
- (rb_spawn): ditto.
- (rb_f_system): follow arguments change.
- (proc_daemon): ditto.
- (rb_f_spawn): show details of error in child process on exception.
-
- * io.c (popen_exec): add error message arguments.
- (pipe_open): show details of error in child process on exception.
-
- * include/ruby/intern.h (rb_run_exec_options): add error message
- arguments.
- (rb_exec): ditto.
- (rb_fork): ditto.
- (rb_spawn): ditto.
-
- * ext/pty/pty.c (chfunc): add error message arguments.
-
-Tue Dec 23 20:28:28 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * io.c: rdoc for File::open and 1.9 feature in file modes.
-
- * transcode.c: rdoc for String#encode
-
-Tue Dec 23 19:51:24 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/win32.c (rb_w32_spawn): deals with quoted commands.
-
-Tue Dec 23 18:44:21 2008 Tanaka Akira <akr@fsij.org>
-
- * strftime.c (rb_strftime): use locale insensitive functions for tr_TR
- locale.
-
-Tue Dec 23 17:38:03 2008 Tanaka Akira <akr@fsij.org>
-
- * lib/test/unit/assertions.rb (assert_equal): show small differences
- for Regexp and Float.
-
-Tue Dec 23 16:49:48 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (rb_w32_spawn): support normal commands with arguments.
-
-Tue Dec 23 16:22:41 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (rb_io_inspect): show fd number if there is no pathname.
-
-Tue Dec 23 15:48:55 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * tool/file2lastrev.rb: shouldn't use single quote in shell's command
- line if you want to support Windows.
-
-Tue Dec 23 15:46:43 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * lib/mathn.rb: Math.sqrt(NaN) should be NaN. [ruby-dev:37537]
-
-Tue Dec 23 15:46:47 2008 Eric Hodel <drbrain@segment7.net>
- * gem_prelude.rb: Match full RubyGems behavior when a gem can't be
- found.
-
-Tue Dec 23 15:36:58 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * tool/file2lastrev.rb: detects vcs directory properly on building
- outside of srcdir. [ruby-dev:37555] [ruby-dev:37561]
-
-Tue Dec 23 15:30:02 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * io.c (pipe_open): need to initialize args.
-
-Tue Dec 23 14:18:14 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * include/ruby/st.h: need to include defines.h because LONG_LONG is
- defined there.
-
-Tue Dec 23 13:52:05 2008 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc/parser/c.rb: Don't coalesce adjacent comment blocks.
- [bug#901]
-
-Tue Dec 23 12:00:00 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (pipe_close): fix coding style. [ruby-dev:37554]
-
-Tue Dec 23 08:10:05 2008 Eric Hodel <drbrain@segment7.net>
-
- * lib/rubygems/installer.rb: Fix documentation. [bug#827]
-
-Tue Dec 23 08:04:58 2008 Eric Hodel <drbrain@segment7.net>
-
- * gem_prelude.rb: Don't remove methods twice. [bug#555]
-
-Tue Dec 23 00:16:48 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * sprintf.c (rb_str_format): fix buffer overflow.
-
-Mon Dec 22 19:31:19 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * common.mk (revision.h): uses tool/file2lastrev.rb to support
- git-svn.
-
- * version.h: changed version string as
- `ruby 1.9.1 (2008-12-22 patchlevel-5000 trunk 20912)
- [i386-darwin9.6.0]'.
-
-Mon Dec 22 16:32:21 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * pack.c (pack_pack): encoding of packed string only from 'm',
- 'M', and 'u' should be US-ASCII. [ruby-dev:37284]
-
- * pack.c (pack_pack): encoding of packed string only from 'U'
- should be UTF-8. also upgrade US-ASCII strings to UTF-8.
-
-Mon Dec 22 15:56:49 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * Doxyfile.in: new file. Template of a configuration file.
- Introduces C-level API reference generation with Doxygen.
-
- * tool/file2lastrev.rb: wrapper script that abstracts subversion
- and git-svn.
-
- * tool/strip-rdoc.rb: filter for preventing doxygen from processing
- rdoc comments.
-
- * configure.in: (Doxyfile): Doxyfile is generated together with
- Makefile.
- (PACKAGE): configuration $(PACKAGE) is necessary for $(docdir).
-
- * instruby.rb: adds a new install target 'capi'
-
- * common.mk (capi): new target that generates C API documents with
- Doxygen.
- (install-capi): new target.
- (pre-install-capi): ditto.
- (do-install-capi): ditto.
- (post-install-capi): ditto.
-
-Mon Dec 22 21:31:11 2008 Tanaka Akira <akr@fsij.org>
-
- * numeric.c (int_ord): Integer#ord implemented.
-
-Mon Dec 22 21:26:12 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (rb_io_s_pipe): IO.pipe can take a block.
- (pipe_close): new function.
-
-Mon Dec 22 21:08:54 2008 Tanaka Akira <akr@fsij.org>
-
- * lib/test/unit/assertions.rb (assert_nothing_raised): increment
- assertion count. [ruby-dev:37480]
-
-Mon Dec 22 19:10:44 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * thread_win32.c (Init_native_thread): need to call
- ruby_thread_set_native() here.
-
-Mon Dec 22 18:00:36 2008 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/tcltklib.c: fix wrong flag value.
-
-Mon Dec 22 15:15:58 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/net/protocol.rb (Net::BufferedIO#rbuf_fill): avoid calling
- read_nonblock in rescue. use retry instead.
-
-Mon Dec 22 14:35:59 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_external_str_new_with_enc): set ASCII-8BIT if
- encoding is US-ASCII and string contains 8bit characters.
-
-Mon Dec 22 12:26:18 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * cygwin/GNUmakefile.in (rubydll.def), win32/mkexports.rb
- (Exports#exports): added VERSION.
-
-Mon Dec 22 12:25:09 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * missing/vsnprintf.c (BSD_vfprintf): fix for test_sprintf_comb.rb, by
- wanabe in [ruby-dev:36935].
-
-Mon Dec 22 12:05:14 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (mingw): no longer uses snprintf and vsnprintf of
- msvcrt. [Bug#6]
-
- * win32/win32.c (rb_w32_vsnprintf, rb_w32_snprintf): removed.
-
- * win32/Makefile.sub (config.h): vsnprintf exists in VC7 or later.
-
- * win32/mkexports.rb (Exports#initialize): aliases
- rb_w32_vsnprintf and rb_w32_snprintf for binary compatibility.
-
- * sprintf.c (rb_str_format): uses snprintf instead of sprintf.
-
- * numeric.c (flo_to_s, rb_num2long, rb_num2ll): ditto.
-
-Mon Dec 22 10:59:31 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_upto): should return enumerator if called
- without block. [ruby-dev:37526]
-
-Mon Dec 22 09:54:43 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (gettable_gen): the encoding of __FILE__ should be
- rb_filesystem_encoding(). [ruby-list:45733]
-
- * parse.y (gettable_gen): __FILE__ should be ASCII-8BIT when
- filesystem encoding is US-ASCII and __FILE__ contains non 7bit
- characters.
-
-Mon Dec 22 02:54:56 2008 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb: temporary patch for trouble on TkAqua (> Tk8.4.9).
-
- * ext/tk/sample/demos-jp/widget: set encoding to a demo-code string to
- avoid garbled text on the Code Window.
-
-Sun Dec 21 14:55:18 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/optparse.rb (SPLAT_PROC): splat values by hand.
-
-Sun Dec 21 13:50:37 2008 TAKAO Kouji <kouji@takao7.net>
-
- * test/readline/test_readline.rb
- (TestReadline#test_some_characters_methods): checked encoding.
-
-Sun Dec 21 12:23:16 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/optparse.rb (SPLAT_PROC): fix for regexp. [ruby-dev:37514]
-
-Sun Dec 21 10:43:10 2008 TAKANO Mitsuhiro (takano32) <tak@no32.tk>
-
- * sample/test.rb: rescue exception.
-
-Sat Dec 20 18:28:26 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * dln.c (dln_find_1): supplements an extension for executable
- files on DOSish platforms.
-
- * io.c (pipe_open): use rb_w32_aspawn() for array form.
-
- * win32/win32.c (rb_w32_pipe_exec): no longer used.
-
- * win32/win32.c (rb_w32_spawn, rb_w32_aspawn): deals with batch
- files and commands with extensions. [ruby-core:20695]
-
- * win32/win32.c (has_redirection): supports environment variables
- references.
-
-Sat Dec 20 15:34:36 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/rake.rb (Rake::FileList#egrep): change open mode to "rb",
- i.e. default to binary. [ruby-dev:37385]
-
- * lib/rake.rb (Rake::FileList#egrep): allow specifying reading
- encoding, e.g. FileList['*.rb'].egrep(/require/, encoding:
- "ascii-8bit")
-
- * lib/rake.rb (Rake::MultiTask): invoke_prerequisites should be
- private. a patch from okkez in [ruby-dev:37399]
-
-Sat Dec 20 10:59:16 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * lib/irb/locale.rb (IRB::Locale#initialize)
- initializes instance variables to suppress warnings.
- typo fix to ignore LoadError: [ruby-dev:37508]
-
-Fri Dec 19 17:01:35 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_io_extract_encoding_option): "internal_encoding: nil"
- to specify no-transcoding. and other corner case fixed.
- [ruby-dev:37496]
-
- * hash.c (rb_hash_lookup2): new function to look-up hash with
- default value.
-
-Fri Dec 19 15:51:48 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (process_options): get rid of warning on DOSISH.
-
-Fri Dec 19 07:45:37 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * error.c (exc_equal): duck typing equal to make it transitive.
- [ruby-dev:34808]
-
-Thu Dec 18 19:31:54 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * lib/irb/init.rb (IRB.opt_parse): (M17N) adds -U and -E as command
- line options. [ruby-dev:37161]. Fixes #711.
- improved long options.
-
- * lib/irb/init.rb (IRB.set_encoding): new subroutine for IRB.opt_parse
-
- * lib/irb/input-method.rb (IRB::StdioInputMethod): (M17N) regards
- scripts that user types as encoded in the external_encoding.
-
- * lib/irb/input-method.rb (IRB::ReadlineInputMethod): ditto.
-
- * lib/irb/input-method.rb (IRB::FileInputMethod): (M17N) respects
- magic comment.
-
- * lib/irb/help.rb (IRB.print_usage): (M17N) respects magic comment
- in the resource file.
-
- * lib/irb/lc/help-message: adds -U and -E.
-
- * lib/irb/lc/ja/help-message: ditto. re-encoded from ISO-2022-JP into UTF-8.
-
- * lib/irb/lc/ja/encoding_aliases.rb: new file. provides Japanese specific
- character encoding name table for backward compatibility.
-
- * lib/irb/lc/ja/error.rb: re-encoded from ISO-2022-JP into UTF-8.
- magic comment.
-
- * lib/irb/locale.rb: integrated with Ruby 1.9's M17N support.
-
- * lib/irb/magic-file.rb: new file. utility to handle files with magic
- comment and opens in the correct encoding.
-
- * lib/irb/ruby-lex.rb (RubyLex#each_top_level_statement): recovers
- character encoding for a statement after it lexed so that irb can
- eval the statement in correct encoding.
-
- * lib/irb/src_encoding.rb: new file. utility.
-
-Thu Dec 18 21:12:28 2008 Takeyuki FUJIOKA <xibbar@ruby-lang.org>
-
- * lib/cgi/session.rb: fix bug for ignore session_id option.
- report from [ruby-core:18635], [Bug #572]
-
- * lib/cgi/core.rb: use Encoding#find when encoding set.
-
- * test/cgi/test_cgi_session.rb: test for session_id specified.
-
-Thu Dec 18 17:00:56 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * hash.c (rb_hash_aset): string key copying only happen if key is
- an exact instance of String, not a subclass. based on a patch
- from Mike Gold <mike.gold.4433 at gmail.com> in [ruby-talk:322667].
- [incompatible] [ruby-talk:322417]
-
-Thu Dec 18 16:48:12 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/optparse/version.rb: remove variable shadowing to stop
- warning. [ruby-core:20612]
-
- * lib/irb/completion.rb, lib/net/imap.rb, lib/prime.rb,
- lib/rinda/ring.rb, lib/racc/parser.rb,
- lib/shell/command-processor.rb, lib/yaml/yamlnode.rb: ditto.
-
- * lib/racc/parser.rb: remove space before parentheses.
-
- * lib/shell/command-processor.rb, lib/shell/process-controller.rb:
- use parentheses around arguments.
-
- * lib/irb/ext/change-ws.rb, lib/rexml/validation/relaxng.rb,
- lib/yaml/baseemitter.rb: indentation fix.
-
- * lib/matrix.rb: small cosmetic change.
-
-Thu Dec 18 08:15:04 2008 James Edward Gray II <jeg2@ruby-lang.org>
-
- * lib/xmlrpc/server.rb: Restricting method inspection to show only
- non-inherited public methods. [ruby-core:20603]
-
- * lib/xmlrpc/server.rb: Fixing method inspection so it doesn't
- trigger XMLRPC::FaultException when used. [ruby-core:20604]
-
-Wed Dec 17 19:39:44 2008 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/socket.c (unix_recv_io): relax msg_controllen error
- check for x86_64-openbsd4.4.
-
-Wed Dec 17 19:37:30 2008 Tanaka Akira <akr@fsij.org>
-
- * ext/pty/extconf.rb: check util.h for OpenBSD.
-
- * ext/pty/pty.c: include util.h if available. fix variable name.
-
-Wed Dec 17 19:23:28 2008 Keiju Ishitsuka <keiju@ruby-lang.org>
-
- * lib/matrix.rb: shut up warning. [ruby-dev:37481] [Bug #899]
-
-Wed Dec 17 15:44:28 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_pop_m): use enum ary_take_pos_flags.
-
- * array.c (rb_ary_push_m): add modification check before actual
- operation. [ruby-dev:37440]
-
-Wed Dec 17 15:35:39 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * configure.in (OBJDUMP, OBJCOPY):
- *BSD's ports and MacPorts prefix GNU binutils with 'g'.
-
-Wed Dec 17 11:39:39 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * test/bigdecimal/test_bigdecimal.rb (TestBigDecimal#test_hash):
- shut up warning. see [ruby-dev:37437]
-
-Wed Dec 17 11:01:35 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_str_hash): gets rid of collisions between different
- encoding strings. [ruby-core:20526]
-
-Wed Dec 17 09:50:19 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * test/ruby/test_metaclass.rb: removed codes for my debugging.
- sorry. [ruby-dev:37470]
-
-Tue Dec 16 22:55:11 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * bin/testrb: set $0.
-
-Tue Dec 16 22:42:16 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * lib/test/unit.rb (Test::Unit.setup_argv): sorry, fixed wrong commit.
-
-Tue Dec 16 22:15:17 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/minitest/unit.rb (MiniTest::Assertions#assert_instance_of):
- should assert by instance_of?, not ===. [ruby-dev:37458]
-
- * lib/minitest/unit.rb (MiniTest::Assertions#assert_instance_of):
- typo fixed.
-
-Tue Dec 16 21:59:29 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * lib/test/unit.rb (Test::Unit.setup_argv): ALT_SEPARATOR support.
-
-Tue Dec 16 21:59:02 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/bigdecimal/bigdecimal.c (VpToString): reverted modification
- (that caused a bug) in r20359. [ruby-dev:37370]
-
- * ext/bigdecimal/bigdecimal.c (BigDecimal_limit): comment update.
- [ruby-dev:37465]
-
-Tue Dec 16 20:34:44 2008 Tanaka Akira <akr@fsij.org>
-
- * ext/pty/pty.c (getDevice): add nomesg argument.
- (get_device_once): add nomesg argument. chmod slave tty to 0600
- if nomesg. more error tests.
- (no_mesg): new function.
- (pty_open): make slave tty's mode 0600.
-
-Tue Dec 16 20:24:20 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date/format.rb (_parse): m17n compliant.
-
-Tue Dec 16 19:48:18 2008 Tanaka Akira <akr@fsij.org>
-
- * ext/pty/extconf.rb: check posix_openpt.
-
- * ext/pty/pty.c (get_device_once): use posix_openpt if available.
-
-Tue Dec 16 19:43:53 2008 Tanaka Akira <akr@fsij.org>
-
- * re.c: use strlcpy for error messages.
-
-Tue Dec 16 16:41:51 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (stmt): returns dispatched result.
-
- * parse.y (primary): also in ripper, saves in_def before restoring.
-
-Tue Dec 16 12:30:56 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (ac_cv_header_ucontext_h): do not use ucontext.h on Mac
- OS X 10.5 or later. merged from MacPorts.
-
- * configure.in (ac_cv_func_daemon): daemon(3) is deprecated on Mac OS
- X 10.5 or later.
-
-Tue Dec 16 11:37:07 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ruby.c (set_arg0): use strlcpy() instead of strncpy().
-
- * load.c (rb_feature_p): ditto.
-
- * dln.c (dln_load): ditto.
-
-Tue Dec 16 09:14:28 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (block_call): block should not be given to yield.
- [ruby-core:20583]
-
-Mon Dec 15 23:48:39 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * thread.c (sleep_timeval): cast tv_usec to long to shut up
- warnings on OSX. [ruby-dev:37449]
-
-Mon Dec 15 23:34:04 2008 Tanaka Akira <akr@fsij.org>
-
- * ext/pty/pty.c (pty_open): set FMODE_SYNC and FMODE_DUPLEX.
-
-Mon Dec 15 23:29:49 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ruby.c (process_options): revive global sub, gsub, chop, chomp
- only when auto looping options (-p/-n) is specified.
- [ruby-core:20570]
-
-Mon Dec 15 22:48:11 2008 Tanaka Akira <akr@fsij.org>
-
- * ext/pty/pty.c (pty_open): new method PTY.open.
-
-Mon Dec 15 21:24:01 2008 Tanaka Akira <akr@fsij.org>
-
- * ext/pty/pty.c (get_device_once): use DEVICELEN instead of
- sizeof SlaveName.
-
-Mon Dec 15 21:01:46 2008 Tanaka Akira <akr@fsij.org>
-
- * ext/pty/pty.c (chfunc): make it static.
-
-Mon Dec 15 20:59:10 2008 Tanaka Akira <akr@fsij.org>
-
- * ext/pty/pty.c (child_info): add slavename.
- (chfunc): use slavename.
- (establishShell): set slavename.
-
-Mon Dec 15 20:16:46 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * common.mk (EXTMK_ARGS): shouldn't use ``\"'' because cmd.exe eat
- ''\'' in such quotes.
-
-Mon Dec 15 19:07:31 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/Makefile.sub (config.h): define CANONICALIZATION_FOR_MATHN
- to follow r20683.
-
-Mon Dec 15 18:12:34 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/rake/packagetask.rb (Rake::PackageTask): small document
- update from okkez in [ruby-dev:37443]
-
-Mon Dec 15 16:28:32 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm_insnhelper.c (vm_callee_setup_arg_complex): uses cfp from
- blockptr instead of the current cfp. [ruby-core:20544]
-
-Mon Dec 15 14:56:59 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * test/ruby/test_metaclass.rb: new test case for metaclass hierarchy.
-
- * class.c (make_metametaclass): new function. extracted from
- rb_make_metaclass.
-
- * class.c (rb_make_metaclass): uses make_metametaclass when called for a
- metaclass.
-
- * class.c (rb_singleton_class): creates a meta^(n+2)-class in
- addition to a meta^(n+1)-class when called for a meta^(n)-class.
- This is because the returned meta^(n+1) class must acts as an instance of
- Class, metaclass of Class, ..., meta^(n+1)-class of Class,
- Module, metaclass of Module, ..., meta^(n+1)-class of Module,
- Object, metaclass of Object, ..., meta^(n+2)-class of Object,
- BasicObject, metaclass of BasicObject, ..., meta^(n+2)-class of
- and BasicObject even when Class, Module, Object or BasicObject has
- not have its meta^(i)-class yet.
-
-Mon Dec 15 15:13:22 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * id.h, template/id.h.tmpl (ruby_method_ids): sees YYTOKENTYPE too.
- [ruby-dev:37436]
-
-Mon Dec 15 15:02:24 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (EXTMK_ARGS): needs MINIRUBY for cross-compile.
- [ruby-core:20131]
-
-Mon Dec 15 14:39:37 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm_eval.c (vm_call0): NODE_ZSUPER supported. [ruby-core:20480]
-
- * vm_eval.c (vm_call_super): uses method_missing().
-
- * vm_eval.c (method_missing): get rid of too large alloca.
-
- * vm_eval.c (rb_call0, method_missing): uses idMethodMissing.
-
- * vm_method.c (rb_add_method, remove_method, rb_undef): uses
- id__send__.
-
- * vm_method.c (Init_eval_method): removed IDs which are defined as
- immediate values.
-
-Mon Dec 15 11:35:27 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm.c (vm_backtrace): defaults to script name for C functions.
-
-Mon Dec 15 11:32:18 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (rubylib_mangled_path, rubylib_mangled_path2): cannot use
- locale encoding before load path is initialized
-
- * ruby.c (ruby_init_loadpath_safe): ditto.
-
- * ruby.c (process_options): loads encdb so that encodings can be
- loaded, then associates script name and load paths with the
- locale encoding.
-
-Mon Dec 15 10:00:36 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (btest-ruby): use RUNRUBY instead of MINIRUBY to load the
- shared library. [Bug #849]
-
-Sun Dec 14 22:31:19 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * bignum.c (bigmul1_karatsuba): remove temporal bignum.
-
- * bignum.c (bigsqr): call bigmul0(x, x) because it is faster than the
- original bigsqr at this point.
-
- * bignum.c (rb_big_pow): a value returned from bigsqr is already
- truncated.
-
-Sun Dec 14 21:13:02 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * bignum.c (bigmul1_karatsuba): fix comment and refactoring.
-
-Sun Dec 14 14:53:41 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * bignum.c (bigmul1_balance, bigmul1_karatsuba): remove all
- rb_gc_force_recycle which causes memory leak.
-
-Sun Dec 14 14:26:11 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * spec/README: directory structure changed
-
-Sun Dec 14 09:14:37 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * reverts r20713.
-
-Sun Dec 14 12:51:48 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * bignum.c (rb_big_mul): faster multiplication by Karatsuba method and
- twice faster square than normal multiplication. [ruby-dev:37392]
-
- * random.c (rb_rand_internal): used by Bignum#*.
-
- * test/ruby/test_bignum.rb: add some tests for above.
-
-Sun Dec 14 01:35:48 2008 Tanaka Akira <akr@fsij.org>
-
- * process.c (forked_child): new variable.
- (before_exec): don't call rb_thread_stop_timer_thread if
- forked_child.
- (after_exec): reset forked_child after rb_thread_start_timer_thread.
- (rb_fork): set forked_child just after fork in child.
-
- * ext/pty/pty.c (chfunc): extracted from establishShell.
- (establishShell): use rb_fork.
-
- [ruby-dev:37418]
-
-Sat Dec 13 22:17:30 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * common.mk (help): describes more targets.
- based on a patch by Michael Klishin. [ruby-core:20523].
-
-Sat Dec 13 18:34:43 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (sym_printable): wrong condition for string iteration.
-
-Sat Dec 13 16:04:48 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * encoding.c (default_external): endless recursion during
- loading a locale encoding on some locale.
- fixed by Nobuyoshi Nakada.
-
-Sat Dec 13 15:55:37 2008 TAKAO Kouji <kouji@takao7.net>
-
- * ruby.c (process_options): fixed default_internal is nil.
- (closes #862)
-
-Sat Dec 13 15:52:27 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (sym_equal): remove documentation error "Otherwise,
- compares them as strings". [ruby-dev:37398]
-
- * string.c (sym_inspect): quote if symbol contains non-printable
- characters. [ruby-dev:37398]
-
-Sat Dec 13 14:24:38 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * test/ruby/enc/test_utf16.rb: feature changed in r20626.
- follows it.
-
-Sat Dec 13 13:41:44 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * test/ruby/test_m17n_comb.rb: feature changed in r20626.
- follows it.
-
-Sat Dec 13 13:03:20 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c: use rb_usascii_str_new2 instead of rb_str_new2.
-
- * rational.c: ditto.
-
-Sat Dec 13 12:48:57 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * test/ruby/test_m17n.rb: feature changed in r20626.
- follows it.
-
-Sat Dec 13 12:38:16 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * lib/minitest/test.rb (MinTest::Unit#location):
- skips user-defined assertions as MiniTest's.
- e.g. for test/ruby/test_m17n.rb.
-
-Sat Dec 13 09:17:33 2008 Ryan Davis <ryand-ruby@zenspider.com>
-
- * lib/minitest/*.rb: Imported minitest 1.3.1 r4503.
- * test/minitest/test_mini_test.rb: ditto.
- * lib/miniunit/autorun.rb: added (as part of r4503).
-
-Sat Dec 13 08:35:14 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c (nucomp_canonicalization): renamed.
-
- * ext/math/complex.c: followed the above change.
-
- * rational.c (nurat_canonicalization): renamed.
-
- * ext/math/rational.c: followed the above change.
-
- * configure.in: defines a new macro.
-
-Sat Dec 13 01:10:03 2008 TAKAO Kouji <kouji@takao7.net>
-
- * ext/readline/readline.c
- (readline_s_get_completion_append_character): uses locale
- encoding but not ASCII-8BIT.
-
-Fri Dec 12 22:12:46 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c, rational.c: do not use RUBY_VERSION_CODE.
-
-Fri Dec 12 21:41:36 2008 TAKAO Kouji <kouji@takao7.net>
-
- * ext/readline/readline.c: r20662 reverted.
-
-Fri Dec 12 19:29:07 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * encoding.c (rb_enc_set_default_external): default_internal can be
- nil, but default_external cannot.
-
- * encoding.c (rb_set_default_internal): adds rdoc.
-
- * encoding.c (enc_find): ditto.
-
-Fri Dec 12 19:24:47 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * common.mk (run, runruby, parse, gdb, gdb-ruby): you can also run
- other scripts than $(srcdir)/test.rb.
-
-Fri Dec 12 19:13:43 2008 TAKAO Kouji <kouji@takao7.net>
-
- * ext/readline/readline.c (readline_readline): changed the message
- of IOError to 'closed stdin' from 'stdin closed' if stdin was
- closed.
-
-Fri Dec 12 19:00:49 2008 TAKAO Kouji <kouji@takao7.net>
-
- * ext/readline/readline.c: used the ExportStringValue macro
- instead of the OutputStringValue macro. removed the
- OutputStringValue macro.
-
-Fri Dec 12 16:23:18 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (yycompile0): ruby_eval_tree_begin is always 0 when
- ruby_eval_tree is 0.
-
-Fri Dec 12 14:09:55 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * encoding.c (enc_get_default_encoding): removed.
- Generalizing rb_default_{external,internal}_encoding seems to be
- difficult.
- default_external cannot be NULL even before detected. [ruby-dev:37390]
-
- * encoding.c (rb_default_external_encoding): has its own
- implementation again.
-
- * encoding.c (rb_default_internal_encoding): ditto.
-
- * gem_prelude.rb: added notice.
-
- * ruby.c (rubylib_mangled_path, rubylib_mangled_path2): uses locale
- encoding but not ASCII-8BIT.
-
- * ruby.c (process_options): refers less to default_external.
-
-Fri Dec 12 11:00:52 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * load.c (rb_feature_p): load path must be expanded.
- [ruby-dev:37388]
-
-Fri Dec 12 10:28:08 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (rb_version): greps only the line that defines version.
-
- * version.h (RUBY_VERSION_CODE, RUBY_RELEASE_CODE): removed.
-
-Fri Dec 12 10:20:55 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * complex.c, rational.c: do not use RUBY_VERSION_CODE.
-
-Fri Dec 12 10:19:21 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_string_value_ptr, rb_to_id): do not use a side
- effect expression in RSTRING_PTR.
-
- * string.c (rb_str_split_m): simplified the argument of
- RSTRING_LEN.
-
-Thu Dec 11 23:48:00 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/cmath.rb (sqrt): should pass nan to the original method.
-
-Thu Dec 11 21:04:04 2008 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/maker.rb, lib/rss/maker/0.9.rb, lib/rss/maker/base.rb:
- RSS::Maker.[] returns a maker class corresponds to passed version.
-
- * test/rss/test_maker_*.rb: add tests for RSS::Maker.[].
-
-Thu Dec 11 20:05:17 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * encoding.c (rb_enc_aliases_enc_i): skips default internal.
-
-Thu Dec 11 19:31:45 2008 Tanaka Akira <akr@fsij.org>
-
- * lib/test/unit/assertions.rb: extracted from lib/test/unit.rb.
- lib/test/unit/testcase.rb: ditto.
- at asakusa.rb. [ruby-core:20014]
-
-Thu Dec 11 19:23:09 2008 Tanaka Akira <akr@fsij.org>
-
- * test/ruby/test_io.rb (test_dup_many): extracted from test_dup.
- test in ruby subprocess. at asakusa.rb. [ruby-dev:35648]
-
-Thu Dec 11 19:16:30 2008 Tanaka Akira <akr@fsij.org>
-
- * lib/pathname.rb (Pathname#=~): undefed. at asakusa.rb.
- [ruby-core:19690]
-
-Thu Dec 11 13:09:01 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * re.c (reg_enc_error): raise EncodingCompatibilityError for
- encoding incompatibility. [ruby-core:18600]
-
- * re.c (rb_reg_prepare_enc): more consistent error message.
- [ruby-core:18611]
-
-Thu Dec 11 13:36:18 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * encoding.c (enc_set_default_encoding): allowed to set default
- encoding.
-
- * encoding.c (rb_locale_encoding): removed Encoding::LOCALE.
-
- * encoding.c (rb_enc_set_default_external): ditto.
-
- * encoding.c (rb_enc_set_default_internal): ditto.
-
- * encoding.c (rb_enc_set_default_internal): defines internal
- encoding as nil.
-
-Thu Dec 11 11:11:03 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/st.h (size_t): needs stddef.h or stdlib.h.
- [ruby-core:20339]
-
-Thu Dec 11 10:25:25 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * test/ruby/test_bignum.rb (TestBignum#test_convert): remove
- platform dependent call of Process.wait. coverage should be
- accomplished by other method. [ruby-dev:36062]
-
-Thu Dec 11 10:18:35 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/rexml/document.rb (REXML::Document#write): require
- rexml/formatters/transitive if transitive flag is on. a patch
- from akira yamada in [ruby-dev:36230]. fix #553
-
- * lib/rexml/element.rb (REXML::Element#write): ditto.
-
- * lib/rexml/formatters/transitive.rb (REXML::Formatters::Transitive#write_element):
- add hack for IE. [ruby-dev:36230]
-
-Thu Dec 11 02:37:22 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * math.c (domain_check): should not raise EDOM exception for NaN
- value if operand is also NaN. affects acos, asin, acosh, atanh,
- log, log2, log10, sqrt, gamma, lgamma. [ruby-dev:37357]
-
-Thu Dec 11 02:23:51 2008 Tanaka Akira <akr@fsij.org>
-
- * lib/open3.rb (Open3.pipeline_start): return an array of threads if a
- block is not given.
-
-Thu Dec 11 01:48:00 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/bigdecimal/bigdecimal.c (BigDecimal_round): should be round
- to integer. [ruby-dev:37355]
-
- * ext/bigdecimal/bigdecimal.c (BigDecimal_divmod): division should
- be integer. [incompatible] [ruby-dev:37355]
-
-Thu Dec 11 01:21:58 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * thread.c (rb_mutex_unlock): shut up warning. a patch from
- Kazuhiro NISHIYAMA in [ruby-dev:37345]. fix #846
-
-Wed Dec 10 23:58:56 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c: avoided warnings on cpp. [ruby-dev:37344]
-
- * rational.c: ditto.
-
-Wed Dec 10 21:32:02 2008 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/maker.rb (RSS::Maker.[]): add.
- Suggested by Akinori MUSHA. Thanks!!! [ruby-dev:37210]
-
-Wed Dec 10 12:56:32 2008 Akinori MUSHA <knu@iDaemons.org>
-
- * enumerator.c (enumerator_rewind): If the enclosed object
- responds to a "rewind" method, call it; cf. [ruby-dev:37268]
-
-Wed Dec 10 12:46:52 2008 Akinori MUSHA <knu@iDaemons.org>
-
- * enumerator.c (enumerator_next): Fix a typo: s/rewinded/rewound/.
-
- * lib/prime.rb (Prime::OldCompatibility#each): Ditto.
-
-Wed Dec 10 11:25:53 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * re.c (rb_reg_initialize): raise RegexpError when encoding
- is dummy encoding. [ruby-dev:37091]
-
-Wed Dec 10 01:28:16 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * common.mk (win32.obj): depend on headers.
-
-Tue Dec 9 18:35:35 2008 Martin Duerst <duerst@it.aoyama.ac.jp>
-
- * enc/trans/single_byte.trans, cp850-tbl.rb, cp852-tbl.rb,
- cp855-tbl.rb, koi8-r-tbl.rb, koi8-u-tbl.rb, tis-620-tbl.rb:
- new single-byte transcodings (from Yoshihiro Kambayashi)
-
- * test/ruby/test_transcode.rb: added tests for the above
- (from Yoshihiro Kambayashi), small cosmetic fixes
-
-Tue Dec 9 13:33:53 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * compile.c (iseq_compile_each), gc.c (assign_heap_slot),
- (gc_mark_children), parse.y (vtable_alloc, vtable_free, vtable_add),
- proc.c (proc_to_s), thread.c (terminate_i, rb_thread_terminate_all),
- (thread_start_func_2, blocking_region_begin, blocking_region_end),
- (rb_thread_kill), thread_pthread.c (native_thread_create),
- (ubf_pthread_cond_signal), vm.c (check_env, thread_free), vm_dump.c
- (vm_env_dump_raw, vm_stack_dump_each, vm_thread_dump_state),
- (vm_call0): use void pointer for %p.
-
- * cont.c (fiber_status), template/insns.inc.tmpl (ruby_vminsn_type),
- vm_insnhelper.h (BOP): ISO C forbids comma at end of enumerator
- list.
-
- * vm_insnhelper.c (check_cfunc): use function pointer.
-
-Tue Dec 9 13:23:55 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/curses/curses.c (curses_use_default_colors): add new
- method. a patch from Giancarlo F Bellido
- <support at coaxialhost.com> in [ruby-core:20434].
-
- * ext/curses/curses.c (curses_tabsize_set): ditto.
-
- * ext/curses/curses.c (curses_tabsize_get): ditto.
-
-Tue Dec 9 12:08:47 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * .gdbinit (rp): fixed typo for T_STRUCT.
-
-Tue Dec 9 11:50:46 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * pack.c (pack_pack): fixed [ruby-dev:37295].
- Array#pack always has returned an US-ASCII string when
- the given format ended with 'u', 'M' or 'm'.
-
-Tue Dec 9 03:21:37 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * mkconfig.rb: fix for continued lines. based on a patch from
- Marcus Rueckert <darix AT opensu.se> at [ruby-core:20420].
-
-Tue Dec 9 00:54:01 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * tool/make-snapshot (package): enc.mk in snapshot is dummy and should
- not deal with objects. [ruby-core:20422]
-
-Tue Dec 9 00:17:50 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * enc/depend (clean-srcs): split out from clean.
-
-Mon Dec 8 23:34:18 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * pack.c (pack_pack): fixed odd act of 'm*', 'M*', and 'P*'.
- just ignores '*' in these cases.
- [ruby-dev:37289]
-
-Mon Dec 8 18:31:41 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * pack.c (pack_pack): fixed length for odd length string.
- [ruby-dev:37283]
-
-Mon Dec 8 11:28:14 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (proc_options): added version, copyright, usage, yydebug,
- syntax to --dump option.
-
-Mon Dec 8 11:15:45 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (proc_options): source-encoding option.
-
-Mon Dec 8 10:32:33 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (set_option_encoding_once): dry.
-
- * ruby.c (proc_options): checks extra argument for -E/--encoding.
-
-Sun Dec 7 23:47:37 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (LIBPATHFLAG): use numbered specifier if RPATHFLAG
- is set. [ruby-talk:322136]
-
-Sun Dec 7 23:17:33 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * Makefile.in (LIBRUBY_SO): localizes non-public symbols.
-
- * configure.in (OBJDUMP, OBJCOPY): for dealing with binary files.
-
-Sun Dec 7 17:44:06 2008 Tanaka Akira <akr@fsij.org>
-
- * lib/open3.rb (Open3.capture3): renamed from Open3.poutput3.
- (Open3.capture2): renamed from Open3.poutput2.
- (Open3.capture2e): renamed from Open3.poutput2e.
-
-Sun Dec 7 11:48:04 2008 Tanaka Akira <akr@fsij.org>
-
- * lib/open3.rb (Open3.poutput3): :binmode option implemented.
- (Open3.poutput2): ditto.
- (Open3.poutput2e): ditto.
-
-Sat Dec 6 18:33:16 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * tool/make-snapshot (package): added RM and CP. [ruby-dev:37288]
-
-Sat Dec 6 17:51:35 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * pack.c (pack_pack): 'u0' is not special differently from 'm0'.
-
-Sat Dec 6 14:35:06 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * pack.c (pack_pack): set US-ASCII and CODERANGE_7BIT
- when quoted-printable ('M') and base64 ('m').
- [ruby-dev:37284]
-
- * pack.c (pack_unpack): ditto.
-
-Fri Dec 5 22:56:24 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_make_exception): single argument to raise may be
- string compatible object.
-
-Fri Dec 5 21:45:45 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * rational.c (nurat_{to_s,inspect}): performance improvement.
-
-Fri Dec 5 21:42:44 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c: inspect should not depend on to_s.
-
-Fri Dec 5 21:18:31 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/bigdecimal/bigdecimal.c (BigDecimal_truncate): return
- integer if no optional argument given. [incompatible]
-
- * ext/bigdecimal/bigdecimal.c (BigDecimal_floor): ditto.
-
- * ext/bigdecimal/bigdecimal.c (BigDecimal_ceil): ditto.
-
-Fri Dec 5 19:06:04 2008 Tanaka Akira <akr@fsij.org>
-
- * lib/open3.rb (Open3.pipeline_start): new method.
- (Open3.pipeline): ditto.
-
-Fri Dec 5 18:55:25 2008 Tanaka Akira <akr@fsij.org>
-
- * process.c (run_exec_dup2): !save is false if Qnil.
-
-Fri Dec 5 18:07:32 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (rb_w32_read, rb_w32_write, rb_w32_isatty): check
- whether fd is valid.
-
-Fri Dec 5 13:05:45 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * iseq.c (rb_iseq_parameters): proc arguments are always optional.
-
- * proc.c (get_proc_iseq, rb_proc_parameters): ditto.
-
-Fri Dec 5 12:38:48 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * compile.c (iseq_set_sequence): uses rb_compile_warning() for
- warning at compilation time.
-
-Fri Dec 5 12:35:46 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * compile.c (ruby_iseq_compile, ruby_iseq_translate_threaded_code),
- (ruby_insns_name_array, ruby_iseq_build_from_ary): prefixed with
- ruby_.
-
- * iseq.c (ruby_iseq_load, ruby_insn_make_insn_table): ditto.
-
-Fri Dec 5 10:01:43 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_str_cmp_m): fixed rdoc. pointed out by <Thomas
- C. Mitchell AT gmail.com> at [ruby-talk:321967]
-
-Fri Dec 5 07:58:30 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (io_binwrite): arg.offset should be updated after retry.
-
-Fri Dec 5 03:29:17 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * load.c (rb_get_load_path): returns the load path without
- touching.
-
- * load.c (rb_feature_provided): new function to return the loading
- path in addition to rb_provided().
-
- * load.c (search_required): sets path if loading.
-
- * variable.c (autoload_provided): load paths are expanded to check
- if loading.
-
- * variable.c (autoload_node): keeps autoload mark while loading.
- [ruby-core:20235]
-
- * variable.c (rb_const_get_0): loops while autoload mark is set.
-
-Fri Dec 5 01:37:02 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (rb_w32_read): ERROR_BROKEN_PIPE is not a real error
- at this point.
-
- * io.c (pipe_open): use rb_w32_spawn() instead of rb_w32_pipe_exec()
- to use our own redirection scheme.
-
-Fri Dec 5 01:35:08 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (sym_to_proc): use hidden object.
-
-Fri Dec 5 01:19:21 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * pack.c (pack_pack): propagate taint status from format string to
- result string.
-
-Fri Dec 5 00:34:10 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * process.c (run_exec_dup2): need to sort by reverted order when
- restoring fds.
-
-Fri Dec 5 00:17:18 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (sym_to_proc): caches Symbol procs, based on a patch from
- Shumpei Akai <admin AT flexfrank.net>. [ruby-dev:37265]
-
-Thu Dec 4 23:29:34 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (waitpid): fix bug of checking child slot.
-
- * win32/win32.c (FindChildSlotByHandle): new.
-
-Thu Dec 4 23:24:05 2008 Tanaka Akira <akr@fsij.org>
-
- * lib/open3.rb (Open3.poutput3): new method.
- (Open3.poutput2): ditto.
- (Open3.poutput2e): ditto.
-
-Thu Dec 4 23:02:13 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * spec/default.mspec: follows changes in rubyspec project.
- inherits configurations from ruby.1.9.mspec.
-
-Thu Dec 4 22:13:55 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * test/ruby/test_complex.rb: added some tests.
-
- * test/ruby/test_rational.rb: ditto.
-
-Thu Dec 4 19:56:20 2008 Tanaka Akira <akr@fsij.org>
-
- * lib/open3.rb (Open3.popen3): simplified.
- (Open3.popen_run): extracted from Open3.popen3.
- (Open3.popen2): new method.
- (Open3.popen2e): new method.
- (Open3.pipeline_rw): new method.
- (Open3.pipeline_r): new method.
- (Open3.pipeline_w): new method.
- (Open3.pipeline_run): new private method.
-
-Thu Dec 4 19:16:28 2008 Tanaka Akira <akr@fsij.org>
-
- * process.c (check_exec_fds): resolve cascaded child fd reference.
-
-Thu Dec 4 16:58:12 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/rubygems/validator.rb (Gem#remove_leading_dot_dir): make
- this method private. a patch from okkez in [ruby-dev:37245]
-
-Thu Dec 4 16:19:18 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/openssl/ossl_ssl.c (ossl_ssl_read_nonblock):
- OpenSSL::SSL::SSLSocket should implement read_nonblock. a patch
- from Aaron Patterson in [ruby-core:20277]. fix: #814 [ruby-core:20241]
-
-Thu Dec 4 16:16:09 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/gserver.rb: fixed type in sample code. a report from Oleg
- Puchinin.
-
-Thu Dec 4 14:54:32 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/rubygems/local_remote_options.rb (Gem#add_update_sources_option):
- little documentation fix. a patch from okkez. [ruby-dev:37271]
-
-Thu Dec 4 13:56:31 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/curses/curses.c (window_getch): avoid ISPRINT() macro which
- has an issue with OpenSolaris. [ruby-core:20189]
-
- * ext/curses/curses.c (curses_getch): no ISPRINT(). [ruby-core:20294]
-
- * signal.c (ruby_signal): EINVAL from sigaction(2) is not a bug.
-
-Thu Dec 4 11:40:56 2008 Akinori MUSHA <knu@iDaemons.org>
-
- * enumerator.c (inspect_enumerator): Implement #inspect.
- [ruby-dev:37248]-[ruby-dev:37263]
-
-Thu Dec 4 11:38:40 2008 Akinori MUSHA <knu@iDaemons.org>
-
- * vm_method.c (rb_obj_respond_to): Remove a duplicated rdoc
- comment and fix a markup error.
-
-Thu Dec 4 06:04:16 2008 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk/menu.rb: TkOptionMenubutton.new fails to treat
- 'parent' and 'variable' options on a Hash argument.
-
-Thu Dec 4 05:06:47 2008 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb: bug fix. use ::RubyVM instead of ::VM
- [ruby-list:45676]
-
- * ext/tk/tcltklib.c: update RELEASE_DATE
-
-Thu Dec 4 01:37:47 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c (nurat_{to_s,inspect}): provides better representation
- for in-finite imag part.
-
-Thu Dec 4 01:22:41 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c (f_signbit): NaN may be signed value.
-
-Wed Dec 3 23:59:32 2008 Tanaka Akira <akr@fsij.org>
-
- * process.c (EXEC_OPTION_DUP2_CHILD): defined.
- (check_exec_redirect_fd): check :in, :out and :err.
- (check_exec_redirect): check [:child, fd].
- (check_exec_fds): validate EXEC_OPTION_DUP2_CHILD array.
- (run_exec_dup2_child): new function.
- (rb_run_exec_options): call run_exec_dup2_child.
-
-Wed Dec 3 22:54:39 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (expr): keyword_not can continue across newline.
- [ruby-core:20252]
-
-Wed Dec 3 22:40:59 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * iseq.c (simple_default_value): returns simplest assignment only.
- [ruby-core:20237]
-
-Wed Dec 3 21:30:06 2008 Tanaka Akira <akr@fsij.org>
-
- * process.c (check_exec_redirect): accept :in, :out, :err as redirect
- target.
-
-Wed Dec 3 21:18:27 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * test/ruby/test_rational.rb: revert.
-
-Wed Dec 3 14:48:52 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/tk/tcltklib.c (ip_ruby_cmd, ip_invoke_with_position): must
- not access internal union directly. [ruby-list:45670]
-
-Wed Dec 3 12:24:08 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (rb_io_getc, rb_io_readchar): documentation correction from
- Emiel van de Laar. [ruby-core:20212]
-
- * ext/stringio/stringio.c (strio_readchar): ditto.
-
-Wed Dec 3 09:26:29 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/rexml/xpath.rb (REXML::XPath.first): apply documentation
- patch from Ken Bloom in [ruby-core:20213].
-
- * lib/rexml/xpath.rb (REXML::XPath.each): ditto.
-
-Wed Dec 3 02:56:34 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_rational.rb: add a test.
-
-Wed Dec 3 02:53:24 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_range.rb: add a test.
-
-Wed Dec 3 02:26:07 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_string.rb: add some tests.
-
-Wed Dec 3 02:04:21 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * ext/pty/pty.c (Init_pty): fix typo.
-
-Tue Dec 2 19:22:13 2008 Tanaka Akira <akr@fsij.org>
-
- * lib/open3.rb (Open3.popen3): merge hash options if given.
-
-Tue Dec 2 15:31:42 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/net/protocol.rb (Net::BufferedIO#rbuf_fill): use
- read_nonblock instead of sysread wrapped by timeout to boost
- performance. a patch from Aaron Patterson in [ruby-core:20191].
- fix #806
-
-Mon Dec 1 23:23:52 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * set 1.9.1-p5000 into version number. [ruby-dev:36998]
-
-Mon Dec 1 15:48:47 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * signal.c (register_sigaltstack): no need to define on non-sigaltstack
- platform.
-
-Mon Dec 1 12:00:45 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * cont.c (rb_fiber_start): calls with exact argument number.
- [ruby-core:20088]
-
-Sun Nov 30 21:41:10 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * man/rake.1: new manual page
-
-Sun Nov 30 18:01:50 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * test/ruby/test_regexp.rb (TestRegexp#test_parse_curly_brace):
- now accepts quantifier on anchors again by r20391.
-
-Sat Nov 29 23:56:44 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * man/irb.1 (EXAMPLES): new section
-
-Sat Nov 29 19:19:32 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * regparse.c (is_invalid_quantifier_target): Perl and old Ruby
- accepts quantifier on anchors. [ruby-core:20161]
-
-Sat Nov 29 18:28:57 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/socket/socket.c (sock_getaddrinfo): should have updated for
- Mac OS X. a patch from Shumpei Akai in [ruby-dev:37234]
-
-Sat Nov 29 00:18:30 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * cont.c (fiber_alloc): separate allocation and initialization.
- allow subclass to override #initialize. [ruby-core:20086]
-
-Fri Nov 28 18:31:21 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/socket/socket.c (sock_s_getaddrinfo): refactored to remove
- code duplication regarding getaddrinfo.
-
-Fri Nov 28 17:52:26 2008 Keiju Ishitsuka <keiju@ruby-lang.org>
-
- * lib/forwardable.rb: should be usable def_single_delegator for
- Class and Module.
-
-Fri Nov 28 13:19:34 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * iseq.c (simple_default_value): extracts simplest default
- argument value.
-
- * iseq.c (rb_iseq_parameters): returns parameter list.
-
- * proc.c (get_proc_iseq, get_method_iseq): handles ifunc and
- bmethod.
-
- * proc.c (rb_proc_parameters, rb_method_parameters): added
- Proc#parameters and Method#parameters. [ruby-core:19759]
-
-Fri Nov 28 02:18:47 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/bigdecimal/bigdecimal.c (BigDecimal_DoDivmod): bigdecimal
- division (including modulo) should raise ZeroDivisionError as
- integer division. [incompatible]
-
-Fri Nov 28 00:12:00 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * numeric.c (flodivmod): floating point division should raise
- ZeroDivisionError as integer division. [incompatible]
-
-Thu Nov 27 23:54:37 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * gc.c (gc_mark): still needs to check stack depth during GC.
-
- * gc.c (stack_check): ditto.
-
-Thu Nov 27 21:41:29 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * strftime.c (rb_strftime): should add padding for %%.
-
-Thu Nov 27 16:32:53 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * signal.c (register_sigaltstack): stores alt stack for debug
- purpose.
-
-Thu Nov 27 16:12:33 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * signal.c (ruby_sigaction_t): added.
-
-Thu Nov 27 15:59:16 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * gc.c (ruby_stack_check): no check if using sigaltstack.
-
- * signal.c (ALT_STACK_SIZE): default minimum size is insufficient
- for method calls.
-
- * signal.c (sigsegv): handles stack overflow if possible.
-
- * thread.c (ruby_thread_stack_overflow): helper function to raise
- sysstack_error.
-
- * thread_pthread.c (ruby_stack_overflowed_p): checks for stack
- overflow.
-
-Thu Nov 27 10:40:52 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/bigdecimal/bigdecimal.c (BigDecimal_div2): should return
- Integer for #div operation.
-
- * ext/bigdecimal/bigdecimal.c (BigDecimal_div2): should raise
- ZeroDivisionError if divisor is zero. [ruby-dev:37207]
-
-Wed Nov 26 23:15:47 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * strftime.c (STRFTIME): use rb_strftime() recursively, instead of
- platform's strftime().
-
-Wed Nov 26 22:46:23 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/bigdecimal/bigdecimal.c (VpException): bigdecimal zero
- division should raise FloatDomainError if mode
- VP_EXCEPTION_ZERODIVIDE is set. [ruby-dev:37204]
-
- * ext/bigdecimal/bigdecimal.c (BigDecimal_mode): should handle
- VP_EXCEPTION_ZERODIVIDE.
-
-Wed Nov 26 15:16:07 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * ext/gdbm/gdbm.c (rb_gdbm_nextkey): fix memory leak.
-
-Wed Nov 26 03:17:48 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/bigdecimal/bigdecimal.c (BigDecimal_to_r): raise exception
- for nan/inf conversion. [ruby-dev:37187] fix #793
-
- * ext/bigdecimal/bigdecimal.c (BigDecimal_to_i): ditto.
-
-Wed Nov 26 03:00:59 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/bigdecimal/bigdecimal.c (VpAlloc): avoid ALLOCA_N() to avoid
- segmentation fault caused by (insanely) long decimal values.
- [ruby-dev:37189] fix #794
-
- * ext/bigdecimal/bigdecimal.c (BigDecimal_dump, BigDecimal_to_i,
- BigDecimal_to_f, BigDecimal_to_s, BigDecimal_split,
- BigDecimal_inspect): ditto.
-
- * ext/bigdecimal/bigdecimal.c (VpToString): small performance
- improvement.
-
-Wed Nov 26 00:26:30 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * strftime.c (STRFTIME): should add padding for %[xXrR] etc.
- [ruby-dev:37185] fix: #792
-
-Tue Nov 25 16:26:12 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_times): taint (and untrust) status should be
- inherited by "ary * 0". [ruby-dev:37024]
-
-Tue Nov 25 15:54:07 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * strftime.c (rb_strftime): should not swallow incomplete
- formatter, e.g. "%E". [ruby-dev:37170] fix: #787
-
- * strftime.c (rb_strftime): clear flags before processing unknown
- formatter, e.g. "%i". [ruby-dev:37180]
-
-Tue Nov 25 10:35:29 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * strftime.c (rb_strftime): "%^P" should convert to upper case.
- [ruby-dev:37180]
-
-Tue Nov 25 07:51:18 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * strftime.c (FMT): use "%0d" formatter for zero padding, not "%.d".
- [ruby-dev:37168] fix: #768
-
- * strftime.c (rb_strftime): %s to use zero padding by default.
- [ruby-dev:37180]
-
-Tue Nov 25 03:37:42 2008 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tkextlib/blt/tabset.rb,
- ext/tk/lib/tkextlib/blt/tabnotebook.rb:
- fix many bugs. Now, those work properly.
-
-Tue Nov 25 03:26:04 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * numeric.c (num_step): treat infinite step specially.
- [ruby-dev:37157] fix: #781.
-
-Tue Nov 25 01:23:25 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date/format.rb (strftime): ignores '_' flag for %[LN].
-
-Tue Nov 25 00:08:22 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * process.c (rb_fork): stops the timer thread during fork.
- [ruby-dev:37117]
-
- * thread.c (rb_thread_start_timer_thread): timer thread needs
- system_working to be set.
-
-Mon Nov 24 23:27:28 2008 Shugo Maeda <shugo@ruby-lang.org>
-
- * strftime.c (rb_strftime): The # flag should work with %a, %A, %b,
- %B, and %h. [ruby-dev:37162]
-
- * test/ruby/test_time.rb (test_strftime): ditto.
-
-Mon Nov 24 23:16:32 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * signal.c (register_sigaltstack): should not add external
- variable (with some cosmetic changes). [ruby-dev:37158]
-
-Mon Nov 24 22:57:25 2008 Shugo Maeda <shugo@ruby-lang.org>
-
- * strftime.c (rb_strftime): A width specifier for %t and %n should
- work. [ruby-dev:37160]
-
- * test/ruby/test_time.rb (test_strftime): ditto.
-
-Mon Nov 24 22:07:07 2008 Shugo Maeda <shugo@ruby-lang.org>
-
- * strftime.c (rb_strftime): The precision of %0N should be 9.
- [ruby-dev:37156]
-
- * test/ruby/test_time.rb (test_strftime): ditto.
-
-Mon Nov 24 21:38:23 2008 Shugo Maeda <shugo@ruby-lang.org>
-
- * strftime.c (rb_strftime): The default precision should be 1, not
- 0. [ruby-dev:37155]
-
- * test/ruby/test_time.rb (test_strftime): ditto.
-
-Mon Nov 24 19:53:47 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date.rb (inspect): changed again.
-
-Mon Nov 24 18:35:00 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/time.rb: r20251 reverted. The patched behavior do not round
- trip. [ruby-core:19988]
-
-Sun Nov 23 16:04:05 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * signal.c (default_handler, Init_signal): compile error if
- USE_SIGALTSTACK is not defined.
-
-Sun Nov 23 00:04:14 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * signal.c (ALT_STACK_SIZE): 4KB is not enough on Mac OS X.
- Uses SIGSTKSZ.
-
-Sat Nov 22 21:29:54 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * test/ruby/test_method.rb (test_default_accessibility): test case for
- [ruby-dev:37124].
-
-Sat Nov 22 18:24:24 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * file.c (rb_file_world_writable_p): should return nil for non
- world-writable files.
-
-Sat Nov 22 10:31:25 2008 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tkextlib/blt.rb, ext/tk/lib/tkextlib/blt/vector.rb:
- fix NameError bug.
-
-Sat Nov 22 03:41:22 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/pty/pty.c (get_device_once): abandon asynchronous exception
- that might cause serious problem if a program terminated early.
- asynchronous exception is a very bad thing anyway. use
- Process.waitpid(pid) or PTY.check(pid) to poll program
- termination. if PTY.check is called with optional second
- argument being true, it raises an exception same as one from
- previous behavior. [incompatible] fix: [ruby-core:19583]
-
-Fri Nov 21 22:24:31 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/curses/curses.c (curses_escdelay_set): support ESCDELAY. a
- patch from Giancarlo F Bellido <support at coaxialhost.com> in
- [ruby-core:19961].
-
-Fri Nov 21 22:17:15 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ruby.c (usage): -W description updated. [ruby-core:19858]
-
-Fri Nov 21 21:50:54 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * signal.c (register_sigaltstack): use alternative stack for
- SIGSEGV to avoid uncaught stack overflow. based on a patch from
- Hiro Yoshioka <hyoshiok at miraclelinux.com> in [ruby-dev:37134].
- [ruby-dev:36993]
-
-Fri Nov 21 16:06:54 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * vm.c (thread_free): th->vm may be NULL when pthread_create
- failed for ENOMEM. [ruby-dev:37095]
-
-Thu Nov 20 07:33:15 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/logger.rb (Logger): should handle the case that cvs/svn do
- not expand $Id keyword. [ruby-core:19991]
-
-Thu Nov 20 07:27:36 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/minitest/unit.rb (MiniTest::Assertions#capture_io): adjust
- indentation to shut up warning. [ruby-core:19993]
-
-Wed Nov 19 17:48:05 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/syck/rubyext.c (rb_syck_mktime): return DateTime for a value
- out of range of Time. [ruby-core:19919]
-
-Wed Nov 19 14:14:38 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * node.h (NOEX_MODFUNC): should be include NOEX_PRIVATE.
- [ruby-dev:37124]
-
-Wed Nov 19 03:01:04 2008 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-
- * test/rinda/test_rinda.rb: fixed fails occasionally [ruby-dev:37119].
- thanks, shinichiro.h.
-
-Wed Nov 19 02:39:31 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * error.c (Init_syserr): moved function definition itself from
- template/known_errors.inc.tmpl.
-
-Wed Nov 19 01:10:52 2008 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-
- * lib/drb/drb.rb (DRbConn::alive?): fixed NoMethodError problem
- from NaHi [ruby-dev:37110].
-
-Wed Nov 19 01:05:26 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * cont.c (cont_mark, cont_capture, cont_restore_1): speed up
- continuation by copying only valid YARV stack. [ruby-dev:37106]
-
-Wed Nov 19 00:03:13 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/time.rb: according to RFC2822, -0000 means local time, +0000
- means UTC. a patch from Chun Wang. [ruby-core:19578]
-
-Tue Nov 18 23:02:23 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * proc.c (proc_eq): equivalence check should not done by pointer
- comparison, but should be based on iseq contents. [ruby-dev:37101]
-
-Tue Nov 18 20:30:08 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/net/ftp.rb (Net::FTP#open_socket): SOCKSsocket is obsolete.
- a patch from Alan Johnson <alan.wayne.johnson at gmail.com> in
- [ruby-core:19982].
-
-Tue Nov 18 16:18:23 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/logger.rb (ProgName): fixed for svn, based on a patch from
- Nobuhiro IMAI at [ruby-dev:37108].
-
-Tue Nov 18 15:56:55 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/webrick/httprequest.rb (WEBrick::HTTPRequest#read_request_line):
- use possessive match for path retrieval to avoid huge recursion
- for insanely long path.
-
-Tue Nov 18 15:50:11 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * re.c (rb_reg_desc): re might be NULL.
-
- * regerror.c (onig_error_code_to_format): message updated.
-
-Tue Nov 18 09:42:11 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/optparse.rb (OptionParser::make_switch): makes default
- conversion to splat. [ruby-list:45645]
-
-Mon Nov 17 18:05:16 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * enc/depend (LIBS): fixed for disable-shared. [ruby-dev:37103]
-
-Mon Nov 17 11:12:24 2008 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-
- * bin/erb: remove -K option.
-
-Mon Nov 17 02:19:03 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (LIBRUBYARG_STATIC): fixed for --enable-rpath.
-
-Sat Nov 15 22:46:32 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * re.c (rb_reg_regsub): returns -1 unless ascii as well as
- rb_enc_ascget(). [ruby-dev:37097]
-
-Sat Nov 15 22:23:45 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (LDSHARED): do not suppress debug info if higher debug
- level is given, on cygwin and mingw.
-
-Fri Nov 14 20:27:46 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * README.EXT, README.EXT.ja, vm_exec.c, vm_insnhelper.c: update
- filenames.
-
-Thu Nov 13 11:31:13 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread.c (rb_barrier_wait): gets rid of recursive deadlock.
-
-Thu Nov 13 06:08:44 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread.c (rb_barrier_{new,wait,release,destroy}): use Mutex so that
- circular requires fail with deadlock. [ruby-core:19821]
-
-Wed Nov 12 07:16:01 2008 David Flanagan <david@think32>
-
- * ruby.c (set_internal_encoding_once): fix typo in error string
-
-Wed Nov 12 03:30:59 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/intern.h (rb_{external,locale}_str_new_cstr): optimized
- versions for literal strings.
-
-Wed Nov 12 03:28:41 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * load.c (rb_require_safe): destroys barrier after successfully
- loaded, to get rid of loading same library again. [ruby-core:19798]
-
- * thread.c (rb_barrier_wait): can not wait destroyed barrier.
-
- * thread.c (rb_barrier_destroy): destroys barrier so that no longer
- waited.
-
-Tue Nov 11 23:02:27 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * man/ruby.1 (RUBYOPT): wrote which option can appear.
- (--yydebug): wrote "do not use".
- (--dump): wrote "do not use".
-
-Tue Nov 11 21:22:28 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/uri/generic.rb (URI::Generic#check_path): REL_PATH should a
- symbol. [ruby-core:19805]
-
-Tue Nov 11 20:49:29 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * configure.in: fix SEGV on Mac OS X 10.5.3 with pthread.
- a patch from Wataru Kimura in Bug #193 [ruby-core:17333].
-
-Tue Nov 11 20:39:27 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date.rb (inspect): reverted the previous change.
-
-Tue Nov 11 17:35:25 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (rb_w32_accept): secure fd before accept because if
- error causes in securing, cannot restore the state of accepted
- socket.
- fixed [ruby-core:19728]
-
-Tue Nov 11 14:40:40 2008 Martin Duerst <duerst@it.aoyama.ac.jp>
-
- * test/ruby/test_transcode.rb: unnecessary setup method
- (setup_really_needed?) removed
-
-Tue Nov 11 14:25:25 2008 Martin Duerst <duerst@it.aoyama.ac.jp>
-
- * enc/trans/single_byte.trans, macgreek-tbl.rb, macroman-tbl.rb,
- macromania-tbl.rb, macturkish-tbl.rb, macukraine-tbl.rb,
- ibm437-tbl.rb, ibm852-tbl.rb, ibm855-tbl.rb, ibm857-tbl.rb,
- ibm860-tbl.rb, ibm861-tbl.rb, ibm862-tbl.rb, ibm863-tbl.rb,
- ibm865-tbl.rb, ibm866-tbl.rb, ibm869-tbl.rb, ibm775-tbl.rb:
- new single-byte transcodings (from Yoshihiro Kambayashi)
-
- * test/ruby/test_transcode.rb: added tests for the above
- (from Yoshihiro Kambayashi)
-
-Tue Nov 11 13:20:23 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/bigdecimal/bigdecimal.c (BigDecimal_to_r): moved from
- bigdecimal/util, converted into C. [ruby-dev:36805]
-
-Tue Nov 11 07:55:57 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date.rb (inspect): changed the format.
-
-Mon Nov 10 17:34:50 2008 Akinori MUSHA <knu@iDaemons.org>
-
- * test/sdbm/test_sdbm.rb (TestSDBM#test_index): Reflect the method
- name change from #index to #key and remove a duplicated test
- method.
-
-Mon Nov 10 10:50:43 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/delegate.rb (Delegator.delegating_block): should not refer
- DelegateClass specific @delegate_dc_obj. a patch from Erik
- Hollensbe in [ruby-core:19671].
-
-Mon Nov 10 09:54:21 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (ifs_open_socket): should retry without proto_buffer
- if cannot find the suitable protocol. a patch from Heesob Park.
- fixed [ruby-core:19713]
-
-Sun Nov 9 13:04:52 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * struct.c (rb_struct_initialize_m): avoid unnecessary array
- allocation.
-
-Sun Nov 9 04:10:19 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm_dump.c (control_frame_dump): suppresses finished method name.
-
-Sun Nov 9 00:30:52 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread_pthread.c (thread_timer): checks working flags again.
-
-Sun Nov 9 00:02:01 2008 Takeyuki FUJIOKA <xibbar@ruby-lang.org>
-
- * lib/cgi/session/pstore.rb: fix indentation.
-
-Sat Nov 8 23:47:45 2008 Takeyuki FUJIOKA <xibbar@ruby-lang.org>
-
- * lib/cgi/session.rb (FileStore): use marshalized data.
-
- * test/cgi/session_dir: add a session directory in test.
-
- * test/cgi/test_cgi_session.rb: add a test.
-
-Sat Nov 8 21:57:03 2008 Takeyuki FUJIOKA <xibbar@ruby-lang.org>
-
- * lib/cgi/session.rb: remove debug code.
-
-Sat Nov 8 21:33:53 2008 Takeyuki FUJIOKA <xibbar@ruby-lang.org>
-
- * lib/cgi/session.rb: fix indentation.
-
-Sat Nov 8 18:11:14 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/webrick/httpproxy.rb (WEBrick::HTTPProxyServer#do_CONNECT):
- use #bytesize instead of #size. a patch submitted from
- raspberry lemon in [ruby-core:18571].
-
- * lib/webrick/httpauth/digestauth.rb, lib/webrick/httpproxy.rb,
- lib/webrick/httprequest.rb, lib/webrick/httpservlet/cgi_runner.rb,
- lib/webrick/httpservlet/abstract.rb, lib/webrick/httpresponse.rb,
- lib/webrick/httpservlet/cgihandler.rb, lib/webrick/utils.rb: ditto.
-
-Sat Nov 8 17:31:41 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/stringio/stringio.c (strio_ungetc): ungetc position should
- not be changed from 1.8. [ruby-core:19632]
-
-Sat Nov 8 17:15:08 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/optparse.rb (OptionParser#make_switch): 1.9 Symbols respond
- to :match. a patch from keith cascio, <keith at ucla.edu>.
- [ruby-core:19730]
-
-Sat Nov 8 12:10:15 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/gdbm/gdbm.c (fgdbm_index): make #index warn like Hash.
- [ruby-dev:37039]
-
- * ext/sdbm/init.c (Init_sdbm): typo fixed. [ruby-dev:37039]
-
-Sat Nov 8 07:07:48 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * configure.in: detect stdio buffer pointers for uClibc. a patch
- from Brian Candler <B.Candler at pobox.com> in [ruby-core:12020].
- [ruby-core:19713]
-
-Sat Nov 8 06:51:42 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/dbm/dbm.c (fdbm_index): make #index warn like Hash.
-
- * ext/dbm/dbm.c (fdbm_key): new method.
-
- * ext/sdbm/init.c: ditto.
-
-Sat Nov 8 06:20:42 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/curses/curses.c: curses encoding should obey locale.
-
- * ext/curses/curses.c (curses_getch): 1.9 getch should return one
- character string for single byte string. wchar_t support may
- follow in the future.
-
-Sat Nov 8 05:46:50 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/io.h (rb_io_t): added write_lock to serialize.
- [ruby-core:19668]
-
- * gc.c (gc_mark_children): mark write_lock.
-
- * gc.c (rb_gc_call_finalizer_at_exit): Mutex also needs to be
- deferred.
-
- * io.c (io_fflush, io_binwrite, fptr_finalize): serializes writing.
-
-Sat Nov 8 05:31:25 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * safe.c (safe_setter): add warning for $SAFE=3.
-
-Sat Nov 8 01:48:07 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread_pthread.c (rb_thread_create_timer_thread): do not wait never
- coming signal if failed to create timer thread.
-
- * thread_pthread.c (native_cond_timedwait): returns error code.
-
- * thread_pthread.c (thread_timer): typo fixed.
-
-Sat Nov 8 01:14:16 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread_pthread.c (thread_timer, rb_thread_create_timer_thread):
- handshakes properly.
-
-Fri Nov 7 22:51:49 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * inits.c (rb_call_inits): do not repeat.
-
-Fri Nov 7 22:46:57 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread_pthread.c (thread_timer): initializes mutex each time.
-
-Fri Nov 7 21:23:02 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread_win32.c (thread_start_func_1): use already gotten stack info.
-
-Fri Nov 7 12:26:00 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/irb.rb (IRB::Irb#eval_input): remove extra @context.prompt_i.
- [ruby-core:19718]
-
-Fri Nov 7 11:55:30 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * nkf.c: update to r1.188. fixes for 16bit environment.
-
-Fri Nov 7 07:43:27 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread.c (thread_timer): pthread_cond_timedwait returns ETIMEDOUT
- when timed out.
-
-Fri Nov 7 07:32:55 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/yaml/rubytypes.rb: support Rational and Complex as 1.8
- does. a patch from Hiroshi Moriyama in [ruby-dev:36899].
-
-Fri Nov 7 07:12:06 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread_pthread.c (thread_timer): uses pthread_cond_timedwait always
- instead of pthread_kill.
-
-Fri Nov 7 06:58:59 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (Init_String): remove Symbol#===. [ruby-dev:37026]
-
-Fri Nov 7 04:02:22 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread.c (thread_timer): uses timedwait on cygwin.
-
-Fri Nov 7 02:00:12 2008 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/rexml/entity.rb (unnormalized): do not call
- document.record_entity_expansion if document is nil.
- see <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=502535>.
- Thanks, Naohisa Goto.
-
- * test/rexml/test_document.rb: ditto.
-
-Fri Nov 7 01:24:20 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * tool/make-snapshot: binary encoding spec is no longer needed in 1.9.
-
-Thu Nov 6 22:21:23 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread.c (rb_thread_stop_timer_thread): terminates timer thread
- immediately.
-
-Thu Nov 6 21:21:46 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (fole_s_connect, fole_initialize,
- folevariant_initialize): check argument type of WIN32OLE.connect,
- WIN32OLE.new, WIN32OLE_VARIANT.new.
-
- * test/win32ole/test_win32ole.rb (test_s_new_exc, test_s_connect_exc):
- ditto.
-
- * test/win32ole/test_win32ole_variant.rb (test_s_new_exc): ditto.
-
- * test/win32ole/test_win32ole_method.rb: add assertion of
- WIN32OLE_METHOD.new.
-
-Tue Nov 4 13:08:01 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * lib/test/unit.rb (Test::Unit.setup_argv): now can specify ``-xname''
- instead of ``-x name''.
-
-Tue Nov 4 08:00:00 2008 TAKANO Mitsuhiro (takano32) <tak@no32.tk>
-
- * test/zlib/test_zlib.rb(test_readchar): compare in same type.
-
-Tue Nov 4 03:28:31 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * array.c (rb_ary_join): do not repeat self in a recursive array.
- [ruby-dev:37019]
-
-Tue Nov 4 01:56:46 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/intern.h (rb_mutex_synchronize): fixed prototype.
-
- * thread.c (rb_mutex_synchronize): fixed function name.
-
-Mon Nov 3 16:32:54 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * missing.h: needs RUBY_EXTERN instead of extern for mswin.
-
-Mon Nov 3 13:01:13 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * array.c (rb_ary_take_first_or_last): renamed rb_ary_partial more
- appropriately.
- (ary_take_pos_flags): new enum. makes the fourth argument of
- rb_ary_take_first_or_last more descriptive.
- (rb_ary_partial): renamed rb_ary_partial0 more appropriately.
- takes a new parameter klass for what class to instantiate.
-
-Mon Nov 3 13:00:26 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * range.c (rb_range_beg_len): rb_raise takes C values as arguments.
- [BUG] ranges turned into other value in a message of RangeError.
-
-Mon Nov 3 00:36:44 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * test/win32ole/test_win32ole_event.rb: rename test class.
-
- * test/win32ole/test_win32ole_variant_outarg.rb: add in order
- to use ADO instead of Internet Explorer.
- remove test/win32ole/test_win32ole_variant_with_ie.rb.
-
- * test/win32ole/orig_data.csv: ditto.
-
-Sun Nov 2 23:08:08 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * test/win32ole/test_err_in_callback.rb: add teardown.
-
-Sun Nov 2 22:12:41 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (ole_event_free): invoke IConnectionPoint::Unadvise
- before invoking IConnectionPoint::Release.
-
- * test/win32ole/test_win32ole_event.rb, test/win32ole/err_in_callback.rb,
- test/win32ole/test_err_in_callback.rb: Use ActiveX Data Object
- Library instead of InternetExplorer.
-
-Sun Nov 2 22:06:55 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * win32/Makefile.sub: add RUNRUBYOPT. [ruby-dev:37009]
-
-Sun Nov 2 16:41:52 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/zlib/zlib.c (Init_zlib): defines readbyte instead redefining
- readchar.
-
-Sat Nov 1 07:09:40 2008 Eric Hodel <drbrain@segment7.net>
-
- * gem_prelude.rb: Don't require rubygems/defaults.rb.
-
-Fri Oct 31 21:58:50 2008 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/converter.rb (RSS::Converter): use String#encode.
-
-Fri Oct 31 21:28:14 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * lib/webrick/httpauth/digestauth.rb
- (WEBrick::HTTPAuth::DigestAuth#initialize): fix typo.
-
-Fri Oct 31 18:51:42 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * test/ruby/test_array.rb (test_array_subclass): test for r20076.
-
-Fri Oct 31 18:42:19 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * array.c (ary_partial0): recovers the mistakenly changed feature at r19723.
- Array#[m,n] had returned an Array even for an instance of a
- subclass.
-
-Fri Oct 31 18:05:05 2008 Martin Duerst <duerst@it.aoyama.ac.jp>
-
- * enc/trans/single_byte.trans, maccroatioan-tbl.rb,
- maccyrillic-tbl.rb, maciceland-tbl.rb: new single-byte
- transcodings (from Yoshihiro Kambayashi)
-
- * test/ruby/test_transcode.rb: added tests for the above
- (from Yoshihiro Kambayashi)
-
-Fri Oct 31 12:51:25 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * dir.c (dir_globs): need taint check. reported by steve
- <oksteev at gmail.com>
-
-Fri Oct 31 12:42:45 2008 wanabe <s.wanabe@gmail.com>
-
- * array.c (rb_ary_decrement_share): fix to work recycling
- shared-array without the following. [ruby-dev:36991]
-
- * array.c (ary_make_substitution): don't recycle substitution array.
-
-Fri Oct 31 12:27:52 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * spec/default.mspec: supports that the build directory != srcdir.
-
-Fri Oct 31 11:35:38 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * encoding.c (rb_enc_set_default_internal): no alias "internal" if
- default internal is not set. [ruby-dev:37000]
-
-Fri Oct 31 08:16:14 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (process_options): delays setting safe level.
- [ruby-dev:36997]
-
-Thu Oct 30 21:32:15 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * array.c (rb_ary_permutation): hide temporal array.
-
-Thu Oct 30 14:45:45 2008 Martin Duerst <duerst@it.aoyama.ac.jp>
-
- * enc/trans/single_byte.trans: refactoring to make it easier
- to add more transcodings (with Yoshihiro Kambayashi)
-
- * enc/trans/iso-8859-1-tbl.rb: new file to avoid having to
- treat ISO-8859-1 as special
-
-Thu Oct 30 14:10:46 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * pack.c (pack_pack): templates a, A, Z should propagate encoding
- of original strings. templates b, B, h, H brings ASCII-8BIT to
- the result.
-
-Thu Oct 30 10:34:20 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (moreswitches): splits option string and passes arguments.
-
- * ruby.c (proc_options): checks if allowed in RUBYOPT.
-
- * ruby.c (process_options): allows long style options in RUBYOPT.
-
- * ruby.c (load_file_internal): ditto in shebang. [ruby-dev:36979]
-
-Thu Oct 30 09:31:45 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * encoding.c (rb_locale_encoding): makes an alias for locale.
- [ruby-dev:36976]
-
- * encoding.c (rb_enc_set_default_external): ditto for external.
-
- * encoding.c (rb_enc_set_default_internal): ditto for internal.
-
-Thu Oct 30 03:30:25 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ruby.c (load_file_internal): should not set script encoding to
- ASCII-8BIT.
-
- * ruby.c (load_file_internal): do not auto convert scripts even
- when default_internal is set. [ruby-core:19579]
-
-Thu Oct 30 02:20:33 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * array.c (rb_ary_sort_bang): remove SEGV when replacing array with
- embedded one during sort. [ruby-dev:36983]
-
- * test/ruby/test_array.rb (test_sort!): add tests for above.
-
-Thu Oct 30 01:44:23 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_array.rb: add some tests.
-
-Thu Oct 30 01:32:15 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * array.c (rb_ary_splice): remove redundant check.
-
-Thu Oct 30 01:24:55 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * string.c (rb_str_cmp): fix condition which always returned true
- because ENCODING_GET returns unsigned long.
-
-Thu Oct 30 01:10:32 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_array.rb (test_permutation): add a test that replaces
- array during permutation.
-
-Wed Oct 29 23:31:34 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_check_dummy_enc): new function to check dummy
- encoding.
-
- * string.c (rb_str_upcase_bang): case conversion functions should
- not be applicable to strings in dummy encoding. [ruby-dev:36985]
-
-Wed Oct 29 23:57:29 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * array.c (rb_ary_sort_bang): replacing array during sort broke
- invariant of array. [ruby-dev:36983]
-
-Wed Oct 29 21:06:46 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_io_rewind): should reset fptr->readconv if it's
- available.
-
- * io.c (more_char): clear readconv at EOF.
-
- * test/ruby/test_file.rb: should not read after EOF. use rewind
- instead.
-
-Wed Oct 29 20:45:08 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/webrick/utils.rb (start_server): provide a reference to log of
- webrick.
-
- * test/webrick/test_httpproxy.rb, test/webrick/test_httpauth.rb,
- test/webrick/test_cgi.rb, test/webrick/test_httpserver.rb,
- test/webrick/test_server.rb, test/webrick/test_filehandler.rb: use
- webrick log as an assertion message.
-
-Wed Oct 29 16:41:17 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * pack.c (pack_pack): set encoding from packing string and UTF-8 for
- "U". [ruby-core:19590]
-
-Wed Oct 29 15:50:00 2008 TAKANO Mitsuhiro (takano32) <tak@no32.tk>
-
- * complex.c (imp1, imp2): should declare type.
- [BUG] at IA-64
-
-Wed Oct 29 14:36:50 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (revision.h): have to be updated daily or by non-trivial
- commits.
-
-Wed Oct 29 13:18:02 2008 Akinori MUSHA <knu@iDaemons.org>
-
- * README, README.ja: Update the portability section.
-
-Wed Oct 29 13:02:17 2008 Akinori MUSHA <knu@iDaemons.org>
-
- * configure.in (rb_cv_lib_xpg4_needed): Drop legacy FreeBSD
- support regarding libxpg4. Those old versions of FreeBSD
- shipped with the library don't have a working pthread library
- anyway.
-
-Wed Oct 29 11:50:57 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (dln-a-out): cannot make shared library nor work with
- ELF. [ruby-core:19571]
-
-Wed Oct 29 11:00:25 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (rb_w32_open): shouldn't seek here.
-
- * win32/win32.c (rb_w32_write): write to the end of the file when
- FAPPEND is specified.
-
-Wed Oct 29 09:30:04 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (load_file_internal): cache common interned IDs.
-
-Wed Oct 29 00:43:39 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c: uses macro in declarations.
-
-Wed Oct 29 00:26:00 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (rb_w32_open): need to seek to the end of the file when
- O_APPEND is specified.
-
-Wed Oct 29 00:08:05 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * math.c (rb_math_{atan2,cos,cosh,hypot,log,sin,sinh,sqrt}): added.
-
- * complex.c: follows the above change.
-
-Tue Oct 28 23:29:06 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/nkf/nkf-utf8/nkf.c (kanji_convert): output unicode chars.
- [ruby-dev:36957]
-
- * ext/nkf/nkf-utf8/nkf.c (numchar_getc): increase buffer size.
- reported and patched at [ruby-dev:36957] by mame.
-
-Tue Oct 28 23:03:46 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * test/ruby/test_proc.rb: filled all patterns for testing
- vm_yield_setup_args.
-
-Tue Oct 28 23:05:35 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c: continues to support canonicalization *unofficially*
- for an odd library mathn for the time being (only 1.9.x).
- since grand mathn must be very very special library for us.
-
- * rational.c: ditto.
-
- * ext/mathn/*/*: follow the above changes.
-
-Tue Oct 28 21:31:55 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * parse.y (parser_yylex): check EOF explicitly.
-
-Tue Oct 28 20:59:12 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * io.c (extract_binmode): new function to extract binmode/textmode
- options from hash.
-
- * io.c (rb_io_extract_modeenc): use above function.
-
- * io.c (rb_io_s_pipe): recognize binmode/textmode options.
-
-Tue Oct 28 20:15:49 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * io.c (make_readconv): now can specify the size of cbuf.
-
- * io.c (read_all, appendline, io_getc, rb_io_ungetc): follow above
- change.
-
-Tue Oct 28 19:00:51 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (rb_w32_pipe_exec): internal fds should be always
- binmode.
-
-Tue Oct 28 17:21:18 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * tool/make-snapshot.rb: merged from ruby_1_9_1.
-
-Tue Oct 28 16:56:31 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * gem_prelude.rb: merged from ruby_1_9_1 branch.
- considers --program-suffix and prefix configure options.
-
- * lib/rubygems/defaults.rb: ditto.
-
- * test/rubygems/test_gem.rb (@default_dir_re): ditto.
-
-Tue Oct 28 16:13:36 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * tool/make-snapshot: use String#bytesize.
-
-Tue Oct 28 09:51:48 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * bootstraptest/test_thread.rb: ignore some exceptions.
- [ruby-dev:36951]
-
-Tue Oct 28 09:19:40 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/Makefile.sub (RUNRUBY): now ruby requires something from
- gem_prelude, so need to set library path.
-
-Mon Oct 27 22:29:11 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * vm_insnhelper.c (vm_yield_setup_args): supports optional parameters.
- Fixed [ruby-core:19503].
-
- * vm_insnhelper.c (vm_yield_setup_block_args): a new function. extracted
- from vm_yield_setup_args.
-
- * vm_insnhelper.c (vm_yield_setup_block_args_complex): ditto.
-
- * test/ruby/test_proc.rb: added tests for arguments on a Proc from
- Kernel#proc called.
-
-Mon Oct 27 20:03:05 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/mathn/complex/complex.c: no need to define rb_cComplex because
- it's already defined at $(srcdir)/complex.c.
-
- * ext/mathn/rational/rational.c: no need to define rb_cRational because
- it's already defined at $(srcdir)/rational.c.
-
-Mon Oct 27 15:58:25 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (load_file): preserves $.. [ruby-dev:36937]
-
- * io.c (argf_init): initial value of $. should be 0.
- see [ruby-dev:36937].
-
-Mon Oct 27 15:38:38 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * test/minitest/test_mini_test.rb
- (test_assert_raises_triggered_different): the test failed when a
- file path in the backtrace contains something except [\w\/\.],
- e.g. hyphen, Japanese characters or backslash.
-
- * test/minitest/test_mini_test.rb
- (test_assert_raises_triggered_subclass): ditto.
-
-Mon Oct 27 15:32:08 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * test/minitest/test_mini_test.rb: fixed that r19958 made
- test-all fail when the ruby was built at $(srcdir).
-
-Mon Oct 27 12:04:58 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * test/ruby/envutil.rb: reverted the changeset 19948 because it
- concealed unexpected behaviours of ruby.
-
- * test/ruby/test_io.rb: ditto.
-
-Mon Oct 27 12:02:53 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * ext/nkf/nkf.c (rb_nkf_convert): should specify type of variable.
-
-Mon Oct 27 11:34:56 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * test/minitest/test_mini_test.rb (test_filter_backtrace):
- fixed failure on Ruby built at out of $(srcdir).
-
- * test/minitest/test_mini_test.rb (test_Filter_backtrace_unit_starts):
- ditto.
-
-Mon Oct 27 10:02:47 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * io.c (read_all): the 3rd argument maybe Qnil.
-
-Mon Oct 27 01:29:55 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/nkf/test_nkf.rb: add a test for [ruby-dev:36909].
-
-Mon Oct 27 01:05:48 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/nkf/nkf.c (rb_nkf_convert): avoid GC.
- reported in [ruby-dev:36909] and patched [ruby-dev:36941] by mame.
-
-Sun Oct 26 21:28:42 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/json/test_json.rb: remove dependency on permutation gem.
-
-Sun Oct 26 19:18:36 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread.c (blocking_region_{begin,end}): declared as inline.
-
- * util.c (freedtoa): used only when MULTIPLE_THREADS is not defined.
-
- * win32/win32.c (rb_w32_pipe): serial is DWORD.
-
- * ext/etc/etc.c (sGroup): getgrent may not be available.
-
-Sun Oct 26 18:11:40 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/io/wait/{extconf.rb,wait.c}: needs sys/ioctl.h for fcntl on
- cygwin.
-
-Sun Oct 26 18:18:39 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * gem_prelude.rb: disables debug and verbose flags to suppress failure
- messages. interpolation does not occur inside single quotes.
-
-Sun Oct 26 18:42:21 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/ruby/envutil.rb (assert_in_out_err): disables builtin rubygems
- to get rid of the interference.
-
- * test/ruby/test_io.rb (ruby): ditto.
-
-Sun Oct 26 13:30:28 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (read_all): use the given buffer to read when needs readconv.
- based on the patch by wanabe <s.wanabe AT gmail.com> at
- [ruby-dev:36931].
-
-Sun Oct 26 07:57:35 2008 Eric Hodel <drbrain@segment7.net>
-
- * lib/rubygems*: Update to RubyGems 1.3.1 r1909.
-
-Sun Oct 26 07:35:56 2008 Ryan Davis <ryand-ruby@zenspider.com>
-
- * lib/minitest/unit.rb: Imported minitest 1.3.0 r4429.
- * test/minitest/*: ditto.
-
-Sun Oct 26 02:16:29 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * configure.in ($MANTYPE): followed ruby.1, which had moved.
-
- * instruby.rb (:man): ditto.
-
- * mdoc2man.rb: fixed for the case Xr with 2 arguments.
-
-Sun Oct 26 01:42:45 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * man/irb.1: new manual page.
-
-Sun Oct 26 00:11:48 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * man/ruby.1: moved into man/. added some descriptions.
-
- * man/goruby.1: new file.
-
- * instruby.rb (:man): followed ruby.1.
-
-Sat Oct 25 20:05:22 2008 Narihiro Nakamura <authorNari@gmail.com>
-
- * gc.c (gc_profile_result): bug fix. The millisecond is 1/1000.
-
-Sat Oct 25 11:12:40 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * ruby.c (usage): updated the description of -E option.
-
-Sat Oct 25 09:54:10 2008 James Edward Gray II <jeg2@ruby-lang.org>
-
- * lib/csv.rb: Fixed a bug in read_to_char() that would slurp
- whole files if the encoding was invalid. It will now read
- up to 10 bytes ahead to find a valid character boundary or
- give up. [ruby-core:19465]
-
- * test/csv/test_features.rb, test/csv/test_table.rb, test/csv/test_row.rb:
- Loosened some tests to check for a compatible? Encoding instead
- of an exact Encoding. [ruby-core:19470]
-
-Sat Oct 25 07:42:49 2008 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc*: Update to RDoc 2.2.2 r192.
-
-Sat Oct 25 04:00:31 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * enc/us_ascii.c (us_ascii_mbc_enc_len): made static. a patch by
- Tadashi Saito <shiba AT mail2.accsnet.ne.jp> at [ruby-dev:36916]
-
- * signal.c (signal_buff): made static. a patch by Tadashi Saito
- <shiba AT mail2.accsnet.ne.jp> at [ruby-dev:36915]
-
- * util.c (freedtoa): made static to get rid of name clash. a patch by
- Tadashi Saito <shiba AT mail2.accsnet.ne.jp> at [ruby-dev:36913]
-
- * util.c (ruby_dtoa): added prefix, ditto.
-
-Sat Oct 25 03:43:25 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (lambda): need to adjust lpar_beg for both of the parser and
- ripper.
-
-Sat Oct 25 01:29:34 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/mathn/rational/rational.c: undef duplicated macro definition
- first to shut up the warning.
-
- * ext/mathn/rational/rational.c (rb_rational_new_mathn): specify
- omitted return value.
-
-Sat Oct 25 00:14:41 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * array.c (rb_ary_sample): fixed sizes and randomness.
-
-Fri Oct 24 23:04:42 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * configure.in (sitedir): considers --program-prefix and
- --program-suffix.
- (vendordir): ditto.
- (rubyhdrdir): ditto.
-
- * mkconfig.rb (CONFIG["rubylibdir"]): ditto.
-
- * win32/Makefile.sub: ditto.
-
- * instruby.rb (:rdoc): ditto.
-
- * lib/rdoc/ri/paths.rb (RDoc::RI::Paths): ditto.
-
-Fri Oct 24 22:59:27 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_array.rb (test_sample): add tests for size of
- returned array and randomness.
-
-Fri Oct 24 21:50:21 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * id.h, template/id.h.tmpl (enum ruby_method_ids): reordered.
-
-Fri Oct 24 21:19:45 2008 Keiju Ishitsuka <keiju@ruby-lang.org>
-
- * ext/mathn/rational.c: change several global functions.
-
-Fri Oct 24 21:05:38 2008 Takeyuki FUJIOKA <xibbar@ruby-lang.org>
-
- * lib/cgi/html.rb: allow symbolized key.
-
- * test/cgi/test_cgi_tag_helper.rb: add a test.
-
-Fri Oct 24 20:54:53 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (exts): renamed to get rid of the existent directory.
-
-Fri Oct 24 20:45:41 2008 Keiju Ishitsuka <keiju@ruby-lang.org>
-
- * ext/mathn/rational.c: change several global functions to static
- function.
-
-Fri Oct 24 19:57:19 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_dump): should have removed commented out
- unnecessary code. [ruby-cvs:27131]
-
-Fri Oct 24 19:16:36 2008 URABE Shyouhei <shyouhei@ruby-lang.org>
-
- * id.h (enum ruby_method_ids): ISO C forbids comma at end of
- enumerator list.
-
-Fri Oct 24 18:29:00 2008 Keiju Ishitsuka <keiju@ruby-lang.org>
-
- * lib/mathn.rb: moved into ext/mathn/rational/rational.c and
- ext/mathn/complex/complex.c.
- * ext/mathn: new mathn ext-libraries.
-
-Fri Oct 24 18:21:31 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * test/ruby/test_array.rb (TestArray#test_join): should restore
- global variable after the test. [ruby-dev:36896]
-
- * test/ruby/test_hash.rb (TestHash#test_to_s): ditto.
-
-Fri Oct 24 17:43:26 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (lambda): need to adjust lpar_beg for ripper as well.
- [ruby-dev:36702]
-
-Fri Oct 24 16:13:12 2008 Takeyuki FUJIOKA <xibbar@ruby-lang.org>
-
- * lib/cgi/core.rb (read_multipart): change field value as String
- from StringIO or Tempfile when multipart parse except file field.
- add files method that can get uploaded files. [ruby-dev:36547]
-
- * test/cgi/test_cgi_multipart.rb: fix the test for core.rb.
-
-Fri Oct 24 14:22:48 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (ext): split out the target for extension library.
-
- * common.mk (encs): depends on enc and trans.
-
-Fri Oct 24 10:23:24 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * test/ruby/test_signal.rb (TestSignal#test_exit_action): Thread
- may terminate before sysread. [ruby-dev:36835]
-
-Thu Oct 23 22:06:23 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * distruby.rb: removed. "make dist" uses tool/make-snapshot for the 1.9
- series. distruby.rb has been no longer used.
-
-Thu Oct 23 17:30:29 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * class.c (rb_class_instance_methods): rdoc fixed. [ruby-core:19458]
-
-Thu Oct 23 16:19:33 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/irb/init.rb (IRB.load_modules): catch LoadError explicitly.
- a patch from Daniel Berger <Daniel.Berger at qwest.com> in
- [ruby-core:19451]. fix [ruby-core:19450]
-
-Thu Oct 23 16:16:17 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/socket/socket.c (sock_s_getservbyport): check if the port range.
- [ruby-core:19460]
-
-Thu Oct 23 14:08:07 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/socket/socket.c (sock_s_getservbyname): unuse unnecessary
- object.
-
- * ext/socket/socket.c (sock_s_getservbyport): the port should be
- converted before the proto so that the #to_int of the former cannot
- alter the latter.
-
-Thu Oct 23 10:55:08 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_dump): use \u{ff} escape for UTF-8 encoding
- string.
-
-Thu Oct 23 09:26:22 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/socket/socket.c (sock_s_getservbyport): cast to get rid of
- warning.
-
-Thu Oct 23 08:06:03 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/socket/socket.c (sock_s_getservbyport): port should be
- network byte order. a patch from Dave Thomas in [ruby-core:19454].
-
-Thu Oct 23 01:26:25 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_conv_enc_opts): new function to convert with
- specifying ecflags and ecopts.
-
- * ext/zlib/zlib.c (gzfile_newstr): specify ecflags and ecopts for
- conversion using above function.
-
- * ext/zlib/zlib.c (gzfile_newstr): use own rb_econv_t for dummy
- encoding to handling stateful encoding (e.g. iso-2022-jp).
- [ruby-dev:36857]
-
- * ext/zlib/zlib.c (gzfile_getc): ditto.
-
-Thu Oct 23 01:24:49 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb (create_tmpsrc): get rid of side effects.
-
-Thu Oct 23 00:10:01 2008 Koichi Sasada <ko1@atdot.net>
-
- * cont.c: separate data structure between rb_fiber_t and
- rb_context_t (rb_fiber_t includes rb_context_t).
- rb_fiber_t has double linked list of fibers in same threads.
-
-Wed Oct 22 17:25:17 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (pipe_open): remove unnecessary flush before fork.
- a patch from Kazuhiro NISHIYAMA <zn at mbf.nifty.com>
- in [ruby-dev:36840].
-
-Wed Oct 22 16:27:57 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm_insnhelper.c (vm_yield_setup_args): should not drop arguments
- corresponding to default parameters.
-
-Wed Oct 22 14:59:30 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (f_larglist): should not allow semicolon separated local
- variable declarations if formal argument list is not surrounded
- by parentheses, mostly because semicolon outside of parentheses
- appears to terminate the expression.
-
-Wed Oct 22 14:52:17 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_external_str_new_with_enc): no implicit strlen call.
- [ruby-dev:36854]
-
- * string.c (rb_external_str_new_cstr): new function to create
- string from external NUL terminated C string.
-
- * string.c (rb_locale_str_new_cstr): ditto.
-
- * ext/readline/readline.c: now use rb_locale_str_new_cstr().
-
- * test/sdbm/test_sdbm.rb (TestSDBM#test_delete_with_block):
- deleted key to the block may be a copy of specified key.
-
- * test/dbm/test_dbm.rb (TestDBM#test_delete_with_block): ditto.
-
-Wed Oct 22 13:16:47 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * re.c (unescape_escaped_nonascii): back out the last change on
- the function. [ruby-dev:36818]
-
-Wed Oct 22 07:09:19 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/zlib/zlib.c (rb_gzreader_ungetc): should be able to unget
- Fixnum.
-
- * ext/stringio/stringio.c (strio_ungetc): should convert unget
- string.
-
- * ext/stringio/stringio.c (strio_ungetbyte): new method.
-
-Wed Oct 22 05:46:25 2008 Koichi Sasada <ko1@atdot.net>
-
- * include/ruby/vm.h: write a comment.
-
- * common.mk: remove vm.h from any rules.
- vm.h is not needed on this version.
-
- * vm_core.h: ditto.
-
-Wed Oct 22 05:39:39 2008 Koichi Sasada <ko1@atdot.net>
-
- * parse.y (arg_concat_gen): concat target node should be NODE_ARRAY.
- [ruby-core:19413]
-
- * bootstraptest/test_method.rb: add tests.
-
-Wed Oct 22 00:29:13 2008 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-
- * test/rinda/test_rinda.rb (test_core_03_notify): Fixed test failures
- [ruby-dev:36837].
-
-Wed Oct 22 00:22:06 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_external_str_new_with_enc): wrong condition to
- calculate strlen().
-
- * ext/readline/readline.c: add encoding support.
-
-Tue Oct 21 23:12:24 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/stringio/stringio.c (strio_write): should convert writing
- string to the encoding of the buffer.
-
- * hash.c (rb_any_hash): typo fixed.
-
- * ext/zlib/zlib.c (rb_gzwriter_write): oops, IO string conversion
- need to be done by to_s.
-
-Tue Oct 21 22:38:58 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (open_key_args): should adjust argc, argv in struct
- foreach_arg.
-
-Tue Oct 21 21:52:00 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/zlib/zlib.c (rb_gzwriter_write): conversion should be done
- using to_str, not to_s.
-
- * ext/zlib/zlib.c (rb_gzwriter_write): need proper conversion
- according to gz encoding.
-
- * ext/zlib/zlib.c (rb_gzreader_ungetc): convert string encoding
- before unget.
-
-Tue Oct 21 21:33:36 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/test/unit.rb (assert_nothing_raised): raise with backtrace.
-
-Tue Oct 21 20:12:19 2008 Tanaka Akira <akr@fsij.org>
-
- * lib/test/unit.rb (assert_nothing_raised): set backtrace.
-
-Tue Oct 21 18:17:42 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/zlib/zlib.c: remove obsolete prototype macros.
-
- * ext/zlib/zlib.c (struct gzfile): add encoding field to gzfile
- structure.
-
- * ext/zlib/zlib.c (rb_gzreader_getc): now works on characters.
-
- * ext/zlib/zlib.c (rb_gzreader_getbyte): new method to retrieve
- single byte.
-
- * ext/zlib/zlib.c (rb_gzreader_readbyte): ditto.
-
- * ext/zlib/zlib.c (rb_gzreader_each_byte): renamed from each_char
-
- * ext/zlib/zlib.c (rb_gzreader_ungetc): allow unget strings.
-
- * ext/zlib/zlib.c (rb_gzreader_ungetbyte): renamed from ungetc.
-
-Tue Oct 21 13:28:42 2008 Shugo Maeda <shugo@ruby-lang.org>
-
- * io.c, include/ruby/intern.h (rb_io_ascii8bit_binmode): externed.
-
- * ext/socket/socket.c (init_sock): use rb_io_ascii8bit_binmode()
- instead of rb_io_binmode().
-
-Tue Oct 21 13:17:39 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * mdoc2man.rb: moved into tools/.
-
- * instruby.rb: followed the change of mdoc2man.
-
-Tue Oct 21 11:34:04 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/iconv/iconv.c (strip_glibc_option, map_charset): check if
- encoding is a string. based on the patch by Hiroshi Moriyama at
- [ruby-dev:36811].
-
- * test/iconv/test_basic.rb (test_invalid_arguments): added tests.
-
-Tue Oct 21 10:40:37 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (rb_file_open_internal): should initialize fmode before using.
-
-Tue Oct 21 08:56:37 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * regparse.c (parse_char_class): CCV_SB is only for single
- byte. [ruby-dev:36786]
-
-Tue Oct 21 01:49:55 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_io_extract_modeenc): plain rb/wb should set ASCII-8BIT
- to the external_encoding.
-
- * io.c (rb_file_open_internal): ditto.
-
- * io.c (NEED_WRITECONV): no conversion when the external_encoding
- is ASCII-8BIT.
-
- * io.c (do_writeconv): skip ASCII-8BIT.
-
-Tue Oct 21 00:51:59 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (rb_io_ascii8bit_binmode): renamed from rb_io_binmode.
- (rb_io_binmode): don't change encoding conversion.
- (rb_io_binmode_m): call rb_io_ascii8bit_binmode.
-
-Mon Oct 20 21:19:00 2008 Takeyuki FUJIOKA <xibbar@ruby-lang.org>
-
- * lib/cgi/core.rb (read_multipart): file's encoding is ascii-8bit
- from file field of multipart form.
-
-Mon Oct 20 20:16:25 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/zlib/zlib.c (Init_zlib): add getbyte as an alias to getc.
- [ruby-dev:36801]
-
-Mon Oct 20 17:31:17 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * error.c (exc_equal): should not compare recursively.
- [ruby-dev:36796]
-
-Mon Oct 20 16:48:43 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * include/ruby/ruby.h (ExportStringValue): new macro to convert
- string in internal encoding to external to export.
-
- * string.c (rb_str_export): new function to do conversion to
- external encoding.
-
- * ext/sdbm/init.c: encoding conversion support.
-
- * ext/dbm/dbm.c: ditto.
-
-Mon Oct 20 15:42:02 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_locale_str_new): new function to convert string
- from locale to internal encoding.
-
-Mon Oct 20 09:47:13 2008 Tanaka Akira <akr@fsij.org>
-
- * test/runner.rb: search srcdir/test/arg at first to find test/ruby
- directory when "ruby" is specified.
-
-Mon Oct 20 08:20:01 2008 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb: support Encoding.default_internal.
-
- * ext/tk/tcltklib.c: ditto.
-
- * ext/tk/extconf.rb: improve the strategy for searching Tcl/Tk headers.
-
-Mon Oct 20 00:57:04 2008 Tanaka Akira <akr@fsij.org>
-
- * lib/test/unit.rb (Test::Unit.setup_argv): call given block for
- filtering files.
-
- * test/runner.rb: search srcdir/test/arg, srcdir/arg.
-
- * bin/testrb: show usage if no files given.
-
-Sun Oct 19 21:19:16 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (srcs): removed ID_H_TARGET.
-
- * tool/generic_erb.rb: always overwrites if no if-change option.
- sends the result to stdout if no output option.
-
- * template/id.h.tmpl: shows which token differs.
-
-Sun Oct 19 18:15:15 2008 Martin Duerst <duerst@it.aoyama.ac.jp>
-
- * enc/trans/single_byte.trans: adding WINDOWS-wwww encodings
- (wwww = 874/1250/1251/1253/1254/1255/1256/1257)
- (contributed by Yoshihiro Kambayashi)
-
- * enc/trans/windows-wwww-tbl.rb: 8 new files
- (contributed by Yoshihiro Kambayashi)
-
- * test/ruby/test_transcode.rb: added test_windows_wwww
- (contributed by Yoshihiro Kambayashi)
-
-Sun Oct 19 07:37:13 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/cmath.rb (log2,cbrt,frexp,ldexp,hypot,erf,erfc,gamma,lgamma):
- should be also provided as module function. [ruby-dev:36787]
-
-Sun Oct 19 07:25:08 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * keywords, lex.c.src, opt_insn_unif.def, opt_operand.def: moved rarely changed
- input files for code generators into defs/ directory.
-
- * Makefile.in (lex.c): followed keywords and lex.c.src.
-
- * common.mk (parser.o): followed keywords.
- (INSNS): followed opt_*.def
-
- * tools/instruction.rb: followed opt_*.def.
-
-Sun Oct 19 12:28:01 2008 James Edward Gray II <jeg2@ruby-lang.org>
-
- * test/csv/*: Renamed tc_* files to test_* to fit in within Ruby's
- testing process.
-
-Sun Oct 19 00:15:03 2008 Tanaka Akira <akr@fsij.org>
-
- * lib/test/unit.rb (assert_nothing_thrown): don't intern.
-
-Sat Oct 18 14:40:32 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * numeric.c (num_sadded): remove newly defined singleton method
- that should not exist after exception handling. [ruby-dev:36569]
-
-Sat Oct 18 14:27:49 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (opt_block_arg): allow trailing comma after usual
- arguments. not after block argument.
-
-Sat Oct 18 13:30:53 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_external_str_new): a new function to convert from
- external encoding to internal encoding. if something went
- wrong, it returns a string with the external encoding.
-
- * string.c (rb_external_str_new_with_enc): same as above besides
- you can specify the source encoding.
-
- * ruby.c (ruby_set_argv): use rb_external_str_new()
-
- * ruby.c (set_arg0, ruby_script): ditto.
-
-Sat Oct 18 04:08:18 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/tempfile.rb (Tempfile#initialize): now Tempfile.new takes
- keyword arguments to open(). [ruby-dev:36756]
-
-Sat Oct 18 17:10:10 2008 Martin Duerst <duerst@it.aoyama.ac.jp>
-
- * tool/transcode-tblgen.rb: added set_valid_byte_pattern
- to reduce coupling between table generation script and
- specific encodings.
-
- * enc/trans/single_byte.trans: using set_valid_byte_pattern
-
-Sat Oct 18 16:39:39 2008 Martin Duerst <duerst@it.aoyama.ac.jp>
-
- * transcode.c: in transcode_search_path, eliminated a warning
- on cygwin about pathlen potentially not being initialized
-
-Sat Oct 18 13:40:27 2008 Tanaka Akira <akr@fsij.org>
-
- * lib/test/unit.rb (assert_nothing_thrown): implemented.
-
-Sat Oct 18 01:33:22 2008 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * common.mk: use added options for generic_erb.rb.
-
-Sat Oct 18 00:47:51 2008 wanabe <s.wanabe@gmail.com>
-
- * array.c: don't recycle shared-array while sort!.
-
-Fri Oct 17 22:04:38 2008 wanabe <s.wanabe@gmail.com>
-
- * array.c: recycle shared-array when it isn't referenced.
-
-Fri Oct 17 20:29:26 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * re.c (rb_reg_initialize_m): specify ARG_ENCODING_NONE instead of
- ARG_ENCODING_FIXED for Regexp.new("", nil, "n"). [ruby-dev:36761]
-
- * test/ruby/test_regexp.rb (TestRegexp#test_initialize): test
- updated.
-
-Fri Oct 17 19:46:20 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * tool/ifchange, win32/ifchange.bat: --timestamp option added.
-
- * tool/generic_erb.rb: --timestamp, --output and --if-change options
- added.
-
-Fri Oct 17 18:33:12 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * array.c (ary_resize_capa): renamed RESIZE_CAPA.
-
-Fri Oct 17 18:16:51 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * test/bigdecimal/test_bigdecimal.rb (TestBigDecimal#test_sqrt_bigdecimal):
- test updated. a patch from TAKANO Mitsuhiro <takano32 at jus.or.jp> in
- [ruby-dev:36736].
-
-Fri Oct 17 18:14:57 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (uncommon.mk): ignores failures at loading.
-
- * test/rubygems/gemutilities.rb (RubyGemTestCase#build_rake_in):
- get rid of interference with other tests.
-
-Fri Oct 17 18:06:39 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * transcode.c (str_transcode0): String#encode without argument now
- behave as if :undef => :replace, :invalid => :replace specified.
-
- * transcode.c (rb_econv_prepare_opts): should preserve options in
- any case.
-
-Fri Oct 17 11:48:18 2008 Shugo Maeda <shugo@ruby-lang.org>
-
- * ext/socket/socket.c (init_sock): sockets should be binmode.
-
- * test/socket/test_tcp.rb (test_encoding): ditto.
-
-Fri Oct 17 10:26:13 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * tool/insns2vm.rb: remove -Kn option in shebang line because it's
- inconsistent with -Ks commandline option in common.mk.
-
-Fri Oct 17 01:26:09 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (transcode_restartable0): in_pos and out_pos never be
- NULL, now.
-
-Fri Oct 17 00:39:19 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * lib/test/unit.rb: sort the order of executing tests.
-
-Fri Oct 17 00:24:15 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (rb_io_binmode): reset encoding conversion.
-
-Fri Oct 17 00:16:08 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * io.c (rb_getc, rb_io_fread, rb_io_fwrite, rb_read_pending):
- remove deprecated functions which do not work. [ruby-dev:36697]
-
-Thu Oct 16 23:48:34 2008 Tanaka Akira <akr@fsij.org>
-
- * common.mk (TESTS): removed to re-enable test for minitest.
-
-Thu Oct 16 23:37:11 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * compile.c (iseq_set_sequence): fix memory leak.
-
-Thu Oct 16 23:27:27 2008 Tanaka Akira <akr@fsij.org>
-
- * lib/test/unit.rb (assert_equal): avoid incompatible character
- encodings error.
-
-Thu Oct 16 23:23:27 2008 Tanaka Akira <akr@fsij.org>
-
- * lib/test/unit.rb (assert_equal): failure message changed.
-
-Thu Oct 16 22:52:54 2008 Tanaka Akira <akr@fsij.org>
-
- * lib/test/unit: removed test/unit.
-
- * lib/test/unit.rb: new compatibility layer using minitest.
-
- * bin/testrb: use above.
-
- * test/runner.rb: ditto.
-
-Thu Oct 16 14:34:16 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk, enc/depend (enc, trans): targets for sources.
-
-Thu Oct 16 14:30:30 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * instruby.rb (lib): installs all files other than README etc.
-
-Thu Oct 16 09:48:03 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * re.c (rb_reg_initialize_m): changed the message to clarify the
- third option argument is now ignored. [ruby-dev:36753]
-
-Thu Oct 16 08:14:39 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ruby.c (proc_options): no warning when default_external already
- set by -E.
-
- * test/ruby/test_rubyoptions.rb (TestRubyOptions#test_rubyopt):
- put -K after -E to set script encoding.
-
-Thu Oct 16 06:20:36 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * test/ruby/test_transcode.rb (TestTranscode#test_errors):
- String#encode now works without any argument. [ruby-dev:36740]
-
-Wed Oct 15 23:48:22 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * .gdbinit (rp): REGEXP handling fixed.
-
- * string.c (rb_str_rindex_m): need not to call rb_enc_check on
- regexp.
-
- * re.c (unescape_escaped_nonascii): try ASCII-8BIT encoding for
- broken strings.
-
-Wed Oct 15 23:11:10 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/delegate.rb (DelegateClass): restored 1.8 behavior for
- DelegateClass as well. [ruby-dev:36739]
-
-Wed Oct 15 22:19:14 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * array.c (RESIZE_CAPA): check whether len is longer than capacity.
-
- * array.c (rb_ary_compact_bang): resize ary before changing capacity.
- fixed [ruby-dev:36704]
-
-Wed Oct 15 16:57:30 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * version.h (RUBY_DESCRIPTION): remove unnecessary space.
-
-Tue Oct 14 23:18:15 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/delegate.rb (Delegator): simplified and restored 1.8
- behavior. [ruby-dev:35986]
-
-Tue Oct 14 21:50:40 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (TESTS): skips minitest by default, since it interferes
- with test/unit.
-
-Tue Oct 14 21:36:29 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (load_conv_function51932): check
- having IMultiLanguage2 or IMultiLanguage. [ruby-dev:36716]
-
- * ext/win32ole/extconf.rb: ditto.
-
-Tue Oct 14 20:45:29 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (Init_IO): $FILENAME and $* must be read-only. [ruby-dev:36698]
-
- * variable.c (*_getter, *_setter, *_marker): made public.
-
- * include/ruby/ruby.h (rb_gvar_*_{getter,setter,marker}): declared.
-
-Tue Oct 14 20:32:09 2008 Tanaka Akira <akr@fsij.org>
-
- * enc/trans/single_byte.trans (transcode_tblgen_singlebyte): renamed
- from transcode_tblgen_windows.
- (transcode_tblgen_iso8859): use transcode_tblgen_singlebyte.
-
-Tue Oct 14 19:32:14 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ruby.c (process_options): -U should be allowed in RUBYOPT
- environment variable. [ruby-dev:36720]
-
-Tue Oct 14 14:11:17 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (proc_options): -U can be followed by other options.
-
-Tue Oct 14 13:30:30 2008 Martin Duerst <duerst@it.aoyama.ac.jp>
-
- * enc/trans/single_byte.trans: added windows-1252
-
- * enc/trans/windows-1252-tbl.rb: new file
- (contributed by Yoshihiro Kambayashi)
-
- * tool/transcode-tblgen.rb: listed windows-1252 as '1byte'
-
- * test/ruby/test_transcode.rb: added test_windows_1252
- (contributed by Yoshihiro Kambayashi)
-
-Tue Oct 14 12:22:32 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * test/ruby/test_variable.rb (TestVariable#test_variable): add
- a test of [ruby-dev:36698].
-
-Tue Oct 14 11:14:29 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * transcode.c (str_transcode0): should not raise error when
- default_internal is not set. [ruby-core:19309]
-
-Tue Oct 14 11:14:26 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * lib/net/pop.rb: check for invalid APOP timestamp. (CVE-2007-1558)
- [ruby-dev:36631]
-
- * test/net/pop/test_pop.rb: ditto.
-
-Tue Oct 14 09:39:32 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ruby.c (set_internal_encoding_once): check double contradicted
- specification of the encoding from command line.
-
- * ruby.c (set_external_encoding_once): ditto.
-
-Tue Oct 14 08:28:31 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (parser_yylex): allow reserved word to be keyword argument.
-
-Mon Oct 13 19:07:52 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * parse.y (token_info_pop): show source filename. [ruby-dev:36710]
-
-Mon Oct 13 08:59:08 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (load_conv_function51932): support
- CP51932 on cygwin and mingw32. thanks to arton.
-
- * test/win32ole/test_win32ole.rb (test_cp51932): ditto.
-
-Mon Oct 13 07:54:00 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ruby.c (proc_options): add -U command line option to specify
- utf-8 as default_internal.
-
-Mon Oct 13 07:42:57 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * transcode.c (str_transcode0): String#encode() with no encoding
- specified transcode the string into Encoding.default_internal.
- inspired by [ruby-core:19298].
-
-Sun Oct 12 18:00:18 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (set_ole_codepage, ole_cp2encoding,
- ole_wc2mb, ole_vstr2wc, ole_mb2wc): support CP51932 (only mswin32).
-
- * test/win32ole/test_win32ole.rb: ditto.
-
-Sun Oct 12 12:03:38 2008 Koichi Sasada <ko1@atdot.net>
-
- * vm.c, vm_insnhelper.h (ruby_vm_redefined_flag): apply optimization
- patch proposed by Paul Brannan. [ruby-core:19171]
-
-Sun Oct 12 09:46:36 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * strftime.c (rb_strftime): suppressed warnings on cygwin.
-
-Sat Oct 11 19:49:35 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (parser_prepare): use utf-8 encoding directly.
-
-Sat Oct 11 10:20:17 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb (CLEANINGS): uses escaped form tabs to preventing the
- confusion. [ruby-talk:317345]
-
-Sat Oct 11 08:51:13 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/rake.rb (Rake::Application#standard_exception_handling): removed
- unnecessary SystemExit, and exits with false instead of system
- dependent value. [ruby-talk:317330]
-
-Sat Oct 11 03:54:05 2008 Koichi Sasada <ko1@atdot.net>
-
- * parse.y: optimize 'for' statement when one variable given.
-
- * benchmark/bm_loop_for.rb: added.
-
- * benchmark/bm_loop_times.rb: modified.
-
-Sat Oct 11 12:09:05 2008 James Edward Gray II <jeg2@ruby-lang.org>
-
- * lib/csv/csv.rb: Added support for Encoding::default_internal.
- * lib/csv/csv.rb: Switched to new Hash syntax.
-
-Fri Oct 10 22:16:55 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (comment_at_top): needed for ripper too.
-
-Fri Oct 10 22:07:05 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby.h: updated macros for headers. [ruby-core:19275]
-
-Fri Oct 10 19:21:50 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (magic_comment_encoding): warns when ignored.
-
- * parse.y (parser_magic_comment): replaces '-' with '_'.
-
- * parse.y (parser_yylex): allows magic comments indented and the
- second line or later.
-
-Fri Oct 10 17:26:50 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/json/ext/parser/parser.c (JSON_parse_string):
- associate encoding.
-
-Fri Oct 10 10:18:21 2008 Ryan Davis <ryand-ruby@zenspider.com>
-
- * lib/test/*: reverted back to test/unit.
- * test/test/*: ditto
- * lib/minitest/*: Imported minitest 1.3.0 r4333.
-
-Fri Oct 10 03:41:31 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * sprintf.c (rb_str_format): check if codepoint for %c is valid.
- [ruby-dev:36691]
-
-Fri Oct 10 01:55:48 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * encoding.c (enc_names): minor improvement.
-
-Fri Oct 10 00:21:39 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/optparse.rb (ParseError.filter_backtrace): removes internal
- backtrace.
-
-Fri Oct 10 00:11:16 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * transcode.c (rb_econv_add_converter): remove unnecessary NULL check.
-
-Thu Oct 9 23:53:23 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * misc/ruby-style.el (ruby-style-c-mode): buffer may not have file
- name.
-
-Thu Oct 9 23:30:47 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * process.c (run_exec_dup2): fix resource leak.
-
-Thu Oct 9 23:19:02 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * process.c (rb_run_exec_options): fix resource leak.
-
-Thu Oct 9 22:13:58 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_module.rb (test_remove_class_variable): add a test
- for Class#remove_class_variable.
-
- * test/ruby/test_object.rb (test_remove_instance_variable): add a test
- for Object#remove_instance_variable.
-
-Thu Oct 9 22:04:38 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * variable.c (rb_mod_remove_cvar): fix r19711.
-
-Thu Oct 9 21:17:50 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * ext/syck/syck.c (syck_lookup_sym): remove reading uninitialized
- variable.
-
-Thu Oct 9 16:34:15 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/json/ext/generator/extconf.rb: fix target.
-
- * ext/json/ext/parser/extconf.rb: ditto.
-
-Thu Oct 9 14:37:59 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * include/ruby/ruby.h: embeds the elements of an array into its
- struct RArray for # of elements <= 3.
-
- * array.c: ditto.
-
- * gc.c (gc_mark_children): following the change of struct RArray.
-
- * ext/tk/tcltklib.c (ip_ruby_cmp): ditto.
-
- * parse.y (coverage): ditto.
-
- * proc.c (curry): ditto.
-
- * .gdbinit: ditto.
-
-Thu Oct 9 11:29:33 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * encoding.c (Init_Encoding): new instance method Encoding#names,
- returns its name and alias names.
-
- * encoding.c (enc_names): defined for Encoding#names.
-
- * encoding.c (enc_names_i): defined for enc_names.
-
-Thu Oct 9 08:47:38 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * thread.c (rb_thread_wait_fd_rw): should not block by select if
- there's only one thread living. fixed [ruby-dev:36646].
-
-Wed Oct 8 20:59:52 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (ole_init_cp): initialize WIN32OLE.codepage
- according to Encoding.default_internal and
- Encoding.default_external.
-
-Wed Oct 8 17:02:21 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/json/lib/json/pure/generator.rb (utf8_to_json):
- process each unpacked Unicode character.
-
-Wed Oct 8 15:00:22 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/json/lib/json/pure/parser.rb
- (JSON::Pure::Parser#parse_string): force_encoding("UTF-8").
-
-Wed Oct 8 11:56:15 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/test/unit/assertions.rb: assert_nothing_thrown,
- assert_raise, assert_not_equal, assert_no_match, assert_not_nil,
- assert_not_same are coming back as alias.
-
-Wed Oct 8 11:18:12 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * variable.c (autoload_delete, autoload_file): should not delete
- autoload table, since it may be shared with duplicated modules.
- [ruby-core:19181]
-
-Wed Oct 8 02:38:28 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * encoding.c (rb_default_internal_encoding): merged a patch from
- Michael Selig <michael.selig at fs.com.au> in [ruby-core:18985].
-
- * io.c (rb_io_ext_int_to_encs): ditto.
-
- * ruby.c (proc_options): support default internal encoding in -E
- option.
-
-Wed Oct 8 00:03:39 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date.rb (today,now): should produce own instances.
- [ruby-talk:317020]
-
-Tue Oct 7 16:43:51 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/json/lib/json/pure/generator.rb (utf8_to_json):
- force_encoding before gsub.
-
-Tue Oct 7 16:35:41 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/json/lib/json/pure/generator.rb (utf8_to_json):
- downcase the result of Unicode escape.
-
-Mon Oct 6 16:44:52 2008 Takeyuki FUJIOKA <xibbar@ruby-lang.org>
-
- * lib/cgi/core.rb (CGI::QueryExtension::initialize_query): fix the
- condition.
-
- * test/cgi/test_cgi_core.rb: bug fix encoding.
- thanks to TAKANO Mitsuhiro <takano32 at jus.or.jp> .
-
- * test/cgi/test_cgi_multipart.rb: temporary comment in.
-
-Mon Oct 6 15:22:08 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * gc.c (gc_mark_children): ignores T_ZOMBIE.
-
-Mon Oct 6 12:45:20 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * test/ruby/test_module.rb (TestModule#_wrap_assertion): add
- definition. is this really needed?
-
- * test/ruby/test_module.rb (TestModule#test_mod_constants): should
- not depend on global Module constants.
-
-Mon Oct 6 12:38:36 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/test/unit/assertions.rb (Test::Assertions#assert_nothing_raised):
- should take optional message argument.
-
-Mon Oct 6 12:18:23 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_comparable): string comparison should be
- transitive. [ruby-dev:36484]
-
- * test/ruby/test_m17n_comb.rb (TestM17NComb#test_str_eq): test
- updated.
-
-Mon Oct 6 09:00:58 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * test/bigdecimal/test_bigdecimal.rb (test_sqrt_bigdecimal): test
- updated. a patch from TAKANO Mitsuhiro <takano32 at jus.or.jp>
- in [ruby-dev:36669].
-
-Sun Oct 5 23:34:28 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb ($config_h): now always defines for old libraries.
-
-Sun Oct 5 23:06:55 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm_method.c (rb_mod_modfunc): method undefined in included module
- may not have nd_body. [ruby-core:18738]
-
-Sun Oct 5 21:28:58 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/rational.rb: resolved conflicts of aliases.
-
- * lib/mathn.rb: avoided some warnings.
-
-Sun Oct 5 18:51:50 2008 Tanaka Akira <akr@fsij.org>
-
- * lib/open-uri.rb: remove debug code introduced by previous change.
-
-Sun Oct 5 17:49:35 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/open-uri.rb (OpenURI.open_uri): set encoding to strio.
-
-Sun Oct 5 17:39:21 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/stringio/stringio.c (strio_set_encoding): defined for
- StringIO#set_encoding.
-
-Sun Oct 5 11:24:42 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * eval.c: come back definition of environ.
-
-Sun Oct 5 09:19:49 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/nkf/nkf-utf8/utf8tbl.c: update table.
-
-Sat Oct 4 22:50:14 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * dln.c: Ruby no longer supports VMS.
-
- * error.c: ditto.
-
- * eval.c: ditto.
-
- * eval_intern.h: ditto.
-
- * include/ruby/defines.h: ditto.
-
- * include/ruby/ruby.h: ditto.
-
- * io.c: ditto.
-
- * process.c: ditto.
-
- * ruby.c: ditto.
-
- * vms/config.h: removed.
-
- * vms/vms.h: ditto.
-
- * vms/vmsruby_private.c: ditto.
-
- * vms/vmsruby_private.h: ditto.
-
-Sat Oct 4 22:44:23 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * dln.c: Ruby no longer supports Windows CE.
-
- * eval.c: ditto.
-
- * include/ruby/defines.h: ditto.
-
- * include/ruby/win32.h: ditto.
-
- * ruby.c: ditto.
-
- * strftime.c: ditto.
-
- * win32/Makefile.sub: ditto.
-
- * win32/win32.c: ditto.
-
- * ext/tk/extconf.rb: ditto.
-
- * lib/fileutils.rb: ditto.
-
- * test/fileutils/test_fileutils.rb: ditto.
-
- * wince/*: removed.
-
-Sat Oct 4 22:35:06 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * dln.c: Ruby no longer supports MacOS 9 or before.
-
- * eval.c: ditto.
-
- * eval_intern.h: ditto.
-
- * ext/extmk.rb: ditto.
-
- * ext/tk/sample/tkextlib/treectrl/demo.rb: ditto.
-
- * ext/tk/stubs.c: ditto.
-
- * file.c: ditto.
-
- * hash.c: ditto.
-
- * include/ruby/defines.h: ditto.
-
- * ruby.c: ditto.
-
- * signal.c: ditto.
-
- * vm_core.h: ditto.
-
-Sat Oct 4 22:30:28 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * dln.c: Ruby no longer supports MS-DOS.
-
- * ext/sdbm/_sdbm.c: ditto.
-
- * ext/sdbm/sdbm.h: ditto.
-
- * gc.c: ditto.
-
- * hash.c: ditto.
-
- * include/ruby/defines.h: ditto.
-
- * include/ruby/util.h: ditto.
-
- * io.c: ditto.
-
- * process.c: ditto.
-
- * ruby.c: ditto.
-
- * strftime.c: ditto.
-
- * util.c: ditto.
-
-Sat Oct 4 22:14:15 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * djgpp/GNUmakefile.in: removed. Ruby no longer supports djgpp.
-
- * djgpp/README.djgpp: ditto.
-
- * djgpp/config.hin: ditto.
-
- * djgpp/config.sed: ditto.
-
- * djgpp/configure.bat: ditto.
-
- * djgpp/mkver.sed: ditto.
-
- * ext/Setup.dj: ditto.
-
- * dln.c: removed djgpp supports.
-
- * file.c: ditto.
-
- * gc.c: ditto.
-
- * io.c: ditto.
-
- * process.c: ditto.
-
- * ruby.c: ditto.
-
- * signal.c: ditto.
-
- * util.c: ditto.
-
- * vm_core.h: ditto.
-
- * lib/fileutils.rb: ditto.
-
- * lib/mkmf.rb: ditto.
-
- * ext/socket/socket.c: ditto.
-
- * test/fileutils/test_fileutils.rb: ditto.
-
- * test/ruby/test_env.rb: ditto.
-
- * test/ruby/test_path.rb: ditto.
-
-Sat Oct 4 21:59:39 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * x68/_dtos18.c: removed. Ruby no longer supports human68k.
-
- * x68/_round.c: ditto.
-
- * x68/fconvert.c: ditto.
-
- * x68/select.c: ditto.
-
- * ext/Setup.x68: ditto.
-
- * missing/x68.c: ditto.
-
- * dln.c (dln_find_exe_r): removed human68k supports.
- (dln_find_1): ditto.
-
- * lib/mkmf.rb: ditto.
-
- * ext/extmk.rb (Init_ext): ditto.
-
- * ext/socket/socket.c (init_sock): ditto.
-
- * gc.c (GC_MALLOC_LIMIT): ditto.
- (rb_setjmp, rb_jmpbuf): ditto.
- (mark_current_machine_context): ditto.
-
- * include/ruby/defines.h (PATH_ENV): ditto.
-
- * io.c: ditto.
-
- * process.c: ditto.
-
- * ruby.c: ditto.
-
- * test/ruby/test_env.rb: ditto.
-
- * test/ruby/test_path.rb: ditto.
-
- * LEGAL
-
-Sat Oct 4 19:02:36 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date/format.rb: no need to require the "lib/rational.rb".
-
-Sat Oct 4 19:02:59 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/nkf/nkf.c (rb_nkf_enc_get): don't replicate encoding.
- [ruby-dev:36575]
-
-Sat Oct 4 18:47:22 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/stringio/stringio.c (strio_external_encoding): defined.
-
- * ext/stringio/stringio.c (strio_internal_encoding): defined.
-
- * ext/stringio/stringio.c (Init_stringio): define above.
-
-Sat Oct 4 15:52:17 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * test/mini/test_mini_test.rb: recovered.
- It had been temporarily removed at r19645.
-
- * test/mini/test_mini_mock.rb: ditto.
-
- * test/mini/test_mini_spec.rb: ditto.
-
- * lib/test/**/*: replaced by miniunit.
- miniunit had been temporarily reverted at r19643 but
- now recovered.
-
-Sat Oct 4 15:33:26 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * common.mk (gdb-ruby): new target. it runs ruby under controlled by
- gdb.
-
- * common.mk (dist): accepts RELNAME variable as the second argument of
- make-snapshot.rb.
-
-Sat Oct 4 12:17:46 2008 Keiju Ishitsuka <keiju@ruby-lang.org>
-
- * lib/irb/irb/ext/save-history.rb: change load_history using File.expand_path. see [ruby-dev:36660]. Thanks Kouhei Sutou.
- * lib/irb/irb/context.rb: convert string Symbol of instance variable names in IRB:Context#inspect.
-
-Fri Oct 3 22:43:04 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * ext/dl/extconf.rb ($distcleanfiles): added callback-?.c into
- the distclean list.
-
-Fri Oct 3 19:33:21 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/json/lib/json/pure.rb (module JSON): remove Iconv dependency.
-
- * ext/json/lib/json/pure/generator.rb (utf8_to_json): process as
- binary and remove Iconv dependency.
-
- * ext/json/lib/json/pure/parser.rb (parse_string): ditto.
-
-Fri Oct 3 14:04:05 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/{configure.bat,setup.mak,Makefile.sub): add --program-prefix
- configure option support.
-
-Thu Oct 2 21:22:43 2008 Takeyuki FUJIOKA <xibbar@ruby-lang.org>
-
- * lib/cgi/core.rb (CGI::QueryExtension): delete MorphingBody
- and replace like as 1.8's in multipart reading.
- see [ruby-dev:36443],
- reference from CGIAlt http://cgialt.rubyforge.org/
-
- * test/cgi/test_cgi_multipart.rb : fixed multipart test.
-
-Thu Oct 2 20:46:17 2008 Tanaka Akira <akr@fsij.org>
-
- * string.c (rb_str_sub_bang): fix coderange.
-
-Wed Oct 1 22:54:09 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * lib/rexml/parsers/lightparser.rb, lib/debug.rb: remove unused when
- clauses.
-
-Wed Oct 1 22:43:59 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * lib/xmlrpc, lib/rexml, test/ruby/test_array.rb,
- test/ruby/test_unicode_escape.rb, test/scanf/test_scanf.rb,
- test/rss/rss-assertions.rb: fix indentation to remove warning.
-
-Wed Oct 1 21:36:35 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * gc.c (rb_gc_call_finalizer_at_exit): finalize deferred IO and Data.
-
- * gc.c (rb_gc_call_finalizer_at_exit): defers IO finalization.
- [ruby-dev:36646]
-
-Wed Oct 1 19:11:48 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * marshal.c (marshal_dump): fixed for check_dump_arg.
-
- * marshal.c (marshal_dump): initializes dump_arg before any funcall.
- [ruby-dev:36648]
-
-Wed Oct 1 00:54:32 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_split_m): should use rb_str_subseq() which use
- offset and length by bytes. [ruby-dev:36641]
-
-Wed Oct 1 00:29:48 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_settracefunc.rb (test_call, test_class): line number
- was changed at r19592.
-
-Wed Oct 1 00:20:38 2008 Tanaka Akira <akr@fsij.org>
-
- * process.c (check_exec_redirect): don't depend on rb_stdout and
- rb_stderr.
-
-Tue Sep 30 23:06:58 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * test/mini/test_mini_test.rb: removed.
- Temporarily removed the tests for miniunit because of
- they depend on the miniunit version of test/unit,
- where test/unit was temporarily reverted to the state
- before importing miniunit.
-
- * test/mini/test_mini_mock.rb: ditto.
-
- * test/mini/test_mini_spec.rb: ditto.
-
-Tue Sep 30 23:04:30 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * lib/test/**/*: recovered.
- Temporarily reverts the changes of lib/test/unit/* in
- r19502 and r19501, in order to release 1.9.0-5.
-
-Tue Sep 30 23:00:05 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * lib/test/unit.rb: removed.
- Temporarily reverts the changes of lib/test/unit/* in
- r19543, r19534 and r19503, in order to release 1.9.0-5.
-
- * lib/test/unit/assertions.rb: ditto.
-
- * lib/test/unit/deprecate.rb: ditto.
-
- * lib/test/unit/error.rb: ditto.
-
- * lib/test/unit/testcase.rb: ditto.
-
-Tue Sep 30 20:17:26 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_io_extract_modeenc): should honor value of the
- textmode: and binmode: options.
-
-Tue Sep 30 17:04:59 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * test/bigdecimal/test_bigdecimal.rb (test_sqrt_bigdecimal): wrong
- precision specification. a patch from TAKANO Mitsuhiro
- <takano32 at jus.or.jp> in [ruby-dev:36634].
-
-Tue Sep 30 16:53:55 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (stmt): returns non zero. [ruby-dev:36633]
-
-Tue Sep 30 16:52:38 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * sprintf.c (rb_str_format): add %<name>s style named argument
- support. a patch from Yusuke Endoh <mame at tsg.ne.jp>
- in [ruby-dev:35851].
-
- * sprintf.c (rb_str_format): add gettext style named format
- (%{name}) support. inspired by [ruby-dev:35852].
-
- * sprintf.c (GETNAMEARG): should raise KeyError exception when no
- named argument found.
-
- * hash.c (rb_hash_fetch): export fetch function.
-
-Tue Sep 30 13:19:01 2008 Eric Hodel <drbrain@segment7.net>
-
- * test/rubygems/test_gem_installer.rb: remove extra call to setup to
- fix ENV['HOME'] pollution.
-
-Tue Sep 30 13:04:11 2008 Ryan Davis <ryand-ruby@zenspider.com>
-
- * lib/mini/test.rb: Updated to 1.3.0 r4257.
- * test/mini/*: added from r4257.
-
-Tue Sep 30 07:46:07 2008 Eric Hodel <drbrain@segment7.net>
-
- * test/rdoc/test_rdoc_markup_attribute_manager.rb: Test with clean
- SPECIALS.
- * test/rubygems/gemutilities.rb: Restore ENV['HOME'] after test.
- * test/runner.rb: Pass -n argument down to miniunit.
-
-Tue Sep 30 01:02:55 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (token_info_push, token_info_pop): do nothing for evaled
- source.
-
-Tue Sep 30 00:47:43 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/nkf/nkf-utf8/nkf.c: constified.
-
-Mon Sep 29 23:32:25 2008 Tanaka Akira <akr@fsij.org>
-
- * string.c (rb_str_subseq): don't use rb_str_drop_bytes for short
- string.
-
-Mon Sep 29 22:54:29 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/mathn.rb: added String#to_[rc]. moved def_canon.
-
-Mon Sep 29 20:41:19 2008 Tanaka Akira <akr@fsij.org>
-
- * string.c (rb_str_subseq): use rb_str_drop_bytes if possible.
-
-Mon Sep 29 20:22:20 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * test/date/*.rb: imported additional tests and some adjustments.
-
-Mon Sep 29 20:13:05 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (fev_initialize): initialization
- handler instance variable.
-
- * test/win32ole/test_win32ole_typelib.rb (test_s_typelibs):
- fix the warning of shadowing outer local variable.
-
-Mon Sep 29 19:59:00 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (rescue_callback): use rb_write_error
- instead of fprintf.
-
-Mon Sep 29 01:51:54 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/rdoc/test_rdoc_info_formatting.rb (teardown): delete tmpdir for
- test.
-
-Mon Sep 29 00:30:20 2008 Takeyuki Fujioka <xibbar@ruby-lang.org>
-
- * lib/cgi/html.rb (CGI::HtmlExtension::{radio_group, checkbox_group}):
- can specify the false as checked or selected value.
- [ruby-core:18306], [ruby-core:18307]
-
- * test/cgi/test_cgi_tag_helper.rb: add a test.
-
-Sun Sep 28 23:08:38 2008 Takeyuki Fujioka <xibbar@ruby-lang.org>
-
- * lib/cgi/html.rb (CGI::HtmlExtension::popup_menu):
- fix the calls #bytesize on array parameters. [ruby-core:18919]
-
-Sun Sep 28 22:44:26 2008 Takeyuki Fujioka <xibbar@ruby-lang.org>
-
- * lib/cgi/core.rb (CGI::parse): ignore illegal query params.
- [ruby-dev:36618]
-
-Sun Sep 28 22:05:07 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * compile.c (iseq_set_sequence): check duplicated when clause.
- [ruby-dev:36616]
-
-Sun Sep 28 19:04:03 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * test/date/*.rb: imported a date test suite ruby 1.9 limited ed.
-
-Sun Sep 28 18:40:49 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mini/test.rb (MINI_DIR): loaded path is expanded.
-
- * lib/mini/test.rb (assert_match): get rid of confusion of
- ruby-mode.el.
-
-Sun Sep 28 12:36:09 2008 Koichi Sasada <ko1@atdot.net>
-
- * vm_exec.c (vm_exec_core): add an UNLIKELY() hint.
-
- * vm_insnhelper.h (BASIC_OP_UNREDEFINED_P): add a LIKELY() hint.
-
-Sun Sep 28 12:04:18 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (str_new): sets empty string to coderange 7bit.
- [ruby-core:18993]
-
-Sun Sep 28 09:39:48 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/mathn.rb ({Fixnum,Bignum,Float}#**): may produce complex
- value.
-
-Sun Sep 28 09:05:53 2008 James Edward Gray II <jeg2@ruby-lang.org>
-
- * lib/csv/csv.rb: Worked around some minor encoding changes in Ruby
- pointed out by Nobu.
-
-Sun Sep 28 08:37:12 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/mathn.rb: a hack to provide canonicalization. This must be
- temporary, but this seems to be not bad for the time being.
-
-Sat Sep 27 06:22:18 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/rake.rb (Module#rake_extension, String#ext, String#pathmap): use
- built-in methods.
-
- * lib/rake.rb (String#pathmap): fixed typo in rdoc.
-
-Sat Sep 27 04:28:41 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (rmext): preceding dots are not a part of extension.
-
- * file.c (rb_file_s_extname): ditto.
-
-Sat Sep 27 03:15:51 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm.c (vm_jump_tag_but_local_jump): exc is not used if val is nil.
-
-Sat Sep 27 03:12:40 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/socket/socket.c (host_str): numeric address should be unsigned.
- [ruby-core:18971]
-
-Fri Sep 26 22:46:58 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (primary, brace_block): fix for line number.
-
- * proc.c (rb_proc_location, rb_method_location): new methods
- {Proc,Method,UnboundMethod}#source_location. [ruby-core:18452]
-
-Fri Sep 26 21:36:33 2008 Koichi Sasada <ko1@atdot.net>
-
- * vm_core.h (RUBY_VM_CHECK_INTS_TH): add an UNLIKELY hint.
-
-Fri Sep 26 19:33:36 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/encoding.h (rb_str_encode): renamed from
- rb_str_transcode. [ruby-dev:36593]
- (rb_econv_has_convpath_p): renamed from rb_transcode_convertible.
-
- * transcode.c: follow the renaming.
-
- * io.c: ditto.
-
-Fri Sep 26 19:01:47 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/bigdecimal/test_bigdecimal.rb (test_inspect): fixed CPU bit
- size dependent test. pointed out by TAKANO Mitsuhiro <takano32 AT
- jus.or.jp>.
-
-Fri Sep 26 18:57:33 2008 Akinori MUSHA <knu@iDaemons.org>
-
- * test/pathname/test_pathname.rb: Fix use of deprecated methods.
-
-Fri Sep 26 18:39:59 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (dist): nothing is needed to run BASERUBY.
-
- * tool/make-snapshot: new option -archname.
-
-Fri Sep 26 18:24:28 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * misc/ruby-mode.el: safe customizable variables.
-
-Fri Sep 26 17:37:18 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * include/ruby/ruby.h (rb_mPrecision): removed.
- Precision module was temporarily removed at r19430.
-
-Fri Sep 26 17:25:10 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * common.mk (dist): Changed its dependencies and action.
-
-Fri Sep 26 17:07:04 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * error.c (Init_syserr): moved to the template.
- (errno_missing): removed. fixed [ruby-dev:35958].
-
- * defs/known_errors.def: added. extracted from Init_syserr.
-
- * templates/known_errors.inc.tmpl: added. Template for Init_syserr.
- c.f. [ruby-dev:35958].
-
- * tools/generic_erb.rb: added. general purpose mapper which maps
- data+template into source code.
-
- * common.mk (error.$(OBJEXT), incs, known_errors.inc):
- Fixed dependencies.
-
-Fri Sep 26 17:02:04 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread.c (thlist_signal): clears the woken thread if nothing woke.
-
- * thread.c (rb_barrier_wait): achieves the lock if no thread was
- waiting yet.
-
-Fri Sep 26 12:04:07 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/curses/curses.c: should include <ruby/io.h>.
-
- * ext/io/wait/wait.c: ditto.
-
- * ext/openssl/ossl.h: ditto.
-
-Fri Sep 26 11:34:08 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * variable.c (rb_define_hooked_variable): cast to get rid of compiler
- warnings.
-
-Fri Sep 26 11:05:41 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * transcode.c, include/ruby/encoding.c (rb_transcode_convertible):
- new function. checking the existence of converter.
-
-Fri Sep 26 10:35:50 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * variable.c (global_variable, struct trace_var): made function
- members more strict.
-
-Fri Sep 26 09:55:06 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby{io,sig}.h: moved to include/ruby/backward.
-
-Fri Sep 26 09:47:15 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/rubysig.h: old macros for backward compatibility.
-
- * thread.c (BLOCKING_REGION): rewritten using helper functions.
-
-Fri Sep 26 03:03:32 2008 Tanaka Akira <akr@fsij.org>
-
- * vm_eval.c (Init_vm_eval): define module_eval, class_eval and eval
- here for rdoc.
-
-Fri Sep 26 00:40:30 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * range.c (range_inspect): fix SEGV for cyclic range object.
- [ruby-core:18835]
-
-Thu Sep 25 23:59:56 2008 Tanaka Akira <akr@fsij.org>
-
- * common.mk: dependency updated.
-
-Thu Sep 25 21:46:48 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (rb_eUndefinedConversionError): renamed from
- rb_eConversionUndefinedError.
- (rb_eConverterNotFoundError): renamed from rb_eNoConverterError.
-
-Thu Sep 25 21:23:08 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * pack.c (pack_pack, pack_unpack): 'm0' format (base64) complies with
- RFC 4648. It adds no line feed when encoding, and raise ArgumentError
- if the encoded string contains non-alphabet (including CR and LF).
-
- * lib/base64.rb: added. This provides encoding/decoding method for
- Base64 in standard RFC 2045, Base64 in standard RFC 4648 and ``Base 64
- Encoding with URL and Filename SafeAlphabet'' in RFC 4648.
-
- * test_pack.c, test/base64/test_base64.rb: add tests for above.
-
-Thu Sep 25 21:00:32 2008 Koichi Sasada <ko1@atdot.net>
-
- * common.mk: fix btest-* rules [ruby-dev:36528].
- and remove obsolete rules.
-
-Thu Sep 25 20:27:54 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * class.c (rb_make_metaclass): [BUG] Fixed a bus error
- on the case for metaclass of a class which includes a
- module.
-
-Thu Sep 25 19:34:33 2008 Eric Hodel <drbrain@segment7.net>
-
- * test/rubygems/*: Update some new tests to use build_rake_in.
- * test/rubygems/gemutilities.rb: Fix broken merge of rake detection.
-
-Thu Sep 25 19:13:12 2008 Eric Hodel <drbrain@segment7.net>
-
- * lib/rubygems*: Update to RubyGems 1.3.0 r1891.
-
-Thu Sep 25 18:40:42 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * class.c (rb_make_metaclass): Made class of class of class
- from Class into its own eigenclass. Now meta^(n)-class
- hierarchy regresses infinitely, again.
- (This feature was decided on developer-meeting-20080922.)
-
-Thu Sep 25 16:01:07 2008 Jim Weirich <jim@tardis.local>
-
- * lib/rake.rb: Update rake source to version 0.8.3. This
- version includes some fixes for running Rake on windows.
- (1) better APPDATA/HOMExxx/USERPROFILE integration for
- system rakefiles, (2) Better handling of the :ruby command
- when installed in directory containing spaces.
-
-Thu Sep 25 11:22:51 2008 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc*: Update to RDoc 2.2.1 r185.
-
-Thu Sep 25 02:08:47 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (rb_io_mode_enc): make it static.
-
-Thu Sep 25 01:22:39 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mini/test.rb (Mini::Assertions#assert_raise): fixed typo.
-
-Wed Sep 24 23:39:00 2008 Takeyuki Fujioka <xibbar@ruby-lang.org>
-
- * test/cgi/test_cgi_multipart.rb : revert last change.
- ( deprecated is assert_raises. )
- * test/cgi/test_cgi_core.rb : ditto.
- * test/cgi/test_cgi_header.rb : ditto.
-
-Wed Sep 24 23:12:49 2008 Takeyuki Fujioka <xibbar@ruby-lang.org>
-
- * lib/cgi/core.rb (CGI::new, CGI::{accept_charset,accept_charset=}) :
- accept parameters either in a hash,
- string as a block. add the encoding validation process.
- * test/cgi/test_cgi_core.rb : test for query encoding check.
-
-Wed Sep 24 22:58:18 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * string.c (rb_str_rstrip_bang): raise exception when the encoding of
- the string is dummy.
-
- * string.c (rb_str_rstrip_bang): remove nul characters even if the
- encoding of the string is not single byte optimizable.
- fixed [ruby-core:18844], reported by Michael Selig.
-
-Wed Sep 24 19:01:45 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * string.c (rb_str_rstrip_bang): workaround for VC++8 x64.
-
-Wed Sep 24 17:44:44 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * complex.c (Init_Complex), rational.c (Init_Rational): undefines
- default #allocate methods which call the allocator.
-
-Wed Sep 24 17:02:14 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * complex.c (Init_Complex), rational.c (Init_Rational): ID_ALLOCATOR
- differs from :allocate, and invisible in ruby level.
-
-Wed Sep 24 15:58:52 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_rstrip_bang): removing mixed spaces and nuls at
- the end of strings. [ruby-dev:36497]
-
-Wed Sep 24 15:13:04 2008 Takeyuki Fujioka <xibbar@ruby-lang.org>
-
- * test/cgi/test_cgi_multipart.rb : test for miniunit.
- * test/cgi/test_cgi_core.rb : ditto.
- * test/cgi/test_cgi_header.rb : ditto.
-
-Wed Sep 24 14:38:29 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * lib/tmpdir.rb: setup buffer with nul characters instead of spaces.
- fixed [ruby-dev:36493]
-
-Wed Sep 24 11:18:33 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_io_s_binread): offset argument was wrongly passed to
- internal IO#read call. [ruby-core:18810]
-
-Wed Sep 24 07:38:23 2008 URABE Shyouhei <shyouhei@ruby-lang.org>
-
- * vm_core.h: ruby/ruby.h should be included at the very first
- place in an entire compilation unit, as it includes
- ruby/config.h
-
-Wed Sep 24 06:41:24 2008 Ryan Davis <ryand-ruby@zenspider.com>
-
- * lib/test/*: removed test/unit.
- * lib/test/*: added miniunit.
- * lib/mini/*: ditto.
-
-Wed Sep 24 04:45:35 2008 Koichi Sasada <ko1@atdot.net>
-
- * include/ruby/node.h, node.h: move node.h from include path.
- This change stop to install node.h because of saving ABI
- (node.h will be changed. Extensions should not depends on
- this file).
-
- * blockinlining.c, class.c, compile.c, debug.h, enum.c,
- gc.c, iseq.c, parse.y, ruby.c, signal.c, variable.c,
- vm.c, vm_core.h, vm_dump.c: ditto.
-
- * ext/ripper/depend: ditto.
-
-Wed Sep 24 04:09:13 2008 Koichi Sasada <ko1@atdot.net>
-
- * vm_core.h: remove unused frame values.
-
-Wed Sep 24 04:07:07 2008 Koichi Sasada <ko1@atdot.net>
-
- * signal.c (signal_exec): execute rb_eval_cmd() directly.
-
-Wed Sep 24 03:08:58 2008 Eric Hodel <drbrain@segment7.net>
-
- * lib/uri/mailto.rb: fix indentation.
- * lib/uri/generic.rb: ditto.
- * lib/yaml.rb: ditto.
- * lib/uri/cgi/core.rb: fix indentation and ambiguous argument warning.
-
-Tue Sep 23 23:39:25 2008 James Edward Gray II <jeg2@ruby-lang.org>
-
- * lib/csv/csv.rb: Improved the idea of whitespace and word characters used
- in substitutions during header conversion as suggested by Michael Selig.
-
-Tue Sep 23 21:50:53 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (io_binwrite): allocate wbuf if nosync.
-
-Tue Sep 23 21:45:02 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (copy_stream_body): use io_binwrite instead of io_fwrite.
-
-Tue Sep 23 21:31:16 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * test/ruby/test_rational2.rb: updated.
-
- * test/ruby/test_complex2.rb: added.
-
- * test/ruby/test_complexrational.rb: added.
-
-Tue Sep 23 21:26:32 2008 Tanaka Akira <akr@fsij.org>
-
- * string.c (rb_str_casecmp): make the ordering consistent with
- String#<=>.
-
-Tue Sep 23 20:52:25 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (io_binwrite): add nosync argument.
- (do_writeconv): extracted from io_fwrite.
- (io_fwrite): add nosync argument. use do_writeconv.
- (io_write): add nosync argument.
- (io_write_m): new function for IO#write.
- (rb_p): don't append record separator.
-
-Tue Sep 23 20:24:41 2008 Koichi Sasada <ko1@atdot.net>
-
- * signal.c (signal_exec): fix to use rb_proc_call().
-
-Tue Sep 23 20:06:46 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/rexml/formatters/pretty.rb (REXML::Formatters::Pretty#wrap):
- abandon wrapping if the line contains no space. [ruby-dev:36045]
-
-Tue Sep 23 19:38:03 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (subtract): check tv_sec. reported by ko1.
-
-Tue Sep 23 19:21:03 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c (nucomp_s_canonicalize_internal): does no apply
- canonicalization rule anymore.
-
- * rational.c (nurat_s_canonicalize_internal(_no_reduce)?): ditto.
-
- * complex.c: removed class method new! and new.
-
- * rational.c: ditto.
-
-Tue Sep 23 19:20:59 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_io_s_binread): a new method to read binary chunk from a
- file. [ruby-core:18674]
-
- * io.c (open_key_args): wrong permission specified for read-open.
-
-Tue Sep 23 18:24:34 2008 Tanaka Akira <akr@fsij.org>
-
- * hash.c (rb_obj_is_proc): declaration moved for rdoc.
-
-Tue Sep 23 18:07:55 2008 Koichi Sasada <ko1@atdot.net>
-
- * common.mk (io.o): remove dependency for vm_core.h.
-
-Tue Sep 23 17:56:44 2008 Koichi Sasada <ko1@atdot.net>
-
- * thread.c (rb_thread_blocking_region): fix typo in a document.
-
-Tue Sep 23 17:50:35 2008 Koichi Sasada <ko1@atdot.net>
-
- * thread.c (rb_thread_blocking_region): write a document.
-
-Tue Sep 23 17:14:31 2008 Koichi Sasada <ko1@atdot.net>
-
- * thread.c, include/ruby/intern.h (rb_thread_interrupted): added.
-
- * io.c: use VALUE of thead instead of rb_tread_t to check interrupts.
-
-Tue Sep 23 17:05:14 2008 Koichi Sasada <ko1@atdot.net>
-
- * class.c, vm_core.h: move decl of rb_iseq_clone() to class.c.
-
-Tue Sep 23 17:02:47 2008 Tanaka Akira <akr@fsij.org>
-
- * debug.h (ruby_set_debug_option): declared.
-
- * main.c: include debug.h.
-
- * common.mk (main.$(OBJEXT)): dependency updated.
-
-Tue Sep 23 16:59:45 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * hash.c (ENVMATCH, ENVNMATCH): reduced same code.
-
-Tue Sep 23 16:55:11 2008 Koichi Sasada <ko1@atdot.net>
-
- * ruby.h: fix comment and rename macro HAVE_RUBY_MVM_H to
- HAVE_RUBY_VM_H.
-
-Tue Sep 23 16:41:31 2008 Koichi Sasada <ko1@atdot.net>
-
- * include/ruby/node.h, vm_core.h: move definition of
- RUBY_VM_METHOD_NODE to node.h.
-
- * class.c, common.mk: remove useless inclusion.
-
- * compile.h, iseq.h, vm_core.h: rename compile.h to iseq.h.
- move some definitions from vm_core.h to iseq.h.
-
- * compile.c, iseq.c, vm.c: ditto.
-
- * eval.c, compile.c: move some functions for parser
- from eval.c to compile.c.
-
- * eval_intern.h, vm_core.h: move va_init_list() macro to
- vm_core.h.
-
- * iseq.c (rb_iseq_new_top, rb_iseq_first_lineno): added.
-
- * load.c, ruby.c: use rb_iseq_new_top() instead of
- rb_iseq_new() with ISEQ_TYPE_TOP constant directly.
-
- * proc.c: use rb_iseq_first_lineno() instead of accessing
- iseq structure.
-
-Tue Sep 23 16:17:54 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/ripper/eventids2.c (token_to_eventid): supper __ENCODING__
- keyword. [ruby-dev:36478]
-
-Tue Sep 23 15:30:53 2008 Koichi Sasada <ko1@atdot.net>
-
- * common.mk, hash.c: remove unused inclusion.
-
-Tue Sep 23 09:52:07 2008 Koichi Sasada <ko1@atdot.net>
-
- * eval_safe.c, safe.c: rename eval_safe.c to safe.c.
-
- * common.mk, eval.c, safe.c, inits.c: separate safe.c from eval.c and
- make Init_safe().
-
-Tue Sep 23 09:20:00 2008 Koichi Sasada <ko1@atdot.net>
-
- * common.mk: clean up
- - remove blockinlining.$(OBJEXT) to built
- - make ENCODING_H_INCLDUES variable (include/ruby/encoding.h)
- - make VM_CORE_H_INCLUDES variable (vm_core.h)
- - simplify rules.
- - make depends rule to output depend status using gcc -MM.
-
- * include/ruby/mvm.h, include/ruby/vm.h: rename mvm.h to vm.h.
-
- * include/ruby.h: ditto.
-
- * load.c: add inclusion explicitly.
-
- * enumerator.c, object.c, parse.y, thread.c, vm_dump.c:
- remove useless inclusion.
-
- * eval_intern.h: cleanup inclusion.
-
- * vm_core.h: rb_thread_t should be defined in this file.
-
- * vm_evalbody.c, vm_exec.c: rename vm_evalbody.c to vm_exec.c.
-
- * vm.h, vm_exec.h: rename vm.h to vm_exec.h.
-
- * insnhelper.h, vm_insnhelper.h: rename insnhelper.h to vm_insnhelper.h.
-
- * vm.c, vm_insnhelper.c, vm_insnhelper.h:
- - rename vm_eval() to vm_exec_core().
- - rename vm_eval_body() to vm_exec().
- - cleanup include order.
-
- * vm_method.c: fix comment.
-
-Tue Sep 23 09:01:15 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * lib/pathname.rb (each_filename): return Enumerator if no block
- given.
-
- * test/pathname/test_pathname.rb: add a test for above.
-
-Tue Sep 23 08:25:56 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * hash.c (env_aset): allow nil value to remove an entry.
- [ruby-dev:36465]
-
- * test/ruby/test_env.rb (TestEnv#test_aset): test updated.
-
-Tue Sep 23 08:07:07 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * misc/ruby-mode.el (ruby-keyword-end-re): emacs21 support. a
- patch from Hiroshi Moriyama <hiroshi at kvd.biglobe.ne.jp> in
- [ruby-dev:36471].
-
- * misc/ruby-mode.el (ruby-in-ppss-context-p): ditto.
-
- * misc/ruby-mode.el (ruby-here-doc-end-syntax):
-
-Tue Sep 23 02:07:52 2008 TAKAO Kouji <kouji@takao7.net>
-
- * test/readline/test_readline_history.rb
- (Readline::TestHistory#test_each): checked return value.
-
-Tue Sep 23 02:05:34 2008 TAKAO Kouji <kouji@takao7.net>
-
- * ext/readline/readline.c (Init_readline): used remove_history to
- check offset of history if unsupported clear_history.
-
-Mon Sep 22 17:39:25 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/tempfile.rb (Tempfile#open): should return a value from the
- block (if given). [ruby-core:18394]
-
-Mon Sep 22 11:17:51 2008 URABE Shyouhei <shyouhei@ruby-lang.org>
-
- * include/ruby/encoding.h (enum): ISO C forbids comma at end of
- enumerator list
-
-Mon Sep 22 10:15:24 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * LEGAL: updated file names removed and added. [ruby-dev:36426]
-
-Mon Sep 22 02:39:05 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * encoding.c (get_default_external): add description.
-
-Sun Sep 21 21:52:41 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * math.c (math_log): should check argc.
-
-Sun Sep 21 21:20:24 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c: added two macros.
-
- * rational.c: ditto.
-
-Sun Sep 21 18:06:38 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c (nucomp_s_convert): checks argc.
-
- * rational.c (nurat_s_convert): ditto.
-
-Sun Sep 21 10:19:04 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c (nucomp_s_canonicalize_internal): checks exactness of
- imag only.
-
- * rational.c (nurat_s_convert): accepts non real value
- (Rational(a,b) as a/b).
-
- * complex.c (nucomp_s_convert): refined.
-
-Sun Sep 21 09:37:57 2008 James Edward Gray II <jeg2@ruby-lang.org>
-
- * lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
- is now parsed in the Encoding it is in without need for translation.
- * lib/csv/csv.rb: Improved inspect() messages for better IRb support.
- * lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
- * lib/csv/csv.rb: Use custom separators in parsing header Strings as
- suggested by Shmulik Regev.
- * lib/csv/csv.rb: Added a :write_headers option for outputting headers.
- * lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
- workaround a Windows issue where line-ending translation can cause an
- off-by-one error in seeking back to a non-zero starting position after
- auto-discovery for :row_sep as suggested by Robert Battle.
- * lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
- of invalid CSV that can be detected without reading ahead.
- * lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
- lookahead and prevent the parser from biting off more data than
- it can chew.
- * lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
- quote_char(), field_size_limit(), converters(), unconverted_fields?(),
- headers(), return_headers?(), write_headers?(), header_converters(),
- skip_blanks?(), and force_quotes?().
- * lib/csv/csv.rb: Cleaned up code syntax to be more inline with
- Ruby 1.9 than 1.8.
-
-Sun Sep 21 07:43:16 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c: an instance method image has been removed and
- uses "imag" instead of "image".
-
- * complex.c: two instance method re and im are removed.
-
- * rational.c: follows the above changes.
-
- * include/ruby/ruby.h: ditto.
-
- * gc.c: ditto.
-
- * lib/cmath.rb: ditto.
-
- * lib/mathn.rb: ditto.
-
- * lib/complex.rb: ditto. and provides some obsolete methods.
-
-Sun Sep 21 02:48:45 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/json/ext/parser/parse.c: use ruby_xfree().
-
- * ext/json/ext/parser/parse.rl: ditto.
-
- * ext/json/ext/parser/unicode.c: ditto.
-
-Sun Sep 21 02:40:20 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/json: import JSON v 1.1.3.
-
-Sat Sep 20 11:43:08 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * lib/optparse.rb (summarize): separator "" should output new line.
-
-Sat Sep 20 08:07:34 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * parse.y: strings which contain only US-ASCII don't force to have
- US-ASCII encoding. [ruby-dev:36400]
-
-Sat Sep 20 07:59:31 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * re.c (rb_reg_desc): Regexps of ASCII Compatible encoding may
- contain non-ASCII characters. So in that case its encoding
- must keep original encoding.
-
-Sat Sep 20 07:44:56 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * common.mk: prec.c is removed.
-
-Fri Sep 19 22:37:25 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c: uses f_(in)?exact_p macro.
-
- * rational.c: ditto.
-
- * bignum.c (rb_big_pow): bignum**bignum - should calculate without
- rational.
-
- * lib/complex.rb: should override Math module at most once.
-
- * lib/mathn.rb: requires 'cmath' directly.
-
-Fri Sep 19 20:48:06 2008 Yuki Sonoda <yugui@yugui.jp>
-
- * prec.c: removed. Precision will be redesigned and be back again.
- c.f. [ruby-dev:36352].
-
- * common.mk (COMMON_OBJS): removed prec.o.
-
- * inits.c (rb_call_inits): removed Init_Precision.
-
- * numeric.c (Init_Numeric): removed inclusion of Precision.
- removed #induced_from from each class.
-
- * rational.c: ditto.
-
- * ext/bigdecimal/bigdecimal.c: ditto.
-
- * lib/rdoc/known_classes.rb: removed the entry for Precision.
-
- * test/ruby/test_prec.rb: removed.
-
- * test/ruby/test_integer.rb: removed tests for Precision.
-
- * test/ruby/test_fixnum.rb: ditto.
-
- * test/ruby/test_float.rb: ditto.
-
- * test/ruby/test_rational.rb: ditto.
-
- * test/ruby/test_complex.rb: ditto.
-
- * test/bigdecimal/test_bigdecimal.rb: ditto.
-
-Fri Sep 19 19:43:40 2008 Yuki Sonoda <yugui@yugui.jp>
-
- * common.mk : Reverts the changeset 18994.
- Uses the official repository of rubyspec again.
-
-Fri Sep 19 17:41:56 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * configure.in: applied OS/2 support patch from Brendan Oakley
- <gentux2 at gmail.com> in [ruby-core:18707].
-
-Fri Sep 19 09:29:26 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * dln.c: newer BeOS support. a patch from Pete Goodeve
- <pete.goodeve at computer.org> in [ruby-core:18712].
-
-Fri Sep 19 03:41:25 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/nkf/nkf-utf8/nkf.c: fix memory violation. mentioned by mame [ruby-dev:36373]
-
-Fri Sep 19 01:07:36 2008 Tanaka Akira <akr@fsij.org>
-
- * regexec.c (string_cmp_ic): add text_end argument.
- (slow_search): call enclen with real string end.
- (map_search): add text_end argument.
-
-Thu Sep 18 22:54:39 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * ext/openssl/ossl_pkey_ec.c (ossl_ec_key_to_string): comment out
- fragments of unused code.
-
-Thu Sep 18 22:35:03 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * ext/bigdecimal/bigdecimal.c (VpCtoV): 1E1000...000 is interpreted as
- Infinity. [ruby-dev:36159]
-
- * ext/bigdecimal/bigdecimal.c (VpPower): Infinity ** 1 returns
- Infinity instead of NaN. [ruby-dev:36159]
-
- * test/bigdecimal/test_bigdecimal.rb: add tests for above.
-
-Thu Sep 18 22:20:08 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * error.c (Init_Exception): introduce EncodingError which is a
- superclass for all encoding related exception classes,
- e.g. Encoding::CompatibilityError. [ruby-dev:36371]
-
- * transcode.c (Init_transcode): ditto.
-
-Thu Sep 18 21:57:32 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_comparable): make ascii8bit string to be
- compatible with any other encoding.
-
- * string.c (rb_str_cmp): use rb_str_comparable() instead of
- rb_enc_compatible() since <=> is a comparison anyway.
-
-Thu Sep 18 21:37:14 2008 Tanaka Akira <akr@fsij.org>
-
- * grapheme cluster implementation reverted. [ruby-dev:36375]
-
-Thu Sep 18 20:50:36 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/rake.rb (Rake::Application#standard_exception_handling):
- replaced magic numbers for exit status.
-
-Thu Sep 18 20:37:59 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/optparse.rb (OptionParser::ParseError#set_backtrace): omits
- OptionParser internal backtraces unless debug flag is set.
-
-Thu Sep 18 20:02:48 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * lib/uri/common.rb (unescape): skip '%' to make String#hex work
- correctly.
-
-Thu Sep 18 19:51:11 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bignum.c (big2str_karatsuba): free internal buffer eagerly.
- a patch from TOYOFUKU Chikanobu <nobu_toyofuku at nifty.com>
- in [ruby-dev:36217].
-
- * bignum.c (rb_big2str0): ditto.
-
-Thu Sep 18 19:43:04 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * st.c (new_size): raise RuntimeError when st_table is too big.
- [ruby-dev:36354]
-
-Thu Sep 18 18:23:23 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (enc_arg): must take pointer argument to avoid GC
- problem. StringValueCStr modifies the argument and it should be
- preserved while the string StringValueCStr returns is used.
- Since the string is used by caller, the modified argument should be
- hold by caller. Actually
- GC.stress = true
- def (o=Object.new).to_str()
- "universal"+"_newline"
- end
- "\u3042".encode(o, "")
- causes curious warning:
- rb_define_const: invalid name `' for constant
-
-Thu Sep 18 17:32:44 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * transcode.c: add "Error" suffix for Encoding exception classes.
- a patch from Tadashi Saito <shiba at mail2.accsnet.ne.jp> in
- [ruby-dev:36346].
-
- * encoding.c (Init_Encoding): rename EncodingCompatibilityError to
- Encoding::CompatibilityError. [ruby-dev:36366]
-
-Thu Sep 18 17:18:35 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * transcode.c (enc_arg): revert last change. too early exception
- raising.
-
- * transcode.c (enc_arg): need not to take pointer argument.
-
-Sun Sep 18 02:22:15 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/bigdecimal/test_bigdecimal.rb: add tests to achieve over 90%
- test coverage of bigdecimal.
-
-Wed Sep 17 21:50:14 2008 Tanaka Akira <akr@fsij.org>
-
- * string.c (rb_str_casecmp): don't use rb_enc_codepoint.
-
-Wed Sep 17 19:55:33 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c (nucomp_s_convert): accepts complex
- value (Complex(a,b) as a+bi).
-
-Wed Sep 17 19:16:47 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * test/ruby/test_io.rb (TestIO#test_dup): avoid infinite loop.
- [ruby-dev:36326]
-
- * test/ruby/test_io.rb (TestIO#test_dup): remove needless open.
- [ruby-dev:35957]
-
-Wed Sep 17 17:44:59 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_io_extract_modeenc): process option mode: and perm: as
- well.
-
- * io.c (open_key_args): move mode: and perm: related code to
- rb_io_extract_modeenc().
-
-Wed Sep 17 13:42:59 2008 Takeyuki Fujioka <xibbar@ruby-lang.org>
-
- * lib/cgi/html.rb (checkbox_group,radio_group): bug fix
- use size instead of bytesize.
-
- * test/cgi/test_cgi_tag_helper.rb: test for checkbox_group,radio_group.
-
-Wed Sep 17 06:58:31 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * numeric.c: provides predicate real? instead of scalar?.
-
- * complex.c: follows the above change.
-
- * lib/cmath.rb: ditto.
-
-Wed Sep 17 01:56:27 2008 Tanaka Akira <akr@fsij.org>
-
- * test/ruby/test_io_m17n.rb: use __FILE__ instead of /dev/null.
- [ruby-dev:36327]
-
-Wed Sep 17 01:33:11 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/oniguruma.h (OnigEncodingTypeST): add precise_ret
- argument for mbc_to_code.
- (ONIGENC_MBC_TO_CODE): provide NULL for precise_ret.
- (ONIGENC_MBC_PRECISE_CODEPOINT): defined.
-
- * include/ruby/encoding.h (rb_enc_mbc_precise_codepoint): defined.
-
- * regenc.h (onigenc_single_byte_mbc_to_code): precise_ret argument
- added.
- (onigenc_mbn_mbc_to_code): ditto.
-
- * regenc.c (onigenc_single_byte_mbc_to_code): precise_ret argument
- added.
- (onigenc_mbn_mbc_to_code): ditto.
-
- * string.c (count_utf8_lead_bytes_with_word): removed.
- (str_utf8_nth): removed.
- (str_utf8_offset): removed.
- (str_strlen): UTF-8 codepoint oriented optimization removed.
- (rb_str_substr): ditto.
- (enc_succ_char): use rb_enc_mbc_precise_codepoint.
- (enc_pred_char): ditto.
- (rb_str_succ): ditto.
-
- * encoding.c (rb_enc_ascget): check length with
- rb_enc_mbc_precise_codepoint.
- (rb_enc_codepoint): use rb_enc_mbc_precise_codepoint.
-
- * regexec.c (string_cmp_ic): add text_end argument.
- (match_at): check end of character after exact string matches.
-
- * enc/utf_8.c (grapheme_table): defined for extended grapheme cluster
- boundary.
- (grapheme_cmp): defined.
- (get_grapheme_properties): defined.
- (grapheme_boundary_p): defined.
- (MAX_BYTES_LENGTH): defined.
- (comb_char_enc_len): defined.
- (mbc_to_code0): extracted from mbc_to_code.
- (mbc_to_code): use mbc_to_code0.
- (left_adjust_combchar_head): defined.
- (utf_8): use a extended grapheme cluster as a unit.
-
- * enc/unicode.c (onigenc_unicode_mbc_case_fold): use
- ONIGENC_MBC_PRECISE_CODEPOINT to extract codepoints.
- (onigenc_unicode_get_case_fold_codes_by_str): ditto.
-
- * enc/euc_jp.c (mbc_to_code): follow mbc_to_code field change.
- use onigenc_mbn_mbc_to_code.
-
- * enc/shift_jis.c (mbc_to_code): ditto.
-
- * enc/emacs_mule.c (mbc_to_code): ditto.
-
- * enc/gbk.c (gbk_mbc_to_code): follow mbc_to_code field and
- onigenc_mbn_mbc_to_code change.
-
- * enc/cp949.c (cp949_mbc_to_code): ditto.
-
- * enc/big5.c (big5_mbc_to_code): ditto.
-
- * enc/euc_tw.c (euctw_mbc_to_code): ditto.
-
- * enc/euc_kr.c (euckr_mbc_to_code): ditto.
-
- * enc/gb18030.c (gb18030_mbc_to_code): ditto.
-
- * enc/utf_32be.c (utf32be_mbc_to_code): follow mbc_to_code field
- change.
-
- * enc/utf_16be.c (utf16be_mbc_to_code): ditto.
-
- * enc/utf_32le.c (utf32le_mbc_to_code): ditto.
-
- * enc/utf_16le.c (utf16le_mbc_to_code): ditto.
-
-Wed Sep 17 01:17:12 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * transcode.c (enc_arg): raise exception when unknown encoding is
- given.
-
-Tue Sep 16 22:23:24 2008 Takeyuki Fujioka <xibbar@ruby-lang.org>
-
- * lib/cgi/core.rb (CGI#header): performance improvement.
- From CGIAlt http://cgialt.rubyforge.org/
-
- * test/cgi/test_cgi_header.rb: exception class fixed.
-
-Tue Sep 16 22:21:33 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (rb_str_concat): fix rdoc. (codepoint is integer)
-
- * string.c (rb_str_each_codepoint): use UINT2NUM.
-
-Tue Sep 16 21:48:55 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * re.c (rb_reg_desc): Regexp#inspect should be US-ASCII.
-
-Tue Sep 16 21:33:22 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_str_crypt): orthodox crypt() sees only first two bytes
- of salt.
-
-Tue Sep 16 19:18:40 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c (nucomp_marshal_{dump,load}): preserve instance
- variables.
-
- * rational.c (nurat_marshal_{dump,load}): ditto.
-
-Tue Sep 16 18:28:52 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_io_gets_m): rdoc updated. limit counts in bytes.
- [ruby-core:18617]
-
- * io.c (rb_io_readlines, rb_f_gets): ditto.
-
- * io.c (rb_io_readbyte): rdoc updated. [ruby-core:18617]
-
-Tue Sep 16 11:55:16 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_each_codepoint): add new methods, #codepoints
- and #each_codepoint. a patch from Michael Selig
- <michael.selig at fs.com.au> in [ruby-core:18532].
-
-Tue Sep 16 11:24:44 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/socket/mkconstants.rb: add new constants. a patch from
- IWAMURO Motonori <deenheart+ruby at gmail.com> in [ruby-dev:36309].
-
-Tue Sep 16 09:20:42 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * test/ruby/test_io.rb (TestIO#test_dup): exception should be
- raised from IO#dup.
-
-Tue Sep 16 08:35:29 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * test/ruby/test_io.rb (TestIO#test_dup): this test might fail if
- there are any garbage IO objects.
-
-Tue Sep 16 02:02:56 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (rb_str_buf_cat_ascii): codepoint is unsigned int.
-
- * string.c (rb_str_concat): ditto.
-
- * string.c (str_cat_char): ditto.
-
- * string.c (prefix_escape): ditto.
-
-Tue Sep 16 01:47:07 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (single_byte_optimizable): make function inline. based
- on a patch from Michael Selig <michael.selig at fs.com.au> in
- [ruby-core:18532].
-
- * string.c (str_modify_keep_cr): new function act as
- rb_str_modify(), but don't clear coderange
-
- * string.c (rb_str_casecmp): specialized for single byte strings.
-
- * string.c (rb_str_splice): preserve coderange.
-
- * string.c (rb_str_slice_bang, rb_str_reverse_bang,
- rb_str_upcase_bang, rb_str_downcase_bang, tr_trans,
- rb_str_capitalize_bang, rb_str_swapcase_bang,
- rb_str_delete_bang, rb_str_chop_bang, rb_str_chomp_bang,
- rb_str_lstrip_bang, rb_str_rstrip_bang): ditto.
-
- * string.c (rb_str_clear): preset coderange.
-
- * string.c (rb_str_split_m): specialized for splitting with a
- string.
-
-Tue Sep 16 00:57:56 2008 Tanaka Akira <akr@fsij.org>
-
- * re.c (rb_reg_quote): use rb_enc_mbcput to generate ASCII
- incompatible characters properly.
-
-Tue Sep 16 00:51:59 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * encoding.c (Encoding#base_encoding): removed. [ruby-dev:36270]
-
-Tue Sep 16 00:40:56 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode_data.h (STR1_LENGTH): defined.
- (makeSTR1LEN): defined.
-
- * tool/transcode-tblgen.rb: use makeSTR1LEN. generate STR1 for 4 to
- 259 bytes.
-
- * transcode.c (rb_transcoding): new field: output_index.
- (transcode_restartable0): use STR1_LENGTH.
-
-Mon Sep 15 23:52:45 2008 Koichi Sasada <ko1@atdot.net>
-
- * gc.c, include/ruby/ruby.h: rename rb_register_mark_object()
- to rb_gc_register_mark_object().
-
- * eval.c, vm.c: initialize vm->mark_object_ary at
- Init_top_self().
-
- * bignum.c, complex.c, encoding.c, ext/win32ole/win32ole.c,
- io.c, load.c, marshal.c, rational.c, ruby.c, vm.c:
- use rb_gc_register_mark_object() instead of
- rb_global_variable() or rb_gc_register_address().
-
-Mon Sep 15 23:37:15 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (econv_opts): don't use to_sym.
-
-Mon Sep 15 23:28:28 2008 Tanaka Akira <akr@fsij.org>
-
- * encoding.c (rb_enc_get_index): don't return -1.
-
- * io.c (rb_scan_open_args): call FilePathValue before encoding
- conversion.
-
-Mon Sep 15 22:11:07 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_squeeze_bang): specialized for 7bit characters in
- ASCII compatible strings.
-
- * string.c (rb_str_count): ditto.
-
- * string.c (tr_trans): preserve 7bit/valid coderange flag.
-
- * string.c (rb_str_squeeze_bang): preserve previous coderange value.
-
- * string.c (rb_str_lstrip_bang): ditto.
-
- * string.c (rb_str_rstrip_bang): ditto.
-
- * encoding.c (rb_default_external_encoding): preserve
- default_external_encoding in a static variable.
-
- * string.c (single_byte_optimizable): check coderange first, to
- reduce number of calling rb_enc_from_index().
-
-Mon Sep 15 20:57:00 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * lib/matrix.rb (Matrix#eql?): fixed [ruby-dev:36298].
- Reported by an anonymous user.
-
- * lib/matrix.rb (Vector#eql?): ditto.
-
- * (Matrix#compare_by_row_vectors): takes comparison
- strategy as an optional parameter.
-
- * (Vector#compare_by): ditto.
-
-Mon Sep 15 14:34:32 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * encoding.c (RUBY_MAX_CHAR_LEN): defined.
-
- * encoding.c (str_cat_char): use RUBY_MAX_CHAR_LEN.
-
-Mon Sep 15 13:53:33 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * encoding.c (rb_enc_compatible): accept other than strings and
- regexps. [ruby-core:18595]
-
- * encoding.c (rb_enc_get_index): works files and encodings.
-
-Mon Sep 15 13:17:21 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c (nucomp_eql_p): new.
-
- * complex.c (nucomp_hash): should use hash values of the elements.
-
- * rational.c (nurat_hash): ditto.
-
- * hash.c (rb_any_cmp): removed an unused variable.
-
-Mon Sep 15 11:11:04 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode_data.h (rb_transcoder): resetsize_func and resetstate_func
- also returns ssize_t.
-
- * enc/trans/iso2022.trans: follow the type change.
-
-Mon Sep 15 10:28:10 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * test/matrix/test_matrix.rb (setup): typo.
- (test_equality): misdefinition of the expected working.
- Reported by an anonymous user.
- (test_hash): added.
-
- * test/matrix/test_vector.rb: ditto.
-
-Mon Sep 15 03:33:10 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode_data.h: return output functions ssize_t.
-
- * transcode.c (transcode_restartable0): don't need to cast the result
- of output functions.
-
- * enc/trans/newline.trans: follow the type change.
-
- * enc/trans/escape.trans: ditto.
-
- * enc/trans/utf_16_32.trans: ditto.
-
- * enc/trans/iso2022.trans: ditto.
-
- * enc/trans/japanese.trans: ditto.
-
-Mon Sep 15 03:04:29 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode_data.h: output function takes output buffer size.
-
- * transcode.c: give output buffer size for output functions.
-
- * enc/trans/newline.trans: follow the type change.
-
- * enc/trans/escape.trans: ditto.
-
- * enc/trans/utf_16_32.trans: ditto.
-
- * enc/trans/iso2022.trans: ditto.
-
- * enc/trans/japanese.trans: ditto.
-
-Mon Sep 15 02:37:19 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * transcode.c (str_encode): returns duplicated string if nothing
- changed. [ruby-core:18578]
-
-Sun Sep 14 22:09:01 2008 Takeyuki Fujioka <xibbar@ruby-lang.org>
-
- * lib/cgi/core.rb (CGI::parse): performance improvement
-
-Sun Sep 14 18:33:32 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c: trivial changes.
-
-Sun Sep 14 16:15:22 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * lib/matrix.rb (Vector#eql?): typo of the method name as "eqn?".
- (Vector#eqn?): removed. Defined by mistake.
- Fixes [ruby-dev:36294]. Reported by weda <weda AT
- issp.u-tokyo.ac.jp> and an anonymous user.
-
- * test/matrix/test_matrix.rb: added.
-
- * test/matrix/test_vector.rb: added.
-
-Sun Sep 14 16:07:04 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (process_options): associates the locale encoding with $0 as
- well as ARGV.
-
-Sun Sep 14 13:48:03 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * object.c (Init_Object): added metameta-class initialization for
- BasicObject, Object, and Module.
- The metameta-classes of them are now the metaclass of Class, as the
- metameta-class of Class is.
-
- * object.c (boot_defmetametaclass): added.
-
-Sun Sep 14 10:10:43 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c (f_{add,mul,sub}): omitted some shortcuts for preserving
- signed zero anyway.
-
- * complex.c (nucomp_negate): new.
-
-Sun Sep 14 04:15:16 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/oniguruma.h (OnigEncodingTypeST): add end argument for
- left_adjust_char_head.
- (ONIGENC_LEFT_ADJUST_CHAR_HEAD): add end argument.
- (onigenc_get_left_adjust_char_head): ditto.
-
- * include/ruby/encoding.h (rb_enc_left_char_head): add end argument.
-
- * regenc.h (onigenc_single_byte_left_adjust_char_head): ditto.
-
- * regenc.c (onigenc_get_right_adjust_char_head): follow the interface
- change.
- (onigenc_get_right_adjust_char_head_with_prev): ditto.
- (onigenc_get_prev_char_head): ditto.
- (onigenc_step_back): ditto.
- (onigenc_get_left_adjust_char_head): ditto.
- (onigenc_single_byte_code_to_mbc): ditto.
-
- * re.c: ditto.
-
- * string.c: ditto.
-
- * io.c: ditto.
-
- * regexec.c: ditto.
-
- * enc/euc_jp.c: ditto.
-
- * enc/cp949.c: ditto.
-
- * enc/shift_jis.c: ditto.
-
- * enc/gbk.c: ditto.
-
- * enc/big5.c: ditto.
-
- * enc/euc_tw.c: ditto.
-
- * enc/euc_kr.c: ditto.
-
- * enc/emacs_mule.c: ditto.
-
- * enc/gb18030.c: ditto.
-
- * enc/utf_8.c: ditto.
-
- * enc/utf_16le.c: ditto.
-
- * enc/utf_16be.c: ditto.
-
- * enc/utf_32le.c: ditto.
-
- * enc/utf_32be.c: ditto.
-
-Sun Sep 14 03:43:27 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/oniguruma.h (ONIGENC_STEP_BACK): add end argument.
- (onigenc_step_back): ditto.
-
- * regenc.c (onigenc_step_back): add end argument.
-
- * regexec.c: follow the interface change.
-
-Sun Sep 14 03:20:03 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/oniguruma.h (onigenc_get_prev_char_head): add end
- argument.
-
- * include/ruby/encoding.h (rb_enc_prev_char): ditto.
-
- * regenc.c (onigenc_get_prev_char_head): add end argument.
-
- * regparse.c: follow the interface change.
-
- * regexec.c: ditto.
-
- * string.c: ditto.
-
- * parse.y: ditto.
-
-Sun Sep 14 02:04:28 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/oniguruma.h
- (onigenc_get_right_adjust_char_head_with_prev): add end argument.
-
- * regenc.c (onigenc_get_right_adjust_char_head_with_prev): use end
- argument.
-
- * regexec.c (forward_search_range): follow the interface change.
-
-Sun Sep 14 01:38:26 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/oniguruma.h (onigenc_get_right_adjust_char_head): add
- end argument.
-
- * include/ruby/encoding.h (rb_enc_right_char_head): add end argument.
-
- * regenc.c (onigenc_get_right_adjust_char_head): use end argument.
-
- * re.c (rb_reg_adjust_startpos): follow the interface change.
-
- * string.c (rb_str_index): ditto.
-
- * regexec.c (backward_search_range): ditto.
- (onig_search): ditto.
-
-Sun Sep 14 00:43:28 2008 Tanaka Akira <akr@fsij.org>
-
- * ext/ripper/depend (ripper.o): it depends on ruby headers.
-
-Sat Sep 13 19:27:01 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (io_encoding_set): don't need argc argument.
- (rb_io_s_pipe): update io_encoding_set call.
- (rb_io_set_encoding): ditto.
-
-Sat Sep 13 18:46:41 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (rb_transcoding): align state field.
-
-Sat Sep 13 18:21:09 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (DECORATOR_P): renamed from SUPPLEMENTAL_CONVERSION.
-
-Sat Sep 13 18:05:37 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (make_writeconv): use rb_enc_name.
- (make_readconv): ditto.
-
- * transcode.c (rb_econv_open_opts): ditto.
- (econv_args): ditto.
- (decorate_convpath): ditto.
- (econv_set_replacement): ditto.
-
-Sat Sep 13 11:15:38 2008 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/rexml/document.rb: fixed typo.
-
-Sat Sep 13 10:53:13 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c: refined.
-
- * rational.c: ditto.
-
-Sat Sep 13 03:44:52 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (rb_econv_prepare_opts): raise ArgumentError if
- a broken string is specified as a replacement.
-
-Sat Sep 13 03:31:05 2008 Tanaka Akira <akr@fsij.org>
-
- * iseq.c (iseq_s_compile_file): use rb_file_open_str.
-
- * io.c (rb_file_open_generic): call validate_enc_binmode.
- (rb_file_open_str): call FilePathValue.
-
-Sat Sep 13 02:58:05 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (validate_enc_binmode): extracted from rb_io_extract_modeenc.
- (rb_io_extract_modeenc): use validate_enc_binmode.
- (io_encoding_set): call validate_enc_binmode.
-
-Sat Sep 13 02:50:34 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (rb_econv_prepare_opts): initialize *opt and return 0
- if opthash is nil.
-
-Sat Sep 13 02:29:19 2008 Tanaka Akira <akr@fsij.org>
-
- * enc/trans/escape.trans: transcoder name renamed to use underscore.
-
- * transcode.c: follow the renaming.
-
-Sat Sep 13 02:12:17 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (rb_econv_init_by_convpath_i): new function.
- (rb_econv_init_by_convpath): new function.
- (econv_init): use rb_econv_init_by_convpath.
-
-Sat Sep 13 01:11:14 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (econv_args): take snamev_p and dnamev_p to prevent
- possible GC problem.
-
-Sat Sep 13 00:38:54 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (enc_arg): take arg as VALUE * to prevent possible GC
- problem.
-
-Fri Sep 12 23:19:41 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (rb_econv_add_transcoder_at): fix loop condition.
-
-Fri Sep 12 22:39:46 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (decorator_names): extracted from rb_econv_open.
- (rb_econv_open): use decorator_names.
- (econv_args): extracted from econv_init.
- (econv_init): use econv_args.
- (decorate_convpath): new function.
- (search_convpath_i): new function.
- (econv_s_search_convpath): new method.
- (Init_transcode): new method defined.
-
-Fri Sep 12 21:55:43 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (rb_econv_t): new field: num_allocated.
- (rb_econv_alloc): extracted from
- rb_econv_open_by_transcoder_entries.
- (rb_econv_add_transcoder_at): extracted from rb_econv_decorate_at
- and generalized
- (rb_econv_open_by_transcoder_entries): use rb_econv_alloc and
- rb_econv_add_transcoder_at.
- (rb_econv_add_converter): extracted from rb_econv_decorate_at.
- (rb_econv_decorate_at): use rb_econv_add_converter.
-
-Fri Sep 12 21:22:09 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (rb_econv_t): new field: started.
- (rb_econv_open_by_transcoder_entries): initialize started field.
- (rb_econv_convert): set started field.
- (rb_econv_insert_output): ditto.
- (rb_econv_decorate_at): check started field instead of num_finished.
-
-Fri Sep 12 20:28:59 2008 Tanaka Akira <akr@fsij.org>
-
- * regenc.c (onigenc_single_byte_code_to_mbc): follow OnigEncoding
- change.
-
-Fri Sep 12 20:00:22 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * regparse.c (parse_exp): fix resource leak.
-
-Fri Sep 12 01:21:22 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * ext/syck/node.c (syck_replace_str2): fix wrong check to free ptr.
-
-Thu Sep 11 20:18:24 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * test/win32ole/test_err_in_callback.rb (teardown): get rid
- of infinite loop.
-
-Thu Sep 11 19:12:56 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * include/ruby/oniguruma.h (OnigCodePoint): unsigned long to unsigned int.
-
- * include/ruby/encoding.h (rb_enc_codepoint): ditto.
-
- * encoding.c (rb_enc_codepoint): signed int to unsigned int.
-
- * encoding.c (rb_enc_ascget): ditto.
-
- * string.c (rb_str_casecmp): ditto.
-
- * string.c (enc_succ_alnum_char): ditto.
-
- * string.c (rb_str_inspect): ditto.
-
- * string.c (rb_str_upcase_bang): ditto.
-
- * string.c (rb_str_downcase_bang): ditto.
-
- * string.c (rb_str_capitalize_bang): ditto.
-
- * string.c (rb_str_swapcase_bang): ditto.
-
- * string.c (struct tr): ditto.
-
- * string.c (trnext): ditto.
-
- * string.c (tr_trans): ditto.
-
- * string.c (tr_setup_table): ditto.
-
- * string.c (tr_find): ditto.
-
- * string.c (rb_str_delete_bang): ditto.
-
- * string.c (rb_str_squeeze_bang): ditto.
-
- * string.c (rb_str_count): ditto.
-
- * string.c (rb_str_split_m): ditto.
-
- * string.c (rb_str_each_line): ditto.
-
- * string.c (rb_str_lstrip_bang): ditto.
-
- * string.c (rb_str_rstrip_bang): ditto.
-
- * string.c (rb_str_intern): ditto.
-
- * dir.c (char_casecmp): ditto.
-
- * sprintf.c (rb_str_format): ditto.
-
- * enc/emacs_mule.c (mbc_to_code): to be 32bit clean.
-
- * enc/emacs_mule.c (code_to_mbc): ditto.
-
- * enc/gb18030.c (mbc_to_code): ditto.
-
- * enc/gb18030.c (code_to_mbc): ditto.
-
-Thu Sep 11 19:09:25 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/iconv/iconv.c: add attention for machine independent.
-
-Thu Sep 11 15:23:26 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bignum.c (bigdivrem): adjust length for division and remainder.
- a patch from TOYOFUKU Chikanobu <nobu_toyofuku at nifty.com> in
- [ruby-dev:36231].
-
-Thu Sep 11 02:59:47 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (io_binwrite): extracted from io_fwrite.
-
-Thu Sep 11 02:25:34 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (make_encoding): new function.
- (make_encobj): new function.
- (econv_s_asciicompat_encoding): use make_encoding.
- (rb_econv_open_exc): use SUPPLEMENTAL_CONVERSION.
- (econv_convpath): use encoding object in the result.
-
-Thu Sep 11 02:14:38 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (econv_convpath): new method.
-
-Wed Sep 10 23:00:43 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * tool/compile_prelude.rb: print "<internal:prelude>" instead of
- "prelude.rb" on stack trace. [ruby-dev:36129]
-
-Wed Sep 10 21:19:58 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bignum.c (big2str_karatsuba): remove unnecessary fixnum code. a
- patch from TOYOFUKU Chikanobu <nobu_toyofuku at nifty.com> in
- [ruby-dev:36217].
-
-Wed Sep 10 21:09:32 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * test/win32ole/test_err_in_callback.rb: InternetExplorer should
- be closed.
-
- * test/win32ole/err_in_callback.rb: ditto.
-
-Wed Sep 10 18:25:19 2008 akira yamada <akira@rice.p.arika.org>
-
- * lib/uri/common.rb (URI::Parser): new class.
-
- * lib/uri/mailto.rb, lib/uri/generic.rb: follow the above change.
-
- * test/uri/test_parser.rb: added tests for URI::Parser.
-
-Wed Sep 10 10:35:32 2008 Takeyuki Fujioka <xibbar@ruby-lang.org>
-
- * lib/cgi/cookie.rb (CGI::Cookie#to_s): performance improvement
- from http://jp.rubyist.net/magazine/?0023-Cgirb.
-
-Wed Sep 10 10:12:29 2008 akira yamada <akira@arika.org>
-
- * lib/sync.rb (Sync_m#sync_exclusive): fixed
- typo. [ruby-dev:36233] [RubyForge#11680]
-
-Wed Sep 10 01:57:23 2008 Tanaka Akira <akr@fsij.org>
-
- * tool/transcode-tblgen.rb (StrSet#hash): cache hash value.
- (ActionMap#hash): ditto.
-
-Wed Sep 10 01:26:01 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/encoding.h (econv_after_output): renamed from
- econv_output_followed_by_input.
- (ECONV_AFTER_OUTPUT): renamed from ECONV_OUTPUT_FOLLOWED_BY_INPUT.
-
- * transcode.c: follow the renaming.
-
- * io.c: ditto.
-
-Wed Sep 10 01:16:07 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (get_replacement_character): don't return ASCII
- incompatible replacements.
- (make_replacement): don't convert the result of
- get_replacement_character.
-
-Wed Sep 10 01:05:00 2008 Tanaka Akira <akr@fsij.org>
-
- * enc/trans/newline.trans (rb_universal_newline): swap src_encoding
- and dst_encoding.
-
- * transcode.c (rb_econv_decorate_at): call get_transcoder_entry only
- once.
- (rb_econv_binmode): follow universal_newline change.
-
-Wed Sep 10 00:01:36 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/io.h (rb_io_t): rename field: writeconv_stateless to
- writeconv_asciicompat.
-
- * io.c: follow the renaming.
-
- * gc.c: ditto.
-
-Tue Sep 9 23:55:26 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (io_fwrite): raise an error if ASCII incompatible string
- written for text mode IO without encoding conversion.
- (rb_io_extract_modeenc): binmode requirement changed.
-
-Tue Sep 9 21:59:48 2008 Takeyuki Fujioka <xibbar@ruby-lang.org>
-
- * lib/cgi*: split cgi.rb into four files. [ruby-dev:36041]
-
-Tue Sep 9 21:17:00 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/encoding.h (ECONV_DECORATOR_MASK): merge
- ECONV_ENCODER_MASK and ECONV_DECORATOR_MASK.
- (ECONV_UNIVERSAL_NEWLINE_DECORATOR): renamed from
- ECONV_UNIVERSAL_NEWLINE_DECODER.
- (ECONV_CRLF_NEWLINE_DECORATOR): renamed from
- ECONV_CRLF_NEWLINE_ENCODER.
- (ECONV_CR_NEWLINE_DECORATOR): renamed from ECONV_CR_NEWLINE_ENCODER.
- (ECONV_XML_TEXT_DECORATOR): renamed from ECONV_XML_TEXT_ENCODER.
- (ECONV_XML_ATTR_CONTENT_DECORATOR): renamed from
- ECONV_XML_ATTR_CONTENT_ENCODER.
- (ECONV_STATEFUL_DECORATOR_MASK): renamed from
- ECONV_STATEFUL_ENCODER_MASK.
- (ECONV_XML_ATTR_QUOTE_DECORATOR): renamed from
- ECONV_XML_ATTR_CONTENT_DECORATOR.
-
- * io.c: follow the renaming.
-
- * transcode.c: ditto.
-
-Tue Sep 9 20:55:55 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (rb_econv_open0): make it static.
- (rb_econv_open): place decorators at last.
-
-Tue Sep 9 20:40:15 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * test/openssl/test_ssl.rb (OpenSSL#test_client_session):
- Debian's openssl 0.9.8g-13 failed at assert(ssl.session_reused?),
- when use default SSLContext. [ruby-dev:36167]
-
-Tue Sep 9 20:34:26 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (rb_econv_t): last_trans_index removed.
- (rb_econv_open_by_transcoder_entries): follow the type change.
- (rb_econv_open0): ditto.
- (rb_econv_decorate_at): ditto.
- (rb_econv_binmode): ditto.
- (rb_econv_insert_output): simplified because there are no decorators
- at last.
-
-Tue Sep 9 20:21:54 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (rb_econv_open): reverse the order of decoders.
-
-Tue Sep 9 20:18:26 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (rb_econv_open0): num_encoders and num_decoders removed.
-
-Tue Sep 9 03:59:13 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (make_writeconv): useless branch removed.
-
-Tue Sep 9 02:18:20 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/encoding.h (rb_econv_decorate_at_first): declared.
- (rb_econv_decorate_at_last): declared.
-
- * transcode.c (rb_econv_open_by_transcoder_entries): initialize
- replacement_enc. allocate outbuf for the last transcoder.
- (rb_econv_open0): extracted from rb_econv_open.
- (rb_econv_open): use rb_econv_open0 and decorate the result using
- rb_econv_decorate_at_first and rb_econv_decorate_at_last.
- (rb_econv_decorate_at): new function.
- (rb_econv_decorate_at_first): ditto.
- (rb_econv_decorate_at_last): ditto.
- (rb_econv_binmode): fix iteration end condition.
- (econv_init): don't set source_encoding_name and
- destination_encoding_name because they are set in rb_econv_open0.
-
-Tue Sep 9 01:10:54 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (rb_econv_open): make ec a local variable.
-
-Tue Sep 9 00:20:10 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (rb_econv_asciicompat_encoding): check decoder.
-
-Tue Sep 9 00:00:47 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (rb_econv_t): last_error.partial_input removed.
-
-Mon Sep 8 23:24:54 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/encoding.h (rb_econv_asciicompat_encoding): renamed
- from rb_econv_stateless_encoding to apply stateless ASCII
- incompatible encodings such as UTF-16BE.
-
- * io.c (make_writeconv): use rb_econv_asciicompat_encoding.
-
- * transcode_data.h (rb_transcoder_asciicompat_type_t): renamed from
- rb_transcoder_stateful_type_t.
- (rb_transcoder): use rb_transcoder_asciicompat_type_t.
-
- * transcode.c: follow the type change.
- (asciicompat_encoding_i): renamed from stateless_encoding_i.
- (rb_econv_asciicompat_encoding): renamed from
- rb_econv_stateless_encoding.
- (econv_s_asciicompat_encoding): method renamed.
-
- * tool/transcode-tblgen.rb: follow the type change.
-
- * enc/trans/utf_16_32.trans: follow the type change.
- rb_from_UTF_16BE to UTF-8 is asciicompat_decoder.
- rb_from_UTF_16LE to UTF-8 is asciicompat_decoder.
- rb_from_UTF_32BE to UTF-8 is asciicompat_decoder.
- rb_from_UTF_32LE to UTF-8 is asciicompat_decoder.
- UTF-8 to rb_to_UTF_16BE is asciicompat_encoder.
- UTF-8 to rb_to_UTF_16LE is asciicompat_encoder.
- UTF-8 to rb_to_UTF_32BE is asciicompat_encoder.
- UTF-8 to rb_to_UTF_32LE is asciicompat_encoder.
-
- * enc/trans/newline.trans: follow the type change. universal newline
- decoder is asciicompat_converter.
-
- * enc/trans/escape.trans: follow the type change.
-
- * enc/trans/iso2022.trans: ditto.
-
- * enc/trans/japanese.trans: ditto.
-
-Mon Sep 8 23:05:42 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (rb_econv_insert_output): "readagain" part should be
- after replacement.
-
-Mon Sep 8 22:30:03 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * dir.c (dir_initialize): rename option name of Dir.open
- from :external_encoding to :encoding.
-
-Mon Sep 8 22:16:20 2008 Takeyuki FUJIOKA <xibbar@ruby-lang.org>
-
- * lib/cgi.rb : obsolete regex "n" option. [ruby-dev:36130]
-
-Mon Sep 8 18:13:20 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (getppid): typo. [ruby-dev:36202]
-
- * process.c (get_ppid): mention the return value on Windows.
-
-Mon Sep 8 18:15:59 2008 Tanaka Akira <akr@fsij.org>
-
- * tool/transcode-tblgen.rb (ArrayCode): less string substitutions.
-
-Mon Sep 8 18:13:13 2008 Tanaka Akira <akr@fsij.org>
-
- * vm.c (rb_mRubyVMFrozenCore): registered for GC.
-
- * re.c (rb_reg_preprocess_dregexp): fix GC problem on MacOS X with
- powerpc-apple-darwin8-gcc-4.0.1 (GCC) 4.0.1 (Apple Computer, Inc.
- build 5367).
-
-Mon Sep 8 18:09:07 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/Makefile.sub (config.h): define SIZE_MAX for VC++6/7.
-
-Mon Sep 8 17:46:09 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (filetime_to_unixtime): remove unused variable.
- [ruby-dev:36191]
-
-Mon Sep 8 13:47:39 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * test/ruby/test_io.rb (TestIO#test_dup): add open in block.
- see [ruby-dev:35957].
-
-Mon Sep 8 07:09:42 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c: some adjustments.
-
- * rational.c: ditto.
-
-Mon Sep 8 06:50:29 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (XLDFLAGS): added --enable-auto-import for cygwin and
- mingw.
-
-Mon Sep 8 02:04:25 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/encoding.h (rb_econv_set_replacement): renamed from
- rb_econv_set_replacemenet.
-
- * transcode.c: follow the renaming.
-
-Mon Sep 8 01:10:41 2008 Tanaka Akira <akr@fsij.org>
-
- * tool/transcode-tblgen.rb (transcode_tblgen): log message refined.
-
-Mon Sep 8 00:58:04 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * rational.c: removed unused code.
-
-Mon Sep 8 00:04:09 2008 Tanaka Akira <akr@fsij.org>
-
- * enc/trans/iso2022.trans: upcase to iso-2022-jp.
-
- * enc/emacs_mule.c: ditto.
-
-Sun Sep 7 23:46:36 2008 Tanaka Akira <akr@fsij.org>
-
- * enc/trans/iso2022.trans: stateless-iso-2022-jp is defined to avoid
- undefined conversion error between iso-2022-jp and the corresponding
- stateless encoding.
-
- * enc/emacs_mule.c: replicate emacs-mule as stateless-iso-2022-jp.
-
-Sun Sep 7 20:03:01 2008 Tanaka Akira <akr@fsij.org>
-
- * enc/trans/escape.trans (hexstr): renamed from str1.
-
-Sun Sep 7 19:45:31 2008 Tanaka Akira <akr@fsij.org>
-
- * enc/trans/escape.trans: use transcode_tblgen.
-
- * tool/transcode-tblgen.rb: generate an empty line after str1.
-
-Sun Sep 7 19:16:38 2008 Tanaka Akira <akr@fsij.org>
-
- * tool/transcode-tblgen.rb (ActionMap#str_name): new method to
- generate a name base on string content.
- (ActionMap#gen_str): extracted from generate_info and use str_name.
-
-Sun Sep 7 18:28:05 2008 Tanaka Akira <akr@fsij.org>
-
- * tool/transcode-tblgen.rb (ActionMap#generate_info): use a memo to
- avoid duplication for STR1.
-
-Sun Sep 7 18:10:28 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode_data.h (STR1): defined for a string up to 255 bytes.
- (STR1_BYTEINDEX): defined.
- (makeSTR1): defined.
-
- * tool/transcode-tblgen.rb: generate STR1.
-
- * transcode.c (transcode_restartable0): interpret STR1.
-
- * enc/trans/escape.trans (fun_so_escape_xml_chref): removed. STR1 is
- used instead.
-
-Sun Sep 7 17:54:45 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * configure.in: Mac OS X's crypt(2) is broken with invalid salt.
- [ruby-dev:35899]
- * string.c (rb_str_crypt): ditto.
-
-Sun Sep 7 17:29:49 2008 Tanaka Akira <akr@fsij.org>
-
- * tool/transcode-tblgen.rb: o4 is usable only if the first byte is
- f0-f7.
-
-Sun Sep 7 12:44:26 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (make_writeconv): choose ASCII compatible encoding as
- intermediate encoding if stateful encoder exists.
-
-Sun Sep 7 12:09:29 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/encoding.h (ECONV_XML_ATTR_CONTENT_ENCODER): defined.
- (ECONV_STATEFUL_ENCODER_MASK): defined.
- (ECONV_XML_ATTR_QUOTE_ENCODER): defined.
- (ECONV_XML_ATTR_ENCODER): removed.
-
- * enc/trans/escape.trans (rb_escape_xml_attr_content): defined.
- (rb_escape_xml_attr_quote): defined.
- (rb_escape_xml_attr): removed.
-
- * io.c (NEED_WRITECONV): writeconv is required if supplemental
- converter is used.
- (make_writeconv): apply stateful encoder in writeconv.
-
- * transcode.c: follow the constant change.
-
-Sun Sep 7 07:24:09 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * misc/*.el: merged the following patches from Nathan Weizenbaum
- <nex342 at gmail.com>. [ruby-core:18424]
-
- * misc/ruby-mode.el: improve here-doc performance.
-
- * misc/ruby-mode.el: don't crash the whole mode if the Subversion
- $ keyword isn't interpolated.
-
- * misc/ruby-mode.el: don't highlight keywords when they're the
- beginning of non-keyword symbols.
-
- * misc/ruby-mode.el, misc/ruby-electric.el: use regexp-opt where
- possible for more efficient regexps.
-
- * misc/*.el: untabify, for internal consistency and consistency
- with standard Emacs elisp files.
-
- * misc/ruby-mode.el: fix a variable-name error.
-
- * misc/emacs-mode.el: don't set case-fold-search globally to nil;
- instead just set it when we need it.
-
-Sun Sep 7 06:31:51 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * file.c (file_expand_path): applied a patch from Nobuhiro Tachino
- in [ruby-dev:35948]. fix #491
-
-Sun Sep 7 03:37:05 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (f_block_optarg): allow default for block parameters as
- long as the value is primary. a patch from Eric Mahurin
- <eric.mahurin at gmail.com> in [ruby-core:16880].
-
-Sun Sep 7 01:07:10 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (yylex): "1.upto 2 {|i| p i }" should be syntax error.
- [ruby-dev:36008]
-
- * test/ruby/test_parse.rb (TestParse): update a test not to use
- recently fixed inconsistent syntax.
-
-Sun Sep 7 00:37:25 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/encoding.h (ECONV_ERROR_HANDLER_MASK): defined.
- (ECONV_DECODER_MASK): defined.
- (ECONV_ENCODER_MASK): defined.
-
- * io.c (make_writeconv): restrict ecflags for writeconv with
- ECONV_ERROR_HANDLER_MASK.
-
-Sat Sep 6 23:03:41 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/encoding.h (ECONV_XML_TEXT_ENCODER): renamed from
- ECONV_HTML_TEXT_ENCODER.
- (ECONV_XML_ATTR_ENCODER): renamed from ECONV_HTML_ATTR_ENCODER.
-
- * enc/trans/escape.trans: follow the renaming.
-
- * transcode.c: ditto.
-
-Sat Sep 6 21:35:52 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/socket/mkconstants.rb: add some IPV6 constants. [ruby-dev:36175]
-
-Sat Sep 6 20:10:48 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (econv_description): show ECONV_HTML_TEXT_ENCODER and
- ECONV_HTML_ATTR_ENCODER.
-
-Sat Sep 6 20:06:09 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (rb_econv_binmode): check actual transcoders.
-
-Sat Sep 6 19:54:25 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (rb_econv_open): fix last_tc.
-
-Sat Sep 6 19:36:34 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (rb_io_binmode): clear newline flags in writeconv_pre_ecflags.
-
-Sat Sep 6 18:47:40 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (str_transcode0): check ECONV_HTML_TEXT_ENCODER and
- ECONV_HTML_ATTR_ENCODER.
-
-Sat Sep 6 18:38:47 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (allocate_converted_string): fix overflow condition.
-
-Sat Sep 6 15:06:21 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (sym_html): new variable.
- (sym_text): ditto.
- (sym_attr): ditto.
- (econv_opts): check :html=>:text and :html=>:attr.
- (Init_transcode): initialize the above variables.
-
-Sat Sep 6 14:46:12 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/encoding.h (ECONV_HTML_TEXT_ENCODER): new constant.
- (ECONV_HTML_ATTR_ENCODER): ditto.
-
- * transcode.c (rb_econv_open): check ECONV_HTML_TEXT_ENCODER and
- ECONV_HTML_ATTR_ENCODER.
- (Init_transcode): Encoding::Converter::HTML_TEXT_ENCODER and
- Encoding::Converter::HTML_ATTR_ENCODER defined.
-
-Sat Sep 6 14:15:25 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (struct trans_open_t): defined to pass num_additional.
- (trans_open_i): use struct trans_open_t.
- (rb_econv_open): ditto.
-
-Sat Sep 6 13:43:20 2008 Tanaka Akira <akr@fsij.org>
-
- * enc/trans/escape.trans (fun_so_escape_html_attr): fix return type.
-
-Sat Sep 6 12:43:55 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (rb_econv_open): needless branch removed.
-
-Sat Sep 6 12:38:34 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (rb_econv_open): test condition simplified.
-
-Sat Sep 6 12:25:31 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (stateless_encoding_i): ignore supplemental conversions.
- Encoding::Converter.stateless_encoding("html-attr-escaped") should be
- nil.
-
-Sat Sep 6 12:19:36 2008 Tanaka Akira <akr@fsij.org>
-
- * enc/trans/escape.trans (escape_html_attr_init): new function.
- (fun_so_escape_html_attr): new function.
- (escape_html_attr_finish): new function.
- (rb_escape_html_attr): use them to quote the converted result.
-
-Sat Sep 6 07:54:36 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c: uses f_real_p macro.
-
-Sat Sep 6 07:27:00 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (rb_econv_open): fail for ASCII incompatible with
- newline conversion.
-
-Sat Sep 6 07:24:49 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (rb_io_extract_modeenc): raise an error for ASCII incompatible
- encoding without binmode.
-
-Sat Sep 6 07:12:42 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bignum.c (bigdivrem1): optimization by skipping zeros at the
- tail of digits. a patch from TOYOFUKU Chikanobu
- <nobu_toyofuku at nifty.com> in [ruby-dev:36169].
-
-Sat Sep 6 06:28:46 2008 Tanaka Akira <akr@fsij.org>
-
- * enc/trans/escape.trans: new file.
-
-Sat Sep 6 06:23:27 2008 Tanaka Akira <akr@fsij.org>
-
- * tool/transcode-tblgen.rb (StrSet.parse): accept upper case
- hexadecimal digits.
-
-Sat Sep 6 05:37:08 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (output_hex_charref): upcase hexadecimal digits.
-
-Sat Sep 6 05:22:29 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/encoding.h (ECONV_UNDEF_HEX_CHARREF): defined.
-
- * transcode.c (output_hex_charref): new function.
- (rb_econv_convert): call output_hex_charref if
- ECONV_UNDEF_HEX_CHARREF.
- (Init_transcode): Encoding::Converter::UNDEF_HEX_CHARREF added.
-
-Sat Sep 6 03:52:47 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (rb_econv_convert): use ECONV_INVALID_MASK and
- ECONV_UNDEF_MASK.
-
-Sat Sep 6 06:05:09 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * include/ruby/ruby.h (DBL2NUM): renamed from DOUBLE2NUM.
- a patch from Tadashi Saito <shiba at mail2.accsnet.ne.jp>
- in [ruby-dev:36102].
-
-Sat Sep 6 04:44:06 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * proc.c (Init_Proc): add '===' operator to use procs in when
- clause of the case statement. inspired by <http://www.aimred.com/news/developers/2008/08/14/unlocking_the_power_of_case_equality_proc/>.
-
-Sat Sep 6 03:18:17 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (allocate_converted_string): add arguments for a buffer
- allocated by caller.
- (rb_econv_insert_output): provide caller allocated buffer to
- allocate_converted_string.
-
-Sat Sep 6 02:58:53 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (str_transcode_enc_args): local variables renamed.
- (str_transcode0): ditto.
-
-Sat Sep 6 02:23:18 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (econv_s_stateless_encoding): new method.
-
-Sat Sep 6 02:01:59 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (enc_arg): extracted from str_transcode_enc_args.
- (str_transcode_enc_args): use enc_arg.
-
-Fri Sep 5 20:27:17 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/io.h (rb_io_modestr_fmode): renamed from
- rb_io_mode_flags.
- (rb_io_modestr_oflags): renamed from rb_io_mode_modenum.
- (rb_io_oflags_fmode): renamed from rb_io_modenum_flags.
- (rb_io_mode_flags): defined as a macro.
- (rb_io_modenum_flags): ditto.
-
- * io.c: follow the renaming with consistency.
-
- * process.c (check_exec_redirect): call rb_io_modestr_oflags.
-
- * ext/pty/depend: pty.o depends on io.h.
-
-Fri Sep 5 20:12:23 2008 Tanaka Akira <akr@fsij.org>
-
- * enc/trans/newline.trans (universal_newline_finish): new function.
-
-Fri Sep 5 20:07:37 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/io.h (rb_io_mode_modenum): moved from
- include/ruby/intern.h.
-
-Fri Sep 5 19:59:26 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (MODENUM_MAX): removed.
-
-Fri Sep 5 18:37:52 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (copy_stream_fallback_body): use read method unless readpartial
- is available. [ruby-dev:36124]
-
-Fri Sep 5 18:16:31 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/iconv/iconv.c (iconv_create): strips glibc style option before
- charset mapping. retries without options if they seemed causing
- error, and warns. [ruby-dev:36147]
-
-Fri Sep 5 03:09:48 2008 Koichi Sasada <ko1@atdot.net>
-
- * iseq.c (iseq_data_to_ary): make it static.
-
- * thread.c (thgroup_enclose): ditto.
-
-Fri Sep 5 02:56:37 2008 Koichi Sasada <ko1@atdot.net>
-
- * vm.c (thread_recycle_stack_slot, thread_recycle_stack_count):
- make it static.
-
-Fri Sep 5 02:40:38 2008 Koichi Sasada <ko1@atdot.net>
-
- * thread.c (rb_thread_critical): removed.
-
-Fri Sep 5 01:22:23 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (argf_mark): mark p->encs.ecopts.
-
-Fri Sep 5 00:45:07 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode_data.h (rb_transcoder): rename fields:
- from_encoding -> src_encoding, to_encoding -> dst_encoding.
-
- * transcode.c: follow the renaming.
-
-Fri Sep 5 00:22:34 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c: variables renamed for consistency.
-
-Fri Sep 5 00:05:27 2008 Tanaka Akira <akr@fsij.org>
-
- * pack.c (encodes): make buff fixed length to avoid SEGV by
- ruby -e '["a"*10000000].pack("m1000000000")'
-
-Thu Sep 4 23:47:05 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * ext/bigdecimal/bigdecimal.c (BigDecimal_mode): set exception mode
- correctly. In spite of BigDecimal.mode(BigDecimal::EXCEPTION_ALL,
- true), BigDecimal.new("NaN") did not raise an exception previously.
-
-Thu Sep 4 23:42:42 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/intern.h (rb_file_open_str): declared.
-
- * io.c (rb_file_open_str): defined.
-
- * ext/zlib/zlib.c (gzfile_s_open): use rb_file_open_str instead of
- rb_file_open.
-
-Thu Sep 4 23:18:55 2008 Tanaka Akira <akr@fsij.org>
-
- * enc/trans/newline.trans: record newline types met in universal
- newline decoder.
-
-Thu Sep 4 23:05:54 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * lib/prime.rb (Prime::OldCompatibility#each): added compatibility to
- Ruby 1.8.7.
- (Prime#each): added more rdocs.
- (Prime#each): remembers the last value of the given block.
-
-Thu Sep 4 21:53:58 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (econv_init): accept an integer as 3rd argument as well.
-
-Thu Sep 4 21:46:21 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (sym_partial_input): new variable.
- (econv_primitive_convert): accept a hash as 5th argument as well.
-
-Thu Sep 4 21:04:27 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (sym_universal_newline_decoder): new variable.
- (sym_crlf_newline_encoder): ditto.
- (sym_cr_newline_encoder): ditto.
- (econv_opts): check newline converter options.
- (econv_init): make 3rd argument hash/nil only.
-
-Thu Sep 4 21:03:28 2008 Koichi Sasada <ko1@atdot.net>
-
- * vm_dump.c: rename some debug functions.
-
-Thu Sep 4 20:57:54 2008 Koichi Sasada <ko1@atdot.net>
-
- * thread.c (rb_thread_check_trap_pending): added for compatibility.
-
- * ext/tk/tcltklib.c, ext/tk/tkutil/tkutil.c: remove ruby/signal.h
- dependency.
-
-Thu Sep 4 20:30:24 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode_data.h (PType): defined unconditionally.
-
- * transcode.c (PType): don't define here.
-
-Thu Sep 4 20:19:36 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c: variables renamed for consistency.
-
-Thu Sep 4 19:40:50 2008 Narihiro Nakamura <authorNari@gmail.com>
-
- * gc.c (gc_profile_record_get): to static function.
- (gc_profile_result): ditto.
- (gc_profile_report): ditto.
-
-Thu Sep 4 19:20:24 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/io.h (rb_io_enc_t): rename flags to ecflags.
- (rb_io_t): rename writeconv_pre_flags to writeconv_pre_ecflags.
- (MakeOpenFile): follow the renaming.
-
- * io.c: follow the renaming.
-
-Thu Sep 4 19:10:27 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/encoding.h (ECONV_INVALID_IGNORE): removed because
- it tend to cause security problem. If the behaviour is really
- required, ECONV_INVALID_REPLACE with empty string can be used.
- For example, CVE-2006-2313, CVE-2008-1036, [ruby-core:15645],
- http://unicode.org/reports/tr36/
- (ECONV_UNDEF_IGNORE): ditto.
-
- * transcode.c (rb_econv_convert): follow the above change.
- (econv_opts): ditto.
- (Init_transcode): ditto.
-
-Thu Sep 4 13:22:02 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm_core.h (struct rb_vm_struct): replaced signal staff with trap
- staff.
-
- * signal.c (signal_buff): per process resource now.
-
- * signal.c (trap_list): moved to VM.
-
- * signal.c (rb_get_next_signal): reverted.
-
- * signal.c (rb_trap_exit): trap_pending_list was no longer used.
-
- * thread.c (timer_thread_function): delivers buffered per-process
- signals to each VMs.
-
- * vm.c (rb_vm_mark): marks trap_list.
-
-Thu Sep 4 13:01:11 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (struct sysopen_struct, rb_sysopen_internal, rb_sysopen):
- constified.
-
- * io.c: expanded ARGF members macros.
-
-Thu Sep 4 10:43:47 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * tool/transcode-tblgen.rb (citrus_decode_mapsrc): support older 1.8.
-
-Thu Sep 4 10:33:43 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (argf_next_argv, argf_set_encoding): copy struct wise.
-
-Thu Sep 4 09:46:18 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (rb_scan_open_args): follow rb_str_transcode change.
-
-Thu Sep 4 08:59:29 2008 Tanaka Akira <akr@fsij.org>
-
- * file.c (rb_find_file): fix GC problem on Debian GNU/Linux (IA64)
- with gcc (GCC) 4.1.2 20061115 (prerelease) (Debian 4.1.1-21).
- There is no register/memory to contain load_path. A register (r35)
- contains &RARRAY_PTR(load_path), (char*)load_path + 32.
-
-Thu Sep 4 03:10:05 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/io.h (rb_io_t): new fields: encs.ecopts and
- writeconv_pre_ecopts.
- (MakeOpenFile): initialize them.
-
- * include/ruby/encoding.h (rb_str_transcode): take ecopts argument.
- (rb_econv_flags): removed.
- (rb_econv_prepare_opts): declared.
- (rb_econv_open_opts): declared.
-
- * io.c (make_writeconv): use rb_econv_open_opts.
- (make_readconv): ditto.
- (io_fwrite): follow rb_str_transcode change.
- (rb_io_extract_modeenc): use rb_econv_prepare_opts.
- (rb_file_open_generic): initialize encs.ecopts.
- (rb_file_open_internal): ditto.
- (rb_io_reopen): ditto.
- (argf_ecopts): defined.
- (argf_next_argv): set encs.ecopts.
- (io_encoding_set): use rb_econv_prepare_opts.
- (argf_set_encoding): set argf_ecopts.
-
- * gc.c (gc_mark_children): mark encs.ecopts and writeconv_pre_ecopts
- in T_FILE.
-
- * transcode.c (transcode_loop): take ecopts argument. use
- rb_econv_open_opts.
- (rb_econv_flags): removed.
- (rb_econv_prepare_opts): defined.
- (rb_econv_open_opts): defined.
- (str_transcode0): take ecopts.
- (str_transcode): use rb_econv_prepare_opts.
- (rb_str_transcode): take ecopts.
- (econv_init): accept hash argument.
- (econv_insert_output): follow rb_str_transcode change.
-
-Thu Sep 4 01:30:26 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/encoding.h (rb_econv_set_replacemenet): declared.
-
- * transcode.c (rb_econv_t): new fields: replacement_str,
- replacement_len, replacement_enc and replacement_allocated.
- (get_replacement_character): make len as size_t.
- (rb_econv_open_by_transcoder_entries): initialize the new fields.
- (rb_econv_close): deallocate replacement_str if it allocated.
- (make_replacement): new function.
- (output_replacement_character): use make_replacement.
- (rb_econv_set_replacemenet): defined.
- (econv_get_replacement): new method.
- (econv_set_replacement): new method.
-
-Thu Sep 4 01:12:03 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (filetime_to_timeval): new function, split from
- gettimeofday().
-
- * win32/win32.c (gettimeofday): use above function.
-
- * win32/win32.c (filetime_to_unixtime): ditto. [ruby-dev:36135]
-
-Thu Sep 4 01:00:57 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * transcode.c (transcode_restartable0): avoid VC++6's bug.
-
-Thu Sep 4 00:26:27 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * io.c (make_writeconv): follow akr's previous commit.
-
-Thu Sep 4 00:09:05 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/encoding.h (rb_econv_option_t): removed. Since
- rb_econv_option_t has only one field, int flags, rb_econv_option_t is
- replaced by int.
-
- * include/ruby/io.h: follow the above change.
-
- * io.c: ditto.
-
- * transcode.c: ditto.
-
-Thu Sep 4 00:04:59 2008 Koichi Sasada <ko1@atdot.net>
-
- * win32/win32.c: fix ruby/signal.h depending codes.
-
-Thu Sep 4 00:01:45 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/etc/test_etc.rb (test_getpwuid, test_getgrgid): use
- Process.euid and egid instead of Etc.getlogin to identify current
- user which may be different from a login one (e.g., su command).
-
-Wed Sep 3 23:52:47 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/etc/test_etc.rb: check only typical use of
- setpwent/getpwent/endpwent and setgrent/getgrent/endgrent.
-
-Wed Sep 3 23:33:09 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (rb_transcoding): moved from transcode_data.h.
- (TRANSCODING_READBUF): ditto.
- (TRANSCODING_WRITEBUF): ditto.
- (TRANSCODING_STATE_EMBED_MAX): ditto.
- (TRANSCODING_STATE): ditto.
-
-Wed Sep 3 23:03:37 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode_data.h (rb_transcoding): remove stateful field.
- add state field.
- (TRANSCODING_STATE): defined.
- (rb_transcoder): add fields: state_size, state_init_func,
- state_fini_func.
- change rb_transcoding* argument to void*.
-
- * transcode.c (transcode_restartable0): use TRANSCODING_STATE for
- first arguments of transcoder functions.
- (rb_transcoding_open_by_transcoder): initialize state field.
- (rb_transcoding_close): finalize state field.
-
- * tool/transcode-tblgen.rb: provide state size/init/fini.
-
- * enc/trans/newline.trans (universal_newline_init): defined.
- (fun_so_universal_newline): take void* as a state pointer.
- (rb_universal_newline): provide state size/init/fini.
- (rb_crlf_newline): ditto.
- (rb_cr_newline): ditto.
-
- * enc/trans/iso2022.trans (iso2022jp_init): defined.
- (fun_si_iso2022jp_to_eucjp): take void* as a state pointer.
- (fun_so_iso2022jp_to_eucjp): ditto.
- (fun_so_eucjp_to_iso2022jp): ditto.
- (iso2022jp_reset_sequence_size): ditto.
- (finish_eucjp_to_iso2022jp): ditto.
- (rb_ISO_2022_JP_to_EUC_JP): provide state size/init/fini.
- (rb_EUC_JP_to_ISO_2022_JP): ditto.
-
- * enc/trans/utf_16_32.trans (fun_so_from_utf_16be): take void* as a
- state pointer.
- (fun_so_to_utf_16be): ditto.
- (fun_so_from_utf_16le): ditto.
- (fun_so_to_utf_16le): ditto.
- (fun_so_from_utf_32be): ditto.
- (fun_so_to_utf_32be): ditto.
- (fun_so_from_utf_32le): ditto.
- (fun_so_to_utf_32le): ditto.
- (rb_from_UTF_16BE): provide state size/init/fini.
- (rb_to_UTF_16BE): ditto.
- (rb_from_UTF_16LE): ditto.
- (rb_to_UTF_16LE): ditto.
- (rb_from_UTF_32BE): ditto.
- (rb_to_UTF_32BE): ditto.
- (rb_from_UTF_32LE): ditto.
- (rb_to_UTF_32LE): ditto.
-
- * enc/trans/japanese.trans (fun_so_eucjp2sjis): take void* as a state
- pointer.
- (fun_so_sjis2eucjp): ditto.
- (rb_eucjp2sjis): provide state size/init/fini.
- (rb_sjis2eucjp): provide state size/init/fini.
-
-Wed Sep 3 22:31:11 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * lib/mathn.rb (Integer): moved into prime.rb.
- (Prime): ditto.
-
- * lib/prime.rb (Integer): moved from mathn.rb.
- (Integer.each_prime): added.
- (Integer#prime?): added.
- (Prime): moved from mathn.rb.
- Its implementation was rewritten. see [ruby-dev:35863].
- And patched by Keiju ISHITSUKA <keiju@ishitsuka.com>,
- see [ruby-dev:36128].
- (Prime.new): obsolete.
- (Prime.instance): added.
- (Prime.each): added.
- (Prime.int_from_prime_division): added.
- (Prime.prime_division): added.
- (Prime.prime?): added.
- Patch by TOYOFUKU Chikanobu
- <nobu_toyofuku at nifty.com> in [ruby-dev:36067].
- (Prime.cache): removed.
- (Prime.primes): removed.
- (Prime.primes_so_far): removed.
- (Prime#int_from_prime_division): added.
- (Prime#prime_division): added.
- (Prime#prime?): added.
- (Prime#primes): removed.
- (Prime#primes_so_far): removed.
- (Prime::PseudoPrmeGenerator): added.
- (Prime::EratosthenesGenerator): added.
- (Prime::TrialDivisionGenerator): added.
- (Prime::Generator23): added.
- (Prime::TrialDivision): added.
- Extracted from the previous implementation of Prime
- by Keiju ISHITSUKA.
- (Prime::EratosthenesSieve): added.
-
- * lib/.document (prime.rb): added
-
- * lib/README (prime.rb): added
-
- * test/test_prime.rb: added.
-
-Wed Sep 3 21:49:00 2008 David A. Black <dblack@rubypal.com>
-
- * lib/scanf.rb: fixed bug involving matching literal '['
-
- * test/scanf/test_scanf.rb: added test for scanf.rb fix
-
-Wed Sep 3 21:31:59 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode_data.h (WORDINDEX_SHIFT_BITS): defined.
- (WORDINDEX2INFO): defined.
- (INFO2WORDINDEX): defined.
-
- * tool/transcode-tblgen.rb: use WORDINDEX2INFO.
-
- * transcode.c: use INFO2WORDINDEX.
-
-Wed Sep 3 21:19:51 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * golf_prelude.rb: suppress warnings when goruby -v.
-
-Wed Sep 3 21:07:30 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (BL_MIN_BYTE): defined.
- (BL_MAX_BYTE): defined.
- (BL_OFFSET): defined.
- (BL_ACTION): defined.
- (transcode_restartable0): use BL_MIN_BYTE, BL_MAX_BYTE and
- BL_ACTION.
-
-Wed Sep 3 20:58:30 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (BYTE_ADDR): defined.
- (WORD_ADDR): ditto.
- (BL_BASE): use BYTE_ADDR and WORD_ADDR.
- (BL_INFO): use WORD_ADDR.
-
-Wed Sep 3 20:47:31 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode_data.h (rb_transcoder): new field: byte_array_length and
- word_array_length.
-
- * tool/transcode-tblgen.rb (transcode_generated_code): generate
- byte_array_length and word_array_length.
-
-Wed Sep 3 20:34:10 2008 Tanaka Akira <akr@fsij.org>
-
- * tool/transcode-tblgen.rb (ArrayCode): new class.
- (ActionMap#gen_array_code): moved to ArrayCode.
- (ActionMap#numelt_array_code): ditto.
- (ActionMap#array_code_insert_at_last): ditto.
- (TRANSCODE_GENERATED_BYTES_CODE): use ArrayCode.
- (TRANSCODE_GENERATED_WORDS_CODE): ditto.
-
-Wed Sep 3 20:08:35 2008 Tanaka Akira <akr@fsij.org>
-
- * enc/trans/japanese.trans: new file.
-
-Wed Sep 3 20:04:33 2008 Tanaka Akira <akr@fsij.org>
-
- * tool/transcode-tblgen.rb (ActionMap#gen_array_code): extracted from
- generate_lookup_node.
- (ActionMap#numelt_array_code): ditto.
- (ActionMap#array_code_insert_at_last): ditto.
-
-Wed Sep 3 20:01:01 2008 Tanaka Akira <akr@fsij.org>
-
- * parse.y (parser_encoding_name): defined.
- (parser_tokadd_mbchar): show encoding in the message of
- "invalid multibyte char" error.
-
-Wed Sep 3 19:28:04 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * vm_insnhelper.c (vm_method_missing): C99.
-
-Wed Sep 3 19:18:12 2008 Koichi Sasada <ko1@atdot.net>
-
- * test/ruby/test_thread.rb: fix test.
- [ruby-dev:35960]
-
-Wed Sep 3 17:48:32 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/trans/make_transdb.rb: check $(srcdir)/enc/trans before
- enc/trans.
-
- * enc/trans/make_transdb.rb: keep names_t.
-
-Wed Sep 3 16:54:46 2008 Koichi Sasada <ko1@atdot.net>
-
- * include/ruby/signal.h: removed.
-
- * common.mk, class.c, eval.c, eval_intern.h, file.c, gc.c, hash.c,
- io.c, process.c, signal.c: vm_core.h: ditto.
- Some unused external global variables are also removed.
- (rb_prohibit_interrupt, rb_trap_immediate, rb_trap_pending,
- rb_thread_critical)
-
- * ext/openssl/ossl_ssl.c, ext/openssl/ossl_x509store.c,
- ext/readline/readline.c, ext/socket/depend,
- ext/socket/socket.c: ditto.
-
-Wed Sep 3 00:23:25 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * vm_insnhelper.c (vm_method_missing): copy arguments to allocated
- memory from machine stack. [ruby-dev:36064]
-
-Tue Sep 2 22:20:26 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode_data.h (base_element): removed.
- (BYTE_LOOKUP): removed.
- (BYTE_LOOKUP_BASE): don't cast.
- (BYTE_LOOKUP_INFO): ditto.
- (PType): unsigned int, instead of uintptr_t.
- (rb_transcoding): change type of next_field, conv_tree_start and
- word_array.
-
- * tool/transcode-tblgen.rb: generate word_array as array of unsigned
- int.
-
- * transcode.c (transcode_restartable0): follow the above type change.
-
-Tue Sep 2 21:22:22 2008 Tanaka Akira <akr@fsij.org>
-
- * tool/transcode-tblgen.rb: add prefix for byte_array and word_array.
-
-Tue Sep 2 20:57:14 2008 Tanaka Akira <akr@fsij.org>
-
- * enc/trans/make_transdb.rb: check foo.c only if foo.trans exists.
-
-Tue Sep 2 19:19:55 2008 Tanaka Akira <akr@fsij.org>
-
- * enc/trans/make_transdb.rb: error message improved.
-
-Tue Sep 2 14:05:50 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * enc/trans/utf_16_32.trans (from_UTF_8): rename from to_UTF_16BE
- because it was not collect.
-
-Tue Sep 2 14:00:54 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * enc/emacs_mule.c (svn:executable): dropped executable bit.
-
- * enc/make_encdb.rb (svn:executable): ditto.
-
-Tue Sep 2 12:58:58 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/Makefile.sub (COMPILERFLAG): new compiler flag to compile
- enc/trans/japanese*.c.
-
-Tue Sep 2 12:37:10 2008 Tanaka Akira <akr@fsij.org>
-
- * enc/trans/japanese_euc.trans: splitted from japanese.trans to avoid
- compiler limitation. reported by usa.
-
- * enc/trans/japanese_sjis.trans: ditto.
-
-Tue Sep 2 12:31:24 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/Makefile.sub (miniruby): new target.
-
-Tue Sep 2 11:47:36 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * marshal.c (struct load_arg): data is now st_table.
-
- * marshal.c (mark_load_arg): marks data and compat_tbl.
-
- * marshal.c (r_object0): no need to check if reentered.
-
- * marshal.c (marshal_load): make the wrapper with mark_load_arg.
-
-Tue Sep 2 10:49:18 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (gettimeofday): easier calculation. use the definition
- of the Gregorian calendar.
-
-Tue Sep 2 10:33:12 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * common.mk (distclean-golf): moved golf_prelude.c here from
- distclean-local.
- (GOLFPRELUDE): added.
- (distclean-local): moved golf_prelude.c into distclean-golf.
-
-Tue Sep 2 10:09:17 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (gettimeofday): calc tv_sec and tv_usec from system
- time by myself. [ruby-dev:36084]
-
-Tue Sep 2 04:00:37 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode_data.h (o3): prevent sign extension on 64bit environment.
- (o4): ditto.
-
-Tue Sep 2 03:26:24 2008 Tanaka Akira <akr@fsij.org>
-
- * tool/transcode-tblgen.rb: comment removed in generated code.
-
-Tue Sep 2 03:16:42 2008 Tanaka Akira <akr@fsij.org>
-
- * tool/transcode-tblgen.rb: define TRANSCODE_TABLE_INFO in generated
- code. use it in rb_transcoder.
-
- * enc/trans/newline.trans: use TRANSCODE_TABLE_INFO.
-
- * enc/trans/iso2022.trans: ditto.
-
- * enc/trans/utf_16_32.trans: ditto.
-
-Tue Sep 2 03:04:33 2008 Tanaka Akira <akr@fsij.org>
-
- * tool/transcode-tblgen.rb: record infos and BYTE_LOOKUPs as index of
- word_array to avoid relocation.
-
- * transcode.c (transcode_restartable0): add word_array to get infos
- and BYTE_LOOKUPs.
-
- * transcode_data.h (BYTE_LOOKUP_INFO): change return type to
- uintptr_t.
-
-Tue Sep 2 02:48:30 2008 Tanaka Akira <akr@fsij.org>
-
- * tool/transcode-tblgen.rb: don't need to cast offsets array.
-
-Tue Sep 2 02:36:20 2008 Tanaka Akira <akr@fsij.org>
-
- * tool/transcode-tblgen.rb: record offsets array as index of
- byte_array to avoid relocation.
-
- * transcode.c (transcode_restartable0): add byte_array to get offsets
- array.
-
- * transcode_data.h (BYTE_LOOKUP_BASE): change return type to
- uintptr_t.
- (rb_transcoder): add fields: byte_array, word_array and word_size.
-
- * enc/trans/newline.trans: follow rb_transcoder change.
-
- * enc/trans/iso2022.trans: ditto.
-
- * enc/trans/utf_16_32.trans: ditto.
-
-Tue Sep 2 02:05:14 2008 Tanaka Akira <akr@fsij.org>
-
- * tool/transcode-tblgen.rb: make infos arrays and BYTE_LOOKUPs into
- single array.
-
-Tue Sep 2 01:47:44 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * common.mk (clean-golf): added.
- (distclean-golf): added.
- (realclean-golf): added.
- (clean): added clean-golf.
- (distclean): added distclean-golf.
- (realclean): added realclean-golf.
-
-Tue Sep 2 01:31:45 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * common.mk (realclean-local): added newline.c.
-
-Tue Sep 2 01:19:15 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode_data.h (BYTE_LOOKUP): change to uintptr_t array.
- (BYTE_LOOKUP_BASE): follow the type change.
- (BYTE_LOOKUP_INFO): ditto.
- (PType): ditto.
- (rb_transcoding): ditto.
-
- * tool/transcode-tblgen.rb: follow the type change.
-
- * transcode.c: ditto.
-
- * enc/trans/newline.trans: ditto.
-
- * enc/trans/iso2022.trans: ditto.
-
- * enc/trans/utf_16_32.trans: ditto.
-
-Mon Sep 1 23:32:46 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode_data.h (BYTE_LOOKUP_BASE): abstract accessor for
- BYTE_LOOKUP.
- (BYTE_LOOKUP_INFO): ditto.
-
- * transcode.c (transcode_restartable0): use BYTE_LOOKUP_BASE and
- BYTE_LOOKUP_INFO.
-
-Mon Sep 1 23:14:25 2008 Tanaka Akira <akr@fsij.org>
-
- * tool/transcode-tblgen.rb: gather infos arrays and BYTE_LOOKUPs.
-
-Mon Sep 1 22:42:54 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * lib/mkmf.rb (distclean): added RM_RF conftest.dSYM.
- Fixes distclean-ext problem on Mac OS X.
- (RM_RF): added.
-
-Mon Sep 1 22:37:06 2008 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/rexml/document.rb: limit entity expansion. Thanks, Luka
- Treiber, Mitja Kolsek, and Michael Koziarski.
-
- * lib/rexml/entity.rb: ditto.
-
- * test/rexml/test_document.rb: ditto.
-
-Mon Sep 1 22:20:22 2008 Tanaka Akira <akr@fsij.org>
-
- * tool/transcode-tblgen.rb: make offsets arrays into single array.
-
-Mon Sep 1 21:46:18 2008 Tanaka Akira <akr@fsij.org>
-
- * tool/transcode-tblgen.rb: gather offsets arrays at top.
-
-Mon Sep 1 21:09:04 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * ./: removed rubyspec from svn:ignore subversion property.
- rubyspec directory is no longer used.
-
- * spec: added mspec and rubyspec to svn:ignore.
-
-Mon Sep 1 19:37:19 2008 Tanaka Akira <akr@fsij.org>
-
- * tool/transcode-tblgen.rb: ValidEncoding['eucJP-ms'] defined.
- "\xA2\xAF".encode("utf-8", "eucJP-ms") should raise
- Encoding::ConversionUndefined, not Encoding::InvalidByteSequence.
-
-Mon Sep 1 18:27:51 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (gettimeofday): shouldn't use mktime(3) because it's
- buggy about handling summer time.
- reported by Yoshikawa <yoshixool AT gmail.com> at [ruby-dev:36071]
-
-Mon Sep 1 17:07:23 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/euc_jp.c (euc-jp-ms): euc-jp-ms is not an alias of EUC-JP
- but eucJP-ms.
-
- * enc/trans/japanese.trans (eucJP-ms): eucJP-ms is the correct
- name of the encoding in Ruby. [ruby-dev:36070]
-
-Mon Sep 1 16:48:50 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/digest/md5/md5init.c (md5), ext/digest/rmd160/rmd160init.c
- (rmd160) ext/digest/sha1/sha1init.c (sha1),
- ext/digest/sha2/sha2init.c (sha256, sha384, sha512): constified.
-
-Mon Sep 1 15:15:40 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/trans/japanese.trans: fix mapping priority.
- IBM extended is prior than NEC selected IBM.
-
-Mon Sep 1 14:44:22 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * tool/transcode-tblgen.rb (transcode_compile_tree): use the first
- mapping when some mappings are given for a character.
- [ruby-dev:36068]
-
- * tool/transcode-tblgen.rb: expandtab.
-
-Mon Sep 1 14:40:18 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * README.EXT (Appendix A): fixed the name of class
- Enumerator. Enumerable::Enumerator was renamed just
- Enumerator at revision 18564.
-
- * README.EXT (Appendix A): ditto.
-
-Mon Sep 1 14:37:58 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * tool/transcode-tblgen.rb: set ERB source filename for error message.
-
-Mon Sep 1 14:37:02 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * enc/depend: transdb.c may not present.
-
-Mon Sep 1 14:25:26 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/trans/japanese.trans: fix Ruby 1.8 compatibility.
-
- * enc/trans/japanese.trans: fix mapping priority. [ruby-dev:36068]
-
-Mon Sep 1 14:24:14 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * test/ruby/test_transcode.rb (test_windows_31j): added.
-
-Mon Sep 1 14:00:04 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * README.EXT (Data-types): fixed for current status.
- (Manipulating Ruby data): mentioned some more functions.
- (Class/module definition): ditto.
- (Global variables shared between C and Ruby):
- fixed prototypes for the getter/setter's of global variables.
- (Appendix A): mentioned some more files.
-
- * README.EXT.ja: ditto.
-
-Mon Sep 1 11:31:49 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/fileutils.rb (copy_stream, fu_copy_stream0, copy_file): use
- IO.copy_stream to get rid of extraneous conversion.
-
-Mon Sep 1 02:55:15 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * strftime.c (rb_strftime): calc timezone offset by myself if system
- doesn't provide timezone info.
-
-Mon Sep 1 02:48:28 2008 Tanaka Akira <akr@fsij.org>
-
- * tool/transcode-tblgen.rb: change "illegal" to "invalid".
-
-Mon Sep 1 02:31:16 2008 Tanaka Akira <akr@fsij.org>
-
- * tool/transcode-tblgen.rb (transcode_generated_code): defined for
- generating table at once.
- (transcode_tblgen): returns an empty string.
- (transcode_generate_node): ditto.
-
- * enc/trans/newline.trans: use transcode_generated_code.
-
- * enc/trans/iso2022.trans: ditto.
-
- * enc/trans/single_byte.trans: ditto.
-
- * enc/trans/utf_16_32.trans: ditto.
-
- * enc/trans/japanese.trans: ditto.
-
- * enc/trans/korean.trans: ditto.
-
-Mon Sep 1 02:10:03 2008 Tanaka Akira <akr@fsij.org>
-
- * tool/transcode-tblgen.rb (citrus_decode_mapsrc): print logging
- message on STDERR.
-
-Mon Sep 1 01:24:09 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/trans/eucjp-tbl.rb: replace by previous Citrus maps.
-
- * enc/trans/sjis-tbl.rb: ditto.
-
-Mon Sep 1 01:18:26 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * tool/transcode-tblgen.rb: add table generator from Citrus maps.
-
- * enc/trans/japanese.trans: use Citrus maps.
-
- * enc/trans/CP: add maps from Citrus.
-
- * enc/trans/JIS: ditto.
-
- * test/ruby/test_transcode.rb: Shift_JIS and EUC-JP doesn't support
- IBM extended characters.
-
-Mon Sep 1 00:19:45 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * common.mk (docs): removed a useless make target.
- tool/makedoc.rb was removed at revision 13919.
-
-Sun Aug 31 20:49:42 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c (numeric_abs2): new.
-
-Sun Aug 31 18:22:04 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb (have_devel?): checks if the compiler works.
-
-Sun Aug 31 18:02:41 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * Temporarily uses git://github.com/yugui/rubyspec.git
- until specs for 1.9 is merged into
- git://github.com/rubyspec/rubyspec.git.
-
-Sun Aug 31 18:06:49 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (transcode.c): set source_encoding and
- destination_encoding as encoding object.
- (ecerr_source_encoding): new method.
- (ecerr_destination_encoding): ditto.
-
-Sun Aug 31 17:58:59 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb (Logging.log_open): opens in binary mode to get rid of
- extra CR.
-
- * lib/mkmf.rb (try_func, try_var, have_struct_member),
- (scalar_ptr_type?, scalar_type?): use MAIN_DOES_NOTHING.
-
- * lib/mkmf.rb (MAIN_DOES_NOTHING): defaults to ordinary main.
-
- * win32/Makefile.sub (config): for MAIN_DOES_NOTHING for wince.
-
-Sun Aug 31 17:30:35 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * spec/README (How to run): added.
-
-Sun Aug 31 17:28:25 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * spec/default.mspec (config): added.
-
- * spec/default.mspec (target): replaced the built ruby
- to runruby.rb.
- Improved $LOAD_PATH on running specs.
-
- * spec/default.mspec (flags): ditto.
-
-Sun Aug 31 17:16:07 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (make_econv_exception): rename instance variable names
- for storing encoding names.
- (ecerr_source_encoding_name): method renamed.
- (ecerr_destination_encoding_name): ditto.
-
-Sun Aug 31 16:57:36 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (econv_putback): associate encoding to the result.
-
-Sun Aug 31 16:43:56 2008 Koichi Sasada <ko1@atdot.net>
-
- * include/ruby/intern.h: rename RB_UBF_DFL to
- RUBY_UBF_IO and RUBY_UBF_PROCESS.
- Because there is no default (universal) unblocking function.
-
- * ext/socket/socket.c, file.c, io.c, process.c, thread.c: ditto.
-
-Sun Aug 31 16:42:23 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (econv_insert_output): raise ArgumentError on failure.
-
-Sun Aug 31 16:39:17 2008 Koichi Sasada <ko1@atdot.net>
-
- * bootstraptest/test_thread.rb: add a test.
-
-Sun Aug 31 16:34:41 2008 Tanaka Akira <akr@fsij.org>
-
- * enc/trans/single_byte.trans (us_ascii_map): don't define 8bit bytes.
-
-Sun Aug 31 14:27:27 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (econv_last_error): new method.
-
-Sun Aug 31 14:17:34 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (econv_primitive_convert): make two arguments,
- destination_byteoffset and destination_bytesize, optional.
-
-Sun Aug 31 14:12:06 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (make_econv_exception): error message simplified.
-
-Sun Aug 31 13:47:59 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/coverage/coverage.c (rb_mCoverage): removed unneeded static variable.
-
- * ext/socket/socket.c (unix_recv_io): ditto.
-
- * ext/socket/socket.c (mConst): ditto.
-
-Sun Aug 31 13:45:41 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/openssl/ossl_ocsp.c (ossl_ocspres_initialize): fix for
- initialization of r18168.
-
-Sun Aug 31 13:42:39 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/ripper/eventids2.c (ripper_init_eventids2): use rb_intern_const.
-
- * ext/ripper/tools/generate.rb (generate_eventids1): ditto.
-
- * ext/ripper/tools/generate.rb (generate_eventids2_table): ditto.
-
-Sun Aug 31 12:56:00 2008 Tanaka Akira <akr@fsij.org>
-
- * ext/dl/mkcallback.rb (rb_dl_init_callbacks): fix indent.
-
-Sun Aug 31 11:39:21 2008 Tanaka Akira <akr@fsij.org>
-
- * ext/strscan/strscan.c (strscan_do_scan): fix usecnt decrement.
-
-Sun Aug 31 04:38:47 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (econv_putback): make max argument optional.
-
-Sun Aug 31 04:35:21 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (rb_econv_putback): putback from last byte.
-
-Sun Aug 31 04:27:04 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (econv_putback): renamed from econv_primitive_putback.
-
-Sun Aug 31 04:22:51 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (econv_insert_output): renamed from
- econv_primitive_insert_output.
-
-Sun Aug 31 04:20:46 2008 Tanaka Akira <akr@fsij.org>
-
- * test/ruby/test_econv.rb: follow econv_primitive_errinfo change.
-
-Sun Aug 31 03:44:24 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (econv_primitive_errinfo): 5th element (partial_input)
- removed from result.
-
-Sun Aug 31 01:53:31 2008 Tanaka Akira <akr@fsij.org>
-
- * ext/dl/mkcallback.rb: split callback.h to callback-[0-9].c to reduce
- memory consumption on compilation. [ruby-dev:31898]
-
- * ext/dl/depend: add dependency for callback-[0-9].[co].
-
-Sun Aug 31 01:27:46 2008 Tanaka Akira <akr@fsij.org>
-
- * ext/dl/mkcallback.rb (foreach_proc_entry): extracted.
- (gencallback): ditto.
- (gen_push_proc_ary): ditto.
- (gen_push_addr_ary): ditto.
-
-Sat Aug 30 23:51:01 2008 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-
- * test/rinda/test_tuplebag.rb (test_has_expires_eh): fix failures
- [ruby-dev:35937].
-
-Sat Aug 30 23:38:00 2008 Tanaka Akira <akr@fsij.org>
-
- * ext/dl/test/test_import.rb: fix character code.
-
- * ext/dl/test/test_func.rb: ditto.
-
-Sat Aug 30 22:23:31 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * rational.c: added a static variable for nurat_to_f.
-
-Sat Aug 30 20:05:41 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (rb_w32_open, rb_w32_read, rb_w32_write): fallback to
- MSVCRT if text mode is specified. this case will not be used from
- ruby itself.
-
-Sat Aug 30 19:49:38 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (rb_w32_read): EOF is not error.
- ref [ruby-dev:36050]
-
-Sat Aug 30 18:17:40 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (struct token_info): constified.
-
- * parse.y (token_info_get_column, token_info_has_nonspaces),
- (token_info_push, token_info_pop): constified.
-
-Sat Aug 30 15:43:03 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/openssl/ossl_config.c (Init_ossl_config): memory leak fixed.
- a patch <shinichiro.hamaji at gmail.com> in [ruby-dev:35880].
-
- * ext/openssl/ossl_x509ext.c (ossl_x509ext_set_value): ditto.
-
- * ext/strscan/strscan.c (strscan_do_scan): ditto.
-
-Sat Aug 30 14:58:32 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/openssl/ossl_x509ext.c (ossl_x509ext_initialize): fix for
- initialization of r18168.
-
-Sat Aug 30 14:47:30 2008 Tanaka Akira <akr@fsij.org>
-
- * ext/dl/mkcallback.rb: fix continuation line detection.
-
-Sat Aug 30 14:39:51 2008 Tanaka Akira <akr@fsij.org>
-
- * ext/dl/mkcallback.rb (rb_dl_init_callbacks): avoid GC problem which
- is caused by 'GC.stress=true; require "dl"'.
-
-Sat Aug 30 11:54:17 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (token_info_push): -w warns indentation level mismatch.
- based on a patch from Yukina Yamano presented at RubyKaigi'07.
- See <http://jp.rubyist.net/RubyKaigi2007/Log0609-LT06.html> and
- <http://www.logic-junction.com/products/rubyend.html> (Japanese).
-
-Sat Aug 30 10:46:44 2008 Koichi Sasada <ko1@atdot.net>
-
- * ext/iconv/iconv.c: remove include pragma for "ruby/intern.h".
-
-Sat Aug 30 10:43:03 2008 Koichi Sasada <ko1@atdot.net>
-
- * parse.y: remove include pragma for "ruby/intern.h".
-
-Sat Aug 30 10:41:57 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/rake.rb (Rake::Application#help): fix for OPTIONAL_ARGUMENT and
- multiple short options. [ruby-dev:36051]
-
-Sat Aug 30 08:59:25 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/intern.h (rb_file_s_absolute_path),
- (rb_file_absolute_path): prototyped.
-
-Sat Aug 30 08:09:36 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * encoding.c (enc_compatible_p): use TYPE not BUILTIN_TYPE.
- [ruby-dev:36048]
-
-Sat Aug 30 07:48:48 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * encoding.c (enc_compatible_p): add SPECIAL_CONST_P check.
- [ruby-dev:36048]
-
- * test/ruby/test_m17n.rb (test_compatible): fix test.
-
-Sat Aug 30 02:48:11 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (rb_obj_freeze): update rdoc to mention RuntimeError
- (not TypeError any longer) would be raised. [ruby-dev:35982]
-
-Sat Aug 30 01:55:30 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bignum.c (bigdivmod): remove redundant code. a patch from
- TOYOFUKU Chikanobu <nobu_toyofuku at nifty.com> in [ruby-dev:36044].
-
-Sat Aug 30 01:37:20 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/cgi.rb (CGI#initialize): remove unused constants. a patch
- from Takeyuki Fujioka in [ruby-dev:36046].
-
-Fri Aug 29 22:29:41 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c ({nucomp,numeric}_rect): new.
-
- * complex.c: added some aliases
- (::rectangular, ::rect, #rectangular, #rect, #phase,
- #magnitude).
-
- * complex.c (string_to_c_internal): should not strip any null
- bytes.
-
- * rational.c (string_to_r_internal): ditto.
-
- * rational.c (i_gcd): reverted to nurat 0.0.2's one.
-
- * numeric.c: added an alias (#magnitude).
-
- * bignum.c: ditto.
-
- * test/ruby/test_complex.rb: added assertions.
-
- * test/ruby/test_rational.rb: ditto.
-
-Fri Aug 29 19:46:02 2008 Koichi Sasada <ko1@atdot.net>
-
- * gc.c, include/ruby/ruby.h: rename T_DEFERRED to T_ZOMBIE.
-
-Fri Aug 29 18:22:27 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * encoding.c (enc_compatible_p): raise TypeError when argument is not
- String nor Regexp.
-
-Fri Aug 29 18:20:56 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (rb_str_index_m): only regexp uses byte offset.
-
- * string.c (rb_str_rindex_m): ditto.
-
-Fri Aug 29 16:48:34 2008 Koichi Sasada <ko1@atdot.net>
-
- * vm_insnhelper.c (vm_call_method): copy arguments to allocated
- memory from machine stack. [ruby-dev:36028]
-
- * KNOWNBUGS.rb, bootstraptest/test_method.rb: move fixed test.
-
-Fri Aug 29 12:19:12 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/openssl/ossl_x509attr.c (ossl_x509attr_initialize): fix for
- initialization of r18168.
-
- * ext/openssl/ossl_ocsp.c (ossl_ocspreq_initialize): ditto.
-
- * ext/openssl/ossl_x509name.c (ossl_x509name_initialize): ditto.
-
-Fri Aug 29 11:04:03 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * encoding.c (rb_enc_compatible): ASCII compatible string and US-ASCII
- regexp is compatible. [ruby-dev:36033]
-
- * string.c (rb_str_index_m): second argument is position of character.
- by usa. [ruby-dev:36033]
-
- * string.c (rb_str_rindex_m): ditto.
-
-Fri Aug 29 04:47:49 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (rb_w32_read, rb_w32_write): more accurate handling
- of wait result.
-
-Fri Aug 29 02:59:35 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (econv_finish): new method.
-
-Fri Aug 29 02:45:29 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (econv_convert): new method.
-
-Fri Aug 29 02:38:14 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (econv_primitive_convert): accept nil as
- destination_bytesize for unlimited destination size.
-
-Fri Aug 29 02:11:46 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (econv_primitive_convert): accept nil as input for empty
- input.
-
-Fri Aug 29 02:03:56 2008 Shugo Maeda <shugo@ruby-lang.org>
-
- * strftime.c (rb_strftime): supported %s and %P.
-
- * time.c (time_strftime): ditto.
-
- * test/ruby/test_time.rb (test_strftime): ditto.
-
-Fri Aug 29 01:57:58 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (sym_invalid_byte_sequence): new variable.
- (sym_undefined_conversion): ditto.
- (sym_destination_buffer_full): ditto.
- (sym_source_buffer_empty): ditto.
- (sym_finished): ditto.
- (sym_output_followed_by_input): ditto.
- (sym_incomplete_input): ditto.
- (econv_result_to_symbol): use above variables.
- (Init_transcode): initialize above variables.
-
-Fri Aug 29 00:53:40 2008 Shugo Maeda <shugo@ruby-lang.org>
-
- * strftime.c (rb_strftime): fixed a bug of padding.
-
- * test/ruby/test_time.rb: ditto.
-
-Fri Aug 29 00:19:54 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (set_pioinfo_extra): use MSVCRT's open() and close().
-
-Fri Aug 29 00:03:13 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * file.c (file_expand_path): check invalid access.
-
-Thu Aug 28 23:55:50 2008 Shugo Maeda <shugo@ruby-lang.org>
-
- * strftime.c (rb_strftime): Time.mktime(2000).strftime("%-S") should
- return "0", not "".
-
- * test/ruby/test_time.rb: ditto.
-
-Thu Aug 28 23:55:22 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_time.rb: suppress warning during test.
-
-Thu Aug 28 23:50:47 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_time.rb (test_strftime): make test for %a independent
- from local timezone. [ruby-dev:35992]
-
-Thu Aug 28 23:39:49 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * string.c (rb_str_shared_replace): remove corrupt noembed string
- which causes SEGV. [ruby-dev:35989]
-
-Thu Aug 28 23:36:15 2008 Tanaka Akira <akr@fsij.org>
-
- * common.mk: dependency updated.
-
-Thu Aug 28 23:28:57 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * KNOWNBUGS.rb: add a test. see [ruby-dev:36028]
-
-Thu Aug 28 21:43:05 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c, include/ruby/win32.h (rb_w32_open): overlapped file
- I/O support.
-
- * win32/win32.c, include/ruby/win32.h (rb_w32_pipe): overlapped pipe
- I/O support.
-
- * win32/win32.c (rb_w32_read, rb_w32_write): overlapped I/O support to
- enable canceling I/O.
-
- * thread_win32.c (ubf_handle): remove workaround.
-
-Thu Aug 28 20:22:49 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * vm_insnhelper.c (vm_yield_setup_args): object with to_ary should
- behave like array. a patch from Yusuke Endoh <mame at tsg.ne.jp>
- in [ruby-dev:35988]. [ruby-dev:35977]
-
- * object.c (convert_type): call less rb_intern() less frequently
- by using cache structure.
-
- * vm_method.c (rb_method_node): fail earlier if no method found.
-
-Thu Aug 28 19:04:50 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * bootstraptest/test_io.rb: no need to create real file.
-
-Thu Aug 28 09:26:53 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * test/cgi/test_cgi_multipart.rb: add test for multipart.
- Patch by Takeyuki Fujioka. [ruby-dev:36014]
- From CGIAlt http://cgialt.rubyforge.org/
-
-Thu Aug 28 09:22:01 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * test/cgi/test_cgi_modruby.rb: add test for mod_ruby adaptor.
- Patch by Takeyuki Fujioka. [ruby-dev:36013]
- From CGIAlt http://cgialt.rubyforge.org/
-
-Thu Aug 28 09:17:10 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * test/cgi/test_cgi_header.rb: add test for CGI::Header.
- Patch by Takeyuki Fujioka. [ruby-dev:36010] [ruby-dev:36011]
- From CGIAlt http://cgialt.rubyforge.org/
-
-Thu Aug 28 02:16:49 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/io.h (rb_io_t): refcnt field removed.
- (MakeOpenFile): refcnt initialization removed.
-
- * io.c (rb_io_fptr_finalize): don't check refcnt.
- (rb_io_close_read): don't use refcnt.
-
-Thu Aug 28 00:07:59 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (rb_io_initialize): don't accept IO object. [ruby-dev:35895]
-
-Wed Aug 27 23:28:51 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (ole_invoke): WIN32OLE#[] and WIN32OLE#[]=
- accepts number argument.
-
- * test/win32ole/test_win32ole.rb: ditto.
-
-Wed Aug 27 14:45:34 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * test/cgi/test_cgi_core.rb: add core test.
- Patch by Takeyuki Fujioka. [ruby-dev:36001] [ruby-dev:36002]
- From CGIAlt http://cgialt.rubyforge.org/
-
-Wed Aug 27 10:34:42 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/cgi.rb (CGI::Cookie): remove delegate.
- Patch by Takeyuki Fujioka. [ruby-dev:35995]
-
- * test/cgi/test_cgi_cookie.rb: added for above.
- Patch by Takeyuki Fujioka. [ruby-dev:35996]
- From CGIAlt http://cgialt.rubyforge.org/
-
-Wed Aug 27 01:13:54 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (transcode_loop): simplified.
-
-Wed Aug 27 01:03:23 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/encoding.h (rb_econv_result_t): enumeration constant:
- econv_incomplete_input.
-
- * io.c (finish_writeconv): check econv_incomplete_input.
-
- * transcode.c (transcode_restartable0): return econv_incomplete_input
- for unexpected end of source buffer.
- (trans_sweep): check econv_incomplete_input.
- (rb_trans_conv): ditto.
- (rb_econv_convert0): ditto.
- (rb_econv_convert): ditto.
- (transcode_loop): ditto.
- (make_econv_exception): change message for econv_incomplete_input.
- (econv_result_to_symbol): return :incomplete_input for
- econv_incomplete_input.
- (ecerr_incomplete_input): new method.
-
-Wed Aug 27 00:05:55 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/io.h (rb_io_t): rename crbuf to cbuf.
-
- * io.c: follow the renaming.
-
-Tue Aug 26 23:52:24 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/encoding.h (rb_econv_elem_t): move to transcode.c
- (rb_econv_t): defined as an incomplete type.
-
- * transcode.c (rb_econv_elem_t): moved from encoding.h.
- (rb_econv_t): complete type defined.
-
-Tue Aug 26 22:44:12 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * time.c (time_asctime): workaround for MSVCRT's bug.
- based on a patch from wanabe <s.wanabe AT gmail.com> at
- [ruby-dev:35831] and a suggestion by KIMURA Koichi
- <kbk AT kt.rim.or.jp> at [ruby-dev:35832]
- fixed [ruby-dev:35555]
-
-Tue Aug 26 21:53:56 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (rb_econv_open): disable newline conversion for ASCII
- incompatible encodings.
- (str_transcode0): don't need disable newline conversion here.
-
-Tue Aug 26 21:44:39 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (rb_econv_binmode): binmode is effective only once.
-
-Tue Aug 26 19:43:59 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * file.c (rb_file_s_expand_path): new class method for class File.
-
- * file.c (file_expand_path): add absolute_path handling (no ~user
- expansion). [ruby-core:18319]
-
-Tue Aug 26 19:27:54 2008 Akinori MUSHA <knu@iDaemons.org>
-
- * test/ruby/test_enum.rb (TestEnumerable#test_each_with_object):
- Add a test for Enumerable#each_with_object.
-
-Tue Aug 26 19:25:44 2008 Akinori MUSHA <knu@iDaemons.org>
-
- * test/ruby/test_enumerator.rb (TestEnumerator#test_with_object):
- Add (back) the test for Enumerator#with_object.
-
-Tue Aug 26 16:16:43 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * test/cgi/test_cgi_tag_helper.rb: add more tests for html3.
- Patch by Takeyuki Fujioka. [ruby-dev:35975]
- From CGIAlt http://cgialt.rubyforge.org/
-
-Tue Aug 26 14:43:10 2008 Akinori MUSHA <knu@iDaemons.org>
-
- * enumerator.c: Activate Enumerator#with_object and add
- Enumerable#each_with_object. [experimental]
-
-Tue Aug 26 14:38:32 2008 Akinori MUSHA <knu@iDaemons.org>
-
- * enumerator.c (enumerator_initialize),
- test/ruby/test_enumerator.rb: Add an ability to generate an
- enumerator from a block. [experimental] [ruby-dev:35903]
-
-Tue Aug 26 13:25:25 2008 Martin Duerst <duerst@it.aoyama.ac.jp>
-
- * test/ruby/test_transcode.rb: added test_euc_jp
- (contributed by Yoshihiro Kambayashi)
-
-Tue Aug 26 11:54:15 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * test/cgi/test_cgi_tag_helper.rb: added by Takeyuki Fujioka.
- [ruby-dev:35971]
-
-Tue Aug 26 11:33:30 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/cgi.rb (nOE_element_def): fix error when cascade methods which
- don't have arguments. Patch by Takeyuki Fujioka. [ruby-dev:35964]
-
- * lib/cgi.rb (blockquote): String#collect (this depends on
- String#each) is no longer exists.
- Patch by Takeyuki Fujioka. [ruby-dev:35946]
-
- * lib/cgi.rb (blockquote): ditto.
-
-Tue Aug 26 03:06:48 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (make_writeconv): copy invalid/undef flags.
-
-Tue Aug 26 02:47:08 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * common.mk (dist): tool/make-snapshot is executable.
-
- * tool/make-snapshot (package): supported release numbers 1.9.0-x.
-
-Tue Aug 26 02:43:50 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/io.h (rb_io_t): new field: writeconv_pre_opts.
-
- * io.c (make_writeconv): initialize writeconv_pre_opts.
- (io_fwrite): use writeconv_pre_opts.
-
-Tue Aug 26 01:48:31 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c: test _WIN32 for CRLF platform. (cygwin defines O_BINARY.)
-
-Tue Aug 26 01:29:26 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c: force CRLF handling if RUBY_TEST_CRLF_ENVIRONMENT is defined.
- This is only for testing.
-
-Tue Aug 26 01:26:31 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (str_transcode0): disable newline conversion for ASCII
- incompatible encoding.
-
-Tue Aug 26 00:55:46 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (str_transcode0): don't short cut for newline conversion.
-
-Tue Aug 26 00:36:01 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (io_fwrite): add TEXTMODE_NEWLINE_ENCODER to option for
- rb_str_transcode.
-
-Tue Aug 26 00:24:23 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (make_econv_exception): show readagain part for invalid
- byte sequence exception. store the part as an instance variable.
- (ecerr_readagain_bytes): new method to access the readagain part.
-
-Tue Aug 26 00:02:49 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * ext/bigdecimal/bigdecimal.c (VpMult): fix double free.
-
-Mon Aug 25 23:59:36 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (rb_econv_open): make last_tc NULL if there are only
- additional transcoders.
- (econv_description): extracted from rb_econv_open_exc.
- (rb_econv_open_exc): use econv_description.
- (econv_inspect): use econv_description.
-
-Mon Aug 25 23:56:42 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32.c (init_stdhandle): set binmode.
-
-Mon Aug 25 23:38:17 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date/format.rb(strftime): %[LN] can print with given
- arbitrary precision.
-
- * lib/date/format.rb(strftime): optional flags and filed width
- should also affect %[nt].
-
-Mon Aug 25 23:01:17 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * compile.c (defined_expr): default defined? should return
- "expression" without evaluating the expression. [ruby-dev:35967]
-
-Mon Aug 25 22:46:01 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_thread.rb (test_status_and_stop_p): reduce the risk
- of race condition.
-
-Mon Aug 25 22:39:57 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * lib/irb/extend-command.rb (def_extend_command): check number of
- arguments. [ruby-dev:35074]
-
- * lib/irb/ext/multi-irb.rb (search): check if a corresponding job is
- found. [ruby-dev:35074]
-
-Mon Aug 25 22:29:13 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_io.rb (test_dup): fix typo. see [ruby-dev:35958]
-
-Mon Aug 25 22:02:35 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (rb_econv_open_by_transcoder_entries): initialize
- last_error. num_trans may be zero.
- (rb_econv_convert0): num_trans may be zero.
- (rb_econv_putbackable): ditto.
- (rb_econv_putback): ditto.
- (rb_econv_convert): input_ptr and output_ptr may be NULL.
-
-Mon Aug 25 19:05:27 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * compile.c (defined_expr): should handle NODE_{AND,OR} as
- "expression". [ruby-dev:35951]
-
-Mon Aug 25 17:36:26 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/intern.h (rb_io_ungetbyte): added prototype.
-
- * io.c (rb_io_gets): use rb_io_getline_1 for unget buffer.
-
- * ruby.c (load_file): use rb_io_ungetbyte.
-
- * transcode.c (rb_econv_substr_append): fix for buffer overrun.
-
- * win32/enc-setup.mak (BUILTIN_TRANSOBJS): added.
-
-Mon Aug 25 14:22:21 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * parse.y (YYSTYPE): struct RVarmap has been no longer
- defined.
- see also r11717 by matz.
-
-Mon Aug 25 10:42:18 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * transcode.c (rb_econv_open_exc): constified.
-
-Mon Aug 25 07:10:21 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/emacs_mule.c: fix ctype.
-
-Mon Aug 25 00:52:31 2008 Tanaka Akira <akr@fsij.org>
-
- * configure.in (BUILTIN_TRANSSRCS): defined.
- (BUILTIN_TRANSOBJS): defined.
-
- * enc/Makefile.in (BUILTIN_TRANSES): defined.
-
- * enc/make_encmake.rb (BUILTIN_TRANSES): defined.
-
- * enc/depend: don't generate rules for builtin transcoders.
-
- * common.mk (COMMONOBJS): add BUILTIN_TRANSOBJS.
- (enc.mk): pass BUILTIN_TRANSOBJS.
- (newline.c): new rule.
- (newline.$(OBJEXT)): new rule.
- (srcs): newline.c added.
-
- * Makefile.in (BUILTIN_TRANSSRCS): defined.
- (BUILTIN_TRANSOBJS): defined.
-
- * transcode.c (Init_transcode): call Init_newline.
-
-Mon Aug 25 00:11:02 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (declare_transcoder): arguments order changed.
- (rb_declare_transcoder): call declare_transcoder just once.
-
-Sun Aug 24 19:48:46 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/encoding.h (rb_econv_t): use rb_econv_option_t.
-
- * transcode.c: follow the rb_econv_t change.
-
-Sun Aug 24 19:40:13 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (rb_io_init_copy): copy encs.
-
-Sun Aug 24 19:17:31 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (rb_io_open): add an argument: vperm.
- (open_key_args): call rb_io_open with perm.
-
-Sun Aug 24 19:11:07 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (sym_invalid): removed.
- (sym_undef): removed.
- (sym_ignore): removed.
- (sym_replace): removed.
-
-Sun Aug 24 19:07:17 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (rb_io_reopen): initialize fptr->encs.opts.
-
-Sun Aug 24 18:37:42 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (rb_io_s_pipe): accept optional hash.
- (rb_io_set_encoding): ditto.
- (rb_io_extract_modeenc): use rb_econv_opts to initialize
- ecopts.
- (rb_file_open_generic): ditto.
- (rb_file_open_internal): ditto.
- (io_encoding_set): new argument: opt.
- (argf_set_encoding): copy fptr->encs.opts to argf_ecopts.
-
- * transcode.c (rb_econv_opts): accept Qnil for initialization.
-
-Sun Aug 24 18:10:08 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/io.h (rb_io_enc_t): add opts field.
- (FMODE_INVALID_MASK): removed.
- (FMODE_INVALID_IGNORE): ditto.
- (FMODE_INVALID_REPLACE): ditto.
- (FMODE_UNDEF_MASK): ditto.
- (FMODE_UNDEF_IGNORE): ditto.
- (FMODE_UNDEF_REPLACE): ditto.
- (MakeOpenFile): initialize the opts field.
-
- * io.c (make_writeconv): use the opts field.
- (io_fwrite): ditto.
- (make_readconv): ditto.
- (argf_ecopts): new macro.
- (rb_io_extract_modeenc): fill the opts field.
- (argf_next_argv): ditto.
- (rb_file_open_generic): initialize the opts field.
- (rb_file_open_internal): ditto.
- (io_encoding_set): ditto.
- (argf_set_encoding): ditto.
-
-Sun Aug 24 18:02:14 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (struct argf): use struct rb_io_enc_t.
- (argf_enc): follow the struct argf change.
- (argf_enc2): ditto.
-
-Sun Aug 24 17:36:21 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/encoding.h (rb_str_transcode): make 3rd argument
- rb_econv_option_t*.
-
- * transcode.c (transcode_loop): take rb_econv_option_t* as a argument.
- (str_transcode0): ditto.
- (str_transcode): make rb_econv_option_t and call str_transcode0 with
- it.
- (rb_str_transcode): take rb_econv_option_t*.
-
- * io.c (io_fwrite): follow the rb_str_transcode change.
-
-Sun Aug 24 16:47:32 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/io.h (rb_io_t): make enc and enc2 as struct
- rb_io_enc_t;
-
- * io.c: follow the structure change.
- (convconfig_t): defined by rb_io_enc_t.
-
-Sun Aug 24 16:19:25 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/encoding.h (rb_econv_opts): declared.
-
- * transcode.c (rb_econv_opts): defined.
-
- * io.c (rb_io_extract_modeenc): use rb_econv_opts.
-
-Sun Aug 24 16:06:30 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/encoding.h (rb_econv_option_t): defined.
- (rb_econv_open): 3rd arg changed.
- (rb_econv_open_exc): ditto.
-
- * io.c (make_writeconv): use rb_econv_option_t.
- (make_readconv): ditto.
- (rb_econv_open): take rb_econv_option_t for options.
- (rb_econv_open_exc): ditto.
- (transcode_loop): use rb_econv_option_t.
- (econv_init): use rb_econv_option_t.
-
-Sun Aug 24 15:43:41 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (rb_econv_substr_append): associate dst with destination
- encoding when dst is created.
-
-Sun Aug 24 15:21:28 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/encoding.h (rb_str_transcode): add ecflags argument.
-
- * transcode.c (econv_opts): extracted from str_transcode.
- (str_transcode_enc_args): extracted from str_transcode.
- (str_transcode0): extracted from str_transcode.
- (str_transcode): use econv_opts, str_transcode_enc_args,
- str_transcode0.
- (rb_str_transcode): call str_transcode0.
- (econv_primitive_insert_output): give the additional argument for
- rb_str_transcode.
-
- * io.c (make_writeconv): use invalid/undef flags.
- (io_fwrite): ditto.
- (rb_scan_open_args): give the additional argument for
- rb_str_transcode.
-
-Sun Aug 24 13:27:42 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (str_transcode): check last hash only if 0 < argc.
-
-Sun Aug 24 12:22:15 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/encoding.h (rb_econv_substr_append): renamed from
- rb_econv_string.
- (rb_econv_str_convert): declared.
- (rb_econv_substr_convert): declared.
- (rb_econv_str_append): declared.
-
- * io.c (io_fwrite): use rb_econv_str_convert instead of
- rb_econv_string.
-
- * transcode.c (rb_econv_substr_append): renamed from rb_econv_string.
- (rb_econv_str_append): new function.
- (rb_econv_substr_convert): ditto.
- (rb_econv_str_convert): ditto.
-
-Sun Aug 24 12:15:12 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/net/http.rb (Net::HTTP#urlencode): str[0] returns char in 1.9.
- Patch by Junegunn Choi [ruby-core:18368]
-
-Sun Aug 24 12:02:39 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (rb_econv_open): return NULL on error.
-
-Sun Aug 24 11:40:38 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/encoding.h (rb_econv_open_exc): declared.
-
- * transcode.c (rb_eNoConverter): new exception.
- (rb_econv_open_exc): new function.
- (transcode_loop): use rb_econv_open_exc.
-
- * io.c (make_writeconv): use rb_econv_open_exc.
- (make_readconv): ditto.
-
-Sun Aug 24 11:26:54 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/cgi.rb (CGI::unescapeHTML): consider ISO-8859-1.
- [ruby-dev:35936]
-
-Sun Aug 24 10:55:00 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/emacs_mule.c: support Emacs/Mule internal encoding.
-
-Sun Aug 24 08:03:31 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * strftime.c (daylight, timezone): not provided as dllexport on cygwin,
- right now.
-
-Sun Aug 24 06:39:05 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/cgi.rb (CGI::unescapeHTML): more encoding sensible unescaping.
- [ruby-dev:35936]
-
-Sun Aug 24 04:23:19 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * encoding.c (enc_compatible_p): raise TypeError when argument is Encoding.
-
-Sat Aug 23 23:25:47 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/cgi.rb (CGI#out): remove auto encoding conversion and set
- LANGUAGE. [ruby-dev:35922]
-
-Sat Aug 23 20:01:29 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * test/ruby/test_process.rb (TestProcess#test_rlimit_value):
- add Errno::EINVAL. [ruby-dev:35900]
-
-Sat Aug 23 18:29:29 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (rb_scan_open_args): use pop_last_hash.
-
-Sat Aug 23 16:59:42 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/io.h (FMODE_INVALID_MASK): defined.
- (FMODE_INVALID_IGNORE): defined.
- (FMODE_INVALID_REPLACE): defined.
- (FMODE_UNDEF_MASK): defined.
- (FMODE_UNDEF_IGNORE): defined.
- (FMODE_UNDEF_REPLACE): defined.
-
- * io.c (sym_invalid): defined.
- (sym_undef): defined.
- (sym_ignore): defined.
- (sym_replace): defined.
- (make_readconv): specify ECONV_INVALID_* and ECONV_UNDEF_* if
- FMODE_INVALID_* and FMODE_UNDEF_* is set.
- (rb_io_extract_modeenc): check {:invalid, :undef} => {:replace,
- :ignore} for FMODE_INVALID_* and FMODE_UNDEF_*.
-
-Sat Aug 23 17:06:57 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * strftime.c (rb_strftime): support more flags.
-
-Sat Aug 23 15:14:10 2008 Koichi Sasada <ko1@atdot.net>
-
- * vm_opts.h: enable "OPT_TRACE_INSTRUCTION" on default.
-
-Sat Aug 23 14:59:32 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/encoding.h (ECONV_INVALID_MASK): defined.
- (ECONV_INVALID_IGNORE): defined.
- (ECONV_INVALID_REPLACE): defined.
- (ECONV_UNDEF_MASK): defined.
- (ECONV_UNDEF_IGNORE): defined.
- (ECONV_UNDEF_REPLACE): defined.
-
- * transcode.c (INVALID_IGNORE): removed.
- (INVALID_REPLACE): removed.
- (UNDEF_IGNORE): removed.
- (UNDEF_REPLACE): removed.
- (rb_econv_convert0): renamed from rb_econv_convert.
- (rb_econv_convert): defined to call rb_econv_convert0 with
- replace/ignore behavior moved from transcode_loop.
- (transcode_loop): replace/ignore behavior removed.
-
-Sat Aug 23 11:23:05 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (rb_io_extract_modeenc): check :textmode and :binmode in option
- hash.
-
-Sat Aug 23 10:48:56 2008 Tanaka Akira <akr@fsij.org>
-
- * ext/pty/pty.c (pty_getpty): follow rb_io_t's path -> pathv change.
-
-Sat Aug 23 10:42:52 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (check_pipe_command): extracted from rb_f_open and rb_io_open.
- (rb_f_open): use check_pipe_command.
- (rb_io_open): ditto.
-
-Sat Aug 23 10:13:00 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (read_all): fptr->enc2 is 0 if no conversion.
- (rb_io_getline_fast): ditto.
- (io_getc): ditto.
-
-Sat Aug 23 09:45:35 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/io.h (rb_io_t): remove path field and add pathv field.
- (MakeOpenFile): initialize pathv as Qnil.
-
- * gc.c: mark pathv field in T_FILE.
-
- * io.c: follow the rb_io_t field change.
-
- * file.c: ditto.
-
- * ext/socket/socket.c: ditto.
-
-Sat Aug 23 01:42:22 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/io.h (FMODE_TEXTMODE): defined.
-
- * include/ruby/encoding.h (rb_econv_t): new field: flags.
- (rb_econv_binmode): declared.
-
- * io.c (io_unread): text mode hack removed.
- (NEED_NEWLINE_DECODER): defined.
- (NEED_NEWLINE_ENCODER): defined.
- (NEED_READCONV): defined.
- (NEED_WRITECONV): defined.
- (TEXTMODE_NEWLINE_ENCODER): defined for windows.
- (make_writeconv): setup converter with TEXTMODE_NEWLINE_ENCODER for
- text mode.
- (io_fwrite): use NEED_WRITECONV. character code conversion is
- disabled if fptr->writeconv_stateless is nil.
- (make_readconv): setup converter with
- ECONV_UNIVERSAL_NEWLINE_DECODER for text mode.
- (read_all): use NEED_READCONV.
- (appendline): use NEED_READCONV.
- (rb_io_getline_1): use NEED_READCONV.
- (io_getc): use NEED_READCONV.
- (rb_io_ungetc): use NEED_READCONV.
- (rb_io_binmode): OS-level text mode test removed. call
- rb_econv_binmode.
- (rb_io_binmode_m): call rb_io_binmode_m with write_io as well.
- (rb_io_flags_mode): return mode string including "t".
- (rb_io_mode_flags): detect "t" for text mode.
- (rb_sysopen): always specify O_BINARY.
-
- * transcode.c (rb_econv_open_by_transcoder_entries): initialize flags.
- (rb_econv_open): if source and destination encoding is
- both empty string, open newline converter. last_tc will be NULL in
- this case.
- (rb_econv_encoding_to_insert_output): last_tc may be NULL now.
- (rb_econv_string): ditto.
- (output_replacement_character): ditto.
- (transcode_loop): ditto.
- (econv_init): ditto.
- (econv_inspect): ditto.
- (rb_econv_binmode): new function.
-
-Fri Aug 22 21:18:40 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c (nucomp_div): now behaves as quo.
-
- * complex.c (nucomp_s_generic_p): has been removed.
-
- * complex.c (nucomp_to_s): adopts new form.
-
- * complex.c (nucomp_inspect): ditto.
-
- * complex.c (string_to_c_internal): ditto and supports polar form.
-
- * complex.c (rb_complex_polar): new.
-
- * rational.c (nurat_to_s): do not canonicalize.
-
- * rational.c (nurat_inspect): adopts new form.
-
- * rational.c (string_to_r_internal): ditto.
-
- * include/ruby/intern.h: added a declaration.
-
- * lib/complex.rb: added an obsolete class method.
-
- * lib/cmath.rb: use scalar? instead of generic?.
-
-Fri Aug 22 20:06:46 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * lib/webrick/server.rb (WEBrick::GenericServer#shutdown):
- rescue Errno::ENOTCONN and close. [ruby-dev:35896]
-
- * test/openssl/test_ssl.rb (OpenSSL#start_server): ditto.
- [ruby-dev:35897]
-
- * lib/net/imap.rb (Net::IMAP#disconnect): ditto. [ruby-dev:35898]
-
-Fri Aug 22 19:58:27 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date.rb: no need to require the "lib/rational.rb" any more.
-
-Fri Aug 22 15:47:38 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * lib/cgi.rb: use bytesize instead of size/length.
-
-Fri Aug 22 14:28:05 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * strftime.c (rb_strftime): supported flags and precision for most
- conversions. [ruby-dev:35906]
-
-Fri Aug 22 14:04:04 2008 Martin Duerst <duerst@it.aoyama.ac.jp>
-
- * test/ruby/test_transcode.rb: test_shift_jis:
- fixed comment strings (see r18291)
-
-Fri Aug 22 12:41:47 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (rb_io_pid): use PIDT2NUM.
-
-Fri Aug 22 11:36:31 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * dir.c (dir_enc_str_new): set US-ASCII to the path
- when the path is 7bit string and encoding is ASCII compatible.
-
- * dir.c (push_glob): set file system encoding when argument encoding
- is US-ASCII.
-
-Fri Aug 22 11:30:38 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * dir.c (dir_enc_str_new): renamed from dir_enc_str.
-
- * dir.c (dir_read): use dir_enc_str_new.
-
- * dir.c (dir_each): ditto.
-
- * dir.c (push_pattern): ditto.
-
-Fri Aug 22 11:29:10 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * common.mk: remove config.h dependency.
-
-Fri Aug 22 10:52:39 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (gmtime_r): check if reentrant versions are available.
-
- * time.c (IF_HAVE_GMTIME_R, ASCTIME, GMTIME, LOCALTIME): use reentrant
- versions if available.
-
-Fri Aug 22 05:29:17 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/ruby.h (INT2NUM): just use a simple macro on LP64.
- (UINT2NUM): ditto.
-
-Fri Aug 22 05:10:07 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (rb_file_open_generic): take filename as a VALUE.
- (rb_file_open_internal): ditto.
- (rb_io_open): ditto.
- (rb_file_open): pass filename as a VALUE to rb_file_open_internal.
- (rb_open_file): pass filename as a VALUE to rb_file_open_generic.
- (open_key_args): pass filename as a VALUE to rb_io_open.
-
-Fri Aug 22 04:33:56 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/ruby.h: fix previous change for LP64.
-
-Fri Aug 22 03:19:41 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/ruby.h (NUM2LONG): make it inline function to evaluate
- the argument only once.
- `t = Object.new; def t.*(x) p x; 0 end; p Time.at(0, t)' did print x
- twice.
- (NUM2INT): ditto.
- (NUM2LL): ditto.
- (INT2NUM): make it inline function.
- (LONG2NUM): ditto.
- (UINT2NUM): ditto.
- (ULONG2NUM): ditto.
-
-Fri Aug 22 03:03:22 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (rb_io_s_sysopen): mode can be a Bignum.
-
-Fri Aug 22 02:57:03 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (rb_io_extract_modeenc): notify coerced to caller.
- (rb_io_initialize): mode may be a Bignum.
-
-Fri Aug 22 02:42:35 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (rb_io_extract_modeenc): use rb_check_to_integer to test
- integer.
-
-Fri Aug 22 02:25:04 2008 Tanaka Akira <akr@fsij.org>
-
- * iseq.c (iseq_inspect): don't raise on uninitialized object.
- show real class name.
-
-Fri Aug 22 02:08:58 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (rb_io_initialize): accept hash argument.
-
-Thu Aug 21 23:51:51 2008 Shugo Maeda <shugo@ruby-lang.org>
-
- * strftime.c (rb_strftime): supported %F and %<precision>N.
- reverted config.h to ruby.h for Windows.
-
- * test/ruby/test_time.rb (TestTime::test_strftime): added tests
- for %F and %N.
-
- * time.c: documented %F and %N.
-
-Thu Aug 21 20:23:26 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * test/ruby/test_m17n_comb.rb (TestM17NComb#test_str_crypt): add
- key and salt to error message.
-
-Thu Aug 21 19:20:25 2008 Tanaka Akira <akr@fsij.org>
-
- * file.c (rb_stat_inspect): don't raise if self is not initialized.
-
-Thu Aug 21 19:17:02 2008 Tanaka Akira <akr@fsij.org>
-
- * process.c (pst_pid): use rb_attr_get to avoid warning on
- Process::Status.allocate.pid.
- (pst_inspect): don't raise if self is not initialized.
-
-Thu Aug 21 19:05:40 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (io_extract_encoding_option): if internal encoding is not
- specified, enc is external encoding.
-
-Thu Aug 21 14:22:50 2008 Shugo Maeda <shugo@ruby-lang.org>
-
- * strftime.c: include ruby/config.h instead of ruby/ruby.h.
-
- * common.mk: removed the old rule for missing/strftime.c.
-
-Thu Aug 21 09:29:01 2008 Shugo Maeda <shugo@ruby-lang.org>
-
- * strftime.c (rb_strftime): return "UTC" instead of "GMT".
-
- * test/ruby/test_time.rb (test_strftime): ditto.
-
-Thu Aug 21 07:59:04 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * test/iconv/test_option.rb (test_ignore_option): skip if iconv
- doesn't have transliterate.
-
- * test/iconv/test_option.rb (test_translit_option): ditto.
-
-Thu Aug 21 06:12:56 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/scanf.rb (Scanf::FormatSpecifier#initialize): %i should accept
- single digit decimal. [ruby-core:18355]
-
-Thu Aug 21 06:02:52 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * range.c (range_initialize_copy): Range is now a Struct.
- [ruby-core:18353]
-
- * struct.c (rb_struct_init_copy): made public.
-
-Thu Aug 21 03:09:34 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (io_extract_encoding_option): enc2 is external encoding if
- external encoding and internal encoding is given.
- (pipe_open): add flags and convconfig argument to initialize
- fptr->{mode,enc,enc2}.
- (pipe_open_v): pass flags and convconfig from caller to pipe_open.
- (pipe_open_s): ditto.
- (pop_last_hash): new function.
- (rb_io_s_popen): use last hash as option to specify code conversion.
- (rb_io_open): specify flags and convconfig arguments for
- pipe_open_s.
- (rb_f_backquote): ditto.
-
-Thu Aug 21 02:27:03 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (prep_io): local variable renamed.
- (rb_io_fdopen): ditto.
- (prep_stdio): ditto.
-
-Thu Aug 21 01:58:59 2008 Shugo Maeda <shugo@ruby-lang.org>
-
- * configure.in: always check timezone().
-
- * strftime.c (rb_strftime): prefer timezone/altzone rather than
- gettimeofday(). The second argument to gettimeofday() is ignored
- on Solaris.
-
-Thu Aug 21 02:03:08 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (open_key_args): simplified.
-
-Thu Aug 21 01:57:03 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (open_key_args): IO.foreach(path, rs, limit) didn't work.
-
-Thu Aug 21 01:31:34 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (rb_file_sysopen_internal): unused function removed.
- (rb_file_sysopen): ditto.
-
-Thu Aug 21 01:09:26 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c: use mode_t for the 3rd argument, permission, of open(2).
-
-Thu Aug 21 00:51:42 2008 Shugo Maeda <shugo@ruby-lang.org>
-
- * configure.in: removed strftime from AC_REPLACE_FUNCS().
-
- * include/ruby/missing.h: removed prototype for strftime().
-
- * missing/strftime.c: removed.
-
- * time.c (time_to_s): use rb_strftime() instead of strftime(3).
- (time_zone): ditto.
-
-Thu Aug 21 00:49:50 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * strftime.c: win32 support.
-
-Thu Aug 21 00:20:05 2008 Shugo Maeda <shugo@ruby-lang.org>
-
- * strftime.c: new file.
-
- * common.mk (COMMONOBJS): added strftime.$(OBJEXT).
-
- * time.c (time_strftime): do not use strftime(3). supported
- %L(millisecond) and %N(nanosecond).
-
- * test/ruby/test_time.rb: added tests for %L and %N.
-
-Wed Aug 20 23:53:42 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (io_set_encoding): removed.
- (rb_io_open): set up encoding using new argument opt.
- (open_key_args): call rb_io_open with opt. don't call
- io_set_encoding.
-
-Wed Aug 20 22:30:33 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (rb_file_open_internal): use rb_io_flags_modenum.
- (rb_io_reopen): use rb_io_flags_modenum and rb_io_modenum_mode.
- (rb_io_stdio_file): ditto.
-
-Wed Aug 20 22:28:15 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * proc.c (proc_new): use the given class.
-
- * vm.c (vm_make_proc): added an argument for the class.
-
-Wed Aug 20 22:24:48 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * enum.c (enum_take): get rid of extraneous iteration.
-
-Wed Aug 20 20:32:49 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (rb_io_open_with_args): use rb_open_file instead of rb_io_open.
-
-Wed Aug 20 20:16:17 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (rb_scan_open_args): extracted from rb_open_file.
-
-Wed Aug 20 19:22:32 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (convconfig_t): new type.
- (rb_io_extract_modeenc): new function.
- (rb_file_open_generic): new function.
- (rb_file_open_internal): use rb_file_open_generic.
- (rb_file_sysopen_internal): use rb_file_open_generic.
- (rb_open_file): use rb_io_extract_modeenc and rb_file_open_generic.
- (rb_io_open): call rb_file_open_internal instead of rb_file_open.
-
-Wed Aug 20 19:15:35 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (Init_IO): new constants: File::DSYNC, File::RSYNC and
- File::NOFOLLOW.
-
-Wed Aug 20 18:41:11 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (rb_open_file): don't lookup :mode and :perm in opt. it is
- useless because vmode and perm is overwritten by rb_scan_args
- anyway.
-
-Wed Aug 20 18:37:20 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (open_key_args): meaningless MEMCPY removed.
-
-Wed Aug 20 18:30:58 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (prep_io) [cygwin]: use FMODE_BINMODE instead of O_BINARY.
-
-Wed Aug 20 16:39:59 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * array.c (rb_ary_sample): performance improvement for huge array.
-
-Wed Aug 20 12:28:31 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * array.c (rb_ary_sample): get rid of infinite loop. #455
-
-Wed Aug 20 06:09:31 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/io.h (FMODE_TRUNC): value changed because 0x100 is used
- as FMODE_NOREVLOOKUP in socket.c
-
-Wed Aug 20 05:19:40 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (parse_mode_enc): extracted from mode_enc.
- (io_extract_encoding_option): extracted from io_set_encoding.
-
-Wed Aug 20 04:17:26 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (rb_io_flags_modenum): make it static.
-
-Wed Aug 20 03:36:45 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/io.h (FMODE_TRUNC): new constant.
-
- * io.c (rb_io_mode_flags): set FMODE_TRUNC for "w".
- (rb_io_modenum_flags): set FMODE_TRUNC for O_TRUNC.
- (rb_io_flags_modenum): new function.
- (rb_io_mode_modenum): just use rb_io_mode_flags and
- rb_io_flags_modenum.
-
-Wed Aug 20 02:36:21 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (fopen): macro for vms removed. fopen is not used now.
-
-Wed Aug 20 02:27:42 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (rb_econv_open): fix memory leak.
- (rb_econv_close): ditto.
- fixed by shinichiro.h. [ruby-dev:35880]
-
-Tue Aug 19 21:50:43 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/io.h (rb_fopen): declaration removed.
-
- * io.c (rb_fopen): unused function removed.
-
-Tue Aug 19 21:14:22 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/io.h (FMODE_READWRITE): define as
- FMODE_READABLE|FMODE_WRITABLE.
-
-Tue Aug 19 21:13:08 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (rb_io_flags_mode): use hexadecimal in error message.
- (rb_io_modenum_mode): ditto.
- (rb_io_initialize): ditto.
-
-Tue Aug 19 18:23:40 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (rb_io_flags_mode): add a prefix 0 to octal in error message.
- (rb_io_modenum_mode): ditto.
-
-Tue Aug 19 18:05:45 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/io.h (FMODE_*): sorted and describe the values in
- hexadecimal.
-
-Tue Aug 19 17:32:30 2008 Tanaka Akira <akr@fsij.org>
-
- * ext/openssl/ossl_x509name.c (ossl_x509name_initialize): store the
- result of d2i_X509_NAME into DATA_PTR(self).
-
-Tue Aug 19 04:54:39 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/rake.rb (FileUtils#ruby): takes care of space containing path.
- [ ruby-Bugs-21591 ]
-
-Tue Aug 19 01:32:37 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (rb_open_file): encoding in mode string was ignored if perm is
- specified.
-
-Tue Aug 19 01:02:19 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (rb_open_file): don't access argv[-1] by
- File.allocate.instance_eval { initialize }.
-
-Tue Aug 19 00:56:01 2008 Tanaka Akira <akr@fsij.org>
-
- * re.c (rb_reg_inspect): don't raise for uninitialized Regexp.
-
-Tue Aug 19 00:34:24 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (rb_io_check_readable): side effect for STDIN removed.
- (rb_io_external_encoding): ditto.
-
-Mon Aug 18 23:27:07 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (io_ungetbyte): renamed from io_ungetc.
- (rb_io_ungetbyte): new method.
- (rb_io_ungetc): push back into character buffer if enc2 is set.
-
-Mon Aug 18 22:41:46 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (id_encode): removed.
-
-Mon Aug 18 22:30:07 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (make_writeconv): if enc and enc2 is set, convert
- string.encoding to enc2.
-
- * include/ruby/io.h: comment changed.
-
-Mon Aug 18 21:02:08 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/io.h (rb_io_t): new fields: writeconv,
- writeconv_stateless and writeconv_initialized.
- (MakeOpenFile): initialize them.
-
- * include/ruby/encoding.h (rb_econv_stateless_encoding): declared.
- (rb_econv_string): declared.
-
- * io.c (make_writeconv): new function.
- (io_fwrite): use econv.
- (make_readconv): fix error message.
- (finish_writeconv): new function.
- (fptr_finalize): call finish_writeconv.
- (clear_writeconv): new function.
- (clear_codeconv): new function to call both clear_readconv and
- clear_writeconv.
- (rb_io_fptr_finalize): call clear_codeconv instead of
- clear_readconv.
- (mode_enc): ditto.
- (io_set_encoding): ditto.
- (argf_next_argv): ditto.
- (io_encoding_set): ditto.
-
- * gc.c (gc_mark_children): mark writeconv_stateless in T_FILE.
-
- * transcode.c (stateless_encoding_i): new function.
- (rb_econv_stateless_encoding): ditto.
- (rb_econv_string): ditto.
-
-Mon Aug 18 17:23:38 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (clear_readconv): extracted from rb_io_fptr_finalize.
- (mode_enc): call clear_readconv.
- (io_set_encoding): ditto.
- (argf_next_argv): ditto.
- (io_encoding_set): ditto.
-
-Mon Aug 18 16:54:06 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (mode_enc): modify enc and enc2 consistently.
- (io_set_encoding): ditto.
- (io_encoding_set): ditto.
-
-Mon Aug 18 13:21:38 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (transcode_search_path): prevent infinite loop by
- searching a path for self conversion.
-
-Mon Aug 18 12:45:24 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (io_enc_str): code conversion removed.
- (io_enc_str_converted): removed because it is identical to
- io_enc_str now.
-
-Mon Aug 18 12:12:29 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (io_shift_crbuf): add strp argument to append into existing
- string.
- (read_all): use econv if enc2 is set.
- (io_getc): follow the io_shift_crbuf change.
-
-Mon Aug 18 10:35:25 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (io_enc_str_converted): new function.
- (make_readconv): extracted from io_getc.
- (more_char): ditto.
- (appendline): use econv via make_readconv and more_char for code
- conversion.
- (prepare_getline_args): don't convert record separator.
- (rb_io_getline_1): don't use rb_io_getline_fast if enc2 is set.
- (io_getc): use make_readconv and more_char.
-
-Mon Aug 18 08:27:44 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * common.mk: fix error in uncommon.mk.
-
-Mon Aug 18 06:10:08 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * common.mk: config.h depends config.status.
-
-Mon Aug 18 03:59:43 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (appendline): appendline cannot check character boundary.
- (rb_io_getline_1): relax limit until character boundary.
-
-Mon Aug 18 02:25:11 2008 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/webrick/cgi.rb (WEBrick::CGI::Socket#eof?): added lacked method.
-
-Sun Aug 17 21:50:22 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (prepare_getline_args): io.gets(10,nil) should cause TypeError.
-
-Sun Aug 17 15:58:39 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb: not check config.h.
-
- * lib/mkmf.rb (init_mkmf): add include/ruby/backward to $INCFLAGS.
-
- * include/ruby/backward/{st,util}.h: added for backward compatibility.
- [ruby-dev:35811]
-
-Sun Aug 17 13:40:04 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (econv_primitive_putback): new method.
-
-Sun Aug 17 13:23:53 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/encoding.h (rb_econv_putbackable): declared.
- (rb_econv_putback): ditto.
-
- * transcode.c (rb_econv_putbackable): implemented.
- (rb_econv_putback): ditto.
-
- * io.c (io_getc): put back bytes if possible.
-
-Sun Aug 17 12:00:18 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (make_econv_exception): add several instance variables
- to exception object.
- (ecerr_source_encoding): new method:
- Encoding::ConversionUndefined#source_encoding and
- Encoding::InvalidByteSequence#source_encoding.
- (ecerr_destination_encoding): new method:
- Encoding::ConversionUndefined#destination_encoding and
- Encoding::InvalidByteSequence#destination_encoding.
- (econverr_error_char): new method:
- Encoding::ConversionUndefined#error_char.
- (econverr_error_bytes): new method:
- Encoding::ConversionUndefined#error_bytes.
-
-Sun Aug 17 11:43:18 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * random.c (struct MT): packed Mersenne Twister staffs.
-
- * random.c (struct RandSeed): packed random seed staffs.
-
-Sun Aug 17 08:38:26 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * test/iconv/test_option.rb (test_ignore_option): skip if iconv
- doesn't have transliterate.
-
- * test/iconv/test_option.rb (test_translit_option): ditto.
-
-Sun Aug 17 01:29:46 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/io.h (rb_io_t): new fields: readconv, crbuf, crbuf_off,
- crbuf_len, crbuf_capa.
- (MakeOpenFile): initialize them.
-
- * io.c (io_shift_crbuf): new function.
- (io_getc): use econv.
- (rb_io_fptr_finalize): finalize readconv and crbuf.
-
-Sun Aug 17 00:02:07 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/encoding.h (rb_econv_check_error): declared.
-
- * transcode.c (make_econv_exception): new function.
- (transcode_loop): use make_econv_exception.
- (rb_econv_check_error): defined.
-
-Sat Aug 16 15:23:16 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/encoding.h (rb_econv_elem_t): fields removed: from and
- to.
- (rb_econv_t): new fields: source_encoding_name and
- destination_encoding_name.
-
- * transcode.c (rb_econv_open_by_transcoder_entries): initialize the
- new fields.
- (rb_econv_open): set up the new fields.
- (econv_inspect): use the new fields.
-
-Sat Aug 16 14:22:04 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/encoding.h (rb_econv_t): add fields: in_buf_start,
- in_data_start, in_data_end, in_buf_end and last_trans_index.
- (rb_econv_output): removed.
- (rb_econv_insert_output): declared.
- (rb_econv_encoding_to_insert_output): declared.
-
- * enc/trans/newline.trans (rb_universal_newline): stateful_type
- changed.
-
- * transcode.c (transcode_restartable0): initialize inchar_start,
- tc->recognized_len and next_table at beginning of the loop.
- (rb_econv_open_by_transcoder_entries): initialize new fields.
- (rb_econv_open): setup last_trans_index.
- (trans_sweep): last out_buf_start can be non-NULL now.
- (rb_econv_convert): check last out_buf_start and in_buf_start at
- first.
- (rb_econv_output_with_destination_encoding): removed.
- (econv_just_convert): removed.
- (rb_econv_output): removed.
- (econv_primitive_output): method removed.
- (rb_econv_encoding_to_insert_output): new function.
- (allocate_converted_string): new function.
- (rb_econv_insert_output): new function.
- (econv_primitive_insert_output): new method.
- (output_replacement_character): use rb_econv_insert_output. unused
- arguments removed.
-
-Sat Aug 16 09:20:18 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/ruby.h (rb_intern_const): tiny optimization.
-
- * include/ruby/ruby.h (SSIZET2NUM, NUM2SSIZET, SSIZE_MAX, SSIZE_MIN):
- macros for ssize_t.
-
-Sat Aug 16 08:11:04 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode_data.h (rb_transcoder_stateful_type_t): defined.
- (rb_transcoder): add field: stateful_type.
-
- * tool/transcode-tblgen.rb: generate stateful_type field as
- stateless_converter.
-
- * enc/trans/iso2022.trans: follow rb_transcoder change.
-
- * enc/trans/newline.trans: ditto.
-
- * enc/trans/utf_16_32.trans: ditto.
-
-Fri Aug 15 23:07:48 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (econv_just_convert): extracted from rb_econv_output.
- (rb_econv_output): use econv_just_convert.
- (econv_primitive_output): new method.
-
-Fri Aug 15 19:57:01 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/encoding.h (rb_econv_output): add str_encoding
- argument.
-
- * transcode.c (get_replacement_character): add repl_enc_ptr argument.
- (rb_econv_output_with_destination_encoding): renamed from
- rb_econv_output and make it static.
- (rb_econv_output): convert str and call
- rb_econv_output_with_destination_encoding.
- (output_replacement_character): follow above interface change.
-
-Fri Aug 15 19:33:57 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_str_drop_bytes): use memmove.
-
-Fri Aug 15 18:33:22 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/encoding.h (rb_econv_t): add error_tc in last_error.
-
- * transcode.c (rb_econv_convert): fill error_tc.
-
-Fri Aug 15 18:10:49 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/encoding.h (rb_econv_t): new field: last_error.
-
- * transcode.c (rb_trans_conv): new argument: result_position_ptr.
- (rb_econv_convert): fill last_error.
- (econv_result_to_symbol): extracted from econv_primitive_convert.
- (econv_primitive_errinfo): new method.
-
-Fri Aug 15 17:39:05 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (parse.{c,h}): creates in the dependency order.
-
-Fri Aug 15 16:59:30 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm_core.h (exec_event_hooks): skips RubyVM::FrozenCore.
-
- * vm.c (Init_VM): get rid of SEGV in a trace proc.
-
-Fri Aug 15 09:33:48 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (conv_init): check empty name.
-
-Fri Aug 15 09:03:54 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (econv_init): don't create dummy encoding if
- rb_econv_open is failed.
- (make_dummy_encoding): new function extracted from make_encoding.
- (make_encoding): removed.
-
-Fri Aug 15 01:07:16 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * common.mk ({$(srcdir)}.y.c): escape backslash.
-
-Fri Aug 15 01:05:39 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (econv_primitive_convert): set destination_buffer
- encoding.
-
-Fri Aug 15 00:52:40 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/encoding.h (rb_econv_output): declared.
-
- * transcode_data.h (rb_transcoder): add resetsize_func field.
-
- * enc/trans/iso2022.trans (iso2022jp_reset_sequence_size): defined.
- (rb_EUC_JP_to_ISO_2022_JP): provide resetsize_func.
-
- * tool/transcode-tblgen.rb: set NULL for resetsize_func.
-
- * transcode.c (rb_econv_output): new function for inserting output.
- (output_replacement_character): use rb_econv_output.
- (transcode_loop): check return value of
- output_replacement_character.
-
-Thu Aug 14 23:47:21 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/encoding.h (ECONV_UNIVERSAL_NEWLINE_DECODER): defined.
- (ECONV_CRLF_NEWLINE_ENCODER): ditto.
- (ECONV_CR_NEWLINE_ENCODER): ditto.
- (ECONV_PARTIAL_INPUT): ditto.
- (ECONV_OUTPUT_FOLLOWED_BY_INPUT): ditto.
-
- * transcode.c: use ECONV_* defined as above.
-
-Thu Aug 14 23:35:21 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c: local variable renamed.
-
-Thu Aug 14 23:22:24 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/encoding.h (rb_econv_result_t): moved from
- transcode_data.h.
- (rb_econv_elem_t): ditto.
- (rb_econv_t): ditto. source_encoding and destination_encoding field
- is added.
- (rb_econv_open): declared.
- (rb_econv_convert): ditto.
- (rb_econv_close): ditto.
-
- * transcode.c (rb_econv_open_by_transcoder_entries): initialize
- source_encoding and destination_encoding field as NULL.
- (rb_econv_open): make it external linkage.
- (rb_econv_close): ditto.
- (rb_econv_convert): ditto. renamed from rb_econv_conv.
- (make_encoding): new function.
- (econv_init): use make_encoding and store rb_encoding* in
- rb_econv_t.
- (econv_source_encoding): new method
- Encoding::Converter#source_encoding.
- (econv_destination_encoding): new method
- Encoding::Converter#destination_encoding.
-
-Thu Aug 14 22:44:32 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode_data.h (rb_econv_result_t): change enumeration
- constant's prefix: transcode_ to econv_.
-
- * transcode.c: follow the constant prefix change.
-
-Thu Aug 14 21:34:41 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (econv_init): accept Encoding object as source_encoding
- and destination_encoding.
-
-Thu Aug 14 21:10:00 2008 Tanaka Akira <akr@fsij.org>
-
- * encoding.c (rb_filesystem_encoding): use default external encoding
- for Unix.
-
- * dir.c (dir_initialize): don't cache fs_encoding.
-
-Thu Aug 14 20:58:57 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (rb_econv_open_by_transcoder_entries): renamed from
- rb_trans_open_by_transcoder_entries.
-
-Thu Aug 14 20:56:28 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (econv_max_output): removed.
-
-Thu Aug 14 20:52:55 2008 Tanaka Akira <akr@fsij.org>
-
- * tool/transcode-tblgen.rb: check unexpected actions.
-
-Thu Aug 14 20:25:52 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode_data.h (transcode_invalid_byte_sequence): renamed from
- transcode_invalid_input.
- (transcode_destination_buffer_full): renamed from transcode_obuf_full.
- (transcode_source_buffer_empty): renamed from transcode_ibuf_empty.
- (rb_econv_result_t): renamed from rb_trans_result_t.
- (rb_econv_elem_t): renamed from rb_trans_elem_t.
- (rb_econv_t): renamed from rb_trans_t.
-
- * transcode.c (UNIVERSAL_NEWLINE_DECODER): renamed from
- UNIVERSAL_NEWLINE.
- (CRLF_NEWLINE_ENCODER): renamed from CRLF_NEWLINE.
- (CR_NEWLINE_ENCODER): renamed from CR_NEWLINE.
- (rb_econv_open): renamed from rb_trans_open.
- (rb_econv_close): renamed from rb_trans_close.
-
-Thu Aug 14 19:41:42 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (load_transcoder): unused function removed.
- (rb_transcoding_open): ditto.
-
-Thu Aug 14 17:57:05 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/encoding.h (rb_enc_ispunct): added.
-
- * common.mk (COMMONOBJS), inits.c (rb_call_inits): id.c is now
- included from parse.c.
-
- * id.c (Init_id), id.h (ruby_method_ids): added IDs used by VM.
-
- * parse.y (global_symbols): added rooms for VM IDs.
-
- * parse.y (rb_intern3, rb_id2str): single punctuation symbol is now
- same as char code.
-
-Thu Aug 14 17:46:21 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (union tmpyystype): no longer needed, since YYSTYPE is
- defined in parse.h now.
-
-Thu Aug 14 17:27:07 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * version.c (Init_version): add RUBY_ENGINE constant.
-
-Thu Aug 14 15:34:10 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (rb_econv_conv): new function. it doesn't consume
- input too much, even for multilevel conversion.
- (transcode_loop): use rb_econv_conv.
- (econv_primitive_convert): ditto.
-
-Thu Aug 14 15:27:42 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/defines.h (RUBY_ALIAS_FUNCTION): fallback definition.
-
-Thu Aug 14 15:08:17 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode_data.h (rb_trans_result_t): new enumeration constant:
- transcode_output_followed_by_input.
-
- * transcode.c (OUTPUT_FOLLOWED_BY_INPUT): new flag.
- (transcode_restartable0): suspend when output followed by input if
- OUTPUT_FOLLOWED_BY_INPUT is specified.
- (trans_sweep): check OUTPUT_FOLLOWED_BY_INPUT.
- (rb_trans_conv): support OUTPUT_FOLLOWED_BY_INPUT.
- (econv_primitive_convert): return :output_followed_by_input for
- transcode_output_followed_by_input.
-
-Thu Aug 14 14:57:46 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * gc.c (getrusage_time): should return the value.
-
- * thread.c (rb_thread_priority_set): get rid of C99 feature.
-
- * transcode.c (transcode_search_path): ditto.
-
- * vm.c (REWIND_CFP): get rid of statement expressions.
-
-Thu Aug 14 14:13:39 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm.c (Init_VM): hide FrozenCore.
-
-Thu Aug 14 12:20:36 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * transcode.c (load_transcoder): suppress warning.
-
- * missing/vsnprintf.c (BSD_vfprintf): ditto.
-
-Thu Aug 14 12:01:39 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (gnumake): check for GNU make.
-
- * Makefile.in (uncommon.mk): includes filtered common.mk.
-
- * common.mk (parse.h): workaround for nmake.
-
-Thu Aug 14 06:09:12 2008 Koichi Sasada <ko1@atdot.net>
-
- * thread.c (rb_thread_execute_interrupts): switch event
- should be occur only once.
-
-Thu Aug 14 05:36:36 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * common.mk: parse.h depends on parse.c.
-
- * common.mk: hash.o depends on $(ID_H_INCLUDES).
-
-Thu Aug 14 02:45:16 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * test/ruby/test_file_exhaustive.rb (TestFileExhaustive#setup):
- set group of tmpdir. [ruby-dev:35633]
-
-Thu Aug 14 15:50:30 2008 Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
-
- * hash.c (set_default): fix rdoc. #441
-
-Thu Aug 14 02:23:31 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (econv_primitive_convert): add output_byteoffset
- argument.
-
-Thu Aug 14 00:43:53 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (rb_cv_gcc_function_alias): checks alias attribute.
-
- * string.c (alias_func): replaced with RUBY_ALIAS_FUNCTION.
-
-Wed Aug 13 23:42:49 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (parse.h): fake rule.
-
-Wed Aug 13 23:15:58 2008 Shugo Maeda <shugo@ruby-lang.org>
-
- * test/ruby/test_thread.rb (test_list): call Thread.pass to run t1.
- fixed [ruby-core:18264].
-
-Wed Aug 13 23:05:51 2008 TAKAO Kouji <kouji@takao7.net>
-
- * string.c (alias_func): changed to 'weak, alias' from 'alias' for
- Mac OSX. (closes #429)
-
-Wed Aug 13 19:40:12 2008 Koichi Sasada <ko1@atdot.net>
-
- * gc.c: count only freed object as freelist size.
-
-Wed Aug 13 18:34:22 2008 Shugo Maeda <shugo@ruby-lang.org>
-
- * marshal.c (marshal_load): set arg.untrust properly.
-
-Wed Aug 13 17:47:09 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (econv_inspect): new method.
-
-Wed Aug 13 17:35:58 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (transcode_restartable0): several local variables
- removed.
-
-Wed Aug 13 17:35:23 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * hash.c (rb_hash_set_default_proc): add new method. a patch from
- Giuseppe Bilotta. #419
-
-Wed Aug 13 17:31:12 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * vm_insnhelper.c (caller_setup_args): should ensure if the value
- from to_proc is a real Proc.
-
-Wed Aug 13 17:28:29 2008 Akinori MUSHA <knu@iDaemons.org>
-
- * common.mk: regint.h no longer includes vm_core.h.
-
-Wed Aug 13 17:26:44 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode_data.h (rb_transcoding): add fields: writebuf_off,
- writebuf_len and writebuf.
- (TRANSCODING_WRITEBUF): new macro.
-
- * transcode.c (transcode_restartable0): output until output buffer is
- really full.
- (rb_transcoding_open_by_transcoder): initialize writebuf_len,
- writebuf_off and writebuf.
- (rb_transcoding_close): finalize writebuf.
-
-Wed Aug 13 17:18:37 2008 Koichi Sasada <ko1@atdot.net>
-
- * thread.c (rb_thread_check_ints): added. please note that
- this function may cause ruby's thread switching.
-
- * include/ruby/intern.h: ditto.
-
- * regint.h: use rb_thread_check_ints() instead of
- RUBY_CHECK_INTS() directly.
-
-Wed Aug 13 17:01:36 2008 Akinori MUSHA <knu@iDaemons.org>
-
- * golf_prelude.rb, lib/set.rb (TC_Set#test_each),
- test/readline/test_readline_history.rb (Readline#test_each__enumerator),
- test/ruby/test_array.rb (TestArray#test_collect),
- test/ruby/test_enumerator.rb (TestEnumerator#test_initialize):
- Enumerable::Enumerator is now called Enumerator.
-
- * lib/rinda/tuplespace.rb (Rinda::TupleBag#initialize): Use
- enum_for instead of hardcoding Enumerable::Enumerator.
-
-Wed Aug 13 16:40:57 2008 Koichi Sasada <ko1@atdot.net>
-
- * thread.c, vm_core.h: add manual priority support
- using time slice. if you enable USE_NATIVE_THREAD_PRIORITY
- macro, this mechanism is ignored. [ruby-dev:33124]
-
- * thread_pthread.c, thread_win32.c: ditto.
-
- * test/ruby/test_thread.rb: fix test parameter.
-
-Wed Aug 13 16:02:14 2008 Shugo Maeda <shugo@ruby-lang.org>
-
- * object.c (rb_obj_untrusted): new method Object#untrusted?.
- (rb_obj_untrust): new method Object#untrust.
- (rb_obj_trust): new method Object#trust.
-
- * array.c, debug.c, time.c, include/ruby/ruby.h, re.c, variable.c,
- string.c, io.c, dir.c, vm_method.c, struct.c, class.c, hash.c,
- ruby.c, marshal.c: fixes for Object#untrusted?.
-
- * test/ruby/test_module.rb, test/ruby/test_array.rb,
- test/ruby/test_object.rb, test/ruby/test_string.rb,
- test/ruby/test_marshal.rb, test/ruby/test_hash.rb: added tests for
- Object#untrusted?.
-
-Wed Aug 13 16:13:58 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * test/ruby/test_m17n.rb: follow EncodingCompatibilityError.
-
- * test/ruby/test_mixed_unicode_escapes.rb: ditto.
-
- * test/ruby/enc/test_utf16.rb: ditto.
-
-Wed Aug 13 16:05:50 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * time.c (time_cmp): retry with right hand operand if its not a
- time object. [ruby-dev:35011]
-
-Wed Aug 13 15:51:22 2008 Akinori MUSHA <knu@iDaemons.org>
-
- * string.c: Apply a temporary fix to fix build on OS X. A real
- fix will follow later.
-
-Wed Aug 13 15:25:09 2008 Akinori MUSHA <knu@iDaemons.org>
-
- * enumerator.c (Init_Enumerator): Rename Enumerable::Enumerator to
- just Enumerator.
-
-Wed Aug 13 15:13:57 2008 Akinori MUSHA <knu@iDaemons.org>
-
- * common.mk (prelude.c, golf_prelude.c): Using $(COMPILE_PRELUDE)
- requires $(RBCONFIG).
-
-Wed Aug 13 15:08:04 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (econv_init): make flags argument optional.
- (econv_primitive_convert): ditto.
-
-Wed Aug 13 14:55:27 2008 Akinori MUSHA <knu@iDaemons.org>
-
- * common.mk (realclean-local): Remove parse.h as well.
-
- * common.mk: Add missing dependencies regarding vm_core.h, id.h,
- parse.c (parse.h), etc..
-
-Wed Aug 13 14:45:37 2008 Tanaka Akira <akr@fsij.org>
-
- * enc/trans/newline.trans (rb_crlf_newline): new transcoder.
- (rb_cr_newline): new transcoder.
-
- * transcode.c (trans_open_i): one more extra room for input newline
- converter.
- (rb_trans_open): crlf newline and cr newline implemented.
- (Init_transcode): Encoding::Converter::CRLF_NEWLINE and
- Encoding::Converter::CR_NEWLINE defined.
-
-Wed Aug 13 14:22:16 2008 Tanaka Akira <akr@fsij.org>
-
- * enc/trans/newline.trans: new file.
-
- * transcode_data.h (rb_trans_t): add last_tc field.
-
- * transcode.c (UNIVERSAL_NEWLINE): defined.
- (CRLF_NEWLINE): defined.
- (CR_NEWLINE): defined.
- (rb_trans_open_by_transcoder_entries): initialize last_tc.
- (trans_open_i): allocate one more room for output newline converter.
- (rb_trans_open): universal newline implemented.
- (more_output_buffer): take max_output argument instead ts.
- (output_replacement_character): take tc argument instead of ts.
- (transcode_loop): use last_tc field.
- (econv_init): add flags argument for rb_trans_open.
- (Init_transcode): Encoding::Converter::UNIVERSAL_NEWLINE defined.
-
-Wed Aug 13 14:00:19 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (parse.c): generates parse.h together.
-
- * id.c, id.h: use constants for parser tokens.
-
-Wed Aug 13 13:47:05 2008 Koichi Sasada <ko1@atdot.net>
-
- * vm.c: rewind cfp to show proper backtrace.
- [ruby-dev:35820]
-
-Wed Aug 13 13:09:09 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * tool/make-snapshot: fix for clean up.
-
-Wed Aug 13 11:45:51 2008 Akinori MUSHA <knu@iDaemons.org>
-
- * vm_core.h: Declare rb_iseq_clone, which is used in class.c.
-
-Wed Aug 13 11:39:19 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (transcode_search_path): return the length of converter
- path.
- (load_transcoder_entry): renamed from load_transcoder.
- (load_transcoder): new function for loading transcoder by encoding
- names.
- (rb_transcoding_open_by_transcoder): extracted from
- rb_transcoding_open.
- (rb_transcoding_open): use load_transcoder and
- rb_transcoding_open_by_transcoder.
- (rb_trans_open_by_transcoder_entries): new function.
- (trans_open_i): construct entries array.
- (rb_trans_open): use rb_trans_open_by_transcoder_entries.
-
-Wed Aug 13 10:45:29 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * tool/make-snapshot: try to find exported directory.
-
-Wed Aug 13 10:16:35 2008 TAKAO Kouji <kouji@takao7.net>
-
- * doc/NEWS: Mention the Readline.vi_editing_mode?,
- Readline.emacs_editing_mode?, Readline::HISTORY[] and
- Readline::HISTORY.clear change.
-
-Wed Aug 13 08:03:02 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (econv_primitive_convert): add output_size argument.
-
-Wed Aug 13 07:41:03 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (rb_trans_conv): report last transcode_obuf_full.
- (econv_max_output): new method Encoding::Converter#max_output.
-
-Wed Aug 13 02:46:01 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * error.c (rb_eEncCompatError): add Exception.
-
- * include/ruby/ruby.h: ditto.
-
- * encoding.c (rb_enc_check): use rb_eEncCompatError.
-
- * string.c (rb_enc_cr_str_buf_cat): ditto.
-
- * string.c (rb_str_sub_bang): ditto.
-
- * string.c (rb_str_hex): ditto.
-
- * string.c (rb_str_oct): ditto.
-
-Wed Aug 13 02:36:47 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * transcode.c (str_transcode): fix error message.
-
-Tue Aug 12 23:42:31 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (rb_cEncodingConverter): new class Encoding::Converter.
- (econv_free): new function.
- (econv_s_allocate): ditto.
- (econv_init): ditto.
- (check_econv): ditto.
- (econv_primitive_convert): new method.
- (Init_transcode): define Encoding::Converter.
-
-Tue Aug 12 23:16:09 2008 Tanaka Akira <akr@fsij.org>
-
- * string.c (rb_str_splice_0): call rb_str_drop_bytes, not rb_str_drop.
-
-Tue Aug 12 19:11:05 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * tool/make-snapshot: fix for enc.mk.
-
-Tue Aug 12 19:08:42 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_str_drop_bytes): new function to drop first bytes.
-
-Tue Aug 12 18:58:48 2008 Koichi Sasada <ko1@atdot.net>
-
- * vm.c, vm_insnhelper.c (vm_define_method): move
- function place.
-
-Tue Aug 12 18:56:52 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c: more descriptive aliases of rb_str_new[2-5].
- [ruby-dev:35615]
-
-Tue Aug 12 18:51:29 2008 TAKAO Kouji <kouji@takao7.net>
-
- * gc.c (getrusage_time): Returned effective value on Windows.
-
-Tue Aug 12 18:51:11 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (rb_trans_open): free ts before raise.
-
-Tue Aug 12 18:46:36 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/bigdecimal/bigdecimal.c (BigDecimalCmp): should not ignore
- <=> comparison. [ruby-dev:35732]
-
-Tue Aug 12 18:43:10 2008 Tanaka Akira <akr@fsij.org>
-
- * enc/trans/make_transdb.rb: *.erb.c is not used anymore.
-
-Tue Aug 12 18:32:33 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode_data.h (rb_trans_elem_t): new field: from and to.
-
- * transcode.c (trans_open_i): just record from and to.
- (rb_trans_open): load transcodings.
-
-Tue Aug 12 18:32:03 2008 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/syslog/syslog.c (mSyslog_open): Use of Check_SafeStr() is
- deprecated.
- (mSyslogConstants_LOG_MASK, mSyslogConstants_LOG_UPTO): Use
- NUM2INT() instead of FIX2INT() when the type of an given object
- is not determined.
-
-Tue Aug 12 18:14:00 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * tool/transcode-tblgen.rb (#transcode_tblgen): slight message
- improvement.
-
-Tue Aug 12 17:16:58 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (trans_open_i): check the result of rb_transcoding_open.
-
-Tue Aug 12 16:23:32 2008 Narihiro Nakamura <authorNari@gmail.com>
-
- * gc.c (gc_profile_result): use rb_str_catf.
-
-Tue Aug 12 16:13:45 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode_data.h (TRANSCODE_ERROR): removed.
-
- * tool/transcode-tblgen.rb: 8bit byte of ASCII-8BIT is a valid
- (but unique to ASCII-8BIT) character.
-
- * transcode.c (rb_eConversionUndefined): new error.
- (rb_eInvalidByteSequence): ditto.
-
-Tue Aug 12 16:08:51 2008 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/pop.rb: POP3Command should export @socket since POP
- calls #socket.
-
-Tue Aug 12 16:06:28 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * sprintf.c, util.c (quorem, nrv_alloc, dtoa): enabled floating point
- support.
-
-Tue Aug 12 15:52:45 2008 Narihiro Nakamura <authorNari@gmail.com>
-
- * gc.c (gc_profile_result): use sprintf.
-
-Tue Aug 12 15:37:40 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_intern): should check symbol table overflow.
-
-Tue Aug 12 15:31:04 2008 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/http.rb (send_request_with_body): Content-Length should
- be byte length of string. (closes #203)
-
-Tue Aug 12 15:17:06 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * enc/depend: (transvpath_prefix): prefix has no extension, so replace
- %s with "".
-
-Tue Aug 12 15:03:43 2008 TAKAO Kouji <kouji@takao7.net>
-
- * test/readline/test_readline.rb (TestReadline#test_safe_level_4):
- tested Readline.vi_editing_mode? and Readline.emacs_editing_mode?.
-
-Tue Aug 12 14:25:09 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * enc/Makefile.in (.SUFFIXES): renamed to .trans.
-
- * enc/make_encmake.rb: added --encs and --no-encs options.
-
- * enc/depend (TRANSVPATH): fix for nmake.
-
-Tue Aug 12 14:19:53 2008 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/https.rb: suppress syntax warning.
-
-Tue Aug 12 14:15:51 2008 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/http.rb (Net::HTTP#initialize): initialize net/https
- variables to suppress syntax warning.
-
-Tue Aug 12 14:15:13 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/dl/cptr.c (rb_dlptr_s_to_ptr): fixed shadowing variable.
-
-Tue Aug 12 10:25:14 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_delete): Array#delete to return deleted element.
-
-Tue Aug 12 10:18:01 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * test/win32ole/test_err_in_callback.rb: do not require 'mkmf'
- unless WIN32OLE is defined.
-
-Tue Aug 12 07:41:13 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode_data.h (rb_transcoder): add resetstate_func field for
- resetting a state of stateful encoding.
-
- * enc/trans/iso2022.trans (rb_EUC_JP_to_ISO_2022_JP): specify
- finish_eucjp_to_iso2022jp for resetstate_func.
-
- * tool/transcode-tblgen.rb: specify NULL for resetstate_func.
-
- * transcode.c (output_replacement_character): call resetstate_func
- before appending the replacement character.
-
-Tue Aug 12 07:19:24 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (get_replacement_character): extracted from
- output_replacement_character.
-
-Tue Aug 12 07:00:02 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode_data.h (rb_transcoder): typedef at first.
-
-Tue Aug 12 06:48:35 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (rb_trans_conv): find second last error.
-
-Tue Aug 12 00:43:44 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode_data.h (rb_trans_result_t): new type.
- (rb_trans_elem_t): new type.
- (rb_trans_t): new type.
-
- * transcode.c (transcode_dispatch_cb): removed.
- (transcode_dispatch): removed.
- (rb_transcoding_result_t): moved to rb_trans_result_t in
- transcode_data.h.
- (transcode_restartable0): goto follow_info when FUNsi.
- (rb_transcoding_open): use get_transcoder_entry.
- (rb_trans_open): new function.
- (rb_trans_conv): ditto.
- (rb_trans_close): ditto.
- (trans_open_i): ditto.
- (trans_sweep): ditto.
- (more_output_buffer): take rb_trans_t instead of rb_transcoding as
- an argument.
- (transcode_loop): take from_encoding and to_encoding instead of tr
- as arguments. use rb_trans_open/rb_trans_conv/rb_trans_close.
- (str_transcode): don't use transcode_dispatch.
-
-Mon Aug 11 20:37:05 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * iseq.c (rb_iseq_clone): should preserve cref_stack link.
-
-Mon Aug 11 20:27:12 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/dl/cfunc.c (rb_dlcfunc_call): add taint check.
-
- * ext/dl/dl.c (rb_dl_malloc): add rb_secure(2).
-
- * ext/dl/dl.c (rb_dl_realloc): ditto.
-
- * ext/dl/dl.c (rb_dl_free): ditto.
-
- * ext/dl/dl.c (rb_dl_ptr2value): ditto.
-
-Mon Aug 11 20:11:21 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * gc.c (getrusage_time): works only if RUSAGE_SELF is defined right
- now.
-
- * gc.c (gc_profile_result): C99.
-
-Mon Aug 11 18:57:38 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_sample): rename #choice to #sample. in
- addition, sample takes optional argument, a la #first.
-
-Mon Aug 11 18:28:02 2008 Narihiro Nakamura <authorNari@gmail.com>
-
- * gc.c: added GC::Profiler.
-
-Mon Aug 11 17:26:16 2008 TAKAO Kouji <kouji@takao7.net>
-
- * ext/readline/README.ja: added API document for
- Readline.vi_editing_mode? and Readline.emacs_editing_mode?.
-
- * ext/readline/extconf.rb: checked rl_editing_mode variable in
- Readline library.
-
- * ext/readline/readline.c (readline_s_emacs_editing_mode_p): added
- Readline.emacs_editing_mode? method.
- (readline_s_vi_editing_mode_p): added Readline.vi_editing_mode?
- method.
- (Init_readline): ditto.
-
-Mon Aug 11 16:56:40 2008 TAKAO Kouji <kouji@takao7.net>
-
- * test/readline/test_readline.rb: added test for Readline's class
- methods.
-
-Mon Aug 11 16:39:23 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * class.c (clone_method): should copy cbase in cref as well.
- [ruby-dev:35116]
-
- * iseq.c (iseq_mark): mark original iseq object.
-
- * iseq.c (iseq_free): do not free internal data if they have
- original iseq to belong.
-
- * iseq.c (rb_iseq_clone): a new function to clone iseq value.
-
-Mon Aug 11 16:34:48 2008 Tanaka Akira <akr@fsij.org>
-
- * enc/trans/iso2022.trans: renamed from iso2022.erb.c.
-
- * enc/trans/single_byte.trans: ditto.
-
- * enc/trans/utf_16_32.trans: ditto.
-
- * enc/trans/korean.trans: ditto.
-
- * enc/trans/japanese.trans: ditto.
-
- * enc/depend: follow the renaming.
-
- * tool/build-transcode: ditto.
-
-Mon Aug 11 15:09:23 2008 Tanaka Akira <akr@fsij.org>
-
- * configure.in (rb_cv_broken_glibc_ia64_erfc): renamed from
- rb_broken_glibc_ia64_erfc.
- [ruby-core:18228]
-
-Mon Aug 11 10:04:34 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode_data.h (rb_transcoding): rename fields.
- readlen -> recognized_len.
- feedlen -> readagain_len.
-
- * transcode.c: follow the field renaming.
-
-Sun Aug 10 22:34:55 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (transcode_restartable0): invalid handling simplified.
- (transcode_restartable): use PARTIAL_INPUT for converting buffered
- input.
-
-Sun Aug 10 22:24:24 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * encoding.c: include util.h. [ruby-dev:35715]
-
- * common.mk: ditto.
-
-Sun Aug 10 20:59:54 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode_data.h (rb_transcoding): new field: flags.
-
- * transcode.c (load_transcoder): extracted from transcode_dispatch_cb.
- (rb_transcoding_result_t): renamed from transcode_result_t.
- (rb_transcoding_open): new function.
- (rb_transcoding_convert): ditto.
- (rb_transcoding_close): ditto.
- (transcode_loop): use rb_transcoding_open, rb_transcoding_convert
- and rb_transcoding_close.
- (str_transcode): don't need rb_transcoding.
-
-Sun Aug 10 18:09:16 2008 Tanaka Akira <akr@fsij.org>
-
- * tool/transcode-tblgen.rb: record checksum of
- transcode-tblgen.rb itself.
-
-Sun Aug 10 12:34:41 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * config.guess ({powerpc-apple,i586-pc}-haiku): re-applied r18403.
- [ruby-core:18110]
-
- * config.{guess,sub}: updated to automake-1.10.1.
-
-Sun Aug 10 11:45:15 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * enc/Makefile.in (make-workdir): use MAKEDIRS.
-
- * enc/depend: makes target directory before compile/link.
-
- * tool/transcode-tblgen.rb: creates target directory.
-
-Sun Aug 10 11:30:48 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c: rename my_transcoding to tc and my_transcoder to tr.
-
-Sun Aug 10 11:15:55 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode_data.h (rb_transcoding): add feedlen field.
-
- * transcode.c (transcode_restartable0): renamed from
- transcode_restartable.
- save input buffer into feed buffer if next character is started the
- point before input buffer. for example, "\x00\xd8\x01" then "\x02"
- in UTF-16LE. \x02 causes invalid and next character is started from
- \x01.
- (transcode_restartable): new function to call
- transcode_restartable0. if feed buffer is not empty, convert it at
- first.
-
-Sun Aug 10 11:02:58 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (extconf): use MAKEDIRS.
-
-Sun Aug 10 09:35:12 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/irb.rb (IRB::Irb#inspect): instance_variables returns symbols
- instead of strings now. [ruby-dev:34930]
-
-Sun Aug 10 09:22:14 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (transcode_char_start): refactored to remove readlen
- argument.
- (transcode_restartable): refactored to remove readlen variable.
-
-Sun Aug 10 08:56:14 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * gc.c (STACK_LEVEL_MAX, ruby_stack_length): returns size_t.
- [ruby-core:18207]
-
- * configure.in (rb_cv_missing__dtos18, rb_cv_missing_fconvert),
- ext/digest/md5/md5.c, ext/openssl/ossl.c (main),
- ext/socket/extconf.rb (ipv6, wide-getaddrinfo): main should be int.
-
- * main.c (main), win32/winmain.c, wince/wincemain.c (WinMain): envp is
- no longer used so long time. based on a patch from Peter Bowen at
- [ruby-core:18208]
-
-Sat Aug 9 22:05:29 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (transcode_loop): take destination and resize function
- as parameters.
- (more_output_buffer): ditto.
- (str_transcoding_resize): argument changed from rb_transcoding* to
- VALUE.
- (str_transcode): call transcode_loop with destination string and its
- resize function.
-
- * transcode_data.h (rb_transcoding): move ruby_string_dest and
- flush_func to transcode_loop parameters.
-
-Sat Aug 9 21:29:45 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * common.mk: encs depend on transdb.h
-
-Sat Aug 9 21:10:51 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (rb_cv_rshift_sign, rb_cv_binary_elf): get rid of
- AC_TRY_RUN.
-
-Sat Aug 9 16:33:21 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode_data.h (rb_transcoding): new fields: next_info and next_byte.
-
- * transcode.c (transcode_restartable): save/restore next_info and
- next_byte.
- sync readlen and in_p when invalid.
-
-Sat Aug 9 15:10:15 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode.c (transcode_restartable): my_transcoder argument removed.
- (transcode_loop): my_transcoder argument removed.
-
-Sat Aug 9 14:39:34 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode_data.h (rb_transcoding): add fields for restartable
- transcoding.
- (rb_transcoder): add max_input field.
- from_unit_length field is renamed to input_unit_length.
-
- * tool/transcode-tblgen.rb: generate max_input field.
-
- * enc/trans/iso2022.erb.c: follow rb_transcoder change.
-
- * enc/trans/utf_16_32.erb.c: ditto.
-
- * transcode.c (PARTIAL_INPUT): new constant.
- (transcode_char_start): new function.
- (transcode_result_t): new type.
- (transcode_restartable): new function.
- (more_output_buffer): new function.
- (transcode_loop): use transcode_restartable.
-
-Sat Aug 9 13:35:08 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * stable/ext/socket/socket.c (NI_MAXHOST, NI_MAXSERV): fixed invalid
- preprocessor directives. a patch from Peter Bowen at
- [ruby-core:18211].
-
-Sat Aug 9 06:37:21 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * enc/make_encdb.rb, enc/trans/make_transdb.rb: skip nonexistent
- directory. [ruby-dev:35802]
-
-Sat Aug 9 01:07:51 2008 Tanaka Akira <akr@fsij.org>
-
- * enc/trans/utf_16_32.erb.c (fun_so_from_utf_32le): implemented.
- (fun_so_to_utf_32le): implemented.
- [ruby-dev:35777]
-
-Sat Aug 9 00:42:33 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode_data.h (rb_transcoder): from_unit_length field added.
- from_utf8 field removed.
-
- * tool/transcode-tblgen.rb: generate offsets range.
- follow rb_transcoder change.
-
- * transcode.c (transcode_loop): don't use from_utf8.
- make invalid region from_unit_length wise.
-
- * enc/trans/iso2022.erb.c: follow rb_transcoder and
- transcode_generate_node change.
-
- * enc/trans/utf_16_32.erb.c: follow rb_transcoder and
- transcode_generate_node change.
- explicit :invalid map removed.
-
-Fri Aug 8 23:29:44 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * enc/depend (TRANSCSRCS): needs rule_subst to apply.
-
- * io.c (shutdown): not define if defined already.
-
-Fri Aug 8 22:47:26 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm_insnhelper.c (opt_eq_func): large function to make inline.
-
- * bcc32/Makefile.sub (config.h): cannot compile a big inline function.
-
-Fri Aug 8 21:09:10 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * common.mk (enk.mk): give not RUBY but MINIRUBY.
-
-Fri Aug 8 17:03:17 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (shutdown, sched_yield, pthread_attr_setinheritsched):
- check for Haiku.
-
- * eval_intern.h, io.c, thread_pthread.c: use autoconfisticated results.
-
-Fri Aug 8 16:52:55 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (enc.mk): mkmf.rb requires rbconfig.rb.
-
- * common.mk (srcs-enc): renamed from transcodes.
-
- * enc/Makefile.in (make-workdir): creates object directories.
-
- * common.mk (encdb.h): see both $(srcdir)/enc and enc.
-
- * enc/make_encdb.rb: ditto.
-
- * enc/trans/make_transdb.rb: fix for the case no transdirs are given.
-
- * enc/trans/make_transdb.rb: converts only one transcoders for each
- basename.
-
-Fri Aug 8 10:53:52 2008 Tanaka Akira <akr@fsij.org>
-
- * lib/resolv.rb: randomize source port and transaction id.
- CVE-2008-1447.
-
- * lib/resolv-replace.rb (UDPSocket#bind): don't resolv host if host is
- "".
-
-Fri Aug 8 04:20:14 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * common.mk: see both $(srcdir)/enc/trans and enc/trans.
-
- * enc/trans/make_transdb.rb: ditto.
-
-Fri Aug 8 00:05:02 2008 TAKAO Kouji <kouji@takao7.net>
-
- * ext/.document: added readline/readline.c.
-
- * ext/readline/readline.c: changed Copyright. added RDoc.
-
- * ext/readline/README.ja: fixed typo.
-
- * ext/readline/README: contents was moved RDoc.
-
-Thu Aug 7 23:43:11 2008 Tanaka Akira <akr@fsij.org>
-
- * transcode_data.h (rb_transcoding): new field "stateful".
- (rb_transcoder): preprocessor and postprocessor field removed.
- change arguments of func_ii, func_si, func_io and func_so.
- new field "finish_func".
-
- * tool/transcode-tblgen.rb: make FUNii, FUNsi and FUNio
- generatable.
-
- * transcode.c (transcoder_lib_table): removed.
- (transcoder_table): change structure.
- (transcoder_key): removed because the above structure change.
- (make_transcoder_entry): new function.
- (get_transcoder_entry): ditto.
- (rb_register_transcoder): follow the structure change.
- (declare_transcoder): ditto.
- (transcode_search_path): new function for breadth first search to
- find a list of converters.
- (transcode_search_path_i): new function.
- (transcode_dispatch_cb): ditto.
- (transcode_dispatch): use transcode_search_path.
- (transcode_loop): follow the argument change.
- (str_transcode): preprocessor and postprocessor stuff removed.
-
- * enc/trans/iso2022.erb.c: new file. ISO-2022-JP conversion
- re-implemented.
-
- * enc/trans/japanese.erb.c: ISO-2022-JP stuff removed.
-
- * enc/trans/utf_16_32.erb.c: follow argument change of FUNso.
-
- [ruby-dev:35798]
-
-Thu Aug 7 22:55:44 2008 TAKAO Kouji <kouji@takao7.net>
-
- * ext/readline/README.ja: updated API document for Readline module.
-
-Thu Aug 7 20:52:08 2008 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/net/ftp.rb (login): raise FTPReplyError if passwd or acct
- is not supplied. fixed [ruby-core:18058].
-
-Thu Aug 7 18:01:44 2008 Akinori MUSHA <knu@iDaemons.org>
-
- * misc/ruby-mode.el (ruby-imenu-create-index-in-block): Fix the
- regexp to only pick definition lines properly. `module_function'
- is not a definition of a module named `_function'.
-
-Thu Aug 7 17:47:55 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * enc/depend: add transdb.c.
-
-Thu Aug 7 16:28:51 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * Makefile.in, common.mk, {bcc,win}32/Makefile.sub (clean-ext): do not
- use miniruby.
-
-Thu Aug 7 14:17:32 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * enc/depend: removed needless explicit commands.
-
- * lib/mkmf.rb, {bcc32,win32}/Makefile.sub (CLEANLIBS, CLEANOBJS):
- moved clean targets to platform makefiles.
-
-Thu Aug 7 13:12:30 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/socket/getaddrinfo.c (gai_strerror): ignore only on Haiku.
- a patch from <zn at mbf.nifty.com>, [ruby-dev:35796].
-
-Thu Aug 7 06:31:12 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * test/ruby/process.rb (test_popen_fork): skip a test which is
- freeze in FreeBSD.
-
-Thu Aug 7 06:05:48 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * config.guess: add powerpc-apple-haiku, i586-pc-haiku.
- see [ruby-core:18110]
-
-Thu Aug 7 05:51:05 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * eval_intern.h: Add support to Haiku. see [ruby-core:18110]
-
- * include/ruby/defines.h: ditto.
-
- * configure.in: ditto.
-
- * thread_pthread.c: ditto.
-
- * io.c: ditto.
-
- * lib/mkmf.rb: ditto.
-
- * ext/socket/getaddrinfo.c: ditto.
-
- * ext/socket/extconf.rb: ditto.
-
- * ext/socket/socket.c: ditto.
-
- * ext/socket/addrinfo.h: ditto.
-
- * ext/socket/getnameinfo.c: ditto.
-
-Thu Aug 7 05:43:32 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * common.mk: mkdir enc/trans before build tables.
-
-Thu Aug 7 05:18:30 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/depend: enc/*.c is source but enc/trans/*.c is generated.
-
-Thu Aug 7 05:14:12 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * regenc.c (code_to_mbc): raise RangeError Integer#chr
- when more than 255 is given with single byte encoding.
- [ruby-dev:35789]
-
-Thu Aug 7 05:06:03 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * gc.c (run_final): runs finalizers with the object terminated.
-
- * gc.c (rb_gc_call_finalizer_at_exit): keeps finalized objects from
- linking to freelist.
-
-Thu Aug 7 04:43:14 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/depend: for build in other than srcdir.
-
-Wed Aug 6 22:40:48 2008 Tanaka Akira <akr@fsij.org>
-
- * tool/transcode-tblgen.rb (transcode_generate_node): code
- argument removed.
-
-Wed Aug 6 21:25:45 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * gc.c (chain_finalized_object): deletes finalizers to be invoked from
- finalizer_table.
-
- * gc.c (rb_gc_call_finalizer_at_exit): warns when could not invoke
- finalizers.
-
-Wed Aug 6 20:56:43 2008 Tanaka Akira <akr@fsij.org>
-
- * enc/depend: transcode table generation depends on
- tool/transcode-tblgen.rb.
-
-Wed Aug 6 20:48:27 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * gc.c (rb_gc_call_finalizer_at_exit): self-referencing finalizers
- cannot be invoked. [ruby-dev:35681]
-
-Wed Aug 6 20:44:41 2008 Tanaka Akira <akr@fsij.org>
-
- * tool/transcode-tblgen.rb: distinguish UNDEF and INVALID.
- [ruby-dev:35709]
-
- * transcode.c (transcode_loop): don't need rb_enc_mbclen now.
-
-Wed Aug 6 14:40:11 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (transdb.h): requires transcoders.
-
- * enc/depend (srcs): target for transcoders.
-
-Wed Aug 6 14:04:08 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * enc/depend: replace not only $(<:...) but also $<.
-
-Wed Aug 6 13:54:30 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/Makefile.sub (config.status): export BASERUBY.
-
- * enc/depend: avoid GNU make'ism.
-
-Wed Aug 6 07:59:02 2008 Tanaka Akira <akr@fsij.org>
-
- * tool/transcode-tblgen.rb (ActionMap#eql?): use == to compare @map.
-
-Wed Aug 6 07:45:26 2008 Tanaka Akira <akr@fsij.org>
-
- * tool/transcode-tblgen.rb: show generating tables in verbose mode.
- (transcode_generate_node): call ActionMap#generate_node with showing
- table name.
-
- * enc/trans/utf_16_32.erb.c: use transcode_generate_node.
-
-Wed Aug 6 06:55:20 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread.c (thread_start_func_2): propagates fatal error and system
- exit to the main thread.
-
-Wed Aug 6 05:31:54 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * encoding.c (rb_to_encoding_index, rb_to_encoding): check if the name
- is ascii compatible as well as Encoding.find.
-
- * transcode.c (str_encode): no need to duplicate first.
-
-Wed Aug 6 05:08:30 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * array.c (rb_ary_sort_bang): reset to real class.
-
- * file.c (rb_find_file_ext, rb_find_file): ditto.
-
- * io.c (io_reopen): ditto.
-
-Wed Aug 6 03:56:39 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (transcodes), tool/build-transcode: generates transcode
- sources.
-
- * enc/trans/{japanese,korean,single_byte,utf_16_32}.c: to be
- autogenerated now.
-
- * enc/depend: added rules for .c from .erb.c.
-
-Tue Aug 5 20:46:20 2008 Tanaka Akira <akr@fsij.org>
-
- * tool/build-transcode: new file.
-
- * tool/transcode-tblgen.rb: new file.
-
- * enc/trans/make_transdb.rb: exclude *.erb.c.
-
- * enc/depend: exclude *.erb.c.
-
- * enc/trans/utf_16_32.erb.c: new file.
-
- * enc/trans/single_byte.erb.c: new file.
-
- * enc/trans/japanese.erb.c: new file.
-
- * enc/trans/korean.erb.c: new file.
-
- * enc/trans/iso-8859-2-tbl.rb: new file.
-
- * enc/trans/iso-8859-3-tbl.rb: new file.
-
- * enc/trans/iso-8859-4-tbl.rb: new file.
-
- * enc/trans/iso-8859-5-tbl.rb: new file.
-
- * enc/trans/iso-8859-6-tbl.rb: new file.
-
- * enc/trans/iso-8859-7-tbl.rb: new file.
-
- * enc/trans/iso-8859-8-tbl.rb: new file.
-
- * enc/trans/iso-8859-9-tbl.rb: new file.
-
- * enc/trans/iso-8859-10-tbl.rb: new file.
-
- * enc/trans/iso-8859-11-tbl.rb: new file.
-
- * enc/trans/iso-8859-13-tbl.rb: new file.
-
- * enc/trans/iso-8859-14-tbl.rb: new file.
-
- * enc/trans/iso-8859-15-tbl.rb: new file.
-
- * enc/trans/eucjp-tbl.rb: new file.
-
- * enc/trans/sjis-tbl.rb: new file.
-
- * enc/trans/euckr-tbl.rb: new file.
-
- * enc/trans/utf_16_32.c: regenerated.
-
- * enc/trans/single_byte.c: regenerated.
-
- * enc/trans/japanese.c: regenerated.
-
- * enc/trans/korean.c: regenerated.
-
- [ruby-dev:35730]
-
-Tue Aug 5 18:02:53 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * test/io/nonblock/test_flush.rb (TestIONonblock#test_flush):
- rescue some exceptions. [ruby-dev:35638]
-
-Tue Aug 5 16:40:06 2008 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/net/ftp.rb (chdir): handle 5xx errors correctly.
- fixed [ruby-core:18057].
-
-Tue Aug 5 16:38:59 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/win32.h, bcc32/Makefile.sub (config.h): bcc 5.8 has
- stdint.h.
-
-Tue Aug 5 16:13:05 2008 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/net/imap.rb (disconnect): do not refer to SSL::SSLSocket for
- environments without OpenSSL. fixed [ruby-dev:35755].
-
-Tue Aug 5 14:19:22 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (rb_stat_mode): generalized st_mode mask.
-
-Tue Aug 5 12:43:47 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (retry_sendfile, retry_read): ENOSYS and EWOULDBLOCK are not
- defined on every platforms.
-
-Tue Aug 5 12:34:49 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * transcode_data.h (TRANSCODE_ERROR): common transcode failure
- exception, would be changed later.
-
- * enc/trans/japanese.c (UNSUPPORTED_MODE): unsupported mode transition
- exception.
-
-Tue Aug 5 03:29:52 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * array.c (rb_ary_sort_bang): respect overridden <=> for String and
- Fixnum. [ruby-core:17708]
-
- * include/ruby/node.h (NOEX_BASIC): basic definition method flag.
-
- * include/ruby/intern.h, vm_method.c (rb_method_basic_definition_p):
- new function to check if the method is not redefined after the
- initialization.
-
- * vm_method.c (rb_obj_respond_to): use rb_method_basic_definition_p.
-
-Mon Aug 4 20:39:06 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * Makefile.in (update-rubyspec): renamed the rubyspec directory
- "spec". Changed directory structure.
-
- * Makefile.in (test-rubyspec): ditto.
-
- * spec/README: described the structure of "spec" directory.
-
- * spec/default.mspec: configured for Matz's Ruby Implementation.
-
-Mon Aug 4 19:21:43 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * array.c (rb_ary_tmp_new): added.
-
- * vm_eval.c (vm_call_super): fixed typo, and get rid of too large
- alloca. [ruby-core:17922]
-
-Mon Aug 4 16:48:50 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (deferred_nodes, compstmt, arg, fixup_nodes, range_op): fix
- up fixnum range literal in conditional as automagical line number
- comparison. [ruby-core:12124], [ruby-dev:35731]
-
-Mon Aug 4 14:41:25 2008 URABE Shyouhei <shyouhei@ruby-lang.org>
-
- * lib/net/smtp.rb (Net::SMTP::rcptto): fix a typo. a patch from
- Masao Takaku <masao at nii.ac.jp>
- fix [ruby-dev:35489].
-
-Mon Aug 4 14:08:55 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * marshal.c (dump_ensure), process.c (run_exec_dup2),
- string.c (rb_str_replace), transcode.c (transcode_dispatch): fixed
- memory leaks. based on patches from shinichiro.h <shinichiro.hamaji
- AT gmail.com> at [ruby-dev:35751].
-
-Sun Aug 3 19:32:52 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (hash2named_arg): refactoring.
-
- * ext/win32ole/win32ole.c (ole_invoke, fole_respond_to, ev_on_event,
- fev_off_event): accepts Symbol argument.
-
- * test/win32ole/test_win32ole.rb: ditto.
-
- * test/win32ole/test_win32ole_event.rb: ditto.
-
-Sun Aug 3 10:41:54 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_str_shared_replace): fixed memory leak. a patch from
- shinichiro.h <shinichiro.hamaji AT gmail.com> at [ruby-dev:35742]
-
-Sat Aug 2 22:55:41 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * test/win32ole/test_err_in_callback.rb: remove temporary files.
- some refactoring.
-
-Sat Aug 2 15:51:50 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (yylex): 8 and 9 in octal integer should cause compile
- error. [ruby-dev:35729]
-
-Sat Aug 2 01:06:10 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/trans/japanese.c: add U+FF5E to EUC-JP.
- [ruby-dev:35720] [ruby-dev:35722]
-
-Fri Aug 1 23:49:44 2008 TAKAO Kouji <kouji@takao7.net>
-
- * ext/readline/extconf.rb: checked to have clear_history in
- readline library.
- * ext/readline/readline.c (hist_get, hist_each, Init_readline):
- The offset specified for the argument of history_get() might be
- different in GNU Readline and libedit. If use libedit, it was
- corrected that the computational method of the offset specified
- for the argument of history_get() when the Readline module was
- initialized was decided.
- (hist_get, hist_set): If use libedit, accesses first an input
- content in history when specifies the negative offset for the
- argument of history_get() or replace_history_entry(). Then
- checks the offset is negative in ruby.
- (rb_remove_history): When compiling, it corrects it to warning
- when libedit is used.
- (hist_clear, Init_readline): added Readline::HISTORY.clear
- method. [ruby-dev:35551]
- * test/readline/test_readline_history.rb: added unit test for
- Readline::HISTORY.
-
-Fri Aug 1 23:26:45 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * transcode.c (transcode_loop): undefined character is replaced with
- only one character. [ruby-dev:35709]
-
-Fri Aug 1 23:26:22 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- Merged r16430(akr), r16431(akr), r16433(akr), r16469(nobu), and
- r17874(akr) from ruby_1_8.
-
- * Makefile.in (update-rubyspec): added
-
- * Makefile.in (test-rubyspec): added
-
-Fri Aug 1 23:16:03 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/trans/japanese.c: add support for CP51932,
-
-Fri Aug 1 22:59:40 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/trans/japanese.c: add U+FF0C,
-
-Fri Aug 1 21:49:41 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/sdbm/test_sdbm.rb: add some tests.
-
-Fri Aug 1 21:36:00 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * gc.c (allocate_heaps, assign_heap_slot, rb_newobj_from_heap):
- reset during_gc before raising NoMemoryError.
-
-Fri Aug 1 21:29:56 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * vm.c (Init_BareVM): check failure of malloc().
-
-Fri Aug 1 20:55:27 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/trans/japanese.c (to_SHIFT_JIS_EF_BF_offsets): add U+FFF3,
- U+FFF4, U+FFF5.
-
- * enc/trans/japanese.c (to_SHIFT_JIS_EF_BF_infos): ditto.
-
- * enc/trans/japanese.c (to_EUC_JP_EF_BF_infos): added.
-
- * enc/trans/japanese.c (to_EUC_JP_EF_BF): added.
-
- * enc/trans/japanese.c (to_EUC_JP_EF_infos): change size.
- [ruby-dev:35714]
-
-Fri Aug 1 18:27:15 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * parse.y (parser_yylex): removed an useless conditional, and magic
- comment are ignored unless at the first of line.
-
- * test/ruby/test_m17n.rb (test_magic_comment_vim): added.
-
- * test/ruby/test_m17n.rb (test_magic_comment_at_various_positions):
- added.
-
-Fri Aug 1 14:54:42 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/win32.c (rb_w32_seekdir): no need to rewind to seek forward.
-
-Fri Aug 1 05:31:08 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * transcode.c (output_replacement_character):
- rename from _get_replacement_character.
-
- * transcode.c (output_replacement_character):
- fix replacement on UTF-32{BE,LE}. [ruby-dev:35705]
-
- * transcode.c (transcode_loop): ditto.
-
- * test/ruby/test_transcode.rb (test_invalid_replace):
- add for above.
-
-Fri Aug 1 01:01:49 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * proc.c (rb_proc_call_with_block): reduce comparison.
-
-Thu Jul 31 22:17:35 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * ext/bigdecimal/bigdecimal.c (VpMult): prevent memory leak.
-
-Thu Jul 31 20:05:56 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * test/ruby/test_transcode.rb (test_unicode_public_review_issue_121):
- fix option1 and 3.
-
-Thu Jul 31 19:54:57 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * transcode.c (get_replacement_character): use U+FFFD as replacement
- character when convert to Unicode.
-
- * test/ruby/test_transcode.rb (test_unicode_public_review_issue_121):
- rename from test_public_review_issue_121.
-
- * test/ruby/test_transcode.rb (test_unicode_public_review_issue_121):
- enable option2.
-
-Thu Jul 31 17:00:10 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * transcode.c (get_replacement_character): fix: invalid byte sequence
- is always replaced "\x00?".
-
-Thu Jul 31 16:37:03 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * test/rubygems/test_gem_ext_configure_builder.rb
- (test_self_build_fail): remove extra newline. [ruby-dev:35704]
-
-Thu Jul 31 15:11:11 2008 Martin Duerst <duerst@it.aoyama.ac.jp>
-
- * test/ruby/test_transcode.rb: added test_shift_jis
- (contributed by Yoshihiro Kambayashi) and
- test_public_review_issue_121
- (see http://www.unicode.org/review/pr-121.html)
-
-Thu Jul 31 13:18:30 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * include/ruby/ruby.h (struct RString): size of ary must be
- RSTRING_EMBED_LEN_MAX + 1.
-
-Thu Jul 31 12:23:53 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * pack.c (pack_unpack): upper half of hexdigits has never been used.
-
-Thu Jul 31 11:31:29 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/syck/syck.h (ASSERT): fix typo at r18176.
-
- * ext/syck/rubyext.c (rb_syck_compile): expression in ASSERT() has no
- effect unless debug mode.
-
-Thu Jul 31 10:51:39 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * iseq.c (ruby_iseq_disasm_insn): suppress warnings on platforms which
- int size differs from pointer size.
-
- * ext/openssl/ossl_asn1.c (ossl_asn1_get_asn1type): ditto
-
- * ext/syck/rubyext.c (rb_syck_err_handler),
- (syck_default_error_handler): ditto.
-
-Thu Jul 31 02:21:39 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * ext/syck/rubyext.c (rb_syck_compile): remove meaningless branch
- that misleads into thinking that the variable sav may be
- uninitialized.
-
-Thu Jul 31 01:25:43 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread.c (rb_mutex_unlock_all): mutex is no longer a ruby object.
-
-Thu Jul 31 01:18:07 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * parse.y (magic_comment_encoding): remove meaningless null check.
-
-Thu Jul 31 01:09:28 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * ext/bigdecimal/bigdecimal.c (VpIsRoundMode): fix tautology
- condition.
-
-Thu Jul 31 00:58:33 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * pack.c (pack_unpack): reduced static variables.
-
-Thu Jul 31 00:10:20 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * proc.c (rb_proc_call_with_block): prevent null reference.
-
-Wed Jul 30 22:19:13 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * parse.y (vtable_free): remove meaningless null check.
-
-Wed Jul 30 22:08:25 2008 Tanaka Akira <akr@fsij.org>
-
- * dir.c (struct dir_data): change path field char * to VALUE.
- (mark_dir): new function for mark path field.
- (free_dir): follow the path field change.
- (dir_s_alloc): ditto.
- (dir_initialize): ditto.
- (dir_s_open): ditto.
- (dir_inspect): ditto.
- (dir_path): return (duplicate of) the path field to preserve
- encoding. [ruby-dev:35685]
-
-Wed Jul 30 22:06:56 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * string.c (sym_inspect): remove dead code.
-
-Wed Jul 30 21:32:52 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * ChangeLog: fix wrong method name and add reference.
-
-Wed Jul 30 21:30:08 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * regparse.c (name_add): fix memory leak.
-
-Wed Jul 30 21:08:06 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * ext/syck/syck.c (syck_free_parser): fix memory leak by
- YAML::Syck.compile.
-
- * regparse.c (parse_exp): fix memory leak at Regexp.new("x{1,1}").
-
-Wed Jul 30 17:48:15 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/win32.c (rb_w32_select): recalc the rest of timeout for each
- iterations. [ruby-core:18015]
-
-Tue Jul 29 23:37:37 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * io.c (io_ungetc): raise NotImplementedError when ungetc is called
- against dummy encoding IO. [ruby-dev:35686]
-
- * io.c (rb_io_getline_1): ditto when gets with delimiter is called.
-
- * io.c (io_getc): ditto when getc is called.
-
- * test/ruby/test_io_m17n.rb (test_terminator_stateful_conversion,
- test_getc_stateful_conversion, test_ungetc_stateful_conversion):
- these tests should raise NotImplementedError.
-
-Tue Jul 29 22:55:34 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_io.rb (pipe): run reader thread and writer thread.
-
-Tue Jul 29 21:38:08 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * ext/bigdecimal/bigdecimal.c (Init_bigdecimal): fix typo.
-
-Tue Jul 29 21:35:59 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/etc/test_etc.rb (test_passwd): age field may be string under
- some environments.
-
-Tue Jul 29 17:54:35 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * dir.c (char_casecmp): fix: return 0 if either of characters is NUL.
-
-Tue Jul 29 13:17:03 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * test/etc/test_etc.rb (test_getpwuid): fix for users whose uid is
- shared.
-
-Tue Jul 29 05:37:53 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (rb_find_file_ext, rb_find_file): explicit relative path
- which starts with "./" or "../" should be searched from cwd
- instead of load path. [ruby-dev:35673]
-
-Tue Jul 29 02:39:46 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * math.c (math_atanh): raise EDOM on FreeBSD when atanh(1).
-
- * math.c (math_log): ditto.
-
- * math.c (math_log2): ditto.
-
- * math.c (math_log10): ditto.
-
- * test/ruby/test_math.rb: test for above.
-
-Tue Jul 29 01:41:15 2008 Tanaka Akira <akr@fsij.org>
-
- * dir.c (struct dir_data): intenc field removed.
- (dir_s_alloc): intenc initialization removed.
- (dir_initialize): :internal_encoding option removed. dirname code
- conversion removed.
- (dir_enc_str): code conversion removed.
- [ruby-dev:35661]
-
-Mon Jul 28 21:32:17 2008 Kouhei Sutou <kou@cozmixng.org>
-
- * test/rss/: use PNG instead of zlib as binary data.
-
-Mon Jul 28 21:24:33 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * thread_win32.[ch] (cond_every_entry, rb_thread_cond_struct): reverted
- r18239 because r18245 made the changes unnecessary.
-
- * thread.c (rb_mutex_struct): define after including thread_{pthread,
- win32}.c.
-
-Mon Jul 28 21:00:10 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_require.rb (test_require_too_long_filename):
- Kernel#require does not use dln_find_file_r (at r18242).
-
-Mon Jul 28 20:17:03 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * vm_core.h: move the definition of struct rb_mutex_struct.
-
- * thread.c: ditto.
-
-Mon Jul 28 18:58:46 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * thread.c (mutex_unlock): fix typo.
-
-Mon Jul 28 18:15:45 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (rb_find_file_ext, rb_find_file): not to split load path with
- path separator. [ruby-Bugs-21356]
-
-Mon Jul 28 18:14:03 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/win32.c (overlapped_socket_io, fcntl, rb_w32_close): must not
- pass a pointer to int which is smaller than st_data_t on mswin64.
-
-Mon Jul 28 16:49:47 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/win32.c (CreateChild, overlapped_socket_io): suppress
- warnings.
-
-Mon Jul 28 16:06:36 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (MAXPATHLEN): define before use.
-
-Mon Jul 28 16:01:12 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * thread_win32.[ch] (cond_every_entry, rb_thread_cond_struct): moved
- the definitions from .c to .h because rb_thread_cond_struct is used
- in vm_core.h.
-
-Mon Jul 28 14:29:54 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * dln.c (load_lib): use dln_find_file_r instead of dln_find_file.
-
-Mon Jul 28 00:18:47 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * vm_core.h, thread.c: It is now prohibited to use Data_Get_Struct in
- *_free against an object that is going to be free'ed. So, change type
- of thread_t#keeping_mutexes from VALUE to mutex_t.
-
- * vm.c: remove mark to keeping_mutexes.
-
-Sun Jul 27 23:32:42 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/openssl/test_ssl.rb (server_loop): rescue Errno::EINVAL and
- Errno::ECONNABORTED.
-
-Sun Jul 27 22:11:57 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * bootstraptests/method.rb: increase RLIMIT_STACK size to 4M+8Kbytes
- because FreeBSD fails this less than that.
-
-Sun Jul 27 21:45:59 2008 Koichi Sasada <ko1@atdot.net>
-
- * gc.c (gc_mark_children, obj_free): T_DEFERRED should not be appear.
-
- * gc.c (gc_sweep, finalize_list): fix to decrement heap_slot#limit
- after executing finalizer.
-
-Sun Jul 27 14:48:37 2008 Koichi Sasada <ko1@atdot.net>
-
- * include/ruby/ruby.h: add a type T_DEFERRED.
-
- * gc.c: fix deferred finalizer system. finalize processes of
- T_DATA and T_FILE are executed after gc process.
- And fix to use BUILTIN_TYPE() instead of seeing flag.
-
- * thread.c, vm_core.h: add RUBY_VM_SET_FINALIZER_INTERRUPT()
- and check interrupt_flag at rb_thread_execute_interrupts().
-
- * thread.c (mutex_mark): fix to mark next_mutex.
-
- * vm.c (rb_thread_mark): fix to mark keeping_mutexes.
-
-Sun Jul 27 09:15:28 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * dln.h (dln_find_exe, dln_find_file): deprecated, use reentrant
- versions instead.
-
-Sun Jul 27 09:02:32 2008 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-
- * lib/rinda/tuplespace.rb: merged from 1.8.
-
- * test/rinda/test_rinda.rb: merged from 1.8.
-
-Sat Jul 26 22:45:18 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * sample/exyacc.rb: fixed NoMethodError(Kernel#sub!).
- replaced use of special variables with explicit IO
- operations.
-
-Sat Jul 26 21:17:18 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (Init_win32ole): add
- WIN32OLE_EVENT#handler=, WIN32OLE_EVENT#handler
-
- * test/win32ole/test_win32ole_event.rb: ditto.
-
-Sat Jul 26 07:44:14 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (add_event_call_back): remove unused
- variable.
-
-Fri Jul 25 23:48:10 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * gc.c (gc_sweep, obj_free, run_final): defer finalizers of IO and
- Data. [ruby-dev:35578]
-
-Fri Jul 25 23:35:18 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/webrick/httputils.rb (WEBrick::HTTPUtils#split_header_value):
- reduce backtrack. based on a fix by Christian Neukirchen
- <chneukirchen AT gmail.com>.
-
-Fri Jul 25 21:55:38 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/enc/test_koi8.rb: move from test/ruby/test_koi8.rb.
-
-Fri Jul 25 21:09:32 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (ole_invoke, add_event_callback,
- rescue_callback): refactoring.
-
-Fri Jul 25 20:52:44 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * test/win32ole/err_in_callback.rb: add test of raising
- exception in WIN32OLE_EVENT callback.
-
- * test/win32ole/test_err_in_callback.rb: ditto.
-
-Fri Jul 25 20:43:57 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (Init_win32ole): add
- WIN32OLE_EVENT#off_event.
-
- * test/win32ole/test_win32ole_event.rb: ditto.
-
- * test/win32ole/test_win32ole_event.rb: some refactoring.
-
-Fri Jul 25 19:50:49 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * regint.c (xmalloc, xrealloc, xfree): not to use ruby managed memory.
-
-Fri Jul 25 15:52:40 2008 Koichi Sasada <ko1@atdot.net>
-
- * vm.c (vm_invoke_proc): skip setting safe_level if
- it from bmethod. This change makes test/ruby/test_proc.rb pass.
-
-Fri Jul 25 10:00:00 2008 Martin Duerst <duerst@it.aoyama.ac.jp>
-
- * test/ruby/test_transcode.rb: refactoring/cleanup of
- test_iso_2022_jp(_1)
-
-Fri Jul 25 04:12:57 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/nkf/nkf.c (rb_nkf_convert): output of mime encode is US-ASCII.
- [ruby-list:45257]
-
-Fri Jul 25 02:43:11 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * sample/coverage.rb: move from lib/coverage.rb because this remains in
- an early phase of development.
-
-Fri Jul 25 00:10:23 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (rb_find_file_ext, rb_find_file): converts Windows style path
- to Cygwin path. [ruby-dev:35647]
-
-Thu Jul 24 16:30:21 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (exit_handler): use st_free_table() to free socklist.
-
- * win32/win32.c (rb_w32_pipe_exec, rb_w32_accept, rb_w32_socket,
- rb_w32_socketpair): should check and release fd and sockets/handles
- if an error occurs in rb_w32_open_osfhandle().
-
-Thu Jul 24 16:05:02 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (overlapped_socket_io): avoid warnings.
-
- * thread_win32.c (ubf_handle): refactoring.
-
-Thu Jul 24 07:01:13 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/win32ole/win32ole.c: got rid of improper casts.
-
-Wed Jul 23 23:19:15 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/socket/test_tcp.rb (test_recvfrom): replace an irrelevant test
- for old behavior.
-
-Wed Jul 23 21:38:16 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_marshal.rb: suppress warning during test.
-
-Wed Jul 23 21:35:53 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_dir.rb: suppress warning during test.
-
-Wed Jul 23 18:27:46 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/tk/{stubs,tcltklib}.c, ext/tk/tkutil/tkutil.c: fix warnings
- about constness and signedness.
-
-Wed Jul 23 17:04:22 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/openssl/openssl_missing.h (d2i_of_void): define for older
- versions. [ruby-dev:35637]
-
-Wed Jul 23 13:53:36 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/curses/extconf.rb: use try_static_assert.
-
-Wed Jul 23 10:06:19 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * test/zlib/test_zlib.rb (TestZlibDeflate#test_params): suppress a
- finalizer warning.
-
-Wed Jul 23 06:25:42 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/syck: suppress warnings more.
-
-Wed Jul 23 03:19:31 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/nkf/nkf-utf8/nkf.c (struct input_code.name, input_codename):
- constified.
-
-Wed Jul 23 03:02:08 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/syck: suppress warnings.
-
-Wed Jul 23 00:34:20 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/openssl: suppress warnings.
-
-Tue Jul 22 23:01:34 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * ext/syck/rubyext.c, ext/syck/yaml2byte.c, ext/syck/emitter.c,
- ext/syck/syck.c, ext/syck/handler.c, ext/syck/syck.h: suppress GCC
- warning.
-
-Tue Jul 22 20:42:24 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * ext/bigdecimal/bigdecimal.c (BigDecimalCmp): BigDecimal#<=> should
- return nil if an argument can't be coerced into BigDecimal.
-
- * ext/bigdecimal/bigdecimal.h, ext/bigdecimal/bigdecimal.c
- (VpIsNegDoubleZero, VpItoV): comment out unused functions.
-
-Tue Jul 22 20:33:54 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/rdoc/test_rdoc_parser_ruby.rb (teardown): close tempfile.
-
-Tue Jul 22 19:38:38 2008 Martin Duerst <duerst@it.aoyama.ac.jp>
-
- * test/ruby/test_transcode.rb: added two comments
-
-Tue Jul 22 18:08:34 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * README.EXT, README.EXT.ja: mention about FIX2LONG and NUM2LONG.
- see [ruby-dev:35197]
-
-Tue Jul 22 17:53:32 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * compile.c (insn_data_to_s_detail), file.c (rb_stat_inspect),
- iseq.c (ruby_iseq_disasm_insn, ruby_iseq_disasm),
- process.c (pst_message), re.c (match_inspect): use rb_str_catf.
-
- * dir.c (dir_inspect), iseq.c (iseq_inspect, insn_operand_intern): use
- rb_sprintf.
-
- * error.c (rb_name_error, rb_raise, rb_loaderror, rb_fatal): use
- rb_vsprintf.
-
-Tue Jul 22 17:20:25 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (init_func): new function to get API's address which
- is often used and not supported on all Windows.
-
- * win32/win32.c (overlapped_socket_io): shouldn't use overlapped I/O if
- CancelIo() is not supported.
-
-Tue Jul 22 16:47:57 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/intern.h, sprintf.c (rb_str_catf, rb_str_vcatf): new
- functions. [ruby-dev:35597]
-
- * string.c (rb_str_capacity): new function to return the capacity.
-
-Tue Jul 22 16:08:58 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/socket/socket.c (connect_blocking, socks_connect_blocking,
- ruby_connect): cast.
-
-Tue Jul 22 11:05:08 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * test/ruby/test_dir.rb: use realpath of tmpdir. [ruby-dev:35481]
-
- * test/ruby/test_process.rb: ditto.
-
-Tue Jul 22 09:51:32 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * misc/ruby-mode.el: fix here-doc strings with inner quotes. patches
- by Nathan Weizenbaum <nex342 AT gmail.com> from [ruby-core:17615]
- through [ruby-core:17910].
-
-Tue Jul 22 04:26:16 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/intern.h (rb_str_buf_new2): optimization for literals.
-
- * string.c (str_buf_cat): returns VALUE.
-
-Tue Jul 22 03:34:01 2008 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc*: Update to RDoc 2.1.0 r112.
-
-Tue Jul 22 02:51:46 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/intern.h (rb_str_buf_cat2, rb_str_cat2): optimization
- for literals.
-
-Tue Jul 22 02:50:47 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * README.EXT, README.EXT.ja (1.5 Manipulating Ruby data): fix the
- prototype of rb_vsprintf, and added rb_str_cat2. [ruby-dev:35622]
-
-Mon Jul 21 17:15:38 2008 Tanaka Akira <akr@fsij.org>
-
- * encoding.c (rb_filesystem_encoding): use locale encoding on Unix.
- [ruby-dev:35617]
-
-Mon Jul 21 15:29:32 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * missing/vsnprintf.c (struct __sbuf, FILE): use size_t.
-
- * sprintf.c (ruby__sfvwrite): ditto.
-
-Mon Jul 21 13:55:37 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * README.EXT, README.EXT.ja (1.5 Manipulating Ruby data): mentioned
- rb_sprintf and rb_vsprintf. [ruby-dev:35611]
-
-Mon Jul 21 10:25:52 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (prepare_getline_args): check if rs is a string when non-nil
- lim is given. [ruby-dev:35610]
-
-Mon Jul 21 04:55:20 2008 Tanaka Akira <akr@fsij.org>
-
- * dir.c (dir_initialize): use rb_convert_type instead of
- rb_check_convert_type to prevent SEGV by Dir.new(".", true).
- (dir_initialize): use FilePathValue before rb_enc_get(dirname) to
- prevent SEGV by Dir.new(0).
-
-Mon Jul 21 04:42:15 2008 Tanaka Akira <akr@fsij.org>
-
- * re.c (rb_reg_s_union): useless rb_enc_get call removed to prevent
- SEGV by Regexp.union("", nil).
-
-Sun Jul 20 22:50:11 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * compile.c (iseq_compile_each): NODE_POSTEXE should set each end
- procs only once. [ruby-dev:35596]
-
-Sun Jul 20 16:00:37 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (EVENTSINK_Invoke): use rb_protect
- instead of rb_rescue2. [ruby-dev:35595]
-
-Sun Jul 20 01:23:24 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (EVENTSINK_Invoke): little refactoring.
-
- * ext/win32ole/win32ole.c (EVENTSINK_GetIDsOfNames): return
- ITypeInfo::GetIDsOfNames().
-
-Sat Jul 19 09:31:35 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (EVENTSINK_Invoke): little refactoring.
-
- * ext/win32ole/win32ole.c: add document of inspect methods.
-
-Sat Jul 19 06:08:43 2008 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc*: Import RDoc r104. Various make test-all fixes.
-
-Sat Jul 19 00:27:58 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * numeric.c (check_uint, rb_num2uint, rb_fix2uint): fixed wrong check
- about 64bit positive value.
-
-Fri Jul 18 23:23:37 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (EVENTSINK_Invoke): avoid cfp consistency
- error when exception raised in event callback.
-
-Fri Jul 18 14:52:14 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (socklist): table for registering socket options
- (currently only O_NONBLOCK).
-
- * win32/win32.c (StartSockets, exit_handler): alloc/free socklist.
-
- * win32/win32.c (is_socket): use socklist.
-
- * win32/win32.c (rb_w32_accept, rb_w32_socket, rb_w32_socketpair):
- register new socket to socklist.
-
- * win32/win32.c (rb_w32_close): remove closing socket from socklist.
-
- * win32/win32.c (fcntl): register socket options.
-
- * win32/win32.c (overlapped_socket_io): send to/recv from socket with
- overlapped operation if the socket is not nonblocking mode.
- [experimental]
-
- * win32/win32.c (rb_w32_send, rb_w32_sendto, rb_w32_recv,
- rb_w32_recvfrom): use overlapped_socket_io().
-
- * win32/win32.c (open_ifs_socket): set overlapped mode. this is the
- default mode of winsock's socket(), so lacking it is an old bug.
-
-Fri Jul 18 09:44:30 2008 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc/*: Import RDoc r101.
-
-Thu Jul 17 23:45:55 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/rdoc/test_rdoc_c_parser.rb (teardown): close tempfile.
-
-Thu Jul 17 21:08:49 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_process.rb (test_getpriority, test_setpriority): use
- PRIO_PROCESS instead of PRIO_USER.
-
-Thu Jul 17 20:41:42 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * pack.c (pack_unpack): fix v and V with big endian.
- [1].pack("V").unpack("V") was [4294967296].
-
-Thu Jul 17 20:35:03 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * pack.c (pack_pack): fix i! with big endian. [1].pack("i!") was
- "\0\0\0\0".
-
-Thu Jul 17 16:48:40 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/socket/socket.c (ruby_connect): select() for connect() has
- mean only when the socket is non-blocking.
-
-Thu Jul 17 10:55:24 2008 Eric Hodel <drbrain@segment7.net>
-
- * mkconfig.rb: Simplify expression for RDoc.
-
-Thu Jul 17 10:21:15 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * numeric.c (check_uint, rb_num2uint, rb_fix2uint): strict check.
- fixed [ruby-dev:33683]
-
-Thu Jul 17 04:19:33 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread.c (thread_start_func_2): wake up joining threads.
-
- * thread.c (sleep_forever, sleep_timeval): return when interrupted.
- [ruby-dev:35542]
-
- * thread.c (timer_thread_function): restore main thread status.
- [ruby-core:17270]
-
-Thu Jul 17 01:27:38 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * io.c (appendline): remove invalid access.
-
-Wed Jul 16 18:04:34 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * signal.c (signal_exec, trap_handler): trap accepts a string as
- command. [ruby-dev:35533]
-
-Wed Jul 16 00:04:30 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/envutil.rb (Test::Unit::Assertions#assert_in_out_err): new
- method.
-
- * test/ruby/test_argf.rb: use assert_in_out_err instead of
- EnvUtil.rubyexec.
-
- * test/ruby/test_module.rb: ditto.
-
- * test/ruby/test_require.rb: ditto.
-
- * test/ruby/test_objectspace.rb: ditto.
-
- * test/ruby/test_object.rb: ditto.
-
- * test/ruby/test_string.rb: ditto.
-
- * test/ruby/test_method.rb: ditto.
-
- * test/ruby/test_variable.rb: ditto.
-
- * test/ruby/test_io.rb: ditto.
-
- * test/ruby/test_rubyoptions.rb: ditto.
-
- * test/ruby/test_exception.rb: ditto.
-
- * test/ruby/test_class.rb: ditto.
-
- * test/ruby/test_thread.rb: ditto.
-
-Tue Jul 15 22:34:03 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/Makefile.sub (ruby_version): follow changes in configure.in.
-
-Tue Jul 15 21:58:20 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/tk/{,tkutil/}extconf.rb: ruby/ruby.h no longer needs to be
- checked.
-
- * ext/tk/{tcltklib.c,tkutil/tkutil.c}: check macros for each headers.
-
-Tue Jul 15 21:45:41 2008 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/tk/extconf.rb, ext/tk/tcltklib.c, ext/tk/tkutil/tkutil.c: Do
- not test ruby/ruby.h, which makes OS X's gcc pick the wrong
- header file from Ruby.framework.
-
-Tue Jul 15 21:31:26 2008 Akinori MUSHA <knu@iDaemons.org>
-
- * configure.in (--with-ruby-version): Add a new option to specify
- the ruby version string for version specific directories.
- [ruby-dev:35490]
-
- * mkconfig.rb: Definition of ruby_version is now determined by the
- configure script.
-
-Tue Jul 15 18:14:20 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/socket/socket.c (ruby_connect, s_accept): check before readable/
- writable by select() instead of wrapping in blocking region.
-
- * ext/socket/socket.c (bsock_send, s_recvfrom, udp_send, unix_send_io,
- unix_recv_io): should check readable/writable before calling blocking
- functions.
- see [ruby-dev:35446]
-
-Tue Jul 15 18:12:02 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * thread_win32.c (ubf_handle): cancel blocking IO if it can (only
- Vista). see [ruby-dev:35446]
-
- * win32/win32.c (errmap): add ERROR_OPERATION_ABORTED as EINTR.
-
-Mon Jul 14 20:35:21 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * test/win32ole/test_win32ole_event.rb (teardown): fix typo.
-
-Mon Jul 14 18:47:30 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * transcode.c (transcode_loop): constified.
-
- * transcode.c (str_transcode): rb_str_set_len() sets a delimiter.
-
- * transcode_data.h (rb_transcoder): constified preprocessor and
- postprocessor input.
-
- * enc/trans/japanese.c: ditto.
-
-Sun Jul 13 05:37:50 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * include/ruby/ruby.h (PRI_PTRDIFF_PREFIX, PRI_SIZE_PREFIX): typo.
-
- * {bcc32,win32}/Makefile.sub: (SIZEOF_SIZE_T, SIZEOF_PTRDIFF_T): added.
-
-Sat Jul 12 23:54:55 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/Makefile.sub (LIBRUBY_DLDFLAGS): import library which created
- with DLL is broken. save import library which created by lib.exe and
- install it.
- fixed the problem mentioned at the postscript of [ruby-dev:35448]
-
-Sat Jul 12 23:24:21 2008 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/socket.c: use PRIuSIZE.
-
-Sat Jul 12 22:41:39 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/ruby.h (PRI_PTRDIFF_PREFIX, PRI_SIZE_PREFIX): fixed typo.
-
-Sat Jul 12 22:30:43 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/intern.h (HAVE_RUBY_RUBY_H): defines macros so that
- extconf.rb do not need to check if headers exist under separated
- directory. [ruby-dev:35437]
-
- * include/{ruby,rubyio,rubysig}.h, include/ruby/intern.h: use
- "ruby/..." instead of <ruby/...>.
-
-Sat Jul 12 22:17:26 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (sizeof ptrdiff_t): check for size of ptrdiff_t.
-
- * include/ruby/ruby.h (PRI?PTRDIFF, PRI?SIZE): printf conversion
- specifiers for ptrdiff_t and size_t/ssize_t.
-
- * insns.def (leave), marshal.c (long_toobig), transcode.c
- (str_transcode), vm_dump.c (control_frame_dump, stack_dump_each),
- (debug_print_register, debug_print_pre): t and z length modifiers
- are C99.
-
-Sat Jul 12 16:02:31 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/xmlrpc/client.rb (XMLRPC::Client#do_rpc): requires
- webrick/cookie. [ ruby-Bugs-21139 ]
-
-Sat Jul 12 09:25:07 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * test/win32ole/test_win32ole_event.rb: add test
- for WIN32OLE_EVENT#on_event_with_outargs
-
- * test/win32ole/test_win32ole_event.rb(teardown): calling
- WIN32OLE_EVENT.message_loop
-
-Sat Jul 12 01:54:13 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (rb_w32_select): shouldn't pass non-socket handle to
- original select().
-
-Fri Jul 11 23:05:40 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/zlib/test_zlib.rb: add a test for Zlib::Deflate#params.
-
-Fri Jul 11 22:58:28 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * ext/zlib/zlib.c (rb_deflate_params): flush before deflateParams.
- [ruby-core:17675]
-
-Fri Jul 11 22:09:01 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/setup.rb, win32/Makefile.sub (PLATFORM): use $(PLATFORM)
- instead of $(OS) because ENV["OS"] is used in test-all (drb).
-
-Fri Jul 11 20:51:36 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (rb_io_wait_readable, rb_io_wait_writable): check if the file
- descriptor is closed.
-
- * thread.c (rb_thread_wait_fd_rw): ditto.
-
-Fri Jul 11 16:16:43 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (rb_w32_accept, rb_w32_socket, rb_w32_socketpair):
- prohibit inheritance of sockets, too. [experimental]
-
-Fri Jul 11 14:39:49 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (CreateChild): the measures for Vista is no longer
- unnecessary.
-
-Fri Jul 11 06:16:26 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (process.o): depends on util.h.
-
-Fri Jul 11 05:07:46 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * include/ruby/win32.h (pipe): prohibit inheritance.
- fixed: [ruby-dev:35421]
-
-Fri Jul 11 00:56:46 2008 Koichi Sasada <ko1@atdot.net>
-
- * thread.c (thread_create_core): fix GC problem.
- [ruby-core:17669]
-
-Thu Jul 10 22:06:00 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/pstore.rb (PStore#transaction): return the result from the
- block. [ruby-core:17718]
-
-Thu Jul 10 21:15:49 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * test/win32ole/test_win32ole_typelib.rb: add some illegal argument
- test.
-
- * test/win32ole/test_win32ole_type.rb: ditto.
-
- * test/win32ole/test_win32ole_event.rb: ditto.
-
- * test/win32ole/test_win32ole_param.rb: ditto.
-
- * test/win32ole/test_win32ole_method.rb: ditto.
-
-Thu Jul 10 19:38:35 2008 wanabe <s.wanabe@gmail.com>
-
- * test/ruby/envutil.rb (assert_normal_exit): r17993 revert.
-
-Thu Jul 10 18:29:41 2008 wanabe <s.wanabe@gmail.com>
-
- * test/ruby/envutil.rb (assert_normal_exit): finish writing script
- before spawn("ruby") to avoid blocking in win32.
-
-Thu Jul 10 17:20:50 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (insert): follow recent changes of globbing.
-
-Thu Jul 10 14:09:05 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/coverage/coverage.c (rb_coverage_start): return nil.
-
-Thu Jul 10 12:41:56 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread.c (rb_thread_wait_for): fixed variable name.
-
-Thu Jul 10 12:09:58 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm_core.h (rb_thread_t), vm.c (rb_thread_mark), process.c
- (rb_last_status_get, rb_last_status_set, rb_last_status_clear):
- moved last_status from rb_vm_t. [ruby-dev:35414]
-
- * vm.c (th_init2): initialize last_status with nil.
-
-Thu Jul 10 12:09:21 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread.c (rb_thread_wait_for): wait until timed out only when
- sleeping with timeout.
-
-Wed Jul 9 22:41:16 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread.c (sleep_timeval): wait until timed out. [ruby-core:17270]
-
-Wed Jul 9 20:58:16 2008 Tanaka Akira <akr@fsij.org>
-
- * array.c (rb_ary_fill): don't raise even if length is negative.
- [ruby-core:17483], [ruby-core:17661]
-
-Wed Jul 9 20:18:50 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (rb_cv_va_args_macro): check for __VA_ARGS__.
-
- * thread.c (thread_debug): show source name and line if possible.
-
- * thread_{pthread,win32}.c (rb_thread_create_timer_thread): needs more
- stack for debug.
-
-Wed Jul 9 11:13:39 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/profiler.rb (Profiler__#print_profile): sort in the descending
- order of cumulative time.
-
-Wed Jul 9 11:11:18 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * dir.c (struct glob_args, rb_glob_caller, rb_glob2, push_pattern),
- (glob_brace): make consistent prototypes.
-
- * dir.c (push_glob): set enc in the caller of rb_glob_caller as well
- as rb_glob2.
-
-Wed Jul 9 09:12:11 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/nkf/nkf-utf8/nkf.c (options): use input_endian.
-
-Wed Jul 9 01:38:37 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_str_succ): alphabets or numerics mutually enclosing
- non-alphanumeric characters can carry up. e.g., "1.999".succ should
- be "2.000".
-
-Wed Jul 9 00:12:31 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * thread.c (rb_set_coverages, rb_reset_coverages): enable and disable
- coverage measurement.
-
- * thread.c (rb_get_coverages): rename and move from vm.c.
-
- * vm.c (rb_vm_get_coverages): ditto.
-
- * iseq.c (prepare_iseq_build): ditto.
-
- * thread.c (clear_coverage): ditto.
-
- * parse.y (coverage): ditto.
-
- * ext/coverage/coverage.c: use above functions, add new method
- Coverage.start and fix rdoc .
-
-Tue Jul 8 23:02:35 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (find_default_source): bug fix when
- OLE object does not have default source interface.
-
- * test/win32ole/test_win32ole_event.rb: ditto.
-
-Tue Jul 8 22:56:23 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * thread.c (rb_enable_coverages): hide coverage array by setting 0 to
- klass during measurement.
-
- * parse.y (coverage, yycompile0): ditto.
-
- * iseq.c (prepare_iseq_build): use rb_hash_lookup instead of
- rb_hash_aref.
-
- * thread.c (rb_coverage_result): restore klass of coverage array
- and return it.
-
- * thread.c (update_coverage): check whether its klass is 0.
-
-Tue Jul 8 22:28:25 2008 Koichi Sasada <ko1@atdot.net>
-
- * lib/debug.rb, lib/profile.rb: fix to use RubyVM.
-
- * lib/rdoc/parsers/parse_c.rb: ditto.
-
-Tue Jul 8 21:45:22 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * vm.c (rb_vm_mark): mark the last element of special_exceptions.
-
-Tue Jul 8 19:55:40 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (find_default_source): try to
- find COCLASS when WIN32OLE object is not COCLASS.
-
- * test/win32ole/test_win32ole_event.rb: ditto
-
-Tue Jul 8 13:38:22 2008 Koichi Sasada <ko1@atdot.net>
-
- * compile.h: fix to skip inserting a trace insn.
-
-Tue Jul 8 11:41:17 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * dir.c: shouldn't use ruby object in globbing, because glob service
- routines are called before initializing ruby on some platforms (ex.
- windows).
-
-Tue Jul 8 10:08:40 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * dir.c (Next): use rb_enc_mbclen. [ruby-dev:35390]
-
-Tue Jul 8 07:59:40 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * dir.c (Next): use rb_enc_precise_mbclen.
-
-Tue Jul 8 02:27:23 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * dir.c: preserve encoding of strings in glob and fnmatch.
-
- * include/ruby/ruby.h: related changes.
-
-Tue Jul 8 00:22:58 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_str_succ): limit carrying in an alphanumeric region if
- exists. [ruby-dev:35094]
-
-Mon Jul 7 20:39:28 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c(Init_win32ole): add
- WIN32OLE_TYPE#source_ole_types, WIN32OLE_TYPE#default_ole_types,
- WIN32OLE_TYPE#default_event_sources.
-
- * test/win32ole/test_win32ole_type.rb: ditto.
-
-Mon Jul 7 19:45:22 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * test/ruby/test_dir.rb (test_chroot_nodir): add Errno::EPERM.
-
-Mon Jul 7 17:12:20 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/ipaddr.rb (IPAddr#initialize): get rid of ArgumentError in
- IPAddr#to_range. a patch from okkez <okkez000 AT gmail.com> in
- [ruby-dev:35091].
-
-Mon Jul 7 01:24:43 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (rb_file_s_extname): fix for file name with spaces.
- [ruby-talk:307404]
-
-Mon Jul 7 00:59:37 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread_pthread.c (ruby_init_stack): prior STACK_END_ADDRESS if
- found. [ruby-core:17624]
-
-Sun Jul 6 23:48:06 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/socket/socket.c (bsock_send, s_recvfrom, ruby_connect, s_accept),
- (udp_send, unix_send_io, unix_recv_io): blocking region support.
-
-Sun Jul 6 18:34:35 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * test/win32ole/test_win32ole_type.rb (test_initialize): add
- more assertions.
-
-Sun Jul 6 10:12:21 2008 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/test/unit/collector/objectspace.rb
- (Test::Unit::Collector::ObjectSpace::NAME): fix a typo.
-
-Sun Jul 6 00:56:51 2008 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/socket.c (host_str): fix type mismatch in rb_raise
- format and argument.
- (port_str): ditto.
- (unix_recv_io): ditto.
- (sock_s_unpack_sockaddr_un): ditto.
-
-Sat Jul 5 23:42:23 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/ruby.h (NUM2INT): cast to int.
- (FIX2INT): ditto.
- (NUM2UINT): cast to unsigned int.
- (FIX2UINT): ditto.
-
-Sat Jul 5 23:10:41 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (rb_pipe): new function for handling EMFILE and ENFILE
- error of pipe().
- (UPDATE_MAXFD_PIPE): removed.
- (pipe_open): use rb_pipe.
- (rb_io_s_pipe): ditto.
-
- * process.c (pipe_nocrash): use rb_pipe.
-
- * include/ruby/intern.h (rb_pipe): declared.
-
-Sat Jul 5 22:22:27 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread.c (thread_initialize): NUM2INT() returns int.
-
- * thread.c (timer_thread_function), thread_pthread.c (thread_timer),
- thread_win32.c (timer_thread_func), thread_{pthread,win32}.c
- (rb_thread_create_timer_thread): passing VM.
-
-Sat Jul 5 20:53:18 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * test/win32ole/test_word.rb: check word installed.
-
-Sat Jul 5 16:12:54 2008 Narihiro Nakamura <authorNari@gmail.com>
-
- * gc.c: revert. before lazy sweep.
-
-Sat Jul 5 09:55:44 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c: add WIN32OLE#ole_respond_to?
-
- * test/win32ole/test_win32ole.rb: ditto.
-
-Sat Jul 5 08:48:05 2008 Tanaka Akira <akr@fsij.org>
-
- * re.c (unescape_nonascii): add has_property argument not to
- raise error by /\p{Hiragana}\u{3042}/ in EUC-JP script.
- (rb_reg_preprocess): use has_property argument to make regexp
- encoding fixed.
-
-Sat Jul 5 08:29:47 2008 Tanaka Akira <akr@fsij.org>
-
- * re.c (unescape_nonascii): make regexp fixed_encoding if \p is used.
- fixed [ruby-core:17279].
-
-Fri Jul 4 23:12:53 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (d2time): fix the bug of VT_DATE
- to String conversion when negative value.
-
- * test/win32ole/test_win32ole_variant.rb: ditto.
-
-Fri Jul 4 22:15:29 2008 Tanaka Akira <akr@fsij.org>
-
- * lib/test/unit/testcase.rb: collect descendants of
- Test::Unit::TestCase using inherited.
-
- * lib/test/unit/autorunner.rb: don't use ObjectSpace.each_object.
-
- * lib/test/unit/collector/dir.rb: ditto.
-
- * lib/test/unit/collector/objectspace.rb: ditto.
-
- [ruby-core:17126]
-
-Fri Jul 4 20:43:53 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/oniguruma.h (OnigEncoding): removed auxiliary_data.
-
- * include/ruby/encoding.h (ENC_DUMMY_P): moved dummy encoding flag to
- rb_encoding from Encoding instance.
-
- * encoding.c (rb_encoding_list): list of Encoding instances.
-
- * encoding.c (struct rb_encoding_entry): moved base encoding from
- instance variable.
-
-Fri Jul 4 17:51:07 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * numeric.c (check_uint, rb_num2uint, rb_fix2uint): proper check.
-
-Fri Jul 4 14:17:22 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/net/ftp.rb (Net::FTP#sendport): use divmod. [ruby-core:17557]
-
-Fri Jul 4 11:08:37 2008 Narihiro Nakamura <authorNari@gmail.com>
-
- * gc.c (garbage_collect_force): sweep is completely ended.
-
- * gc.c (os_obj_of): invoke garbage_collect_force() when freelist none.
-
-Fri Jul 4 05:01:26 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * numeric.c (rb_num2uint, rb_fix2uint): typo.
-
-Fri Jul 4 02:21:06 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * numeric.c (check_uint, rb_num2uint, rb_fix2uint): also needs checking
- negative value. see [ruby-dev:33683]
-
-Thu Jul 3 23:26:36 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * include/ruby/intern.h: remove prototypes about coverage.
-
- * iseq.c (prepare_iseq_build): add prototype.
-
- * parse.y (coverage): ditto.
-
- * thread.c (clear_coverage): ditto.
-
- * thread.c (update_coverage): use rb_sourceline.
-
- * thread.c (rb_get_coverages): rename and move to vm.c.
-
- * vm.c (rb_vm_get_coverages): ditto.
-
- * ext/coverage/coverage.c: add rdoc.
-
-Thu Jul 3 21:51:21 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * ext/coverage/coverage.c, ext/coverage/extconf.rb: eliminate
- COVERAGE__ and introduce coverage.so instead. How to measure
- coverage: (1) require "coverage.so", (2) require or load Ruby source
- file, and (3) Coverage.result will return the same hash as COVERAGE__.
- [ruby-dev:35324]
-
- * thread.c (rb_enable_coverages): start coverage measurement by using
- rb_add_event_hook.
-
- * thread.c (rb_get_coverages): returns current results of coverage
- measurement.
-
- * include/ruby/intern.h: add prototype for above two functions.
-
- * vm_core.h, vm.c: add field of coverages to rb_vm_t.
-
- * insns.def (trace): remove special handling for COVERAGE__.
-
- * iseq.c (prepare_iseq_build): switch COVERAGE__ to
- rb_get_coverages().
-
- * parse.y (coverage): ditto.
-
- * thread.c (clear_coverage): ditto.
-
- * lib/coverage.rb: use coverage.so instead of COVERAGE__.
-
-Thu Jul 3 21:20:45 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * thread.c (thread_initialize): NUM2INT returns long.
-
-Thu Jul 3 21:06:16 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (Init_eval): typo fixed in r17833.
-
-Thu Jul 3 19:44:44 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (Init_win32ole): remove duplicate line.
-
-Thu Jul 3 16:08:36 2008 Tanaka Akira <akr@fsij.org>
-
- * configure.in (erfc): erfc of glibc comes with Debian GNU/Linux Etch
- on IA64 is broken. erfc(10000.0) aborts.
- use missing/erf.c instead.
- http://sources.redhat.com/ml/libc-hacker/2005-08/msg00008.html
-
-Thu Jul 3 12:49:39 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/net/smtp.rb (Net::SMTP::start): use 'localhost' instead of
- 'localhost.localdomain'. [ruby-dev:35333]
-
- * lib/net/smtp.rb (Net::SMTP::SMTP.start): ditto.
-
-Thu Jul 3 07:06:02 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * Makefile.in (SET_LC_MESSAGES): LC_MESSAGES must be C.
-
-Thu Jul 3 07:02:55 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (Init_eval), gc.c (Init_GC), proc.c (Init_Proc): freeze
- messages of preallocated special exceptions also.
-
-Thu Jul 3 04:39:30 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * gc.c (rb_during_gc): VALUE cache is irrelevant.
-
-Thu Jul 3 01:44:01 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * regint.h (GET_ALIGNMENT_PAD_SIZE, ALIGNMENT_RIGHT): cast pointer to
- uintptr_t instead of unsigned int.
-
-Thu Jul 3 01:23:13 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * sprintf.c: include ieeefp.h to refer to isinf.
-
- * ext/bigdecimal/bigdecimal.c: ditto.
-
- * ext/json/ext/generator/generator.c: ditto.
-
- * rational.c: ditto.
-
-Thu Jul 3 01:01:57 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * missing/tgamma.c (tgamma): remove unused variable.
-
-Thu Jul 3 00:18:00 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c: avoid creating Ruby object during
- GC. thanks to arton <artonx AT yahoo.co.jp>. [ruby-dev:35313]
-
- * test/win32ole/test_win32ole_event.rb: ditto.
-
-Thu Jul 3 00:09:31 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * gc.c: add rb_during_gc(). based on a patch from arton <artonx AT
- yahoo.co.jp> at [ruby-dev:35313].
-
- * include/ruby/intern.h: ditto.
-
-Wed Jul 2 09:49:10 2008 Narihiro Nakamura <authorNari@gmail.com>
-
- * gc.c (gc_lazy_sweep): use lazy sweep algorithm for response
- performance gain.
-
- * gc.c (garbage_collect_force): mark and lazysweep invoke, after
- erasing all mark.
-
- * gc.c (GC_NOT_LAZY_SWEEP): not lazy sweep flag. for debug.
-
-Wed Jul 2 03:42:44 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_settracefunc.rb: fix expected traces for
- RubyVM::FrozenCore's event and r17744.
-
-Wed Jul 2 03:10:41 2008 Koichi Sasada <ko1@atdot.net>
-
- * compile.h, insns.def: reduce insn operand of "trace".
-
- * include/ruby/ruby.h: add RUBY_EVENT_COVERAGE event.
-
-Wed Jul 2 02:02:34 2008 Koichi Sasada <ko1@atdot.net>
-
- * proc.c, vm.c: fix to refer to next ruby level cfp to make binding.
-
-Wed Jul 2 01:58:19 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * insns.def (trace): C99ism.
-
-Wed Jul 2 01:53:40 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * Add coverage measurement constant COVERAGE__. This constant is not
- for casual use. Usage: (1) assign {} to COVERAGE__, (2) require or
- load Ruby source file, and (3) COVERAGE__["sourcefilepath"] will
- return an array whose elements represent number of executions per
- line of source code.
-
- * vm_core.h: add field of coverage array to iseq.
-
- * iseq.c (prepare_iseq_build): ditto.
-
- * insns.def (trace): update coverage array.
-
- * parse.y (coverage): create and initialize coverage array.
-
- * compile.h (ADD_TRACE): add trace instruction to update coverage
- array.
-
- * thread.c (clear_coverage): delete coverage array when forking.
- Otherwise, double count of coverage may occur.
-
- * lib/coverage.rb: sample coverage measurement tool.
-
- * error.c: distinguish explicitly between parse_in_eval and
- mild_compile_error.
-
- * load.c: ditto.
-
- * vm_eval.c: ditto.
-
-Tue Jul 1 21:32:43 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * lib/test/unit/ui/console/testrunner.rb: prevent destructive
- modification to $0.
-
- * test/rubygems/gemutilities.rb (build_rake_in): move from
- test_gem_ext_rake_builder.rb.
-
- * test/rubygems/test_gem_ext_rake_builder.rb: ditto.
-
- * test/rubygems/test_gem_installer.rb: override Gem.ruby and
- ENV["rake"].
-
- * test/rubygems/test_gem_uninstaller.rb: ditto.
-
-Tue Jul 1 21:13:17 2008 Koichi Sasada <ko1@atdot.net>
-
- * compile.c, vm.c, insns.def: call FrozenCore.set_postexe method
- instead to use "postexe" insn.
-
- * id.c, id.h: add a prepared id for above.
-
-Tue Jul 1 21:09:58 2008 URABE Shyouhei <shyouhei@ruby-lang.org>
-
- * lib/mkmf.rb (create_tmpsrc): we need to include COMMON_HEADERS,
- namely inclusion of ruby.h, because _GNU_SOURCE is now defined
- there (if any) and socket.so requires it on Linux systems.
-
-Tue Jul 1 20:55:07 2008 URABE Shyouhei <shyouhei@ruby-lang.org>
-
- * eval.c (rb_interrupt): trick to suppress GCC warning.
-
- * sprintf.c (rb_str_format): ditto.
-
-Tue Jul 1 20:44:36 2008 Koichi Sasada <ko1@atdot.net>
-
- * tool/instruction.rb: RubyVM is not module.
-
-Tue Jul 1 19:31:24 2008 URABE Shyouhei <shyouhei@ruby-lang.org>
-
- * ext/digest/digest.c (rb_digest_instance_inspect): constified.
-
- * variable.c (rb_path2class): field precision should have type int.
-
-Tue Jul 1 19:01:00 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/shift_jis.c (code_is_ctype): HALF WIDTH KATAKANA is
- a character.
-
-Tue Jul 1 17:56:34 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * missing/vsnprintf.c (BSD__uqtoa): constified.
-
-Tue Jul 1 17:50:44 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * enc/make_encdb.h: always add ';' at the end of line.
-
-Tue Jul 1 17:44:30 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * iseq.c (COMPILE_OPTION_FALSE), time.c (timegm_noleapsecond),
- thread.c (eKillSignal, eTerminateSignal),
- missing/vsnprintf.c (BSD_vfprintf): constified.
-
-Tue Jul 1 17:37:43 2008 URABE Shyouhei <shyouhei@ruby-lang.org>
-
- * enc/ascii.c: ISO C does not allow extra ';' outside of a
- function
-
- * enc/us_ascii.c: ditto.
-
- * enc/utf_8.c: ditto.
-
- * enc/big5.c: ditto.
-
- * enc/euc_jp.c: ditto.
-
- * enc/euc_kr.c: ditto.
-
- * enc/euc_tw.c: ditto.
-
- * enc/gb2312.c: ditto.
-
- * enc/gbk.c: ditto.
-
- * enc/iso_8859_1.c: ditto.
-
- * enc/iso_8859_2.c: ditto.
-
- * enc/iso_8859_3.c: ditto.
-
- * enc/iso_8859_4.c: ditto.
-
- * enc/iso_8859_5.c: ditto.
-
- * enc/iso_8859_6.c: ditto.
-
- * enc/iso_8859_7.c: ditto.
-
- * enc/iso_8859_8.c: ditto.
-
- * enc/iso_8859_9.c: ditto.
-
- * enc/iso_8859_10.c: ditto.
-
- * enc/iso_8859_11.c: ditto.
-
- * enc/iso_8859_13.c: ditto.
-
- * enc/iso_8859_14.c: ditto.
-
- * enc/iso_8859_15.c: ditto.
-
- * enc/iso_8859_16.c: ditto.
-
- * enc/koi8_r.c: ditto.
-
- * enc/shift_jis.c: ditto.
-
- * enc/utf_16be.c: ditto.
-
- * enc/utf_32be.c: ditto.
-
- * enc/utf_32le.c: ditto.
-
- * enc/windows_1251.c: ditto.
-
- * process.c (run_exec_rlimit): ISO C90 forbids mixed declarations
- and code
-
- * include/ruby/ruby.h (enum ruby_special_consts): ISO C forbids
- comma at end of enumerator list
-
- * include/ruby/ruby.h (enum ruby_value_type): ditto.
-
- * eval_intern.h (enum): ditto.
-
- * vm_core.h (enum rb_thread_status): ditto.
-
- * parse.y (enum lex_state_e): ditto.
-
- * parse.y (enum string_type): ditto.
-
- * process.c (enum): ditto.
-
- * ruby.c (enum dump_flag_bits): ditto.
-
- * ruby.c (enum disable_flag_bits): ditto.
-
- * enc/gb18030.c (enum): ditto.
-
-Tue Jul 1 17:21:42 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * regexec.c (stack_double): use MatchStackLimitSize atomically.
-
- * regparse.c (onig_free_shared_cclass_table): OnigTypeCClassTable
- needs atomicity
-
- * regsyntax.c: constified all predefined OnigSyntaxTypes.
-
-Tue Jul 1 16:57:44 2008 URABE Shyouhei <shyouhei@ruby-lang.org>
-
- * include/ruby/st.h (struct st_table): type of bit-field
- 'num_entries' is a GCC extension
-
- * include/ruby/ruby.h (rb_intern): prefix __extension__ for
- braced-groups within expressions.
-
- * include/ruby/intern.h (rb_usascii_str_new2): ditto.
-
- * include/ruby/intern.h (rb_tainted_str_new2): ditto.
-
- * include/ruby/intern.h (rb_str_new2): ditto.
-
-Tue Jul 1 15:01:13 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/rubygems/ext/builder.rb (Gem::Ext::Builder.make),
- (Gem::Ext::Builder.run): EXIT_SUCCESS may be 0 or may not.
-
- * test/rubygems/test_gem_ext_rake_builder.rb (build_rake_in): override
- Gem.ruby and ENV["rake"].
-
- * runruby.rb: bin/rake does not exist in archdir where architecture
- depend script (i.e. rbconfig.rb) exists.
-
-Tue Jul 1 13:19:44 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * array.c (rb_ary_fill): check if beg is too big.
-
-Tue Jul 1 12:01:16 2008 Koichi Sasada <ko1@atdot.net>
-
- * compile.c, insns.def, vm.c, vm_core.h: remove some insns
- (undef, alias, definemethod).
- Call RubyVM::FrozenCore's singleton method instead.
- Add "putiseq" and "putspecialobject" instructions.
-
- * id.c, id.h: add ids for above.
-
- * tool/parse.rb: "VM" no longer exists. Use RubyVM instead.
-
-Tue Jul 1 03:28:16 2008 Eric Hodel <drbrain@segment7.net>
-
- * test/rubygems/test_ext_configure_builder.rb: Apply locale-free
- patch by Yusuke ENDOH. [ruby-core:17444].
-
- * runruby.rb: Set ENV['rake']. Patch by Yusuke ENDOH
- [ruby-core:17442].
-
-Tue Jul 1 01:07:17 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/cgi.rb (CGI::QueryExtension.read_multipart): blanks inside
- double quotes are allowed. [ruby-list:45140]
-
-Tue Jul 1 00:59:43 2008 Tanaka Akira <akr@fsij.org>
-
- * numeric.c (num_coerce): call rb_Float(x) first. don't depend on
- evaluation order of function arguments.
-
-Tue Jul 1 00:49:11 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * gc.c (rb_newobj): abort GC phase before rb_bug.
-
-Mon Jun 30 23:15:07 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/openssl/test_ssl.rb (start_server): shutdown TCPServer before
- close.
-
-Mon Jun 30 23:01:50 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (RUBY_H_INCLUDES): common headers which are included with
- ruby.h together.
-
-Mon Jun 30 22:57:50 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_settracefunc.rb (test_raise): reveal an exception
- hided by rescue modifier.
-
-Mon Jun 30 22:49:32 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_array.rb (test_aset): access with too big index
- raises not ArgumentError but IndexError now.
-
-Mon Jun 30 22:30:37 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/test/unit/collector/dir.rb (recursive_collect): r15662 reverted.
-
-Mon Jun 30 22:27:39 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * ext/stringio/stringio.c (strio_getline): fix for nil and "" as
- separator. [ruby-dev:34591]
-
-Mon Jun 30 22:21:30 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * io.c (argf_each_line): pass args to each_line. [ruby-dev:34958]
-
-Mon Jun 30 22:12:46 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * gc.c (chain_finalized_object): should not delete from finalizer
- table until run.
-
- * gc.c (rb_gc_call_finalizer_at_exit): deferred_final_list may be
- empty first.
-
-Mon Jun 30 18:57:05 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * gc.c (gc_finalize_deferred): allow object allocation in finalizers.
-
- * gc.c (rb_gc_call_finalizer_at_exit): ditto.
-
-Mon Jun 30 14:41:36 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * gc.c (rb_newobj): prohibit call of rb_newobj() during gc when
- USE_VALUE_CACHE is not defined (normal case).
-
-Mon Jun 30 10:28:33 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/syslog/syslog.c (syslog_write): syslog operations should be
- protected from $SAFE level 4. a patch from Keita Yamaguchi
- <keita.yamaguchi at gmail.com>.
-
- * ext/syslog/syslog.c (mSyslog_close): ditto.
-
- * ext/syslog/syslog.c (mSyslog_set_mask): ditto.
-
-Mon Jun 30 03:01:35 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/net/http/test_http.rb (_test_request__file): specify encoding
- explicitly.
-
- * test/net/http/utils.rb: ditto.
-
-Mon Jun 30 02:31:07 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * encoding.c (rb_utf8_encindex): defined.
-
- * include/ruby/encoding.h (rb_utf8_encindex): ditto.
-
-Mon Jun 30 02:14:34 2008 Koichi Sasada <ko1@atdot.net>
-
- * vm.c, vm_core.h,vm_core.h, vm_dump.c, iseq.c: rename class name
- VM -> RubyVM, and rename rb_cVM -> rb_cRubyVM.
- "VM" is too short name for class.
-
- * test/ruby/test_method.rb, test/ruby/test_settracefunc.rb: ditto.
-
- * include/ruby/ruby.h: rb_cRubyVM, rb_cEnv, rb_cISeq should not be
- exposed.
-
-Mon Jun 30 02:10:32 2008 Koichi Sasada <ko1@atdot.net>
-
- * process.c (Init_process): fix to avoid a warning.
-
-Mon Jun 30 01:52:05 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_parse.rb: remove tests for open_args.
-
-Sun Jun 29 23:01:54 2008 Tanaka Akira <akr@fsij.org>
-
- * string.c (rb_str_format_m): make tmp volatile to avoid possible GC
- problem.
-
-Sun Jun 29 18:01:30 2008 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/parser.rb, lib/rss/utils.rb: merge documents from ruby_1_8.
-
-Sun Jun 29 17:44:23 2008 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/parser.rb (RSS::ListenerMixin#known_class): define to
- work with ruby 1.8.x too.
-
-Sun Jun 29 17:41:42 2008 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/maker/base.rb (RSS::Maker::RSSBase#to_feed): raise
- exception not return nil if RSS::Maker.make can't get required
- information.
-
- * test/rss/rss-assertions.rb: follow the above change.
-
-Sun Jun 29 17:37:23 2008 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/maker/base.rb (RSS::Maker::RSSBase#make): require block.
-
- * test/rss/test_maker_{0.9,1.0,2.0}.rb: follow the above change.
-
-Sun Jun 29 17:33:34 2008 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/maker/base.rb, lib/rss/maker/itunes.rb: don't use
- instance_eval to initialize variables. (speed up)
-
-Sun Jun 29 17:31:15 2008 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/rss.rb, test/rss/test_version.rb (RSS::VERSION):
- 0.2.4 -> 0.2.5.
-
-Sun Jun 29 11:36:20 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * dir.rb: fix resource leak.
-
-Sun Jun 29 09:43:10 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/tmpdir.rb (@@systmpdir): prior LOCAL_APPDATA if possible, and
- should be clean. based on a patch from arton <artonx AT
- yahoo.co.jp> at [ruby-dev:35269]
-
-Sun Jun 29 07:53:08 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (date2time_str): fix the overflow in
- some situation. [ruby-bugs-20793]
-
-Sat Jun 28 21:25:08 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/ruby.h (struct RRegexp): new field usecnt. replace
- str and len by src.
-
- * gc.c (gc_mark_children): mark src field of regexp.
- (obj_free): don't free str field.
-
- * re.c (REG_BUSY): removed.
- (rb_reg_initialize): prohibit re-initialize regexp.
- (rb_reg_search): use usecnt to prevent freeing regexp currently
- using. this prevents SEGV by:
- r = /\A((a.)*(a.)*)*b/
- r =~ "ab" + "\xc2\xa1".force_encoding("euc-jp")
- t = Thread.new { r =~ "ab"*8 + "\xc2\xa1".force_encoding("utf-8")}
- sleep 0.2
- r =~ "ab"*8 + "\xc2\xa1".force_encoding("euc-jp")
-
-Sat Jun 28 21:15:43 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/intern.h (rb_str_new2, rb_tainted_str_new2,
- rb_usascii_str_new2): use inline versions only for constant
- literals.
-
-Sat Jun 28 13:12:06 2008 Tanaka Akira <akr@fsij.org>
-
- * test/rubygems/test_gem.rb (test_self_path_APPLE_GEM_HOME): don't use
- fixed /tmp/apple_gem_home directory.
-
-Sat Jun 28 08:40:18 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c: check String encoding when
- converting String to VT_BSTR in OLE.
-
- * test/win32ole/test_win32ole.rb: ditto.
-
-Sat Jun 28 01:08:42 2008 Tanaka Akira <akr@fsij.org>
-
- * time.c (time_timespec): fix rounding negative float.
-
-Fri Jun 27 21:38:57 2008 Tanaka Akira <akr@fsij.org>
-
- * struct.c: __size__ removed. use the length of __members__ instead.
- (num_members): new function.
-
-Fri Jun 27 21:19:08 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/inlinetest.rb (InlineTest.in_progname): workaround for frozen
- $0. [ruby-dev:35261]
-
- * lib/test/unit/ui/console/testrunner.rb (TestRunner#finished): ditto.
-
-Fri Jun 27 17:45:17 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * lib/erb.rb: adjust line number for magic comment.
-
- * test/erb/test_erb.rb: add tests for def_method.
-
-Fri Jun 27 14:29:07 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (primary): empty not should call '!' on nil.
- cf [ruby-dev:35227]
-
-Fri Jun 27 14:25:52 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm.c (vm_eval_body): if thrown exception is frozen, reraise it to
- create a new instance.
-
-Fri Jun 27 13:29:26 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/intern.h (rb_str_new2, rb_tainted_str_new2,
- rb_usascii_str_new2): use with-length versions with strlen to
- optimize strlen, if optimized.
-
-Fri Jun 27 12:28:57 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/un.rb (mkmf): new command to create makefile.
-
-Fri Jun 27 11:06:05 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/un.rb (wait_writable): added help message.
-
-Fri Jun 27 06:52:54 2008 Koichi Sasada <ko1@atdot.net>
-
- * configure.in: need a ",".
-
- * process.c (rb_fork): check CANNOT_FORK_WITH_PTHREAD macro.
-
-Fri Jun 27 06:50:56 2008 Koichi Sasada <ko1@atdot.net>
-
- * vm_eval.c (vm_call_super): fix to call method_missing.
- [ruby-core:15719], [ruby-core:17340]
-
-Fri Jun 27 00:00:14 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (set_arg0, ruby_prog_init): freeze $0. a patch from Keita
- Yamaguchi <keita.yamaguchi at gmail.com>.
-
-Thu Jun 26 23:58:29 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * string.c (rb_str_index_m, rb_str_rindex_m, rb_str_include): fix
- rdoc.
-
-Thu Jun 26 17:43:41 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * variable.c (rb_f_trace_var): should not be allowed at safe level 4.
- a patch from Keita Yamaguchi <keita.yamaguchi at gmail.com>.
-
-Thu Jun 26 11:04:30 2008 Eric Hodel <drbrain@segment7.net>
-
- * lib/rubygems: Update to RubyGems 1.2.0 r1824. Incorporates patch by
- Yusuke ENDOH [ruby-core:17353].
-
-Thu Jun 26 00:48:31 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (primary): not operand might be empty. [ruby-dev:35227]
-
-Wed Jun 25 21:54:34 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (primary): make functional-style not operator to act
- like function. see <http://d.hatena.ne.jp/ku-ma-me/20080624/p1>.
-
-Wed Jun 25 15:28:50 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * array.c (rb_ary_fill): not depend on unspecified behavior at integer
- overflow. reported by Vincenzo Iozzo <snagg AT openssl.it>.
-
-Wed Jun 25 13:42:44 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/erb.rb (ERB::Compiler:Buffer#new): push magic comment first.
-
- * lib/erb.rb (ERB::Compiler#compile): fix for broken input.
-
-Wed Jun 25 12:10:01 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/erb.rb (ERB::Compiler#compile): magic comment needs LF.
-
-Wed Jun 25 09:31:11 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/erb.rb (ERB::Compiler#compile): output magic comment.
-
-Tue Jun 24 22:14:36 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * vm_eval.c (eval_string_with_cref): preserve parse_in_eval even if
- exception raised.
-
-Tue Jun 24 22:09:18 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+Sun Jun 29 18:22:06 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
* ext/win32ole/win32ole.c(ole_invoke): fix memory leak.
[ruby-bugs-20792]
-Tue Jun 24 17:20:39 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (rb_cv_fork_with_pthread): check after check for
- pthread library, and define the macro when checked only.
-
-Tue Jun 24 17:04:39 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/io/wait/extconf.rb: check sys/socket.h for cygwin.
-
-Tue Jun 24 16:51:51 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * io.c (io_reopen): remove cygwin handling because it seems to be for
- C's stdio.
- fixed [ruby-dev:35183]
-
-Tue Jun 24 11:12:33 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * include/ruby/win32.h, win32/win32.c (rb_w32_getppid): now support
- getppid() on win32 (but only Win2k or later).
-
- * process.c (get_ppid): remove win32 special logic.
-
-Tue Jun 24 09:40:47 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/socket/socket.c (init_sock): socket is binmode on platforms
- which support binmode.
-
-Tue Jun 24 00:21:53 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * compile.c (iseq_build_from_ary): initialize arg_opts, a patch from
- Adam Strzelecki <ono at java.pl> in [ruby-core:17220].
-
-Tue Jun 24 00:10:53 2008 wanabe <s.wanabe@gmail.com>
-
- * compile.c (iseq_build_from_ary): fix expression to obtain
- iseq->local_size and iseq->local_table_size. [ruby-dev:35205]
-
-Mon Jun 23 11:31:41 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/mathn.rb (Rational::power2): removed incomplete method.
- see [ruby-dev:35195]. [ruby-core:17293]
-
-Sun Jun 22 14:16:28 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/readline/extconf.rb (have_readline_func): readline on Mac OS X
- needs headers to detect some functions.
-
-Sun Jun 22 09:51:14 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * object.c (rb_class_superclass): rdoc improvement, a patch from
- Gaston Ramos <ramos.gaston AT gmail.com> in [ruby-core:17371].
-
-Sun Jun 22 09:22:32 2008 URABE Shyouhei <shyouhei@ruby-lang.org>
-
- * README.EXT: translated README.EXT.ja
-
-Sun Jun 22 00:42:02 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (rb_w32_osid, rb_w32_osver, CreateChild): XP is
- is different from Vista about pipe handle inheritance.
- fixed [ruby-core:17367], reported by Lars Christensen <larsch at
- belunktum.dk>
-
-Sun Jun 22 00:38:45 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * README.EXT.ja: add note about mark and free.
-
-Sun Jun 22 00:01:36 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * io.c (rb_io_binmode_p, argf_binmode_p, Init_IO): new method
- IO#binmode? and ARGF.binmode? [ruby-dev:35148]
-
-Sat Jun 21 17:33:50 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (rb_w32_spawn): no longer support P_WAIT.
-
-Sat Jun 21 16:46:09 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * thread_win32.c (native_sleep): must block reentrance when accessing
- th->unblock.
- fixed [ruby-core:17341], reported by Bill Kelly <billk at cts.com>
-
-Sat Jun 21 16:29:02 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (call_args2, open_args): removed.
+Sun Jun 29 18:19:11 2008 Akinori MUSHA <knu@iDaemons.org>
- * parse.y (parser_yylex): unified warnings at space between method
- name and argument parenthesis. [ruby-dev:33943]
+ * eval.c (PUSH_FRAME, PUSH_CLASS): Add volatile to avoid a
+ possible optimization bug on OS X/PPC. This at least makes
+ build with gcc -O1 and `make test' pass.
-Sat Jun 21 16:21:07 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * numeric.c (flo_round): get rid of overflow.
-
-Sat Jun 21 15:57:15 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun Jun 29 17:24:43 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/rdoc/parsers/parse_rb.rb (RDoc#collect_first_comment): skip
magic comment.
-Sat Jun 21 15:54:55 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun Jun 29 17:22:09 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * configure.in: check if fork works with pthread.
+ * ext/stringio/stringio.c (strio_each, strio_readlines): IO#each and
+ IO#readlines do not affect $_. [ruby-core:17277]
-Sat Jun 21 15:31:09 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun Jun 29 17:19:59 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * tool/make-snapshot: ported to ruby.
+ * ext/stringio/stringio.c (strio_readline, strio_each)
+ (strio_readlines): set lastline. [ruby-core:17257]
- * tool/make-snapshot: fixed digests.
+Sun Jun 29 17:15:49 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-Sat Jun 21 04:36:59 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * ext/openssl/ossl.h: include winsock.h if USE_WINSOCK2 is not defined.
+ a patch from arton <artonx at yahoo.co.jp> in [ruby-dev:35078]
- * ext/bigdecimal/lib/bigdecimal/jacobian.rb (Jacobian::dfdxi):
- typo fixed (raize -> raise). [ruby-list:45101]
+Sun Jun 29 17:09:48 2008 wanabe <s.wanabe@gmail.com>
- * enumerator.c (enum_each_cons): typo in RDoc fixed.
+ * util.c (ruby_strtod): ruby_strtod don't allow a trailing
+ decimal point like "7.". [ruby-dev:34835] [ruby-dev:35009]
+
+Sat Jun 28 19:23:40 2008 URABE Shyouhei <shyouhei@ruby-lang.org>
-Sat Jun 21 00:45:34 2008 URABE Shyouhei <shyouhei@ruby-lang.org>
+ * class.c (clone_method): use rb_copy_node_scope.
+ fixed [ruby-list:45102]
+ fixed [ruby-core:17393]
- * tool/make-snapshot: do not use sha256sum; use BASERUBY instead
+Sat Jun 28 18:49:50 2008 URABE Shyouhei <shyouhei@ruby-lang.org>
- * common.mk (dist): use tool/make-snapshot instead
+ * class.c: revert to r15855.
-Fri Jun 20 16:34:14 2008 Tanaka Akira <akr@fsij.org>
+Fri Jun 20 18:25:18 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * process.c (Init_process): Process::Status#to_int removed.
- (PST2INT): defined.
- (pst_to_s): use PST2INT.
- (pst_inspect): ditto.
- (pst_equal): ditto.
- (pst_bitand): ditto.
- (pst_rshift): ditto.
- (pst_wifstopped): ditto.
- (pst_wstopsig): ditto.
- (pst_wifsignaled): ditto.
- (pst_wtermsig): ditto.
- (pst_wifexited): ditto.
- (pst_wexitstatus): ditto.
- (pst_success_p): ditto.
- (pst_wcoredump): ditto.
- (rb_f_system): ditto.
+ * string.c (rb_str_buf_append): should infect.
-Fri Jun 20 15:40:02 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Jun 20 16:33:09 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* array.c (rb_ary_store, rb_ary_splice): not depend on unspecified
behavior at integer overflow.
* string.c (str_buf_cat): ditto.
-Fri Jun 20 12:39:55 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * process.c (rb_detach_process): store detached process ID in the
- thread local storage. moved from lib/open3.rb.
-
-Fri Jun 20 11:57:46 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_sub_bang): should preserve replacement points
- since they may be altered in the yielded block.
-
-Fri Jun 20 11:07:56 2008 Tanaka Akira <akr@fsij.org>
-
- * string.c (rb_memhash): randomize hash to avoid algorithmic
- complexity attacks.
- (rb_str_hash): use rb_memhash.
-
- * include/ruby/intern.h (rb_reset_random_seed): declared.
-
- * thread.c (rb_thread_atfork): call rb_reset_random_seed.
-
- * inits.c (rb_call_inits): call Init_RandomSeed at first.
-
- * random.c (seed_initialized): defined.
- (fill_random_seed): extracted from random_seed.
- (make_seed_value): extracted from random_seed.
- (rb_f_rand): initialize random seed at first.
- (initial_seed): defined.
- (Init_RandomSeed): defined.
- (Init_RandomSeed2): defined.
- (rb_reset_random_seed): defined.
- (Init_Random): call Init_RandomSeed2.
-
-Wed Jun 18 21:52:38 2008 URABE Shyouhei <shyouhei@ruby-lang.org>
+Wed Jun 18 22:24:46 2008 URABE Shyouhei <shyouhei@ruby-lang.org>
* array.c (ary_new, rb_ary_initialize, rb_ary_store,
- rb_ary_splice, rb_ary_times): integer overflows should be
+ rb_ary_aplice, rb_ary_times): integer overflows should be
checked. based on patches from Drew Yao <ayao at apple.com>
fixed CVE-2008-2726
- * string.c (rb_enc_cr_str_buf_cat): fixed unsafe use of alloca,
+ * string.c (rb_str_buf_append): fixed unsafe use of alloca,
which led memory corruption. based on a patch from Drew Yao
<ayao at apple.com> fixed CVE-2008-2726
-Fri Jun 20 03:26:00 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * process.c (rb_f_fork): NetBSD 4.0 or later can fork.
-
-Fri Jun 20 03:19:39 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/testunit/collector/test_dir.rb: r15825 made it unnecessary to
- change String to Symbol.
-
- * test/testunit/collector/test_objectspace.rb: ditto.
-
-Fri Jun 20 03:14:31 2008 Eric Hodel <drbrain@segment7.net>
-
- * lib/rubygems*, test/rubygems/*: Update to RubyGems 1.1.1 r1784 (pre
- 1.2).
-
-Fri Jun 20 03:01:59 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * thread.c: try to remove false positive of deadlock detection (second
- trial).
-
-Fri Jun 20 02:16:43 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/mathn.rb (Rational::power2): typo fixed. [ruby-core:17293]
-
-Fri Jun 20 02:11:01 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (str_gsub): should preserve last successful match
- data. [ruby-dev:35182]
-
-Fri Jun 20 01:07:28 2008 Koichi Sasada <ko1@atdot.net>
-
- * KNOWNBUGS.rb, bootstraptest/pending.rb: move a bug (?) to pending.
-
-Fri Jun 20 00:40:08 2008 Koichi Sasada <ko1@atdot.net>
-
- * proc.c (proc_new): fix to return Proc object if block is already
- in heap. [ruby-core:15711]
-
- * bootstraptest/test_proc.rb: add a test.
-
-Fri Jun 20 00:18:04 2008 Koichi Sasada <ko1@atdot.net>
-
- * thread_win32.c (native_sleep): fix to decrement sleeper count.
-
-Thu Jun 19 23:48:45 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/net/http/test_http.rb: compare encodings of two strings before
- comparing themself, which suppress too big error output.
-
-Thu Jun 19 23:46:35 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * ext/json/ext/parser/parser.rl, ext/json/ext/parser/parser.c: JSON
- text SHALL be encoded in Unicode.
-
-Thu Jun 19 23:17:56 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * thread.c, thread_win32.c, vm_core.h: try to remove false positive of
- deadlock detection.
-
-Thu Jun 19 21:38:08 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/extmk.rb (extmake): check if compile before showing message.
-
-Thu Jun 19 21:35:32 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * tool/make-snapshot: supported multiple snapshots.
-
-Thu Jun 19 20:37:00 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * lib/net/pop.rb (Net::POP3#set_all_uids): speed
- up. a patch from <m-sumi AT techfirm.co.jp> [ruby-list:45047]
-
-Thu Jun 19 17:44:15 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/etc/etc.c (Init_etc): define constant aliases Etc::Passwd
- and Etc::Group. [ruby-dev:35150]
-
-Thu Jun 19 17:37:21 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (str_alloc): specify 'inline' modifier.
-
- * string.c (str_alloc): remove cSymbol hack that no longer
- necessary.
-
- * string.c (scan_once): avoid retrieving encoding info unless
- necessary.
-
-Thu Jun 19 17:19:14 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_scan): String#scan should preserve last
- successful match data. [ruby-dev:35106]
-
-Thu Jun 19 16:49:36 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * missing/acosh.c (atanh): should set ERANGE to errno if parameter
- is the boundary case. fixed [ruby-dev:35155]
-
-Thu Jun 19 16:06:01 2008 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tkextlib/tile/treeview.rb: cannot configure tags.
-
-Thu Jun 19 11:48:33 2008 Koichi Sasada <ko1@atdot.net>
-
- * test/ruby/test_enumerator.rb: fix to skip "with_memo" test.
-
-Thu Jun 19 11:40:55 2008 Koichi Sasada <ko1@atdot.net>
-
- * vm_insnhelper.c (vm_throw): fix "return" process from "lambda".
-
- * bootstraptest/test_proc.rb: add a test.
-
- * bootstraptest/pending.rb: add a pending bug.
-
-Thu Jun 19 00:33:40 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/etc/test_etc.rb: avoid infinite loop. [ruby-dev:35158]
-
-Wed Jun 18 23:07:19 2008 URABE Shyouhei <shyouhei@ruby-lang.org>
-
- * gc.c (rb_newobj): prohibit call of rb_newobj() during gc.
- a patch from Sylvain Joyeux in [ruby-core:12099].
-
-Wed Jun 18 21:08:14 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (verbose_setter, opt_W_getter): fixed prototypes.
-
-Wed Jun 18 19:20:00 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ruby.c (opt_W_getter): use ruby_verbose directly instead of parameter
- because ruby_verbose is not a real variable, so the address of
- parameter is not collect.
-
-Wed Jun 18 18:31:03 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (errmap): add some pipe errors.
-
- * win32/win32.c (rb_w32_write): set errno when CRT's errno is EINVAL
- for pipe errors.
-
-Wed Jun 18 18:09:08 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (poll_child_status): set EINVAL to errno when
- GetExitCodeProcess() fails with ERROR_INVALID_HANDLE.
-
-Wed Jun 18 15:01:18 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * io.c (rb_open_file): fs_encoding and fname_encoding is
- rb_encoding *.
- fixed [ruby-dev:35151]
-
-Wed Jun 18 14:30:06 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * io.c (rb_open_file): not rb_enc_get_index but rb_enc_get.
-
-Wed Jun 18 13:49:58 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * include/ruby/win32.h (pipe): now pipe is textmode. although this
- change is experimental, it will be spec if no compatibility problem
- is reported.
-
-Wed Jun 18 12:05:30 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * marshal.c (w_object, marshal_dump, r_object0, marshal_load): search
- public methods only. [ruby-core:17283]
-
- * object.c (convert_type): ditto.
-
- * lib/singleton.rb (Singleton#_dump): conversion method should be
- public.
-
-Wed Jun 18 10:18:11 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/etc/etc.c (etc_passwd, etc_group): fixed rdoc. a patch from
- okkez <okkez000 AT gmail.com> in [ruby-dev:35141].
-
-Wed Jun 18 08:58:16 2008 Eric Hodel <drbrain@segment7.net>
-
- * lib/rubygems/*: Fix errors for 1.9.
-
- * gem_prelude.rb: Only remove methods from gem_prelude.rb when
- loading real RubyGems.
-
-Wed Jun 18 07:03:30 2008 Eric Hodel <drbrain@egment7.net>
-
- * lib/rubygems/*: Update to RubyGems r1778 (pre 1.2).
-
-Wed Jun 18 04:27:58 2008 Koichi Sasada <ko1@atdot.net>
-
- * KNOWNBUGS.rb, bootstraptest/pending.rb: move pending bug.
-
-Wed Jun 18 04:24:20 2008 Koichi Sasada <ko1@atdot.net>
-
- * vm.c, vm_insnhelper.c: fix escape process with "break" and "return"
- syntax in "lambda". [ ruby-Bugs-19304 ], [ruby-core:17164]
-
- * KNOWNBUGS.rb, bootstraptest/test_proc.rb: add/move solved test.
-
-Wed Jun 18 01:51:10 2008 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/multi-tk.rb: cannot access class variable from
- singleton method.
-
-Wed Jun 18 00:03:33 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * dir.c (Init_Dir): dir_foreach() takes variable argument.
-
-Tue Jun 17 23:04:24 2008 James Edward Gray II <jeg2@ruby-lang.org>
-
- * lib/net/telnet.rb: Fixing Telnet#wairfor() which was broken by
- changes to the Kernel::Integer() method. [ruby-core:17272]
-
-Tue Jun 17 23:02:18 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (opt_W_getter): made a hooked variable.
-
-Tue Jun 17 22:04:47 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * enc/euc_jp.c (property_name_to_ctype): core dumped when sizeof(int)
- differs from sizeof(long). [ruby-dev:35131]
-
- * enc/shift_jis.c (property_name_to_ctype): ditto.
-
- * enc/unicode.c (onigenc_unicode_property_name_to_ctype): ditto.
-
-Tue Jun 17 20:32:37 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (miniruby$(EXEEXT)): $(PREP) isn't always same as
- miniruby, and tests, debug, etc have no meaning when
- cross-compiling.
-
-Tue Jun 17 18:39:11 2008 Ryan Davis <ryand-ruby@zenspider.com>
-
- * common.mk: fixed dependencies on miniruby.
-
-Tue Jun 17 18:11:01 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * include/ruby/win32.h (pipe): expand pipe buffer size.
-
-Tue Jun 17 17:07:35 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (CreateChild): no need to inherit handles here because
- spawn'ed child cannot detect that STDIN is closed.
-
-Tue Jun 17 06:32:55 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * dir.c (dir_data): add intenc and extenc.
-
- * dir.c (dir_s_alloc): ditto.
-
- * dir.c (dir_initialize): now accept internal_encoding and
- external_encoding.
-
- * dir.c (dir_s_open): changed for dir_initialize.
-
- * dir.c (dir_open_dir): ditto.
-
- * dir.c (dir_foreach): changed for dir_open_dir.
-
- * dir.c (dir_entries): changed for dir_open_dir.
-
- * dir.c (dir_enc_str): defined.
-
- * dir.c (dir_path): use dir_enc_str.
-
- * dir.c (dir_read): ditto.
-
- * dir.c (dir_each): ditto.
-
-Tue Jun 17 06:28:57 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * io.c (io_set_encoding): defined.
-
- * io.c (rb_open_file): convert path on Windows and Mac OS X.
-
- * io.c (open_key_args): use io_set_encoding and now accept
- internal_encoding and external_encoding.
-
-Tue Jun 17 06:26:28 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * encoding.c (rb_filesystem_encoding): defined.
-
- * include/ruby/encoding.h (rb_filesystem_encoding): added.
-
-Tue Jun 17 06:24:28 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/syck/rubyext.c: add encoding header.
-
-Tue Jun 17 01:52:50 2008 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/tcltklib.c: SEGV when exit.
-
- * ext/tk/lib/tk.rb: add a check for safety to Tk.exit.
-
- * ext/tk/sample/irbtkw.rbw: freezes when receives SIGINT.
-
-Mon Jun 16 21:58:38 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/stringio/stringio.c (strio_each, strio_readlines): IO#each and
- IO#readlines do not affect $_. [ruby-core:17277]
-
-Mon Jun 16 18:52:47 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/thwait.rb (ThreadsWait): Exception2MessageMapper no longer has
- extend_to method. [ruby-core:17267]
-
-Mon Jun 16 14:46:25 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/e2mmap.rb (E2MM.def_e2message): typo.
-
-Mon Jun 16 09:43:27 2008 Akinori MUSHA <knu@iDaemons.org>
-
- * enumerator.c (enumerator_with_object, Init_Enumerator):
- Temporarily back out with_memo, for which we need a better name.
-
-Mon Jun 16 07:14:48 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/stringio/stringio.c (strio_readline, strio_each)
- (strio_readlines): set lastline. [ruby-core:17257]
-
-Mon Jun 16 01:49:39 2008 Koichi Sasada <ko1@atdot.net>
-
- * eval.c (rb_f_block_given_p): fix to skip class frame.
- [ruby-core:14813]
-
- * KNOWNBUGS.rb, bootstraptest/test_method.rb: move solved test.
-
-Mon Jun 16 01:48:08 2008 Koichi Sasada <ko1@atdot.net>
-
- * vm_dump.c (vm_stack_dump_raw): disable verbose debug output.
-
-Mon Jun 16 01:33:08 2008 Koichi Sasada <ko1@atdot.net>
+ * sprintf.c (rb_str_format): backported from trunk.
- * vm_core.h, thread.c: rename global_interpreter_lock to
- global_vm_lock.
-
-Sun Jun 15 18:40:35 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/syck/rubyext.c (yaml_org_handler): associate encoding.
-
- * ext/syck/rubyext.c (syck_genericresolver_node_import): ditto.
-
-Sun Jun 15 18:17:03 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm_core.h (rb_vm_t), vm.c (rb_vm_mark): moved preallocated special
- exceptions.
-
- * eval.c (Init_eval), gc.c (Init_GC), proc.c (Init_Proc): freeze
- preallocated special exceptions.
-
- * eval.c (rb_longjmp): duplicate the thrown exception to set backtrace
- if it was frozen.
-
- * gc.c (rb_memerror): raise nomem_error without backtrace if failed to
- make backtrace.
-
-Sat Jun 14 22:52:35 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/stringio/stringio.c (strio_sysread): should not raise at empty
- read. a patch from Arthur Schreiber at [ruby-core:17245].
+ * intern.h: ditto.
-Sat Jun 14 16:55:46 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Jun 17 15:09:46 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* file.c (file_expand_path): no need to expand root path which has no
short file name. [ruby-dev:35095]
-Sat Jun 14 11:59:17 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * gc.h (STACK_UPPER): moved from gc.c
-
- * thread.c, thread_{pthread,win32}.c (ruby_init_stack,
- ruby_thread_init_stack): moved stack initialization from gc.c.
-
-Sat Jun 14 11:57:53 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * gc.h (STACK_UPPER): moved from gc.c
-
- * thread.c, thread_{pthread,win32}.c (ruby_init_stack,
- ruby_thread_init_stack): moved stack initialization from gc.c.
-
-Sat Jun 14 07:52:53 2008 Tanaka Akira <akr@fsij.org>
-
- * gc.c (ruby_initial_gc_stress): defined.
- (ruby_initial_gc_stress_ptr): defined.
-
- * debug.c (set_debug_option): use ruby_initial_gc_stress_ptr for
- gc_stress option.
-
-Sat Jun 14 00:09:19 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * gc.c (ruby_gc_stress): moved to rb_objspace_t.
-
- * gc.c (gc_stress_get, gc_stress_set): VM local attribute.
-
- * signal.c (sigsegv): ditto.
-
-Fri Jun 13 21:55:48 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * rational.c (nurat_equal_p): Rational(0,x) and 0 are equivalent,
- anyway.
-
-Fri Jun 13 21:26:39 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c (string_to_c, nucomp_s_convert): preserve the current
- backref.
-
- * rational.c (string_to_r, nurat_s_convert): ditto.
-
- * include/ruby/intern.h (rb_match_busy): added a declaration.
-
-Fri Jun 13 18:08:10 2008 Tanaka Akira <akr@fsij.org>
-
- * lib/time.rb (Time.xmlschema): don't accept decimal dot without
- fractional digits. fractional digits handling simplified.
-
-Fri Jun 13 17:20:40 2008 wanabe <s.wanabe@gmail.com>
-
- * complex.c (string_to_c_internal): save and restore backref.
- fixed [ruby-dev:34991]
-
-Fri Jun 13 17:06:20 2008 wanabe <s.wanabe@gmail.com>
-
- * rational.c (string_to_r_internal): save and restore backref.
- fixed [ruby-dev:34990]
-
-Fri Jun 13 14:41:26 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * README.EXT.ja: update about Fixnum. reported in
- <http://www.tmtm.org/ja/tdiary/?date=20080611#p01>
-
- * README.EXT.ja: describe about StringValueCStr().
-
- * README.EXT: ditto.
-
-Fri Jun 13 14:24:37 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * gc.c (rb_memerror): exit with EXIT_FAILURE instead of magic number.
-
- * gc.c (ruby_stack_check): STACK_LENGTH should be less than
- STACK_LEVEL_MAX.
-
-Fri Jun 13 12:55:37 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enum.c (sort_by_i): use NODE_DOT2 instead of NODE_MEMO to avoid
- extra calls to is_pointer_to_heap() in GC.
-
- * enum.c (enum_zip): ditto.
-
-Fri Jun 13 00:41:58 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_thread.rb: add a test.
-
-Thu Jun 12 23:30:11 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * thread.c (mutex_unlock): fix cond_notified consistency.
-
-Thu Jun 12 22:19:45 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * thread_win32.c (native_sleep): fixed previous commit.
-
-Thu Jun 12 21:59:17 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * thread.c, vm_core.h, vm.c, thread_pthread.c, thread_win32.c: add
- deadlock detection. [ruby-dev:35044]
-
- * bootstraptest/test_thread.rb: add tests for above.
-
-Thu Jun 12 21:39:55 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c: refactoring.
-
- * rational.c: ditto.
-
-Thu Jun 12 17:11:24 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * regint.h: undefine USE_CAPTURE_HISTORY which is mentioned as
- unsupported in the Onigiruma document.
-
-Thu Jun 12 13:36:54 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/ruby.h (rb_intern): use rb_intern2 with strlen for
- constant symbols to optimize strlen.
-
-Thu Jun 12 08:47:51 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (read_all): should use io_read_encoding(), not
- io_input_encoding().
-
- * io.c (rb_io_getline_1): reduce calling of io_read_encoding().
-
- * string.c (rb_str_scan): need not to restore $~ value, so avoid
- pinning match object.
-
-Thu Jun 12 02:49:40 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * ext/stringio/stringio.c (strio_init): rewind when reopened.
-
-Thu Jun 12 02:43:27 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * array.c (rb_ary_zip): ANSI style.
-
-Thu Jun 12 02:25:54 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (rb_io_reopen): clear read buffer.
-
-Thu Jun 12 00:56:20 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/tk: check proper conditions. [ruby-dev:35047]
-
-Wed Jun 11 23:33:13 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (io_fread): bypass buffered read if reading buffer is empty.
-
- * io.c (remain_size): do not add extra one byte.
-
-Wed Jun 11 12:15:17 2008 Tanaka Akira <akr@fsij.org>
-
- * bootstraptest/runner.rb (assert_normal_exit): hide stderr output
- when success.
-
-Wed Jun 11 09:26:43 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * common.mk (encs): need to pass miniruby path for windows.
-
-Wed Jun 11 05:53:20 2008 Koichi Sasada <ko1@atdot.net>
-
- * vm.c, eval_intern.h (PASS_PASSED_BLOCK):
- set a VM_FRAME_FLAG_PASSED flag to skip this frame when
- searching ruby-level-cfp.
-
- * eval.c, eval_intern.h, proc.c: fix to check cfp. if there is
- no valid ruby-level-cfp, cause RuntimeError exception.
- [ruby-dev:34128]
-
- * vm_core.h, vm_evalbody.c, vm.c, vm_dump.c, vm_insnhelper.c,
- insns.def: rename FRAME_MAGIC_* to VM_FRAME_MAGIC_*.
-
- * KNOWNBUGS.rb, bootstraptest/test*.rb: move solved bugs.
-
-Wed Jun 11 05:55:31 2008 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/tcltklib.c: SEGV when tcltk-stubs is enabled.
-
- * ext/tk/tcltklib.c: avoid error on a shared object.
-
- * ext/tk/extconf.rb: support --with-tcltkversion
-
- * ext/tk/README.tcltklib: add document about --with-tcltkversion
-
- * ext/tk/lib/tk.rb, ext/tk/lib/multi-tk.rb, ext/tk/lib/remote-tk.rb:
- not work on $SAFE==4
-
- * ext/tk/lib/multi-tk.rb: Object#methods returns Symbols on Ruby1.9.
-
- * ext/tk/lib/tk/timer.rb: add TkTimer#at_end(proc) to register the
- procedure which called at end of the timer.
-
- * ext/tk/lib/tk.rb, ext/tk/lib/tk/itemfont.rb, ext/tk/lib/font.rb:
- support __IGNORE_UNKNOWN_CONFIGURE_OPTION__ about font options.
-
- * ext/tk/lib/*: treat __IGNORE_UNKNOWN_CONFIGURE_OPTION__
-
- * ext/tk/lib/tkextlib/iwidgets/scrolledcanvas.rb,
- ext/tk/lib/tkextlib/iwidgets/scrolledlistbox.rb,
- ext/tk/lib/tkextlib/iwidgets/scrolledtext.rb: bug fix.
-
- * ext/tk/lib/tk/text.rb: typo. call a wrong method.
-
- * ext/tk/lib/tk/itemconfig.rb: ditto.
-
- * ext/tk/lib/tk.rb, ext/tk/lib/tk/itemconfig.rb,
- ext/tk/lib/tk/canvas.rb: support alias names of option keys.
-
- * ext/tk/lib/tk/grid.rb: lack of module-method definitions.
-
- * ext/tk/lib/tk/pack.rb, ext/tk/lib/tk/grid.rb: increase supported
- parameter patterns of configure method.
-
- * ext/tk/lib/tk.rb: add TkWindow#grid_anchor, grid_column, grid_row.
-
- * ext/tk/lib/tk/wm.rb: methods of Tk::Wm_for_General module cannot
- pass the given block to methods of Tk::Wm module.
-
- * ext/tk/lib/tk/wm.rb: Wm#overrideredirect overwrites argument to
- an invalid value.
-
- * ext/tk/lib/tk.rb: fix memory (object) leak bug.
-
- * ext/tk/tcltklib.c, ext/tk/tkutil/tkutil.c: fix memory leak.
-
- * ext/tk/sample/demos-jp/aniwave.rb, ext/tk/sample/demos-en/aniwave.rb:
- bug fix.
-
- * ext/tk/lib/tkextlib/blt/component.rb,
- ext/tk/lib/tkextlib/tile/tentry.rb,
- ext/tk/lib/tkextlib/tile/treeview.rb: ditto.
-
- * ext/tk/lib/tkextlib/tile/tpaned.rb: improve TPaned#add.
-
- * ext/tk/sample/demos-jp/widget, ext/tk/sample/demos-en/widget,
- ext/tk/sample/demos-jp/style.rb, ext/tk/sample/demos-en/style.rb,
- ext/tk/sample/demos-jp/bind.rb, ext/tk/sample/demos-en/bind.rb:
- bug fix.
-
- * ext/tk/sample/ttk_wrapper.rb: ditto.
-
- * ext/tk/sample/ttk_wrapper.rb: support "if __FILE__ == $0" idiom.
-
- * ext/tk/sample/tktextio.rb: add binding for 'Ctrl-u' at console mode.
-
- * ext/tk/lib/tkextlib/tile.rb, ext/tk/lib/tkextlib/tile/style.rb,
- ext/tk/sample/ttk_wrapper.rb: improve treating and control themes.
- add Tk::Tile.themes and Tk::Tile.set_theme(theme).
-
- * ext/tk/lib/tkextlib/tile.rb: lack of autoload definitions.
-
- * ext/tk/lib/tkextlib/tile/tnotebook.rb: cannot use kanji (not UTF-8)
- characters for headings.
-
- * ext/tk/lib/tkextlib/tkDND/shape.rb: wrong package name.
-
- * ext/tk/tkutil/tkutil.c: improve handling callback-subst-keys.
- Now, support longnam-keys (e.g. '%CTT' on tkdnd-2.0; however, still
- not support tkdnd-2.0 on tkextlib), and symbols of parameters (e.g.
- :widget=>'%W', :keycode=>'%k', '%x'=>:x, '%X'=>:root_x, and so on;
- those are attributes of event object). It means that Ruby/Tk accepts
- not only "widget.bind(ev, '%W', '%k', ...){|w, k, ...| ... }", but
- also "widget.bind(ev, :widget, :keycode, ...){|w, k, ...| ... }".
- It is potentially incompatible, when user passes symbols to the
- arguments of the callback block (the block receives the symbols as
- strings). I think that is very rare case (probably, used by Ruby/Tk
- experts only). When causes such trouble, please give strings instead
- of such symbol parameters (e.g. call Symbol#to_s method).
-
- * ext/tk/lib/tk/event.rb, ext/tk/lib/tk/validation.rb,
- ext/tk/lib/tkextlib/blt/treeview.rb,
- ext/tk/lib/tkextlib/winico/winico.rb: ditto.
-
- * ext/tk/tkutil/tkutil.c: strings are available on subst_tables on
- TkUtil::CallbackSubst class (it is useful on Ruby 1.9).
-
- * ext/tk/lib/tk/spinbox.rb, ext/tk/lib/tkextlib/iwidgets/hierarchy.rb,
- ext/tk/lib/tkextlib/iwidgets/spinner.rb,
- ext/tk/lib/tkextlib/iwidgets/entryfield.rb,
- ext/tk/lib/tkextlib/iwidgets/calendar.rb,
- ext/tk/lib/tkextlib/blt/dragdrop.rb,
- ext/tk/lib/tkextlib/tkDND/tkdnd.rb,
- ext/tk/lib/tkextlib/treectrl/tktreectrl.rb,
- ext/tk/lib/tkextlib/tktable/tktable.rb: disable code piece became
- unnecessary by reason of the changes of ext/tk/tkutil/tkutil.c.
-
- * ext/tk/lib/tk.rb, ext/tk/lib/multi-tk.rb: change strategy to define
- the constant WITH_ENCODING.
-
- * ext/tk/lib/tk.rb: fix bug on Tk::Encoding.tk_encoding_names.
-
-Wed Jun 11 03:40:37 2008 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/find.rb (Find#find): Return an enumerator if no block is
- given.
-
-Wed Jun 11 01:28:12 2008 Koichi Sasada <ko1@atdot.net>
-
- * include/ruby/intern.h, proc.c: revert rb_proc_call() and
- create rb_proc_call_with_block() instead.
-
- * include/ruby/ruby.h, eval_jump.c, thread.c, vm_insnhelper.c:
- rb_blockptr should not be exposed.
-
-Tue Jun 10 21:07:19 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * test/ruby/test_float.rb: add tests. [ruby-dev:35009]
-
-Tue Jun 10 20:55:57 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c (nucomp_s_convert): need not to initialize optional
- argument for rb_scan_args().
-
-Tue Jun 10 20:13:56 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/extmk.rb: negate default of --without-ext if --with-ext is
- given.
-
- * ext/extmk.rb: negate default of --without-ext.
-
-Tue Jun 10 17:43:35 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_shuffle_bang): update RDoc. [ruby-dev:35034]
-
-Tue Jun 10 17:30:19 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun Jun 15 19:27:40 2008 Akinori MUSHA <knu@iDaemons.org>
- * include/ruby/intern.h (rb_obj_instance_exec, rb_mod_module_exec):
- added prototypes.
-
-Tue Jun 10 17:00:29 2008 wanabe <s.wanabe@gmail.com>
-
- * util.c (ruby_strtod): ruby_strtod don't allow a trailing
- decimal point like "7.". [ruby-dev:34835] [ruby-dev:35009]
-
-Tue Jun 10 13:48:38 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * rational.c (nurat_s_convert): need not to initialize optional
- argument for rb_scan_args().
-
-Tue Jun 10 12:58:07 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/io/wait/wait.c (FIONREAD_POSSIBLE_P): suppress warnings.
-
-Tue Jun 10 12:43:19 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/ruby.h (CONST_ID_CACHE): fixed statement expression.
-
-Tue Jun 10 11:25:15 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (rb_argv0): revised for ext/tk.
-
- * include/ruby/encoding.h: not to use varargs.h since requiring C89.
-
-Tue Jun 10 00:50:51 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * include/ruby/ruby.h, vm_core.h: add a type rb_blockptr.
-
- * vm_insnhelper.c (vm_yield_with_cfunc): vm_yield_with_cfunc receives
- blockptr and passes it to iterating block.
-
- * proc.c (rb_proc_call), include/ruby/intern.h: rb_proc_call receives
- blockptr. "rb_proc_call(self, args, blockptr)" in C corresponds to
- "self.call(*args, &block)" in Ruby.
-
- * proc.c (proc_call): pass blockptr to block that is written in C.
-
- * proc.c (curry): receive blockptr and pass it to original proc.
- [ruby-core:15551]
-
- * vm.c (invoke_block_from_c): fix for change of vm_yield_with_cfunc.
-
- * thread.c (call_trace_proc), eval_jump.c (rb_call_end_proc): fix for
- change of rb_proc_call.
-
-Tue Jun 10 00:10:49 2008 Tanaka Akira <akr@fsij.org>
-
- * common.mk (test-knownbug): give $(OPTS) for bootstraptest/runner.rb.
-
-Mon Jun 9 23:10:50 2008 Tanaka Akira <akr@fsij.org>
-
- * eval.c (Init_stack): don't declare. it is a macro now.
-
-Mon Jun 9 22:46:47 2008 wanabe <s.wanabe@gmail.com>
-
- * compile.c : treat []&&= in virtually the same way as []||=.
- [ruby-dev:34679]
-
-Mon Jun 9 21:17:26 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * enc/depend (clean): remove build directories.
-
- * test_knownbug.rb -> KNOWNBUGS.rb: renamed.
-
- * common.mk: apply above change.
-
-Mon Jun 9 21:14:26 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb (configuration): set flags.
-
-Mon Jun 9 21:09:02 2008 Koichi Sasada <ko1@atdot.net>
-
- * bootstraptest/test_knownbug.rb -> ./test_knownbug.rb: moved.
-
- * common.mk: add a rule "test-knownbug".
-
-Mon Jun 9 21:00:32 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c (nucomp_s_convert): can accept Complex('i').
- [ruby-dev:34991]
-
-Mon Jun 9 18:25:30 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/ruby.h (CONST_ID): constant ID cache for non-gcc.
-
- * *.c: no cache in init functions.
+ * configure.in: Fix $LOAD_PATH. Properly expand vendor_ruby
+ directories; submitted by Takahiro Kambe <taca at
+ back-street.net> in [ruby-dev:35099].
Mon Jun 9 17:56:30 2008 Akinori MUSHA <knu@iDaemons.org>
@@ -23819,138 +91,35 @@ Mon Jun 9 17:56:30 2008 Akinori MUSHA <knu@iDaemons.org>
(TC_SortedSet#test_sortedset): Return self; [ruby-dev:35002] by
Arthur Schreiber.
-Mon Jun 9 17:47:09 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (fptr_finalize): close IO object if fd is already closed.
- (rb_p): call rb_io_write just once.
-
-Mon Jun 9 15:37:38 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ruby.c (require_libraries): req_list may be NULL. [ruby-dev:35008]
+Mon Jun 9 03:28:05 2008 Akinori MUSHA <knu@iDaemons.org>
-Mon Jun 9 14:18:01 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm_core.h (struct rb_vm_struct): moved src_encoding_index,
- ruby_debug, ruby_verbose, and rb_progname.
-
- * ruby.c (rb_argv0): no longer used.
-
- * ruby.c (struct cmdline_options): moved setids and req_list, and the
- latter is now an array, to prevent memory leak.
-
- * ruby.c (cmdline_options_init): added.
-
- * ruby.c (add_modules, require_libraries, init_ids, forbid_setid): use
- struct cmdline_options.
-
- * vm.c (vm_init2): initialize src_encoding_index.
-
- * vm.c: getters/setters for ruby_{debug,verbose}.
-
-Mon Jun 9 09:54:13 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/intern.h (Init_stack): make to call ruby_init_stack.
-
-Mon Jun 9 08:12:40 2008 wanabe <s.wanabe@gmail.com>
-
- * vm_insnhelper.c, vm.c, proc.c : revert r17021. [ruby-dev:34997]
-
-Mon Jun 9 03:12:23 2008 Koichi Sasada <ko1@atdot.net>
-
- * bootstraptest/pending.rb: move/remove solved issues.
-
- * bootstraptest/test_class.rb: ditto.
-
-Mon Jun 9 02:32:58 2008 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/zlib/zlib.c (rb_deflate_init_copy): Copy buffers as well.
- [ruby-list:45018]
-
-Sun Jun 8 22:22:20 2008 wanabe <s.wanabe@gmail.com>
-
- * vm_insnhelper.c, vm.c, proc.c (proc_call): allow call method with
- block that both is written in C. [ruby-dev:34273] [ruby-core:15551]
-
- * proc.c (curry): use proc_call instead of rb_proc_call.
- [ruby-dev:34273] [ruby-core:15551]
-
-Sun Jun 8 21:50:27 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/zlib/test_zlib.rb: add tests to achieve over 90% test coverage
- of zlib.
-
-Sun Jun 8 20:12:47 2008 wanabe <s.wanabe@gmail.com>
-
- * vm_insnhelper.c (vm_throw): regard break as return in lambda.
- [ruby-dev:34646]
-
-Sun Jun 8 19:17:59 2008 Koichi Sasada <ko1@atdot.net>
-
- * gc.c: add a build option "CALC_EXACT_MALLOC_SIZE".
- This option enables to calculate exact size of current
- allocated size by malloc(). You can access these information
- with GC.malloc_allocated_size and GC.malloc_allocations.
- This option consume additional memory as a header of each memory
- object. This option also helps to find out xmalloc()/xfree()
- consistency. If you get trouble with this option, some extension
- using "free()" instead of "xfree()".
- This options is disabled by default.
-
-Sun Jun 8 18:15:38 2008 Koichi Sasada <ko1@atdot.net>
+ * ext/zlib/zlib.c (rb_deflate_initialize, Init_zlib): Fix up
+ initialize_copy; [ruby-list:45016], [ruby-list:45018].
- * array.c, bignum.c, cont.c, dir.c, dln.c, encoding.c, enumerator.c,
- enumerator.c (enumerator_allocate), eval_jump.c, file.c, hash.c,
- io.c, load.c, pack.c, proc.c, random.c, re.c, ruby.c, st.c,
- string.c, thread.c, thread_pthread.c, time.c, util.c, variable.c,
- vm.c, gc.c:
- allocated memory objects by xmalloc (ruby_xmalloc) should be
- freed by xfree (ruby_xfree).
+Mon Jun 9 03:26:03 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
- * ext/curses/curses.c, ext/dbm/dbm.c, ext/digest/digest.c,
- ext/gdbm/gdbm.c, ext/json/ext/parser/parser.c,
- ext/json/ext/parser/unicode.c, ext/openssl/ossl_cipher.c,
- ext/openssl/ossl_hmac.c, ext/openssl/ossl_pkey_ec.c,
- ext/sdbm/init.c, ext/strscan/strscan.c, ext/zlib/zlib.c:
- ditto.
+ * NEWS: Mention new constants.
-Sun Jun 8 01:15:11 2008 Tanaka Akira <akr@fsij.org>
+Mon Jun 9 03:24:18 2008 Tanaka Akira <akr@fsij.org>
* hash.c (hash_i): make Hash#hash order insensitive.
- (rb_hash_dup): use DUPSETUP.
-Sat Jun 7 23:47:35 2008 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/zlib/zlib.c (rb_deflate_initialize, Init_zlib): Fix up
- initialize_copy; [ruby-list:45016].
-
-Sat Jun 7 22:15:02 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Jun 9 03:22:43 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (VENDOR_DIR): use LIBDIR instead of PREFIX as well as
SITE_DIR. a patch from Richard Brown <rbrown AT exherbo.org> in
[ruby-core:17129].
-Sat Jun 7 21:37:58 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (rb_f_open), re.c (rb_reg_search), transcode.c (str_transcode):
- suppress warnings.
-
- * util.c (quorem, rv_alloc, nrv_alloc): only used in dtoa().
+Mon Jun 9 03:21:20 2008 Tanaka Akira <akr@fsij.org>
-Sat Jun 7 16:06:14 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * gc.c (os_obj_of): assure to not free the scanning heap.
- * configure.in (CFLAGS, CXXFLAGS): append default flags.
-
-Sat Jun 7 01:23:59 2008 NAKAMURA Usaku <usa@ruby-lang.org>
+Mon Jun 9 03:20:12 2008 NAKAMURA Usaku <usa@ruby-lang.org>
* io.c (rb_open_file, rb_io_s_sysopen): fmode should be unsigned int.
fixed [ruby-dev:34979]
-Fri Jun 6 23:46:19 2008 Koichi Sasada <ko1@atdot.net>
-
- * vm_insnhelper.c (vm_callee_setup_arg): check simple flag before
- calling setup_arg function(). this change reduce function call.
-
-Fri Jun 6 21:51:46 2008 NAKAMURA Usaku <usa@ruby-lang.org>
+Fri Jun 6 21:16:55 2008 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/Makefile.sub (COMMON_HEADERS): include ws2tcpip.h.
@@ -23958,70 +127,43 @@ Fri Jun 6 21:51:46 2008 NAKAMURA Usaku <usa@ruby-lang.org>
freehostent, freeaddrinfo): undef before define because these are
macros in some versions of Windows SDK.
- merged from ruby_1_8.
-
-Fri Jun 6 18:25:43 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/iconv/utils.rb (default_test): override not to croak.
-
-Fri Jun 6 16:41:45 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * include/ruby/win32.h: include ws2tcpip.h. fixed [ruby-Bugs-20528]
-
-Fri Jun 6 15:05:02 2008 Tanaka Akira <akr@fsij.org>
-
- * gc.c (count_objects): clear hash after counting objects.
+ * win32/setup.mak: maybe commit miss.
-Fri Jun 6 12:43:41 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+Fri Jun 6 19:34:22 2008 Akinori MUSHA <knu@iDaemons.org>
- * test/ruby/test_dir.rb (TestDir::test_glob): glob file names not sorted.
-
-Fri Jun 6 00:05:33 2008 Tanaka Akira <akr@fsij.org>
-
- * lib/time.rb (Time.xmlschema): don't use float. fix
- http://rubyforge.org/tracker/index.php?func=detail&group_id=426&atid=1698&aid=20504
-
-Thu Jun 5 23:56:18 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_gc.rb: add tests to achieve over 90% test coverage of
- gc.c.
-
- * test/ruby/test_objectspace.rb: ditto.
-
- * test/ruby/test_marshal.rb: ditto.
-
-Thu Jun 5 23:40:08 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * gc.c (rb_objspace_alloc): this function is needed only when
- ENABLE_VM_OBJSPACE macro is defined.
+ * mkconfig.rb: hide build path from rbconfig.rb.
- * vm.c: ditto.
+ * util.c (ruby_strtod, dtoa): initialize more variables for error
+ handling.
-Thu Jun 5 23:31:21 2008 Yusuke Endoh <mame@tsg.ne.jp>
+ * io.c (rscheck), marshal.c (w_nbyte, w_bytes, w_unique),
+ (path2class, path2module): constified.
- * test/stringio/test_stringio.rb: add tests to achieve over 95% test
- coverage of stringio.
+ * pack.c (pack_unpack), process.c (rb_syswait): suppress warnings.
- * test/strscan/test_stringscanner.rb: ditto for strscan.
+ * suppress warnings on cygwin, mingw and mswin.
-Thu Jun 5 23:25:34 2008 Yusuke Endoh <mame@tsg.ne.jp>
+Fri Jun 6 19:23:53 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * eval.c (ruby_finalize_0): clear trace_func after executing END
- procs.
+ * file.c (file_expand_path): fix for non-existent files and SFN of
+ symlinks. [ruby-talk:303736]
- * thread.c: fix typo.
+Fri Jun 6 18:25:43 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Thu Jun 5 22:50:50 2008 Tanaka Akira <akr@fsij.org>
+ * test/iconv: Tests fixed.
- * gc.c (os_obj_of): heaps may be modified in yield.
+Fri Jun 6 17:04:56 2008 Akinori MUSHA <knu@iDaemons.org>
-Thu Jun 5 21:46:50 2008 Yusuke Endoh <mame@tsg.ne.jp>
+ * win32/win32.h: include ws2tcpip.h. fixed [ruby-Bugs-20528]
- * st.c (st_reverse_foreach): comment out unused function.
+ * lib/time.rb (Time.xmlschema): don't use float. fix
+ http://rubyforge.org/tracker/index.php?func=detail&group_id=426&atid=1698&aid=20504
- * util.c (dtoa): ditto.
+ * object.c (rb_obj_alloc): RDoc updated. a patch from Gaston
+ Ramos <ramos.gaston at gmail.com> in [ruby-core:17073].
-Thu Jun 5 20:30:46 2008 Akinori MUSHA <knu@iDaemons.org>
+ * lib/rdoc.rb: massive spelling correction patch from Evan Farrar
+ <evanfarrar at gmail.com> in [ruby-doc:1382] applied.
* ext/openssl/ossl_ssl_session.c (ossl_ssl_session_initialize):
Add a null check for ssl; submitted by akira yamada
@@ -24035,127 +177,24 @@ Thu Jun 5 20:30:46 2008 Akinori MUSHA <knu@iDaemons.org>
workaround for the case where OpenSSL is configured with
--enable-tlsext; submitted by akira yamada in [ruby-dev:34944].
-Thu Jun 5 20:24:15 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * thread.c (thread_set_trace_func_m): fix check for proc argument.
-
-Thu Jun 5 20:17:29 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * lib/rexml/document.rb (REXML::Document:write): leaky modification
- trans -> transitive. [ruby-dev:32040], r13686
-
- * lib/rexml/text.rb (Text.check): fix check for illegal character.
-
-Thu Jun 5 14:03:44 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/iconv/iconv.c (iconv_create): find encoding without options.
-
-Thu Jun 5 07:48:32 2008 Koichi Sasada <ko1@atdot.net>
-
- * string.c (hash): should be "static".
-
-Thu Jun 5 01:47:18 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_transcode.rb: add tests for iso-2022-jp.
-
-Thu Jun 5 01:27:42 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_process.rb: add tests.
-
-Wed Jun 4 23:10:08 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * ext/zlib/zlib.c (rb_gzfile_set_mtime): fix typo.
-
-Wed Jun 4 18:53:39 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (rb_obj_alloc): RDoc updated. a patch from Gaston
- Ramos <ramos.gaston at gmail.com> in [ruby-core:17073].
-
-Wed Jun 4 18:36:11 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/rdoc.rb: massive spelling correction patch from Evan Farrar
- <evanfarrar at gmail.com> in [ruby-doc:1382] applied.
-
-Wed Jun 4 17:52:18 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Jun 6 16:58:23 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/iconv/iconv.c (iconv_iconv): fix for length argument and now
- allows range. [ruby-core:17092]
-
-Wed Jun 4 15:45:41 2008 Akinori MUSHA <knu@iDaemons.org>
-
- * enumerator.c (enumerator_with_index, enumerator_with_memo): Fix
- grammo in rdoc.
-
-Wed Jun 4 13:06:58 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (CFLAGS, CXXFLAGS): include additional flags to
- CFLAGS and CXXFLAGS while configuration.
-
-Tue Jun 3 23:06:35 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * ext/strscan/strscan.c (strscan_scan_full, strscan_search_full): fix
- document.
-
-Tue Jun 3 22:37:26 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * ext/strscan/strscan.c (strscan_exist_p): fix document.
-
-Tue Jun 3 22:33:29 2008 Yusuke Endoh <mame@tsg.ne.jp>
+ allows range. [ruby-core:17092] [ruby-core:17115]
- * test/ruby/test_dir.rb: add tests to achieve over 90% test coverage
- of dir.c.
+Wed Jun 4 17:22:30 2008 Akinori MUSHA <knu@iDaemons.org>
- * test/ruby/test_encoding.rb: add tests for dummy?, name_list and
- aliases.
-
- * test/ruby/test_marshal.rb: add some tests.
-
-Tue Jun 3 22:25:51 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/etc/test_etc.rb: new tests for etc.
-
-Tue Jun 3 19:35:02 2008 Akinori MUSHA <knu@iDaemons.org>
-
- * enumerator.c (enumerator_with_memo): New method: with_memo().
-
-Tue Jun 3 20:04:03 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/Makefile.sub (miniruby$(EXEEXT)): miniruby cannot be
- written by miniruby itself.
+ * NEWS: Fix typos and move misplaced entries.
+ NEWS: Somehow optflags and warnflags were not actually included
+ in this release.
Tue Jun 3 19:33:22 2008 Akinori MUSHA <knu@iDaemons.org>
* enumerator.c (enumerator_init_copy): Take care of
initialize_copy as well as initialize.
-Tue Jun 3 16:06:09 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (file_expand_path): fix for non-existent files and SFN of
- symlinks. [ruby-talk:303736]
-
-Tue Jun 3 15:12:01 2008 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/set.rb (Set#classify): Back out the `group_by' alias.
- Better think twice.
-
-Tue Jun 3 15:00:22 2008 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/set.rb (Set#collect, Set#select): Back out. I thought it
- was consistent but turned out to be wrong.
-
-Tue Jun 3 13:41:08 2008 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/set.rb (Set#collect, Set#select): Override Enumerable
- methods and make them return a set. [ruby-core:17055]
- (Set#delete_if, Set#collect!, Set#reject!, Set#classify)
- (Set#divide, Set#delete_if): Return an enumerator if no block is
- given.
- (Set#classify): Define an alias `group_by' to override that of
- Enumerable.
-
-Tue Jun 3 13:35:40 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * process.c (run_exec_pgroup): C99 ism.
+ * test/ruby/test_enumerator.rb: Pull in the test suite for
+ enumerator from trunk.
Tue Jun 3 12:51:57 2008 Akinori MUSHA <knu@iDaemons.org>
@@ -24164,232 +203,65 @@ Tue Jun 3 12:51:57 2008 Akinori MUSHA <knu@iDaemons.org>
appropriate.
(enumerator_initialize): Fix a typo in rdoc. [ruby-core:17052]
-Tue Jun 3 01:21:51 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_method.rb: add a test.
-
-Tue Jun 3 00:26:48 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * marshal.c (w_object): add a check for modification of array during
- its dump.
-
-Mon Jun 2 22:27:57 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * enc/iso_8859_5.c: Large omicron should lowercase to small omicron.
-
- * test/ruby/test_big5.rb, test/ruby/test_cp949.rb,
- test/ruby/test_euc_jp.rb, test/ruby/test_euc_kr.rb,
- test/ruby/test_euc_tw.rb, test/ruby/test_gb18030.rb,
- test/ruby/test_gbk.rb, test/ruby/test_iso_8859.rb,
- test/ruby/test_koi8.rb, test/ruby/test_shift_jis.rb,
- test/ruby/test_windows_1251.rb: new tests for encoding.
-
- * test/ruby/test_utf16.rb, test/ruby/test_utf32.rb,
- test/ruby/test_regexp.rb: add tests.
-
-Mon Jun 2 21:56:47 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_file.rb: add tests for uninitialized object.
-
- * test/ruby/test_class.rb: ditto.
-
- * test/ruby/test_thread.rb: ditto.
-
-Mon Jun 2 21:44:15 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * re.c: fix SEGV by Regexp.allocate.names, Match.allocate.names, etc.
-
- * test/ruby/test_regexp.rb: add tests for above.
-
- * io.c: fix SEGV by IO.allocate.print, etc.
-
- * test/ruby/test_io.rb: add tests for above.
-
-Mon Jun 2 19:17:47 2008 Tanaka Akira <akr@fsij.org>
-
- * test/ruby/test_argf.rb (teardown): remove renamed temporary files.
-
-Mon Jun 2 18:51:15 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/un.rb (wait_writable): wait until target files can be
- written actually.
-
- * win32/Makefile.sub (LDSHARED_0, LINK_SO): get rid of failure of
- mt.exe.
-
-Mon Jun 2 16:26:17 2008 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/delegate.rb (Delegator::MethodDelegation#respond_to):
- respond_to? should now take optional second argument; submitted
- by Jeremy Kemper <jeremy at bitsweat.net> in [ruby-core:17045].
-
-Mon Jun 2 16:14:18 2008 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/erb.rb (ERB::Compiler::TrimScanner#scan_line): Oops. This
- change did not apply to trunk. Backed out.
-
-Mon Jun 2 16:08:24 2008 Akinori MUSHA <knu@iDaemons.org>
+Tue Jun 3 10:16:40 2008 Akinori MUSHA <knu@iDaemons.org>
* lib/erb.rb (ERB::Compiler::TrimScanner#scan_line): Fix a bug
- where tokens are not yielded one by one.
+ where tokens are not yilelded one by one.
+ (ERB::Compiler::TrimScanner#explicit_trim_line): Fix without-
+ strscan problems. [ruby_core:17028].
* test/erb/test_erb.rb (TestERBCore#_test_01)
(TestERBCore#test_02_safe_04): The expected value should come
first for assert_equal().
+ (TestERBCoreWOStrScan): Add test class for without-strscan.
-Mon Jun 2 13:06:38 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * mkconfig.rb: hide build path from rbconfig.rb.
-
-Mon Jun 2 08:46:52 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * util.c (ruby_strtod, dtoa): initialize more variables for error
- handling.
-
-Mon Jun 2 04:55:05 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * suppress warnings on cygwin, mingw and mswin.
-
-Mon Jun 2 04:35:32 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/gb18030.c (gb18030_code_to_mbc): add 0x80000000
- for 4bytes character.
-
-Mon Jun 2 03:52:04 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (set_arg0): reverted used variable definition.
-
-Mon Jun 2 03:23:25 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/gb18030.c (gb18030_mbc_to_code): mask by 0x7FFFFFFF
- because OnigCodePoint will be used as 32bit signed int.
- Masking by 0x7FFFFFFF is ok on GB18030;
- Minimum 4bytes character is 0x81308130.
-
-Sun Jun 1 22:29:35 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * rational.c (string_to_r_internal): use rb_isdigit.
-
- * marshal.c (long_toobig): use %zd.
-
- * ruby.c (set_arg0): move unused variable definition.
-
-Sun Jun 1 12:18:12 2008 NARUSE, Yui <naruse@ruby-lang.org>
+Mon Jun 2 19:47:16 2008 Akinori MUSHA <knu@iDaemons.org>
- * insns.def (DEFINE_INSN): subtract of pointers is ptrdiff_t.
- this is not int on 64bit system.
+ * lib/delegate.rb (DelegateClass, Delegator#respond_to?):
+ respond_to? must take optional second argument. This was a
+ latent bug exposed by a recent internal change of marshal.c to
+ call respond_to? with a second argument; submitted by Jeremy
+ Kemper <jeremy at bitsweat.net> in [ruby-core:17045].
- * vm_dump.c (control_frame_dump): ditto.
+Sat May 31 23:53:35 2008 Akinori MUSHA <knu@iDaemons.org>
- * vm_dump.c (stack_dump_each): ditto.
-
- * vm_dump.c (debug_print_register): ditto.
-
- * vm_dump.c (debug_print_pre): ditto.
-
- * transcode.c (str_transcode): ditto.
-
-Sun Jun 1 10:32:18 2008 Tanaka Akira <akr@fsij.org>
-
- * test/ruby/envutil.rb (assert_normal_exit): show coredump status.
+ * .: Release as Ruby 1.8.7.
Sat May 31 23:33:34 2008 Akinori MUSHA <knu@iDaemons.org>
* README, README.ja: Add a note about default C flags.
-Sat May 31 23:02:00 2008 Tanaka Akira <akr@fsij.org>
-
- * gc.c (count_objects): clear given hash.
+Sat May 31 22:11:15 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-Sat May 31 20:28:10 2008 Yusuke Endoh <mame@tsg.ne.jp>
+ * version.c (ruby_description, ruby_copyright): backported from
+ 1.9. bug#19002, [ruby-dev:34883]
- * test/ruby/test_regexp.rb: add tests.
+ * error.c (report_bug): uses ruby_description.
-Sat May 31 19:11:39 2008 NARUSE, Yui <naruse@ruby-lang.org>
+Sat May 31 20:56:04 2008 Akinori MUSHA <knu@iDaemons.org>
- * enc/utf_16{be,le}.c (utf16{be,le}_code_to_mbc):
- fix codepoint to bytes.
+ * array.c (rb_ary_delete_if): should return enumerator if no block
+ is given. [ruby-dev:34901]
Sat May 31 18:28:17 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* suppress warnings with -Wwrite-string.
-Sat May 31 18:26:33 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_delete_if): should return enumerator if no block
- is given. [ruby-dev:34901]
-
Sat May 31 15:58:08 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* Makefile.in, configure.in (warnflags): defaulted to -Wall
-Wno-parentheses with gcc. [ruby-dev:34810]
-Sat May 31 15:17:36 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/mvm.h: new header file for MVM, and moved rb_vm_t and
- rb_thread_t from vm_core.h.
-
-Sat May 31 12:02:23 2008 Tanaka Akira <akr@fsij.org>
-
- * test/ruby/envutil.rb (assert_normal_exit): show pid when fail.
-
-Fri May 30 23:55:56 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * test/ruby/test_rubyoptions.rb: add a test of RUBY_DESCRIPTION.
-
-Fri May 30 22:47:17 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_regexp.rb: add tests.
-
-Fri May 30 22:40:53 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_signal.rb: add tests to achieve over 80% test
- coverage of signal.c.
-
-Fri May 30 22:28:03 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * signal.c (esignal_signo): fix SignalException#signo which returned
- nil absolutely.
-
- * signal.c (esignal_init): always prepend "SIG" to a string that is
- returned by SignalException#signm.
-
-Fri May 30 22:17:39 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_argf.rb: rename a conflicting method name.
-
- * test/ruby/test_string.rb: ditto.
-
- * test/ruby/test_io.rb: ditto.
-
-Fri May 30 22:14:37 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * compile.c (defined_expr): fix SEGV by defined?([1]).
-
-Fri May 30 12:18:43 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (prelude.c): simply depends on PREP. [ruby-dev:34877]
+Fri May 30 05:28:18 2008 NAKAMURA Usaku <usa@ruby-lang.org>
- * enc/make_encdb.rb, enc/trans/make_transdb.rb: ditto.
+ * enum.c (count_i, count_iter_i, count_all_i): add prototypes for VC.
-Fri May 30 10:55:42 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri May 30 04:32:07 2008 Akinori MUSHA <knu@iDaemons.org>
- * vm_core.h (struct rb_unblock_callback), thread.c
- (set_unblock_function), thread_{pthread,win32}.c (native_sleep):
- extracted from struct rb_thread_struct.
-
- * thread.c (reset_unblock_function): not check interrupts at leaving
- blocking region. [ruby-dev:34874]
-
-Fri May 30 06:09:31 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/utf_8.c: add UTF8-MAC (UTF-8-MAC).
-
-Fri May 30 04:17:13 2008 Akinori MUSHA <knu@iDaemons.org>
-
- * enum.c (enum_count, count_all_i, Init_Enumerable),
- array.c (rb_ary_count): If no argument or block is given, count
- the number of all elements.
+ * enum.c (count_i, count_iter_i): Sync with trunk.
+ enum.c (enum_count, count_all_i, Init_Enumerable),
+ array.c (rb_ary_count): Sync with trunk. If no argument or
+ block is given, count the number of all elements.
Fri May 30 03:12:18 2008 Akinori MUSHA <knu@iDaemons.org>
@@ -24408,64 +280,33 @@ Fri May 30 02:35:00 2008 Akinori MUSHA <knu@iDaemons.org>
use FIX2INT() without checking the value type. Use NUM2INT()
instead; found by akr in [ruby-dev:34890].
-Fri May 30 02:08:20 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * signal.c (esignal_init): handle a non-integer argument correctly,
- allowing SignalException.new(:INT).
-
-Fri May 30 00:59:47 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_regexp.rb: add tests.
-
-Thu May 29 22:51:05 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_require.rb: add a test for load with wrap flag, to
- achieve 100% test coverage of eval_jump.c.
-
-Thu May 29 22:47:53 2008 Yusuke Endoh <mame@tsg.ne.jp>
+Thu May 29 20:07:45 2008 Akinori MUSHA <knu@iDaemons.org>
- * test/ruby/test_argf.rb: new tests for ARGF, to achieve over 85% test
- coverage of file.c.
-
- * test/ruby/test_io.rb: add tests.
-
-Thu May 29 22:41:48 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * io.c (argf_readchar): raise EOFError, synchronizing IO#readchar.
-
-Thu May 29 22:29:39 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * io.c (argf_external_encoding, argf_internal_encoding): fix SEGV by
- ARGF.external_encoding.
+ * configure.in, win32/Makefile.sub, mkconfig.rb, instruby.rb,
+ ruby.c, lib/mkmf.rb, README.EXT, README.EXT.ja: Backport the
+ vendor_ruby directory support.
Thu May 29 17:52:31 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/zlib/extconf.rb: search zlib1, and regard mswin32 later than VC6
as WIN32. [ruby-core:16984]
-Wed May 28 18:05:28 2008 Akinori MUSHA <knu@iDaemons.org>
-
- * array.c (rb_ary_nitems, Init_Array): Axe Array#nitems().
- cf. [ruby-dev:34676]-[ruby-dev:34713]
+Wed May 28 17:54:29 2008 Akinori MUSHA <knu@iDaemons.org>
-Wed May 28 17:50:32 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * string.c (rb_str_start_with): Remove an unused variable.
+ (rb_str_upto_m): Fix a prototype.
- * win32/mkexports.rb (Exports#objdump, Exports#each_line): extracted.
+Wed May 28 17:48:28 2008 Akinori MUSHA <knu@iDaemons.org>
-Wed May 28 17:41:43 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * range.c (range_step): Fix brokenness when a non-integer numeric
+ value is specified as step. [rubyspec]
+ (range_step): Make use of String#step internally if a string (or
+ string-alike) range is given.
- * Makefile.in (MKPREP): appended $(RBCONFIG).
+ * string.c (rb_str_upto_m, Init_String): Add an optional second
+ argument to specify if the last value should be included.
- * common.mk (enc.mk, prelude.c): not depend on $(RBCONFIG) on mswin32
- to get of compiling twice each time.
-
- * win32/Makefile.sub (prelude.c): not depend on $(PREP).
-
-Wed May 28 17:37:07 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/mkexports.rb (Exports::Mswin#each_export): speed up.
-
-Wed May 28 16:41:59 2008 Akinori MUSHA <knu@iDaemons.org>
+Wed May 28 16:53:39 2008 Akinori MUSHA <knu@iDaemons.org>
* array.c (rb_ary_slice_bang): Call rb_ary_modify_check() at the
beginning. [rubyspec]
@@ -24477,20 +318,10 @@ Wed May 28 16:12:44 2008 Akinori MUSHA <knu@iDaemons.org>
present and the status code is not valid as a client
redirection. cf. RFC 3875 6.2.3, 6.2.4.
-Wed May 28 15:53:52 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * enc/trans/japanese.c (to_SHIFT_JIS_EF_infos): typo.
-
Wed May 28 15:18:16 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/singleton.rb (SingletonClassMethods): _load should be public.
-Wed May 28 13:30:43 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/trans/japanese.c: add workaround for Unicode to CP932.
- U+2015->0x815C, U+2225->0x8161, U+FF0D->0x817C, U+FF3C->0x815F,
- U+FF5E->0x8160, U+FFE0->0x8191, U+FFE1->0x8192, U+FFE2->0x81CA
-
Wed May 28 12:52:41 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* marshal.c (w_object, marshal_dump, r_object0, marshal_load): search
@@ -24498,69 +329,73 @@ Wed May 28 12:52:41 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* object.c (convert_type): ditto.
-Wed May 28 08:42:51 2008 Tanaka Akira <akr@fsij.org>
-
- * numeric.c: "%" is required before PRI?VALUE.
-
-Tue May 27 22:10:44 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval_error.c (error_handle): SystemExit and SignalException throws
- TAG_RAISE but not TAG_FATAL.
+Tue May 27 23:26:49 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
- * thread.c (rb_thread_execute_interrupts): delay interrupts during
- raising exceptions. [ruby-dev:34855]
+ * error.c (rb_bug): description from rb_bug() should include
+ patchlevel. [ruby-dev:34826]
-Tue May 27 20:18:30 2008 Akinori MUSHA <knu@iDaemons.org>
+Tue May 27 20:19:22 2008 Akinori MUSHA <knu@iDaemons.org>
* array.c (rb_ary_slice_bang): Return an empty array instead of
nil when pos is valid and len is adjusted from a valid value to
zero; caught by RubySpec.
-Tue May 27 19:12:37 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue May 27 19:45:20 2008 Akinori MUSHA <knu@iDaemons.org>
- * Makefile.in (MKPREP), common.mk, win32/Makefile.sub (prelude.c): get
- rid of depending PREP with nmake.
+ * numeric.c (flo_divmod): Revert the behavior change; do not
+ suppress an exception when div is NaN or Inf. [ruby-dev:34857]
- * common.mk (encs): depends on libruby.
+Tue May 27 19:24:40 2008 Akinori MUSHA <knu@iDaemons.org>
-Tue May 27 19:00:22 2008 Akinori MUSHA <knu@iDaemons.org>
+ * enum.c (enum_to_a): Pass arguments through to #each().
+ (enum_sort): Follow the enum_to_a signature change.
+ (enum_reverse_each): Add #reverse_each().
+
+Tue May 27 18:54:02 2008 Akinori MUSHA <knu@iDaemons.org>
* ext/stringio/stringio.c (strio_each_char, Init_stringio): Add
StringIO#{each_char,chars}.
- (Init_stringio): Fix StringIO#bytes.
-Tue May 27 17:54:35 2008 Akinori MUSHA <knu@iDaemons.org>
+Tue May 27 17:59:34 2008 Akinori MUSHA <knu@iDaemons.org>
+
+ * ext/stringio/stringio.c (strio_each): Return an enumerator if no
+ block is given.
+ (strio_each_byte): Return an enumerator if no block is given,
+ and return self if one is given as the rdoc says.
- * ext/stringio/stringio.c (strio_each_byte): Return self instead
- of nil as the rdoc says.
+ * io.c (rb_io_each_byte): Fix rdoc. IO#each_byte returns self,
+ not nil.
-Tue May 27 15:36:27 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+Tue May 27 16:02:58 2008 Akinori MUSHA <knu@iDaemons.org>
- * numeric.c (check_int): use PRIxVALUE format specifier.
+ * eval.c (rb_mod_module_exec, Init_eval): Add
+ Module#{module_exec,class_exec}.
- * numeric.c (check_uint, rb_num2fix, int_chr): ditto.
+Tue May 27 15:36:37 2008 Akinori MUSHA <knu@iDaemons.org>
- * numeric.c (num_fdiv): fallback to_f should always return float
- result. should not use #quo that may return rational.
+ * io.c (rb_io_each_char, argf_each_char, Init_IO):
+ Add {IO#,ARGF.}{each_char,chars}.
- * numeric.c (num_div): should raise ZeroDivisionError.
+Tue May 27 13:46:52 2008 Akinori MUSHA <knu@iDaemons.org>
- * numeric.c (fix_divide): ditto.
+ * ext/stringio/stringio.c (Init_stringio): Define
+ StringIO#{getbyte,readbyte}.
- * test/ruby/test_numeric.rb (TestNumeric::test_divmod): avoid
- ZeroDivisionError in tests.
+Tue May 27 13:38:51 2008 Akinori MUSHA <knu@iDaemons.org>
-Tue May 27 13:14:53 2008 Akinori MUSHA <knu@iDaemons.org>
+ * io.c (Init_IO): Define {IO#,ARGF.}{getbyte,readbyte}.
- * enum.c (enum_to_a): Pass arguments through to #each().
- (enum_sort): Follow the enum_to_a signature change.
- (enum_reverse_each): Add #reverse_each().
+Tue May 27 13:26:15 2008 Akinori MUSHA <knu@iDaemons.org>
+
+ * ext/stringio/stringio.c (Init_stringio): Define #bytes and
+ #lines.
-Tue May 27 13:12:37 2008 Akinori MUSHA <knu@iDaemons.org>
+Tue May 27 13:20:35 2008 Akinori MUSHA <knu@iDaemons.org>
- * io.c (Init_IO): Define ARGF.{lines,bytes,chars}.
+ * io.c: (rb_io_lines, rb_io_bytes, Init_IO): Define
+ IO#{lines,bytes} and ARGF.{lines,bytes}.
-Tue May 27 12:06:37 2008 NAKAMURA Usaku <usa@ruby-lang.org>
+Tue May 27 12:13:17 2008 NAKAMURA Usaku <usa@ruby-lang.org>
* file.c (BUFCHECK): wrong condition. [ruby-core:16921]
@@ -24572,193 +407,167 @@ Mon May 26 18:24:48 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* file.c (file_expand_path): use BUFCHECK.
-Mon May 26 17:48:42 2008 Akinori MUSHA <knu@iDaemons.org>
-
- * enumerator.c (struct enumerator, enumerator_init)
- (enumerator_init_copy, enumerator_each): Eliminate iter.
- (enumerator_ptr): Do not hardcode the class name.
- (enumerator_with_index): Delay variable initialization after
- RETURN_ENUMERATOR().
-
-Mon May 26 17:23:49 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * file.c (file_expand_path): add more space for '/'.
-
- * file.c (file_expand_path): should reset address of p after calling
- rb_str_resize(). [ruby-dev:34800]
-
-Mon May 26 16:49:55 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * misc/ruby-mode.el (ruby-mode): use run-hooks if run-mode-hook is
- not available. a patch from Kazuhiro NISHIYAMA <zn at mbf.nifty.com>
- in [ruby-dev:34853].
-
-Mon May 26 16:41:35 2008 NAKAMURA Usaku <usa@ruby-lang.org>
+Mon May 26 16:46:19 2008 NAKAMURA Usaku <usa@ruby-lang.org>
* file.c (ntfs_tail): filename which starts with '.' is valid.
* file.c (file_expand_path): cygwin symlink support.
-Mon May 26 07:15:52 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm_dump.c (rb_vm_bugreport): rb_make_backtrace has no arguments.
-
-Mon May 26 01:17:54 2008 Tanaka Akira <akr@fsij.org>
-
- * test/ruby/envutil.rb (assert_normal_exit): signal description
- refined.
+Mon May 26 12:16:43 2008 Akinori MUSHA <knu@iDaemons.org>
-Mon May 26 00:52:52 2008 Akinori MUSHA <knu@iDaemons.org>
+ * .: Release as Ruby 1.8.7-preview4.
- * hash.c (env_each_key, env_each_value, env_reject_bang)
- (rb_env_clear, env_replace): Omit duplicated secure level check.
+Mon May 26 12:12:26 2008 Akinori MUSHA <knu@iDaemons.org>
-Mon May 26 00:37:16 2008 Akinori MUSHA <knu@iDaemons.org>
+ * marshal.c (dump_ensure, load_ensure): should return values.
- * hash.c (env_each_value): Do not call env_values() twice.
+ * eval.c (yield_under, yield_under_i, yield_args_under_i)
+ (specific_eval, rb_obj_instance_exec, Init_eval): Implement
+ Object#instance_exec(), a 1.9 feature.
-Sun May 25 17:54:36 2008 Yusuke Endoh <mame@tsg.ne.jp>
+Mon May 26 11:53:21 2008 Akinori MUSHA <knu@iDaemons.org>
- * compile.c (iseq_compile): set local_table for
- ISEQ_TYPE_DEFINED_GUARD.
+ * eval.c (rb_yield_0, proc_invoke, proc_arity): allow passing a
+ block to a Proc. [ruby-dev:23533]; by nobu; backported from
+ 1.9. This implementation in current shape is known to be
+ buggy/broken, especially with nested block invocation. Take
+ this as an experimental feature.
-Sun May 25 17:52:25 2008 Yusuke Endoh <mame@tsg.ne.jp>
+ * parse.y (block_par, block_var): ditto.
- * compile.c (iseq_build_body): remove side effect from
- VM::InstructionSequence.load.
+Mon May 26 08:00:52 2008 Akinori MUSHA <knu@iDaemons.org>
-Sun May 25 04:30:45 2008 Yusuke Endoh <mame@tsg.ne.jp>
+ * marshal.c (r_object0, Init_marshal): Fix the garbled s_call
+ definition; fixes [ruby-dev:34843].
- * test/ruby/test_module.rb (remove_json_mixins): change judgment
- condition.
+Mon May 26 03:16:20 2008 Akinori MUSHA <knu@iDaemons.org>
-Sun May 25 03:54:39 2008 Yusuke Endoh <mame@tsg.ne.jp>
+ * hash.c (rb_hash_default): Fix rdoc.
+ (rb_hash_each, env_each_value, env_each_pair): Return an
+ enumerator if no block is given.
+ (rb_hash_update): Update rdoc.
+ (envix): Conditionalize the definition itself.
+ (rb_f_getenv, env_fetch, env_keys, env_values, env_values_at)
+ (env_select, env_inspect, env_to_a, env_empty_p, env_has_key)
+ (env_has_value, env_index, env_indexes, env_to_hash, env_shift)
+ (env_update): Require secure level 4.
+ (env_each_value, env_each_i): Delay variable initialization.
+ (env_each_key, env_each_value, env_reject_bang)
+ (env_clear, env_replace): Omit duplicated secure level check.
+ (env_has_value): Do to_str conversion.
+
+Sun May 25 19:48:12 2008 Akinori MUSHA <knu@iDaemons.org>
+
+ * hash.c (env_delete_if): Return an enumerator if no block is
+ given.
+ (env_each_key): Delay a variable initialization after
+ RETURN_ENUMERATOR().
- * test/ruby/test_module.rb (test_ancestors, test_included_modules):
- ignore json mixins.
+Sun May 25 05:07:19 2008 Akinori MUSHA <knu@iDaemons.org>
-Sun May 25 02:37:25 2008 Koichi Sasada <ko1@atdot.net>
+ * array.c (rb_ary_slice_bang): Be consistent with Array#slice()
+ and String#slice!(). Just return nil when a negative length or
+ out of boundary index is given instead of raising an exception
+ via internal functions.
+ (rb_ary_slice_bang): should not use rb_ary_subseq() which shares
+ internal pointer. splice modifies the receiver right after
+ subseq. [ruby-dev:34005]
+ (rb_ary_slice_bang): should adjust length before making
+ sub-array.
- * eval_method.c: renamed from vm_method.c. "vm_method.c" is included
- by "vm.c".
+ * enumerator.c (Init_Enumerator): Override
+ Enumerable::Enumerator#each_with_index with #with_index.
- * vm_eval.c: added. Some codes are moved from "eval.c"
+Sun May 25 03:13:09 2008 Akinori MUSHA <knu@iDaemons.org>
- * common.mk: fix for above changes.
+ * eval.c (Init_Thread): Initialize recursive_key.
- * compile.c: make a vm_eval(0)
+Sun May 25 02:45:49 2008 Akinori MUSHA <knu@iDaemons.org>
- * eval.c, eval_error.c, eval_intern.h, eval_jump.c, proc.c, vm.c,
- id.c, id.h, vm_core.h, vm_dump.c, vm_evalbody.c, vm_insnhelper.c,
- blockinlining.c: fix for above changes. and do some refactoring.
- this changes improve rb_yield() performance.
+ * error.c (syserr_eqq): Use en.
Sat May 24 22:32:49 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
- * util.c (ruby_strtod): clear errno at the top of our own
- implementation of strtod(3). [ruby-dev:34834] [ruby-dev:34839]
+ * object.c (rb_cstr_to_dbl): should clear errno before calling
+ strtod(3). [ruby-dev:34834]
-Sat May 24 15:26:16 2008 Yusuke Endoh <mame@tsg.ne.jp>
+Sat May 24 22:27:44 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
- * compile.c (iseq_set_exception_table, NODE_WHILE, NODE_NEXT): remove
- special handling that decrements sp in CATCH_TYPE_NEXT for NODE_WHILE.
+ * marshal.c (marshal_load): should initialize arg.data used for
+ reentrant check. [ruby-dev:34837]
- * vm.c (vm_eval_body), vm_insnhelper.c (vm_throw): remove unused code.
+Sat May 24 00:34:59 2008 Tanaka Akira <akr@fsij.org>
-Sat May 24 08:13:34 2008 NARUSE, Yui <naruse@ruby-lang.org>
+ * lib/rational.rb (Rational#to_i): fix rdoc. Rational(-7,4).to_i
+ should be -1.
- * transcode.c (rb_str_transcode): argc is 1, and argv is &to.
+Fri May 23 20:22:44 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-Fri May 23 17:55:11 2008 Akinori MUSHA <knu@iDaemons.org>
+ * marshal.c (reentrant_check): check reentrance via callcc.
+ [ruby-dev:34802]
- * array.c (rb_ary_slice_bang): Be consistent with Array#slice()
- and String#slice!(). Just return nil when a negative length or
- out of boundary index is given instead of raising an exception
- via internal functions.
+Fri May 23 16:46:28 2008 Akinori MUSHA <knu@iDaemons.org>
-Fri May 23 16:44:34 2008 Akinori MUSHA <knu@iDaemons.org>
+ * enumerator.c (proc_call): Remove an unused static function.
- * enumerator.c (Init_Enumerator): Override
- Enumerable::Enumerator#each_with_index with #with_index.
+Fri May 23 13:46:09 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri May 23 12:23:05 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * configure.in (cflags): commit miss.
- * vm_core.h (rb_num_t): moved form vm.h.
+Fri May 23 09:52:21 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * tool/instruction.rb (RubyVM::Instruction#sp_increase_c_expr),
- tool/instruction.rb (RubyVM::VmBodyGenerator#make_header_operands):
- omit unused variables.
+ * configure.in (MINIRUBY), common.mk (RUBYOPT): add purelib.rb.
+ [ruby-core:16642]
-Fri May 23 08:47:02 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * ext/extmk.rb: load purelib.rb only when not cross compiling.
- * error.c (exc_equal): == operator should be transitional.
- [ruby-dev:34808]
+Fri May 23 08:47:02 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* error.c (syserr_eqq): === should be able to handle delegated
objects as well.
-Fri May 23 06:15:20 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * iseq.c (rb_iseq_compile_with_option): get rid of segv.
-
-Fri May 23 02:29:14 2008 Koichi Sasada <ko1@atdot.net>
-
- * insns.def (opt_gt|ge|lt|le): use values directly to compare.
-
-Fri May 23 01:15:09 2008 Koichi Sasada <ko1@atdot.net>
+Fri May 23 04:22:19 2008 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * eval.c, eval_intern.h, include/ruby/intern.h, include/ruby/ruby.h,
- vm.c, vm_core.h, vm_insnhelper.c: remove pointless "const".
-
-Thu May 22 23:45:17 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * compile.c (get_destination_insn, get_next_insn, get_prev_insn):
- peephole optimization should not ignore ISEQ_ELEMENT_ADJUST.
-
-Thu May 22 20:20:54 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * marshal.c (check_dump_arg, check_load_arg): check if reentered.
- [ruby-dev:34802]
-
-Thu May 22 20:14:28 2008 Yusuke Endoh <mame@tsg.ne.jp>
+ * ext/tk/tcltklib.c, ext/tk/tkutil/tkutil.c: fix memory leak.
- * iseq.c (iseq_load, iseq_data_to_ary): support
- ISEQ_TYPE_DEFINED_GUARD.
+ * ext/tk/lib/tk.rb: avoid trouble when finalize TclTkIp.
-Thu May 22 19:01:29 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/tk/lib/tk.rb, ext/tk/lib/tk/*: help to fix troubles when
+ use Ttk widgets on old Tk scripts.
- * vm.c (vm_get_ruby_level_cfp): moved from eval_intern.h.
+ * ext/tk/sample/*: update and add demo scripts. some of them are
+ introduction about new features of Tcl/Tk8.5.
- * vm.c (sdr, nsdr): define methods only if VMDEBUG is defined.
+Fri May 23 03:48:10 2008 Akinori MUSHA <knu@iDaemons.org>
-Thu May 22 17:18:35 2008 Tanaka Akira <akr@fsij.org>
+ * class.c (clone_method): Just use ruby_cref as cref.
- * array.c (rb_ary_compact_bang): fix reallocation size.
+Fri May 23 01:03:23 2008 Akinori MUSHA <knu@iDaemons.org>
-Thu May 22 15:20:20 2008 NAKAMURA Usaku <usa@ruby-lang.org>
+ * class.c (rb_singleton_class_clone): Pass Qnil, not 0.
- * eval_intern.h, vm_core.h, include/ruby/intern.h, include/ruby/ruby.h,
- vm.c: need to add const to prototypes, of course.
+Fri May 23 00:51:48 2008 Akinori MUSHA <knu@iDaemons.org>
-Thu May 22 13:24:43 2008 Koichi Sasada <ko1@atdot.net>
+ * class.c (clone_method): Totally revamp the previous fix which
+ was incorrect.
+ (rb_mod_init_copy): Ditto.
+ (singleton_class_clone_int): Ditto.
- * eval.c, vm.c, vm_core.h, vm_insnhelper.c: specify "const".
+Fri May 23 00:48:10 2008 Akinori MUSHA <knu@iDaemons.org>
- * vm_opts.h: add a OPT_TOKEN_THREADED_CODE macro.
+ * eval.c (rb_copy_node_scope), node.h: Rename from copy_node_scope
+ and export.
-Thu May 22 12:51:41 2008 Tanaka Akira <akr@fsij.org>
+Thu May 22 21:24:15 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
- * insns.def (newhash): fix a variable definition: "const k".
+ * parse.y (top_local_setup): fixed memory leak bug based on a
+ patch from Roger Pack <rogerpack2005 at gmail.com> in
+ [ruby-core:16610].
-Thu May 22 12:40:54 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu May 22 14:20:54 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* array.c (flatten): check if reentered. [ruby-dev:34798]
-Thu May 22 11:39:59 2008 Tanaka Akira <akr@fsij.org>
-
- * test/ruby/envutil.rb (assert_normal_exit): capture stdout and stderr
- of the child process.
-
Thu May 22 08:28:49 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* array.c (flatten): free memo hash table before raising exception.
@@ -24768,172 +577,31 @@ Thu May 22 06:30:10 2008 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* array.c (flatten): fix memory leak.
-Thu May 22 06:21:34 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/nkf/nkf-utf8/nkf.c (nkf_str_caseeql): added.
-
- * ext/nkf/nkf-utf8/nkf.c (nkf_enc_find_index): use nkf_str_caseeql.
-
Thu May 22 05:45:30 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* proc.c (proc_dup): should copy safe_level from src proc
properly. a patch from Keita Yamaguchi
<keita.yamaguchi at gmail.com>
-Thu May 22 02:46:08 2008 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/net/imap.rb: do not use Thread#raise. [ruby-dev:34739]
-
-Thu May 22 00:30:06 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_require.rb: new tests for library requiring, to
- achieve over 90% test coverage of dln.c.
-
- * test/ruby/test_class.rb: add tests to achieve over 90% test coverage
- of class.c.
-
- * test/ruby/test_module.rb: ditto.
-
-Thu May 22 00:15:44 2008 Koichi Sasada <ko1@atdot.net>
-
- * insns.def, vm_insnhelper.c: specify "const".
-
-Wed May 21 23:20:21 2008 Koichi Sasada <ko1@atdot.net>
-
- * bootstraptest/test_eval.rb: fix syntax.
-
-Wed May 21 17:46:17 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/nkf/nkf-utf8/nkf.c (nkf_enc_find_index):
- use strcasecmp. [ruby-dev:34787]
-
-Wed May 21 16:48:22 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_compact_bang): avoid forceful realloc.
-
-Wed May 21 07:42:28 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (rb_usascii_str_new): use rb_str_new.
-
- * string.c (rb_enc_str_new): ditto.
-
- * string.c (rb_usascii_str_new2): use rb_str_new2.
-
-Wed May 21 07:22:01 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * encoding.c, include/ruby/encoding.h
- (rb_enc_associate, rb_enc_associate_index):
- returns obj. [ruby-dev:34778]
-
-Wed May 21 04:20:20 2008 NARUSE, Yui <naruse@ruby-lang.org>
+Wed May 21 23:31:44 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * encoding.c (rb_ascii8bit_encoding): use ENCINDEX_ASCII.
+ * eval.c (rb_get_method_body, rb_alias, rb_eval): should not cache
+ uninitialized value, since search_method doesn't set origin if the
+ method wasn't found.
- * encoding.c, include/ruby/encoding.h (rb_ascii8bit_encindex):
- added.
+ * eval.c (search_method, remove_method, error_print, rb_alias)
+ (rb_eval, rb_rescue2, search_required, Init_eval, rb_thread_create),
+ gc.c (rb_source_filename, Init_stack), io.c (rb_io_getline),
+ parse.y (rb_id2name, rb_parser_free): suppress warnings.
- * encoding.c (rb_locale_encoding): use rb_usascii_encoding().
+Wed May 21 12:34:51 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed May 21 01:45:58 2008 NAKAMURA Usaku <usa@ruby-lang.org>
+ * hash.c (rb_hash_delete): rdoc fix based on a patch from Gaston Ramos
+ <ramos.gaston AT gmail.com>. [ruby-core:16825]
- * test/ruby/test_file_exhaustive.rb (setup): workaround for Windows
- Vista.
+Tue May 20 13:15:46 2008 Akinori MUSHA <knu@iDaemons.org>
- * test/ruby/envutil.rb (rubyexec): now Open3.open3 is supported on
- Windows.
-
- * test/ruby/test_process.rb: use ``||'' instead of ``;'' because
- cmd.exe not support it.
-
-Wed May 21 01:28:47 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * transcode.c, include/ruby/encoding.h (rb_str_transcode):
- C API of encoding conversion for Ruby object.
- VALUE rb_str_transcode(VALUE str, VALUE to).
-
- * transcode.c (str_encode, str_encode_bang):
- rename from rb_tr_transcode or rb_str_transcode_bang.
-
-Tue May 20 23:26:05 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_array.rb: fix tests for 64bit CPU.
-
-Tue May 20 20:59:56 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/nkf/nkf-utf8/nkf.c (rb_nkf_convert) (nkf_enc_without_bom):
- reverted. nkf-utf8/nkf.c should be independent of ruby.
-
- * ext/nkf/nkf.c (options):
- moved from nkf-utf8/nkf.c.
- override nkf's original settings for Unicode BOM.
-
-Tue May 20 13:20:51 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/nkf/nkf.c (rb_nkf_convert), ext/nkf/nkf-utf8/nkf.c
- (nkf_enc_without_bom): BOM is not a part of encodings.
-
- * ext/nkf/nkf.c (Init_nkf), ext/nkf/nkf-utf8/nkf.c (options):
- UTF-{16,32} without endian have no sense.
-
-Tue May 20 12:13:50 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (proc_options, process_options): --dump option.
-
-Tue May 20 11:36:06 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/ruby.h (PRI[diouxX]VALUE): printf format for VALUE.
-
- * gc.c (assign_heap_slot): suppress a warning.
-
-Tue May 20 03:42:43 2008 Koichi Sasada <ko1@atdot.net>
-
- * eval.c, vm_insnhelper.c: fix cref in instance_eval
- and cvar_base search protocol.
-
- * bootstraptest/test_knownbug.rb, test_eval.rb: move solved test
- and add new tests.
-
- * test/ruby/test_eval.rb: fix tests for spec.
-
-Tue May 20 01:43:44 2008 Koichi Sasada <ko1@atdot.net>
-
- * bootstraptest/test_knownbug.rb: fix a test.
- "block_given?" returns true if "yield" can be used.
-
-Tue May 20 01:07:19 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * parse.y (assignable_gen): when "self = 1" was evaluated, unnecessary
- error message was output, which might cause null pointer access.
-
-Tue May 20 08:38:56 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_enc_strlen_cr): need to set ENC_CODERANGE_7BIT if
- search_nonascii() fails. [ruby-dev:34751]
-
- * string.c (rb_str_reverse): preserve coderange info if the
- receiver is 7bit string.
-
- * string.c (rb_str_reverse_bang): ditto.
-
- * string.c (rb_str_reverse_bang): should have called
- single_byte_optimizable before rb_str_modify() that clears
- coderange info.
-
- * string.c (tr_trans): handle single bytes more eagerly.
-
-Mon May 19 23:32:12 2008 Koichi Sasada <ko1@atdot.net>
-
- * vm.c (invoke_block_from_c): fix call flow.
-
-Mon May 19 23:19:35 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * regexec.c (slow_search): check the case when the length is 1.
- The behavior of memcmp is undefined if the third argument is 0.
-
-Mon May 19 21:07:48 2008 Koichi Sasada <ko1@atdot.net>
-
- * thread_pthread.c (native_thread_apply_priority):
- fix argument range check. [ruby-dev:33124]
+ * file.c (lchmod_internal): Remove a compiler warning.
Mon May 19 18:22:35 2008 Akinori MUSHA <knu@iDaemons.org>
@@ -24941,73 +609,32 @@ Mon May 19 18:22:35 2008 Akinori MUSHA <knu@iDaemons.org>
of md; pointed out by Takahiro Kambe <taca at back-street.net>
in [ruby-dev:34748].
-Mon May 19 17:23:55 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * regparse.c (PINC): use optimized enclen() instead of
- ONIGENC_MBC_ENC_LEN().
-
- * regparse.c (PFETCH): ditto.
-
- * regparse.c (PFETCH): small optimization.
-
- * regexec.c (slow_search): single byte encoding optimization.
-
- * regenc.h (enclen): avoid calling function when encoding's
- min_len == max_len.
-
- * re.c (rb_reg_regsub): rb_enc_ascget() optimization for single
- byte encoding.
-
- * re.c (rb_reg_search): avoid allocating new re_registers if we
- already have MatchData.
+Mon May 19 14:20:13 2008 NAKAMURA Usaku <usa@ruby-lang.org>
- * re.c (match_init_copy): avoid unnecessary onig_region_free()
- before onig_region_copy.
+ * sprintf.c (rb_f_sprintf): fixed SEGV on win32 with "% 0e" % 1.0/0.0.
- * encoding.c (rb_enc_get_index): remove implicit enc_capable check
- each time.
+Mon May 19 13:29:58 2008 NAKAMURA Usaku <usa@ruby-lang.org>
- * encoding.c (rb_enc_set_index): ditto.
+ * process.c (rb_f_system): set last_status when status == -1 because
+ there is no path to set it on win32. this patch is derived from
+ [ruby-core:16787], submitted by Luis Lavena <luislavena at gmail.com>
- * encoding.c (enc_compatible_p): small refactoring.
+Mon May 19 13:01:05 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * include/ruby/encoding.h (rb_enc_dummy_p): inline
- rb_enc_dummy_p() and export related code.
+ * common.mk ({MSPEC,RUBYSPEC}_GIT_URL): moved from Makefine.in.
-Mon May 19 14:32:03 2008 Koichi Sasada <ko1@atdot.net>
+ * {win32,bcc32}/Makefile.sub (update-rubyspec): added.
- * version.h: fix strange change by version.h update tool.
+Mon May 19 11:53:45 2008 Akinori MUSHA <knu@iDaemons.org>
-Mon May 19 14:18:13 2008 Koichi Sasada <ko1@atdot.net>
-
- * bootstraptest/test_knownbug.rb: move solved tests.
-
- * bootstraptest/test_eval.rb, test_literal.rb, test_syntax.rb,
- test_thread.rb: ditto.
-
- * test/ruby/test_m17n.rb, test_proc.rb, test_sprintf.rb,
- test_string.rb, test/ruby/test_struct.rb: ditto.
-
-Mon May 19 13:23:03 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * process.c (rb_spawn_internal): set last_status when status == -1
- because there is no path to set it on win32. this patch is derived
- from [ruby-core:16787], submitted by Luis Lavena <luislavena at
- gmail.com>
-
-Mon May 19 11:32:47 2008 Koichi Sasada <ko1@atdot.net>
-
- * vm.c, insns.def, eval.c, vm_insnhelper.c: fix CREF handling.
- VM value stack frame of block contains cref information.
- (dfp[-1] points CREF)
-
- * compile.c, eval_intern.h, eval_method.c, load.c, proc.c,
- vm_dump.h, vm_core.h: ditto.
+ * ext/openssl/openssl_missing.c (HMAC_CTX_copy): adopted
+ prototype change in openssl bundled with newer OpenBSD.
+ a patch from Takahiro Kambe <taca at back-street.net> in
+ [ruby-dev:34691].
- * include/ruby/ruby.h, gc.c: remove T_VALUES because of above
- changes.
+Mon May 19 06:36:37 2008 Akinori MUSHA <knu@iDaemons.org>
- * bootstraptest/test_eval.rb, test_knownbug.rb: move solved test.
+ * .: Release as Ruby 1.8.7-preview3.
Sun May 18 22:26:51 2008 GOTOU Yuuzou <gotoyuzo@notwork.org>
@@ -25019,589 +646,216 @@ Sun May 18 22:26:51 2008 GOTOU Yuuzou <gotoyuzo@notwork.org>
filename) is less than perfect.
* lib/webrick/httpservlet/abstract.rb
- (WEBrick::HTTPServlet::AbstractServlet#redirect_to_directory_uri):
+ (WEBrick::HTTPServlet::AbstracServlet#redirect_to_directory_uri):
should escape the value of Location: header.
* lib/webrick/httpservlet/cgi_runner.rb: accept interpreter
command line arguments.
-Sun May 18 02:54:46 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * pack.c (pack_pack): check errno to detect error of ruby_strtoul.
-
- * pack.c (pack_unpack): ditto.
-
- * test/ruby/test_pack.rb: add a test for above.
-
Sat May 17 23:53:57 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* file.c (file_expand_path): fix for short file name on Cygwin.
-Sat May 17 18:03:52 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * vm.c (Init_VM): removed the definition of Thread#initialize,
- which is overwritten in Init_Thread and is never used.
-
-Sat May 17 14:01:50 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * array.c (rb_ary_sort_bang): should not free shared pointer, and set
- shared. [ruby-dev:34732]
-
-Sat May 17 12:34:54 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * thread_pthread.c (Init_native_thread): Kernel#.sleep used never to
- sleep on Mac OS X. Reported by arton <artonx AT yahoo.co.jp>.
-
- * thread_pthread.c (native_sleep): added error checks.
-
Sat May 17 11:29:11 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* file.c (rb_file_s_extname): first dot is not an extension name.
-Sat May 17 03:21:29 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_sort_bang): stop memory leak. [ruby-dev:34726]
+Sat May 17 10:18:44 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* re.c (rb_reg_search): need to free allocated buffer in re_register.
- * regexec.c (onig_region_new): more pedantic malloc check.
-
- * regexec.c (onig_region_resize): ditto.
-
- * regexec.c (STATE_CHECK_BUFF_INIT): ditto.
-
- * regexec.c (onig_region_copy): use onig_region_resize.
+Fri May 16 17:01:44 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-Fri May 16 12:48:33 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * win32/Makefile.sub (test-rubyspec): added.
- * math.c (to_flo): rb_Float() accepts even strings for input.
+Fri May 16 16:22:40 2008 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * complex.c (nucomp_to_f): fix wrong message.
+ * ext/tk/tcltklib.c: sometimes freeze when receive Interrupt signal.
- * complex.c (nucomp_to_r): ditto.
+Fri May 16 14:54:56 2008 Tanaka Akira <akr@fsij.org>
- * object.c (rb_Float): do not check NaN for error. NaN is a part
- of valid float values.
+ * Makefile.in (update-rubyspec): move rubyspec to srcdir.
+ (test-rubyspec): ditto.
-Thu May 15 23:36:09 2008 Yusuke Endoh <mame@tsg.ne.jp>
+Fri May 16 14:25:22 2008 Tanaka Akira <akr@fsij.org>
- * test/ruby/test_string.rb: add tests to achieve over 90% test
- coverage of string.c.
+ * Makefile.in (test-rubyspec): use RUNRUBY. suggested by nobu.
- * test/ruby/test_m17n.rb: ditto.
+Fri May 16 13:01:43 2008 Tanaka Akira <akr@fsij.org>
- * test/ruby/test_symbol.rb: ditto.
+ * Makefile.in (update-rubyspec): new target to download rubyspec.
+ (test-rubyspec): new target to run rubyspec. this doesn't work
+ before install.
- * test/ruby/test_pack.rb: ditto.
+Fri May 16 08:15:52 2008 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-Thu May 15 23:01:06 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * string.c (tr_find): String#delete returned wrong result when multiple
- utf-8 arguments are passed.
+ * ext/tk/lib/tk.rb: fix memory (object) leak bug.
- * test/ruby/test_m17n.rb (test_delete): add a test for above.
+ * ext/tk/sample/demos-jp/aniwave.rb, ext/tk/sample/demos-en/aniwave.rb:
+ bug fix.
-Thu May 15 22:37:56 2008 NAKAMURA Usaku <usa@ruby-lang.org>
+Thu May 15 17:00:22 2008 Akinori MUSHA <knu@iDaemons.org>
- * parse.y (ripper_warningS): now used.
+ * string.c (Init_String): Define #bytesize as an alias for #size
+ for compatibility with 1.9.
Thu May 15 15:33:59 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* file.c (file_expand_path): support for alternative data stream
- and ignored trailing garbage of NTFS.
+ and ignored trailing garbages of NTFS.
* file.c (rb_file_s_basename): ditto.
* file.c (rb_file_s_extname): ditto.
-Thu May 15 13:43:36 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (rb_cstr_to_dbl): no need for forceful warning when
- converting to float. overflow is a nature of float values.
-
- * parse.y (parser_yylex): ditto.
-
-Thu May 15 13:23:20 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * re.c (rb_reg_prepare_enc): error condition was updated for non
- ASCII compatible strings.
-
-Thu May 15 12:19:42 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/openssl/openssl_missing.c (HMAC_CTX_copy): adopted
- prototype change in openssl bundled with newer OpenBSD.
- a patch from Takahiro Kambe <taca at back-street.net> in
- [ruby-dev:34691].
-
-Wed May 14 22:09:25 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * ChangeLog: fix typo.
-
-Wed May 14 21:49:14 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_object.rb: new tests to achieve over 90% test
- coverage of object.c, eval.c and eval_method.c.
-
- * test/ruby/test_module.rb: ditto.
-
- * test/ruby/test_trace.rb: ditto.
-
- * test/ruby/test_integer.rb: ditto.
-
- * test/ruby/test_float.rb: ditto.
-
- * test/ruby/test_method.rb: ditto.
-
- * test/ruby/test_variable.rb: ditto.
-
- * test/ruby/test_eval.rb: ditto.
-
- * test/ruby/test_exception.rb: ditto.
-
- * test/ruby/test_class.rb: ditto.
-
-Wed May 14 12:46:37 2008 Koichi Sasada <ko1@atdot.net>
-
- * iseq.c (insn_operand_intern): remove Qundef related code.
-
-Wed May 14 12:42:36 2008 Akinori MUSHA <knu@iDaemons.org>
+Wed May 14 19:24:59 2008 Akinori MUSHA <knu@iDaemons.org>
* array.c (rb_ary_count): Override Enumerable#count for better
performance.
+ (rb_ary_nitems): Undo the backport. Use #count {} instead.
-Wed May 14 11:29:06 2008 Koichi Sasada <ko1@atdot.net>
-
- * insns.def: add a "putcbase" instruction.
-
- * compile.c, insns.def: fix to use putcbase instruction for
- class search. Qundef should not be used.
-
-Wed May 14 07:49:35 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_call0): defer calling of rb_frame_self() until it
- become really necessary.
-
- * eval.c (rb_call): ditto.
-
-Wed May 14 00:55:56 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_io_m17n.rb: remove a duplicative method.
-
- * test/ruby/test_utf16.rb: rename a conflicting method name.
-
- * test/ruby/test_array.rb: ditto.
-
- * test/ruby/test_file_exhaustive.rb: ditto.
-
- * test/ruby/test_hash.rb: ditto.
-
- * test/ruby/test_env.rb: ditto.
-
- * test/ruby/test_fixnum.rb: ditto.
+ * enumerator.c (enumerator_iter_i): Remove an unused function.
+ (enumerator_with_index, enumerator_each): Remove unused
+ variables.
- * test/ruby/test_rational.rb: ditto.
+Wed May 14 17:15:11 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-Wed May 14 00:45:58 2008 Yusuke Endoh <mame@tsg.ne.jp>
+ * ext/tk/tkutil/extronf.rb: check stdndup() because it's not standard
+ function of C.
- * eval_method.c (rb_add_method): fix check for warning when
- Object#initialize is redefined. (same as 1.8)
+ * ext/tk/tkutil/tkutil.c (cbsubst_table_setup): use malloc() and
+ strncpy() instead of strndup() if not available.
-Tue May 13 23:32:44 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed May 14 09:52:02 2008 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * enum.c (enum_yield): use rb_yield_values2.
+ * ext/tk/tkutil/tkutil.c: improve handling callback-subst-keys.
+ Now, support longnam-keys (e.g. '%CTT' on tkdnd-2.0; however, still
+ not support tkdnd-2.0 on tkextlib), and symbols of parameters (e.g.
+ :widget=>'%W', :keycode=>'%k', '%x'=>:x, '%X'=>:root_x, and so on;
+ those are attributes of event object). It means that Ruby/Tk accepts
+ not only "widget.bind(ev, '%W', '%k', ...){|w, k, ...| ... }", but
+ also "widget.bind(ev, :widget, :keycode, ...){|w, k, ...| ... }".
+ It is potentially incompatible, when user passes symbols to the
+ arguments of the callback block (the block receives the symbols as
+ strings). I think that is very rare case (probably, used by Ruby/Tk
+ experts only). When causes such trouble, please give strings instead
+ of such symbol parameters (e.g. call Symbol#to_s method).
- * enum.c (DEFINE_ENUMFUNCS): macro to define enumerator and yielding
- functions.
+ * ext/tk/lib/tk/event.rb, ext/tk/lib/tk/validation.rb,
+ ext/tk/lib/tkextlib/blt/treeview.rb,
+ ext/tk/lib/tkextlib/winico/winico.rb: ditto.
- * enum.c (enum_all_func, enum_any_func, enum_one_func,
- enum_none_func): reduced duplicate code.
+ * ext/tk/tkutil/tkutil.c: strings are available on subst_tables on
+ TkUtil::CallbackSubst class (it is useful on Ruby 1.9).
+
+ * ext/tk/lib/tk/spinbox.rb, ext/tk/lib/tkextlib/iwidgets/hierarchy.rb,
+ ext/tk/lib/tkextlib/iwidgets/spinner.rb,
+ ext/tk/lib/tkextlib/iwidgets/entryfield.rb,
+ ext/tk/lib/tkextlib/iwidgets/calendar.rb,
+ ext/tk/lib/tkextlib/blt/dragdrop.rb,
+ ext/tk/lib/tkextlib/tkDND/tkdnd.rb,
+ ext/tk/lib/tkextlib/treectrl/tktreectrl.rb,
+ ext/tk/lib/tkextlib/tktable/tktable.rb: disable code piece became
+ unnecessary by reason of the changes of ext/tk/tkutil/tkutil.c.
-Tue May 13 15:09:38 2008 Akinori MUSHA <knu@iDaemons.org>
+Tue May 13 15:10:50 2008 Akinori MUSHA <knu@iDaemons.org>
* enumerator.c: Update rdoc.
(enumerator_initialize): Discourage the use.
(enum_each_slice, enum_each_cons, enumerator_each)
(enumerator_with_index): Add a note about a call without a block.
-Tue May 13 08:25:31 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (rb_f_gets): re-enable rdoc.
- (rb_f_readline): ditto.
- (rb_f_readlines): ditto.
+ * NEWS: Intentionally omit enum_slice and enum_cons, which are
+ removed in 1.9.
Tue May 13 07:56:36 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* string.c (rb_str_cat): fixed buffer overrun reported by
Christopher Thompson <cthompson at nexopia.com> in [ruby-core:16746]
-Mon May 12 23:37:57 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * vm.c (collect_local_variables_in_env): remove unnecessary check
- which causes: x=1;proc{local_variables}.call #=> []
-
- * test/ruby/test_variable.rb: add a test for above.
-
-Mon May 12 23:05:24 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * process.c, include/ruby/intern.h (rb_run_exec_options): externed.
-
- * process.c (save_redirect_fd, save_env_i, save_env, run_exec_dup2,
- run_exec_open, run_exec_pgroup, run_exec_rlimit, rb_run_exec_options):
- save parent's process environments.
-
- * process.c (rb_spawn_internal): remove calling run_exec_options()
- because cannot restore after spawn.
-
- * io.c (pipe_open): ditto.
-
- * test/ruby/test_process.rb (test_execopts_env): upcase environment
- variable name for case insensitive platforms.
-
- * win32/win32.c (init_env): set USER environment variable only when
- USERNAME is available.
-
-Mon May 12 22:23:01 2008 Tanaka Akira <akr@fsij.org>
-
- * lib/date.rb (once): use Object#object_id instead of Symbol#to_i.
-
-Mon May 12 21:34:46 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * test/ruby/envutil.rb (rubybin): return expanded rubyexe instead of
- expanded ruby if available.
-
-Mon May 12 20:19:55 2008 Akinori MUSHA <knu@iDaemons.org>
-
- * enum.c (grep_i): Be aware of multiple values;
- fix [ruby-dev:34653].
- (grep_iter_i): Ditto.
- (count_i): Ditto.
- (find_i): Ditto.
- (find_index_i): Ditto.
- (find_all_i): Ditto.
- (reject_i): Ditto.
- (inject_i): Ditto.
- (inject_op_i): Ditto.
- (partition_i): Ditto.
- (group_by_i): Ditto.
- (first_i): Ditto.
- (sort_by_i): Ditto.
- (all_i): Ditto.
- (all_iter_i): Ditto.
- (any_i): Ditto.
- (any_iter_i): Ditto.
- (one_i): Ditto.
- (one_iter_i): Ditto.
- (none_i): Ditto.
- (none_iter_i): Ditto.
- (min_i): Ditto.
- (min_ii): Ditto.
- (max_i): Ditto.
- (max_ii): Ditto.
- (minmax_i): Ditto.
- (minmax_ii): Ditto.
- (min_by_i): Ditto.
- (max_by_i): Ditto.
- (minmax_by_i): Ditto.
- (member_i): Ditto.
- (take_i): Ditto.
- (take_while_i): Ditto.
- (drop_i): Ditto.
- (drop_while_i): Ditto.
- (cycle_i): Ditto.
-
- * enum.c (each_with_index): Update rdoc. each_with_index() takes
- arguments that are passed through to each(), and a hash preserves
- key order.
-
-Mon May 12 19:05:24 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * process.c (rb_spawn_internal): remove calling run_exec_options()
- because cannot restore after spawn. we'll fix this later.
-
-Mon May 12 18:16:44 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * process.c (rb_spawn_internal): need to call run_exec_options() before
- spawn if the platform doesn't have fork. [ruby-dev:34647]
-
-Mon May 12 15:20:02 2008 Tanaka Akira <akr@fsij.org>
-
- * gc.c (ruby_vm_xmalloc): increase malloc_increase only if malloc
- succeeds. failed malloc size can be huge. it may increase
- malloc_limit too big which cause less GC and memory full.
- (ruby_vm_xrealloc): ditto.
- (rb_objspace): make params.limit and params.increase size_t.
-
-Mon May 12 15:04:58 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * re.c (rb_reg_prepare_re): made non static with small refactoring.
-
- * ext/strscan/strscan.c (strscan_do_scan): should adjust encoding
- before regex searching.
-
Mon May 12 13:57:19 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (is_defined): add NODE_OP_ASGN_{OR,AND}. "defined?(a||=1)"
should not operate assignment. [ruby-dev:34645]
-Mon May 12 13:29:26 2008 Tanaka Akira <akr@fsij.org>
+Mon May 12 12:59:23 2008 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * bignum.c (bigzero_p): check from MSB to LSB. [ruby-dev:34649]
-
-Mon May 12 12:32:10 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (RUBYOPT): affected BASERUBY too. [ruby-talk:301514]
-
-Mon May 12 12:27:55 2008 Tanaka Akira <akr@fsij.org>
+ * ext/tk/lib/tk/wm.rb: Wm#overrideredirect overwrites arguemnt to
+ an invalid value.
- * gc.c (assign_heap_slot): fix condition for number of objects in
- a heap.
+ * ext/tk/sample/ttk_wrapper.rb: support "if __FILE__ == $0" idiom.
-Mon May 12 12:24:48 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+Mon May 12 12:36:55 2008 NAKAMURA Usaku <usa@ruby-lang.org>
- * string.c (sym_to_i): really removed. [ruby-dev:34641]
+ * win32/win32.c (rb_w32_select): backport from trunk.
+ [ruby-talk:300743]
-Mon May 12 11:15:55 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
+Mon May 12 12:33:21 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * gc.c (assign_heap_slot): put the binary search routine in order.
+ * common.mk (RUBYLIB, RUBYOPT): clear.
-Mon May 12 10:52:51 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon May 12 10:41:10 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ruby.c (ruby_init_gems), gem_prelude.rb: check if Gem is defined
- instead of Gem::Enable.
+ * lib/delegate.rb (SimpleDelegator::dup): removed needless argument.
+ [ruby-list:44910]
- * gem_prelude.rb (load_full_rubygems_library, const_missing): prevent
- infinite recursion. [ruby-dev:34539]
+ * lib/delegate.rb (clone, dup): keep relationship with the target
+ object.
Sun May 11 23:19:39 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* enum.c (all_iter_i, any_iter_i): reduced duplicated code.
-Sun May 11 22:54:02 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * bootstraptest/runner.rb (main): leave -I options for purelib.rb
- untouched.
-
- * bootstraptest/runner.rb (main): handle relative path -r options.
-
-Sun May 11 19:04:06 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_thread.rb: kill and join temporal threads that are
- created in each test.
-
-Sun May 11 17:58:45 2008 Tanaka Akira <akr@fsij.org>
-
- * test/ruby/test_process.rb (TestProcess#with_stdin): defined.
- (TestProcess#test_argv0_noarg): don't use redirect_fds.
- [ruby-dev:34647]
-
Sun May 11 17:57:36 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (MINIRUBY): should not include extension library path.
-Sun May 11 14:40:36 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/ruby.h (SIZET2NUM): new macro.
- (NUM2SIZET): new macro.
-
- * gc.c (struct rb_objspace): use size_t for increment, length and
- used for 64bit.
- (allocate_heaps): ditto.
- (assign_heap_slot): ditto.
- (set_heaps_increment): ditto.
- (gc_mark_all): ditto.
- (is_pointer_to_heap): ditto.
- (free_unused_heaps): ditto.
- (gc_sweep): ditto.
- (os_obj_of): ditto.
- (rb_gc_call_finalizer_at_exit): ditto.
- (count_objects): ditto.
-
-Sun May 11 13:14:09 2008 Tanaka Akira <akr@fsij.org>
-
- * thread.c (thread_cleanup_func_before_exec): extracted from
- thread_cleanup_func not to touch pthread data.
- pthread_cond_destroy in forked process may cause deadlock on
- Debian GNU/Linux Etch on x86, x86-64 and IA64.
- this doesn't cause resource leak because the process will exec soon.
- (terminate_atfork_before_exec_i): defined.
- (rb_thread_atfork_before_exec): defined.
-
- * include/ruby/intern.h (rb_thread_atfork_before_exec): declared.
-
- * process.c (rb_exec_atfork): call rb_thread_atfork_before_exec
- instead of rb_thread_atfork.
-
- * io.c (popen_exec): call rb_thread_atfork_before_exec instead of
- rb_thread_atfork.
-
-Sat May 10 22:14:03 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+Sun May 11 10:36:10 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
- * string.c (tr_trans): single '^' does not mean negation.
- [ruby-dev:34632]
+ * eval.c (method_name, method_owner): New methods; backported
+ from 1.9. (UnboundMethod#name, UnboundMethod#owner)
- * string.c (tr_trans): should check src size, not str size.
- [ruby-dev:34637]
+Sun May 11 02:48:13 2008 <nagai@orca16.orcabay.ddo.jp>
- * string.c (tr_trans): should not turn on modify flag if no
- modification happens. [ruby-dev:34631]
+ * ext/tk/lib/tk/pack.rb, ext/tk/lib/tk/grid.rb: fail to do pack/grid
+ without options.
-Sat May 10 18:11:18 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_each_line): zero length record separator should
- split a string into paragraphs. [ruby-dev:34586]
-
- * string.c (rb_str_each_line): RDoc updated.
-
-Sat May 10 11:36:20 2008 Tanaka Akira <akr@fsij.org>
-
- * vm.c (env_mark): mark env->block.self. prevent SEGV when GC occur
- in prepare_iseq_build with gcc version 3.4.6 [FreeBSD] 20060305 on
- FreeBSD/amd64.
-
-Fri May 9 19:16:00 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * thread.c (timeofday): use monotonic clock. based on a patch
- from zimbatm <zimbatm at oree.ch> in [ruby-core:16627].
-
-Fri May 9 07:47:07 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * cont.c (cont_restore_0): dynamic stack direction code should be
- consistent with static one. [ruby-talk:301152]
-
-Fri May 9 00:03:50 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (arg): operator assignment "a += b rescue c" should be
- parsed as "a += (b rescue c)" just like normal assignment.
- [ruby-talk:301000]
-
-Thu May 8 18:14:00 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bignum.c (rb_big_and): bit-wise operation should not take float
- values. [ruby-dev:34612]
-
- * bignum.c (rb_big_or): ditto.
-
- * bignum.c (rb_big_xor): ditto.
-
-Thu May 8 17:44:13 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk, ext/extmk.rb, lib/mkmf.rb: use absolute path for RUBYOPT.
-
- * file.c (rb_find_file_ext): guard load_path from GC.
- gcc version 4.1.2 20061115 (prerelease) (Debian 4.1.1-21) optimizes
- load_path by holding only RARRAY_LEN(load_path) and
- RARRAY_PTR(load_path) in registers on IA64 GNU/Linux Etch.
-
-Thu May 8 16:41:20 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (MINIRUBY), common.mk (RUBYOPT): add purelib.rb.
- [ruby-core:16642]
-
-Thu May 8 16:00:41 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (parser_yylex): ! and ? at the bottom are no longer part
- of valid symbol names. [ruby-dev:34590]
-
-Thu May 8 15:36:11 2008 Tanaka Akira <akr@fsij.org>
-
- * thread.c (rb_gc_save_machine_context): call FLUSH_REGISTER_WINDOWS
- to mark the register stack from GC on another thread.
-
-Thu May 8 15:14:34 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * array.c (rb_ary_sort_bang): freeze temporary array.
-
-Thu May 8 13:19:18 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm.c (rb_thread_mark): mark stat_insn_usage only when ptr is not
- null.
-
-Thu May 8 10:44:04 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (sort_reentered): reentered check may be called from
- Array#sort.
-
-Thu May 8 09:51:52 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * array.c (sort_1, sort_2): check for reentered and if elements are
- accessible. [ruby-core:16679]
-
-Thu May 8 06:43:52 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * dln.c (dln_find_exe_r, dln_find_file_r): reentrant versions.
-
- * file.c (rb_find_file_ext, rb_find_file), process.c (proc_exec_v),
- (rb_proc_exec, proc_spawn_v, proc_spawn), ruby.c (process_options):
- use reentrant versions.
-
-Thu May 8 06:27:33 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread.c (rb_thread_key_p): thread local storage stores ID.
-
-Thu May 8 01:10:03 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (tr_trans): should squeeze properly. [ruby-dev:34587]
-
- * string.c (tr_trans): had a bug in treating multi-byte character
- replacement.
-
- * string.c (rb_str_delete_bang): need not to do anything for empty
- strings.
-
- * test/ruby/test_m17n_comb.rb (TestM17NComb::test_str_delete): add
- test for empty receiver.
-
-Wed May 7 20:19:18 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ruby.c (process_options, ruby_set_argv): set encoding of rb_argv
- after Init_prelude() because cannot load encoding extensions before
- it.
-
-Wed May 7 20:00:21 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * numeric.c (bit_coerce): float should not be a valid operand of
- bitwise operations. [ruby-dev:34583]
-
-Wed May 7 19:35:29 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * thread.c (rb_thread_key_p): should always convert symbol to ID.
- [ruby-dev:34588]
-
-Wed May 7 19:30:34 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * numeric.c (fix_divide): float division should floor() before
- rounding into integer. [ruby-dev:34584]
+ * ext/tk/lib/tk.rb: add TkWindow#grid_anchor, grid_column, grid_row.
-Wed May 7 18:02:01 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+Sat May 10 18:19:16 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
- * string.c (sym_to_i): remove obsolete method. preparation for
- symbol GC.
+ * string.c (rb_str_each_line): RDoc updated. [ruby-dev:34586]
- * numeric.c (fix_to_sym): ditto.
+Sat May 10 13:17:56 2008 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * numeric.c (fix_id2name): ditto.
+ * ext/tk/lib/tk/pack.rb, ext/tk/lib/tk/grid.rb: increase supported
+ parameter patterns of configure method.
-Wed May 7 17:43:22 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat May 10 09:16:13 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
- * io.c (io_puts_ary): check recursion first. [ruby-dev:34580]
+ * util.c (ruby_strtod): backported from 1.9. a patch from Satoshi
+ Nakagawa <psychs at limechat.net> in [ruby-dev:34625].
+ fixed: [ruby-dev:34623]
-Wed May 7 17:41:14 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri May 9 23:33:25 2008 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * vm.c (vm_eval_body): initialize retval. [ruby-dev:34576]
+ * ext/tk/lib/tk/wm.rb: methods of Tk::Wm_for_General module cannot
+ pass the given block to methods of Tk::Wm module.
-Wed May 7 13:02:56 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * ext/tk/lib/tk/grid.rb: lack of module-method definitions.
- * bignum.c (rb_big_fdiv): flo.fdiv(NaN) should result NaN.
+ * ext/tk/lib/tkextlib/tile.rb: lack of autoload definitions.
- * numeric.c (num_quo): renamed and moved from bignum.c.
- [ruby-dev:34582]
+ * ext/tk/lib/tkextlib/tile/tnotebook.rb: cannot use kanji (not UTF-8)
+ characters for headings.
- * bignum.c (rb_big_fdiv): update RDoc description
+ * ext/tk/tcltklib.c: maybe a little more stable about @encoding value
+ of TclTkIp object.
- * rational.c (nurat_s_new_m): small refactoring.
+Wed May 7 08:46:44 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
- * bignum.c (rb_big2dbl): no need for forceful warning when
- converting to float. overflow is a nature of float values.
+ * struct.c (rb_struct_s_def): to_str should be called only once.
+ [ruby-core:16647]
Wed May 7 00:54:25 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
@@ -25609,154 +863,39 @@ Wed May 7 00:54:25 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
a patch from Kouya <kouyataifu4 at gmail.com> in
[ruby-reference-manual:762].
-Tue May 6 02:08:18 2008 Tanaka Akira <akr@fsij.org>
-
- * test/io/nonblock/test_flush.rb: don't set Thread.abort_on_exception.
-
- * test/net/imap/test_imap.rb: ensure disconnecting imap to terminate
- receiver thread.
-
-Tue May 6 00:29:21 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * iseq.c (insn_operand_intern): should handle Qundef embedded in
- operand. [ruby-core:16656]
-
-Tue May 6 00:00:02 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * compile.c (iseq_compile_each): should call compile_cpath() for
- modules as well. [ruby-dev:34585]
-
- * insns.def (defineclass): add undef handling.
-
-Mon May 5 23:49:40 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * insns.def (defineclass): was using wrong variable. [ruby-dev:34592]
-
-Mon May 5 20:07:59 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (io_fflush): IO#flush problem within threads. a patch from
- <s.wanabe at gmail.com> in [ruby-dev:34595].
-
-Mon May 5 19:58:44 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * compile.c (defined_expr): protect some expression from
- segmentation fault. a patch from wanabe <s.wanabe at gmail.com>
- in [ruby-dev:34593].
-
-Mon May 5 19:49:59 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * struct.c (rb_struct_s_def): Struct.new(0) should not SEGV.
- based on the patch from wanabe <s.wanabe at gmail.com> in
- [ruby-dev:34594].
-
- * struct.c (make_struct): call to_str on name object.
-
-Mon May 5 17:17:40 2008 Tanaka Akira <akr@fsij.org>
-
- * eval.c (ruby_cleanup): wrap ruby_finalize_0 by SAVE_ROOT_JMPBUF to
- avoid SEGV by at_exit { Fiber.new{}.resume } on IA64.
-
-Mon May 5 12:12:11 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_slice_bang): should adjust length before making
- sub-array.
-
-Mon May 5 11:36:14 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_dup): should dupe corresponding information.
- [ruby-dev:34581]
-
-Mon May 5 11:13:50 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+Sun May 4 09:35:51 2008 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
- * compile.c (compile_cpath): use Qundef to denote cbase lookup.
+ * sample/erb/erb4html.rb (ERB4Html) : add example of ERB#set_eoutvar.
+ ERB4Html is an auto-quote ERB.
- * insns.def (defineclass): Qundef is passed for cbase.
+Sat May 3 22:52:48 2008 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * insns.def (setconstant): ditto.
-
- * vm_insnhelper.c (vm_check_if_namespace): use rb_inspect()
- instead of rb_obj_as_string() for better description.
-
-Mon May 5 02:10:23 2008 Tanaka Akira <akr@fsij.org>
-
- * gc.c (set_heaps_increment): fix memory allocation strategy by
- determining heaps_inc from heaps_used, not objects_delta.
- (struct rb_objspace): delta removed. change increment, length and
- used to long for LP64.
- (objects_delta): removed.
- (allocate_heaps): add next_heaps_length argument.
- (init_heap): renamed from add_heap.
- (garbage_collect): use heaps_increment in dont_gc.
-
-Sun May 4 21:09:32 2008 Tanaka Akira <akr@fsij.org>
-
- * lib/getoptlong.rb: use $stderr instead of $deferr.
-
-Sun May 4 16:04:28 2008 Tanaka Akira <akr@fsij.org>
-
- * time.c (obj2nsec): fix string argument.
-
-Sun May 4 14:29:14 2008 Tanaka Akira <akr@fsij.org>
-
- * eval.c (rb_obj_respond_to): check the result of respond_to? method
- by RTEST.
-
-Sun May 4 12:57:58 2008 Tanaka Akira <akr@fsij.org>
-
- * string.c (rb_str_each_line): return original string.
-
-Sat May 3 20:57:06 2008 Tanaka Akira <akr@fsij.org>
-
- * test/ruby/envutil.rb (Test::Unit::Assertions#assert_normal_exit):
- new method.
-
-Sat May 3 18:10:54 2008 Tanaka Akira <akr@fsij.org>
-
- * time.c (time_timespec): raise TypeError for nil and other objects
- which has no divmod method.
-
-Fri May 2 23:59:26 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (internal_read_func, internal_write_func): split from
- internal_io_func.
-
-Fri May 2 23:55:15 2008 Tanaka Akira <akr@fsij.org>
-
- * variable.c (rb_define_hooked_variable): guard *var from GC to
- prevent collecting argf under RUBY_DEBUG=gc_stress.
-
-Fri May 2 17:29:59 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * range.c (range_step): call to_int if step is not a numeric
- value. [ruby-dev:34575]
-
-Fri May 2 16:10:57 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * range.c (range_step): do not forcefully convert steps into
- integers. [ruby-dev:34571]
+ * ext/tk/lib/tkextlib/tile.rb, ext/tk/lib/tkextlib/tile/style.rb,
+ ext/tk/sample/ttk_wrapper.rb: improve treating and control themes.
+ add Tk::Tile.themes and Tk::Tile.set_theme(theme).
Fri May 2 14:52:33 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* misc/ruby-mode.el: move fontifying code from hook. a patch from
Phil Hagelberg <phil at hagelb.org> in [ruby-core:16636].
-Fri May 2 14:10:17 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * range.c (range_step): step may be bignum.
+Fri May 2 13:47:51 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-Fri May 2 13:52:36 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * re.c (match_select): restore previous behavior of MatchData#select.
+ RDoc updated as well, mentioning the plan to remove this method
+ in the future. [ruby-dev:34556]
- * re.c (Init_Regexp): remove MatchData#select. [ruby-dev:34563]
+Fri May 2 13:04:04 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-Thu May 1 23:59:59 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * bignum.c (rb_big_divide), numeric.c (fix_divide): check for result
- domain. [ruby-dev:34559]
+ * ext/dbm/dbm.c (Init_dbm): defines DBM::VERSION even when
+ DB_VERSION_STRING is not available. [ruby-dev:34569]
Thu May 1 23:57:06 2008 James Edward Gray II <jeg2@ruby-lang.org>
+ Merged 16257 from trunk.
+
* lib/net/telnet.rb: This patch from Brian Candler adds a FailEOF mode which
- can be activated to have net/telnet raise EOFError exceptions when the
+ can be activated to have net/telnet raise EOFError exceptions when the
remote connection is closed. The default behavior remains unchanged though.
Thu May 1 23:43:21 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
@@ -25767,1090 +906,663 @@ Thu May 1 23:43:21 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* range.c (range_step): allow float step bigger than zero but less
than one. [ruby-dev:34557]
-Thu May 1 23:20:12 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * bignum.c (rb_big_divide): return an integer for idiv.
- [ruby-dev:34553]
-
-Thu May 1 20:47:30 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * hash.c (rb_hash_s_create): should access converted hash value.
- [ruby-dev:34555]
-
-Thu May 1 20:31:09 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * test/ruby/test_parse.rb (TestParse::test_void_expr_stmts_value):
- shut up warning.
-
- * rational.c (nurat_to_f): no need for forceful warning when
- converting to float. overflow is a nature of float values.
+Wed Apr 30 20:22:40 2008 James Edward Gray II <jeg2@ruby-lang.org>
-Thu May 1 16:10:21 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ Merged 16241 from trunk.
- * hash.c (env_delete_if): return enumerator if no block given.
- [ruby-dev:34554]
-
-Wed Apr 30 21:36:40 2008 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-
- * lib/erb.rb (url_encode): [ruby-dev:34497] ERB::Util#url_encode
- bug fix. Reported by rubikitch.
-
- * test/erb/test_erb.rb: ditto
-
-Wed Apr 30 20:11:36 2008 James Edward Gray II <jeg2@ruby-lang.org>
-
- * lib/net/telnet.rb: Fixing a bug where line endings would not be properly
+ * lib/net/telnet.rb: Fixing a bug where line endings would not be properly
escaped when the two character ending was broken up into separate TCP
packets. Issue reported and patched by Brian Candler.
-Wed Apr 30 18:03:01 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * load.c (rb_load_path), vm_core.h (rb_vm_t): moved to VM.
-
- * load.c (rb_get_load_path): returns absolute load path.
-
- * load.c (load_path_getter): $LOAD_PATH getter.
-
- * file.c (rb_find_file_ext, rb_find_file), ruby.c (push_include,
- ruby_init_loadpath): use the accessor.
-
- * vm.c (rb_vm_mark): mark load_path.
-
Wed Apr 30 17:47:21 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* re.c (rb_reg_search): use local variable. a patch from wanabe
<s.wanabe AT gmail.com> in [ruby-dev:34537]. [ruby-dev:34492]
-Wed Apr 30 16:10:18 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * eval_intern.h: specify the values of the enumeration constants
- explicitly. [ruby-dev:34489]
-
-Wed Apr 30 12:32:39 2008 Tanaka Akira <akr@fsij.org>
-
- * process.c (check_exec_redirect_fd): prohibit duplex IO.
- (check_exec_fds): record maxhint even if close_others is not
- specified.
- (rb_exec_arg_fixup): renamed from rb_exec_arg_fix.
-
-Mon Apr 28 20:24:27 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * rational.c (nurat_marshal_load): checks the given
- denominator. [ruby-dev:34536]
-
-Mon Apr 28 14:21:18 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/ruby.h (POSFIXABLE): use FIXNUM_MAX+1 instead of
- FIXNUM_MAX to make it possible to convert to double accurately on
- environments with 64bit VALUE and 64bit double.
- It assumes FLT_RADIX is 2.
- fix RubyForge bug #14102.
-
-Mon Apr 28 12:48:57 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * process.c (rb_exec_arg_addopt, rb_exec_arg_addopt): now can specify
- close_exec on having no fork environment (but still meaningless).
-
-Mon Apr 28 11:11:29 2008 Tanaka Akira <akr@fsij.org>
-
- * process.c (run_exec_options): don't call FIX2INT for nil.
-
-Mon Apr 28 11:11:38 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * proc.c (method_name): should return symbols instead of strings.
- [ruby-dev:34531]
-
-Mon Apr 28 09:02:43 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/intern.h (rb_exec_arg_init): declared.
- (rb_exec_arg_addopt): declared.
- (rb_exec_arg_fix): declared.
- (rb_exec_initarg): removed.
- (rb_exec_getargs): removed.
- (rb_exec_initarg2): removed.
-
- * io.c (struct popen_arg): make execarg as a pointer.
- (popen_exec): follow popen_arg change.
- (pipe_open): add eargp argument. extract argc and argv from eargp.
- use rb_exec_arg_addopt to add redirect options.
- (pipe_open_v): set up struct rb_exec_arg.
- (pipe_open_s): set up struct rb_exec_arg.
-
- * process.c (rb_exec_arg_addopt): new function extracted from
- check_exec_options_i.
- (check_exec_options_i): use rb_exec_arg_addopt.
- (rb_check_exec_options): opthash is always a hash now.
- (rb_exec_getargs): make it static.
- (rb_exec_fillarg): renamed from rb_exec_initarg2. don't set up
- redirect_fds.
- (rb_exec_arg_init): new function.
- (rb_exec_arg_fix): new function.
- (rb_f_exec): use rb_exec_arg_init and rb_exec_arg_fix. use
- rb_exec_arg_addopt to set close_others option.
- (run_exec_options): make close_others by default.
- (rb_spawn_internal): use rb_exec_arg_init and rb_exec_arg_fix. use
- rb_exec_arg_addopt to set close_others option.
-
-Sun Apr 27 18:59:04 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * rational.c (nurat_expt): use f_rational_new2. [ruby-dev:34524]
-
-Sun Apr 27 15:23:40 2008 Koichi Sasada <ko1@atdot.net>
-
- * gc.c (gc_count): add a GC.count method. This method returns
- a GC invoking count.
-
-Sun Apr 27 12:20:33 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm_core.h (rb_vm_t), gc.c (rb_objspace, rb_newobj), vm.c
- (Init_BareVM): per-VM object space support, which is disabled now.
-
- * gc.c (rb_objspace_alloc), vm.c (Init_BareVM): should not use ruby
- malloc here.
-
- * gc.c (garbage_collect, etc): performance improvement by passing the
- reference instead of referring the global variable in each functions.
-
-Sun Apr 27 08:06:15 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ruby.c (ruby_set_argv): ARGV should be locale encoding.
- [ruby-list:44861]
-
-Sun Apr 27 01:46:29 2008 Tanaka Akira <akr@fsij.org>
-
- * lib/open3.rb (Open3.popen3w): removed.
- (Open3.popen3): notice wait_thr.
-
-Sun Apr 27 01:13:05 2008 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc, test/rdoc: Update to RDoc 2.0.0 r56.
-
-Sat Apr 26 21:30:40 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/intern.h (rb_hash_dup): declared.
-
- * hash.c (rb_hash_dup): new function.
-
- * process.c (rb_spawn_internal): don't modify option hash.
-
-Sat Apr 26 18:36:31 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c, signal.c, thread.c, thread_win32.c, include/ruby/intern.h:
- suppress warnings.
-
-Sat Apr 26 17:42:30 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * error.c (builtin_types), gc.c (count_objects): added Complex and
- Rational.
-
-Sat Apr 26 17:35:19 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * error.c (rb_eNOERROR): renamed.
-
-Sat Apr 26 17:30:11 2008 Koichi Sasada <ko1@atdot.net>
-
- * include/ruby/ruby.h, gc.c: remove T_BLOCK.
+Sat Apr 26 19:40:34 2008 Guy Decoux <decoux@moulon.inra.fr>
- * include/ruby/ruby.h: re-number T_xxx.
+ * class.c (struct clone_method_data): Add cref.
+ (clone_method): Properly handle NODE_BMETHOD and NODE_DMETHOD.
+ (rb_singleton_class_clone, singleton_class_clone_int): Set a
+ proper value to klass and propagate cref. [ruby-core:16238]
-Sat Apr 26 17:31:09 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * eval.c (rb_block_dup, rb_method_dup), intern.h: Add duplicator
+ methods for use from class.c#clone_method().
- * process.c (rb_cProcessTms, rb_cProcessStatus): renamed.
+Fri Apr 25 15:46:37 2008 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * error.c (builtin_types), signal.c (siglist), st.c (primes),
- struct.c (ref_func), time.c (months): constified.
+ * ext/tk/lib/tk.rb, ext/tk/lib/tk/scrollbar.rb, ext/tk/lib/tk/scale.rb:
+ improve unknonw-option check when create a widget.
-Sat Apr 26 13:00:41 2008 Tanaka Akira <akr@fsij.org>
+ * ext/tk/lib/tkextlib/blt/unix_dnd.rb, ext/tk/lib/tkextlib/blt/ted.rb,
+ ext/tk/lib/tkextlib/treectrl/tktreectrl.rb: bug fix on 'cget'.
- * lib/open3.rb: double fork is replaced by spawn with Process.detach.
- (Open3.popen3w): new method to access the thread returned by
- Process.detach.
+ * ext/tk/lib/tk/menuspec.rb: option check will fail when
+ TkConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__ is true.
-Sat Apr 26 00:47:43 2008 Tanaka Akira <akr@fsij.org>
+ * ext/tk/lib/tk/palette.rb: bug fix.
- * process.c (rb_spawn_internal): new function to specify
- default_close_others.
- (rb_spawn): specify default_close_others true.
- (rb_f_system): call rb_spawn_internal with default_close_others as
- false.
-
-Sat Apr 26 12:26:41 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * range.c (range_each): use INT2FIX() for fixnum values.
-
-Fri Apr 25 17:56:25 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * gc.c (free_unused_heaps): preserve last used heap segment to
- reduce malloc() call.
+Fri Apr 25 12:37:54 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Apr 25 17:54:10 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * array.c (flatten): returns an instance of same class.
+ [ruby-core:16554]
- * gc.c (HEAP_SIZE): use smaller heap segment (2K) for more chance
- to be freed. based on patch from authorNari <authornari at gmail.com>.
+Thu Apr 24 23:47:50 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
- * gc.c (rb_newobj_from_heap): eventually allocate heap segments.
+ * lib/net/pop.rb: backported from 1.9. bug#19003
-Fri Apr 25 15:35:36 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/openssl/lib/openssl/ssl.rb: set_params; backported from 1.9.
+ bug#19552, [ruby-dev:34402]
- * process.c (rb_spawn): rb_exec_initarg() returns new argc and argv in
- earg.
+ * ext/openssl/ossl_ssl.c: ditto.
-Fri Apr 25 12:37:54 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * test/openssl/test_ssl.rb: ditto.
- * array.c (flatten): returns an instance of same class.
- [ruby-core:16554]
+Thu Apr 24 17:06:34 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-Fri Apr 25 10:52:27 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * include/ruby/win32.h: define mode_t for umask.
-
- * process.c (check_exec_options_i, check_exec_fds, run_exec_options):
- support "close_others" only when fork(2) is available.
-
-Fri Apr 25 00:16:11 2008 Tanaka Akira <akr@fsij.org>
-
- * process.c: include sys/stat.h for umask.
-
-Thu Apr 24 23:25:17 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/intern.h (rb_env_clear): declared.
- (rb_io_mode_modenum): declared.
- (rb_close_before_exec): declared.
- (struct rb_exec_arg): add options and redirect_fds field.
- (rb_check_argv): removed.
- (rb_exec_initarg): declared.
- (rb_exec_getargs): declared.
- (rb_exec_initarg2): declared.
- (rb_fork): add third argument: fds.
-
- * io.c (max_file_descriptor): new static variable to record maximum
- file descriptor ruby used.
- (UPDATE_MAXFD): new macro.
- (UPDATE_MAXFD_PIPE): new macro.
- (rb_io_mode_modenum): externed.
- (rb_sysopen): update max_file_descriptor.
- (rb_close_before_exec): new function.
- (popen_exec): redirection removed because it is done by extended
- spawn mechanism.
- (pipe_open): generate a hash for spawn options to specify
- redirections.
- (pipe_open_v): use rb_exec_getargs.
- (pipe_open_s): use rb_exec_getargs.
- (rb_io_initialize): update max_file_descriptor.
-
- * process.c (hide_obj): new function.
- (check_exec_redirect_fd): new function.
- (check_exec_redirect): new function.
- (check_exec_options_i): new function.
- (check_exec_fds): new function.
- (rb_check_exec_options): new function.
- (check_exec_env_i): new function.
- (rb_check_exec_env): new function.
- (rb_exec_getargs): new function.
- (rb_exec_initarg2): new function.
- (rb_exec_initarg): new function.
- (rb_f_exec): use rb_exec_initarg.
- (intcmp): new function.
- (run_exec_dup2): new function.
- (run_exec_close): new function.
- (run_exec_open): new function.
- (run_exec_pgroup): new function.
- (run_exec_rlimit): new function.
- (run_exec_options): new function.
- (rb_exec): call run_exec_options.
- (move_fds_to_avoid_crash): new function.
- (pipe_nocrash): new function.
- (rb_fork): use pipe_nocrash to avoid file descriptor conflicts.
- (rb_spawn): use rb_exec_initarg.
- (rlimit_resource_name2int): extracted from rlimit_resource_type.
- (rlimit_type_by_hname): new function.
- (rlimit_type_by_lname): new function.
- (rlimit_resource_type): use rlimit_type_by_hname.
- (proc_daemon): add fds argument for rb_fork.
-
- * hash.c (rb_env_clear): renamed from env_clear and externed.
-
- [ruby-dev:34086]
-
-Thu Apr 24 23:00:58 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_thread.rb: fix typos.
-
- * test/ruby/envutil.rb (rubyexec): move Open3.popen3 call into timeout
- block.
-
-Thu Apr 24 22:34:52 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_comparable.rb: new tests for Comparable, to achieve
- 100% test coverage of compar.c.
-
-Thu Apr 24 17:19:01 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ruby.c (process_options): set safe_level before loading script.
- [ruby-dev:34421]
+ * eval.c (THREAD_SAVE_CONTEXT): remove unnecessary
+ FLUSH_REGISTER_WINDOWS before calling setjmp(). [ruby-core:16285]
Thu Apr 24 14:15:11 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* dln.c (dln_find_1): prior files with extensions to files sans
extensions. [ruby-core:16517]
-Thu Apr 24 00:26:06 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * lib/rdoc/ri/descriptions.rb: fixed wrong class nestings.
+Wed Apr 23 15:39:31 2008 Akinori MUSHA <knu@iDaemons.org>
-Thu Apr 24 00:20:01 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_settracefunc.rb: add a test for set_trace_func.
-
- * test/ruby/envutil.rb: move "rubyexec" method from test_rubyoptions.rb.
-
- * test/ruby/test_rubyoptions.rb: use rubyexec in envutil.rb.
-
- * test/ruby/test_thread.rb: add tests to achieve over 90% test coverage
- of thread.c.
+ * eval.c (bind_eval): Add Binding#eval, a shorthand method for
+ eval(str, binding, ..); backported from 1.9.
Wed Apr 23 15:28:52 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
* test/gdbm/test_gdbm.rb (TestGDBM#test_s_open_no_create): failed
notice moved from comment to assertion message. [ruby-dev:29127]
+Wed Apr 23 14:00:05 2008 Akinori MUSHA <knu@iDaemons.org>
+
+ * lib/mkmf.rb (create_makefile): Add a missing dependency on the
+ target directory for each .rb file. This will hopefully fix
+ parallel make (-jN). Tested on FreeBSD.
+
Wed Apr 23 11:49:54 2008 Akinori MUSHA <knu@iDaemons.org>
* lib/set.rb (Set#each, SortedSet#each, TC_Set#test_each): Return
an enumerator if no block is given.
-Wed Apr 23 00:36:03 2008 Yusuke Endoh <mame@tsg.ne.jp>
+Wed Apr 23 00:42:49 2008 Tanaka Akira <akr@fsij.org>
- * test/openssl/test_ssl.rb (start_server): add timeout to server.join.
+ * eval.c (error_print): show full stack grace except SystemStackError.
+ backport from 1.9. [ruby-dev:31014]
Wed Apr 23 00:18:45 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
* test/ruby/test_symbol.rb (TestSymbol#test_to_proc): Improve
tests of Symbol#to_proc.
-Tue Apr 22 22:40:57 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/drb/drb.rb (DRb::DRbServer::check_insecure_method): should
- check method names by symbols, not by strings. a patch from
- Kazuhiro NISHIYAMA <zn at mbf.nifty.com> in [ruby-dev:34487].
-
-Tue Apr 22 22:15:54 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Apr 22 22:43:05 2008 Akinori MUSHA <knu@iDaemons.org>
- * misc/ruby-style.el (ruby-style-{case,label}-indent): up list from
- indentation point.
+ * eval.c (rb_proc_new, YIELD_FUNC_LAMBDA): Add a new nd_state
+ YIELD_FUNC_LAMBDA which avoids automatic `avalue' conversion for
+ arguments. This fixes a bug where [1,[2,3]].map(&:object_id)
+ fails.
-Tue Apr 22 21:09:05 2008 NARUSE, Yui <naruse@ruby-lang.org>
+ * intern.h, object.c: Hide rb_proc_new() from intern.h. It should
+ not be considered an official API function yet.
- * ext/nkf/nkf-utf8/nkf.c (score_table_A0, score_table_F0):
- type of content is unsigned char.
+Tue Apr 22 21:24:32 2008 Akinori MUSHA <knu@iDaemons.org>
- * ext/nkf/nkf-utf8/nkf.c (push_broken_buf): 'c' is nkf_char.
+ * eval.c (rb_proc_new): Turn the BLOCK_LAMBDA flag on.
- * ext/nkf/nkf-utf8/nkf.c (push_broken_buf): enc is 0 or pointer.
+ * object.c (sym_to_proc), test/ruby/test_symbol.rb: Add back
+ Symbol#to_proc, now that it passes the tests.
- * ext/nkf//nkf.c (options): type of option is unsigned char.
-
-Tue Apr 22 20:51:58 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/nkf/nkf-utf8/nkf.c (z_conv): characters must be nkf_char.
-
-Tue Apr 22 19:23:05 2008 Akinori MUSHA <knu@iDaemons.org>
+Tue Apr 22 19:35:03 2008 Akinori MUSHA <knu@iDaemons.org>
* enumerator.c (enumerator_initialize): Remove an undocumented
feature (passing a block to the constructor) that's broken.
This is not what I intended.
-Tue Apr 22 17:54:05 2008 URABE Shyouhei <shyouhei@ruby-lang.org>
-
- * vm_core.h (exec_event_hooks): ``inline'' is a type modifier, not
- a type itself.
-
-Tue Apr 22 16:24:27 2008 URABE Shyouhei <shyouhei@ruby-lang.org>
-
- * string.c (rb_enc_cr_str_buf_cat): do not use C++ comments.
-
-Tue Apr 22 16:23:53 2008 URABE Shyouhei <shyouhei@ruby-lang.org>
-
- * configure.in: use AC_USE_SYSTEM_EXTENSIONS.
-
-Tue Apr 22 16:23:16 2008 URABE Shyouhei <shyouhei@ruby-lang.org>
-
- * vm_evalbody.c (DECL_SC_REG): use __asm__ instead.
-
-Tue Apr 22 16:18:30 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Apr 22 17:49:46 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
- * vm_evalbody.c (DECL_SC_REG): typo fixed.
+ * sprintf.c (rb_f_sprintf): should protect temporary string from
+ GC. [ruby-dev:34480]
-Tue Apr 22 15:25:04 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Apr 22 17:12:05 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
- * configure.in (struct timespec): needs time.h according to POSIX.
+ * regex.c (re_search): string might be NULL. [ruby-core:16478]
-Tue Apr 22 13:19:48 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+Tue Apr 22 16:44:00 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
- * thread.c (rb_thread_stop_timer_thread): should clear
- timer_thread_id after stopping it.
+ * object.c (rb_obj_tap): Correct documentation; pointed out by
+ okkez in [ruby-dev:34472].
-Tue Apr 22 13:12:58 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread.c (thread_join): remove the current thread from the join list
- of the target thread.
-
-Tue Apr 22 12:03:50 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm_insnhelper.c (vm_get_ev_const): search from the base klass if it
- is given.
-
-Tue Apr 22 09:58:13 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/win32ole/win32ole.c: avoid warnings.
-
-Tue Apr 22 09:56:51 2008 NAKAMURA Usaku <usa@ruby-lang.org>
+Tue Apr 22 10:05:51 2008 NAKAMURA Usaku <usa@ruby-lang.org>
* file.c (eaccess): workaround for recent msvcrt's behavior.
[ruby-core:16460]
-Mon Apr 21 19:08:32 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (copy_stream_body): call rb_io_check_readable and
- rb_io_check_writable.
-
-Mon Apr 21 17:45:27 2008 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/dbm/dbm.c (fdbm_each_value, fdbm_each_key, fdbm_each_pair):
- GDBM#{each,each_pair,each_key,each_value}: Return an enumerator
- if no block is given.
-
- * ext/gdbm/gdbm.c (fgdbm_each_value, fgdbm_each_key,
- fgdbm_each_pair): GDBM#{each,each_pair,each_key,each_value}:
- Return an enumerator if no block is given.
-
- * ext/openssl/ossl_config.c (ossl_config_each):
- OpenSSL::Config#each: Return an enumerator if no block is given.
-
- * ext/readline/readline.c (hist_each): Readline::HISTORY#each:
- Return an enumerator if no block is given.
-
- * ext/sdbm/init.c (fsdbm_each_value, fsdbm_each_key,
- fsdbm_each_pair): SDBM#{each,each_pair,each_key,each_value}:
- Return an enumerator if no block is given.
-
- * ext/stringio/stringio.c (strio_each_byte, strio_each):
- StringIO#{each,each_line,each_byte}: Return an enumerator if no
- block is given.
+Mon Apr 21 16:06:47 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/stringio/stringio.c (Init_stringio): Add #lines and #bytes,
- which are aliases to #each_line and #each_byte, respectively.
+ * enumerator.c (enumerator_init): preserve the method name in ID.
- * ext/win32ole/win32ole.c (fole_each): WIN32OLE#each: Return an
- enumerator if no block is given.
+ * enumerator.c (enumerator_each): need not to call rb_to_id().
- * ext/zlib/zlib.c (rb_gzreader_each_byte, rb_gzreader_each):
- Zlib::GzipReader#{each,each_line,each_byte}: Return an
- enumerator if no block is given.
+ * enumerator.c (enumerator_with_index): ditto.
- * ext/zlib/zlib.c (Init_zlib): Add Zlib::GzipReader#lines and
- #bytes, which are aliases to #each_line and #each_byte,
- respectively.
+Mon Apr 21 17:19:52 2008 Akinori MUSHA <knu@iDaemons.org>
-Mon Apr 21 17:01:44 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * eval.c (rb_f_method_name): New gloval function: __method__;
+ backported from matzruby / 1.9.
- * iseq.c (rb_iseq_compile_with_option): check if src is a string.
- [ruby-core:16453]
+ * eval.c (rb_frame_this_func), intern.h: New internal function.
-Mon Apr 21 16:06:47 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * intern.h (RETURN_ENUMERATOR): Use rb_frame_this_func() instead
+ of rb_frame_last_func(), to accommodate the behavior to that of
+ 1.9.
- * enumerator.c (enumerator_init): preserve the method name in ID.
+Mon Apr 21 15:54:48 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
- * enumerator.c (enumerator_each): need not to call rb_to_id().
+ * lib/tempfile.rb (Tempfile::_close): check @data before modifying
+ it; backported from 1.9. [ruby-dev:34094]
- * enumerator.c (enumerator_with_index): ditto.
+ * lib/tempfile.rb (Tempfile::close): clear @data and @tmpname.
-Mon Apr 21 11:00:27 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+Mon Apr 21 10:17:17 2008 NAKAMURA Usaku <usa@ruby-lang.org>
- * compile.c (defined_expr): capture exception during defined?
- evaluation. a patch from wanabe <s.wanabe at gmail.com> in
- [ruby-dev:34461]. [ruby-core:16010]
+ * time.c: should include <errno.h> to refer errno.
-Mon Apr 21 10:06:26 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+Mon Apr 21 10:02:43 2008 NAKAMURA Usaku <usa@ruby-lang.org>
- * time.c: should include <errno.h> to refer to errno.
+ * hash.c (recursive_hash): prototype.
-Mon Apr 21 09:58:04 2008 NAKAMURA Usaku <usa@ruby-lang.org>
+Mon Apr 21 10:00:51 2008 NAKAMURA Usaku <usa@ruby-lang.org>
* time.c (rb_strftime): check errno to detect strftime(3)'s error.
this is workaround for recent version of MSVCRT.
[ruby-dev:34456]
-Mon Apr 21 08:54:30 2008 NAKAMURA Usaku <usa@ruby-lang.org>
+Sun Apr 20 21:10:04 2008 Akinori MUSHA <knu@iDaemons.org>
- * gc.c (ruby_xmalloc): use size_t for malloc argument instead of long.
+ * .: Release as Ruby 1.8.7-preview2.
-Sun Apr 20 21:00:21 2008 Akinori MUSHA <knu@iDaemons.org>
-
- * enumerator.c, include/ruby/ruby.h: Export rb_cEnumerator.
-
-Sun Apr 20 20:47:50 2008 Akinori MUSHA <knu@iDaemons.org>
+Sun Apr 20 21:02:06 2008 Akinori MUSHA <knu@iDaemons.org>
* enumerator.c: Resolve the method every time an enumeration
method is run, not once when the enumerator is initialized as it
was before, so that method_missing() and method (re)definition
afterwards are both in effect; pointed out in: [ruby-core:16441]
-Sun Apr 20 15:11:00 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (copy_stream_rbuf_to_dst): removed.
- (copy_stream_fallback_body): don't bypass write method.
- (copy_stream_body): simplified.
+Sun Apr 20 17:59:25 2008 Akinori MUSHA <knu@iDaemons.org>
-Sun Apr 20 15:01:25 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * object.c, NEWS, test/ruby/test_symbol.rb: Revert Symbol#to_proc
+ since it does not pass the tests.
- * vm_core.h (struct iseq_compile_data): moved label_no from
- new_label_body().
+Sun Apr 20 14:29:35 2008 Technorama Ltd. <oss-ruby@technorama.net>
- * compile.c (iseq_set_exception_table): allocates catch_table only
- when entries exist.
+ * ext/openssl/ossl_ssl.c: initialize session class.
- * compile.c (struct iseq_link_element, struct iseq_insn_data): made
- enum for debuggers.
+Sat Apr 19 20:54:42 2008 akira yamada <akira@arika.org>
-Sun Apr 20 14:44:45 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/uri/ftp.rb, lib/uri/generic.rb, test/uri/test_common.rb,
+ test/uri/test_ftp.rb, test/uri/test_generic.rb: backported from 1.9.
+ [ruby-dev:31318]
- * compile.c (iseq_compile_each): fix for splat in when and rescue.
- a patch from wanabe <s.wanabe AT gmail.com> in [ruby-dev:34429].
- [ruby-core:14537]
+Sat Apr 19 20:35:02 2008 Akinori MUSHA <knu@iDaemons.org>
-Sun Apr 20 13:55:37 2008 Tanaka Akira <akr@fsij.org>
+ * lib/yaml/baseemitter.rb, lib/yaml/encoding.rb: performance
+ tuning around String#gsub.
- * io.c (copy_stream_fallback): write directly (bypassing write method)
- if possible.
+ * lib/yaml/tag.rb: Replace nodoc with stopdoc so Module methods get
+ documented.
-Sun Apr 20 12:49:03 2008 Tanaka Akira <akr@fsij.org>
+ * lib/yaml/store.rb (YAML::load): modified to support empty
+ database.
- * io.c (copy_stream_fallback): read directly (bypassing readpartial
- method) if possible.
+ * lib/yaml/store.rb (YAML::Store::marshal_dump_supports_canonical_option?):
+ add a method to support faster PStore.
-Sun Apr 20 04:45:13 2008 Tanaka Akira <akr@fsij.org>
+Sat Apr 19 20:16:52 2008 Akinori MUSHA <knu@iDaemons.org>
- * io.c (copy_stream_body): use readpartial and write method for
- non-IOs such as StringIO and ARGF.
+ * lib/yaml/types.rb: Likewise, pass self to YAML::quick_emit;
+ merged from 1.9.
-Fri Apr 18 20:57:33 2008 Yusuke Endoh <mame@tsg.ne.jp>
+ * lib/yaml.rb (quick_emit): use combination of object_id and hash to
+ identify repeated object references, since GC will reuse memory of
+ objects during output of YAML. [ruby-Bugs-8548] [ruby-Bugs-3698];
+ merged from 1.9.
- * test/ruby/test_array.rb: add tests to achieve over 95% test coverage
- of array.c.
+Sat Apr 19 20:05:39 2008 Akinori MUSHA <knu@iDaemons.org>
-Fri Apr 18 17:37:48 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * array.c (rb_ary_equal, rb_ary_eql, rb_ary_hash, rb_ary_cmp):
+ Make Array#eql?, #hash, #== and #<=> use rb_exec_recursive() and
+ handle recursive data properly.
- * gc.c (rb_gc_mark_locations): get rid of underflow.
+ * hash.c (hash_equal, rb_hash_hash): Make Hash#eql?, #hash and #==
+ use rb_exec_recursive() and handle recursive data properly.
- * gc.c (mark_current_machine_context): check if the main thread stack
- position may shrink under the initialized position. [ruby-core:16436]
+Sat Apr 19 19:26:09 2008 Akinori MUSHA <knu@iDaemons.org>
-Thu Apr 17 22:20:52 2008 Yusuke Endoh <mame@tsg.ne.jp>
+ * intern.h, eval.c (rb_exec_recursive): New internal function to
+ help perform recursive operation; backported from 1.9.
- * enc/trans/utf_16_32.c (fun_so_to_utf_16be, fun_so_to_utf_16le): add
- parentheses to remove warnings of gcc.
+Sat Apr 19 18:42:04 2008 Akinori MUSHA <knu@iDaemons.org>
- * io.c (rb_io_getc): remove unused variables.
+ * intern.h, hash.c (rb_hash_lookup): New internal function to
+ check if a key exists in a hash, ignoring #default; backported
+ from 1.9.
- * compile.c (NODE_NEXT, NODE_REDO): remove unused labels.
+Fri Apr 18 18:56:57 2008 Akinori MUSHA <knu@iDaemons.org>
- * ext/nkf/nkf.c (rb_nkf_convert): remove unused variables.
+ * ext/syck/rubyext.c (syck_genericresolver_node_import): should
+ not set instance variable "@kind" before initializing it.
+ [ruby-dev:32677]
* ext/syck/rubyext.c (syck_resolver_initialize,
syck_resolver_detect_implicit, syck_emitter_emit): remove unused
variables.
-Thu Apr 17 20:12:47 2008 Yusuke Endoh <mame@tsg.ne.jp>
+Fri Apr 18 18:54:57 2008 Akinori MUSHA <knu@iDaemons.org>
- * test/ruby/test_rubyoptions.rb (test_search): enable some assertions.
-
- * test/ruby/test_rubyoptions.rb: flunk message in win32.
-
-Thu Apr 17 16:07:12 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/syck/rubyext.c: Node#value defined twice.
- * test/ruby/test_rubyoptions.rb (ruby): run in C locale.
+ * lib/yaml/: several method redefinitions causing warnings.
- * test/ruby/test_rubyoptions.rb (test_encoding): --encoding does not
- affect source code.
+Fri Apr 18 16:36:16 2008 Akinori MUSHA <knu@iDaemons.org>
-Thu Apr 17 00:45:41 2008 Yusuke Endoh <mame@tsg.ne.jp>
+ * lib/rexml/node.rb (REXML::Node::indent): should initialize rv
+ variable. a patch from Tadayoshi Funaba <tadf AT dotrb.org> in
+ [ruby-dev:32783].
- * test/ruby/test_process.rb (test_rlimit_nofile): reset RLIMIT_NOFILE
- before exit (for gcov).
+Fri Apr 18 16:01:37 2008 Akinori MUSHA <knu@iDaemons.org>
- * test/ruby/test_rubyoptions.rb: new tests for option of ruby
- interpreter, to achieve over 95% test coverage of ruby.c.
+ * lib/rexml: Merge fixes since 1.8.6 made solely on the ruby_1_8_6
+ branch.
-Wed Apr 16 02:40:44 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Apr 16 06:11:49 2008 Akinori MUSHA <knu@iDaemons.org>
- * ruby.c (process_options): preludes and parser need to run in safe
- level 0. [ruby-dev:34407]
+ * test/ruby/test_settracefunc.rb (TestSetTraceFunc#test_event):
+ Fix tests to reflect the following changes: r15833, r15759.
-Wed Apr 16 02:26:27 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Apr 16 05:03:48 2008 Akinori MUSHA <knu@iDaemons.org>
- * ruby.c (process_options): dln_find_file returns the pointer to a
- static buffer, so should copy it. [ruby-dev:34409]
+ * .: Release as Ruby 1.8.7-preview1.
-Tue Apr 15 23:08:46 2008 Kouhei Sutou <kou@cozmixng.org>
+Wed Apr 16 02:09:14 2008 Kouhei Sutou <kou@cozmixng.org>
* lib/xmlrpc/client.rb: fix cookie handling. [ruby-dev:34403]
* test/xmlrpc/test_cookie.rb: add a test for the above fix.
-Tue Apr 15 19:20:14 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c: #undef rb_argv moved before #define.
-
-Tue Apr 15 18:02:17 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/intern.h (rb_argv): replaced with rb_get_argv().
- [ruby-Bugs-19514]
-
-Tue Apr 15 17:10:59 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+Tue Apr 15 23:48:28 2008 Akinori MUSHA <knu@iDaemons.org>
- * lib/net/http.rb, lib/net/smtp.rb, lib/net/pop.rb: update
- URLs of Japanese documents.
+ * version.h: Branch off ruby_1_8_7 from ruby_1_8 in preparation
+ for the forthcoming 1.8.7 release.
-Tue Apr 15 16:45:14 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+Tue Apr 15 23:40:39 2008 Akinori MUSHA <knu@iDaemons.org>
- * test/ruby/test_symbol.rb (TestSymbol#test_to_proc): add tests.
-
-Tue Apr 15 15:38:02 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * misc/ruby-mode.el (ruby-encoding-map): added shift-jis for older
- versions.
+ * ext/syck/rubyext.c (rb_syck_mktime): Avoid buffer overflow.
- * misc/ruby-mode.el (ruby-mode-set-encoding):
- coding-system-to-mime-charset is not a standard function.
- [carbon-emacs:795]
- fix for the case that magic comment exists but coding system is
- absent.
+Tue Apr 15 20:32:03 2008 Tanaka Akira <akr@fsij.org>
- * misc/ruby-mode.el (ruby-mode): use write-contents-functions or
- write-contents-hooks for older versions.
+ * re.c (match_inspect): backported from 1.9.
-Tue Apr 15 07:21:21 2008 Tadayoshi Funaba <tadf@dotrb.org>
+Tue Apr 15 19:03:28 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
- * complex.c (nucomp_div): [ruby-dev:34357]
+ * eval.c (method_receiver, method_name, method_owner): New
+ methods; backported from 1.9. bug#19007
- * complex.c (nucomp_abs): use hypot.
+Tue Apr 15 18:39:14 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
- * complex.c (nucomp_quo): do not force conversion.
-
- * test/ruby/test_complex.rb: omitted some meaningless tests.
+ * lib/uri.rb, lib/uri/ldaps.rb: added LDAPS
+ scheme; backported from 1.9. bug#19015, [ruby-dev:31896]
-Mon Apr 14 23:25:50 2008 Yusuke Endoh <mame@tsg.ne.jp>
+Tue Apr 15 17:45:43 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
- * test/ruby/test_objectspace.rb: add a test for
- ObjectSpace.count_objects.
+ * lib/net/smtp.rb: backported from 1.9. bug#19003
-Mon Apr 14 22:44:24 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+Tue Apr 15 17:06:12 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
- * file.c (SET_EXTERNAL_ENCODING): avoid call rb_enc_check() on
- half-baked result string.
+ * test/ruby/test_symbol.rb (TestSymbol#test_to_proc): add tests.
- * re.c (rb_reg_search): make search reentrant. [ruby-dev:34223]
+Tue Apr 15 16:58:55 2008 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * test/ruby/test_parse.rb (TestParse::test_global_variable):
- should preserve $& variable.
+ * ext/tk/lib/tk/menuspec.rb: option check will fail when
+ TkConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__ is true.
-Mon Apr 14 17:23:27 2008 Akinori MUSHA <knu@iDaemons.org>
+ * ext/tk/lib/tk/palette.rb: bug fix.
- * hash.c (rb_hash_delete_if, rb_hash_reject_bang, env_delete_if,
- env_reject_bang): Return an enumerator if no block is given.
+Tue Apr 15 16:47:48 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-Mon Apr 14 14:33:59 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * signal.c, gc.c: New methods: GC.stress, GC.stress=;
+ backported from 1.9. a patch from Tadashi Saito
+ in [ruby-dev:34394] and bug#19000
- * compile.c, compile.h (compile_debug): made runtime option.
+Tue Apr 15 12:35:44 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * debug.c (ruby_debug_print_indent): returns if debug_level exceeds
- the threshold.
+ * rubyio.h (rb_io_t): renamed from OpenFile.
- * debug.c (ruby_debug_printf): printf to stderr.
+ * ruby.h (struct RHash), file.c, gc.c, io.c, ext/dl/dl.c,
+ ext/io/wait/wait.c, ext/pty/pty.c, ext/readline/readline.c,
+ ext/socket/socket.c: ditto.
- * iseq.c (make_compile_option, make_compile_option_value): added
- debug_level option.
+ * win32/win32.h: removed workaround for OpenFile.
- * vm_core.h (rb_compile_option_t): added debug_level.
+Tue Apr 15 00:15:29 2008 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * vm_core.h (struct iseq_compile_data): added node_level.
+ * ext/tk/lib/tk/text.rb: typo. call a wrong method.
-Mon Apr 14 12:52:25 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/tk/lib/tk/itemconfig.rb: ditto.
- * gc.c (Init_stack): use ruby_init_stack. [ruby-dev:34350]
+ * ext/tk/sample/ttk_wrapper.rb: bug fix.
- * gc.c (rb_objspace_t): packed globals. [ruby-dev:34348]
+ * ext/tk/sample/tktextio.rb: add binding for 'Ctrl-u' at console mode.
- * gc.c (finalizers): removed. [ruby-dev:34349]
+ * ext/tk/lib/tk.rb, ext/tk/lib/tk/itemfont.rb, ext/tk/lib/font.rb:
+ support __IGNORE_UNKNOWN_CONFIGURE_OPTION__ about font options.
-Mon Apr 14 11:30:07 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * ext/tk/lib/tkextlib/iwidgets/scrolledcanvas.rb,
+ ext/tk/lib/tkextlib/iwidgets/scrolledlistbox.rb,
+ ext/tk/lib/tkextlib/iwidgets/scrolledtext.rb: bug fix.
- * array.c (ary_new): new integer overflow check condition.
- suggested by TOYOFUKU Chikanobu <nobu_toyofuku at nifty.com> in
- [ruby-dev:34156].
+ * ext/tk/lib/tkextlib/tile/tpaned.rb: improve TPaned#add.
- * array.c (rb_ary_initialize): ditto.
+ * ext/tk/lib/tk/timer.rb: add TkTimer#at_end(proc) to register the
+ procedure which called at end of the timer.
-Mon Apr 14 00:51:40 2008 Yusuke Endoh <mame@tsg.ne.jp>
+Mon Apr 14 19:54:21 2008 Akinori MUSHA <knu@iDaemons.org>
- * test/ruby/test_parse.rb: add tests to achieve over 95% test coverage
- of parse.y.
+ * array.c (rb_ary_flatten, rb_ary_flatten_bang): Take an optional
+ argument that determines the level of recursion to flatten;
+ backported from 1.9.
-Sun Apr 13 23:53:58 2008 Akinori MUSHA <knu@iDaemons.org>
+ * array.c (rb_ary_shuffle_bang, rb_ary_shuffle, rb_ary_choice,
+ rb_ary_cycle, rb_ary_permutation, rb_ary_combination,
+ rb_ary_product, rb_ary_take, rb_ary_take_while, rb_ary_drop,
+ rb_ary_drop_while): New methods: Array#shuffle, #shuffle!,
+ #choice, #cycle, #permutation, #combination, #product, #take,
+ #take_while, #drop, #drop_while; backported from 1.9.
- * enum.c (enum_cycle): Make Enumerable#cycle do a finite loop when
- the number of cycles is specified.
+Mon Apr 14 19:52:35 2008 Akinori MUSHA <knu@iDaemons.org>
- * array.c (rb_ary_cycle): Ditto for Array#cycle.
+ * ruby.h: New macro: RB_GC_GUARD().
-Sun Apr 13 18:52:27 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Apr 14 19:49:35 2008 Akinori MUSHA <knu@iDaemons.org>
- * thread_pthread.c (lock_func): should not check interrupts in
- blocking region. [ruby-dev:34378]
+ * random.c (rb_genrand_int32, rb_genrand_real), intern.h: Export.
-Sat Apr 12 12:41:49 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * string.c (rb_str_tmp_new), intern.h: New function.
- * eval.c (ruby_exec_node, ruby_run_node), ruby.c (process_options):
- use iseq instead of NODE.
+Mon Apr 14 19:18:55 2008 NAKAMURA Usaku <usa@ruby-lang.org>
- * gc.c (source_filenames): removed.
+ * enum.c (inject_i, inject_op_i): prototype.
- * include/ruby/intern.h, parse.y (yycompile, parser_mark, parser_free,
- ripper_initialize): rb_source_filename() is no longer used.
+Mon Apr 14 19:10:47 2008 Akinori MUSHA <knu@iDaemons.org>
- * compile.c, compile.h (ERROR_ARGS), parse.y (node_newnode, fixpos,
- parser_warn, e_option_supplied, warn_unless_e_option, range_op,
- cond0): nd_file is no longer used.
+ * enum.c New methods: Enumerable#take, #take_while, #drop and
+ #drop_while; backported from 1.9.
-Sat Apr 12 12:17:31 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+Mon Apr 14 18:50:15 2008 Akinori MUSHA <knu@iDaemons.org>
- * prelude.rb (require_relative): move require_relative from
- lib/require_relative.rb. [ruby-core:16356]
+ * enum.c: New methods: Enumerable#one?, #none?, #minmax, #min_by,
+ #max_by, #minmax_by and #cycle; backported from 1.9.
- * lib/require_relative.rb: removed.
+ * enum.c (enum_find_index): Add support for find_index(obj);
+ [ruby-dev:34313]; backported from 1.9.
-Sat Apr 12 05:55:57 2008 Eric Hodel <drbrain@segment7.net>
+ * enum.c (enum_inject): Add support for Enumerable#inject(:binop);
+ backported from 1.9.
- * lib/rubygems*, test/rubygems*: Update to RubyGems 1.1.1 r1701.
+ * enum.c: Alias Enumerable#reject to #inject; backported from 1.9.
-Sat Apr 12 03:13:38 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Apr 14 18:14:19 2008 Akinori MUSHA <knu@iDaemons.org>
- * file.c (file_expand_path): set external encoding.
+ * enum.c (enum_find, enum_reject): Return an enumerator if no
+ block is given; backported from 1.9.
- * file.c (rb_file_s_basename, rb_file_s_dirname, rb_file_s_extname):
- copy encoding.
+ * io.c (rb_io_each_line, rb_io_each_byte, rb_io_s_foreach,
+ argf_each_line, argf_each_byte): Ditto.
-Fri Apr 11 17:35:06 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * string.c (str_gsub): Ditto.
- * enum.c (count_i): modified to shut warning up.
+Mon Apr 14 18:10:05 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-Fri Apr 11 17:25:09 2008 Akinori MUSHA <knu@iDaemons.org>
+ * enum.c (find_index_i, find_index_iter_i): add prototype for VC.
- * enum.c (count_i, count_iter_i, enum_count, enum_find_index):
- Reduce code.
+Mon Apr 14 17:55:30 2008 Akinori MUSHA <knu@iDaemons.org>
-Fri Apr 11 17:06:01 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * array.c (rb_ary_collect_bang, rb_ary_select): Return an
+ enumerator if no block is given; backported from 1.9.
- * enum.c (find_index_i): modified to shut warning up.
+ * dir.c (dir_each, dir_foreach): Ditto.
- * enum.c (find_index_iter_i): ditto.
+ * enum.c (enum_partition, enum_sort_by): Ditto.
-Fri Apr 11 16:44:43 2008 Akinori MUSHA <knu@iDaemons.org>
+ * gc.c (os_each_obj): Ditto.
- * enum.c (enum_find_index): Add support for find_index(obj);
- [ruby-dev:34313].
+ * hash.c (rb_hash_delete_if, rb_hash_reject_bang, rb_hash_select,
+ rb_hash_each_value, rb_hash_each_key, rb_hash_each_pair,
+ env_each_key, env_each_value, env_each, env_each_pair,
+ env_reject_bang, env_delete_if, env_select): Ditto.
- * array.c (rb_ary_index): Define find_index as an alias to index.
+ * numeric.c (num_step, int_upto, int_downto, int_dotimes): Ditto.
-Fri Apr 11 16:42:33 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+Mon Apr 14 16:42:53 2008 Akinori MUSHA <knu@iDaemons.org>
- * lib/yaml/store.rb (YAML::load): modified to support empty
- database.
+ * ruby.h (rb_block_call_func): Fix prototype.
-Fri Apr 11 08:05:12 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * enumerator.c (enumerator_iter_i, enumerator_each_i): Ditto.
- * marshal.c (w_object): add volatile to avoid potential GC bug. a
- patch from Tomoyuki Chikanaga <chikanag at nippon-control-system.co.jp>
- in [ruby-dev:34312].
+Mon Apr 14 15:49:05 2008 Akinori MUSHA <knu@iDaemons.org>
-Thu Apr 10 23:08:52 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * enum.c (enum_count, enum_find_index): New methods:
+ Enumerable#count and #find_index; backported from 1.9.
- * lib/pstore.rb (PStore::dump, PStore::load): allow subclass
- overriding. [ruby-dev:34305]
+Mon Apr 14 14:16:08 2008 NAKAMURA Usaku <usa@ruby-lang.org>
- * lib/yaml/store.rb (YAML::Store::marshal_dump_supports_canonical_option?):
- add a method to support faster PStore.
+ * enumerator.c (enumerator_mark, enumerator_iter_i, enumerator_each_i,
+ enumerator_allocate): add prototype.
-Thu Apr 10 20:36:45 2008 Akinori MUSHA <knu@iDaemons.org>
+ * enumerator.c (enumerator_each_i): declare unused two arguments.
- * misc/rdebug.el, misc/README: Remove rdebug.el as per request
- from the maintainer and mention the ruby-debug project at
- RubyForge in README; bug#19043.
+Mon Apr 14 13:58:32 2008 Akinori MUSHA <knu@iDaemons.org>
-Thu Apr 10 19:41:00 2008 Akinori MUSHA <knu@iDaemons.org>
+ * string.c (rb_str_each_char): New methods: String#chars and
+ #each_char; backported from 1.9.
- * eval.c (rb_f_loop): Mention StopIteration in the document.
+Mon Apr 14 13:42:20 2008 Akinori MUSHA <knu@iDaemons.org>
-Thu Apr 10 19:23:55 2008 Akinori MUSHA <knu@iDaemons.org>
+ * string.c (rb_str_each_line, rb_str_each_byte): Reflect
+ enumerator integration. #lines and #bytes are now aliases to
+ #each_line and #each_byte, respectively.
- * array.c (rb_ary_pop_m, rb_ary_shift_m): Update documents for
- #pop() and #shift().
+Mon Apr 14 13:19:36 2008 Akinori MUSHA <knu@iDaemons.org>
- * array.c (rb_ary_slice_bang): Update document. Assigning
- array[*args]= nil no longer removes elements.
+ * range.c (range_each, range_step): Return an enumerator if no
+ block is given; backported from 1.9.
-Thu Apr 10 16:58:44 2008 Tanaka Akira <akr@fsij.org>
+ * struct.c (rb_struct_each, rb_struct_each_pair): Ditto.
- * marshal.c (w_object): TYPE_USERDEF assigns id for ivars first.
- [ruby-dev:34159] by nagachika.
+Mon Apr 14 13:07:59 2008 Akinori MUSHA <knu@iDaemons.org>
-Thu Apr 10 15:03:47 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * string.c (rb_str_partition, rb_str_rpartition,
+ rb_str_start_with, rb_str_end_with): New methods:
+ String#partition, #rpartition, #start_with? and #end_with?;
+ backported from 1.9. These methods are $KCODE aware unlike
+ #index, #rindex and #include?.
- * lib/generator.rb: removed obsolete library. [ruby-core:16233]
+Sun Apr 13 15:55:52 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
- * test/test_generator.rb: removed as well. [ruby-dev:34306]
+ * object.c (sym_to_proc): new method Symbol#to_proc; backported
+ from 1.9. bug#19012
- * lib/pstore.rb: replaced by Hongli Lai's faster version.
+Fri Apr 11 19:14:30 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-Thu Apr 10 10:27:24 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * object.c (rb_obj_tap): new method Object#tap; backported from
+ 1.9. bug#19008
- * thread_pthread.c (native_sleep): sleep_cond is initialized at
- creation. [ruby-Patches-19361].
+Fri Apr 11 18:58:09 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-Wed Apr 9 14:43:26 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * process.c: new method Process.exec; backported from 1.9. bug#19006
- * thread.c (lock_func): optimized and checks for interrupt_flag.
- based on a patch from Sylvain Joyeux in [ruby-Patches-19361] and
- [ruby-Patches-19362].
+Fri Apr 11 12:43:56 2008 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-Wed Apr 9 12:12:01 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/tk/lib/tkextlib/tile.rb, ext/tk/lib/tkextlib/tile/style.rb,
+ ext/tk/sample/tkextlib/tile/demo.rb: previous patch is not complete.
- * test/ruby/test_thread.rb: new tests from Sylvain Joyeux in
- [ruby-Patches-19361].
+Fri Apr 11 10:22:54 2008 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-Tue Apr 8 21:36:40 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/tk/lib/tkextlib/tile.rb:
+ __define_LoadImages_proc_for_compatibility__! do nothing when the
+ Tcl command exists.
- * thread.c (rb_mutex_sleep): ensures to re-acquire at waking up.
- [ruby-Patches-19361]
+ * ext/tk/lib/tkextlib/tile/style.rb:
+ __define_wrapper_proc_for_compatibility__! do nothing when the Tcl
+ command exists.
-Tue Apr 8 11:00:14 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * ext/tk/sample/tkextlib/tile/demo.rb: don't create 'step' theme if
+ it already exists.
- * lib/complex.rb: remove Math first before overwriting by CMath.
+Fri Apr 11 08:05:12 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-Tue Apr 8 10:34:10 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * marshal.c (w_object): add volatile to avoid potential GC bug. a
+ patch from Tomoyuki Chikanaga <chikanag at nippon-control-system.co.jp>
+ in [ruby-dev:34311].
- * load.c (rb_require_safe): should check fname path after $SAFE is
- properly set. [ruby-dev:34268]
+Thu Apr 10 20:29:13 2008 Akinori MUSHA <knu@iDaemons.org>
- * re.c (rb_reg_quote): should always copy the quoting string.
- [ruby-core:16235]
+ * misc/rdebug.el, misc/README: Remove rdebug.el as per request
+ from the maintainer and mention the ruby-debug project at
+ RubyForge in README; bug#19043.
-Tue Apr 8 10:30:29 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Apr 10 20:08:37 2008 Akinori MUSHA <knu@iDaemons.org>
- * common.mk (prelude.c): depends on enc/prelude.rb.
+ * enum.c (enum_first, enum_group_by): New methods:
+ Enumerable#first and #group_by; backported from 1.9.
- * enc/prelude.rb: fixed initial library names.
+Thu Apr 10 19:49:10 2008 Akinori MUSHA <knu@iDaemons.org>
-Tue Apr 8 03:39:26 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * enumerator.c (rb_eStopIteration), eval.c (rb_f_loop), ruby.h:
+ Add a new exception class StopIteration, which breaks Kernel#loop
+ iteration when raised; backported from 1.9.
- * load.c (rb_provided): check expanded path for relative path
- features, loading or loaded features are already expanded in 1.9.
+ * enumerator.c (enumerator_next, enumerator_rewind): Implement
+ #next and #rewind using the "generator" library.
- * variable.c (rb_autoload_load): no needs to check if provided before
- rb_require_safe. [ruby-dev:34266]
+ * lib/generator.rb: Implement Enumerable::Enumerator#next and
+ #rewind.
-Mon Apr 7 22:41:21 2008 Tadayoshi Funaba <tadf@dotrb.org>
+Thu Apr 10 19:29:48 2008 Akinori MUSHA <knu@iDaemons.org>
- * numeric.c: cancelled recent changes (except to remove rdiv).
+ * array.c (rb_ary_first, rb_ary_last): Return a shared array when
+ possible.
- * bignum.c: ditto.
+ * array.c (rb_ary_pop, rb_ary_pop_m, rb_ary_shift, rb_ary_shift_m):
+ Array#pop and Array#shift can take an optional argument
+ specifying the number of elements to remove and return;
+ backported from 1.9.
- * bignum.c: added rb_big_idiv.
+Thu Apr 10 14:00:44 2008 Tanaka Akira <akr@fsij.org>
-Mon Apr 7 15:51:31 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/resolv.rb (Resolv::DNS#each_address): backport from 1.9 for
+ CNAME. [ruby-dev:34200]
- * encoding.c (enc_init_db): moved to enc/encdb.c.
+Thu Apr 10 01:42:25 2008 NAKAMURA Usaku <usa@ruby-lang.org>
- * transcode.c (init_transcoder_table): moved to enc/trans/transdb.c.
+ * enum.c (iterate_method): add prototype to avoid warning on VC++.
- * enc/depend (enc/encdb.o enc/trans/transdb.o): depend on
- corresponding headers.
+Wed Apr 9 23:12:41 2008 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * common.mk (COMMONOBJS): moved transcode.o from OBJS
+ * ext/tk/tcltklib.c: SEGV when tcltk-stubs is enabled.
-Mon Apr 7 12:26:32 2008 Koichi Sasada <ko1@atdot.net>
+ * ext/tk/tcltklib.c: avoid error on a shared object.
- * bootstraptest/test_knownbug.rb: add a known-bug.
+ * ext/tk/extconf.rb: support --with-tcltkversion
-Mon Apr 7 12:15:24 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/tk/README.tcltklib: add document about --with-tcltkversion
- * range.c (range_each_func): should not leave a variable
- uninitialized, which could cause SEGV.
+ * ext/tk/sample/demos-jp/widget, ext/tk/sample/demos-en/widget,
+ ext/tk/sample/demos-jp/style.rb, ext/tk/sample/demos-en/style.rb,
+ ext/tk/sample/demos-jp/bind.rb, ext/tk/sample/demos-en/bind.rb:
+ bug fix.
- * range.c (range_step): removed duplicated and unreachable code.
+Wed Apr 9 21:54:45 2008 Akinori MUSHA <knu@iDaemons.org>
-Mon Apr 7 02:12:27 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * array.c (rb_ary_pop): Do not reallocate too often; backported
+ from 1.9.
- * string.c (rb_str_intern): need not to check if tainted.
- [ruby-dev:34219]
+Wed Apr 9 21:13:05 2008 Akinori MUSHA <knu@iDaemons.org>
-Sun Apr 6 09:45:00 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * array.c (rb_ary_each, rb_ary_each_index, rb_ary_reverse_each,
+ rb_ary_reject, rb_ary_reject_bang): Array#each, #each_index,
+ #reverse_each, #reject, #reject! and #delete_if return an
+ enumerator if no block is given; backported from 1.9.
- * dir.c (dir_tell): check if closed. [ruby-core:16223]
+Wed Apr 9 20:47:16 2008 Akinori MUSHA <knu@iDaemons.org>
-Sat Apr 5 23:17:20 2008 Tadayoshi Funaba <tadf@dotrb.org>
+ * array.c (rb_ary_index, rb_ary_index): Array#index and #rindex
+ can take a block instead of an argument; backported from 1.9.
- * lib/cmath.rb: new.
+Wed Apr 9 19:58:31 2008 Akinori MUSHA <knu@iDaemons.org>
- * lib/complex.rb: depends lib/cmath.rb.
+ * enumerator.c, inits.c (rb_call_inits), ruby.h, intern.h,
+ ext/enumerator, common.mk (OBJS, enumerator.$(OBJEXT)): Make the
+ enumerator module built-in.
- * lib/rational.rb: added rdiv.
+ * enumerator.c: New method: Enumerable::Enumerator#with_index.
- * complex.c: removed some math functions.
+ * enum.c (enum_each_with_index): Enumerable#each_with_index now
+ returns an enumerator instead of raising an exception if no
+ block is given. Enumerable#enum_with_index, formerly defined in
+ the enumerator module, is kept as an alias to each_with_index
+ for backward compatibility.
-Sat Apr 5 05:50:57 2008 Eric Hodel <drbrain@segment7.net>
+Wed Apr 9 19:43:51 2008 Akinori MUSHA <knu@iDaemons.org>
- * lib/rdoc/parsers/parse_rb.rb: Fix uninitialized variable warnings.
+ * eval.c (rb_obj_method, rb_proc_call), intern.h: Export.
- * lib/rdoc/generator/html.rb: ditto.
+Tue Apr 8 11:11:28 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/rdoc/options.rb: Fix shadowed variable warning.
+ * eval.c (EXEC_TAG): remove unnecessary FLUSH_REGISTER_WINDOWS for
+ better performance on SPARC. [ruby-core:16159]
- * lib/webrick/httprequest.rb: Fix redefined method warning.
+Tue Apr 8 10:49:54 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-Sat Apr 5 02:13:52 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * re.c (rb_reg_quote): should always copy the quoting string.
+ [ruby-core:16235]
- * bignum.c (rb_cmpint): moved from compar.c, to check bignum
- zero.
+Mon Apr 7 21:35:08 2008 Akinori MUSHA <knu@iDaemons.org>
-Fri Apr 4 23:24:06 2008 NARUSE, Yui <naruse@ruby-lang.org>
+ * array.c (rb_ary_nitems): Backport Array#nitems with a block;
+ suggested by Bertram Scharpf <lists@bertram-scharpf.de> in
+ [ruby-talk:134083].
- * re.c (rb_memsearch_qs): wrong boundary condition.
+Sun Apr 6 09:45:00 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * re.c (rb_memsearch_qs_utf8): ditto.
+ * dir.c (dir_tell): check if closed. [ruby-core:16223]
-Fri Apr 4 14:11:36 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+Sat Apr 5 10:05:00 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * re.c (rb_memsearch_qs): wrong boundary condition. a patch from
- wanabe <s.wanabe AT gmail.com> in [ruby-dev:34248].
+ * object.c (rb_check_to_integer): backported for range_step.
Fri Apr 4 05:57:11 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/net/pop.rb (Net::POP3::do_finish): clear @n_mails and
@n_bytes as well. [ruby-core:16144]
-Fri Apr 4 01:59:30 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * range.c (range_step): add step for each iteration if begin and
- end are numeric. [ruby-core:15990]
-
-Fri Apr 4 00:42:26 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bignum.c (Init_Bignum): rdiv method removed. [ruby-dev:34242]
+Fri Apr 4 02:17:06 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
- * complex.c (nucomp_quo): ditto.
-
- * numeric.c (num_rdiv): ditto.
-
- * rational.c (nurat_div): ditto.
-
- * complex.c (nucomp_fdiv): fdiv implementation restored.
-
- * numeric.c (num_quo): RDoc updated.
-
-Thu Apr 3 21:51:45 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c (nucomp_int_check): function for DRY real check.
-
- * complex.c (nucomp_{add,sub,mul,div,expt}): use rb_num_coerce_bin().
-
-Thu Apr 3 19:59:42 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * insns.def (defineclass): check if cbase is a class or a module.
- [ruby-core:16118]
-
-Thu Apr 3 14:42:11 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * common.mk (INSNS): add insns_info.inc.
-
- * common.mk (INSNS): make incs separately for nmake.
-
-Thu Apr 3 13:20:38 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (endb.h, transdb.h, prelude.c): depend on $(PREP) and
- check if really changed. [ruby-core:16102]
-
- * Makefile.in, common.mk, configure.in, {win32,bcc32}/Makefile.sub
- (MINIOBJS, ARCHMINIOBJS): separated.
-
-Thu Apr 3 09:00:45 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * compile.c (iseq_set_sequence, iseq_insns_unification,
- insn_data_to_s_detail): constified.
-
- * iseq.c (insn_operand_intern, ruby_iseq_disasm_insn): ditto.
-
- * template/{insns_info,opt_sc,optunifs}.inc.tmpl: ditto.
-
- * tool/instruction.rb (OptUnifsIncGenerator): ditto.
-
-Thu Apr 3 08:46:09 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * range.c (range_include): add RDoc to describe that comparison
- for numeric is done according magnitude of values.
- [ruby-core:15907]
-
-Wed Apr 2 22:29:35 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * rational.c (nurat_int_check): function for DRY integer check.
-
- * numeric.c (num_rdiv): should always return rational number.
-
- * rational.c (nurat_add, nurat_sub, nurat_mul, nurat_fdiv,
- nurat_cmp): use rb_num_coerce_bin().
-
- * rational.c (nurat_division): does / and rdiv.
-
- * .gdbinit (rp): no longer use rb_p().
-
-Wed Apr 2 06:52:31 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * .gdbinit (rp): supports rational and complex numbers. it's
- cheating since it uses rb_p().
-
-Wed Apr 2 06:24:06 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * include/ruby/node.h: add new constants for rb_call()'s scope.
-
- * eval.c (iterate_method): use CALL_* scope constant to specify
- proper scope value.
-
- * eval.c (rb_each, rb_apply, rb_funcall, rb_funcall2, rb_funcall3):
- ditto.
-
-Tue Apr 1 21:19:41 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * rational.c: need to include <float.h> just once.
-
-Tue Apr 1 16:40:21 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * bignum.c (big2dbl): more precise conversion at edge cases.
- [ruby-dev:34195]
+ * range.c (range_step): should not round step into integer if
+ begin and end are numeric. [ruby-core:15990]
Tue Apr 1 14:43:38 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in: get rid of empty expansion.
- * configure.in: _setjmp is available but _longjmp is not on mingw.
-
-Tue Apr 1 09:41:22 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
* {bcc,win}32/Makefile (config.h): need to define RUBY_SETJMP, etc.
-Tue Apr 1 07:31:58 2008 Eric Hodel <drbrain@segment7.net>
+Tue Apr 1 11:36:19 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/rubygems* test/rubygems*: Import RubyGems 1.1.0.
+ * configure.in: _setjmp is available but _longjmp is not on mingw.
Tue Apr 1 03:20:40 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
@@ -26870,221 +1582,124 @@ Tue Apr 1 01:55:52 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/resolv.rb (Resolv::Config.default_config_hash): requires
win32/resolv to use Win32::Resolv. [ruby-dev:34138]
-Tue Apr 1 01:40:58 2008 Tadayoshi Funaba <tadf@dotrb.org>
+Mon Mar 31 14:51:11 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
- * complex.c: adopted the ruby's style.
+ * bignum.c (rb_big_div): Bignum#div should return integer for
+ floating number operand.
- * rational.c: ditto.
+Sun Mar 30 07:00:32 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Tue Apr 1 00:17:35 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * rational.c: revert.
-
-Mon Mar 31 18:57:36 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * {bcc,win}32/Makefile.sub (config.h): define ssize_t.
-
- * io.c (copy_stream_body): some platform don't have O_NOCTTY.
-
-Mon Mar 31 18:42:41 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in: check for ssize_t. [ruby-dev:34184]
-
-Mon Mar 31 14:45:00 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * numeric.c (num_quo): should convert its operand to Rational.
-
- * rational.c (string_to_r_strict): should raise TypeError.
-
- * bignum.c (Init_Bignum): should not redefine Bignum#div.
- Numeric#div will do. [ruby-dev:34066]
-
-Mon Mar 31 04:05:15 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * io.c (io_getc): set coderange while getting characters.
-
-Sun Mar 30 23:16:49 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * proc.c (proc_dup): should copy is_lambda attribute as well.
- [ruby-talk:296244]
-
-Sun Mar 30 15:33:29 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c: IO.copy_stream implemented. [ruby-dev:33843]
-
- * thread.c (rb_fd_select): new function.
-
- * configure.in (sys/sendfile.h): check the header file.
- (sendfile): check the function.
- (pread): check the function.
+ * ext/tk/tcltklib.c: rb_hash_lookup has not been backported yet.
Sat Mar 29 14:18:41 2008 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/*: full update Ruby/Tk to support Ruby(1.9|1.8) and Tc/Tk8.5.
- * ext/tk/lib/tkextlib/tile.rb: [incompatible] remove TileWidgets'
+ * ext/tk/lib/tkextlib/tile.rb: [incompatible] remove TileWidgets'
instate/state/identify method to avoid the conflict with standard
widget options. Those methods are renamed to ttk_instate/ttk_state/
- ttk_identify (tile_instate/tile_state/tile_identify are available
- too). Although I don't recommend, if you really need old methods,
- please define "Tk::USE_OBSOLETE_TILE_STATE_METHOD = true" before
+ ttk_identify (tile_instate/tile_state/tile_identify are available
+ too). Although I don't recommend, if you realy need old methods,
+ please define "Tk::USE_OBSOLETE_TILE_STATE_METHOD = true" before
"require 'tkextlib/tile'".
* ext/tk/lib/tkextlib/tile.rb: "Tk::Tile::__Import_Tile_Widgets__!"
- is obsolete. It outputs warning. To control default widget set,
+ is obsolete. It outputs warning. To control default widget set,
use "Tk.default_widget_set = :Ttk".
- * ext/tk/lib/tk.rb: __IGNORE_UNKNOWN_CONFIGURE_OPTION__ method and
- __set_IGNORE_UNKNOWN_CONFIGURE_OPTION__!(mode) method are defined
- as module methods of TkConfigMethod. It may help users to wrap old
+ * ext/tk/lib/tk.rb: __IGNORE_UNKNOWN_CONFIGURE_OPTION__ method and
+ __set_IGNORE_UNKNOWN_CONFIGURE_OPTION__!(mode) method are defind
+ as module methods of TkConfigMethod. It may help users to wrap old
Ruby/Tk scripts (use standard widgets) to force to use Ttk widgets.
- Ttk widgets don't have some options of standard widgets which are
- control the view of widgets. When set ignore-mode true, configure
- method tries to ignore such unknown options with no exception.
- Of course, it may raise other troubles on the GUI design.
- So, those are a little danger methods.
-
- * ext/tk/lib/tk/itemconfig.rb: __IGNORE_UNKNOWN_CONFIGURE_OPTION__
- method and __set_IGNORE_UNKNOWN_CONFIGURE_OPTION__!(mode) method
- are defined as module methods of TkItemConfigMethod as the same
+ Ttk widgets don't have some options of standard widgets which are
+ control the view of widgets. When set ignore-mode true, configure
+ method tries to ignoure such unknown options with no exception.
+ Of course, it may raise other troubles on the GUI design.
+ So, those are a little danger methods.
+
+ * ext/tk/lib/tk/itemconfig.rb: __IGNORE_UNKNOWN_CONFIGURE_OPTION__
+ method and __set_IGNORE_UNKNOWN_CONFIGURE_OPTION__!(mode) method
+ are defind as module methods of TkItemConfigMethod as the same
purpose as TkConfigMethod's ones.
- * ext/tk/sample/ttk_wrapper.rb: A new example. This is a tool for
- wrapping old Ruby/Tk scripts (which use standard widgets) to use
+ * ext/tk/sample/ttk_wrapper.rb: A new example. This is a tool for
+ wrapping old Ruby/Tk scripts (which use standard widgets) to use
Ttk (Tile) widgets as default.
- * ext/tk/sample/tkextlib/tile/demo.rb: use ttk_instate/ttk_state
+ * ext/tk/sample/tkextlib/tile/demo.rb: use ttk_instate/ttk_state
method instead of instate/state method.
* ext/tk/lib/tk/root, ext/tk/lib/tk/namespace.rb,
- ext/tk/lib/tk/text.rb, ext/tk/lib/tkextlib/*: some 'instance_eval's
+ ext/tk/lib/tk/text.rb, ext/tk/lib/tkextlib/*: some 'instance_eval's
are replaced to "instance_exec(self)".
- * ext/tk/lib/tk/event.rb: bug fix on KEY_TBL and PROC_TBL (?x is not
+ * ext/tk/lib/tk/event.rb: bug fix on KEY_TBL and PROC_TBL (?x is not
a character code on Ruby1.9).
- * ext/tk/lib/tk/variable.rb: support new style of operation argument
- on Tcl/Tk's 'trace' command for variables.
+ * ext/tk/lib/tk/variable.rb: support new style of operation argument
+ on Tcl/Tk's 'trace' command for variables.
* ext/tk/sample/demos-jp/widget, ext/tk/sample/demos-en/widget: bug fix
- * ext/tk/sample/demos-jp/textpeer.rb,
- ext/tk/sample/demos-en/textpeer.rb: new widget demo.
+ * ext/tk/sammple/demos-jp/textpeer.rb,
+ ext/tk/sammple/demos-en/textpeer.rb: new widget demo.
- * ext/tk/tcltklib.c: decrease SEGV troubles (probably)
+ * ext/tk/tcltklib.c: decrase SEGV troubles (probably)
* ext/tk/lib/tk.rb: remove Thread.critical access if Ruby1.9
* ext/tk/lib/tk/multi-tk.rb: support Ruby1.9 (probably)
- * ext/tk/lib/tkextlib/tile.rb: add method to define Tcl/Tk command
- to make Tcl/Tk theme sources (based on different version of Tile
- extension) available.
- (Tk::Tile::__define_LoadImages_proc_for_compatibility__)
+ * ext/tk/lib/tkextlib/tile.rb: add method to define Tcl/Tk command
+ to make Tcl/Tk theme sources (based on different version of Tile
+ extension) available.
+ (Tk::Tile::__define_LoadImages_proc_for_comaptibility__)
* ext/tk/lib/tk.rb, ext/tk/lib/tk/wm.rb: support dockable frames
- (Tcl/Tk8.5 feature). 'wm' command can treat many kinds of widgets
+ (Tcl/Tk8.5 feature). 'wm' command can treat many kinds of widgets
as toplevel widgets.
* ext/tk/lib/tkextlib/tile/style.rb: ditto.
(Tk::Tile::Style.__define_wrapper_proc_for_compatibility__)
- * ext/tk/lib/tk/font.rb: add actual_hash and metrics_hash to get
- properties as a hash. metrics_hash method returns a boolean value
- for 'fixed' option. But metrics method returns numeric value
- (0 or 1) for 'fixed' option, because of backward compatibility.
+ * ext/tk/lib/tk/font.rb: add actual_hash and metrics_hash to get
+ properties as a hash. metrics_hash method returns a boolean value
+ for 'fixed' option. But metrics method returns numeric value
+ (0 or 1) for 'fixed' option, because of backward compatibility.
- * ext/tk/lib/tk/timer.rb: sometimes fail to set callback procedure.
+ * ext/tk/lib/tk/timer.rb: somtimes fail to set callback procedure.
- * ext/tk/lib/tk.rb: add Tk.sleep and Tk.wakeup method. Tk.sleep
- doesn't block the eventloop. It will be better to use the method
+ * ext/tk/lib/tk.rb: add Tk.sleep and Tk.wakeup method. Tk.sleep
+ doesn't block the eventloop. It will be better to use the method
in event callbacks.
* ext/tk/sample/tksleep_sample.rb: sample script about Tk.sleep.
-Thu Mar 27 20:44:22 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c (f_lcm): removed.
-
- * rational.c (rb_lcm, rb_gcdlcm): added.
-
- * lib/complex.rb (gcd, lcm, gcdlcm): removed.
-
- * lib/rational.rb (gcd, lcm, gcdlcm): ditto.
+Sat Mar 29 04:08:59 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-Wed Mar 26 18:11:26 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * class.c (clone_method): should copy cref as well.
+ [ruby-core:15833]
- * variable.c (rb_mod_constants): rdoc updated. a patch from
- Florian Gilcher <flo AT andersground.net> in [ruby-core:16009].
+Mon Mar 24 20:07:42 2008 Akinori MUSHA <knu@iDaemons.org>
-Wed Mar 26 00:55:28 2008 Yusuke Endoh <mame@tsg.ne.jp>
+ * eval.c (rb_eval): Call trace hook for if expression after the
+ condition has been evaluated, not before; submitted by Rocky
+ Bernstein in #18722.
- * test/ruby/test_rand.rb: add tests to achieve over 95% test coverage
- of random.c.
+Mon Mar 24 19:44:53 2008 Akinori MUSHA <knu@iDaemons.org>
-Wed Mar 26 00:28:55 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_rational.rb: add tests to achieve over 90% test
- coverage of rational.c.
-
- * test/ruby/test_complex.rb: ditto for complex.c.
-
-Tue Mar 25 19:34:05 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * bootstraptest/test_knownbug.rb: add tests. [ruby-dev:34128]
-
-Tue Mar 25 19:09:04 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * array.c (ary_new): fix size check. [ruby-dev:34123]
-
- * array.c (rb_ary_take, rb_ary_drop): check negative size and use
- NUM2LONG instead of FIX2LONG. [ruby-dev:34123]
-
- * enum.c (enum_take, enum_drop): check negative size.
-
- * test/ruby/test_array.rb: add tests for above.
-
-Tue Mar 25 16:32:56 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (proc_options): checks if the word is empty.
-
- * ruby.c (process_options): typo fixed. [ruby-dev:34122]
-
-Tue Mar 25 15:26:30 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * compile.c (defined_expr): false short-circuit destination label may
- be needed. [ruby-talk:295296]
-
- * compile.c (iseq_compile_each): put nil if false short-circuit is
- created.
-
- * compile.c (compile_massign_opt): no need to use alloca.
-
-Mon Mar 24 19:23:52 2008 Akinori MUSHA <knu@iDaemons.org>
-
- * parse.y (debug_lines): Always prepare a new array for each
- file's SCRIPT_LINES__ storage, instead of appending source lines
- every time a file is re-loaded; submitted by Rocky Bernstein in
+ * parse.y (yycompile): Always prepare a new array for each file's
+ SCRIPT_LINES__ storage, instead of appending source lines every
+ time a file is re-loaded; submitted by Rocky Bernstein in
#18517.
Mon Mar 24 10:25:54 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in: sitearch should use target_cpu. [ruby-core:15986]
-Sun Mar 23 02:51:57 2008 Tanaka Akira <akr@fsij.org>
-
- * process.c (rlimit_resource_value): use NUM2RLIM.
-
-Sun Mar 23 02:28:01 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c: fixed. [ruby-dev:34109]
-
- * rational.c: ditto.
+Mon Mar 24 01:24:24 2008 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-Fri Mar 21 21:32:25 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (rb_f_gets, rb_f_readline, rb_f_readlines): delegates to ARGF
- as well as puts and putc. [ruby-dev:34100]
+ * lib/erb.rb (result): use proc instead of Thread. [ruby-dev:33692]
Fri Mar 21 21:26:52 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
@@ -27111,125 +1726,28 @@ Fri Mar 21 09:24:28 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* instruby.rb (open_for_install): write block result and rewrite only
if changed from existing file.
-Fri Mar 21 08:29:33 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * rational.c (nurat_to_f): rearrangement.
-
-Fri Mar 21 06:44:59 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * rational.c (nurat_to_f): C99.
-
-Fri Mar 21 01:40:27 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * complex.c (nucomp_sub, nucomp_expt): call corresponding functions.
-
-Fri Mar 21 01:21:43 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * missing/tgamma.c: include config.h before math.h. [ruby-dev:34075]
-
-Thu Mar 20 21:46:33 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (argf_getline): use receiver.
-
-Thu Mar 20 21:20:19 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * rational.c: some improvements (include Shin-ichiro HARA's
- effort).
-
- * complex.c: some improvements.
-
- * test/ruby/test_rational2.rb: new.
-
-Thu Mar 20 00:21:12 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (argf_initialize_copy): get rid of segfault.
-
- * io.c (argf_tell, argf_seek_m, argf_set_pos, argf_rewind,
- argf_fileno, argf_to_io, argf_eofl, argf_getc, argf_getbyte,
- argf_readchar, argf_readbyte, argf_each_line): use receiver.
-
-Wed Mar 19 23:52:41 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (rb_io_putc, rb_io_puts): output directly if the receiver is
- rb_stdout to get rid of infinite recursion. [ruby-dev:34059]
-
-Wed Mar 19 22:27:41 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * rational.c: added rb_gcd.
-
- * complex.c: use rb_gcd.
+Wed Mar 19 21:01:08 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed Mar 19 18:37:00 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c: revert.
-
- * rational.c: revert.
-
-Wed Mar 19 17:31:20 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval_intern.h (TH_EXEC_TAG): need not to FLUSH_REGISTER_WINDOWS.
- [ruby-core:15871], [ruby-dev:34088]
+ * dir.c (dir_inspect, dir_path, dir_tell): check for frozen and closed
+ is not needed. [ruby-dev:32640]
-Wed Mar 19 14:53:03 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Mar 19 20:25:40 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * complex.c (nucomp_to_s, nucomp_inspect): get rid of making
- unnecessary intermediate objects.
+ * dir.c (Init_Dir): define inspect method. [ruby-core:15960]
- * complex.c (make_patterns, string_to_c): do not treat successive
- underscores as a part of numeric like as literals. [ruby-dev:34085]
+Wed Mar 19 14:59:12 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * rational.c (make_patterns, string_to_r): ditto.
+ * misc/ruby-style.el (ruby-style-{case,label}-indent): fix for labels
+ inside blocks in switch and function top level.
Wed Mar 19 14:36:40 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* bignum.c (rb_cstr_to_inum): treat successive underscores as
nondigit. [ruby-dev:34089]
-Wed Mar 19 14:08:47 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * encoding.c (enc_check_encoding): should not load autoloaded encoding
- directly, instead use rb_enc_find_index() which deal with alias and
- replica. [ruby-core:15957]
-
-Wed Mar 19 11:49:47 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * regint.h (include): include ruby.h instead of defines.h and config.h.
-
-Wed Mar 19 10:17:12 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * regint.h (CHECK_INTERRUPT_IN_MATCH_AT): add interrupt check
- during match. [ruby-talk:295002]
-
-Tue Mar 18 16:24:53 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (literal_concat_gen): bail out at different encoding.
-
-Tue Mar 18 04:00:27 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * re.c (rb_memsearch_ss): simple shift search.
-
- * re.c (rb_memsearch_qs): quick search.
-
- * re.c (rb_memsearch_qs_utf8): quick search for UTF-8 string.
-
- * re.c (rb_memsearch_qs_utf8_hash): hash functions for above.
-
- * re.c (rb_memsearch): use above functions.
-
- * string.c (rb_str_index): give enc to rb_memsearch.
-
- * include/ruby/intern.h (rb_memsearch): move to encoding.h.
-
- * include/ruby/encoding.h (rb_memsearch): move from intern.h.
+Wed Mar 19 00:01:23 2008 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
- * common.mk (PREP): add dependency.
-
-Mon Mar 17 22:23:54 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * array.c (rb_ary_take, rb_ary_take_while, rb_ary_drop,
- rb_ary_drop_while): new methods. [ruby-dev:34067]
-
- * test/ruby/test_array.rb: add tests for above.
+ * lib/erb.rb (ERB::Compiler): Make some minor code optimization.
Mon Mar 17 17:11:13 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
@@ -27241,69 +1759,6 @@ Mon Mar 17 16:41:08 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in: unset GREP_OPTIONS. [ruby-core:15918]
-Sun Mar 16 18:07:07 2008 Martin Duerst <duerst@it.aoyama.ac.jp>
-
- * enc/trans/utf_16_32.c: bug fix (some invalid UTF-8 sequences
- were legal)
-
- * test/ruby/test_transcode.rb: test for above bug
-
-Sun Mar 16 17:28:07 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * common.mk (LIBRUBY_SO): add dependency to $(BUILTIN_ENCOBJS).
-
-Sun Mar 16 08:51:41 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * include/ruby/intern.h: added some declarations.
-
- * include/ruby/ruby.h: ditto.
-
- * common.mk: added some entries.
-
- * configure.in: added a check for signbit.
-
- * lib/complex.rb: nearly all of core definitions have been removed.
-
- * lib/rational.rb: ditto.
-
- * lib/mathn.rb: some trivial adjustments.
-
- * complex.c: new.
-
- * rational.c: ditto.
-
- * numeric.c (flo_{quo,rdiv}, fix_fdiv): added.
-
- * numeric.c ({num,int}_{numerator,denominator}): ditto.
-
- * bignum.c (rb_big_fdiv): ditto.
-
- * numeric.c (fix_{quo,pow}): now may yield rational number.
-
- * bignum.c (rb_big_{quo,pow}): ditto.
-
- * numeric.c (rb_{int,flo}_induced_from): now can accept rational.
-
- * gc.c (gc_mark_children, obj_free): now detects complex and rational.
-
- * inits.c (rb_call_inits): now calls Init_{Complex,Rational}.
-
- * test/ruby/test_complex.rb: new.
-
- * test/ruby/test_rational.rb: ditto.
-
-Sat Mar 15 17:48:48 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * encoding.c (rb_enc_associate_index): pass unnecessary enc_capable().
-
- * string.c (rb_str_cmp): reduce invocation of rb_enc_compatible().
-
-Fri Mar 14 17:04:43 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/ruby.h (inttypes.h): includes always if available.
-
- * string.c, ext/digest/defs.h: moved inttypes.h to ruby.h.
-
Fri Mar 14 16:59:23 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (RUBY_LIB_PREFIX): fix for prefix.
@@ -27317,702 +1772,94 @@ Fri Mar 14 15:49:05 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (RUBY_LIB_PREFIX): use libdir.
-Fri Mar 14 14:24:15 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/digest/defs.h: inttypes.h is still needed.
-
-Fri Mar 14 11:34:12 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * {bcc,win}32/Makefile.sub: follow below changes.
-
-Fri Mar 14 11:24:30 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * misc/ruby-mode.el (ruby-encoding-map, ruby-use-encoding-map): added
- to customize.
-
-Fri Mar 14 10:37:15 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * configure.in (int8_t, uint8_t, int16_t, uint16_t int32_t,
- uint32_t int64_t, uint64_t, int128_t, uint128_t,
- intptr_t, uintptr_t): check if defined.
-
- * win32/Makefile.sub: follow configure.in.
-
- * ext/digest/defs.h: remove checks for uint8_t, uint32_t and uint64_t.
-
Fri Mar 14 10:12:29 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (RUBY_CHECK_VARTYPE): should not indent preprocessor
directives.
-Fri Mar 14 10:03:59 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Mar 13 00:37:20 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * string.c (UNALIGNED_WORD_ACCESS): IA64 cannot access unaligned word.
+ * eval.c (rb_call0): yields the last executed node line number at
+ return event. [ruby-core:15855]
-Thu Mar 13 21:00:50 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+Wed Mar 12 02:12:20 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
- * array.c (rb_ary_slice_bang): should not use rb_ary_subseq()
- which shares internal pointer. splice modifies the receiver
- right after subseq. [ruby-dev:34005]
-
- * bootstraptest/test_struct.rb: some test moved from test to shut
- warning up.
-
-Thu Mar 13 19:42:43 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * {bcc,win}32/Makefile.sub (config.h): define uint32_t.
-
-Thu Mar 13 14:14:19 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * trunk/configure.in (AC_CHECK_HEADERS): stdint.h is not needed to
- check.
-
- * trunk/configure.in (rb_cv_type_uint32_t): unquoted. [ruby-dev:34030]
-
- * trunk/string.c (hash): use inttypes.h instead of stdint.h.
-
-Thu Mar 13 10:42:46 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * numeric.c (fix_divmod): should return integer division. [ruby-dev:34006]
-
- * enum.c (zip_ary): wrong boundary condition.
-
- * test/ruby/test_numeric.rb (TestNumeric::test_num2long): bit-and
- should not raise RangeError.
-
-Thu Mar 13 03:12:48 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/irb/cmd/help.rb: should be updated for new ri structure.
- [ruby-core:15825]
-
- * lib/rdoc/ri/driver.rb (RDoc::initialize): allow options to be optional.
-
- * lib/rdoc/ri/driver.rb (RDoc::class_cache): map_dirs may be
- empty.
-
- * lib/rdoc/ri/driver.rb (RDoc::get_info_for): revive get_info_for
- method. maybe broken.
-
- * lib/rdoc/ri/util.rb (RDoc::initialize): should not use RiError
- no more.
-
-Thu Mar 13 01:45:25 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (stdint.h): check if presence.
-
- * configure.in (uint32_t): check if defined.
-
- * string.c (hash): fix for portability. [ruby-dev:34020]
-
-Wed Mar 12 17:33:34 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * object.c (rb_cstr_to_dbl): fix for a mere underscore.
-
-Wed Mar 12 14:47:07 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval_intern.h (rb_thread_raised_set): use generic flags.
-
- * eval.c (rb_longjmp): clear all raised flags.
-
- * eval.c (stack_check): leave clearing flag to rb_longjmp.
-
- * gc.c (rb_memerror): use thread raised flag instead of static flag.
-
-Tue Mar 11 23:38:39 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_combination): argument check before creating
- Enumerator.
-
- * array.c (rb_ary_permutation): ditto.
-
- * enum.c (enum_zip): optimize if all arguments are arrays.
+ * lib/delegate.rb: check $@ to avoid NoMethodError.
Tue Mar 11 19:48:09 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* numeric.c (fix_coerce): try conversion before type check.
[ruby-core:15838]
-Tue Mar 11 12:39:53 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (clean-local): WINMAINOBJ is Windows specific.
-
-Tue Mar 11 10:19:10 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (hash): replaced by MurmurHash described in
- <http://murmurhash.googlepages.com/>.
-
-Tue Mar 11 09:52:49 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_comparable): empty strings in any encoding are
- compatible each other.
-
-Tue Mar 11 00:46:29 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ruby.c (usage): remove some unimportant lines to fit -h message
- in a page. [ruby-dev:34018]
-
-Mon Mar 10 17:11:00 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_f_local_variables): local_variables should return an
- array of symbols. [ruby-dev:34008]
-
- * vm.c (collect_local_variables_in_env): ditto.
-
-Mon Mar 10 15:53:48 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Mar 11 17:03:23 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * version.c (MKSTR): make US-ASCII. [ruby-dev:34010]
+ * lib/delegate.rb (Delegator#initialize, DelegateClass): skip correct
+ backtrace. [ruby-dev:34019]
-Mon Mar 10 02:08:21 2008 NARUSE, Yui <naruse@ruby-lang.org>
+Tue Mar 11 16:43:53 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * string.c (rb_str_index): if t == s + pos, the character beginning
- from s + pos is valid.
+ * win32/win32.c (rb_w32_cmdvector): terminate shrunken command line.
-Sun Mar 9 13:51:21 2008 Eric Hodel <drbrain@segment7.net>
+Tue Mar 11 12:39:03 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/rdoc/generator.rb: Restore missing line to #params. Patch by
- Lincoln Stoll <lstoll at lstoll.net>
-
-Sun Mar 9 09:52:00 2008 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc/code_objects.rb: Remove debugging Kernel#p. Patch by
- Lincoln Stoll <lstoll at lstoll.net>
- * lib/rdoc/generator/html.rb: Fully qualify AllReferences. Patch by
- Lincoln Stoll <lstoll at lstoll.net>
- * lib/rdoc/ri/writer.rb: Fix 1.8 backwards compatibility.
+ * common.mk (clean-local): removes MINOBJS.
Sat Mar 8 18:50:57 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* file.c (isdirsep): backslash is valid path separator on cygwin too.
-Sat Mar 8 06:53:48 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (search_nonascii): Use VALUE instead of unsigned long
- because VALUE can be the fastest unsigned integer type.
- On LLP64 unsigned long isn't the fastest.
- * string.c (str_strlen): ditto.
- * string.c (str_utf8_nth): ditto.
- * string.c (count_utf8_lead_bytes_with_ulong): ditto.
-
- * string.c (count_utf8_lead_bytes_with_word): renamed.
-
-Fri Mar 7 21:27:43 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * bignum.c: fix indent.
-
-Fri Mar 7 21:12:19 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * bignum.c (power_cache_init, power_cache_get_power0, Init_Bignum):
- delayed initializing power cache per base. [ruby-dev:34003]
-
-Fri Mar 7 20:30:05 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * cont.c (cont_restore_0): fixed typo. [ruby-core:15821]
-
Fri Mar 7 19:56:10 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb: rdoc added. [ruby-Patches-9762]
-Thu Mar 6 17:26:53 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * sprintf.c (rb_str_format): space flag is in effect for Inf/NaN too.
- [ruby-dev:34002]
-
-Thu Mar 6 15:44:20 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * sprintf.c (rb_str_format): casting double to long is undefined
- if the integer part of double is out of the range of long.
-
-Thu Mar 6 15:11:40 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * sprintf.c (rb_str_format): ignore 0 flag for NaN and Inf.
- [ruby-dev:33994]
-
-Thu Mar 6 15:05:25 2008 NAKAMURA Usaku <usa@ruby-lang.org>
+Thu Mar 6 15:10:21 2008 NAKAMURA Usaku <usa@ruby-lang.org>
* {bcc32,win32}/Makefile.sub (RUNRUBY): use $(PROGRAM) instead of
ruby$(EXEEXT).
suggested by KIMURA Koichi <kimura.koichi at canon.co.jp>.
[ruby-dev:34000]
-Thu Mar 6 14:46:08 2008 Tanaka Akira <akr@fsij.org>
-
- * missing/lgamma_r.c (loggamma): return 0 for 1 and 2.
-
- * test/ruby/test_math.rb: accept errors by functions under missing/.
-
-Thu Mar 6 14:29:44 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * transcode.c (rb_str_transcode_bang): set coderange.
-
- * transcode.c (rb_str_transcode): use rb_str_transcode_bang.
-
-Thu Mar 6 14:00:10 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/missing.h (cbrt): add declaration.
-
-Thu Mar 6 11:14:14 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * misc/ruby-mode.el (ruby-add-log-current-method): use ruby style
- method name format.
-
-Thu Mar 6 11:12:29 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * sprintf.c (rb_str_format): no need of loop.
-
-Thu Mar 6 08:30:42 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (rb_mod_freeze): call rb_class_name() directly.
- [ruby-core:15802]
-
-Thu Mar 6 04:32:06 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (count_utf8_lead_bytes_with_ulong): fix shift size.
- [ruby-dev:33993]
-
- * string.c (str_utf8_nth) fix wrong counting.
-
-Thu Mar 6 00:34:00 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * sprintf.c (rb_str_format): size_t returned from strlen() can be
- unsigned.
-
-Thu Mar 6 00:31:39 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * struct.c (make_struct): preserve encoding of struct name.
-
-Wed Mar 5 22:49:20 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (is_utf8_lead_byte, count_utf8_lead_bytes_with_ulong):
- defined for UTF-8 optimization.
-
- * string.c (str_strlen): use is_utf8_lead_byte and
- count_utf8_lead_bytes_with_ulong.
-
- * string.c (str_utf8_nth) ditto.
-
-Wed Mar 5 17:53:01 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (rb_file_flock): returns false on EAGAIN if non-blocking.
- [ruby-core:15795]
-
-Wed Mar 5 17:43:43 2008 Martin Duerst <duerst@it.aoyama.ac.jp>
+Thu Mar 6 12:15:06 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * transcode.c (transcode_loop): Adjusted detection of invalid
- (ill-formed) UTF-8 sequences. Fixing potential security issue, see
- http://www.unicode.org/versions/Unicode5.1.0/#Notable_Changes.
-
- * test/ruby/test_transcode.rb: Added two tests for above fix.
-
-Wed Mar 5 14:00:49 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * numeric.c (fix_to_s): avoid rb_scan_args() when no argument
- given.
- * bignum.c (rb_big_to_s): ditto.
- * enum.c (enum_first): ditto.
- * eval_jump.c (rb_f_catch): ditto.
- * io.c (rb_obj_display): ditto.
- * class.c (rb_obj_singleton_methods): ditto.
- * object.c (rb_class_initialize): ditto.
- * random.c (rb_f_srand): ditto.
- * range.c (range_step): ditto.
- * re.c (rb_reg_s_last_match): ditto.
- * string.c (rb_str_to_i): ditto.
- * string.c (rb_str_each_line): ditto.
- * string.c (rb_str_chomp_bang): ditto.
- * string.c (rb_str_sum): ditto.
-
- * string.c (str_modifiable): declare inline.
- * string.c (str_independent): ditto.
-
-Wed Mar 5 11:50:32 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/debug.rb: require 'continuation' to implement "restart"
- command. [ruby-dev:33992]
-
- * lib/debug.rb (Context::debug_command): remove local variable
- shadowing to shut up warnings. [ruby-dev:33992]
-
- * lib/debug.rb (Context::display_list): ditto.
-
- * lib/debug.rb (Context::resume): ditto.
-
- * lib/debug.rb (Context::get_thread): no longer use #index for Hash.
-
-Tue Mar 4 21:35:59 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/irb.rb (IRB::Irb::eval_input): SyntaxError should not be
- considered as IRB bug. [ruby-dev:33991]
-
- * lib/irb/workspace.rb (IRB::WorkSpace::filter_backtrace): should
- filter 'irb.rb' as well for context mode 2 and 3.
-
-Tue Mar 4 19:10:43 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * hash.c (rb_hash_aset): should not copy key string when
- compare_by_identity is set. [ruby-dev:33604]
-
- * hash.c (hash_equal): two hash tables are different when internal
- comparison table differ. [ruby-dev:33989]
-
-Tue Mar 4 16:29:06 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (parser_yylex): disallow non digits '0o' expression.
-
-Tue Mar 4 14:35:12 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * io.c (open_key_args): use rb_io_open_with_args instead of rb_f_open.
- [ruby-core:15763]
-
-Tue Mar 4 13:41:46 2008 Tanaka Akira <akr@fsij.org>
-
- * gc.c (add_heap): fix previous change. [ruby-dev:33988]
-
-Tue Mar 4 10:21:03 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * gc.c (add_heap): use binary search to find the place to insert the
- new heap slot. [ruby-dev:33983]
+ * parse.y (opt_block_param): command can start just after block param
+ definition. [ruby-list:44479]
-Tue Mar 4 05:30:31 2008 NARUSE, Yui <naruse@ruby-lang.org>
+Thu Mar 6 00:34:11 2008 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
- * io.c (open_key_args): use rb_io_open instead of rb_f_open.
- [ruby-core:15746]
+ * lib/erb.rb: update RDoc. Thanks Makoto Kuwata [ruby-dev:33702]
-Mon Mar 3 23:28:37 2008 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Mon Mar 3 23:28:34 2008 GOTOU Yuuzou <gotoyuzo@notwork.org>
* lib/webrick/httpservlet/filehandler.rb: should normalize path
- separators in path_info to prevent directory traversal
- attacks on DOSISH platforms.
+ separators in path_info to prevent directory traversal attacks
+ on DOSISH platforms.
reported by Digital Security Research Group [DSECRG-08-026].
* lib/webrick/httpservlet/filehandler.rb: pathnames which have
not to be published should be checked case-insensitively.
-Mon Mar 3 17:25:45 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * gc.c (add_heap): sort heaps array in ascending order to use
- binary search.
-
- * gc.c (is_pointer_to_heap): use binary search to identify object
- in heaps. works better when number of heap segments grow big.
-
-Mon Mar 3 17:15:09 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * re.c (rb_reg_regsub): remove too strict encoding check.
- [ruby-dev:33966]
-
Mon Mar 3 16:14:24 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* hash.c (rb_any_hash): shrinks all results in Fixnum range.
[ruby-core:15713]
-Sun Mar 2 23:03:59 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (rb_io_ungetc): reduce redundant call.
-
-Sun Mar 2 10:13:12 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (load_file): parse shebang in us-ascii. a patch from
- sheepman <sheepman AT sheepman.sakura.ne.jp> in [ruby-dev:33955]
-
-Sun Mar 2 00:08:10 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * object.c (rb_cstr_to_dbl): check for successive underscores.
- [ruby-dev:33952]
-
-Sat Mar 1 17:59:01 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (struct argf): packed ARGF stuffs.
-
- * ruby.c (proc_options): use ruby_set_inplace_mode().
-
-Sat Mar 1 17:51:34 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/test/unit/collector/dir.rb (recursive_collect): do not always
- include all test_*.rb.
-
-Sat Mar 1 14:14:17 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * development snapshot 1.9.0-1 released.
-
-Sat Mar 1 13:46:26 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * tool/make-snapshot: make prereq uses MINIRUBY.
-
- * tool/make-snapshot: allow packaging like 1.9.0-1 by second
- command-line argument.
-
-Sat Mar 1 13:11:03 2008 Tanaka Akira <akr@fsij.org>
-
- * test/ruby/allpairs.rb: new file for all pairs method.
-
- * test/ruby/test_m17n_comb.rb: use allpairs.rb to reduce test cases.
-
- * test/ruby/test_sprintf_comb.rb: ditto.
-
-Sat Mar 1 12:34:21 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (sym_inspect): use rb_str_inspect() instead of
- rb_str_dump(). [ruby-dev:33946]
-
-Sat Mar 1 12:15:42 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval_method.c (rb_get_method_body): ent->method may be freed by
- GC. [ruby-dev:31819]
-
- * thread.c (remove_event_hook): should not access freed memory.
- [ruby-dev:31820]
-
-Sat Mar 1 10:31:19 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * io.c (read_all, rb_io_getline_fast): encoding is io_input_encoding.
-
-Sat Mar 1 10:09:40 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (tr_setup_table, rb_str_split_m, rb_str_chomp_bang):
- simplified with rb_enc_ascget(). [ruby-dev:33944]
-
-Sat Mar 1 10:01:30 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_coderange_scan_restartable): should not return
- offset in the middle of a character.
-
- * string.c (rb_str_coderange_scan_restartable): should not return
- invalid cr value.
-
-Sat Mar 1 09:36:08 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * sprintf.c (rb_str_format): "%#.0o" should keep prefix where
- "%#.0x" should not.
-
Sat Mar 1 02:35:08 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* bignum.c (big2str_find_n1): check integer overflow.
-Sat Mar 1 00:29:07 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * encoding.c (rb_enc_dummy_p): bootstrap encodings can not be dummy.
-
- * encoding.c (rb_enc_ascget): no needs to call rb_enc_precise_mbclen()
- twice.
-
-Fri Feb 29 23:14:38 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * test/ruby/test_m17n_comb.rb (TestM17NComb::test_str_chomp): test
- updated.
-
-Fri Feb 29 20:58:09 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * test/ruby/test_iterator.rb (TestIterator::test_enumerator):
- adjust test for zip behavior reversion.
-
-Fri Feb 29 20:25:07 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_chomp_bang): now works on UTF-16.
-
- * string.c (tr_setup_table): negation should work on non ASCII
- compatible strings as well.
-
- * string.c (rb_str_split_m): awk split should work on non ASCII
- compatible strings as well.
-
-Fri Feb 29 18:08:43 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * time.c (time_strftime): format should be ascii compatible.
-
- * parse.y (rb_intern3): non ASCII compatible symbols.
-
- * re.c (rb_reg_regsub): add encoding check.
-
- * string.c (rb_str_chomp_bang): ditto.
-
- * test/ruby/test_utf16.rb (TestUTF16::test_chomp): raises exception.
-
-Fri Feb 29 15:16:31 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_rpartition): calculation was done in byte indexing.
-
- * test/ruby/test_m17n_comb.rb (TestM17NComb::test_str_start_with):
- allow start_with? matching on broken strings.
-
-Fri Feb 29 15:12:43 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (opt_block_param): command can start just after block param
- definition. [ruby-list:44479]
-
-Fri Feb 29 03:22:19 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * test/ruby/test_time.rb (test_readers): fix typo.
- (test_strftime): "UTC" is also ok for time.gmtime.strftime("%Z").
-
-Fri Feb 29 02:50:07 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (str_new): remove encoding assumption of empty string.
-
- * hash.c ( rb_f_getenv, env_fetch, env_inspect): result of ENV should
- be always ASCII-8BIT.
-
- * object.c (nil_to_s): nil.to_s should be US-ASCII.
-
-Fri Feb 29 02:24:22 2008 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb: forgot to update RELEASE_DATE
-
- * ext/tk/lib/tk.rb, ext/tk/lib/tk/text.rb,
- ext/tk/lib/tkextlib/iwidgets/scrolledtext.rb: remove adhoc check
- of Ruby's features (use existence of some classes instead of
- comparing with RUBY_VERSION)
-
- * ext/tk/lib/tk/root.rb, ext/tk/lib/tk/autoload.rb: make TkRoot
- (Tk::Root) unswitchable
-
- * ext/tk/lib/multi-tk.rb: partial bug fix (still not work!!)
-
-Thu Feb 28 23:37:12 2008 Tanaka Akira <akr@fsij.org>
-
- * lib/open-uri.rb (OpenURI::Meta#meta_setup_encoding): use ASCII-8BIT
- for charset unspecified non-text data.
-
-Thu Feb 28 22:19:14 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * encoding.c (enc_capable): IMMEDIATE_P doesn't include Qnil and Qfalse.
- use SPECIAL_CONST_P.
-
-Thu Feb 28 19:45:52 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * encoding.c (enc_find): check type of argument and convert to String
- if it is StringValue. [ruby-cvs:22866]
-
-Thu Feb 28 18:07:52 2008 Tanaka Akira <akr@fsij.org>
-
- * lib/open-uri.rb (OpenURI::Meta#meta_setup_encoding): setup encoding
- by charset.
- (OpenURI::Meta#meta_add_field): call meta_setup_encoding when
- content-type.
-
-Thu Feb 28 15:29:12 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * io.c (rb_io_getline_fast): scan coderange.
-
-Thu Feb 28 14:36:46 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (rb_enc_str_copy): removed.
-
-Thu Feb 28 13:51:59 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (stack_check): made flag per threads.
-
- * thread.c (rb_thread_set_raised, rb_thread_reset_raised): prefixed.
-
-Thu Feb 28 11:43:56 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (rb_file_flock): immediately returns on EAGAIN if
- non-blocking. [ruby-core:15672]
-
-Thu Feb 28 11:23:50 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (rb_io_getline_1): get rid of segfault. [ruby-dev:33938]
-
-Thu Feb 28 11:19:51 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_str_reverse_bang): removed unused variables.
-
- * include/ruby/encoding.h (rb_str_coderange_scan_restartable): added
- prototype.
-
- * string.c (rb_str_coderange_scan_restartable, rb_str_times): removed
- unused variables.
-
- * string.c (rb_str_reverse_bang): ditto
-
- * string.c (rb_enc_str_copy): unused now. may be used in future?
-
-Thu Feb 28 03:03:32 2008 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb, ext/tk/lib/*: make default widget set
- switchable between Tk (standard Tcl/Tk widget set) and
- Ttk (Tile). Initial default widget set is Tk. Now, toplevel
- widget classes are removed and defined as aliases.
- For example, "TkButton" is an alias of the "Tk::Button" class.
- Those aliases are replaced when switching default widget set.
- "Tk.default_widget_set=" is the method for switching default
- widget set. "Tk.default_widget_set = :Ttk" defines Ttk (Tile)
- widget set as default. It means that "TkButton" denotes
- "Tk::Tile::Button" class. And then, "TkButton.new" creates
- a Tk::Tile::Button widget. Of course, you can back to use
- standard Tk widgets as the default widget set by calling
- "Tk.default_widget_set = :Tk", whenever you want. Based on
- the feature, you can use Ttk widget styling engine on your
- old Ruby/Tk application without modifying its source, if you
- don't use widget options unsupported on Ttk widgets (At first,
- call "Tk.default_widget_set = :Ttk", and next load and run
- your application).
- This is one step for supporting Tcl/Tk8.5 features.
-
-Wed Feb 27 22:55:42 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (rb_str_coderange_scan_restartable): coderange scanning
- for partial read.
-
- * io.c (read_all): set coderange when not convert encoding.
-
-Wed Feb 27 03:55:58 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/extmk.rb, enc/make_encmake.rb: load current mkmf.rb even if
- cross-compiling.
-
- * ext/extmk.rb, enc/make_encmake.rb, lib/mkmf.rb: need to be 1.8
- compatible for cross-compiling.
-
-Tue Feb 26 16:53:13 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * misc/ruby-mode.el (ruby-calculate-indent): should distinguish
- comment and # in strings. [ruby-dev:33874]
-
-Tue Feb 26 16:41:27 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * array.c (combi_len, rb_ary_product): check for overflow.
- [ruby-Bugs-18355]
-
-Tue Feb 26 16:38:10 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * array.c (recursive_cmp): compare minimal length parts.
-
Tue Feb 26 16:06:00 2008 Technorama Ltd. <oss-ruby@technorama.net>
- * ext/openssl/ossl_{ec,dh,dsa,rsa}.c: Remove useless warnings.
+ * ext/openssl/ossl_pkey_{ec,dh,dsa,rsa}.c: Remove useless warnings.
* ext/openssl/ossl_asn1.c: Simplify code.
* ext/openssl/ossl_ssl_session.c Fix compiler warnings.
Undefine #id if SSL_SESSION_get_id is not supported.
-Tue Feb 26 15:50:10 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (value_expr_gen): removed inappropriate warning.
- [ruby-core:15660]
-
Tue Feb 26 15:43:42 2008 Tanaka Akira <akr@fsij.org>
* parse.y (tokadd_escape): refactored. [ruby-core:15657]
-Tue Feb 26 15:30:36 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * array.c (rb_ary_eql, rb_ary_cmp): get rid of stack overflow with
- self-recursive constructs. [ruby-Bugs-18356]
-
-Tue Feb 26 01:16:01 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/ruby.h (ROBJECT_NUMIV): renamed from ROBJECT_LEN.
- (ROBJECT_IVPTR): renamed from ROBJECT_PTR.
-
- * variable.c: follow the above renaming.
-
- * object.c: ditto.
-
- * gc.c: ditto.
-
- * marshal.c: ditto.
-
Mon Feb 25 17:30:29 2008 Technorama Ltd. <oss-ruby@technorama.net>
* ext/openssl/digest.c ext/openssl/lib/openssl/digest.rb:
@@ -28021,171 +1868,29 @@ Mon Feb 25 17:30:29 2008 Technorama Ltd. <oss-ruby@technorama.net>
existing Digest framework.
Enhance performance.
-Mon Feb 25 15:33:29 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * bignum.c (big2str_karatsuba): initialize cache if not initialized.
-
- * bignum.c (Init_Bignum): delayed initializing cache.
- [ruby-dev:33930]
-
Mon Feb 25 13:40:03 2008 Tanaka Akira <akr@fsij.org>
* process.c (Init_process): share bignum objects for RLIM_INFINITY,
RLIM_SAVED_MAX and RLIM_SAVED_CUR if they are equal.
-Mon Feb 25 10:41:41 2008 Martin Duerst <duerst@it.aoyama.ac.jp>
-
- * encoding.c (Encoding#dummy): minor grammatical fixes
- in rdoc documentation.
-
-Mon Feb 25 00:01:03 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * cygwin/GNUmakefile.in (clean-local): should be double-colon.
-
-Sun Feb 24 23:39:59 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun Feb 24 23:29:48 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* common.mk, {bcc,win}32/Makefile.sub (clean-local): remove
intermediate files.
- * cygwin/GNUmakefile.in (clean-local): remove def file.
-
-Sun Feb 24 06:49:12 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * debug.c (ruby_set_debug_option): separated ruby_each_words().
-
- * util.c (ruby_each_words): extracted from ruby_set_debug_option().
-
- * ruby.c (enable_option, disable_option): allow all for all known
- features.
-
- * ruby.c (proc_options): generalized enable/disable options.
-
- * ruby.c (ruby_init_gems): take enabled flag. [ruby-core:14840]
-
- * ruby.c (process_options): added --disable-rubyopt flag.
-
- * include/ruby/util.h (ruby_each_words): prototype.
-
-Sun Feb 24 05:25:26 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (proc_options): check if argument for -E exists.
-
-Sun Feb 24 05:09:43 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * misc/ruby-style.el (ruby-style-label-indent): fix for labels inside
- blocks in switch.
-
Sun Feb 24 03:52:58 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* util.c (valid_filename): use O_EXCL to get rid of clobbering
existing files in race conditions.
-Sat Feb 23 21:36:13 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/win32ole/win32ole.c (ole_init_cp): should return value.
-
-Sat Feb 23 20:16:05 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (str_sublen): removed.
-
- * string.c (rb_str_reverse, rb_str_reverse_bang): use
- single_byte_optimizable.
-
-Sat Feb 23 19:25:18 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (rb_enc_cr_str_copy_for_substr): renamed from
- rb_enc_cr_str_copy.
-
- * string.c: use rb_enc_cr_str_copy_for_substr and keep coderange.
-
-Sat Feb 23 18:50:17 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (ole_encoding2cp): remove US-ASCII
- mapping.
-
-Sat Feb 23 01:09:47 2008 Tanaka Akira <akr@fsij.org>
-
- * process.c (rlimit_resource_type): new function.
- (rlimit_resource_value): new function.
- (proc_getrlimit): use rlimit_resource_type to accept
- symbol and string as resource type.
- (proc_setrlimit): use rlimit_resource_type and rlimit_resource_value
- to accept symbol and string as resource type and values.
-
-Fri Feb 22 21:12:42 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (rb_enc_cr_str_copy): check string's coderange is 7bit or
- valid.
-
Fri Feb 22 19:50:19 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* bignum.c (BIGZEROP): fix for longer Bignum zeros. [ruby-Bugs-17454]
-Fri Feb 22 15:47:36 2008 Tanaka Akira <akr@fsij.org>
-
- * encoding.c (rb_enc_mbclen): return minlen instead of 1 when
- a character is not found properly.
-
- * string.c (rb_enc_strlen): round up string length with fixed
- multibyte encoding such as UTF-32.
- (rb_enc_strlen_cr): ditto.
- (rb_str_substr): fix substring with fixed multibyte encoding.
- (rb_str_justify): check number of characters.
-
-Fri Feb 22 12:11:12 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (rb_str_inspect): string of ascii incompatible encoding
- should be escaped and returned as US-ASCII encoding.
-
-Fri Feb 22 11:16:55 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (rb_str_substr): copy encoding although empty string.
-
-Fri Feb 22 04:48:22 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (rb_str_times): empty string's coderange is CODERANGE_7BIT.
+Fri Feb 22 16:09:53 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * string.c (rb_str_substr): ditto.
-
- * encoding.c (rb_enc_compatible): empty string is compatible with not
- only nonasciicompatible strings. [ruby-dev:33895]
-
-Thu Feb 21 17:15:15 2008 Martin Duerst <duerst@it.aoyama.ac.jp>
-
- * transcode.c: Added basic support for passing options to String#encode
- via a hash. Currently only one option, with one value, is supported:
- invalid: :ignore (dropping invalid byte sequences instead of
- producing an error). Option naming is not yet stable!
-
- * test/ruby/test_transcode.rb: Added a single test for invalid: :ignore
- option. Not more tests because most data does not yet distinguish
- between INVALID and UNKNOWN.
-
-Thu Feb 21 16:35:26 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * array.c (rb_ary_unshift_m): expands enough for argc. [ruby-dev:33880]
-
-Thu Feb 21 14:49:40 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (argf_set_encoding): uses current_file after check if next
- input is available.
-
-Thu Feb 21 14:13:38 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_f_putc): invoke stdout method so that redefining putc
- may take effect. [ruby-talk:291844]
-
- * io.c (rb_f_puts): ditto.
-
-Thu Feb 21 11:10:49 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c: replace rb_enc_copy by rb_enc_cr_str_copy or
- rb_enc_cr_str_exact_copy.
-
-Thu Feb 21 10:35:04 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * include/ruby/encoding.h (rb_enc_asciicompat): dummy encoding is not
- ascii compatible. [ruby-dev:33878]
+ * bignum.c (rb_big_lshift, rb_big_rshift, rb_big_aref): removed excess
+ arguments.
Thu Feb 21 00:01:34 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
@@ -28196,29 +1901,6 @@ Wed Feb 20 23:55:19 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* win32/win32.c (rb_w32_map_errno): exported.
-Wed Feb 20 23:28:43 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/readline/extconf.rb (rl_event_hook): workaround for native
- windows.
-
-Wed Feb 20 19:42:03 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * encoding.c (rb_enc_associate_index): doesn't clear coderange
- when new encoding equals to old one.
-
-Wed Feb 20 19:15:38 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (rb_enc_str_copy): added for wrapper for rb_enc_copy.
- this also copy coderange when ptr and len is equal.
-
- * string.c (rb_enc_cr_str_copy): added for wrapper for rb_enc_copy.
- this always copy coderange.
-
- * string.c (str_replace_shared): use rb_enc_str_copy.
-
- * string.c (str_new3): don't rb_enc_copy because encoding is copied
- at str_replace_shared.
-
Wed Feb 20 13:08:52 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* instruby.rb (parse_args): added --dir-mode, --script-mode and
@@ -28228,7 +1910,7 @@ Wed Feb 20 13:08:52 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
type, for compiled files and script files.
* instruby.rb (parse_args): deal with make style command line macros,
- and count as long style options if prefixed with INSTALL_.
+ and count as long syle options if prefixed with INSTALL_.
* instruby.rb (makedirs): use $dir_mode. [ruby-dev:33805]
@@ -28238,21 +1920,6 @@ Wed Feb 20 13:08:52 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* instruby.rb (bin-comm): installs scripts with replacing shebang
lines.
-Wed Feb 20 10:04:22 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * io.c (open_key_args): set arg->io even if no options passed.
- [ruby-dev:33072]
-
-Tue Feb 19 21:11:49 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (rb_enc_strlen_cr): get length with coderange scan.
-
- * string.c (str_strlen): use rb_enc_strlen_cr. [ruby-dev:33849]
-
-Tue Feb 19 20:49:49 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_raise_jump): moved adjustment for control frame.
-
Tue Feb 19 18:34:32 2008 Tanaka Akira <akr@fsij.org>
* gc.c (STACK_LENGTH) [SPARC] : 0x80 offset removed. [ruby-dev:33857]
@@ -28262,272 +1929,39 @@ Tue Feb 19 14:27:32 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/readline/readline.c (readline_event): prevent polling. based on
a patch from error errorsson in [ruby-Bugs-17675].
-Tue Feb 19 11:14:13 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Feb 19 12:08:29 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * eval.c (ruby_exec_node): no thread starts inside iseq compilation.
+ * parse.y (yycompile): clear ruby_eval_tree_begin if parse failed.
- * eval.c (rb_f_raise): skip current control frame. [ruby-core:15589]
+Mon Feb 18 16:23:45 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * insns.def (opt_div): raise as the ordinary method. [ruby-core:15589]
-
-Mon Feb 18 15:16:30 2008 Tanaka Akira <akr@fsij.org>
-
- * string.c (rb_str_each_line): fix newline size.
-
-Mon Feb 18 13:06:37 2008 Tanaka Akira <akr@fsij.org>
-
- * lib/irb/locale.rb (IRB::Locale#lc2kconv): check ja_JP.EUC-JP as well.
-
-Mon Feb 18 11:51:19 2008 Tanaka Akira <akr@fsij.org>
-
- * re.c (re_warn): defined to restore warnings for /[a-c-e]/, etc.
+ * parse.y (yycompile): clear ruby_eval_tree_begin too before parse.
Mon Feb 18 10:17:42 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/pty/lib/expect.rb (IO#expect): check if peer is closed.
[ruby-Bugs-17940]
-Mon Feb 18 00:33:03 2008 Tanaka Akira <akr@fsij.org>
-
- * re.c (rb_reg_regsub): don't repeat repl twice with
- "X".sub!(/./, sprintf("\\%c", 255)).
-
-Sun Feb 17 23:06:55 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * lib/cgi.rb (CGI::escapeHTML): use gsub with Hash. [ruby-dev:33828]
-
-Sun Feb 17 21:38:21 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * encoding.c (ENC_CODERANGE_AND): fix broken case. [ruby-dev:33826]
-
- * string.c (rb_str_times): fix broken case. [ruby-dev:33826]
-
-Sun Feb 17 20:45:10 2008 Tanaka Akira <akr@fsij.org>
-
- * re.c (rb_reg_prepare_re): add enable_warning parameter.
- (rb_reg_adjust_startpos): disable warning by rb_reg_prepare_re.
- (rb_reg_search): follow rb_reg_prepare_re parameter change.
-
-Sun Feb 17 20:12:41 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_regexp.rb: add tests to achieve over 90% test
- coverage of re.c.
-
-Sun Feb 17 15:25:08 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * encoding.c (ENC_CODERANGE_AND): added.
-
- * string.c (rb_str_plus, rb_str_times): keep coderange.
-
- * parse.y (STR_NEW0) use rb_usascii_str_new.
-
-Sun Feb 17 14:07:24 2008 Tanaka Akira <akr@fsij.org>
-
- * string.c (str_strlen): rb_enc_strlen doesn't fail.
-
-Sun Feb 17 13:03:48 2008 Tanaka Akira <akr@fsij.org>
-
- * string.c (str_sublen): use rb_enc_strlen.
-
-Sun Feb 17 12:17:52 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/{euc_jp.c,gbk.c,iso_8859_1.c,iso_8859_11.c,iso_8859_13.c,
- iso_8859_2.c,iso_8859_6.c,iso_8859_7.c,iso_8859_8.c,iso_8859_9.c,
- shift_jis.c,windows_1251.c}: add document about encodings.
-
- * enc/cp949.c: divided into new file.
-
-Sun Feb 17 10:59:04 2008 Tanaka Akira <akr@fsij.org>
-
- * re.c (rb_reg_quote): return US-ASCII string consistently.
-
-Sun Feb 17 09:17:08 2008 Tanaka Akira <akr@fsij.org>
-
- * string.c (rb_str_times): reduce loop overhead.
-
-Sun Feb 17 03:37:01 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/re.h (struct rmatch_offset): new struct for character
- offsets.
- (struct rmatch): new struct.
- (struct RMatch): reference struct rmatch.
- (RMATCH_REGS): new macro.
-
- * re.c (match_alloc): initialize struct rmatch.
- (pair_byte_cmp): new function.
- (update_char_offset): update character offsets.
- (match_init_copy): copy regexp and character offsets.
- (match_sublen): removed.
- (match_offset): use update_char_offset.
- (match_begin): ditto.
- (match_end): ditto.
- (rb_reg_search): make character offset updated flag false.
- (match_size): use RMATCH_REGS.
- (match_backref_number): ditto.
- (rb_reg_nth_defined): ditto.
- (rb_reg_nth_match): ditto.
- (rb_reg_match_pre): ditto.
- (rb_reg_match_post): ditto.
- (rb_reg_match_last): ditto.
- (match_array): ditto.
- (match_aref): ditto.
- (match_values_at): ditto.
- (match_inspect): ditto.
-
- * string.c (rb_str_subpat_set): use RMATCH_REGS.
- (rb_str_sub_bang): ditto.
- (str_gsub): ditto.
- (rb_str_split_m): ditto.
- (scan_once): ditto.
-
- * gc.c (obj_free): free character offsets.
-
-Sun Feb 17 03:13:40 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/resource.rb: made version infos confirm to OS spec.
-
- * {bcc32,win32}/Makefile.sub (*.rc): add dependency.
-
-Sat Feb 16 20:49:34 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (rb_str_substr): optimized for UTF-8.
-
-Sat Feb 16 18:13:53 2008 Tanaka Akira <akr@fsij.org>
-
- * encoding.c (rb_enc_compatible): check encoding incapable arguments.
-
-Sat Feb 16 20:12:47 2008 Tanaka Akira <akr@fsij.org>
-
- * re.c (match_inspect): avoid SEGV with MatchData.allocate.inspect.
-
-Sat Feb 16 19:04:17 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (str_strlen): revert r15507. [ruby-dev:33810]
-
-Sat Feb 16 18:25:14 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (str_strlen): little more optimization.
- (rb_enc_nth): remove needless variable 'c'.
-
-Sat Feb 16 18:00:13 2008 Tanaka Akira <akr@fsij.org>
-
- * encoding.c (rb_enc_compatible): empty strings are always compatible.
-
- * string.c (rb_enc_cr_str_buf_cat): ditto.
-
-Sat Feb 16 16:14:35 2008 Tanaka Akira <akr@fsij.org>
-
- * string.c (rb_enc_strlen): UTF-8 character count moved to str_strlen.
- (str_strlen): UTF-8 character count is only applicable for valid
- UTF-8 string. [ruby-dev:33807]
-
-Sat Feb 16 13:16:49 2008 Tanaka Akira <akr@fsij.org>
-
- * string.c (rb_str_sub_bang): stringize replacing hash values.
- (str_gsub): ditto.
-
-Sat Feb 16 13:01:33 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (rb_enc_strlen): add search_nonascii like character
- counter for UTF-8.
-
-Sat Feb 16 11:53:35 2008 Tanaka Akira <akr@fsij.org>
-
- * encoding.c (rb_enc_strlen): moved to string.c.
-
- * string.c (rb_enc_strlen): use search_nonascii.
- (str_strlen): don't use search_nonascii.
-
-Sat Feb 16 11:45:31 2008 Tanaka Akira <akr@fsij.org>
-
- * lib/require_relative.rb: check require_relative call in eval.
-
-Sat Feb 16 08:00:01 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ruby.c (process_options): set default_external before loading
- libraries. [ruby-dev:33801]
-
-Sat Feb 16 05:49:54 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/iso_8859_{4,13}.c: Windows-1257 is replica of ISO-8859-13.
-
- * string.c (single_byte_optimizable): rb_enc_mbminlen must be 1
- when rb_enc_mbmaxlen is 1.
-
-Sat Feb 16 03:43:18 2008 Tanaka Akira <akr@fsij.org>
-
- * encoding.c (rb_enc_nth): moved to string.c.
-
- * string.c (rb_enc_nth): moved from string.c. use search_nonascii
- for ASCII compatible string.
- (str_nth): wrong optimization removed to fix
- "a".force_encoding("EUC-JP").slice!(0,10) returns
- "a\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-
-Sat Feb 16 00:21:49 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * range.c (rb_range_beg_len): check if responds to "begin" and "end"
- methods for non-Range object.
-
-Fri Feb 15 20:29:42 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (ole_init_cp): initialize WIN32OLE.codepage
- according to Encoding.default_external.
-
- * test/win32ole/test_win32ole.rb: ditto.
+Fri Feb 15 20:37:06 2008 Tadayoshi Funaba <tadf@dotrb.org>
-Fri Feb 15 19:31:23 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * include/ruby/node.h (NODE_FL_NEWLINE): renamed from NODE_NEWLINE
- to denote its a flag. [ruby-core:15529]
-
-Fri Feb 15 18:23:54 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_str_sub_bang, str_gsub): allows hash for replacement.
-
-Fri Feb 15 17:12:41 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (str_strlen): use search_nonascii() for performance.
-
- * string.c (str_nth): ditto.
-
-Fri Feb 15 16:22:49 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (open_key_args): allow specifying both :mode and :encoding.
+ * lib/rational.rb (floor, ceil, truncate, round): do not use
+ definitions of Numeric.
-Fri Feb 15 15:34:47 2008 Tanaka Akira <akr@fsij.org>
+ * lib/rational.rb (to_i): should returns truncated self.
- * string.c (rb_str_getbyte): new method.
- (rb_str_setbyte): new method.
+ * lib/complex.rb (numerator): requires
+ Integer#{numerator,denominator}.
-Fri Feb 15 15:29:03 2008 Tanaka Akira <akr@fsij.org>
+ * lib/complex.rb (quo): do not use definition of Numeric.
- * lib/require_relative.rb: new file.
+ * lib/complex.rb (div, divmod, floor, ceil, truncate, round):
+ undef'ed.
Fri Feb 15 15:23:12 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/iconv/iconv.c (iconv_convert): check upper bound. a patch from
Daniel Luz at [ruby-Bugs-17910].
-Fri Feb 15 10:35:54 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * re.c (rb_reg_quote): set US-ASCII for ASCII-only string.
- [ruby-dev:33785]
-
-Fri Feb 15 10:27:47 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * {win,bcc}32/Makefile.sub (config.h): added HAVE_FTRUNCATE.
- [ruby-dev:33786]
-
-Fri Feb 15 09:44:11 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (reg_compile_gen): reg_fragment_setenc might not raise an
- exception before rb_reg_compile.
-
-Fri Feb 15 07:37:40 2008 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc/ri/paths.rb: Preserve compatibility with 1.8.
-
Fri Feb 15 02:42:25 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (ftruncate): check if available.
@@ -28541,33 +1975,15 @@ Fri Feb 15 02:40:54 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* signal.c (USE_TRAP_MASK): set true if sigprocmask or sigsetmask is
available.
-Thu Feb 14 23:56:38 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Feb 14 17:44:32 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
- * eval_error.c (error_print): append a newline to rest lines.
-
- * parse.y (reg_compile_gen): appends error message from
- rb_reg_compile() to one from reg_fragment_setenc().
-
-Thu Feb 14 21:00:14 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (io_reopen): check STDIN, STDOUT and STDERR mode according to
- stdio streams.
-
-Thu Feb 14 16:07:40 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * test/ruby/test_math.rb: actual-expected argument ordering for
- test_math.rb fixed. a patch from Tadashi Saito
- <shiba AT mail2.accsnet.ne.jp> in [ruby-dev:33770].
+ * ext/dl/ptr.c (dlmem_each_i): typo fixed. a patch from IKOMA
+ Yoshiki <ikoma AT mb.i-chubu.ne.jp> in [ruby-dev:33776].
Thu Feb 14 16:02:51 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* file.c (rb_file_s_utime): inhibits with secure level 2 or higher.
-Thu Feb 14 12:30:02 2008 Tanaka Akira <akr@fsij.org>
-
- * re.c (rb_reg_preprocess_dregexp): use non-preprocessed regexp source
- for result.
-
Thu Feb 14 01:43:16 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/timeout.rb (Timeout::timeout): made sensitive to location on the
@@ -28579,185 +1995,15 @@ Thu Feb 14 00:49:53 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* instruby.rb (parse_args): added --data-mode and --prog-mode options.
-Thu Feb 14 00:02:19 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * eval.c (eval): allow to eval in a binding that has a singleton method.
- [ruby-dev:33763]
-
- * test/ruby/test_proc.rb: add tests to achieve over 70% test coverage
- of proc.c.
-
- * test/ruby/test_method.rb: ditto.
-
-Wed Feb 13 22:46:36 2008 Tanaka Akira <akr@fsij.org>
-
- * lib/pathname.rb (Pathname#sub_ext): new method. [ruby-list:44608]
-
-Wed Feb 13 21:50:32 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * proc.c (proc_curry): new method. [ruby-dev:33676]
-
- * test/ruby/test_proc.rb: add tests for above.
-
-Wed Feb 13 20:48:50 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/ruby.h (RObject): add iv_index_tbl for shortcut of
- RCLASS_IV_INDEX_TBL(rb_obj_class(obj)).
- (ROBJECT_IV_INDEX_TBL): defined.
-
- * object.c (init_copy): initialize iv_index_tbl in struct RObject.
-
- * variable.c (ivar_get): use ROBJECT_IV_INDEX_TBL.
- (rb_ivar_defined): ditto.
- (obj_ivar_each): ditto.
- (rb_obj_remove_instance_variable): ditto.
- (rb_ivar_set): update iv_index_tbl in struct RObject.
-
-Wed Feb 13 16:21:48 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/uri/generic.rb: revert r15442. 2nd argument of String#sub parse
- escapes. [ruby-dev:33726]
-
- * bootstraptest/test_method.rb, enc/depend, instruby.rb, lib/mkmf.rb,
- mkconfig.rb: revert r15443. ditto.
-
-Wed Feb 13 11:20:26 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * enc/depend: fix typo.
-
- * lib/mkmf.rb: revert r15443. "\\1#{sep}\\2" is wrong if sep is ended
- with "\\".
-
-Wed Feb 13 08:57:21 2008 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc/markup/inline.rb: Allow inline markup to have a leading
- '#' or '\', or trailing punctuation. i.e. *#freeze?*, *\foo?*.
-
-Wed Feb 13 07:21:23 2008 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc/to_html_hyperlink.rb: Moved linking to to_html.rb, move
- crossref to to_html_crossref.rb
-
-Wed Feb 13 04:15:44 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (arg_concat_gen, arg_append_gen): optimize for array push.
-
- * parse.y (arg_concat_gen): optimize for array concat.
-
- * parse.y (arg_add_gen): removed since identical to arg_append_gen.
-
-Tue Feb 12 21:04:51 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (exc_list): should use mrhs if non array.
-
-Tue Feb 12 20:32:50 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/rational.rb (floor, ceil, truncate, round): do not use
- definitions of Numeric.
-
- * lib/rational.rb (to_i): should returns truncated self.
-
- * lib/complex.rb (numerator): requires
- Integer#{numerator,denominator}.
-
- * lib/complex.rb (quo): do not use definition of Numeric.
-
- * lib/complex.rb (>, >=, <, <=, between?, div, divmod, modulo,
- floor, ceil, truncate, round): undef'ed.
-
- * lib/mathn.rb (Rational#inspect): removed.
-
-Tue Feb 12 16:48:10 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (args, mrhs): flattens literal array splats.
-
- * parse.y (exc_list): splat literal array.
-
-Tue Feb 12 15:27:19 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * bootstraptest/runner.rb, bootstraptest/test_method.rb, enc/depend,
- instruby.rb, lib/mkmf.rb, lib/test/unit/util/procwrapper.rb,
- mkconfig.rb, sample/test.rb, template/vm.inc.tmpl,
- test/ruby/test_stringchar.rb: fixes around String#gsub.
-
-Tue Feb 12 15:11:47 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/json/lib/json/pure/generator.rb,
- ext/json/lib/json/pure/parser.rb, ext/openssl/lib/openssl/x509.rb,
- ext/win32ole/sample/olegen.rb, lib/date/format.rb, lib/irb/context.rb,
- lib/irb/workspace.rb, lib/net/http.rb, lib/net/imap.rb,
- lib/rdoc/generator.rb, lib/rdoc/markup/to_html.rb,
- lib/rdoc/markup/to_latex.rb, lib/rdoc/parsers/parse_c.rb,
- lib/rdoc/ri/formatter.rb, lib/rexml/parsers/baseparser.rb,
- lib/rexml/quickpath.rb, lib/rexml/text.rb, lib/rss/parser.rb,
- lib/uri/common.rb, lib/uri/generic.rb, lib/webrick/httpresponse.rb,
- lib/webrick/httpservlet/filehandler.rb, lib/yaml/baseemitter.rb,
- lib/yaml/encoding.rb: performance tuning around String#gsub.
-
-Tue Feb 12 12:16:45 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_hash_cmp): lighter version of rb_str_cmp() for
- hash comparison function.
-
- * hash.c (rb_any_cmp): use rb_str_hash_cmp().
-
- * string.c (rb_str_casecmp): should return nil for incompatible
- comparison.
-
-Tue Feb 12 12:13:25 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * instruby.rb: specify file mode to install. a patch from
- pegacorn <subscriber.jp AT gmail.com> in [ruby-dev:33699].
-
-Tue Feb 12 11:38:57 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * numeric.c (rb_num_coerce_bin): add ID argument to specify
- caller's method name. [ruby-dev:33663]
-
- * numeric.c (rb_num_coerce_cmp): ditto.
+Tue Feb 12 11:33:26 2008 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
- * numeric.c (rb_num_coerce_relop): ditto.
+ * test/erb/test_erb.rb(TestERBCore): import from erb-2.0.4.
- * ext/bigdecimal/bigdecimal.c (DoSomeOne): add function name argument.
+ * test/erb/hello.erb: ditto
-Tue Feb 12 10:25:02 2008 Eric Hodel <drbrain@segment7.net>
+Mon Feb 11 17:25:21 2008 Kouhei Sutou <kou@cozmixng.org>
- * lib/rdoc/rdoc.rb: Wrap parse_files' read in version check for
- backwards compatibility.
-
-Tue Feb 12 10:15:14 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ruby.c (load_file): enc must effect source encoding.
- [ruby-core:15496]
-
-Tue Feb 12 10:16:47 2008 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc/ri/paths.rb: Restore require rubygems check.
-
-Tue Feb 12 02:42:27 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * range.c (range_include): specialize single character string
- case (e.g. (?a ..?z).include(?x)) for performance.
- [ruby-core:15481]
-
- * string.c (rb_str_upto): specialize single character case.
-
- * string.c (rb_str_hash): omit coderange scan for performance.
-
- * object.c (rb_check_to_integer): check Fixnum first.
-
- * object.c (rb_to_integer): ditto.
-
- * string.c (rb_str_equal): inline memcmp to avoid unnecessary
- rb_str_comparable().
-
- * parse.y (rb_intern2): use US-ASCII encoding.
-
- * parse.y (rb_intern_str): ditto.
-
-Mon Feb 11 17:21:18 2008 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/rss.rb (RSS::VERSION), test/rss/test_version.rb:
+ * lib/rss/rss.rb (RSS::VERSION), test/rss/test_version.rb, NEWS:
0.2.3 -> 0.2.4.
* lib/rss/maker.rb, lib/rss/maker/, test/rss/test_maker_2.0.rb:
@@ -28768,86 +2014,28 @@ Mon Feb 11 17:21:18 2008 Kouhei Sutou <kou@cozmixng.org>
* lib/rss/maker/0.9.rb, test/rss/test_maker_0.9.rb:
RSS::Maker.make("0.9") generates RSS 0.92 not RSS 0.91.
-Mon Feb 11 10:43:31 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ruby.c (load_file): the encoding of DATA follows the source
- file encoding. [ruby-dev:33693]
-
-Mon Feb 11 06:50:42 2008 Yusuke Endoh <mame@tsg.ne.jp>
+Mon Feb 11 16:57:00 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
- * test/ruby/test_pack.rb: fix tests for 64bit CPU.
-
- * test/ruby/test_bignum.rb: ditto.
-
- * test/ruby/test_file_exhaustive.rb: ditto.
-
- * test/ruby/test_integer.rb: ditto.
+ * ChangeLog: format-time-string under C locale. [ruby-dev:33261]
- * test/ruby/test_time.rb: ditto.
+Mon Feb 11 16:31:47 2008 URABE Shyouhei <shyouhei@ice.uec.ac.jp>
- * test/ruby/test_numeric.rb: ditto.
+ * gc.c (rb_newobj): prohibit call of rb_newobj() during gc.
+ Submitted by Sylvain Joyeux [ruby-core:12099].
- * test/ruby/test_fixnum.rb: ditto.
+ * ext/dl/ptr.c: do not use LONG2NUM() inside dlptr_free().
+ Slightly modified fix bassed on a patch by Sylvain Joyeux
+ [ruby-core:12099] [ ruby-bugs-11859 ] [ ruby-bugs-11882 ]
+ [ ruby-patches-13151 ].
-Mon Feb 11 00:18:57 2008 NARUSE, Yui <naruse@ruby-lang.org>
+Mon Feb 11 00:22:55 2008 NARUSE, Yui <naruse@ruby-lang.org>
* lib/benchmark.rb (Job::Benchmark#item): fix typo.
-Sun Feb 10 21:58:32 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * common.mk (encdb, transdb): depend on $(PREP).
-
-Sun Feb 10 16:58:20 2008 Eric Hodel <drbrain@segment7.net>
-
- * lib/rubygems*, test/rubygems*, gem_prelude.rb: Import RubyGems
- r1601. [ruby-core:15381]
-
-Sun Feb 10 15:07:23 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * {bcc32,win32,wince}/Makefile.sub (MISSING): added cbrt.obj.
-
-Sun Feb 10 12:58:33 2008 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc/code_objects.rb: Make some attributes accessible for reuse.
- * lib/rdoc/generator/html.rb: Pull out ContextUser classes and related
- methods for reuse.
- * lib/rdoc/generator.rb: Move ContextUser classes to
- RDoc::Generator::Context for reuse.
- * lib/rdoc/rdoc.rb: Make RDoc::RDoc initialization a little easier.
- * lib/rdoc/options.rb: Make RDoc::Options easier to use without
- parsing an ARGV.
- * lib/rdoc/markup/to_*.rb: Subclass RDoc::Markup::Formatter.
- * lib/rdoc/markup/formatter.rb: Add RDoc::Markup::Formatter to make
- RDoc markup conversion easier.
- * lib/rdoc/markup/fragments.rb: Make RDoc::Markup::ListItem easier to
- test.
- * lib/rdoc/markup/to_html_hyperlink.rb: Pulled out of the HTML
- generator for easier reusability.
- * lib/rdoc/markup.rb: Fix bug with labeled lists containing bullet
- lists.
- * lib/rdoc/generators/html/html.rb: Fix Constant display.
-
-Sat Feb 9 23:44:29 2008 Tanaka Akira <akr@fsij.org>
-
- * missing/tgamma.c (tgamma): use lgamma_r if available.
-
Sat Feb 9 23:22:52 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/bigdecimal/extconf.rb: simplified the condition.
-Sat Feb 9 21:20:28 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_math.rb: add tests for Math.gamma, Math.lgamma and
- Math.cbrt, and use assert_in_delta instead of assert.
-
-Sat Feb 9 18:34:45 2008 Tanaka Akira <akr@fsij.org>
-
- * math.c (math_cbrt): new method Math.cbrt.
-
- * configure.in (cbrt): check for replacement functions.
-
- * missing/cbrt.c: new file.
-
Sat Feb 9 17:51:24 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/bigdecimal/bigdecimal.c (BigDecimal_to_f): use strtod() for more
@@ -28857,165 +2045,15 @@ Sat Feb 9 17:51:24 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/bigdecimal/extconf.rb: ditto. [ruby-dev:33658]
-Sat Feb 9 12:06:45 2008 Tanaka Akira <akr@fsij.org>
-
- * missing/tgamma.c (tgamma): add error check.
-
-Sat Feb 9 11:47:03 2008 Tanaka Akira <akr@fsij.org>
-
- * math.c (math_gamma): add error check.
- (math_lgamma): ditto.
-
-Sat Feb 9 11:09:26 2008 Tanaka Akira <akr@fsij.org>
-
- * missing/lgamma_r.c (lgamma_r): return HUGE_VAL for non-positive
- integers.
-
-Sat Feb 9 10:03:07 2008 Tanaka Akira <akr@fsij.org>
-
- * string.c (rb_str_new4): copy encoding from orig, instead of shared
- one.
-
-Sat Feb 9 01:01:38 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * file.c (lchmod_internal): fix warning cast from pointer to integer of
- different size.
-
Sat Feb 9 00:44:52 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/irb.rb (IRB::Irb::eval_input): rescues Interrupt and other than
SystemExit and SignalException. [ruby-core:15359]
-Fri Feb 8 23:51:36 2008 Tanaka Akira <akr@fsij.org>
-
- * missing/lgamma_r.c (lgamma_r): use smaller argument for sin function.
-
-Fri Feb 8 22:10:36 2008 Tanaka Akira <akr@fsij.org>
-
- * lib/open-uri.rb (OpenURI.open_http): rescue URI::InvalidURIError by
- URI.parse for location URI.
-
-Fri Feb 8 19:22:13 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/iconv/iconv.c (rb_str_derive): uses rb_str_subseq() for byte
- length. [ruby-dev:33653]
-
- * ext/iconv/iconv.c (iconv_convert): added toidx argument to set
- encoding of successfully converted string. [ruby-dev:33221]
-
Fri Feb 8 15:09:21 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (xsystem): expand macros like as make.
-Fri Feb 8 09:27:57 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/rdoc/ri/driver.rb (read_yaml): remove SM* for compatibility.
-
-Fri Feb 8 00:07:24 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_hash.rb: follow the change of Hash#flatten.
-
- * test/ruby/test_time.rb: add tests to achieve over 70% test coverage
- of time.c.
-
- * test/ruby/test_prec.rb: ditto over 90% for prec.c.
-
-Thu Feb 7 19:11:39 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_str_dup): reverted unneeded change. [ruby-dev:33634]
-
- * string.c (rb_str_replace): makes frozen shared string before
- sharing.
-
-Thu Feb 7 16:33:51 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (io_reopen): don't change access mode for stdin, stdout and
- stderr. [ruby-core:15360]
-
-Thu Feb 7 16:33:48 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (str_replace_shared): replaces string with sharing.
-
- * string.c (rb_str_new4, rb_str_associate, rb_str_associated): allows
- associated strings shared.
-
- * string.c (rb_str_dup, rb_str_substr, rb_str_replace): shares memory.
- [ruby-core:15400]
-
-Thu Feb 7 15:42:42 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_str_end_with): compares with the suffix.
-
-Thu Feb 7 15:03:15 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/trans/korean.c: add support for CP949 by Park Ji-In.
- [ruby-dev:33626]
-
-Thu Feb 7 11:11:02 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * missing/lgamma_r.c (lgamma_r): some compilers don't permit dividing
- by literal 0.0. use const variable instead.
-
- * {bcc32,win32,wince}/Makefile.sub (MISSING): add lgamma_r.obj and
- tgamma.obj.
-
-Thu Feb 7 10:39:21 2008 Tanaka Akira <akr@fsij.org>
-
- * math.c (math_gamma): new method Math.gamma.
- (math_lgamma): new method Math.lgamma.
-
- * include/ruby/missing.h (tgamma): declared unless HAVE_TGAMMA.
- (lgamma_r): declared unless HAVE_LGAMMA_R.
-
- * configure.in (tgamma): check for replacement functions.
- (lgamma_r): ditto.
-
- * missing/tgamma.c: new file. based on gamma.c from
- "C-gengo niyoru saishin algorithm jiten" (New Algorithm handbook
- in C language) (Gijyutsu hyouron sha, Tokyo, 1991)
- by Haruhiko Okumura.
-
- * missing/lgamma_r.c: ditto.
-
- * LEGAL (missing/tgamma.c): describe as public domain.
- (missing/lgamma_r.c): ditto.
-
-Thu Feb 7 09:05:57 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/nkf/nkf-utf8/nkf.c (nkf_enc_from_index): BINARY does not
- have in-bound encoding index.
-
-Thu Feb 7 04:26:28 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/trans/korean.c: add EUC-KR conversion support by Park Ji-In.
- [ruby-dev:33621]
-
-Wed Feb 6 01:47:39 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * hash.c (rb_hash_flatten): do not flatten recursively by default.
- [ruby-dev:33603]
-
-Wed Feb 6 00:50:19 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * insns.def (adjuststack): never use INC_SP with minus value because
- some compilers cannot deal it correctly. use DEC_SP instead.
-
-Wed Feb 6 00:48:41 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_hash.rb: add tests to achieve over 90% test coverage
- of hash.c.
-
- * test/ruby/test_env.rb: ditto.
-
-Wed Feb 6 00:24:49 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * hash.c (env_rassoc): remove access to free'd environment on mswin32.
-
-Tue Feb 5 21:57:34 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * vm.c (rb_call_super): pass a passed block when super is called via
- rb_call_super. [ruby-dev:33598]
-
Tue Feb 5 11:14:11 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (INSTALL_DIRS, install_dirs): added BINDIR.
@@ -29024,52 +2062,19 @@ Tue Feb 5 11:14:11 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
$NONINSTALLFILES.
* lib/mkmf.rb (init_mkmf): defaults $NONINSTALLFILES to backup and
- temporary files.
-
-Mon Feb 4 21:52:06 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/delegate.rb (DelegateClass): use define_method instead of
- module_eval to improve performance. [ruby-dev:33586]
+ temporary filse.
Mon Feb 4 16:44:24 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (darwin): NSIG is not defined if _XOPEN_SOURCE > 500L.
[ruby-dev:33584]
-Mon Feb 4 14:51:19 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (rb_enc_symname2_p): support "!", "!=" and "!~".
- [ruby-dev:33592]
-
-Mon Feb 4 13:58:42 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * lib/delegate.rb (Delegator.preserved, DelegateClass.methods): extend
- shouldn't be delegated. [ruby-dev:32987], etc.
-
-Mon Feb 4 08:59:31 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/cgi.rb (CGI::QueryExtension::[]): no more transition
- extend(CGI::Value). a patch from <tommy AT tmtm.org> in
- [ruby-dev:33583].
-
-Sun Feb 3 21:13:13 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_numeric.rb: forgot to add this (at r15360).
-
- * test/ruby/test_file_exhaustive.rb: add tests to achieve over 80% test
- coverage of file.c.
-
Sat Feb 2 20:06:42 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/benchmark.rb (Benchmark::realtime): make Benchmark#realtime
a bit faster. a patch from Alexander Dymo <dymo AT ukrpost.ua> in
[ruby-core:15337].
-Sat Feb 2 17:40:21 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * time.c (time_cmp): Time.<=> no longer supports comparison with
- numeric. [ruby-core:15332]
-
Sat Feb 2 09:53:39 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (darwin): disabled fat-binary support which confuses
@@ -29078,11 +2083,6 @@ Sat Feb 2 09:53:39 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
after builds for each archs. Anyway, config.h and rbconfig.rb must
be separated definitely at least.
-Sat Feb 2 09:28:36 2008 Tanaka Akira <akr@fsij.org>
-
- * random.c (limited_big_rand): fix buffer overflow when SIZEOF_BDIGITS
- is 2. fixed by Kenta Murata. [ruby-dev:33565]
-
Fri Feb 1 21:42:37 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (darwin): _XOPEN_SOURCE is necessary to make ucontext_t
@@ -29091,312 +2091,33 @@ Fri Feb 1 21:42:37 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (darwin): ucontext on PowerPC MacOS X 10.5 is broken.
-Fri Feb 1 11:44:22 2008 Tanaka Akira <akr@fsij.org>
-
- * tool/compile_prelude.rb (C_ESC): use octal escape to avoid
- "\x09for (;;) ..." to be interpret the first character 0x9f.
-
-Thu Jan 31 23:06:42 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_bignum.rb: suppress warnings during test.
-
- * test/ruby/test_enum.rb: ditto.
-
- * test/ruby/test_integer.rb: add tests to achieve over 90% test
- coverage of numeric.c.
-
- * test/ruby/test_float.rb: ditto.
-
- * test/ruby/test_fixnum.rb: ditto.
-
- * test/ruby/test_numeric.rb: ditto.
-
- * test/ruby/test_pack.rb: add tests to achieve over 90% test coverage
- of pack.c.
-
-Thu Jan 31 17:30:42 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * marshal.c (r_object0): no need to call r_entry for immediate values.
-
-Thu Jan 31 15:46:30 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * lib/rdoc/ri/formatter.rb (output): add accessor.
-
- * lib/rdoc/ri/display.rb (page): replace @formatter.output instead of
- $stdout.
-
-Thu Jan 31 15:06:50 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * marshal.c (r_object0): call r_entry/r_leave to call proc when
- TYPE_FIXNUM, TYPE_NIL, TYPE_TRUE, TYPE_FALSE, TYPE_SYMBOL.
-
-Thu Jan 31 14:03:38 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * lib/rdoc/ri/display.rb (display_method_list, display_class_list):
- use @formatter.raw_print_line instead of puts.
-
- * lib/rdoc/ri/driver.rb (select_methods): new method to collect all
- instance/class methods which match with passed pattern.
-
- * lib/rdoc/ri/driver.rb (run): use class_cache's result directly
- instead of select_classes' because it's removed now.
-
- * lib/rdoc/ri/driver.rb (run): search methods when passed name is not
- class name. [ruby-core:15309]
-
Thu Jan 31 08:31:19 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* common.mk (ext/extmk.rb, instruby.rb): inlined $(MAKE) so that can
be executed even with -n.
-Thu Jan 31 06:24:22 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (rb_io_close_read): replaces fptr with the tied writer if
- duplex.
-
- * io.c (rb_io_close_write): unties the tied IO for writing if duplex.
- [ruby-dev:33532]
-
-Thu Jan 31 02:22:04 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (open_key_args): allow encoding key to take two encoding
- names. a patch from <rubikitch AT ruby-lang.org>. [ruby-dev:33540]
-
-Thu Jan 31 02:15:49 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+Thu Jan 31 07:00:19 2008 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
- * parse.y (dsym): allow empty symbols. [ruby-core:15248]
+ * lib/rinda/tuplespace.rb (bin_for_find): should find a symbol by
+ Symbol class.
-Thu Jan 31 00:01:51 2008 Tanaka Akira <akr@fsij.org>
+ * test/rinda/test_rinda.rb (test_symbol_tuple): ditto.
- * io.c (select_internal): fix SEGV by `select [STDIN],nil,[STDIN]'.
- fixed by Petr Chromec.
- http://rubyforge.org/tracker/index.php?func=detail&aid=17275&group_id=426&atid=1698
+Wed Jan 30 22:07:58 2008 Tadayoshi Funaba <tadf@dotrb.org>
-Wed Jan 30 17:32:49 2008 NARUSE, Yui <naruse@ruby-lang.org>
+ * lib/date.rb: refined deprecated methods.
- * enc/*.c: add GB12345, UCS-{2,4}{BE,LE}.
-
-Wed Jan 30 14:32:18 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * lib/rdoc/ri/driver.rb (cache_file_for): shouldn't use `:' in filename.
-
-Wed Jan 30 14:27:19 2008 Tanaka Akira <akr@fsij.org>
-
- * string.c (rb_str_succ): use wrapped character as a carry for
- ASCII incompatible encoding.
-
-Wed Jan 30 12:26:59 2008 Tanaka Akira <akr@fsij.org>
-
- * enc/utf_16be.c (UTF16_IS_SURROGATE_FIRST): avoid branch.
- (UTF16_IS_SURROGATE_SECOND): ditto.
- (UTF16_IS_SURROGATE): defined.
- (utf16be_mbc_enc_len): validation implemented.
-
- * enc/utf_16le.c (UTF16_IS_SURROGATE_FIRST): avoid branch.
- (UTF16_IS_SURROGATE_SECOND): ditto.
- (UTF16_IS_SURROGATE): defined.
- (utf16le_mbc_enc_len): validation implemented.
-
-Wed Jan 30 12:06:43 2008 Tadayoshi Funaba <tadf@dotrb.org>
+Wed Jan 30 22:06:54 2008 Tadayoshi Funaba <tadf@dotrb.org>
* bignum.c (rb_cstr_to_inum): '0_2' is a valid representation.
-Wed Jan 30 11:57:50 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * bootstraptest/runner.rb: fix -I../../hoge case.
-
-Wed Jan 30 01:25:16 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_range.rb: add tests to achieve over 90% test coverage
- of range.c.
-
-Wed Jan 30 00:09:37 2008 Tanaka Akira <akr@fsij.org>
-
- * enc/euc_tw.c (euctw_mbc_enc_len): validation implemented.
-
-Tue Jan 29 22:58:11 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_enumerator.rb: add tests to achieve over 90% test
- coverage of enumerator.c.
-
- * test/ruby/test_enum.rb: add for enum.c.
-
-Tue Jan 29 22:29:48 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * enumerator.c: fix documents.
-
-Tue Jan 29 22:27:11 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * range.c: fix SEGV by ("a" .. "z").step(2 ** 30) { }.
-
-Tue Jan 29 21:59:16 2008 Tanaka Akira <akr@fsij.org>
-
- * enc/euc_tw.c (euctw_islead): 0x8e is a leading byte.
-
-Tue Jan 29 21:55:35 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * bignum.c: move object allocation out of blocking_region.
- [ruby-dev:33139]
-
-Tue Jan 29 20:37:36 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/trans/make_transdb.rb: add for make transdb.h.
-
- * dmytranscode.c: add for miniruby.
-
- * enc/gbk.c (gbk_left_adjust_char_head, gbk_is_allowed_reverse_match):
- fix odd regexp match. [ruby-dev:33502]
-
-Tue Jan 29 20:17:06 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * {bcc32,win32}/Makefile.sub (MINIOBJS): add dmytranscode.$(OBJEXT).
-
-Tue Jan 29 19:39:40 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * configure.in, common.mk: fix rule for dmytranscode.o.
-
-Tue Jan 29 19:03:16 2008 NARUSE, Yui <naruse@ruby-lang.org>
+Tue Jan 29 22:40:12 2008 Yusuke Endoh <mame@tsg.ne.jp>
- * enc/trans/japanese.c (rb_to_Windows_31J): to 'Windows-31J'.
+ * range.c (step_i): rb_funcall receives VALUE as an argument.
- * common.mk: add rules for transdb.h.
+Tue Jan 29 11:53:05 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * transcode.c (init_transcoder_table): use transdb.h.
-
-Tue Jan 29 18:05:48 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * encoding.c (encdb_{replicate,alias,dummy,declare}): define only if
- NO_ENCDB_H is not defined.
-
-Tue Jan 29 17:54:11 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/gbk.c (EncLen_gbk): too short. [ruby-dev:33497]
-
-Tue Jan 29 17:25:22 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * dmyencoding.c, encoding.c (enc_init_db, NO_ENCDB_H):
- miniruby doesn't use encdb.
-
- * common.mk: encdb.h use miniruby.
-
-Tue Jan 29 17:37:36 2008 Tanaka Akira <akr@fsij.org>
-
- * enc/gb18030.c (gb18030_mbc_enc_len): validation implemented.
-
-Tue Jan 29 17:01:07 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * tool/ifchange: remove $temp when unchanged.
-
-Tue Jan 29 16:59:01 2008 Tanaka Akira <akr@fsij.org>
-
- * insns.def (toregexp): generate a regexp from strings instead of one
- string.
-
- * re.c (rb_reg_new_ary): defined for toregexp. it concatenates
- strings after each string is preprocessed.
-
- * compile.c (compile_dstr_fragments): split from compile_dstr.
- (compile_dstr): call compile_dstr_fragments.
- (compile_dregx): defined for dynamic regexp.
- (iseq_compile_each): use compile_dregx for dynamic regexp.
-
- [ruby-dev:33400]
-
-Tue Jan 29 16:25:26 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * common.mk, ext/extmk.rb: always make encdb.h.
-
-Tue Jan 29 12:53:39 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/gbk.c: add GBK, CP936 and CP949.
-
- * enc/euc_kr.c: remove CP949.
-
- * enc/euc_cn.c: remove CP936 and rename to gb2312.c
-
- * enc/gb2312.c: GB2312 is preferred MIME name.
-
-Tue Jan 29 03:01:29 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * parse.y (reg_fragment_setenc_gen): US-ASCII script special code.
-
- * parse.y (reg_fragment_check_len, reg_compile_gen): no need such
- trick.
- [ruby-dev:33399]
-
- * test/ruby/test_m17n.rb (test_regexp_usacii_literal): add tests.
-
-Tue Jan 29 01:38:02 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * common.mk ($(srcdir)/revision.h): no need to show ifchange execution
- because ifchange echos updated or unchanged.
-
-Tue Jan 29 01:26:23 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (up): use last changed revision.
-
- * common.mk (up): force to update revision.h.
-
-Tue Jan 29 00:12:17 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * bignum.c (rb_big2str0): should be US-ASCII.
-
-Tue Jan 29 00:10:00 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * misc/ruby-mode.el (ruby-mode-set-encoding): updates magic comment.
-
-Mon Jan 28 23:47:52 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * parse.y (rb_id2str, ripper_initialize, Init_ripper):
- use rb_usascii_str_new2. [ruby-dev:33449]
-
-Mon Jan 28 19:37:08 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/win32ole/win32ole.c (ole_cp2encoding): new function.
-
- * ext/win32ole/win32ole.c (ole_wc2vstr, ole_variant2val, fole_missing):
- set encoding to result.
-
- * ext/win32ole/win32ole.c (fole_s_set_code_page, Init_win32ole): set
- default encoding.
- [ruby-dev:33433]
-
-Mon Jan 28 11:17:28 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c, parse.y, re.c: use rb_ascii8bit_encoding.
-
-Mon Jan 28 17:54:15 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/utf_7.h: add dummy encoding UTF-7 and its alias CP65000.
-
-Mon Jan 28 17:41:19 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * enc/utf_8.c: add alias CP65001.
-
-Mon Jan 28 15:33:23 2008 Tanaka Akira <akr@fsij.org>
-
- * enc/big5.c (big5_mbc_enc_len): validation implemented.
-
-Mon Jan 28 13:02:02 2008 Tanaka Akira <akr@fsij.org>
-
- * enc/euc_kr.c (euckr_mbc_enc_len): validation implemented.
-
-Mon Jan 28 11:24:49 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * parse.y (parser_str_new): encoding of UTF-8 literal string in
- US-ASCII script is UTF-8. [ruby-dev:33406]
-
-Mon Jan 28 10:25:59 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * test/ruby/test_m17n.rb (test_magic_comment): add test.
-
-Mon Jan 28 09:34:54 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * common.mk (help): use double quotes for nmake.
-
-Mon Jan 28 00:39:09 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (parser_set_encode): check if encoding is ASCII compatible.
+ * configure.in: rm largefile.h.
Mon Jan 28 01:21:15 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
@@ -29409,635 +2130,42 @@ Mon Jan 28 01:21:15 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* io.c (next_argv): ditto.
-Sun Jan 27 23:33:35 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * sprintf.c (rb_str_format): fix for left justify flag.
-
- * sprintf.c (rb_str_format): zero-precision zero bug revised.
- [ruby-dev:33419]
-
-Sun Jan 27 23:20:54 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/oniguruma.h: precise mbclen API redesigned to avoid
- inline functions.
- (onigenc_mbclen_charfound): removed.
- (onigenc_mbclen_needmore): removed.
- (onigenc_mbclen_recover): removed.
- (ONIGENC_MBCLEN_CHARFOUND): removed.
- (ONIGENC_MBCLEN_CHARFOUND_P): defined.
- (ONIGENC_MBCLEN_CHARFOUND_LEN): defined.
- (ONIGENC_MBCLEN_INVALID): removed.
- (ONIGENC_MBCLEN_INVALID_P): defined.
- (ONIGENC_MBCLEN_NEEDMORE): removed.
- (ONIGENC_MBCLEN_NEEDMORE_P): defined.
- (ONIGENC_MBCLEN_NEEDMORE_LEN): defined.
- (ONIGENC_MBC_ENC_LEN): use onigenc_mbclen_approximate.
-
- * regenc.c (onigenc_mbclen_approximate): defined.
-
- * include/ruby/encoding.h (MBCLEN_CHARFOUND): removed.
- (MBCLEN_INVALID): removed.
- (MBCLEN_NEEDMORE): removed.
- (MBCLEN_CHARFOUND_P): defined.
- (MBCLEN_INVALID_P): defined.
- (MBCLEN_NEEDMORE_P): defined.
- (MBCLEN_CHARFOUND_LEN): defined.
- (MBCLEN_NEEDMORE_LEN): defined.
-
- * encoding.c: use new API.
-
- * re.c: ditto.
-
- * string.c: ditto.
-
- * parse.y: ditto.
-
-Sun Jan 27 22:55:27 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (value_expr_gen): reverted r12880. [ruby-dev:33388]
-
-Sun Jan 27 22:33:39 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * sprintf.c (rb_str_format): fix for octal with precision.
- [ruby-dev:33411]
-
-Sun Jan 27 22:31:45 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * misc/ruby-mode.el (ruby-mode-set-encoding): automatically insert
- encoding magic comment.
-
- * misc/ruby-mode.el (ruby-mode): set ruby-mode-set-encoding to buffer
- local before-save-hook.
-
-Sun Jan 27 19:51:15 2008 Tanaka Akira <akr@fsij.org>
-
- * string.c (rb_str_inspect): avoid exception by
- "\#\xa1".force_encoding("euc-jp").inspect.
-
-Sun Jan 27 19:07:33 2008 Tanaka Akira <akr@fsij.org>
-
- * string.c (rb_str_succ): warning suppressed.
-
-Sun Jan 27 18:18:13 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * common.mk (help): show major targets.
-
-Sun Jan 27 17:54:48 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/nkf/nkf.c: raise error when no output encoding is given.
+ * io.c (rb_io_s_foreach): ditto.
-Sun Jan 27 17:20:10 2008 Tanaka Akira <akr@fsij.org>
+ * io.c (rb_io_s_readlines): ditto.
- * string.c (rb_str_succ): don't increment/decrement codepoint.
+ * io.c (rb_io_s_read): ditto.
-Sun Jan 27 16:03:42 2008 NARUSE, Yui <naruse@ruby-lang.org>
+Fri Jan 25 22:33:38 2008 Yusuke Endoh <mame@tsg.ne.jp>
- * lib/irb/ruby-lex.rb (RubyLex#buf_input): use chars.to_a.
-
-Sun Jan 27 16:27:22 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/nkf/nkf-utf8: update nkf.
-
-Sun Jan 27 16:25:27 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * re.c (rb_reg_source): set encoding as regexp encoding.
-
-Sun Jan 27 05:56:39 2008 Tanaka Akira <akr@fsij.org>
-
- * re.c (rb_reg_preprocess): force fixed encoding when ASCII
- incompatible source string.
-
-Sat Jan 26 23:46:33 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * sprintf.c (rb_str_format): zero-precision zero should be empty.
- [ruby-dev:33363]
-
- * sprintf.c (rb_str_format): not prepend octal prefix to negative or
- zero value. [ruby-dev:33363], [ruby-dev:33367]
-
-Sat Jan 26 23:42:15 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (assignable_gen, keyword_to_name): __ENCODING__ was missing.
-
-Sat Jan 26 19:08:45 2008 Tanaka Akira <akr@fsij.org>
-
- * marshal.c (w_object): dump string encoding in USERDEF.
- [ruby-dev:33401]
-
-Sat Jan 26 17:42:23 2008 Koichi Sasada <ko1@atdot.net>
-
- * compile.c (iseq_compile_each): validate argument expr of "next"
- statement.
-
- * bootstraptest/test_syntax.rb: add a test.
-
-Sat Jan 26 17:22:46 2008 Koichi Sasada <ko1@atdot.net>
-
- * compile.c, compile.h: fix to calculate correct stack depth
- at each instruction.
-
-Sat Jan 26 09:41:02 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/rexml/doctype.rb, test/rss/test_maker_itunes.rb: replace
- multi-byte string.
-
- * test/json/{test_json.rb, test_json_unicode.rb}:
- add magic comment.
-
-Sat Jan 26 09:30:26 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/encoding.h (rb_usascii_encindex): added prototype.
-
- * include/ruby/intern.h (rb_usascii_str_new, rb_usascii_str_new2):
- ditto.
-
-Sat Jan 26 09:17:13 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (rb_str_new): set US-ASCII and ENC_CODERANGE_7BIT when
- empty string (len == 0).
-
-Sat Jan 26 03:41:53 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * parse.y (parser_initialize): set default script encoding as US-ASCII.
-
- * ruby.c (load_file): ditto.
-
- * ruby.c (process_options): set script encoding of -e from locale
- except when -K is specified.
-
- * ruby.c (load_file): set script encoding of stdin from locale except
- when -K is specified. [ruby-dev:33375]
-
-Sat Jan 26 02:51:06 2008 Koichi Sasada <ko1@atdot.net>
-
- * compile.c, compile.h: fix stack pointer issues.
- calculate correct stack depth at compile time.
-
- * insns.def (emptstack): remove it and add a new insn "adjuststack".
-
- * bootstraptest/test_knownbug.rb: move/remove fixed test.
-
- * bootstraptest/test_syntax.rb: ditto.
-
-Sat Jan 26 00:17:18 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (rb_str_usascii_new{,2}: defined.
- (rb_str_new): set US-ASCII and ENC_CODERANGE_7BIT when empty
- string.
-
- * encoding.c (rb_usascii_encoding, rb_usascii_encindex): defined.
- (rb_enc_inspect, enc_name, rb_locale_charmap, rb_enc_name_list_i):
- use rb_str_ascii_new.
-
- * array.c (recursive_join, inspect_ary): ditto.
-
- * object.c (nil_to_s, nil_inspect, true_to_s, false_to_s,
- rb_mod_to_s): ditto.
-
- * hash.c (inspect_hash, rb_hash_inspect, rb_f_getenv, env_fetch,
- env_clear, env_to_s, env_inspect): ditto.
-
- * numeric.c (flo_to_s, int_chr, rb_fix2str): ditto.
-
- * bignum.c (rb_big2str): ditto.
-
- * file.c (rb_file_ftype, rb_file_s_dirname, rb_file_s_extname,
- file_inspect_join, Init_file): ditto.
-
- * test/ruby/test_ruby_m17n.rb: add checks for encoding of string.
-
-Sat Jan 26 01:35:46 2008 Tanaka Akira <akr@fsij.org>
-
- * marshal.c (r_byte): use getbyte instead of getc.
- (marshal_load): ditto.
- [ruby-dev:33264]
-
-Sat Jan 26 00:43:40 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (rb_io_getline_fast): don't care ASCII incompatible encoding.
- (prepare_getline_args): generate a newline according to IO encoding
- when necessary.
- (rb_io_getline_1): call rb_io_getline_fast only for ASCII
- compatible encoding.
-
-Fri Jan 25 21:49:36 2008 Tanaka Akira <akr@fsij.org>
-
- * string.c (rb_str_buf_cat_ascii): use rb_enc_cr_str_buf_cat.
-
-Fri Jan 25 19:38:45 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (version.$(OBJEXT)): depends on $(srcdir)/revision.h.
-
- * common.mk (revision.h): extracts revision number with ``svn info''.
-
- * common.mk (up): target to update from the repository.
-
- * Makefile.in, {win,bcc}32/Makefile.sub (IFCHANGE): tool to update a
- file if changed.
-
- * tool/ifchange: for unixen.
-
- * win32/ifchange.bat: some fix
-
-Fri Jan 25 17:12:13 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (load_file): set default to ASCII-8BIT explicitly if -K
- option is not given.
-
-Fri Jan 25 16:31:47 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/intern.h (rb_str_buf_cat_ascii): declared.
-
- * string.c (rb_str_buf_cat_ascii): defined.
-
- * re.c (rb_reg_s_union): use rb_str_buf_cat_ascii to support ASCII
- incompatible encoding.
-
-Fri Jan 25 16:11:16 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (process_options, load_file, rb_load_file): propagates script
- encoding by -K to libraries. [ruby-dev:33156]
-
-Fri Jan 25 15:56:48 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (cmdline_arguments): split argc and argv from cmdline_options.
-
- * ruby.c (process_options): not set encoding of -e option from -E
- option if they are not compatible.
-
-Fri Jan 25 13:15:23 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ruby.c (proc_options, process_options, load_file): shouldn't effect
- --encoding to script encoding. [ruby-dev:33169]
+ * math.c: fix comment. [ruby-dev:33276]
Fri Jan 25 10:31:58 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* */*.bat: set svn:mime-type to text/batch.
-Thu Jan 24 23:23:06 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * enum.c (enum_one, enum_take_while, enum_drop_while): fix documents.
-
-Thu Jan 24 21:46:24 2008 Tanaka Akira <akr@fsij.org>
-
- * parse.y (reg_fragment_setenc_gen): associate ASCII-8BIT only if
- str has only ASCII characters.
-
-Thu Jan 24 20:46:17 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * test/ruby/test_m17n.rb: follow to the following changes.
-
-Thu Jan 24 20:21:07 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * parser.y (parser_str_new): automatically update string literal's
- encoding from US-ASCII to ASCII-8BIT when script encoding is US-ASCII
- and the string includes non-ascii bytes. [ruby-dev:33348]
-
- * parser.y (reg_fragment_check_gen, reg_compile_gen): automatically
- update regexp literal's encoding from US-ASCII to ASCII-8BIT when
- script encoding is US-ASCII, the regexp has no kcode option and the
- regexp includes non-ascii bytes. [ruby-dev:33353]
-
Thu Jan 24 19:36:22 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/uri/generic.rb (URI::Generic::inspect): use Kernel#to_s instead
object_id with printf. [ruby-dev:33347]
-Thu Jan 24 19:29:20 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * sprintf.c (remove_sign_bits): returns pointer to the first char to
- be used, instead of copying.
-
- * sprintf.c (rb_str_format): negative indicator dots should come
- before sign digits always. [ruby-dev:33224]
-
-Thu Jan 24 18:19:42 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/encoding.h (rb_enc_is_newline): parenthesized arguments.
-
-Thu Jan 24 18:14:14 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * re.c (rb_reg_fixed_encoding_p): no need to treat ASCII-8BIT specially.
-
-Thu Jan 24 16:53:06 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * re.c (rb_reg_initialize): 7bit clean regexp should be US-ASCII.
- [ruby-dev:33346]
-
-Thu Jan 24 16:31:04 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_io_getline_fast): the end point of left_char_head()
- must be the last character. [ruby-cvs:22445]
-
-Thu Jan 24 16:24:25 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * parse.y (reg_fragment_setenc_gen): recognize regexp with option n as
- as ASCII-8BIT instead of US-ASCII. [ruby-dev:33339]
-
-Thu Jan 24 15:44:42 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (collect_bang_i): use rb_ary_store() to avoid potential
- memory corruption. a patch from Yusuke Endoh <mame@tsg.ne.jp>
- in [ruby-dev:33328].
-
- * array.c (ITERATE): remove unnecessary macro.
-
- * array.c (sort_1): remove ary_sort_check(). in-place sort keep
- original elements even when it's modified.
-
- * array.c (sort_2): ditto.
-
-Thu Jan 24 15:09:40 2008 Tanaka Akira <akr@fsij.org>
-
- * time.c (make_time_t): revert round trip test. [ruby-dev:33058]
-
-Thu Jan 24 11:14:56 2008 Tanaka Akira <akr@fsij.org>
-
- * string.c (rb_enc_cr_str_buf_cat): ASCII incompatible encoding is
- not compatible with any other encoding.
-
-Thu Jan 24 07:34:34 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * parse.y (STR_NEW0): set encoding as US-ASCII.
-
-Thu Jan 24 03:47:41 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/rexml/text.rb, lib/rubygems/open-uri.rb, lib/open-uri.rb,
- test/logger/test_logger.rb, test/ruby/test_regexp.rb:
- fix tests. [ruby-dev:33336]
-
-Thu Jan 24 03:23:44 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_each_line): use memchr(3) for faster newline
- search.
-
- * io.c (appendline): remove unused arguments
-
- * io.c (rb_io_getline_fast): make much simpler (and faster).
-
-Thu Jan 24 02:13:07 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * insns.def (expandarray): fix stack inc. [ruby-dev:32892]
-
- * bootstraptest/test_knownbug.rb, test_massign.rb: move a fixed test.
-
-Thu Jan 24 01:00:34 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * encoding.{c, h} (rb_usascii_encoding): added.
-
- * parse.y (parser_str_new, rb_intern3): ascii only string literal is
- US-ASCII.
-
- * ruby.c (proc_optionc): -Kn means ASCII-8BIT.
-
-Wed Jan 23 23:54:40 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * sprintf.c: fix comment. [ruby-dev:33275]
-
- * math.c: fix comment. [ruby-dev:33276]
-
-Wed Jan 23 22:47:34 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_struct.rb: add tests to achieve over 90% test
- coverage of struct.c.
-
- * test/ruby/test_sprintf.rb: ditto for sprintf.c.
-
- * test/ruby/test_math.rb: ditto for math.c.
-
-Wed Jan 23 22:14:28 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * enc/trans/japanese.c (rb_from_Windows_31J, rb_to_Windows_31J):
- provisional workaround for Windows-31J. [ruby-dev:33320]
-
-Wed Jan 23 15:25:04 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * time.c (time_strftime): copy encoding from format. [ruby-dev:33303]
-
-Wed Jan 23 15:04:11 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (str_make_independent): should set length.
-
- * string.c (rb_str_associate): hide associated array from ObjectSpace.
-
- * string.c (rb_str_associated): return associated array with freezing
- instead of false. [ruby-dev:33282]
-
- * string.c (rb_str_freeze): freeze associated array together.
-
-Wed Jan 23 13:39:48 2008 Tanaka Akira <akr@fsij.org>
-
- * re.c (rb_reg_prepare_re): fix SEGV by
- /a/ =~ "aa".force_encoding("utf-16be").
-
-Wed Jan 23 11:53:26 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (str_mod_check, str_nth, str_offset): constified.
-
- * string.c (rb_str_dump): dump in ASCII-8BIT always.
-
-Wed Jan 23 10:18:10 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval_method.c (rb_export_method): set ruby_vm_redefined_flag for
- visibility change as well. reported by K.Kosako in
- http://d.hatena.ne.jp/kkos/20080122#1201012720.
-
-Tue Jan 22 22:26:23 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_bignum.rb: change some tests because rational
- redefines Bignum#quo and Bignum#**.
-
-Tue Jan 22 20:58:15 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * lib/mkmf.rb (create_makefile): need to output sodir rule.
-
-Tue Jan 22 19:37:16 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * lib/mkmf.rb (create_makefile): lib files shouldn't depend on install
- dir because if the dir is newer than lib files, lib files will be
- always copied.
-
-Tue Jan 22 17:52:52 2008 Martin Duerst <duerst@it.aoyama.ac.jp>
-
- * enc/trans/utf_16_32.c: Streamline parentheses, add more
- 'static' qualifiers.
-
-Tue Jan 22 12:57:07 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * configure.in (MINIRUBY): remove -I$(EXTOUT)/$(arch) from
- MINIRUBY since miniruby might not be able to load DLL.
-
- * test/ruby/test_m17n.rb: move tests from bootstrap test.
-
- * encoding.c (enc_find): should check name if ASCII compatible.
-
- * string.c (rb_str_end_with): should check character boundary.
-
- * encoding.c (rb_enc_compatible): encoding must be ASCII
- compatible before checking ENC_CODERANGE_7BIT.
-
- * encoding.c (rb_enc_compatible): wrong compatibility condition.
- [ruby-dev:33273]
-
-Tue Jan 22 09:26:47 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_str_each_char): iterates over a shadow.
- [ruby-dev:33243]
-
-Tue Jan 22 08:59:52 2008 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc/ri/formatter.rb: Indent labeled lists like note lists.
-
- * test/rdoc/test_rdoc_ri_overstrike_formatter.rb: Added.
-
- * test/rdoc/test_rdoc_ri_formatter.rb: Added tests.
-
-Tue Jan 22 04:40:28 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (rb_intern3): do not call rb_enc_mbclen() if *m is
- ASCII. [ruby-talk:287225]
-
- * string.c (rb_str_each_line): use rb_enc_is_newline() to gain
- performance if the record separator ($/) is not modified.
-
-Tue Jan 22 01:15:51 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * ChangeLog: format-time-string under C locale. [ruby-dev:33261]
-
-Tue Jan 22 00:45:12 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_bignum.rb: add tests for bignum.c.
+Tue Jan 22 11:22:47 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-Tue Jan 22 00:30:08 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * bignum.c (big_shift): fix a bug that caused infinite loop when
- left shifting.
-
-Mon Jan 21 20:09:38 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date.rb (marshal_load): initialize the cache.
-
-Mon Jan 21 19:42:42 2008 Martin Duerst <duerst@it.aoyama.ac.jp>
-
- * transcode.c, enc/trans/utf_16_32.c, test/ruby/test_transcode.rb:
- added UTF-32BE and UTF-32LE conversions.
+ * win32/setup.mak ($(ARCH)): if a macro is appended by $(APPEND),
+ a space will be inserted on the top of the line.
-Mon Jan 21 14:36:14 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * win32/Makefile.sub (MKFILES): stop make process if Makefile is
+ updated.
- * transcode.c (str_transcode): initialize transcoder in
- rb_transcoding. [ruby-dev:33234]
+Mon Jan 21 17:34:41 2008 Akinori MUSHA <knu@iDaemons.org>
- * transcode_data.h (rb_transcoding): transcoder constified.
+ * io.c (rb_io_mode_flags, rb_io_mode_modenum): Ignore encoding
+ options for forward compatibility.
Mon Jan 21 12:50:02 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c, gc.c (setjmp): sigsetjmp is a macro on cygwin.
-Mon Jan 21 12:35:00 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * transcode.c (transcode_loop, str_transcoding_resize): use unsigned
- char. [ruby-dev:33232]
-
- * transcode_data.h (rb_transcoding, rb_transcoder): removed callback
- parameters.
-
- * enc/trans/japanese.c: ditto.
-
- * enc/trans/utf_16_32.c: parenthesized bit-or operands.
-
-Mon Jan 21 11:59:00 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_str_each_char): move forward. [ruby-dev:33231]
-
-Mon Jan 21 06:40:03 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * transcode.c (transcode_dispatch): constified return value.
-
- * transcode_data.h (rb_transcoding): include pointer to rb_transcoder
- and auxiliary data.
-
- * transcode_data.h (rb_transcoder): all callback functions should have
- their own parameters.
-
- * enc/trans/{japanese,single_byte}.c: constified.
-
-Mon Jan 21 03:45:49 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_str_each_char): advance offset before get next char
- length. [ruby-dev:33211]
-
-Sun Jan 20 20:00:20 2008 Martin Duerst <duerst@it.aoyama.ac.jp>
-
- * transcode.c, enc/trans/utf_16_32.c, test/ruby/test_transcode.rb:
- added UTF-16LE conversions.
-
- * fixed changelog for last commit
-
-Sun Jan 20 17:54:00 2008 Martin Duerst <duerst@it.aoyama.ac.jp>
-
- * added changelog for last commit
-
-Sun Jan 20 15:08:08 2008 Martin Duerst <duerst@it.aoyama.ac.jp>
-
- * enc/trans/utf_16_32.c: new file, currently implementing
- UTF-16BE conversions only.
-
- * test/ruby/test_transcode.rb: Added tests for UTF-16BE;
- made check_both_ways() use force_encoding differently.
-
- * transcode_data.h, transcode.c: Support for more conversion
- functions.
-
-Sun Jan 20 13:06:01 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_str_each_char): performance improvement, and stop if
- shortened in the block. [ruby-dev:33189]
-
-Sun Jan 20 09:12:26 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * common.mk: use -Ks when read insns.def. [ruby-dev#33185]
-
- * parse.y: fix -e and stdin strings aren't set encoding.
-
-Sun Jan 20 05:12:44 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/make_encdb.rb: fix duplication check.
-
-Sun Jan 20 05:03:46 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ascii.c: remove definition of replica KOI8-U.
-
-Sun Jan 20 00:33:59 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/koi8_u.c: added.
-
- * regenc.c, enc/utf_8.c, enc/unicode.c, enc/gb18030.c: add ARG_UNUSED.
-
-Sat Jan 19 22:41:39 2008 Tanaka Akira <akr@fsij.org>
-
- * string.c (coderange_scan): don't call mbclen functions for ASCII
- characters with ASCII compatible encoding.
-
-Sat Jan 19 21:00:34 2008 Tanaka Akira <akr@fsij.org>
-
- * lib/rdoc/template.rb (RDoc): defined to avoid uninitialized constant
- error by `./ruby test/rubygems/test_gem_server.rb'.
-
-Sat Jan 19 20:41:29 2008 Tanaka Akira <akr@fsij.org>
-
- * encoding.c (enc_new): don't free rb_encoding to avoid SEGV by
- `miniruby -e exit' on x86_64 GNU/Linux.
-
-Sat Jan 19 18:40:19 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date.rb (once): use an instance variable which points a hash
- as cache. [experimental]
-
-Sat Jan 19 17:21:29 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date.rb, lib/date/format.rb: parse's hints as an
- experimental function has been removed.
-
Sat Jan 19 11:21:53 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (sigsetjmp): check if available.
@@ -30049,192 +2177,7 @@ Sat Jan 19 11:10:11 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in: Remove wrong assumptions about Cygwin. a patch from
Corinna Vinschen in [ruby-Bugs-17018].
-Sat Jan 19 09:23:14 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (ole_set_safe_array): should not use
- recursive calling.
-
- * test/win32ole/test_win32ole_variant.rb: ditto.
-
-Sat Jan 19 08:58:47 2008 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc/markup: Remove ListBase and Line constants.
-
- * lib/rdoc/ri: Allow output IO to be specified.
-
- * test/rdoc/parser/test_parse_c.rb: Move up one level, fixed.
-
- * test/rdoc/parser/test_rdoc_markup_attribute_manager.rb: Renamed to
- match new class name, updated to match new classes.
-
- * test/rdoc/test_rdoc_ri_formatter.rb: Start of RI formatting tests.
-
- * test/rdoc/test_rdoc_ri_attribute_manager.rb: Start of
- RDoc::RI::AttributeManager tests.
-
- * test/rdoc/test_simple_markup.rb: Moved to match new class name.
-
-Sat Jan 19 08:35:36 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (parser_prepare): get encoding from the first line.
- [ruby-dev:33168]
-
- * ruby.c (load_file): set encoding to input with set_encoding.
-
-Sat Jan 19 03:46:42 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * thread.c (thread_create_core): prohibit thread creation in the
- frozen thread group. a patch in [ruby-dev:33176] from sheepman
- <sheepman AT sheepman.sakura.ne.jp>.
-
- * thread.c (thread_create_core): should inherit ThreadGroup from
- the current thread.
-
-Sat Jan 19 00:37:19 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * sprintf.c (rb_str_format): set result encoding for wider width.
-
-Sat Jan 19 00:13:19 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * thread_win32.c (w32_wait_events): shouldn't invoke interrupt handle
- by timer_thread.
-
-Fri Jan 18 23:49:41 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread.c (thread_create_core): set thread group before creating
- thread.
-
-Fri Jan 18 20:19:51 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * parse.y (ripper_initialize): too early to set parser->enc.
-
-Fri Jan 18 20:03:05 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/setup.mak (BASERUBY): nmake cannot execute ruby correctly
- if the path of ruby.exe is quoted.
-
- * win32/setup.mak ($(ARCH)): if a macro is appended by $(APPEND),
- a space will be inserted on the top of the line.
-
-Fri Jan 18 17:56:09 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval_intern.h, insnhelper.h, thread_pthread.h, vm_core.h, vm_opts.h:
- prefixed include guards with RUBY.
-
- * id.h: added include guard.
-
- * regenc.h, regint.h, regparse.h: prefixed include guards with
- ONIGURUMA.
-
-Fri Jan 18 15:57:05 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread.c (thread_cleanup_func): ignore errors from destroying mutex
- of dead thread. [ruby-core:15069]
-
- * thread_pthread.c, thread_win32.c (native_thread_destroy): ditto.
-
-Fri Jan 18 15:56:04 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * encoding.c (rb_enc_name_list_i, rb_enc_aliases_enc_i): freeze
- element strings to be returned.
-
-Fri Jan 18 14:36:34 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * test/ruby/test_m17n.rb (test_str_dump): added test for
- String#dump. [ruby-dev:33142]
-
-Fri Jan 18 12:25:13 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * encoding.c (load_encoding): check if successfully loaded.
-
- * encoding.c (rb_enc_find_index): use original encoding name to
- replicate loaded encoding instead alias.
-
-Fri Jan 18 09:43:02 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * re.c (rb_char_to_option_kcode): Regexp switch `s' should mean
- Windows-31J, as wells as `-Ks'.
-
-Fri Jan 18 09:22:07 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (parser_initialize): explicitly call rb_ascii8bit_encoding().
-
- * parse.y (parser_prepare): lex_input may not be have encoding (e.g. IO).
-
- * parse.y (rb_parser_compile_string): set encoding from input string.
-
- * encoding.c (rb_enc_find_index): use ASCII-8BIT if loading known
- encoding failed.
-
- * parse.y (ripper_initialize): move parser->enc initialization.
-
- * encoding.c (rb_enc_aliases_enc_i): exclude non alias names from
- Encoding.aliases.
-
- * encoding.c (rb_enc_find_index): use original encoding name to
- load DLL.
-
-Fri Jan 18 07:06:25 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (Init_IO): stdin/stdout may not be duplex.
-
-Fri Jan 18 04:27:57 2008 Eric Hodel <drbrain@segment7.net>
-
- * sample/rdoc/markup/rdoc2latex.rb: Fix for new namespacing.
-
- * lib/rdoc/markup/to_latex.rb: Fix namespacing.
-
-Fri Jan 18 02:02:28 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * bootstraptest/runner.rb (assert_valid_syntax): added.
-
- * bootstraptest/test_knownbug.rb: added test for [ruby-list:44479]
-
-Fri Jan 18 01:48:06 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm_insnhelper.c (vm_call_method): check argument number to
- attr_reader. [ruby-core:15120]
-
-Fri Jan 18 00:49:31 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (rb_io_check_readable): flush tied write IO too.
-
- * io.c (Init_IO): tie stdin with stdout. [ruby-core:15107]
-
-Fri Jan 18 00:23:31 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * encoding.c (enc_free): removed since rb_encoding may be used while
- cleanup.
-
-Fri Jan 18 00:17:19 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * enc/euc_cn.c: split from enc/euc_kr.c.
-
-Fri Jan 18 00:03:54 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/stringio/stringio.c (strio_init): use default external encoding
- if nothing is given. a patch from sheepman <sheepman AT
- sheepman.sakura.ne.jp> in [ruby-dev:33159].
-
-Thu Jan 17 23:56:20 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (encdb.h): give output file name to make_encdb.rb.
-
- * encoding.c (enc_table): simplified.
-
- * encoding.c (enc_register_at): lazy loading. [ruby-dev:33013]
-
- * regenc.h (ENC_DUMMY): added.
-
- * enc/make_encdb.rb: now emits macros only.
-
- * enc/iso_2022_jp.h: split from encoding.c.
-
-Thu Jan 17 21:48:21 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * re.c (rb_char_to_option_kcode): fixed typo.
-
-Thu Jan 17 21:01:25 2008 Tadayoshi Funaba <tadf@dotrb.org>
+Thu Jan 17 21:06:01 2008 Tadayoshi Funaba <tadf@dotrb.org>
* lib/date.rb (Date::Infinity#<=>): didn't work. A patch from
Dirkjan Bussink <d.bussink AT gmail.com> [ruby-core:15098].
@@ -30243,132 +2186,10 @@ Thu Jan 17 21:01:25 2008 Tadayoshi Funaba <tadf@dotrb.org>
* lib/date.rb, lib/date/format.rb: some trivial changes.
-Thu Jan 17 13:07:18 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_dump): preserve the encoding of source string
- if it is ASCII compatible. otherwise, add '.force_encoding()'
- for ugly work around. maybe we should implement some other way
- to keep non ASCII encoding in dumped string. [ruby-dev:33142]
-
-Thu Jan 17 10:30:32 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (io_fwrite): always flush IO on tty, even without newlines.
- [ruby-core:15107]
-
-Wed Jan 16 22:45:27 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * encoding.c (enc_register_at): make own copy. [ruby-dev:33136]
-
-Wed Jan 16 18:03:10 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (pipe_open, rb_io_s_popen): clear temporary object to release
- and prevent from GC.
-
-Wed Jan 16 17:55:07 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * numeric.c (fix_quo): typo. a patch from Shin-ichiro HARA
- <sinara AT blade.nagaokaut.ac.jp> in [ruby-dev:33130]
-
-Wed Jan 16 17:36:26 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * test/test_delegate.rb: add new test file for delegate.rb.
-
-Wed Jan 16 16:14:00 2008 Akinori MUSHA <knu@iDaemons.org>
-
- * ruby.1: Fix grammar.
-
-Wed Jan 16 15:26:31 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (sys_fail2): get rid of unlimited alloca.
-
- * io.c (mode_enc, pipe_open, rb_io_s_popen): ditto.
-
- * load.c (rb_feature_p): ditto.
-
- * object.c (rb_cstr_to_dbl): ditto.
-
- * io.c (mode_enc): fixed uninitialized variable.
-
-Wed Jan 16 12:51:30 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/intern.h (rb_str_tmp_new, rb_str_shared_replace):
- prototype moved.
-
-Tue Jan 15 23:52:51 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/*: add ARG_UNUSED.
-
- * enc/koi8_u.c: added.
-
-Tue Jan 15 23:00:08 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/utf_{16,32}{be,le}.c: remove some ARG_UNUSED. replace struct
- OnigEncodingST by OnigEncoding.
-
-Tue Jan 15 22:30:43 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * encoding.c (ENC_REGISTER): use &OnigEncoding*.
- (ENCINDEX_UTF_8): renamed from ENCINDEX_UTF8.
- (rb_enc_init): use ENC_REGISTER.
-
- * include/ruby/oniguruma.h (OnigEncodingUTF8, ONIG_ENCODING_UTF8):
- removed.
-
- * enc/*.c: remove use of &encoding_*; use enc argument instead.
-
-Tue Jan 15 18:44:46 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enc/utf_8.c: remove use of ONIG_ENCODING_UTF8 altogether; use
- enc argument instead.
-
-Tue Jan 15 18:05:26 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * enc/utf_8.c (ONIG_ENCODING_UTF8): reverted.
-
-Tue Jan 15 18:01:55 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/Makefile.sub (MKFILES): add dependencies.
-
-Tue Jan 15 18:00:16 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enc/utf_8.c (OnigEncodingDefine): encoding name should be kept
- unchanged.
-
-Tue Jan 15 17:53:05 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * enc/utf_8.c: renamed as IANA name.
-
- * enc/Makefile.in: ditto.
-
-Tue Jan 15 16:59:31 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (proc_options): encoding libraries cannot be loaded until
- load path is set.
-
Tue Jan 15 15:09:28 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* win32/setup.mak: strip out empty lines from CPP output.
-Tue Jan 15 14:57:38 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * {win,bcc}32/setup.mak (-basic-vars-): expand BASERUBY to full path
- to get rid of ./ruby.exe.
-
- * win32/enc-setup.mak: workaround for Borland make.
-
-Tue Jan 15 14:44:53 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * encoding.c (rb_locale_charmap): use ASCII-8BIT in miniruby.
-
-Tue Jan 15 13:54:41 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * {bcc32,win32}/Makefile.sub (RUNRUBY): need to set archdir when
- invoking ruby.
-
-Tue Jan 15 13:43:18 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * common.mk (us_ascii.o): add dependencies. [ruby-dev:33111]
-
Tue Jan 15 03:41:42 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (eval): check if backtrace is empty. [ruby-core:15040]
@@ -30377,282 +2198,26 @@ Tue Jan 15 01:28:47 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* common.mk: simplified dummy objects dependencies.
-Tue Jan 15 01:19:00 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (OBJS): moved encoding.o from COMMONOBJS.
-
- * common.mk (dmyencoding.o): added. [ruby-dev:33099]
-
- * configure.in, {win,bcc}32/Makefile.sub (MINIOBJS): added
- dmyencoding.o.
-
- * dmyencoding.c (rb_locale_charmap): returns nil for miniruby.
-
-Tue Jan 15 00:05:50 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (appendline): specifying limit should not generate broken
- byte sequence. strings should be rounded. [ruby-dev:33088]
-
-Mon Jan 14 23:33:02 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/nkf/lib/kconv.rb (Kconv.tolocale): argument is str.
-
-Mon Jan 14 23:31:05 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * configure.in (setup): add -I$(EXTOUT)/$(arch) to MINIRUBY.
-
- * bootstraptest/runner.rb (main): expand -I directory path.
-
-Mon Jan 14 23:28:10 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/enc-setup.mak (BUILTIN_ENCOBJS): depends on enc/Makefile.in.
-
-Mon Jan 14 22:48:16 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * re.c (rb_char_to_option_kcode): use rb_enc_find_index() instead
- of using fixed index value.
-
- * enc/Makefile.in (encsrcdir): make US-ASCII built-in.
-
-Mon Jan 14 22:25:02 2008 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * golf_prelude.rb: Shorter method name completion. Same method
- used for const missing. do_while and do_until added. Enumerator
- gains all of Array's abilities. Ex:
- '123'.m{|i|i*2} #=> "112233"
- '123'.pe #=> '123'.perm*' ' #=> "123 132 213 231 312 321"
- base on a patch from Darren Smith <darrenks AT ml1.net>.
-
-Mon Jan 14 21:10:02 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enc/us_ascii.c: wrong alias name: ANSI_X3.4-1986.
-
- * rubytest.rb: add -I#{srcdir} to load encoding DLL.
-
-Mon Jan 14 18:53:58 2008 Koichi Sasada <ko1@atdot.net>
-
- * thread.c: clear thread structure.
- (TODO: survey that child process should clear mutex or not).
-
- * bootstraptest/test_knownbug.rb, test_thread.rb: move a fixed test.
-
-Mon Jan 14 18:43:38 2008 Koichi Sasada <ko1@atdot.net>
-
- * bootstraptest/runner.rb: add "flunk" method.
-
- * bootstraptest/test_knownbug.rb: fix to use flunk.
-
-Mon Jan 14 18:10:59 2008 Koichi Sasada <ko1@atdot.net>
-
- * vm.h: remove dangerous assembler sentence.
-
-Mon Jan 14 18:06:37 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * encoding.c (rb_locale_encoding): return US-ASCII when charmap is
- nil.
-
Mon Jan 14 16:12:58 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/shellwords.rb: scape should be an alias to shellescape. a
patch from Masahiro Kawato <m-kawato AT mwb.biglobe.ne.jp> in
[ruby-dev:33060].
-Mon Jan 14 16:09:16 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ruby.1: a patch to describe --encoding. a patch from Yugui
- <yugui AT yugui.sakura.ne.jp> in [ruby-dev:33079].
-
- * ruby.c: ditto.
-
-Mon Jan 14 13:49:26 2008 Tanaka Akira <akr@fsij.org>
-
- * re.c (rb_reg_prepare_re): initialize error message buffer.
- (rb_reg_search): ditto.
- (rb_reg_check_preprocess): ditto.
- (rb_reg_new_str): ditto.
- (rb_enc_reg_new): ditto.
- (rb_reg_compile): ditto.
- (rb_reg_initialize_m): ditto.
- (rb_reg_s_union_m): ditto.
-
-Mon Jan 14 12:33:07 2008 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc/markup*: Renamespace from SM::SimpleMarkup to
- RDoc::Markup.
-
-Mon Jan 14 10:45:45 2008 Martin Duerst <duerst@it.aoyama.ac.jp>
-
- * enc/ascii.c: Exchanged order of arguments for one ENC_ALIAS
-
-Mon Jan 14 09:19:07 2008 Tadayoshi Funaba <tadf@dotrb.org>
+Mon Jan 14 09:32:40 2008 Tadayoshi Funaba <tadf@dotrb.org>
* lib/time.rb: do not reference Time directly from the inside of
definitions. [ruby-dev:33059]
-Mon Jan 14 05:44:44 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/*.c: add replicas and aliases.
-
- * enc/make_encdb.h: add duplicate and undefined check.
-
-Mon Jan 14 02:03:05 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * include/ruby/oniguruma.h: remove ONIG_ENCODING_* and OnigEncoding*
- which are not builtin.
-
- * regenc.{c,h} (onigenc_mb2_code_to_mbclen, onigenc_mb4_code_to_mbclen):
- fix prototype.
-
- * enc/big5.c, enc/euc_kr.c, enc/euc_tw.c, enc/gb18030.c,
- enc/koi8_r.c, enc/windows_1251.c: imported from Oniguruma.
-
-Sun Jan 13 22:47:28 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/make_encdb.h: sort encoding names by original name.
-
- * encoding.c, enc/*.c: define replicas and aliases.
-
-Sun Jan 13 20:24:03 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * encoding.c: add documents.
-
-Sun Jan 13 18:41:48 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * encoding.c (Init_Encoding): moved initialization from encdb.h.
-
- * enc/make_encdb.rb (enc_name_list): constified.
-
- * enc/make_encdb.rb (enc_init_db): moved some functions to encoding.c.
-
-Sun Jan 13 13:53:00 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (load_file): local variable was not initialized when -x flag
- is given.
-
- * ruby.c (load_file): script files should not be affected by locale.
- [ruby-dev:33054]
-
-Sun Jan 13 12:01:32 2008 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc/generators*: Reorganize RDoc generators.
-
-Sun Jan 13 11:41:11 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * encoding.c (ENCINDEX_EUC_JP, ENCINDEX_SJIS): removed.
- (rb_enc_init): EUC-JP and Shift_JIS are not builtin now.
-
- * enc/Makefile.in: ditto.
-
- * common.mk: ditto.
-
- * ruby.c (proc_options): ditto.
-
- * enc/shift_jis.c, enc/euc_jp.c: fixes for remove from builtin.
-
-Sun Jan 13 10:21:40 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * encoding.c (enc_table): packed all enc_table stuff.
-
-Sun Jan 13 09:58:17 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * encoding.c (rb_enc_init): revert removing SJIS.
-
- * enc/sjis.c: move to enc/shift_jis.c, to make encoding name equal to
- filename for convenience of loading lib.
-
- * enc/shift_jis.c: moved from enc/sjis.c.
-
- * common.mk: follows enc/shift_jis.c.
-
- * enc/Makefile.in: ditto.
-
-Sun Jan 13 09:22:33 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (incs): includes encdb.h.
-
-Sun Jan 13 09:17:29 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * {bcc,win}32/Makefile.sub (MV): use move instead of ren. [ruby-Bugs-17019]
-
-Sun Jan 13 01:52:31 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enc/make_encdb.rb: should work on Ruby 1.8. [ruby-dev:33069]
-
- * common.mk (encdb.h): pass enc dir from outside to make_encdb.rb.
-
-Sun Jan 13 00:01:07 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/make_encdb.rb: added. search enc/*.c and make encoding database.
-
- * regenc.h (ENC_REPLICATE, ENC_ALIAS): added for defining replica
- encoding and encoding alias.
-
- * encoding.c (rb_enc_init): move alias definitions to enc/*.c.
- (rb_enc_find_index): search original of replica and alias when no
- encoding library.
- (rb_enc_name_list, rb_enc_aliases_enc_i, rb_enc_aliases_str_i,
- rb_enc_aliases, Encoding.name_list, Encoding.aliases): added.
- (Init_Encoding): init encdb.
-
- * enc/ascii.c, enc/us_ascii.c, enc/euc_jp.c, enc/sjis.c:
- add replica encoding and encoding alias definition.
-
- * common.mk (dist-clean-local): add rule for remove encdb.h.
-
Sat Jan 12 18:27:41 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (rb_define_alloc_func, rb_undef_alloc_func): should
- define/undef on a singleton class. [ruby-core:09959]
+ define/undef on a signleton class. [ruby-core:09959]
-Sat Jan 12 12:44:36 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/nkf/nkf.c: rdoc update.
-
-Sat Jan 12 12:01:49 2008 Tadayoshi Funaba <tadf@dotrb.org>
+Sat Jan 12 12:04:14 2008 Tadayoshi Funaba <tadf@dotrb.org>
* lib/date.rb, lib/date/format.rb: tuning for performance.
-Sat Jan 12 11:29:45 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * bootstraptest/test_proc.rb: fixed wrong expected result. pointed
- out by Kornelius "murphy" Kalnbach <murphy AT rubychan.de> in
- [ruby-core:15022].
-
-Sat Jan 12 04:38:38 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ruby.c (process_options): -e'script' is locale encoding by default.
- (load_file): ruby script from stdin is locale encoding by default.
-
-Sat Jan 12 04:31:59 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/nkf/nkf-utf8/nkf.c: fix bug: -m was -m0.
-
-Fri Jan 11 23:22:31 2008 Tanaka Akira <akr@fsij.org>
-
- * string.c (string.c): call rb_str_buf_append to update encoding of
- str1, even if str2 is empty.
-
-Fri Jan 11 20:20:16 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * proc.c (proc_mark): needs to mark the receiver too. a patch from
- Chris Heath <chris AT heathens.co.nz> in [ruby-core:14983].
- [ruby-core:14885]
-
-Fri Jan 11 18:28:49 2008 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc/usage.rb: Removed.
-
- * lib/getoptlong.rb: Update example to not use lib/rdoc/usage.rb.
-
-Fri Jan 11 18:17:10 2008 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc/ri/driver.rb (read_yaml): Follow namespace change
- [ruby-core:14964].
-
-Fri Jan 11 16:55:21 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_str_append): performance improvement.
-
Fri Jan 11 12:35:56 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in: moved broken syscall checks from process.c etc.
@@ -30660,1166 +2225,95 @@ Fri Jan 11 12:35:56 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* defines.h (WORDS_BIGENDIAN): honor __BIG_ENDIAN__ than the result of
configure.
- * lib/rdoc/options.rb (check_diagram): more precise check, darwin
- is not Windows but mingw is on it.
-
-Fri Jan 11 09:59:05 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/nkf/nkf-utf8/nkf.c: update to r1.163.
-
- * ext/nkf/nkf.c: ASCII's canonical name is US-ASCII.
-
- * ext/nkf/lib/kconv.rb (Kconv.isjis): force_encoding('BINARY').
-
-Fri Jan 11 09:23:31 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * encoding.c (set_base_encoding): must use rb_enc_dummy_p.
-
-Fri Jan 11 06:13:14 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * encoding.c (rb_to_encoding_index, rb_to_encoding): disallow nil.
- [ruby-dev:33003]
-
-Fri Jan 11 01:08:01 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * thread.c (rb_mutex_unlock): proper error message for unlocking
- mutex that is not locked. a patch from Yusuke ENDOH
- <mame at tsg.ne.jp> in [ruby-dev:33010].
-
-Thu Jan 10 18:00:41 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * prelude.rb (Mutex::synchronize): capture exception from unlock.
- [ruby-dev:32935]
-
-Thu Jan 10 10:15:03 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (io_encoding_set): IO.pipe("euc-jp", nil) should work as
- IO.pipe("euc-jp", nil). [ruby-dev:33000]
-
- * io.c (io_encoding_set): handle nil for v1.
-
-Thu Jan 10 02:41:22 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_io_binmode): should not alter encoding. [ruby-dev:32918]
-
- * io.c (io_read_encoding): need not to return ASCII-8BIT for
- binary IO.
-
-Wed Jan 9 22:04:17 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * lib/mathn.rb (Prime#each): returns an enumerator if no block
- given. [ruby-dev:32815]
-
-Wed Jan 9 22:03:26 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * encoding.c (rb_enc_replicate): replica of dummy is a dummy.
-
-Wed Jan 9 20:55:38 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/e2mmap.rb (Exception2MessageMapper::Raise): define fail.
- [ruby-dev:32854]
-
-Wed Jan 9 20:35:42 2008 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/webrick/httprequest.rb: support X-Forwarded-* header fields.
- WEBrick::HTTPRequest#{host,port,request_uri} is derived having
- regards to X-Forwarded-Proto and X-Forwarded-Host.
-
- * lib/webrick/httprequest.rb
- (WEBrick::HTTPRequest#server_name?): new method.
- (WEBrick::HTTPRequest#remote_ip?): new method.
- (WEBrick::HTTPRequest#ssl?): new method.
-
-Wed Jan 9 18:24:39 2008 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * golf_prelude.rb (Array#to_s): alias to join.
-
- * golf_prelude.rb (FalseClass#to_s): return "".
-
-Wed Jan 9 16:59:54 2008 Tanaka Akira <akr@fsij.org>
-
- * string.c (rb_enc_cr_str_buf_cat): fix self appending.
-
-Wed Jan 9 15:54:24 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (process_options): give priority command line encoding option
- to RUBYOPT, and enable -E option in RUBYOPT.
-
- * ruby.c (load_file): deal with encoding option in shebang line if
- nothing in command line and RUBYOPT.
-
-Wed Jan 9 14:55:36 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * parse.y (yycompile0): remove setting parser->enc because it is set
- in parser_prepare() by previous change of parser_prepare().
-
-Wed Jan 9 14:52:18 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_enc_cr_str_buf_cat, rb_str_buf_append): deal with self
- appending.
-
-Wed Jan 9 14:44:57 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * parse.y (parser_prepare): set parser->enc from lex_input for ripper.
-
-Wed Jan 9 13:45:52 2008 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/webrick/server.rb (WEBrick::HTTPServer#start):
- :DoNotReverseLookup option had not been performed.
-
-Wed Jan 9 13:03:34 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_enc_cr_str_buf_cat): do not recalculate coderange
- value if it's given from outside.
-
-Wed Jan 9 08:42:01 2008 James Edward Gray II <jeg2@ruby-lang.org>
-
- * enum.c: Updating the documentation of Enumerable#zip to reflect
- the recent changes Matz made to the method.
-
-Wed Jan 9 01:35:10 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/Makefile.in (BUILTIN_ENCS): UTF-{16,32}{BE,LE} are not builtin.
-
-Tue Jan 8 23:55:15 2008 NARUSE, Yui <naruse@ruby-lang.org>
+ * dln.c: use dlopen on Mac OS X 10.3 or later. backport from trunk.
- * encoding.c (rb_enc_init): UTF-{16,32}{BE,LE} are not builtin.
+ * lib/rdoc/options.rb (check_diagram): more precise check, darwin
+ is not Windows but minwg is on it.
-Tue Jan 8 22:33:03 2008 NARUSE, Yui <naruse@ruby-lang.org>
+Thu Jan 10 10:53:50 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * encoding.c, Makefile.in, include/ruby/oniguruma.h,
- enc/Makefile.in: fix rules for UTF-{16,32}{BE,LE}.
+ * win32/win32.c (rb_w32_open_osfhandle): reverted to old definition.
+ [ ruby-Bugs-16948 ]
Tue Jan 8 20:02:08 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* win{32,ce}/Makefile.sub: merged.
-Tue Jan 8 19:48:15 2008 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc/ri/driver.rb: Speed up Marshal.load. Fix bug with nested
- classes' methods.
-
-Tue Jan 8 19:17:29 2008 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc/*: Clean up namespacing of RI's classes.
-
-Tue Jan 8 18:05:35 2008 Eric Hodel <drbrain@segment7.net>
-
- * bin/ri, lib/rdoc/ri/*: Replace with Ryan Davis' cached ri.
-
-Tue Jan 8 17:32:07 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enum.c (enum_zip): honor length of the receiver, not the
- shortest length. [ruby-core:14738]
-
- * enum.c (enum_zip): returns array not enumerator for no block
- form. [ruby-core:14738]
-
- * enumerator.c (next_ii): do not ignore multiple values yielded.
-
- * array.c (rb_ary_zip): faster version without creating generators.
-
-Tue Jan 8 15:47:43 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * enc/utf{16,32}_{be,le}.c: use &OnigEncodingName(*) instead of
- ONIG_ENCODING_*.
-
-Tue Jan 8 15:40:31 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * regenc.c (onigenc_strlen_null, onigenc_str_bytelen_null): suppressed
- warnings.
-
- * regenc.h, enc/unicode.c (onigenc_unicode_ctype_code_range): added
- encoding argument.
-
- * enc/utf{16,32}_{be,le}.c: added init functions.
-
- * enc/utf{16,32}_{be,le}.c: imported from Oniguruma 5.9.1.
-
-Tue Jan 8 15:03:10 2008 Tanaka Akira <akr@fsij.org>
-
- * string.c (str_gsub): avoid appending empty pre-match substr.
-
-Tue Jan 8 13:05:57 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * compile.c (iseq_build_from_ary), iseq.c (iseq_load): fix for format change.
-
-Tue Jan 8 07:56:11 2008 Tanaka Akira <akr@fsij.org>
-
- * string.c (rb_str_buf_append): fix append itself.
-
-Tue Jan 8 01:13:50 2008 Tanaka Akira <akr@fsij.org>
-
- * string.c (STR_ENC_GET): defined. same as rb_enc_get without
- enc_capable.
- (coderange_scan): ASCII-8BIT test refined.
- (rb_enc_cr_str_buf_cat): new internal function to accumulate
- strings with encoding.
- (rb_enc_str_buf_cat): use rb_enc_cr_str_buf_cat.
- (rb_str_buf_append): ditto
- (str_gsub): use rb_str_buf_append.
- (rb_str_hash): use ENCODING_GET.
- (rb_str_comparable): ditto.
- (rb_str_cmp): compare encoding index, not rb_encoding address.
-
-Mon Jan 7 20:37:55 2008 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/webrick/httpservlet/cgihandler.rb: external encoding of
- tempfiles is set to "ASCII-8BIT".
-
-Mon Jan 7 19:39:50 2008 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc/template.rb: Use ERB instead of custom template language.
-
- * lib/rdoc/generators/template/html/old_html.rb: Remove.
-
- * lib/rdoc/generators/template/*: Convert to ERB.
-
-Mon Jan 7 19:11:30 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (Init_String): sym_match arity spec was wrong. a patch
- from Hiroyuki Iwatsuki <don at na.rim.or.jp> in [ruby-dev:32957].
-
-Mon Jan 7 18:10:33 2008 Tanaka Akira <akr@fsij.org>
-
- * string.c (str_gsub): move rb_enc_get(str) to out of loop.
-
-Mon Jan 7 15:52:10 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/oniguruma.h (OnigEncodingType): new member
- ruby_encoding_index to avoid linear search in rb_enc_to_index.
-
- * include/ruby/encoding.h (rb_enc_to_index): macro defined to use
- ruby_encoding_index.
-
- * encoding.c (rb_enc_to_index): removed.
- (enc_register_at): initialize ruby_encoding_index member.
-
-Mon Jan 7 16:10:35 2008 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc/tokenstream.rb: Namespace under RDoc.
-
-Mon Jan 7 16:06:09 2008 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc/dot.rb: Namespace under RDoc.
-
- * lib/rdoc/diagram.rb: Clean up formatting.
-
-Mon Jan 7 15:51:35 2008 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc/options.rb: Convert to OptionParser, clean up -h output,
- namespace under RDoc.
- * lib/rdoc/*: Namespace RDoc::Options.
-
-Mon Jan 7 15:42:46 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * common.mk, Makefile.in, */Makefile.sub (distclean-local): move
- removing rule of ext/ripper/y.output from common.mk to Makefiles
- that depend on platforms.
-
-Mon Jan 7 13:54:57 2008 Tanaka Akira <akr@fsij.org>
-
- * re.c (rb_reg_preprocess): fix fixed_enc condition.
-
-Mon Jan 7 11:51:49 2008 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc/generators/ri_generator.rb: Merge documentation from the
- same class on output. Fixes bug where documentation could
- disappear.
-
- * lib/rdoc/options.rb: Fix typo.
-
- * lib/rdoc/generators/*: Clean up some namespacing and make RDoc
- consistent.
-
-Mon Jan 7 11:44:45 2008 Tanaka Akira <akr@fsij.org>
-
- * encoding.c (rb_enc_internal_get_index): extracted from
- rb_enc_get_index.
- (rb_enc_internal_set_index): extracted from rb_enc_associate_index
-
- * include/ruby/encoding.h (ENCODING_SET): work over ENCODING_INLINE_MAX.
- (ENCODING_GET): ditto.
- (ENCODING_IS_ASCII8BIT): defined.
- (ENCODING_CODERANGE_SET): defined.
-
- * re.c (rb_reg_fixed_encoding_p): use ENCODING_IS_ASCII8BIT.
-
- * string.c (rb_enc_str_buf_cat): use ENCODING_IS_ASCII8BIT.
-
- * parse.y (reg_fragment_setenc_gen): use ENCODING_IS_ASCII8BIT.
-
- * marshal.c (has_ivars): use ENCODING_IS_ASCII8BIT.
-
-Mon Jan 7 02:14:07 2008 Tanaka Akira <akr@fsij.org>
-
- * string.c (coderange_scan): avoid rb_enc_to_index.
- (rb_enc_str_buf_cat): ditto.
- (str_cat_char): use rb_enc_str_buf_cat.
- (rb_str_inspect): ditto.
-
-Mon Jan 7 01:36:49 2008 Tanaka Akira <akr@fsij.org>
-
- * string.c (coderange_scan): optimize ASCII-8BIT string.
- (rb_enc_str_buf_cat): don't call coderange_scan if possible.
-
-Mon Jan 7 01:05:45 2008 Tanaka Akira <akr@fsij.org>
-
- * lib/erb.rb (ERB::Revision): cut off locale dependent string in Date
- keyword.
-
-Mon Jan 7 00:48:02 2008 Tanaka Akira <akr@fsij.org>
-
- * Date keyword removed to avoid inclusion of locale dependent
- string. [ruby-dev:32940]
-
-Sun Jan 6 21:14:12 2008 Tanaka Akira <akr@fsij.org>
-
- * re.c (rb_reg_initialize_str): forbid raw non ASCII character
- for ASCII-8BIT regexp in non ASCII-8BIT script.
-
-Sun Jan 6 18:19:12 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/encoding.h (rb_enc_str_buf_cat): declared.
-
- * string.c (coderange_scan): extracted from rb_enc_str_coderange.
- (rb_enc_str_coderange): use coderange_scan.
- (rb_str_shared_replace): copy encoding and coderange.
- (rb_enc_str_buf_cat): new function for linear complexity string
- accumulation with encoding.
- (rb_str_sub_bang): don't conflict substituted part and replacement.
- (str_gsub): use rb_enc_str_buf_cat.
- (rb_str_clear): clear coderange.
-
- * re.c (rb_reg_regsub): use rb_enc_str_buf_cat.
-
-Sun Jan 6 17:55:44 2008 Technorama Ltd. <oss-ruby@technorama.net>
-
- * lib/securerandom.rb: Add Win32 support.
-
-Sun Jan 6 09:32:58 2008 Tadayoshi Funaba <tadf@dotrb.org>
+Sun Jan 6 09:39:02 2008 Tadayoshi Funaba <tadf@dotrb.org>
* lib/date.rb, lib/date/format.rb: introduced some constants
- (for internal use) and aliases (minute and second).
+ (for internal use).
* sample/cal.rb: trivial adjustments.
-Sun Jan 6 01:38:07 2008 Tanaka Akira <akr@fsij.org>
-
- * re.c (rb_reg_initialize_str): /\x80/n is not an error even if script
- encoding is EUC-JP.
-
-Sun Jan 6 00:48:12 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/resolv.rb (Resolv::DNS#each_address): get A record and then AAAA
- record. [ruby-dev:32925]
-
-Sat Jan 5 21:48:03 2008 Tanaka Akira <akr@fsij.org>
-
- * vm_insnhelper.c (vm_callee_setup_arg): it is not inlinable because
- alloca is used.
-
-Sat Jan 5 16:50:48 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_str_resize): copy if old data is not empty
- [ruby-core:14785]
-
-Sat Jan 5 13:04:24 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (proc_options): no need for intermediate object.
-
-Sat Jan 5 11:48:19 2008 Tanaka Akira <akr@fsij.org>
-
- * encoding.c (Init_Encoding): alias csWindows31J to Windows-31J.
- IE6 accepts csWindows31J but Windows-31J.
-
-Sat Jan 5 02:21:10 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/ruby.h (rb_intern): memorize interned ID for constant
- string, using gcc's __builtin_constant_p and statement expression.
-
-Sat Jan 5 02:14:45 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (trnext): should enable backslash escape.
-
-Sat Jan 5 01:50:32 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (Init_eval): move instance_eval and instance_exec to
- BasicObject. [ruby-core:14747]
-
- * lib/delegate.rb: should preserve new methods in BasicObject.
-
-Sat Jan 5 01:46:29 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ruby.c (proc_options): update according to the last API revert.
-
-Sat Jan 5 01:30:30 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/intern.h, re.c (rb_reg_new): keep interface same as
- 1.8. [ruby-core:14583]
-
- * include/ruby/intern.h, re.c (rb_reg_new_str): renamed, and defines
- HAVE_RB_REG_NEW_STR macro to tell if it is available.
-
- * include/ruby/encoding.h (rb_enc_reg_new): added.
-
- * insns.def (toregexp), marshal.c (r_object0): use rb_reg_new_str().
-
- * re.c (rb_reg_regcomp, rb_reg_s_union): ditto.
-
Fri Jan 4 23:08:48 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* time.c (time_arg): use converted object. [ruby-core:14759]
-Fri Jan 4 16:24:58 2008 Tanaka Akira <akr@fsij.org>
-
- * ext/digest/lib/digest/hmac.rb (Digest::HMAC#initialize): use
- String#bytesize to avoid test errors on EUC-JP environment.
-
-Fri Jan 4 14:00:50 2008 Tanaka Akira <akr@fsij.org>
-
- * re.c (rb_reg_prepare_re): check string encoding. Oniguruma doesn't
- support invalid encoding.
-
-Fri Jan 4 10:22:25 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * re.c (rb_reg_search): avoid inner loop for reverse search.
-
- * regexec.c: unset USE_MATCH_RANGE_MUST_BE_INSIDE_OF_SPECIFIED_RANGE
- which is turned on since oniguruma 5.9.1.
-
-Fri Jan 4 02:53:31 2008 Tanaka Akira <akr@fsij.org>
-
- * enc/euc_jp.c: remove eucjp_ prefix. breakpoint can be specified as
- euc_jp.c:mbc_enc_len. avoid needless conflict by merge.
-
- * enc/sjis.c: remove sjis_ prefix.
-
- * enc/utf8.c: remove utf8_ prefix.
-
- * enc/iso_8859_1.c: remove iso_8859_1_ prefix.
-
- * enc/iso_8859_2.c: remove iso_8859_2_ prefix.
-
- * enc/iso_8859_3.c: remove iso_8859_3_ prefix.
-
- * enc/iso_8859_4.c: remove iso_8859_4_ prefix.
-
- * enc/iso_8859_5.c: remove iso_8859_5_ prefix.
-
- * enc/iso_8859_6.c: remove iso_8859_6_ prefix.
-
- * enc/iso_8859_7.c: remove iso_8859_7_ prefix.
-
- * enc/iso_8859_8.c: remove iso_8859_8_ prefix.
-
- * enc/iso_8859_9.c: remove iso_8859_9_ prefix.
-
- * enc/iso_8859_10.c: remove iso_8859_10_ prefix.
-
- * enc/iso_8859_11.c: remove iso_8859_11_ prefix.
-
- * enc/iso_8859_13.c: remove iso_8859_13_ prefix.
-
- * enc/iso_8859_14.c: remove iso_8859_14_ prefix.
-
- * enc/iso_8859_15.c: remove iso_8859_15_ prefix.
-
- * enc/iso_8859_16.c: remove iso_8859_16_ prefix.
-
-Fri Jan 4 02:47:06 2008 Tanaka Akira <akr@fsij.org>
-
- * re.c (rb_reg_search): iterate onig_match for reverse mode.
-
Fri Jan 4 01:20:21 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* win32.h: only VC6 needs extern "C++" for math.h. [ruby-talk:285660]
-Fri Jan 4 00:54:43 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * include/ruby/oniguruma.h: Oniguruma 5.9.1 merged.
-
-Fri Jan 4 00:20:47 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (io_ungetc): move data in buffer if it is required to store the
- argument.
-
-Thu Jan 3 21:56:07 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/ruby.h (st_strcasecmp): declared for STRCASECMP.
- (st_strncasecmp): declared for STRNCASECMP.
-
-Thu Jan 3 20:24:48 2008 Koichi Sasada <ko1@atdot.net>
-
- * eval_jump.c (rb_f_catch): Restore cfp if caught thrown object.
-
-Thu Jan 3 19:45:57 2008 Koichi Sasada <ko1@atdot.net>
-
- * bootstraptest/test_eval.rb, test_knownbug.rb: move a fixed test.
-
-Thu Jan 3 18:39:12 2008 Tanaka Akira <akr@fsij.org>
-
- * encoding.c: (rb_tolower, rb_toupper): body was exchanged.
-
-Thu Jan 3 17:54:01 2008 Tanaka Akira <akr@fsij.org>
-
- * regenc.h (onigenc_ascii_is_code_ctype): put back.
-
-Thu Jan 3 17:33:09 2008 Tanaka Akira <akr@fsij.org>
-
- * encoding.c (rb_isalnum): defined.
- (rb_isalpha): ditto.
- (rb_isblank): ditto.
- (rb_iscntrl): ditto.
- (rb_isdigit): ditto.
- (rb_isgraph): ditto.
- (rb_islower): ditto.
- (rb_isprint): ditto.
- (rb_ispunct): ditto.
- (rb_isspace): ditto.
- (rb_isupper): ditto.
- (rb_isxdigit): ditto.
- (rb_tolower): ditto.
- (rb_toupper): ditto.
-
- * include/ruby/ruby.h: don't include include/ruby/encoding.h.
- (rb_isascii): defined.
- (rb_isalnum): declared.
- (rb_isalpha): ditto.
- (rb_isblank): ditto.
- (rb_iscntrl): ditto.
- (rb_isdigit): ditto.
- (rb_isgraph): ditto.
- (rb_islower): ditto.
- (rb_isprint): ditto.
- (rb_ispunct): ditto.
- (rb_isspace): ditto.
- (rb_isupper): ditto.
- (rb_isxdigit): ditto.
- (rb_tolower): ditto.
- (rb_toupper): ditto.
- (ISASCII): simplified.
- (ISPRINT): ditto.
- (ISSPACE): ditto.
- (ISUPPER): ditto.
- (ISLOWER): ditto.
- (ISALNUM): ditto.
- (ISALPHA): ditto.
- (ISDIGIT): ditto.
- (ISXDIGIT): ditto.
- (TOUPPER): ditto.
- (TOLOWER): ditto.
-
- * include/ruby/encoding.h (rb_isascii): removed.
- (rb_isalnum): ditto.
- (rb_isalpha): ditto.
- (rb_isblank): ditto.
- (rb_iscntrl): ditto.
- (rb_isdigit): ditto.
- (rb_isgraph): ditto.
- (rb_islower): ditto.
- (rb_isprint): ditto.
- (rb_ispunct): ditto.
- (rb_isspace): ditto.
- (rb_isupper): ditto.
- (rb_isxdigit): ditto.
- (rb_tolower): ditto.
- (rb_toupper): ditto.
-
- * common.mk: dependency updated.
-
-Thu Jan 3 15:10:26 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/encoding.h (rb_isascii): simplified.
- (rb_isalnum): call onigenc_ascii_is_code_ctype without indirect call.
- (rb_isalpha): ditto.
- (rb_isblank): ditto.
- (rb_iscntrl): ditto.
- (rb_isdigit): ditto.
- (rb_isgraph): ditto.
- (rb_islower): ditto.
- (rb_isprint): ditto.
- (rb_ispunct): ditto.
- (rb_isspace): ditto.
- (rb_isupper): ditto.
- (rb_isxdigit): ditto.
-
- * include/ruby/oniguruma.h (onigenc_ascii_is_code_ctype): declaration
- moved from regenc.h.
-
-Thu Jan 3 14:37:17 2008 Tanaka Akira <akr@fsij.org>
-
- * parse.y (parser_magic_comment): use STRNCASECMP.
- (set_file_encoding): ditto.
-
-Thu Jan 3 11:44:37 2008 Tanaka Akira <akr@fsij.org>
-
- * time.c: don't mention an obsolete library, ParseDate.
-
Thu Jan 3 11:28:58 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (fptr_finalize): clear errno first. [ruby-talk:284492]
-Thu Jan 3 05:02:36 2008 Tanaka Akira <akr@fsij.org>
-
- * enc/us_ascii.c: add us_ascii_ prefix for functions to ease
- setting breakpoint when debugging.
-
- * enc/euc_jp.c: add eucjp_ prefix.
-
- * enc/sjis.c: add sjis_ prefix.
-
- * enc/iso_8859_1.c: add iso_8859_1_ prefix.
-
- * enc/iso_8859_2.c: add iso_8859_2_ prefix.
-
- * enc/iso_8859_3.c: add iso_8859_3_ prefix.
-
- * enc/iso_8859_4.c: add iso_8859_4_ prefix.
-
- * enc/iso_8859_5.c: add iso_8859_5_ prefix.
-
- * enc/iso_8859_6.c: add iso_8859_6_ prefix.
-
- * enc/iso_8859_7.c: add iso_8859_7_ prefix.
-
-Thu Jan 3 02:44:34 2008 Tanaka Akira <akr@fsij.org>
-
- * bignum.c (conv_digit): use ISDIGIT, ISLOWER and ISUPPER.
-
-Wed Jan 2 23:50:15 2008 Tanaka Akira <akr@fsij.org>
-
- * util.c (ruby_strtoul): "0x", "+" and "-" is not a valid integer.
- end of integer should be just after "0", the beginning, the
- beginning respectively.
-
-Wed Jan 2 15:23:15 2008 Tanaka Akira <akr@fsij.org>
-
- * util.c (ruby_strtoul): locale independent strtoul is implemented to
- avoid "i".to_i(36) cause 0 under tr_TR locale on Debian GNU/Linux
- 4.0 (Etch).
- This is newly implemented, not a copy of missing/strtoul.c.
-
- * include/ruby/ruby.h (ruby_strtoul): declared.
- (STRTOUL): defined to use ruby_strtoul.
-
- * bignum.c, pack.c, ext/socket/socket.c: use STRTOUL.
-
- * configure.in (strtoul): don't check.
-
- * missing/strtoul.c: removed.
-
- * include/ruby/missing.h (strtoul): removed.
-
- * common.mk (strtoul.o): removed.
-
- * LEGAL (missing/strtoul.c): removed.
-
-Wed Jan 2 14:41:08 2008 Tanaka Akira <akr@fsij.org>
-
- * common.mk (strcasecmp.o): removed.
- (strncasecmp.o): removed.
-
- * include/ruby/missing.h (strcasecmp): removed.
- (strncasecmp): removed.
-
-Wed Jan 2 11:34:57 2008 Tanaka Akira <akr@fsij.org>
-
- * missing/strcasecmp.c: removed. Ruby don't use locale dependent
- strcasecmp.
-
- * missing/strncasecmp.c: ditto.
-
- * configure.in: don't check strcasecmp and strncasecmp.
-
- * LEGAL: missing/strcasecmp.c and missing/strncasecmp.c removed.
-
-Wed Jan 2 10:13:54 2008 Tadayoshi Funaba <tadf@dotrb.org>
+Wed Jan 2 10:18:56 2008 Tadayoshi Funaba <tadf@dotrb.org>
* sample/time.rb: use Process.times instead of Time.times.
-Wed Jan 2 09:09:53 2008 Tadayoshi Funaba <tadf@dotrb.org>
+Wed Jan 2 09:18:11 2008 Tadayoshi Funaba <tadf@dotrb.org>
* sample/goodfriday.rb: examples for date are enough. retired.
-Wed Jan 2 08:58:54 2008 Tadayoshi Funaba <tadf@dotrb.org>
+Wed Jan 2 09:06:55 2008 Tadayoshi Funaba <tadf@dotrb.org>
* sample/cal.rb: just updated with the newest version.
-Wed Jan 2 01:19:31 2008 Tanaka Akira <akr@fsij.org>
-
- * enc/depend: dependency updated.
-
-Wed Jan 2 00:14:41 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/nkf/nkf-utf8/{nkf.c, utf8tbl.c}: Update nkf.
-
- * ext/nkf/nkf.c: fix documents.
-
- * ext/nkf/lib/kconv.rb: fix documents.
- (Kconv.is*): use valid_encoding?.
- (Kconv.isjis): defined.
-
-Tue Jan 1 23:17:03 2008 Tanaka Akira <akr@fsij.org>
-
- * common.mk: dependency updated.
-
-Tue Jan 1 21:11:33 2008 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/encoding.h (rb_isascii): defined.
- (rb_isalnum): ditto.
- (rb_isalpha): ditto.
- (rb_isblank): ditto.
- (rb_iscntrl): ditto.
- (rb_isdigit): ditto.
- (rb_isgraph): ditto.
- (rb_islower): ditto.
- (rb_isprint): ditto.
- (rb_ispunct): ditto.
- (rb_isspace): ditto.
- (rb_isupper): ditto.
- (rb_isxdigit): ditto.
- (rb_tolower): ditto.
- (rb_toupper): ditto.
-
- * include/ruby/st.h (st_strcasecmp): declared.
- (st_strncasecmp): ditto.
-
- * st.c (type_strcasehash): use st_strcasecmp instead of strcasecmp.
- (st_strcasecmp): defined.
- (st_strncasecmp): ditto.
-
- * include/ruby/ruby.h: include include/ruby/encoding.h.
- (ISASCII): use rb_isascii.
- (ISPRINT): use rb_isprint.
- (ISSPACE): use rb_isspace.
- (ISUPPER): use rb_isupper.
- (ISLOWER): use rb_islower.
- (ISALNUM): use rb_isalnum.
- (ISALPHA): use rb_isalpha.
- (ISDIGIT): use rb_isdigit.
- (ISXDIGIT): use rb_isxdigit.
- (TOUPPER): defined.
- (TOLOWER): ditto.
- (STRCASECMP): ditto.
- (STRNCASECMP): ditto.
-
- * dir.c, encoding.c, file.c, hash.c, process.c, ruby.c, time.c,
- transcode.c, ext/readline/readline.c: use locale insensitive
- functions. [ruby-core:14662]
-
-Tue Jan 1 17:50:47 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (rb_io_mode_enc): encoding spec is not allowed in binary mode.
- [ruby-dev:32913]
-
-Tue Jan 1 14:41:56 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/rexml: 1.9 patch from Sam Ruby mentioned in his blog:
- <http://intertwingly.net/blog/2007/12/31/Porting-REXML-to-Ruby-1-9>
- [ruby-core:14639]
-
-Tue Jan 1 14:15:04 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_substr): offset movement bug. a patch from
- Vincent Isambart <vincent.isambart at gmail.com> in
- [ruby-core:14647]. [ruby-core:14644]
-
-Tue Jan 1 01:29:04 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * encoding.c (rb_to_encoding): raises for non-nil, non-encoding,
- non-string object. [ruby-core:14634]
-
-Tue Jan 1 01:04:06 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (process_options): rejects dummy encoding.
-
-Mon Dec 31 23:53:55 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (proc_options, process_options): delays finding encoding
- until load_path is set.
-
-Mon Dec 31 23:27:17 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_str_resize): embeds if ptr is null. [ruby-dev:32819]
-
-Mon Dec 31 23:17:22 2007 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/webrick/httpproxy.rb (WEBrick::HTTPProxyServer#proxy_service):
- call do_XXX which correspond with request method.
- (WEBrick::HTTPProxyServer#do_CONNECT,do_GET,do_POST,do_HEAD): added.
-
- * test/webrick/test_httpproxy.rb: add test for WEBrick::HTTPProxyServer.
-
-Mon Dec 31 22:53:29 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * thread_pthread.c (native_sleep): timespec tv_sec may overflow on
- some platform. a patch from zunda <zunda616e AT yahoo.co.jp> in
- [ruby-dev:32904].
-
-Mon Dec 31 19:35:20 2007 Tanaka Akira <akr@fsij.org>
-
- * string.c (IS_7BIT): removed.
- (single_byte_optimizable): new function to test optimizationability
- using single byte string.
- (str_strlen): use single_byte_optimizable instead of
- is_ascii_string.
- (str_nth): rename argument: asc -> singlebyte.
- (str_offset): ditto.
- (rb_str_substr): use single_byte_optimizable instead of IS_7BIT.
- (rb_str_index): ditto.
- (rb_str_rindex): ditto.
- (rb_str_splice): ditto.
- (rb_str_justify): ditto.
-
-Mon Dec 31 07:39:31 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * main.c, goruby.c (RUBY_MAIN_INIT): removed.
-
- * goruby.c (goruby_run_node): run after ruby_init_loadpath() so that
- require works, and protect the call.
-
Mon Dec 31 06:50:38 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * common.mk: not use -I$(srcdir)/lib with $(MINIRUBY) for cross
+ * trunk/common.mk: not use -I$(srcdir)/lib with $(MINIRUBY) for cross
compiling.
* configure.in, {win,bcc}32/Makefile.sub (MINIRUBY): -I$(srcdir)/lib
moved.
-Mon Dec 31 06:08:34 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/encoding.h (rb_enc_sprintf, rb_enc_vsprintf): prototyped.
-
- * sprintf.c (rb_enc_sprintf, rb_enc_vsprintf): new functions to format
- arguments with encoding.
-
-Sun Dec 30 23:48:00 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * golf_prelude.rb (String#/): define / as split, as association of
- Array#*.
-
-Sun Dec 30 23:19:06 2007 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * golf_prelude.rb (@@golf_hash): for performance improvement.
-
-Sun Dec 30 22:44:50 2007 Tadayoshi Funaba <tadf@dotrb.org>
+Sun Dec 30 22:48:37 2007 Tadayoshi Funaba <tadf@dotrb.org>
* lib/date.rb (_valid_time?): I'm not sure to recommend such an
expression. but anyway it is acceptable now. [ruby-core:14580]
-Sun Dec 30 21:54:26 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (program, yycompile0): too early to drop lex_lastline in
- rules.
-
-Sun Dec 30 19:23:23 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * bootstraptest/test_knownbug.rb: support DOSISH.
-
-Sun Dec 30 17:43:54 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * encoding.c (Init_Encoding): registered rb_encoding differs from
- ONIG_ENCODINGs.
-
-Sun Dec 30 13:56:15 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (program): clear input strings after all process.
-
- * parse.y (parser_nextc, parser_yylex): should not drop lex_lastline
- while lex_p is valid. [ruby-dev:32896]
-
-Sun Dec 30 10:54:49 2007 NARUSE, Yui <naruse@ruby-lang.org>
-
- * configure.in: rm largefile.h.
-
- * common.mk: clean golf, conf*, preludes, and so on.
-
- * enc/depend: silent and ignore error for rm.
-
- * enc/Makefile.in: should define prefix and exec_prefix.
-
-Sun Dec 30 06:31:11 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * encoding.c (Init_encoding): register Windows-31J and its alias.
- [ruby-dev:32843]
-
- * ruby.c (proc_options): -Ks options means Windows-31J, not Shift_JIS.
-
-Sun Dec 30 06:27:38 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * lib/mkmf.rb (depend_rules): need to convert `/' to `\' for windows
- native commands.
-
-Sun Dec 30 01:43:56 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * enc/Makefile.in (DLDFLAGS): like as extensions. [ruby-core:14567]
-
-Sat Dec 29 23:48:13 2007 Tanaka Akira <akr@fsij.org>
-
- * io.c (io_fflush): don't retry when wbuf modified by other threads.
-
-Sat Dec 29 22:44:30 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * re.c (rb_reg_regsub): returns the given string itself if nothing
- changed.
-
- * string.c (rb_str_sub_bang): keeps code-range as possible.
-
- * string.c (str_gsub): adjusts code-range. [ruby-core:14566]
-
-Sat Dec 29 21:54:37 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (clean, distclean, realclean): should include clean-enc
- and others. [ruby-dev:32887]
-
-Sat Dec 29 13:29:29 2007 Tanaka Akira <akr@fsij.org>
-
- * bootstraptest/test_knownbug.rb: add a test reported by
- Kazuhiro NISHIYAMA. [ruby-dev:32819].
- add a test reported by Frederick Cheung. [ruby-core:14556].
-
- * test/ruby/test_m17n.rb (test_gsub): add a test reported by
- Sam Ruby. [ruby-core:14566]
-
-Sat Dec 29 04:46:58 2007 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/test/unit/assertions.rb (Test::Unit::Assertions#assert_throws):
- throw won't raise NameError nor ThreadError but ArgumentError on 1.9.
- (Test::Unit::Assertions#assert_not_throws): ditto.
-
- * test/testunit/test_assertions.rb: add assertions for throwing some
- objects other than Symbol.
-
-Sat Dec 29 03:10:12 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * io.c (io_unread): fix typo.
-
-Sat Dec 29 02:18:45 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * io.c (io_unread): adhoc workaround for non-binary mode of some DOSish
- platforms. this is not perfect and safety, but works with most cases.
-
-Fri Dec 28 23:53:18 2007 Tanaka Akira <akr@fsij.org>
-
- * ext/strscan/strscan.c (str_new): new function for allocate an string
- with encoding propagation.
- (extract_range): use str_new.
- (extract_beg_len): ditto.
- (strscan_peek): ditto.
- (strscan_rest): ditto.
-
-Fri Dec 28 20:18:42 2007 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * golf_prelude.rb (Object.say): derived from Perl 5.10.
-
-Fri Dec 28 19:39:34 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * encoding.c (rb_locale_encoding): should check return value from
- rb_locale_charmap().
-
- * ruby.c (locale_encoding): removed.
-
- * ruby.c (process_options): use rb_locale_encoding() instead of
- locale_encoding().
-
- * ext/readline/readline.c (readline_readline): use locale encoding
- instead of input IO's encoding. [ruby-dev:32872]
-
-Fri Dec 28 19:29:07 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/readline/readline.c (readline_readline, readline_s_set_input):
- use mReadline directly because self is not always same.
-
-Fri Dec 28 19:11:28 2007 Tanaka Akira <akr@fsij.org>
-
- * encoding.c (rb_locale_encoding): defined.
-
- * include/ruby/encoding.h (rb_locale_encoding): declared.
-
-Fri Dec 28 18:45:29 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/readline/readline.c (readline_readline): set encoding to result.
-
- * ext/readline/readline.c (readline_s_set_input, Init_readline): save
- input IO to hidden instance variable.
-
-Fri Dec 28 01:55:04 2007 Martin Duerst <duerst@it.aoyama.ac.jp>
-
- * transcode.c (transcode_dispatch): reverted some of the changes
- in r14746.
-
- * transcode.c, enc/trans/single_byte.c: Added conversions to/from
- US-ASCII and ASCII-8BIT (using data tables).
-
- * enc/trans/single_byte.c: Some spacing/ordering changes due to
- automatic data file generation.
-
- * transcode_data.h, transcode.c: Preliminary code for using
- micro-conversion functions.
-
- * test/ruby/test_transcode.rb: Added some tests for US-ASCII and
- ASCII-8BIT conversions.
-
-Fri Dec 28 17:33:44 2007 Tanaka Akira <akr@fsij.org>
-
- * time.c (make_time_t): verify mktime and timegm result.
-
Fri Dec 28 16:36:33 2007 NARUSE, Yui <naruse@airemix.com>
- * lib/resolv.rb (Resolv::DNS#each_address): now returns IPv6 address.
-
-Fri Dec 28 16:10:00 2007 Eric Hodel <drbrain@segment7.net>
+ * lib/resolv.rb (Resolv::DNS#each_address): now returns IPv6 address.
- * lib/rdoc/dot/dot.rb: Move to lib/rdoc/dot.rb. Fix namespacing.
+Fri Dec 28 13:21:32 2007 Kouhei Sutou <kou@cozmixng.org>
- * lib/rdoc/diagram.rb: Update for 1.9.
-
-Fri Dec 28 15:38:29 2007 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc/markup/sample/: Move to sample/rdoc/markup directory.
-
-Fri Dec 28 15:15:12 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/irb/completion.rb: Remove garbage ("X=1").
-
-Fri Dec 28 15:12:05 2007 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc, test/rdoc: Move RDoc tests out of lib/.
-
-Fri Dec 28 15:10:47 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * encoding.c (set_base_encoding, enc_base_encoding): renamed
- based_encoding as base_encoding.
-
-Fri Dec 28 13:57:49 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * golf_prelude.rb (Integer#each): use alias simply.
-
-Fri Dec 28 13:45:21 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * golf_prelude.rb (Object.const_missing): No need to delegate to
- superclass. Just raise a NameError when none matches.
-
-Fri Dec 28 13:18:47 2007 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/rss.rb, test/rss/test_version.rb: 0.2.2 -> 0.2.3.
+ * lib/rss/rss.rb, test/rss/test_version.rb, NEWS: 0.2.2 -> 0.2.3.
* lib/rss/parser.rb, test/rss/test_parser.rb: supported "-" in tag name.
Reported by Ray Chen. Thanks.
-Fri Dec 28 13:07:31 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * gc.c (os_obj_of): returns an enumerator if no block given. based on
- a patch from Yugui <yugui AT yugui.sakura.ne.jp>. [ruby-dev:32828]
-
-Fri Dec 28 11:46:04 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * tool/ytab.sed: skip yydestruct hack unless yymsg exists, for bison
- 1.8 series. [ruby-dev:32825]
-
-Fri Dec 28 11:39:02 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * golf_prelude.rb (Object.quine): need to join because SCRIPT_LINES__[]
- returns an array of lines.
-
-Fri Dec 28 11:16:53 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * golf_prelude.rb (Object.quine): get the script itself.
-
-Fri Dec 28 10:06:54 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * golf_prelude.rb (Object.const_missing): Auto-complete constants.
-
-Fri Dec 28 01:55:04 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * transcode.c (transcode_dispatch): allows transcoding from/to
- ASCII-8BIT.
-
-Fri Dec 28 01:47:25 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * golf_prelude.rb (Integer): Integer is now enumerable on goruby.
-
-Fri Dec 28 01:27:47 2007 Tanaka Akira <akr@fsij.org>
-
- * lib/rdoc/rdoc.rb (parse_files): don't depend on the default external
- encoding.
-
-Fri Dec 28 00:01:57 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * common.mk (golf_prelude.c): use MINIRUBY instead of BASERUBY because
- tool/compile_prelude.rb requires rbconfig.rb.
-
Thu Dec 27 23:56:01 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* mkconfig.rb: should not use the libraries under the source directory
at cross compiling.
-Thu Dec 27 23:43:35 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * cygwin/GNUmakefile.in (EXTOBJS): uses ruby.rc always for other than
- rubyw.exe.
-
-Thu Dec 27 22:31:37 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * lib/rubygems/commands/update_command.rb (do_rubygems_update): use
- portable and safely ENV operation. reported in
- <http://slashdot.jp/developers/comments.pl?sid=384937&cid=1273085>.
-
-Thu Dec 27 21:47:04 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * mkconfig.rb (prefix): archdir is "1.9.0", not "1.9". reported in
- <http://slashdot.jp/developers/comments.pl?sid=384937&cid=1273085>.
-
-Thu Dec 27 17:57:30 2007 Tanaka Akira <akr@fsij.org>
-
- * parse.y, transcode_data.h, transcode.c, lib/weakref.rb,
- lib/irb/ruby-lex.rb, lib/irb/lc/error.rb, enc/trans/japanese.c:
- change "illegal" to "invalid" in a context which doesn't against
- a law.
-
-Thu Dec 27 16:37:06 2007 Tanaka Akira <akr@fsij.org>
-
- * re.c (rb_reg_s_union): show encodings in error message.
-
-Thu Dec 27 15:25:16 2007 Tanaka Akira <akr@fsij.org>
-
- * encoding.c (rb_enc_codelen): show codepoint in error message.
+Thu Dec 27 11:02:45 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * include/ruby/encoding.h (rb_enc_codelen): comment it returns
- positive integer.
+ * intern.h, string.c (rb_str_set_len): added for upgrading path from
+ 1.8 to 1.9. [ruby-dev:32807]
- * string.c (rb_str_concat): rb_enc_codelen doesn't return 0.
+ * string.c (rb_str_lines, rb_str_bytes): ditto.
-Thu Dec 27 15:18:44 2007 Tanaka Akira <akr@fsij.org>
+Thu Dec 27 10:47:32 2007 Technorama Ltd. <oss-ruby@technorama.net>
- * encoding.c (rb_enc_codelen): error message refined.
-
-Thu Dec 27 15:11:27 2007 Tanaka Akira <akr@fsij.org>
-
- * encoding.c (rb_enc_check): show encodings in error message.
-
-Thu Dec 27 15:02:52 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_str_casecmp): fixed using a wrong variable.
- [ruby-list:44402]
-
-Thu Dec 27 14:34:38 2007 Tanaka Akira <akr@fsij.org>
-
- * io.c (io_fflush): checks wbuf modification by other threads.
- not perfect. it need locks.
-
-Thu Dec 27 10:44:03 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/socket/socket.c: a patch to support IRIX from Andrew
- Thompson <andrew@hijacked.us> in [ruby-core:14447].
-
-Thu Dec 27 02:25:45 2007 NAKAMURA Usaku <usa@ruby-lang.org>
+ * ext/openssl/ossl_ssl.c: Only show a warning if the default
+ DH callback is actually used.
- * lib/mkmf.rb (create_tmpsrc): retry to create file if Errno::EACCES
- occurs. this is a workaround for mswin32.
+ * ext/openssl/ossl_rand.c: New method: random_add().
-Wed Dec 26 22:47:31 2007 NARUSE, Yui <naruse@ruby-lang.org>
+Wed Dec 26 22:27:45 2007 NARUSE, Yui <naruse@ruby-lang.org>
* lib/resolv.rb (Resolv::DNS::Name.==): fix for other is array of
Resolv::DNS::Label::Str.
@@ -31828,2259 +2322,58 @@ Wed Dec 26 22:47:31 2007 NARUSE, Yui <naruse@ruby-lang.org>
is not defined, so replace to_s.
* lib/resolv.rb (Resolv::IPv6#to_name): ip6.int is obsoleted by
- ip6.arpa.
-
-Wed Dec 26 21:27:02 2007 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date/format.rb (_xmlschema): some improvements.
-
- * lib/date/format.rb (_parse): a new hint compfunc. [experimental]
-
-Wed Dec 26 17:31:08 2007 Tanaka Akira <akr@fsij.org>
-
- * io.c (io_fflush): check closed fptr after rb_write_internal to avoid
- SEGV on MacOS X.
-
-Wed Dec 26 16:10:17 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (Init_String): defines chars method.
-
-Wed Dec 26 14:38:43 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * instruby.rb: install goruby if exists.
+ int.arpa.
-Wed Dec 26 13:55:02 2007 James Edward Gray II <jeg2@ruby-lang.org>
+Mon Dec 24 16:18:57 2007 Eric Hodel <drbrain@segment7.net>
- * lib/csv.rb: Cleaned up some code with Ruby 1.9 idioms.
+ * lib/rdoc/ri/ri_options.rb: Fix ri --help listing of gem ri paths.
+ Merge of r14567 and r14569 from trunk.
-Wed Dec 26 13:29:35 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * array.c (tmpbuf): use rb_str_tmp_new().
-
-Wed Dec 26 00:57:53 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/json/ext/generator/generator.c (Init_generator): requires
- json/common.rb for GeneratorError, when static linked. a patch from
- Kenta Murata <muraken AT gmail.com> in [ruby-dev:32789].
-
-Tue Dec 25 23:33:55 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * development version 1.9.0 released.
-
-Tue Dec 25 23:25:29 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/rexml/node.rb (REXML::Node::indent): should initialize rv
- variable. a patch from Tadayoshi Funaba <tadf AT dotrb.org> in
- [ruby-dev:32783].
-
-Tue Dec 25 23:16:01 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (proc_options): encoding option in shebang and RUBYOPT did not
- work, do not store alloca()ed string in a parent scope struct.
-
-Tue Dec 25 22:56:52 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/Makefile.sub (config.status): keep this file.
-
-Tue Dec 25 22:55:42 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (TIMEZONE_VOID): typo.
-
-Tue Dec 25 22:45:10 2007 Koichi Sasada <ko1@atdot.net>
-
- * insns2vm.rb: add encoding option to shebang.
-
-Tue Dec 25 22:13:51 2007 Koichi Sasada <ko1@atdot.net>
-
- * bootstraptest/pending.rb: add pending issue.
-
-Tue Dec 25 22:12:40 2007 Koichi Sasada <ko1@atdot.net>
-
- * thread.c: remove Thread.critical(=).
-
-Tue Dec 25 21:44:50 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * tool/make-snapshot: add version number.
-
-Tue Dec 25 21:32:54 2007 Koichi Sasada <ko1@atdot.net>
-
- * compile.c (iseq_compile_each): fix stack consistency error
- (break is compiled to throw instead of jump insn).
- these problems are reported by Yusuke ENDOH <mame AT tsg.ne.jp>
-
- * bootstraptest/test_knownbug.rb, test_syntax.rb: move fixed test.
-
-Tue Dec 25 21:32:44 2007 Tanaka Akira <akr@fsij.org>
-
- * parse.y (struct parser_params): make parser_ruby_sourcefile common
- field. it is used by node_newnode.
- new field parser_ruby_sourcefile_string for ripper.
- (parser_initialize): initialize parser_ruby_sourcefile in ripper.
- (ripper_initialize): initialize parser_ruby_sourcefile_string.
-
-Tue Dec 25 21:26:09 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (parse.c): depends on tool/ytab.sed.
-
- * tool/ytab.sed: hack for bison 2.1.
-
-Tue Dec 25 20:24:58 2007 Technorama Ltd. <oss-ruby@technorama.net>
-
- * ext/openssl/ossl_ssl.c: Only show a warning if the default
- DH callback is actually used.
-
- * ext/openssl/ossl_rand.c: New method: random_add().
-
-Tue Dec 25 20:24:48 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * tool/make-snapshot: argument check, and cleanup exported directory.
-
-Tue Dec 25 20:07:13 2007 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * tool/make-snapshot: more portable.
-
-Tue Dec 25 19:01:04 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * encoding.h (rb_enc_mbc_to_codepoint): wrapper for
- ONIGENC_MBC_TO_CODE().
-
- * string.c (rb_str_succ): deal with invalid sequence as binary.
-
-Tue Dec 25 18:40:46 2007 Koichi Sasada <ko1@atdot.net>
-
- * iseq.c: all methods need $SAFE < 1.
-
- vm.c: comment out debug functions.
-
-Tue Dec 25 18:37:42 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (appendline): move RS comparison to rb_io_getline_1().
-
-Tue Dec 25 18:27:51 2007 Tanaka Akira <akr@fsij.org>
-
- * string.c (rb_str_each_line): don't call rb_enc_codepoint with empty
- string.
-
-Tue Dec 25 18:06:04 2007 Tanaka Akira <akr@fsij.org>
-
- * string.c (rb_str_inspect): don't call rb_enc_codepoint with empty
- string. fix '#'.inspect.
-
- * encoding.c (rb_enc_codepoint): raise on empty string.
-
-Tue Dec 25 17:48:28 2007 Shugo Maeda <shugo@ruby-lang.org>
-
- * vm.c (rb_frame_method_id_and_class): new function to get the
- method id and class of the current frame.
-
-Tue Dec 25 17:32:04 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/mkmf.rb (create_makefile): Add a missing dependency on the
- target directory for each .rb file. This will hopefully fix
- parallel make (-jN). Tested on FreeBSD.
-
-Tue Dec 25 16:51:07 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * enc/trans/japanese.c (rb_{from,to}_{SHIFT_JIS,EUC_JP}): inversed
- from_encoding and to_encoding.
-
-Tue Dec 25 16:41:57 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * golf_prelude.rb (h): add new method for all golfers.
-
-Tue Dec 25 16:37:12 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * enc/trans/japanese.c (rb_to_EUC_JP): fixed typo.
-
-Tue Dec 25 16:34:58 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/dl/depend: add dependencies. [ruby-dev:32760]
-
-Tue Dec 25 16:26:48 2007 Koichi Sasada <ko1@atdot.net>
-
- * include/ruby/ruby.h, thread.c: rename is_ruby_native_thread() to
- ruby_native_thread_p().
-
- * ext/tk/tcltklib.c: apply it.
-
-Tue Dec 25 16:15:15 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (clean-enc): clean encoding objects.
-
-Tue Dec 25 16:04:28 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk, goruby.c, golf_prelude.rb: for golfers.
-
- * main.c (main): hook for embedding applications.
-
- * tool/compile_prelude.rb: can change initialize function name.
-
-Tue Dec 25 15:59:51 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * encoding.c (rb_enc_register): do not use based_encoding to check if
- dummy encoding.
-
-Tue Dec 25 15:55:14 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_str_succ): fix for string with non-alphanumeric chars.
-
-Tue Dec 25 15:42:49 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_io_external_encoding): should return nil for
- pass-through write IO. [ruby-dev:32740]
-
-Tue Dec 25 15:24:57 2007 Tanaka Akira <akr@fsij.org>
-
- * io.c (appendline): initialize rslen to 1 if rsptr is 0.
- rslen is the length of the delimiter.
- if only delim is given, it should be 1.
- [ruby-dev:32746]
-
-Tue Dec 25 15:21:33 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * transcode.c (transcode_dispatch): fix for multistep transcode.
-
-Tue Dec 25 15:07:51 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * enc/trans/single_byte.c (Init_single_byte): renamed.
-
-Tue Dec 25 15:00:33 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enum.c (enum_yield): when multiple values yielded from #each
- pack them into an array. [ruby-dev:32708]
-
- * enum.c: all method but all?, any?, one? and none? passed packed
- multiple values to the block.
-
- * enum.c (collect_all): should pack all values. [ruby-core:14410]
-
-Tue Dec 25 14:57:00 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (COMMONOBJS): transcode_data_*.c moved under enc/trans.
-
- * transcode_data.h (rb_transcoding, rb_transcoder): prefixed.
-
- * transcode.c (rb_register_transcoder, rb_declare_transcoder): split
- declaration and registration. [ruby-dev:32704]
-
- * transcode.c (transcode_dispatch): autoload pre-declared transcoder.
-
- * transcode.c (str_transcode): use rb_define_dummy_encoding().
-
- * transcode.c (Init_transcode): initialize transcoder tables.
-
- * enc/trans/single_byte.c, enc/trans/japanese.c: moved from top.
-
-Tue Dec 25 14:20:13 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/mkmf.rb (map_dir): should generate path including $top_srcdir.
-
-Tue Dec 25 14:09:16 2007 James Edward Gray II <jeg2@ruby-lang.org>
-
- * lib/csv.rb: Fixed test failures caused by changes to Ruby.
-
- * test/csv/tc_serialization, test/csv/tc_csv_parsing, test/csv/tc_features:
- Fixed test failures caused by changes to Ruby.
-
-Tue Dec 25 14:11:57 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (io_encoding_set): missing return type.
-
-Tue Dec 25 14:03:48 2007 NARUSE, Yui <naruse@ruby-lang.org>
-
- * test/rinda/test_rinda.rb (MockClock#{_forward, forward, sleep}):
- Change default value of n as @reso from nil. If default value is
- nil, n.+ is not defined.
-
-Tue Dec 25 13:54:01 2007 Tanaka Akira <akr@fsij.org>
-
- * test/ruby/test_io_m17n.rb (test_pipe): fixed.
- [ruby-dev:32743]
-
-Tue Dec 25 13:44:51 2007 Koichi Sasada <ko1@atdot.net>
-
- * thread.c (rb_thread_wait_fd_rw): should check EBADF on select().
-
-Tue Dec 25 13:30:03 2007 Koichi Sasada <ko1@atdot.net>
-
- * thread_pthread.c, thread_pthread.h, thread_win32.c,
- thread_win32.c: make some functions static functions.
- a patch from Tadashi Saito <shiba AT mail2.accsnet.ne.jp>
- in [ruby-core:14407]
-
-Tue Dec 25 13:23:13 2007 Tanaka Akira <akr@fsij.org>
-
- * test/ruby/test_io_m17n.rb (test_write_noenc): don't mix text and
- binary mode. [ruby-dev:32743]
-
-Tue Dec 25 13:13:09 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * README.EXT.ja, dir.c, eval.c, eval_intern.h, lex.c.src,
- lex.c.blt, keywords, load.c, thread.c: more ANSI'ize.
- a patch from Tadashi Saito <shiba AT mail2.accsnet.ne.jp>
- in [ruby-dev:32725]
-
-Tue Dec 25 13:07:56 2007 Koichi Sasada <ko1@atdot.net>
-
- * vm_core.h, thread.c, cont.c: add RUBY_VM_SET_INTERRUPT(),
- RUBY_VM_SET_TIMER_INTERRUPT(), RUBY_VM_INTERRUPTED().
-
- * thread.c, thread_pthread.c, thread_win32.c: fix to ignore time slice
- event until sleep.
-
- * bootstraptest/test_thread.rb: add a test for time limited join test.
-
-Tue Dec 25 12:42:59 2007 Koichi Sasada <ko1@atdot.net>
-
- * vm.c (Init_VM): remove unused code.
- [ruby-dev:32732]
-
-Tue Dec 25 12:32:32 2007 Martin Duerst <duerst@it.aoyama.ac.jp>
-
- * transcode.c: Moving a static counter from inside register_transcoder()
- and register_functional_transcoder() to outside the functions, renaming
- from n to next_transcoder_position. Fixes 3) in [ruby-dev:32715].
-
-Tue Dec 25 12:22:17 2007 NARUSE, Yui <naruse@ruby-lang.org>
-
- * sample/from.rb: follow Ruby 1.9 libraries.
-
-Tue Dec 25 12:21:56 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * proc.c (method_inspect): preserve encoding of the method name.
-
-Tue Dec 25 12:07:52 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (BASERUBY): delayed error until BASERUBY is used.
-
-Tue Dec 25 11:48:35 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * sample/README: removed obsoleted files: dbmtest.rb,
- getopts.test, mrshtest.rb, regx.rb.
-
-Tue Dec 25 11:45:34 2007 James Edward Gray II <jeg2@ruby-lang.org>
-
- * lib/csv.rb: Import the FasterCSV source as the new CSV class.
-
- * test/csv/*: Added all applicable tests from FasterCSV.
-
-Tue Dec 25 11:33:52 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * error.c (report_bug): uses ruby_description.
-
-Tue Dec 25 11:20:38 2007 Koichi Sasada <ko1@atdot.net>
-
- * compile.c (iseq_compile_each): fix stack consistency error.
- a patch from Yusuke ENDOH <mame AT tsg.ne.jp> [ruby-dev:32720]
-
- * bootstraptest/test_syntax.rb: add 2 tests for above.
-
-Tue Dec 25 11:14:20 2007 Koichi Sasada <ko1@atdot.net>
-
- * iseq.c, vm_core.h: comment out unused fields.
-
-Tue Dec 25 11:02:10 2007 Koichi Sasada <ko1@atdot.net>
-
- * vm.c: check frame is FINAL when creating env.
- [ruby-core:14395]
-
- * bootstraptest/test_block.rb: add a test for above.
-
-Tue Dec 25 09:12:13 2007 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc/: Enable RDoc debugging only with $DEBUG_RDOC.
-
-Tue Dec 25 08:37:43 2007 James Edward Gray II <jeg2@ruby-lang.org>
-
- * lib/csv.rb, test/csv/test_csv.rb: Removed in preparation for
- FasterCSV code import.
-
-Tue Dec 25 08:27:43 2007 Eric Hodel <drbrain@segment7.net>
-
- * lib/rubygems.rb: Fix test failures.
-
- * test/rubygems/test_gem.rb: Fix test failure.
-
-Tue Dec 25 06:23:40 2007 Koichi Sasada <ko1@atdot.net>
-
- * bootstraptest/test_knownbug.rb, test_literal.rb: move fixed test.
-
-Tue Dec 25 06:19:04 2007 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * sample/biorhythm.rb: follow Ruby 1.9 libraries.
-
-Tue Dec 25 06:15:01 2007 Koichi Sasada <ko1@atdot.net>
-
- * vm.c: add dummy toplevel frame.
-
-Tue Dec 25 05:44:56 2007 Eric Hodel <drbrain@segment7.net>
-
- * lib/net/http.rb: Fix uninitialized variable warning.
- [ruby-talk:284582]
-
- * lib/irb/output-method.rb: Remove unused #foo method.
- [ruby-talk:284582]
-
-Tue Dec 25 05:24:12 2007 Koichi Sasada <ko1@atdot.net>
-
- * compile.c (iseq_compile): clear local table if node == 0.
- a patch from Yusuke ENDOH <mame AT tsg.ne.jp> [ruby-dev:32530]
-
- * vm.c: clear VM stack.
-
-Tue Dec 25 04:23:32 2007 Tanaka Akira <akr@fsij.org>
-
- * parse.y (rb_id2str): fill klass of returned string as rb_cString.
- some strings are allocated before rb_cString is created.
- This prevents a "called on terminated object" error by
- ObjectSpace.each_object(Module) {|m| p m.name }.
-
-Tue Dec 25 03:51:55 2007 Koichi Sasada <ko1@atdot.net>
-
- * compile.c (iseq_compile_each): fix stack consistency bug.
- a patch from Yusuke ENDOH <mame AT tsg.ne.jp>
-
-Tue Dec 25 03:19:47 2007 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * tool/make-snapshot: must create configure and lex.c.
-
-Tue Dec 25 03:16:05 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_io_s_pipe): now takes up to two arguments. allow its
- external/internal encoding by Encoding objects.
-
- * io.c (rb_io_set_encoding): new method to set encoding of the IO.
-
- * io.c (argf_set_encoding): ditto.
-
-Tue Dec 25 03:08:53 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * pack.c (pack_pack): use NUM2LONG instead of NUM2INT.
-
- * numeric.c (fix_lshift, fix_aref): use SIZEOF_LONG instead of
- SIZEOF_VALUE.
-
- * bignum.c (big2ulong, rb_big_aref): ditto.
-
-Tue Dec 25 02:55:26 2007 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/rexml/element.rb (REXML::Elements#each): yield in each
- should be called with one parameter. [ruby-dev:32708]
-
-Tue Dec 25 02:15:39 2007 Koichi Sasada <ko1@atdot.net>
-
- * compile.c (iseq_compile_each): add a "pop" insn after break
- to fix stack consistency error. [ruby-core:14385]
-
- * bootstraptest/test_syntax.rb: add tests for above.
-
- * bootstraptest/test_knownbug.rb: remove fixed bug.
-
-Tue Dec 25 01:54:36 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * id.c (Init_id): remove several unused symbols. [ruby-core:14362]
-
- * compile.c (iseq_specialized_instruction): do not use
- VM_CALL_SEND_BANG flag any longer.
-
-Tue Dec 25 01:42:41 2007 Tanaka Akira <akr@fsij.org>
-
- * lib/rdoc/rdoc.rb (parse_files): interpret coding cookie.
-
-Tue Dec 25 01:38:04 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * proc.c (method_name): preserve Symbol's encoding.
-
- * numeric.c (fix_id2name): ditto.
-
-Tue Dec 25 01:19:18 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * include/ruby/encoding.h (rb_enc_left_char_head): new utility macro.
-
- * include/ruby/encoding.h (rb_enc_right_char_head): ditto.
-
- * io.c (appendline): does multibyte RS search in the function.
-
- * io.c (prepare_getline_args): RS may be nil.
-
- * io.c (rb_io_getc): should process character based on external
- encoding, when transcoding required.
-
-Tue Dec 25 01:07:57 2007 Tanaka Akira <akr@fsij.org>
-
- * lib/irb/output-method.rb: translate a comment to English to
- avoid mix of EUC-JP comment and UTF-8 Date keyword.
- svn substitute Date keyword with UTF-8 weekday on UTF-8 locale.
-
-Tue Dec 25 00:27:28 2007 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/webrick/httpservley/cgihandler.rb
- (WEBrick::HTTPServlet::CGIHandler#do_GET): m17nized.
-
-Mon Dec 24 23:55:29 2007 Tanaka Akira <akr@fsij.org>
-
- * lib/cgi.rb (CGI::escape): m17nized.
- (CGI::unescape): ditto.
- (CGI::escapeHTML): ditto.
- (CGI::unescapeHTML): ditto.
-
-Mon Dec 24 23:32:24 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * transcode_data_japanese.c (select_iso_2022_mode): '\e' is not valid.
-
-Mon Dec 24 23:13:09 2007 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/rdoc/diagram.rb (RDoc::Diagram#initialize): use fileuitls
- instead of ftools.
-
-Mon Dec 24 23:04:57 2007 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/ftools.rb: removed obsoleted lib. use fileutils instead (by eban).
-
- * lib/rdoc/rdoc.rb, lib/rdoc/generators/*, lib/rake.rb: let it use
- fileutils instead of ftools.
-
- * lib/shell/command-processor.rb: removed unused references to ftools.
-
- * lib/parsedate.rb: removed. see [ruby-core:12535], [ruby-dev:31969].
-
- * lib/README: updated.
-
-Mon Dec 24 23:01:04 2007 Tanaka Akira <akr@fsij.org>
-
- * lib/open-uri.rb (OpenURI::Buffer): use Meta ===. [ruby-core:14295]
-
-Mon Dec 24 22:46:42 2007 NARUSE, Yui <naruse@ruby-lang.org>
-
- * transcode.c: register_functional_transcoder() added.
- (init_transcoder_table(: register ISO-2022-JP.
- (str_transcode): add preprocessor and postprocessor.
-
- * transcode_data_japanese.c: add ISO-2022-JP support.
-
- * transcode_data.h: moved transcoder and transcoding definition from
- transcode.c.
-
-Mon Dec 24 20:29:28 2007 Koichi Sasada <ko1@atdot.net>
-
- * test/io/nonblock/test_flush.rb: fix test for 1.9.
-
-Mon Dec 24 20:23:44 2007 Koichi Sasada <ko1@atdot.net>
-
- * test/rinda/test_rinda.rb: revert last commit because this test seems
- to have timing problem to halt all tests.
-
-Mon Dec 24 20:18:52 2007 Koichi Sasada <ko1@atdot.net>
-
- * test/rinda/test_rinda.rb: enable rinda test.
-
-Mon Dec 24 20:16:54 2007 Koichi Sasada <ko1@atdot.net>
-
- * instruby.rb: fix rdoc install dir.
-
-Mon Dec 24 18:37:32 2007 Tanaka Akira <akr@fsij.org>
-
- * re.c (rb_reg_prepare_re): show regexp encoding in the error message.
-
-Mon Dec 24 18:23:32 2007 Tanaka Akira <akr@fsij.org>
-
- * eval.c (rb_exc_raise): ANSI style.
- (rb_exc_fatal): ditto.
- (rb_raise_jump): ditto.
- (rb_jump_tag): ditto.
- (rb_block_given_p): ditto.
-
- * variable.c (original_module): ditto.
-
-Mon Dec 24 18:05:09 2007 Koichi Sasada <ko1@atdot.net>
-
- * iseq.c (Init_ISeq): disable ISeq.load() because there is no verifier.
-
- * iseq.c, proc.c: add ISeq.disasm(method).
-
-Mon Dec 24 18:06:03 2007 Tanaka Akira <akr@fsij.org>
-
- * eval_method.c (Init_eval_method): extracted from Init_eval
- for rdoc to find rb_mod_remove_method, rb_mod_undef_method and
- rb_mod_alias_method.
-
- * eval.c (Init_eval): call Init_eval_method.
-
-Mon Dec 24 17:59:29 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * load.c (load_lock): reverted.
-
- * thread.c (rb_barrier_wait): check for recursive wait.
-
-Mon Dec 24 17:50:54 2007 Tanaka Akira <akr@fsij.org>
-
- * eval.c (function_call_may_return_twice_jmp_buf): removed.
- (function_call_may_return_twice_false): removed.
- [ruby-core:14335]
-
-Mon Dec 24 17:40:57 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (node_name.inc, miniprelude.c, prelude.c): nmake cannot
- handle target vpath in other than implicit rules.
-
-Mon Dec 24 17:20:34 2007 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/{mailread.rb,getopts.rb,parsearg.rb}: removed.
- see [ruby-core:12535], [ruby-dev:31969].
-
-Mon Dec 24 17:12:57 2007 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/intern.h, random.c, array.c:
- change exported name.
- genrand_int32 -> rb_genrand_int32.
- genrand_real -> rb_genrand_real.
- [ruby-core:14335]
-
-Mon Dec 24 17:06:37 2007 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * {lib,test}/{soap,wsdl,xsd}: removed soap4r along to the discussion
- at ruby-core and ruby-dev. see [ruby-core:12535], [ruby-dev:31969].
-
-Mon Dec 24 17:06:14 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * load.c (rb_feature_p): returns loading path name too.
-
- * load.c (search_required): returns path too if feature is being
- loaded. [ruby-dev:32048] [TODO: refactoring]
-
-Mon Dec 24 16:29:12 2007 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * sample/openssl: reviewed and remove dependency on getopts.rb.
-
-Mon Dec 24 16:18:57 2007 Koichi Sasada <ko1@atdot.net>
-
- * mkconfig.rb: add teeny to CONFIG['ruby_version'].
-
-Mon Dec 24 15:55:50 2007 Koichi Sasada <ko1@atdot.net>
-
- * tool/compile.rb, getrev.rb, runruby.rb: remove unused tools.
-
-Mon Dec 24 15:42:04 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in, cygwin/GNUmakefile.in, */Makefile.sub,
- djgpp/config.hin.: version dependent directory names now contain
- teeny.
-
-Mon Dec 24 15:29:13 2007 Tanaka Akira <akr@fsij.org>
-
- * tool/serb.rb: removed.
-
-Mon Dec 24 13:55:35 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * proc.c (rb_proc_new), vm.c (invoke_block): removed u3.state magic.
- [ruby-core:14310]
-
- * test/ruby/test_symbol.rb (test_to_proc): a test from Frederick
- Cheung <frederick.cheung AT gmail.com>.
-
-Mon Dec 24 13:43:36 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread.c (rb_thread_atfork): should not leave living_threads
- referring freed table while allocating new table.
-
-Mon Dec 24 12:49:54 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * Makefile.in, configure.in, lib/mkmf.rb, */Makefile.sub: specify
- compiled output file name explicitly.
-
- * enc/Makefile.in, enc/depend: now makes compiler to put generated
- files under directories corresponding to the each source.
- enc/trans supported.
-
- * enc/make_encmake.rb: evaluates depend file before Makefile.in so
- that the former can influence to CONFIG.
+ * lib/rdoc/ri/ri_paths.rb: Fix duplication of ri data for multiple
+ gems. Merge of r14567 from trunk
Mon Dec 24 12:35:03 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* win{32,ce}/Makefile.sub (MFLAGS): defaulted to -l.
-Mon Dec 24 12:08:10 2007 Eric Hodel <drbrain@segment7.net>
-
- * /, ext/: Add svn:ignore for OS X Xcode 3's conftest.dSYM
- directories.
-
Mon Dec 24 11:56:31 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * common.mk: should not pass MAKEFLAGS to recursive make.
- + normal make: MFLAGS are set and command line options and macros
- are all passed silently.
- + GNU make: ditto, and all options and macros in MAKEFLAGS are in
- effect.
- + nmake: MFLAGS is not set and MAKEFLAGS has only options without
- hyphen, no macros exist in any variables.
- + Borland make: ditto, and command line macros cannot override
- macros in makefile, so passing them is vain.
-
* {bcc32,win{32,ce}}/Makefile.sub (SET_MAKE): set MFLAGS which is not
set by default, to get rid of chaotic situation of MFLAGS/MAKEFLAGS.
-Mon Dec 24 11:32:44 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_comparable): fixed to keep transitivity.
- [ruby-dev:32693]
-
-Mon Dec 24 11:20:31 2007 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc/ri/ri_options.rb: Fix display of GEMDIRS, make command
- examples match ri's name.
-
- * lib/rdoc/ri/ri_paths.rb: Only allow latest ri dirs in ri output.
-
-Mon Dec 24 10:49:04 2007 Eric Hodel <drbrain@segment7.net>
-
- * lib/uri/mailto.rb, lib/uri/common.rb: Fix Regexp warnings. Patch
- #16524 from Kornelius Kalnbach, [ruby-core:14302].
-
-Mon Dec 24 10:37:38 2007 Eric Hodel <drbrain@segment7.net>
-
- * gem_prelude.rb: Remove methods from Gem, not QuickLoader, to fix
- warnings.
-
-Mon Dec 24 09:45:45 2007 Martin Duerst <duerst@it.aoyama.ac.jp>
-
- * transcode.c, transcode_data_one_byte.c, transcode_data_japanese.c:
- added rb_ prefix to external data symbols.
-
-Mon Dec 24 05:32:22 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enum.c (enum_inject): updated documentation. a patch from Keita
- Yamaguchi <keita.yamaguchi AT gmail.com> in [ruby-dev:32686].
-
- * README.EXT: updated. a patch from Tadashi Saito
- <shiba AT mail2.accsnet.ne.jp> in [ruby-core:14328].
-
- * array.c (rb_ary_at): updated documentation. a patch from Tadashi
- Saito <shiba AT mail2.accsnet.ne.jp> in [ruby-core:14330].
-
-Mon Dec 24 05:13:04 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (tr_trans): should associate new encoding if modified.
-
-Mon Dec 24 04:04:12 2007 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * test/net/http/test_https.rb: should rescue LoadError.
-
-Mon Dec 24 03:57:28 2007 Koichi Sasada <ko1@atdot.net>
-
- * cont.c, vm.h: fix to support sparc machine.
- a patch from Yusuke ENDOH <mame AT tsg.ne.jp>
-
-Mon Dec 24 03:35:19 2007 Koichi Sasada <ko1@atdot.net>
-
- * common.mk: remove additional "-".
-
-Mon Dec 24 02:59:32 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_io_check_readable): should not fill fptr->enc always.
- read-write IO (e.g. socket) does not work. [ruby-dev:32685]
-
- * io.c (io_read_encoding): retrieve reading encoding.
-
- * io.c (prepare_getline_args): convert RS to external encoding.
-
- * string.c (str_new_shared): was setting embedding flag of wrong
- string object. [ruby-dev:32685]
-
- * io.c (io_enc_str): should preserve default_external encoding.
-
- * io.c (appendline): should do multibyte aware RS search.
-
-Mon Dec 24 02:06:35 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_f_open): documentation update.
-
- * io.c (rb_io_s_pipe): ditto.
-
- * io.c (io_fwrite): wrong encoding destination.
-
- * io.c (rb_io_external_encoding): should return the encoding of
- the file reading.
-
- * io.c (rb_io_internal_encoding): should return the encoding of
- read string.
-
-Mon Dec 24 01:46:43 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_io_s_pipe): allow specifying read-side encoding.
-
- * io.c (io_enc_str): wrong encoding destination.
-
-Mon Dec 24 01:03:17 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_comparable): comparison including broken
- coderange strings do not consider encoding.
-
-Mon Dec 24 00:57:15 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (open_key_args): IO direct methods (foreach, readlines,
- read) now takes keyword argument: encoding, mode, open_args.
-
-Mon Dec 24 00:52:15 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_io_s_read): encoding argument reverted.
-
- * io.c (mode_enc): independent function to share code.
-
- * io.c (rb_io_internal_encoding): new method.
-
-Mon Dec 24 00:47:05 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * test/ruby/test_beginendblock.rb (TestBeginEndBlock::test_endblockwarn):
- rename endblockwarn.rb to endblockwarn_rb to avoid unnecessary
- warning in make test.
-
-Sun Dec 23 23:03:13 2007 Tanaka Akira <akr@fsij.org>
-
- * encoding.c (rb_enc_codepoint): implemented to raise invalid
- encoding.
-
- * include/ruby/encoding.h (rb_enc_codepoint): macro is replaced as a
- declaration.
-
-Sun Dec 23 19:45:22 2007 Tanaka Akira <akr@fsij.org>
-
- * lib/time.rb (Time.httpdate): fix 2 digits year for 20xx.
- reported by Tadayoshi Funaba. [ruby-dev:32687]
-
-Sun Dec 23 19:33:42 2007 Eric Hodel <drbrain@segment7.net>
-
- * lib/open-uri.rb: Fix method redefined warning. [ruby-core:14304]
-
-Sun Dec 23 18:31:49 2007 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/nkf/nkf.c (rb_nkf_enc_get): use rb_define_dummy_encoding.
-
- * ext/nkf/nkf.c (Init_nkf): use rb_nkf_enc_get("ASCII").
-
- * ext/nkf/nkf-utf8/nkf.c: Update 1.161.
-
- * ext/nkf/nkf-utf9/config.h: default output encoding is now UTF-8.
-
- * ext/nkf/lib/kconv.rb (Kconv.kconv): replace Encoding#name by
- Encoding#to_s.
-
-Sun Dec 23 18:02:52 2007 Eric Hodel <drbrain@segment7.net>
+Sat Dec 22 14:49:46 2007 Tadayoshi Funaba <tadf@dotrb.org>
- * lib/rubygems/gem_open_uri.rb: Fix version check.
-
-Sun Dec 23 17:24:48 2007 Tanaka Akira <akr@fsij.org>
-
- * encoding.c (rb_enc_init): add eucJP as an alias of EUC-JP.
-
-Sun Dec 23 17:00:23 2007 Tanaka Akira <akr@fsij.org>
-
- * lib/time.rb (Time.httpdate): use Time.utc for
- "day-of-week, dd-mon-yy HH::MM:SS GMT" format.
-
-Sun Dec 23 16:12:40 2007 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc: Fix 1.9 warnings.
-
-Sun Dec 23 15:28:37 2007 Eric Hodel <drbrain@segment7.net>
-
- * lib/rubygems, test/rubygems: Fix new 1.9 warnings.
-
-Sun Dec 23 14:43:10 2007 Eric Hodel <drbrain@segment7.net>
-
- * gem_prelude.rb: Use require to load rubygems.rb so the correct path
- is in $LOADED_FEATURES on RubyGems upgrade.
-
-Sun Dec 23 11:26:43 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (sym_call): use exact argument array interface.
- [ruby-core:14279]
-
-Sun Dec 23 11:01:35 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (rb_io_binmode_m): removed C99ism.
-
-Sun Dec 23 10:23:23 2007 Martin Duerst <duerst@it.aoyama.ac.jp>
-
- * transcode_data_one_byte.c: Better (and more honest) optimization.
-
- * transcode_data_japanese.c: First optimization step.
-
-Sun Dec 23 09:07:02 2007 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/encoding.h, encoding.c, re.c, io.c, parse.y, numeric.c,
- ruby.c, transcode.c, ext/nkf/nkf.c: rename rb_ascii_encoding to
- rb_ascii8bit_encoding. rb_ascii_encoding is ambiguous with
- ASCII-8BIT and US-ASCII.
-
-Sun Dec 23 03:35:52 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * version.h: use patchlevel if revision is not set.
-
- * {bcc32,win{32,ce}}/setup.mak (-version-): skip including revision.h.
-
- * common.mk (srcs): new target to generated sources.
-
- * common.mk (encs, ext/ripper/ripper.c): MAKEFLAGS needs -.
-
- * enc/depend, enc/make_encmake.rb: use erb.
-
-Sun Dec 23 01:56:18 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_io_mode_enc): do not set encoding unless explicitly
- specified.
-
- * io.c (rb_io_check_readable): fill fptr->enc by default_external
- if it's empty.
-
- * io.c (io_enc_str): fptr->enc is always set for reading IO (by
- rb_io_check_readable(fptr)).
-
-Sun Dec 23 01:18:06 2007 David Flanagan <david@davidflanagan.com>
-
- * io.c, io.h: temporary patch to partially implement
- transcode-on-read and transcode-on-write
-
-Sun Dec 23 00:48:05 2007 Shugo Maeda <shugo@ruby-lang.org>
-
- * test/net/imap/test_imap.rb: added tests for SSL.
-
-Sat Dec 22 21:10:53 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/syck/rubyext.c (syck_genericresolver_node_import): should
- not set instance variable "@kind" before initializing it.
- [ruby-dev:32677]
-
-Sat Dec 22 19:52:23 2007 Koichi Sasada <ko1@atdot.net>
-
- * bootstraptest/test_objectspace.rb: fix condition.
-
-Sat Dec 22 19:17:10 2007 Koichi Sasada <ko1@atdot.net>
-
- * ext/probeprofiler/: removed.
-
-Sat Dec 22 19:14:38 2007 Koichi Sasada <ko1@atdot.net>
-
- * process.c (rb_f_fork): Unsupport Kernel.fork() on NetBSD.
-
-Sat Dec 22 18:20:13 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * common.mk (version.o): add dependency. [ruby-dev:32680]
-
-Sat Dec 22 17:45:11 2007 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/nkf/nkf.c (Init_nkf): use rb_ascii_encoding() for
- rb_nkf_enc_get("US-ASCII").
- * if use rb_nkf_enc_get("US-ASCII"), ruby will crash - this is bug?
-
-Sat Dec 22 17:39:03 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * lib/mkmf.rb ($extmk): fixed broken condition.
-
-Sat Dec 22 17:35:59 2007 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/nkf/nkf-utf8.c: Update nkf.c rev:1.157.
-
- * ext/nkf/nkf.c (rb_nkf_enc_get): replicate proper based encoding.
-
- * ext/nkf/kconv.c (Kconv#kconv, to*): use self.encoding as from_enc
- when from_enc isn't given.
-
-Sat Dec 22 17:06:50 2007 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/lib/net/ssl.rb (OpenSSL::SSL::SSLContext.build): removed.
-
- * ext/openssl/lib/net/ssl.rb (OpenSSL::SSL::SSLContext#set_params):
- new method to set suitable SSL parameters.
-
- * lib/net/pop.rb, lib/net/http.rb, lib/net/imap.rb,
- test/openssl/test_ssl.rb: follow above change.
-
- * test/net/http/test_https.rb: refine error case.
-
-Sat Dec 22 16:58:49 2007 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/net/imap.rb (encode_utf7): accept UTF-8 strings.
-
- * lib/net/imap.rb (decode_utf7): return UTF-8 strings.
-
-Sat Dec 22 15:56:36 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * transcode_data_japanese: typo.
-
-Sat Dec 22 15:54:54 2007 Martin Duerst <duerst@it.aoyama.ac.jp>
-
- * ChangeLog: Information for last patch got lost, fixed
-
- * test/ruby/test_transcode.rb: Added simple tests for
- EUC-JP and Shift_JIS and tests for ASCII-only range
-
-Sat Dec 22 15:45:45 2007 Martin Duerst <duerst@it.aoyama.ac.jp>
-
- * transcode_data_one_byte: slightly optimized
-
- * transcode_data_japanese: new data file for EUC-JP and SHIFT_JIS
- (not yet optimized; tests to follow; data from
- http://nkf.sourceforge.jp/ucm/{SJIS|eucJP}-nkf.ucm)
-
- * common.mk, transcode.c: Adjusted for transcode_data_japanese
-
-Sat Dec 22 15:30:13 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * */Makefile.sub (MFLAGS): define unless defined.
-
-Sat Dec 22 15:17:40 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * lib/mkmf.rb ($extmk): set true only when under ext/ or tool/.
-
-Sat Dec 22 15:14:48 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (encs, ext/ripper/ripper.c): needs MFLAGS.
-
- * configure.in (STRINGIZE): stringizing macro.
-
- * include/ruby/defines.h (STRINGIZE): fallback.
-
- * tool/make-snapshot: new file.
-
- * version.c (ruby_description, ruby_copyright): string constants for
- -v option.
-
-Sat Dec 22 15:03:37 2007 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/net/imap.rb (initialize): fixed documentation.
-
-Sat Dec 22 15:01:16 2007 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/net/pop.rb (enable_ssl): use OpenSSL::SSL::SSLContext.build
- instead of SSLContext.new (default verify mode is now
- OpenSSL::SSL::VERIFY_PEER).
-
-Sat Dec 22 14:45:21 2007 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date.rb: shouldn't freeze nil. [ruby-dev:32677]
-
-Sat Dec 22 14:27:27 2007 Tanaka Akira <akr@fsij.org>
-
- * regenc.c (onigenc_ascii_is_code_ctype): moved from enc/ascii.c.
-
- * regenc.h (onigenc_ascii_is_code_ctype): declared.
-
- * enc/ascii.c: use onigenc_ascii_is_code_ctype.
-
- * enc/us_ascii.c: new file for US-ASCII.
-
-Sat Dec 22 14:30:34 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (reg_named_capture_assign_iter): allows non-ascii names and
- get rid of reserved word IDs.
-
-Sat Dec 22 14:18:45 2007 Koichi Sasada <ko1@atdot.net>
-
- * test/ruby/test_float.rb, test_sprintf.rb: fix test place.
-
-Sat Dec 22 14:17:02 2007 Koichi Sasada <ko1@atdot.net>
-
- * bootstraptest/test_objectspace.rb: skip frozen string.
-
-Sat Dec 22 14:02:58 2007 Koichi Sasada <ko1@atdot.net>
-
- * array.c (rb_ary_permutation): add volatile to avoid GC problem.
-
-Sat Dec 22 11:47:42 2007 Koichi Sasada <ko1@atdot.net>
-
- * eval.c (rb_obj_instance_eval): use class of immediate objects.
-
- * test/ruby/test_eval.rb: fix a test.
-
-Sat Dec 22 11:37:06 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * encoding.c (rb_locale_charmap): win32 support.
-
-Sat Dec 22 11:31:14 2007 Eric Hodel <drbrain@segment7.net>
-
- * gem_prelude.rb: Place bin dir before lib dir so gem bin stubs work.
-
-Sat Dec 22 11:05:44 2007 Jim Weirich <jim@tardis.local>
-
- * lib/rake.rb (Rake): Added Rake and related libraries to the
- source code base.
-
-Sat Dec 22 10:30:45 2007 Koichi Sasada <ko1@atdot.net>
-
- * tool/insns2vm.rb: moved from lib/vm/instruction.rb.
-
-Sat Dec 22 10:25:44 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (reg_named_capture_assign_iter): captured name should
- not be reserved word. a patch from Keita Yamaguchi
- <keita.yamaguchi AT gmail.com> in [ruby-dev:32675].
-
- * parse.y (reg_named_capture_assign_iter): just ignore the
- captures that do not have valid local variable name.
-
-Sat Dec 22 10:19:08 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_f_method_name): now __method__ and __callee__ are
- aliases. [ruby-core:14244]
-
-Sat Dec 22 08:29:56 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_str_buf_append): improvement for non-broken coded
- strings.
-
-Sat Dec 22 06:30:04 2007 Koichi Sasada <ko1@atdot.net>
-
- * bootstraptest/test_fork.rb: skip if fork is not unsupported.
-
- * bootstraptest/test_io.rb: skip if require failed.
-
-Sat Dec 22 06:09:12 2007 David Flanagan <david@davidflanagan.com>
-
- * io.c: fix typo in rdoc comment
-
-Sat Dec 22 05:09:43 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * parse.y (parser_str_new, rb_intern3): rb_default_encoding() renamed.
-
- * ext/nkf/nkf.c (rb_nkf_putchar): ditto.
-
-Sat Dec 22 03:54:18 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * encoding.c (rb_ascii_encoding): renamed from previous
- rb_default_encoding().
-
-Sat Dec 22 02:49:02 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (command): block from cmd_brace_block was ignored.
- [ruby-dev:32644]
-
- * re.c (rb_reg_prepare_re): stop ENCODING_NONE warning if the
- encoding of the str is ASCII-8BIT.
-
-Sat Dec 22 01:52:11 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (io_ungetc): avoid buffer relocation, which might cause
- serious problem under concurrent situation.
-
-Sat Dec 22 01:35:41 2007 Tanaka Akira <akr@fsij.org>
-
- * re.c (ARG_ENCODING_NONE): defined for /.../n option.
- (REG_ENCODING_NONE): ditto.
- (rb_char_to_option_kcode): return ARG_ENCODING_NONE for n.
- (rb_reg_prepare_re): warn /ascii/n =~ "non-ascii".
- (rb_reg_initialize): set REG_ENCODING_NONE from ARG_ENCODING_NONE.
-
-Sat Dec 22 01:23:10 2007 Shugo Maeda <shugo@ruby-lang.org>
-
- * test/json/test_json_addition.rb (test_core): do not use Time.now
- because JSON can't hold nsec.
-
-Sat Dec 22 01:10:30 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/tk/sample/tkextlib/vu/canvSticker2.rb,
- ext/tk/sample/demos-{en,jp}/bind.rb: fix typo. [ruby-dev:32668]
-
-Sat Dec 22 00:56:43 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * sample/test.rb (valid_syntax): force_encoding input script.
-
-Fri Dec 21 23:48:38 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * lib/mkmf.rb (depend_rules): suffixes list broken. fixed.
-
-Fri Dec 21 20:18:15 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bignum.c (rb_big_mul0): remove unused variable.
-
- * bignum.c (bigdivrem): ditto.
-
-Fri Dec 21 20:13:51 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/ruby.h (rb_catch_obj, rb_throw_obj): prototyped.
-
- * include/ruby/intern.h (rb_fiber_alive_p): prototyped.
-
-Fri Dec 21 20:09:18 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_str_succ): retry increasing until valid char is found.
-
-Fri Dec 21 20:00:02 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * encoding.c (rb_enc_replicate): now creates first class encoding.
-
- * encoding.c (rb_define_dummy_encoding): always based on the default
- encoding.
-
- * encoding.c (rb_enc_dummy_p): check if dummy.
-
- * encoding.c (enc_inspect): shows if dummy.
-
- * encoding.c (Init_Encoding): added dummy? method
-
- * include/ruby/encoding.h (ENCODING_INLINE_MAX): increased.
-
-Fri Dec 21 18:40:54 2007 Koichi Sasada <ko1@atdot.net>
-
- * io.c: write() should be in blocking region.
-
- * bootstraptest/test_io.rb, test_knownbug.rb: move a fixed test.
-
-Fri Dec 21 17:56:30 2007 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/tcltklib.c: provisional support on Ruby-VM.
-
- * ext/tk/MANUAL_tcltklib.eng, ext/tk/MANUAL_tcltklib.eucj:
- modify document about new functions.
-
- * ext/tk/lib/tk.rb, ext/tk/lib/tk/labelframe.rb,
- ext/tk/lib/tk/frame.rb, ext/tk/lib/tk/toplevel.rb,
- ext/tk/lib/tk/scrollbar.rb, ext/tk/lib/tk/message.rb,
- ext/tk/lib/tk/listbox.rb, ext/tk/lib/tk/text.rb,
- ext/tk/lib/tk/scale.rb, ext/tk/lib/tk/entry.rb,
- ext/tk/lib/tk/ttk_selector.rb, ext/tk/lib/tk/menu.rb,
- ext/tk/lib/tk/label.rb, ext/tk/lib/tk/spinbox.rb,
- ext/tk/lib/tk/textmark.rb, ext/tk/lib/tk/winpkg.rb,
- ext/tk/lib/tk/checkbutton.rb, ext/tk/lib/tk/panedwindow.rb,
- ext/tk/lib/tk/texttag.rb, ext/tk/lib/tk/root.rb,
- ext/tk/lib/tk/textimage.rb, ext/tk/lib/tk/radiobutton.rb,
- ext/tk/lib/tk/package.rb, ext/tk/lib/tk/macpkg.rb,
- ext/tk/lib/tk/composite.rb, ext/tk/lib/tk/autoload.rb,
- ext/tk/lib/tk/canvas.rb, ext/tk/lib/tk/button.rb,
- ext/tk/lib/tk/textwindow.rb,
- ext/tk/lib/tkextlib/iwidgets/scrolledtext.rb,
- ext/tk/lib/tkextlib/tile/style.rb,
- ext/tk/lib/tkextlib/tile/tscrollbar.rb,
- ext/tk/lib/tkextlib/tile/tpaned.rb, ext/tk/lib/tkextlib/tile.rb,
- ext/tk/extconf.rb: support Tcl/Tk8.5 (partial, not complete).
-
- * ext/tk/sample/demos-jp/widget,
- ext/tk/sample/demos-jp/pendulum.rb,
- ext/tk/sample/demos-jp/bind.rb,
- ext/tk/sample/tkextlib/vu/canvSticker2.rb,
- ext/tk/sample/demos-en/pendulum.rb,
- ext/tk/sample/demos-en/bind.rb: remove $KCODE and minor bug fix.
-
-Fri Dec 21 17:49:06 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * transcode.c (rb_str_transcode_bang): returns self if no conversion.
- [ruby-dev:32662]
-
-Fri Dec 21 17:44:47 2007 Eric Hodel <drbrain@segment7.net>
-
- * lib/rubygems*: Update to RubyGems 1.0.1, r1581
-
-Fri Dec 21 17:32:49 2007 Koichi Sasada <ko1@atdot.net>
-
- * bootstraptest/pending.rb: renamed from featurebug.rb.
- This file contains bugs which is known but will not be
- fixed in days.
-
-Fri Dec 21 17:31:22 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * debug.c (dummy_gdb_enums.various): added ENCODING and CODERANGE
- constants.
-
- * .gdbinit: use enum constants.
-
-Fri Dec 21 17:28:17 2007 Koichi Sasada <ko1@atdot.net>
-
- * bootstraptest/featurebug.rb: added.
-
- * bootstraptest/test_knownbug.rb: move a feature bug.
-
-Fri Dec 21 17:25:22 2007 Koichi Sasada <ko1@atdot.net>
-
- * thread.c (rb_thread_atfork): fix to mark thread object.
- [ruby-dev:32404]
-
- * bootstraptest/test_knownbug.rb, test_fork.rb: move a fixed test.
-
-Fri Dec 21 17:07:13 2007 Koichi Sasada <ko1@atdot.net>
-
- * gc.h: extern variable should not be initialized.
-
- * thread_pthread.c: add a parameter.
-
-Fri Dec 21 16:50:43 2007 Tanaka Akira <akr@fsij.org>
-
- * encoding.c (Init_Encoding): use enc_name as to_s.
- (enc_inspect): renamed from enc_to_s. add "#" at beginning.
-
-Fri Dec 21 16:37:43 2007 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/nkf/nkf-utf8/config.h (MIME_DECODE_DEFAULT, X0201_DEFAULT):
- defined as FALSE. nkf and kconv don't decode MIME encoded string
- and don't convert JIS X 0201 Katakana.
-
- * test/nkf/test_kconv.rb: fix tests.
-
-Fri Dec 21 16:33:28 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * enumerator.c (enumerator_iter_i): adjusted for rb_block_call_func.
-
- * include/ruby/ruby.h (rb_block_call_func): function to be called back
- as block.
-
-Fri Dec 21 16:25:25 2007 Martin Duerst <duerst@it.aoyama.ac.jp>
-
- * common.mk, transcode_data_iso_8859.c: renamed to
- transcode_data_one_byte.c.
-
-Fri Dec 21 16:10:30 2007 Shigeo Kobayashi <shigeo@tinyforest.jp>
-
- * ext/bigdecimal/bigdecimal.c (VpMidRound): Round method bug
- pointed by Ryan Platte fixed(Patch to the patch from "NATORI
- Shin"). [ruby-talk:273360]
-
-Fri Dec 21 16:06:13 2007 Tanaka Akira <akr@fsij.org>
-
- * re.c (append_utf8): use rb_utf8_encoding() instead of
- rb_enc_find("utf-8").
-
-Fri Dec 21 15:59:46 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * encoding.c (rb_enc_init): use enc_register_at() directly.
-
- * encoding.c (rb_utf8_encoding): returns utf-8 encoding.
-
- * include/ruby/encoding.h (rb_utf8_encoding): prototyped.
-
- * parse.y (UTF8_ENC): uses rb_utf8_encoding().
-
-Fri Dec 21 15:31:59 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_io_s_read): allow specifying encoding explicitly.
-
- * io.c (rb_io_binmode): specifies encoding to ASCII-8BIT (binary).
-
- * io.c (rb_io_s_read): IO should be in binary mode when offset is
- specified.
-
- * encoding.c (rb_to_encoding): returns default encoding if no
- corresponding encoding found.
-
-Fri Dec 21 15:24:22 2007 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/net/imap.rb (initialize): accept service name. changed
- the default value of the old style +verify+ argument to true.
-
-Fri Dec 21 15:15:44 2007 Tanaka Akira <akr@fsij.org>
-
- * gc.c (rb_garbage_collect): new function for debugging.
-
-Fri Dec 21 15:16:00 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * encoding.c (rb_to_encoding_index): should return error instead of
- exception even if type is incorrect.
-
-Fri Dec 21 14:58:27 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enumerator.c (enumerator_init_copy): prohibit cloning of
- generators since Fibers cannot be copied.
-
- * enumerator.c (enumerator_init_copy): typo fixed.
-
-Fri Dec 21 14:46:07 2007 Tanaka Akira <akr@fsij.org>
-
- * io.c (Init_IO): define IO::BINARY even if O_BINARY is not exist.
-
-Fri Dec 21 14:01:14 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * test/ruby/test_system.rb (TestSystem::valid_syntax): apply
- ASCII-8BIT encoding explicitly.
-
- * re.c (rb_reg_prepare_re): add encoding name in the message.
-
-Fri Dec 21 13:54:05 2007 Tanaka Akira <akr@fsij.org>
-
- * re.c: change "character encodings differ" error messages.
-
-Fri Dec 21 13:46:58 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * encoding.c (rb_enc_register): set encoding constant.
-
- * encoding.c (rb_enc_find_index): replace non-alphanumeric chars with
- underscores, so that initialize function can be called.
-
- * encoding.c (rb_enc_find_index): extension libraries have lower case
- names conventionally.
-
- * ruby.c (proc_options, process_options): finds encoding after
- load_path is initialized.
-
-Fri Dec 21 13:10:57 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_io_external_encoding): new method.
-
- * encoding.c (rb_enc_from_encoding): returns Qnil for NULL
- encoding.
-
- * io.c (rb_io_external_encoding): should fill delayed
- initialization for STDIN.
-
-Fri Dec 21 13:09:11 2007 Tanaka Akira <akr@fsij.org>
-
- * encoding.c (rb_locale_charmap): return nil if no locale information.
-
-Fri Dec 21 12:55:39 2007 Tanaka Akira <akr@fsij.org>
-
- * lib/runit, lib/rubyunit.rb, test/testunit/runit: removed.
-
-Fri Dec 21 12:45:49 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_chomp_bang): avoid unnecessary loop using
- ONIGENC_LEFT_ADJUST_CHAR_HEAD().
-
-Fri Dec 21 12:32:08 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * file.c (Init_File): File.exists? revived.
-
- * dir.c (Init_Dir): Dir.exists? again.
-
-Fri Dec 21 12:26:36 2007 Koichi Sasada <ko1@atdot.net>
-
- * compile.c: remove "illegal".
-
-Fri Dec 21 12:22:20 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * keywords, parse.y (__ENCODING__): represent script encoding.
-
-Fri Dec 21 12:16:50 2007 Tanaka Akira <akr@fsij.org>
-
- * string.c (rb_str_is_ascii_only_p): new method ascii_only?.
-
-Fri Dec 21 12:11:57 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_io_mode_enc): set default external encoding if no
- encoding specified explicitly.
-
-Fri Dec 21 12:00:34 2007 Tanaka Akira <akr@fsij.org>
-
- * configure.in: check langinfo.h and locale.h.
-
- * encoding.c: use langinfo.h only if available.
-
- * main.c: use locale.h only if available.
-
-Fri Dec 21 11:47:56 2007 Tanaka Akira <akr@fsij.org>
-
- * encoding.c: include locale.h
- (rb_locale_charmap): new method Encoding.locale_charmap for
- nl_langinfo(CODESET).
-
- * include/ruby/encoding.h (rb_locale_charmap): declared.
-
- * main.c (main): call setlocale with LC_CTYPE.
-
- * ruby.c (locale_encoding): use rb_locale_charmap.
-
-Fri Dec 21 11:35:10 2007 Koichi Sasada <ko1@atdot.net>
-
- * vm.c, vm_dump.c: fix typo. Reported by Yuki Mitsui.
-
-Fri Dec 21 11:28:00 2007 Tanaka Akira <akr@fsij.org>
-
- * regerror.c, string.c, io.c, lib/getoptlong.rb, lib/net/imap.rb,
- compile.c, sprintf.c, parse.y, ext/win32ole/win32ole.c,
- ext/tk/sample/demos-en/entry3.rb, ext/tk/lib/tcltk.rb,
- ext/openssl/ossl_bn.c, numeric.c, vm.c,
- benchmark/bm_so_meteor_contest.rb, bignum.c, ruby.c: don't "illegal"
- for non law violation context.
-
-Fri Dec 21 11:23:24 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (enc.mk): depends on $(RBCONFIG) instead of rbconfig.rb.
-
- * encoding.c (Init_Encoding): ISO-8859-1 is no longer a replica.
-
- * regenc.h (OnigEncodingDefine): names of extension and encoding can
- differ.
-
- * enc/Makefile.in: always shared.
-
- * enc/depend (deffile): should not upcase.
-
- * enc/{ascii,euc_jp,sjis,utf8,iso_8859_{1..16}}.c: fix for Init.
-
-Fri Dec 21 09:26:48 2007 Tanaka Akira <akr@fsij.org>
-
- * tool/compile_prelude.rb: use erb.
-
-Fri Dec 21 08:07:35 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enumerator.c (enumerator_next): should call next_init() if fiber
- is dead already. [ruby-dev:32459]
-
-Fri Dec 21 01:21:49 2007 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/lib/openssl/ssl.rb (OpenSSL::SSL::SSLContext.build):
- enable CRL checking by default.
-
-Fri Dec 21 01:20:56 2007 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/net/http.rb (Net::HTTP#connect): use
- OpenSSL::SSL::SSLContext.build instead of SSLContext.new (default
- verify mode is now OpenSSL::SSL::VERIFY_PEER).
-
- * lib/net/https.rb: SSL parameters are defined by attr_accessor.
-
- * test/net/http/test_https.rb: add test for HTTPS features.
-
-Fri Dec 21 01:11:37 2007 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * io.c (select_internal): should return original value.
-
-Fri Dec 21 00:26:39 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (tr_trans): wrong encoding check for tree strings.
-
- * test/ruby/test_m17n.rb (TestM17N::test_tr_s): "invalid mbstring
- sequence" is not an error to be tested.
-
- * test/ruby/test_m17n.rb (TestM17N::test_tr): ditto.
-
-Thu Dec 20 19:29:07 2007 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/net/imap.rb (initialize): the second argument is an option
- hash now. use SSLContext.build to specify SSL parameters.
-
-Thu Dec 20 19:11:56 2007 Koichi Sasada <ko1@atdot.net>
-
- * thread_pthread.c (native_thread_apply_priority): check
- _POSIX_PRIORITY_SCHEDULING for OpenBSD.
-
-Thu Dec 20 18:33:54 2007 Koichi Sasada <ko1@atdot.net>
-
- * configure.in: add libthr for FreeBSD.
-
-Thu Dec 20 18:17:14 2007 Koichi Sasada <ko1@atdot.net>
-
- * common.mk, *.ci: renamed to *.c.
-
- * eval_load.c: renamed to load.c.
-
-Thu Dec 20 17:36:01 2007 Eric Hodel <drbrain@segment7.net>
-
- * lib/rubygems*: Import RubyGems 1.0.0, r1575.
-
-Thu Dec 20 17:18:38 2007 Koichi Sasada <ko1@atdot.net>
-
- * proc.c: support Proc#binding.
-
- * sample/test.rb: add a test.
-
-Thu Dec 20 17:15:15 2007 Martin Duerst <duerst@it.aoyama.ac.jp>
-
- * pack.c: Slight change to documentation ('character' ->
- 'byte (C char)'). [ruby-core:13126], see also [ruby-core:13998].
-
-Thu Dec 20 17:07:54 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (enc.mk): depends on rbconfig.rb.
-
- * regenc.h (OnigEncodingDefine): external encoding definition macro.
-
- * enc/Makefile.in: fix for linking.
-
- * enc/depend, enc/make_encmake.rb: fix for Windows.
-
- * enc/{ascii,euc_jp,sjis,utf8,iso_8859_{1..16}}.c: renamed.
-
-Thu Dec 20 16:42:55 2007 Koichi Sasada <ko1@atdot.net>
-
- * iseq.c (find_line_no): return 0 if not found.
-
-Thu Dec 20 16:04:17 2007 Koichi Sasada <ko1@atdot.net>
-
- * insnhelper.ci, vm.c, vm_core.h: change interface of
- vm_invoke_block() to specify block ptr. [ruby-talk:266422]
-
- * cont.c, eval_jump.ci, insns.def, proc.c, signal.c, thread.c:
- apply above change.
-
- * bootstraptest/test_knownbug.rb: move fixed bug.
-
- * bootstraptest/test_block.rb: ditto. and add a test.
-
-Thu Dec 20 15:47:13 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * enc/iso_8859_{1..16}.c: renamed.
-
-Thu Dec 20 09:59:27 2007 Koichi Sasada <ko1@atdot.net>
-
- * insnhelper.ci (vm_expandarray): fix sp increase place.
- a patch from Yusuke ENDOH <mame AT tsg.ne.jp> in [ruby-dev:32581].
-
- * bootstraptest/test_massign.rb: add a test for above.
-
- * bootstraptest/test_syntax.rb: fix last committed test.
-
-Thu Dec 20 09:47:58 2007 Koichi Sasada <ko1@atdot.net>
-
- * bootstraptest/test_syntax.rb: add a test.
-
-Thu Dec 20 09:40:51 2007 Koichi Sasada <ko1@atdot.net>
-
- * compile.c (iseq_compile_each/NODE_RETURN): fix stack consistency.
-
-Thu Dec 20 09:42:11 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bignum.c (big2str_orig): access beyond memory region cause crash
- on interrupt. a patch from Yusuke ENDOH <mame AT tsg.ne.jp> in
- [ruby-dev:32651]. [ruby-dev:32641]
-
-Thu Dec 20 09:06:54 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_index): wrong starting position.
-
-Thu Dec 20 06:34:27 2007 Koichi Sasada <ko1@atdot.net>
-
- * compile.c (iseq_compile_each): add pop after throw as return.
-
- * bootstraptest/test_knownbug.rb, test_syntax.rb: move resolved test.
-
- * vm_core.h, iseq.c, compile.h: add debug output code.
-
-Thu Dec 20 04:57:18 2007 Koichi Sasada <ko1@atdot.net>
-
- * compile.c (iseq_compile_each): remove unused retry entry.
-
-Thu Dec 20 04:15:41 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * */Makefile.sub (DEFS, RM): output to config.status.
-
-Thu Dec 20 02:59:05 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * common.mk (encs): create encoding directory.
-
-Thu Dec 20 02:50:28 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * enc/iso8859_{1..16}.c: adjust for ruby.
-
-Thu Dec 20 02:28:29 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * enc/iso8859_{1..16}.c: imported from Onigiruma 5.9.0.
-
-Thu Dec 20 02:23:22 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * enc/Makefile.in (RM): added.
-
- * enc/depend (encs): sort in alpha-numeric order.
-
- * enc/depend (clean, distclean): added.
-
-Thu Dec 20 01:10:52 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * compile.c (iseq_compile_each): should handle upper level eval iseq
- from break/next, and COMPILE_ERROR() breaks only one block.
- [ruby-dev:31372]
-
-Thu Dec 20 00:07:36 2007 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-
- * test/drb/drbtest.rb (test_07_public_private_protected_missing):
- followed current Ruby specification.
-
-Wed Dec 19 23:57:37 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * dir.c (dir_inspect, dir_path, dir_tell): check for frozen and closed
- is not needed. [ruby-dev:32640]
-
-Wed Dec 19 22:59:52 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (str_sublen): adjust position if position is not at the
- head of a character.
-
- * string.c (rb_str_chomp_bang): check if match start at the head
- of a character.
-
- * string.c (rb_str_chomp_bang): wrong adjust condition.
-
- * string.c (rb_str_rindex): comparison length should be based on
- bytes, not characters.
-
- * string.c (rb_str_rindex_m): too much adjustment.
-
- * re.c (reg_match_pos): pos adjustment should be based on
- characters.
-
- * test/ruby/test_m17n.rb (TestM17N::test_str_insert): test updated
- to check negative offset behavior.
-
- * string.c (rb_str_each_line): should consider rslen.
-
- * string.c (rb_str_buf_append): should propagate encoding.
-
- * string.c (rb_str_each_line): ditto.
-
- * test/ruby/test_m17n.rb (TestM17N::test_str_each_line): should
- check encoding as well.
-
- * test/ruby/test_m17n.rb (TestM17N::test_str_each_line): empty
- array can not propagate encoding; should not check.
-
-Wed Dec 19 21:42:18 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * re.c (rb_reg_regsub): should set checked encoding.
-
- * string.c (rb_str_sub_bang): applied r14212 too.
-
-Wed Dec 19 20:40:01 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * bignum.c (bigmul1): C99ism.
-
- * bignum.c (bigdivrem1): need dummy return value.
-
-Wed Dec 19 19:18:06 2007 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/nkf/nkf-utf8/nkf.c: Updated.
-
- * ext/nkf/nkf.c (rb_nkf_enc_get): added.
- (find encoding or replicate default encoding)
-
- * ext/nkf/nkf.c (NKF::<ENCODING>): redefine encoding constant.
-
- * ext/nkf/lib/kconv.rb (Kconv::<ENCODING>): redefined as Encoding.
-
- * ext/nkf/lib/kconv.rb: refactoring.
-
-Wed Dec 19 19:11:08 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bignum.c (rb_big_mul0): blocking check for bigger numbers.
- a patch from Yusuke ENDOH <mame AT tsg.ne.jp> in [ruby-dev:32632].
-
- * bignum.c (bigdivrem): ditto.
-
-Wed Dec 19 17:34:50 2007 Koichi Sasada <ko1@atdot.net>
-
- * compile.c (iseq_compile_each): remove "retry" in block.
- ("iter{retry}" cause syntax error)
- Currently, "begin; ...; rescue; iter{retry}; end" cause
- syntax error too.
-
- * bootstraptest/test_jump.rb: ditto.
-
- * lib/drb/invokemethod.rb: ditto.
-
- * sample/drb/darrayc.rb: ditto.
-
- * sample/test.rb: ditto.
-
- * test/drb/drbtest.rb: ditto.
-
- * test/ruby/test_iterator.rb: ditto.
-
- * sample/test.rb: add a 'test' directory on the SYSTEM test.
-
-Wed Dec 19 17:12:59 2007 Koichi Sasada <ko1@atdot.net>
-
- * bootstraptest/test_knownbug.rb, test_block.rb:
- move fixed bug.
-
- * bootstraptest/test_m17n.rb: added.
-
-Wed Dec 19 16:59:55 2007 Koichi Sasada <ko1@atdot.net>
-
- * eval.c (errinfo_place): skip if error is Fixnum. [ruby-dev:32608]
-
- * bootstraptest/test_exception.rb, test_known_bug.rb: move fixed bug.
-
-Wed Dec 19 16:31:58 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (reg_named_capture_assign_iter): remove C99 dependency.
-
- * parse.y (reg_named_capture_assign_iter): get rid of creating
- unnecessary ID.
-
- * parse.y (rb_enc_symname2_p): check for non-nul-terminated string.
-
-Wed Dec 19 15:37:06 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * insnhelper.ci (vm_yield_with_cfunc): call cfunc with
- (argv[0], data, argc, argv) to pass all arguments.
-
- * enumerator.c (enumerator_each_i): adapted to new calling
- convention.
-
-Wed Dec 19 15:13:20 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_justify): should propagate encoding from pad
- string too.
+ * lib/date.rb: don't freeze nil even if 1.8 will not be aware of
+ the issue. [ruby-dev:32677]
Wed Dec 19 13:57:43 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (TIMEZONE_VOID): check whether timezone requires zero
arguments. [ruby-dev:32631]
-Wed Dec 19 13:22:14 2007 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/nkf/nkf.c (NKF::_ENCODING): removed.
-
- * ext/nkf/nkf.c (rb_nkf_kconv): renamed to rb_nkf_convert.
-
- * ext/nkf/nkf.c (rb_nkf_convert): set encoding.
+Wed Dec 19 12:01:42 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/nkf/nkf.c (rb_nkf_guess1): removed.
-
- * ext/nkf/nkf.c (rb_nkf_guess2): renamed to rb_nkf_guess.
-
- * ext/nkf/nkf.c (rb_nkf_guess):
- guess method now returns encoding object.
-
- * ext/nkf/nkf-utf8/nkf.c: Update to nkf 2.0.8 2007-12-19.
+ * parse.y (f_rest_arg): check if duplicated. [ruby-core:14140]
Wed Dec 19 10:52:29 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* bignum.c (rb_cstr_to_inum): an underscore succeeding after octal
prefix is allowed. [ruby-core:14139]
-Wed Dec 19 00:09:19 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bignum.c (rb_cstr_to_inum): wrong radix check. a patch from
- Yusuke ENDOH <mame AT tsg.ne.jp> in [ruby-dev:32628].
-
- * bignum.c (big2str_find_n1): ditto.
-
-Tue Dec 18 23:53:53 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * compile.c (iseq_compile_each): fix for segfault. [ruby-dev:31372]
-
-Tue Dec 18 23:44:32 2007 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * test/net/http/utils.rb: split TestNetHTTPUtils module from
- test/net/http/test_http.rb. and start HTTP server in each test case.
-
-Tue Dec 18 23:27:51 2007 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/webrick/server.rb (WEBrick::GenericServer#accept_client):
- should rescue Errno::EINVAL from TCPServer#accept. this exception
- might occur if the server socket is not in ready to listen.
-
- * lib/webrick/server.rb (WEBrick::GenericServer#accept_client):
- don't call TCPServer#close if the :ShutdownSocketWithoutClose is set.
-
- * lib/webrick/config.rb (WEBrick::Config::General): add new parameter
- :ShutdownSocketWithoutClose.
-
-Tue Dec 18 22:51:47 2007 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/lib/openssl/ssl.rb (OpenSSL::SSL::SSLServer#shutdown):
- new method which calls TCPSocket#shutdown of the underlying socket.
-
-Tue Dec 18 22:11:50 2007 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/rss/parser.rb, lib/rss/atom.rb, lib/rss/rss.rb,
- test/rss/rss-assertions.rb, test/rss/test_atom.rb: use
- pack/unpack("m") instead of base64 library.
-
- * lib/webrick/httpproxy.rb: use delete("\n") instead of chomp/chop
- because the result of pack("m") might be multi-line.
-
-Tue Dec 18 22:12:35 2007 Koichi Sasada <ko1@atdot.net>
-
- * insnhelper.ci, vm.c: rewrite sp manipulation around method/block
- invocation. [ruby-dev:32547]
-
-Tue Dec 18 22:11:23 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/dl/win32/lib/win32/sspi.rb: use pack/unpack("m") instead of
- base64 library which was already removed.
-
-Tue Dec 18 21:09:23 2007 Koichi Sasada <ko1@atdot.net>
-
- * vm.c (invoke_block): merge 2 stack overflow checks.
-
-Tue Dec 18 20:58:35 2007 Koichi Sasada <ko1@atdot.net>
-
- * compile.c, insnhelper.ci, insns.def, object.c, vm.c, vm.h:
- optimize !@, != method invocation.
-
- * id.c, id.h: ditto.
-
- * bootstraptest/test_syntax.rb: add tests for above.
-
-Tue Dec 18 18:10:05 2007 Koichi Sasada <ko1@atdot.net>
-
- * bootstraptest/test_knownbug.rb: add issues.
-
-Tue Dec 18 20:22:44 2007 Tanaka Akira <akr@fsij.org>
-
- * parse.y (arg tMATCH arg): call reg_named_capture_assign_gen if regexp
- literal is used.
- (reg_named_capture_assign_gen): assign the result of named capture
- into local variables.
- [ruby-dev:32588]
-
- * re.c: document the assignment by named captures.
-
-Tue Dec 18 18:09:15 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_splice): propagate encoding.
-
- * string.c (rb_str_subpat_set): ditto.
-
-Tue Dec 18 17:27:12 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (rb_obj_freeze): preserve frozen state of immediate
- values in internal hash table, a la generic_ivar.
-
- * object.c (rb_obj_frozen_p): check immediate values too.
-
- * variable.c (generic_ivar_set): add frozen check fro immediate
- values.
-
-Tue Dec 18 17:04:25 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * transcode.c (rb_str_transcode_bang, rb_str_transcode): set new
- encoding even if no conversion is done because of 7bit only.
- [ruby-dev:32591]
-
-Tue Dec 18 15:43:59 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (encs, ext/ripper/ripper.c): other options must come
- before MAKEFLAGS in GNU make.
-
-Tue Dec 18 15:19:55 2007 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc/parsers/parse_rb.rb: Don't call private fail anymore.
-
-Tue Dec 18 15:17:26 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (encs, ext/ripper/ripper.c): pass MAKEFLAGS.
-
-Tue Dec 18 14:45:25 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (op_tbl): remove duplication to avoid symbol aliases.
-
-Tue Dec 18 14:39:05 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (str_nth): need not to raise out-of-range exception.
-
- * test/ruby/test_m17n.rb (TestM17N::test_str_aref_len): removed
- debug print.
-
-Tue Dec 18 14:05:23 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * enc/depend: get rid of target expanded as empty for nmake.
-
-Tue Dec 18 07:56:57 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * proc.c (rb_obj_public_method): Object#public_method to retrieve
- public method object.
-
- * proc.c (rb_mod_public_instance_method): Module#public_instance_method
- to retrieve public instance method from class / module.
-
- * proc.c (mnew): visibility check added.
-
- * eval_error.ci (rb_print_undef): add rb_ prefix.
-
- * eval_error.ci (rb_print_undef): add visibility in the error
- message.
-
-Tue Dec 18 05:54:26 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/Env.rb, lib/base64.rb, lib/importenv.rb, lib/eregex.rb: removed.
-
- * lib/ping.rb, lib/readbytes.rb: removed
-
-Tue Dec 18 02:30:56 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (BUILTIN_ENCS): removed.
-
- * common.mk (enc.mk): pass BUILTIN_ENCS from command line.
-
- * enc/depend: ditto.
-
- * enc/make_encmake.rb: ditto.
-
-Tue Dec 18 01:46:48 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * sprintf.c (rb_str_format): need to clear output buffer to avoid
- broken encoding compatibility check.
-
-Tue Dec 18 01:40:20 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb (depend_rules): inserts ruby to only headers.
-
-Tue Dec 18 01:21:19 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (parser_encode_length): chomp eol style modifiers.
-
- * parse.y (parser_magic_comment): ditto.
-
- * parse.y (set_file_encoding): ditto.
-
-Tue Dec 18 01:15:44 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (encs): added dependencies.
-
- * enc/Makefile.in, enc/depend, enc/make_encmake.rb: moved serb code.
-
- * lib/mkmf.rb (depend_rules): now takes content string, not file name.
-
- * win32/enc-setup.mak: overrides default target.
-
-Tue Dec 18 00:26:12 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * re.c (rb_reg_initialize): raise error if non-Unicode fixed
- encoding option is specified for regexp literals with \u{}
- escapes.
-
- * string.c (rb_str_squeeze_bang): should squeeze multibyte
- characters as well.
-
-Mon Dec 17 21:41:25 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/enc-setup.mak: extracts BUILTIN_ENCOBJS.
-
- * tool/compile_prelude.rb: needs srcdir.
-
-Mon Dec 17 21:24:04 2007 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * common.mk (miniprelude.c): add -I$(srcdir).
-
-Mon Dec 17 20:53:27 2007 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/ossl_ssl.c (ossl_sslctx_set_ssl_version):
- new method OpenSSL::SSL::SSLContext#ssl_version to wrap
- SSL_CTX_set_ssl_version.
-
- * ext/openssl/ossl_ssl.c (ossl_ssl_get_verify_result):
- new method OpenSSL::SSL::SSLSocket#verify_result to wrap
- SSL_get_verify_result.
-
- * ext/openssl/lib/openssl/ssl.rb (OpenSSL::SSL::SSLContext.build):
- new method to build OpenSSL::SSL::SSLContext with Hash parameters.
- this method provides safety default parameters than SSLContext.new.
-
- * ext/openssl/lib/openssl/ssl.rb (OpenSSL::SSL.verify_certificate_identity):
- new module function: pull out identity verification process
- from OpenSSL::SSL::SSLSocket#post_connection_check.
-
-Mon Dec 17 18:42:23 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (scan_once): need no encoding compatibility check.
- it's done inside of re_reg_search().
-
- * string.c (rb_str_split_m): ditto.
-
- * re.c (rb_reg_regsub): ditto.
-
-Mon Dec 17 17:50:30 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_index): check if substring is broken.
-
- * string.c (rb_str_rindex): ditto.
-
- * string.c (rb_str_succ): should carry over.
-
-Mon Dec 17 17:47:26 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Dec 17 13:43:15 2007 Tanaka Akira <akr@fsij.org>
- * common.mk (encs): new target to compile external encodings.
-
- * enc/Makefile.in: became a serb template.
-
- * enc/make_encmake.rb: creates enc.mk from enc/Makefile.in using serb.
-
- * lib/mkmf.rb (relative_from): moved from ext/extmk.rb.
-
- * lib/mkmf.rb ($extmk): true if under to top source directory, not
- only ext.
-
- * lib/mkmf.rb (depend_rules): extracted from create_makefile.
-
- * tool/serb.rb (serb): splitted from tool/compile_prelude.rb.
-
-Mon Dec 17 17:32:55 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (MAKEFILES): removed enc/Makefile.
-
- * configure.in (EXTERNAL_ENCOBJS, ENCSOS): removed.
-
- * enc/Makefile.in (BUILTIN_ENCS): includes .c suffix.
-
- * enc/depend: splitted from Makefile.in.
-
- * {bcc32,win32,wince}/setup.mak (-encs-): extracts BUILTIN_ENCOBJS.
-
-Mon Dec 17 17:07:53 2007 Tanaka Akira <akr@fsij.org>
-
- * string.c (rb_enc_str_asciionly_p): use rb_enc_str_coderange.
-
-Mon Dec 17 16:39:25 2007 Tanaka Akira <akr@fsij.org>
-
- * string.c (rb_enc_str_coderange): set ENC_CODERANGE_BROKEN using
- rb_enc_precise_mbclen.
- (rb_str_valid_encoding_p): just check coderange is
- ENC_CODERANGE_BROKEN or not.
-
-Mon Dec 17 16:04:16 2007 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/lib/openssl/buffering.rb (Buffering#gets): added second
- optional argument to specify maximum length limit.
-
-Mon Dec 17 16:02:30 2007 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/webrick/httprequest.rb, lib/webrick/cgi.rb: Request-Line or
- header fields should be read with maximum length. [ruby-talk:231745]
-
-Mon Dec 17 14:03:39 2007 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/encoding.h (ENC_CODERANGE_VALID): rename from
- ENC_CODERANGE_8BIT.
-
- * string.c (rb_enc_str_coderange): follow the renaming.
-
-Mon Dec 17 13:56:53 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (tr_find): wrong condition fixed.
-
- * sprintf.c (rb_str_format): check encoding based on result, not
- the format string.
-
- * string.c (rb_str_upto): add encoding check.
+ * gc.c (stack_end_address): use local variable address instead of
+ __builtin_frame_address(0) to avoid SEGV on SunOS 5.11 on x86 with
+ gcc (GCC) 3.4.3 (csl-sol210-3_4-20050802).
+ stack_end_address returned a frame address of garbage_collect
+ since stack_end_address doesn't create its own frame.
+ So a VALUE stored in a callee saved register, %edi, pushed into
+ the stack at the beginning of garbage_collect was not marked.
Mon Dec 17 12:21:25 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* Makefile.in (RUNRUBY): added RUNRUBYOPT.
-Mon Dec 17 11:38:59 2007 Tanaka Akira <akr@fsij.org>
-
- * thread_win32.ci (native_thread_create): initialize
- th->machine_stack_maxsize as rb_gc_stack_maxsize.
-
-Sun Dec 16 17:07:35 2007 Martin Duerst <duerst@it.aoyama.ac.jp>
-
- * transcode.c (transcode_loop): removed special case (-1)
- for undefined conversions.
-
- * transcode_data_iso_8859.c: Changed from character constants
- ('\xC2') to integer constants (0xC2) for shorter files and
- better readability; eliminated duplicated tables; changed
- from -1 offset to actual UNDEF entry (not yet distinguishing
- UNDEF and ILLEGAL correctly).
-
- * test/ruby/test_transcode.rb: added a test for UNDEF conversion.
-
-Sun Dec 16 14:51:59 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (MAKEFILES): should be enc/Makefile, not GNUmakefile.
- [ruby-dev:32609]
-
- * configure.in (BUILTIN_ENCS): removed escapes for OpenBSD.
-
-Sat Dec 15 23:58:46 2007 Tanaka Akira <akr@fsij.org>
-
- * test/openssl/test_pair.rb (SSLPair#ssl_pair): join the thread, even
- on an error.
-
-Sat Dec 15 23:50:31 2007 Tanaka Akira <akr@fsij.org>
-
- * test/xmlrpc/webrick_testing.rb: join webrick server thread.
-
-Sat Dec 15 22:27:39 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (BUILTIN_ENCS): splitted command line instead of
- semicolons for Solaris.
-
-Sat Dec 15 21:38:24 2007 Tanaka Akira <akr@fsij.org>
-
- * lib/timeout.rb: join the background thread to make sure it is dead.
-
-Sat Dec 15 20:20:48 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (enc/Makefile): add external encoding objects list.
-
- * common.mk (BUILTIN_ENCOBJS): renamed from ENCOBJS.
-
- * configure.in (BUILTIN_ENCS): [] needs to be enclosed because of m4.
-
- * Makefile.in (BUILTIN_ENCOBJS): substituted by autoconf.
-
- * enc/Makefile.in: new file to compile external encoding sources.
-
- * encoding.c (rb_enc_find_index): auto-load external encoding objects
- as "ext/ENCODING_NAME". [ruby-dev:32606]
-
-Sat Dec 15 13:04:30 2007 Tanaka Akira <akr@fsij.org>
-
- * vm_core.h (rb_thread_t): new member machine_stack_maxsize and
- machine_register_stack_maxsize.
-
- * gc.c (rb_gc_stack_maxsize): new global variable for the thread size
- of the main thread.
- (STACK_LEVEL_MAX): use machine_stack_maxsize of current thread.
- (ruby_stack_check): check IA64 register stack.
- (ruby_set_stack_size): set rb_gc_stack_maxsize.
- (Init_stack): set rb_gc_stack_maxsize.
-
- * thread_pthread.ci (native_thread_create): initialize
- th->machine_stack_maxsize and th->machine_register_stack_maxsize.
-
- * vm.c (Init_BareVM): initialize th->machine_stack_maxsize and
- th->machine_register_stack_maxsize.
-
- * thread_win32.ci (native_thread_create): initialize
- th->machine_stack_maxsize. not tested. just a guess at all.
-
- [ruby-dev:32604]
-
-Sat Dec 15 12:58:00 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * encoding.c (rb_enc_register, rb_enc_replicate, rb_enc_alias): check
- if already registered.
-
-Sat Dec 15 01:57:06 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/rdoc/options.rb (Options::parse): do not access $KCODE any
- longer. [ruby-core:14079]
-
- * lib/irb/init.rb (IRB::IRB.parse_opts): ditto.
-
- * lib/cgi.rb (CGI::CGI): ditto.
-
-Fri Dec 14 18:18:31 2007 Tanaka Akira <akr@fsij.org>
-
- * thread_pthread.ci (native_thread_create): twice the stack size.
- 512KB is not enough to complete test-all on Debian GNU/Linux on
- IA64.
-
-Fri Dec 14 16:10:50 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_f_p): RDoc update. a patch from murphy <murphy AT rubychan.de>.
- [ruby-core:14010]
-
-Fri Dec 14 16:06:18 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_cmp): encoding aware comparison.
-
- * string.c (rb_str_casecmp): ditto.
-
-Fri Dec 14 15:25:30 2007 Martin Duerst <duerst@it.aoyama.ac.jp>
-
- * transcode.c (encoding_equal): new function.
-
- * transcode.c (str_transcode, transcode_dispatch): added two-step
- conversion logic via UTF-8.
-
- * transcode.c: some minor formatting fixes
-
- * transcode_data.h, transcode_data_iso_8859.c: Shortened
- extremely frequently used macros to shorten file length.
-
- * test/ruby/test_transcode.rb: Fixed name of test class;
- added setup method to ensure all necessary encodings exist;
- split tests into more test methods; added tests; fixed ordering
- of arguments in assert_equal to have expected result first.
-
-Fri Dec 14 13:47:54 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (ruby.imp): fix for circular dependency. a patch from
- Yutaka Kanemoto <kinpoco AT gmail.com> in [ruby-dev:32590].
-
- * regint.h, st.c, ext/json/ext/generator/generator.c: suppress
- warnings on AIX.
-
Fri Dec 14 12:36:35 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (RUBY_CHECK_VARTYPE): check if a variable is defined
@@ -34095,211 +2388,14 @@ Fri Dec 14 12:36:35 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/readline/extconf.rb: should use have_func for functions instead
of have_var.
-Fri Dec 14 10:25:56 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/e2mmap.rb (Exception2MessageMapper::E2MM.Raise): $! no
- longer modifiable in 1.9.
-
-Fri Dec 14 08:17:24 2007 Tanaka Akira <akr@fsij.org>
-
- * eval.c (rb_protect): restore root_jmpbuf even if proc exits by
- break such as dbm.delete_if { break }.
-
-Fri Dec 14 02:55:41 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (str_nth): direct jump if string is 7bit only. great
- performance boost for worst case.
-
- * string.c (str_strlen): direct size if string is 7bit only.
+Tue Dec 11 00:04:05 2007 Akinori MUSHA <knu@iDaemons.org>
-Fri Dec 14 02:29:32 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * array.c (rb_ary_slice_bang): If an invalid negative index (<
+ -size) is given, do not raise an exception but return nil just
+ like slice() does.
- * encoding.c (rb_enc_compatible): 1st argument (typically the
- receiver) would have higher priority in encoding detection.
-
-Fri Dec 14 02:05:42 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_io_synchronized): should check if initialized.
- [ruby-dev:32585]
-
-Fri Dec 14 00:54:40 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * re.c (rb_reg_initialize): embedded string may override encoding
- of the regular expression.
-
- * re.c (rb_reg_initialize): fix encoding of regular expression if
- embedded string has its own encoding specified.
-
-Thu Dec 13 22:16:46 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * encoding.c (rb_enc_compatible): encoding should never fall back
- to ASCII-8BIT unless both encodings are ASCII-8BIT.
-
-Thu Dec 13 20:31:28 2007 Tanaka Akira <akr@fsij.org>
-
- * string.c (rb_str_shared_replace): make str noembed after free.
-
-Thu Dec 13 20:09:09 2007 Tanaka Akira <akr@fsij.org>
-
- * eval.c (rb_protect): restore root_jmpbuf to avoid SEGV by
- 'IO.pipe; [].each.next' with gcc version 3.3.5 (Debian 1:3.3.5-13)
- on IA64.
-
-Thu Dec 13 17:51:54 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_split_m): need not to check encoding if regexp
- is empty.
-
- * string.c (rb_str_justify): associate encoding of original to the
- result.
-
- * string.c (rb_str_chomp_bang): need to check encoding of record
- separator.
-
- * string.c (str_gsub): should copy encoding to the result.
-
- * sprintf.c (rb_str_format): ditto.
-
- * string.c (rb_str_succ): should not enter infinite loop for
- non-ASCII, non-alphanumeric character at the bottom.
-
-Thu Dec 13 17:03:29 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * encoding.c (rb_enc_compatible): should swap encoding indexes too.
-
-Thu Dec 13 16:41:37 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * encoding.c (rb_enc_compatible): should not judge compatibility
- based on rb_enc_asciicompat().
-
-Thu Dec 13 13:09:03 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * include/ruby/io.h (MakeOpenFile): fptr->enc should be
- initialized to zero. [ruby-dev:32569]
-
-Thu Dec 13 08:56:01 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_io_getc): use default external encoding if fptr->enc is
- not set. [ruby-dev:32565]
-
- * lib/rubygems/package.rb (Gem::TarReader::Entry::rewind): typo fixed.
- [ruby-dev:32565]
-
-Thu Dec 13 08:24:16 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (read_all): should associate default external encoding.
-
- * io.c (io_read): should NOT associate default external encoding.
-
-Wed Dec 12 23:22:58 2007 Tanaka Akira <akr@fsij.org>
-
- * re.c, regerror.c, string.c, parse.y, ruby.c, file.c:
- use capital letter for \xHH notation. [ruby-dev:32511]
-
-Wed Dec 12 22:21:34 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_io_mode_enc): allow specifying external encoding in
- open mode, e.g. open(path, "r:utf-8").
-
-Wed Dec 12 21:26:03 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval_method.ci (rb_alias): no need to skip aliasing when new
- equals to old. [ruby-core:13990]
-
-Wed Dec 12 16:34:53 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_io_check_readable): set default external encoding to
- STDIN.
-
- * io.c (io_enc_str): associate encoding to output string.
-
-Wed Dec 12 12:44:39 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (expr): 'not' and '!' should act as conditional
- expression. [ruby-dev:32548]
-
-Wed Dec 12 12:11:42 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * re.c (rb_reg_regsub): should copy encoding.
-
- * string.c (rb_str_sub_bang, str_gsub): should check and copy encoding
- to be replaced.
-
-Tue Dec 11 23:04:17 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * pack.c (pack_pack): RDoc update. a patch from Gary Wright
- <radar2002 AT gmail.com>. [ruby-core:13998]
-
- * pack.c (pack_unpack): ditto.
-
-Tue Dec 11 16:37:47 2007 Tanaka Akira <akr@fsij.org>
-
- * encoding.c (rb_enc_ascget): renamed from rb_enc_get_ascii.
-
- * include/ruby/encoding.h: follow the renaming.
-
- * re.c: ditto.
-
-Tue Dec 11 16:19:26 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * Makefile.in, */Makefile.sub (CP, MV): added.
-
- * common.mk (.y.c): not discard the old target until successfully
- created.
-
-Tue Dec 11 15:20:39 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (Init_Object): singleton_method_{added,removed,undefined}
- hooks should be defined for BasicObject. [ruby-dev:32531]
-
- * eval.c (Init_eval): method_missing should be defined for all
- objects; moved to BasicObject.
-
-Tue Dec 11 14:27:50 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * transcode.c (transcode_loop): get rid of SEGV at sequence can not be
- converted.
-
- * transcode.c (rb_str_transcode_bang): copy encoding. [ruby-dev:32532]
-
- * test/ruby/test_transcode.rb: added tests from Martin Duerst <duerst
- AT it.aoyama.ac.jp>. [ruby-dev:32532]
-
-Tue Dec 11 12:05:51 2007 Tanaka Akira <akr@fsij.org>
-
- * encoding.c (rb_enc_get_ascii): add an argument to provide the
- length of the returned character.
-
- * include/ruby/encoding.h (rb_enc_get_ascii): add the argument.
-
- * re.c (rb_reg_expr_str): modify rb_enc_get_ascii call.
- (rb_reg_quote): ditto.
- (rb_reg_regsub): ditto.
-
-Tue Dec 11 09:40:21 2007 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/oniguruma.h (ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE):
- parenthesize an argument.
-
-Tue Dec 11 02:23:32 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_method_missing): RDoc update patch from Hugh Sasse
- <hgs AT dmu.ac.uk>. [ruby-core:12932]
-
-Tue Dec 11 01:51:34 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/net/http.rb (Net::HTTP::get): now supports gzip
- content-encoding. a patch from Hugh Sasse <hgs AT dmu.ac.uk>.
- [ruby-core:13451]
-
-Tue Dec 11 01:21:21 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (shadowing_lvar_gen): no duplicate error for "_".
-
-Mon Dec 10 22:08:47 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * array.c (rb_ary_slice_bang): If an invalid range is given, do
- not raise an exception but return nil just like slice() does.
+ * test/ruby/test_array.rb (TestArray::test_slice,
+ TestArray::test_slice!): Pull in test cases from trunk.
Mon Dec 10 21:47:53 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
@@ -34312,412 +2408,47 @@ Mon Dec 10 21:00:30 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
of range. a patch from Akinori MUSHA <knu AT iDaemons.org>.
[ruby-dev:32518]
-Mon Dec 10 19:02:52 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * re.c (rb_reg_match): should calculate offset by converted
- operand. [ruby-cvs:21416]
-
Mon Dec 10 18:28:06 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/uri/common.rb (URI::REGEXP::PATTERN): typo in REG_NAME
regular expression. a patch from Ueda Satoshi
<s-ueda AT livedoor.jp>. [ruby-dev:32514]
-Mon Dec 10 17:46:04 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_str_tmp_new): creates hidden temporary buffer.
-
- * transcode.c (transcoding): added a pointer to function to flush.
-
- * transcode.c (transcode_loop): do not use string internal.
- [ruby-dev:32512]
-
- * transcode.c (str_transcode): allow Encoding objects.
-
- * transcode_data.h (BYTE_LOOKUP): use actual struct name.
-
-Mon Dec 10 16:52:17 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_str_insert): should not add length in bytes to index in
- chars.
-
-Mon Dec 10 14:33:50 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_f_public_send): rename invoke_method to public_send.
- it now invokes public method only no matter how it's called.
-
-Mon Dec 10 14:00:43 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * transcode.c: new file to provide encoding conversion features.
- code contributed by Martin Duerst.
-
-Mon Dec 10 13:50:33 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * re.c (rb_reg_search): return byte offset. [ruby-dev:32452]
-
- * re.c (rb_reg_match, rb_reg_match2, rb_reg_match_m): convert byte
- offset to char index.
-
- * string.c (rb_str_index): return byte offset. [ruby-dev:32472]
-
- * string.c (rb_str_split_m): calculate in byte offset.
-
-Mon Dec 10 09:56:29 2007 Koichi Sasada <ko1@atdot.net>
-
- * benchmark/bm_vm1_neq.rb, bm_vm1_not.rb: added.
-
-Mon Dec 10 07:48:14 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (parser_yylex): wrong token was generated. [ruby-dev:32498]
-
- * object.c (rb_obj_not_match): wrong test.
-
-Mon Dec 10 06:44:47 2007 Tanaka Akira <akr@fsij.org>
-
- * re.c (rb_reg_expr_str): use \xHH instead of \OOO.
-
- * regerror.c (to_ascii): ditto.
- (onig_snprintf_with_pattern): ditto.
- (onig_snprintf_with_pattern): ditto.
-
- * string.c (rb_str_inspect): ditto.
- (rb_str_dump): ditto.
-
- * parse.y (parser_yylex): ditto.
-
- * ruby.c (proc_options): ditto.
-
- * file.c (rb_f_test): ditto.
-
- [ruby-dev:32495]
-
-Mon Dec 10 06:41:00 2007 Tanaka Akira <akr@fsij.org>
-
- * re.c (rb_reg_names): new method Regexp#names.
- (rb_reg_named_captures): new method Regexp#named_captures
- (match_regexp): new method MatchData#regexp.
- (match_names): new method MatchData#names.
-
- * lib/pp.rb (MatchData#pretty_print): show names of named captures.
-
- [ruby-dev:32493]
-
-Mon Dec 10 01:35:06 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (expr): redefinable not (!) operator.
-
- * parse.y (arg): ditto.
-
- * object.c (rb_obj_not): new method "!".
-
- * object.c (rb_obj_not_equal): new method "!=".
-
- * object.c (rb_obj_not_match): new method "!~".
-
-Sun Dec 9 22:31:36 2007 Tanaka Akira <akr@fsij.org>
-
- * re.c (rb_reg_s_last_match): accept named capture's name.
-
-Sun Dec 9 15:57:53 2007 Tanaka Akira <akr@fsij.org>
-
- * re.c (match_backref_number): new function for converting a backref
- name/number to an integer.
- (match_offset): use match_backref_number.
- (match_begin): ditto.
- (match_end): ditto.
- (name_to_backref_number): raise IndexError instead of RuntimeError.
- (match_inspect): show capture index.
-
-Sun Dec 9 14:59:15 2007 Koichi Sasada <ko1@atdot.net>
-
- * eval_intern.h (CHECK_STACK_OVERFLOW): reserve frame size.
- [ruby-dev:32485]
-
-Sun Dec 9 14:38:25 2007 Koichi Sasada <ko1@atdot.net>
-
- * vm.c (rb_thread_mark): use rb_gc_mark_maybe() for
- VM stack specified by mark_stack_len. [ruby-dev:32462]
-
- * insnhelper.ci: clear vm stack extended by opt value.
-
-Sun Dec 9 14:08:47 2007 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/ruby.h (FilePathStringValue): defined. similar to
- FilePathValue but no taint check.
-
- * file.c (rb_get_path_no_checksafe): implementation of
- FilePathStringValue.
- (rb_file_s_basename): use FilePathStringValue.
- (rb_file_s_dirname): ditto.
- (rb_file_s_extname): ditto.
- (rb_file_s_split): ditto.
- (rb_file_join): ditto.
-
- * dir.c (file_s_fnmatch): ditto.
-
-Sun Dec 9 12:49:34 2007 Tanaka Akira <akr@fsij.org>
-
- * re.c (append_utf8): check unicode range.
-
Sun Dec 9 12:39:01 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/cgi.rb (read_multipart): exclude blanks from header values.
[ruby-list:44327]
-Sun Dec 9 12:18:19 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (rb_get_path): use the original object if to_path method is
- not defined. [ruby-dev:32473]
-
- * io.c (rb_f_open): call to_open on non-string objects, instead of
- to_str. [ruby-dev:32473]
-
-Sun Dec 9 12:12:23 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (tr_find): returns true if no characters to be removed is
- specified.
-
-Sun Dec 9 12:03:16 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (parser_magic_comment): delimits with a semicolon.
-
-Sun Dec 9 11:29:23 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (tr_trans): get rid of segfaults when has multibytes but
- source sets have no multibytes.
-
-Sun Dec 9 04:01:28 2007 Tanaka Akira <akr@fsij.org>
-
- * encoding.c (rb_enc_mbclen): return 1 if underlying implementation
- returns a length longer than e-p.
- (rb_enc_precise_mbclen): return needmore if underlying
- implementation returns a length longer than e-p.
-
-Sat Dec 8 17:59:40 2007 Tanaka Akira <akr@fsij.org>
-
- * signal.c (posix_signal): return value.
-
-Sat Dec 8 17:22:16 2007 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * test/openssl/test_pkcs7.rb: Remove redundant module namespace.
-
-Sat Dec 8 17:07:10 2007 Tanaka Akira <akr@fsij.org>
-
- * ruby.c (proc_options): make rb_raise format as a string literal to
- avoid warning.
-
-Sat Dec 8 16:18:16 2007 Tanaka Akira <akr@fsij.org>
-
- * re.c (rb_reg_check_preprocess): new function for validating regexp
- fragment.
-
- * parse.y (regexp): invoke reg_fragment_check.
- (reg_fragment_check): defined.
- (reg_fragment_check_gen): defined.
+Wed Dec 5 23:38:50 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Dec 8 11:06:29 2007 Tanaka Akira <akr@fsij.org>
+ * range.c (range_each): followed step_i change.
- * encoding.c (rb_enc_mbclen): make it never fail.
- (rb_enc_nth): don't check the return value of rb_enc_mbclen.
- (rb_enc_strlen): ditto.
- (rb_enc_precise_mbclen): return needmore(1) if e <= p.
- (rb_enc_get_ascii): new function for extracting ASCII character.
-
- * include/ruby/encoding.h (rb_enc_get_ascii): declared.
-
- * include/ruby/regex.h (ismbchar): removed.
-
- * re.c (rb_reg_expr_str): use rb_enc_get_ascii.
- (unescape_escaped_nonascii): use rb_enc_precise_mbclen to determine
- the termination of escaped non-ASCII character.
- (unescape_nonascii): use rb_enc_precise_mbclen.
- (rb_reg_quote): use rb_enc_get_ascii.
- (rb_reg_regsub): use rb_enc_get_ascii.
-
- * string.c (rb_str_reverse) don't check the return value of
- rb_enc_mbclen.
- (rb_str_split_m): don't call rb_enc_mbclen with e <= p.
-
- * parse.y (is_identchar): use ISASCII.
- (parser_ismbchar): removed.
- (parser_precise_mbclen): new macro.
- (parser_isascii): new macro.
- (parser_tokadd_mbchar): use parser_precise_mbclen to check invalid
- character precisely.
- (parser_tokadd_string): use parser_isascii.
- (parser_yylex): ditto.
- (is_special_global_name): don't call is_identchar with e <= p.
- (rb_enc_symname_p): ditto.
-
- [ruby-dev:32455]
-
- * ext/tk/sample/tkextlib/vu/canvSticker2.rb: remove coding cookie
- because the encoding is not UTF-8. [ruby-dev:32475]
-
-Fri Dec 7 20:21:35 2007 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/lib/net/ftptls.rb, ext/openssl/lib/net/telnets.rb:
- half-finished libraries are discontinued.
-
-Fri Dec 7 15:44:40 2007 Tanaka Akira <akr@fsij.org>
-
- * lib/pp.rb: use Hash for recursion check as inspect.
-
-Fri Dec 7 15:04:01 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * array.c (flatten): some performance improvements, based on a patch
- from Yusuke ENDOH <mame AT tsg.ne.jp> in [ruby-core:13877].
- [ruby-core:13851]
-
- * thread.c (rb_exec_recursive): use Hash instead of Array for
- performance improvement. [ruby-core:13898]
-
- * thread.c (recursive_pop): use object ID.
-
-Thu Dec 6 19:52:50 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (arg): typo fixed ("!" -> "|") in the ripper code.
-
-Thu Dec 6 19:48:41 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (arg): tUPLUS no longer works as identity operation any
- more. inspired by [ruby-talk:265532].
-
-Thu Dec 6 18:22:11 2007 Tanaka Akira <akr@fsij.org>
-
- * encoding.c (rb_enc_precise_mbclen): new function for mbclen with
- validation.
+Wed Dec 5 18:08:45 2007 Tanaka Akira <akr@fsij.org>
- * include/ruby/encoding.h (rb_enc_precise_mbclen): declared.
- (MBCLEN_CHARFOUND): new macro.
- (MBCLEN_INVALID): new macro.
- (MBCLEN_NEEDMORE): new macro.
-
- * include/ruby/oniguruma.h (OnigEncodingTypeST): replace mbc_enc_len
- by precise_mbc_enc_len.
- (ONIGENC_PRECISE_MBC_ENC_LEN): new macro.
- (ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND): new macro.
- (ONIGENC_CONSTRUCT_MBCLEN_INVALID): new macro.
- (ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE): new macro.
- (ONIGENC_MBCLEN_CHARFOUND): new macro.
- (ONIGENC_MBCLEN_INVALID): new macro.
- (ONIGENC_MBCLEN_NEEDMORE): new macro.
- (ONIGENC_MBC_ENC_LEN): use ONIGENC_PRECISE_MBC_ENC_LEN.
-
- * enc/euc_jp.c: validation implemented.
-
- * enc/sjis.c: ditto.
-
- * enc/utf8.c: ditto.
-
- * string.c (rb_str_inspect): use rb_enc_precise_mbclen for invalid
- encoding.
- (rb_str_valid_encoding_p): new method String#valid_encoding?.
-
- * io.c (rb_io_getc): use rb_enc_precise_mbclen.
-
- [ruby-dev:32438]
-
-Thu Dec 6 01:37:23 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * regparse.c (i_apply_case_fold): fix for negative character class. a
- patch from Yusuke ENDOH <mame AT tsg.ne.jp> in [ruby-core:13884].
-
-Thu Dec 6 01:00:38 2007 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/iconv/iconv.c (iconv_s_list): support NetBSD/Citrus iconv.
-
-Wed Dec 5 16:18:50 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * proc.c (rb_proc_s_new): call initialize. [ruby-core:13824]
-
- * proc.c (rb_proc_location): return file name and line number where
- the proc is defined.
-
- * thread.c (thread_s_new): call initialize. [ruby-core:13835]
-
- * thread.c (thread_initialize): split initialize method.
-
-Wed Dec 5 15:25:55 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (rb_intern3): fix to changing encoding to default, and
- uncommented r13835, which is rare but not impossible.
+ * numeric.c (int_odd_p): new method Integer#odd?.
+ (int_even_p): new method Integer#even?.
+ (int_pred): new method Integer#pred.
+ (fix_odd_p): new method Fixnum#odd?.
+ (fix_even_p): new method Fixnum#even?.
Wed Dec 5 15:15:21 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* range.c (step_i, range_step): support non-fixnum steps.
[ruby-talk:282100]
-Wed Dec 5 14:25:11 2007 Koichi Sasada <ko1@atdot.net>
-
- * compile.c (iseq_compile_each): fix typo.
-
-Wed Dec 5 13:41:25 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (yycompile): get rid of tracing while parsing.
- [ruby-dev:31351]
-
- * thread.c (ruby_suppress_tracing): added a new parameter, which
- directs to call func always.
-
-Tue Dec 4 19:56:42 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/iconv/iconv.c (iconv_convert): should not set encoding unless
- the target encoding is supported. [ruby-dev:32451]
-
-Tue Dec 4 17:34:17 2007 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/nkf/lib/kconv.rb (tojis, tosjis, toeuc, toutf8):
- set encoding. [ruby-dev:32447]
-
-Tue Dec 4 17:07:25 2007 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/json.rb, lib/json/*: moved to ext/json/lib.
-
-Tue Dec 4 16:34:46 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/iconv/iconv.c (iconv_create): achieve target encoding.
-
- * ext/iconv/iconv.c (iconv_convert, iconv_finish, iconv_iconv,
- iconv_conv): set result string encoding. [ruby-dev:32446]
-
- * ext/iconv/iconv.c (iconv_initialize, iconv_s_open): set encoding to
- Iconv instance.
-
-Tue Dec 4 14:34:35 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (process_options): reverted c flag.
-
Tue Dec 4 11:23:50 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * bignum.c (rb_cstr_to_inum): trailing spaces may exist at squeezing
- preceding 0s. [ruby-core:13873]
-
-Mon Dec 3 11:51:53 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/Win32API/*: removed or moved to ext/dl/win32.
-
- * ext/dl/win32/*: new. [ruby-dev:32387]
-
-Sun Dec 2 22:08:01 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (parser_tokadd_mbchar): fix for ASCII chars. [ruby-dev:32432]
-
- * parse.y (parser_parse_string, parser_here_document): prevent false
- error messages.
-
-Sun Dec 2 20:43:22 2007 Tanaka Akira <akr@fsij.org>
-
- * re.c (unescape_escaped_nonascii): fix mbclen argument.
+ * bignum.c (rb_cstr_to_inum): trailing spaces may exist at sqeezing
+ preceeding 0s. [ruby-core:13873]
-Sun Dec 2 15:47:57 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun Dec 2 22:43:45 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * parse.y (parser_tokadd_mbchar): check insufficient multibyte char.
- [ruby-dev:32429]
+ * eval.c (error_print): put newline unless multiple line message ends
+ with a newline. [ruby-dev:32429]
-Sun Dec 2 15:42:16 2007 Kouhei Sutou <kou@cozmixng.org>
+Sun Dec 2 15:49:20 2007 Kouhei Sutou <kou@cozmixng.org>
- * lib/rss/rss.rb, test/rss/test_version.rb: 0.2.1 -> 0.2.2.
+ * lib/rss/rss.rb, test/rss/test_version.rb, NEWS: 0.2.1 -> 0.2.2.
* lib/rss/maker/itunes.rb: fixed new_itunes_category.
* lib/rss/maker/taxonomy.rb: new_taxo_topic -> new_topic because
@@ -34726,160 +2457,41 @@ Sun Dec 2 15:42:16 2007 Kouhei Sutou <kou@cozmixng.org>
* test/rss/test_maker_itunes.rb, test/rss/test_itunes.rb: removed
needless UTF-8 characters.
-Sun Dec 2 15:18:37 2007 Koichi Sasada <ko1@atdot.net>
+Sun Dec 2 01:12:15 2007 James Edward Gray II <jeg2@ruby-lang.org>
- * insnhelper.ci (vm_callee_setup_arg): fix error message.
- [ruby-dev:32430]
-
-Sun Dec 2 09:12:48 2007 Tanaka Akira <akr@fsij.org>
-
- * parse.y (regexp): fix /#{}\xa1\xa2/e to be EUC-JP.
- (reg_fragment_setenc_gen): extracted from reg_compile_gen.
-
-Sun Dec 2 01:39:51 2007 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/intern.h (rb_uv_to_utf8): declared.
-
- * re.c (rb_reg_preprocess): new function for dynamic regexp with
- \u{} such as Regexp.new("\\u{6666}").
- (rb_reg_prepare_re): preprocess regexp for recompiling.
- (read_escaped_byte): new function.
- (unescape_escaped_nonascii): new function.
- (append_utf8): new function.
- (unescape_unicode_list): new function.
- (unescape_unicode_bmp): new function.
- (unescape_nonascii): new function.
- (rb_reg_initialize): preprocess regexp.
-
- * pack.c (rb_uv_to_utf8): renamed from uv_to_utf8.
-
- * parse.y (STR_NEW3): take func instead of has8 and hasmb.
- (parser_str_new): use default coderange mechanism except for regexp.
- (parser_tokadd_utf8): copy regexp source as-is.
- (parser_read_escape): UTF-8 stuff removed.
- (parser_tokadd_escape): has8bit and hasmb removed.
- (parser_tokadd_string): fix 8-bit single byte character with \u.
- (parser_parse_string): has8bit and hasmb removed.
- (parser_here_document): has8bit and hasmb removed.
- (parser_yylex): call parser_tokadd_utf8 instead of read_escape for
- UTF-8 character.
-
-Wed Dec 2 01:00:07 2007 James Edward Gray II <jeg2@ruby-lang.org>
+ Merged 14070 from trunk.
* lib/xmlrpc/server.rb (XMLRPC::Server#server): Improve signal handling so
pressing control-c in the controlling terminal or sending SIGTERM stops
the XML-RPC server.
-Sat Dec 1 23:04:42 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * encoding.c: rename primary_encoding -> default_external (encoding).
-
-Sat Dec 1 19:52:57 2007 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date.rb (Time#to_datetime): use nsec instead of usec.
-
- * lib/date.rb (DateTime#to_time): second minute as an argument to
- Time::utc contains fractional part in rational; hence Time
- object may keep resolution at most nanosecond.
-
-Sat Dec 1 14:36:05 2007 Koichi Sasada <ko1@atdot.net>
-
- * bootstraptest/test_knownbug.rb: move fixed bugs.
-
- * test/ruby/test_sprintf.rb: ditto.
-
- * test/yaml/test_yaml.rb: ditto.
-
-Sat Dec 1 13:24:47 2007 Koichi Sasada <ko1@atdot.net>
-
- * insnhelper.ci (vm_yield_with_cfunc): fix to passing argc on third
- parameter of IFUNC. [ruby-dev:32329]
-
- * enumerator.c: fix to pass exact number of argument.
-
- * eval.c (rb_yield_values2): added.
-
- * include/ruby/ruby.h: ditto.
-
- * bootstraptest/test_knownbug.rb: move a fixed test.
+Sat Dec 1 15:13:33 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
- * bootstraptest/test_block.rb: ditto.
+ * lib/resolv.rb: documentation update. backported from 1.9.
+ [ruby-core:13273]
-Sat Dec 1 10:45:56 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+Sat Dec 1 03:30:47 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * io.c (rb_f_open): use to_open for every non-string object. path
- object may use method_missing.
+ * parse.y (newline_node): set line from outermost node before removing
+ NODE_BEGIN. [ruby-dev:32406]
-Sat Dec 1 09:44:32 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+Fri Nov 30 21:53:28 2007 Kouhei Sutou <kou@cozmixng.org>
- * insns.def (concatarray, splatarray): use to_a instead of
- to_splat.
-
- * insnhelper.ci (caller_setup_args): ditto.
-
-Sat Dec 1 03:34:32 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (newline_node): always remove NODE_BEGIN.
-
-Fri Nov 30 23:48:07 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * signal.c (ruby_signal): use SA_SIGINFO if available.
- [ ruby-Patches-6418 ]
-
-Fri Nov 30 22:52:54 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * signal.c (trap_signm): SIGVTALRM no longer used for green
- thread. [ruby-talk:281318]
-
- * signal.c (ruby_sig_finalize): do not install SIG_DFL handler if
- previous handler is sighandler().
-
-Fri Nov 30 21:02:15 2007 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/json.rb, lib/json/add/{core.rb, rails.rb},
- test/json/test_json_rails.rb: additional files of JSON 1.1.2.
- [ruby-dev:32405]
-
-Fri Nov 30 19:33:38 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/syck/rubyext.c (rb_syck_mktime): avoid segmentation fault.
- [ruby-core:13735]
-
-Fri Nov 30 19:05:55 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enum.c (enum_count): precise argument number check.
-
- * enum.c (enum_count): return Enumerator if no block given.
-
-Fri Nov 30 16:42:50 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * lib/rss/rss.rb, test/rss/test_version.rb: 0.2.0 -> 0.2.1.
- * enum.c (enum_take_while): returns Enumerator if no block given.
+ * lib/rss/content.rb, lib/rss/content/1.0.rb,
+ lib/rss/content/2.0.rb, lib/rss/maker/content.rb,
+ test/rss/rss-testcase.rb, test/rss/test_content.rb,
+ test/rss/test_maker_content.rb: supported content:encoded with RSS
+ 2.0.
+ Suggested by Sam Lown. Thanks.
- * enum.c (enum_drop_while): ditto.
+ * NEWS: added the above changes.
Thu Nov 29 16:59:10 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (stmt): remove unnecessary NODE_BEGIN. [ruby-core:13814]
-Thu Nov 29 06:45:48 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * hash.c (rb_hash_eql): recursive comparison should be based on
- eql? [ruby-core:13803]
-
-Wed Nov 28 18:08:00 2007 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/json, lib/json, test/json: Update to JSON 1.1.2.
- (RubyForge#15447)
-
- * math.c: fix typo.
-
-Wed Nov 28 16:29:35 2007 Koichi Sasada <ko1@atdot.net>
-
- * insnhelper.ci (vm_invoke_block): should splat args.
- [ruby-dev:32392]
-
- * test/ruby/test_yield.rb: add tests for above.
-
Wed Nov 28 14:43:14 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/extmk.rb (extract_makefile): use dldflags instead of DLDFLAGS to
@@ -34890,459 +2502,29 @@ Wed Nov 28 14:43:14 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (create_makefile): support for extensions which has no
shared object.
-Wed Nov 28 02:42:10 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Nov 28 09:51:42 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * bignum.c (big2str_find_n1): removed extraneous element.
- [ruby-dev:32351], [ruby-dev:32365]
-
- * bignum.c (big2str_find_n1): returns necessary digits now.
+ * bignum.c (rb_big2str0): do not clobber space for sign.
* sprintf.c (remove_sign_bits): extends sign bit first.
-Tue Nov 27 15:53:43 2007 Koichi Sasada <ko1@atdot.net>
-
- * compile.c (iseq_compile_each): "when *[],1" dumps core.
- a patch from Yusuke ENDOH <mame AT tsg.ne.jp>. [ruby-dev:32350]
-
- * bootstraptest/test_syntax.rb: add a test for above.
-
-Tue Nov 27 15:40:05 2007 Koichi Sasada <ko1@atdot.net>
-
- * compile.c (iseq_compile_each): "a[*b] += 1" dumps core.
- a patch from Yusuke ENDOH <mame AT tsg.ne.jp>. [ruby-dev:32354]
-
- * bootstraptest/test_syntax.rb: add a test for above.
-
-Tue Nov 27 12:47:23 2007 Koichi Sasada <ko1@atdot.net>
-
- * compile.c, insns.def: change return value of "defined?"
- for $&, $1, ... . If such variables are defined,
- return "global-variable".
-
- * test/ruby/test_defined.rb: add tests.
-
- * bootstraptest/test_syntax.rb: fix a test.
-
-Tue Nov 27 11:54:46 2007 Koichi Sasada <ko1@atdot.net>
-
- * insns.def: fix typo.
-
-Tue Nov 27 11:23:20 2007 Koichi Sasada <ko1@atdot.net>
-
- * test_beginendblock.rb: add loop to wait signal.
- [ruby-dev:32332]
-
-Tue Nov 27 11:14:57 2007 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/encoding.h, encoding.c, re.c, string.c, parse.y:
- rename ENC_CODERANGE_SINGLE to ENC_CODERANGE_7BIT.
- rename ENC_CODERANGE_MULTI to ENC_CODERANGE_8BIT.
- Because single byte 8bit character, such as Shift_JIS 1byte katakana,
- is represented by ENC_CODERANGE_MULTI even if it is not multi byte.
-
-Tue Nov 27 10:45:45 2007 Koichi Sasada <ko1@atdot.net>
-
- * eval.c (rb_method_missing): fix stack trace.
-
- * bootstraptest/test_knownbug.rb: move solved tests.
-
- * bootstraptest/test_method.rb, test/ruby/test_regexp.rb: ditto.
-
-Tue Nov 27 09:57:42 2007 Koichi Sasada <ko1@atdot.net>
-
- * insns.def, compile.c: fix to allow dsym for alias/undef.
- [ruby-dev:32355]
-
- * bootstraptest/test_method.rb: add tests for above.
-
-Mon Nov 26 23:18:46 2007 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-
- * lib/drb/extserv.rb (initialize, stop_service): synchronize with
- ExtServManager.
-
- * test/drb/test_drb.rb (TestDRbEval): ignored.
-
-Mon Nov 26 17:32:16 2007 Tanaka Akira <akr@fsij.org>
-
- * re.c (Init_Regexp): new method Regexp#fixed_encoding?
- [ruby-dev:32361]
-
-Mon Nov 26 13:28:14 2007 Keiju Ishitsuka <keiju@ruby-lang.org>
-
- * lib/complex.rb: be able to create Complex(0, -0.0). [ruby-list:44268]
-
-Mon Nov 26 11:24:04 2007 Tanaka Akira <akr@fsij.org>
-
- * re.c (rb_reg_fixed_encoding_p): extracted from rb_reg_prepare_re and
- rb_reg_s_union.
- (rb_reg_s_union): refactored.
-
-Mon Nov 26 10:44:20 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (rb_read_internal, rb_sysopen_internal): remove C99 dependency.
-
-Sun Nov 25 22:21:35 2007 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/encoding.h (rb_enc_str_asciionly_p): declared.
- (rb_enc_str_asciicompat_p): defined.
-
- * re.c (rb_reg_initialize_str): use rb_enc_str_asciionly_p.
- (rb_reg_quote): return ascii-8bit string if the argument is
- ascii-only to generate encoding generic regexp if possible.
- (rb_reg_s_union): fix encoding handling. [ruby-dev:32094]
-
- * string.c (rb_enc_str_asciionly_p): defined.
-
-Sun Nov 25 12:12:03 2007 Eric Hodel <drbrain@segment7.net>
-
- * gem_prelude.rb: Import fast-loading gem_prelude.rb from RubyGems.
-
- * lib/rubygems*: Import RubyGems r1516.
-
-Sat Nov 24 23:25:52 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * test/ruby/test_eval.rb (TestEval::test_instance_eval_cvar):
- updated not to modify class variable of Object class.
-
-Fri Nov 23 17:34:24 2007 Koichi Sasada <ko1@atdot.net>
-
- * io.c: add rb_read_internal() as blocking function.
-
-Fri Nov 23 17:33:39 2007 Koichi Sasada <ko1@atdot.net>
-
- * vm.c: fix comment.
-
-Fri Nov 23 17:26:11 2007 Koichi Sasada <ko1@atdot.net>
-
- * bootstraptest/test_knownbug.rb: move solved tests.
-
- * bootstraptest/test_io.rb, test_marshal.rb, test_objectspace.rb:
- ditto.
-
- * test/ruby/test_integer.rb, test_regexp.rb: ditto.
-
-Fri Nov 23 15:59:04 2007 Tanaka Akira <akr@fsij.org>
-
- * struct.c (rb_struct_alloc_noinit): new function.
- (rb_struct_define_without_accessor): add allocator to the arguments.
-
- * range.c (range_alloc): re-introduced using rb_struct_alloc_noinit.
-
-Fri Nov 23 15:27:43 2007 Tanaka Akira <akr@fsij.org>
-
- * re.c (REG_CASESTATE): unused macro removed.
- (rb_reg_prepare_re): check encoding difference.
- (rb_reg_initialize): check 8bit byte.
-
- * parse.y (parser_tokadd_escape): fix has8bit.
-
- [ruby-dev:32113]
-
-Fri Nov 23 15:16:48 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * variable.c (rb_f_global_variables): variable names should not
- duplicate. [ruby-dev:32344]
-
-Fri Nov 23 13:34:08 2007 Tanaka Akira <akr@fsij.org>
-
- * struct.c (rb_struct_define_without_accessor): new function.
-
- * range.c (range_alloc): removed.
- (Init_Range): use rb_struct_define_without_accessor.
-
- based on [ruby-dev:32327].
-
-Fri Nov 23 11:01:54 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * re.c (match_begin): should return offset by character.
- [ruby-dev:32331]
-
- * re.c (match_end): ditto.
-
- * re.c (rb_reg_search): ditto.
-
-Fri Nov 23 10:44:24 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * compile.c (defined_expr): defined(method(x)) dumped core. a
- patch from Yusuke ENDOH <mame AT tsg.ne.jp>. [ruby-dev:32335]
-
-Wed Nov 21 18:03:49 2007 Koichi Sasada <ko1@atdot.net>
-
- * vm.c: fix to recycle thread data (VM stack).
-
- * thread.c: ditto.
-
- * benchmark/bm_vm3_thread_create_join.rb: add loop count.
-
-Wed Nov 21 18:02:10 2007 Koichi Sasada <ko1@atdot.net>
-
- * benchmark/driver.rb: add path to trunk/lib if driver runner is
- in build directory.
-
-Wed Nov 21 16:39:21 2007 Tanaka Akira <akr@fsij.org>
-
- * test/fileutils/fileasserts.rb (assert_equal_timestamp): new assert
- to test tv_sec only for filestamp resolution portability.
- (assert_same_entry): use assert_same_entry for mtime comparison.
-
-Wed Nov 21 14:55:13 2007 Koichi Sasada <ko1@atdot.net>
-
- * array.c (rb_ary_permutation): add gc guard codes.
-
-Wed Nov 21 11:16:37 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * insnhelper.ci (vm_search_normal_superclass): rename function.
-
- * insnhelper.ci (vm_search_superclass): ditto.
-
- * proc.c (struct METHOD): rename rklass -> rclass.
-
-Wed Nov 21 03:12:50 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * process.c (rb_f_system): returns nil on execution failure.
- [ruby-core:13715]
-
Wed Nov 21 01:04:12 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* object.c (nil_plus): remove unused function. [ruby-core:13737]
-Tue Nov 20 21:46:46 2007 Tanaka Akira <akr@fsij.org>
-
- * time.c (time_mload): ignore invalid digits in submicro.
-
-Tue Nov 20 20:33:32 2007 Koichi Sasada <ko1@atdot.net>
-
- * include/ruby/ruby.h: rename RFloat#double_value -> float_value.
-
- * numeric.c, parse.y: ditto.
-
-Tue Nov 20 19:36:21 2007 Koichi Sasada <ko1@atdot.net>
-
- * gc.h, vm_core.h: decl of rb_gc_save_machine_context()
- should be at vm_core.h.
-
- * include/ruby/ruby.h, intern.h: remove type rb_thread_t.
-
- * include/ruby/intern.h: change rb_unblock_function_t,
- rb_unblock_function_t.
-
- * file.c, process.c: apply above changes.
-
- * thread.c, thread_pthread.ci, thread_win32.ci: ditto.
-
- * io.c: support blocking open (2). [ruby-core:13614]
-
-Tue Nov 20 17:10:11 2007 Tanaka Akira <akr@fsij.org>
-
- * io.c (rb_io_close_on_exec_p): new method IO#close_on_exec?.
- (rb_io_set_close_on_exec): new method IO#close_on_exec=.
- [ruby-dev:32323]
-
-Tue Nov 20 16:24:31 2007 Tanaka Akira <akr@fsij.org>
-
- * gc.c (gc_mark_children): obj->as.file.fptr may be 0 for T_FILE.
-
-Tue Nov 20 15:09:00 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (parser_read_escape): has8bit flag may be set with control
- escape. [ruby-core:13722]
-
- * parse.y (parser_prepare): set begging after BOM if exists.
- [ruby-core:13718]
-
-Tue Nov 20 14:55:37 2007 Eric Hodel <drbrain@segment7.net>
-
- * lib/rubygems*: Update to RubyGems 0.9.5.
-
-Tue Nov 20 13:00:44 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * include/ruby/win32.h win32/win32.c (rb_w32_pipe_exec): use dual fd
- instead of socketpair when mode is RDWR.
-
- * io.c (pipe_open): pass &write_fd to rb_w32_pipe_exec().
-
- * io.c (popen_redirect): define only when HAVE_FORK.
-
-Tue Nov 20 12:12:04 2007 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/io.h (rb_io_t): add tied_io_for_writing member.
-
- * io.c: use tied_io_for_writing for duplex popen.
-
- * gc.c: mark tied_io_for_writing.
-
- * common.mk: gc.o depends io.h.
-
- [ruby-dev:32205]
-
-Tue Nov 20 11:59:33 2007 Tanaka Akira <akr@fsij.org>
-
- * test/drb/test_drb.rb: rename TestRubyYield to TestDRbRubyYield to
- avoid name crash with test/ruby/test_yield.rb.
- TestRuby18Yield is renamed to TestDRbRuby18Yield too.
-
-Tue Nov 20 03:24:42 2007 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-
- * lib/drb/extservm.rb: merged from ruby_1_8 branch.
-
- * lib/drb/acl.rb: ditto.
-
- * lib/drb/ssl.rb: ditto.
-
- * lib/drb/unix.rb: ditto.
-
- * lib/drb/drb.rb: ditto.
-
- * lib/drb/observer.rb: ditto.
-
- * lib/drb/invokemethod.rb: ditto.
-
- * test/drb/test_drbssl.rb: ditto.
-
- * test/drb/test_drb.rb: ditto.
-
- * test/drb/drbtest.rb: ditto.
-
- * test/drb/test_drbunix.rb: ditto.
-
-Tue Nov 20 00:52:46 2007 Tanaka Akira <akr@fsij.org>
-
- * test/fileutils/fileasserts.rb (assert_equal_time): show nsec if
- assertion fails but time.to_s equals.
- (assert_same_entry): use assert_equal_time.
-
- * test/fileutils/test_fileutils.rb (test_install): use
- assert_equal_time.
-
-Mon Nov 19 18:46:49 2007 Tanaka Akira <akr@fsij.org>
-
- * file.c (utime_internal): fallback utimensat to utimes.
-
-Mon Nov 19 17:51:27 2007 Tanaka Akira <akr@fsij.org>
-
- * configure.in: check struct timespec, clock_gettime, utimensat,
- struct stat.st_atim,
- struct stat.st_atimespec,
- struct stat.st_atimensec,
- struct stat.st_mtim,
- struct stat.st_mtimespec,
- struct stat.st_mtimensec,
- struct stat.st_ctim,
- struct stat.st_ctimespec,
- struct stat.st_ctimensec.
-
- * include/ruby/missing.h: provide struct timespec if not available.
-
- * time.c: support nanosecond-resolution using struct timespec.
- (time_nsec): new method: Time#nsec and Time#tv_nsec.
-
- * include/ruby/intern.h: provide rb_time_nano_new.
-
- * file.c (utime_internal): use utimensat if available.
- (rb_file_s_utime): refactored.
- (rb_f_test): use stat_atime, stat_mtime, stat_ctime.
- (rb_stat_cmp): check tv_nsec.
- (stat_atimespec): new function.
- (stat_atime): ditto.
- (stat_mtimespec): ditto.
- (stat_mtime): ditto.
- (stat_ctimespec): ditto.
- (stat_ctime): ditto.
- (rb_stat_atime): use stat_atime.
- (rb_file_s_atime): ditto.
- (rb_file_atime): ditto.
- (rb_stat_mtime): use stat_mtime.
- (rb_file_s_mtime): ditto.
- (rb_file_mtime): ditto.
- (rb_file_ctime): use stat_ctime.
- (rb_file_s_ctime): ditto.
- (rb_stat_ctime): ditto.
-
- * variable.c (rb_copy_generic_ivar): clear clone's instance variables
- if obj has no instance variable.
-
- * marshal.c (w_object): dump instance variables of generated string
- for TYPE_USERDEF, even if original object has instance variables.
-
- * lib/time.rb (Time#xmlschema): use nsec instead of usec.
-
- [ruby-dev:32306]
-
-Mon Nov 19 17:48:30 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (rb_class_superclass): should not raise exception for
- BasicObject. [ruby-Bugs-15668]
-
-Mon Nov 19 16:04:08 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_permutation): gives all permutations of elements
- if no argument given. a patch from Yusuke ENDOH <mame AT tsg.ne.jp>.
- [ruby-dev:32309]
-
-Mon Nov 19 02:44:07 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * compile.c (iseq_compile_each): alias and undef accept dsyms as well
- as literals. [ruby-dev:32308]
-
-Mon Nov 19 02:31:36 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval_method.ci (rb_add_method): no redefinition warning for undef.
-
-Mon Nov 19 01:53:11 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (parser_read_escape): disallow control and meta modifiers
- for non-ASCII characters. [ruby-core:13685]
-
-Sun Nov 18 20:47:41 2007 Tanaka Akira <akr@fsij.org>
-
- * marshal.c (mark_dump_arg): it may be called after dump_ensure.
-
-Sun Nov 18 18:27:47 2007 Tanaka Akira <akr@fsij.org>
-
- * time.c (time_minus): fix Time.at(2**60+1) - Time.at(2**60).
-
-Sun Nov 18 17:28:49 2007 Tanaka Akira <akr@fsij.org>
-
- * time.c (time_arg): show actual year in 2-3 digits year warning.
- (time_mdump): show actual year in "year too big to marshal" error.
-
Sun Nov 18 14:03:44 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * eval_method.ci (rb_alias): do not call hook functions until
- initialization finishes. [ruby-talk:279538]
+ * eval.c (rb_alias): do not call hook functions until initialization
+ finishes. [ruby-talk:279538]
Sun Nov 18 09:09:48 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (String#tr_cpp): make preprocessor identifiers.
-Sun Nov 18 05:19:46 2007 Tanaka Akira <akr@fsij.org>
-
- * lib/mkmf.rb (have_struct_member): define HAVE_type_member.
-
-Sat Nov 17 23:51:29 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+Sat Nov 17 13:58:11 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
* ext/win32ole/win32ole.c (ole_invoke): bug fix. [ruby-talk:279100]
-Sat Nov 17 23:21:15 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (parser_yylex): should clear parser->tokp as well.
- [ruby-dev:32250]
-
- * parse.y: remove NEED_ASSOC that break test_parser_events.
-
- * parse.y (parser_yylex): should not decrement line numbers at the
- end of file.
-
- * file.c (rb_find_file_ext): search .rb files first through in the
- loadpath.
-
-Fri Nov 16 23:31:18 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bignum.c (rb_big_odd_p): new method added. a patch from Tadashi
- Saito <shiba AT mail2.accsnet.ne.jp>. [ruby-dev:32305]
-
- * bignum.c (rb_big_even_p): ditto.
-
Fri Nov 16 17:41:34 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/iconv/iconv.c (Document-class): moved the simplest example to
@@ -35354,135 +2536,25 @@ Fri Nov 16 17:41:34 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/iconv/iconv.c (iconv_iconv): also instance method needs to be
qualified.
-Fri Nov 16 16:26:57 2007 Shugo Maeda <shugo@ruby-lang.org>
-
- * include/ruby/ruby.h: added some declarations for event hooks.
-
- * lib/profile.rb: set VM::InstructionSequence.compile_option.
-
Fri Nov 16 11:16:41 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/yaml/rubytypes.rb (String#is_binary_data?): use Integer#fdiv.
-Fri Nov 16 03:36:01 2007 why the lucky stiff <why@ruby-lang.org>
-
- * ext/syck/rubyext.c: Node#value defined twice.
-
- * lib/yaml/: several method redefinitions causing warnings.
-
-Fri Nov 16 03:01:00 2007 why the lucky stiff <why@ruby-lang.org>
-
- * lib/yaml/types.rb: Likewise, pass self to YAML::quick_emit.
-
-Fri Nov 16 02:51:59 2007 why the lucky stiff <why@ruby-lang.org>
-
- * lib/yaml.rb (quick_emit): use combination of object_id and hash to
- identify repeated object references, since GC will reuse memory of
- objects during output of YAML. [ruby-Bugs-8548] [ruby-Bugs-3698]
-
-Thu Nov 15 19:49:03 2007 NAKAMURA Usaku <usa@ruby-lang.org>
+Thu Nov 15 19:50:46 2007 NAKAMURA Usaku <usa@ruby-lang.org>
* ext/curses/extconf.rb: check macro if cannot find func.
[ruby-list:44224]
-Thu Nov 15 18:04:06 2007 Tanaka Akira <akr@fsij.org>
-
- * tool/compile_prelude.rb: fix TMP_RUBY_PREFIX for relative load path
- environment.
-
-Thu Nov 15 17:28:21 2007 Tanaka Akira <akr@fsij.org>
-
- * tool/compile_prelude.rb: absolute path may not start with a slash.
- pointed by usa.
-
-Thu Nov 15 17:07:54 2007 Tanaka Akira <akr@fsij.org>
-
- * tool/compile_prelude.rb: fix first substitution.
- use constant for prefix.
- pointed by Richard Kilmer.
-
-Thu Nov 15 14:29:56 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (prereq): added auto generated sources. [ruby-dev:32280]
-
-Thu Nov 15 12:31:13 2007 Tanaka Akira <akr@fsij.org>
-
- * tool/compile_prelude.rb: use constant for prefix.
-
-Thu Nov 15 12:24:39 2007 Tanaka Akira <akr@fsij.org>
-
- * tool/compile_prelude.rb: use simple template system for source
- code generation.
-
Thu Nov 15 12:19:14 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/cgi/session.rb (CGI::Session::FileStore::restore): use
lockfile for exclusive locks. a patch from <tommy AT tmtm.org>.
[ruby-dev:32296]
-Thu Nov 15 12:14:53 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * tool/compile_prelude.rb (c_esc): need to escape closing brace.
-
-Thu Nov 15 11:52:16 2007 Tanaka Akira <akr@fsij.org>
-
- * tool/compile_prelude.rb: adjust RbConfig::CONFIG paths relative
- to the installation path.
-
-Thu Nov 15 11:25:20 2007 Tanaka Akira <akr@fsij.org>
-
- * ruby.c (usage): fix typo on --disable-gems option.
- pointed by Richard Kilmer.
-
-Wed Nov 14 16:16:17 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * test/net/http/test_https_proxy.rb
- (HTTPSProxyTest::test_https_proxy_authentication): initialize
- local variable 't' first. [ruby-dev:32253]
-
-Wed Nov 14 15:39:24 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * test/socket/test_socket.rb: update not to use 1.8 assignment to
- external local variable in the block parameters. [ruby-dev:32251]
-
- * test/strscan/test_stringscanner.rb: avoid $KCODE, and use
- String#force_encoding(). [ruby-dev:32251]
-
-Wed Nov 14 14:04:42 2007 Tanaka Akira <akr@fsij.org>
-
- * common.mk, Makefile.in: rename prelude.c to miniprelude.c.
- rename ext_prelude.c to prelude.c
-
- * win32/Makefile.sub: ditto.
-
- * bcc32/Makefile.sub: ditto.
-
-Wed Nov 14 07:09:48 2007 Koichi Sasada <ko1@atdot.net>
-
- * blockinlining.c, compile.c, compile.h, debug.c, debug.h,
- id.c, insnhelper.h, insns.def, thread.c, thread_pthread.ci,
- thread_pthread.h, thread_win32.ci, thread_win32.h, vm.h,
- vm_dump.c, vm_evalbody.ci, vm_opts.h: fix comments and
- copyright year.
-
-Wed Nov 14 07:07:51 2007 Koichi Sasada <ko1@atdot.net>
-
- * tool/makedocs.rb, template/insnstbl.html: removed.
-
-Wed Nov 14 02:50:43 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (parse.c): dependency also needs vpath.
-
- * common.mk (node_name.inc, prelude.c): VPATH in nmake does not
- work for targets of explicit rules.
-
-Wed Nov 14 02:11:38 2007 Tanaka Akira <akr@fsij.org>
+Wed Nov 14 01:52:59 2007 Tanaka Akira <akr@fsij.org>
* missing/isinf.c (isinf): don't define if the macro is defined.
- * configure.in: no need to set ac_cv_func_isinf=yes on non-gcc
- solaris.
-
Wed Nov 14 01:34:42 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* numeric.c (round): fallback definition.
@@ -35490,43 +2562,11 @@ Wed Nov 14 01:34:42 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* numeric.c (flo_divmod, flo_round): use round() always.
[ruby-dev:32269]
-Wed Nov 14 00:33:49 2007 Koichi Sasada <ko1@atdot.net>
-
- * include/ruby/ruby.h: introduce 2 macros:
- RFLOAT_VALUE(v), DOUBLE2NUM(dbl).
- Rename RFloat#value -> RFloat#double_value.
- Do not touch RFloat#double_value directly.
-
- * bignum.c, insns.def, marshal.c, math.c, numeric.c, object.c,
- pack.c, parse.y, process.c, random.c, sprintf.c, string.c,
- time.c: apply above changes.
-
- * ext/dl/mkcallback.rb, ext/json/ext/generator/generator.c:
- ditto.
-
-Wed Nov 14 00:15:37 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * tool/ytab.sed: get rid of GNU sed feature. a patch from Laurent
- Sansonetti <laurent.sansonetti AT gmail.com> in [ruby-core:13470].
+Tue Nov 13 22:02:23 2007 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-Tue Nov 13 21:41:39 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/drb/drb.rb: remove Thread.exclusive.
- * common.mk (parse.c), ext/ripper/depend (ripper.c): process after
- bison with sed. [ruby-dev:32204]
-
- * ruby.c (proc_options): use yydebug in cmdline_options.
-
- * ruby.c (process_options): set yydebug flag of parser.
-
- * parse.y (yydebug): moved into struct parser_params.
-
- * parse.y (rb_parser_get_yydebug, rb_parser_set_yydebug): parser
- generic methods.
-
- * */Makefile.sub (parse.c): moved to common.mk.
-
- * tool/ytab.sed: comment out yydebug definition, and substitute
- yyerror with parser_yyerror.
+ * lib/drb/extservm.rb: ditto.
Tue Nov 13 16:33:07 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
@@ -35535,367 +2575,39 @@ Tue Nov 13 16:33:07 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* numeric.c (flo_divmod): work around for platforms have no round().
[ruby-dev:32247]
-Tue Nov 13 15:26:33 2007 Tanaka Akira <akr@fsij.org>
-
- * lex.c.blt: moved from lex.c.
-
- * lex.c.src: copied from keywords. This is the source of lex.c.blt.
-
- * Makefile.in (lex.c): use lex.c.blt if keywords is same as lex.c.src.
-
- * win32/Makefile.sub (lex.c): re-introduce copy rule.
-
- * bcc32/Makefile.sub (lex.c): ditto.
+Tue Nov 13 13:58:51 2007 Tanaka Akira <akr@fsij.org>
- * wince/Makefile.sub (lex.c): ditto.
-
-Tue Nov 13 15:21:52 2007 Koichi Sasada <ko1@atdot.net>
-
- * compile.c (iseq_specialized_instruction): check argc.
-
-Tue Nov 13 14:44:32 2007 why the lucky stiff <why@ruby-lang.org>
-
- * test/yaml/test_yaml.rb: fixed the failing YAML Struct test
- at ko1's request.
+ * numeric.c (numeric.c): Integer#ord implemented. [ruby-dev:32206]
Tue Nov 13 02:57:04 2007 URABE Shyouhei <shyouhei@ice.uec.ac.jp>
* numeric.c (flo_divmod): round to the nearest integer.
[ ruby-Bugs-14540 ]
-Tue Nov 13 00:36:16 2007 Shugo Maeda <shugo@ruby-lang.org>
-
- * test/ruby/test_settracefunc.rb: fixed tests for set_trace_func.
-
-Mon Nov 12 19:47:29 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * thread.c (call_trace_proc): should return value.
-
-Mon Nov 12 19:45:18 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * {bcc,win}32/Makefile.sub (miniruby): use $(COMMONOBJS) and $(DMYEXT)
- instead of $(LIBRUBY_A).
-
-Mon Nov 12 18:32:53 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * {bcc,win}32/Makefile.sub (MINIOBJS): added prelude.$(OBJEXT).
-
-Mon Nov 12 17:13:23 2007 Tanaka Akira <akr@fsij.org>
-
- * Makefile.in, common.mk: add prelude.o to MINIOBJS.
-
Mon Nov 12 16:52:29 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (create_makefile): rdoc about srcprefix. a patch from
Daniel Berger <djberg96 AT gmail.com> in [ruby-core:13378].
-Mon Nov 12 16:48:09 2007 Tanaka Akira <akr@fsij.org>
-
- * Makefile.in, common.mk: add ext_prelude.o to OBJS.
-
-Mon Nov 12 13:57:39 2007 Tanaka Akira <akr@fsij.org>
-
- * configure.in (MINIDLNOBJS): removed.
- (MINIOBJS): set to dln.o if dmydln.o is not used.
-
- * Makefile.in (miniruby): use MINIOBJS instead of MINIDLNOBJS.
-
Mon Nov 12 13:53:06 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* misc/ruby-mode.el (ruby-parse-partial): handle stringified
symbols properly using ruby-forward-string.
-Mon Nov 12 12:17:59 2007 Tanaka Akira <akr@fsij.org>
-
- * configure.in (MINIDLNOBJS): defined.
-
- * Makefile.in (miniruby): use MINIDLNOBJS and COMMONOBJS instead of
- MINIOBJS and OBJS to avoid linking both dmydln.o and dln.o.
-
-Sun Nov 11 20:32:45 2007 Tanaka Akira <akr@fsij.org>
-
- * {win32,wince,bcc32}/Makefile.sub: delete lex.c rule.
-
-Sun Nov 11 19:40:52 2007 Tanaka Akira <akr@fsij.org>
-
- * Makefile.in (lex.c): simplified.
-
-Sun Nov 11 18:31:48 2007 Tanaka Akira <akr@fsij.org>
-
- * Makefile.in (lex.c): touch lex.c if gperf failed but lex.c exists.
- Although this may cause non-updated lex.c,
- svn co may generate keywords newer than lex.c especially on
- a file system which can record fractional mtime such as XFS.
-
-Sun Nov 11 17:32:46 2007 Shugo Maeda <shugo@ruby-lang.org>
-
- * insnhelper.ci (vm_call_method): pass mn->nd_clss to
- vm_call_cfunc() instead of klass.
-
- * vm.c (rb_thread_method_id_and_klass): traverse parent_iseq.
-
- * thread.c (call_trace_proc): use rb_thread_method_id_and_klass().
-
-Sun Nov 11 16:54:25 2007 Tanaka Akira <akr@fsij.org>
-
- * lex.c: renamed from lex.c.blt.
-
- * Makefile.in (lex.c): use find command to check mtime.
-
-Sun Nov 11 05:34:13 2007 Eric Hodel <drbrain@segment7.net>
-
- * bin/gem: Add forgotten gem command.
-
-Sat Nov 10 23:50:31 2007 Tanaka Akira <akr@fsij.org>
-
- * string.c (tr_trans): cast to unsigned char after dereference
- a pointer to a char to avoid SEGV with "\377".tr("a", "b").
- on FreeBSD/amd64.
-
-Sat Nov 10 23:08:53 2007 Tanaka Akira <akr@fsij.org>
-
- * configure.in, common.mk, Makefile.in: don't generate
- libminiruby-static.a.
-
-Sat Nov 10 19:46:54 2007 Tanaka Akira <akr@fsij.org>
-
- * configure.in, common.mk, Makefile.in: generate libminiruby-static.a
- which contains prelude.o for miniruby.
-
-Sat Nov 10 18:10:07 2007 Tanaka Akira <akr@fsij.org>
-
- * gem_prelude.rb: new file for gem libraries. currently empty.
-
- * common.mk: generate ext_prelude.c by prelude.rb and gem_prelude.rb.
- ruby (not miniruby) is linked with ext_prelude.o instead of
- prelude.o.
-
- * inits.c (rb_call_inits): don't call Init_prelude.
-
- * ruby.c: support --disable-gems option.
- (ruby_init_gems): new function to define Gem::Enable and
- invoke Init_prelude.
- (process_options): call ruby_init_gems just after
- ruby_init_loadpath.
-
- * tool/compile_prelude.rb: support multiple files.
-
-Sat Nov 10 17:27:55 2007 Shugo Maeda <shugo@ruby-lang.org>
-
- * thread.c (call_trace_proc): don't call ID2SYM() for ID_ALLOCATOR
- to avoid SEGV.
-
-Sat Nov 10 16:37:07 2007 Eric Hodel <drbrain@segment7.net>
-
- * lib/rubygems: Import RubyGems revision 1493.
-
- * lib/rubygems.rb: ditto.
-
- * lib/ubygems.rb: ditto.
-
- * lib/rbconfig/datadir.rb: ditto.
-
- * test/rubygems: ditto.
-
-Sat Nov 10 16:34:21 2007 Eric Hodel <drbrain@segment7.net>
-
- * lib/soap/property.rb: Don't override Enumerable#inject for 1.9.
-
-Sat Nov 10 14:43:30 2007 David Flanagan <davidflanagan@ruby-lang.org>
-
- * parse.y: use ASCII encoding for string literals that are
- 7-bit clean, fixing regression from my previous patch
-
-Sat Nov 10 13:18:54 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * {bcc32,win32}/Makefile.sub: vendor_ruby support.
-
-Fri Nov 9 23:33:16 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (parser_nextc): added single line read forward buffer.
-
- * parse.y (parser_yylex): adjust line number for fluent interface.
-
-Fri Nov 9 22:04:21 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm.h (FRAME_MAGIC_MASK_BITS): bits of FRAME_MAGIC_MASK.
-
- * insnhelper.ci (vm_call_cfunc, vm_cfunc_flags): use shift operations.
-
-Fri Nov 9 21:46:28 2007 Koichi Sasada <ko1@atdot.net>
-
- * eval.c (eval): should be volatile value for GC.
-
-Fri Nov 9 17:48:22 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (locale_encoding): guesstimate encoding from environment
- variables. [ruby-core:13315]
-
- * ruby.c (process_options): set primary encoding from environment.
-
-Fri Nov 9 16:51:42 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_io_each_byte): should update rbuf_off and rbuf_len for
- each iteration. [ruby-dev:31659][ruby-dev:32192]
-
- * variable.c (rb_cvar_set): cvar assignment obey same rule to cvar
- reference. [ruby-dev:32192]
-
-Fri Nov 9 15:52:00 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * encoding.c (enc_check_encoding, rb_set_primary_encoding): ENCODING
- is no longer in FL_USERS flags.
-
-Fri Nov 9 15:20:13 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_str_squeeze_bang): initialize squeezing table if no
- arguments given.
-
-Fri Nov 9 13:57:50 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enum.c (each_with_index_i): use rb_yield_values() for
- compatibility with Enumerator#with_index(). a patch from Yusuke
- ENDOH <mame AT tsg.ne.jp>. [ruby-dev:32195]
-
-Fri Nov 9 13:45:05 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * test/ruby/test_iterator.rb (TestIterator::IterTest::each):
- #each_pair is now alias to #each. [ruby-dev:32192]
-
- * test/ruby/test_iterator.rb (TestIterator::test_assoc_yield):
- ditto
-
-Fri Nov 9 12:56:36 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval_load.c (loaded_feature_path): check with type of given feature.
-
-Fri Nov 9 12:43:02 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * test/ruby/test_basicinstructions.rb: updated for new class
- behavior. [ruby-dev:32192]
-
- * encoding.c (enc_name): Encoding should not rely on ENCODING in
- the FL_USERS flags.
-
- * encoding.c (rb_enc_from_encoding): do not call rb_enc_associate
- for encoding itself.
-
- * encoding.c (enc_register_at): ditto.
-
- * marshal.c (r_ivar): do not set real instance variable for
- encoding data associated.
-
-Fri Nov 9 10:43:55 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (send_internal): use self in the previous frame to check for
- protected methods. [ruby-core:13254]
-
- * insnhelper.ci (vm_call_method): send! method has gone.
-
-Fri Nov 9 10:38:13 2007 Koichi Sasada <ko1@atdot.net>
+Mon Nov 12 12:38:31 2007 Tanaka Akira <akr@fsij.org>
- * marshal.c (w_object): should be SPECIAL_CONST_P() instead of
- IMMEDIATE_P().
-
-Fri Nov 9 10:29:21 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_invoke_method): check if invoked in function style.
- [ruby-core:13245]
-
- * insnhelper.ci (vm_call_cfunc, vm_cfunc_flags): stores and returns VM
- calling flags.
-
- * vm.c (rb_vm_cfunc_funcall_p): returns if the current method is
- invoked in function style.
-
-Fri Nov 9 10:10:21 2007 Koichi Sasada <ko1@atdot.net>
-
- * cont.c: add rb_context_t#type.
-
-Fri Nov 9 10:05:54 2007 Koichi Sasada <ko1@atdot.net>
-
- * ruby.c (set_arg0): fix breaking environ bugs.
+ * Makefile.in (lex.c): don't remove lex.c at first.
Fri Nov 9 07:26:04 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* random.c: update MT URL.[ruby-core:13305].
-Thu Nov 8 17:09:55 2007 David Flanagan <davidflanagan@ruby-lang.org>
-
- * object.c: improve docs for Object.tap
-
- * ChangeLog: fix bogus dates on my previous entries
-
-Thu Nov 8 15:13:56 2007 David Flanagan <davidflanagan@ruby-lang.org>
-
- * parse.y: fix segfault with \x escapes in regexps
- delete unused #if 0 code regions from previous patch
-
-Thu Nov 8 12:12:10 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * parse.y (parser_read_escape): remove C99/gcc-ism.
-
-Thu Nov 8 07:54:22 2007 David Flanagan <davidflanagan@ruby-lang.org>
-
- * parse.y: patch, based on Nobu's, work to support \u escapes
- also modifications for better coderange detection
-
- * test/ruby/test_unicode_escapes.rb: test cases
-
- * test/ruby/test_mixed_unicode_escapes.rb: mixed encoding test cases
-
-Thu Nov 8 07:14:37 2007 David Flanagan <davidflanagan@ruby-lang.org>
-
- * parse.y (rb_intern3): commented out broken code that prevented
- correct interning of multi-byte symbols. Without this patch
- :x==:x is false when x is a multi-byte character.
-
-Thu Nov 8 07:04:31 2007 David Flanagan <davidflanagan@ruby-lang.org>
-
- * string.c (tr_setup_table, tr_trans): fix test failures
- in test/ruby/test_string.rb
-
-Wed Nov 7 15:07:51 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * enum.c (enum_each_with_index): make different arrays at each
- iteration. [ruby-dev:32181]
-
-Wed Nov 7 05:17:24 2007 David Flanagan <davidflanagan@ruby-lang.org>
-
- * eval.c: fix typo in invoke_method documentation
-
-Wed Nov 7 03:52:26 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_product): core dumped with non array arguments.
- a patch from Yusuke ENDOH <mame AT tsg.ne.jp>. [ruby-dev:32180]
-
Wed Nov 7 03:32:38 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/rexml/encodings/SHIFT-JIS.rb (REXML::Encoding): place -x for
nkf conversion. a patch from <moonwolf AT moonwolf.com>.
[ruby-dev:32183]
-Wed Nov 7 02:59:49 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_each_index): should return meaningful value.
-
-Tue Nov 6 16:37:47 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval_load.c (loaded_feature_path): need to expand relative paths.
-
- * eval_load.c (rb_feature_p): check if the feature is loading with
- load path. [ruby-dev:31932]
-
- * eval_load.c (load_lock): check the result of barrier waiting.
-
- * thread.c (rb_barrier_wait): check if owned by the current thread.
-
- * thread.c (rb_barrier_release): ditto.
-
-Mon Nov 5 08:01:22 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (Init_eval): move #send to Kernel module from BasicObject.
-
Mon Nov 5 05:17:04 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/optparse.rb (OptionParser::Switch::summarize): fix for long form
@@ -35909,176 +2621,23 @@ Mon Nov 5 01:20:33 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
reimplement the parser that is simpler than the current one.
since we abandoned the plan, warning no longer required.
-Mon Nov 5 01:02:56 2007 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/http.rb (HTTPHeader#initialize): provide default
- User-Agent to fix 500 error on some corrupted HTTP servers.
- [ruby-core:13135]
-
-Mon Nov 5 00:32:32 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_f_send): allow send/__send__ to call methods of all
- visibility again. we no longer provide __send, __send!.
-
- * eval.c (rb_invoke_method): new method to honor private
- visibility. if it's invoked in a function call style, it calls
- private methods as well (previous 1.9 send behavior).
-
-Mon Nov 5 00:24:24 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/Makefile.sub: vendor_ruby support.
-
- * configure.in (RUBY_LIB): duplicated.
-
-Mon Nov 5 00:01:33 2007 Tanaka Akira <akr@fsij.org>
-
- * re.c (rb_reg_quote): quote \v as well.
-
-Sun Nov 4 23:51:59 2007 Tanaka Akira <akr@fsij.org>
-
- * re.c (rb_reg_initialize_m): use StringValuePtr instead of
- StringValueCStr because \0 exists when Regexp.new("\0").
-
-Sun Nov 4 08:11:19 2007 Tanaka Akira <akr@fsij.org>
-
- * gc.c (count_objects): count TOTAL.
-
-Sun Nov 4 03:58:32 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (tr_setup_table): use C array for characters that fit
- in a byte to gain performance.
-
- * string.c (rb_str_delete_bang): ditto.
-
- * string.c (rb_str_squeeze_bang): ditto.
-
- * string.c (rb_str_count): ditto.
-
- * string.c (tr_trans): ditto.
-
-Sun Nov 4 00:06:40 2007 Tanaka Akira <akr@fsij.org>
-
- * gc.c (count_objects): ObjectSpace.count_objects implemented.
- [ruby-core:12301]
-
-Sat Nov 3 22:49:37 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * hash.c (rb_hash_each_pair): make Hash#each to be alias to
- Hash#each_pair for compatibility and clarity.
-
- * hash.c (env_each_pair): ditto.
-
-Sat Nov 3 22:41:05 2007 Tanaka Akira <akr@fsij.org>
-
- * configure.in: --with-vendor-hdrdir implemented.
-
- * lib/mkmf.rb: check --vendor argument.
-
- * README.EXT: explain --vendor option for extconf.rb
-
- * README.EXT.ja: ditto.
-
-Sat Nov 3 20:30:48 2007 Tanaka Akira <akr@fsij.org>
-
- * configure.in: --with-vendordir implemented.
-
- * mkconfig.rb: add config to vendorlibdir and vendorarchdir.
-
- * instruby.rb: make vendor library directories.
-
- * ruby.c: insert vendor library directories into load path.
-
-Fri Nov 2 20:55:49 2007 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/content.rb, lib/rss/content/, lib/rss/maker/content.rb,
- test/rss/test_content.rb, test/rss/test_maker_content.rb,
- test/rss/rss-testcase.rb (RSS::TestCase): supported
- content:encoded with RSS 2.0.
- Suggested by Sam Lown. Thanks.
-
-Fri Nov 2 20:47:04 2007 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/rss.rb, test/rss/test_version.rb: 0.2.0 -> 0.2.1.
-
-Thu Nov 1 21:56:45 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * error.c (Init_Exception): make NameError to be subclass of
- StandardError again.
-
- * error.c (Init_Exception): make SecurityError to be subclass of
- Exception, since it's too important to be handled implicitly.
-
-Thu Nov 1 14:51:39 2007 David Flanagan <davidflanagan@ruby-lang.org>
- * enum.c (take_while_i, drop_while_i) add RTEST to handle nil return
-
-Thu Nov 1 02:12:50 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * common.mk (prereq): update the path of prelude.c.
-
- * common.mk (prelude.c): rollback a part of r13675, because it is not
- documented and causes build error.
-
-Thu Nov 1 01:52:23 2007 NAKAMURA Usaku <usa@ruby-lang.org>
+Fri Nov 2 00:13:51 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
- * enum.c (enum_drop): fix typo.
-
-Thu Nov 1 01:51:01 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * vm_core.h (ruby_current_thread): RUBY_EXTERN'ed for probeprofiler.
-
-Thu Nov 1 00:46:30 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/configure.bat, setup.mak: now can recognize OS even if
- the ``--target'' option of configure is omitted.
-
- * win32/README.win32: update the descriptions about compiler.
-
-Wed Oct 31 03:13:41 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enum.c (enum_take_while): separate with-block form.
-
- * enum.c (drop_while_i): ditto.
-
- * enum.c (enum_butfirst): abandon butfirst method. reverted.
-
-Tue Oct 30 10:03:43 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enum.c (enum_butfirst): add a new method to iterates over
- elements but first n. RDoc need to be updated.
-
- * enumerator.c (Init_Enumerator): remove unnecessary symbol
- initialization.
-
-Mon Oct 29 18:42:17 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (bvar): block-local variable can shadow outer variable.
- [ruby-core:13036]
-
-Mon Oct 29 17:58:16 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_str_substr): performance improvement. [ruby-dev:31806]
-
-Mon Oct 29 17:20:13 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * encoding.c (rb_enc_replicate): new function to replicate encoding.
-
- * encoding.c (enc_based_encoding): Encoding#base_encoding returns
- based encoding of replica.
-
-Mon Oct 29 17:18:36 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * array.c (rb_ary_assoc): check and convert inner arrays (assocs)
+ using #to_ary.
- * encoding.c (rb_enc_compatible): ASCII encoding is compatible with
- ASCII-compatible encoding, even for non-string objects.
+ * hash.c (rb_hash_s_create): check and convert argument hash
+ using #to_hash.
-Sun Oct 28 21:50:02 2007 Tanaka Akira <akr@fsij.org>
+ * hash.c (rb_hash_s_create): Hash#[] now takes assocs as source of
+ hash conversion.
- * lib/open-uri.rb: :redirect option implemented to disable redirects.
- (OpenURI::HTTPRedirect): new exception class for redirection.
+Thu Nov 1 23:47:43 2007 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-Fri Oct 26 17:38:13 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/drb/drb.rb (DRbTCPSocket): Improving with multiple network
+ interface.
- * numeric.c (int_chr): take an optional encoding parameter.
- [ruby-core:12816]
+ * test/drb/drbtest.rb: ditto.
Fri Oct 26 17:14:14 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
@@ -36086,344 +2645,107 @@ Fri Oct 26 17:14:14 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* numeric.c (fix_pow): returns infinity for 0**-1. [ruby-dev:32084]
-Fri Oct 26 15:00:52 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * misc/ruby-style.el (ruby-style-{case,label}-indent): adjust for
- labels inside switch block.
-
-Fri Oct 26 05:48:57 2007 David Flanagan <davidflanagan@ruby-lang.org>
- * array.c: raise IndexError for negative length in rb_ary_fill
+Wed Oct 25 07:18:09 2007 James Edward Gray II <jeg2@ruby-lang.org>
-Wed Oct 25 07:12:03 2007 James Edward Gray II <jeg2@ruby-lang.org>
+ Merged 13781 from trunk.
* lib/net/telnet.rb (Net::Telnet#login): Allowing "passphrase" in
addition to "password" for Telnet login prompts. [ruby-Bugs-10746]
-Wed Oct 25 06:34:11 2007 James Edward Gray II <jeg2@ruby-lang.org>
+Wed Oct 25 06:46:21 2007 James Edward Gray II <jeg2@ruby-lang.org>
+
+ Merged 13779 from trunk.
* lib/net/telnet.rb (Net::Telnet#login): Making the password prompt
pattern case insensitive. [ruby-Bugs-10746]
-Fri Oct 26 04:21:36 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/net/pop.rb (Net::POP3::do_start): type fixed. a patch from
- Dan Zwell <dzwell AT zwell.net> in [ruby-core:12941].
-
-Fri Oct 26 01:48:28 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_assoc): check and convert inner arrays (assocs)
- using #to_ary.
-
- * hash.c (rb_hash_s_create): check and convert argument hash
- using #to_hash.
-
- * hash.c (rb_hash_s_create): Hash#[] now takes assocs as source of
- hash conversion.
-
-Thu Oct 25 16:46:05 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (parser_yylex): dot at the head of the line denote line
- continuation from previous one to support fluent interface.
- [experimental]
-
- * misc/ruby-mode.el (ruby-calculate-indent): support fluent dot.
-
Thu Oct 25 14:19:33 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (rb_io_tell, rb_io_seek): check errno too. [ruby-dev:32093]
-Thu Oct 25 13:59:53 2007 David Flanagan <davidflanagan@ruby-lang.org>
+Wed Oct 25 08:03:53 2007 James Edward Gray II <jeg2@ruby-lang.org>
- * parse.y (parser_tokspace): increment tokidx
- fixes test failure at [test/ruby/test_stringchar.rb:72]
-
-Thu Oct 25 09:49:49 2007 akira yamada <akira@ruby-lang.org>
-
- * lib/uri.rb, lib/uri/ldaps.rb: added LDAPS
- scheme. [ruby-dev:31896]
-
-Wed Oct 25 06:23:14 2007 James Edward Gray II <jeg2@ruby-lang.org>
+ Merged 13767, 13768, 13769, and 13770 from trunk.
* lib/xmlrpc/parser.rb (XMLRPC::Convert::dateTime): Fixing a bug that
caused time zone conversion to fail for some ISO 8601 date formats.
[ruby-Bugs-12677]
-Wed Oct 25 04:59:28 2007 James Edward Gray II <jeg2@ruby-lang.org>
-
* lib/xmlrpc/client.rb (XMLRPC::Client#do_rpc): Explicitly start
the HTTP connection to support keepalive requests. [ruby-Bugs-9353]
-Wed Oct 25 04:46:53 2007 James Edward Gray II <jeg2@ruby-lang.org>
-
* lib/xmlrpc/client.rb (XMLRPC::Client#do_rpc): Improving the error
message for Content-Type check failures. [ruby-core:12163]
-Wed Oct 25 03:45:08 2007 James Edward Gray II <jeg2@ruby-lang.org>
-
* lib/xmlrpc/utils.rb (XMLRPC::ParseContentType#parse_content_type):
Making Content-Type checks case insensitive. [ruby-Bugs-3367]
-Wed Oct 24 17:09:39 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (parser_tokspace): make space in token buffer.
-
- * parse.y (parser_yylex): fix encoding of single character literal.
-
-Tue Oct 23 13:44:14 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (call_args2): nd_head of NODE_BLOCK_PASS should be a list.
- [ruby-core:12850]
-
-Tue Oct 23 10:42:51 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (process_options): encoding set by command line option takes
- priority over the encoding in the source, as the primary encoding.
-
-Mon Oct 22 19:24:33 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ruby.c (proc_options): allow space after -E (encoding) option.
-
-Mon Oct 22 11:03:09 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * encoding.c (enc_check_encoding): returns index now.
-
- * encoding.c (rb_enc_compatible): check if two objects have compatible
- encodings.
-
- * encoding.c (enc_compatible_p): added Encoding.compatible?.
-
- * include/ruby/encoding.h (rb_enc_compatible): prototype.
-
-Sun Oct 21 18:29:17 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * encoding.c (rb_enc_default, rb_enc_primary): return pointers to
- rb_encoding of default and primary respectively. [ruby-core:12795]
-
- * encoding.c (set_primary_encoding): removed primary_encoding setter.
-
-Sat Oct 20 13:17:01 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enum.c (enum_cycle): hide temporary array from ObjectSpace.
- [ruby-core:12762]
-
-Sat Oct 20 11:49:20 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (rb_get_path): returns frozen string.
-
- * file.c (rb_file_s_chown, rb_file_s_lchown): use uid_t and gid_t.
-
-Fri Oct 19 20:08:14 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * encoding.c (rb_id_encoding): returns ID "encoding".
-
- * marshal.c (w_encoding): dump encoding name.
-
- * marshal.c (r_ivar): load encoding.
-
-Fri Oct 19 16:41:00 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (parser_regx_options, reg_compile_gen): relaxened encoding
- matching rule.
-
- * re.c (rb_reg_initialize): always set encoding of Regexp.
-
- * re.c (rb_reg_initialize_str): fix encoding for non 7bit-clean
- strings.
-
- * re.c (rb_reg_initialize_m): use ascii encoding for 'n' option.
-
-Fri Oct 19 11:09:56 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (process_options): set primary encoding from the parser
- always. [ruby-core:12758]
+Sun Oct 21 21:16:43 2007 Kouhei Sutou <kou@cozmixng.org>
- * ruby.c (load_file): should not discard the parser parameter.
-
-Fri Oct 19 10:55:42 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * range.c (range_last): removed unused variables.
-
-Thu Oct 18 17:08:57 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enum.c (enum_find_index): update RDoc. a patch from David Flanagan
- <david AT davidflanagan.com> in [ruby-core:12710].
-
- * enum.c (enum_take, enum_drop): ditto.
-
- * enum.c (enum_cycle): should not cause infinite loop for empty
- arrays. [ruby-core:12710]
-
- * range.c (Init_Range): typo fixed.
-
-Thu Oct 18 16:39:34 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/rexml/source.rb (REXML::SourceFactory::SourceFactory): more
- duck typed. better performance on JRuby.
- http://headius.blogspot.com/2007/10/another-performance-discovery-rexml.html
-
-Thu Oct 18 09:33:25 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * range.c (range_first): takes first n element if argument is
- given. [ruby-core:12697]
-
- * range.c (range_last): returns last n elements if argument is
- given.
-
- * array.c (rb_ary_subseq, rb_ary_last): export.
-
-Wed Oct 17 17:39:31 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (proc_options): fixed reversed condition. [ruby-core:12722]
-
-Wed Oct 17 13:54:28 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * re.c (rb_reg_s_union): the last check was not complete.
-
-Wed Oct 17 11:30:55 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * encoding.c (rb_enc_from_encoding, rb_enc_register): associate index
- to self.
-
- * encoding.c (enc_capable): Encoding objects are encoding capable.
-
- * re.c (rb_reg_s_union): check if encoding matching by exact encoding
- objects.
-
-Wed Oct 17 06:18:06 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * encoding.c (rb_enc_alias, rb_enc_find_index): changed
- enc_table_alias to a name-to-index hash.
-
- * encoding.c (rb_enc_init): use upper case names for aliases to use as
- constant names.
-
- * encoding.c (enc_find): allow symbols.
-
- * encoding.c (Init_Encoding): define encoding constants.
-
- * st.c (strcasehash): fix wrong code range condition.
-
-Wed Oct 17 05:07:18 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * encoding.c (rb_primary_encoding): added Encoding.primary_encoding.
-
- * parse.y (rb_parser_encoding): added.
-
- * ruby.c (proc_options): added -E and --encoding options.
-
- * ruby.c (process_options): set primary encoding from command line
- option if set, or source encoding.
-
- * include/ruby/encoding.h (rb_enc_from_encoding,
- rb_get_primary_encoding, rb_set_primary_encoding): prototypes.
-
- * include/ruby/node.h (rb_parser_encoding): prototype.
-
-Wed Oct 17 03:37:07 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * re.c (rb_reg_desc): set encoding.
-
- * re.c (rb_reg_s_union): check encodings.
-
- * enc/utf8.c (utf8_code_to_mbclen): 0xfe and 0xff are valid Unicode to
- be encoded to 2bytes in UTF-8. [ruby-core:12700]
-
-Wed Oct 17 02:50:49 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_str_ord): use encoding.
-
-Wed Oct 17 01:57:06 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * re.c (rb_reg_initialize_m): allow binary encoding option.
- [ruby-dev:32083]
-
-Tue Oct 16 19:48:01 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * re.c (rb_reg_s_union): check for encoding of original object.
-
-Tue Oct 16 18:28:51 2007 Tanaka Akira <akr@fsij.org>
-
- * debug.c: use enum for constants for gdb if possible.
-
-Tue Oct 16 18:20:10 2007 Tanaka Akira <akr@fsij.org>
-
- * ruby.c, debug.c: move debug enum and constants to debug.c.
-
-Tue Oct 16 18:16:15 2007 Tanaka Akira <akr@fsij.org>
-
- * ruby.c (RUBY_ENCODING_SHIFT): added as enum.
-
- * .gdbinit (rp): show encoding and coderange for strings.
-
-Tue Oct 16 14:48:38 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (parser_regx_options): check if regexp encoding option
- matches to current encoding.
-
- * re.c (char_to_option, rb_char_to_option_kcode): 'n' is not kcode
- option now.
-
- * re.c (rb_reg_to_s, rb_reg_error_desc): copy encoding rather than
- append as an option.
-
- * re.c (make_regexp, rb_reg_prepare_re): use encoding of Regexp and
- String instead of kcode.
+ * lib/rss.rb, lib/rss/, test/rss/, sample/rss/: merged from trunk.
+ - 0.1.6 -> 2.0.0.
+ - fixed image module URI. Thanks to Dmitry Borodaenko.
+ - supported Atom.
+ - supported ITunes module.
+ - supported Slash module.
- * re.c (rb_reg_initialize): set fixed option if none is set.
+ * NEWS: added an entry for RSS Parser.
- * re.c (rb_reg_regcomp): ditto.
+Thu Oct 18 10:57:06 2007 Tanaka Akira <akr@fsij.org>
- * re.c (rb_reg_equal): check if encodings are equal.
+ * ruby.h (RCLASS_IV_TBL): defined.
+ (RCLASS_M_TBL): ditto.
+ (RCLASS_SUPER): ditto.
+ (RMODULE_IV_TBL): ditto.
+ (RMODULE_M_TBL): ditto.
+ (RMODULE_SUPER): ditto.
- * re.c (rb_reg_initialize_m): encoding option is obsolete.
+Mon Oct 15 22:08:55 2007 Akinori MUSHA <knu@iDaemons.org>
- * re.c (rb_kcode, rb_get_kcode, rb_set_kcode): removed.
+ * NEWS: Merge some of the sub-sections, as the differences were
+ unclear.
- * re.c (Init_Regexp): removed Regexp#kcode method.
+Mon Oct 15 21:57:07 2007 Akinori MUSHA <knu@iDaemons.org>
- * ruby.c (proc_options): allow long encoding name.
+ * NEWS: Mention ipaddr enhancements.
-Tue Oct 16 14:03:09 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * lib/ipaddr.rb (in_addr, in6_addr, addr_mask): Make some minor
+ code optimization.
- * re.c (rb_reg_s_union): encoding of all regexp objects should
- match. [ruby-dev:32076]
+ * lib/ipaddr.rb (<=>): Implement IPAddr#<=> and make IPAddr
+ comparable.
-Tue Oct 16 13:49:41 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * lib/ipaddr.rb (succ): Implement IPAddr#succ. You can now create
+ a range between two IPAddr's, which (Range) object is
+ enumerable.
- * encoding.c (enc_to_s): rename function.
+ * lib/ipaddr.rb (to_range): A new method to create a Range object
+ for the (network) address.
-Tue Oct 16 13:25:46 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/ipaddr.rb (coerce_other): Support type coercion and make &,
+ |, == and include? accept a string or an integer instead of an
+ IPAddr object as the argument.
- * string.c (rb_str_new4): should copy encoding. a patch from NARUSE,
- Yui <naruse AT airemix.com>. [ruby-dev:32076]
+ * lib/ipaddr.rb (initialize): Give better error messages.
-Tue Oct 16 01:31:23 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * lib/ipaddr.rb: Improve documentation.
- * enum.c (enum_inject): RDoc update. a patch from David Flanagan
- <david AT davidflanagan.com> in [ruby-core:12710].
+Mon Oct 15 21:24:25 2007 Akinori MUSHA <knu@iDaemons.org>
-Tue Oct 16 01:25:40 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * NEWS: Mention shellwords and tempfile enhancements.
- * encoding.c (Init_Encoding): define #to_s to show encoding name
- in to_s representation as well as #inspect.
+ * NEWS: Move the entry about Tk::X_Scrollable to a better section.
-Mon Oct 15 13:24:08 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Oct 15 17:28:20 2007 NAKAMURA Usaku <usa@ruby-lang.org>
- * numeric.c (flo_round): should be number but not rounding factor.
- [ruby-dev:32060]
+ * ext/openssl/lib/openssl/buffering.rb (read, readpartial): revert
+ r12496. handling EOF is a little differnt in ruby 1.8 and ruby 1.9.
+ [ruby-dev:31979]
Mon Oct 15 11:45:12 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* marshal.c (r_bytes0): refined length check. [ruby-dev:32059]
-Mon Oct 15 10:24:19 2007 Tanaka Akira <akr@fsij.org>
-
- * process.c (pst_to_s): returns a string such as "pid 10220 exit 1"
- instead of "256". [ruby-dev:32053]
- (pst_inspect): change format
- "#<Process::Status: pid=10220,exited(1)>" to
- "#<Process::Status: pid 10220 exit 1>".
-
Mon Oct 15 09:58:07 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* marshal.c (r_bytes0): check if source has enough data.
@@ -36434,26 +2756,6 @@ Mon Oct 15 01:15:09 2007 Tanaka Akira <akr@fsij.org>
* ext/socket/socket.c (s_accept_nonblock): make accepted fd
nonblocking. [ruby-talk:274079]
-Sun Oct 14 17:31:48 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * encoding.c (rb_obj_encoding): rdoc update. a patch from David
- Flanagan <david AT davidflanagan.com>. [ruby-core:12664]
-
- * encoding.c (enc_dump, enc_load): marshaling feature. a patch from
- David Flanagan. [ruby-core:12665]
-
- * encoding.c (Init_Encoding): undefine allocator of Encoding.
- [ruby-core:12665], [ruby-core:12666]
-
- * test/ruby/test_encoding.rb: tests for Encoding from David Flanagan
- [ruby-core:12665]
-
-Sun Oct 14 11:09:09 2007 Tanaka Akira <akr@fsij.org>
-
- * lib/pp.rb (PP::PPMethods#pp_hash): don't sort keys because hash is
- ordered.
- (ENV.pretty_print): call pp_hash with sorted hash.
-
Sun Oct 14 04:08:34 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (AC_SYS_LARGEFILE): keep results also in command
@@ -36466,789 +2768,98 @@ Sun Oct 14 03:55:52 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* win32/mkexports.rb: deal with __fastcall name decorations.
[ruby-list:44111]
-Sun Oct 14 02:20:40 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * encoding.c (rb_cEncoding): new Encoding class.
-
- * encoding.c (rb_to_encoding, rb_to_encoding_index): helper functions.
-
- * encoding.c (rb_obj_encoding): return Encoding object now.
-
- * gc.c (garbage_collect): mark Encoding objects.
-
- * inits.c (rb_call_inits): call Init_Encoding.
-
- * string.c (rb_str_force_encoding): accept Encoding object as well as
- encoding name.
-
- * include/ruby/encoding.h (rb_to_encoding_index, rb_to_encoding):
- prototypes.
-
-Sun Oct 14 01:03:30 2007 Tanaka Akira <akr@fsij.org>
-
- * lib/open-uri.rb (OpenURI.open_http): fix :ssl_ca_cert option.
-
-Sat Oct 13 21:23:21 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (foletype_s_ole_classes,
- foletype_s_typelibs): refactoring.
-
- * test/win32ole/test_win32ole_type.rb: add some test.
-
- * ext/win32ole/win32ole.c (Init_win32ole): change method name
- WIN32OLE_TYPELIB.ole_types from WIN32OLE_TYPELIB.ole_classes.
-
- * test/win32ole/test_win32ole_typelib.rb: ditto.
-
- * test/win32ole/test_folderitem2_invokeverb.rb: check create
- shortcut string more strictly (This test is invoked in Japanese
- Windows environment).
-
-Sat Oct 13 09:11:58 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (set_file_encoding): case-insensitive search, a patch from
- David Flanagan <david AT davidflanagan.com> [ruby-core:12629]
-
Sat Oct 13 09:02:16 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* {bcc,win}32/mkexports.rb: explicit data. [ruby-list:44108]
-Sat Oct 13 00:17:49 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+Sat Oct 13 00:35:03 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/rexml/document.rb (REXML::Document::write): leaky
- modification trans -> transitive. [ruby-dev:32040]
-
-Sat Oct 13 00:00:33 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y: encoding specifier should work if the line matches
- /coding[:=] ?/, a la Python PEP-263, so that VIM comments like
- "# vim: set fileencoding=<encoding name>" should be recognized.
-
-Fri Oct 12 15:04:54 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (magic_comments): add "encoding" as same as "coding".
-
- * parse.y (set_file_encoding): special file encoding handling.
-
- * parse.y (parser_yylex): ditto.
-
-Fri Oct 12 12:44:11 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_combination): fixed memory corruption due to too
- small memory allocation
-
- * array.c (rb_ary_product): accessing out of memory bounds.
- condition fixed.
+ * lib/rexml/source.rb (REXML::SourceFactory::SourceFactory): typo
+ fixed. [ruby-list:44099]
Fri Oct 12 11:22:15 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* re.c (match_values_at): make #select to be alias to #values_at
to adapt RDoc description. [ruby-core:12588]
-Thu Oct 11 21:10:17 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * include/ruby/node.h (NOEX_LOCAL): remove unused local visibility.
-
- * class.c (ins_methods_push): ditto.
-
- * class.c (rb_class_local_methods): method removed.
-
-Thu Oct 11 14:29:31 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * */Makefile.sub (COMMON_MACROS): workaround for old SDK's bug.
- [ruby-core:12584]
-
-Thu Oct 11 06:35:43 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * Makefile.in, */Makefile.sub (VPATH): add enc directory.
-
- * common.mk (ENCOBJS): encoding objects.
-
- * enc: directory for encodings.
-
-Thu Oct 11 00:04:37 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * include/ruby/oniguruma.h (OnigEncodingTypeST): add OnigEncoding
- parameter to every function members.
-
- * include/ruby/oniguruma.h (OnigEncodingTypeST): add auxiliary
- data member to provide user defined data for an encoding.
-
-Wed Oct 10 23:32:15 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * re.c (rb_reg_s_quote): no longer takes optional second argument
- that has never been documented.
-
-Wed Oct 10 15:39:04 2007 Tanaka Akira <akr@fsij.org>
-
- * encoding.c (rb_enc_init): don't alias iso-8859-1 to ascii.
-
- * ascii.c (OnigEncodingASCII): change the name US-ASCII to ASCII-8BIT.
-
-Wed Oct 10 14:31:05 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_enc_str_coderange): fixed check for non-ascii.
-
-Tue Oct 9 21:35:28 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * array.c (rb_ary_permutation, rb_ary_combination): missing type
- names.
-
- * array.c (rb_ary_permutation): used buffer should be t1.
-
- * array.c (rb_ary_permutation): use frozen shared hidden array.
- [ruby-dev:31985]
-
-Tue Oct 9 16:58:10 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+Thu Oct 11 14:32:46 2007 NAKAMURA Usaku <usa@ruby-lang.org>
- * array.c: remove to_a completely.
+ * {bcc32,win32}/Makefile.sub (COMMON_MACROS): workaround for old SDK's
+ bug. [ruby-core:12584]
- * array.c (tmpbuf): keep DRY to clear klass of temporary objects.
+Wed Oct 10 23:34:45 2007 Tanaka Akira <akr@fsij.org>
-Tue Oct 9 16:33:32 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/securerandom.rb: new file. [ruby-dev:31928]
- * array.c (rb_ary_permutation, rb_ary_combination, rb_ary_product):
- hide internal buffer objects. [ruby-dev:31982]
+ * lib/cgi/session.rb (create_new_id): use securerandom if available.
-Tue Oct 9 16:00:32 2007 NAKAMURA Usaku <usa@ruby-lang.org>
+Tue Oct 9 01:01:55 2007 Tanaka Akira <akr@fsij.org>
- * parse.y (parser_read_escape, parser_tokadd_escape): check code range.
- [ruby-dev:31980]
+ * re.c (rb_reg_s_union_m): Regexp.union accepts single
+ argument which is an array of patterns. [ruby-list:44084]
-Tue Oct 9 15:40:24 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Oct 8 20:06:23 2007 GOTOU Yuuzou <gotoyuzo@notwork.org>
- * parse.y (STR_NEW3): check for if single byte sequence.
+ * lib/net/http.rb, lib/open-uri.rb: remove
+ Net::HTTP#enable_post_connection_check. [ruby-dev:31960]
-Mon Oct 8 20:06:29 2007 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/net/imap.rb, lib/net/smtp.rb, lib/net/pop.rb: hostname should
- be verified against server's identity as presented in the server's
- certificate. [ruby-dev:31960]
+ * lib/net/imap.rb: hostname should be verified against server's
+ indentity as persented in the server's certificate. [ruby-dev:31960]
* ext/openssl/lib/net/telnets.rb, ext/openssl/lib/net/ftptls.rb: ditto.
-Sun Oct 7 22:37:47 2007 Kouhei Sutou <kou@cozmixng.org>
-
- * test/rss/test_taxonomy.rb, test/rss/test_parser_1.0.rb,
- test/rss/test_image.rb, test/rss/rss-testcase.rb: ensured
- declaring XML namespaces.
-
-Sun Oct 7 22:00:01 2007 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/node.h: make node flags as VALUE type.
- enum ruby_node_flags removed.
-
- * ruby.c: define RUBY_NODE_* as const for gdb.
-
-Sun Oct 7 18:57:12 2007 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/ruby.h: enum ruby_value_flags removed. [ruby-dev:31959]
-
- * ruby.c: define RUBY_FL_* as const VALUE for gdb.
-
-Sun Oct 7 17:50:14 2007 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/net/http.rb: remove enable_post_connection_check flag.
-
- * lib/open-uri.rb: ditto.
-
-Sun Oct 7 15:48:40 2007 Koichi Sasada <ko1@atdot.net>
-
- * insns.def (opt_eq): fix to use rb_str_equal().
-
Sat Oct 6 23:14:54 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* string.c (rb_str_to_i): update RDoc since base can be any value
between 2 and 36. [ruby-talk:272879]
-Sat Oct 6 16:24:02 2007 Koichi Sasada <ko1@atdot.net>
-
- * cont.c (cont_free): check Fiber or Continuation.
-
- * bootstraptest/test_knownbug.rb: remove a fixed test.
-
-Sat Oct 6 14:56:02 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * encoding.c (rb_enc_register): returns new index or -1 if failed.
-
- * encoding.c (rb_enc_alias): check if original name is registered.
-
- * encoding.c (rb_enc_init): register in same order as kcode options in
- re.c. added new aliases.
-
- * string.c (rb_str_force_encoding): check if valid encoding name.
-
-Sat Oct 6 14:32:30 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * insns.def (opt_eq): get rid of gcc bug.
-
-Sat Oct 6 02:34:18 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * include/ruby/defines.h: no longer provide DEFAULT_KCODE.
-
-Fri Oct 5 21:24:59 2007 Tanaka Akira <akr@fsij.org>
-
- * re.c (rb_reg_s_union_m): Regexp.union accepts single argument which
- is an array of patterns. [ruby-list:44084]
-
-Fri Oct 5 16:42:27 2007 Tanaka Akira <akr@fsij.org>
-
- * bootstraptest/runner.rb (assert_not_match): new method.
-
-Fri Oct 5 16:15:52 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * configure.in: Turn on --enable-pthread by default for FreeBSD
- 5.2.1-RELEASE and later, and remove pthread support for older
- versions which has never worked perfectly.
-
-Fri Oct 5 16:11:50 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * time.c (time_to_s): Fix documentation. Time format changed.
-
-Fri Oct 5 04:02:39 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/ipaddr.rb (in_addr, in6_addr, addr_mask): Make some minor
- code optimization.
-
-Fri Oct 5 03:25:51 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/ipaddr.rb (<=>): Implement IPAddr#<=> and make IPAddr
- comparable.
-
- * lib/ipaddr.rb (succ): Implement IPAddr#succ. You can now create
- a range between two IPAddr's, which (Range) object is
- enumerable.
-
- * lib/ipaddr.rb (to_range): A new method to create a Range object
- for the (network) address.
-
-Fri Oct 5 03:14:45 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/ipaddr.rb (coerce_other): Support type coercion and make &,
- |, == and include? accept a string or an integer instead of an
- IPAddr object as the argument.
-
- * lib/ipaddr.rb (initialize): Give better error messages.
-
- * lib/ipaddr.rb: Improve documentation.
-
-Thu Oct 4 20:45:53 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * process.c (Init_process): win32 has our own WNOHANG definition, so
- remove unnecessary #ifdef guard.
-
-Thu Oct 4 20:17:19 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * array.c (rb_ary_permutation, rb_ary_product): support non C99
- compilers.
-
-Thu Oct 4 17:33:18 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * re.c (kcode_setter): Perl-ish global variable `$=' no longer
- effective.
-
- * io.c (Init_IO): remove obsolete variables: $defout, $deferr.
-
- * re.c (Init_Regexp): remove obsolete const alias: MatchingData.
-
- * time.c (Init_Time): remove obsolete Time::times.
-
- * re.c (ignorecase_setter): change warning message.
-
- * re.c (ignorecase_getter): now gives warning.
-
- * string.c (rb_str_cmp_m): update RDoc document.
-
- * re.c (kcode_setter): restore erroneously removed setter.
-
-Thu Oct 4 16:28:33 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * encoding.c (rb_obj_encoding): returns encoding of the given object.
-
- * parse.y (reg_compile_gen): copy encoding from source string if
- non-empty.
-
- * re.c (Init_Regexp): new method Regexp#encoding.
-
- * string.c (str_encoding): moved to encoding.c
-
-Thu Oct 4 15:49:33 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_permutation): remove C99 dependency.
- [ruby-dev:31934]
-
- * array.c (rb_ary_product): ditto.
-
-Wed Oct 3 23:37:17 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/nkf/nkf.c, bin/ri, bin/irb: fixed typos in doc and comments.
- a patch from Eugene Ossintsev <eugoss AT gmail.com>.
- [ruby-core:12375]
-
-Wed Oct 3 17:56:22 2007 Koichi Sasada <ko1@atdot.net>
-
- * benchmark/driver.rb: enable specify label to executable.
- (-e "ruby1::/path/to/ruby1; ruby2::/path/to/ruby2; ...")
-
-Wed Oct 3 16:58:48 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (parser_str_new, parser_yylex, rb_intern3): set code-range
- bits.
-
- * parse.y (parser_tokadd_string): check code-range.
-
- * parse.y (parser_parse_string, parser_here_document): ditto.
-
- * parse.y (parser_set_encode): check if valid encoding.
-
-Wed Oct 3 15:43:15 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * variable.c (rb_cvar_set): check whether class variable is
- defined in superclasses. root classes have higher priority.
- removes lower class variable entry from IV_TBL (if it's defined
- in classes, not modules).
-
- * variable.c (rb_cvar_get): ditto.
-
-Wed Oct 3 10:06:53 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (ruby_process_options): push frame with program name.
- [ruby-core:12351]
-
-Tue Oct 2 20:16:55 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (init_env): refactoring. remove unused code.
-
-Tue Oct 2 12:30:40 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_product): generalized product, now takes
- arbitrary number of arrays. a patch from David Flanagan
- <david AT davidflanagan.com>. [ruby-core:12346]
-
-Tue Oct 2 08:25:50 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_permutation): implementation contributed from
- David Flanagan. [ruby-core:12344]
-
- * array.c (rb_ary_combination): RDoc update to clarify. a patch
- from David Flanagan. [ruby-core:12344]
-
- * array.c (rb_ary_permutation): small dirty hack by Matz to avoid
- arrays on stack.
-
-Tue Oct 2 07:01:05 2007 Koichi Sasada <ko1@atdot.net>
-
- * proc.c (proc_dup): proc->block.proc should be self.
-
- * bootstraptest/test_knownbug.rb, test_method.rb:
- move a fixed test.
-
-Mon Oct 1 16:17:44 2007 Tanaka Akira <akr@fsij.org>
-
- * bootstraptest/test_method.rb: use assert_normal_exit to test
- [ruby-dev:31818].
-
-Mon Oct 1 15:57:49 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * gc.c (id2ref): skip ICLASS.
-
-Mon Oct 1 15:29:35 2007 Tanaka Akira <akr@fsij.org>
-
- * bootstraptest/runner.rb (assert_normal_exit): use `` instead of
- system.
-
-Mon Oct 1 15:17:48 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * gc.c (id2ref): T_VALUES is less than T_BLOCK. [ruby-dev:31911]
-
-Mon Oct 1 10:58:42 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (require_libraries): use require method instead of calling
- rb_require directly. [ruby-dev:31322]
-
-Mon Oct 1 10:52:30 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (ruby_options), ruby.c (proc_options, process_options): not
- call exit(2) directly. [ruby-dev:31912]
-
- * eval.c (ruby_run_node): deal with direct exit code.
-
-Sun Sep 30 17:12:53 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_str_append): always set encoding, and coderange
- cache bits.
-
- * include/ruby/encoding.h (ENC_CODERANGE_SET): fixed a bug not to
- set cache bits.
-
-Sun Sep 30 11:52:11 2007 Tanaka Akira <akr@fsij.org>
-
- * bootstraptest/runner.rb (pretty): don't show beginning empty line.
-
-Sun Sep 30 11:32:34 2007 Tanaka Akira <akr@fsij.org>
-
- * numeric.c: use #ifdef for test LONG_LONG_VALUE.
-
-Sun Sep 30 04:30:55 2007 Tanaka Akira <akr@fsij.org>
-
- * bignum.c: use SIZEOF_LONG instead of SIZEOF_ULONG which is not
- defined.
-
-Sun Sep 30 04:03:43 2007 Tanaka Akira <akr@fsij.org>
-
- * re.c (Init_Regexp): test DEFAULT_KCODE in C code because
- KCODE_EUC, etc. are enum.
-
-Sun Sep 30 00:55:40 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * variable.c (obj_ivar_each): get rid of warning.
-
-Sat Sep 29 17:45:22 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * main.c (main): use platform-independent per-process initialization.
- [ruby-dev:31900]
-
- * ruby.c (ruby_sysinit): new function for per-process initialization.
-
- * include/ruby/ruby.h (RUBY_GLOBAL_SETUP): toplevel setup declaration.
-
- * include/ruby/win32.h, win32/mkexports.rb: alias NtInitialize
- ruby_sysinit.
-
- * win32/win32.c (rb_w32_sysinit): renamed from NtInitialize.
-
-Sat Sep 29 17:31:04 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_combination): new method to give all combination
- of elements from an array. [ruby-list:42671]
-
- * array.c (rb_ary_product): a new method to get all combinations
- of elements from two arrays. can be extended to combinations of
- n-arrays, e.g. a.product(b,c,d). anyone volunteer?
-
- * array.c (rb_ary_permutation): empty function body to calculate
- permutations of array elements. need volunteer.
-
-Sat Sep 29 17:14:44 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * marshal.c (r_leave): move proc invocation from r_entry() to
- avoid potential crash.
-
-Sat Sep 29 12:28:08 2007 Tanaka Akira <akr@fsij.org>
-
- * bootstraptest/runner.rb (assert_normal_exit): new method.
-
- * bootstraptest/test_knownbug.rb: add test for Marshal.load.
-
-Sat Sep 29 10:12:20 2007 Tanaka Akira <akr@fsij.org>
-
- * variable.c (rb_ivar_set): fix class instance variable.
-
- * object.c (rb_class_real): cl argument may be 0.
-
-Sat Sep 29 09:12:02 2007 Tanaka Akira <akr@fsij.org>
-
- * object.c (rb_class_real): use BUILTIN_TYPE instead of TYPE.
- access flags directly instead of FL_TEST.
- they are enough because cl argument is a class.
-
-Sat Sep 29 08:57:15 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/win32.h (strcasecmp): needed for type_strcasehash.
-
-Sat Sep 29 06:47:29 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (struct cmdline_options): static variables packed.
-
-Sat Sep 29 05:29:30 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (rb_io_fdopen): create IO object from fd.
-
- * parse.y (yycompile): use encoding of the source as default.
-
- * ruby.c (proc_options, load_file): ditto.
-
-Sat Sep 29 04:27:08 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * encoding.c (rb_enc_alias): allow encodings multiple aliases.
-
- * encoding.c (rb_enc_find_index): search the encoding which has the
- given name and return its index if found, or -1.
-
- * st.c (type_strcasehash): case-insensitive string hash type.
-
- * string.c (rb_str_force_encoding): force encoding of self. this name
- comes from [ruby-dev:31894] by Martin Duerst. [ruby-dev:31744]
-
- * include/ruby/encoding.h (rb_enc_find_index, rb_enc_associate_index):
- prototyped.
-
- * include/ruby/encoding.h (rb_enc_isctype): direct interface to ctype.
-
- * include/ruby/st.h (st_init_strcasetable): prototyped.
-
-Sat Sep 29 03:53:26 2007 Koichi Sasada <ko1@atdot.net>
-
- * cont.c: Thread local storage should be fiber local.
-
- * bootstraptest/test_knownbug.rb, test/ruby/test_fiber.rb:
- move a fixed test.
-
-Fri Sep 28 23:15:31 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * insnhelper.ci (vm_call_method): allow send! to call protected
- methods as well. [ruby-core:12280]
-
-Fri Sep 28 22:33:47 2007 Koichi Sasada <ko1@atdot.net>
-
- * benchmark/bm_so_fasta.rb: added.
-
- * benchmark/bm_so_k_nucleotide.rb: added.
-
- * benchmark/bm_so_reverse_complement.rb: added.
-
- * benchmark/make_fasta_output.rb: added.
-
- * benchmark/prepare_so_k_nucleotide.rb: added.
-
- * benchmark/prepare_so_reverse_complement.rb: added.
-
-Fri Sep 28 19:14:51 2007 Koichi Sasada <ko1@atdot.net>
-
- * benchmark/driver.rb: fix notations.
-
- * benchmark/bm_loop_whileloop.rb: ditto.
-
- * benchmark/bm_loop_whileloop2.rb: ditto.
-
- * benchmark/bm_app_uri.rb: added.
-
- * benchmark/bm_vm1_ivar_set.rb: ditto.
-
- * benchmark/bm_so_binary_trees.rb: added from Computer Language
- Benchmarks Game (http://shootout.alioth.debian.org/).
-
- * benchmark/bm_so_fannkuch.rb: ditto.
-
- * benchmark/bm_so_mandelbrot.rb: ditto.
-
- * benchmark/bm_so_meteor_contest.rb: ditto.
-
- * benchmark/bm_so_nbody.rb: ditto.
-
- * benchmark/bm_so_nsieve.rb: ditto.
-
- * benchmark/bm_so_nsieve_bits.rb: ditto.
-
- * benchmark/bm_so_partial_sums.rb: ditto.
-
- * benchmark/bm_so_pidigits.rb: ditto.
-
- * benchmark/bm_so_spectralnorm.rb: ditto.
-
-Fri Sep 28 16:22:52 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * vm_core.h (rb_vm_struct): fix typo: bufferd -> buffered.
-
-Fri Sep 28 15:47:48 2007 Koichi Sasada <ko1@atdot.net>
-
- * benchmark/driver.rb: fix to output benchmark results
- to file "bmlog-#{Time.now.strftime('%Y%m%d-%H%M%S')}.#{$$}".
-
- * benchmark/bm_io_file_create.rb: remove useless codes.
-
- * benchmark/bm_vm2_eval.rb: added.
-
-Fri Sep 28 15:05:24 2007 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/intern.h: export rb_ivar_foreach.
-
- * include/ruby/ruby.h: modify struct RObject and RClass for optimizing
- T_OBJECT space. [ruby-dev:31853]
- (ROBJECT_LEN, ROBJECT_PTR)
- (RCLASS_IV_TBL, RCLASS_M_TBL, RCLASS_SUPER, RCLASS_IV_INDEX_TBL)
- (RMODULE_IV_TBL, RMODULE_M_TBL, RMODULE_SUPER): abstract accessor
- defined.
-
- * variable.c: support the modified RObject and RClass.
-
- * object.c: ditto.
-
- * class.c: ditto.
-
- * gc.c: ditto.
-
- * marshal.c: ditto.
-
- * eval_method.ci: use the abstract accessor.
-
- * insns.def: ditto.
-
- * proc.c: ditto.
-
- * struct.c: ditto.
-
- * eval.c: ditto.
-
- * error.c: ditto.
-
- * vm.c: ditto.
-
- * insnhelper.ci: ditto.
-
- * ext/digest/digest.c: ditto.
+Fri Oct 5 15:44:50 2007 Akinori MUSHA <knu@iDaemons.org>
-Fri Sep 28 13:20:10 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (rb_io_getline_fast, rb_io_getline_1): set encoding to the
- result string, as well as getc.
-
-Fri Sep 28 12:51:42 2007 Koichi Sasada <ko1@atdot.net>
-
- * benchmark/bm_app_erb.rb: added.
-
- * benchmark/bm_io_file_(create|read|write).rb: added.
-
-Fri Sep 28 12:49:05 2007 Koichi Sasada <ko1@atdot.net>
-
- * benchmark/driver.rb: fix file selection algorithm.
-
-Fri Sep 28 02:05:42 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_comparable): need not to check asciicompat here.
-
- * encoding.c (rb_enc_check): ditto.
-
- * string.c (rb_enc_str_coderange): tuned a bit; no broken check.
-
- * encoding.c (rb_enc_check): new encoding comparison criteria.
-
-Thu Sep 27 17:36:28 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/REAMDE.win32: follow recent changes.
-
-Thu Sep 27 16:01:53 2007 Koichi Sasada <ko1@atdot.net>
-
- * benchmark/driver.rb: fix to output some helpful messages.
-
-Thu Sep 27 15:44:51 2007 Koichi Sasada <ko1@atdot.net>
-
- * benchmark/driver.rb: added.
-
- * common.mk: fix to use above driver.
-
- * benchmark/prepare_so_count_words.rb: added.
-
- * benchmark/bm_so_count_words.rb: fix benchmark process.
-
-Thu Sep 27 15:42:34 2007 Koichi Sasada <ko1@atdot.net>
-
- * ext/fiber/fiber.c: modify prototype declaration.
- [ruby-core:12247]
-
-Thu Sep 27 09:42:50 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (strings, xstring, regexp, dsym): empty strings have
- US-ASCII encoding.
-
-Thu Sep 27 07:39:13 2007 Tanaka Akira <akr@fsij.org>
-
- * bootstraptest/runner.rb (assert_finish): new method.
-
- * bootstraptest/test_knownbug.rb: add test for [ruby-dev:31866] using
- assert_finish.
-
-Thu Sep 27 04:46:31 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * encoding.c (rb_enc_associate_index): deal with ASCII compatible
- flags.
-
- * encoding.c (rb_enc_check): allow ASCII compatible strings.
-
- * parse.y (rb_intern_str): use ASCII encoding for ASCII string.
-
- * string.c (rb_enc_str_coderange): check for code-range.
-
- * string.c (rb_str_modify): clear code-range flags.
-
- * string.c (rb_str_hash, rb_str_eql): ASCII compatible strings are
- comparable.
-
- * include/ruby/encoding.h: added code-range flags.
-
-Thu Sep 27 04:40:47 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * gc.c (rb_mark_set): new function to mark keys.
-
- * marshal.c (struct dump_arg, struct load_arg): added wrappers to mark
- data and compat_tbl entries. [ruby-dev:31870]
-
-Thu Sep 27 03:17:41 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * process.c (rb_waitpid): no needs to poll. [ruby-dev:31871]
-
-Wed Sep 26 20:11:46 2007 Koichi Sasada <ko1@atdot.net>
-
- * bootstraptest/test_knownbug.rb: remove a fixed test.
-
-Wed Sep 26 20:00:12 2007 Koichi Sasada <ko1@atdot.net>
-
- * bootstraptest/test_knownbug.rb: move fixed tests.
-
- * bootstraptest/test_method.rb: ditto.
-
- * test/ruby/test_io.rb: ditto.
-
-Wed Sep 26 19:36:26 2007 Koichi Sasada <ko1@atdot.net>
-
- * eval.c (eval): fix to check stack overflow.
- [ruby-dev:31850]
-
- * eval_intern.h, vm.h: move CHECK_STACK_OVERFLOW() macro.
-
-Wed Sep 26 19:27:11 2007 Koichi Sasada <ko1@atdot.net>
-
- * insnhelper.ci (vm_throw): fix to move increment point.
- [ruby-dev:31840]
-
-Wed Sep 26 19:23:56 2007 Koichi Sasada <ko1@atdot.net>
-
- * cont.c: Fiber as SemiCoroutine on default. [ruby-core:12146]
+ * lib/shellwords.rb: Add shellescape() and shelljoin().
- * ext/fiber/fiber.c: enable Fiber#transfer.
+ * lib/shellwords.rb: Rename shellwords() to shellsplit() and make
+ the former an alias to the latter.
-Wed Sep 26 18:38:41 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/shellwords.rb: Add escape(), split(), join() as class
+ methods, which are aliases to their respective long names
+ prefixed with `shell'.
- * encoding.c (rb_enc_check): check for ASCII-compatibilities.
+ * lib/shellwords.rb: Add String#shellescape(), String#shellsplit()
+ and Array#shelljoin() for convenience.
- * parse.y (parser_tokadd_string, parser_parse_string,
- parser_here_document, parser_yylex): set encoding to US-ASCII.
+Fri Oct 5 15:40:04 2007 Akinori MUSHA <knu@iDaemons.org>
- * parse.y (rb_enc_symname_p): check if valid with encoding.
+ * lib/tempfile.rb (Tempfile::make_tmpname): Allow to specify a
+ suffix for a temporary file name.
- * parse.y (rb_intern3): let symbols have encoding.
+ * lib/tempfile.rb (Tempfile::make_tmpname): Make temporary file
+ names less predictable by including a random string.
+ [inspired by: akr]
- * string.c (rb_str_hash): add encoding index.
+Tue Oct 2 21:20:14 2007 NAKAMURA Usaku <usa@ruby-lang.org>
- * string.c (rb_str_comparable, rb_str_equal, rb_str_eql): check if
- compatible encoding.
+ * win32/win32.c (make_cmdvector): adjust escaped successive
+ double-quote handling. (merge from trunk)
- * string.c (sym_inspect): made encoding aware.
+Tue Oct 2 20:35:24 2007 NAKAMURA Usaku <usa@ruby-lang.org>
- * insns.def (opt_eq): compare with encoding.
+ * win32/win32.c (init_env): initialize HOME and USER environment
+ variables unless set. [ruby-core:12328] (merge from trunk)
- * include/ruby/encoding.h (rb_enc_asciicompat): check if ASCII
- compatible.
+ * win32/win32.c (NtInitialize, getlogin): ditto.
- * include/ruby/encoding.h (rb_enc_get_index): added prototype.
+ * configure.in, win32/Makefile.sub (LIBS): need to link shell32
+ library for SH* functions on mswin32 and mingw32.
- * include/ruby/intern.h (rb_str_comparable, rb_str_equal): ditto.
+Mon Oct 1 12:50:59 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-Wed Sep 26 15:01:16 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * gc.c (id2ref): valid id should not refer T_VALUE nor T_ICLASS.
+ [ruby-dev:31911]
- * eval_method.ci (rb_get_alloc_func): cast to suppress a warning.
+Wed Sep 26 23:54:37 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * eval_method.ci (remove_method): local variable to be initialized.
+ * ext/extmk.rb (extmake), lib/mkmf.rb (configuration): top_srcdir
+ should not prefixed with DESTDIR.
Wed Sep 26 08:36:31 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
@@ -37257,51 +2868,20 @@ Wed Sep 26 08:36:31 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
Wed Sep 26 05:12:17 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * parse.y (parser_yyerror): limit error message length.
- [ruby-dev:31848]
-
-Tue Sep 25 15:11:32 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (io_ungetc): reallocate internal buffer if pushing data
- excess capacity. [ruby-dev:31650]
-
-Tue Sep 25 13:43:03 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval_method.ci (remove_method): should not remove undef place
- holder. [ruby-dev:31816], [ruby-dev:31817]
-
-Tue Sep 25 09:51:31 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_longjmp): source file information may be NULL.
- [ruby-dev:31849]
+ * parse.y (yyerror): limit error message length. [ruby-dev:31848]
- * eval.c (ruby_finalize_0): clear trace_func before finalization.
+ * regex.c (re_mbc_startpos): separated from re_adjust_startpos.
-Mon Sep 24 22:36:13 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+Tue Sep 25 13:47:38 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
- * array.c (rb_ary_equal): should handle recursive array.
-
- * hash.c (hash_equal): should handle recursive hash.
-
-Mon Sep 24 22:14:13 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/weakref.rb (WeakRef): remove debug print. [ruby-dev:31799]
-
- * hash.c (hash_i): avoid too frequent hash conflict where key and
- value are same. a patch from Yusuke ENDOH <mame AT tsg.ne.jp>.
- [ruby-dev:31802]
-
-Mon Sep 24 17:56:21 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/strscan/strscan.c (strscan_initialize, strscan_getch): use the
- encoding of the target string instead of setting to StringScanner
- instance. [ruby-dev:31831]
+ * eval.c (remove_method): should not remove undef place holder.
+ [ruby-dev:31817]
Mon Sep 24 16:52:11 2007 Urabe Shyouhei <shyouhei@ruby-lang.org>
* lib/net/http.rb: fix typo.
-Mon Sep 24 06:49:15 2007 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Sun Sep 23 21:57:25 2007 GOTOU Yuuzou <gotoyuzo@notwork.org>
* lib/net/http.rb: an SSL verification (the server hostname should
be matched with its certificate's commonName) is added.
@@ -37322,16 +2902,11 @@ Sun Sep 23 09:05:05 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
Sun Sep 23 08:58:01 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * eval_method.ci (rb_attr): should not use alloca for unknown size
- input. [ruby-dev:31818]
+ * eval_method.ci (rb_attr): should not use alloca for unknowen size
+ input. [ruby-dev:31816]
* parse.y (rb_intern_str): prevent str from optimization.
-Sun Sep 23 06:16:04 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval_method.ci (remove_method): check for undefined method.
- [ruby-dev:31816]
-
Sun Sep 23 05:42:35 2007 URABE Shyouhei <shyouhei@ruby-lang.org>
* lib/rdoc/options.rb (Options::check_diagram): dot -V output
@@ -37347,305 +2922,60 @@ Sat Sep 22 05:19:49 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/stringio/stringio.c (strio_init): separate from strio_initialize
to share with strio_reopen properly. [ruby-Bugs-13919]
-Fri Sep 21 14:51:40 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * gc.c (gc_mark_rest): copy just used part.
-
- * gc.c (gc_mark_children): mark u1 and u2 of NODE_ARGSCAT.
-
- * gc.c (os_obj_of): hide T_VALUES too. [ruby-dev:31804]
+Fri Sep 21 15:46:20 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * gc.c (run_final): freeze temporary argument array.
+ * process.c (struct rb_exec_arg): proc should be a VALUE.
-Fri Sep 21 04:58:39 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * process.c (rb_f_exec): suppress a warning.
- * misc/ruby-style.el (ruby-style-label-indent): fix for function top
- level labels.
+Fri Sep 21 03:05:35 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Sep 21 02:11:22 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * eval.c, intern.h, ext/thread/thread.c: should not free queue while
+ any live threads are waiting. [ruby-dev:30653]
- * re.c (rb_reg_match_m): evaluate a block if match. it would make
- condition statement much shorter, if no else clause is needed.
+Thu Sep 20 17:24:59 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * string.c (rb_str_match_m): ditto.
+ * process.c (rb_detach_process): cast for the platforms where size of
+ pointer differs from size of int.
-Fri Sep 21 02:02:34 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * process.c (rb_f_exec, rb_f_system): should not exceptions after
+ fork. [ruby-core:08262]
- * hash.c (hash_equal): should call rb_eql when argument eql is set.
+Fri Sep 14 00:34:25 2007 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-Thu Sep 20 17:28:00 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (popen_exec), process.c (rb_spawn): stop other threads before
- exec. [ruby-core:08262]
-
-Tue Sep 18 22:08:42 2007 Keiju Ishitsuka <keiju@ruby-lang.org>
-
- * lib/matrix.rb: fix a coerce bug of Vector. [ruby-core: 12190]
-
-Mon Sep 17 21:06:03 2007 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/http.rb (HTTP::GenericRequest#initialize): check path is
- not nil. [ruby-dev:31149]
-
-Mon Sep 17 21:00:51 2007 Minero Aoki <aamine@loveruby.net>
-
- * parse.y (ripper): rename event: arglist_* -> args_*.
-
- * parse.y (ripper): rename event: restparam -> rest_param.
-
- * parse.y (ripper): rename event: constpath_* -> const_path_*.
-
- * parse.y (ripper): rename event: topconst_* -> top_const_*.
-
- * parse.y (ripper): rename event: iter_block -> method_add_block.
-
- * parse.y (ripper): support block local parameter declaration.
-
- * parse.y (ripper): introduce new macro params_new.
-
- * ext/ripper/lib/ripper/sexp.rb: should not dispose event
- arguments whose name ends with "_new" but arity != 0.
-
-Sat Sep 15 23:36:31 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (struct parser_params): common members in the parser and
- ripper must be placed at each same location.
-
-Sat Sep 15 18:25:15 2007 Kouhei Sutou <kou@cozmixng.org>
-
- * string.c (rb_str_rstrip_bang): fixed too much rstrip. [ruby-dev:31786]
-
-Sat Sep 15 17:32:10 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (parser_initialize): set default encoding. [ruby-dev:31787]
-
- * ruby.c (load_file): make new parse instance after processing shebang
- line options.
-
-Sat Sep 15 17:04:08 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * encoding.c (rb_enc_associate_index, rb_enc_get_index): check if
- object is encoding capable. [ruby-dev:31780]
-
- * string.c (rb_str_subpat_set): check for if the argument is a String.
-
-Sat Sep 15 13:31:21 2007 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss.rb, lib/rss/, test/rss/:
- - 0.1.9 -> 0.2.0.
- - supported Slash module.
-
-Fri Sep 14 22:20:01 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (fev_unadvise): no needs to reset
- event handlers.
-
-Fri Sep 14 17:28:32 2007 Koichi Sasada <ko1@atdot.net>
-
- * test/ruby/test_io.rb: tests which cause SEGV should not be
- added.
-
- * bootstraptest/test_knownbug.rb: add above test to known bug.
-
-Fri Sep 14 16:24:04 2007 Koichi Sasada <ko1@atdot.net>
-
- * insnhelper.ci (vm_expandarray): assignment should be placed
- after creating new array.
-
-Fri Sep 14 16:17:30 2007 Koichi Sasada <ko1@atdot.net>
-
- * bootstraptest/runner.rb: add a stress test (-s).
-
-Fri Sep 14 16:14:28 2007 Koichi Sasada <ko1@atdot.net>
-
- * vm.h, eval_intern.h: move some macros to eval_intern.h.
-
- * eval_jump.ci (rb_f_throw): fix to use NEW_THROW_OBJECT().
-
- * eval.c (rb_f_loop): remove additional macro.
-
-Fri Sep 14 16:12:10 2007 Koichi Sasada <ko1@atdot.net>
-
- * insnhelper.ci (vm_expandarray): should be volatile value for GC.
-
-Thu Sep 13 15:42:03 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * compile.c (iseq_compile_each): inline cache entries are overwritten
- in iseq_build_body().
-
-Thu Sep 13 14:00:15 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (brace_block): should use compstmt. patch submitted by
- Kirill A. Shutemov <k.shutemov AT gmail.com> [ruby-core:12154].
-
-Thu Sep 13 13:47:08 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (rb_id2str): fixed typo.
+ * lib/drb/extservm.rb (invoke_service): use Thread.exclusive instead of
+ Thread.critical
Wed Sep 12 23:12:22 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* ruby.c (proc_options): -W should be allowed in RUBYOPT
environment variable. [ruby-core:12118]
-Wed Sep 12 15:19:04 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (rb_io_s_sysopen): should not use alloca for unknown size
- input. [ruby-dev:31775]
-
- * parse.y (rb_id2str): ditto.
-
- * marshal.c (w_float): use snprintf instead of sprintf.
-
-Tue Sep 11 17:28:00 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/tempfile.rb (Tempfile::make_tmpname): Allow to specify a
- suffix for a temporary file name.
-
- * lib/tempfile.rb (Tempfile::make_tmpname): Make temporary file
- names less predictable by including a random string.
- [inspired by: akr]
-
-Tue Sep 11 17:25:59 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/shellwords.rb: Add shellescape() and shelljoin().
-
- * lib/shellwords.rb: Rename shellwords() to shellsplit() and make
- the former an alias to the latter.
-
- * lib/shellwords.rb: Add escape(), split(), join() as class
- methods, which are aliases to their respective long names
- prefixed with `shell'.
-
- * lib/shellwords.rb: Add String#shellescape(), String#shellsplit()
- and Array#shelljoin() for convenience.
-
-Mon Sep 10 15:48:31 2007 Tanaka Akira <akr@fsij.org>
-
- * range.c: represent initialized state using EXCL instead of FL_USER3.
-
- * range.c (range_dumper): make uninitialized range dumpable.
- (range_loader): make uninitialized range loadable.
-
-Mon Sep 10 13:44:37 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_cycle): avoid infinite loop for empty array.
- based on a patch from David Flanagan. [ruby-core:12085]
-
-Mon Sep 10 01:21:23 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * marshal.c (r_object0): struct allocation first to check if a
- class is a struct. compatibility check should come next.
-
Mon Sep 10 01:05:25 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* range.c (range_step): fixed integer overflow. [ruby-dev:31763]
-Sun Sep 9 08:57:27 2007 Tadayoshi Funaba <tadf@dotrb.org>
+Sun Sep 9 09:14:45 2007 Tadayoshi Funaba <tadf@dotrb.org>
* lib/date/format.rb (_strptime): now also attaches an element
which denotes leftover substring if exists.
-Sun Sep 9 01:59:08 2007 Tanaka Akira <akr@fsij.org>
-
- * marshal.c (r_object0): check T_STRUCT type for structs.
-
-Sun Sep 9 01:17:05 2007 Tanaka Akira <akr@fsij.org>
-
- * marshal.c (r_object0): don't call user-defined initialize for
- T_STRUCT objects.
-
- * include/ruby/intern.h (rb_struct_initialize): declared.
-
- * struct.c (rb_struct_initialize): export.
-
-Sat Sep 8 23:55:56 2007 Tanaka Akira <akr@fsij.org>
-
- * eval_method.ci (rb_get_alloc_func): new function to get allocation
- function.
-
- * include/ruby/intern.h (rb_alloc_func_t): declared.
- (rb_define_alloc_func): declared.
- (rb_marshal_define_compat): declared.
-
- * range.c: use T_STRUCT for Range.
-
- * inits.c: move Init_marshal() prior to Init_Range() because
- Init_Range calls rb_marshal_define_compat which needs
- marshal's compat_allocator_tbl initialized.
-
- * marshal.c: support marshal format compatibility layer designed for
- marshaling T_STRUCT Range using T_OBJECT format.
- (rb_marshal_define_compat): defined.
-
- [ruby-dev:31710]
-
-Sat Sep 8 10:05:14 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * struct.c (rb_struct_s_members): check if __members__ is an
- array to prevent segmentation fault. [ruby-dev:31759]
-
-Sat Sep 8 09:33:09 2007 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date/format.rb (str[fp]time): now check specifications more
- strictly.
-
-Sat Sep 8 02:56:31 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * test/ruby/test_fiber.rb (TestFiber::test_throw): uncaught throw
- now raise ArgumentError exception.
-
-Sat Sep 8 02:45:33 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+Sat Sep 8 10:22:20 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* struct.c (rb_struct_s_members): should raise TypeError instead
of call rb_bug(). [ruby-dev:31709]
* marshal.c (r_object0): no nil check require any more.
-Sat Sep 8 01:46:36 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * regenc.c, regenc.h (onigenc_single_byte_mbc_enc_len): should take
- two arguments. [ruby-dev:31754]
-
-Fri Sep 7 00:58:16 2007 Koichi Sasada <ko1@atdot.net>
-
- * common.mk: fix typo.
-
-Fri Sep 7 00:28:25 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_io_getc): forgot to commit rb_enc_mbclen() fix.
-
- * ext/stringio/stringio.c (strio_getc): rb_enc_mbclen() fix.
-
- * ext/stringio/stringio.c (strio_ungetc): ditto.
-
-Thu Sep 6 22:57:01 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/fileutils.rb (FileUtils::Entry_::copy): prevent self copy of
- directories.
+Sat Sep 8 09:38:19 2007 Tadayoshi Funaba <tadf@dotrb.org>
- * lib/fileutils.rb (FileUtils::fu_each_src_dest0): use try_convert.
-
- * lib/fileutils.rb (FileUtils::fu_update_option): ditto.
-
-Thu Sep 6 21:36:33 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * include/ruby/oniguruma.h (OnigEncodingTypeST): add end parameter
- to mbc_enc_len.
-
- * euc_jp.c (mbc_enc_len), sjis.c (mbc_enc_len),
- utf8.c (utf8_mbc_enc_len): ditto.
-
- * encoding.c (rb_enc_mbclen): add end parameter.
-
-Thu Sep 6 21:31:49 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_cycle): typo in rdoc. a patch from Yugui
- <yugui@yugui.sakura.ne.jp>. [ruby-dev:31748]
+ * lib/date/format.rb (str[fp]time): now check specifications more
+ strictly.
-Thu Sep 6 12:42:10 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Sep 7 05:36:19 2007 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
- * string.c (rb_str_succ, rb_str_chop_bang, rb_str_chop): m17n support.
- [ruby-dev:31734]
+ * test/rinda/test_rinda.rb (MockClock): correct synchronous problems
+ of the MultiThreading. [ruby-dev:31692]
Wed Sep 5 22:02:27 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
@@ -37659,983 +2989,93 @@ Wed Sep 5 22:02:27 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* string.c (rb_str_splice): integer overflow for length.
[ruby-dev:31739]
-Tue Sep 4 20:43:44 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c: add WIN32OLE_EVENT#unadvise.
-
- * test/win32ole/test_win32ole_event.rb: ditto.
-
-Mon Sep 3 15:37:09 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (vm.o): depends on st.h too.
-
-Sun Sep 2 23:38:29 2007 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/st.h (struct st_table): make num_entries bitfield
- instead of num_bins for speed. num_entries has less access.
-
-Sun Sep 2 00:37:57 2007 Tadayoshi Funaba <tadf@dotrb.org>
+Sun Sep 2 00:48:15 2007 Tadayoshi Funaba <tadf@dotrb.org>
* lib/date/format.rb (_parse): improved parsing of ordinal dates.
* lib/date/format.rb (_parse): use named character classes in some
regular expressions.
-Sat Sep 1 23:44:26 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval_jump.ci (rb_f_throw): wrap tag and TAG_THROW in a NODE_MEMO
- node to make throw instruction to work well.
-
-Sat Sep 1 20:56:07 2007 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/ruby.h (struct RBignum): embed digits in RBignum for
- small bignums.
-
- * bignum.c: RBignum embedded digits implemented.
-
- * include/ruby/intern.h: declare rb_big_resize.
-
- * gc.c: don't free embedded digits.
+Sat Sep 1 08:13:36 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
- * numeric.c: replace direct bignum field accessor by abstract field
- accessor such as RBIGNUM(val)->sign to RBIGNUM_SIGN(val).
+ * ext/win32ole/win32ole.c: add WIN32OLE#ole_activex_initialize.
- * sprintf.c: ditto.
-
- * compar.c: ditto.
-
- * marshal.c: ditto.
-
- * random.c: ditto.
-
- * .gdbinit: support embedded small bignums.
-
- [ruby-dev:31689]
-
-Sat Sep 1 19:59:43 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (ole_event_free): IConnectionPoint should be
- released.
-
- * ext/win32ole/win32ole.c (EVENTSINK_Destructor): ITypeInfo should be
- released.
-
- * ext/win32ole/win32ole.c (fev_initialize): refactoring.
-
-Sat Sep 1 16:26:09 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * test/socket/test_tcp.rb (test_recvfrom): same as mswin32 on mswin64.
-
-Sat Sep 1 14:24:23 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * st.c (st_numcmp, st_numhash): use st_data_t instead of long, because
- the former may be larger than the latter.
-
- * include/ruby/st.h (CHAR_BIT): get rid of magic number.
-
- * include/ruby/st.h (rb_index_t): use st_data_t for the platforms it
- is larger than int.
-
-Sat Sep 1 10:43:30 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval_jump.ci (rb_f_catch): generate new tag object if no argument is
- given. backported from MatzRuby. [ruby-dev:31609]
-
- * eval_jump.ci (rb_catch): call #catch without arguments if tag
- string is NULL.
-
- * eval_jump.ci (rb_f_throw): allow throwing non-symbol object.
-
- * eval_jump.ci (rb_catch_obj): new function to wait throw with arbitrary
- object.
-
- * eval_jump.ci (rb_throw_obj): new function to throw arbitrary object.
-
- * variable.c (check_autoload_table): prevent multiple calls from
- RSTRING_PTR().
-
-Fri Aug 31 07:12:24 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * numeric.c (SQRT_LONG_MAX): use SIZEOF_LONG instead of SIZEOF_VALUE
- because SIZEOF_VALUE > SIZEOF_LONG on some platforms.
-
-Fri Aug 31 04:18:03 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (f_norm_arg, f_arg_item): not croak already erred names.
- [ruby-dev:31687]
-
- * parse.y (assignable_gen): ignore already erred names.
-
- * parse.y (shadowing_lvar_gen): always make new block local variable
- when shadowing outer local variable. [ruby-dev:31507]
-
-Thu Aug 30 19:40:33 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * regenc.h: check RUBY_EXTERN before including config.h and defines.h
-
- * common.mk: update header dependency.
-
-Thu Aug 30 14:06:50 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * proc.c (rb_obj_define_method): reverted. [ruby-talk:266637]
-
-Thu Aug 30 13:49:25 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb: initialize $top_srcdir always. [ruby-dev:31682]
+Thu Aug 30 13:13:13 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (try_const, have_const): check for a const is defined.
[ruby-core:04422]
-Thu Aug 30 08:00:12 2007 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/intern.h: declare rb_hash_tbl.
-
- * include/ruby/ruby.h (RHash): delay st_table allocation.
- rename tbl field to ntbl to detect direct reference to the st_table
- as a compile error.
- (RHASH_TBL): abstract accessor defined.
- (RHASH_ITER_LEV): ditto.
- (RHASH_IFNONE): ditto.
- (RHASH_SIZE): ditto.
- (RHASH_EMPTY_P): ditto.
- (hash_alloc0, hash_alloc): unified because hash_alloc doesn't
- allocate st_table now.
-
- * hash.c: delay st_table allocation.
-
- * gc.c: replace tbl by ntbl.
-
- * array.c: replace direct field accessor by abstract field accessor
- such as RHASH(hash)->tbl to RHASH_TBL(hash).
-
- * marshal.c: ditto.
-
- * insns.def: ditto.
+Thu Aug 30 13:10:57 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/iconv/iconv.c: ditto.
-
- * ext/json/ext/generator/generator.c: ditto.
-
- * ext/json/ext/parser/parser.c: ditto.
-
- * ext/json/ext/parser/parser.rl: ditto.
-
- * ext/syck/rubyext.c: ditto.
-
- * ext/tk/tkutil/tkutil.c: ditto.
-
- [ruby-dev:31678]
-
-Wed Aug 29 18:36:06 2007 Tanaka Akira <akr@fsij.org>
-
- * lib/open-uri.rb: add :ftp_active_mode option. [ruby-dev:31677]
-
-Wed Aug 29 14:55:28 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (str_gsub): should not use mbclen2() which has broken API.
-
- * re.c: remove rb_reg_mbclen2().
-
-Wed Aug 29 12:48:17 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (aref_args): args may not be a list. [ruby-dev:31592]
+ * configure.in (group_member): check if presents.
-Wed Aug 29 11:30:10 2007 Tanaka Akira <akr@fsij.org>
+ * configure.in (XCFLAGS): add _GNU_SOURCE on linux.
- * include/ruby/st.h (struct st_table): add entries_packed 1-bit
- bitfield. decrease num_bins 1-bit.
+ * file.c (group_member): use system routine if available.
- * st.c: pack numhash which have 5 or less entries in bins.
- (st_init_table_with_size): setup entries_packed flag.
- (st_clear): support packed mode.
- (st_lookup): ditto.
- (st_insert): ditto.
- (st_add_direct): ditto.
- (st_copy): ditto.
- (st_delete): ditto.
- (st_foreach): ditto.
- (st_reverse_foreach): ditto.
- (unpack_entries): new function for converting to unpacked mode.
+Thu Aug 30 08:24:18 2007 Tanaka Akira <akr@fsij.org>
- [ruby-list:43954]
+ * ruby.h (RHASH_TBL): defined for compatibility to 1.9.
+ * (RHASH_ITER_LEV): ditto.
+ * (RHASH_IFNONE): ditto.
+ * (RHASH_SIZE): ditto.
+ * (RHASH_EMPTY_P): ditto.
-Wed Aug 29 10:46:37 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+Wed Aug 29 13:05:59 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* include/ruby/defines.h (flush_register_windows): call "ta 0x03"
even on Linux/Sparc. [ruby-dev:31674]
-Tue Aug 28 19:16:00 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (ole_type_progid): progid getted by
- ProgIDFromCLSID should be freed by CoTaskMemFree. Thanks, arton.
-
- * test/win32ole/test_win32ole.rb (test_raise_message): set negative
- compareMode value to raise WIN32OLERuntimeError.
-
- * test/win32ole/test_win32ole_type.rb (test_implemented_ole_types):
- support some environment which returns IShellDispatch5 instead
- of IShellDispatch.
-
-Tue Aug 28 15:42:09 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_subseq): retrieve substring based on byte offset.
-
- * string.c (rb_str_rindex_m): was confusing character offset and
- byte offset.
-
-Tue Aug 28 14:23:31 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_str_splice_0): should check to modify. [ruby-dev:31665]
-
-Tue Aug 28 14:21:46 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (parser_prepare): set parser encode too when BOM exists.
-
-Tue Aug 28 00:51:22 2007 Koichi Sasada <ko1@atdot.net>
-
- * thread.c: fix Mutex to be interruptable lock.
-
- * thread_win32.ci, thread_win32.h, thread_pthread.ci, thread_pthread.h:
- prepare native_cond_*() which are based on pthread_cond_*() spec.
-
- * prelude.rb: fix Mutex#synchronize method.
-
- * vm_core.h, include/ruby/intern.h: change unblock function interface
- (to pass some user data).
-
- * file.c, process.c: ditto.
-
- * benchmark/bm_vm2_mutex.rb: add a benchmark for mutex.
-
- * benchmark/bm_vm3_thread_mutex.rb: add a benchmark for mutex
- with contention.
-
- * benchmark/run.rb: fix to remove ENV['RUBYLIB'] for matzruby.
-
- * test/ruby/test_thread.rb: add a test.
-
- * common.mk: fix benchmark options.
-
-Mon Aug 27 23:14:02 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_rstrip_bang): wrong strip point. [ruby-dev:31652]
-
- * string.c (rb_str_each_line): should swallow sequence of newlines
- if rs (optional argument) is an empty string. [ruby-dev:31652]
-
-Mon Aug 27 22:39:08 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * encoding.c (rb_enc_codelen): raises invalid sequence exception
- if ONIGENC_CODE_TO_MBCLEN() returns zero. [ruby-dev:31661]
-
- * encoding.c (rb_enc_mbclen): check invalid sequence.
+Tue Aug 28 23:26:12 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-Mon Aug 27 20:27:59 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (ole_type_progid): fix the bug.
+ * ext/win32ole/win32ole.c (ole_type_progid, reg_enum_key,
+ reg_get_val, ole_wc2mb): fix the bug. Thanks, arton.
[ruby-dev:31576]
- * test/win32ole/test_win32ole_type.rb (test_initialize):
- remove duplicate assertions.
-
Mon Aug 27 19:10:50 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* ext/etc/etc.c (etc_getlogin): update documentation to note
security issue. [ruby-Bugs-11821]
-Mon Aug 27 15:56:48 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (sym_encoding): return the encoding of a Symbol.
-
-Mon Aug 27 15:33:10 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * util.c (IEEE_BIG_ENDIAN): use configured value. [ruby-dev:31623]
-
- * util.c (Llong): set to LONG_LONG if available.
-
-Mon Aug 27 13:11:56 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (tr_trans): wrong condition for mbmaxlen==1 strings.
- [ruby-dev:31652]
-
-Mon Aug 27 00:41:13 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_io_each_byte): caused infinite loop. [ruby-dev:31652]
-
- * io.c (rb_io_getc): should return nil at EOF, not EOFError.
-
- * lib/delegate.rb (SimpleDelegator::__setobj__): use raise
- argument to specify backtrace.
-
- * test/ruby/test_fnmatch.rb (TestFnmatch::bracket_test):
- String#include? no longer works for Fixnum. use #chr.
- [ruby-dev:31652]
-
-Sun Aug 26 12:27:14 2007 Koichi Sasada <ko1@atdot.net>
-
- * cont.c: fix to remove Fiber.new until fiber.so is not loaded.
-
- * test/ruby/test_continuation.rb: fix to use resume.
-
-Sun Aug 26 06:51:46 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (ole_wc2mb, reg_enum_key): allocate
- buffer should be NULL terminated.
-
-Sun Aug 26 06:04:13 2007 Koichi Sasada <ko1@atdot.net>
-
- * insnhelper.ci (vm_setup_method): reorder code for branch prediction.
-
-Sun Aug 26 05:54:49 2007 Koichi Sasada <ko1@atdot.net>
-
- * insnhelper.ci (vm_call_method): fix to relaxant safe level check
- ($SAFE > 2). [ruby-core:11998]
-
- * bootstraptest/test_method.rb: add tests for above.
-
-Sun Aug 26 05:52:08 2007 Koichi Sasada <ko1@atdot.net>
-
- * test/ruby/test_fiber.rb: fix to require 'continuation'.
-
-Sat Aug 25 23:52:14 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enumerator.c (enumerator_next): message changed.
-
-Sat Aug 25 23:22:14 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * include/ruby/encoding.h: remove unused rb_enc_ismbchar().
-
-Sat Aug 25 22:50:14 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (ole_event_free, EVENTSINK_Destructor,
- fev_initialize): remove the connection ole_event_free and
- EVENTSINK_Destructor.
-
-Sat Aug 25 17:52:06 2007 Koichi Sasada <ko1@atdot.net>
-
- * string.c, include/ruby/intern.h: export rb_str_length().
-
- * insns.def: use rb_str_length() in opt_length.
-
-Sat Aug 25 17:48:51 2007 Koichi Sasada <ko1@atdot.net>
-
- * cont.c: rename FIBER_STACK_SIZE to FIBER_VM_STACK_SIZE.
-
-Sat Aug 25 17:05:05 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (swallow): removed condition using an unset variable.
-
- * parse.y, re.c: re-applied revision 13092.
-
- * string.c (rb_str_splice): return from void function.
-
- * include/ruby/encoding.h (rb_enc_str_new): prototype added.
-
-Sat Aug 25 11:45:37 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * encoding.c: provide basic features for M17N.
-
- * parse.y: encoding aware parsing.
-
- * parse.y (pragma_encoding): encoding specification pragma.
-
- * parse.y (rb_intern3): encoding specified symbols.
-
- * string.c (rb_str_length): length based on characters.
- for older behavior, bytesize method added.
-
- * string.c (rb_str_index_m): index based on characters. rindex as
- well.
-
- * string.c (succ_char): encoding aware succeeding string.
-
- * string.c (rb_str_reverse): reverse based on characters.
-
- * string.c (rb_str_inspect): encoding aware string description.
-
- * string.c (rb_str_upcase_bang): encoding aware case conversion.
- downcase, capitalize, swapcase as well.
-
- * string.c (rb_str_tr_bang): tr based on characters. delete,
- squeeze, tr_s, count as well.
-
- * string.c (rb_str_split_m): split based on characters.
-
- * string.c (rb_str_each_line): encoding aware each_line.
-
- * string.c (rb_str_each_char): added. iteration based on
- characters.
-
- * string.c (rb_str_strip_bang): encoding aware whitespace
- stripping. lstrip, rstrip as well.
-
- * string.c (rb_str_justify): encoding aware justifying (ljust,
- rjust, center).
-
- * string.c (str_encoding): get encoding attribute from a string.
-
- * re.c (rb_reg_initialize): encoding aware regular expression
-
- * sprintf.c (rb_str_format): formatting (i.e. length count) based
- on characters.
-
- * io.c (rb_io_getc): getc to return one-character string.
- for older behavior, getbyte method added.
-
- * ext/stringio/stringio.c (strio_getc): ditto.
-
- * io.c (rb_io_ungetc): allow pushing arbitrary string at the
- current reading point.
-
- * ext/stringio/stringio.c (strio_ungetc): ditto.
-
- * ext/strscan/strscan.c: encoding support.
-
-Sat Aug 25 10:59:19 2007 Koichi Sasada <ko1@atdot.net>
-
- * cont.c: separate Continuation and Fiber from core.
-
- * ext/continuation/*, ext/fiber/*: ditto.
-
- * include/ruby/ruby.h: remove rb_cFiber.
-
- * include/ruby/intern.h: add the rb_fiber_new() declaration.
-
- * enumerator.c (next_init): fix to use rb_fiber_new().
-
- * test/ruby/test_enumerator.rb: remove next? tests.
-
- * test/ruby/test_continuation.rb: add a require 'continuation'.
-
- * test/ruby/test_fiber.rb: add a require 'fiber'.
-
-Sat Aug 25 10:20:28 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (prelude.o): depends on vm_core.h now.
-
- * common.mk (prelude.c): depends on tool/compile_prelude.rb too.
-
- * common.mk (prereq): updates all auto-generated sources.
-
- * tool/compile_prelude.rb: separated dynamic and static portions.
-
-Sat Aug 25 10:05:17 2007 Koichi Sasada <ko1@atdot.net>
-
- * prelude.rb: add Thread.exclusive. This class method
- is different from 1.8's. Thread.exclusive only does
- synchronize with VM global mutex.
-
-Sat Aug 25 09:39:50 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_s_try_convert): more document description.
-
- * re.c (rb_reg_s_try_convert): typo fixed.
-
-Sat Aug 25 08:54:12 2007 Koichi Sasada <ko1@atdot.net>
-
- * id.h, id.c: remove idFuncall.
-
- * compile.c (iseq_specialized_instruction): ditto.
-
-Sat Aug 25 08:47:28 2007 Koichi Sasada <ko1@atdot.net>
-
- * tool/compile_prelude.rb: fix to include "vm_core.h".
-
-Sat Aug 25 03:49:14 2007 Tanaka Akira <akr@fsij.org>
-
- * test/ruby/sentence.rb (Sentence): include Enumerable.
- (Sentence#each): defined.
-
- * test/ruby/test_assignment.rb: use Sentence#expand.
-
-Sat Aug 25 03:08:57 2007 Koichi Sasada <ko1@atdot.net>
-
- * prelude.rb: fix Mutex#synchronize definition.
-
-Sat Aug 25 02:08:45 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_s_try_convert): a new class method to convert
- object or nil if it's not target-type. this mechanism is used
- to convert types in the C implemented methods.
-
- * hash.c (rb_hash_s_try_convert): ditto.
-
- * io.c (rb_io_s_try_convert): ditto.
-
- * re.c (rb_reg_s_try_convert): ditto.
-
- * string.c (rb_str_s_try_convert): ditto.
-
-Sat Aug 25 00:49:44 2007 Koichi Sasada <ko1@atdot.net>
-
- * benchmark/bm_loop_generator.rb: added.
-
-Sat Aug 25 00:22:31 2007 Koichi Sasada <ko1@atdot.net>
-
- * prelude.rb: added. run this script on startup.
-
- * tool/compile_prelude.rb: compile prelude.rb to C string.
- (prelude.rb -> prelude.c)
-
- * common.mk: fix to build with prelude.c.
-
- * inits.c (rb_call_inits): ditto.
-
- * thread.c (Init_Thread): move definition of Mutex#synchronize
- to prelude.rb.
-
-Sat Aug 25 00:08:43 2007 Koichi Sasada <ko1@atdot.net>
-
- * compile.c (compile_massign_opt): fix to skip massign optimization
- with global variables.
-
- * bootstraptest/test_massign.rb: add some tests for above.
-
-Fri Aug 24 18:42:03 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * test/ruby/test_dir.rb (TestDir::setup): ?c now makes a string.
-
- * lib/test/unit/autorunner.rb (Test::Unit::AutoRunner::initialize):
- initialize @workdir to stop warning.
-
-Fri Aug 24 18:30:50 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/drb/drb.rb (DRb::DRbServer::InvokeMethod::perform_without_block):
- replace funcall by send!. other files in the distribution as well.
-
-Fri Aug 24 17:06:56 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_f_send_bang): abandon the name funcall for private
- aware method call.
-
-Fri Aug 24 15:27:12 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enumerator.c (enumerator_next): stop pre-fetching.
-
- * enumerator.c (Init_Enumerator): remove next? method.
-
-Fri Aug 24 15:14:57 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_f_loop): now handles StopIteration exception.
-
-Thu Aug 23 20:31:31 2007 Koichi Sasada <ko1@atdot.net>
-
- * compile.c: optimize simple massign.
-
-Thu Aug 23 20:02:25 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (reg_get_value): use RegQueryValueEx instead
- of RegQueryValueEx.
-
- * ext/win32ole/win32ole.c (typelib_file_from_clsid): fix the bug
- that the function always returns Qnil.
-
- * test/win32ole/test_win32ole_type.rb (test_initialize): add some test.
-
-Thu Aug 23 17:25:05 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (group_member): check if presents.
-
- * configure.in (XCFLAGS): add _GNU_SOURCE on linux.
-
- * file.c (group_member): use system routine if available.
-
- * process.c: moved _GNU_SOURCE macro to Makefile.
-
-Thu Aug 23 16:59:40 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * compile.c (compile_massign), insnhelper.ci (vm_throw): not use C99
- comment.
-
- * cont.c (rb_cont_call, fiber_switch, rb_fiber_resume, rb_fiber_yield):
- suppress warnings.
-
- * cont.c (rb_fiber_start): change on non-volatile variable between
- setjmp and longjmp may not has an effect.
-
- * enumerator.c (sym_call): initialize first.
-
- * enumerator.c (enum_iter): typedefed.
-
- * enumerator.c (next_i): suppress a warning.
-
-Thu Aug 23 16:04:11 2007 Koichi Sasada <ko1@atdot.net>
-
- * compile.c, insns.def, parse.y: fix massign order. This change
- causes performance problem. Try vm1_swap benchmark.
- [ruby-dev:31522]
-
- * insns.def, insnhelper.ci: move process body of expandarray insn to
- vm_expandarray().
-
- * bootstraptest/test_knownbug.rb, bootstraptest/test_massign.rb:
- move a solved test.
-
-Thu Aug 23 15:51:19 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (f_norm_arg): ripper has no shadowing check.
-
- * parse.y (f_block_arg): dispatch blkarg_mark.
-
-Thu Aug 23 15:48:26 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * compile.c (make_masgn_lhs, iseq_compile_each): fixed indent.
-
- * compile.c (iseq_translate_threaded_code),
- vm_evalbody.ci (get_insns_address_table),
- template/vmtc.inc.tmpl (insns_address_table): constified.
-
- * vm_evalbody.ci (vm_eval),
- template/insns_info.inc.tmpl (insn_stack_increase, insn_ret_num):
- suppress warnings.
-
-Thu Aug 23 13:19:43 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (f_norm_arg): check also nested arguments. [ruby-dev:31502]
-
-Thu Aug 23 00:06:48 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * util.c: updated for ANSI C only. applied a patch from
- <snakagawa AT infoteria.co.jp>. [ruby-dev:31591]
-
-Thu Aug 23 00:04:45 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * missing/strtod.c: removed. [ruby-dev:31588]
-
- * LEGAL: updated.
-
-Wed Aug 22 15:59:44 2007 Koichi Sasada <ko1@atdot.net>
-
- * bootstraptest/test_knownbug.rb:
- fix typo of filename (test_knownbug.rb).
-
-Wed Aug 22 14:04:53 2007 Koichi Sasada <ko1@atdot.net>
-
- * bootstraptest/test_knownbug.rb: added. This file will contain
- test cases which point out known bug. If bug is fixed, tests
- should move to the suitable place.
-
- * bootstraptest/test_massign.rb: move a test which show known bug
- to test_knownbug.rb.
-
-Wed Aug 22 13:02:26 2007 Tanaka Akira <akr@fsij.org>
-
- * bootstraptest/runner.rb (in_temporary_working_directory):
- don't remove the directory specified by --dir.
-
-Wed Aug 22 05:51:23 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * util.c (ruby_strtod): replaced by the implementation by David
- M. Gay inspired by William D. Clinger's paper "How to Read Floating
- Point Numbers Accurately" [Proc. ACM SIGPLAN '90, pp. 92-101].
- a patch from Satoshi Nakagawa <snakagawa AT infoteria.co.jp>.
- [ruby-dev:31582]
-
- * test/ruby/test_float.rb (TestFloat::test_float): add test for
- precision.
-
-Wed Aug 22 03:51:07 2007 Koichi Sasada <ko1@atdot.net>
-
- * cont.c: add Fiber#resume and Fiber.yield.
- and Fiber::Core class to realize Coroutine.
-
- * include/ruby/intern.h: declare rb_fiber_yield(), rb_fiber_resume().
-
- * enumerator.c: use above api.
-
- * test/ruby/test_fiber.rb: fix and add tests for above changes.
-
Tue Aug 21 21:09:48 2007 Tanaka Akira <akr@fsij.org>
* lib/tmpdir.rb (Dir.mktmpdir): make directory suffix specifiable.
- suggested by knu. [ruby-dev:31568]
-
-Tue Aug 21 15:00:23 2007 Koichi Sasada <ko1@atdot.net>
-
- * st.c (st_clear): reset num_entries too.
Tue Aug 21 13:57:04 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* hash.c (st_foreach_func, rb_foreach_func): typedefed.
- * hash.c (rb_hash_clear): use st_clear() unless iterating.
-
- * st.c (struct st_table_entry): add new members, fore and back, to
- iterate in inserted order.
-
- * include/ruby/st.h (struct st_table): ditto.
-
-Tue Aug 21 04:09:06 2007 Koichi Sasada <ko1@atdot.net>
-
- * benchmark/bm_vm2_case.rb: add a new benchmark.
- YARV optimize case/when syntax. If every conditions
- are literal (such as Symbol, Fixnum, String), dispatch
- calc order will be O(1).
-
-Tue Aug 21 04:08:07 2007 Koichi Sasada <ko1@atdot.net>
-
- * test/ruby/test_enumerator.rb: fix last commit.
-
-Tue Aug 21 03:59:32 2007 Koichi Sasada <ko1@atdot.net>
-
- * test_enumerator.rb (enum_test): fix to return sorted
- array (for Hash test).
-
-Tue Aug 21 03:55:20 2007 Koichi Sasada <ko1@atdot.net>
-
- * enumerator.c (next_i): fix to return with Fiber#yield at
- the end of each block. [ruby-dev:31470]
-
- * enumerator.c (enumerator_next_p): call init_next if not
- initialized. [ruby-dev:31514]
-
- * test/ruby/test_enumerator.rb: add tests for Enumerator.
-
-Mon Aug 20 23:28:39 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (Init_String): remove Symbol.intern and Symbol#dump.
- [ruby-dev:31525]
-
- * dir.c (dir_foreach): return Enumerator if no block given.
- [ruby-dev:31525]
+Mon Aug 20 17:25:33 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
- * io.c (rb_io_s_foreach): argument count check before making
- Enumerator. [ruby-dev:31525]
+ * eval.c (mnew): should preserve noex as safe_level.
-Mon Aug 20 23:17:14 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * eval.c (rb_call0): tighten security check condition..
- * vm_core.h (struct rb_thread_struct): removed first_func_arg and
- reuse first_args instead.
+Sat Aug 18 21:32:20 2007 Tanaka Akira <akr@fsij.org>
-Sun Aug 19 13:31:40 2007 Tanaka Akira <akr@fsij.org>
-
- * gc.c: use VALGRIND_MAKE_MEM_UNDEFINED to detect use of collected
- objects if valgrind is available. It cannot detect first 2 words
- because they are used as the free list.
-
-Sun Aug 19 13:13:52 2007 Koichi Sasada <ko1@atdot.net>
-
- * compile.c (iseq_compile_each/NODE_RESBODY): fix to add
- additional nop to prevent tailcall optimization.
-
- * vm_opts.h: clean up comments.
-
-Sun Aug 19 12:58:39 2007 Koichi Sasada <ko1@atdot.net>
-
- * insnhelper.ci (vm_call_bmethod): fix to propagate information
- that this proc is "from Method". [ruby-dev:31490]
-
- * proc.c (method_proc, rb_mod_define_method): ditto.
-
- * vm.c (vm_invoke_proc_core): removed.
-
- * vm_core.h: ditto.
-
-Sun Aug 19 12:36:11 2007 Tanaka Akira <akr@fsij.org>
-
- * test/ruby/sentence.rb: new method Sentence().
-
-Sun Aug 19 12:32:39 2007 Koichi Sasada <ko1@atdot.net>
-
- * insnhelper.ci (vm_callee_setup_arg): fix to mark enough VM stack.
- [ruby-dev:31492]
-
-Sat Aug 18 19:02:34 2007 Tanaka Akira <akr@fsij.org>
-
- * test/ruby/test_yield.rb (TestYieldGen): relax array size check
- in nested parameters.
- [ruby-dev:31485]
+ * lib/tmpdir.rb (Dir.mktmpdir): new method.
+ [ruby-dev:31462]
Sat Aug 18 17:44:42 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/tk/tcltklib.c (Init_tcltklib): use rb_set_end_proc().
-Sat Aug 18 17:40:11 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread.c (is_ruby_native_thread): check properly. [ruby-dev:31166]
-
-Sat Aug 18 16:44:15 2007 Koichi Sasada <ko1@atdot.net>
-
- * insnhelper.ci (vm_call_bmethod),
- vm.c (vm_invoke_proc_core): fix to do not restore
- $SAFE when proc invoked by bmethod.
-
- * vm_core.h: ditto.
-
-Sat Aug 18 16:44:49 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval_error.ci (ruby_error_print): call error_print.
-
- * eval_jump.ci, process.c (rb_exit, rb_f_exit, rb_f_abort): moved.
-
Sat Aug 18 15:59:52 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* process.c (detach_process_watcher): should not pass the pointer
to an auto variable to the thread to be created. pointed and
fix by KUBO Takehiro <kubo at jiubao.org> [ruby-dev:30618]
-Sat Aug 18 15:52:50 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * insnhelper.ci (vm_send_optimize): use MEMMOVE to shift values inside
- an array.
-
-Sat Aug 18 15:45:34 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * insnhelper.ci (vm_yield_setup_args): rsize and psize should not be
- negative.
-
-Sat Aug 18 14:35:00 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * insnhelper.ci (vm_callee_setup_arg, vm_send_optimize,
- vm_yield_setup_args): bulk copy for arguments.
-
-Sat Aug 18 13:55:58 2007 Koichi Sasada <ko1@atdot.net>
-
- * compile.c (iseq_compile_each): fix to allow self.x=
- if x= is private.
-
- * bootstraptest/test_method.rb: add a test for above.
-
-Sat Aug 18 14:05:34 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (reg_compile_gen): obtain error info from errinfo.
-
- * re.c (rb_reg_error_desc): make RegexpError for initialization error.
-
- * re.c (rb_reg_compile): return nil and set errinfo if error.
-
-Sat Aug 18 13:23:01 2007 Koichi Sasada <ko1@atdot.net>
-
- * eval.c: $! should not be writable.
-
- * eval.c (rb_rubylevel_errinfo): added. rb_errinfo() returns
- rb_thread_t#errinfo. rb_rubylevel_errinfo() returns $! value.
-
-Sat Aug 18 13:14:40 2007 Koichi Sasada <ko1@atdot.net>
-
- * insnhelper.ci (vm_callee_setup_arg): fix to check arguments
- correctly. [ruby-dev:31472]
-
-Sat Aug 18 13:13:06 2007 Koichi Sasada <ko1@atdot.net>
-
- * bootstraptest/test_exception.rb: add escape character ("\") for
- editors.
-
-Sat Aug 18 12:42:50 2007 Tanaka Akira <akr@fsij.org>
-
- * test/ruby/test_yield.rb (TestYieldGen): add test for yielding to
- lambda using lambda parameter passing emulator.
-
Sat Aug 18 12:24:30 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* sample/test.rb, test/ruby/test_system.rb(valid_syntax?): keep
comment lines first.
-Sat Aug 18 11:44:59 2007 Koichi Sasada <ko1@atdot.net>
-
- * compile.c (iseq_set_arguments), insnhelper.ci
- (vm_callee_setup_arg, vm_yield_setup_args):
- fix to cause raise on "lambda{|a|}.call(1, 2)".
- [ruby-dev:31464]
-
- * bootstraptest/test_block.rb: add tests for above.
-
-Sat Aug 18 01:12:01 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (frame_func_id): return proper method ID.
-
-Fri Aug 17 22:43:11 2007 Koichi Sasada <ko1@atdot.net>
-
- * compile.c (iseq_compile_each): massign should return rvalue(s).
-
-Fri Aug 17 22:10:19 2007 Koichi Sasada <ko1@atdot.net>
-
- * test/ruby/test_basicinstructions.rb: fix old tests.
- class variables should be inherited.
-
-Fri Aug 17 21:20:44 2007 Koichi Sasada <ko1@atdot.net>
-
- * eval.c (rb_call), eval_method.ci (rb_add_method, rb_alias),
- insnhelper.ci (vm_call_method): fix to save safelevel for
- method node.
-
- * include/ruby/node.h: ditto.
-
- * bootstraptest/test_method.rb: add a test for above.
-
-Fri Aug 17 16:02:50 2007 Koichi Sasada <ko1@atdot.net>
-
- * thread.c (rb_thread_terminate_all): fix to ignore
- exceptions.
-
- * thread.c (thread_start_func_2): fix
- abort_on_exception process. [ruby-dev:31394]
-
-Fri Aug 17 14:38:36 2007 Tanaka Akira <akr@fsij.org>
-
- * bootstraptest/runner.rb (in_temporary_working_directory): use
- Dir.mktmpdir to create and remove temporary directory.
- (Dir.mktmpdir): define if not available.
- [ruby-dev:31431]
-
-Fri Aug 17 03:07:37 2007 Koichi Sasada <ko1@atdot.net>
-
- * compile.c (iseq_compile_each): fix throw insn option of next.
-
-Fri Aug 17 01:25:23 2007 Koichi Sasada <ko1@atdot.net>
-
- * compile.c (iseq_set_arguments), insnhelper.ci
- (vm_callee_setup_arg, vm_yield_setup_args): fix
- block parameter problems. [ruby-dev:31437], [ruby-dev:31440]
-
- * bootstraptest/test_block.rb: add a test of [ruby-dev:31440].
-
-Fri Aug 17 01:24:12 2007 Koichi Sasada <ko1@atdot.net>
-
- * iseq.c (ruby_iseq_disasm): fix to show arg_simple value.
-
-Fri Aug 17 01:21:29 2007 Koichi Sasada <ko1@atdot.net>
-
- * insns.def (throw): insert a RUBY_VM_CHECK_INTS(). [ruby-dev:31361]
-
Thu Aug 16 20:40:50 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* bignum.c (bigtrunc): RBIGNUM(x)->len may be zero. out of bound
access. [ruby-dev:31404]
- * sprintf.c (rb_str_format): small float should not call
- rb_dbl2big().
-
-Thu Aug 16 22:10:06 2007 Koichi Sasada <ko1@atdot.net>
-
- * compile.c (iseq_compile_each): fix next/redo stack consistency.
- [ruby-dev:31373]
-
- * bootstraptest/test_syntax.rb: add tests for above.
-
- * sample/test.rb: fix to use __FILE__ instead of $0 to know basedir.
-
-Thu Aug 16 21:14:06 2007 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * configure.in (BASERUBY): need AC_SUBST. [ruby-dev:31438]
-
-Thu Aug 16 19:18:26 2007 Tanaka Akira <akr@fsij.org>
-
- * test/ruby/sentence.rb: Sentence class implemented
- based on sentgen.rb
-
- * test/ruby/sentgen.rb: removed.
-
- * test/ruby/test_assignment.rb: use sentence.rb.
-
- * test/ruby/test_yield.rb: block parameter passing emulator
- implemented.
-
-Thu Aug 16 16:48:47 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (BASERUBY): check if base ruby is runnable first.
- [ruby-core:11900]
-
Thu Aug 16 16:46:07 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (aix): enable shared by default.
@@ -38653,49 +3093,10 @@ Thu Aug 16 13:06:08 2007 Tanaka Akira <akr@fsij.org>
(big_rshift): ditto.
[ruby-dev:31434]
-Thu Aug 16 06:29:08 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (argf_readpartial): argf_forward needs argc and argv.
+Thu Aug 16 04:09:19 2007 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-Thu Aug 16 02:47:39 2007 Koichi Sasada <ko1@atdot.net>
-
- * cont.c (rb_fiber_m_yield): added. use this function
- for Fiber#yield instead of rb_fiber_yield.
-
-Thu Aug 16 00:36:52 2007 Tanaka Akira <akr@fsij.org>
-
- * lib/tmpdir.rb (Dir.mktmpdir): new method. [ruby-dev:31416]
-
-Wed Aug 15 18:57:30 2007 Koichi Sasada <ko1@atdot.net>
-
- * gc.c (os_live_obj): fix to skip T_VALUES.
-
- * sample/test.rb: add an ObjectSpace test.
-
-Wed Aug 15 16:49:04 2007 Koichi Sasada <ko1@atdot.net>
-
- * inits.c (rb_call_inits): change initializing order.
- [ruby-dev:31420]
-
-Wed Aug 15 16:44:15 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (ARGF_FORWARD): wrongly compares with current_file with
- rb_stdout. should be rb_stdin. [ruby-cvs:20177]
-
-Wed Aug 15 14:59:21 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (rb_io_initialize, argf_each_line, argf_each_byte): suppress
- warnings.
-
-Wed Aug 15 14:22:05 2007 Koichi Sasada <ko1@atdot.net>
-
- * parse.y: remove "//" type comment.
-
-Wed Aug 15 13:42:15 2007 Koichi Sasada <ko1@atdot.net>
-
- * parse.y: fix rules around f_margs. "make test" passes all tests.
-
- * bootstraptest/test_block.rb: add some tests for above.
+ * lib/rinda/tuplespace.rb (Rinda::TupleSpace#start_keeper): improve
+ keeper thread.
Wed Aug 15 13:50:10 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
@@ -38706,212 +3107,18 @@ Wed Aug 15 13:50:10 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* hash.c (delete_if_i): use rb_hash_delete_key() so that the block
isn't called twice. [ruby-core:11556]
-Wed Aug 15 13:39:25 2007 Koichi Sasada <ko1@atdot.net>
-
- * process.c (proc_geteuid): fix strange conversion. [ruby-dev:31417]
-
-Wed Aug 15 01:05:55 2007 Tanaka Akira <akr@fsij.org>
-
- * bootstraptest/runner.rb (assert_check): don't call newtest.
- (assert_equal): call newtest.
- (assert_match): ditto.
-
-Tue Aug 14 21:43:39 2007 Tanaka Akira <akr@fsij.org>
+Sun Arg 12 03:56:30 2007 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
- * bootstraptest/runner.rb (assert_check): new method.
- (assert_match): new method.
- (assert_equal): use assert_check.
- (pretty): give failure description as an argument.
+ * lib/rinda/tuplespace.rb: fix Rinda::TupleSpace keeper thread bug.
+ the thread is started too early. [ruby-talk:264062]
- * bootstraptest/test_exception.rb: use assert_match to describe the
- test for [ruby-dev:31407]. [ruby-dev:31412]
-
-Tue Aug 14 19:53:15 2007 Koichi Sasada <ko1@atdot.net>
-
- * proc.c (Init_Proc), eval.c (Init_eval), eval_intern.h: move
- init place of exception_error.
-
- * inits.c: ditto.
-
- * eval.c (Init_eval): set exception_error#throwed_state as TAG_FATAL.
- [ruby-dev:31407]
-
- * bootstraptest/test_exception.rb: add a test for above.
-
-Tue Aug 14 19:51:20 2007 Koichi Sasada <ko1@atdot.net>
-
- * common.mk: change test order (test -> btest).
-
-Tue Aug 14 00:04:27 2007 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/rss.rb: 0.1.8 -> 0.1.9.
-
- * test/rss/test_version.rb: followed the above change.
-
- * lib/rss/parser.rb: fixed a bug that handles unintended elements.
- Thanks to Takuo Yonezawa. [ruby-list:43841]
-
-Mon Aug 13 17:23:10 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_clear_trace_func, rb_thread_stop_timer_thread):
- declarations for forward references.
-
- * eval.c (rb_longjmp, eval): use local variable.
-
- * eval.c (rb_longjmp): string object not to be optimized.
-
-Mon Aug 13 13:21:58 2007 Tanaka Akira <akr@fsij.org>
-
- * lib/open-uri.rb: make ftp passive mode to avoid NAT problem.
- [ruby-dev:31377]
-
-Mon Aug 13 09:18:05 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/stringio/stringio.c (strio_getc): should returns
- one-character string.
-
- * ext/stringio/stringio.c: remove unnecessary prototypes.
-
- * ext/stringio/stringio.c (strio_getbyte): new method.
-
- * ext/stringio/stringio.c (strio_readbyte): new method.
-
- * ext/stringio/stringio.c (strio_ungetc): should take a string as
- an input.
-
-Mon Aug 13 08:19:43 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (argf_close): always close via method.
-
- * io.c (Init_IO): remove obsolete Kernel#getc.
-
-Mon Aug 13 05:03:53 2007 Koichi Sasada <ko1@atdot.net>
-
- * thread.c (rb_thread_raise): check if target thread is
- thrown by another thread or not. [ruby-dev:31371]
-
- * bootstraptest/test_thread.rb: add a test for above.
-
-Mon Aug 13 04:35:30 2007 Koichi Sasada <ko1@atdot.net>
-
- * compile.c (iseq_peephole_optimize): fix peephole optimization
- bug. [ruby-dev:31360]
-
- * bootstraptest/test_syntax.rb: add a test for above.
-
-Mon Aug 13 04:02:29 2007 Koichi Sasada <ko1@atdot.net>
-
- * vm_dump.c (debug_print_pre): fix to show control frame count.
-
- * insns.def (opt_call_c_function): fix operand type.
-
- * lib/vm/instruction.rb: ditto.
-
- * insnhelper.ci (vm_push_frame, vm_pop_frame): fix to show
- control stack status on if VMDEBUG == 2.
-
- * vm.h: add a comment about VMDEBUG.
-
- * iseq.c (find_prev_line_no): fix to skip bug report if
- line is not found.
-
- * lib/vm/instruction.rb: fix to use build_string() on
- source code generators.
-
-Mon Aug 13 03:57:32 2007 Koichi Sasada <ko1@atdot.net>
-
- * template/yasmdata.rb.tmpl: fix type and name.
-
-Sat Aug 11 23:27:37 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (argf_each_line): should use #each_line, not #each.
-
- * io.c (argf_each_line): simplified.
-
- * io.c (argf_getline): should handle non T_FILE object in ARGV.
-
- * io.c (argf_each_byte): each_byte should yield bytes not
- one-character strings. [ruby-dev:31374]
+ * test/rinda/test_rinda.rb: ditto.
-Sat Aug 11 07:24:55 2007 Tadayoshi Funaba <tadf@dotrb.org>
+Sat Aug 11 07:34:10 2007 Tadayoshi Funaba <tadf@dotrb.org>
* lib/date/format.rb: reverted some wrongly erased "o" options
(pointed out by nobu).
-Sat Aug 11 00:01:12 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread.c (thread_start_func_2): not re-raise to main thread if it is
- joining the current thread.
-
-Fri Aug 10 23:54:46 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread.c (thread_create_core): inherit the priority of creating
- thread. submitted at [ruby-core:11873] by David Flanagan <david AT
- davidflanagan.com>. [ruby-core:11876]
-
-Fri Aug 10 05:12:19 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread.c (thread_start_func_2): let abort_on_exception work.
- [ruby-core:11873]
-
-Fri Aug 10 04:47:09 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (internal_id_gen): internal ID must be bigger than
- tLAST_TOKEN.
-
-Thu Aug 9 16:04:55 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (stmt): check if rhs has value before assignment instead
- inside node_assign_gen(). [ruby-dev:31293]
-
- * parse.y (call_bin_op_gen, call_uni_op_gen): split call_op_gen.
-
-Thu Aug 9 14:01:36 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (f_marg_list): renamed from f_marg_head.
-
- * parse.y (f_margs): allow multiple mandatory arguments after a splat.
- [ruby-dev:31153]
-
-Thu Aug 9 02:02:02 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enum.c (enum_cycle): typo fixed. a patch from Kazuhiro
- NISHIYAMA <zn AT mbf.nifty.com>. [ruby-dev:31362]
-
-Wed Aug 8 19:17:40 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/dl/cptr.c (rb_dlptr_s_to_ptr): no longer check
- HAVE_RB_IO_STDIO_FILE.
-
-Wed Aug 8 15:52:01 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enumerator.c (enumerator_next_p): should check correctly even when
- e.next has not been called before.
-
- * enumerator.c (enumerator_next): raise StopIteration (name taken
- from Python) instead of IndexError.
-
- * enum.c (enum_zip): catch StopIteration exception.
-
- * enumerator.c (enumerator_with_index): return Enumerator if no
- block is given.
-
- * test/ruby/test_iterator.rb (TestIterator::test_enumerator): add
- test for enumerators.
-
-Wed Aug 8 11:48:37 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * bignum.c (rb_big2str0): should not use RTEST for non-VALUE.
-
-Wed Aug 8 11:25:25 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * bignum.c (rb_big2str0): should preserve sign mark.
-
-Wed Aug 8 11:02:43 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (btest-miniruby, test-sample): split the test target
- so that -k option works.
-
Tue Aug 7 14:58:39 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/pty/pty.c (establishShell): handshaking before close slave
@@ -38923,130 +3130,15 @@ Tue Aug 7 14:58:39 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/pty/expect_sample.rb: support for autologin.
-Tue Aug 7 13:58:03 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/ruby.h (ruby_special_consts): added RUBY_SPECIAL_SHIFT.
-
- * .gdbinit: some improvements.
-
-Tue Aug 7 13:28:32 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (node_name.inc): use $? instead of $< for nmake.
- [ruby-dev:31356]
-
Tue Aug 7 12:45:13 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (ac_cv_func_isinf): set yes also on OpenSolaris.
[ruby-Bugs-12859]
-Tue Aug 7 12:31:51 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (pipe_open): fix for win32 platforms.
-
-Tue Aug 7 02:58:33 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bignum.c (rb_big2str0): make Bignum#to_s even faster. a patch
- from Kenta Murata <muraken AT gmail.com>. [ruby-dev:31354]
-
-Tue Aug 7 01:42:05 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enum.c (enum_zip): zip no longer converts arguments into
- arrays, uses enumerators.
-
-Tue Aug 7 01:27:47 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * cont.c (rb_fiber_yield): change argument ordering. export.
-
- * cont.c (rb_fiber_current): export
-
- * include/ruby/intern.h: export several functions from cont.c.
-
- * enumerator.c (enumerator_next): new method to implement external
- iterator (generator) using fiber.
-
- * enumerator.c (enumerator_next_p): new method to check whether
- any element is left in the generator sequence.
-
- * enumerator.c (enumerator_rewind): a new method to rewind the
- generator sequence.
-
-Tue Aug 7 01:15:24 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enum.c (enum_cycle): new method to cycle enumerable forever.
-
-Tue Aug 7 00:05:38 2007 Keiju Ishitsuka <keiju@ruby-lang.org>
-
- * irb/ruby-lex.rb: support for '\c'. [ruby-talk:263508]
-
-Mon Aug 6 20:29:22 2007 Koichi Sasada <ko1@atdot.net>
-
- * insnhelper.ci, insns.def: move some statements to functions.
-
- * vm.c, vm.h, vm_evalbody.ci: fix include/typedef places.
-
-Mon Aug 6 18:41:12 2007 Koichi Sasada <ko1@atdot.net>
-
- * lib/vm/instruction.rb (make_header_analysys): fix last commit.
-
-Mon Aug 6 18:33:22 2007 Koichi Sasada <ko1@atdot.net>
-
- * lib/vm/instruction.rb (make_header_analysys): add to separate
- header addition process.
-
Mon Aug 6 17:36:29 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/rexml/encodings/{ISO-8859-15,CP-1252}.rb: fixed invalid syntax.
-Mon Aug 6 16:57:08 2007 Koichi Sasada <ko1@atdot.net>
-
- * sample/test.rb: fix to output file name if it contains
- invalid syntax.
-
-Mon Aug 6 16:41:22 2007 Koichi Sasada <ko1@atdot.net>
-
- * parse.y (value_expr_gen): fix to cause "void value expression"
- when jump expression such as "next" are shown on value_expr().
- [ruby-dev:31119]
-
- * bootstraptest/test_syntax.rb: fix to above change.
-
-Mon Aug 6 14:36:30 2007 Koichi Sasada <ko1@atdot.net>
-
- * parse.y: fix a f_marg rule. [ruby-dev:31160]
-
-Mon Aug 6 14:29:30 2007 Koichi Sasada <ko1@atdot.net>
-
- * bootstraptest/runner.rb (assert_equal): add additional
- message parameter.
-
-Mon Aug 6 13:34:09 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (INSNS): not chdir to srcdir.
-
- * common.mk (node_name.inc): auto-generate node name list.
-
- * iseq.c (ruby_node_name): ditto.
-
- * iseq.c (iseq_s_compile_option_get, Init_ISeq): added a new
- method VM::InstructionSequence::compile_option.
-
- * lib/vm/instruction.rb (RubyVM::SourceCodeGenerator): --destdir
- option.
-
- * tool/node_name.rb: to auto-generate node name list.
-
-Sun Aug 5 11:51:39 2007 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss, sample/rss, test/rss:
- - 0.1.7 -> 0.1.8.
- - supported <itunes:XXX>.
- - reverted backward incompatibility API changes introduced 0.1.7.
-
-Sun Aug 5 04:56:25 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (pipe_open_v, pipe_open_s): separate array and string
- cases. [ruby-dev:31344]
-
Fri Aug 3 11:05:54 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/extmk.rb (extmake): save all CONFIG values.
@@ -39065,47 +3157,11 @@ Fri Aug 3 07:09:05 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (find_type): new method.
-Fri Aug 3 00:00:20 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * bignum.c (big2str_table): base cannot be 0 or 1.
-
-Thu Aug 2 23:42:57 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (reg_compile_gen): set error if failed to compile regexp
- literal. [ruby-dev:31336]
-
- * re.c (option_to_str, arg_kcode, opt_kcode): options conversion
- between int and string.
-
- * re.c (rb_reg_compile): should not use regexp which could not get
- initialized. [ruby-dev:31333]
- return error message to let the parser know it.
-
- * re.c (rb_reg_compile): append regexp options to error message.
- [ruby-dev:31334]
-
-Thu Aug 2 22:05:32 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bignum.c (rb_big2str0): faster Bignum#to_s using Karatsuba
- algorithm. a patch from Yusuke ENDOH <mame AT tsg.ne.jp>
- in [ruby-dev:31312], slightly modified by Kenta Murata
- <muraken AT gmail.com> in [ruby-dev:31339].
-
Thu Aug 2 13:46:39 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* sprintf.c (rb_f_sprintf): should not check positional number as
width. [ruby-core:11838]
-Wed Aug 1 12:40:05 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * generic.rb (URI::Generic::merge_path): behave as RFC 3986.
- [ruby-talk:252052]
-
-Tue Jul 31 23:38:09 2007 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date/format.rb (_parse): now interprets slashed numerical
- dates as a big endian (except dd/mm/yyyy). [experimental]
-
Mon Jul 30 11:16:40 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* bignum.c (rb_big_aref): check for Bignum index range.
@@ -39116,11 +3172,6 @@ Sat Jul 28 09:35:41 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* ext/digest/lib/digest.rb (Digest::self.const_missing): avoid
infinite recursive const_missing call. [ruby-talk:262193]
-Thu Jul 26 20:40:25 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * range.c (range_eqq): call_super() in === does not work well
- since Enumerable#=== has different behavior. [ruby-dev:31296]
-
Thu Jul 26 13:57:45 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* dln.c (load_1, dln_find_1): constified.
@@ -39137,37 +3188,12 @@ Thu Jul 26 13:57:45 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ruby.c (ruby_init_loadpath): not convert built-in paths.
-Tue Jul 24 10:37:04 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (rb_f_p): return nil if no argument. [ruby-dev:31285]
-
-Tue Jul 24 01:05:07 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * regint.h (USE_MATCH_RANGE_IS_COMPLETE_RANGE): undef to achieve old
- rindex behavior. [ruby-dev:31265]
-
-Mon Jul 23 18:37:14 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * include/ruby/oniguruma.h: upgrade to Oniguruma 5.9.0. fixes
- some memory violation. [ruby-dev:31070]
-
-Sun Jul 22 20:09:49 2007 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date/format.rb (Date._parse): now accepts some new
- hints. [experimental]
-
- * lib/parsedate.rb: followed the changes on
- lib/date/format.rb. [experimental]
-
-Sun Jul 22 16:06:56 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread.c (is_ruby_native_thread): made an int function as
- well as version 1.8.
+Sun Jul 22 16:07:12 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * include/ruby/ruby.h (is_ruby_native_thread): moved prototype
- from intern.h as well as version 1.8.
+ * intern.h (is_ruby_native_thread): removed since declared as an int
+ function in ruby.h already.
-Sun Jul 22 14:33:46 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun Jul 22 14:33:40 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* file.c (rb_file_s_rename): deleted code to get rid of a bug of
old Cygwin.
@@ -39175,7 +3201,7 @@ Sun Jul 22 14:33:46 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* file.c (rb_file_truncate): added prototype of GetLastError()
on cygwin. [ruby-dev:31239]
- * include/ruby/intern.h (is_ruby_native_thread): prototype.
+ * intern.h (is_ruby_native_thread): prototype.
* missing/strftime.c (strftime): fix printf format and actual
arguments.
@@ -39184,35 +3210,21 @@ Sun Jul 22 14:33:46 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/tk/tcltklib.c (ip_finalize): ditto.
- * ext/win32ole/win32ole.c (lcid_installed): ditto.
+ * ext/dl/ptr.c (rb_dlptr_inspect): ditto. [ruby-dev:31268]
- * ext/socket/getnameinfo.c: include stdio.h always.
-
-Sat Jul 21 21:39:12 2007 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date.rb, lib/date/format.rb (Date._parse): now can take some
- hints (its aim must be mainly determination of endianness of
- date). [experimental]
+ * ext/dl/sym.c (rb_dlsym_inspect): ditto.
- * lib/date.rb, lib/date/format.rb (Date._parse): now completes
- truncated year as default action. [experimental]
+ * ext/socket/getnameinfo.c: include stdio.h always.
- * lib/date.rb, lib/date/format.rb: added ::iso8601, ::rfc3339,
- ::xmlschema, ::rfc2822, ::httpdate, ::jisx0301, #xmlschema,
- #httpdate. [experimental]
+ * ext/win32ole/win32ole.c (ole_hresult2msg, folevariable_name,
+ folevariable_ole_type, folevariable_ole_type_detail,
+ folevariable_value, folemethod_visible): missing return value.
Sat Jul 21 17:48:26 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * common.mk: inverted rules order.
-
- * thread_win32.ci (w32_create_thread): bcc does not have
- _beginthreadex().
-
* lib/mkmf.rb (create_makefile): make OBJS depend on RUBY_EXTCONF_H
only if extconf.h is created.
- * bcc32/Makefile.sub: headers have moved.
-
* bcc32/{Makefile.sub,configure.bat,setup.mak: configure_args
support.
@@ -39229,63 +3241,21 @@ Sat Jul 21 12:06:48 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (init_mkmf): should remove mkmf.log too.
-Sat Jul 21 01:45:03 2007 Tadayoshi Funaba <tadf@dotrb.org>
+Sat Jul 21 01:53:17 2007 Tadayoshi Funaba <tadf@dotrb.org>
* lib/date/format.rb (Date._parse): completes calendar week based year.
* lib/date/format.rb (Date._parse): detects year of ordinal date in
extended format.
-Fri Jul 20 16:30:31 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * compile.c (iseq_set_sequence): raise SyntaxError instead of rb_bug
- since this function can be called from VM::InstructionSequence.load.
-
- * compile.c (insn_set_sc_state, iseq_set_sequence_stackcaching): ditto.
-
-Fri Jul 20 16:11:33 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * compile.c, compile.h (DECL_ANCHOR, INIT_ANCHOR): split not to
- initialize aggregations with dynamic values. [ruby-talk:259306]
-
- * eval.c (rb_protect): not to initialize aggregations with dynamic
- values. [ruby-talk:259306]
-
- * gc.c (mark_current_machine_context): ditto.
-
- * thread.c (thgroup_list, call_trace_func): ditto.
-
- * vm.c (vm_init_redefined_flag): ditto.
-
Fri Jul 20 15:22:51 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/openssl/ossl_config.c (ossl_config_set_section): do not
initialize aggregations with dynamic values. [ruby-talk:259306]
-Fri Jul 20 10:39:28 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (stmt, mlhs_node, lhs, arg, var_ref): return dummy
- NODE_BEGIN after errors. [ruby-dev:31100], [ruby-dev:31118]
-
- * parse.y (remove_begin): keep empty NODE_BEGIN, instead of null.
- [ruby-dev:31252], [ruby-dev:31263]
-
-Fri Jul 20 09:50:40 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * bootstraptest/runner.rb (get_result_string): check $?.coredump?
- first.
-
- * bootstraptest/runner.rb (cleanup_coredump, check_coredump): see
- stackdump file too.
-
-Thu Jul 19 20:39:30 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (value_expr_gen): warn for empty expression ().
- [ruby-dev:31252]
-
Thu Jul 19 19:24:14 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * eval_error.ci (get_backtrace): check the result more.
+ * eval.c (get_backtrace): check the result more.
[ruby-dev:31261] [ruby-bugs-12398]
Thu Jul 19 14:38:45 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
@@ -39300,40 +3270,29 @@ Wed Jul 18 16:57:41 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* bignum.c (rb_big_pow): refine overflow check. [ruby-dev:31242]
-Wed Jul 18 09:19:07 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (rb_parser_append_print, rb_parser_while_loop): moved check
- for node to the head.
-
- * ruby.c (proc_options): do nothing for -p/-n options if tree is null.
- submitted by Yusuke ENDOH <mame AT tsg.ne.jp> at [ruby-dev:31243].
-
Wed Jul 18 08:47:09 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* time.c (time_succ): Time#succ should return a time object in the
same timezone mode to the original. [ruby-talk:260256]
+Tue Jul 17 00:50:53 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * numeric.c (fix_pow): integer power calculation: 0**n => 0,
+ 1**n => 1, -1**n => 1 (n: even) / -1 (n: odd).
+
+ * test/ruby/test_fixnum.rb (TestFixnum::test_pow): update test
+ suite. pow(-3, 2^64) gives NaN when pow(3, 2^64) gives Inf.
+
Mon Jul 16 23:07:51 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/base64.rb (Base64::b64encode): should not specify /o option
for regular expression. [ruby-dev:31221]
-Mon Jul 16 22:57:53 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * sprintf.c (rb_str_format): make %u behave like %d for negative
- values, since decimal format does not work with preceding dots.
- [ruby-core:11575]
-
Mon Jul 16 18:29:33 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* string.c (rb_str_rindex_m): accept string-like object convertible
with #to_str method, as well as rb_str_index_m. [ruby-core:11692]
-Mon Jul 16 07:17:28 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * insns.def (getspecial): lfp_svar_get() requires int for special
- global variables.
-
Mon Jul 16 05:45:53 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* sprintf.c (rb_f_sprintf): more checks for format argument.
@@ -39344,9 +3303,11 @@ Mon Jul 16 00:26:10 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* bignum.c (rb_big_pow): removed invariant variable. [ruby-dev:31236]
-Sun Jul 15 22:24:37 2007 pegacorn <subscriber.jp AT gmail.com>
+Sun Jul 15 23:59:57 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * bignum.c (rb_big_neg): SIGNED_VALUE isn't in 1.8.
- * ext/dl/cfunc.c (rb_dlcfunc_call): adjust format. [ruby-dev:31222]
+Sun Jul 15 22:24:49 2007 pegacorn <subscriber.jp AT gmail.com>
* ext/digest/digest.c (rb_digest_instance_update,
rb_digest_instance_finish, rb_digest_instance_reset,
@@ -39370,8 +3331,7 @@ Sun Jul 15 22:24:37 2007 pegacorn <subscriber.jp AT gmail.com>
* win32/win32.c: include mbstring.h for _mbspbrk(). [ruby-dev:31232]
- * include/ruby/win32.h (rb_w32_getcwd): prototype added.
- [ruby-dev:31232]
+ * win32.h (rb_w32_getcwd): prototype added. [ruby-dev:31232]
Sun Jul 15 21:07:43 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
@@ -39386,67 +3346,33 @@ Sun Jul 15 04:42:20 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* bignum.c (get2comp): do nothing for empty Bignum. [ruby-dev:31225]
-Sat Jul 14 22:49:30 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * numeric.c (fix_pow): integer power calculation: 0**n => 0,
- 1**n => 1, -1**n => 1 (n: even) / -1 (n: odd).
-
- * test/ruby/test_fixnum.rb (TestFixnum::test_pow): update test
- suite. pow(-3, 2^64) gives NaN when pow(3, 2^64) gives Inf.
-
-Sat Jul 14 18:46:35 2007 Tanaka Akira <akr@fsij.org>
-
- * configure.in: add --with-valgrind.
-
- * gc.h (SET_MACHINE_STACK_END): new macro to replace
- rb_gc_set_stack_end. it find out accurate stack boundary by
- asm using gcc on x86.
-
- * thread.c (rb_gc_set_stack_end): don't define if asm-version
- SET_MACHINE_STACK_END is available.
-
- * gc.c (mark_current_machine_context): extracted from garbage_collect.
- it use SET_MACHINE_STACK_END to not scan out of stack area.
- it notify conservative GC information to valgrind if
- --with-valgrind.
-
Sat Jul 14 14:04:06 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* enum.c (sort_by_cmp): check if reentered. [ruby-dev:24291]
-Sat Jul 14 11:08:28 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/json/ext/generator/generator.c (check_max_nesting): wrong
- format specifier. a patch from pegacorn <subscriber.jp AT gmail.com>.
- [ruby-dev:31217]
+Sat Jul 14 12:44:14 2007 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-Sat Jul 14 02:27:43 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * test/openssl/test_pkcs7.rb: reverted the previous patch. it should
+ be as it was to check interface compatibility. sorry for bothering
+ with this.
- * numeric.c (int_pow): overflow detection using FIT_SQRT_LONG().
- [ruby-dev:31215]
+Sat Jul 14 12:16:17 2007 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-Sat Jul 14 02:05:53 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * test/openssl/test_pkcs7.rb: follow the library change. applied a
+ patch from <zn at mbf.nifty.com> [ruby-dev:31214].
+ NOTE: r12496 imports the latest openssl libs from trunk to ruby_1_8
+ though its's not ChangeLog-ed. maintainer should aware that.
- * insns.def (opt_div): LONG2FIX() may not work for corner cases,
- use LONG2NUM() instead. [ruby-dev:31210]
+Sat Jul 14 02:51:52 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-Sat Jul 14 00:34:01 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * numeric.c (fix_pow): 0**2 should not raise floating point
+ exception. [ruby-dev:31216]
- * numeric.c (int_round): should not return false, but self.
- [ruby-dev:31212]
+Sat Jul 14 02:25:48 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-Fri Jul 13 18:31:27 2007 Koichi Sasada <ko1@atdot.net>
+ * numeric.c (int_pow): wrong overflow detection. [ruby-dev:31213]
- * include/ruby/intern.h: remove unused function declarations.
-
- * include/ruby/ruby.h: ditto.
-
-Fri Jul 13 17:32:37 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * vm.c (vm_free): clear free'ed living_threads field.
- [ruby-dev:31163]
-
- * insns.def (opt_succ): use cast to shut a warning up.
+ * numeric.c (int_pow): wrong overflow detection. [ruby-dev:31215]
Fri Jul 13 16:10:00 2007 Tanaka Akira <akr@fsij.org>
@@ -39459,319 +3385,30 @@ Fri Jul 13 15:02:15 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* win32/win32.c (CreateChild): enclose command line except for
command.com which can not handle quotes. [ruby-talk:258939]
-Fri Jul 13 11:33:09 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * range.c (range_max, range_min): return nil for empty set as well as
- 1.8 and Enumerable. [ruby-dev:31198]
-
-Fri Jul 13 11:28:37 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (bvar): semicolon was lost for ripper description.
- [ruby-dev:31140]
-
-Fri Jul 13 11:25:10 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (program, stmt, primary): reduced duplicated code.
-
- * parse.y (dsym): convert also literals containing NUL to
- symbol.
-
- * parse.y (debug_lines): use rb_hash_lookup() to get rid of
- call of Hash#default.
-
- * parse.y (ripper_warningS): unused in ripper right now.
-
-Fri Jul 13 10:33:29 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * array.c (rb_ary_flatten_bang): check argument if valid
- integer. [ruby-dev:31197]
-
Fri Jul 13 10:10:46 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (link_command, cc_command, cpp_command): do not expand
::CONFIG which is an alias of MAKEFILE_CONFIG.
-Thu Jul 12 21:38:02 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * insns.def (opt_succ): use LONG_MAX as maximum Fixnum VALUE.
- [ruby-dev:31199]
-
-Thu Jul 12 18:42:18 2007 Tanaka Akira <akr@fsij.org>
-
- * range.c (range_max): use FIX2LONG instead of FIX2INT to avoid
- RangeError by ((-0x80000001)...(-0x80000001)).max on LP64.
-
- * insns.def (opt_plus): use FIX2LONG instead of FIX2INT to avoid
- RangeError by 0x3fffffffffffffff+1 on LP64.
-
- * insns.def (opt_succ): don't use 0x80000000 which assumes 32bit VALUE.
- use FIX2LONG instead of FIX2INT.
- [ruby-dev:31190]
-
Thu Jul 12 17:03:15 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* struct.c (rb_struct_init_copy): disallow changing the size.
[ruby-dev:31168]
-Thu Jul 12 12:58:21 2007 Koichi Sasada <ko1@atdot.net>
-
- * blockinlining.c: remove "yarv" prefix.
-
- * array.c, numeric.c: ditto.
-
- * insnhelper.ci, insns.def, vm_evalbody.ci: ditto.
-
- * yarvcore.c: removed.
-
- * yarvcore.h: renamed to core.h.
-
- * cont.c, debug.c, error.c, process.c, signal.c : ditto.
-
- * ext/probeprofiler/probeprofiler.c: ditto.
-
- * id.c, id.h: added.
-
- * inits.c: ditto.
-
- * compile.c: rename internal functions.
-
- * compile.h: fix debug flag.
-
- * eval.c, object.c, vm.c: remove ruby_top_self.
- use rb_vm_top_self() instead.
-
- * eval_intern.h, eval_load: ditto.
-
- * gc.c: rename yarv_machine_stack_mark() to
- rb_gc_mark_machine_stack().
-
- * insnhelper.h: remove unused macros.
-
- * iseq.c: add iseq_compile() to create iseq object
- from source string.
-
- * proc.c: rename a internal function.
-
- * template/insns.inc.tmpl: remove YARV prefix.
-
- * thread.c: use rb_iseq_eval() and rb_str_new2().
-
- * vm.c (rb_iseq_eval): added.
-
- * vm.c: move some functions from yarvcore.c.
-
- * vm_dump.c: fix to remove compiler warning.
-
-Thu Jul 12 12:24:29 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * insns.def (opt_succ): fixed typo. [ruby-dev:31189]
-
-Thu Jul 12 10:30:46 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread.c (thread_start_func_2): moved prototye from thread_*.ci.
-
- * thread_pthread.ci (thread_start_func_2): not use a directive
- inside a macro argument. [ruby-talk:258763]
-
- * thread.c (thread_join): pthread_t may not be pointer.
-
- * thread_pthread.ci (ubf_select_each): ditto.
-
-Thu Jul 12 05:32:28 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * include/ruby/ruby.h (FIX2ULONG): drop sign bit for LLP64 platform.
-
-Tue Jul 10 19:34:45 2007 Koichi Sasada <ko1@atdot.net>
-
- * hash.c (rb_hash_lookup): added. this function is similar to
- rb_hash_aref(), but doesn't call Hash#default when no entry
- exists.
+Wed Jul 11 23:38:14 2007 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
- * include/ruby/intern.h: ditto.
-
- * insnhelper.ci (lfp_svar_get): use rb_hash_lookup().
-
-Tue Jul 10 19:16:28 2007 Koichi Sasada <ko1@atdot.net>
-
- * eval.c, insnhelper.ci, vm.c: change cref index (-1 -> 2).
-
-Tue Jul 10 18:49:56 2007 Koichi Sasada <ko1@atdot.net>
-
- * eval.c (exec_under): add proper casts.
-
-Tue Jul 10 16:58:16 2007 Koichi Sasada <ko1@atdot.net>
-
- * vm.c, insnhelper.ci: fix svar interface.
-
- * compile.c (iseq_compile_each), yarvcore.h: fix to use new
- svar interface for flip flop.
-
- * eval.c: ditto.
-
- * insns.def: ditto.
-
- * include/ruby/intern.h: remove "rb_svar()" declaration.
-
-Tue Jul 10 16:52:01 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * compile.c (rb_iseq_compile): formatted if/else to switch statement.
-
-Tue Jul 10 15:57:53 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * bootstraptest/test_flip.rb: new test for flip-flop operator.
+ * random.c: documentation fix. srand(0) initializes PRNG with '0',
+ not with random_seed.
Tue Jul 10 14:50:01 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* bcc32/{Makefile.sub,setup.mak}: remove surplus slash from srcdir.
-Mon Jul 9 02:17:36 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * cont.c (cont_restore_1): workaround for x64-mswin64's SEH.
-
-Sun Jul 8 02:08:53 2007 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/json.rb, lib/json/, ext/json/: import JSON 1.1.1
-
-Sat Jul 7 21:59:29 2007 Tanaka Akira <akr@fsij.org>
-
- * lib/pp.rb (PP::PPMethods#pp_hash): sort condition changed:
- all keys have a same class which is kind of Comparable.
-
-Sat Jul 7 17:12:37 2007 Koichi Sasada <ko1@atdot.net>
-
- * compile.c: use rb_bug() instead of rb_compile_error().
-
-Sat Jul 7 16:12:48 2007 Koichi Sasada <ko1@atdot.net>
-
- * parse.y: fix node construction (around f_margs).
- [ruby-dev:31143]
-
- * bootstraptest/test_block.rb: add a test for above.
-
- * insnhelper.ci: fix indent.
-
-Sat Jul 7 15:36:50 2007 Tanaka Akira <akr@fsij.org>
-
- * lib/pp.rb (PP::PPMethods#pp_hash): sort if
- all keys are strings, symbols or integers.
-
-Sat Jul 7 15:30:05 2007 Koichi Sasada <ko1@atdot.net>
-
- * insnhelper.ci (vm_yield_setup_args), vm.c, insns.def:
- fix to pass nil as block parameter to yielded block.
- [ruby-dev:31147]
-
- * bootstraptest/test_block.rb: add a test for above.
-
-Fri Jul 6 19:55:10 2007 Keiju Ishitsuka <keiju@ruby-lang.org>
-
- * lib/irb.rb: typo. Thanks, Giles Bowkett.
-
- * lib/irb/completion.rb: support Ruby1.9 changing return value
- String to Symbol for Object#methods, etc. [ruby-dev:31148].
-
-Fri Jul 6 18:20:50 2007 Koichi Sasada <ko1@atdot.net>
-
- * bootstraptest/runner.rb: fix load path.
-
- * common.mk: fix "test" rule to run with "btest".
-
- * rubytest.rb, sample/test.rb: fix to show tests progress.
-
-Fri Jul 6 15:37:48 2007 Koichi Sasada <ko1@atdot.net>
-
- * test/ruby/test_iterator.rb: fix test to 1.9 spec.
-
-Fri Jul 6 15:21:25 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Jul 6 15:22:58 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (rb_interrupt): suppress a gcc's officious warning.
-Fri Jul 6 14:57:12 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (keyword_to_name): constified.
-
- * ext/ripper/eventids2.c (token_to_eventid): ditto.
-
-Fri Jul 6 14:50:40 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * bootstraptest/runner.rb: added --quiet option.
-
-Fri Jul 6 14:35:25 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (f_marg): wrap f_norm_arg assignment node with NODE_LIST.
- [ruby-dev:31141]
-
-Fri Jul 6 12:15:01 2007 Tanaka Akira <akr@fsij.org>
-
- * test/ruby/sentgen.rb: new file.
-
- * test/ruby/test_assignment.rb: tests implemented using assignment
- generator and emulator.
-
-Fri Jul 6 03:06:58 2007 Koichi Sasada <ko1@atdot.net>
-
- * insns.def: remove unused code.
-
- * compile.c (compile_massign): fix to invoke to_splat on
- splat rhs (example: *a = *nil). [ruby-dev:31136]
-
- * bootstraptest/test_massign.rb: add tests for above.
-
- * compile.c (iseq_compile_each): disable excess optimization.
- [ruby-dev:31126]
-
-Fri Jul 6 02:08:25 2007 Koichi Sasada <ko1@atdot.net>
-
- * insns.def: fix to invoke nil.to_splat on NODE_ARGSCAT.
- [ruby-dev:31138].
-
- * bootstraptest/test_literal.rb: add tests for above.
-
-Thu Jul 5 19:45:55 2007 Koichi Sasada <ko1@atdot.net>
-
- * yarvcore.h: rename rb_control_frame_t#magic to flag.
-
- * vm.h: add VM_FRAME_TYPE() and VM_FRAME_FLAG().
-
- * cont.c, insnhelper.ci, insns.def, vm.c, vm_dump.c,
- vm_evalbody.ci, yarvcore.c: apply above changes.
-
-Thu Jul 5 19:16:14 2007 Koichi Sasada <ko1@atdot.net>
-
- * test/ruby/test_basicinstructions.rb: remove an assertion using
- unsupported hash literal (such as {1, 2}).
-
- * test/ruby/test_hash.rb: ditto.
-
-Thu Jul 5 19:12:22 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ruby.c: Qfalse is VALUE, not pointer.
-
-Thu Jul 5 18:42:01 2007 Koichi Sasada <ko1@atdot.net>
-
- * compile.c (iseq_compile_each): add break catch point.
-
- * insns.def (throw): support correct "break" and "return".
- this commit achieve that "make test" passes all tests.
-
- * vm.c: ditto.
-
-Thu Jul 5 18:44:12 2007 Tanaka Akira <akr@fsij.org>
-
- * parse.y (mlhs_basic): use mlhs_post after tSTAR.
- [ruby-dev:31109]
-
-Thu Jul 5 18:27:58 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/{intern,ruby}.h, compile.[ch], error.c, eval.c,
- eval_load.c, gc.c, iseq.c, main.c, parse.y, re.c, ruby.c,
- yarvcore.[ch] (ruby_eval_tree, ruby_sourcefile, ruby_sourceline,
- ruby_nerrs): purge global variables.
-
- * ruby.c (proc_options): moved do_print and do_loop options
- handling from ruby_process_options().
-
-Thu Jul 5 16:37:34 2007 NAKAMURA Usaku <usa@ruby-lang.org>
+Thu Jul 5 16:44:28 2007 NAKAMURA Usaku <usa@ruby-lang.org>
* numeric.c (int_pow): fix previous nubu's commit.
@@ -39781,684 +3418,41 @@ Thu Jul 5 15:56:06 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* numeric.c (int_pow): even number multiplication never be negative.
-Thu Jul 5 10:42:07 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/{node,ruby}.h, ruby.c: added enum constants for gdb
- support. [ruby-dev:31066]
-
- * .gdbinit: some improvements.
-
-Thu Jul 5 10:13:08 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (global_symbols.last_id): reduce unused ID numbers.
-
- * include/ruby/st.h, st.c (st_init_table, st_init_table_with_size):
- constified.
-
-Wed Jul 4 23:36:27 2007 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/webrick/httpauth/authenticator.rb
- (WEBrick::HTTPAuth::Authenticator#check_scheme): auth-scheme must be
- treated as a case-insensitive token according to RFC 2617 section 1.2.
-
-Wed Jul 4 18:30:04 2007 Tanaka Akira <akr@fsij.org>
-
- * parse.y (mlhs_inner): new rule. [ruby-dev:31132]
+Mon Jul 2 14:34:43 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed Jul 4 05:11:57 2007 Koichi Sasada <ko1@atdot.net>
-
- * iseq.c (set_relation): added.
-
-Wed Jul 4 04:58:30 2007 Koichi Sasada <ko1@atdot.net>
-
- * insnhelper.ci (caller_setup_args): fix to show correct class
- on an error message (ex: m(&1)). [ruby-dev:31101]
-
-Wed Jul 4 04:30:32 2007 Koichi Sasada <ko1@atdot.net>
-
- * compile.c (compile_array, iseq_compile_each): fix about array
- generation in void context. [ruby-dev:31102]
-
- * bootstraptest/test_literal.rb: add a test for above.
-
-Wed Jul 4 04:07:00 2007 Koichi Sasada <ko1@atdot.net>
-
- * compile.c (compile_array): ignore NODE_ZARRAY.
- [ruby-dev:31110]
-
- * bootstraptest/test_method.rb: add a test for above.
-
-Wed Jul 4 04:04:02 2007 Koichi Sasada <ko1@atdot.net>
-
- * compile.h: fix debug print level.
-
-Wed Jul 4 03:52:55 2007 Koichi Sasada <ko1@atdot.net>
-
- * compile.c (iseq_compile_each): support v[&b]= type method call.
- [ruby-dev:31094]
-
- * bootstraptest/test_method.rb: add a test for above.
-
-Wed Jul 4 03:43:29 2007 Koichi Sasada <ko1@atdot.net>
-
- * compile.c (compile_massign): fix massign compilation
- (example: a, *v, (*x) = ...). [ruby-dev:31107]
-
- * bootstraptest/test_massign.rb: add tests for above.
-
-Tue Jul 3 23:12:29 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * include/ruby/onigiruma.h (ONIG_EXTERN): use RUBY_EXTERN if defined.
-
- * regenc.h: include ruby/defines.h.
-
- * regint.h: x64-mswin64 support.
-
-Tue Jul 3 13:47:44 2007 Koichi Sasada <ko1@atdot.net>
-
- * cont.c (cont_save_machine_stack): clear saved_thread.machine_stack*.
-
-Mon Jul 2 21:45:53 2007 Koichi Sasada <ko1@atdot.net>
-
- * compile.c: rename iseq_translate_direct_threaded_code()
- to iseq_translate_threaded_code().
-
- * eval_intern.h, yarvcore.h: mv EXEC_EVENT_HOOK() and
- exec_event_hooks() to yarvcore.h.
-
- * insnhelper.ci, vm.c: mv yarv_finish_insn_seq to vm.c.
-
- * insns.def (opt_call_c_function): fix to use RESTORE_REGS().
-
- * iseq.c (rb_iseq_build_for_ruby2cext): fix to allocate iseq.
-
-Mon Jul 2 11:59:34 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * insns.def (defineclass): suppress a warning.
-
- * insns.def (opt_call_c_function): should raise the thrown exception
- instead of returning it.
-
-Mon Jul 2 08:53:47 2007 Koichi Sasada <ko1@atdot.net>
-
- * eval_intern.h, yarvcore.h: move declaration of sysstack_error
- to yarvcore.h.
-
- * iseq.c: fix symbol name (:toplevel -> :top).
-
- * lib/vm/instruction.rb, template/vm.inc.tmpl: replaceable
- current file name.
-
-Mon Jul 2 05:29:07 2007 Koichi Sasada <ko1@atdot.net>
-
- * compile.c, iseq.c: fix iseq some of load/store process.
-
-Mon Jul 2 03:09:36 2007 Koichi Sasada <ko1@atdot.net>
-
- * yarvcore.h, compile.c, insnhelper.ci, iseq.c, vm.c:
- rename structure names and field names.
-
- * insnhelper.h, insns.def: add GET_CONST_INLINE_CACHE().
-
- * iseq.c: add rb_iseq_build_for_ruby2cext().
-
- * yarvcore.h, vm.h: move declaration of rb_insn_func_t
- to yarvcore.h.
-
-Sun Jul 1 03:25:53 2007 Koichi Sasada <ko1@atdot.net>
-
- * insnhelper.h, vm.h: some refactoring.
- remove useless comments, etc.
-
-Sun Jul 1 03:02:29 2007 Koichi Sasada <ko1@atdot.net>
-
- * yarvcore.h: some refactoring on rb_iseq_t.
- rename some variable names, add comments, etc.
-
- * compile.c, iseq.c, proc.c, vm.c: ditto.
-
-Sun Jul 1 02:57:57 2007 Koichi Sasada <ko1@atdot.net>
-
- * vm.h: rename insn_func_type to rb_insn_func_type.
+ * sprintf.c (rb_f_sprintf): sign bit extension should not be done
+ if FPLUS flag is specified. [ruby-list:39224]
- * vm_evalbody.ci: ditto.
+Sat Jun 30 16:05:41 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
- * insns.def: add opt_call_native_compiled instruction
- instead of opt_call_native_compiled.
+ * array.c (rb_ary_initialize): should call rb_ary_modify() first.
+ [ruby-core:11562]
Sat Jun 30 00:17:00 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * parse.y (parser_yylex): return non-valid token for an invalid
+ * parse.y (yylex): return non-valid token for an invalid
instance/class variable name. a patch from Yusuke ENDOH
<mame AT tsg.ne.jp>. [ruby-dev:31095]
-Fri Jun 29 23:38:06 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (stmts): fix for ripper.
-
-Fri Jun 29 21:55:48 2007 Koichi Sasada <ko1@atdot.net>
-
- * parse.y: fix to show line number of blank block.
- [ruby-dev:31093]
-
-Fri Jun 29 20:51:04 2007 Tanaka Akira <akr@fsij.org>
-
- * lib/cgi/session.rb (create_new_id): don't cut off md5.hexdigest to
- follow Ruby 1.8.
-
-Fri Jun 29 17:10:14 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * debug.h: constified.
-
- * debug.c (ruby_set_debug_option): separated from main.c.
-
- * gc.c (ruby_gc_stress), signal.c (ruby_enable_coredump): prefixed.
-
-Fri Jun 29 16:39:06 2007 Koichi Sasada <ko1@atdot.net>
-
- * proc.c (proc_new): fix to return a proc object
- which block is contained ([ruby-dev:31056]).
-
-Fri Jun 29 15:43:59 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * numeric.c (fix_pow): get rid of division by zero. reported by
- Yusuke ENDOH <mame AT tsg.ne.jp> [ruby-dev:31040]
-
- * numeric.c (int_round): do nothing when rounding by zeroth digit.
- check underflow. [ruby-dev:31043]
-
-Fri Jun 29 15:32:00 2007 Koichi Sasada <ko1@atdot.net>
-
- * configure.in: add fastcall attribute check.
-
-Fri Jun 29 14:51:24 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (assoc_list): remove expanded hash literal (no splat).
-
- * lib/webrick/httpstatus.rb (WEBrick::HTTPStatus::EOFError): adapt
- to new syntax.
-
-Fri Jun 29 14:48:18 2007 Koichi Sasada <ko1@atdot.net>
-
- * tool/insns2vm.rb, lib/vm/instruction.rb: move process body
- to lib/vm/instruction.rb.
-
- * common.mk: fix aotc rule.
- experimental. bin/ruby2cext is not added yet.
-
Fri Jun 29 11:23:09 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (dsym): return non-null NODE even if yyerror(). based on a
patch from Yusuke ENDOH <mame AT tsg.ne.jp>. [ruby-dev:31085]
-Thu Jun 28 23:29:30 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (assoc_list): odd number check only for NODE_ARRAY.
- [ruby-dev:31082]
-
-Thu Jun 28 22:24:33 2007 Koichi Sasada <ko1@atdot.net>
-
- * win32/Makefile.sub: define FUNC_FASTCALL macro.
-
- * vm.h: fix to use FUNC_FASTCALL macro.
- TODO: add FUNC_FASTCALL macro by configure.
-
-Thu Jun 28 19:38:53 2007 Koichi Sasada <ko1@atdot.net>
-
- * compile.c: fix to remove -Wall warnings on gcc.
-
- * compile.c (make_name_with_str): removed. use rb_sprintf() instead.
-
-Thu Jun 28 18:53:01 2007 Tanaka Akira <akr@fsij.org>
-
- * bignum.c (rb_big_hash): fix hash area.
-
-Thu Jun 28 15:00:06 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/stringio/stringio.c (strio_getline): local variable to be
- initialized. [ruby-dev:31077]
-
-Thu Jun 28 11:30:39 2007 NAKAMURA Usaku <usa@ruby-lang.org>
+Tue Jun 26 16:35:21 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * gc.c (rb_obj_id): use SIGNED_VALUE instead of long.
+ * process.c (ruby_setreuid, ruby_setregid): rename to get rid of name
+ clash.
-Thu Jun 28 05:01:56 2007 Koichi Sasada <ko1@atdot.net>
+ * process.c (proc_exec_v, rb_proc_exec): preserve errno.
- * common.mk (run.gdb): fix to load $(srcdir)/.gdbinit
+Sat Jun 23 00:37:46 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
- * vm.c (rb_vm_set_finish_env): add a cast.
+ * hash.c (rb_hash_select): remove unnecessary varargs for
+ rb_hash_select. a patch from Daniel Berger
+ <Daniel.Berger at qwest.com>. [ruby-core:11527]
- * vm.h: support __fastcall for MSVC.
-
-Thu Jun 28 02:12:08 2007 Koichi Sasada <ko1@atdot.net>
-
- * bootstraptest/runner.rb: fix to untouch $:.
-
-Thu Jun 28 02:03:07 2007 Koichi Sasada <ko1@atdot.net>
-
- * compile.c (setup_args): change parameter type.
-
-Thu Jun 28 02:03:39 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * parse.y (rb_intern2): unconstify cast.
-
-Thu Jun 28 01:44:31 2007 Tanaka Akira <akr@fsij.org>
-
- * parse.y (rb_intern2): don't allocate a string object at first.
- [ruby-dev:31064]
-
-Thu Jun 28 01:24:02 2007 Koichi Sasada <ko1@atdot.net>
-
- * bootstraptest/runner.rb: fix to show file name.
-
- * bootstraptest/test_*.rb: add bootstrap tests.
-
-Thu Jun 28 01:22:15 2007 Koichi Sasada <ko1@atdot.net>
-
- * include/ruby/node.h, parse.y, gc.c, iseq.c: remove NODE_CREF.
-
-Thu Jun 28 01:19:43 2007 Koichi Sasada <ko1@atdot.net>
-
- * compile.c (iseq_compile_each): fix popped backref and others.
- ([ruby-dev:31068]).
-
- * compile.c (iseq_compile_each): remove needless statements.
-
-Wed Jun 27 23:51:33 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c: remove unused functions.
-
-Wed Jun 27 20:46:05 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * include/ruby/win32.h, win32/Makefile.sub, win32/configure.bat,
- win32/mkexports.rb, win32/setup.mak, win32/win32.c: import
- x64-mswin64 port.
-
-Wed Jun 27 20:31:07 2007 Koichi Sasada <ko1@atdot.net>
-
- * compile.c (iseq_translate_direct_threaded_code): fix prototype
- function name.
-
- * vm.h: add correct cast.
-
-Wed Jun 27 17:08:42 2007 Koichi Sasada <ko1@atdot.net>
-
- * vm_evalbody.ci: support OPT_CALL_THREADED_CODE.
-
- * insns.def, vm.c, vm.h: ditto.
-
- * vm.h: add VM_CFP_CNT() and VM_SP_CNT().
-
-Wed Jun 27 04:23:47 2007 Koichi Sasada <ko1@atdot.net>
-
- * compile.c (iseq_compile_each): fix type error.
-
-Wed Jun 27 03:26:15 2007 Koichi Sasada <ko1@atdot.net>
-
- * compile.c (compile_massign), insns.def (expandarray): support
- postarg with massign (a, *b, c = ...).
-
- * bootstraptest/test_massign.rb: add tests for above.
-
- * compile.h: fix debug macro names.
-
-Wed Jun 27 00:18:41 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_clear): need to check STR_EMBED_P() before
- free()ing memory. a patch from Yusuke ENDOH <mame AT tsg.ne.jp>.
- [ruby-dev:31062]
-
-Tue Jun 26 16:39:01 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * process.c (proc_getgroups): use GIDT2NUM for rb_gid_t.
-
-Tue Jun 26 16:28:24 2007 Koichi Sasada <ko1@atdot.net>
-
- * thread.c (rb_thread_wait_fd_rw): terminate fdset.
-
-Tue Jun 26 16:26:58 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * regint.h: IL32LLP64 support.
-
-Tue Jun 26 16:22:45 2007 Koichi Sasada <ko1@atdot.net>
-
- * iseq.c (ruby_node_name): update node names.
-
-Tue Jun 26 15:21:20 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * include/ruby/ruby.h: IL32LLP64 support.
-
- * bignum.c (bigfixize, rb_cstr_to_inum): ditto.
-
- * insns.def (opt_plus, opt_minus, opt_mult): ditto.
-
-Tue Jun 26 15:04:06 2007 Koichi Sasada <ko1@atdot.net>
-
- * cont.c (rb_fiber_s_new): revert initializing VM stack.
-
- * yarvcore.c (th_init2): ditto.
-
- * vm.c, vm.h: fix to stop using Qundef on VM stack. According to
- this change, VM stack should not include Qundef value.
-
- * insns.def (putundef): removed.
-
- * compile.c (iseq_compile_each): ditto.
-
- * eval.c (eval): fix spacing.
-
-Tue Jun 26 04:03:50 2007 Koichi Sasada <ko1@atdot.net>
-
- * insnhelper.ci (vm_yield_with_cfunc), proc.c: fix Method#to_proc
- to return lambda Proc ([ruby-dev:31021], [ruby-dev:31037]).
-
-Tue Jun 26 03:46:08 2007 Koichi Sasada <ko1@atdot.net>
-
- * cont.c (rb_fiber_s_new): fix to clear rb_thread_t#tag.
- [ruby-dev:30995]
-
-Tue Jun 26 03:38:31 2007 Koichi Sasada <ko1@atdot.net>
-
- * cont.c (rb_fiber_s_new), yarvcore.c (th_init2): fix to clear
- VM stack ([ruby-dev:31046]).
-
-Tue Jun 26 03:15:27 2007 Koichi Sasada <ko1@atdot.net>
-
- * compile.c: rename setup_arg() to setup_args().
- fix to use setup_args() at processing NODE_YIELD.
-
-Tue Jun 26 02:50:24 2007 Koichi Sasada <ko1@atdot.net>
-
- * compile.c (setup_arg): support kind of "m(*ary, x)" method call.
- ([ruby-dev:31048]).
-
-Tue Jun 26 00:28:44 2007 Koichi Sasada <ko1@atdot.net>
-
- * insnhelper.ci, vm.c: complete block parameter support.
- post arguments, optional arguments, block argument.
-
- * compile.c, parse.y: fix {|a|} parameter.
-
- * insnshelper.ci, insns.def: revert caller_setup_args() option
- (need_block_check) parameter.
-
-Mon Jun 25 20:18:44 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * gc.c (RVALUE): in RVALUE and RBasic, flags must be the same type.
-
-Mon Jun 25 18:02:55 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/pty/extconf.rb: skip wince and win64.
-
-Mon Jun 25 17:59:32 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * include/ruby/node.h (NODE_LMASK, nd_line): shouldn't use int and/or
- long carelessly.
-
-Mon Jun 25 11:36:35 2007 Koichi Sasada <ko1@atdot.net>
-
- * gc.h: add RUBY_ prefix to debug macros.
-
- * cont.c, proc.c, yarvcore.c,
-
- * gc.c: define ruby_gc_debug_indent variable to debug mark/free.
-
- * vm.c, insnhelper.ci: rename some functions to vm_* or rb_vm_*.
- move some functions, definitions, declarations to suitable files.
-
- * eval.c, yarvcore.h, eval_error.ci, insnhelper.ci: ditto.
-
-Mon Jun 25 09:45:46 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval_error.ci, eval_jump.ci, eval_method.ci, eval_safe.ci: c-mode.
-
-Mon Jun 25 05:27:54 2007 Koichi Sasada <ko1@atdot.net>
-
- * eval.c: remove ruby_current_node and change eval() prototype.
- fix to use rb_sourcefile/line() instead of ruby_sourcefile/line.
-
- * error.c, eval_error.ci, eval_load.c, eval_safe.ci, gc.c,
- include/ruby/intern.h, parse.y, process.c, ruby.c: ditto.
-
- * vm.c: fix spaces.
-
-Mon Jun 25 04:20:14 2007 Koichi Sasada <ko1@atdot.net>
-
- * eval_*.h: rename to eval_*.ci.
-
- * common.mk: ditto.
-
- * eval_error.ci: remove ruby_set_current_source().
-
- * error.c, eval.c, ruby.c: ditto.
-
- * eval_safe.c, proc.c: remove unused macros.
-
-Mon Jun 25 03:37:20 2007 Koichi Sasada <ko1@atdot.net>
-
- * insnhelper.ci (caller_setup_args): add need_block_check option.
-
- * insns.def: ditto.
-
- * yarvcore.h: add GetCoreDataFromValue().
-
-Mon Jun 25 02:14:30 2007 Koichi Sasada <ko1@atdot.net>
-
- * call_cfunc.ci: removed.
-
- * insnhelper.ci: added. this function includes all functions that
- vm insns need.
-
- * common.mk: ditto.
-
- * insnhelper.h, vm.h, vm.c: move some declaration.
-
- * gc.h: remove GC_CHECK() macro because GC.stress is more useful.
-
- * compile.c, iseq.c, vm_dump: ditto.
-
- * gc.h, thread.c: move a prototype declaration.
-
- * debug.c, debug.h: rename some functions.
-
- * compile.h: ditto.
-
-Mon Jun 25 00:45:02 2007 Koichi Sasada <ko1@atdot.net>
-
- * insns.def (invokesuper): fix error message.
-
-Mon Jun 25 00:14:13 2007 Koichi Sasada <ko1@atdot.net>
-
- * vm.c: some refactoring.
- * rename th_* to vm_*.
- * remove unused variables functions.
- * add prototypes.
-
- * blockinlining.c, compile.c, cont.c, eval.c, eval_intern.h,
- eval_jump.h, eval_load.c, inits.c, insns.def, iseq.c, parse.y,
- proc.c, process.c, signal.c, thread.c, vm.c, vm_dump.c,
- vm_evalbody.ci, yarvcore.c, yarvcore.h: ditto.
-
-Sun Jun 24 22:32:00 2007 Koichi Sasada <ko1@atdot.net>
-
- * eval_method.h (rb_add_method): fix to check 0.
-
-Sun Jun 24 22:00:17 2007 Koichi Sasada <ko1@atdot.net>
-
- * insn_send.ci: removed.
-
- * common.mk: ditto.
-
- * vm.c (vm_call_bmethod), isnsn.def: added. fix to use this
- function instead of using goto.
-
- * vm.c (vm_call_bmethod): renamed from th_invoke_bmethod().
-
- * vm.c (vm_method_missing): renamed from eval_method_missing().
-
- * vm_evalbody.ci: remove tmp_* variables.
-
- * insnhelper.h: add some macros.
-
- * insns.def: forbid zsuper from method defined by define_method().
-
- * test/ruby/test_super.rb: ditto.
-
-Sun Jun 24 20:01:08 2007 Koichi Sasada <ko1@atdot.net>
-
- * vm_macro.def: removed.
-
- * insn_send.ci: added. this file includes send instruction body.
-
- * common.mk: ditto.
-
- * insns.def: ditto.
-
- * tool/insns2vm.rb: ditto.
-
- * vm.c: ditto.
-
-Sun Jun 24 19:30:37 2007 Koichi Sasada <ko1@atdot.net>
-
- * insnhelper.h (RESTORE_REGS): add do/while(0) around macro.
-
- * vm.c, vm_macro.def: remove macro_eval_invoke_func() and
- add vm_setup_method(). use it instead.
-
-Sun Jun 24 19:02:33 2007 Koichi Sasada <ko1@atdot.net>
-
- * vm.c, vm_macro.def : remove macro_eval_invoke_cfunc() and
- add vm_call_cfunc().
-
-Sun Jun 24 17:54:13 2007 Koichi Sasada <ko1@atdot.net>
-
- * insns.def, vm.c: add/fix stack overflow check.
-
-Sun Jun 24 17:28:52 2007 Koichi Sasada <ko1@atdot.net>
-
- * insnhelper.h: change CHECK_STACK_OVERFLOW() to throw exception.
-
- * vm.c (caller_setup_arg), vm_macro.def: remove
- macro_eval_setup_send_arguments and add caller_setup_arg().
-
- * insns.def: ditto.
-
- * bootstraptest/test_method.rb: add splat arg tests.
-
-Sun Jun 24 16:35:46 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * proc.c (proc_to_s): used a variable before initialized.
-
-Sun Jun 24 16:05:45 2007 Koichi Sasada <ko1@atdot.net>
-
- * vm.c (callee_setup_arg): added. support correct post arg.
-
- * vm_macro.def (macro_eval_invoke_func): fix to use
- callee_setup_arg.
-
- * compile.c (set_arguments): adjust for above changes.
-
- * compile.c (iseq_compile_each): ditto.
-
- * iseq.c (ruby_iseq_disasm): ditto.
-
- * yarvcore.h: add rb_iseq_t#post_arg_start and arg_size.
-
- * bootstraptest/test_method.rb: add post arg tests.
-
-Sun Jun 24 16:10:43 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * proc.c (proc_to_s): suppress warning, and reduced duplicated code.
-
-Sun Jun 24 15:33:47 2007 Koichi Sasada <ko1@atdot.net>
-
- * bootstraptest/runner.rb: set default directory to
- '/tmp/bootstraptest.tmpwd' and add --dir option.
- fix to output driver and target information.
-
- * common.mk: fix to run btest on BASERUBY and
- add OPTS to pass option ("make btest OPTS=...").
-
-Sun Jun 24 03:05:00 2007 Tanaka Akira <akr@fsij.org>
-
- * enum.c (enum_minmax): fix SEGV by [].minmax.
-
-Sat Jun 23 17:18:19 2007 Tanaka Akira <akr@fsij.org>
-
- * re.c (match_inspect): MatchData#inspect implemented.
-
-Sat Jun 23 15:00:16 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enum.c (enum_minmax): new method to get the minimum and maximum
- values from the enumerable at once.
-
- * enum.c (enum_minmax_by): ditto.
-
-Sat Jun 23 01:25:40 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * hash.c (rb_hash_assoc): new method.
-
- * hash.c (rb_hash_rassoc): ditto.
-
- * hash.c (rb_hash_flatten): ditto.
-
-Fri Jun 22 23:55:59 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_upto): add optional argument to specify
- exclusiveness.
-
- * range.c (range_step): use String#upto with optional argument.
-
- * range.c (range_each): ditto.
-
-Fri Jun 22 19:55:51 2007 Tanaka Akira <akr@fsij.org>
-
- * proc.c (proc_to_s): revert the change from %p to %lx at YARV
- merge time.
-
-Fri Jun 22 19:33:49 2007 Tanaka Akira <akr@fsij.org>
-
- * proc.c (proc_to_s): show is_lambda.
-
-Thu Jun 21 20:36:12 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * hash.c (rb_hash_sort): remove hash specific implementation.
-
-Thu Jun 21 20:28:05 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * hash.c (rb_hash_select): returns new hash, not assoc array.
- [ruby-core:11504]
-
- * hash.c (env_select): ditto.
-
-Thu Jun 21 23:08:19 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (rb_intern2): ID_JUNK test based on len, not by NUL.
-
-Thu Jun 21 19:42:07 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * yarvcore.c (rb_thread_mark): mark also thrown_errinfo.
-
-Thu Jun 21 17:13:44 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (rb_intern2): name may not be NUL-terminated.
-
-Wed Jun 20 08:27:57 2007 Tanaka Akira <akr@fsij.org>
-
- * eval_error.h (error_print): show full stacktrace on
- non-SystemStackError.
-
-Wed Jun 20 04:45:39 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (rb_intern2): use rb_intern2 to intern without trailing
- equal sign.
-
- * parse.y (rb_intern2, ripper_id2sym): fixed indent.
-
-Tue Jun 19 10:55:05 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval_load.c (load_ext, rb_require_safe): pass VALUE instead of
- pointer. [ruby-Bugs-11659]
+ * hash.c: ditto.
Mon Jun 18 08:47:54 2007 Technorama Ltd. <oss-ruby@technorama.net>
@@ -40472,46 +3466,11 @@ Mon Jun 18 08:47:54 2007 Technorama Ltd. <oss-ruby@technorama.net>
* ext/openssl/ossl_rand.c
New method Random.status?
- * test/openssl/test_ec.rb
- New tests.
-
-Mon Jun 18 17:04:07 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval_load.c (rb_require_safe, ruby_init_ext): load with ruby level
- cfp. [ruby-core:10779]
-
- * eval_intern.h, vm.c (rb_vm_call_cfunc): new function to call a
- function with ruby level cfp.
-
-Mon Jun 18 16:57:24 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (yycompile): disable trace while creating ruby_debug_lines.
- [ruby-talk:253586]
-
- * thread.c (ruby_suppress_tracing): new function to call a function
- with suppressing trace.
-
- * lib/debug.rb, lib/tracer.rb: for YARV.
-
Mon Jun 18 13:54:36 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * eval.c (ruby_cleanup): return EXIT_FAILURE if any exceptions occurred
+ * eval.c (ruby_cleanup): return EXIT_FAILURE if any exceptions occured
in at_exit blocks. [ruby-core:11263]
-Mon Jun 18 02:49:16 2007 Koichi Sasada <ko1@atdot.net>
-
- * vm.c (env_mark): fix to mark block.proc.
-
- * vm.c (th_make_proc_from_block): set created proc to block->proc.
-
-Mon Jun 18 02:48:12 2007 Koichi Sasada <ko1@atdot.net>
-
- * vm_dump.c (vm_stack_dump_raw): hide VM stack trace.
-
-Mon Jun 18 02:43:53 2007 Koichi Sasada <ko1@atdot.net>
-
- * signal.c (sigsegv): clear gc_stress flag on SEGV.
-
Mon Jun 18 01:14:10 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* variable.c (rb_path2class): get rid of dangling pointer caused by
@@ -40523,170 +3482,31 @@ Mon Jun 18 01:14:10 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
rb_free_generic_ivar, rb_copy_generic_ivar,
rb_obj_instance_variables): suppress warnings.
-Sun Jun 17 11:11:07 2007 Tanaka Akira <akr@fsij.org>
-
- * eval.c (rb_method_missing): avoid a warning "too many arguments
- for format string" on "./ruby -ve 'def m() super end; m'".
-
-Sat Jun 16 22:24:17 2007 Tanaka Akira <akr@fsij.org>
-
- * gc.c (garbage_collect): re-introduce ruby_current_node marking code.
- [ruby-dev:31005]
-
-Sat Jun 16 21:37:43 2007 Tanaka Akira <akr@fsij.org>
-
- * gc.c (gc_sweep): re-introduce heap extension strategy change.
- [ruby-dev:31005]
-
-Fri Jun 15 22:59:37 2007 Tanaka Akira <akr@fsij.org>
-
- * .gdbinit: new file to ease debugging using gdb.
-
-Fri Jun 15 22:33:55 2007 Tanaka Akira <akr@fsij.org>
-
- * signal.c (default_handler): func argument removed.
- (trap_handler): support SYSTEM_DEFAULT. call default_handler
- internally.
- (sig_trap): don't call default_handler.
- [ruby-dev:30999]
-
Fri Jun 15 22:33:29 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* common.mk (realclean): separate local and ext.
* ext/extmk.rb: not remove unrelated directories.
-Fri Jun 15 20:50:02 2007 Tanaka Akira <akr@fsij.org>
-
- * keywords: enclose C code in declaration section by %{ and %} to
- avoid extra semicolon after #ifdef RIPPER.
- pointed by eban.
-
-Fri Jun 15 18:56:52 2007 Tanaka Akira <akr@fsij.org>
-
- * signal.c (trap_handler): trap("SIGSEGV", "DEFAULT") may cause wrong
- trap error because SIG_DFL may be zero.
-
-Fri Jun 15 15:55:55 2007 Koichi Sasada <ko1@atdot.net>
-
- * insns.def (setconstant, toregexp): fix to mark object correctly.
-
-Fri Jun 15 13:24:18 2007 Koichi Sasada <ko1@atdot.net>
-
- * hash.c: exchange semantics of Hash#each and Hash#each_pair.
- pointed out by [ruby-dev:30997].
-
- * test/ruby/test_iterator.rb: ditto.
-
- * test/ruby/test_yield.rb: ditto.
-
-Fri Jun 15 12:38:29 2007 Koichi Sasada <ko1@atdot.net>
-
- * test/ruby/test_iterator.rb: remove debug code (GC.stress=true).
-
-Fri Jun 15 12:25:33 2007 Koichi Sasada <ko1@atdot.net>
-
- * vm.c (th_yield_setup_args): |v| should work as |v,|.
- ex) def m;yield 1, 2; end; m{|v| p v} #=> 1
-
- * parse.y: apply above change for "for" statement.
-
- * test/ruby/test_assignment.rb: ditto
-
- * test/ruby/test_basicinstructions.rb: ditto.
-
- * test/ruby/test_iterator.rb: ditto.
-
- * test/ruby/test_yield.rb: ditto.
-
- * compile.c (iseq_compile_each): fix debug.
-
-Fri Jun 15 12:22:10 2007 Koichi Sasada <ko1@atdot.net>
+Fri Jun 15 17:01:20 2007 NAKAMURA Usaku <usa@ruby-lang.org>
- * eval.c (ruby_finalize_1): rb_thread_t#errinfo should be clear with
- Qnil.
-
-Fri Jun 15 12:20:11 2007 Koichi Sasada <ko1@atdot.net>
-
- * cont.c (rb_cont_call): forbid cross fiber continuation call.
-
- * test/ruby/test_fiber.rb: ditto.
-
-Fri Jun 15 12:14:07 2007 Koichi Sasada <ko1@atdot.net>
-
- * sample/test.rb: fix to show line information whether test succeeds.
-
-Thu Jun 14 17:16:05 2007 Tanaka Akira <akr@fsij.org>
-
- * eval_load.c (Init_load): delay allocating an array for rb_load_path
- to avoid GC problem in very early stage.
- (RUBY_GC_STRESS causes GC in such stage.)
-
- * variable.c (rb_gc_mark_global_tbl): rb_global_tbl may be 0 in
- very early stage.
-
- * thread.c (thread_cleanup_func) [IA64]: clear register stack position.
- (thread_start_func_2) [IA64]: record the beginning of register
- stack using extra argument.
- (rb_gc_save_machine_context) [IA64]: record the end of register
- stack.
-
- * gc.c [IA64] (SET_STACK_END): record the end of register stack.
- (garbage_collect) [IA64]: use recorded register stack area for
- GC marking.
- (yarv_machine_stack_mark) [IA64]: GC mark from the register stack
- area.
-
- * yarvcore.c [IA64] (rb_gc_register_stack_start): defined.
- (Init_VM): store th->self on stack to fix GC problem.
- (Init_yarv) [IA64]: initialize the beginning of register stack.
-
- * yarvcore.h (struct rb_thread_struct) [IA64]: new members for
- register stack area.
-
- * thread_pthread.ci (thread_start_func_1) [IA64]: call
- thread_start_func_2 with the end of register stack.
-
- * cont.c (struct rb_context_struct) [IA64]: new members for register
- stack area.
- (cont_mark) [IA64]: GC mark from register stack area.
- (cont_free) [IA64]: free saved register stack.
- (cont_save_machine_stack) [IA64]: record the position and contents
- of the register stack.
- (cont_capture): store cont->self on stack to fix GC problem.
- (cont_restore_1) [IA64]: restore the register stack.
- [IA64] (register_stack_extend): new function.
- (cont_restore_0) [IA64]: call register_stack_extend instead of
- cont_restore_1.
-
- [ruby-dev:30982]
+ * ext/dl/lib/dl/win32.rb: seems that dl doesn't accept void argument.
+ fixed [ruby-bugs:PR#5489].
Thu Jun 14 17:09:48 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser): handle more
extensions. [ruby-dev:30972]
-Thu Jun 14 14:40:42 2007 Tanaka Akira <akr@fsij.org>
-
- * lib/securerandom.rb: document updated.
- suggested by NaHi. [ruby-dev:30966]
-
-Wed Jun 13 22:42:06 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * gc.c (garbage_collect): update IA64 register stack code.
- [ruby-dev:30971]
-
Wed Jun 13 06:05:12 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (darwin): prohibit loading extension libraries to
miniruby.
-Tue Jun 12 21:50:51 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+Wed Jun 13 05:47:58 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * parse.y (call_args): no allow splat after assocs. takes
- consistency over compatibility.
-
- * parse.y (call_args2): ditto
+ * eval.c (rb_kill_thread): renamed in order to get rid of conflict
+ with a BeOS system function. [ruby-core:10830]
Tue Jun 12 14:53:51 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
@@ -40695,408 +3515,66 @@ Tue Jun 12 14:53:51 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (find_header): use header names in the message.
-Sun Jun 10 18:37:13 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/probeprofiler/probeprofiler.c: clean warnings.
-
-Sun Jun 10 18:32:24 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * missing/isinf.c, missing/dup2.c, missing/strtod.c, missing/x68.c,
- missing/alloca.c: use "ruby/config.h".
-
-Sun Jun 10 17:49:20 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * instruby.rb (install_recursive): should check parent directories of
- the destination. [ruby-dev:30947]
-
-Sun Jun 10 16:59:39 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (do_block, brace_block): fix line numbers. [ruby-dev:30831]
-
-Sun Jun 10 16:57:20 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * instruby.rb (install_recursive): add :glob option rather than
- using FNM_DOTMACH.
-
- * instruby.rb (ext-comm): make header directory first.
-
-Sun Jun 10 16:10:58 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * test/ruby/test_beginendblock.rb: typo.
-
-Sun Jun 10 16:07:10 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * instruby.rb (install_recursive): skip .svn directories.
-
-Sun Jun 10 15:44:43 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/Makefile.sub (config.status): rubyhdrdir was missing.
-
-Sun Jun 10 15:26:36 2007 Tanaka Akira <akr@fsij.org>
-
- * Makefile.in: use --output-file for gperf to not leave lex.c.tmp.
-
-Sun Jun 10 15:11:07 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * Makefile.in, win32/Makefile.sub (XCFLAGS): -I. is needed for *.inc.
-
- * ext/extmk.rb: prepend also topdir to mflags at last.
-
Sun Jun 10 13:47:36 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* test/ruby/test_beginendblock.rb (test_should_propagate_signaled):
get rid of invoking shell. [ruby-dev:30942]
-Sun Jun 10 12:56:46 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby: moved public headers.
-
- * instruby.rb (install_recursive): skip backup files.
-
- * instruby.rb (ext-comm): install only current platform headers.
-
-Sun Jun 10 10:42:04 2007 Tanaka Akira <akr@fsij.org>
-
- * lib/securerandom.rb: renamed from lib/secrand.rb.
- suggested by NaHi. [ruby-dev:30934]
-
-Sat Jun 9 06:40:05 2007 Tanaka Akira <akr@fsij.org>
-
- * lib/secrand.rb: rename SecRand() to SecRand.random_number.
- suggested by NaHi. [ruby-dev:30934]
-
-Fri Jun 8 16:34:20 2007 Tanaka Akira <akr@fsij.org>
-
- * ext/zlib/zlib.c (gzfile_s_open): use FilePathValue to support
- to_path.
-
-Fri Jun 8 16:11:00 2007 Koichi Sasada <ko1@atdot.net>
-
- * eval_jump.h: th->errinfo should clear with nil.
-
-Fri Jun 8 14:53:28 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (call_args): allow splat argument after unpacked
- assocs like 1.8 does.
-
- * parse.y (call_args): ditto.
-
-Fri Jun 8 14:26:18 2007 Tanaka Akira <akr@fsij.org>
-
- * lib/secrand.rb: new file for secure random interface.
-
- * lib/cgi/session.rb: use secrand for generating cookies.
-
-Fri Jun 8 12:44:37 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * {win32,wince}/Makefile.sub: add lex.c rule.
-
-Fri Jun 8 11:54:18 2007 Tanaka Akira <akr@fsij.org>
-
- * lex.c.blt: moved from lex.c.
-
- * Makefile.in: use lex.c.blt if gperf is not available.
- [ruby-list:8212], [ruby-list:8214], [ruby-list:24667],
- [ruby-talk:120857], [ruby-dev:28102]
-
-Thu Jun 7 21:38:39 2007 Koichi Sasada <ko1@atdot.net>
-
- * thread.c (rb_thread_execute_interrupts): invoke ensure when
- main thread exits.
-
Thu Jun 7 19:02:48 2007 Tanaka Akira <akr@fsij.org>
* lib/pp.rb: call original "method" method instead of redefined one.
-Thu Jun 7 17:20:57 2007 Koichi Sasada <ko1@atdot.net>
-
- * iseq.c (prepare_iseq_build): freeze filename and name string.
-
- * variable.c: freeze class name string.
-
-Thu Jun 7 12:48:33 2007 Koichi Sasada <ko1@atdot.net>
-
- * cont.c (cont_restore_1): fix to check root fiber [ruby-dev:30911].
-
- * test/ruby/test_fiber.rb: add a test.
-
-Thu Jun 7 07:24:36 2007 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/json/common.rb: Ponder offering parse! method.
-
- * lib/json/editor.rb: be a bit more robust while loading data.
-
- * ext/json/ext/{generator,parser}/extconf.rb:
- add a have_header directive for st.h
-
- * test/json: fix some tests.
-
-Thu Jun 7 03:29:18 2007 Koichi Sasada <ko1@atdot.net>
-
- * test_fiber.rb: add a test (Continuation and Fiber).
-
-Thu Jun 7 03:17:24 2007 Koichi Sasada <ko1@atdot.net>
-
- * cont.c (cont_new): add debug message.
-
- * cont.c (cont_restore_1): copy stack information from fiber.
-
- * cont.c (rb_fiber_s_new): fix to mark created fiber.
-
- * test/ruby/test_fiber.rb: add some tests around Thread and Fiber.
-
- * yarvcore.c (thread_free): fix to skip freeing stack if root fiber
- is available.
-
-Thu Jun 7 01:03:20 2007 Koichi Sasada <ko1@atdot.net>
-
- * eval_intern.h, eval.c (ruby_init): remove POP_TAG_INIT().
-
- * cont.c (rb_fiber_start): remove zero-clearing tag.
-
-Wed Jun 6 20:23:46 2007 Koichi Sasada <ko1@atdot.net>
-
- * insns.def (invokeblock): fix of splat argument.
- (splat same as normal method dispatch)
-
-Wed Jun 6 16:27:25 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * insns.def: fixed indentation.
-
-Wed Jun 6 10:58:23 2007 Koichi Sasada <ko1@atdot.net>
-
- * eval.c (rb_yield): fix to check Qundef.
-
-Wed Jun 6 10:57:45 2007 Koichi Sasada <ko1@atdot.net>
-
- * test/ruby/test_continuation.rb: add a test for last commit.
-
-Wed Jun 6 10:55:42 2007 Koichi Sasada <ko1@atdot.net>
-
- * cont.c (rb_cont_call): forbid calling dead fiber with
- Continuation#call.
-
-Wed Jun 6 10:50:01 2007 Koichi Sasada <ko1@atdot.net>
-
- * compile.c (iseq_compile_each): fix around yield arguments
- (with NODE_ARGSCAT).
-
-Wed Jun 6 02:50:53 2007 Koichi Sasada <ko1@atdot.net>
-
- * cont.c (rb_fiber_start): clear th->tag and check error to fix
- [ruby-dev:30888] and [ruby-dev:30889].
-
- * eval_intern.h: fix rb_fiber_start() prototype.
-
- * test/ruby/test_fiber.rb: add tests for above.
-
-Wed Jun 6 02:40:20 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * insnhelper.h, insns.def (DEC_SP): shouldn't use unary minus operator
- in pointer operation. some compilers (such as VC++8 x64) cannot deal
- it with expected way.
-
-Wed Jun 6 02:19:48 2007 Koichi Sasada <ko1@atdot.net>
-
- * parse.y (new_yield), compile.c (iseq_compile_each): fix
- passing parameter.
+Mon Jun 4 11:11:12 2007 Shugo Maeda <shugo@ruby-lang.org>
- * eval.c, eval_jump.h: simplify rb_yield*.
-
- * proc.c (proc_mark): fix to mark proc->block.proc.
-
- * proc.c (Init_Proc): add Proc#lambda?
-
- * test/ruby/test_lambda.rb: add some tests.
-
- * vm.c (invoke_block): fix to check lambda block or not.
-
- * vm.c (th_yield_setup_args): fix to check arguments size
- when lambda block.
-
-Tue Jun 5 16:30:38 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_f_p): returns arguments to intervene. [ruby-dev:29736]
-
-Tue Jun 5 14:07:55 2007 Koichi Sasada <ko1@atdot.net>
-
- * insns.def (invokeblock): check block is created by lambda
- or Proc.new.
-
- * vm.c (block_proc_is_lambda): added.
-
-Tue Jun 5 14:47:52 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/pp.rb (PP::PPMethods::seplist): revert last change to work
- around wrapper bug. [ruby-dev:30840]
-
-Tue Jun 5 14:11:15 2007 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/nkf/nkf-utf8/nkf.c (kanji_convert): Fix guess fallback.
-
-Tue Jun 5 13:32:04 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
- pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
- thread_pthread.ci, thread_win32.ci: fixed indentation.
-
- * call_cfunc.ci: protoized.
-
- * thread_win32.ci: fixed typo.
-
-Tue Jun 5 13:17:11 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * call_cfunc.ci, compile.c, dir.c, eval.c, eval_jump.h, numeric.c,
- pack.c, re.c, thread.c, thread_win32.ci, vm.c, vm_dump.c: fixed
- indentation.
-
-Mon Jun 4 21:15:45 2007 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/json.rb, lib/json, ext/json, test/json:
- import JSON library.
-
- * ext/nkf: import nkf.c rev:1.124
- Support CP10001.
-
-Mon Jun 4 20:52:58 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * numeric.c (int_round): should not just truncate.
-
-Sat Jun 2 16:48:55 2007 Koichi Sasada <ko1@atdot.net>
-
- * cont.c (Fiber#pass): rename to Fiber#yield. Block parameter
- of fiber body receive first yield values.
- e.g.: Fiber.new{|x| p x}.yield(:ok) #=> :ok
-
- * cont.c: rename rb_context_t#retval to rb_context_t#value.
-
- * test/ruby/test_fiber.rb: ditto.
-
-Sat Jun 2 16:45:21 2007 Koichi Sasada <ko1@atdot.net>
-
- * proc.c (Init_Proc): remove a line break.
-
-Sat Jun 2 01:27:27 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * numeric.c (int_round): small optimization to handle bignums.
-
-Fri Jun 1 13:02:35 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * insnhelper.h (INC_SP): shouldn't cast ``x'' to unsigned type because
- it might be a negative value.
-
- * insnhelper.h, insns.def: shouldn't use unary minus operator in index
- operator. some compilers (such as VC++8 x64) cannot deal it with
- expected way.
-
-Fri Jun 1 11:33:40 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * numeric.c (num_round): should convert self to Float.
- [ruby-dev:30860]
-
-Fri Jun 1 02:01:13 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * numeric.c (flo_round): now takes optional argument to specify
- number of digits, like round() in Python/PHP.
-
- * numeric.c (num_round): ditto.
-
-Fri Jun 1 01:58:33 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * lib/net/imap.rb (ResponseParser#next_token): fixed
+ error message. (backported from HEAD)
- * enum.c (each_with_index_i): should work well with continuation.
- a patch from sheepman <sheepman AT sheepman.sakura.ne.jp>.
- [ruby-dev:30846]
+ * lib/net/imap.rb (ResponseParser#parse_error): fixed
+ the condition not to refer @token.symbol unexpectedly.
+ Thanks, Dick Monahan. (backported from HEAD)
Thu May 31 17:27:53 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/benchmark.rb (Benchmark::Job::item): avoid modifying the
argument unintentionally. [ruby-talk:253676]
-Wed May 30 14:43:00 2007 Koichi Sasada <ko1@atdot.net>
+Thu May 31 02:12:32 2007 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
- * cont.c (cont_capture): store all local variables in heap
- ([ruby-dev:30832]).
+ * lib/rinda/tuplespace.rb (Rinda::TupleBag): create index on tuple bag
+ by first column.
- * vm.c (th_stack_to_heap): added.
+Wed May 30 13:27:40 2007 Shugo Maeda <shugo@ruby-lang.org>
- * test/ruby/test_continuation.rb: add a test for above.
-
- * eval_intern.h (th_get_ruby_level_cfp): fix to clean code.
-
-Wed May 30 13:32:34 2007 Shugo Maeda <shugo@ruby-lang.org>
+ * lib/net/ftp.rb (Net::FTP#transfercmd): skip 2XX
+ responses for some FTP servers. (backported from HEAD)
- * lib/net/imap.rb (ResponseParser#next_token): fixed
- error message.
+Wed May 30 05:17:55 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/net/imap.rb (ResponseParser#parse_error): fixed
- the condition not to refer to @token.symbol unexpectedly.
- Thanks, Dick Monahan.
+ * eval.c (rb_eval): get rid of SEGV at ZSUPER in a block
+ [ruby-dev:30836]
-Wed May 30 13:24:33 2007 Shugo Maeda <shugo@ruby-lang.org>
+Wed May 30 04:29:43 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/net/ftp.rb (Net::FTP#transfercmd): skip 2XX
- responses for some FTP servers.
+ * eval.c (thread_timer): timer thread should not receive any
+ signals. submitted by Sylvain Joyeux. [ruby-core:08546]
Wed May 30 04:18:37 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (rb_eval_cmd): just return if no exceptions.
[ruby-dev:30820]
-Wed May 30 02:14:25 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * signal.c (interrupt_init): needs to pass nil for Interrupt.
- [ruby-core:11038]
-
- * signal.c (trap): fixed segfaults. [ruby-dev:30830]
-
-Wed May 30 00:50:48 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * gc.c (rb_source_filename, obj_free): suppress warnings.
-
- * gc.c (garbage_collect, yarv_machine_stack_mark): fixed typo.
- http://bugs.debian.org/426267
+Tue May 29 11:01:06 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed May 30 00:24:09 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (open_args, arg_ambiguous, parser_warning): should not use
- rb_warning in the parser.
-
-Tue May 29 12:31:33 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/win32.c (rb_w32_opendir): removed duplicated code.
-
-Tue May 29 10:55:24 2007 Koichi Sasada <ko1@atdot.net>
-
- * cont.c: fix bug around Continuation and Fiber.
-
- * test/ruby/test_continuation.rb: add tests for Continuation.
-
-Tue May 29 10:54:34 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * win32/win32.c (rb_w32_opendir): store attributes of the second
+ entries or later too.
* win32/win32.c (rb_w32_opendir, rb_w32_readdir): eliminate magic
numbers.
-Mon May 28 10:27:14 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * cont.c: fixed a function name.
-
-Mon May 28 03:56:44 2007 Koichi Sasada <ko1@atdot.net>
-
- * cont.c: support Fiber. Check test/ruby/test_fiber.rb for detail.
- Fiber is known as "Micro Thread", "Coroutine", and other terms.
- At this time, only Fiber#pass is supported to change context.
- I want to know more suitable method name/API for Fiber (... do you
- know more suitable class name instead of Fiber?) as "suspend/resume",
- "call", "yield", "start/kick/stop/restart", ....
-
- * eval.c, eval_intern.h, thread.c, yarvcore.c, yarvcore.h: ditto.
+Mon May 28 02:54:05 2007 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-Sat May 26 00:38:21 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (ruby_exec_internal): do nothing if no code.
-
- * compile.c (rb_iseq_compile): check node if NULL before check
- nd_type. [ruby-talk:252956]
+ * lib/rinda/tuplespace.rb (Rinda::TupleBag#delete): use rindex and
+ delete_at instead of delete for little improvement.
Sat May 26 00:05:22 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
@@ -41104,54 +3582,6 @@ Sat May 26 00:05:22 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
skip tests for exitstatus and termsig on the platforms where
signals not supported.
-Fri May 25 16:04:47 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * yarvcore.c (Init_VM): wrap already initialized structs to use
- it directly.
-
-Fri May 25 11:09:47 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * regint.h (include): on some platform, defines.h redefines
- SIZE_OF_LONG_LONG so shouldn't re-include config.h after included
- defines.h.
-
- * regint.h (vsnprintf): ruby on windows already have vsnprintf macro.
-
-Thu May 24 12:07:27 2007 Koichi Sasada <ko1@atdot.net>
-
- * cont.c: check across trap violation.
-
- * eval.c, yarvcore.h: ditto.
-
-Thu May 24 11:46:55 2007 Koichi Sasada <ko1@atdot.net>
-
- * gc.c, yarvcore.c: fix to mark VM structure on startup.
-
- * yarvcore.h: disable USE_CACHED_VALUE.
-
-Thu May 24 01:54:53 2007 Koichi Sasada <ko1@atdot.net>
-
- * cont.c: support callcc which everyone love.
- incomplete. please give me bug reports.
-
- * common.mk, inits.c, thread.c: ditto.
-
- * yarvcore.c: export thread_mark().
-
- * yarvcore.h: disable value cache option.
-
- * eval_intern.h: set th_get_ruby_level_cfp to inline.
-
-Wed May 23 15:39:02 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * common.mk: add a rule for regsyntax.c.
-
-Wed May 23 10:31:53 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * oniguruma.h: updated to Oniguruma 5.7.0.
-
- * regsyntax.c, unicode.c: new files along with Oniguruma 5.x.
-
Wed May 23 06:51:46 2007 URABE Shyouhei <shyouhei@ruby-lang.org>
* lib/cgi.rb (CGI#[]): get rid of exceptions being raised.
@@ -41163,148 +3593,50 @@ Wed May 23 05:49:49 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
load path to get rid of load pre-installed extensions/libraries.
[ruby-core:11017]
-Tue May 22 16:37:36 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ruby.c (set_arg0): support RSTRING_LEN on HP-UX. a patch from
- WATANABE Tetsuya <Tetsuya.WATANABE AT nifty.com>. [ruby-dev:30806]
-
-Mon May 21 13:40:00 2007 Koichi Sasada <ko1@atdot.net>
-
- * compile.c, vm_macro.def: support tail call optimization
- (on default, this feature is not enabled).
-
- * iseq.c, compile.c, vm_opts.h: add "tailcall_optimization"
- option.
-
- * sample/test.rb (test_ok): fix to adjust tailcall stack layout.
-
- * insns.def, vm.c, compile.c, yarvcore.c, yarvcore.h:
- add opt_gt, opt_le instructions.
-
-Mon May 21 03:34:06 2007 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/smtp.rb: CRAM-MD5 authentication did not work.
- [ruby-dev:30770]
-
-Sat May 19 10:26:01 2007 Tadayoshi Funaba <tadf@dotrb.org>
+Sat May 19 10:29:18 2007 Tadayoshi Funaba <tadf@dotrb.org>
* lib/date/format.rb (Date._parse): detects some OFX dates
(Of course not fully).
-Sat May 19 03:08:05 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * enum.c (enum_inject): minor improvement. [ruby-dev:30792]
-
- * enum.c (one_i): no needs to iterate once the result became false.
-
- * enum.c (enum_one): fix for an example.
-
- * enum.c (one_iter_i, none_iter_i): DRY.;
-
-Sat May 19 01:07:42 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+Fri May 18 23:07:33 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
- * enum.c (enum_inject): it is now can work without block. you
- have to specify two argument method name as the first argument.
+ * array.c (rb_ary_first): call rb_ary_subseq() instead of pushing
+ values by itself. [ruby-talk:252062]
- * enum.c (Init_Enumerable): reduce is new alias to inject.
+ * array.c (rb_ary_first): add negative length check.
-Sat May 19 01:05:33 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri May 18 17:10:31 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * file.c (Init_File): method definition mismatch.
+ * win32/win32.c (move_to_next_entry): loc also must move forward.
+ [ruby-talk:251987]
-Fri May 18 16:44:04 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+Fri May 18 03:02:40 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * file.c (Init_File): add to_path method to File objects.
-
-Fri May 18 11:12:39 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * win32/mkexports.rb: preserve prefixed underscores for WINAPI
+ symbols.
- * ruby.c (DllMain, ruby_init_loadpath): use DLL instance handle given
- to DllMain instead of VirtualQuery so that loadpath becomes relative
- from the DLL on WinCE too.
+ * wince/mkconfig_wce.rb, wince/mkexports.rb: obsolete.
Thu May 17 17:03:11 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* misc/ruby-style.el (ruby-style-label-indent): for yacc rules.
-Thu May 17 13:30:27 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (f_arg): remove typo from ripper description.
-
-Thu May 17 13:23:38 2007 Koichi Sasada <ko1@atdot.net>
-
- * parse.y, compile.c (set_arguments): fix to support in-paren
- parameter (ex: def foo((a, b))).
-
-Thu May 17 13:01:52 2007 Koichi Sasada <ko1@atdot.net>
-
- * iseq.c (ruby_iseq_disasm): fix to show post arg info.
-
-Thu May 17 12:56:52 2007 Koichi Sasada <ko1@atdot.net>
-
- * debug.c (ruby_debug_node): fix to show node line.
-
-Wed May 16 21:48:44 2007 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/logger.rb (Logger::Application): remove meaningless logdev
- attribute and added logger attribute instead. [ruby-core:11143]
- also added Logger#formatter rdoc comment.
-
-Tue May 15 16:40:07 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/ruby/test_beginendblock.rb (test_endblockwarn): now parser
- warnings emit source names and line numbers.
-
-Tue May 15 15:01:38 2007 NAKAMURA Usaku <usa@ruby-lang.org>
+Tue May 15 14:54:07 2007 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/win32.c (init_stdhandle): stderr should be without buffering,
but mswin32 use buffering when stderr is not connected to tty.
-Mon May 14 02:12:07 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_zip): a.zip(b,c) should return an array, not
- enumerator.
-
- * array.c (rb_ary_zip): a.zip(b,c) should return array with size
- truncated to the size of its shortest argument array.
- [incompatible]
+Mon May 14 13:28:03 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Mon May 14 01:54:15 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * ext/thread/thread.c (wait_list): supress a warning.
- * array.c (rb_ary_choice): should return nil when the array is
- empty.
-
-Sat May 12 18:26:36 2007 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/http.rb (tokens): forgot to add strip. [ruby-core:11120]
-
- * test/net/http/test_http.rb: test Net::HTTP.post_form.
-
-Fri May 11 15:27:09 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * iseq.c (iseq_data_to_ary): internal IDs must not be exposed.
- [ruby-core:11073]
-
- * parse.y (internal_id_gen): now returns scope local ID instead of
- global one.
-
-Thu May 10 15:15:53 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * test/ruby/test_super.rb: add tests.
-
-Thu May 10 15:14:05 2007 NAKAMURA Usaku <usa@ruby-lang.org>
+Thu May 10 15:21:51 2007 NAKAMURA Usaku <usa@ruby-lang.org>
* ext/iconv/iconv.c (iconv_s_conv): rdoc fix.
-Thu May 10 15:09:23 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (POINTER_P): pointer may be larger than long.
-
- * parse.y (vtable_size, vtable_included, vtable_tblcpy,
- vtable_to_tbl): constified.
+Thu May 10 10:14:14 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Thu May 10 10:13:14 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread.c (rb_thread_priority): rdoc fix; the initial value is
+ * eval.c (rb_thread_priority): rdoc fix; the initial value is
inherited from the creating thread. [ruby-core:10607]
Wed May 9 12:28:57 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
@@ -41312,163 +3644,49 @@ Wed May 9 12:28:57 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* bignum.c (Init_Bignum), numeric.c (Init_Numeric): added fdiv as
aliases of quo. [ruby-dev:30771]
-Tue May 8 23:39:09 2007 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date/format.rb (Date._parse): revised treatment of
- hyphened/separatorless dates.
-
- * lib/date/format.rb: some trivial adjustments.
-
-Tue May 8 20:23:07 2007 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date/format.rb: reverted.
-
-Tue May 8 19:32:18 2007 Keiju Ishitsuka <keiju@ruby-lang.org>
-
- * lib/rational.rb: fix high-precision Rationals cannot be
- converted to Floats. [ruby-Bugs:10502], [ruby-core:11069],
- [ruby-dev:30743]
-
-Mon May 7 10:59:55 2007 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/image.rb, test/rss/test_image.rb: fixed Image module
- namespace URI. reported by Dmitry Borodaenko. Thanks.
-
-Sun May 6 18:44:11 2007 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/http.rb (Net::HTTP.post_form): allow an Array of String
- for pairs argument. [ruby-Bugs:10340]
-
- * lib/net/http.rb (Net::HTTP#set_form_data): ditto.
-
-Sun May 6 17:54:36 2007 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/http.rb: Connection header field might include both of
- "keep-alive" token and "close" token. [ruby-core:10818]
-
-Sat May 5 16:26:33 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/date/format.rb (Format::Bag#method_missing): get rid of
- modifying original argument. [ruby-core:11090]
-
-Thu May 3 22:20:08 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in, defines.h, eval_load.c (rb_feature_p, rb_provided,
- search_required, rb_require_safe), ext/extmk.rb: Fix
- a bug where a statically linked extension cannot be autoloaded.
- [ruby-dev:30023] / [ruby-dev:30239]
-
- * thread.c: added an internal class, Barrier.
-
- * thread.c: copied rdocs from fastthread.
-
- * yarvcore.h (struct rb_vm_struct): moved loading_table from global.
-
-Thu May 3 18:10:12 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm_evalbody.ci, insns.def, vm.c, tool/insns2vm.rb (rb_num_t):
- renamed to get rid of name clash. [ruby-dev:30504]
-
- * yarvcore.c (ruby_thread_init): ditto.
-
-Wed May 2 18:52:58 2007 Koichi Sasada <ko1@atdot.net>
-
- * vm.c, yarvcore.h, yarvcore.c, insns.def: fix to mark VM stack
- in correct range.
-
-Wed May 2 17:13:26 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed May 9 11:55:15 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* bignum.c (rb_big_quo): now calculate in integer. [ruby-dev:30753]
-Wed May 2 15:14:56 2007 Koichi Sasada <ko1@atdot.net>
-
- * eval_method.h: add redefine checks ([ruby-dev:30751]).
-
-Wed May 2 11:22:52 2007 Koichi Sasada <ko1@atdot.net>
-
- * compile.c: use Qtrue instead of 2.
+Wed May 9 11:51:06 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vm.c, insns.def: support "lambda" calling convention.
-
-Wed May 2 06:46:43 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * error.c, parse.y, ruby.h (rb_compile_warn, rb_compile_warning): warn
- for compilation. the parser should no longer use rb_warn() and
- rb_warning(). [ruby-dev:30121]
-
-Wed May 2 05:45:21 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (assoc): result of assoc_new needs to be an assoc.
+ * bignum.c (rb_big_pow): reduce multiplying for even number.
-Wed May 2 05:40:43 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * bignum.c (rb_big_pow): truncate all zero BDIGITs. [ruby-dev:30733]
* bignum.c (rb_big_pow): improvement by calculating from MSB and using
factorization. <http://yowaken.dip.jp/tdiary/20070426.html#p01>
-Tue May 1 18:45:45 2007 Koichi Sasada <ko1@atdot.net>
-
- * sample/test.rb: import matzruby's sample/test.rb.
-
-Tue May 1 17:46:05 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_choice): a new method to choose an element
- randomly from an array.
-
- * array.c (rb_ary_choice): fixed mistake from RDoc.
-
-Tue May 1 13:59:18 2007 Koichi Sasada <ko1@atdot.net>
-
- * proc.c (proc_arity): fix an arity bug ([ruby-core:11060]).
-
-Tue May 1 13:12:49 2007 Koichi Sasada <ko1@atdot.net>
-
- * yarvcore.h, compile.c (set_arguments): support post arguments.
-
- * test/ruby/test_method.rb: add tests for above.
-
- * test/ruby/test_proc.rb: ditto.
-
- * proc.c: fix an arity bug ([ruby-core:11029]).
-
- * vm.c, vm.h, insns.def, vm_dump.h: fix bmethod process.
-
- * vm.c: support block argument on block parameter.
-
-Fri Apr 27 17:05:41 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * numeric.c (int_pow): bugfix of overflow detection.
-
- * numeric.c (int_pow): rb_big_pow() may return other than Bignum.
-
-Fri Apr 27 01:51:50 2007 Koichi Sasada <ko1@atdot.net>
-
- * compile.c: support multiple splat (e.g, [a, *b, *c, e, *f]).
+ * numeric.c (int_pow): calculate power in Fixnum as possible.
+ [ruby-dev:30726]
-Fri Apr 27 00:03:48 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue May 8 23:42:51 2007 Tadayoshi Funaba <tadf@dotrb.org>
- * bignum.c (rb_big_pow): truncate all zero BDIGITs. [ruby-dev:30733]
+ * lib/date/format.rb (Date._parse): revised treatment of
+ hyphened/separatorless dates.
-Thu Apr 26 17:31:00 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/date/format.rb: some trivial adjustments.
- * bignum.c (rb_big_pow): reduce multiplying for even number.
+Tue May 8 20:25:05 2007 Tadayoshi Funaba <tadf@dotrb.org>
- * numeric.c (int_pow): calculate power in Fixnum as possible.
- [ruby-dev:30726]
+ * lib/date/format.rb: reverted.
-Thu Apr 26 17:18:51 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat May 5 16:26:33 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * parse.y: fixes for ripper.
+ * lib/date/format.rb (Format::Bag#method_missing): get rid of
+ modifying orginal argument. [ruby-core:11090]
- * parse.y (primary): reduced duplicated code.
+Mon Apr 30 01:17:51 2007 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
- * parse.y (f_arg_item): should not override by meaningless value.
+ * lib/rinda/tuplespace.rb (TupleSpace#create_entry, TupleBag#push,
+ delete): extract method, and rename parameter.
- * parse.y (f_arg, assocs): should not use $$ before assigned.
+Fri Apr 27 02:00:17 2007 Ryan Davis <ryand-ruby@zenspider.com>
- * parse.y (assoc_list): dispatch assoclist_from_args for assocs as
- well as args.
+ * signal.c: Fixed backwards compatibility for 'raise Interrupt'.
- * parse.y (assoc): return assoc if dispatched result is $1.
+ * lib/yaml/tag.rb: Running rdoc over the 1.8.6 tree skips
+ Module. Patch from James Britt
Thu Apr 26 13:54:51 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
@@ -41479,49 +3697,6 @@ Wed Apr 25 19:49:16 2007 Tanaka Akira <akr@fsij.org>
* ext/socket/socket.c (unix_send_io, unix_recv_io): use CMSG_DATA to
align file descriptor appropriately.
-Wed Apr 25 15:23:29 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (NtInitialize, exit_handler): add initializing and
- cleanup of critical section object for select.
-
- * win32/win32.c (do_select): block reentrance.
-
- * win32/win32.c (rb_w32_select): 0 sec polling of socket. this is
- workaround because winsock cannot do select at same socket at the
- same time by two or more threads.
-
-Wed Apr 25 14:10:47 2007 Koichi Sasada <ko1@atdot.net>
-
- * ext/probeprofiler/probeprofiler.c: fix function name and
- return value.
-
-Wed Apr 25 12:42:40 2007 Koichi Sasada <ko1@atdot.net>
-
- * yarvcore.h: remove rb_control_frame_t#callee_id.
-
- * vm_macro.def: ditto.
-
- * eval_intern.h (exec_event_hooks): fix to check event flags
-
- * eval_intern.h (EXEC_EVENT_HOOK): fix to re-check event flags.
-
- * ext/probeprofiler : added. this profiler is sampling based
- profiler.
-
- * vm.c: add rb_thread_current_status() API for probeprofiler.
-
- * thread.c (rb_thread_execute_interrupts): add comments.
-
-Wed Apr 25 10:36:03 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval_intern.h (PUSH_TAG): no argument now.
-
- * eval.c, eval_error.h, eval_jump.h, eval_load.c, proc.c, thread.c:
- ditto.
-
- * thread.c (alloc_event_hook, rb_thread_remove_event_hook): should
- return value.
-
Tue Apr 24 09:33:57 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* dir.c (do_stat, do_lstat, do_opendir): should not warn ENOTDIR.
@@ -41549,89 +3724,19 @@ Fri Apr 20 12:27:04 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/optparse.rb: fix to override conv proc.
-Fri Apr 20 12:21:28 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (ruby_cleanup): fixed access to out of bound, and inverted
- the order of errinfos.
-
-Fri Apr 20 10:33:23 2007 Koichi Sasada <ko1@atdot.net>
-
- * eval_intern.h: add prototypes of rb_sourceline() and
- rb_sourcefile().
-
-Fri Apr 20 02:37:48 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (ruby_cleanup): re-send signal. [ruby-dev:30516]
-
- * eval_error.h (error_handle): no message when exiting by signal.
+Fri Apr 20 12:17:05 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * intern.h (rb_thread_signal_raise, ruby_default_signal): prototypes.
+ * eval.c (ruby_cleanup): inversed the order of errinfos.
- * signal.c (esignal_init): takes a signal number and an optional
- signal name.
+Thu Apr 19 14:53:32 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * signal.c (interrupt_init): pass SIGINT always.
-
- * signal.c (ruby_default_signal): invoke system default signal
- handler.
-
- * signal.c (rb_f_kill): use NUM2PIDT instead of NUM2INT.
-
- * signal.c (rb_signal_exec, trap): handle SIGTERM. [ruby-dev:30505]
-
- * thread.c (rb_thread_signal_raise): now takes signal number instead
- of signal name.
-
- * thread.c (rb_thread_signal_exit): since rb_make_exception() calls
- #exception method, rb_class_new_instance() is not needed here.
-
- * yarvcore.h (struct rb_vm_struct), eval_jump.h (terminate_process):
- exit_code is no longer stored in VM.
-
-Thu Apr 19 18:37:49 2007 Koichi Sasada <ko1@atdot.net>
-
- * eval.c, node.h, thread.c, yarvcore.[ch], eval_intern.h:
- support set_trace_func (incomplete. id and klass
- don't be passed). And support Thread#set_trace_func
- which hook only specified thread and Thread#add_trace_func
- which add new trace func instead of replace old one.
- C level API was modified. See thread.c (logic) and
- yarvcore.h (data structures).
-
- * vm.c, vm_macro.def: add hook points.
-
- * compile.c, insns.def: fix "trace" instruction.
-
- * iseq.c, vm_macro.h: add compile option "trace_instruction".
-
- * test/ruby/test_settracefunc.rb: hook "c-return" of set_trace_func.
-
-Thu Apr 19 20:57:50 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (symbol): symbols should be followed by EXPR_ENDARG.
-
- * parse.y (dsym): ditto.
-
- * parse.y (parser_yylex): strings should be followed by
- EXPR_ENDARG.
-
- * parse.y (parser_yylex): ditto for numbers.
-
- * parse.y (parser_yylex): EXPR_ENDARG after ']' and '}'.
-
-Thu Apr 19 17:46:36 2007 Koichi Sasada <ko1@atdot.net>
-
- * lib/optparse.rb: fix to override conv proc.
+ * lib/monitor.rb (ConditionVariable#wait, mon_enter, mon_exit_for_cond):
+ ensures Thread.critical to be false. [ruby-talk:248300]
Wed Apr 18 10:41:21 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* util.c (ruby_strtod): exponent is radix 10. [ruby-talk:248272]
-Wed Apr 18 02:50:50 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * yarvcore.c (th_init2): push initial blockptr value for
- rb_block_given_p() outside ruby_exec(). [ruby-core:10923]
-
Wed Apr 18 02:30:24 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (LDFLAGS): prepend -L. instead appending it to
@@ -41640,6 +3745,14 @@ Wed Apr 18 02:30:24 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (Makefile): remove $U for automake from MISSING.
[ruby-talk:248171]
+Tue Apr 17 16:46:46 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c (rb_yield_0): should not clear state on TAG_NEXT when
+ it's invoked from within lambda body. [ruby-talk:248136]
+
+ * eval.c (proc_invoke): handle TAG_NEXT which would be caused by
+ next in the lambda body as well.
+
Mon Apr 16 22:56:01 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* ext/pty/expect_sample.rb: avoid symbolic link representation for
@@ -41667,124 +3780,23 @@ Mon Apr 16 16:34:08 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* parse.y (parser_yylex): should set command_start after block
starting "do"s and braces. [ruby-core:10916]
-Mon Apr 16 10:51:37 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enum.c (enum_each_with_index): each_with_index to forward
- arguments to each. [ruby-core:10921]
-
-Mon Apr 16 10:43:10 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * time.c (time_arg): should allow to specify 24:00.
- [ruby-core:10915]
-
-Sun Apr 15 09:12:54 2007 Tadayoshi Funaba <tadf@dotrb.org>
+Sun Apr 15 09:19:57 2007 Tadayoshi Funaba <tadf@dotrb.org>
* lib/date/format.rb: added some zone names.
* lib/date/format.rb (_parse): now interprets doted numerical
dates as a big endian (except dd.mm.yyyy).
-Thu Apr 12 17:13:22 2007 Koichi Sasada <ko1@atdot.net>
-
- * thread.c (mutex_try_lock): check and set owner thread.
-
- * thread_pthread.ci: fix to show error code in error message.
-
-Thu Apr 12 17:11:54 2007 Koichi Sasada <ko1@atdot.net>
-
- * eval.c (rb_rescue2): restore cfp ([ruby-dev:30582]).
-
-Thu Apr 12 16:06:48 2007 Koichi Sasada <ko1@atdot.net>
-
- * eval.c (rb_protect): restore cfp ([ruby-dev:30671]).
-
-Thu Apr 12 16:04:31 2007 Koichi Sasada <ko1@atdot.net>
-
- * compile.c (iseq_compile_each): check node->nd_state == 1, not !0.
-
-Wed Apr 11 16:35:16 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.[ch] (rb_w32_enter_critical, rb_w32_leave_critical): no
- need to reject reentrance. removed.
-
- * rubysig.h (RUBY_CRITICAL): follow above changes.
-
- * rubysig.h (TRAP_BEG, TRAP_END): no need to save errno.
-
-Tue Apr 10 17:02:17 2007 NAKAMURA Usaku <usa@ruby-lang.org>
+Tue Apr 10 17:37:36 2007 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/win32.c (rb_w32_fclose, rb_w32_close): need to save errno
before calling original fclose()/close().
-Tue Apr 10 16:14:22 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * thread_win32.ci (w32_wait_events): check whether interrupt_event is
- valid handle or not.
-
- * thread_win32.ci (native_thread_destroy): clear interrupt_event when
- close it.
-
-Tue Apr 10 15:53:17 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * thread_pthread.ci (native_thread_create): initialize sleep_cond.
- fixed: [ruby-dev:30675]
-
-Mon Apr 9 18:48:57 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * thread.c (do_select): ubf_select() is not necessary. interrupt is
- checked in the loop.
-
-Mon Apr 9 18:27:26 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * thread.c (do_select): use ubf_select() as UBF on windows.
-
- * win32/win32.c (do_select): shouldn't call catch_interrupt() here.
- fixed: [ruby-dev:30674], reported by wanabe.
-
-Mon Apr 9 09:24:32 2007 Shugo Maeda <shugo@ruby-lang.org>
+Mon Apr 9 09:30:44 2007 Shugo Maeda <shugo@ruby-lang.org>
* lib/net/imap.rb (disconnect): call shutdown for
SSLSocket. Thanks, Technorama Ltd.
-Sun Apr 8 13:28:17 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * compile.c (defined_expr): test arguments of NODE_CALL and so
- on as well as NODE_ATTRASGN. [ruby-core:10886]
-
-Fri Apr 6 10:56:29 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/openssl/ossl_pkey_ec.c (ossl_ec_key_get_group): get rid of
- warning. we are aware of it.
-
-Fri Apr 6 04:00:24 2007 Technorama Ltd. <oss-ruby@technorama.net>
-
- * ext/openssl/ossl_{bn,x509{attr,cert,name,store}}.c:
- Add documentation.
-
-Thu Apr 5 17:59:19 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * compile.c (defined_expr): support for assignment.
- [ruby-core:10867]
-
- * compile.h (ADD_CATCH_ENTRY): removed temporary variable.
-
-Thu Apr 5 15:13:34 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/openssl/ossl_ssl_session.c (ossl_ssl_session_alloc): should
- return value.
-
-Thu Apr 5 14:58:49 2007 Technorama Ltd. <oss-ruby@technorama.net>
-
- * ext/openssl/ossl_pkcs5.c: New module.
-
- * ext/openssl/ossl_{cipher,digest,pkcs7,pkcs12}.c:
- Remove redundant module namespace.
-
- * ext/openssl/lib/openssl/{cipher,digest}.rb
- Add backwards compatible classes for rearranged classes.
-
- * ext/openssl/ossl_{pkcs7,pkcs12}.c: Add documentation.
-
Thu Apr 5 00:42:48 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* error.c (rb_notimplement), io.c (pipe_open): removed definite
@@ -41795,258 +3807,153 @@ Wed Apr 4 17:09:17 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (pipe_open): refined the message of NotImplementedError.
[ruby-dev:30685]
-Wed Apr 4 12:29:02 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * error.c (rb_notimplement): should show the name of this func,
- not callee.
-
Wed Apr 4 10:18:04 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * io.c (popen_exec): should not close close-on-exec FDs.
- [ruby-dev:30679]
-
* io.c (pipe_open): raise NotImplementedError for command "-" on
platforms where fork(2) is not available. [ruby-dev:30681]
-Tue Apr 4 04:17:18 2007 Technorama Ltd. <oss-ruby@technorama.net>
-
- * ext/openssl/ossl_ssl.c: Add documentation.
-
-Tue Apr 3 16:22:24 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/openssl/extconf.rb: check for functions added in 1.9.
-
- * ext/openssl/ruby_missing.h: check per features instead by
- checking version code. [ruby-core:10845]
-
-Tue Apr 3 16:02:44 2007 Technorama Ltd. <oss-ruby@technorama.net>
-
- * ext/openssl/ossl_bn.c: More documentation.
-
- * ext/openssl/lib/ossl_{pkey,pkey_ec}.[ch]: Add elliptic curves.
-
-Tue Apr 3 15:50:41 2007 NAKAMURA Usaku <usa@ruby-lang.org>
+Tue Apr 3 15:45:41 2007 NAKAMURA Usaku <usa@ruby-lang.org>
* ext/socket/socket.c (s_recv, s_recvfrom): some systems (such as
windows) doesn't set fromlen if the socket is connection-oriented.
reported by Bram Whillock in [ruby-core:10512] [ruby-Bugs#9061]
-Tue Apr 3 09:36:55 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/openssl/ruby_missing.h: need to include version.h to check
- RUBY_VERSION_CODE.
-
-Mon Apr 3 07:10:12 2007 Technorama Ltd. <oss-ruby@technorama.net>
-
- * ext/openssl/ossl_{ssl.[ch],ssl_session.c},
- ext/openssl/lib/openssl/lib/openssl/ssl.rb:
- New SSL::Session class. Add session cb's, getter/setters,
- config, and statistics methods.
-
-Mon Apr 3 04:00:23 2007 Technorama Ltd. <oss-ruby@technorama.net>
-
- * ext/openssl/{ossl.[ch],ossl_pkey.c} Add documentation.
-
- * ext/openssl/ossl_hmac.c Add reset method.
-
- * ext/openssl/ossl_cipher.c (Cipher#update) Take additional
- buffer argument.
-
- * ext/openssl/{ossl_bio.c,ossl_ssl.c,ruby_missing.h}
- compatibility with 1.8.
+Sat Mar 24 23:40:29 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Mon Apr 2 21:55:12 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * node.h (struct rb_thread.locals): explicit as struct.
+ [ruby-core:10585]
- * insns.def (throw), thread.c, yarvcore.h (throwed_errinfo): fixed
- typo.
+ * eval.c, node.h (enum rb_thread_status, struct rb_thread,
+ rb_curr_thread, rb_main_thread): prefixed. [ruby-core:10586]
-Fri Mar 30 11:46:51 2007 NAKAMURA Usaku <usa@ruby-lang.org>
+ * file.c (chompdirsep): made an unprefixed name static.
- * win32/win32.c (rb_w32_cmdvector): fixed buffer size. reported by
- wanabe [ruby-dev:30672]
+ * io.c (io_fread): ditto.
- * win32/win32.c (init_env, insert, rb_w32_get_environ): use strdup
- instead of malloc + strlcpy. suggested by nobu [ruby-dev:30673]
+Sat Mar 24 01:54:03 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Mar 30 02:29:04 2007 Technorama <oss-ruby@technorama.net>
+ * eval.c (ruby_cleanup): exit by SystemExit and SignalException in END
+ block. [ruby-core:10609]
- * ext/openssl/ossl_{bn,cipher,digest,hmac,rand,pkey_{dh,dsa,rsa}}.c:
- Add Documentation for various methods.
+ * test/ruby/test_beginendblock.rb (test_should_propagate_exit_code):
+ test for exit in END block. [ruby-core:10760]
- * ext/openssl/lib/openssl/cipher.rb: Ditto
-
- * ext/openssl/ossl_bn.c: add lshift! and rshift! methods.
-
- * ext/openssl/ossl_digest.c: GetDigestPtr() also accept a string.
-
-Fri Mar 23 11:28:24 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (init_env, insert, cmdglob, rb_w32_cmdvector,
- rb_w32_opendir, rb_w32_readdir, rb_w32_strerror, rb_w32_stati64,
- rb_w32_get_environ): use strlcpy() and strlcat().
-
- * win32/win32.c (rb_w32_opendir): use realloc() instead of xrealloc().
-
- * win32/win32.c (rb_w32_closedir): check NULL before free pointers.
-
-Fri Mar 23 00:24:52 2007 Keiju Ishitsuka <keiju@ruby-lang.org>
-
- * lib/shell: commit miss(support for ruby 1.9(YARV) thread model).
+ * test/ruby/test_beginendblock.rb (test_should_propagate_signaled):
+ test for signal in END block.
-Thu Mar 22 13:32:17 2007 NAKAMURA Usaku <usa@ruby-lang.org>
+Thu Mar 22 23:13:17 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * win32/Makefile.sub (LIBS): remove an unnecessary library.
+ * eval.c (rb_provided): check for extension library if SOEXT is
+ explicitly given. [ruby-dev:30657]
-Thu Mar 22 10:27:58 2007 NAKAMURA Usaku <usa@ruby-lang.org>
+Thu Mar 22 10:29:25 2007 NAKAMURA Usaku <usa@ruby-lang.org>
* test/ruby/test_bignum.rb (test_to_s): add tests for Bignum#to_s.
-Wed Mar 21 20:38:06 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * marshal.c (w_short, w_long, w_object): get rid of VC++ warnings.
-
-Wed Mar 21 20:05:07 2007 Koichi Sasada <ko1@atdot.net>
-
- * compile.c, parse.y, eval.c, intern.h, iseq.c, lex.c, node.h,
- proc.c, vm.c, vm_macro.def, vm_macro.def, yarvcore.c, yarvcore.h,
- debug.c, debug.h: merge half-baked-1.9 changes. The biggest change
- is to change node structure around NODE_SCOPE, NODE_ARGS. Every
- scope (method/class/block) has own NODE_SCOPE node and NODE_ARGS
- represents more details of arguments information. I'll write a
- document about detail of node structure.
-
Wed Mar 21 17:04:30 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* bignum.c (rb_big2str0): round up for the most significant digit.
[ruby-core:10686]
-Tue Mar 21 08:20:00 2007 Nathaniel Talbott <ntalbott@ruby-lang.org>
-
- * test/testunit/collector/test_dir.rb: Fixed test/unit tests that
- were breaking due to Module#public_instance_methods now
- returning a Symbol instead of a String.
+Wed Mar 21 07:21:24 2007 Akinori MUSHA <knu@iDaemons.org>
- * test/testunit/collector/test_objectspace.rb: Ditto.
+ * ext/thread/thread.c (remove_one): Preserve List invariants;
+ submitted by: MenTaLguY <mental AT rydia.net>
+ in [ruby-core:10598] and [ruby-bugs:PR#9388].
Tue Mar 20 22:54:50 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* marshal.c (w_extended): erroneous check condition when dump
method is defined. [ruby-core:10646]
-Tue Mar 20 21:36:47 2007 Keiju Ishitsuka <keiju@ruby-lang.org>
-
- * lib/shell.rb, lib/shell: support for ruby 1.9(YARV) thread model.
-
-Tue Mar 20 16:36:08 2007 URABE Shyouhei <shyouhei@ruby-lang.org>
+Tue Mar 20 15:37:24 2007 URABE Shyouhei <shyouhei@ruby-lang.org>
* distruby.rb: Add zip generation.
-Tue Mar 20 16:20:49 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_f_callee_name): add __method__ and __callee__ again.
- __callee__ need to rework to adopt YARV. [ruby-core:10671]
-
-Tue Mar 20 11:09:00 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/set.rb: Revise rdoc.
-
- * lib/set.rb (Set#freeze, Set#taint, Set#untaint): Implement
- Set#freeze, Set#taint, and Set#untaint; requested by: Dan
- Hutchings <dan AT moltoagitato.com> in [ruby-bugs:PR#9359].
-
-Tue Mar 20 09:13:10 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * process.c (rb_fork): flush stdouts always before fork(2).
- fixed: [ruby-dev:30612]
-
-Tue Mar 20 01:38:48 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread.c (thread_start_func_2): store the result of first_func
- as well as first_proc.
-
- * thread.c (thread_create_core): block is not used if first_func
- is given.
-
-Mon Mar 19 16:58:52 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * missing/{strlcat,strlcpy}.c, missing.h: new functions.
-
- * LEGAL: add copyright notice about above files.
-
- * configure.in: check whether strlcat and strlcpy are exist or not.
-
- * {bcc32,win32,wince}/Makefile.sub: use above files.
-
-Mon Mar 19 14:12:25 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+Tue Mar 20 11:28:41 2007 Akinori MUSHA <knu@iDaemons.org>
* lib/matrix.rb (Matrix::inverse_from): adding partial pivoting to
the Gauss-Jordan algorithm, making it stable. a patch from
Peter Vanbroekhoven. [ruby-core:10641]
-Mon Mar 19 12:13:36 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+Mon Mar 19 11:39:29 2007 Minero Aoki <aamine@loveruby.net>
+
+ * lib/net/protocol.rb (rbuf_read): extend buffer size for speed.
- * regparse.c, etc.: K&R to ANSI code cleanup patch from Stefan
- Huehner <stefan at huehner.org>. [ruby-core:10543]
+Sun Mar 18 04:23:52 2007 Akinori MUSHA <knu@iDaemons.org>
-Mon Mar 19 11:27:13 2007 Minero Aoki <aamine@loveruby.net>
+ * NEWS: Add a note about the new `date' library defining
+ Time#to_date and Time#to_datetime private methods.
- * lib/net/protocol.rb (rbuf_read): extend buffer size for speed.
+ * NEWS: Inform that the old `thread' library is considered to be
+ stable.
-Sun Mar 18 08:31:51 2007 NAKAMURA Usaku <usa@ruby-lang.org>
+ * NEWS: Sort library entries in alphabetical order.
- * win32/dir.h, win32/win32.c (rb_w32_opendir, rb_w32_readdir,
- rb_w32_closedir): get rid of possible buffer-overflows.
+Fri Mar 16 21:48:11 2007 Akinori MUSHA <knu@iDaemons.org>
-Sat Mar 17 19:10:39 2007 Kouhei Sutou <kou@cozmixng.org>
+ * ext/dl/dl.c (rb_ary2cary): Fix a bug in type validation;
+ submitted by sheepman <sheepman AT sheepman.sakura.ne.jp>
+ in [ruby-dev:30554].
- * lib/rss, test/rss:
- - supported Atom.
- - bumped version 0.1.6 to 0.1.7.
- * sample/rss/convert.rb: added new sample.
+Fri Mar 16 18:28:06 2007 Akinori MUSHA <knu@iDaemons.org>
-Fri Mar 16 22:32:20 2007 Minero Aoki <aamine@loveruby.net>
+ * ext/etc/etc.c (etc_getgrgid): Fix a bug in Etc::getgrgid()
+ always returning the (real) group entry of the running process;
+ reported by: UEDA Hiroyuki <ueda AT netforest.ad.jp>
+ in [ruby-dev:30586].
- * lib/net/pop.rb: change default verification mode from
- VERIFY_PEER to VERIFY_NONE because most POPS server does not have
- true certification.
+Fri Mar 16 16:33:58 2007 Akinori MUSHA <knu@iDaemons.org>
-Fri Mar 16 22:19:24 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+ * ext/thread/thread.c (unlock_mutex_inner): Make sure that the
+ given mutex is actually owned by the caller; submitted by:
+ Sylvain Joyeux <sylvain.joyeux AT m4x.org> in [ruby-core:10598].
- * ext/win32ole/win32ole.c: add WIN32OLE#ole_activex_initialize,
- a little bit supporting ActiveX control. [ruby-talk:241188]
+Fri Mar 16 16:21:35 2007 Akinori MUSHA <knu@iDaemons.org>
-Fri Mar 16 22:16:58 2007 Minero Aoki <aamine@loveruby.net>
+ * ext/thread/thread.c (wait_condvar, lock_mutex): Fix a problem in
+ ConditionVariable#wait that occurs when two threads that are
+ trying to access the condition variable are also in concurrence
+ for the given mutex; submitted by: Sylvain Joyeux
+ <sylvain.joyeux AT m4x.org> and MenTaLguY <mental AT rydia.net>
+ in [ruby-core:10598].
- * lib/net/http.rb: merge Ruby-SSPI patch contributed by Justin
- Bailey.
+Fri Mar 16 16:17:27 2007 Akinori MUSHA <knu@iDaemons.org>
- * ext/Win32API/lib/win32/sspi.rb: new file.
+ * test/thread/test_thread.rb: Add a test script for the `thread'
+ library. This should result in failure as of now with
+ ext/thread; submitted by: Sylvain Joyeux <sylvain.joyeux AT
+ m4x.org> in [ruby-core:10598].
Wed Mar 14 12:30:00 2007 Shigeo Kobayashi <shigeo@tinyforest.jp>
* ext/bigdecimal/bigdecimal.c: BigDecimal("-.31") is now
treated as ("-0.31") not as ("0.31").
-Tue Mar 13 19:04:30 2007 Keiju Ishitsuka <keiju@ruby-lang.org>
-
- * lib/sync.rb: support for ruby 1.9(YARV) thread model.
-
Tue Mar 13 09:25:10 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* common.mk (clear-installed-list): separated from install-prereq.
-Tue Mar 13 07:23:20 2007 Shugo Maeda <shugo@ruby-lang.org>
+Tue Mar 13 06:38:43 2007 Akinori MUSHA <knu@iDaemons.org>
+
+ * NEWS: Reword and improve entries.
- * lib/monitor.rb (mon_try_enter): call @mon_muetx.try_lock.
- Thanks, Keiju ISHITSUKA. [ruby-dev:30507]
+Tue Mar 13 06:03:46 2007 Akinori MUSHA <knu@iDaemons.org>
+
+ * stable version 1.8.6 released from the ruby_1_8_6 branch.
+
+Tue Mar 13 03:24:07 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * runruby.rb: added --pure (turned on by default) and --debugger
+ options.
-Tue Mar 13 02:42:58 2007 Akinori MUSHA <knu@iDaemons.org>
+Tue Mar 13 02:50:28 2007 Akinori MUSHA <knu@iDaemons.org>
* lib/cgi.rb (CGI::header): IIS >= 5.0 does not need the nph
assumption any more; submitted by MIYASAKA Masaru <alkaid AT
coral.ocn.ne.jp> in [ruby-dev:30537].
-Mon Mar 12 10:53:28 2007 Akinori MUSHA <knu@iDaemons.org>
+Mon Mar 12 11:07:44 2007 Akinori MUSHA <knu@iDaemons.org>
* ext/openssl/ossl_asn1.c (Init_ossl_asn1): Let rdoc know about
externally defined modules; submitted by Technorama
@@ -42072,105 +3979,101 @@ Mon Mar 12 10:53:28 2007 Akinori MUSHA <knu@iDaemons.org>
* ext/openssl/ossl_ssl.c (Init_ossl_ssl): Ditto.
-Sun Mar 11 18:42:01 2007 Akinori MUSHA <knu@iDaemons.org>
+Mon Mar 12 01:05:17 2007 Akinori MUSHA <knu@iDaemons.org>
- * misc/ruby-mode.el (ruby-block-end-re): Support for the
- experimental ';;' terminator had been dropped.
+ * ext/dl/sym.c (rb_dlsym_inspect): Use "0x%x" rather for pointers.
+ This might not be very right but it is commonly used in other
+ parts of the code; submitted by sheepman <sheepman AT
+ sheepman.sakura.ne.jp> in [ruby-dev:30532].
-Sun Mar 11 05:45:46 2007 Akinori MUSHA <knu@iDaemons.org>
+ * ext/dl/ptr.c (rb_dlptr_inspect): Ditto.
- * misc/README, misc/rdebug.el: Add rdebug.el, Emacs ruby-debug
- interface based on rubydb3x.el; submitted by Martin Nordholts
- <enselic AT gmail.com> in [ruby-bugs:PR#9023].
-
-Sat Mar 10 07:20:28 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c: add WIN32OLE_TYPELIB#library_name,
- WIN32OLE_TYPELIB#visible?.
-
- * test/win32ole/test_win32ole_typelib.rb: ditto.
+Mon Mar 12 00:59:19 2007 Akinori MUSHA <knu@iDaemons.org>
-Thu Mar 8 09:17:59 2007 Minero Aoki <aamine@loveruby.net>
+ * ext/dl/lib/dl/import.rb (DL::Importable::Internal::import,
+ DL::Importable::Internal::callback): Avoid race condition for an
+ instance variable; submitted by sheepman <sheepman AT
+ sheepman.sakura.ne.jp> in [ruby-dev:30530].
- * compile.c: iseq_compile -> rb_iseq_compile.
+Sun Mar 11 18:57:50 2007 Akinori MUSHA <knu@iDaemons.org>
- * iseq.c: ditto.
+ * misc/README: Add a note about ruby-electric.el.
- * intern.h: provide function prototype of Init_jump.
+ * misc/ruby-mode.el (ruby-non-block-do-re): Fix
+ ruby-non-block-do-re. [ruby-core:03719]
- * eval_jump.h (Init_jump): declare function type.
+ * misc/inf-ruby.el: Synchronize the comment section with trunk.
- * thread.c: platform-dependent functions should be surrounded by #ifdef.
-
- * iseq.c (iseq_data_to_ary): remove unused variable.
-
- * compile.c (set_arguments): ditto.
-
- * thread.c (set_unblock_function): ditto.
-
- * thread_pthread.ci: reduce printf warning.
+ * misc/README, misc/rdebug.el: Add rdebug.el, Emacs ruby-debug
+ interface based on rubydb3x.el; submitted by Martin Nordholts
+ <enselic AT gmail.com> in [ruby-bugs:PR#9023].
- * vm_dump.c: ditto.
+Sun Mar 11 17:45:51 2007 Akinori MUSHA <knu@iDaemons.org>
-Tue Mar 6 16:35:04 2007 Keiju Ishitsuka <keiju@ruby-lang.org>
+ * ext/dl/mkcallback.rb (mkfunc): Make sure that a callback
+ function is found in the function table before trying to call
+ it; submitted by sheepman <sheepman AT sheepman.sakura.ne.jp>
+ in [ruby-dev:30524].
- * lib/shell/process-controller.rb: fix thread synchronization problem for [ruby-dev:30477].
+Sun Mar 11 12:09:37 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Tue Mar 6 11:53:25 2007 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * eval.c (error_handle): no message when exiting by signal.
- * ext/tk/sample/irbtkw.rbw: fails to exit process.
+ * eval.c (ruby_cleanup): re-send signal. [ruby-dev:30516]
-Tue Mar 6 10:23:09 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * eval.c (rb_thread_interrupt): instantiate SignalException.
- * runruby.rb: added --pure (turned on by default) and --debugger
- options.
+ * eval.c (rb_thread_signal_raise): now takes signal number instead
+ of signal name.
-Mon Mar 5 09:19:33 2007 Minero Aoki <aamine@loveruby.net>
+ * intern.h (rb_thread_signal_raise, ruby_default_signal): prototypes.
- * lib/timeout.rb (Timeout.timeout): should return the block value
- always.
+ * signal.c (esignal_init): takes a signal number and an optional
+ signal name.
- * lib/timeout.rb (Timeout.timeout): should yield sec argument
- always.
+ * signal.c (interrupt_init): pass SIGINT always.
- * lib/timeout.rb (Timeout.timeout): fix document.
+ * signal.c (ruby_default_signal): invoke system default signal
+ handler.
-Mon Mar 5 09:16:40 2007 Minero Aoki <aamine@loveruby.net>
+ * signal.c (rb_signal_exec, trap): handle SIGTERM. [ruby-dev:30505]
- * lib/net/smtp.rb: support automatic STARTTLS.
+Tue Mar 6 19:08:46 2007 Akinori MUSHA <knu@iDaemons.org>
- * lib/net/smtp.rb: check server advertisement.
+ * ext/digest/lib/md5.rb (MD5::new, MD5::md5): Do not modify
+ Digest::MD5.
- * lib/net/smtp.rb: introduce new class SMTP::Response.
+ * ext/digest/lib/sha1.rb (SHA1::new, SHA1::sha1): Ditto.
- * lib/net/smtp.rb (getok): should not use sprintf.
+Tue Mar 6 18:58:37 2007 Keiju Ishitsuka <keiju@ruby-lang.org>
- * lib/net/smtp.rb (get_response): ditto.
+ * lib/shell/process-controller.rb: fix thread synchronization
+ problem for [ruby-dev:30477].
- * lib/net/protocol.rb: reduce syntax warning on 1.9.
+Tue Mar 6 18:44:26 2007 Akinori MUSHA <knu@iDaemons.org>
-Mon Mar 5 07:13:28 2007 Minero Aoki <aamine@loveruby.net>
+ * ext/digest/lib/md5.rb (MD5::new, MD5::md5): Catch up with
+ Digest's API changes; noted by: Kazuhiro Yoshida <moriq AT
+ moriq.com> in [ruby-dev:30500].
- * lib/net/smtp.rb: reconstruct SMTPS/STARTTLS interface. New
- interface is incompatible from current 1.9 interface at all.
+ * ext/digest/lib/sha1.rb (SHA1::new, SHA1::sha1): Ditto.
- * lib/net/smtp.rb: All SSL-related class methods are removed; use
- instance methods instead.
+Tue Mar 6 18:24:19 2007 Akinori MUSHA <knu@iDaemons.org>
- * lib/net/smtp.rb: rename methods: *ssl -> *tls (with alias
- "ssl").
+ * time.c (time_to_s): Back out the format changes; discussed
+ in [ruby-dev:30495].
- * lib/net/smtp.rb: rename methods: *tls -> *starttls.
+Tue Mar 6 11:53:25 2007 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-Mon Mar 5 01:36:41 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/tk/sample/irbtkw.rbw: fails to exit process.
- * parse.y (parser_yylex), win32/win32.c (rb_w32_utime): fixed
- indentation broken at YARV merger.
+Mon Mar 5 20:14:49 2007 Akinori MUSHA <knu@iDaemons.org>
-Sun Mar 4 23:41:14 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * time.c (time_to_s): Correct the wrong format which did not
+ really conform to RFC 2822; pointed out by: OHARA Shigeki <os at
+ iij.ad.jp> in [ruby-dev:30487].
- * file.c (rb_stat_uid, rb_stat_gid, eaccess): use rb_uid_t and
- rb_gid_t instead of int.
+Sun Mar 4 23:38:07 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* file.c (rb_stat_s_utime): fixed a commit miss for the platforms
where utimes() does not exist.
@@ -42181,21 +4084,21 @@ Sun Mar 4 14:46:56 2007 WATANABE Hirofumi <eban@ruby-lang.org>
* util.c (push_element): should return a int value.
-Sun Mar 4 01:01:25 2007 Akinori MUSHA <knu@iDaemons.org>
+Sun Mar 4 01:05:57 2007 Akinori MUSHA <knu@iDaemons.org>
* lib/set.rb (Set#^, Set#&): Correct documentation. Those methods
return sets, not arrays; noted by Oliver Frank Wittich <nietz AT
mangabrain.de>.
-Sat Mar 3 22:54:33 2007 Minero Aoki <aamine@loveruby.net>
+Sat Mar 3 23:01:07 2007 Minero Aoki <aamine@loveruby.net>
- * lib/fileutils.rb (touch): last #touch change causes error when
- :mtime option was not given.
+ * lib/fileutils.rb (mv): could not move a directory between
+ different filesystems. [ruby-dev:30411]
-Sat Mar 3 22:51:29 2007 Minero Aoki <aamine@loveruby.net>
+Sat Mar 3 22:57:11 2007 Minero Aoki <aamine@loveruby.net>
- * lib/fileutils.rb (mv): could not move directory between
- different file systems. [ruby-dev:30411]
+ * lib/fileutils.rb (touch): last commit causes error if :mtime
+ option was not given.
Sat Mar 3 22:37:02 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
@@ -42204,26 +4107,39 @@ Sat Mar 3 22:37:02 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/fileutils.rb (touch): ditto, and added :mtime and :nocreate
options. fixed: [ruby-talk:219037]
-Sat Mar 3 15:52:26 2007 Akinori MUSHA <knu@iDaemons.org>
+Sat Mar 3 21:17:35 2007 Akinori MUSHA <knu@iDaemons.org>
+
+ * eval.c (stack_check): Unset inline to fix build with GCC 3.4.6;
+ submitted by: NISHIMATSU Takeshi <t_nissie AT yahoo.co.jp> in
+ [ruby-list:43218].
+ cf. http://gcc.gnu.org/bugzilla/show_bug.cgi?id=24556
+
+Sat Mar 3 19:05:31 2007 Akinori MUSHA <knu@iDaemons.org>
+
+ * ext/thread/thread.c (push_list): Use ALLOC().
+
+ * ext/thread/thread.c (rb_mutex_alloc): Ditto.
+
+ * ext/thread/thread.c (rb_condvar_alloc): Ditto.
- * object.c (instance_variable_get): Restore rdoc markups lost in
- the last commit.
+Sat Mar 3 18:53:11 2007 Akinori MUSHA <knu@iDaemons.org>
-Fri Mar 2 21:17:14 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+ * NEWS: Add a note for String#intern.
- * ext/win32ole/win32ole.c (get_ptr_of_variant, ole_set_safe_array,
- ole_val2ptr_variant, ole_val2olevariantdata, ole_variant2val,
- ): fix some bugs of WIN32OLE_VARIANT.new when variant type is
- VT_ARRAY|VT_BSTR or VT_BYREF.
+Sat Mar 3 16:23:13 2007 Akinori MUSHA <knu@iDaemons.org>
- * ext/win32ole/win32ole.c (folevariant_s_array, folevariant_initialize):
- WIN32OLE_VARIANT#[], WIN32OLE_VARIANT#[]=, WIN32OLE_VARIANT#value=
- is defined as instance method of WIN32OLE_VARIANT.
+ * env.h (SCOPE_CLONE): Introduce a new scope flag to prevent a
+ local_tbl region from getting freed many times; submitted by
+ Chikanaga Tomoyuki <chikanag AT nippon-control-system.co.jp> in
+ [ruby-dev:30460].
- * test/win32ole/test_win32ole_variant.rb: add some test for
- VT_ARRAY, VT_BYREF variant type.
+ * eval.c (proc_invoke): Ditto.
-Fri Mar 2 07:58:24 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * gc.c (obj_free): Ditto.
+
+ * parse.y (top_local_setup_gen): Ditto.
+
+Sat Mar 3 16:07:02 2007 Akinori MUSHA <knu@iDaemons.org>
* object.c (rb_obj_ivar_set): RDoc updated according to a
suggestion from Brian Candler <B.Candler AT pobox.com>.
@@ -42234,7 +4150,14 @@ Thu Mar 1 21:38:07 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (stmt, arg): should not omit lhs of OP_ASGN1 even if
empty. [ruby-dev:30455]
-Thu Mar 1 02:55:25 2007 Akinori MUSHA <knu@iDaemons.org>
+Thu Mar 1 08:55:38 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (rb_feature_p): check loading_tbl if the given ext is
+ empty. [ruby-dev:30452]
+
+ * eval.c (rb_feature_p): fix possible buffer overrun.
+
+Thu Mar 1 03:30:21 2007 Akinori MUSHA <knu@iDaemons.org>
* ext/digest/digest.c (get_digest_base_metadata): Allow inheriting
Digest::Base subclasses, which was unintentionally made
@@ -42244,6 +4167,11 @@ Thu Mar 1 02:05:17 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* mkconfig.rb (patchlevel): read from version.h.
+Thu Mar 1 00:09:39 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (rb_provided): return true only for features loaded from
+ .rb files, and not search actual library type. [ruby-dev:30414]
+
Wed Feb 28 21:15:00 2007 WATANABE Hirofumi <eban@ruby-lang.org>
* configure.in (ac_cv_func_fcntl): fcntl support for MinGW.
@@ -42256,31 +4184,29 @@ Wed Feb 28 20:51:32 2007 URABE Shyouhei <shyouhei@ruby-lang.org>
UTF-8 encoded BOMs; submitted by SOUMA Yutaka <holon@radastery.jp>
to fix [ruby-core:10437]
-Wed Feb 28 18:31:51 2007 NAKAMURA Usaku <usa@ruby-lang.org>
+Wed Feb 28 18:59:57 2007 Akinori MUSHA <knu@iDaemons.org>
+
+ * NEWS: Add NEWS, a document file to keep user visible feature
+ changes between releases.
+
+Wed Feb 28 18:35:50 2007 NAKAMURA Usaku <usa@ruby-lang.org>
* ext/openssl/extconf.rb: no need to check unistd.h and sys/time.h.
they are already checked at configure.
reported by KOBAYASHI Yasuhiro [ruby-list:43225]
-Wed Feb 28 18:23:43 2007 NAKAMURA Usaku <usa@ruby-lang.org>
+Wed Feb 28 18:34:48 2007 NAKAMURA Usaku <usa@ruby-lang.org>
* lib/mkmf.rb ($DEFLIBPATH): default library paths ($(topdir), etc)
should be the first elements of library paths list.
reported by KOBAYASHI Yasuhiro [ruby-list:43225]
-Wed Feb 28 10:33:58 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * Makefile.in, configure.in, */Makefile.sub (THREAD_MODEL): system
- specific thread model.
-
- * compile.h, regint.h, vm.h, array.c: removed unnecessary #include.
+Wed Feb 28 18:31:32 2007 Akinori MUSHA <knu@iDaemons.org>
-Wed Feb 28 04:03:03 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * doc/NEWS-1.8.0: Rename NEWS to NEWS-1.8.0. This is way too old
+ NEWS.
- * enum.c (take_i): small cosmetic / documentation patch from
- Tadashi Saito <shiba AT mail2.accsnet.ne.jp>. [ruby-dev:30446]
-
-Wed Feb 28 01:20:18 2007 NAKAMURA Usaku <usa@ruby-lang.org>
+Wed Feb 28 01:22:58 2007 NAKAMURA Usaku <usa@ruby-lang.org>
* test/{dbm,gdbm}/test_{dbm,gdbm}.rb: shouldn't use host_os. use
target_os instead. reported by KOBAYASHI Yasuhiro [ruby-list:43225]
@@ -42295,7 +4221,7 @@ Wed Feb 28 00:08:11 2007 URABE Shyouhei <shyouhei@ice.uec.ac.jp>
Tue Feb 27 22:18:45 2007 WATANABE Hirofumi <eban@ruby-lang.org>
- * configure.in (--enable-auto-image-base): avoid the necessity to
+ * configure.in (--enable-auto-image-base): avoid the neccessity to
rebase the shared libs as much as possible;
submitted by Corinna Vinschen <spam at vinschen.de> in
[ruby-talk:240964].
@@ -42308,27 +4234,19 @@ Tue Feb 27 21:33:04 2007 WATANABE Hirofumi <eban@ruby-lang.org>
* configure.in (ac_cv_func_setrlimit): workaround for djgpp.
-Tue Feb 27 20:35:28 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * common.mk (error.c, process.c): depend on yarvcore.h and rubysig.h.
-
-Tue Feb 27 19:26:31 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/nkf/nkf.c (rb_str_resize, rb_nkf_kconv, rb_nkf_guess1,
- rb_nkf_guess2): Silence warnings regarding char * vs. unsigned
- char * mismatch; submitted by Lyle Johnson
- <lyle.johnson@gmail.com> in [ruby-core:10416].
-
-Tue Feb 27 19:15:01 2007 Akinori MUSHA <knu@iDaemons.org>
+Tue Feb 27 19:38:52 2007 Akinori MUSHA <knu@iDaemons.org>
* lib/base64.rb (Base64::b64encode): Fix documentation; submitted
by David Symonds <dsymonds@gmail.com> in [ruby-core:10432].
-Tue Feb 27 18:59:42 2007 Akinori MUSHA <knu@iDaemons.org>
+Tue Feb 27 19:36:57 2007 Akinori MUSHA <knu@iDaemons.org>
- * ext/bigdecimal/bigdecimal.c (BigDecimal_load): Silence warnings
- regarding char * vs. unsigned char * mismatch; submitted by Lyle
- Johnson <lyle.johnson@gmail.com> in [ruby-core:10416].
+ * regex.c (calculate_must_string, slow_search, re_search): Silence
+ warnings regarding char * vs. unsigned char * mismatch;
+ submitted by Lyle Johnson <lyle.johnson@gmail.com>
+ in [ruby-core:10416].
+
+ * ext/bigdecimal/bigdecimal.c (BigDecimal_load): Ditto.
* ext/digest/sha1/sha1ossl.c (SHA1_Finish): Ditto.
@@ -42337,321 +4255,65 @@ Tue Feb 27 18:59:42 2007 Akinori MUSHA <knu@iDaemons.org>
* ext/digest/digest.c (rb_digest_base_finish,
rb_digest_base_update): Ditto.
-Tue Feb 27 18:12:05 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enum.c (enum_take): new method. [ruby-dev:30407]
-
- * enum.c (enum_drop): ditto.
-
-Tue Feb 27 07:47:24 2007 Koichi Sasada <ko1@atdot.net>
-
- * yarvcore.h, vm.h: rename th_invoke_yield() to th_yield().
-
- * blockinlining.c: ditto.
-
- * eval.c: ditto.
-
- * vm.c, insns.def: rename th_invoke_yield_cfunc()
- to th_yield_with_cfunc().
-
- * yarvcore.h, yarvcore.c: rename theYarvVM to ruby_current_vm and
- yarvCurrentThread to ruby_current_thread. remove yarvVMArray.
-
-Tue Feb 27 00:45:23 2007 Minero Aoki <aamine@loveruby.net>
-
- * test/ruby/test_optimization.rb: restore method before calling
- assert_equal.
-
-Mon Feb 26 00:58:39 2007 Koichi Sasada <ko1@atdot.net>
-
- * yarvcore.h: add rb_thread_t#top_wrapper, top_self.
-
- * eval_load.c (rb_load): support eval in wrapper module
- (load(file, true)).
-
- * eval.c: ditto.
-
- * eval_jump.h: ditto.
-
- * iseq.c: ditto.
-
- * vm.c: ditto.
-
- * yarvcore.c: ditto.
-
- * insns.def: add a empty line.
-
-Mon Feb 26 00:54:36 2007 Koichi Sasada <ko1@atdot.net>
-
- * common.mk: change "gdb" rule. You can debug miniruby with
- $(srcdir)/test.rb on gdb by this rule (type "make gdb").
- If you write break points to "breakpoints.gdb" on $srcdir,
- gdb runs with this file.
-
-Sun Feb 25 11:46:58 2007 Koichi Sasada <ko1@atdot.net>
-
- * win32/Makefile.sub: enable -Zi (debug) option.
-
-Sun Feb 25 11:38:40 2007 Koichi Sasada <ko1@atdot.net>
-
- * ruby.h: define RUBY_VM macro and remove NATIVETHREAD* macros.
-
- * intern.h: ditto.
-
- * signal.c (posix_signal): remove unused function
- posix_nativethread_signal().
-
-Sun Feb 25 11:31:13 2007 Koichi Sasada <ko1@atdot.net>
-
- * thread.c (rb_thread_run): fix to ANSI style.
-
-Sun Feb 25 11:09:16 2007 Minero Aoki <aamine@loveruby.net>
-
- * bootstraptest/runner.rb: show source code in error message.
-
-Sun Feb 25 09:39:50 2007 Koichi Sasada <ko1@atdot.net>
-
- * yarvcore.h:
- rename:
- rb_iseq_t#file_name -> filename
- rb_iseq_t#local_tbl -> local_table
- add:
- rb_iseq_t#local_table_size
-
- * compile.c: separate local_table_size and local_size
- (local variable size)
-
- * blockinlining.c: apply above rename.
-
- * compile.h: ditto.
-
- * eval.c: ditto.
-
- * iseq.c: ditto.
-
- * proc.c: ditto.
-
- * vm.c: ditto.
-
- * vm_dump.c: ditto.
-
-Sun Feb 25 10:27:17 2007 Minero Aoki <aamine@loveruby.net>
-
- * bootstraptest/runner.rb: add lib/ to load path.
-
-Sat Feb 25 10:16:50 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * rubyio.h (HAVE_RB_IO_T): macro to tell if rb_io_t is defined.
-
-Sat Feb 24 19:39:16 2007 Minero Aoki <aamine@loveruby.net>
-
- * common.mk: new target "btest", to run bootstraptests.
-
-Sat Feb 24 19:30:40 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c, gc.c, io.c, ruby.h, rubyio.h, win32/win32.h (rb_io_t):
- renamed from OpenFile.
-
- * ext/dl/cptr.c, ext/io/wait/wait.c, ext/openssl/ossl.h,
- ext/openssl/ossl_bio.c, ext/openssl/ossl_ssl.c, ext/pty/pty.c,
- ext/readline/readline.c, ext/socket/socket.c: ditto.
-
-Sat Feb 24 19:28:23 2007 Minero Aoki <aamine@loveruby.net>
-
- * bootstraptest/runner.rb: new option -v,--verbose.
-
-Sat Feb 24 18:55:50 2007 Minero Aoki <aamine@loveruby.net>
-
- * yarvtest/test_method.rb: removed (merged to bootstraptest).
-
- * yarvtest/test_class.rb: ditto.
-
-Sat Feb 24 18:44:39 2007 Minero Aoki <aamine@loveruby.net>
-
- * bootstraptest/test_class.rb: new file.
-
- * bootstraptest/test_method.rb: add tests.
-
-Sat Feb 24 18:44:30 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * intern.h (rb_thread_blocking_region): add prototype.
-
- * file.c (rb_thread_flock, rb_file_flock): use UBF feature.
-
- * process.c (rb_waitpid_blocking, rb_waitpid): use UBF feature.
-
- * thread.c (rb_thread_debug): added runtime debugging flag.
-
- * thread.c (BLOCKING_REGION): restore previous UBF.
-
- * thread.c (rb_thread_blocking_region): default UBF to interrupt
- in system dependent way by RB_UBF_DFL.
- + ubf_select() on posix system
- + ubf_handle() on Win32
- + none on cygwin
-
- * thread_win32.ci (rb_w32_wait_events_blocking): blocking version.
-
- * win32/win32.c (waitpid): use rb_w32_wait_events_blocking().
-
-Sat Feb 24 17:45:48 2007 Minero Aoki <aamine@loveruby.net>
-
- * parse.y (f_arg, opt_f_block_arg): ripper should export VALUE.
-
-Sat Feb 24 16:52:55 2007 Minero Aoki <aamine@loveruby.net>
-
- * bootstraptest/runner.rb: fix syntax error.
-
-Sat Feb 24 16:51:09 2007 Minero Aoki <aamine@loveruby.net>
-
- * bootstraptest/runner.rb: new option --help.
-
-Sat Feb 24 16:47:33 2007 Minero Aoki <aamine@loveruby.net>
-
- * bootstraptest: new test suite.
-
- * bootstraptest/runner.rb: new file.
-
- * bootstraptest/test_literal.rb: new file.
-
- * bootstraptest/test_method.rb: new file.
-
-Sat Feb 24 16:29:15 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (StartSocket): remove unnecessary code.
-
-Sat Feb 24 16:04:30 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (struct local_vars): remove unused nofree member from
- struct.
-
- * parse.y (parser_free): ditto.
-
-Sat Feb 24 15:57:19 2007 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/thread.rb (ConditionVariable#broadcast): use Mutex
- instead of Thread.exclusive.
-
- * lib/monitor.rb (MonitorMixin#mon_exit): unset @mon_owner
- before calling Mutex#unlock.
-
-Sat Feb 24 15:51:45 2007 Minero Aoki <aamine@loveruby.net>
-
- * parse.y (program): remove useless assignment to reduce warning.
-
-Sat Feb 24 15:41:51 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (lambda): remove unused clause from the rule to stop
- warning.
-
-Sat Feb 24 15:41:22 2007 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/thread.rb: do not redefine Mutex#synchronize.
-
-Sat Feb 24 15:14:02 2007 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/monitor.rb: rewritten using Mutex/ConditionVariable.
-
-Sat Feb 24 13:25:32 2007 Koichi Sasada <ko1@atdot.net>
-
- * lib/soap/mapping/factory.rb: catch up with spec changes (return
- Symbols instead of Strings).
-
- * lib/soap/mapping/mapping.rb: ditto.
-
-Sat Feb 24 10:49:55 2007 Koichi Sasada <ko1@atdot.net>
-
- * parse.y, node.h, compile.c: change node tree structure. a purpose
- of this change is to unify argument structure of method and block.
- this change prohibits duplicate block parameter name.
- new argument information:
- NODE_ARGS [m: int, o: NODE_OPT_ARG, ->]
- NODE_ARGS_AUX [r: ID, b: ID, ->]
- NODE_ARGS_AUX [Pst: id, Plen: int, init: NODE*]
- optarg information:
- NODE_OPT_ARGS [idx, expr, ->]
+ * ext/nkf/nkf.c (rb_str_resize, rb_nkf_kconv, rb_nkf_guess1,
+ rb_nkf_guess2): Ditto.
- * vm_macro.def: ditto.
+Tue Feb 27 03:40:09 2007 Akinori MUSHA <knu@iDaemons.org>
- * gc.c: ditto.
+ * ext/thread/thread.c (wait_list_cleanup, rb_mutex_try_lock):
+ Eliminate rb_thread_critical switching where unnecessary;
+ implied by shugo in [ruby-dev:30412].
- * iseq.c: ditto.
+ * ext/thread/thread.c (set_critical): Merge in
+ thread_exclusive_ensure().
- * compile.h: fix debug function name.
+ * ext/thread/thread.c: Consistently use 0 and 1 for
+ rb_thread_critical values.
- * test/ripper/test_scanner_events.rb: |_,_,foo| -> |_1,_2,foo|
+Mon Feb 26 15:18:23 2007 Akinori MUSHA <knu@iDaemons.org>
- * test/ruby/test_lambda.rb: disable test temporarily.
+ * ext/thread/thread.c: Use xmalloc()/xfree() instead of
+ malloc()/free(); pointed out by shugo in [ruby-dev:30412].
-Sat Feb 24 10:46:28 2007 Koichi Sasada <ko1@atdot.net>
+Sun Feb 25 23:02:55 2007 Akinori MUSHA <knu@iDaemons.org>
- * test/testunit/test_testcase.rb: catch up with current instance
- variable spec.
+ * lib/test/unit/autorunner.rb (Test::Unit::AutoRunner::initialize):
+ Initialize @workdir properly to silence a warning under -w.
+ Submitted by <tommy at tmtm.org> in [ruby-dev:30400].
-Sat Feb 24 10:32:59 2007 Koichi Sasada <ko1@atdot.net>
+Sun Feb 25 02:47:43 2007 Akinori MUSHA <knu@iDaemons.org>
- * common.mk: change vm_macro.def rule.
+ * defines.h: Pull the RUBY_MBCHAR_MAXSIZE definition from trunk,
+ which is necessary for dir.c to compile on djgpp and emx.
-Sat Feb 24 10:38:05 2007 Minero Aoki <aamine@loveruby.net>
+Sat Feb 24 10:42:01 2007 Minero Aoki <aamine@loveruby.net>
* ext/racc/cparse/cparse.c (cparse_params_mark): remove useless
rb_gc_mark. Thanks Tomoyuki Chikanaga. [ruby-dev:30405]
-Sat Feb 24 07:31:35 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c: add WIN32OLE_VARIANT.array,
- WIN32OLE_VARIANT#value=, refactoring.
-
- * test/win32ole/test_win32ole_variant.rb: add some test for
- WIN32OLE_VARIANT.array, WIN32OLE_VARIANT#value=.
-
-Fri Feb 23 18:37:55 2007 Minero Aoki <aamine@loveruby.net>
-
- * test/ruby/test_yield.rb: new test.
-
- * yarvtest/test_yield.rb: removed (moved to test_yield.rb).
-
-Fri Feb 23 18:27:17 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * thread.c (rb_thread_polling): check interrupts here.
+Fri Feb 23 15:10:46 2007 NAKAMURA Usaku <usa@ruby-lang.org>
- * thread_win32.ci (w32_wait_events): rename from w32_wait_event(), and
- now receive multiple event handles.
-
- * win32/win32.c (wait_events, rb_w32_main_context): removed.
-
- * thread_win32.ci (rb_w32_wait_events): new function.
-
- * thread_win32.ci, win32/win32.c (rb_w32_sleep, rb_w32_Sleep): move
- from win32/win32.c to thread_win32.ci, and use w32_wait_events().
-
-Fri Feb 23 18:13:22 2007 Minero Aoki <aamine@loveruby.net>
-
- * test/ruby/test_optimization.rb: new test (merges test_opts.rb).
-
- * yarvtest/test_opts.rb: removed.
-
-Fri Feb 23 16:59:39 2007 Minero Aoki <aamine@loveruby.net>
-
- * test/ruby/test_assignment.rb: merge yarvtest/test_massign.
-
- * yarvtest/test_massign.rb: removed (merged to
- test_assignment.rb).
+ * win32/win32.c (set_pioinfo_extra): new function for VC++8 SP1
+ workaround. [ruby-core:10259]
-Fri Feb 23 15:58:20 2007 NAKAMURA Usaku <usa@ruby-lang.org>
+ * win32/win32.c (NtInitialize): call above function.
- * signal.c (sighandler): need to re-install sighandler on some
- platforms.
+Fri Feb 23 14:19:40 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-Fri Feb 23 15:05:57 2007 NAKAMURA Usaku <usa@ruby-lang.org>
+ * signal.c (sighandler): need to tell to be interrupted to main
+ context when handler is installed.
- * win32/win32.c (set_pioinfo_extra): simplified.
+ * win32/win32.[ch] (rb_win32_interrupted): new function to listen
+ interrupt.
-Fri Feb 23 14:23:20 2007 Minero Aoki <aamine@loveruby.net>
+Fri Feb 23 13:02:17 2007 Akinori MUSHA <knu@iDaemons.org>
- * test/ruby/test_literal.rb: new test.
+ * numeric.c (fix_cmp, fix_equal): Remove FIX2LONG() to optimize.
+ suggested in
+ http://t-a-w.blogspot.com/2007/02/making-ruby-faster.html.
+ [ruby-talk:240223]
-Fri Feb 23 12:40:12 2007 James Edward Gray II <james@grayproductions.net>
+Fri Feb 23 12:43:17 2007 James Edward Gray II <james@grayproductions.net>
* lib/xmlrpc/client.rb (XMLRPC::Client::do_rpc): Make the
Content-Length parameter optional for responses in
@@ -42661,85 +4323,12 @@ Fri Feb 23 12:40:12 2007 James Edward Gray II <james@grayproductions.net>
* lib/xmlrpc/create.rb (XMLRPC::Create::conv2value): Add DateTime
support to xmlrpc; approved by the maintainer.
-Fri Feb 23 12:24:46 2007 Minero Aoki <aamine@loveruby.net>
-
- * parse.y (lambda): add ripper event. This fixes bus error on
- "make test-all".
-
- * ext/ripper/extconf.rb: do not stop build.
-
-Fri Feb 23 12:16:05 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y: remove dyna_check_gen() prototype.
-
-Fri Feb 23 11:41:21 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y, compile.c, gc.c, insns.def, intern.h, iseq.c, node.h,
- object.c, string.c, variable.c, vm_macro.def: revert private
- instance variable feature, which is postponed until next major
- release.
-
- * marshal.c: TYPE_SYMBOL2 removed; MARSHAL_MINOR reverted back to
- 8th version.
-
-Fri Feb 23 10:53:21 2007 Shugo Maeda <shugo@ruby-lang.org>
-
- * thread_pthread.ci (native_mutex_lock): do not call
- pthread_mutex_trylock().
-
-Fri Feb 23 10:31:16 2007 Minero Aoki <aamine@loveruby.net>
-
- * dln.c: use dlopen on Mac OS X 10.3 or later.
-
-Fri Feb 23 10:03:49 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_ord): need not to check string length; ord
- returns a codepoint for the first character in the string.
-
-Wed Feb 21 22:29:45 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * numeric.c (fix_equal): A bit more optimization.
-
-Wed Feb 21 17:40:37 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * numeric.c (fix_equal): remove FIX2LONG() to optimize. suggested
- in http://t-a-w.blogspot.com/2007/02/making-ruby-faster.html.
- [ruby-talk:240223]
-
- * numeric.c (fix_cmp): ditto.
-
-Wed Feb 21 09:14:04 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Feb 19 18:22:52 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * eval_load.c (rb_require_safe): should restore safe level.
-
-Tue Feb 20 21:19:29 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (installed_code_page_proc,
- ole_variant2val): small refactoring.
-
-Tue Feb 20 15:11:42 2007 Koichi Sasada <ko1@atdot.net>
-
- * eval.c, vm.c, yarvcore.h: move definition of rb_call_super() to
- vm.c from eval.c. change th_call_super() to static function.
-
-Tue Feb 20 15:08:25 2007 Koichi Sasada <ko1@atdot.net>
-
- * test/io/nonblock/test_flush.rb: YARV doesn't raise any errors if
- another thread close IO object which current thread is blocking with.
-
-Tue Feb 20 15:03:29 2007 Koichi Sasada <ko1@atdot.net>
-
- * thread.c (do_select, rb_thread_wait_fd_rw): raise sys error if
- errno is not 0 and EBADF.
-
-Mon Feb 19 22:15:31 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (RUBY_REPLACE_TYPE): cache convertible type info.
-
- * intern.h (rb_detach_process): use rb_pid_t instead of pid_t.
-
- * ruby.h (PIDT2NUM, NUM2PIDT, UIDT2NUM, NUM2UIDT, GIDT2NUM, NUM2GIDT):
- defaulted to conversion using long.
+ * configure.in, defines.h, eval.c (rb_feature_p, rb_provided,
+ load_wait, search_required, rb_require_safe), ext/extmk.rb: Fix
+ a bug where a statically linked extension cannot be autoloaded.
+ [ruby-dev:30023] / [ruby-dev:30239]
Mon Feb 19 17:14:28 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
@@ -42747,45 +4336,10 @@ Mon Feb 19 17:14:28 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
message for #peeraddr. a patch from Sam Roberts
<sroberts at uniserve.com>. [ruby-core:10366]
-Sun Feb 18 22:56:07 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/etc/etc.c (etc_getgrgid): missed to replace a macro.
-
-Sun Feb 18 19:33:00 2007 Tadayoshi Funaba <tadf@dotrb.org>
+Sun Feb 18 19:35:21 2007 Tadayoshi Funaba <tadf@dotrb.org>
* lib/date/format.rb: updated based on date2 4.0.3.
-Sun Feb 18 13:11:51 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (pid_t, uid_t, gid_t): check if defined.
-
- * intern.h, process.c, rubyio.h, ext/etc/etc.c, ext/pty/pty.c: use
- rb_{pid,uid,gid}_t instead of plain int. [ruby-dev:30376]
-
- * ext/etc/extconf.rb (PIDT2NUM, NUM2PIDT, UIDT2NUM, NUM2UIDT, GIDT2NUM,
- NUM2GIDT): moved to configure.in.
-
-Fri Feb 16 21:34:33 2007 Koichi Sasada <ko1@atdot.net>
-
- * object.c (rb_obj_ivar_set/get/defined): fix to check :@_v/C id.
-
- * test/testunit/test_testcase.rb: fix to use instance_variable_get()
- to access @_result.
-
-Fri Feb 16 20:59:10 2007 Koichi Sasada <ko1@atdot.net>
-
- * intern.h: add a prototype of rb_sym_to_s().
-
-Fri Feb 16 19:24:22 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * math.c (math_log): update document to mention second optional
- argument for logarithm base.
-
-Fri Feb 16 19:19:21 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (mrhs): need to append by arg_append().
- [ruby-talk:239385]
-
Fri Feb 16 11:18:21 2007 Eric Hodel <drbrain@segment7.net>
* lib/.document: Apply patch for irb, e2mmap and README by Hugh Sasse
@@ -42793,108 +4347,35 @@ Fri Feb 16 11:18:21 2007 Eric Hodel <drbrain@segment7.net>
* lib/prettyprint.rb: Suppress RDoc for PrettyPrint test suite.
-Thu Feb 15 20:48:36 2007 NAKAMURA Usaku <usa@ruby-lang.org>
+Thu Feb 15 20:26:30 2007 Akinori MUSHA <knu@iDaemons.org>
- * win32/win32.c (set_pioinfo_extra): new function for VC++8 SP1
- workaround. [ruby-core:10259]
+ * lib/uri/ftp.rb: Revert the previous change pending discussion.
- * win32/win32.c (NtInitialize): call above function.
+Thu Feb 15 18:08:17 2007 Akinori MUSHA <knu@iDaemons.org>
+
+ * dir.c (glob_helper): Fix the function declaration.
-Thu Feb 15 16:25:54 2007 Akinori MUSHA <knu@iDaemons.org>
+Thu Feb 15 17:13:32 2007 Akinori MUSHA <knu@iDaemons.org>
+
+ * version.h: Welcome to the post-1.8.6 world. Radical changes are
+ inhibited in the ruby_1_8 branch until the 1.8.6 final release
+ goes out of the door.
+
+Thu Feb 15 16:44:14 2007 Akinori MUSHA <knu@iDaemons.org>
* lib/uri/generic.rb (URI::Generic::userinfo): Considering how
`scheme://user:@...', `scheme://:password@...' and
`scheme://:@...' are parsed, an empty user name or password
should be allowed and represented as it is.
-Thu Feb 15 01:52:53 2007 Koichi Sasada <ko1@atdot.net>
-
- * vm.(c|h), yarvcore.(c|h) (yarvGlobalStateVersion): rename to
- ruby_vm_global_state_version.
-
-Thu Feb 15 01:50:26 2007 Koichi Sasada <ko1@atdot.net>
-
- * test/fileutils/test_fileutils.rb (check_singleton): fix to use
- symbol instead of string.
-
- * test/io/nonblock/test_flush.rb: enable tests.
-
- * test/xmlrpc/test_webrick_server.rb: ditto.
-
-Thu Feb 15 01:43:45 2007 Koichi Sasada <ko1@atdot.net>
-
- * lib/delegate.rb: catch up with class local variable (@_v) spec.
-
- * lib/singleton.rb: ditto.
+Thu Feb 15 11:46:05 2007 KIMURA Koichi <hogemuta@gmail.com>
-Wed Feb 14 22:52:43 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+ * dir.c, win32/win32.c, win32/dir.h, ruby.h, intern.h: Bring
+ encoding aware globbing support in from trunk. Dir.[] and
+ Dir.glob() can now take many patterns in an array. Minor fixes
+ will follow.
- * ext/win32ole/win32ole.c (ole_variant2val): VC++6 does not
- support VT_I8, VT_UI8.
-
-Wed Feb 14 22:10:21 2007 Koichi Sasada <ko1@atdot.net>
-
- * configure.in: change stack limit to 2MB from 32MB.
-
- * win32/Makefile.sub: ditto.
-
-Wed Feb 14 21:39:36 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/digest/lib/digest.rb (Digest::self.const_missing): Drop
- autoloads for sha2 classes in favor of handling in
- const_missing(), to work around a problem exposed on OS X.
-
-Wed Feb 14 21:19:47 2007 Koichi Sasada <ko1@atdot.net>
-
- * thread_pthread.ci (native_thread_create): adjust 4KB (page size)
- alignment.
-
-Wed Feb 14 21:12:36 2007 Koichi Sasada <ko1@atdot.net>
-
- * thread_pthread.ci (CHECK_ERR): call rb_bug()
- instead of printf() and exit().
-
-Wed Feb 14 16:48:56 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/date/format.rb (Date::Format::Bag::method_missing): need not
- to use instance variables corresponding each method; use Hash
- instead.
-
-Wed Feb 14 13:12:06 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * re.c (reg_operand): allow symbols to be operands for regular
- expression matches.
-
- * string.c (Init_String): allow Symbol#===.
-
- * lib/date/format.rb (Date::Format::Bag::to_hash): string
- added prefixes.
-
-Wed Feb 14 12:58:38 2007 Koichi Sasada <ko1@atdot.net>
-
- * thread.c (do_select): fix to iterate select().
- on cygwin/mswin32, iterate in unblocking region.
-
- * thread.c (rb_thread_select): don't iterate on this function.
- (iterate in do_select).
-
-Wed Feb 14 11:39:18 2007 Koichi Sasada <ko1@atdot.net>
-
- * thread.c (set_unblock_function): fix function interface.
-
-Wed Feb 14 11:12:02 2007 Koichi Sasada <ko1@atdot.net>
-
- * eval_load.c, yarvcore.h: use rb_vm_t#loaded_features instead of
- rb_features (global variable).
-
- * yarvcore.c: mark rb_vm_t#loaded_features.
-
-Wed Feb 14 08:46:25 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * compile.c (defined_expr): no longer distinguish ordinary local
- variables and in-block local variables in defined? value.
-
-Wed Feb 14 03:14:42 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+Thu Feb 15 11:00:26 2007 Akinori MUSHA <knu@iDaemons.org>
* lib/uri/generic.rb (URI::Generic::userinfo): should support
empty password. [ruby-core:10290]
@@ -42902,644 +4383,147 @@ Wed Feb 14 03:14:42 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/uri/generic.rb (URI::Generic::set_password): password can be
cleared by nil. [ruby-core:10290]
-Wed Feb 14 03:10:33 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * lib/uri/common.rb (escape): regard second string argument as a
+ character set properly. [ruby-dev:27692]
- * parse.y (struct local_vars): no need to warn out-of-scope
- variables; remove dnames member from struct.
+ * lib/uri/ftp.rb: Attempt to conform to RFC 1738 with regard to
+ relative/absolute paths.
-Wed Feb 14 03:04:10 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * lib/uri: Lovely RDOC patches from mathew (metaATpoboxDOTcom).
- * parse.y: RVarmap no longer used as yytype; removed.
+Thu Feb 15 10:57:38 2007 Tietew <tietew@tietew.net>>
- * parse.y (dyna_push_gen): no longer need return value.
+ * lib/cgi.rb (CGI::unescapeHTML): invalid decoding for single
+ unescaped ampersand. a patch from Tietew
+ <tietew+ruby-dev at tietew.net> in [ruby-dev:30292].
+ fixed: [ruby-dev:30289]
- * parse.y (dyna_pop_gen): no longer need argument.
+Thu Feb 15 10:48:40 2007 MenTaLguY <mental@rydia.net>
- * parse.y (local_push_gen): initialize nofree.
+ * ext/thread/thread.c: Handle interrupted waits correctly.
+ [ruby-bugs:PR#8663]
-Wed Feb 14 00:30:07 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+Wed Feb 14 19:22:15 2007 Akinori MUSHA <knu@iDaemons.org>
- * ext/socket/socket.c (init_unixsock): path may contain NUL for
- abstract unix sockets. [ruby-core:10288]
+ * ext/digest/lib/digest.rb (Digest::self.const_missing): Drop
+ autoloads for sha2 classes in favor of handling in
+ const_missing(), to work around a problem exposed on OS X.
Tue Feb 13 02:21:12 2007 Sam Roberts <sroberts@uniserve.com>
* io.c (rb_f_syscall): Fix buffer overflow with syscall
arguments. [ruby-bugs:PR#8541]
-Mon Feb 12 13:57:30 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (ole_variant2val): support VT_I8, VT_UI8.
-
-Mon Feb 12 11:48:52 2007 Kouhei Sutou <kou@cozmixng.org>
+Sun Feb 11 07:46:45 2007 Akinori MUSHA <knu@iDaemons.org>
- * lib/rss/dublincore.rb, lib/rss/maker/dublincore.rb: dc_rightses
- -> dc_rights_list. dc_rightses still exists for backward
- compatibility. [ruby-core:8350]
+ * lib/cgi.rb (CGI::QueryExtension::read_multipart): Properly parse
+ a quoted-string in a Content-Disposition value.
- * test/rss/test_maker_dc.rb: added tests for dc_rights_list.
+Sun Feb 11 06:27:54 2007 Akinori MUSHA <knu@iDaemons.org>
-Sun Feb 11 22:40:17 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+ * configure.in, ext/thread/extconf.rb, lib/thread.rb: Add a
+ configure option `--disable-fastthread', to choose the original,
+ pure ruby version of the "thread" library instead of the new,
+ much faster implementation in ext/thread.
- * ext/win32ole/win32ole.c (ole_ptrtype2val): ole_type, ole_type_detail
- should not return "VARIANT,VARIANT".
+Sun Feb 11 06:22:20 2007 Akinori MUSHA <knu@iDaemons.org>
-Sun Feb 11 22:11:05 2007 Kouhei Sutou <kou@cozmixng.org>
+ * ext/Setup: Add thread except for platforms without threads
+ support.
- * lib/rss/xml-stylesheet.rb (RSS::XMLStyleSheet#initialize):
- kept backward compatibility.
+Sun Feb 11 06:15:16 2007 Akinori MUSHA <knu@iDaemons.org>
-Sun Feb 11 22:10:08 2007 Kouhei Sutou <kou@cozmixng.org>
+ * ext/thread/lib/thread.rb: Add a replacement of thread.rb that
+ loads this extension.
- * lib/rss/parser.rb (RSS::ListenerMixin#start_else_element): used
- const_defined? instead of constants.include?.
+Sun Feb 11 05:39:47 2007 Akinori MUSHA <knu@iDaemons.org>
-Sun Feb 11 18:47:14 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+ * lib/thread.rb: Remove an ineffective part of the code.
- * ext/win32ole/win32ole.c (ole_val2olevariantdata):
- WIN32OLE_VARIANT#new accepts nil when variant type is VT_ARRAY.
+Sun Feb 11 05:32:54 2007 Akinori MUSHA <knu@iDaemons.org>
- * test/win32ole/test_win32ole_variant.rb: ditto.
+ * ext/thread/thread.c (rb_thread_exclusive): Implement
+ Thread.exclusive.
- * ext/win32ole/win32ole.c: small refactoring.
+Sun Feb 11 05:26:51 2007 Akinori MUSHA <knu@iDaemons.org>
-Sun Feb 11 07:42:25 2007 Akinori MUSHA <knu@iDaemons.org>
+ * ext/thread/thread.c: Get rid of use of a dummy function.
- * lib/cgi.rb (CGI::QueryExtension::read_multipart): Properly parse
- a quoted-string in a Content-Disposition value.
+Sun Feb 11 01:45:31 2007 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-Sat Feb 10 20:21:29 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+ * ext/thread/thread.c (Init_thread): Define missing aliases:
+ Queue#enq and SizedQueue#enq.
- * ext/win32ole/win32ole.c: add WIN32OLE#ole_query_interface.
- thanks to Mikael Pahmp.
+Sat Feb 10 09:27:35 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
- * test/win32ole/test_win32ole.rb: ditto.
+ * ext/win32ole/win32ole.c (ole_variant2val): fix compile error
+ on VC++.
-Sat Feb 10 17:46:52 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat Feb 10 07:41:52 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
- * common.mk: targets which depend on yarvcore.h now depend on
- rubysig.h too.
-
- * yarvcore.h (rb_vm_t): use rb_atomic_t instead of int.
+ * ext/win32ole/win32ole.c (ole_variant2val): fix the bug when
+ SAFEARRAY pointer is NULL.
Sat Feb 10 00:13:11 2007 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tk.rb: fix typo (TkConfigMethod::__confinfo_cmd,
__conv_keyonly_opts).
-Fri Feb 9 12:33:40 2007 Koichi Sasada <ko1@atdot.net>
-
- * thread_win32.ci (w32_show_error_message): renamed to w32_error.
- this function do rb_bug().
-
- * thread_win32.ci (w32_set_event, w32_reset_event, w32_close_handle,
- w32_resume_thread): added. fix to use these functions instead calling
- win32api directly.
-
- * thread_win32.ci (w32_create_thread): create suspend thread
- (caller must call w32_resume_thread()).
-
-Fri Feb 9 11:03:40 2007 Koichi Sasada <ko1@atdot.net>
-
- * test/ruby/test_readpartial.rb: tests are working on mswin32/cygwin.
-
-Fri Feb 9 05:08:17 2007 Koichi Sasada <ko1@atdot.net>
-
- * thread.c, thread_pthread.ci, thread_win32.ci (thread_start_func_1):
- move cleanup function to thread_start_func_2().
-
- * thread.c, thread_pthread.ci, thread_win32.ci:
- add more destruct functions.
- (native_thread_destroy() and native_mutex_destroy())
-
- * thread_pthread.ci, thread_pthread.h: make native_mutex_* functions
- (check error, etc), it's not macro any more.
-
- * thread_win32.ci (thread_start_func_1): store some values before
- running thread (to release these after running thread).
-
- * thread_win32.ci (native_thread_create): fix spaces.
-
-Thu Feb 8 22:44:04 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (ole_set_safe_array, ole_variant2val,
- ole_val_ary2variant_ary): fix WIN32OLE_VARIANT.new bug when
- 1st argument is empty array, and when 2nd argument is
- VT_ARRAY|VT_BYREF.
-
- * test/win32ole/test_win32ole_variant.rb: ditto.
-
-Thu Feb 8 22:39:09 2007 Koichi Sasada <ko1@atdot.net>
-
- * yarvtest/yarvtest.rb: check target command names.
-
-Thu Feb 8 22:31:45 2007 Koichi Sasada <ko1@atdot.net>
-
- * test/ruby/test_clone.rb: fix to current spec
- (Module should not be occur many times in ancestors).
-
-Thu Feb 8 22:26:14 2007 Koichi Sasada <ko1@atdot.net>
-
- * test/ruby/test_string.rb: ("foo" == :foo) and ("foo" === :foo)
- should be false.
-
- * ChangeLog: fix last messages.
-
-Thu Feb 8 22:24:06 2007 Koichi Sasada <ko1@atdot.net>
-
- * test/ruby/test_module.rb: fix to use Symbol instead of String.
-
- * test/ruby/test_module.rb: remove space before argument parentheses.
-
-Thu Feb 8 22:02:14 2007 Koichi Sasada <ko1@atdot.net>
-
- * test/ruby/marshaltestlib.rb: eval(sym) -> eval(sym.to_s)
-
-Thu Feb 8 21:35:16 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * test/win32ole/test_propertyputref.rb (setup): fix typo.
-
- * test/win32ole/test_win32ole_event.rb: should not use
- InternetExplorer.gohome to test.
-
-Thu Feb 8 21:02:07 2007 Koichi Sasada <ko1@atdot.net>
-
- * thread.c (GVL_UNLOCK_RANGE): rename to BLOCKING_REGION().
-
- * thread.c (rb_thread_run_parallel): rename to
- rb_thread_blocking_region().
-
-Thu Feb 8 15:48:44 2007 Koichi Sasada <ko1@atdot.net>
-
- * yarvcore.h, thread.c: fix to use pthread on cygwin.
-
- * yarvcore.h, thread.c: move GVL_UNLOCK_BEGIN() and GVL_UNLOCK_END()
- from yarvcore.h to thread.c.
-
- * thread.c: change GVL_UNLOCK_RANGE() arguments
- (adding ubf as 2nd argument).
-
- * thread.c: fix to use polling in select on cygwin and mswin32.
-
- * thread.c, thread_pthread.ci, thread_win32.ci, yarvcore.h:
- rename:
- * rb_thread_t#interrupt_function -> unblock_function
- * rb_interrupt_function_t -> rb_unblock_function
- * some interrupt function name -> ubf_*
- * yarv_* -> *
-
-Thu Feb 8 16:08:02 2007 Koichi Sasada <ko1@atdot.net>
-
- * common.mk: fix to use RUNRUBY instead of BASERUBY if possible.
-
- * common.mk ($(INSNS) rule): remove $(PROGRAM) first.
-
-Thu Feb 8 15:43:05 2007 Koichi Sasada <ko1@atdot.net>
+Fri Feb 9 20:44:53 2007 Akinori MUSHA <knu@iDaemons.org>
- * process.c: fix to use rb_status_line_set/get/clear().
+ * ext/thread: Make style fixes (mostly de-K&R'ism) to match the
+ rest of the source code.
- * eval_intern.h: fix line break.
+ * ext/thread: Make USE_MEM_POOLS an extconf option.
-Thu Feb 8 15:00:14 2007 Koichi Sasada <ko1@atdot.net>
+Fri Feb 9 20:43:01 2007 Akinori MUSHA <knu@iDaemons.org>
- * blockinlining.c, error.c, eval.c, eval_error.h, eval_intern.h,
- eval_jump.h, eval_load.c, eval_safe.h, gc.c, proc.c, signal.c,
- thread.c, thread_pthread.ci, thread_win32.ci, vm.c, vm.h,
- vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
- fix typo (rb_thead_t -> rb_thread_t).
+ * ext/thread: Import the "fastthread" implementation by MenTaLguY
+ in the original form. This module is not hooked into the build
+ yet since it needs some style fixes and adjustments.
- * eval_intern.h: remove unused definitions.
+Fri Feb 9 15:46:09 2007 Akinori MUSHA <knu@iDaemons.org>
- * common.mk: fix around vm_opts.h path
- and remove harmful argument passed to insns2vm.rb.
+ * ext/bigdecimal: Synchronize with trunk. Better function
+ prototypes, removal of a useless method `!=', and document
+ updates.
-Thu Feb 8 03:11:47 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/cgi.rb (CGI::unescapeHTML): invalid decoding for single
- unescaped ampersand. a patch from Tietew
- <tietew+ruby-dev at tietew.net> in [ruby-dev:30292].
- fixed: [ruby-dev:30289]
-
-Wed Feb 7 23:25:31 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (specific_eval): suppress warning.
-
- * thread_win32.h: undefine _WIN32 on cygwin. [ruby-dev:30303]
-
-Wed Feb 7 22:41:34 2007 Koichi Sasada <ko1@atdot.net>
-
- * eval_intern.h: remove UNSUPPORTED() macro.
-
- * thread.c: fix to define Continuation methods
- (they only do rb_notimplement()).
-
-Wed Feb 7 22:33:58 2007 Koichi Sasada <ko1@atdot.net>
-
- * eval_intern.h, yarvcore.h: remove unused macro definition.
-
-Wed Feb 7 22:30:28 2007 Koichi Sasada <ko1@atdot.net>
-
- * eval.c: fixed to use ANSI function style.
-
-Wed Feb 7 09:35:32 2007 Koichi Sasada <ko1@atdot.net>
-
- * this commit is a result of refactoring. only renaming functions,
- moving definitions place, add/remove prototypes, deleting
- unused variables and removing yarv.h.
- This commit doesn't change any behavior of ruby/vm.
-
- * yarv.h, common.mk: remove yarv.h (contents are moved to yarvcore.h).
-
- * error.c, eval_intern.h: include yarvcore.h instead yarv.h
-
- * rename some functions:
- * debug.[ch]: debug_*() -> ruby_debug_*()
- * iseq.c: iseq_*() -> rb_iseq_*(), ruby_iseq_disasm()
- * iseq.c: node_name() -> ruby_node_name()
- * vm.c: yarv_check_redefinition_opt_method() ->
- rb_vm_check_redefinition_opt_method()
-
- * some refactoring with checking -Wall.
-
- * array.c: remove rb_ary_ptr() (unused) and remove unused
- local variables.
-
- * object.c: add a prototype of rb_mod_module_exec().
-
- * eval_intern.h (ruby_cref): set it inline.
-
- * eval_load.c (rb_load), yarvcore.c: yarv_load() -> rb_load_internal().
-
- * parse.y: add a prototype of rb_parse_in_eval() (in eval.c).
-
- * process.c: add a prototype of rb_thread_stop_timer_thread() (in thread.c).
-
- * thread.c: remove raw_gets() function (unused) and fix some format
- mismatch (format mismatches have remained yet. this is todo).
-
- * thread.c (rb_thread_wait_fd_rw): fix typo on label name.
-
- * thread_pthread.ci: comment out codes with USE_THREAD_CACHE.
-
- * vm.c (rb_svar, rb_backref_get, rb_backref_get,
- rb_lastline_get, rb_lastline_set) : moved from yarvcore.c.
-
- * vm.c (yarv_init_redefined_flag): add a prototype and rename
- yarv_opt_method_table to vm_opt_method_table.
-
- * vm.c (rb_thread_eval): moved from yarvcore.c.
-
- * yarvcore.c: remove unused global variables and fix to use nsdr().
-
-Wed Feb 7 03:39:32 2007 Koichi Sasada <ko1@atdot.net>
-
- * blockinlining.c, compile.c, compile.h, error.c, eval.c,
- eval_intern.h, eval_jump.h, eval_load.c, eval_method.h,
- eval_safe.h, gc.c, insnhelper.h, insns.def, iseq.c, proc.c,
- process.c, signal.c, thread.c, thread_pthread.ci, thread_win32.ci,
- vm.c, vm.h, vm_dump.c, vm_evalbody.ci, vm_macro.def,
- yarv.h, yarvcore.h, yarvcore.c: change type and macro names:
- * yarv_*_t -> rb_*_t
- * yarv_*_struct -> rb_*_struct
- * yarv_tag -> rb_vm_tag
- * YARV_* -> RUBY_VM_*
-
- * proc.c, vm.c: move functions about env object creation
- from proc.c to vm.c.
-
- * proc.c, yarvcore.c: fix rb_cVM initialization place.
-
- * inits.c: change Init_ISeq() order (after Init_VM).
-
- * ruby.h, proc.c: change declaration place of rb_cEnv
- from proc.c to ruby.c.
-
-Tue Feb 6 22:06:45 2007 NARUSE, Yui <naruse@ruby-lang.org>
+Tue Feb 06 22:06:45 2007 NARUSE, Yui <naruse@ruby-lang.org>
* ext/nkf/nkf-utf8/{nkf.c,utf8tbl.c}:
imported nkf 2007-01-28.
* Fixed: can't decode MIME encode JIS string.
- * Fixed: Fullwidth-halfwidth conversion.
+ * Fixed: Fullwitdh-halfwidth conversion.
* Support DoCoMo's and Softbank's EMOJI
* Support CP932, CP5022x, eucJP-ms UDC
* Support UTF-32 encoding
* Support beyond BMP
[ruby-dev:29700] [ruby-dev:29922] [ruby-dev:30144]
-Tue Feb 6 20:36:19 2007 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/rss.rb, lib/rss/parser.rb: followed current Ruby
- specification. [ruby-dev:30274]
-
-Tue Feb 6 20:29:44 2007 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/rss.rb, lib/rss/parser.rb: removed needless code for
- backward compatibility.
-
-Tue Feb 6 18:43:17 2007 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/net/ftp.rb: moved fixes for EPIPE to the correct
- place. [ruby-core:10204]
-
-Tue Feb 6 16:38:08 2007 Koichi Sasada <ko1@atdot.net>
-
- * vm_opts.h: set properties:
- svn:keywords: Author Date Id Revision
- svn:eol-style: native
-
-Tue Feb 6 15:55:46 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * variable.c (ivar_i): need to support class local instance
- variables.
-
-Tue Feb 6 15:44:11 2007 Koichi Sasada <ko1@atdot.net>
-
- * compile.c (iseq_compile_each): fix setting is_local flag.
-
- * yarvtest/test_class.rb: add a test for class local instance variable.
-
-Tue Feb 6 14:15:34 2007 Koichi Sasada <ko1@atdot.net>
-
- * compile.c, insns.def: remove (get|set)instancevariable2 and add a
- operand is_local to (get|set)instancevariable.
-
- * yarvtest/test_class.rb: add a test for class local instance variable.
-
- * parse.y (rb_decompose_ivar2): remove unused variable oid.
-
- * tool/insns2vm.rb: remove needless require.
-
-Tue Feb 6 11:18:41 2007 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/net/ftp.rb: check the control connection on EPIPE.
- Thanks, Simon Williams. [ruby-core:9547]
-
-Tue Feb 6 11:03:27 2007 Koichi Sasada <ko1@atdot.net>
-
- * complement last commit.
-
- * common.mk (*.inc): use VPATH.
-
- * vm_opts.h: renamed from vm_opts.h.base.
-
-Tue Feb 6 10:02:41 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * tool/insns2vm.rb: use vm_opts.h in VPATH.
-
-Tue Feb 6 03:47:58 2007 Koichi Sasada <ko1@atdot.net>
-
- * proc.c: support Binding#eval.
-
- * yarvtest/test_eval.rb: add a test for above change.
-
-Tue Feb 6 03:13:33 2007 Koichi Sasada <ko1@atdot.net>
-
- * proc.c: refactoring (remove K&R style, move Binding stuffs from
- Init_Proc() to Init_Binding()).
-
-Tue Feb 6 01:07:14 2007 Koichi Sasada <ko1@atdot.net>
-
- * intern.h: prepare rb_last_status_get() and rb_last_status_set().
- Use these functions instead of rb_last_status ([ruby-dev:30264]).
-
- * process.c: define above functions.
-
- * ext/pty/pty.c: use above functions.
-
- * io.c (pipe_finalize): ditto.
-
- * process.c: ditto.
-
-Mon Feb 5 21:26:56 2007 Koichi Sasada <ko1@atdot.net>
-
- * ruby.h: add a prototype of rb_id2str().
-
-Mon Feb 5 21:06:50 2007 Koichi Sasada <ko1@atdot.net>
-
- * eval_thread.c, common.mk: remove eval_thread.c.
-
- * yarvcore.c: rename cYarvThread to rb_cThread.
-
- * gc.c: remove YARV_* prefix.
-
- * gc.h: add an include guard and prototype of rb_gc_set_stack_end().
-
- * inits.c: fix to ANSI prototype style and reorder Init_*().
-
- * io.c (pipe_finalize): TODO: comment out last_status.
-
- * process.c, yarvcore.h: fix to use yarv_vm_t#last_status instead of
- rb_last_status and make last_status_get() to access $?.
-
- * yarvcore.c (vm_mark): mark yarv_vm_t#last_status.
-
- * ruby.h: add declarations of rb_cISeq and rb_cVM.
-
- * thread.c: move eval_thread.c codes to thread.c and remove yarv_*
- function prefix.
-
- * thread.c (thread_start_func_2): use yarv_thread_t#first_func if
- it is not null.
-
- * vm.c: fix copyright year.
-
- * yarvcore.c (Init_vm): rename to Init_VM().
-
-Mon Feb 5 04:09:48 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_frame_callee): check if prev_cfp can be accessible.
- a patch from Yoshinori Sano <yoshinori.sano at gmail.com> in
- [ruby-dev:30252]. solves [ruby-dev:30200] and [ruby-core:9856].
-
-Sun Feb 4 20:34:41 2007 Kouhei Sutou <kou@cozmixng.org>
-
- * test/rss/rss-assertions.rb: removed needless code for backward
- compatibility.
-
-Sun Feb 4 02:22:59 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/cgi.rb (CGI::QueryExtension::read_multipart): Remove a debug
- print.
-
-Sat Feb 3 23:51:58 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (rb_compose_ivar2): function to create a new ivar2
- symbol from a symbol and a class. back-ported from matzruby.
-
- * parse.y (rb_decompose_ivar2): reverse function of
- rb_compose_ivar2().
-
- * marshal.c (w_symbol): support class local instance variables.
-
- * marshal.c (r_object0): ditto.
-
- * compile.c (defined_expr): ditto.
-
- * compile.c (iseq_compile_each): ditto.
-
- * insns.def: add two new instructions: getinstancevariable2 and
- setinstancevariable2.
-
-Sat Feb 3 23:21:13 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * insns.def (setclassvariable): remove unnecessary operand.
-
- * compile.c (iseq_compile_each): ditto.
-
- * common.mk (insns_info.inc): add dependency for insns_info.inc.
-
-Sat Feb 3 14:32:58 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (ole_val2olevariantdata, ole_val2variant):
- fix the bug of WIN32OLE_VARIANT.new when variant type is
- VT_ARRAY.
-
- * ext/win32ole/sample/excel1.rb: rewrite using WIN32OLE_VARIANT.
-
- * test/win32ole/test_win32ole.rb: add some test.
-
- * test/win32ole/test_win32ole_variant.rb: ditto.
-
-Sat Feb 3 03:35:20 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * Makefile.in, */Makefile.sub, common.mk (vmasm): generalized.
-
- * common.mk (runruby, benchmark, benchmark-each, tbench): use
- PROGRAM for the file to be built.
-
- * proc.c (yarv_proc_alloc): needs return.
-
- * call_cfunc.ci, compile.c, compile.h, debug.h, eval.c,
- eval_error.h, eval_jump.h, eval_load.c, eval_thread.c, gc.c,
- insnhelper.h, insns.def, iseq.c, main.c, numeric.c, parse.y,
- range.c, ruby.h, signal.c, thread.c, thread_win32.ci, vm.c,
- vm.h, vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
- fixed indents and non-C90 comments.
-
- * regenc.h: revert to before YARV.
-
- * lib/mkmf.rb (create_makefile): make object files depend on
- extconf.h even if depend file exists.
-
-Fri Feb 2 23:39:42 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * common.mk (bin): add more dependency. a patch from Tadashi
- Saito <shiba at mail2.accsnet.ne.jp>. [ruby-dev:30245]
-
-Fri Feb 2 18:44:31 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * insns.def (setclassvariable): remove warn argument.
-
-Fri Feb 2 18:36:40 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * common.mk (compile.$(OBJEXT)): add config.h to vm.c and
- compile.c.
-
-Fri Feb 2 18:27:54 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c: remove duplicated global variables rb_cProc and
- rb_cBinding. [ruby-dev:30242]
-
-Fri Feb 2 00:13:44 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ruby.h (SYMBOL_P): make Symbol immediate again for performance.
-
- * string.c: redesign symbol methods.
-
-Thu Feb 1 23:25:21 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (rb_id2str): store Strings for operator symbols.
- [ruby-dev:30235]
-
-Thu Feb 1 21:04:39 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (assignable_gen): no need to generate NODE_CVDECL.
-
- * compile.c (iseq_compile_each): no NODE_CVDECL.
-
-Thu Feb 1 20:53:32 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * vm.c (eval_get_cvar_base): destination for class variable access
- is now strictly innermost surrounding class or module. warned
- if accessed from toplevel.
-
- * variable.c (rb_cvar_get): new class variable look-up scheme:
- 1) look up in the class. 2) if the class is singleton attached
- to a class (i.e. metaclass) then start look up in the attached
- class and its ancestors. 3) otherwise, look-up in ancestors of
- the class.
-
- * eval.c (cvar_cbase): destination for class variable access is
- the class/module that holds the method, or cbase outside of
- methods.
-
-Thu Feb 1 20:31:41 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * variable.c (rb_cvar_set): remove warn argument.
-
Wed Jan 31 14:52:09 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * eval.c (rb_iterate): need to PUSH_ITER in proper order.
+ [ruby-core:10125]
+
* test/ruby/test_iterator.rb (TestIterator::test_block_given_within_iterator):
add new test. [ruby-core:10125]
-Tue Jan 30 17:01:21 2007 NAKAMURA Usaku <usa@ruby-lang.org>
+Tue Jan 30 14:58:51 2007 NAKAMURA Usaku <usa@ruby-lang.org>
* string.c (rb_str_sub_bang): calling rb_str_modify() should be just
before actually modifying the string.
fixed: [ruby-dev:30211] (originally reported by zunda)
-Tue Jan 30 13:24:06 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * numeric.c (int_pred): add Integer#pred corresponding
- Integer#succ. [RCR#5]
-
Tue Jan 30 12:05:35 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* mkconfig.rb: autoconf 2.61 support. [ruby-core:10016]
-Mon Jan 29 23:52:32 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * tool/compile.rb: replace YARVCore by VM class.
-
-Mon Jan 29 17:52:44 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+Sat Jan 27 15:20:11 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/date/format.rb (Date::Format::Bag::method_missing): add
- prefix to avoid making t class-local instance variable.
+ * parse.y (dyna_var_lookup): should not alter dvar->val not to
+ destroy living value. [ruby-core:10076]
-Mon Jan 29 21:32:37 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c: add WIN32OLE.locale=, WIN32OLE.locale,
- WIN32OLE_VARIANT#vartype.
-
- * test/win32ole/test_win32ole.rb: add test for WIN32OLE.locale=,
- WIN32OLE.locale.
-
- * test/win32ole/test_win32ole_variant.rb: add test for
- WIN32OLE_VARIANT#vartype.
-
-Mon Jan 29 14:14:35 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * tool/parse.rb: replace YARVCore by VM class.
- http://d.hatena.ne.jp/ysano2005/20070128
-
-Sun Jan 28 08:41:49 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c: refactoring.
-
-Sat Jan 27 18:36:33 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (ole_val2olevariantdata): bug fix.
- WIN32OLE_VARIANT.new check that 1st argument should T_ARRAY
- when variant type is VT_ARRAY.
-
- * test/win32ole/test_win32ole_variant.rb: add some test.
-
-Fri Jan 26 23:55:56 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c: bug fix of WIN32OLE_VARIANT when variant
- type is VT_BYREF|VT_VARIANT.
-
- * test/win32ole/test_win32ole_variant_with_ie.rb: ditto.
+ * parse.y (dyna_init): ditto.
Fri Jan 26 12:03:39 2007 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
@@ -43556,195 +4540,62 @@ Fri Jan 26 12:03:39 2007 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tk/scrollable.rb: change primary name of modules
[ruby-dev:30080].
-Fri Jan 26 07:48:57 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enumerator.c (enumerator_init_copy): need to copy internal
- structure on clone and dup. [ruby-dev:30192]
-
-Wed Jan 24 20:34:51 2007 Kouhei Sutou <kou@cozmixng.org>
-
- * test/ruby/test_iterator.rb: removed a needless workaround.
-
Wed Jan 24 18:05:39 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* misc/ruby-mode.el (ruby-font-lock-syntactic-keywords): fix
regexp font-lock bug. [ruby-talk:235758]
+Tue Jan 23 11:02:33 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * lib/webrick/httprequest.rb (WEBrick::HTTPRequest::read_line):
+
Tue Jan 23 18:26:12 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/cgi.rb (CGI::QueryExtension::read_multipart): use == instead
of ===. [ruby-dev:30176]
-Tue Jan 23 15:39:25 2007 NAKAMURA Usaku <usa@ruby-lang.org>
+Tue Jan 23 10:48:17 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
- * Makefile.in, common.mk, configure.in, */{Makefile.sub, configure.bat,
- setup.mak}: add --with-baseruby configure option.
+ * hash.c: added documentation for Hash about how it uses eql? and
+ hash methods for the keys. [ruby-core:09995]
Mon Jan 22 14:57:25 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* ext/socket/socket.c: fix errors in socket sample code.
[ruby-core:09992]
-Sat Jan 20 21:05:18 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (fole_s_set_code_page): WIN32OLE.codepage=
- accepts installed codepage.
-
- * test/win32ole/test_win32ole.rb (test_s_codepage_changed): ditto.
-
-Sat Jan 20 11:18:49 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (ole_invoke, ole_invoke2, ole_propertyput):
- modify WIN32OLERuntimeError message.
-
- * test/win32ole/test_win32ole.rb: ditto.
-
-Sat Jan 20 06:45:21 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval_proc.c (method_receiver): add new method to get the bound
- receiver of the method object. [ruby-talk:234949]
-
- * eval_proc.c (method_name): new method to get the name of a
- method.
-
- * eval_proc.c (method_owner): a new method to get the class or
- module that defines the method.
-
-Fri Jan 19 17:12:23 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (Init_win32ole): add WIN32OLE_VARIANT::Empty,
- WIN32OLE_VARIANT::Null, WIN32OLE_VARIANT::Nothing.
-
- * test/win32ole/test_win32ole_variant.rb: ditto.
-
- * test/win32ole/test_nil2vtempty.rb(test_openSchema): ditto.
-
-Fri Jan 19 06:53:38 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (olevariant_free): fix memory leak.
-
- * ext/win32ole/win32ole.c (ole_val2olevariantdata):
- WIN32OLE_VARIANT.new accepts nil as first argument for some VARIANT
- TYPE.
-
- * test/win32ole/test_win32ole_variant.rb: ditto.
-
-Wed Jan 17 17:31:28 2007 Koichi Sasada <ko1@atdot.net>
-
- * some refactoring around yarvcore and proc.
-
- * eval_proc.c: renamed to proc.c.
-
- * common.mk: ditto.
-
- * yarvcore.h, yarvcore.c: rename or remove some global variables
- removed: mYarvCore, mYarvInsns
- renamed: cYarvISeq -> rb_cISeq,
- cYarvProc -> rb_cProc, cYarvBinding -> rb_cBinding
- ::YarvCore module is removed and ::YarvCore::VM class becomes ::VM.
- And change/remove some functions which added with YARV.
-
- * compile.c: ditto.
-
- * eval.c: ditto.
-
- * iseq.c: ditto.
-
- * vm.c: ditto.
-
- * inits.c: rename Init_yarvcore to Init_vm.
-
- * yarvcore.c, proc.c: move some functions and initialization
- from yarvcore.c to proc.c.
-
- * intern.h, proc.c: add global function rb_binding_new(void).
-
-Tue Jan 16 17:49:29 2007 Koichi Sasada <ko1@atdot.net>
-
- * vm.c (eval_search_super_klass): rename to search_super_klass() and
- use it by th_call_super().
-
- * insns.def: ditto.
-
-Tue Jan 16 17:48:11 2007 Koichi Sasada <ko1@atdot.net>
-
- * common.mk: fix ruby script path.
-
-Tue Jan 16 17:39:44 2007 Koichi Sasada <ko1@atdot.net>
-
- * vm.c (invoke_block): fix to specify self.
-
-Tue Jan 16 12:12:27 2007 Koichi Sasada <ko1@atdot.net>
-
- * env.h: removed
-
-Tue Jan 16 12:00:06 2007 Koichi Sasada <ko1@atdot.net>
-
- * eval_proc.c (rb_proc_new): added.
-
- * string.c (sym_to_proc): supported.
-
- * vm.c (invoke_block, th_invoke_yield, th_invoke_proc): fix to support
- rb_proc_new.
-
- * yarvcore.c: add a test code.
-
-Sat Jan 13 23:24:59 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+Sat Jan 13 23:54:48 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
* ext/win32ole/win32ole.c (ole_free, ole_type_free,
olemethod_free, olevariable_free, oleparam_free,
ole_event_free): fix memory leak. [ruby-core:09846]
-Wed Jan 10 00:10:23 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * array.c (rb_ary_replace): use ptr and len of orig instead of
- shared. fixed: [ruby-dev:30116]
-
-Tue Jan 9 17:48:38 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * file.c (rb_find_file): should not call fpath_check() with NULL.
- fixed: [ruby-core:09867]
-
-Tue Jan 9 12:29:20 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Jan 12 11:13:55 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/etc/etc.c (etc_getpwuid, etc_getgrgid): fix to correctly
- convert uid/gid from VALUE.
-
- * ext/etc/etc.c (etc_getpwuid): ditto.
-
-Tue Jan 9 03:54:38 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_upto): String#upto from empty string makes
- infinite loop. [ruby-core:09864]
-
- * string.c (rb_str_upto): use RSTRING_LEN().
+ convert uid/gid from VALUE. (backport of r11521)
-Sun Jan 7 18:36:05 2007 Koichi Sasada <ko1@atdot.net>
+Wed Jan 10 18:57:57 2007 Minero Aoki <aamine@loveruby.net>
- * thread.c (rb_thread_stop_timer_thread(), rb_thread_reset_timer_thread(),
- rb_thread_start_timer_thread()): added.
+ * ext/strscan/strscan.c (strscan_do_scan): should set kcode option
+ before match. [ruby-dev:29914]
- * thread_pthread.ci: add a native_thread_join() and move
- rb_thread_reset_timer_thread() definition to thread.c.
+ * test/strscan/test_stringscanner.rb: test it.
- * thread_win32.ci: ditto
+ * re.c: export kcode_set_option and kcode_reset_option (with "rb_"
+ prefix).
- * process.c: fix before_exec(), after_exec() to stop timer thread
- (and restart timer thread if exec failed). and fix to reset
- timer thread information when forked child process starts
- (to fix [ruby-core:09822]).
-
-Sun Jan 7 18:28:17 2007 Koichi Sasada <ko1@atdot.net>
+ * intern.h: ditto.
- * common.mk: add a "compare" rule and fix MATZRUBY variable
+Tue Jan 9 17:45:17 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-Sun Jan 7 17:47:16 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+ * file.c (rb_find_file): should not call fpath_check() with NULL.
+ fixed: [ruby-core:09867]
- * test/win32ole/test_win32ole.rb: add test for WIN32OLE#[],
- WIN32OLE#[]=.
+Tue Jan 9 03:54:38 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/win32ole/win32ole.c: update comment for rdoc of
- WIN32OLE#[] and WIN32OLE#[]=.
+ * string.c (rb_str_upto): String#upto from empty string makes
+ inifinite loop. [ruby-core:09864]
Sun Jan 7 12:13:26 2007 Eric Hodel <drbrain@segment7.net>
@@ -43759,330 +4610,36 @@ Sun Jan 7 10:32:12 2007 Eric Hodel <drbrain@segment7.net>
* test/rdoc/parsers/test_parse_c.rb:
Test RDoc::C_Parser#do_classes and Rdoc::C_Parser#find_class_comment.
-Sun Jan 7 09:31:18 2007 Tadayoshi Funaba <tadf@dotrb.org>
+Sun Jan 7 09:33:02 2007 Tadayoshi Funaba <tadf@dotrb.org>
* lib/date/format.rb: updated based on date2 4.0.1.
-Sat Jan 6 18:46:34 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (rb_io_getline_fast, rb_io_getline): increase lineno
- when met the delimiter or EOF. fixed: [ruby-dev:30081]
-
- * io.c (prepare_getline_args, rb_io_getline_1): split
- preparation of arguments and reading. [ruby-dev:30085]
-
-Sat Jan 6 13:48:36 2007 Koichi Sasada <ko1@atdot.net>
-
- * insns.def (send): fix to optimize send() with Symbol.
-
- * yarvtest/test_method.rb: add another test.
-
-Sat Jan 6 13:43:55 2007 Koichi Sasada <ko1@atdot.net>
-
- * common.mk: add PHONY dependency to some rules
-
-Sat Jan 6 11:50:33 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (argf_read): fix wrong replacement. [ruby-dev:30070]
-
-Sat Jan 6 09:10:52 2007 Koichi Sasada <ko1@atdot.net>
-
- * insns.def: support direct method dispatch with "send" or "funcall".
- This means that "obj.send :m" skips "BasicObject#send" invocation
- (method frame creation, etc) and "obj.m" invokes directly.
- If you make backtrace, there are no entries of "send" method.
-
- * compile.c (iseq_specialized_instruction): fix to support above
-
- * eval.c: ditto (remove "static" from rb_f_send and rb_f_funcall
-
- * yarvcore.c: ditto (add a external IDs for compiler)
-
- * yarvcore.h: ditto (add a VM_CALL_SEND_BIT macro)
-
- * yarvtest/test_method.rb: add tests for above changes
-
- * eval.c: remove unused "Kernel#send" declaration
-
-Sat Jan 6 08:29:17 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (Init_win32ole): add
- WIN32OLE::VARIANT::VT_EMPTY, WIN32OLE::VARIANT::VT_NULL
-
- * test/win32ole/test_win32ole_variant_m.rb (test_variant): ditto.
-
-Sat Jan 6 03:49:22 2007 Koichi Sasada <ko1@atdot.net>
-
- * benchmark/run.rb: change option format
-
- * common.mk: ditto
-
-Fri Jan 5 22:21:08 2007 Koichi Sasada <ko1@atdot.net>
-
- * benchmark/bm_app_pentomino.rb: use Array#dup instead of
- Array#clone
-
- * benchmark/bmx_temp.rb: removed
-
- * benchmark/run.rb: use run.rb instead of run_rite.rb
-
- * common.mk: ditto
-
- * benchmark/run_rite.rb: removed
-
- * common.mk: use $(srcdir)/test.rb to run a test program
- with "make run"
-
- * benchmark/bmx_temp.rb: removed and
- set svn:ignore (bmx_*.rb) to benchmark/
-
- * test.rb: set svn:ignore
-
-Fri Jan 5 21:03:08 2007 Koichi Sasada <ko1@atdot.net>
-
- * yarvtest/yarvtest.rb: fix to compare results
-
-Fri Jan 5 20:52:56 2007 Koichi Sasada <ko1@atdot.net>
-
- * compile.c, compile.h: add ADD_CALL_RECEIVER() macro.
-
- * insns.def (send): use GET_SELF() direct if FCALL.
-
- * eval.c (rb_f_send): check method dispatch type to permit
- invoking private method when dispatch type is FCALL/VCALL
-
- * insns.def (opt_ltlt): remove useless statement.
-
- * vm.h: remove unused macros.
-
-Fri Jan 5 20:50:31 2007 Koichi Sasada <ko1@atdot.net>
-
- * benchmark/run_rite.rb: fix to use readlines instead of
- read(...).lines (because 1.8 doesn't have String#lines).
-
-Fri Jan 5 20:28:19 2007 Koichi Sasada <ko1@atdot.net>
-
- * thread_win32.ci (rb_thread_reset_timer_thread):
- added ([ruby-dev:30086]).
-
-Fri Jan 5 20:20:36 2007 Koichi Sasada <ko1@atdot.net>
-
- * common.mk: add .SUFFIXES rule
-
-Fri Jan 5 15:58:15 2007 Koichi Sasada <ko1@atdot.net>
-
- * eval_method.h (rb_alias): fix to check search result
-
-Fri Jan 5 13:59:53 2007 Koichi Sasada <ko1@atdot.net>
-
- * eval_method.h (rb_add_method): fix to check old_node
-
-Fri Jan 5 12:03:07 2007 Koichi Sasada <ko1@atdot.net>
-
- * compile.c (iseq_compile_each, set_block_local_tbl):
- support NODE_LAMBDA (partly).
-
- * sample/test.rb: restore test of NODE_LAMBDA
-
- * test/ruby/test_lambda.rb: ditto
-
-Fri Jan 5 12:31:23 2007 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * thread_pthread.ci (native_sleep): fix tv_nsec overflow.
-
-Thu Jan 4 20:01:29 2007 Koichi Sasada <ko1@atdot.net>
-
- * common.mk: rename yarv-test-[all/each] to compare-test[/-each].
- purpose of "compare-test" rule is to compare ruby (trunk) and
- matzruby (branches/matzruby) binary in miniruby level. MATZRUBY
- parameter means an path to miniruby of matzruby binary. to do this
- comparison test, you should build matzruby branch.
-
- * yarvtest/yarvtest.rb: fix to use command line option as
- command names to be compared.
-
- * yarvtest/runner.rb: remove a debug output.
-
-Thu Jan 4 19:12:27 2007 Koichi Sasada <ko1@atdot.net>
-
- * common.mk: fix to use test.rb script in build directory.
- ($(srcdir)/test.rb -> test.rb)
-
-Thu Jan 4 17:28:05 2007 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/webrick/utils.rb (WEBrick::Utils::TimeoutHandler#initialize):
- Arrays could not be modified in its each block. [ruby-dev:30063]
-
-Thu Jan 4 16:57:14 2007 Koichi Sasada <ko1@atdot.net>
-
- * yarv_version.h: removed.
-
- * common.mk: remove yarv_version.h from rules
-
- * yarvcore.h (Init_yarvcore): remove useless constants
-
-Thu Jan 4 17:00:06 2007 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/ossl_asn1.c (Init_ossl_asn1):
- OpenSSL::ASN1::ASN1Data#value,#tag,#tag_class and
- OpenSSL::ASN1::BitString#unused_bits should be public.
-
-Thu Jan 4 13:45:10 2007 Koichi Sasada <ko1@atdot.net>
-
- * thread_pthread.ci: fix last changes around PTHREAD_STACK_MIN.
-
-Thu Jan 4 13:42:47 2007 Koichi Sasada <ko1@atdot.net>
-
- * common.mk: restore changes.
-
-Thu Jan 4 10:33:54 2007 Koichi Sasada <ko1@atdot.net>
-
- * thread_pthread.ci: fix to skip using PTHREAD_STACK_MIN.
- [ruby-dev:30063]
-
-Thu Jan 4 10:30:11 2007 Koichi Sasada <ko1@atdot.net>
-
- * benchmark/run_rite.rb (bm): fix to use lines.
-
-Wed Jan 3 18:49:15 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_io_getline): lineno update condition was wrong.
- [ruby-dev:30065]
-
- * io.c (rb_io_getline_fast): ditto.
-
Wed Jan 3 11:36:51 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* io.c (ruby_dup): start GC on ENOMEM as well.
-Tue Jan 2 10:29:54 2007 Eric Hodel <drbrain@segment7.net>
-
- * ext/zlib/zlib.c: fix to compile on YARV
- ruby_errinfo -> rb_errinfo()
-
-Mon Jan 1 08:07:06 2007 Koichi Sasada <ko1@atdot.net>
-
- * ext/tk/tcltklib.c: fix to compile on YARV
- ruby_errinfo -> rb_errinfo(),
- ruby_safe_level -> rb_safe_level().
-
-Mon Jan 1 07:57:17 2007 Koichi Sasada <ko1@atdot.net>
-
- * test/drb/test_drbssl.rb: fix to skip drb tests.
-
Mon Jan 1 06:13:11 2007 Eric Hodel <drbrain@segment7.net>
* lib/rdoc/parsers/c_parser.rb: Make Rdoc accessible. Update constant
value information.
+Mon Jan 1 06:13:11 2007 Eric Hodel <drbrain@segment7.net>
+
* ext/bigdecimal/bigdecimal.c: Update constant comments to provide
values for RDoc.
Mon Jan 1 06:05:55 2007 Eric Hodel <drbrain@segment7.net>
- * lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser#handle_constants):
+ * lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser#handle_constansts):
Allow RDoc comment to give friendly value for rb_define_const. Patch
by Daniel Berger <djberg96 at gmail.com>, [ruby-patches-7499].
- * lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser#handle_constants): Fix
+ * lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser#handle_constansts): Fix
whitespace handling in constant comments.
-Mon Jan 1 00:00:00 2007 Koichi Sasada <ko1@atdot.net>
-
- * Merge YARV
-
-Sun Dec 31 16:22:48 2006 Eric Hodel <drbrain@segment7.net>
-
- * array.c: Fix Array#reject.
-
-Sun Dec 31 00:46:25 2006 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date2.rb: removed.
-
-Sun Dec 31 00:15:13 2006 Tadayoshi Funaba <tadf@dotrb.org>
+Sun Dec 31 00:31:16 2006 Tadayoshi Funaba <tadf@dotrb.org>
* lib/date.rb, lib/date/format.rb: updated based on date2 4.0.
-Sat Dec 30 04:38:23 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enum.c (enum_each_with_index): reuse array for yield parameters.
-
- * enum.c (enum_min, enum_max): ditto.
-
-Sat Dec 30 04:25:29 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enum.c (enum_inject): reuse array for yield parameters.
-
-Sat Dec 30 02:54:22 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/stringio/stringio.c (strio_gets): accepts limit argument.
-
- * ext/stringio/stringio.c (strio_readline, strio_each,
- strio_readlines): ditto.
-
-Sat Dec 30 02:22:32 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/stringio/stringio.c (strio_getline): add limit capability.
-
- * io.c (rb_io_gets_m): accepts limit argument. [ruby-talk:231563]
-
- * io.c (rb_io_readline, rb_io_readlines, rb_io_each_line, argf_getline):
- ditto.
-
- * io.c (appendline): add limit capability.
-
- * io.c (rb_io_getline_fast, rb_io_getline): ditto.
-
- * io.c (rb_io_getline): small refactoring for DRY.
-
- * io.c (rb_io_s_foreach, rb_io_s_readlines): small refactoring.
-
-Thu Dec 28 15:27:38 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/cgi.rb (CGI::Cookie::initialize): use Array() again.
- [ruby-core:09781]
-
-Wed Dec 27 20:52:32 2006 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c: remove WIN32OLE::PROPERTY class.
-
- * ext/win32ole/tests/testWIN32OLE.rb: ditto.
-
-Wed Dec 27 10:04:11 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (rb_Array): returns 1-element array if the argument
- does not have to_ary nor to_a.
-
-Tue Dec 26 21:02:14 2006 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * test/win32ole/test_folderitem2_invokeverb.rb: The argument
- of Shell.NameSpace should not be file path.
-
-Tue Dec 26 06:13:08 2006 Minero Aoki <aamine@loveruby.net>
-
- * ext/bigdecimal/bigdecimal.c: remove useless method
- BigDecimal#!=. [ruby-dev:30050]
-
-Thu Dec 21 15:37:17 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_slice_bang): rdoc description bug fixed.
- [ruby-core:09754]
-
-Wed Dec 20 12:54:31 2006 Koichi Sasada <ko1@atdot.net>
-
- * Convert CVS repository to Subversion repository.
-
-Mon Dec 18 08:36:29 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/cgi.rb (CGI::Cookie::initialize): Array(string) no longer
- works. [ruby-core:09738]
-
-Fri Dec 15 00:19:53 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/Makefile.sub (COMPILE_RULES): latter rule has higher priority.
-
- * lib/mkmf.rb (create_makefile): remove static library before update,
- to get rid of sludge of Borland tlib.exe.
-
Thu Dec 14 18:29:13 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* ext/readline/readline.c: NetBSD editline does not have
@@ -44095,11 +4652,7 @@ Thu Dec 14 18:20:43 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/irb/locale.rb (IRB::Locale::puts): typo fixed. a patch from
NAKAMURA Usaku <usa@ruby-lang.org>. [ruby-dev:30012]
-Tue Dec 12 23:33:53 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/optparse.rb (Switch#parse_arg, Switch#conv_arg): splat failures.
-
-Mon Dec 11 11:51:10 2006 Akinori MUSHA <knu@iDaemons.org>
+Mon Dec 11 11:58:36 2006 Akinori MUSHA <knu@iDaemons.org>
* ext/digest/sha2/lib/sha2.rb: Moved one level up from under
the superfluous subdirectory digest/.
@@ -44120,132 +4673,83 @@ Sat Dec 9 21:39:24 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
Sat Dec 9 11:22:00 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/irb/locale.rb (IRB::Locale::search_file): use File.exist?
+ * lib/irb/locale.rb (IRB::Locale::search_file): ues File.exist?
instead of File.exists?. a patch from Yutaka Kanemoto
<kinpoco at gmail.com> in [ruby-dev:30000].
-Fri Dec 8 18:11:18 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * lib/optparse.rb: cannot put :nodoc: before method definition.
- put after it.
-
-Fri Dec 8 17:00:13 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * bin/rdoc: use File.exist? instead of File.exists?.
-
-Thu Dec 7 23:50:21 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (Init_Object): new method Dir.exist?(path).
- [ruby-core:09663]
-
- * file.c (Init_File): remove File.exists?; use File.exist?
- instead.
-
- * file.c: rename functions to test_* to rb_file_*_p.
-
Thu Dec 7 09:29:02 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/weakref.rb (WeakRef::__setobj__): should support
marshaling. [ruby-talk:228508]
-Wed Dec 6 23:58:36 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/delegate.rb (Delegator::marshal_load): need to call
+ __setobj__.
+
+Wed Dec 6 23:56:14 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* Makefile.in, common.mk (NULLCMD): moved for platforms that empty
command does not run. fixed: [ruby-dev:29994]
- * win32/win32.c (init_stdhandle): redirect unopened IOs to NUL.
- [ruby-core:09572]
-
-Tue Dec 5 19:01:42 2006 WATANABE Hirofumi <eban@ruby-lang.org>
+Wed Dec 6 17:17:26 2006 WATANABE Hirofumi <eban@ruby-lang.org>
- * configure.in (SITE_DIR): fixed to empty RUBY_SITE_LIB in config.h on
+ * configure.in (SITE_DIR): fixed to emtpy RUBY_SITE_LIB in config.h on
NetBSD. fixed: [ruby-dev:29358]
-Tue Dec 5 18:38:21 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/matrix.rb (Matrix::rank): use quo method to avoid integer
- division problem. [ruby-core:09644]
-
- * lib/matrix.rb (Matrix::rank_e): ditto.
-
Tue Dec 5 00:59:05 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* misc/ruby-mode.el (ruby-parse-partial): need to parse "/=" as
self assignment operator, not regex. [ruby-talk:227324]
-Tue Dec 5 00:19:14 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * intern.h, object.c, variable.c (rb_mod_constants): added an optional
- flag to search ancestors, which is defaulted to true, as well as
- const_defined? and const_get. [ruby-dev:29989]
-
-Mon Dec 4 23:49:28 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * instruby.rb (install_recursive): get rid of warning.
-
- * lib/optparse.rb (CompletingHash#match): get rid of splat failure.
-
-Mon Dec 4 19:16:39 2006 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/digest/lib/digest/hmac.rb: Do alias << update.
-
Mon Dec 4 10:48:03 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* ruby.h (OFFT2NUM): use LONG2NUM() if sizeof(long) equals to
sizeof(off_t).
-Mon Dec 4 08:32:25 2006 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/cgi.rb (CGI::QueryExtension::read_multipart): should quote
- boundary. JVN#84798830
-
-Sun Dec 3 16:16:53 2006 Akinori MUSHA <knu@iDaemons.org>
+Mon Dec 4 10:43:46 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/digest/lib/digest/hmac.rb: Fix problems with update
- timing. [Reported by: oss-ruby@technorama.net]
+ * parse.y (dyna_init_gen): dvar initialization only if dvar is
+ assigned inner block. [ruby-talk:227402]
-Sat Dec 2 07:33:53 2006 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Mon Dec 4 08:32:49 2006 Shugo Maeda <shugo@ruby-lang.org>
- * lib/webrick/httputils.rb (WEBrick::HTTPUtils::FormData::<<):
- HTTPUtils::parse_header() takes a string. [ruby-dev:29931]
-
- * lib/webrick/httputils.rb (WEBrick::HTTPUtils::parse_header):
- String does no longer have each method.
-
- * lib/webrick/httputils.rb (WEBrick::HTTPUtils::parse_form_data):
- ditto.
+ * lib/cgi.rb (CGI::QueryExtension::read_multipart): should quote
+ boundary. JVN#84798830
Sat Dec 2 07:09:04 2006 GOTOU Yuuzou <gotoyuzo@notwork.org>
* ext/openssl/ossl_ocsp.c: OpenSSL::OCSP::OSCPError should be
subclass of OpenSSL::OpenSSLError. [ruby-dev:29980]
+Fri Dec 1 17:01:49 2006 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * gc.c (ruby_init_stack): decrease "stack level too deep" in Windows.
+ merge from trunk.
+
Fri Dec 1 16:31:53 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/tcltklib.c: shouldn't run the killed thread at callback.
[ruby-talk: 227408]
-Tue Nov 28 17:25:11 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+Mon Nov 27 17:18:27 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * array.c (ary_iter_check): should check modification (size
- change) during iteration.
-
- * array.c (rb_ary_initialize, rb_ary_shift, rb_ary_unshift,
- rb_ary_splice, rb_ary_reverse, rb_ary_sort, rb_ary_delete,
- rb_ary_delete_at, rb_ary_reject_bang, rb_ary_replace,
- rb_ary_clear, rb_ary_fill, rb_ary_uniq_bang, rb_ary_compact,
- rb_ary_shuffle): add iteration check.
-
-Mon Nov 27 09:00:15 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_ord): typo fixed. reported from Kornelius
- Kalnbach <murphy@rubychan.de>. [ruby-core:09621]
+ * sprintf.c (rb_f_sprintf): need not to truncate string if no
+ width specifier given for %s. [ruby-dev:29952]
Sun Nov 26 16:36:46 2006 URABE Shyouhei <shyouhei@ruby-lang.org>
* version.h: addition of RUBY_PATCHLEVEL.
* version.c: ditto.
+Fri Nov 24 10:17:51 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * bignum.c (bignorm): avoid segmentation. a patch from Hiroyuki
+ Ito <ZXB01226@nifty.com>. [ruby-list:43012]
+
+Thu Nov 23 10:38:40 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c (rb_mod_define_method): set implicit visibility only when
+ it's called for the target class (ruby_cbase).
+
Wed Nov 22 16:00:49 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/extconf.rb: support --with-X11/--without-X11 option.
@@ -44256,57 +4760,28 @@ Wed Nov 22 16:00:49 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/tkutil/extconf.rb: able to be called manually
[ruby-talk:225950].
-Sat Nov 18 23:39:20 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (rb_obj_tap): a new method. [ruby-talk:224013]
-
Wed Nov 15 23:22:54 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* file.c (test_grpowned, rb_stat_grpowned): should honor
supplementary group IDs. [ruby-core:09546]
-Tue Nov 7 18:35:18 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (formal_assign): need to pack rest arg information in
- argc.
-
-Tue Nov 7 18:05:01 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk/itemconfig.rb: minor bug fix.
-
-Tue Nov 7 17:52:08 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * class.c (rb_include_module): revert duplicate inclusion of
- modules. [ruby-dev:29793]
-
-Tue Nov 7 17:18:11 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (method_missing): update old argument adjustment.
-
-Tue Nov 7 16:41:21 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (when_check): need to splat for NODE_ARGSCAT as well.
- [ruby-dev:29860]
-
-Mon Nov 6 22:23:52 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (Init_String): remove duplicated definition of
- Symbol#to_s.
+Thu Nov 9 03:15:22 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-Mon Nov 6 18:54:13 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * eval.c (BEGIN_CALLARGS): ruby_block may be NULL even when
+ ITER_PRE.
- * eval.c (svalue_to_avalue): need to splat but no error.
+Tue Nov 7 18:34:34 2006 Akinori MUSHA <knu@iDaemons.org>
- * eval.c: new macros - YIELD_CALL, YIELD_VALUES.
+ * ext/digest/lib/digest/hmac.rb: Keep this out of the 1.8 tree
+ until we reach a consensus that HMAC should be put under Digest.
- * eval.c (rb_yield_values): specify YIELD_VALUES.
+Tue Nov 7 18:05:01 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * eval.c (rb_yield_0): use new macros.
+ * ext/tk/lib/tk/itemconfig.rb: minor bug fix.
- * eval.c (proc_invoke): slightly modified to separate YIELD_CALL
- and YIELD_VALUES from YIELD_ARY_ARGS.
+Mon Nov 6 20:11:20 2006 Kouhei Sutou <kou@cozmixng.org>
- * object.c (Init_Object): add nil.to_splat => [].
+ * lib/rss/0.9.rb (RSS::Rss): removed needless include.
Mon Nov 6 15:41:55 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
@@ -44314,9 +4789,9 @@ Mon Nov 6 15:41:55 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
fix on 'itemconfiginfo' method, and modify to make it easy to
override 'itemconfiginfo' method.
- * ext/tk/lib/tkextlib/tile/treeview.rb: support Tile 0.7.8.
+ * ext/tk/lib/tkextlib/tile/treeview.rb : support Tile 0.7.8.
- * ext/tk/lib/tkextlib/version.rb: [new] add Tk::Tkextlib_RELEASE_DATE
+ * ext/tk/lib/tkextlib/version.rb : [new] add Tk::Tkextlib_RELEASE_DATE
to get the information from scripts.
* ext/tk/lib/tk.rb: load 'tkextlib/version.rb', and update RELEASE_DATE
@@ -44333,17 +4808,14 @@ Mon Nov 6 15:41:55 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
real console. IRB works on a text widget without I/O blocking. That
is, thread switching on IRB will work properly, even if on Windows.
-Mon Nov 6 00:42:05 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (arg_dup_check): vid may be nameless internal id.
-
-Sun Nov 5 19:52:19 2006 Tadayoshi Funaba <tadf@dotrb.org>
+Sun Nov 5 19:53:49 2006 Tadayoshi Funaba <tadf@dotrb.org>
* lib/date.rb: updated based on date2 3.9.7.
-Sat Nov 4 13:09:31 2006 Shugo Maeda <shugo@ruby-lang.org>
+Sat Nov 4 13:13:57 2006 Shugo Maeda <shugo@ruby-lang.org>
* lib/net/imap.rb: accept NOMODSEQ. [ruby-core:9002]
+ (backported from HEAD)
Fri Nov 3 00:16:37 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
@@ -44351,49 +4823,17 @@ Fri Nov 3 00:16:37 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
for AIX. a patch from Yutaka Kanemoto <kinpoco AT gmail.com>.
[ruby-dev:29744]
-Thu Nov 2 14:19:44 2006 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/set.rb (Set#^): Fix XOR operation against a container that
- holds duplicate values. [ruby-core:9372]
+Thu Nov 2 15:43:39 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-Thu Nov 2 10:00:06 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c: class Symbol is no longer subclass of String. also
- covers [ruby-core:09366]
-
-Thu Nov 2 08:21:07 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/xmlrpc/create.rb (XMLRPC::Create::conv2value): Symbol should
- come earlier than String.
-
- * lib/soap/mapping/rubytypeFactory.rb (RubytypeFactory::obj2soap):
- ditto.
+ * parse.y (primary): should set NODE even when compstmt is NULL.
+ merge from trunk. fixed: [ruby-dev:29732]
- * lib/set.rb (TC_Set::test_s_new): strings are no longer
- Enumerable
+Thu Nov 2 14:48:30 2006 Akinori MUSHA <knu@iDaemons.org>
- * lib/soap/property.rb (Property::load): ditto.
-
- * lib/webrick/httputils.rb (WEBrick::HTTPUtils::parse_header): ditto.
-
- * lib/soap/mimemessage.rb (MIMEMessage::Headers::parse): ditto.
-
-Thu Nov 2 09:08:04 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c: revert lfree shift/unshift boost patch to avoid unknown
- memory error.
-
-Wed Nov 1 23:24:42 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ruby.h (struct RArray): revert embedding ptr in RVALUE.
-
- * array.c: ditto.
-
-Wed Nov 1 23:01:55 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (hash): use Bob Jenkins' hash algorithm.
+ * lib/set.rb (Set#^): Fix XOR operation against a container that
+ holds duplicate values. [issue: #6444]
-Wed Nov 1 02:22:31 2006 Akinori MUSHA <knu@iDaemons.org>
+Wed Nov 1 02:41:38 2006 Akinori MUSHA <knu@iDaemons.org>
* ext/digest/lib/digest/hmac.rb (Digest::HMAC::update): Minor
optimization.
@@ -44406,6 +4846,8 @@ Wed Nov 1 01:05:13 2006 NAKAMURA Usaku <usa@ruby-lang.org>
* eval.c (rb_call0): fixed bug of zsuper with both of opt and rest.
fixed: [ruby-list:42928]
+ * test/ruby/test_super.rb: add tests to check above bug.
+
Tue Oct 31 17:03:21 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* time.c (time_dup): duplicate the class of original time.
@@ -44414,11 +4856,6 @@ Tue Oct 31 17:03:21 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/time.rb (Time::make_time, Time::rfc2822, Time::httpdate):
should respect subclasses. [ruby-core:09357]
-Tue Oct 31 16:25:22 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (ary_shared_first): should address offset after
- ary_shared_array(). [ruby-core:09358]
-
Mon Oct 30 23:40:52 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* Makefile.in (miniruby): add XLDFLAGS.
@@ -44430,7 +4867,7 @@ Mon Oct 30 23:40:52 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* win32/win32.c (cmdglob, rb_w32_cmdvector, rb_w32_opendir,
rb_w32_get_environ): not to use GC before initialization.
-Mon Oct 30 19:28:02 2006 NAKAMURA Usaku <usa@ruby-lang.org>
+Mon Oct 30 19:29:20 2006 NAKAMURA Usaku <usa@ruby-lang.org>
* bignum.c (rb_big2str0): use better approximation.
@@ -44443,96 +4880,62 @@ Mon Oct 30 12:34:02 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (rb_eval): fix commit miss. [ruby-dev:29707]
+Mon Oct 30 12:20:58 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * bignum.c (rb_big2str0): a bug in length adjustment.
+
Mon Oct 30 11:15:40 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* sprintf.c (rb_str_format): should preserve leading zero
information for negative %b and %x. [ruby-talk:221347]
-Sun Oct 29 19:51:31 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
-
- * regexec.c: invalid offset value was used in STATE_CHECK_BUFF_INIT().
-
-Sat Oct 28 20:13:18 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
-
- * oniguruma.h: Version 4.4.5
-
- * regint.h: ditto.
-
- * regerror.c: ditto.
-
- * regexec.c: ditto.
-
- * regcomp.c ditto.
-
- * regparse.c ditto.
-
-Sat Oct 28 07:56:13 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * marshal.c (r_object0): missing break. [ruby-core:09345]
-
-Fri Oct 27 17:30:31 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enumerator.c (enum_each_cons): move RETURN_ENUMERATOR() after
- argument check.
-
-Thu Oct 26 21:05:48 2006 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Thu Oct 26 21:05:58 2006 GOTOU Yuuzou <gotoyuzo@notwork.org>
* ext/openssl/ossl_pkcs7.c (ossl_pkcs7_verify): should clear error.
(fix http://bugs.debian.org/394336)
* ext/openssl/ossl_ns_spki.c (ossl_spki_initialize): ditto.
-Thu Oct 26 15:23:47 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enumerator.c: remove by_slice and by_cons.
-
-Thu Oct 26 15:12:12 2006 NAKAMURA Usaku <usa@ruby-lang.org>
+Thu Oct 26 15:21:10 2006 NAKAMURA Usaku <usa@ruby-lang.org>
* ext/digest/digest.c (Init_digest): typo.
-Wed Oct 25 17:16:05 2006 Akinori MUSHA <knu@iDaemons.org>
-
- * test/digest/test_digest_hmac.rb: added.
-
-Wed Oct 25 16:34:31 2006 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/digest/test.sh: make this script work again.
-
-Wed Oct 25 07:59:42 2006 Tadayoshi Funaba <tadf@dotrb.org>
+Wed Oct 25 17:23:28 2006 Akinori MUSHA <knu@iDaemons.org>
+
+ * ext/digest, test/digest/test_digest.rb: Merge from trunk:
+ - Introduce versioning in Digest::Base API, and prefix C
+ constants with RUBY_ and C type names with rb_ to avoid name
+ clash in writing extensions.
+ - Introduce Digest::Class and Digest::Instance for ease of
+ implementing subclasses and add-ons.
+ - Digest::Instance module requires and assumes that any instance
+ be resettable and clonable. An instance method #new() is
+ added so digest instances work just like digest classes.
+ - The constructor does no longer take an initial string to feed;
+ digest() and hexdigest() now do, instead. This allows digest
+ classes to take their own hashing parameters.
+ - Make some changes to digest() and hexdigest() class methods,
+ which now take extra arguments, which are passed through to
+ the constructor in an internal call.
+ - Add #digest_length/size/length() and #block_length(),
+ - Add the Digest::SHA2 class to wrap up SHA2 variants: SHA256,
+ SHA384 and SHA512, hoping this module would make a decent
+ example of a digest subclass written in Ruby.
+ - Rip BubbleBabble support out of the base class and have a
+ separate module named digest/bubblebabble.
+ - Remove RD documents in favor of newly written and embedded
+ RDoc documentation.
+
+Wed Oct 25 08:03:23 2006 Tadayoshi Funaba <tadf@dotrb.org>
* lib/date/format.rb: updated based on date2 3.9.6.
[ruby-core:09323]
-Wed Oct 25 00:58:19 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/mkexports.rb, win32/resource.rb: use unique variable names.
-
-Tue Oct 24 19:18:53 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enumerator.c (enumerator_by_slice): new method added.
-
- * enumerator.c (enumerator_by_cons): ditto.
-
-Tue Oct 24 18:56:13 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enumerator.c (enum_each_slice, enum_each_cons): returns
- Enumerable::Enumerator if no block is given. [ruby-dev:29246]
-
- * enumerator.c: remove methods: enum_with_index, enum_slice,
- enum_cons. [ruby-dev:29246]
-
-Tue Oct 24 18:51:27 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enum.c (enum_zip): add RETURN_ENUMERATOR() to zip method.
-
-Mon Oct 23 04:30:04 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * marshal.c (r_object0): use return value from proc given as the
- second argument to Marshal#load() to allow value replacement in
- the restoring data.
-
Sun Oct 22 14:48:31 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * signal.c (ruby_signal): don't set SA_RESTART. a backport from
+ the HEAD. [ruby-talk:220937] [ruby-talk:147220]
+
* signal.c (Init_signal): avoid duplicated installation of SIGCHLD
handler.
@@ -44541,57 +4944,14 @@ Sun Oct 22 16:47:56 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* string.c (rb_str_substr): should be infected with only original
string, but not the shared string. fixed: [ruby-core:09152]
- * string.c (rb_str_new4): keep shared string untainted when original
+ * string.c (rb_str_new4): keep shared string untainted when orignal
string is tainted. fixed: [ruby-dev:29672]
-Sun Oct 22 07:55:11 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_upcase, rb_str_downcase, rb_str_downcase,
- rb_str_upcase_bang, rb_str_downcase_bang, rb_str_swapcase_bang):
- add RDoc description that case conversion to be effective only
- in ASCII region.
-
Sun Oct 22 05:20:34 2006 URABE Shyouhei <shyouhei@ice.uec.ac.jp>
* configure.in: alloca is broken; use C_ALLOCA instead.
[ruby-dev:29416]
-Sat Oct 21 17:50:40 2006 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/digest/lib/digest.rb: Follow the framework updates.
-
-Fri Oct 20 22:00:43 2006 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/digest/lib/digest/hmac.rb: Complete half-boiled updates.
-
- * ext/digest/sha2/lib/digest/sha2.rb: Fix #initialize_clone().
-
-Fri Oct 20 20:28:37 2006 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/digest: Prefix C constants with RUBY_ and C type names with
- rb_ to avoid name clash in writing extensions.
-
- * ext/digest: Introduce Digest::Class and Digest::Instance for
- ease of implementing subclasses and add-ons, inspired by
- gotoyuzo.
-
- * ext/digest: The Digest::Instance module now requires and assumes
- that any instance be resettable and clonable, and add some
- convenient instance methods such as "new()", for creating a new
- copy, parameter taking "digest()" and "hexdigest()", for instant
- calculation. These methods make digest instances work just like
- digest classes.
-
- * ext/digest/sha2/lib/digest/sha2.rb:
- Add the Digest::SHA2 class to wrap up SHA2 variants: SHA256,
- SHA384 and SHA512, hoping this module would make a decent
- example of a digest subclass written in Ruby.
-
- * ext/digest/lib/digest.rb: Adjust autoload entries for SHA2
- classes.
-
- * ext/digest/lib/digest/hmac.rb: Follow the framework updates.
-
Fri Oct 20 10:47:43 2006 NAKAMURA Usaku <usa@ruby-lang.org>
* lib/mkmf.rb: fixed the bug of handling COMMON_MACROS.
@@ -44618,39 +4978,10 @@ Wed Oct 18 23:02:40 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* win32/win32.c (rb_w32_utime): allow NULL to set the current time.
[ruby-talk:219248]
-Wed Oct 18 13:25:50 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_each_line): String#lines now works when a block
- is given. in other words, lines become an alias to each_line.
- [ruby-core:09218]
-
- * string.c (rb_str_each_byte): ditto for bytes in place of lines.
-
Wed Oct 18 00:55:33 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (parser_yylex): use particular enums. [ruby-core:09221]
-Tue Oct 17 22:03:08 2006 Minero Aoki <aamine@loveruby.net>
-
- * lib/erb.rb: String#each was removed, use #each_line instead.
-
-Tue Oct 17 12:27:32 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (ary_shared_array): should set NOEMBED flag for a copied
- array.
-
-Tue Oct 17 08:04:31 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_lines): now takes optional argument for the
- line separator.
-
- * io.c (rb_io_lines, rb_io_bytes): new methods.
-
-Mon Oct 16 23:33:18 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_unshift_m): a bug in lfree shift length
- calculation.
-
Mon Oct 16 08:30:43 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* mkconfig.rb: *OBJS are not needed for extension libraries.
@@ -44658,11 +4989,6 @@ Mon Oct 16 08:30:43 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* {bcc32,wince,win32}/Makefile.sub (config.status): fixed typo,
missing comma.
-Mon Oct 16 00:44:26 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * pack.c (pack_unpack): execute block if given with unpacked value
- instead of creating an array. an idea from Tim Bray.
-
Sun Oct 15 01:03:08 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/test/unit/collector/dir.rb (Collector::Dir#collect): append base
@@ -44682,49 +5008,16 @@ Sat Oct 14 23:25:31 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
contain format specifiers. a patch from Akinori MUSHA <knu at
iDaemons.org>. [ruby-dev:29657]
- * regparse.c (onig_rb_warning, onig_rb_warn): ditto.
-
* ext/bigdecimal/bigdecimal.c (VpException): ditto.
* ext/dl/handle.c (rb_dlhandle_initialize): ditto.
* ext/gdbm/gdbm.c (rb_gdbm_fatal): ditto.
-Sat Oct 14 08:15:42 2006 Akinori MUSHA <knu@iDaemons.org>
+Sat Oct 14 08:24:45 2006 Akinori MUSHA <knu@iDaemons.org>
- * ext/digest/digest.c, ext/digest/digest.h,
- ext/digest/md5/md5init.c, ext/digest/rmd160/rmd160init.c,
- ext/digest/sha1/sha1init.c, ext/digest/sha2/sha2init.c:
- Introduce API versioning.
-
- * ext/digest/digest.c, ext/digest/digest.h,
- ext/digest/md5/md5init.c, ext/digest/rmd160/rmd160init.c,
- ext/digest/sha1/sha1init.c, ext/digest/sha2/sha2init.c: Remove
- the constants DIGEST_LENGTH and BLOCK_LENGTH and turn them into
- instance methods digest_length() and block_length(). Class
- methods with the same names are also provided, which take extra
- parameters for a digest method.
-
- * ext/digest/lib/digest/hmac.rb: Completely redesign the somewhat
- bizarre API, now that Digest classes can take hashing
- parameters.
-
-Sat Oct 14 05:54:05 2006 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/digest/digest.c: Improve RDoc documentation further more.
-
-Sat Oct 14 04:33:33 2006 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/digest/digest.c: Improve RDoc documentation.
-
- * ext/digest/digest.c (Init_digest, rb_digest_base_s_digest,
- rb_digest_base_s_hexdigest): Make Digest::Base::digest() and
- Digest::Base::hexdigest() take extra arguments, which are passed
- through to the constructor in an internal call.
-
- * ext/digest/bubblebabble/bubblebabble.c
- (rb_digest_base_s_bubblebabble): Ditto for
- Digest::Base::bubblebabble().
+ * ext/digest/lib/digest/hmac: Back out the addition of digest/hmac
+ for now because the API is too premature for a stable branch.
Sat Oct 14 00:55:08 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
@@ -44733,58 +5026,20 @@ Sat Oct 14 00:55:08 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* bcc32/configure.bat: get rid of a quirk of Borland make, which
sets empty macro in command line to "1".
-Fri Oct 13 22:49:02 2006 Tadayoshi Funaba <tadf@dotrb.org>
+Fri Oct 13 22:50:43 2006 Tadayoshi Funaba <tadf@dotrb.org>
* lib/date.rb: updated based on date2 3.9.5.
-Fri Oct 13 21:00:01 2006 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/digest/lib/digest.rb (Digest): Try to auto-load non-standard
- digest modules when a specified digest class is missing.
-
- * ext/digest/lib/digest.rb: Define Digest(name) for ease of
- dynamically selecting a hashing algorithm.
+Fri Oct 13 22:33:28 2006 Minero Aoki <aamine@loveruby.net>
-Fri Oct 13 20:53:37 2006 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/digest/digest.c (Init_digest): Digest::Base.new() does no
- longer take an initial string to feed. This change allows
- subclasses to take hashing parameters. A statement such as
- ``md = Digest::MD5.new(s)'' can be easily rewritten as
- ``md = Digest::MD5.new << s'' or
- ``md = Digest::MD5.new.update(s)''.
-
-Fri Oct 13 20:51:55 2006 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/digest/digest.c, ext/digest/md5/md5init.c,
- ext/digest/rmd160/rmd160init.c, ext/digest/sha1/sha1init.c,
- ext/digest/sha2/sha2init.c: Add RDoc documentation.
-
- * ext/digest/digest.txt, ext/digest/digest.txt.ja: Removed in
- favor of embedded RDoc documentation.
-
-Fri Oct 13 20:38:12 2006 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/digest/bubblebabble, ext/digest/digest.c: Rip BubbleBabble
- support out of the base class and have a separate module named
- digest/bubblebabble.
-
-Fri Oct 13 19:53:59 2006 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/digest/digest.c (rb_digest_base_equal): Again, should call
- digest() of a subclass instead of the one defined in the base
- class.
+ * lib/fileutils.rb (FileUtils.cp_r): dereference_root=true is
+ default in Ruby 1.8. This line is wrongly removed in last commit.
Fri Oct 13 18:19:31 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* object.c: Class#inherited RDoc added. a patch from Daniel
Berger <djberg96 at gmail.com> [ruby-core:08942]
-Fri Oct 13 02:42:00 2006 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/digest/digest.c (rb_digest_base_equal): Should call digest()
- of a subclass instead of the one defined in the base class.
-
Fri Oct 13 02:30:12 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/test/unit/collector/dir.rb (Collector::Dir#collect): prepend
@@ -44801,13 +5056,6 @@ Fri Oct 13 01:48:42 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/date.rb (Date::self.complete_hash): need to check if g is
nil before dereference. [ruby-core:09116]
-Fri Oct 13 01:05:58 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_partition): RDoc update. a patch from
- Mauricio Fernandez <mfp at acm.org>. [ruby-core:09160]
-
- * hash.c (rb_hash_compare_by_id): ditto.
-
Fri Oct 13 00:34:26 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* object.c (rb_mod_cvar_defined): wrong id check. a patch from
@@ -44817,102 +5065,29 @@ Fri Oct 13 00:34:26 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* object.c (rb_mod_cvar_set): ditto.
-Thu Oct 12 22:58:11 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * hash.c (rb_hash_compare_by_id): somehow we lost renaming from
- Hash#identical. [ruby-core:09163]
-
-Thu Oct 12 18:25:40 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/tk/tkutil/tkutil.c (cbsubst_table_setup): need to handle new
- character literal (1 char string).
-
- * lib/mkmf.rb: shut up some warnings from tk's extconf.rb.
-
-Thu Oct 12 02:15:24 2006 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/digest/lib/digest/hmac.rb: Make use of String#bytes.
-
-Thu Oct 12 02:12:31 2006 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/digest/digest.c (get_digest_base_metadata): Use an instance
- variable of a class object instead of a class variable for
- metadata. This change is only crucial for ruby 1.8 because
- class variables are inherited to subclasses prior to 1.9, but
- applying it also to 1.9 will assure compatibilities.
-
- * ext/digest/md5/md5init.c (Init_md5): Ditto.
-
- * ext/digest/rmd160/rmd160init.c (Init_rmd160): Ditto.
-
- * ext/digest/sha1/sha1init.c (Init_sha1): Ditto.
-
- * ext/digest/sha2/sha2init.c (Init_sha2): Ditto.
-
-Wed Oct 11 21:36:47 2006 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/digest/digest.c (rb_digest_base_alloc,
- rb_digest_base_equal): Simplify the equality check and just
- compare resulted digests since state-level equality should
- not be so significant.
-
- * ext/digest/digest.h: Ditto.
-
- * ext/digest/*/*.[ch]: Ditto.
-
-Wed Oct 11 17:11:03 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_obj_define_method): add half boiled RDoc document.
-
-Wed Oct 11 16:57:46 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_replace): should shift lfree pointer before
- calling xfree.
-
-Wed Oct 11 15:07:42 2006 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/digest/lib/digest/hmac.rb: Add digest/hmac, which implements
- HMAC keyed-hashing algorithm.
-
-Wed Oct 11 15:03:55 2006 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/digest/digest.c (rb_digest_base_reset): Do not make
- recursive calls, but call initialize() when reset() is not
- defined in a subclass.
-
-Wed Oct 11 14:56:10 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/digest/sha1/sha1ossl.h: libssl 0.9.8c-3 defines no
- SHA_BLOCK_LENGTH.
-
-Wed Oct 11 14:03:31 2006 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/digest/digest.c (rb_digest_base_reset, Init_digest): Add
- Digest::Base#reset.
-
- * ext/digest/digest.h: Update the header comment.
-
- * ext/digest/md5/md5ossl.h, ext/digest/md5/md5init.c (Init_md5):
- Define DIGEST_LENGTH and BLOCK_LENGTH.
-
- * ext/digest/rmd160/rmd160init.c (Init_rmd160): Ditto.
+Wed Oct 11 22:21:41 2006 Akinori MUSHA <knu@iDaemons.org>
- * ext/digest/sha1/sha1init.c (Init_sha1): Ditto.
+ * ext/digest: Merge from trunk; metadata location changed,
+ Digest::Base#reset() added, Digest::Base#equal() changed, and
+ digest/hmac added with some modifications made for ruby 1.8.
- * ext/digest/sha2/sha2init.c (Init_sha2): Ditto.
+Tue Oct 10 17:24:12 2006 NAKAMURA Usaku <usa@ruby-lang.org>
- * ext/digest/depend, ext/digest/extconf.rb: Use $INSTALLFILES
- rather than adding make targets. [Pointed out by: nobu]
+ * {bcc32,win32,wince}/Makefile.sub (config.status): shouldn't use
+ copy command instead of install. use -run install.
-Tue Oct 10 16:39:08 2006 Akinori MUSHA <knu@iDaemons.org>
+Tue Oct 10 16:49:16 2006 Akinori MUSHA <knu@iDaemons.org>
* ext/digest/digest.c (hexdigest_str_new, bubblebabble_str_new):
Perform StringValue() checks properly.
-Tue Oct 10 13:21:21 2006 Akinori MUSHA <knu@iDaemons.org>
+ * ext/digest/digest.c: Use RSTRING_{PTR,LEN} macros.
+
+Tue Oct 10 13:49:53 2006 Akinori MUSHA <knu@iDaemons.org>
- * ext/digest/sha1/depend, ext/digest/sha2/depend: Remove obsolete
- dependencies.
+ * ext/digest: Merge from trunk; apply all changes since the
+ initial import, except for the removal of compatibility stub
+ libraries (md5.rb and sha1.rb).
Mon Oct 9 23:46:29 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
@@ -44921,11 +5096,6 @@ Mon Oct 9 23:46:29 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/open3.rb, lib/ping.rb: ditto.
-Mon Oct 9 23:40:58 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/extmk.rb, lib/fileutils.rb, lib/mkmf.rb, lib/optparse.rb,
- lib/shellwords.rb: get rid of shadowing outer local variable.
-
Mon Oct 9 22:56:12 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/rexml/encoding.rb (REXML::Encoding::check_encoding): spaces
@@ -44933,11 +5103,6 @@ Mon Oct 9 22:56:12 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/rexml/parsers/baseparser.rb (REXML::Parsers::BaseParser): ditto.
-Mon Oct 9 01:56:34 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_obj_define_method): add new method
- Kernel#define_singleton_method. [ruby-list:42851]
-
Sat Oct 7 23:53:08 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* string.c (rb_str_scan): small documentation fix.
@@ -44948,95 +5113,15 @@ Sat Oct 7 23:44:33 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* bignum.c (rb_big_rshift): a bug in right shift of negative
bignums. [ruby-core:09020]
-Sat Oct 7 23:33:02 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (formal_assign): packed post splat arguments may conflict
- with normal arguments. [ruby-core:09021]
-
- * eval.c (rb_call0): ditto.
-
-Sat Oct 7 11:53:04 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * object.c (rb_mod_initialize): since module_eval no longer passes
- self, use module_exec instead. fixed: [ruby-dev:29637]
-
Sat Oct 7 00:27:58 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* class.c (rb_include_module): remove unnecessary check.
[ruby-talk:218402]
-Fri Oct 6 15:19:59 2006 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/digest/depend: Fix header installation when the build
- directory is different from srcdir. [Pointed out by: eban]
-
-Fri Oct 6 09:56:31 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * {bcc32,win32,wince}/Makefile.sub (config.status): shouldn't use
- copy command instead of install. use -run install.
-
-Fri Oct 6 06:53:46 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_yield_0): small refactoring.
-
- * parse.y (bparam_item): fixed bugs in handling parenthesized LHS.
-
-Fri Oct 6 04:47:07 2006 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/digest/depend: Install digest.h.
-
-Fri Oct 6 04:27:40 2006 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/digest/lib/md5.rb, ext/digest/lib/sha1.rb: Remove those
- compatibility stub libraries.
+Fri Oct 6 04:30:30 2006 Akinori MUSHA <knu@iDaemons.org>
* sample/openssl/c_rehash.rb: Use digest/md5 instead of obsolete md5.
-Fri Oct 6 04:09:51 2006 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/digest/digest.c: Make hexdigest() always call digest() internally.
-
- * ext/digest/digest.c: Add bubblebabble().
-
-Fri Oct 6 02:38:42 2006 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/digest/digest.c: Allow subclassing in Ruby.
-
-Fri Oct 6 02:06:10 2006 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/digest/digest.c (hexdigest_str_new): Add a string size check.
-
-Thu Oct 5 19:28:35 2006 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/digest/digest.[ch]: Since the argument order of
- hash_final_func_t was inconsistent with others, change it and
- rename to hash_finish_func_t to avoid confusion.
-
- * ext/digest/digest.[ch]: Remove and eliminate the use of
- hash_end_func_t. Implement hexdigest conversion in the base
- class.
-
- * ext/digest/md5/md5.c, ext/digest/md5/md5.h,
- ext/digest/md5/md5init.c, ext/digest/md5/md5ossl.c,
- ext/digest/md5/md5ossl.h: Remove MD5_End() and change
- MD5_Final() to MD5_Finish().
-
- * ext/digest/rmd160/depend, ext/digest/rmd160/extconf.rb,
- ext/digest/rmd160/rmd160.c, ext/digest/rmd160/rmd160.h,
- ext/digest/rmd160/rmd160hl.c, ext/digest/rmd160/rmd160init.c,
- ext/digest/rmd160/rmd160ossl.c, ext/digest/rmd160/rmd160ossl.h:
- Remove unused functions RMD160_End(), RMD160_File(),
- RMD160_Data() and change RMD160_Final() to RMD160_Finish().
-
- * ext/digest/sha1/extconf.rb, ext/digest/sha1/sha1.c,
- ext/digest/sha1/sha1.h, ext/digest/sha1/sha1hl.c,
- ext/digest/sha1/sha1init.c, ext/digest/sha1/sha1ossl.c,
- ext/digest/sha1/sha1ossl.h: Likewise.
-
- * ext/digest/sha2/extconf.rb, ext/digest/sha2/sha2.c,
- ext/digest/sha2/sha2.h, ext/digest/sha2/sha2hl.c,
- ext/digest/sha2/sha2init.c: Likewise.
-
Wed Oct 4 18:47:25 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tkextlib/*: bugfix and update
@@ -45047,45 +5132,15 @@ Wed Oct 4 17:25:14 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (rb_call): check protected visibility based on real self,
not ruby_frame->self. [ruby-talk:217822]
-Wed Oct 4 15:46:32 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (block_param): should interpret single parenthesized
- left hand side expression.
-
Wed Oct 4 08:52:30 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* test/optparse/test_getopts.rb: changed the class name of test case
to get rid of conflict with test_optparse.rb.
-Tue Oct 3 21:04:29 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (dyna_in_block): inline using macro.
-
- * parse.y (mlhs): simplifies the rule a bit.
-
- * parse.y (block_param): restrict block parameters to be local
- variables only.
+Tue Oct 3 23:32:27 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/ruby/test_iterator.rb (TestIterator::test_nested_iterator):
- update test suite to conform the last change.
-
-Tue Oct 3 02:31:13 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (splat_value): use "to_splat" instead of "to_ary" to
- prepare splat values as an array.
-
- * array.c (Init_Array): define to_splat.
-
- * range.c (range_to_splat): new method.
-
- * enumerator.c (enumerator_to_splat): ditto.
-
-Tue Oct 3 01:36:47 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_lines): returns an Enumerator instead of an
- array of lines.
-
- * string.c (rb_str_bytes): a new method.
+ * lib/test/unit/testcase.rb (Test::Unit::TestCase.suite): test name
+ must be string. fixed: [ruby-core:08978]
Mon Oct 2 23:47:55 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
@@ -45097,7 +5152,7 @@ Mon Oct 2 23:47:55 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/test/unit/collector/dir.rb (Test::Unit::Collector::Dir#collect_file):
load expanded path. fixed: [ruby-dev:29621]
-Mon Oct 2 15:47:55 2006 NAKAMURA Usaku <usa@ruby-lang.org>
+Mon Oct 2 15:49:19 2006 NAKAMURA Usaku <usa@ruby-lang.org>
* instruby.rb: batfile should be CRLF'ed.
@@ -45121,15 +5176,10 @@ Sun Oct 1 23:12:19 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/optparse.rb (OptionParser#make_switch): pass arguments directly.
-Sat Sep 30 15:11:26 2006 Tadayoshi Funaba <tadf@dotrb.org>
+Sat Sep 30 15:12:25 2006 Tadayoshi Funaba <tadf@dotrb.org>
* lib/date.rb, lib/date/format.rb: updated based on date2 3.9.4.
-Fri Sep 29 13:18:24 2006 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/digest/lib/digest.rb (Digest): Require digest.so and fix the
- breakage. Point out by NAKAMURA Usaku in [ruby-dev:29619].
-
Fri Sep 29 12:11:04 2006 WATANABE Hirofumi <eban@ruby-lang.org>
* jcode.rb (succ!): call original succ! if $KCODE == 'n'.
@@ -45154,60 +5204,22 @@ Thu Sep 28 23:59:31 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
win32 regardless if it is implemented. Provisional fix for
[ruby-core:08917].
-Thu Sep 28 20:49:20 2006 NAKAMURA Usaku <usa@ruby-lang.org>
+Thu Sep 28 20:53:16 2006 NAKAMURA Usaku <usa@ruby-lang.org>
* lib/tmpdir.rb: use return value of getdir.call for length.
-Wed Sep 27 22:08:16 2006 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/digest/md5/md5init.c (Init_md5): Now that we have digest.rb,
- require "digest" rather than "digest.so".
-
- * ext/digest/rmd160/rmd160init.c (Init_rmd160): Ditto.
-
- * ext/digest/sha1/sha1init.c (Init_sha1): Ditto.
-
- * ext/digest/sha2/sha2init.c (Init_sha2): Ditto.
-
-Wed Sep 27 21:21:08 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_startwith): rename startwith? to start_with?,
- endwith? to endwith?, respectively. [ruby-talk:216685]
-
-Wed Sep 27 13:29:01 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/cgi.rb (CGI::TagMaker::nOE_element_def): replace to_s by
- join. some other methods as well. [ruby-dev:29613]
-
Wed Sep 27 01:04:49 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (try_func): check function pointer first and macro next.
* lib/mkmf.rb (have_type): simplified with typedef and sizeof.
-Wed Sep 27 00:08:12 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_shift): shift/unshift performance boost patch,
- based on the patch from Eric Mahurin <eric_mahurin at yahoo.com>.
- [ruby-core:05861]
-
- * array.c (rb_ary_unshift_m): ditto.
-
- * array.c (ary_make_shared): ditto.
-
- * array.c (RESIZE_CAPA): ditto.
-
- * array.c (rb_ary_free): new function to free memory. code moved
- from gc.c.
-
- * string.c (rb_str_free): ditto.
-
Tue Sep 26 23:57:03 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/optparse.rb (OptionParser#getopts): use strings as key.
fixed: [ruby-dev:29614]
-Tue Sep 26 15:29:55 2006 NAKAMURA Usaku <usa@ruby-lang.org>
+Tue Sep 26 15:31:26 2006 NAKAMURA Usaku <usa@ruby-lang.org>
* {win32,wince}/Makefile.sub (CPP): check predefined value.
@@ -45217,38 +5229,13 @@ Tue Sep 26 07:55:16 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
body is shared. a patch from Kent Sibilev <ksruby at gmail.com>.
[ruby-core:08922]
-Mon Sep 25 23:10:46 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * dir.c (rb_push_glob): need not to check by FilePathValue().
- [ruby-dev:29599]
-
- * dir.c (dir_globs): ditto.
-
Mon Sep 25 22:26:26 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* file.c (rb_path_end): skip root directory. fixed: [ruby-core:08913]
- * lib/mkmf.rb (rm_f): get rid of NUL.
-
* lib/mkmf.rb (init_mkmf): set default $LDFLAGS. Patch by Michal
Suchanek <hramrach at centrum.cz>. [ruby-talk:216256]
-Mon Sep 25 15:06:18 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * sample/test.rb: "print nil" now prints empty string.
-
- * test/ruby/test_system.rb (TestSystem::test_system): ditto.
-
-Mon Sep 25 11:26:25 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * hash.c (recursive_hash): remove unused local variable.
-
- * parse.y (parser_yylex): ditto.
-
- * parse.y (rb_gc_mark_symbols): fix unmatched prototype .
-
- * file.c (rb_get_path): check NUL byte in the path string.
-
Mon Sep 25 08:14:43 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* array.c (rb_ary_shift): should clear shifting top element.
@@ -45262,25 +5249,19 @@ Mon Sep 25 08:11:35 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* random.c (rb_f_rand): RDoc typo fix. a patch from Frederick
Cheung <fred at 82ask.com>. [ruby-talk:216047]
-Sun Sep 24 21:19:24 2006 Guy Decoux <ts@moulon.inra.fr>
-
- * gc.c (gc_mark_children): NODE_POSTEXE holds Ruby VALUE.
- [ruby-core:08912]
-
Sun Sep 24 22:28:20 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* runruby.rb: extension library scripts moved into common directory.
-Sun Sep 24 12:10:04 2006 Tadayoshi Funaba <tadf@dotrb.org>
+Sun Sep 24 14:59:50 2006 Tanaka Akira <akr@fsij.org>
- * lib/date.rb, lib/date/format.rb: updated based on date2 3.9.3.
+ * node.h (struct thread): ia64 support is broken by sandbox patch.
-Sun Sep 24 06:55:36 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun Sep 24 12:11:16 2006 Tadayoshi Funaba <tadf@dotrb.org>
- * io.c (rb_io_print): no special handling for nil as well as puts.
- fixed: [ruby-dev:29586]
+ * lib/date.rb, lib/date/format.rb: updated based on date2 3.9.3.
-Sun Sep 24 06:25:53 2006 why the lucky stiff <why@ruby-lang.org>
+Sat Sep 23 23:24:57 2006 why the lucky stiff <why@ruby-lang.org>
* eval.c (rb_thread_save_context, rb_thread_restore_context):
sandbox hook to save and restore sandbox state.
@@ -45289,7 +5270,7 @@ Sun Sep 24 06:25:53 2006 why the lucky stiff <why@ruby-lang.org>
* eval.c (rb_thread_kill_bang): Thread#kill! uses the above flag
to circumvent ensure, in order to prevent endless loops.
- contributed by MenTaLguY. [ruby-core:08768]
+ [ruby-core:08768]
* eval.c (rb_thread_kill): fix Thread#kill docs, which returns
the thread object in all cases.
@@ -45304,40 +5285,14 @@ Sat Sep 23 21:34:15 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/cgi.rb (CGI::QueryExtension::read_multipart): CGI content
may be empty. a patch from Jamis Buck <jamis at 37signals.com>.
-Sat Sep 23 20:54:28 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
-
- * oniguruma.h: Version 4.4.4
-
- * regexec.c: ditto.
-
- * regcomp.c ditto.
-
Sat Sep 23 08:35:53 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/rdoc/ri/ri_options.rb: prevent NameError. [ruby-dev:29597]
-Sat Sep 23 01:02:57 2006 Tadayoshi Funaba <tadf@dotrb.org>
+Sat Sep 23 01:04:20 2006 Tadayoshi Funaba <tadf@dotrb.org>
* lib/date.rb, lib/date/format.rb: updated based on date2 3.9.2.
-Fri Sep 22 18:07:17 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_partition): no need to call rb_call_super(),
- since String is no longer includes Enumerable.
-
-Fri Sep 22 17:33:29 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * hash.c (rb_hash_eql): new method to be used by Hash.
-
- * hash.c (rb_hash_hash): ditto.
-
-Fri Sep 22 06:53:22 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bignum.c (rb_big_hash): use rb_memhash().
-
- * numeric.c (flo_hash): simplified. klass need not to affect
- resulting hash value.
-
Fri Sep 22 02:06:26 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* .cvsignore: ignore timestamp files and installed list file.
@@ -45346,11 +5301,6 @@ Fri Sep 22 01:36:34 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* instruby.rb: include FileUtils unconditionally.
-Fri Sep 22 00:36:05 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * numeric.c (Init_Numeric): fix_odd_p and fix_even_p are for Fixnum.
- patch from Ondrej Bilka <neleai at seznam.cz>. [ruby-core:08904]
-
Thu Sep 21 22:56:20 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* common.mk (no-install): not install rdoc actually.
@@ -45361,51 +5311,14 @@ Thu Sep 21 22:56:20 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/extmk.rb: expand ruby executable names.
-Thu Sep 21 20:19:22 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (str_new3): embed shorter strings more eagerly.
-
-Thu Sep 21 17:44:49 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_startwith): a new method to check if a string
- starts with given prefix.
-
- * string.c (rb_str_endwith): the opposite of String#startwith?.
-
-Thu Sep 21 16:29:02 2006 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * rubytest.rb: use each_line instead of each.
-
-Thu Sep 21 15:06:24 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * numeric.c (int_odd_p): a new method to check even or odd.
- [RCR#337]
-
- * numeric.c (int_even_p): ditto.
-
Thu Sep 21 13:55:07 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/etc/etc.c (etc_getpwuid): uid integer should be wrapped in
+ * ext/etc/etc.c (etc_getpwuid): uid integer should be wraped in
uid_t value. [ruby-core:08897]
* ext/etc/etc.c (etc_getpwuid): uid_t may be bigger than plain
'int' type.
-Thu Sep 21 10:07:09 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_partition): RDoc typo fixed. [ruby-core:08898]
-
- * string.c (rb_str_rpartition): fixed separation seek bug.
-
-Thu Sep 21 09:38:12 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_lines): new method to split a string into lines.
-
- * string.c (Init_String): Strings are no longer Enumerable. use
- each_line or lines method explicitly.
-
- * string.c (Init_String): remove each method. use each_lines.
-
Wed Sep 20 23:17:41 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* common.mk (pre-install-doc): create data directory before install.
@@ -45414,19 +5327,7 @@ Wed Sep 20 23:17:41 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (install_dirs): remove extra slash.
-Wed Sep 20 22:41:45 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * numeric.c (fix_mul): typo again. patch from Tadashi Saito
- <shiba at mail2.accsnet.ne.jp>. fixed: [ruby-core:08893]
-
-Wed Sep 20 19:32:06 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_partition): a new method to separate the string
- by a separator. taken from Python 2.5.
-
- * string.c (rb_str_rpartition): ditto.
-
-Wed Sep 20 09:49:40 2006 NAKAMURA Usaku <usa@ruby-lang.org>
+Wed Sep 20 09:53:38 2006 NAKAMURA Usaku <usa@ruby-lang.org>
* {bcc32,win32,wince}/Makefile.sub (INSTALLED_LIST): need to define
this macro to install.
@@ -45434,7 +5335,7 @@ Wed Sep 20 09:49:40 2006 NAKAMURA Usaku <usa@ruby-lang.org>
Wed Sep 20 09:43:10 2006 Shugo Maeda <shugo@ruby-lang.org>
* lib/net/imap.rb: allow extra spaces in responses.
- Thanks, Tom Soderlund.
+ Thanks, Tom Soderlund. (backported from HEAD)
Wed Sep 20 09:25:39 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
@@ -45442,6 +5343,13 @@ Wed Sep 20 09:25:39 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
Adolphs <futzilogik at users dot sourceforge dot net>.
[ruby-doc:1223]
+Tue Sep 19 01:28:00 2006 Minero Aoki <aamine@loveruby.net>
+
+ * lib/fileutils.rb: backport from HEAD (rev 1.71).
+
+ * lib/fileutils.rb (FileUtils.cp_r): new option
+ :remove_destination.
+
Tue Sep 19 00:42:15 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* object.c (rb_obj_ivar_defined, rb_mod_cvar_defined): new methods,
@@ -45453,42 +5361,6 @@ Tue Sep 19 00:42:15 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
defined. fixed: [ruby-dev:29554]
-- This didn't fix anything.
-Tue Sep 19 00:07:17 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (sym_eql): fail early to gain performance.
-
- * string.c (sym_hash): cache hash value in aux.shared if possible.
-
- * gc.c (rb_obj_id): no need to treat symbols specially.
-
- * lib/fileutils.rb (FileUtils::FileUtils): singleton_methods() no
- longer return an array of strings, but of symbols.
-
- * lib/delegate.rb (DelegateClass): ditto.
-
-Mon Sep 18 15:29:21 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * dir.c (dir_s_glob): restore GC protection volatile variable.
- [ruby-dev:29588]
-
- * re.c (rb_reg_regcomp): ditto.
-
-Mon Sep 18 12:16:48 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * numeric.c (fix_mul): get rid of shift overflow.
-
-Mon Sep 18 10:47:49 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * dir.c (dir_s_glob): remove unused variable.
-
- * math.c (math_log): ditto.
-
- * re.c (rb_reg_regcomp): ditto.
-
- * eval.c (break_jump): ditto.
-
- * eval.c (rb_thread_yield_0): remove unused function.
-
Sun Sep 17 23:44:58 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/rdoc/rdoc.rb (RDoc::RDoc#document): scan only files modified
@@ -45502,18 +5374,11 @@ Sun Sep 17 17:42:13 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/rdoc/generators/ri_generator.rb: do not chdir twice.
-Sun Sep 17 10:42:10 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * numeric.c (fix_mul): fixed typo. fixed: [ruby-core:08885]
-
-Sat Sep 16 19:47:16 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+Sat Sep 16 23:14:29 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * README.EXT: should mention new macros: RSTRING_PTR, RSTRING_LEN,
- RARRAY_PTR, RARRAY_LEN.
+ * ext/pty/pty.c (establishShell): remove remaining unused line.
- * README.EXT.ja: ditto.
-
-Sat Sep 16 16:39:23 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat Sep 16 16:40:44 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* Makefile.in, common.in, instruby.rb, ext/extmk.rb, lib/mkmf.rb:
use instruby.rb to install extensions instead of ext/extmk.rb.
@@ -45528,53 +5393,9 @@ Sat Sep 16 16:39:23 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/pty/pty.c (freeDevice): not used.
- * lib/mkmf.rb (checking_for): improved the messages.
-
-Sat Sep 16 11:03:49 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (ary_shared_first): should create embedded copies
- instead of sharing memory region for smaller arrays.
-
-Sat Sep 16 09:37:39 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * struct.c (inspect_struct): do not display a class name for
- anonymous struct. The member fields are sufficient.
-
-Fri Sep 15 20:22:15 2006 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/nkf/nkf-8/nkf.c: imported nkf 2.0.8 rev.110.
- * Fix: check_bom cuts \xfe\xff\xXX\xXX of UTF-32LE.
- * Add support --ic=UTF-32.
- * Fix: can't guess UTF-16 and UTF-32.
- * Fix: can't decode beyond BMP of UTF-16LE.
+ * ext/pty/pty.c (get_device_once): removed garbage right brace.
- * ext/nkf/nkf.c (guess): Support UTF-32.
-
- * ext/nkf/lib/kconv.rb (kconv): Support UTF-32.
-
- * ext/nkf/lib/kconv.rb (to_utf32): new method.
-
-Fri Sep 15 05:23:24 2006 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/nkf/nkf-8/nkf.c: imported nkf 2.0.8 2006-09-15.
- Add support for U+10000 - U+10FFFF
- Add support UTF-32
-
-Fri Sep 15 00:03:07 2006 Tanaka Akira <akr@fsij.org>
-
- * ext/digest/lib/digest.rb (Digest::Base.file): open a file in binary
- mode. suggested by Kazuhiro NISHIYAMA. [ruby-dev:29579]
-
-Thu Sep 14 17:21:07 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * numeric.c (fix_mul): avoid bignum multiplication as far as
- possible. a patch from Ondrej Bilka <neleai at seznam.cz>.
- [ruby-core:08825]
-
-Thu Sep 14 16:34:55 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_intern): allow zero length symbols.
- [ruby-core:08861]
+ * lib/mkmf.rb (checking_for): improved the messages.
Thu Sep 14 16:11:15 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
@@ -45584,27 +5405,7 @@ Thu Sep 14 16:11:15 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* parse.y (rb_interned_p): new function to check if a string is
already interned.
- * string.c (str_to_id): use rb_str_intern().
-
-Thu Sep 14 14:37:45 2006 Tanaka Akira <akr@fsij.org>
-
- * ext/digest/lib/digest.rb (Digest::Base.file): new method.
- [ruby-dev:29572]
-
-Thu Sep 14 08:30:02 2006 Tanaka Akira <akr@fsij.org>
-
- * ext/digest/digest.c (rb_digest_base_inspect): new method.
- [ruby-dev:29573]
-
-Thu Sep 14 01:13:56 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * gc.c (ruby_init_stack): decrease "stack level too deep" in Windows.
- [ruby-dev:29569]
-
-Thu Sep 14 01:02:25 2006 Tanaka Akira <akr@fsij.org>
-
- * ext/digest/lib/digest.rb: new file.
- [ruby-dev:28689]
+ * object.c (str_to_id): use rb_str_intern().
Wed Sep 13 18:43:05 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
@@ -45621,74 +5422,28 @@ Wed Sep 13 16:43:36 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* string.c (rb_str_intern): prohibit interning tainted string.
-Wed Sep 13 01:14:02 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Sep 13 01:14:21 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/optparse.rb (OptionParser#getopts): works with pre-registered
options. [ruby-core:08826]
-Tue Sep 12 03:58:39 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * hash.c (rb_hash_compare_by_identity): rename Hash#identical to
- Hash#compare_by_identity.
-
-Mon Sep 11 16:52:37 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * hash.c (rb_hash_identical): a new method to make a hash to
- compare keys by their identity.
-
- * hash.c (rb_hash_identical_p): new method to tell if a hash is
- identical or not.
-
- * st.c (st_numcmp, st_numhash): export hash type functions.
-
-Mon Sep 11 11:42:21 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/rexml/source.rb (REXML::Source::encoding): should not
- convert the body twice. [ruby-core:08828]
-
- * lib/rexml/encoding.rb (REXML::Encoding::encoding):
- Encoding#encoding= to return boolean value to tell if the body
- is really converted or not.
-
- * lib/rexml/encoding.rb (REXML::Encoding::encoding): Specific
- conversion library (e.g. rexml/encodings/UTF-16.rb) to have
- higher preceding.
-
- * lib/rexml/encodings/UTF-16.rb (REXML::Encoding::decode_utf16):
- UTF-16#decode_utf16 should work strings without BOM.
-
-Mon Sep 11 07:39:44 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (sym_equal): "sym == str" should compare them as
- strings. [ruby-dev:29554]
-
-Sun Sep 10 22:59:43 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * instruby.rb (parse_args): remove splat.
-
-Sun Sep 10 20:25:30 2006 Tadayoshi Funaba <tadf@dotrb.org>
+Sun Sep 10 20:27:13 2006 Tadayoshi Funaba <tadf@dotrb.org>
* lib/date.rb, lib/date/format.rb: updated based on date2 3.9.1.
-Sun Sep 10 09:41:29 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c: ISPRINT() needs ctype.h
-
-Sun Sep 10 09:19:47 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/optparse.rb: splat parsed arguments.
-
Tue Jan 10 09:18:03 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * eval.c (stack_extend): fixed prototype.
+
* eval.c (rb_require_safe): prevent extension from loading twice.
fixed: [ruby-dev:29523]
-Sat Sep 9 23:55:28 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+Sat Sep 9 23:50:38 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * file.c (rb_f_test): test(0) should not have any special
- meaning. [ruby-dev:29425]
+ * bignum.c (rb_big_mul0): bignum multiplication without
+ normalization.
- * file.c (rb_f_test): properer error message.
+ * bignum.c (rb_big_pow): use rb_big_mul0(). [ruby-dev:29547]
Sat Sep 9 14:08:38 2006 Eric Hodel <drbrain@segment7.net>
@@ -45700,29 +5455,18 @@ Sat Sep 9 04:55:59 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/pstore.rb: open all in binary mode, and get rid of the quirk of
msvcrt. fixed: [ruby-dev:29518]
-Sat Sep 9 04:47:45 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat Sep 9 04:54:42 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* Makefile.in, win32/Makefile.sub (MINIRUBY): append MINIRUBYOPT.
* mkconfig.rb, ext/extmk.rb, lib/mkmf.rb, win32/mkexports.rb: suppress
warnings with $VERBOSE.
- * win32/resource.rb: only file which has more than one icon is DLL.
-
-Fri Sep 8 16:53:30 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (str_alloc): should allocate a String object, even when
- asked to allocate a Symbol object. [ruby-dev:29529]
-
-Fri Sep 8 16:36:27 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/extmk.rb (extmake): follow Array#to_s.
+ * ext/extmk.rb: Proc#call does not pass the block in 1.8.
- * lib/mkmf.rb (create_makefile): ditto.
+ * win32/resource.rb: add more info.
- * win32/resource.rb: ditto.
-
-Fri Sep 8 10:00:12 2006 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Fri Sep 8 10:03:59 2006 GOTOU Yuuzou <gotoyuzo@notwork.org>
* lib/webrick/cookie.rb (WEBrick::Cookie.parse_set_cookies): new
method to parse multiple cookies per Set-Cookie header.
@@ -45734,62 +5478,33 @@ Fri Sep 8 08:59:30 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* win32/Makefile.sub, win32/configure.bat win32/setup.mak: program
name transform.
-Fri Sep 8 08:25:39 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/optparse.rb: suppress `assigning void value' warning.
-
-Fri Sep 8 01:16:34 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (Init_Array): #to_s to be an alias to #inspect.
- [ruby-dev:29520]
-
- * hash.c (Init_Hash): ditto.
+Fri Sep 8 01:33:08 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/mkmf.rb (create_makefile): replace "print array" by
- "print *array".
+ * ruby.h (RSTRING_PTR): add migration macro.
- * mkconfig.rb: ditto.
-
-Thu Sep 7 21:02:56 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (nil_to_s): returns the empty string again.
- [ruby-dev:29520]
+ * ruby.h (RARRAY_PTR): ditto.
Thu Sep 7 23:27:05 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* file.c (path_check_0, fpath_check): disable path check on cygwin.
[ruby-talk:213074]
-Thu Sep 7 02:03:45 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * time.c (time_to_s): adopt new date format using digits
- e.g. "2006-09-07 02:03:45 +9000".
-
-Thu Sep 7 01:54:22 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (sym_equal): override. check equivalence.
+Wed Sep 06 12:05:19 2006 NARUSE, Yui <naruse@ruby-lang.org>
-Wed Sep 6 13:25:04 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (symbols_i): need to initialize early-created symbols.
- [ruby-dev:29496]
-
-Wed Sep 6 12:05:19 2006 NARUSE, Yui <naruse@ruby-lang.org>
+ * ext/nkf/lib/kconv.rb (Kconv::RegexpEucjp): fix regexp for euc-jp
+ [ruby-dev:29344]
* ext/nkf/lib/kconv.rb (Kconv::toeuc): remove -m0 [ruby-dev:29505]
-Tue Sep 5 22:06:43 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/tk/tcltklib.c: use rb_ary_new3() since RARRAY_LEN() is not l-value.
-
- * ext/tk/tkutil/tkutil.c: use RARRAY_PTR() and RARRAY_LEN() and etc.
- fixed: [ruby-dev:29473]
-
Tue Sep 5 06:47:22 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* time.c (time_to_s): variable declaration after an execution
statement.
+Tue Sep 5 05:56:51 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * numeric.c (flo_hash): improve collision. fixed: [ruby-dev:29352]
+
Tue Sep 5 05:49:41 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* file.c (path_check_0): check if sticky bit is set on parent
@@ -45816,7 +5531,7 @@ Mon Sep 4 21:43:57 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/dbm/extconf.rb: create makefile according to the result of check
for dbm header. fixed: [ruby-dev:29445]
-Mon Sep 4 21:39:42 2006 Tadayoshi Funaba <tadf@dotrb.org>
+Mon Sep 4 21:42:35 2006 Tadayoshi Funaba <tadf@dotrb.org>
* lib/date.rb, lib/date/format.rb: updated based on date2 3.9.
@@ -45824,37 +5539,21 @@ Mon Sep 4 21:14:20 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* time.c (time_strftime): include nul character. fixed: [ruby-dev:29422]
-Mon Sep 4 16:39:11 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/cgi.rb (CGI::out): specify -x option for nkf.
-
- * lib/cgi.rb (CGI::out): should not convert utf-8 implicitly using
- NKF. it is too Japanese centric.
-
-Mon Sep 4 14:23:10 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/dbm/extconf.rb (db_check): remove debug print.
+Mon Sep 4 16:29:33 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-Mon Sep 4 06:46:08 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * lib/cgi.rb (CGI::out): specify -m0 -x option for nkf.
+ [ruby-dev:29284]
- * parse.y (rb_id2sym): intern if id is attrset_id.
- [ruby-dev:29420] [ruby-dev:29447]
+Mon Sep 4 16:13:23 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-Mon Sep 4 01:25:16 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * io.c (pipe_open): command name should not contain null bytes.
+ [ruby-dev:29421]
- * eval.c (rb_f_local_variables): list symbols.
+ * process.c (proc_spawn): ditto.
- * struct.c (rb_struct_s_members_m): ditto.
+ * process.c (proc_spawn_n): ditto.
- * variable.c (ivar_i): ditto.
-
- * variable.c (gvar_i): ditto.
-
- * variable.c (cv_i): ditto.
-
-Sun Sep 3 20:47:02 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.h (SYMBOL_P): Qnil and Qfalse are not Symbol.
+ * process.c (rb_f_system): ditto.
Sun Sep 3 15:32:44 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
@@ -45870,279 +5569,95 @@ Sun Sep 3 04:40:42 2006 Tanaka Akira <akr@fsij.org>
* ext/socket/socket.c: include arpa/inet.h if available.
-Sat Sep 2 23:59:58 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (Init_String): undef Symbol#new.
-
- * struct.c (rb_struct_s_def): wrong symbol detection.
-
-Sat Sep 2 23:59:37 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (str_to_id): a bug caused by premature optimization.
-
-Sat Sep 2 23:53:28 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (Init_Object): move symbol related code to string.c
-
- * string.c (Init_String): Symbol as subclass of String.
+Sun Sep 3 02:34:55 2006 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
- * parse.y (rb_intern2): handle symbol as strings.
+ * lib/drb/unix.rb (DRbUNIXSocket#close): don't get path if client mode.
+ [ruby-dev:29417]
- * string.c (str_new): substring of symbols are mere strings, not
- symbols.
-
-Sat Sep 2 23:37:29 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ruby.h (struct RArray): embed small arrays.
- (RARRAY_LEN): defined for accessing array members.
- (RARRAY_PTR): ditto.
+Sun Sep 3 01:45:17 2006 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
- * array.c: use RARRAY_LEN and RARRAY_PTR.
+ * lib/drb/acl.rb (ACLEntry#initialize): examine whether '*' is
+ included before IPAddr.new. [ruby-dev:29406]
Sat Sep 2 13:23:01 2006 Tanaka Akira <akr@fsij.org>
* common.mk (ia64.o): use the compiler driver to assemble ia64.s
to use appropriate ABI.
-Sat Sep 2 12:06:35 2006 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/soap/generator.rb (SOAP::SOAPGenerator#encode_tag): do not dump
- XML attribute which value is nil. value "" and nil both were dumped
- as 'attr="value"'. [ruby-dev:29395]
-
-Sat Sep 2 12:00:32 2006 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/csv.rb (CSV::IOReader#initialize): use String#[](pos, len)
- instead of String#[](idx) to check utf BOM. follows String#[](idx)
- behavior change of 1.9.
-
-Sat Sep 2 11:47:58 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_eval): should handle when in else clause. a patch
- from Eric Hodel <drbrain at segment7.net>. [ruby-core:08662]
-
- * parse.y (primary): wrap with NODE_CASE. [ruby-core:08663]
-
-Fri Sep 1 22:07:04 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ruby.h (RSTRING_EMBED_LEN_MASK): uses 5 bits to support 64bit
- environment. [ruby-dev:29369]
+Sat Sep 2 03:36:22 2006 Tanaka Akira <akr@fsij.org>
-Fri Sep 1 22:02:08 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_resize): should copy embedded string to
- malloc'ed buffer. a patch from <nobu at ruby-lang.org> in
- [ruby-dev:29369]. fixed: [ruby-dev:29368]
-
- * string.c (rb_str_ord): use %ld specifier since STRING_LEN() is a
- long. [ruby-dev:29369]
-
-Fri Sep 1 21:41:12 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/socket/socket.c (socks_init): typo fixed. a patch from Sven
- Klemm <sven at c3d2.de>. [ruby-core:08770]
-
-Fri Sep 1 14:22:42 2006 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * array.c (rb_ary_shuffle): RDoc fixed.
+ * common.mk, configure.in, defines.h, eval.c, gc.c, main.c,
+ numeric.c, ruby.h, ia64.s: backport IA64 HP-UX support.
Fri Sep 1 13:52:57 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tk/font.rb: TkFont#current_configinfo() doesn't work
on Tcl/Tk8.x.
-Fri Sep 1 09:32:55 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/irb/ruby-lex.rb (RubyLex::getc): should not push nil into
- reading buffer (@readed). reported in
- <http://jarp.does.notwork.org/diary/200608c.html#200608311>.
-
-Thu Aug 31 23:59:03 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb (configuration): follow nil.to_s.
-
-Thu Aug 31 20:50:46 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * lib/mkmf.rb (create_makefile): follow nil.to_s.
-
- * win32/resource.rb: ditto.
-
-Thu Aug 31 20:21:47 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * eval.c (search_required): use RSTRING_PTR and RSTRING_STR.
-
- * file.c (test_identical, rb_file_s_truncate): ditto.
-
- * io.c (pipe_open, rb_io_reopen): ditto.
-
- * object.c (nil_plus): ditto.
-
- * process.c (proc_spawn_n, rb_spawn): ditto.
-
- * util.c (ruby_add_suffix): ditto.
-
- * ext/Win32API/Win32API.c (Win32API_initialize): ditto.
-
- * ext/dl/cptr.c (rb_dlptr_s_to_ptr): ditto.
-
- * ext/openssl/ossl_x509ext.c (ossl_x509extfactory_create_ext): ditto.
-
- * ext/tk/stubs.c, ext/tk/tcltklib.c, ext/tk/tkutil/tkutil.c: ditto.
-
- * ext/win32ole/win32ole.c (ole_val2olevariantdata): ditto.
-
-Thu Aug 31 18:23:00 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ruby.h (struct RString): embed small strings.
- (RSTRING_LEN): defined for accessing string members.
- (RSTRING_PTR): ditto.
-
- * string.c: use RSTRING_LEN and RSTRING_PTR.
-
-Thu Aug 31 17:16:19 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_shuffle_bang): new method.
-
- * array.c (rb_ary_shuffle): ditto.
-
- * random.c (genrand_real): ditto.
-
- * random.c (genrand_int32): export the function.
-
- * random.c (Init_Random): initialize random seed at the
- beginning.
-
-Thu Aug 31 13:12:06 2006 why the lucky stiff <why@ruby-lang.org>
+Thu Aug 31 12:46:55 2006 why the lucky stiff <why@ruby-lang.org>
* eval.c (ruby_init): rename top_cref to ruby_top_cref and export,
along with ruby_cref, for use by the sandbox. [ruby-core:08762]
* node.h: ditto.
-Wed Aug 30 12:01:57 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * numeric.c (flo_hash): improve collision.
-
- * string.c (rb_memhash): new generic function to calculate hash value
- for memory chunk.
-
Tue Aug 29 19:10:10 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* hash.c (rb_hash_s_create): fixed memory leak, based on the patch
by Kent Sibilev <ksruby at gmail.com>. fixed: [ruby-talk:211233]
-Mon Aug 28 11:29:46 2006 Eric Hodel <drbrain@segment7.net>
+Mon Aug 28 11:36:02 2006 Eric Hodel <drbrain@segment7.net>
- * eval.c, parse.y: Revert.
- * ext/.document: Add digest.c.
- * ext/digest/digest.c: Make RDoc show up.
- * ext/io/wait.c: Fix call-seq in RDoc.
-
-Mon Aug 28 08:03:20 2006 Eric Hodel <drbrain@segment7.net>
-
- * ext/.document: Add C files with RDoc.
- * ext/digest/digest.c: Convert to RDoc.
- * ext/io/wait.c: ditto.
* lib/rdoc/parsers/parse_rb.rb: Fix typo. Submitted by
<calamitas at gmail.com>. [ruby-core:08724]
-Mon Aug 28 07:21:47 2006 Eric Hodel <drbrain@segment7.net>
-
- * file.c (File#size?): Fix documentation submitted by Rick Ohnemus.
- ruby-Bugs-5529. [ruby-core:08725]
+Mon Aug 28 07:53:44 2006 Eric Hodel <drbrain@segment7.net>
-Sun Aug 27 21:41:23 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
-
- * oniguruma.h: Version 4.4.0
-
- * regint.h: ditto.
-
- * regparse.h: ditto.
-
- * regexec.c: ditto.
+ * lib/rdoc/ri/ri_formatter.rb: Don't unescape HTML in HtmlFormatter.
+ Submitted by Kent Sibilev <ksruby at gmail.com>. [ruby-core:08392].
- * regcomp.c ditto.
+Mon Aug 28 07:25:45 2006 Eric Hodel <drbrain@segment7.net>
- * regparse.c: ditto.
+ * file.c (File#size?): Fix documentation submitted by Rick Ohnemus.
+ ruby-Bugs-5529. [ruby-core:08725]
-Sat Aug 26 08:03:03 2006 Tadayoshi Funaba <tadf@dotrb.org>
+Sat Aug 26 08:07:13 2006 Tadayoshi Funaba <tadf@dotrb.org>
* lib/date.rb, lib/date/format.rb: updated based on date2 3.8.2.
-Fri Aug 25 21:15:22 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
-
- * common.mk: add regint.h and oniguruma.h to dependence.
-
- * ext/strscan/depend: ditto.
+Fri Aug 25 22:32:04 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Aug 25 20:35:57 2006 NAKAMURA Usaku <usa@ruby-lang.org>
+ * lib/rexml/source.rb (REXML::IOSource#initialize): encoding have to
+ be set with the accessor. fixed: [ruby-list:42737]
- * test/wsdl/document/echo.rb: removed.
+Fri Aug 25 17:15:17 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * test/wsdl/document/test_rpc.rb: remove echo.rb after test.
- [ruby-dev:29337]
+ * stable version 1.8.5 released.
Fri Aug 25 17:02:06 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* gc.c (gc_sweep): typo fixed.
-Fri Aug 25 16:05:50 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * object.c (sym_call): check if the receiver is given.
-
-Fri Aug 25 01:10:11 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (rb_Integer): Integer(nil) should raise TypeError.
- [ruby-talk:210205]
-
- * object.c (nil_to_s): no longer returns empty string but "nil".
- [ruby-talk:210205]
-
- * lib/mkmf.rb: avoid COMMON_HEADERS being nil.
-
-Wed Aug 23 00:25:14 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/rexml/source.rb (REXML::IOSource#initialize): encoding have to
- be set with the accessor. fixed: [ruby-list:42737]
-
-Tue Aug 22 19:21:00 2006 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/smtp.rb: parameter `to_addrs' might be an Array,
- .flatten is required. [ruby-dev:29316]
-
Tue Aug 22 18:47:51 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::handle_method):
rdoc documents C module methods as instance methods. a patch in
[ruby-core:08536].
-Tue Aug 22 12:35:57 2006 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/nkf/lib/kconv.rb (Kconv::RegexpEucjp): fix regexp for
- euc-jp [ruby-dev:29344]
-
-Sun Aug 20 11:46:52 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * numeric.c (num_step): also return an enumerator object if no block
- is given.
-
-Sat Aug 19 16:47:51 2006 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+Sat Aug 19 14:15:02 2006 NAKAMURA Usaku <usa@ruby-lang.org>
- * ext/win32ole/win32ole.c (hash2named_arg): accept hash argument
- of symbol key.
-
- * test/win32ole/test_win32ole.rb
- ditto.
+ * win32/Makefile.sub (config.status): include winsock2.h instead of
+ winsock.h when --with-winsock2 is specified.
+ fixed: [ruby-dev:29296]
Sat Aug 19 11:28:08 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* file.c (rb_file_s_rename): use errno if set properly.
fixed: [ruby-dev:29293]
-Fri Aug 18 01:05:57 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+Sat Aug 19 11:09:23 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/cgi.rb (CGI::out): specify -m0 to disable MIME decode. a
- patch from Fujioka <fuj at rabbix.jp>. [ruby-dev:29284]
+ * parse.y (then): remove semicolon warning. [ruby-dev:29299]
Thu Aug 17 19:15:16 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
@@ -46153,98 +5668,30 @@ Thu Aug 17 14:47:06 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb: added rdoc by Daniel Berger. [ruby-core:08177]
-Wed Aug 16 17:46:59 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * marshal.c (r_byte): IO#getc returns one byte string now.
- fixed: [ruby-dev:29255]
+Thu Aug 17 00:39:05 2006 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-Wed Aug 16 17:22:44 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * common.mk (pre-install-local): remove unnecessary code.
- [ruby-dev:29249]
+ * lib/rinda/ring.rb (do_reply): Fix for RingServer fails to find a
+ TupleSpace when TupleSpace resides in the same ruby process with
+ RingServer. a patch from Kent Sibilev. [ruby-core:08453]
Wed Aug 16 11:45:36 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* process.c (proc_setuid, proc_setgid, proc_seteuid, proc_setegid):
get rid of bogus implementations on Mac OS X.
+Tue Aug 15 19:10:18 2006 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser#find_class_comment): Fix
+ broken class-level documentation.
+
Wed Aug 16 11:09:26 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ruby.c (set_arg0): fill argv other than the first with an empty
string instead of NULL.
-Tue Aug 15 11:21:08 2006 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/smtp.rb: support SMTP/SSL. Thanks Kazuhiro NISHIYAMA.
-
- * lib/net/smtp.rb: new method SMTP.use_ssl?
-
- * lib/net/smtp.rb: new method SMTP.enable_ssl.
-
- * lib/net/smtp.rb: new method SMTP.disable_ssl.
-
- * lib/net/smtp.rb: new method SMTP.default_ssl_port.
-
- * lib/net/smtp.rb: new method SMTP.default_tls_port.
-
- * lib/net/smtp.rb: now SMTP#enable_tls accepts a SSLContext
- object, instead of a verity and cert. [FEATURE CHANGE]
-
- * lib/net/smtp.rb: new method SMTP.ssl_context.
-
- * lib/net/smtp.rb: new method SMTP.default_ssl_context.
-
- * lib/net/smtp.rb: export SMTP.authenticate.
+Wed Aug 16 11:08:00 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/net/smtp.rb: export SMTP.auth_plain.
-
- * lib/net/smtp.rb: export SMTP.auth_login.
-
- * lib/net/smtp.rb: export SMTP.auth_cram_md5.
-
- * lib/net/smtp.rb: export SMTP.starttls.
-
- * lib/net/smtp.rb: export SMTP.helo.
-
- * lib/net/smtp.rb: export SMTP.ehlo.
-
- * lib/net/smtp.rb: export SMTP.mailfrom.
-
- * lib/net/smtp.rb: export SMTP.rcptto.
-
- * lib/net/smtp.rb: export SMTP.rcptto_list.
-
- * lib/net/smtp.rb: export SMTP.data.
-
- * lib/net/smtp.rb: export SMTP.quit.
-
-Sat Aug 12 22:33:06 2006 Eric Hodel <drbrain@segment7.net>
-
- * string.c (String#split): Describe grouping behavior. Patch by Jan
- Svitok <jan.svitok at gmail.com>. [ruby-core:08603]
-
-Sun Aug 13 12:08:02 2006 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/socket.c: ANSIfied. [ruby-core:08601]
-
-Sat Aug 12 15:55:32 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in, bcc32/Makefile.sub, win32/Makefile.sub, win32/dir.h,
- win32/win32.c, win32/win32.h: large file support for win32.
-
-Fri Aug 11 15:39:25 2006 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser#find_body): Make RDoc
- ignore C function prototypes. Patch by Tilman Sauerbeck
- <tilman at code-monkey.de>. [ruby-core:8574]
- * lib/yaml/tag.rb: Replace nodoc with stopdoc so Module methods get
- documented.
-
-Wed Aug 9 16:53:28 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/net/smtp.rb (Net::SMTP::auth_cram_md5): use ord to retrieve
- bytes from strings. a patch from WATANABE Tetsuya
- <Tetsuya.WATANABE at nifty.com>. [ruby-dev:29240]
+ * win32/win32.h: removed an excess macro. fixed: [ruby-dev:29258]
Tue Aug 8 23:49:06 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
@@ -46252,23 +5699,17 @@ Tue Aug 8 23:49:06 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
RDoc. a patch from Eric Hodel <drbrain at segment7.net>.
[ruby-core:08522]
-Tue Aug 8 19:26:10 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/resolv.rb (Resolv::DNS::Message::MessageDecoder::get_string):
- affected by str[0] returns 1 char string. [ruby-dev:29223]
+Tue Aug 8 11:32:54 2006 NAKAMURA Usaku <usa@ruby-lang.org>
- * lib/resolv.rb (Resolv::DNS::Message::MessageDecoder::get_labels):
- ditto.
-
-Tue Aug 8 12:28:43 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (arg): allow newlines before ternary colon. [ruby-dev:29189]
+ * Makefile.in, common.mk, configure.in: fix for platforms without
+ rm. patches from Yutaka kanemoto <kinpoco at gmail.com>.
+ [ruby-dev:29215]
Mon Aug 7 17:56:59 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* ext/bigdecimal/bigdecimal.c, ext/digest/rmd160/rmd160ossl.c,
ext/digest/sha1/sha1ossl.c, ext/readline/readline.c: move
- inclusion of config.h to pacify AIX. a patch from Yutaka
+ incluion of config.h to pacify AIX. a patch from Yutaka
Kanemoto <kinpoco at gmail.com>. [ruby-dev:29197]
Mon Aug 7 15:55:08 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
@@ -46285,58 +5726,33 @@ Mon Aug 7 14:37:48 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
Mon Aug 7 12:05:28 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * dln.c, eval.c, gc.c, ruby.h: shut up AIX alloca warning.
- a patch from Yutaka Kanemoto <kinpoco at gmail.com>.
+ * dln.c, eval.c, gc.c, regex.c, ruby.h: shut up AIX alloca
+ warning. a patch from Yutaka Kanemoto <kinpoco at gmail.com>.
[ruby-dev:29191]
-Sun Aug 6 20:34:24 2006 Tadayoshi Funaba <tadf@dotrb.org>
+Sun Aug 6 20:40:41 2006 Tadayoshi Funaba <tadf@dotrb.org>
* lib/date/format.rb (str[fp]time): %[EO]U didn't denote %U.
-Sun Aug 6 17:12:12 2006 Tanaka Akira <akr@fsij.org>
-
- * io.c (io_reopen): STDERR.reopen(open("/dev/tty", "w")) should not
- clear FMODE_PREP in STDERR.
-
-Sat Aug 5 22:53:41 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
-
- * oniguruma.h: Version 4.2.2
-
- * regint.h: ditto.
-
- * regparse.h: ditto.
-
- * regexec.c: ditto.
-
- * regcomp.c ditto.
-
- * regerror.c: ditto.
-
- * regparse.c: ditto.
-
Sat Aug 5 17:07:43 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* parse.y (top_local_setup): local_vars[-1] should point
ruby_scope itself to protect local_tbl from garbage collection.
[ruby-dev:29049]
-Sat Aug 5 13:49:43 2006 Tadayoshi Funaba <tadf@dotrb.org>
+Sat Aug 5 13:54:03 2006 Tadayoshi Funaba <tadf@dotrb.org>
* lib/date/format.rb (str[fp]time): "%\n" means "\n".
-Fri Aug 4 12:13:22 2006 Eric Hodel <drbrain@segment7.net>
+Fri Aug 4 15:21:00 2006 Eric Hodel <drbrain@segment7.net>
- * lib: Clean up files for RDoc.
- * lib/.document: Include most of the standard library in RDoc
- generation.
- * lib/rdoc/ri/ri_formatter.rb: Don't unescape HTML in HtmlFormatter.
- Submitted by <ksruby at gmail.com>. [ruby-core:08392].
+ * lib: Merge RDoc and .document from HEAD.
* lib/drb/ssl.rb: Close socket on SSLError [ruby-core:7197]
-Fri Aug 4 18:59:49 2006 Keiju Ishitsuka <keiju@ruby-lang.org>
+Fri Aug 4 19:13:41 2006 Keiju Ishitsuka <keiju@ruby-lang.org>
* lib/irb/{init.rb,ruby-lex.rb,slex.rb}: can't input '\c' for
- [ruby-core: 7122]. and support for ruby1.8.X
+ [ruby-core: 7122].
Fri Aug 4 14:02:14 2006 James Edward Gray II <james@grayproductions.net>
@@ -46349,22 +5765,15 @@ Fri Aug 4 13:56:51 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* pack.c (pack_pack): check argument overrun for 'P'. based on a
patch by rucila <rucila at yahoo.cojp>. fixed: [ruby-dev:29182]
-Fri Aug 4 02:42:29 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * sprintf.c (rb_str_format): a bug in %c type check.
+Tue Aug 1 17:44:03 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Aug 4 01:28:19 2006 Tanaka Akira <akr@fsij.org>
-
- * io.c (io_reopen): STDERR.reopen(File.open("/dev/null", "w")) should
- not fclose stderr.
+ * win32/win32.c (init_stdhandle): assign standard file handles.
-Thu Aug 3 15:16:44 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+Tue Aug 1 12:24:58 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * range.c (range_include): should always call Enumerable#include?
- (not #===) for non numeric end points. [ruby-core:08477]
- [ruby-core:08496]
+ * eval.c (Init_Binding): fix old commit miss.
-Mon Jul 31 16:51:40 2006 NAKAMURA Usaku <usa@ruby-lang.org>
+Mon Jul 31 17:08:20 2006 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/win32.c (exit_handler): new function; release winsock and
environment work area.
@@ -46375,7 +5784,7 @@ Mon Jul 31 16:51:40 2006 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/win32.c (rb_w32_getenv): use GetEnvironmentStrings() instead
of GetEnvironmentVariable(), because the latter cannot distinguish
- whether a null environment variable exists or not.
+ wheather a null environment variable exists or not.
fixed: [ruby-talk:205123]
Mon Jul 31 16:15:13 2006 Tanaka Akira <akr@fsij.org>
@@ -46384,18 +5793,18 @@ Mon Jul 31 16:15:13 2006 Tanaka Akira <akr@fsij.org>
setrlimit may fail with EINVAL.
reported by MIYAMUKO Katsuyuki. [ruby-dev:29174]
+Mon Jul 31 13:38:22 2006 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * lib/webrick/httprequest.rb (WEBrick::HTTPReuqest#parse_uri): improve
+ for the value of IPv6 address in the Host: header field.
+
Mon Jul 31 09:22:12 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* ruby.h: use ifdef (or defined) for macro constants that may or
may not be defined to shut up gcc's -Wundef warnings.
[ruby-core:08447]
-Mon Jul 31 13:38:13 2006 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/webrick/httprequest.rb (WEBrick::HTTPReuqest#parse_uri): improve
- for the value of IPv6 address in the Host: header field.
-
-Sun Jul 30 23:26:12 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun Jul 30 23:26:22 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (rb_call0): trace call/return of method defined from block.
fixed: [ruby-core:08329]
@@ -46417,33 +5826,9 @@ Sat Jul 29 01:23:52 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
statement back before the comment block. a patch from Hugh
Sasse <hgs at dmu.ac.uk>. [ruby-core:08422]
-Fri Jul 28 17:18:03 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/curses/curses.c (NUM2CH, CH2FIX): use single char strings.
-
-Fri Jul 28 14:09:14 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_call): fixed typo in cache look-up. [ruby-dev:29167]
-
-Fri Jul 28 10:41:35 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_call): a bug in method cache look-up.
- http://www.rubyist.net/~matz/20060720.html#c04
-
-Fri Jul 28 10:19:28 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * sprintf.c (rb_f_sprintf): documentation update patch from Jacob
- Fugal <lukfugl at gmail.com>. [ruby-core:08418]
-
-Fri Jul 28 09:41:45 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * time.c (time_to_s): fixed typo. [ruby-dev:29162]
-
-Fri Jul 28 00:26:47 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * math.c (domain_check): ANSI style function arguments
+Thu Jul 27 22:21:52 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * math.c (math_log): too few argument to domain_check().
+ * time.c (time_to_s): fixed format mismatch.
Thu Jul 27 21:19:54 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
@@ -46456,10 +5841,6 @@ Thu Jul 27 21:19:54 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* math.c (math_sqrt): fix documentation flaw.
-Thu Jul 27 22:21:52 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * time.c (time_to_s): fixed format mismatch.
-
Thu Jul 27 18:12:12 2006 WATANABE Hirofumi <eban@ruby-lang.org>
* time.c: need to declare time_utc_offset.
@@ -46469,19 +5850,23 @@ Thu Jul 27 17:01:01 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* io.c (io_close): always calls "close" method of the receiver.
[ruby-core:6911] [ruby-core:8112]
+Thu Jul 27 16:49:01 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * time.c (time_to_s): use +0900 style timezone string for local time.
+ [ruby-dev:29143]
+
Thu Jul 27 16:41:15 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* ext/openssl/ossl.h: move <ruby.h> inclusion point to shut up
Solaris compiler. [ruby-core:08114]
- * time.c (time_to_s): use +0900 style timezone string for local time.
- [ruby-dev:29143]
-
Wed Jul 26 22:20:59 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* configure.in: add support for as and ASFLAGS. [ruby-dev:29138]
-Wed Jul 26 21:59:33 2006 Minero Aoki <aamine@loveruby.net>
+Wed Jul 26 22:13:45 2006 Minero Aoki <aamine@loveruby.net>
+
+ * lib/net/http.rb: sync with HEAD (rev 1.132).
* lib/net/http.rb (Net::HTTP#post, request_post, request): should
set Content-Type: x-www-form-urlencoded by default.
@@ -46495,37 +5880,21 @@ Wed Jul 26 21:59:33 2006 Minero Aoki <aamine@loveruby.net>
* lib/net/http.rb (Net::HTTPHeader#type_params): wrongly failed
when there's no Content-Type.
-Wed Jul 26 18:38:13 2006 Minero Aoki <aamine@loveruby.net>
-
- * ext/strscan/strscan.c (strscan_do_scan): always return nil if
- p->curr exceeds string size.
-
-Wed Jul 26 18:33:31 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (Init_eval): rename #invoke_method and
- #invoke_functional_method to __send and __send! respectively.
-
- * eval.c (remove_method): prohibit removing __send and __send!.
-
- * eval.c (rb_undef): prohibit undef'ing __send and __send!.
+Wed Jul 26 18:35:38 2006 Minero Aoki <aamine@loveruby.net>
- * eval.c (rb_eval): prohibit redefining __send and __send!.
+ * ext/strscan/strscan.c: sync with HEAD (rev 1.25).
- * lib/delegate.rb (Delegator): preserve __send.
+ * ext/strscan/strscan.c (strscan_do_scan):
+ StringScanner.new("").scan(//) should return "". [ruby-Bugs:4361]
Wed Jul 26 18:14:19 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/pty/pty.c (getDevice): retry once after GC on failure.
[ruby-core:08282]
-Wed Jul 26 17:43:20 2006 Minero Aoki <aamine@loveruby.net>
-
- * ext/strscan/strscan.c (strscan_do_scan):
- StringScanner.new("").scan(//) should return "". [ruby-Bugs:4361]
-
Wed Jul 26 17:28:16 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * sprintf.c (rb_str_format): prepend ".." to %u for negative bignum,
+ * sprintf.c (rb_f_sprintf): prepend ".." to %u for negative bignum,
but not "-". fixed: [ruby-core:08167]
Wed Jul 26 16:39:07 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
@@ -46543,7 +5912,11 @@ Wed Jul 26 01:02:59 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in: suppress warnings by automake 1.8 or later.
-Tue Jul 25 14:46:14 2006 NAKAMURA Usaku <usa@ruby-lang.org>
+Tue Jul 25 00:30:06 2006 Eric Hodel <drbrain@segment7.net>
+
+ * lib/prettyprint.rb: RD to RDoc conversion by Hugh Sasse.
+
+Tue Jul 25 14:49:51 2006 NAKAMURA Usaku <usa@ruby-lang.org>
* lib/mkmf.rb (configuration): typo.
@@ -46556,6 +5929,13 @@ Mon Jul 24 22:03:40 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (backtrace): skip frames successive on node and method name.
+Mon Jul 24 17:55:55 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * process.c (rb_f_system): add security check. [ruby-talk:202947]
+
+ * process.c (rb_f_system): move signal right before fork to avoid
+ signal handler intervention.
+
Mon Jul 24 15:51:52 2006 Tanaka Akira <akr@fsij.org>
* ext/readline/readline.c (readline_readline): rl_deprep_term_function
@@ -46571,61 +5951,36 @@ Sun Jul 23 22:59:49 2006 Tanaka Akira <akr@fsij.org>
* test/socket/test_unix.rb: disabled on cygwin.
reported by Kouhei Yanagita. [ruby-dev:29080]
-Fri Jul 21 23:57:26 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (proc_options): script is never used while recursing.
-
Fri Jul 21 21:21:08 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (rb_call0): include funcalled methods in caller list.
fixed: [ruby-core:08290]
-Fri Jul 21 17:52:24 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (rb_cstr_to_dbl): "9_e8" should consider "_e8" as
- trailing garbage so that it should return 9.0. [ruby-dev:29088]
-
Fri Jul 21 12:11:00 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/extmk.rb, lib/mkmf.rb (with_destdir): remove drive letter before
prepending destdir on DOSISH.
-Fri Jul 21 04:17:22 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_call): try local method look-up first for fcall, then
- normal method look-up. [ruby-talk:202564]
-
- * eval.c (rb_get_method_body): save local method cache separately.
-
- * eval.c (search_method): export info whether method is local or
- not.
-
-Thu Jul 20 20:27:07 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (rb_mod_attr): make Module#attr to be an alias to
- attr_reader. [RCR#331]
-
Thu Jul 20 15:07:14 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* ruby.h: export classes/modules to implement sandbox.
[ruby-core:08283]
-Wed Jul 19 19:40:00 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+Thu Jul 20 00:06:29 2006 Keiju Ishitsuka <keiju@ishitsuka.com>
- * eval.c (rb_yield_0): should check args_args before lambda
- argument check. [ruby-dev:29029]
+ * lib/irb/completion.rb: support for completion of numeric
+ number. [ruby-dev: 29038]
-Tue Jul 18 23:53:59 2006 NAKAMURA Usaku <usa@ruby-lang.org>
+Wed Jul 19 23:53:05 2006 Kouhei Sutou <kou@cozmixng.org>
- * process.c (rb_f_system): shouldn't block SIGCHLD if it's not
- exist.
+ * lib/rss/parser.rb, lib/rss/utils.rb: added documents.
Tue Jul 18 22:10:13 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* process.c (rb_f_system): block SIGCHLD during the process
execution, like glibc system(3) does. [ruby-talk:202361]
-Tue Jul 18 23:10:43 2006 NAKAMURA Usaku <usa@ruby-lang.org>
+Tue Jul 18 23:12:14 2006 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/win32.c (open_ifs_socket): should not use plain malloc.
@@ -46636,11 +5991,6 @@ Tue Jul 18 18:05:49 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* test/ruby/test_float.rb (TestFloat::test_strtod): update test to
conform strtod change.
-Tue Jul 18 16:52:29 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (yield_under_i): argument should be passed in avalue
- form. [ruby-dev:29044]
-
Tue Jul 18 15:49:42 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* pack.c (pack_unpack): propagate association array to copied
@@ -46652,15 +6002,6 @@ Tue Jul 18 15:49:42 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* pack.c (pack_pack): taint 'p' packed strings.
-Tue Jul 18 15:19:07 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * intern.h (st_foreach_safe): fix prototype.
-
- * node.h (NODE_LMASK): bigger than long on LLP64.
-
- * missing/vsnprintf.c (BSD__uqtoa): new function to support LLP64.
- all changes are derived from [ruby-dev:29045]
-
Tue Jul 18 14:03:02 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/webrick/httpserver.rb (WEBrick::HTTPServer::unmount): remove
@@ -46676,7 +6017,7 @@ Tue Jul 18 10:53:37 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
Mon Jul 18 00:43:05 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* util.c (ruby_strtod): stop at dot not followed by digits.
- fixed: [ruby-dev:29036]
+ fixed: [ruby-dev:29035]
Tue Jul 18 00:01:27 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
@@ -46687,23 +6028,23 @@ Mon Jul 17 23:30:46 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (rb_cv_msvcrt): defaulted to msvcrt. Workaround for a
bug of cygwin 1.5.20.
-Mon Jul 17 22:55:31 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/io/wait/wait.c (io_ready_p): protoize.
-
Mon Jul 17 13:43:05 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* pack.c (define_swapx): should not use plain malloc.
- * ext/curses/curses.c (curses_getmouse): ditto.
-
Mon Jul 17 12:58:41 2006 WATANABE Hirofumi <eban@ruby-lang.org>
* configure.in: should use ac_cv_lib_dl_dlopen=no on MinGW.
-Mon Jul 17 11:47:35 2006 NAKAMURA Usaku <usa@ruby-lang.org>
+Sat Jul 15 23:50:12 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * st.c: still need to include config.h on some platforms.
+ * eval.c (rb_require_safe): wait for another thread requiring the same
+ feature. fixed: [ruby-core:08229]
+
+Sat Jul 15 01:27:13 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * dir.c (has_magic): glob names contain alphabets to enable case fold
+ search also for directories. fixed: [ruby-talk:201917]
Sat Jul 15 01:09:22 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
@@ -46711,6 +6052,8 @@ Sat Jul 15 01:09:22 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
malloc/calloc, to detect memory allocation failure. see
<http://www.nongnu.org/failmalloc/>.
+ * gc.c (rb_memerror): should not raise empty nomem_error.
+
Fri Jul 14 13:08:13 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tk.rb: add methods for new features of latest Tcl/Tk8.5.
@@ -46722,6 +6065,10 @@ Fri Jul 14 02:30:12 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/monitor.rb: document patch from Hugh Sasse <hgs at dmu.ac.uk>.
[ruby-core:08205]
+Fri Jul 14 01:09:46 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * parse.y (then): error in warning action.
+
Fri Jul 14 00:10:15 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* array.c (rb_ary_pop): may cause realloc oscillation. a patch
@@ -46733,23 +6080,15 @@ Thu Jul 13 22:23:56 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tk/composite.rb: improve handling of the classname on the
option database for the widget class which includes TkComposite.
-Thu Jul 13 00:40:57 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ruby.h (FIX2LONG): returns integer of size of VALUE.
- [ruby-dev:29024]
-
- * ruby.h (FIX2ULONG): ditto.
+Thu Jul 13 20:32:19 2006 Kouhei Sutou <kou@cozmixng.org>
-Wed Jul 12 20:05:23 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * lib/rss/parser.rb: updated documents by a patch from
+ Hugh Sasse <hgs at dmu.ac.uk>. [ruby-core:8194]
- * parse.y (f_args): allow post mandatory arguments after optional
- arguments. [ruby-dev:29014]
+Wed Jul 12 13:54:09 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * parse.y (new_args_gen): allow post_args without rest_args.
-
- * eval.c (formal_assign): ditto.
-
- * parse.y (new_args_gen): check post argument duplication.
+ * parse.y (then): we'd like to reserve colon here for the future.
+ warning added.
Tue Jul 11 20:58:18 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
@@ -46764,42 +6103,10 @@ Tue Jul 11 18:00:57 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/multi-tk.rb: security fix.
-Tue Jul 11 17:28:08 2006 NAKAMURA Usaku <usa@ruby-lang.org>
+Tue Jul 11 17:33:39 2006 NAKAMURA Usaku <usa@ruby-lang.org>
* string.c (rb_str_dump): need to extend len for \b.
-Tue Jul 11 15:29:15 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bignum.c (rb_int2big): use SIGNED_VALUE. [ruby-dev:29019]
-
- * bignum.c (rb_int2inum, rb_uint2inum): use VALUE sized integer.
-
- * bignum.c (rb_big2long, rb_big2ulong): ditto.
-
- * numeric.c (rb_num2long, rb_num2ulong): ditto.
-
- * numeric.c (check_int, check_uint): ditto.
-
- * bignum.c (rb_quad_pack): typo fixed.
-
-Tue Jul 11 13:40:52 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bignum.c (bignorm): sizeof(long) may be smaller than
- sizeof(VALUE). [ruby-dev:29013]
-
- * ruby.h (FIXNUM_MAX): fixnum may be bigger than long.
-
- * ruby.h (SIGNED_VALUE): signed integer of size of VALUE.
-
-Mon Jul 10 23:37:14 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/soap/rpc/proxy.rb (Proxy::Operation::response_doc): remove
- splat star from return statements.
-
- * lib/soap/rpc/proxy.rb (Proxy::Operation::response_obj): retrieve
- the first value from the result array if response has only one
- value.
-
Mon Jul 10 22:00:00 2006 Shigeo Kobayashi <shigek@ruby-lang.org>
* ext/bigdecimal/bigdecimal.c: Allows '_' to appear within
@@ -46843,52 +6150,17 @@ Mon Jul 10 18:46:52 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/sample/demos-jp/widget: ditto.
-Mon Jul 10 17:32:38 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+Mon Jul 10 13:58:40 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * sample/test.rb: update test suites.
+ * signal.c (ruby_nativethread_signal, posix_nativethread_signal,
+ sigsend_to_ruby_thread, install_nativethread_sighandler):
+ nativethread-support on signal handler. RE-backport from 1.9.
- * test/ruby/test_assignment.rb (TestAssignment::test_yield): ditto.
+ * ruby.h (HAVE_NATIVETHREAD_KILL): ditto.
- * test/ruby/test_iterator.rb (TestIterator::test_itertest): ditto.
+ * eval.c (ruby_native_thread_kill): ditto.
-Mon Jul 10 14:43:47 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_call): remove erroneously restored prot_tag->blkid
- initialization. [ruby-dev:28997] [ruby-dev:29000]
-
-Mon Jul 10 13:58:08 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * signal.c (install_nativethread_sighandler): commented out.
-
-Mon Jul 10 09:29:12 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_clear_cache_for_remove): clear entries for included
- module. fixed: [ruby-core:08180]
-
-Mon Jul 10 02:22:58 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (proc_invoke): should not overwrite block information in
- current frame. [ruby-dev:28957]
-
- * eval.c (rb_yield_0): retrieve proper block object from the frame
- record.
-
- * eval.c (proc_alloc): return preserved block object if it's
- available.
-
-Mon Jul 10 01:48:38 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * st.h (st_data_t): use pointer sized integer for st_data_t.
- [ruby-dev:28988]
-
-Sun Jul 9 18:06:47 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb (try_constant): fix for value 1 at cross compiling.
-
- * lib/mkmf.rb (create_makefile): prevent substitution of macro
- definition. fixed: http://www.yotabanana.com/lab/20060624.html#p02
-
-Sun Jul 9 07:58:48 2006 Ryan Davis <ryand@zenspider.com>
+Mon Jul 10 10:54:14 2006 Ryan Davis <ryand@zenspider.com>
* lib/rdoc/parsers/parse_f95.rb: massive overhaul from Yasuhiro
Morikawa including new file suffixes, function support, public
@@ -46908,33 +6180,44 @@ Sun Jul 9 07:58:48 2006 Ryan Davis <ryand@zenspider.com>
* lib/pp.rb: minor clarification on exception.
-Sun Jul 9 00:54:11 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Jul 10 09:29:12 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (rb_clear_cache_for_undef): clear entries for included
+ module. fixed: [ruby-core:08180]
- * eval.c (next_jump): deal with destination of next.
- fixed: [ruby-core:08169]
+Mon Jul 10 01:48:38 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-Fri Jul 7 17:49:16 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * st.h (st_data_t): use pointer sized integer for st_data_t.
+ [ruby-dev:28988]
- * string.c (rb_str_ord): extract lower byte. fixed: [ruby-dev:28980]
+Sun Jul 9 18:06:47 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/jcode.rb (String#succ!): fix for 1.9. fixed: [ruby-dev:28979]
+ * lib/mkmf.rb (try_constant): fix for value 1 at cross compiling.
+
+ * lib/mkmf.rb (create_makefile): prevent substitution of macro
+ definition. fixed: http://www.yotabanana.com/lab/20060624.html#p02
-Fri Jul 7 14:05:03 2006 NAKAMURA Usaku <usa@ruby-lang.org>
+Sun Jul 9 00:54:34 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * win32/Makefile.sub (config.h): define FUNC_STDCALL/FUNC_CDECL.
- from [ruby-dev:28970].
+ * eval.c (next_jump): deal with destination of next.
+ fixed: [ruby-core:08169]
Fri Jul 7 00:38:49 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* hash.c (rb_hash_default): should not call default procedure if
no key is given. [ruby-list:42541]
-Thu Jul 6 23:30:04 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Jul 7 00:29:10 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * time.c (time_mload): a patch from Daniel Berger
+ <Daniel.Berger at qwest.com>. [ruby-core:08128]
+
+Thu Jul 6 22:21:57 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* process.c (rb_proc_times): use sysconf(_SC_CLK_TCK) value prior to
HZ and CLK_TCK. fixed: [ruby-talk:200293]
-Thu Jul 6 21:50:06 2006 Minero Aoki <aamine@loveruby.net>
+Thu Jul 6 22:17:21 2006 Minero Aoki <aamine@loveruby.net>
* ext/racc/cparse/cparse.c: sync with original code, rev 1.8.
@@ -46944,35 +6227,11 @@ Thu Jul 6 21:50:06 2006 Minero Aoki <aamine@loveruby.net>
* lib/racc/parser.rb: update coding style.
-Wed Jul 5 05:28:45 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (block_param): should allow block argument after splat
- and post splat args.
-
-Wed Jul 5 01:12:19 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * test/ruby/test_lambda.rb (TestLambdaParameters::test_lambda_as_iterator):
- -> style block no longer available. [ruby-dev:28958]
-
-Tue Jul 4 21:48:56 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ruby.c (proc_options): suppress warning on DOSISH.
-
-Tue Jul 4 15:12:49 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_call): should not set prot_tag->blkid since it would
- never catch breaks at this level. [ruby-dev:28922]
-
-Tue Jul 4 04:48:36 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bignum.c: ruby 1.9 HEAD 64 bit warnings clean up from
- <ville.mattila at stonesoft.com>. [ruby-core:08120]
-
Mon Jul 3 19:04:38 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/tcltklib.c (ip_make_menu_embeddable): help to make a menu
widget embeddable (pack, grid, and so on) like as a general widget.
- However, an embeddable menu may require to be defined some event
+ However, an embeddable menu may require to be definied some event
bindings for general use.
* ext/tk/lib/tk/event.rb: [bug fix] Tk.callback_break and
@@ -46990,15 +6249,6 @@ Mon Jul 3 14:42:06 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
from int, and sys/types.h needs to be included before grp.h.
fixed: [ruby-dev:28938]
-Mon Jul 3 10:44:01 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (popen_exec): close file descriptors other than standard I/Os.
- fixed: [ruby-dev:28924]
-
-Mon Jul 3 05:15:29 2006 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * test/openssl/test_asn1.c: String#[]= doesn't accept Integer.
-
Mon Jul 3 01:14:15 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* string.c (rb_str_inspect): encode \b (\010) for escape.
@@ -47006,34 +6256,15 @@ Mon Jul 3 01:14:15 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* string.c (rb_str_dump): ditto.
-Sun Jul 2 19:03:30 2006 Minero Aoki <aamine@loveruby.net>
-
- * ext/racc/cparse/cparse.c: sync with original code, rev 1.7.
-
- * ext/racc/cparse/cparse.c: must require version.h to get
- RUBY_VERSION_CODE.
-
-Sun Jul 2 18:42:27 2006 Minero Aoki <aamine@loveruby.net>
+Sun Jul 2 19:17:56 2006 Minero Aoki <aamine@loveruby.net>
- * ext/racc/cparse/cparse.c: sync with original source code, rev
- 1.6.
+ * ext/racc/cparse/cparse.c: sync with original code (rev 1.7).
- * ext/racc/cparse/cparse.c: do not use rb_iterate to give a block
- to the method, use rb_block_call instead. [ruby-dev:28445]
-
-Sun Jul 2 11:22:03 2006 Tanaka Akira <akr@m17n.org>
-
- * io.c (io_reopen): STDOUT.reopen(filename, "w+") didn't work.
- (rb_io_reopen): STDOUT.reopen(File.open(filename, "w+")) didn't work.
-
-Sat Jul 1 23:55:42 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (PUSH_FRAME): initialize frame->self. [ruby-dev:28911]
-
-Sat Jul 1 17:00:42 2006 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * test/webrick/utils.rb: use Proc#yield instead of Proc#call.
- [ruby-dev:28914]
+ * ext/racc/cparse/cparse.c: use rb_catch instead of rb_iterate.
+ Giving a block to a Ruby-level method by rb_iterate is obsolete on
+ Ruby 1.9. Note that current cparse.c still includes one
+ rb_iterate call on Ruby 1.8, but it is not a problem (at least
+ just now).
Sat Jul 1 15:15:49 2006 Tanaka Akira <akr@m17n.org>
@@ -47049,34 +6280,6 @@ Fri Jun 30 23:46:23 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* configure.in: -shared patch from Andrew Morrow
<andrew.c.morrow at gmail.com>. [ruby-core:08100]
-Fri Jun 30 19:35:41 2006 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/webrick/httputils.rb (WEBrick::HTTPUtils._escape): should
- use String#ord to get ascii code from the one-character string.
- [ruby-dev:28901]
-
-Thu Jun 29 23:56:01 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * gc.c (gc_mark_children): a bug in NODE_BLOCK_PASS marking.
- [ruby-dev:28908]
-
-Thu Jun 29 23:04:36 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y: use ARGSPUSH instead of ARGSCAT to prevent too much
- splat expansion.
-
- * eval.c (when_check): need to handle ARGSPUSH as well.
-
- * eval.c (block_orphan): lambda and proc from method are always
- orphan.
-
- * gc.c (gc_mark_children): proper marking for NODE_LAMBDA.
-
-Thu Jun 29 22:47:30 2006 Tanaka Akira <akr@m17n.org>
-
- * eval.c (SETUP_ARGS0): avoid GC problem.
- [ruby-dev:28902]
-
Thu Jun 29 18:58:51 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* ext/bigdecimal/bigdecimal.c (BigDecimal_version): fix patch
@@ -47087,51 +6290,16 @@ Thu Jun 29 18:00:51 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* ext/bigdecimal/bigdecimal.c: add RDoc document. a patch from
mathew <meta at pobox.com>. [ruby-core:07050]
-Wed Jun 28 14:53:09 2006 Eric Hodel <drbrain@segment7.net>
+Wed Jun 28 15:47:14 2006 Eric Hodel <drbrain@segment7.net>
* lib/optparse.rb: RDoc patch from Robin Stocker <robin@nibor.org>
[ruby-core:08087]
-Wed Jun 28 23:23:48 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (rb_cstr_to_dbl): underscores should appear only
- between digits. [ruby-dev:28891]
-
Wed Jun 28 19:04:34 2006 Tanaka Akira <akr@m17n.org>
* test/socket/test_unix.rb: test_seqpacket_pair removed.
[ruby-dev:28846]
-Wed Jun 28 13:51:21 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (when_check): arbitrary values are allowed after splats.
- fixed: [ruby-dev:28879]
-
-Wed Jun 28 09:16:18 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (primary): remove meaningless else-only case statement
- syntax.
-
-Wed Jun 28 08:08:13 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_eval): problem to handle else part. [ruby-dev:28873]
-
-Wed Jun 28 01:48:23 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_eval): support splat in when expression list.
- [ruby-dev:28822]
-
- * eval.c (when_check): a new auxiliary function for case match.
-
- * eval.c (when_cond): ditto.
-
-Wed Jun 28 01:05:37 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (rb_cstr_to_dbl): should not skip '_' at the beginning
- of a string. [ruby-dev:28830]
-
- * bignum.c (rb_cstr_to_inum): ditto.
-
Tue Jun 27 23:03:49 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* string.c: RDoc update for =~ method. a patch from Alex Young
@@ -47144,17 +6312,6 @@ Tue Jun 27 22:47:18 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tk.rb (tk_tcl2ruby): [bug fix] sometimes fail to convert
a tcl string to a ruby object if the tcl string includes "\n".
-Tue Jun 27 20:05:14 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (pipe_open): backout unnecessary fix on 2006-06-26.
- [ruby-dev:28865]
-
- * eval.c (rb_yield_0): exact argument number check now done only
- for lambda Proc.
-
- * eval.c (rb_yield_0): add check for number of arguments, if
- there's one lambda block parameter.
-
Tue Jun 27 16:04:05 2006 WATANABE Hirofumi <eban@ruby-lang.org>
* win32/win32.h: define isascii on MinGW for msvcrt compatibility.
@@ -47167,246 +6324,297 @@ Tue Jun 27 11:36:02 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/etc/etc.c (setup_passwd, setup_group): allow bignum uid, gid and
so on. [ruby-talk:199102]
-Tue Jun 27 10:46:53 2006 Tanaka Akira <akr@m17n.org>
+Mon Jun 26 13:37:27 2006 Eric Hodel <drbrain@segment7.net>
- * eval.c (rb_yield_0): avoid core dump. [ruby-dev:28840]
+ * lib/rdoc: Merge from HEAD.
+ Add options to limit the ri search path.
-Mon Jun 26 11:03:00 2006 Eric Hodel <drbrain@segment7.net>
+Tue Jun 27 00:54:08 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/rdoc/ri: Add options to limit the ri search path.
-
-Tue Jun 27 01:31:59 2006 Tanaka Akira <akr@m17n.org>
-
- * ext/socket/socket.c (bsock_recv_nonblock): new method
- BasicSocket#recv_nonblock.
- (udp_recvfrom_nonblock): renamed from ip_recvfrom_nonblock.
- IPSocket#recvfrom_nonblock is moved to UDPSocket#recvfrom_nonblock.
- (unix_recvfrom_nonblock): removed.
- UNIXSocket#recvfrom_nonblock is removed.
-
-Tue Jun 27 00:52:40 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/ripper/eventids2.c (token_assoc): added tCHAR, which is not
- under 256 now. fixed: [ruby-dev:28832]
-
-Mon Jun 26 23:42:57 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (call_trace_func): no check for argument number of the
- callback. fixed: [ruby-dev:28812]
+ * util.c (powersOf10): constified.
Mon Jun 26 18:37:44 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/tcltklib.c (ip_delete): fix SEGV when a slave-ip is
deleted on callback.
-Mon Jun 26 15:40:26 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/socket/socket.c (sock_accept): revert to avoid ambiguity of
- argument evaluation order. [ruby-dev:28861]
-
- * ext/socket/socket.c (sock_accept_nonblock): ditto.
-
Mon Jun 26 10:47:42 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* io.c (pipe_open): avoid closing uninitialized file descriptors.
a patch from <tommy at tmtm.org> [ruby-dev:28600]
+Mon Jun 26 09:56:22 2006 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * win32/win32.[ch] (rb_w32_send, rb_w32_sendto): constified.
+
Sun Jun 25 23:02:12 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* Makefile.in, mkconfig.rb: catch-up for latest autoconf.
-Sun Jun 25 17:44:16 2006 Tanaka Akira <akr@m17n.org>
+Sat Jun 24 06:35:00 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * parse.y (paren_args): wrap $2 by escape_Qundef because it may be
- Qundef. [ruby-dev:28843]
+ * signal.c: revert last change.
-Sun Jun 25 17:18:33 2006 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+ * ruby.h: ditto.
- * ext/win32ole/win32ole.c(ole_invoke): support some kind of
- method of word. [ruby-Bugs#3237]
+ * eval.c: ditto.
- * test/win32ole/test_word.rb: ditto.
+Thu Jun 22 11:52:02 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-Sat Jun 24 23:48:08 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * lib/net/http.rb (Net::HTTPResponse): duplicated error 501;
+ HTTPInternalServerError should be error 500. [ruby-core:08037]
- * parse.y: replace terminal token names with more descriptive
- name, i.e. kEND to keyword_end. [ruby-list:42477]
+Thu Jun 22 05:15:58 2006 Tanaka Akira <akr@m17n.org>
-Sat Jun 24 23:37:41 2006 Tanaka Akira <akr@m17n.org>
+ * ext/socket/socket.c (sock_s_socketpair): try GC only once.
+ [ruby-dev:28778]
- * eval.c (rb_eval): use rb_ary_new2 instead of rb_ary_new4 to avoid
- GC problem.
- (rb_yield_values): use rb_ary_new2 instead of rb_ary_new4.
+Wed Jun 21 21:28:32 2006 Tadayoshi Funaba <tadf@dotrb.org>
- * array.c (rb_ary_new4): don't set len as n if contents is not
- initialized. make it safe with GC.
+ * lib/date.rb (jd_to_commercial): now works fine even if in
+ mathn-ized context.
- [ruby-dev:28826]
+Wed Jun 21 17:32:31 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-Fri Jun 23 23:35:32 2006 Tanaka Akira <akr@m17n.org>
+ * signal.c (ruby_nativethread_signal, posix_nativethread_signal,
+ sigsend_to_ruby_thread, install_nativethread_sighandler):
+ nativethread-support on signal handler (backport from 1.9).
- * ruby.h, lib/drb/drb.rb, lib/drb/invokemethod.rb: remove Values class.
- [ruby-dev:28805]
+ * ruby.h (HAVE_NATIVETHREAD_KILL): ditto.
-Fri Jun 23 17:27:52 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * eval.c (ruby_native_thread_kill): ditto.
- * eval.c (rb_block_pass): removed.
+Wed Jun 21 08:39:54 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * eval.c (rb_thread_start_1): use rb_proc_yield() instead of
- rb_block_pass(). fixed: [ruby-dev:28794]
+ * lib/xmlrpc/create.rb (XMLRPC::Create::conv2value): merge Date
+ and Time processing. [ruby-core:08033]
-Thu Jun 22 11:52:02 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+Wed Jun 21 01:40:25 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/net/http.rb (Net::HTTPResponse): duplicated error 501;
- HTTPInternalServerError should be error 500. [ruby-core:08037]
+ * parse.y (yylex, reswords): modifier token is no longer returned in
+ fname state. [ruby-dev:28775]
-Thu Jun 22 11:47:52 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+Wed Jun 21 01:12:46 2006 Kouhei Sutou <kou@cozmixng.org>
- * variable.c (rb_mod_name): returns nil for anonymous modules.
- [ruby-talk:198440]
+ * lib/rss/rss.rb: RSS::Element.def_corresponded_attr_writer
+ supported date type.
-Thu Jun 22 10:31:39 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+Tue Jun 20 22:08:36 2006 Kouhei Sutou <kou@cozmixng.org>
- * string.c (rb_str_aref): "abc"[3] should not return an empty
- string but nil. [ruby-dev:28786]
+ * test/rss/test_parser.rb: split parser tests into ...
+ * test/rss/test_parser_1.0.rb: ... RSS 1.0 parsing tests and ...
+ * test/rss/test_parser_2.0.rb: ... RSS 2.0 parsing tests.
-Thu Jun 22 05:15:58 2006 Tanaka Akira <akr@m17n.org>
+Tue Jun 20 21:19:06 2006 Kouhei Sutou <kou@cozmixng.org>
- * ext/socket/socket.c (sock_s_socketpair): try GC only once.
- [ruby-dev:28778]
+ * lib/rss/rss.rb: provided default RSS::Element#children.
-Wed Jun 21 21:20:31 2006 Tadayoshi Funaba <tadf@dotrb.org>
+ * lib/rss/0.9.rb: used default RSS::Element#children.
+ * lib/rss/1.0.rb: ditto.
+ * lib/rss/2.0.rb: ditto.
+ * lib/rss/taxonomy.rb: ditto.
- * lib/date.rb (jd_to_commercial): now works fine even if in
- mathn-ized context.
+Tue Jun 20 21:04:33 2006 Kouhei Sutou <kou@cozmixng.org>
-Wed Jun 21 17:29:57 2006 NAKAMURA Usaku <usa@ruby-lang.org>
+ * lib/rss/rss.rb: provided default RSS::Element#_tags.
- * ext/socket/getaddrinfo.c (freeaddrinfo, get_name): fixed typo.
+ * lib/rss/0.9.rb: used default RSS::Element#_tags.
+ * lib/rss/1.0.rb: ditto.
+ * lib/rss/2.0.rb: ditto.
+ * lib/rss/image.rb: ditto.
+ * lib/rss/taxonomy.rb: ditto.
- * ext/tk/tcltklib.c (tcl_eval, tcl_global_eval): ditto.
+Tue Jun 20 20:47:07 2006 Kouhei Sutou <kou@cozmixng.org>
- * ext/zlib/zlib.c (rscheck): constified.
+ * lib/rss/rss.rb: hide RSS::Element.install_model.
+ (RSS::Element.install_have_child_element,
+ RSS::Element.install_have_children_element,
+ RSS::Element.install_text_element,
+ RSS::Element.install_date_element): call
+ RSS::Element.install_model internally.
-Wed Jun 21 17:18:55 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * lib/rss/0.9.rb: followed new API.
+ * lib/rss/1.0.rb: ditto.
+ * lib/rss/2.0.rb: ditto.
+ * lib/rss/content.rb: ditto.
+ * lib/rss/dublincore.rb: ditto.
+ * lib/rss/image.rb: ditto.
+ * lib/rss/syndication.rb: ditto.
+ * lib/rss/taxonomy.rb: ditto.
+ * lib/rss/trackback.rb: ditto.
- * lib/pp.rb (PP::PPMethods::seplist): should have preserved
- original reference to the array. [ruby-dev:28747]
+Tue Jun 20 20:18:05 2006 GOTOU Yuuzou <gotoyuzo@notwork.org>
-Wed Jun 21 14:35:06 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * ext/openssl/extconf.rb: add check for OBJ_NAME_do_all_sorted.
- * parse.y (block_param): do not use multiple assignment for a sole
- block parameter. [ruby-dev:28710]
+ * ext/openssl/ossl_cipher.c (ossl_s_ciphers): new method
+ OpenSSL::Cipher.ciphers. it returns all the cipher names.
- * eval.c (rb_yield_0): pass a raw yielded value to a sole block
- parameter if a value is passed by yield.
+ * ext/openssl/lib/openssl/cipher.rb:
+ - add constants AES128, AES192, AES256. [ruby-dev:28610]
+ - reimplement without eval()
- * eval.c (proc_invoke): args may not be an array.
+ * ext/openssl/lib/openssl/digest.rb: reimplement without eval().
- * eval.c (rb_proc_yield): pass original value without wrapping
- it in an array.
+ * test/openssl/test_cipher.rb, test_digest: fix about reimplemented
+ features.
-Wed Jun 21 14:06:47 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * sample/openssl/cipher.rb: rewrite all.
- * parse.y (method_call): remove (fn)(args) style lambda
- invocation, add fn.(args) instead.
+Sat Jun 19 11:21:46 2006 Eric Hodel <drbrain@segment7.net>
-Wed Jun 21 08:39:54 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * lib/test/unit/assertions.rb: Merge RDoc from HEAD.
- * lib/xmlrpc/create.rb (XMLRPC::Create::conv2value): merge Date
- and Time processing. [ruby-core:08033]
+Tue Jun 20 01:06:57 2006 Kouhei Sutou <kou@cozmixng.org>
-Wed Jun 21 03:01:10 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * lib/rss/rss.rb:
+ - cleanup validation mechanism. Now, #XXX_validation is
+ needless.
+ - changed internal variable name RSS::Element::MODEL to
+ RSS::Element::MODELS.
+ - RSS::Element.install_model requires uri.
- * eval.c, file.c, etc.: code-cleanup patch from Stefan Huehner
- <stefan at huehner.org>. [ruby-core:08029]
+ * lib/rss/0.9.rb: followed new validation API.
+ * lib/rss/1.0.rb: ditto.
+ * lib/rss/2.0.rb: ditto.
+ * lib/rss/content.rb: ditto.
+ * lib/rss/dublincore.rb: ditto.
+ * lib/rss/image.rb: ditto.
+ * lib/rss/syndication.rb: ditto.
+ * lib/rss/taxonomy.rb: ditto.
+ * lib/rss/trackback.rb: ditto.
-Wed Jun 21 01:40:25 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Jun 19 23:40:59 2006 NARUSE, Yui <naruse@ruby-lang.org>
- * parse.y (reswords): modifier token is no longer returned in fname
- state. fixed: [ruby-dev:28775]
+ * ext/nkf/lib/kconv.rb: remove default -m0 and fix document.
-Tue Jun 20 23:28:34 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/nkf/nkf-8/{nkf.c, config.h, utf8tbl.c, utf8tbl.h}:
+ imported nkf 2.0.7.
- * ext/extmk.rb (parse_args): provisional catch-up for the recent changes.
+Mon Jun 19 22:31:59 2006 Kouhei Sutou <kou@cozmixng.org>
- * lib/optparse.rb (OptionParser::List#summarize, OptionParser#order!): ditto.
+ * lib/rss/rss.rb:
+ - provided default #to_s as RSS::Element#to_s.
+ - removed RSS::Element#other_element.
+ - RSS::Element#tag requires attributes as Hash instead of Array.
-Tue Jun 20 11:07:55 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * lib/rss/0.9.rb: removed #to_s to use RSS::Element#to_s.
+ * lib/rss/1.0.rb: ditto.
+ * lib/rss/image.rb: ditto.
+ * lib/rss/taxonomy.rb: ditto.
+ * lib/rss/trackback.rb: ditto.
- * eval.c (proc_invoke): intercept break and return from lambda
- Proc objects. [ruby-dev:28742]
+ * lib/rss/2.0.rb: removed #other_element.
- * eval.c (proc_invoke): remove unnecessary YIELD_PROC_CALL flag.
+Mon Jun 19 22:09:16 2006 Masaki Suketa <masaki.suketa@nifty.ne.jp>
- * eval.c (YIELD_EXACT_ARGS): renamed from YIELD_LAMBDA_CALL, which
- is no longer related to the behavior turned on by this flag.
+ * ext/win32ole/win32ole.c(ole_invoke): support some kind of
+ method of word. [ruby-Bugs#3237]
- * eval.c (return_jump): no need to care about PROT_YIELD.
+ * ext/win32ole/tests/test_word.rb: ditto.
- * eval.c (break_jump): no jump to toplevel PROT_THREAD tag.
+ * ext/win32ole/tests/testall.rb: ditto.
- * eval.c (rb_yield_0): fix confusion between lambda (which is a
- property of a proc) and pcall (which depends on whether it's
- called via yield or call).
+Mon Jun 19 00:02:17 2006 Kouhei Sutou <kou@cozmixng.org>
- * eval.c (rb_thread_yield): no need to specify YIELD_LAMBDA_CALL.
+ * lib/rss/rss.rb: automatically detected attributes.
- * eval.c (rb_block_pass): update blkid in prot_tag.
+ * lib/rss/0.9.rb: removed #_attrs.
+ * lib/rss/1.0.rb: ditto.
+ * lib/rss/2.0.rb: ditto.
+ * lib/rss/image.rb: ditto.
+ * lib/rss/taxonomy.rb: ditto.
+ * lib/rss/trackback.rb: ditto.
-Mon Jun 19 23:40:59 2006 NARUSE, Yui <naruse@ruby-lang.org>
+ * lib/rss/parser.rb: followed new internal API.
- * ext/nkf/lib/kconv.rb: remove default -m0 and fix document.
+Mon Jun 19 00:00:17 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * ext/nkf/nkf-8/{nkf.c, config.h, utf8tbl.c, utf8tbl.h}:
- imported nkf 2.0.7.
+ * ext/tk/lib/multi-tk.rb: fix bug: initialize improper tables.
-Mon Jun 19 17:02:14 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+Sun Jun 18 22:36:13 2006 Kouhei Sutou <kou@cozmixng.org>
- * sample/test.rb (proc_return3): return within non lambda block
- should terminate surrounding method. [ruby-dev:28741]
+ * lib/rss/rss.rb: RSS::Element#initialize accepts initial
+ attributes.
+ * lib/rss/0.9.rb: ditto.
+ * lib/rss/1.0.rb: ditto.
+ * lib/rss/2.0.rb: ditto.
+ * lib/rss/dublincore.rb: ditto.
+ * lib/rss/image.rb: ditto.
+ * lib/rss/taxonomy.rb: ditto.
+ * lib/rss/trackback.rb: ditto.
-Mon Jun 19 13:22:48 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * lib/rss/utils.rb: added Utils.element_initialize_arguments? to
+ detect backward compatibility initial arguments.
- * ext/socket/socket.c (unix_sysaccept): typo fixed.
+ * lib/rss/parser.rb: user initial attributes to initialize
+ RSS::Element.
- * ext/socket/socket.c (sock_connect): remove an unused local
- variable tmpaddr.
+Sun Jun 18 18:24:42 2006 Kouhei Sutou <kou@cozmixng.org>
-Mon Jun 19 02:10:32 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * lib/rss/converter.rb: use NKF for Uconv fallback.
- * ext/socket/socket.c (tcp_accept_nonblock): forgot to remove
- abandoned hacks. [ruby-dev:28740]
+Sun Jun 18 18:22:04 2006 Kouhei Sutou <kou@cozmixng.org>
-Mon Jun 19 00:00:17 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * test/rss/test_image.rb: shared name space configuration.
- * ext/tk/lib/multi-tk.rb: fix bug: initialize improper tables.
+Sun Jun 18 18:13:25 2006 Kouhei Sutou <kou@cozmixng.org>
+
+ * lib/rss/rss.rb: improved ignore_unknown_element
+ handling. RSS::NotExpectedTagError provides tag URI.
+ * lib/rss/parser.rb: ditto.
+ * lib/rss/0.9.rb: ditto.
+ * lib/rss/1.0.rb: ditto.
+ * lib/rss/content.rb: ditto.
+ * lib/rss/dublincore.rb: ditto.
+ * lib/rss/image.rb: ditto.
+ * lib/rss/syndication.rb: ditto.
+ * lib/rss/taxonomy.rb: ditto.
+ * lib/rss/trackback.rb: ditto.
-Sun Jun 18 20:28:43 2006 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+ * test/rss/rss-assertions.rb: checked URI of not expected tag too.
+ * test/rss/test_parser.rb: ditto.
- * ext/win32ole/win32ole.c (fole_methods): The return value
- of WIN32OLE#ole_methods should include PROPERTYPUTREF methods.
+Sun Jun 18 18:08:36 2006 Kouhei Sutou <kou@cozmixng.org>
- * ext/win32ole/win32ole.c (fole_put_methods): The return value
- of WIN32OLE#ole_put_methods should include PROPERTYPUTREF methods.
+ * lib/rss/rss.rb: changed empty namespace URI representation to ""
+ from nil.
+ * lib/rss/parser.rb: ditto.
+ * lib/rss/0.9.rb: ditto.
+ * lib/rss/1.0.rb: ditto.
+ * lib/rss/2.0.rb: ditto.
- * test/win32ole/test_ole_methods.rb: ditto.
+Sun Jun 18 18:03:50 2006 Kouhei Sutou <kou@cozmixng.org>
- * ext/win32ole/win32ole.c (ole_propertyput): support
- PROPERTYPUTREF. [ruby-talk:183042]
+ * lib/rss/parser.rb: removed a guard for requiring open-uri.
- * test/win32ole/test_propertyputref.rb: ditto.
+Sun Jun 18 18:01:26 2006 Kouhei Sutou <kou@cozmixng.org>
-Sat Jun 17 23:42:26 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * lib/rss/rss.rb: fixed typo: except -> expect
+ * lib/rss/parser.rb: ditto.
+ * test/rss/rss-assertions.rb: ditto.
+ * test/rss/test_parser.rb: ditto.
+
+Sun Jun 18 17:52:39 2006 Kouhei Sutou <kou@cozmixng.org>
+
+ * lib/rss/rss.rb: RSS::Element#calc_indent became to be deprecated.
+ * lib/rss/0.9.rb: ditto.
+ * lib/rss/1.0.rb: ditto.
+ * lib/rss/image.rb: ditto.
+ * lib/rss/taxonomy.rb: ditto.
+ * lib/rss/trackback.rb: ditto.
- * eval.c (Init_eval): add aliases invoke_method and
- invoke_functional_method corresponding send and funcall
- respectively. [ruby-talk:197512]
+ * test/rss/test_1.0.rb: removed RSS::Element.indent_size tests.
+ * test/rss/test_2.0.rb: ditto.
- * parse.y (parser_yylex): returns the most typical keyword token
- on EXPR_FNAME. [ruby-core:7995]
+Sun Jun 18 00:49:11 2006 Tanaka Akira <akr@m17n.org>
- * ext/socket/socket.c: protoize.
+ * ext/socket/socket.c (bsock_recv_nonblock): new method
+ BasicSocket#recv_nonblock.
+ (udp_recvfrom_nonblock): renamed from ip_recvfrom_nonblock.
+ IPSocket#recvfrom_nonblock is moved to UDPSocket#recvfrom_nonblock.
+ (unix_recvfrom_nonblock): removed.
+ UNIXSocket#recvfrom_nonblock is removed.
Sat Jun 17 22:17:17 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
@@ -47415,147 +6623,227 @@ Sat Jun 17 22:17:17 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
Sat Jun 17 14:53:32 2006 Tanaka Akira <akr@m17n.org>
- * lib/pathname.rb (Kernel#Pathname): new method.
+ * lib/pathname.rb: backport from 1.9.
+ (Kernel#Pathname): new method.
-Sat Jun 17 02:01:00 2006 Tanaka Akira <akr@m17n.org>
+Sat Jun 17 10:30:41 2006 Kouhei Sutou <kou@cozmixng.org>
- * lib/pp.rb (Kernel#pretty_inspect): defined for pretty printed
- string.
+ * lib/rss/rss.rb (Hash#merge, Enumerable#sort_by): removed.
-Fri Jun 16 01:41:00 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/rss/rss.rb (RSS::RootElementMixin#to_xml): added.
+ [ruby-talk:197284]
- * eval.c (rb_proc_arity): get rid of segfault for mere splat.
+ We can convert RSS version easily like the following:
+ rss10 = RSS::Parser.parse(File.read("1.0.rdf"))
+ File.open("2.0.rss", "w") {|f| f.print(rss10.to_xml("2.0"))}
- * gc.c (gc_mark_children): NODE_BLOCK_PASS needs u3 to be marked.
+ * test/rss/test_1.0.rb: added #to_xml test.
+ * test/rss/test_2.0.rb: ditto.
-Thu Jun 15 22:06:56 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * test/rss/rss-testcase.rb: added some helper methods that
+ generates sample RSS 2.0.
- * parse.y (then): remove ':' from 'then' and 'do' rules.
+ * sample/rss/convert.rb: added a sample script to convert RSS format.
-Wed Jun 14 18:00:20 2006 Eric Hodel <drbrain@segment7.net>
+Sat Jun 17 10:23:22 2006 Kouhei Sutou <kou@cozmixng.org>
- * enum.c (enum_any): Documentation typo.
+ * lib/rss/rss.rb (Kernel#funcall): removed.
+ * lib/rss/parser.rb (Kernel.URI): removed.
-Wed Jun 14 15:01:09 2006 Eric Hodel <drbrain@segment7.net>
+ * lib/rss/maker/: supported
+ xxx.new_yyy do |yyy|
+ yyy.zzz = zzz
+ ...
+ end
+ style and this style became the style of the recommendation.
- * lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser#warn): Don't print
- warnings when -q is set.
+ Old style
+ yyy = xxx.new_yyy
+ yyy.zzz = zzz
+ ...
+ is supported too but this style isn't recommended.
+ [ruby-talk:197284]
-Wed Jun 14 16:11:37 2006 NAKAMURA Usaku <usa@ruby-lang.org>
+ * test/rss/test_*maker*.rb: used new recommended style.
- * eval.c (rb_f_method_name, rb_f_callee_name): document typo.
+Sat Jun 17 09:03:47 2006 Kouhei Sutou <kou@cozmixng.org>
-Wed Jun 14 15:19:14 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * lib/rss, test/rss: backported from trunk. (2005-11-16 - now)
- * hash.c (env_aset): raise TypeError on nil with more descriptive
- message. [ruby-core:07990]
+ * lib/rss/rss.rb (RSS::VERSION): 0.1.5 -> 0.1.6.
+ * test/rss/test_version.rb (RSS::TestVersion#test_version): ditto.
-Tue Jun 13 17:22:19 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * lib/rss/trackback.rb: added TrackBack prefix.
+ * lib/rss/maker/trackback.rb: ditto.
- * ext/socket/socket.c (Init_socket): remove obsolete constants:
- IPsocket, TCPsocket, SOCKSsocket, TCPserver, UDPsocket,
- UNIXsocket, UNIXserver.
+ * lib/rss/rss.rb : removed needless argument 'prefix'.
+ * lib/rss/parser.rb: ditto.
-Tue Jun 13 09:07:27 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * lib/rss/1.0.rb: added rdf:Bag.
- * eval.c (formal_assign): post splat arguments should have had
- higher priority than optional arguments, since they are
- mandatory. [ruby-dev:28715]
+ * lib/rss/taxonomy.rb: implemented taxonomy module.
+ * test/rss/test_taxonomy.rb: added tests for taxonomy support.
- * eval.c (VIS_MASK): broken. should be 15. [ruby-dev:28715]
+ * lib/rss/1.0.rb: added convenience method 'resources'.
+ * lib/rss/taxonomy.rb: ditto.
+ * test/rss/rss-assertions.rb: added test for 'resources'.
+ * test/rss/test_taxonomy.rb: ditto.
- * io.c (argf_getc): should return one-character string.
- [ruby-dev:28715]
+ * lib/rss/rss.rb: fixed a indentation bug.
+ * lib/rss/taxonomy.rb: fixed <taxo:topic> #to_s bug.
+ * test/rss/test_taxonomy.rb: added a #to_s test.
- * io.c (rb_io_readchar): ditto.
+ * lib/rss/maker/taxonomy.rb: implemented taxonomy module for RSS
+ Maker.
+ * lib/rss/taxonomy.rb: supported RSS Maker.
+ * lib/rss/maker.rb: added taxonomy module support.
-Sun Jun 11 23:20:07 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/rss/rss.rb: adjusted to other element API.
+ * lib/rss/1.0.rb: adjusted to other element API but backward
+ compatibility is reserved.
+ * lib/rss/0.9.rb: ditto.
- * object.c (sym_call): disallow to call private methods.
+ * test/rss/test_maker_taxo.rb: added test case for taxonomy module
+ for RSS Maker.
+ * test/rss/test_setup_maker_1.0.rb: added tests for taxo:topic.
- * lib/optparse.rb (OptionParser::Arguable#getopts): pass self to the
- parser.
+ * test/rss/test_setup_maker_1.0.rb: added backward compatibility
+ test.
+ * test/rss/test_setup_maker_0.9.rb: ditto.
+ * test/rss/test_setup_maker_2.0.rb: ditto.
+
+ * test/rss/rss-testcase.rb: added convenience method for setting
+ up taxo:topic.
+ * test/rss/rss-assertions.rb: added assertion for taxo:topic.
-Sun Jun 11 09:56:41 2006 NAKAMURA Usaku <usa@ruby-lang.org>
+ * sample/rss/blend.rb: followed new API.
- * win32/win32.h (write): not need to define on bcc.
+ * lib/rss/taxonomy.rb: changed class or module prefix to
+ Taxonomy from Taxo.
+ * lib/rss/maker/taxonomy.rb: ditto.
-Sun Jun 11 08:30:33 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * test/rss/test_taxonomy.rb: use #reject directory.
- * lib/optparse.rb (OptionParser#getopts): new methods.
+ * lib/rss/: use #__send__ instead of #send.
+ * test/rss/: ditto.
-Sun Jun 11 07:27:11 2006 NAKAMURA Usaku <usa@ruby-lang.org>
+ * lib/rss/parser.rb: added entity handling type predicate.
+ * lib/rss/rexmlparser.rb: ditto.
+ * lib/rss/xmlparser.rb: ditto.
+ * lib/rss/xmlscanner.rb: ditto.
- * lib/rdoc/ri/ri_writer.rb: use String#ord.
+ * lib/rss/xmlscanner.rb: more robust entity handling.
-Sun Jun 11 04:38:20 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * test/rss/test_parser.rb: added an entity handling test.
- * object.c (sym_to_proc): imported Symbol#to_proc from ActiveSupport.
+ * test/rss/test_2.0.rb: added RSS 2.0 tests.
+ * test/rss/rss-assertions.rb: extended XML stylesheet assertion.
+ * lib/rss/0.9.rb: added initialize method.
+ * test/rss/test_1.0.rb: cleanup.
-Sat Jun 10 18:02:40 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * lib/rss/image.rb: added Image prefix.
+ * lib/rss/maker/image.rb: ditto.
- * ext/bigdecimal/lib/bigdecimal/newton.rb (Newton::nlsolve): typo
- fixed: raize -> raise. [ruby-talk:196608]
+ * lib/rss/rss.rb: improved type conversion.
+ * lib/rss/1.0.rb: ditto.
+ * lib/rss/0.9.rb: ditto.
+ * lib/rss/2.0.rb: ditto.
+ * lib/rss/image.rb: ditto.
+ * lib/rss/syndication.rb: ditto.
-Sat Jun 10 17:49:53 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * test/rss/test_2.0.rb: added type conversion tests.
+ * test/rss/test_accessor.rb: ditto.
+ * test/rss/test_to_s.rb: ditto.
+ * test/rss/test_syndication.rb: ditto.
+ * test/rss/test_setup_maker_2.0.rb: ditto.
+ * test/rss/test_setup_maker_1.0.rb: ditto.
+ * test/rss/test_setup_maker_0.9.rb: ditto.
+ * test/rss/test_maker_sy.rb: ditto.
+ * test/rss/test_maker_image.rb: ditto.
+ * test/rss/test_maker_2.0.rb: ditto.
+ * test/rss/test_maker_0.9.rb: ditto.
+ * test/rss/test_image.rb: ditto.
- * string.c (rb_str_ord): new method.
+ * test/rss/test_maker_1.0.rb: use assert instead of assert_equal.
- * parse.y (rbracket): allow optional newline before closing
- brackets.
+ * test/rss/rss-assertions.rb: improved type conversion assertions.
-Sat Jun 10 15:12:29 2006 NAKAMURA Usaku <usa@ruby-lang.org>
+ * lib/rss/rss.rb: added backward compatibility codes.
+ * lib/rss/parser.rb: ditto.
+ * test/rss/test_parser.rb: ditto.
+ * test/rss/test_2.0.rb: ditto.
- * eval.c (rb_f_method_name, rb_f_callee_name): new functions.
- new global method `__method__' and `__callee__'.
+Sat Jun 17 02:01:00 2006 Tanaka Akira <akr@m17n.org>
-Sat Jun 10 10:13:13 2006 NAKAMURA Usaku <usa@ruby-lang.org>
+ * lib/pp.rb (Kernel#pretty_inspect): defined for pretty printed
+ string.
- * lib/getoptlong.rb (GetoptLong#set_options): receive arguments
- as Array.
+Sat Jun 17 00:23:58 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/irb/slex.rb: use Proc#yield.
+ * parse.y (reswords): kDO_BLOCK was missing. fixed: [ruby-core:7995]
- * lib/rdoc/markup/simple_markup/inline.rb: follow the new behavior
- of String#[].
+Sat Jun 17 00:02:15 2006 Masaki Suketa <masaki.suketa@nifty.ne.jp>
- * lib/rdoc/ri/ri_writer.rb: ditto.
+ * ext/win32ole/win32ole.c (ole_propertyput): support
+ PROPERTYPUTREF. [ruby-talk:183042]
-Sat Jun 10 08:17:23 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/win32ole/tests/test_propertyputref.rb: ditto.
- * math.c (log2): may be a macro.
+Thu Jun 15 23:02:47 2006 Masaki Suketa <masaki.suketa@nifty.ne.jp>
- * parse.y (args, block_param, f_args): pass f_post_arg to #params.
+ * ext/win32ole/win32ole.c (fole_methods): The return value
+ of WIN32OLE#ole_methods should include PROPERTYPUTREF methods.
- * util.c (powersOf10): constified.
+ * ext/win32ole/win32ole.c (fole_put_methods): The return value
+ of WIN32OLE#ole_put_methods should include PROPERTYPUTREF methods.
- * ext/readline/readline.c: include extconf.h first.
+ * ext/win32ole/tests/test_ole_methods.rb: ditto.
- * ext/ripper/eventids2.c: removed tLAMBDA_ARG.
+ * ext/win32ole/tests/testall.rb : ditto.
- * ext/tk/tcltklib.c (lib_fromUTF8_core): removed conflict.
+Wed Jun 14 18:23:28 2006 Eric Hodel <drbrain@segment7.net>
- * ext/tk/tkutil/tkutil.c (cbsubst_get_subst_arg): rb_id2name() is
- defined as const now.
+ * enum.c (enum_any): Documentation typo.
- * ext/win32ole/win32ole.c (fole_missing): ditto.
+Wed Jun 14 15:01:09 2006 Eric Hodel <drbrain@segment7.net>
- * lib/mkmf.rb (create_makefile): force to create extconf header.
+ * lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser#warn): Don't print
+ warnings when -q is set.
- * lib/optparse.rb (order!): use Proc#yield.
+Wed Jun 14 23:03:53 2006 Tanaka Akira <akr@m17n.org>
-Sat Jun 10 06:53:22 2006 NAKAMURA Usaku <usa@ruby-lang.org>
+ * configure.in: check sizeof(rlim_t).
+ check setrlimit.
- * eval.c (CALLARGS): remove last semicolon. C90 compiler doesn't
- allow any lines (even if they're empty) within variable
- declarations.
+ * process.c (proc_getrlimit): new method Process.getrlimit.
+ (proc_setrlimit): new method Process.setrlimit.
-Fri Jun 9 09:56:32 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * ruby.h (NUM2ULL): new macro.
- * sprintf.c (rb_str_format): allow %c to print one character
- string (e.g. ?x).
+Mon Jun 12 22:25:09 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-Thu Jun 8 14:00:02 2006 NAKAMURA Usaku <usa@ruby-lang.org>
+ * sprintf.c (rb_f_sprintf): adjust precision length to prevent
+ splitting multi-byte characters. [ruby-list:42389]
+
+Sun Jun 11 23:20:07 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/optparse.rb (OptionParser::Arguable#getopts): pass self to the
+ parser.
+
+Sun Jun 11 10:00:57 2006 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * win32/win32.h (write): not need to define on bcc.
+
+Sun Jun 11 08:30:33 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/optparse.rb (OptionParser#getopts): new methods.
+
+Sat Jun 10 18:02:40 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * ext/bigdecimal/lib/bigdecimal/newton.rb (Newton::nlsolve): typo
+ fixed: raize -> raise. [ruby-talk:196608]
+
+Thu Jun 8 14:19:17 2006 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/win32.[ch] (rb_w32_read, rb_w32_write): new functions.
use recv() and send() when fd is socket. fixed: [ruby-dev:28694]
@@ -47565,25 +6853,43 @@ Wed Jun 7 16:22:51 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/tempfile.rb (Tempfile::make_tmpname): put dot between
basename and pid. [ruby-talk:196272]
-Wed Jun 7 16:16:29 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+Wed Jun 7 14:53:04 2006 NAKAMURA Usaku <usa@ruby-lang.org>
- * parse.y (do_block): remove -> style block.
+ * win32/win32.c (errmap): add some winsock errors.
- * parse.y (parser_yylex): remove tLAMBDA_ARG.
+Wed Jun 7 11:34:38 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-Wed Jun 7 14:51:22 2006 NAKAMURA Usaku <usa@ruby-lang.org>
+ * configure.in: add new configure option `--with-winsock2' for mingw.
- * win32/win32.c (errmap): add some winsock errors.
+ * win32/Makefile.sub (config.h): define USE_WINSOCK2 in config.h
+ instead of in CPPFLAGS.
+
+ * ext/socket/extconf.rb: determine whether to use winsock2 or not
+ by using with_config.
+
+Wed Jun 7 10:45:10 2006 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * win32/{configure.bat, setup.mak, Makefile.sub, win32.h}: add
+ new configure option `--with-winsock2'.
+
+ * win32/win32.c (StartSockets): ditto.
+
+ * ext/socket/extconf.rb: ditto.
+
+ * win32/win32.c (open_ifs_socket): new function.
+
+ * win32/win32.c (StartSockets, rb_w32_socket): use open_ifs_socket()
+ instead of socket().
+ ifs socket support is backported from trunk.
Wed Jun 7 09:14:44 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (rb_call0): binding for the return event hook should have
consistent scope. [ruby-core:07928]
-Tue Jun 6 23:25:49 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (proc_invoke): return behavior should depend whether it
- is surrounded by a lambda or a mere block.
+ * eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
+ event_hooks. no guarantee for arbitrary hook deletion.
+ [ruby-dev:28632]
Mon Jun 5 18:12:12 2006 Tanaka Akira <akr@m17n.org>
@@ -47597,21 +6903,12 @@ Sun Jun 4 20:40:19 2006 Tanaka Akira <akr@m17n.org>
* ext/socket/socket.c: fix sockaddr_un handling.
[ruby-dev:28677]
-Sat Jun 3 23:53:18 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (formal_assign): handles post splat arguments.
-
- * eval.c (rb_call0): ditto.
+Fri Jun 2 22:08:17 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-Sat Jun 3 13:10:41 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * lib/forwardable.rb: RDoc typo fix from Jan Svitok
+ <jan.svitok at gmail.com>. [ruby-core:07943]
- * st.c (strhash): use FNV-1a hash.
-
-Fri Jun 2 20:01:24 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (parser_yylex): removed experimental ';;' terminator.
-
-Fri Jun 2 19:00:40 2006 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Fri Jun 2 19:02:09 2006 GOTOU Yuuzou <gotoyuzo@notwork.org>
* ext/openssl/extconf.rb: use create_header.
@@ -47640,83 +6937,23 @@ Thu Jun 1 19:12:37 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* win32/win32.c (rb_w32_cmdvector): backslashes inside single-quotes
no longer has special meanings. fixed: [ruby-list:42311]
-Thu Jun 1 17:55:42 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_node_arity): should be aware of post splat arguments.
-
- * eval.c (rb_proc_arity): ditto.
-
-Thu Jun 1 16:17:26 2006 NAKAMURA Usaku <usa@ruby-lang.org>
+Thu Jun 1 16:14:41 2006 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/win32.c (rb_w32_getcwd): runtime's getcwd() will not success
if the length of the cwd is longer than MAX_PATH.
fixed [ruby-list:42335]
-Thu Jun 1 16:07:48 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (f_args): syntax rule enhanced to support arguments
- after the splat.
-
- * parse.y (mlhs_basic): ditto for multiple assignments
-
- * parse.y (block_param): ditto for block parameters.
-
- * parse.y (f_post_arg): mandatory formal arguments after the splat
- argument.
-
- * parse.y (new_args_gen): generate nodes for mandatory formal
- arguments after the splat argument.
-
- * eval.c (rb_eval): dispatch mandatory formal arguments after the
- splat argument.
-
-Thu Jun 1 11:33:32 2006 NAKAMURA Usaku <usa@ruby-lang.org>
+Thu Jun 1 11:29:14 2006 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/win32.c (rb_w32_getcwd): set errno if not set.
fixed [ruby-list:42346]
-Thu Jun 1 00:45:52 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (args): allow more than one splat in the argument list.
-
-Wed May 31 18:38:11 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (method_call): allow aref [] to accept all kind of
- method argument, including assocs, splat, and block argument.
-
- * eval.c (SETUP_ARGS0): prepare block argument as well.
-
-Tue May 30 18:13:53 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931]
-
-Mon May 29 22:40:13 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (error_line): print receivers true/false/nil specially.
-
- * eval.c (rb_proc_yield): handles parameters in yield semantics.
-
- * eval.c (nil_yield): gives LocalJumpError to denote no block
- error.
-
- * io.c (rb_io_getc): now takes one-character string.
-
-Sat May 27 22:46:38 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (proc_invoke): save and restore block in the current frame.
- fixed: [ruby-core:07833], [ruby-talk:191639]
-
-Sat May 27 11:29:46 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat May 27 11:29:46 2006 nobuyoshi nakada <nobu@ruby-lang.org>
* ext/extmk.rb (extmake): remove extinit files if no statically linked
extensions.
-Fri May 26 19:56:46 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo
- hashing algorithm.
-
-Fri May 26 09:05:11 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri May 26 09:05:11 2006 nobuyoshi nakada <nobu@ruby-lang.org>
* ruby.h, lib/mkmf.rb (create_header): clear command line options for
macros moved to extconf.h.
@@ -47731,7 +6968,7 @@ Fri May 26 09:05:11 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (configuration): add $defs unless extconf.h was created.
-Thu May 25 01:52:07 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu May 25 01:52:07 2006 nobuyoshi nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (pkg_config): particular config commands support.
@@ -47745,27 +6982,23 @@ Thu May 25 01:52:07 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* win32/setup.mak: suffix OS name by runtime version.
-Wed May 24 23:52:11 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed May 24 23:52:11 2006 nobuyoshi nakada <nobu@ruby-lang.org>
* configure.in (ac_install_sh): ignore dummy install-sh.
[ruby-talk:193876]
-Wed May 24 17:55:13 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_aref): str[0] now returns 1 character string,
- instead of a fixnum. [Ruby2]
-
- * parse.y (parser_yylex): ?c now returns 1 character string,
- instead of a fixnum. [Ruby2]
-
- * string.c (rb_str_aset): no longer support fixnum insertion.
-
-Wed May 24 03:10:44 2006 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Wed May 24 03:10:48 2006 GOTOU Yuuzou <gotoyuzo@notwork.org>
* ext/openssl/lib/openssl/ssl.rb
(OpenSSL::SSL::SocketForwarder#setsockopt,getsockopt): typo fixed.
-Mon May 22 16:32:03 2006 Tanaka Akira <akr@m17n.org>
+Mon May 22 17:54:12 2006 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * ext/socket/socket.c (sock_recvfrom_nonblock): use rb_read_pending
+ instead of rb_io_read_pending.
+ [ruby-dev:28663]
+
+Mon May 22 17:30:04 2006 Tanaka Akira <akr@m17n.org>
* rubyio.h (rb_io_set_nonblock): declared.
@@ -47774,8 +7007,7 @@ Mon May 22 16:32:03 2006 Tanaka Akira <akr@m17n.org>
(io_read_nonblock): new method: IO#read_nonblock.
(io_write_nonblock): new method: IO#write_nonblock.
- * ext/socket/socket.c (s_accept): retry for EWOULDBLOCK.
- revert [ruby-talk:113807].
+ * ext/socket/socket.c
(sock_connect_nonblock): new method: Socket#connect_nonblock.
(sock_accept_nonblock): new method: Socket#accept_nonblock.
(sock_recvfrom_nonblock): new method: Socket#recvfrom_nonblock.
@@ -47792,33 +7024,6 @@ Mon May 22 13:38:57 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (ev_const_get): should support constant access from
within instance_eval(). [ruby-dev:28327]
-Sun May 21 09:50:31 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
-
- * regexec.c: add STK_NULL_CHECK_END to IS_TO_VOID_TARGET().
- [ruby-list:42234]
-
-Thu May 18 22:37:20 2006 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/webrick/config.rb (WEBrick::Config::HTTP): add new parameters,
- :InputBufferSize and :OutputBufferSize.
-
- * lib/webrick/utils.rb (WEBrick::Utils.timeout): add new timeout
- method. this implementation is expected to be compatible with
- timeout.rb and faster than timeout.rb.
-
- * lib/webrick/httprequest.rb (WEBrick::HTTPRequest#_read_data):
- Timeout.timeout is replaced by WEBrick::Utils.timeout.
-
- * lib/webrick/httprequest.rb: WEBrick::HTTPRequest::BUFSIZE is
- replaced by config[:InputBufferSize].
-
- * lib/webrick/httpresposne.rb: WEBrick::HTTPResponse::BUFSIZE is
- replaced by config[:OutputBufferSize].
-
- * lib/webrick/server.rb: get rid of unnecessary require.
-
- * test/webrick/test_utils.rb: test for WEBrick::Utils.timeout.
-
Thu May 18 17:51:32 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* time.c (time_timeval): should round for usec floating
@@ -47826,21 +7031,24 @@ Thu May 18 17:51:32 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* time.c (time_add): ditto.
-Thu May 18 00:42:12 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu May 18 17:11:45 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * lib/cgi.rb (CGI::out): support utf-8. a patch from Fujioka
+ <fuj at rabbix.jp>. [ruby-dev:28649]
+
+Thu May 18 00:42:12 2006 nobuyoshi nakada <nobu@ruby-lang.org>
* ext/extmk.rb, lib/mkmf.rb: use BUILD_FILE_SEPARATOR in Makefiles.
Wed May 17 17:55:26 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* dir.c (sys_warning): should not call a vararg function
- rb_sys_warning() indirectly. [ruby-core:07886]
+ rb_sys_warning() indirectly. [ruby-core:07886]
-Tue May 16 17:23:19 2006 Shin-ichiro HARA <sinara@blade.nagaokaut.ac.jp>
+Wed May 17 08:17:15 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * numeric.c (flo_divmod): the first element of Float#divmod should
- be an integer. [ruby-dev:28589]
-
- * test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
+ * util.c (ruby_strtod): try to reduce errors using powersOf10
+ table. [ruby-dev:28644]
Tue May 16 15:34:18 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
@@ -47858,10 +7066,6 @@ Tue May 16 09:20:16 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* dir.c (GetDIR): add tainted/frozen check for each dir operation.
-Mon May 15 21:37:12 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
-
- * re.c (rb_reg_prepare_re): don't use onig_recompile().
-
Mon May 15 17:42:39 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg):
@@ -47875,85 +7079,40 @@ Sat May 13 16:14:05 2006 Tanaka Akira <akr@m17n.org>
(Struct#pretty_print_cycle): ditto.
[ruby-core:7865]
-Fri May 12 15:54:48 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
- event_hooks. no guarantee for arbitrary hook deletion.
- [ruby-dev:28632]
-
Thu May 11 19:57:00 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* util.c (ruby_strtod): differ addition to minimize error.
[ruby-dev:28619]
-Thu May 11 18:30:11 2006 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Fri Aug 11 15:39:25 2006 Eric Hodel <drbrain@segment7.net>
- * ext/openssl/ossl_cipher.c (add_cipher_name_to_ary): should return
- value. [ruby-dev:28627]
+ * lib/yaml/tag.rb: Replace nodoc with stopdoc so Module methods get
+ documented.
Thu May 11 18:10:43 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* util.c (ruby_strtod): should not raise ERANGE when the input
string does not have any digits. [ruby-dev:28629]
-Wed May 10 23:40:21 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
-
- * oniguruma.h: Version 4.0.3
-
- * regexec.c: ditto.
-
-Mon May 8 09:10:31 2006 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/extconf.rb: add check for OBJ_NAME_do_all_sorted.
-
- * ext/openssl/ossl_cipher.c (ossl_s_ciphers): new method
- OpenSSL::Cipher.ciphers. it returns all the cipher names.
-
- * ext/openssl/ossl_cipher.c (ossl_cipher_init): refine warning message.
-
- * ext/openssl/lib/openssl/cipher.rb: reimplement without eval() and
- add constants AES128, AES192, AES256. [ruby-dev:28610]
-
- * ext/openssl/lib/openssl/digest.rb: reimplement without eval().
-
- * test/openssl/test_cipher.rb, test_digest: fix about reimplemented
- features.
-
- * sample/openssl/cipher.rb: rewrite all.
-
Sun May 7 03:09:51 2006 Stephan Maka <stephan@spaceboyz.net>
* lib/resolv.rb (Resolv::DNS::Requester::ConnectedUDP#initialize):
Use AF_INET6 for nameservers containing colons.
-Sat May 6 23:40:03 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (proc_invoke): should restore old ruby_frame->block.
- thanks to ts <decoux at moulon.inra.fr>. [ruby-core:07833]
- also fix [ruby-dev:28614] as well.
-
Sat May 6 00:38:42 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* signal.c (trap): sig should be less then NSIG. Coverity found
this bug. a patch from Kevin Tew <tewk at tewk.com>.
[ruby-core:07823]
-Thu May 4 22:13:22 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * math.c (math_log2): add new method inspired by
- [ruby-talk:191237].
-
- * math.c (math_log): add optional base argument to Math::log().
- [ruby-talk:191308]
-
Thu May 4 02:24:16 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* ext/syck/emitter.c (syck_scan_scalar): avoid accessing
- uninitialized array element. a patch from Pat Eyler
+ uninitialized array element. a patch from Pat Eyler
<rubypate at gmail.com>. [ruby-core:07809]
* array.c (rb_ary_fill): initialize local variables first. a
- patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810]
+ patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810]
* ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free
type_tag. a patch from Pat Eyler <rubypate at gmail.com>.
@@ -47965,17 +7124,17 @@ Wed May 3 02:12:07 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
check from Sam Roberts <sroberts at uniserve.com>.
[ruby-core:07691]
-Mon May 1 17:58:16 2006 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+Mon May 1 12:23:19 2006 <sinara@blade.nagaokaut.ac.jp>
- * ext/win32ole/win32ole.c (add_event_call_back): should not
- delete event handler when the event name is not entried.
+ * numeric.c (num_div): use floor rather than rb_Integer().
+ [ruby-dev:28589]
-Mon May 1 08:32:10 2006 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+ * numeric.c (flo_divmod): the first element of Float#divmod should
+ be an integer. [ruby-dev:28589]
- * ext/win32ole/win32ole.c (ole_param_ole_type): should return
- "unknown type" string when ITypeInfo::GetFuncDesc failed.
+ * test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
-Sat Apr 29 22:43:37 2006 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Sat Apr 29 22:42:08 2006 GOTOU Yuuzou <gotoyuzo@notwork.org>
* ext/openssl/ossl_asn1.c (ossl_asn1_decode0): should initialize
flag. [ruby-core:07785]
@@ -47985,6 +7144,8 @@ Fri Apr 28 10:53:16 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* util.c (ruby_strtod): should not cut off 18 digits for no
reason. [ruby-core:07796]
+ * util.c (ruby_strtod): fixed wrong conversion.
+
Thu Apr 27 01:38:10 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* array.c (rb_ary_fill): internalize local variable "beg" to
@@ -47993,12 +7154,7 @@ Thu Apr 27 01:38:10 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
Wed Apr 26 16:59:24 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* pack.c (pack_unpack): now supports CRLF newlines. a patch from
- <tommy at tmtm.org>. [ruby-dev:28601]
-
-Wed Apr 26 16:55:19 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * applied code clean-up patch from Stefan Huehner
- <stefan at huehner.org>. [ruby-core:07764]
+ <tommy at tmtm.org>. [ruby-dev:28601]
Tue Apr 25 18:00:05 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
@@ -48011,21 +7167,22 @@ Tue Apr 25 07:55:31 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
squeezing character sequence (i.e. a character) as well. thanks
to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090]
+Tue Apr 25 00:08:24 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * regex.c (re_compile_pattern): should check if c is not a
+ multibyte character. a patch from KIMURA Koichi
+ <kimura.koichi at canon.co.jp>. [ruby-dev:28598]
+
Fri Apr 21 15:19:13 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * ext/tk/tcltklib.c (lib_eventloop_ensure): avoid dereferencing
- freed pointer [ruby-core:07744] and memory leak.
+ * ext/tk/tcltklib.c (lib_eventloop_ensure): refer freed pointer
+ [ruby-core:07744] and memory leak.
Fri Apr 21 12:14:52 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* ext/socket/socket.c: document update patch from Sam Roberts
<sroberts at uniserve.com>. [ruby-core:07701]
-Thu Apr 20 08:43:54 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/mathn.rb (Integer): need not to remove gcd2. a patch from
- NARUSE, Yui <naruse at airemix.com>. [ruby-dev:28570]
-
Wed Apr 19 13:55:27 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* parse.y (arg): too much NEW_LIST()
@@ -48037,6 +7194,8 @@ Wed Apr 19 11:57:04 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1.
[ruby-dev:28585]
+ * parse.y (list_concat): revert last change.
+
* parse.y (arg): use NODE_ARGSCAT for placeholder.
Wed Apr 19 11:13:17 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
@@ -48049,6 +7208,11 @@ Wed Apr 19 10:13:27 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* variable.c (rb_const_set): raise error when no target klass is
supplied. [ruby-dev:28582]
+Wed Apr 19 09:49:36 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * parse.y (list_concat): should not modify nodes other than
+ NODE_ARRAY. [ruby-dev:28583]
+
Tue Apr 18 17:40:37 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/multi-tk.rb: add a binding to a container for a slave IP.
@@ -48059,6 +7223,19 @@ Tue Apr 18 17:40:37 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/stubs.c: fix potential bugs about handling rb_argv0.
+Tue Apr 18 00:11:21 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c: block_unique should be 1, not frame_unique.
+ [ruby-dev:28577]
+
+Fri Aug 11 15:39:25 2006 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser#find_body): Make RDoc
+ ignore C function prototypes. Patch by Tilman Sauerbeck
+ <tilman at code-monkey.de>. [ruby-core:8574]
+ * lib/yaml/tag.rb: Replace nodoc with stopdoc so Module methods get
+ documented.
+
Mon Apr 10 01:03:10 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* prec.c (prec_prec_f): documentation patch from
@@ -48073,30 +7250,10 @@ Sat Apr 8 02:12:38 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* README.EXT: update symbol description. [ruby-talk:188104]
-Sat Apr 8 18:06:28 2006 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c: add WIN32OLE_METHOD#inspect,
- WIN32OLE_PARAM#inspect.
-
- * test/win32ole/test_win32ole_method.rb: ditto.
-
- * add test/win32ole/test_win32ole_param.rb.
-
-Fri Apr 7 22:11:30 2006 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c(foletypelib_initialize): WIN32OLE_TYPELIB.new
- accepts OLE file.
-
- * test/win32ole/test_win32ole_typelib.rb(test_initialize): ditto.
-
Thu Apr 6 23:28:47 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* COPYING: explicitly note GPLv2. [ruby-talk:187922]
-Thu Apr 6 16:43:06 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * intern.h (rb_obj_instance_exec, rb_mod_module_exec): add declaration.
-
Thu Apr 6 11:18:37 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tk/panedwindow.rb: lack of arguments. [ruby-core:7681]
@@ -48120,51 +7277,27 @@ Thu Apr 6 01:04:47 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tk/variable.rb: remove warning about unseting Tcl
variables.
-Wed Apr 5 00:22:54 2006 Tanaka Akira <akr@m17n.org>
-
- * lib/pathname.rb: use a subclass for instantiation except
- methods take pathname argument. suggested by Evan Phoenix.
- [ruby-core:7618]
-
-Tue Apr 4 22:15:41 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y: remove some obsolete syntax rules (unparenthesized
- method calls in argument list).
-
-Sat Apr 1 15:11:27 2006 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c: add WIN32OLE_TYPE#inspect,
- WIN32OLE_VARIABLE#inspect
-
- * remove ext/win32ole/tests/testOLEVARIABLE.rb, testOLETYPE.rb
- testOLETYPELIB.rb.
-
- * testall.rb: ditto.
+Wed Mar 29 20:54:44 2006 Masaki Suketa <masaki.suketa@nifty.ne.jp>
- * add test/win32ole
+ * ext/win32ole/win32ole.c (fole_getproperty): WIN32OLE#[] should accept
+ multi arguments.
-Fri Mar 31 14:24:55 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/win32ole/tests/testWIN32OLE.rb (test_setproperty_bracket): ditto.
- * enumerator.c (enumerator_with_index): removed suspicious return
- statement.
-
-Wed Mar 29 23:06:48 2006 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (ole_invoke): change the behavior of
- WIN32OLE#[], WIN32OLE#[]=. These methods invoke DISPID_VALUE.
-
- * ext/win32ole/sample/excel2.rb: ditto.
-
- * ext/win32ole/tests/testWIN32OLE.rb: ditto.
-
-Wed Mar 29 10:11:31 2006 NAKAMURA Usaku <usa@ruby-lang.org>
+Wed Mar 29 10:07:44 2006 NAKAMURA Usaku <usa@ruby-lang.org>
* ext/nkf/nkf-utf8/nkf.c (nkf_each_char_to_hex, encode_fallback_subchar,
e2w_conv): support C90 compiler.
-Mon Mar 27 22:45:37 2006 NARUSE, Yui <naruse@ruby-lang.org>
+Wed Mar 29 06:48:40 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/nkf/nkf-utf8/{nkf.c, utf8tbl.c}: imported nkf 2.0.6.
+ * eval.c (backtrace): reports aliased method names in a generated
+ backtrace. a patch from "U.Nakamura" <usa at garbagecollect.jp>.
+ [ruby-dev:28471]
+
+Mon Mar 27 22:19:09 2006 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * ext/nkf/nkf-utf8/{nkf.c, utf8tbl.c, config.h}: imported nkf 2.0.6.
* Add --ic / --oc option and mapping tables.
* Add fallback option.
* Add --no-best-fit-chars option.
@@ -48175,12 +7308,6 @@ Mon Mar 27 22:45:37 2006 NARUSE, Yui <naruse@ruby-lang.org>
* ext/nkf/lib/kconv.rb (Kconv.to*): add -m0.
Note that Kconv.to* still imply -X.
- * ext/nkf/test.rb: Removed. Obsolete by test/nkf.
-
- * ext/.document: enabled documents in nkf and kconv
-
- * ext/nkf/nkf.c, ext/nkf/lib/kconv.rb: Add rdoc.
-
Mon Mar 27 03:17:21 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (rb_call0): insecure calling should be checked for non
@@ -48189,125 +7316,53 @@ Mon Mar 27 03:17:21 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (rb_alias): should preserve the current safe level as
well as method definition.
-Sun Mar 26 22:02:51 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
-
- * re.c: refactoring for options.
-
- * parse.y: ditto.
-
-Fri Mar 24 21:11:02 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
-
- * re.c (match_aref): RDoc description updated.
-
- * string.c (rb_str_sub): ditto.
+Fri Mar 24 23:14:30 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * string.c (rb_str_gsub): ditto.
+ * eval.c (yield_under_i): pass self again for instance_eval().
+ [ruby-dev:28466]
Fri Mar 24 17:20:03 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * process.c (rb_f_sleep): remove RDoc description about SIGALRM
- which is not valid on the current implementation. [ruby-dev:28464]
-
-Thu Mar 23 21:40:47 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
-
- * re.c (rb_reg_regsub): prohibit \1, \2 ...\9 in replaced string
- for named regex pattern.
-
-Thu Mar 23 21:06:23 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
-
- * oniguruma.h: Version 4.0.2
-
- * regparse.c: ditto.
-
- * regcomp.c ditto.
-
- * regerror.c: ditto.
+ * process.c (rb_f_sleep): remove description about SIGALRM which
+ is not valid on the current implementation. [ruby-dev:28464]
Thu Mar 23 10:47:03 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (method_missing): should support argument splat in
- super. a bug in combination of super, splat and
- method_missing. [ruby-talk:185438]
-
-Thu Mar 23 00:01:32 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
-
- * re.c (rb_reg_regsub): add back reference by name \k<name> in
- replace string.
-
- * re.h: add regexp argument to rb_reg_regsub().
-
- * string.c (rb_str_sub_bang): ditto.
-
- * string.c (str_gsub): ditto.
-
-Tue Mar 21 22:14:01 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
-
- * re.c (match_alloc): initialize member regexp.
-
- * re.c (match_aref): add String and Symbol argument. [ruby-dev:28448]
-
- * re.h: add member regexp to RMatch.
-
- * gc.c (gc_mark_children): add gc_mark() to regexp member.
+ super. [ruby-talk:185438]
Mon Mar 20 12:05:18 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* configure.in: Solaris SunPro compiler -rapth patch from
<kuwa at labs.fujitsu.com>. [ruby-dev:28443]
-Mon Mar 20 11:12:38 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/win32ole/win32ole.c (folevariant_value): could not compile
- with C90 compiler.
-
Mon Mar 20 09:40:23 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* configure.in: remove enable_rpath=no for Solaris.
[ruby-dev:28440]
-Sun Mar 19 09:46:30 2006 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior
- of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby
- String object.
-
- * ext/win32ole/win32ole.c (folevariant_value): ditto.
+Fri Mar 17 19:08:49 2006 GOTOU Yuuzou <gotoyuzo@notwork.org>
- * ext/win32ole/tests/testOLEVARIANT.rb: ditto.
+ * ext/openssl/ossl_ssl.c, ext/openssl/ossl_nsspki.c: fix typo.
+ [ruby-core:07571]
-Wed Mar 15 16:51:11 2006 NAKAMURA Usaku <usa@ruby-lang.org>
+Wed Mar 15 16:54:21 2006 NAKAMURA Usaku <usa@ruby-lang.org>
* lib/mkmf.rb (create_makefile): support libraries without *.so.
-Wed Mar 15 16:39:29 2006 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Wed Mar 15 16:35:43 2006 GOTOU Yuuzou <gotoyuzo@notwork.org>
* ext/openssl/ossl_ssl.c, ext/openssl/ossl_nsspki.c: should use
"rb_str_new(0, 0)" to make empty string.
-Sun Mar 12 17:02:10 2006 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c(ole_val2olevariantdata): support VT_ARRAY in
- WIN32OLE_VARIANT.new().
-
- * ext/win32ole/tests/testOLEVARIANT.rb: ditto.
-
- * ext/win32ole/tests/testOLEPARAM.rb: test method name should not be
- duplicated.
-
Sat Mar 11 14:24:06 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * lib/rdoc/ri/ri_formatter.rb (RI::TextFormatter::wrap): removed
+ space before argument parenthesis. [ruby-talk:183630]
+
* ruby.1: a clarification patch from David Lutterkort
<dlutter at redhat.com>. [ruby-core:7508]
-Sun Mar 5 18:40:58 2006 Minero Aoki <aamine@loveruby.net>
-
- * lib/fileutils.rb: do not repeat command options.
-
-Sun Mar 5 18:35:03 2006 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/http.rb (send_request_with_body): #content_type never
- return false, use #main_type instead. [ruby-core:07476]
-
Sat Mar 4 15:26:40 2006 Tanaka Akira <akr@m17n.org>
* gc.c (id2ref): fix symbol test.
@@ -48315,112 +7370,84 @@ Sat Mar 4 15:26:40 2006 Tanaka Akira <akr@m17n.org>
Sat Mar 4 01:08:07 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems
- directories. a patch from Eric Hodel <drbrain at segment7.net>.
+ directories. a patch from Eric Hodel <drbrain at segment7.net>.
[ruby-core:07423]
-Fri Mar 3 17:59:00 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_clear_cache_by_class): clearing wrong cache.
-
-Fri Mar 3 21:22:42 2006 Tanaka Akira <akr@m17n.org>
-
- * lib/fileutils.rb (FileUtils.cp_r): implement :remove_destination
- option.
-
- * ext/extmk.rb: use :remove_destination to install extension libraries
- to avoid SEGV. [ruby-dev:28417]
-
-Fri Mar 3 14:41:04 2006 Minero Aoki <aamine@loveruby.net>
-
- * ext/dl/.cvsignore: ignore callback.h.
-
- * ext/ripper/.cvsignore: ignore eventids2table.c.
+Thu Mar 2 19:44:18 2006 Tanaka Akira <akr@m17n.org>
- * ext/socket/.cvsignore: ignore constants.h.
+ * gc.c: align VALUE with sizeof(RVALUE) globally.
+ (is_pointer_to_heap): check alignment out of loop.
+ (id2ref): avoid collision between symbols and objects.
+ (rb_obj_id): ditto. moved from object.c.
+ [ruby-talk:178364] [ruby-core:7305]
Thu Mar 2 18:58:18 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (rb_thread_fd_writable): should not re-schedule output
from KILLED thread (must be error printing).
-Thu Mar 2 09:12:05 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_flatten_bang): allow specifying recursion
- level. [ruby-talk:182170]
-
- * array.c (rb_ary_flatten): ditto.
-
-Thu Mar 2 08:02:42 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * gc.c (add_heap): a heap_slots may overflow. a patch from Stefan
- Weil <weil at mail.berlios.de>.
-
-Wed Mar 1 17:13:37 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_call): use separate cache for fcall/vcall
- invocation.
-
- * eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local
- functions.
-
- * eval.c (rb_mod_local): a new method to specify newly added
- visibility "local".
-
- * eval.c (search_method): search for local methods which are
- visible only from the current class.
-
- * class.c (rb_class_local_methods): a method to list local methods.
-
-Thu Mar 2 17:54:45 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Thu Mar 2 17:57:49 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* gc.c: commited magic for reducing RVALUE size on windows. (24->20byte)
[ruby-core:7474]
-Thu Mar 2 14:12:26 2006 Tanaka Akira <akr@m17n.org>
-
- * gc.c: align VALUE with sizeof(RVALUE) globally.
- (is_pointer_to_heap): check alignment out of loop.
- (id2ref): avoid collision between symbols and objects.
- (rb_obj_id): ditto. moved from object.c.
- [ruby-talk:178364] [ruby-core:7305]
-
-Thu Mar 2 12:55:16 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Thu Mar 2 12:59:14 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* win32/win32.c (filetime_to_unixtime): should set tm_isdst to -1.
stat() didn't treat daylight saving time property on WinNT.
[ruby-talk:182100]
-Wed Mar 1 00:15:51 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Thu Mar 2 08:02:42 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * gc.c (add_heap): heap_slots may overflow. a patch from Stefan
+ Weil <weil at mail.berlios.de>.
+
+Wed Mar 1 00:24:31 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* lib/rdoc/parsers/parse_rb.rb (read_escape): could not handle /\^/.
merged Mr. Ishizuka's lib/irb/ruby-lex.rb 's patch rev 1.29.
[ruby-talk:181631] [ruby-dev:28404]
-Tue Feb 28 19:32:14 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+Tue Feb 28 09:32:17 2006 NAKAMURA Usaku <usa@ruby-lang.org>
- * object.c (Init_Object): add BasicObject class as a top level
- BlankSlate class.
+ * lib/drb/extservm.rb (invoke_service_command): cannot invoke command
+ if command name is quoted on mswin32. [ruby-dev:28400]
Mon Feb 27 00:19:16 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* ruby.h (SYM2ID): should not cast to signed long.
[ruby-core:07414]
-Fri Feb 24 20:21:38 2006 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+Fri Feb 24 20:07:23 2006 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
* test/drb/drbtest.rb (add_service_command): quote pathnames in the
server's command line for space contained directory names.
Thanks, arton. [ruby-dev:28386]
-Fri Feb 24 12:10:07 2006 NAKAMURA Usaku <usa@ruby-lang.org>
+Fri Feb 24 12:11:08 2006 NAKAMURA Usaku <usa@ruby-lang.org>
* instruby.rb: install *.exe.manifest and *.dll.manifest if exist.
It's for VC++8.
-Fri Feb 24 11:17:45 2006 NAKAMURA Usaku <usa@ruby-lang.org>
+Fri Feb 24 11:33:52 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+
+ * bcc32/Makefile.sub (HAVE_HYPOT): bcc32 has hypot().
+
+Fri Feb 24 11:19:58 2006 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * time.c (time_new_internal): add prototype to tell the compiler
+ arugments types.
* win32/win32.c (NtInitialize): need to set a handler for VC++8.
+Fri Feb 24 08:19:16 2006 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * test.rb: Removed. Obsolete by test/nkf.
+
+ * ext/.document: enabled documents in nkf and kconv
+
+ * ext/nkf/nkf.c ext/nkf/lib/kconv.rb: Add rdoc.
+
Thu Feb 23 22:39:59 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* bcc32/Makefile.sub: use borlndmm.dll if possible. bcc32's RTL internal
@@ -48428,84 +7455,30 @@ Thu Feb 23 22:39:59 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
ex: 10000.times { "" << "." * 529671; GC.start } # crash
[ruby-dev:28230]
-Thu Feb 23 13:23:03 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Thu Feb 23 13:20:28 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* eval.c (SETUP_ARGS0): fixed memory corruption. [ruby-dev:28360]
-Wed Feb 22 21:16:55 2006 Tanaka Akira <akr@m17n.org>
-
- * lib/pathname.rb (Pathname#each_filename): use split_names properly.
+Tue Feb 21 02:18:46 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-Wed Feb 22 16:24:05 2006 NAKAMURA Usaku <usa@ruby-lang.org>
+ * configure.in (mingw): have link. [ruby-list:41838]
- * test/webrick/test_cgi.rb: should support platforms which search
- library path from the interpreter's path.
- And, support test without install incidentally.
-
-Wed Feb 22 14:21:03 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bignum.c (bignorm): x may not be a bignum. [ruby-dev:28367]
-
-Wed Feb 22 09:22:40 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (proc_alloc): add proper check for creation of a lambda
- without a block.
+ * win32/Makefile.sub (config.h): ditto.
Tue Feb 21 02:07:39 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* parse.y (f_arglist): should set command_start = Qtrue for
command body. [ruby-talk:180648]
-Mon Feb 20 22:30:17 2006 Tanaka Akira <akr@m17n.org>
-
- * mkconfig.rb: alias Config to RbConfig for compatibility.
+Mon Feb 20 17:37:26 2006 Tanaka Akira <akr@m17n.org>
-Mon Feb 20 18:21:41 2006 Tanaka Akira <akr@m17n.org>
-
- * io.c (rb_io_reopen): flush before reopening a file.
- reported by Mathieu Bouchard. [ruby-core:7396]
-
-Mon Feb 20 17:29:50 2006 Tanaka Akira <akr@m17n.org>
-
- * mkconfig.rb: generate RbConfig instead of Config.
-
- * instruby.rb, rubytest.rb, runruby.rb, bcc32/Makefile.sub,
- ext/extmk.rb, ext/dl/extconf.rb, ext/iconv/charset_alias.rb,
- lib/mkmf.rb, lib/rdoc/ri/ri_paths.rb,
- lib/webrick/httpservlet/cgihandler.rb,
- test/dbm/test_dbm.rb, test/gdbm/test_gdbm.rb,
- test/ruby/envutil.rb, test/soap/calc/test_calc_cgi.rb,
- test/soap/header/test_authheader_cgi.rb, test/soap/ssl/test_ssl.rb,
- win32/mkexports.rb, win32/resource.rb: Use RbConfig instead of
- Config.
-
-Mon Feb 20 13:46:19 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * lib/find.rb: should raise ENOENT if root entry does not exist,
- without opening it. [ruby-dev:28345]
+ * mkconfig.rb: alias RbConfig for Config.
Mon Feb 20 12:27:53 2006 Kent Sibilev <ksruby@gmail.com>
* lib/rational.rb (Integer::gcd): small typo fix.
[ruby-core:07395]
-Mon Feb 20 10:03:59 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * variable.c (rb_const_get_0): Object should have been the lowest
- in const lookup precedence. [ruby-dev:28343]
-
-Mon Feb 20 09:17:11 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/delegate.rb (Delegator): should not delegate "funcall".
-
-Mon Feb 20 09:13:42 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/webrick/httpservlet/cgihandler.rb (WEBrick::HTTPServlet::CGIHandler):
- qualify the access for Config constant. [ruby-dev:28338]
-
- * lib/resolv.rb (Resolv::DNS::Resource::IN::A): qualify
- ClassValue. [ruby-dev:28338]
-
Mon Feb 20 01:05:27 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/rational.rb (Integer::gcd): replaced by gcd4 in
@@ -48516,13 +7489,6 @@ Mon Feb 20 00:57:02 2006 GOTOU Yuuzou <gotoyuzo@notwork.org>
* ext/openssl/ossl.h (OSSL_Debug): should not use __func__.
[ruby-dev:28339]
-Mon Feb 20 00:13:49 2006 Tanaka Akira <akr@m17n.org>
-
- * lib/open-uri.rb: add :ssl_verify_mode option.
- suggested by Will Glynn.
-
- * lib/open-uri.rb: add :ssl_ca_cert option.
-
Sun Feb 19 04:46:29 2006 Guy Decoux <ts@moulon.inra.fr>
* eval.c: initial value for block_unique must be 1.
@@ -48538,44 +7504,17 @@ Sat Feb 18 23:58:26 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* sample/rtags.rb: ditto.
-Sat Feb 18 21:16:27 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+Sat Feb 18 12:18:26 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * eval.c (rb_obj_instance_eval): RDoc description updated. a
- patch from Ozgur Murat Homurlu <ozgurmurath at gmail.com>.
- [ruby-core:07381]
-
-Sat Feb 18 01:01:17 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * variable.c (rb_const_get_0): skip ruby_wrapper in const search
- to give it lower priority (just above Object). need not to
- change rb_const_defined_0() since it's only a precedence matter;
- they are defined anyway.
+ * lib/fileutils.rb (FileUtils::fu_world_writable): make it
+ private. [ruby-core:07383]
Sat Feb 18 00:22:39 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/tracer.rb: merged a minor clarification patch from Daniel
Berger <Daniel.Berger at qwest.com>. [ruby-core:07376]
-Fri Feb 17 17:30:20 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (ev_const_get): simplified using rb_const_get_fallback().
-
- * eval.c (ev_const_defined): adopt to ev_const_get() using
- rb_const_defined_fallback().
-
- * variable.c (rb_const_get_fallback): new function to implement
- constant search.
-
- * variable.c (rb_const_defined_fallback): new function to
- implement constant definition check.
-
- * variable.c (rb_const_get_0): adopt to new behavior. constants
- are looked up in the order of: current class, super classes (but
- Object), lexically external classes/modules, and Object.
-
- * variable.c (rb_const_defined_0): ditto.
-
-Fri Feb 17 11:20:53 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Fri Feb 17 11:18:42 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* util.c (ruby_strtod): Float("1e") should fail. [ruby-core:7330]
@@ -48590,6 +7529,11 @@ Fri Feb 17 09:39:29 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (rb_thread_wait_for): sleep should always sleep for
specified amount of time. [ruby-talk:180067]
+Thu Feb 16 01:10:48 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c (backtrace): frame->orig_func may not be initialized.
+ [ruby-core:07367]
+
Wed Feb 15 16:52:52 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (rb_eval): NODE_OP_ASGN1 should allow splat in its
@@ -48601,10 +7545,6 @@ Wed Feb 15 16:52:52 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (rb_eval): honor visibility on OP_ASGN1 and
OP_ASGN2. [ruby-core:07366]
-Wed Feb 15 15:20:23 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (error_line): remove void control path. [ruby-dev:28335]
-
Wed Feb 15 10:09:51 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (yield_under_i): should not pass self as an argument to
@@ -48615,32 +7555,17 @@ Wed Feb 15 09:20:35 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (rb_obj_instance_eval): should be no singleton classes for
true, false, and nil. [ruby-dev:28186]
-Tue Feb 14 20:26:00 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enumerator.c (enumerator_each): return self if no block is
- given. [yarv-dev:882]
-
Tue Feb 14 18:48:33 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (DMETHOD_P): accessing wrong frame. [ruby-dev:28181]
* eval.c (proc_invoke): preserve FRAME_DMETH flag.
-Tue Feb 14 15:15:22 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * ext/zlib/zlib.c: suppress warning on test/zlib. [ruby-dev:28323]
+Tue Feb 14 15:13:51 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-Tue Feb 14 13:47:22 2006 NAKAMURA Usaku <usa@ruby-lang.org>
+ * ext/zlib/zlib.c: supress warning on test/zlib. [ruby-dev:28323]
- * win32/win32.c (rb_w32_utime): drop read-only attribute before
- changing file time.
-
-Tue Feb 14 13:38:01 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/Makefile.sub (config.h): should define HAVE_LONG_LONG with
- VC++8.
-
-Tue Feb 14 11:42:38 2006 NAKAMURA Usaku <usa@ruby-lang.org>
+Tue Feb 14 14:01:17 2006 NAKAMURA Usaku <usa@ruby-lang.org>
* time.c (search_time_t): support non 32bit time_t environments.
@@ -48648,40 +7573,35 @@ Tue Feb 14 11:42:38 2006 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/Makefile.sub (config.h): VC++8's time_t is 64bit value.
-Mon Feb 13 18:01:52 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (copy_node_scope): remove duplicated semicolons at end.
- a patch from KIMURA Koichi <kimura.koichi at canon.co.jp>.
- [ruby-dev:28332]
-
- * eval.c (VIS_MODE): remove unnecessary argument.
- [ruby-dev:28332]
+ * win32/win32.c (rb_w32_utime): drop read-only attribute before
+ changing file time.
-Mon Feb 13 13:49:48 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+ all changes are backported from CVS HEAD.
- * parse.y (parser_parse_string): mention "regexp" in a error
- message. a patch from Mauricio Fernandez <mfp at acm.org>
- [ruby-core:07340]
+Tue Feb 14 11:21:38 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-Mon Feb 13 00:01:32 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
+ * io.c (argf_forward): should not use frame->argv.
+ [ruby-core:07358]
- * oniguruma.h: Version 4.0.1
+Mon Feb 13 18:08:12 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * regparse.c (onig_free_shared_cclass_table): fix memory leaks.
+ * eval.c (rb_call0): argument update propagation. [ruby-dev:28044]
- * regcomp.c (optimize_node_left): change from IS_POSIXLINE() to IS_MULTILINE().
+ * env.h: remove argv member from struct FRAME.
- * regint.h: rename ANCHOR_ANYCHAR_STAR_PL to ANCHOR_ANYCHAR_STAR_ML.
+Mon Feb 13 13:27:00 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * regparse.h: ditto.
+ * eval.c (eval): should push class from binding if supplied.
+ [ruby-core:07347]
- * regexec.c: ditto.
+Mon Feb 13 00:04:00 2006 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-Sat Feb 11 21:57:29 2006 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+ * lib/erb.rb (ERB::Compiler): add instance variable @insert_cmd to
+ change <%='s behavior. (backported 1.15 - 1.16)
- * ext/win32ole/win32ole.c: add WIN32OLE.create_guid.
+Sat Feb 11 02:04:11 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/win32ole/tests/testWIN32OLE.rb: ditto.
+ * eval.c (eval): no need to push ruby_class. [ruby-dev:28176]
Sat Feb 11 01:57:44 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
@@ -48689,76 +7609,39 @@ Sat Feb 11 01:57:44 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
instance_eval for objects cannot have singleton classes,
e.g. fixnums and symbols). [ruby-dev:28178]
-Fri Feb 10 12:31:05 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_eval): should support NODE_ZSUPER in NODE_ITER.
- [ruby-dev:28326]
-
- * eval.c (ZSUPER_ARGS): support macro.
-
-Wed Feb 8 10:26:06 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * gc.c (rb_gc_call_finalizer_at_exit): turn on during_gc while
- invoking finalizers.
-
- * gc.c (rb_gc_finalize_deferred): ditto.
-
-Tue Feb 7 23:03:13 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Tue Feb 7 23:03:24 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* ext/zlib/zlib.c: should not access ruby objects in finalizer.
[ruby-dev:28286]
-Tue Feb 7 18:42:00 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_write_error2): use fwrite(3) if rb_stderr is not
- updated or is already freed. [ruby-dev:28313]
-
Mon Feb 6 16:02:51 2006 WATANABE Hirofumi <eban@ruby-lang.org>
* file.c (rb_thread_flock): ERROR_NOT_LOCKED is not an error on Cygwin.
In such situation, flock() should return 0.
-Mon Feb 6 14:36:29 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (error_line): include the class name of a surrounding
- method in error position description.
-
-Mon Feb 6 00:14:57 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enum.c (enum_find_index): a new method Enumerable#find_index.
- [ruby-talk:178495]
-
-Sun Feb 5 23:29:31 2006 Tanaka Akira <akr@m17n.org>
+Mon Feb 6 00:41:08 2006 Tanaka Akira <akr@m17n.org>
- * ruby.h (struct RStruct): embed 3 or less elements structs.
- (RSTRUCT_LEN): defined for accessing struct members.
- (RSTRUCT_PTR): ditto.
+ * ruby.h (RSTRUCT_LEN, RSTRUCT_PTR): defined for source level
+ compatibility with ruby 1.9.
- * struct.c: use RSTRUCT_LEN and RSTRUCT_PTR.
- (struct_alloc): allocate small structs in embedded format.
- (rb_struct_init_copy): ditto.
-
- * gc.c (gc_mark_children): use RSTRUCT_LEN and RSTRUCT_PTR.
- (obj_free): ditto.
-
- * marshal.c (w_object): use RSTRUCT_LEN and RSTRUCT_PTR.
-
-Sun Feb 5 21:01:49 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Sun Feb 5 21:05:34 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* numeric.c (fix_to_s): removed workaround for radix 2. Historically,
rb_fix2str could only handle radix 8, 10, 16. (Rev1.37) But for now,
it can handle radix 2..36. [ruby-Bugs#3438] [ruby-core:7300]
-Sun Feb 5 18:49:00 2006 Minero Aoki <aamine@loveruby.net>
+Sun Feb 5 18:55:08 2006 Minero Aoki <aamine@loveruby.net>
- * lib/net/http.rb (add_field, get_fields): keep 1.8.2
- compatibility. This patch is contributed by Rob Pitt.
+ * lib/net/http.rb: imported from trunk, rev 1.129
-Sun Feb 5 16:33:50 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+ * lib/net/http.rb (add_field, get_fields): keep 1.8.2 backward
+ compatibility.
+
+ * lib/net/https.rb: imported from trunk, rev 1.3.
- * lib/mkmf.rb (create_makefile): Kernel#sub! was removed on HEAD.
+ * lib/net/https.rb: #use_ssl? definition moved from net/http.rb.
-Sun Feb 5 14:26:54 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Sun Feb 5 14:22:15 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* lib/pstore.rb: should return default value if name is not found.
[ruby-core:7304]
@@ -48770,68 +7653,42 @@ Sat Feb 4 22:51:43 2006 Tanaka Akira <akr@m17n.org>
* eval.c: apply the FreeBSD getcontext/setcontext workaround
only before FreeBSD 7-CURRENT.
-Sat Feb 4 21:10:06 2006 NAKAMURA Usaku <usa@ruby-lang.org>
+Sat Feb 4 21:19:23 2006 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/win32.c (LK_ERR): ERROR_NOT_LOCKED is not an error.
In such situation, flock() should return 0.
-Sat Feb 4 15:52:56 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Sat Feb 4 15:56:37 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* numeric.c (fix_to_s): (2**32).to_s(2) fails with exception where
sizeof(int) == 4 < sizeof(long). [ruby-core:7300]
-Sat Feb 4 15:02:05 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * oniguruma.h: merge Oniguruma 4.0.0 [ruby-dev:28290]
-
-Fri Feb 3 19:25:53 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * ruby.h: fixed prototype.
-
- * ext/syck/rubyext.c: defined symbol ID as global variable as others.
-
-Fri Feb 3 17:57:02 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c: unify ruby_class (for method definition) and ruby_cbase
- (for constant reference).
-
-Fri Feb 3 15:02:10 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Fri Feb 3 15:06:50 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* ext/syck/syck.c (syck_move_tokens): should reset p->cursor or etc
even if skip == 0. This causes buffer overrun.
(ex: YAML.load('--- "..' + '\x82\xA0' * 511 + '"'))
-Fri Feb 3 00:01:31 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Thu Feb 2 23:51:18 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* ext/syck/emitter.c (syck_emitter_write): should not set '\0' on
- emitter's marker. if marker points to the end of buffer, this is
+ emitter's marker. if marker points to the end of buffer, this causes
buffer overrun. (ex: YAML.dump("." * 12288))
-Thu Feb 2 17:13:01 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser#get_tk): added
- support of :'string' style Symbol.
-
Thu Feb 2 16:01:24 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * eval.c (rb_call0): use TMP_ALLOC() instead of allocating
- a temporary array object.
-
* eval.c (eval): need not to protect $SAFE value.
[ruby-core:07177]
- * error.c (Init_Exception): change NameError to direct subclass of
- Exception so that default rescue do not handle it silently.
-
Thu Feb 2 14:45:53 2006 Ville Mattila <ville.mattila@stonesoft.com>
- * configure.in: The isinf is not recognized by autoconf
+ * configure.in: The isinf is not regognized by autoconf
library guesser on solaris 10. [ruby-core:7138]
Wed Feb 1 22:01:47 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* configure.in, hash.c (ruby_setenv): use setenv(3) and unsetenv(3)
- where they are supported. modifying environ variable seems to
+ where they are supported. modifing environ variable seems to
segfault solaris 10. [ruby-core:7276] [ruby-dev:28270]
* ruby.c (set_arg0): if use setenv(3), environ space cannot be used
@@ -48849,36 +7706,17 @@ Tue Jan 31 11:58:51 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tk/namespace.rb: TkNamespace#eval was enbugged at the
last commit. Now it will return a proper object.
-Tue Jan 31 08:07:02 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * numeric.c (int_upto): return an enumerator if no block is
- attached to the method.
-
- * numeric.c (int_downto): ditto.
-
- * numeric.c (int_dotimes): ditto.
-
- * enum.c (enum_first): new method Enumerable#first to take first n
- elements from an enumerable.
-
- * enum.c (enum_group_by): new method Enumerable#group_by that
- groups enumerable values according to their block values.
-
-Tue Jan 31 00:08:22 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Tue Jan 31 00:10:26 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* ext/syck/rubyext.c (syck_resolver_transfer): workaround for SEGV.
ex: ruby -ryaml -e 'YAML.load("!map:B {}")' [ruby-core:7217]
-Sat Jan 28 07:49:30 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Sat Jan 28 07:56:57 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* lib/rdoc/usage.rb: support "a:0:33" style caller[-1]. In this case
file name is "a:0". I don't know this really happens though...
[ruby-Bugs:3344]
-Thu Jan 26 15:55:52 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/socket/socket.c: turn on do_not_reverse_lookup by default.
-
Wed Jan 25 22:29:04 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in, dln.c, file.c, intern.h, missing.h (eaccess): use
@@ -48902,7 +7740,13 @@ Sun Jan 22 20:03:35 2006 Tanaka Akira <akr@m17n.org>
FreeBSD/i386 getcontext/setcontext bug.
[ruby-dev:28263]
-Thu Jan 19 22:19:18 2006 Minero Aoki <aamine@loveruby.net>
+Sat Jan 21 00:36:47 2006 Tanaka Akira <akr@m17n.org>
+
+ * eval.c (FUNCTION_CALL_MAY_RETURN_TWICE): use only on SPARC and IA64
+ before gcc 4.0.3.
+ [ruby-dev:28247]
+
+Thu Jan 19 22:21:23 2006 Minero Aoki <aamine@loveruby.net>
* lib/fileutils.rb (mv): should remove file after copying.
[ruby-dev:28223]
@@ -48916,34 +7760,32 @@ Wed Jan 18 23:37:06 2006 Tanaka Akira <akr@m17n.org>
reported by Pav Lucistnik and Marius Strobl.
http://lists.freebsd.org/pipermail/freebsd-sparc64/2006-January/003739.html
-Tue Jan 17 23:59:56 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * object.c (rb_mod_const_get, rb_mod_const_defined): added optional
- flag to search ancestors, which is defaulted to true.
- fixed: [ruby-talk:175899]
-
- * eval.c (rb_mod_method_defined): ditto.
-
-Tue Jan 17 11:31:47 2006 NAKAMURA Usaku <usa@ruby-lang.org>
+Tue Jan 17 11:32:46 2006 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/setup.mak (MAKE): workaround for nmake 8.
-Tue Jan 17 11:06:19 2006 NAKAMURA Usaku <usa@ruby-lang.org>
+Tue Jan 17 11:10:21 2006 NAKAMURA Usaku <usa@ruby-lang.org>
- * win32/Makefile.sub: invoke .bat via shell. workaround for nmake 8.
+ * win32/{Makefile.sub,setup.mak}: invoke .bat via shell. workaround
+ for nmake 8.
-Mon Jan 16 10:13:38 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Mon Jan 16 10:26:23 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* ext/syck/emitter.c (syck_emit_seq, syck_emit_map, syck_emit_item):
should output complex key mark even if map's key is empty seq/map.
[ruby-core:7129]
-Sat Jan 14 03:38:54 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Sat Jan 14 05:37:06 2006 Tanaka Akira <akr@m17n.org>
+
+ * io.c (READ_DATA_PENDING, READ_DATA_PENDING_COUNT): defined
+ for DragonFly BSD 1.4.0.
+
+Sat Jan 14 03:43:24 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* file.c (rb_file_s_chmod): avoid warning where sizeof(int) !=
sizeof(void*).
-Fri Jan 13 19:26:15 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Fri Jan 13 19:14:56 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* lib/rdoc/diagram.rb:
- properly quote bare element attributes
@@ -48965,15 +7807,23 @@ Thu Jan 12 11:53:08 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
[new feature] support 'command' option which is called just before
popping up the balloon help.
-Wed Jan 11 00:12:29 2006 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+Wed Jan 11 15:00:00 2006 Ville Mattila <mulperi@iki.fi>
- * lib/erb.rb (ERB::Compiler): add instance variable @insert_cmd to
- change <%='s behavior.
+ * io.c (READ_PENDING*): Support solaris 64-bit environments.
+ Solaris defines a opaque FILE struct when compiling 64 bit
+ binaries. This means that we dont have access to _ptr etc.
+ members anymore. The solution by Steven Lumos is to define
+ FILE64 that has needed members available. I've modified
+ the origanal patch a bit so that it compiles both with gcc
+ and now free sun studio 11 compiler and both amd64 and sparc.
+ NOTE! We have to 64 bit solaris FILE structure time to time
+ otherwise we'll get breakage.
+ [ruby-core:7106]
Tue Jan 10 19:42:33 2006 Tanaka Akira <akr@m17n.org>
* gc.c (garbage_collect): mark ruby_current_node.
- if an exception is raised in a finalizer written in C called by
+ if an exception is raised in a finalizer called written in C by
rb_gc_call_finalizer_at_exit, ruby_set_current_source may use
collected ruby_current_node and mark_source_filename may corrupt
memory.
@@ -48996,68 +7846,37 @@ Tue Jan 10 12:00:48 2006 Aaron Schrab <aaron @nospam@ schrab.com>
* lib/yaml/rubytypes.rb (Symbol#yaml_new): YAML loading of quoted
Symbols broken. [ruby-Bugs:2535]
-Tue Jan 10 07:26:52 2006 Tanaka Akira <akr@m17n.org>
-
- * gc.c (gc_stress): renamed from always_gc and enabled by default.
- (gc_stress_get): new function for GC.stress.
- (gc_stress_set): new function for GC.stress=.
-
-Mon Jan 9 19:58:56 2006 arton <artonx@yahoo.co.jp>
+Mon Jan 9 19:54:35 2006 arton <artonx@yahoo.co.jp>
* ext/zlib/extconf.rb: zlib compiled DLL version 1.2.3 distributed by
http://www.zlib.net/ has zdll.lib. [ruby-dev:28209]
-Mon Jan 9 14:25:00 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Mon Jan 9 14:17:12 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* win32/Makefile.sub (OPTFLAGS): I have experienced trouble on y- flag,
(VisualC++6) so use -O2b2xg- if $(MSC_VER) < 1400. [ruby-core:7040]
-Mon Jan 9 14:25:00 2006 Kero van Gelder <rubyforge @nospam@ kero.tmfweb.nl>
+Mon Jan 9 14:17:12 2006 Kero van Gelder <rubyforge @nospam@ kero.tmfweb.nl>
* lib/webrick/httpservlet/filehandler.rb: fixed typo. [ruby-core:7075]
-Sun Jan 8 14:15:27 2006 Tanaka Akira <akr@m17n.org>
-
- * eval.c (GCC_VERSION_BEFORE): check __INTEL_COMPILER.
- Intel C++ Compiler defines __GNUC__.
- http://www.intel.com/software/products/compilers/clin/docs/ug_cpp/lin1077.htm
-
Sat Jan 7 15:40:07 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (singleton): get rid of segfault on syntax error.
fixed: [ruby-core:07070]
-Sat Jan 7 06:24:18 2006 Tanaka Akira <akr@m17n.org>
-
- * eval.c (rb_fd_isset): compare the result of FD_ISSET with 0 to
- avoid FreeBSD bug. FreeBSD defines FD_ISSET as just a bitmap of
- unsigned long. So returning the value from rb_fd_isset discards
- upper 32bits on LP64 environment.
- http://www.freebsd.org/cgi/query-pr.cgi?pr=ia64/91421
-
-Fri Jan 6 02:20:18 2006 Tanaka Akira <akr@m17n.org>
-
- * configure.in: don't force getcontext on IA64.
+Fri Jan 6 10:16:20 2006 Steven Lumos <steven@lumos.us>
- * eval.c (ruby_setjmp): add an argument for just before getcontext.
- (THREAD_SAVE_CONTEXT): call rb_thread_save_context just
- before getcontext.
- [ruby-dev:28205]
+ * io.c (READ_DATA_PENDING): defined for 64bit Solaris on SPARC.
+ [ruby-core:7057]
+ (READ_DATA_PENDING_COUNT): ditto.
+ (READ_DATA_PENDING_PTR): ditto.
-Sun Jan 1 15:28:46 2006 Tanaka Akira <akr@m17n.org>
-
- * missing.h (isinf): avoid macro expansion
- "extern int isinf(double);" to
- "extern int ((sizeof(double)==sizeof(float))?_Isinff(double):_Isinf(double));" on
- HP-UX.
-
-Sun Jan 1 14:42:54 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Sun Jan 1 17:07:59 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* win32/win32.c (rb_w32_seekdir): should not segfault even if passed
- the location which rb_w32_telldir didn't return. (and should change
- `bits' position) [ruby-core:7035]
-
- * win32/dir.h: ditto. (stores `loc' instead of `bitpos')
+ the location which rb_w32_telldir didn't return. [ruby-core:7035]
+ (I think HEAD implementation is better. but binary compatibility)
* test/ruby/test_dir.rb: added.
@@ -49066,41 +7885,26 @@ Sat Dec 31 22:57:00 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (rb_thread_save_context): should not recycle scope object used
in a thread. fixed: [ruby-dev:28177]
-Sat Dec 31 19:50:38 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * ext/syck/rubyext.c: attribute name was truncated with Rev1.64.
-
-Sat Dec 31 11:53:16 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * lib/generator.rb: (Generator#initialize): should kill @loop_thread
- before starting new thread. (occurs when called via Generator#rewind)
- [ruby-dev:28184]
-
Fri Dec 30 18:22:42 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * gc.c (garbage_collect): mark objects referred from aborting threads.
+ * gc.c (garbage_collect): mark objects refered from aborting threads.
[ruby-dev:28190]
* win32/Makefile.sub: VC++8 support.
-Fri Dec 30 15:17:35 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * lib/generator.rb (Generator#initialize): ensured to stop @loop_thread.
- Mr. Tanaka pointed out one Thread.pass is not enough. [ruby-dev:28185]
+Fri Dec 30 14:24:53 2005 WATANABE Hirofumi <eban@ruby-lang.org>
-Fri Dec 30 12:20:57 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+ * dir.c (glob_helper): do not use TRUE for djgpp.
- * lib/generator.rb (Generator#initialize): fixed dead lock. this occurred
- when end? was called before @loop_thread was stopped. [ruby-core:7029]
+Fri Dec 30 04:54:40 2005 NAKAMURA Usaku <usa@ruby-lang.org>
-Fri Dec 30 01:04:52 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+ * file.c (eaccess): workaround for VC++8 runtime.
- * lib/generator.rb: should work with another thread. (more robust code)
- [ruby-dev:28177]
+ * win32/win32.c (ioinfo): VC++8 support.
Thu Dec 29 23:59:37 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * eval.c (rb_gc_mark_threads): keep unmarked threads which won't wake
+ * eval.c (rb_gc_mark_threads): leave unmarked threads which won't wake
up alone, and mark threads in the loading table. [ruby-dev:28154]
* eval.c (rb_gc_abort_threads), gc.c (gc_sweep): kill unmarked
@@ -49111,87 +7915,23 @@ Thu Dec 29 17:02:07 2005 Tanaka Akira <akr@m17n.org>
* test/ruby/envutil.rb (EnvUtil.rubybin): search "ruby" instead of
"miniruby". [ruby-dev:28140]
-Thu Dec 29 14:35:10 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_mod_define_method): should save safe_level in the
- proc object. [ruby-dev:28146]
-
-Thu Dec 29 11:22:34 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * lib/generator.rb: reimplemented Generator class with Thread instead of
- callcc, in order to fix memory leak. [ruby-dev:28142]
-
-Wed Dec 28 14:10:05 2005 Tanaka Akira <akr@m17n.org>
-
- * ia64.s: remove .pred.safe_across_calls directive.
- reported by WATANABE Tetsuya. [ruby-dev:28141]
-
-Wed Dec 28 01:32:39 2005 Tanaka Akira <akr@m17n.org>
-
- * eval.c (struct thread): add bstr_max.
- (rb_thread_save_context): use realloc instead of REALLOC_N
- to avoid GC.
-
-Tue Dec 27 23:59:53 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/optparse.rb (CompletingHash#match): fix for 1.9.
-
Tue Dec 27 16:59:52 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* test/drb/drbtest.rb (DRbService::self.ext_service): increase
timeout limit. a patch from Kazuhiro NISHIYAMA
<zn at mbf.nifty.com>. [ruby-dev:28132]
-Tue Dec 27 14:17:55 2005 Tanaka Akira <akr@m17n.org>
-
- * configure.in: define IA64 for portability. (HP aC++/ANSI C doesn't
- define __ia64__.)
- don't check libunwind stuff.
- check __libc_ia64_register_backing_store_base.
-
- * defines.h: declare rb_ia64_bsp and rb_ia64_flushrs.
- (flush_register_windows): call rb_ia64_flushrs on IA64.
-
- * ia64.s: new file for IA64.
- it is separated from C program files because
- Intel C++ Compiler for IA64 doesn't support inline assembly.
-
- * common.mk (ia64.$(OBJEXT)): new target.
-
- * ruby.h (RUBY_INIT_STACK): defined.
- (ruby_init_stack): declared for RUBY_INIT_STACK.
-
- * main.c (main): precedes RUBY_INIT_STACK before ruby_init.
+Tue Dec 27 08:29:18 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
- * gc.c (rb_gc_register_stack_start): new global variable on IA64.
- (garbage_collect): simplify register stack marking code.
- don't use libunwind.
- (Init_stack): initialize rb_gc_register_stack_start.
- (ruby_init_stack): new function for RUBY_INIT_STACK.
-
- * eval.c (struct thread): add bstr_pos member for original position of
- register stack.
- (rb_thread_save_context): simplify register stack saving code.
- don't use libunwind.
- (rb_thread_restore_context_0): new function. moved from
- rb_thread_restore_context except the stack position checking code.
- don't use libunwind for IA64 register stack.
- (register_stack_extend): new function.
- (stack_extend): make it self-recursive with
- the stack position checking code in old rb_thread_restore_context.
- (rb_thread_restore_context): just call stack_extend.
- (flush_register_windows): removed.
-
- [ruby-dev:28127]
-
-Tue Dec 27 14:09:39 2005 Minero Aoki <aamine@loveruby.net>
-
- * process.c: new method Process.exec. [ruby-dev:28107]
+ * ext/openssl/lib/openssl/ssl.rb (OpenSSL::SSL::SSLSocket#post_connection_chech):
+ treat wildcard character in commonName. [ruby-dev:28121]
-Tue Dec 27 08:22:15 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Mon Dec 26 22:32:47 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/openssl/lib/openssl/ssl.rb (OpenSSL::SSL::SSLSocket#post_connection_check):
- treat wildcard character in commonName. [ruby-dev:28121]
+ * eval.c (rb_eval), gc.c (gc_mark_children), node.h (NEW_ALIAS,
+ NEW_VALIAS), parse.y (fitem): allow dynamic symbols to
+ NODE_UNDEF and NODE_ALIAS.
+ backported from trunk. fixed: [ruby-dev:28105]
Mon Dec 26 08:50:36 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
@@ -49204,20 +7944,23 @@ Mon Dec 26 08:50:36 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
Joel VanderWerf <vjoel at path.berkeley.edu>.
[ruby-talk:165285] [ruby-core:6995]
+Sat Dec 24 18:58:14 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * stable version 1.8.4 released.
+
Fri Dec 23 10:30:23 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* ext/digest/sha2/sha2.c (ULL): support AIX C. a patch from
Kailden <kailden at gmail.com>. [ruby-core:06984]
-Wed Dec 21 16:47:35 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Wed Dec 21 16:53:06 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* file.c (w32_io_info): should return handle because FileIndex is
valid only while file is open. [ruby-dev:28088]
-Wed Dec 21 12:12:21 2005 Tanaka Akira <akr@m17n.org>
+Wed Dec 21 14:53:26 2005 Tanaka Akira <akr@m17n.org>
- * test/pathname/test_pathname.rb (test_kernel_open): use
- File.identical?.
+ * lib/pathname.rb (test_kernel_open): use File.identical?.
[ruby-talk:171804]
Tue Dec 20 22:41:17 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
@@ -49225,102 +7968,36 @@ Tue Dec 20 22:41:17 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (eval_under_i): evaluate source in caller's frame.
[ruby-dev:28076]
-Tue Dec 20 12:53:23 2005 why the lucky stiff <why@ruby-lang.org>
-
- * ext/syck/rubyext.c (syck_emitter_reset): to ensure compatibility
- with previous Ruby versions, documents are no longer headless.
-
-Tue Dec 20 12:33:01 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * ext/syck/rubyext.c (syck_node_transform): ruby object holding
- explicitly freed SyckNode caused SEGV. [ruby-dev:28067]
-
- ... I think syck GC problem was solved now!
-
-Tue Dec 20 01:46:48 2005 Tanaka Akira <akr@m17n.org>
-
- * io.c (rb_f_backquote): fix a GC problem on
- IA64 with gcc 4.0.3 20051216 (prerelease) -O3.
-
-Mon Dec 19 23:32:39 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * eval.c (rb_call_super): use original method name on exception.
+ [ruby-dev:28078]
- * Makefile.in (XCFLAGS): separated as well as win32/Makefile.sub.
+Tue Dec 20 13:11:59 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * main.c (always_gc): dllimport is required for VC to import a DLL
- symbol. fixed: [ruby-dev:28051]
+ * ext/syck/rubyext.c: fixed GC problem (backported HEAD 1.55 - 1.62)
+ [ruby-dev:27839]
- * parse.y (rb_symname_p): fixed wrong validation. [ruby-dev:28047]
-
-Mon Dec 19 23:09:24 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+ * ext/syck/syck.h (S_FREE): small hack. no need to check if pointer is
+ NULL or not before S_FREE.
* st.c: uses malloc instead of xmalloc to avoid GC. syck uses st_insert
in gram.c to insert node from rb_syck_bad_anchor_handler into
SyckParser's hash table. if GC occurs in st_insert, it's not under
SyckParser's mark system yet. so RString can be released wrongly.
+ [ruby-dev:28057]
- * ext/syck/syck.h (S_FREE): small hack. no need to check if pointer is
- NULL or not before S_FREE.
-
- * ext/syck/rubyext.c (syck_parser_assign_io): rb_check_string_type can
- return new RString. if so, it becomes unreachable from GC after
- returns syck_parser_assign_io, and can be freed by GC. (dangling
- in syck io system) so extends its life time till syck_parse is called.
-
- * ext/syck/rubyext.c (syck_parser_s_alloc): always allocates bonus,
- so no need to check if NULL, and "volatile VALUE hash"
- is not needed. (bonus->port was not protected in syck_emitter_reset)
-
- * ext/syck/rubyext.c (syck_mark_parser): ditto.
-
- * ext/syck/rubyext.c (syck_parser_load): ditto.
-
- * ext/syck/rubyext.c (syck_parser_load_documents): ditto.
-
- * ext/syck/rubyext.c (syck_emitter_s_alloc): ditto.
-
- * ext/syck/rubyext.c (syck_mark_emitter): ditto.
-
- * ext/syck/rubyext.c (syck_emitter_reset): ditto.
-
- * ext/syck/rubyext.c (syck_scalar_value_set): "should set newly
- allocated memory instead of RString's internal storage" stuff again.
- by this, should call syck_free_node instead of rb_syck_free_node.
-
- * ext/syck/rubyext.c (syck_node_type_id_set): ditto.
-
- ... I believe syck GC problem was solved by this.
-
-Mon Dec 19 12:20:59 2005 Tanaka Akira <akr@m17n.org>
-
- * eval.c (FUNCTION_CALL_MAY_RETURN_TWICE): activate only
- before gcc 4.0.3 on SPARC and IA64.
-
-Mon Dec 19 11:37:47 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * ext/syck/rubyext.c: sorry, I reverted my "should set newly
- allocated memory instead of RString's internal storage" stuff.
- node allocated in rubyext.c seems to be freed by rb_syck_free_node
- not syck_free_node, and it won't free data.str->ptr and type_id.
-
- (I still think this is unsafe because RString(foo)->ptr becomes
- dangling pointer when RString is modified or freed, but anyway
- I misunderstood, so go back to original code for now)
-
-Sat Dec 17 21:50:41 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Tue Dec 20 12:53:23 2005 why the lucky stiff <why@ruby-lang.org>
- * ext/syck/rubyext.c (syck_emitter_reset): should initialize
- emitter->bonus->oid. otherwise rb_gc_mark crashes.
+ * ext/syck/rubyext.c (syck_emitter_reset): to ensure compatibility
+ with previous Ruby versions, documents are no longer headless.
- * ext/syck/rubyext.c (syck_mark_parser): should mark anchor nodes
- because they hold ruby objects. (ie: rb_syck_bad_anchor_handler)
+Tue Dec 20 01:46:48 2005 Tanaka Akira <akr@m17n.org>
-Sat Dec 17 11:00:17 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * io.c (rb_f_backquote): fix a GC problem on
+ IA64 with gcc 4.0.3 20051216 (prerelease) -O3.
- * ext/syck/rubyext.c (rb_syck_compile): avoid potential memory
- leak.
+Mon Dec 19 23:32:39 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/syck/rubyext.c (syck_set_ivars): avoid potential memory
- leak by explicit symbol allocation.
+ * parse.y (rb_symname_p): fixed wrong validation. [ruby-dev:28047]
Sat Dec 17 03:57:01 2005 Tanaka Akira <akr@m17n.org>
@@ -49332,35 +8009,10 @@ Sat Dec 17 03:30:23 2005 Tanaka Akira <akr@m17n.org>
* eval.c (bmcall): fix a GC problem by tail call on
IA64 with gcc 4.0.3 20051216 (prerelease).
-Fri Dec 16 17:53:45 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * ext/syck/rubyext.c (rb_syck_compile): fixed memory leak.
-
- * ext/syck/rubyext.c: should protect global variable from GC.
-
-Fri Dec 16 11:44:43 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * ext/syck/rubyext.c (syck_resolver_tagurize): fixed memory leak.
-
- * ext/syck/rubyext.c (syck_node_type_id_set): should set newly
- allocated memory instead of RString's internal storage.
-
- * ext/syck/rubyext.c (syck_scalar_value_set): ditto.
-
- ... these fixes won't fix [ruby-dev:27839]. more work is needed.
-
-Fri Dec 16 04:38:55 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/delegate.rb (Delegator::method_missing): should delegate
- block as well.
-
-Thu Dec 15 19:57:12 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+Fri Dec 16 00:54:06 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/cgi.rb (CGI::QueryExtension::MorphingBody): fix criteria to
- use Tempfile. A fix from Zev Blut <rubyzbibd at ubit.com>.
- [ruby-core:06076]
-
- * string.c: remove global functions work on $_.
+ * signal.c (Init_signal): revert C++ style comment.
+ [ruby-dev:28041]
Thu Dec 15 12:35:14 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
@@ -49372,18 +8024,10 @@ Thu Dec 15 01:33:31 2005 Tanaka Akira <akr@m17n.org>
* ext/zlib/zlib.c (zstream_run): fix a GC problem by tail call on
x86_64 with gcc 4.0.3 20051111 (prerelease) (Debian 4.0.2-4)
-Wed Dec 14 23:50:20 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/rdoc/parsers/parse_c.rb (find_class_comment): fix for class
- document with prototypes. [ruby-core:06863]
-
-Wed Dec 14 23:39:53 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Dec 14 12:11:46 2005 WATANABE Hirofumi <eban@ruby-lang.org>
- * dir.c (has_magic): glob names contain alphabets to enable case fold
- search. [ruby-dev:27735]
-
- * dir.c (Init_Dir): FNM_SYSCASE which is default case fold flag.
- [ruby-dev:23296]
+ * test/gdbm/test_gdbm.rb: specify pid for the argument of
+ Process.wait. workaround for Cygwin.
Wed Dec 14 12:01:26 2005 Tanaka Akira <akr@m17n.org>
@@ -49407,18 +8051,11 @@ Tue Dec 13 00:08:09 2005 Tanaka Akira <akr@m17n.org>
* sprintf.c (rb_str_format): fix a GC problem.
[ruby-dev:28001]
-Mon Dec 12 15:51:22 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Mon Dec 12 15:54:56 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
* test/openssl/test_ssl.rb (test_parallel): call GC.start to close
unused files. [ruby-dev:27981]
-Mon Dec 12 09:58:09 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * range.c (range_cover): new method Range#cover? added. the
- method name might be changed. thanks to takano32 at
- http://www.rubyist.net/~matz/20051210.html#c08 for name
- suggestion. [ruby-talk:167182]
-
Mon Dec 12 00:33:56 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* ext/digest/digest.c (rb_digest_base_s_digest): add volatile to
@@ -49428,38 +8065,11 @@ Mon Dec 12 00:33:56 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
be called before actual variable initialization.
[ruby-dev:27986]
-Sun Dec 11 23:54:07 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/*: update to support libraries in ActiveTcl8.4.12.0
- (see ext/tk/ChangeLog.tkextlib).
-
- * ext/tk/sample/scrollframe.rb: add a new sample.
-
-Sun Dec 11 22:07:58 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-
- * test/rinda/test_rinda.rb (test_remote_array_and_hash): pseudo remote
- objects are protected against GC. [ruby-dev:27911]
-
-Sat Dec 10 01:06:06 2005 Keiju Ishitsuka <keiju@ruby-lang.org>
-
- * lib/matrix.rb: add Matrix#determinant_e, Matrix#rank_e.
- [ruby-dev:27820] and related thread.
-
-Sat Dec 10 00:31:42 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (calling_scope_t): gave names to magic numbers for rb_call().
- [ruby-dev:27978]
-
Fri Dec 9 23:31:02 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/rexml/encoding.rb (encoding=): give priority to particular
conversion to iconv. [ruby-core:06520]
-Fri Dec 9 23:16:51 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * range.c (range_include): return false unless included in numeric
- range. fixed: [ruby-dev:27975]
-
Thu Dec 8 02:07:19 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (umethod_bind): adjust invoking class for module method.
@@ -49474,15 +8084,6 @@ Wed Dec 7 17:10:27 2005 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
* sprintf.c (rb_f_sprintf): [ruby-dev:27967]
-Wed Dec 7 16:39:18 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * range.c (range_include): use discrete membership for non Numeric
- values, for example, String.
-
- * numeric.c (num_scalar_p): new method. [ruby-dev:27936]
-
- * lib/complex.rb (Complex#scalar?): ditto.
-
Wed Dec 7 15:31:35 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* sprintf.c (rb_str_format): integer overflow check added.
@@ -49510,22 +8111,11 @@ Wed Dec 7 01:02:04 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/sample/demos-en/menu.rb: ditto.
-Tue Dec 6 16:48:40 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * gc.c (ruby_xmalloc2): change check condition for integer
- overflow. [ruby-dev:27399]
-
- * gc.c (ruby_xrealloc2): ditto.
-
Tue Dec 6 16:37:57 2005 Yuya Nishida <yuya@j96.org>
* eval.c (exec_under): avoid accessing ruby_frame->prev.
[ruby-dev:27948]
-Fri Dec 2 19:06:06 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * dir.c (Compare): should not fold double byte alphabet on win9x.
-
Thu Dec 1 00:50:33 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (rb_funcall2): allow to call protected methods.
@@ -49533,9 +8123,6 @@ Thu Dec 1 00:50:33 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
Wed Nov 30 23:52:17 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * parse.y (struct parser_params): fields common to ripper must be
- placed at each same offset.
-
* parse.y (NEWHEAP, ADD2HEAP): set count after pointer was set.
fixed: [ruby-dev:27896]
@@ -49544,51 +8131,23 @@ Wed Nov 30 13:43:07 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* misc/ruby-mode.el (ruby-expr-beg): support $! at the end of
expression. [ruby-dev:27868]
-Tue Nov 29 23:57:05 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (struct parser_params): heap must be placed at same offset
- also in ripper.y. fixed: [ruby-dev:27846]
-
- * parse.y (yycompile): prevent vparser from tail call optimization.
- fixed: [ruby-dev:27851]
-
- * parse.y (parser_mark): value needs to be marked.
- fixed: [ruby-dev:27845]
-
-Tue Nov 29 22:45:30 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-
- * lib/drb/observer.rb (notify_observers): follow change of observer.rb.
- fixed: [ruby-core:6796]
-
-Mon Nov 28 20:24:22 2005 Tanaka Akira <akr@m17n.org>
-
- * lib/pp.rb (PP::PPMethods#object_address_group): mask an address with
- word size.
-
- * lib/pp.rb (PP::PPMethods#object_address_group): adjust address format.
-
-Mon Nov 28 18:55:22 2005 NAKAMURA Usaku <usa@ruby-lang.org>
+Mon Nov 28 18:55:43 2005 NAKAMURA Usaku <usa@ruby-lang.org>
* ext/socket/socket.c (init_inetsock_internal): remove setting
SO_REUSEADDR option on server socket on Cygwin.
fixed: [ruby-core:6765] ([ ruby-Bugs-2872 ])
-Mon Nov 28 13:11:45 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Mon Nov 28 13:08:54 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* win32/win32.c (rb_w32_strerror): remove all CR and LF. (avoid broken
error message on bccwin32 + winsock)
-Mon Nov 28 09:15:50 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Mon Nov 28 09:21:49 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* lib/mkmf.rb (create_makefile): should not change sodir with
- dir.gsub!. (bccwin32 failed to install third party extensions)
+ dir.gsub!. (bccwin32 failed to install third party exntesions)
[ruby-dev:27834]
-Sun Nov 27 05:37:20 2005 Tanaka Akira <akr@m17n.org>
-
- * lib/pathname.rb: use File.basename to decompose pathnames.
- experimental Windows support.
-
Sun Nov 27 00:56:13 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
* lib/wsdl/xmlSchema/complexContent.rb: missing
@@ -49598,103 +8157,23 @@ Sat Nov 26 19:57:45 2005 WATANABE Hirofumi <eban@ruby-lang.org>
* dln.c (conv_to_posix_path): should initialize posix.
-Fri Nov 25 20:34:56 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/xmlrpc/datetime.rb (DateTime::to_a): comparison with non
- array-convertible object must return false.
+Thu Nov 24 21:05:58 2005 NAKAMURA Usaku <usa@ruby-lang.org>
-Fri Nov 25 14:34:09 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * configure.in (AC_CHECK_FUNCS): need to check link().
+ fixed: [ruby-dev:27814]
- * range.c (range_max): treat end exclusion without iteration if
- the end value is an integer. [ruby-talk:167433]
-
-Fri Nov 25 12:52:57 2005 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/rss.rb: added backward compatibility codes.
- * lib/rss/parser.rb: ditto.
- * test/rss/test_parser.rb: ditto.
- * test/rss/test_2.0.rb: ditto.
-
- * test/rss/test_content.rb: use #__send__ instead of #funcall for
- no private method.
-
-Fri Nov 25 12:39:56 2005 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/rss.rb: improved type conversion.
- * lib/rss/1.0.rb: ditto.
- * lib/rss/0.9.rb: ditto.
- * lib/rss/2.0.rb: ditto.
- * lib/rss/image.rb: ditto.
- * lib/rss/syndication.rb: ditto.
-
- * test/rss/test_2.0.rb: added type conversion tests.
- * test/rss/test_accessor.rb: ditto.
- * test/rss/test_to_s.rb: ditto.
- * test/rss/test_syndication.rb: ditto.
- * test/rss/test_setup_maker_2.0.rb: ditto.
- * test/rss/test_setup_maker_1.0.rb: ditto.
- * test/rss/test_setup_maker_0.9.rb: ditto.
- * test/rss/test_maker_sy.rb: ditto.
- * test/rss/test_maker_image.rb: ditto.
- * test/rss/test_maker_2.0.rb: ditto.
- * test/rss/test_maker_0.9.rb: ditto.
- * test/rss/test_image.rb: ditto.
-
- * test/rss/test_maker_1.0.rb: use assert instead of assert_equal.
-
- * test/rss/rss-assertions.rb: improved type conversion assertions.
-
-Fri Nov 25 10:38:20 2005 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/image.rb: added Image prefix.
-
- * lib/rss/maker/image.rb: ditto.
-
-Fri Nov 25 10:33:02 2005 Kouhei Sutou <kou@cozmixng.org>
-
- * test/rss/test_2.0.rb: added RSS 2.0 tests.
-
- * test/rss/rss-assertions.rb: extended XML stylesheet assertion.
-
- * lib/rss/0.9.rb: added initialize method.
-
- * test/rss/test_1.0.rb: cleanup.
-
-Fri Nov 25 10:29:48 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * range.c (range_min): use <=> comparison rather than iteration.
- [ruby-talk:167420]
-
- * range.c (range_max): ditto.
-
-Thu Nov 24 01:31:44 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Thu Nov 24 01:22:25 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* file.c (w32_io_info): CreateFile failed on Win9x if file was already
opened. (FILE_SHARE_READ was needed, but actually I don't understand
the flags of CreateFile well...)
-Wed Nov 23 23:52:35 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * numeric.c (num_div): use floor rather than rb_Integer().
- [ruby-dev:27674]
-
-Wed Nov 23 22:34:15 2005 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/parser.rb: added entity handling type predicate.
- * lib/rss/rexmlparser.rb: ditto.
- * lib/rss/xmlparser.rb: ditto.
- * lib/rss/xmlscanner.rb: ditto.
-
- * lib/rss/xmlscanner.rb: more robust entity handling.
-
- * test/rss/test_parser.rb: added an entity handling test.
-
Wed Nov 23 20:59:01 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tk.rb: add Tk.pkgconfig_list and Tk.pkgconfig_get
[Tk8.5 feature].
- * ext/tk/lib/tk/text.rb: supports new indices modifiers on a Text
+ * ext/tk/lib/tk/text.rb: supports new indices modifires on a Text
widget [Tk8.5 feature].
* ext/tk/lib/tk/virtevent.rb: add TkNamedVirtualEvent.
@@ -49704,7 +8183,7 @@ Wed Nov 23 20:59:01 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tk/event.rb: add :data key for virtual events [Tk8.5
feature].
-Wed Nov 23 18:52:45 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Wed Nov 23 18:55:31 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* file.c (w32_io_info): should not call GetFileInformationByHandle
for pipe.
@@ -49713,61 +8192,15 @@ Wed Nov 23 18:52:45 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* file.c (w32_io_info): now can identify directory on WinNT.
-Wed Nov 23 18:46:53 2005 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/: use #__send__ instead of #send.
- * test/rss/: ditto.
-
-Wed Nov 23 18:32:56 2005 Kouhei Sutou <kou@cozmixng.org>
-
- * test/rss/test_taxonomy.rb: use #reject directory.
-
-Wed Nov 23 18:26:00 2005 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/taxonomy.rb: changed class or module prefix to
- Taxonomy from Taxo.
- * lib/rss/maker/taxonomy.rb: ditto.
-
-Wed Nov 23 18:21:11 2005 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/maker/taxonomy.rb: implemented taxonomy module for RSS
- Maker.
- * lib/rss/taxonomy.rb: supported RSS Maker.
- * lib/rss/maker.rb: added taxonomy module support.
-
- * lib/rss/rss.rb: adjusted to other element API.
- * lib/rss/1.0.rb: adjusted to other element API but backward
- compatibility is reserved.
- * lib/rss/0.9.rb: ditto.
-
- * test/rss/test_maker_taxo.rb: added test case for taxonomy module
- for RSS Maker.
- * test/rss/test_setup_maker_1.0.rb: added tests for taxo:topic.
-
- * test/rss/test_setup_maker_1.0.rb: added backward compatibility
- test.
- * test/rss/test_setup_maker_0.9.rb: ditto.
- * test/rss/test_setup_maker_2.0.rb: ditto.
-
- * test/rss/rss-testcase.rb: added convenience method for setting
- up taxo:topic.
- * test/rss/rss-assertions.rb: added assertion for taxo:topic.
-
- * sample/rss/blend.rb: followed new API.
-
-Wed Nov 23 17:42:24 2005 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/rss.rb: fixed a indentation bug.
-
- * lib/rss/taxonomy.rb: fixed <taxo:topic> #to_s bug.
-
- * test/rss/test_taxonomy.rb: added a #to_s test.
-
Wed Nov 23 03:40:49 2005 Guy Decoux <ts@moulon.inra.fr>
* re.c (KR_REHASH): should cast to unsigned for 64bit CPU.
[ruby-core:06721]
+Wed Nov 23 11:01:33 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+
+ * intern.h, file.c: failed to compile on windows.
+
Wed Nov 23 07:26:44 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
* ext/openssl/extconf.rb: check for X509V3_EXT_nconf_nid.
@@ -49799,14 +8232,14 @@ Tue Nov 22 18:36:11 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* win32/win32.c (winnt_stat): set mapped errno instead of ENOENT.
-Tue Nov 22 14:36:54 2005 NAKAMURA Usaku <usa@ruby-lang.org>
+Tue Nov 22 14:46:57 2005 NAKAMURA Usaku <usa@ruby-lang.org>
* file.c (rb_file_s_basename): skip slashes just after UNC top slashes.
* test/ruby/test_path.rb (test_dirname, test_basename): follow new
spec. and add new tests.
-Tue Nov 22 13:30:15 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Tue Nov 22 13:18:32 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* win32/win32.c (rb_w32_stat): Dir.chdir('//server/shared');
p Dir.glob('*') should work on WinNT. (implemented our own
@@ -49835,11 +8268,6 @@ Mon Nov 21 16:03:48 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* win32/setup.mk: findstr doesn't exist on win9x.
fixed: [ruby-dev:27756]
-Sun Nov 20 21:39:27 2005 K.Kosako <sndgk393 AT ybb.ne.jp>
-
- * regparse.c (fetch_token_in_cc): tok->escaped should be
- initialized. [ruby-dev:27763]
-
Sun Nov 20 22:34:06 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (rb_symname_p): [ not followed by ] is not valid symbol.
@@ -49850,10 +8278,6 @@ Sat Nov 19 19:57:54 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/fileutils.rb (FileUtils::ln): ln documentation fix.
[ruby-core:06661]
-Sat Nov 19 08:19:38 2005 Zach Dennis <zdennis@mktec.com>
-
- * ext/socket/socket.c: Socket Documentation. [ruby-core:6552]
-
Sat Nov 19 07:34:32 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tk/font.rb: remove dependency on Ruby's version (1.8
@@ -49863,7 +8287,7 @@ Sat Nov 19 07:34:32 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/sample/tkextlib/treectrl/demo.rb: ditto.
-Fri Nov 18 18:07:05 2005 NAKAMURA Usaku <usa@ruby-lang.org>
+Fri Nov 18 17:57:08 2005 NAKAMURA Usaku <usa@ruby-lang.org>
* file.c (rb_file_s_dirname): should use skipprefix for UNC path.
pointed out by nobu ([ruby-dev:27744]). fixed: [ruby-core:5076]
@@ -49884,7 +8308,7 @@ Fri Nov 18 17:35:09 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tk/namespace.rb: ditto.
-Fri Nov 18 16:47:33 2005 NAKAMURA Usaku <usa@ruby-lang.org>
+Fri Nov 18 17:26:06 2005 NAKAMURA Usaku <usa@ruby-lang.org>
* file.c (rb_file_s_dirname): added checks for some patterns with drive
letter. fixed: [ruby-dev:27738]
@@ -49892,37 +8316,11 @@ Fri Nov 18 16:47:33 2005 NAKAMURA Usaku <usa@ruby-lang.org>
* test/ruby/test_path.rb (test_dirname): added tests for above
patterns.
-Fri Nov 18 12:19:16 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Fri Nov 18 12:18:02 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* win32/win32.h (S_IFIFO): r,w = IO.pipe; r.stat.pipe? now
returns true on VisualC++6.
-Thu Nov 17 17:58:00 2005 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/1.0.rb: added convenience method 'resources'.
-
- * lib/rss/taxonomy.rb: ditto.
-
- * test/rss/rss-assertions.rb: added test for 'resources'.
-
- * test/rss/test_taxonomy.rb: ditto.
-
-Thu Nov 17 17:53:30 2005 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/taxonomy.rb: implemented taxonomy module.
-
- * test/rss/test_taxonomy.rb: added tests for taxonomy support.
-
-Thu Nov 17 17:40:19 2005 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/1.0.rb: added rdf:Bag.
-
-Thu Nov 17 13:52:00 2005 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/rss.rb: removed needless argument 'prefix'.
-
- * lib/rss/parser.rb: ditto.
-
Wed Nov 16 23:24:17 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* common.mk (static-ruby): overridable.
@@ -49932,24 +8330,12 @@ Wed Nov 16 23:24:17 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/extmk.rb (RUBY, RUBYW): overridable.
-Wed Nov 16 01:29:31 2005 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/trackback.rb: added TrackBack prefix.
-
- * lib/rss/maker/trackback.rb: ditto.
-
-Wed Nov 16 01:26:13 2005 Kouhei Sutou <kou@cozmixng.org>
+Tue Nov 15 23:46:35 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/rss/rss.rb (RSS::VERSION): 0.1.5 -> 0.1.6.
-
- * test/rss/test_version.rb (RSS::TestVersion#test_version): ditto.
+ * lib/find.rb (Find::find): should not ignore symbolic links to
+ non-existing files. [ruby-talk:165866]
-Tue Nov 15 23:54:24 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (file_load_ok): eaccess() returns 0 on success.
- fixed: [ruby-dev:27713]
-
-Tue Nov 15 16:36:03 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Tue Nov 15 16:23:26 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* array.c (rb_ary_fill): previous commit disabled this usage:
@@ -49957,17 +8343,9 @@ Tue Nov 15 16:36:03 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
a.fill {|i| a[i] * 10} #=> [nil, nil, ...., nil]
previous commit has the advantage of early garbage collection, but
- potentially this would break some script. so I reverted behavior.
-
-Tue Nov 15 16:15:23 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+ potensially this would break some script. so I reverted behavior.
- * file.c (file_load_ok): use eaccess() instead of actually opening
- the file. [ruby-talk:156378]
-
- * lib/jcode.rb (String::reverse): add new methods.
- [ruby-list:41245]
-
-Tue Nov 15 15:49:34 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Tue Nov 15 16:04:10 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* array.c (rb_ary_fill): tail elements were vanished when the middle
part of array was filled. (ie: [0,1,2,3,4].fill(-1,2,1) => [0,1,-1])
@@ -49989,71 +8367,33 @@ Mon Nov 14 17:36:22 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* array.c (rb_ary_first): RDoc update from Daniel Berger
<djberg96@yahoo.com>. [ruby-core:06577].
-Sun Nov 13 10:55:24 2005 Minero Aoki <aamine@loveruby.net>
-
- * lib/uri/common.rb (escape): regard second argument as a
- character set. [ruby-dev:27692]
-
-Sat Nov 12 08:36:40 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in, eval.c, intern.h: check fd_mask type.
+Fri Nov 11 10:31:44 2005 Zach Dennis <zdennis@mktec.com>
- * configure.in (socketpair): need to be checked.
-
-Fri Nov 11 19:53:47 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * eval.c, intern.h: failed to compile where NFDBITS is defined but
- howmany() is not defined. [ruby-dev:27680]
-
- * io.c (is_socket): failed to compile where S_ISSOCK is not defined.
-
- * io.c (pipe_open): failed to compile where socketpair is not supported.
+ * ext/socket/socket.c: Socket Documentation. [ruby-core:6552]
Fri Nov 11 08:20:56 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* Makefile.in (OUTFLAG): keep trailing spaces. [ruby-dev:27666]
- * mkconfig.rb: substitution references added.
+ * mkconfig.rb: substitution refereces added.
-Fri Nov 11 07:39:49 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Fri Nov 11 07:44:18 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* configure.in: undef HAVE_LINK on BeOS. (link(2) always returns
EINVAL, and this causes error in test/fileutils.)
- * file.c: override chown(2) and fchown(2) on BeOS. (these functions
+ * file.c: overwride chown(2) and fchown(2) on BeOS. (these functions
should not change user/group id if -1 is passed as corresponding
argument, and this causes error in test/fileutils too)
[ruby-dev:27672]
-Thu Nov 10 21:05:03 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/shellwords.rb: fix for blank but not empty string.
- fixed: [ruby-dev:27663]
-
-Wed Nov 9 08:39:38 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/shellwords.rb: refactored. [ruby-core:06581]
-
-Tue Nov 8 17:35:53 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * intern.h, eval.c (rb_thread_signal_raise): constified.
-
- * signal.c: cosmetic change.
+ * file.c (rb_file_s_link): checks HAVE_LINK.
Tue Nov 8 15:32:27 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
* lib/drb/ssl.rb (DRb::SSLConfig#accept): fixed typo.
[ruby-dev:27560] [ruby-core:4627]
-Mon Nov 7 20:54:57 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/iconv/iconv.c: iconvctl() support. [EXPERIMENTAL]
-
-Mon Nov 7 16:23:23 2005 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/openssl/ossl.h: need to include winsock2.h before including
- windows.h by some openssl headers.
-
Mon Nov 7 13:43:51 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/stubs.c (_nativethread_consistency_check): use simpler
@@ -50064,7 +8404,7 @@ Mon Nov 7 13:43:51 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/tkutil/tkutil.c: ditto.
-Mon Nov 7 00:06:12 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Mon Nov 7 00:06:58 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* lib/yaml.rb: removed :nodoc: to generate Kernel doc. [ruby-core:6324]
@@ -50073,7 +8413,7 @@ Sun Nov 6 23:39:13 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/iconv/iconv.c (Iconv::BrokenLibrary): exception when detected a
bug of underlying library.
-Sun Nov 6 21:43:22 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Sun Nov 6 21:46:59 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* ext/tk/stubs.c (ruby_tcl_create_ip_and_stubs_init): should touch
interpreter after initialization is done. [ruby-dev:27638]
@@ -50083,33 +8423,21 @@ Sun Nov 6 20:13:27 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* file.c (rb_file_s_readlink): readlink(2) on AIX fails with ERANGE if
buffer size is less than required. fixed: [ruby-dev:27634]
-Sat Nov 5 13:42:50 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in, cygwin/GNUmakefile.in (mingw): use def file to alias
- symbols. [ruby-dev:27532]
-
- * bcc32/mkexports.rb, win32/mkexports.rb: make aliases in DLL.
-
- * win32/win32.c, win32/win32.h: replace symbols only when RUBY_EXPORT
- is defined.
-
-Thu Nov 3 07:57:39 2005 Minero Aoki <aamine@loveruby.net>
-
- * lib/open-uri.rb (open_loop): find_proxy should return nil when
- proxy does not exist. [ruby-dev:27630]
-
Wed Nov 2 20:25:28 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/extconf.rb: ext/tk/extconf.rb: change the check parameter
for Win32.
+Wed Nov 2 20:14:53 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tcltklib: merge into ext/tk and remove.
+
Wed Nov 2 19:03:06 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * ext/tk/tcltklib.c (ip_rbUpdateObjCmd, ip_rb_threadUpdateObjCmd):
- passed improper flags to DoOneEvent().
+ * ext/tcltklib/tcltklib.c (ip_rbUpdateObjCmd,
+ ip_rb_threadUpdateObjCmd): passed improper flags to DoOneEvent().
- * ext/tk/tkutil/tkutil.c: use rb_obj_respond_to() instead of
- rb_respond_to().
+ * ext/tk/tkutil.c: use rb_obj_respond_to() instead of rb_respond_to().
Tue Nov 1 14:20:11 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
@@ -50119,7 +8447,7 @@ Tue Nov 1 14:20:11 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (exec_under): frame during eval should preserve external
information.
-Tue Nov 1 10:48:49 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Tue Nov 1 10:50:17 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
* ext/openssl/extconf.rb: should check ERR_peek_last_error().
[ruby-dev:27597]
@@ -50131,14 +8459,19 @@ Mon Oct 31 17:34:46 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* configure.in: use proper option for Sun linker. A patch from
Shinya Kuwamura <kuwa at labs.fujitsu.com>. [ruby-dev:27603]
-Mon Oct 31 05:46:08 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Mon Oct 31 11:27:22 2005 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * test/gdbm/test_gdbm.rb, test/sdbm/test_sdbm.rb (test_s_open_error):
+ skip on Win32/DOS platforms.
+
+Mon Oct 31 05:49:23 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
* ext/openssl/ossl_cipher.c (ossl_cipher_update): input data must
not be empty. [ruby-talk:161220]
* test/openssl/test_cipher.rb: add test for Cipher#update("").
-Mon Oct 31 05:38:26 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Mon Oct 31 05:37:20 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
* lib/webrick/httpservlet/cgihandler.rb
(WEBrick::HTTPServlet::CGIHandler#do_GET): the value of Set-Cookie:
@@ -50150,14 +8483,17 @@ Mon Oct 31 05:38:26 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
* test/webrick/test_cookie.rb, test/webrick/test_cgi.rb,
test/webrick/webrick.cgi: add some test for cookie.
-Mon Oct 31 02:33:25 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+Mon Oct 31 03:19:36 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * ext/readline/readline.c (readline_readline): type check.
+ [ruby-core:6089]
* numeric.c (fix_rshift): RDoc fix. [ruby-core:6351]
* util.h (strtod): add #undef for platforms defines strtod()
macro. [ruby-dev:27563]
-Mon Oct 31 02:31:41 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Mon Oct 31 02:35:59 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* test/ruby/test_float.rb (test_precision): test by assert_in_delta.
[ruby-dev:27575]
@@ -50169,33 +8505,25 @@ Sat Oct 29 01:58:25 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* ext/fcntl/fcntl.c: ditto.
-Sat Oct 29 16:56:03 2005 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date.rb: added seven predicates sunday? to saturday?.
-
- * lib/date.rb: added two methods {prev,next}_month,
- that are almost same as << and >>.
-
-Thu Oct 27 20:34:43 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * enumerator.c (enumerator_allocate): allow subclassing.
-
Thu Oct 27 16:45:31 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* string.c (scan_once): wrong condition to use mbclen2().
[ruby-dev:27535]
-Thu Oct 27 11:53:17 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * missing.h, missing/memcmp.c, missing/memmove.c:
- ANSI compatible interface.
-
-Wed Oct 26 09:15:48 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Wed Oct 26 09:27:27 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* ext/syck/implicit.c (syck_type_id_to_uri): should return
newly allocated memory. otherwise, type_id will be freed
twice. [ruby-dev:27384] [ruby-core:6385]
+Wed Oct 26 09:04:51 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+
+ * ruby.h (Qfalse, Qtrue, Qnil, Qundef): make sure these immediate
+ values have VALUE type. there is an environment where sizeof(VALUE)
+ != sizeof(int) like IA64. if 32bit integer (Qtrue) is passed to ANYARGS
+ and received by 64bit integer (VALUE), upper bits may have garbage value.
+ [ruby-dev:27513]
+
Wed Oct 26 01:58:19 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (RUBY_EXTERN): macro to export symbols in shared
@@ -50206,14 +8534,6 @@ Wed Oct 26 01:58:19 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/extmk.rb (extmake): RUBY_EXTERN for static linked extensions.
-Tue Oct 25 20:06:59 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * ruby.h (Qfalse, Qtrue, Qnil, Qundef): make sure these immediate
- values have VALUE type. there is an environment where sizeof(VALUE)
- != sizeof(int) like IA64. if 32bit integer (Qtrue) is passed to ANYARGS
- and received by 64bit integer (VALUE), upper bits may have garbage value.
- [ruby-dev:27513]
-
Tue Oct 25 15:32:00 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/rational.rb: applied documentation patch from Gavin Sinclair
@@ -50222,22 +8542,12 @@ Tue Oct 25 15:32:00 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/irb.rb (IRB::Irb::eval_input): handle prompts with newlines
in irb auto-indentation mode. [ruby-core:06358]
-Tue Oct 25 14:21:46 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * gc.c (garbage_collect): sorry, previous commit was incorrect.
- [ruby-core:6386]
-
-Tue Oct 25 13:40:16 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * gc.c (garbage_collect): return now whether there're rooms for new
- objects, rather than whether GC run. fixed: [ruby-core:6376]
-
Tue Oct 25 02:12:08 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/rdoc/markup/simple_markup.rb (SM::SimpleMarkup::LABEL_LIST_RE):
reduce redundant backtrack. [ruby-talk:161771]
-Tue Oct 25 00:35:33 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+Tue Oct 25 00:27:35 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
* lib/rinda/*: RDoc documentation from Eric Hodel
<drbrain@segment7.net> added.
@@ -50247,19 +8557,11 @@ Mon Oct 24 21:14:29 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in, io.c: use sys/syscall.h if syscall.h is not available.
[ruby-core:06247]
-Mon Oct 24 20:38:25 2005 NAKAMURA Usaku <usa@ruby-lang.org>
+Mon Oct 24 20:49:45 2005 NAKAMURA Usaku <usa@ruby-lang.org>
* ext/Win32API/lib/win32/resolv.rb (get_info): support multiple DNS.
fixed: [ruby-list:40058], [ruby-dev:27479]
-Mon Oct 24 11:01:11 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk/canvas.rb (TkCanvasItemConfig::__item_val2ruby_optkeys):
- typo fixed. [ruby-talk:162187]
-
- * ext/tk/lib/tk/menu.rb (TkMenuEntryConfig::__item_val2ruby_optkeys):
- ditto. [ruby-core:06359]
-
Mon Oct 24 07:57:56 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* ext/tk/lib/tk/canvas.rb (TkCanvasItemConfig::__item_val2ruby_optkeys):
@@ -50268,18 +8570,15 @@ Mon Oct 24 07:57:56 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* ext/tk/lib/tk/menu.rb (TkMenuEntryConfig::__item_val2ruby_optkeys):
ditto. [ruby-core:06359]
- * lib/matrix.rb (Matrix::initialize): use funcall instead of send
- to allow private methods to be called. A report from
- Jean-Claude Arbaut <jcarbaut@laposte.net>. [ruby-core:06359]
+Sun Oct 23 21:50:15 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-Mon Oct 24 00:41:18 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * time.c (time_sunday): added predicate methods for the days of the
- week. [ruby-list:41340]
+ * ext/enumerator/enumerator.c: applied documentation patch from
+ James Edward Gray II <james@grayproductions.net>.
+ [ruby-core:06348]
Sun Oct 23 07:11:11 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * ext/tk/extconf.rb: improve messages [ruby-core:06325].
+ * ext/tcltklib/extconf.rb: improve messages [ruby-core:06325].
* ext/tk/lib/tk.rb, ext/tk/lib/tk/canvas.rb, ext/tk/lib/tk/entry.rb,
ext/tk/lib/tk/frame.rb, ext/tk/lib/tk/image.rb,
@@ -50306,16 +8605,6 @@ Sat Oct 22 23:54:07 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/extmk.rb, lib/mkmf.rb (with_config): support --with-extension
options. [ruby-dev:27449]
-Sat Oct 22 14:25:43 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * util.[hc] (ruby_add_suffix): constified.
-
- * util.[hc] (ruby_scan_{oct,hex}): fixed typo. (renamed from
- scan_{oct,hex})
-
- * util.c: almostly ANSI styled. (except for functions depending on
- macro and K&R technique)
-
Sat Oct 22 13:26:57 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* object.c (sym_inspect), parse.y (parser_yylex, rb_symname_p): check
@@ -50326,20 +8615,7 @@ Sat Oct 22 13:26:57 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* time.c (rb_strftime): removed meaningless volatile modifiers, and
concatenate successive nul characters at once. [ruby-dev:27472]
- * ext/tk/lib/tk/font.rb, ext/tk/lib/tkextlib/ICONS/icons.rb,
- ext/tk/sample/tkextlib/treectrl/demo.rb, lib/net/imap.rb,
- lib/rss/parser.rb, test/rss/test_content.rb,
- test/rss/test_dublincore.rb, test/rss/test_syndication.rb,
- test/rss/test_trackback.rb, test/ruby/test_eval.rb,
- test/socket/test_socket.rb, test/socket/test_udp.rb:
- Object#fcall was renamed as Object#funcall.
-
-Sat Oct 22 10:08:28 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * missing.h, missing/*.c: SUSv3 compatible strcasecmp and strncasecmp,
- ANSI compatible strtol and strtoul, and ANSI styled other functions.
-
-Fri Oct 21 19:16:08 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Fri Oct 21 19:21:56 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* rubysig.h (CHECK_INTS): fixed typo. (I believe bit-or is improper)
@@ -50347,27 +8623,7 @@ Fri Oct 21 17:49:32 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* bin/erb (ERB::Main::run): typo fixed. [ruby-core:06337]
-Fri Oct 21 15:42:28 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * intern.h, struct.c (rb_struct_iv_get): constified.
-
- * marshal.c: avoid one VC++6 warning for implicit conversion
- from int to char.
-
- * ruby.h: ANSI styled.
-
- * bcc32/Makefile.sub (HAVE_HYPOT): added.
-
- * ext/socket/extconf.rb: BeOS is only one platform should call
- closesocket, so check __BEOS__ macro directly. (I was worried
- accidently HAVE_CLOSESOCKET is defined on windows again because
- it has it)
-
- * ext/socket/{getaddrinfo.c,socket.c}: ditto.
-
- ... these are all cosmetic changes.
-
-Fri Oct 21 15:23:23 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Fri Oct 21 15:27:17 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* bignum.c (bignew_1): convertion from `int' to `char' discards
upper bits, (ie. (char)0xff00 -> 0) so it's better to test if
@@ -50377,26 +8633,7 @@ Fri Oct 21 15:23:23 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* time.c: should use LONG_LONG instead of `long long'.
-Thu Oct 20 22:22:49 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parser.y (struct parser_params): parser never modify input string.
-
- * ext/ripper/tools/preproc.rb (prelude): do not append surplus
- newlines to fix line numbers.
-
-Thu Oct 20 11:41:57 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * class.c, eval.c, hash.c, st.c, variable.c: changed /* ??? */ stuff
- protoize generated to ANYARGS.
-
-Thu Oct 20 11:18:11 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * eval.c, file.c, ruby.c: removed strchr, strrchr, strstr definition
- because they are defined in missing.h.
-
- * missing.h, missing/strchr.c, missing/strstr.c: ANSI styled.
-
-Thu Oct 20 09:36:06 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Thu Oct 20 09:37:15 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* lib/mkmf.rb (create_makefile): Borland make seems not to allow
empty dependency list. If this change is not good, please correct
@@ -50407,13 +8644,20 @@ Thu Oct 20 07:55:09 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (create_makefile): get rid of a restriction
of Borland make. fixed: [ruby-dev:27460]
- * ext/ripper/depend: ditto.
+Thu Oct 20 00:13:18 2005 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * rubysig.h (CHECK_INTS): fix typo.
Wed Oct 19 23:58:03 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (create_makefile): do not create unnecessary empty
directories. fixed: [ruby-dev:27451]
+Wed Oct 19 19:26:15 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * parse.y (rb_gc_mark_parser): get rid of segfault with old yacc.
+ fixed: [ruby-dev:27439]
+
Wed Oct 19 08:28:32 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* file.c (rb_file_join): elements may contain null pointer strings.
@@ -50421,33 +8665,27 @@ Wed Oct 19 08:28:32 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
Wed Oct 19 02:34:33 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * enumerator.c, eval.c, gc.c, parse.y, regparse.c, sjis.c, time.c:
- made internal symbols static. [ruby-dev:27435]
-
-Tue Oct 18 10:58:27 2005 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/dl/depend, ext/dl/extconf.rb, ext/socket/depend,
- ext/socket/extconf.rb: shouldn't define DESTCLEANFILES in depend,
- use $distcleanfiles in extconf.rb.
+ * eval.c, gc.c, time.c: made internal symbols static. [ruby-dev:27435]
- * win32/Makefile.sub (distclean-local): should remove .config.h.time.
+Wed Oct 19 01:27:07 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Mon Oct 17 09:42:50 2005 NAKAMURA Usaku <usa@ruby-lang.org>
+ * regex.c (re_compile_pattern): numeric literal inside character class
+ disabled succeeding backtrack. fixed: [ruby-list:41328]
- * mkconfig.rb: fixup configure_args for mswin32 configure.
+Mon Oct 17 21:18:50 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * win32/configure.bat (srcdir, target): ditto.
+ * parse.y (parser_heap): byacc never free parser stack.
+ fixed: [ruby-dev:27428]
-Mon Oct 17 05:01:50 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+Mon Oct 17 16:04:47 2005 NAKAMURA Usaku <usa@ruby-lang.org>
- * env.h: move struct METHOD and struct BLOCK from eval.c to
- support NodeWrap and ParseTree.
+ * file.c (chmod_internal, lchmod_internal): fixed type of 2nd argument.
Sun Oct 16 22:16:51 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/extmk.rb: omit non-existing directories.
-Sun Oct 16 14:40:54 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+Sun Oct 16 14:30:05 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
* lib/rinda/rinda.rb (Rinda::Tuple#initialize): check remote hash
tuple. fixed: [ruby-list:41227]
@@ -50465,48 +8703,20 @@ Sun Oct 16 03:38:07 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (rb_thread_schedule): clear rb_thread_critical.
[ruby-core:04039]
-Sun Oct 16 00:13:14 2005 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/configure.bat: remove unnecessary line which prevents
- creating Makefile.
-
-Sat Oct 15 23:52:07 2005 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/net/ftp.rb: (getbinaryfile): allow nil for localfile, and
- returns retrieved data if localfile is nil.
-
- * lib/net/ftp.rb: (gettextfile): ditto.
-
-Sat Oct 15 19:51:29 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+Sat Oct 15 19:56:38 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
* bin/erb: typo fixed, again. thanks, Doug Kearns.
-Fri Oct 14 23:09:31 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/Makefile.sub (MKFILES): update MKFILES if configure files get
- changed.
-
- * win32/configure.bat, win32/setup.mak (configure_args): store
- arguments to configure files.
-
-Fri Oct 14 22:05:45 2005 NAKAMURA Usaku <usa@ruby-lang.org>
+Fri Oct 14 22:08:26 2005 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/win32.c (ioctl): should set errno.
-Fri Oct 14 16:39:37 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Fri Oct 14 16:57:32 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
* lib/webrick/config.rb (Config::FileHandler): :UserDir should be nil.
It is harmful to permit the access to ~/public_html by default.
suggested by Hiroyuki Iwatsuki.
-Fri Oct 14 04:58:38 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_obj_instance_exec): create instance_exec and
- module_exec which pass arguments to the block.
-
- * eval.c (rb_f_funcall): rename fcall to funcall to follow
- tradition.
-
Thu Oct 13 23:29:51 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (HEAPCNT): bison allocates indivisible size.
@@ -50515,7 +8725,7 @@ Thu Oct 13 23:29:51 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c, pack.c, ext/syck/rubyext.c, ext/syck/syck.h, missing/isinf.c:
get rid of warnings. fixed: [ruby-core:06247]
-Wed Oct 12 12:51:56 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Wed Oct 12 12:52:57 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
* ext/openssl/ossl.c (Init_openssl): should call
OpenSSL_add_ssl_algorithms().
@@ -50526,15 +8736,6 @@ Wed Oct 12 11:08:54 2005 WATANABE Hirofumi <eban@ruby-lang.org>
Tue Oct 11 21:41:58 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * configure.in (RUBY_FUNC_ATTRIBUTE): check prefixed attribute form
- first. [ruby-dev:27398]
-
- * array.c, enum.c, eval.c, util.c: safer function pointer usage.
- fixed: [ruby-core:06143]
-
- * util.h (qsort): removed the definition incompatible to ANSI.
- fixed: [ruby-core:06147]
-
* eval.c (rb_obj_respond_to): check if obj responds to the given
method with the given visibility. [ruby-dev:27408]
@@ -50545,66 +8746,33 @@ Tue Oct 11 00:01:21 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* st.c (st_free_table): do not call free() but xfree().
[ruby-core:06205]
-Sat Oct 8 19:49:42 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat Oct 8 20:04:40 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (Init_Binding): add Binding#dup method. [yarv-dev:666]
- * io.c (rb_io_init_copy): clear PREP flag for copied IO.
- fixed: [ruby-dev:27371]
-
* parse.y (rb_parser_malloc, rb_parser_free): manage parser stack on
heap. [ruby-list:41199]
- * parse.y (ripper_initialize): use rb_respond_to().
-
- * ext/ripper/depend (check): get rid of re-generating ripper.y always.
-
* ext/iconv/charset_alias.rb: parse config.charset_alias file directly.
- * ext/nkf/lib/kconv.rb (Kconv.conv): get rid of nil.to_a.
-
- * lib/scanf.rb (Scanf::FormatSpecifier#letter, #width): use matched
- substring directly.
-
- * test/ruby/test_assignment.rb, test/ruby/test_iterator.rb: followed
- change of sample/test.rb.
-
- * test/net/http/test_http.rb: removed superfluous splatting stars.
-
-Fri Oct 7 16:41:43 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (splat_value): call rb_Array() to convert svalue to
- values. [ruby-dev:27397]
-
Fri Oct 7 09:54:00 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/cgi.rb (CGI::Cookie::parse): Cookies from Nokia devices may
not be parsed correctly. A patch from August Z. Flatby
(augustzf) in [ruby-Patches-2595]. [ruby-core:06183]
-Thu Oct 6 22:51:30 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (rb_Array): Array() to raise error for objects without
- to_ary, nor to_a.
-
- * object.c (nil_to_a): revert NilClass#to_a.
-
-Thu Oct 6 20:10:38 2005 Minero Aoki <aamine@loveruby.net>
+Thu Oct 6 20:12:16 2005 Minero Aoki <aamine@loveruby.net>
* ext/strscan/strscan.c (strscan_free): remove useless code.
[ruby-dev:26368] [ruby-dev:27389]
-
-Thu Oct 6 01:02:19 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * range.c (rb_range_beg_len): should return Qfalse for non-range
- object.
+ (backported from trunk, rev 1.22)
Wed Oct 5 04:42:38 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
* lib/xmlrpc/server.rb (XMLRPC::Server#initialize): should mount the
servlet on "/".
-Wed Oct 5 04:06:49 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Wed Oct 5 03:59:09 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
* lib/xmlrpc/server.rb (XMLRPC::Server#serve): delete wrong call
of "join".
@@ -50613,31 +8781,14 @@ Mon Oct 3 00:04:00 2005 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
* pack.c (EXTEND16): [ruby-dev:27383]
-Sat Oct 1 23:55:24 2005 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (do_select, rb_w32_select): brush up.
-
-Sat Oct 1 12:57:02 2005 Tanaka Akira <akr@m17n.org>
-
- * bignum.c (rb_big_rand): removed. [ruby-dev:25405]
-
-Sat Oct 1 01:46:51 2005 Tanaka Akira <akr@m17n.org>
-
- * lib/open-uri.rb (OpenURI.open_loop): prohibit multiple proxy
- options.
-
Thu Sep 29 10:26:18 2005 Tanaka Akira <akr@m17n.org>
- * ext/dl/cptr.c (rb_dlptr_s_to_ptr): abolish sizeof(FILE).
+ * ext/dl/dl.c (rb_io_to_ptr): abolish sizeof(FILE).
[ruby-dev:27317]
-Thu Sep 29 10:15:14 2005 Tanaka Akira <akr@m17n.org>
-
- * lib/open-uri.rb (:proxy_http_basic_authentication): new option.
-
Thu Sep 29 07:22:05 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * eval.c (rb_f_send): underscores need to be escaped.
+ * evalc. (rb_f_send): underscores need to be escaped.
fixed by Doug Kearns. [ruby-core:06053]
Thu Sep 29 00:57:35 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
@@ -50648,21 +8799,38 @@ Thu Sep 29 00:57:35 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* variable.c (rb_autoload_load): now return true if autoload
succeeded. fixed: [ruby-dev:27331]
-Wed Sep 28 23:40:04 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Sep 28 23:42:15 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * file.c (apply2files): add prototype.
* file.c (rb_stat_inspect): constified.
-Wed Sep 28 15:12:28 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * class.c (rb_mod_init_copy, rb_class_init_copy), file.c (rb_stat_init_copy),
+ numeric.c (num_init_copy), object.c (rb_obj_init_copy, Init_Object),
+ re.c (match_init_copy, rb_reg_init_copy), time.c (time_init_copy):
+ undocumented.
+
+Wed Sep 28 23:09:23 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * lib/delegate.rb: document update from James Edward Gray II
+ <james@grayproductions.net>. [ruby-core:06027]
+
+Wed Sep 28 15:14:19 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
* lib/webrick/cgi.rb (WEBrick::CGI#start): req.query_string should
- refer to the value of QUERY_STRING. [ruby-list:41186]
+ refer the value of QUERY_STRING. [ruby-list:41186]
* lib/webrick/httprequest.rb (WEBrick::HTTPRequest#query_string=):
add new method.
Wed Sep 28 10:45:44 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * ext/tk/tcltklib.c: cannot compile with Tcl/Tk8.0.x [ruby-dev:27335].
+ * ext/tcltklib/tcltklib.c: cannot compile with Tcl/Tk8.0.x
+ [ruby-dev:27335].
+
+Wed Sep 28 08:12:18 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * io.c (read_buffered_data): check if reached EOF. fixed: [ruby-dev:27334]
Wed Sep 28 07:56:52 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
@@ -50673,7 +8841,7 @@ Wed Sep 28 07:56:52 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/yaml/types.rb (YAML::PrivateType, YAML::DomainType): ditto.
-Wed Sep 28 03:16:41 2005 NAKAMURA Usaku <usa@ruby-lang.org>
+Wed Sep 28 03:23:35 2005 NAKAMURA Usaku <usa@ruby-lang.org>
* rubysig.h: fixed build problem with --enable-pthread on platforms
which don't have setitimer().
@@ -50683,38 +8851,15 @@ Mon Sep 26 22:32:13 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (set_trace_func): add rb_secure(4) to prevent adding
tracing function.
-Mon Sep 26 20:59:28 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * parse.y: changed to ANSI function style.
-
-Sun Sep 25 12:02:04 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+Sun Sep 25 12:05:10 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
* bin/erb: typo fixed.
-Sun Sep 25 11:54:11 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-
- * lib/rinda/tuplespace.rb (Rinda::TemplateEntry::initialize): pull
- up method. Tabs converted to spaces.
-
-Sun Sep 25 09:34:22 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * parse.y: replaced `foo _((boo))' with `foo(boo)'.
-
-Sun Sep 25 08:19:53 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/rss/test_content.rb, test/rss/test_syndication.rb: use fcall
- instead of send in order to override visibility.
-
Sun Sep 25 01:46:43 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* misc/ruby-mode.el (ruby-calculate-indent): arrange deep-indent
closing parenthesis at same column as the opening.
-Sun Sep 25 01:33:41 2005 Tanaka Akira <akr@m17n.org>
-
- * process.c (proc_setrlimit): make the third argument (rlim_max)
- optional.
-
Sun Sep 25 00:42:11 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* misc/ruby-mode.el (ruby-expr-beg): deal with heredoc separately.
@@ -50724,37 +8869,20 @@ Sun Sep 25 00:42:11 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
level for continuous line inside parentheses.
http://nabeken.tdiary.net/20050915.html#p02
-Sat Sep 24 21:19:39 2005 Minero Aoki <aamine@loveruby.net>
-
- * ext/strscan/strscan.c: document enhancement.
-
- * ext/strscan/strscan.c: update copyright year.
-
- * ext/strscan/strscan.c: update coding style.
-
-Sat Sep 24 20:20:05 2005 Minero Aoki <aamine@loveruby.net>
+Sun Sep 25 00:18:11 2005 Tanaka Akira <akr@m17n.org>
- * test/net/http/test_http.rb (teardown): Net::HTTP.version_1_1 breaks
- many other tests; ensure that Net::HTTP is version 1.2 after test.
- [ruby-dev:27312]
-
-Sat Sep 24 11:44:28 2005 Minero Aoki <aamine@loveruby.net>
-
- * test/net/http/test_http.rb: new file.
+ * eval.c (unknown_node): show more information. [ruby-dev:26196]
-Sat Sep 24 08:54:05 2005 Minero Aoki <aamine@loveruby.net>
+Sat Sep 24 08:56:01 2005 Minero Aoki <aamine@loveruby.net>
* lib/fileutils.rb (cd): no longer accept :noop option, related
- code is useless. [ruby-core:05858] [ruby-Bugs:2494]
-
-Sat Sep 24 08:30:00 2005 Tanaka Akira <akr@m17n.org>
-
- * lib/pathname.rb (Pathname#sub): new method.
+ code is useless (backported from trunk, rev 1.67).
+ [ruby-core:05858] [ruby-Bugs:2494]
-Sat Sep 24 08:29:36 2005 Minero Aoki <aamine@loveruby.net>
+Sat Sep 24 08:38:07 2005 Minero Aoki <aamine@loveruby.net>
* lib/fileutils.rb: fix visibility of FileUtils::NoWrite, Verbose,
- DryRun. [ruby-core:05954]
+ DryRun (backported from trunk, rev 1.66). [ruby-core:05954]
* test/fileutils/test_nowrite.rb: test it.
@@ -50762,163 +8890,32 @@ Sat Sep 24 08:29:36 2005 Minero Aoki <aamine@loveruby.net>
* test/fileutils/test_verbose.rb: new file.
-Sat Sep 24 07:59:01 2005 Minero Aoki <aamine@loveruby.net>
-
- * sample/ripper/colorize.rb: removed (replaced by ruby2html.rb).
-
- * sample/ripper/ruby2html.rb: added.
-
-Sat Sep 24 06:35:15 2005 Minero Aoki <aamine@loveruby.net>
-
- * ext/ripper: no longer generates .rb files.
-
- * parse.y (Init_ripper): ripper_init_eventids*() takes 1 argument,
- self (class Ripper).
-
- * ext/ripper/depend: target removed: `lib/ripper/core.rb'.
-
- * ext/ripper/depend: new target `eventids2table.c'.
-
- * ext/ripper/depend: new target `check'.
-
- * ext/ripper/eventids2.c: include eventids2table.c.
-
- * ext/ripper/eventids2.c: initialize SCANNER_EVENT_TABLE.
-
- * ext/ripper/extconf.rb: update $cleanfiles list.
-
- * ext/ripper/tools/generate.rb: no longer generate ripper/core.rb.
-
- * ext/ripper/tools/generate.rb: new mode `check'.
-
- * ext/ripper/tools/generate.rb: new mode `eventids2table'.
-
- * ext/ripper/lib/ripper/core.rb.in: removed.
-
- * ext/ripper/lib/ripper/core.rb: added.
-
- * ext/ripper/lib/ripper/filter.rb: update copyright year.
-
- * ext/ripper/lib/ripper/lexer.rb: ditto.
-
- * ext/ripper/lib/ripper/sexp.rb: ditto.
-
Sat Sep 24 02:40:20 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/delegate.rb: document update from James Edward Gray II
<james@grayproductions.net>. [ruby-core:05942]
-Sat Sep 24 02:05:51 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * process.c (proc_daemon): should restrict execution on levels
- higher than $SAFE=2. suggested by URABE Shyouhei
- <shyouhei@ice.uec.ac.jp>.
-
-Fri Sep 23 20:10:35 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/ripper/tools/generate.rb, ext/ripper/tools/preproc.rb: StringIO
- is not available for miniruby. fixed: [ruby-dev:27307]
-
-Fri Sep 23 17:36:48 2005 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c: avoid core dump with WIN32OLE_EVENT.
- [ruby-dev:27133]
-
-Fri Sep 23 16:27:39 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/forwardable.rb: replaced by new implementation from
- <Daniel.Berger@qwest.com>. [ruby-core:05899]
-
-Fri Sep 23 07:07:47 2005 Minero Aoki <aamine@loveruby.net>
-
- * test/ripper/depend: use --output option instead of redirect;
- nmake does not remove a target when the target file is created by
- redirect. [ruby-dev:26466]
-
- * test/ripper/tools/preproc.rb: new option --output.
-
-Fri Sep 23 06:57:52 2005 Minero Aoki <aamine@loveruby.net>
-
- * test/ripper/tools/generate.rb: check parser event arity.
-
- * test/ripper/tools/generate.rb: detect crash of parser-event-IDs
- and scanner-event-IDs.
-
-Fri Sep 23 06:01:30 2005 Minero Aoki <aamine@loveruby.net>
-
- * test/ruby/test_file.rb: check File#chown(nil,nil).
- [ruby-dev:27140]
-
-Fri Sep 23 05:57:23 2005 Minero Aoki <aamine@loveruby.net>
-
- * ext/ripper: refactoring code generation tools. [ruby-dev:27247]
- [ruby-dev:27273]
-
- * ext/ripper/depend: use generate.rb.
-
- * ext/ripper/lib/ripper/core.rb: removed.
-
- * ext/ripper/tools/generate-eventids1.rb: removed (code moved to
- generate.rb).
-
- * ext/ripper/tools/generate-ripper_rb.rb: removed (code moved to
- generate.rb).
-
- * ext/ripper/tools/list-parse-event-ids.rb: removed (code moved to
- generate.rb).
-
- * ext/ripper/tools/list-scan-event-ids.rb: removed (code moved to
- generate.rb).
-
- * ext/ripper/lib/ripper/core.rb: removed.
-
- * ext/ripper: refactoring tests. [ruby-dev:27273]
-
- * ext/ripper/test/check-event-arity.rb: removed (code moved to
- tools/generate.rb).
-
- * ext/ripper/test/check-event-coverage.rb: removed (code moved to
- test/ripper/test_parser_events.rb).
-
- * ext/ripper/test/check-scanner-event-coverage.rb: removed (code
- moved to test/ripper/test_scanner_events.rb).
-
- * ext/ripper/test/list-called-events.rb: removed.
-
- * ext/ripper/test/src_rb: removed.
-
- * ext/ripper/test/validate.rb: removed.
-
- * test/ripper/test_scanner_events.rb: check event coverage.
-
- * ext/ripper/lib/ripper/core.rb.in: update copyright year.
-
-Thu Sep 22 23:40:19 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Sep 22 23:36:24 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (find_executable0): default path if environment is not
set. [ruby-dev:27281]
- * ext/ripper/extconf.rb (have_command): replaced with find_executable.
-
-Thu Sep 22 17:31:48 2005 Shugo Maeda <shugo@ruby-lang.org>
+Thu Sep 22 16:33:12 2005 Shugo Maeda <shugo@ruby-lang.org>
* test/readline/test_readline.rb (TestReadline::replace_stdio):
merged the patch of [ruby-dev:25232] instead of [ruby-dev:25223].
- (merged from ruby_1_8 branch)
Wed Sep 21 23:30:44 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (configuration): generalized nmake dependent code.
-Wed Sep 21 14:16:30 2005 NAKAMURA Usaku <usa@ruby-lang.org>
+Wed Sep 21 09:07:55 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/ripper/depend (SUFFIXES): no longer needed.
-
- * ext/ripper/depend (c): avoid nmake problem. fixed [ruby-dev:27191]
+ * stable version 1.8.3 released.
Wed Sep 21 08:52:25 2005 why the lucky stiff <why@ruby-lang.org>
- * ext/syck/token.c: correctly compute indentation of a block
+ * ext/syck/token.c: correctly compute identation of a block
scalar's parent node. [ruby-talk:150620]
Wed Sep 21 08:20:24 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
@@ -50935,18 +8932,19 @@ Wed Sep 21 02:44:09 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* file.c (path_check_0): disallow sticky world writable directory
in PATH (and $LOAD_PATH). [ruby-dev:27226]
-Wed Sep 21 00:32:22 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * file.c (fpath_check): typo fixed.
+
+Tue Sep 20 22:29:49 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
- * numeric.c (fix_idiv): 1.div(1.0) should return integer value.
- [ruby-dev:27235]
+ * test/wsdl/simpletype/rpc/test_rpc.rb, test/wsdl/ref/test_ref.rb,
+ test/wsdl/any/test_any.rb test/soap/wsdlDriver/test_calc.rb:
+ suppress deliberate warnings with $VERBOSE = nil.
-Tue Sep 20 22:25:43 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Sep 20 21:26:23 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/io/wait/lib/nonblock.rb: disable on platforms non-blocking flag
is not available. fixed: [ruby-dev:27187]
- * file.c (rb_stat_inspect): protoized function pointer.
-
Tue Sep 20 18:23:04 2005 Tanaka Akira <akr@m17n.org>
* eval.c (thread_mark): mark th->last_status. [ruby-dev:27179]
@@ -50966,23 +8964,28 @@ Tue Sep 20 17:48:34 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/xmlrpc/server.rb (WEBrickServlet::service): ditto.
-Tue Sep 20 17:26:42 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Tue Sep 20 17:34:46 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* test/webrick/test_cgi.rb: set ENV["PATH"] to CGIEnvPath on
windows. bcc32's runtime is not installed into system directory,
so it cannot be found without this setting. [ruby-dev:27166]
-Tue Sep 20 17:14:10 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * io.c: PIPE_BUF is not defined on BeOS. use _POSIX_PIPE_BUF instead.
- [ruby-dev:27185]
-
Tue Sep 20 17:10:38 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* test/dbm/test_dbm.rb (TestDBM::test_s_open_error): remove
test_s_open_error test to detect duplicate open.
[ruby-dev:27202]
+Tue Sep 20 17:08:31 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+
+ * io.c: PIPE_BUF is not defined on BeOS. use _POSIX_PIPE_BUF instead.
+ [ruby-dev:27185]
+
+Tue Sep 20 16:53:53 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * test/readline/test_readline.rb (TestReadline::replace_stdio):
+ BSD seek support from [ruby-dev:25223]. fixed: [ruby-dev:27150]
+
Tue Sep 20 15:39:40 2005 why the lucky stiff <why@ruby-lang.org>
* ext/syck/emitter.c (syck_scan_scalar): prevent indicators from
@@ -50999,57 +9002,49 @@ Tue Sep 20 15:39:40 2005 why the lucky stiff <why@ruby-lang.org>
* ext/syck/rubyext.c: loading of binary-typed nodes. prevent
emission of plain strings that look like symbols, but which aren't.
-Tue Sep 20 05:48:26 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Tue Sep 20 05:50:22 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* test/xmlrpc/test_webrick_server.rb (setup_http_server):
should not include 'webrick/https' unless 'use_ssl' because
it fails where openssl is not installed.
-Tue Sep 20 01:24:45 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (splat_value): use to_a to splat non Array object.
-
- * object.c (nil_to_a): remove nil.to_a. [experimental]
-
-Tue Sep 20 01:01:41 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/mathn.rb (Fixnum): remove debug print.
-
- * lib/rational.rb (Rational): ditto.
-
Tue Sep 20 00:34:07 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* io.c (io_close): call rb_io_close() directly if io is a T_FILE
object. [ruby-dev:27156]
-Mon Sep 19 18:58:10 2005 Minero Aoki <aamine@loveruby.net>
+Mon Sep 19 19:09:08 2005 Minero Aoki <aamine@loveruby.net>
* file.c (rb_file_chown): should accept nil. [ruby-dev:27171]
+ (backport from trunk, rev 1.208)
-Mon Sep 19 18:29:54 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+Mon Sep 19 18:35:13 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * file.c (file_expand_path): allow pathnames to expand.
- [ruby-dev:27152]
+ * ext/dl/dl.c (rb_io_to_ptr): fix DragonFlyBSD support.
+ [ruby-dev:27151]
-Mon Sep 19 15:12:15 2005 Minero Aoki <aamine@loveruby.net>
+Mon Sep 19 14:17:04 2005 Minero Aoki <aamine@loveruby.net>
- * ext/ripper/depend: do not make ripper/core.rb. [ruby-dev:26462]
+ * ext/syck/emitter.c (syck_emit): passing an int* value to the
+ long* parameter causes unaligned access on LP64 systems.
+ [ruby-dev:27161]
-Mon Sep 19 14:49:19 2005 Minero Aoki <aamine@loveruby.net>
+Mon Sep 19 13:44:03 2005 Masaki Suketa <masaki.suketa@nifty.ne.jp>
- * ext/ripper/eventids2.c: add prefix `t' to tLAMBDA-related lexer
- events.
+ * ext/win32ole/win32ole.c: avoid core dump with WIN32OLE_EVENT.
+ [ruby-dev:27133]
- * ext/ripper/lib/ripper/core.rb: updated.
+Mon Sep 19 10:36:06 2005 Minero Aoki <aamine@loveruby.net>
-Mon Sep 19 14:39:46 2005 Minero Aoki <aamine@loveruby.net>
+ * lib/fileutils.rb (cp_r): default is :dereference_root=>true for
+ backward compatibility. [ruby-dev:27145]
- * parse.y (do_block): do_block event dispatches 2 args.
- [ruby-dev:26964]
+ * test/fileutils/test_fileutils.rb (test_cp_r): test it.
- * ext/ripper/lib/ripper/core.rb: updated.
+Mon Sep 19 09:57:39 2005 Minero Aoki <aamine@loveruby.net>
- * ext/ripper/tools/list-parser-event-ids.rb: check arity mismatch.
+ * test/fileutils/test_fileutils.rb: backported from trunk (1.36).
+ (again) [ruby-dev:27145]
Mon Sep 19 07:45:37 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
@@ -51061,23 +9056,43 @@ Mon Sep 19 07:45:37 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
* ext/openssl/ossl_engine.c: (ossl_engine_load_privkey): set private
key flag.
- * test/openssl/test_pkey_rsa.rb: add test about private detection.
+Mon Sep 19 06:41:32 2005 Minero Aoki <aamine@loveruby.net>
-Mon Sep 19 06:38:03 2005 Minero Aoki <aamine@loveruby.net>
+ * lib/fileutils.rb: backported from trunk (rev 1.65):
- * lib/fileutils.rb: method renaming: collect_methods ->
- collect_method.
+ * lib/fileutils.rb (rm_r): new option :secure.
-Mon Sep 19 05:58:59 2005 Minero Aoki <aamine@loveruby.net>
+ * lib/fileutils.rb (rm_rf): new option :secure.
- * lib/fileutils.rb: use module_function instead of single extend.
+ * lib/fileutils.rb: new method #remove_entry_secure.
+
+ * lib/fileutils.rb (cd): remove option :noop.
+
+ * lib/fileutils.rb (cp_r): new option :dereference_root.
+
+ * lib/fileutils.rb (cp_r): new option :dereference_root.
+
+ * lib/fileutils.rb: new method #remove_entry.
+
+ * lib/fileutils.rb: new method #chmod_R.
- * test/fileutils/test_fileutils.rb: test existence of singleton
- methods.
+ * lib/fileutils.rb: new method #chown.
-Mon Sep 19 05:32:41 2005 Minero Aoki <aamine@loveruby.net>
+ * lib/fileutils.rb: new method #chown_R.
- * lib/fileutils.rb (remove_entry_secure): does not use chdir(2).
+ * lib/fileutils.rb: new method .commands.
+
+ * lib/fileutils.rb: new method .options.
+
+ * lib/fileutils.rb: new method .have_option?.
+
+ * lib/fileutils.rb: new method .options_of.
+
+ * lib/fileutils.rb: new method .collect_method.
+
+ * lib/fileutils.rb: use module_function instead of single extend.
+
+ * test/fileutils/test_fileutils.rb: backported from trunk (1.36).
Mon Sep 19 03:17:48 2005 Tanaka Akira <akr@m17n.org>
@@ -51089,24 +9104,13 @@ Mon Sep 19 03:17:48 2005 Tanaka Akira <akr@m17n.org>
which is full. [ruby-dev:27132]
* io.c (rb_io_syswrite): wrap the write system call by
- TRAP_BEG/TRAP_END to run signal handler in syswrite method.
- [ruby-dev:27134]
-
-Mon Sep 19 01:07:38 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * numeric.c (Init_Numeric): should define Fixnum#div.
- [ruby-dev:27129]
-
- * file.c (rb_thread_flock): wrap flock(2) by TRAP_BEG and
- TRAP_END. [ruby-dev:27122]
+ TRAP_BEG/TRAP_END to enable signals when writing to a pipe which is
+ full. [ruby-dev:27134]
- * file.c (rb_file_join): call FilePathValue() to all Pathnames to
- join. [ruby-dev:27127]
+Mon Sep 19 03:02:08 2005 Tanaka Akira <akr@m17n.org>
- * file.c (rb_get_path): call StringValueCStr() to ensure no nul
- bytes in path strings.
-
- * gc.c (garbage_collect): need value for return. [ruby-dev:27127]
+ * io.c (io_fwrite): wrap the write system call by TRAP_BEG/TRAP_END to
+ enable signals when writing to a pipe which is full.
Sun Sep 18 02:10:47 2005 why the lucky stiff <why@ruby-lang.org>
@@ -51124,10 +9128,6 @@ Sun Sep 18 02:10:47 2005 why the lucky stiff <why@ruby-lang.org>
* test/yaml/test_yaml.rb: remove outdated tests.
-Sun Sep 18 01:10:37 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * gc.c (garbage_collect): return false if no GC run.
-
Sat Sep 17 23:25:04 2005 sheepman <sheepman@sheepman.sakura.ne.jp>
* lib/mathn.rb (Rational::inspect): should preserve original
@@ -51138,79 +9138,6 @@ Sat Sep 17 23:20:27 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/cgi.rb (CGI::Cookie): should handle multiple values for a
cookie name. [ruby-talk:156140]
- * test/socket/test_tcp.rb (TestTCPSocket::test_recvfrom): typo
- fixed. [ruby-dev:27123]
-
-Sat Sep 17 20:58:56 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * win32/win32.c (rb_w32_select): fixed deadlock bug.
- because select(2) modifies its fd_set arguments, it must be
- restored sometimes.
-
- * win32/win32.c (rb_w32_select): performance improvement when
- 'always readable/writable handles' and sockets are passed.
- sockets should be polled every time.
-
- require "net/http"
-
- Thread.new {
- loop do
- STDOUT.write(".") # busy on console (this is worst case though)
- end
- }
-
- # socket operation took long time. (sometimes timed out)
- Net::HTTP.start("www.ruby-lang.org") do |http|
- http.get("/cgi-bin/cvsweb.cgi/ruby/array.c?rev=1.179")
- end
-
-Sat Sep 17 14:54:40 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * test/ruby/test_readpartial.rb (test_open_pipe, test_with_stdio):
- these tests are working now, so turned on. (windows)
-
-Sat Sep 17 14:18:15 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * win32/win32.c (rb_w32_select): I hope performance problem was
- solved.
-
-Sat Sep 17 13:45:22 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * win32/win32.c (rb_w32_select): console support is back.
- but still has performance problem because I loosely took 1 second
- for wait time. I'll fix it later. (The reason I drastically changed
- the code is that I wanted to implement the fileset management as
- single function, and I was worried that if pipe or console
- was always available, socket may not be processed any time)
-
-Sat Sep 17 11:24:16 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * win32/win32.c (rb_w32_select): select for socket didn't work.
- this caused deadlock in drb test. this happened because GetFileType
- for socket handle returns FILE_TYPE_PIPE. Of course, it's not a
- pipe. So socket handle didn't reach winsock's select function.
-
- * win32/win32.c (rb_w32_select): read for pipe was still blocked
- even if writer handle was closed.
-
- r,w = IO.pipe
-
- Thread.new {
- sleep 3; puts "------- 1"
- w.puts("foo")
- sleep 3; puts "------- 2"
- w.puts("boo")
- sleep 3; puts "------- 3"
- w.close
- }
-
- until r.eof? # should break by w.close but didn't.
- puts r.gets
- end
-
- * win32/win32.c (rb_w32_select): temporary reverted console support
- but it'll be back soon.
-
Sat Sep 17 10:42:13 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/multi-tk.rb: MultiTkIp#eval_string and bg_eval_string
@@ -51234,14 +9161,14 @@ Sat Sep 17 08:35:39 2005 Kouhei Sutou <kou@cozmixng.org>
* test/rss/test_maker_1.0.rb (RSS::TestMaker10#test_items): ditto.
-Sat Sep 17 08:02:53 2005 Shugo Maeda <shugo@ruby-lang.org>
+Fri Sep 16 23:09:20 2005 Masaki Suketa <masaki.suketa@nifty.ne.jp>
- * lib/net/imap.rb: supported DIGEST-MD5. Thanks, Mathieu Arnold.
+ * ext/win32ole/win32ole.c (ole_search_event_at): bug fix
+ in ext/win32ole/sample/ienavi.rb.
- * lib/net/imap.rb: use fcall instead of send. Thanks, Satoru
- Takabayashi.
+ * ext/win32ole/win32ole/tests/testOLEEVENT.rb: ditto.
-Fri Sep 16 22:45:49 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Sep 16 22:41:18 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* file.c (rb_file_s_extname): empty string for path name ending with a
period. fixed: [ruby-core:05651]
@@ -51249,19 +9176,6 @@ Fri Sep 16 22:45:49 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* file.c (rb_file_join): smarter behavior at edge cases.
fixed: [ruby-core:05706]
- * gc.c (rb_memerror, ruby_xmalloc, ruby_xrealloc, rb_newobj): just
- abandon if no memory available, when interpreter is not running.
- [ruby-dev:27104]
-
- * gc.c (garbage_collect): return whether GC could run.
-
- * dir.c (rb_push_glob): fix delimiter bug. fixed: [ruby-dev:27105]
-
- * dir.c (dir_s_aref, dir_s_glob): allow multiple patterns.
- [ruby-dev:27110]
-
- * win32/win32.c (cmdglob): enable brace expansion.
-
Fri Sep 16 18:34:01 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* ext/syck/node.c (syck_replace_str): was using return from the
@@ -51277,12 +9191,12 @@ Fri Sep 16 12:02:12 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* ext/syck/rubyext.c (syck_resolver_transfer): remove C++ style
comment (//). [ruby-core:05793]
-Fri Sep 16 00:17:03 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+Fri Sep 16 00:14:14 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
* test/logger/test_logger.rb: unintentionally overwritten changes by
Usa. reverted.
-Fri Sep 16 00:03:11 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Fri Sep 16 00:06:18 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
* lib/webrick/cgi.rb (WEBrick::CGI::Socket#initialize): should set
$stdout.binmode.
@@ -51296,17 +9210,17 @@ Thu Sep 15 23:25:21 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
* SOAP
* allow to configure an envelope namespace of SOAP request. (#124)
- TemporaryNamespace = 'http://www.w3.org/2003/05/soap-envelope'
- @client.options["soap.envelope.requestnamespace"] =
+ TemporaryNamespace = 'http://www.w3.org/2003/05/soap-envelope'
+ @client.options["soap.envelope.requestnamespace"] =
TemporaryNamespace
- @client.options["soap.envelope.responsenamespace"] =
+ @client.options["soap.envelope.responsenamespace"] =
TemporaryNamespace
@client.do_proc(...)
- * let SOAP request XML indent space configurable. see
+ * let SOAP request XML indent space configuable. see
"soap.envelope.no_indent" option. (#130)
- * let external CES configurable.
+ * let external CES configuable.
ex. client["soap.mapping.external_ces"] = 'SJIS'. $KCODE is used
by default. (#133)
external CES ::= CES used in Ruby object of client and server
@@ -51315,7 +9229,7 @@ Thu Sep 15 23:25:21 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
* add iso-8859-1 external CES support. (#106)
* fixed illegal 'qualified' handling of elements. it caused
- ASP.NET interoperability problem. (#144)
+ ASP.NET inteoperability problem. (#144)
* added 'soap.envelope.use_numeric_character_reference' (boolean)
option to let query XML use numeric character reference in XML,
@@ -51347,7 +9261,7 @@ Thu Sep 15 23:25:21 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
* Array of an element which has simpleType causes a crash. (#128)
- * parameterOrder may not contain return part so it can be shorter
+ * prarmeterOrder may not contain return part so it can be shorter
than parts size. Thanks to Hugh. (#139)
* Samples
@@ -51371,62 +9285,45 @@ Thu Sep 15 23:25:21 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
* updated deprecated method usage. (#138)
-Thu Sep 15 22:40:27 2005 NAKAMURA Usaku <usa@ruby-lang.org>
+Thu Sep 15 23:02:57 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * test/ruby/test_signal.rb (test_exit_action): skip the test using
- fork on fork-less platforms.
+ * win32/win32.h (rb_w32_stat): added prototype.
-Thu Sep 15 13:54:33 2005 Tanaka Akira <akr@m17n.org>
+Thu Sep 15 22:35:55 2005 NAKAMURA Usaku <usa@ruby-lang.org>
- * lib/open-uri.rb: add :read_timeout option.
- [ruby-core:4848]
+ * test/ruby/test_signal.rb (test_exit_action): skip the test using
+ fork on fork-less platforms.
Thu Sep 15 11:39:18 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tk/dialog.rb: If a dialog does not show up yet,
TkDialogObj#name raises an exception. [ruby-talk:156109]
-Thu Sep 15 11:01:58 2005 NAKAMURA Usaku <usa@ruby-lang.org>
+Thu Sep 15 01:39:19 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
- * win32/win32.c (rb_w32_pipe_exec): remove unnecessary CloseHandle().
-
- * win32/win32.c (extract_console_fd, peek_console): new functions.
-
- * win32/win32.c (rb_w32_select): check consoles by polling them.
+ * lib/rinda/tuplespace.rb (Rinda::TemplateEntry::initialize): pull
+ up method. Tabs converted to spaces.
Thu Sep 15 00:18:24 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/net/telnet.rb (Net::Telnet::waitfor): replace sysread with
readpartial. [ruby-talk:127641]
-Wed Sep 14 23:28:28 2005 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (collect_file_fd): rename from extract_file_fd.
-
- * win32/win32.c (extract_pipe_fd, peek_pipe): new functions.
-
- * win32/win32.c (rb_w32_select): check pipes by polling them.
-
Wed Sep 14 22:40:26 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* dir.c (ruby_glob): glob function not using ruby exception system.
-Wed Sep 14 17:24:22 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Wed Sep 14 01:26:03 2005 Minero Aoki <aamine@loveruby.net>
- * dir.c: changed `foo (*bar)_((boo))' to `foo (*bar)(boo)`.
+ * lib/net/https.rb: backported from trunk, rev 1.3.
+ [ruby-dev:25673] (again), [ruby-dev:26617] (again),
+ [ruby-dev:27062]
- * enumerator.c, eval.c, gc.c, intern.h, io.c, process.c, ruby.c,
- ruby.h, signal.c: ditto.
+ * ext/openssl/lib/net/https.rb: removed.
-Wed Sep 14 15:06:22 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+ * ext/openssl/lib/net/protocols.rb: removed.
- * bignum.c: changed `foo _((boo))' to `foo(boo)`. [ruby-dev:27056]
-
- * defines.h, dir.c, dln.h, enumerator.c, env.h, error.c, eval.c, file.c,
- gc.c, hash.c, inits.c, intern.h, io.c, lex.c, marshal.c, missing.h,
- node.h, numeric.c, pack.c, process.c, re.h, ruby.c, ruby.h, rubyio.h,
- rubysig.h, signal.c, sprintf.c, st.h, string.c, struct.c, time.c,
- util.c, util.h, variable.c: ditto.
+ * lib/net/http.rb: #use_ssl?, #use_ssl are moved from net/https.
Tue Sep 13 22:09:40 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
@@ -51447,20 +9344,19 @@ Tue Sep 13 21:47:17 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (BEGIN_CALLARGS): pop halfly pushed status.
fixed: [ruby-dev:26881]
-Tue Sep 13 20:24:37 2005 Tanaka Akira <akr@m17n.org>
+Tue Sep 13 16:26:45 2005 Minero Aoki <aamine@loveruby.net>
- * ruby.h (PRINTF_ARGS): new macro for printf style argument checking.
+ * lib/net/http.rb: backported from trunk, rev 1.128.
+ [ruby-dev:25673] [ruby-dev:26617]
-Tue Sep 13 15:41:29 2005 Minero Aoki <aamine@loveruby.net>
+ * lib/net/protocol.rb: backported from trunk, rev 1.78.
- * lib/net/http.rb: wrote documentation of HTTPRequest/HTTPResponse
- classes.
+ * lib/net/protocol.rb: new method #old_open to support net/smtp
+ and net/pop.
-Tue Sep 13 14:27:47 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+ * lib/net/smtp.rb: use #old_open.
- * string.c, missing.h: failed to build on powerpc-apple-darwin7.9.0
- because of crypt argument's constness mismatch. (I hope this works)
- (http://mput.dip.jp/autobuild/ruby-trunk/log/20050913T110001.gz)
+ * lib/net/pop.rb: ditto.
Tue Sep 13 12:33:05 2005 why the lucky stiff <why@ruby-lang.org>
@@ -51476,12 +9372,12 @@ Tue Sep 13 12:33:05 2005 why the lucky stiff <why@ruby-lang.org>
continue support of Object#to_yaml_type.
* ext/syck/rubyext.c: new emitter code. yaml_new and yaml_initialize
- get called, should they be present. consolidated all the diaspora of internal node types into the family below YAML::Syck::Node -- Map,
+ get called, should they be present. consolidated all the diaspora of internal
+ node types into the family below YAML::Syck::Node -- Map,
Seq, Scalar -- all of whom are SyckNode structs pointing to
- Ruby data. moved Object#yaml_new into the node_import and made it
- the default behavior. the target_class is always called with
- yaml_new, prepended a parameter, which is the klass. loaded nodes
- through GenericResolver show their style.
+ Ruby data. moved Object#yaml_new into the node_import and made it the
+ default behavior. the target_class is always called wih yaml_new, prepended
+ a parameter, which is the klass. loaded nodes through GenericResolver show their style.
new Resolver#tagurize converts type ids to taguris.
* ext/syck/implicit.re: were 'y' and 'n' seriously omitted??
@@ -51500,112 +9396,36 @@ Tue Sep 13 12:33:05 2005 why the lucky stiff <why@ruby-lang.org>
* ext/syck/syck.h: reflect block_styles and new node functions.
-Tue Sep 13 08:09:18 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/ostruct.rb (new_ostruct_member): Object#send no longer call
- private methods. [ruby-dev:27044]
-
- * test/rss/test_dublincore.rb, test/rss/test_trackback.rb,
- test/ruby/test_eval.rb, test/socket/test_socket.rb: ditto.
-
- * test/ruby/test_lambda (test_call_with_block): lambda makes new scope
- for formal block parameter.
-
-Tue Sep 13 01:17:45 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (proc_save_safe_level): no need to restrict safe level
- memoize in $SAFE>=3. [ruby-dev:27050]
-
-Tue Sep 13 00:02:33 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (apply2files): stricter callback definition.
-
- * file.c (rb_path_check): constified.
-
Mon Sep 12 20:53:06 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
* test/openssl/test_pkcs7.rb (test_enveloped): skip this test
- to avoid a bug of PKCS7_encrypt() (only if ext/openssl is
+ to avoid a bug of PKCS7_enctypt() (only if ext/openssl is
compiled with OpenSSL-0.9.7d or earlier versions).
http://www.mail-archive.com/openssl-dev@openssl.org/msg17376.html
-Mon Sep 12 20:32:00 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * win32/win32.[hc] (rb_w32_argv_size, ...): reverted my latest change
- to avoid incompatible pointer warning. (mingw32)
-
-Mon Sep 12 19:58:53 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * dln.c: avoid warning of const to non-const convertion.
- [ruby-dev:27041]
-
- * eval.c, io.c, ruby.c: ditto.
-
-Mon Sep 12 19:26:29 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * array.c: moved to ANSI function style from K&R function style.
- (used protoize on windows, so still K&R remains on #ifdef part of
- other platforms. And `foo _((boo))' stuff is still there)
- [ruby-dev:26975]
-
- * bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
- enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
- io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
- prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
- regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
- sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
- version.c: ditto.
-
Mon Sep 12 14:03:33 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* test/dbm/test_dbm.rb: remove locking test, which may not be
supported on some platforms. [ruby-dev:27030]
-Sun Sep 11 23:23:02 2005 Shugo Maeda <shugo@ruby-lang.org>
+Mon Sep 12 10:45:58 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/net/imap.rb (starttls): supported the STARTTLS command.
+ * ext/dl/dl.c (rb_io_to_ptr): merged a patch for DragonFly BSD
+ from Takahiro Kambe <taca at back-street.net>. [ruby-dev:27023]
-Sun Sep 11 22:18:07 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+Sun Sep 11 22:05:51 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
* bin/erb (ERB::Main#run): set ERB#filename so that it is used
when reporting syntax/runtime errors. Tabs converted to spaces.
-Sat Sep 10 22:34:19 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c, bignum.c: protoize.
-
-Sat Sep 10 00:23:01 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (splat_value): simpler and consistent array conversion
- for argument splat. [yarv-dev:599]
-
-Fri Sep 9 16:45:25 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_str_times): make empty strings to keep taintness,
- and a little improvement. [ruby-dev:26900]
-
- * ext/iconv/iconv.c (iconv_try), ext/iconv/extconf.rb: get rid of meta
- characters in command line option. fixed: [ruby-talk:155369]
-
- * ext/iconv/iconv.c: protoized.
-
-Thu Sep 8 14:58:11 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * merged a patch from Takahiro Kambe <taca at back-street.net> to
- support DragonFly BSD. [ruby-dev:26984]
-
-Thu Sep 8 13:14:57 2005 Tadashi Saito <shiba@mail2.accsnet.ne.jp>
-
- * missing/strchr.c (strrchr): fixed a bug in detecting NUL in a
- string. [ruby-dev:26985]
-
-Wed Sep 7 17:29:27 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Sat Sep 10 10:17:03 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
* ext/openssl/ossl_engine.c (ossl_engine_s_by_id):
OpenSSL::Engine.by_id calls given block before calling
ENGINE_init (block parameter is the return value of this method
itself). this functionality is useful to load dynamic shared
- engines.
+ engines. the following code is a sample of loading a key using
+ OpenSC PKCS #11 module.
require "openssl"
pkcs11 = OpenSSL::Engine.by_id("dynamic"){|e|
@@ -51620,9 +9440,9 @@ Wed Sep 7 17:29:27 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
OpenSSL::Engine#ctrl_cmd. it wraps ENGINE_ctrl_cmd_string.
* ext/openssl/ossl_engine.c (ossl_engine_get_cmds): new method
- OpenSSL::Engine#cmds. it returns engine command definitions.
+ OpenSSL::Engine#cmds. it returms engine command definitions.
-Wed Sep 7 15:48:37 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Sat Sep 10 10:09:47 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
* ext/openssl/ossl_asn1.c (asn1str_to_str): new function.
@@ -51635,6 +9455,64 @@ Wed Sep 7 15:48:37 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
* test/openssl/test_pkcs7.rb: new file.
+Sat Sep 10 10:05:51 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * ext/openssl/ossl_ns_spki.c (ossl_spki_initialize): assume that
+ the argument is a DER string if Base64 decoding failed.
+
+ * ext/openssl/ossl_ns_pki.c (ossl_spki_to_der): new method.
+
+ * test/openssl/test_ns_spki.rb: add new file.
+
+Sat Sep 10 09:56:24 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * ext/openssl/lib/digest.rb: added SHA224, SHA256, SHA384 and SHA512.
+ these features are enabled if this library is compiled with
+ OpenSSL 0.9.8 or later.
+
+ * test/openssl/test_digest.rb: add test for new digests.
+
+Sat Sep 10 09:51:30 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * ext/openssl/ossl.c (ossl_raise): should use ERR_peek_last_error
+ to get last error on the current thread. And should report
+ errors on the stack while OpenSSL.debug is true.
+
+ * ext/openssl/ossl.c (ossl_get_errors): new method for debugging
+ this library.
+
+ * ext/openssl/ossl_ssl.c (ossl_sslctx_set_ciphers): fix error message.
+
+ * ext/openssl/ossl_x509req.c (ossl_x509req_set_attributes): get rid
+ of unused variable.
+
+ * ext/openssl/ossl_x509store.c (ossl_x509store_initialize): should
+ set @time to avoid warning.
+
+ * ext/openssl/ossl_x509store.c (ossl_x509store_set_default_paths,
+ X509_STORE_add_cert, X509_STORE_add_crl): should raise error if
+ wrapped functions failed.
+
+ * test/openssl/test_x509store.rb: add test for errors.
+
+Fri Sep 9 22:13:19 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c (rb_call0): prohibit calling tainted method (>2) when
+ $SAFE == 0.
+
+Fri Sep 9 16:45:25 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * string.c (rb_str_times): make empty strings to keep taintness,
+ and a little improvement. [ruby-dev:26900]
+
+ * ext/iconv/iconv.c (iconv_try), ext/iconv/extconf.rb: get rid of meta
+ characters in command line option. fixed: [ruby-talk:155369]
+
+Thu Sep 8 14:58:11 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * merged a patch from Takahiro Kambe <taca at back-street.net> to
+ support DragonFly BSD. [ruby-dev:26984]
+
Wed Sep 7 12:55:08 2005 Tanaka Akira <akr@m17n.org>
* lib/open-uri.rb: abolish mod === tempfile to avoid a problem
@@ -51648,15 +9526,6 @@ Wed Sep 7 10:45:15 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (rb_thread_terminated): show backtrace before propagate
exceptions to main thread.
-Wed Sep 7 09:21:41 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * win32/win32.[hc] (rb_w32_utime): constified.
-
- * win32/win32.h (rb_w32_stat): added prototype.
-
- * win32/win32.[hc] (rb_w32_argv_size,rb_w32_join_argv,rb_w32_aspawn):
- changed `char *const *' to `const char *const *'. (constify string)
-
Wed Sep 7 08:35:04 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* Makefile.in, configure.in (MINIOBJS): miniruby on HP-UX can not load
@@ -51675,62 +9544,37 @@ Wed Sep 7 08:35:04 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/etc/etc.c (setup_passwd), ext/etc/extconf.rb: pw_age might be
char*. fixed: [ruby-core:05470]
-Wed Sep 7 08:32:07 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_times): should taint empty strings as well.
-
- * object.c (Init_Object): make class_variable_{get,set} public.
- [ruby-dev:26965]
+Wed Sep 7 08:32:47 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-Mon Sep 5 22:28:46 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * object.c (rb_mod_cvar_get, rb_mod_cvar_set): document fix from
+ sheepman <sheepman@sheepman.sakura.ne.jp>; a bug in visibility
+ description. [ruby-dev:26965]
- * parse.y (stmt, mlhs_node, lhs, arg, method_call): aref_args might be
- nothing. fixed: [ruby-dev:26952]
-
- * ext/ripper/eventids2.c: added new tokens. fixed: [ruby-dev:26952]
+ * sprintf.c (rb_f_sprintf): warn "too many argument" on verbose
+ mode (-v/-w); backported from 1.9. [ruby-dev:26963]
Mon Sep 5 17:03:07 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/find.rb: should raise ENOENT if root entry does not exist.
- [ruby-list:41054]
-
* lib/ostruct.rb: a patch from Florian Gross <florgro at gmail.com>
merged to allow recursive inspect (and to_s) for OpenStruct.
[ruby-core:05532]
-Mon Sep 5 08:20:19 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/observer.rb: a patch from nornagon <nornagon at gmail.com>
- merged to allow arbitrary names for update methods.
- [ruby-core:05416]
-
Mon Sep 5 07:01:12 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
* ext/openssl/openssl/lib/openssl/buffering.rb (Buffering#do_write):
should clear data from the buffer which already been output.
-Sun Sep 4 15:01:35 2005 Minero Aoki <aamine@loveruby.net>
-
- * parse.y (f_arg): Ripper should not do semantic check.
- [ruby-dev:26948]
-
-Sat Sep 3 23:52:35 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_f_fcall): new method to avoid inefficiency of
- obj.instance_eval{send(...)} tricks.
-
-Sat Sep 3 13:59:31 2005 Tanaka Akira <akr@m17n.org>
+Fri Sep 2 23:51:54 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/pathname.rb (Pathname#descend): Pathname.new("./a/b/c").descend
- didn't yield "."
- (Pathname#ascend): ditto.
+ * lib: do not use __send__ to access private methods. [ruby-dev:26935]
-Fri Sep 2 23:51:54 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Sep 2 03:29:00 2005 Keiju Ishitsuka <keiju@ruby-lang.org>
- * parse.y (f_arg): f_norm_arg is a VALUE in ripper, not an ID.
- fixed: [ruby-dev:26942]
+ * lib/irb/init.rb: make IRB -I option that is same befavior for ruby.
+ [ruby-dev:26872], [ruby-dev: 26920]
- * lib: do not use __send__ to access private methods. [ruby-dev:26935]
+ * lib/irb/locale.rb: support to print help message when OS locale is
+ ja_JP.utf-8. [ruby-dev:26872]
Thu Sep 1 17:11:25 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
@@ -51745,31 +9589,20 @@ Thu Sep 1 14:12:45 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
to support '-namespace' option of 'interp invokehidden' command
on Tcl8.5.
-Wed Aug 31 14:41:30 2005 NAKAMURA Usaku <usa@ruby-lang.org>
+Wed Aug 31 14:43:15 2005 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/Makefile.sub (OPTFLAGS): default global optimization to
disabled for all VC++ versions. fixed: [ruby-dev:26897]
-Wed Aug 31 10:36:09 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Wed Aug 31 11:35:43 2005 NAKAMURA Usaku <usa@ruby-lang.org>
- * process.c (proc_detach, proc_setmaxgroups): missing argument type
- declaration. (I recommend ANSI-style function)
-
-Wed Aug 31 06:59:01 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_str_scan): already String#scan behaves differently
- regarding if block is given.
-
-Tue Aug 30 23:49:34 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * array.c, dir.c, enum.c, hash.c, io.c, range.c, string.c, struct.c:
- let enumerable methods return Enumerator. [ruby-dev:26924]
-
- * intern.h (RETURN_ENUMERATOR): utility macro for enumerable methods.
+ * test/gdbm/test_gdbm.rb (teardown): should remove GDBM temporary
+ file.
-Tue Aug 30 23:25:45 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+Wed Aug 31 10:30:56 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * lib/debug.rb: no need to restart at exit.
+ * process.c (proc_detach, proc_setmaxgroups): missing argument type
+ declaration. (I recommend ANSI-style function)
Tue Aug 30 23:20:19 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
@@ -51788,127 +9621,45 @@ Tue Aug 30 19:34:27 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
ext/digest/sha1/sha1ossl.h: include <stddef.h> to avoid
error in compilation with OpenSSL-0.9.8. [ruby-list:41068]
-Tue Aug 30 16:19:40 2005 Keiju Ishitsuka <keiju@ruby-lang.org>
-
- * lib/irb/init.rb: bug fix. [ruby-dev: 26920]
-
-Tue Aug 30 16:13:00 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enum.c (enum_count): new method. [ruby-dev:26895]
-
-Tue Aug 30 12:45:15 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_f_send): do not call private methods if the receiver
- is specified. [ruby-talk:153672]
-
-Mon Aug 29 19:47:18 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Mon Aug 29 19:54:21 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* lib/rdoc/usage.rb: improper exceptions. [ruby-dev:26870]
* lib/rdoc/usage.rb: support the case when non-ruby code exists before
shebang. (this is needed when ri.bat is executed on windows)
-Mon Aug 29 18:58:05 2005 Keiju Ishitsuka <keiju@ruby-lang.org>
-
- * lib/irb/init.rb: make IRB -I option that is same behavior for ruby.
- [ruby-dev:26872]
-
- * lib/irb/locale.rb: support to print help message when OS locale is
- ja_JP.utf-8. [ruby-dev:26872]
-
-Mon Aug 29 01:43:05 2005 Tanaka Akira <akr@m17n.org>
+Mon Aug 29 17:48:17 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/pathname.rb (Pathname#descend): new method.
- (Pathname#ascend): ditto.
+ * eval.c (method_arity): should return proper arity value.
+ [ruby-dev:26390]
-Mon Aug 29 00:35:09 2005 Tanaka Akira <akr@m17n.org>
+Mon Aug 29 01:19:57 2005 Tanaka Akira <akr@m17n.org>
- * lib/time.rb: require 'date/format' instead of 'parsedate'.
- (Time.parse): extract fractional seconds using Date._parse.
- (Time.strptime): extract fractional seconds using Date._strptime.
- [ruby-talk:153859]
+ * lib/time.rb (Time.parse): extract fractional seconds using
+ Date._parse. [ruby-talk:153859]
-Sat Aug 27 20:13:31 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Sat Aug 27 20:20:01 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* ext/curses/curses.c ({curses,window}_clrtoeol): added. suggested
by Reyn Vlietstra.
- * ext/curses/curses.c: chtype in curses is not `char', rather `long'.
+ * ext/curses/curses.c: chtype in curses is not `char', rahter `long'.
[ruby-Bugs:2298]
* ext/curses/view.rb: String =~ String is deprecated.
-Thu Aug 25 15:48:58 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * ext/win32ole/win32ole.c: suppress warnings. (win32)
-
-Wed Aug 24 11:01:26 2005 NAKAMURA Usaku <usa@ruby-lang.org>
+Wed Aug 24 10:53:28 2005 NAKAMURA Usaku <usa@ruby-lang.org>
* test/logger/test_logger.rb (test_shifting_size): should close log
device before unlink, since some platform cannot unlink opened
file.
-Tue Aug 23 06:07:02 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/lib/digest.rb: added SHA224, SHA256, SHA384 and SHA512.
- these features are enabled if this library is compiled with
- OpenSSL 0.9.8 or later.
-
- * test/openssl/test_digest.rb: add test for new digests.
-
-Tue Aug 23 05:47:04 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/ossl_ns_spki.c (ossl_spki_initialize): try to decode
- the argument as a string.
-
- * ext/openssl/ossl_ns_pki.c (ossl_spki_to_der): new method.
-
- * ext/openssl/ossl_x509store.c (ossl_x509store_initialize): should
- set @time to avoid warning.
-
- * ext/openssl/ossl_x509store.c (ossl_x509store_set_default_paths,
- X509_STORE_add_cert, X509_STORE_add_crl): should raise error if
- wrapped functions fails.
-
- * ext/openssl/ossl_ssl.c (ossl_sslctx_set_ciphers): fix error message.
-
- * ext/openssl/ossl_x509req.c (ossl_x509req_set_attributes): get rid
- of unused variable.
-
- * test/openssl/test_ns_spki.rb: add new file.
-
- * test/openssl/test_x509store.rb: add test for error.
-
-Tue Aug 23 01:11:40 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * sprintf.c (ruby__sfvwrite): should move `buf' to the end of
- `result'. [ruby-dev:26859]
-
-Mon Aug 22 23:51:19 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y: ONIG_OPTION_CAPTURE_GROUP conflicts with
- RE_OPTION_ONCE. [ruby-dev:26852]
-
-Mon Aug 22 20:11:35 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * missing/vsnprintf.c (BSD__sprint): needs to call vwrite function
- pointer. fixed: [ruby-dev:26854]
-
-Sat Aug 20 23:55:25 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (parser_yylex): update paren_nest for brackets [].
-
-Sun Aug 21 00:10:23 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+Sun Aug 21 00:13:27 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
* lib/wsdl/xmlSchema/importer.rb (WSDL::XMLSchema::Importer#fetch): add
a workaround for importing an WSDL whose path begins with drive
letter. [ruby-dev:26242]
-Sat Aug 20 22:05:25 2005 K.Kosako <sndgk393 AT ybb.ne.jp>
-
- * regexec.c (code_is_in_cclass_node): check code size.
- [ruby-dev:26840]
-
Sat Aug 20 22:37:13 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
* lib/logger.rb (write, shift_log?, shift_log): file shifting race
@@ -51921,25 +9672,23 @@ Fri Aug 19 18:13:39 2005 Tanaka Akira <akr@m17n.org>
* lib/time.rb (Time.apply_offset): fix a problem with last day of
month. reported by Lucas Nussbaum. [ruby-talk:152866]
-Thu Aug 18 11:05:36 2005 NAKAMURA Usaku <usa@ruby-lang.org>
+Thu Aug 18 12:46:28 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+
+ * bcc32/Makefile.sub (COMMON_HEADERS): reverted 1.42.2.24.
+ I misunderstood, bccwin32 on ruby_1_8 uses winsock2 originally.
+ [ruby-dev:26806]
- * win32/win32.c (socketpair_internal): need to call open_ifs_socket()
- to create sockets instead of winsock's socket().
- fixed: [yarv-dev:581]
+ * win32/win32.h: include winsock2.h instead of winsock.h. (bcc32)
Wed Aug 17 23:58:05 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * object.c (rb_to_integer): argument constified.
+
* eval.c (terminate_process): take String message.
* eval.c (rb_thread_switch): propagate the exception caused thread
termination directly. fixed: [ruby-core:05552]
-Wed Aug 17 21:20:05 2005 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/nkf/lib/kconv.rb: ensure that symbol_to_option is private_class_method
- and all other methods are module_function
- fixed: [ruby-dev:26808]
-
Wed Aug 17 00:05:46 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (rb_add_method): preserve safe level in the environment
@@ -51948,19 +9697,6 @@ Wed Aug 17 00:05:46 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (rb_call0): restore preserved safe level in the method
execution.
- * parse.y (lambda): need separate block variable stack
- manipulation and lpar_beg maintenance. based on a patch found
- in [ruby-core:05551] from Mauricio Fernandez <mfp at acm.org>.
-
- * parse.y (parser_yylex): adjust lpar_beg after tLAMBEG and
- kDO_LAMBDA. [ruby-core:05551]
-
-Mon Aug 15 07:24:38 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * intern.h (rb_check_to_integer): add declaration.
-
- * object.c (rb_to_integer, rb_check_to_integer): argument constified.
-
Mon Aug 15 00:38:51 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (rb_rescue2): reduce PUSH_TAG() as well as NODE_RESCUE.
@@ -51968,27 +9704,6 @@ Mon Aug 15 00:38:51 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* range.c (range_check, range_init): reduce useless exceptions.
-Mon Aug 15 00:34:11 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (yycompile): remove unreachable code. [yarv-dev:570]
-
-Sat Aug 13 22:16:12 2005 Minero Aoki <aamine@loveruby.net>
-
- * lib/fileutils.rb (remove_entry_secure): forgot final chdir.
-
-Sat Aug 13 22:07:49 2005 Minero Aoki <aamine@loveruby.net>
-
- * lib/fileutils.rb (remove_entry_secure): uses chdir(2) and check
- if current directory is correct. [ruby-dev:26100] [ruby-dev:26226]
-
-Sat Aug 13 21:11:05 2005 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c: add WIN32OLE_VARIANT class.
-
- * ext/win32ole/tests/testall.rb: ditto.
-
- * ext/win32ole/tests/testOLEVARIANT.rb: ditto.
-
Sat Aug 13 18:51:26 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (rb_block_pass): distinguish current block from others.
@@ -51997,30 +9712,10 @@ Sat Aug 13 18:51:26 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/stringio/stringio.c (strio_set_string): disallow nil.
http://www.rubyist.net/~nobu/t/20050811.html#c05
-Sat Aug 13 08:01:59 2005 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/nkf/lib/kconv.rb: Kconv.kconv is now alias of Kconv.conv
- * ext/nkf/lib/kconv.rb: remove nkf dependent symbols from SYMBOL_TO_OPTION
-
-Fri Aug 12 17:06:53 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (f_larglist): allow optional arguments even when
- parentheses are omitted. based on Nobu's patch from
- http://www.rubyist.net/~nobu/t/20050805.html
-
- * parse.y (parser_yylex): update & maintain lpar_beg for detect
- lambda parameters.
-
Thu Aug 11 23:29:03 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/stringio/stringio.c: keep holding string after closed.
-Thu Aug 11 20:48:40 2005 Tadashi Saito <shiba@mail2.accsnet.ne.jp>
-
- * numeric.c (fix_equal, fix_cmp, fix_gt, fix_ge, fix_lt, fix_le):
- reduce coercing when a method knows about a operand type.
- [ruby-dev:26789]
-
Thu Aug 11 13:01:48 2005 Kouhei Sutou <kou@cozmixng.org>
* lib/rss: fixed sort bug. [ruby-list:41018]
@@ -52045,33 +9740,6 @@ Thu Aug 11 13:01:48 2005 Kouhei Sutou <kou@cozmixng.org>
(RSS::TestSetupMaker10::test_setup_maker_items_sort): added some
tests for RSS::Maker::ItemsBase#do_sort.
-Wed Aug 10 12:01:20 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/delegate.rb: simplifies Delegator classes; SimpleDelegator
- now uses method_missing for all methods.
-
-Wed Aug 10 10:38:50 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bignum.c (rb_big_mul0): multiply two numbers (x, y) without
- normalizing the result. x should be a big number.
- [ruby-dev:26778]
-
- * bignum.c (rb_big_pow): use rb_big_mul0() instead of
- rb_big_mul().
-
- * array.c (rb_ary_or, rb_ary_and, rb_ary_plus, rb_ary_diff):
- revert the change on 2005-08-03. Set operation on other item
- should have in separate methods.
-
- * parse.y (shadowing_lvar_gen): warn when arguments shadows
- external local variables.
-
- * parse.y (f_opt): optional arguments should not clobber external
- local variables.
-
- * parse.y (f_rest_arg): rest arguments should not clobber external
- local variables.
-
Wed Aug 10 10:29:40 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tk.rb: fix bug on handling __ruby2val_optkeys().
@@ -52083,19 +9751,9 @@ Wed Aug 10 10:29:40 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tkextlib/blt/component.rb: ditto.
-Tue Aug 9 21:53:17 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (formal_assign): let default values override
- arguments to zsuper. fixed: [ruby-dev:26743]
-
-Tue Aug 9 20:30:19 2005 Tadashi Saito <shiba@mail2.accsnet.ne.jp>
-
- * bignum.c (rb_big_coerce): allow bignum x bignum coercing.
- [ruby-dev:26778]
-
Tue Aug 9 15:12:04 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * ext/tk/tcltklib.c: remove dangerous 'rb_jump_tag's.
+ * ext/tcltklib/tcltklib.c: remove dangerous 'rb_jump_tag's.
* ext/tk/lib/tk.rb: add __val2ruby_optkeys and __ruby2val_optkeys to
help to convert option values between ruby and tcl.
@@ -52118,56 +9776,28 @@ Tue Aug 9 15:12:04 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tkextlib/*: support to treat tkvariable-type
configure options.
-Tue Aug 9 08:24:05 2005 Mauricio Fernandez <mfp@acm.org>
-
- * parse.y (f_block_arg), eval.c (rb_yield_0): deal with dynamic
- variable lambda arguments. [ruby-core:05540]
-
-Mon Aug 8 22:13:48 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (assign): deal with new block argument.
- fixed: [ruby-core:05536]
-
- * eval.c (rb_node_arity): follow change of NODE_ARGS.
- fixed: [ruby-dev:26761]
-
-Mon Aug 8 21:28:13 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Tue Aug 9 20:30:19 2005 Tadashi Saito <shiba@mail2.accsnet.ne.jp>
- * test/ruby/test_fnmatch.rb: separated from test_file.rb.
+ * bignum.c (rb_big_coerce): allow bignum x bignum coercing.
+ [ruby-dev:26778]
-Mon Aug 8 20:40:35 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+Mon Aug 8 20:43:02 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
* test/ruby/test_method.rb: added. [ruby-dev:26761]
-Mon Aug 8 01:26:37 2005 Mauricio Fernandez <mfp@acm.org>
+Sun Aug 7 23:50:14 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
- * parse.y (f_larglist): mistake in syntax rule. [ruby-core:05535]
+ * test/ruby/test_super.rb: added from HEAD. [ruby-dev:26743]
-Mon Aug 8 05:16:55 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Sun Aug 7 01:31:15 2005 Masaki Suketa <masaki.suketa@nifty.ne.jp>
- * ext/openssl/ossl.c (ossl_raise): should use ERR_peek_last_error
- to get last error on the current thread. And should report
- if errors are on the stack while OpenSSL.debug is true.
-
- * ext/openssl/ossl.c (ossl_get_errors): new method for debugging
- this library.
-
-Mon Aug 8 05:15:19 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/webrick/httpproxy.rb (HTTPProxyServer#initialize),
- lib/webrick/httpserver.rb (HTTPServer#initialize),
- lib/webrick/httpservlet/cgihandler.rb (CGIHandler#initialize),
- lib/webrick/httpservlet/erbhandler.rb (ERBHandler#initialize),
- lib/webrick/httpservlet/filehandler.rb(DefaultFileHandler#initialize):
- super (called with no arguments) takes default value of optional
- arguments. [ruby-dev:26743]
+ * ext/win32ole/win32ole.c (WIN32OLE_EVENT#on_event): should set
+ only one event handler.
- * lib/webrick/httputils.rb: add a media-type "text/html" for .xhtml.
+ * ext/win32ole/tests/testOLEEVENT.rb: ditto.
-Sun Aug 7 23:52:39 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * test/ruby/test_super.rb: added optional arg tests. [ruby-dev:26743]
- the tests expects 1.8 behavior at this time.
+ * ext/win32ole/tests/testOLEPARAM.rb: remove re-defined
+ test_ole_type_detail method.
Sat Aug 6 12:35:24 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
@@ -52178,60 +9808,35 @@ Sat Aug 6 12:35:24 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tk/{label,radiobutton}.rb: removed its own
{variable,textvariable} function.
- * ext/tk/lib/tk/variable.rb: retains backward compatibility.
+ * ext/tk/lib/tk/variable.rb: retains backward conpatibility.
-Fri Aug 5 12:48:31 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Fri Aug 5 12:50:32 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * ext/tk/tcltklib.c: fixed memory leak when tk_funcall raised
+ * ext/tcltklib/tcltklib.c: fixed memory leak when tk_funcall raised
exception. (copies argv into heap in tk_funcall instead of
caller)
-Fri Aug 5 12:36:40 2005 NAKAMURA Usaku <usa@ruby-lang.org>
+Fri Aug 5 12:42:57 2005 NAKAMURA Usaku <usa@ruby-lang.org>
- * lib/mkmf.rb (create_makefile): need to convert path separator
+ * lib/mkmf.rb (create_makefile): need to convert path separetor
before invoking install command.
-Fri Aug 5 08:08:05 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (return_jump): fix "can't across thread" error message
- when no thread associated.
- http://www.namikilab.tuat.ac.jp/~sasada/diary/200507.html#d31
-
-Fri Aug 5 00:25:12 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Fri Aug 5 00:27:04 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * ext/tk/tcltklib.c: refactoring - extract ruby string <->
+ * ext/tcltklib/tcltklib.c: refactoring - extract ruby string <->
tcl object conversion as get_str_from_obj and get_obj_from_str.
Fri Aug 5 00:19:33 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * enumerator.c (Init_Enumerator): provided features should have
- extensions.
-
- * eval.c (rb_feature_p): returns type of the feature instead of
- extension.
-
- * eval.c (search_required): ruby library should be prior to statically
- linked extensions. fixed: [ruby-dev:26711]
-
- * eval.c (formal_assign): returns position of rest arguments variable.
-
- * parse.y (f_rest_arg): use anonymous variable for rest arguments.
- fixed: [ruby-dev:26647]
-
* extmk.rb (extmake): needs to be wrapped in an Array.
-Thu Aug 4 20:03:18 2005 Tadashi Saito <shiba@mail2.accsnet.ne.jp>
-
- * numeric.c (Init_Numeric): do not share implementation among
- Fixnum#/ and Fixnum#div. [ruby-core:05531]
-
Thu Aug 4 18:38:36 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * ext/tk/tcltklib.c: cannot compile for Tcl7.6/Tk4.2.
+ * ext/tcltklib/tcltklib.c: cannot compile for Tcl7.6/Tk4.2.
- * ext/tk/tcltklib.c: add nativethread consistency check.
+ * ext/tcltklib/tcltklib.c: add nativethread consistency check.
- * ext/tk/stubs.c: ditto.
+ * ext/tcltklib/stubs.c: ditto.
* ext/tk/lib/tk.rb: forgot to define TclTkIp.encoding and encoding=
when Tcl is 7.6 or 8.0.
@@ -52243,17 +9848,12 @@ Thu Aug 4 18:38:36 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tk/toplevel.rb: ditto.
- * ext/tk/lib/tkextlib/SUPPORT_STATUS: update RELEASE_DATE
-
-Thu Aug 4 13:30:15 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * numeric.c (fix_div): should not convert the result into
- integer. [ruby-core:05524]
+ * ext/tk/lib/tkextlib/SUPPRT_STATUS: update RELEASE_DATE
Thu Aug 4 08:03:39 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/extmk.rb (extmake): should not modify $mflags for each
- extensions.
+ extentions.
Thu Aug 4 00:25:48 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
@@ -52264,84 +9864,47 @@ Thu Aug 4 00:25:48 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* {win32,wince}/Makefile.sub: separate config.h for compiler versions.
-Thu Aug 4 00:24:59 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * sprintf.c: replacing is no longer needed.
-
Wed Aug 3 21:59:16 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tk/variable.rb: TkVariable#trace didn't work on
- TkVariable retrieved from TkVariable.new_hash.ref. [ruby-dev:26721]
-
-Wed Aug 3 12:40:28 2005 Tadashi Saito <shiba@mail2.accsnet.ne.jp>
-
- * numeric.c (fix_plus): reduce coercing when a method knows about
- a operand type. [ruby-dev:26723]
-
- * numeric.c (fix_minus, fix_mul, fix_quo, fix_div, fix_mod,
- fix_divmod, fix_pow): ditto.
-
- * bignum.c (rb_big_div, rb_big_modulo): export to reduce
- coercing.
-
-Wed Aug 3 10:13:52 2005 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * configure.in, {bcc32,win32,wince}/Makefile.sub (HAVE_SNPRINTF,
- HAVE_VSNPRINTF): use win32/win32.c's implementation instead of
- missing/vsnprintf.c's.
-
- * win32/win32.[ch] (rb_w32_snprintf, rb_w32_vsnprintf): reverted.
-
-Wed Aug 3 10:05:08 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in: check vsnprintf() and snprintf().
-
- * sprintf.c, missing/vsnprintf.c: made vsnprintf() and snprintf()
- private. fixed: [ruby-dev:26651]
+ TkVariable retrived from TkVariable.new_hash.ref. [ruby-dev:26721]
Wed Aug 3 08:22:13 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* ext/socket/socket.c (ruby_connect): revert [ruby-talk:111654]
changes at 2004-09-07. [ruby-dev:26656]
-Wed Aug 3 06:53:35 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_or): wraps the operand in an array if it is not
- an array. [ruby-talk:150495] [EXPERIMENTAL]
+Tue Aug 2 10:20:54 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * array.c (rb_ary_and, rb_ary_plus, rb_ary_diff): ditto.
-
-Tue Aug 2 10:23:12 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * ext/tk/tcltklib.c: use Tcl_[GS]etVar2Ex instead of
+ * ext/tcltklib/tcltklib.c: use Tcl_[GS]etVar2Ex instead of
Tcl_Obj[GS]etVar2. (avoid Tcl_NewStringObj on supported platforms)
- * ext/tk/tcltklib.c: use ip_{get,set,unset}_variable2_core from
+ * ext/tcltklib/tcltklib.c: use ip_{get,set,unset}_variable2_core from
ip_{get,set,unset}_variable.
- * ext/tk/tcltklib.c: replaced Tcl_Panic with rb_bug.
+ * ext/tcltklib/tcltklib.c: replaced Tcl_Panic with rb_bug.
-Tue Aug 2 01:40:38 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Tue Aug 2 01:41:28 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
* lib/ping.rb (Ping.pingecho): should rescue StandardError.
[ruby-dev:26677]
-Mon Aug 1 19:02:23 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Mon Aug 1 19:09:41 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * ext/tk/tcltklib.c: refactoring - replaced rb_ivar_defined &
+ * ext/tcltklib/tcltklib.c: refactoring - replaced rb_ivar_defined &
rb_ivar_get with single rb_attr_get call.
-Mon Aug 1 18:44:08 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Mon Aug 1 18:45:07 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * ext/tk/tcltklib.c (Tcl_GetStringResult): refactoring - define
+ * ext/tcltklib/tcltklib.c (Tcl_GetStringResult): refactoring - define
alternative macro on Tcl7.x or earlier.
-Mon Aug 1 13:53:55 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Mon Aug 1 13:57:35 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * ext/tk/tcltklib.c (deleted_ip): refactoring - interpreter
+ * ext/tcltklib/tcltklib.c (deleted_ip): refactoring - interpreter
deletion check. [ruby-dev:26664]
-Mon Aug 1 01:08:21 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+Mon Aug 1 01:17:40 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
* lib/drb/drb.rb (check_insecure_method): use private_methods and
protected_methods instead of respond_to? to check method visibility.
@@ -52351,205 +9914,86 @@ Mon Aug 1 01:08:21 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
* test/drb/ut_drb.rb: ditto.
-Sat Jul 30 18:49:44 2005 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c: add WIN32OLE_TYPE#ole_typelib,
- WIN32OLE_TYPE#implemented_ole_types.
+Mon Aug 1 00:07:32 2005 Keiju Ishitsuka <keiju@ruby-lang.org>
- * ext/win32ole/tests/testOLETYPE.rb: ditto.
-
-Fri Jul 29 16:12:02 2005 Keiju Ishitsuka <keiju@ruby-lang.org>
-
- * lib/irb/context.rb: fix `irb --readline` option. [ruby-dev:40955]
+ * lib/irb/context.rb: fix `irb --readline` option. [ruby-list:40955]
Fri Jul 29 09:59:38 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * eval.c (rb_call0): fix calling zsuper from a method with anonymous
- rest argument. [ruby-dev:26639]
-
* eval.c (rb_yield_0): push yielded node instead of yielding.
fixed: [yarv-dev:549]
-Thu Jul 28 21:49:17 2005 IWATSUKI Hiroyuki <don@na.rim.or.jp>
-
- * parse.y (rb_parser_end_seen_p): exclude from ripper.
- <http://moonrock.jp/~don/d/200507.html#d28_t2>
-
- * sprintf.c (clearerr): remove standard macro before re-definition.
- <http://moonrock.jp/~don/d/200507.html#d28_t3>
-
Thu Jul 28 18:09:55 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * ext/tk/stubs.c: When --enable-tcltk-stubs, the initialize
+ * ext/tcltklib/stubs.c: When --enable-tcltk-stubs, the initialize
routine creates a Tcl/Tk interpreter and deletes it. However,
init cost of Tk's MainWindow is not so small. And that makes it
impossible to use libraries written with Tcl functions only on
an environment without a graphical display. This changes support
- delaying initialization of Tk_Stubs until the script needs Tk.
+ delaying initalization of Tk_Stubs until the script needs Tk.
- * ext/tk/stubs.h: New file. Define prototypes and return codes of
- functions on stubs.c.
+ * ext/tcltklib/stubs.h: New file. Define prototypes and return
+ codes of functions on stubs.c.
- * ext/tk/tcltklib.c: Support delaying initialization of Tk_Stubs
- until the script needs Tk.
+ * ext/tcltklib/tcltklib.c: Support delaying initalization of
+ Tk_Stubs until the script needs Tk.
- * ext/tk/tcltklib.c: Show friendly error messages for errors on
- initialization.
+ * ext/tcltklib/tcltklib.c: Show friendly error messages for errors
+ on initialization.
- * ext/tk/tcltklib.c: Avoid SEGV on ip_finalize() when ruby is
+ * ext/tcltklib/tcltklib.c: Avoid SEGV on ip_finalize() when ruby is
exiting and $DEBUG is true. (Not fix. If you know the reason of
why, please fix it.)
- * ext/tk/tkutil/tkutil.c (ary2list, ary2list2): bug fix on handling
- of encoding.
+ * ext/tk/tkutil.c (ary2list, ary2list2): bug fix on handling of
+ encoding.
* ext/tk/lib/multi-tk.rb: MultiTkIp#eval_string and bg_eval_string
- don't work properly.
+ don't work propery.
* ext/tk/lib/tk.rb: Forget extending Tk::Encoding module to Tk.
-
* ext/tk/lib/tk/variable.rb: TkVarAccess fails to initialize the
object for an element of a Tcl's array variable.
-Thu Jul 28 17:23:37 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (f_larglist): allow block argument in lambda parameter
- list without parenthesis.
-
-Thu Jul 28 17:14:01 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * hash.c (each_i): typo fixed. [ruby-dev:26622]
-
-Thu Jul 28 15:04:11 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (f_arg): better argument name duplication check
-
- * parse.y (new_args_gen): factored out name duplication check for
- optional and rest arguments.
-
- * parse.y (new_bv_gen): allow shadowing outer local variables;
- warning remains.
-
-Thu Jul 28 13:46:06 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (ripper_warningS): the argument was omitted.
- [ruby-dev:26621]
-
-Thu Jul 28 11:30:57 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (f_larglist): allow bv_decl at the end of lambda
- argument list. [EXPERIMENTAL]
-
- * parse.y (new_bv_gen): allow local variable shadowing, with
- warning in verbose mode.
-
Wed Jul 27 23:23:54 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* gc.c (obj_free): make message format consistent with one from
gc_mark(). [ruby-talk:149668]
- * sprintf.c (quad_t): prepare quad_t as well. [ruby-talk:149668]
-
Wed Jul 27 22:11:37 2005 Kouhei Sutou <kou@cozmixng.org>
* sample/rss/tdiary_plugin: removed. because the plugin
is imported in the tDiary plugin packages.
-Wed Jul 27 19:11:53 2005 Minero Aoki <aamine@loveruby.net>
-
- * lib/fileutils.rb (cd): follow :noop option change. (This patch
- is contributed by Doug Kearns)
-
-Wed Jul 27 16:25:59 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (lambda): Perl6 style -> lambda expression. [NEW]
- [VERY EXPERIMENTAL]
-
-Wed Jul 27 10:43:14 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * gc.c (id2ref): must not assign pointers to long int. use
- LONG_LONG instead if SIZEOF_LONG < SIZEOF_VOIDP.
- [ruby-talk:149645]
-
- * ruby.h: use LONG_LONG to simplify the change.
- [ruby-talk:149645]
-
Wed Jul 27 10:59:02 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* dir.c (dir_each): rewinddir(3) before iteration.
[ruby-talk:149628]
-Wed Jul 27 02:34:58 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+Tue Jul 26 12:57:49 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
- * eval.c (rb_f_throw): replace all '0x%lx' by '%p'.
- [ruby-talk:149553]
-
- * missing/vsnprintf.c (BSD_vfprintf): '%p' need to handle 64bit
- size pointer. [ruby-talk:149553]
-
-Tue Jul 26 22:41:28 2005 Minero Aoki <aamine@loveruby.net>
-
- * ext/ripper/lib/ripper/sexp.rb: new method Ripper.sexp_raw.
-
- * ext/ripper/lib/ripper/sexp.rb (Ripper.sexp): returns more
- readable tree. This is suggested by Kirill A. Shutemov.
-
-Tue Jul 26 22:05:12 2005 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/http.rb: merge a patch contributed by Daniel Berger,
- with some modification. (RubyForge #2128)
-
-Tue Jul 26 18:11:33 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ruby.h: support LLP64 model. [ruby-talk:149524]
-
-Tue Jul 26 12:57:40 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/openssl_missing.c: include <openssl/engine.h> before
+ * ext/openssl/openssl_missin.c: include <openssl/engine.h> before
<openssl/x509_vfy.h> to avoid compilation error of mswin32.
suggested by NAKAMURA Usaku.
-Mon Jul 25 23:48:55 2005 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.[ch]: (rb_w32_vsnprintf, rb_w32_snprintf): removed.
-
Mon Jul 25 21:30:46 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * common.mk: Borland MAKE doesn't look for file names which have paths
- from VPATH. fixed: [ruby-dev:26604]
-
- * ruby.h (NORETURN, DEPRECATED): moved just after config.h.
-
- * {win32,wince}/Makefile.sub: vsnprintf() is in missing now.
-
* {bcc32,win32,wince}/Makefile.sub: moved CPPFLAGS only for ruby
source to XCFLAGS.
-Mon Jul 25 14:10:02 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/multi-tk.rb: fix en-bugged part in the last commit.
-
Mon Jul 25 13:45:18 2005 NAJIMA Hiroki <najima@mickey.ai.kyutech.ac.jp>
* io.c: check HAVE_SYS_IOCTL_H before including the header.
[ruby-dev:26610]
-Sat Jul 23 16:48:12 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/ossl_engine.c (ossl_engine_s_load): should check
- OPENSSL_NO_STATIC_ENGINE.
-
-Sat Jul 23 11:46:30 2005 Tanaka Akira <akr@m17n.org>
-
- * eval.c (rb_fd_select): the all three fd_sets must be long enough for
- select. fixed: [ruby-talk:149059]
+Mon Jul 25 14:10:02 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-Sat Jul 23 10:01:41 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/tk/lib/multi-tk.rb: fix en-bugged part in the last commit.
- * sprintf.c (rb_vsprintf, rb_sprintf): new functions return new String,
- using missing/vsnprintf.c. [ruby-dev:26580]
+Sat Jul 23 16:49:04 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
- * missing/vsnprintf.c: made the output changeable.
+ * ext/openssl/ossl_engine.c (ossl_engine_s_load): should check
+ OPENSSL_NO_STATIC_ENGINE.
Fri Jul 22 21:06:08 2005 Tadashi Saito <shiba@mail2.accsnet.ne.jp>
@@ -52583,12 +10027,12 @@ Fri Jul 22 14:37:43 2005 Kouhei Sutou <kou@cozmixng.org>
Fri Jul 22 07:01:42 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * ext/tk/tkutil/tkutil.c (tk_conv_args): forget to revert
- thread_critical and gc_disable when raise ArgumentError.
+ * ext/tk/tkutil.c (tk_conv_args): forget to revert thread_critical
+ and gc_disable when raise ArgumentError.
* ext/tk/lib/remote-tk.rb: RemoteTkIp doesn't need to include TkUtil.
- * ext/tk/tcltklib.c: add TclTkIp#has_mainwindow? method.
+ * ext/tcltklib/tcltklib.c: add TclTkIp#has_mainwindow? method.
* ext/tk/lib/tk.rb: add Tk.has_mainwindow? method.
@@ -52620,17 +10064,11 @@ Fri Jul 22 07:01:42 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/multi-tk.rb: fail to control a slave IP when Tk.mainloop
runs on the IP.
-Thu Jul 21 01:00:00 2005 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/nkf/nkf-utf8/{nkf.c,utf8tbl.c,config.h}:
- import 1.76
- [ruby-dev:26592] nkf constification
-
-Wed Jul 20 19:18:52 2005 NAKAMURA Usaku <usa@ruby-lang.org>
+Wed Jul 20 19:20:37 2005 NAKAMURA Usaku <usa@ruby-lang.org>
* io.c (S_ISREG): need to define S_ISREG before it is used first.
-Wed Jul 20 18:33:15 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Wed Jul 20 18:40:50 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* io.c (wsplit_p): patch for the environment where
fcntl(F_GETFL, O_NONBLOCK) is not supported. in that case,
@@ -52644,9 +10082,9 @@ Wed Jul 20 18:07:11 2005 Tanaka Akira <akr@m17n.org>
Wed Jul 20 10:04:51 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* variable.c (rb_class_path): need to adjust snprintf() len for
- terminating NUL. [ruby-dev:26581]
+ teminating NUL. [ruby-dev:26581]
-Wed Jul 20 03:58:52 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Wed Jul 20 04:01:55 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* ext/socket/socket.c: sorry, BeOS also uses HAVE_CLOSESOCKET,
so reverted.
@@ -52654,7 +10092,7 @@ Wed Jul 20 03:58:52 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* ext/socket/extconf.rb: should not define HAVE_CLOSESOCKET
on windows.
-Wed Jul 20 03:12:21 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Wed Jul 20 03:16:43 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* ext/socket/socket.c: should not undef close() on win32.
it's defined to rb_w32_close(), otherwise handle leaks.
@@ -52670,22 +10108,19 @@ Tue Jul 19 22:47:29 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* error.c (syserr_initialize): add 1 byte for snprintf() size for
NUL at the end. [ruby-dev:26574]
-Tue Jul 19 17:16:34 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * signal.c (trap): remove sigexit(); handle "EXIT" via sig_exec().
- [ruby-dev:26440]
+Tue Jul 19 16:39:46 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* io.c (rb_io_inspect): replace sprintf() with "%s" format all
over the place by snprintf() to avoid integer overflow.
-Tue Jul 19 14:10:50 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Tue Jul 19 14:08:22 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * ext/tk/tcltklib.c: rbtk_eventloop_depth is used as int.
+ * ext/tcltklib/tcltklib.c: rbtk_eventloop_depth is used as int.
- * ext/tk/tcltklib.c: rbtk_pending_exception is tested with
+ * ext/tcltklib/tcltklib.c: rbtk_pending_exception is tested with
NIL_P, so should assign Qnil instead of 0 (Qfalse).
- * ext/tk/tcltklib.c (ip_invoke_real): fixed memory leak when
+ * ext/tcltklib/tcltklib.c (ip_invoke_real): fixed memory leak when
ip is deleted.
Tue Jul 19 13:19:46 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
@@ -52694,50 +10129,33 @@ Tue Jul 19 13:19:46 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
returns a string even if the default value type of the TkVariable
object is not "string".
-Mon Jul 18 21:39:18 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Mon Jul 18 21:40:20 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* eval.c (rb_call0): make the pointer to NODE volatile
instead of NODE itself.
Mon Jul 18 14:32:21 2005 Tanaka Akira <akr@m17n.org>
- * eval.c (rb_call0): make body volatile to avoid possible optimization
- problem.
+ * eval.c (rb_call0): make body volatile to avoid optimization problem.
[ruby-dev:26195]
Mon Jul 18 12:23:27 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * ext/io/wait/wait.c: wrong backport from trunk, and compile error on
- platforms fd_set is not a bit set. fixed: [ruby-dev:26562]
+ * ext/io/wait/wait.c: wrong backport from trunk. fixed: [ruby-dev:26562]
Mon Jul 18 09:36:25 2005 Tanaka Akira <akr@m17n.org>
* rubyio.h (FMODE_WSPLIT, FMODE_WSPLIT_INITIALIZED): new constant.
* io.c (wsplit_p): new function.
- (io_fflush): split writing data by PIPE_BUF if wsplit_p is true in
+ (io_fwrite): split writing data by PIPE_BUF if wsplit_p is true in
multi-threaded mode.
- (io_fwrite): ditto.
[ruby-dev:26540]
-Mon Jul 18 05:00:00 2005 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/nkf/nkf-utf8/nkf.c: import nkf.c 1.73
- fix: TestKconv 1F
-
Sun Jul 17 13:46:54 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/io/wait/extconf.rb, ext/io/wait/wait.c: Win32 platforms support.
-Sat Jul 16 23:43:16 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * enumerator.c (Init_Enumerator): wrong argument specs.
- [ruby-core:05481]
-
-Sat Jul 16 15:52:50 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * win32/win32.[hc]: constified socket functions. [ruby-dev:26553]
-
Fri Jul 15 23:59:03 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/rdoc/parsers/parse_c.rb (handle_class_module): handle a
@@ -52748,25 +10166,23 @@ Fri Jul 15 23:59:03 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/rdoc/parsers/parse_c.rb (find_call_seq): allow :nodoc: modifier
in C. [ruby-core:04572]
-Fri Jul 15 23:20:03 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Jul 15 18:00:01 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * enumerator.c (Init_Enumerator): use an internal directly.
+ * bcc32/Makefile.sub (COMMON_HEADERS): ruby_1_8 is using winsock.h.
+ failed to compile ext/socket on bcc5.6.4. [ruby-dev:26193]
-Fri Jul 15 07:58:10 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Fri Jul 15 07:58:56 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
* lib/webrick/server.rb (WEBrick::GenericServer#accept_client):
sockets should be non-blocking mode. [ruby-dev:26405]
* lib/webrick/utils.rb (WEBrick::Utils.set_non_blocking): new method.
-Fri Jul 15 00:11:36 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * enum.c (enumeratorize): create new enumerator for current method if
- no block is given.
+ * lib/webrick/httprequest.rb (WEBrick::HTTPRequest#read_chunked):
+ should call sock.read repeatedly until the preferred size data
+ is obtained.
- * enumerator.c: moved from ext/enumerator.
-
-Thu Jul 14 18:27:35 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Thu Jul 14 18:27:16 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* win32/win32.c (rb_w32_strerror): should return correct message
for ENAMETOOLONG and ENOTEMPTY. (bcc32) [ruby-dev:26533]
@@ -52778,11 +10194,7 @@ Thu Jul 14 00:45:42 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* LEGAL (ext/nkf/nkf-utf8): updated from nkf1.7 to nkf-utf8.
-Wed Jul 13 22:44:00 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y: remove static variables. [ruby-dev:26530]
-
-Wed Jul 13 19:36:29 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Wed Jul 13 19:37:47 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* win32/win32.c (rb_w32_mkdir): should set EEXIST (not EACCES)
if file or directory already exists. (bcc32) [ruby-dev:26508]
@@ -52795,7 +10207,7 @@ Wed Jul 13 19:36:29 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
Wed Jul 13 12:40:00 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * ext/tk/tcltklib.c: TclTkLib.do_one_event doesn't work.
+ * ext/tcltklib/tcltklib.c: TclTkLib.do_one_event doesn't work.
* ext/tk/lib/tk.rb: Tk.thread_update is available.
@@ -52803,30 +10215,16 @@ Tue Jul 12 23:32:11 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb: keep curdir unexpanded.
-Mon Jul 11 23:50:17 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c, intern.h (rb_proc_call, rb_obj_method, rb_method_call):
- export.
-
- * ext/enumerator/enumerator.c (enumerator_with_index): [EXPERIMENTAL]
- added a new method Enumerator#with_index. [ruby-talk:147728]
-
Mon Jul 11 08:31:29 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * regparse.c (fetch_escaped_value): mask values following \c in
+ * regex.c (read_special): fix parsing backslashes following \c in
regexp. fixed: [ruby-dev:26500]
-Sun Jul 11 05:18:17 2005 Michael Neumann <mneumann@ruby-lang.org>
-
- * lib/xmlrpc/server.rb (XMLRPC::Server): Switch from GServer over to
- WEBrick. This makes file lib/xmlrpc/httpserver.rb obsolete (at least it is
- no further used by the XML-RPC library).
-
-Mon Jul 11 02:50:23 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Mon Jul 11 02:53:00 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
* lib/webrick/cgi.rb (WEBrick::CGI::Socket#request_line):
- mistook to merge the patch of [ruby-dev:26235] at
- revision 1.11.
+ mistook in merging the patch of [ruby-dev:26235] at
+ revision 1.4.2.6.
Sun Jul 10 23:58:04 2005 Tanaka Akira <akr@m17n.org>
@@ -52834,12 +10232,18 @@ Sun Jul 10 23:58:04 2005 Tanaka Akira <akr@m17n.org>
avoid unlink a directory by root.
cf. [ruby-dev:26237]
+Sun Jul 11 05:18:17 2005 Michael Neumann <mneumann@ruby-lang.org>
+
+ * lib/xmlrpc/server.rb (XMLRPC::Server): Switch from GServer over to
+ WEBrick. This makes file lib/xmlrpc/httpserver.rb obsolete (at least it is
+ no further used by the XML-RPC library).
+
Sun Jul 10 12:47:01 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/debug.rb (debug_command): added a deficient format specifier.
fixed: [ruby-core:05419]
-Sat Jul 9 22:02:37 2005 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+Sat Jul 9 21:28:46 2005 Masaki Suketa <masaki.suketa@nifty.ne.jp>
* ext/win32ole/win32ole.c (ole_method_dispid): convert dispid
in Ruby and C by INT2NUM and NUM2INT.
@@ -52864,36 +10268,6 @@ Fri Jul 8 15:45:04 2005 Kouhei Sutou <kou@cozmixng.org>
* test/rss/test_parser.rb (RSS::TestParser#test_category20):
adjusted test case.
-Wed Jul 6 18:45:53 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (rb_obj_pattern_match): now returns nil.
- [ruby-core:05391]
-
-Mon Jul 4 14:35:52 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * sample/svr.rb: service can be stopped by ill-behaved client; use
- tsvr.rb instead.
-
-Mon Jul 4 13:25:21 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * missing/erf.c: original erf.c by prof. Okumura is confirmed to
- be public domain. reverted BSD implementation.
-
-Wed Jul 6 11:15:21 2005 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (open_ifs_socket): new function.
-
- * win32/win32.c (StartSockets, rb_w32_socket): use open_ifs_socket()
- instead of socket().
- all changes are derived from [ruby-core:5388].
-
-Wed Jul 6 00:15:00 2005 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/nkf/nkf-utf8/{nkf.c,utf8tbl.c,config.h}:
- imported nkf.c 1.70 (support UTF-8-MAC)
-
- * ext/nkf/lib/kconv.rb: add :utf8mac and :internalunicode
-
Tue Jul 5 23:44:06 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* instruby.rb: expand source library path.
@@ -52910,19 +10284,19 @@ Tue Jul 5 15:15:10 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/tkutil.c: fix typo.
-Tue Jul 5 14:52:56 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+Tue Jul 5 14:51:35 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * ext/tk/tcltklib.c: bug fix on treating Unicode strings.
+ * ext/tcltklib/tcltklib.c: bug fix on treating Unicode strings.
- * ext/tk/tcltklib.c: add methods to treat encoding mode.
+ * ext/tcltklib/tcltklib.c: add methods to treat encoding mode.
- * ext/tk/MANUAL_tcltklib.eng: add description of TclTkLib#encoding,
+ * ext/tcltklib/MANUAL.eng: add description of TclTkLib#encoding,
encoding_system, and so on.
- * ext/tk/MANUAL_tcltklib.eucj: ditto.
+ * ext/tcltklib/MANUAL.euc: ditto.
- * ext/tk/tkutil/tkutil.c: fail to create a Tcl's list string from
- an array including multiple kind of encoded strings.
+ * ext/tk/tkutil.c: fail to create a Tcl's list string from an
+ array including multiple kind of encoded strings.
* ext/tk/lib/tk.rb: ditto.
@@ -52948,11 +10322,17 @@ Tue Jul 5 14:52:56 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tk/namespace.rb: arguemnts for TclTkIp#_merge_tklist
should be UTF-8 strings.
-Mon Jul 4 19:29:32 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Mon Jul 4 14:35:52 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/set.rb: test change to follow revision 1.28. (duck typing?)
+ * sample/svr.rb: service can be stopped by ill-behaved client; use
+ tsvr.rb instead.
-Mon Jul 4 11:23:50 2005 NAKAMURA Usaku <usa@ruby-lang.org>
+Mon Jul 4 13:25:21 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * missing/erf.c: original erf.c by prof. Okumura is confirmed to
+ be public domain. reverted BSD implementation.
+
+Mon Jul 4 11:15:37 2005 NAKAMURA Usaku <usa@ruby-lang.org>
* test/{dbm,gdbm,sdbm}/test_{dbm,gdbm,sdbm}.rb: skip some tests
which using fork on fork-less platforms.
@@ -52975,18 +10355,11 @@ Sat Jul 2 17:06:23 2005 Tanaka Akira <akr@m17n.org>
* eval.c (flush_register_windows): new function.
- * ruby.h (NOINLINE): move up to be effective in defines.h.
-
-Sat Jul 2 15:19:41 2005 Tanaka Akira <akr@m17n.org>
-
- * configure.in: check select_large_fdset.
-
- * eval.c: use select_large_fdset to support large file descriptors
- on Solaris. [ruby-dev:26404]
+Fri Jul 1 17:48:52 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-Fri Jul 1 17:55:08 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bignum.c (rb_big_neg): may be accessing bogus pointer value.
+ * bignum.c (get2comp): revert all prior changes, and calculate
+ proper 2's complement for negative numbers. backported from
+ HEAD.
Fri Jul 1 15:50:12 2005 NAKAMURA Usaku <usa@ruby-lang.org>
@@ -53026,11 +10399,6 @@ Fri Jul 1 00:18:40 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/delegate.rb (Delegator::respond_to): respond_to? must check
destination object. [ruby-talk:146894]
-Thu Jun 30 23:52:12 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * signal.c (trap): non-string trap hander was ignored.
- fixed: [ruby-dev:26417]
-
Thu Jun 30 19:00:21 2005 Keiju Ishitsuka <keiju@ruby-lang.org>
* lib/irb/ruby-lex.rb (RubyLex::identify_number): alternative implements
@@ -53046,76 +10414,46 @@ Thu Jun 30 15:13:16 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (rb_eval): pre-evaluate argument for unambiguous
evaluation order. [ruby-dev:26383]
-Thu Jun 30 14:48:23 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/net/http.rb (Net::HTTP#connect, Net::HTTP#request): should
- not send proxy username and password to origin servers.
- [ruby-dev:25673]
-
- * lib/net/http.rb (Net::HTTP::ProxyDelta#edit_path): should not
- send HTTPS scheme URL to origine servers. [ruby-dev:25689]
-
Thu Jun 30 09:53:56 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/delegate.rb (Delegator::method_missing): forward unknown
method to the destination. suggested by
<christophe.poucet@gmail.com>. [ruby-talk:146776]
-Wed Jun 29 00:03:20 2005 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * regparse.c (fetch_token): avoid warning of unused goto tag.
- [ruby-dev:26389]
-
Tue Jun 28 21:59:29 2005 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
- * dir.c, eval.c, parse.y, process.c, ruby.c: avoid warning "unused
+ * dir.c, eval.c, hash.c, process.c, ruby.c: avoid warning "unused
variable" [ruby-dev:26387]
- * dir.c (glob_helper): avoid warning "enumeration value `RECURSIVE'
- not handled in switch" [ruby-dev:26392]
+Sat Jun 25 17:15:23 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-Tue Jun 28 01:52:00 2005 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/nkf/lib/kconv.rb: add Kconv::VERSION
- * ext/nkf/lib/kconv.rb (conv): can process arrayed options
- * ext/nkf/nkf-utf8/nkf.c: imported Revision 1.69
- * ext/nkf/nkf-utf8/utf8tbl.c: imported Revision 1.9
+ * lib/webrick/httputils.rb (WEBrick::HTTPUtils.parse_query): should
+ discard if key=val pair is empty. patch from Gary Wright.
Sat Jun 25 23:30:51 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* process.c (detach_process_watcher): terminate process watcher
thread right after rb_waitpid() succeed. [ruby-talk:146430]
-Sat Jun 25 17:12:20 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/webrick/httputils.rb (WEBrick::HTTPUtils.parse_query): should
- discard if key=val pair is empty. patch from Gary Wright.
-
Sat Jun 25 15:49:18 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * enum.c (enum_min, enum_max, enum_min_by, enum_max_by): do not ignore
- nil as the first element.
+ * enum.c (enum_min, enum_max): do not ignore nil as the first element.
-Sat Jun 25 15:13:54 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Sat Jun 25 14:40:17 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * lib/set.rb (Set#==): [ruby-dev:25206] (ported from ruby_1_8 branch)
+ * ext/sdbm/init.c (fsdbm_select): SDBM#select had returned the array
+ which contained each elements twice. [ruby-dev:26358]
-Sat Jun 25 11:37:00 2005 NARUSE, Yui <naruse@ruby-lang.org>
+Fri Jun 25 05:06:47 2005 Michael Neumann <mneumann@ruby-lang.org>
- * ext/nkf/lib/kconv.rb: remove constants
- Iconv_Shift_JIS, Uconv_EUC_JP, Iconv_UTF8
- * ext/nkf/lib/kconv.rb: add module functions to Kconv
- conv, {eucjp, shiftjis, utf8}?, guess_as_symbol
- * ext/nkf/lib/kconv.rb: add instance methods to String
- conv, {eucjp, shiftjis, utf8}?
- * ext/nkf/lib/kconv.rb: add aliases Kconv.to_* and String#to_*
+ * lib/xmlrpc/*, test/xmlrpc/*: backported changes from HEAD into 1.8
Fri Jun 24 17:00:00 2005 Shigeo Kobayashi <shigeo@tinyforest.jp>
* ext/bigdecimal/bigdecimal.c: patch from "NATORI Shin"
(u-tokyo.ac.jp) applied to fix rounding bug.
-Fri Jun 24 13:17:45 2005 akira yamada <akira@ruby-lang.org>
+Fri Jun 24 13:06:45 2005 akira yamada <akira@ruby-lang.org>
* lib/uri/common.rb, lib/uri/generic.rb: fixed typo in documents and
replaced some existent domain name with "example.com".
@@ -53152,7 +10490,7 @@ Mon Jun 20 18:44:04 2005 Tanaka Akira <akr@m17n.org>
because setjmp is not enough to fix getcontext and SPARC register
window problem.
-Mon Jun 20 17:15:51 2005 NAKAMURA Usaku <usa@ruby-lang.org>
+Mon Jun 20 16:48:36 2005 NAKAMURA Usaku <usa@ruby-lang.org>
* ext/dbm/dbm.c (fdbm_closed): new method DBM#closed?
@@ -53165,7 +10503,7 @@ Mon Jun 20 17:15:51 2005 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/win32.{ch} (unlink): hook runtime function to change
file attribute before unlinking.
- merge from 1.8, see [ruby-dev:26360]
+ fixed: [ruby-dev:26360]
Mon Jun 20 02:15:35 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
@@ -53179,17 +10517,6 @@ Mon Jun 20 01:26:49 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
ext/openssl/ossl_pkcs12.h, ext/openssl/ossl_x509req.c: avoid
compiler warnings. suggested by Michal Rokos.
-Sun Jun 20 00:22:02 2005 Michael Neumann <mneumann@ruby-lang.org>
-
- * lib/xmlrpc/utils.rb: Patch by Nobuhiro IMAI fixes the following
- problem: Default value modification on
- Module#public_instance_methods (false -> true) breaks
- s.add_handler(XMLRPC::iPIMethods("sample"), MyHandler.new) style
- security protection.
-
- * lib/xmlrpc/client.rb: Aliased XMLRPC::Client#new2 as
- XMLRPC::Client#new_from_uri, and #new3 as #new_from_hash.
-
Sun Jun 19 14:09:07 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* gc.c (run_final): reduce unnecessary object allocation during
@@ -53198,30 +10525,15 @@ Sun Jun 19 14:09:07 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* gc.c (rb_gc_call_finalizer_at_exit): deferred finalizers list should
be cleared before calling them. fixed: [ruby-talk:145790]
-Sat Jun 18 01:15:36 2005 Shugo Maeda <shugo@ruby-lang.org>
-
- * ext/readline/readline.c (readline_readline): do not set
- rl_{in,out}stream.
-
- * ext/readline/readline.c (readline_s_set_input): new method.
-
- * ext/readline/readline.c (readline_s_set_output): new method.
-
- * lib/irb/input-method.rb: set Readline.input and Readline.output.
-
Fri Jun 17 13:01:40 2005 Tanaka Akira <akr@m17n.org>
* lib/time.rb (Time.parse): fix previous leap seconds support.
(Time.rfc2822): ditto.
(Time.xmlschema): ditto.
-Thu Jun 16 15:41:32 2005 NAKAMURA Usaku <usa@ruby-lang.org>
+Thu Jun 16 15:06:55 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * ruby.c (load_file): '!' is already read. reported by gotoyuzo.
-
-Thu Jun 16 15:09:38 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * ext/tk/tcltklib.c (ip_rb_threadVwaitCommand): Tcl_Release
+ * ext/tcltklib/tcltklib.c (ip_rb_threadVwaitCommand): Tcl_Release
was missing.
Thu Jun 16 13:34:48 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
@@ -53237,14 +10549,10 @@ Thu Jun 16 12:53:24 2005 Tanaka Akira <akr@m17n.org>
(Time.rfc2822): ditto.
(Time.xmlschema): ditto.
-Thu Jun 16 00:13:41 2005 Tanaka Akira <akr@m17n.org>
+Thu Jun 16 08:29:22 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * lib/resolv.rb (Resolv::DNS::Resource#ttl): new attribute.
- (Resolv::DNS::Resource#==): ignore @ttl.
- (Resolv::DNS::Resource#hash): ditto.
- (Resolv::DNS::Message::MessageDecoder#get_rr): save TTL in a
- Resource object.
- based on [ruby-core:5190] by Eric Hodel.
+ * ext/dl/sym.c (rb_dlsym_call): needs FREE_ARGS before return.
+ fixed memory leak. [ruby-Bugs-2034]
Wed Jun 15 18:26:39 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
@@ -53255,13 +10563,13 @@ Wed Jun 15 18:26:39 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
Tue Jun 14 02:02:43 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * ext/tk/tkutil/tkutil.c: add TkUtil::CallbackSubst.subst_arg(m, ...)
- & _define_attribute_aliases(hash) to get substitution-argument from
+ * ext/tk/tkutil.c: add TkUtil::CallbackSubst.subst_arg(m, ...) &
+ _define_attribute_aliases(hash) to get substitution-argument from
attributes (e.g. subst_arg(:x,:y,:num,:button) --> "%x %y %b %b ").
* ext/tk/lib/tk/event.rb: use _define_attribute_aliases().
-Mon Jun 13 13:03:08 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Mon Jun 13 13:01:05 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* hash.c (ruby_setenv): fixed SEGV. [ruby-dev:26186]
@@ -53284,20 +10592,11 @@ Mon Jun 13 01:20:02 2005 Tanaka Akira <akr@m17n.org>
* eval.c (rb_gc_mark_threads): curr_thread may not be part of the
thread list. [ruby-dev:26312]
-Sat Jun 11 22:34:44 2005 Minero Aoki <aamine@loveruby.net>
-
- * parse.y: missing arg_paren event. This patch is contributed by
- Mitchell N Charity.
-
-Fri Jun 10 23:55:17 2005 Tanaka Akira <akr@m17n.org>
-
- * eval.c (unknown_node): show more information. [ruby-dev:26196]
-
Fri Jun 10 23:35:34 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* missing/mkdir.c: remove. [ruby-core:05177]
-Fri Jun 10 22:54:18 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Jun 10 22:54:26 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* missing.h: fd_set stuffs need sys/types.h. fixed: [ruby-core:05179]
@@ -53321,47 +10620,20 @@ Thu Jun 9 19:55:41 2005 Tanaka Akira <akr@m17n.org>
* gc.c (Init_stack): remove IA64_MAGIC_STACK_LIMIT.
-Thu Jun 9 18:24:16 2005 Tanaka Akira <akr@m17n.org>
-
- * configure.in, eval.c, gc.c: use libunwind only on HP-UX.
- [ruby-dev:26297]
-
-Thu Jun 9 14:46:32 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * hash.c (env_aset): do not treat nil as key-removing value.
- [ruby-list:40865]
-
- * parse.y (method_call): allow aref expression ([]) to take a
- block.
-
- * parse.y (block_dup_check): a function to check duplication of
- a block argument and an actual block.
-
Thu Jun 9 11:55:34 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/delegate.rb (SimpleDelegator::__setobj__): need check for
recursive delegation. [ruby-core:04940]
-Thu Jun 9 11:50:43 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/cgi.rb: add underscore aliases CGI::escape_html,
- CGI::unescape_html, CGI::escape_element, CGI::unescape_element.
- [ruby-core:05058]
-
Wed Jun 8 18:47:10 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* misc/ruby-mode.el (ruby-expr-beg): fix looking point drift.
-Wed Jun 8 12:25:59 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_nitems): add the block feature to Array#nitems.
- suggested by Bertram Scharpf <lists@bertram-scharpf.de> in
- [ruby-talk:134083].
-
Wed Jun 8 11:11:34 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * bignum.c (get2comp): revert all prior changes, and calculate
- proper 2's complement for negative numbers.
+ * bignum.c (get2comp): calculate proper 2's complement for
+ negative numbers. a bug in normalizing negative numbers
+ reported from Honda Hiroki <hhonda@ipflex.com>.
Wed Jun 8 08:33:10 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
@@ -53372,15 +10644,6 @@ Wed Jun 8 08:33:10 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (backtrace): skip successive frames sharing same node.
-Wed Jun 8 01:27:06 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bignum.c (bignorm): fixed a bug in normalizing negative numbers
- reported from Honda Hiroki <hhonda@ipflex.com>. normalizing
- should not trim leading zeros from negative numbers.
-
- * bignum.c (rb_cstr_to_inum): must remove leading zeros for this
- case.
-
Wed Jun 8 00:15:08 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* ext/socket/socket.c (ruby_getaddrinfo__aix): merged a patch from
@@ -53406,55 +10669,37 @@ Tue Jun 7 19:34:15 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
Tue Jun 7 18:39:31 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/thread.rb: RDoc documentation from Eric Hodel
- <drbrain@segment7.net> added. [ruby-core:05148]
+ <drbrain at segment7.net> added. [ruby-core:05148]
Tue Jun 7 18:30:04 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (create_makefile): add .SUFFIXES from depend file.
fixed: [ruby-dev:26294]
-Tue Jun 7 17:20:39 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (parser_yylex): allow ';;' to be block terminator in
- place of 'end'. [highly experimental]
-
- * misc/ruby-mode.el (ruby-block-end-re): allow ';;' to be a
- negative indent trigger. [highly experimental]
+Tue Jun 7 17:39:54 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * parse.y (parser_yylex): small error fixed.
+ * object.c (rb_mod_cvar_get): Module#class_variable_get(): back
+ ported from CVS HEAD. [ruby-talk:144741]
-Tue Jun 7 16:45:49 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (parser_yylex): "respond_to?:foo" should be interpreted
- as "respond_to? :foo" at the command level. [ruby-talk:144303]
+ * object.c (rb_mod_cvar_set): Module#class_variable_set().
+ [ruby-talk:144741]
Tue Jun 7 16:32:53 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* sprintf.c (rb_f_sprintf): raise exception on debug mode (-d),
not verbose mode (-v/-w). [ruby-core:05123]
- * sprintf.c (rb_f_sprintf): warn always on verbose mode.
-
Tue Jun 7 10:30:49 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/multi-tk.rb: slave-ip fails to call procedures
delegated by master-ip.
-Mon Jun 6 16:35:18 2005 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/ripper/depend: add .y to .SUFFIXES for nmake.
-
Sun Jun 5 23:00:35 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tk/console.rb: create console when required
* ext/tk/sample/tkextlib/tile/demo.rb: fix TypeError & create Console
-Sun Jun 5 10:23:52 2005 Tanaka Akira <akr@m17n.org>
-
- * signal.c (ruby_signal): don't set SA_RESTART.
- [ruby-dev:26276]
-
Sat Jun 4 14:55:18 2005 Tanaka Akira <akr@m17n.org>
* test/dbm/test_dbm.rb: merged from ext/dbm/testdbm.rb.
@@ -53464,61 +10709,15 @@ Sat Jun 4 14:55:18 2005 Tanaka Akira <akr@m17n.org>
* test/sdbm/test_sdbm.rb: renamed from ext/sdbm/testsdbm.rb with
modification to use test/unit.
-Fri Jun 3 23:23:02 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * intern.h (rb_fdset_t): deal with fd bit sets over FD_SETSIZE.
- fixed: [ruby-dev:26187]
-
- * eval.c (rb_fd_init, rb_fd_term, rb_fd_zero, rb_fd_set, rb_fd_clr,
- rb_fd_isset, rb_fd_copy): ditto.
-
- * io.c (rb_io_wait_readable, rb_io_wait_writable, rb_f_select): ditto.
-
- * ext/io/wait/wait.c (io_wait): ditto.
-
- * ext/socket/socket.c (wait_connectable, unix_recv_io): ditto.
-
Fri Jun 3 14:06:12 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/multi-tk.rb: fix typo.
-Thu Jun 2 23:42:57 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y: pragma support on ripper. [ruby-dev:26266]
-
-Thu Jun 2 00:02:16 2005 Minero Aoki <aamine@loveruby.net>
-
- * struct.c: accessing >10 member caused segmentation fault.
- [ruby-dev:26247]
-
- * test/ruby/test_struct.rb: test it.
-
-Wed Jun 1 11:30:09 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Wed Jun 1 11:32:42 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* bcc32/Makefile.sub: can use single quote character in DESTDIR.
[ruby-dev:26205]
- * bcc32/Makefile.sub: Dir.glob in 1.9 doesn't treat \ as path separator.
- [ruby-dev:26254]
-
-Wed Jun 1 00:11:06 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (method_call): new experiment: "(expr)(args...)" to
- invoke "expr.call(args...)". [EXPERIMENTAL]
-
-Tue May 31 23:43:41 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (command): revert implicit "call" for local variables.
-
-Tue May 31 15:52:45 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/webrick/httpserver.rb (WEBrick::HTTPServer#run): should
- break the loop if the socket reached to EOF. [ruby-talk:142285]
-
- * lib/webrick/httpserver.rb (WEBrick::HTTPServer#run): send response
- without reading the whole request body if keep-alive is diabled.
- [experimental]
-
Mon May 30 23:48:29 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tk/macpkg.rb: add PACKAGE_NAME information of Tcl/Tk
@@ -53530,12 +10729,12 @@ Mon May 30 23:48:29 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tkextlib/*: ditto.
-Sat May 28 16:39:21 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Sat May 28 16:40:15 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
* test/openssl/test_x509store.rb: add test for expired CRL
and refine some assertions.
-Sat May 28 05:15:44 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Sat May 28 05:15:51 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
* ext/openssl/ossl_x509store.c (ossl_x509stctx_set_time): should
not set internal flag directry.
@@ -53551,41 +10750,22 @@ Fri May 27 16:32:04 2005 WATANABE Hirofumi <eban@ruby-lang.org>
* lib/mkmf.rb: use the semicolon as the path separator
in the environment of MSYS. fixed: [ruby-dev:26232]
-Thu May 26 20:31:21 2005 Minero Aoki <aamine@loveruby.net>
-
- * lib/fileutils.rb (remove_entry_secure): add documentation.
-
- * lib/fileutils.rb (remove_entry_secure): should not invoke
- unlink(2) against a directory.
-
-Thu May 26 08:29:19 2005 Akiyoshi, Masamichi <akiyoshi@hp.com>
-
- * vms/vmsruby_private.c, vms/vmsruby_private.h: private routines
- for VMS port are added.
-
- * eval.c (ruby_init): change to call VMS private intialization routine.
-
-Thu May 26 07:39:07 2005 Minero Aoki <aamine@loveruby.net>
-
- * lib/fileutils.rb (rm_r): use lchown(2), not chown(2).
- [ruby-dev:26226]
-
- * lib/fileutils.rb (cd): remove :noop option. (feature change)
+Thu May 26 06:08:11 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * lib/fileutils.rb (cp_r): should copy symlink as symlink, for
- also tree root. (feature change)
+ * ext/tk/lib/tk.rb: add shortcut-methods of tk_call + tk_split_list
- * lib/fileutils.rb (cp_r): new option :dereference_root.
+Wed May 25 22:52:42 2005 Shugo Maeda <shugo@ruby-lang.org>
- * lib/fileutils.rb: new method remove_entry.
+ * lib/irb/input-method.rb: do not use Readline::HISTORY.pop.
+ (backported from HEAD)
- * lib/fileutils.rb: new method remove_entry_secure.
+Wed May 25 21:55:40 2005 Shugo Maeda <shugo@ruby-lang.org>
- * lib/fileutils.rb: add documentation.
+ * ext/readline/readline.c: supported libedit. (backported from HEAD)
-Thu May 26 06:08:11 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * ext/readline/extconf.rb: ditto.
- * ext/tk/lib/tk.rb: add shortcut-methods of tk_call + tk_split_list
+ * test/readline/test_readline.rb: ditto.
Wed May 25 20:06:27 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
@@ -53627,10 +10807,6 @@ Wed May 25 20:06:27 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tkextlib/iwidgets/scrolledcanvas.rb: ditto.
-Wed May 25 19:48:12 2005 Minero Aoki <aamine@loveruby.net>
-
- * lib/fileutils.rb (rm_r): does chown(2). [ruby-dev:26199]
-
Wed May 25 12:59:48 2005 Tanaka Akira <akr@m17n.org>
* lib/open-uri.rb (OpenURI::Meta::RE_QUOTED_STRING): a content of
@@ -53646,17 +10822,17 @@ Tue May 24 16:57:24 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* ruby.c (require_libraries): caused SEGV when continuation jumped
in to the required library code.
-Tue May 24 17:45:59 2005 Shugo Maeda <shugo@ruby-lang.org>
+Tue May 24 11:56:25 2005 WATANABE Hirofumi <eban@ruby-lang.org>
- * test/readline/test_readline.rb: do not test libedit.
- fixed: [ruby-dev:26217]
+ * lib/getopts.rb: should warn only if verbose mode.
+ fixed: [ruby-dev:26201]
Tue May 24 06:45:31 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* misc/ruby-mode.el (ruby-font-lock-syntactic-keywords): string
literals to be matched non-greedy.
-Tue May 24 00:39:14 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+Tue May 24 00:34:32 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
* test/soap/calc: method name 'set' was able to crash with a class Set.
[ruby-dev:26210]
@@ -53664,16 +10840,11 @@ Tue May 24 00:39:14 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
* test/wsdl/document/test_rpc.rb: dateTime comparison failed under
TZ=right/Asia/Tokyo (with leap second.) [ruby-dev:26208]
-Mon May 23 16:23:06 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/extconf.rb: Framework support on MacOS X Tiger.
+Mon May 23 16:24:05 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * ext/tk/README.tcltklib: add description of Framework support options.
+ * ext/tcltklib/extconf.rb: Framework support on MacOS X Tiger.
-Mon May 23 15:07:34 2005 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/Makefile.sub ($(PROGRAM)): add dependency on $(LIBRUBY_SO).
- [experimental]
+ * ext/tcltklib/README.1st: add description of Framework support options.
Mon May 23 12:21:37 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
@@ -53766,79 +10937,41 @@ Sun May 22 19:11:35 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
* ext/openssl/ossl_ssl.c (ossl_sslctx_setup): add session id support.
-Sun May 22 12:30:58 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * intern.h, parse.y (ruby_pragma): removed. fixed: [ruby-dev:26198]
-
- * parse.y (parser_pragma): pragma name was ignored.
-
-Sun May 22 02:39:57 2005 Minero Aoki <aamine@loveruby.net>
-
- * lib/fileutils.rb (rm_r): new option :secure to avoid
- time-to-check-to-time-to-use security problem. [ruby-dev:26100]
-
- * lib/fileutils.rb (remove_file, remove_dir): try chmod(700) only
- on Windows.
-
- * lib/fileutils.rb: does not depend on find.rb.
-
- * lib/fileutils.rb: new method chmod_R.
-
- * lib/fileutils.rb (chown_R): did not work.
-
-Sat May 21 10:23:21 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Sat May 21 10:24:21 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* bcc32/Makefile.sub: tds files were not deleted when DESTDIR
included '\' path delimiter. [ruby-dev:26193]
-Fri May 20 15:52:18 2005 Shugo Maeda <shugo@ruby-lang.org>
-
- * ext/readline/readline.c (readline_attempted_completion_function):
- return 2 items if completion_proc returns only 1 item (for libedit).
-
-Fri May 20 01:24:33 2005 Shugo Maeda <shugo@ruby-lang.org>
+Thu May 19 19:04:29 2005 speakillof <speakillof@yahoo.co.jp>
- * ext/readline/extconf.rb: check rl_vi_editing_mode() and
- rl_emacs_editing_mode().
-
-Thu May 19 23:33:09 2005 Shugo Maeda <shugo@ruby-lang.org>
-
- * ext/readline/readline.c: supported libedit. fixed: [ruby-core:4858]
-
- * ext/readline/extconf.rb: added new option --enable-libedit.
-
- * test/readline/test_readline.rb: added assertions for
- Readline::HISTORY.
-
- * lib/irb/input-method.rb: do not use Readline::HISTORY.pop.
+ * lib/rexml/encodings/SHIFT-JIS.rb: encoding and decoding were
+ swapped. [ruby-core:4772]
Wed May 18 23:42:25 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* error.c (exc_exception): reverted to call Exception#initialize
directly. fixed: [ruby-dev:26177]
-Wed May 18 17:38:51 2005 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * dir.c (glob_helper): check whether path is "" before calling
- do_opendir. [ruby-dev:26183]
-
-Wed May 18 13:40:48 2005 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (NtInitialize): fix typo.
-
-Wed May 18 11:07:47 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed May 18 23:39:09 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* dir.c (glob_helper): get rid of using String. [ruby-dev:26180]
+ * dir.c (push_braces): should skip balanced braces.
+
* eval.c (ruby_options), win32/win32.c (NtInitialize): move argument
intialization back. [ruby-dev:26180]
-Tue May 17 11:49:18 2005 NAKAMURA Usaku <usa@ruby-lang.org>
+Tue May 17 15:31:31 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * lib/webrick/httpserver.rb (WEBrick::HTTPServer#run): should
+ break the loop if the socket reached to EOF. [ruby-talk:142285]
+
+Tue May 17 11:52:18 2005 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/win32.c (unixtime_to_filetime): use localtime() instead of
gmtime() when using FileLocalTimeToFileTime().
-Mon May 16 22:42:52 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon May 16 22:28:43 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* win32/win32.h, {bcc32,win32,wince}/Makefile.sub: moved rb_[ugp]id_t
to get rid of redefinition warnings on mingw.
@@ -53846,12 +10979,7 @@ Mon May 16 22:42:52 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* class.c (rb_class_init_copy): singleton class is disallowed to copy,
from its definition. fixed: [ruby-talk:142749]
- * parse.y (pragma_encoding): add prototype to suppress false warning
- by VC.
-
- * process.c (proc_spawn_v): use rb_w32_aspawn on Win32.
-
-Mon May 16 03:29:01 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Mon May 16 08:52:29 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* win32/win32.{h,c}: define rb_[pgu]id_t.
@@ -53861,7 +10989,7 @@ Mon May 16 00:21:02 2005 Tanaka Akira <akr@m17n.org>
Errno::EISDIR because EISDIR is not portable.
[ruby-core:5001]
-Sun May 15 22:28:10 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+Sun May 15 22:11:33 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
* lib/drb/drb.rb (DRbObject#method_missing): use raise(exception).
[ruby-dev:26164]
@@ -53886,7 +11014,7 @@ Sat May 14 23:59:11 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* error.c (exc_exception, {exit,name_err,syserr}_initialize): call
Execption#initialize. fixed: [ruby-talk:142593]
-Sat May 14 23:56:41 2005 Erik Huelsmann <ehuels@gmail.com>
+Sat May 14 23:57:26 2005 Erik Huelsmann <ehuels@gmail.com>
* configure.in: Check for the availability of pid_t, gid_t and uid_t and
remove AC_TYPE_UID_T. fixed: [ruby-core:04745]
@@ -53911,16 +11039,6 @@ Sat May 14 23:56:41 2005 Erik Huelsmann <ehuels@gmail.com>
* wince/sys/types.h: Remove definitions of {p,g,u}id_t.
-Sat May 14 11:47:57 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * intern.h (ruby_pragma): prototype. [ruby-core:04881]
-
- * parse.y (parser_pragma): parse Emacsen hack.
-
- * parse.y (parser_prepare): deal with specific syntax at the top.
-
- * ruby.c (load_file): read the first line iff it started with shebang.
-
Fri May 13 23:44:22 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/extmk.rb: keep srcdir unexpanded.
@@ -53932,45 +11050,87 @@ Fri May 13 23:44:22 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
also INSTALL_PROG and INSTALL_DATA system dependent.
fixed: [ruby-core:04931]
-Fri May 13 23:32:55 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (unknown_node): add volatile directive to prototype.
-
-Fri May 13 17:50:49 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Fri May 13 17:54:39 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* variable.c (generic_ivar_get): rb_attr_get should not warn.
[ruby-dev:26010]
-Thu May 12 17:41:00 2005 NARUSE, Yui <naruse@ruby-lang.org>
+Fri May 13 12:28:43 2005 Daniel Berger <djberge@qwest.com>
- * ext/nkf/nkf-utf8/nkf.c: follow nkf 2.0.5
+ * array.c (rb_ary_select): can remove argc check. [ruby-core:4911]
+
+ * test/ruby/test_array.rb: add test for find_all.
+
+Fri May 13 11:29:00 2005 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * eval.c (unknown_node): add volatile directive to prototype.
+
+Thu May 12 17:08:48 2005 Tanaka Akira <akr@m17n.org>
-Thu May 12 16:50:40 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+ * io.c (rb_io_eof, remain_size, read_all, io_read, appendline)
+ (swallow, rb_io_each_byte, rb_io_getc): revert previous change.
+
+ * io.c (rb_io_eof, io_fread, appendline, swallow, rb_io_each_byte)
+ (rb_io_getc, rb_getc): call clearerr before getc to avoid
+ stdio incompatibility.
+
+Thu May 12 16:52:20 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* lib/rdoc/parsers/parse_c.rb: more readability for mixing
progress "c..." and warning message.
-Thu May 12 15:50:56 2005 Tilman Sauerbeck <tilman@code-monkey.de>
+Thu May 12 16:31:00 2005 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * ext/nkf/nkf-utf8/nkf.c: follow nkf 2.0.5
+
+Thu May 12 16:15:01 2005 Tanaka Akira <akr@m17n.org>
+
+ * io.c (rb_io_eof, remain_size, read_all, io_read, appendline)
+ (swallow, rb_io_each_byte, rb_io_getc): don't rely EOF flag.
+ [ruby-talk:141527]
+
+Thu May 12 15:56:20 2005 Tilman Sauerbeck <tilman@code-monkey.de>
* lib/rdoc/parsers/parse_c.rb: show parsing progress for C files.
[ruby-core:4341]
+Thu May 12 13:47:56 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+
+ * test/drb/test_drb{ssl,unix}.rb: can test drb
+ before install. (backported from HEAD) [ruby-dev:26146]
+
Thu May 12 09:53:57 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* version.c (ruby_show_version): flush for non-tty stdout.
+Thu May 12 09:07:07 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+
+ * test/ruby/envutil.rb, test/drb/drbtest.rb: can test drb
+ before install. (backported from HEAD) [ruby-Bugs-1672]
+
Thu May 12 01:23:55 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * eval.c (rb_eval), parse.y (arg): reduce fixnum range literal at
+ parser. fixed: [ruby-dev:26113]
+
* eval.c (unknown_node): ignore broken NODE to get rid of accessing
possibly inaccessible address. fixed: [ruby-dev:26122]
should emit more useful information like [ruby-dev:26126], though.
+Wed May 11 16:20:01 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * lib/webrick/cgi.rb: new methods WEBrick::CGI#[], WEBrick::CGI#logger
+ and WEBrick::CGI#config. (backported from HEAD)
+
+ * lib/webrick/httputils.rb (WEBrick::HTTPUtils.escape_path): should
+ not use String#split("/"). (backported from HEAD)
+
Wed May 11 15:58:39 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (break_jump): break should not cross functions.
[ruby-list:40818]
-Wed May 11 10:41:54 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Wed May 11 10:39:37 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* lib/tempfile.rb (Tempfile#unlink): fixed typo.
@@ -53983,12 +11143,7 @@ Sun May 8 23:17:47 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tk/timer.rb: fix typo.
-Sun May 8 21:00:50 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * hash.c (Init_Hash): remove custom "hash" and "eql?".
- (ported from 1.8) [ruby-dev:26132]
-
-Sun May 8 16:50:25 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Sun May 8 16:52:56 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* lib/profiler.rb: fixed "undefined method `[]' for nil:NilClass"
[ruby-core:4775] [ruby-talk:140401] [ruby-dev:26118]
@@ -53997,54 +11152,11 @@ Sat May 7 22:58:00 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (have_var): no libs argument is given.
-Fri May 6 08:08:37 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * hash.c:rb_hash_hash_i() should be static. [ruby-core:04815]
-
- * re.c should include regint.h for declarations of oniguruma
- functions. [ruby-core:04815]
-
-Sun May 1 09:15:17 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun May 1 09:58:11 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ruby.c (process_sflag): replace '-' in variable names with '_'.
[ruby-dev:26107]
- * eval.c (rb_eval), parse.y (arg): reduce fixnum range literal at
- parser. fixed: [ruby-dev:26113]
-
-Sat Apr 30 11:59:25 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (RUBY_FUNC_ATTRIBUTE): check for function attribute.
- [ruby-dev:26109]
-
- * eval.c, gc.c: moved noinline to configure.in.
-
- * rubyio.h (DEPRECATED): moved to configure.in.
-
- * ruby.h (DEPRECATED, NOINLINE): default definition.
-
- * win{32,ce}/Makefile.sub (config.h): deprecated and noinline for
- __declspec() are available for VC++7 or later.
-
-Sat Apr 30 06:57:39 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/webrick/cgi.rb: new methods WEBrick::CGI#[], WEBrick::CGI#logger
- and WEBrick::CGI#config. these are necessary to use an instance of
- WEBrick::CGI as the first argument of HTTPServlet#get_instance.
- (suggested by Tatsuki Sugiura)
-
- * lib/webrick/cgi.rb
- (WEBrick::CGI#initalize): set a dummy to @config[:ServerSoftware]
- if SERVER_SOFTWARE environment variable is not given.
- (WEBrick::CGI#start): req.path_info must be a String.
- (WEBrick::CGI::Socket#request_line): treat REQUEST_METHOD, PATH_INFO
- and SCRIPT_NAME to run in console.
-
- * lib/webrick/httputils.rb (WEBrick::HTTPUtils.escape_path): should
- not use String#split("/"). it removes trailing empty path component.
-
-Thu Apr 28 08:21:51 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
* ruby.c (set_arg0): use also environment variable space for setting
$0. [ruby-core:04774]
@@ -54055,46 +11167,23 @@ Wed Apr 27 23:42:22 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
Tue Apr 26 22:58:00 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * ext/tk/tcltklib.c (ip_invoke_core): call Tcl's "::unknown"
+ * ext/tcltklib/tcltklib.c (ip_invoke_core): call Tcl's "::unknown"
command when can't get information of target command.
-Mon Apr 25 13:54:55 2005 speakillof <speakillof@yahoo.co.jp>
-
- * lib/rexml/encodings/SHIFT-JIS.rb: encoding and decoding were
- swapped. [ruby-core:4772]
-
Mon Apr 25 01:18:43 2005 Tanaka Akira <akr@m17n.org>
- * oniguruma.h (OnigWarnFunc): add a variadic argument.
- [ruby-core:4751]
+ * regex.c: declare rb_warn to have variadic argument. [ruby-core:4751]
-Sat Apr 23 19:49:21 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Sat Apr 23 19:45:59 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * ext/tk/tcltklib.c (ip_RubyExitCommand): exit with status code
+ * ext/tcltklib/tcltklib.c (ip_RubyExitCommand): exit with status code
via TclTkIp#_eval didn't work. [ruby-talk:139390]
-Sat Apr 23 11:45:29 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_provided): should check also path name to be loaded.
- fixed: [ruby-dev:26093]
-
-Fri Apr 22 16:55:35 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * ext/tk/tcltklib.c (ip_set_exc_message): fixed memory leak.
-
- * ext/tk/tcltklib.c: eTkCallbackReturn was not initialized.
+Fri Apr 22 16:41:50 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-Thu Apr 21 06:45:28 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/tcltklib/tcltklib.c (ip_set_exc_message): fixed memory leak.
- * ruby.c (ruby_incpush_expand, proc_options): expand relative path
- given with -I option. [ruby-dev:26090]
-
- * configure.in, lib/mkmf.rb, {bcc32,win32,wince}/Makefile.sub: improve
- C++ support. [ruby-dev:26089]
-
-Thu Apr 21 01:53:09 2005 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/http.rb: add rdoc.
+ * ext/tcltklib/tcltklib.c: eTkCallbackReturn was not initialized.
Thu Apr 21 00:07:50 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
@@ -54108,7 +11197,7 @@ Thu Apr 21 00:07:50 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
Wed Apr 20 23:22:39 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * Makefile.in, common.mk: miniruby depends on MINIOBJS.
+ * Makefile.in, common.mk: miniruby depens on MINIOBJS.
* dmydln.c (dln_load): dummy function to raise LoadError.
@@ -54119,21 +11208,6 @@ Wed Apr 20 23:01:35 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* win32/ifchange.bat: delete testing files.
-Wed Apr 20 22:54:54 2005 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/http.rb: new method Net::HTTP.post_form.
-
- * lib/net/http.rb: new method Net::HTTPHeader#set_form_data and
- its alias #form_data=.
-
- * lib/net/http.rb: Net::HTTPHeader#add_header -> add_field
- (adjustted to Ruby 1.8).
-
-Wed Apr 20 10:53:30 2005 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * lib/rdoc/parsers/parse_rb.rb (lex_init): use IRB module.
- [ruby-core:04737]
-
Wed Apr 20 07:27:18 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* {bcc32,win32,wince}/configure.bat, {bcc32,win32,wince}/setup.mak:
@@ -54141,33 +11215,18 @@ Wed Apr 20 07:27:18 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* bcc32/setup.mak: make configuration variables overridable.
-Tue Apr 19 23:37:09 2005 WATANABE Hirofumi <eban@ruby-lang.org>
+Wed Apr 20 04:15:27 2005 Keiju Ishitsuka <keiju@ruby-lang.org>
- * lib/ftools.rb (File.safe_unlink): do not modify a symlinked file.
+ * lib/irb.rb lib/irb/* doc/irb: IRB 0.9.5
-Tue Apr 19 23:02:40 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (search_required): deal with features with path too.
-
- * intern.h (rb_file_expand_path): prototype. fixed: [ruby-dev:26082]
-
-Tue Apr 19 08:38:07 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Apr 19 23:37:09 2005 WATANABE Hirofumi <eban@ruby-lang.org>
- * eval.c (search_required, rb_require_safe): expand path in
- rb_features. [ruby-dev:26079]
+ * lib/ftools.rb (File.safe_unlink): do not modify a symlinked file.
- * file.c (rb_find_file_ext): return absolute path.
+Tue Apr 19 00:06:20 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/extmk.rb: expand path for ext/**/extconf.rb.
- * eval.c (search_required): handle static linked extensions.
-
-Mon Apr 18 15:37:35 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_attr): attribute name check added.
-
- * numeric.c (flo_plus): small typo fix.
-
Mon Apr 18 11:25:14 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* ext/zlib/zlib.c (zstream_run): fixed SEGV. [ruby-core:4712]
@@ -54194,7 +11253,7 @@ Sat Apr 16 15:27:03 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* mkconfig.rb: purge autoconf value variables.
-Sat Apr 16 10:33:48 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Sat Apr 16 10:36:01 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* bcc32/Makefile.sub: quick hack... prepend DESTDIR.
still have restriction on DESTDIR ("", "/", "e:")
@@ -54205,55 +11264,18 @@ Sat Apr 16 03:59:42 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
* ext/openssl/openssl_missing.h: ditto.
-Fri Apr 15 22:40:19 2005 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/tests/testWIN32OLE.rb: add test for WIN32OLE.codepage=
-
- * ext/win32ole/tests/testOLETYPELIB.rb: correct expected message.
-
-Fri Apr 15 22:04:07 2005 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c(ole_invoke): retry after converting Qnil
- to VT_EMPTY.
-
-Thu Apr 14 19:05:06 2005 Minero Aoki <aamine@loveruby.net>
-
- * parse.y [ripper] (regexp): dispatch regexp option.
- [ruby-Bugs:1688]
-
- * ext/ripper/lib/core.rb: regenerated (interface changed).
-
-Thu Apr 14 18:59:43 2005 Minero Aoki <aamine@loveruby.net>
+Thu Apr 14 19:18:30 2005 Minero Aoki <aamine@loveruby.net>
* lib/fileutils.rb (remove_file): ignore exceptions caused by
chmod.
* lib/fileutils.rb (remove_dir): try to get rights to rmdir.
- [ruby-Bugs:1502]
-
-Thu Apr 14 18:51:02 2005 Keiju Ishitsuka <keiju@ruby-lang.org>
-
- * lib/irb/ruby-lex.rb, lib/irb/slex.rb: bug fix of [ruby-Bugs-1745]
-
- * lib/irb/ext/loader.rb, lib/irb/ext/save-history.rb:
- fix location of @RCS_ID
-
- * lib/irb/cmd/help.rb: a lost of release IRB 0.9.5.
-
-Thu Apr 14 15:10:30 2005 Keiju Ishitsuka <keiju@ruby-lang.org>
-
- * lib/irb/notifier.rb, lib/irb/output-method.rb, lib/irb/ext/history.rb
- fixed warning of 'ruby -w'
-
-Thu Apr 14 05:35:45 2005 Keiju Ishitsuka <keiju@ruby-lang.org>
-
- * doc/irb/irb.rd.ja: a lost of release IRB 0.9.5.
+ [ruby-Bugs:1502] (2 items backportted from HEAD, rev 1.53-54)
- * lib/irb/slex.rb: bug fix by [ruby-core:04707].
+Thu Apr 14 16:57:40 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Thu Apr 14 00:20:31 2005 Keiju Ishitsuka <keiju@ruby-lang.org>
-
- * bin/irb lib/irb.rb lib/irb/...: IRB 0.9.5.
+ * bcc32/Makefile.sub: failed to remove debug information files.
+ fixed: [ruby-dev:26034]
Wed Apr 13 23:40:21 2005 Kouhei Sutou <kou@cozmixng.org>
@@ -54262,44 +11284,33 @@ Wed Apr 13 23:40:21 2005 Kouhei Sutou <kou@cozmixng.org>
* lib/rss/rss.rb (RSS::Element#converter): fixed converter
transmission bug.
-Wed Apr 13 22:12:16 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/optparse.rb (OptionParser#order!): call handlers iff matches
- non-switch.
-
Wed Apr 13 21:20:35 2005 WATANABE Hirofumi <eban@ruby-lang.org>
* configure.in (mingw32): extract msvcr*.dll from objdump result.
-Wed Apr 13 19:25:31 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Apr 13 20:24:30 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (mingw32): use actual runtime DLL name as ruby DLL
name and default load path.
* win32/Makefile.sub, win32/setup.mak: ditto.
-Tue Apr 12 19:30:36 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/optparse.rb (OptionParser#make_switch, OptionParser#order!):
- added non-option and end-of-args handler. [ruby-talk:136878]
- [EXPERIMENTAL]
-
Tue Apr 12 15:33:09 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * ext/tk/tcltklib.c (ip_finalize): better modification than the
+ * ext/tcltklib/tcltklib.c (ip_finalize): better modification than the
previous commit [ruby-dev:26029].
Tue Apr 12 12:38:06 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * ext/tk/tcltklib.c (ip_finalize): fix SEGV when Tcl_GlobalEval()
+ * ext/tcltklib/tcltklib.c (ip_finalize): fix SEGV when Tcl_GlobalEval()
modifies the argument string to eval.
Tue Apr 12 02:21:55 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * ext/tk/tcltklib.c (ip_finalize): add existence check of
+ * ext/tcltklib/tcltklib.c (ip_finalize): add existence check of
Tcl commands before calling Tcl_GlobalEval().
-Mon Apr 11 23:36:04 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+Mon Apr 11 23:47:21 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
* lib/drb/drb.rb: [druby-ja:123] fix: When reference of my object is
loaded, the object is tainted.
@@ -54312,13 +11323,28 @@ Mon Apr 11 22:18:23 2005 WATANABE Hirofumi <eban@ruby-lang.org>
Mon Apr 11 20:11:06 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * ext/tk/tcltklib.c (ip_finalize): adhoc patch to avoid SEGV when exit
- on Tcl/Tk8.3.x.
+ * ext/tcltklib/tcltklib.c (ip_finalize): adhoc patch to avoid SEGV
+ when exit on Tcl/Tk8.3.x.
-Mon Apr 11 15:24:20 2005 NAKAMURA Usaku <usa@ruby-lang.org>
+Mon Apr 11 15:26:25 2005 NAKAMURA Usaku <usa@ruby-lang.org>
* lib/mkmf.rb (configuration): shouldn't output hdrdir twice.
+Mon Apr 11 12:09:05 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+
+ * {bcc32,win32,wince}/Makefile.sub: ri data was not installed
+ into correct path. [ruby-dev:26011]
+
+ * bcc32/Makefile.sub: defaulted install-nodoc. [ruby-dev:26011]
+
+Sun Apr 10 10:12:42 2005 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+ * ext/win32ole/win32ole.c(ole_invoke): retry after converting Qnil
+ to VT_EMPTY.
+
+ * ext/win32ole/win32ole/tests/testWIN32OLE.rb: correct error
+ message string "Unknown" => "unknown".
+
Sat Apr 9 18:20:31 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tk/image.rb: support to create TkImage object without
@@ -54338,41 +11364,68 @@ Sat Apr 9 14:42:29 2005 Kouhei Sutou <kou@cozmixng.org>
* sample/rss/tdiary_plugin/rss-recent.rb: supported configuration
via Web browser.
-Fri Apr 8 20:17:48 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat Apr 9 11:59:57 2005 Kouhei Sutou <kou@cozmixng.org>
- * ext/extmk.rb (extmake): hdrdir needs to be defined also in
- Config::CONFIG.
+ * lib/rss: backoported from HEAD.
- * lib/mkmf.rb (configuration, create_makefile): get rid of recursive
- macro reference.
+ * lib/rss: refactored.
+ - gave a name to 'x'.
+ - undef_method -> remove_method for avoiding a warning in ruby 1.6.
-Fri Apr 8 01:55:20 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * lib/rss/parser.rb: @@setter -> @@setters.
- * ext/tk/sample/demos-{en,jp}/goldberg.rb: reduced window size.
- [ruby-dev:25992]
+ * lib/rss/parser.rb
+ (RSS::BaseListener.register_uri)
+ (RSS::BaseListener.uri_registered?)
+ (RSS::BaseListener.install_get_text_element):
+ swapped the first argument and the second argument.
-Thu Apr 7 23:58:40 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/rss/taxonomy.rb: swapped the first argument and the second
+ argument for RSS::BaseListener.install_get_text_element.
+ * lib/rss/image.rb: ditto.
+ * lib/rss/syndication.rb: ditto.
+ * lib/rss/dublincore.rb: ditto.
+ * lib/rss/parser.rb: ditto.
+ * lib/rss/1.0.rb: ditto.
+ * lib/rss/2.0.rb: ditto.
+ * lib/rss/0.9.rb: ditto.
+ * lib/rss/content.rb: ditto.
- * ext/extmk.rb (extmake): keep directory names in Makefile as macros.
+ * lib/rss/parser.rb
+ (RSS::BaseListener.install_setter)
+ (RSS::BaseListener.register_uri): changed fallback way.
- * lib/mkmf.rb (configuration, create_makefile): ditto.
+ * lib/rss/parser.rb: added class name registry for complex model
+ elements. (ex. have childlen elements, have some attributes and
+ a child element and so on.)
- * lib/mkmf.rb (CXX_EXT): separate C++ extensions.
+ * lib/rss/dublincore.rb: supported multiple Dublin Core items.
+ * lib/rss/maker/dublincore.rb: ditto.
-Thu Apr 7 17:24:17 2005 Shugo Maeda <shugo@ruby-lang.org>
+ * lib/rss/maker/image.rb: supproted new Dublin Core API.
- * eval.c (rb_call0): "return" event hook should be always executed
- if event_hooks is set.
+ * lib/rss/maker/base.rb: added default current_element implementation.
+
+ * lib/rss/trackback.rb (RSS::TrackBackUtils.new_with_value_if_need):
+ moved to RSS::Utils.
-Thu Apr 7 14:33:09 2005 Kouhei Sutou <kou@cozmixng.org>
+ * lib/rss/utils.rb (RSS::Utils.new_with_value_if_need):
+ moved from RSS::TrackBackUtils.
- * test/rss/test_maker_dc.rb (test_date): added a test for #date=
- and #dc_date=.
+ * lib/rss/maker/image.rb: fixed invalid argument of
+ add_need_initialize_variable bug.
+ * lib/rss/maker/trackback.rb: ditto.
+
+ * lib/rss/rss.rb (Hash#merge): added for ruby 1.6.
-Thu Apr 7 11:49:53 2005 Kouhei Sutou <kou@cozmixng.org>
+ * lib/rss/rss.rb (RSS::BaseModel.date_writer): changed to accept nil
+ for date value.
- * lib/rss/maker/dublincore.rb: _really_ supported multiple Dublin
- Core items.
+ * test/test_dublincore.rb: added tests for plural accessor and
+ multiple Dublin Core items.
+
+ * test/test_setup_maker_1.0.rb: fixed swapped actual and expected
+ values.
* test/rss/rss-assertions.rb (assert_multiple_dublin_core): added
an assertion for testing multiple Dublin Core items.
@@ -54380,18 +11433,8 @@ Thu Apr 7 11:49:53 2005 Kouhei Sutou <kou@cozmixng.org>
* test/rss/test_maker_dc.rb (test_rss10_multiple): added a test
for making multiple Dublin Core items.
-Wed Apr 6 16:06:30 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * test/ruby/test_env.rb (test_key): should test ENV.key instead of
- ENV.index. [ruby-dev:25994]
-
-Tue Apr 5 16:01:12 2005 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/*: refactored.
- - gave a name to 'x'.
- - undef_method -> remove_method for avoiding a warning in ruby 1.6.
-
-Tue Apr 5 15:45:33 2005 Kouhei Sutou <kou@cozmixng.org>
+ * test/rss/test_maker_dc.rb (test_date): added a test for #date=
+ and #dc_date=.
* sample/rss/tdiary_plugin/rss-recent.rb:
new option: @options['rss-recent.use-image-link']:
@@ -54400,42 +11443,54 @@ Tue Apr 5 15:45:33 2005 Kouhei Sutou <kou@cozmixng.org>
* sample/rss/tdiary_plugin/rss-recent.rb (RSS_RECENT_VERSION):
0.0.5 -> 0.0.6.
-Tue Apr 5 15:15:26 2005 Kouhei Sutou <kou@cozmixng.org>
+Fri Apr 8 20:17:48 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/rss/dublincore.rb: supported multiple Dublin Core items.
+ * ext/extmk.rb (extmake): hdrdir needs to be defined also in
+ Config::CONFIG.
- * lib/rss/parser.rb: added class name registry for complex model
- elements. (ex. have childlen elements, have some attributes and
- a child element and so on.)
+ * lib/mkmf.rb (configuration, create_makefile): get rid of recursive
+ macro reference.
- * lib/rss/maker/base.rb: added default current_element implementation.
+Fri Apr 8 18:26:56 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
- * lib/rss/maker/dublincore.rb: supported multiple Dublin Core
- items.
+ * ext/openssl/ossl_ssl.c: add callbacks to OpenSSL::SSL::SSLContexts.
+ - SSLContext#client_cert_cb=(aProc). it is called when a client
+ certificate is requested by a server and no certificate was not
+ set for the SSLContext. it must return an Array which includes
+ OpenSSL::X509::Certificate and OpenSSL::PKey::RSA/DSA objects.
+ - SSLContext#tmp_dh_callback=(aProc). it is called in key
+ exchange with DH algorithm. it must return an OpenSSL::PKey::DH
+ object.
- * lib/rss/maker/image.rb: supproted new Dublin Core API.
+ * ext/openssl/ossl_ssl.c (ossl_sslctx_set_ciphers): ignore the
+ argument if it's nil.
- * lib/rss/trackback.rb (RSS::TrackBackUtils.new_with_value_if_need):
- moved to RSS::Utils.
+ * ext/openssl/ossl_pkey.c
+ (GetPrivPKeyPtr, ossl_pkey_sign): should call rb_funcall first.
+ (DupPrivPKeyPtr): new function.
- * lib/rss/utils.rb (RSS::Utils.new_with_value_if_need):
- moved from RSS::TrackBackUtils.
+ * ext/openssl/ossl_pkey_dh.c: add default DH parameters.
- * lib/rss/maker/image.rb: fixed invalid argument of
- add_need_initialize_variable bug.
+ * ext/openssl/ossl_pkey.h: ditto.
- * lib/rss/maker/trackback.rb: ditto.
+Fri Apr 8 01:55:20 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * lib/rss/rss.rb (Hash#merge): added for ruby 1.6.
+ * ext/tk/sample/demos-{en,jp}/goldberg.rb: reduced window size.
+ [ruby-dev:25992]
- * lib/rss/rss.rb (RSS::BaseModel.date_writer): changed to accept nil
- for date value.
+Thu Apr 7 23:58:40 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/test_dublincore.rb: added tests for plural accessor and
- multiple Dublin Core items.
+ * ext/extmk.rb (extmake): keep directory names in Makefile as macros.
- * test/test_setup_maker_1.0.rb: fixed swapped actual and expected
- values.
+ * lib/mkmf.rb (configuration, create_makefile): ditto.
+
+ * lib/mkmf.rb (CXX_EXT): separate C++ extensions.
+
+Thu Apr 7 17:43:25 2005 Shugo Maeda <shugo@ruby-lang.org>
+
+ * eval.c (rb_call0): "return" event hook should be always executed
+ if event_hooks is set. fixed: [ruby-core:04662]
+ (backported from HEAD)
Mon Apr 4 23:17:52 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
@@ -54450,6 +11505,11 @@ Mon Apr 4 10:26:48 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* ext/tk/lib/tk/dialog.rb: fixed typo.
+Sun Apr 3 17:16:33 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+
+ * win32/win32.{h,c} (rb_w32_fdopen): avoid warning on bcc32.
+ (backported from HEAD)
+
Sat Apr 2 23:38:54 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (CP, INSTALL): get rid of less portable options.
@@ -54457,8 +11517,8 @@ Sat Apr 2 23:38:54 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (configuration, create_makefile): correct configuration
variable.
- * wince/configure.bat, wince/setup.mak: add prefix, extstatic and
- rdoc options.
+ * {bcc32,win32,wince}/{Makefile.sub,setup.mak}: leave prefix empty in
+ config.status for backward compatibility. fixed: [ruby-core:04649]
* lib/mkmf.rb (create_makefile): ensure library directories get made
before copying libraries there.
@@ -54477,11 +11537,6 @@ Sat Apr 2 16:59:46 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tk/autoload.rb: add autoload entry 'TkDialogObj' and
'TkWarningObj'
-Sat Apr 2 13:23:17 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * hash.c (env_key): ENV.index is deprecated as well as Hash#index.
- use ENV.key instead. [ruby-dev:25974]
-
Sat Apr 2 02:19:11 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tk.rb (TkWindow.initialize): accept 'without_creating'
@@ -54498,39 +11553,12 @@ Thu Mar 31 22:23:51 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* README.EXT, README.EXT.ja (Appendix C): utility functions.
-Thu Mar 31 14:08:43 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Thu Mar 31 14:15:44 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
* ext/openssl/ossl_engine.c (ossl_engine_s_load): should return
value. [ruby-dev:25971]
-Thu Mar 31 11:07:50 2005 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/parser.rb: @@setter -> @@setters.
-
- * lib/rss/parser.rb
- (RSS::BaseListener.register_uri)
- (RSS::BaseListener.uri_registered?)
- (RSS::BaseListener.install_get_text_element):
- swapped the first argument and the second argument.
-
- * lib/rss/taxonomy.rb: swapped the first argument and the second
- argument for RSS::BaseListener.install_get_text_element.
- * lib/rss/image.rb: ditto.
- * lib/rss/syndication.rb: ditto.
- * lib/rss/dublincore.rb: ditto.
- * lib/rss/parser.rb: ditto.
- * lib/rss/1.0.rb: ditto.
- * lib/rss/2.0.rb: ditto.
- * lib/rss/0.9.rb: ditto.
- * lib/rss/content.rb: ditto.
-
-Thu Mar 31 11:00:36 2005 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/parser.rb
- (RSS::BaseListener.install_setter)
- (RSS::BaseListener.register_uri): changed fallback way.
-
-Thu Mar 31 08:25:40 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Mar 31 08:25:50 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* common.mk (RUBYOPT): clear for the environment RubyGems installed.
@@ -54544,10 +11572,21 @@ Thu Mar 31 06:00:20 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
error even if the specified engine could not be loaded. (Dynamic
engines don't have fixed name to load.)
+Thu Mar 31 00:18:27 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+
+ * win32/ifchange.bat, win32/rm.bat: backported from HEAD.
+
+Wed Mar 30 23:44:50 2005 Nobuyoshi Nakada <nobu.nokada@softhome.net>
+
+ * Makefile.in, */Makefile.sub, */configure.bat,
+ cygwin/GNUmakefile.in, common.mk, configure.in, ext/extmk.rb,
+ lib/mkmf.rb, instruby.rb, runruby.rb: backport extout.
+ [ruby-dev:25963]
+
Wed Mar 30 17:41:48 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * ext/tk/tcltklib.c: add TclTkIp#_create_console() method to create
- a Tcl/Tk's console window.
+ * ext/tcltklib/tcltklib.c: add TclTkIp#_create_console() method to
+ create a Tcl/Tk's console window.
* ext/tk/lib/multi-tk.rb: support TclTkIp#_create_console() method.
@@ -54561,12 +11600,12 @@ Wed Mar 30 17:41:48 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/sample/tkextlib/**: ditto.
-Tue Mar 29 22:20:49 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+Tue Mar 29 22:11:56 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
* test/rinda/test_rinda.rb: use DRbObject.new_with instead of reinit.
[ruby-dev:25961]
-Tue Mar 29 00:04:57 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+Mon Mar 28 23:40:40 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
* lib/drb/drb.rb: move method DRbObject#reinit to DRbObject.new_with.
extract method DRbObject.prepare_backtrace. add DRb.regist_server,
@@ -54575,23 +11614,15 @@ Tue Mar 29 00:04:57 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
* lib/drb/gw.rb: ditto.
-Mon Mar 28 20:53:44 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/extmk.rb (extract_makefile): nothing to be removed when no file
- was deleted.
+Mon Mar 28 20:43:34 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/extmk.rb (extmake): restore srcdir.
+ * ext/syck/rubyext.c: get rid of warnings caused by a bug of VC.
Mon Mar 28 08:39:49 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/iconv/iconv.c (iconv_create): Iconv::Failure requires 3
arguments. (pointed out by NaHi)
-Sun Mar 27 00:56:58 2005 Minero Aoki <aamine@loveruby.net>
-
- * lib/fileutils.rb (remove_file): ignore Errno::E* if force option
- is set. [ruby-dev:25944]
-
Sat Mar 26 22:51:33 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tk.rb (_callback_entry_class?): add for checking whether
@@ -54647,26 +11678,31 @@ Thu Mar 24 23:10:44 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (check_sizeof): refine logging messages.
-Wed Mar 23 19:08:10 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Thu Mar 24 03:57:48 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
* lib/webrick/utils.rb (WEBrick::Utils.create_listeners):
- should raise ArgumentError if no port is specified.
- even if the specified port is 0, all TCPServers should be
- initialized with the port given to the first one.
+ initialized with the port given to the first one.
* lib/webrick/server.rb (WEBrick::GenericServer#initialize): if :Port
parameter is 0, it should be updated with the port number which
- ectually listened.
-
-Wed Mar 23 16:12:40 2005 Shugo Maeda <shugo@ruby-lang.org>
+ actually listened.
- * parse.y (primary): fix lineno of rescue and ensure.
-
-Wed Mar 23 00:39:05 2005 Shugo Maeda <shugo@ruby-lang.org>
+Wed Mar 23 00:35:10 2005 Shugo Maeda <shugo@ruby-lang.org>
* test/ruby/test_settracefunc.rb (test_event): added tests for
"class" and "end" and "raise".
+Tue Mar 22 22:40:18 2005 Shugo Maeda <shugo@ruby-lang.org>
+
+ * eval.c (rb_call0): check event_hooks instead of trace_func.
+
+Tue Mar 22 17:30:44 2005 Shugo Maeda <shugo@ruby-lang.org>
+
+ * eval.c (rb_add_event_hook): new function to add a hook function for
+ interpreter events. (backported form HEAD)
+
Sun Mar 20 22:51:19 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (mkmf_failed): check if Makefile is created without
@@ -54692,42 +11728,28 @@ Thu Mar 17 17:42:13 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* struct.c (inspect_struct): ditto.
-Wed Mar 16 23:39:13 2005 Shugo Maeda <shugo@ruby-lang.org>
-
- * test/ruby/test_settracefunc.rb: added test for c-return.
-
-Wed Mar 16 22:57:43 2005 Shugo Maeda <shugo@ruby-lang.org>
+Wed Mar 16 23:36:02 2005 Shugo Maeda <shugo@ruby-lang.org>
* eval.c (rb_call0): call_cfunc() should be protected.
- * eval.c (rb_add_event_hook): use K&R style.
+ * test/ruby/test_settracefunc.rb: added test for c-return.
- * eval.c (rb_remove_event_hook): ditto.
+Wed Mar 16 22:20:25 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-Wed Mar 16 22:03:15 2005 Shugo Maeda <shugo@ruby-lang.org>
-
- * eval.c (rb_add_event_hook): new function to add a hook function for
- interpreter events.
+ * object.c (str_to_id): fixed typo.
Wed Mar 16 18:08:32 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (rb_call0): reorganize "return" event post.
- * eval.c (return_jump): no need to post "return" event here.
-
Tue Mar 15 23:49:19 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/iconv/iconv.c (Init_iconv): InvalidEncoding also should include
Iconv::Failure.
-Tue Mar 15 23:12:36 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Mar 15 16:38:11 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * eval.c (recursive_check, recursive_push): more restrictive check.
- fixed: [ruby-dev:25916]
-
-Tue Mar 15 16:38:31 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/tkutil/tkutil.c (ary2list): give wrong arguments to hash2kv()
+ * ext/tk/tkutil.c (ary2list): give wrong arguments to hash2kv()
Mon Mar 14 19:39:33 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
@@ -54743,8 +11765,7 @@ Mon Mar 14 12:21:03 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
Mon Mar 14 08:14:56 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * object.c (str_to_id): raise ArgumentError for NUL containing
- strings.
+ * object.c (str_to_id): warn for NUL containing strings.
Mon Mar 14 00:13:49 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
@@ -54764,37 +11785,14 @@ Mon Mar 14 00:13:49 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/sample/demos-jp/tcolor: ditto.
-Sun Mar 13 22:19:17 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (recursive_pop): raise TypeError instead of fatal error.
- fixed: [ruby-dev:25843]
-
-Sun Mar 13 10:09:17 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+Sun Mar 13 10:04:17 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
* test/rinda/test_rinda.rb: remove test_gc. [ruby-dev:25871]
-Sun Mar 13 02:32:54 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/ossl_ssl.c (ossl_tmp_dh_callback): should get DH
- parameter from the current SSL object.
-
-Sun Mar 13 02:09:03 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/ossl_pkey_dh.c (ossl_create_dh): fix typo.
- patch from IWATSUKI Hiroyuki. [ruby-dev:25867]
-
- * ext/openssl/ossl_ssl.c (ossl_tmp_dh_callback): ditto.
- (ossl_call_tmp_dh_callback): ditto
-
-Fri Mar 11 03:24:59 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (primary): wrong var node was set for NODE_LAMBDA.
- [ruby-core:04555]
+Thu Mar 10 19:12:06 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-Thu Mar 10 19:10:29 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/tcltklib.c (lib_eventloop_ensure): mis-delete a timer handler
- when exit from a recursive called eventloop
+ * ext/tcltklib/tcltklib.c (lib_eventloop_ensure): mis-delete a timer
+ handler when exit from a recursive called eventloop
* ext/tk/lib/tk/timer.rb: new TkRTTimer class, which can works for a
realtime operation
@@ -54815,48 +11813,18 @@ Thu Mar 10 08:10:11 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* re.c (make_regexp): need to free internal regexp structure when
compilation fails. [ruby-talk:133228]
-Thu Mar 10 01:08:20 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (bv_decl): remove initialize rule from block local
- variable declaration.
-
-Wed Mar 9 23:55:34 2005 Tanaka Akira <akr@m17n.org>
-
- * lib/pp.rb (PP::PPMethods#guard_inspect_key): support
- __recursive_key__. [ruby-dev:25821]
-
-Wed Mar 9 19:42:21 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/ossl_ssl.c: OpenSSL::SSL::SSLContexts suports callbacks:
- - SSLContext#client_cert_cb is a Proc. it is called when a client
- certificate is requested by a server and no certificate was yet
- set for the SSLContext. it must return an Array which includes
- OpenSSL::X509::Certificate and OpenSSL::PKey::RSA/DSA objects.
- - SSLContext#tmp_dh_callback is called in key exchange with DH
- algorithm. it must return an OpenSSL::PKey::DH object.
-
- * ext/openssl/ossl_ssl.c:
- (ossl_sslctx_set_ciphers): ignore the argument if it's nil.
- (ossl_start_ssl, ossl_ssl_write): call rb_sys_fail if errno isn't 0.
- [ruby-dev:25831]
-
- * ext/openssl/ossl_pkey.c
- (GetPrivPKeyPtr, ossl_pkey_sign): should call rb_funcall first.
- (DupPrivPKeyPtr): new function.
-
- * ext/openssl/ossl_pkey_dh.c: add default DH parameters.
+Wed Mar 9 20:25:58 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
- * ext/openssl/ossl_pkey.h: ditto.
+ * ext/openssl/ossl_ssl.c (ossl_start_ssl, ossl_ssl_write): call
+ rb_sys_fail if errno isn't 0. [ruby-dev:25831]
* ext/openssl/lib/openssl/cipher.rb: fix typo. [ruby-dev:24285]
-Wed Mar 9 18:09:51 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (gettable_gen): warns if VCALL name is used as
- out-of-scope block local variable. [EXPERIMENTAL]
+Wed Mar 9 15:46:35 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
- * parse.y (opt_bv_decl): add explicit block local variable
- declaration. raises error for name conflicts. [EXPERIMENTAL]
+ * lib/webrick/server.rb (WEBrick::GenericServer#start): should
+ restore @token if accept failure. suggested by Dominique Brezinski.
+ [ruby-core:04518]
Wed Mar 9 13:37:57 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
@@ -54869,10 +11837,9 @@ Tue Mar 8 18:16:55 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
sample supports to use a text widget as if it is a I/O stream (such
like as StringIO class).
-Tue Mar 8 13:39:25 2005 NAKAMURA Usaku <usa@ruby-lang.org>
+Tue Mar 8 13:54:40 2005 NAKAMURA Usaku <usa@ruby-lang.org>
- * ext/socket/mkconstants.rb: workaround for some of 4.4BSD-Lite
- derived OSs.
+ * ext/socket/socket.c: workaround for some of 4.4BSD-Lite derived OSs.
Tue Mar 8 12:36:17 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
@@ -54880,277 +11847,161 @@ Tue Mar 8 12:36:17 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
<sroberts@uniserve.com> for getsockopt and setsockopt is merged.
[ruby-doc:824]
-Tue Mar 8 10:48:53 2005 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * eval.c (rb_exec_recursive): declaration should precede statements
- before C99.
-
-Tue Mar 8 10:05:40 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * error.c (errno_missing): Errno.const_missing to allow references
- to SyscallError exceptions not defined on the platform.
- [ruby-core:04522]
-
- * error.c (Init_syserr): Errno::NOERROR(0) for fallback exception.
-
-Tue Mar 8 01:19:00 2005 NARUSE, Yui <naruse@ruby-lang.org>
+Tue Mar 8 01:27:00 2005 NARUSE, Yui <naruse@ruby-lang.org>
* ext/nkf/nkf-utf8/nkf.c: follow nkf 1.66
fixed: [ruby-dev:25828]
-Mon Mar 7 21:29:40 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/webrick/server.rb (WEBrick::GenericServer#start): should
- restore @token if accept failure. suggested by Dominique Brezinski.
- [ruby-core:04518]
+Mon Mar 7 21:35:02 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
* sample/webrick/httpsd.rb: fix typo in comment. suggested by
Kazuhiko Shiozaki.
-Mon Mar 7 21:01:37 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_require_safe): get actual path string under safe level
- when requested. fixed: [ruby-dev:25815]
-
-Mon Mar 7 16:46:02 2005 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/openssl/ossl_ssl.c (ossl_start_ssl, ossl_ssl_read,
- ossl_ssl_write): need to set errno on Win32 platform.
-
Mon Mar 7 14:55:43 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (block_pass): should not push unique number if a block is
not an orphan. [ruby-dev:25808]
-Mon Mar 7 14:13:23 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/lib/openssl/buffering.rb (Buffering#initialize):
- should set @eof and @rbuffer.
-
-Mon Mar 7 10:28:00 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (inspect_obj): unintended space removal.
- [ruby-dev:25810]
-
- * eval.c (rb_exec_recursive): should not use NODE in disclosed
- context. [ruby-dev:25812]
-
- * io.c (rb_f_open): need not to check if to_open value is a
- T_FILE. [ruby-dev:25812]
-
-Mon Mar 7 01:21:01 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/tkutil/tkutil.c: follow the change of st.c (committed
- at Fri, 4 Mar 2005 15:47:47 +0900 by matz)
-
-Mon Mar 7 00:01:55 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+Wed Feb 16 02:55:21 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
- * ext/tk/tcltklib.c: fail to call TclTkLib.mainloop when $SAFE==4
-
-Sun Mar 6 13:04:10 2005 Dee Zsombor <zsombor@ruby-lang.org>
-
- * misc/ruby-electric.el: added.
- * misc/Readme: updated.
-
-Sun Mar 6 11:47:10 2005 Sam Roberts <sroberts@uniserve.com>
-
- * lib/pp.rb: rdoced. [ruby-core:4490]
-
-Sun Mar 6 11:36:37 2005 Tanaka Akira <akr@m17n.org>
-
- * lib/pp.rb (File::Stat#pretty_print): Etc.getpwuid and Etc.getgrgid
- may return nil. [ruby-talk:129826]
- reported by Daniel Berger.
-
-Sun Mar 6 06:34:31 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/ossl_ssl.c (ossl_start_ssl): should wait for that
- the underlying IO become readable or writable if the error was
- SSL_ERROR_WANT_READ or SSL_ERROR_WANT_WRITE. [ruby-dev:25795]
-
- * ext/openssl/ossl_ssl.c (ossl_ssl_read, ossl_ssl_write): ditto.
+ * ext/openssl/ossl_ssl.c (ossl_start_ssl, ossl_ssl_read,
+ ossl_ssl_write):
+ - need to set errno on Win32 platform.
+ - should call rb_sys_fail instead of rasing SSLError if
+ SSL_ERROR_SYSCALL occured.
+ - should wait for that the underlying IO become readable or
+ writable if the error was SSL_ERROR_WANT_READ or
+ SSL_ERROR_WANT_WRITE. [ruby-dev:25795]
* ext/openssl/lib/openssl/buffering.rb
+ (Buffering#initialize): should set @eof and @rbuffer.
+ (Buffering#fill_rbuff): should rescue Errno::EAGAIN.
(Buffering#consume_rbuf): pointless eof flag resetting is deleted.
(Buffering#read): should return an empty string if the specified
size is zero.
(Buffering#readpartial): new method.
(Buffering#readline): fix typo.
(Buffering#getc): return the first character of string correctly.
+ (Buffering#each): fix typo. suggested by Brian Ollenberger.
(Buffering#readchar): fix typo.
(Buffering#eof?): should read again it the input buffer is empty.
(Buffering#do_write): should rescue Errno::EAGAIN.
(Buffering#puts): use "\n" as the output field separator.
+ * ext/openssl/lib/openssl/ssl.rb: set non-blocking flag to the
+ underlying IO.
+
* ext/openssl/extconf.rb: get rid of GNUmakefile generation.
* text/openssl/test_pair.rb: test for IO like methods.
* test/ruby/ut_eof.rb: test about empty file.
-Sat Mar 5 17:48:31 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * dir.c (rb_glob): fixed mismatch of argument.
-
- * dir.c (fnmatch): removed unnecessary code. (by string.c 1.219)
-
- * win32/win32.c (NtInitialize): ditto. (by numeric.c 1.117)
+Mon Mar 7 10:22:06 2005 WATANABE Hirofumi <eban@ruby-lang.org>
-Sat Mar 5 16:50:00 2005 NARUSE, Yui <naruse@ruby-lang.org>
+ * lib/un.rb: should use OptionParser. (backported form HEAD)
- * ext/nkf/nkf-utf8/nkf.c: follow nkf 1.65
+Mon Mar 7 09:18:42 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-Sat Mar 5 16:29:26 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/multi-tk.rb: freeze callback-entry objects
-
- * ext/tk/lib/tkextlib/tile.rb: support tile-0.6
-
-Sat Mar 5 12:52:08 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * string.c (rb_str_cmp_m): should not return false but nil.
+ fixed: [ruby-dev:25811]
- * lib/mkmf.rb (create_makefile): allow putting spaces between target
- and colon in depend file.
-
-Sat Mar 5 02:41:00 2005 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * file.c (eaccess): workaround for VC++8 runtime.
-
- * win32/win32.c (ioinfo): VC++8 support.
+Mon Mar 7 01:22:14 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-Fri Mar 4 19:39:55 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/tk/tkutil.c: remove the some codes which depend on the
+ difference between Ruby1.8 and 1.9, because st.c on Ruby1.9
+ was changed.
- * lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser#do_includes): replace
- also locally defined modules.
+Mon Mar 7 00:01:04 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * ext/iconv/iconv.c: rdocified.
+ * ext/tcltklib/tcltklib.c: fail to call TclTkLib.mainloop when $SAFE==4
- * ext/strscan/strscan.c: moved misplaced rdoc.
+Sun Mar 6 16:41:33 2005 Minero Aoki <aamine@loveruby.net>
-Fri Mar 4 16:11:20 2005 NAKAMURA Usaku <usa@ruby-lang.org>
+ * lib/net/http.rb: HTTPHeader holds its header fields as an array
+ (backport from CVS HEAD rev 1.112-1.123). [ruby-list:40629]
- * eval.c (rb_exec_recursive): matched the declaration to prototype.
+ * test/net/http/test_httpheader.rb: new file.
- * ext/curses/curses.c: don't need to check HAVE_WCOLOR_SET excluding
- window_color_set().
+Sun Mar 6 11:47:10 2005 Sam Roberts <sroberts@uniserve.com>
- * ext/tk/tcltklib.c: fixed commit mistakes.
+ * lib/pp.rb: rdoced. [ruby-core:4490]
-Fri Mar 4 12:45:17 2005 Tilman Sauerbeck <tilman@code-monkey.de>
+Sun Mar 6 11:36:37 2005 Tanaka Akira <akr@m17n.org>
- * lib/rdoc/parsers/parse_c.rb: allow whitespace after function names.
- [ruby-core:4296]
+ * lib/pp.rb (File::Stat#pretty_print): Etc.getpwuid and Etc.getgrgid
+ may return nil. [ruby-talk:129826]
+ reported by Daniel Berger.
- * lib/rdoc/parsers/parse_simple.rb: adds support for private comments
- in the "simple" parser. [ruby-core:4301]
+Sat Mar 5 18:06:21 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-Fri Mar 4 12:45:17 2005 Charles Mills <cmills@freeshell.org>
+ * dir.c (fnmatch): removed unnecessary code. (ruby_1_8 didn't have
+ String#clear, so [ruby-dev:24749] didn't affect it)
- * lib/rdoc/parsers/parse_c.rb: adds support for constants
- (rb_define_const), accessors (rb_define_attr), and makes a
- couple fixes. [ruby-core:4307]
+ * win32/win32.c (NtInitialize): ditto. (by numeric.c 1.101.2.14)
-Fri Mar 4 12:45:17 2005 Florian Gross <florgro@gmail.com>
+Sat Mar 5 16:29:26 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * lib/rdoc/parsers/parse_rb.rb: Logic for def Builtin.method() end
- [ruby-core:4302]
+ * ext/tk/lib/multi-tk.rb: freeze callback-entry objects
-Fri Mar 4 12:45:17 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * ext/tk/lib/tkextlib/tile.rb: support tile-0.6
- * array.c: replace rb_protect_inspect() and rb_inspecting_p() by
- rb_exec_recursive() in eval.c.
+Fri Mar 4 19:39:28 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * eval.c (rb_exec_recursive): new function.
+ * lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser#do_includes): replace
+ also locally defined modules.
- * array.c (rb_ary_join): use rb_exec_recursive().
+ * ext/iconv/iconv.c: backport Iconv::InvalidEncoding from CVS HEAD.
- * array.c (rb_ary_inspect, rb_ary_hash): ditto.
+ * ext/strscan/strscan.c: moved misplaced rdoc.
- * file.c (rb_file_join): ditto.
+Fri Mar 4 15:58:12 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
+ * lib/cgi-lib.rb: add deprecation warning. [ruby-dev:25499]
+ getopts.rb, parsearg.rb, importenv.rb as well.
- * io.c (rb_io_puts): ditto.
+Fri Mar 4 11:17:06 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * object.c (rb_obj_inspect): ditto
+ * ext/tcltklib/tcltklib.c (ip_rbUpdateCommand): get rid of
+ warnings with Tcl/Tk 8.3 or former (backport from CVS_HEAD).
- * struct.c (rb_struct_inspect): ditto.
+ * ext/tcltklib/tcltklib.c (ip_rb_threadUpdateCommand): ditto.
Fri Mar 4 10:15:30 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
-Fri Mar 4 09:37:12 2005 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * common.mk (install-nodoc, pre-install-doc, post-install-doc):
- fix some omissions.
-
-Fri Mar 4 08:09:12 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/time.rb (Time::strptime): add new function. inspired by
- [ruby-talk:132815].
-
- * lib/parsedate.rb (ParseDate::strptime): ditto.
-
Fri Mar 4 07:07:00 2005 NARUSE, Yui <naruse@ruby-lang.org>
* ext/nkf/nkf-utf8/nkf.c: follow nkf 1.63
-Thu Mar 3 23:24:00 2005 NARUSE, Yui <naruse@ruby-lang.org>
+Thu Mar 3 23:49:00 2005 NARUSE, Yui <naruse@ruby-lang.org>
* ext/nkf/nkf-utf8/nkf.c: follow nkf 1.62
-Thu Mar 3 18:47:18 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * {bcc32,win32,wince}/Makefile.sub (config.h): check if affected
- when makefiles are modified.
-
- * {bcc32,win32,wince}/Makefile.sub (config.status): add variables
- for tests.
-
- * win32/ifchange.bat: try to update a file only if modified.
-
- * win32/resource.rb: more descriptions.
-
- * common.mk: add {pre,post}-install targets.
-
- * instruby.rb (install?): install particular part.
-
- * bcc32/Makefile.sub (post-install-ext): remove debug information
- files after installation.
-
- * ext/tk/tcltklib.c (ip_rbUpdateCommand, ip_rb_threadUpdateCommand):
- get rid of warnings with Tcl/Tk 8.3 or former.
-
Thu Mar 3 11:49:51 2005 Kouhei Sutou <kou@cozmixng.org>
* sample/rss/tdiary_plugin/rss-recent.rb: added site information.
-Wed Mar 2 19:53:44 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/extmk.rb (parse_args): return false if nothing matched.
-
-Wed Mar 2 17:15:08 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/tcltklib.c (lib_eventloop_core): fix typo
-
-Wed Mar 2 16:59:50 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+Wed Mar 2 19:53:07 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * eval.c (ruby_native_thread_kill): call pthread_kill() to send a
- signal to ruby's native thread
+ * ext/extmk.rb (parse_args): add DESTDIR only when not directed
+ already. fixed: [ruby-dev:25781]
- * ruby.h: add definition of ruby_native_thread_kill()
+Wed Mar 2 17:14:18 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * signal.c (sigsend_to_ruby_thread): send the signal to ruby's
- native thread ([ruby-dev:25744], [ruby-dev:25754]), and set
- signal mask to the current native thread
+ * ext/tcltklib/tcltklib.c (lib_eventloop_core): fix typo
-Wed Mar 2 16:03:08 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+Wed Mar 2 16:00:02 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * ext/tk/tcltklib.c: enforce thread-check and exception-handling to
- avoid SEGV trouble.
+ * ext/tcltklib/tcltklib.c: enforce thread-check and exception-handling
+ to avoid SEGV trouble.
+ [KNOWN BUG] When supports pthread and running multiple Tk
+ interpreters, an interrupt signal causes SEGV frequently. That
+ may be a trouble of Ruby's signal handler.
- * ext/tk/tkutil/tkutil.c: fix a bug on converting a SJIS string array
+ * ext/tk/tkutil/tkutil.c; fix a bug on converting a SJIS string array
to a Tcl's list string.
* ext/tk/tcltklib.c: wrap Tcl's original "namespace" command to
@@ -55192,58 +12043,17 @@ Wed Mar 2 16:03:08 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/sample/demos-*/widget: add entries of animation demos.
-Wed Mar 2 12:21:18 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Mar 1 00:47:43 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
- * eval.c (rb_eval): [EXPERIMENTAL] NODE_LAMBDA implemented.
- [ruby-dev:25780]
+ * test/rinda/test_rinda.rb: backport from CVS_HEAD. use
+ MockClock.sleep instead of Kernel.sleep [ruby-dev:25387]
- * node.h (NODE_LAMBDA): for literal Proc object.
-
- * parse.y (expr): interpret mere do...end block as proc object.
-
- * parse.y (primary): ditto, for brace block.
-
-Tue Mar 1 21:16:54 2005 K.Kosako <sndgk393 AT ybb.ne.jp>
-
- * regcomp.c (optimize_node_left): uninitialized member
- (OptEnv.backrefed_status) was used. [ruby-dev:25778]
-
-Tue Mar 1 16:50:37 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * regparse.c: move st_*_strend() functions from st.c. fixed some
- potential memory leaks.
-
-Tue Mar 1 00:40:35 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+Tue Mar 1 00:34:24 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
* lib/rinda/tuplespace.rb (Rinda::TupleSpace): improved keeper thread.
* test/rinda/test_rinda.rb: ditto.
-Mon Feb 28 23:10:13 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * ext/socket/socket.c (Init_socket): IPv6 is not supported although
- AF_INET6 is defined on bcc32. (rev1.108 again)
-
- * ext/socket/mkconstants.rb: ditto.
-
-Mon Feb 28 21:55:49 2005 K.Kosako <sndgk393 AT ybb.ne.jp>
-
- * ext/strscan/strscan.c (strscan_s_allocate):
- use onig_region_init().
-
- * ext/strscan/strscan.c (adjust_registers_to_matched):
- use onig_region_set().
-
-Mon Feb 28 15:12:06 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * ext/socket/socket.c (Init_socket): ported more Socket::Constants
- from ruby_1_8, and made it easy to add new constants.
- [ruby-dev:25771]
-
- * ext/socket/depend: ditto.
-
- * ext/socket/mkconstants.rb: ditto. (added)
-
Mon Feb 28 11:42:23 2005 Ian Macdonald <ian@caliban.org>
* exception error messages updated. [ruby-core:04497]
@@ -55254,27 +12064,6 @@ Mon Feb 28 09:03:09 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
-Sun Feb 27 05:55:38 2005 Minero Aoki <aamine@loveruby.net>
-
- * parse.y [ripper]: fix typo. [ruby-core:04494]
-
-Sat Feb 26 16:58:20 2005 K.Kosako <sndgk393 AT ybb.ne.jp>
-
- * parse.y, re.c, regex.h, LEGAL, ext/strscan/strscan.c:
- remove oniggnu.h (GNU regex API).
-
-Wed Feb 23 22:08:16 2005 Kazuo Saito <ksaito@uranus.dti.ne.jp>
-
- * st.c, st.h: imported additional file changes on
- Oniguruma 3.7.0.
-
-Wed Feb 23 21:45:29 2005 Kazuo Saito <ksaito@uranus.dti.ne.jp>
-
- * ascii.c, euc_jp.c, oniggnu.h, oniguruma.h, regcomp.c,
- regenc.c, regenc.h, regerror.c, regexec.c, regint.h,
- regparse.c, regparse.h, sjis.c, utf8.c: imported Oni Guruma
- 3.7.0.
-
Wed Feb 23 15:04:32 2005 akira yamada <akira@ruby-lang.org>
* lib/uri/generic.rb (split_userinfo): should split ":pass" into ""
@@ -55287,53 +12076,27 @@ Wed Feb 23 08:00:18 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* array.c (rb_ary_unshift_m): ditto.
-Wed Feb 23 01:53:29 2005 Shugo Maeda <shugo@ruby-lang.org>
+Wed Feb 23 01:57:46 2005 Shugo Maeda <shugo@ruby-lang.org>
* lib/net/imap.rb (initialize): handle certs correctly. Thanks,
- NABEYA Kenichi.
-
-Wed Feb 23 00:37:34 2005 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/mkmf.rb (mkmf_failed): fixed typo.
-
-Tue Feb 22 23:52:45 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in, lib/mkmf.rb: use simple commands if available.
-
- * mkconfig.rb: remove autoconf internal variables from rbconfig.rb.
-
- * lib/mkmf.rb (create_makefile): substitute implicit rules in depend
- file.
+ NABEYA Kenichi. (backported from CVS HEAD)
- * {bcc32,win32,wince}/Makefile.sub (COMPILE_RULES, RULE_SUBST):
- include $(topdir) and $(hdrdir) to search path.
+Tue Feb 22 07:25:18 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Tue Feb 22 23:51:45 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * parse.y (parser_yylex): identfier after dot must not be a variable.
- * ext/syck/rubyext.c: get rid of warnings caused by a bug of VC.
-
-Tue Feb 22 23:50:26 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * signal.c (ruby_signal, ruby_nativethread_signal): must be valid as
- expressions, not only statements.
+Mon Feb 21 10:04:49 2005 NAKAMURA Usaku <usa@ruby-lang.org>
-Tue Feb 22 12:54:13 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_thread_start_0): update curr_thread before raising
- TAG_THREAD. [ruby-dev:25712]
-
-Tue Feb 22 07:24:57 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * {bcc32,win32,wince}/Makefile.sub (config.h): add fcntl.
- * parse.y (parser_yylex): identifier after dot must not be a variable.
+ * win32/win32.[ch] (fcntl): ditto.
-Mon Feb 21 18:31:12 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * win32/win32.c (rb_w32_connect): support nonblocking mode.
- * signal.c: Standard signal handlers ignore signals on non-Ruby native
- threads. When a handler is entried with ruby_signal() (like as the
- standard signal handlers), the handler for the signal is marked as
- it cannot accept non-Ruby native threads. If a handler can treat all
- signals on all native threads, please use ruby_nativethread_signal()
- to entry it.
+ * ext/socket/socket.c (wait_connectable, ruby_connect): support
+ nonblocking connect on various platforms.
+ all changes are backported from CVS HEAD. [ruby-core:3154],
+ [ruby-core:4364].
Sun Feb 20 00:48:48 2005 Tanaka Akira <akr@m17n.org>
@@ -55341,7 +12104,7 @@ Sun Feb 20 00:48:48 2005 Tanaka Akira <akr@m17n.org>
re-implemented according to RFC 1738.
reported by Guillaume Marcais. [ruby-talk:131650]
-Sat Feb 19 18:46:56 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+Sat Feb 19 18:11:47 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
* lib/drb/drb.rb (DRbObject#respond_to?): take two arguments.
[ruby-dev:25722]
@@ -55353,16 +12116,7 @@ Sat Feb 19 13:52:02 2005 Tanaka Akira <akr@m17n.org>
* lib/open-uri.rb: call OpenSSL::SSL::SSLSocket#post_connection_check
after connection is made.
-Sat Feb 19 13:31:28 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/extmk.rb (extract_makefile): remove no longer existing installed
- files.
-
- * lib/mkmf.rb (install_dirs): return installation directory list.
-
- * lib/mkmf.rb (create_makefile): reverted wrongly removed lines.
-
-Sat Feb 19 01:28:56 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Sat Feb 19 01:32:03 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* ext/bigdecimal/lib/bigdecimal/newton.rb: resolved LoadError.
[ruby-dev:25685]
@@ -55379,42 +12133,16 @@ Fri Feb 18 17:14:00 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
-Fri Feb 18 04:06:41 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (fcall_gen): lvar(arg) will be evaluated as
- lvar.call(arg) when lvar is a defined local variable. [new]
-
-Thu Feb 17 22:15:34 2005 K.Kosako <sndgk393 AT ybb.ne.jp>
-
- * ext/strscan/strscan.c: calls Oniguruma API directly.
-
-Thu Feb 17 21:53:12 2005 K.Kosako <sndgk393 AT ybb.ne.jp>
-
- * common.mk, LEGAL: remove reggnu.c.
-
-Thu Feb 17 21:53:12 2005 Kazuo Saito <ksaito@uranus.dti.ne.jp>
-
- * gc.c, re.c: now ruby calls Oniguruma API directly, bypassing
- GNU compatible APIs.
-
-Thu Feb 17 20:09:23 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Thu Feb 17 20:11:18 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* lib/drb/drb.rb (DRbServer.default_safe_level): fix typo.
-Thu Feb 17 20:09:23 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Feb 17 20:11:18 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* test/digest/test_digest.rb: separate test case for each algorithms.
[ruby-dev:25412]
-Thu Feb 17 14:31:52 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (rb_class_initialize): call inherited method before
- calling initializing block.
-
- * eval.c (rb_thread_start_1): initialize newly pushed frame.
- fixed: [ruby-dev:25707]
-
-Thu Feb 17 13:46:00 2005 Nathaniel Talbott <ntalbott@ruby-lang.org>
+Thu Feb 17 11:54:00 2005 Nathaniel Talbott <ntalbott@ruby-lang.org>
* lib/test/unit/collector.rb (collect_file): now deletes paths added
to $LOAD_PATH instead of restoring it verbatim.
@@ -55432,43 +12160,38 @@ Thu Feb 17 04:21:47 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
-Thu Feb 17 00:31:21 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-
- * test/drb/test_drb.rb, ut_safe1.rb: port from 1.8
+Thu Feb 17 00:09:45 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-Thu Feb 17 00:02:27 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * test/drb/ignore_test_drb.rb: move TestDRbReusePort to new file
+ [ruby-dev:25238]
- * eval.c (is_defined): NODE_IASGN is an assignment.
+ * test/drb/test_drb.rb: add method DRbService.ext_service, move
+ TestDRbReusePort to new file [ruby-dev:25238]
-Wed Feb 16 23:54:14 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * test/drb/test_drb.rb: ditto.
- * eval.c (rb_thread_start_1): outer block variables wasn't linked to
- threads. fixed: [ruby-dev:25700]
+ * test/drb/test_drbssl.rb: ditto.
-Wed Feb 16 15:11:43 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * test/drb/test_drbunix.rb: ditto.
- * ext/openssl/lib/openssl/ssl.rb (OpenSSL::Nonblock#initialize):
- native win32 platform doesn't have F_GETFL.
+ * test/drb/ut_drb.rb: reduce sleep.
-Wed Feb 16 02:47:45 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Thu Feb 17 00:02:27 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/openssl/ossl_ssl.c (ossl_ssl_read, ossl_ssl_write): should
- call rb_sys_fail instead of raising SSLError if SSL_ERROR_SYSCALL
- occurred.
+ * eval.c (is_defined): NODE_IASGN is an assignment.
- * ext/openssl/lib/openssl/buffering.rb (Buffering#fill_rbuff):
- should rescue Errno::EAGAIN.
+Wed Feb 16 23:34:30 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
- * ext/openssl/lib/openssl/buffering.rb (Buffering#each): fix typo.
- suggested by Brian Ollenberger.
+ * lib/drb/drb.rb: add lazy stop_service. ([druby-ja:109])
- * ext/openssl/lib/openssl/ssl.rb: set non-blocking flag to the
- underlying IO.
+ * lib/drb/extserv.rb: ditto.
-Tue Feb 15 22:14:34 2005 sheepman <sheepman@tcn.zaq.ne.jp>
+Wed Feb 16 17:07:57 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * ext/readline/readline.c (Readline.readline): use rl_outstream
- and rl_instream. [ruby-dev:25699]
+ * ext/tk/tkutil.c: Follow the change of st.c (st_foreach)
+ [ruby-list:40623].
+ Sometimes mis-convert from a Ruby's Array of SJIS Strings, which
+ includes some kind of SJIS characters, to a Tcl's UTF8 list string.
Mon Feb 14 23:58:17 2005 Kouhei Sutou <kou@cozmixng.org>
@@ -55478,14 +12201,13 @@ Mon Feb 14 23:58:17 2005 Kouhei Sutou <kou@cozmixng.org>
Mon Feb 14 13:12:38 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
* ext/openssl/lib/openssl/ssl.rb
- (OpenSSL::SSL::SSLSocket#post_connection_check): new method.
+ (OpenSSL::SSL::SSLSocket#post_connection_check): new method.
-Mon Feb 14 00:10:17 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+Mon Feb 14 00:40:49 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
- * lib/drb/drb.rb (DRbServer): add default_safe_level, safe_level,
- config[:safe_level] ([druby-ja:120])
+ * lib/drb/drb.rb (InvokeMethod.perform): pass DRb info to sub thread.
- * test/drb/test_drb.rb, ut_eval.rb, ut_safe1.rb: ditto.
+ * test/drb/test_drb.rb (test_01_safe1_safe4_eval): fix test case.
Sun Feb 13 23:13:46 2005 Kouhei Sutou <kou@cozmixng.org>
@@ -55498,43 +12220,22 @@ Sun Feb 13 23:13:46 2005 Kouhei Sutou <kou@cozmixng.org>
* test/rss/: added tests for the convenient methods.
-Sun Feb 13 23:12:47 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun Feb 13 22:43:03 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
- * eval.c (rb_thread_start_0): restore prot_tag before rewinding.
+ * lib/drb/drb.rb (DRbServer): add default_safe_level, safe_level,
+ config[:safe_level] ([druby-ja:120])
+
+ * test/drb/test_drb.rb, ut_eval.rb, ut_safe1.rb: ditto.
Sun Feb 13 16:56:52 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
* lib/webrick/cgi.rb (WEBrick::CGI.start): should set reason-phrase
to the value of status header field. ([ruby-dev:40617])
-Sun Feb 13 11:38:40 2005 Kazuo Saito <ksaito@uranus.dti.ne.jp>
-
- * regparse.c (type_cclass_hash): (Thanks Nobu) fixed
- overrun. ([ruby-dev:25676]).
-
-Sun Feb 13 10:53:08 2005 Kazuo Saito <ksaito@uranus.dti.ne.jp>
-
- * oniggnu.h, oniguruma.h, regcomp.c, st.c: imported
- Oni Guruma 3.6.0.
-
-Sun Feb 13 01:33:19 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+Sun Feb 13 00:52:33 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
* lib/erb.rb (ERB::Util.h, u): make it module_function.
-Sat Feb 12 22:17:11 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (TAG_THREAD): to start a new thread.
-
- * eval.c (ruby_init, ruby_options, ruby_cleanup, rb_protect,
- rb_load_protect, rb_thread_start_0): make thread anchor.
-
- * eval.c (proc_alloc): clone proc object if klass is not Proc or
- created in different thread.
-
- * eval.c (rb_block_pass): call a function with a block. [new]
-
- * eval.c (rb_f_throw): raise NameError in main thread.
-
Sat Feb 12 17:29:19 2005 Tanaka Akira <akr@m17n.org>
* lib/open-uri.rb (OpenURI.open_loop): send authentication only for
@@ -55544,10 +12245,6 @@ Sat Feb 12 15:07:23 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* random.c (rand_init): suppress warning.
-Sat Feb 12 14:10:24 2005 Tanaka Akira <akr@m17n.org>
-
- * lib/open-uri.rb (OpenURI.open_http): reject userinfo explicitly.
-
Sat Feb 12 13:54:03 2005 Tanaka Akira <akr@m17n.org>
* lib/open-uri.rb: support https if the platform provides CA
@@ -55555,10 +12252,10 @@ Sat Feb 12 13:54:03 2005 Tanaka Akira <akr@m17n.org>
Sat Feb 12 06:18:28 2005 URABE Shyouhei <shyouhei@ice.uec.ac.jp>
- * ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
+ * ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check.
[ruby-dev:25675]
-Fri Feb 11 17:37:50 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Fri Feb 11 17:40:42 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
* ext/openssl/ossl_x509store.c (ossl_x509store_set_default_paths):
new method OpenSSL::X509::Store#set_default_paths.
@@ -55580,108 +12277,68 @@ Fri Feb 11 04:54:13 2005 Tilman Sauerbeck <tilman@code-monkey.de>
* lib/rdoc/generators/ri_generator.rb: ditto.
-Thu Feb 10 13:52:42 2005 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * configure.in, win32/Makefile.sub (LIBS, COMMON_HEADERS): use
- winsock2 on mswin32/mingw.
-
- * ext/socket/extconf.rb: ditto.
-
- * win32/win32.c (StartSockets): ditto.
-
- * win32/win32.h: ditto.
+Thu Feb 10 11:14:17 2005 NAKAMURA Usaku <usa@ruby-lang.org>
-Thu Feb 10 12:09:16 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * win32/Makefile.sub (COMMON_HEADERS): shouldn't include winsock2.h.
- * ext/extmk.rb (extract_makefile): default to true if not compiled
- previously.
+ * ext/socket/extconf.rb (sockaddr_storage): remove workaround for
+ mswin32.
- * ext/extmk.rb (extmake): create dummy makefile if extconf failed.
+Thu Feb 10 10:29:16 2005 NAKAMURA Usaku <usa@ruby-lang.org>
-Thu Feb 10 12:07:10 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/win32.c (init_stdhandle): assign standard file handles.
-
- * bcc32/Makefile.sub (COMMON_LIBS): add libraries included in
- import32.lib.
-
- * lib/mkmf.rb (create_makefile): restrict prefixing with srcdir to
- rule lines, add search path to implicit rules, and set Borland make
- special macros for search path.
-
- * win32/win32.c, win32/win32.h (read): avoid a BCC runtime bug.
+ * ext/curses/curses.c: don't need to check HAVE_WCOLOR_SET excluding
+ window_color_set().
Thu Feb 10 00:47:25 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* struct.c (make_struct): fixed: [ruby-core:04402]
-Wed Feb 9 16:33:05 2005 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/socket/socket.c (wait_connectable): fixed wrong condition.
-
-Wed Feb 9 14:42:28 2005 URABE Shyouhei <shyouhei@ice.uec.ac.jp>
-
- * eval.c (scope_dup): add volatile not to optimize tbl.
-
-Wed Feb 9 10:02:02 2005 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/tk/make-tkutil, ext/tk/tkutil/subconf.rb: no longer used.
-
- * ext/tk/tkutil/extconf.rb: need to compile tkutil. [ruby-dev:25607]
-
Wed Feb 9 08:07:08 2005 Paul Duncan <pabs@pablotron.org>
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
-Tue Feb 8 23:48:36 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+Tue Feb 8 23:51:47 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
* lib/drb/drb.rb: reject :instance_eval, :class_eval, :module_eval
[druby-ja:117]
-Tue Feb 8 22:38:28 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * keywords, parse.y: separate EXPR_VALUE from EXPR_BEG.
- fixed: [ruby-core:04310], [ruby-core:04368]
-
Tue Feb 8 13:06:12 2005 Sam Roberts <sroberts@uniserve.com>
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
+Tue Feb 8 09:30:01 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * lib/cgi.rb (CGI::Cookie): [ruby-talk:130040]
+
Tue Feb 8 00:19:02 2005 Tanaka Akira <akr@m17n.org>
* lib/resolv.rb (Resolv::DNS::Name#subdomain_of?): new method.
(Resolv::DNS::Name#inspect): ditto.
Suggested by Sam Roberts. [ruby-talk:129086]
-Mon Feb 7 23:14:11 2005 Tanaka Akira <akr@m17n.org>
-
- * io.c (io_getc): flush rb_stdout before read from stdin, which is
- connected to a tty. [ruby-core:4378]
-
- * rubyio.h (FMODE_TTY): renamed from FMODE_LINEBUF.
-
Mon Feb 7 10:06:30 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* object.c: [ruby-doc:818]
-Mon Feb 7 02:13:05 2005 NAKAMURA Usaku <usa@ruby-lang.org>
+Mon Feb 7 01:56:20 2005 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * instruby.rb, rubytest.rb (srcdir): no longer embed srcdir into
+ rbconfig.rb. (backported from CVS HEAD)
* ext/socket/extconf.rb (sockaddr_storage): winsock2.h have the
definition of struct sockaddr_storage, but socket.c doesn't
include it because this version of ruby still has binary level
compatibility with winsock1.
-Mon Feb 7 01:22:50 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/mkmf.rb (create_makefile): should support header files in
+ depend file.
- * ext/extmk.rb (extract_makefile): extract previously collected
- informations from existing Makefile.
+Mon Feb 7 01:21:50 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/socket/extconf.rb: check if getaddrinfo() works fine only when
wide-getaddrinfo option is not given. fixed: [ruby-dev:25422]
- * ext/tk/extconf.rb: separate tkutil configuration.
-
* lib/mkmf.rb ($extmk): check if under ext directory.
* lib/mkmf.rb (Logging.postpone): allow recursive operation.
@@ -55698,25 +12355,31 @@ Mon Feb 7 01:22:50 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (dir_config): accept arrays of directory names as
default values.
- * lib/mkmf.rb (with_cppflags, with_cflags, with_ldflags): keep flags
- modified if the block returned true.
+ * mkconfig.rb: no longer embed srcdir and compile_dir into
+ rbconfig.rb.
+
+ * lib/mkmf.rb (create_makefile): fix unbalanced parens.
-Sun Feb 6 19:20:05 2005 NAKAMURA Usaku <usa@ruby-lang.org>
+Sun Feb 6 19:23:01 2005 NAKAMURA Usaku <usa@ruby-lang.org>
* eval.c (stack_extend): add prototype because VC++8 doesn't
accept __declspec(noinline) with K&R style function definitions.
+ (backported from CVS HEAD)
-Sun Feb 6 13:56:19 2005 Tadayoshi Funaba <tadf@dotrb.org>
+Sun Feb 6 14:14:26 2005 Tadayoshi Funaba <tadf@dotrb.org>
* lib/date.rb (new_with_hash): changed messages of exception.
* lib/date/format.rb (str[fp]time): undocumented conversion
specifications %[1-3] are now deprecated.
-Sun Feb 6 11:27:37 2005 Tanaka Akira <akr@m17n.org>
+Sun Feb 6 12:20:11 2005 Akinori MUSHA <knu@iDaemons.org>
+
+ * bignum.c (rb_big2ulong_pack): One too many arguments are passed
+ to big2ulong().
- * ext/dl/dl.c (Init_dl): function declaration should precede
- statements before C99.
+ * re.c (rb_reg_init_copy, rb_reg_initialize_m): One too many
+ arguments are passed to rb_reg_initialize().
Sun Feb 6 03:24:20 2005 Tanaka Akira <akr@m17n.org>
@@ -55728,28 +12391,7 @@ Sun Feb 6 03:24:20 2005 Tanaka Akira <akr@m17n.org>
(Resolv::DNS::Message::MessageDecoder#get_string_list): ditto.
based on [ruby-talk:129732] by Sam Roberts.
-Sat Feb 5 02:24:06 2005 Minero Aoki <aamine@loveruby.net>
-
- * test/ripper/test_scanner_events.rb: fix test.
-
-Fri Feb 4 18:44:35 2005 Minero Aoki <aamine@loveruby.net>
-
- * ext/ripper/lib/ripper/lexer.rb: last Lexer fix was incomplete;
- test all green.
-
-Fri Feb 4 15:57:06 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (open_args): fix too verbose warnings for the space
- before argument parentheses. [ruby-dev:25492]
-
- * parse.y (parser_yylex): ditto.
-
-Fri Feb 4 14:33:25 2005 Minero Aoki <aamine@loveruby.net>
-
- * ext/ripper/lib/ripper/filter.rb: ripper/tokenizer ->
- ripper/lexer. [ruby-dev:25632]
-
-Fri Feb 4 00:24:15 2005 Kouhei Sutou <kou@cozmixng.org>
+Fri Feb 4 00:30:45 2005 Kouhei Sutou <kou@cozmixng.org>
* lib/rss: supported Image module.
http://web.resource.org/rss/1.0/modules/image/
@@ -55762,19 +12404,6 @@ Thu Feb 3 23:42:36 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/stringio/stringio.c (strio_extend, strio_putc): fill with zero
extended portion. [ruby-dev:25626]
-Thu Feb 3 16:12:57 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (parser_yylex): the first expression in the parentheses
- should not be a command. [ruby-dev:25492]
-
-Thu Feb 3 03:31:20 2005 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/nkf/nkf-utf8/nkf.c: follow original v 1.57
-
- * ext/nkf/nkf-utf8/utf8tbl.c: follow original v 1.8
-
- * ext/nkf/nkf-utf8/config.h: follow original v 1.7
-
Wed Feb 2 23:52:53 2005 sheepman <sheepman@tcn.zaq.ne.jp>
* ext/stringio/stringio.c (strio_truncate): should MEMZERO an extended
@@ -55794,49 +12423,18 @@ Wed Feb 2 21:56:01 2005 Kouhei Sutou <kou@cozmixng.org>
* lib/rss/trackback.rb: ditto.
-Wed Feb 2 03:30:58 2005 Minero Aoki <aamine@loveruby.net>
-
- * ext/ripper/lib/ripper/tokenizer.rb -> lexer.rb.
-
- * ext/ripper/lib/ripper/lexer.rb: new method Ripper.slice.
- [experimental]
-
- * ext/ripper/lib/ripper/sexp.rb: new file. [experimental]
-
- * ext/ripper/lib/ripper.rb: require ripper/lexer and ripper/sexp.
-
-Tue Feb 1 21:49:24 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+Tue Feb 1 22:48:48 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
* lib/drb/drb.rb (DRb::DRbObject#respond_to?): check marshal_dump and
_dump.
Tue Feb 1 00:20:23 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * Makefile.in, configure.in: made EXTOUT configurable.
-
- * ext/extmk.rb (extmake), lib/mkmf.rb: keep topdir as relative style.
-
- * lib/mkmf.rb: make extensions in depth order. [ruby-dev:25522]
-
* configure.in (aix): fix linker flags on AIX. [ruby-talk:125460]
-Mon Jan 31 13:16:39 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/extconf.rb: add tkutil configuration step (remove old schema)
-
- * ext/tk/depend: remove the information of tkutil
-
- * ext/tk/make-tkutil: sub-part of Makefile to compile tkutil
-
- * ext/tk/tkutil/tkutil.c: move tkutil.c to subdirectory
-
- * ext/tk/tkutil/subconf.rb: configuration file for tkutil.c
-
- * ext/tk/tkutil/depend: ditto
-
-Mon Jan 31 13:13:35 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+Mon Jan 31 13:33:21 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * ext/tk/tcltklib.c: add invalid namespace check
+ * ext/tcltklib/tcltklib.c: add invalid namespace check
* ext/tk/lib/multi-tk.rb: add invalid_namespace? method
@@ -55846,22 +12444,11 @@ Mon Jan 31 10:29:18 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
-Mon Jan 31 09:44:03 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (Init_Object): remove Object#type. [ruby-core:04335]
-
Sat Jan 29 09:42:12 2005 Sam Roberts <sroberts@uniserve.com>
* lib/resolv.rb (Resolv::DNS::Resource::IN::SRV): Added RFC2782 SRV
resource record for specifying location of services.
-Sat Jan 29 00:10:33 2005 Kazuo Saito <ksaito@uranus.dti.ne.jp>
-
- * ascii.c, euc_jp.c, hash.c, oniggnu.h, oniguruma.h, regcomp.c,
- regenc.c, regenc.h, regerror.c, regexec.c, reggnu.c, regint.h,
- regparse.c, regparse.h, sjis.c, st.c, st.h, utf8.c: imported
- Oni Guruma 3.5.4.
-
Fri Jan 28 17:16:55 2005 Tanaka Akira <akr@m17n.org>
* lib/resolv.rb (Resolv::DNS::Config.parse_resolv_conf):
@@ -55871,60 +12458,33 @@ Fri Jan 28 17:16:55 2005 Tanaka Akira <akr@m17n.org>
(Resolv::DNS::Config#lazy_initialize): ditto.
Suggested by Sam Roberts.
-Thu Jan 27 17:15:03 2005 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/tk/extconf.rb: support new tk scheme on bccwin32.
- fixed: [ruby-dev:25546]
-
Thu Jan 27 13:18:03 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
-Thu Jan 27 00:12:19 2005 Minero Aoki <aamine@loveruby.net>
+Thu Jan 27 00:15:29 2005 Minero Aoki <aamine@loveruby.net>
- * test/fileutils/test_fileutils.rb (setup): support BSD style
- directory group inheritance (again).
-
-Thu Jan 27 00:02:40 2005 Minero Aoki <aamine@loveruby.net>
-
- * test/fileutils/test_fileutils.rb (setup): support BSD style
- directory group inheritance. [ruby-dev:25440]
+ * test/fileutils/test_fileutils.rb (setup): support BSD-style
+ directory group inheritance. (backport from HEAD, rev 1.32)
* test/fileutils/fileasserts.rb (assert_same_entry): show entry
- difference.
-
-Wed Jan 26 17:12:50 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y: forgot to initialize parser struct. [ruby-dev:25492]
-
- * parse.y (parser_yylex): no tLABEL on EXPR_BEG.
- [ruby-talk:127711]
+ difference. (backport from HEAD, rev 1.4)
-Wed Jan 26 14:12:58 2005 NAKAMURA Usaku <usa@ruby-lang.org>
+Wed Jan 26 23:09:11 2005 Minero Aoki <aamine@loveruby.net>
- * ext/Setup*: remove tcltklib.
+ * lib/net/protocol.rb (WriteAdapter#puts): should append \n, not
+ prepend. [ruby-talk:128302] (backport from HEAD, rev 1.75)
-Wed Jan 26 12:45:16 2005 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/tk/extconf.rb: support new tk scheme on mswin32.
- fixed: [ruby-dev:25535]
-
-Wed Jan 26 10:45:19 2005 NAKAMURA Usaku <usa@ruby-lang.org>
+Wed Jan 26 10:51:50 2005 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/win32.c (flock_winnt, flock_win95): unlock file even if
- LOCK_NB is specified.
-
-Tue Jan 25 23:10:48 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ LOCK_NB is specified. (backported from CVS HEAD)
- * ext/tk: merge tcltklib for Ruby/Tk installation control
+Tue Jan 25 17:11:51 2005 NAKAMURA Usaku <usa@ruby-lang.org>
- * ext/tcltklib: remove
-
-Tue Jan 25 17:05:15 2005 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ruby.c (proc_options): correct -T option in RUBYOPT.
- fixed: [ruby-dev:25512]
+ * ruby.c (proc_options): correct -T option in RUBYOPT. (backported
+ from CVS HEAD)
Tue Jan 25 14:05:52 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
@@ -55963,17 +12523,31 @@ Tue Jan 25 14:05:52 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/sample/tkHTML/ss.rb: local variable scope bug fix
[ruby-dev:25479]
-Mon Jan 24 16:00:53 2005 NARUSE, Yui <naruse@ruby-lang.org>
+Mon Jan 24 15:44:25 2005 Tilman Sauerbeck <tilman@code-monkey.de>
+
+ * lib/rdoc/parsers/parse_c.rb: allow whitespace after function names.
+ [ruby-core:4296]
+
+ * lib/rdoc/parsers/parse_simple.rb: adds support for private comments
+ in the "simple" parser. [ruby-core:4301]
- * ext/nkf/lib/kconv.rb (guess_old): not use NKF.guess_old
- but NKF.guess1. fixed: [ruby-dev:25491]
+Mon Jan 24 15:44:25 2005 Charles Mills <cmills@freeshell.org>
+
+ * lib/rdoc/parsers/parse_c.rb: adds support for constants
+ (rb_define_const), accessors (rb_define_attr), and makes a
+ couple fixes. [ruby-core:4307]
+
+Mon Jan 24 15:44:25 2005 Florian Gro <florgro@gmail.com>
+
+ * lib/rdoc/parsers/parse_rb.rb: Logic for def Builtin.method() end
+ [ruby-core:4302]
Mon Jan 24 15:44:25 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
-Sun Jan 23 12:38:01 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+Sun Jan 23 12:41:16 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
* lib/soap/wsdlDriver.rb: from 1.5.3-ruby1.8.2, operation which has
capitalized name (such as KeywordSearchRequest in AWS) is defined as
@@ -55989,62 +12563,65 @@ Sun Jan 23 05:24:42 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
* ext/openssl/ossl_ocsp.c (ossl_ocspreq_to_der): should call
GetOCSPReq at first.
-Sat Jan 22 22:59:08 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+Sat Jan 22 23:09:47 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
* lib/drb/ssl.rb (accept): rescue SSLError. [druby-ja:110]
-Sat Jan 22 22:27:28 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+Sat Jan 22 22:35:03 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
* lib/drb/unix.rb: fail if UNIXFileOwner is set. [druby-ja:111]
+Fri Jan 21 23:58:42 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * ext/stringio/stringio.c (strio_set_pos): clear EOF flag.
+ [ruby-talk:127511]
+
Fri Jan 21 20:07:02 2005 Tanaka Akira <akr@m17n.org>
* lib/resolv.rb (Resolv::DNS::Config.resolv): don't raise ResolvError.
reported by Sam Roberts. [ruby-talk:127133]
-Fri Jan 21 17:09:44 2005 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/net/imap.rb (decode_utf7): use pack("U*") to encode UTF-8.
-
- * lib/net/imap.rb (encode_utf7): use unpack("U*") to decode UTF-8.
-
- * test/net/imap/test_imap.rb: added tests for Net::IMAP.
-
Fri Jan 21 16:58:10 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* dir.c (rb_push_glob): should work for NUL delimited patterns.
- * dir.c (rb_glob2): should aware of offset in the pattern.
-
Fri Jan 21 13:58:37 2005 Shugo Maeda <shugo@ruby-lang.org>
* lib/net/imap.rb (u8tou16): fixed typo. fixed: [ruby-list:40546]
+ (backported from CVS HEAD)
+
+Fri Jan 21 09:30:16 2005 NAKAMURA Usaku <usa@ruby-lang.org>
-Fri Jan 21 00:37:09 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+ * rubyio.h (rb_eof_error): should mark as NORETURN. (backported
+ from CVS HEAD)
+
+Fri Jan 21 00:31:36 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* ext/syck/rubyext.c (syck_parser_bufsize_set): avoid VC++ warning
"local variable 'size' used without having been initialized".
+Thu Jan 20 19:03:24 2005 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * ext/extmk.rb (extmake): shouldn't set $extflags on mswin32.
+
+ * win32/Makefile.sub (LIBRUBY_SO): should use $DLDOBJS instead of
+ $EXTOBJS.
+ fixed: [ruby-core:04290] (backported from CVS HEAD)
+
Thu Jan 20 11:42:02 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* string.c (rb_str_new4): should propagate taintedness.
- * env.h: rename member names in struct FRAME; last_func -> callee,
- orig_func -> this_func, last_class -> this_class.
-
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
-Thu Jan 20 02:01:10 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (Init_Object): remove rb_obj_id_obsolete()
-
-Wed Jan 19 18:02:19 2005 NAKAMURA Usaku <usa@ruby-lang.org>
+Wed Jan 19 18:06:40 2005 NAKAMURA Usaku <usa@ruby-lang.org>
* lib/ipaddr.rb (to_s, test_to_s): too many colons with some cases.
+ (backported from CVS HEAD)
Wed Jan 19 01:16:30 2005 Tanaka Akira <akr@m17n.org>
@@ -56052,6 +12629,32 @@ Wed Jan 19 01:16:30 2005 Tanaka Akira <akr@m17n.org>
domain and search directive without an argument.
reported by Sam Roberts. [ruby-talk:126781]
+Tue Jan 18 15:03:05 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * lib/webrick/ssl.rb (WEBrick::Config::SSL): the default value
+ of :SSLEnable is false.
+
+ * lib/webrick/server.rb (WEBrick::Daemon.start): prepared stdio
+ don't allow changing its mode.
+
+ * lib/webrick/httpproxy.rb (WEBrick::HTTPProxyServer#proxy_service):
+ should delete trailing LF from the result of pack("m*").
+
+ * lib/webrick/httpproxy.rb (WEBrick::HTTPProxyServer#proxy_connect):
+ - should delete trailing LF from the result of pack("m*").
+ - clear Request-Line not to send the response by HTTPServer#run.
+
+ * lib/webrick/httputils (WEBrick::HTTPUtils.parse_qvalues):
+ refine regexp (and change the name of a local variable).
+
+ * lib/webrick/httputils.rb (WEBrick::HTTPUtils#escape_path): add
+ new method to escape URI path component.
+
+ * lib/webrick/cgi.rb (WEBrick::CGI::Socket#request_line): should
+ escape SCRIPT_NAME and PATH_INFO before being parsed as a URI.
+
+ * test/webrick/*, sample/webrick/httpproxy.rb: add new file.
+
Mon Jan 17 23:33:46 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (aix): fix typo. [ruby-talk:126401]
@@ -56080,63 +12683,48 @@ Sat Jan 15 14:57:22 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ruby.c (proc_options): ignore trailing CRs at the end of short
options as well as long options. fixed: [ruby-core:04232]
-Sat Jan 15 13:44:22 2005 Kouhei Sutou <kou@cozmixng.org>
+Sat Jan 15 13:35:16 2005 Kouhei Sutou <kou@cozmixng.org>
* lib/rss/rss.rb (RSS::VERSION): 0.1.2 -> 0.1.3.
* lib/rss/rss.rb: accept inheritance. [ruby-talk:126104]
-Wed Jan 12 12:29:28 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_mod_define_method): incomplete subclass check.
- [ruby-dev:25464]
+Thu Jan 13 04:48:53 2005 Tanaka Akira <akr@m17n.org>
- * class.c (rb_make_metaclass): class of metaclasses should be
- plain Class. [ruby-list:40524]
+ * io.c (io_fread): don't warn nonblocking behavior by default.
-Tue Jan 11 20:58:52 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Jan 12 00:36:29 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * io.c (remain_size): use buffered data instead of unreading to avoid
- inconsistency of text mode. fixed: [ruby-dev:25446]
+ * object.c (rb_class_superclass): superclass of singleton class also
+ should be a singleton class. fixed: [ruby-list:40519]
-Tue Jan 11 09:37:53 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Tue Jan 11 09:44:40 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* numeric.c (Init_Numeric): turn off floating point exceptions
on bcc32. "1e300".to_f had crashed by overflow.
-Mon Jan 10 15:28:51 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Tue Jan 11 03:10:10 2005 Minero Aoki <aamine@loveruby.net>
- * lib/webrick/cgi.rb (WEBrick::CGI::Socket#request_line): should
- escape SCRIPT_NAME and PATH_INFO before being parsed as a URI.
+ * lib/fileutils.rb (copy_entry): could not copy symbolic link.
+ [ruby-talk:125733]
- * lib/webrick/httputils.rb (WEBrick::HTTPUtils#escape_path): add
- new method to escape URI path component.
-
- * lib/webrick/ssl.rb (WEBrick::Config::SSL): the default value
- of :SSLEnable is false.
+ * lib/fileutils.rb (copy_stream): use read/write instead of
+ sysread/syswrite.
- * test/webrick/{test_cgi.rb,webrick.cgi}: new file.
+Mon Jan 10 23:08:15 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/webrick/utils.rb: require "webrick/https.h".
+ * variable.c (rb_autoload): hide internal data from ruby level.
+ fixed: [ruby-dev:25435], [ruby-list:40498]
Mon Jan 10 01:22:55 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
-Sun Jan 9 14:12:17 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (rb_f_select): IO list could be altered. [ruby-dev:25312]
-
-Sun Jan 9 04:08:40 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * test/webrick/test_server.rb (test_daemon): delete an assertion
- which has possibility to fail by race condition.
+Sun Jan 9 03:12:58 2005 Tanaka Akira <akr@m17n.org>
-Sun Jan 9 03:22:46 2005 Minero Aoki <aamine@loveruby.net>
-
- * test/fileutils/test_fileutils.rb (test_copy_entry): copy_entry
- copies only file type, not mtime. [ruby-dev:25383]
+ * io.c (io_fread): warn nonblocking behavior.
+ (io_readpartial): new method IO#readpartial.
Sat Jan 8 04:38:47 2005 why the lucky stiff <why@ruby-lang.org>
@@ -56147,33 +12735,17 @@ Fri Jan 7 21:12:29 2005 TAMURA Takashi <sheepman@tcn.zaq.ne.jp>
* random.c (rand_init): use ALLOC_N instead of ALLOCA_N
[ruby-dev:25426]
-Fri Jan 7 20:01:31 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/webrick/httpproxy.rb (WEBrick::HTTPProxyServer#proxy_service):
- should delete trailing LF from the result of pack("m*").
-
- * lib/webrick/httpproxy.rb (WEBrick::HTTPProxyServer#proxy_connect):
- - should delete trailing LF from the result of pack("m*").
- - clear Request-Line not to send the response by HTTPServer#run.
-
- * lib/webrick/httputils (WEBrick::HTTPUtils.parse_qvalues):
- refine regexp (and change the name of a local variable).
-
- * lib/webrick/server.rb (WEBrick::Daemon.start): prepared stdio
- don't allow changing its mode.
-
- * test/webrick/*, sample/webrick/httpproxy.rb: add new files.
-
Fri Jan 7 18:03:35 2005 Tanaka Akira <akr@m17n.org>
* gc.c (mark_locations_array): avoid core dump with -O3.
[ruby-dev:25424]
-Thu Jan 6 20:29:18 2005 NAKAMURA Usaku <usa@ruby-lang.org>
+Thu Jan 6 20:31:07 2005 NAKAMURA Usaku <usa@ruby-lang.org>
- * ext/zlib/zlib.c (zstream_end): should return value.
+ * ext/zlib/zlib.c (zstream_end): should return value. (backported
+ from CVS HEAD)
-Thu Jan 6 19:59:03 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Thu Jan 6 19:55:13 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* win32/win32.c (rb_w32_close): didn't close socket handle.
[ruby-dev:25414]
@@ -56181,7 +12753,7 @@ Thu Jan 6 19:59:03 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* win32/win32.c (rb_w32_open_osfhandle): bcc32's _open_osfhandle
never set EMFILE.
-Thu Jan 6 17:22:41 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Thu Jan 6 17:14:31 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* random.c (random_seed): O_NONBLOCK isn't defined on some
platforms. [ruby-dev:25417]
@@ -56195,11 +12767,6 @@ Thu Jan 6 07:58:28 2005 Dave Thomas <dave@pragprog.com>
* lib/rdoc/usage.rb (RDoc::RDoc.usage_no_exit): Allow for colons
in path names on DOS machines. (thanks to Johan Nilsson)
-Thu Jan 6 00:02:35 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-
- * test/rinda/test_rinda.rb: use MockClock.sleep instead of Kernel.sleep
- [ruby-dev:25387]
-
Wed Jan 5 20:16:32 2005 Tanaka Akira <akr@m17n.org>
* random.c (limited_big_rand): didn't work if SIZEOF_BDIGITS == 2.
@@ -56207,20 +12774,22 @@ Wed Jan 5 20:16:32 2005 Tanaka Akira <akr@m17n.org>
* random.c (random_seed): refined.
-Wed Jan 5 16:39:54 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * parse.y (BITSTACK_POP): workaround for bcc32 compiler's bug.
- shift assignment operator '>>=' for __int64 in struct may
- generate collapsed code. [ruby-dev:25342]
-
- * win32/win32.[ch]: failed to compile on bcc32 (and probably wince)
- [ruby-dev:25306]
-
Wed Jan 5 12:49:39 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (rb_thread_initialize): Thread objects cannot be initialized
again. fixed: [ruby-core:04067]
+Wed Jan 5 10:48:16 2005 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * dir.c (dir_s_mkdir): win32 special processing doesn't need any
+ longer. (backported from CVS HEAD)
+
+ * win32/win32.[ch] (rb_w32_mkdir): new function. POSIX.1 compatible
+ interface. (backported from CVS HEAD)
+
+ * win32/win32.[ch] (rb_w32_rmdir): new function. (backported from CVS
+ HEAD)
+
Wed Jan 5 02:30:11 2005 Tanaka Akira <akr@m17n.org>
* random.c (init_by_array): imported from mt19937ar-cok.tgz.
@@ -56239,10 +12808,10 @@ Tue Jan 4 23:25:29 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
-Tue Jan 4 21:25:43 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+Tue Jan 4 11:15:29 2005 TAMURA Takashi <sheepman@tcn.zaq.ne.jp>
- * test/drb/{test_drbssl.rb,test_drbunix.rb,ut_drb.rb}: use
- DRbService.ext_service. reduce sleep.
+ * bignum.c (rb_big_rand): do not use rb_big_modulo to generate
+ random bignums. [ruby-dev:25396]
Mon Jan 3 14:01:54 2005 Tanaka Akira <akr@m17n.org>
@@ -56254,21 +12823,7 @@ Mon Jan 3 11:37:42 2005 Tanaka Akira <akr@m17n.org>
* random.c (random_seed): use /dev/urandom if available.
[ruby-dev:25392]
-Tue Jan 4 11:15:29 2005 TAMURA Takashi <sheepman@tcn.zaq.ne.jp>
-
- * bignum.c (rb_big_rand): do not use rb_big_modulo to generate
- random bignums. [ruby-dev:25396]
-
-Mon Jan 3 11:03:37 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-
- * test/drb/test_drb.rb: move TestDRbReusePort to new file.
- [ruby-dev:25238]
-
- * test/drb/drbtest.rb: change timeout.
-
- * test/drb/ignore_test_drb.rb: new file.
-
-Mon Jan 3 07:27:46 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Mon Jan 3 07:46:42 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
* lib/webrick/httpauth/htpasswd.rb (WEBrick::Htpasswd#reload):
raise NotImplementedError if password is encrypted by digest
@@ -56284,46 +12839,6 @@ Mon Jan 3 07:27:46 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
* test/webrick/test_httpauth.rb: new file.
-Sun Jan 2 15:42:10 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-
- * lib/drb/drb.rb: add lazy stop_service.
-
- * lib/drb/extserv.rb: ditto.
-
-Sun Jan 2 01:17:17 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-
- * test/drb/drbtest.rb: add method DRbService.ext_service.
-
- * test/drb/test_drb.rb: ditto.
-
- * test/drb/test_drbssl.rb: ditto.
-
-Sat Jan 1 20:23:02 2005 Tanaka Akira <akr@m17n.org>
-
- * io.c (argf_readpartial): new method ARGF.readpartial.
- (io_getpartial): extracted from io_readpartial.
- (io_readpartial): call io_getpartial.
-
-Sat Jan 1 17:44:54 2005 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/http.rb (each_capitalized): should join header field
- value. This patch is contributed sheepman [ruby-list:40478]
-
- * test/net/http/test_httpheader.rb: test it.
-
-Sat Jan 1 16:21:29 2005 Minero Aoki <aamine@loveruby.net>
-
- * lib/fileutils.rb (copy_stream): use read/write instead of
- sysread/syswrite, which allows duck typing. [ruby-dev:25369]
-
- * lib/fileutils.rb (copy_stream): does NOT support nonblocking IO.
- [ruby-dev:25370]
-
- * lib/fileutils.rb (copy_entry): could not copy symlink.
-
- * test/fileutils/test_fileutils.rb: test copy_entry, copy_file,
- copy_stream.
-
Sat Jan 1 04:20:23 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
* ext/openssl/ossl_ns_spki.c (ossl_spki_set_challenge): should call
@@ -56335,29 +12850,8 @@ Sat Jan 1 01:13:28 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
Fri Dec 31 14:10:43 2004 Dave Thomas <dave@pragprog.com>
- * lib/rdoc/ri/ri_formatter.rb (RI::TextFormatter::display_flow_item):
- Fix problem if heading contains formatting.
-
-Fri Dec 31 00:08:02 2004 Tanaka Akira <akr@m17n.org>
-
- * configure.in (HAVE_RLIM_T): removed because not used.
-
-Thu Dec 30 22:45:39 2004 Tanaka Akira <akr@m17n.org>
-
- * rubyio.h: don't deprecate rb_read_check.
-
- * io.c (STDIO_READ_DATA_PENDING): reverted from old READ_DATA_PENDING
- to check stdio read buffer.
- (rb_read_check): use STDIO_READ_DATA_PENDING.
- (rb_read_pending): ditto.
- (rb_getc): ditto.
-
-Thu Dec 30 05:39:35 2004 Minero Aoki <aamine@loveruby.net>
-
- * parse.y: eliminate unused members in struct parser_params.
- [ruby-dev:25258] (again)
-
- * parse.y: make parser_new() static.
+ * lib/rdoc/ri/ri_formatter.rb (RI::TextFormatter::display_flow_item): Fix problem
+ if heading contains formatting.
Thu Dec 30 00:41:42 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
@@ -56375,11 +12869,6 @@ Tue Dec 28 22:31:46 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* string.c (rb_str_justify): create buffer string after argument type
conversion. fixed: [ruby-dev:25341]
-Tue Dec 28 17:18:17 2004 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * lib/net/telnet.rb (preprocess): remove NULL unless binmode.
- fixed: [ruby-list:40320]
-
Tue Dec 28 15:41:48 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/nkf/nkf-utf8/nkf.c (reinit): should initialize all static
@@ -56400,58 +12889,91 @@ Tue Dec 28 13:35:20 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/zlib/zlib.c (rb_deflate_init_copy): replace rb_deflate_clone.
+Tue Dec 28 12:26:45 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * win32/Makefile.sub, win32/setup.mak (RDOCTARGET, install,
+ install-nodoc, install-doc): rdoc support for mswin32.
+
+ * win32/configure.bat (--enable-install-doc, --disable-install-doc):
+ ditto.
+
Mon Dec 27 20:02:14 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tcltklib/tcltklib.c: fix SEGV bug when deleting Tk interp
* ext/tk/lib/multi-tk.rb: ditto
-Mon Dec 27 16:54:05 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Mon Dec 27 16:55:17 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
* ext/openssl/ossl_x509name.c (Init_ossl_x509name): should use
rb_hash_new to get exactly a Hash. fix [ruby-dev:25325].
-Mon Dec 27 15:29:12 2004 Minero Aoki <aamine@loveruby.net>
+Mon Dec 27 16:29:56 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
- * test/fileutils/test_fileutils.rb (cp_r): tested wrong file name.
- [ruby-dev:25339]
+ * string.c (rb_str_justify): [ruby-dev:25341]
-Mon Dec 27 15:15:18 2004 Minero Aoki <aamine@loveruby.net>
+Mon Dec 27 15:47:48 2004 Minero Aoki <aamine@loveruby.net>
+
+ * test/fileutils/fileasserts.rb: sync with HEAD.
+
+ * test/fileutils/test_fileutils.rb: ditto.
+
+ * test/fileutils/test_nowrite.rb: ditto.
+
+Mon Dec 27 15:21:07 2004 Minero Aoki <aamine@loveruby.net>
* lib/fileutils.rb (mv): should raise error when moving a
directory to the (empty) directory. [ruby-talk:124368]
+ (backport from HEAD 1.48)
* lib/fileutils.rb (mv): wrongly did not overwrite file on Win32
- platforms.
+ platforms. (backport from HEAD 1.48)
+
+Sat Dec 25 11:11:48 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-Mon Dec 27 14:36:20 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+ * stable version 1.8.2 released.
- * process.c (NUM2RLIM, RLIM2NUM): Without SIZEOF_RLIM_T is not error.
- fixed: [ruby-dev:25346]
+Sat Dec 25 04:23:49 2004 Minero Aoki <aamine@loveruby.net>
-Sun Dec 26 16:21:39 2004 Shugo Maeda <shugo@ruby-lang.org>
+ * lib/fileutils.rb (mkdir, mkdir_p): should ensure directory
+ permission. (backportted from HEAD, 1.47)
- * lib/net/imap.rb (Net::IMAP::PlainAuthenticator): added a new class
- to support the PLAIN authentication mechanism. Thanks, Benjamin
- Stiglitz.
+ * lib/fileutils.rb (traverse, remove_dir): untaint trasted
+ objects. (backportted from HEAD, 1.46)
Sat Dec 25 01:28:23 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
- * io.c (rb_f_select): [ruby-dev:25312]
+ * io.c: cancel io_reopen() change on Dec. 24th.
+
+ * dln.c: use <dlfcn.h> for NetBSD. [ruby-dev:25313]
+
+ * io.c (rb_f_select): IO list could be altered. [ruby-dev:25312]
+
+Fri Dec 24 23:51:48 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+
+ * bcc32/Makefile.sub: bcc32 should use RTL dll (backport from HEAD)
+ [ruby-dev:25306]
+
+ * win32/win32.[ch]: ditto.
Fri Dec 24 23:27:18 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tk/image.rb: TkPhotoImage#cget bug fix
-Fri Dec 24 03:06:13 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Dec 24 18:39:25 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+
+ * win32/win32.[ch]: failed to compile on bcc32 (and probably wince)
+ [ruby-dev:25306]
+
+Fri Dec 24 02:52:52 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (io_reopen, rb_io_reopen): prohibit to change access mode for
special IO ports. [ruby-dev:25225]
- * io.c (next_argv): reduce use of stdio.
-
Fri Dec 24 02:22:53 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/syck/rubyext.c (rb_syck_io_str_read): [ruby-core:03973]
+
* ext/syck/rubyext.c (syck_loader_transfer): check type conversion.
* ext/syck/rubyext.c (syck_parser_assign_io, rb_new_syck_node): duck
@@ -56471,20 +12993,11 @@ Fri Dec 24 01:21:00 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tkextlib/blt/tile/*.rb: ditto
-Thu Dec 23 23:43:24 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Dec 23 23:36:28 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * process.c (proc_setgroups): check if the argument length is
+ * process.c (proc_setgroups): check if the argument lenght is
modified. fixed: [ruby-dev:25285]
- * process.c (SIZEOF_RLIM_T): err if size of rlim_t is not set.
-
-Thu Dec 23 19:08:41 2004 Tanaka Akira <akr@m17n.org>
-
- * rubyio.h: rename FMODE_UNSEEKABLE to FMODE_DUPLEX.
-
- * io.c (io_check_tty): extracted function to set FMODE_LINEBUF and
- FMODE_DUPLEX.
-
Thu Dec 23 13:13:33 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tcltklib/tcltklib.c: define TclTkLib::COMPILE_INFO and
@@ -56496,6 +13009,10 @@ Thu Dec 23 13:13:33 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tk.rb: define Tk::RELEASE_DATE
+Thu Dec 23 09:38:31 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * io.c (io_reopen): restore exact mode. fixed: [ruby-core:04003]
+
Thu Dec 23 00:16:32 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (bsdi): use $(CC) for LDSHARED. fixed [ruby-dev:25270]
@@ -56510,49 +13027,41 @@ Wed Dec 22 08:34:32 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/dl/sym.c (rb_dlsym_initialize): extract internal pointers after
all argument conversion. fixed: [ruby-dev:25271]
-Tue Dec 21 16:15:21 2004 Michael Neumann <mneumann@ruby-lang.org>
-
- * lib/xmlrpc/client.rb: use "" instead of "." if prefix argument is
- nil in proxy methods. nil is default value.
-
- * test/xmlrpc/test_webrick_server.rb, test/xmlrpc/webrick_testing.rb:
- use threads instead of forking. this should fix issue #1208
- (http://rubyforge.org/tracker/?func=detail&atid=1698&aid=1208&group_id=426).
- removed testing of SSL enabled servlet as this hangs.
-
-Wed Dec 22 00:05:10 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+Wed Dec 22 00:08:01 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
* lib/soap/*, test/soap/*, sample/soap/authheader/*: eval cleanup.
-Tue Dec 21 22:07:41 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/ossl_asn1.c (ossl_asn1_decode_all): use rb_str_new4
- to avoid SEGV.
+Tue Dec 21 22:07:33 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
* ext/openssl/ossl_asn1.c (ossl_asn1_traverse, ossl_asn1_decode,
ossl_asn1_decode_all): temporary value should be marked volatile.
-Tue Dec 21 12:42:34 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Tue Dec 21 14:40:02 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
- * ext/openssl/ossl_asn1.c (ossl_asn1_traverse, ossl_asn1_decode):
- use rb_str_new4 to avoid SEGV. fix [ruby-dev:25261]
+ * ext/openssl/ossl_asn1.c (ossl_asn1_traverse, ossl_asn1_decode,
+ ossl_asn1_decode_all): use rb_str_new4 to avoid SEGV.
+ fix [ruby-dev:25261]
* test/openssl/test_asn1.rb: add tests for OpenSSL::ASN1.
+Tue Dec 21 12:22:40 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * io.c (io_reopen): keep duplex pipe in correct mode for exception
+ safeness. fixed: [ruby-dev:25152]
+
Tue Dec 21 12:10:04 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tk/grid.rb: rescue bug of 'grid configure' on Tcl/Tk8.3-
-Mon Dec 20 22:52:29 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+Tue Dec 21 00:53:01 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
- * added samples for the previous soap4r's commit.
+ * ext/openssl/ossl_asn1.c (ossl_asn1_traverse): [ruby-dev:25261]
-Mon Dec 20 22:56:39 2004 Tanaka Akira <akr@m17n.org>
+ * ext/openssl/ossl_asn1.c (ossl_asn1_decode): ditto.
- * gc.c (set_stack_end): gcc noinline attribute is available since
- gcc-3.1.
+ * ext/openssl/ossl_asn1.c (ossl_asn1_decode_all): ditto.
-Mon Dec 20 22:40:31 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+Mon Dec 20 23:22:26 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
* added files:
* lib/soap/mapping/wsdl*.rb
@@ -56566,6 +13075,8 @@ Mon Dec 20 22:40:31 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
* test/soap/*
* test/wsdl/*
* test/xsd/*
+ * sample/soap/*
+ * sample/sdl/*
* summary
* imported from the soap4r repository. Version: 1.5.3-ruby1.8.2
@@ -56579,14 +13090,12 @@ Mon Dec 20 22:40:31 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
* HTTP client/server gzipped content encoding support.
* improved WSDL schema definition support; still is far from
- complete, but is making step by step improvement.
-
-Mon Dec 20 14:45:19 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ complete, but is making step by step improovement.
- * lib/net/https.rb: delete descriptions about key_file and cert_file.
- fixed: [ruby-dev:25243]
+Mon Dec 20 22:56:39 2004 Tanaka Akira <akr@m17n.org>
- * ext/openssl/lib/net/telnets.rb: ditto.
+ * gc.c (stack_end_address): gcc noinline attribute is available since
+ gcc-3.1.
Mon Dec 20 14:07:02 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
@@ -56598,14 +13107,21 @@ Mon Dec 20 14:07:02 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tk/panedwindow.rb: ditto
-Mon Dec 20 13:51:40 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+Mon Dec 20 12:47:13 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
- * ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
+ * ext/openssl/lib/net/https.rb,protocols.rb,telnets.rb: delete
+ doc and code about SSLContext#{key_file,cert_file}.
+ fixed: [ruby-dev:25243]
+
+Mon Dec 20 12:42:17 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * io.c (io_fwrite): workaround for MSVCRT's bug.
+ fixed: [ruby-core:03982]
-Mon Dec 20 10:51:58 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Dec 20 11:21:04 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * parse.y (special_local_set): prevent the parser object from GC.
- fixed: [ruby-dev:25252]
+ * io.c (rb_io_eof): check if closed before clearerr().
+ fixed: [ruby-dev:25251]
Mon Dec 20 03:30:40 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
@@ -56616,10 +13132,40 @@ Mon Dec 20 01:51:01 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* struct.c (make_struct): [ruby-dev:25249]
-Mon Dec 20 00:16:54 2004 Kouhei Sutou <kou@cozmixng.org>
+Mon Dec 20 00:28:20 2004 Kouhei Sutou <kou@cozmixng.org>
+
+ * lib/rexml/encodings/SHIFT-JIS.rb: backported from CVS HEAD.
+
+ * lib/rexml/encodings/SHIFT_JIS.rb: ditto.
- * lib/rexml/encodings/SHIFT_JIS.rb: fixed LoadError bug.
- [ruby-core:3958]
+Sun Dec 19 17:19:48 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * ext/openssl/ossl_x509store.c
+ (ossl_x509store_set_time): add OpenSSL::X509::Store#time=.
+ (ossl_x509stctx_set_time): add OpenSSL::X509::StoreContext#time=.
+
+ * test/openssl/ossl_x509store.rb: test certificate validity times.
+
+ * ext/openssl/ossl_x509name.c (ossl_x509name_to_s): add optional
+ second argument to specify the output format (see also
+ X509_NAME_print_ex).
+
+ * ext/openssl/ossl_x509name.c (ossl_x509name_init): new constants:
+ OpenSSL::X509::Name::COMPAT, OpenSSL::X509::Name::RFC2253,
+ OpenSSL::X509::ONELINE, OpenSSL::X509::MULTILINE.
+
+ * ext/openssl/lib/openssl/x509.rb (OpenSSL::X509::Name::RFC2253DN):
+ new module to provide the parse for RFC2253 DN format.
+
+ * ext/openssl/lib/openssl/x509.rb (OpenSSL::X509::Name.parse_rfc2253):
+ new method to parse RFC2253 DN format.
+
+ * test/openssl/ossl_x509name.rb: add tests about RFC2253 DN.
+
+ * text/openssl/ssl_server.rb: try to listen ports from 20443 to 20542
+ while EADDRINUSE is raised.
+
+ * all changes in this entry are backport from 1.9.
Sun Dec 19 17:24:59 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
@@ -56641,7 +13187,7 @@ Sat Dec 18 16:36:23 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/zlib/zlib.c (rb_deflate_s_deflate, rb_inflate_s_inflate):
disallow interrupt by type conversion. fixed: [ruby-dev:25226]
-Sat Dec 18 15:09:02 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+Sat Dec 18 15:16:41 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
* lib/webrick/httpauth.rb,
lib/webrick/httpauth/{basicauth.rb,digestauth.rb}: use
@@ -56652,12 +13198,10 @@ Sat Dec 18 10:51:01 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
- * io.c (rb_f_open): add type check for return value from to_open.
+Fri Dec 17 18:07:01 2004 Shugo Maeda <shugo@ruby-lang.org>
-Fri Dec 17 16:44:26 2004 Tanaka Akira <akr@m17n.org>
-
- * configure.in (ac_cv_sizeof_rlim_t): set 8 for BSD/OS.
- Reported by OHARA Shigeki. [ruby-dev:25236]
+ * test/readline/test_readline.rb: fix for BSD. Thanks, GOTOU Yuuzou.
+ fixed: [ruby-dev:25218]
Fri Dec 17 16:28:12 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
@@ -56695,27 +13239,45 @@ Fri Dec 17 16:28:12 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tk/textwindow.rb: wrong gravity of text mark for
embedded window
+Fri Dec 17 13:50:00 2004 Akiyoshi, Masamichi <akiyoshi@hp.com>
+
+ * vms/vmsruby_private.c, vms/vmsruby_private.h: private routines
+ for VMS port are added.
+
+ * eval.c (ruby_init): change to call VMS private intialization routine.
+
Fri Dec 17 13:33:58 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/cgi/session.rb (CGI::Session#initialize): control adding
session_id hidden fields. fixed: [ruby-talk:123850]
-Fri Dec 17 00:01:48 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Dec 16 23:25:25 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+
+ * lib/drb/drb.rb, lib/drb/ssl.rb: backported from CVS HEAD.
+ [druby-ja:101]
+
+ * test/drb/test_drb.rb: adjust and reduce sleep (backported from
+ CVS HEAD.)
- * eval.c (rb_proc_arity, rb_node_arity, rb_mod_method_arity,
- rb_obj_method_arity): new functions to obtain method arity.
- [ruby-dev:25143]
+Thu Dec 16 18:44:58 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * lib/webrick/httpserver.rb (WEBrick::HTTPServer#run): should wait
+ for reading request till data arrive. [ruby-talk:121068]
-Thu Dec 16 23:31:13 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/webrick/server.rb (WEBrick::GenericServer#start_thread):
+ should log about all accepted socket. [ruby-core:03962]
- * lib/mkmf.rb (create_makefile): create RUBYARCHDIR also when no extension
- is installed. fixed: [ruby-dev:25215]
+ * lib/webrick/accesslog.rb (WEBrick::AccessLog#setup_params):
+ "%%" and "%u" are supported. [webricken:135]
-Thu Dec 16 22:36:57 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+ * lib/webrick/httpservlet/filehandler.rb
+ (WEBrick::HTTPServlet::FileHandler#check_filename):
+ :NondisclosureName is acceptable if it is Enumerable.
- * test/drb/test_drb.rb: adjust and reduce sleep.
+ * lib/webrick/config.rb (WEBrick::Config::FileHandler):
+ default value of :NondisclosureName is [".ht*", "*~"].
-Thu Dec 16 18:37:08 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Thu Dec 16 18:36:52 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
* ext/openssl/ossl.c (ossl_raise): refine message format.
@@ -56754,64 +13316,55 @@ Thu Dec 16 16:03:50 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tkextlib/*: ditto
-Thu Dec 16 04:02:28 2004 Minero Aoki <aamine@loveruby.net>
-
- * ext/ripper/extconf.rb: bison is not needed if ripper.c exists.
- [ruby-dev:25191]
+Thu Dec 16 03:14:28 2004 Minero Aoki <aamine@loveruby.net>
-Thu Dec 16 03:27:10 2004 Minero Aoki <aamine@loveruby.net>
+ * lib/net/http.rb (basic_encode): return value of pack('m') may
+ include multiple CR/LFs. Backported from main trunk (rev 1.112).
+ [ruby-dev:25212]
- * lib/net/http.rb: remove junk.
+Thu Dec 16 00:33:37 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-Thu Dec 16 00:57:30 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/syck/rubyext.c (rb_syck_io_str_read): [ruby-core:03973]
+ * hash.c (Init_Hash): remove custom "hash" and "eql?".
-Thu Dec 16 00:43:29 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+Wed Dec 15 18:57:01 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/drb/drb.rb: changed default binded address family to use an
- available address family of host name. [druby-ja:101]
+ * lib/set.rb (Set::eql): wrong definition. [ruby-dev:25207]
- * lib/drb/ssl.rb: ditto
+Wed Dec 15 18:48:42 2004 Shugo Maeda <shugo@ruby-lang.org>
-Wed Dec 15 17:47:17 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * ext/curses/curses.c (window_subwin): call NUM2INT() before
+ GetWINDOW(). (backported from CVS HEAD)
- * lib/webrick/server.rb (WEBrick::GenericServer#start_thread):
- should log about all accepted socket. [ruby-core:03962]
+Wed Dec 15 17:03:50 2004 NAKAMURA Usaku <usa@ruby-lang.org>
- * lib/webrick/accesslog.rb (WEBrick::AccessLog#setup_params):
- "%%" and "%u" are supported. [webricken:135]
+ * win32/win32.[ch] (rb_w32_isatty): new function to replace MSVCRT's
+ isatty because it never sets errno. (backported from CVS HEAD)
- * lib/webrick/httpservlet/filehandler.rb
- (WEBrick::HTTPServlet::FileHandler#check_filename):
- :NondisclosureName is acceptable if it is Enumerable.
+Wed Dec 15 15:39:32 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
- * lib/webrick/config.rb (WEBrick::Config::FileHandler):
- default value of :NondisclosureName is [".ht*", "*~"].
+ * ext/openssl/ossl_x509name.c (ossl_x509name_to_a): avoid SEGV
+ (rollback the previous commit).
Wed Dec 15 16:10:23 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* object.c (rb_obj_id_obsolete): warn always.
+ * eval.c (rb_enable_super): ditto.
+
Wed Dec 15 15:31:02 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/set.rb (Set#==): [ruby-dev:25206]
-Wed Dec 15 14:32:18 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+Wed Dec 15 14:22:10 2004 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/win32.c (rb_w32_fdisset): check whether the handle is valid.
+ fixed: [ruby-core:03959]
Wed Dec 15 10:30:37 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* ext/openssl/ossl_digest.c (ossl_digest_initialize): [ruby-dev:25198]
-Tue Dec 14 19:17:15 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * utf8.c (utf8_is_mbc_ambiguous): [ruby-talk:123561]
-
- * utf8.c (utf8_mbc_to_normalize): ditto.
-
-Tue Dec 14 17:08:15 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+Tue Dec 14 17:10:09 2004 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/win32.c (rb_w32_close): need to reset osfhnd().
@@ -56825,36 +13378,27 @@ Tue Dec 14 12:36:04 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/cgi/session.rb (CGI::Session::initialize): generate new
session if given session_id does not exist. [ruby-list:40368]
-Tue Dec 14 08:47:45 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (Init_eval): should mark ruby_eval_tree. [ruby-dev:25189]
-
Mon Dec 13 18:13:52 2004 Tanaka Akira <akr@m17n.org>
- * gc.c (set_stack_end): new function to obtain stack end address.
- set_stack_end obtains a stack end address by an address of local
- variable in the function.
- (SET_STACK_END, STACK_END): use set_stack_end. don't use alloca.
+ * gc.c (stack_end_address): new function to obtain stack end address.
+ stack_end_address calls __builtin_frame_address(0) to obtain the
+ frame pointer of a stack frame of stack_end_address. The address
+ is the stack pointer of the caller's stack frame.
+ (SET_STACK_END): use stack_end_address.
This makes the conservative garbage collector to scan a stack frame
of the garbage_collect function itself. This is required because
callee-save registers may be stored in the frame.
[ruby-dev:25158]
-Mon Dec 13 02:45:51 2004 Shugo Maeda <shugo@ruby-lang.org>
-
- * ext/curses/curses.c (window_subwin): call NUM2INT() before
- GetWINDOW(). fixed: [ruby-dev:25161]
-
Mon Dec 13 00:58:02 2004 Tanaka Akira <akr@m17n.org>
* lib/pathname.rb (cleanpath_aggressive): make it private.
(cleanpath_conservative): ditto.
Suggested by Daniel Berger. [ruby-core:3914]
-Sun Dec 12 21:32:14 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun Dec 12 20:06:38 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
- * test/ruby/test_super.rb (TestSuper#test_define_method): now methods
- from procs can call super.
+ * lib/drb/drb.rb: backported from CVS HEAD.
Sun Dec 12 10:35:10 2004 Dave Thomas <dave@pragprog.com>
@@ -56866,7 +13410,14 @@ Sun Dec 12 10:14:03 2004 Dave Thomas <dave@pragprog.com>
* lib/rdoc/rdoc.rb (RDoc::RDoc::parse_files): Never exclude files
explicitly given on the command line.
-Sat Dec 11 21:10:16 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+Sun Dec 11 23:54:07 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/*: update to support libraries in ActiveTcl8.4.12.0
+ (see ext/tk/ChangeLog.tkextlib).
+
+ * ext/tk/sample/scrollframe.rb: add a new sample.
+
+Sat Dec 11 20:12:21 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
* lib/drb/drb.rb: add DRbRemoteError. [ruby-list:40348],
[ruby-list:40390]
@@ -56875,27 +13426,41 @@ Sat Dec 11 21:10:16 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
* test/drb/ut_drb.rb: ditto.
-Sat Dec 11 13:08:28 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat Dec 11 15:38:14 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * lib/jcode.rb (String::succ): [ruby-dev:25156]
+
+Sat Dec 11 12:41:55 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * eval.c (run_trap_eval): prototype; avoid VC++ warnings.
- * sample/optparse/subcommand.rb: a sample for sub commands like
- cvs. contributed by Minero Aoki.
+ * ext/socket/getaddrinfo.c: fix typo. fixed: [ruby-core:03947]
-Fri Dec 10 08:39:48 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * win32/win32.c: need to include dln.h.
+
+Sat Dec 11 00:10:18 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * io.c (io_reopen): [ruby-dev:25150]
+
+Fri Dec 10 08:39:27 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/socket/socket.c (sock_listen): get OpenFile just before calling
- listen(2).
+ listen(2). fixed: [ruby-dev:25149]
-Thu Dec 9 16:28:35 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+Thu Dec 9 17:00:00 2004 Akiyoshi, Masamichi <akiyoshi@hp.com>
- * ext/sdbm/init.c (GetDBM): typo.
+ * ext/socket/socket.c, ext/socket/getaddrinfo.c: port to VMS
+
+Thu Dec 9 16:31:02 2004 NAKAMURA Usaku <usa@ruby-lang.org>
-Thu Dec 9 16:21:51 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * ext/sdbm/init.c (GetDBM): typo.
- * lib/webrick/cgi.rb (WEBrick::CGI#setup_header): avoid
- SecurityError. [ruby-dev:24970]
+Thu Dec 9 16:05:00 2004 Akiyoshi, Masamichi <akiyoshi@hp.com>
- * lib/webrick/httpserver.rb (WEBrick::HTTPServer#run): should wait
- for reading request till data arrive. [ruby-talk:121068]
+ * defines.h: change path of vms.h
+ * vms/vms.h: delete reference for snprintf()
+ * vms/config.h: new file
+ * vms/config.h_in: deleted
Thu Dec 9 14:38:35 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
@@ -56904,10 +13469,6 @@ Thu Dec 9 14:38:35 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* string.c (rb_str_dump): not escape # which isn't a substitution.
-Thu Dec 9 12:31:53 2004 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * io.c (pipe_open): should set prog if argc != 0.
-
Thu Dec 9 10:54:36 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* ext/dbm/dbm.c (fdbm_select): [ruby-dev:25132]
@@ -56916,11 +13477,6 @@ Thu Dec 9 10:54:36 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* ext/gdbm/gdbm.c: ditto.
-Thu Dec 9 10:19:18 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/socket/test_socket.rb (test_setsockopt): use SO_LINGER instead
- of SO_BINDTODEVICE. fixed: [ruby-dev:25133]
-
Thu Dec 9 03:08:36 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tcltklib/tcltklib.c (ip_init): set root-win title to "ruby" when
@@ -56975,174 +13531,44 @@ Wed Dec 8 23:54:29 2004 Dave Thomas <dave@pragprog.com>
* lib/rdoc/generators/template/html/html.rb (RDoc::Page): Typo
meant that h2 tag was invisible.
-Wed Dec 8 22:10:02 2004 Tanaka Akira <akr@m17n.org>
-
- * rubyio.h, io.c, ext/dl/dl.c, ext/pty/pty.c, ext/socket/socket.c:
- create FILE object only when required: popen(3) and DL's IO#to_ptr.
- [ruby-dev:25122]
-
- * io.c (rb_io_binmode): use setmode for Human68k. [ruby-dev:25121]
-
-Wed Dec 8 20:13:06 2004 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * process.c (rb_spawn): support for DJGPP.
+Wed Dec 8 21:56:31 2004 Kouhei Sutou <kou@cozmixng.org>
- * lib/mkmf.rb (VPATH): specify the implicit path separator for DJGPP.
-
-Wed Dec 8 17:48:22 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (proc_invoke): merge Guy Decoux's argument preserve
- patch in [ruby-core:03874].
-
-Wed Dec 8 17:37:33 2004 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (rb_w32_pipe_exec): need to close original socket
- handle.
+ * lib/rss, test/rss, sample/rss: backported from CVS HEAD.
Wed Dec 8 14:31:36 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
- * sprintf.c (rb_f_sprintf): [ruby-dev:25104]
-
-Wed Dec 8 13:49:46 2004 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (rb_w32_pipe_exec): must close original handle
- before exec. fixed: [ruby-dev:25112]
-
-Wed Dec 8 11:46:26 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (string_content): get rid of segfault at empty evstr.
- fixed: [ruby-dev:25113]
-
-Wed Dec 8 03:26:51 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/ossl_bio.c (ossl_obj2bio): should not use fptr->f.
- [ruby-dev:25101]
-
-Wed Dec 8 03:26:41 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * runruby.rb: prepend LIBRUBY_SO to LD_PRELOAD as well as rubytest.rb.
-
-Wed Dec 8 01:35:44 2004 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (is_socket): reorder of function definitions.
-
-Wed Dec 8 00:44:31 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+ * io.c (io_fwrite): change dereference for cosmetic reason.
- * io.c (pipe_open): win32 bidirectional pipe support.
-
- * win32/win32.[ch] (rb_w32_pipe_exec): ditto.
-
- * win32/win32.[ch] (socketpair): new function. POSIX socketpair
- emulation.
-
- * win32/win32.c (socketpair_internal): ditto.
-
-Wed Dec 8 00:25:07 2004 Kouhei Sutou <kou@cozmixng.org>
-
- * test/rss/test_version.rb: added version check test.
- [ruby-dev:25053]
-
-Tue Dec 7 15:40:38 2004 Tanaka Akira <akr@m17n.org>
-
- * io.c (io_fwrite): avoid context switch before writing to stderr.
- [ruby-dev:25080]
-
- * rubyio.h: refine deprecated declaration.
-
- * configure.in, file.c, io.c: remove useless check: fseeko, etc.
-
-Tue Dec 7 13:42:07 2004 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * dir.c (dir_s_mkdir): win32 special processing doesn't need any
- longer.
+ * sprintf.c (rb_f_sprintf): [ruby-dev:25104]
- * win32/win32.[ch] (rb_w32_mkdir): new function. POSIX.1 compatible
- interface.
+Tue Dec 7 19:08:00 2004 Akiyoshi, Masamichi <akiyoshi@hp.com>
- * win32/win32.[ch] (rb_w32_rmdir): new function.
+ * io.c (io_fwrite): fix offset incrementation (for VMS and Human68k)
Tue Dec 7 00:27:37 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* process.c (proc_setgroups): [ruby-dev:25081]
-Mon Dec 6 23:07:57 2004 Tanaka Akira <akr@m17n.org>
-
- * configure.in: check -lsocket for socketpair and shutdown.
- reported by Ville Mattila. [ruby-core:03903]
-
-Mon Dec 6 23:00:45 2004 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * configure.in (ac_cv_sizeof_rlim_t): setup for DJGPP.
-
- * io.c (is_socket, shutdown): define dummy macros for DJGPP.
-
- * process.c: use SIZEOF_RLIM_T instead of HAVE_RLIM_T for DJGPP.
-
-Mon Dec 6 21:19:40 2004 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * io.c (is_socket): fix typos. [ruby-core:03900]
-
-Mon Dec 6 20:13:28 2004 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * io.c (is_socket): new function.
-
- * io.c (rb_io_close_read, rb_io_close_write): use is_socket().
-
- * io.c (rb_io_fptr_finalize): need to check fptr->f before calling
- rb_io_fptr_cleanup().
-
- * io.c (pipe_open): win32 pipe support (experimental).
-
- * win32/win32.[ch] (rb_w32_pipe_exec): return file descriptors
- instead of FILE structure objects.
-
- * win32/win32.[ch] (rb_w32_is_socket): new function.
-
-Mon Dec 6 19:40:40 2004 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * Makefile.in (.y.c): simplify the rule.
-
Mon Dec 6 18:08:10 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* re.c (rb_reg_eqq): document fix. [ruby-talk:122541]
-Mon Dec 6 17:49:30 2004 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * eval.c (run_trap_eval): add prototype for Microsoft compiler.
+Mon Dec 6 17:19:13 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Mon Dec 6 17:32:38 2004 Tanaka Akira <akr@m17n.org>
+ * rubysig.h (TRAP_BEG, TRAP_END): safe errno around CHECK_INTS.
+ (backported from CVS HEAD) [ruby-dev:24993]
- * rubyio.h, intern.h, io.c, file.c, process.c, ext/socket/socket.c,
- ext/pty/pty.c, ext/io/wait/wait.c, ext/openssl/ossl_ssl.c:
- Use own buffering mechanism instead of stdio. [ruby-dev:25056]
+Mon Dec 6 10:18:17 2004 Dave Thomas <dave@pragprog.com>
- * io.c, ext/stringio/stringio.c, test/ruby/ut_eof.rb:
- EOF flag removed.
-
-Mon Dec 6 17:15:17 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/socket/test_socket.rb (TestBasicSocket#test_setsockopt):
- BasicSocket#setsockopt dumps core. [ruby-dev:25039]
-
- * test/socket/test_tcp.rb (TestTCPSocket#test_recvfrom):
- TCPSocket#recvfrom dumps core. [ruby-dev:24705]
-
- * test/socket/test_udp.rb (TestUDPSocket#test_connect):
- UDPSocket#connect dumps core. [ruby-dev:25045]
-
- * test/socket/test_udp.rb (TestUDPSocket#test_bind):
- UDPSocket#bind dumps core. [ruby-dev:25057]
+ * lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::look_for_directives_in):
+ Oops - 1.8 doesn't have String#clear
Mon Dec 6 09:59:23 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
- * io.c (io_fread): take VALUE argument.
-
* ext/socket/socket.c (sock_connect): use rb_str_new4().
[ruby-dev:25052]
- * eval.c (rb_yield_0): [ruby-dev:25051]
-
-Mon Dec 6 01:32:31 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Mon Dec 6 01:42:08 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
* ext/openssl/ossl_pkey_rsa.c (ossl_rsa_public_encrypt,
ossl_rsa_public_decrypt, ossl_rsa_private_encrypt,
@@ -57163,11 +13589,6 @@ Sun Dec 5 19:39:17 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/optparse.rb (OptionParser#order!): ignore case only for long
option. [ruby-dev:25048]
-Sun Dec 5 00:54:32 2004 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * mkconfig.rb: setup library paths before requiring library.
- [ruby-core:03892]
-
Sat Dec 4 22:54:15 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* io.c (io_write): remove rb_str_locktmp(). [ruby-dev:25050]
@@ -57191,29 +13612,10 @@ Sat Dec 4 22:54:15 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* hash.c (rb_hash_hash): should provide "hash" method where "eql?"
is redefined. [ruby-talk:122482]
-Sat Dec 4 21:29:05 2004 Minero Aoki <aamine@loveruby.net>
-
- * lib/fileutils.rb: (In previous commit) new method chown.
-
- * lib/fileutils.rb: (In previous commit) new method chown_R.
+Sat Dec 4 14:54:52 2004 WATANABE Hirofumi <eban@ruby-lang.org>
- * lib/fileutils.rb: (In previous commit) new method chmod_R
- wrongly added. Removed now.
-
-Sat Dec 4 20:45:52 2004 Minero Aoki <aamine@loveruby.net>
-
- * lib/fileutils.rb (mkdir, mkdir_p): should chmod explicitly.
- [ruby-core:03881]
-
-Sat Dec 4 18:54:09 2004 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/rss.rb: removed empty lines from output.
-
-Sat Dec 4 18:49:09 2004 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/rss.rb (RSS::VERSION): 0.1.1 -> 0.1.2
-
- * lib/rss/rss.rb: #item=/#set_item and so on are obsolete.
+ * eval.c (proc_invoke): use volatile `tmp' rather than `args'.
+ [ruby-core:03882]
Sat Dec 4 14:28:56 2004 Dave Thomas <dave@pragprog.com>
@@ -57227,13 +13629,48 @@ Sat Dec 4 14:28:56 2004 Dave Thomas <dave@pragprog.com>
The lines before :section: are removed, and identical lines at the end are
also removed if present.
+Sat Dec 4 03:33:45 2004 Shugo Maeda <shugo@ruby-lang.org>
+
+ * ext/readline/readline.c: check $SAFE. (backported from CVS HEAD)
+
+ * test/readline/test_readline.rb: added tests for readline.
+ (backported from CVS HEAD)
+
+Sat Dec 4 02:24:00 2004 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * ext/nkf/nkf.c: add constant NKF::VERSION
+
+ * ext/nkf/nkf.c(guess): this becomes an alias of guess2
+
+ * ext/nkf/test.rb(mime_out2): add --no-cp932
+
+ * ext/nkf/nkf-utf8/nkf.c: original nkf2 revision 1.47
+
Sat Dec 4 00:35:08 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* ext/socket/socket.c (bsock_setsockopt): [ruby-dev:25039]
-Fri Dec 3 12:25:21 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Dec 3 18:57:03 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * lib/ostruct.rb: 1.9 marshaling support back-ported.
+ [ruby-core:03871]
+
+Fri Dec 3 13:45:20 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
- * st.h: fix prototype for C++.
+ * eval.c (proc_invoke): copy arguments to frame.argv.
+ [ruby-core:03861]
+
+Fri Dec 3 12:25:41 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * st.h: fix prototypes.
+
+Fri Dec 3 00:21:05 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * object.c (convert_type): use rb_respond_to() again.
+ [ruby-dev:25021]
+
+ * eval.c (rb_respond_to): funcall respond_to? if it's redefined.
+ [ruby-dev:25021]
Fri Dec 3 01:55:24 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
@@ -57253,25 +13690,6 @@ Fri Dec 3 01:55:24 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/sample/demos-jp/widget: ditto.
-Fri Dec 3 00:21:05 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (proc_invoke): prepare to pass a block from "call" method
- to a Proc generated by Method#to_proc. [ruby-dev:25031]
-
- * eval.c (rb_yield_0): actually passes a block given to "call".
-
- * object.c (convert_type): use rb_respond_to() again. this fix is
- based on [ruby-dev:25021]
-
- * eval.c (rb_respond_to): funcall respond_to? if it's redefined.
- [ruby-dev:25021]
-
-Thu Dec 2 15:13:53 2004 Michael Neumann <mneumann@ruby-lang.org>
-
- * test/xmlrpc/test_parser.rb, test/xmlrpc/data/*.expected: Expected
- values are now stored in YAML instead of using #inspect. This fixes
- false hash order.
-
Fri Dec 3 00:11:48 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* io.c (rb_file_initialize): [ruby-dev:25032]
@@ -57284,16 +13702,12 @@ Thu Dec 2 16:41:03 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (rb_callcc, rb_cont_call): prohibit calling from different
signal contexts. [ruby-dev:25022]
-Thu Dec 2 10:45:02 2004 Shugo Maeda <shugo@ruby-lang.org>
-
- * test/readline/test_readline.rb: fix for NetBSD.
-
Thu Dec 2 09:57:24 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/ostruct.rb (OpenStruct::Marshaler): OpenStruct can be
marshaled again. [ruby-core:03862]
-Thu Dec 2 09:30:58 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Dec 2 09:30:06 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (thread_mark): mark thread group. [ruby-dev:25020]
@@ -57303,56 +13717,35 @@ Thu Dec 2 07:57:16 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* io.c (rb_io_ctl): [ruby-dev:25019]
-Wed Dec 1 06:13:00 2004 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/nkf/nkf.c: add constant NKF::VERSION
-
- * ext/nkf/nkf.c(guess): this becomes an alias of guess2
-
- * ext/nkf/test.rb: add --no-cp932
-
- * ext/nkf/nkf-utf8/nkf.c: original nkf2 revision 1.47
-
Wed Dec 1 02:21:02 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* signal.c (sighandler): call handler immediately only for default
handlers. [ruby-dev:25003]
-Tue Nov 30 23:49:12 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (pipe_open): errno should be preserved for rb_sys_fail() when
- fork failed.
-
-Tue Nov 30 16:18:50 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+Tue Nov 30 23:38:18 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (io_fread): need not to null terminate. [ruby-dev:24998]
- * eval.c (rb_eval): should check previous frame for ZSUPER.
-
* io.c (read_all): remove unnecessary rb_str_resize().
- [ruby-dev:24996]
+ [ruby-dev:24996] (backported from CVS HEAD)
* io.c (io_readpartial): ditto.
* io.c (io_read): ditto.
-Tue Nov 30 14:58:33 2004 WATANABE Hirofumi <eban@ruby-lang.org>
+Tue Nov 30 16:18:50 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
- * instruby.rb (install): add arguments explicitly to "super".
+ * io.c (io_fread): need not to null terminate. [ruby-dev:24998]
-Tue Nov 30 00:49:08 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * io.c (read_all): remove unnecessary rb_str_resize().
+ [ruby-dev:24996]
- * eval.c (PUSH_FRAME): flags should have been initialized.
+ * io.c (io_read): ditto.
- * eval.c (rb_eval): [ruby-core:03856]
+Tue Nov 30 00:49:08 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* io.c (rb_io_sysread): use temporary lock. [ruby-dev:24992]
-Tue Nov 30 00:12:57 2004 Kazuo Saito <ksaito@uranus.dti.ne.jp>
-
- * regparse.c: now handles many alternatives (over 500000)
- in regexp. [ruby-dev:24773]
-
Mon Nov 29 16:06:04 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/stringio/stringio.c (strio_write): insufficiently filled string
@@ -57370,19 +13763,10 @@ Mon Nov 29 15:22:28 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* test/io/nonblock/test_flush.rb: abandon tests when io/nonblock is
not supported.
-Mon Nov 29 13:37:54 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (fptr_finalize): must not use FILE after fclose().
- [ruby-dev:24985]
-
-Mon Nov 29 13:13:13 2004 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (CreateChild): push back the last space before next
- loop because CharNext() eats it.
-
Mon Nov 29 03:08:30 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
- * object.c (convert_type): [ruby-core:03845]
+ * object.c (convert_type): direct call conversion methods for the
+ performance. [ruby-core:03845]
* eval.c (rb_funcall_rescue): new function.
@@ -57390,57 +13774,30 @@ Mon Nov 29 03:08:30 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* object.c (rb_Integer): ditto.
- * eval.c (get_backtrace): no conversion for nil.
-
* parse.y (reduce_nodes): empty body should return nil.
-Mon Nov 29 01:18:18 2004 Tanaka Akira <akr@m17n.org>
-
- * io.c (rb_io_check_writable): call io_seek regardless of
- NEED_IO_SEEK_BETWEEN_RW. [ruby-dev:24986]
-
-Sun Nov 28 15:57:58 2004 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/rss.rb (RSS::Element#tag): not use block_given? for
- working with ruby 1.6 again.
-
- * lib/rss/{0.9,2.0,trackback}.rb, lib/rss/maker/base.rb:
- undef -> remove_method for working with ruby 1.6 again.
-
-Sun Nov 28 15:51:40 2004 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/rss.rb (RSS::NotSetError): added.
-
- * lib/rss/maker/{1.0,0.9,2.0}.rb: changed RSS Maker to raise
- RSS::NotSetError if required values of maker.channel are not
- set. [ruby-talk:120061]
-
- * test/rss/test_maker_{1.0,0.9,2.0}.rb: changed tests to check RSS
- Maker raises or not.
-
-Sun Nov 28 12:14:47 2004 Kazuo Saito <ksaito@uranus.dti.ne.jp>
-
- * regparse.c (fetch_token): fixed test failure on HP-UX ia64
- ([ruby-dev:24859]).
+ * string.c (rb_str_aset): the original string should not be
+ affected by modifying duplicated string. [ruby-dev:24981]
-Sun Nov 28 12:08:15 2004 Kazuo Saito <ksaito@uranus.dti.ne.jp>
+Mon Nov 29 13:57:38 2004 NAKAMURA Usaku <usa@ruby-lang.org>
- * regparse.c, test/ruby/test_regexp.rb: fixed problem with UTF-8
- characters that have U+00FE or invalid characters.
+ * win32/win32.c (CreateChild): search executable file if no program
+ name given. (backported from CVS HEAD)
-Sun Nov 28 12:07:04 2004 Kazuo Saito <ksaito@uranus.dti.ne.jp>
+Mon Nov 29 13:37:54 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * regexec.c, test/ruby/test_regexp.rb: fixed segmentation fault
- ([ruby-dev:24887]).
+ * io.c (fptr_finalize): must not use FILE after fclose().
+ [ruby-dev:24985]
-Sun Nov 28 12:05:48 2004 Kazuo Saito <ksaito@uranus.dti.ne.jp>
+Mon Nov 29 13:16:31 2004 NAKAMURA Usaku <usa@ruby-lang.org>
- * regcomp.c, regint.h: fixed PLATFORM_UNALIGNED_WORD_ACCESS
- problem ([ruby-dev:24802] and [ruby-core:3733])
+ * win32/win32.c (CreateChild): push back the last space before next
+ loop because CharNext() eats it.
-Sat Nov 27 23:43:39 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+Mon Nov 29 01:18:18 2004 Tanaka Akira <akr@m17n.org>
- * io.c (rb_io_initialize): [ruby-dev:24972]
+ * io.c (rb_io_check_writable): call io_seek regardless of
+ NEED_IO_SEEK_BETWEEN_RW. [ruby-dev:24986]
Sat Nov 27 21:43:39 2004 Tanaka Akira <akr@m17n.org>
@@ -57452,36 +13809,10 @@ Sat Nov 27 21:43:39 2004 Tanaka Akira <akr@m17n.org>
(rb_io_fwrite): wrapper for io_fwrite now.
(io_write): call io_fwrite instead of rb_io_fwrite.
-Sat Nov 27 17:43:21 2004 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/{0.9,1.0,2.0,trackback,xml-stylesheet}.rb: added
- #setup_maker.
-
- * test/rss/test_setup_maker_*.rb: added tests for #setup_maker.
-
- * lib/rss/maker/base.rb(RSS::Maker::Items#max_size=): supported
- output item size limitation.
-
- * sample/rss/blend.rb: added sample for RSS Maker.
-
-Sat Nov 27 17:41:35 2004 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/maker/0.9.rb: supported RSS::Maker.make("0.91"). Now,
- "0.9" is just alias of "0.91."
-
- * test/rss/test_maker_0.9.rb: make("0.9") -> maker("0.91").
-
- * test/rss/test_to_s.rb: ditto.
-
-Sat Nov 27 17:21:30 2004 Kouhei Sutou <kou@cozmixng.org>
-
- * sample/rss/list_description.rb: untabified.
-
- * sample/rss/rss_recent.rb: ditto.
-
Sat Nov 27 14:44:15 2004 Kent Sibilev <ksibilev@bellsouth.net>
- * lib/cgi/session.rb (CGI::Session::initialize): [ruby-core:03832]
+ * lib/cgi/session.rb (CGI::Session::initialize): create_new_id is
+ now a instance method. [ruby-core:03832]
Sat Nov 27 09:41:21 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
@@ -57499,18 +13830,8 @@ Fri Nov 26 18:02:44 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tkextlib/*: some methods uses TkWindow#epath
-Fri Nov 26 14:29:39 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_io_initialize): uninitialized fd was checked to see open
- mode. [ruby-dev:24963]
-
- * io.c (rb_io_initialize): uninitialized fd was used. [ruby-dev:24962]
-
Fri Nov 26 13:49:06 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
- * io.c (rb_io_initialize): should retrieve flags from copying file
- descriptor. [ruby-dev:24961]
-
* eval.c (method_missing): raise TypeError for classes do not
have allocators. [ruby-core:03752]
@@ -57532,17 +13853,12 @@ Thu Nov 25 20:14:57 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/thwait.rb (ThreadsWait#join_nowait): abnormally terminated
threads should be also processed. [ruby-talk:121320]
-Thu Nov 25 18:06:37 2004 Tanaka Akira <akr@m17n.org>
+Thu Nov 25 10:14:26 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * configure.in: AC_CHECK_SIZEOF(rlim_t) to include stdio.h to fix
- problem with autoconf 2.52 or earlier.
- revert AC_PREREQ to 2.50.
- [ruby-core:3809]
+ * dir.c (push_braces): do not reuse buffer strings. [ruby-core:03806]
Thu Nov 25 07:59:41 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
- * configure.in: AC_PREREQ(2.53) [ruby-core:03800]
-
* io.c (read_all): stringify non-nil buffer argument, and always
taint the result. [ruby-dev:24955]
@@ -57573,12 +13889,13 @@ Tue Nov 23 00:10:48 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* dir.c (dir_seek): use NUM2OFFT().
- * misc/ruby-mode.el (ruby-non-block-do-re): [ruby-core:03719]
+ * misc/ruby-mode.el (ruby-non-block-do-re): should not match words
+ start with block keyword and underscore. [ruby-core:03719]
Mon Nov 22 22:33:02 2004 Dave Thomas <dave@pragprog.com>
* lib/rdoc/parsers/parse_rb.rb (RDoc::parse_require): Don't use names
- of variables or constants when parsing 'require'
+ of variables or constants when oarsing 'require'
Mon Nov 22 00:13:35 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
@@ -57588,7 +13905,7 @@ Mon Nov 22 00:13:35 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
Sat Nov 20 23:57:33 2004 Dave Thomas <dave@pragprog.com>
* lib/rdoc/README (et al): Add a new directive, :section:, and
- change the output format to accommodate. :section: allows to to
+ change the output format to accomodate. :section: allows to to
group together methods, attributes, constants, etc under
headings in the output. If used, a table of contents is
generated.
@@ -57603,25 +13920,9 @@ Sat Nov 20 23:55:19 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* string.c (rb_str_splice): should place index wrapping after
possible modification. [ruby-dev:24940]
-Sat Nov 20 23:25:12 2004 Minero Aoki <aamine@loveruby.net>
-
- * io.c (rb_io_getline): f.gets("") did not work. [ruby-core:03771]
-
- * test/ruby/test_io.rb (test_gets_rs): test it.
-
-Sat Nov 20 22:55:09 2004 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * test/runner.rb (CROSS_COMPILING): need to require rbconfig.rb before
- using CROSS_COMPILNG.
+Sat Nov 20 13:26:03 2004 NARUSE, Yui <naruse@ruby-lang.org>
-Sat Nov 20 20:42:42 2004 Minero Aoki <aamine@loveruby.net>
-
- * ext/ripper/depend: fix ripper.o dependency.
-
-Sat Nov 20 17:48:29 2004 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * io.c (io_reopen): work around problem with Cygwin fseeko
- returning ESPIPE.
+ * ext/nkf/nkf-utf8/utf8tbl.c: original revision 1.7
Sat Nov 20 05:34:24 2004 NARUSE, Yui <naruse@ruby-lang.org>
@@ -57629,11 +13930,6 @@ Sat Nov 20 05:34:24 2004 NARUSE, Yui <naruse@ruby-lang.org>
* ext/nkf/test.rb: add test for mime encode/decode
-Sat Nov 20 01:45:04 2004 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * test/xmlrpc/test_webrick_server.rb: move `requrie "webrick/https"'
- into #setup_http_server method to avoid soap test errors.
-
Sat Nov 20 01:37:34 2004 Johan Holmberg <holmberg@iar.se>
* eval.c (error_print): nicer traceback at interrupt.
@@ -57644,66 +13940,6 @@ Sat Nov 20 00:07:16 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* string.c (str_gsub): internal buffer should not be listed by
ObjectSpace.each_object() by String#gsub. [ruby-dev:24931]
-Fri Nov 19 22:44:43 2004 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * lib/test/unit/collector/dir.rb: better support for -p/-x option.
-
-Fri Nov 19 17:46:56 2004 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/maker/0.9.rb (RSS::Maker::RSS09::Image#have_required_values):
- changed /rss/channel/image to be optional. [ruby-Bugs:1047]
-
- * test/rss/test_maker_0.9.rb: added tests for the above.
-
-Fri Nov 19 17:18:17 2004 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/rss.rb (RSS::VERSION): 0.1.0 -> 0.1.1.
-
- * lib/rss: #to_s used #tag.
-
- * test/rss/test_to_s.rb: added.
-
- * lib/rss/maker.rb (RSS::Maker.make): changed API. It's not
- received modules which is used as the second argument.
-
- * lib/rss/xml-stylesheet.rb (RSS::XMLStyleSheet#alternate):
- changed return value type which is not String but Boolean.
-
- * lib/rss/2.0.rb (RSS::Rss::Channel#ttl): changed return value
- type which is not String but Integer.
-
- * lib/rss/0.9.rb (RSS::Rss::Channel): <skipDays> has <day>s and
- <skipHours> has <hour>s.
-
- * lib/rss/maker/0.9.rb (RSS::Maker::RSS09::Channel): ditto.
-
- * lib/rss/0.9.rb (RSS::Rss::Channel::Item): <item> has <category>s.
-
- * lib/rss/maker/2.0.rb (RSS::Maker::Rss20::Channel::Item): ditto.
-
- * lib/rss/2.0.rb (RSS::Rss::Channel): <channel> has <category>s.
-
- * lib/rss/maker/2.0.rb (RSS::Maker::RSS20::Channel): ditto.
-
- * lib/rss/trackback.rb: parent element has <trackback:about>s.
-
- * lib/rss/maker/trackback.rb: ditto.
-
-Fri Nov 19 11:10:16 2004 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * lib/test/unit/collector/dir.rb: add support for directory name
- with -p/-x options.
-
- * test/testunit/collector/test_dir.rb: ditto.
-
- * lib/xmlrpc/datetime.rb (XMLRPC::DateTime#==): should use Array()
- instead of to_a.
-
-Fri Nov 19 10:32:36 2004 Shugo Maeda <shugo@ruby-lang.org>
-
- * ext/readline/readline.c (readline_s_set_completion_append_character):
- accept nil. [ruby-core:03765]
-
Fri Nov 19 01:20:22 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/cgi/session.rb (CGI::Session::FileStore::initialize): raise
@@ -57715,37 +13951,12 @@ Fri Nov 19 00:59:31 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* string.c (str_gsub): internal buffer should not be listed by
ObjectSpace.each_object(). [ruby-dev:24919]
-Thu Nov 18 23:42:36 2004 Minero Aoki <aamine@loveruby.net>
-
- * ext/ripper/depend: Never regenerate lib/ripper/core.rb
- automatically. [ruby-dev:24911]
-
-Thu Nov 18 20:47:24 2004 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.[ch] (rb_w32_isatty): new function to replace MSVCRT's
- isatty because it never sets errno.
-
Thu Nov 18 18:41:08 2004 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
* test/ruby/test_stringchar.rb (test_bang): added.
* string.c (rb_str_upcase_bang, rb_str_capitalize_bang)
- (rb_str_swapcase_bang): missing rb_str_modify().
-
-Thu Nov 18 17:05:01 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (f_rest_arg): store rest args into invisible local variable
- in order to get rid of SEGV at ZSUPER. [ruby-dev:24913]
-
-Thu Nov 18 15:39:52 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * hash.c (rb_f_getenv): prohibit for $SAFE=4. [ruby-dev:24908]
-
-Thu Nov 18 14:58:42 2004 Shugo Maeda <shugo@ruby-lang.org>
-
- * ext/readline/readline.c: check $SAFE.
-
- * test/readline/test_readline.rb: added tests for readline.
+ (rb_str_swapcase_bang): missing rb_str_modify(). [ruby-dev:24915]
Thu Nov 18 00:21:15 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
@@ -57766,15 +13977,10 @@ Thu Nov 18 10:10:14 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/stringio/stringio.c (strio_initialize): allow Fixnum as mode as
well as IO.new does. [ruby-dev:24896]
-Wed Nov 17 23:47:30 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+Wed Nov 17 23:42:40 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
* test/ruby/test_settracefunc.rb: added. [ruby-dev:24884]
-Wed Nov 17 18:59:16 2004 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * process.c (proc_getrlimit, proc_setrlimit): add rb_secure(2) to
- methods of Process.{getrlimit,setrlimit}
-
Wed Nov 17 13:56:57 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* parse.y (newline_node): should not use FL_SET. [ruby-dev:24874]
@@ -57784,65 +13990,28 @@ Wed Nov 17 13:56:57 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* node.h (NODE_NEWLINE): remove unused bit to utilize flag field
in nodes.
-Wed Nov 17 13:05:10 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Nov 17 13:09:40 2004 NAKAMURA Usaku <usa@ruby-lang.org>
- * dir.c (rb_push_glob): fix overrun. [ruby-dev:24886]
+ * {bcc32,win32,wince}/Makefile.sub (test): should build ruby.exe
+ before running test. [ruby-core:03756]
-Wed Nov 17 11:48:17 2004 Michael Neumann <mneumann@ruby-lang.org>
+Wed Nov 17 04:33:01 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
- * lib/xmlrpc/parser.rb, test/xmlrpc/test_features.rb: fixed "assigning
- to constants" warnings
+ * pack.c: all features are backport from 1.9. [ruby-dev:24826]
-Wed Nov 17 09:38:18 2004 Johan Holmberg <holmberg@iar.se>
-
- * re.c (rb_reg_initialize_m): should raise exception instead of
- compile error. [ruby-core:03755]
+ * bignum.c (rb_big2ulong_pack): new function to pack Bignums.
Wed Nov 17 03:42:45 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* string.c (rb_str_splice): move rb_str_modify() after
StringValue(), which may alter the receiver. [ruby-dev:24878]
- * error.c (rb_error_frozen): now raise RuntimeError instead of
- TypeError.
-
-Tue Nov 16 21:22:47 2004 Michael Neumann <mneumann@ruby-lang.org>
-
- * lib/xmlrpc/server.rb (CGIServer): fixed bug when client sends
- "Content-typ: text/xml; ..."
-
Tue Nov 16 23:45:07 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* numeric.c (flo_divmod): protect float values from GC by
assignment to local variables. [ruby-dev:24873]
-Tue Nov 16 14:31:54 2004 Michael Neumann <mneumann@ruby-lang.org>
-
- * test/xmlrpc/*: imported and refactored original test cases.
-
- * test/xmlrpc/test_webrick_server.rb, test/xmlrpc/webrick_testing.rb:
- added test case that starts up a WEBrick XML-RPC server and performs
- some tests on it (both http and https servers are started).
-
- * lib/xmlrpc/create.rb (XMLWriter::each_installed_writer),
- lib/xmlrpc/parser.rb (XMLParser::each_installed_parser):
- added methods to simply original test cases
-
- * lib/xmlrpc/parser.rb, lib/xmlrpc/datetime.rb: applied patch by
- MoonWolf <moonwolf@moonwolf.com> to allow parsing datetime.iso8601
- (e.g. 20041105T01:15:23Z).
-
- * lib/xmlrpc/server.rb: fixed issue #998
- (http://rubyforge.org/tracker/?func=detail&atid=1700&aid=998&group_id=426)
-
- * lib/xmlrpc/create.rb, lib/xmlrpc/utils.rb: when marshalling/loading
- user-defined data structures, use Class#allocate instead of defining
- an empty #initialize method. module XMLRPC::Marshallable is now only
- used for tagging.
-
- * lib/xmlrpc/.document, lib/xmlrpc/README.rdoc: added howto
-
-Tue Nov 16 16:26:12 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+Tue Nov 16 16:30:21 2004 NAKAMURA Usaku <usa@ruby-lang.org>
* {bcc32,win32,wince}/setup.mak (-epilogue-): remove config.h and
config.status to force updating them.
@@ -57852,15 +14021,6 @@ Tue Nov 16 16:20:45 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/stringio/stringio.c (strio_read): position was ignored when a
buffer was passed. http://www.yo.rim.or.jp/~nov/d/?date=20041116#p03
-Tue Nov 16 13:35:54 2004 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * lib/test/unit/autorunner.rb (Test::Unit::AutoRunner::options): add
- new option --exclude (-x) to skip some tests. [ruby-core:3363],
- [ruby-dev:24865]
-
- * lib/test/unit/collector/dir.rb (Test::Unit::Collector::Dir.exclude):
- ditto.
-
Tue Nov 16 11:19:07 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/test/unit/autorunner.rb (Test::Unit::AutoRunner::options): use
@@ -57874,72 +14034,32 @@ Tue Nov 16 01:41:31 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* array.c (rb_ary_update): pedantic check to detect
rb_ary_to_ary() to modify the receiver. [ruby-dev:24861]
-Mon Nov 15 18:58:05 2004 Tanaka Akira <akr@m17n.org>
+Mon Nov 15 13:50:52 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
- * configure.in: check rlim_t more portably. [ruby-core:3735]
+ * string.c (rb_str_justify): typo fixed. [ruby-dev:24851]
Mon Nov 15 11:50:32 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* misc/ruby-mode.el (ruby-special-char-p, ruby-parse-partial): handle
operator symbols. [ruby-talk:120177]
-Mon Nov 15 08:58:55 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (Init_Proc): make proc as an alias to Proc.new.
- [ruby-dev:24848]
-
-Mon Nov 15 00:46:03 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_yield_0): lambda{}.call(1) should raise exception.
- [ruby-talk:120253]
-
-Mon Nov 15 00:33:40 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_clear): avoid revealing NULL pointer.
- [ruby-dev:24766]
-
- * string.c (str_gsub): add paranoid check. [ruby-dev:24827]
-
- * string.c (str_mod_check): check frozen status as well.
- [ruby-dev:24801]
-
-Sun Nov 14 18:59:03 2004 Tanaka Akira <akr@m17n.org>
-
- * process.c (proc_getrlimit): new function for Process.getrlimit.
- (proc_setrlimit): new function for Process.setrlimit.
- [ruby-dev:24834]
-
- * configure.in: check rlim_t and its size. check setrlimit.
-
- * ruby.h (NUM2ULL): new macro.
-
Sun Nov 14 13:27:03 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/pp.rb (PP#object_address_group): remove odd number of 'f'
prefixed to negative address.
-Sun Nov 14 10:48:21 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/mathn.rb (Integer::gcd2): faster implementation by
- <erlercw@siu.edu>. [ruby-talk:120232]
-
-Sun Nov 14 08:46:33 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+Sun Nov 14 08:51:04 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
* test/logger/test_logger.rb: Logger just expects
Logger#datetime_format to be used for Time#strftime independently of
locale. [ruby-dev:24828]
-Fri Nov 12 17:32:07 2004 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * bcc32/README.bcc32, win32/README.win32: need bison instead of
- byacc.
-
-Fri Nov 12 15:15:06 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+Fri Nov 12 15:03:26 2004 NAKAMURA Usaku <usa@ruby-lang.org>
* eval.c (ruby_options): now we cannot call rb_glob() before
ruby_init(), so call rb_w32_cmdvector() at ruby_options().
- * win32/win32.{c,h} (rb_w32_cmdvector): rename make_cmdvector() and
+ * win32.{c,h} (rb_w32_cmdvector): rename make_cmdvector() and
export it.
Fri Nov 12 14:08:01 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
@@ -57953,15 +14073,21 @@ Fri Nov 12 00:31:05 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* ext/gdbm/gdbm.c (fgdbm_store): StringValue() may alter string
pointer. [ruby-dev:24783]
-Thu Nov 11 17:58:19 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+Thu Nov 11 17:36:12 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * dir.c (rb_glob): should have called rb_glob_caller().
- [ruby-dev:24773]
+ * dir.c (rb_globi): also should call back via rb_glob_caller().
+ [ruby-dev:24775]
-Thu Nov 11 16:56:10 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+Thu Nov 11 16:47:21 2004 NAKAMURA Usaku <usa@ruby-lang.org>
* test/ruby/test_file.rb (test_truncate_wbuf): we want to test
- only File#truncate, not behavior of seek(2).
+ only File#truncate, not behaviour of seek(2).
+
+Thu Nov 11 09:41:01 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * dir.c (push_braces): was confusing VALUE and char*.
+
+ * dir.c (rb_push_glob): Dir.glob should have called its block.
Thu Nov 11 01:52:52 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
@@ -57975,10 +14101,6 @@ Wed Nov 10 22:49:01 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/delegate.rb (DelegateClass::dup): ditto.
-Wed Nov 10 19:47:55 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * dir.c (glob_helper): path is a string object now.
-
Wed Nov 10 12:31:21 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* README.EXT (Example): extconf.rb is indispensable now.
@@ -57990,22 +14112,10 @@ Wed Nov 10 03:33:36 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tkextlib/tile/style.rb: bug fix
-Tue Nov 9 22:24:07 2004 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/nkf: original nkf.c rev:1.38
-
- * ext/nkf/nkf.c: fix bug: can't parse long-name options
-
- * ext/nkf/test.rb: fix bug: mime tests fail
-
Tue Nov 9 14:27:18 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/optparse.rb (OptionParser::Officious): moved from DefaultList.
-Tue Nov 9 00:50:06 2004 Dave Thomas <dave@pragprog.com>
-
- * lib/rdoc/rdoc.rb: Change version numbering of RDoc and ri
-
Tue Nov 9 01:05:04 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* dir.c (rb_glob2): do not allocate buffer from heap to avoid
@@ -58019,7 +14129,15 @@ Tue Nov 9 01:05:04 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* dir.c (fnmatch): p or s may be NULL. [ruby-dev:24749]
-Tue Nov 9 00:36:26 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+Tue Nov 9 00:53:53 2004 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * regex.c (slow_match): avoid GCC 3.4.x warnings.
+
+Tue Nov 9 00:50:06 2004 Dave Thomas <dave@pragprog.com>
+
+ * lib/rdoc/rdoc.rb: Change version numbering of RDoc and ri
+
+Mon Nov 8 23:38:35 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
* lib/drb/extservm.rb: add DRb::ExtServManager#uri=.
[ruby-dev:24743]
@@ -58050,14 +14168,13 @@ Sun Nov 7 23:49:26 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tkextlib: ditto.
-Sat Nov 6 20:40:16 2004 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+Sat Nov 6 14:58:44 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
- * ext/win32ole/win32ole.c: rename WIN32OLE#ole_obj_help to
- WIN32OLE#ole_type. alias ole_obj_help to ole_type.
+ * lib/webrick/server.rb (WEBrick::HTTPServer#start): remove
+ :DoNotReverseLookup option. (Socket#do_not_reverse_lookup is a
+ ruby 1.9 feature)
- * ext/win32ole/tests/testWIN32OLE.rb: ditto.
-
-Sat Nov 6 11:18:59 2004 Tadayoshi Funaba <tadf@dotrb.org>
+Sat Nov 6 11:31:04 2004 Tadayoshi Funaba <tadf@dotrb.org>
* lib/date.rb (_parse): checks whether zone was given.
@@ -58066,10 +14183,6 @@ Sat Nov 6 00:46:27 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* string.c (rb_str_locktmp): check STR_TMPLOCK flag before
locking. [ruby-dev:24727]
-Fri Nov 5 19:07:16 2004 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/nkf: follow CVS Head of original nkf.
-
Fri Nov 5 18:12:42 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tk/scrollable.rb: divide Scrollable module into
@@ -58096,43 +14209,23 @@ Fri Nov 5 08:52:48 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* gc.c (gc_mark): stricter GC stack check.
+Fri Nov 5 08:52:48 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * gc.c (gc_mark): stricter GC stack check.
+
Fri Nov 5 08:34:43 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* string.c (str_gsub): should have removed rb_str_unlocktmp(str).
[ruby-dev:24708]
- * ext/socket/socket.c (s_recvfrom): buffer modification check.
- [ruby-dev:24708]
-
-Thu Nov 4 23:54:21 2004 Kazuo Saito <ksaito@uranus.dti.ne.jp>
-
- * regexec.c, regparse.c, regint.h: fixed conflicts between
- vendor branch.
-
-Thu Nov 4 23:41:55 2004 Kazuo Saito <ksaito@uranus.dti.ne.jp>
-
- * ascii.c, euc_jp.c, oniggnu.h, oniguruma.h, regcomp.c,
- regenc.c, regenc.h, regerror.c, regexec.c, reggnu.c,
- regint.h, regparse.c, regparse.h, sjis.c, utf8.c:
- imported Oni Guruma 3.4.0.
-
- * parse.y, re.c: Now mbclen() takes unsigned char as
- its argument.
-
Thu Nov 4 21:25:38 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* string.c (str_gsub): string modify check no longer based on
tmplock. [ruby-dev:24706]
-Thu Nov 4 21:13:48 2004 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+Thu Nov 4 19:27:46 2004 NAKAMURA Usaku <usa@ruby-lang.org>
- * ext/win32ole/win32ole.c(typelib_file_from_typelib): search "win16"
- entry to get library path.
-
- * ext/win32ole/win32ole.c(oletypelib_path): ditto.
-
- * ext/win32ole/win32ole.c(ole_typedesc2val): add VT_LPWSTR, VT_LPSTR,
- VT_ERROR case.
+ * io.c (rb_f_open): fix typo.
Thu Nov 4 15:02:14 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
@@ -58150,6 +14243,10 @@ Thu Nov 4 03:11:33 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* ext/socket/socket.c (s_recvfrom): tmplock input buffer.
[ruby-dev:24705]
+Wed Nov 3 22:32:12 2004 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * process.c: On NetBSD don't use setruid() and setrgid().
+
Wed Nov 3 22:24:17 2004 Daigo Moriwaki <techml@sgtpepper.net>
* lib/webrick/httpauth/digestauth.rb: use Base64.encode64 to
@@ -58164,7 +14261,11 @@ Wed Nov 3 17:19:59 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* array.c (rb_ary_or): ditto.
-Wed Nov 3 17:02:48 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+Wed Nov 3 17:13:02 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * io.c (pipe_open): fix compile error
+
+Wed Nov 3 16:58:07 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tk.rb: support to use different Tcl commands between
configure and configinfo
@@ -58180,55 +14281,33 @@ Wed Nov 3 17:02:48 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tkextlib: some bug fixes (see ext/tk/ChangeLog.tkextlib)
-Wed Nov 3 15:38:28 2004 Kouhei Sutou <kou@cozmixng.org>
-
- * test/rss/*.rb: removed tab width configuration headers.
-
- * test/rss/test_maker_{0.9,1.0}.rb: sort -> do_sort.
+Wed Nov 3 16:30:41 2004 NARUSE, Yui <naruse@ruby-lang.org>
- * lib/rss/maker/*.rb: changed API to RSS version independence.
+ * ext/nkf: follow nkf 2.0.4
- * lib/rss/maker/base.rb
- (RSS::Maker::XMLStyleSheets::XMLStyleSheet): checked required
- (pseudo) attributes.
+Wed Nov 3 15:53:34 2004 Kouhei Sutou <kou@cozmixng.org>
- * lib/rss/maker/base.rb (RSS::Maker::Items): sort -> do_sort.
+ * test/rss/test_maker_*.rb: added tests for RSS Maker.
- * lib/rss/rss.rb (RSS::BaseModel.install_date_element): avoided
- warning.
+ * lib/rss/maker.rb: added RSS Maker.
- * lib/rss/0.9.rb (RSS::Rss#textinput): added convenience method.
+ * lib/rss/maker/*.rb: ditto.
Tue Nov 2 16:35:57 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* ext/enumerator/enumerator.c (each_cons_i): pass copy of an
internal consequent array. [ruby-talk:118691]
-Tue Nov 2 14:54:02 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+Tue Nov 2 16:05:21 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
- * io.c (pipe_open): need to set cmd if argc == 0 (win32).
+ * process.c (rb_f_fork): need to flush stdout and stderr before
+ fork(2). [ruby-talk:117715]
Tue Nov 2 01:20:09 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
- * io.c (pipe_open): IO.popen should take array as 1st argument for
- a command line. [ruby-dev:24678]
-
* eval.c (proc_invoke): nail down dyna_var node when Proc object
or continuation is created. [ruby-dev:24671]
- * io.c (rb_io_s_popen): do not expand argv array. [ruby-dev:24670]
-
-Mon Nov 1 22:25:56 2004 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/maker/base.rb: changed xml-stylesheet's API of RSS Maker
- like to item's one.
-
- * lib/rss/xml-stylesheet.rb (RSS::XMLStyleSheet#guess_type): fixed
- regular expression bug.
-
- * test/rss/test_maker_xml-stylesheet.rb: updated tests for
- xml-stylesheet.
-
Mon Nov 1 13:59:28 2004 WATANABE Hirofumi <eban@ruby-lang.org>
* ext/extmk.rb (MANIFEST): do not use anymore, use extconf.rb instead.
@@ -58240,29 +14319,15 @@ Mon Nov 1 13:59:28 2004 WATANABE Hirofumi <eban@ruby-lang.org>
* README.EXT, README.EXT.ja: remove MANIFEST stuff.
-Mon Nov 1 11:52:18 2004 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * io.c (pipe_open): avoid conflict of variable name. [ruby-dev:24662]
-
-Mon Nov 1 11:46:19 2004 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * process.c (rb_f_exec): should check whether prog is NULL.
-
-Mon Nov 1 09:37:19 2004 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/maker.rb: added entry point of RSS Maker.
+Mon Nov 1 01:14:52 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-Mon Nov 1 03:14:14 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * io.c (rb_f_open): create copy of popen specifier. [ruby-dev:24656]
- * eval.c (rb_get_method_body): store ICLASS in the cache.
- [ruby-core:03672]
+Mon Nov 1 00:36:48 2004 WATANABE Hirofumi <eban@ruby-lang.org>
- * eval.c (rb_provided): should return true for loading library
- too for autoloading. [ruby-core:03655]
+ * main.c (_stklen): move to gc.c.
-Mon Nov 1 01:14:52 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_f_open): create copy of popen specifier. [ruby-dev:24656]
+Sun Oct 31 00:22:28 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* string.c (rb_str_locktmp): lock string temporarily.
@@ -58275,54 +14340,15 @@ Mon Nov 1 01:14:52 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* io.c (read_all): ditto.
-Sun Oct 31 23:37:00 2004 NARUSE, Yui <naruse@ruby-lang.org>
-
- * process.c: on NetBSD don't use setruid() and setrgid().
-
-Sun Oct 31 23:12:10 2004 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/maker/*.rb: added RSS Maker.
-
- * test/rss/test_maker_*.rb: added tests for RSS Maker.
-
-Sun Oct 31 16:58:12 2004 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c: add WIN32OLE.codepage, WIN32OLE.codepage=.
-
- * ext/win32ole/tests/testWIN32OLE.rb: ditto.
-
-Sun Oct 31 14:35:26 2004 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ext/nkf/nkf-utf8/nkf.c: add "\075?UTF-8?Q?" for Gmail.
-
-Sun Oct 31 14:18:56 2004 Minero Aoki <aamine@loveruby.net>
-
- * parse.y [ripper]: emit lexer-event values to the parser
- (still incomplete).
-
-Sat Oct 30 15:24:41 2004 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c: add WIN32OLE_TYPELIB class. add
- WIN32OLE#ole_typelib method.
-
- * ext/win32ole/tests/testOLETYPELIB.rb: add WIN32OLE_TYPELIB class.
-
Sat Oct 30 06:53:24 2004 Peter Vanbroekhoven <peter.vanbroekhoven@cs.kuleuven.ac.be>
* eval.c (rb_eval): NODE_XSTR should pass copy of literal string.
Sat Oct 30 00:19:40 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
- * array.c (rb_ary_update): a[n,m]=nil no longer works as element
- deletion.
-
* enum.c (enum_sort_by): protect continuation jump in.
[ruby-dev:24642]
- * eval.c (rb_eval), gc.c (gc_mark_children), node.h (NEW_ALIAS,
- NEW_VALIAS), parse.y (fitem): allow dynamic symbols to
- NODE_UNDEF and NODE_ALIAS.
-
Fri Oct 29 21:27:51 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (rb_io_check_initialized): new function to check uninitialized
@@ -58330,26 +14356,6 @@ Fri Oct 29 21:27:51 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* file.c (rb_file_path), io.c (rb_io_closed): check if initialized.
-Fri Oct 29 19:05:33 2004 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/nkf: follow nkf2.0.
-
-Fri Oct 29 17:18:22 2004 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * parse.y (ripper_s_allocate): add prototype for Microsoft compiler.
-
- * range.c (range_step, range_each): need cast.
-
-Fri Oct 29 16:34:19 2004 Daiki Ueno <ueno@unixuser.org>
-
- * misc/ruby-mode.el (ruby-parse-partial): Parse the rest of the
- line after opening heredoc identifier. [ruby-dev:24635]
-
-Fri Oct 29 11:35:04 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (rb_parser_append_print, rb_parser_while_loop): body node
- can be empty. [ruby-dev:24628]
-
Fri Oct 29 10:00:30 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (rb_thread_start_0): forget to free some memory chunks.
@@ -58364,20 +14370,32 @@ Thu Oct 28 08:42:02 2004 Tanaka Akira <akr@m17n.org>
(argf_read): call argf_forward with argv argument.
[ruby-dev:24624]
+Thu Oct 28 23:32:54 2004 akira yamada <akira@ruby-lang.org>
+
+ * ext/zlib/zlib.c (zstream_detach_input): resets klass of z->input if
+ z->input isn't nil.
+
+Thu Oct 28 23:19:31 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/extmk.rb: prefer relative path. [ruby-talk:93037]
+
+Wed Oct 27 18:49:11 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * gc.c: prototype; rb_io_fptr_finalize() doesn't return any value
+ at this version.
+
+Wed Oct 27 17:27:45 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * gc.c (gc_sweep): recover ruby_in_compile variable.
+
Wed Oct 27 09:17:30 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* string.c (str_gsub): use a string object for exception safeness.
[ruby-dev:24601]
-Wed Oct 27 07:38:55 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * node.h (NODE_TYPESHIFT): allow 4 more bits for line numbers.
- [ruby-talk:117841]
-
- * ruby.h (FL_ABLE): nodes are not subject for flag operations.
+Tue Oct 26 23:52:32 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * io.c (ARGF_FORWARD): should have specified argv explicitly,
- since we no longer have frame->argv saved. [ruby-dev:24602]
+ * io.c (rb_io_getline): rs modification check should not interfere in the loop.
Tue Oct 26 23:30:39 2004 Dave Thomas <dave@pragprog.com>
@@ -58399,6 +14417,16 @@ Tue Oct 26 10:56:55 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* sprintf.c (rb_f_sprintf): raise ArgumentError for extra
arguments, unless (digit)$ style used.
+Tue Oct 26 11:33:26 2004 David G. Andersen <dga@lcs.mit.edu>
+
+ * ext/zlib/zlib.c (gzreader_gets): use memchr() to to gain
+ performance. [ruby-talk:117701]
+
+Tue Oct 26 10:56:55 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * sprintf.c (rb_f_sprintf): raise ArgumentError for extra
+ arguments, unless (digit)$ style used.
+
Mon Oct 25 18:35:39 2004 WATANABE Hirofumi <eban@ruby-lang.org>
* win32/win32.c (isUNCRoot): should check NUL after '.'.
@@ -58410,16 +14438,11 @@ Mon Oct 25 08:03:26 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (get_backtrace): ignore illegal backtrace. [ruby-dev:24587]
-Sun Oct 24 00:40:50 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun Oct 24 00:41:09 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (rb_load, search_required, rb_require_safe, rb_require): use
frozen shared string to avoid outside modification. [ruby-dev:24580]
-Sat Oct 23 23:40:34 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_io_fptr_finalize): leave stdin/stdout/stderr open in
- interpreter termination. [ruby-dev:24579]
-
Sat Oct 23 22:18:32 2004 Guy Decoux <ts@moulon.inra.fr>
* eval.c (frame_free): Guy Decoux solved the leak problem.
@@ -58463,10 +14486,6 @@ Thu Oct 21 19:06:15 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
* lib/webrick/httpresponse.rb (WEBrick::HTTPResponse#send_body_io):
ensure to close @body. (http://bugs.debian.org/277520)
-Thu Oct 21 13:11:31 2004 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * io.c (pipe_open): variable name "fpw" is conflicted.
-
Thu Oct 21 00:36:41 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (rb_alias): should warn on method discarding.
@@ -58475,21 +14494,11 @@ Thu Oct 21 00:36:41 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* ext/zlib/zlib.c (zstream_expand_buffer_into): hide internal
string buffer by clearing klass. [ruby-dev:24548]
- * parse.y (lex_getline): should not touch ruby_debug_lines if
- RIPPER is defined. [ruby-dev:24547]
-
Wed Oct 20 19:45:13 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* string.c (str_gsub): reentrant check. [ruby-dev:24432]
-Wed Oct 20 12:42:53 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (rb_io_getline): rs modification check should not interfere
- in the loop.
-
-Wed Oct 20 10:31:33 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (lex_getline): should update ruby_debug_lines.
+ * backport all SEGV bug fixes from CVS HEAD. [ruby-dev:24536]
Wed Oct 20 04:17:55 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
@@ -58511,23 +14520,13 @@ Wed Oct 20 01:37:18 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (ruby_exec): stack marking position may be higher than
expected. thanks to Guy Decoux. [ruby-core:03527]
-Wed Oct 20 00:25:41 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (search_required): required name must not be changed before
- loading. [ruby-dev:24492]
-
-Tue Oct 19 23:59:46 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_require_safe): provide the feature after loaded.
- [ruby-list:40085]
-
Tue Oct 19 22:43:12 2004 Dave Thomas <dave@pragprog.com>
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_attr): If
we come across 'attr' in a context where it isn't
followed by a symbol, just issue a warning.
-Tue Oct 19 20:32:50 2004 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+Tue Oct 19 20:41:37 2004 Masaki Suketa <masaki.suketa@nifty.ne.jp>
* ext/win32ole.c(ole_invoke): retrieve the result value when
retrying the IDispatch::invoke.
@@ -58547,7 +14546,15 @@ Tue Oct 19 17:24:11 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* ext/zlib/zlib.c (zstream_expand_buffer): hide internal string
buffer by clearing klass. [ruby-dev:24510]
-Tue Oct 19 08:47:21 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Oct 19 16:12:18 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/tkutil.c: backport from CVS HEAD
+
+Tue Oct 19 08:54:26 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * intern.h, object.c (rb_class_inherited_p): export.
+
+Tue Oct 19 08:46:57 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* string.c (rb_str_upto): method result must be checked. [ruby-dev:24504]
@@ -58558,20 +14565,60 @@ Mon Oct 18 23:37:05 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* marshal.c (r_object0): check inheritance by the internal function.
[ruby-dev:24515]
-Mon Oct 18 11:29:32 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Oct 18 15:58:01 2004 NAKAMURA Usaku <usa@ruby-lang.org>
- * io.c (rb_io_flags_mode, rb_io_mode_flags): distinguish whether file
- not existing is created. [ruby-dev:24505]
+ * range.c (range_step, range_each): need cast.
+
+Fri Oct 29 16:34:19 2004 Daiki Ueno <ueno@unixuser.org>
+
+ * misc/ruby-mode.el (ruby-parse-partial): Parse the rest of the
+ line after opening heredoc identifier. [ruby-dev:24635]
Mon Oct 18 07:26:21 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* file.c (rb_file_truncate): discard read buffer before truncation.
[ruby-dev:24197]
-Mon Oct 18 01:56:03 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Mon Oct 18 02:11:21 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
- * lib/webrick/httprequest.rb (WEBrick::HTTPRequest#initialize):
- initial value of accpet-* should be array.
+ * lib/webrick/config.rb (WEBrick::Config::General): add default values:
+ - WEBrick::Config[:DoNotReverseLookup]
+ - WEBrick::Config[:RequestCallback] (it used as an alias of
+ :RequestHandler in WEBrick::HTTPServer#run)
+ - WEBrick::Config::FileHandler[:AcceptableLanguages]
+
+ * lib/webrick/httpservlet/filehandler.rb
+ (WEBrick::HTTPServlet::FileHandler#set_filename): search files
+ having suffix of language-name which Accept-Language header field
+ includes if :AcceptableLanguages options is present.
+
+ * lib/webrick/httpservlet/filehandler.rb
+ (WEBrick::HTTPServlet::FileHandler#get_servlet): new method to
+ search servlet correspond to the suffix of filename.
+
+ * lib/webrick/httprequest.rb: add attributes access methods: accept,
+ accept_charset, accept_encoding, accept_language, content_length
+ and content_type.
+
+ * lib/webrick/httpresponse.rb: add attribute access methods:
+ content_length, content_length=, content_type and content_type=.
+
+ * lib/webrick/httputils.rb (WEBrick::HTTPUtils.mime_types):
+ use the second suffix to detect media type. (the first suffix
+ may be a language name.)
+
+ * lib/webrick/httputils.rb (WEBrick::HTTPUtils.parse_qvalues):
+ add method to parse Accept header field. it returns an Array of
+ values sorted by the qvalues.
+
+Mon Oct 18 02:04:11 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * lib/webrick/httpserver.rb (WEBrick::HTTPServer#virtual_host): new
+ method to register virtual hosting servers.
+
+ * lib/webrick/server.rb (WEBrick::GenericServer#accept): call
+ do_not_reverse_lookup for each socket if :DoNotReverseLookup
+ is set. [ruby-core:02357]
Mon Oct 18 00:42:45 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
@@ -58585,7 +14632,7 @@ Sun Oct 17 23:03:48 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tk/timer.rb: TkTimer#start and restart accept a block
-Sun Oct 17 12:53:46 2004 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+Sun Oct 17 13:05:04 2004 Masaki Suketa <masaki.suketa@nifty.ne.jp>
* ext/win32ole/win32ole.c (fole_func_methods): correct argument mismatch.
* ext/win32ole/win32ole.c (fole_get_methods): ditto.
@@ -58608,21 +14655,6 @@ Sat Oct 16 13:34:56 2004 Kouhei Sutou <kou@cozmixng.org>
* lib/rss: supported prety print.
* test/rss/test_1.0.rb: added test for calculating default indent size.
-Sat Oct 16 10:56:36 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb (create_makefile): install-rb is needed for statically
- linked extensions. [ruby-dev:24491]
-
-Fri Oct 15 18:07:08 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/ossl_x509store.c
- (ossl_x509stctx_initialize): setup OpenSSL::X509::StoreContext with
- ossl_x509stctx_* functions instead of X509_STORE_CTX_*.
- (ossl_x509store_set_time): add OpenSSL::X509::Store#time=.
- (ossl_x509stctx_set_time): add OpenSSL::X509::StoreContext#time=.
-
- * test/openssl/ossl_x509store.rb: test certificate validity times.
-
Fri Oct 15 18:04:35 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tk/timer.rb: TkTimer.new(interval, loop){ ... } is
@@ -58633,60 +14665,13 @@ Fri Oct 15 12:43:09 2004 Tanaka Akira <akr@m17n.org>
* eval.c (Init_stack): make prototype declaration consistent with
the definition in gc.c.
-Thu Oct 14 13:33:59 2004 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/rss.rb: added link to Tutorial.
-
-Tue Oct 12 21:22:50 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/webrick/config.rb:
- add WEBrick::Config::FileHandler[:AcceptableLanguages].
-
- * lib/webrick/httpservlet/filehandler.rb
- (WEBrick::HTTPServlet::FileHandler#set_filename): search files
- having suffix of language-name which Accept-Language header field
- includes if :AcceptableLanguages options is present.
-
- * lib/webrick/httpservlet/filehandler.rb
- (WEBrick::HTTPServlet::FileHandler#get_servlet): new method to
- search servlet correspond to the suffix of filename.
-
- * lib/webrick/httprequest.rb: add attributes access methods: accept,
- accept_charset, accept_encoding, accept_language, content_length
- and content_type.
-
- * lib/webrick/httpresponse.rb: add attribute access methods:
- content_length, content_length=, content_type and content_type=.
-
- * lib/webrick/httputils.rb (WEBrick::HTTPUtils.mime_types):
- use the second suffix to detect media type. (the first suffix
- may be a language name.)
-
- * lib/webrick/httputils.rb (WEBrick::HTTPUtils.parse_qvalues):
- add method to parse Accept header field. it returns an Array of
- values sorted by the qvalues.
-
-Tue Oct 12 15:05:32 2004 WATANABE Hirofumi <eban@ruby-lang.org>
+Thu Oct 14 14:34:01 2004 WATANABE Hirofumi <eban@ruby-lang.org>
* io.c (MODE_BINMODE, MODE_BINARY): fixed reversed condition.
-Mon Oct 11 17:51:34 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_io_popen): get mode string via rb_io_flags_mode() to
- avoid mode string modification. [ruby-dev:24454]
-
- * io.c (rb_io_getline_fast): should take delim as unsigned char to
- distinguish EOF and '\377'. [ruby-dev:24460]
-
- * io.c (rb_io_getline): add check for RS modification.
- [ruby-dev:24461]
-
- * enum.c (enum_sort_by): use qsort() directly instead using
- rb_iterate(). [ruby-dev:24462]
+Thu Oct 14 13:33:59 2004 Kouhei Sutou <kou@cozmixng.org>
- * enum.c (enum_each_with_index): remove rb_gc_force_recycle() to
- prevent access to recycled object (via continuation for
- example). [ruby-dev:24463]
+ * lib/rss/rss.rb: added link to Tutorial.
Mon Oct 11 13:48:20 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
@@ -58697,16 +14682,6 @@ Sun Oct 10 12:32:08 2004 Dave Thomas <dave@pragprog.com>
* lib/rdoc/parsers/parse_rb.rb (RDoc::parse_require): Allow 'require'
to be used as a variable name
-Sun Oct 10 02:49:14 2004 Minero Aoki <aamine@loveruby.net>
-
- * ext/ripper/lib/ripper/filter.rb: require ripper/tokenizer.
-
- * ext/ripper/lib/ripper/filter.rb (parse): argument is optional.
-
-Sun Oct 10 02:43:13 2004 Minero Aoki <aamine@loveruby.net>
-
- * parse.y [ripper]: \n between two comments disappeared.
-
Sat Oct 9 21:23:37 2004 Kouhei Sutou <kou@cozmixng.org>
* lib/rss/converter.rb: changed to try to use Iconv for default
@@ -58719,19 +14694,6 @@ Sat Oct 9 19:50:36 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (rb_io_getline): should not treat char as negative value.
[ruby-dev:24460]
-Sat Oct 9 00:25:39 2004 Tanaka Akira <akr@m17n.org>
-
- * io.c (rb_io_fread): rb_thread_wait_fd() was lost.
- [ruby-dev:24457]
-
-Fri Oct 8 21:36:56 2004 Minero Aoki <aamine@loveruby.net>
-
- * lib/fileutils.rb (fu_traverse): return value of Dir.entries is
- reliable. (pass $SAFE=1)
-
- * lib/fileutils.rb (remove_dir): return value of Dir.foreach is
- reliable. (pass $SAFE=1)
-
Fri Oct 8 09:49:32 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* pack.c (pack_pack): pointer modification check before each
@@ -58791,19 +14753,7 @@ Wed Oct 6 09:21:00 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* range.c (member_i): use RANGE_EACH_BREAK. [ruby-talk:114959]
-Tue Oct 5 09:53:22 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_fopen): mode string copy at the lowest level.
-
- * io.c (rb_io_flags_mode): requires output buffer no more. no
- allocation needed.
-
- * array.c (rb_ary_index): takes a block to compare items in an
- array. [ruby-talk:113069] [Ruby2]
-
- * array.c (rb_ary_rindex): ditto.
-
-Mon Oct 4 14:03:40 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Oct 4 14:04:14 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (rb_file_open_internal, rb_io_reopen): fname might be altered
while GC. [ruby-dev:24408]
@@ -58815,21 +14765,16 @@ Mon Oct 4 12:53:45 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tk/image.rb: bug fix
-Sun Oct 3 21:16:05 2004 Shugo Maeda <shugo@ruby-lang.org>
+Sun Oct 3 21:20:03 2004 Shugo Maeda <shugo@ruby-lang.org>
* lib/net/imap.rb (TEXT_REGEXP): allow 8-bit characters for the german
- version of Microsoft Exchange Server.
+ version of Microsoft Exchange Server. (backported from HEAD)
* lib/net/imap.rb (RTEXT_REGEXP): ditto.
* lib/net/imap.rb (CTEXT_REGEXP): ditto.
-Sat Oct 2 20:34:05 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (local_vars): moved to struct parser_params.
- [ruby-dev:24391]
-
- * parser.y (stmts): remove suspicious NODE_BEGIN. [ruby-dev:24390]
+Sat Oct 2 20:34:22 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* node.h (NEW_DVAR): extra semicolon.
@@ -58851,6 +14796,9 @@ Sat Oct 2 00:42:20 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (specific_eval): defer pointer retrieval to prevent
unsafe sourcefile string modification. [ruby-dev:24382]
+ * eval.c (specific_eval): defer pointer retrieval to prevent
+ unsafe sourcefile string modification. [ruby-dev:24382]
+
* string.c (rb_str_sum): wrong cast caused wrong result.
[ruby-dev:24385]
@@ -58862,6 +14810,24 @@ Sat Oct 2 00:42:20 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* string.c (rb_str_sum): string may be altered. [ruby-dev:24381]
+Mon Oct 11 17:51:34 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * io.c (rb_io_popen): get mode string via rb_io_flags_mode() to
+ avoid mode string modification. [ruby-dev:24454]
+
+ * io.c (rb_io_getline_fast): should take delim as unsigned char to
+ distinguish EOF and '\377'. [ruby-dev:24460]
+
+ * io.c (rb_io_getline): add check for RS modification.
+ [ruby-dev:24461]
+
+ * enum.c (enum_sort_by): use qsort() directly instead using
+ rb_iterate(). [ruby-dev:24462]
+
+ * enum.c (enum_each_with_index): remove rb_gc_force_recycle() to
+ prevent access to recycled object (via continuation for
+ example). [ruby-dev:24463]
+
Fri Oct 1 11:40:14 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (rb_f_eval): defer pointer retrieval to prevent unsafe
@@ -58906,18 +14872,6 @@ Wed Sep 29 10:58:07 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* enum.c (sort_by_i): internally used object must not be changed
outside. [ruby-dev:24368]
-Mon Sep 27 21:25:12 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_call0): invoke finalizers periodically.
-
- * gc.c (gc_sweep): defer running finalizers. [ruby-dev:24354]
-
- * gc.c (rb_gc_finalize_deferred): run deferred finalizers.
-
-Mon Sep 27 15:01:59 2004 Minero Aoki <aamine@loveruby.net>
-
- * parse.y [ripper]: missing ';'.
-
Mon Sep 27 13:46:45 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* intern.h, struct.c (rb_struct_s_members, rb_struct_members): public
@@ -58927,34 +14881,9 @@ Mon Sep 27 13:46:45 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
Mon Sep 27 09:14:03 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
- * array.c (rb_ary_delete): comparison may change the capacity.
- [ruby-dev:24348]
-
- * array.c (rb_ary_fill): fill should honor length argument.
- [ruby-dev:24346]
-
- * array.c (rb_ary_replace): should not use ptr from shared array.
- [ruby-dev:24345]
-
* ext/socket/socket.c (s_accept): don't retry for EWOULDBLOCK.
[ruby-talk:113807]
-Sun Sep 26 08:05:10 2004 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date.rb: provides {Time,Date,DateTime}#to_{time,date,datetime}.
-
- * sample/cal.rb: uses getoptlong instead of getopts.
-
-Sat Sep 25 18:39:22 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (flatten): element size might change during comparison.
- [ruby-dev:24343]
-
-Sat Sep 25 01:52:49 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * struct.c (rb_struct_s_members): wrong call of struct_members.
- [ruby-dev:24333]
-
Fri Sep 24 16:09:42 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (proc_invoke): propagate DVAR_DONT_RECYCLE on termination
@@ -58962,11 +14891,6 @@ Fri Sep 24 16:09:42 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
Fri Sep 24 08:29:45 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
- * parse.y (rb_parser_append_print): should handle prelude.
- [llama@u01.gate0]
-
- * parse.y (rb_parser_while_loop): ditto.
-
* array.c (rb_ary_subseq): original object might be modified after
sharing data creation. [ruby-dev:24327]
@@ -58977,22 +14901,6 @@ Fri Sep 24 08:29:45 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* struct.c (struct_members): always check struct size and size of
members list in the class. [ruby-dev:24320]
-Thu Sep 23 19:48:14 2004 Minero Aoki <aamine@loveruby.net>
-
- * ext/ripper/Makefile.dev: removed.
-
- * ext/ripper/ripper.rb.in: moved to lib/ripper/core.rb.in.
-
- * ext/ripper/lib/ripper/core.rb: new file.
-
- * ext/ripper/lib/ripper/core.rb.in: new file.
-
- * ext/ripper/tools/generate-ripper_rb.rb: change comment.
-
- * test/ripper/*.rb: on__scan event removed.
-
- * test/ripper/*.rb: event name is changed: on__XXX -> on_XXX.
-
Thu Sep 23 09:29:14 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* string.c (rb_str_sub_bang): check if string is not modified
@@ -59001,50 +14909,23 @@ Thu Sep 23 09:29:14 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* hash.c (rb_hash_rehash): replace st_foreach() by its deep
checking counterpart. [ruby-dev:24310]
-Wed Sep 22 14:21:54 2004 Minero Aoki <aamine@loveruby.net>
-
- * parse.y [ripper]: on__scan event removed.
-
- * parse.y [ripper]: event name is changed: on__XXX -> on_XXX.
-
- * ext/ripper/eventids2.c: ditto.
-
- * ext/ripper/ripper.rb.in: ditto.
-
- * ext/ripper/lib/ripper.rb: sync with ripper.rb.in.
-
- * ext/ripper/lib/ripper/tokenizer: ditto.
-
- * ext/ripper/lib/ripper/filter: new file.
-
- * sample/ripper/colorize.rb: new file.
-
- * sample/ripper/strip-comment.rb: new file.
-
-Wed Sep 22 13:50:49 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * hash.c (hash_alloc): was using tbl pointer without
- initialization.
-
Wed Sep 22 13:38:12 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* hash.c (rb_hash_rehash): add iteration check. [ruby-dev:24301]
* st.c (st_foreach): add deep check.
- * hash.c (rb_hash_fetch): returns KeyError instead of IndexError.
+Wed Sep 22 13:06:14 2004 NAKAMURA Usaku <usa@ruby-lang.org>
- * hash.c (env_fetch): ditto.
+ * win32/win32.c (rb_w32_call_handler): workaround for Ctrl-C.
+ merge from HEAD.
-Wed Sep 22 13:02:02 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+Wed Sep 22 00:11:12 2004 Dave Thomas <dave@pragprog.com>
- * win32/win32.c (rb_w32_call_handler): workaround for Ctrl-C.
+ * process.c: Add documentation for fork()
Wed Sep 22 09:04:41 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
- * parse.y: remove global variables ruby_eval_tree and
- ruby_eval_tree_begin.
-
* array.c (rb_ary_collect_bang): element size might change during
comparison. [ruby-dev:24300]
@@ -59052,116 +14933,13 @@ Wed Sep 22 09:04:41 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* array.c (rb_ary_eql): ditto. [ruby-dev:24300]
-Wed Sep 22 00:11:12 2004 Dave Thomas <dave@pragprog.com>
-
- * process.c: Add documentation for fork()
-
Tue Sep 21 18:29:49 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * array.c (rb_ary_equal): merge miss.
+
* array.c (rb_ary_uniq_bang): element size might change during
comparison. [ruby-dev:24298]
-Mon Sep 20 17:46:51 2004 Minero Aoki <aamine@loveruby.net>
-
- * ext/ripper/lib/ripper/tokenizer.rb: fix typo.
-
-Mon Sep 20 17:38:43 2004 Minero Aoki <aamine@loveruby.net>
-
- * test/ripper/test_scanner_events.rb: tokens must be reordered.
-
- * ext/ripper/lib/ripper/tokenizer.rb: ditto.
-
-Mon Sep 20 16:58:16 2004 Minero Aoki <aamine@loveruby.net>
-
- * parse.y [ripper]: do not delay dispatching.
-
- * ext/ripper/lib/ripper/tokenizer.rb: sort tokens by right order.
-
-Mon Sep 20 15:17:47 2004 Minero Aoki <aamine@loveruby.net>
-
- * ext/ripper/lib/ripper/tokenizer.rb: new file.
-
-Mon Sep 20 15:13:52 2004 Minero Aoki <aamine@loveruby.net>
-
- * test/ripper/test_scanner_events.rb: test #lineno and #column.
-
-Mon Sep 20 14:50:17 2004 Minero Aoki <aamine@loveruby.net>
-
- * parse.y [ripper]: delayed heredocument events should be
- dispatched after EOF.
-
-Mon Sep 20 14:39:42 2004 Minero Aoki <aamine@loveruby.net>
-
- * parse.y [ripper]: adjust lineno and columns for multi-line
- strings.
-
- * parse.y [ripper]: delay heredocument events until seeing
- end-of-line.
-
- * parse.y [ripper]: event on__heredoc_contentn ->
- on__tstring_content.
-
- * ext/ripper/eventids2.c: ditto.
-
- * ext/ripper/lib/ripper.rb: sync with eventids2.c.
-
- * test/ripper/test_scanner_events.rb: test it.
-
- * ext/ripper/tools/generate-ripper_rb.rb: show basename of input.
-
- * ext/ripper/Makefile.dev: support objdir build.
-
-Mon Sep 20 13:22:55 2004 Minero Aoki <aamine@loveruby.net>
-
- * parse.y [ripper]: remove Ripper#pos.
-
- * parse.y [ripper]: Ripper#column should return the column of the
- current token.
-
-Mon Sep 20 12:02:41 2004 Minero Aoki <aamine@loveruby.net>
-
- * parse.y [ripper]: unify old_lex_p and token_head.
-
- * test/ripper/test_scanner_events.rb: now \r\n is saved correctly.
-
- * parse.y: new macro lex_goto_eol() for next change.
-
-Mon Sep 20 11:01:55 2004 Minero Aoki <aamine@loveruby.net>
-
- * parse.y [ripper]: adjust line number for heredoc. [ruby-dev:24272]
-
-Mon Sep 20 04:49:22 2004 Minero Aoki <aamine@loveruby.net>
-
- * ext/ripper/ripper.rb.in: new const Ripper::PARSER_EVENT_TABLE.
-
- * ext/ripper/ripper.rb.in: new const Ripper::SCANNER_EVENT_TABLE.
-
- * ext/ripper/lib/ripper.rb: sync with ripper.rb.in.
-
-Mon Sep 20 04:13:00 2004 Minero Aoki <aamine@loveruby.net>
-
- * test/ripper/test_scanner_events.rb: test spaces before heredoc
- mark.
-
-Mon Sep 20 03:46:54 2004 Minero Aoki <aamine@loveruby.net>
-
- * parse.y [ripper]: spaces before heredoc marker was lost.
- [ruby-dev:24272]
-
- * keywords: rb_reserved_word() should be defined only in ruby
- core. [ruby-dev:24272]
-
- * lex.c: sync with keywords.
-
- * ext/ripper/ripper.rb.in (parse): fix typo.
-
- * ext/ripper/lib/ripper.rb: sync with ripper.rb.in.
-
-Mon Sep 20 03:37:59 2004 Tanaka Akira <akr@m17n.org>
-
- * ext/zlib/zlib.c (gzfile_read_raw): call readpartial at first.
- (Zlib::GzipReader#readpartial): new method.
-
Mon Sep 20 00:24:19 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* enum.c (enum_sort_by): do not use qsort directly. use
@@ -59203,23 +14981,15 @@ Sat Sep 18 14:10:23 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
direcotry or within block. thanks to Johan Holmberg
<holmberg@iar.se> [ruby-core:03446]
-Fri Sep 17 20:29:33 2004 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * parse.y: add prototypes for Microsoft compiler.
+Fri Sep 17 20:20:27 2004 Minero Aoki <aamine@loveruby.net>
- * ext/ripper/depend (parse.obj): lex.c exists at hdrdir.
-
- * {bcc32,win32,wince}/Makefile.sub (YACC, YFLAGS, parse.c):
- use bison.
+ * lib/fileutils.rb (mkdir_p): backport from CVS HEAD 1.45. [ruby-core:03420]
Fri Sep 17 17:11:08 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* array.c (rb_ary_delete): element comparison might change array
size. [ruby-dev:24273]
- * parse.y: make ruby parser reentrant. merge ripper parser to the
- real one. this change makes ruby require bison.
-
* file.c (rb_file_truncate): clear stdio buffer before truncating
the file. [ruby-dev:24191]
@@ -59247,7 +15017,7 @@ Fri Sep 17 15:01:57 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/sample/tkoptdb-safeTk.rb: ditto
-Thu Sep 16 18:12:13 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Thu Sep 16 18:12:32 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
* lib/webrick/cgi.rb (WEBrick::CGI#start): should set REMOTE_USER
to request.user attribute.
@@ -59276,44 +15046,6 @@ Tue Sep 14 23:45:44 2004 Dave Thomas <dave@pragprog.com>
* lib/rdoc/ri/ri_formatter.rb (RI::TextFormatter::TextFormatter.for):
Add Eric Hodel's simpleformatter.
-Tue Sep 14 22:11:08 2004 Minero Aoki <aamine@loveruby.net>
-
- * parse.y [ripper]: Add rdoc.
-
-Tue Sep 14 20:24:49 2004 Minero Aoki <aamine@loveruby.net>
-
- * parse.y [ripper]: space event is on__sp, not on__lwsp.
- [ruby-dev:24257]
-
- * ext/ripper/eventids2.c: ditto.
-
- * ext/ripper/lib/ripper.rb: ditto.
-
- * ext/ripper/depend (ripper.o): No action is needed.
- [ruby-dev:24260]
-
- * ext/ripper/depend: Borland make does not accept pipes in
- Makefile rules. [ruby-dev:24589]
-
- * ext/ripper/depend: separate rules for developpers.
-
- * ext/ripper/Makefile.dev: new file.
-
- * ext/ripper/MANIFEST: add Makefile.dev.
-
- * ext/ripper/tools/generate-eventids1.rb: read from file, not
- stdin.
-
- * ext/ripper/extconf.rb: clean ripper.E.
-
- * ext/ripper/tools/generate-ripper_rb.rb: #include ids1/ids2
- function was lost.
-
- * ext/ripper/tools/generate-ripper_rb.rb: SCANNER_EVENTS wrongly
- contained parser events.
-
- * ext/ripper/lib/ripper.rb: ditto.
-
Tue Sep 14 16:59:37 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tcltklib/tcltklib.c: fix SEGV
@@ -59324,21 +15056,9 @@ Tue Sep 14 16:59:37 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/sample/safe-tk.rb: new sample script
-Mon Sep 13 21:33:40 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Tue Sep 14 00:15:15 2004 WATANABE Hirofumi <eban@ruby-lang.org>
- * ext/openssl/ossl_x509name.c (ossl_x509name_to_s): add optional
- second argument to specify the output format (see also
- X509_NAME_print_ex).
-
- * ext/openssl/ossl_x509name.c (ossl_x509name_init): new constants:
- OpenSSL::X509::Name::COMPAT, OpenSSL::X509::Name::RFC2253,
- OpenSSL::X509::ONELINE, OpenSSL::X509::MULTILINE.
-
- * ext/openssl/lib/openssl/x509.rb (OpenSSL::X509::Name::RFC2253DN):
- new module to provide the parse for RFC2253 DN format.
-
- * ext/openssl/lib/openssl/x509.rb (OpenSSL::X509::Name.parse_rfc2253):
- new method to parse RFC2253 DN format.
+ * ext/zlib/zlib.c: backported from HEAD.
Mon Sep 13 19:16:33 2004 WATANABE Hirofumi <eban@ruby-lang.org>
@@ -59349,92 +15069,10 @@ Mon Sep 13 16:23:27 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/multi-tk.rb: MultiTkIp.new_master and new_slave accept
safe-level value argument
-Mon Sep 13 10:48:37 2004 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (rb_w32_getpid): don't need to use _getpid() on
- mswin32 and mingw32.
-
-Mon Sep 13 10:22:05 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+Mon Sep 13 10:20:45 2004 NAKAMURA Usaku <usa@ruby-lang.org>
* object.c (nil_inspect): fix typo.
-Mon Sep 13 09:29:58 2004 Minero Aoki <aamine@loveruby.net>
-
- * ext/ripper/depend: (nmake hack) prepend "./" to ripper.c to
- avoid {$(srcdir)}.
-
-Mon Sep 13 06:43:42 2004 Minero Aoki <aamine@loveruby.net>
-
- * ext/ripper/tools/list-parse-event-ids.rb: does not use getopts.
-
- * ext/ripper/tools/list-scan-event-ids.rb: ditto.
-
-Mon Sep 13 02:42:28 2004 Minero Aoki <aamine@loveruby.net>
-
- * ext/Setup: add ripper.
-
- * ext/Setup.atheos: ditto.
-
- * ext/Setup.dj: ditto.
-
- * ext/Setup.emx: ditto.
-
- * ext/Setup.nt: ditto.
-
- * ext/Setup.x68: ditto.
-
-Mon Sep 13 02:26:31 2004 Minero Aoki <aamine@loveruby.net>
-
- * ext/ripper: ripper extension added.
-
- * ext/ripper/MANIFEST: new file.
-
- * ext/ripper/README: new file.
-
- * ext/ripper/depend: new file.
-
- * ext/ripper/extconf.rb: new file.
-
- * ext/ripper/eventids2.c: new file.
-
- * ext/ripper/ripper.rb.in: new file.
-
- * ext/ripper/lib/ripper.rb: new file.
-
- * ext/ripper/test/check-event-arity.rb: new file.
-
- * ext/ripper/test/check-event-coverage.sh: new file.
-
- * ext/ripper/test/check-scanner-event-coverage.rb: new file.
-
- * ext/ripper/test/list-called-events.rb: new file.
-
- * ext/ripper/test/src_rb: new file.
-
- * ext/ripper/test/validate.rb: new file.
-
- * ext/ripper/tools/generate-eventids1.rb: new file.
-
- * ext/ripper/tools/generate-param-macros.rb: new file.
-
- * ext/ripper/tools/generate-ripper_rb.rb: new file.
-
- * ext/ripper/tools/list-parse-event-ids.rb: new file.
-
- * ext/ripper/tools/list-scan-event-ids.rb: new file.
-
- * ext/ripper/tools/preproc.rb: new file.
-
- * ext/ripper/tools/strip.rb: new file.
-
- * test/ripper: ripper tests added.
-
- * test/ripper/dummyparser.rb: new file.
-
- * test/ripper/test_parser_events.rb: new file.
-
- * test/ripper/test_scanner_events.rb: new file.
-
Mon Sep 13 01:03:02 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tcltklib/tcltklib.c: improve control of preserv/release tcltkip
@@ -59443,19 +15081,7 @@ Mon Sep 13 01:03:02 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/tkutil.c: fix(?) SEGV
-Mon Sep 13 00:22:53 2004 Minero Aoki <aamine@loveruby.net>
-
- * parse.y: fix file header.
-
-Mon Sep 13 00:20:39 2004 Minero Aoki <aamine@loveruby.net>
-
- * parse.y: ripper merged.
-
- * lex.c: ditto.
-
- * keywords: ditto.
-
-Sun Sep 12 23:53:17 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Sun Sep 12 23:46:23 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* util.c (ruby_strdup): remove unnecessary code. (xmalloc never
returns NULL.)
@@ -59487,25 +15113,11 @@ Sat Sep 11 16:09:46 2004 Dave Thomas <dave@pragprog.com>
* lib/rdoc/parsers/parse_rb.rb: Fix up cross-file class merging.
-Fri Sep 10 20:18:05 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Fri Sep 10 20:20:53 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* ext/tcltklib/tcltklib.c (lib_merge_tklist): fix suspicious
pointer conversion.
-Fri Sep 10 19:16:24 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * bcc32/Makefile.sub: bccwin32 port starts to use RTL dll.
- (need to rebuild all) [ruby-dev:24138]
-
- * win32/win32.{h,c}: ditto.
-
-Fri Sep 10 15:55:59 2004 Minero Aoki <aamine@loveruby.net>
-
- * lib/fileutils.rb (mkdir_p): should pass mode argument to
- Dir.mkdir. [ruby-dev:24242]
-
- * test/fileutils/test_fileutils.rb: test it.
-
Fri Sep 10 02:43:54 2004 Dave Thomas <dave@pragprog.com>
* lib/rdoc/generators/template/kilmer.rb: James Buck's
@@ -59547,16 +15159,9 @@ Tue Sep 7 15:17:49 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/socket/socket.c (ruby_connect): break immediately if a
socket is non-blocking. [ruby-talk:111654]
-Tue Sep 7 12:48:22 2004 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * {bcc32,win32,wince}/Makefile.sub (config.h): add fcntl.
-
- * win32/win32.[ch] (fcntl): ditto.
-
- * win32/win32.c (rb_w32_connect): support nonblocking mode.
+Mon Sep 6 11:08:50 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * ext/socket/socket.c (wait_connectable, ruby_connect): support
- nonblocking connect on various platforms.
+ * ext/tk/lib/tk/menu.rb(TkOptionMenubutton#insert): call correct method
Mon Sep 6 11:00:47 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
@@ -59564,13 +15169,9 @@ Mon Sep 6 11:00:47 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
exception occurred within a block. a patch was given from Johan
Holmberg <holmberg at iar.se>. [ruby-core:03292]
-Mon Sep 6 10:57:40 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * ext/tk/lib/tk/menu.rb(TkOptionMenubutton#insert): call correct method
-
Mon Sep 6 07:51:42 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
- * eval.c (cvar_cbase): singletons should refer to outer cvar scope.
+ * eval.c (cvar_cbase): singletons should refer outer cvar scope.
[ruby-dev:24223]
* eval.c (rb_load): should preserve previous ruby_wrapper value.
@@ -59601,20 +15202,18 @@ Fri Sep 3 02:12:48 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
Fri Sep 3 01:54:20 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/extmk.rb (extmake): extact target prefix from Makefiles.
-
* ext/extmk.rb: already built-in libraries satisfy dependencies.
[ruby-dev:24028]
-Wed Sep 1 21:16:50 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Thu Sep 2 11:36:20 2004 WATANABE Hirofumi <eban@ruby-lang.org>
- * ext/tk/lib/tk/spinbox.rb: fix typo
+ * eval.c (rb_obj_instance_eval): backported from HEAD.
-Wed Sep 1 19:28:37 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Sep 1 21:18:25 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * process.c (rb_proc_exec): label cannot precede variable declarations.
+ * ext/tk/lib/tk/spinbox.rb: fix typo
-Tue Aug 31 18:20:49 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Tue Aug 31 18:24:04 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* ext/tk/tkutil.c (cbsubst_init): fix memory leak
@@ -59629,10 +15228,6 @@ Tue Aug 31 12:30:36 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tcltklib/tcltklib.c (del_root): fix SEGV
-Mon Aug 30 21:50:14 2004 Dave Thomas <dave@pragprog.com>
-
- * object.c: Add RDoc for Module.included.
-
Mon Aug 30 23:11:06 2004 Dave Thomas <dave@pragprog.com>
* lib/rdoc/ri/ri_driver.rb (and others): ri now merges documentation
@@ -59642,10 +15237,19 @@ Mon Aug 30 22:40:30 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/multi-tk.rb: 'restart' method accepts arguments
+Mon Aug 30 21:50:14 2004 Dave Thomas <dave@pragprog.com>
+
+ * object.c: Add RDoc for Module.included.
+
Mon Aug 30 15:10:46 2004 WATANABE Hirofumi <eban@ruby-lang.org>
* configure.in (GNU/k*BSD): fixed FTBFS on GNU/k*BSD. [ruby-dev:24051]
+Mon Aug 30 11:29:35 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * win32/win32.c (CreateChild): strip trailing spaces. [ruby-dev:24143]
+ merge from HEAD.
+
Sun Aug 29 14:08:56 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tcltklib/tcltklib.c: compile error on bcc32 [ruby-dev:24081]
@@ -59657,49 +15261,27 @@ Sat Aug 28 23:04:41 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* bignum.c (rb_big_and): protect parameters from GC.
[ruby-talk:110664]
-Fri Aug 27 12:13:50 2004 Tanaka Akira <akr@m17n.org>
-
- * ext/stringio/stringio.c (Init_stringio): add StringIO#readpartial as
- an alias for StringIO#sysread.
-
-Fri Aug 27 10:14:21 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * process.c (rb_proc_exec): strip trailing spaces. [ruby-dev:24143]
-
- * win32/win32.c (CreateChild): ditto.
-
Thu Aug 26 04:38:29 2004 Dave Thomas <dave@pragprog.com>
* eval.c (return_jump): Minor typo in error message. Now reads
"return can't jump across threads".
-Wed Aug 25 15:18:52 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_longjmp): Exception#to_str is no longer defined.
-
-Wed Aug 25 11:39:10 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * error.c (exc_equal): exceptions are equal if they share same
- class, message and backtrace. [ruby-talk:110354]
-
- * error.c (name_err_mesg_equal): ditto.
-
-Tue Aug 24 16:41:48 2004 Shugo Maeda <shugo@ruby-lang.org>
+Tue Aug 24 17:30:00 2004 Shugo Maeda <shugo@ruby-lang.org>
* lib/cgi/session.rb (CGI::Session::FileStore#initialize): do not
- use a session id as a filename.
+ use a session id as a filename. (backported from HEAD)
* lib/cgi/session/pstore.rb (CGI::Session::PStore#initialize): ditto.
* lib/cgi/session/pstore.rb (CGI::Session::PStore#initialize): use
- Dir::tmpdir.
+ Dir::tmpdir. (backported from HEAD)
-Tue Aug 24 14:32:17 2004 Shugo Maeda <shugo@ruby-lang.org>
+Tue Aug 24 14:40:16 2004 Shugo Maeda <shugo@ruby-lang.org>
* lib/cgi/session.rb (CGI::Session::FileStore#initialize): untaint
- session id after check.
+ session id after check. (backported from HEAD)
-Tue Aug 24 08:57:51 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Tue Aug 24 09:09:01 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
* ext/openssl/ossl_x509attr.c (ossl_x509attr_initialize): d2i
functions may replace the pointer indicated by the first argument.
@@ -59708,12 +15290,7 @@ Tue Aug 24 08:57:51 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
* ext/openssl/ossl_x509name.c (ossl_x509name_initialize): ditto.
-Mon Aug 23 12:43:32 2004 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * lib/resolv.rb (Config.default_config_hash): when multiple domains
- are set, Win32::Resolv.get_resolv_info returns Array.
-
-Sun Aug 22 16:27:38 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Mon Aug 23 14:04:51 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
* ext/openssl/ossl_ssl.c (ossl_ssl_read):
- should return an empty string if specified length to read is 0.
@@ -59729,7 +15306,12 @@ Sun Aug 22 16:27:38 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
* ext/openssl/lib/openssl/buffering.rb: should not use select.
-Sun Aug 22 01:10:36 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Mon Aug 23 12:40:56 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * lib/resolv.rb (Config.default_config_hash): when multiple domains
+ are set, Win32::Resolv.get_resolv_info returns Array.
+
+Sun Aug 22 01:15:31 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
* lib/webrick/httpproxy.rb (WEBrick::HTTPProxyServer#proxy_connect):
should call :ProxyContentHandler before finishing CONNECT.
@@ -59741,15 +15323,6 @@ Sat Aug 21 06:41:16 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (arg_config, with_config): deal with '-' and '_'
uniformly. [ruby-dev:24118]
-Fri Aug 20 14:49:42 2004 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * io.c (rb_io_check_writable): no need to check read buffer if
- already changed to write mode.
-
-Fri Aug 20 11:46:43 2004 UENO Katsuhiro <katsu@blue.sky.or.jp>
-
- * ext/zlib/zlib.c: GzipReader#ungetc caused crc error.
-
Thu Aug 19 16:29:45 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tk.rb: Fail to treat a hash value of 'font' option.
@@ -59763,15 +15336,17 @@ Thu Aug 19 15:15:24 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* dir.c (free_dir): fix memory leak. reported by yamamoto
madoka.
-Thu Aug 19 09:19:27 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+Thu Aug 19 11:00:00 2004 Akiyoshi, Masamichi <masamichi.akiyoshi@hp.com>
- * configure.in, win32/Makefile.sub (LIBS): need to link shell32
- library for SH* functions on mswin32 and mingw32.
+ * dln.c (dln_load): Modify to call lib$find_image_symbol for VMS.
+ * io.c (rb_io_fwrite): Use fputc() for VMS non-stream file.
- * wince/Makefile.sub (LIBS): need to link ceshell library for SH*
- functions on mswince.
+Thu Aug 19 06:07:45 2004 why the lucky stiff <why@ruby-lang.org>
-Thu Aug 19 03:07:00 2004 why the lucky stiff <why@ruby-lang.org>
+ * ext/syck/token.c: re2c no longer compiled with bit vectors. caused
+ problems for non-ascii characters. [ruby-core:03280]
+ * ext/syck/implicit.c: ditto.
+ * ext/syck/bytecode.c: ditto.
* lib/yaml/baseemitter.rb: folding now handles double-quoted strings,
fixed problem with extra line feeds at end of folding, whitespace
@@ -59780,9 +15355,9 @@ Thu Aug 19 03:07:00 2004 why the lucky stiff <why@ruby-lang.org>
* lib/yaml/rubytypes.rb: subtelties in handling strings with
non-printable characters and odd whitespace patterns.
-Wed Aug 18 23:44:20 2004 Minero Aoki <aamine@loveruby.net>
+Wed Aug 18 23:41:33 2004 Minero Aoki <aamine@loveruby.net>
- * lib/net/protocol.rb (rbuf_fill): OpenSSL::SSLSocket has its own
+ * lib/net/protocol.rb (rbuf_fill): OpenSSL::SSL::SSLSocket has its own
buffer, select(2) might not work. [ruby-dev:24072]
Wed Aug 18 17:10:12 2004 WATANABE Hirofumi <eban@ruby-lang.org>
@@ -59795,17 +15370,6 @@ Wed Aug 18 12:52:55 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (rb_obj_instance_eval): evaluates under special singleton
classes as for special constants.
-Wed Aug 18 11:22:52 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/win32.c (init_env): initialize HOME and USER environment
- variables unless set.
-
-Wed Aug 18 10:17:21 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (bind_eval): new method. [RCR 251]
-
- * string.c (rb_str_clear): new method. [ruby-dev:24104]
-
Tue Aug 17 17:20:59 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* io.c (rb_io_reopen): should clear allocated OpenFile. pointed
@@ -59816,19 +15380,23 @@ Tue Aug 17 01:36:32 2004 Dave Thomas <dave@pragprog.com>
* lib/rdoc/usage.rb: Remove extra indent. Tidy 'ri' option
parsing so RDoc::usage plays better with OptionParser.
+Sat Aug 14 13:09:10 2004 Minero Aoki <aamine@loveruby.net>
+
+ * lib/fileutils.rb: backport from CVS HEAD (rev1.44).
+
+ * lib/fileutils.rb: cp_r should copy symlink itself, except cp_r
+ root.
+
+ * lib/fileutils.rb: new option mv :force.
+
+ * lib/fileutils.rb: new module FileUtils::DryRun.
+
Sat Aug 14 02:48:16 2004 Dave Thomas <dave@pragprog.com>
* lib/rdoc/usage.rb: Added. Allows command line programs
to report usage using their initial RDoc comment.
-Sat Aug 14 01:25:48 2004 why the lucky stiff <why@ruby-lang.org>
-
- * ext/syck/token.c: re2c no longer compiled with bit vectors. caused
- problems for non-ascii characters. [ruby-core:03280]
- * ext/syck/implicit.c: ditto.
- * ext/syck/bytecode.c: ditto.
-
-Fri Aug 13 12:55:20 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Fri Aug 13 13:23:17 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
* lib/webrick/httputils.rb (WEBrick::HTTPUtils.parse_range_header):
fix regex for range-spec.
@@ -59837,44 +15405,15 @@ Fri Aug 13 12:55:20 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
(WEBrick::HTTPServlet::DefaultFileHandler#make_partial_content):
multipart/byteranges response was broken.
- * lib/xmlrpc/server.rb: refine example code.
-
-Thu Aug 12 10:54:17 2004 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * rubyio.h (rb_eof_error): should mark as NORETURN.
-
- * win32/win32.c (make_cmdvector): adjust escaped successive
- double-quote handling.
-
-Thu Aug 12 01:53:10 2004 Tanaka Akira <akr@m17n.org>
-
- * io.c (read_buffered_data): extracted from rb_io_fread.
- (io_readpartial): new method IO#readpartial.
- [ruby-dev:24055]
-
-Wed Aug 11 17:17:50 2004 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * configure.in (RPATHFLAG): stop setting RPATHFLAG on Interix.
-
-Mon Aug 9 15:03:20 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
* lib/webrick/httpservlet/erbhandler.rb
(WEBrick::HTTPServlet::ERBHandler#do_GET): should select media type
by suffix of script filename.
-Mon Aug 9 12:51:43 2004 Dave Thomas <dave@pragprog.com>
-
- * dir.c (dir_s_glob): Roll in Austin Ziegler's Dir.glob and
- fnmatch updates.
-
-Mon Aug 9 06:33:06 2004 Minero Aoki <aamine@loveruby.net>
-
- * lib/fileutils.rb (cp_r): copies symlink to symlink, except
- root entries of cp_r.
+ * lib/xmlrpc/server.rb: refine example code.
- * lib/fileutils.rb: new method FileUtils.copy_entry.
+Wed Aug 11 17:17:50 2004 WATANABE Hirofumi <eban@ruby-lang.org>
- * test/fileutils/test_fileutils.rb: more cp_r tests.
+ * configure.in (RPATHFLAG): stop setting RPATHFLAG on Interix.
Sun Aug 8 00:43:31 2004 why the lucky stiff <why@ruby-lang.org>
@@ -59886,38 +15425,21 @@ Sun Aug 8 00:43:31 2004 why the lucky stiff <why@ruby-lang.org>
collections. plain scalars are trimmed if indentation follows in
an ambiguous flow collection.
-Sat Aug 7 03:08:21 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * process.c (proc_daemon): new method. should be modified for
- platforms without /dev/null.
-
Sat Aug 7 00:50:01 2004 Tanaka Akira <akr@m17n.org>
* ext/zlib/zlib.c: Zlib::GzipReader#read(0) returns "" instead of nil.
-Wed Aug 4 13:26:00 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * marshal.c (r_bytes0): optimize out read(0). [ruby-talk:108276]
-
-Tue Aug 3 13:49:12 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+Tue Aug 3 13:49:20 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tk/namespace.rb: bug fix
* ext/tk/lib/tkextlib/treectrl/tktreectrl.rb: add Tk::TreeCtrl.loupe
-Mon Aug 2 23:33:48 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * test/ruby/test_file.rb (test_fnmatch): added more tests.
-
Mon Aug 2 18:04:21 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tk/msgcat.rb (set_translation): bug fix (fail to set
trans_str to the same as src_str when trans_str is not given.)
-Mon Aug 2 17:40:44 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (blk_free): fixed serious memory leak. [ruby-dev:24013]
-
Mon Aug 2 11:53:06 2004 Dave Thomas <dave@pragprog.com>
* lib/rdoc/code_objects.rb (RDoc::Context::find_symbol): Fix infinite recursion
@@ -59928,21 +15450,15 @@ Mon Aug 2 11:48:29 2004 Dave Thomas <dave@pragprog.com>
* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::do_methods): Allow '.'s in
variable names to support SWIG generated files (Hans Fugal)
-Sat Jul 31 23:08:00 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (is_defined): stupid mistakes fixed. [ruby-dev:24006]
-
-Sat Jul 31 17:39:47 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat Jul 31 17:40:16 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* misc/ruby-mode.el (ruby-expr-beg, ruby-parse-partial,
ruby-calculate-indent, ruby-move-to-block, ruby-forward-sexp,
ruby-backward-sexp): keywords must match word-wise.
-Sat Jul 31 13:37:51 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+Sat Jul 31 05:47:37 2004 why the lucky stiff <why@ruby-lang.org>
- * eval.c (is_defined): avoid unnecessary method invocations.
-
-Sat Jul 31 05:35:37 2004 why the lucky stiff <why@ruby-lang.org>
+ * lib/yaml.rb (YAML::load_file, YAML::parse_file): added.
* lib/yaml/rubytypes.rb: exceptions were using an older
YAML.object_maker. [ruby-core:03080]
@@ -59951,10 +15467,9 @@ Sat Jul 31 05:35:37 2004 why the lucky stiff <why@ruby-lang.org>
handline CR-LFs. "\000" was showing up on folded blocks which
stopped at EOF.
-Sat Jul 31 01:25:11 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (is_defined): call is_defined() before invoking
- rb_eval(). [ruby-talk:107867]
+ * ext/syck/token.c: re2c compiled with bit vectors now.
+ * ext/syck/implicit.c: ditto.
+ * ext/syck/bytecode.c: ditto.
Fri Jul 30 16:10:54 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
@@ -59972,26 +15487,8 @@ Wed Jul 28 18:59:17 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/cgi.rb (CGI::initialize): remove at_exit code for CGI_PARAMS
and CGI_COOKIES. they will no longer be used.
-Wed Jul 28 15:44:08 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_call0): should call rb_call_super() directly for
- visibility overriding. [ruby-dev:23989]
-
Wed Jul 28 01:04:44 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
- * env.h: remove argv from ruby_frame.
-
- * eval.c (rb_eval): no more copy on write.
-
- * eval.c (assign): ditto.
-
- * eval.c (rb_call0): can receive *rest by specifying negative
- argc. (-1 means 0 arg and *rest, -2 means 1 arg and *rest...)
-
- * eval.c (rb_call0): properly set frame's argc counter.
-
- * gc.c (rb_gc_mark_frame): need not to mark frame's argv
-
* gc.c (run_final): wrong order of data. [ruby-dev:23984]
Tue Jul 27 07:05:04 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
@@ -60012,13 +15509,11 @@ Mon Jul 26 11:22:55 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
* lib/webrick/httputils.rb (WEBrick::HTTPUtils.escape): should
escape space.
-Sun Jul 25 10:56:28 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Sun Jul 25 11:05:21 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* win32/win32.{h,c} (rb_w32_{f,fd,fs}open): workaround for bcc32's
{f,fd,fs}open bug. set errno EMFILE and EBADF. [ruby-dev:23963]
- * test/drb/drbtest.rb: fix method duplication.
-
Sat Jul 24 13:32:47 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* range.c (rb_range_beg_len): returns Qnil only when "beg" points
@@ -60029,24 +15524,37 @@ Fri Jul 23 16:40:25 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* gc.c (define_final): should not disclose NODE* to Ruby world.
[ruby-dev:23957]
-Fri Jul 23 08:52:22 2004 Shugo Maeda <shugo@ruby-lang.org>
+Fri Jul 23 09:03:16 2004 Shugo Maeda <shugo@ruby-lang.org>
- * lib/net/imap.rb (disconnected?): new method.
+ * lib/net/imap.rb (disconnected?): new method. (backported from HEAD)
Thu Jul 22 16:41:54 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/cgi/session.rb (CGI::Session::FileStore#update): sets the
- permission of the session data file to 0600.
+ permission of the session data file to 0600.
* lib/cgi/session/pstore.rb (CGI::Session::Pstore#initialize):
ditto.
-Mon Jul 19 00:53:46 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Thu Jul 22 00:02:21 2004 Masahiro Kitajima <katonbo@katontech.com>
+
+ * process.c (rb_f_system): not need to call last_status_set() any
+ longer on _WIN32.
+
+Tue Jul 20 09:15:17 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+
+ * test/fileutils/test_fileutils.rb: File.link raises EINVAL on BeOS.
+
+Mon Jul 19 01:15:07 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
* lib/webrick/httpservlet/cgihandler.rb
(WEBrick::HTTPServlet::CGIhandler#do_GET): set SystemRoot environment
variable to CGI process on Windows native platforms. [ruby-dev:23936]
+ * lib/webrick/httpservlet/cgihandler.rb
+ (WEBrick::HTTPServlet::CGIhandler#do_GET): use $?.exitstatus and
+ refine log message.
+
Sun Jul 18 16:14:29 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tk/msgcat.rb (TkMsgCatalog.callback): bug fix
@@ -60056,19 +15564,18 @@ Sun Jul 18 08:13:58 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* sprintf.c (rb_f_sprintf): remove extra sign digit.
-Sun Jul 18 03:19:14 2004 Akinori MUSHA <knu@iDaemons.org>
+Sun Jul 18 03:21:42 2004 Akinori MUSHA <knu@iDaemons.org>
- * dir.c (bracket): use NULL instead of 0.
+ * dir.c (range): use NULL instead of 0.
-Sun Jul 18 02:35:30 2004 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/net/imap.rb (receive_responses): return if a LOGOUT response
- received.
+ * dir.c (range): get rid of a gcc 3.4 warning.
-Sat Jul 17 23:59:01 2004 Shugo Maeda <shugo@ruby-lang.org>
+Sun Jul 18 03:12:11 2004 Shugo Maeda <shugo@ruby-lang.org>
+ * lib/net/imap.rb (receive_responses): return if a LOGOUT response
+ received. (backported from HEAD)
* lib/net/imap.rb (send_string_data): wait command continuation
- requests before sending octet data of literals.
+ requests before sending octet data of literals. (backported from HEAD)
Sat Jul 17 23:54:59 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
@@ -60082,14 +15589,6 @@ Sat Jul 17 18:29:07 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (stmt): not to show same error messages twice.
-Sat Jul 17 14:18:11 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_match_m): String#match should also take
- optional argument. [ruby-core:03205]
-
- * re.c (rb_reg_match_m): add optional second argugment "pos" to
- specify match start point. [ruby-core:03203]
-
Sat Jul 17 13:13:32 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/irb/ruby-lex.rb (RubyLex::identify_string): %s string do not
@@ -60097,7 +15596,7 @@ Sat Jul 17 13:13:32 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
Sat Jul 17 05:26:27 2004 Dave Thomas <dave@pragprog.com>
- * lib/rdoc/diagram.rb: Incorporate Micheal Neumann's
+ * lib/rdoc/diagram.rb: Incorporate Micheal Neuman's
client-side imagemao patch
Sat Jul 17 01:57:03 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
@@ -60110,6 +15609,24 @@ Fri Jul 16 22:30:28 2004 Michael Neumann <mneumann@ntecs.de>
* file.c (rb_stat_dev_major): new methods File::Stat#dev_major and
#dev_minor. [ruby-core:03195]
+Fri Jul 16 15:23:53 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (return_jump, break_jump): raise unexpceted local jump
+ exception directly. [ruby-dev:23740]
+
+ * lib/base64.rb (Deprecated): super in bound method calls original
+ name method in stable version. [ruby-dev:23916]
+
+Fri Jul 16 11:31:49 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+
+ * lib/test/unit/ui/{fox,gtk,gtk2}/testrunner.rb: remove
+ garbage (patch from akira yamada) [ruby-dev:23911]
+
+Fri Jul 16 11:20:00 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * sprintf.c (rb_f_sprintf): fix output of NaN, Inf and -Inf with
+ "%f" or etc on MSVCRT platforms. (backported from HEAD)
+
Fri Jul 16 11:17:38 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* error.c (exit_initialize): use EXIT_SUCCESS instead of 0.
@@ -60129,19 +15646,13 @@ Thu Jul 15 23:53:38 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
Thu Jul 15 22:59:48 2004 Shugo Maeda <shugo@ruby-lang.org>
* ext/readline/extconf.rb: added dir_config for curses, ncurses,
- termcap.
-
-Thu Jul 15 20:44:46 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * class.c: rdoc patch
+ termcap. (backported from HEAD)
-Thu Jul 15 14:12:34 2004 why the lucky stiff <why@ruby-lang.org>
+Thu Jul 15 20:29:15 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * lib/yaml.rb (YAML::load_file, YAML::parse_file): added.
-
- * ext/syck/token.c: re2c compiled with bit vectors now.
- * ext/syck/implicit.c: ditto.
- * ext/syck/bytecode.c: ditto.
+ * class.c, error.c, eval.c, intern.h, object.c, variable.c:
+ do not set path if it is a singleton class. [ruby-dev:22588]
+ (backport from 1.9)
Thu Jul 15 10:15:04 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
@@ -60167,12 +15678,7 @@ Thu Jul 15 10:15:04 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/sample/tkextlib/: add samples of Iwidget and TkTable
-Wed Jul 14 23:49:30 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enum.c (enum_min_by): new method Enum#min_by. added Enum#max_by
- as well.
-
-Wed Jul 14 18:05:21 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Wed Jul 14 18:08:37 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
* ext/openssl/ossl_asn1.c (ossl_asn1cons_to_der): fix type of
argument. [ruby-dev:23891]
@@ -60180,14 +15686,14 @@ Wed Jul 14 18:05:21 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
* test/openssl/test_x509store.rb: prune tests for CRL checking
unless X509::V_FLAG_CRL_CHECK is defined.
-Wed Jul 14 12:20:05 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Wed Jul 14 12:29:07 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* util.c (ruby_strtod): should not convert string in the form of
"-I.FE-X" which both "I" and "F" are ommitted. [ruby-dev:23883]
* test/ruby/test_float.rb (test_strtod): add test for bug fix.
-Wed Jul 14 00:33:48 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Wed Jul 14 00:31:15 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* array.c: rdoc patch. merged patch from Johan Holmberg
<holmberg@iar.se> [ruby-core:3170]
@@ -60202,7 +15708,7 @@ Tue Jul 13 19:39:12 2004 akira yamada <akira@ruby-lang.org>
* test/uri/test_generic.rb (TestGeneric#test_merge): added tests.
-Tue Jul 13 15:48:56 2004 Akinori MUSHA <knu@iDaemons.org>
+Tue Jul 13 15:51:45 2004 Akinori MUSHA <knu@iDaemons.org>
* lib/mkmf.rb (init_mkmf): Do not add $(libdir) to $LIBPATH in
extmk mode.
@@ -60214,14 +15720,14 @@ Tue Jul 13 00:50:48 2004 Dave Thomas <dave@pragprog.com>
* lib/rdoc/parsers/parse_rb.rb: Support call-seq: for Ruby files.
-Mon Jul 12 21:20:51 2004 Dave Thomas <dave@pragprog.com>
+Mon Jul 12 21:20:36 2004 Dave Thomas <dave@pragprog.com>
* html_generator.rb: Support hyperlinks of the form {any text}[xxx]
as well as stuff[xxx]
Sat Jul 10 09:30:24 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
- * test/soap/marshal/test_struct.rb: use qualified built-in class name
+ * test/soap/marshal/test_struct.rb: use qualified build-tin class name
(::Struct) to avoid name crash.
Sat Jul 10 04:21:56 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
@@ -60236,7 +15742,7 @@ Sat Jul 10 04:21:56 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
function of Tk::ValidateConfigure to define validatecommand
methods easier
-Fri Jul 9 22:18:59 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Fri Jul 9 22:36:36 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* array.c, enum.c, pack.c: rdoc patch from Johan Holmberg
<holmberg@iar.se> [ruby-core:3132] [ruby-core:3136]
@@ -60256,33 +15762,36 @@ Fri Jul 9 14:28:54 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
Fri Jul 9 01:47:08 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * ext/tk/lib: bug fix
- * ext/tk/lib/tkextlib/itcl: add [incr Tcl] support
- * ext/tk/lib/tkextlib/itk: add [incr Tk] support
- * ext/tk/lib/tkextlib/iwidgets: midway point of [incr Widgets] support
- * ext/tk/sample/tkextlib/iwidgets: very simple examples of
+ * ext/tk/lib : bug fix
+ * ext/tk/lib/tkextlib/itcl : add [incr Tcl] support
+ * ext/tk/lib/tkextlib/itk : add [incr Tk] support
+ * ext/tk/lib/tkextlib/iwidgets : midway point of [incr Widgets] support
+ * ext/tk/sample/tkextlib/iwidgets : very simple examples of
[incr Widgets]
-Thu Jul 8 19:27:16 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (rb_cv_stack_end_address): detect stack end address
- variable supplied by system. [ruby-core:03115]
+Thu Jul 8 22:52:19 2004 Kouhei Sutou <kou@cozmixng.org>
- * gc.c (Init_stack): use system provided address if possible.
+ * lib/rss/{rss,parser,0.9,1.0,2.0}.rb: supported RSS 0.9x/2.0
+ validation and validation which disregard order of elements.
+ * test/rss/test_parser.rb: added tests for RSS 0.9x/2.0
+ validation.
+ * test/rss/{test_trackback,rss-testcase}.rb: fixed no good method
+ name.
Thu Jul 8 00:05:23 2004 akira yamada <akira@ruby-lang.org>
* lib/tempfile.rb (Tempfile::initialize): got out code of
generating tmpname. [ruby-dev:23832][ruby-dev:23837]
-Wed Jul 7 02:31:41 2004 Kouhei Sutou <kou@cozmixng.org>
+Wed Jul 7 15:53:14 2004 NAKAMURA Usaku <usa@ruby-lang.org>
- * lib/rss/{rss,parser,0.9,1.0,2.0}.rb: supported RSS 0.9x/2.0
- validation and validation which disregard order of elements.
- * test/rss/test_parser.rb: added tests for RSS 0.9x/2.0
- validation.
- * test/rss/{test_trackback,rss-testcase}.rb: fixed no good method
- name.
+ * string.c (rb_str_match): raise TypeError when both arguments are
+ strings. [ruby-dev:22869] (backported from HEAD)
+
+ * string.c (rb_str_match2): removed.
+
+ * Makefile.in, bcc32/Makefile.sub, win32/Makefile.sub,
+ wince/Makefile.sub (string.c): now not depend on version.h.
Wed Jul 7 00:48:34 2004 WATANABE Hirofumi <eban@ruby-lang.org>
@@ -60291,7 +15800,7 @@ Wed Jul 7 00:48:34 2004 WATANABE Hirofumi <eban@ruby-lang.org>
Tue Jul 6 18:38:45 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * ext/tk/lib: improve framework of developping Tcl/Tk extension
+ * ext/tk/lib : improve framework of developping Tcl/Tk extension
wrappers
Mon Jul 5 23:56:42 2004 Kouhei Sutou <kou@cozmixng.org>
@@ -60310,7 +15819,7 @@ Mon Jul 5 09:02:52 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (rb_thread_yield, rb_f_catch): 4th argument to rb_yield_0()
is a set of bit flags. [ruby-dev:23859]
-Mon Jul 5 01:20:17 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Mon Jul 5 01:27:32 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* lib/drb/drb.rb(DRbConn self.open): If socket pool is full, close
the socket whose last-access-time is oldest. (and add new one)
@@ -60320,10 +15829,12 @@ Sun Jul 4 12:24:50 2004 Kouhei Sutou <kou@cozmixng.org>
* lib/rss/rss.rb: added copyright header.
-Sat Jul 3 22:25:27 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+Sun Jul 4 00:24:40 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
- * added files:
- * lib/soap/header/*
+ * added files
+ * lib/soap/attachment.rb
+ * lib/soap/header
+ * lib/soap/mimemessage.rb
* lib/soap/rpc/httpserver.rb
* lib/wsdl/soap/cgiStubCreator.rb
* lib/wsdl/soap/classDefCreator.rb
@@ -60337,29 +15848,36 @@ Sat Jul 3 22:25:27 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
* lib/wsdl/xmlSchema/enumeration.rb
* lib/wsdl/xmlSchema/simpleRestriction.rb
* lib/wsdl/xmlSchema/simpleType.rb
- * lib/xsd/codegen/*
+ * lib/xsd/codegen
* lib/xsd/codegen.rb
- * sample/soap/authheader/*
- * sample/soap/raa2.4/*
- * sample/soap/ssl/*
- * sample/soap/swa/*
+ * sample/soap/authheader
+ * sample/soap/raa2.4
+ * sample/soap/ssl
+ * sample/soap/swa
* sample/soap/whois.rb
- * sample/wsdl/raa2.4/*
- * test/soap/header/*
- * test/soap/ssl/*
- * test/soap/struct/*
- * test/soap/swa/*
- * test/soap/wsdlDriver/*
+ * sample/soap/calc/samplehttpd.conf
+ * sample/soap/exchange/samplehttpd.conf
+ * sample/soap/sampleStruct/samplehttpd.conf
+ * sample/wsdl/raa2.4
+ * sample/wsdl/googleSearch/samplehttpd.conf
+ * test/openssl/_test_ssl.rb
+ * test/soap/header
+ * test/soap/ssl
+ * test/soap/struct
+ * test/soap/swa
+ * test/soap/wsdlDriver
* test/wsdl/multiplefault.wsdl
- * test/wsdl/simpletype/*
+ * test/wsdl/simpletype
* test/wsdl/test_multiplefault.rb
- * modified files:
+ * modified files
* lib/soap/baseData.rb
* lib/soap/element.rb
* lib/soap/generator.rb
+ * lib/soap/marshal.rb
* lib/soap/netHttpClient.rb
* lib/soap/parser.rb
+ * lib/soap/processor.rb
* lib/soap/property.rb
* lib/soap/soap.rb
* lib/soap/streamHandler.rb
@@ -60374,6 +15892,7 @@ Sat Jul 3 22:25:27 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
* lib/soap/mapping/wsdlRegistry.rb
* lib/soap/rpc/cgistub.rb
* lib/soap/rpc/driver.rb
+ * lib/soap/rpc/element.rb
* lib/soap/rpc/proxy.rb
* lib/soap/rpc/router.rb
* lib/soap/rpc/soaplet.rb
@@ -60390,12 +15909,26 @@ Sat Jul 3 22:25:27 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
* lib/wsdl/xmlSchema/schema.rb
* lib/xsd/datatypes.rb
* lib/xsd/qname.rb
+ * sample/soap/calc/httpd.rb
+ * sample/soap/exchange/httpd.rb
+ * sample/soap/sampleStruct/httpd.rb
* sample/soap/sampleStruct/server.rb
* sample/wsdl/amazon/AmazonSearch.rb
* sample/wsdl/amazon/AmazonSearchDriver.rb
+ * sample/wsdl/googleSearch/httpd.rb
+ * test/soap/test_basetype.rb
* test/soap/test_property.rb
+ * test/soap/test_streamhandler.rb
+ * test/soap/calc/test_calc.rb
+ * test/soap/calc/test_calc2.rb
* test/soap/calc/test_calc_cgi.rb
+ * test/soap/helloworld/test_helloworld.rb
* test/wsdl/test_emptycomplextype.rb
+ * test/wsdl/axisArray/test_axisarray.rb
+ * test/wsdl/datetime/test_datetime.rb
+ * test/wsdl/raa/test_raa.rb
+ * test/xsd/test_xmlschemaparser.rb
+ * test/xsd/test_xsd.rb
* summary
* add SOAP Header mustUnderstand support.
@@ -60410,33 +15943,34 @@ Sat Jul 3 22:25:27 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
* add WSDL simpleType support to restrict lexical value space.
+ * add SOAP with Attachment support.
+
Sat Jul 3 17:19:44 2004 WATANABE Hirofumi <eban@ruby-lang.org>
* ext/tk/lib/tkextlib/tkDND.rb: fix syntax error.
-Thu Jul 1 18:36:08 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+Thu Jul 1 23:15:29 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/tk/lib/tcltklib: bug fix
+ * lib/pstore.rb (transaction): safer backup scheme. [ruby-list:39102]
- * ext/tk/lib/tk: bug fix and add Tcl/Tk extension support libraries
+ * lib/pstore.rb (commit_new): use FileUtils.copy_stream for Cygwin.
+ [ruby-dev:23157]
-Thu Jul 1 18:31:31 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/pstore.rb (transaction): allow overriding dump and load.
+ [ruby-dev:23567]
* lib/pstore.rb (PStore#transaction): get rid of opening in write mode
when read only transaction. [ruby-dev:23842]
-Thu Jul 1 00:44:42 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * lib/yaml/store.rb: follow lib/pstore.rb's change.
- * ext/openssl/ossl_cipher.c (ossl_cipher_encrypt, ossl_cipher_decrypt):
- re-implemnt (the arguments for this method is ).
+Thu Jul 1 18:36:08 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * ext/openssl/ossl_cipher.c (ossl_cipher_pkcs5_keyivgen): new method
- OpenSSL::Cipher::Cipher#pkcs5_keyivgen. it calls EVP_BytesToKey().
+ * ext/tk/lib/tcltklib : bug fix
- * ext/openssl/ossl_cipher.c (ossl_cipher_set_key_length): new method
- OpenSSL::Cipher::Cipher#key_len=.
+ * ext/tk/lib/tk : bug fix and add Tcl/Tk extension support libraries
-Wed Jun 30 19:48:09 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Thu Jul 1 11:59:45 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
* ext/openssl/extconf.rb: check for EVP_CIPHER_CTX_copy, ENGINE_add,
EVP_CIPHER_CTX_set_padding, EVP_CipherFinal_ex, EVP_CipherInit_ex,
@@ -60448,17 +15982,23 @@ Wed Jun 30 19:48:09 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
EVP_CipherInit_ex, EVP_CipherFinal_ex, HMAC_Init_ex): new macro for
OpenSSL 0.9.6.
+ * ext/openssl/ossl_cipher.c (ossl_cipher_encrypt, ossl_cipher_decrypt):
+ re-implemnt (the arguments for this method is ).
+
+ * ext/openssl/ossl_cipher.c (ossl_cipher_pkcs5_keyivgen): new method
+ OpenSSL::Cipher::Cipher#pkcs5_keyivgen. it calls EVP_BytesToKey().
+
* ext/openssl/ossl_cipher.c (ossl_cipher_alloc, ossl_cipher_initialize,
- ossl_cipher_copy, ossl_cipher_reset, ossl_cipher_encrypt,
- ossl_cipher_decrypt, ossl_cipher_final, ossl_cipher_set_key,
- ossl_cipher_set_iv): replace all EVP_CipherInit and
- EVP_CipherFinal into EVP_CipherInit_ex and EVP_CipherFinal_ex.
+ ossl_cipher_copy, ossl_cipher_reset ossl_cipher_final,
+ ossl_cipher_set_key, ossl_cipher_set_iv): replace all EVP_CipherInit
+ and EVP_CipherFinal into EVP_CipherInit_ex and EVP_CipherFinal_ex.
and EVP_CIPHER_CTX_init should only be called once.
- * ext/openssl/ossl_cipher.c (ossl_cipher_set_padding): check for
- EVP_CIPHER_CTX_set_padding.
+ * ext/openssl/ossl_cipher.c (ossl_cipher_set_key_length): new method
+ OpenSSL::Cipher::Cipher#key_len=.
- * ext/openssl/ossl_cipher.c (Init_ossl_cipher): Cipher#<< is deprecated.
+ * ext/openssl/ossl_cipher.c (ossl_cipher_init_deprecated): new
+ finction; print warning for Cipher#<<.
* ext/openssl/ossl_digest.c: replace all EVP_DigestInit and
EVP_DigestFinal into EVP_DigestInit_ex and EVP_DigestFinal_ex.
@@ -60476,16 +16016,50 @@ Wed Jun 30 19:48:09 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
* test/openssl/test_cipher.rb, test/openssl/test_digest.rb,
test/openssl/test_hmac.rb: new file.
-Wed Jun 30 16:59:39 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Thu Jul 1 04:08:30 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * ext/openssl/ossl_asn1.c (ossl_i2d_ASN1_TYPE, ossl_ASN1_TYPE_free):
+ workaround for the versions earlier than OpenSSL-0.9.7.
+
+Thu Jul 1 03:33:55 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * ext/openssl/ossl_pkey_dh.c (ossl_dh_initialize): should create
+ empty pkey object if no argument is passed. [ruby-talk:103328]
+
+ * ext/openssl/ossl_pkey_dsa.c (ossl_dsa_initialize): ditto.
+
+ * ext/openssl/ossl_pkey_rsa.c (ossl_rsa_initialize): ditto.
+
+ * ext/openssl/ossl_pkey_dh.c: add new methods: OpenSSL::PKey::DH#p,
+ OpenSSL::PKey::DH#p=, OpenSSL::PKey::DH#g, OpenSSL::PKey::DH#g=,
+ OpenSSL::PKey::DH#pub_key, OpenSSL::PKey::DH#pub_key=,
+ OpenSSL::PKey::DH#priv_key and OpenSSL::PKey::DH#priv_key=.
+
+ * ext/openssl/ossl_pkey_dsa.c: add new methods: OpenSSL::PKey::DSA#p,
+ OpenSSL::PKey::DSA#p=, OpenSSL::PKey::DSA#q, OpenSSL::PKey::DSA#q=,
+ OpenSSL::PKey::DSA#g, OpenSSL::PKey::DSA#g=,
+ OpenSSL::PKey::DSA#pub_key, OpenSSL::PKey::DSA#pub_key=,
+ OpenSSL::PKey::DSA#priv_key and OpenSSL::PKey::DSA#priv_key=.
+
+Thu Jul 1 03:16:09 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * ext/openssl/ossl_ssl.c (ossl_ssl_read): take optional second argument
+ to specify a string to be written.
- * test/ruby/test_file.rb (test_fnmatch): some tests for File.fnmatch
- are added.
+ * ext/openssl/lib/openssl/buffering.rb (OpenSSL::Buffering#read):
+ take optional second argument to specify a string to be written.
+
+ * ext/openssl/lib/openssl/buffering.rb (OpenSSL::Buffering#gets):
+ refine regexp for end-of-line.
+
+ * ext/opnessl/lib/openssl/ssl.rb
+ (OpenSSL::SSL::SocketForwarder#listen): fix typo.
Wed Jun 30 11:38:51 2004 Mikael Brockman <phubuh@phubuh.org>
* parse.y (primary): should not be NULL. [ruby-core:03098]
-Wed Jun 30 02:41:10 2004 why the lucky stiff <why@ruby-lang.org>
+Wed Jun 30 02:53:24 2004 why the lucky stiff <why@ruby-lang.org>
* ext/syck/rubyext.c (syck_emitter_new): set buffer after
Data_Wrap_Struct to avoid possible GC. [ruby-talk:104835]
@@ -60505,107 +16079,80 @@ Mon Jun 28 14:57:56 2004 Jeff Mitchell <quixoticsycophant@yahoo.com>
* configure.in, lib/mkmf.rb (LIBPATHFLAG): use double quotes due to
DOSISH compilers. [ruby-core:03107]
-Mon Jun 28 00:35:29 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+Mon Jun 28 00:30:19 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
* sample/drb/*.rb: using 'DRb.thread.join' instead of 'gets'
-Sun Jun 27 22:36:47 2004 Kouhei Sutou <kou@cozmixng.org>
+Sun Jun 27 22:39:51 2004 Kouhei Sutou <kou@cozmixng.org>
* sample/rss/tdiary_plugin/rss-recent.rb: supported Hiki.
-Sat Jun 26 15:17:11 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun Jun 27 12:19:46 2004 Kouhei Sutou <kou@cozmixng.org>
- * variable.c (rb_mod_class_variables): class variables are no longer
- inherited. [ruby-dev:23808]
+ * {lib,sample,test}/rss: added RSS Parser. [ruby-dev:23780]
-Sat Jun 26 11:07:20 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat Jun 26 11:07:30 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (aix): -b must come at the start of the command line,
and -e must not appear while testing libraries. [ruby-talk:104501]
- * lib/mkmf.rb (find_header, dir_config): quote directory names if
- necessary. [ruby-talk:104505]
+ * lib/mkmf.rb (dir_config): quote directory names if necessary.
+ [ruby-talk:104505]
-Sat Jun 26 00:13:08 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Jun 25 15:33:19 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * io.c (rb_fopen, rb_fdopen, rb_io_reopen): setvbuf() may return
- positive value on failure. [ruby-dev:23792]
+ * ext/iconv/extconf.rb: check stricter. [ruby-talk:104501]
-Fri Jun 25 18:07:15 2004 Michal Rokos <michal@ruby-lang.org>
+ * ext/iconv/extconf.rb: include iconv.h for libiconv. [ruby-dev:22715]
- * gc.c: bring back _stklen for DJGPP [ruby-core:3084]
+Fri Jun 25 08:31:29 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-Fri Jun 25 15:33:01 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * eval.c (rb_thread_atfork): remove "fork terminates thread"
+ warning. [ruby-dev:23768]
- * ext/iconv/extconf.rb: check stricter. [ruby-talk:104501]
+ * object.c (rb_obj_clone): backport FL_FINALIZE patch from 1.9.
+ [ruby-core:02786][ruby-core:03067]
+
+ * ext/socket/socket.c (sock_sockaddr): Socket#gethostbyname()
+ should give us packed address, not struct sockaddr.
+ [ruby-core:03053]
-Fri Jun 25 01:58:01 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+Fri Jun 25 02:04:23 2004 NAKAMURA Usaku <usa@ruby-lang.org>
* {bcc32,win32,wince}/setup.mak: remove RUBY_EXTERN lines when
- including version.h. [ruby-talk:104456]
+ including version.h. [ruby-talk:104456] (backported from HEAD)
Thu Jun 24 14:23:29 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (rb_io_fread): return already read data when system call is
interrupted. [ruby-talk:97206]
-Thu Jun 24 01:25:21 2004 Shugo Maeda <shugo@ruby-lang.org>
+Thu Jun 24 01:32:43 2004 Shugo Maeda <shugo@ruby-lang.org>
* version.h: added declarations of ruby_version,
ruby_release_date, ruby_platform.
+ (backported from HEAD)
-Thu Jun 24 01:07:15 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/socket/socket.c (sock_sockaddr): Socket#gethostbyname()
- should give us packed address, not struct sockaddr.
- [ruby-core:03053]
-
-Wed Jun 23 22:19:10 2004 Dave Thomas <dave@pragprog.com>
+Wed Jun 23 22:23:37 2004 Dave Thomas <dave@pragprog.com>
* ext/socket/socket.c (sock_s_gethostbyaddr): Work around problem
with OS X not returning 'from' parameter to recvfrom for
connection-oriented sockets.
-Wed Jun 23 22:16:16 2004 Michal Rokos <michal@ruby-lang.org>
-
- * io.c: io_seek()'s retval should be checked [ruby-core:03045]
-
-Wed Jun 23 21:48:27 2004 Michal Rokos <michal@ruby-lang.org>
-
- * time.c: Fix indentation.
-
- * main.c: Remove _stklen, and _CRT_glob. Move _stacksize for
- __human68k__ to gc.c where the others are.
-
- * gc.c: put _stacksize in place and clean the #ifdefs macros.
-
-Wed Jun 23 17:37:54 2004 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/net/imap.rb: added new option --ssl.
-
Wed Jun 23 01:45:27 2004 Dave Thomas <dave@pragprog.com>
* lib/rdoc/parsers/parse_rb.rb (RubyLex::identify_quotation):
Fix problem with the 'r' being dropped from %r{xxx}
-Wed Jun 23 00:10:17 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Wed Jun 23 00:20:20 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* ext/win32ole/win32ole.c (ole_hresult2msg): remove trailing
CRs and LFs. (doesn't depend on CR+LF) [ruby-dev:23749]
Wed Jun 23 00:00:25 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * eval.c (return_jump, break_jump): raise unexpected local jump
- exception directly. [ruby-dev:23740]
-
* io.c (rb_io_initialize): should check fcntl result. [ruby-dev:23742]
-Tue Jun 22 23:35:43 2004 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * sprintf.c (rb_f_sprintf): support FZERO and FSPACE with NaN/Inf.
-
- * test/ruby/test_sprintf.rb (test_nan, test_inf): add tests.
-
Tue Jun 22 21:11:36 2004 Masaki Suketa <masaki.suketa@nifty.ne.jp>
* ext/win32ole/win32ole.c (OLE_FREE): should not call CoFreeUnuse-
@@ -60616,56 +16163,21 @@ Tue Jun 22 21:11:36 2004 Masaki Suketa <masaki.suketa@nifty.ne.jp>
* ext/win32ole/win32ole.c (ole_hresult2msg): truncate error message
before CR.
-Tue Jun 22 19:24:59 2004 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * sprintf.c (rb_f_sprintf): unify output of NaN, Inf and -Inf with
- "%f" or etc on all platform. [ruby-dev:23704], [ruby-dev:23747]
-
-Tue Jun 22 15:28:12 2004 Michal Rokos <michal@ruby-lang.org>
-
- * compar.c: Remove explicit NIL_P() checks since rb_cmpint() does it
- again in the exactly same manner.
+Tue Jun 22 16:47:42 2004 Shugo Maeda <shugo@ruby-lang.org>
-Tue Jun 22 01:32:40 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/ossl_pkey_dh.c (ossl_dh_initialize): should create
- empty pkey object if no argument is passed. [ruby-talk:103328]
-
- * ext/openssl/ossl_pkey_dsa.c (ossl_dsa_initialize): ditto.
-
- * ext/openssl/ossl_pkey_rsa.c (ossl_rsa_initialize): ditto.
-
- * ext/openssl/ossl_pkey_dh.c: add new methods: OpenSSL::PKey::DH#p,
- OpenSSL::PKey::DH#p=, OpenSSL::PKey::DH#g, OpenSSL::PKey::DH#g=,
- OpenSSL::PKey::DH#pub_key, OpenSSL::PKey::DH#pub_key=,
- OpenSSL::PKey::DH#priv_key and OpenSSL::PKey::DH#priv_key=.
-
- * ext/openssl/ossl_pkey_dsa.c: add new methods: OpenSSL::PKey::DSA#p,
- OpenSSL::PKey::DSA#p=, OpenSSL::PKey::DSA#q, OpenSSL::PKey::DSA#q=,
- OpenSSL::PKey::DSA#g, OpenSSL::PKey::DSA#g=,
- OpenSSL::PKey::DSA#pub_key, OpenSSL::PKey::DSA#pub_key=,
- OpenSSL::PKey::DSA#priv_key and OpenSSL::PKey::DSA#priv_key=.
-
-Mon Jun 21 09:24:51 2004 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (rb_w32_opendir): should set errno if error occurs
- when calling OS API.
+ * lib/net/ftp.rb (MDTM_REGEXP): fix for demon's ftp server.
+ Thanks, Rutger Nijlunsing.
-Sun Jun 20 21:12:54 2004 Shugo Maeda <shugo@ruby-lang.org>
+Mon Jun 21 10:19:23 2004 NAKAMURA Usaku <usa@ruby-lang.org>
- * lib/net/ftp.rb (binary=): send TYPE commands only once.
+ * win32/win32.c (rb_w32_opendir): use FindFirstFile()/FindNextFile()/
+ FindClose() instead of _findfirst()/_findnext()/_findclose().
+ merge from HEAD.
-Sat Jun 19 13:27:01 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat Jun 19 13:24:15 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (method_call): allow changing $SAFE. [ruby-dev:23713]
- * eval.c (proc_set_safe_level, proc_invoke, rb_mod_define_method): not
- set $SAFE for methods defined from Proc. [ruby-dev:23697]
-
-Sat Jun 19 01:10:12 2004 Kouhei Sutou <kou@cozmixng.org>
-
- * sample/rss/tdiary_plugin/rss-recent.rb: added more information.
-
Fri Jun 18 23:12:22 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (proc_save_safe_level, rb_set_safe_level, safe_setter): limit
@@ -60676,27 +16188,10 @@ Wed Jun 16 23:05:57 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* object.c (rb_mod_freeze): prepare string representation before
freezing. [ruby-talk:103646]
-Wed Jun 16 19:57:24 2004 Michal Rokos <michal@ruby-lang.org>
-
- * test/ruby/test_array.rb: extend testcase to check #first, #last,
- #shift, #unshift, #pop, #push
-
-Wed Jun 16 16:05:17 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * array.c (ary_new): move alloc behind checks. [ruby-core:02982]
+Wed Jun 16 16:04:40 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * array.c (rb_ary_pop_m, rb_ary_shift_m): take arg to behave as push
- and unshift.
-
- * array.c (rb_ary_first, rb_ary_last): make shared array for result
- array, and correct doc for Array#first(n) and Array#last(n)
-
- * array.c (rb_ary_select): not accept any arg.
-
-Wed Jun 16 16:03:59 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * object.c (rb_class_inherited_p): singleton class inherits Class
- rather than its object's class. [ruby-dev:23690]
+ * object.c (rb_mod_le): singleton class inherits Class rather than its
+ object's class. [ruby-dev:23690]
Wed Jun 16 16:01:17 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
@@ -60731,36 +16226,31 @@ Sun Jun 13 00:23:04 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/sample/menubar?.rb: [add] sample of menu_spec usage
-Sat Jun 12 14:15:20 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * dir.c: RDOC for File::FNM_CASEFOLD was missed.
-
Sat Jun 12 11:15:53 2004 WATANABE Hirofumi <eban@ruby-lang.org>
* configure.in (target_os): strip -gnu suffix on Linux.
-Fri Jun 11 22:08:50 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c: remove #indexes, #indices.
+Fri Jun 11 17:08:21 2004 Akinori MUSHA <knu@iDaemons.org>
- * hash.c: ditto.
+ * config.guess: Restore a wrongly removed hyphen.
- * ext/dbm/dbm.c: remove #indexes, #indices, "values_at" warning
- from #select.
+Fri Jun 11 14:30:08 2004 Akinori MUSHA <knu@iDaemons.org>
- * ext/gdbm/gdbm.c: ditto.
+ * config.guess: Attempt to avoid system name change on
+ Darwin platforms also.
- * ext/sdbm/init.c: ditto.
+Fri Jun 11 14:22:45 2004 Akinori MUSHA <knu@iDaemons.org>
- * ext/dbm/dbm.c (Init_dbm): set VERSION constant as "unknown" when
- DB_VERSION_STRING is not available.
+ * config.guess, config.sub: Attempt to avoid system name change on
+ Linux platforms. We have been using "linux" instead of
+ "linux-gnu" on this branch.
Thu Jun 10 19:19:41 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* ext/sdbm/init.c (fsdbm_store): sdbm should use StringValue().
[ruby-talk:103062]
-Wed Jun 9 16:09:01 2004 akira yamada <akira@ruby-lang.org>
+Wed Jun 9 18:04:14 2004 akira yamada <akira@ruby-lang.org>
* lib/uri/generic.rb (URI::Generic::merge,
URI::Generic::route_from): accepts non-hierarchical URI.
@@ -60769,18 +16259,12 @@ Wed Jun 9 16:09:01 2004 akira yamada <akira@ruby-lang.org>
* test/uri/test_generic.rb (TestGeneric::test_route,
TestGeneric::test_merge): added tests for above changes.
-Wed Jun 9 15:39:55 2004 Akinori MUSHA <knu@iDaemons.org>
-
- * configure.in: Add support for DragonFly BSD.
-
-Wed Jun 9 15:07:06 2004 Akinori MUSHA <knu@iDaemons.org>
+Wed Jun 9 17:39:37 2004 Akinori MUSHA <knu@iDaemons.org>
* config.guess, config.sub: Update to a more recent version as of
2004-01-20.
-Wed Jun 9 11:20:05 2004 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c: remove unused functions and variables.
+ * configure.in: Add support for DragonFly BSD.
Wed Jun 2 20:16:03 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
@@ -60798,43 +16282,82 @@ Fri May 28 11:20:31 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (eval): reverted wrongly removed condition. [ruby-dev:23638]
-Thu May 27 21:37:50 2004 Tanaka Akira <akr@m17n.org>
+Thu May 27 23:15:18 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
- * lib/pathname.rb (Pathname#initialize): fix pathname initialization
- by pathname.
-
-Thu May 27 20:02:09 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+ * lib/logger.rb: leading 0 padding of timestamp usec part.
- * io.c (rb_io_fwrite): check all case errno != 0 [ruby-dev:23648]
+ * lib/csv.rb (CSV.parse): [CAUTION] behavior changed. in the past,
+ CSV.parse accepts a filename to be read-opened (it was just a
+ shortcut of CSV.open(filename, 'r')). now CSV.parse accepts a
+ string or a stream to be parsed e.g.
+ CSV.parse("1,2\n3,r") #=> [['1', '2'], ['3', '4']]
-Thu May 27 15:54:02 2004 Shugo Maeda <shugo@ruby-lang.org>
+ * lib/csv.rb: CSV::Row and CSV::Cell are deprecated. these classes
+ are removed in the future. in the new csv.rb, row is represented
+ as just an Array. since CSV::Row was a subclass of Array, it won't
+ hurt almost all programs except one which depended CSV::Row#match.
+ and a cell is represented as just a String or nil(NULL). this
+ change will cause widespread destruction.
- * lib/net/ftp.rb (MDTM_REGEXP): fix for demon's ftp server.
- Thanks, Rutger Nijlunsing.
+ CSV.open("foo.csv", "r") do |row|
+ row.each do |cell|
+ if cell.is_null # using Cell#is_null
+ p "(NULL)"
+ else
+ p cell.data # using Cell#data
+ end
+ end
+ end
-Thu May 27 14:53:13 2004 WATANABE Hirofumi <eban@ruby-lang.org>
+ must be just;
- * io.c (rb_io_fwrite): workaround for bcc32's fwrite bug.
- add errno checking. [ruby-dev:23627]
+ CSV.open("foo.csv", "r") do |row|
+ row.each do |cell|
+ if cell.nil?
+ p "(NULL)"
+ else
+ p cell
+ end
+ end
+ end
- * io.c (rb_io_fwrite): should check if errno == ENOENT, too.
+ * lib/csv.rb: [CAUTION] record separator(CR, LF, CR+LF) behavior
+ change. CSV.open, CSV.parse, and CSV,generate now do not force
+ opened file binmode. formerly it set binmode explicitly.
-Thu May 27 11:25:03 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+ with CSV.open, binmode of opened file depends the given mode
+ parameter "r", "w", "rb", and "wb". CSV.parse and CSV.generate open
+ file with "r" and "w".
- * test/csv/test_csv.rb: illegal require module name (../lib/csv.rb).
+ setting mode properly is user's responsibility now.
-Wed May 26 23:12:13 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+ * lib/csv.rb: accepts String as a fs (field separator/column separator)
+ and rs (record separator/row separator)
* lib/csv.rb (CSV.read, CSV.readlines): added. works as IO.read and
IO.readlines in CSV format.
- * lib/csv.rb (CSV.parse): [CAUTION] behavior changed. in the past,
- CSV.parse accepts a filename to be read-opened (it was just a
- shortcut of CSV.open(filename, 'r')). now CSV.parse accepts a
- string or a stream to be parsed e.g.
- CSV.parse("1,2\n3,r") #=> [['1', '2'], ['3', '4']]
+ * lib/csv.rb: added CSV.foreach(path, rs = nil, &block). CSV.foreach
+ now does not handle "| cmd" as a path different from IO.foreach.
+ needed?
+
+ * test/csv/test_csv.rb: updated.
+
+ * test/ruby/test_float.rb: added test_strtod to test Float("0").
+
+Thu May 27 21:37:50 2004 Tanaka Akira <akr@m17n.org>
- * test/csv/test_csv.rb: follow above changes.
+ * lib/pathname.rb (Pathname#initialize): refine pathname initialization
+ by pathname.
+
+Thu May 27 20:22:05 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+
+ * io.c (rb_io_fwrite): check all case errno != 0 [ruby-dev:23648]
+
+Thu May 27 14:53:13 2004 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * io.c (rb_io_fwrite): workaround for bcc32's fwrite bug.
+ add errno checking. [ruby-dev:23627]
Wed May 26 14:19:42 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
@@ -60865,33 +16388,16 @@ Wed May 26 00:00:00 2004 why the lucky stiff <why@ruby-lang.org>
* lib/yaml/baseemitter.rb (indent_text): simpler flow block code.
-Tue May 25 11:54:13 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_yield_0, proc_invoke, proc_arity): allow passing a block
- to a Proc. [ruby-dev:23533]
-
- * parse.y (block_par, block_var): ditto.
-
-Tue May 25 01:50:17 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/ossl_asn1.c (ossl_i2d_ASN1_TYPE, ossl_ASN1_TYPE_free):
- workaround for the versions earlier than OpenSSL-0.9.7.
+ * lib/yaml.rb: added rdoc to beginning of lib.
Mon May 24 10:46:26 2004 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
* lib/rdoc/generators/template/html/html.rb: SYSTEM identifiers
must be absolute URIs
-Sun May 23 04:53:50 2004 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * lib/pstore.rb (transaction): allow overriding dump and load.
- [ruby-dev:23567]
-
- * lib/yaml/store.rb: follow lib/pstore.rb's change.
-
-Sat May 22 11:54:10 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat May 22 12:00:04 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * MANIFEST: add test/openssl/test_x509store.rb.
+ * MANIFEST: add new encodings in rexml.
* ext/tk/MANIFEST: add recent files.
@@ -60905,12 +16411,6 @@ Fri May 21 09:22:05 2004 Dave Thomas <dave@pragprog.com>
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_method_parameters):
Add ()'s around parameters that don't have them
-Fri May 21 02:21:11 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/csv.rb: fixed a few bugs around multi char record/field separator.
-
- * test/csv/test_csv.rb: added boundary test for above feature.
-
Thu May 20 17:02:03 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (check_sizeof): define result size. [ruby-core:02911]
@@ -60918,6 +16418,10 @@ Thu May 20 17:02:03 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (create_header): macro name should not include equal
sign.
+Thu May 20 15:59:50 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+
+ * ext/socket/socket.c: fix SEGV. [ruby-dev:23550]
+
Thu May 20 14:35:52 2004 Tanaka Akira <akr@m17n.org>
* ext/socket/socket.c: check SCM_RIGHTS macro addition to
@@ -60938,100 +16442,20 @@ Thu May 20 12:34:39 2004 Dave Thomas <dave@pragprog.com>
Thu May 20 12:22:13 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (have_type): do not check pointer to incomplete type,
- which always get compiled.
- [ruby-list:39683]
+ which always get compiled. [ruby-list:39683]
-Wed May 19 23:45:43 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/inlinetest.rb (InlineTest::loadtest): requiring library with
- replaced $0 can make $0 == __FILE__ block be evaluated twice.
-
- * test/ruby/envutil.rb (EnvUtil::rubybin): give priority to
- environment variable. [ruby-dev:23538]
-
-Wed May 19 11:08:10 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+Wed May 19 11:09:00 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tk.rb: change permition of TkObject#tk_send from
private to public
-Wed May 19 02:29:36 2004 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/http.rb: support TRACE.
-
-Wed May 19 02:21:53 2004 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/http.rb: do not use class variables.
-
-Tue May 18 21:21:43 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/csv.rb: writes lines with "\n" when row separator is not given.
- formerly it was "\r\n".
-
- * lib/csv.rb: [CAUTION] API change
-
- * CSV::Row removed. a row is represented as just an Array. since
- CSV::Row was a subclass of Array, it won't hurt almost all programs
- except one which depended CSV::Row#match.
-
- * CSV::Cell removed. a cell is represented as just a String or
- nil(NULL). this change will cause widespread destruction.
-
- CSV.open("foo.csv", "r") do |row|
- row.each do |cell|
- if cell.is_null # Cell#is_null
- p "(NULL)"
- else
- p cell.data # Cell#data
- end
- end
- end
-
- must be just;
-
- CSV.open("foo.csv", "r") do |row|
- row.each do |cell|
- if cell.nil?
- p "(NULL)"
- else
- p cell
- end
- end
- end
-
- * lib/csv.rb: [CAUTION] record separator(CR, LF, CR+LF) behavior
- change. CSV.open, CSV.parse, and CSV,generate now do not force
- opened file binmode. formerly it set binmode explicitly.
-
- with CSV.open, binmode of opened file depends the given mode
- parameter "r", "w", "rb", and "wb". CSV.parse and CSV.generate open
- file with "r" and "w".
-
- setting mode properly is user's responsibility now.
-
- * lib/csv.rb: accepts String as a fs (field separator/column separator)
- and rs (record separator/row separator)
-
- * lib/csv.rb: added CSV.foreach(path, rs = nil, &block). CSV.foreach
- now does not handle "| cmd" as a path different from IO.foreach.
- needed?
-
- * test/csv/test_csv.rb: updated.
-
-Tue May 18 14:24:20 2004 why the lucky stiff <why@ruby-lang.org>
-
- * lib/yaml.rb: added rdoc to beginning of lib.
-
Tue May 18 14:00:46 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* node.h (NEW_DSTR): adjust list length.
* parse.y (literal_concat): ditto.
-Tue May 18 09:30:25 2004 SASADA Koichi <ko1@atdot.net>
-
- * eval.c (rb_method_node): search cache entry first.
-
-Mon May 17 16:04:06 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Mon May 17 16:14:25 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* numeric.c (flo_to_s): it's preferable that "p 0.0" outputs "0.0"
instead of "0.0e+00". [ruby-dev:23480]
@@ -61048,43 +16472,13 @@ Mon May 17 10:13:33 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* ext/socket/socket.c (sock_s_getnameinfo): ditto.
-Mon May 17 00:36:21 2004 why the lucky stiff <why@ruby-lang.org>
+Mon May 17 01:15:23 2004 why the lucky stiff <why@ruby-lang.org>
+
+ * lib/yaml.rb: removed fallback to pure Ruby parser.
* lib/yaml/baseemitter.rb (indent_text): was forcing a mod value
of zero at times, which kept some blocks from getting indentation.
-Mon May 17 00:07:00 2004 Gavin Sinclair <gsinclair@soyabean.com.au>
-
- * lib/drb/drb.rb: Cosmetic documentation changes.
-
-Sun May 16 20:55:49 2004 Tanaka Akira <akr@m17n.org>
-
- * ext/dbm/dbm.c (fdbm_initialize): accept optional 3rd argument to
- specify an open flag.
- (Init_dbm): define open flags: DBM::READER, DBM::WRITER, DBM::WRCREAT
- and DBM::NEWDB.
-
-Sat May 15 17:52:24 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * test/ruby/test_float.rb(test_strtod): Add test for signed 0.000...1
-
-Sat May 15 14:20:13 2004 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ext/syck/depend: add ruby's headers.
-
-Sat May 15 13:38:33 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/syck/MANIFEST, ext/syck/depend: new file.
-
- * lib/yaml/rubytypes.rb: range of exponential floats. [ruby-core:02824]
-
- * test/yaml/test_yaml.rb: tests for strings start with colon and some
- round trip.
-
-Sat May 15 12:04:58 2004 why the lucky stiff <why@ruby-lang.org>
-
- * lib/yaml.rb: removed fallback to pure Ruby parser.
-
* lib/yaml/baseemitter.rb (node_text): rewriting folded scalars.
* ext/syck/syck.h: reports style of scalars now, be they plain, block
@@ -61101,9 +16495,33 @@ Sat May 15 12:04:58 2004 why the lucky stiff <why@ruby-lang.org>
* ext/syck/rubyext.c (yaml_org_handler): symbols loaded only
if scalar style is plain.
+ * ext/syck/rubyext.c (yaml_org_handler): some empty strings were
+ loaded as symbols.
+
* test/yaml/test_yaml.rb (test_perl_regexp): updated test to
match new regexp serialization.
+Mon May 17 00:03:00 2004 Gavin Sinclair <gsinclair@soyabean.com.au>
+
+ * lib/drb/drb.rb: Cosmetic documentation changes.
+
+Sun May 16 22:36:00 2004 Gavin Sinclair <gsinclair@soyabean.com.au>
+
+ * lib/test/unit.rb: Removed :nodoc: directive (it prevented effective
+ RDoc operation), and added file-level comment.
+
+Sun May 16 20:55:49 2004 Tanaka Akira <akr@m17n.org>
+
+ * ext/dbm/dbm.c (fdbm_initialize): accept optional 3rd argument to
+ specify an open flag.
+ (Init_dbm): define open flags: DBM::READER, DBM::WRITER, DBM::WRCREAT
+ and DBM::NEWDB.
+
+Sun May 16 13:10:00 2004 Gavin Sinclair <gsinclair@soyabean.com.au>
+
+ * lib/test/unit/**/*.rb: Removed :nodoc: directives (many were
+ generating warnings, many were on private methods).
+
Sat May 15 01:41:34 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (eval): forgot to restore $SAFE value before evaluating
@@ -61119,27 +16537,18 @@ Fri May 14 22:08:38 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* string.c (rb_str_new4): should not reuse frozen shared string if
the original is not an instance of String. [ruby-talk:100193]
-Fri May 14 21:29:26 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * time.c (time_mdump): preserve GMT bit in the marshal data.
- [ruby-talk:100213]
-
-Fri May 14 18:37:49 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+Fri May 14 18:39:25 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * ext/tk/lib/tk/canvas.rb: improve coords support for canvas
- items. Now, supports all of the followings.
- TkcLine.new(c, 0, 0, 100, 100, :fill=>'red')
- TkcLine.new(c, [0, 0, 100, 100], :fill=>'red')
- TkcLine.new(c, [0, 0], [100, 100], :fill=>'red')
- TkcLine.new(c, [[0, 0], [100, 100]], :fill=>'red')
- TkcLine.new(c, :coords=>[0, 0, 100, 100], :fill=>'red')
- TkcLine.new(c, :coords=>[[0, 0], [100, 100]], :fill=>'red')
+ * ext/tk/lib/tk/canvas.rb: improve coords support for canvas items.
+ Now, supports all of the followings.
+ TkcLine.new(c, 0, 0, 100, 100, :fill=>'red')
+ TkcLine.new(c, [0, 0, 100, 100], :fill=>'red')
+ TkcLine.new(c, [0, 0], [100, 100], :fill=>'red')
+ TkcLine.new(c, [[0, 0], [100, 100]], :fill=>'red')
+ TkcLine.new(c, :coords=>[0, 0, 100, 100], :fill=>'red')
+ TkcLine.new(c, :coords=>[[0, 0], [100, 100]], :fill=>'red')
-Fri May 14 13:30:39 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * test/ruby/test_float.rb: Add test for util.c revision 1.42.
-
-Fri May 14 12:13:46 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Fri May 14 12:11:43 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* util.c (ruby_strtod): strtod("0", &end); => end should point '\0'.
[ruby-dev:23498]
@@ -61149,10 +16558,15 @@ Thu May 13 15:47:30 2004 akira yamada <akira@ruby-lang.org>
* lib/net/telnet.rb (Net::Telnet::login): "options" can specify
regexps for login prompt and/or password prompt.
-Thu May 13 14:17:57 2004 why the lucky stiff <why@ruby-lang.org>
+Thu May 13 14:23:45 2004 WATANABE Hirofumi <eban@ruby-lang.org>
- * ext/syck/rubyext.c (yaml_org_handler): some empty strings were
- loaded as symbols.
+ * hash.c (delete_if_i): use st_delete_safe() (via
+ rb_hash_delete()) instead of returning ST_DELETE.
+ backport from HEAD. [ruby-dev:23487]
+
+Thu May 13 13:01:30 2004 akira yamada <akira@ruby-lang.org>
+
+ * lib/uri/mailto.rb (URI::MailTo::to_s): should include fragment.
Thu May 13 11:04:08 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
@@ -61184,15 +16598,6 @@ Wed May 12 11:51:08 2004 Dave Thomas <dave@pragprog.com>
* class.c (rb_obj_singleton_methods): fix rdoc
-Tue May 11 07:09:42 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (is_defined): do not protect exception during receiver
- evaluation.
-
-Mon May 10 22:28:14 2004 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/protocol.rb (each_crlf_line): remove junk line.
-
Mon May 10 21:44:42 2004 Dave Thomas <dave@pragprog.com>
* lib/rdoc/generators/html_generator.rb: Change scheme for
@@ -61211,81 +16616,43 @@ Mon May 10 12:11:37 2004 Dave Thomas <dave@pragprog.com>
* lib/rdoc/generators/html_generator.rb: Hack to search parents
for unqualified constant names.
-Mon May 10 01:18:15 2004 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/pop.rb (logging): append "\n".
-
-Sun May 9 23:38:00 2004 Gavin Sinclair <gsinclair@soyabean.com.au>
-
- * lib/net/ftp.rb: ported documentation improvement from 1.8 branch
-
- * lib/net/imap.rb: ditto
+Mon May 10 12:11:37 2004 Dave Thomas <dave@pragprog.com>
- * lib/net/pop.rb: ditto
+ * lib/rdoc/generators/html_generator.rb: Hack to search parents
+ for unqualified constant names.
- * lib/net/smtp.rb: ditto
+Sun May 9 22:37:00 2004 Gavin Sinclair <gsinclair@soyabean.com.au>
+ * lib/net/ftp.rb: improved documentation
+ * lib/net/imap.rb: ditto
+ * lib/net/pop.rb: ditto
+ * lib/net/smtp.rb: ditto
* lib/net/telnet.rb: ditto
-Sun May 9 23:34:51 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * test/ruby/test_float.rb: added test_strtod to test Float("0").
-
-Sun May 9 13:24:24 2004 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * lib/yaml/store.rb: use FileUtils::copy.
-
-Sun May 9 12:34:26 2004 Kazuo Saito <ksaito@uranus.dti.ne.jp>
-
- * regex.c: removed unused file.
-
-Sat May 8 10:53:30 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_f_open): open should not ignore block when "to_open"
- method is used. [ruby-dev:23478]
-
-Fri May 7 22:07:39 2004 Minero Aoki <aamine@loveruby.net>
-
- * lib/fileutils.rb (mv): new option `force'. [ruby-talk:99457]
-
- * lib/fileutils.rb: new method for command option reflection:
- FileUtils.commands, .options, .have_option?, .options_of,
- .collect_methods.
-
- * lib/fileutils.rb: module Verbose, NoWrite, DryRun do not have
- option flags @fileutils_verbose and @fileutils_noop, they make no
- sense.
-
Fri May 7 21:50:21 2004 Dave Thomas <dave@pragprog.com>
* lib/rdoc/parsers/parse_rb.rb (RDoc::parse_include): Allow
multiple arguments to 'include'
-Fri May 7 21:03:51 2004 Minero Aoki <aamine@loveruby.net>
+Fri May 7 21:31:56 2004 Minero Aoki <aamine@loveruby.net>
* lib/fileutils.rb (fu_list): Array() breaks pathes including "\n".
[ruby-core:02843]
- * test/fileutils/test_fileutils.rb (mkdir): test "\n" in path.
-
-Fri May 7 20:53:25 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/dbm/dbm.c (fdbm_modify): typo fixed. [ruby-dev:23473]
-
-Fri May 7 11:17:27 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Fri May 7 11:25:53 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* util.c (ruby_strtod): "0.0000000000000000001" should be converted
to 1.0e-19 instead of 0.0. (leading zeros aren't significant digits)
[ruby-talk:99318] [ruby-dev:23465]
-Thu May 6 22:27:32 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+Fri May 7 10:00:05 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * ext/socket/socket.c (ippaddr): use NUMERICHOST if can not resolve
- hostname.
+ * ext/tk/tkutil.c (get_eval_string_core): bug fix. [ruby-dev:23466]
-Thu May 6 22:09:29 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+Thu May 6 22:13:17 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
- * ext/tk/tkutil.c (get_eval_string_core): bug fix. [ruby-dev:23466]
+ * ext/socket/socket.c (ippaddr): use NUMERICHOST if can not resolve
+ hostname.
Thu May 6 14:22:29 2004 why the lucky stiff <why@ruby-lang.org>
@@ -61300,15 +16667,6 @@ Thu May 6 14:22:29 2004 why the lucky stiff <why@ruby-lang.org>
* ext/syck/gram.c: fixed transfer methods on structs, broke it
last commit.
-Thu May 6 14:38:02 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * dir.c (rb_push_glob): simplified code (not change behavior)
-
-Thu May 6 13:32:44 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/extmk.rb: get rid of side effect of Config.expand, patched by
- <tttt01@infoseek.jp> (ruby-bugs:PR#597)
-
Thu May 6 11:40:28 2004 Shugo Maeda <shugo@ruby-lang.org>
* lib/net/imap.rb (string): accept NIL.
@@ -61321,13 +16679,16 @@ Thu May 6 01:59:04 2004 Dave Thomas <dave@pragprog.com>
Don't include the &block parameter if we have explicit
yield parameters.
-Wed May 5 03:52:31 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+Wed May 5 03:40:29 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
* lib/rinda/ring.rb: use recv instead of recvfrom.
-Wed May 5 00:38:00 2004 Gavin Sinclair <gsinclair@soyabean.com.au>
+Tue May 4 23:52:00 2004 Gavin Sinclair <gsinclair@soyabean.com.au>
* lib/gserver.rb: documented
+
+Tue May 4 23:46:00 2004 Gavin Sinclair <gsinclair@soyabean.com.au>
+
* lib/xmlrpc/README.txt: introduced for documentation purposes
Mon May 3 09:47:24 2004 Dave Thomas <dave@pragprog.com>
@@ -61335,10 +16696,6 @@ Mon May 3 09:47:24 2004 Dave Thomas <dave@pragprog.com>
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_method_or_yield_parameters):
Fix parsing bug if yield called within 1 line block
-Sun May 2 21:56:48 2004 Minero Aoki <aamine@loveruby.net>
-
- * test/fileutils/test_fileutils.rb (rm_f, rm_r): test :force flag.
-
Sun May 2 01:04:38 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tcltklib, ext/tk: renewal Ruby/Tk
@@ -61347,26 +16704,11 @@ Fri Apr 30 20:08:41 2004 WATANABE Hirofumi <eban@ruby-lang.org>
* time.c (SIZEOF_TIME_T): support SIZEOF_TIME_T == SIZEOF_INT.
-Wed Apr 28 01:26:11 2004 Kazuo Saito <ksaito@uranus.dti.ne.jp>
-
- * oniguruma.h, regparse.c: imported Oni Guruma 2.2.8.
-
-Wed Apr 28 01:16:23 2004 Kazuo Saito <ksaito@uranus.dti.ne.jp>
-
- * oniguruma.h, regparse.c: imported Oni Guruma 2.2.7.
-
-Tue Apr 27 14:43:32 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Apr 27 13:12:42 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
- * common.mk: LIBURUBY_A is needed for extconf.rb even when
- cross-compiling.
+ * eval.c (rb_eval): too many line trace call. (ruby-bugs PR#1320)
-Tue Apr 27 13:33:50 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (string_content): turn off NODE_NEWLINE flag to avoid
- unnecessary line trace for inlined expression.
- (ruby-bugs PR#1320)
-
-Tue Apr 27 08:15:13 2004 why the lucky stiff <why@ruby-lang.org>
+Tue Apr 27 08:41:28 2004 why the lucky stiff <why@ruby-lang.org>
* lib/yaml/rubytypes.rb: passing Range tests.
@@ -61394,33 +16736,32 @@ Mon Apr 26 21:40:09 2004 Dave Thomas <dave@pragprog.com>
* lib/rdoc/code_objects.rb (RDoc::Context::add_alias): Only alias
to instance methods.
-Sun Apr 25 18:26:23 2004 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * configure.in (ac_cv_func_fork): set to no on DJGPP.
-
-Sat Apr 24 14:32:03 2004 Kazuo Saito <ksaito@uranus.dti.ne.jp>
-
- * re.c: applied stack error handling patch. [ruby-dev:23431]
-
Sat Apr 24 10:38:31 2004 Dave Thomas <dave@pragprog.com>
* lib/rdoc/markup/simple_markup.rb (SM::SimpleMarkup::group_lines):
Fix bug where consecutive headings are merged.
-Fri Apr 23 23:24:47 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Apr 23 23:26:13 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/mkmf.rb: $hdrdir should not contain macros, for backward
+ * lib/mkmf.rb: $hdrdir should not contain macros for backward
compatibility. [bruby-dev:28]
- * lib/mkmf.rb (create_makefile): in the case of extout, just copy
- script files, without comparison.
+ * version.c (ruby_show_copyright): obtain copyright year from
+ RUBY_RELEASE_YEAR.
+
+ * win32/resource.rb: ditto.
+
+ * win32/resource.rb: default rubyw icon to ruby.ico, and let DLL also
+ include them.
+
+ * win32/resource.rb: include winver.h for older WindowsCE.
Fri Apr 23 16:38:46 2004 Tanaka Akira <akr@m17n.org>
* lib/pathname.rb: sync taint/freeze flag between
a pathname object and its internal string object.
-Fri Apr 23 14:52:14 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Apr 23 14:52:08 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (stmt, arg, aref_args): should not make sole splat into
array, in aref_args other than aref with op_asgn.
@@ -61430,18 +16771,7 @@ Fri Apr 23 14:14:38 2004 Tanaka Akira <akr@m17n.org>
* lib/resolv.rb: don't use Regexp#source to embed regexps.
[ruby-dev:23432]
-Thu Apr 22 18:25:10 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk, ext/extmk.rb: make ext and .ext get removed by distclean.
-
-Thu Apr 22 10:07:01 2004 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * */Makefile.sub (distclean-local): should remove $(RBCONFIG).
-
-Thu Apr 22 04:17:57 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_mod_define_method): allow binding methods to modules.
- [ruby-dev:23410]
+Thu Apr 22 04:15:36 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (aref_args): should pass expanded list. [ruby-core:02793]
@@ -61453,7 +16783,7 @@ Thu Apr 22 01:12:57 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* string.c (rb_str_index_m): use unsigned comparison for T_FIXNUM
search. [ruby-talk:97342]
-Wed Apr 21 23:04:42 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+Wed Apr 21 22:57:27 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
* lib/rinda/rinda.rb, test/rinda/test_rinda.rb: check Hash tuple size.
@@ -61462,44 +16792,6 @@ Wed Apr 21 20:05:00 2004 Tanaka Akira <akr@m17n.org>
* lib/open-uri.rb (URI::HTTP#proxy_open): set Host: field explicitly.
[ruby-list:39542]
-Wed Apr 21 18:39:46 2004 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/smtp.rb: merge SMTP-TLS patch. This patch is
- contributed by Daniel Hob. [ruby-core:02789]
-
-Wed Apr 21 18:23:45 2004 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/smtp.rb: change coding style: def m( a ) -> def m(a).
-
-Wed Apr 21 18:01:47 2004 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/pop.rb: do not use class variables.
-
- * lib/net/pop.rb (do_start): ensure to clean up connection when
- authentication failed.
-
-Wed Apr 21 17:23:59 2004 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/http.rb (HTTP#connect): CONNECT must precede SSL connect.
- [ruby-dev:23379]
-
- * lib/net/http.rb (HTTP.new): class variables are not inherited
- now.
-
-Wed Apr 21 15:56:43 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/test/unit/ui/console/testrunner.rb (test_started): restore $0
- after changing process title. [ruby-talk:97426]
-
-Wed Apr 21 10:18:06 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * process.c(rb_spawn): fix SEGV at "p system('command line here')"
- (may happen only in bccwin32) [ruby-dev:23380]
-
-Mon Apr 19 20:58:44 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * dir.c: Updated RDocs.
-
Mon Apr 19 18:11:15 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* hash.c (rb_hash_equal): returns true if two hashes have same set
@@ -61508,132 +16800,107 @@ Mon Apr 19 18:11:15 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* hash.c (rb_hash_eql): returns true if two hashes are equal and
have same default values.
-Mon Apr 19 08:19:11 2004 Doug Kearns <djkea2@mugca.its.monash.edu.au>
+Mon Apr 19 08:19:58 2004 Doug Kearns <djkea2@mugca.its.monash.edu.au>
- * dln.c, io.c, pack.c, lib/benchmark.rb, lib/cgi.rb, lib/csv.rb,
- lib/date.rb, lib/ftools.rb, lib/getoptlong.rb, lib/logger.rb,
- lib/matrix.rb, lib/monitor.rb, lib/set.rb, lib/thwait.rb,
- lib/timeout.rb, lib/yaml.rb, lib/drb/drb.rb, lib/irb/workspace.rb,
- lib/net/ftp.rb, lib/net/http.rb, lib/net/imap.rb, lib/net/pop.rb,
- lib/net/telnet.rb, lib/racc/parser.rb, lib/rinda/rinda.rb,
- lib/rinda/tuplespace.rb, lib/shell/command-processor.rb,
- lib/soap/rpc/soaplet.rb, lib/test/unit/testcase.rb,
- lib/test/unit/testsuite.rb: typo fix.
+ * dln.c, io.c, lib/benchmark.rb, lib/cgi.rb, lib/csv.rb, lib/date.rb,
+ lib/ftools.rb, lib/getoptlong.rb, lib/logger.rb, lib/matrix.rb,
+ lib/monitor.rb, lib/set.rb, lib/thwait.rb, lib/timeout.rb,
+ lib/yaml.rb, lib/drb/drb.rb, lib/irb/workspace.rb, lib/net/ftp.rb,
+ lib/net/http.rb, lib/net/imap.rb, lib/net/telnet.rb,
+ lib/racc/parser.rb, lib/rinda/rinda.rb, lib/rinda/tuplespace.rb,
+ lib/shell/command-processor.rb, lib/soap/rpc/soaplet.rb,
+ lib/test/unit/testcase.rb, lib/test/unit/testsuite.rb: typo fix.
Mon Apr 19 08:14:18 2004 Dave Thomas <dave@pragprog.com>
* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::find_body): Allow for
#ifdef HAVE_PROTOTYPES
+Fri Apr 16 22:33:00 2004 Gavin Sinclair <gsinclair@soyabean.com.au>
+
+ * ext/iconv/iconv.c: nearly finished RDoc comments.
+
Fri Apr 16 17:04:07 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* string.c (rb_str_equal): always returns true or false, never
returns nil. [ruby-dev:23404]
-Fri Apr 16 12:38:48 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/drb/drb.rb (DRb::DRbUnknown::initialize): Exception#to_str is
- deprecated.
-
- * lib/drb/drb.rb (DRb::DRbServer::InvokeMethod::perform): multiple
- value class changed.
-
- * lib/drb/invokemethod.rb (DRb::DRbServer::InvokeMethod18Mixin::block_yield):
- ditto.
-
-Fri Apr 16 08:27:08 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Apr 16 08:27:02 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/extmk.rb: skip linking when libraries to be preloaded not
compiled. [ruby-list:39561]
-Thu Apr 15 19:57:11 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Apr 15 23:21:52 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* process.c (pst_success_p): new method Process::Status#success?.
[ruby-dev:23385]
- * rubytest.rb: do nothing while cross-compiling, return status in
- system independent style.
-
-Thu Apr 15 19:26:54 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * dir.c (rb_push_glob): Dir.glob() should return nil if block is given.
- (http://www.ruby-lang.org/ja/man/index.cgi?cmd=view;name=Dir)
-
- * dir.c (push_braces): Dir.glob() should handle '{ }' nested more than
- 3 times.
-
- * dir.c (push_braces, rb_push_glob): Dir.glob() should handle escaped
- '{' and '}' and ','.
-
- [ruby-dev:23376]
-
Thu Apr 15 17:12:13 2004 Tanaka Akira <akr@m17n.org>
* ext/gdbm/gdbm.c (Init_gdbm): define GDBM::READER, GDBM::WRITER,
GDBM::WRCREAT and GDBM::NEWDB.
(fgdbm_initialize): use specified read/write flag.
-Wed Apr 14 13:06:09 2004 Doug Kearns <djkea2@mugca.its.monash.edu.au>
-
- * array.c, enum.c, eval.c, file.c, io.c, numeric.c, object.c, prec.c,
- process.c, re.c, string.c: typos in RDoc comments. [ruby-core:02783]
-
Wed Apr 14 11:29:56 2004 WATANABE Hirofumi <eban@ruby-lang.org>
* numeric.c (flo_eq): workaround for bcc32's bug.
(ruby-bugs-ja:PR#594)
+Wed Apr 14 13:06:35 2004 Doug Kearns <djkea2@mugca.its.monash.edu.au>
+
+ * array.c, enum.c, eval.c, file.c, io.c, numeric.c, object.c, prec.c,
+ process.c, re.c, string.c: typos in RDoc comments. [ruby-core:02783]
+
Wed Apr 14 11:06:38 2004 Dave Thomas <dave@pragprog.com>
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::scan): Changed
behavior of :enddoc: -- it now unconditionally terminates
processing of the current file.
-Wed Apr 14 10:57:40 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Wed Apr 14 11:03:22 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* defines.h: include <net/socket.h> to get fd_set definition in BeOS.
-Tue Apr 13 23:00:55 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+Tue Apr 13 23:06:30 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
* lib/rinda/rinda.rb: change pattern matching.
a === b -> a == b || a === b. [druby-ja:98]
* test/rinda/test_rinda.rb: ditto.
-Tue Apr 13 21:50:57 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Apr 13 19:54:29 2004 Minero Aoki <aamine@loveruby.net>
- * bcc32/Makefile.sub (PHONY): Borland make disallows empty command
- rules.
+ * lib/net/http.rb: should not overwrite HTTP request header.
+ [ruby-list:39543]
-Tue Apr 13 17:55:16 2004 Minero Aoki <aamine@loveruby.net>
+Tue Apr 13 01:30:00 2004 Gavin Sinclair <gsinclair@soyabean.com.au>
- * lib/net/http.rb (begin_transport): should not overwrite HTTP
- request header. [ruby-list:39543]
+ * ext/iconv/iconv.c: RDoc documentation (from RD; nearly finished).
+ * ext/iconv/charset_alias.rb: Prevent from RDoc'ing.
-Tue Apr 13 16:48:00 2004 Minero Aoki <aamine@loveruby.net>
+Mon Apr 12 19:11:29 2004 Eric Hodel <drbrain@segment7.net>
- * lib/net/pop.rb: merge POP3S patch. This patch is contributed by
- Daniel Hobe.
+ * gc.c (rb_gc_copy_finalizer): typo. [ruby-core:02774]
-Tue Apr 13 02:56:29 2004 Kazuo Saito <ksaito@uranus.dti.ne.jp>
+Mon Apr 12 18:52:32 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
- * common.mk: changed the order of ascii.c alphabetically.
+ * ext/openssl/ossl_x509name.c (ossl_x509name_init_i): should return
+ a value.
-Mon Apr 12 19:11:21 2004 Eric Hodel <drbrain@segment7.net>
+Mon Apr 12 10:43:47 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * gc.c (rb_gc_copy_finalizer): typo. [ruby-core:02774]
+ * dir.c (rb_glob2, rb_glob, rb_globi, push_globs, push_braces,
+ rb_push_glob): fix memory leak. (leaked when block was interrupted)
-Mon Apr 12 18:45:58 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Mon Apr 12 10:27:37 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * ext/openssl/ossl_x509name.c (ossl_x509name_init_i): should return
- a value.
+ * bcc32/Makefile.sub: backport SIZEOF_TIME_T definition from 1.9.
-Mon Apr 12 10:39:50 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+ * win32/Makefile.sub: ditto.
- * dir.c (rb_glob2, rb_glob, push_globs, push_braces, rb_push_glob):
- fix memory leak. (leaked when block was interrupted)
+ * wince/Makefile.sub: ditto.
-Sun Apr 11 19:10:13 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun Apr 11 19:12:35 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ruby.c (require_libraries): restore source file/line after
statically linked extensions initialized. [ruby-dev:23357]
@@ -61654,73 +16921,7 @@ Sat Apr 10 00:00:19 2004 Dave Thomas <dave@pragprog.com>
* lib/rdoc/markup/simple_markup/inline.rb: Fix problem
with \_cat_<b>dog</b>
-Fri Apr 9 17:05:21 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * dir.c (has_magic, find_dirsep): incomplete '[' matches no character
- in Dir.glob. (follows File.fnmatch's behavior)
-
- * dir.c (fnmatch_helper): incomplete escape is ignored in File.fnmatch.
- (follows Dir.glob's behavior)
-
- * dir.c (find_dirsep): '/' between '[' and ']' is ignored in Dir.glob.
- (follows File.fnmatch with File::FNM_PATHNAME 's behavior)
-
- * dir.c (find_dirsep): escaped slash '\/' loses its meaning as
- directory separator in Dir.glob.
-
- [ruby-dev:23291]
-
-Thu Apr 8 20:25:19 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/extmk.rb (extmake): skip uncompiled extensions.
-
- * lib/mkmf.rb (create_makefile): emit no rules for static library if
- $static is nil, e.g., outside of ext/.
-
- * lib/test/unit/ui/console/testrunner.rb (test_started): show test
- name via $0.
-
- * runruby.rb: set environments to use the compiled binary.
-
- * test/runner.rb: do nothing while cross-compiling.
-
- * test/drb/drbtest.rb, test/soap/calc/test_calc_cgi.rb: use envutil to
- know ruby binary, and restore $: after require.
-
- * test/ruby/envutil.rb: give priority to RUBY environment variable to
- use just compiled binary and libraries.
-
-Thu Apr 8 19:03:33 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (rb_io_binmode): inverted condition. [ruby-dev:23349]
-
-Thu Apr 8 18:22:00 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/iconv/iconv.c (iconv_s_list): return encoding list if no block
- is given. [ruby-dev:23063]
-
-Wed Apr 7 15:29:24 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * pack.c (pack_pack): use NUM2INT() instead of num2i32().
-
-Wed Apr 7 12:32:02 2004 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/parser.rb, lib/rss/1.0.rb: accepted rdf:resource or
- resource attribute in rdf:li.
- * test/rss/test_parser.rb: added test for above change.
-
- * lib/rss/dublincore.rb: reverted style.
-
- * lib/rss/xmlparser.rb: normalized XMLParser class hierarchy.
-
-Wed Apr 7 10:43:17 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * Makefile.in, common.mk, */Makefile.sub (ext/extinit.o): OUTFLAG
- doesn't work for object files on VC.
-
- * */Makefile.sub (config.h): need SIZEOF_TIME_T now.
-
-Wed Apr 7 00:24:34 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+Wed Apr 7 00:19:50 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
* lib/rinda/rinda.rb: fix hash tuple bug.
@@ -61730,12 +16931,6 @@ Wed Apr 7 00:24:34 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
Tue Apr 6 18:24:18 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
- * file.c (rb_get_path): get path string via "to_path" method if
- path object is not a string. [Ruby2]
-
- * gc.c (rb_gc_call_finalizer_at_exit): do not free threads in the
- exit finalizers.
-
* io.c (rb_io_reopen): should use rb_io_check_io().
Tue Apr 6 16:46:09 2004 Tanaka Akira <akr@m17n.org>
@@ -61746,82 +16941,49 @@ Tue Apr 6 16:46:09 2004 Tanaka Akira <akr@m17n.org>
(time_plus): use time_add.
(time_minus): use time_add.
-Tue Apr 6 13:11:48 2004 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/socket/socket.c (raise_socket_error): never return.
+Tue Apr 6 13:21:30 2004 NAKAMURA Usaku <usa@ruby-lang.org>
* ext/socket/socket.c (make_hostent): must return value.
-Tue Apr 6 00:14:43 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * error.c (Init_Exception): remove Exception#to_str. [Ruby2]
-
- * eval.c (error_print): should no call "to_str" anymore use
- "message" method instead.
-
- * io.c (rb_f_open): Kernel#open() calls "to_open" if the first
- argument responds to it. [Ruby2]
-
-Tue Apr 6 00:13:43 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+Tue Apr 6 00:05:30 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
* lib/rinda/rinda.rb: add require 'drb/drb'
-Mon Apr 5 22:25:32 2004 Tanaka Akira <akr@m17n.org>
-
- * test/zlib/test_zlib.rb: new file.
- (TestZlibGzipWriter#test_new_nil): test for [ruby-dev:23228].
-
-Mon Apr 5 22:16:23 2004 Minero Aoki <aamine@loveruby.net>
-
- * parse.y (assoc_list): {a: 1, b: 2} should be allowed.
- [ruby-dev:23328]
-
-Mon Apr 5 19:43:40 2004 Kazuo Saito <ksaito@uranus.dti.ne.jp>
-
- * regexec.c: imported Oni Guruma 2.2.6.
-
-Mon Apr 5 19:39:10 2004 Kazuo Saito <ksaito@uranus.dti.ne.jp>
+Mon Apr 5 08:18:23 2004 Dave Thomas <dave@pragprog.com>
- * regparse.c, oniguruma.h: imported Oni Guruma 2.2.6.
+ * lib/rdoc/rdoc.rb: Remove leading ./ from file names so that cross
+ references work properly.
-Mon Apr 5 12:12:09 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+Sun Apr 4 20:33:42 2004 Minero Aoki <aamine@loveruby.net>
- * ext/socket/socket.c (raise_socket_error): some platforms don't have
- EAI_SYSTEM.
+ * eval.c (Init_load): make $LOADED_FEATURES built-in.
+ [ruby-dev:23299]
-Mon Apr 5 08:18:23 2004 Dave Thomas <dave@pragprog.com>
+ * ruby.c (ruby_prog_init): make $PROGRAM_NAME built-in.
- * lib/rdoc/rdoc.rb: Remove leading ./ from file names so that cross
- references work properly.
+ * lib/English.rb: remove $LOADED_FEATURES and $PROGRAM_NAME.
Sun Apr 4 14:01:20 2004 Dave Thomas <dave@pragprog.com>
- * lib/rdoc/options.rb (Options::parse): Allow multiple -x options to
- RDoc. Fix bug where files weren't being excluded properly
+ * lib/rdoc/options.rb (Options::parse): Allow multiple -x options to RDoc.
+ Fix bug where files weren't being excluded properly
-Sat Apr 3 09:36:38 2004 why the lucky stiff <why@ruby-lang.org>
+Sat Apr 3 17:11:05 2004 why the lucky stiff <why@ruby-lang.org>
* ext/syck/syck.h: version 0.43.
-Sat Apr 3 08:28:47 2004 why the lucky stiff <why@ruby-lang.org>
-
* ext/syck/lib/gram.c: allow root-level inline collections.
- [ruby-talk:94922]
+ [ruby-talk:94922]
* lib/yaml/rubytypes.rb (Symbol#to_yaml): emit symbols as implicits.
- [ruby-talk:94930]
-
-Fri Apr 2 19:28:48 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ [ruby-talk:94930]
- * bcc32/Makefile.sub (OUTFLAG): needed for static-linked-ext.
-
-Fri Apr 2 18:00:05 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/syck/bytecode.c: turn off default implicit typing.
- * ext/extmk.rb (extmake): extract necessary variables for static link
- from Makefile.
+ * ext/syck/implicit.c: detect base60 integers.
- * lib/mkmf.rb (create_makefile): save preload and libpath for next
- compile.
+ * ext/syck/rubyext.c: handle base60, as well as hex and octal
+ with commas. implicit typing of ruby symbols.
Fri Apr 2 17:27:17 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
@@ -61840,20 +17002,8 @@ Fri Apr 2 14:35:26 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (block_pass): should generate unique identifier of the
pushing block. [ruby-talk:96363]
-Fri Apr 2 11:36:20 2004 Minero Aoki <aamine@loveruby.net>
-
- * eval.c (Init_load): make $LOADED_FEATURES built-in.
- [ruby-dev:23299]
-
- * ruby.c (ruby_prog_init): make $PROGRAM_NAME built-in.
-
- * lib/English.rb: remove $LOADED_FEATURES and $PROGRAM_NAME.
-
Fri Apr 2 07:31:38 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/socket/socket.c: mistakingly removed do_not_reverse_lookup.
- [ruby-list:39475]
-
* ext/socket/socket.c (make_hostent): fix memory leak, based on
the patch from HORIKAWA Hisashi <vzw00011@nifty.ne.jp>.
@@ -61878,6 +17028,14 @@ Thu Apr 1 19:58:37 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
be empty). Instance of URI have instance_variables but it must be
llowed whenever original mapping is allowed or not.
+ * lib/xsd/datatypes.rb: check the smallest positive non-zero
+ single-precision float exactly instead of packing with "f".
+ [ruby-talk:88822]
+
+ * lib/soap/mapping/rubytypeFactory.rb: should not dump singleton class.
+ [ruby-dev:22588]
+ c = class << Object.new; class C; self; end; end; SOAPMarshal.dump(c)
+
Wed Mar 31 19:06:23 2004 Tanaka Akira <akr@m17n.org>
* time.c (year_leap_p): new function.
@@ -61885,7 +17043,7 @@ Wed Mar 31 19:06:23 2004 Tanaka Akira <akr@m17n.org>
(search_time_t): use timegm_noleapsecond instead of
mktime for first guess.
-Wed Mar 31 12:05:17 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Mar 31 12:04:04 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/delegate.rb (DelegateClass): define internal methods of the
result class, but not metaclass of the caller. [ruby-talk:96156]
@@ -61894,44 +17052,12 @@ Wed Mar 31 12:05:17 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ruby.h: missing.h is now prerequisite to intern.h.
-Wed Mar 31 11:17:16 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * pack.c (pack_pack): raises RangeError if uv is out of UTF8 value
- range. [ruby-dev:23281]
-
- * io.c (rb_io_binmode): stdio buffer should be empty when calling
- IO#binmode. [ruby-talk:96155]
-
Tue Mar 30 20:25:34 2004 Tanaka Akira <akr@m17n.org>
* time.c (search_time_t): limit guess range by mktime if it is
available. [ruby-dev:23274]
-Tue Mar 30 18:19:00 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_eval): fix SEGV at retry in iterator's receiver.
- [ruby-dev:23227]
-
-Mon Mar 29 20:17:16 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * process.c (rb_exec): follow older behavior if close-on-exec is not
- available.
-
- * process.c (rb_fork): protect from exceptions while waiting failed
- process, if status is given.
-
-Sun Mar 28 16:25:37 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * cygwin/GNUmakefile.in (clean-local, distclean-local): remove
- work files.
-
- * win32/Makefile.sub (clean-local): ditto.
-
-Sun Mar 28 14:23:02 2004 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/pop.rb: def m( arg ) -> def m(arg).
-
-Sun Mar 28 14:09:13 2004 Minero Aoki <aamine@loveruby.net>
+Sun Mar 28 14:16:59 2004 Minero Aoki <aamine@loveruby.net>
* lib/net/pop.rb (auth): failed when account/password include "%".
[ruby-talk:95933]
@@ -61945,46 +17071,16 @@ Sat Mar 27 10:40:48 2004 Tanaka Akira <akr@m17n.org>
* (lib/pp.rb, lib/prettyprint.rb): define seplist in PP::PPMethods
instead of PrettyPrint.
-Sat Mar 27 01:47:09 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/logger.rb: trim tail space of each line. no user visible change.
-
- * lib/rss/dublincore.rb: fixed class definition mismatch.
+Thu Mar 25 23:28:52 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
- * sample/openssl/gen_csr.rb: fixed wrong usage text.
+ * time.c (time_overflow_p): backport 1.9 usec overflow function.
+ (ruby-bugs PR#1307)
Thu Mar 25 23:15:24 2004 Dave Thomas <dave@pragprog.com>
* lib/rdoc/ri/ri_options.rb (RI::Options::show_version):
Add --version option
-Thu Mar 25 21:45:00 2004 Shigeo Kobayashi <shigek@ruby-lang.org>
-
- * ext/bigdecimal/bigdecimal.c: Bug in + and - reported by Bret Jolly
- fixed.
-
-Thu Mar 25 21:01:32 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * version.c (ruby_show_copyright): obtain copyright year from
- RUBY_RELEASE_YEAR.
-
- * win32/resource.rb: ditto.
-
-Thu Mar 25 19:37:35 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/resource.rb: default rubyw icon to ruby.ico, and let DLL also
- include them.
-
- * win32/resource.rb: include winver.h for older WindowsCE.
-
-Thu Mar 25 14:01:03 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk, */Makefile.sub (lib, dll): phony targets.
-
- * configure.in (ruby, miniruby): ditto.
-
- * cygwin/GNUmakefile.in (rubyw): ditto.
-
Thu Mar 25 04:16:18 2004 Dave Thomas <dave@pragprog.com>
* lib/rdoc/ri/ri_options.rb (RI::Options): Add the --list-names option,
@@ -62001,7 +17097,7 @@ Thu Mar 25 02:00:18 2004 Dave Thomas <dave@pragprog.com>
* lib/rdoc/generators/template/html/one_page_html.rb (Page):
Fix to work with C modules.
-Wed Mar 24 20:49:00 2004 Gavin Sinclair <gsinclair@soyabean.com.au>
+Wed Mar 24 21:17:00 2004 Gavin Sinclair <gsinclair@soyabean.com.au>
* lib/uri.rb: Documented (thanks Dmitry V. Sabanin).
* lib/uri/common.rb: Ditto.
@@ -62011,13 +17107,17 @@ Wed Mar 24 20:49:00 2004 Gavin Sinclair <gsinclair@soyabean.com.au>
* lib/uri/https.rb: Ditto.
* lib/uri/ldap.rb: Ditto.
* lib/uri/mailto.rb: Ditto.
+ (All backported from 1.9)
-Wed Mar 24 18:48:05 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Mar 24 18:48:26 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb ($ruby, $topdir, $hdrdir): should not be affected by
DESTDIR after installed.
- * lib/mkmf.rb (dummy_makefile): default file lists to be cleaned.
+ * lib/mkmf.rb (RUBY): / is not recognized as path separator on
+ nmake/bmake. [ruby-list:39388]
+
+ * lib/mkmf.rb (init_mkmf): $INCFLAGS also should be lazy-evaluated.
Wed Mar 24 12:32:56 2004 Dave Thomas <dave@pragprog.com>
@@ -62034,86 +17134,18 @@ Wed Mar 24 11:11:26 2004 Dave Thomas <dave@pragprog.com>
* lib/rdoc/generators/html_generator.rb (Generators::HTMLGenerator::load_html_template):
Allow non-RDoc templates by putting a slash in the template name
-Wed Mar 24 10:05:22 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/tempfile.rb (Tempfile::_close): should not clear @tmpname
- until the file is really removed. [ruby-core:02684]
-
-Wed Mar 24 04:12:44 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (rb_mod_cvar_get): new method Module#class_variable_get.
+Mon Mar 22 16:19:57 2004 WATANABE Hirofumi <eban@ruby-lang.org>
- * object.c (rb_mod_cvar_set): ditto (Module#class_variable_set).
-
-Tue Mar 23 17:45:22 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_thread_atfork): 1.9 warns no more for thread
- termination. [ruby-dev:23212]
-
-Tue Mar 23 14:46:10 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * Makefile.in, */Makefile.sub, common.mk (clean-local, distclean-local):
- separate files under directories due to directory separator.
-
- * */Makefile.sub (MKFILES): common.mk and */Makefile.sub should not be
- removed.
-
- * win32/Makefile.sub, wince/Makefile.sub: $* cannot appear in explicit
- rules.
-
- * cygwin/GNUmakefile.in: some mingw stuffs were missed.
-
- * lib/mkmf.rb (create_makefile): Borland make wrongly removes braces
- from command lines.
-
- * bcc32/Makefile.sub: needs bcc32/mkexports.rb.
-
-Mon Mar 22 08:21:17 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * Makefile.in, */Makefile.sub, common.mk: extract common portions.
-
- * Makefile.in, cygwin/GNUmakefile.in, */Makefile.sub (RBCONFIG):
- separated time stamp file for rbconfig.rb.
-
- * configure.in: append common.mk to Makefile.
-
- * mkconfig.rb: keep mtime of rbconfig.rb if unchanged.
-
- * win32/rm.bat: remove multiple files.
-
- * wince/mkconfig_wce.rb: use fake.rb instead.
-
-Sun Mar 21 22:17:35 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/webrick/httpserver.rb (WEBrick::HTTPServer#virtual_host):
- sort @virtual_hosts in address, port, host order.
-
- * lib/webrick/httpserver.rb (WEBrick::HTTPServer#lookup_server):
- hostname should not be match if :ServerAlias is not given.
+ * ruby.1: add -width option to .Bl for old groff.
Sun Mar 21 21:11:16 2004 Keiju Ishitsuka <keiju@ishitsuka.com>
* lib/shell/*: bug fix for Shell#system(command_line_string).
-Sun Mar 21 21:04:42 2004 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ruby.1: add -width option to .Bl for old groff.
+Sat Mar 20 20:57:10 2004 David Black <dblack@wobblini.net>
-Sun Mar 21 18:57:37 2004 Kouhei Sutou <kou@cozmixng.org>
-
- * test/rss/*: Test::Unit::TestCase -> RSS::TestCase and
- Test::Unit::Assertions -> RSS::Assertions.
-
-Sun Mar 21 18:48:20 2004 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/{rss,dublincore,syndication}.rb: handled W3CDTF correctly.
-
-Sun Mar 21 18:15:29 2004 Kouhei Sutou <kou@cozmixng.org>
-
- * test/rss/test_xml-stylesheet.rb: added tests for xml-stylesheet.
-
- * lib/rss/xml-stylesheet.rb: added xml-stylesheet parsing
- function.
+ * lib/scanf.rb: Backported 1.9 branch
+ modifications/corrections to 1.8 branch
Sat Mar 20 23:51:03 2004 WATANABE Hirofumi <eban@ruby-lang.org>
@@ -62123,164 +17155,58 @@ Sat Mar 20 23:51:03 2004 WATANABE Hirofumi <eban@ruby-lang.org>
* eval.c (rb_f_raise): should not clear backtrace information if
exception object already have one.
-Sat Mar 20 21:21:03 2004 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ext/extmk.rb: rm -rf $extout, not extout.
-
Sat Mar 20 15:25:36 2004 Dave Thomas <dave@pragprog.com>
* lib/rdoc/generators/template/html/html.rb (RDoc::Page): Force
page background to white.
-Sat Mar 20 09:33:36 2004 Tadayoshi Funaba <tadf@dotrb.org>
+Sat Mar 20 09:52:33 2004 Tadayoshi Funaba <tadf@dotrb.org>
* lib/date.rb, lib/date/format.rb: _parse() now accepts fractional
part of second minute that follows a comma or a full stop.
-Fri Mar 19 21:06:21 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (assoc_list): allow {sym: val} style Hash. [Ruby2]
- this change is done by Nobuyoshi Nakada <nobu@ruby-lang.org>.
-
-Fri Mar 19 15:15:15 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * variable.c (rb_cvar_set): class variables become private to the
- particular class/module. [Ruby2]
-
- * variable.c (rb_cvar_get): ditto.
-
- * variable.c (rb_cvar_defined): ditto.
-
-Fri Mar 19 11:31:32 2004 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * lib/mkmf.rb ($beos, $solaris): add OS flags.
-
- * lib/mkmf.rb (RUBY): / is not recognized as path separator on
- nmake/bmake. [ruby-list:39388]
-
- * lib/mkmf.rb (CLEANLIBS, CLEANOBJS): should remove *.exp with *.so.
-
Fri Mar 19 01:55:57 2004 Mauricio Fernandez <batsman.geo@yahoo.com>
* io.c (rb_io_sync): need not to check writable. [ruby-core:02674]
-Thu Mar 18 19:47:44 2004 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * instruby.rb, rubytest.rb: do not depend on srcdir.
+Thu Mar 18 21:44:38 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-Thu Mar 18 18:50:06 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/drb/drb.rb: backport drb.rb 1.16.
- * mkconfig.rb: no longer embed srcdir and compile_dir into
- rbconfig.rb.
+Fri Mar 18 17:49:51 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/extmk.rb, lib/mkmf.rb: obtain top_srcdir and topdir from library
- paths.
+ * struct.c (make_struct): allow const_id for accessor names.
+ [ruby-core:04585]
-Thu Mar 18 17:46:35 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-
- * lib/drb/drb.rb: do not undef :to_a.
+ * eval.c (rb_attr): check if attribute name is local_id or
+ const_id.
Thu Mar 18 16:22:38 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (proc_eq): avoid false positive by using scope and
dyna_vars. no longer use frame.uniq.
- * eval.c (proc_arity): arity is now defined as number of
- parameters that would not be ignored. i.e. Proc.new{}.arity
- returns zero. update test suites too.
-
-Thu Mar 18 15:27:25 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c: remove specialized version of rb_Array(). use simple
- one defined in object.c.
-
- * object.c (Init_Object): remove Kernel#to_a.
-
- * enum.c (enum_zip): use "to_a" instead of "to_ary".
-
-Wed Mar 17 00:22:03 2004 Kazuo Saito <ksaito@uranus.dti.ne.jp>
-
- * oniguruma.h: imported Oniguruma 2.2.5.
- * regparse.c: ditto.
-
-Tue Mar 16 11:14:17 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * dir.c (fnmatch_helper): File.fnmatch('\.', '.') should return true.
- (Rev1.112 lost compatiblity)
-
- * dir.c (fnmatch_helper): File.fnmatch('\/', '/', File::FNM_PATHNAME)
- should return true. (Rev1.112 lost compatiblity)
-
- * dir.c (fnmatch): File.fnmatch('**/.boo', '.foo/.boo',
- File::FNM_PATHNAME) should return false because of leading period.
+Wed Mar 17 14:44:43 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-Mon Mar 15 17:01:07 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * error.c (exc_initialize): calling 'to_str' each time just for
- type checking is too heavy. [ruby-core:02661]
-
-Mon Mar 15 10:14:51 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/lib/openssl/ssl.rb (OpenSSL::SSL::SocketForwarder):
- add do_not_reverse_lookup.
+ * dir.c (range): fix possible "\0" overrun. (in case of "\0-")
Mon Mar 15 07:39:13 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (rb_yield_0): should not re-submit TAG_BREAK if this
yield is not break destination. [ruby-dev:23197]
-Sun Mar 14 22:07:38 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_thread_raise): err at unstarted thread. (PR#1302)
-
-Sat Mar 13 14:56:32 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-
- * test/drb/ut_drb.rb: use 'druby://localhost:0'. [ruby-dev:23078]
-
- * test/drb/ut_eval.rb: ditto.
-
- * test/drb/ut_large.rb: ditto.
-
- * test/drb/ut_safe1.rb: ditto.
-
- * test/drb/ut_drb_drbssl.rb: use 'drbssl://localhost:0'.
-
-Fri Mar 12 23:52:56 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * dir.c (fnmatch): directory recursion '**/' can be used with
- File::FNM_PATHNAME. [ruby-dev:22901]
-
- * dir.c (fnmatch, fnmatch_helper): only '/' is accepted as path
- separator even in DOSISH environment. [ruby-dev:22974]
- [ruby-list:39337]
-
- * dir.c (fnmatch_helper): faster '*' matching.
-
-Fri Mar 12 20:19:16 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (rb_cv_noreturn): default for platforms not support
- prototypes.
+Sat Mar 13 14:28:16 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
- * ruby.c (ruby_init_loadpath): buffer for path name should have
- MAXPATHLEN.
+ * test/drb/test_drbssl.rb: rescue LoadError. (Barkport from main
+ trunk)
- * lib/mkmf.rb (configuration): include topdir and hdrdir in VPATH.
-
- * lib/mkmf.rb (create_makefile): default dependency rule.
-
-Fri Mar 12 07:35:36 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/webrick/config.rb (WEBrick::Config::General): add
- :DoNotReverseLookup.
-
- * lib/webrick/server.rb (WEBrick::GenericServer#accept): call
- do_not_reverse_lookup for each socket if :DoNotReverseLookup
- is set. [ruby-code:02357]
+ * test/drb/test_drbunix.rb: ditto.
-Wed Mar 10 22:26:25 2004 Minero Aoki <aamine@loveruby.net>
+Wed Mar 10 22:28:09 2004 Minero Aoki <aamine@loveruby.net>
* lib/fileutils.rb (remove_dir): should handle symlink correctly.
This patch is contributed by Christian Loew. [ruby-talk:94635]
+ (Backport from main trunk)
Wed Mar 10 16:28:42 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
@@ -62291,337 +17217,54 @@ Wed Mar 10 16:28:42 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (rb_yield_0): set exit_value for block break.
-Wed Mar 10 16:00:14 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * struct.c (rb_struct_s_def): Struct::new executes block with
- generated struct class. [ruby-talk:02606]
-
Wed Mar 10 15:58:43 2004 Ryan Davis <ryand@zenspider.com>
* eval.c (eval): Only print backtrace if generating the backtrace
doesn't generate an exception. [ruby-core:02621]
-Wed Mar 10 10:15:16 2004 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ruby.c (opt_W_getter): get rid of warning.
-
- * bcc32/Makefile.sub, win32/Makefile.sub, wince/Makefile.sub:
- fixed dependency.
-
Tue Mar 9 13:04:26 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* io.c (rb_io_ungetc): raise IOError instead of calling
rb_sys_fail(). [ruby-talk:23181]
-Tue Mar 9 10:03:40 2004 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * bcc32/Makefile.sub, win32/Makefile.sub, wince/Makefile.sub:
- replaced regex.c entry with Oniguruma files.
-
-Tue Mar 9 01:09:46 2004 Kazuo Saito <ksaito@uranus.dti.ne.jp>
-
- * Makefile.in: replaced regex.c entry with Oniguruma files.
-
-Mon Mar 8 23:16:07 2004 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/http.rb: HTTPHeader did not initialized correctly.
-
- * lib/net/http.rb (connect): does same debug output.
-
-Mon Mar 8 21:38:18 2004 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/http.rb (add_header): remove warning. [ruby-dev:23170]
-
-Mon Mar 8 21:09:39 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * dir.c (range): Cancel change for incomplete '['. More discussion
- is needed.
-
-Mon Mar 8 19:35:13 2004 akira yamada <akira@arika.org>
+Mon Mar 8 19:32:28 2004 akira yamada <akira@ruby-lang.org>
* lib/uri/common.rb (URI::REGEXP::PATTERN::HOSTPORT): (?:#{PORT})
-> (?::#{PORT}). [ruby-dev:23170]
-Mon Mar 8 15:03:24 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Mon Mar 8 15:31:41 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* dir.c (range): treat incomplete '[' as ordinary character (like
- has_magic does). fix buffer overrun at incomplete escape like '[\'.
+ has_magic does).
-Mon Mar 8 13:35:32 2004 WATANABE Hirofumi <eban@ruby-lang.org>
+ * dir.c (range): Cancel above change. More discussion is needed.
- * regparse.c (parse_exp): need to separate initialization for bcc32.
- [ruby-dev:23169]
+Sun Mar 7 22:37:46 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
- * oniguruma.h (ONIG_EXTERN): check __GNUC__ instead of __CYGWIN__.
-
-Mon Mar 8 01:05:55 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/webrick/config.rb (WEBrick::Config::HTTP): rename :RequestHander
- to :RequestCallback and add new option :ServerAlias.
+ * test/drb/ut_drb.rb: use 'druby://localhost:0'. [ruby-dev:23078]
- * lib/webrick/httpserver.rb (WEBrick::HTTPServer#run): use
- :RequestCallback and warn if :RequestHandler is in server's option.
+ * test/drb/ut_eval.rb: ditto.
- * lib/webrick/httpserver.rb (WEBrick::HTTPServer#run): should print
- error message for WEBrick::HTTPSataus::Error.
+ * test/drb/ut_large.rb: ditto.
- * lib/webrick/httpserver.rb (WEBrick::HTTPServer#lookup_server):
- lookup for hostname from :ServerAlias if the req.host is not match
- to :ServerName.
+ * test/drb/ut_safe1.rb: ditto.
- * lib/webrick/httpservlet.rb (WEBrick::HTTPServlet::CGIHandler#do_GET):
- use $?.exitstatus and refine log message.
+ * test/drb/ut_drb_drbssl.rb: use 'drbssl://localhost:0'.
Sun Mar 7 16:22:26 2004 WATANABE Hirofumi <eban@ruby-lang.org>
* Makefile.in (lex.c): use $? instead of $<.
- * lib/pstore.rb (commit_new): use FileUtils.copy_stream for Cygwin.
- [ruby-dev:23157]
-
-Sun Mar 7 05:34:42 2004 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/http.rb: HTTPHeader keeps its header fields as an array.
-
- * lib/net/http.rb: new method HTTPHeader#add_header, get_fields.
-
- * lib/net/http.rb: new method HTTPHeader#content_length=.
-
- * lib/net/http.rb: new method HTTPHeader#content_type, main_type,
- sub_type, type_params, content_type=, set_content_type.
-
- * lib/net/http.rb (HTTPHeader#basic_encode): result of pack(m) may
- contain multiple LFs.
-
-Sun Mar 7 03:11:00 2004 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/http.rb: new method Net::HTTPRequest#body(=).
-
- * lib/net/http.rb: new method Net::HTTPRequest#body_stream(=).
-
-Sun Mar 7 02:06:07 2004 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/http.rb: spin off https code again.
-
- * lib/net/https.rb: new file.
-
- * ext/openssl/lib/net/https.rb: removed. moved to net/https with
- slight modifications.
-
- * ext/openssl/lib/net/protocols.rb: removed. merged with net/http.
-
- * lib/net/protocol.rb: new class BufferedIO.
-
- * lib/net/protocol.rb: InternetMessageIO < BufferedIO.
-
- * lib/net/protocol.rb: BufferedIO.new takes an IO.
-
- * lib/net/smtp.rb: follow InternetMessageIO's change.
-
- * lib/net/pop.rb: ditto.
-
-Sun Mar 7 00:55:03 2004 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/protocol.rb: remove method: InternetMessageIO#address,
- port, ip_address, read_timeout(=), socket.
-
- * lib/net/protocol.rb: simplify code.
-
- * lib/net/protocol.rb: apply latest coding style.
-
-Sat Mar 6 15:15:05 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/strscan/depend: depends on re.h and regex.h.
-
- * ext/strscan/strscan.c: no version check needed.
-
- * ext/strscan/strscan.c (strscan_init_copy): struct re_registers must
- not be bitwise copied.
-
-Sat Mar 6 11:14:33 2004 David Black <dblack@wobblini.net>
-
- * lib/scanf.rb: refixed the previous fix in IO#block_scanf
-
-Sat Mar 6 10:49:40 2004 David Black <dblack@wobblini.net>
-
- * lib/scanf.rb: fixed a logic glitch in IO#block_scanf
-
-Sat Mar 6 02:00:19 2004 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/http.rb: net/https is merged.
-
- * ext/openssl/lib/net/https.rb: ditto.
-
-Sat Mar 6 00:39:21 2004 Kazuo Saito <ksaito@uranus.dti.ne.jp>
-
- * oniggnu.h: imported from Oniguruma library.
- * oniguruma.h: ditto.
- * regcomp.c: ditto.
- * regenc.c: ditto.
- * regenc.h: ditto.
- * regerror.c: ditto.
- * regex.c: ditto.
- * regexec.c: ditto.
- * reggnu.c: ditto.
- * regint.h: ditto.
- * regparse.c: ditto.
- * regparse.h: ditto.
- * ascii.c: ditto.
- * euc_jp.c: ditto.
- * sjis.c: ditto.
- * utf8.c: ditto.
-
- * MANIFEST: added Oniguruma files listed above.
-
- * LEGAL: added Oniguruma license.
-
- * regex.h: now includes oniggnu.h.
-
- * re.c: applied Oniguruma patch.
-
-Fri Mar 5 23:13:08 2004 Minero Aoki <aamine@loveruby.net>
+Fri Mar 5 00:54:14 2004 Dave Thomas <dave@pragprog.com>
- * lib/net/http.rb: support WebDAV methods, PROPPATCH, LOCK,
- UNLOCK, OPTIONS, PROPFIND, DELETE, MOVE, COPY, MKCOL.
- This patch is contributed by Tatsuki Sugiura.
-
-Fri Mar 5 20:58:37 2004 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/http.rb: Net::HTTPResponse#response is obsolete.
- [ruby-core:02592]
-
- * lib/net/http.rb: Net::HTTPResponse#header is obsolete.
-
- * lib/net/http.rb: Net::HTTPResponse#read_header is obsolete.
-
-Fri Mar 5 20:10:57 2004 Minero Aoki <aamine@loveruby.net>
-
- * ext/strscan/strscan.c: new method StringScanner#initialize_copy
- to allow #dup and #clone.
-
- * test/strscan/test_strscan.rb: test StringScanner#dup.
-
-Fri Mar 5 19:42:09 2004 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/http.rb (HTTPResponse#to_ary): should return an object
- which does not respond to #to_ary. It causes infinite loop in
- puts. [ruby-core:02578]
-
-Fri Mar 5 00:51:35 2004 Dave Thomas <dave@pragprog.com>
-
- * lib/test/unit.rb: Move RDoc documentation so that you can
+ * lib/test/unit.rb: MOve RDoc documentation so that you can
now say 'ri Test::Unit'
-Thu Mar 4 22:31:40 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * Makefile.in: miniruby is not needed for cross compile.
-
- * configure.in (PREP): miniruby for native compile.
-
-Thu Mar 4 11:46:32 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/drb/extservm.rb (DRb::ExtServManager#invoke_service_command):
- detach server processes to get rid of zombies.
-
-Thu Mar 4 10:41:25 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ruby.h (T_MASK): save 1 bit in flags bits by shifting T_xxx
- values.
-
-Thu Mar 4 08:08:36 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/syck/rubyext.c: get rid of warnings.
-
- * lib/rss/taxonomy.rb: ditto.
-
- * lib/rdoc/ri/ri_formatter.rb: ditto.
-
- * test/ruby/test_assignment.rb: ditto.
-
-Thu Mar 4 01:17:28 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/rdoc/ri/ri_display.rb (DefaultDisplay::page): wait until the
- pager terminates.
-
-Wed Mar 3 13:10:56 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (method_hash): new method. [ruby-talk:93968]
-
- * eval.c (proc_eq): do not compare dyna_vars.
-
- * eval.c (proc_hash): new method.
-
- * eval.c (rb_yield_0): protect break/return from within orphan (or
- lambda) Proc object.
-
-Wed Mar 3 09:52:05 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb ($topdir): use compile_dir only when not installed yet.
- [ruby-talk:94098]
-
-Wed Mar 3 01:18:52 2004 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/converter.rb: handled Uconv::Error.
-
- * lib/rss/dublincore.rb: DublincoreModel -> DublinCoreModel
-
-Wed Mar 3 00:59:30 2004 David Black <dblack@wobblini.net>
-
- * lib/scanf.rb: soak_up_spaces only ungetc's non-space last
- character
-
- * lib/scanf.rb: IO#block_scanf now returns partial last iteration
- array if format string matches partly
-
-Tue Mar 2 16:30:21 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (pipe_open): erred program name should be reported by
- exceptions, instead of the first argument.
-
- * process.c (rb_spawn): ditto.
-
- * process.c (proc_spawn_v): use first argument as program name.
-
- * win32/win32.c (rb_w32_aspawn): ditto.
-
- * win32/win32.c (CreateChild): search executable file if no program
- name given.
-
- * lib/drb/extservm.rb (invoke_service_command): use Process.spawn.
- [ruby-dev:23103]
-
- * lib/rdoc/ri/ri_display.rb (setup_pager): use IO.popen.
- [ruby-dev:23086], [ruby-dev:23103]
-
- * lib/rdoc/diagram.rb (convert_to_png): ditto.
-
- * lib/rdoc/generators/chm_generator.rb (compile_project): ditto.
-
-Tue Mar 2 12:24:03 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+Tue Mar 2 12:32:59 2004 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/Makefile.sub, wince/Makefile.sub (config.h): shouldn't check
defined? NORETURN. [ruby-dev:23100]
-Tue Mar 2 11:28:40 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/ruby/test_iterator.rb (test_ljump): cannot use
- assert_nothing_raised due to passing block.
-
-Tue Mar 2 06:23:14 2004 David Black <dblack@wobblini.net>
-
- * lib/scanf.rb: fixed Kernel#scanf to propagate code block
-
-Mon Mar 1 23:25:40 2004 David Black <dblack@wobblini.net>
-
- * lib/scanf.rb: Partial fix so STDIN#scanf works with new
- STDIN#pos behavior
-
-Mon Mar 1 19:42:05 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * bcc32/setup.mak: configure's default is "--enable-install-doc"
-
- * win32/setup.mak: ditto.
-
Mon Mar 1 12:24:10 2004 Dave Thomas <dave@pragprog.com>
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_alias):
@@ -62632,105 +17275,38 @@ Sun Feb 29 23:14:53 2004 Dave Thomas <dave@pragprog.com>
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_class):
Handle :nodoc: on singleton classes.
-Sat Feb 28 21:50:20 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * bcc32/Makefile.sub, bcc32/README.bcc32, bcc32/configure.bat,
- bcc32/setup.mak: new configure scheme. use ``configure --prefix=dir''
- instead of ``make DESTDIR=dir install''.
- --with-static-linked-ext support on bccwin32. [ruby-dev:23034]
-
-Sat Feb 28 21:50:20 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * bcc32/setup.mak: "configure --disable-install-doc" is now working.
-
- * win32/setup.mak: ditto.
-
-Sat Feb 28 15:09:49 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * bcc32/configure.bat: append missing label ":exit".
-
- * bcc32/configure.bat: fix typo.
-
-Sat Feb 28 10:31:03 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+Sat Feb 28 10:58:49 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
* MANIFEST: add test_erb.rb
* lib/erb.rb, test/erb/test_erb.rb: don't forget filename,
if both filename and safe_level given. [ruby-dev:23050]
-Sat Feb 28 01:08:40 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (yylex): should not allow symbol for invalid global
- variable (e.g. `:$-)`). [ruby-core:02518]
-
-Fri Feb 27 20:37:09 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (proc_invoke): no orphan block check is needed when pcall
- is true.
-
- * eval.c (localjump_destination): update localjump condition.
-
-Fri Feb 27 02:10:49 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (localjump_destination): lambda should not interfere
- return from the yielded block.
-
-Fri Feb 27 00:53:49 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+Fri Feb 27 01:00:09 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
* lib/drb/drb.rb, test/drb/drbtest.rb: require drb/eq.rb by default
-Thu Feb 26 12:15:02 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/win32.c (make_cmdvector): adjust successive double-quote
- handling.
-
-Thu Feb 26 09:42:56 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * hash.c (delete_if_i): use st_delete_safe() (via
- rb_hash_delete()) instead of returning ST_DELETE.
-
-Thu Feb 26 02:35:10 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * process.c (rb_f_exec): get rid of SEGV when exec failed for command
- in single string.
-
-Wed Feb 25 21:17:33 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * gc.c (obj_free), io.c (rb_io_fptr_finalize), rubyio.h (OpenFile):
- sharing OpenFile.
-
- * io.c (rb_io_initialize): accept IO instance. [ruby-dev:22195]
-
-Wed Feb 25 21:16:10 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Feb 25 21:16:25 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* instruby.rb (with_destdir): should return the given argument if no
DESTDIR is given.
* instruby.rb: use path name expansion of cmd.exe.
-Wed Feb 25 20:44:45 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Feb 25 09:35:22 2004 NAKAMURA Usaku <usa@ruby-lang.org>
- * lib/cgi-lib.rb, lib/getopts.rb, lib/importenv.rb, lib/parsearg.rb:
- warn with caller position.
+ * error.c (NameError::Message): new class for lazy evaluation of
+ message to ensure replaced before marshalling. merge from HEAD.
+ (ruby-bugs-ja:PR#588)
- * test/rss/test_content.rb, test/rss/test_dublincore.rb,
- test/rss/test_syndication.rb, test/rss/test_trackback.rb: use cgi
- instead of cgi-lib.
+ * eval.c (rb_method_missing): use NameError::Message. merge from
+ HEAD. (ruby-bugs-ja:PR#588)
-Tue Feb 24 18:42:03 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Tue Feb 24 18:59:37 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* dir.c (glob_helper): '**/' should not match leading period
unless File::FNM_DOTMATCH is set. (like '*/') [ruby-dev:23014]
-Tue Feb 24 18:03:14 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/ruby/test_file.rb (test_fnmatch): test for dir.c:1.108.
-
-Tue Feb 24 17:07:17 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * dir.c (fnmatch): File.fnmatch with File::FNM_PATHNAME was broken
- for the pattern including '*' followed by '/'.
-
Tue Feb 24 13:22:21 2004 Dave Thomas <dave@pragprog.com>
* lib/rdoc/rdoc.rb (RDoc::RDoc::normalized_file_list): Attempt to get better
@@ -62748,6 +17324,11 @@ Tue Feb 24 06:40:14 2004 Dave Thomas <dave@pragprog.com>
* lib/rdoc/parsers/parse_rb.rb (RubyLex::identify_identifier): Handle
class variables in code listings
+Tue Feb 24 06:40:14 2004 Dave Thomas <dave@pragprog.com>
+
+ * lib/rdoc/parsers/parse_rb.rb (RubyLex::identify_identifier): Handle
+ class variables in code listings
+
Tue Feb 24 06:32:27 2004 Dave Thomas <dave@pragprog.com>
* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::do_aliases): Handle
@@ -62776,164 +17357,88 @@ Tue Feb 24 03:45:06 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
* ext/openssl/ossl_config.c (Init_ossl_config): include Enumerable.
-Mon Feb 23 09:09:44 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * instruby.rb (parse_args): use optparse instead of getopts.
+Mon Feb 23 09:16:35 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* instruby.rb (DOSISH): embedded path in batch files should not be
prefixed by DESTDIR. [ruby-core:02186]
-Sun Feb 22 14:58:04 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/extmk.rb: $extstatic is Array or nil now. [ruby-talk:93383]
+Sun Feb 22 09:54:00 2004 Gavin Sinclair <gsinclair@soyabean.com.au>
- * Makefile.in, bcc32/Makefile.sub, win32/Makefile.sub: terminate options.
+ * re.c: corrected documentation format (again)
- * lib/mkmf.rb (init_mkmf): $INCFLAGS also should be lazy-evaluated.
-
-Sun Feb 22 13:05:37 2004 akira yamada <akira@ruby-lang.org>
-
- * lib/uri/mailto.rb (URI::MailTo::to_s): should include fragment.
-
-Sun Feb 22 12:58:35 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/extmk.rb: use optparse instead of getopts.
-
- * Makefile.in, bcc32/Makefile.sub, win32/Makefile.sub: ditto.
-
-Sun Feb 22 09:51:00 2004 Gavin Sinclair <gsinclair@soyabean.com.au>
+Sun Feb 22 09:43:00 2004 Gavin Sinclair <gsinclair@soyabean.com.au>
* re.c: corrected documentation format (rb_reg_initialize_m)
-Sat Feb 21 22:41:00 2004 Gavin Sinclair <gsinclair@soyabean.com.au>
+Sat Feb 21 22:36:00 2004 Gavin Sinclair <gsinclair@soyabean.com.au>
* ext/zlib/zlib.c: documented, but needs more effort.
-Sat Feb 21 14:33:20 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/extmk.rb: prefer relative path. [ruby-talk:93037]
-
-Sat Feb 21 11:12:08 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat Feb 21 11:12:15 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* missing/os2.c, missing/x68.c: typo fix. pointed out by greentea.
-Fri Feb 20 19:11:20 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/ostruct.rb (OpenStruct#initialize_copy): should not share
- members. [ruby-dev:22966]
-
Fri Feb 20 18:59:47 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/irb/init.rb (IRB::IRB.parse_opts): add -I option to
irb. [ruby-dev:39243]
-Fri Feb 20 12:55:27 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (pipe_open): fix typo.
-
- * win32/win32.c (CreateChild): first argument to CreateProcess() must
- have path, not just basename.
-
Thu Feb 19 23:24:16 2004 Dave Thomas <dave@pragprog.com>
* lib/rdoc/generators/html_generator.rb (Generators::HtmlClass::build_attribute_list):
Support visibility modifiers for attributes
-Thu Feb 19 22:39:00 2004 Gavin Sinclair <gsinclair@soyabean.com.au>
+Thu Feb 19 23:24:16 2004 Dave Thomas <dave@pragprog.com>
- * lib/ostruct.rb: documented
+ * lib/rdoc/generators/html_generator.rb (Generators::HtmlClass::build_attribute_list):
+ Support visibility modifiers for attributes
Thu Feb 19 22:39:04 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
* test/rinda/test_rinda.rb: DRb.start_service only once in testsuites.
DRb.start_service could handle this.
-Thu Feb 19 22:24:04 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+Thu Feb 19 22:19:00 2004 Gavin Sinclair <gsinclair@soyabean.com.au>
- * lib/soap/mapping/rubytypeFactory.rb: should not dump singleton class.
- [ruby-dev:22588]
- c = class << Object.new; class C; self; end; end; SOAPMarshal.dump(c)
+ * lib/ostruct.rb: documented
-Thu Feb 19 18:08:18 2004 Gavin Sinclair <gsinclair@soyabean.com.au>
+Thu Feb 19 21:28:00 2004 Gavin Sinclair <gsinclair@soyabean.com.au>
* ext/strscan/strscan.c: improved documentation
-Thu Feb 19 18:08:18 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/win32.c, win32/win32.h: fixed prototypes.
-
- * win32/win32.c (wait): same as waitpid() with -1.
-
-Thu Feb 19 02:34:28 2004 Dave Thomas <dave@pragprog.com>
-
- * lib/rdoc/markup/simple_markup/preprocess.rb (SM::PreProcess::include_file):
- Only strip comment markers if all lines start with comments.
-
-Thu Feb 19 03:05:49 2004 Minero Aoki <aamine@loveruby.net>
-
- * ext/strscan/strscan.c: StringScanner#restsize is obsolete;
- use #rest_size instead.
-
- * ext/strscan/strscan.c: StringScanner#matchedsize is obsolete;
- use #matched_size instead.
-
-Thu Feb 19 02:42:19 2004 Minero Aoki <aamine@loveruby.net>
-
- * ext/strscan/strscan.c: don't use rb_eval_string, it defines
- classes under the module when required in module clauses.
- [ruby-dev:22951]
+Thu Feb 19 03:10:52 2004 Minero Aoki <aamine@loveruby.net>
-Thu Feb 19 02:37:28 2004 Minero Aoki <aamine@loveruby.net>
+ * ext/strscan/strscan.c: synchronized with main trunk (rev 1.11).
- * ext/strscan/strscan.c: merge documentation from 1.8 branch.
- Thanks Gavin Sinclair.
+Thu Feb 19 02:30:34 2004 Minero Aoki <aamine@loveruby.net>
-Thu Feb 19 00:20:00 2004 Gavin Sinclair <gsinclair@soyabean.com.au>
-
- * lib/cgi-lib.rb: deprecated after 1.8.1
-
- * lib/getopts.rb: ditto
-
- * lib/importenv.rb: ditto
-
- * lib/parsearg.rb: ditto
+ * ext/strscan/strscan.c: documentation checked.
Thu Feb 19 00:11:05 2004 Dave Thomas <dave@pragprog.com>
* lib/rdoc/markup/simple_markup/preprocess.rb (SM::PreProcess::handle):
Strip extraneous space from filenames in :include:
-Wed Feb 18 22:53:41 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+Wed Feb 18 22:52:00 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
- * lib/drb/unix.rb: remove O_NONBLOCk, thanks \ay
+ * lib/drb/unix.rb: remove O_NONBLOCK, thanks \ay
-Wed Feb 18 22:42:19 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+Wed Feb 18 22:47:00 2004 Gavin Sinclair <gsinclair@soyabean.com.au>
- * test/rinda/test_rinda.rb: improt test_rinda.rb
+ * ext/strscan/strscan.c: documented
Wed Feb 18 22:03:11 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
* test/*: should not depend on $KCODE.
-Wed Feb 18 18:07:09 2004 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * test/ruby/test_sprintf.rb: added tests.
-
Wed Feb 18 17:18:01 2004 WATANABE Hirofumi <eban@ruby-lang.org>
* ext/win32ole/win32ole.c: need to include <olectl.h> on Cygwin.
Wed Feb 18 10:40:38 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
- * sprintf.c (rb_f_sprintf): sign bit extension should not be done
- if FPLUS flag is specified. [ruby-list:39224]
-
* sprintf.c (rb_f_sprintf): do not prepend dots for negative
- numbers if FZERO is specified. [ruby-dev:39218]
-
-Wed Feb 18 10:23:34 2004 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * sprintf.c (rb_f_sprintf): clean up.
+ numbers if FZERO is specified. [ruby-list:39218]
Tue Feb 17 23:40:34 2004 Guy Decoux <ts@moulon.inra.fr>
@@ -62942,11 +17447,6 @@ Tue Feb 17 23:40:34 2004 Guy Decoux <ts@moulon.inra.fr>
Tue Feb 17 23:28:45 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
- * test/soap/marshal/test_marshal.rb, test/ruby/test_marshal.rb: do $:
- trick to share the testcase test/ruby/marshaltestlib.rb.
-
-Tue Feb 17 23:13:23 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
* test/ruby/marshaltestlib.rb: common marshal testcase added.
* test/ruby/test_marshal.rb: use above testsuite.
@@ -62955,282 +17455,108 @@ Tue Feb 17 23:13:23 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
* test/soap/marshal/cmarshal.rb: removed (not used).
-Tue Feb 17 19:34:26 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/extmk.rb (extmake): $extout_prefix doesn't vary for libraries.
-
- * ext/extmk.rb (extmake): remove compile directory if empty.
-
- * ext/extmk.rb (parse_args) lib/mkmf.rb (create_makefile): move
- initialization of $extout_prefix from lib/mkmf.rb. [ruby-dev:22928]
-
- * ext/extmk.rb: clear ext and extout directory when cleaning.
-
- * lib/mkmf.rb (CLEANLIBS): should be under $(arch) directory.
-
-Tue Feb 17 18:02:10 2004 Minero Aoki <aamine@loveruby.net>
-
- * ext/strscan/strscan.c: ScanError may be (wrongly) garbage
- collected. (thanks Gavin Sinclair)
-
- * ext/strscan/strscan.c: move ::ScanError to StringScanner::Error.
- ::ScanError is also defined for backward compatibility.
-
- * ext/strscan/strscan.c: #peep is obsolete, use #peek.
+Tue Feb 17 10:51:23 2004 NAKAMURA Usaku <usa@ruby-lang.org>
- * ext/strscan/strscan.c: #empty? is obsolete, use #eos?.
+ * ext/syck/rubyext.c (syck_emitter_end_object): takes only one arg.
- * ext/strscan/strscan.c: #clear is obsolete, use #terminate.
+Tue Feb 17 01:35:28 2004 Tanaka Akira <akr@m17n.org>
- * ext/strscan/strscan.c: #getbyte is obsolete, use #get_byte.
+ * eval.c (rb_eval): care that another thread replace NODE_DREGX_ONCE
+ to NODE_LIT. [ruby-dev:22920]
-Tue Feb 17 12:12:47 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Feb 17 01:24:35 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/extmk.rb (parse_args): delay expanding $(extout) until invoking
- make.
+ * bcc32/Makefile.sub, win32/Makefile.sub (config.h): define
+ STACK_GROW_DIRECTION. [ruby-dev:22910]
- * lib/mkmf.rb (CLEANLIBS): should remove files have specific
- extensions.
+ * bcc32/Makefile.sub (config.h): add newer checks.
-Tue Feb 17 11:33:30 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * wince/Makefile.sub (config.h): define NEED_IO_SEEK_BETWEEN_RW.
- * lib/rss/rexmlparser.rb: REXML version may be 4 digits.
+Tue Feb 17 00:38:10 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-Tue Feb 17 10:45:59 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+ * lib/rinda/tuplespace.rb: TupleSpace#initialize, stop doubling timeout
- * ext/syck/rubyext.c (syck_emitter_end_object): takes only one arg.
+Tue Feb 17 00:18:03 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-Tue Feb 17 07:48:21 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * test/rinda/test_rinda.rb: import test_rinda.rb
- * lib/rexml/encodings/SHIFT_JIS: wrong library name.
+Tue Feb 17 00:14:30 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-Tue Feb 17 01:35:28 2004 Tanaka Akira <akr@m17n.org>
+ * bcc32/Makefile.sub: avoid warning "Redefinition of macro
+ 'HAVE_GETLOGIN'".
- * eval.c (rb_eval): care that another thread replace NODE_DREGX_ONCE
- to NODE_LIT. [ruby-dev:22920]
-
-Tue Feb 17 01:20:57 2004 Minero Aoki <aamine@loveruby.net>
-
- * lib/fileutils.rb: new module FileUtils::DryRun.
+ * vms/config.h_in: ditto.
Mon Feb 16 23:28:14 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
* lib/csv.rb: document reduction. [ruby-core:02429]
- * test/yaml/test_yaml.rb: added 0..1 test with "0".."1" on display.
- it should be defined that the specification about what kind of Range
- is supported in ruby's custom type in YAML.
-
-Mon Feb 16 22:22:00 2004 Gavin Sinclair <gsinclair@soyabean.com.au>
+Mon Feb 16 22:08:00 2004 Gavin Sinclair <gsinclair@soyabean.com.au>
* lib/generator.rb: corrected doc format
-
* lib/rinda/rinda.rb: added documentation (from Hugh Sasse)
-
* lib/rinda/tuplespace.rb: ditto
- [Note: rinda files actually committed Wed Feb 18 07:27:00 2004]
-
-Mon Feb 16 20:28:52 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Mon Feb 16 20:41:32 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* bcc32/Makefile.sub: show more warnings. (refering to mingw)
* bcc32/setup.mak: ditto.
-Mon Feb 16 18:35:58 2004 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/Makefile.sub (config.status): should create *.pdb on ext/,
- not .ext/.
-
- * win32/Makefile.sub (config.status): convert the name of import
- library.
+Mon Feb 16 13:39:44 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * lib/mkmf.rb (create_makefile): now don't need to remove
- $(TARGET).lib.
+ * dir.c (rb_glob, rb_globi): add const.
-Mon Feb 16 15:45:22 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ruby.h: ditto.
- * configure.in: check functions, fork spawnv.
-
- * io.c (rb_io_s_popen): accept argv not only single command line.
-
- * process.c (rb_proc_exec_n): export.
-
- * process.c (rb_check_argv): check if arguments are safe to invoke.
-
- * process.c (rb_fork): retry to fork.
-
- * process.c (rb_spawn): spawn child process asynchronously.
-
- * process.c (rb_f_system): raise an exception if the command could not
- execute.
-
- * win32/win32.c (rb_w32_argv_size): count necessary size for joined
- arguments.
-
- * win32/win32.c (rb_w32_join_argv): join arguments with quoting.
-
- * win32/win32.c (rb_w32_pipe_exec, rb_w32_spawn, rb_w32_aspawn):
- accept program name adding to command line.
-
-Mon Feb 16 15:18:33 2004 Minero Aoki <aamine@loveruby.net>
-
- * lib/racc/parser.rb: add note for Racc full package.
-
-Mon Feb 16 15:13:01 2004 Minero Aoki <aamine@loveruby.net>
-
- * ext/racc/cparse/README: new file.
-
- * ext/racc/cparse/MANIFEST: add README.
-
-Mon Feb 16 12:29:10 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/iconv/iconv.c (iconv_s_list): new method Iconv.list
- (libiconv only).
-
-Mon Feb 16 10:29:52 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * dir.c (CompareImpl): File.fnmatch and Dir.glob get better performance
- in Win32. This is achived by calling downcase() for single-byte
- characters. (CharLower() is slower than downcase())
-
-Mon Feb 16 02:14:29 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Mon Feb 16 02:16:33 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* bcc32/Makefile.sub: should warn suspicious pointer conversion.
* bcc32/setup.mak: ditto.
-Sun Feb 15 20:56:22 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * dir.c (push_braces): remove wrong const. [ruby-dev:22891]
-
-Sun Feb 15 20:41:15 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+Sun Feb 15 19:06:42 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
- * sample/soap/calc/httpd.rb, sample/soap/exchange/httpd.rb,
- sample/soap/sampleStruct/httpd.rb, sample/wsdl/googleSearch/httpd.rb:
- use soap/property instead of getopts for configuring DocumentRoot
- and port# of httpd. see samplehttpd.conf below.
+ * lib/rinda/tuplespace.rb: TupleSpace#read(tpl, 0), raise
+ RequestExpiredError if not found.
- * sample/soap/calc/samplehttpd.conf,
- sample/soap/exchange/samplehttpd.conf,
- sample/soap/sampleStruct/samplehttpd.conf,
- sample/wsdl/googleSearch/samplehttpd.conf: added.
-
-Sun Feb 15 19:13:33 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-
- * lib/rinda/tuplespace.rb: read(tpl,0), raise RequestExpiredError
- if not found.
-
-Sun Feb 15 15:48:57 2004 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+Sun Feb 15 15:56:46 2004 Masaki Suketa <masaki.suketa@nifty.ne.jp>
* ext/win32ole/win32ole.c: add IDispatch wrapper in val2variant.
Thanks, arton.
-Sun Feb 15 15:23:29 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * ruby.h, dir.c (rb_glob): add const.
-
Sun Feb 15 01:46:05 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
* lib/mkmf.rb: absolute path of ruby is assigned to $(RUBY).
[ruby-dev:22870]
-Sat Feb 14 23:59:11 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * mkconfig.rb: use fileutils.rb instead of ftools.rb.
-
- * bcc32/Makefile.sub, win32/Makefile.sub (config.h): define
- STACK_GROW_DIRECTION.
-
- * bcc32/Makefile.sub (config.h): add newer checks.
-
- * wince/Makefile.sub (config.h): define NEED_IO_SEEK_BETWEEN_RW.
-
-Sat Feb 14 23:26:27 2004 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * lib/un.rb: use OptionParser instead of getopts.
-
-Sat Feb 14 11:28:14 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+Sat Feb 14 11:29:41 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
* sample/drb/*: import lib/drb/sample
-Sat Feb 14 11:14:12 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+Sat Feb 14 11:08:23 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
* lib/drb/drb.rb: add pretty_print, thanks gotoken.
-Fri Feb 13 21:51:00 2004 Gavin Sinclair <gsinclair@soyabean.com.au>
-
- * lib/fileutils.rb: slighly improved documentation (sync with 1.8)
-
-Fri Feb 13 19:57:01 2004 Kouhei Sutou <kou@cozmixng.org>
-
- * test/rss/test_trackback.rb: added tests for TrackBack with RSS
- 2.0.
-
- * test/rss/common.rb: added methods make RSS 2.0.
-
- * lib/rss/trackback.rb: TrackBack API is decided.
-
- * lib/rss/rss.rb: RSS::VERSION 0.0.7 -> 0.0.8.
+Fri Feb 13 12:35:08 2004 Minero Aoki <aamine@loveruby.net>
- * lib/rss/parser.rb, lib/rss/rss.rb: replaced $DEBUG by RSS::DEBUG.
+ * test/fileutils/test_fileutils.rb: File.link may raise EINVAL and
+ EACCES on Windows.
- * lib/rss/2.0.rb: removed RSS 2.0 URI. Because RSS 2.0 doesn't
- have URI.
-
-Fri Feb 13 14:41:00 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb: en-bugged at last commit (Feb 11 23:24:22 2004)
-
-Fri Feb 13 12:26:37 2004 Minero Aoki <aamine@loveruby.net>
-
- * test/fileutils/test_fileutils.rb: rescue SystemCallError instead
- of EINVAL. File.link may raise EACCES on network file systems.
-
-Fri Feb 13 05:18:58 2004 Minero Aoki <aamine@loveruby.net>
-
- * test/fileutils/test_fileutils.rb: File.link raises EINVAL on
- Win9x. [ruby-dev:22713]
-
-Thu Feb 12 21:49:00 2004 Gavin Sinclair <gsinclair@soyabean.com.au>
+Thu Feb 12 21:45:00 2004 Gavin Sinclair <gsinclair@soyabean.com.au>
* lib/ftools.rb: documented
-Thu Feb 12 21:19:00 2004 Gavin Sinclair <gsinclair@soyabean.com.au>
-
- * lib/base64.rb: added and tidied documentation
-
-Thu Feb 12 20:45:01 2004 Minero Aoki <aamine@loveruby.net>
+Thu Feb 12 21:25:00 2004 Gavin Sinclair <gsinclair@soyabean.com.au>
- * lib/net/protocol.rb (WriteAdapater#puts): must append "\n" to
- the string, don't prepend. (ruby-bugs:PR#1280)
+ * lib/base64.rb: backported from HEAD (modularised and documented)
-Thu Feb 12 20:31:43 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Feb 12 20:31:48 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (create_tmpsrc): cpp32 of Borland C++ ignores #error
directives in DOS line-ending files at all.
-Thu Feb 12 15:23:20 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (rparen): ignore preceding newlines to right parentheses.
- (ruby-bugs:PR#1221) [ruby-dev:22858]
-
-Thu Feb 12 14:17:43 2004 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * configure.in: set ac_cv_func_link to yes to enable link() on MinGW.
- [ruby-dev:22241]
-
-Thu Feb 12 13:32:49 2004 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (link): raise NotImplementedError on Win9X.
- contributed by Tietew. [ruby-dev:22713]
-
- * win32/win32.c, win32/win32.h (link): add const.
-
-Thu Feb 12 09:56:19 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/tk/lib/tk.rb (TkComm::tk_split_list): suppress a warning.
-
Thu Feb 12 02:23:56 2004 Tanaka Akira <akr@m17n.org>
* lib/pathname.rb: use assert_raise instead of assert_raises.
@@ -63242,91 +17568,26 @@ Thu Feb 12 02:23:56 2004 Tanaka Akira <akr@m17n.org>
* lib/tsort.rb: ditto.
use TSortHash and TSortArray instead of Hash and Array in test.
-Wed Feb 11 23:24:22 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb: properly treat a Tcl/Tk's string with escaping
- special characters.
-
-Tue Feb 10 20:49:07 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (method_proc): return bound Proc object. [ruby-dev:22854]
-
- * eval.c (rb_mod_define_method): bind method body itself for Method
- object.
-
- * node.h (NODE_DMETHOD): deprecated.
-
- * object.c (rb_class_inherited_p): export.
-
-Tue Feb 10 16:43:50 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (umethod_bind): purge unused check. [ruby-dev:22850]
-
-Tue Feb 10 14:33:08 2004 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * string.c (rb_str_match): raise TypeError when both arguments are
- strings. [ruby-dev:22851]
-
- * string.c (rb_str_match2): removed.
-
- * Makefile.in, bcc32/Makefile.sub, win32/Makefile.sub,
- wince/Makefile.sub (string.c): now not depend on version.h.
-
-Mon Feb 9 17:46:07 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * Makefile.in, bcc32/Makefile.sub, win32/Makefile.sub, configure.in,
- runruby.rb: run rdoc, test and so on with compiled extension
- libraries. [ruby-dev:22688]
-
- * ext/extmk.rb, lib/mkmf.rb: make extension libraries in separated
- directory, similar to the actual directory structure.
-
- * lib/fileutils.rb (FileUtils.copy_file): use the mode of the original
- file to create new file.
-
- * lib/rdoc/ri/ri_paths.rb (RI::Paths::SYSDIR): get rid of unexpected
- influence by environment variable.
-
- * bcc32/configure.bat, win32/configure.bat: add install-doc options.
-
- * win32/win32.c, win32/win32.h (rb_w32_fstat): fix Borland C runtime
- bug which returns wrong mode. [ruby-dev:22846]
-
-Mon Feb 9 16:30:12 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * process.c (detach_process_watcher): return the last status.
- [ruby-dev:22841]
-
-Sun Feb 8 16:46:08 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/pp.rb (PP::PPMethods::object_address_group): suppress negative
- sign for higher heap areas.
-
-Sun Feb 8 16:18:27 2004 akira yamada <akira@ruby-lang.org>
-
- * test/yaml/test_yaml.rb (YAML_Unit_Tests::test_range_cycle):
- added tests.
-
-Sun Feb 8 15:51:57 2004 akira yamada <akira@ruby-lang.org>
+Wed Feb 11 20:01:12 2004 akira yamada <akira@ruby-lang.org>
* test/ruby/test_file.rb (TestFile::test_fnmatch): added tests for
File.fnmatch. [ruby-dev:22815][ruby-dev:22819]
-Sun Feb 8 15:41:45 2004 akira yamada <akira@ruby-lang.org>
+ * test/ruby/test_proc.rb (TestProc::test_eq): added a
+ test. [ruby-dev:22599]
- * test/yaml/test_yaml.rb (YAML_Unit_Tests::test_range_cycle):
- added tests. [ruby-core:02306] [ruby-core:02311]
+ * test/ruby/test_proc.rb (TestProc::test_eq): added tests for
+ Proc#==. [ruby-dev:22592], [ruby-dev:22601]
-Sun Feb 8 14:24:35 2004 Minero Aoki <aamine@loveruby.net>
+Tue Feb 10 16:43:56 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/net/http.rb (HTTP#request): should not overwrite Connection
- header. (ruby-bugs:PR#1274)
+ * eval.c (umethod_bind): purge unused check. [ruby-dev:22850]
-Sun Feb 8 10:11:21 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Mon Feb 9 17:16:00 2004 WATANABE Hirofumi <eban@ruby-lang.org>
- * dir.c (glob_helper): Dir.glob('**/') did not work. [ruby-dev:22832]
+ * lib/rdoc/parsers/parse_c.rb: escape '{' and '}' to avoid warnings.
-Sun Feb 8 00:29:26 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Mon Feb 9 13:00:55 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* dir.c (fnmatch): File.fnmatch('*?', 'a') should return true.
[ruby-dev:22815]
@@ -63334,14 +17595,10 @@ Sun Feb 8 00:29:26 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* dir.c (fnmatch): File.fnmatch('\[1\]' , '[1]') should return true.
[ruby-dev:22819]
- * dir.c: Did some styles (no change to behavior)
+Sun Feb 8 16:46:13 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Feb 7 19:56:11 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/irb/init.rb (IRB.rc_files): yield possible rc file names.
-
- * lib/irb/input-method.rb (IRB::ReadlineInputMethod::initialize):
- load and save history automatically. [ruby-core:02352]
+ * lib/pp.rb (PP::PPMethods::object_address_group): suppress negative
+ sign for higher heap areas.
Fri Feb 6 22:48:16 2004 Dave Thomas <dave@pragprog.com>
@@ -63358,27 +17615,6 @@ Fri Feb 6 22:22:50 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
* lib/pp.rb (PPInspectTest#test_to_s_with_iv): remove instance
variable which is defined in the test.
-Fri Feb 6 18:54:18 2004 akira yamada <akira@ruby-lang.org>
-
- * test/ruby/test_proc.rb (TestProc::test_eq): added a
- test. [ruby-dev:22599]
-
-Fri Feb 6 18:26:00 2004 akira yamada <akira@ruby-lang.org>
-
- * test/ruby/test_proc.rb (TestProc::test_eq): added tests for
- Proc#==. [ruby-dev:22592], [ruby-dev:22601]
-
-Fri Feb 6 10:12:06 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/socket/socket.c (bsock_do_not_reverse_lookup): control reverse
- lookup for every instance. [ruby-core:02346]
-
-Fri Feb 6 09:15:11 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/irb/extend-command.rb: add irb_help command. [ruby-talk:91610]
-
- * lib/irb/cmd/help.rb (IRB::ExtendCommand::Help): show RDoc.
-
Fri Feb 6 00:48:37 2004 Tanaka Akira <akr@m17n.org>
* lib/prettyprint.rb (PrettyPrint#first?): obsoleted.
@@ -63395,10 +17631,6 @@ Thu Feb 5 23:56:55 2004 Tanaka Akira <akr@m17n.org>
* lib/set.rb (Set#pretty_print): use seplist.
-Wed Feb 4 22:39:46 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (rb_stat_mode): should not sign-expand, so backout.
-
Wed Feb 4 02:12:06 2004 Tanaka Akira <akr@m17n.org>
* file.c (test_l): fix wrong method name in document.
@@ -63409,37 +17641,19 @@ Wed Feb 4 02:12:06 2004 Tanaka Akira <akr@m17n.org>
(test_sgid): ditto.
(test_sticky): ditto.
-Tue Feb 3 22:36:25 2004 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/2.0.rb, lib/rss/content.rb, lib/rss/dublincore.rb,
- lib/rss/rss.rb, lib/rss/syndication.rb: removed warnings.
-
- * lib/rss/converter.rb: removed handling load error of nkf.
-
- * test/rss/test_syndication.rb, test/rss/test_trackback.rb,
- test/rss/test_dublincore.rb, test/rss/test_content.rb: replaced
- 'require "rss/parser"' by 'require "rss/1.0"'.
-
- * test/rss/test_parser.rb, test/rss/test_accessor.rb: removed
- 'require "rss/parser"'.
-
-Tue Feb 3 11:23:17 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (reduce_nodes): remove tail returns. [ruby-talk:90934]
-
Tue Feb 3 08:04:57 2004 Tanaka Akira <akr@m17n.org>
* lib/pp.rb (Struct#pretty_print_cycle): follow 1.8 style.
-Mon Feb 2 22:06:31 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Feb 2 19:33:49 2004 WATANABE Hirofumi <eban@ruby-lang.org>
- * parse.y (block_append, new_evstr, void_expr0): remove no longer used
- labels.
+ * configure.in: backport from 1.9 for Interix.
-Mon Feb 2 18:45:50 2004 WATANABE Hirofumi <eban@ruby-lang.org>
+ * dln.c (dln_load): ditto.
+
+Mon Feb 2 13:31:51 2004 NAKAMURA Usaku <usa@ruby-lang.org>
- * dln.c (dln_load): don't specify RTLD_GLOBAL on Interix,
- because it caused SEGV when running runner.rb.
+ * lib/net/http.rb (canonical_each): fix merge miss.
Mon Feb 2 01:54:00 2004 Tanaka Akira <akr@m17n.org>
@@ -63461,14 +17675,12 @@ Mon Feb 2 01:54:00 2004 Tanaka Akira <akr@m17n.org>
(UDPSocket#send): recognize 3 arguments form. try all addresses on
4 arguments form.
-Sun Feb 1 23:00:00 2004 Shigeo Kobayashi <shigek@ruby-lang.org>
+Sun Feb 1 18:17:00 2004 Gavin Sinclair <gsinclair@soyabean.com.au>
- * ext/bigdecimal.c: Bug in BigDecimal("1e#{n}").add BigDecimal('.5'),n)
- reported and fixed by Javier Goizueta.
+ * lib/net/http.rb: merged coding style changes from HEAD.
-Sun Feb 1 18:21:00 2004 Gavin Sinclair <gsinclair@soyabean.com.au>
+Sun Feb 1 16:15:00 2004 Gavin Sinclair <gsinclair@soyabean.com.au>
- From ruby_1_8 branch:
* lib/test/unit.rb: rearranged documentation for RDoc's sake.
* lib/matrix.rb: improved documentation.
* lib/net/http.rb: slight documentation formatting improvement.
@@ -63479,32 +17691,27 @@ Sun Feb 1 05:30:06 2004 Tanaka Akira <akr@m17n.org>
raise an errror on non-http proxy URI.
(OpenURI::Buffer#<<): make a tempfile binmode. [ruby-talk:90793]
-Sun Feb 1 00:57:41 2004 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/parser.rb (RSS::Parser): added @@default_parser. Used
- XML parser became selectable.
- * test/rss/test_parser.rb: added tests for
- RSS::Parser.default_parser.
+Sat Jan 31 09:20:32 2004 NAKAMURA, Hiroshi <nakahiro@sairon.co.jp>
-Sat Jan 31 02:28:15 2004 WATANABE Hirofumi <eban@ruby-lang.org>
+ * sample/openssl/gen_csr.rb: wrong usage string.
- * configure.in (RPATHFLAG): set to -Wl,-R like NetBSD on Interix.
+Sat Jan 31 01:00:32 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-Sat Jan 31 01:09:41 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/logger.rb: leading 0 padding of timestamp usec part.
+ * lib/soap/wsdlDriver.rb, lib/wsdl/soap/operation.rb: add support of
+ "parts" attribute of soap:body element in WSDL.
-Fri Jan 30 18:53:23 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * lib/wsdl/xmlSchema/schema.rb: friendly warning message for
+ simpleType element which is not supported for now.
- * re.c (KR_REHASH): wrong hash value on sizeof(long) > sizeof(int).
+ * lib/soap/mapping/factory.rb: deleted unused methods.
-Thu Jan 29 23:11:57 2004 WATANABE Hirofumi <eban@ruby-lang.org>
+ * lib/soap/mapping/rubytypeFactory.rb: do no ignore case while xsi:type
+ string <-> Ruby class name matching.
- * configure.in (DLEXT2): removed. Ruby does not treat
- ".dll" as a extension library anymore.
+ * test/wsdl/soap/{soapbodyparts.wsdl,test_soapbodyparts.wsdl}: new
+ files.
- * bcc32/Makefile.sub, win32/Makefile.sub, wince/Makefile.sub (DLEXT2):
- ditto.
+Thu Jan 29 23:56:00 2004 WATANABE Hirofumi <eban@ruby-lang.org>
* util.c (mblen): fix overrun. [ruby-dev:22672]
@@ -63513,83 +17720,36 @@ Thu Jan 29 22:41:53 2004 Dave Thomas <dave@pragprog.com>
* lib/rdoc/generators/html_generator.rb: Allow 'link:' in Tidylinks.
THis means you can write "see f1[link:files/f1_rb.html]".
-Thu Jan 29 22:24:47 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * sample/openssl/gen_csr.rb: follow OpenSSL::X509::Name change.
- ASN.1 type of subject DN elements were wrong.
-
-Thu Jan 29 22:19:51 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * test/*: remove $: trick. [ruby-dev:22763] use test/runner.rb to
- run test.
-
-Thu Jan 29 19:28:16 2004 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/http.rb (Request#initialize): reject only when a path is
- empty. [ruby-dev:22771]
-
-Thu Jan 29 18:54:08 2004 H.Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * dir.c (glob_helper): infinite loop bug in win32 code.
- [ruby-dev:22770]
-
-Thu Jan 29 17:03:49 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * dir.c: merge tuning from H.Yamamoto <ocean@m2.ccsnet.ne.jp>.
- [ruby-dev:22761]
-
-Thu Jan 29 11:32:14 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * test/rss/test_*: do $: trick while searching a module in the current
- directory.
+Thu Jan 29 15:33:23 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
- * test/xsd/test_xmlschemaparser.rb, test/wsdl/test_emptycomplextype.rb,
- test/soap/helloworld/test_helloworld.rb,
- test/soap/calc/{test_calc.rb,test_calc2.rb}: do File.expand_path
- before using __FILE__.
-
- * test/yaml/test_yaml.rb: assert_equals -> assert_equal.
-
-Thu Jan 29 01:56:02 2004 why the lucky stiff <why@ruby-lang.org>
-
- * ext/syck/rubyext.c: usec round-tripping skew. [ruby-core:2305]
-
- * lib/yaml/rubytypes.rb: character Range now round-trips. [ruby-core:2306]
-
- * test/yaml/test_yaml.rb: add Time and Range tests.
-
-Thu Jan 29 00:00:46 2004 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss: rss/parser.rb is always required.
-
-Wed Jan 28 15:09:14 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/openssl/ossl_x509hame.c (ossl_x509name_initialize): change
+ second argument. it expected to be a Hash not an Integer.
- * test/rss/*.rb: remove "test/" prefix.
+ * ext/openssl/ossl_x509name.c (ossl_x509name_add_entry): add new
+ function for OpenSSL::X509::Name#add_entry.
-Wed Jan 28 13:07:02 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/openssl/ossl_x509name.c (ossl_x509name_to_a): append ASN.1
+ tag number to each element of return value.
- * ext/iconv/extconf.rb: include iconv.h for libiconv. [ruby-dev:22715]
+ * ext/openssl/ossl_x509name.c (Init_ossl_x509name): add constants
+ OpenSSL::X509::Name::DEFAULT_OBJECT_TYPE and OBJECT_TYPE_TEMPLATE.
-Wed Jan 28 12:43:07 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * ext/openssl/lib/openssl/x509.rb (OpenSSL::X509::Name#initialize):
+ second argument takes OBJECT_TYPE_TEMPLATE by default.
- * lib/rss: rss library imported. [ruby-dev:22726]
+ * sample/openssl/gen_csr.rb: use OpenSSL::X509::Name.parse.
Wed Jan 28 04:29:41 2004 Eric Schwartz <emschwar@fc.hp.com>
* lib/cgi/session.rb: use LOCK_SH to read, and a few other
improvements. [ruby-core:02328]
-Tue Jan 27 15:00:14 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * misc/ruby-mode.el: better support for general delimited
- strings. [ruby-dev:22695]
-
-Tue Jan 27 11:04:40 2004 FUKUMOTO Atsushi <fukumoto@nospam.imasy.or.jp>
+Tue Jan 27 11:09:29 2004 FUKUMOTO Atsushi <fukumoto@nospam.imasy.or.jp>
* ext/socket/socket.c (s_recvfrom): sending length should be an
invariant while retrying on EAGAIN. [ruby-talk:89962]
-Tue Jan 27 10:31:28 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+Tue Jan 27 10:35:18 2004 NAKAMURA Usaku <usa@ruby-lang.org>
* ext/win32ole/win32ole.c (set_argv): fix condition.
@@ -63598,14 +17758,19 @@ Tue Jan 27 02:26:31 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
* lib/webrick/httputils.rb (WEBrick:HTTPUtils::parse_header):
refine regex for header-name.
+Tue Jan 27 00:30:11 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * win32/Makefile.sub: rollback.
+
Mon Jan 26 22:53:04 2004 Dave Thomas <dave@pragprog.com>
* io.c: Remove documentation references to $defout.
-Mon Jan 26 14:41:46 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+Mon Jan 26 15:11:47 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * sample/exyacc.rb: escape '}' to avoid warning.
- * lib/weakref.rb (WeakRef::initialize): set up @__id before
- calling "super".
+Mon Jan 26 14:41:46 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/delegate.rb (Delegator::initialize): preserve
singleton_method_added method [ruby-dev:22685]
@@ -63613,11 +17778,11 @@ Mon Jan 26 14:41:46 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/delegate.rb (Delegator::initialize): use Kernel::raise
instead of mere raise. [ruby-dev:22681]
-Mon Jan 26 12:45:23 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+Mon Jan 26 12:47:17 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tcltklib/tcltklib.c: define CONST84 when TCL_MAJOR_VERSION == 7
-Mon Jan 26 11:30:58 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Jan 26 11:35:23 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/extmk.rb: Makefiles should depend on also rbconfig.rb.
(ruby-bugs:PR#1256)
@@ -63625,112 +17790,18 @@ Mon Jan 26 11:30:58 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/win32ole/win32ole.c (set_argv): set real arguments to
WIN32OLE::ARGV. [ruby-list:39073]
-Sun Jan 25 18:25:26 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/ossl_x509name.c (ossl_x509name_add_entry): third
- argument become optional.
-
- * ext/openssl/ossl_x509name.c (ossl_x509name_initialize): ditto.
-
- * ext/openssl/ossl_x509name.c (Init_x509name): emailAddress and
- domainComponent should be IA5String.
-
-Sun Jan 25 01:45:38 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/webrick/httpserver.rb (WEBrick::HTTPServer#run): support
- virtual host.
-
- * lib/webrick/httpserver.rb (WEBrick::HTTPServer#virtual_host): add
- new method to register virtual hosting server.
-
- * lib/webrick/httpserver.rb (WEBrick::HTTPServer#lookup_server): add
- new method to lookup virtual hosting server.
-
-Sat Jan 24 13:06:26 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/ossl_x509hame.c (ossl_x509name_initialize): change
- second argument. it expected to be a Hash not an Integer.
-
- * ext/openssl/ossl_x509name.c (ossl_x509name_add_entry): add new
- function for OpenSSL::X509::Name#add_entry.
-
- * ext/openssl/ossl_x509name.c (Init_ossl_x509name): add constants
- OpenSSL::X509::Name::DEFAULT_OBJECT_TYPE and OBJECT_TYPE_TEMPLATE.
-
- * ext/openssl/lib/openssl/x509.rb (OpenSSL::X509::Name#initialize):
- second argument takes OBJECT_TYPE_TEMPLATE by default.
-
-Fri Jan 23 02:26:30 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * pack.c (num2i32): pack should not raise RangeError.
- [ruby-dev:22654]
-
- * pack.c (pack_pack): do not auto convert nil to zero.
-
Thu Jan 22 22:54:53 2004 Shugo Maeda <shugo@ruby-lang.org>
* lib/net/imap.rb (BEG_REGEXP): allow 8-bit characters in quoted
strings for Novell GroupWise Internet Agent.
-
* lib/net/imap.rb (DATA_REGEXP): ditto.
-Thu Jan 22 18:35:49 2004 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * lib/e2mmap.rb (VERSION): remove unnecessary version checking.
-
-Thu Jan 22 16:21:02 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Jan 22 16:21:33 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (string_content): reset lexical states at the beginning of
string contents. [ruby-list:39061]
-Thu Jan 22 08:08:50 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (opt_rescue): use NODE_ERRINFO() instead of
- NODE_GVAR("$!"), to avoid confusion from variable aliasing.
- [ruby-talk:90074]
-
- * version.c (Init_version): remove obsolete constants VERSION
- etc. [ruby-dev:22643]
-
-Thu Jan 22 01:46:32 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (newline_node): do not use NODE_NEWLINE node anymore,
- use NEWLINE flag instead.
-
-Thu Jan 22 01:12:12 2004 Siena. <siena@faculty.chiba-u.jp>
-
- * missing/os2.c (chdir, getcwd):
- use _chdir2 and _getcwd2 supporting multiple drives in OS/2 with EMX.
-
-Thu Jan 22 00:33:52 2004 Siena. <siena@faculty.chiba-u.jp>
-
- * configure.in: check availability of link(). [ruby-dev:22237]
- * file.c (rb_file_s_link): raise an exception when link() is unavailable.
- * missing/os2.c (link): removed. File#link isn't supported.
- * bcc32/Makefile.sub: define HAVE_LINK to enable link(). [ruby-dev:22241]
- * win32/Makefile.sub: ditto.
-
-Thu Jan 22 00:26:25 2004 Siena. <siena@faculty.chiba-u.jp>
-
- * ChangeLog: typo: RUBY_MBCHAR_MAX was RUBY_MBCHAR_MAXSIZE.
-
-Thu Jan 22 00:12:51 2004 Siena. <siena@faculty.chiba-u.jp>
-
- * defines.h: define RUBY_MBCHAR_MAX instead of MB_CUR_MAX.
- * dir.c (Next, emx_mblen): use RUBY_MBCHAR_MAX for mblen().
- * file.c (CharNext): ditto.
- * ruby.c (translate_char): ditto.
- * util.c (__crt0_glob_function): ditto.
-
-Thu Jan 22 00:10:01 2004 Dave Thomas <dave@pragprog.com>
-
- * lib/base64.rb: :nodoc: the Deprecated module
-
-Wed Jan 21 23:52:39 2004 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * configure.in: Interix(SFU) support.
-
-Wed Jan 21 23:03:45 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+Wed Jan 21 21:55:51 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
* lib/drb/drb.rb: remove O_NONBLOCK, thanks \ay
* lib/drb/extserv.rb: typo
@@ -63743,28 +17814,21 @@ Wed Jan 21 17:57:56 2004 Shugo Maeda <shugo@ruby-lang.org>
* lib/net/imap.rb (ensure_nz_number): show a detailed error
message.
-Wed Jan 21 16:44:15 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Jan 21 16:44:20 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (merge_libs): squeeze successive same libraries.
[ruby-dev:22652]
-Wed Jan 21 16:10:36 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/base64.rb: enclosed in a module. [ruby-core:02285]
-
-Wed Jan 21 16:01:26 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Jan 21 16:01:37 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/digest/rmd160/extconf.rb: have_library appends found library.
Wed Jan 21 11:36:00 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/socket/socket.c (sock_gethostbyname): returns host if
- ai_canonname is NULL. (ruby-bugs PR#1243)
-
* parse.y (block_append): update nd_end for "real" head node.
[ruby-list:39058]
-Tue Jan 20 14:48:28 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Tue Jan 20 14:48:13 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
* ext/openssl/extconf.rb: should check <openssl/conf_api.h> instead
of OPENSSL_VERSION_NUMBER. [ruby-list:39056]
@@ -63784,57 +17848,25 @@ Tue Jan 20 13:22:39 2004 Dave Thomas <dave@pragprog.com>
* lib/English.rb: Document English.rb.
-Tue Jan 20 04:41:58 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/ruby/test_marshal.rb (MarshalTestLib::test_exception): test
- for [ruby-dev:22604].
-
- * test/ruby/test_marshal.rb (MarshalTestLibtest_singleton): test
- for [ruby-dev:22588].
-
-Tue Jan 20 02:38:13 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * marshal.c (w_class): should not dump singleton class.
- [ruby-dev:22631]
-
Tue Jan 20 02:49:22 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
* ext/openssl/extconf.rb: add check for OpenSSL version.
[ruby-list:39054]
-Mon Jan 19 23:56:20 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * error.c (name_err_mesg_to_str): inverted condition for result of
- inspection. [ruby-dev:22628]
-
-Mon Jan 19 22:24:28 2004 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * sample/exyacc.rb: escape '}' to avoid warning.
-
- * lib/rdoc/parsers/parse_c.rb: escape '{' and '}' to avoid warnings.
-
-Mon Jan 19 21:28:06 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/digest/defs.h, win32/win3.c, win32/win32.h, file.c: remove
- useless casts for Borland C.
-
-Mon Jan 19 17:39:38 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * error.c (NameError::message): internal use only.
+Tue Jan 20 02:38:13 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
- * eval.c (rb_method_missing): use hidden constant.
+ * marshal.c (w_class): should not dump singleton class.
+ [ruby-dev:22631]
-Mon Jan 19 16:30:53 2004 akira yamada <akira@ruby-lang.org>
+Tue Jan 20 01:31:36 2004 WATANABE Hirofumi <eban@ruby-lang.org>
- * test/ruby/test_time.rb: added tests for [ruby-dev:22614] and
- [ruby-dev:22617].
+ * io.c (lineno): typo fix(FIX2INT -> INT2FIX).
-Mon Jan 19 13:09:21 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+Mon Jan 19 21:53:38 2004 akira yamada <akira@ruby-lang.org>
- * ext/extmk.rb, win32/Makefile.sub, win32/configure.bat,
- win32/setup.mak: --with-static-linked-ext support on mswin32.
+ * io.c, re.c, string.c, time.c: fixed up positions of RDocs.
-Mon Jan 19 06:49:07 2004 Tadayoshi Funaba <tadf@dotrb.org>
+Mon Jan 19 07:09:20 2004 Tadayoshi Funaba <tadf@dotrb.org>
* lib/date.rb: zone was wrong when it was behind UTC.
Thanks Mark J. Reed.
@@ -63844,53 +17876,10 @@ Mon Jan 19 06:49:07 2004 Tadayoshi Funaba <tadf@dotrb.org>
* sample/cal.rb: added a class, anyway.
-Mon Jan 19 01:08:39 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * class.c, error.c, eval.c, intern.h, object.c, variable.c:
- do not set path if it is a singleton class. [ruby-dev:22588]
-
- * lib/cgi.rb (CGI::QueryExtension): give extended string, not a
- delegater object.
-
-Sun Jan 18 23:59:44 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/iconv/charset_alias.rb: prefer us_EN locale encodings or
- former. [ruby-dev:22609]
-
- * ext/iconv/iconv.c (iconv_create): raise InvalidEncoding
- exception when EINVAL.
-
-Sun Jan 18 23:16:34 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * class.c, error.c, file.c, io.c, numeric.c, object.c, re.c, struct.c,
- time.c: marked init_copy functions nodoc.
-
Sun Jan 18 20:47:35 2004 WATANABE Hirofumi <eban@ruby-lang.org>
* ruby.c: use translate_char() on Cygwin.
-Sun Jan 18 20:00:16 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/soap/wsdlDriver.rb, lib/wsdl/soap/operation.rb: add support of
- "parts" attribute of soap:body element in WSDL.
-
- * lib/wsdl/xmlSchema/schema.rb: friendly warning message for
- simpleType element which is not supported for now.
-
- * test/wsdl/soap/{soapbodyparts.wsdl,test_soapbodyparts.wsdl}: new
- files.
-
-Sun Jan 18 16:46:48 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * time.c (time_overflow_p): should return results. [ruby-dev:22614]
-
-Sun Jan 18 12:07:24 2004 Siena. <siena@faculty.chiba-u.jp>
-
- * test/ruby/test_time.rb: new test case to test Time#[+-].
-
- * time.c (time_plus, time_minus): fix RangeError for a negative
- argument in environments whose time_t is unsigned. [ruby-dev:22608]
-
Sun Jan 18 02:33:26 2004 WATANABE Hirofumi <eban@ruby-lang.org>
* defines.h (_WIN32): undef _WIN32 on Cygwin before defining DOSISH.
@@ -63900,136 +17889,59 @@ Sun Jan 18 00:23:55 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* marshal.c (class2path): check anonymous class/module before
checking referable, and allow singleton classes.
-Sat Jan 17 23:58:51 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * error.c (NameError::Message): new class for lazy evaluation of
- message to ensure replaced before marshalling. [ruby-dev:22604]
-
- * eval.c (rb_method_missing): use NameError::Message.
-
-Sat Jan 17 21:49:50 2004 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * lib/time.rb (test_rfc2822, test_rfc3339, test_encode_xmlschema):
- should not expect that all platforms handle negative time_t value.
-
-Fri Jan 16 23:53:09 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (proc_eq): compare also arguments and environment
- (including local variables). [ruby-dev:22590]
-
Fri Jan 16 14:33:35 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* marshal.c (class2path): get class path and check referable.
[ruby-dev:22588]
-Thu Jan 15 12:58:26 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Jan 16 09:52:23 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c (proc_eq): Proc with empty body may not be equal.
+ [ruby-dev:22590]
+
+Thu Jan 15 13:03:10 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (argf_read): do not append EOF. (ruby-bugs-ja:PR#585)
* io.c (rb_io_fwrite): ad-hockery hack to get rid of HP-UX stdio
weird behavior. [ruby-dev:22424]
-Wed Jan 14 21:13:06 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/inlinetest.rb (InlineTest::eval_part): eval under the top
- level environment.
-
-Wed Jan 14 17:54:17 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/inlinetest.rb (InlineTest::loadtest): require instead of
- load, to get rid of multiple loading.
-
-Wed Jan 14 13:30:52 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Jan 14 13:31:06 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/iconv/extconf.rb: wrapper iconv.rb is dependent on platform.
-Wed Jan 14 09:32:02 2004 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * MANIFEST: add test/net/test_httpheader.rb. (commit miss?)
-
-Wed Jan 14 00:58:35 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (Init_Proc): move SystemStackError from under
- StandardError to Exception. [ruby-talk:89782]
-
-Tue Jan 13 18:03:02 2004 Ian Macdonald <ian@caliban.org>
-
- * file.c (rb_stat_wr, rb_stat_ww): New functions
- implementing new methods (File::Stat#world_readable?,
- File::Stat#world_writable?).
-
-Tue Jan 13 16:53:25 2004 why the lucky stiff <why@ruby-lang.org>
+Tue Jan 13 18:54:28 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
- * ext/syck/rubyext.c: omission of Date library code caused
- test suite failure. [ruby-core:2251]
-
-Tue Jan 13 16:50:03 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb: use $0 as the default application class name.
-
-Tue Jan 13 14:48:00 2004 Ian Macdonald <ian@caliban.org>
-
- * lib/pathname.rb: New methods (Pathname#world_readable?,
- Pathname#world_writable?).
-
-Tue Jan 13 14:48:01 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (primary): allow no "when" case. [ruby-dev:22578]
+ * lib/logger.rb(Logger#msg2str): no special treatment for the object
+ which responds to :to_str. commited at 2004-01-11T21:46:27 by
+ gsinclair.
- * ruby.h (rb_class_of): reduce branch. [ruby-dev:22577]
+ * lib/logger.rb(LogDevice#initialize): remove type checking if the
+ given object is a String. Kernel.open handles it correctly.
+ commited at 2004-01-11T21:46:27 by gsinclair.
- * ruby.h (rb_type): ditto.
+ * test/logger/test_logger.rb: follow above change (ArgumentError ->
+ TypeError.) follow above commit.
-Tue Jan 13 14:26:59 2004 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+Tue Jan 13 14:27:13 2004 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
* lib/test/unit/ui/testrunnerutilities.rb (TestRunnerUtilities):
moved run method which allows output level. [ruby-dev:22554]
-Tue Jan 13 13:04:24 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * test/test_*.rb: Pathname#parent -> Pathname#dirname.
-
-Tue Jan 13 11:38:58 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/yaml/test_yaml.rb (YAML_Unit_Tests::test_spec_type_{int,float}):
- fix syntax error.
-
-Tue Jan 13 07:52:40 2004 why the lucky stiff <why@ruby-lang.org>
-
- * ext/syck/bytecode.c: turn off default implicit typing.
-
- * ext/syck/implicit.c: detect base60 integers.
-
- * ext/syck/rubyext.c: handle base60, as well as hex and octal
- with commas. implicit typing of ruby symbols.
-
- * test/yaml/test_yaml.rb: add test.
-
Tue Jan 13 04:29:52 2004 Dave Thomas <dave@pragprog.com>
* lib/rdoc/ri/ri_driver.rb (RiDriver::report_method_stuff):
Show fully-qualified class names in class list.
-Tue Jan 13 01:24:17 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * file.c (test_wr): Rdoc fix. [ruby-core:02225]
-
Tue Jan 13 01:04:37 2004 Dave Thomas <dave@pragprog.com>
* lib/rdoc/ri/ri_paths.rb (RI::Paths): First attempt at
incorporating DESTDIR in the rdoc installation.
-Mon Jan 12 23:26:21 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Jan 12 23:27:19 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (primary): fix position after FCALL. [ruby-dev:22574]
-Mon Jan 12 18:00:11 2004 Ian Macdonald <ian@caliban.org>
-
- * file.c (test_wr, test_ww): New functions implementing new
- methods (File::world_readable?, File::world_writable?).
-
- * file.c (S_IRUGO, S_IGUGO): New macros.
-
Mon Jan 12 12:07:22 2004 Dave Thomas <dave@pragprog.com>
* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::do_methods):
@@ -64047,22 +17959,29 @@ Mon Jan 12 12:07:22 2004 Dave Thomas <dave@pragprog.com>
* lib/rdoc/ri/ri_formatter.rb (RI::HtmlFormatter::break_to_newline):
HTML formats need explicit line breaks.
+Mon Jan 12 11:46:30 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * configure.in (LIBPATHFLAG, RPATHFLAG): enclose paths with single
+ quotes. [ruby-dev:22564]
+
+ * lib/mkmf.rb (libpathflag): do not enclose with quotes always.
+
+ * {bcc32,win32,wince}/Makefile.sub (LIBPATHFLAG): quoted.
+
Mon Jan 12 02:24:07 2004 Dave Thomas <dave@pragprog.com>
* lib/rdoc/ri/ri_formatter.rb (RI::HtmlFormatter): Add HTML
generation support to ri (Elliot Hughes)
-Sun Jan 11 23:54:41 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * env.h (ruby_frame, ruby_scope, ruby_in_eval, ruby_class,
- ruby_dyna_vars): export. [ruby-dev:22566]
+Mon Jan 12 02:24:07 2004 Dave Thomas <dave@pragprog.com>
-Sun Jan 11 02:35:53 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * lib/rdoc/ri/ri_formatter.rb (RI::HtmlFormatter): Add HTML
+ generation support to ri (Elliot Hughes)
- * ext/socket/socket.c (make_hostent): a bug in brace position.
+Sun Jan 11 02:07:47 2004 Dave Thomas <dave@pragprog.com>
- * configure.in: install rdoc by default. if you do not want to
- install rdoc, specify --disable-install-doc.
+ * lib/rdoc/ri/ri_options.rb (RI::Options::OptionList::OptionList):
+ Also accept command line options via the 'RI' environment variable.
Sun Jan 11 02:07:47 2004 Dave Thomas <dave@pragprog.com>
@@ -64083,49 +18002,7 @@ Sat Jan 10 01:54:50 2004 Eric Sunshine <sunshine@sunshineco.com>
correctly on Rhapsody when -arch compiler flag was used (via
configure's --enable-fat-binary option).
-Sat Jan 10 23:01:41 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (LIBPATHFLAG, RPATHFLAG): enclose paths with single
- quotes. [ruby-dev:22564]
-
- * lib/mkmf.rb (libpathflag): do not enclose with quotes always.
-
- * {bcc32,win32,wince}/Makefile.sub (LIBPATHFLAG): quoted.
-
-Sat Jan 10 22:46:18 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * dir.c (dir_inspect): new method, Dir#inspect. [ruby-dev:22562]
-
-Fri Jan 9 17:36:51 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/socket/socket.c (make_hostent): getaddrinfo(3) on BSD do not
- fill ai_canonname if serv is not supplied. (ruby-bugs PR#1243)
-
-Fri Jan 9 13:14:59 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/test/unit/collector/dir.rb: do not ignore exceptions(LoadError
- and SystemExitError) while loading a testcase. smell of bug.
-
- * test/testunit/collector/test_dir.rb: add new test of the LoadError.
-
- * test/drb/{test_drbssl.rb,test_drbunix.rb}: do not define testcase if
- openssl is not installed.
-
- * test/testunit/collector/test_dir.rb: assert_raises -> assert_raise.
-
-Fri Jan 9 11:52:16 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * rubysig.h: <errno.h> is needed to use errno which may be a macro.
-
-Fri Jan 9 11:20:24 2004 Siena. <siena@faculty.chiba-u.jp>
-
- * ext/extmk.rb (extmake): should not reduce necessary libraries.
- [ruby-dev:22440]
-
- * lib/mkmf.rb (merge_libs): merge libraries according to
- dependency.
-
-Fri Jan 9 10:05:23 2004 Siena. <siena@faculty.chiba-u.jp>
+Fri Jan 9 10:05:14 2004 Siena. <siena@faculty.chiba-u.jp>
* lib/mkmf.rb (libpathflag): use single quotes. [ruby-dev:22440]
@@ -64135,7 +18012,7 @@ Thu Jan 8 23:49:21 2004 WATANABE Hirofumi <eban@ruby-lang.org>
rdoc documentation, you need to run configure with
--enable-install-doc.
-Thu Jan 8 21:17:43 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Thu Jan 8 21:29:43 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
* ext/openssl/ossl_pkey.c (ossl_pkey_to_der): removed; it returns
public key only.
@@ -64149,10 +18026,6 @@ Thu Jan 8 21:17:43 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
* ext/openssl/ossl_pkey_rsa.c (ossl_rsa_to_der): new function for
OpenSSL::PKey::RSA#to_der.
-Thu Jan 8 18:25:29 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * dir.c (glob_helper): should not recurse in exceptional status.
-
Thu Jan 8 16:51:04 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
* test/wsdl/datetime/test_datetime.rb: fixed a stupid testcase which
@@ -64162,58 +18035,15 @@ Thu Jan 8 11:20:01 2004 WATANABE Hirofumi <eban@ruby-lang.org>
* eval.c, object.c, process.c, re.c: don't use C++ style comments.
-Thu Jan 8 08:46:14 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/syck/rubyext.c (yaml_org_handler): lazy-load Date for
- static-ext.
-
-Thu Jan 8 07:06:30 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/extmk.rb: preserve order in Setup. [ruby-dev:22503]
-
- * ext/extmk.rb: move dependent libraries just after depended
- libraries.
-
- * ext/digest/*/extconf.rb: depend on digest.
-
-Thu Jan 8 04:36:17 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Thu Jan 8 04:36:21 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
* lib/webrick/cgi.rb (WEBrick::CGI#initialize): should create
@config[:Logger] if it was not given.
-Wed Jan 7 22:28:12 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * dir.c (glob_helper): fix memory leak.
-
-Wed Jan 7 21:15:07 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
* sample/webrick/*: new files.
* MANIFEST: add sample/webrick/*
-Wed Jan 7 20:51:51 2004 Minero Aoki <aamine@loveruby.net>
-
- * test/net/test_httpheader.rb: new file.
-
- * MANIFEST: add test/net/test_httpheader.rb.
-
-Wed Jan 7 20:42:06 2004 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/http.rb (HTTPHeader#content_length): should return nil
- unless header exists. [ruby-dev:22519]
-
-Wed Jan 7 14:26:05 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb (TkPanedWindow): use epath for embedded windows.
-
- * ext/tk/lib/tktext.rb: use epath for embedded windows.
-
- * ext/tk/lib/tkcanvas.rb: use epath for window items.
-
-Wed Jan 7 14:24:04 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/soap/{attachment.rb,mimemessage.rb}: added from soap4r/1.5.2.
-
Wed Jan 7 13:00:18 2004 Dave Thomas <dave@pragprog.com>
* lib/rdoc/ri/ri_driver.rb: Fix problem where ri was
@@ -64237,71 +18067,16 @@ Tue Jan 6 22:13:34 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (rb_mod_modfunc): should break if m has no super class.
[ruby-dev:22498]
-Tue Jan 6 21:51:37 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Jan 6 21:55:02 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (fptr_finalize): should save errno just after failure.
[ruby-dev:22492]
-Tue Jan 6 20:51:10 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/logger.rb(Logger#msg2str): no special treatment for the object
- which responds to :to_str.
-
- * lib/logger.rb(LogDevice#initialize): remove type checking if the
- given object is a String. Kernel.open handles it correctly.
-
- * test/logger/test_logger.rb: follow above change (ArgumentError ->
- TypeError.)
-
Tue Jan 6 14:53:14 2004 Dave Thomas <dave@pragprog.com>
* bin/ri: split out the display side, making it pluggable. Added
new ri_driver and ri_display files in lib/rdoc/ri.
-Tue Jan 6 11:29:43 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * test/inlinetest.rb, test/{test_generator.rb,test_ipaddr.rb,
- test_pathname.rb,test_pp.rb,test_prettyprint.rb,test_set.rb,
- test_time.rb,test_tsort.rb: added.
-
-Tue Jan 6 09:38:27 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * import soap4r/1.5.2;
-
- * lib/soap/{attachment.rb,baseData.rb,encodingstyle/soapHandler.rb}:
- introduce SOAPExternalReference class as a referenct to SOAPEnvelope
- external content.
-
- * lib/soap/{attachment.rb,mimemessage.rb}: great SwA (SOAP messages
- with Attachments) support code by Jamie Herre.
-
- * lib/soap/{element.rb,marshal.rb,parser.rb,processor.rb,
- streamHandler.rb,wsdlDriver.rb}: SwA support.
-
- * lib/soap/rpc/{cgistub.rb,driver.rb,element.rb,proxy.rb,router.rb,
- soaplet.rb}: SwA support and refactoring.
-
- * lib/soap/generator.rb, lib/soap/mapping/mapping.rb: follow
- SOAPReference#initialize signature change.
-
- * lib/soap/mapping/factory.rb: deleted unused methods.
-
- * lib/soap/mapping/rubytypeFactory.rb: do no ignore case while xsi:type
- string <-> Ruby class name matching.
-
- * lib/xsd/datatypes.rb: check the smallest positive non-zero
- single-precision float exactly instead of packing with "f".
- [ruby-talk:88822]
-
- * test/soap/test_basetype.rb, test/xsd/test_xsd.rb: use 1.402e-45, not
- 1.4e-45. 1.4e-45 is smaller than 2 ** -149...
-
- * test/soap/test_basetype.rb, test/soap/marshal/test_marshal.rb,
- test/xsd/test_xsd.rb: use "(-1.0 / (1.0 / 0.0))" instead of "-0.0".
-
- * test/soap/test_streamhandler.rb: revert to the previous test that
- warns "basic_auth unsupported under net/http".
-
Tue Jan 6 06:37:53 2004 Dave Thomas <dave@pragprog.com>
* bin/rdoc: Add --ri-system switch
@@ -64322,45 +18097,6 @@ Tue Jan 6 00:04:40 2004 Dave Thomas <dave@pragprog.com>
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_method_or_yield_parameters):
fix parsing if there are braces in a method parameter list
-Tue Jan 6 01:01:04 2004 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/dir.h, win32/win32.c: fix patch miss.
-
- * win32/Makefile.sub: fix file dependency.
-
-Mon Jan 5 20:32:00 2004 Gavin Sinclair <gsinclair@soyabean.com.au>
-
- * lib/logger.rb: enhanced documentation.
-
-Mon Jan 5 18:58:47 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * dir.c: merge tuning from H.Yamamoto <ocean@m2.ccsnet.ne.jp>.
- [ruby-dev:22486]
-
- * pack.c (pack_unpack): unpack requires big endian offet (OFF16B
- and OFF32B). The patch is from Minero Aoki in [ruby-dev:22489]
-
- * pack.c (OFF16B): add big-endian offset again.
-
-Mon Jan 5 03:00:53 2004 Minero Aoki <aamine@loveruby.net>
-
- * test/ruby/test_pack.rb: new test test_unpack_N.
-
-Mon Jan 5 01:47:53 2004 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * lib/mkmf.rb (create_makefile): remove duplicated object files
- from $objs on DOSISH platforms.
-
-Sat Jan 3 02:44:48 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * rubysig.h (TRAP_END): preserve errno before switching context.
- [ruby-core:02137]
-
-Sat Jan 3 01:18:08 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * dir.c: merge tuning from H.Yamamoto <ocean@m2.ccsnet.ne.jp>.
- [ruby-dev:22476]
-
Fri Jan 2 14:54:11 2004 Dave Thomas <dave@pragprog.com>
* bin/ri: Add new --classes option, and arrange for
@@ -64379,23 +18115,10 @@ Fri Jan 2 01:50:13 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* io.c (argf_eof): ARGF.eof? should not have any side effect.
[ruby-dev:22469]
-Thu Jan 1 09:03:20 2004 Dave Thomas <dave@pragprog.com>
-
- * bin/ri (report_class_stuff): Fix problem with ambiguous nested
- classes not matching.
-
Wed Dec 31 17:25:17 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
* io.c (argf_each_byte): should return self. [ruby-dev:22465]
-Wed Dec 31 15:05:00 2003 Gavin Sinclair <gsinclair@soyabean.com.au>
-
- * lib/pathname.rb: Corrected small coding error.
-
-Wed Dec 31 15:00:00 2003 Gavin Sinclair <gsinclair@soyabean.com.au>
-
- * lib/pathname.rb: Completed documentation.
-
Wed Dec 31 11:20:34 2003 Dave Thomas <dave@pragprog.com>
* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::do_methods): Make
@@ -64434,20 +18157,16 @@ Tue Dec 30 12:30:30 2003 Dave Thomas <dave@pragprog.com>
Tue Dec 30 08:32:32 2003 Dave Thomas <dave@pragprog.com>
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_method):
- Handle undoing nsting of yield parameters correctly for:
-
- def each_entry(&b) Dir.foreach(@path) {|f| yield P.new(f) } end
+ Handle undoing nesting of yield parameters correctly for:
-Tue Dec 30 07:30:00 2003 Gavin Sinclair <gsinclair@soyabean.com.au>
+ def each_entry(&b) Dir.foreach(@path) {|f| yield P.new(f) } end
- * lib/pathname.rb: Added documentation.
-
-Mon Dec 29 20:08:17 2003 Minero Aoki <aamine@loveruby.net>
+Tue Dec 30 08:32:32 2003 Dave Thomas <dave@pragprog.com>
- * lib/net/http.rb (GenericRequest#initialize): check if path
- begins with '/'.
+ * lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_method):
+ Handle undoing nesting of yield parameters correctly for:
- * lib/net/http.rb: def m( arg ) -> def m(arg)
+ def each_entry(&block) Dir.foreach(@path) {|f| yield Pathname.new(f) } end
Mon Dec 29 12:51:02 2003 Dave Thomas <dave@pragprog.com>
@@ -64461,25 +18180,10 @@ Mon Dec 29 05:05:51 2003 Dave Thomas <dave@pragprog.com>
* struct.c, random: Add RDoc comments
-Mon Dec 29 02:25:00 2003 Gavin Sinclair <gsinclair@soyabean.com.au>
-
- * lib/optparse.rb: Improved documentation.
-
Mon Dec 29 02:20:54 2003 Dave Thomas <dave@pragprog.com>
* eval.c: Add RDoc for class Proc, Method, UnboundMethod
-Mon Dec 29 02:20:26 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * instruby.rb: fix install directory if destdir and compile_dir are
- not in the same drive.
-
- * ext/extmk.rb: ditto. [ruby-list:39009]
-
- * win32/Makefile.sub, win32/README.win32, win32/configure.bat,
- win32/setup.mak: new configure scheme. use ``configure --prefix=dir''
- instead of ``nmake DESTDIR=dir install''.
-
Mon Dec 29 00:41:44 2003 Dave Thomas <dave@pragprog.com>
* math.c: Add RDoc comments
@@ -64513,7 +18217,7 @@ Sun Dec 28 03:50:05 2003 Dave Thomas <dave@pragprog.com>
* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::find_override_comment):
Escape method names used in regexp
-Sun Dec 28 01:46:02 2003 Dave Thomas <dave@wireless_3.local.thomases.com>
+Sun Dec 28 01:46:02 2003 Dave Thomas <dave@pragprog.com>
* lib/rdoc/ri/ri_formatter.rb (RI::TextFormatter::display_flow_item):
Add support for rules in 'ri' output.
@@ -64531,27 +18235,27 @@ Sun Dec 28 01:05:31 2003 Dave Thomas <dave@pragprog.com>
* marshal.c, signal.c: RDoc collemts added by Elliott Hughes
-Sun Dec 28 00:46:25 2003 Dave Thomas <dave@pragprog.com>
+Sun Dec 28 00:48:47 2003 Dave Thomas <dave@pragprog.com>
* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::find_class_comment):
- Some Ruby source uses lower-case class names for the
- Init_Xxx C function name.
+ Some source files use lower case class or module names
+ when naming the Init_XXX function in C.
Sat Dec 27 23:41:46 2003 WATANABE Hirofumi <eban@ruby-lang.org>
* configure.in: fix "test: too many arguments" error.
-Sat Dec 27 15:32:40 2003 Dave Thomas <dave@wireless_3.local.thomases.com>
+Sat Dec 27 15:32:19 2003 Dave Thomas <dave@wireless_3.local.thomases.com>
- * time.c: Add RDoc comments for Time class.
+ * time.c: RDoc comments added
-Sat Dec 27 15:07:26 2003 Dave Thomas <dave@pragprog.com>
+Sat Dec 27 15:07:57 2003 Dave Thomas <dave@pragprog.com>
* object.c: Add RDoc comments for Symbol class.
-Sat Dec 27 14:39:53 2003 Dave Thomas <dave@pragprog.com>
+Sat Dec 27 14:42:30 2003 Dave Thomas <dave@pragprog.com>
- * numeric.c (Init_Numeric): Add RDoc comments.
+ * numeric.c: Add RDoc comments.
Sat Dec 27 00:44:00 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
@@ -64569,7 +18273,7 @@ Fri Dec 26 23:02:09 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
* io.c (rb_io_getline): should return nil when read_all gives
empty string, even when nil rs is specified. [ruby-core:02077]
-Fri Dec 26 18:33:54 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Dec 26 18:50:59 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in: check if getcontext and setcontext are available.
@@ -64579,26 +18283,14 @@ Fri Dec 26 16:40:53 2003 Tanaka Akira <akr@m17n.org>
* lib/pathname.rb (PathnameTest#test_plus): add 2 assertions.
-Fri Dec 26 14:05:13 2003 Minero Aoki <aamine@loveruby.net>
-
- * test/ruby/test_pack.rb: new test test_pack_N.
-
-Fri Dec 26 12:53:26 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+Fri Dec 26 09:26:58 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
* pack.c (pack_pack): add sign check for 'i', and 'l'.
[ruby-dev:22427]
* bignum.c (rb_quad_pack): add range check for 'quad int'.
-Fri Dec 26 10:58:58 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * MANIFEST: add vms/config.h and remove vms/config.h_in.
-
-Fri Dec 26 10:42:00 2003 AKIYOSHI, Masamichi <masamichi.akiyoshi@hp.com>
-
- * io.c: [VMS] "rfm=stmlf" is specified for open() and fopen().
-
-Thu Dec 25 22:29:53 2003 NAKAMURA Usaku <usa@ruby-lang.org>
+Thu Dec 25 22:39:59 2003 NAKAMURA Usaku <usa@ruby-lang.org>
* string.c (rb_str_update): don't return any value.
@@ -66448,10 +20140,10 @@ Wed Nov 5 22:55:16 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tcltklib/README.1st: add the description of '--with-pthread-ext'
- * ext/tk/lib/tktext.rb: add TkText#text_copy, text_cut, text_paste
+ * ext/tk/lib/tktext.rb : add TkText#text_copy, text_cut, text_paste
to support Tcl/Tk8.4's tk_textCopy, tk_textCut, tk_textPaste
- * ext/tk/lib/tk.rb: add TkMenu#set_focus support Tcl/Tk's
+ * ext/tk/lib/tk.rb : add TkMenu#set_focus support Tcl/Tk's
tk_menuSetFocus
Wed Nov 5 17:33:45 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
@@ -66863,6 +20555,11 @@ Mon Oct 20 09:45:12 2003 NAKAMURA Usaku <usa@ruby-lang.org>
* lib/debug.rb (debug_command): remove debug print.
+Wed Oct 20 00:25:41 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (search_required): required name must not be changed before
+ loading. [ruby-dev:24492]
+
Sun Oct 19 13:12:30 2003 Tanaka Akira <akr@m17n.org>
* lib/pathname.rb (foreachline, dir_foreach): add obsolete warning.
@@ -67020,10 +20717,10 @@ Wed Oct 15 05:05:53 2003 Akinori MUSHA <knu@iDaemons.org>
Wed Oct 15 04:31:51 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * ext/tk/sample/demos-en/entry3.rb, ext/tk/sample/demos-jp/entry3.rb:
+ * ext/tk/sample/demos-en/entry3.rb, ext/tk/sample/demos-jp/entry3.rb :
new demo-scripts
- * ext/tk/sample/demos-en/widget, ext/tk/sample/demos-jp/widget:
+ * ext/tk/sample/demos-en/widget, ext/tk/sample/demos-jp/widget :
add entries for 'entry3.rb'
Wed Oct 15 04:31:47 2003 Akinori MUSHA <knu@iDaemons.org>
@@ -67419,6 +21116,12 @@ Mon Oct 6 22:59:46 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
* test/csv/test_csv.rb: add tests for above change.
+Sun Oct 5 23:27:09 2003 Tanaka Akira <akr@m17n.org>
+
+ * ext/socket/extconf.rb: check recvmsg even if sendmsg is exists.
+
+ * ext/socket/socket.c (thread_read_select): restored.
+
Mon Oct 6 16:23:38 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
* marshal.c (w_object): wrong method name in the message.
@@ -67448,10 +21151,6 @@ Mon Oct 6 09:19:54 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
Sun Oct 5 23:27:09 2003 Tanaka Akira <akr@m17n.org>
- * ext/socket/extconf.rb: check recvmsg even if sendmsg is exists.
-
- * ext/socket/socket.c (thread_read_select): restored.
-
* lib/pathname.rb: version information is added in document.
Sun Oct 5 23:07:03 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
@@ -67844,6 +21543,35 @@ Thu Oct 2 00:21:11 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
* test/soap/calc/*: give httpd config param "CGIInterpreter".
"/usr/bin/env ruby" thing does not work under non-Unix boxes.
+Sat Oct 2 00:42:20 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * marshal.c (r_byte): retrieve pointer from string value for each
+ time. [ruby-dev:24404]
+
+ * marshal.c (r_bytes0): ditto.
+
+ * enum.c (sort_by_i): re-entrance check added. [ruby-dev:24399]
+
+ * io.c (io_read): should freeze all reading buffer.
+ [ruby-dev:24400]
+
+ * string.c (rb_str_sum): should use bignums when bits is greater
+ than or equals to sizeof(long)*CHAR_BITS. [ruby-dev:24395]
+
+ * eval.c (specific_eval): defer pointer retrieval to prevent
+ unsafe sourcefile string modification. [ruby-dev:24382]
+
+ * string.c (rb_str_sum): wrong cast caused wrong result.
+ [ruby-dev:24385]
+
+ * enum.c (enum_sort_by): hide temporary array from
+ ObjectSpace.each_object. [ruby-dev:24386]
+
+ * string.c (rb_str_sum): check was done with false pointer.
+ [ruby-dev:24383]
+
+ * string.c (rb_str_sum): string may be altered. [ruby-dev:24381]
+
Thu Oct 2 00:25:21 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
* signal.c (ruby_signal_name): adjust to the prototype.
@@ -68007,6 +21735,20 @@ Sat Sep 27 09:44:18 2003 Minero Aoki <aamine@loveruby.net>
* test/fileutils/test_nowrite.rb: ditto.
+Mon Sep 27 09:14:03 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * array.c (rb_ary_delete): comparison may change the capacity.
+ [ruby-dev:24348]
+
+ * array.c (rb_ary_fill): fill should honor length argument.
+ [ruby-dev:24346]
+
+ * array.c (rb_ary_replace): should not use ptr from shared array.
+ [ruby-dev:24345]
+
+ * ext/socket/socket.c (s_accept): don't retry for EWOULDBLOCK.
+ [ruby-talk:113807]
+
Sat Sep 27 04:57:07 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
* test/ruby/test_file.rb: new file. only asserts unlink-before-close
@@ -68337,6 +22079,8 @@ Tue Sep 9 10:39:51 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (struct tag): dst should be VALUE.
+Tue Sep 9 10:39:51 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
* eval.c (localjump_destination): stop at the scope where the current
block was created. [ruby-dev:21353]
@@ -68408,7 +22152,7 @@ Sun Sep 7 16:08:28 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tcltklib/tcltklib.c (lib_mainloop_core): fixed signal-trap bug
- * ext/tk/lib/*.rb: Ruby/Tk works at $SAFE == 4
+ * ext/tk/lib/*.rb : Ruby/Tk works at $SAFE == 4
Sat Sep 6 02:26:34 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
@@ -68627,7 +22371,7 @@ Tue Sep 2 14:02:19 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tcltklib/tcltklib.c (ip_invoke): fixed bug on passing a exception
- * ext/tk/lib/{tk.rb, tkcanvas.rb, tkfont.rb, tktext.rb}:
+ * ext/tk/lib/{tk.rb, tkcanvas.rb, tkfont.rb, tktext.rb} :
bug fix and improvement of font control
Tue Sep 2 09:51:36 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
@@ -68728,17 +22472,17 @@ Fri Aug 29 17:30:15 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* process.c: deny handling IDs during evaluating the block given to
the Process::{UID,GID}.switch method
- * ext/tcltklib/tcltklib.c: some methods have no effect if on slave-IP
+ * ext/tcltklib/tcltklib.c : some methods have no effect if on slave-IP
- * ext/tcltklib/tcltklib.c: can create a interpreter without Tk
+ * ext/tcltklib/tcltklib.c : can create a interpreter without Tk
- * ext/tcltklib/tcltklib.c: bug fix on handling exceptions
+ * ext/tcltklib/tcltklib.c : bug fix on handling exceptions
- * ext/tcltklib/MANUAL.euc: modify
+ * ext/tcltklib/MANUAL.euc : modify
- * ext/tk/lib/tk.rb: freeze some core modules
+ * ext/tk/lib/tk.rb : freeze some core modules
- * ext/tk/lib/multi-tk.rb: more secure
+ * ext/tk/lib/multi-tk.rb : more secure
* ext/tk/lib/tk.rb: TkVariable.new(array) --> treat the array as the
Tk's list
@@ -68746,9 +22490,9 @@ Fri Aug 29 17:30:15 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tk.rb: improve accessibility of TkVariable object
* ext/tk/lib/tk.rb, ext/tk/lib/tkfont.rb, ext/tk/lib/tkcanvas.rb,
- ext/tk/lib/tktext.rb: fix bug of font handling
+ ext/tk/lib/tktext.rb : fix bug of font handling
- * ext/tk/lib/tkfont.rb: TkFont.new() accepts compound fonts
+ * ext/tk/lib/tkfont.rb TkFont.new() accepts compound fonts
Thu Aug 28 22:07:12 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
@@ -68912,12 +22656,7 @@ Tue Aug 19 23:20:00 2003 Shigeo Kobayashi <shigek@ruby-lang.org>
* ext/bigdecimal/lib/bigdecimal/math.rb: E implemented.
-Tue Aug 19 11:19:33 2003 Shugo Maeda <shugo@ruby-lang.org>
-
- * io.c (next_argv): should not call GetOpenFile() if rb_stdout is
- not a IO (T_FILE).
-
-Tue Aug 19 07:47:10 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Tue Aug 19 07:47:09 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
* lib/webrick/ssl.rb: new file; SSL/TLS enhancement for GenericServer.
@@ -68938,6 +22677,11 @@ Tue Aug 19 07:47:10 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
* ext/openssl/lib/openssl/ssl.rb (SSLServer#accept): should close
socket if SSLSocket raises error.
+Tue Aug 19 11:19:33 2003 Shugo Maeda <shugo@ruby-lang.org>
+
+ * io.c (next_argv): should not call GetOpenFile() if rb_stdout is
+ not a IO (T_FILE).
+
Tue Aug 19 07:47:09 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
* ext/openssl/ossl_ssl.c: sync_close is moved to SSLSocket as
@@ -69026,7 +22770,7 @@ Fri Aug 15 23:15:00 2003 Shigeo Kobayashi <shigek@ruby-lang.org>
* ext/bigdecimal/lib/bigdecimal/math.rb: atan() & sqrt() added.
-Fri Aug 15 12:01:44 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Aug 15 12:01:43 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (HUGE_ST_INO): check whether struct stat.st_ino
is larger than long. [ruby-dev:21194]
@@ -69350,7 +23094,7 @@ Tue Aug 5 15:47:34 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
Tue Aug 5 10:04:42 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
- * string.c (str_new4): ptr may refer to null_str.
+ * string.c (str_new4): ptr may refer null_str.
Mon Aug 4 17:25:18 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
diff --git a/KNOWNBUGS.rb b/KNOWNBUGS.rb
deleted file mode 100644
index b97a08d928..0000000000
--- a/KNOWNBUGS.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# This test file concludes tests which point out known bugs.
-# So all tests will cause failure.
-#
-
diff --git a/LEGAL b/LEGAL
index 991bb4dea9..908eb270f5 100644
--- a/LEGAL
+++ b/LEGAL
@@ -5,59 +5,34 @@ All the files in this distribution are covered under either the Ruby's
license (see the file COPYING) or public-domain except some files
mentioned below.
-include/ruby/oniguruma.h:
-regcomp.c:
-regenc.[ch]:
-regerror.c:
-regexec.c:
-regint.h:
-regparse.[ch]:
-enc/ascii.c
-enc/big5.c
-enc/cp949.c
-enc/emacs_mule.c
-enc/encdb.c
-enc/euc_jp.c
-enc/euc_kr.c
-enc/euc_tw.c
-enc/gb18030.c
-enc/gb2312.c
-enc/gbk.c
-enc/iso_8859_1.c
-enc/iso_8859_10.c
-enc/iso_8859_11.c
-enc/iso_8859_13.c
-enc/iso_8859_14.c
-enc/iso_8859_15.c
-enc/iso_8859_16.c
-enc/iso_8859_2.c
-enc/iso_8859_3.c
-enc/iso_8859_4.c
-enc/iso_8859_5.c
-enc/iso_8859_6.c
-enc/iso_8859_7.c
-enc/iso_8859_8.c
-enc/iso_8859_9.c
-enc/koi8_r.c
-enc/koi8_u.c
-enc/shift_jis.c
-enc/unicode.c
-enc/us_ascii.c
-enc/utf_16be.c
-enc/utf_16le.c
-enc/utf_32be.c
-enc/utf_32le.c
-enc/utf_8.c
-enc/windows_1251.c
-
-Oniguruma ---- (C) K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
-
-http://www.geocities.jp/kosako3/oniguruma/
-http://www.ruby-lang.org/cgi-bin/cvsweb.cgi/oniguruma/
-http://www.freebsd.org/cgi/cvsweb.cgi/ports/devel/oniguruma/
-
- When this software is partly used or it is distributed with Ruby,
- this of Ruby follows the license of Ruby.
+regex.[ch]:
+
+ These files are under LGPL. Treat them as LGPL says. (See the file
+ LGPL for details)
+
+ Extended regular expression matching and search library.
+ Copyright (C) 1993, 94, 95, 96, 97, 98 Free Software Foundation, Inc.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file LGPL. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+ Multi-byte extension added May, 1993 by t^2 (Takahiro Tanimoto)
+ Last change: May 21, 1993 by t^2
+ removed gapped buffer support, multiple syntax support by matz <matz@nts.co.jp>
+ Perl5 extension added by matz <matz@caelum.co.jp>
+ UTF-8 extension added Jan 16 1999 by Yoshida Masato <yoshidam@tau.bekkoame.ne.jp>
configure:
@@ -68,8 +43,8 @@ configure:
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
-tool/config.guess:
-tool/config.sub:
+config.guess:
+config.sub:
parse.c:
As long as you distribute these files with the file configure, they
@@ -98,21 +73,6 @@ parse.c:
the same distribution terms that you use for the rest of that program.
util.c (partly):
-
- Copyright (c) 1991, 2000, 2001 by Lucent Technologies.
-
- Permission to use, copy, modify, and distribute this software for any
- purpose without fee is hereby granted, provided that this entire notice
- is included in all copies of any software which is or includes a copy
- or modification of this software and in all copies of the supporting
- documentation for such software.
-
- THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR IMPLIED
- WARRANTY. IN PARTICULAR, NEITHER THE AUTHOR NOR LUCENT MAKES ANY
- REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
- OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
-
-util.c (partly):
win32/win32.[ch]:
You can apply the Artistic License to these files. (or GPL,
@@ -171,6 +131,7 @@ random.c
email: matumoto@math.keio.ac.jp
st.[ch]:
+x68/*:
missing/alloca.c:
missing/dup2.c:
missing/finite.c:
@@ -179,16 +140,51 @@ missing/isinf.c:
missing/isnan.c:
missing/memcmp.c:
missing/memmove.c:
+missing/strcasecmp.c:
missing/strchr.c:
+missing/streror.c:
+missing/strftime.c:
+missing/strncasecmp.c:
missing/strstr.c:
missing/strtol.c:
ext/digest/sha1/sha1.[ch]:
These files are all under public domain.
+missing/strtod.c:
+
+ This file will not be used on most platforms depending on how the
+ configure script results. In any case you must not receive any fee
+ with the file itself.
+
+ Copyright (c) 1988-1993 The Regents of the University of California.
+ Copyright (c) 1994 Sun Microsystems, Inc.
+
+ Permission to use, copy, modify, and distribute this
+ software and its documentation for any purpose and without
+ fee is hereby granted, provided that the above copyright
+ notice appear in all copies. The University of California
+ makes no representations about the suitability of this
+ software for any purpose. It is provided "as is" without
+ express or implied warranty.
+
+missing/strtoul.c:
+
+ This file will not be used on most platforms depending on how the
+ configure script results. In any case you must not receive any fee
+ with the file itself.
+
+ Copyright 1988 Regents of the University of California
+
+ Permission to use, copy, modify, and distribute this
+ software and its documentation for any purpose and without
+ fee is hereby granted, provided that the above copyright
+ notice appear in all copies. The University of California
+ makes no representations about the suitability of this
+ software for any purpose. It is provided "as is" without
+ express or implied warranty.
+
missing/erf.c:
-missing/tgamma.c:
-missing/lgamma_r.c:
missing/crypt.c:
missing/vsnprintf.c:
@@ -230,47 +226,6 @@ missing/vsnprintf.c:
From ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change
paragraph 3 above is now null and void.
-missing/strlcat.c
-missing/strlcpy.c
-
- These files are under the new-style BSD license.
-
- Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- 3. The name of the author may not be used to endorse or promote products
- derived from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
- THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-missing/langinfo.c
-
- This file is from http://www.cl.cam.ac.uk/~mgk25/ucs/langinfo.c.
- Ruby uses a modified version. The file contains the following
- author/copyright notice:
-
- Markus.Kuhn@cl.cam.ac.uk -- 2002-03-11
- Permission to use, copy, modify, and distribute this software
- for any purpose and without fee is hereby granted. The author
- disclaims all warranties with regard to this software.
-
ext/digest/md5/md5.[ch]:
These files are under the following license. Ruby uses modified
@@ -309,7 +264,18 @@ ext/digest/rmd160/rmd160.[ch]:
Copyright (c) Katholieke Universiteit Leuven
1996, All Rights Reserved
+ext/digest/rmd160/rmd160hl.c:
+ext/digest/sha1/sha1hl.c:
+
+ These files are under the beer-ware license.
+
+ "THE BEER-WARE LICENSE" (Revision 42):
+ <phk@login.dkuug.dk> wrote this file. As long as you retain this notice you
+ can do whatever you want with this stuff. If we meet some day, and you think
+ this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
+
ext/digest/sha2/sha2.[ch]:
+ext/digest/sha2/sha2hl.c:
These files are under the new-style BSD license.
diff --git a/Makefile.in b/Makefile.in
index 5843ed030d..a37bcf65fb 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,23 +1,17 @@
SHELL = /bin/sh
NULLCMD = :
-RUNCMD = $(SHELL)
-CHDIR = @CHDIR@
-exec = exec
#### Start of system configuration section. ####
srcdir = @srcdir@
-top_srcdir = $(srcdir)
-hdrdir = $(srcdir)/include
+VPATH = $(srcdir):$(srcdir)/missing
CC = @CC@
-YACC = bison
+YACC = @YACC@
PURIFY =
AUTOCONF = autoconf
@SET_MAKE@
MKFILES = @MAKEFILES@
-BASERUBY = @BASERUBY@
-TEST_RUNNABLE = @TEST_RUNNABLE@
prefix = @prefix@
exec_prefix = @exec_prefix@
@@ -30,27 +24,21 @@ datadir = @datadir@
arch = @arch@
sitearch = @sitearch@
sitedir = @sitedir@
-ruby_version = @ruby_version@
TESTUI = console
TESTS =
RDOCTARGET = @RDOCTARGET@
EXTOUT = @EXTOUT@
-arch_hdrdir = $(EXTOUT)/include/$(arch)
-VPATH = $(arch_hdrdir)/ruby:$(hdrdir)/ruby:$(srcdir):$(srcdir)/enc:$(srcdir)/missing
+RIDATADIR = $(DESTDIR)$(datadir)/ri/$(MAJOR).$(MINOR)/system
empty =
OUTFLAG = @OUTFLAG@$(empty)
-COUTFLAG = @COUTFLAG@$(empty)
-ARCH_FLAG = @ARCH_FLAG@
-CFLAGS = @CFLAGS@
+CFLAGS = @CFLAGS@ @XCFLAGS@ @ARCH_FLAG@
cflags = @cflags@
optflags = @optflags@
debugflags = @debugflags@
-warnflags = @warnflags@
-XCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir) -I$(srcdir) @XCFLAGS@
-CPPFLAGS = @CPPFLAGS@
+CPPFLAGS = -I. -I$(srcdir) @CPPFLAGS@
LDFLAGS = @STATIC@ $(CFLAGS) @LDFLAGS@
EXTLDFLAGS =
XLDFLAGS = @XLDFLAGS@ $(EXTLDFLAGS)
@@ -58,15 +46,11 @@ EXTLIBS =
LIBS = @LIBS@ $(EXTLIBS)
MISSING = @LIBOBJS@ @ALLOCA@
LDSHARED = @LIBRUBY_LDSHARED@
-DLDFLAGS = @LIBRUBY_DLDFLAGS@ $(EXTLDFLAGS) $(ARCH_FLAG)
+DLDFLAGS = @LIBRUBY_DLDFLAGS@ $(EXTLDFLAGS) @ARCH_FLAG@
SOLIBS = @SOLIBS@
MAINLIBS = @MAINLIBS@
-ARCHMINIOBJS = @MINIOBJS@
-BUILTIN_ENCOBJS = @BUILTIN_ENCOBJS@
-BUILTIN_TRANSSRCS = @BUILTIN_TRANSSRCS@
-BUILTIN_TRANSOBJS = @BUILTIN_TRANSOBJS@
+MINIOBJS = @MINIOBJS@
-RUBY_BASE_NAME=@RUBY_BASE_NAME@
RUBY_INSTALL_NAME=@RUBY_INSTALL_NAME@
RUBY_SO_NAME=@RUBY_SO_NAME@
EXEEXT = @EXEEXT@
@@ -89,43 +73,23 @@ LIBRUBYARG = @LIBRUBYARG@
LIBRUBYARG_STATIC = @LIBRUBYARG_STATIC@
LIBRUBYARG_SHARED = @LIBRUBYARG_SHARED@
-THREAD_MODEL = @THREAD_MODEL@
-
PREP = @PREP@
ARCHFILE = @ARCHFILE@
SETUP =
EXTSTATIC = @EXTSTATIC@
-SET_LC_MESSAGES = env LC_MESSAGES=C
-MAKEDIRS = @MKDIR_P@
-CP = cp
-MV = mv
RM = rm -f
-RMDIRS = @RMDIRS@
-RMALL = @RMALL@
NM = @NM@
AR = @AR@
ARFLAGS = rcu
RANLIB = @RANLIB@
AS = @AS@
ASFLAGS = @ASFLAGS@
-IFCHANGE = $(srcdir)/tool/ifchange
-SET_LC_MESSAGES = env LC_MESSAGES=C
-OBJDUMP = @OBJDUMP@
-OBJCOPY = @OBJCOPY@
-VCS = @VCS@
-VCSUP = @VCSUP@
OBJEXT = @OBJEXT@
-ASMEXT = S
-DLEXT = @DLEXT@
MANTYPE = @MANTYPE@
INSTALLED_LIST= .installed.list
-
-MKMAIN_CMD = mkmain.sh
-
-SRC_FILE = $<
#### End of variables
all:
@@ -136,8 +100,8 @@ all:
.NOEXPORT:
miniruby$(EXEEXT):
- @-if test -f $@; then $(MV) -f $@ $@.old; $(RM) $@.old; fi
- $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(MAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) $(ARCHFILE) $(LIBS) $(OUTFLAG)$@
+ @$(RM) $@
+ $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(MAINOBJ) $(MINIOBJS) $(LIBRUBY_A) $(LIBS) $(OUTFLAG)$@
$(PROGRAM):
@$(RM) $@
@@ -154,18 +118,30 @@ $(LIBRUBY_A):
$(LIBRUBY_SO):
@-$(PRE_LIBRUBY_UPDATE)
$(LDSHARED) $(DLDFLAGS) $(OBJS) $(DLDOBJS) $(SOLIBS) $(OUTFLAG)$@
- -$(OBJCOPY) -w -L '@EXPORT_PREFIX@Init_*' $@
@-$(MINIRUBY) -e 'ARGV.each{|link| File.delete link if File.exist? link; \
File.symlink "$(LIBRUBY_SO)", link}' \
$(LIBRUBY_ALIASES) || true
-fake: $(arch)-fake.rb
-$(arch)-fake.rb: config.status
- @./config.status --file=$@:$(srcdir)/template/fake.rb.in
-
-Makefile: $(srcdir)/Makefile.in $(srcdir)/enc/Makefile.in
-
-$(MKFILES): config.status
+fake.rb: Makefile
+ @echo ' \
+ class Object; \
+ CROSS_COMPILING = RUBY_PLATFORM; \
+ remove_const :RUBY_PLATFORM; \
+ remove_const :RUBY_VERSION; \
+ RUBY_PLATFORM = "@arch@"; \
+ RUBY_VERSION = "@MAJOR@.@MINOR@.@TEENY@"; \
+ end; \
+ if RUBY_PLATFORM =~ /mswin|bccwin|mingw/; \
+ class File; \
+ remove_const :ALT_SEPARATOR; \
+ ALT_SEPARATOR = "\\"; \
+ end; \
+ end; \
+ ' > $@
+
+Makefile: $(srcdir)/Makefile.in
+
+$(MKFILES): config.status $(srcdir)/common.mk
MAKE=$(MAKE) $(SHELL) ./config.status
@{ \
echo "all:; -@rm -f conftest.mk"; \
@@ -175,132 +151,52 @@ $(MKFILES): config.status
$(MAKE) -f conftest.mk | grep '^AUTO_REMAKE$$' >/dev/null 2>&1 || \
{ echo "Makefile updated, restart."; exit 1; }
-uncommon.mk: $(srcdir)/common.mk
- sed 's/{\$$([^(){}]*)[^{}]*}//g' $< > $@
-
-config.status: $(srcdir)/configure $(srcdir)/enc/Makefile.in
- PWD= MINIRUBY="$(MINIRUBY)" $(SHELL) ./config.status --recheck
+config.status: $(srcdir)/configure
+ MINIRUBY="$(MINIRUBY)" $(SHELL) ./config.status --recheck
$(srcdir)/configure: $(srcdir)/configure.in
- $(CHDIR) $(srcdir) && exec $(AUTOCONF)
-
-incs: id.h
-
-# Things which should be considered:
-# * with gperf v.s. without gperf
-# * ./configure v.s. ../ruby/configure
-# * GNU make v.s. HP-UX make # HP-UX make invokes the action if lex.c and keywords has same mtime.
-# * svn checkout generate a file with mtime as current time
-# * XFS has a mtime with fractional part
-lex.c: defs/keywords
- @\
- if cmp -s $(srcdir)/defs/lex.c.src $?; then \
- set -x; \
- $(CP) $(srcdir)/lex.c.blt $@; \
- else \
- set -x; \
- gperf -C -p -j1 -i 1 -g -o -t -N rb_reserved_word -k1,3,$$ $? > $@.tmp && \
- $(MV) $@.tmp $@ && \
- $(CP) $? $(srcdir)/defs/lex.c.src && \
- $(CP) $@ $(srcdir)/lex.c.blt; \
- fi
-
-NAME2CTYPE_OPTIONS = -7 -c -j1 -i1 -t -C -P -T -H uniname2ctype_hash -Q uniname2ctype_pool -N uniname2ctype_p
+ cd $(srcdir) && $(AUTOCONF)
-enc/unicode/name2ctype.h: enc/unicode/name2ctype.kwd
- $(MAKEDIRS) $(@D)
- @set +e; \
- if cmp -s $(?:.kwd=.src) $?; then \
- set -x; \
- $(CP) $(?:.kwd=.h.blt) $@; \
+lex.c: keywords
+ ( gperf -C -p -j1 -i 1 -g -o -t -N rb_reserved_word -k1,3,$$ $? > $@.tmp && mv $@.tmp $@ ) || \
+ if test -f $@; then \
+ touch $@ && echo $@ touched.; \
else \
- trap '$(RM) $@-1.h $@-2.h' 0 && \
- set -x; \
- sed '/^#ifdef USE_UNICODE_PROPERTIES/,/^#endif/d' $? | gperf $(NAME2CTYPE_OPTIONS) > $@-1.h && \
- gperf $(NAME2CTYPE_OPTIONS) < $? > $@-2.h && \
- diff -DUSE_UNICODE_PROPERTIES $@-1.h $@-2.h > $@.tmp || :; \
- $(MV) $@.tmp $@ && \
- $(CP) $? $(?:.kwd=.src) && \
- $(CP) $@ $(?:.kwd=.h.blt); \
+ cp $(srcdir)/lex.c $@ && echo $@ copied.; \
fi
+.y.c:
+ $(YACC) $<
+ sed '/^#/s|y\.tab\.c|$@|' y.tab.c > $@
+ rm -f y.tab.c
+
.c.@OBJEXT@:
- $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $<
+ $(CC) $(CFLAGS) $(CPPFLAGS) -c $<
.s.@OBJEXT@:
$(AS) $(ASFLAGS) -o $@ $<
-.c.S:
- $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -S $<
-
-.c.i:
- $(CPP) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -E $< > $@
-
clean-local::
- @$(RM) ext/extinit.c ext/extinit.$(OBJEXT) ext/ripper/y.output
+ @$(RM) ext/extinit.c ext/extinit.$(OBJEXT)
distclean-local::
- @$(RM) ext/config.cache $(RBCONFIG) Doxyfile
- @-$(RM) run.gdb
- @-$(RM) $(INSTALLED_LIST) $(arch_hdrdir)/ruby/config.h
- @-$(RMDIRS) $(arch_hdrdir)/ruby
-
-distclean-rdoc:
- @$(RMALL) $(RDOCOUT:/=\)
-
-clean-ext distclean-ext realclean-ext::
- @set dummy ${EXTS}; shift; \
- if test "$$#" = 0; then \
- set dummy `find ext -name Makefile | sed 's:^ext/::;s:/Makefile$$::' | sort`; \
- shift; \
- fi; \
- for dir; do \
- [ -f "ext/$$dir/Makefile" ] || continue; \
- echo $(@:-ext=)ing "$$dir"; \
- (cd "ext/$$dir" && exec $(MAKE) $(MFLAGS) $(@:-ext=)) && \
- case "$@" in \
- *distclean-ext*|*realclean-ext*) \
- $(RMDIRS) "ext/$$dir";; \
- esac; \
- done
-
-distclean-ext realclean-ext::
- @-rmdir ext 2> /dev/null || true
+ @$(RM) ext/config.cache $(RBCONFIG)
ext/extinit.$(OBJEXT): ext/extinit.c $(SETUP)
- $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c
-
-up::
- @$(CHDIR) "$(srcdir)" && LC_TIME=C exec $(VCSUP)
-
-update-mspec:
- @$(CHDIR) $(srcdir); \
- if [ -d spec/mspec ]; then \
- cd spec/mspec; \
- echo updating mspec ...; \
- exec git pull; \
+ $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(OUTFLAG)$@ -c ext/extinit.c
+
+update-rubyspec:
+ if [ -d $(srcdir)/rubyspec ]; then \
+ cd $(srcdir)/rubyspec/mspec; \
+ git pull; \
+ cd ../spec/rubyspec; \
+ git pull; \
else \
- echo retrieving mspec ...; \
- exec git clone $(MSPEC_GIT_URL) spec/mspec; \
- fi
-
-update-rubyspec: update-mspec
- @$(CHDIR) $(srcdir); \
- if [ -d spec/rubyspec ]; then \
- cd spec/rubyspec; \
- echo updating rubyspec ...; \
- exec git pull; \
- else \
- echo retrieving rubyspec ...; \
- exec git clone $(RUBYSPEC_GIT_URL) spec/rubyspec; \
+ git clone $(MSPEC_GIT_URL) $(srcdir)/rubyspec/mspec; \
+ git clone $(RUBYSPEC_GIT_URL) $(srcdir)/rubyspec/spec/rubyspec; \
fi
test-rubyspec:
- @if [ ! -d $(srcdir)/spec/rubyspec ]; then echo No rubyspec here. make update-rubyspec first.; exit 1; fi
- $(RUNRUBY) $(srcdir)/spec/mspec/bin/mspec -B $(srcdir)/spec/default.mspec $(MSPECOPT)
-
-INSNS = opt_sc.inc optinsn.inc optunifs.inc insns.inc insns_info.inc \
- vmtc.inc vm.inc
+ @if [ ! -d $(srcdir)/rubyspec ]; then echo No rubyspec here. make update-rubyspec first.; exit 1; fi
+ $(RUNRUBY) $(srcdir)/rubyspec/mspec/bin/mspec -r$(srcdir)/ext/purelib.rb $(srcdir)/rubyspec/spec/rubyspec/$(MAJOR).$(MINOR)
-$(INSNS): $(srcdir)/insns.def vm_opts.h $(srcdir)/defs/opt_operand.def $(srcdir)/defs/opt_insn_unif.def
- $(BASERUBY) -Ks $(srcdir)/tool/insns2vm.rb $(INSNS2VMOPT) $@
diff --git a/NEWS b/NEWS
index 492177e05f..61373187e5 100644
--- a/NEWS
+++ b/NEWS
@@ -7,243 +7,623 @@ Note that each entry is kept so brief that no reason behind or
reference information is supplied with. For a full list of changes
with all sufficient information, see the ChangeLog file.
-== Changes since the 1.9.1 release
+== Changes since the 1.8.6 release
+
+=== Configuration changes
+
+* vendor_ruby directory
+
+ A new library directory named `vendor_ruby' is introduced in
+ addition to `site_ruby'. The idea is to separate libraries
+ installed by the package system (`vendor') from manually (`site')
+ installed libraries preventing the former from getting overwritten
+ by the latter, while preserving the user option to override vendor
+ libraries with site libraries. (`site_ruby' takes precedence over
+ `vendor_ruby')
+
+ If you are a package maintainer, make each library package configure
+ the library passing the `--vendor' option to `extconf.rb' so that
+ the library files will get installed under `vendor_ruby'.
+
+ You can change the directory locations using configure options such
+ as `--with-sitedir=DIR' and `--with-vendordir=DIR'.
+
+=== Global constants
+
+* new constants
+
+ * RUBY_COPYRIGHT
+ * RUBY_DESCRIPTION
+
=== Library updates (outstanding ones only)
+* new library
+
+ * securerandom
+
* builtin classes
- * Array
- * new method:
- * Array#sort_by!
-
- * Dir
- * new method:
- * Dir.home
-
- * Enumerator
- * new methods:
- * Enumerator#peek
- * Enumerator#next_values
- * Enumerator#peek_values
- * Enumerator#feed
- * StopIteration#result
-
- * extended methods:
- * #with_index accepts an optional argument that specifies the
- index number to start with, defaulted to 0.
-
- * incompatible changes:
- * #rewind now calls the "rewind" method of the enclosed object
- if defined.
- * #next doesn't clear the position at end.
-
- * IO
- * new method:
- * IO#fdatasync
-
- * extended methods:
- * IO.pipe can take a block.
-
- * new modules:
- * IO::WaitReadable
- * IO::WaitWritable
- They are used to extend non-blocking exceptions.
-
- * Process
- * extended methods:
- * Process.spawn accepts [:child, FD] for a redirect target.
-
- * String
- * extended methods:
- * string[regexp, name] is supported for named capture.
-
- * Time
- * extended feature:
- * time_t restriction is removed to represent before 1901 and after 2038.
- Proleptic Gregorian calendar is used for old dates.
- * Time.new have optional arguments to specify date with time offset.
- * Time#getlocal, Time#localtime have optional time offset argument.
-
- * new method:
- * Time#to_r
-
- * incompatible changes:
- * The year argument of Time.{utc,gm,local,mktime} is now interpreted as
- the value itself. For example, Time.utc(99) means the year 99 AD,
- not 1999 AD.
-
- * Kernel
- * extended methods:
- * respond_to? can be used to detect methods not implemented.
- For example, Process.respond_to?(:fork) returns false on Windows.
+ * Array#flatten
+ * Array#flatten!
-* rss
+ Takes an optional argument that determines the level of recursion
+ to flatten.
+
+ * Array#eql?
+ * Array#hash
+ * Array#==
+ * Array#<=>
+
+ Handle recursive data properly.
+
+ * Array#index
+ * Array#rindex
+
+ Take a block instead of an argument.
+
+ * Array#collect!
+ * Array#map!
+ * Array#each
+ * Array#each_index
+ * Array#reverse_each
+ * Array#reject
+ * Array#reject!
+ * Array#delete_if
+
+ Return an enumerator if no block is given.
+
+ Note that #map and #collect still return an array unlike Ruby 1.9
+ to keep compatibility.
+
+ * Array#pop
+ * Array#shift
+
+ Take an optional argument specifying the number of elements to
+ remove.
+
+ * Array#choice
+ * Array#combination
+ * Array#cycle
+ * Array#drop
+ * Array#drop_while
+ * Array#permutation
+ * Array#product
+ * Array#shuffle
+ * Array#shuffle!
+ * Array#take,
+ * Array#take_while
+
+ New methods.
+
+ * Binding#eval
+
+ New method.
+
+ * Dir#each
+ * Dir#foreach
+
+ Return an enumerator if no block is given.
+
+ * Enumerable::Enumerator
+
+ New class for various enumeration defined by the enumerator library.
+
+ * Enumerable#each_slice
+ * Enumerable#each_cons
+ * Object#to_enum
+ * Object#enum_for
+
+ New methods for various enumeration defined by the enumerator library.
+
+ * Enumerable#count
+ * Enumerable#cycle
+ * Enumerable#drop
+ * Enumerable#drop_while
+ * Enumerable#find_index
+ * Enumerable#first
+ * Enumerable#group_by
+ * Enumerable#max_by
+ * Enumerable#min_by
+ * Enumerable#minmax
+ * Enumerable#minmax_by
+ * Enumerable#none?
+ * Enumerable#one?
+ * Enumerable#take
+ * Enumerable#take_while
+
+ New methods.
+
+ * Enumerable#find
+ * Enumerable#find_all
+ * Enumerable#partition
+ * Enumerable#reject
+ * Enumerable#select
+ * Enumerable#sort_by
+
+ Return an enumerator if no block is given.
+
+ Note that #map and #collect still return an array unlike Ruby 1.9
+ to keep compatibility.
+
+ * Enumerable#inject
+
+ Accepts a binary operator instead of a block.
+
+ * Enumerable#reduce
+
+ New alias to #inject.
+
+ * Hash#eql?
+ * Hash#hash
+ * Hash#==
+
+ Handle recursive data properly.
+
+ * Hash#delete_if
+ * Hash#each
+ * Hash#each_key
+ * Hash#each_pair
+ * Hash#each_value
+ * Hash#reject!
+ * Hash#select
+ * ENV.delete_if
+ * ENV.each
+ * ENV.each_key
+ * ENV.each_pair
+ * ENV.each_value
+ * ENV.reject!
+ * ENV.select
+
+ Return an enumerator if no block is given.
+
+ * GC.stress
+ * GC.stress=
+
+ New methods.
+
+ * Integer#ord
+ * Integer#odd?
+ * Integer#even?
+ * Integer#pred
+
+ New methods.
- * 0.2.4 -> 0.2.7.
+ * Integer#downto
+ * Integer#times
+ * Integer#upto
- * RSS::Maker.make
- * raise an exception not returns nil for invalid feed making.
- * requires block.
+ Return an enumerator if no block is given.
- * RSS::Maker.[]
- * new method to return maker class.
+ * IO#each
+ * IO#each_line
+ * IO#each_byte
+ * IO.foreach
+ * ARGF.each
+ * ARGF.each_line
+ * ARGF.each_byte
- * RSS::Maker.supported?(version)
- * new method to check whether given version is supported.
+ Return an enumerator if no block is given.
- * RSS::Maker: item.guid.permanent_link?
- * new alias of item.guid.isPermaLink
- * RSS::Maker: item.guid.permanent_link=
- * new alias of item.guid.isPermaLink=
+ * IO#bytes
+ * IO#chars
+ * IO#each_char
+ * IO#getbyte
+ * IO#lines
+ * IO#readbyte
+ * ARGF.bytes
+ * ARGF.chars
+ * ARGF.each_char
+ * ARGF.getbyte
+ * ARGF.lines
+ * ARGF.readbyte
-* REXML
+ New methods.
- * REXML::Document.entity_expansion_limit=
+ * Method#name
+ * Method#owner
+ * Method#receiver
+ * UnboundMethod#name
+ * UnboundMethod#owner
- New method to set the entity expansion limit. By default the limit is
- set to 10000. See the following URL for details.
+ New methods.
- http://www.ruby-lang.org/en/news/2008/08/23/dos-vulnerability-in-rexml/
+ * Module#class_exec
+ * Module#module_exec
-* logger
+ New methods.
- * imported upstream version (logger/1.2.7)
- * do not raise an exception even if log writing failed.
- * do not raise ShiftingError if an aged file already exists.
- (no ShiftingError will be raised from 1.2.7, just warn() instead)
+ * Numeric#step
-* open3
- * new methods:
- * Open3.popen2
- * Open3.popen2e
- * Open3.capture3
- * Open3.capture2
- * Open3.capture2e
- * Open3.pipeline_rw
- * Open3.pipeline_r
- * Open3.pipeline_w
- * Open3.pipeline_start
- * Open3.pipeline
+ Return an enumerator if no block is given.
-* pty
- * new method:
- * PTY.open
+ * Object#instance_exec
+ * Object#tap
+
+ New methods.
+
+ * ObjectSpace.each_object
+
+ Return an enumerator if no block is given.
+
+ * Process.exec implemented.
+
+ * Range#each
+ * Range#step
+
+ Return an enumerator if no block is given.
+
+ * Regexp.union accepts an array of patterns.
+
+ * String#bytesize
+
+ New method, returning the size in bytes. (alias length and size)
+
+ * String#chars
+ * String#each_char
+ * String#partition
+ * String#rpartition
+ * String#start_with?
+ * String#end_with?
+
+ New methods. These are $KCODE aware unlike #index, #rindex and
+ #include?.
+
+ * String#each_byte
+ * String#each
+ * String#each_line
+ * String#gsub(pattern)
+
+ Return an enumerator if no block is given.
+
+ * String#upto
+
+ An optional second argument is added to specify if the last value
+ should be included.
+
+ * StopIteration
+
+ New exception class that causes Kernel#loop to stop iteration when
+ raised.
+
+ * Struct#each
+ * Struct#each_pair
+
+ Return an enumerator if no block is given.
+
+ * Symbol#to_proc
+
+ New method.
+
+ * __method__
+
+ New global function that returns the name of the current method as
+ a Symbol.
+
+* enumerator
+
+ * Enumerator is now a built-in module. The #next and #rewind
+ methods are implemented using the "generator" library. Use with
+ care and be aware of the performance loss.
+
+* ipaddr
+
+ * New methods
+ * IPAddr#<=>
+ * IPAddr#succ
+
+ IPAddr objects are now comparable and enumerable having these
+ methods. This also means that it is possible to have a Range
+ object between two IPAddr objects.
+
+ * IPAddr#to_range
+
+ A new method to create a Range object for the (network) address.
+
+ * Type coercion support
+ * IPAddr#&
+ * IPAddr#|
+ * IPAddr#==
+ * IPAddr#include?
+
+ These methods now accept a string or an integer instead of an
+ IPAddr object as the argument.
+
+* net/smtp
+
+ * Support SSL/TLS.
* openssl
- * new methods:
- * OpenSSL::Buffering#read_nonblock
- * OpenSSL::Buffering#write_nonblock
- * OpenSSL::SSL::SSLSocket#connect_nonblock
- * OpenSSL::SSL::SSLSocket#accept_nonblock
-
-* socket
-
- * incompatible changes:
- * Socket#{recvfrom,recvfrom_nonblock,accept,accept_nonblock,sysaccept}
- returns a sender address as Addrinfo object instead of a binary sockaddr string.
- Addrinfo#to_s returns the old binary sockaddr string.
- * BasicSocket#getsockopt returns Socket::Option object instead of a binary string.
- Socket::Option#to_s returns the old binary string.
-
- * new class:
- * Addrinfo
- * Socket::Option
- * Socket::AncillaryData
-
- * new methods:
- * Socket.ip_address_list
- * Socket.tcp
- * Socket.tcp_server_loop
- * Socket.tcp_server_sockets
- * Socket.udp_server_sockets
- * Socket.udp_server_loop_on
- * Socket.udp_server_loop
- * Socket.unix
- * Socket.unix_server_loop
- * Socket.unix_server_socket
- * Socket.accept_loop
- * Socket#ipv6only!
- * BasicSocket#local_address
- * BasicSocket#remote_address
- * BasicSocket#connect_address
- * BasicSocket#sendmsg
- * BasicSocket#sendmsg_nonblock
- * BasicSocket#recvmsg
- * BasicSocket#recvmsg_nonblock
- * BasicSocket#getpeereid
-
- * extended methods:
- * Socket.new's 3rd argument is optional now.
- * Socket.pair's 3rd argument is optional now.
- * Socket.pair and UNIXSocket.pair can take a block.
- * BasicSocket#send, UDPSocket#send, Socket.getnameinfo, Socket#bind, and
- Socket#{connect,connect_nonblock} accepts an Addrinfo object as sockaddr.
- * BasicSocket#getsockopt accepts a Socket::Option object.
-
- * constant names can be accepted as well as constant values.
- i.e. Socket.new(:PF_INET, :SOCK_STREAM, 0)
- The constant names can be specified without the prefix.
- i.e. Socket.new(:INET, :STREAM, 0)
- * protocol/address family
- * socket type
- * socket option protocol level
- * socket option name
- * shutdown's argument
-
-* pathname
- * new methods:
- * Pathname#binread
- * Pathname#realdirpath
- * Pathname#each_child
-
-* Readline
- * new methods:
- * Readline.set_screen_size
- * Readline.get_screen_size
-
- * extended methods:
- * Readline.completion_proc= accepts nil.
- nil means to use default completion proc.
-
-* time
- * incompatible changes:
- * Time.parse raises ArgumentError when no date information.
-
-* securerandom
- * new methods:
- * SecureRandom.urlsafe_base64
-
-* etc
- * new methods:
- * Etc::Passwd.each
- * Etc::Group.each
-
-* zlib
- * new methods:
- * Zlib::GzipFile#path
-
-=== Compilation options
-
-* --program-prefix and --program-suffix no longer act on the shared object
- names nor paths to libraries.
-
- use --with-rubylibprefix='${libruby}/${RUBY_INSTALL_NAME}' and
- --with-soname='${RUBY_INSTALL_NAME}' for the same result as Ruby 1.9.1.
+
+ * New classes
+ * OpenSSL::PKey::EC
+ * OpenSSL::PKey::EC::Group
+ * OpenSSL::PKey::EC::Point
+ * OpenSSL::PKey::PKCS5
+ * OpenSSL::SSL::Session
+
+ * Documentation!
+
+ * Various new methods (see documentation).
+
+ * Remove redundant module namespace in Cipher, Digest, PKCS7, PKCS12.
+ Compatibility classes are provided which will be removed in Ruby 1.9.
+
+* shellwords
+
+ * Add methods for escaping shell-unsafe characters:
+ * Shellwords.join
+ * Shellwords.escape
+ * Array#shelljoin
+ * String#shellescape
+
+ * Add shorthand methods:
+ * Shellwords.split (alias shellwords)
+ * String#shellsplit
+
+* stringio
+
+ * StringIO#getbyte
+ * StringIO#readbyte
+
+ New methods. (aliases for compatibility with 1.9)
+
+ * StringIO#each_char
+ * StringIO#chars
+
+ New methods.
+
+ * StringIO#each
+ * StringIO#each_line
+ * StringIO#each_byte
+
+ Return an enumerator if no block is given.
+
+* tempfile
+
+ * Tempfile.open and Tempfile.new now accept a suffix for the
+ temporary file to be created. To specify a suffix, pass an array
+ of [basename, suffix] as the first argument.
+
+ Tempfile.open(['image', 'jpg']) { |tempfile| ... }
+
+* tmpdir
+
+ * New method:
+
+ * Dir.mktmpdir
+
+* uri
+
+ * added LDAPS scheme.
+ * Change for RFC3986:
+ * FTP
+ * URI('ftp://example.com/foo').path #=> 'foo'
+ * URI('ftp://example.com/%2Ffoo').path #=> '/foo'
+ * URI::FTP.build([nil, 'example.com', nil, '/foo', 'i').to_s #=> 'ftp://example.com/%2Ffoo;type=i'
+ * URI merge
+ * URI('http://a/b/c/d;p?q').merge('?y') == URI('http://a/b/c/d;p?y')
+ * URI('http://a/b/c/d;p?q').merge('/./g') == URI('http://a/g')
+ * URI('http://a/b/c/d;p?q').merge('/../g') == URI('http://a/g')
+ * URI('http://a/b/c/d;p?q').merge('../../../g') == URI('http://a/g')
+ * URI('http://a/b/c/d;p?q').merge('../../../../g') == URI('http://a/g')
+
+* rss
+
+ * 0.1.6 -> 0.2.4
+
+ * Fix image module URI
+
+ * Atom support
+
+ * ITunes module support
+
+ * Slash module support
+
+ * content:encoded with RSS 2.0 support
+
+=== Interpreter Implementation
+
+* passing a block to a Proc [experimental]
+
+ This implementation in current shape is known to be buggy/broken,
+ especially with nested block invocation. Take this as an
+ experimental feature.
+
+* stack trace
+
+ On non-SystemStackError exception, full stack trace is shown.
+
+=== Compatibility issues (excluding feature bug fixes)
+
+* String#slice! had some unintentional bugs and they have been fixed
+ because either they disagreed with documentation or their respective
+ behavior of #slice. Unfortunately, this causes some
+ incompatibilities in the following (somewhat rare) cases.
+
+ * #slice! no longer expands the array when an out-of-boundary value
+ is given.
+
+ # Ruby 1.8.6
+ a = [1,2]
+ a.slice!(4,0) #=> nil
+ a #=> [1,2,nil,nil]
+
+ # Ruby 1.8.7
+ a = [1,2]
+ a.slice!(4,0) #=> nil
+ a #=> [1,2]
+
+ * #slice! no longer raises an exception but returns nil when a
+ negative length or out-of-boundary negative position is given.
+
+ # Ruby 1.8.6
+ a = [1,2]
+ a.slice!(1,-1) #=> (raises IndexError)
+ a.slice!(-5,1) #=> (raises IndexError)
+
+ # Ruby 1.8.7
+ a = [1,2]
+ a.slice!(1,-1) #=> nil
+ a.slice!(-5,1) #=> nil
+
+* String#to_i, String#hex and String#oct no longer accept a sequence
+ of underscores (`__') as part of a number.
+
+ # Ruby 1.8.6
+ '1__0'.to_i #=> 10
+ '1__0'.to_i(2) #=> 2 # 0b10
+ '1__0'.oct #=> 8 # 010
+ '1__0'.hex #=> 16 # 0x10
+
+ # Ruby 1.8.7
+ '1__0'.to_i #=> 1
+ '1__0'.to_i(2) #=> 1
+ '1__0'.oct #=> 1
+ '1__0'.hex #=> 1
+
+ The old behavior was inconsistent with Ruby syntax and considered as
+ a bug.
+
+* date
+
+ * Date.parse
+
+ '##.##.##' (where each '#' is a digit) is now taken as 'YY.MM.DD'
+ instead of 'MM.DD.YY'. While the change may confuse you, you can
+ always use Date.strptime() when you know what you are dealing
+ with.
+
+* stringio
+
+ * StringIO#each_byte
+
+ The return value changed from nil to self. This is what the
+ document says and the same as each_line() does.
+
+* tempfile
+
+ * The file name format has changed. No dots are included by default
+ in temporary file names any more. See above for how to specify a
+ suffix.
+
+* uri
+
+ * See above for details.
+
+== Changes since the 1.8.5 release
+
+=== New platforms/build tools support
+
+* IA64 HP-UX
+
+* Visual C++ 8 SP1
+
+* autoconf 2.6x
+
+=== Global constants
+
+* RUBY_PATCHLEVEL
+
+ New constant since 1.8.5-p1.
+
+=== Library updates (outstanding ones only)
+
+* builtin classes
+
+ * New method: Kernel#instance_variable_defined?
+
+ * New method: Module#class_variable_defined?
+
+ * New feature: Dir::glob() can now take an array of glob patterns.
+
+* date
+
+ * Updated based on date2 4.0.3.
+
+* digest
+
+ * New internal APIs for C and Ruby.
+
+ * Support for autoloading.
+
+ require 'digest'
+
+ # autoloads digest/md5
+ md = Digest::MD5.digest("string")
+
+ * New digest class methods: file
+
+ * New digest instance methods: clone, reset, new, inspect,
+ digest_length (alias size or length), block_length()
+
+ * New library: digest/bubblebabble
+
+ * New function: Digest(name)
+
+* fileutils
+
+ * New option for FileUtils.cp_r(): :remove_destination
+
+* nkf
+
+ * Updated based on nkf as of 2007-01-28.
+
+* thread
+
+ * Replaced with much faster mutex implementation in C. The former
+ implementation, which is slow but considered to be stable, is
+ available with a configure option `--disable-fastthread'.
+
+* tk
+
+ * Updated Tile extension support based on Tile 0.7.8.
+
+ * Support --without-X11 configure option for non-X11 versions of
+ Tcl/Tk (e.g. Tcl/Tk Aqua).
+
+ * New sample script: irbtkw.rbw -- IRB on Ruby/Tk. It has no trouble
+ about STDIN blocking on Windows.
+
+* webrick
+
+ * New method: WEBrick::Cookie.parse_set_cookies()
=== Compatibility issues (excluding feature bug fixes)
- * Enumerator#rewind
- * Socket#recvfrom
- * Socket#recvfrom_nonblock
- * Socket#accept
- * Socket#accept_nonblock
- * Socket#sysaccept
- * BasicSocket#getsockopt
- * Time.utc
- * Time.gm
- * Time.local
- * Time.mktime
- * Time.parse
- * --program-prefix and --program-suffix
-
- See above.
+* builtin classes
+
+ * String#intern now raises SecurityError when $SAFE level is greater
+ than zero.
+
+* date
+
+ * Time#to_date and Time#to_datetime are added as private methods.
+ They cause name conflict error in ActiveSupport 1.4.1 and prior,
+ which comes with Rails 1.2.2 and prior. Updating ActiveSupport
+ and/or Rails to the latest versions fixes the problem.
+
+* digest
+
+ * The constructor does no longer take an initial string to feed.
+ The following examples show how to migrate:
+
+ # Before
+ md = Digest::MD5.new("string")
+ # After (works with any version)
+ md = Digest::MD5.new.update("string")
+
+ # Before
+ hd = Digest::MD5.new("string").hexdigest
+ # After (works with any version)
+ hd = Digest::MD5.hexdigest("string")
+
+* fileutils
+
+ * A minor implementation change breaks Rake <=0.7.1.
+ Updating Rake to 0.7.2 or higher fixes the problem.
+
+* tk
+
+ * Tk::X_Scrollable (Y_Scrollable) is renamed to Tk::XScrollable
+ (YScrollable). Tk::X_Scrollable (Y_Scrollable) is still available,
+ but it is an alias name.
diff --git a/README b/README
index 7e8370ec59..1b79781367 100644
--- a/README
+++ b/README
@@ -16,9 +16,8 @@ Perl). It is simple, straight-forward, and extensible.
+ Iterators and Closures
+ Garbage Collection
+ Dynamic Loading of Object files(on some architecture)
- + Highly Portable (works on many Unix-like/POSIX compatible platforms
- as well as Windows, Mac OS X, BeOS etc.)
- cf. http://redmine.ruby-lang.org/wiki/ruby-19/SupportedPlatforms
+ + Highly Portable(works on many UNIX machines, and on DOS,
+ Windows, Mac, BeOS etc.)
* How to get Ruby
@@ -27,6 +26,11 @@ The Ruby distribution files can be found in the following FTP site:
ftp://ftp.ruby-lang.org/pub/ruby/
+The latest source code of this version series can be checked out
+through SVN with the following command:
+
+ $ svn co http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8/
+
The trunk of the Ruby source tree can be checked out with the
following command:
diff --git a/README.EXT b/README.EXT
index da0f6148f1..637b19d25b 100644
--- a/README.EXT
+++ b/README.EXT
@@ -31,12 +31,10 @@ The Ruby interpreter has the following data types:
T_STRING string
T_REGEXP regular expression
T_ARRAY array
+ T_FIXNUM Fixnum(31bit integer)
T_HASH associative array
T_STRUCT (Ruby) structure
T_BIGNUM multi precision integer
- T_FIXNUM Fixnum(31bit or 63bit integer)
- T_COMPLEX complex number
- T_RATIONAL rational number
T_FILE IO
T_TRUE true
T_FALSE false
@@ -48,8 +46,9 @@ In addition, there are several other types used internally:
T_ICLASS
T_MATCH
T_UNDEF
+ T_VARMAP
+ T_SCOPE
T_NODE
- T_ZOMBIE
Most of the types are represented by C structures.
@@ -79,8 +78,7 @@ There is the data-type check function
void Check_Type(VALUE value, int type)
-which raises an exception if the VALUE does not have the type
-specified.
+which raises an exception if the VALUE does not have the type specified.
There are also faster check macros for fixnums and nil.
@@ -94,44 +92,37 @@ respectively. They are singletons for the data type.
The T_FIXNUM data is a 31bit length fixed integer (63bit length on
some machines), which can be converted to a C integer by using the
-FIX2INT() macro or FIX2LONG(). Though you have to check that the
-data is really FIXNUM before using them, they are faster. FIX2LONG()
-never raises exceptions, but FIX2INT() raises RangeError if the
-result is bigger or smaller than the size of int.
-There are also NUM2INT() and NUM2LONG() which converts any Ruby
-numbers into C integers. These macros includes a type check,
-so an exception will be raised if the conversion failed. NUM2DBL()
-can be used to retrieve the double float value in the same way.
-
-You can use the macros
+FIX2INT() macro. There is also NUM2INT() which converts any Ruby
+numbers into C integers. The NUM2INT() macro includes a type check, so
+an exception will be raised if the conversion failed. NUM2DBL() can
+be used to retrieve the double float value in the same way.
+
+In version 1.7 or later it is recommended that you use the new macros
StringValue() and StringValuePtr() to get a char* from a VALUE.
StringValue(var) replaces var's value with the result of "var.to_str()".
StringValuePtr(var) does same replacement and returns char*
-representation of var. These macros will skip the replacement if var
-is a String. Notice that the macros take only the lvalue as their
+representation of var. These macros will skip the replacement if var is
+a String. Notice that the macros take only the lvalue as their
argument, to change the value of var in place.
-You can also use the macro named StringValueCStr(). This is just
-like StringValuePtr(), but always add nul character at the end of
-the result. If the result contains nul character, this macro causes
-the ArgumentError exception.
-StringValuePtr() doesn't gurantee to exist nul at the end of the
-result, and the result may contain nul.
+In version 1.6 or earlier, STR2CSTR() was used to do the same thing
+but now it is deprecated in version 1.7, because STR2CSTR() has a risk
+of a dangling pointer problem in the to_str() impliclit conversion.
Other data types have corresponding C structures, e.g. struct RArray
-for T_ARRAY etc. The VALUE of the type which has the corresponding
-structure can be cast to retrieve the pointer to the struct. The
-casting macro will be of the form RXXXX for each data type; for
-instance, RARRAY(obj). See "ruby.h".
+for T_ARRAY etc. The VALUE of the type which has the corresponding structure
+can be cast to retrieve the pointer to the struct. The casting macro
+will be of the form RXXXX for each data type; for instance, RARRAY(obj).
+See "ruby.h".
-There are some accessing macros for structure members, for example
-`RSTRING_LEN(str)' to get the size of the Ruby String object. The
-allocated region can be accessed by `RSTRING_PTR(str)'. For arrays,
-use `RARRAY_LEN(ary)' and `RARRAY_PTR(ary)' respectively.
+For example, `RSTRING(str)->len' is the way to get the size of the
+Ruby String object. The allocated region can be accessed by
+`RSTRING(str)->ptr'. For arrays, use `RARRAY(ary)->len' and
+`RARRAY(ary)->ptr' respectively.
Notice: Do not change the value of the structure directly, unless you
-are responsible for the result. This ends up being the cause of
-interesting bugs.
+are responsible for the result. This ends up being the cause of interesting
+bugs.
1.4 Convert C data into VALUE
@@ -161,10 +152,9 @@ range, but is a bit slower.
1.5 Manipulating Ruby data
-As I already mentioned, it is not recommended to modify an object's
-internal structure. To manipulate objects, use the functions supplied
-by the Ruby interpreter. Some (not all) of the useful functions are
-listed below:
+As I already mentioned, it is not recommended to modify an object's internal
+structure. To manipulate objects, use the functions supplied by the Ruby
+interpreter. Some (not all) of the useful functions are listed below:
String functions
@@ -173,7 +163,6 @@ listed below:
Creates a new Ruby string.
rb_str_new2(const char *ptr)
- rb_str_new_cstr(const char *ptr)
Creates a new Ruby string from a C string. This is equivalent to
rb_str_new(ptr, strlen(ptr)).
@@ -184,41 +173,13 @@ listed below:
sources should be tainted.
rb_tainted_str_new2(const char *ptr)
- rb_tainted_str_new_cstr(const char *ptr)
Creates a new tainted Ruby string from a C string.
- rb_sprintf(const char *format, ...)
- rb_vsprintf(const char *format, va_list ap)
-
- Creates a new Ruby string with printf(3) format.
-
rb_str_cat(VALUE str, const char *ptr, long len)
Appends len bytes of data from ptr to the Ruby string.
- rb_str_cat2(VALUE str, const char* ptr)
-
- Appends C string ptr to Ruby string str. This function is
- equivalent to rb_str_cat(str, ptr, strlen(ptr)).
-
- rb_str_catf(VALUE str, const char* format, ...)
- rb_str_vcatf(VALUE str, const char* format, va_list ap)
-
- Appends C string format and successive arguments to Ruby string
- str according to a printf-like format. These functions are
- equivalent to rb_str_cat2(str, rb_sprintf(format, ...)) and
- rb_str_cat2(str, rb_vsprintf(format, ap)), respectively.
-
- rb_enc_str_new(const char *ptr, long len, rb_encoding *enc)
-
- Creates a new Ruby string with the specified encoding.
-
- rb_usascii_str_new(const char *ptr, long len)
- rb_usascii_str_new_cstr(const char *ptr)
-
- Creates a new Ruby string with encoding US-ASCII.
-
Array functions
rb_ary_new()
@@ -238,35 +199,17 @@ listed below:
Creates an n-element array from a C array.
- rb_ary_to_ary(VALUE obj)
-
- Converts the object into an array.
- Equivalent to Object#to_ary.
-
- There are many functions to operate an array.
- They may dump core if other types are given.
-
- rb_ary_aref(argc, VALUE *argv, VALUE ary)
-
- Equivaelent to Array#[].
-
- rb_ary_entry(VALUE ary, long offset)
-
- ary[offset]
-
- rb_ary_subseq(VALUE ary, long beg, long len)
-
- ary[beg, len]
-
rb_ary_push(VALUE ary, VALUE val)
rb_ary_pop(VALUE ary)
rb_ary_shift(VALUE ary)
rb_ary_unshift(VALUE ary, VALUE val)
+ Array operations. The first argument to each functions must be an
+ array. They may dump core if other types are given.
2. Extending Ruby with C
-2.1 Adding new features to Ruby
+2.1 Addding new features to Ruby
You can add new features (classes, methods, etc.) to the Ruby
interpreter. Ruby provides APIs for defining the following things:
@@ -321,23 +264,15 @@ will be called like:
where obj is the receiver, and args is the Ruby array containing
actual arguments.
-There are some more functions to define methods. One takes an ID
-as the name of method to be defined. See 2.2.2 for IDs.
-
- void rb_define_method_id(VALUE klass, ID name,
- VALUE (*func)(ANYARGS), int argc)
-
-There are two functions to define private/protected methods:
+There are two more functions to define methods. One is to define
+private methods:
void rb_define_private_method(VALUE klass, const char *name,
VALUE (*func)(), int argc)
- void rb_define_protected_method(VALUE klass, const char *name,
- VALUE (*func)(), int argc)
-At last, rb_define_module_funcion defines a module functions,
-which are private AND singleton methods of the module.
-For example, sqrt is the module function defined in Math module.
-It can be called in the following way:
+The other is to define module functions, which are private AND singleton
+methods of the module. For example, sqrt is the module function
+defined in Math module. It can be called in the following way:
Math.sqrt(4)
@@ -360,10 +295,6 @@ To define an alias for the method,
void rb_define_alias(VALUE module, const char* new, const char* old);
-To define an reader/writer to an attribute,
-
- void rb_define_attr(VALUE klass, const char *name, int read, int write)
-
To define and undefine the `allocate' class method,
void rb_define_alloc_func(VALUE klass, VALUE (*func)(VALUE klass));
@@ -397,26 +328,14 @@ evaluate the string as Ruby program. This function will do the job:
Evaluation is done under the current context, thus current local variables
of the innermost method (which is defined by Ruby) can be accessed.
-Note that the evaluation can raise an exception. There is a safer
-function:
-
- VALUE rb_eval_string_protect(const char *str, int *state)
-
-It returns nil when an error occur. And *state is zero if str was
-successfully evaluated, or nonzero otherwise.
-
-
2.2.2 ID or Symbol
-You can invoke methods directly, without parsing the string. First I
-need to explain about ID. ID is the integer number to represent
-Ruby's identifiers such as variable names. The Ruby data type
-corresponding to ID is Symbol. It can be accessed from Ruby in the
-form:
+You can invoke methods directly, without parsing the string. First I need
+to explain about ID. ID is the integer number to represent Ruby's
+identifiers such as variable names. The Ruby data type corresponding to ID
+is Symbol. It can be accessed from Ruby in the form:
:Identifier
-or
- :"any kind of string"
You can get the ID value from a string within C code by using
@@ -447,8 +366,8 @@ specified by the symbol mid.
2.2.4 Accessing the variables and constants
You can access class variables and instance variables using access
-functions. Also, global variables can be shared between both
-environments. There's no way to access Ruby's local variables.
+functions. Also, global variables can be shared between both environments.
+There's no way to access Ruby's local variables.
The functions to access/modify instance variables are below:
@@ -497,30 +416,23 @@ function below.
You can defined hooked variables. The accessor functions (getter and
setter) are called on access to the hooked variables.
- void rb_define_hooked_variable(const char *name, VALUE *var,
+ void rb_define_hooked_variable(constchar *name, VALUE *var,
VALUE (*getter)(), void (*setter)())
If you need to supply either setter or getter, just supply 0 for the
hook you don't need. If both hooks are 0, rb_define_hooked_variable()
works just like rb_define_variable().
-The prototypes of the getter and setter functions are as follows:
-
- VALUE (*getter)(ID id, VALUE *var);
- void (*setter)(VALUE val, ID id, VALUE *var);
-
-
-Also you can define a Ruby global variable without a corresponding C
-variable. The value of the variable will be set/get only by hooks.
-
void rb_define_virtual_variable(const char *name,
VALUE (*getter)(), void (*setter)())
-The prototypes of the getter and setter functions are as follows:
+This function defines a Ruby global variable without a corresponding C
+variable. The value of the variable will be set/get only by hooks.
- VALUE (*getter)(ID id);
- void (*setter)(VALUE val, ID id);
+The prototypes of the getter and setter functions are as follows:
+ (*getter)(ID id, void *data, struct global_entry* entry);
+ (*setter)(VALUE val, ID id, void *data, struct global_entry* entry);
3.3 Encapsulate C data into a Ruby object
@@ -536,10 +448,6 @@ function to free the pointer allocation. If this is -1, the pointer
will be just freed. The functions mark and free will be called from
garbage collector.
-These mark / free functions are invoked during GC execution. No
-object allocations are allowed during it, so do not allocate ruby
-objects inside them.
-
You can allocate and wrap the structure in one step.
Data_Make_Struct(klass, type, mark, free, sval)
@@ -593,8 +501,7 @@ the library.
Here's the example of an initializing function.
--
-void
-Init_dbm(void)
+Init_dbm()
{
/* define DBM class */
cDBM = rb_define_class("DBM", rb_cObject);
@@ -628,8 +535,8 @@ struct dbmdata {
obj = Data_Make_Struct(klass, struct dbmdata, 0, free_dbm, dbmp);
--
-This code wraps the dbmdata structure into a Ruby object. We avoid
-wrapping DBM* directly, because we want to cache size information.
+This code wraps the dbmdata structure into a Ruby object. We avoid wrapping
+DBM* directly, because we want to cache size information.
To retrieve the dbmdata structure from a Ruby object, we define the
following macro:
@@ -649,7 +556,8 @@ methods with a fixed number of arguments receive arguments like this:
--
static VALUE
-fdbm_delete(VALUE obj, VALUE keystr)
+fdbm_delete(obj, keystr)
+ VALUE obj, keystr;
{
:
}
@@ -663,7 +571,10 @@ arguments like this:
--
static VALUE
-fdbm_s_open(int argc, VALUE *argv, VALUE klass)
+fdbm_s_open(argc, argv, klass)
+ int argc;
+ VALUE *argv;
+ VALUE klass;
{
:
if (rb_scan_args(argc, argv, "11", &file, &vmode) == 1) {
@@ -678,17 +589,16 @@ argument is the C array of the method arguments, and the third
argument is the receiver of the method.
You can use the function rb_scan_args() to check and retrieve the
-arguments. The third argument is a string that specifies how to
-capture method arguments and assign them to the following VALUE
-references.
-
+arguments. For example, "11" means that the method requires at least one
+argument, and at most receives two arguments.
-The following is an example of a method that takes arguments by Ruby's
-array:
+Methods with an arbitrary number of arguments can receive arguments
+by Ruby's array, like this:
--
static VALUE
-thread_initialize(VALUE thread, VALUE args)
+fdbm_indexes(obj, args)
+ VALUE obj, args;
{
:
}
@@ -786,121 +696,53 @@ Appendix A. Ruby source files overview
ruby language core
- class.c : classes and modules
- error.c : exception classes and exception mechanism
- gc.c : memory management
- load.c : library loading
- object.c : objects
- variable.c : variables and constants
-
-ruby syntax parser
- parse.y
- -> parse.c : automatically generated
- keywords : reserved keywords
- -> lex.c : automatically generated
-
-ruby evaluator (a.k.a. YARV)
- blockinlining.c
- compile.c
+ class.c
+ error.c
eval.c
- eval_error.c
- eval_jump.c
- eval_safe.c
- insns.def : definition of VM instructions
- iseq.c : implementation of VM::ISeq
- thread.c : thread management and context swiching
- thread_win32.c : thread implementation
- thread_pthread.c : ditto
- vm.c
- vm_dump.c
- vm_eval.c
- vm_exec.c
- vm_insnhelper.c
- vm_method.c
-
- opt_insns_unif.def : instruction unification
- opt_operand.def : definitions for optimization
-
- -> insn*.inc : automatically generated
- -> opt*.inc : automatically generated
- -> vm.inc : automatically generated
-
-regular expression engine (oniguruma)
- regex.c
- regcomp.c
- regenc.c
- regerror.c
- regexec.c
- regparse.c
- regsyntax.c
+ gc.c
+ object.c
+ parse.y
+ variable.c
utility functions
- debug.c : debug symbols for C debuggger
- dln.c : dynamic loading
- st.c : general purpose hash table
- strftime.c : formatting times
- util.c : misc utilities
+ dln.c
+ regex.c
+ st.c
+ util.c
ruby interpreter implementation
dmyext.c
- dmydln.c
- dmyencoding.c
- id.c
inits.c
main.c
ruby.c
version.c
- gem_prelude.rb
- prelude.rb
-
-
class library
- array.c : Array
- bignum.c : Bignum
- compar.c : Comparable
- complex.c : Complex
- cont.c : Fiber, Continuation
- dir.c : Dir
- enum.c : Enumerable
- enumerator.c : Enumerator
- file.c : File
- hash.c : Hash
- io.c : IO
- marshal.c : Marshal
- math.c : Math
- numeric.c : Numeric, Integer, Fixnum, Float
- pack.c : Array#pack, String#unpack
- proc.c : Binding, Proc
- process.c : Process
- random.c : random number
- range.c : Range
- rational.c : Rational
- re.c : Regexp, MatchData
- signal.c : Signal
- sprintf.c :
- string.c : String
- struct.c : Struct
- time.c : Time
-
- defs/knwon_errors.def : Errno::* exception classes
- -> known_errors.inc : automatically generated
-
-multilingualization
- encoding.c : Encoding
- transcode.c : Encoding::Converter
- enc/*.c : encoding classes
- enc/trans/* : codepoint mapping tables
-
-goruby interpreter implementation
-
- goruby.c
- golf_prelude.rb : goruby specific libraries.
- -> golf_prelude.c : automatically generated
-
+ array.c
+ bignum.c
+ compar.c
+ dir.c
+ enum.c
+ file.c
+ hash.c
+ io.c
+ marshal.c
+ math.c
+ numeric.c
+ pack.c
+ prec.c
+ process.c
+ random.c
+ range.c
+ re.c
+ signal.c
+ sprintf.c
+ string.c
+ struct.c
+ time.c
Appendix B. Ruby extension API reference
@@ -956,17 +798,10 @@ void Check_SafeStr(VALUE value)
** Data type conversion
-FIX2INT(value), INT2FIX(i)
-FIX2LONG(value), LONG2FIX(l)
-NUM2INT(value), INT2NUM(i)
-NUM2UINT(value), UINT2NUM(ui)
-NUM2LONG(value), LONG2NUM(l)
-NUM2ULONG(value), ULONG2NUM(ul)
-NUM2LL(value), LL2NUM(ll)
-NUM2ULL(value), ULL2NUM(ull)
-NUM2OFFT(value), OFFT2NUM(off)
-NUM2SIZET(value), SIZET2NUM(size)
-NUM2SSIZET(value), SSIZET2NUM(ssize)
+FIX2INT(value)
+INT2FIX(i)
+NUM2INT(value)
+INT2NUM(i)
NUM2DBL(value)
rb_float_new(f)
StringValue(value)
@@ -1079,42 +914,11 @@ Defines a singleton method. Arguments are same as rb_define_method().
rb_scan_args(int argc, VALUE *argv, const char *fmt, ...)
-Retrieve argument from argc and argv to given VALUE references
-according to the format string. The format can be described in ABNF
-as follows:
-
---
-scan-arg-spec := param-arg-spec [block-arg-spec]
-
-param-arg-spec := pre-arg-spec [post-arg-spec] / post-arg-spec / pre-opt-post-arg-spec
-pre-arg-spec := num-of-leading-mandatory-args [num-of-optional-args]
-post-arg-spec := sym-for-variable-length-args [num-of-trailing-mandatory-args]
-pre-opt-post-arg-spec := num-of-leading-mandatory-args num-of-optional-args num-of-trailing-mandatory-args
-block-arg-spec := sym-for-block-arg
-
-num-of-leading-mandatory-args := DIGIT ; The number of leading
- ; mandatory arguments
-num-of-optional-args := DIGIT ; The number of optional
- ; arguments
-sym-for-variable-length-args := "*" ; Indicates that variable
- ; length arguments are
- ; captured as a ruby array
-num-of-trailing-mandatory-args := DIGIT ; The number of trailing
- ; mandatory arguments
-sym-for-block-arg := "&" ; Indicates that an iterator
- ; block should be captured if
- ; given
---
-
-For example, "12" means that the method requires at least one
-argument, and at most receives three (1+2) arguments. So, the format
-string must be followed by three variable references, which are to be
-assigned to captured arguments. For omitted arguments, variables are
-set to Qnil. NULL can be put in place of a variable reference, which
-means the corresponding captured argument(s) should be just dropped.
-
-The number of given arguments, excluding an iterator block, is
-returned.
+Retrieve argument from argc, argv. The fmt is the format string for
+the arguments, such as "12" for 1 non-optional argument, 2 optional
+arguments. If `*' appears at the end of fmt, it means the rest of
+the arguments are assigned to the corresponding variable, packed in
+an array.
** Invoking Ruby method
@@ -1159,23 +963,12 @@ Sets the value of the instance variable.
** Control Structure
- VALUE rb_block_call(VALUE recv, ID mid, int argc, VALUE * argv,
- VALUE (*func) (ANYARGS), VALUE data2)
-
-Calls a method on the recv, with the method name specified by the
-symbol mid, supplying func as the block. func will receive the
-value from yield as the first argument, data2 as the second, and
-argc/argv as the third/fourth arguments.
-
- [OBSOLETE] VALUE rb_iterate(VALUE (*func1)(), void *arg1, VALUE (*func2)(), void *arg2)
+ VALUE rb_iterate(VALUE (*func1)(), void *arg1, VALUE (*func2)(), void *arg2)
Calls the function func1, supplying func2 as the block. func1 will be
called with the argument arg1. func2 receives the value from yield as
the first argument, arg2 as the second argument.
-When rb_iterate is used in 1.9, func1 has to call some Ruby-level method.
-This function is obsolete since 1.9; use rb_block_call instead.
-
VALUE rb_yield(VALUE val)
Evaluates the block with value val.
@@ -1245,7 +1038,7 @@ Specifies the name of the script ($0).
** Hooks for the Interpreter Events
- void rb_add_event_hook(rb_event_hook_func_t func, rb_event_flag_t events, VALUE data)
+ void rb_add_event_hook(rb_event_hook_func_t func, rb_event_t events)
Adds a hook function for the specified interpreter events.
events should be Or'ed value of:
@@ -1262,57 +1055,13 @@ events should be Or'ed value of:
The definition of rb_event_hook_func_t is below:
- typedef void (*rb_event_hook_func_t)(rb_event_t event, VALUE data,
+ typedef void (*rb_event_hook_func_t)(rb_event_t event, NODE *node,
VALUE self, ID id, VALUE klass)
-The third argument `data' to rb_add_event_hook() is passed to the hook
-function as the second argument, which was the pointer to the current
-NODE in 1.8. See RB_EVENT_HOOKS_HAVE_CALLBACK_DATA below.
-
int rb_remove_event_hook(rb_event_hook_func_t func)
Removes the specified hook function.
-** Macros for the Compatibilities
-
-Some macros to check API compatibilities are available by default.
-
- NORETURN_STYLE_NEW
-
-Means that NORETURN macro is functional style instead of prefix.
-
- HAVE_RB_DEFINE_ALLOC_FUNC
-
-Means that function rb_define_alloc_func() is provided, that means the
-allocation framework is used. This is same as the result of
-have_func("rb_define_alloc_func", "ruby.h").
-
- HAVE_RB_REG_NEW_STR
-
-Means that function rb_reg_new_str() is provided, that creates Regexp
-object from String object. This is same as the result of
-have_func("rb_reg_new_str", "ruby.h").
-
- HAVE_RB_IO_T
-
-Means that type rb_io_t is provided.
-
- USE_SYMBOL_AS_METHOD_NAME
-
-Means that Symbols will be returned as method names, e.g.,
-Module#methods, #singleton_methods and so on.
-
- HAVE_RUBY_*_H
-
-Defined in ruby.h and means correspoinding header is available. For
-instance, when HAVE_RUBY_ST_H is defined you should use ruby/st.h not
-mere st.h.
-
- RB_EVENT_HOOKS_HAVE_CALLBACK_DATA
-
-Means that rb_add_event_hook() takes the third argument `data', to be
-passed to the given event hook function.
-
Appendix C. Functions Available in extconf.rb
These functions are available in extconf.rb:
@@ -1376,7 +1125,7 @@ this method, the compilation will not be done.
find_executable(bin, path)
Finds command in path, which is File::PATH_SEPARATOR-separated list of
-directories. If path is nil or omitted, environment variable PATH
+directories. If path is nil or omitted, environment varialbe PATH
will be used. Returns the path name of the command if it is found,
otherwise nil.
@@ -1405,7 +1154,7 @@ Returns an array of the added directories ([include_dir, lib_dir]).
pkg_config(pkg)
Obtains the information for pkg by pkg-config command. The actual
-command name can be overridden by --with-pkg-config command line
+command name can be overriden by --with-pkg-config command line
option.
/*
diff --git a/README.EXT.ja b/README.EXT.ja
index c6b5dfed9f..73425c2cdb 100644
--- a/README.EXT.ja
+++ b/README.EXT.ja
@@ -35,12 +35,10 @@ Ruby¤Ë¤Ï¥æ¡¼¥¶¤¬»È¤¦²ÄǽÀ­¤Î¤¢¤ë°Ê²¼¤Î¥¿¥¤¥×¤¬¤¢¤ê¤Þ¤¹¡¥
T_STRING ʸ»úÎó
T_REGEXP Àµµ¬É½¸½
T_ARRAY ÇÛÎó
+ T_FIXNUM Fixnum(31bitĹÀ°¿ô)
T_HASH Ï¢ÁÛÇÛÎó
T_STRUCT (Ruby¤Î)¹½Â¤ÂÎ
T_BIGNUM ¿ÇÜĹÀ°¿ô
- T_FIXNUM Fixnum(31bit¤Þ¤¿¤Ï63bitĹÀ°¿ô)
- T_COMPLEX Ê£ÁÇ¿ô
- T_RATIONAL Í­Íý¿ô
T_FILE Æþ½ÐÎÏ
T_TRUE ¿¿
T_FALSE µ¶
@@ -52,8 +50,9 @@ Ruby¤Ë¤Ï¥æ¡¼¥¶¤¬»È¤¦²ÄǽÀ­¤Î¤¢¤ë°Ê²¼¤Î¥¿¥¤¥×¤¬¤¢¤ê¤Þ¤¹¡¥
T_ICLASS
T_MATCH
T_UNDEF
+ T_VARMAP
+ T_SCOPE
T_NODE
- T_ZOMBIE
¤Û¤È¤ó¤É¤Î¥¿¥¤¥×¤ÏC¤Î¹½Â¤ÂΤǼÂÁõ¤µ¤ì¤Æ¤¤¤Þ¤¹¡¥
@@ -96,40 +95,28 @@ FIXNUM¤ÈNIL¤Ë´Ø¤·¤Æ¤Ï¤è¤ê¹â®¤ÊȽÊÌ¥Þ¥¯¥í¤¬ÍѰդµ¤ì¤Æ¤¤¤Þ¤¹¡¥
1.3 VALUE¤òC¤Î¥Ç¡¼¥¿¤ËÊÑ´¹¤¹¤ë
-¥Ç¡¼¥¿¥¿¥¤¥×¤¬T_NIL¡¤T_FALSE¡¤T_TRUE¤Ç¤¢¤ë»þ¡¤¥Ç¡¼¥¿¤Ï¤½¤ì¤¾
-¤ìnil¡¤false¡¤true¤Ç¤¹¡¥¤³¤Î¥Ç¡¼¥¿¥¿¥¤¥×¤Î¥ª¥Ö¥¸¥§¥¯¥È¤Ï¤Ò¤È
+¥Ç¡¼¥¿¥¿¥¤¥×¤¬T_NIL, T_FALSE, T_TRUE¤Ç¤¢¤ë»þ¡¤¥Ç¡¼¥¿¤Ï¤½¤ì¤¾
+¤ìnil, false, true¤Ç¤¹¡¥¤³¤Î¥Ç¡¼¥¿¥¿¥¤¥×¤Î¥ª¥Ö¥¸¥§¥¯¥È¤Ï¤Ò¤È
¤Ä¤º¤Ä¤·¤«Â¸ºß¤·¤Þ¤»¤ó¡¥
-¥Ç¡¼¥¿¥¿¥¤¥×¤¬T_FIXNUM¤Î»þ¡¤¤³¤ì¤Ï31bit¤Þ¤¿¤Ï63bit¤Î¥µ¥¤¥º¤ò
-»ý¤ÄÀ°¿ô¤Ç¤¹¡¥long¤Î¥µ¥¤¥º¤¬32bit¤Î¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ç¤¢¤ì¤Ð
-31bit¤Ë¡¤long¤Î¥µ¥¤¥º¤¬64bit¤Î¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ç¤¢¤ì¤Ð63bit
-¤Ë¤Ê¤ê¤Þ¤¹. FIXNUM ¤ò C ¤ÎÀ°¿ô¤ËÊÑ´¹¤¹¤ë¤¿¤á¤Ë¤Ï¥Þ¥¯¥í
-¡ÖFIX2INT()¡×¤Þ¤¿¤Ï¡ÖFIX2LONG()¡×¤ò»È¤¤¤Þ¤¹¡¥¤³¤ì¤é¤Î¥Þ¥¯¥í
-¤ò»ÈÍѤ¹¤ëºÝ¤Ë¤Ï»öÁ°¤Ë¥Ç¡¼¥¿¥¿¥¤¥×¤¬FIXNUM¤Ç¤¢¤ë¤³¤È¤ò³Îǧ¤¹
-¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¤¬¡¢Èæ³ÓŪ¹â®¤ËÊÑ´¹¤ò¹Ô¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡¥¤Þ
-¤¿¡¢¡ÖFIX2LONG()¡×¤ÏÎã³°¤òȯÀ¸¤·¤Þ¤»¤ó¤¬¡¢¡ÖFIX2INT()¡×¤ÏÊÑ
-´¹·ë²Ì¤¬int¤Î¥µ¥¤¥º¤Ë¼ý¤Þ¤é¤Ê¤¤¾ì¹ç¤Ë¤ÏÎã³°¤òȯÀ¸¤·¤Þ¤¹¡£
-¤½¤ì¤«¤é¡¤FIXNUM¤Ë¸Â¤é¤ºRuby¤Î¥Ç¡¼¥¿¤òÀ°¿ô¤ËÊÑ´¹¤¹¤ë
-¡ÖNUM2INT()¡×¤ª¤è¤Ó¡ÖNUM2LONG()¡×¤È¤¤¤¦¥Þ¥¯¥í¤¬¤¢¤ê¤Þ¤¹¡¥¤³
-¤ì¤é¤Î¥Þ¥¯¥í¤Ï¥Þ¥¯¥í¤Ï¥Ç¡¼¥¿¥¿¥¤¥×¤Î¥Á¥§¥Ã¥¯Ìµ¤·¤Ç»È¤¨¤Þ¤¹
-(À°¿ô¤ËÊÑ´¹¤Ç¤­¤Ê¤¤¾ì¹ç¤Ë¤ÏÎã³°¤¬È¯À¸¤¹¤ë)¡¥Æ±Íͤ˥Á¥§¥Ã¥¯Ìµ
-¤Ç»È¤¨¤ëÊÑ´¹¥Þ¥¯¥í¤Ïdouble¤ò¼è¤ê½Ð¤¹¡ÖNUM2DBL()¡×¤¬¤¢¤ê¤Þ¤¹¡¥
-
-char* ¤ò¼è¤ê½Ð¤¹¾ì¹ç¡¤ StringValue() ¤È StringValuePtr()
-¤ò»È¤¤¤Þ¤¹¡¥
-StringValue(var) ¤Ï var ¤¬ String
-¤Ç¤¢¤ì¤Ð²¿¤â¤»¤º¡¤¤½¤¦¤Ç¤Ê¤±¤ì¤Ð var ¤ò var.to_str() ¤Î·ë²Ì
-¤ËÃÖ¤­´¹¤¨¤ë¥Þ¥¯¥í¡¤StringValuePtr(var) ¤ÏƱÍÍ¤Ë var ¤ò
-String ¤ËÃÖ¤­´¹¤¨¤Æ¤«¤é var ¤Î¥Ð¥¤¥ÈÎóɽ¸½¤ËÂФ¹¤ë char* ¤ò
-ÊÖ¤¹¥Þ¥¯¥í¤Ç¤¹¡¥var ¤ÎÆâÍÆ¤òľÀÜÃÖ¤­´¹¤¨¤ë½èÍý¤¬Æþ¤ë¤Î¤Ç¡¤
-var ¤Ï lvalue ¤Ç¤¢¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡¥
-¤Þ¤¿¡¤StringValuePtr() ¤ËÎà»÷¤·¤¿ StringValueCStr() ¤È¤¤¤¦¥Þ
-¥¯¥í¤â¤¢¤ê¤Þ¤¹¡¥StringValueCStr(var) ¤Ï var ¤ò String ¤ËÃÖ¤­
-´¹¤¨¤Æ¤«¤é var ¤Îʸ»úÎóɽ¸½¤ËÂФ¹¤ë char* ¤òÊÖ¤·¤Þ¤¹¡¥ÊÖ¤µ¤ì
-¤ëʸ»úÎó¤ÎËöÈø¤Ë¤Ï nul ʸ»ú¤¬Éղ䵤ì¤Þ¤¹¡¥¤Ê¤ª¡¤ÅÓÃæ¤Ë nul
-ʸ»ú¤¬´Þ¤Þ¤ì¤ë¾ì¹ç¤Ï ArgumentError ¤¬È¯À¸¤·¤Þ¤¹¡¥
-°ìÊý¡¤StringValuePtr() ¤Ç¤Ï¡¤ËöÈø¤Ë nul ʸ»ú¤¬¤¢¤ëÊݾڤϤʤ¯¡¤
-ÅÓÃæ¤Ë nul ʸ»ú¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë²ÄǽÀ­¤â¤¢¤ê¤Þ¤¹¡¥
+¥Ç¡¼¥¿¥¿¥¤¥×¤¬T_FIXNUM¤Î»þ¡¤¤³¤ì¤Ï31bit¤Î¥µ¥¤¥º¤ò»ý¤ÄÀ°¿ô¤Ç
+¤¹¡¥FIXNUM¤òC¤ÎÀ°¿ô¤ËÊÑ´¹¤¹¤ë¤¿¤á¤Ë¤Ï¥Þ¥¯¥í¡ÖFIX2INT()¡×¤ò»È
+¤¤¤Þ¤¹¡¥¤½¤ì¤«¤é¡¤FIXNUM¤Ë¸Â¤é¤ºRuby¤Î¥Ç¡¼¥¿¤òÀ°¿ô¤ËÊÑ´¹¤¹¤ë
+¡ÖNUM2INT()¡×¤È¤¤¤¦¥Þ¥¯¥í¤¬¤¢¤ê¤Þ¤¹¡¥¤³¤Î¥Þ¥¯¥í¤Ï¥Ç¡¼¥¿¥¿¥¤
+¥×¤Î¥Á¥§¥Ã¥¯Ìµ¤·¤Ç»È¤¨¤Þ¤¹(À°¿ô¤ËÊÑ´¹¤Ç¤­¤Ê¤¤¾ì¹ç¤Ë¤ÏÎã³°¤¬
+ȯÀ¸¤¹¤ë)¡¥Æ±Íͤ˥Á¥§¥Ã¥¯Ìµ¤·¤Ç»È¤¨¤ëÊÑ´¹¥Þ¥¯¥í¤Ïdouble¤ò
+¼è¤ê½Ð¤¹¡ÖNUM2DBL()¡×¤¬¤¢¤ê¤Þ¤¹¡£
+
+char* ¤ò¼è¤ê½Ð¤¹¾ì¹ç¡¢version 1.6 °ÊÁ°¤Ç¤Ï¡ÖSTR2CSTR()¡×¤È
+¤¤¤¦¥Þ¥¯¥í¤ò»È¤Ã¤Æ¤¤¤Þ¤·¤¿¤¬¡¢¤³¤ì¤Ï to_str() ¤Ë¤è¤ë°ÅÌÛ¤Î
+·¿ÊÑ´¹·ë²Ì¤¬ GC ¤µ¤ì¤ë²ÄǽÀ­¤¬¤¢¤ë¤¿¤á¡¢version 1.7 °Ê¹ß¤Ç¤Ï
+obsolete ¤È¤Ê¤ê¡¢Âå¤ï¤ê¤Ë StringValue() ¤È StringValuePtr()
+¤ò»È¤¦»ö¤ò¿ä¾©¤·¤Æ¤¤¤Þ¤¹¡£StringValue(var) ¤Ï var ¤¬ String
+ ¤Ç¤¢¤ì¤Ð²¿¤â¤»¤º¡¢¤½¤¦¤Ç¤Ê¤±¤ì¤Ð var ¤ò var.to_str() ¤Î·ë²Ì¤Ë
+ÃÖ¤­´¹¤¨¤ë¥Þ¥¯¥í¡¢StringValuePtr(var) ¤ÏƱÍÍ¤Ë var ¤òÃÖ¤­´¹¤¨
+¤Æ¤«¤é var ¤Îʸ»úÎóɽ¸½¤ËÂФ¹¤ë char* ¤òÊÖ¤¹¥Þ¥¯¥í¤Ç¤¹¡£var ¤Î
+ÆâÍÆ¤òľÀÜÃÖ¤­´¹¤¨¤ë½èÍý¤¬Æþ¤ë¤Î¤Ç¡¢var ¤Ï lvalue ¤Ç¤¢¤ëɬÍפ¬
+¤¢¤ê¤Þ¤¹¡£
¤½¤ì°Ê³°¤Î¥Ç¡¼¥¿¥¿¥¤¥×¤ÏÂбþ¤¹¤ëC¤Î¹½Â¤ÂΤ¬¤¢¤ê¤Þ¤¹¡¥Âбþ¤¹
¤ë¹½Â¤ÂΤΤ¢¤ëVALUE¤Ï¤½¤Î¤Þ¤Þ¥­¥ã¥¹¥È(·¿ÊÑ´¹)¤¹¤ì¤Ð¹½Â¤ÂΤÎ
@@ -142,11 +129,10 @@ var ¤Ï lvalue ¤Ç¤¢¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡¥
ruby.h¤Ç¤Ï¹½Â¤ÂΤإ­¥ã¥¹¥È¤¹¤ë¥Þ¥¯¥í¤â¡ÖRXXXXX()¡×(Á´ÉôÂçʸ
»ú¤Ë¤·¤¿¤â¤Î)¤È¤¤¤¦Ì¾Á°¤ÇÄ󶡤µ¤ì¤Æ¤¤¤Þ¤¹(Îã: RSTRING())¡¥
-¹½Â¤ÂΤ«¤é¥Ç¡¼¥¿¤ò¼è¤ê½Ð¤¹¥Þ¥¯¥í¤¬Ä󶡤µ¤ì¤Æ¤¤¤Þ¤¹¡¥Ê¸»úÎó
-str¤ÎŤµ¤òÆÀ¤ë¤¿¤á¤Ë¤Ï¡ÖRSTRING_LEN(str)¡×¤È¤·¡¤Ê¸»úÎóstr¤ò
-char*¤È¤·¤ÆÆÀ¤ë¤¿¤á¤Ë¤Ï¡ÖRSTRING_PTR(str)¡×¤È¤·¤Þ¤¹¡¥ÇÛÎó¤Î
-¾ì¹ç¤Ë¤Ï¡¤¤½¤ì¤¾¤ì¡ÖRARRAY_LEN(ary)¡×¡¤¡ÖRARRAY_PTR(ary)¡×¤È
-¤Ê¤ê¤Þ¤¹¡¥
+Î㤨¤Ð¡¤Ê¸»úÎóstr¤ÎŤµ¤òÆÀ¤ë¤¿¤á¤Ë¤Ï¡ÖRSTRING(str)->len¡×¤È
+¤·¡¤Ê¸»úÎóstr¤òchar*¤È¤·¤ÆÆÀ¤ë¤¿¤á¤Ë¤Ï¡ÖRSTRING(str)->ptr¡×
+¤È¤·¤Þ¤¹¡¥ÇÛÎó¤Î¾ì¹ç¤Ë¤Ï¡¤¤½¤ì¤¾¤ì¡ÖRARRAY(ary)->len¡×¡¤
+¡ÖRARRAY(ary)->ptr¡×¤È¤Ê¤ê¤Þ¤¹¡¥
Ruby¤Î¹½Â¤ÂΤòľÀÜ¥¢¥¯¥»¥¹¤¹¤ë»þ¤Ëµ¤¤ò¤Ä¤±¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¤³
¤È¤Ï¡¤ÇÛÎó¤äʸ»úÎó¤Î¹½Â¤ÂΤÎÃæ¿È¤Ï»²¾È¤¹¤ë¤À¤±¤Ç¡¤Ä¾ÀÜÊѹ¹¤·
@@ -179,8 +165,7 @@ FIXNUM¤Ë´Ø¤·¤Æ¤ÏÊÑ´¹¥Þ¥¯¥í¤ò·Ðͳ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡¥C¤ÎÀ°¿ô
¤«¤éVALUE¤ËÊÑ´¹¤¹¤ë¥Þ¥¯¥í¤Ï°Ê²¼¤Î¤â¤Î¤¬¤¢¤ê¤Þ¤¹¡¥É¬Íפ˱þ¤¸
¤Æ»È¤¤Ê¬¤±¤Æ¤¯¤À¤µ¤¤¡¥
- INT2FIX() ¤â¤È¤ÎÀ°¿ô¤¬31bit¤Þ¤¿¤Ï63bit°ÊÆâ¤Ë¼ý¤Þ¤ë¼«¿®
- ¤¬¤¢¤ë»þ
+ INT2FIX() ¤â¤È¤ÎÀ°¿ô¤¬31bit°ÊÆâ¤Ë¼ý¤Þ¤ë¼«¿®¤¬¤¢¤ë»þ
INT2NUM() Ǥ°Õ¤ÎÀ°¿ô¤«¤éVALUE¤Ø
INT2NUM()¤ÏÀ°¿ô¤¬FIXNUM¤ÎÈϰϤ˼ý¤Þ¤é¤Ê¤¤¾ì¹ç¡¤Bignum¤ËÊÑ´¹
@@ -202,13 +187,11 @@ Ruby¤¬ÍѰդ·¤Æ¤¤¤ë´Ø¿ô¤òÍѤ¤¤Æ¤¯¤À¤µ¤¤¡¥
¿·¤·¤¤Ruby¤Îʸ»úÎó¤òÀ¸À®¤¹¤ë¡¥
rb_str_new2(const char *ptr)
- rb_str_new_cstr(const char *ptr)
C¤Îʸ»úÎ󤫤éRuby¤Îʸ»úÎó¤òÀ¸À®¤¹¤ë¡¥¤³¤Î´Ø¿ô¤Îµ¡Ç½¤Ï
rb_str_new(ptr, strlen(ptr))¤ÈƱÅù¤Ç¤¢¤ë¡¥
rb_tainted_str_new(const char *ptr, long len)
- rb_tainted_str_new_cstr(const char *ptr)
±øÀ÷¥Þ¡¼¥¯¤¬Éղ䵤줿¿·¤·¤¤Ruby¤Îʸ»úÎó¤òÀ¸À®¤¹¤ë¡¥³°Éô
¤«¤é¤Î¥Ç¡¼¥¿¤Ë´ð¤Å¤¯Ê¸»úÎó¤Ë¤Ï±øÀ÷¥Þ¡¼¥¯¤¬Éղ䵤ì¤ë¤Ù¤­
@@ -218,39 +201,10 @@ Ruby¤¬ÍѰդ·¤Æ¤¤¤ë´Ø¿ô¤òÍѤ¤¤Æ¤¯¤À¤µ¤¤¡¥
C¤Îʸ»úÎ󤫤鱸À÷¥Þ¡¼¥¯¤¬Éղ䵤줿Ruby¤Îʸ»úÎó¤òÀ¸À®¤¹¤ë¡¥
- rb_sprintf(const char *format, ...)
- rb_vsprintf(const char *format, va_list ap)
-
- C¤Îʸ»úÎóformat¤È³¤¯°ú¿ô¤òprintf(3)¤Î¥Õ¥©¡¼¥Þ¥Ã¥È¤Ë¤·¤¿¤¬¤Ã¤Æ
- À°·Á¤·¡¤Ruby¤Îʸ»úÎó¤òÀ¸À®¤¹¤ë¡¥
-
rb_str_cat(VALUE str, const char *ptr, long len)
Ruby¤Îʸ»úÎóstr¤Ëlen¥Ð¥¤¥È¤Îʸ»úÎóptr¤òÄɲ乤롥
- rb_str_cat2(VALUE str, const char* ptr)
-
- Ruby¤Îʸ»úÎóstr¤ËC¤Îʸ»úÎóptr¤òÄɲ乤롥¤³¤Î´Ø¿ô¤Îµ¡Ç½¤Ï
- rb_str_cat(str, ptr, strlen(ptr))¤ÈƱÅù¤Ç¤¢¤ë¡¥
-
- rb_str_catf(VALUE str, const char* format, ...)
- rb_str_vcatf(VALUE str, const char* format, va_list ap)
-
- C¤Îʸ»úÎóformat¤È³¤¯°ú¿ô¤òprintf(3)¤Î¥Õ¥©¡¼¥Þ¥Ã¥È¤Ë¤·¤¿¤¬¤Ã¤Æ
- À°·Á¤·¡¤Ruby¤Îʸ»úÎóstr¤ËÄɲ乤롥¤³¤Î´Ø¿ô¤Îµ¡Ç½¤Ï¡¤¤½¤ì¤¾¤ì
- rb_str_cat2(str, rb_sprintf(format, ...)) ¤ä
- rb_str_cat2(str, rb_vsprintf(format, ap)) ¤ÈƱÅù¤Ç¤¢¤ë¡¥
-
- rb_enc_str_new(const char *ptr, long len, rb_encoding *enc)
-
- »ØÄꤵ¤ì¤¿¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤ÇRuby¤Îʸ»úÎó¤òÀ¸À®¤¹¤ë.
-
- rb_usascii_str_new(const char *ptr, long len)
- rb_usascii_str_new_cstr(const char *ptr)
-
- ¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤¬US-ASCII¤ÎRuby¤Îʸ»úÎó¤òÀ¸À®¤¹¤ë.
-
-
ÇÛÎó¤ËÂФ¹¤ë´Ø¿ô
rb_ary_new()
@@ -270,32 +224,14 @@ Ruby¤¬ÍѰդ·¤Æ¤¤¤ë´Ø¿ô¤òÍѤ¤¤Æ¤¯¤À¤µ¤¤¡¥
ÇÛÎó¤ÇÍ¿¤¨¤¿nÍ×ÁǤÎÇÛÎó¤òÀ¸À®¤¹¤ë¡¥
- rb_ary_to_ary(VALUE obj)
-
- ¥ª¥Ö¥¸¥§¥¯¥È¤òÇÛÎó¤ËÊÑ´¹¤¹¤ë.
- Object#to_ary¤ÈƱÅù¤Ç¤¢¤ë.
-
- ¾¤Ë¤âÇÛÎó¤òÁàºî¤¹¤ë´Ø¿ô¤¬Â¿¿ô¤¢¤ë. ¤³¤ì¤é¤Ï
- °ú¿ôary¤ËÇÛÎó¤òÅϤµ¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤. ¤µ¤â¤Ê¤¤¤È
- ¥³¥¢¤òÅǤ¯.
-
- rb_ary_aref(argc, VALUE *argv, VALUE ary)
-
- Array#[]¤ÈƱÅù.
-
- rb_ary_entry(VALUE ary, long offset)
-
- ary[offset]
-
- rb_ary_subseq(VALUE ary, long beg, long len)
-
- ary[beg, len]
-
rb_ary_push(VALUE ary, VALUE val)
rb_ary_pop(VALUE ary)
rb_ary_shift(VALUE ary)
rb_ary_unshift(VALUE ary, VALUE val)
+ Array¤ÎƱ̾¤Î¥á¥½¥Ã¥É¤ÈƱ¤¸Æ¯¤­¤ò¤¹¤ë´Ø¿ô¡¥Âè1°ú¿ô¤Ïɬ¤º
+ ÇÛÎó¤Ç¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¡¥
+
2¡¥Ruby¤Îµ¡Ç½¤ò»È¤¦
¸¶ÍýŪ¤ËRuby¤Ç½ñ¤±¤ë¤³¤È¤ÏC¤Ç¤â½ñ¤±¤Þ¤¹¡¥Ruby¤½¤Î¤â¤Î¤¬C¤Çµ­
@@ -358,26 +294,19 @@ argc¤¬Éé¤Î»þ¤Ï°ú¿ô¤Î¿ô¤Ç¤Ï¤Ê¤¯¡¤·Á¼°¤ò»ØÄꤷ¤¿¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡¥
argc¤¬-1¤Î»þ¤Ï°ú¿ô¤òÇÛÎó¤ËÆþ¤ì¤ÆÅϤµ¤ì¤Þ¤¹¡¥argc¤¬-2¤Î»þ¤Ï°ú
¿ô¤ÏRuby¤ÎÇÛÎó¤È¤·¤ÆÅϤµ¤ì¤Þ¤¹¡¥
-¥á¥½¥Ã¥É¤òÄêµÁ¤¹¤ë´Ø¿ô¤Ï¤Þ¤À¤¤¤¯¤Ä¤«¤¢¤ê¤Þ¤¹. ¤Ò¤È¤Ä¤Ï¥á¥½¥Ã¥É
-̾¤È¤·¤ÆID¤ò¼è¤ê¤Þ¤¹. ID¤Ë¤Ä¤¤¤Æ¤Ï2.2.2¤ò»²¾È.
-
- void rb_define_method_id(VALUE klass, ID name,
- VALUE (*func)(ANYARGS), int argc)
-
-private/protected¤Ê¥á¥½¥Ã¥É¤òÄêµÁ¤¹¤ë¤Õ¤¿¤Ä¤Î´Ø¿ô¤¬¤¢¤ê¤Þ¤¹.
+¥á¥½¥Ã¥É¤òÄêµÁ¤¹¤ë´Ø¿ô¤Ï¤â¤¦Æó¤Ä¤¢¤ê¤Þ¤¹¡¥¤Ò¤È¤Ä¤Ïprivate¥á
+¥½¥Ã¥É¤òÄêµÁ¤¹¤ë´Ø¿ô¤Ç¡¤°ú¿ô¤Ïrb_define_method()¤ÈƱ¤¸¤Ç¤¹¡¥
void rb_define_private_method(VALUE klass, const char *name,
VALUE (*func)(), int argc)
- void rb_define_protected_method(VALUE klass, const char *name,
- VALUE (*func)(), int argc)
private¥á¥½¥Ã¥É¤È¤Ï´Ø¿ô·Á¼°¤Ç¤·¤«¸Æ¤Ó½Ð¤¹¤³¤È¤Î½ÐÍè¤Ê¤¤¥á¥½¥Ã
¥É¤Ç¤¹¡¥
-ºÇ¸å¤Ë¡¢ rb_define_module´Ø¿ô¤Ï¥â¥¸¥å¡¼¥ë´Ø¿ô¤òÄêµÁ¤·¤Þ¤¹¡£
-¥â¥¸¥å¡¼¥ë´Ø¿ô¤È¤Ï¥â¥¸¥å¡¼¥ë¤ÎÆÃ°Û¥á¥½¥Ã¥É¤Ç¤¢¤ê¡¤Æ±»þ¤Ë
-private¥á¥½¥Ã¥É¤Ç¤â¤¢¤ë¤â¤Î¤Ç¤¹¡¥Îã¤ò¤¢¤²¤ë¤ÈMath¥â¥¸¥å¡¼¥ë
-¤Îsqrt()¤Ê¤É¤¬¤¢¤²¤é¤ì¤Þ¤¹¡¥¤³¤Î¥á¥½¥Ã¥É¤Ï
+¤â¤¦¤Ò¤È¤Ä¤Ï¥â¥¸¥å¡¼¥ë´Ø¿ô¤òÄêµÁ¤¹¤ë¤â¤Î¤Ç¤¹¡¥¥â¥¸¥å¡¼¥ë´Ø¿ô
+¤È¤Ï¥â¥¸¥å¡¼¥ë¤ÎÆÃ°Û¥á¥½¥Ã¥É¤Ç¤¢¤ê¡¤Æ±»þ¤Ëprivate¥á¥½¥Ã¥É¤Ç
+¤â¤¢¤ë¤â¤Î¤Ç¤¹¡¥Îã¤ò¤¢¤²¤ë¤ÈMath¥â¥¸¥å¡¼¥ë¤Îsqrt()¤Ê¤É¤¬¤¢¤²
+¤é¤ì¤Þ¤¹¡¥¤³¤Î¥á¥½¥Ã¥É¤Ï
Math.sqrt(4)
@@ -398,24 +327,20 @@ private¥á¥½¥Ã¥É¤Ç¤â¤¢¤ë¤â¤Î¤Ç¤¹¡¥Îã¤ò¤¢¤²¤ë¤ÈMath¥â¥¸¥å¡¼¥ë
void rb_define_global_function(const char *name, VALUE (*func)(), int argc)
-¥á¥½¥Ã¥É¤ÎÊÌ̾¤òÄêµÁ¤¹¤ë¤¿¤á¤Î´Ø¿ô¤Ï°Ê²¼¤ÎÄ̤ê¤Ç¤¹¡¥
+¥á¥½¥Ã¥É¤ÎÊÌ̾¤òÄêµÁ¤¹¤ë¤¿¤á¤Î´Ø¿ô¤Ï°Ê²¼¤ÎÄ̤ê¤Ç¤¹¡£
void rb_define_alias(VALUE module, const char* new, const char* old);
-°À­¤Î¼èÆÀ¡¦ÀßÄê¥á¥½¥Ã¥É¤òÄêµÁ¤¹¤ë¤Ë¤Ï
-
- void rb_define_attr(VALUE klass, const char *name, int read, int write)
-
¥¯¥é¥¹¥á¥½¥Ã¥Éallocate¤òÄêµÁ¤·¤¿¤êºï½ü¤·¤¿¤ê¤¹¤ë¤¿¤á¤Î´Ø¿ô¤Ï
-°Ê²¼¤ÎÄ̤ê¤Ç¤¹¡¥
+°Ê²¼¤ÎÄ̤ê¤Ç¤¹¡£
void rb_define_alloc_func(VALUE klass, VALUE (*func)(VALUE klass));
void rb_undef_alloc_func(VALUE klass);
-func¤Ï¥¯¥é¥¹¤ò°ú¿ô¤È¤·¤Æ¼õ¤±¼è¤Ã¤Æ¡¤¿·¤·¤¯³ä¤êÅö¤Æ¤é¤ì¤¿¥¤¥ó
-¥¹¥¿¥ó¥¹¤òÊÖ¤µ¤Ê¤¯¤Æ¤Ï¤Ê¤ê¤Þ¤»¤ó¡¥¤³¤Î¥¤¥ó¥¹¥¿¥ó¥¹¤Ï¡¤³°Éô¥ê
-¥½¡¼¥¹¤Ê¤É¤ò´Þ¤Þ¤Ê¤¤¡¤¤Ç¤­¤ë¤À¤±¡Ö¶õ¡×¤Î¤Þ¤Þ¤Ë¤·¤Æ¤ª¤¤¤¿¤Û¤¦
-¤¬¤è¤¤¤Ç¤·¤ç¤¦¡¥
+func¤Ï¥¯¥é¥¹¤ò°ú¿ô¤È¤·¤Æ¼õ¤±¼è¤Ã¤Æ¡¢¿·¤·¤¯³ä¤êÅö¤Æ¤é¤ì¤¿¥¤¥ó
+¥¹¥¿¥ó¥¹¤òÊÖ¤µ¤Ê¤¯¤Æ¤Ï¤Ê¤ê¤Þ¤»¤ó¡£¤³¤Î¥¤¥ó¥¹¥¿¥ó¥¹¤Ï¡¢³°Éô¥ê
+¥½¡¼¥¹¤Ê¤É¤ò´Þ¤Þ¤Ê¤¤¡¢¤Ç¤­¤ë¤À¤±¡Ö¶õ¡×¤Î¤Þ¤Þ¤Ë¤·¤Æ¤ª¤¤¤¿¤Û¤¦
+¤¬¤è¤¤¤Ç¤·¤ç¤¦¡£
2.1.3 Äê¿ôÄêµÁ
@@ -449,26 +374,16 @@ C¤«¤éRuby¤Îµ¡Ç½¤ò¸Æ¤Ó½Ð¤¹¤â¤Ã¤È¤â´Êñ¤ÊÊýË¡¤È¤·¤Æ¡¤Ê¸»úÎó¤Ç
¤³¤Îɾ²Á¤Ï¸½ºß¤Î´Ä¶­¤Ç¹Ô¤ï¤ì¤Þ¤¹¡¥¤Ä¤Þ¤ê¡¤¸½ºß¤Î¥í¡¼¥«¥ëÊÑ¿ô
¤Ê¤É¤ò¼õ¤±·Ñ¤®¤Þ¤¹¡¥
-ɾ²Á¤ÏÎã³°¤òȯÀ¸¤¹¤ë¤«¤â¤·¤ì¤Ê¤¤¤³¤È¤ËÃí°Õ¤·¤Þ¤·¤ç¤¦. ¤è¤ê°ÂÁ´
-¤Ê´Ø¿ô¤â¤¢¤ê¤Þ¤¹.
-
- VALUE rb_eval_string_protect(const char *str, int *state)
-
-¤³¤Î´Ø¿ô¤Ï¥¨¥é¡¼¤¬È¯À¸¤¹¤ë¤Ènil¤òÊÖ¤·¤Þ¤¹¡£¤½¤·¤Æ¡¢À®¸ù»þ¤Ë¤Ï
-*state¤Ï¥¼¥í¤Ë¡¢¤µ¤â¤Ê¤¯¤ÐÈó¥¼¥í¤Ë¤Ê¤ê¤Þ¤¹¡£
-
-
2.2.2 ID¤Þ¤¿¤Ï¥·¥ó¥Ü¥ë
C¤«¤éʸ»úÎó¤ò·Ðͳ¤»¤º¤ËRuby¤Î¥á¥½¥Ã¥É¤ò¸Æ¤Ó½Ð¤¹¤³¤È¤â¤Ç¤­¤Þ
¤¹¡¥¤½¤ÎÁ°¤Ë¡¤Ruby¥¤¥ó¥¿¥×¥ê¥¿Æâ¤Ç¥á¥½¥Ã¥É¤äÊÑ¿ô̾¤ò»ØÄꤹ¤ë
»þ¤Ë»È¤ï¤ì¤Æ¤¤¤ëID¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Æ¤ª¤­¤Þ¤·¤ç¤¦¡¥
-ID¤È¤ÏÊÑ¿ô̾¡¤¥á¥½¥Ã¥É̾¤òɽ¤¹À°¿ô¤Ç¤¹¡¥Ruby¤ÎÃæ¤Ç¤Ï
+ID¤È¤ÏÊÑ¿ô̾¡¤¥á¥½¥Ã¥É̾¤òɽ¤¹À°¿ô¤Ç¤¹¡¥Ruby¤Ç¤ÏID¤ËÂбþ¤¹¤ë
+¥ª¥Ö¥¸¥§¥¯¥È¤È¤·¤Æ¥·¥ó¥Ü¥ë(Symbol)¤¬¤¢¤ê¡¤
:¼±ÊÌ»Ò
-¤Þ¤¿¤Ï
- :"Ǥ°Õ¤Îʸ»úÎó"
¤Ç¥¢¥¯¥»¥¹¤Ç¤­¤Þ¤¹¡¥C¤«¤é¤³¤ÎÀ°¿ô¤òÆÀ¤ë¤¿¤á¤Ë¤Ï´Ø¿ô
@@ -479,6 +394,14 @@ ID¤È¤ÏÊÑ¿ô̾¡¤¥á¥½¥Ã¥É̾¤òɽ¤¹À°¿ô¤Ç¤¹¡¥Ruby¤ÎÃæ¤Ç¤Ï
rb_to_id(VALUE symbol)
+ID¤«¤é¥·¥ó¥Ü¥ë¤òÆÀ¤ë¤¿¤á¤Ë¤Ï°Ê²¼¤Î¥Þ¥¯¥í¤ò»È¤¤¤Þ¤¹¡¥
+
+ VALUE ID2SYM(ID id)
+
+¥·¥ó¥Ü¥ë¤«¤éID¤òÆÀ¤ë¤¿¤á¤Ë¤Ï°Ê²¼¤Î¥Þ¥¯¥í¤ò»È¤¤¤Þ¤¹¡¥
+
+ ID SYM2ID(VALUE symbol)
+
2.2.3 C¤«¤éRuby¤Î¥á¥½¥Ã¥É¤ò¸Æ¤Ó½Ð¤¹
C¤«¤éʸ»úÎó¤ò·Ðͳ¤»¤º¤ËRuby¤Î¥á¥½¥Ã¥É¤ò¸Æ¤Ó½Ð¤¹¤¿¤á¤Ë¤Ï°Ê²¼
@@ -560,17 +483,11 @@ C¤ÈRuby¤ÇÂç°èÊÑ¿ô¤ò»È¤Ã¤Æ¾ðÊó¤ò¶¦Í­¤Ç¤­¤Þ¤¹¡¥¶¦Í­¤Ç¤­¤ëÂç°è
¤¹¡¥ÊÑ¿ô¤¬»²¾È¤µ¤ì¤¿»þ¤Ë¤Ï´Ø¿ôgetter¤¬¡¤ÊÑ¿ô¤ËÃͤ¬¥»¥Ã¥È¤µ¤ì
¤¿»þ¤Ë¤Ï´Ø¿ôsetter¤¬¸Æ¤Ð¤ì¤ë¡¥hook¤ò»ØÄꤷ¤Ê¤¤¾ì¹ç¤Ïgetter¤ä
setter¤Ë0¤ò»ØÄꤷ¤Þ¤¹¡¥
-# getter¤âsetter¤â0¤Ê¤é¤Ðrb_define_variable()¤ÈƱ¤¸¤Ë¤Ê¤ë¡¥
-
-getter¤Èsetter¤Î»ÅÍͤϼ¡¤ÎÄ̤ê¤Ç¤¹¡£
-
- VALUE (*getter)(ID id, VALUE *var);
- void (*setter)(VALUE val, ID id, VALUE *var);
+# getter¤âsetter¤â0¤Ê¤é¤Ðrb_define_variable()¤ÈƱ¤¸¤Ë¤Ê¤ë¡¥
-¤½¤ì¤«¤é¡¤Âбþ¤¹¤ëC¤ÎÊÑ¿ô¤ò»ý¤¿¤Ê¤¤Ruby¤ÎÂç°èÊÑ¿ô¤òÄêµÁ¤¹¤ë
-¤³¤È¤â¤Ç¤­¤Þ¤¹. ¤½¤ÎÊÑ¿ô¤ÎÃͤϥե寴ؿô¤Î¤ß¤Ë¤è¤Ã¤Æ¼èÆÀ¡¦ÀßÄê
-¤µ¤ì¤Þ¤¹.
+¤½¤ì¤«¤é¡¤C¤Î´Ø¿ô¤Ë¤è¤Ã¤Æ¼Â¸½¤µ¤ì¤ëRuby¤ÎÂç°èÊÑ¿ô¤òÄêµÁ¤¹¤ë
+´Ø¿ô¤¬¤¢¤ê¤Þ¤¹¡¥
void rb_define_virtual_variable(const char *name,
VALUE (*getter)(), void (*setter)())
@@ -580,8 +497,8 @@ getter¤¬¡¤ÊÑ¿ô¤ËÃͤ¬¥»¥Ã¥È¤µ¤ì¤¿»þ¤Ë¤Ïsetter¤¬¸Æ¤Ð¤ì¤Þ¤¹¡¥
getter¤Èsetter¤Î»ÅÍͤϰʲ¼¤ÎÄ̤ê¤Ç¤¹¡¥
- (*getter)(ID id);
- (*setter)(VALUE val, ID id);
+ (*getter)(ID id, void *data, struct global_entry* entry);
+ (*setter)(VALUE val, ID id, void *data, struct global_entry* entry);
3.3 C¤Î¥Ç¡¼¥¿¤òRuby¥ª¥Ö¥¸¥§¥¯¥È¤Ë¤¹¤ë
@@ -608,11 +525,6 @@ free¤Ï¤³¤Î¹½Â¤ÂΤ¬¤â¤¦ÉÔÍפˤʤä¿»þ¤Ë¸Æ¤Ð¤ì¤ë´Ø¿ô¤Ç¤¹¡¥¤³¤Î
´Ø¿ô¤¬¥¬¡¼¥Ù¡¼¥¸¥³¥ì¥¯¥¿¤«¤é¸Æ¤Ð¤ì¤Þ¤¹¡¥¤³¤ì¤¬-1¤Î¾ì¹ç¤Ï¡¤Ã±
½ã¤Ë³«Êü¤µ¤ì¤Þ¤¹¡¥
-mark¤ª¤è¤Ófree´Ø¿ô¤ÏGC¼Â¹ÔÃæ¤Ë¸Æ¤Ó½Ð¤µ¤ì¤Þ¤¹.
-¤Ê¤ª, GC¼Â¹ÔÃæ¤ÏRuby¥ª¥Ö¥¸¥§¥¯¥È¤Î¥¢¥í¥±¡¼¥·¥ç¥ó¤Ï¶Ø»ß¤µ¤ì¤Þ
-¤¹. ¤è¤Ã¤Æ, mark¤ª¤è¤Ófree´Ø¿ô¤ÇRuby¥ª¥Ö¥¸¥§¥¯¥È¤Î¥¢¥í¥±¡¼¥·
-¥ç¥ó¤Ï¹Ô¤ï¤Ê¤¤¤Ç¤¯¤À¤µ¤¤.
-
C¤Î¹½Â¤ÂΤγäÅö¤ÈData¥ª¥Ö¥¸¥§¥¯¥È¤ÎÀ¸À®¤òƱ»þ¤Ë¹Ô¤¦¥Þ¥¯¥í¤È
¤·¤Æ°Ê²¼¤Î¤â¤Î¤¬Ä󶡤µ¤ì¤Æ¤¤¤Þ¤¹¡¥
@@ -672,8 +584,7 @@ Ruby¤Ï³ÈÄ¥¥é¥¤¥Ö¥é¥ê¤ò¥í¡¼¥É¤¹¤ë»þ¤Ë¡ÖInit_¥é¥¤¥Ö¥é¥ê̾¡×¤È
ÄêµÁ¤ò¹Ô¤¤¤Þ¤¹¡¥dbm.c¤«¤é°ìÉô°úÍѤ·¤Þ¤¹¡¥
--
-void
-Init_dbm(void)
+Init_dbm()
{
/* DBM¥¯¥é¥¹¤òÄêµÁ¤¹¤ë */
cDBM = rb_define_class("DBM", rb_cObject);
@@ -735,7 +646,8 @@ fdbm_delete()¤Ï¤³¤Î¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡¥
--
static VALUE
-fdbm_delete(VALUE obj, VALUE keystr)
+fdbm_delete(obj, keystr)
+ VALUE obj, keystr;
{
:
}
@@ -751,7 +663,10 @@ fdbm_delete(VALUE obj, VALUE keystr)
--
static VALUE
-fdbm_s_open(int argc, VALUE *argv, VALUE klass)
+fdbm_s_open(argc, argv, klass)
+ int argc;
+ VALUE *argv;
+ VALUE klass;
{
:
if (rb_scan_args(argc, argv, "11", &file, &vmode) == 1) {
@@ -766,17 +681,22 @@ fdbm_s_open(int argc, VALUE *argv, VALUE klass)
¤¨¤é¤ì¤Þ¤¹¡¥
¤³¤ÎÇÛÎó¤ÇÍ¿¤¨¤é¤ì¤¿°ú¿ô¤ò²òÀϤ¹¤ë¤¿¤á¤Î´Ø¿ô¤¬open()¤Ç¤â»È¤ï
-¤ì¤Æ¤¤¤ërb_scan_args()¤Ç¤¹¡¥Âè3°ú¿ô¤Ë»ØÄꤷ¤¿¥Õ¥©¡¼¥Þ¥Ã¥È¤Ë½¾
-¤¤¡¤Âè4ÊÑ¿ô°Ê¹ß¤Ë»ØÄꤷ¤¿VALUE¤Ø¤Î»²¾È¤ËÃͤòÂåÆþ¤·¤Æ¤¯¤ì¤Þ
-¤¹¡¥
-
-
-°ú¿ô¤òRuby¤ÎÇÛÎó¤È¤·¤Æ¼õ¤±¼è¤ë¥á¥½¥Ã¥É¤ÎÎã¤Ë¤Ï
-Thread#initialize¤¬¤¢¤ê¤Þ¤¹¡¥¼ÂÁõ¤Ï¤³¤¦¤Ç¤¹¡¥
+¤ì¤Æ¤¤¤ërb_scan_args()¤Ç¤¹¡¥Âè3°ú¿ô¤Ë»ØÄꤷ¤¿¥Õ¥©¡¼¥Þ¥Ã¥È¤Ë
+½¾¤¤¡¤Âè4ÊÑ¿ô°Ê¹ß¤Ë»ØÄꤷ¤¿ÊÑ¿ô¤ËÃͤòÂåÆþ¤·¤Æ¤¯¤ì¤Þ¤¹¡¥¤³¤Î
+¥Õ¥©¡¼¥Þ¥Ã¥È¤Ï¡¤Âè1ʸ»úÌܤ¬¾Êά¤Ç¤­¤Ê¤¤°ú¿ô¤Î¿ô¡¤Âè2ʸ»úÌܤ¬
+¾Êά¤Ç¤­¤ë°ú¿ô¤Î¿ô¡¤Âè3ʸ»úÌܤ¬Âбþ¤¹¤ëÁê¼ê¤¬Ìµ¤¤¤¢¤Þ¤ê¤Î°ú
+¿ô¤¬¤¢¤ë¤«¤É¤¦¤«¤ò¼¨¤¹"*"¤Ç¤¹¡¥2ʸ»úÌܤÈ3ʸ»úÌܤϾÊά¤Ç¤­¤Þ
+¤¹¡¥dbm.c¤ÎÎã¤Ç¤Ï¡¤¥Õ¥©¡¼¥Þ¥Ã¥È¤Ï"11"¤Ç¤¹¤«¤é¡¤°ú¿ô¤ÏºÇÄã1¤Ä
+¤Ç¡¤2¤Ä¤Þ¤Çµö¤µ¤ì¤ë¤È¤¤¤¦°ÕÌ£¤Ë¤Ê¤ê¤Þ¤¹¡¥¾Êά¤µ¤ì¤Æ¤¤¤ë»þ¤Î
+ÊÑ¿ô¤ÎÃͤÏnil(C¸À¸ì¤Î¥ì¥Ù¥ë¤Ç¤ÏQnil)¤Ë¤Ê¤ê¤Þ¤¹¡¥
+
+Ruby¤ÎÇÛÎó¤Ç°ú¿ô¤ò¼õ¤±¼è¤ë¤â¤Î¤Ïindexes¤¬¤¢¤ê¤Þ¤¹¡¥¼ÂÁõ¤Ï¤³
+¤¦¤Ç¤¹¡¥
--
static VALUE
-thread_initialize(VALUE thread, VALUE args)
+fdbm_indexes(obj, args)
+ VALUE obj, args;
{
:
}
@@ -815,9 +735,9 @@ Makefile¤òºî¤ë¾ì¹ç¤Î¿÷·¿¤Ë¤Ê¤ëextconf.rb¤È¤¤¤¦¥Õ¥¡¥¤¥ë¤òºî¤ê
$LDFLAGS: ¥ê¥ó¥¯»þ¤ËÄɲÃŪ¤Ë»ØÄꤹ¤ë¥Õ¥é¥°(-L¤Ê¤É)
$objs: ¥ê¥ó¥¯¤µ¤ì¤ë¥ª¥Ö¥¸¥§¥¯¥È¥Õ¥¡¥¤¥ë̾¤Î¥ê¥¹¥È
-¥ª¥Ö¥¸¥§¥¯¥È¥Õ¥¡¥¤¥ë¤Î¥ê¥¹¥È¤Ï¡¤Ä̾ï¤Ï¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤ò¸¡º÷¤·
-¤Æ¼«Æ°Åª¤ËÀ¸À®¤µ¤ì¤Þ¤¹¤¬¡¤make¤ÎÅÓÃæ¤Ç¥½¡¼¥¹¤òÀ¸À®¤¹¤ë¤è¤¦¤Ê
-¾ì¹ç¤ÏÌÀ¼¨Åª¤Ë»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡¥
+¥ª¥Ö¥¸¥§¥¯¥È¥Õ¥¡¥¤¥ë¤Î¥ê¥¹¥È¤Ï¡¢Ä̾ï¤Ï¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤ò¸¡º÷¤·
+¤Æ¼«Æ°Åª¤ËÀ¸À®¤µ¤ì¤Þ¤¹¤¬¡¢make¤ÎÅÓÃæ¤Ç¥½¡¼¥¹¤òÀ¸À®¤¹¤ë¤è¤¦¤Ê
+¾ì¹ç¤ÏÌÀ¼¨Åª¤Ë»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
¥é¥¤¥Ö¥é¥ê¤ò¥³¥ó¥Ñ¥¤¥ë¤¹¤ë¾ò·ï¤¬Â·¤ï¤º¡¤¤½¤Î¥é¥¤¥Ö¥é¥ê¤ò¥³¥ó
¥Ñ¥¤¥ë¤·¤Ê¤¤»þ¤Ë¤Ïcreate_makefile¤ò¸Æ¤Ð¤Ê¤±¤ì¤ÐMakefile¤ÏÀ¸
@@ -845,7 +765,7 @@ Makefile¤ò¼ÂºÝ¤ËÀ¸À®¤¹¤ë¤¿¤á¤Ë¤Ï
¤È¤·¤Æ¤¯¤À¤µ¤¤¡¥
-site_ruby ¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤Ê¤¯¡¤
+site_ruby ¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤Ê¤¯¡¢
vendor_ruby ¥Ç¥£¥ì¥¯¥È¥ê¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¾ì¹ç¤Ë¤Ï
°Ê²¼¤Î¤è¤¦¤Ë --vendor ¥ª¥×¥·¥ç¥ó¤ò²Ã¤¨¤Æ¤¯¤À¤µ¤¤¡¥
@@ -893,120 +813,53 @@ Ruby¤Î¥½¡¼¥¹¤Ï¤¤¤¯¤Ä¤«¤ËʬÎह¤ë¤³¤È¤¬½ÐÍè¤Þ¤¹¡¥¤³¤Î¤¦¤Á¥¯¥é
Ruby¸À¸ì¤Î¥³¥¢
- class.c : ¥¯¥é¥¹¤È¥â¥¸¥å¡¼¥ë
- error.c : Îã³°¥¯¥é¥¹¤ÈÎã³°µ¡¹½
- gc.c : µ­²±Îΰè´ÉÍý
- load.c : ¥é¥¤¥Ö¥é¥ê¤Î¥í¡¼¥É
- object.c : ¥ª¥Ö¥¸¥§¥¯¥È
- variable.c : ÊÑ¿ô¤ÈÄê¿ô
-
-Ruby¤Î¹½Ê¸²òÀÏ´ï
- parse.y : »ú¶ç²òÀÏ´ï¤È¹½Ê¸ÄêµÁ
- -> parse.c : ¼«Æ°À¸À®
- keywords : ͽÌó¸ì
- -> lex.c : ¼«Æ°À¸À®
-
-Ruby¤Îɾ²Á´ï(Ä̾ÎYARV)
- blockinlining.c
- compile.c
+ class.c
+ error.c
eval.c
- eval_error.c
- eval_jump.c
- eval_safe.c
- insns.def : ²¾ÁÛµ¡³£¸ì¤ÎÄêµÁ
- iseq.c : VM::ISeq¤Î¼ÂÁõ
- thread.c : ¥¹¥ì¥Ã¥É´ÉÍý¤È¥³¥ó¥Æ¥­¥¹¥ÈÀÚ¤êÂØ¤¨
- thread_win32.c : ¥¹¥ì¥Ã¥É¼ÂÁõ
- thread_pthread.c : Ʊ¾å
- vm.c
- vm_dump.c
- vm_eval.c
- vm_exec.c
- vm_insnhelper.c
- vm_method.c
-
- opt_insns_unif.def : Ì¿ÎáÍ»¹ç
- opt_operand.def : ºÇŬ²½¤Î¤¿¤á¤ÎÄêµÁ
-
- -> insn*.inc : ¼«Æ°À¸À®
- -> opt*.inc : ¼«Æ°À¸À®
- -> vm.inc : ¼«Æ°À¸À®
-
-Àµµ¬É½¸½¥¨¥ó¥¸¥ó (µ´¼Ö)
- regex.c
- regcomp.c
- regenc.c
- regerror.c
- regexec.c
- regparse.c
- regsyntax.c
+ gc.c
+ object.c
+ parse.y
+ variable.c
¥æ¡¼¥Æ¥£¥ê¥Æ¥£´Ø¿ô
- debug.c : C¥Ç¥Ð¥Ã¥¬ÍѤΥǥХå°¥·¥ó¥Ü¥ë
- dln.c : ưŪ¥í¡¼¥Ç¥£¥ó¥°
- st.c : ÈÆÍѥϥå·¥åɽ
- strftime.c : »þ¹ïÀ°·Á
- util.c : ¤½¤Î¾¤Î¥æ¡¼¥Æ¥£¥ê¥Æ¥£
+ dln.c
+ regex.c
+ st.c
+ util.c
Ruby¥³¥Þ¥ó¥É¤Î¼ÂÁõ
dmyext.c
- dmydln.c
- dmyencoding.c
- id.c
inits.c
main.c
ruby.c
version.c
- gem_prelude.rb
- prelude.rb
-
¥¯¥é¥¹¥é¥¤¥Ö¥é¥ê
- array.c : Array
- bignum.c : Bignum
- compar.c : Comparable
- complex.c : Complex
- cont.c : Fiber, Continuation
- dir.c : Dir
- enum.c : Enumerable
- enumerator.c : Enumerator
- file.c : File
- hash.c : Hash
- io.c : IO
- marshal.c : Marshal
- math.c : Math
- numeric.c : Numeric, Integer, Fixnum, Float
- pack.c : Array#pack, String#unpack
- proc.c : Binding, Proc
- process.c : Process
- random.c : Íð¿ô
- range.c : Range
- rational.c : Rational
- re.c : Regexp, MatchData
- signal.c : Signal
- sprintf.c :
- string.c : String
- struct.c : Struct
- time.c : Time
-
- defs/knwon_errors.def : Îã³°¥¯¥é¥¹ Errno::*
- -> known_errors.inc : ¼«Æ°À¸À®
-
-¿¸À¸ì²½
- encoding.c : Encoding
- transcode.c : Encoding::Converter
- enc/*.c : ¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¥¯¥é¥¹·²
- enc/trans/* : ¥³¡¼¥É¥Ý¥¤¥ó¥ÈÂбþɽ
-
-goruby¥³¥Þ¥ó¥É¤Î¼ÂÁõ
-
- goruby.c
- golf_prelude.rb : goruby¸ÇÍ­¤Î¥é¥¤¥Ö¥é¥ê
- -> golf_prelude.c : ¼«Æ°À¸À®
-
+ array.c
+ bignum.c
+ compar.c
+ dir.c
+ enum.c
+ file.c
+ hash.c
+ io.c
+ marshal.c
+ math.c
+ numeric.c
+ pack.c
+ prec.c
+ process.c
+ random.c
+ range.c
+ re.c
+ signal.c
+ sprintf.c
+ string.c
+ struct.c
+ time.c
Appendix B. ³ÈÄ¥ÍÑ´Ø¿ô¥ê¥Õ¥¡¥ì¥ó¥¹
@@ -1064,17 +917,10 @@ void Check_SafeStr(VALUE value)
** ·¿ÊÑ´¹
-FIX2INT(value), INT2FIX(i)
-FIX2LONG(value), LONG2FIX(l)
-NUM2INT(value), INT2NUM(i)
-NUM2UINT(value), UINT2NUM(ui)
-NUM2LONG(value), LONG2NUM(l)
-NUM2ULONG(value), ULONG2NUM(ul)
-NUM2LL(value), LL2NUM(ll)
-NUM2ULL(value), ULL2NUM(ull)
-NUM2OFFT(value), OFFT2NUM(off)
-NUM2SIZET(value), SIZET2NUM(size)
-NUM2SSIZET(value), SSIZET2NUM(ssize)
+FIX2INT(value)
+INT2FIX(i)
+NUM2INT(value)
+INT2NUM(i)
NUM2DBL(value)
rb_float_new(f)
StringValue(value)
@@ -1178,38 +1024,13 @@ rb_define_singleton_method(VALUE klass, const char *name, VALUE (*func)(), int a
rb_scan_args(int argc, VALUE *argv, const char *fmt, ...)
- argc, argv·Á¼°¤ÇÍ¿¤¨¤é¤ì¤¿»ØÄꤵ¤ì¤¿¥Õ¥©¡¼¥Þ¥Ã¥È¤Ë½¾¤Ã¤Æ°ú
- ¿ô¤òʬ²ò¤·¡¤Â³¤¯VALUE¤Ø¤Î»²¾È¤Ë¥»¥Ã¥È¤·¤Þ¤¹¡¥¤³¤Î¥Õ¥©¡¼¥Þ¥Ã
- ¥È¤Ï¡¤ABNF¤Çµ­½Ò¤¹¤ë¤È°Ê²¼¤ÎÄ̤ê¤Ç¤¹¡¥
-
---
-scan-arg-spec := param-arg-spec [block-arg-spec]
-
-param-arg-spec := pre-arg-spec [post-arg-spec] / post-arg-spec / pre-opt-post-arg-spec
-pre-arg-spec := num-of-leading-mandatory-args [num-of-optional-args]
-post-arg-spec := sym-for-variable-length-args [num-of-trailing-mandatory-args]
-pre-opt-post-arg-spec := num-of-leading-mandatory-args num-of-optional-args num-of-trailing-mandatory-args
-block-arg-spec := sym-for-block-arg
-
-num-of-leading-mandatory-args := DIGIT ; ÀèÆ¬¤ËÃÖ¤«¤ì¤ë¾ÊάÉÔǽ¤Ê°ú¿ô¤Î¿ô
-num-of-optional-args := DIGIT ; ³¤¤¤ÆÃÖ¤«¤ì¤ë¾Êά²Äǽ¤Ê°ú¿ô¤Î¿ô
-sym-for-variable-length-args := "*" ; ³¤¤¤ÆÃÖ¤«¤ì¤ë²ÄÊÑŰú¿ô¤ò
- ; Ruby¤ÎÇÛÎó¤Ç¼èÆÀ¤¹¤ë¤¿¤á¤Î»ØÄê
-num-of-trailing-mandatory-args := DIGIT ; ½ªÃ¼¤ËÃÖ¤«¤ì¤ë¾ÊάÉÔǽ¤Ê°ú¿ô¤Î¿ô
-sym-for-block-arg := "&" ; ¥¤¥Æ¥ì¡¼¥¿¥Ö¥í¥Ã¥¯¤ò¼èÆÀ¤¹¤ë¤¿¤á¤Î
- ; »ØÄê
---
-
- ¥Õ¥©¡¼¥Þ¥Ã¥È¤¬"12"¤Î¾ì¹ç¡¤°ú¿ô¤ÏºÇÄã1¤Ä¤Ç¡¤3¤Ä(1+2)¤Þ¤Çµö¤µ
- ¤ì¤ë¤È¤¤¤¦°ÕÌ£¤Ë¤Ê¤ê¤Þ¤¹¡¥½¾¤Ã¤Æ¡¤¥Õ¥©¡¼¥Þ¥Ã¥Èʸ»úÎó¤Ë³¤¤
- ¤Æ3¤Ä¤ÎVALUE¤Ø¤Î»²¾È¤òÃÖ¤¯É¬Íפ¬¤¢¤ê¤Þ¤¹¡¥¤½¤ì¤é¤Ë¤Ï¼èÆÀ¤·¤¿
- ÊÑ¿ô¤¬¥»¥Ã¥È¤µ¤ì¤Þ¤¹¡¥ÊÑ¿ô¤Ø¤Î»²¾È¤ÎÂå¤ï¤ê¤ËNULL¤ò»ØÄꤹ¤ë
- ¤³¤È¤â¤Ç¤­¡¤¤½¤Î¾ì¹ç¤Ï¼èÆÀ¤·¤¿°ú¿ô¤ÎÃͤϼΤƤé¤ì¤Þ¤¹¡¥¤Ê¤ª¡¢
- ¾Êά²Äǽ°ú¿ô¤¬¾Êά¤µ¤ì¤¿»þ¤ÎÊÑ¿ô¤ÎÃͤÏnil(C¸À¸ì¤Î¥ì¥Ù¥ë¤Ç¤Ï
- Qnil)¤Ë¤Ê¤ê¤Þ¤¹¡¥
-
- ÊÖ¤êÃͤÏÍ¿¤¨¤é¤ì¤¿°ú¿ô¤Î¿ô¤Ç¤¹¡¥¥¤¥Æ¥ì¡¼¥¿¥Ö¥í¥Ã¥¯¤Ï¿ô¤¨¤Þ
- ¤»¤ó¡¥
+ argc, argv·Á¼°¤ÇÍ¿¤¨¤é¤ì¤¿°ú¿ô¤òʬ²ò¤¹¤ë¡¥fmt¤Ïɬ¿Ü°ú¿ô¤Î¿ô,
+ Éղðú¿ô¤Î¿ô, »Ä¤ê¤Î°ú¿ô¤¬¤¢¤ë¤«¤ò»ØÄꤹ¤ëʸ»úÎó¤Ç, "¿ô»ú
+ ¿ô»ú*"¤È¤¤¤¦·Á¼°¤Ç¤¢¤ë¡¥ 2 ÈÖÌܤοô»ú¤È"*"¤Ï¤½¤ì¤¾¤ì¾Êά²Ä
+ ǽ¤Ç¤¢¤ë¡¥É¬¿Ü°ú¿ô¤¬°ì¤Ä¤â¤Ê¤¤¾ì¹ç¤Ï0¤ò»ØÄꤹ¤ë¡¥Âè3°ú¿ô°Ê
+ ¹ß¤ÏÊÑ¿ô¤Ø¤Î¥Ý¥¤¥ó¥¿¤Ç, ³ºÅö¤¹¤ëÍ×ÁǤ¬¤½¤ÎÊÑ¿ô¤Ë³ÊǼ¤µ¤ì¤ë¡¥
+ Éղðú¿ô¤ËÂбþ¤¹¤ë°ú¿ô¤¬Í¿¤¨¤é¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤ÏÊÑ¿ô¤ËQnil¤¬
+ ÂåÆþ¤µ¤ì¤ë¡¥
** Ruby¥á¥½¥Ã¥É¸Æ¤Ó½Ð¤·
@@ -1236,12 +1057,12 @@ char *rb_id2name(ID id)
char *rb_class2name(VALUE klass)
- ¥¯¥é¥¹¤Î̾Á°¤òÊÖ¤¹(¥Ç¥Ð¥Ã¥°ÍÑ)¡¥¥¯¥é¥¹¤¬Ì¾Á°¤ò»ý¤¿¤Ê¤¤»þ¤Ë
- ¤Ï, ÁÄÀè¤òÁ̤äÆÌ¾Á°¤ò»ý¤Ä¥¯¥é¥¹¤Î̾Á°¤òÊÖ¤¹¡¥
+ ¥¯¥é¥¹¤Î̾Á°¤òÊÖ¤¹(¥Ç¥Ð¥Ã¥°ÍÑ)¡¥¥¯¥é¥¹¤¬Ì¾Á°¤ò»ý¤¿¤Ê¤¤»þ¤Ë¤Ï,
+ ÁÄÀè¤òÁ̤äÆÌ¾Á°¤ò»ý¤Ä¥¯¥é¥¹¤Î̾Á°¤òÊÖ¤¹¡¥
int rb_respond_to(VALUE obj, ID id)
- obj¤¬id¤Ç¼¨¤µ¤ì¤ë¥á¥½¥Ã¥É¤ò»ý¤Ä¤«¤É¤¦¤«¤òÊÖ¤¹¡¥
+ obj¤¬id¤Ç¼¨¤µ¤ì¤ë¥á¥½¥Ã¥É¤ò»ý¤Ä¤«¤É¤¦¤«¤òÊÖ¤¹¡£
** ¥¤¥ó¥¹¥¿¥ó¥¹ÊÑ¿ô
@@ -1258,23 +1079,12 @@ VALUE rb_iv_set(VALUE obj, const char *name, VALUE val)
** À©¸æ¹½Â¤
-VALUE rb_block_call(VALUE obj, ID mid, int argc, VALUE * argv,
- VALUE (*func) (ANYARGS), VALUE data2)
-
- func¤ò¥Ö¥í¥Ã¥¯¤È¤·¤ÆÀßÄꤷ, obj¤ò¥ì¥·¡¼¥Ð, argc¤Èargv¤ò°ú
- ¿ô¤È¤·¤Æmid¥á¥½¥Ã¥É¤ò¸Æ¤Ó½Ð¤¹. func¤ÏÂè°ì°ú¿ô¤Ëyield¤µ¤ì¤¿
- ÃÍ, ÂèÆó°ú¿ô¤Ëdata2, Âè»°, Âè»Í°ú¿ô¤Ëargc¤Èargv¤ò¼õ¤±¼è¤ë.
-
-[OBSOLETE] VALUE rb_iterate(VALUE (*func1)(), VALUE arg1, VALUE (*func2)(), VALUE arg2)
+VALUE rb_iterate(VALUE (*func1)(), VALUE arg1, VALUE (*func2)(), VALUE arg2)
func2¤ò¥Ö¥í¥Ã¥¯¤È¤·¤ÆÀßÄꤷ, func1¤ò¥¤¥Æ¥ì¡¼¥¿¤È¤·¤Æ¸Æ¤Ö¡¥
func1¤Ë¤Ï arg1¤¬°ú¿ô¤È¤·¤ÆÅϤµ¤ì, func2¤Ë¤ÏÂè1°ú¿ô¤Ë¥¤¥Æ¥ì¡¼
¥¿¤«¤éÍ¿¤¨¤é¤ì¤¿ÃÍ, Âè2°ú¿ô¤Ëarg2¤¬ÅϤµ¤ì¤ë¡¥
- 1.9¤Çrb_iterate¤ò»È¤¦¾ì¹ç¤Ï, func1¤ÎÃæ¤ÇRuby¥ì¥Ù¥ë¤Î¥á¥½¥Ã¥É
- ¤ò¸Æ¤Ó½Ð¤µ¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤.
- 1.9¤Çobsolete¤È¤Ê¤Ã¤¿. Âå¤ï¤ê¤Ërb_block_call¤¬ÍѰդµ¤ì¤¿.
-
VALUE rb_yield(VALUE val)
val¤òÃͤȤ·¤Æ¥¤¥Æ¥ì¡¼¥¿¥Ö¥í¥Ã¥¯¤ò¸Æ¤Ó½Ð¤¹¡¥
@@ -1341,77 +1151,6 @@ void ruby_script(char *name)
Ruby¤Î¥¹¥¯¥ê¥×¥È̾($0)¤òÀßÄꤹ¤ë¡¥
-** ¥¤¥ó¥¿¥×¥ê¥¿¤Î¥¤¥Ù¥ó¥È¤Î¥Õ¥Ã¥¯
-
- void rb_add_event_hook(rb_event_hook_func_t func, rb_event_flag_t events, VALUE data)
-
-»ØÄꤵ¤ì¤¿¥¤¥ó¥¿¥×¥ê¥¿¤Î¥¤¥Ù¥ó¥È¤ËÂФ¹¤ë¥Õ¥Ã¥¯´Ø¿ô¤òÄɲä·¤Þ¤¹¡¥
-events¤Ï°Ê²¼¤ÎÃͤÎor¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó:
-
- RUBY_EVENT_LINE
- RUBY_EVENT_CLASS
- RUBY_EVENT_END
- RUBY_EVENT_CALL
- RUBY_EVENT_RETURN
- RUBY_EVENT_C_CALL
- RUBY_EVENT_C_RETURN
- RUBY_EVENT_RAISE
- RUBY_EVENT_ALL
-
-rb_event_hook_func_t¤ÎÄêµÁ¤Ï°Ê²¼¤ÎÄ̤ê¤Ç¤¹:
-
- typedef void (*rb_event_hook_func_t)(rb_event_t event, VALUE data,
- VALUE self, ID id, VALUE klass)
-
-rb_add_event_hook() ¤ÎÂè3°ú¿ô data ¤Ï¡¤¥Õ¥Ã¥¯´Ø¿ô¤ÎÂè2°ú¿ô¤È
-¤·¤ÆÅϤµ¤ì¤Þ¤¹¡¥¤³¤ì¤Ï1.8¤Ç¤Ï¸½ºß¤ÎNODE¤Ø¤Î¥Ý¥¤¥ó¥¿¤Ç¤·¤¿¡¥°Ê
-²¼¤Î RB_EVENT_HOOKS_HAVE_CALLBACK_DATA ¤â»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡¥
-
- int rb_remove_event_hook(rb_event_hook_func_t func)
-
-»ØÄꤵ¤ì¤¿¥Õ¥Ã¥¯´Ø¿ô¤òºï½ü¤·¤Þ¤¹¡¥
-
-** ¸ß´¹À­¤Î¤¿¤á¤Î¥Þ¥¯¥í
-
-API¤Î¸ß´¹À­¤ò¥Á¥§¥Ã¥¯¤¹¤ë¤¿¤á¤Ë°Ê²¼¤Î¥Þ¥¯¥í¤¬¥Ç¥Õ¥©¥ë¥È¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤¹¡¥
-
-NORETURN_STYLE_NEW
-
- NORETURN ¥Þ¥¯¥í¤¬´Ø¿ô·¿¥Þ¥¯¥í¤È¤·¤ÆÄêµÁ¤µ¤ì¤Æ¤¤¤ë¤³¤È¤ò°ÕÌ£¤¹¤ë¡¥
-
-HAVE_RB_DEFINE_ALLOC_FUNC
-
- rb_define_alloc_func() ´Ø¿ô¤¬Ä󶡤µ¤ì¤Æ¤¤¤ë¤³¤È¡¢¤Ä¤Þ¤ê
- allocation framework ¤¬»È¤ï¤ì¤ë¤³¤È¤ò°ÕÌ£¤¹¤ë¡¥
- have_func("rb_define_alloc_func", "ruby.h")
- ¤Î·ë²Ì¤ÈƱ¤¸¡¥
-
-HAVE_RB_REG_NEW_STR
-
- String¥ª¥Ö¥¸¥§¥¯¥È¤«¤éRegexp¥ª¥Ö¥¸¥§¥¯¥È¤òºî¤ë
- rb_reg_new_str() ´Ø¿ô¤¬Ä󶡤µ¤ì¤Æ¤¤¤ë¤³¤È¤ò°ÕÌ£¤¹¤ë¡¥
- have_func("rb_reg_new_str", "ruby.h").
- ¤Î·ë²Ì¤ÈƱ¤¸¡¥
-
-HAVE_RB_IO_T
-
- rb_io_t ·¿¤¬Ä󶡤µ¤ì¤Æ¤¤¤ë¤³¤È¤ò°ÕÌ£¤¹¤ë¡¥
-
-USE_SYMBOL_AS_METHOD_NAME
-
- ¥á¥½¥Ã¥É̾¤òÊÖ¤¹¥á¥½¥Ã¥É¡¤Module#methods, #singleton_methods
- ¤Ê¤É¤¬Symbol¤òÊÖ¤¹¤³¤È¤ò°ÕÌ£¤¹¤ë¡¥
-
-HAVE_RUBY_*_H
-
- ruby.h ¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤ë¡¥Âбþ¤¹¤ë¥Ø¥Ã¥À¤¬Ä󶡤µ¤ì¤Æ¤¤¤ë¤³¤È
- ¤ò°ÕÌ£¤¹¤ë¡¥¤¿¤È¤¨¤Ð¡¤HAVE_RUBY_ST_H ¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï
- ñ¤Ê¤ë st.h ¤Ç¤Ï¤Ê¤¯ ruby/st.h ¤ò»ÈÍѤ¹¤ë¡¥
-
-RB_EVENT_HOOKS_HAVE_CALLBACK_DATA
-
- rb_add_event_hook() ¤¬¥Õ¥Ã¥¯´Ø¿ô¤ËÅϤ¹ data ¤òÂè3°ú¿ô¤È¤·¤Æ
- ¼õ¤±¼è¤ë¤³¤È¤ò°ÕÌ£¤¹¤ë¡¥
Appendix C. extconf.rb¤Ç»È¤¨¤ë´Ø¿ô¤¿¤Á
@@ -1436,10 +1175,10 @@ find_library(lib, func, path...)
have_func(func, header)
- ¥Ø¥Ã¥À¥Õ¥¡¥¤¥ëheader¤ò¥¤¥ó¥¯¥ë¡¼¥É¤·¤Æ´Ø¿ôfunc¤Î¸ºß¤ò¥Á¥§
- ¥Ã¥¯¤¹¤ë¡¥func¤¬É¸½à¤Ç¤Ï¥ê¥ó¥¯¤µ¤ì¤Ê¤¤¥é¥¤¥Ö¥é¥êÆâ¤Î¤â¤Î¤Ç
- ¤¢¤ë»þ¤Ë¤ÏÀè¤Ëhave_library¤Ç¤½¤Î¥é¥¤¥Ö¥é¥ê¤ò¥Á¥§¥Ã¥¯¤·¤Æ¤ª
- ¤¯»ö¡¥´Ø¿ô¤¬Â¸ºß¤¹¤ë»þtrue¤òÊÖ¤¹¡¥
+ ¥Ø¥Ã¥À¥Õ¥¡¥¤¥ëheader¤ò¥¤¥ó¥¯¥ë¡¼¥É¤·¤Æ´Ø¿ôfunc¤Î¸ºß¤ò¥Á¥§¥Ã
+ ¥¯¤¹¤ë¡¥func¤¬É¸½à¤Ç¤Ï¥ê¥ó¥¯¤µ¤ì¤Ê¤¤¥é¥¤¥Ö¥é¥êÆâ¤Î¤â¤Î¤Ç¤¢
+ ¤ë»þ¤Ë¤ÏÀè¤Ëhave_library¤Ç¤½¤Î¥é¥¤¥Ö¥é¥ê¤ò¥Á¥§¥Ã¥¯¤·¤Æ¤ª¤¯
+ »ö¡¥´Ø¿ô¤¬Â¸ºß¤¹¤ë»þtrue¤òÊÖ¤¹¡¥
have_var(var, header)
@@ -1490,8 +1229,7 @@ find_executable(command, path)
with_config(withval[, default=nil])
- ¥³¥Þ¥ó¥É¥é¥¤¥ó¾å¤Î--with-<withval>¤Ç»ØÄꤵ¤ì¤¿¥ª¥×¥·¥ç¥óÃÍ
- ¤òÆÀ¤ë¡¥
+ ¥³¥Þ¥ó¥É¥é¥¤¥ó¾å¤Î--with-<withval>¤Ç»ØÄꤵ¤ì¤¿¥ª¥×¥·¥ç¥óÃͤòÆÀ¤ë¡¥
enable_config(config, *defaults)
disable_config(config, *defaults)
@@ -1500,9 +1238,8 @@ disable_config(config, *defaults)
--disable-<config>¤Ç»ØÄꤵ¤ì¤¿¿¿µ¶ÃͤòÆÀ¤ë¡¥
--enable-<config>¤¬»ØÄꤵ¤ì¤Æ¤¤¤¿¾ì¹ç¤Ïtrue¡¤
--disable-<config>¤¬»ØÄꤵ¤ì¤Æ¤¤¤¿¾ì¹ç¤Ïfalse¤òÊÖ¤¹¡¥
- ¤É¤Á¤é¤â»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¡¤¥Ö¥í¥Ã¥¯¤Ä¤­¤Ç¸Æ¤Ó½Ð¤µ¤ì¤Æ
- ¤¤¤ë¾ì¹ç¤Ï*defaults¤òyield¤·¤¿·ë²Ì¡¤¥Ö¥í¥Ã¥¯¤Ê¤·¤Ê¤é
- *defaults¤òÊÖ¤¹¡¥
+ ¤É¤Á¤é¤â»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¡¤¥Ö¥í¥Ã¥¯¤Ä¤­¤Ç¸Æ¤Ó½Ð¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï
+ *defaults¤òyield¤·¤¿·ë²Ì¡¤¥Ö¥í¥Ã¥¯¤Ê¤·¤Ê¤é*defaults¤òÊÖ¤¹¡¥
dir_config(target[, default_dir])
dir_config(target[, default_include, default_lib])
@@ -1511,8 +1248,8 @@ dir_config(target[, default_include, default_lib])
--with-<target>-lib¤Î¤¤¤º¤ì¤«¤Ç»ØÄꤵ¤ì¤ë¥Ç¥£¥ì¥¯¥È¥ê¤ò
$CFLAGS ¤ä $LDFLAGS ¤ËÄɲ乤롥--with-<target>-dir=/path¤Ï
--with-<target>-include=/path/include --with-<target>-lib=/path/lib
- ¤ÈÅù²Á¤Ç¤¢¤ë¡¥Äɲ䵤줿 include ¥Ç¥£¥ì¥¯¥È¥ê¤È lib ¥Ç¥£¥ì
- ¥¯¥È¥ê¤ÎÇÛÎó¤òÊÖ¤¹¡¥ ([include_dir, lib_dir])
+ ¤ÈÅù²Á¤Ç¤¢¤ë¡¥Äɲ䵤줿 include ¥Ç¥£¥ì¥¯¥È¥ê¤È lib ¥Ç¥£¥ì¥¯¥È¥ê¤Î
+ ÇÛÎó¤òÊÖ¤¹¡¥ ([include_dir, lib_dir])
pkg_config(pkg)
diff --git a/README.ja b/README.ja
index 2191720a26..71ce4ee12c 100644
--- a/README.ja
+++ b/README.ja
@@ -20,9 +20,9 @@ Ruby¤Ï¥Æ¥­¥¹¥È½èÍý´Ø·¸¤ÎǽÎϤʤɤËÍ¥¤ì¡¤Perl¤ÈƱ¤¸¤¯¤é¤¤¶¯ÎÏ
+ ¥¤¥Æ¥ì¡¼¥¿¤È¥¯¥í¡¼¥¸¥ã
+ ¥¬¡¼¥Ù¡¼¥¸¥³¥ì¥¯¥¿
+ ¥À¥¤¥Ê¥ß¥Ã¥¯¥í¡¼¥Ç¥£¥ó¥° (¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Ë¤è¤ë)
- + °Ü¿¢À­¤¬¹â¤¤¡¥Â¿¤¯¤ÎUnix-like/POSIX¸ß´¹¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¾å¤Ç
- ư¤¯¤À¤±¤Ç¤Ê¤¯¡¤Windows¡¤ Mac OS X¡¤BeOS¤Ê¤É¤Î¾å¤Ç¤âư¤¯
- cf. http://redmine.ruby-lang.org/wiki/ruby-19/SupportedPlatformsJa
+ + °Ü¿¢À­¤¬¹â¤¤¡¥Â¿¤¯¤ÎUNIX¾å¤Çư¤¯¤À¤±¤Ç¤Ê¤¯¡¤DOS¤äWindows¡¤
+ Mac¡¤BeOS¤Ê¤É¤Î¾å¤Ç¤âư¤¯
+
* Æþ¼êË¡
@@ -34,6 +34,10 @@ Ruby¤Ï¥Æ¥­¥¹¥È½èÍý´Ø·¸¤ÎǽÎϤʤɤËÍ¥¤ì¡¤Perl¤ÈƱ¤¸¤¯¤é¤¤¶¯ÎÏ
** Subversion¤Ç
+ËÜ¥Ö¥é¥ó¥Á¤ÎRuby¤ÎºÇ¿·¤Î¥½¡¼¥¹¥³¡¼¥É¤Ï¼¡¤Î¥³¥Þ¥ó¥É¤Ç¼èÆÀ¤Ç¤­¤Þ¤¹¡¥
+
+ $ svn co http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8/
+
³«È¯Àèü¤Î¥½¡¼¥¹¥³¡¼¥É¤Ï¼¡¤Î¥³¥Þ¥ó¥É¤Ç¼èÆÀ¤Ç¤­¤Þ¤¹¡¥
$ svn co http://svn.ruby-lang.org/repos/ruby/trunk/ ruby
@@ -130,14 +134,15 @@ UNIX¤Ç¤¢¤ì¤Ðconfigure¤¬¤Û¤È¤ó¤É¤Îº¹°Û¤òµÛ¼ý¤·¤Æ¤¯¤ì¤ë¤Ï¤º¤Ç
¤³¤È¤ò¥ì¥Ý¡¼¥È¤¹¤ì¤Ð¡¤²ò·è¤Ç¤­¤ë¤«¤âÃΤì¤Þ¤»¤ó¡¥
¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Ë¤â¤Ã¤È¤â°Í¸¤¹¤ë¤Î¤ÏGCÉô¤Ç¤¹¡¥Ruby¤ÎGC¤ÏÂоÝ
-¤Î¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤¬setjmp()¤Þ¤¿¤Ïgetcontext()¤Ë¤è¤Ã¤ÆÁ´¤Æ¤Î¥ì
-¥¸¥¹¥¿¤òjmp_buf¤äucontext_t¤Ë³ÊǼ¤¹¤ë¤³¤È¤È¡¤jmp_buf¤ä
-ucontext_t¤È¥¹¥¿¥Ã¥¯¤¬32bit¥¢¥é¥¤¥ó¥á¥ó¥È¤µ¤ì¤Æ¤¤¤ë¤³¤È¤ò²¾Äê
-¤·¤Æ¤¤¤Þ¤¹¡¥ÆÃ¤ËÁ°¼Ô¤¬À®Î©¤·¤Ê¤¤¾ì¹ç¤ÎÂбþ¤ÏÈó¾ï¤Ëº¤Æñ¤Ç¤·¤ç
-¤¦¡¥¸å¼Ô¤Î²ò·è¤ÏÈæ³ÓŪ´Êñ¤Ç¡¤gc.c¤Ç¥¹¥¿¥Ã¥¯¤ò¥Þ¡¼¥¯¤·¤Æ¤¤¤ë
-Éôʬ¤Ë¥¢¥é¥¤¥ó¥á¥ó¥È¤Î¥Ð¥¤¥È¿ô¤À¤±¤º¤é¤·¤Æ¥Þ¡¼¥¯¤¹¤ë¥³¡¼¥É¤ò
-Äɲ乤ë¤À¤±¤ÇºÑ¤ß¤Þ¤¹¡¥¡Ödefined(__mc68000__)¡×¤Ç³ç¤é¤ì¤Æ¤¤
-¤ëÉôʬ¤ò»²¹Í¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡¥
+¤Î¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤¬setjmp()¤Ë¤è¤Ã¤ÆÁ´¤Æ¤Î¥ì¥¸¥¹¥¿¤ò jmp_buf¤Ë
+³ÊǼ¤¹¤ë¤³¤È¤È¡¤jmp_buf¤È¥¹¥¿¥Ã¥¯¤¬32bit¥¢¥é¥¤¥ó¥á¥ó¥È¤µ¤ì¤Æ
+¤¤¤ë¤³¤È¤ò²¾Äꤷ¤Æ¤¤¤Þ¤¹¡¥ÆÃ¤ËÁ°¼Ô¤¬À®Î©¤·¤Ê¤¤¾ì¹ç¤ÎÂбþ¤ÏÈó
+¾ï¤Ëº¤Æñ¤Ç¤·¤ç¤¦¡¥¸å¼Ô¤Î²ò·è¤ÏÈæ³ÓŪ´Êñ¤Ç¡¤gc.c¤Ç¥¹¥¿¥Ã¥¯¤ò
+¥Þ¡¼¥¯¤·¤Æ¤¤¤ëÉôʬ¤Ë¥¢¥é¥¤¥ó¥á¥ó¥È¤Î¥Ð¥¤¥È¿ô¤À¤±¤º¤é¤·¤Æ¥Þ¡¼
+¥¯¤¹¤ë¥³¡¼¥É¤òÄɲ乤ë¤À¤±¤ÇºÑ¤ß¤Þ¤¹¡¥¡Ödefined(THINK_C)¡×¤Ç
+³ç¤é¤ì¤Æ¤¤¤ëÉôʬ¤ò»²¹Í¤Ë¤·¤Æ¤¯¤À¤µ¤¤
+
+# ¼ÂºÝ¤Ë¤ÏRuby¤ÏThink C¤Ç¤Ï¥³¥ó¥Ñ¥¤¥ë¤Ç¤­¤Þ¤»¤ó¡¥
¥ì¥¸¥¹¥¿¥¦¥£¥ó¥É¥¦¤ò»ý¤ÄCPU¤Ç¤Ï¡¤¥ì¥¸¥¹¥¿¥¦¥£¥ó¥É¥¦¤ò¥¹¥¿¥Ã
¥¯¤Ë¥Õ¥é¥Ã¥·¥å¤¹¤ë¥¢¥»¥ó¥Ö¥é¥³¡¼¥É¤òÄɲ乤ëɬÍפ¬¤¢¤ë¤«¤âÃÎ
diff --git a/ToDo b/ToDo
index 7e5ef523a8..b55e399edf 100644
--- a/ToDo
+++ b/ToDo
@@ -2,10 +2,6 @@ Language Spec.
- Class#allocate - basicNew
- class Foo::Bar<Baz .. end, module Boo::Bar .. end
-- raise exception by `` error
-- a +1 to be a+1, not a(+1).
-- clarify evaluation order of operator argument (=~, .., ...)
-- :symbol => value hash in the form of {symbol: value, ...} ??
* operator !! for rescue. ???
* objectify characters
* ../... outside condition invokes operator method too.
@@ -18,6 +14,7 @@ Language Spec.
* def Class#method .. end ??
* def Foo::Bar::baz() .. end ??
* I18N (or M17N) script/string/regexp
+* Fixnum 0 as false ????
* discourage use of symbol variables (e.g. $/, etc.) in manual
* discourage use of Perlish features by giving warnings.
* non confusing in-block local variable (is it possible?)
@@ -25,9 +22,12 @@ Language Spec.
+ variables appears within block may have independent values.
* Regexp: make /o thread safe.
* decide whether begin with rescue or ensure make do..while loop.
+* a +1 to be a+1, not a(+1).
* unify == and eql? again
* to_i returns nil if str contains no digit.
+* raise exception by `` error
* jar like combined library package. -> RubyGems?
+* resumable Exception via Exception#resume.
* method combination, e.g. before, after, around, etc.
* .. or something like defadvice in Emacs.
* property - for methods, or for objects in general.
@@ -35,6 +35,8 @@ Language Spec.
* selector namespace - something like generic-flet in CLOS, to help RubyBehavior
* private instance variable (as in Python?) @_foo in class Foo => @_Foo_foo
* warn/error "bare word" method, like "foo", you should type "foo()"
+* clarify evaluation order of operator argument (=~, .., ...)
+* :symbol => value hash in the form of {symbol: value, ...} ??
Hacking Interpreter
@@ -81,7 +83,7 @@ Standard Libraries
- use Mersenne Twister RNG for random.
- deprecate Array#indexes, and Array#indices.
- remove dependency on MAXPATHLEN.
-- String#scanf(?)
+* String#scanf(?)
* Object#fmt(?)
* Time::strptime
* Integer[num], Float[num]; Fixnum[num]?
@@ -115,7 +117,7 @@ Extension Libraries
Ruby Libraries
-- urllib.rb, nttplib.rb, etc.
+* urllib.rb, nttplib.rb, etc.
* format like perl's
Tools
diff --git a/array.c b/array.c
index b6a8900049..9814722382 100644
--- a/array.c
+++ b/array.c
@@ -3,32 +3,29 @@
array.c -
$Author$
+ $Date$
created at: Fri Aug 6 09:46:12 JST 1993
- Copyright (C) 1993-2007 Yukihiro Matsumoto
+ Copyright (C) 1993-2003 Yukihiro Matsumoto
Copyright (C) 2000 Network Applied Communication Laboratory, Inc.
Copyright (C) 2000 Information-technology Promotion Agency, Japan
**********************************************************************/
-#include "ruby/ruby.h"
-#include "ruby/util.h"
-#include "ruby/st.h"
-
-#ifndef ARRAY_DEBUG
-# define NDEBUG
-#endif
-#include <assert.h>
+#include "ruby.h"
+#include "util.h"
+#include "st.h"
VALUE rb_cArray;
-
static ID id_cmp;
#define ARY_DEFAULT_SIZE 16
-#define ARY_MAX_SIZE (LONG_MAX / (int)sizeof(VALUE))
+#define ARY_MAX_SIZE (LONG_MAX / sizeof(VALUE))
void
-rb_mem_clear(register VALUE *mem, register long size)
+rb_mem_clear(mem, size)
+ register VALUE *mem;
+ register long size;
{
while (size--) {
*mem++ = Qnil;
@@ -36,242 +33,48 @@ rb_mem_clear(register VALUE *mem, register long size)
}
static inline void
-memfill(register VALUE *mem, register long size, register VALUE val)
+memfill(mem, size, val)
+ register VALUE *mem;
+ register long size;
+ register VALUE val;
{
while (size--) {
*mem++ = val;
}
}
-# define ARY_SHARED_P(ary) \
- (assert(!FL_TEST(ary, ELTS_SHARED) || !FL_TEST(ary, RARRAY_EMBED_FLAG)), \
- FL_TEST(ary,ELTS_SHARED)!=0)
-# define ARY_EMBED_P(ary) \
- (assert(!FL_TEST(ary, ELTS_SHARED) || !FL_TEST(ary, RARRAY_EMBED_FLAG)), \
- FL_TEST(ary, RARRAY_EMBED_FLAG)!=0)
-
-#define ARY_HEAP_PTR(a) (assert(!ARY_EMBED_P(a)), RARRAY(a)->as.heap.ptr)
-#define ARY_HEAP_LEN(a) (assert(!ARY_EMBED_P(a)), RARRAY(a)->as.heap.len)
-#define ARY_EMBED_PTR(a) (assert(ARY_EMBED_P(a)), RARRAY(a)->as.ary)
-#define ARY_EMBED_LEN(a) \
- (assert(ARY_EMBED_P(a)), \
- (long)((RBASIC(a)->flags >> RARRAY_EMBED_LEN_SHIFT) & \
- (RARRAY_EMBED_LEN_MASK >> RARRAY_EMBED_LEN_SHIFT)))
-
-#define ARY_OWNS_HEAP_P(a) (!FL_TEST(a, ELTS_SHARED|RARRAY_EMBED_FLAG))
-#define FL_SET_EMBED(a) do { \
- assert(!ARY_SHARED_P(a)); \
- assert(!OBJ_FROZEN(a)); \
- FL_SET(a, RARRAY_EMBED_FLAG); \
-} while (0)
-#define FL_UNSET_EMBED(ary) FL_UNSET(ary, RARRAY_EMBED_FLAG|RARRAY_EMBED_LEN_MASK)
-#define FL_SET_SHARED(ary) do { \
- assert(!ARY_EMBED_P(ary)); \
- FL_SET(ary, ELTS_SHARED); \
-} while (0)
-#define FL_UNSET_SHARED(ary) FL_UNSET(ary, ELTS_SHARED)
-
-#define ARY_SET_PTR(ary, p) do { \
- assert(!ARY_EMBED_P(ary)); \
- assert(!OBJ_FROZEN(ary)); \
- RARRAY(ary)->as.heap.ptr = (p); \
-} while (0)
-#define ARY_SET_EMBED_LEN(ary, n) do { \
- long tmp_n = n; \
- assert(ARY_EMBED_P(ary)); \
- assert(!OBJ_FROZEN(ary)); \
- RBASIC(ary)->flags &= ~RARRAY_EMBED_LEN_MASK; \
- RBASIC(ary)->flags |= (tmp_n) << RARRAY_EMBED_LEN_SHIFT; \
-} while (0)
-#define ARY_SET_HEAP_LEN(ary, n) do { \
- assert(!ARY_EMBED_P(ary)); \
- RARRAY(ary)->as.heap.len = n; \
-} while (0)
-#define ARY_SET_LEN(ary, n) do { \
- if (ARY_EMBED_P(ary)) { \
- ARY_SET_EMBED_LEN(ary, n); \
- } \
- else { \
- ARY_SET_HEAP_LEN(ary, n); \
- } \
- assert(RARRAY_LEN(ary) == n); \
-} while (0)
-#define ARY_INCREASE_PTR(ary, n) do { \
- assert(!ARY_EMBED_P(ary)); \
- assert(!OBJ_FROZEN(ary)); \
- RARRAY(ary)->as.heap.ptr += n; \
-} while (0)
-#define ARY_INCREASE_LEN(ary, n) do { \
- assert(!OBJ_FROZEN(ary)); \
- if (ARY_EMBED_P(ary)) { \
- ARY_SET_EMBED_LEN(ary, RARRAY_LEN(ary)+n); \
- } \
- else { \
- RARRAY(ary)->as.heap.len += n; \
- } \
-} while (0)
-
-#define ARY_CAPA(ary) (ARY_EMBED_P(ary) ? RARRAY_EMBED_LEN_MAX : \
- ARY_SHARED_ROOT_P(ary) ? RARRAY_LEN(ary) : RARRAY(ary)->as.heap.aux.capa)
-#define ARY_SET_CAPA(ary, n) do { \
- assert(!ARY_EMBED_P(ary)); \
- assert(!ARY_SHARED_P(ary)); \
- assert(!OBJ_FROZEN(ary)); \
- RARRAY(ary)->as.heap.aux.capa = (n); \
-} while (0)
-
-#define ARY_SHARED(ary) (assert(ARY_SHARED_P(ary)), RARRAY(ary)->as.heap.aux.shared)
-#define ARY_SET_SHARED(ary, value) do { \
- assert(!ARY_EMBED_P(ary)); \
- assert(ARY_SHARED_P(ary)); \
- assert(ARY_SHARED_ROOT_P(value)); \
- RARRAY(ary)->as.heap.aux.shared = (value); \
-} while (0)
-#define RARRAY_SHARED_ROOT_FLAG FL_USER5
-#define ARY_SHARED_ROOT_P(ary) (FL_TEST(ary, RARRAY_SHARED_ROOT_FLAG))
-#define ARY_SHARED_NUM(ary) \
- (assert(ARY_SHARED_ROOT_P(ary)), RARRAY(ary)->as.heap.aux.capa)
-#define ARY_SET_SHARED_NUM(ary, value) do { \
- assert(ARY_SHARED_ROOT_P(ary)); \
- RARRAY(ary)->as.heap.aux.capa = (value); \
-} while (0)
-#define FL_SET_SHARED_ROOT(ary) do { \
- assert(!ARY_EMBED_P(ary)); \
- FL_SET(ary, RARRAY_SHARED_ROOT_FLAG); \
-} while (0)
-
-static void
-ary_resize_capa(VALUE ary, long capacity)
-{
- assert(RARRAY_LEN(ary) <= capacity);
- assert(!OBJ_FROZEN(ary));
- assert(!ARY_SHARED_P(ary));
- if (capacity > RARRAY_EMBED_LEN_MAX) {
- if (ARY_EMBED_P(ary)) {
- long len = ARY_EMBED_LEN(ary);
- VALUE *ptr = ALLOC_N(VALUE, (capacity));
- MEMCPY(ptr, ARY_EMBED_PTR(ary), VALUE, len);
- FL_UNSET_EMBED(ary);
- ARY_SET_PTR(ary, ptr);
- ARY_SET_HEAP_LEN(ary, len);
- }
- else {
- REALLOC_N(RARRAY(ary)->as.heap.ptr, VALUE, (capacity));
- }
- ARY_SET_CAPA(ary, (capacity));
- }
- else {
- if (!ARY_EMBED_P(ary)) {
- long len = RARRAY_LEN(ary);
- VALUE *ptr = RARRAY_PTR(ary);
- if (len > capacity) len = capacity;
- MEMCPY(RARRAY(ary)->as.ary, ptr, VALUE, len);
- FL_SET_EMBED(ary);
- ARY_SET_LEN(ary, len);
- xfree(ptr);
- }
- }
-}
-
-static void
-ary_double_capa(VALUE ary, long min)
-{
- long new_capa = ARY_CAPA(ary) / 2;
-
- if (new_capa < ARY_DEFAULT_SIZE) {
- new_capa = ARY_DEFAULT_SIZE;
- }
- if (new_capa >= ARY_MAX_SIZE - min) {
- new_capa = (ARY_MAX_SIZE - min) / 2;
- }
- new_capa += min;
- ary_resize_capa(ary, new_capa);
-}
-
-static void
-rb_ary_decrement_share(VALUE shared)
-{
- if (shared) {
- long num = ARY_SHARED_NUM(shared) - 1;
- if (num == 0) {
- rb_ary_free(shared);
- rb_gc_force_recycle(shared);
- }
- else if (num > 0) {
- ARY_SET_SHARED_NUM(shared, num);
- }
- }
-}
-
-static void
-rb_ary_unshare(VALUE ary)
-{
- VALUE shared = RARRAY(ary)->as.heap.aux.shared;
- rb_ary_decrement_share(shared);
- FL_UNSET_SHARED(ary);
-}
+#define ARY_TMPLOCK FL_USER1
static inline void
-rb_ary_unshare_safe(VALUE ary)
-{
- if (ARY_SHARED_P(ary) && !ARY_EMBED_P(ary)) {
- rb_ary_unshare(ary);
- }
-}
-
-static VALUE
-rb_ary_increment_share(VALUE shared)
-{
- long num = ARY_SHARED_NUM(shared);
- if (num >= 0) {
- ARY_SET_SHARED_NUM(shared, num + 1);
- }
- return shared;
-}
-
-static void
-rb_ary_set_shared(VALUE ary, VALUE shared)
-{
- rb_ary_increment_share(shared);
- FL_SET_SHARED(ary);
- ARY_SET_SHARED(ary, shared);
-}
-
-static inline void
-rb_ary_modify_check(VALUE ary)
+rb_ary_modify_check(ary)
+ VALUE ary;
{
if (OBJ_FROZEN(ary)) rb_error_frozen("array");
- if (!OBJ_UNTRUSTED(ary) && rb_safe_level() >= 4)
+ if (FL_TEST(ary, ARY_TMPLOCK))
+ rb_raise(rb_eRuntimeError, "can't modify array during iteration");
+ if (!OBJ_TAINTED(ary) && rb_safe_level() >= 4)
rb_raise(rb_eSecurityError, "Insecure: can't modify array");
}
static void
-rb_ary_modify(VALUE ary)
+rb_ary_modify(ary)
+ VALUE ary;
{
+ VALUE *ptr;
+
rb_ary_modify_check(ary);
- if (ARY_SHARED_P(ary)) {
- long len = RARRAY_LEN(ary);
- if (len <= RARRAY_EMBED_LEN_MAX) {
- VALUE *ptr = ARY_HEAP_PTR(ary);
- VALUE shared = ARY_SHARED(ary);
- FL_UNSET_SHARED(ary);
- FL_SET_EMBED(ary);
- MEMCPY(ARY_EMBED_PTR(ary), ptr, VALUE, len);
- rb_ary_decrement_share(shared);
- ARY_SET_EMBED_LEN(ary, len);
- }
- else {
- VALUE *ptr = ALLOC_N(VALUE, len);
- MEMCPY(ptr, RARRAY_PTR(ary), VALUE, len);
- rb_ary_unshare(ary);
- ARY_SET_CAPA(ary, len);
- ARY_SET_PTR(ary, ptr);
- }
+ if (FL_TEST(ary, ELTS_SHARED)) {
+ ptr = ALLOC_N(VALUE, RARRAY(ary)->len);
+ FL_UNSET(ary, ELTS_SHARED);
+ RARRAY(ary)->aux.capa = RARRAY(ary)->len;
+ MEMCPY(ptr, RARRAY(ary)->ptr, VALUE, RARRAY(ary)->len);
+ RARRAY(ary)->ptr = ptr;
}
}
VALUE
-rb_ary_freeze(VALUE ary)
+rb_ary_freeze(ary)
+ VALUE ary;
{
return rb_obj_freeze(ary);
}
@@ -285,62 +88,79 @@ rb_ary_freeze(VALUE ary)
*/
static VALUE
-rb_ary_frozen_p(VALUE ary)
+rb_ary_frozen_p(ary)
+ VALUE ary;
{
if (OBJ_FROZEN(ary)) return Qtrue;
+ if (FL_TEST(ary, ARY_TMPLOCK)) return Qtrue;
return Qfalse;
}
+static VALUE ary_alloc _((VALUE));
static VALUE
-ary_alloc(VALUE klass)
+ary_alloc(klass)
+ VALUE klass;
{
NEWOBJ(ary, struct RArray);
OBJSETUP(ary, klass, T_ARRAY);
- FL_SET_EMBED((VALUE)ary);
- ARY_SET_EMBED_LEN((VALUE)ary, 0);
+
+ ary->len = 0;
+ ary->ptr = 0;
+ ary->aux.capa = 0;
return (VALUE)ary;
}
static VALUE
-ary_new(VALUE klass, long capa)
+ary_new(klass, len)
+ VALUE klass;
+ long len;
{
- VALUE ary;
+ VALUE ary = ary_alloc(klass);
- if (capa < 0) {
+ if (len < 0) {
rb_raise(rb_eArgError, "negative array size (or size too big)");
}
- if (capa > ARY_MAX_SIZE) {
+ if (len > ARY_MAX_SIZE) {
rb_raise(rb_eArgError, "array size too big");
}
- ary = ary_alloc(klass);
- if (capa > RARRAY_EMBED_LEN_MAX) {
- FL_UNSET_EMBED(ary);
- ARY_SET_PTR(ary, ALLOC_N(VALUE, capa));
- ARY_SET_CAPA(ary, capa);
- ARY_SET_HEAP_LEN(ary, 0);
- }
+ if (len == 0) len++;
+ RARRAY(ary)->ptr = ALLOC_N(VALUE, len);
+ RARRAY(ary)->aux.capa = len;
return ary;
}
VALUE
-rb_ary_new2(long capa)
+rb_ary_new2(len)
+ long len;
{
- return ary_new(rb_cArray, capa);
+ return ary_new(rb_cArray, len);
}
VALUE
-rb_ary_new(void)
+rb_ary_new()
{
- return rb_ary_new2(RARRAY_EMBED_LEN_MAX);
+ return rb_ary_new2(ARY_DEFAULT_SIZE);
}
+#ifdef HAVE_STDARG_PROTOTYPES
#include <stdarg.h>
+#define va_init_list(a,b) va_start(a,b)
+#else
+#include <varargs.h>
+#define va_init_list(a,b) va_start(a)
+#endif
VALUE
+#ifdef HAVE_STDARG_PROTOTYPES
rb_ary_new3(long n, ...)
+#else
+rb_ary_new3(n, va_alist)
+ long n;
+ va_dcl
+#endif
{
va_list ar;
VALUE ary;
@@ -348,153 +168,84 @@ rb_ary_new3(long n, ...)
ary = rb_ary_new2(n);
- va_start(ar, n);
+ va_init_list(ar, n);
for (i=0; i<n; i++) {
- RARRAY_PTR(ary)[i] = va_arg(ar, VALUE);
+ RARRAY(ary)->ptr[i] = va_arg(ar, VALUE);
}
va_end(ar);
- ARY_SET_LEN(ary, n);
+ RARRAY(ary)->len = n;
return ary;
}
VALUE
-rb_ary_new4(long n, const VALUE *elts)
+rb_ary_new4(n, elts)
+ long n;
+ const VALUE *elts;
{
VALUE ary;
ary = rb_ary_new2(n);
if (n > 0 && elts) {
- MEMCPY(RARRAY_PTR(ary), elts, VALUE, n);
- ARY_SET_LEN(ary, n);
- }
-
- return ary;
-}
-
-VALUE
-rb_ary_tmp_new(long capa)
-{
- return ary_new(0, capa);
-}
-
-void
-rb_ary_free(VALUE ary)
-{
- if (ARY_OWNS_HEAP_P(ary)) {
- xfree(ARY_HEAP_PTR(ary));
+ MEMCPY(RARRAY(ary)->ptr, elts, VALUE, n);
}
-}
-size_t
-rb_ary_memsize(VALUE ary)
-{
- if (ARY_OWNS_HEAP_P(ary)) {
- return RARRAY(ary)->as.heap.aux.capa * sizeof(VALUE);
- }
- else {
- return 0;
- }
-}
+ /* This assignment to len will be moved to the above "if" block in Ruby 1.9 */
+ RARRAY(ary)->len = n;
-static inline void
-ary_discard(VALUE ary)
-{
- rb_ary_free(ary);
- RBASIC(ary)->flags |= RARRAY_EMBED_FLAG;
- RBASIC(ary)->flags &= ~RARRAY_EMBED_LEN_MASK;
+ return ary;
}
static VALUE
-ary_make_shared(VALUE ary)
+ary_make_shared(ary)
+ VALUE ary;
{
- assert(!ARY_EMBED_P(ary));
- if (ARY_SHARED_P(ary)) {
- return ARY_SHARED(ary);
- }
- else if (ARY_SHARED_ROOT_P(ary)) {
- return ary;
- }
- else if (OBJ_FROZEN(ary)) {
- ary_resize_capa(ary, ARY_HEAP_LEN(ary));
- FL_SET_SHARED_ROOT(ary);
- ARY_SET_SHARED_NUM(ary, 0);
- return ary;
- }
- else {
+ if (!FL_TEST(ary, ELTS_SHARED)) {
NEWOBJ(shared, struct RArray);
- OBJSETUP(shared, 0, T_ARRAY);
- FL_UNSET_EMBED(shared);
-
- ARY_SET_LEN((VALUE)shared, RARRAY_LEN(ary));
- ARY_SET_PTR((VALUE)shared, RARRAY_PTR(ary));
- FL_SET_SHARED_ROOT(shared);
- ARY_SET_SHARED_NUM((VALUE)shared, 1);
- FL_SET_SHARED(ary);
- ARY_SET_SHARED(ary, (VALUE)shared);
+ OBJSETUP(shared, rb_cArray, T_ARRAY);
+
+ shared->len = RARRAY(ary)->len;
+ shared->ptr = RARRAY(ary)->ptr;
+ shared->aux.capa = RARRAY(ary)->aux.capa;
+ RARRAY(ary)->aux.shared = (VALUE)shared;
+ FL_SET(ary, ELTS_SHARED);
OBJ_FREEZE(shared);
return (VALUE)shared;
}
-}
-
-
-static VALUE
-ary_make_substitution(VALUE ary)
-{
- if (RARRAY_LEN(ary) <= RARRAY_EMBED_LEN_MAX) {
- VALUE subst = rb_ary_new2(RARRAY_LEN(ary));
- MEMCPY(ARY_EMBED_PTR(subst), RARRAY_PTR(ary), VALUE, RARRAY_LEN(ary));
- ARY_SET_EMBED_LEN(subst, RARRAY_LEN(ary));
- return subst;
- }
else {
- return rb_ary_increment_share(ary_make_shared(ary));
+ return RARRAY(ary)->aux.shared;
}
}
VALUE
-rb_assoc_new(VALUE car, VALUE cdr)
+rb_assoc_new(car, cdr)
+ VALUE car, cdr;
{
- return rb_ary_new3(2, car, cdr);
+ VALUE ary;
+
+ ary = rb_ary_new2(2);
+ RARRAY(ary)->ptr[0] = car;
+ RARRAY(ary)->ptr[1] = cdr;
+ RARRAY(ary)->len = 2;
+
+ return ary;
}
static VALUE
-to_ary(VALUE ary)
+to_ary(ary)
+ VALUE ary;
{
return rb_convert_type(ary, T_ARRAY, "Array", "to_ary");
}
VALUE
-rb_check_array_type(VALUE ary)
+rb_check_array_type(ary)
+ VALUE ary;
{
return rb_check_convert_type(ary, T_ARRAY, "Array", "to_ary");
}
-/*
- * call-seq:
- * Array.try_convert(obj) -> array or nil
- *
- * Try to convert <i>obj</i> into an array, using to_ary method.
- * Returns converted array or nil if <i>obj</i> cannot be converted
- * for any reason. This method is to check if an argument is an
- * array.
- *
- * Array.try_convert([1]) # => [1]
- * Array.try_convert("1") # => nil
- *
- * if tmp = Array.try_convert(arg)
- * # the argument is an array
- * elsif tmp = String.try_convert(arg)
- * # the argument is a string
- * end
- *
- */
-
-static VALUE
-rb_ary_s_try_convert(VALUE dummy, VALUE ary)
-{
- return rb_check_array_type(ary);
-}
+static VALUE rb_ary_replace _((VALUE, VALUE));
/*
* call-seq:
@@ -515,45 +266,43 @@ rb_ary_s_try_convert(VALUE dummy, VALUE ary)
* Array.new
* Array.new(2)
* Array.new(5, "A")
- *
+ *
* # only one copy of the object is created
* a = Array.new(2, Hash.new)
* a[0]['cat'] = 'feline'
* a
* a[1]['cat'] = 'Felix'
* a
- *
+ *
* # here multiple copies are created
* a = Array.new(2) { Hash.new }
* a[0]['cat'] = 'feline'
* a
- *
+ *
* squares = Array.new(5) {|i| i*i}
* squares
- *
+ *
* copy = Array.new(squares)
*/
static VALUE
-rb_ary_initialize(int argc, VALUE *argv, VALUE ary)
+rb_ary_initialize(argc, argv, ary)
+ int argc;
+ VALUE *argv;
+ VALUE ary;
{
long len;
VALUE size, val;
rb_ary_modify(ary);
- if (argc == 0) {
- if (ARY_OWNS_HEAP_P(ary) && RARRAY_PTR(ary)) {
- xfree(RARRAY_PTR(ary));
- }
- rb_ary_unshare_safe(ary);
- FL_SET_EMBED(ary);
- ARY_SET_EMBED_LEN(ary, 0);
+ if (rb_scan_args(argc, argv, "02", &size, &val) == 0) {
+ RARRAY(ary)->len = 0;
if (rb_block_given_p()) {
rb_warning("given block not used");
}
return ary;
}
- rb_scan_args(argc, argv, "02", &size, &val);
+
if (argc == 1 && !FIXNUM_P(size)) {
val = rb_check_array_type(size);
if (!NIL_P(val)) {
@@ -569,8 +318,10 @@ rb_ary_initialize(int argc, VALUE *argv, VALUE ary)
if (len > ARY_MAX_SIZE) {
rb_raise(rb_eArgError, "array size too big");
}
- rb_ary_modify(ary);
- ary_resize_capa(ary, len);
+ if (len > RARRAY(ary)->aux.capa) {
+ REALLOC_N(RARRAY(ary)->ptr, VALUE, len);
+ RARRAY(ary)->aux.capa = len;
+ }
if (rb_block_given_p()) {
long i;
@@ -579,19 +330,20 @@ rb_ary_initialize(int argc, VALUE *argv, VALUE ary)
}
for (i=0; i<len; i++) {
rb_ary_store(ary, i, rb_yield(LONG2NUM(i)));
- ARY_SET_LEN(ary, i + 1);
+ RARRAY(ary)->len = i + 1;
}
}
else {
- memfill(RARRAY_PTR(ary), len, val);
- ARY_SET_LEN(ary, len);
+ memfill(RARRAY(ary)->ptr, len, val);
+ RARRAY(ary)->len = len;
}
+
return ary;
}
-/*
-* Returns a new array populated with the given objects.
+/*
+* Returns a new array populated with the given objects.
*
* Array.[]( 1, 'a', /^A/ )
* Array[ 1, 'a', /^A/ ]
@@ -599,25 +351,33 @@ rb_ary_initialize(int argc, VALUE *argv, VALUE ary)
*/
static VALUE
-rb_ary_s_create(int argc, VALUE *argv, VALUE klass)
+rb_ary_s_create(argc, argv, klass)
+ int argc;
+ VALUE *argv;
+ VALUE klass;
{
- VALUE ary = ary_new(klass, argc);
- if (argc > 0 && argv) {
- MEMCPY(RARRAY_PTR(ary), argv, VALUE, argc);
- ARY_SET_LEN(ary, argc);
+ VALUE ary = ary_alloc(klass);
+
+ if (argc > 0) {
+ RARRAY(ary)->ptr = ALLOC_N(VALUE, argc);
+ MEMCPY(RARRAY(ary)->ptr, argv, VALUE, argc);
}
+ RARRAY(ary)->len = RARRAY(ary)->aux.capa = argc;
return ary;
}
void
-rb_ary_store(VALUE ary, long idx, VALUE val)
+rb_ary_store(ary, idx, val)
+ VALUE ary;
+ long idx;
+ VALUE val;
{
if (idx < 0) {
- idx += RARRAY_LEN(ary);
+ idx += RARRAY(ary)->len;
if (idx < 0) {
rb_raise(rb_eIndexError, "index %ld out of array",
- idx - RARRAY_LEN(ary));
+ idx - RARRAY(ary)->len);
}
}
else if (idx >= ARY_MAX_SIZE) {
@@ -625,85 +385,78 @@ rb_ary_store(VALUE ary, long idx, VALUE val)
}
rb_ary_modify(ary);
- if (idx >= ARY_CAPA(ary)) {
- ary_double_capa(ary, idx);
- }
- if (idx > RARRAY_LEN(ary)) {
- rb_mem_clear(RARRAY_PTR(ary) + RARRAY_LEN(ary),
- idx-RARRAY_LEN(ary) + 1);
- }
+ if (idx >= RARRAY(ary)->aux.capa) {
+ long new_capa = RARRAY(ary)->aux.capa / 2;
- if (idx >= RARRAY_LEN(ary)) {
- ARY_SET_LEN(ary, idx + 1);
+ if (new_capa < ARY_DEFAULT_SIZE) {
+ new_capa = ARY_DEFAULT_SIZE;
+ }
+ if (new_capa >= ARY_MAX_SIZE - idx) {
+ new_capa = (ARY_MAX_SIZE - idx) / 2;
+ }
+ new_capa += idx;
+ REALLOC_N(RARRAY(ary)->ptr, VALUE, new_capa);
+ RARRAY(ary)->aux.capa = new_capa;
}
- RARRAY_PTR(ary)[idx] = val;
-}
-
-static VALUE
-ary_make_partial(VALUE ary, VALUE klass, long offset, long len)
-{
- assert(offset >= 0);
- assert(len >= 0);
- assert(offset+len <= RARRAY_LEN(ary));
-
- if (len <= RARRAY_EMBED_LEN_MAX) {
- VALUE result = ary_alloc(klass);
- MEMCPY(ARY_EMBED_PTR(result), RARRAY_PTR(ary) + offset, VALUE, len);
- ARY_SET_EMBED_LEN(result, len);
- return result;
+ if (idx > RARRAY(ary)->len) {
+ rb_mem_clear(RARRAY(ary)->ptr + RARRAY(ary)->len,
+ idx-RARRAY(ary)->len + 1);
}
- else {
- VALUE shared, result = ary_alloc(klass);
- FL_UNSET_EMBED(result);
- shared = ary_make_shared(ary);
- ARY_SET_PTR(result, RARRAY_PTR(ary));
- ARY_SET_LEN(result, RARRAY_LEN(ary));
- rb_ary_set_shared(result, shared);
-
- ARY_INCREASE_PTR(result, offset);
- ARY_SET_LEN(result, len);
- return result;
+ if (idx >= RARRAY(ary)->len) {
+ RARRAY(ary)->len = idx + 1;
}
+ RARRAY(ary)->ptr[idx] = val;
}
static VALUE
-ary_make_shared_copy(VALUE ary)
+ary_shared_array(klass, ary)
+ VALUE klass;
+ VALUE ary;
{
- return ary_make_partial(ary, rb_obj_class(ary), 0, RARRAY_LEN(ary));
-}
+ VALUE val = ary_alloc(klass);
-enum ary_take_pos_flags
-{
- ARY_TAKE_FIRST = 0,
- ARY_TAKE_LAST = 1
-};
+ ary_make_shared(ary);
+ RARRAY(val)->ptr = RARRAY(ary)->ptr;
+ RARRAY(val)->len = RARRAY(ary)->len;
+ RARRAY(val)->aux.shared = RARRAY(ary)->aux.shared;
+ FL_SET(val, ELTS_SHARED);
+ return val;
+}
static VALUE
-ary_take_first_or_last(int argc, VALUE *argv, VALUE ary, enum ary_take_pos_flags last)
+ary_shared_first(argc, argv, ary, last)
+ int argc;
+ VALUE *argv;
+ VALUE ary;
+ int last;
{
- VALUE nv;
+ VALUE nv, result;
long n;
long offset = 0;
rb_scan_args(argc, argv, "1", &nv);
n = NUM2LONG(nv);
- if (n > RARRAY_LEN(ary)) {
- n = RARRAY_LEN(ary);
+ if (n > RARRAY(ary)->len) {
+ n = RARRAY(ary)->len;
}
else if (n < 0) {
rb_raise(rb_eArgError, "negative array size");
}
if (last) {
- offset = RARRAY_LEN(ary) - n;
+ offset = RARRAY(ary)->len - n;
}
- return ary_make_partial(ary, rb_cArray, offset, n);
+ result = ary_shared_array(rb_cArray, ary);
+ RARRAY(result)->ptr += offset;
+ RARRAY(result)->len = n;
+
+ return result;
}
/*
* call-seq:
* array << obj -> array
- *
+ *
* Append---Pushes the given object on to the end of this array. This
* expression returns the array itself, so several appends
* may be chained together.
@@ -714,36 +467,33 @@ ary_take_first_or_last(int argc, VALUE *argv, VALUE ary, enum ary_take_pos_flags
*/
VALUE
-rb_ary_push(VALUE ary, VALUE item)
+rb_ary_push(ary, item)
+ VALUE ary;
+ VALUE item;
{
- long idx = RARRAY_LEN(ary);
-
- rb_ary_modify(ary);
- if (idx >= ARY_CAPA(ary)) {
- ary_double_capa(ary, idx);
- }
- RARRAY_PTR(ary)[idx] = item;
- ARY_SET_LEN(ary, idx + 1);
+ rb_ary_store(ary, RARRAY(ary)->len, item);
return ary;
}
-/*
+/*
* call-seq:
* array.push(obj, ... ) -> array
- *
+ *
* Append---Pushes the given object(s) on to the end of this array. This
* expression returns the array itself, so several appends
* may be chained together.
*
* a = [ "a", "b", "c" ]
- * a.push("d", "e", "f")
+ * a.push("d", "e", "f")
* #=> ["a", "b", "c", "d", "e", "f"]
*/
static VALUE
-rb_ary_push_m(int argc, VALUE *argv, VALUE ary)
+rb_ary_push_m(argc, argv, ary)
+ int argc;
+ VALUE *argv;
+ VALUE ary;
{
- rb_ary_modify_check(ary);
while (argc--) {
rb_ary_push(ary, *argv++);
}
@@ -751,33 +501,31 @@ rb_ary_push_m(int argc, VALUE *argv, VALUE ary)
}
VALUE
-rb_ary_pop(VALUE ary)
+rb_ary_pop(ary)
+ VALUE ary;
{
- long n;
rb_ary_modify_check(ary);
- if (RARRAY_LEN(ary) == 0) return Qnil;
- if (ARY_OWNS_HEAP_P(ary) &&
- RARRAY_LEN(ary) * 3 < ARY_CAPA(ary) &&
- ARY_CAPA(ary) > ARY_DEFAULT_SIZE)
- {
- ary_resize_capa(ary, RARRAY_LEN(ary) * 2);
+ if (RARRAY(ary)->len == 0) return Qnil;
+ if (!FL_TEST(ary, ELTS_SHARED) &&
+ RARRAY(ary)->len * 3 < RARRAY(ary)->aux.capa &&
+ RARRAY(ary)->aux.capa > ARY_DEFAULT_SIZE) {
+ RARRAY(ary)->aux.capa = RARRAY(ary)->len * 2;
+ REALLOC_N(RARRAY(ary)->ptr, VALUE, RARRAY(ary)->aux.capa);
}
- n = RARRAY_LEN(ary)-1;
- ARY_SET_LEN(ary, n);
- return RARRAY_PTR(ary)[n];
+ return RARRAY(ary)->ptr[--RARRAY(ary)->len];
}
/*
* call-seq:
* array.pop -> obj or nil
* array.pop(n) -> array
- *
+ *
* Removes the last element from <i>self</i> and returns it, or
* <code>nil</code> if the array is empty.
*
* If a number _n_ is given, returns an array of the last n elements
* (or less) just like <code>array.slice!(-n, n)</code> does.
- *
+ *
* a = [ "a", "b", "c", "d" ]
* a.pop #=> "d"
* a.pop(2) #=> ["b", "c"]
@@ -785,7 +533,10 @@ rb_ary_pop(VALUE ary)
*/
static VALUE
-rb_ary_pop_m(int argc, VALUE *argv, VALUE ary)
+rb_ary_pop_m(argc, argv, ary)
+ int argc;
+ VALUE *argv;
+ VALUE ary;
{
VALUE result;
@@ -794,35 +545,31 @@ rb_ary_pop_m(int argc, VALUE *argv, VALUE ary)
}
rb_ary_modify_check(ary);
- result = ary_take_first_or_last(argc, argv, ary, ARY_TAKE_LAST);
- ARY_INCREASE_LEN(ary, -RARRAY_LEN(result));
+ result = ary_shared_first(argc, argv, ary, Qtrue);
+ RARRAY(ary)->len -= RARRAY(result)->len;
return result;
}
VALUE
-rb_ary_shift(VALUE ary)
+rb_ary_shift(ary)
+ VALUE ary;
{
VALUE top;
rb_ary_modify_check(ary);
- if (RARRAY_LEN(ary) == 0) return Qnil;
- top = RARRAY_PTR(ary)[0];
- if (!ARY_SHARED_P(ary)) {
- if (RARRAY_LEN(ary) < ARY_DEFAULT_SIZE) {
- MEMMOVE(RARRAY_PTR(ary), RARRAY_PTR(ary)+1, VALUE, RARRAY_LEN(ary)-1);
- ARY_INCREASE_LEN(ary, -1);
- return top;
- }
- assert(!ARY_EMBED_P(ary)); /* ARY_EMBED_LEN_MAX < ARY_DEFAULT_SIZE */
-
- RARRAY_PTR(ary)[0] = Qnil;
+ if (RARRAY(ary)->len == 0) return Qnil;
+ top = RARRAY(ary)->ptr[0];
+ if (!FL_TEST(ary, ELTS_SHARED)) {
+ if (RARRAY(ary)->len < ARY_DEFAULT_SIZE) {
+ MEMMOVE(RARRAY(ary)->ptr, RARRAY(ary)->ptr+1, VALUE, RARRAY(ary)->len-1);
+ RARRAY(ary)->len--;
+ return top;
+ }
+ RARRAY(ary)->ptr[0] = Qnil;
ary_make_shared(ary);
}
- else if (ARY_SHARED_NUM(ARY_SHARED(ary)) == 1) {
- RARRAY_PTR(ary)[0] = Qnil;
- }
- ARY_INCREASE_PTR(ary, 1); /* shift ptr */
- ARY_INCREASE_LEN(ary, -1);
+ RARRAY(ary)->ptr++; /* shift ptr */
+ RARRAY(ary)->len--;
return top;
}
@@ -831,14 +578,14 @@ rb_ary_shift(VALUE ary)
* call-seq:
* array.shift -> obj or nil
* array.shift(n) -> array
- *
+ *
* Returns the first element of <i>self</i> and removes it (shifting all
* other elements down by one). Returns <code>nil</code> if the array
* is empty.
*
* If a number _n_ is given, returns an array of the first n elements
* (or less) just like <code>array.slice!(0, n)</code> does.
- *
+ *
* args = [ "-m", "-q", "filename" ]
* args.shift #=> "-m"
* args #=> ["-q", "filename"]
@@ -849,7 +596,10 @@ rb_ary_shift(VALUE ary)
*/
static VALUE
-rb_ary_shift_m(int argc, VALUE *argv, VALUE ary)
+rb_ary_shift_m(argc, argv, ary)
+ int argc;
+ VALUE *argv;
+ VALUE ary;
{
VALUE result;
long n;
@@ -859,97 +609,130 @@ rb_ary_shift_m(int argc, VALUE *argv, VALUE ary)
}
rb_ary_modify_check(ary);
- result = ary_take_first_or_last(argc, argv, ary, ARY_TAKE_FIRST);
- n = RARRAY_LEN(result);
- if (ARY_SHARED_P(ary)) {
- if (ARY_SHARED_NUM(ARY_SHARED(ary)) == 1) {
- rb_mem_clear(RARRAY_PTR(ary), n);
+ result = ary_shared_first(argc, argv, ary, Qfalse);
+ n = RARRAY(result)->len;
+ if (FL_TEST(ary, ELTS_SHARED)) {
+ RARRAY(ary)->ptr += n;
+ RARRAY(ary)->len -= n;
}
- ARY_INCREASE_PTR(ary, n);
- }
else {
- MEMMOVE(RARRAY_PTR(ary), RARRAY_PTR(ary)+n, VALUE, RARRAY_LEN(ary)-n);
+ MEMMOVE(RARRAY(ary)->ptr, RARRAY(ary)->ptr+n, VALUE, RARRAY(ary)->len-n);
+ RARRAY(ary)->len -= n;
}
- ARY_INCREASE_LEN(ary, -n);
return result;
}
+VALUE
+rb_ary_unshift(ary, item)
+ VALUE ary, item;
+{
+ rb_ary_modify(ary);
+ if (RARRAY(ary)->len == RARRAY(ary)->aux.capa) {
+ long capa_inc = RARRAY(ary)->aux.capa / 2;
+ if (capa_inc < ARY_DEFAULT_SIZE) {
+ capa_inc = ARY_DEFAULT_SIZE;
+ }
+ RARRAY(ary)->aux.capa += capa_inc;
+ REALLOC_N(RARRAY(ary)->ptr, VALUE, RARRAY(ary)->aux.capa);
+ }
+
+ /* sliding items */
+ MEMMOVE(RARRAY(ary)->ptr + 1, RARRAY(ary)->ptr, VALUE, RARRAY(ary)->len);
+
+ RARRAY(ary)->len++;
+ RARRAY(ary)->ptr[0] = item;
+
+ return ary;
+}
+
/*
* call-seq:
* array.unshift(obj, ...) -> array
- *
+ *
* Prepends objects to the front of <i>array</i>.
* other elements up one.
- *
+ *
* a = [ "b", "c", "d" ]
* a.unshift("a") #=> ["a", "b", "c", "d"]
* a.unshift(1, 2) #=> [ 1, 2, "a", "b", "c", "d"]
*/
static VALUE
-rb_ary_unshift_m(int argc, VALUE *argv, VALUE ary)
+rb_ary_unshift_m(argc, argv, ary)
+ int argc;
+ VALUE *argv;
+ VALUE ary;
{
- long len;
+ long len = RARRAY(ary)->len;
if (argc == 0) return ary;
- rb_ary_modify(ary);
- if (ARY_CAPA(ary) <= (len = RARRAY_LEN(ary)) + argc) {
- ary_double_capa(ary, len + argc);
- }
- /* sliding items */
- MEMMOVE(RARRAY_PTR(ary) + argc, RARRAY_PTR(ary), VALUE, len);
- MEMCPY(RARRAY_PTR(ary), argv, VALUE, argc);
- ARY_INCREASE_LEN(ary, argc);
+ /* make rooms by setting the last item */
+ rb_ary_store(ary, len + argc - 1, Qnil);
+ /* sliding items */
+ MEMMOVE(RARRAY(ary)->ptr + argc, RARRAY(ary)->ptr, VALUE, len);
+ MEMCPY(RARRAY(ary)->ptr, argv, VALUE, argc);
+
return ary;
}
-VALUE
-rb_ary_unshift(VALUE ary, VALUE item)
-{
- return rb_ary_unshift_m(1,&item,ary);
-}
-
/* faster version - use this if you don't need to treat negative offset */
static inline VALUE
-rb_ary_elt(VALUE ary, long offset)
+rb_ary_elt(ary, offset)
+ VALUE ary;
+ long offset;
{
- if (RARRAY_LEN(ary) == 0) return Qnil;
- if (offset < 0 || RARRAY_LEN(ary) <= offset) {
+ if (RARRAY(ary)->len == 0) return Qnil;
+ if (offset < 0 || RARRAY(ary)->len <= offset) {
return Qnil;
}
- return RARRAY_PTR(ary)[offset];
+ return RARRAY(ary)->ptr[offset];
}
VALUE
-rb_ary_entry(VALUE ary, long offset)
+rb_ary_entry(ary, offset)
+ VALUE ary;
+ long offset;
{
if (offset < 0) {
- offset += RARRAY_LEN(ary);
+ offset += RARRAY(ary)->len;
}
return rb_ary_elt(ary, offset);
}
-VALUE
-rb_ary_subseq(VALUE ary, long beg, long len)
+static VALUE
+rb_ary_subseq(ary, beg, len)
+ VALUE ary;
+ long beg, len;
{
- VALUE klass;
+ VALUE klass, ary2, shared;
+ VALUE *ptr;
- if (beg > RARRAY_LEN(ary)) return Qnil;
+ if (beg > RARRAY(ary)->len) return Qnil;
if (beg < 0 || len < 0) return Qnil;
- if (RARRAY_LEN(ary) < len || RARRAY_LEN(ary) < beg + len) {
- len = RARRAY_LEN(ary) - beg;
+ if (RARRAY(ary)->len < len || RARRAY(ary)->len < beg + len) {
+ len = RARRAY(ary)->len - beg;
+ if (len < 0)
+ len = 0;
}
klass = rb_obj_class(ary);
if (len == 0) return ary_new(klass, 0);
- return ary_make_partial(ary, klass, beg, len);
+ shared = ary_make_shared(ary);
+ ptr = RARRAY(ary)->ptr;
+ ary2 = ary_alloc(klass);
+ RARRAY(ary2)->ptr = ptr + beg;
+ RARRAY(ary2)->len = len;
+ RARRAY(ary2)->aux.shared = shared;
+ FL_SET(ary2, ELTS_SHARED);
+
+ return ary2;
}
-/*
+/*
* call-seq:
* array[index] -> obj or nil
* array[start, length] -> an_array or nil
@@ -982,16 +765,22 @@ rb_ary_subseq(VALUE ary, long beg, long len)
*/
VALUE
-rb_ary_aref(int argc, VALUE *argv, VALUE ary)
+rb_ary_aref(argc, argv, ary)
+ int argc;
+ VALUE *argv;
+ VALUE ary;
{
VALUE arg;
long beg, len;
if (argc == 2) {
+ if (SYMBOL_P(argv[0])) {
+ rb_raise(rb_eTypeError, "Symbol as array index");
+ }
beg = NUM2LONG(argv[0]);
len = NUM2LONG(argv[1]);
if (beg < 0) {
- beg += RARRAY_LEN(ary);
+ beg += RARRAY(ary)->len;
}
return rb_ary_subseq(ary, beg, len);
}
@@ -1003,8 +792,11 @@ rb_ary_aref(int argc, VALUE *argv, VALUE ary)
if (FIXNUM_P(arg)) {
return rb_ary_entry(ary, FIX2LONG(arg));
}
+ if (SYMBOL_P(arg)) {
+ rb_raise(rb_eTypeError, "Symbol as array index");
+ }
/* check if idx is Range */
- switch (rb_range_beg_len(arg, &beg, &len, RARRAY_LEN(ary), 0)) {
+ switch (rb_range_beg_len(arg, &beg, &len, RARRAY(ary)->len, 0)) {
case Qfalse:
break;
case Qnil:
@@ -1015,13 +807,15 @@ rb_ary_aref(int argc, VALUE *argv, VALUE ary)
return rb_ary_entry(ary, NUM2LONG(arg));
}
-/*
+/*
* call-seq:
* array.at(index) -> obj or nil
*
* Returns the element at _index_. A
* negative index counts from the end of _self_. Returns +nil+
* if the index is out of range. See also <code>Array#[]</code>.
+ * (<code>Array#at</code> is slightly faster than <code>Array#[]</code>,
+ * as it does not accept ranges and so on.)
*
* a = [ "a", "b", "c", "d", "e" ]
* a.at(0) #=> "a"
@@ -1029,34 +823,39 @@ rb_ary_aref(int argc, VALUE *argv, VALUE ary)
*/
static VALUE
-rb_ary_at(VALUE ary, VALUE pos)
+rb_ary_at(ary, pos)
+ VALUE ary, pos;
{
return rb_ary_entry(ary, NUM2LONG(pos));
}
/*
* call-seq:
- * array.first -> obj or nil
- * array.first(n) -> an_array
+ * array.first -> obj or nil
+ * array.first(n) -> an_array
*
* Returns the first element, or the first +n+ elements, of the array.
* If the array is empty, the first form returns <code>nil</code>, and the
* second form returns an empty array.
*
* a = [ "q", "r", "s", "t" ]
- * a.first #=> "q"
- * a.first(2) #=> ["q", "r"]
+ * a.first #=> "q"
+ * a.first(1) #=> ["q"]
+ * a.first(3) #=> ["q", "r", "s"]
*/
static VALUE
-rb_ary_first(int argc, VALUE *argv, VALUE ary)
+rb_ary_first(argc, argv, ary)
+ int argc;
+ VALUE *argv;
+ VALUE ary;
{
if (argc == 0) {
- if (RARRAY_LEN(ary) == 0) return Qnil;
- return RARRAY_PTR(ary)[0];
+ if (RARRAY(ary)->len == 0) return Qnil;
+ return RARRAY(ary)->ptr[0];
}
else {
- return ary_take_first_or_last(argc, argv, ary, ARY_TAKE_FIRST);
+ return ary_shared_first(argc, argv, ary, Qfalse);
}
}
@@ -1064,24 +863,25 @@ rb_ary_first(int argc, VALUE *argv, VALUE ary)
* call-seq:
* array.last -> obj or nil
* array.last(n) -> an_array
- *
+ *
* Returns the last element(s) of <i>self</i>. If the array is empty,
* the first form returns <code>nil</code>.
- *
- * a = [ "w", "x", "y", "z" ]
- * a.last #=> "z"
- * a.last(2) #=> ["y", "z"]
+ *
+ * [ "w", "x", "y", "z" ].last #=> "z"
*/
-VALUE
-rb_ary_last(int argc, VALUE *argv, VALUE ary)
+static VALUE
+rb_ary_last(argc, argv, ary)
+ int argc;
+ VALUE *argv;
+ VALUE ary;
{
if (argc == 0) {
- if (RARRAY_LEN(ary) == 0) return Qnil;
- return RARRAY_PTR(ary)[RARRAY_LEN(ary)-1];
+ if (RARRAY(ary)->len == 0) return Qnil;
+ return RARRAY(ary)->ptr[RARRAY(ary)->len-1];
}
else {
- return ary_take_first_or_last(argc, argv, ary, ARY_TAKE_LAST);
+ return ary_shared_first(argc, argv, ary, Qtrue);
}
}
@@ -1090,14 +890,14 @@ rb_ary_last(int argc, VALUE *argv, VALUE ary)
* array.fetch(index) -> obj
* array.fetch(index, default ) -> obj
* array.fetch(index) {|index| block } -> obj
- *
+ *
* Tries to return the element at position <i>index</i>. If the index
* lies outside the array, the first form throws an
* <code>IndexError</code> exception, the second form returns
* <i>default</i>, and the third form returns the value of invoking
* the block, passing in the index. Negative values of <i>index</i>
* count from the end of the array.
- *
+ *
* a = [ 11, 22, 33, 44 ]
* a.fetch(1) #=> 22
* a.fetch(-1) #=> 44
@@ -1106,7 +906,10 @@ rb_ary_last(int argc, VALUE *argv, VALUE ary)
*/
static VALUE
-rb_ary_fetch(int argc, VALUE *argv, VALUE ary)
+rb_ary_fetch(argc, argv, ary)
+ int argc;
+ VALUE *argv;
+ VALUE ary;
{
VALUE pos, ifnone;
long block_given;
@@ -1120,28 +923,28 @@ rb_ary_fetch(int argc, VALUE *argv, VALUE ary)
idx = NUM2LONG(pos);
if (idx < 0) {
- idx += RARRAY_LEN(ary);
+ idx += RARRAY(ary)->len;
}
- if (idx < 0 || RARRAY_LEN(ary) <= idx) {
+ if (idx < 0 || RARRAY(ary)->len <= idx) {
if (block_given) return rb_yield(pos);
if (argc == 1) {
rb_raise(rb_eIndexError, "index %ld out of array", idx);
}
return ifnone;
}
- return RARRAY_PTR(ary)[idx];
+ return RARRAY(ary)->ptr[idx];
}
/*
* call-seq:
* array.index(obj) -> int or nil
* array.index {|item| block} -> int or nil
- *
+ *
* Returns the index of the first object in <i>self</i> such that is
* <code>==</code> to <i>obj</i>. If a block is given instead of an
* argument, returns first object for which <em>block</em> is true.
* Returns <code>nil</code> if no match is found.
- *
+ *
* a = [ "a", "b", "c" ]
* a.index("b") #=> 1
* a.index("z") #=> nil
@@ -1151,25 +954,26 @@ rb_ary_fetch(int argc, VALUE *argv, VALUE ary)
*/
static VALUE
-rb_ary_index(int argc, VALUE *argv, VALUE ary)
+rb_ary_index(argc, argv, ary)
+ int argc;
+ VALUE *argv;
+ VALUE ary;
{
VALUE val;
long i;
- if (argc == 0) {
+ if (argc == 0) {
RETURN_ENUMERATOR(ary, 0, 0);
- for (i=0; i<RARRAY_LEN(ary); i++) {
- if (RTEST(rb_yield(RARRAY_PTR(ary)[i]))) {
+ for (i=0; i<RARRAY(ary)->len; i++) {
+ if (RTEST(rb_yield(RARRAY(ary)->ptr[i]))) {
return LONG2NUM(i);
}
}
return Qnil;
}
- rb_scan_args(argc, argv, "1", &val);
- if (rb_block_given_p())
- rb_warn("given block not used");
- for (i=0; i<RARRAY_LEN(ary); i++) {
- if (rb_equal(RARRAY_PTR(ary)[i], val))
+ rb_scan_args(argc, argv, "01", &val);
+ for (i=0; i<RARRAY(ary)->len; i++) {
+ if (rb_equal(RARRAY(ary)->ptr[i], val))
return LONG2NUM(i);
}
return Qnil;
@@ -1178,12 +982,12 @@ rb_ary_index(int argc, VALUE *argv, VALUE ary)
/*
* call-seq:
* array.rindex(obj) -> int or nil
- *
+ *
* Returns the index of the last object in <i>array</i>
* <code>==</code> to <i>obj</i>. If a block is given instead of an
* argument, returns first object for which <em>block</em> is
* true. Returns <code>nil</code> if no match is found.
- *
+ *
* a = [ "a", "b", "b", "b", "c" ]
* a.rindex("b") #=> 3
* a.rindex("z") #=> nil
@@ -1191,106 +995,144 @@ rb_ary_index(int argc, VALUE *argv, VALUE ary)
*/
static VALUE
-rb_ary_rindex(int argc, VALUE *argv, VALUE ary)
+rb_ary_rindex(argc, argv, ary)
+ int argc;
+ VALUE *argv;
+ VALUE ary;
{
VALUE val;
- long i = RARRAY_LEN(ary);
+ long i = RARRAY(ary)->len;
if (argc == 0) {
RETURN_ENUMERATOR(ary, 0, 0);
while (i--) {
- if (RTEST(rb_yield(RARRAY_PTR(ary)[i])))
+ if (RTEST(rb_yield(RARRAY(ary)->ptr[i])))
return LONG2NUM(i);
- if (i > RARRAY_LEN(ary)) {
- i = RARRAY_LEN(ary);
+ if (i > RARRAY(ary)->len) {
+ i = RARRAY(ary)->len;
}
}
return Qnil;
}
- rb_scan_args(argc, argv, "1", &val);
- if (rb_block_given_p())
- rb_warn("given block not used");
+ rb_scan_args(argc, argv, "01", &val);
while (i--) {
- if (rb_equal(RARRAY_PTR(ary)[i], val))
+ if (rb_equal(RARRAY(ary)->ptr[i], val))
return LONG2NUM(i);
- if (i > RARRAY_LEN(ary)) {
- i = RARRAY_LEN(ary);
+ if (i > RARRAY(ary)->len) {
+ i = RARRAY(ary)->len;
}
}
return Qnil;
}
+/*
+ * call-seq:
+ * array.indexes( i1, i2, ... iN ) -> an_array
+ * array.indices( i1, i2, ... iN ) -> an_array
+ *
+ * Deprecated; use <code>Array#values_at</code>.
+ */
+
+static VALUE
+rb_ary_indexes(argc, argv, ary)
+ int argc;
+ VALUE *argv;
+ VALUE ary;
+{
+ VALUE new_ary;
+ long i;
+
+ rb_warn("Array#%s is deprecated; use Array#values_at", rb_id2name(rb_frame_last_func()));
+ new_ary = rb_ary_new2(argc);
+ for (i=0; i<argc; i++) {
+ rb_ary_push(new_ary, rb_ary_aref(1, argv+i, ary));
+ }
+
+ return new_ary;
+}
+
VALUE
-rb_ary_to_ary(VALUE obj)
+rb_ary_to_ary(obj)
+ VALUE obj;
{
if (TYPE(obj) == T_ARRAY) {
return obj;
}
if (rb_respond_to(obj, rb_intern("to_ary"))) {
- return to_ary(obj);
+ return rb_convert_type(obj, T_ARRAY, "Array", "to_ary");
}
return rb_ary_new3(1, obj);
}
static void
-rb_ary_splice(VALUE ary, long beg, long len, VALUE rpl)
+rb_ary_splice(ary, beg, len, rpl)
+ VALUE ary;
+ long beg, len;
+ VALUE rpl;
{
long rlen;
if (len < 0) rb_raise(rb_eIndexError, "negative length (%ld)", len);
if (beg < 0) {
- beg += RARRAY_LEN(ary);
+ beg += RARRAY(ary)->len;
if (beg < 0) {
- beg -= RARRAY_LEN(ary);
+ beg -= RARRAY(ary)->len;
rb_raise(rb_eIndexError, "index %ld out of array", beg);
}
}
- if (RARRAY_LEN(ary) < len || RARRAY_LEN(ary) < beg + len) {
- len = RARRAY_LEN(ary) - beg;
+ if (RARRAY(ary)->len < len || RARRAY(ary)->len < beg + len) {
+ len = RARRAY(ary)->len - beg;
}
- if (rpl == Qundef) {
+ if (NIL_P(rpl)) {
rlen = 0;
}
else {
rpl = rb_ary_to_ary(rpl);
- rlen = RARRAY_LEN(rpl);
+ rlen = RARRAY(rpl)->len;
}
rb_ary_modify(ary);
- if (beg >= RARRAY_LEN(ary)) {
+
+ if (beg >= RARRAY(ary)->len) {
if (beg > ARY_MAX_SIZE - rlen) {
rb_raise(rb_eIndexError, "index %ld too big", beg);
}
len = beg + rlen;
- if (len >= ARY_CAPA(ary)) {
- ary_double_capa(ary, len);
+ if (len >= RARRAY(ary)->aux.capa) {
+ REALLOC_N(RARRAY(ary)->ptr, VALUE, len);
+ RARRAY(ary)->aux.capa = len;
}
- rb_mem_clear(RARRAY_PTR(ary) + RARRAY_LEN(ary), beg - RARRAY_LEN(ary));
+ rb_mem_clear(RARRAY(ary)->ptr + RARRAY(ary)->len, beg - RARRAY(ary)->len);
if (rlen > 0) {
- MEMCPY(RARRAY_PTR(ary) + beg, RARRAY_PTR(rpl), VALUE, rlen);
+ MEMCPY(RARRAY(ary)->ptr + beg, RARRAY(rpl)->ptr, VALUE, rlen);
}
- ARY_SET_LEN(ary, len);
+ RARRAY(ary)->len = len;
}
else {
long alen;
- alen = RARRAY_LEN(ary) + rlen - len;
- if (alen >= ARY_CAPA(ary)) {
- ary_double_capa(ary, alen);
+ if (beg + len > RARRAY(ary)->len) {
+ len = RARRAY(ary)->len - beg;
+ }
+
+ alen = RARRAY(ary)->len + rlen - len;
+ if (alen >= RARRAY(ary)->aux.capa) {
+ REALLOC_N(RARRAY(ary)->ptr, VALUE, alen);
+ RARRAY(ary)->aux.capa = alen;
}
if (len != rlen) {
- MEMMOVE(RARRAY_PTR(ary) + beg + rlen, RARRAY_PTR(ary) + beg + len,
- VALUE, RARRAY_LEN(ary) - (beg + len));
- ARY_SET_LEN(ary, alen);
+ MEMMOVE(RARRAY(ary)->ptr + beg + rlen, RARRAY(ary)->ptr + beg + len,
+ VALUE, RARRAY(ary)->len - (beg + len));
+ RARRAY(ary)->len = alen;
}
if (rlen > 0) {
- MEMMOVE(RARRAY_PTR(ary) + beg, RARRAY_PTR(rpl), VALUE, rlen);
+ MEMMOVE(RARRAY(ary)->ptr + beg, RARRAY(rpl)->ptr, VALUE, rlen);
}
}
}
-/*
+/*
* call-seq:
* array[index] = obj -> obj
* array[start, length] = obj or an_array or nil -> obj or an_array or nil
@@ -1303,10 +1145,11 @@ rb_ary_splice(VALUE ary, long beg, long len, VALUE rpl)
* the current capacity of the array, the array grows
* automatically. A negative indices will count backward
* from the end of the array. Inserts elements if _length_ is
- * zero. An +IndexError+ is raised if a negative index points
- * past the beginning of the array. See also
+ * zero. If +nil+ is used in the second and third form,
+ * deletes elements from _self_. An +IndexError+ is raised if a
+ * negative index points past the beginning of the array. See also
* <code>Array#push</code>, and <code>Array#unshift</code>.
- *
+ *
* a = Array.new
* a[4] = "4"; #=> [nil, nil, nil, nil, "4"]
* a[0, 3] = [ 'a', 'b', 'c' ] #=> ["a", "b", "c", nil, "4"]
@@ -1314,19 +1157,25 @@ rb_ary_splice(VALUE ary, long beg, long len, VALUE rpl)
* a[0, 2] = "?" #=> ["?", 2, nil, "4"]
* a[0..2] = "A" #=> ["A", "4"]
* a[-1] = "Z" #=> ["A", "Z"]
- * a[1..-1] = nil #=> ["A", nil]
- * a[1..-1] = [] #=> ["A"]
+ * a[1..-1] = nil #=> ["A"]
*/
static VALUE
-rb_ary_aset(int argc, VALUE *argv, VALUE ary)
+rb_ary_aset(argc, argv, ary)
+ int argc;
+ VALUE *argv;
+ VALUE ary;
{
long offset, beg, len;
if (argc == 3) {
- beg = NUM2LONG(argv[0]);
- len = NUM2LONG(argv[1]);
- rb_ary_splice(ary, beg, len, argv[2]);
+ if (SYMBOL_P(argv[0])) {
+ rb_raise(rb_eTypeError, "Symbol as array index");
+ }
+ if (SYMBOL_P(argv[1])) {
+ rb_raise(rb_eTypeError, "Symbol as subarray length");
+ }
+ rb_ary_splice(ary, NUM2LONG(argv[0]), NUM2LONG(argv[1]), argv[2]);
return argv[2];
}
if (argc != 2) {
@@ -1336,7 +1185,10 @@ rb_ary_aset(int argc, VALUE *argv, VALUE ary)
offset = FIX2LONG(argv[0]);
goto fixnum;
}
- if (rb_range_beg_len(argv[0], &beg, &len, RARRAY_LEN(ary), 1)) {
+ if (SYMBOL_P(argv[0])) {
+ rb_raise(rb_eTypeError, "Symbol as array index");
+ }
+ if (rb_range_beg_len(argv[0], &beg, &len, RARRAY(ary)->len, 1)) {
/* check if idx is Range */
rb_ary_splice(ary, beg, len, argv[1]);
return argv[1];
@@ -1351,17 +1203,20 @@ fixnum:
/*
* call-seq:
* array.insert(index, obj...) -> array
- *
+ *
* Inserts the given values before the element with the given index
* (which may be negative).
- *
+ *
* a = %w{ a b c d }
* a.insert(2, 99) #=> ["a", "b", 99, "c", "d"]
* a.insert(-2, 1, 2, 3) #=> ["a", "b", 99, "c", 1, 2, 3, "d"]
*/
static VALUE
-rb_ary_insert(int argc, VALUE *argv, VALUE ary)
+rb_ary_insert(argc, argv, ary)
+ int argc;
+ VALUE *argv;
+ VALUE ary;
{
long pos;
@@ -1371,7 +1226,7 @@ rb_ary_insert(int argc, VALUE *argv, VALUE ary)
}
pos = NUM2LONG(argv[0]);
if (pos == -1) {
- pos = RARRAY_LEN(ary);
+ pos = RARRAY(ary)->len;
}
if (pos < 0) {
pos++;
@@ -1383,26 +1238,27 @@ rb_ary_insert(int argc, VALUE *argv, VALUE ary)
/*
* call-seq:
* array.each {|item| block } -> array
- *
+ *
* Calls <i>block</i> once for each element in <i>self</i>, passing that
* element as a parameter.
- *
+ *
* a = [ "a", "b", "c" ]
* a.each {|x| print x, " -- " }
- *
+ *
* produces:
- *
+ *
* a -- b -- c --
*/
VALUE
-rb_ary_each(VALUE ary)
+rb_ary_each(ary)
+ VALUE ary;
{
long i;
RETURN_ENUMERATOR(ary, 0, 0);
- for (i=0; i<RARRAY_LEN(ary); i++) {
- rb_yield(RARRAY_PTR(ary)[i]);
+ for (i=0; i<RARRAY(ary)->len; i++) {
+ rb_yield(RARRAY(ary)->ptr[i]);
}
return ary;
}
@@ -1410,25 +1266,26 @@ rb_ary_each(VALUE ary)
/*
* call-seq:
* array.each_index {|index| block } -> array
- *
+ *
* Same as <code>Array#each</code>, but passes the index of the element
* instead of the element itself.
- *
+ *
* a = [ "a", "b", "c" ]
* a.each_index {|x| print x, " -- " }
- *
+ *
* produces:
- *
+ *
* 0 -- 1 -- 2 --
*/
static VALUE
-rb_ary_each_index(VALUE ary)
+rb_ary_each_index(ary)
+ VALUE ary;
{
long i;
- RETURN_ENUMERATOR(ary, 0, 0);
- for (i=0; i<RARRAY_LEN(ary); i++) {
+ RETURN_ENUMERATOR(ary, 0, 0);
+ for (i=0; i<RARRAY(ary)->len; i++) {
rb_yield(LONG2NUM(i));
}
return ary;
@@ -1436,30 +1293,31 @@ rb_ary_each_index(VALUE ary)
/*
* call-seq:
- * array.reverse_each {|item| block }
- *
+ * array.reverse_each {|item| block }
+ *
* Same as <code>Array#each</code>, but traverses <i>self</i> in reverse
* order.
- *
+ *
* a = [ "a", "b", "c" ]
* a.reverse_each {|x| print x, " " }
- *
+ *
* produces:
- *
+ *
* c b a
*/
static VALUE
-rb_ary_reverse_each(VALUE ary)
+rb_ary_reverse_each(ary)
+ VALUE ary;
{
long len;
RETURN_ENUMERATOR(ary, 0, 0);
- len = RARRAY_LEN(ary);
+ len = RARRAY(ary)->len;
while (len--) {
- rb_yield(RARRAY_PTR(ary)[len]);
- if (RARRAY_LEN(ary) < len) {
- len = RARRAY_LEN(ary);
+ rb_yield(RARRAY(ary)->ptr[len]);
+ if (RARRAY(ary)->len < len) {
+ len = RARRAY(ary)->len;
}
}
return ary;
@@ -1468,259 +1326,285 @@ rb_ary_reverse_each(VALUE ary)
/*
* call-seq:
* array.length -> int
- *
+ *
* Returns the number of elements in <i>self</i>. May be zero.
- *
+ *
* [ 1, 2, 3, 4, 5 ].length #=> 5
*/
static VALUE
-rb_ary_length(VALUE ary)
+rb_ary_length(ary)
+ VALUE ary;
{
- long len = RARRAY_LEN(ary);
- return LONG2NUM(len);
+ return LONG2NUM(RARRAY(ary)->len);
}
/*
* call-seq:
* array.empty? -> true or false
- *
+ *
* Returns <code>true</code> if <i>self</i> array contains no elements.
- *
+ *
* [].empty? #=> true
*/
static VALUE
-rb_ary_empty_p(VALUE ary)
+rb_ary_empty_p(ary)
+ VALUE ary;
{
- if (RARRAY_LEN(ary) == 0)
+ if (RARRAY(ary)->len == 0)
return Qtrue;
return Qfalse;
}
VALUE
-rb_ary_dup(VALUE ary)
+rb_ary_dup(ary)
+ VALUE ary;
{
- VALUE dup = rb_ary_new2(RARRAY_LEN(ary));
- int is_embed = ARY_EMBED_P(dup);
- DUPSETUP(dup, ary);
- if (is_embed) FL_SET_EMBED(dup);
- MEMCPY(RARRAY_PTR(dup), RARRAY_PTR(ary), VALUE, RARRAY_LEN(ary));
- ARY_SET_LEN(dup, RARRAY_LEN(ary));
+ VALUE dup = rb_ary_new2(RARRAY(ary)->len);
+ DUPSETUP(dup, ary);
+ MEMCPY(RARRAY(dup)->ptr, RARRAY(ary)->ptr, VALUE, RARRAY(ary)->len);
+ RARRAY(dup)->len = RARRAY(ary)->len;
return dup;
}
-VALUE
-rb_ary_resurrect(VALUE ary)
-{
- return rb_ary_new4(RARRAY_LEN(ary), RARRAY_PTR(ary));
-}
-
extern VALUE rb_output_fs;
-static void ary_join_1(VALUE obj, VALUE ary, VALUE sep, long i, VALUE result);
-
static VALUE
-recursive_join(VALUE obj, VALUE argp, int recur)
-{
- VALUE *arg = (VALUE *)argp;
- VALUE ary = arg[0];
- VALUE sep = arg[1];
- VALUE result = arg[2];
-
- if (recur) {
- rb_raise(rb_eArgError, "recursive array join");
- }
- else {
- ary_join_1(obj, ary, sep, 0, result);
- }
- return Qnil;
-}
-
-static void
-ary_join_0(VALUE ary, VALUE sep, long max, VALUE result)
+inspect_join(ary, arg)
+ VALUE ary;
+ VALUE *arg;
{
- long i;
- VALUE val;
-
- for (i=0; i<max; i++) {
- val = RARRAY_PTR(ary)[i];
- if (i > 0 && !NIL_P(sep))
- rb_str_buf_append(result, sep);
- rb_str_buf_append(result, val);
- if (OBJ_TAINTED(val)) OBJ_TAINT(result);
- if (OBJ_UNTRUSTED(val)) OBJ_TAINT(result);
- }
+ return rb_ary_join(arg[0], arg[1]);
}
-static void
-ary_join_1(VALUE obj, VALUE ary, VALUE sep, long i, VALUE result)
+VALUE
+rb_ary_join(ary, sep)
+ VALUE ary, sep;
{
- VALUE val, tmp;
+ long len = 1, i;
+ int taint = Qfalse;
+ VALUE result, tmp;
- for (; i<RARRAY_LEN(ary); i++) {
- if (i > 0 && !NIL_P(sep))
- rb_str_buf_append(result, sep);
+ if (RARRAY(ary)->len == 0) return rb_str_new(0, 0);
+ if (OBJ_TAINTED(ary) || OBJ_TAINTED(sep)) taint = Qtrue;
- val = RARRAY_PTR(ary)[i];
- switch (TYPE(val)) {
+ for (i=0; i<RARRAY(ary)->len; i++) {
+ tmp = rb_check_string_type(RARRAY(ary)->ptr[i]);
+ len += NIL_P(tmp) ? 10 : RSTRING(tmp)->len;
+ }
+ if (!NIL_P(sep)) {
+ StringValue(sep);
+ len += RSTRING(sep)->len * (RARRAY(ary)->len - 1);
+ }
+ result = rb_str_buf_new(len);
+ for (i=0; i<RARRAY(ary)->len; i++) {
+ tmp = RARRAY(ary)->ptr[i];
+ switch (TYPE(tmp)) {
case T_STRING:
- str_join:
- rb_str_buf_append(result, val);
break;
case T_ARRAY:
- obj = val;
- ary_join:
- if (val == ary) {
- rb_raise(rb_eArgError, "recursive array join");
+ if (rb_inspecting_p(tmp)) {
+ tmp = rb_str_new2("[...]");
}
else {
- VALUE args[3];
-
- args[0] = val;
+ VALUE args[2];
+
+ args[0] = tmp;
args[1] = sep;
- args[2] = result;
- rb_exec_recursive(recursive_join, obj, (VALUE)args);
+ tmp = rb_protect_inspect(inspect_join, ary, (VALUE)args);
}
break;
default:
- tmp = rb_check_string_type(val);
- if (!NIL_P(tmp)) {
- val = tmp;
- goto str_join;
- }
- tmp = rb_check_convert_type(val, T_ARRAY, "Array", "to_a");
- if (!NIL_P(tmp)) {
- obj = val;
- val = tmp;
- goto ary_join;
- }
- val = rb_obj_as_string(val);
- goto str_join;
+ tmp = rb_obj_as_string(tmp);
}
- }
-}
-
-VALUE
-rb_ary_join(VALUE ary, VALUE sep)
-{
- long len = 1, i;
- int taint = FALSE;
- int untrust = FALSE;
- VALUE val, tmp, result;
-
- if (RARRAY_LEN(ary) == 0) return rb_str_new(0, 0);
- if (OBJ_TAINTED(ary) || OBJ_TAINTED(sep)) taint = TRUE;
- if (OBJ_UNTRUSTED(ary) || OBJ_UNTRUSTED(sep)) untrust = TRUE;
-
- if (!NIL_P(sep)) {
- StringValue(sep);
- len += RSTRING_LEN(sep) * (RARRAY_LEN(ary) - 1);
- }
- for (i=0; i<RARRAY_LEN(ary); i++) {
- val = RARRAY_PTR(ary)[i];
- tmp = rb_check_string_type(val);
-
- if (NIL_P(tmp) || tmp != val) {
- result = rb_str_buf_new(len + (RARRAY_LEN(ary)-i)*10);
- if (taint) OBJ_TAINT(result);
- if (untrust) OBJ_UNTRUST(result);
- ary_join_0(ary, sep, i, result);
- ary_join_1(ary, ary, sep, i, result);
- return result;
- }
-
- len += RSTRING_LEN(tmp);
+ if (i > 0 && !NIL_P(sep))
+ rb_str_buf_append(result, sep);
+ rb_str_buf_append(result, tmp);
+ if (OBJ_TAINTED(tmp)) taint = Qtrue;
}
- result = rb_str_buf_new(len);
if (taint) OBJ_TAINT(result);
- if (untrust) OBJ_UNTRUST(result);
- ary_join_0(ary, sep, RARRAY_LEN(ary), result);
-
return result;
}
/*
* call-seq:
* array.join(sep=$,) -> str
- *
+ *
* Returns a string created by converting each element of the array to
* a string, separated by <i>sep</i>.
- *
+ *
* [ "a", "b", "c" ].join #=> "abc"
* [ "a", "b", "c" ].join("-") #=> "a-b-c"
*/
static VALUE
-rb_ary_join_m(int argc, VALUE *argv, VALUE ary)
+rb_ary_join_m(argc, argv, ary)
+ int argc;
+ VALUE *argv;
+ VALUE ary;
{
VALUE sep;
rb_scan_args(argc, argv, "01", &sep);
if (NIL_P(sep)) sep = rb_output_fs;
-
+
return rb_ary_join(ary, sep);
}
+/*
+ * call-seq:
+ * array.to_s -> string
+ *
+ * Returns _self_<code>.join</code>.
+ *
+ * [ "a", "e", "i", "o" ].to_s #=> "aeio"
+ *
+ */
+
+VALUE
+rb_ary_to_s(ary)
+ VALUE ary;
+{
+ if (RARRAY(ary)->len == 0) return rb_str_new(0, 0);
+
+ return rb_ary_join(ary, rb_output_fs);
+}
+
+static ID inspect_key;
+
+struct inspect_arg {
+ VALUE (*func)();
+ VALUE arg1, arg2;
+};
+
static VALUE
-inspect_ary(VALUE ary, VALUE dummy, int recur)
+inspect_call(arg)
+ struct inspect_arg *arg;
+{
+ return (*arg->func)(arg->arg1, arg->arg2);
+}
+
+static VALUE
+get_inspect_tbl(create)
+ int create;
+{
+ VALUE inspect_tbl = rb_thread_local_aref(rb_thread_current(), inspect_key);
+
+ if (NIL_P(inspect_tbl)) {
+ if (create) {
+ tbl_init:
+ inspect_tbl = rb_ary_new();
+ rb_thread_local_aset(rb_thread_current(), inspect_key, inspect_tbl);
+ }
+ }
+ else if (TYPE(inspect_tbl) != T_ARRAY) {
+ rb_warn("invalid inspect_tbl value");
+ if (create) goto tbl_init;
+ rb_thread_local_aset(rb_thread_current(), inspect_key, Qnil);
+ return Qnil;
+ }
+ return inspect_tbl;
+}
+
+static VALUE
+inspect_ensure(obj)
+ VALUE obj;
+{
+ VALUE inspect_tbl;
+
+ inspect_tbl = get_inspect_tbl(Qfalse);
+ if (!NIL_P(inspect_tbl)) {
+ rb_ary_pop(inspect_tbl);
+ }
+ return 0;
+}
+
+VALUE
+rb_protect_inspect(func, obj, arg)
+ VALUE (*func)(ANYARGS);
+ VALUE obj, arg;
+{
+ struct inspect_arg iarg;
+ VALUE inspect_tbl;
+ VALUE id;
+
+ inspect_tbl = get_inspect_tbl(Qtrue);
+ id = rb_obj_id(obj);
+ if (rb_ary_includes(inspect_tbl, id)) {
+ return (*func)(obj, arg);
+ }
+ rb_ary_push(inspect_tbl, id);
+ iarg.func = func;
+ iarg.arg1 = obj;
+ iarg.arg2 = arg;
+
+ return rb_ensure(inspect_call, (VALUE)&iarg, inspect_ensure, obj);
+}
+
+VALUE
+rb_inspecting_p(obj)
+ VALUE obj;
+{
+ VALUE inspect_tbl;
+
+ inspect_tbl = get_inspect_tbl(Qfalse);
+ if (NIL_P(inspect_tbl)) return Qfalse;
+ return rb_ary_includes(inspect_tbl, rb_obj_id(obj));
+}
+
+static VALUE
+inspect_ary(ary)
+ VALUE ary;
{
int tainted = OBJ_TAINTED(ary);
- int untrust = OBJ_UNTRUSTED(ary);
long i;
VALUE s, str;
- if (recur) return rb_tainted_str_new2("[...]");
str = rb_str_buf_new2("[");
- for (i=0; i<RARRAY_LEN(ary); i++) {
- s = rb_inspect(RARRAY_PTR(ary)[i]);
- if (OBJ_TAINTED(s)) tainted = TRUE;
- if (OBJ_UNTRUSTED(s)) untrust = TRUE;
+ for (i=0; i<RARRAY(ary)->len; i++) {
+ s = rb_inspect(RARRAY(ary)->ptr[i]);
+ if (OBJ_TAINTED(s)) tainted = Qtrue;
if (i > 0) rb_str_buf_cat2(str, ", ");
rb_str_buf_append(str, s);
}
rb_str_buf_cat2(str, "]");
if (tainted) OBJ_TAINT(str);
- if (untrust) OBJ_UNTRUST(str);
return str;
}
/*
* call-seq:
- * array.to_s -> string
* array.inspect -> string
*
* Create a printable version of <i>array</i>.
*/
static VALUE
-rb_ary_inspect(VALUE ary)
-{
- if (RARRAY_LEN(ary) == 0) return rb_usascii_str_new2("[]");
- return rb_exec_recursive(inspect_ary, ary, 0);
-}
-
-VALUE
-rb_ary_to_s(VALUE ary)
+rb_ary_inspect(ary)
+ VALUE ary;
{
- return rb_ary_inspect(ary);
+ if (RARRAY(ary)->len == 0) return rb_str_new2("[]");
+ if (rb_inspecting_p(ary)) return rb_str_new2("[...]");
+ return rb_protect_inspect(inspect_ary, ary, 0);
}
/*
* call-seq:
* array.to_a -> array
- *
+ *
* Returns _self_. If called on a subclass of Array, converts
* the receiver to an Array object.
*/
static VALUE
-rb_ary_to_a(VALUE ary)
+rb_ary_to_a(ary)
+ VALUE ary;
{
if (rb_obj_class(ary) != rb_cArray) {
- VALUE dup = rb_ary_new2(RARRAY_LEN(ary));
+ VALUE dup = rb_ary_new2(RARRAY(ary)->len);
rb_ary_replace(dup, ary);
return dup;
}
@@ -1730,26 +1614,28 @@ rb_ary_to_a(VALUE ary)
/*
* call-seq:
* array.to_ary -> array
- *
+ *
* Returns _self_.
*/
static VALUE
-rb_ary_to_ary_m(VALUE ary)
+rb_ary_to_ary_m(ary)
+ VALUE ary;
{
return ary;
}
VALUE
-rb_ary_reverse(VALUE ary)
+rb_ary_reverse(ary)
+ VALUE ary;
{
VALUE *p1, *p2;
VALUE tmp;
rb_ary_modify(ary);
- if (RARRAY_LEN(ary) > 1) {
- p1 = RARRAY_PTR(ary);
- p2 = p1 + RARRAY_LEN(ary) - 1; /* points last item */
+ if (RARRAY(ary)->len > 1) {
+ p1 = RARRAY(ary)->ptr;
+ p2 = p1 + RARRAY(ary)->len - 1; /* points last item */
while (p1 < p2) {
tmp = *p1;
@@ -1762,17 +1648,18 @@ rb_ary_reverse(VALUE ary)
/*
* call-seq:
- * array.reverse! -> array
- *
+ * array.reverse! -> array
+ *
* Reverses _self_ in place.
- *
+ *
* a = [ "a", "b", "c" ]
* a.reverse! #=> ["c", "b", "a"]
* a #=> ["c", "b", "a"]
*/
static VALUE
-rb_ary_reverse_bang(VALUE ary)
+rb_ary_reverse_bang(ary)
+ VALUE ary;
{
return rb_ary_reverse(ary);
}
@@ -1780,246 +1667,180 @@ rb_ary_reverse_bang(VALUE ary)
/*
* call-seq:
* array.reverse -> an_array
- *
+ *
* Returns a new array containing <i>self</i>'s elements in reverse order.
- *
+ *
* [ "a", "b", "c" ].reverse #=> ["c", "b", "a"]
* [ 1 ].reverse #=> [1]
*/
static VALUE
-rb_ary_reverse_m(VALUE ary)
+rb_ary_reverse_m(ary)
+ VALUE ary;
{
return rb_ary_reverse(rb_ary_dup(ary));
}
struct ary_sort_data {
VALUE ary;
- int opt_methods;
- int opt_inited;
-};
-
-enum {
- sort_opt_Fixnum,
- sort_opt_String,
- sort_optimizable_count
+ VALUE *ptr;
+ long len;
};
-#define STRING_P(s) (TYPE(s) == T_STRING && CLASS_OF(s) == rb_cString)
-
-#define SORT_OPTIMIZABLE_BIT(type) (1U << TOKEN_PASTE(sort_opt_,type))
-#define SORT_OPTIMIZABLE(data, type) \
- ((data->opt_inited & SORT_OPTIMIZABLE_BIT(type)) ? \
- (data->opt_methods & SORT_OPTIMIZABLE_BIT(type)) : \
- ((data->opt_inited |= SORT_OPTIMIZABLE_BIT(type)), \
- rb_method_basic_definition_p(TOKEN_PASTE(rb_c,type), id_cmp) && \
- (data->opt_methods |= SORT_OPTIMIZABLE_BIT(type))))
-
-static VALUE
-sort_reentered(VALUE ary)
+static void
+ary_sort_check(data)
+ struct ary_sort_data *data;
{
- if (RBASIC(ary)->klass) {
- rb_raise(rb_eRuntimeError, "sort reentered");
+ if (RARRAY(data->ary)->ptr != data->ptr || RARRAY(data->ary)->len != data->len) {
+ rb_raise(rb_eArgError, "array modified during sort");
}
- return Qnil;
}
static int
-sort_1(const void *ap, const void *bp, void *dummy)
+sort_1(a, b, data)
+ VALUE *a, *b;
+ struct ary_sort_data *data;
{
- struct ary_sort_data *data = dummy;
- VALUE retval = sort_reentered(data->ary);
- VALUE a = *(const VALUE *)ap, b = *(const VALUE *)bp;
+ VALUE retval = rb_yield_values(2, *a, *b);
int n;
- retval = rb_yield_values(2, a, b);
- n = rb_cmpint(retval, a, b);
- sort_reentered(data->ary);
+ n = rb_cmpint(retval, *a, *b);
+ ary_sort_check(data);
return n;
}
static int
-sort_2(const void *ap, const void *bp, void *dummy)
+sort_2(ap, bp, data)
+ VALUE *ap, *bp;
+ struct ary_sort_data *data;
{
- struct ary_sort_data *data = dummy;
- VALUE retval = sort_reentered(data->ary);
- VALUE a = *(const VALUE *)ap, b = *(const VALUE *)bp;
+ VALUE retval;
+ VALUE a = *ap, b = *bp;
int n;
- if (FIXNUM_P(a) && FIXNUM_P(b) && SORT_OPTIMIZABLE(data, Fixnum)) {
+ if (FIXNUM_P(a) && FIXNUM_P(b)) {
if ((long)a > (long)b) return 1;
if ((long)a < (long)b) return -1;
return 0;
}
- if (STRING_P(a) && STRING_P(b) && SORT_OPTIMIZABLE(data, String)) {
- return rb_str_cmp(a, b);
+ if (TYPE(a) == T_STRING) {
+ if (TYPE(b) == T_STRING) return rb_str_cmp(a, b);
}
retval = rb_funcall(a, id_cmp, 1, b);
n = rb_cmpint(retval, a, b);
- sort_reentered(data->ary);
+ ary_sort_check(data);
return n;
}
+static VALUE
+sort_internal(ary)
+ VALUE ary;
+{
+ struct ary_sort_data data;
+
+ data.ary = ary;
+ data.ptr = RARRAY(ary)->ptr; data.len = RARRAY(ary)->len;
+ qsort(RARRAY(ary)->ptr, RARRAY(ary)->len, sizeof(VALUE),
+ rb_block_given_p()?sort_1:sort_2, &data);
+ return ary;
+}
+
+static VALUE
+sort_unlock(ary)
+ VALUE ary;
+{
+ FL_UNSET(ary, ARY_TMPLOCK);
+ return ary;
+}
+
/*
* call-seq:
* array.sort! -> array
- * array.sort! {| a,b | block } -> array
- *
+ * array.sort! {| a,b | block } -> array
+ *
* Sorts _self_. Comparisons for
* the sort will be done using the <code><=></code> operator or using
* an optional code block. The block implements a comparison between
* <i>a</i> and <i>b</i>, returning -1, 0, or +1. See also
* <code>Enumerable#sort_by</code>.
- *
+ *
* a = [ "d", "a", "e", "c", "b" ]
* a.sort #=> ["a", "b", "c", "d", "e"]
* a.sort {|x,y| y <=> x } #=> ["e", "d", "c", "b", "a"]
*/
VALUE
-rb_ary_sort_bang(VALUE ary)
+rb_ary_sort_bang(ary)
+ VALUE ary;
{
rb_ary_modify(ary);
- assert(!ARY_SHARED_P(ary));
- if (RARRAY_LEN(ary) > 1) {
- VALUE tmp = ary_make_substitution(ary); /* only ary refers tmp */
- struct ary_sort_data data;
-
- RBASIC(tmp)->klass = 0;
- data.ary = tmp;
- data.opt_methods = 0;
- data.opt_inited = 0;
- ruby_qsort(RARRAY_PTR(tmp), RARRAY_LEN(tmp), sizeof(VALUE),
- rb_block_given_p()?sort_1:sort_2, &data);
-
- if (ARY_EMBED_P(tmp)) {
- assert(ARY_EMBED_P(tmp));
- if (ARY_SHARED_P(ary)) { /* ary might be destructively operated in the given block */
- rb_ary_unshare(ary);
- }
- FL_SET_EMBED(ary);
- MEMCPY(RARRAY_PTR(ary), ARY_EMBED_PTR(tmp), VALUE, ARY_EMBED_LEN(tmp));
- ARY_SET_LEN(ary, ARY_EMBED_LEN(tmp));
- }
- else {
- assert(!ARY_EMBED_P(tmp));
- if (ARY_HEAP_PTR(ary) == ARY_HEAP_PTR(tmp)) {
- assert(!ARY_EMBED_P(ary));
- FL_UNSET_SHARED(ary);
- ARY_SET_CAPA(ary, ARY_CAPA(tmp));
- }
- else {
- assert(!ARY_SHARED_P(tmp));
- if (ARY_EMBED_P(ary)) {
- FL_UNSET_EMBED(ary);
- }
- else if (ARY_SHARED_P(ary)) {
- /* ary might be destructively operated in the given block */
- rb_ary_unshare(ary);
- }
- else {
- xfree(ARY_HEAP_PTR(ary));
- }
- ARY_SET_PTR(ary, RARRAY_PTR(tmp));
- ARY_SET_HEAP_LEN(ary, RARRAY_LEN(tmp));
- ARY_SET_CAPA(ary, ARY_CAPA(tmp));
- }
- /* tmp was lost ownership for the ptr */
- FL_UNSET(tmp, FL_FREEZE);
- FL_SET_EMBED(tmp);
- ARY_SET_EMBED_LEN(tmp, 0);
- FL_SET(tmp, FL_FREEZE);
- }
- /* tmp will be GC'ed. */
- RBASIC(tmp)->klass = rb_cArray;
+ if (RARRAY(ary)->len > 1) {
+ FL_SET(ary, ARY_TMPLOCK); /* prohibit modification during sort */
+ rb_ensure(sort_internal, ary, sort_unlock, ary);
}
return ary;
}
/*
* call-seq:
- * array.sort -> an_array
- * array.sort {| a,b | block } -> an_array
- *
+ * array.sort -> an_array
+ * array.sort {| a,b | block } -> an_array
+ *
* Returns a new array created by sorting <i>self</i>. Comparisons for
* the sort will be done using the <code><=></code> operator or using
* an optional code block. The block implements a comparison between
* <i>a</i> and <i>b</i>, returning -1, 0, or +1. See also
* <code>Enumerable#sort_by</code>.
- *
+ *
* a = [ "d", "a", "e", "c", "b" ]
* a.sort #=> ["a", "b", "c", "d", "e"]
* a.sort {|x,y| y <=> x } #=> ["e", "d", "c", "b", "a"]
*/
VALUE
-rb_ary_sort(VALUE ary)
+rb_ary_sort(ary)
+ VALUE ary;
{
ary = rb_ary_dup(ary);
rb_ary_sort_bang(ary);
return ary;
}
-
-static VALUE
-sort_by_i(VALUE i)
-{
- return rb_yield(i);
-}
-
-/*
- * call-seq:
- * array.sort_by! {| obj | block } -> array
- *
- * Sorts <i>array</i> in place using a set of keys generated by mapping the
- * values in <i>array</i> through the given block.
- */
-
-static VALUE
-rb_ary_sort_by_bang(VALUE ary)
-{
- VALUE sorted;
-
- RETURN_ENUMERATOR(ary, 0, 0);
- rb_ary_modify(ary);
- sorted = rb_block_call(ary, rb_intern("sort_by"), 0, 0, sort_by_i, 0);
- rb_ary_replace(ary, sorted);
- return ary;
-}
-
-
/*
* call-seq:
* array.collect {|item| block } -> an_array
* array.map {|item| block } -> an_array
- *
- * Invokes <i>block</i> once for each element of <i>self</i>. Creates a
+ *
+ * Invokes <i>block</i> once for each element of <i>self</i>. Creates a
* new array containing the values returned by the block.
* See also <code>Enumerable#collect</code>.
- *
+ *
* a = [ "a", "b", "c", "d" ]
* a.collect {|x| x + "!" } #=> ["a!", "b!", "c!", "d!"]
* a #=> ["a", "b", "c", "d"]
*/
static VALUE
-rb_ary_collect(VALUE ary)
+rb_ary_collect(ary)
+ VALUE ary;
{
long i;
VALUE collect;
- RETURN_ENUMERATOR(ary, 0, 0);
- collect = rb_ary_new2(RARRAY_LEN(ary));
- for (i = 0; i < RARRAY_LEN(ary); i++) {
- rb_ary_push(collect, rb_yield(RARRAY_PTR(ary)[i]));
+ if (!rb_block_given_p()) {
+ return rb_ary_new4(RARRAY(ary)->len, RARRAY(ary)->ptr);
+ }
+
+ collect = rb_ary_new2(RARRAY(ary)->len);
+ for (i = 0; i < RARRAY(ary)->len; i++) {
+ rb_ary_push(collect, rb_yield(RARRAY(ary)->ptr[i]));
}
return collect;
}
-
-/*
+/*
* call-seq:
* array.collect! {|item| block } -> array
* array.map! {|item| block } -> array
@@ -2027,27 +1848,33 @@ rb_ary_collect(VALUE ary)
* Invokes the block once for each element of _self_, replacing the
* element with the value returned by _block_.
* See also <code>Enumerable#collect</code>.
- *
+ *
* a = [ "a", "b", "c", "d" ]
* a.collect! {|x| x + "!" }
* a #=> [ "a!", "b!", "c!", "d!" ]
*/
static VALUE
-rb_ary_collect_bang(VALUE ary)
+rb_ary_collect_bang(ary)
+ VALUE ary;
{
long i;
RETURN_ENUMERATOR(ary, 0, 0);
rb_ary_modify(ary);
- for (i = 0; i < RARRAY_LEN(ary); i++) {
- rb_ary_store(ary, i, rb_yield(RARRAY_PTR(ary)[i]));
+ for (i = 0; i < RARRAY(ary)->len; i++) {
+ rb_ary_store(ary, i, rb_yield(RARRAY(ary)->ptr[i]));
}
return ary;
}
VALUE
-rb_get_values_at(VALUE obj, long olen, int argc, VALUE *argv, VALUE (*func) (VALUE, long))
+rb_values_at(obj, olen, argc, argv, func)
+ VALUE obj;
+ long olen;
+ int argc;
+ VALUE *argv;
+ VALUE (*func) _((VALUE,long));
{
VALUE result = rb_ary_new2(argc);
long beg, len, i, j;
@@ -2074,15 +1901,15 @@ rb_get_values_at(VALUE obj, long olen, int argc, VALUE *argv, VALUE (*func) (VAL
return result;
}
-/*
+/*
* call-seq:
* array.values_at(selector,... ) -> an_array
*
* Returns an array containing the elements in
* _self_ corresponding to the given selector(s). The selectors
- * may be either integer indices or ranges.
+ * may be either integer indices or ranges.
* See also <code>Array#select</code>.
- *
+ *
* a = %w{ a b c d e f }
* a.values_at(1, 3, 5)
* a.values_at(1, 3, 5, 7)
@@ -2091,34 +1918,37 @@ rb_get_values_at(VALUE obj, long olen, int argc, VALUE *argv, VALUE (*func) (VAL
*/
static VALUE
-rb_ary_values_at(int argc, VALUE *argv, VALUE ary)
+rb_ary_values_at(argc, argv, ary)
+ int argc;
+ VALUE *argv;
+ VALUE ary;
{
- return rb_get_values_at(ary, RARRAY_LEN(ary), argc, argv, rb_ary_entry);
+ return rb_values_at(ary, RARRAY(ary)->len, argc, argv, rb_ary_entry);
}
-
/*
* call-seq:
* array.select {|item| block } -> an_array
- *
+ *
* Invokes the block passing in successive elements from <i>array</i>,
* returning an array containing those elements for which the block
* returns a true value (equivalent to <code>Enumerable#select</code>).
- *
+ *
* a = %w{ a b c d e f }
* a.select {|v| v =~ /[aeiou]/} #=> ["a", "e"]
*/
static VALUE
-rb_ary_select(VALUE ary)
+rb_ary_select(ary)
+ VALUE ary;
{
VALUE result;
long i;
RETURN_ENUMERATOR(ary, 0, 0);
- result = rb_ary_new2(RARRAY_LEN(ary));
- for (i = 0; i < RARRAY_LEN(ary); i++) {
- if (RTEST(rb_yield(RARRAY_PTR(ary)[i]))) {
+ result = rb_ary_new2(RARRAY(ary)->len);
+ for (i = 0; i < RARRAY(ary)->len; i++) {
+ if (RTEST(rb_yield(RARRAY(ary)->ptr[i]))) {
rb_ary_push(result, rb_ary_elt(ary, i));
}
}
@@ -2127,14 +1957,14 @@ rb_ary_select(VALUE ary)
/*
* call-seq:
- * array.delete(obj) -> obj or nil
+ * array.delete(obj) -> obj or nil
* array.delete(obj) { block } -> obj or nil
- *
+ *
* Deletes items from <i>self</i> that are equal to <i>obj</i>. If
* the item is not found, returns <code>nil</code>. If the optional
* code block is given, returns the result of <i>block</i> if the item
* is not found.
- *
+ *
* a = [ "a", "b", "b", "b", "c" ]
* a.delete("b") #=> "b"
* a #=> ["a", "c"]
@@ -2143,24 +1973,22 @@ rb_ary_select(VALUE ary)
*/
VALUE
-rb_ary_delete(VALUE ary, VALUE item)
+rb_ary_delete(ary, item)
+ VALUE ary;
+ VALUE item;
{
- VALUE v = item;
long i1, i2;
- for (i1 = i2 = 0; i1 < RARRAY_LEN(ary); i1++) {
- VALUE e = RARRAY_PTR(ary)[i1];
+ for (i1 = i2 = 0; i1 < RARRAY(ary)->len; i1++) {
+ VALUE e = RARRAY(ary)->ptr[i1];
- if (rb_equal(e, item)) {
- v = e;
- continue;
- }
+ if (rb_equal(e, item)) continue;
if (i1 != i2) {
rb_ary_store(ary, i2, e);
}
i2++;
}
- if (RARRAY_LEN(ary) == i2) {
+ if (RARRAY(ary)->len == i2) {
if (rb_block_given_p()) {
return rb_yield(item);
}
@@ -2168,21 +1996,24 @@ rb_ary_delete(VALUE ary, VALUE item)
}
rb_ary_modify(ary);
- if (RARRAY_LEN(ary) > i2) {
- ARY_SET_LEN(ary, i2);
- if (i2 * 2 < ARY_CAPA(ary) &&
- ARY_CAPA(ary) > ARY_DEFAULT_SIZE) {
- ary_resize_capa(ary, i2*2);
+ if (RARRAY(ary)->len > i2) {
+ RARRAY(ary)->len = i2;
+ if (i2 * 2 < RARRAY(ary)->aux.capa &&
+ RARRAY(ary)->aux.capa > ARY_DEFAULT_SIZE) {
+ REALLOC_N(RARRAY(ary)->ptr, VALUE, i2 * 2);
+ RARRAY(ary)->aux.capa = i2 * 2;
}
}
- return v;
+ return item;
}
VALUE
-rb_ary_delete_at(VALUE ary, long pos)
+rb_ary_delete_at(ary, pos)
+ VALUE ary;
+ long pos;
{
- long len = RARRAY_LEN(ary);
+ long i, len = RARRAY(ary)->len;
VALUE del;
if (pos >= len) return Qnil;
@@ -2192,10 +2023,11 @@ rb_ary_delete_at(VALUE ary, long pos)
}
rb_ary_modify(ary);
- del = RARRAY_PTR(ary)[pos];
- MEMMOVE(RARRAY_PTR(ary)+pos, RARRAY_PTR(ary)+pos+1, VALUE,
- RARRAY_LEN(ary)-pos-1);
- ARY_INCREASE_LEN(ary, -1);
+ del = RARRAY(ary)->ptr[pos];
+ for (i = pos + 1; i < len; i++, pos++) {
+ RARRAY(ary)->ptr[pos] = RARRAY(ary)->ptr[i];
+ }
+ RARRAY(ary)->len = pos;
return del;
}
@@ -2203,11 +2035,11 @@ rb_ary_delete_at(VALUE ary, long pos)
/*
* call-seq:
* array.delete_at(index) -> obj or nil
- *
+ *
* Deletes the element at the specified index, returning that element,
* or <code>nil</code> if the index is out of range. See also
* <code>Array#slice!</code>.
- *
+ *
* a = %w( ant bat cat dog )
* a.delete_at(2) #=> "cat"
* a #=> ["ant", "bat", "dog"]
@@ -2215,7 +2047,8 @@ rb_ary_delete_at(VALUE ary, long pos)
*/
static VALUE
-rb_ary_delete_at_m(VALUE ary, VALUE pos)
+rb_ary_delete_at_m(ary, pos)
+ VALUE ary, pos;
{
return rb_ary_delete_at(ary, NUM2LONG(pos));
}
@@ -2224,12 +2057,18 @@ rb_ary_delete_at_m(VALUE ary, VALUE pos)
* call-seq:
* array.slice!(index) -> obj or nil
* array.slice!(start, length) -> sub_array or nil
- * array.slice!(range) -> sub_array or nil
- *
+ * array.slice!(range) -> sub_array or nil
+ *
* Deletes the element(s) given by an index (optionally with a length)
* or by a range. Returns the deleted object, subarray, or
- * <code>nil</code> if the index is out of range.
- *
+ * <code>nil</code> if the index is out of range. Equivalent to:
+ *
+ * def slice!(*args)
+ * result = self[*args]
+ * self[*args] = nil
+ * result
+ * end
+ *
* a = [ "a", "b", "c" ]
* a.slice!(1) #=> "b"
* a #=> ["a", "c"]
@@ -2240,15 +2079,18 @@ rb_ary_delete_at_m(VALUE ary, VALUE pos)
*/
static VALUE
-rb_ary_slice_bang(int argc, VALUE *argv, VALUE ary)
+rb_ary_slice_bang(argc, argv, ary)
+ int argc;
+ VALUE *argv;
+ VALUE ary;
{
VALUE arg1, arg2;
long pos, len, orig_len;
rb_ary_modify_check(ary);
- if (argc == 2) {
- pos = NUM2LONG(argv[0]);
- len = NUM2LONG(argv[1]);
+ if (rb_scan_args(argc, argv, "11", &arg1, &arg2) == 2) {
+ pos = NUM2LONG(arg1);
+ len = NUM2LONG(arg2);
delete_pos_len:
if (len < 0) return Qnil;
orig_len = RARRAY_LEN(ary);
@@ -2263,16 +2105,10 @@ rb_ary_slice_bang(int argc, VALUE *argv, VALUE ary)
if (len == 0) return rb_ary_new2(0);
arg2 = rb_ary_new4(len, RARRAY_PTR(ary)+pos);
RBASIC(arg2)->klass = rb_obj_class(ary);
- rb_ary_splice(ary, pos, len, Qundef);
+ rb_ary_splice(ary, pos, len, Qnil); /* Qundef in 1.9 */
return arg2;
}
- if (argc != 1) {
- /* error report */
- rb_scan_args(argc, argv, "11", NULL, NULL);
- }
- arg1 = argv[0];
-
if (!FIXNUM_P(arg1)) {
switch (rb_range_beg_len(arg1, &pos, &len, RARRAY_LEN(ary), 0)) {
case Qtrue:
@@ -2293,7 +2129,7 @@ rb_ary_slice_bang(int argc, VALUE *argv, VALUE ary)
/*
* call-seq:
* array.reject! {|item| block } -> array or nil
- *
+ *
* Equivalent to <code>Array#delete_if</code>, deleting elements from
* _self_ for which the block evaluates to true, but returns
* <code>nil</code> if no changes were made. Also see
@@ -2301,37 +2137,39 @@ rb_ary_slice_bang(int argc, VALUE *argv, VALUE ary)
*/
static VALUE
-rb_ary_reject_bang(VALUE ary)
+rb_ary_reject_bang(ary)
+ VALUE ary;
{
long i1, i2;
RETURN_ENUMERATOR(ary, 0, 0);
rb_ary_modify(ary);
- for (i1 = i2 = 0; i1 < RARRAY_LEN(ary); i1++) {
- VALUE v = RARRAY_PTR(ary)[i1];
+ for (i1 = i2 = 0; i1 < RARRAY(ary)->len; i1++) {
+ VALUE v = RARRAY(ary)->ptr[i1];
if (RTEST(rb_yield(v))) continue;
if (i1 != i2) {
rb_ary_store(ary, i2, v);
}
i2++;
}
+ if (RARRAY(ary)->len == i2) return Qnil;
+ if (i2 < RARRAY(ary)->len)
+ RARRAY(ary)->len = i2;
- if (RARRAY_LEN(ary) == i2) return Qnil;
- if (i2 < RARRAY_LEN(ary))
- ARY_SET_LEN(ary, i2);
return ary;
}
/*
* call-seq:
* array.reject {|item| block } -> an_array
- *
+ *
* Returns a new array containing the items in _self_
* for which the block is not true.
*/
static VALUE
-rb_ary_reject(VALUE ary)
+rb_ary_reject(ary)
+ VALUE ary;
{
RETURN_ENUMERATOR(ary, 0, 0);
ary = rb_ary_dup(ary);
@@ -2342,50 +2180,28 @@ rb_ary_reject(VALUE ary)
/*
* call-seq:
* array.delete_if {|item| block } -> array
- *
+ *
* Deletes every element of <i>self</i> for which <i>block</i> evaluates
* to <code>true</code>.
- *
+ *
* a = [ "a", "b", "c" ]
* a.delete_if {|x| x >= "b" } #=> ["a"]
*/
static VALUE
-rb_ary_delete_if(VALUE ary)
+rb_ary_delete_if(ary)
+ VALUE ary;
{
RETURN_ENUMERATOR(ary, 0, 0);
rb_ary_reject_bang(ary);
return ary;
}
-static VALUE
-take_i(VALUE val, VALUE *args, int argc, VALUE *argv)
-{
- if (args[1]-- == 0) rb_iter_break();
- if (argc > 1) val = rb_ary_new4(argc, argv);
- rb_ary_push(args[0], val);
- return Qnil;
-}
-
-static VALUE
-take_items(VALUE obj, long n)
-{
- VALUE result = rb_check_array_type(obj);
- VALUE args[2];
-
- if (!NIL_P(result)) return rb_ary_subseq(result, 0, n);
- result = rb_ary_new2(n);
- args[0] = result; args[1] = (VALUE)n;
- rb_block_call(obj, rb_intern("each"), 0, 0, take_i, (VALUE)args);
- return result;
-}
-
-
/*
* call-seq:
* array.zip(arg, ...) -> an_array
* array.zip(arg, ...) {| arr | block } -> nil
- *
+ *
* Converts any arguments to arrays, then merges elements of
* <i>self</i> with corresponding elements from each argument. This
* generates a sequence of <code>self.size</code> <em>n</em>-element
@@ -2394,42 +2210,50 @@ take_items(VALUE obj, long n)
* <code>nil</code> values are supplied. If a block given, it is
* invoked for each output array, otherwise an array of arrays is
* returned.
- *
+ *
* a = [ 4, 5, 6 ]
* b = [ 7, 8, 9 ]
+ *
* [1,2,3].zip(a, b) #=> [[1, 4, 7], [2, 5, 8], [3, 6, 9]]
* [1,2].zip(a,b) #=> [[1, 4, 7], [2, 5, 8]]
* a.zip([1,2],[8]) #=> [[4,1,8], [5,2,nil], [6,nil,nil]]
*/
static VALUE
-rb_ary_zip(int argc, VALUE *argv, VALUE ary)
+rb_ary_zip(argc, argv, ary)
+ int argc;
+ VALUE *argv;
+ VALUE ary;
{
int i, j;
long len;
- VALUE result = Qnil;
+ VALUE result;
- len = RARRAY_LEN(ary);
for (i=0; i<argc; i++) {
- argv[i] = take_items(argv[i], len);
- }
- if (!rb_block_given_p()) {
- result = rb_ary_new2(len);
+ argv[i] = to_ary(argv[i]);
}
+ if (rb_block_given_p()) {
+ for (i=0; i<RARRAY(ary)->len; i++) {
+ VALUE tmp = rb_ary_new2(argc+1);
- for (i=0; i<RARRAY_LEN(ary); i++) {
+ rb_ary_push(tmp, rb_ary_elt(ary, i));
+ for (j=0; j<argc; j++) {
+ rb_ary_push(tmp, rb_ary_elt(argv[j], i));
+ }
+ rb_yield(tmp);
+ }
+ return Qnil;
+ }
+ len = RARRAY(ary)->len;
+ result = rb_ary_new2(len);
+ for (i=0; i<len; i++) {
VALUE tmp = rb_ary_new2(argc+1);
rb_ary_push(tmp, rb_ary_elt(ary, i));
for (j=0; j<argc; j++) {
rb_ary_push(tmp, rb_ary_elt(argv[j], i));
}
- if (NIL_P(result)) {
- rb_yield(tmp);
- }
- else {
- rb_ary_push(result, tmp);
- }
+ rb_ary_push(result, tmp);
}
return result;
}
@@ -2437,34 +2261,35 @@ rb_ary_zip(int argc, VALUE *argv, VALUE ary)
/*
* call-seq:
* array.transpose -> an_array
- *
+ *
* Assumes that <i>self</i> is an array of arrays and transposes the
* rows and columns.
- *
+ *
* a = [[1,2], [3,4], [5,6]]
* a.transpose #=> [[1, 3, 5], [2, 4, 6]]
*/
static VALUE
-rb_ary_transpose(VALUE ary)
+rb_ary_transpose(ary)
+ VALUE ary;
{
long elen = -1, alen, i, j;
VALUE tmp, result = 0;
- alen = RARRAY_LEN(ary);
+ alen = RARRAY(ary)->len;
if (alen == 0) return rb_ary_dup(ary);
for (i=0; i<alen; i++) {
tmp = to_ary(rb_ary_elt(ary, i));
if (elen < 0) { /* first element */
- elen = RARRAY_LEN(tmp);
+ elen = RARRAY(tmp)->len;
result = rb_ary_new2(elen);
for (j=0; j<elen; j++) {
rb_ary_store(result, j, rb_ary_new2(alen));
}
}
- else if (elen != RARRAY_LEN(tmp)) {
- rb_raise(rb_eIndexError, "element size differs (%ld should be %ld)",
- RARRAY_LEN(tmp), elen);
+ else if (elen != RARRAY(tmp)->len) {
+ rb_raise(rb_eIndexError, "element size differs (%d should be %d)",
+ RARRAY(tmp)->len, elen);
}
for (j=0; j<elen; j++) {
rb_ary_store(rb_ary_elt(result, j), i, rb_ary_elt(tmp, j));
@@ -2476,58 +2301,36 @@ rb_ary_transpose(VALUE ary)
/*
* call-seq:
* array.replace(other_array) -> array
- *
+ *
* Replaces the contents of <i>self</i> with the contents of
* <i>other_array</i>, truncating or expanding if necessary.
- *
+ *
* a = [ "a", "b", "c", "d", "e" ]
* a.replace([ "x", "y", "z" ]) #=> ["x", "y", "z"]
* a #=> ["x", "y", "z"]
*/
-VALUE
-rb_ary_replace(VALUE copy, VALUE orig)
+static VALUE
+rb_ary_replace(copy, orig)
+ VALUE copy, orig;
{
+ VALUE shared;
+
+ rb_ary_modify(copy);
orig = to_ary(orig);
- rb_ary_modify_check(copy);
if (copy == orig) return copy;
+ shared = ary_make_shared(orig);
+ if (RARRAY(copy)->ptr && !FL_TEST(copy, ELTS_SHARED))
+ free(RARRAY(copy)->ptr);
+ RARRAY(copy)->ptr = RARRAY(orig)->ptr;
+ RARRAY(copy)->len = RARRAY(orig)->len;
+ RARRAY(copy)->aux.shared = shared;
+ FL_SET(copy, ELTS_SHARED);
- if (RARRAY_LEN(orig) <= RARRAY_EMBED_LEN_MAX) {
- VALUE *ptr;
- VALUE shared = 0;
-
- if (ARY_OWNS_HEAP_P(copy)) {
- xfree(RARRAY_PTR(copy));
- }
- else if (ARY_SHARED_P(copy)) {
- shared = ARY_SHARED(copy);
- FL_UNSET_SHARED(copy);
- }
- FL_SET_EMBED(copy);
- ptr = RARRAY_PTR(orig);
- MEMCPY(RARRAY_PTR(copy), ptr, VALUE, RARRAY_LEN(orig));
- if (shared) {
- rb_ary_decrement_share(shared);
- }
- ARY_SET_LEN(copy, RARRAY_LEN(orig));
- }
- else {
- VALUE shared = ary_make_shared(orig);
- if (ARY_OWNS_HEAP_P(copy)) {
- xfree(RARRAY_PTR(copy));
- }
- else {
- rb_ary_unshare_safe(copy);
- }
- FL_UNSET_EMBED(copy);
- ARY_SET_PTR(copy, RARRAY_PTR(orig));
- ARY_SET_LEN(copy, RARRAY_LEN(orig));
- rb_ary_set_shared(copy, shared);
- }
return copy;
}
-/*
+/*
* call-seq:
* array.clear -> array
*
@@ -2538,12 +2341,14 @@ rb_ary_replace(VALUE copy, VALUE orig)
*/
VALUE
-rb_ary_clear(VALUE ary)
+rb_ary_clear(ary)
+ VALUE ary;
{
rb_ary_modify(ary);
- ARY_SET_LEN(ary, 0);
- if (ARY_DEFAULT_SIZE * 2 < ARY_CAPA(ary)) {
- ary_resize_capa(ary, ARY_DEFAULT_SIZE * 2);
+ RARRAY(ary)->len = 0;
+ if (ARY_DEFAULT_SIZE * 2 < RARRAY(ary)->aux.capa) {
+ REALLOC_N(RARRAY(ary)->ptr, VALUE, ARY_DEFAULT_SIZE * 2);
+ RARRAY(ary)->aux.capa = ARY_DEFAULT_SIZE * 2;
}
return ary;
}
@@ -2556,15 +2361,14 @@ rb_ary_clear(VALUE ary)
* array.fill {|index| block } -> array
* array.fill(start [, length] ) {|index| block } -> array
* array.fill(range) {|index| block } -> array
- *
+ *
* The first three forms set the selected elements of <i>self</i> (which
* may be the entire array) to <i>obj</i>. A <i>start</i> of
* <code>nil</code> is equivalent to zero. A <i>length</i> of
* <code>nil</code> is equivalent to <i>self.length</i>. The last three
* forms fill the array with the value of the block. The block is
* passed the absolute index of each element to be filled.
- * Negative values of <i>start</i> count from the end of the array.
- *
+ *
* a = [ "a", "b", "c", "d" ]
* a.fill("x") #=> ["x", "x", "x", "x"]
* a.fill("z", 2, 2) #=> ["x", "x", "z", "z"]
@@ -2574,15 +2378,18 @@ rb_ary_clear(VALUE ary)
*/
static VALUE
-rb_ary_fill(int argc, VALUE *argv, VALUE ary)
+rb_ary_fill(argc, argv, ary)
+ int argc;
+ VALUE *argv;
+ VALUE ary;
{
VALUE item, arg1, arg2;
long beg = 0, end = 0, len = 0;
VALUE *p, *pend;
- int block_p = FALSE;
+ int block_p = Qfalse;
if (rb_block_given_p()) {
- block_p = TRUE;
+ block_p = Qtrue;
rb_scan_args(argc, argv, "02", &arg1, &arg2);
argc += 1; /* hackish */
}
@@ -2592,36 +2399,34 @@ rb_ary_fill(int argc, VALUE *argv, VALUE ary)
switch (argc) {
case 1:
beg = 0;
- len = RARRAY_LEN(ary);
+ len = RARRAY(ary)->len;
break;
case 2:
- if (rb_range_beg_len(arg1, &beg, &len, RARRAY_LEN(ary), 1)) {
+ if (rb_range_beg_len(arg1, &beg, &len, RARRAY(ary)->len, 1)) {
break;
}
/* fall through */
case 3:
beg = NIL_P(arg1) ? 0 : NUM2LONG(arg1);
if (beg < 0) {
- beg = RARRAY_LEN(ary) + beg;
+ beg = RARRAY(ary)->len + beg;
if (beg < 0) beg = 0;
}
- len = NIL_P(arg2) ? RARRAY_LEN(ary) - beg : NUM2LONG(arg2);
+ len = NIL_P(arg2) ? RARRAY(ary)->len - beg : NUM2LONG(arg2);
break;
}
rb_ary_modify(ary);
- if (len < 0) {
- return ary;
- }
- if (beg >= ARY_MAX_SIZE || len > ARY_MAX_SIZE - beg) {
+ end = beg + len;
+ if (end < 0) {
rb_raise(rb_eArgError, "argument too big");
}
- end = beg + len;
- if (RARRAY_LEN(ary) < end) {
- if (end >= ARY_CAPA(ary)) {
- ary_resize_capa(ary, end);
+ if (end > RARRAY(ary)->len) {
+ if (end >= RARRAY(ary)->aux.capa) {
+ REALLOC_N(RARRAY(ary)->ptr, VALUE, end);
+ RARRAY(ary)->aux.capa = end;
}
- rb_mem_clear(RARRAY_PTR(ary) + RARRAY_LEN(ary), end - RARRAY_LEN(ary));
- ARY_SET_LEN(ary, end);
+ rb_mem_clear(RARRAY(ary)->ptr + RARRAY(ary)->len, end - RARRAY(ary)->len);
+ RARRAY(ary)->len = end;
}
if (block_p) {
@@ -2630,12 +2435,12 @@ rb_ary_fill(int argc, VALUE *argv, VALUE ary)
for (i=beg; i<end; i++) {
v = rb_yield(LONG2NUM(i));
- if (i>=RARRAY_LEN(ary)) break;
- RARRAY_PTR(ary)[i] = v;
+ if (i>=RARRAY(ary)->len) break;
+ RARRAY(ary)->ptr[i] = v;
}
}
else {
- p = RARRAY_PTR(ary) + beg;
+ p = RARRAY(ary)->ptr + beg;
pend = p + len;
while (p < pend) {
*p++ = item;
@@ -2644,53 +2449,55 @@ rb_ary_fill(int argc, VALUE *argv, VALUE ary)
return ary;
}
-/*
+/*
* call-seq:
* array + other_array -> an_array
*
* Concatenation---Returns a new array built by concatenating the
* two arrays together to produce a third array.
- *
+ *
* [ 1, 2, 3 ] + [ 4, 5 ] #=> [ 1, 2, 3, 4, 5 ]
*/
VALUE
-rb_ary_plus(VALUE x, VALUE y)
+rb_ary_plus(x, y)
+ VALUE x, y;
{
VALUE z;
long len;
y = to_ary(y);
- len = RARRAY_LEN(x) + RARRAY_LEN(y);
+ len = RARRAY(x)->len + RARRAY(y)->len;
z = rb_ary_new2(len);
- MEMCPY(RARRAY_PTR(z), RARRAY_PTR(x), VALUE, RARRAY_LEN(x));
- MEMCPY(RARRAY_PTR(z) + RARRAY_LEN(x), RARRAY_PTR(y), VALUE, RARRAY_LEN(y));
- ARY_SET_LEN(z, len);
+ MEMCPY(RARRAY(z)->ptr, RARRAY(x)->ptr, VALUE, RARRAY(x)->len);
+ MEMCPY(RARRAY(z)->ptr + RARRAY(x)->len, RARRAY(y)->ptr, VALUE, RARRAY(y)->len);
+ RARRAY(z)->len = len;
return z;
}
-/*
+/*
* call-seq:
* array.concat(other_array) -> array
*
* Appends the elements in other_array to _self_.
- *
+ *
* [ "a", "b" ].concat( ["c", "d"] ) #=> [ "a", "b", "c", "d" ]
*/
VALUE
-rb_ary_concat(VALUE x, VALUE y)
+rb_ary_concat(x, y)
+ VALUE x, y;
{
y = to_ary(y);
- if (RARRAY_LEN(y) > 0) {
- rb_ary_splice(x, RARRAY_LEN(x), 0, y);
+ if (RARRAY(y)->len > 0) {
+ rb_ary_splice(x, RARRAY(x)->len, 0, y);
}
return x;
}
-/*
+/*
* call-seq:
* array * int -> an_array
* array * str -> a_string
@@ -2706,7 +2513,8 @@ rb_ary_concat(VALUE x, VALUE y)
*/
static VALUE
-rb_ary_times(VALUE ary, VALUE times)
+rb_ary_times(ary, times)
+ VALUE ary, times;
{
VALUE ary2, tmp;
long i, len;
@@ -2717,31 +2525,27 @@ rb_ary_times(VALUE ary, VALUE times)
}
len = NUM2LONG(times);
- if (len == 0) {
- ary2 = ary_new(rb_obj_class(ary), 0);
- goto out;
- }
+ if (len == 0) return ary_new(rb_obj_class(ary), 0);
if (len < 0) {
rb_raise(rb_eArgError, "negative argument");
}
- if (ARY_MAX_SIZE/len < RARRAY_LEN(ary)) {
+ if (ARY_MAX_SIZE/len < RARRAY(ary)->len) {
rb_raise(rb_eArgError, "argument too big");
}
- len *= RARRAY_LEN(ary);
+ len *= RARRAY(ary)->len;
ary2 = ary_new(rb_obj_class(ary), len);
- ARY_SET_LEN(ary2, len);
+ RARRAY(ary2)->len = len;
- for (i=0; i<len; i+=RARRAY_LEN(ary)) {
- MEMCPY(RARRAY_PTR(ary2)+i, RARRAY_PTR(ary), VALUE, RARRAY_LEN(ary));
+ for (i=0; i<len; i+=RARRAY(ary)->len) {
+ MEMCPY(RARRAY(ary2)->ptr+i, RARRAY(ary)->ptr, VALUE, RARRAY(ary)->len);
}
- out:
OBJ_INFECT(ary2, ary);
return ary2;
}
-/*
+/*
* call-seq:
* array.assoc(obj) -> an_array or nil
*
@@ -2762,15 +2566,16 @@ rb_ary_times(VALUE ary, VALUE times)
*/
VALUE
-rb_ary_assoc(VALUE ary, VALUE key)
+rb_ary_assoc(ary, key)
+ VALUE ary, key;
{
long i;
VALUE v;
- for (i = 0; i < RARRAY_LEN(ary); ++i) {
- v = rb_check_array_type(RARRAY_PTR(ary)[i]);
- if (!NIL_P(v) && RARRAY_LEN(v) > 0 &&
- rb_equal(RARRAY_PTR(v)[0], key))
+ for (i = 0; i < RARRAY(ary)->len; ++i) {
+ v = rb_check_array_type(RARRAY(ary)->ptr[i]);
+ if (!NIL_P(v) && RARRAY(v)->len > 0 &&
+ rb_equal(RARRAY(v)->ptr[0], key))
return v;
}
return Qnil;
@@ -2778,48 +2583,52 @@ rb_ary_assoc(VALUE ary, VALUE key)
/*
* call-seq:
- * array.rassoc(obj) -> an_array or nil
- *
+ * array.rassoc(key) -> an_array or nil
+ *
* Searches through the array whose elements are also arrays. Compares
- * _obj_ with the second element of each contained array using
+ * <em>key</em> with the second element of each contained array using
* <code>==</code>. Returns the first contained array that matches. See
* also <code>Array#assoc</code>.
- *
+ *
* a = [ [ 1, "one"], [2, "two"], [3, "three"], ["ii", "two"] ]
* a.rassoc("two") #=> [2, "two"]
* a.rassoc("four") #=> nil
*/
VALUE
-rb_ary_rassoc(VALUE ary, VALUE value)
+rb_ary_rassoc(ary, value)
+ VALUE ary, value;
{
long i;
VALUE v;
- for (i = 0; i < RARRAY_LEN(ary); ++i) {
- v = RARRAY_PTR(ary)[i];
+ for (i = 0; i < RARRAY(ary)->len; ++i) {
+ v = RARRAY(ary)->ptr[i];
if (TYPE(v) == T_ARRAY &&
- RARRAY_LEN(v) > 1 &&
- rb_equal(RARRAY_PTR(v)[1], value))
+ RARRAY(v)->len > 1 &&
+ rb_equal(RARRAY(v)->ptr[1], value))
return v;
}
return Qnil;
}
+static VALUE recursive_equal _((VALUE, VALUE, int));
static VALUE
-recursive_equal(VALUE ary1, VALUE ary2, int recur)
+recursive_equal(ary1, ary2, recur)
+ VALUE ary1, ary2;
+ int recur;
{
long i;
- if (recur) return Qtrue; /* Subtle! */
- for (i=0; i<RARRAY_LEN(ary1); i++) {
+ if (recur) return Qfalse;
+ for (i=0; i<RARRAY(ary1)->len; i++) {
if (!rb_equal(rb_ary_elt(ary1, i), rb_ary_elt(ary2, i)))
return Qfalse;
}
return Qtrue;
}
-/*
+/*
* call-seq:
* array == other_array -> bool
*
@@ -2834,7 +2643,8 @@ recursive_equal(VALUE ary1, VALUE ary2, int recur)
*/
static VALUE
-rb_ary_equal(VALUE ary1, VALUE ary2)
+rb_ary_equal(ary1, ary2)
+ VALUE ary1, ary2;
{
if (ary1 == ary2) return Qtrue;
if (TYPE(ary2) != T_ARRAY) {
@@ -2843,17 +2653,20 @@ rb_ary_equal(VALUE ary1, VALUE ary2)
}
return rb_equal(ary2, ary1);
}
- if (RARRAY_LEN(ary1) != RARRAY_LEN(ary2)) return Qfalse;
- return rb_exec_recursive_paired(recursive_equal, ary1, ary2, ary2);
+ if (RARRAY(ary1)->len != RARRAY(ary2)->len) return Qfalse;
+ return rb_exec_recursive(recursive_equal, ary1, ary2);
}
+static VALUE recursive_eql _((VALUE, VALUE, int));
static VALUE
-recursive_eql(VALUE ary1, VALUE ary2, int recur)
+recursive_eql(ary1, ary2, recur)
+ VALUE ary1, ary2;
+ int recur;
{
long i;
- if (recur) return Qtrue; /* Subtle! */
- for (i=0; i<RARRAY_LEN(ary1); i++) {
+ if (recur) return Qfalse;
+ for (i=0; i<RARRAY(ary1)->len; i++) {
if (!rb_eql(rb_ary_elt(ary1, i), rb_ary_elt(ary2, i)))
return Qfalse;
}
@@ -2869,29 +2682,35 @@ recursive_eql(VALUE ary1, VALUE ary2, int recur)
*/
static VALUE
-rb_ary_eql(VALUE ary1, VALUE ary2)
+rb_ary_eql(ary1, ary2)
+ VALUE ary1, ary2;
{
if (ary1 == ary2) return Qtrue;
if (TYPE(ary2) != T_ARRAY) return Qfalse;
- if (RARRAY_LEN(ary1) != RARRAY_LEN(ary2)) return Qfalse;
- return rb_exec_recursive_paired(recursive_eql, ary1, ary2, ary2);
+ if (RARRAY(ary1)->len != RARRAY(ary2)->len) return Qfalse;
+ return rb_exec_recursive(recursive_eql, ary1, ary2);
}
+static VALUE recursive_hash _((VALUE, VALUE, int));
static VALUE
-recursive_hash(VALUE ary, VALUE dummy, int recur)
+recursive_hash(ary, dummy, recur)
+ VALUE ary;
+ VALUE dummy;
+ int recur;
{
long i, h;
VALUE n;
if (recur) {
- rb_raise(rb_eArgError, "recursive key for hash");
+ return LONG2FIX(0);
}
- h = rb_hash_start(RARRAY_LEN(ary));
- for (i=0; i<RARRAY_LEN(ary); i++) {
- n = rb_hash(RARRAY_PTR(ary)[i]);
- h = rb_hash_uint(h, NUM2LONG(n));
+
+ h = RARRAY(ary)->len;
+ for (i=0; i<RARRAY(ary)->len; i++) {
+ h = (h << 1) | (h<0 ? 1 : 0);
+ n = rb_hash(RARRAY(ary)->ptr[i]);
+ h ^= NUM2LONG(n);
}
- h = rb_hash_end(h);
return LONG2FIX(h);
}
@@ -2904,7 +2723,8 @@ recursive_hash(VALUE ary, VALUE dummy, int recur)
*/
static VALUE
-rb_ary_hash(VALUE ary)
+rb_ary_hash(ary)
+ VALUE ary;
{
return rb_exec_recursive(recursive_hash, ary, 0);
}
@@ -2912,23 +2732,25 @@ rb_ary_hash(VALUE ary)
/*
* call-seq:
* array.include?(obj) -> true or false
- *
+ *
* Returns <code>true</code> if the given object is present in
* <i>self</i> (that is, if any object <code>==</code> <i>anObject</i>),
* <code>false</code> otherwise.
- *
+ *
* a = [ "a", "b", "c" ]
* a.include?("b") #=> true
* a.include?("z") #=> false
*/
VALUE
-rb_ary_includes(VALUE ary, VALUE item)
+rb_ary_includes(ary, item)
+ VALUE ary;
+ VALUE item;
{
long i;
-
- for (i=0; i<RARRAY_LEN(ary); i++) {
- if (rb_equal(RARRAY_PTR(ary)[i], item)) {
+
+ for (i=0; i<RARRAY(ary)->len; i++) {
+ if (rb_equal(RARRAY(ary)->ptr[i], item)) {
return Qtrue;
}
}
@@ -2936,15 +2758,19 @@ rb_ary_includes(VALUE ary, VALUE item)
}
+static VALUE recursive_cmp _((VALUE, VALUE, int));
static VALUE
-recursive_cmp(VALUE ary1, VALUE ary2, int recur)
+recursive_cmp(ary1, ary2, recur)
+ VALUE ary1;
+ VALUE ary2;
+ int recur;
{
long i, len;
- if (recur) return Qundef; /* Subtle! */
- len = RARRAY_LEN(ary1);
- if (len > RARRAY_LEN(ary2)) {
- len = RARRAY_LEN(ary2);
+ if (recur) return Qnil;
+ len = RARRAY(ary1)->len;
+ if (len > RARRAY(ary2)->len) {
+ len = RARRAY(ary2)->len;
}
for (i=0; i<len; i++) {
VALUE v = rb_funcall(rb_ary_elt(ary1, i), id_cmp, 1, rb_ary_elt(ary2, i));
@@ -2955,7 +2781,7 @@ recursive_cmp(VALUE ary1, VALUE ary2, int recur)
return Qundef;
}
-/*
+/*
* call-seq:
* array <=> other_array -> -1, 0, +1
*
@@ -2969,87 +2795,48 @@ recursive_cmp(VALUE ary1, VALUE ary2, int recur)
* ``equal'' according to <code>Array#<=></code> if and only if they have
* the same length and the value of each element is equal to the
* value of the corresponding element in the other array.
- *
+ *
* [ "a", "a", "c" ] <=> [ "a", "b", "c" ] #=> -1
* [ 1, 2, 3, 4, 5, 6 ] <=> [ 1, 2 ] #=> +1
*
*/
VALUE
-rb_ary_cmp(VALUE ary1, VALUE ary2)
+rb_ary_cmp(ary1, ary2)
+ VALUE ary1, ary2;
{
long len;
VALUE v;
ary2 = to_ary(ary2);
if (ary1 == ary2) return INT2FIX(0);
- v = rb_exec_recursive_paired(recursive_cmp, ary1, ary2, ary2);
+ v = rb_exec_recursive(recursive_cmp, ary1, ary2);
if (v != Qundef) return v;
- len = RARRAY_LEN(ary1) - RARRAY_LEN(ary2);
+ len = RARRAY(ary1)->len - RARRAY(ary2)->len;
if (len == 0) return INT2FIX(0);
if (len > 0) return INT2FIX(1);
return INT2FIX(-1);
}
static VALUE
-ary_add_hash(VALUE hash, VALUE ary)
-{
- long i;
-
- for (i=0; i<RARRAY_LEN(ary); i++) {
- rb_hash_aset(hash, RARRAY_PTR(ary)[i], Qtrue);
- }
- return hash;
-}
-
-static inline VALUE
-ary_tmp_hash_new(void)
+ary_make_hash(ary1, ary2)
+ VALUE ary1, ary2;
{
VALUE hash = rb_hash_new();
-
- RBASIC(hash)->klass = 0;
- return hash;
-}
-
-static VALUE
-ary_make_hash(VALUE ary)
-{
- VALUE hash = ary_tmp_hash_new();
- return ary_add_hash(hash, ary);
-}
-
-static VALUE
-ary_add_hash_by(VALUE hash, VALUE ary)
-{
long i;
- for (i = 0; i < RARRAY_LEN(ary); ++i) {
- VALUE v = rb_ary_elt(ary, i), k = rb_yield(v);
- if (rb_hash_lookup2(hash, k, Qundef) == Qundef) {
- rb_hash_aset(hash, k, v);
+ for (i=0; i<RARRAY(ary1)->len; i++) {
+ rb_hash_aset(hash, RARRAY(ary1)->ptr[i], Qtrue);
+ }
+ if (ary2) {
+ for (i=0; i<RARRAY(ary2)->len; i++) {
+ rb_hash_aset(hash, RARRAY(ary2)->ptr[i], Qtrue);
}
}
return hash;
}
-static VALUE
-ary_make_hash_by(VALUE ary)
-{
- VALUE hash = ary_tmp_hash_new();
- return ary_add_hash_by(hash, ary);
-}
-
-static inline void
-ary_recycle_hash(VALUE hash)
-{
- if (RHASH(hash)->ntbl) {
- st_table *tbl = RHASH(hash)->ntbl;
- RHASH(hash)->ntbl = 0;
- st_free_table(tbl);
- }
-}
-
-/*
+/*
* call-seq:
* array - other_array -> an_array
*
@@ -3062,24 +2849,24 @@ ary_recycle_hash(VALUE hash)
*/
static VALUE
-rb_ary_diff(VALUE ary1, VALUE ary2)
+rb_ary_diff(ary1, ary2)
+ VALUE ary1, ary2;
{
VALUE ary3;
volatile VALUE hash;
long i;
- hash = ary_make_hash(to_ary(ary2));
+ hash = ary_make_hash(to_ary(ary2), 0);
ary3 = rb_ary_new();
- for (i=0; i<RARRAY_LEN(ary1); i++) {
- if (st_lookup(RHASH_TBL(hash), RARRAY_PTR(ary1)[i], 0)) continue;
+ for (i=0; i<RARRAY(ary1)->len; i++) {
+ if (st_lookup(RHASH(hash)->tbl, RARRAY(ary1)->ptr[i], 0)) continue;
rb_ary_push(ary3, rb_ary_elt(ary1, i));
}
- ary_recycle_hash(hash);
return ary3;
}
-/*
+/*
* call-seq:
* array & other_array
*
@@ -3091,31 +2878,28 @@ rb_ary_diff(VALUE ary1, VALUE ary2)
static VALUE
-rb_ary_and(VALUE ary1, VALUE ary2)
+rb_ary_and(ary1, ary2)
+ VALUE ary1, ary2;
{
VALUE hash, ary3, v, vv;
long i;
ary2 = to_ary(ary2);
- ary3 = rb_ary_new2(RARRAY_LEN(ary1) < RARRAY_LEN(ary2) ?
- RARRAY_LEN(ary1) : RARRAY_LEN(ary2));
- hash = ary_make_hash(ary2);
-
- if (RHASH_EMPTY_P(hash))
- return ary3;
+ ary3 = rb_ary_new2(RARRAY(ary1)->len < RARRAY(ary2)->len ?
+ RARRAY(ary1)->len : RARRAY(ary2)->len);
+ hash = ary_make_hash(ary2, 0);
- for (i=0; i<RARRAY_LEN(ary1); i++) {
+ for (i=0; i<RARRAY(ary1)->len; i++) {
v = vv = rb_ary_elt(ary1, i);
- if (st_delete(RHASH_TBL(hash), (st_data_t*)&vv, 0)) {
+ if (st_delete(RHASH(hash)->tbl, (st_data_t*)&vv, 0)) {
rb_ary_push(ary3, v);
}
}
- ary_recycle_hash(hash);
return ary3;
}
-/*
+/*
* call-seq:
* array | other_array -> an_array
*
@@ -3127,84 +2911,65 @@ rb_ary_and(VALUE ary1, VALUE ary2)
*/
static VALUE
-rb_ary_or(VALUE ary1, VALUE ary2)
+rb_ary_or(ary1, ary2)
+ VALUE ary1, ary2;
{
VALUE hash, ary3;
VALUE v, vv;
long i;
ary2 = to_ary(ary2);
- ary3 = rb_ary_new2(RARRAY_LEN(ary1)+RARRAY_LEN(ary2));
- hash = ary_add_hash(ary_make_hash(ary1), ary2);
+ ary3 = rb_ary_new2(RARRAY(ary1)->len+RARRAY(ary2)->len);
+ hash = ary_make_hash(ary1, ary2);
- for (i=0; i<RARRAY_LEN(ary1); i++) {
+ for (i=0; i<RARRAY(ary1)->len; i++) {
v = vv = rb_ary_elt(ary1, i);
- if (st_delete(RHASH_TBL(hash), (st_data_t*)&vv, 0)) {
+ if (st_delete(RHASH(hash)->tbl, (st_data_t*)&vv, 0)) {
rb_ary_push(ary3, v);
}
}
- for (i=0; i<RARRAY_LEN(ary2); i++) {
+ for (i=0; i<RARRAY(ary2)->len; i++) {
v = vv = rb_ary_elt(ary2, i);
- if (st_delete(RHASH_TBL(hash), (st_data_t*)&vv, 0)) {
+ if (st_delete(RHASH(hash)->tbl, (st_data_t*)&vv, 0)) {
rb_ary_push(ary3, v);
}
}
- ary_recycle_hash(hash);
return ary3;
}
-static int
-push_value(st_data_t key, st_data_t val, st_data_t ary)
-{
- rb_ary_push((VALUE)ary, (VALUE)val);
- return ST_CONTINUE;
-}
-
/*
* call-seq:
* array.uniq! -> array or nil
- *
+ *
* Removes duplicate elements from _self_.
* Returns <code>nil</code> if no changes are made (that is, no
* duplicates are found).
- *
+ *
* a = [ "a", "a", "b", "b", "c" ]
* a.uniq! #=> ["a", "b", "c"]
* b = [ "a", "b", "c" ]
* b.uniq! #=> nil
- * c = [ "a:def", "a:xyz", "b:abc", "b:xyz", "c:jkl" ]
- * c.uniq! {|s| s[/^\w+/]} #=> [ "a:def", "b:abc", "c:jkl" ]
*/
static VALUE
-rb_ary_uniq_bang(VALUE ary)
+rb_ary_uniq_bang(ary)
+ VALUE ary;
{
- VALUE hash, v;
+ VALUE hash, v, vv;
long i, j;
- if (rb_block_given_p()) {
- hash = ary_make_hash_by(ary);
- if (RARRAY_LEN(ary) == (i = RHASH_SIZE(hash))) {
- return Qnil;
- }
- ary_resize_capa(ary, i);
- ARY_SET_LEN(ary, 0);
- st_foreach(RHASH_TBL(hash), push_value, ary);
+ hash = ary_make_hash(ary, 0);
+
+ if (RARRAY(ary)->len == RHASH(hash)->tbl->num_entries) {
+ return Qnil;
}
- else {
- hash = ary_make_hash(ary);
- if (RARRAY_LEN(ary) == (long)RHASH_SIZE(hash)) {
- return Qnil;
+ for (i=j=0; i<RARRAY(ary)->len; i++) {
+ v = vv = rb_ary_elt(ary, i);
+ if (st_delete(RHASH(hash)->tbl, (st_data_t*)&vv, 0)) {
+ rb_ary_store(ary, j++, v);
}
- for (i=j=0; i<RARRAY_LEN(ary); i++) {
- st_data_t vv = (st_data_t)(v = rb_ary_elt(ary, i));
- if (st_delete(RHASH_TBL(hash), &vv, 0)) {
- rb_ary_store(ary, j++, v);
- }
- }
- ARY_SET_LEN(ary, j);
}
- ary_recycle_hash(hash);
+ RARRAY(ary)->len = j;
return ary;
}
@@ -3212,42 +2977,23 @@ rb_ary_uniq_bang(VALUE ary)
/*
* call-seq:
* array.uniq -> an_array
- *
+ *
* Returns a new array by removing duplicate values in <i>self</i>.
- *
+ *
* a = [ "a", "a", "b", "b", "c" ]
* a.uniq #=> ["a", "b", "c"]
- * c = [ "a:def", "a:xyz", "b:abc", "b:xyz", "c:jkl" ]
- * c.uniq {|s| s[/^\w+/]} #=> [ "a:def", "b:abc", "c:jkl" ]
*/
static VALUE
-rb_ary_uniq(VALUE ary)
+rb_ary_uniq(ary)
+ VALUE ary;
{
- VALUE hash, uniq, v;
- long i;
-
- if (rb_block_given_p()) {
- hash = ary_make_hash_by(ary);
- uniq = ary_new(rb_obj_class(ary), RHASH_SIZE(hash));
- st_foreach(RHASH_TBL(hash), push_value, uniq);
- }
- else {
- hash = ary_make_hash(ary);
- uniq = ary_new(rb_obj_class(ary), RHASH_SIZE(hash));
- for (i=0; i<RARRAY_LEN(ary); i++) {
- st_data_t vv = (st_data_t)(v = rb_ary_elt(ary, i));
- if (st_delete(RHASH_TBL(hash), &vv, 0)) {
- rb_ary_push(uniq, v);
- }
- }
- }
- ary_recycle_hash(hash);
-
- return uniq;
+ ary = rb_ary_dup(ary);
+ rb_ary_uniq_bang(ary);
+ return ary;
}
-/*
+/*
* call-seq:
* array.compact! -> array or nil
*
@@ -3259,27 +3005,24 @@ rb_ary_uniq(VALUE ary)
*/
static VALUE
-rb_ary_compact_bang(VALUE ary)
+rb_ary_compact_bang(ary)
+ VALUE ary;
{
VALUE *p, *t, *end;
- long n;
rb_ary_modify(ary);
- p = t = RARRAY_PTR(ary);
- end = p + RARRAY_LEN(ary);
-
+ p = t = RARRAY(ary)->ptr;
+ end = p + RARRAY(ary)->len;
+
while (t < end) {
if (NIL_P(*t)) t++;
else *p++ = *t++;
}
- n = p - RARRAY_PTR(ary);
- if (RARRAY_LEN(ary) == n) {
+ if (RARRAY(ary)->len == (p - RARRAY(ary)->ptr)) {
return Qnil;
}
- ARY_SET_LEN(ary, n);
- if (n * 2 < ARY_CAPA(ary) && ARY_DEFAULT_SIZE * 2 < ARY_CAPA(ary)) {
- ary_resize_capa(ary, n * 2);
- }
+ RARRAY(ary)->len = RARRAY(ary)->aux.capa = (p - RARRAY(ary)->ptr);
+ REALLOC_N(RARRAY(ary)->ptr, VALUE, RARRAY(ary)->len);
return ary;
}
@@ -3295,7 +3038,8 @@ rb_ary_compact_bang(VALUE ary)
*/
static VALUE
-rb_ary_compact(VALUE ary)
+rb_ary_compact(ary)
+ VALUE ary;
{
ary = rb_ary_dup(ary);
rb_ary_compact_bang(ary);
@@ -3304,10 +3048,34 @@ rb_ary_compact(VALUE ary)
/*
* call-seq:
+ * array.nitems -> int
+ *
+ * Returns the number of non-<code>nil</code> elements in _self_.
+ *
+ * May be zero.
+ *
+ * [ 1, nil, 3, nil, 5 ].nitems #=> 3
+ */
+
+static VALUE
+rb_ary_nitems(ary)
+ VALUE ary;
+{
+ long n = 0;
+ VALUE *p, *pend;
+
+ for (p = RARRAY(ary)->ptr, pend = p + RARRAY(ary)->len; p < pend; p++) {
+ if (!NIL_P(*p)) n++;
+ }
+ return LONG2NUM(n);
+}
+
+/*
+ * call-seq:
* array.count -> int
* array.count(obj) -> int
* array.count { |item| block } -> int
- *
+ *
* Returns the number of elements. If an argument is given, counts
* the number of elements which equals to <i>obj</i>. If a block is
* given, counts the number of elements yielding a true value.
@@ -3320,7 +3088,10 @@ rb_ary_compact(VALUE ary)
*/
static VALUE
-rb_ary_count(int argc, VALUE *argv, VALUE ary)
+rb_ary_count(argc, argv, ary)
+ int argc;
+ VALUE *argv;
+ VALUE ary;
{
long n = 0;
@@ -3350,7 +3121,10 @@ rb_ary_count(int argc, VALUE *argv, VALUE ary)
}
static VALUE
-flatten(VALUE ary, int level, int *modified)
+flatten(ary, level, modified)
+ VALUE ary;
+ int level;
+ int *modified;
{
long i = 0;
VALUE stack, result, tmp, elt;
@@ -3364,13 +3138,13 @@ flatten(VALUE ary, int level, int *modified)
*modified = 0;
while (1) {
- while (i < RARRAY_LEN(ary)) {
- elt = RARRAY_PTR(ary)[i++];
+ while (i < RARRAY(ary)->len) {
+ elt = RARRAY(ary)->ptr[i++];
tmp = rb_check_array_type(elt);
if (RBASIC(result)->klass) {
rb_raise(rb_eRuntimeError, "flatten reentered");
}
- if (NIL_P(tmp) || (level >= 0 && RARRAY_LEN(stack) / 2 >= level)) {
+ if (NIL_P(tmp) || (level >= 0 && RARRAY(stack)->len / 2 >= level)) {
rb_ary_push(result, elt);
}
else {
@@ -3387,7 +3161,7 @@ flatten(VALUE ary, int level, int *modified)
i = 0;
}
}
- if (RARRAY_LEN(stack) == 0) {
+ if (RARRAY(stack)->len == 0) {
break;
}
id = (st_data_t)ary;
@@ -3407,12 +3181,12 @@ flatten(VALUE ary, int level, int *modified)
* call-seq:
* array.flatten! -> array or nil
* array.flatten!(level) -> array or nil
- *
+ *
* Flattens _self_ in place.
* Returns <code>nil</code> if no modifications were made (i.e.,
* <i>array</i> contains no subarrays.) If the optional <i>level</i>
* argument determines the level of recursion to flatten.
- *
+ *
* a = [ 1, 2, [3, [4, 5] ] ]
* a.flatten! #=> [1, 2, 3, 4, 5]
* a.flatten! #=> nil
@@ -3422,23 +3196,21 @@ flatten(VALUE ary, int level, int *modified)
*/
static VALUE
-rb_ary_flatten_bang(int argc, VALUE *argv, VALUE ary)
+rb_ary_flatten_bang(argc, argv, ary)
+ int argc;
+ VALUE *argv;
+ VALUE ary;
{
int mod = 0, level = -1;
VALUE result, lv;
rb_scan_args(argc, argv, "01", &lv);
if (!NIL_P(lv)) level = NUM2INT(lv);
- if (level == 0) return Qnil;
+ if (level == 0) return ary;
result = flatten(ary, level, &mod);
- if (mod == 0) {
- ary_discard(result);
- return Qnil;
- }
- if (!(mod = ARY_EMBED_P(result))) rb_obj_freeze(result);
+ if (mod == 0) return Qnil;
rb_ary_replace(ary, result);
- if (mod) ARY_SET_EMBED_LEN(result, 0);
return ary;
}
@@ -3447,12 +3219,12 @@ rb_ary_flatten_bang(int argc, VALUE *argv, VALUE ary)
* call-seq:
* array.flatten -> an_array
* array.flatten(level) -> an_array
- *
+ *
* Returns a new array that is a one-dimensional flattening of this
* array (recursively). That is, for every element that is an array,
* extract its elements into the new array. If the optional
* <i>level</i> argument determines the level of recursion to flatten.
- *
+ *
* s = [ 1, 2, 3 ] #=> [1, 2, 3]
* t = [ 4, 5, 6, [7, 8] ] #=> [4, 5, 6, [7, 8]]
* a = [ s, t, 9, 10 ] #=> [[1, 2, 3], [4, 5, 6, [7, 8]], 9, 10]
@@ -3462,40 +3234,44 @@ rb_ary_flatten_bang(int argc, VALUE *argv, VALUE ary)
*/
static VALUE
-rb_ary_flatten(int argc, VALUE *argv, VALUE ary)
+rb_ary_flatten(argc, argv, ary)
+ int argc;
+ VALUE *argv;
+ VALUE ary;
{
int mod = 0, level = -1;
VALUE result, lv;
rb_scan_args(argc, argv, "01", &lv);
if (!NIL_P(lv)) level = NUM2INT(lv);
- if (level == 0) return ary_make_shared_copy(ary);
+ if (level == 0) return ary;
result = flatten(ary, level, &mod);
- OBJ_INFECT(result, ary);
+ if (OBJ_TAINTED(ary)) OBJ_TAINT(result);
return result;
}
/*
* call-seq:
- * array.shuffle! -> array
- *
+ * array.shuffle! -> array or nil
+ *
* Shuffles elements in _self_ in place.
*/
static VALUE
-rb_ary_shuffle_bang(VALUE ary)
+rb_ary_shuffle_bang(ary)
+ VALUE ary;
{
- long i = RARRAY_LEN(ary);
+ long i = RARRAY(ary)->len;
rb_ary_modify(ary);
while (i) {
- long j = (long)(rb_genrand_real()*i);
- VALUE tmp = RARRAY_PTR(ary)[--i];
- RARRAY_PTR(ary)[i] = RARRAY_PTR(ary)[j];
- RARRAY_PTR(ary)[j] = tmp;
+ long j = rb_genrand_real()*i;
+ VALUE tmp = RARRAY(ary)->ptr[--i];
+ RARRAY(ary)->ptr[i] = RARRAY(ary)->ptr[j];
+ RARRAY(ary)->ptr[j] = tmp;
}
return ary;
}
@@ -3504,9 +3280,9 @@ rb_ary_shuffle_bang(VALUE ary)
/*
* call-seq:
* array.shuffle -> an_array
- *
+ *
* Returns a new array with elements of this array shuffled.
- *
+ *
* a = [ 1, 2, 3 ] #=> [1, 2, 3]
* a.shuffle #=> [2, 3, 1]
*/
@@ -3522,86 +3298,22 @@ rb_ary_shuffle(VALUE ary)
/*
* call-seq:
- * array.sample -> obj
- * array.sample(n) -> an_array
- *
- * Choose a random element or +n+ random elements from the array. The elements
- * are chosen by using random and unique indices into the array in order to
- * ensure that an element doesn't repeat itself unless the array already
- * contained duplicate elements. If the array is empty the first form returns
- * <code>nil</code> and the second form returns an empty array.
- *
+ * array.choice -> obj
+ *
+ * Choose a random element from an array.
*/
static VALUE
-rb_ary_sample(int argc, VALUE *argv, VALUE ary)
+rb_ary_choice(ary)
+ VALUE ary;
{
- VALUE nv, result, *ptr;
- long n, len, i, j, k, idx[10];
-
- len = RARRAY_LEN(ary);
- if (argc == 0) {
- if (len == 0) return Qnil;
- i = len == 1 ? 0 : (long)(rb_genrand_real()*len);
- return RARRAY_PTR(ary)[i];
- }
- rb_scan_args(argc, argv, "1", &nv);
- n = NUM2LONG(nv);
- if (n < 0) rb_raise(rb_eArgError, "negative sample number");
- ptr = RARRAY_PTR(ary);
- len = RARRAY_LEN(ary);
- if (n > len) n = len;
- switch (n) {
- case 0: return rb_ary_new2(0);
- case 1:
- return rb_ary_new4(1, &ptr[(long)(rb_genrand_real()*len)]);
- case 2:
- i = (long)(rb_genrand_real()*len);
- j = (long)(rb_genrand_real()*(len-1));
- if (j >= i) j++;
- return rb_ary_new3(2, ptr[i], ptr[j]);
- case 3:
- i = (long)(rb_genrand_real()*len);
- j = (long)(rb_genrand_real()*(len-1));
- k = (long)(rb_genrand_real()*(len-2));
- {
- long l = j, g = i;
- if (j >= i) l = i, g = ++j;
- if (k >= l && (++k >= g)) ++k;
- }
- return rb_ary_new3(3, ptr[i], ptr[j], ptr[k]);
- }
- if ((size_t)n < sizeof(idx)/sizeof(idx[0])) {
- long sorted[sizeof(idx)/sizeof(idx[0])];
- sorted[0] = idx[0] = (long)(rb_genrand_real()*len);
- for (i=1; i<n; i++) {
- k = (long)(rb_genrand_real()*--len);
- for (j = 0; j < i; ++j) {
- if (k < sorted[j]) break;
- ++k;
- }
- memmove(&sorted[j+1], &sorted[j], sizeof(sorted[0])*(i-j));
- sorted[j] = idx[i] = k;
- }
- result = rb_ary_new2(n);
- for (i=0; i<n; i++) {
- RARRAY_PTR(result)[i] = RARRAY_PTR(ary)[idx[i]];
- }
- }
- else {
- result = rb_ary_new4(len, ptr);
- RB_GC_GUARD(ary);
- for (i=0; i<n; i++) {
- j = (long)(rb_genrand_real()*(len-i)) + i;
- nv = RARRAY_PTR(result)[j];
- RARRAY_PTR(result)[j] = RARRAY_PTR(result)[i];
- RARRAY_PTR(result)[i] = nv;
- }
- }
- ARY_SET_LEN(result, n);
+ long i, j;
- return result;
+ i = RARRAY(ary)->len;
+ if (i == 0) return Qnil;
+ j = rb_genrand_real()*i;
+ return RARRAY(ary)->ptr[j];
}
@@ -3609,20 +3321,23 @@ rb_ary_sample(int argc, VALUE *argv, VALUE ary)
* call-seq:
* ary.cycle {|obj| block }
* ary.cycle(n) {|obj| block }
- *
+ *
* Calls <i>block</i> for each element repeatedly _n_ times or
* forever if none or nil is given. If a non-positive number is
* given or the array is empty, does nothing. Returns nil if the
* loop has finished without getting interrupted.
- *
+ *
* a = ["a", "b", "c"]
* a.cycle {|x| puts x } # print, a, b, c, a, b, c,.. forever.
* a.cycle(2) {|x| puts x } # print, a, b, c, a, b, c.
- *
+ *
*/
static VALUE
-rb_ary_cycle(int argc, VALUE *argv, VALUE ary)
+rb_ary_cycle(argc, argv, ary)
+ int argc;
+ VALUE *argv;
+ VALUE ary;
{
long n, i;
VALUE nv = Qnil;
@@ -3638,25 +3353,22 @@ rb_ary_cycle(int argc, VALUE *argv, VALUE ary)
if (n <= 0) return Qnil;
}
- while (RARRAY_LEN(ary) > 0 && (n < 0 || 0 < n--)) {
- for (i=0; i<RARRAY_LEN(ary); i++) {
- rb_yield(RARRAY_PTR(ary)[i]);
+ while (RARRAY(ary)->len > 0 && (n < 0 || 0 < n--)) {
+ for (i=0; i<RARRAY(ary)->len; i++) {
+ rb_yield(RARRAY(ary)->ptr[i]);
}
}
return Qnil;
}
#define tmpbuf(n, size) rb_str_tmp_new((n)*(size))
-#define tmpbuf_discard(s) (rb_str_resize((s), 0L), RBASIC(s)->klass = rb_cString)
-#define tmpary(n) rb_ary_tmp_new(n)
-#define tmpary_discard(a) (ary_discard(a), RBASIC(a)->klass = rb_cArray)
/*
* Recursively compute permutations of r elements of the set [0..n-1].
* When we have a complete permutation of array indexes, copy the values
- * at those indexes into a new array and yield that array.
+ * at those indexes into a new array and yield that array.
*
- * n: the size of the set
+ * n: the size of the set
* r: the number of elements in each permutation
* p: the array (of size r) that we're filling in
* index: what index we're filling in now
@@ -3664,7 +3376,10 @@ rb_ary_cycle(int argc, VALUE *argv, VALUE ary)
* values: the Ruby array that holds the actual values to permute
*/
static void
-permute0(long n, long r, long *p, long index, char *used, VALUE values)
+permute0(n, r, p, index, used, values)
+ long n, r, *p, index;
+ int *used;
+ VALUE values;
{
long i,j;
for (i = 0; i < n; i++) {
@@ -3673,7 +3388,7 @@ permute0(long n, long r, long *p, long index, char *used, VALUE values)
if (index < r-1) { /* if not done yet */
used[i] = 1; /* mark index used */
permute0(n, r, p, index+1, /* recurse */
- used, values);
+ used, values);
used[i] = 0; /* index unused */
}
else {
@@ -3681,15 +3396,12 @@ permute0(long n, long r, long *p, long index, char *used, VALUE values)
/* Build a ruby array of the corresponding values */
/* And yield it to the associated block */
VALUE result = rb_ary_new2(r);
- VALUE *result_array = RARRAY_PTR(result);
- const VALUE *values_array = RARRAY_PTR(values);
+ VALUE *result_array = RARRAY(result)->ptr;
+ const VALUE *values_array = RARRAY(values)->ptr;
for (j = 0; j < r; j++) result_array[j] = values_array[p[j]];
- ARY_SET_LEN(result, r);
+ RARRAY(result)->len = r;
rb_yield(result);
- if (RBASIC(values)->klass) {
- rb_raise(rb_eRuntimeError, "permute reentered");
- }
}
}
}
@@ -3701,15 +3413,15 @@ permute0(long n, long r, long *p, long index, char *used, VALUE values)
* ary.permutation -> enumerator
* ary.permutation(n) { |p| block } -> array
* ary.permutation(n) -> enumerator
- *
+ *
* When invoked with a block, yield all permutations of length <i>n</i>
* of the elements of <i>ary</i>, then return the array itself.
* If <i>n</i> is not specified, yield all permutations of all elements.
- * The implementation makes no guarantees about the order in which
+ * The implementation makes no guarantees about the order in which
* the permutations are yielded.
*
* When invoked without a block, return an enumerator object instead.
- *
+ *
* Examples:
*
* a = [1, 2, 3]
@@ -3722,47 +3434,49 @@ permute0(long n, long r, long *p, long index, char *used, VALUE values)
*/
static VALUE
-rb_ary_permutation(int argc, VALUE *argv, VALUE ary)
+rb_ary_permutation(argc, argv, ary)
+ int argc;
+ VALUE *argv;
+ VALUE ary;
{
VALUE num;
long r, n, i;
- n = RARRAY_LEN(ary); /* Array length */
+ n = RARRAY(ary)->len; /* Array length */
RETURN_ENUMERATOR(ary, argc, argv); /* Return enumerator if no block */
rb_scan_args(argc, argv, "01", &num);
r = NIL_P(num) ? n : NUM2LONG(num); /* Permutation size from argument */
- if (r < 0 || n < r) {
+ if (r < 0 || n < r) {
/* no permutations: yield nothing */
}
else if (r == 0) { /* exactly one permutation: the zero-length array */
rb_yield(rb_ary_new2(0));
}
else if (r == 1) { /* this is a special, easy case */
- for (i = 0; i < RARRAY_LEN(ary); i++) {
- rb_yield(rb_ary_new3(1, RARRAY_PTR(ary)[i]));
+ for (i = 0; i < RARRAY(ary)->len; i++) {
+ rb_yield(rb_ary_new3(1, RARRAY(ary)->ptr[i]));
}
}
else { /* this is the general case */
volatile VALUE t0 = tmpbuf(n,sizeof(long));
- long *p = (long*)RSTRING_PTR(t0);
- volatile VALUE t1 = tmpbuf(n,sizeof(char));
- char *used = (char*)RSTRING_PTR(t1);
- VALUE ary0 = ary_make_substitution(ary); /* private defensive copy of ary */
- RBASIC(ary0)->klass = 0;
+ long *p = (long*)RSTRING(t0)->ptr;
+ volatile VALUE t1 = tmpbuf(n,sizeof(int));
+ int *used = (int*)RSTRING(t1)->ptr;
+ VALUE ary0 = ary_make_shared(ary); /* private defensive copy of ary */
- MEMZERO(used, char, n); /* initialize array */
+ for (i = 0; i < n; i++) used[i] = 0; /* initialize array */
permute0(n, r, p, 0, used, ary0); /* compute and yield permutations */
- tmpbuf_discard(t0);
- tmpbuf_discard(t1);
- RBASIC(ary0)->klass = rb_cArray;
+ RB_GC_GUARD(t0);
+ RB_GC_GUARD(t1);
}
return ary;
}
static long
-combi_len(long n, long k)
+combi_len(n, k)
+ long n, k;
{
long i, val = 1;
@@ -3785,14 +3499,14 @@ combi_len(long n, long k)
* call-seq:
* ary.combination(n) { |c| block } -> ary
* ary.combination(n) -> enumerator
- *
- * When invoked with a block, yields all combinations of length <i>n</i>
+ *
+ * When invoked with a block, yields all combinations of length <i>n</i>
* of elements from <i>ary</i> and then returns <i>ary</i> itself.
- * The implementation makes no guarantees about the order in which
+ * The implementation makes no guarantees about the order in which
* the combinations are yielded.
*
* When invoked without a block, returns an enumerator object instead.
- *
+ *
* Examples:
*
* a = [1, 2, 3, 4]
@@ -3802,17 +3516,19 @@ combi_len(long n, long k)
* a.combination(4).to_a #=> [[1,2,3,4]]
* a.combination(0).to_a #=> [[]] # one combination of length 0
* a.combination(5).to_a #=> [] # no combinations of length 5
- *
+ *
*/
static VALUE
-rb_ary_combination(VALUE ary, VALUE num)
+rb_ary_combination(ary, num)
+ VALUE ary;
+ VALUE num;
{
long n, i, len;
n = NUM2LONG(num);
RETURN_ENUMERATOR(ary, 1, &num);
- len = RARRAY_LEN(ary);
+ len = RARRAY(ary)->len;
if (n < 0 || len < n) {
/* yield nothing */
}
@@ -3821,34 +3537,30 @@ rb_ary_combination(VALUE ary, VALUE num)
}
else if (n == 1) {
for (i = 0; i < len; i++) {
- rb_yield(rb_ary_new3(1, RARRAY_PTR(ary)[i]));
+ rb_yield(rb_ary_new3(1, RARRAY(ary)->ptr[i]));
}
}
else {
volatile VALUE t0 = tmpbuf(n+1, sizeof(long));
- long *stack = (long*)RSTRING_PTR(t0);
+ long *stack = (long*)RSTRING(t0)->ptr;
long nlen = combi_len(len, n);
- volatile VALUE cc = tmpary(n);
- VALUE *chosen = RARRAY_PTR(cc);
+ volatile VALUE cc = rb_ary_new2(n);
+ VALUE *chosen = RARRAY(cc)->ptr;
long lev = 0;
+ RBASIC(cc)->klass = 0;
MEMZERO(stack, long, n);
stack[0] = -1;
for (i = 0; i < nlen; i++) {
- chosen[lev] = RARRAY_PTR(ary)[stack[lev+1]];
+ chosen[lev] = RARRAY(ary)->ptr[stack[lev+1]];
for (lev++; lev < n; lev++) {
- chosen[lev] = RARRAY_PTR(ary)[stack[lev+1] = stack[lev]+1];
+ chosen[lev] = RARRAY(ary)->ptr[stack[lev+1] = stack[lev]+1];
}
rb_yield(rb_ary_new4(n, chosen));
- if (RBASIC(t0)->klass) {
- rb_raise(rb_eRuntimeError, "combination reentered");
- }
do {
stack[lev--]++;
} while (lev && (stack[lev+1]+n == len+lev+1));
}
- tmpbuf_discard(t0);
- tmpary_discard(cc);
}
return ary;
}
@@ -3856,11 +3568,11 @@ rb_ary_combination(VALUE ary, VALUE num)
/*
* call-seq:
* ary.product(other_ary, ...)
- *
+ *
* Returns an array of all combinations of elements from all arrays.
* The length of the returned array is the product of the length
* of ary and the argument arrays
- *
+ *
* [1,2,3].product([4,5]) # => [[1,4],[1,5],[2,4],[2,5],[3,4],[3,5]]
* [1,2].product([1,2]) # => [[1,1],[1,2],[2,1],[2,2]]
* [1,2].product([3,4],[5,6]) # => [[1,3,5],[1,3,6],[1,4,5],[1,4,6],
@@ -3870,13 +3582,16 @@ rb_ary_combination(VALUE ary, VALUE num)
*/
static VALUE
-rb_ary_product(int argc, VALUE *argv, VALUE ary)
+rb_ary_product(argc, argv, ary)
+ int argc;
+ VALUE *argv;
+ VALUE ary;
{
int n = argc+1; /* How many arrays we're operating on */
volatile VALUE t0 = tmpbuf(n, sizeof(VALUE));
volatile VALUE t1 = tmpbuf(n, sizeof(int));
- VALUE *arrays = (VALUE*)RSTRING_PTR(t0); /* The arrays we're computing the product of */
- int *counters = (int*)RSTRING_PTR(t1); /* The current position in each one */
+ VALUE *arrays = (VALUE*)RSTRING(t0)->ptr; /* The arrays we're computing the product of */
+ int *counters = (int*)RSTRING(t1)->ptr; /* The current position in each one */
VALUE result; /* The array we'll be returning */
long i,j;
long resultlen = 1;
@@ -3887,13 +3602,13 @@ rb_ary_product(int argc, VALUE *argv, VALUE ary)
/* initialize the arrays of arrays */
arrays[0] = ary;
for (i = 1; i < n; i++) arrays[i] = to_ary(argv[i-1]);
-
+
/* initialize the counters for the arrays */
for (i = 0; i < n; i++) counters[i] = 0;
/* Compute the length of the result array; return [] if any is empty */
for (i = 0; i < n; i++) {
- long k = RARRAY_LEN(arrays[i]), l = resultlen;
+ long k = RARRAY(arrays[i])->len, l = resultlen;
if (k == 0) return rb_ary_new2(0);
resultlen *= k;
if (resultlen < k || resultlen < l || resultlen / k != l) {
@@ -3920,14 +3635,12 @@ rb_ary_product(int argc, VALUE *argv, VALUE ary)
*/
m = n-1;
counters[m]++;
- while (m > 0 && counters[m] == RARRAY_LEN(arrays[m])) {
+ while (m > 0 && counters[m] == RARRAY(arrays[m])->len) {
counters[m] = 0;
m--;
counters[m]++;
}
}
- tmpbuf_discard(t0);
- tmpbuf_discard(t1);
return result;
}
@@ -3935,44 +3648,48 @@ rb_ary_product(int argc, VALUE *argv, VALUE ary)
/*
* call-seq:
* ary.take(n) => array
- *
+ *
* Returns first n elements from <i>ary</i>.
- *
+ *
* a = [1, 2, 3, 4, 5, 0]
* a.take(3) # => [1, 2, 3]
- *
+ *
*/
static VALUE
-rb_ary_take(VALUE obj, VALUE n)
+rb_ary_take(obj, n)
+ VALUE obj;
+ VALUE n;
{
long len = NUM2LONG(n);
if (len < 0) {
rb_raise(rb_eArgError, "attempt to take negative size");
}
+
return rb_ary_subseq(obj, 0, len);
}
/*
* call-seq:
* ary.take_while {|arr| block } => array
- *
+ *
* Passes elements to the block until the block returns nil or false,
* then stops iterating and returns an array of all prior elements.
- *
+ *
* a = [1, 2, 3, 4, 5, 0]
* a.take_while {|i| i < 3 } # => [1, 2]
- *
+ *
*/
static VALUE
-rb_ary_take_while(VALUE ary)
+rb_ary_take_while(ary)
+ VALUE ary;
{
long i;
RETURN_ENUMERATOR(ary, 0, 0);
- for (i = 0; i < RARRAY_LEN(ary); i++) {
- if (!RTEST(rb_yield(RARRAY_PTR(ary)[i]))) break;
+ for (i = 0; i < RARRAY(ary)->len; i++) {
+ if (!RTEST(rb_yield(RARRAY(ary)->ptr[i]))) break;
}
return rb_ary_take(ary, LONG2FIX(i));
}
@@ -3980,17 +3697,19 @@ rb_ary_take_while(VALUE ary)
/*
* call-seq:
* ary.drop(n) => array
- *
+ *
* Drops first n elements from <i>ary</i>, and returns rest elements
* in an array.
- *
+ *
* a = [1, 2, 3, 4, 5, 0]
* a.drop(3) # => [4, 5, 0]
- *
+ *
*/
static VALUE
-rb_ary_drop(VALUE ary, VALUE n)
+rb_ary_drop(ary, n)
+ VALUE ary;
+ VALUE n;
{
VALUE result;
long pos = NUM2LONG(n);
@@ -3998,7 +3717,7 @@ rb_ary_drop(VALUE ary, VALUE n)
rb_raise(rb_eArgError, "attempt to drop negative size");
}
- result = rb_ary_subseq(ary, pos, RARRAY_LEN(ary));
+ result = rb_ary_subseq(ary, pos, RARRAY(ary)->len);
if (result == Qnil) result = rb_ary_new();
return result;
}
@@ -4006,54 +3725,51 @@ rb_ary_drop(VALUE ary, VALUE n)
/*
* call-seq:
* ary.drop_while {|arr| block } => array
- *
+ *
* Drops elements up to, but not including, the first element for
* which the block returns nil or false and returns an array
* containing the remaining elements.
- *
+ *
* a = [1, 2, 3, 4, 5, 0]
* a.drop_while {|i| i < 3 } # => [3, 4, 5, 0]
- *
+ *
*/
static VALUE
-rb_ary_drop_while(VALUE ary)
+rb_ary_drop_while(ary)
+ VALUE ary;
{
long i;
RETURN_ENUMERATOR(ary, 0, 0);
- for (i = 0; i < RARRAY_LEN(ary); i++) {
- if (!RTEST(rb_yield(RARRAY_PTR(ary)[i]))) break;
+ for (i = 0; i < RARRAY(ary)->len; i++) {
+ if (!RTEST(rb_yield(RARRAY(ary)->ptr[i]))) break;
}
return rb_ary_drop(ary, LONG2FIX(i));
}
-/* Arrays are ordered, integer-indexed collections of any object.
- * Array indexing starts at 0, as in C or Java. A negative index is
- * assumed to be relative to the end of the array---that is, an index of -1
- * indicates the last element of the array, -2 is the next to last
- * element in the array, and so on.
+/* Arrays are ordered, integer-indexed collections of any object.
+ * Array indexing starts at 0, as in C or Java. A negative index is
+ * assumed to be relative to the end of the array---that is, an index of -1
+ * indicates the last element of the array, -2 is the next to last
+ * element in the array, and so on.
*/
void
-Init_Array(void)
+Init_Array()
{
-#undef rb_intern
-#define rb_intern(str) rb_intern_const(str)
-
rb_cArray = rb_define_class("Array", rb_cObject);
rb_include_module(rb_cArray, rb_mEnumerable);
rb_define_alloc_func(rb_cArray, ary_alloc);
rb_define_singleton_method(rb_cArray, "[]", rb_ary_s_create, -1);
- rb_define_singleton_method(rb_cArray, "try_convert", rb_ary_s_try_convert, 1);
rb_define_method(rb_cArray, "initialize", rb_ary_initialize, -1);
rb_define_method(rb_cArray, "initialize_copy", rb_ary_replace, 1);
+ rb_define_method(rb_cArray, "to_s", rb_ary_to_s, 0);
rb_define_method(rb_cArray, "inspect", rb_ary_inspect, 0);
- rb_define_alias(rb_cArray, "to_s", "inspect");
rb_define_method(rb_cArray, "to_a", rb_ary_to_a, 0);
rb_define_method(rb_cArray, "to_ary", rb_ary_to_ary_m, 0);
rb_define_method(rb_cArray, "frozen?", rb_ary_frozen_p, 0);
@@ -4084,12 +3800,13 @@ Init_Array(void)
rb_define_method(rb_cArray, "find_index", rb_ary_index, -1);
rb_define_method(rb_cArray, "index", rb_ary_index, -1);
rb_define_method(rb_cArray, "rindex", rb_ary_rindex, -1);
+ rb_define_method(rb_cArray, "indexes", rb_ary_indexes, -1);
+ rb_define_method(rb_cArray, "indices", rb_ary_indexes, -1);
rb_define_method(rb_cArray, "join", rb_ary_join_m, -1);
rb_define_method(rb_cArray, "reverse", rb_ary_reverse_m, 0);
rb_define_method(rb_cArray, "reverse!", rb_ary_reverse_bang, 0);
rb_define_method(rb_cArray, "sort", rb_ary_sort, 0);
rb_define_method(rb_cArray, "sort!", rb_ary_sort_bang, 0);
- rb_define_method(rb_cArray, "sort_by!", rb_ary_sort_by_bang, 0);
rb_define_method(rb_cArray, "collect", rb_ary_collect, 0);
rb_define_method(rb_cArray, "collect!", rb_ary_collect_bang, 0);
rb_define_method(rb_cArray, "map", rb_ary_collect, 0);
@@ -4128,10 +3845,11 @@ Init_Array(void)
rb_define_method(rb_cArray, "compact!", rb_ary_compact_bang, 0);
rb_define_method(rb_cArray, "flatten", rb_ary_flatten, -1);
rb_define_method(rb_cArray, "flatten!", rb_ary_flatten_bang, -1);
+ rb_define_method(rb_cArray, "nitems", rb_ary_nitems, 0);
rb_define_method(rb_cArray, "count", rb_ary_count, -1);
rb_define_method(rb_cArray, "shuffle!", rb_ary_shuffle_bang, 0);
rb_define_method(rb_cArray, "shuffle", rb_ary_shuffle, 0);
- rb_define_method(rb_cArray, "sample", rb_ary_sample, -1);
+ rb_define_method(rb_cArray, "choice", rb_ary_choice, 0);
rb_define_method(rb_cArray, "cycle", rb_ary_cycle, -1);
rb_define_method(rb_cArray, "permutation", rb_ary_permutation, -1);
rb_define_method(rb_cArray, "combination", rb_ary_combination, 1);
@@ -4143,4 +3861,5 @@ Init_Array(void)
rb_define_method(rb_cArray, "drop_while", rb_ary_drop_while, 0);
id_cmp = rb_intern("<=>");
+ inspect_key = rb_intern("__inspect_key__");
}
diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub
index 834e8a5870..713b5c69df 100644
--- a/bcc32/Makefile.sub
+++ b/bcc32/Makefile.sub
@@ -3,10 +3,6 @@
SHELL = $(COMSPEC)
MKFILES = Makefile
-!ifndef MFLAGS
-MFLAGS=-
-!endif
-
#### Start of system configuration section. ####
!ifndef OS
OS = bccwin32
@@ -15,8 +11,6 @@ OS = bccwin32
!error RT not defined. Retry from configure pass.
!endif
-arch = $(ARCH)-$(OS)
-
## variables may be overridden by $(compile_dir)/Makefile
!ifndef srcdir
srcdir = ..
@@ -33,7 +27,7 @@ RUBYW_INSTALL_NAME = $(RUBY_INSTALL_NAME:ruby=rubyw)
RUBYW_INSTALL_NAME = $(RUBY_INSTALL_NAME)w
!endif
!ifndef RUBY_SO_NAME
-RUBY_SO_NAME = $(RT)-$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR)$(TEENY)
+RUBY_SO_NAME = $(RT)-$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR)
!endif
!ifndef icondirs
!ifdef ICONDIRS
@@ -46,6 +40,7 @@ iconinc=-I$(icondirs: = -I)
!endif
###############
+VPATH = $(srcdir):$(srcdir)/missing
.SUFFIXES: .y
!ifndef CC
@@ -58,21 +53,15 @@ CPP = cpp32
RC = brcc32
!endif
!ifndef YACC
-YACC = bison
+YACC = byacc
!endif
!ifndef AR
AR = tlib
!endif
-!ifndef BASERUBY
-BASERUBY = ruby
-!endif
PURIFY =
AUTOCONF = autoconf
-IFCHANGE = $(srcdir:/=\)\win32\ifchange.bat
RM = $(srcdir:/=\)\win32\rm.bat
-CP = copy > nul
-MV = move > nul
!if !defined(PROCESSOR_ARCHITECTURE)
PROCESSOR_ARCHITECTURE = x86
@@ -109,11 +98,14 @@ exec_prefix = $(prefix)
libdir = $(exec_prefix)/lib
!endif
!if !defined(datadir)
-datadir = $(prefix)/share
+datadir = /share
!endif
!ifndef EXTOUT
EXTOUT = .ext
!endif
+!ifndef RIDATADIR
+RIDATADIR = $(DESTDIR)$(datadir)/ri/$(MAJOR).$(MINOR)/system
+!endif
!ifndef TESTUI
TESTUI = console
!endif
@@ -121,24 +113,13 @@ TESTUI = console
TESTS =
!endif
!ifndef RDOCTARGET
-RDOCTARGET = install-doc
+RDOCTARGET = install-nodoc
!endif
OUTFLAG = -o
-COUTFLAG = -o
!ifndef CFLAGS
CFLAGS = -q -tWR -tWC $(DEBUGFLAGS) $(OPTFLAGS) $(PROCESSOR_FLAG) -w- -wsus -wcpt -wdup -wext -wrng -wrpt -wzdi
!endif
-!ifndef DEFS
-DEFS =
-!endif
-!ifndef CPPFLAGS
-CPPFLAGS =
-!endif
-CPPFLAGS = $(DEFS) $(CPPFLAGS)
-!ifndef CXXFLAGS
-CXXFLAGS = $(CFLAGS)
-!endif
!ifndef LDFLAGS
LDFLAGS = -S:$(STACK)
!endif
@@ -152,13 +133,13 @@ EXTLIBS =
MEMLIB =
!endif
LIBS = $(MEMLIB) cw32i.lib import32.lib ws2_32.lib $(EXTLIBS)
-MISSING = acosh.obj cbrt.obj crypt.obj erf.obj lgamma_r.obj strlcat.obj strlcpy.obj tgamma.obj win32.obj
+MISSING = acosh.obj crypt.obj erf.obj win32.obj
!ifndef STACK
STACK = 0x2000000
!endif
-XCFLAGS = -DRUBY_EXPORT -I. -I$(arch_hdrdir) -I$(hdrdir) -I$(srcdir) -I$(srcdir)/missing
+XCFLAGS = -DRUBY_EXPORT -I. -I$(srcdir) -I$(srcdir)/missing
ARFLAGS = /a /p32
LD = ilink32 -q -Gn
@@ -177,7 +158,7 @@ PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT)
WPROGRAM=$(RUBYW_INSTALL_NAME)$(EXEEXT)
RUBYDEF = $(RUBY_SO_NAME).def
MINIRUBY = .\miniruby$(EXEEXT) -I$(srcdir)/lib $(MINIRUBYOPT)
-RUNRUBY = .\$(PROGRAM) -i"$(EXTOUT)/$(arch)" "$(srcdir)/runruby.rb" --extout="$(EXTOUT)" --
+RUNRUBY = .\$(PROGRAM) "$(srcdir)/runruby.rb" --extout="$(EXTOUT)" --
ORGLIBPATH = $(LIB)
@@ -187,39 +168,32 @@ LIBRUBY_A = $(RUBY_SO_NAME)-static.lib
LIBRUBY_SO = $(RUBY_SO_NAME).dll
LIBRUBY = $(RUBY_SO_NAME).lib
LIBRUBYARG = $(LIBRUBY)
-THREAD_MODEL = win32
PREP = miniruby$(EXEEXT)
OBJEXT = obj
-ASMEXT = asm
INSTALLED_LIST= .installed.list
WINMAINOBJ = winmain.$(OBJEXT)
-ARCHMINIOBJS = dmydln.$(OBJEXT)
+MINIOBJS = dmydln.$(OBJEXT)
-arch_hdrdir = $(EXTOUT)/include/$(arch)
-hdrdir = $(srcdir)/include
-VPATH = $(arch_hdrdir)/ruby;$(hdrdir)/ruby;$(srcdir);$(srcdir)/enc;$(srcdir)/missing;$(srcdir)/win32
-
-.path.c = .;$(srcdir);$(srcdir)/enc;$(srcdir)/win32;$(srcdir)/missing
-.path.ci = $(srcdir)
-.path.inc = .;$(srcdir)
-.path.def = .;$(srcdir)
-.path.h = .;$(arch_hdrdir)/ruby;$(hdrdir)/ruby;$(srcdir);$(srcdir)/win32;$(srcdir)/missing
+.path.c = .;$(srcdir);$(srcdir)/win32;$(srcdir)/missing
+.path.h = .;$(srcdir);$(srcdir)/win32;$(srcdir)/missing
.path.y = $(srcdir)
.path. = $(srcdir)
.c.obj:
- $(CC) $(CFLAGS) $(XCFLAGS) -I. $(CPPFLAGS) $(COUTFLAG)$@ -c $(<:/=\)
-
-.c.asm:
- $(CC) $(CFLAGS) $(XCFLAGS) -I. $(CPPFLAGS) $(COUTFLAG)$@ -S $(<:\=/)
+ $(CC) $(CFLAGS) $(XCFLAGS) -I. $(CPPFLAGS) -c $(<:/=\)
.rc.res:
$(RC) $(RFLAGS) -I. -I$(<D). $(iconinc) -I$(srcdir)/win32 $(RFLAGS) -fo$@ $(<:/=\)
+.y.c:
+ $(YACC) $(YFLAGS) $(<:\=/)
+ sed -e "s!^ *extern char \*getenv();!/* & */!;s/^\(#.*\)y\.tab/\1parse/" y.tab.c > $(@F)
+ @del y.tab.c
+
all: $(srcdir)/bcc32/Makefile.sub $(srcdir)/common.mk
ruby: $(PROGRAM)
@@ -235,9 +209,6 @@ PHONY: nul
@exit
|
-PHONY: nul
-
-RUBY_CONFIG_H = $(arch_hdrdir)/ruby/config.h
CONFIG_H = ./.config.h.time
config: config.status
@@ -245,30 +216,23 @@ config: config.status
config.status: $(CONFIG_H)
$(CONFIG_H): $(MKFILES) $(srcdir)/bcc32/Makefile.sub
- @if not exist $(arch_hdrdir:/=\) md $(arch_hdrdir:/=\)
- @if not exist $(arch_hdrdir:/=\)\ruby md $(arch_hdrdir:/=\)\ruby
- @$(IFCHANGE) $(RUBY_CONFIG_H:/=\) &&|
-\#define NO_BIG_INLINE 1
+ @$(srcdir:/=\)\win32\ifchange.bat config.h &&|
\#define HAVE_SYS_TYPES_H 1
\#define HAVE_SYS_STAT_H 1
\#define HAVE_STDLIB_H 1
\#define HAVE_STRING_H 1
\#define HAVE_MEMORY_H 1
-\#define HAVE_LONG_LONG 1
\#define HAVE_OFF_T 1
\#define SIZEOF_INT 4
\#define SIZEOF_SHORT 2
\#define SIZEOF_LONG 4
\#define SIZEOF_LONG_LONG 0
\#define SIZEOF___INT64 8
-\#define SIZEOF_OFF_T 8
+\#define SIZEOF_OFF_T 4
\#define SIZEOF_VOIDP 4
\#define SIZEOF_FLOAT 4
\#define SIZEOF_DOUBLE 8
\#define SIZEOF_TIME_T 4
-\#define SIZEOF_RLIM_T 0
-\#define SIZEOF_SIZE_T 4
-\#define SIZEOF_PTRDIFF_T 4
\#define HAVE_PROTOTYPES 1
\#define TOKEN_PASTE(x,y) x\#\#y
\#define HAVE_STDARG_PROTOTYPES 1
@@ -284,27 +248,6 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/bcc32/Makefile.sub
\#define rb_pid_t int
\#define HAVE_STRUCT_STAT_ST_RDEV 1
\#define HAVE_ST_RDEV 1
-!if $(BORLANDC) < 0x0580
-\#define int8_t signed char
-\#define uint8_t unsigned char
-\#define int16_t short
-\#define uint16_t unsigned short
-\#define int32_t int
-\#define uint32_t unsigned int
-\#define int64_t __int64
-\#define uint64_t unsigned __int64
-\#define ssize_t int
-!endif
-\#define HAVE_UINT8_T 1
-\#define HAVE_INT16_T 1
-\#define HAVE_UINT16_T 1
-\#define HAVE_INT32_T 1
-\#define HAVE_UINT32_T 1
-\#define HAVE_INT64_T HAVE_LONG_LONG
-\#define HAVE_UINT64_T HAVE_LONG_LONG
-\#define HAVE_INTPTR_T 1
-\#define HAVE_UINTPTR_T 1
-\#define HAVE_SSIZE_T 1
\#define GETGROUPS_T int
\#define RETSIGTYPE void
\#define HAVE_ALLOCA 1
@@ -320,7 +263,6 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/bcc32/Makefile.sub
\#define HAVE_STRTOD 1
\#define HAVE_STRTOL 1
\#define HAVE_STRTOUL 1
-\#define HAVE_SNPRINTF 1
\#define HAVE_VSNPRINTF 1
\#define HAVE_ISNAN 1
\#define HAVE_FINITE 1
@@ -329,10 +271,7 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/bcc32/Makefile.sub
\#define HAVE_WAITPID 1
\#define HAVE_FSYNC 1
\#define HAVE_GETCWD 1
-\#define HAVE_TRUNCATE 1
-\#define HAVE_FTRUNCATE 1
-\#define HAVE_FSEEKO 1
-\#define HAVE_FTELLO 1
+\#define HAVE_CHSIZE 1
\#define HAVE_TIMES 1
\#define HAVE_FCNTL 1
\#define HAVE_LINK 1
@@ -344,26 +283,25 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/bcc32/Makefile.sub
\#define RSHIFT(x,y) ((x)>>(int)y)
\#define FILE_COUNT level
\#define FILE_READPTR curp
-\#define RUBY_SETJMP(env) setjmp(env)
+\#define RUBY_SETJMP(env) _setjmp(env)
\#define RUBY_LONGJMP(env,val) longjmp(env,val)
\#define RUBY_JMP_BUF jmp_buf
\#define inline __inline
\#define NEED_IO_SEEK_BETWEEN_RW 1
\#define STACK_GROW_DIRECTION -1
\#define DEFAULT_KCODE KCODE_NONE
-\#define LOAD_RELATIVE 1
\#define DLEXT ".so"
-\#define RUBY_LIB "/lib/ruby/$(MAJOR).$(MINOR).$(TEENY)"
+\#define RUBY_LIB "/lib/ruby/$(MAJOR).$(MINOR)"
\#define RUBY_SITE_LIB "/lib/ruby/site_ruby"
-\#define RUBY_SITE_LIB2 "/lib/ruby/site_ruby/$(MAJOR).$(MINOR).$(TEENY)"
+\#define RUBY_SITE_LIB2 "/lib/ruby/site_ruby/$(MAJOR).$(MINOR)"
\#define RUBY_VENDOR_LIB "/lib/ruby/vendor_ruby"
-\#define RUBY_VENDOR_LIB2 "/lib/ruby/vendor_ruby/$(MAJOR).$(MINOR).$(TEENY)"
+\#define RUBY_VENDOR_LIB2 "/lib/ruby/vendor_ruby/$(MAJOR).$(MINOR)"
\#define RUBY_PLATFORM "$(ARCH)-$(OS)"
-\#define RUBY_ARCHLIB "/lib/ruby/$(MAJOR).$(MINOR).$(TEENY)/$(ARCH)-$(OS)"
-\#define RUBY_SITE_ARCHLIB "/lib/ruby/site_ruby/$(MAJOR).$(MINOR).$(TEENY)/$(ARCH)-$(OS)"
-\#define RUBY_VENDOR_ARCHLIB "/lib/ruby/vendor_ruby/$(MAJOR).$(MINOR).$(TEENY)/$(ARCH)-$(OS)"
+\#define RUBY_ARCHLIB "/lib/ruby/$(MAJOR).$(MINOR)/$(ARCH)-$(OS)"
+\#define RUBY_SITE_ARCHLIB "/lib/ruby/site_ruby/$(MAJOR).$(MINOR)/$(ARCH)-$(OS)"
+\#define RUBY_VENDOR_ARCHLIB "/lib/ruby/vendor_ruby/$(MAJOR).$(MINOR)/$(ARCH)-$(OS)"
|
- @exit > $(@:/=\)
+ @exit > $@
config.status: $(MKFILES) $(srcdir)/bcc32/Makefile.sub $(srcdir)/common.mk
@echo Creating $@
@@ -373,14 +311,13 @@ s,@SHELL@,$$(COMSPEC),;t t
s,@BUILD_FILE_SEPARATOR@,\,;t t
s,@PATH_SEPARATOR@,;,;t t
s,@CFLAGS@,$(CFLAGS),;t t
-s,@DEFS@,$(DEFS),;t t
s,@CPPFLAGS@,$(CPPFLAGS),;t t
s,@CXXFLAGS@,$(CXXFLAGS),;t t
s,@FFLAGS@,$(FFLAGS),;t t
s,@LDFLAGS@,,;t t
s,@LIBS@,$(LIBS),;t t
s,@exec_prefix@,$${prefix},;t t
-s,@prefix@,$(prefix),;t t
+s,@prefix@,,;t t
s,@program_transform_name@,s,,,,;t t
s,@bindir@,$${exec_prefix}/bin,;t t
s,@sbindir@,$${exec_prefix}/sbin,;t t
@@ -394,7 +331,6 @@ s,@includedir@,$${prefix}/include,;t t
s,@oldincludedir@,/usr/include,;t t
s,@infodir@,$${prefix}/info,;t t
s,@mandir@,$${prefix}/man,;t t
-s,@ridir@,$${prefix}/share/ri,;t t
s,@build@,$(CPU)-pc-$(OS),;t t
s,@build_alias@,$(CPU)-$(OS),;t t
s,@build_cpu@,$(CPU),;t t
@@ -412,17 +348,14 @@ s,@target_vendor@,pc,;t t
s,@target_os@,$(OS),;t t
s,@CC@,$(CC),;t t
s,@CPP@,cpp32,;t t
-s,@CXX@,$$(CC),;t t
-s,@LD@,$(LD),;t t
s,@YACC@,$(YACC),;t t
s,@RANLIB@,,;t t
s,@AR@,$(AR),;t t
s,@ARFLAGS@,$(ARFLAGS) ,;t t
s,@LN_S@,$(LN_S),;t t
s,@SET_MAKE@,MFLAGS = -$$(MAKEFLAGS),;t t
-s,@RM@,$$(top_srcdir:/=\)\win32\rm.bat,;t t
s,@CP@,copy > nul,;t t
-s,@LIBOBJS@, $(MISSING),;t t
+s,@LIBOBJS@, acosh.obj crypt.obj erf.obj win32.obj,;t t
s,@ALLOCA@,$(ALLOCA),;t t
s,@DEFAULT_KCODE@,$(DEFAULT_KCODE),;t t
s,@EXEEXT@,.exe,;t t
@@ -462,30 +395,24 @@ s,@SOLIBS@,$(SOLIBS),;t t
s,@DLDLIBS@,$(DLDLIBS),;t t
s,@ENABLE_SHARED@,yes,;t t
s,@OUTFLAG@,$(OUTFLAG),;t t
-s,@COUTFLAG@,$(COUTFLAG),;t t
s,@CPPOUTFILE@,,;t t
s,@LIBPATHFLAG@, -L"%s",;t t
s,@RPATHFLAG@,,;t t
s,@LIBARG@,%s.lib,;t t
-s,@LINK_SO@,$$(LDSHARED) $$(DLDFLAGS) $$(LIBPATH) $$(OBJS:/=\), $$(@:/=\), nul, $$(LIBS) $$(LOCAL_LIBS), $$(DEFFILE:/=\), $$(RESFILE:/=\),;t t
-s,@COMPILE_C@,$$(CC) $$(INCFLAGS) $$(CFLAGS) $$(CPPFLAGS) $(COUTFLAG)$$(@) -c $$(<:/=\),;t t
-s,@COMPILE_CXX@,$$(CXX) $$(INCFLAGS) $$(CXXFLAGS) $$(CPPFLAGS) -P $(COUTFLAG)$$(@) -c $$(<:/=\),;t t
+s,@LINK_SO@,$$(LDSHARED) $$(DLDFLAGS) $$(LIBPATH) $$(OBJS), $$(@:/=\), nul, $$(LIBS) $$(LOCAL_LIBS), $$(DEFFILE), $$(RESFILE),;t t
+s,@COMPILE_C@,$$(CC) $$(INCFLAGS) $$(CFLAGS) $$(CPPFLAGS) -c $$(<:/=\),;t t
+s,@COMPILE_CXX@,$$(CXX) $$(INCFLAGS) $$(CXXFLAGS) $$(CPPFLAGS) -P -c $$(<:/=\),;t t
s,@COMPILE_RULES@,{$$(srcdir)}.%s{}.%s: {$$(topdir)}.%s{}.%s: {$$(hdrdir)}.%s{}.%s: .%s.%s:,;t t
s,@RULE_SUBST@,{.;$$(VPATH)}%s,;t t
s,@COMMON_LIBS@,m advapi32 avicap32 avifil32 cap comctl32 comdlg32 dlcapi gdi32 glu32 imagehlp imm32 inetmib1 kernel32 loadperf lsapi32 lz32 mapi32 mgmtapi mpr msacm32 msvfw32 nddeapi netapi32 ole32 oleaut32 oledlg olepro32 opengl32 pdh pkpd32 rasapi32 rasdlg rassapi rpcrt4 setupapi shell32 shfolder snmpapi sporder tapi32 url user32 vdmdbg version win32spl winmm wintrust wsock32,;t t
s,@COMMON_MACROS@,WIN32_LEAN_AND_MEAN WIN32,;t t
s,@COMMON_HEADERS@,winsock2.h windows.h,;t t
-s,@cleanlibs@,$$*.tds,;t t
-s,@cleanobjs@,$$*-$$(arch).def $$*.il? $$*.lib,;t t
s,@TRY_LINK@,$$(CC) -oconftest $$(INCFLAGS) -I$$(hdrdir) $$(CPPFLAGS) $$(CFLAGS) $$(LIBPATH) $$(LDFLAGS) $$(src) $$(LOCAL_LIBS) $$(LIBS),;t t
s,@EXPORT_PREFIX@,_,;t t
s,@arch@,$(ARCH)-$(OS),;t t
s,@sitearch@,$(ARCH)-$(OS),;t t
s,@sitedir@,$${prefix}/lib/ruby/site_ruby,;t t
s,@vendordir@,$${prefix}/lib/ruby/vendor_ruby,;t t
-s,@rubyhdrdir@,$$(includedir)/ruby-$$(MAJOR).$$(MINOR).$$(TEENY),;t t
-s,@sitehdrdir@,$$(rubyhdrdir)/site_ruby,;t t
-s,@vendorhdrdir@,$$(rubyhdrdir)/vendor_ruby,;t t
s,@configure_args@,--enable-shared $(configure_args),;t t
s,@configure_input@,$$configure_input,;t t
s,@srcdir@,$(srcdir),;t t
@@ -494,7 +421,7 @@ s,@top_srcdir@,$(srcdir),;t t
miniruby$(EXEEXT):
@echo $(LIBS)
- $(LD) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ) $(MINIOBJS) $(COMMONOBJS:/=\) $(DMYEXT),$@,nul,$(LIBS)
+ $(LD) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ) $(MINIOBJS),$@,nul,$(LIBRUBY_A) $(LIBS)
$(PROGRAM): $(MAINOBJ) $(LIBRUBY_SO) $(RUBY_INSTALL_NAME).res
$(LD) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ),$@,nul,$(LIBRUBYARG) $(LIBS),,$(RUBY_INSTALL_NAME).res
@@ -519,16 +446,13 @@ $(LIBRUBY): $(LIBRUBY_SO)
$(RUBYDEF): $(LIBRUBY_A) $(PREP)
$(MINIRUBY) $(srcdir)/bcc32/mkexports.rb -output=$@ -base=$(RUBY_SO_NAME) $(LIBRUBY_A)
-$(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc: rbconfig.rb $(srcdir)/revision.h $(srcdir)/win32/resource.rb
+$(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc: rbconfig.rb
@$(MINIRUBY) $(srcdir)/win32/resource.rb \
-ruby_name=$(RUBY_INSTALL_NAME) \
-rubyw_name=$(RUBYW_INSTALL_NAME) \
-so_name=$(RUBY_SO_NAME) \
. $(icondirs) $(srcdir)/win32
-lex.c: {$(srcdir)}lex.c.blt
- copy "$(?:/=\)" $@
-
post-install-bin::
@$(NULLCMD)
post-install-lib::
@@ -545,25 +469,48 @@ post-install-doc::
clean-local::
@$(RM) $(WINMAINOBJ) ext\extinit.c ext\extinit.$(OBJEXT) *.tds *.il? $(RUBY_SO_NAME).lib
@$(RM) $(RUBY_INSTALL_NAME).res $(RUBYW_INSTALL_NAME).res $(RUBY_SO_NAME).res
- @$(RM) *.map *.pdb *.ilk *.exp $(RUBYDEF) ext\ripper\y.output
+ @$(RM) *.map *.pdb *.ilk *.exp $(RUBYDEF)
distclean-local::
@$(RM) ext\config.cache $(RBCONFIG:/=\)
@$(RM) $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc
-clean-ext distclean-ext realclean-ext::
- @for /R ext %I in (.) do @if exist %I\Makefile ( \
- echo $(@:-ext=)ing %~nI & \
- cd %I & \
- $(MAKE) $(MFLAGS) $(@:-ext=) & \
- cd %CD% \
- )
+update-rubyspec:
+ @echo SPEC_EXISTS=0 > $@.mk
+ @if exist $(srcdir:/=\)\rubyspec\nul echo SPEC_EXISTS=1 >> $@.mk
+ @type >> $@.mk &&|
+$()update-rubyspec:
+$() @del $@.mk
+$()!if $$(SPEC_EXISTS)
+$() cd $(srcdir:/=\)\rubyspec\mspec
+$() git pull
+$() cd ..\spec\rubyspec
+$() git pull
+$()!else
+$() git clone $(MSPEC_GIT_URL) $(srcdir)/rubyspec/mspec
+$() git clone $(RUBYSPEC_GIT_URL) $(srcdir)/rubyspec/spec/rubyspec
+$()!endif
+|
+ @$(MAKE) -$(MAKEFLAGS)$(MFLAGS) -f $@.mk
+
+test-rubyspec:
+ @echo SPEC_EXISTS=0 > $@.mk
+ @if exist $(srcdir:/=\)\rubyspec\nul echo SPEC_EXISTS=1 >> $@.mk
+ @type >> $@.mk &&|
+$()test-rubyspec:
+$()!if $$(SPEC_EXISTS)
+$() $(RUNRUBY) $(srcdir)/rubyspec/mspec/bin/mspec -r$(srcdir)/ext/purelib.rb $(srcdir)/rubyspec/spec/rubyspec/$(MAJOR).$(MINOR)
+$()!else
+$() @echo No rubyspec here. put rubyspec to srcdir first.
+$() @cd $(srcdir:/=\)\rubyspec
+$()!endif
+|
+ @$(MAKE) -$(MAKEFLAGS) -f $@.mk
ext/extinit.obj: ext/extinit.c $(SETUP)
- $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c
+ $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -o$@ -c ext/extinit.c
main.$(OBJEXT): win32.h
-ascii.$(OBJEXT): win32.h
array.$(OBJEXT): win32.h
bignum.$(OBJEXT): win32.h
class.$(OBJEXT): win32.h
@@ -572,7 +519,6 @@ dir.$(OBJEXT): dir.h win32.h
dln.$(OBJEXT): win32.h
enum.$(OBJEXT): win32.h
error.$(OBJEXT): win32.h
-euc_jp.$(OBJEXT): win32.h
eval.$(OBJEXT): win32.h
file.$(OBJEXT): win32.h
gc.$(OBJEXT): win32.h
@@ -590,21 +536,14 @@ prec.$(OBJEXT): win32.h
random.$(OBJEXT): win32.h
range.$(OBJEXT): win32.h
re.$(OBJEXT): win32.h
-regcomp.$(OBJEXT): win32.h
-regenc.$(OBJEXT): win32.h
-regerror.$(OBJEXT): win32.h
-regexec.$(OBJEXT): win32.h
-reggnu.$(OBJEXT): win32.h
-regparse.$(OBJEXT): win32.h
+regex.$(OBJEXT): win32.h
ruby.$(OBJEXT): win32.h
signal.$(OBJEXT): win32.h
-sjis.$(OBJEXT): win32.h
sprintf.$(OBJEXT): win32.h
st.$(OBJEXT): win32.h
string.$(OBJEXT): win32.h
struct.$(OBJEXT): win32.h
time.$(OBJEXT): win32.h
-utf_8.$(OBJEXT): win32.h
util.$(OBJEXT): win32.h
variable.$(OBJEXT): win32.h
version.$(OBJEXT): win32.h
diff --git a/bcc32/README.bcc32 b/bcc32/README.bcc32
index fb19906c75..c27a1261f1 100644
--- a/bcc32/README.bcc32
+++ b/bcc32/README.bcc32
@@ -16,7 +16,7 @@
* ilink32
(3) If you want to build from CVS source, following commands are required.
- * bison ((<URL:http://gnuwin32.sourceforge.net/packages/bison.htm>))
+ * byacc ((<URL:http://gnuwin32.sourceforge.net/packages/byacc.htm>))
* sed ((<URL:http://gnuwin32.sourceforge.net/packages/sed.htm>))
(4) We strongly recommend to build ruby on C++Builder, to link following files.
@@ -30,12 +30,7 @@
== How to compile and install
(1) Execute bcc32\configure.bat on your build directory.
- ex. c:\src\ruby> bcc32\configure.bat
- You can specify the target platform as an argument.
- For example, run `((%configure i686-bccwin32%))'
- You can also specify the install directory.
- For example, run `((%configure --prefix=<install_directory>%))'
- Default of the install directory is /usr .
+ ex. c:\ruby-1.6.7>bcc32\configure.bat
(2) Change ((|RUBY_INSTALL_NAME|)) and ((|RUBY_SO_NAME|)) in (({Makefile}))
if you want to change the name of the executable files.
@@ -46,7 +41,7 @@
(4) Run `((%make test%))'
-(5) Run `((%make install%))'
+(5) Run `((%make DESTDIR=<install_directory> install%))'
This command will create following directories and install files onto them.
* <install_directory>\bin
@@ -59,7 +54,7 @@
* <install_directory>\lib\ruby\site_ruby\<MAJOR>.<MINOR>\<PLATFORM>
* <install_directory>\man\man1
If Ruby's version is `x.y.z', the ((|<MAJOR>|)) is `x' and the ((|<MINOR>|)) is `y'.
- The default ((|<PLATFORM>|)) is `(({i386-bccwin32}))'.
+ The ((|<PLATFORM>|)) is usually `(({i586-bccwin32}))'.
(6) Requires dynamic RTL (cc3250.dll on C++Builder5) and borlndmm.dll (If built with
usebormm.lib) to use installed binary. These files are ordinary in bcc32's bin
@@ -95,10 +90,10 @@ in Japanese, but you can download at least.
C:
cd \ruby
- bcc32\configure --prefix=/usr/local
+ bcc32\configure
make
make test
- make install
+ make DESTDIR=/usr/local install
* Build on the relative directory from the ruby source directory and CPU type
i386.
@@ -113,10 +108,10 @@ in Japanese, but you can download at least.
cd \ruby
mkdir bccwin32
cd bccwin32
- ..\bcc32\configure --prefix=/usr/local
+ ..\bcc32\configure target i386-bccwin32
make
make test
- make install
+ make DESTDIR=/usr/local install
* Build on the different drive.
@@ -127,10 +122,10 @@ in Japanese, but you can download at least.
D:
cd D:\build\ruby
- C:\src\ruby\bcc32\configure --prefix=C:/usr/local
+ C:\src\ruby\bcc32\configure
make
make test
- make install
+ make DESTDIR=C:/usr/local install
== Bugs
diff --git a/bcc32/configure.bat b/bcc32/configure.bat
index 8cdfc64b03..95575cbc60 100755
--- a/bcc32/configure.bat
+++ b/bcc32/configure.bat
@@ -30,8 +30,6 @@ if "%1" == "--enable-install-doc" goto :enable-rdoc
if "%1" == "--disable-install-doc" goto :disable-rdoc
if "%1" == "--extout" goto :extout
if "%1" == "EXTOUT" goto :extout
-if "%1" == "--with-baseruby" goto :baseruby
-if "%1" == "BASERUBY" goto :baseruby
if "%1" == "--path" goto :path
if "%1" == "-h" goto :help
if "%1" == "--help" goto :help
@@ -109,14 +107,6 @@ goto :loop
shift
shift
goto :loop
-:baseruby
- echo>>confargs.mk !ifndef BASERUBY
- echo>>confargs.mk BASERUBY = %2
- echo>>confargs.mk !endif
- echo>>confargs.tmp %1=%2 \
- shift
- shift
-goto :loop
:path
echo>>pathlist.tmp %2;\
echo>>confargs.tmp %1=%2 \
@@ -132,9 +122,8 @@ goto :loop
echo System types:
echo --target=TARGET configure for TARGET [i386-bccwin32]
echo Optional Package:
- echo --with-baseruby=RUBY use RUBY as baseruby [ruby]
echo --with-static-linked-ext link external modules statically
- echo --enable-install-doc install rdoc indexes during install
+ echo --disable-install-doc install rdoc indexes during install
del *.tmp
del ~tmp~.mak
goto :exit
diff --git a/bcc32/mkexports.rb b/bcc32/mkexports.rb
index 888ab2e2a6..dc523e2541 100755
--- a/bcc32/mkexports.rb
+++ b/bcc32/mkexports.rb
@@ -1,26 +1,27 @@
#!./miniruby -s
-$:.unshift(File.expand_path("../..", __FILE__))
-require 'win32/mkexports'
+$name = $library = $description = nil
-class Exports::Bcc < Exports
- def forwarding(internal, export)
- internal[/\A_?/]+export
+SYM = {}
+STDIN.reopen(open("nul"))
+ARGV.each do |obj|
+ IO.foreach("|tdump -q -oiPUBDEF -oiPUBD32 #{obj.tr('/', '\\')}") do |l|
+ next unless /(?:PUBDEF|PUBD32)/ =~ l
+ SYM[$1] = true if /'(.*?)'/ =~ l
end
+end
- def each_line(objs, &block)
- objs.each do |obj|
- opt = /\.(?:so|dll)\z/i =~ obj ? "-ee" : "-oiPUBDEF -oiPUBD32"
- IO.foreach("|tdump -q #{opt} #{obj.tr('/', '\\')} < nul", &block)
- end
- end
+exports = []
+if $name
+ exports << "Name " + $name
+elsif $library
+ exports << "Library " + $library
+end
+exports << "Description " + $description.dump if $description
+exports << "EXPORTS" << SYM.keys.sort
- def each_export(objs)
- objdump(objs) do |l|
- next unless /(?:PUBDEF|PUBD32|EXPORT)/ =~ l
- yield $1 if /'(.*?)'/ =~ l
- end
- yield "_strcasecmp", "_stricmp"
- yield "_strncasecmp", "_strnicmp"
- end
+if $output
+ open($output, 'w') {|f| f.puts exports.join("\n")}
+else
+ puts exports.join("\n")
end
diff --git a/bcc32/setup.mak b/bcc32/setup.mak
index e5b4ee8f44..483292ed51 100644
--- a/bcc32/setup.mak
+++ b/bcc32/setup.mak
@@ -15,7 +15,7 @@ prefix = /usr
OS = bccwin32
RT = $(OS)
BANG = !
-APPEND = echo.>>$(MAKEFILE)
+APPEND = echo>>$(MAKEFILE)
!ifdef MAKEFILE
MAKE = $(MAKE) -f $(MAKEFILE)
!else
@@ -42,16 +42,6 @@ $(BANG)endif
$(BANG)ifndef prefix
prefix = $(prefix:\=/)
$(BANG)endif
-$(BANG)if !defined(BASERUBY)
-!if defined(BASERUBY)
-BASERUBY = $(BASERUBY)
-!endif
-|
-!if !defined(BASERUBY)
- @for %I in (ruby.exe) do @echo BASERUBY = "%~$$PATH:I" >> $(MAKEFILE)
-!endif
- @type >> $(MAKEFILE) &&|
-$(BANG)endif
|
!if exist(confargs.mk)
@type confargs.mk >> $(MAKEFILE)
@@ -94,7 +84,6 @@ $(BANG)endif
-version-: nul
@cpp32 -I$(srcdir) -P- -o$(MAKEFILE) > nul &&|
-\#define RUBY_REVISION 0
\#include "version.h"
MAJOR = RUBY_VERSION_MAJOR
MINOR = RUBY_VERSION_MINOR
@@ -158,11 +147,6 @@ $(BANG)endif
@$(APPEND) PROCESSOR_LEVEL = 6
@$(APPEND) !endif
--epilogue-: -encs-
-
--encs-: nul
- @$(MAKE) -f $(srcdir)/win32/enc-setup.mak srcdir="$(srcdir)" MAKEFILE=$(MAKEFILE)
-
-epilogue-: nul
@type >> $(MAKEFILE) &&|
diff --git a/benchmark/bm_app_answer.rb b/benchmark/bm_app_answer.rb
deleted file mode 100644
index 3cd8a8fd37..0000000000
--- a/benchmark/bm_app_answer.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-def ack(m, n)
- if m == 0 then
- n + 1
- elsif n == 0 then
- ack(m - 1, 1)
- else
- ack(m - 1, ack(m, n - 1))
- end
-end
-
-def the_answer_to_life_the_universe_and_everything
- (ack(3,7).to_s.split(//).inject(0){|s,x| s+x.to_i}.to_s + "2" ).to_i
-end
-
-answer = the_answer_to_life_the_universe_and_everything
diff --git a/benchmark/bm_app_erb.rb b/benchmark/bm_app_erb.rb
deleted file mode 100644
index e58b7a34a1..0000000000
--- a/benchmark/bm_app_erb.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# Create many HTML strings with ERB.
-#
-
-require 'erb'
-
-data = DATA.read
-max = 5_000
-title = "hello world!"
-content = "hello world!\n" * 10
-
-max.times{
- ERB.new(data).result(binding)
-}
-
-__END__
-
-<html>
- <head> <%= title %> </head>
- <body>
- <h1> <%= title %> </h1>
- <p>
- <%= content %>
- </p>
- </body>
-</html>
diff --git a/benchmark/bm_app_factorial.rb b/benchmark/bm_app_factorial.rb
deleted file mode 100644
index a5a5de0426..0000000000
--- a/benchmark/bm_app_factorial.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-def fact(n)
- if(n > 1)
- n * fact(n-1)
- else
- 1
- end
-end
-
-8.times{
- fact(5000)
-} \ No newline at end of file
diff --git a/benchmark/bm_app_fib.rb b/benchmark/bm_app_fib.rb
deleted file mode 100644
index 34a7b2e725..0000000000
--- a/benchmark/bm_app_fib.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-def fib n
- if n < 3
- 1
- else
- fib(n-1) + fib(n-2)
- end
-end
-
-fib(34)
-
diff --git a/benchmark/bm_app_mandelbrot.rb b/benchmark/bm_app_mandelbrot.rb
deleted file mode 100644
index a0dcf5e874..0000000000
--- a/benchmark/bm_app_mandelbrot.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-require 'complex'
-
-def mandelbrot? z
- i = 0
- while i<100
- i+=1
- z = z * z
- return false if z.abs > 2
- end
- true
-end
-
-ary = []
-
-(0..100).each{|dx|
- (0..100).each{|dy|
- x = dx / 50.0
- y = dy / 50.0
- c = Complex(x, y)
- ary << c if mandelbrot?(c)
- }
-}
-
diff --git a/benchmark/bm_app_pentomino.rb b/benchmark/bm_app_pentomino.rb
deleted file mode 100644
index 59c63f358e..0000000000
--- a/benchmark/bm_app_pentomino.rb
+++ /dev/null
@@ -1,259 +0,0 @@
-#!/usr/local/bin/ruby
-# This program is contributed by Shin Nishiyama
-
-
-# modified by K.Sasada
-
-NP = 5
-ROW = 8 + NP
-COL = 8
-
-$p = []
-$b = []
-$no = 0
-
-def piece(n, a, nb)
- nb.each{|x|
- a[n] = x
- if n == NP-1
- $p << [a.sort]
- else
- nbc=nb.dup
- [-ROW, -1, 1, ROW].each{|d|
- if x+d > 0 and not a.include?(x+d) and not nbc.include?(x+d)
- nbc << x+d
- end
- }
- nbc.delete x
- piece(n+1,a[0..n],nbc)
- end
- }
-end
-
-def kikaku(a)
- a.collect {|x| x - a[0]}
-end
-def ud(a)
- kikaku(a.collect {|x| ((x+NP)%ROW)-ROW*((x+NP)/ROW) }.sort)
-end
-def rl(a)
- kikaku(a.collect {|x| ROW*((x+NP)/ROW)+ROW-((x+NP)%ROW)}.sort)
-end
-def xy(a)
- kikaku(a.collect {|x| ROW*((x+NP)%ROW) + (x+NP)/ROW }.sort)
-end
-
-def mkpieces
- piece(0,[],[0])
- $p.each do |a|
- a0 = a[0]
- a[1] = ud(a0)
- a[2] = rl(a0)
- a[3] = ud(rl(a0))
- a[4] = xy(a0)
- a[5] = ud(xy(a0))
- a[6] = rl(xy(a0))
- a[7] = ud(rl(xy(a0)))
- a.sort!
- a.uniq!
- end
- $p.uniq!.sort! {|x,y| x[0] <=> y[0] }
-end
-
-def mkboard
- (0...ROW*COL).each{|i|
- if i % ROW >= ROW-NP
- $b[i] = -2
- else
- $b[i] = -1
- end
- $b[3*ROW+3]=$b[3*ROW+4]=$b[4*ROW+3]=$b[4*ROW+4]=-2
- }
-end
-
-def pboard
- return # skip print
- print "No. #$no\n"
- (0...COL).each{|i|
- print "|"
- (0...ROW-NP).each{|j|
- x = $b[i*ROW+j]
- if x < 0
- print "..|"
- else
- printf "%2d|",x+1
- end
- }
- print "\n"
- }
- print "\n"
-end
-
-$pnum=[]
-def setpiece(a,pos)
- if a.length == $p.length then
- $no += 1
- pboard
- return
- end
- while $b[pos] != -1
- pos += 1
- end
- ($pnum - a).each do |i|
- $p[i].each do |x|
- f = 0
- x.each{|s|
- if $b[pos+s] != -1
- f=1
- break
- end
- }
- if f == 0 then
- x.each{|s|
- $b[pos+s] = i
- }
- a << i
- setpiece(a.dup, pos)
- a.pop
- x.each{|s|
- $b[pos+s] = -1
- }
- end
- end
- end
-end
-
-mkpieces
-mkboard
-$p[4] = [$p[4][0]]
-$pnum = (0...$p.length).to_a
-setpiece([],0)
-
-
-__END__
-
-# original
-
-NP = 5
-ROW = 8 + NP
-COL = 8
-
-$p = []
-$b = []
-$no = 0
-
-def piece(n,a,nb)
- for x in nb
- a[n] = x
- if n == NP-1
- $p << [a.sort]
- else
- nbc=nb.dup
- for d in [-ROW, -1, 1, ROW]
- if x+d > 0 and not a.include?(x+d) and not nbc.include?(x+d)
- nbc << x+d
- end
- end
- nbc.delete x
- piece(n+1,a[0..n],nbc)
- end
- end
-end
-
-def kikaku(a)
- a.collect {|x| x - a[0]}
-end
-def ud(a)
- kikaku(a.collect {|x| ((x+NP)%ROW)-ROW*((x+NP)/ROW) }.sort)
-end
-def rl(a)
- kikaku(a.collect {|x| ROW*((x+NP)/ROW)+ROW-((x+NP)%ROW)}.sort)
-end
-def xy(a)
- kikaku(a.collect {|x| ROW*((x+NP)%ROW) + (x+NP)/ROW }.sort)
-end
-
-def mkpieces
- piece(0,[],[0])
- $p.each do |a|
- a0 = a[0]
- a[1] = ud(a0)
- a[2] = rl(a0)
- a[3] = ud(rl(a0))
- a[4] = xy(a0)
- a[5] = ud(xy(a0))
- a[6] = rl(xy(a0))
- a[7] = ud(rl(xy(a0)))
- a.sort!
- a.uniq!
- end
- $p.uniq!.sort! {|x,y| x[0] <=> y[0] }
-end
-
-def mkboard
- for i in 0...ROW*COL
- if i % ROW >= ROW-NP
- $b[i] = -2
- else
- $b[i] = -1
- end
- $b[3*ROW+3]=$b[3*ROW+4]=$b[4*ROW+3]=$b[4*ROW+4]=-2
- end
-end
-
-def pboard
- print "No. #$no\n"
- for i in 0...COL
- print "|"
- for j in 0...ROW-NP
- x = $b[i*ROW+j]
- if x < 0
- print "..|"
- else
- printf "%2d|",x+1
- end
- end
- print "\n"
- end
- print "\n"
-end
-
-$pnum=[]
-def setpiece(a,pos)
- if a.length == $p.length then
- $no += 1
- pboard
- return
- end
- while $b[pos] != -1
- pos += 1
- end
- ($pnum - a).each do |i|
- $p[i].each do |x|
- f = 0
- for s in x do
- if $b[pos+s] != -1
- f=1
- break
- end
- end
- if f == 0 then
- for s in x do
- $b[pos+s] = i
- end
- a << i
- setpiece(a.dup, pos)
- a.pop
- for s in x do
- $b[pos+s] = -1
- end
- end
- end
- end
-end
-
-mkpieces
-mkboard
-$p[4] = [$p[4][0]]
-$pnum = (0...$p.length).to_a
-setpiece([],0)
diff --git a/benchmark/bm_app_raise.rb b/benchmark/bm_app_raise.rb
deleted file mode 100644
index 01d2ae3219..0000000000
--- a/benchmark/bm_app_raise.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-i=0
-while i<300000
- i+=1
- begin
- raise
- rescue
- end
-end
diff --git a/benchmark/bm_app_strconcat.rb b/benchmark/bm_app_strconcat.rb
deleted file mode 100644
index c6ef817263..0000000000
--- a/benchmark/bm_app_strconcat.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-i=0
-while i<500000
- "#{1+1} #{1+1} #{1+1}"
- i+=1
-end
diff --git a/benchmark/bm_app_tak.rb b/benchmark/bm_app_tak.rb
deleted file mode 100644
index efe5380f4e..0000000000
--- a/benchmark/bm_app_tak.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-
-def tak x, y, z
- unless y < x
- z
- else
- tak( tak(x-1, y, z),
- tak(y-1, z, x),
- tak(z-1, x, y))
- end
-end
-
-tak(18, 9, 0)
-
diff --git a/benchmark/bm_app_tarai.rb b/benchmark/bm_app_tarai.rb
deleted file mode 100644
index 4c146f5ccf..0000000000
--- a/benchmark/bm_app_tarai.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-def tarai( x, y, z )
- if x <= y
- then y
- else tarai(tarai(x-1, y, z),
- tarai(y-1, z, x),
- tarai(z-1, x, y))
- end
-end
-
-tarai(12, 6, 0)
diff --git a/benchmark/bm_app_uri.rb b/benchmark/bm_app_uri.rb
deleted file mode 100644
index 586edfd5dc..0000000000
--- a/benchmark/bm_app_uri.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-require 'uri'
-
-100_000.times{
- uri = URI.parse('http://www.ruby-lang.org')
- uri.scheme
- uri.host
- uri.port
-}
diff --git a/benchmark/bm_io_file_create.rb b/benchmark/bm_io_file_create.rb
deleted file mode 100644
index 7adbe9ea5e..0000000000
--- a/benchmark/bm_io_file_create.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Create files
-#
-
-max = 50_000
-file = './tmpfile_of_bm_io_file_create'
-
-max.times{
- f = open(file, 'w')
- f.close#(true)
-}
-File.unlink(file)
-
diff --git a/benchmark/bm_io_file_read.rb b/benchmark/bm_io_file_read.rb
deleted file mode 100644
index 2b4212db76..0000000000
--- a/benchmark/bm_io_file_read.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# Seek and Read file.
-#
-
-require 'tempfile'
-
-max = 20_000
-str = "Hello world! " * 1000
-f = Tempfile.new('yarv-benchmark')
-f.write str
-
-max.times{
- f.seek 0
- f.read
-}
diff --git a/benchmark/bm_io_file_write.rb b/benchmark/bm_io_file_write.rb
deleted file mode 100644
index 3cec58c6ae..0000000000
--- a/benchmark/bm_io_file_write.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# Seek and Write file.
-#
-
-require 'tempfile'
-
-max = 20_000
-str = "Hello world! " * 1000
-f = Tempfile.new('yarv-benchmark')
-
-max.times{
- f.seek 0
- f.write str
-}
diff --git a/benchmark/bm_loop_for.rb b/benchmark/bm_loop_for.rb
deleted file mode 100644
index 0fc4cc1511..0000000000
--- a/benchmark/bm_loop_for.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-for i in 1..30_000_000
- #
-end
diff --git a/benchmark/bm_loop_generator.rb b/benchmark/bm_loop_generator.rb
deleted file mode 100644
index d3375c744c..0000000000
--- a/benchmark/bm_loop_generator.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-max = 600000
-
-if defined? Fiber
- gen = (1..max).each
- loop do
- gen.next
- end
-else
- require 'generator'
- gen = Generator.new((0..max))
- while gen.next?
- gen.next
- end
-end
diff --git a/benchmark/bm_loop_times.rb b/benchmark/bm_loop_times.rb
deleted file mode 100644
index 521f72ad1a..0000000000
--- a/benchmark/bm_loop_times.rb
+++ /dev/null
@@ -1 +0,0 @@
-30_000_000.times{|e|}
diff --git a/benchmark/bm_loop_whileloop.rb b/benchmark/bm_loop_whileloop.rb
deleted file mode 100644
index 43d35e1131..0000000000
--- a/benchmark/bm_loop_whileloop.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-i=0
-while i<30_000_000 # benchmark loop 1
- i+=1
-end
diff --git a/benchmark/bm_loop_whileloop2.rb b/benchmark/bm_loop_whileloop2.rb
deleted file mode 100644
index e514989661..0000000000
--- a/benchmark/bm_loop_whileloop2.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-i=0
-while i< 6_000_000 # benchmark loop 2
- i+=1
-end
diff --git a/benchmark/bm_so_ackermann.rb b/benchmark/bm_so_ackermann.rb
deleted file mode 100644
index 7db5be9050..0000000000
--- a/benchmark/bm_so_ackermann.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/ruby
-# -*- mode: ruby -*-
-# $Id: ackermann-ruby.code,v 1.4 2004/11/13 07:40:41 bfulgham Exp $
-# http://www.bagley.org/~doug/shootout/
-
-def ack(m, n)
- if m == 0 then
- n + 1
- elsif n == 0 then
- ack(m - 1, 1)
- else
- ack(m - 1, ack(m, n - 1))
- end
-end
-
-NUM = 9
-ack(3, NUM)
-
-
diff --git a/benchmark/bm_so_array.rb b/benchmark/bm_so_array.rb
deleted file mode 100644
index 2b8fce8f99..0000000000
--- a/benchmark/bm_so_array.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/ruby
-# -*- mode: ruby -*-
-# $Id: ary-ruby.code,v 1.4 2004/11/13 07:41:27 bfulgham Exp $
-# http://www.bagley.org/~doug/shootout/
-# with help from Paul Brannan and Mark Hubbart
-
-n = 9000 # Integer(ARGV.shift || 1)
-
-x = Array.new(n)
-y = Array.new(n, 0)
-
-n.times{|bi|
- x[bi] = bi + 1
-}
-
-(0 .. 999).each do |e|
- (n-1).step(0,-1) do |bi|
- y[bi] += x.at(bi)
- end
-end
-# puts "#{y.first} #{y.last}"
-
-
diff --git a/benchmark/bm_so_binary_trees.rb b/benchmark/bm_so_binary_trees.rb
deleted file mode 100644
index 6a26465578..0000000000
--- a/benchmark/bm_so_binary_trees.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-# The Computer Language Shootout Benchmarks
-# http://shootout.alioth.debian.org
-#
-# contributed by Jesse Millikan
-
-# disable output
-def STDOUT.write_ *args
-end
-
-def item_check(tree)
- if tree[0] == nil
- tree[1]
- else
- tree[1] + item_check(tree[0]) - item_check(tree[2])
- end
-end
-
-def bottom_up_tree(item, depth)
- if depth > 0
- item_item = 2 * item
- depth -= 1
- [bottom_up_tree(item_item - 1, depth), item, bottom_up_tree(item_item, depth)]
- else
- [nil, item, nil]
- end
-end
-
-max_depth = 12 # 16 # ARGV[0].to_i
-min_depth = 4
-
-max_depth = min_depth + 2 if min_depth + 2 > max_depth
-
-stretch_depth = max_depth + 1
-stretch_tree = bottom_up_tree(0, stretch_depth)
-
-puts "stretch tree of depth #{stretch_depth}\t check: #{item_check(stretch_tree)}"
-stretch_tree = nil
-
-long_lived_tree = bottom_up_tree(0, max_depth)
-
-min_depth.step(max_depth + 1, 2) do |depth|
- iterations = 2**(max_depth - depth + min_depth)
-
- check = 0
-
- for i in 1..iterations
- temp_tree = bottom_up_tree(i, depth)
- check += item_check(temp_tree)
-
- temp_tree = bottom_up_tree(-i, depth)
- check += item_check(temp_tree)
- end
-
- puts "#{iterations * 2}\t trees of depth #{depth}\t check: #{check}"
-end
-
-puts "long lived tree of depth #{max_depth}\t check: #{item_check(long_lived_tree)}"
diff --git a/benchmark/bm_so_concatenate.rb b/benchmark/bm_so_concatenate.rb
deleted file mode 100644
index 82629688b7..0000000000
--- a/benchmark/bm_so_concatenate.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/ruby
-# -*- mode: ruby -*-
-# $Id: strcat-ruby.code,v 1.4 2004/11/13 07:43:28 bfulgham Exp $
-# http://www.bagley.org/~doug/shootout/
-# based on code from Aristarkh A Zagorodnikov and Dat Nguyen
-
-STUFF = "hello\n"
-i=0
-while i<10
- i+=1
- hello = ''
- 400000.times do |e|
- hello << STUFF
- end
-end
-# puts hello.length
-
-
diff --git a/benchmark/bm_so_count_words.rb b/benchmark/bm_so_count_words.rb
deleted file mode 100644
index 65f6337a4a..0000000000
--- a/benchmark/bm_so_count_words.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/ruby
-# -*- mode: ruby -*-
-# $Id: wc-ruby.code,v 1.4 2004/11/13 07:43:32 bfulgham Exp $
-# http://www.bagley.org/~doug/shootout/
-# with help from Paul Brannan
-
-input = open(File.join(File.dirname($0), 'wc.input'), 'rb')
-
-nl = nw = nc = 0
-while true
- tmp = input.read(4096) or break
- data = tmp << (input.gets || "")
- nc += data.length
- nl += data.count("\n")
- ((data.strip! || data).tr!("\n", " ") || data).squeeze!
- nw += data.count(" ") + 1
-end
-# STDERR.puts "#{nl} #{nw} #{nc}"
-
diff --git a/benchmark/bm_so_exception.rb b/benchmark/bm_so_exception.rb
deleted file mode 100644
index d8b461290c..0000000000
--- a/benchmark/bm_so_exception.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/usr/bin/ruby
-# -*- mode: ruby -*-
-# $Id: except-ruby.code,v 1.4 2004/11/13 07:41:33 bfulgham Exp $
-# http://www.bagley.org/~doug/shootout/
-
-$HI = 0
-$LO = 0
-NUM = 250000 # Integer(ARGV[0] || 1)
-
-
-class Lo_Exception < Exception
- def initialize(num)
- @value = num
- end
-end
-
-class Hi_Exception < Exception
- def initialize(num)
- @value = num
- end
-end
-
-def some_function(num)
- begin
- hi_function(num)
- rescue
- print "We shouldn't get here, exception is: #{$!.type}\n"
- end
-end
-
-def hi_function(num)
- begin
- lo_function(num)
- rescue Hi_Exception
- $HI = $HI + 1
- end
-end
-
-def lo_function(num)
- begin
- blowup(num)
- rescue Lo_Exception
- $LO = $LO + 1
- end
-end
-
-def blowup(num)
- if num % 2 == 0
- raise Lo_Exception.new(num)
- else
- raise Hi_Exception.new(num)
- end
-end
-
-
-i = 1
-max = NUM+1
-while i < max
- i+=1
- some_function(i+1)
-end
diff --git a/benchmark/bm_so_fannkuch.rb b/benchmark/bm_so_fannkuch.rb
deleted file mode 100644
index a214f2e205..0000000000
--- a/benchmark/bm_so_fannkuch.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-# The Computer Language Shootout
-# http://shootout.alioth.debian.org/
-# Contributed by Sokolov Yura
-# Modified by Ryan Williams
-
-def fannkuch(n)
- maxFlips, m, r, check = 0, n-1, n, 0
- count = (1..n).to_a
- perm = (1..n).to_a
-
- while true
- if check < 30
- puts "#{perm}"
- check += 1
- end
-
- while r != 1
- count[r-1] = r
- r -= 1
- end
-
- if perm[0] != 1 and perm[m] != n
- perml = perm.clone #.dup
- flips = 0
- while (k = perml.first ) != 1
- perml = perml.slice!(0, k).reverse + perml
- flips += 1
- end
- maxFlips = flips if flips > maxFlips
- end
- while true
- if r==n then return maxFlips end
- perm.insert r,perm.shift
- break if (count[r] -= 1) > 0
- r += 1
- end
- end
-end
-
-def puts *args
-end
-
-N = 10 # (ARGV[0] || 1).to_i
-puts "Pfannkuchen(#{N}) = #{fannkuch(N)}"
-
diff --git a/benchmark/bm_so_fasta.rb b/benchmark/bm_so_fasta.rb
deleted file mode 100644
index 3f759ba7ae..0000000000
--- a/benchmark/bm_so_fasta.rb
+++ /dev/null
@@ -1,81 +0,0 @@
-# The Computer Language Shootout
-# http://shootout.alioth.debian.org/
-# Contributed by Sokolov Yura
-
-$last = 42.0
-def gen_random (max,im=139968,ia=3877,ic=29573)
- (max * ($last = ($last * ia + ic) % im)) / im
-end
-
-alu =
- "GGCCGGGCGCGGTGGCTCACGCCTGTAATCCCAGCACTTTGG"+
- "GAGGCCGAGGCGGGCGGATCACCTGAGGTCAGGAGTTCGAGA"+
- "CCAGCCTGGCCAACATGGTGAAACCCCGTCTCTACTAAAAAT"+
- "ACAAAAATTAGCCGGGCGTGGTGGCGCGCGCCTGTAATCCCA"+
- "GCTACTCGGGAGGCTGAGGCAGGAGAATCGCTTGAACCCGGG"+
- "AGGCGGAGGTTGCAGTGAGCCGAGATCGCGCCACTGCACTCC"+
- "AGCCTGGGCGACAGAGCGAGACTCCGTCTCAAAAA"
-
-iub = [
- ["a", 0.27],
- ["c", 0.12],
- ["g", 0.12],
- ["t", 0.27],
-
- ["B", 0.02],
- ["D", 0.02],
- ["H", 0.02],
- ["K", 0.02],
- ["M", 0.02],
- ["N", 0.02],
- ["R", 0.02],
- ["S", 0.02],
- ["V", 0.02],
- ["W", 0.02],
- ["Y", 0.02],
-]
-homosapiens = [
- ["a", 0.3029549426680],
- ["c", 0.1979883004921],
- ["g", 0.1975473066391],
- ["t", 0.3015094502008],
-]
-
-def make_repeat_fasta(id, desc, src, n)
- puts ">#{id} #{desc}"
- v = nil
- width = 60
- l = src.length
- s = src * ((n / l) + 1)
- s.slice!(n, l)
- puts(s.scan(/.{1,#{width}}/).join("\n"))
-end
-
-def make_random_fasta(id, desc, table, n)
- puts ">#{id} #{desc}"
- rand, v = nil,nil
- width = 60
- chunk = 1 * width
- prob = 0.0
- table.each{|v| v[1]= (prob += v[1])}
- for i in 1..(n/width)
- puts((1..width).collect{
- rand = gen_random(1.0)
- table.find{|v| v[1]>rand}[0]
- }.join)
- end
- if n%width != 0
- puts((1..(n%width)).collect{
- rand = gen_random(1.0)
- table.find{|v| v[1]>rand}[0]
- }.join)
- end
-end
-
-
-n = (ARGV[0] or 250_000).to_i
-
-make_repeat_fasta('ONE', 'Homo sapiens alu', alu, n*2)
-make_random_fasta('TWO', 'IUB ambiguity codes', iub, n*3)
-make_random_fasta('THREE', 'Homo sapiens frequency', homosapiens, n*5)
-
diff --git a/benchmark/bm_so_k_nucleotide.rb b/benchmark/bm_so_k_nucleotide.rb
deleted file mode 100644
index dadab3e79c..0000000000
--- a/benchmark/bm_so_k_nucleotide.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-# The Computer Language Shootout
-# http://shootout.alioth.debian.org
-#
-# contributed by jose fco. gonzalez
-# modified by Sokolov Yura
-
-seq = String.new
-
-def frecuency( seq,length )
- n, table = seq.length - length + 1, Hash.new(0)
- f, i = nil, nil
- (0 ... length).each do |f|
- (f ... n).step(length) do |i|
- table[seq[i,length]] += 1
- end
- end
- [n,table]
-
-end
-
-def sort_by_freq( seq,length )
- n,table = frecuency( seq,length )
- a, b, v = nil, nil, nil
- table.sort{|a,b| b[1] <=> a[1]}.each do |v|
- puts "%s %.3f" % [v[0].upcase,((v[1]*100).to_f/n)]
- end
- puts
-end
-
-def find_seq( seq,s )
- n,table = frecuency( seq,s.length )
- puts "#{table[s].to_s}\t#{s.upcase}"
-end
-
-input = open(File.join(File.dirname($0), 'fasta.output.100000'), 'rb')
-
-line = input.gets while line !~ /^>THREE/
-line = input.gets
-
-while (line !~ /^>/) & line do
- seq << line.chomp
- line = input.gets
-end
-
-[1,2].each {|i| sort_by_freq( seq,i ) }
-
-%w(ggt ggta ggtatt ggtattttaatt ggtattttaatttatagt).each{|s| find_seq( seq,s) }
-
diff --git a/benchmark/bm_so_lists.rb b/benchmark/bm_so_lists.rb
deleted file mode 100644
index 3652288881..0000000000
--- a/benchmark/bm_so_lists.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-#from http://www.bagley.org/~doug/shootout/bench/lists/lists.ruby
-
-NUM = 100
-SIZE = 10000
-
-def test_lists()
- # create a list of integers (Li1) from 1 to SIZE
- li1 = (1..SIZE).to_a
- # copy the list to li2 (not by individual items)
- li2 = li1.dup
- # remove each individual item from left side of li2 and
- # append to right side of li3 (preserving order)
- li3 = Array.new
- while (not li2.empty?)
- li3.push(li2.shift)
- end
- # li2 must now be empty
- # remove each individual item from right side of li3 and
- # append to right side of li2 (reversing list)
- while (not li3.empty?)
- li2.push(li3.pop)
- end
- # li3 must now be empty
- # reverse li1 in place
- li1.reverse!
- # check that first item is now SIZE
- if li1[0] != SIZE then
- p "not SIZE"
- 0
- else
- # compare li1 and li2 for equality
- if li1 != li2 then
- return(0)
- else
- # return the length of the list
- li1.length
- end
- end
-end
-
-i = 0
-while i<NUM
- i+=1
- result = test_lists()
-end
-
-result
diff --git a/benchmark/bm_so_mandelbrot.rb b/benchmark/bm_so_mandelbrot.rb
deleted file mode 100644
index 76331c64b8..0000000000
--- a/benchmark/bm_so_mandelbrot.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-# The Computer Language Benchmarks Game
-# http://shootout.alioth.debian.org/
-#
-# contributed by Karl von Laudermann
-# modified by Jeremy Echols
-
-size = 600 # ARGV[0].to_i
-
-puts "P4\n#{size} #{size}"
-
-ITER = 49 # Iterations - 1 for easy for..in looping
-LIMIT_SQUARED = 4.0 # Presquared limit
-
-byte_acc = 0
-bit_num = 0
-
-count_size = size - 1 # Precomputed size for easy for..in looping
-
-# For..in loops are faster than .upto, .downto, .times, etc.
-for y in 0..count_size
- for x in 0..count_size
- zr = 0.0
- zi = 0.0
- cr = (2.0*x/size)-1.5
- ci = (2.0*y/size)-1.0
- escape = false
-
- # To make use of the for..in code, we use a dummy variable,
- # like one would in C
- for dummy in 0..ITER
- tr = zr*zr - zi*zi + cr
- ti = 2*zr*zi + ci
- zr, zi = tr, ti
-
- if (zr*zr+zi*zi) > LIMIT_SQUARED
- escape = true
- break
- end
- end
-
- byte_acc = (byte_acc << 1) | (escape ? 0b0 : 0b1)
- bit_num += 1
-
- # Code is very similar for these cases, but using separate blocks
- # ensures we skip the shifting when it's unnecessary, which is most cases.
- if (bit_num == 8)
- print byte_acc.chr
- byte_acc = 0
- bit_num = 0
- elsif (x == count_size)
- byte_acc <<= (8 - bit_num)
- print byte_acc.chr
- byte_acc = 0
- bit_num = 0
- end
- end
-end
diff --git a/benchmark/bm_so_matrix.rb b/benchmark/bm_so_matrix.rb
deleted file mode 100644
index 0f274ad06c..0000000000
--- a/benchmark/bm_so_matrix.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/ruby
-# -*- mode: ruby -*-
-# $Id: matrix-ruby.code,v 1.4 2004/11/13 07:42:14 bfulgham Exp $
-# http://www.bagley.org/~doug/shootout/
-
-n = 60 #Integer(ARGV.shift || 1)
-
-size = 30
-
-def mkmatrix(rows, cols)
- count = 1
- mx = Array.new(rows)
- (0 .. (rows - 1)).each do |bi|
- row = Array.new(cols, 0)
- (0 .. (cols - 1)).each do |j|
- row[j] = count
- count += 1
- end
- mx[bi] = row
- end
- mx
-end
-
-def mmult(rows, cols, m1, m2)
- m3 = Array.new(rows)
- (0 .. (rows - 1)).each do |bi|
- row = Array.new(cols, 0)
- (0 .. (cols - 1)).each do |j|
- val = 0
- (0 .. (cols - 1)).each do |k|
- val += m1.at(bi).at(k) * m2.at(k).at(j)
- end
- row[j] = val
- end
- m3[bi] = row
- end
- m3
-end
-
-m1 = mkmatrix(size, size)
-m2 = mkmatrix(size, size)
-mm = Array.new
-n.times do
- mm = mmult(size, size, m1, m2)
-end
-# puts "#{mm[0][0]} #{mm[2][3]} #{mm[3][2]} #{mm[4][4]}"
-
-
diff --git a/benchmark/bm_so_meteor_contest.rb b/benchmark/bm_so_meteor_contest.rb
deleted file mode 100644
index 99cf6a91cc..0000000000
--- a/benchmark/bm_so_meteor_contest.rb
+++ /dev/null
@@ -1,564 +0,0 @@
-#!/usr/bin/env ruby
-#
-# The Computer Language Shootout
-# http://shootout.alioth.debian.org
-# contributed by Kevin Barnes (Ruby novice)
-
-# PROGRAM: the main body is at the bottom.
-# 1) read about the problem here: http://www-128.ibm.com/developerworks/java/library/j-javaopt/
-# 2) see how I represent a board as a bitmask by reading the blank_board comments
-# 3) read as your mental paths take you
-
-def print *args
-end
-
-# class to represent all information about a particular rotation of a particular piece
-class Rotation
- # an array (by location) containing a bit mask for how the piece maps at the given location.
- # if the rotation is invalid at that location the mask will contain false
- attr_reader :start_masks
-
- # maps a direction to a relative location. these differ depending on whether it is an even or
- # odd row being mapped from
- @@rotation_even_adder = { :west => -1, :east => 1, :nw => -7, :ne => -6, :sw => 5, :se => 6 }
- @@rotation_odd_adder = { :west => -1, :east => 1, :nw => -6, :ne => -5, :sw => 6, :se => 7 }
-
- def initialize( directions )
- @even_offsets, @odd_offsets = normalize_offsets( get_values( directions ))
-
- @even_mask = mask_for_offsets( @even_offsets)
- @odd_mask = mask_for_offsets( @odd_offsets)
-
- @start_masks = Array.new(60)
-
- # create the rotational masks by placing the base mask at the location and seeing if
- # 1) it overlaps the boundries and 2) it produces a prunable board. if either of these
- # is true the piece cannot be placed
- 0.upto(59) do | offset |
- mask = is_even(offset) ? (@even_mask << offset) : (@odd_mask << offset)
- if (blank_board & mask == 0 && !prunable(blank_board | mask, 0, true)) then
- imask = compute_required( mask, offset)
- @start_masks[offset] = [ mask, imask, imask | mask ]
- else
- @start_masks[offset] = false
- end
- end
- end
-
- def compute_required( mask, offset )
- board = blank_board
- 0.upto(offset) { | i | board |= 1 << i }
- board |= mask
- return 0 if (!prunable(board | mask, offset))
- board = flood_fill(board,58)
- count = 0
- imask = 0
- 0.upto(59) do | i |
- if (board[i] == 0) then
- imask |= (1 << i)
- count += 1
- end
- end
- (count > 0 && count < 5) ? imask : 0
- end
-
- def flood_fill( board, location)
- return board if (board[location] == 1)
- board |= 1 << location
- row, col = location.divmod(6)
- board = flood_fill( board, location - 1) if (col > 0)
- board = flood_fill( board, location + 1) if (col < 4)
- if (row % 2 == 0) then
- board = flood_fill( board, location - 7) if (col > 0 && row > 0)
- board = flood_fill( board, location - 6) if (row > 0)
- board = flood_fill( board, location + 6) if (row < 9)
- board = flood_fill( board, location + 5) if (col > 0 && row < 9)
- else
- board = flood_fill( board, location - 5) if (col < 4 && row > 0)
- board = flood_fill( board, location - 6) if (row > 0)
- board = flood_fill( board, location + 6) if (row < 9)
- board = flood_fill( board, location + 7) if (col < 4 && row < 9)
- end
- board
- end
-
- # given a location, produces a list of relative locations covered by the piece at this rotation
- def offsets( location)
- if is_even( location) then
- @even_offsets.collect { | value | value + location }
- else
- @odd_offsets.collect { | value | value + location }
- end
- end
-
- # returns a set of offsets relative to the top-left most piece of the rotation (by even or odd rows)
- # this is hard to explain. imagine we have this partial board:
- # 0 0 0 0 0 x [positions 0-5]
- # 0 0 1 1 0 x [positions 6-11]
- # 0 0 1 0 0 x [positions 12-17]
- # 0 1 0 0 0 x [positions 18-23]
- # 0 1 0 0 0 x [positions 24-29]
- # 0 0 0 0 0 x [positions 30-35]
- # ...
- # The top-left of the piece is at position 8, the
- # board would be passed as a set of positions (values array) containing [8,9,14,19,25] not necessarily in that
- # sorted order. Since that array starts on an odd row, the offsets for an odd row are: [0,1,6,11,17] obtained
- # by subtracting 8 from everything. Now imagine the piece shifted up and to the right so it's on an even row:
- # 0 0 0 1 1 x [positions 0-5]
- # 0 0 1 0 0 x [positions 6-11]
- # 0 0 1 0 0 x [positions 12-17]
- # 0 1 0 0 0 x [positions 18-23]
- # 0 0 0 0 0 x [positions 24-29]
- # 0 0 0 0 0 x [positions 30-35]
- # ...
- # Now the positions are [3,4,8,14,19] which after subtracting the lowest value (3) gives [0,1,5,11,16] thus, the
- # offsets for this particular piece are (in even, odd order) [0,1,5,11,16],[0,1,6,11,17] which is what
- # this function would return
- def normalize_offsets( values)
- min = values.min
- even_min = is_even(min)
- other_min = even_min ? min + 6 : min + 7
- other_values = values.collect do | value |
- if is_even(value) then
- value + 6 - other_min
- else
- value + 7 - other_min
- end
- end
- values.collect! { | value | value - min }
-
- if even_min then
- [values, other_values]
- else
- [other_values, values]
- end
- end
-
- # produce a bitmask representation of an array of offset locations
- def mask_for_offsets( offsets )
- mask = 0
- offsets.each { | value | mask = mask + ( 1 << value ) }
- mask
- end
-
- # finds a "safe" position that a position as described by a list of directions can be placed
- # without falling off any edge of the board. the values returned a location to place the first piece
- # at so it will fit after making the described moves
- def start_adjust( directions )
- south = east = 0;
- directions.each do | direction |
- east += 1 if ( direction == :sw || direction == :nw || direction == :west )
- south += 1 if ( direction == :nw || direction == :ne )
- end
- south * 6 + east
- end
-
- # given a set of directions places the piece (as defined by a set of directions) on the board at
- # a location that will not take it off the edge
- def get_values ( directions )
- start = start_adjust(directions)
- values = [ start ]
- directions.each do | direction |
- if (start % 12 >= 6) then
- start += @@rotation_odd_adder[direction]
- else
- start += @@rotation_even_adder[direction]
- end
- values += [ start ]
- end
-
- # some moves take you back to an existing location, we'll strip duplicates
- values.uniq
- end
-end
-
-# describes a piece and caches information about its rotations to as to be efficient for iteration
-# ATTRIBUTES:
-# rotations -- all the rotations of the piece
-# type -- a numeic "name" of the piece
-# masks -- an array by location of all legal rotational masks (a n inner array) for that location
-# placed -- the mask that this piece was last placed at (not a location, but the actual mask used)
-class Piece
- attr_reader :rotations, :type, :masks
- attr_accessor :placed
-
- # transform hashes that change one direction into another when you either flip or rotate a set of directions
- @@flip_converter = { :west => :west, :east => :east, :nw => :sw, :ne => :se, :sw => :nw, :se => :ne }
- @@rotate_converter = { :west => :nw, :east => :se, :nw => :ne, :ne => :east, :sw => :west, :se => :sw }
-
- def initialize( directions, type )
- @type = type
- @rotations = Array.new();
- @map = {}
-
- generate_rotations( directions )
- directions.collect! { | value | @@flip_converter[value] }
- generate_rotations( directions )
-
- # creates the masks AND a map that returns [location, rotation] for any given mask
- # this is used when a board is found and we want to draw it, otherwise the map is unused
- @masks = Array.new();
- 0.upto(59) do | i |
- even = true
- @masks[i] = @rotations.collect do | rotation |
- mask = rotation.start_masks[i]
- @map[mask[0]] = [ i, rotation ] if (mask)
- mask || nil
- end
- @masks[i].compact!
- end
- end
-
- # rotates a set of directions through all six angles and adds a Rotation to the list for each one
- def generate_rotations( directions )
- 6.times do
- rotations.push( Rotation.new(directions))
- directions.collect! { | value | @@rotate_converter[value] }
- end
- end
-
- # given a board string, adds this piece to the board at whatever location/rotation
- # important: the outbound board string is 5 wide, the normal location notation is six wide (padded)
- def fill_string( board_string)
- location, rotation = @map[@placed]
- rotation.offsets(location).each do | offset |
- row, col = offset.divmod(6)
- board_string[ row*5 + col, 1 ] = @type.to_s
- end
- end
-end
-
-# a blank bit board having this form:
-#
-# 0 0 0 0 0 1
-# 0 0 0 0 0 1
-# 0 0 0 0 0 1
-# 0 0 0 0 0 1
-# 0 0 0 0 0 1
-# 0 0 0 0 0 1
-# 0 0 0 0 0 1
-# 0 0 0 0 0 1
-# 0 0 0 0 0 1
-# 0 0 0 0 0 1
-# 1 1 1 1 1 1
-#
-# where left lest significant bit is the top left and the most significant is the lower right
-# the actual board only consists of the 0 places, the 1 places are blockers to keep things from running
-# off the edges or bottom
-def blank_board
- 0b111111100000100000100000100000100000100000100000100000100000100000
-end
-
-def full_board
- 0b111111111111111111111111111111111111111111111111111111111111111111
-end
-
-# determines if a location (bit position) is in an even row
-def is_even( location)
- (location % 12) < 6
-end
-
-# support function that create three utility maps:
-# $converter -- for each row an array that maps a five bit row (via array mapping)
-# to the a a five bit representation of the bits below it
-# $bit_count -- maps a five bit row (via array mapping) to the number of 1s in the row
-# @@new_regions -- maps a five bit row (via array mapping) to an array of "region" arrays
-# a region array has three values the first is a mask of bits in the region,
-# the second is the count of those bits and the third is identical to the first
-# examples:
-# 0b10010 => [ 0b01100, 2, 0b01100 ], [ 0b00001, 1, 0b00001]
-# 0b01010 => [ 0b10000, 1, 0b10000 ], [ 0b00100, 1, 0b00100 ], [ 0b00001, 1, 0b00001]
-# 0b10001 => [ 0b01110, 3, 0b01110 ]
-def create_collector_support
- odd_map = [0b11, 0b110, 0b1100, 0b11000, 0b10000]
- even_map = [0b1, 0b11, 0b110, 0b1100, 0b11000]
-
- all_odds = Array.new(0b100000)
- all_evens = Array.new(0b100000)
- bit_counts = Array.new(0b100000)
- new_regions = Array.new(0b100000)
- 0.upto(0b11111) do | i |
- bit_count = odd = even = 0
- 0.upto(4) do | bit |
- if (i[bit] == 1) then
- bit_count += 1
- odd |= odd_map[bit]
- even |= even_map[bit]
- end
- end
- all_odds[i] = odd
- all_evens[i] = even
- bit_counts[i] = bit_count
- new_regions[i] = create_regions( i)
- end
-
- $converter = []
- 10.times { | row | $converter.push((row % 2 == 0) ? all_evens : all_odds) }
- $bit_counts = bit_counts
- $regions = new_regions.collect { | set | set.collect { | value | [ value, bit_counts[value], value] } }
-end
-
-# determines if a board is punable, meaning that there is no possibility that it
-# can be filled up with pieces. A board is prunable if there is a grouping of unfilled spaces
-# that are not a multiple of five. The following board is an example of a prunable board:
-# 0 0 1 0 0
-# 0 1 0 0 0
-# 1 1 0 0 0
-# 0 1 0 0 0
-# 0 0 0 0 0
-# ...
-#
-# This board is prunable because the top left corner is only 3 bits in area, no piece will ever fit it
-# parameters:
-# board -- an initial bit board (6 bit padded rows, see blank_board for format)
-# location -- starting location, everything above and to the left is already full
-# slotting -- set to true only when testing initial pieces, when filling normally
-# additional assumptions are possible
-#
-# Algorithm:
-# The algorithm starts at the top row (as determined by location) and iterates a row at a time
-# maintainng counts of active open areas (kept in the collector array) each collector contains
-# three values at the start of an iteration:
-# 0: mask of bits that would be adjacent to the collector in this row
-# 1: the number of bits collected so far
-# 2: a scratch space starting as zero, but used during the computation to represent
-# the empty bits in the new row that are adjacent (position 0)
-# The exact procedure is described in-code
-def prunable( board, location, slotting = false)
- collectors = []
- # loop accross the rows
- (location / 6).to_i.upto(9) do | row_on |
- # obtain a set of regions representing the bits of the curent row.
- regions = $regions[(board >> (row_on * 6)) & 0b11111]
- converter = $converter[row_on]
-
- # track the number of collectors at the start of the cycle so that
- # we don't compute against newly created collectors, only existing collectors
- initial_collector_count = collectors.length
-
- # loop against the regions. For each region of the row
- # we will see if it connects to one or more existing collectors.
- # if it connects to 1 collector, the bits from the region are added to the
- # bits of the collector and the mask is placed in collector[2]
- # If the region overlaps more than one collector then all the collectors
- # it overlaps with are merged into the first one (the others are set to nil in the array)
- # if NO collectors are found then the region is copied as a new collector
- regions.each do | region |
- collector_found = nil
- region_mask = region[2]
- initial_collector_count.times do | collector_num |
- collector = collectors[collector_num]
- if (collector) then
- collector_mask = collector[0]
- if (collector_mask & region_mask != 0) then
- if (collector_found) then
- collector_found[0] |= collector_mask
- collector_found[1] += collector[1]
- collector_found[2] |= collector[2]
- collectors[collector_num] = nil
- else
- collector_found = collector
- collector[1] += region[1]
- collector[2] |= region_mask
- end
- end
- end
- end
- if (collector_found == nil) then
- collectors.push(Array.new(region))
- end
- end
-
- # check the existing collectors, if any collector overlapped no bits in the region its [2] value will
- # be zero. The size of any such reaason is tested if it is not a muliple of five true is returned since
- # the board is prunable. if it is a multiple of five it is removed.
- # Collector that are still active have a new adjacent value [0] set based n the matched bits
- # and have [2] cleared out for the next cycle.
- collectors.length.times do | collector_num |
- collector = collectors[collector_num]
- if (collector) then
- if (collector[2] == 0) then
- return true if (collector[1] % 5 != 0)
- collectors[collector_num] = nil
- else
- # if a collector matches all bits in the row then we can return unprunable early for the
- # follwing reasons:
- # 1) there can be no more unavailable bits bince we fill from the top left downward
- # 2) all previous regions have been closed or joined so only this region can fail
- # 3) this region must be good since there can never be only 1 region that is nuot
- # a multiple of five
- # this rule only applies when filling normally, so we ignore the rule if we are "slotting"
- # in pieces to see what configurations work for them (the only other time this algorithm is used).
- return false if (collector[2] == 0b11111 && !slotting)
- collector[0] = converter[collector[2]]
- collector[2] = 0
- end
- end
- end
-
- # get rid of all the empty converters for the next round
- collectors.compact!
- end
- return false if (collectors.length <= 1) # 1 collector or less and the region is fine
- collectors.any? { | collector | (collector[1] % 5) != 0 } # more than 1 and we test them all for bad size
-end
-
-# creates a region given a row mask. see prunable for what a "region" is
-def create_regions( value )
- regions = []
- cur_region = 0
- 5.times do | bit |
- if (value[bit] == 0) then
- cur_region |= 1 << bit
- else
- if (cur_region != 0 ) then
- regions.push( cur_region)
- cur_region = 0;
- end
- end
- end
- regions.push(cur_region) if (cur_region != 0)
- regions
-end
-
-# find up to the counted number of solutions (or all solutions) and prints the final result
-def find_all
- find_top( 1)
- find_top( 0)
- print_results
-end
-
-# show the board
-def print_results
- print "#{@boards_found} solutions found\n\n"
- print_full_board( @min_board)
- print "\n"
- print_full_board( @max_board)
- print "\n"
-end
-
-# finds solutions. This special version of the main function is only used for the top level
-# the reason for it is basically to force a particular ordering on how the rotations are tested for
-# the first piece. It is called twice, first looking for placements of the odd rotations and then
-# looking for placements of the even locations.
-#
-# WHY?
-# Since any found solution has an inverse we want to maximize finding solutions that are not already found
-# as an inverse. The inverse will ALWAYS be 3 one of the piece configurations that is exactly 3 rotations away
-# (an odd number). Checking even vs odd then produces a higher probability of finding more pieces earlier
-# in the cycle. We still need to keep checking all the permutations, but our probability of finding one will
-# diminsh over time. Since we are TOLD how many to search for this lets us exit before checking all pieces
-# this bennifit is very great when seeking small numbers of solutions and is 0 when looking for more than the
-# maximum number
-def find_top( rotation_skip)
- board = blank_board
- (@pieces.length-1).times do
- piece = @pieces.shift
- piece.masks[0].each do | mask, imask, cmask |
- if ((rotation_skip += 1) % 2 == 0) then
- piece.placed = mask
- find( 1, 1, board | mask)
- end
- end
- @pieces.push(piece)
- end
- piece = @pieces.shift
- @pieces.push(piece)
-end
-
-# the normail find routine, iterates through the available pieces, checks all rotations at the current location
-# and adds any boards found. depth is acheived via recursion. the overall approach is described
-# here: http://www-128.ibm.com/developerworks/java/library/j-javaopt/
-# parameters:
-# start_location -- where to start looking for place for the next piece at
-# placed -- number of pieces placed
-# board -- current state of the board
-#
-# see in-code comments
-def find( start_location, placed, board)
- # find the next location to place a piece by looking for an empty bit
- while board[start_location] == 1
- start_location += 1
- end
-
- @pieces.length.times do
- piece = @pieces.shift
- piece.masks[start_location].each do | mask, imask, cmask |
- if ( board & cmask == imask) then
- piece.placed = mask
- if (placed == 9) then
- add_board
- else
- find( start_location + 1, placed + 1, board | mask)
- end
- end
- end
- @pieces.push(piece)
- end
-end
-
-# print the board
-def print_full_board( board_string)
- 10.times do | row |
- print " " if (row % 2 == 1)
- 5.times do | col |
- print "#{board_string[row*5 + col,1]} "
- end
- print "\n"
- end
-end
-
-# when a board is found we "draw it" into a string and then flip that string, adding both to
-# the list (hash) of solutions if they are unique.
-def add_board
- board_string = "99999999999999999999999999999999999999999999999999"
- @all_pieces.each { | piece | piece.fill_string( board_string ) }
- save( board_string)
- save( board_string.reverse)
-end
-
-# adds a board string to the list (if new) and updates the current best/worst board
-def save( board_string)
- if (@all_boards[board_string] == nil) then
- @min_board = board_string if (board_string < @min_board)
- @max_board = board_string if (board_string > @max_board)
- @all_boards.store(board_string,true)
- @boards_found += 1
-
- # the exit motif is a time saver. Ideally the function should return, but those tests
- # take noticable time (performance).
- if (@boards_found == @stop_count) then
- print_results
- exit(0)
- end
- end
-end
-
-
-##
-## MAIN BODY :)
-##
-create_collector_support
-@pieces = [
- Piece.new( [ :nw, :ne, :east, :east ], 2),
- Piece.new( [ :ne, :se, :east, :ne ], 7),
- Piece.new( [ :ne, :east, :ne, :nw ], 1),
- Piece.new( [ :east, :sw, :sw, :se ], 6),
- Piece.new( [ :east, :ne, :se, :ne ], 5),
- Piece.new( [ :east, :east, :east, :se ], 0),
- Piece.new( [ :ne, :nw, :se, :east, :se ], 4),
- Piece.new( [ :se, :se, :se, :west ], 9),
- Piece.new( [ :se, :se, :east, :se ], 8),
- Piece.new( [ :east, :east, :sw, :se ], 3)
- ];
-
-@all_pieces = Array.new( @pieces)
-
-@min_board = "99999999999999999999999999999999999999999999999999"
-@max_board = "00000000000000000000000000000000000000000000000000"
-@stop_count = ARGV[0].to_i || 2089
-@all_boards = {}
-@boards_found = 0
-
-find_all ######## DO IT!!!
-
diff --git a/benchmark/bm_so_nbody.rb b/benchmark/bm_so_nbody.rb
deleted file mode 100644
index d6c5bb9e61..0000000000
--- a/benchmark/bm_so_nbody.rb
+++ /dev/null
@@ -1,148 +0,0 @@
-# The Computer Language Shootout
-# http://shootout.alioth.debian.org
-#
-# Optimized for Ruby by Jesse Millikan
-# From version ported by Michael Neumann from the C gcc version,
-# which was written by Christoph Bauer.
-
-SOLAR_MASS = 4 * Math::PI**2
-DAYS_PER_YEAR = 365.24
-
-def _puts *args
-end
-
-class Planet
- attr_accessor :x, :y, :z, :vx, :vy, :vz, :mass
-
- def initialize(x, y, z, vx, vy, vz, mass)
- @x, @y, @z = x, y, z
- @vx, @vy, @vz = vx * DAYS_PER_YEAR, vy * DAYS_PER_YEAR, vz * DAYS_PER_YEAR
- @mass = mass * SOLAR_MASS
- end
-
- def move_from_i(bodies, nbodies, dt, i)
- while i < nbodies
- b2 = bodies[i]
- dx = @x - b2.x
- dy = @y - b2.y
- dz = @z - b2.z
-
- distance = Math.sqrt(dx * dx + dy * dy + dz * dz)
- mag = dt / (distance * distance * distance)
- b_mass_mag, b2_mass_mag = @mass * mag, b2.mass * mag
-
- @vx -= dx * b2_mass_mag
- @vy -= dy * b2_mass_mag
- @vz -= dz * b2_mass_mag
- b2.vx += dx * b_mass_mag
- b2.vy += dy * b_mass_mag
- b2.vz += dz * b_mass_mag
- i += 1
- end
-
- @x += dt * @vx
- @y += dt * @vy
- @z += dt * @vz
- end
-end
-
-def energy(bodies)
- e = 0.0
- nbodies = bodies.size
-
- for i in 0 ... nbodies
- b = bodies[i]
- e += 0.5 * b.mass * (b.vx * b.vx + b.vy * b.vy + b.vz * b.vz)
- for j in (i + 1) ... nbodies
- b2 = bodies[j]
- dx = b.x - b2.x
- dy = b.y - b2.y
- dz = b.z - b2.z
- distance = Math.sqrt(dx * dx + dy * dy + dz * dz)
- e -= (b.mass * b2.mass) / distance
- end
- end
- e
-end
-
-def offset_momentum(bodies)
- px, py, pz = 0.0, 0.0, 0.0
-
- for b in bodies
- m = b.mass
- px += b.vx * m
- py += b.vy * m
- pz += b.vz * m
- end
-
- b = bodies[0]
- b.vx = - px / SOLAR_MASS
- b.vy = - py / SOLAR_MASS
- b.vz = - pz / SOLAR_MASS
-end
-
-BODIES = [
- # sun
- Planet.new(0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0),
-
- # jupiter
- Planet.new(
- 4.84143144246472090e+00,
- -1.16032004402742839e+00,
- -1.03622044471123109e-01,
- 1.66007664274403694e-03,
- 7.69901118419740425e-03,
- -6.90460016972063023e-05,
- 9.54791938424326609e-04),
-
- # saturn
- Planet.new(
- 8.34336671824457987e+00,
- 4.12479856412430479e+00,
- -4.03523417114321381e-01,
- -2.76742510726862411e-03,
- 4.99852801234917238e-03,
- 2.30417297573763929e-05,
- 2.85885980666130812e-04),
-
- # uranus
- Planet.new(
- 1.28943695621391310e+01,
- -1.51111514016986312e+01,
- -2.23307578892655734e-01,
- 2.96460137564761618e-03,
- 2.37847173959480950e-03,
- -2.96589568540237556e-05,
- 4.36624404335156298e-05),
-
- # neptune
- Planet.new(
- 1.53796971148509165e+01,
- -2.59193146099879641e+01,
- 1.79258772950371181e-01,
- 2.68067772490389322e-03,
- 1.62824170038242295e-03,
- -9.51592254519715870e-05,
- 5.15138902046611451e-05)
-]
-
-init = 200_000 # ARGV[0]
-n = Integer(init)
-
-offset_momentum(BODIES)
-
-puts "%.9f" % energy(BODIES)
-
-nbodies = BODIES.size
-dt = 0.01
-
-n.times do
- i = 0
- while i < nbodies
- b = BODIES[i]
- b.move_from_i(BODIES, nbodies, dt, i + 1)
- i += 1
- end
-end
-
-puts "%.9f" % energy(BODIES)
diff --git a/benchmark/bm_so_nested_loop.rb b/benchmark/bm_so_nested_loop.rb
deleted file mode 100644
index a0513f8c47..0000000000
--- a/benchmark/bm_so_nested_loop.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/ruby
-# -*- mode: ruby -*-
-# $Id: nestedloop-ruby.code,v 1.4 2004/11/13 07:42:22 bfulgham Exp $
-# http://www.bagley.org/~doug/shootout/
-# from Avi Bryant
-
-n = 16 # Integer(ARGV.shift || 1)
-x = 0
-n.times do
- n.times do
- n.times do
- n.times do
- n.times do
- n.times do
- x += 1
- end
- end
- end
- end
- end
-end
-# puts x
-
-
diff --git a/benchmark/bm_so_nsieve.rb b/benchmark/bm_so_nsieve.rb
deleted file mode 100644
index a65cc78233..0000000000
--- a/benchmark/bm_so_nsieve.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-# The Computer Language Shootout
-# http://shootout.alioth.debian.org/
-#
-# contributed by Glenn Parker, March 2005
-# modified by Evan Phoenix, Sept 2006
-
-def sieve(m)
- flags = Flags.dup[0,m]
- count = 0
- pmax = m - 1
- p = 2
- while p <= pmax
- unless flags[p].zero?
- count += 1
- mult = p
- while mult <= pmax
- flags[mult] = 0
- mult += p
- end
- end
- p += 1
- end
- count
-end
-
-n = 9 # (ARGV[0] || 2).to_i
-Flags = ("\x1" * ( 2 ** n * 10_000)).unpack("c*")
-
-n.downto(n-2) do |exponent|
- break if exponent < 0
- m = (1 << exponent) * 10_000
- # m = (2 ** exponent) * 10_000
- count = sieve(m)
- printf "Primes up to %8d %8d\n", m, count
-end
diff --git a/benchmark/bm_so_nsieve_bits.rb b/benchmark/bm_so_nsieve_bits.rb
deleted file mode 100644
index 019b8b6382..0000000000
--- a/benchmark/bm_so_nsieve_bits.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/usr/bin/ruby
-#
-# The Great Computer Language Shootout
-# http://shootout.alioth.debian.org/
-#
-# nsieve-bits in Ruby
-# Contributed by Glenn Parker, March 2005
-
-CharExponent = 3
-BitsPerChar = 1 << CharExponent
-LowMask = BitsPerChar - 1
-
-def sieve(m)
- items = "\xFF" * ((m / BitsPerChar) + 1)
- masks = ""
- BitsPerChar.times do |b|
- masks << (1 << b).chr
- end
-
- count = 0
- pmax = m - 1
- 2.step(pmax, 1) do |p|
- if items[p >> CharExponent][p & LowMask] == 1
- count += 1
- p.step(pmax, p) do |mult|
- a = mult >> CharExponent
- b = mult & LowMask
- items[a] -= masks[b] if items[a][b] != 0
- end
- end
- end
- count
-end
-
-n = 9 # (ARGV[0] || 2).to_i
-n.step(n - 2, -1) do |exponent|
- break if exponent < 0
- m = 2 ** exponent * 10_000
- count = sieve(m)
- printf "Primes up to %8d %8d\n", m, count
-end
-
diff --git a/benchmark/bm_so_object.rb b/benchmark/bm_so_object.rb
deleted file mode 100644
index e8607c7199..0000000000
--- a/benchmark/bm_so_object.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/usr/bin/ruby
-# -*- mode: ruby -*-
-# $Id: objinst-ruby.code,v 1.4 2004/11/13 07:42:25 bfulgham Exp $
-# http://www.bagley.org/~doug/shootout/
-# with help from Aristarkh Zagorodnikov
-
-class Toggle
- def initialize(start_state)
- @bool = start_state
- end
-
- def value
- @bool
- end
-
- def activate
- @bool = !@bool
- self
- end
-end
-
-class NthToggle < Toggle
- def initialize(start_state, max_counter)
- super start_state
- @count_max = max_counter
- @counter = 0
- end
-
- def activate
- @counter += 1
- if @counter >= @count_max
- @bool = !@bool
- @counter = 0
- end
- self
- end
-end
-
-n = 1500000 # (ARGV.shift || 1).to_i
-
-toggle = Toggle.new 1
-5.times do
- toggle.activate.value ? 'true' : 'false'
-end
-n.times do
- toggle = Toggle.new 1
-end
-
-ntoggle = NthToggle.new 1, 3
-8.times do
- ntoggle.activate.value ? 'true' : 'false'
-end
-n.times do
- ntoggle = NthToggle.new 1, 3
-end
-
diff --git a/benchmark/bm_so_partial_sums.rb b/benchmark/bm_so_partial_sums.rb
deleted file mode 100644
index 630b45cb8d..0000000000
--- a/benchmark/bm_so_partial_sums.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-n = 2_500_000 # (ARGV.shift || 1).to_i
-
-alt = 1.0 ; s0 = s1 = s2 = s3 = s4 = s5 = s6 = s7 = s8 = 0.0
-
-1.upto(n) do |d|
- d = d.to_f ; d2 = d * d ; d3 = d2 * d ; ds = Math.sin(d) ; dc = Math.cos(d)
-
- s0 += (2.0 / 3.0) ** (d - 1.0)
- s1 += 1.0 / Math.sqrt(d)
- s2 += 1.0 / (d * (d + 1.0))
- s3 += 1.0 / (d3 * ds * ds)
- s4 += 1.0 / (d3 * dc * dc)
- s5 += 1.0 / d
- s6 += 1.0 / d2
- s7 += alt / d
- s8 += alt / (2.0 * d - 1.0)
-
- alt = -alt
-end
-
-if false
- printf("%.9f\t(2/3)^k\n", s0)
- printf("%.9f\tk^-0.5\n", s1)
- printf("%.9f\t1/k(k+1)\n", s2)
- printf("%.9f\tFlint Hills\n", s3)
- printf("%.9f\tCookson Hills\n", s4)
- printf("%.9f\tHarmonic\n", s5)
- printf("%.9f\tRiemann Zeta\n", s6)
- printf("%.9f\tAlternating Harmonic\n", s7)
- printf("%.9f\tGregory\n", s8)
-end
diff --git a/benchmark/bm_so_pidigits.rb b/benchmark/bm_so_pidigits.rb
deleted file mode 100644
index c7d6fbfb4d..0000000000
--- a/benchmark/bm_so_pidigits.rb
+++ /dev/null
@@ -1,92 +0,0 @@
-# The Great Computer Language Shootout
-# http://shootout.alioth.debian.org/
-#
-# contributed by Gabriele Renzi
-
-class PiDigitSpigot
-
- def initialize()
- @z = Transformation.new 1,0,0,1
- @x = Transformation.new 0,0,0,0
- @inverse = Transformation.new 0,0,0,0
- end
-
- def next!
- @y = @z.extract(3)
- if safe? @y
- @z = produce(@y)
- @y
- else
- @z = consume @x.next!()
- next!()
- end
- end
-
- def safe?(digit)
- digit == @z.extract(4)
- end
-
- def produce(i)
- @inverse.qrst(10,-10*i,0,1).compose(@z)
- end
-
- def consume(a)
- @z.compose(a)
- end
-end
-
-
-class Transformation
- attr_reader :q, :r, :s, :t
- def initialize (q, r, s, t)
- @q,@r,@s,@t,@k = q,r,s,t,0
- end
-
- def next!()
- @q = @k = @k + 1
- @r = 4 * @k + 2
- @s = 0
- @t = 2 * @k + 1
- self
- end
-
- def extract(j)
- (@q * j + @r) / (@s * j + @t)
- end
-
- def compose(a)
- self.class.new( @q * a.q,
- @q * a.r + r * a.t,
- @s * a.q + t * a.s,
- @s * a.r + t * a.t
- )
- end
-
- def qrst *args
- initialize *args
- self
- end
-
-
-end
-
-
-WIDTH = 10
-n = 2_500 # Integer(ARGV[0])
-j = 0
-
-digits = PiDigitSpigot.new
-
-while n > 0
- if n >= WIDTH
- WIDTH.times {print digits.next!}
- j += WIDTH
- else
- n.times {print digits.next!}
- (WIDTH-n).times {print " "}
- j += n
- end
- puts "\t:"+j.to_s
- n -= WIDTH
-end
-
diff --git a/benchmark/bm_so_random.rb b/benchmark/bm_so_random.rb
deleted file mode 100644
index 83c0d6d380..0000000000
--- a/benchmark/bm_so_random.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-# from http://www.bagley.org/~doug/shootout/bench/random/random.ruby
-
-IM = 139968.0
-IA = 3877.0
-IC = 29573.0
-
-$last = 42.0
-
-def gen_random(max)
- (max * ($last = ($last * IA + IC) % IM)) / IM
-end
-
-N = 1000000
-
-i=0
-while i<N
- i+=1
- gen_random(100.0)
-end
-# "%.9f" % gen_random(100.0)
diff --git a/benchmark/bm_so_reverse_complement.rb b/benchmark/bm_so_reverse_complement.rb
deleted file mode 100644
index 82ea666994..0000000000
--- a/benchmark/bm_so_reverse_complement.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/ruby
-# The Great Computer Language Shootout
-# http://shootout.alioth.debian.org/
-#
-# Contributed by Peter Bjarke Olsen
-# Modified by Doug King
-
-seq=Array.new
-
-def revcomp(seq)
- seq.reverse!.tr!('wsatugcyrkmbdhvnATUGCYRKMBDHVN','WSTAACGRYMKVHDBNTAACGRYMKVHDBN')
- stringlen=seq.length
- 0.step(stringlen-1,60) {|x| print seq.slice(x,60) , "\n"}
-end
-
-input = open(File.join(File.dirname($0), 'fasta.output.2500000'), 'rb')
-
-while input.gets
- if $_ =~ />/
- if seq.length != 0
- revcomp(seq.join)
- seq=Array.new
- end
- puts $_
- else
- $_.sub(/\n/,'')
- seq.push $_
- end
-end
-revcomp(seq.join)
diff --git a/benchmark/bm_so_sieve.rb b/benchmark/bm_so_sieve.rb
deleted file mode 100644
index dbe2bfa63d..0000000000
--- a/benchmark/bm_so_sieve.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-# from http://www.bagley.org/~doug/shootout/bench/sieve/sieve.ruby
-num = 40
-count = i = j = 0
-flags0 = Array.new(8192,1)
-k = 0
-while k < num
- k+=1
- count = 0
- flags = flags0.dup
- i = 2
- while i<8192
- i+=1
- if flags[i]
- # remove all multiples of prime: i
- j = i*i
- while j < 8192
- j += i
- flags[j] = nil
- end
- count += 1
- end
- end
-end
-count
diff --git a/benchmark/bm_so_spectralnorm.rb b/benchmark/bm_so_spectralnorm.rb
deleted file mode 100644
index 6b97206689..0000000000
--- a/benchmark/bm_so_spectralnorm.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-# The Computer Language Shootout
-# http://shootout.alioth.debian.org/
-# Contributed by Sokolov Yura
-
-def eval_A(i,j)
- return 1.0/((i+j)*(i+j+1)/2+i+1)
-end
-
-def eval_A_times_u(u)
- v, i = nil, nil
- (0..u.length-1).collect { |i|
- v = 0
- for j in 0..u.length-1
- v += eval_A(i,j)*u[j]
- end
- v
- }
-end
-
-def eval_At_times_u(u)
- v, i = nil, nil
- (0..u.length-1).collect{|i|
- v = 0
- for j in 0..u.length-1
- v += eval_A(j,i)*u[j]
- end
- v
- }
-end
-
-def eval_AtA_times_u(u)
- return eval_At_times_u(eval_A_times_u(u))
-end
-
-n = 500 # ARGV[0].to_i
-
-u=[1]*n
-for i in 1..10
- v=eval_AtA_times_u(u)
- u=eval_AtA_times_u(v)
-end
-vBv=0
-vv=0
-for i in 0..n-1
- vBv += u[i]*v[i]
- vv += v[i]*v[i]
-end
-
-str = "%0.9f" % (Math.sqrt(vBv/vv)), "\n"
-# print str
diff --git a/benchmark/bm_vm1_block.rb b/benchmark/bm_vm1_block.rb
deleted file mode 100644
index 2dc4e72be5..0000000000
--- a/benchmark/bm_vm1_block.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-def m
- yield
-end
-
-i=0
-while i<30000000 # while loop 1
- i+=1
- m{
- }
-end \ No newline at end of file
diff --git a/benchmark/bm_vm1_const.rb b/benchmark/bm_vm1_const.rb
deleted file mode 100644
index 3e395d9478..0000000000
--- a/benchmark/bm_vm1_const.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-Const = 1
-
-i = 0
-while i<30000000 # while loop 1
- i+= 1
- j = Const
- k = Const
-end
diff --git a/benchmark/bm_vm1_ensure.rb b/benchmark/bm_vm1_ensure.rb
deleted file mode 100644
index c3b71ead5a..0000000000
--- a/benchmark/bm_vm1_ensure.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-i=0
-while i<30000000 # benchmark loop 1
- i+=1
- begin
- begin
- ensure
- end
- ensure
- end
-end
-
diff --git a/benchmark/bm_vm1_ivar.rb b/benchmark/bm_vm1_ivar.rb
deleted file mode 100644
index 4de833a316..0000000000
--- a/benchmark/bm_vm1_ivar.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-@a = 1
-
-i = 0
-while i<30000000 # while loop 1
- i+= 1
- j = @a
- k = @a
-end
diff --git a/benchmark/bm_vm1_ivar_set.rb b/benchmark/bm_vm1_ivar_set.rb
deleted file mode 100644
index c8076c6ab6..0000000000
--- a/benchmark/bm_vm1_ivar_set.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-i = 0
-while i<30_000_000 # while loop 1
- i+= 1
- @a = 1
- @b = 2
-end
diff --git a/benchmark/bm_vm1_length.rb b/benchmark/bm_vm1_length.rb
deleted file mode 100644
index 2d7d7f0b52..0000000000
--- a/benchmark/bm_vm1_length.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-a = 'abc'
-b = [1, 2, 3]
-i=0
-while i<30000000 # while loop 1
- i+=1
- a.length
- b.length
-end
-
diff --git a/benchmark/bm_vm1_neq.rb b/benchmark/bm_vm1_neq.rb
deleted file mode 100644
index 212f056c6e..0000000000
--- a/benchmark/bm_vm1_neq.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-i = 0
-obj1 = Object.new
-obj2 = Object.new
-
-while i<30000000 # while loop 1
- i+= 1
- obj1 != obj2
-end
diff --git a/benchmark/bm_vm1_not.rb b/benchmark/bm_vm1_not.rb
deleted file mode 100644
index f139fed8be..0000000000
--- a/benchmark/bm_vm1_not.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-i = 0
-obj = Object.new
-
-while i<30000000 # while loop 1
- i+= 1
- !obj
-end
diff --git a/benchmark/bm_vm1_rescue.rb b/benchmark/bm_vm1_rescue.rb
deleted file mode 100644
index 0c98d00e0d..0000000000
--- a/benchmark/bm_vm1_rescue.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-i=0
-while i<30000000 # while loop 1
- i+=1
- begin
- rescue
- end
-end
diff --git a/benchmark/bm_vm1_simplereturn.rb b/benchmark/bm_vm1_simplereturn.rb
deleted file mode 100644
index c843ee3d97..0000000000
--- a/benchmark/bm_vm1_simplereturn.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-def m
- return 1
-end
-i=0
-while i<30000000 # while loop 1
- i+=1
- m
-end
-
diff --git a/benchmark/bm_vm1_swap.rb b/benchmark/bm_vm1_swap.rb
deleted file mode 100644
index a565b6f6dc..0000000000
--- a/benchmark/bm_vm1_swap.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-a = 1
-b = 2
-i=0
-while i<30000000 # while loop 1
- i+=1
- a, b = b, a
-end
-
diff --git a/benchmark/bm_vm2_array.rb b/benchmark/bm_vm2_array.rb
deleted file mode 100644
index e29c11200f..0000000000
--- a/benchmark/bm_vm2_array.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-i=0
-while i<6000000 # benchmark loop 2
- i+=1
- a = [1,2,3,4,5,6,7,8,9,10]
-end
diff --git a/benchmark/bm_vm2_case.rb b/benchmark/bm_vm2_case.rb
deleted file mode 100644
index 1ec34ad692..0000000000
--- a/benchmark/bm_vm2_case.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-i=0
-while i<6000000 # while loop 2
- case :foo
- when :bar
- raise
- when :baz
- raise
- when :boo
- raise
- when :foo
- i+=1
- end
-end
-
diff --git a/benchmark/bm_vm2_eval.rb b/benchmark/bm_vm2_eval.rb
deleted file mode 100644
index 375dccc00e..0000000000
--- a/benchmark/bm_vm2_eval.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-i=0
-while i<6000000 # benchmark loop 2
- i+=1
- eval("1")
-end
-
diff --git a/benchmark/bm_vm2_method.rb b/benchmark/bm_vm2_method.rb
deleted file mode 100644
index cc94b8ab3d..0000000000
--- a/benchmark/bm_vm2_method.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-def m
- nil
-end
-
-i=0
-while i<6000000 # benchmark loop 2
- i+=1
- m; m; m; m; m; m; m; m;
-end
diff --git a/benchmark/bm_vm2_mutex.rb b/benchmark/bm_vm2_mutex.rb
deleted file mode 100644
index 9ec1a0f136..0000000000
--- a/benchmark/bm_vm2_mutex.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'thread'
-
-m = Mutex.new
-
-i=0
-while i<6000000 # benchmark loop 2
- i+=1
- m.synchronize{}
-end
diff --git a/benchmark/bm_vm2_poly_method.rb b/benchmark/bm_vm2_poly_method.rb
deleted file mode 100644
index ac9953ce5f..0000000000
--- a/benchmark/bm_vm2_poly_method.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-class C1
- def m
- 1
- end
-end
-class C2
- def m
- 2
- end
-end
-
-o1 = C1.new
-o2 = C2.new
-
-i=0
-while i<6000000 # benchmark loop 2
- o = (i % 2 == 0) ? o1 : o2
- o.m; o.m; o.m; o.m; o.m; o.m; o.m; o.m
- i+=1
-end
diff --git a/benchmark/bm_vm2_poly_method_ov.rb b/benchmark/bm_vm2_poly_method_ov.rb
deleted file mode 100644
index 856ba9b161..0000000000
--- a/benchmark/bm_vm2_poly_method_ov.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-class C1
- def m
- 1
- end
-end
-class C2
- def m
- 2
- end
-end
-
-o1 = C1.new
-o2 = C2.new
-
-i=0
-while i<6000000 # benchmark loop 2
- o = (i % 2 == 0) ? o1 : o2
-# o.m; o.m; o.m; o.m; o.m; o.m; o.m; o.m
- i+=1
-end
diff --git a/benchmark/bm_vm2_proc.rb b/benchmark/bm_vm2_proc.rb
deleted file mode 100644
index 0bd05b9544..0000000000
--- a/benchmark/bm_vm2_proc.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-def m &b
- b
-end
-
-pr = m{
- a = 1
-}
-
-i=0
-while i<6000000 # benchmark loop 2
- i+=1
- pr.call
-end
-
diff --git a/benchmark/bm_vm2_regexp.rb b/benchmark/bm_vm2_regexp.rb
deleted file mode 100644
index 44f6ed402e..0000000000
--- a/benchmark/bm_vm2_regexp.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-i=0
-str = 'xxxhogexxx'
-while i<6000000 # benchmark loop 2
- /hoge/ =~ str
- i+=1
-end
diff --git a/benchmark/bm_vm2_send.rb b/benchmark/bm_vm2_send.rb
deleted file mode 100644
index c20dbdd26c..0000000000
--- a/benchmark/bm_vm2_send.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-class C
- def m
- end
-end
-
-o = C.new
-
-i=0
-while i<6000000 # benchmark loop 2
- i+=1
- o.__send__ :m
-end
diff --git a/benchmark/bm_vm2_super.rb b/benchmark/bm_vm2_super.rb
deleted file mode 100644
index 70c86b376f..0000000000
--- a/benchmark/bm_vm2_super.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-
-class C
- def m
- 1
- end
-end
-
-class CC < C
- def m
- super()
- end
-end
-
-obj = CC.new
-
-i = 0
-while i<6000000 # benchmark loop 2
- obj.m
- i+=1
-end
diff --git a/benchmark/bm_vm2_unif1.rb b/benchmark/bm_vm2_unif1.rb
deleted file mode 100644
index e12bd2ade0..0000000000
--- a/benchmark/bm_vm2_unif1.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-i = 0
-def m a, b
-end
-
-while i<6000000 # benchmark loop 2
- i+=1
- m 100, 200
-end
diff --git a/benchmark/bm_vm2_zsuper.rb b/benchmark/bm_vm2_zsuper.rb
deleted file mode 100644
index 3a75960403..0000000000
--- a/benchmark/bm_vm2_zsuper.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-i = 0
-
-class C
- def m a
- 1
- end
-end
-
-class CC < C
- def m a
- super
- end
-end
-
-obj = CC.new
-
-while i<6000000 # benchmark loop 2
- obj.m 10
- i+=1
-end
diff --git a/benchmark/bm_vm3_gc.rb b/benchmark/bm_vm3_gc.rb
deleted file mode 100755
index 7db9829d44..0000000000
--- a/benchmark/bm_vm3_gc.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-#! /usr/bin/ruby
-5000.times do
- 100.times do
- {"xxxx"=>"yyyy"}
- end
- GC.start
-end
diff --git a/benchmark/bm_vm3_thread_create_join.rb b/benchmark/bm_vm3_thread_create_join.rb
deleted file mode 100644
index 325a66d587..0000000000
--- a/benchmark/bm_vm3_thread_create_join.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-i=0
-while i<100_000 # benchmark loop 3
- i+=1
- Thread.new{
- }.join
-end
diff --git a/benchmark/bm_vm3_thread_mutex.rb b/benchmark/bm_vm3_thread_mutex.rb
deleted file mode 100644
index 649f1fddac..0000000000
--- a/benchmark/bm_vm3_thread_mutex.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-require 'thread'
-m = Mutex.new
-r = 0
-max = 1000
-(1..max).map{
- Thread.new{
- i=0
- while i<max
- i+=1
- m.synchronize{
- r += 1
- }
- end
- }
-}.each{|e|
- e.join
-}
-raise r.to_s if r != max * max
diff --git a/benchmark/bmx_temp.rb b/benchmark/bmx_temp.rb
deleted file mode 100644
index 0b4b219ca2..0000000000
--- a/benchmark/bmx_temp.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-def m
- nil
-end
-
-i=0
-while i<800000 # benchmark loop 2
- i+=1
- m; m; m; m; m; m; m; m;
-end
diff --git a/benchmark/driver.rb b/benchmark/driver.rb
deleted file mode 100644
index 687dec26f1..0000000000
--- a/benchmark/driver.rb
+++ /dev/null
@@ -1,251 +0,0 @@
-#
-# Ruby Benchmark driver
-#
-
-first = true
-
-begin
- require 'optparse'
-rescue LoadError
- if first
- first = false
- $:.unshift File.join(File.dirname(__FILE__), '../lib')
- retry
- else
- raise
- end
-end
-
-require 'benchmark'
-require 'pp'
-
-class BenchmarkDriver
- def self.benchmark(opt)
- driver = self.new(opt[:execs], opt[:dir], opt)
- begin
- driver.run
- ensure
- driver.show_results
- end
- end
-
- def output *args
- puts(*args)
- @output and @output.puts(*args)
- end
-
- def message *args
- output(*args) if @verbose
- end
-
- def message_print *args
- if @verbose
- print(*args)
- STDOUT.flush
- @output and @output.print(*args)
- end
- end
-
- def progress_message *args
- unless STDOUT.tty?
- STDERR.print(*args)
- STDERR.flush
- end
- end
-
- def initialize execs, dir, opt = {}
- @execs = execs.map{|e|
- e.strip!
- next if e.empty?
-
- if /(.+)::(.+)/ =~ e
- # ex) ruby-a::/path/to/ruby-a
- v = $1.strip
- e = $2
- else
- v = `#{e} -v`.chomp
- v.sub!(/ patchlevel \d+/, '')
- end
- [e, v]
- }.compact
-
- @dir = dir
- @repeat = opt[:repeat] || 1
- @repeat = 1 if @repeat < 1
- @pattern = opt[:pattern] || nil
- @verbose = opt[:quiet] ? false : (opt[:verbose] || false)
- @output = opt[:output] ? open(opt[:output], 'w') : nil
- @loop_wl1 = @loop_wl2 = nil
- @opt = opt
-
- # [[name, [[r-1-1, r-1-2, ...], [r-2-1, r-2-2, ...]]], ...]
- @results = []
-
- if @verbose
- @start_time = Time.now
- message @start_time
- @execs.each_with_index{|(e, v), i|
- message "target #{i}: #{v}"
- }
- end
- end
-
- def show_results
- output
-
- if @verbose
- message '-----------------------------------------------------------'
- message 'raw data:'
- message
- message PP.pp(@results, "", 79)
- message
- message "Elapesed time: #{Time.now - @start_time} (sec)"
- end
-
- output '-----------------------------------------------------------'
- output 'benchmark results:'
-
- if @verbose and @repeat > 1
- output "minimum results in each #{@repeat} measurements."
- end
-
- output "name\t#{@execs.map{|(e, v)| v}.join("\t")}"
- @results.each{|v, result|
- rets = []
- s = nil
- result.each_with_index{|e, i|
- r = e.min
- case v
- when /^vm1_/
- if @loop_wl1
- r -= @loop_wl1[i]
- s = '*'
- end
- when /^vm2_/
- if @loop_wl2
- r -= @loop_wl2[i]
- s = '*'
- end
- end
- rets << sprintf("%.3f", r)
- }
- output "#{v}#{s}\t#{rets.join("\t")}"
- }
- end
-
- def files
- flag = {}
- vm1 = vm2 = wl1 = wl2 = false
- @files = Dir.glob(File.join(@dir, 'bm*.rb')).map{|file|
- next if @pattern && /#{@pattern}/ !~ File.basename(file)
- case file
- when /bm_(vm[12])_/, /bm_loop_(whileloop2?).rb/
- flag[$1] = true
- end
- file
- }.compact
-
- if flag['vm1'] && !flag['whileloop']
- @files << File.join(@dir, 'bm_loop_whileloop.rb')
- elsif flag['vm2'] && !flag['whileloop2']
- @files << File.join(@dir, 'bm_loop_whileloop2.rb')
- end
-
- @files.sort!
- progress_message "total: #{@files.size * @repeat} trial(s) (#{@repeat} trial(s) for #{@files.size} benchmark(s))\n"
- @files
- end
-
- def run
- files.each_with_index{|file, i|
- @i = i
- r = measure_file(file)
-
- if /bm_loop_whileloop.rb/ =~ file
- @loop_wl1 = r[1].map{|e| e.min}
- elsif /bm_loop_whileloop2.rb/ =~ file
- @loop_wl2 = r[1].map{|e| e.min}
- end
- }
- end
-
- def measure_file file
- name = File.basename(file, '.rb').sub(/^bm_/, '')
- prepare_file = File.join(File.dirname(file), "prepare_#{name}.rb")
- load prepare_file if FileTest.exist?(prepare_file)
-
- if @verbose
- output
- output '-----------------------------------------------------------'
- output name
- output
- output File.read(file)
- output
- end
-
- result = [name]
- result << @execs.map{|(e, v)|
- (0...@repeat).map{
- message_print "#{v}\t"
- progress_message '.'
-
- m = measure(e, file)
- message "#{m}"
- m
- }
- }
- @results << result
- result
- end
-
- def measure executable, file
- cmd = "#{executable} #{file}"
- m = Benchmark.measure{
- `#{cmd}`
- }
-
- if $? != 0
- raise "Benchmark process exited with abnormal status (#{$?})"
- end
-
- m.real
- end
-end
-
-if __FILE__ == $0
- opt = {
- :execs => ['ruby'],
- :dir => './',
- :repeat => 1,
- :output => "bmlog-#{Time.now.strftime('%Y%m%d-%H%M%S')}.#{$$}",
- }
-
- parser = OptionParser.new{|o|
- o.on('-e', '--executables [EXECS]',
- "Specify benchmark one or more targets. (exec1; exec2; exec3, ...)"){|e|
- opt[:execs] = e.split(/;/)
- }
- o.on('-d', '--directory [DIRECTORY]', "Benchmark suites directory"){|d|
- opt[:dir] = d
- }
- o.on('-p', '--pattern [PATTERN]', "Benchmark name pattern"){|p|
- opt[:pattern] = p
- }
- o.on('-r', '--repeat-count [NUM]', "Repeat count"){|n|
- opt[:repeat] = n.to_i
- }
- o.on('-o', '--output-file [FILE]', "Output file"){|o|
- opt[:output] = o
- }
- o.on('-q', '--quiet', "Run without notify information except result table."){|q|
- opt[:quiet] = q
- }
- o.on('-v', '--verbose'){|v|
- opt[:verbose] = v
- }
- }
-
- parser.parse!(ARGV)
- BenchmarkDriver.benchmark(opt)
-end
-
diff --git a/benchmark/make_fasta_output.rb b/benchmark/make_fasta_output.rb
deleted file mode 100644
index b6d787ae27..0000000000
--- a/benchmark/make_fasta_output.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-# prepare 'fasta.output'
-
-def prepare_fasta_output n
- filebase = File.join(File.dirname($0), 'fasta.output')
- script = File.join(File.dirname($0), 'bm_so_fasta.rb')
- file = "#{filebase}.#{n}"
-
- unless FileTest.exist?(file)
- STDERR.puts "preparing #{file}"
-
- open(file, 'w'){|f|
- ARGV[0] = n
- $stdout = f
- load script
- $stdout = STDOUT
- }
- end
-end
-
diff --git a/benchmark/other-lang/ack.pl b/benchmark/other-lang/ack.pl
deleted file mode 100644
index 201e22ddfa..0000000000
--- a/benchmark/other-lang/ack.pl
+++ /dev/null
@@ -1,11 +0,0 @@
-use integer;
-
-sub Ack {
- return $_[0] ? ($_[1] ? Ack($_[0]-1, Ack($_[0], $_[1]-1))
- : Ack($_[0]-1, 1))
- : $_[1]+1;
-}
-
-my $NUM = 9;
-$NUM = 1 if ($NUM < 1);
-my $ack = Ack(3, $NUM);
diff --git a/benchmark/other-lang/ack.py b/benchmark/other-lang/ack.py
deleted file mode 100644
index 9968e7cfcf..0000000000
--- a/benchmark/other-lang/ack.py
+++ /dev/null
@@ -1,16 +0,0 @@
-import sys
-sys.setrecursionlimit(5000000)
-
-def Ack(M, N):
- if (not M):
- return( N + 1 )
- if (not N):
- return( Ack(M-1, 1) )
- return( Ack(M-1, Ack(M, N-1)) )
-
-def main():
- NUM = 9
- sys.setrecursionlimit(10000)
- Ack(3, NUM)
-
-main()
diff --git a/benchmark/other-lang/ack.rb b/benchmark/other-lang/ack.rb
deleted file mode 100644
index 7451bed6c4..0000000000
--- a/benchmark/other-lang/ack.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-def ack(m, n)
- if m == 0 then
- n + 1
- elsif n == 0 then
- ack(m - 1, 1)
- else
- ack(m - 1, ack(m, n - 1))
- end
-end
-
-NUM = 9
-ack(3, NUM)
diff --git a/benchmark/other-lang/ack.scm b/benchmark/other-lang/ack.scm
deleted file mode 100644
index a80b73ba55..0000000000
--- a/benchmark/other-lang/ack.scm
+++ /dev/null
@@ -1,7 +0,0 @@
-(define (ack m n)
- (cond ((zero? m) (+ n 1))
- ((zero? n) (ack (- m 1) 1))
- (else (ack (- m 1) (ack m (- n 1))))))
-
-(ack 3 9)
-
diff --git a/benchmark/other-lang/eval.rb b/benchmark/other-lang/eval.rb
deleted file mode 100644
index 3875927389..0000000000
--- a/benchmark/other-lang/eval.rb
+++ /dev/null
@@ -1,66 +0,0 @@
-
-Bench = %w(
- loop
- ack
- fib
- tak
- fact
-)
-
-Lang = <<EOP.map{|l| l.strip}
- ruby-cyg
- ../../../test6/miniruby
- perl
- python
- gosh
-EOP
-
-Bench.replace ['loop2']
-Lang.replace ['ruby-cyg']
-
-Ext = %w(
- .rb
- .rb
- .pl
- .py
- .scm
-)
-
-p Bench
-p Lang
-
-require 'benchmark'
-
-def bench cmd
- m = Benchmark.measure{
- #p cmd
- system(cmd)
- }
- [m.utime, m.real]
-end
-
-Result = []
-Bench.each{|b|
- r = []
- Lang.each_with_index{|l, idx|
- cmd = "#{l} #{b}#{Ext[idx]}"
- r << bench(cmd)
- }
- Result << r
-}
-
-require 'pp'
-# utime
-puts Lang.join("\t")
-Bench.each_with_index{|b, bi|
- print b, "\t"
- puts Result[bi].map{|e| e[0]}.join("\t")
-}
-
-# rtime
-puts Lang.join("\t")
-Bench.each_with_index{|b, bi|
- print b, "\t"
- puts Result[bi].map{|e| e[1]}.join("\t")
-}
-
diff --git a/benchmark/other-lang/fact.pl b/benchmark/other-lang/fact.pl
deleted file mode 100644
index a9b0b69cdf..0000000000
--- a/benchmark/other-lang/fact.pl
+++ /dev/null
@@ -1,13 +0,0 @@
-sub fact{
- my $n = @_[0];
- if($n < 2){
- return 1;
- }
- else{
- return $n * fact($n-1);
- }
-}
-
-for($i=0; $i<10000; $i++){
- &fact(100);
-}
diff --git a/benchmark/other-lang/fact.py b/benchmark/other-lang/fact.py
deleted file mode 100644
index 01593965d9..0000000000
--- a/benchmark/other-lang/fact.py
+++ /dev/null
@@ -1,18 +0,0 @@
-#import sys
-#sys.setrecursionlimit(1000)
-
-def factL(n):
- r = 1
- for x in range(2, n):
- r *= x
- return r
-
-def factR(n):
- if n < 2:
- return 1
- else:
- return n * factR(n-1)
-
-for i in range(10000):
- factR(100)
-
diff --git a/benchmark/other-lang/fact.rb b/benchmark/other-lang/fact.rb
deleted file mode 100644
index 7e97b22b39..0000000000
--- a/benchmark/other-lang/fact.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-def fact(n)
- if n < 2
- 1
- else
- n * fact(n-1)
- end
-end
-
-i=0
-while i<10000
- i+=1
- fact(100)
-end
diff --git a/benchmark/other-lang/fact.scm b/benchmark/other-lang/fact.scm
deleted file mode 100644
index c98a7fedd3..0000000000
--- a/benchmark/other-lang/fact.scm
+++ /dev/null
@@ -1,8 +0,0 @@
-(define (fact n)
- (if (< n 2)
- 1
- (* n (fact (- n 1)))))
-
-(dotimes (i 10000)
- (fact 100))
-
diff --git a/benchmark/other-lang/fib.pl b/benchmark/other-lang/fib.pl
deleted file mode 100644
index a46f666d1e..0000000000
--- a/benchmark/other-lang/fib.pl
+++ /dev/null
@@ -1,11 +0,0 @@
-sub fib{
- my $n = $_[0];
- if($n < 3){
- return 1;
- }
- else{
- return fib($n-1) + fib($n-2);
- }
-};
-
-&fib(34);
diff --git a/benchmark/other-lang/fib.py b/benchmark/other-lang/fib.py
deleted file mode 100644
index 45f2bceb8d..0000000000
--- a/benchmark/other-lang/fib.py
+++ /dev/null
@@ -1,7 +0,0 @@
-def fib(n):
- if n < 3:
- return 1
- else:
- return fib(n-1) + fib(n-2)
-
-fib(34)
diff --git a/benchmark/other-lang/fib.rb b/benchmark/other-lang/fib.rb
deleted file mode 100644
index ec587eabe0..0000000000
--- a/benchmark/other-lang/fib.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-def fib n
- if n < 3
- 1
- else
- fib(n-1) + fib(n-2)
- end
-end
-
-fib(34)
diff --git a/benchmark/other-lang/fib.scm b/benchmark/other-lang/fib.scm
deleted file mode 100644
index 2fc4e225bd..0000000000
--- a/benchmark/other-lang/fib.scm
+++ /dev/null
@@ -1,7 +0,0 @@
-(define (fib n)
- (if (< n 3)
- 1
- (+ (fib (- n 1)) (fib (- n 2)))))
-
-(fib 34)
-
diff --git a/benchmark/other-lang/loop.pl b/benchmark/other-lang/loop.pl
deleted file mode 100644
index 2777490aaa..0000000000
--- a/benchmark/other-lang/loop.pl
+++ /dev/null
@@ -1,3 +0,0 @@
-for($i=0; $i<30000000; $i++){
-}
-
diff --git a/benchmark/other-lang/loop.py b/benchmark/other-lang/loop.py
deleted file mode 100644
index 003749bf3a..0000000000
--- a/benchmark/other-lang/loop.py
+++ /dev/null
@@ -1,2 +0,0 @@
-for i in xrange(30000000):
- pass
diff --git a/benchmark/other-lang/loop.rb b/benchmark/other-lang/loop.rb
deleted file mode 100644
index d43cef61f3..0000000000
--- a/benchmark/other-lang/loop.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-i=0
-while i<30000000
- i+=1
-end
diff --git a/benchmark/other-lang/loop.scm b/benchmark/other-lang/loop.scm
deleted file mode 100644
index 3364f7e679..0000000000
--- a/benchmark/other-lang/loop.scm
+++ /dev/null
@@ -1 +0,0 @@
-(dotimes (x 30000000))
diff --git a/benchmark/other-lang/loop2.rb b/benchmark/other-lang/loop2.rb
deleted file mode 100644
index df8fffc1ff..0000000000
--- a/benchmark/other-lang/loop2.rb
+++ /dev/null
@@ -1 +0,0 @@
-30000000.times{}
diff --git a/benchmark/other-lang/tak.pl b/benchmark/other-lang/tak.pl
deleted file mode 100644
index 7e748a67c6..0000000000
--- a/benchmark/other-lang/tak.pl
+++ /dev/null
@@ -1,11 +0,0 @@
-sub tak {
- local($x, $y, $z) = @_;
- if (!($y < $x)) {
- return $z;
- } else {
- return &tak(&tak($x - 1, $y, $z),
- &tak($y - 1, $z, $x),
- &tak($z - 1, $x, $y));
- }
-}
-&tak(18, 9, 0);
diff --git a/benchmark/other-lang/tak.py b/benchmark/other-lang/tak.py
deleted file mode 100644
index 04f3f6829c..0000000000
--- a/benchmark/other-lang/tak.py
+++ /dev/null
@@ -1,8 +0,0 @@
-def tak(x, y, z):
- if not(y<x):
- return z
- else:
- return tak(tak(x-1, y, z),
- tak(y-1, z, x),
- tak(z-1, x, y))
-tak(18, 9, 0)
diff --git a/benchmark/other-lang/tak.rb b/benchmark/other-lang/tak.rb
deleted file mode 100644
index efe5380f4e..0000000000
--- a/benchmark/other-lang/tak.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-
-def tak x, y, z
- unless y < x
- z
- else
- tak( tak(x-1, y, z),
- tak(y-1, z, x),
- tak(z-1, x, y))
- end
-end
-
-tak(18, 9, 0)
-
diff --git a/benchmark/other-lang/tak.scm b/benchmark/other-lang/tak.scm
deleted file mode 100644
index 52a7629ee5..0000000000
--- a/benchmark/other-lang/tak.scm
+++ /dev/null
@@ -1,10 +0,0 @@
-(define (tak x y z)
- (if (not (< y x))
- z
- (tak (tak (- x 1) y z)
- (tak (- y 1) z x)
- (tak (- z 1) x y))))
-
-(tak 18 9 0)
-
-
diff --git a/benchmark/prepare_so_count_words.rb b/benchmark/prepare_so_count_words.rb
deleted file mode 100644
index ee2138cdb2..0000000000
--- a/benchmark/prepare_so_count_words.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# prepare 'wc.input'
-
-def prepare_wc_input
- wcinput = File.join(File.dirname($0), 'wc.input')
- wcbase = File.join(File.dirname($0), 'wc.input.base')
- unless FileTest.exist?(wcinput)
- data = File.read(wcbase)
- 13.times{
- data << data
- }
- open(wcinput, 'w'){|f| f.write data}
- end
-end
-
-prepare_wc_input
diff --git a/benchmark/prepare_so_k_nucleotide.rb b/benchmark/prepare_so_k_nucleotide.rb
deleted file mode 100644
index f28f4460a1..0000000000
--- a/benchmark/prepare_so_k_nucleotide.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-require File.join(File.dirname(__FILE__), 'make_fasta_output')
-prepare_fasta_output(100_000)
diff --git a/benchmark/prepare_so_reverse_complement.rb b/benchmark/prepare_so_reverse_complement.rb
deleted file mode 100644
index 7f089109de..0000000000
--- a/benchmark/prepare_so_reverse_complement.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-require File.join(File.dirname(__FILE__), 'make_fasta_output')
-prepare_fasta_output(2_500_000)
diff --git a/benchmark/report.rb b/benchmark/report.rb
deleted file mode 100644
index e931966cca..0000000000
--- a/benchmark/report.rb
+++ /dev/null
@@ -1,81 +0,0 @@
-#
-# YARV benchmark driver
-#
-
-require 'yarvutil'
-require 'benchmark'
-require 'rbconfig'
-
-def exec_command type, file, w
- <<-EOP
- $DRIVER_PATH = '#{File.dirname($0)}'
- $LOAD_PATH.replace $LOAD_PATH | #{$LOAD_PATH.inspect}
- require 'benchmark'
- require 'yarvutil'
-# print '#{type}'
- begin
- puts Benchmark.measure{
- #{w}('#{file}')
- }.utime
- rescue Exception => exec_command_error_variable
- puts "\t" + exec_command_error_variable.message
- end
- EOP
-end
-
-def benchmark cmd
- rubybin = ENV['RUBY'] || File.join(
- RbConfig::CONFIG["bindir"],
- RbConfig::CONFIG["ruby_install_name"] + RbConfig::CONFIG["EXEEXT"])
-
- IO.popen(rubybin, 'r+'){|io|
- io.write cmd
- io.close_write
- return io.gets
- }
-end
-
-def ruby_exec file
- prog = exec_command 'ruby', file, 'load'
- benchmark prog
-end
-
-def yarv_exec file
- prog = exec_command 'yarv', file, 'YARVUtil.load_bm'
- benchmark prog
-end
-
-$wr = $wy = nil
-
-def measure bench
- file = File.dirname($0) + "/bm_#{bench}.rb"
- r = ruby_exec(file).to_f
- y = yarv_exec(file).to_f
- puts "#{bench}\t#{r}\t#{y}"
-end
-
-def measure2
- r = ruby_exec.to_f
- y = yarv_exec.to_f
- puts r/y
-end
-
-if $0 == __FILE__
- %w{
- whileloop
- whileloop2
- times
- const
- method
- poly_method
- block
- rescue
- rescue2
- }.each{|bench|
- measure bench
- }
-end
-
-
-
-
diff --git a/benchmark/run.rb b/benchmark/run.rb
deleted file mode 100644
index 6ef2943642..0000000000
--- a/benchmark/run.rb
+++ /dev/null
@@ -1,127 +0,0 @@
-#
-# Ruby benchmark driver
-#
-
-require 'benchmark'
-require 'rbconfig'
-
-$matzrubyonly = false
-$rubyonly = false
-
-$results = []
-
-# prepare 'wc.input'
-def prepare_wc_input
- wcinput = File.join(File.dirname($0), 'wc.input')
- wcbase = File.join(File.dirname($0), 'wc.input.base')
- unless FileTest.exist?(wcinput)
- data = File.read(wcbase)
- 13.times{
- data << data
- }
- open(wcinput, 'w'){|f| f.write data}
- end
-end
-
-prepare_wc_input
-
-def bm file
- prog = File.readlines(file).map{|e| e.rstrip}.join("\n")
- return if prog.empty?
-
- /[a-z]+_(.+)\.rb/ =~ file
- bm_name = $1
- puts '-----------------------------------------------------------' unless $rubyonly || $matzrubyonly
- puts "#{bm_name}: "
-
-
-puts <<EOS unless $matzrubyonly || $rubyonly
-#{prog}
---
-EOS
- begin
- result = [bm_name]
- result << matzruby_exec(file) unless $rubyonly
- result << ruby_exec(file) unless $matzrubyonly
- $results << result
-
- rescue Exception => e
- puts
- puts "** benchmark failure: #{e}"
- puts e.backtrace
- end
-end
-
-def benchmark file, bin
- m = Benchmark.measure{
- `#{bin} #{$opts} #{file}`
- }
- sec = '%.3f' % m.real
- puts " #{sec}"
- sec
-end
-
-def ruby_exec file
- print 'ruby'
- benchmark file, $ruby_program
-end
-
-def matzruby_exec file
- print 'matz'
- rubylib = ENV['RUBYLIB']
- ENV['RUBYLIB'] = ''
- r = benchmark file, $matzruby_program
- ENV['RUBYLIB'] = rubylib
- r
-end
-
-if $0 == __FILE__
- ARGV.each{|arg|
- case arg
- when /\A--ruby=(.+)/
- $ruby_program = $1
- when /\A--matzruby=(.+)/
- $matzruby_program = $1
- when /\A--opts=(.+)/
- $opts = $1
- when /\A(-r|--only-ruby)\z/
- $rubyonly = true
- when /\A(-m|--only-matzruby)\z/
- $matzrubyonly = true
- end
- }
- ARGV.delete_if{|arg|
- /\A-/ =~ arg
- }
-
- puts "MatzRuby:"
- system("#{$matzruby_program} -v")
- puts "Ruby:"
- system("#{$ruby_program} -v")
- puts
-
- if ARGV.empty?
- Dir.glob(File.dirname(__FILE__) + '/bm_*.rb').sort.each{|file|
- bm file
- }
- else
- ARGV.each{|file|
- Dir.glob(File.join(File.dirname(__FILE__), file + '*')){|ef|
- # file = "#{File.dirname(__FILE__)}/#{file}.rb"
- bm ef
- }
- }
- end
-
- puts
- puts "-- benchmark summary ---------------------------"
- $results.each{|res|
- print res.shift, "\t"
- (res||[]).each{|result|
- /([\d\.]+)/ =~ result
- print $1 + "\t" if $1
- }
- puts
- }
-end
-
diff --git a/benchmark/runc.rb b/benchmark/runc.rb
deleted file mode 100644
index ec1d36a61b..0000000000
--- a/benchmark/runc.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-#
-#
-
-require 'benchmark'
-require 'rbconfig'
-
-$rubybin = ENV['RUBY'] || File.join(
- RbConfig::CONFIG["bindir"],
- RbConfig::CONFIG["ruby_install_name"] + RbConfig::CONFIG["EXEEXT"])
-
-def runfile file
- puts file
- file = File.join(File.dirname($0), 'contrib', file)
- Benchmark.bm{|x|
- x.report('ruby'){
- system("#{$rubybin} #{file}")
- }
- x.report('yarv'){
- system("#{$rubybin} -rite -I.. #{file}")
- }
- }
-end
-
-ARGV.each{|file|
- runfile file
-}
-
-
diff --git a/benchmark/wc.input.base b/benchmark/wc.input.base
deleted file mode 100644
index 41143fbac0..0000000000
--- a/benchmark/wc.input.base
+++ /dev/null
@@ -1,25 +0,0 @@
-Subject: Re: Who was Izchak Miller?
-From: "Jane D. Anonymous" <nobody@yale.edu>
-Date: 1996/04/28
-Message-Id: <4lv7bc$oh@news.ycc.yale.edu>
-References: <317C405E.5DFA@panix.com> <4lk6vl$gde@ns.oar.net>
-To: 75176.2330@compuserve.com
-Content-Type: text/plain; charset=us-ascii
-Organization: Yale University
-X-Url: news:4lk6vl$gde@ns.oar.net
-Mime-Version: 1.0
-Newsgroups: rec.games.roguelike.nethack
-X-Mailer: Mozilla 1.1N (Macintosh; I; 68K)
-
-Hello there, Izchak Miller was my father. When I was younger I spent
-many a night, hunched over the keyboard with a cup of tea, playing
-nethack with him and my brother. my dad was a philosopher with a strong
-weakness for fantasy/sci fi. I remember when he started to get involved
-with the Nethack team- my brother's Dungeons and Dragons monster book
-found a regular place beside my dad's desk. it's nice to see him living
-on in the game he loved so much :-).
- Tamar Miller
-
-The following is a really long word of 5000 characters:
-
-wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww
diff --git a/bignum.c b/bignum.c
index a2ce0bc3bb..be287032ce 100644
--- a/bignum.c
+++ b/bignum.c
@@ -3,14 +3,14 @@
bignum.c -
$Author$
+ $Date$
created at: Fri Jun 10 00:48:55 JST 1994
- Copyright (C) 1993-2007 Yukihiro Matsumoto
+ Copyright (C) 1993-2003 Yukihiro Matsumoto
**********************************************************************/
-#include "ruby/ruby.h"
-#include "ruby/util.h"
+#include "ruby.h"
#include <math.h>
#include <float.h>
@@ -18,7 +18,6 @@
#ifdef HAVE_IEEEFP_H
#include <ieeefp.h>
#endif
-#include <assert.h>
VALUE rb_cBignum;
@@ -26,124 +25,45 @@ VALUE rb_cBignum;
#define USHORT _USHORT
#endif
-#define BDIGITS(x) (RBIGNUM_DIGITS(x))
+#define BDIGITS(x) ((BDIGIT*)RBIGNUM(x)->digits)
#define BITSPERDIG (SIZEOF_BDIGITS*CHAR_BIT)
#define BIGRAD ((BDIGIT_DBL)1 << BITSPERDIG)
-#define DIGSPERLONG (SIZEOF_LONG/SIZEOF_BDIGITS)
+#define DIGSPERLONG ((unsigned int)(SIZEOF_LONG/SIZEOF_BDIGITS))
#if HAVE_LONG_LONG
-# define DIGSPERLL (SIZEOF_LONG_LONG/SIZEOF_BDIGITS)
+# define DIGSPERLL ((unsigned int)(SIZEOF_LONG_LONG/SIZEOF_BDIGITS))
#endif
#define BIGUP(x) ((BDIGIT_DBL)(x) << BITSPERDIG)
#define BIGDN(x) RSHIFT(x,BITSPERDIG)
#define BIGLO(x) ((BDIGIT)((x) & (BIGRAD-1)))
#define BDIGMAX ((BDIGIT)-1)
-#define BIGZEROP(x) (RBIGNUM_LEN(x) == 0 || \
+#define BIGZEROP(x) (RBIGNUM(x)->len == 0 || \
(BDIGITS(x)[0] == 0 && \
- (RBIGNUM_LEN(x) == 1 || bigzero_p(x))))
+ (RBIGNUM(x)->len == 1 || bigzero_p(x))))
+static int bigzero_p(VALUE);
static int
-bigzero_p(VALUE x)
+bigzero_p(x)
+ VALUE x;
{
long i;
- BDIGIT *ds = BDIGITS(x);
-
- for (i = RBIGNUM_LEN(x) - 1; 0 <= i; i--) {
- if (ds[i]) return 0;
+ for (i = 0; i < RBIGNUM(x)->len; ++i) {
+ if (BDIGITS(x)[i]) return 0;
}
return 1;
}
-int
-rb_bigzero_p(VALUE x)
-{
- return BIGZEROP(x);
-}
-
-int
-rb_cmpint(VALUE val, VALUE a, VALUE b)
-{
- if (NIL_P(val)) {
- rb_cmperr(a, b);
- }
- if (FIXNUM_P(val)) {
- long l = FIX2LONG(val);
- if (l > 0) return 1;
- if (l < 0) return -1;
- return 0;
- }
- if (TYPE(val) == T_BIGNUM) {
- if (BIGZEROP(val)) return 0;
- if (RBIGNUM_SIGN(val)) return 1;
- return -1;
- }
- if (RTEST(rb_funcall(val, '>', 1, INT2FIX(0)))) return 1;
- if (RTEST(rb_funcall(val, '<', 1, INT2FIX(0)))) return -1;
- return 0;
-}
-
-#define RBIGNUM_SET_LEN(b,l) \
- ((RBASIC(b)->flags & RBIGNUM_EMBED_FLAG) ? \
- (void)(RBASIC(b)->flags = \
- (RBASIC(b)->flags & ~RBIGNUM_EMBED_LEN_MASK) | \
- ((l) << RBIGNUM_EMBED_LEN_SHIFT)) : \
- (void)(RBIGNUM(b)->as.heap.len = (l)))
-
-static void
-rb_big_realloc(VALUE big, long len)
-{
- BDIGIT *ds;
- if (RBASIC(big)->flags & RBIGNUM_EMBED_FLAG) {
- if (RBIGNUM_EMBED_LEN_MAX < len) {
- ds = ALLOC_N(BDIGIT, len);
- MEMCPY(ds, RBIGNUM(big)->as.ary, BDIGIT, RBIGNUM_EMBED_LEN_MAX);
- RBIGNUM(big)->as.heap.len = RBIGNUM_LEN(big);
- RBIGNUM(big)->as.heap.digits = ds;
- RBASIC(big)->flags &= ~RBIGNUM_EMBED_FLAG;
- }
- }
- else {
- if (len <= RBIGNUM_EMBED_LEN_MAX) {
- ds = RBIGNUM(big)->as.heap.digits;
- RBASIC(big)->flags |= RBIGNUM_EMBED_FLAG;
- RBIGNUM_SET_LEN(big, len);
- if (ds) {
- MEMCPY(RBIGNUM(big)->as.ary, ds, BDIGIT, len);
- xfree(ds);
- }
- }
- else {
- if (RBIGNUM_LEN(big) == 0) {
- RBIGNUM(big)->as.heap.digits = ALLOC_N(BDIGIT, len);
- }
- else {
- REALLOC_N(RBIGNUM(big)->as.heap.digits, BDIGIT, len);
- }
- }
- }
-}
-
-void
-rb_big_resize(VALUE big, long len)
-{
- rb_big_realloc(big, len);
- RBIGNUM_SET_LEN(big, len);
-}
-
static VALUE
-bignew_1(VALUE klass, long len, int sign)
+bignew_1(klass, len, sign)
+ VALUE klass;
+ long len;
+ int sign;
{
NEWOBJ(big, struct RBignum);
OBJSETUP(big, klass, T_BIGNUM);
- RBIGNUM_SET_SIGN(big, sign?1:0);
- if (len <= RBIGNUM_EMBED_LEN_MAX) {
- RBASIC(big)->flags |= RBIGNUM_EMBED_FLAG;
- RBIGNUM_SET_LEN(big, len);
- }
- else {
- RBIGNUM(big)->as.heap.digits = ALLOC_N(BDIGIT, len);
- RBIGNUM(big)->as.heap.len = len;
- }
+ big->sign = sign?1:0;
+ big->len = len;
+ big->digits = ALLOC_N(BDIGIT, len);
return (VALUE)big;
}
@@ -151,26 +71,21 @@ bignew_1(VALUE klass, long len, int sign)
#define bignew(len,sign) bignew_1(rb_cBignum,len,sign)
VALUE
-rb_big_new(long len, int sign)
-{
- return bignew(len, sign != 0);
-}
-
-VALUE
-rb_big_clone(VALUE x)
+rb_big_clone(x)
+ VALUE x;
{
- long len = RBIGNUM_LEN(x);
- VALUE z = bignew_1(CLASS_OF(x), len, RBIGNUM_SIGN(x));
+ VALUE z = bignew_1(CLASS_OF(x), RBIGNUM(x)->len, RBIGNUM(x)->sign);
- MEMCPY(BDIGITS(z), BDIGITS(x), BDIGIT, len);
+ MEMCPY(BDIGITS(z), BDIGITS(x), BDIGIT, RBIGNUM(x)->len);
return z;
}
/* modify a bignum by 2's complement */
static void
-get2comp(VALUE x)
+get2comp(x)
+ VALUE x;
{
- long i = RBIGNUM_LEN(x);
+ long i = RBIGNUM(x)->len;
BDIGIT *ds = BDIGITS(x);
BDIGIT_DBL num;
@@ -181,56 +96,52 @@ get2comp(VALUE x)
num += ds[i];
ds[i++] = BIGLO(num);
num = BIGDN(num);
- } while (i < RBIGNUM_LEN(x));
+ } while (i < RBIGNUM(x)->len);
if (num != 0) {
- rb_big_resize(x, RBIGNUM_LEN(x)+1);
+ REALLOC_N(RBIGNUM(x)->digits, BDIGIT, ++RBIGNUM(x)->len);
ds = BDIGITS(x);
- ds[RBIGNUM_LEN(x)-1] = 1;
+ ds[RBIGNUM(x)->len-1] = RBIGNUM(x)->sign ? ~0 : 1;
}
}
void
-rb_big_2comp(VALUE x) /* get 2's complement */
+rb_big_2comp(x) /* get 2's complement */
+ VALUE x;
{
get2comp(x);
}
-static inline VALUE
-bigtrunc(VALUE x)
+static VALUE
+bigtrunc(x)
+ VALUE x;
{
- long len = RBIGNUM_LEN(x);
+ long len = RBIGNUM(x)->len;
BDIGIT *ds = BDIGITS(x);
if (len == 0) return x;
while (--len && !ds[len]);
- if (RBIGNUM_LEN(x) > len+1) {
- rb_big_resize(x, len+1);
- }
+ RBIGNUM(x)->len = ++len;
return x;
}
-static inline VALUE
-bigfixize(VALUE x)
+static VALUE
+bigfixize(x)
+ VALUE x;
{
- long len = RBIGNUM_LEN(x);
+ long len = RBIGNUM(x)->len;
BDIGIT *ds = BDIGITS(x);
- if (len == 0) return INT2FIX(0);
- if ((size_t)(len*SIZEOF_BDIGITS) <= sizeof(long)) {
+ if (len*SIZEOF_BDIGITS <= sizeof(VALUE)) {
long num = 0;
-#if 2*SIZEOF_BDIGITS > SIZEOF_LONG
- num = (long)ds[0];
-#else
while (len--) {
- num = (long)(BIGUP(num) + ds[len]);
+ num = BIGUP(num) + ds[len];
}
-#endif
if (num >= 0) {
- if (RBIGNUM_SIGN(x)) {
+ if (RBIGNUM(x)->sign) {
if (POSFIXABLE(num)) return LONG2FIX(num);
}
else {
- if (NEGFIXABLE(-num)) return LONG2FIX(-num);
+ if (NEGFIXABLE(-(long)num)) return LONG2FIX(-(long)num);
}
}
}
@@ -238,7 +149,8 @@ bigfixize(VALUE x)
}
static VALUE
-bignorm(VALUE x)
+bignorm(x)
+ VALUE x;
{
if (!FIXNUM_P(x) && TYPE(x) == T_BIGNUM) {
x = bigfixize(bigtrunc(x));
@@ -247,13 +159,15 @@ bignorm(VALUE x)
}
VALUE
-rb_big_norm(VALUE x)
+rb_big_norm(x)
+ VALUE x;
{
return bignorm(x);
}
VALUE
-rb_uint2big(VALUE n)
+rb_uint2big(n)
+ unsigned long n;
{
BDIGIT_DBL num = n;
long i = 0;
@@ -269,12 +183,13 @@ rb_uint2big(VALUE n)
i = DIGSPERLONG;
while (--i && !digits[i]) ;
- RBIGNUM_SET_LEN(big, i+1);
+ RBIGNUM(big)->len = i+1;
return big;
}
VALUE
-rb_int2big(SIGNED_VALUE n)
+rb_int2big(n)
+ long n;
{
long neg = 0;
VALUE big;
@@ -285,29 +200,33 @@ rb_int2big(SIGNED_VALUE n)
}
big = rb_uint2big(n);
if (neg) {
- RBIGNUM_SET_SIGN(big, 0);
+ RBIGNUM(big)->sign = 0;
}
return big;
}
VALUE
-rb_uint2inum(VALUE n)
+rb_uint2inum(n)
+ unsigned long n;
{
if (POSFIXABLE(n)) return LONG2FIX(n);
return rb_uint2big(n);
}
VALUE
-rb_int2inum(SIGNED_VALUE n)
+rb_int2inum(n)
+ long n;
{
if (FIXABLE(n)) return LONG2FIX(n);
return rb_int2big(n);
}
-#if SIZEOF_BDIGITS*2 == SIZEOF_LONG_LONG
+#ifdef HAVE_LONG_LONG
void
-rb_quad_pack(char *buf, VALUE val)
+rb_quad_pack(buf, val)
+ char *buf;
+ VALUE val;
{
LONG_LONG q;
@@ -316,25 +235,26 @@ rb_quad_pack(char *buf, VALUE val)
q = FIX2LONG(val);
}
else {
- long len = RBIGNUM_LEN(val);
+ long len = RBIGNUM(val)->len;
BDIGIT *ds;
- if (len > SIZEOF_LONG_LONG/SIZEOF_BDIGITS) {
- len = SIZEOF_LONG_LONG/SIZEOF_BDIGITS;
- }
+ if (len > SIZEOF_LONG_LONG/SIZEOF_BDIGITS)
+ rb_raise(rb_eRangeError, "bignum too big to convert into `quad int'");
ds = BDIGITS(val);
q = 0;
while (len--) {
q = BIGUP(q);
q += ds[len];
}
- if (!RBIGNUM_SIGN(val)) q = -q;
+ if (!RBIGNUM(val)->sign) q = -q;
}
memcpy(buf, (char*)&q, SIZEOF_LONG_LONG);
}
VALUE
-rb_quad_unpack(const char *buf, int sign)
+rb_quad_unpack(buf, sign)
+ const char *buf;
+ int sign;
{
unsigned LONG_LONG q;
long neg = 0;
@@ -364,10 +284,10 @@ rb_quad_unpack(const char *buf, int sign)
i = DIGSPERLL;
while (i-- && !digits[i]) ;
- RBIGNUM_SET_LEN(big, i+1);
+ RBIGNUM(big)->len = i+1;
if (neg) {
- RBIGNUM_SET_SIGN(big, 0);
+ RBIGNUM(big)->sign = 0;
}
return bignorm(big);
}
@@ -377,7 +297,9 @@ rb_quad_unpack(const char *buf, int sign)
#define QUAD_SIZE 8
void
-rb_quad_pack(char *buf, VALUE val)
+rb_quad_pack(buf, val)
+ char *buf;
+ VALUE val;
{
long len;
@@ -386,12 +308,12 @@ rb_quad_pack(char *buf, VALUE val)
if (FIXNUM_P(val)) {
val = rb_int2big(FIX2LONG(val));
}
- len = RBIGNUM_LEN(val) * SIZEOF_BDIGITS;
+ len = RBIGNUM(val)->len * SIZEOF_BDIGITS;
if (len > QUAD_SIZE) {
rb_raise(rb_eRangeError, "bignum too big to convert into `quad int'");
}
memcpy(buf, (char*)BDIGITS(val), len);
- if (!RBIGNUM_SIGN(val)) {
+ if (!RBIGNUM(val)->sign) {
len = QUAD_SIZE;
while (len--) {
*buf = ~*buf;
@@ -403,7 +325,9 @@ rb_quad_pack(char *buf, VALUE val)
#define BNEG(b) (RSHIFT(((BDIGIT*)b)[QUAD_SIZE/SIZEOF_BDIGITS-1],BITSPERDIG-1) != 0)
VALUE
-rb_quad_unpack(const char *buf, int sign)
+rb_quad_unpack(buf, sign)
+ const char *buf;
+ int sign;
{
VALUE big = bignew(QUAD_SIZE/SIZEOF_BDIGITS, 1);
@@ -412,7 +336,7 @@ rb_quad_unpack(const char *buf, int sign)
long len = QUAD_SIZE;
char *tmp = (char*)BDIGITS(big);
- RBIGNUM_SET_SIGN(big, 0);
+ RBIGNUM(big)->sign = 0;
while (len--) {
*tmp = ~*tmp;
tmp++;
@@ -425,7 +349,10 @@ rb_quad_unpack(const char *buf, int sign)
#endif
VALUE
-rb_cstr_to_inum(const char *str, int base, int badcheck)
+rb_cstr_to_inum(str, base, badcheck)
+ const char *str;
+ int base;
+ int badcheck;
{
const char *s = str;
char *end;
@@ -439,16 +366,21 @@ rb_cstr_to_inum(const char *str, int base, int badcheck)
#define conv_digit(c) \
(!ISASCII(c) ? -1 : \
- ISDIGIT(c) ? ((c) - '0') : \
- ISLOWER(c) ? ((c) - 'a' + 10) : \
- ISUPPER(c) ? ((c) - 'A' + 10) : \
+ isdigit(c) ? ((c) - '0') : \
+ islower(c) ? ((c) - 'a' + 10) : \
+ isupper(c) ? ((c) - 'A' + 10) : \
-1)
if (!str) {
if (badcheck) goto bad;
return INT2FIX(0);
}
- while (ISSPACE(*str)) str++;
+ if (badcheck) {
+ while (ISSPACE(*str)) str++;
+ }
+ else {
+ while (ISSPACE(*str) || *str == '_') str++;
+ }
if (str[0] == '+') {
str++;
@@ -519,7 +451,7 @@ rb_cstr_to_inum(const char *str, int base, int badcheck)
break;
default:
if (base < 2 || 36 < base) {
- rb_raise(rb_eArgError, "invalid radix %d", base);
+ rb_raise(rb_eArgError, "illegal radix %d", base);
}
if (base <= 32) {
len = 5;
@@ -529,7 +461,7 @@ rb_cstr_to_inum(const char *str, int base, int badcheck)
}
break;
}
- if (*str == '0') { /* squeeze preceding 0s */
+ if (*str == '0') { /* squeeze preceeding 0s */
int us = 0;
while ((c = *++str) == '0' || c == '_') {
if (c == '_') {
@@ -548,10 +480,10 @@ rb_cstr_to_inum(const char *str, int base, int badcheck)
}
len *= strlen(str)*sizeof(char);
- if ((size_t)len <= (sizeof(long)*CHAR_BIT)) {
- unsigned long val = STRTOUL(str, &end, base);
+ if (len <= (sizeof(VALUE)*CHAR_BIT)) {
+ unsigned long val = strtoul((char*)str, &end, base);
- if (str < end && *end == '_') goto bigparse;
+ if (*end == '_') goto bigparse;
if (badcheck) {
if (end == str) goto bad; /* no number */
while (*end && ISSPACE(*end)) end++;
@@ -567,7 +499,7 @@ rb_cstr_to_inum(const char *str, int base, int badcheck)
}
else {
VALUE big = rb_uint2big(val);
- RBIGNUM_SET_SIGN(big, sign);
+ RBIGNUM(big)->sign = sign;
return bignorm(big);
}
}
@@ -613,7 +545,7 @@ rb_cstr_to_inum(const char *str, int base, int badcheck)
while (*str && ISSPACE(*str)) str++;
if (*str) {
bad:
- rb_invalid_str(s, "Integer()");
+ rb_invalid_str(s, "Integer");
}
}
@@ -621,7 +553,10 @@ rb_cstr_to_inum(const char *str, int base, int badcheck)
}
VALUE
-rb_str_to_inum(VALUE str, int base, int badcheck)
+rb_str_to_inum(str, base, badcheck)
+ VALUE str;
+ int base;
+ int badcheck;
{
char *s;
long len;
@@ -631,10 +566,10 @@ rb_str_to_inum(VALUE str, int base, int badcheck)
s = StringValueCStr(str);
}
else {
- s = RSTRING_PTR(str);
+ s = RSTRING(str)->ptr;
}
if (s) {
- len = RSTRING_LEN(str);
+ len = RSTRING(str)->len;
if (s[len]) { /* no sentinel somehow */
char *p = ALLOCA_N(char, len+1);
@@ -648,8 +583,9 @@ rb_str_to_inum(VALUE str, int base, int badcheck)
#if HAVE_LONG_LONG
-static VALUE
-rb_ull2big(unsigned LONG_LONG n)
+VALUE
+rb_ull2big(n)
+ unsigned LONG_LONG n;
{
BDIGIT_DBL num = n;
long i = 0;
@@ -665,12 +601,13 @@ rb_ull2big(unsigned LONG_LONG n)
i = DIGSPERLL;
while (i-- && !digits[i]) ;
- RBIGNUM_SET_LEN(big, i+1);
+ RBIGNUM(big)->len = i+1;
return big;
}
-static VALUE
-rb_ll2big(LONG_LONG n)
+VALUE
+rb_ll2big(n)
+ LONG_LONG n;
{
long neg = 0;
VALUE big;
@@ -681,20 +618,22 @@ rb_ll2big(LONG_LONG n)
}
big = rb_ull2big(n);
if (neg) {
- RBIGNUM_SET_SIGN(big, 0);
+ RBIGNUM(big)->sign = 0;
}
return big;
}
VALUE
-rb_ull2inum(unsigned LONG_LONG n)
+rb_ull2inum(n)
+ unsigned LONG_LONG n;
{
if (POSFIXABLE(n)) return LONG2FIX(n);
return rb_ull2big(n);
}
VALUE
-rb_ll2inum(LONG_LONG n)
+rb_ll2inum(n)
+ LONG_LONG n;
{
if (FIXABLE(n)) return LONG2FIX(n);
return rb_ll2big(n);
@@ -703,200 +642,89 @@ rb_ll2inum(LONG_LONG n)
#endif /* HAVE_LONG_LONG */
VALUE
-rb_cstr2inum(const char *str, int base)
+rb_cstr2inum(str, base)
+ const char *str;
+ int base;
{
return rb_cstr_to_inum(str, base, base==0);
}
VALUE
-rb_str2inum(VALUE str, int base)
+rb_str2inum(str, base)
+ VALUE str;
+ int base;
{
return rb_str_to_inum(str, base, base==0);
}
const char ruby_digitmap[] = "0123456789abcdefghijklmnopqrstuvwxyz";
-
-static VALUE bigsqr(VALUE x);
-static void bigdivmod(VALUE x, VALUE y, volatile VALUE *divp, volatile VALUE *modp);
-
-#define POW2_P(x) (((x)&((x)-1))==0)
-
-static inline int
-ones(register unsigned long x)
-{
-#if SIZEOF_LONG == 8
-# define MASK_55 0x5555555555555555UL
-# define MASK_33 0x3333333333333333UL
-# define MASK_0f 0x0f0f0f0f0f0f0f0fUL
-#else
-# define MASK_55 0x55555555UL
-# define MASK_33 0x33333333UL
-# define MASK_0f 0x0f0f0f0fUL
-#endif
- x -= (x >> 1) & MASK_55;
- x = ((x >> 2) & MASK_33) + (x & MASK_33);
- x = ((x >> 4) + x) & MASK_0f;
- x += (x >> 8);
- x += (x >> 16);
-#if SIZEOF_LONG == 8
- x += (x >> 32);
-#endif
- return (int)(x & 0x7f);
-#undef MASK_0f
-#undef MASK_33
-#undef MASK_55
-}
-
-static inline unsigned long
-next_pow2(register unsigned long x)
-{
- x |= x >> 1;
- x |= x >> 2;
- x |= x >> 4;
- x |= x >> 8;
- x |= x >> 16;
-#if SIZEOF_LONG == 8
- x |= x >> 32;
-#endif
- return x + 1;
-}
-
-static inline int
-floor_log2(register unsigned long x)
-{
- x |= x >> 1;
- x |= x >> 2;
- x |= x >> 4;
- x |= x >> 8;
- x |= x >> 16;
-#if SIZEOF_LONG == 8
- x |= x >> 32;
-#endif
- return (int)ones(x) - 1;
-}
-
-static inline int
-ceil_log2(register unsigned long x)
-{
- return floor_log2(x) + !POW2_P(x);
-}
-
-#define LOG2_KARATSUBA_DIGITS 7
-#define KARATSUBA_DIGITS (1L<<LOG2_KARATSUBA_DIGITS)
-#define MAX_BIG2STR_TABLE_ENTRIES 64
-
-static VALUE big2str_power_cache[35][MAX_BIG2STR_TABLE_ENTRIES];
-
-static void
-power_cache_init(void)
-{
- int i, j;
- for (i = 0; i < 35; ++i) {
- for (j = 0; j < MAX_BIG2STR_TABLE_ENTRIES; ++j) {
- big2str_power_cache[i][j] = Qnil;
- }
- }
-}
-
-static inline VALUE
-power_cache_get_power0(int base, int i)
-{
- if (NIL_P(big2str_power_cache[base - 2][i])) {
- big2str_power_cache[base - 2][i] =
- i == 0 ? rb_big_pow(rb_int2big(base), INT2FIX(KARATSUBA_DIGITS))
- : bigsqr(power_cache_get_power0(base, i - 1));
- rb_gc_register_mark_object(big2str_power_cache[base - 2][i]);
- }
- return big2str_power_cache[base - 2][i];
-}
-
-static VALUE
-power_cache_get_power(int base, long n1, long* m1)
+VALUE
+rb_big2str0(x, base, trim)
+ VALUE x;
+ int base;
+ int trim;
{
- int i, m;
- long j;
- VALUE t;
-
- if (n1 <= KARATSUBA_DIGITS)
- rb_bug("n1 > KARATSUBA_DIGITS");
-
- m = ceil_log2(n1);
- if (m1) *m1 = 1 << m;
- i = m - LOG2_KARATSUBA_DIGITS;
- if (i >= MAX_BIG2STR_TABLE_ENTRIES)
- i = MAX_BIG2STR_TABLE_ENTRIES - 1;
- t = power_cache_get_power0(base, i);
-
- j = KARATSUBA_DIGITS*(1 << i);
- while (n1 > j) {
- t = bigsqr(t);
- j *= 2;
- }
- return t;
-}
-
-/* big2str_muraken_find_n1
- *
- * Let a natural number x is given by:
- * x = 2^0 * x_0 + 2^1 * x_1 + ... + 2^(B*n_0 - 1) * x_{B*n_0 - 1},
- * where B is BITSPERDIG (i.e. BDIGITS*CHAR_BIT) and n_0 is
- * RBIGNUM_LEN(x).
- *
- * Now, we assume n_1 = min_n \{ n | 2^(B*n_0/2) <= b_1^(n_1) \}, so
- * it is realized that 2^(B*n_0) <= {b_1}^{2*n_1}, where b_1 is a
- * given radix number. And then, we have n_1 <= (B*n_0) /
- * (2*log_2(b_1)), therefore n_1 is given by ceil((B*n_0) /
- * (2*log_2(b_1))).
- */
-static long
-big2str_find_n1(VALUE x, int base)
-{
- static const double log_2[] = {
- 1.0, 1.58496250072116, 2.0,
- 2.32192809488736, 2.58496250072116, 2.8073549220576,
- 3.0, 3.16992500144231, 3.32192809488736,
- 3.4594316186373, 3.58496250072116, 3.70043971814109,
- 3.8073549220576, 3.90689059560852, 4.0,
- 4.08746284125034, 4.16992500144231, 4.24792751344359,
- 4.32192809488736, 4.39231742277876, 4.4594316186373,
- 4.52356195605701, 4.58496250072116, 4.64385618977472,
- 4.70043971814109, 4.75488750216347, 4.8073549220576,
- 4.85798099512757, 4.90689059560852, 4.95419631038688,
- 5.0, 5.04439411935845, 5.08746284125034,
- 5.12928301694497, 5.16992500144231
- };
- long bits;
-
- if (base < 2 || 36 < base)
- rb_bug("invalid radix %d", base);
+ volatile VALUE t;
+ BDIGIT *ds;
+ long i, j, hbase;
+ VALUE ss;
+ char *s;
if (FIXNUM_P(x)) {
- bits = (SIZEOF_LONG*CHAR_BIT - 1)/2 + 1;
+ return rb_fix2str(x, base);
}
- else if (BIGZEROP(x)) {
- return 0;
+ i = RBIGNUM(x)->len;
+ if (BIGZEROP(x)) {
+ return rb_str_new2("0");
}
- else if (RBIGNUM_LEN(x) >= LONG_MAX/BITSPERDIG) {
+ if (i >= LONG_MAX/SIZEOF_BDIGITS/CHAR_BIT) {
rb_raise(rb_eRangeError, "bignum too big to convert into `string'");
}
- else {
- bits = BITSPERDIG*RBIGNUM_LEN(x);
+ j = SIZEOF_BDIGITS*CHAR_BIT*i;
+ switch (base) {
+ case 2: break;
+ case 3:
+ j = j * 53L / 84 + 1;
+ break;
+ case 4: case 5: case 6: case 7:
+ j = (j + 1) / 2;
+ break;
+ case 8: case 9:
+ j = (j + 2) / 3;
+ break;
+ case 10: case 11: case 12: case 13: case 14: case 15:
+ j = j * 28L / 93 + 1;
+ break;
+ case 16: case 17: case 18: case 19: case 20: case 21:
+ case 22: case 23: case 24: case 25: case 26: case 27:
+ case 28: case 29: case 30: case 31:
+ j = (j + 3) / 4;
+ break;
+ case 32: case 33: case 34: case 35: case 36:
+ j = (j + 4) / 5;
+ break;
+ default:
+ rb_raise(rb_eArgError, "illegal radix %d", base);
+ break;
}
+ j++; /* space for sign */
- return (long)ceil(bits/log_2[base - 2]);
-}
+ hbase = base * base;
+#if SIZEOF_BDIGITS > 2
+ hbase *= hbase;
+#endif
-static long
-big2str_orig(VALUE x, int base, char* ptr, long len, long hbase, int trim)
-{
- long i = RBIGNUM_LEN(x), j = len;
- BDIGIT* ds = BDIGITS(x);
+ t = rb_big_clone(x);
+ ds = BDIGITS(t);
+ ss = rb_str_new(0, j+1);
+ s = RSTRING(ss)->ptr;
- while (i && j > 0) {
+ s[0] = RBIGNUM(x)->sign ? '+' : '-';
+ while (i && j > 1) {
long k = i;
BDIGIT_DBL num = 0;
- while (k--) { /* x / hbase */
+ while (k--) {
num = BIGUP(num) + ds[k];
ds[k] = (BDIGIT)(num / hbase);
num %= hbase;
@@ -904,93 +732,23 @@ big2str_orig(VALUE x, int base, char* ptr, long len, long hbase, int trim)
if (trim && ds[i-1] == 0) i--;
k = SIZEOF_BDIGITS;
while (k--) {
- ptr[--j] = ruby_digitmap[num % base];
+ s[--j] = ruby_digitmap[num % base];
num /= base;
- if (j <= 0) break;
+ if (!trim && j <= 1) break;
if (trim && i == 0 && num == 0) break;
}
}
- if (trim) {
- while (j < len && ptr[j] == '0') j++;
- MEMMOVE(ptr, ptr + j, char, len - j);
- len -= j;
- }
- return len;
-}
-
-static long
-big2str_karatsuba(VALUE x, int base, char* ptr,
- long n1, long len, long hbase, int trim)
-{
- long lh, ll, m1;
- VALUE b, q, r;
-
- if (BIGZEROP(x)) {
- if (trim) return 0;
- else {
- memset(ptr, '0', len);
- return len;
- }
- }
-
- if (n1 <= KARATSUBA_DIGITS) {
- return big2str_orig(x, base, ptr, len, hbase, trim);
- }
-
- b = power_cache_get_power(base, n1, &m1);
- bigdivmod(x, b, &q, &r);
- lh = big2str_karatsuba(q, base, ptr, (len - m1)/2,
- len - m1, hbase, trim);
- rb_big_resize(q, 0);
- ll = big2str_karatsuba(r, base, ptr + lh, m1/2,
- m1, hbase, !lh && trim);
- rb_big_resize(r, 0);
-
- return lh + ll;
-}
-
-VALUE
-rb_big2str0(VALUE x, int base, int trim)
-{
- int off;
- VALUE ss, xx;
- long n1, n2, len, hbase;
- char* ptr;
-
- if (FIXNUM_P(x)) {
- return rb_fix2str(x, base);
- }
- if (BIGZEROP(x)) {
- return rb_usascii_str_new2("0");
- }
-
- if (base < 2 || 36 < base)
- rb_raise(rb_eArgError, "invalid radix %d", base);
-
- n2 = big2str_find_n1(x, base);
- n1 = (n2 + 1) / 2;
- ss = rb_usascii_str_new(0, n2 + 1); /* plus one for sign */
- ptr = RSTRING_PTR(ss);
- ptr[0] = RBIGNUM_SIGN(x) ? '+' : '-';
-
- hbase = base*base;
-#if SIZEOF_BDIGITS > 2
- hbase *= hbase;
-#endif
- off = !(trim && RBIGNUM_SIGN(x)); /* erase plus sign if trim */
- xx = rb_big_clone(x);
- RBIGNUM_SET_SIGN(xx, 1);
- if (n1 <= KARATSUBA_DIGITS) {
- len = off + big2str_orig(xx, base, ptr + off, n2, hbase, trim);
+ if (trim) {while (s[j] == '0') j++;}
+ i = RSTRING(ss)->len - j;
+ if (RBIGNUM(x)->sign) {
+ memmove(s, s+j, i);
+ RSTRING(ss)->len = i-1;
}
else {
- len = off + big2str_karatsuba(xx, base, ptr + off, n1,
- n2, hbase, trim);
+ memmove(s+1, s+j, i);
+ RSTRING(ss)->len = i;
}
- rb_big_resize(xx, 0);
-
- ptr[len] = '\0';
- rb_str_resize(ss, len);
+ s[RSTRING(ss)->len] = '\0';
return ss;
}
@@ -998,7 +756,7 @@ rb_big2str0(VALUE x, int base, int trim)
VALUE
rb_big2str(VALUE x, int base)
{
- return rb_big2str0(x, base, 1);
+ return rb_big2str0(x, base, Qtrue);
}
/*
@@ -1016,84 +774,87 @@ rb_big2str(VALUE x, int base)
*/
static VALUE
-rb_big_to_s(int argc, VALUE *argv, VALUE x)
+rb_big_to_s(argc, argv, x)
+ int argc;
+ VALUE *argv;
+ VALUE x;
{
+ VALUE b;
int base;
+ rb_scan_args(argc, argv, "01", &b);
if (argc == 0) base = 10;
- else {
- VALUE b;
-
- rb_scan_args(argc, argv, "01", &b);
- base = NUM2INT(b);
- }
+ else base = NUM2INT(b);
return rb_big2str(x, base);
}
-static VALUE
-big2ulong(VALUE x, const char *type, int check)
+static unsigned long
+big2ulong(x, type)
+ VALUE x;
+ char *type;
{
- long len = RBIGNUM_LEN(x);
+ long len = RBIGNUM(x)->len;
BDIGIT_DBL num;
BDIGIT *ds;
- if (len > DIGSPERLONG) {
- if (check)
- rb_raise(rb_eRangeError, "bignum too big to convert into `%s'", type);
- len = DIGSPERLONG;
- }
+ if (len > SIZEOF_LONG/SIZEOF_BDIGITS)
+ rb_raise(rb_eRangeError, "bignum too big to convert into `%s'", type);
ds = BDIGITS(x);
num = 0;
while (len--) {
num = BIGUP(num);
num += ds[len];
}
- return (VALUE)num;
+ return num;
}
-VALUE
-rb_big2ulong_pack(VALUE x)
+unsigned long
+rb_big2ulong_pack(x)
+ VALUE x;
{
- VALUE num = big2ulong(x, "unsigned long", FALSE);
- if (!RBIGNUM_SIGN(x)) {
- return (VALUE)(-(SIGNED_VALUE)num);
+ unsigned long num = big2ulong(x, "unsigned long");
+ if (!RBIGNUM(x)->sign) {
+ return -num;
}
return num;
}
-VALUE
-rb_big2ulong(VALUE x)
+unsigned long
+rb_big2ulong(x)
+ VALUE x;
{
- VALUE num = big2ulong(x, "unsigned long", TRUE);
+ unsigned long num = big2ulong(x, "unsigned long");
- if (!RBIGNUM_SIGN(x)) {
- if ((SIGNED_VALUE)num < 0) {
+ if (!RBIGNUM(x)->sign) {
+ if ((long)num < 0) {
rb_raise(rb_eRangeError, "bignum out of range of unsigned long");
}
- return (VALUE)(-(SIGNED_VALUE)num);
+ return -num;
}
return num;
}
-SIGNED_VALUE
-rb_big2long(VALUE x)
+long
+rb_big2long(x)
+ VALUE x;
{
- VALUE num = big2ulong(x, "long", TRUE);
+ unsigned long num = big2ulong(x, "long");
- if ((SIGNED_VALUE)num < 0 &&
- (RBIGNUM_SIGN(x) || (SIGNED_VALUE)num != LONG_MIN)) {
+ if ((long)num < 0 && (RBIGNUM(x)->sign || (long)num != LONG_MIN)) {
rb_raise(rb_eRangeError, "bignum too big to convert into `long'");
}
- if (!RBIGNUM_SIGN(x)) return -(SIGNED_VALUE)num;
+ if (!RBIGNUM(x)->sign) return -(long)num;
return num;
}
#if HAVE_LONG_LONG
static unsigned LONG_LONG
-big2ull(VALUE x, const char *type)
+big2ull(x, type)
+ VALUE x;
+ char *type;
{
- long len = RBIGNUM_LEN(x);
+ long len = RBIGNUM(x)->len;
BDIGIT_DBL num;
BDIGIT *ds;
@@ -1109,32 +870,34 @@ big2ull(VALUE x, const char *type)
}
unsigned LONG_LONG
-rb_big2ull(VALUE x)
+rb_big2ull(x)
+ VALUE x;
{
unsigned LONG_LONG num = big2ull(x, "unsigned long long");
- if (!RBIGNUM_SIGN(x))
- return (VALUE)(-(SIGNED_VALUE)num);
+ if (!RBIGNUM(x)->sign) return -num;
return num;
}
LONG_LONG
-rb_big2ll(VALUE x)
+rb_big2ll(x)
+ VALUE x;
{
unsigned LONG_LONG num = big2ull(x, "long long");
- if ((LONG_LONG)num < 0 && (RBIGNUM_SIGN(x)
+ if ((LONG_LONG)num < 0 && (RBIGNUM(x)->sign
|| (LONG_LONG)num != LLONG_MIN)) {
rb_raise(rb_eRangeError, "bignum too big to convert into `long long'");
}
- if (!RBIGNUM_SIGN(x)) return -(LONG_LONG)num;
+ if (!RBIGNUM(x)->sign) return -(LONG_LONG)num;
return num;
}
#endif /* HAVE_LONG_LONG */
static VALUE
-dbl2big(double d)
+dbl2big(d)
+ double d;
{
long i = 0;
BDIGIT c;
@@ -1166,92 +929,36 @@ dbl2big(double d)
}
VALUE
-rb_dbl2big(double d)
+rb_dbl2big(d)
+ double d;
{
return bignorm(dbl2big(d));
}
-static int
-nlz(BDIGIT x)
-{
- BDIGIT y;
- int n = BITSPERDIG;
-#if BITSPERDIG > 64
- y = x >> 64; if (y) {n -= 64; x = y;}
-#endif
-#if BITSPERDIG > 32
- y = x >> 32; if (y) {n -= 32; x = y;}
-#endif
-#if BITSPERDIG > 16
- y = x >> 16; if (y) {n -= 16; x = y;}
-#endif
- y = x >> 8; if (y) {n -= 8; x = y;}
- y = x >> 4; if (y) {n -= 4; x = y;}
- y = x >> 2; if (y) {n -= 2; x = y;}
- y = x >> 1; if (y) {return n - 2;}
- return n - x;
-}
-
static double
-big2dbl(VALUE x)
+big2dbl(x)
+ VALUE x;
{
double d = 0.0;
- long i = (bigtrunc(x), RBIGNUM_LEN(x)), lo = 0, bits;
- BDIGIT *ds = BDIGITS(x), dl;
+ long i = RBIGNUM(x)->len;
+ BDIGIT *ds = BDIGITS(x);
- if (i) {
- bits = i * BITSPERDIG - nlz(ds[i-1]);
- if (bits > DBL_MANT_DIG+DBL_MAX_EXP) {
- d = HUGE_VAL;
- }
- else {
- if (bits > DBL_MANT_DIG+1)
- lo = (bits -= DBL_MANT_DIG+1) / BITSPERDIG;
- else
- bits = 0;
- while (--i > lo) {
- d = ds[i] + BIGRAD*d;
- }
- dl = ds[i];
- if (bits && (dl & (1UL << (bits %= BITSPERDIG)))) {
- int carry = dl & ~(~(BDIGIT)0 << bits);
- if (!carry) {
- while (i-- > 0) {
- if ((carry = ds[i]) != 0) break;
- }
- }
- if (carry) {
- dl &= (BDIGIT)~0 << bits;
- dl += (BDIGIT)1 << bits;
- if (!dl) d += 1;
- }
- }
- d = dl + BIGRAD*d;
- if (lo) {
- if (lo > INT_MAX / BITSPERDIG)
- d = HUGE_VAL;
- else if (lo < INT_MIN / BITSPERDIG)
- d = 0.0;
- else
- d = ldexp(d, (int)(lo * BITSPERDIG));
- }
- }
+ while (i--) {
+ d = ds[i] + BIGRAD*d;
}
- if (!RBIGNUM_SIGN(x)) d = -d;
+ if (!RBIGNUM(x)->sign) d = -d;
return d;
}
double
-rb_big2dbl(VALUE x)
+rb_big2dbl(x)
+ VALUE x;
{
double d = big2dbl(x);
if (isinf(d)) {
- rb_warning("Bignum out of Float range");
- if (d < 0.0)
- d = -HUGE_VAL;
- else
- d = HUGE_VAL;
+ rb_warn("Bignum out of Float range");
+ d = HUGE_VAL;
}
return d;
}
@@ -1266,9 +973,10 @@ rb_big2dbl(VALUE x)
*/
static VALUE
-rb_big_to_f(VALUE x)
+rb_big_to_f(x)
+ VALUE x;
{
- return DBL2NUM(rb_big2dbl(x));
+ return rb_float_new(rb_big2dbl(x));
}
/*
@@ -1281,11 +989,11 @@ rb_big_to_f(VALUE x)
*
*/
-VALUE
-rb_big_cmp(VALUE x, VALUE y)
+static VALUE
+rb_big_cmp(x, y)
+ VALUE x, y;
{
- long xlen = RBIGNUM_LEN(x);
- BDIGIT *xds, *yds;
+ long xlen = RBIGNUM(x)->len;
switch (TYPE(y)) {
case T_FIXNUM:
@@ -1296,35 +1004,24 @@ rb_big_cmp(VALUE x, VALUE y)
break;
case T_FLOAT:
- {
- double a = RFLOAT_VALUE(y);
-
- if (isinf(a)) {
- if (a > 0.0) return INT2FIX(-1);
- else return INT2FIX(1);
- }
- return rb_dbl_cmp(rb_big2dbl(x), a);
- }
+ return rb_dbl_cmp(rb_big2dbl(x), RFLOAT(y)->value);
default:
- return rb_num_coerce_cmp(x, y, rb_intern("<=>"));
+ return rb_num_coerce_cmp(x, y);
}
- if (RBIGNUM_SIGN(x) > RBIGNUM_SIGN(y)) return INT2FIX(1);
- if (RBIGNUM_SIGN(x) < RBIGNUM_SIGN(y)) return INT2FIX(-1);
- if (xlen < RBIGNUM_LEN(y))
- return (RBIGNUM_SIGN(x)) ? INT2FIX(-1) : INT2FIX(1);
- if (xlen > RBIGNUM_LEN(y))
- return (RBIGNUM_SIGN(x)) ? INT2FIX(1) : INT2FIX(-1);
-
- xds = BDIGITS(x);
- yds = BDIGITS(y);
+ if (RBIGNUM(x)->sign > RBIGNUM(y)->sign) return INT2FIX(1);
+ if (RBIGNUM(x)->sign < RBIGNUM(y)->sign) return INT2FIX(-1);
+ if (xlen < RBIGNUM(y)->len)
+ return (RBIGNUM(x)->sign) ? INT2FIX(-1) : INT2FIX(1);
+ if (xlen > RBIGNUM(y)->len)
+ return (RBIGNUM(x)->sign) ? INT2FIX(1) : INT2FIX(-1);
- while(xlen-- && (xds[xlen]==yds[xlen]));
+ while(xlen-- && (BDIGITS(x)[xlen]==BDIGITS(y)[xlen]));
if (-1 == xlen) return INT2FIX(0);
- return (xds[xlen] > yds[xlen]) ?
- (RBIGNUM_SIGN(x) ? INT2FIX(1) : INT2FIX(-1)) :
- (RBIGNUM_SIGN(x) ? INT2FIX(-1) : INT2FIX(1));
+ return (BDIGITS(x)[xlen] > BDIGITS(y)[xlen]) ?
+ (RBIGNUM(x)->sign ? INT2FIX(1) : INT2FIX(-1)) :
+ (RBIGNUM(x)->sign ? INT2FIX(-1) : INT2FIX(1));
}
/*
@@ -1338,8 +1035,9 @@ rb_big_cmp(VALUE x, VALUE y)
* 68719476736 == 68719476736.0 #=> true
*/
-VALUE
-rb_big_eq(VALUE x, VALUE y)
+static VALUE
+rb_big_eq(x, y)
+ VALUE x, y;
{
switch (TYPE(y)) {
case T_FIXNUM:
@@ -1348,10 +1046,10 @@ rb_big_eq(VALUE x, VALUE y)
case T_BIGNUM:
break;
case T_FLOAT:
- {
+ {
volatile double a, b;
- a = RFLOAT_VALUE(y);
+ a = RFLOAT(y)->value;
if (isnan(a)) return Qfalse;
b = rb_big2dbl(x);
return (a == b)?Qtrue:Qfalse;
@@ -1359,9 +1057,9 @@ rb_big_eq(VALUE x, VALUE y)
default:
return rb_equal(y, x);
}
- if (RBIGNUM_SIGN(x) != RBIGNUM_SIGN(y)) return Qfalse;
- if (RBIGNUM_LEN(x) != RBIGNUM_LEN(y)) return Qfalse;
- if (MEMCMP(BDIGITS(x),BDIGITS(y),BDIGIT,RBIGNUM_LEN(y)) != 0) return Qfalse;
+ if (RBIGNUM(x)->sign != RBIGNUM(y)->sign) return Qfalse;
+ if (RBIGNUM(x)->len != RBIGNUM(y)->len) return Qfalse;
+ if (MEMCMP(BDIGITS(x),BDIGITS(y),BDIGIT,RBIGNUM(y)->len) != 0) return Qfalse;
return Qtrue;
}
@@ -1377,12 +1075,13 @@ rb_big_eq(VALUE x, VALUE y)
*/
static VALUE
-rb_big_eql(VALUE x, VALUE y)
+rb_big_eql(x, y)
+ VALUE x, y;
{
if (TYPE(y) != T_BIGNUM) return Qfalse;
- if (RBIGNUM_SIGN(x) != RBIGNUM_SIGN(y)) return Qfalse;
- if (RBIGNUM_LEN(x) != RBIGNUM_LEN(y)) return Qfalse;
- if (MEMCMP(BDIGITS(x),BDIGITS(y),BDIGIT,RBIGNUM_LEN(y)) != 0) return Qfalse;
+ if (RBIGNUM(x)->sign != RBIGNUM(y)->sign) return Qfalse;
+ if (RBIGNUM(x)->len != RBIGNUM(y)->len) return Qfalse;
+ if (MEMCMP(BDIGITS(x),BDIGITS(y),BDIGIT,RBIGNUM(y)->len) != 0) return Qfalse;
return Qtrue;
}
@@ -1394,11 +1093,12 @@ rb_big_eql(VALUE x, VALUE y)
*/
static VALUE
-rb_big_uminus(VALUE x)
+rb_big_uminus(x)
+ VALUE x;
{
VALUE z = rb_big_clone(x);
- RBIGNUM_SET_SIGN(z, !RBIGNUM_SIGN(x));
+ RBIGNUM(z)->sign = !RBIGNUM(x)->sign;
return bignorm(z);
}
@@ -1416,248 +1116,112 @@ rb_big_uminus(VALUE x)
*/
static VALUE
-rb_big_neg(VALUE x)
+rb_big_neg(x)
+ VALUE x;
{
VALUE z = rb_big_clone(x);
- BDIGIT *ds;
long i;
+ BDIGIT *ds;
- if (!RBIGNUM_SIGN(x)) get2comp(z);
+ if (!RBIGNUM(x)->sign) get2comp(z);
ds = BDIGITS(z);
- i = RBIGNUM_LEN(x);
- if (!i) return INT2FIX(~(SIGNED_VALUE)0);
- while (i--) {
- ds[i] = ~ds[i];
- }
- RBIGNUM_SET_SIGN(z, !RBIGNUM_SIGN(z));
- if (RBIGNUM_SIGN(x)) get2comp(z);
+ i = RBIGNUM(x)->len;
+ if (!i) return INT2FIX(~0);
+ while (i--) ds[i] = ~ds[i];
+ RBIGNUM(z)->sign = !RBIGNUM(z)->sign;
+ if (RBIGNUM(x)->sign) get2comp(z);
return bignorm(z);
}
-static void
-bigsub_core(BDIGIT *xds, long xn, BDIGIT *yds, long yn, BDIGIT *zds, long zn)
-{
- BDIGIT_DBL_SIGNED num;
- long i;
-
- for (i = 0, num = 0; i < yn; i++) {
- num += (BDIGIT_DBL_SIGNED)xds[i] - yds[i];
- zds[i] = BIGLO(num);
- num = BIGDN(num);
- }
- while (num && i < xn) {
- num += xds[i];
- zds[i++] = BIGLO(num);
- num = BIGDN(num);
- }
- while (i < xn) {
- zds[i] = xds[i];
- i++;
- }
- assert(i <= zn);
- while (i < zn) {
- zds[i++] = 0;
- }
-}
-
static VALUE
-bigsub(VALUE x, VALUE y)
+bigsub(x, y)
+ VALUE x, y;
{
VALUE z = 0;
- long i = RBIGNUM_LEN(x);
- BDIGIT *xds, *yds;
+ BDIGIT *zds;
+ BDIGIT_DBL_SIGNED num;
+ long i = RBIGNUM(x)->len;
/* if x is larger than y, swap */
- if (RBIGNUM_LEN(x) < RBIGNUM_LEN(y)) {
+ if (RBIGNUM(x)->len < RBIGNUM(y)->len) {
z = x; x = y; y = z; /* swap x y */
}
- else if (RBIGNUM_LEN(x) == RBIGNUM_LEN(y)) {
- xds = BDIGITS(x);
- yds = BDIGITS(y);
+ else if (RBIGNUM(x)->len == RBIGNUM(y)->len) {
while (i > 0) {
i--;
- if (xds[i] > yds[i]) {
+ if (BDIGITS(x)[i] > BDIGITS(y)[i]) {
break;
}
- if (xds[i] < yds[i]) {
+ if (BDIGITS(x)[i] < BDIGITS(y)[i]) {
z = x; x = y; y = z; /* swap x y */
break;
}
}
}
- z = bignew(RBIGNUM_LEN(x), z==0);
- bigsub_core(BDIGITS(x), RBIGNUM_LEN(x),
- BDIGITS(y), RBIGNUM_LEN(y),
- BDIGITS(z), RBIGNUM_LEN(z));
-
- return z;
-}
-
-static VALUE bigadd_int(VALUE x, long y);
-
-static VALUE
-bigsub_int(VALUE x, long y0)
-{
- VALUE z;
- BDIGIT *xds, *zds;
- long xn;
- BDIGIT_DBL_SIGNED num;
- long i, y;
-
- y = y0;
- xds = BDIGITS(x);
- xn = RBIGNUM_LEN(x);
-
- z = bignew(xn, RBIGNUM_SIGN(x));
+ z = bignew(RBIGNUM(x)->len, z==0);
zds = BDIGITS(z);
-#if SIZEOF_BDIGITS == SIZEOF_LONG
- num = (BDIGIT_DBL_SIGNED)xds[0] - y;
- if (xn == 1 && num < 0) {
- for (i=0; i<xn; i++) {
- }
- RBIGNUM_SET_SIGN(z, !RBIGNUM_SIGN(x));
- zds[0] = (BDIGIT)-num;
- return bignorm(z);
- }
- zds[0] = BIGLO(num);
- num = BIGDN(num);
- i = 1;
-#else
- num = 0;
- for (i=0; i<(int)(sizeof(y)/sizeof(BDIGIT)); i++) {
- num += (BDIGIT_DBL_SIGNED)xds[i] - BIGLO(y);
+ for (i = 0, num = 0; i < RBIGNUM(y)->len; i++) {
+ num += (BDIGIT_DBL_SIGNED)BDIGITS(x)[i] - BDIGITS(y)[i];
zds[i] = BIGLO(num);
num = BIGDN(num);
- y = BIGDN(y);
}
-#endif
- while (num && i < xn) {
- num += xds[i];
+ while (num && i < RBIGNUM(x)->len) {
+ num += BDIGITS(x)[i];
zds[i++] = BIGLO(num);
num = BIGDN(num);
}
- while (i < xn) {
- zds[i] = xds[i];
+ while (i < RBIGNUM(x)->len) {
+ zds[i] = BDIGITS(x)[i];
i++;
}
- if (num < 0) {
- z = bigsub(x, rb_int2big(y0));
- }
- return bignorm(z);
+
+ return z;
}
static VALUE
-bigadd_int(VALUE x, long y)
+bigadd(x, y, sign)
+ VALUE x, y;
+ int sign;
{
VALUE z;
- BDIGIT *xds, *zds;
- long xn, zn;
BDIGIT_DBL num;
- long i;
-
- xds = BDIGITS(x);
- xn = RBIGNUM_LEN(x);
+ long i, len;
- if (xn < 2) {
- zn = 3;
- }
- else {
- zn = xn + 1;
+ sign = (sign == RBIGNUM(y)->sign);
+ if (RBIGNUM(x)->sign != sign) {
+ if (sign) return bigsub(y, x);
+ return bigsub(x, y);
}
- z = bignew(zn, RBIGNUM_SIGN(x));
- zds = BDIGITS(z);
-#if SIZEOF_BDIGITS == SIZEOF_LONG
- num = (BDIGIT_DBL)xds[0] + y;
- zds[0] = BIGLO(num);
- num = BIGDN(num);
- i = 1;
-#else
- num = 0;
- for (i=0; i<(int)(sizeof(y)/sizeof(BDIGIT)); i++) {
- num += (BDIGIT_DBL)xds[i] + BIGLO(y);
- zds[i] = BIGLO(num);
- num = BIGDN(num);
- y = BIGDN(y);
- }
-#endif
- while (num && i < xn) {
- num += xds[i];
- zds[i++] = BIGLO(num);
- num = BIGDN(num);
- }
- if (num) zds[i++] = (BDIGIT)num;
- else while (i < xn) {
- zds[i] = xds[i];
- i++;
- }
- assert(i <= zn);
- while (i < zn) {
- zds[i++] = 0;
+ if (RBIGNUM(x)->len > RBIGNUM(y)->len) {
+ len = RBIGNUM(x)->len + 1;
+ z = x; x = y; y = z;
}
- return bignorm(z);
-}
-
-static void
-bigadd_core(BDIGIT *xds, long xn, BDIGIT *yds, long yn, BDIGIT *zds, long zn)
-{
- BDIGIT_DBL num = 0;
- long i;
-
- if (xn > yn) {
- BDIGIT *tds;
- tds = xds; xds = yds; yds = tds;
- i = xn; xn = yn; yn = i;
+ else {
+ len = RBIGNUM(y)->len + 1;
}
+ z = bignew(len, sign);
- i = 0;
- while (i < xn) {
- num += (BDIGIT_DBL)xds[i] + yds[i];
- zds[i++] = BIGLO(num);
+ len = RBIGNUM(x)->len;
+ for (i = 0, num = 0; i < len; i++) {
+ num += (BDIGIT_DBL)BDIGITS(x)[i] + BDIGITS(y)[i];
+ BDIGITS(z)[i] = BIGLO(num);
num = BIGDN(num);
}
- while (num && i < yn) {
- num += yds[i];
- zds[i++] = BIGLO(num);
+ len = RBIGNUM(y)->len;
+ while (num && i < len) {
+ num += BDIGITS(y)[i];
+ BDIGITS(z)[i++] = BIGLO(num);
num = BIGDN(num);
}
- while (i < yn) {
- zds[i] = yds[i];
+ while (i < len) {
+ BDIGITS(z)[i] = BDIGITS(y)[i];
i++;
}
- if (num) zds[i++] = (BDIGIT)num;
- assert(i <= zn);
- while (i < zn) {
- zds[i++] = 0;
- }
-}
-
-static VALUE
-bigadd(VALUE x, VALUE y, int sign)
-{
- VALUE z;
- long len;
-
- sign = (sign == RBIGNUM_SIGN(y));
- if (RBIGNUM_SIGN(x) != sign) {
- if (sign) return bigsub(y, x);
- return bigsub(x, y);
- }
-
- if (RBIGNUM_LEN(x) > RBIGNUM_LEN(y)) {
- len = RBIGNUM_LEN(x) + 1;
- }
- else {
- len = RBIGNUM_LEN(y) + 1;
- }
- z = bignew(len, sign);
-
- bigadd_core(BDIGITS(x), RBIGNUM_LEN(x),
- BDIGITS(y), RBIGNUM_LEN(y),
- BDIGITS(z), RBIGNUM_LEN(z));
+ BDIGITS(z)[i] = (BDIGIT)num;
return z;
}
@@ -1670,32 +1234,21 @@ bigadd(VALUE x, VALUE y, int sign)
*/
VALUE
-rb_big_plus(VALUE x, VALUE y)
+rb_big_plus(x, y)
+ VALUE x, y;
{
- long n;
-
switch (TYPE(y)) {
case T_FIXNUM:
- n = FIX2LONG(y);
- if ((n > 0) != RBIGNUM_SIGN(x)) {
- if (n < 0) {
- n = -n;
- }
- return bigsub_int(x, n);
- }
- if (n < 0) {
- n = -n;
- }
- return bigadd_int(x, n);
-
+ y = rb_int2big(FIX2LONG(y));
+ /* fall through */
case T_BIGNUM:
return bignorm(bigadd(x, y, 1));
case T_FLOAT:
- return DBL2NUM(rb_big2dbl(x) + RFLOAT_VALUE(y));
+ return rb_float_new(rb_big2dbl(x) + RFLOAT(y)->value);
default:
- return rb_num_coerce_bin(x, y, '+');
+ return rb_num_coerce_bin(x, y);
}
}
@@ -1707,354 +1260,71 @@ rb_big_plus(VALUE x, VALUE y)
*/
VALUE
-rb_big_minus(VALUE x, VALUE y)
+rb_big_minus(x, y)
+ VALUE x, y;
{
- long n;
-
switch (TYPE(y)) {
case T_FIXNUM:
- n = FIX2LONG(y);
- if ((n > 0) != RBIGNUM_SIGN(x)) {
- if (n < 0) {
- n = -n;
- }
- return bigadd_int(x, n);
- }
- if (n < 0) {
- n = -n;
- }
- return bigsub_int(x, n);
-
+ y = rb_int2big(FIX2LONG(y));
+ /* fall through */
case T_BIGNUM:
return bignorm(bigadd(x, y, 0));
case T_FLOAT:
- return DBL2NUM(rb_big2dbl(x) - RFLOAT_VALUE(y));
+ return rb_float_new(rb_big2dbl(x) - RFLOAT(y)->value);
default:
- return rb_num_coerce_bin(x, y, '-');
+ return rb_num_coerce_bin(x, y);
}
}
-static long
-big_real_len(VALUE x)
-{
- long i = RBIGNUM_LEN(x);
- BDIGIT *xds = BDIGITS(x);
- while (--i && !xds[i]);
- return i + 1;
-}
-
-static VALUE
-bigmul1_single(VALUE x, VALUE y)
+VALUE
+rb_big_mul0(x, y)
+ VALUE x, y;
{
- BDIGIT_DBL n;
- VALUE z = bignew(2, RBIGNUM_SIGN(x)==RBIGNUM_SIGN(y));
- BDIGIT *xds, *yds, *zds;
+ long i, j;
+ BDIGIT_DBL n = 0;
+ VALUE z;
+ BDIGIT *zds;
- xds = BDIGITS(x);
- yds = BDIGITS(y);
- zds = BDIGITS(z);
+ if (FIXNUM_P(x)) x = rb_int2big(FIX2LONG(x));
+ switch (TYPE(y)) {
+ case T_FIXNUM:
+ y = rb_int2big(FIX2LONG(y));
+ break;
- n = (BDIGIT_DBL)xds[0] * yds[0];
- zds[0] = BIGLO(n);
- zds[1] = BIGDN(n);
+ case T_BIGNUM:
+ break;
- return z;
-}
+ case T_FLOAT:
+ return rb_float_new(rb_big2dbl(x) * RFLOAT(y)->value);
-static VALUE
-bigmul1_normal(VALUE x, VALUE y)
-{
- long xl = RBIGNUM_LEN(x), yl = RBIGNUM_LEN(y), i, j = xl + yl + 1;
- BDIGIT_DBL n = 0;
- VALUE z = bignew(j, RBIGNUM_SIGN(x)==RBIGNUM_SIGN(y));
- BDIGIT *xds, *yds, *zds;
+ default:
+ return rb_num_coerce_bin(x, y);
+ }
- xds = BDIGITS(x);
- yds = BDIGITS(y);
+ j = RBIGNUM(x)->len + RBIGNUM(y)->len + 1;
+ z = bignew(j, RBIGNUM(x)->sign==RBIGNUM(y)->sign);
zds = BDIGITS(z);
while (j--) zds[j] = 0;
- for (i = 0; i < xl; i++) {
- BDIGIT_DBL dd;
- dd = xds[i];
+ for (i = 0; i < RBIGNUM(x)->len; i++) {
+ BDIGIT_DBL dd = BDIGITS(x)[i];
if (dd == 0) continue;
n = 0;
- for (j = 0; j < yl; j++) {
- BDIGIT_DBL ee = n + (BDIGIT_DBL)dd * yds[j];
+ for (j = 0; j < RBIGNUM(y)->len; j++) {
+ BDIGIT_DBL ee = n + (BDIGIT_DBL)dd * BDIGITS(y)[j];
n = zds[i + j] + ee;
if (ee) zds[i + j] = BIGLO(n);
n = BIGDN(n);
}
if (n) {
- zds[i + j] = (BDIGIT)n;
- }
- }
- rb_thread_check_ints();
- return z;
-}
-
-static VALUE bigmul0(VALUE x, VALUE y);
-
-/* balancing multiplication by slicing larger argument */
-static VALUE
-bigmul1_balance(VALUE x, VALUE y)
-{
- VALUE z, t1, t2;
- long i, xn, yn, r, n;
- BDIGIT *yds, *zds, *t1ds;
-
- xn = RBIGNUM_LEN(x);
- yn = RBIGNUM_LEN(y);
- assert(2 * xn <= yn);
-
- z = bignew(xn + yn, RBIGNUM_SIGN(x)==RBIGNUM_SIGN(y));
- t1 = bignew(xn, 1);
-
- yds = BDIGITS(y);
- zds = BDIGITS(z);
- t1ds = BDIGITS(t1);
-
- for (i = 0; i < xn + yn; i++) zds[i] = 0;
-
- n = 0;
- while (yn > 0) {
- r = xn > yn ? yn : xn;
- MEMCPY(t1ds, yds + n, BDIGIT, r);
- RBIGNUM_SET_LEN(t1, r);
- t2 = bigmul0(x, t1);
- bigadd_core(zds + n, RBIGNUM_LEN(z) - n,
- BDIGITS(t2), big_real_len(t2),
- zds + n, RBIGNUM_LEN(z) - n);
- yn -= r;
- n += r;
- }
-
- return z;
-}
-
-/* split a bignum into high and low bignums */
-static void
-big_split(VALUE v, long n, volatile VALUE *ph, volatile VALUE *pl)
-{
- long hn = 0, ln = RBIGNUM_LEN(v);
- VALUE h, l;
- BDIGIT *vds = BDIGITS(v);
-
- if (ln > n) {
- hn = ln - n;
- ln = n;
- }
-
- while (--hn && !vds[hn + ln]);
- h = bignew(hn += 2, 1);
- MEMCPY(BDIGITS(h), vds + ln, BDIGIT, hn);
- BDIGITS(h)[hn - 1] = 0;
-
- while (--ln && !vds[ln]);
- l = bignew(ln += 2, 1);
- MEMCPY(BDIGITS(l), vds, BDIGIT, ln);
- BDIGITS(l)[ln - 1] = 0;
-
- *pl = l;
- *ph = h;
-}
-
-/* multiplication by karatsuba method */
-static VALUE
-bigmul1_karatsuba(VALUE x, VALUE y)
-{
- long i, n, xn, yn, t1n, t2n;
- VALUE xh, xl, yh, yl, z, t1, t2;
- BDIGIT *zds;
-
- xn = RBIGNUM_LEN(x);
- yn = RBIGNUM_LEN(y);
- n = yn / 2;
- big_split(x, n, &xh, &xl);
- if (x == y) {
- yh = xh; yl = xl;
- }
- else big_split(y, n, &yh, &yl);
-
- /* x = xh * b + xl
- * y = yh * b + yl
- *
- * Karatsuba method:
- * x * y = z2 * b^2 + z1 * b + z0
- * where
- * z2 = xh * yh
- * z0 = xl * yl
- * z1 = (xh + xl) * (yh + yl) - z2 - z0
- *
- * ref: http://en.wikipedia.org/wiki/Karatsuba_algorithm
- */
-
- /* allocate a result bignum */
- z = bignew(xn + yn, RBIGNUM_SIGN(x)==RBIGNUM_SIGN(y));
- zds = BDIGITS(z);
-
- /* t1 <- xh * yh */
- t1 = bigmul0(xh, yh);
- t1n = big_real_len(t1);
-
- /* copy t1 into high bytes of the result (z2) */
- MEMCPY(zds + 2 * n, BDIGITS(t1), BDIGIT, t1n);
- for (i = 2 * n + t1n; i < xn + yn; i++) zds[i] = 0;
-
- if (!BIGZEROP(xl) && !BIGZEROP(yl)) {
- /* t2 <- xl * yl */
- t2 = bigmul0(xl, yl);
- t2n = big_real_len(t2);
-
- /* copy t2 into low bytes of the result (z0) */
- MEMCPY(zds, BDIGITS(t2), BDIGIT, t2n);
- for (i = t2n; i < 2 * n; i++) zds[i] = 0;
-
- /* subtract t2 from middle bytes of the result (z1) */
- i = xn + yn - n;
- bigsub_core(zds + n, i, BDIGITS(t2), t2n, zds + n, i);
- }
- else {
- /* copy 0 into low bytes of the result (z0) */
- for (i = 0; i < 2 * n; i++) zds[i] = 0;
- }
-
- /* subtract t1 from middle bytes of the result (z1) */
- i = xn + yn - n;
- bigsub_core(zds + n, i, BDIGITS(t1), t1n, zds + n, i);
-
- /* xh <- xh + xl */
- if (RBIGNUM_LEN(xl) > RBIGNUM_LEN(xh)) {
- t1 = xl; xl = xh; xh = t1;
- }
- bigadd_core(BDIGITS(xh), RBIGNUM_LEN(xh),
- BDIGITS(xl), RBIGNUM_LEN(xl),
- BDIGITS(xh), RBIGNUM_LEN(xh));
-
- /* yh <- yh + yl */
- if (x != y) {
- if (RBIGNUM_LEN(yl) > RBIGNUM_LEN(yh)) {
- t1 = yl; yl = yh; yh = t1;
+ zds[i + j] = n;
}
- bigadd_core(BDIGITS(yh), RBIGNUM_LEN(yh),
- BDIGITS(yl), RBIGNUM_LEN(yl),
- BDIGITS(yh), RBIGNUM_LEN(yh));
}
- else yh = xh;
-
- /* t1 <- xh * yh */
- t1 = bigmul0(xh, yh);
-
- /* add t1 to middle bytes of the result (z1) */
- bigadd_core(zds + n, i, BDIGITS(t1), big_real_len(t1), zds + n, i);
-
- return z;
-}
-/* efficient squaring (2 times faster than normal multiplication)
- * ref: Handbook of Applied Cryptography, Algorithm 14.16
- * http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf
- */
-static VALUE
-bigsqr_fast(VALUE x)
-{
- long len = RBIGNUM_LEN(x), i, j;
- VALUE z = bignew(2 * len + 1, 1);
- BDIGIT *xds = BDIGITS(x), *zds = BDIGITS(z);
- BDIGIT_DBL c, v, w;
-
- for (i = 2 * len + 1; i--; ) zds[i] = 0;
- for (i = 0; i < len; i++) {
- v = (BDIGIT_DBL)xds[i];
- if (!v) continue;
- c = (BDIGIT_DBL)zds[i + i] + v * v;
- zds[i + i] = BIGLO(c);
- c = BIGDN(c);
- v *= 2;
- for (j = i + 1; j < len; j++) {
- w = (BDIGIT_DBL)xds[j];
- c += (BDIGIT_DBL)zds[i + j] + BIGLO(v) * w;
- zds[i + j] = BIGLO(c);
- c = BIGDN(c);
- if (BIGDN(v)) c += w;
- }
- if (c) {
- c += (BDIGIT_DBL)zds[i + len];
- zds[i + len] = BIGLO(c);
- c = BIGDN(c);
- }
- if (c) zds[i + len + 1] += (BDIGIT)c;
- }
return z;
}
-#define KARATSUBA_MUL_DIGITS 70
-
-
-/* determine whether a bignum is sparse or not by random sampling */
-static inline VALUE
-big_sparse_p(VALUE x)
-{
- long c = 0, n = RBIGNUM_LEN(x);
- unsigned long rb_rand_internal(unsigned long i);
-
- if ( BDIGITS(x)[rb_rand_internal(n / 2) + n / 4]) c++;
- if (c <= 1 && BDIGITS(x)[rb_rand_internal(n / 2) + n / 4]) c++;
- if (c <= 1 && BDIGITS(x)[rb_rand_internal(n / 2) + n / 4]) c++;
-
- return (c <= 1) ? Qtrue : Qfalse;
-}
-
-#if 0
-static void
-dump_bignum(VALUE x)
-{
- long i;
- printf("0x0");
- for (i = RBIGNUM_LEN(x); i--; ) {
- printf("_%08x", BDIGITS(x)[i]);
- }
- puts("");
-}
-#endif
-
-static VALUE
-bigmul0(VALUE x, VALUE y)
-{
- long xn, yn;
-
- xn = RBIGNUM_LEN(x);
- yn = RBIGNUM_LEN(y);
-
- /* make sure that y is longer than x */
- if (xn > yn) {
- VALUE t;
- long tn;
- t = x; x = y; y = t;
- tn = xn; xn = yn; yn = tn;
- }
- assert(xn <= yn);
-
- /* normal multiplication when x is small */
- if (xn < KARATSUBA_MUL_DIGITS) {
- normal:
- if (x == y) return bigsqr_fast(x);
- if (xn == 1 && yn == 1) return bigmul1_single(x, y);
- return bigmul1_normal(x, y);
- }
-
- /* normal multiplication when x or y is a sparse bignum */
- if (big_sparse_p(x)) goto normal;
- if (big_sparse_p(y)) return bigmul1_normal(y, x);
-
- /* balance multiplication by slicing y when x is much smaller than y */
- if (2 * xn <= yn) return bigmul1_balance(x, y);
-
- /* multiplication by karatsuba method */
- return bigmul1_karatsuba(x, y);
-}
-
/*
* call-seq:
* big * other => Numeric
@@ -2063,103 +1333,33 @@ bigmul0(VALUE x, VALUE y)
*/
VALUE
-rb_big_mul(VALUE x, VALUE y)
+rb_big_mul(x, y)
+ VALUE x, y;
{
- switch (TYPE(y)) {
- case T_FIXNUM:
- y = rb_int2big(FIX2LONG(y));
- break;
-
- case T_BIGNUM:
- break;
-
- case T_FLOAT:
- return DBL2NUM(rb_big2dbl(x) * RFLOAT_VALUE(y));
-
- default:
- return rb_num_coerce_bin(x, y, '*');
- }
-
- return bignorm(bigmul0(x, y));
-}
-
-struct big_div_struct {
- long nx, ny;
- BDIGIT *yds, *zds;
- VALUE stop;
-};
-
-static VALUE
-bigdivrem1(void *ptr)
-{
- struct big_div_struct *bds = (struct big_div_struct*)ptr;
- long nx = bds->nx, ny = bds->ny;
- long i, j, nyzero;
- BDIGIT *yds = bds->yds, *zds = bds->zds;
- BDIGIT_DBL t2;
- BDIGIT_DBL_SIGNED num;
- BDIGIT q;
-
- j = nx==ny?nx+1:nx;
- for (nyzero = 0; !yds[nyzero]; nyzero++);
- do {
- if (bds->stop) return Qnil;
- if (zds[j] == yds[ny-1]) q = (BDIGIT)BIGRAD-1;
- else q = (BDIGIT)((BIGUP(zds[j]) + zds[j-1])/yds[ny-1]);
- if (q) {
- i = nyzero; num = 0; t2 = 0;
- do { /* multiply and subtract */
- BDIGIT_DBL ee;
- t2 += (BDIGIT_DBL)yds[i] * q;
- ee = num - BIGLO(t2);
- num = (BDIGIT_DBL)zds[j - ny + i] + ee;
- if (ee) zds[j - ny + i] = BIGLO(num);
- num = BIGDN(num);
- t2 = BIGDN(t2);
- } while (++i < ny);
- num += zds[j - ny + i] - t2;/* borrow from high digit; don't update */
- while (num) { /* "add back" required */
- i = 0; num = 0; q--;
- do {
- BDIGIT_DBL ee = num + yds[i];
- num = (BDIGIT_DBL)zds[j - ny + i] + ee;
- if (ee) zds[j - ny + i] = BIGLO(num);
- num = BIGDN(num);
- } while (++i < ny);
- num--;
- }
- }
- zds[j] = q;
- } while (--j >= ny);
- return Qnil;
+ return bignorm(rb_big_mul0(x, y));
}
static void
-rb_big_stop(void *ptr)
+bigdivrem(x, y, divp, modp)
+ VALUE x, y;
+ VALUE *divp, *modp;
{
- VALUE *stop = (VALUE*)ptr;
- *stop = Qtrue;
-}
-
-static VALUE
-bigdivrem(VALUE x, VALUE y, volatile VALUE *divp, volatile VALUE *modp)
-{
- struct big_div_struct bds;
- long nx = RBIGNUM_LEN(x), ny = RBIGNUM_LEN(y);
+ long nx = RBIGNUM(x)->len, ny = RBIGNUM(y)->len;
long i, j;
- VALUE z, yy, zz;
+ VALUE yy, z;
BDIGIT *xds, *yds, *zds, *tds;
BDIGIT_DBL t2;
+ BDIGIT_DBL_SIGNED num;
BDIGIT dd, q;
if (BIGZEROP(y)) rb_num_zerodiv();
- xds = BDIGITS(x);
yds = BDIGITS(y);
- if (nx < ny || (nx == ny && xds[nx - 1] < yds[ny - 1])) {
+ if (nx < ny || (nx == ny && BDIGITS(x)[nx - 1] < BDIGITS(y)[ny - 1])) {
if (divp) *divp = rb_int2big(0);
if (modp) *modp = x;
- return Qnil;
+ return;
}
+ xds = BDIGITS(x);
if (ny == 1) {
dd = yds[0];
z = rb_big_clone(x);
@@ -2170,23 +1370,23 @@ bigdivrem(VALUE x, VALUE y, volatile VALUE *divp, volatile VALUE *modp)
zds[i] = (BDIGIT)(t2 / dd);
t2 %= dd;
}
- RBIGNUM_SET_SIGN(z, RBIGNUM_SIGN(x)==RBIGNUM_SIGN(y));
+ RBIGNUM(z)->sign = RBIGNUM(x)->sign==RBIGNUM(y)->sign;
if (modp) {
- *modp = rb_uint2big((VALUE)t2);
- RBIGNUM_SET_SIGN(*modp, RBIGNUM_SIGN(x));
+ *modp = rb_uint2big((unsigned long)t2);
+ RBIGNUM(*modp)->sign = RBIGNUM(x)->sign;
}
if (divp) *divp = z;
- return Qnil;
+ return;
}
- z = bignew(nx==ny?nx+2:nx+1, RBIGNUM_SIGN(x)==RBIGNUM_SIGN(y));
+ z = bignew(nx==ny?nx+2:nx+1, RBIGNUM(x)->sign==RBIGNUM(y)->sign);
zds = BDIGITS(z);
if (nx==ny) zds[nx+1] = 0;
while (!yds[ny-1]) ny--;
dd = 0;
q = yds[ny-1];
- while ((q & (1UL<<(BITSPERDIG-1))) == 0) {
- q <<= 1UL;
+ while ((q & (1U<<(BITSPERDIG-1))) == 0) {
+ q <<= 1;
dd++;
}
if (dd) {
@@ -2200,7 +1400,6 @@ bigdivrem(VALUE x, VALUE y, volatile VALUE *divp, volatile VALUE *modp)
t2 = BIGDN(t2);
}
yds = tds;
- RB_GC_GUARD(y) = yy;
j = 0;
t2 = 0;
while (j<nx) {
@@ -2216,29 +1415,45 @@ bigdivrem(VALUE x, VALUE y, volatile VALUE *divp, volatile VALUE *modp)
while (j--) zds[j] = xds[j];
}
- bds.nx = nx;
- bds.ny = ny;
- bds.zds = zds;
- bds.yds = yds;
- bds.stop = Qfalse;
- if (nx > 10000 || ny > 10000) {
- rb_thread_blocking_region(bigdivrem1, &bds, rb_big_stop, &bds.stop);
- }
- else {
- bigdivrem1(&bds);
- }
-
+ j = nx==ny?nx+1:nx;
+ do {
+ if (zds[j] == yds[ny-1]) q = BIGRAD-1;
+ else q = (BDIGIT)((BIGUP(zds[j]) + zds[j-1])/yds[ny-1]);
+ if (q) {
+ i = 0; num = 0; t2 = 0;
+ do { /* multiply and subtract */
+ BDIGIT_DBL ee;
+ t2 += (BDIGIT_DBL)yds[i] * q;
+ ee = num - BIGLO(t2);
+ num = (BDIGIT_DBL)zds[j - ny + i] + ee;
+ if (ee) zds[j - ny + i] = BIGLO(num);
+ num = BIGDN(num);
+ t2 = BIGDN(t2);
+ } while (++i < ny);
+ num += zds[j - ny + i] - t2;/* borrow from high digit; don't update */
+ while (num) { /* "add back" required */
+ i = 0; num = 0; q--;
+ do {
+ BDIGIT_DBL ee = num + yds[i];
+ num = (BDIGIT_DBL)zds[j - ny + i] + ee;
+ if (ee) zds[j - ny + i] = BIGLO(num);
+ num = BIGDN(num);
+ } while (++i < ny);
+ num--;
+ }
+ }
+ zds[j] = q;
+ } while (--j >= ny);
if (divp) { /* move quotient down in z */
- *divp = zz = rb_big_clone(z);
- zds = BDIGITS(zz);
+ *divp = rb_big_clone(z);
+ zds = BDIGITS(*divp);
j = (nx==ny ? nx+2 : nx+1) - ny;
for (i = 0;i < j;i++) zds[i] = zds[i+ny];
- if (!zds[i-1]) i--;
- RBIGNUM_SET_LEN(zz, i);
+ RBIGNUM(*divp)->len = i;
}
if (modp) { /* normalize remainder */
- *modp = zz = rb_big_clone(z);
- zds = BDIGITS(zz);
+ *modp = rb_big_clone(z);
+ zds = BDIGITS(*modp);
while (--ny && !zds[ny]); ++ny;
if (dd) {
t2 = 0; i = ny;
@@ -2249,31 +1464,40 @@ bigdivrem(VALUE x, VALUE y, volatile VALUE *divp, volatile VALUE *modp)
t2 = BIGUP(q);
}
}
- if (!zds[ny-1]) ny--;
- RBIGNUM_SET_LEN(zz, ny);
- RBIGNUM_SET_SIGN(zz, RBIGNUM_SIGN(x));
+ RBIGNUM(*modp)->len = ny;
+ RBIGNUM(*modp)->sign = RBIGNUM(x)->sign;
}
- return z;
}
static void
-bigdivmod(VALUE x, VALUE y, volatile VALUE *divp, volatile VALUE *modp)
+bigdivmod(x, y, divp, modp)
+ VALUE x, y;
+ VALUE *divp, *modp;
{
VALUE mod;
bigdivrem(x, y, divp, &mod);
- if (RBIGNUM_SIGN(x) != RBIGNUM_SIGN(y) && !BIGZEROP(mod)) {
+ if (RBIGNUM(x)->sign != RBIGNUM(y)->sign && !BIGZEROP(mod)) {
if (divp) *divp = bigadd(*divp, rb_int2big(1), 0);
if (modp) *modp = bigadd(mod, y, 1);
}
- else if (modp) {
- *modp = mod;
+ else {
+ if (divp) *divp = *divp;
+ if (modp) *modp = mod;
}
}
+/*
+ * call-seq:
+ * big / other => Numeric
+ * big.div(other) => Numeric
+ *
+ * Divides big by other, returning the result.
+ */
static VALUE
-rb_big_divide(VALUE x, VALUE y, ID op)
+rb_big_div(x, y)
+ VALUE x, y;
{
VALUE z;
@@ -2285,19 +1509,8 @@ rb_big_divide(VALUE x, VALUE y, ID op)
case T_BIGNUM:
break;
- case T_FLOAT:
- {
- double div = rb_big2dbl(x) / RFLOAT_VALUE(y);
- if (op == '/') {
- return DBL2NUM(div);
- }
- else {
- return rb_dbl2big(div);
- }
- }
-
default:
- return rb_num_coerce_bin(x, y, op);
+ return rb_num_coerce_bin(x, y);
}
bigdivmod(x, y, &z, 0);
@@ -2306,34 +1519,6 @@ rb_big_divide(VALUE x, VALUE y, ID op)
/*
* call-seq:
- * big / other => Numeric
- *
- * Performs division: the class of the resulting object depends on
- * the class of <code>numeric</code> and on the magnitude of the
- * result.
- */
-
-VALUE
-rb_big_div(VALUE x, VALUE y)
-{
- return rb_big_divide(x, y, '/');
-}
-
-/*
- * call-seq:
- * big.div(other) => integer
- *
- * Performs integer division: returns integer value.
- */
-
-VALUE
-rb_big_idiv(VALUE x, VALUE y)
-{
- return rb_big_divide(x, y, rb_intern("div"));
-}
-
-/*
- * call-seq:
* big % other => Numeric
* big.modulo(other) => Numeric
*
@@ -2341,8 +1526,9 @@ rb_big_idiv(VALUE x, VALUE y)
* information.
*/
-VALUE
-rb_big_modulo(VALUE x, VALUE y)
+static VALUE
+rb_big_modulo(x, y)
+ VALUE x, y;
{
VALUE z;
@@ -2355,7 +1541,7 @@ rb_big_modulo(VALUE x, VALUE y)
break;
default:
- return rb_num_coerce_bin(x, y, '%');
+ return rb_num_coerce_bin(x, y);
}
bigdivmod(x, y, 0, &z);
@@ -2372,7 +1558,8 @@ rb_big_modulo(VALUE x, VALUE y)
* -1234567890987654321.remainder(13731.24) #=> -9906.22531493148
*/
static VALUE
-rb_big_remainder(VALUE x, VALUE y)
+rb_big_remainder(x, y)
+ VALUE x, y;
{
VALUE z;
@@ -2385,41 +1572,13 @@ rb_big_remainder(VALUE x, VALUE y)
break;
default:
- return rb_num_coerce_bin(x, y, rb_intern("remainder"));
+ return rb_num_coerce_bin(x, y);
}
bigdivrem(x, y, 0, &z);
return bignorm(z);
}
-/*
- * call-seq:
- * big.divmod(numeric) => array
- *
- * See <code>Numeric#divmod</code>.
- *
- */
-VALUE
-rb_big_divmod(VALUE x, VALUE y)
-{
- VALUE div, mod;
-
- switch (TYPE(y)) {
- case T_FIXNUM:
- y = rb_int2big(FIX2LONG(y));
- break;
-
- case T_BIGNUM:
- break;
-
- default:
- return rb_num_coerce_bin(x, y, rb_intern("divmod"));
- }
- bigdivmod(x, y, &div, &mod);
-
- return rb_assoc_new(bignorm(div), bignorm(mod));
-}
-
static int
bdigbitsize(BDIGIT x)
{
@@ -2441,120 +1600,163 @@ bdigbitsize(BDIGIT x)
return size;
}
-static VALUE big_lshift(VALUE, unsigned long);
-static VALUE big_rshift(VALUE, unsigned long);
+static VALUE big_lshift _((VALUE, unsigned long));
+static VALUE big_rshift _((VALUE, unsigned long));
-static VALUE
-big_shift(VALUE x, long n)
+static VALUE big_shift(x, n)
+ VALUE x;
+ int n;
{
if (n < 0)
- return big_lshift(x, (unsigned long)-n);
+ return big_lshift(x, (unsigned int)n);
else if (n > 0)
- return big_rshift(x, (unsigned long)n);
+ return big_rshift(x, (unsigned int)n);
return x;
}
-static VALUE
-big_fdiv(VALUE x, VALUE y)
+/*
+ * call-seq:
+ * big.divmod(numeric) => array
+ *
+ * See <code>Numeric#divmod</code>.
+ *
+ */
+VALUE
+rb_big_divmod(x, y)
+ VALUE x, y;
{
-#define DBL_BIGDIG ((DBL_MANT_DIG + BITSPERDIG) / BITSPERDIG)
- VALUE z;
- long l, ex, ey;
- int i;
-
- bigtrunc(x);
- l = RBIGNUM_LEN(x) - 1;
- ex = l * BITSPERDIG;
- ex += bdigbitsize(BDIGITS(x)[l]);
- ex -= 2 * DBL_BIGDIG * BITSPERDIG;
- if (ex) x = big_shift(x, ex);
+ VALUE div, mod;
switch (TYPE(y)) {
case T_FIXNUM:
y = rb_int2big(FIX2LONG(y));
- case T_BIGNUM: {
- bigtrunc(y);
- l = RBIGNUM_LEN(y) - 1;
- ey = l * BITSPERDIG;
- ey += bdigbitsize(BDIGITS(y)[l]);
- ey -= DBL_BIGDIG * BITSPERDIG;
- if (ey) y = big_shift(y, ey);
- bignum:
- bigdivrem(x, y, &z, 0);
- l = ex - ey;
-#if SIZEOF_LONG > SIZEOF_INT
- {
- /* Visual C++ can't be here */
- if (l > INT_MAX) return DBL2NUM(ruby_div0(1.0));
- if (l < INT_MIN) return DBL2NUM(0.0);
- }
-#endif
- return DBL2NUM(ldexp(big2dbl(z), (int)l));
- }
- case T_FLOAT:
- y = dbl2big(ldexp(frexp(RFLOAT_VALUE(y), &i), DBL_MANT_DIG));
- ey = i - DBL_MANT_DIG;
- goto bignum;
+ break;
+
+ case T_BIGNUM:
+ break;
+
+ default:
+ return rb_num_coerce_bin(x, y);
}
- rb_bug("big_fdiv");
- /* NOTREACHED */
+ bigdivmod(x, y, &div, &mod);
+
+ return rb_assoc_new(bignorm(div), bignorm(mod));
}
/*
* call-seq:
- * big.fdiv(numeric) -> float
+ * big.quo(numeric) -> float
+ * big.fdiv(numeric) -> float
*
* Returns the floating point result of dividing <i>big</i> by
* <i>numeric</i>.
*
- * -1234567890987654321.fdiv(13731) #=> -89910996357705.5
- * -1234567890987654321.fdiv(13731.24) #=> -89909424858035.7
+ * -1234567890987654321.quo(13731) #=> -89910996357705.5
+ * -1234567890987654321.quo(13731.24) #=> -89909424858035.7
*
*/
-
-VALUE
-rb_big_fdiv(VALUE x, VALUE y)
+static VALUE
+rb_big_quo(x, y)
+ VALUE x, y;
{
- double dx, dy;
+ double dx = big2dbl(x);
+ double dy;
- dx = big2dbl(x);
+ if (isinf(dx)) {
+#define DBL_BIGDIG ((DBL_MANT_DIG + BITSPERDIG) / BITSPERDIG)
+ VALUE z;
+ int ex, ey;
+
+ ex = (RBIGNUM(bigtrunc(x))->len - 1) * BITSPERDIG;
+ ex += bdigbitsize(BDIGITS(x)[RBIGNUM(x)->len - 1]);
+ ex -= 2 * DBL_BIGDIG * BITSPERDIG;
+ if (ex) x = big_shift(x, ex);
+
+ switch (TYPE(y)) {
+ case T_FIXNUM:
+ y = rb_int2big(FIX2LONG(y));
+ case T_BIGNUM: {
+ ey = (RBIGNUM(bigtrunc(y))->len - 1) * BITSPERDIG;
+ ey += bdigbitsize(BDIGITS(y)[RBIGNUM(y)->len - 1]);
+ ey -= DBL_BIGDIG * BITSPERDIG;
+ if (ey) y = big_shift(y, ey);
+ bignum:
+ bigdivrem(x, y, &z, 0);
+ return rb_float_new(ldexp(big2dbl(z), ex - ey));
+ }
+ case T_FLOAT:
+ y = dbl2big(ldexp(frexp(RFLOAT(y)->value, &ey), DBL_MANT_DIG));
+ ey -= DBL_MANT_DIG;
+ goto bignum;
+ }
+ }
switch (TYPE(y)) {
case T_FIXNUM:
dy = (double)FIX2LONG(y);
- if (isinf(dx))
- return big_fdiv(x, y);
break;
case T_BIGNUM:
dy = rb_big2dbl(y);
- if (isinf(dx) || isinf(dy))
- return big_fdiv(x, y);
break;
case T_FLOAT:
- dy = RFLOAT_VALUE(y);
- if (isnan(dy))
- return y;
- if (isinf(dx))
- return big_fdiv(x, y);
+ dy = RFLOAT(y)->value;
break;
default:
- return rb_num_coerce_bin(x, y, rb_intern("fdiv"));
+ return rb_num_coerce_bin(x, y);
}
- return DBL2NUM(dx / dy);
+ return rb_float_new(dx / dy);
}
static VALUE
-bigsqr(VALUE x)
+bigsqr(x)
+ VALUE x;
{
- return bigtrunc(bigmul0(x, x));
+ long len = RBIGNUM(x)->len, k = len / 2, i;
+ VALUE a, b, a2, z;
+ BDIGIT_DBL num;
+
+ if (len < 4000 / BITSPERDIG) {
+ return rb_big_mul0(x, x);
+ }
+
+ a = bignew(len - k, 1);
+ MEMCPY(BDIGITS(a), BDIGITS(x) + k, BDIGIT, len - k);
+ b = bignew(k, 1);
+ MEMCPY(BDIGITS(b), BDIGITS(x), BDIGIT, k);
+
+ a2 = bigtrunc(bigsqr(a));
+ z = bigsqr(b);
+ REALLOC_N(RBIGNUM(z)->digits, BDIGIT, (len = 2 * k + RBIGNUM(a2)->len) + 1);
+ while (RBIGNUM(z)->len < 2 * k) BDIGITS(z)[RBIGNUM(z)->len++] = 0;
+ MEMCPY(BDIGITS(z) + 2 * k, BDIGITS(a2), BDIGIT, RBIGNUM(a2)->len);
+ RBIGNUM(z)->len = len;
+ a2 = bigtrunc(rb_big_mul0(a, b));
+ len = RBIGNUM(a2)->len;
+ for (i = 0, num = 0; i < len; i++) {
+ num += (BDIGIT_DBL)BDIGITS(z)[i + k] + ((BDIGIT_DBL)BDIGITS(a2)[i] << 1);
+ BDIGITS(z)[i + k] = BIGLO(num);
+ num = BIGDN(num);
+ }
+ if (num) {
+ len = RBIGNUM(z)->len;
+ for (i += k; i < len && num; ++i) {
+ num += (BDIGIT_DBL)BDIGITS(z)[i];
+ BDIGITS(z)[i] = BIGLO(num);
+ num = BIGDN(num);
+ }
+ if (num) {
+ BDIGITS(z)[RBIGNUM(z)->len++] = BIGLO(num);
+ }
+ }
+ return bigtrunc(z);
}
/*
* call-seq:
- * big ** exponent => numeric
+ * big ** exponent #=> numeric
*
* Raises _big_ to the _exponent_ power (which may be an integer, float,
* or anything that will coerce to a number). The result may be
@@ -2566,17 +1768,16 @@ bigsqr(VALUE x)
*/
VALUE
-rb_big_pow(VALUE x, VALUE y)
+rb_big_pow(x, y)
+ VALUE x, y;
{
double d;
- SIGNED_VALUE yy;
+ long yy;
if (y == INT2FIX(0)) return INT2FIX(1);
switch (TYPE(y)) {
case T_FLOAT:
- d = RFLOAT_VALUE(y);
- if ((!RBIGNUM_SIGN(x) && !BIGZEROP(x)) && d != round(d))
- return rb_funcall(rb_complex_raw1(x), rb_intern("**"), 1, y);
+ d = RFLOAT(y)->value;
break;
case T_BIGNUM:
@@ -2586,91 +1787,32 @@ rb_big_pow(VALUE x, VALUE y)
case T_FIXNUM:
yy = FIX2LONG(y);
-
- if (yy < 0)
- return rb_funcall(rb_rational_raw1(x), rb_intern("**"), 1, y);
- else {
+ if (yy > 0) {
VALUE z = 0;
- SIGNED_VALUE mask;
+ long mask;
const long BIGLEN_LIMIT = 1024*1024 / SIZEOF_BDIGITS;
- if ((RBIGNUM_LEN(x) > BIGLEN_LIMIT) ||
- (RBIGNUM_LEN(x) > BIGLEN_LIMIT / yy)) {
+ if ((RBIGNUM(x)->len > BIGLEN_LIMIT) ||
+ (RBIGNUM(x)->len > BIGLEN_LIMIT / yy)) {
rb_warn("in a**b, b may be too big");
d = (double)yy;
break;
}
for (mask = FIXNUM_MAX + 1; mask; mask >>= 1) {
- if (z) z = bigsqr(z);
+ if (z) z = bigtrunc(bigsqr(z));
if (yy & mask) {
- z = z ? bigtrunc(bigmul0(z, x)) : x;
+ z = z ? bigtrunc(rb_big_mul0(z, x)) : x;
}
}
return bignorm(z);
}
- /* NOTREACHED */
+ d = (double)yy;
break;
default:
- return rb_num_coerce_bin(x, y, rb_intern("**"));
- }
- return DBL2NUM(pow(rb_big2dbl(x), d));
-}
-
-static inline VALUE
-bit_coerce(VALUE x)
-{
- while (!FIXNUM_P(x) && TYPE(x) != T_BIGNUM) {
- if (TYPE(x) == T_FLOAT) {
- rb_raise(rb_eTypeError, "can't convert Float into Integer");
- }
- x = rb_to_int(x);
- }
- return x;
-}
-
-static VALUE
-bigand_int(VALUE x, long y)
-{
- VALUE z;
- BDIGIT *xds, *zds;
- long xn, zn;
- long i;
- char sign;
-
- if (y == 0) return INT2FIX(0);
- sign = (y > 0);
- xds = BDIGITS(x);
- zn = xn = RBIGNUM_LEN(x);
-#if SIZEOF_BDIGITS == SIZEOF_LONG
- if (sign) {
- y &= xds[0];
- return LONG2NUM(y);
- }
-#endif
-
- z = bignew(zn, RBIGNUM_SIGN(x) || sign);
- zds = BDIGITS(z);
-
-#if SIZEOF_BDIGITS == SIZEOF_LONG
- i = 1;
- zds[0] = xds[0] & y;
-#else
- {
- BDIGIT_DBL num = y;
-
- for (i=0; i<(int)(sizeof(y)/sizeof(BDIGIT)); i++) {
- zds[i] = xds[i] & BIGLO(num);
- num = BIGDN(num);
- }
- }
-#endif
- while (i < xn) {
- zds[i] = sign?0:xds[i];
- i++;
+ return rb_num_coerce_bin(x, y);
}
- if (!RBIGNUM_SIGN(z)) get2comp(z);
- return bignorm(z);
+ return rb_float_new(pow(rb_big2dbl(x), d));
}
/*
@@ -2681,7 +1823,8 @@ bigand_int(VALUE x, long y)
*/
VALUE
-rb_big_and(VALUE xx, VALUE yy)
+rb_big_and(xx, yy)
+ VALUE xx, yy;
{
volatile VALUE x, y, z;
BDIGIT *ds1, *ds2, *zds;
@@ -2689,33 +1832,33 @@ rb_big_and(VALUE xx, VALUE yy)
char sign;
x = xx;
- y = bit_coerce(yy);
- if (!RBIGNUM_SIGN(x)) {
- x = rb_big_clone(x);
- get2comp(x);
- }
+ y = rb_to_int(yy);
if (FIXNUM_P(y)) {
- return bigand_int(x, FIX2LONG(y));
+ y = rb_int2big(FIX2LONG(y));
}
- if (!RBIGNUM_SIGN(y)) {
+ if (!RBIGNUM(y)->sign) {
y = rb_big_clone(y);
get2comp(y);
}
- if (RBIGNUM_LEN(x) > RBIGNUM_LEN(y)) {
- l1 = RBIGNUM_LEN(y);
- l2 = RBIGNUM_LEN(x);
+ if (!RBIGNUM(x)->sign) {
+ x = rb_big_clone(x);
+ get2comp(x);
+ }
+ if (RBIGNUM(x)->len > RBIGNUM(y)->len) {
+ l1 = RBIGNUM(y)->len;
+ l2 = RBIGNUM(x)->len;
ds1 = BDIGITS(y);
ds2 = BDIGITS(x);
- sign = RBIGNUM_SIGN(y);
+ sign = RBIGNUM(y)->sign;
}
else {
- l1 = RBIGNUM_LEN(x);
- l2 = RBIGNUM_LEN(y);
+ l1 = RBIGNUM(x)->len;
+ l2 = RBIGNUM(y)->len;
ds1 = BDIGITS(x);
ds2 = BDIGITS(y);
- sign = RBIGNUM_SIGN(x);
+ sign = RBIGNUM(x)->sign;
}
- z = bignew(l2, RBIGNUM_SIGN(x) || RBIGNUM_SIGN(y));
+ z = bignew(l2, RBIGNUM(x)->sign || RBIGNUM(y)->sign);
zds = BDIGITS(z);
for (i=0; i<l1; i++) {
@@ -2724,43 +1867,7 @@ rb_big_and(VALUE xx, VALUE yy)
for (; i<l2; i++) {
zds[i] = sign?0:ds2[i];
}
- if (!RBIGNUM_SIGN(z)) get2comp(z);
- return bignorm(z);
-}
-
-static VALUE
-bigor_int(VALUE x, long y)
-{
- VALUE z;
- BDIGIT *xds, *zds;
- long xn, zn;
- long i;
- char sign;
-
- sign = (y >= 0);
- xds = BDIGITS(x);
- zn = xn = RBIGNUM_LEN(x);
- z = bignew(zn, RBIGNUM_SIGN(x) && sign);
- zds = BDIGITS(z);
-
-#if SIZEOF_BDIGITS == SIZEOF_LONG
- i = 1;
- zds[0] = xds[0] | y;
-#else
- {
- BDIGIT_DBL num = y;
-
- for (i=0; i<(int)(sizeof(y)/sizeof(BDIGIT)); i++) {
- zds[i] = xds[i] | BIGLO(num);
- num = BIGDN(num);
- }
- }
-#endif
- while (i < xn) {
- zds[i] = sign?xds[i]:(BDIGIT)(BIGRAD-1);
- i++;
- }
- if (!RBIGNUM_SIGN(z)) get2comp(z);
+ if (!RBIGNUM(z)->sign) get2comp(z);
return bignorm(z);
}
@@ -2772,7 +1879,8 @@ bigor_int(VALUE x, long y)
*/
VALUE
-rb_big_or(VALUE xx, VALUE yy)
+rb_big_or(xx, yy)
+ VALUE xx, yy;
{
volatile VALUE x, y, z;
BDIGIT *ds1, *ds2, *zds;
@@ -2780,81 +1888,46 @@ rb_big_or(VALUE xx, VALUE yy)
char sign;
x = xx;
- y = bit_coerce(yy);
-
- if (!RBIGNUM_SIGN(x)) {
- x = rb_big_clone(x);
- get2comp(x);
- }
+ y = rb_to_int(yy);
if (FIXNUM_P(y)) {
- return bigor_int(x, FIX2LONG(y));
+ y = rb_int2big(FIX2LONG(y));
}
- if (!RBIGNUM_SIGN(y)) {
+ if (!RBIGNUM(y)->sign) {
y = rb_big_clone(y);
get2comp(y);
}
- if (RBIGNUM_LEN(x) > RBIGNUM_LEN(y)) {
- l1 = RBIGNUM_LEN(y);
- l2 = RBIGNUM_LEN(x);
+ if (!RBIGNUM(x)->sign) {
+ x = rb_big_clone(x);
+ get2comp(x);
+ }
+ if (RBIGNUM(x)->len > RBIGNUM(y)->len) {
+ l1 = RBIGNUM(y)->len;
+ l2 = RBIGNUM(x)->len;
ds1 = BDIGITS(y);
ds2 = BDIGITS(x);
- sign = RBIGNUM_SIGN(y);
+ sign = RBIGNUM(y)->sign;
}
else {
- l1 = RBIGNUM_LEN(x);
- l2 = RBIGNUM_LEN(y);
+ l1 = RBIGNUM(x)->len;
+ l2 = RBIGNUM(y)->len;
ds1 = BDIGITS(x);
ds2 = BDIGITS(y);
- sign = RBIGNUM_SIGN(x);
+ sign = RBIGNUM(x)->sign;
}
- z = bignew(l2, RBIGNUM_SIGN(x) && RBIGNUM_SIGN(y));
+ z = bignew(l2, RBIGNUM(x)->sign && RBIGNUM(y)->sign);
zds = BDIGITS(z);
for (i=0; i<l1; i++) {
zds[i] = ds1[i] | ds2[i];
}
for (; i<l2; i++) {
- zds[i] = sign?ds2[i]:(BDIGIT)(BIGRAD-1);
+ zds[i] = sign?ds2[i]:(BIGRAD-1);
}
- if (!RBIGNUM_SIGN(z)) get2comp(z);
- return bignorm(z);
-}
-
-static VALUE
-bigxor_int(VALUE x, long y)
-{
- VALUE z;
- BDIGIT *xds, *zds;
- long xn, zn;
- long i;
- char sign;
-
- sign = (y >= 0) ? 1 : 0;
- xds = BDIGITS(x);
- zn = xn = RBIGNUM_LEN(x);
- z = bignew(zn, !(RBIGNUM_SIGN(x) ^ sign));
- zds = BDIGITS(z);
+ if (!RBIGNUM(z)->sign) get2comp(z);
-#if SIZEOF_BDIGITS == SIZEOF_LONG
- i = 1;
- zds[0] = xds[0] ^ y;
-#else
- {
- BDIGIT_DBL num = y;
-
- for (i=0; i<(int)(sizeof(y)/sizeof(BDIGIT)); i++) {
- zds[i] = xds[i] ^ BIGLO(num);
- num = BIGDN(num);
- }
- }
-#endif
- while (i < xn) {
- zds[i] = sign?xds[i]:~xds[i];
- i++;
- }
- if (!RBIGNUM_SIGN(z)) get2comp(z);
return bignorm(z);
}
+
/*
* call-seq:
* big ^ numeric => integer
@@ -2863,7 +1936,8 @@ bigxor_int(VALUE x, long y)
*/
VALUE
-rb_big_xor(VALUE xx, VALUE yy)
+rb_big_xor(xx, yy)
+ VALUE xx, yy;
{
volatile VALUE x, y;
VALUE z;
@@ -2872,36 +1946,35 @@ rb_big_xor(VALUE xx, VALUE yy)
char sign;
x = xx;
- y = bit_coerce(yy);
-
- if (!RBIGNUM_SIGN(x)) {
- x = rb_big_clone(x);
- get2comp(x);
- }
+ y = rb_to_int(yy);
if (FIXNUM_P(y)) {
- return bigxor_int(x, FIX2LONG(y));
+ y = rb_int2big(FIX2LONG(y));
}
- if (!RBIGNUM_SIGN(y)) {
+ if (!RBIGNUM(y)->sign) {
y = rb_big_clone(y);
get2comp(y);
}
- if (RBIGNUM_LEN(x) > RBIGNUM_LEN(y)) {
- l1 = RBIGNUM_LEN(y);
- l2 = RBIGNUM_LEN(x);
+ if (!RBIGNUM(x)->sign) {
+ x = rb_big_clone(x);
+ get2comp(x);
+ }
+ if (RBIGNUM(x)->len > RBIGNUM(y)->len) {
+ l1 = RBIGNUM(y)->len;
+ l2 = RBIGNUM(x)->len;
ds1 = BDIGITS(y);
ds2 = BDIGITS(x);
- sign = RBIGNUM_SIGN(y);
+ sign = RBIGNUM(y)->sign;
}
else {
- l1 = RBIGNUM_LEN(x);
- l2 = RBIGNUM_LEN(y);
+ l1 = RBIGNUM(x)->len;
+ l2 = RBIGNUM(y)->len;
ds1 = BDIGITS(x);
ds2 = BDIGITS(y);
- sign = RBIGNUM_SIGN(x);
+ sign = RBIGNUM(x)->sign;
}
- RBIGNUM_SET_SIGN(x, RBIGNUM_SIGN(x)?1:0);
- RBIGNUM_SET_SIGN(y, RBIGNUM_SIGN(y)?1:0);
- z = bignew(l2, !(RBIGNUM_SIGN(x) ^ RBIGNUM_SIGN(y)));
+ RBIGNUM(x)->sign = RBIGNUM(x)->sign?1:0;
+ RBIGNUM(y)->sign = RBIGNUM(y)->sign?1:0;
+ z = bignew(l2, !(RBIGNUM(x)->sign ^ RBIGNUM(y)->sign));
zds = BDIGITS(z);
for (i=0; i<l1; i++) {
@@ -2910,7 +1983,7 @@ rb_big_xor(VALUE xx, VALUE yy)
for (; i<l2; i++) {
zds[i] = sign?ds2[i]:~ds2[i];
}
- if (!RBIGNUM_SIGN(z)) get2comp(z);
+ if (!RBIGNUM(z)->sign) get2comp(z);
return bignorm(z);
}
@@ -2918,9 +1991,9 @@ rb_big_xor(VALUE xx, VALUE yy)
static VALUE
check_shiftdown(VALUE y, VALUE x)
{
- if (!RBIGNUM_LEN(x)) return INT2FIX(0);
- if (RBIGNUM_LEN(y) > SIZEOF_LONG / SIZEOF_BDIGITS) {
- return RBIGNUM_SIGN(x) ? INT2FIX(0) : INT2FIX(-1);
+ if (!RBIGNUM(x)->len) return INT2FIX(0);
+ if (RBIGNUM(y)->len > SIZEOF_LONG / SIZEOF_BDIGITS) {
+ return RBIGNUM(x)->sign ? INT2FIX(0) : INT2FIX(-1);
}
return Qnil;
}
@@ -2933,7 +2006,8 @@ check_shiftdown(VALUE y, VALUE x)
*/
VALUE
-rb_big_lshift(VALUE x, VALUE y)
+rb_big_lshift(x, y)
+ VALUE x, y;
{
long shift;
int neg = 0;
@@ -2948,33 +2022,35 @@ rb_big_lshift(VALUE x, VALUE y)
break;
}
else if (TYPE(y) == T_BIGNUM) {
- if (!RBIGNUM_SIGN(y)) {
+ if (!RBIGNUM(y)->sign) {
VALUE t = check_shiftdown(y, x);
if (!NIL_P(t)) return t;
neg = 1;
}
- shift = big2ulong(y, "long", TRUE);
+ shift = big2ulong(y, "long");
break;
}
y = rb_to_int(y);
}
- x = neg ? big_rshift(x, shift) : big_lshift(x, shift);
- return bignorm(x);
+ if (neg) return big_rshift(x, shift);
+ return big_lshift(x, shift);
}
static VALUE
-big_lshift(VALUE x, unsigned long shift)
+big_lshift(x, shift)
+ VALUE x;
+ unsigned long shift;
{
BDIGIT *xds, *zds;
long s1 = shift/BITSPERDIG;
- int s2 = (int)(shift%BITSPERDIG);
+ int s2 = shift%BITSPERDIG;
VALUE z;
BDIGIT_DBL num = 0;
long len, i;
- len = RBIGNUM_LEN(x);
- z = bignew(len+s1+1, RBIGNUM_SIGN(x));
+ len = RBIGNUM(x)->len;
+ z = bignew(len+s1+1, RBIGNUM(x)->sign);
zds = BDIGITS(z);
for (i=0; i<s1; i++) {
*zds++ = 0;
@@ -2986,7 +2062,7 @@ big_lshift(VALUE x, unsigned long shift)
num = BIGDN(num);
}
*zds = BIGLO(num);
- return z;
+ return bignorm(z);
}
/*
@@ -2997,7 +2073,8 @@ big_lshift(VALUE x, unsigned long shift)
*/
VALUE
-rb_big_rshift(VALUE x, VALUE y)
+rb_big_rshift(x, y)
+ VALUE x, y;
{
long shift;
int neg = 0;
@@ -3012,52 +2089,54 @@ rb_big_rshift(VALUE x, VALUE y)
break;
}
else if (TYPE(y) == T_BIGNUM) {
- if (RBIGNUM_SIGN(y)) {
+ if (RBIGNUM(y)->sign) {
VALUE t = check_shiftdown(y, x);
if (!NIL_P(t)) return t;
}
else {
neg = 1;
}
- shift = big2ulong(y, "long", TRUE);
+ shift = big2ulong(y, "long");
break;
}
y = rb_to_int(y);
}
- x = neg ? big_lshift(x, shift) : big_rshift(x, shift);
- return bignorm(x);
+ if (neg) return big_lshift(x, shift);
+ return big_rshift(x, shift);
}
static VALUE
-big_rshift(VALUE x, unsigned long shift)
+big_rshift(x, shift)
+ VALUE x;
+ unsigned long shift;
{
BDIGIT *xds, *zds;
long s1 = shift/BITSPERDIG;
- int s2 = (int)(shift%BITSPERDIG);
+ int s2 = shift%BITSPERDIG;
VALUE z;
BDIGIT_DBL num = 0;
long i, j;
volatile VALUE save_x;
- if (s1 > RBIGNUM_LEN(x)) {
- if (RBIGNUM_SIGN(x))
+ if (s1 > RBIGNUM(x)->len) {
+ if (RBIGNUM(x)->sign)
return INT2FIX(0);
else
return INT2FIX(-1);
}
- if (!RBIGNUM_SIGN(x)) {
+ if (!RBIGNUM(x)->sign) {
save_x = x = rb_big_clone(x);
get2comp(x);
}
xds = BDIGITS(x);
- i = RBIGNUM_LEN(x); j = i - s1;
+ i = RBIGNUM(x)->len; j = i - s1;
if (j == 0) {
- if (RBIGNUM_SIGN(x)) return INT2FIX(0);
+ if (RBIGNUM(x)->sign) return INT2FIX(0);
else return INT2FIX(-1);
}
- z = bignew(j, RBIGNUM_SIGN(x));
- if (!RBIGNUM_SIGN(x)) {
+ z = bignew(j, RBIGNUM(x)->sign);
+ if (!RBIGNUM(x)->sign) {
num = ((BDIGIT_DBL)~0) << BITSPERDIG;
}
zds = BDIGITS(z);
@@ -3066,10 +2145,10 @@ big_rshift(VALUE x, unsigned long shift)
zds[j] = BIGLO(num);
num = BIGUP(xds[i]);
}
- if (!RBIGNUM_SIGN(x)) {
+ if (!RBIGNUM(x)->sign) {
get2comp(z);
}
- return z;
+ return bignorm(z);
}
/*
@@ -3092,22 +2171,22 @@ big_rshift(VALUE x, unsigned long shift)
*/
static VALUE
-rb_big_aref(VALUE x, VALUE y)
+rb_big_aref(x, y)
+ VALUE x, y;
{
BDIGIT *xds;
BDIGIT_DBL num;
- VALUE shift;
+ unsigned long shift;
long i, s1, s2;
if (TYPE(y) == T_BIGNUM) {
- if (!RBIGNUM_SIGN(y))
+ if (!RBIGNUM(y)->sign)
return INT2FIX(0);
- bigtrunc(y);
- if (RBIGNUM_LEN(y) > DIGSPERLONG) {
+ if (RBIGNUM(bigtrunc(y))->len > SIZEOF_LONG/SIZEOF_BDIGITS) {
out_of_range:
- return RBIGNUM_SIGN(x) ? INT2FIX(0) : INT2FIX(1);
+ return RBIGNUM(x)->sign ? INT2FIX(0) : INT2FIX(1);
}
- shift = big2ulong(y, "long", FALSE);
+ shift = big2ulong(y, "long");
}
else {
i = NUM2LONG(y);
@@ -3117,8 +2196,8 @@ rb_big_aref(VALUE x, VALUE y)
s1 = shift/BITSPERDIG;
s2 = shift%BITSPERDIG;
- if (s1 >= RBIGNUM_LEN(x)) goto out_of_range;
- if (!RBIGNUM_SIGN(x)) {
+ if (s1 >= RBIGNUM(x)->len) goto out_of_range;
+ if (!RBIGNUM(x)->sign) {
xds = BDIGITS(x);
i = 0; num = 1;
while (num += ~xds[i], ++i <= s1) {
@@ -3141,12 +2220,17 @@ rb_big_aref(VALUE x, VALUE y)
*/
static VALUE
-rb_big_hash(VALUE x)
+rb_big_hash(x)
+ VALUE x;
{
- int hash;
+ long i, len, key;
+ BDIGIT *digits;
- hash = rb_memhash(BDIGITS(x), sizeof(BDIGIT)*RBIGNUM_LEN(x)) ^ RBIGNUM_SIGN(x);
- return INT2FIX(hash);
+ key = 0; digits = BDIGITS(x); len = RBIGNUM(x)->len;
+ for (i=0; i<len; i++) {
+ key ^= *digits++;
+ }
+ return LONG2FIX(key);
}
/*
@@ -3154,7 +2238,8 @@ rb_big_hash(VALUE x)
*/
static VALUE
-rb_big_coerce(VALUE x, VALUE y)
+rb_big_coerce(x, y)
+ VALUE x, y;
{
if (FIXNUM_P(y)) {
return rb_assoc_new(rb_int2big(FIX2LONG(y)), x);
@@ -3180,15 +2265,37 @@ rb_big_coerce(VALUE x, VALUE y)
*/
static VALUE
-rb_big_abs(VALUE x)
+rb_big_abs(x)
+ VALUE x;
{
- if (!RBIGNUM_SIGN(x)) {
+ if (!RBIGNUM(x)->sign) {
x = rb_big_clone(x);
- RBIGNUM_SET_SIGN(x, 1);
+ RBIGNUM(x)->sign = 1;
}
return x;
}
+VALUE
+rb_big_rand(max, rand_buf)
+ VALUE max;
+ double *rand_buf;
+{
+ VALUE v;
+ long len = RBIGNUM(max)->len;
+
+ if (BIGZEROP(max)) {
+ return rb_float_new(rand_buf[0]);
+ }
+ v = bignew(len,1);
+ len--;
+ BDIGITS(v)[len] = BDIGITS(max)[len] * rand_buf[len];
+ while (len--) {
+ BDIGITS(v)[len] = ((BDIGIT)~0) * rand_buf[len];
+ }
+
+ return v;
+}
+
/*
* call-seq:
* big.size -> integer
@@ -3202,41 +2309,10 @@ rb_big_abs(VALUE x)
*/
static VALUE
-rb_big_size(VALUE big)
-{
- return LONG2FIX(RBIGNUM_LEN(big)*SIZEOF_BDIGITS);
-}
-
-/*
- * call-seq:
- * big.odd? -> true or false
- *
- * Returns <code>true</code> if <i>big</i> is an odd number.
- */
-
-static VALUE
-rb_big_odd_p(VALUE num)
-{
- if (BDIGITS(num)[0] & 1) {
- return Qtrue;
- }
- return Qfalse;
-}
-
-/*
- * call-seq:
- * big.even? -> true or false
- *
- * Returns <code>true</code> if <i>big</i> is an even number.
- */
-
-static VALUE
-rb_big_even_p(VALUE num)
+rb_big_size(big)
+ VALUE big;
{
- if (BDIGITS(num)[0] & 1) {
- return Qfalse;
- }
- return Qtrue;
+ return LONG2FIX(RBIGNUM(big)->len*SIZEOF_BDIGITS);
}
/*
@@ -3258,7 +2334,7 @@ rb_big_even_p(VALUE num)
*/
void
-Init_Bignum(void)
+Init_Bignum()
{
rb_cBignum = rb_define_class("Bignum", rb_cInteger);
@@ -3270,11 +2346,12 @@ Init_Bignum(void)
rb_define_method(rb_cBignum, "*", rb_big_mul, 1);
rb_define_method(rb_cBignum, "/", rb_big_div, 1);
rb_define_method(rb_cBignum, "%", rb_big_modulo, 1);
- rb_define_method(rb_cBignum, "div", rb_big_idiv, 1);
+ rb_define_method(rb_cBignum, "div", rb_big_div, 1);
rb_define_method(rb_cBignum, "divmod", rb_big_divmod, 1);
rb_define_method(rb_cBignum, "modulo", rb_big_modulo, 1);
rb_define_method(rb_cBignum, "remainder", rb_big_remainder, 1);
- rb_define_method(rb_cBignum, "fdiv", rb_big_fdiv, 1);
+ rb_define_method(rb_cBignum, "quo", rb_big_quo, 1);
+ rb_define_method(rb_cBignum, "fdiv", rb_big_quo, 1);
rb_define_method(rb_cBignum, "**", rb_big_pow, 1);
rb_define_method(rb_cBignum, "&", rb_big_and, 1);
rb_define_method(rb_cBignum, "|", rb_big_or, 1);
@@ -3286,15 +2363,9 @@ Init_Bignum(void)
rb_define_method(rb_cBignum, "<=>", rb_big_cmp, 1);
rb_define_method(rb_cBignum, "==", rb_big_eq, 1);
- rb_define_method(rb_cBignum, "===", rb_big_eq, 1);
rb_define_method(rb_cBignum, "eql?", rb_big_eql, 1);
rb_define_method(rb_cBignum, "hash", rb_big_hash, 0);
rb_define_method(rb_cBignum, "to_f", rb_big_to_f, 0);
rb_define_method(rb_cBignum, "abs", rb_big_abs, 0);
- rb_define_method(rb_cBignum, "magnitude", rb_big_abs, 0);
rb_define_method(rb_cBignum, "size", rb_big_size, 0);
- rb_define_method(rb_cBignum, "odd?", rb_big_odd_p, 0);
- rb_define_method(rb_cBignum, "even?", rb_big_even_p, 0);
-
- power_cache_init();
}
diff --git a/bin/erb b/bin/erb
index 6db3d0b6ed..a6fcd5370c 100755
--- a/bin/erb
+++ b/bin/erb
@@ -12,17 +12,9 @@ class ERB
arg = self.shift
return nil if arg == '--'
if arg =~ /^-(.)(.*)/
- if $1 == '-'
- arg, @maybe_arg = arg.split(/=/, 2)
- return arg
- end
- raise 'unknown switch "-"' if $2[0] == ?- and $1 != 'T'
- if $2.size > 0
- self.unshift "-#{$2}"
- @maybe_arg = $2
- else
- @maybe_arg = nil
- end
+ return arg if $1 == '-'
+ raise 'unknown switch "-"' if $2.index('-')
+ self.unshift "-#{$2}" if $2.size > 0
"-#{$1}"
else
self.unshift arg
@@ -31,9 +23,7 @@ class ERB
end
def ARGV.req_arg
- (@maybe_arg || self.shift || raise('missing argument')).tap {
- @maybe_arg = nil
- }
+ self.shift || raise('missing argument')
end
def trim_mode_opt(trim_mode, disable_percent)
@@ -82,11 +72,20 @@ class ERB
end
raise "invalid trim mode #{arg.dump}" unless arg =~ /^[0-2]$/
trim_mode = arg.to_i
- when '-E', '--encoding'
+ when '-K' # KCODE
arg = ARGV.req_arg
- set_encoding(*arg.split(/:/, 2))
- when '-U'
- set_encoding(Encoding::UTF_8, Encoding::UTF_8)
+ case arg.downcase
+ when 'e', '-e', 'euc'
+ $KCODE = 'EUC'
+ when 's', '-s', 'sjis'
+ $KCODE = 'SJIS'
+ when 'u', '-u', 'utf8'
+ $KCODE = 'UTF8'
+ when 'n', '-n', 'none'
+ $KCODE = 'NONE'
+ else
+ raise "invalid KCODE #{arg.dump}"
+ end
when '-P'
disable_percent = true
when '--help'
@@ -104,17 +103,15 @@ class ERB
-n print ruby script with line number
-v enable verbose mode
-d set $DEBUG to true
- -r library load a library
- -S safe_level set $SAFE (0..4)
- -E ex[:in] set default external/internal encodings
- -U set default encoding to UTF-8.
- -T trim_mode specify trim_mode (0..2, -)
+ -r [library] load a library
+ -K [kcode] specify KANJI code-set
+ -S [safe_level] set $SAFE (0..4)
+ -T [trim_mode] specify trim_mode (0..2, -)
-P ignore lines which start with "%"
EOU
exit 1
end
- $<.set_encoding(Encoding::ASCII_8BIT, nil)
src = $<.read
filename = $FILENAME
exit 2 unless src
@@ -123,8 +120,10 @@ EOU
erb.filename = filename
if output
if number
- erb.src.each_line.with_index do |line, l|
- puts "%3d %s"%[l+1, line]
+ l = 1
+ for line in erb.src
+ puts "%3d %s"%[l, line]
+ l += 1
end
else
puts erb.src
@@ -134,19 +133,6 @@ EOU
end
end
module_function :run
-
- def set_encoding(extern, intern = nil)
- verbose, $VERBOSE = $VERBOSE, nil
- Encoding.default_external = extern unless extern.nil? || extern.empty?
- Encoding.default_internal = intern unless intern.nil? || intern.empty?
- [$stdin, $stdout, $stderr].each do |io|
- io.set_encoding(extern, intern)
- end
- ensure
- $VERBOSE = verbose
- end
- module_function :set_encoding
- class << self; private :set_encoding; end
end
end
diff --git a/bin/gem b/bin/gem
deleted file mode 100755
index 14c3d3c480..0000000000
--- a/bin/gem
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env ruby
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-require 'rubygems'
-require 'rubygems/gem_runner'
-require 'rubygems/exceptions'
-
-required_version = Gem::Requirement.new ">= 1.8.6"
-
-unless required_version.satisfied_by? Gem.ruby_version then
- abort "Expected Ruby Version #{required_version}, is #{Gem.ruby_version}"
-end
-
-args = ARGV.clone
-
-begin
- Gem::GemRunner.new.run args
-rescue Gem::SystemExitException => e
- exit e.exit_code
-end
-
diff --git a/bin/irb b/bin/irb
index 6c8465c802..f277bc4b69 100755..100644
--- a/bin/irb
+++ b/bin/irb
@@ -1,8 +1,9 @@
#!/usr/bin/env ruby
#
-# irb.rb - interactive ruby
-# $Release Version: 0.9.6 $
+# irb.rb - intaractive ruby
+# $Release Version: 0.9.5 $
# $Revision$
+# $Date$
# by Keiju ISHITSUKA(keiju@ruby-lang.org)
#
diff --git a/bin/rake b/bin/rake
deleted file mode 100755
index c9e95da611..0000000000
--- a/bin/rake
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env ruby
-
-#--
-# Copyright (c) 2003, 2004, 2005, 2006, 2007 Jim Weirich
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-# IN THE SOFTWARE.
-#++
-
-begin
- require 'rake'
-rescue LoadError
- require 'rubygems'
- require 'rake'
-end
-Rake.application.run
diff --git a/bin/rdoc b/bin/rdoc
index e50285478d..fe619137fd 100755..100644
--- a/bin/rdoc
+++ b/bin/rdoc
@@ -8,15 +8,60 @@
#
# $Revision$
+## Transitional Hack ####
+#
+# RDoc was initially distributed independently, and installed
+# itself into <prefix>/lib/ruby/site_ruby/<ver>/rdoc...
+#
+# Now that RDoc is part of the distribution, it's installed into
+# <prefix>/lib/ruby/<ver>, which unfortunately appears later in the
+# search path. This means that if you have previously installed RDoc,
+# and then install from ruby-lang, you'll pick up the old one by
+# default. This hack checks for the condition, and readjusts the
+# search path if necessary.
+
+def adjust_for_existing_rdoc(path)
+
+ $stderr.puts %{
+ It seems as if you have a previously-installed RDoc in
+ the directory #{path}.
+
+ Because this is now out-of-date, you might want to consider
+ removing the directories:
+
+ #{File.join(path, "rdoc")}
+
+ and
+
+ #{File.join(path, "markup")}
+
+ }
+
+ # Move all the site_ruby directories to the end
+ p $:
+ $:.replace($:.partition {|path| /site_ruby/ !~ path}.flatten)
+ p $:
+end
+
+$:.each do |path|
+ if /site_ruby/ =~ path
+ rdoc_path = File.join(path, 'rdoc', 'rdoc.rb')
+ if File.exists?(rdoc_path)
+ adjust_for_existing_rdoc(path)
+ break
+ end
+ end
+end
+
+## End of Transitional Hack ##
+
+
require 'rdoc/rdoc'
begin
r = RDoc::RDoc.new
- r.document ARGV
-rescue Interrupt
- $stderr.puts
- $stderr.puts "Interrupted"
-rescue RDoc::Error => e
+ r.document(ARGV)
+rescue RDoc::RDocError => e
$stderr.puts e.message
- exit 1
+ exit(1)
end
diff --git a/bin/ri b/bin/ri
index 243557403c..fb3e00eda3 100755
--- a/bin/ri
+++ b/bin/ri
@@ -1,5 +1,49 @@
#!/usr/bin/env ruby
+# usage:
+#
+# ri name...
+#
+# where name can be
+#
+# Class | Class::method | Class#method | Class.method | method
+#
+# All names may be abbreviated to their minimum unbiguous form. If a name
+# _is_ ambiguous, all valid options will be listed.
+#
+# The form '.' method matches either class or instance methods, while
+# #method matches only instance and ::method matches only class methods.
+#
+#
+# == Installing Documentation
+#
+# 'ri' uses a database of documentation built by the RDoc utility.
+#
+# So, how do you install this documentation on your system?
+# It depends on how you installed Ruby.
+#
+# <em>If you installed Ruby from source files</em> (that is, if it some point
+# you typed 'make' during the process :), you can install the RDoc
+# documentation yourself. Just go back to the place where you have
+# your Ruby source and type
+#
+# make install-doc
+#
+# You'll probably need to do this as a superuser, as the documentation
+# is installed in the Ruby target tree (normally somewhere under
+# <tt>/usr/local</tt>.
+#
+# <em>If you installed Ruby from a binary distribution</em> (perhaps
+# using a one-click installer, or using some other packaging system),
+# then the team that produced the package probably forgot to package
+# the documentation as well. Contact them, and see if they can add
+# it to the next release.
+#
-require 'rdoc/ri/driver'
-RDoc::RI::Driver.run ARGV
+require 'rdoc/ri/ri_driver'
+
+######################################################################
+
+ri = RiDriver.new
+ri.process_args
+
diff --git a/bin/testrb b/bin/testrb
index e4eb9099b3..ff49cb5466 100755
--- a/bin/testrb
+++ b/bin/testrb
@@ -1,14 +1,5 @@
#!/usr/bin/env ruby
require 'test/unit'
-Test::Unit.setup_argv {|files|
- if files.empty?
- puts "Usage: testrb [options] tests..."
- exit 1
- end
- if files.size == 1
- $0 = File.basename(files[0])
- else
- $0 = files.to_s
- end
- files
-}
+(r = Test::Unit::AutoRunner.new(true)).process_args(ARGV) or
+ abort r.options.banner + " tests..."
+exit r.run
diff --git a/blockinlining.c b/blockinlining.c
deleted file mode 100644
index f9eb8af229..0000000000
--- a/blockinlining.c
+++ /dev/null
@@ -1,464 +0,0 @@
-/**********************************************************************
-
- blockinlining.c -
-
- $Author$
-
- Copyright (C) 2004-2007 Koichi Sasada
-
-**********************************************************************/
-
-#include "ruby/ruby.h"
-#include "vm_core.h"
-
-static VALUE
-iseq_special_block(rb_iseq_t *iseq, void *builder)
-{
-#if OPT_BLOCKINLINING
- VALUE parent = Qfalse;
- VALUE iseqval;
-
- if (iseq->argc > 1 || iseq->arg_simple == 0) {
- /* argument check */
- return 0;
- }
-
- if (iseq->cached_special_block_builder) {
- if (iseq->cached_special_block_builder == builder) {
- return iseq->cached_special_block;
- }
- else {
- return 0;
- }
- }
- else {
- iseq->cached_special_block_builder = (void *)1;
- }
-
- if (iseq->parent_iseq) {
- parent = iseq->parent_iseq->self;
- }
- iseqval = rb_iseq_new_with_bopt(iseq->node, iseq->name, iseq->filename,
- parent, iseq->type,
- GC_GUARDED_PTR(builder));
- if (0) {
- printf("%s\n", RSTRING_PTR(rb_iseq_disasm(iseqval)));
- }
- iseq->cached_special_block = iseqval;
- iseq->cached_special_block_builder = builder;
- return iseqval;
-#else
- return 0;
-#endif
-}
-
-static NODE *
-new_block(NODE * head, NODE * tail)
-{
- head = NEW_BLOCK(head);
- tail = NEW_BLOCK(tail);
- head->nd_next = tail;
- return head;
-}
-
-static NODE *
-new_ary(NODE * head, NODE * tail)
-{
- head = NEW_ARRAY(head);
- head->nd_next = tail;
- return head;
-}
-
-static NODE *
-new_assign(NODE * lnode, NODE * rhs)
-{
- switch (nd_type(lnode)) {
- case NODE_LASGN:{
- return NEW_NODE(NODE_LASGN, lnode->nd_vid, rhs, lnode->nd_cnt);
- /* NEW_LASGN(lnode->nd_vid, rhs); */
- }
- case NODE_GASGN:{
- return NEW_GASGN(lnode->nd_vid, rhs);
- }
- case NODE_DASGN:{
- return NEW_DASGN(lnode->nd_vid, rhs);
- }
- case NODE_ATTRASGN:{
- NODE *args = 0;
- if (lnode->nd_args) {
- args = NEW_ARRAY(lnode->nd_args->nd_head);
- args->nd_next = NEW_ARRAY(rhs);
- args->nd_alen = 2;
- }
- else {
- args = NEW_ARRAY(rhs);
- }
-
- return NEW_ATTRASGN(lnode->nd_recv,
- lnode->nd_mid,
- args);
- }
- default:
- rb_bug("unimplemented (block inlining): %s", ruby_node_name(nd_type(lnode)));
- }
- return 0;
-}
-
-static NODE *
-build_Integer_times_node(rb_iseq_t *iseq, NODE * node, NODE * lnode,
- VALUE param_vars, VALUE local_vars)
-{
- /* Special Block for Integer#times
- {|e, _self|
- _e = e
- while(e < _self)
- e = _e
- redo_point:
- BODY
- next_point:
- _e = _e.succ
- end
- }
-
- {|e, _self|
- while(e < _self)
- BODY
- next_point:
- e = e.succ
- end
- }
- */
- ID _self;
- CONST_ID(_self, "#_self");
- if (iseq->argc == 0) {
- ID e;
- CONST_ID(e, "#e");
- rb_ary_push(param_vars, ID2SYM(e));
- rb_ary_push(param_vars, ID2SYM(_self));
- iseq->argc += 2;
-
- node =
- NEW_WHILE(NEW_CALL
- (NEW_DVAR(e), idLT, new_ary(NEW_DVAR(_self), 0)),
- new_block(NEW_OPTBLOCK(node),
- NEW_DASGN(e,
- NEW_CALL(NEW_DVAR(e), idSucc, 0))),
- Qundef);
- }
- else {
- ID _e;
- ID e = SYM2ID(rb_ary_entry(param_vars, 0));
- NODE *assign;
-
- CONST_ID(_e, "#_e");
- rb_ary_push(param_vars, ID2SYM(_self));
- rb_ary_push(local_vars, ID2SYM(_e));
- iseq->argc++;
-
- if (nd_type(lnode) == NODE_DASGN_CURR) {
- assign = NEW_DASGN(e, NEW_DVAR(_e));
- }
- else {
- assign = new_assign(lnode, NEW_DVAR(_e));
- }
-
- node =
- new_block(NEW_DASGN(_e, NEW_DVAR(e)),
- NEW_WHILE(NEW_CALL
- (NEW_DVAR(_e), idLT,
- new_ary(NEW_DVAR(_self), 0)),
- new_block(assign,
- new_block(NEW_OPTBLOCK(node),
- NEW_DASGN(_e,
- NEW_CALL
- (NEW_DVAR(_e),
- idSucc, 0)))),
- Qundef));
- }
- return node;
-}
-
-VALUE
-invoke_Integer_times_special_block(VALUE num)
-{
- rb_thread_t *th = GET_THREAD();
- rb_block_t *orig_block = GC_GUARDED_PTR_REF(th->cfp->lfp[0]);
-
- if (orig_block && BUILTIN_TYPE(orig_block->iseq) != T_NODE) {
- VALUE tsiseqval = iseq_special_block(orig_block->iseq,
- build_Integer_times_node);
- rb_iseq_t *tsiseq;
- VALUE argv[2], val;
-
- if (tsiseqval) {
- rb_block_t block = *orig_block;
- GetISeqPtr(tsiseqval, tsiseq);
- block.iseq = tsiseq;
- th->cfp->lfp[0] = GC_GUARDED_PTR(&block);
- argv[0] = INT2FIX(0);
- argv[1] = num;
- val = rb_yield_values(2, argv);
- if (val == Qundef) {
- return num;
- }
- else {
- return val;
- }
- }
- }
- return Qundef;
-}
-
-static NODE *
-build_Range_each_node(rb_iseq_t *iseq, NODE * node, NODE * lnode,
- VALUE param_vars, VALUE local_vars, ID mid)
-{
- /* Special Block for Range#each
- {|e, _last|
- _e = e
- while _e < _last
- e = _e
- next_point:
- BODY
- redo_point:
- _e = _e.succ
- end
- }
- {|e, _last|
- while e < _last
- BODY
- redo_point:
- e = e.succ
- end
- }
- */
- ID _last;
- CONST_ID(_last, "#_last");
- if (iseq->argc == 0) {
- ID e;
- CONST_ID(e, "#e");
- rb_ary_push(param_vars, ID2SYM(e));
- rb_ary_push(param_vars, ID2SYM(_last));
- iseq->argc += 2;
-
- node =
- NEW_WHILE(NEW_CALL(NEW_DVAR(e), mid, new_ary(NEW_DVAR(_last), 0)),
- new_block(NEW_OPTBLOCK(node),
- NEW_DASGN(e,
- NEW_CALL(NEW_DVAR(e), idSucc, 0))),
- Qundef);
- }
- else {
- ID _e;
- ID e = SYM2ID(rb_ary_entry(param_vars, 0));
- NODE *assign;
-
- CONST_ID(_e, "#_e");
- rb_ary_push(param_vars, ID2SYM(_last));
- rb_ary_push(local_vars, ID2SYM(_e));
- iseq->argc++;
-
- if (nd_type(lnode) == NODE_DASGN_CURR) {
- assign = NEW_DASGN(e, NEW_DVAR(_e));
- }
- else {
- assign = new_assign(lnode, NEW_DVAR(_e));
- }
-
- node =
- new_block(NEW_DASGN(_e, NEW_DVAR(e)),
- NEW_WHILE(NEW_CALL
- (NEW_DVAR(_e), mid,
- new_ary(NEW_DVAR(_last), 0)),
- new_block(assign,
- new_block(NEW_OPTBLOCK(node),
- NEW_DASGN(_e,
- NEW_CALL
- (NEW_DVAR(_e),
- idSucc, 0)))),
- Qundef));
- }
- return node;
-}
-
-static NODE *
-build_Range_each_node_LE(rb_iseq_t *iseq, NODE * node, NODE * lnode,
- VALUE param_vars, VALUE local_vars)
-{
- return build_Range_each_node(iseq, node, lnode,
- param_vars, local_vars, idLE);
-}
-
-static NODE *
-build_Range_each_node_LT(rb_iseq_t *iseq, NODE * node, NODE * lnode,
- VALUE param_vars, VALUE local_vars)
-{
- return build_Range_each_node(iseq, node, lnode,
- param_vars, local_vars, idLT);
-}
-
-VALUE
-invoke_Range_each_special_block(VALUE range,
- VALUE beg, VALUE end, int excl)
-{
- rb_thread_t *th = GET_THREAD();
- rb_block_t *orig_block = GC_GUARDED_PTR_REF(th->cfp->lfp[0]);
-
- if (BUILTIN_TYPE(orig_block->iseq) != T_NODE) {
- void *builder =
- excl ? build_Range_each_node_LT : build_Range_each_node_LE;
- VALUE tsiseqval = iseq_special_block(orig_block->iseq, builder);
- rb_iseq_t *tsiseq;
- VALUE argv[2];
-
- if (tsiseqval) {
- VALUE val;
- rb_block_t block = *orig_block;
- GetISeqPtr(tsiseqval, tsiseq);
- block.iseq = tsiseq;
- th->cfp->lfp[0] = GC_GUARDED_PTR(&block);
- argv[0] = beg;
- argv[1] = end;
- val = rb_yield_values(2, argv);
- if (val == Qundef) {
- return range;
- }
- else {
- return val;
- }
- }
- }
- return Qundef;
-}
-
-
-static NODE *
-build_Array_each_node(rb_iseq_t *iseq, NODE * node, NODE * lnode,
- VALUE param_vars, VALUE local_vars)
-{
- /* Special block for Array#each
- ary.each{|e|
- BODY
- }
- =>
- {|e, _self|
- _i = 0
- while _i < _self.length
- e = _self[_i]
- redo_point:
- BODY
- next_point:
- _i = _i.succ
- end
- }
-
- ary.each{
- BODY
- }
- =>
- {|_i, _self|
- _i = 0
- while _i < _self.length
- redo_point:
- BODY
- next_point:
- _i = _i.succ
- end
- }
- */
-
- ID _self, _i;
-
- CONST_ID(_self, "#_self");
- CONST_ID(_i, "#_i");
- if (iseq->argc == 0) {
- ID _e;
- CONST_ID(_e, "#_e");
- rb_ary_push(param_vars, ID2SYM(_e));
- rb_ary_push(param_vars, ID2SYM(_self));
- iseq->argc += 2;
- rb_ary_push(local_vars, ID2SYM(_i));
-
- node =
- new_block(NEW_DASGN(_i, NEW_LIT(INT2FIX(0))),
- NEW_WHILE(NEW_CALL(NEW_DVAR(_i), idLT,
- new_ary(NEW_CALL
- (NEW_DVAR(_self), idLength,
- 0), 0)),
- new_block(NEW_OPTBLOCK(node),
- NEW_DASGN(_i,
- NEW_CALL(NEW_DVAR(_i),
- idSucc, 0))),
- Qundef));
- }
- else {
- ID e = SYM2ID(rb_ary_entry(param_vars, 0));
- NODE *assign;
-
- rb_ary_push(param_vars, ID2SYM(_self));
- iseq->argc++;
- rb_ary_push(local_vars, ID2SYM(_i));
-
- if (nd_type(lnode) == NODE_DASGN_CURR) {
- assign = NEW_DASGN(e,
- NEW_CALL(NEW_DVAR(_self), idAREF,
- new_ary(NEW_DVAR(_i), 0)));
- }
- else {
- assign = new_assign(lnode,
- NEW_CALL(NEW_DVAR(_self), idAREF,
- new_ary(NEW_DVAR(_i), 0)));
- }
-
- node =
- new_block(NEW_DASGN(_i, NEW_LIT(INT2FIX(0))),
- NEW_WHILE(NEW_CALL(NEW_DVAR(_i), idLT,
- new_ary(NEW_CALL
- (NEW_DVAR(_self), idLength,
- 0), 0)), new_block(assign,
- new_block
- (NEW_OPTBLOCK
- (node),
- NEW_DASGN
- (_i,
- NEW_CALL
- (NEW_DVAR
- (_i),
- idSucc,
- 0)))),
- Qundef));
- }
- return node;
-}
-
-VALUE
-invoke_Array_each_special_block(VALUE ary)
-{
- rb_thread_t *th = GET_THREAD();
- rb_block_t *orig_block = GC_GUARDED_PTR_REF(th->cfp->lfp[0]);
-
- if (BUILTIN_TYPE(orig_block->iseq) != T_NODE) {
- VALUE tsiseqval = iseq_special_block(orig_block->iseq,
- build_Array_each_node);
- rb_iseq_t *tsiseq;
- VALUE argv[2];
-
- if (tsiseqval) {
- VALUE val;
- rb_block_t block = *orig_block;
- GetISeqPtr(tsiseqval, tsiseq);
- block.iseq = tsiseq;
- th->cfp->lfp[0] = GC_GUARDED_PTR(&block);
- argv[0] = 0;
- argv[1] = ary;
- val = rb_yield_values(2, argv);
- if (val == Qundef) {
- return ary;
- }
- else {
- return val;
- }
- }
- }
- return Qundef;
-}
diff --git a/bootstraptest/pending.rb b/bootstraptest/pending.rb
deleted file mode 100644
index 744c0adac1..0000000000
--- a/bootstraptest/pending.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-assert_equal 'A', %q{
- class A
- @@a = 'A'
- def a=(x)
- @@a = x
- end
- def a
- @@a
- end
- end
-
- B = A.dup
- B.new.a = 'B'
- A.new.a
-}, '[ruby-core:17019]'
-
-assert_equal 'ok', %q{
- def m
- lambda{
- proc{
- return :ng1
- }
- }.call.call
- :ng2
- end
-
- begin
- m()
- rescue LocalJumpError
- :ok
- end
-}
-
-assert_normal_exit %q{
- r = Range.allocate
- def r.<=>(o) true end
- r.instance_eval { initialize r, r }
- r.inspect
-}
diff --git a/bootstraptest/runner.rb b/bootstraptest/runner.rb
deleted file mode 100755
index df444f3181..0000000000
--- a/bootstraptest/runner.rb
+++ /dev/null
@@ -1,379 +0,0 @@
-"exec" "${RUBY-ruby}" "-x" "$0" "$@"; true # -*- mode: ruby; coding: utf-8 -*-
-#!./ruby
-# $Id$
-
-# NOTE:
-# Never use optparse in this file.
-# Never use test/unit in this file.
-# Never use Ruby extensions in this file.
-
-begin
- require 'fileutils'
- require 'tmpdir'
-rescue LoadError
- $:.unshift File.join(File.dirname(__FILE__), '../lib')
- retry
-end
-
-if !Dir.respond_to?(:mktmpdir)
- # copied from lib/tmpdir.rb
- def Dir.mktmpdir(prefix_suffix=nil, tmpdir=nil)
- case prefix_suffix
- when nil
- prefix = "d"
- suffix = ""
- when String
- prefix = prefix_suffix
- suffix = ""
- when Array
- prefix = prefix_suffix[0]
- suffix = prefix_suffix[1]
- else
- raise ArgumentError, "unexpected prefix_suffix: #{prefix_suffix.inspect}"
- end
- tmpdir ||= Dir.tmpdir
- t = Time.now.strftime("%Y%m%d")
- n = nil
- begin
- path = "#{tmpdir}/#{prefix}#{t}-#{$$}-#{rand(0x100000000).to_s(36)}"
- path << "-#{n}" if n
- path << suffix
- Dir.mkdir(path, 0700)
- rescue Errno::EEXIST
- n ||= 0
- n += 1
- retry
- end
-
- if block_given?
- begin
- yield path
- ensure
- FileUtils.remove_entry_secure path
- end
- else
- path
- end
- end
-end
-
-def main
- @ruby = File.expand_path('miniruby')
- @verbose = false
- dir = nil
- quiet = false
- tests = nil
- ARGV.delete_if {|arg|
- case arg
- when /\A--ruby=(.*)/
- @ruby = $1
- @ruby.gsub!(/^([^ ]*)/){File.expand_path($1)}
- @ruby.gsub!(/(\s+-I\s*)((?!(?:\.\/)*-(?:\s|\z))\S+)/){$1+File.expand_path($2)}
- @ruby.gsub!(/(\s+-r\s*)(\.\.?\/\S+)/){$1+File.expand_path($2)}
- true
- when /\A--sets=(.*)/
- tests = Dir.glob("#{File.dirname($0)}/test_{#{$1}}*.rb")
- puts tests.map {|path| File.basename(path) }.inspect
- true
- when /\A--dir=(.*)/
- dir = $1
- true
- when /\A(--stress|-s)/
- $stress = true
- when /\A(-q|--q(uiet))\z/
- quiet = true
- true
- when /\A(-v|--v(erbose))\z/
- @verbose = true
- when /\A(-h|--h(elp)?)\z/
- puts(<<-End)
-Usage: #{File.basename($0, '.*')} --ruby=PATH [--sets=NAME,NAME,...]
- --sets=NAME,NAME,... Name of test sets.
- --dir=DIRECTORY Working directory.
- default: /tmp/bootstraptestXXXXX.tmpwd
- -s, --stress stress test.
- -v, --verbose Output test name before exec.
- -q, --quiet Don\'t print header message.
- -h, --help Print this message and quit.
-End
- exit true
- else
- false
- end
- }
- if tests and not ARGV.empty?
- $stderr.puts "--tests and arguments are exclusive"
- exit false
- end
- tests ||= ARGV
- tests = Dir.glob("#{File.dirname($0)}/test_*.rb") if tests.empty?
- pathes = tests.map {|path| File.expand_path(path) }
-
- unless quiet
- puts Time.now
- if defined?(RUBY_DESCRIPTION)
- puts "Driver is #{RUBY_DESCRIPTION}"
- elsif defined?(RUBY_PATCHLEVEL)
- puts "Driver is ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}#{RUBY_PLATFORM}) [#{RUBY_PLATFORM}]"
- else
- puts "Driver is ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
- end
- puts "Target is #{`#{@ruby} -v`.chomp}"
- puts
- $stdout.flush
- end
-
- in_temporary_working_directory(dir) {
- exec_test pathes
- }
-end
-
-def exec_test(pathes)
- @count = 0
- @error = 0
- @errbuf = []
- @location = nil
- pathes.each do |path|
- $stderr.print "\n#{File.basename(path)} "
- load File.expand_path(path)
- end
- $stderr.puts
- if @error == 0
- if @count == 0
- $stderr.puts "No tests, no problem"
- else
- $stderr.puts "PASS all #{@count} tests"
- end
- exit true
- else
- @errbuf.each do |msg|
- $stderr.puts msg
- end
- $stderr.puts "FAIL #{@error}/#{@count} tests failed"
- exit false
- end
-end
-
-def assert_check(testsrc, message = '', opt = '')
- $stderr.puts "\##{@count} #{@location}" if @verbose
- result = get_result_string(testsrc, opt)
- check_coredump
- faildesc = yield(result)
- if !faildesc
- $stderr.print '.'
- else
- $stderr.print 'F'
- error faildesc, message
- end
-rescue Exception => err
- $stderr.print 'E'
- error err.message, message
-end
-
-def assert_equal(expected, testsrc, message = '')
- newtest
- assert_check(testsrc, message) {|result|
- if expected == result
- nil
- else
- desc = "#{result.inspect} (expected #{expected.inspect})"
- pretty(testsrc, desc, result)
- end
- }
-end
-
-def assert_match(expected_pattern, testsrc, message = '')
- newtest
- assert_check(testsrc, message) {|result|
- if expected_pattern =~ result
- nil
- else
- desc = "#{expected_pattern.inspect} expected to be =~\n#{result.inspect}"
- pretty(testsrc, desc, result)
- end
- }
-end
-
-def assert_not_match(unexpected_pattern, testsrc, message = '')
- newtest
- assert_check(testsrc, message) {|result|
- if unexpected_pattern !~ result
- nil
- else
- desc = "#{unexpected_pattern.inspect} expected to be !~\n#{result.inspect}"
- pretty(testsrc, desc, result)
- end
- }
-end
-
-def assert_valid_syntax(testsrc, message = '')
- newtest
- assert_check(testsrc, message, '-c') {|result|
- result if /Syntax OK/ !~ result
- }
-end
-
-def assert_normal_exit(testsrc, message = '', ignore_signals = nil)
- newtest
- $stderr.puts "\##{@count} #{@location}" if @verbose
- faildesc = nil
- filename = make_srcfile(testsrc)
- old_stderr = $stderr.dup
- begin
- $stderr.reopen("assert_normal_exit_stderr.log", "w")
- `#{@ruby} -W0 #{filename}`
- status = $?
- ensure
- $stderr.reopen(old_stderr)
- old_stderr.close
- end
- if status.signaled?
- signo = status.termsig
- signame = Signal.list.invert[signo]
- unless ignore_signals and ignore_signals.include?(signame)
- sigdesc = "signal #{signo}"
- if signame
- sigdesc = "SIG#{signame} (#{sigdesc})"
- end
- faildesc = pretty(testsrc, "killed by #{sigdesc}", nil)
- stderr_log = File.read("assert_normal_exit_stderr.log")
- if !stderr_log.empty?
- faildesc << "\n" if /\n\z/ !~ faildesc
- stderr_log << "\n" if /\n\z/ !~ stderr_log
- stderr_log.gsub!(/^.*\n/) { '| ' + $& }
- faildesc << stderr_log
- end
- end
- end
- if !faildesc
- $stderr.print '.'
- true
- else
- $stderr.print 'F'
- error faildesc, message
- false
- end
-rescue Exception => err
- $stderr.print 'E'
- error err.message, message
- false
-end
-
-def assert_finish(timeout_seconds, testsrc, message = '')
- newtest
- $stderr.puts "\##{@count} #{@location}" if @verbose
- faildesc = nil
- filename = make_srcfile(testsrc)
- io = IO.popen("#{@ruby} -W0 #{filename}")
- pid = io.pid
- waited = false
- tlimit = Time.now + timeout_seconds
- while Time.now < tlimit
- if Process.waitpid pid, Process::WNOHANG
- waited = true
- break
- end
- sleep 0.1
- end
- if !waited
- Process.kill(:KILL, pid)
- Process.waitpid pid
- faildesc = pretty(testsrc, "not finished in #{timeout_seconds} seconds", nil)
- end
- io.close
- if !faildesc
- $stderr.print '.'
- else
- $stderr.print 'F'
- error faildesc, message
- end
-rescue Exception => err
- $stderr.print 'E'
- error err.message, message
-end
-
-def flunk(message = '')
- newtest
- $stderr.print 'F'
- error message, ''
-end
-
-def pretty(src, desc, result)
- src = src.sub(/\A.*\n/, '')
- (/\n/ =~ src ? "\n#{adjust_indent(src)}" : src) + " #=> #{desc}"
-end
-
-INDENT = 27
-
-def adjust_indent(src)
- untabify(src).gsub(/^ {#{INDENT}}/o, '').gsub(/^/, ' ')
-end
-
-def untabify(str)
- str.gsub(/^\t+/) {' ' * (8 * $&.size) }
-end
-
-def make_srcfile(src)
- filename = 'bootstraptest.tmp.rb'
- File.open(filename, 'w') {|f|
- f.puts "GC.stress = true" if $stress
- f.puts "print(begin; #{src}; end)"
- }
- filename
-end
-
-def get_result_string(src, opt = '')
- if @ruby
- filename = make_srcfile(src)
- begin
- `#{@ruby} -W0 #{opt} #{filename}`
- ensure
- raise CoreDumpError, "core dumped" if $? and $?.coredump?
- end
- else
- eval(src).to_s
- end
-end
-
-def newtest
- @location = File.basename(caller(2).first)
- @count += 1
- cleanup_coredump
-end
-
-def error(msg, additional_message)
- @errbuf.push "\##{@count} #{@location}: #{msg} #{additional_message}"
- @error += 1
-end
-
-def in_temporary_working_directory(dir)
- if dir
- Dir.mkdir dir
- Dir.chdir(dir) {
- yield
- }
- else
- Dir.mktmpdir(["bootstraptest", ".tmpwd"]) {|d|
- Dir.chdir(d) {
- yield
- }
- }
- end
-end
-
-def cleanup_coredump
- FileUtils.rm_f 'core'
- FileUtils.rm_f Dir.glob('core.*')
- FileUtils.rm_f @ruby+'.stackdump' if @ruby
-end
-
-class CoreDumpError < StandardError; end
-
-def check_coredump
- if File.file?('core') or not Dir.glob('core.*').empty? or
- (@ruby and File.exist?(@ruby+'.stackdump'))
- raise CoreDumpError, "core dumped"
- end
-end
-
-main
diff --git a/bootstraptest/test_attr.rb b/bootstraptest/test_attr.rb
deleted file mode 100644
index 721a847145..0000000000
--- a/bootstraptest/test_attr.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-assert_equal 'ok', %q{
- module M
- class A
- class << self
- attr_accessor :at
- def workflow_rule
- yield self
- end
-
- def eval_str(str)
- eval(str)
- end
- end
- end
- end
- begin
- M::A.eval_str(<<-END)
- workflow_rule do |r|
- r.at 1
- end
- END
- rescue ArgumentError => e
- print "ok"
- end
-}, '[ruby-core:14641]'
-
-assert_equal %{ok}, %{
- class A
- attr :m
- end
- begin
- A.new.m(3)
- rescue ArgumentError => e
- print "ok"
- end
-}, '[ruby-core:15120]'
diff --git a/bootstraptest/test_autoload.rb b/bootstraptest/test_autoload.rb
deleted file mode 100644
index b781fdb7e9..0000000000
--- a/bootstraptest/test_autoload.rb
+++ /dev/null
@@ -1,78 +0,0 @@
-assert_equal 'ok', %q{
- open("zzz.rb", "w") {|f| f.puts "class ZZZ; def self.ok;:ok;end;end"}
- autoload :ZZZ, "./zzz.rb"
- ZZZ.ok
-}
-
-assert_equal 'ok', %q{
- open("zzz.rb", "w") {|f| f.puts "class ZZZ; def self.ok;:ok;end;end"}
- autoload :ZZZ, "./zzz.rb"
- require "./zzz.rb"
- ZZZ.ok
-}
-
-assert_equal 'ok', %q{
- open("zzz.rb", "w") {|f| f.puts "class ZZZ; def self.ok;:ok;end;end"}
- autoload :ZZZ, "./zzz.rb"
- proc{$SAFE=4; ZZZ.ok}.call
-}
-
-assert_equal 'ok', %q{
- open("zzz.rb", "w") {|f| f.puts "class ZZZ; def self.ok;:ok;end;end"}
- autoload :ZZZ, "./zzz.rb"
- require "./zzz.rb"
- proc{$SAFE=4; ZZZ.ok}.call
-}
-
-assert_equal 'ok', %q{
- open("zzz.rb", "w") {|f| f.puts "class ZZZ; def hoge;:ok;end;end"}
- autoload :ZZZ, File.join(Dir.pwd, 'zzz.rb')
- module M; end
- Thread.new{M.instance_eval('$SAFE=4; ZZZ.new.hoge')}.value
-}
-
-assert_equal 'ok', %q{
- open("zzz.rb", "w") {|f| f.puts "class ZZZ; def hoge;:ok;end;end"}
- autoload :ZZZ, File.join(Dir.pwd, 'zzz.rb')
- module M; end
- Thread.new{$SAFE=4; M.instance_eval('ZZZ.new.hoge')}.value
-}
-
-assert_equal 'ok', %q{
- open("zzz.rb", "w") {|f| f.puts "class ZZZ; def hoge;:ok;end;end"}
- autoload :ZZZ, File.join(Dir.pwd, 'zzz.rb')
- Thread.new{$SAFE=4; eval('ZZZ.new.hoge')}.value
-}
-
-assert_equal 'ok', %q{
- open("zzz.rb", "w") {|f| f.puts "class ZZZ; def hoge;:ok;end;end"}
- autoload :ZZZ, File.join(Dir.pwd, 'zzz.rb')
- module M; end
- Thread.new{eval('$SAFE=4; ZZZ.new.hoge')}.value
-}
-
-assert_equal 'okok', %q{
- open("zzz.rb", "w") {|f| f.puts "class ZZZ; def self.ok;:ok;end;end"}
- autoload :ZZZ, "./zzz.rb"
- t1 = Thread.new {ZZZ.ok}
- t2 = Thread.new {ZZZ.ok}
- [t1.value, t2.value].join
-}
-
-assert_finish 5, %q{
- autoload :ZZZ, File.expand_path(__FILE__)
- begin
- ZZZ
- rescue NameError
- end
-}, '[ruby-core:21696]'
-
-assert_equal 'A::C', %q{
- open("zzz.rb", "w") {}
- class A
- autoload :C, "./zzz"
- class C
- end
- C
- end
-}
diff --git a/bootstraptest/test_block.rb b/bootstraptest/test_block.rb
deleted file mode 100644
index ce7f00b033..0000000000
--- a/bootstraptest/test_block.rb
+++ /dev/null
@@ -1,567 +0,0 @@
-assert_equal %q{1}, %q{
- 1.times{
- begin
- a = 1
- ensure
- foo = nil
- end
- }
-}
-assert_equal %q{2}, %q{
- [1,2,3].find{|x| x == 2}
-}
-assert_equal %q{2}, %q{
- class E
- include Enumerable
- def each(&block)
- [1, 2, 3].each(&block)
- end
- end
- E.new.find {|x| x == 2 }
-}
-assert_equal %q{6}, %q{
- sum = 0
- for x in [1, 2, 3]
- sum += x
- end
- sum
-}
-assert_equal %q{15}, %q{
- sum = 0
- for x in (1..5)
- sum += x
- end
- sum
-}
-assert_equal %q{0}, %q{
- sum = 0
- for x in []
- sum += x
- end
- sum
-}
-assert_equal %q{1}, %q{
- ans = []
- 1.times{
- for n in 1..3
- a = n
- ans << a
- end
- }
-}
-assert_equal %q{1..3}, %q{
- ans = []
- for m in 1..3
- for n in 1..3
- a = [m, n]
- ans << a
- end
- end
-}
-assert_equal %q{[1, 2, 3]}, %q{
- (1..3).to_a
-}
-assert_equal %q{[4, 8, 12]}, %q{
- (1..3).map{|e|
- e * 4
- }
-}
-assert_equal %q{[1, 2, 3]}, %q{
- class C
- include Enumerable
- def each
- [1,2,3].each{|e|
- yield e
- }
- end
- end
-
- C.new.to_a
-}
-assert_equal %q{[4, 5, 6]}, %q{
- class C
- include Enumerable
- def each
- [1,2,3].each{|e|
- yield e
- }
- end
- end
-
- C.new.map{|e|
- e + 3
- }
-}
-assert_equal %q{100}, %q{
- def m
- yield
- end
- def n
- yield
- end
-
- m{
- n{
- 100
- }
- }
-}
-assert_equal %q{20}, %q{
- def m
- yield 1
- end
-
- m{|ib|
- m{|jb|
- i = 20
- }
- }
-}
-assert_equal %q{2}, %q{
- def m
- yield 1
- end
-
- m{|ib|
- m{|jb|
- ib = 20
- kb = 2
- }
- }
-}
-assert_equal %q{3}, %q{
- def iter1
- iter2{
- yield
- }
- end
-
- def iter2
- yield
- end
-
- iter1{
- jb = 2
- iter1{
- jb = 3
- }
- jb
- }
-}
-assert_equal %q{2}, %q{
- def iter1
- iter2{
- yield
- }
- end
-
- def iter2
- yield
- end
-
- iter1{
- jb = 2
- iter1{
- jb
- }
- jb
- }
-}
-assert_equal %q{2}, %q{
- def m
- yield 1
- end
- m{|ib|
- ib*2
- }
-}
-assert_equal %q{92580}, %q{
- def m
- yield 12345, 67890
- end
- m{|ib,jb|
- ib*2+jb
- }
-}
-assert_equal %q{[10, nil]}, %q{
- def iter
- yield 10
- end
-
- a = nil
- [iter{|a|
- a
- }, a]
-}
-assert_equal %q{21}, %q{
- def iter
- yield 10
- end
-
- iter{|a|
- iter{|a|
- a + 1
- } + a
- }
-}
-assert_equal %q{[10, 20, 30, 40, nil, nil, nil, nil]}, %q{
- def iter
- yield 10, 20, 30, 40
- end
-
- a = b = c = d = nil
- iter{|a, b, c, d|
- [a, b, c, d]
- } + [a, b, c, d]
-}
-assert_equal %q{[10, 20, 30, 40, nil, nil]}, %q{
- def iter
- yield 10, 20, 30, 40
- end
-
- a = b = nil
- iter{|a, b, c, d|
- [a, b, c, d]
- } + [a, b]
-}
-assert_equal %q{[1]}, %q{
- $a = []
-
- def iter
- yield 1
- end
-
- def m
- x = iter{|x|
- $a << x
- y = 0
- }
- end
- m
- $a
-}
-assert_equal %q{[1, [2]]}, %q{
- def iter
- yield 1, 2
- end
-
- iter{|a, *b|
- [a, b]
- }
-}
-assert_equal %q{[[1, 2]]}, %q{
- def iter
- yield 1, 2
- end
-
- iter{|*a|
- [a]
- }
-}
-assert_equal %q{[1, 2, []]}, %q{
- def iter
- yield 1, 2
- end
-
- iter{|a, b, *c|
- [a, b, c]
- }
-}
-assert_equal %q{[1, 2, nil, []]}, %q{
- def iter
- yield 1, 2
- end
-
- iter{|a, b, c, *d|
- [a, b, c, d]
- }
-}
-assert_equal %q{1}, %q{
- def m
- yield
- end
- m{
- 1
- }
-}
-assert_equal %q{15129}, %q{
- def m
- yield 123
- end
- m{|ib|
- m{|jb|
- ib*jb
- }
- }
-}
-assert_equal %q{2}, %q{
- def m a
- yield a
- end
- m(1){|ib|
- m(2){|jb|
- ib*jb
- }
- }
-}
-assert_equal %q{9}, %q{
- sum = 0
- 3.times{|ib|
- 2.times{|jb|
- sum += ib + jb
- }}
- sum
-}
-assert_equal %q{10}, %q{
- 3.times{|bl|
- break 10
- }
-}
-assert_equal %q{[1, 2]}, %q{
- def iter
- yield 1,2,3
- end
-
- iter{|i, j|
- [i, j]
- }
-}
-assert_equal %q{[1, nil]}, %q{
- def iter
- yield 1
- end
-
- iter{|i, j|
- [i, j]
- }
-}
-
-assert_equal '0', %q{
-def m()
-end
-m {|(v0,*,(*)),|}
-m {|(*v0,(*)),|}
-m {|(v0,*v1,(*)),|}
-m {|((v0,*v1,v2)),|}
-m {|(v0,*v1,v2),|}
-m {|(v0,*v1,(v2)),|}
-m {|((*),*v0,v1),|}
-m {|((v0),*v1,v2),|}
-m {|(v0,v1,*v2,v3),|}
-m {|v0,(v1,*v2,v3),|}
-m {|(v0,*v1,v2),v3,|}
-m {|(v0,*v1,v2)|}
-m {|(v0,*v1,v2),&v3|}
-m {|(v0,*v1,v2),*|}
-m {|(v0,*v1,v2),*,&v3|}
-m {|*,(v0,*v1,v2)|}
-m {|*,(v0,*v1,v2),&v3|}
-m {|v0,*,(v1,*v2,v3)|}
-m {|v0,*,(v1,*v2,v3),&v4|}
-m {|(v0,*v1,v2),*,v3|}
-m {|(v0,*v1,v2),*,v3,&v4|}
-m {|(v0, *v1, v2)|}
-m {|(*,v)|}
-0
-}, "block parameter (shouldn't SEGV: [ruby-dev:31143])"
-
-assert_equal 'nil', %q{
- def m
- yield
- end
- m{|&b| b}.inspect
-}, '[ruby-dev:31147]'
-
-assert_equal 'nil', %q{
- def m()
- yield
- end
- m {|(v,(*))|}.inspect
-}, '[ruby-dev:31160]'
-
-assert_equal 'nil', %q{
- def m()
- yield
- end
- m {|(*,a,b)|}.inspect
-}, '[ruby-dev:31153]'
-
-assert_equal 'nil', %q{
- def m()
- yield
- end
- m {|((*))|}.inspect
-}
-
-assert_equal %q{[1, 1, [1, nil], [1, nil], [1, nil], [1, nil], [1, 1], 1, [1, nil], [1, nil], [1, nil], [1, nil], [[1, 1], [1, 1]], [1, 1], [1, 1], [1, 1], [1, nil], [1, nil], [[[1, 1], [1, 1]], [[1, 1], [1, 1]]], [[1, 1], [1, 1]], [[1, 1], [1, 1]], [[1, 1], [1, 1]], [1, 1], [1, 1], [[[[1, 1], [1, 1]], [[1, 1], [1, 1]]], [[[1, 1], [1, 1]], [[1, 1], [1, 1]]]], [[[1, 1], [1, 1]], [[1, 1], [1, 1]]], [[[1, 1], [1, 1]], [[1, 1], [1, 1]]], [[[1, 1], [1, 1]], [[1, 1], [1, 1]]], [[1, 1], [1, 1]], [[1, 1], [1, 1]]]}, %q{
-def m(ary = [])
- yield(ary)
-end
-
-$ans = []
-o = 1
-5.times{
- v,(*) = o; $ans << o
- m(o){|(v,(*))| $ans << v}
- ((x, y)) = o; $ans << [x, y]
- m(o){|((x, y))| $ans << [x, y]}
- (((x, y))) = o; $ans << [x, y]
- m(o){|(((x, y)))| $ans << [x, y]}
- o = [o, o]
-}; $ans
-}
-
-assert_equal '0', %q{
- def m()
- yield [0]
- end
- m {|*,v| v}.inspect
-}, '[ruby-dev:31437]'
-assert_equal '[0]', %q{
- def m
- yield [0]
- end
- m{|v, &b| v}.inspect
-}, '[ruby-dev:31440]'
-assert_equal 'ok', %q{
- begin
- lambda{|a|}.call(1, 2)
- rescue ArgumentError
- :ok
- else
- :ng
- end
-}, '[ruby-dev:31464]'
-assert_equal 'ok', %q{
- begin
- lambda{|&b|}.call(3)
- rescue ArgumentError
- :ok
- else
- :ng
- end
-}, '[ruby-dev:31472]'
-assert_equal 'ok', %q{
- class C
- def each
- yield [1,2]
- yield 1,2
- end
- end
- vs1 = []
- C.new.each {|*v| vs1 << v }
- vs2 = []
- C.new.to_enum.each {|*v| vs2 << v }
- vs1 == vs2 ? :ok : :ng
-}, '[ruby-dev:32329]'
-
-assert_normal_exit %q{
- e = [1,2,3].each
- 10000.times {
- e = [e].each
- }
- Thread.new { GC.start }.join
-}, '[ruby-dev:32604]'
-
-
-assert_equal '[nil, []]', %q{
- def m() yield nil,[] end
- l = lambda {|*v| v}
- GC.stress=true
- r = m(&l)
- GC.stress=false
- r.inspect
-}, '[ruby-dev:32567]'
-
-assert_equal NilClass.to_s, %q{
- r = false; 1.times{|&b| r = b}; r.class
-}
-
-assert_equal 'ok', %q{
- class C
- define_method(:foo) do |arg, &block|
- if block then block.call else arg end
- end
- end
- C.new.foo("ng") {"ok"}
-}, '[ruby-talk:266422]'
-
-assert_equal 'ok', %q{
- class C
- define_method(:xyz) do |o, k, &block|
- block.call(o, k)
- end
- end
- C.new.xyz("o","k") {|o, k| o+k}
-}, '[ruby-core:20544]'
-
-assert_equal 'ok', %q{
- class C
- define_method(:xyz) do |*args, &block|
- block.call(*args)
- end
- end
- C.new.xyz("o","k") {|*args| args.join("")}
-}, '[ruby-core:20544]'
-
-assert_equal 'ok', %q{
- STDERR.reopen(STDOUT)
- class C
- define_method(:foo) do |&block|
- block.call if block
- end
- result = "ng"
- new.foo() {result = "ok"}
- result
- end
-}
-
-assert_equal "ok", %q{
- class Bar
- def bar; :ok; end
- end
- def foo
- yield(Bar.new) if block_given?
- end
- foo(&:bar)
-}, '[ruby-core:14279]'
-
-assert_normal_exit %q{
- class Controller
- def respond_to(&block)
- responder = Responder.new
- block.call(responder)
- responder.respond
- end
- def test_for_bug
- respond_to{|format|
- format.js{
- puts "in test"
- render{|obj|
- puts obj
- }
- }
- }
- end
- def render(&block)
- puts "in render"
- end
- end
-
- class Responder
- def method_missing(symbol, &block)
- puts "enter method_missing"
- @response = Proc.new{
- puts 'in method missing'
- block.call
- }
- puts "leave method_missing"
- end
- def respond
- @response.call
- end
- end
- t = Controller.new
- t.test_for_bug
-}, '[ruby-core:14395]'
-
diff --git a/bootstraptest/test_class.rb b/bootstraptest/test_class.rb
deleted file mode 100644
index a7f6d4df47..0000000000
--- a/bootstraptest/test_class.rb
+++ /dev/null
@@ -1,152 +0,0 @@
-# class
-assert_equal 'true', %q( class C; end
- Object.const_defined?(:C) )
-assert_equal 'Class', %q( class C; end
- C.class )
-assert_equal 'C', %q( class C; end
- C.name )
-assert_equal 'C', %q( class C; end
- C.new.class )
-assert_equal 'C', %q( class C; end
- C.new.class.name )
-assert_equal 'Class', %q( class C; end
- C.new.class.class )
-
-# inherited class
-assert_equal 'true', %q( class A; end
- class C < A; end
- Object.const_defined?(:C) )
-assert_equal 'Class', %q( class A; end
- class C < A; end
- C.class )
-assert_equal 'C', %q( class A; end
- class C < A; end
- C.name )
-assert_equal 'C', %q( class A; end
- class C < A; end
- C.new.class )
-assert_equal 'C', %q( class A; end
- class C < A; end
- C.new.class.name )
-assert_equal 'Class', %q( class A; end
- class C < A; end
- C.new.class.class )
-
-# module
-assert_equal 'true', %q( module M; end
- Object.const_defined?(:M) )
-assert_equal 'Module', %q( module M; end
- M.class )
-assert_equal 'M', %q( module M; end
- M.name )
-assert_equal 'C', %q( module M; end
- class C; include M; end
- C.new.class )
-
-# nested class
-assert_equal 'A::B', %q( class A; end
- class A::B; end
- A::B )
-assert_equal 'A::B', %q( class A; end
- class A::B; end
- A::B.name )
-assert_equal 'A::B', %q( class A; end
- class A::B; end
- A::B.new.class )
-assert_equal 'Class', %q( class A; end
- class A::B; end
- A::B.new.class.class )
-assert_equal 'A::B::C', %q( class A; end
- class A::B; end
- class A::B::C; end
- A::B::C )
-assert_equal 'A::B::C', %q( class A; end
- class A::B; end
- class A::B::C; end
- A::B::C.name )
-assert_equal 'Class', %q( class A; end
- class A::B; end
- class A::B::C; end
- A::B::C.class )
-assert_equal 'A::B::C', %q( class A; end
- class A::B; end
- class A::B::C; end
- A::B::C.new.class )
-assert_equal 'Class', %q( class A; end
- class A::B; end
- class A::B::C; end
- A::B::C.new.class.class )
-assert_equal 'A::B2', %q( class A; end
- class A::B; end
- class A::B2 < A::B; end
- A::B2 )
-assert_equal 'Class', %q( class A; end
- class A::B; end
- class A::B2 < A::B; end
- A::B2.class )
-
-# reopen
-assert_equal 'true', %q( class C; end; c1 = ::C
- class C; end; c2 = ::C
- c1.equal?(c2) )
-assert_equal '1', %q( class C; end
- class A; end
- begin class C < A; end; rescue TypeError; 1 end )
-assert_equal '1', %q( class C; end
- begin module C; end; rescue TypeError; 1 end )
-assert_equal '1', %q( C = 1 # [yarv-dev:782]
- begin class C; end; rescue TypeError; 1 end )
-assert_equal '1', %q( C = 1 # [yarv-dev:800]
- begin module C; end; rescue TypeError; 1 end )
-
-# colon2, colon3
-assert_equal '1', %q( class A; end; A::C = 1; A::C )
-assert_equal '1', %q( A = 7; begin A::C = 7; rescue TypeError; 1 end )
-assert_equal '1', %q( begin 7::C = 7; rescue TypeError; 1 end )
-assert_equal 'C', %q( class A; class ::C; end end; C )
-assert_equal 'Class', %q( class A; class ::C; end end; C.class )
-assert_equal 'OK', %q( class A; ::C = "OK"; end; C )
-assert_equal 'String', %q( class A; ::C = "OK"; end; C.class )
-
-# class/module dup
-assert_equal 'Class', %q( class C; end; C.dup.class )
-assert_equal 'Module', %q( module M; end; M.dup.class )
-
-
-assert_equal "ok", %q{
- module Foo
- end
-
- begin
- def foo(&b)
- Foo.module_eval &b
- end
- foo{
- def bar
- end
- }
- bar()
- rescue NameError
- :ok
- end
-}, '[ruby-core:14378]'
-
-assert_equal '3', %q{
- $i = 0
- class C
- def self.const_missing *args
- $i+=1
- end
- end
-
- 3.times{
- C::FOO
- }
- $i
-}
-
-assert_match /::C\z/, %q{
- c = nil
- Module.new{|m| c = class m::C; name; end}
- c
-}, '[ruby-dev:38456]'
diff --git a/bootstraptest/test_eval.rb b/bootstraptest/test_eval.rb
deleted file mode 100644
index 452ce43107..0000000000
--- a/bootstraptest/test_eval.rb
+++ /dev/null
@@ -1,310 +0,0 @@
-assert_equal %q{ok}, %q{
- def m
- a = :ok
- $b = binding
- end
- m
- eval('a', $b)
-}
-assert_equal %q{[:ok, :ok2]}, %q{
- def m
- a = :ok
- $b = binding
- end
- m
- eval('b = :ok2', $b)
- eval('[a, b]', $b)
-}
-assert_equal %q{[nil, 1]}, %q{
- $ans = []
- def m
- $b = binding
- end
- m
- $ans << eval(%q{
- $ans << eval(%q{
- a
- }, $b)
- a = 1
- }, $b)
- $ans
-}
-assert_equal %q{C}, %q{
- Const = :top
- class C
- Const = :C
- def m
- binding
- end
- end
- eval('Const', C.new.m)
-}
-assert_equal %q{top}, %q{
- Const = :top
- a = 1
- class C
- Const = :C
- def m
- eval('Const', TOPLEVEL_BINDING)
- end
- end
- C.new.m
-}
-assert_equal %q{:ok
-ok}, %q{
- class C
- $b = binding
- end
- eval %q{
- def m
- :ok
- end
- }, $b
- p C.new.m
-}
-assert_equal %q{ok}, %q{
- b = proc{
- a = :ok
- binding
- }.call
- a = :ng
- eval("a", b)
-}
-assert_equal %q{C}, %q{
- class C
- def foo
- binding
- end
- end
- C.new.foo.eval("self.class.to_s")
-}
-assert_equal %q{1}, %q{
- eval('1')
-}
-assert_equal %q{1}, %q{
- eval('a=1; a')
-}
-assert_equal %q{1}, %q{
- a = 1
- eval('a')
-}
-assert_equal %q{ok}, %q{
- __send__ :eval, %{
- :ok
- }
-}
-assert_equal %q{ok}, %q{
- 1.__send__ :instance_eval, %{
- :ok
- }
-}
-assert_equal %q{1}, %q{
- 1.instance_eval{
- self
- }
-}
-assert_equal %q{foo}, %q{
- 'foo'.instance_eval{
- self
- }
-}
-assert_equal %q{1}, %q{
- class Fixnum
- Const = 1
- end
- 1.instance_eval %{
- Const
- }
-}
-assert_equal %q{C}, %q{
- Const = :top
- class C
- Const = :C
- end
- C.module_eval{
- Const
- }
-}
-assert_equal %q{C}, %q{
- Const = :top
- class C
- Const = :C
- end
- C.class_eval %{
- def m
- Const
- end
- }
- C.new.m
-}
-assert_equal %q{C}, %q{
- Const = :top
- class C
- Const = :C
- end
- C.class_eval{
- def m
- Const
- end
- }
- C.new.m
-}
-assert_equal %q{[:top, :C, :top, :C]}, %q{
- Const = :top
- class C
- Const = :C
- end
- $nest = false
- $ans = []
- def m
- $ans << Const
- C.module_eval %{
- $ans << Const
- Boo = false unless defined? Boo
- unless $nest
- $nest = true
- m
- end
- }
- end
- m
- $ans
-}
-assert_equal %q{[10, main]}, %q{
- $nested = false
- $ans = []
- $pr = proc{
- $ans << self
- unless $nested
- $nested = true
- $pr.call
- end
- }
- class C
- def initialize &b
- 10.instance_eval(&b)
- end
- end
- C.new(&$pr)
- $ans
-}
-
-%w[break next redo].each do |keyword|
- assert_match %r"Can't escape from eval with #{keyword}\z", %{
- begin
- eval "0 rescue #{keyword}"
- rescue SyntaxError => e
- e.message
- end
- }, '[ruby-dev:31372]'
-end
-
-assert_normal_exit %q{
- STDERR.reopen(STDOUT)
- class Foo
- def self.add_method
- class_eval("def some-bad-name; puts 'hello' unless @some_variable.some_function(''); end")
- end
- end
- Foo.add_method
-}, '[ruby-core:14556] reported by Frederick Cheung'
-
-assert_equal 'ok', %q{
- class Module
- def my_module_eval(&block)
- module_eval(&block)
- end
- end
- class String
- Integer.my_module_eval do
- def hoge; end
- end
- end
- if Integer.instance_methods(false).map{|m|m.to_sym}.include?(:hoge) &&
- !String.instance_methods(false).map{|m|m.to_sym}.include?(:hoge)
- :ok
- else
- :ng
- end
-}, "[ruby-dev:34236]"
-
-assert_equal 'ok', %q{
- begin
- eval("class nil::Foo; end")
- :ng
- rescue Exception
- :ok
- end
-}
-
-assert_equal 'ok', %q{
- begin
- 0.instance_eval { def m() :m end }
- 1.m
- :ng
- rescue Exception
- :ok
- end
-}, '[ruby-dev:34579]'
-
-assert_equal 'ok', %q{
- begin
- 12.instance_eval { @@a }
- rescue NameError
- :ok
- end
-}, '[ruby-core:16794]'
-
-assert_equal 'ok', %q{
- begin
- 12.instance_exec { @@a }
- rescue NameError
- :ok
- end
-}, '[ruby-core:16794]'
-
-assert_equal 'ok', %q{
- begin
- nil.instance_eval {
- def a() :a end
- }
- rescue TypeError
- :ok
- end
-}, '[ruby-core:16796]'
-
-assert_equal 'ok', %q{
- begin
- nil.instance_exec {
- def a() :a end
- }
- rescue TypeError
- :ok
- end
-}, '[ruby-core:16796]'
-
-assert_normal_exit %q{
- eval("", method(:proc).call {}.binding)
-}
-
-assert_equal "(eval):1:in `block in <main>': ", %q{
- b = binding
- 10.times{
- eval('', b)
- }
- begin
- eval('1.times{raise}', b)
- rescue => e
- e.message
- end
-}, '[ruby-dev:35392]'
-
-assert_equal "[:x]", %q{
- def kaboom!
- yield.eval("local_variables")
- end
-
- for x in enum_for(:kaboom!)
- binding
- end
-}, '[ruby-core:25125]'
diff --git a/bootstraptest/test_exception.rb b/bootstraptest/test_exception.rb
deleted file mode 100644
index 33154a546d..0000000000
--- a/bootstraptest/test_exception.rb
+++ /dev/null
@@ -1,416 +0,0 @@
-assert_equal %q{2}, %q{
- begin
- 1+1
- ensure
- 2+2
- end
-}
-assert_equal %q{4}, %q{
- begin
- 1+1
- begin
- 2+2
- ensure
- 3+3
- end
- ensure
- 4+4
- end
-}
-assert_equal %q{4}, %q{
- begin
- 1+1
- begin
- 2+2
- ensure
- 3+3
- end
- ensure
- 4+4
- begin
- 5+5
- ensure
- 6+6
- end
- end
-}
-assert_equal %q{NilClass}, %q{
- a = nil
- 1.times{|e|
- begin
- rescue => err
- end
- a = err.class
- }
- a
-}
-assert_equal %q{RuntimeError}, %q{
- a = nil
- 1.times{|e|
- begin
- raise
- rescue => err
- end
- a = err.class
- }
- a
-}
-assert_equal %q{}, %q{
- $!
-}
-assert_equal %q{FOO}, %q{
- begin
- raise "FOO"
- rescue
- $!
- end
-}
-assert_equal %q{FOO}, %q{
- def m
- $!
- end
- begin
- raise "FOO"
- rescue
- m()
- end
-}
-assert_equal %q{[#<RuntimeError: BAR>, #<RuntimeError: FOO>]}, %q{
- $ans = []
- def m
- $!
- end
- begin
- raise "FOO"
- rescue
- begin
- raise "BAR"
- rescue
- $ans << m()
- end
- $ans << m()
- end
- $ans
-}
-assert_equal %q{[#<RuntimeError: FOO>, #<RuntimeError: FOO>]}, %q{
- $ans = []
- def m
- $!
- end
-
- begin
- begin
- raise "FOO"
- ensure
- $ans << m()
- end
- rescue
- $ans << m()
- end
-}
-assert_equal %q{[nil]}, %q{
- $ans = []
- def m
- $!
- end
- def m2
- 1.times{
- begin
- return
- ensure
- $ans << m
- end
- }
- end
- m2
- $ans
-}
-assert_equal %q{ok}, %q{
- begin
- raise
- rescue
- :ok
- end
-}
-assert_equal %q{ok}, %q{
- begin
- raise
- rescue
- :ok
- ensure
- :ng
- end
-}
-assert_equal %q{RuntimeError}, %q{
- begin
- raise
- rescue => e
- e.class
- end
-}
-assert_equal %q{ng}, %q{
- begin
- raise
- rescue StandardError
- :ng
- rescue Exception
- :ok
- end
-}
-assert_equal %q{c}, %q{
- begin
- begin
- raise "a"
- rescue
- raise "b"
- ensure
- raise "c"
- end
- rescue => e
- e.message
- end
-}
-assert_equal %q{33}, %q{
- def m a, b
- a + b
- end
- m(1, begin
- raise
- rescue
- 2
- end) +
- m(10, begin
- raise
- rescue
- 20
- ensure
- 30
- end)
-}
-assert_equal %q{3}, %q{
- def m a, b
- a + b
- end
- m(begin
- raise
- rescue
- 1
- end,
- begin
- raise
- rescue
- 2
- end)
-}
-assert_equal %q{ok3}, %q{
- class E1 < Exception
- end
-
- def m
- yield
- end
-
- begin
- begin
- begin
- m{
- raise
- }
- rescue E1
- :ok2
- ensure
- end
- rescue
- :ok3
- ensure
- end
- rescue E1
- :ok
- ensure
- end
-}
-assert_equal %q{7}, %q{
- $i = 0
- def m
- iter{
- begin
- $i += 1
- begin
- $i += 2
- break
- ensure
-
- end
- ensure
- $i += 4
- end
- $i = 0
- }
- end
-
- def iter
- yield
- end
- m
- $i
-}
-assert_equal %q{10}, %q{
- $i = 0
- def m
- begin
- $i += 1
- begin
- $i += 2
- return
- ensure
- $i += 3
- end
- ensure
- $i += 4
- end
- p :end
- end
- m
- $i
-}
-assert_equal %q{1}, %q{
- begin
- 1
- rescue
- 2
- end
-}
-assert_equal %q{4}, %q{
- begin
- 1
- begin
- 2
- rescue
- 3
- end
- 4
- rescue
- 5
- end
-}
-assert_equal %q{3}, %q{
- begin
- 1
- rescue
- 2
- else
- 3
- end
-}
-assert_equal %q{2}, %q{
- begin
- 1+1
- rescue
- 2+2
- ensure
- 3+3
- end
- }
-assert_equal %q{2}, %q{
- begin
- 1+1
- rescue
- 2+2
- ensure
- 3+3
- end
- }
-assert_equal %q{6}, %q{
- begin
- 1+1
- rescue
- 2+2
- else
- 3+3
- ensure
- 4+4
- end
- }
-assert_equal %q{12}, %q{
- begin
- 1+1
- begin
- 2+2
- rescue
- 3+3
- else
- 4+4
- end
- rescue
- 5+5
- else
- 6+6
- ensure
- 7+7
- end
- }
-assert_equal %q{ok}, %q{ #
- proc{
- begin
- raise
- break
- rescue
- :ok
- end
- }.call
-}
-assert_equal %q{}, %q{
- proc do
- begin
- raise StandardError
- redo
- rescue StandardError
- end
- end.call
-}
-
-##
-assert_match /undefined method `foo\'/, %q{#`
- STDERR.reopen(STDOUT)
- class C
- def inspect
- bar {}
- end
-
- def bar
- raise
- ensure
- end
- end
- C.new.foo
-}, "[ruby-dev:31407]"
-
-assert_equal 'nil', %q{
- doit = false
- exc = nil
- t = Thread.new {
- begin
- doit = true
- sleep 10
- ensure
- exc = $!
- end
- }
- Thread.pass until doit
- t.kill
- t.join
- exc.inspect
-}, '[ruby-dev:32608]'
-
-assert_equal 'exception class/object expected', %q{
- class ZeroDivisionError
- def self.new(message)
- 42
- end
- end
- begin
- 1/0
- rescue Exception => e
- e.message
- end
-}, '[ruby-core:24767]'
diff --git a/bootstraptest/test_finalizer.rb b/bootstraptest/test_finalizer.rb
deleted file mode 100644
index 22a16b1220..0000000000
--- a/bootstraptest/test_finalizer.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-assert_normal_exit %q{
-a1,a2,b1,b2=Array.new(4){""}
-ObjectSpace.define_finalizer(b2,proc{})
-ObjectSpace.define_finalizer(b1,proc{b1.inspect})
-
-ObjectSpace.define_finalizer(a2,proc{a1.inspect})
-ObjectSpace.define_finalizer(a1,proc{})
-}, '[ruby-dev:35778]'
diff --git a/bootstraptest/test_flip.rb b/bootstraptest/test_flip.rb
deleted file mode 100644
index ff194868b2..0000000000
--- a/bootstraptest/test_flip.rb
+++ /dev/null
@@ -1 +0,0 @@
-assert_equal %q{E}, %q{$_ = "E"; eval("nil if true..~/^E/",nil,"-e"); $_}
diff --git a/bootstraptest/test_flow.rb b/bootstraptest/test_flow.rb
deleted file mode 100644
index 46ca1a0c6a..0000000000
--- a/bootstraptest/test_flow.rb
+++ /dev/null
@@ -1,504 +0,0 @@
-assert_equal %q{[1, 2, 4, 5, 6, 7, 8]}, %q{$a = []; begin; ; $a << 1
- [1,2].each{; $a << 2
- break; $a << 3
- }; $a << 4
- begin; $a << 5
- ensure; $a << 6
- end; $a << 7
-; $a << 8
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{[1, 2, 3, 5, 6, 7, 8]}, %q{$a = []; begin; ; $a << 1
- begin; $a << 2
- [1,2].each do; $a << 3
- break; $a << 4
- end; $a << 5
- ensure; $a << 6
- end; $a << 7
-; $a << 8
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{ok}, %q{
- ["a"].inject("ng"){|x,y|
- break :ok
- }
-}
-assert_equal %q{ok}, %q{
- unless ''.respond_to? :lines
- class String
- def lines
- self
- end
- end
- end
-
- ('a').lines.map{|e|
- break :ok
- }
-}
-assert_equal %q{[1, 2, 4, 5]}, %q{$a = []; begin; ; $a << 1
- ["a"].inject("ng"){|x,y|; $a << 2
- break :ok; $a << 3
- }; $a << 4
-; $a << 5
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{[1, 2, 4, 5]}, %q{$a = []; begin; ; $a << 1
- ('a'..'b').map{|e|; $a << 2
- break :ok; $a << 3
- }; $a << 4
-; $a << 5
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{[1, 2, 3, 5, 7, 8]}, %q{$a = []; begin; ; $a << 1
- [1,2].each do; $a << 2
- begin; $a << 3
- break; $a << 4
- ensure; $a << 5
- end; $a << 6
- end; $a << 7
-; $a << 8
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{[1, 2, 3, 4, 5, 6, 9, 10]}, %q{$a = []; begin; ; $a << 1
- i=0; $a << 2
- while i<3; $a << 3
- i+=1; $a << 4
- begin; $a << 5
- ensure; $a << 6
- break; $a << 7
- end; $a << 8
- end; $a << 9
-; $a << 10
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{[1, 2, 3, 4, 5, 7, 10, 11]}, %q{$a = []; begin; ; $a << 1
- i=0; $a << 2
- while i<3; $a << 3
- i+=1; $a << 4
- begin; $a << 5
- raise; $a << 6
- ensure; $a << 7
- break; $a << 8
- end; $a << 9
- end; $a << 10
-; $a << 11
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{[1, 2, 3, 4, 5, 7, 10, 11]}, %q{$a = []; begin; ; $a << 1
- i=0; $a << 2
- while i<3; $a << 3
- i+=1; $a << 4
- begin; $a << 5
- raise; $a << 6
- rescue; $a << 7
- break; $a << 8
- end; $a << 9
- end; $a << 10
-; $a << 11
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{[1, 2, 3, 5, 8, 9]}, %q{$a = []; begin; ; $a << 1
- [1,2].each do; $a << 2
- begin; $a << 3
- raise StandardError; $a << 4
- ensure; $a << 5
- break; $a << 6
- end; $a << 7
- end; $a << 8
-; $a << 9
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{[1, 2, 3, 5, 8, 9]}, %q{$a = []; begin; ; $a << 1
- [1,2].each do; $a << 2
- begin; $a << 3
- raise StandardError; $a << 4
- rescue; $a << 5
- break; $a << 6
- end; $a << 7
- end; $a << 8
-; $a << 9
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{[1, 2, 3, 4, 6, 8, 10, 11]}, %q{$a = []; begin; ; $a << 1
- [1,2].each do; $a << 2
- begin; $a << 3
- begin; $a << 4
- break; $a << 5
- ensure; $a << 6
- end; $a << 7
- ensure; $a << 8
- end; $a << 9
- end; $a << 10
-; $a << 11
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{[1, 2, 3, 4, 5, 6, 7, 8, 10, 13, 3, 4, 5, 6, 7, 8, 10, 13, 3, 4, 5, 6, 7, 8, 10, 13, 14, 15]}, %q{$a = []; begin; ; $a << 1
- i = 0; $a << 2
- while i<3; $a << 3
- i+=1; $a << 4
- j = 0; $a << 5
- while j<3; $a << 6
- j+=1; $a << 7
- begin; $a << 8
- raise; $a << 9
- rescue; $a << 10
- break; $a << 11
- end; $a << 12
- end; $a << 13
- end; $a << 14
-; $a << 15
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{[1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 14, 6, 7, 8, 9, 11, 14, 6, 7, 8, 9, 11, 14, 15, 3, 4, 5, 6, 7, 8, 9, 11, 14, 6, 7, 8, 9, 11, 14, 6, 7, 8, 9, 11, 14, 15, 3, 4, 5, 6, 7, 8, 9, 11, 14, 6, 7, 8, 9, 11, 14, 6, 7, 8, 9, 11, 14, 15, 16, 17]}, %q{$a = []; begin; ; $a << 1
- i = 0; $a << 2
- while i<3; $a << 3
- i+=1; $a << 4
- j = 0; $a << 5
- while j<3; $a << 6
- j+=1; $a << 7
- 1.times{; $a << 8
- begin; $a << 9
- raise; $a << 10
- rescue; $a << 11
- break; $a << 12
- end; $a << 13
- }; $a << 14
- end; $a << 15
- end; $a << 16
-; $a << 17
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{[1, 2, 3, 4, 5, 6, 7, 8, 10, 13, 3, 4, 5, 6, 7, 8, 10, 13, 3, 4, 5, 6, 7, 8, 10, 13, 14, 15]}, %q{$a = []; begin; ; $a << 1
- i = 0; $a << 2
- while i<3; $a << 3
- i+=1; $a << 4
- j = 0; $a << 5
- while j<3; $a << 6
- j+=1; $a << 7
- begin; $a << 8
- raise; $a << 9
- ensure; $a << 10
- break; $a << 11
- end; $a << 12
- end; $a << 13
- end; $a << 14
-; $a << 15
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{[1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 14, 6, 7, 8, 9, 11, 14, 6, 7, 8, 9, 11, 14, 15, 3, 4, 5, 6, 7, 8, 9, 11, 14, 6, 7, 8, 9, 11, 14, 6, 7, 8, 9, 11, 14, 15, 3, 4, 5, 6, 7, 8, 9, 11, 14, 6, 7, 8, 9, 11, 14, 6, 7, 8, 9, 11, 14, 15, 16, 17]}, %q{$a = []; begin; ; $a << 1
- i = 0; $a << 2
- while i<3; $a << 3
- i+=1; $a << 4
- j = 0; $a << 5
- while j<3; $a << 6
- j+=1; $a << 7
- 1.times{; $a << 8
- begin; $a << 9
- raise; $a << 10
- ensure; $a << 11
- break; $a << 12
- end; $a << 13
- }; $a << 14
- end; $a << 15
- end; $a << 16
-; $a << 17
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{[1, 2, 3, 5, 8, 9]}, %q{$a = []; begin; ; $a << 1
- while true; $a << 2
- begin; $a << 3
- break; $a << 4
- ensure; $a << 5
- break; $a << 6
- end; $a << 7
- end; $a << 8
-; $a << 9
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{[1, 2, 3, 5, 99]}, %q{
-$a = [];
-begin; ; $a << 1
- while true; $a << 2
- begin; $a << 3
- break; $a << 4
- ensure; $a << 5
- raise; $a << 6
- end; $a << 7
- end; $a << 8
-; $a << 9
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{[1, 2, 3, 4, 6, 8, 9, 10, 11]}, %q{$a = []; begin; ; $a << 1
- begin; $a << 2
- [1,2].each do; $a << 3
- begin; $a << 4
- break; $a << 5
- ensure; $a << 6
- end; $a << 7
- end; $a << 8
- ensure; $a << 9
- end; $a << 10
-; $a << 11
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{[1, 2, 4, 99]}, %q{$a = []; begin; ; $a << 1
- begin; $a << 2
- raise StandardError; $a << 3
- ensure; $a << 4
- end; $a << 5
-; $a << 6
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{[1, 2, 3, 4]}, %q{$a = []; begin; ; $a << 1
- begin; $a << 2
- ensure; $a << 3
- end ; $a << 4
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{[1, 2, 3, 5, 99]}, %q{$a = []; begin; ; $a << 1
- [1,2].each do; $a << 2
- begin; $a << 3
- break; $a << 4
- ensure; $a << 5
- raise StandardError; $a << 6
- end; $a << 7
- end; $a << 8
-; $a << 9
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{3}, %q{
- def m a, b
- a + b
- end
- m(1,
- while true
- break 2
- end
- )
-}
-assert_equal %q{4}, %q{
- def m a, b
- a + b
- end
- m(1,
- (i=0; while i<2
- i+=1
- class C
- next 2
- end
- end; 3)
- )
-}
-assert_equal %q{34}, %q{
- def m a, b
- a+b
- end
- m(1, 1.times{break 3}) +
- m(10, (1.times{next 3}; 20))
-}
-assert_equal %q{[1, 2, 3, 6, 7]}, %q{$a = []; begin; ; $a << 1
- 3.times{; $a << 2
- class C; $a << 3
- break; $a << 4
- end; $a << 5
- }; $a << 6
-; $a << 7
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{[1, 2, 3, 4, 8, 9]}, %q{$a = []; begin; ; $a << 1
- 3.times{; $a << 2
- class A; $a << 3
- class B; $a << 4
- break; $a << 5
- end; $a << 6
- end; $a << 7
- }; $a << 8
-; $a << 9
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{[1, 2, 3, 2, 3, 2, 3, 6, 7]}, %q{$a = []; begin; ; $a << 1
- 3.times{; $a << 2
- class C; $a << 3
- next; $a << 4
- end; $a << 5
- }; $a << 6
-; $a << 7
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{[1, 2, 3, 4, 2, 3, 4, 2, 3, 4, 8, 9]}, %q{$a = []; begin; ; $a << 1
- 3.times{; $a << 2
- class C; $a << 3
- class D; $a << 4
- next; $a << 5
- end; $a << 6
- end; $a << 7
- }; $a << 8
-; $a << 9
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{[1, 2, 3, 6, 7]}, %q{$a = []; begin; ; $a << 1
- while true; $a << 2
- class C; $a << 3
- break; $a << 4
- end; $a << 5
- end; $a << 6
-; $a << 7
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{[1, 2, 3, 4, 8, 9]}, %q{$a = []; begin; ; $a << 1
- while true; $a << 2
- class C; $a << 3
- class D; $a << 4
- break; $a << 5
- end; $a << 6
- end; $a << 7
- end; $a << 8
-; $a << 9
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{[1, 2, 3, 4, 5, 3, 4, 5, 3, 4, 5, 8, 9]}, %q{$a = []; begin; ; $a << 1
- i=0; $a << 2
- while i<3; $a << 3
- i+=1; $a << 4
- class C; $a << 5
- next 10; $a << 6
- end; $a << 7
- end; $a << 8
-; $a << 9
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{1}, %q{
- 1.times{
- while true
- class C
- begin
- break
- ensure
- break
- end
- end
- end
- }
-}
-assert_equal %q{[1, 2, 3, 5, 2, 3, 5, 7, 8]}, %q{$a = []; begin; ; $a << 1
- [1,2].each do; $a << 2
- begin; $a << 3
- next; $a << 4
- ensure; $a << 5
- end; $a << 6
- end; $a << 7
-; $a << 8
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{[1, 2, 6, 3, 5, 7, 8]}, %q{$a = []; begin; ; $a << 1
- o = "test"; $a << 2
- def o.test(a); $a << 3
- return a; $a << 4
- ensure; $a << 5
- end; $a << 6
- o.test(123); $a << 7
-; $a << 8
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{[1, 4, 7, 5, 8, 9]}, %q{$a = []; begin; ; $a << 1
- def m1 *args; $a << 2
- ; $a << 3
- end; $a << 4
- def m2; $a << 5
- m1(:a, :b, (return 1; :c)); $a << 6
- end; $a << 7
- m2; $a << 8
-; $a << 9
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{[1, 8, 2, 3, 4, 5, 9, 10]}, %q{$a = []; begin; ; $a << 1
- def m(); $a << 2
- begin; $a << 3
- 2; $a << 4
- ensure; $a << 5
- return 3; $a << 6
- end; $a << 7
- end; $a << 8
- m; $a << 9
-; $a << 10
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{[1, 3, 11, 4, 5, 6, 7, 12, 13]}, %q{$a = []; begin; ; $a << 1
- def m2; $a << 2
- end; $a << 3
- def m(); $a << 4
- m2(begin; $a << 5
- 2; $a << 6
- ensure; $a << 7
- return 3; $a << 8
- end); $a << 9
- 4; $a << 10
- end; $a << 11
- m(); $a << 12
-; $a << 13
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{[1, 16, 2, 3, 4, 5, 6, 7, 10, 11, 17, 18]}, %q{$a = []; begin; ; $a << 1
- def m; $a << 2
- 1; $a << 3
- 1.times{; $a << 4
- 2; $a << 5
- begin; $a << 6
- 3; $a << 7
- return; $a << 8
- 4; $a << 9
- ensure; $a << 10
- 5; $a << 11
- end; $a << 12
- 6; $a << 13
- }; $a << 14
- 7; $a << 15
- end; $a << 16
- m(); $a << 17
-; $a << 18
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{[:ok, :ok2, :last]}, %q{
- a = []
- i = 0
- begin
- while i < 1
- i+=1
- begin
- begin
- next
- ensure
- a << :ok
- end
- ensure
- a << :ok2
- end
- end
- ensure
- a << :last
- end
- a
-}
-assert_equal %q{[:ok, :ok2, :last]}, %q{
- a = []
- i = 0
- begin
- while i < 1
- i+=1
- begin
- begin
- break
- ensure
- a << :ok
- end
- ensure
- a << :ok2
- end
- end
- ensure
- a << :last
- end
- a
-}
-assert_equal %q{[:ok, :ok2, :last]}, %q{
- a = []
- i = 0
- begin
- while i < 1
- if i>0
- break
- end
- i+=1
- begin
- begin
- redo
- ensure
- a << :ok
- end
- ensure
- a << :ok2
- end
- end
- ensure
- a << :last
- end
- a
-}
-assert_equal %Q{ENSURE\n}, %q{
- def test
- while true
- return
- end
- ensure
- puts("ENSURE")
- end
- test
-}, '[ruby-dev:37967]'
-
diff --git a/bootstraptest/test_fork.rb b/bootstraptest/test_fork.rb
deleted file mode 100644
index 60a74e8a22..0000000000
--- a/bootstraptest/test_fork.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-assert_equal '0', %q{
- begin
- GC.stress = true
- pid = fork {}
- Process.wait pid
- $?.to_i
- rescue NotImplementedError
- 0
- end
-}, '[ruby-dev:32404]'
-
-assert_finish 10, %q{
- begin
- children = (1..10).map{
- Thread.start{fork{}}.value
- }
- while !children.empty? and pid = Process.wait
- children.delete(pid)
- end
- rescue NotImplementedError
- end
-}, '[ruby-core:22158]'
-
-assert_normal_exit(<<'End', '[ruby-dev:37934]')
- Thread.new { sleep 1; Thread.kill Thread.main }
- Process.setrlimit(:NPROC, 1)
- fork {}
-End
diff --git a/bootstraptest/test_io.rb b/bootstraptest/test_io.rb
deleted file mode 100644
index 2294654211..0000000000
--- a/bootstraptest/test_io.rb
+++ /dev/null
@@ -1,103 +0,0 @@
-assert_finish 5, %q{
- r, w = IO.pipe
- t1 = Thread.new { r.sysread(1) }
- t2 = Thread.new { r.sysread(1) }
- sleep 0.1
- w.write "a"
- sleep 0.1
- w.write "a"
-}, '[ruby-dev:31866]'
-
-assert_finish 10, %q{
- begin
- require "io/nonblock"
- require "timeout"
- timeout(3) do
- r, w = IO.pipe
- w.nonblock = true
- w.write_nonblock("a" * 100000)
- w.nonblock = false
- t1 = Thread.new { w.write("b" * 4096) }
- t2 = Thread.new { w.write("c" * 4096) }
- sleep 0.5
- r.sysread(4096).length
- sleep 0.5
- r.sysread(4096).length
- t1.join
- t2.join
- end
- rescue LoadError, TimeoutError
- end
-}, '[ruby-dev:32566]'
-
-assert_finish 1, %q{
- r, w = IO.pipe
- Thread.new {
- w << "ab"
- sleep 0.1
- w << "ab"
- }
- r.gets("abab")
-}
-
-assert_equal 'ok', %q{
- require 'tmpdir'
- begin
- tmpname = "#{Dir.tmpdir}/ruby-btest-#{$$}-#{rand(0x100000000).to_s(36)}"
- rw = File.open(tmpname, File::RDWR|File::CREAT|File::EXCL)
- rescue Errno::EEXIST
- retry
- end
- save = STDIN.dup
- STDIN.reopen(rw)
- STDIN.reopen(save)
- rw.close
- File.unlink(tmpname)
- :ok
-}
-
-assert_equal 'ok', %q{
- require 'tmpdir'
- begin
- tmpname = "#{Dir.tmpdir}/ruby-btest-#{$$}-#{rand(0x100000000).to_s(36)}"
- rw = File.open(tmpname, File::RDWR|File::CREAT|File::EXCL)
- rescue Errno::EEXIST
- retry
- end
- save = STDIN.dup
- STDIN.reopen(rw)
- STDIN.print "a"
- STDIN.reopen(save)
- rw.close
- File.unlink(tmpname)
- :ok
-}
-
-assert_normal_exit %q{
- ARGF.set_encoding "foo"
-}
-
-50.times do
- assert_normal_exit %q{
- at_exit { p :foo }
-
- megacontent = "abc" * 12345678
- #File.open("megasrc", "w") {|f| f << megacontent }
-
- Thread.new { sleep rand*0.2; Process.kill(:INT, $$) }
-
- r1, w1 = IO.pipe
- r2, w2 = IO.pipe
- t1 = Thread.new { w1 << megacontent; w1.close }
- t2 = Thread.new { r2.read }
- IO.copy_stream(r1, w2) rescue nil
- r2.close; w2.close
- r1.close; w1.close
- }, '', ["INT"] or break
-end
-
-assert_normal_exit %q{
- r, w = IO.pipe
- STDOUT.reopen(w)
- STDOUT.reopen(__FILE__, "r")
-}, '[ruby-dev:38131]'
diff --git a/bootstraptest/test_jump.rb b/bootstraptest/test_jump.rb
deleted file mode 100644
index 77467337c2..0000000000
--- a/bootstraptest/test_jump.rb
+++ /dev/null
@@ -1,261 +0,0 @@
-assert_equal %q{ok}, %q{
- def m
- :ng1
- mm{
- yield
- }
- :ng2
- end
-
- def mm
- :ng3
- yield
- :ng4
- end
-
- m{
- break :ok
- }
-}
-assert_equal %q{ok}, %q{
- 3.times{
- break :ok
- }
-}
-assert_equal %q{}, %q{
- catch(:foo){
- throw :foo
- }
-}
-assert_equal %q{false}, %q{
- catch(:foo){
- throw :foo, false
- }
-}
-assert_equal %q{}, %q{
- catch(:foo){
- throw :foo, nil
- }
-}
-assert_equal %q{ok}, %q{
- catch(:foo){
- throw :foo, :ok
- }
-}
-assert_equal %q{}, %q{
- catch(:foo){
- 1.times{
- throw :foo
- }
- }
-}
-assert_equal %q{ok}, %q{
- catch(:foo){
- 1.times{
- throw :foo, :ok
- }
- }
-}
-assert_equal %q{ok}, %q{
- catch(:foo){
- catch(:bar){
- throw :foo, :ok
- }
- :ng
- }
-}
-assert_equal %q{ok}, %q{
- catch(:foo){
- catch(:bar){
- 1.times{
- throw :foo, :ok
- }
- }
- :ng
- }
-}
-assert_equal %q{2}, %q{
- module Enumerable
- def all_?
- self.each{|e|
- unless yield(e)
- return false
- end
- }
- true
- end
- end
-
- xxx = 0
- [1,2].each{|bi|
- [3,4].each{|bj|
- [true, nil, true].all_?{|be| be}
- break
- }
- xxx += 1
- }
- xxx
-}
-assert_equal %q{ok}, %q{
- def m
- yield
- end
-
- m{
- begin
- ensure
- break :ok
- end
- }
-}
-assert_equal %q{ok}, %q{
- def m
- yield
- :ok
- end
- i=0
- m{
- if i>10
- i*i
- else
- i+=1
- next
- end
- }
-}
-assert_equal %q{ok}, %q{
- def m
- yield
- end
-
- m{
- next :ok
- }
-}
-assert_equal %q{131}, %q{
- def m
- yield + 10
- end
- i=0
- m{
- if i>10
- i*i
- else
- i+=1
- redo
- end
- }
-}
-assert_equal %q{ok}, %q{
-begin
- eval %q{
- 1.times{
- retry
- }
- }
-rescue SyntaxError
- :ok
-end
-}
-assert_equal %q{3}, %q{
- def m
- return 3
- end
- m
-}
-assert_equal %q{ok}, %q{
- def m
- :ng1
- mm{
- return :ok
- }
- :ng2
- end
-
- def mm
- :ng3
- yield
- :ng4
- end
- m
-}
-assert_equal %q{100}, %q{
- $i = 0
- def m
- begin
- iter{
- return
- }
- ensure
- $i = 100
- end
- end
-
- def iter
- yield
- end
- m
- $i
-}
-assert_equal %q{ok}, %q{
- def m
- begin
- raise
- rescue
- return :ok
- end
- :ng
- end
- m
-}
-assert_equal %q{1}, %q{
- def m
- begin
- raise
- rescue
- return 1
- end
- end
-
- m
-}
-assert_equal %q{1}, %q{
- def m
- begin
- #
- ensure
- return 1
- end
- end
-
- m
-}
-assert_equal 'ok', %q{
- begin
- catch {|t| throw t, :ok }
- rescue ArgumentError
- :ng
- end
-}, '[ruby-dev:31609]'
-
-assert_equal "1", %q{
- catch do |t|
- begin
- throw t, 1
- 2
- ensure
- 3
- end
- end
-}, "[ruby-dev:31698]"
-
-assert_normal_exit %q{
- f = 0
- 1.times do
- begin
- f += 1
- ensure
- redo unless f > 2
- end
- end
-}
diff --git a/bootstraptest/test_literal.rb b/bootstraptest/test_literal.rb
deleted file mode 100644
index ab028e2c1e..0000000000
--- a/bootstraptest/test_literal.rb
+++ /dev/null
@@ -1,202 +0,0 @@
-# empty program
-assert_equal '', ''
-assert_equal '', ' '
-assert_equal '', "\n"
-
-# special const
-assert_equal 'true', 'true'
-assert_equal 'TrueClass', 'true.class'
-assert_equal 'false', 'false'
-assert_equal 'FalseClass', 'false.class'
-assert_equal '', 'nil'
-assert_equal 'nil', 'nil.inspect'
-assert_equal 'NilClass', 'nil.class'
-assert_equal 'sym', ':sym'
-assert_equal ':sym', ':sym.inspect'
-assert_equal 'Symbol', ':sym.class'
-assert_equal '1234', '1234'
-assert_equal 'Fixnum', '1234.class'
-assert_equal '1234', '1_2_3_4'
-assert_equal 'Fixnum', '1_2_3_4.class'
-assert_equal '18', '0x12'
-assert_equal 'Fixnum', '0x12.class'
-assert_equal '15', '0o17'
-assert_equal 'Fixnum', '0o17.class'
-assert_equal '5', '0b101'
-assert_equal 'Fixnum', '0b101.class'
-assert_equal '123456789012345678901234567890', '123456789012345678901234567890'
-assert_equal 'Bignum', '123456789012345678901234567890.class'
-assert_equal '2.0', '2.0'
-assert_equal 'Float', '1.3.class'
-
-# self
-assert_equal 'main', 'self'
-assert_equal 'Object', 'self.class'
-
-# string literal
-assert_equal 'a', '?a'
-assert_equal 'String', '?a.class'
-assert_equal 'A', '?A'
-assert_equal 'String', '?A.class'
-assert_equal "\n", '?\n'
-assert_equal 'String', '?\n.class'
-assert_equal ' ', '?\ '
-assert_equal 'String', '?\ .class'
-assert_equal 'string', "'string'"
-assert_equal 'string', '"string"'
-assert_equal 'string', '%(string)'
-assert_equal 'string', '%q(string)'
-assert_equal 'string', '%Q(string)'
-assert_equal 'string string', '"string string"'
-assert_equal ' ', '" "'
-assert_equal "\0", '"\0"'
-assert_equal "\1", '"\1"'
-assert_equal "3", '"\x33"'
-assert_equal "\n", '"\n"'
-
-# dynamic string literal
-assert_equal '2', '"#{1 + 1}"'
-assert_equal '16', '"#{2 ** 4}"'
-assert_equal 'string', 's = "string"; "#{s}"'
-
-# dynamic symbol literal
-assert_equal 'a3c', ':"a#{1+2}c"'
-assert_equal ':a3c', ':"a#{1+2}c".inspect'
-assert_equal 'Symbol', ':"a#{1+2}c".class'
-
-# xstring
-assert_equal "foo\n", %q(`echo foo`)
-assert_equal "foo\n", %q(s = "foo"; `echo #{s}`)
-
-# regexp
-assert_equal '', '//.source'
-assert_equal 'Regexp', '//.class'
-assert_equal '0', '// =~ "a"'
-assert_equal '0', '// =~ ""'
-assert_equal 'a', '/a/.source'
-assert_equal 'Regexp', '/a/.class'
-assert_equal '0', '/a/ =~ "a"'
-assert_equal '0', '/test/ =~ "test"'
-assert_equal '', '/test/ =~ "tes"'
-assert_equal '0', 're = /test/; re =~ "test"'
-assert_equal '0', 'str = "test"; /test/ =~ str'
-assert_equal '0', 're = /test/; str = "test"; re =~ str'
-
-# dynacmi regexp
-assert_equal 'regexp', %q(/re#{'ge'}xp/.source)
-assert_equal 'Regexp', %q(/re#{'ge'}xp/.class)
-
-# array
-assert_equal 'Array', '[].class'
-assert_equal '0', '[].size'
-assert_equal '0', '[].length'
-assert_equal '[]', '[].inspect'
-assert_equal 'Array', '[0].class'
-assert_equal '1', '[3].size'
-assert_equal '[3]', '[3].inspect'
-assert_equal '3', 'a = [3]; a[0]'
-assert_equal 'Array', '[1,2].class'
-assert_equal '2', '[1,2].size'
-assert_equal '[1, 2]', '[1,2].inspect'
-assert_equal 'Array', '[1,2,3,4,5].class'
-assert_equal '5', '[1,2,3,4,5].size'
-assert_equal '[1, 2, 3, 4, 5]', '[1,2,3,4,5].inspect'
-assert_equal '1', 'a = [1,2]; a[0]'
-assert_equal '2', 'a = [1,2]; a[1]'
-assert_equal 'Array', 'a = [1 + 2, 3 + 4, 5 + 6]; a.class'
-assert_equal '[3, 7, 11]', 'a = [1 + 2, 3 + 4, 5 + 6]; a.inspect'
-assert_equal '7', 'a = [1 + 2, 3 + 4, 5 + 6]; a[1]'
-assert_equal '1', '([0][0] += 1)'
-assert_equal '1', '([2][0] -= 1)'
-assert_equal 'Array', 'a = [obj = Object.new]; a.class'
-assert_equal '1', 'a = [obj = Object.new]; a.size'
-assert_equal 'true', 'a = [obj = Object.new]; a[0] == obj'
-assert_equal '5', 'a = [1,2,3]; a[1] = 5; a[1]'
-assert_equal 'bar', '[*:foo];:bar'
-assert_equal '[1, 2]', 'def nil.to_a; [2]; end; [1, *nil]'
-assert_equal '[1, 2]', 'def nil.to_a; [1, 2]; end; [*nil]'
-assert_equal '[0, 1, {2=>3}]', '[0, *[1], 2=>3]', "[ruby-dev:31592]"
-
-
-# hash
-assert_equal 'Hash', '{}.class'
-assert_equal '{}', '{}.inspect'
-assert_equal 'Hash', '{1=>2}.class'
-assert_equal '{1=>2}', '{1=>2}.inspect'
-assert_equal '2', 'h = {1 => 2}; h[1]'
-assert_equal '0', 'h = {1 => 2}; h.delete(1); h.size'
-assert_equal '', 'h = {1 => 2}; h.delete(1); h[1]'
-assert_equal '2', 'h = {"string" => "literal", "goto" => "hell"}; h.size'
-assert_equal 'literal', 'h = {"string"=>"literal", "goto"=>"hell"}; h["string"]'
-assert_equal 'hell', 'h = {"string"=>"literal", "goto"=>"hell"}; h["goto"]'
-
-# range
-assert_equal 'Range', '(1..2).class'
-assert_equal '1..2', '(1..2).inspect'
-assert_equal '1', '(1..2).begin'
-assert_equal '2', '(1..2).end'
-assert_equal 'false', '(1..2).exclude_end?'
-assert_equal 'Range', 'r = 1..2; r.class'
-assert_equal '1..2', 'r = 1..2; r.inspect'
-assert_equal '1', 'r = 1..2; r.begin'
-assert_equal '2', 'r = 1..2; r.end'
-assert_equal 'false', 'r = 1..2; r.exclude_end?'
-assert_equal 'Range', '(1...3).class'
-assert_equal '1...3', '(1...3).inspect'
-assert_equal '1', '(1...3).begin'
-assert_equal '3', '(1...3).end'
-assert_equal 'true', '(1...3).exclude_end?'
-assert_equal 'Range', 'r = (1...3); r.class'
-assert_equal '1...3', 'r = (1...3); r.inspect'
-assert_equal '1', 'r = (1...3); r.begin'
-assert_equal '3', 'r = (1...3); r.end'
-assert_equal 'true', 'r = (1...3); r.exclude_end?'
-assert_equal 'Range', 'r = (1+2 .. 3+4); r.class'
-assert_equal '3..7', 'r = (1+2 .. 3+4); r.inspect'
-assert_equal '3', 'r = (1+2 .. 3+4); r.begin'
-assert_equal '7', 'r = (1+2 .. 3+4); r.end'
-assert_equal 'false', 'r = (1+2 .. 3+4); r.exclude_end?'
-assert_equal 'Range', 'r = (1+2 ... 3+4); r.class'
-assert_equal '3...7', 'r = (1+2 ... 3+4); r.inspect'
-assert_equal '3', 'r = (1+2 ... 3+4); r.begin'
-assert_equal '7', 'r = (1+2 ... 3+4); r.end'
-assert_equal 'true', 'r = (1+2 ... 3+4); r.exclude_end?'
-assert_equal 'Range', 'r = ("a".."c"); r.class'
-assert_equal '"a".."c"', 'r = ("a".."c"); r.inspect'
-assert_equal 'a', 'r = ("a".."c"); r.begin'
-assert_equal 'c', 'r = ("a".."c"); r.end'
-
-assert_equal 'String', '__FILE__.class'
-assert_equal 'Fixnum', '__LINE__.class'
-
-###
-
-assert_equal 'ok', %q{
- # this cause "called on terminated object".
- ObjectSpace.each_object(Module) {|m| m.name.inspect }
- :ok
-}
-
-assert_normal_exit %q{
- begin
- r = 0**-1
- r + r
- rescue
- end
-}, '[ruby-dev:34524]'
-
-assert_normal_exit %q{
- begin
- r = Marshal.load("\x04\bU:\rRational[\ai\x06i\x05")
- r + r
- rescue
- end
-}, '[ruby-dev:34536]'
-
-assert_equal 'ok', %q{
- "#{}""#{}ok"
-}, '[ruby-dev:38968]'
-
-assert_equal 'ok', %q{
- "#{}o""#{}k""#{}"
-}, '[ruby-core:25284]'
diff --git a/bootstraptest/test_load.rb b/bootstraptest/test_load.rb
deleted file mode 100644
index e63c93a8f4..0000000000
--- a/bootstraptest/test_load.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-assert_equal 'ok', %q{
- open("require-lock-test.rb", "w") {|f|
- f.puts "sleep 0.1"
- f.puts "module M"
- f.puts "end"
- }
- $:.unshift Dir.pwd
- vs = (1..2).map {|i|
- Thread.start {
- require "require-lock-test"
- M
- }
- }.map {|t| t.value }
- vs[0] == M && vs[1] == M ? :ok : :ng
-}, '[ruby-dev:32048]'
-
-assert_equal 'ok', %q{
- %w[a a/foo b].each {|d| Dir.mkdir(d)}
- open("b/foo", "w") {|f| f.puts "$ok = :ok"}
- $:.replace(%w[a b])
- begin
- load "foo"
- $ok
- rescue => e
- e.message
- end
-}, '[ruby-dev:38097]'
diff --git a/bootstraptest/test_marshal.rb b/bootstraptest/test_marshal.rb
deleted file mode 100644
index 7e34176169..0000000000
--- a/bootstraptest/test_marshal.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-
-assert_normal_exit %q{
- Marshal.load(Marshal.dump({"k"=>"v"}), lambda {|v| v})
-}
-
diff --git a/bootstraptest/test_massign.rb b/bootstraptest/test_massign.rb
deleted file mode 100644
index 0f63dd424a..0000000000
--- a/bootstraptest/test_massign.rb
+++ /dev/null
@@ -1,183 +0,0 @@
-assert_equal '[[1], 2, 3]', '*v1, (a, b) = [1,[2, 3]]; [v1, a, b]'
-assert_equal '[[1], 2, 3]', '*v1,(*), (a, b) = [1,:x,[2, 3]]; [v1, a, b]'
-
-assert_equal '[]', '*a = *nil; a'
-assert_equal '[nil]', '*a = nil; a'
-assert_equal '2', 'a, a = 1, 2; a', "[ruby-dev:31522]"
-assert_equal '[1, 2]', 'a, b = 1, 2'
-assert_equal '[1, 2]', %q{
- ans = []
- trace_var(:$a){|v| ans << v}
- trace_var(:$b){|v| ans << v}
- $a, $b = 1, 2
- ans
-}
-
-assert_equal 'ok', %q{
- r = :ok
- :ng.tap {|(r)|}
- r
-}, '[ruby-dev:31507]'
-
-=begin
-# generated by this script:
-
-3.times{|i|
- 8.times{|e|
- ary = (0...e).to_a
- a,b,c,d,e,f = nil
- vals = %w(a b c d e f)
- vals[i] = '*' + vals[i]
- program = "#{vals.join(", ")} = *ary"
- eval(program)
- ans = [a,b,c,d,e,f]
- puts %Q{
- assert_equal "#{ans.inspect}", %q{
- ary = #{ary.inspect}
- #{program}; [a, b, c, d, e, f]
- }}
- }
-}
-=end
-
- assert_equal "[[], nil, nil, nil, nil, nil]", %q{
- ary = []
- *a, b, c, d, e, f = *ary; [a, b, c, d, e, f]
- }
-
- assert_equal "[[], 0, nil, nil, nil, nil]", %q{
- ary = [0]
- *a, b, c, d, e, f = *ary; [a, b, c, d, e, f]
- }
-
- assert_equal "[[], 0, 1, nil, nil, nil]", %q{
- ary = [0, 1]
- *a, b, c, d, e, f = *ary; [a, b, c, d, e, f]
- }
-
- assert_equal "[[], 0, 1, 2, nil, nil]", %q{
- ary = [0, 1, 2]
- *a, b, c, d, e, f = *ary; [a, b, c, d, e, f]
- }
-
- assert_equal "[[], 0, 1, 2, 3, nil]", %q{
- ary = [0, 1, 2, 3]
- *a, b, c, d, e, f = *ary; [a, b, c, d, e, f]
- }
-
- assert_equal "[[], 0, 1, 2, 3, 4]", %q{
- ary = [0, 1, 2, 3, 4]
- *a, b, c, d, e, f = *ary; [a, b, c, d, e, f]
- }
-
- assert_equal "[[0], 1, 2, 3, 4, 5]", %q{
- ary = [0, 1, 2, 3, 4, 5]
- *a, b, c, d, e, f = *ary; [a, b, c, d, e, f]
- }
-
- assert_equal "[[0, 1], 2, 3, 4, 5, 6]", %q{
- ary = [0, 1, 2, 3, 4, 5, 6]
- *a, b, c, d, e, f = *ary; [a, b, c, d, e, f]
- }
-
- assert_equal "[nil, [], nil, nil, nil, nil]", %q{
- ary = []
- a, *b, c, d, e, f = *ary; [a, b, c, d, e, f]
- }
-
- assert_equal "[0, [], nil, nil, nil, nil]", %q{
- ary = [0]
- a, *b, c, d, e, f = *ary; [a, b, c, d, e, f]
- }
-
- assert_equal "[0, [], 1, nil, nil, nil]", %q{
- ary = [0, 1]
- a, *b, c, d, e, f = *ary; [a, b, c, d, e, f]
- }
-
- assert_equal "[0, [], 1, 2, nil, nil]", %q{
- ary = [0, 1, 2]
- a, *b, c, d, e, f = *ary; [a, b, c, d, e, f]
- }
-
- assert_equal "[0, [], 1, 2, 3, nil]", %q{
- ary = [0, 1, 2, 3]
- a, *b, c, d, e, f = *ary; [a, b, c, d, e, f]
- }
-
- assert_equal "[0, [], 1, 2, 3, 4]", %q{
- ary = [0, 1, 2, 3, 4]
- a, *b, c, d, e, f = *ary; [a, b, c, d, e, f]
- }
-
- assert_equal "[0, [1], 2, 3, 4, 5]", %q{
- ary = [0, 1, 2, 3, 4, 5]
- a, *b, c, d, e, f = *ary; [a, b, c, d, e, f]
- }
-
- assert_equal "[0, [1, 2], 3, 4, 5, 6]", %q{
- ary = [0, 1, 2, 3, 4, 5, 6]
- a, *b, c, d, e, f = *ary; [a, b, c, d, e, f]
- }
-
- assert_equal "[nil, nil, [], nil, nil, nil]", %q{
- ary = []
- a, b, *c, d, e, f = *ary; [a, b, c, d, e, f]
- }
-
- assert_equal "[0, nil, [], nil, nil, nil]", %q{
- ary = [0]
- a, b, *c, d, e, f = *ary; [a, b, c, d, e, f]
- }
-
- assert_equal "[0, 1, [], nil, nil, nil]", %q{
- ary = [0, 1]
- a, b, *c, d, e, f = *ary; [a, b, c, d, e, f]
- }
-
- assert_equal "[0, 1, [], 2, nil, nil]", %q{
- ary = [0, 1, 2]
- a, b, *c, d, e, f = *ary; [a, b, c, d, e, f]
- }
-
- assert_equal "[0, 1, [], 2, 3, nil]", %q{
- ary = [0, 1, 2, 3]
- a, b, *c, d, e, f = *ary; [a, b, c, d, e, f]
- }
-
- assert_equal "[0, 1, [], 2, 3, 4]", %q{
- ary = [0, 1, 2, 3, 4]
- a, b, *c, d, e, f = *ary; [a, b, c, d, e, f]
- }
-
- assert_equal "[0, 1, [2], 3, 4, 5]", %q{
- ary = [0, 1, 2, 3, 4, 5]
- a, b, *c, d, e, f = *ary; [a, b, c, d, e, f]
- }
-
- assert_equal "[0, 1, [2, 3], 4, 5, 6]", %q{
- ary = [0, 1, 2, 3, 4, 5, 6]
- a, b, *c, d, e, f = *ary; [a, b, c, d, e, f]
- }
-
-
-#
-assert_equal 'ok', %q{
- a,s=[],"aaa"
- 300.times { a<<s; s=s.succ }
- eval <<-END__
- GC.stress=true
- Fiber.new do
- #{ a.join(",") },*zzz=1
- end.resume
- END__
- :ok
-}, '[ruby-dev:32581]'
-
-assert_equal 'ok', %q{
- while true
- *, z = 1
- break
- end
- :ok
-}, '[ruby-dev:32892]'
diff --git a/bootstraptest/test_method.rb b/bootstraptest/test_method.rb
deleted file mode 100644
index 2ce66f6a6a..0000000000
--- a/bootstraptest/test_method.rb
+++ /dev/null
@@ -1,1163 +0,0 @@
-# regular argument
-assert_equal '1', 'def m() 1 end; m()'
-assert_equal '1', 'def m(a) a end; m(1)'
-assert_equal '[1, 2]', 'def m(a,b) [a, b] end; m(1,2)'
-assert_equal '[1, 2, 3]', 'def m(a,b,c) [a, b, c] end; m(1,2,3)'
-assert_equal 'wrong number of arguments (1 for 0)', %q{
- def m; end
- begin
- m(1)
- rescue => e
- e.message
- end
-}
-
-assert_equal 'wrong number of arguments (0 for 1)', %q{
- def m a; end
- begin
- m
- rescue => e
- e.message
- end
-}
-
-# default argument
-assert_equal '1', 'def m(x=1) x end; m()'
-assert_equal '1', 'def m(x=7) x end; m(1)'
-assert_equal '1', 'def m(a,x=1) x end; m(7)'
-assert_equal '1', 'def m(a,x=7) x end; m(7,1)'
-assert_equal '1', 'def m(a,b,x=1) x end; m(7,7)'
-assert_equal '1', 'def m(a,b,x=7) x end; m(7,7,1)'
-assert_equal '1', 'def m(a,x=1,y=1) x end; m(7)'
-assert_equal '1', 'def m(a,x=1,y=1) y end; m(7)'
-assert_equal '1', 'def m(a,x=7,y=1) x end; m(7,1)'
-assert_equal '1', 'def m(a,x=7,y=1) y end; m(7,1)'
-assert_equal '1', 'def m(a,x=7,y=7) x end; m(7,1,1)'
-assert_equal '1', 'def m(a,x=7,y=7) y end; m(7,1,1)'
-
-# rest argument
-assert_equal '[]', 'def m(*a) a end; m().inspect'
-assert_equal '[1]', 'def m(*a) a end; m(1).inspect'
-assert_equal '[1, 2]', 'def m(*a) a end; m(1,2).inspect'
-assert_equal '[]', 'def m(x,*a) a end; m(7).inspect'
-assert_equal '[1]', 'def m(x,*a) a end; m(7,1).inspect'
-assert_equal '[1, 2]', 'def m(x,*a) a end; m(7,1,2).inspect'
-assert_equal '[]', 'def m(x,y,*a) a end; m(7,7).inspect'
-assert_equal '[1]', 'def m(x,y,*a) a end; m(7,7,1).inspect'
-assert_equal '[1, 2]', 'def m(x,y,*a) a end; m(7,7,1,2).inspect'
-assert_equal '[]', 'def m(x,y=7,*a) a end; m(7).inspect'
-assert_equal '[]', 'def m(x,y,z=7,*a) a end; m(7,7).inspect'
-assert_equal '[]', 'def m(x,y,z=7,*a) a end; m(7,7,7).inspect'
-assert_equal '[]', 'def m(x,y,z=7,zz=7,*a) a end; m(7,7,7).inspect'
-assert_equal '[]', 'def m(x,y,z=7,zz=7,*a) a end; m(7,7,7,7).inspect'
-assert_equal '1', 'def m(x,y,z=7,zz=1,*a) zz end; m(7,7,7).inspect'
-assert_equal '1', 'def m(x,y,z=7,zz=1,*a) zz end; m(7,7,7).inspect'
-assert_equal '1', 'def m(x,y,z=7,zz=7,*a) zz end; m(7,7,7,1).inspect'
-
-# block argument
-assert_equal 'Proc', 'def m(&block) block end; m{}.class'
-assert_equal 'nil', 'def m(&block) block end; m().inspect'
-assert_equal 'Proc', 'def m(a,&block) block end; m(7){}.class'
-assert_equal 'nil', 'def m(a,&block) block end; m(7).inspect'
-assert_equal '1', 'def m(a,&block) a end; m(1){}'
-assert_equal 'Proc', 'def m(a,b=nil,&block) block end; m(7){}.class'
-assert_equal 'nil', 'def m(a,b=nil,&block) block end; m(7).inspect'
-assert_equal 'Proc', 'def m(a,b=nil,&block) block end; m(7,7){}.class'
-assert_equal '1', 'def m(a,b=nil,&block) b end; m(7,1){}'
-assert_equal 'Proc', 'def m(a,b=nil,*c,&block) block end; m(7){}.class'
-assert_equal 'nil', 'def m(a,b=nil,*c,&block) block end; m(7).inspect'
-assert_equal '1', 'def m(a,b=nil,*c,&block) a end; m(1).inspect'
-assert_equal '1', 'def m(a,b=1,*c,&block) b end; m(7).inspect'
-assert_equal '1', 'def m(a,b=7,*c,&block) b end; m(7,1).inspect'
-assert_equal '[1]', 'def m(a,b=7,*c,&block) c end; m(7,7,1).inspect'
-
-# splat
-assert_equal '1', 'def m(a) a end; m(*[1])'
-assert_equal '1', 'def m(x,a) a end; m(7,*[1])'
-assert_equal '1', 'def m(x,y,a) a end; m(7,7,*[1])'
-assert_equal '1', 'def m(a,b) a end; m(*[1,7])'
-assert_equal '1', 'def m(a,b) b end; m(*[7,1])'
-assert_equal '1', 'def m(x,a,b) b end; m(7,*[7,1])'
-assert_equal '1', 'def m(x,y,a,b) b end; m(7,7,*[7,1])'
-assert_equal '1', 'def m(a,b,c) a end; m(*[1,7,7])'
-assert_equal '1', 'def m(a,b,c) b end; m(*[7,1,7])'
-assert_equal '1', 'def m(a,b,c) c end; m(*[7,7,1])'
-assert_equal '1', 'def m(x,a,b,c) a end; m(7,*[1,7,7])'
-assert_equal '1', 'def m(x,y,a,b,c) a end; m(7,7,*[1,7,7])'
-
-# hash argument
-assert_equal '1', 'def m(h) h end; m(7=>1)[7]'
-assert_equal '1', 'def m(h) h end; m(7=>1).size'
-assert_equal '1', 'def m(h) h end; m(7=>1, 8=>7)[7]'
-assert_equal '2', 'def m(h) h end; m(7=>1, 8=>7).size'
-assert_equal '1', 'def m(h) h end; m(7=>1, 8=>7, 9=>7)[7]'
-assert_equal '3', 'def m(h) h end; m(7=>1, 8=>7, 9=>7).size'
-assert_equal '1', 'def m(x,h) h end; m(7, 7=>1)[7]'
-assert_equal '1', 'def m(x,h) h end; m(7, 7=>1, 8=>7)[7]'
-assert_equal '1', 'def m(x,h) h end; m(7, 7=>1, 8=>7, 9=>7)[7]'
-assert_equal '1', 'def m(x,y,h) h end; m(7,7, 7=>1)[7]'
-assert_equal '1', 'def m(x,y,h) h end; m(7,7, 7=>1, 8=>7)[7]'
-assert_equal '1', 'def m(x,y,h) h end; m(7,7, 7=>1, 8=>7, 9=>7)[7]'
-
-# block argument
-assert_equal '1', %q(def m(&block) mm(&block) end
- def mm() yield 1 end
- m {|a| a })
-assert_equal '1', %q(def m(x,&block) mm(x,&block) end
- def mm(x) yield 1 end
- m(7) {|a| a })
-assert_equal '1', %q(def m(x,y,&block) mm(x,y,&block) end
- def mm(x,y) yield 1 end
- m(7,7) {|a| a })
-
-# recursive call
-assert_equal '1', %q(def m(n) n == 0 ? 1 : m(n-1) end; m(5))
-
-# instance method
-assert_equal '1', %q(class C; def m() 1 end end; C.new.m)
-assert_equal '1', %q(class C; def m(a) a end end; C.new.m(1))
-assert_equal '1', %q(class C; def m(a = 1) a end end; C.new.m)
-assert_equal '[1]', %q(class C; def m(*a) a end end; C.new.m(1).inspect)
-assert_equal '1', %q( class C
- def m() mm() end
- def mm() 1 end
- end
- C.new.m )
-
-# singleton method (const)
-assert_equal '1', %q(class C; def C.m() 1 end end; C.m)
-assert_equal '1', %q(class C; def C.m(a) a end end; C.m(1))
-assert_equal '1', %q(class C; def C.m(a = 1) a end end; C.m)
-assert_equal '[1]', %q(class C; def C.m(*a) a end end; C.m(1).inspect)
-assert_equal '1', %q(class C; end; def C.m() 1 end; C.m)
-assert_equal '1', %q(class C; end; def C.m(a) a end; C.m(1))
-assert_equal '1', %q(class C; end; def C.m(a = 1) a end; C.m)
-assert_equal '[1]', %q(class C; end; def C.m(*a) a end; C.m(1).inspect)
-assert_equal '1', %q(class C; def m() 7 end end; def C.m() 1 end; C.m)
-assert_equal '1', %q( class C
- def C.m() mm() end
- def C.mm() 1 end
- end
- C.m )
-
-# singleton method (lvar)
-assert_equal '1', %q(obj = Object.new; def obj.m() 1 end; obj.m)
-assert_equal '1', %q(obj = Object.new; def obj.m(a) a end; obj.m(1))
-assert_equal '1', %q(obj = Object.new; def obj.m(a=1) a end; obj.m)
-assert_equal '[1]', %q(obj = Object.new; def obj.m(*a) a end; obj.m(1))
-assert_equal '1', %q(class C; def m() 7 end; end
- obj = C.new
- def obj.m() 1 end
- obj.m)
-
-# inheritance
-assert_equal '1', %q(class A; def m(a) a end end
- class B < A; end
- B.new.m(1))
-assert_equal '1', %q(class A; end
- class B < A; def m(a) a end end
- B.new.m(1))
-assert_equal '1', %q(class A; def m(a) a end end
- class B < A; end
- class C < B; end
- C.new.m(1))
-
-# include
-assert_equal '1', %q(class A; def m(a) a end end
- module M; end
- class B < A; include M; end
- B.new.m(1))
-assert_equal '1', %q(class A; end
- module M; def m(a) a end end
- class B < A; include M; end
- B.new.m(1))
-
-# alias
-assert_equal '1', %q( def a() 1 end
- alias m a
- m() )
-assert_equal '1', %q( class C
- def a() 1 end
- alias m a
- end
- C.new.m )
-assert_equal '1', %q( class C
- def a() 1 end
- alias :m a
- end
- C.new.m )
-assert_equal '1', %q( class C
- def a() 1 end
- alias m :a
- end
- C.new.m )
-assert_equal '1', %q( class C
- def a() 1 end
- alias :m :a
- end
- C.new.m )
-assert_equal '1', %q( class C
- def a() 1 end
- alias m a
- undef a
- end
- C.new.m )
-
-# undef
-assert_equal '1', %q( class C
- def m() end
- undef m
- end
- begin C.new.m; rescue NoMethodError; 1 end )
-assert_equal '1', %q( class A
- def m() end
- end
- class C < A
- def m() end
- undef m
- end
- begin C.new.m; rescue NoMethodError; 1 end )
-assert_equal '1', %q( class A; def a() end end # [yarv-dev:999]
- class B < A
- def b() end
- undef a, b
- end
- begin B.new.a; rescue NoMethodError; 1 end )
-assert_equal '1', %q( class A; def a() end end # [yarv-dev:999]
- class B < A
- def b() end
- undef a, b
- end
- begin B.new.b; rescue NoMethodError; 1 end )
-
-assert_equal '3', %q{
- def m1
- 1
- end
- alias m2 m1
- alias :"#{'m3'}" m1
- m1 + m2 + m3
-}, '[ruby-dev:32308]'
-assert_equal '1', %q{
- def foobar
- end
- undef :"foo#{:bar}"
- 1
-}, '[ruby-dev:32308]'
-assert_equal '1', %q{
- def foobar
- 1
- end
- alias :"bar#{:baz}" :"foo#{:bar}"
- barbaz
-}, '[ruby-dev:32308]'
-
-# private
-assert_equal '1', %q( class C
- def m() mm() end
- def mm() 1 end
- private :mm
- end
- C.new.m )
-assert_equal '1', %q( class C
- def m() 7 end
- private :m
- end
- begin C.m; rescue NoMethodError; 1 end )
-assert_equal '1', %q( class C
- def C.m() mm() end
- def C.mm() 1 end
- private_class_method :mm
- end
- C.m )
-assert_equal '1', %q( class C
- def C.m() 7 end
- private_class_method :m
- end
- begin C.m; rescue NoMethodError; 1 end )
-assert_equal '1', %q( class C; def m() 1 end end
- C.new.m # cache
- class C
- alias mm m; private :mm
- end
- C.new.m
- begin C.new.mm; 7; rescue NoMethodError; 1 end )
-
-# nested method
-assert_equal '1', %q( class C
- def m
- def mm() 1 end
- end
- end
- C.new.m
- C.new.mm )
-assert_equal '1', %q( class C
- def m
- def mm() 1 end
- end
- end
- instance_eval "C.new.m; C.new.mm" )
-
-# method_missing
-assert_equal ':m', %q( class C
- def method_missing(mid, *args) mid end
- end
- C.new.m.inspect )
-assert_equal ':mm', %q( class C
- def method_missing(mid, *args) mid end
- end
- C.new.mm.inspect )
-assert_equal '[1, 2]', %q( class C
- def method_missing(mid, *args) args end
- end
- C.new.m(1,2).inspect )
-assert_equal '1', %q( class C
- def method_missing(mid, *args) yield 1 end
- end
- C.new.m {|a| a })
-assert_equal 'nil', %q( class C
- def method_missing(mid, *args, &block) block end
- end
- C.new.m.inspect )
-
-# send
-assert_equal '1', %q( class C; def m() 1 end end;
- C.new.__send__(:m) )
-assert_equal '1', %q( class C; def m() 1 end end;
- C.new.send(:m) )
-assert_equal '1', %q( class C; def m(a) a end end;
- C.new.send(:m,1) )
-assert_equal '1', %q( class C; def m(a,b) a end end;
- C.new.send(:m,1,7) )
-assert_equal '1', %q( class C; def m(x,a=1) a end end;
- C.new.send(:m,7) )
-assert_equal '1', %q( class C; def m(x,a=7) a end end;
- C.new.send(:m,7,1) )
-assert_equal '[1, 2]', %q( class C; def m(*a) a end end;
- C.new.send(:m,1,2).inspect )
-assert_equal '1', %q( class C; def m() 7 end; private :m end
- begin C.new.public_send(:m); rescue NoMethodError; 1 end )
-assert_equal '1', %q( class C; def m() 1 end; private :m end
- C.new.send(:m) )
-
-# with block
-assert_equal '[[:ok1, :foo], [:ok2, :foo, :bar]]',
-%q{
- class C
- def [](a)
- $ary << [yield, a]
- end
- def []=(a, b)
- $ary << [yield, a, b]
- end
- end
-
- $ary = []
- C.new[:foo, &lambda{:ok1}]
- C.new[:foo, &lambda{:ok2}] = :bar
- $ary
-}
-
-# with
-assert_equal '[:ok1, [:ok2, 11]]', %q{
- class C
- def []
- $ary << :ok1
- 10
- end
- def []=(a)
- $ary << [:ok2, a]
- end
- end
- $ary = []
- C.new[]+=1
- $ary
-}
-
-# splat and block arguments
-assert_equal %q{[[[:x, :y, :z], NilClass], [[1, :x, :y, :z], NilClass], [[1, 2, :x, :y, :z], NilClass], [[:obj], NilClass], [[1, :obj], NilClass], [[1, 2, :obj], NilClass], [[], Proc], [[1], Proc], [[1, 2], Proc], [[], Proc], [[1], Proc], [[1, 2], Proc], [[:x, :y, :z], Proc], [[1, :x, :y, :z], Proc], [[1, 2, :x, :y, :z], Proc]]}, %q{
-def m(*args, &b)
- $result << [args, b.class]
-end
-$result = []
-ary = [:x, :y, :z]
-obj = :obj
-b = Proc.new{}
-
-m(*ary)
-m(1,*ary)
-m(1,2,*ary)
-m(*obj)
-m(1,*obj)
-m(1,2,*obj)
-m(){}
-m(1){}
-m(1,2){}
-m(&b)
-m(1,&b)
-m(1,2,&b)
-m(*ary,&b)
-m(1,*ary,&b)
-m(1,2,*ary,&b)
-$result
-}
-
-# post test
-assert_equal %q{[1, 2, :o1, :o2, [], 3, 4, NilClass, nil, nil]}, %q{
-def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
- x, y = :x, :y if $foo
- [m1, m2, o1, o2, r, p1, p2, b.class, x, y]
-end
-; m(1, 2, 3, 4)}
-
-assert_equal %q{[1, 2, 3, :o2, [], 4, 5, NilClass, nil, nil]}, %q{
-def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
- x, y = :x, :y if $foo
- [m1, m2, o1, o2, r, p1, p2, b.class, x, y]
-end
-; m(1, 2, 3, 4, 5)}
-
-assert_equal %q{[1, 2, 3, 4, [], 5, 6, NilClass, nil, nil]}, %q{
-def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
- x, y = :x, :y if $foo
- [m1, m2, o1, o2, r, p1, p2, b.class, x, y]
-end
-; m(1, 2, 3, 4, 5, 6)}
-
-assert_equal %q{[1, 2, 3, 4, [5], 6, 7, NilClass, nil, nil]}, %q{
-def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
- x, y = :x, :y if $foo
- [m1, m2, o1, o2, r, p1, p2, b.class, x, y]
-end
-; m(1, 2, 3, 4, 5, 6, 7)}
-
-assert_equal %q{[1, 2, 3, 4, [5, 6], 7, 8, NilClass, nil, nil]}, %q{
-def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
- x, y = :x, :y if $foo
- [m1, m2, o1, o2, r, p1, p2, b.class, x, y]
-end
-; m(1, 2, 3, 4, 5, 6, 7, 8)}
-
-assert_equal %q{[1, 2, 3, 4, [5, 6, 7], 8, 9, NilClass, nil, nil]}, %q{
-def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
- x, y = :x, :y if $foo
- [m1, m2, o1, o2, r, p1, p2, b.class, x, y]
-end
-; m(1, 2, 3, 4, 5, 6, 7, 8, 9)}
-
-assert_equal %q{[1, 2, 3, 4, [5, 6, 7, 8], 9, 10, NilClass, nil, nil]}, %q{
-def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
- x, y = :x, :y if $foo
- [m1, m2, o1, o2, r, p1, p2, b.class, x, y]
-end
-; m(1, 2, 3, 4, 5, 6, 7, 8, 9, 10)}
-
-assert_equal %q{[1, 2, 3, 4, [5, 6, 7, 8, 9], 10, 11, NilClass, nil, nil]}, %q{
-def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
- x, y = :x, :y if $foo
- [m1, m2, o1, o2, r, p1, p2, b.class, x, y]
-end
-; m(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11)}
-
-assert_equal %q{[1, 2, :o1, :o2, [], 3, 4, Proc, nil, nil]}, %q{
-def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
- x, y = :x, :y if $foo
- [m1, m2, o1, o2, r, p1, p2, b.class, x, y]
-end
-; m(1, 2, 3, 4){}}
-
-assert_equal %q{[1, 2, 3, :o2, [], 4, 5, Proc, nil, nil]}, %q{
-def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
- x, y = :x, :y if $foo
- [m1, m2, o1, o2, r, p1, p2, b.class, x, y]
-end
-; m(1, 2, 3, 4, 5){}}
-
-assert_equal %q{[1, 2, 3, 4, [], 5, 6, Proc, nil, nil]}, %q{
-def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
- x, y = :x, :y if $foo
- [m1, m2, o1, o2, r, p1, p2, b.class, x, y]
-end
-; m(1, 2, 3, 4, 5, 6){}}
-
-assert_equal %q{[1, 2, 3, 4, [5], 6, 7, Proc, nil, nil]}, %q{
-def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
- x, y = :x, :y if $foo
- [m1, m2, o1, o2, r, p1, p2, b.class, x, y]
-end
-; m(1, 2, 3, 4, 5, 6, 7){}}
-
-assert_equal %q{[1, 2, 3, 4, [5, 6], 7, 8, Proc, nil, nil]}, %q{
-def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
- x, y = :x, :y if $foo
- [m1, m2, o1, o2, r, p1, p2, b.class, x, y]
-end
-; m(1, 2, 3, 4, 5, 6, 7, 8){}}
-
-assert_equal %q{[1, 2, 3, 4, [5, 6, 7], 8, 9, Proc, nil, nil]}, %q{
-def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
- x, y = :x, :y if $foo
- [m1, m2, o1, o2, r, p1, p2, b.class, x, y]
-end
-; m(1, 2, 3, 4, 5, 6, 7, 8, 9){}}
-
-assert_equal %q{[1, 2, 3, 4, [5, 6, 7, 8], 9, 10, Proc, nil, nil]}, %q{
-def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
- x, y = :x, :y if $foo
- [m1, m2, o1, o2, r, p1, p2, b.class, x, y]
-end
-; m(1, 2, 3, 4, 5, 6, 7, 8, 9, 10){}}
-
-assert_equal %q{[1, 2, 3, 4, [5, 6, 7, 8, 9], 10, 11, Proc, nil, nil]}, %q{
-def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
- x, y = :x, :y if $foo
- [m1, m2, o1, o2, r, p1, p2, b.class, x, y]
-end
-; m(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11){}}
-
-assert_equal %q{[1, 2, :o1, :o2, [], 3, 4, nil, nil]}, %q{
-def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2)
- x, y = :x, :y if $foo
- [m1, m2, o1, o2, r, p1, p2, x, y]
-end
-; m(1, 2, 3, 4)}
-
-assert_equal %q{[1, 2, 3, :o2, [], 4, 5, nil, nil]}, %q{
-def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2)
- x, y = :x, :y if $foo
- [m1, m2, o1, o2, r, p1, p2, x, y]
-end
-; m(1, 2, 3, 4, 5)}
-
-assert_equal %q{[1, 2, 3, 4, [], 5, 6, nil, nil]}, %q{
-def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2)
- x, y = :x, :y if $foo
- [m1, m2, o1, o2, r, p1, p2, x, y]
-end
-; m(1, 2, 3, 4, 5, 6)}
-
-
-#
-# super
-#
-=begin
-# below programs are generated by this program:
-
-BASE = <<EOS__
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; <TEST>; super; end; end
-EOS__
-
-tests = {
-%q{
- def m
-} => %q{
- C1.new.m
-},
-#
-%q{
- def m a
-} => %q{
- C1.new.m 1
-},
-%q{
- def m a
- a = :a
-} => %q{
- C1.new.m 1
-},
-#
-%q{
- def m a, o=:o
-} => %q{
- C1.new.m 1
- C1.new.m 1, 2
-},
-%q{
- def m a, o=:o
- a = :a
-} => %q{
- C1.new.m 1
- C1.new.m 1, 2
-},
-%q{
- def m a, o=:o
- o = :x
-} => %q{
- C1.new.m 1
- C1.new.m 1, 2
-},
-#
-%q{
- def m a, *r
-} => %q{
- C1.new.m 1
- C1.new.m 1, 2
- C1.new.m 1, 2, 3
-},
-%q{
- def m a, *r
- r = [:x, :y]
-} => %q{
- C1.new.m 1
- C1.new.m 1, 2
- C1.new.m 1, 2, 3
-},
-#
-%q{
- def m a, o=:o, *r
-} => %q{
- C1.new.m 1
- C1.new.m 1, 2
- C1.new.m 1, 2, 3
- C1.new.m 1, 2, 3, 4
-},
-#
-%q{
- def m a, o=:o, *r, &b
-} => %q{
- C1.new.m 1
- C1.new.m 1, 2
- C1.new.m 1, 2, 3
- C1.new.m 1, 2, 3, 4
- C1.new.m(1){}
- C1.new.m(1, 2){}
- C1.new.m(1, 2, 3){}
- C1.new.m(1, 2, 3, 4){}
-},
-#
-"def m(m1, m2, o1=:o1, o2=:o2, p1, p2)" =>
-%q{
-C1.new.m(1,2,3,4)
-C1.new.m(1,2,3,4,5)
-C1.new.m(1,2,3,4,5,6)
-},
-#
-"def m(m1, m2, *r, p1, p2)" =>
-%q{
-C1.new.m(1,2,3,4)
-C1.new.m(1,2,3,4,5)
-C1.new.m(1,2,3,4,5,6)
-C1.new.m(1,2,3,4,5,6,7)
-C1.new.m(1,2,3,4,5,6,7,8)
-},
-#
-"def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2)" =>
-%q{
-C1.new.m(1,2,3,4)
-C1.new.m(1,2,3,4,5)
-C1.new.m(1,2,3,4,5,6)
-C1.new.m(1,2,3,4,5,6,7)
-C1.new.m(1,2,3,4,5,6,7,8)
-C1.new.m(1,2,3,4,5,6,7,8,9)
-},
-
-###
-}
-
-
-tests.each{|setup, methods| setup = setup.dup; setup.strip!
- setup = BASE.gsub(/<TEST>/){setup}
- methods.split(/\n/).each{|m| m = m.dup; m.strip!
- next if m.empty?
- expr = "#{setup}; #{m}"
- result = eval(expr)
- puts "assert_equal %q{#{result.inspect}}, %q{\n#{expr}}"
- puts
- }
-}
-
-=end
-
-assert_equal %q{[:C0_m, [1, 2, :o1, :o2, 3, 4]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m(m1, m2, o1=:o1, o2=:o2, p1, p2); super; end; end
-; C1.new.m(1,2,3,4)}
-
-assert_equal %q{[:C0_m, [1, 2, 3, :o2, 4, 5]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m(m1, m2, o1=:o1, o2=:o2, p1, p2); super; end; end
-; C1.new.m(1,2,3,4,5)}
-
-assert_equal %q{[:C0_m, [1, 2, 3, 4, 5, 6]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m(m1, m2, o1=:o1, o2=:o2, p1, p2); super; end; end
-; C1.new.m(1,2,3,4,5,6)}
-
-assert_equal %q{[:C0_m, [1, :o]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m a, o=:o, *r; super; end; end
-; C1.new.m 1}
-
-assert_equal %q{[:C0_m, [1, 2]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m a, o=:o, *r; super; end; end
-; C1.new.m 1, 2}
-
-assert_equal %q{[:C0_m, [1, 2, 3]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m a, o=:o, *r; super; end; end
-; C1.new.m 1, 2, 3}
-
-assert_equal %q{[:C0_m, [1, 2, 3, 4]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m a, o=:o, *r; super; end; end
-; C1.new.m 1, 2, 3, 4}
-
-assert_equal %q{[:C0_m, [:a]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m a
- a = :a; super; end; end
-; C1.new.m 1}
-
-assert_equal %q{[:C0_m, [1, 2, 3, 4]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m(m1, m2, *r, p1, p2); super; end; end
-; C1.new.m(1,2,3,4)}
-
-assert_equal %q{[:C0_m, [1, 2, 3, 4, 5]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m(m1, m2, *r, p1, p2); super; end; end
-; C1.new.m(1,2,3,4,5)}
-
-assert_equal %q{[:C0_m, [1, 2, 3, 4, 5, 6]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m(m1, m2, *r, p1, p2); super; end; end
-; C1.new.m(1,2,3,4,5,6)}
-
-assert_equal %q{[:C0_m, [1, 2, 3, 4, 5, 6, 7]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m(m1, m2, *r, p1, p2); super; end; end
-; C1.new.m(1,2,3,4,5,6,7)}
-
-assert_equal %q{[:C0_m, [1, 2, 3, 4, 5, 6, 7, 8]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m(m1, m2, *r, p1, p2); super; end; end
-; C1.new.m(1,2,3,4,5,6,7,8)}
-
-assert_equal %q{[:C0_m, [1, :o]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m a, o=:o, *r, &b; super; end; end
-; C1.new.m 1}
-
-assert_equal %q{[:C0_m, [1, 2]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m a, o=:o, *r, &b; super; end; end
-; C1.new.m 1, 2}
-
-assert_equal %q{[:C0_m, [1, 2, 3]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m a, o=:o, *r, &b; super; end; end
-; C1.new.m 1, 2, 3}
-
-assert_equal %q{[:C0_m, [1, 2, 3, 4]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m a, o=:o, *r, &b; super; end; end
-; C1.new.m 1, 2, 3, 4}
-
-assert_equal %q{[:C0_m, [1, :o]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m a, o=:o, *r, &b; super; end; end
-; C1.new.m(1){}}
-
-assert_equal %q{[:C0_m, [1, 2]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m a, o=:o, *r, &b; super; end; end
-; C1.new.m(1, 2){}}
-
-assert_equal %q{[:C0_m, [1, 2, 3]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m a, o=:o, *r, &b; super; end; end
-; C1.new.m(1, 2, 3){}}
-
-assert_equal %q{[:C0_m, [1, 2, 3, 4]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m a, o=:o, *r, &b; super; end; end
-; C1.new.m(1, 2, 3, 4){}}
-
-assert_equal %q{[:C0_m, [1, :x]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m a, o=:o
- o = :x; super; end; end
-; C1.new.m 1}
-
-assert_equal %q{[:C0_m, [1, :x]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m a, o=:o
- o = :x; super; end; end
-; C1.new.m 1, 2}
-
-assert_equal %q{[:C0_m, [:a, :o]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m a, o=:o
- a = :a; super; end; end
-; C1.new.m 1}
-
-assert_equal %q{[:C0_m, [:a, 2]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m a, o=:o
- a = :a; super; end; end
-; C1.new.m 1, 2}
-
-assert_equal %q{[:C0_m, [1]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m a; super; end; end
-; C1.new.m 1}
-
-assert_equal %q{[:C0_m, [1, :x, :y]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m a, *r
- r = [:x, :y]; super; end; end
-; C1.new.m 1}
-
-assert_equal %q{[:C0_m, [1, :x, :y]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m a, *r
- r = [:x, :y]; super; end; end
-; C1.new.m 1, 2}
-
-assert_equal %q{[:C0_m, [1, :x, :y]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m a, *r
- r = [:x, :y]; super; end; end
-; C1.new.m 1, 2, 3}
-
-assert_equal %q{[:C0_m, [1, 2, :o1, :o2, 3, 4]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2); super; end; end
-; C1.new.m(1,2,3,4)}
-
-assert_equal %q{[:C0_m, [1, 2, 3, :o2, 4, 5]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2); super; end; end
-; C1.new.m(1,2,3,4,5)}
-
-assert_equal %q{[:C0_m, [1, 2, 3, 4, 5, 6]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2); super; end; end
-; C1.new.m(1,2,3,4,5,6)}
-
-assert_equal %q{[:C0_m, [1, 2, 3, 4, 5, 6, 7]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2); super; end; end
-; C1.new.m(1,2,3,4,5,6,7)}
-
-assert_equal %q{[:C0_m, [1, 2, 3, 4, 5, 6, 7, 8]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2); super; end; end
-; C1.new.m(1,2,3,4,5,6,7,8)}
-
-assert_equal %q{[:C0_m, [1, 2, 3, 4, 5, 6, 7, 8, 9]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2); super; end; end
-; C1.new.m(1,2,3,4,5,6,7,8,9)}
-
-assert_equal %q{[:C0_m, [1]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m a, *r; super; end; end
-; C1.new.m 1}
-
-assert_equal %q{[:C0_m, [1, 2]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m a, *r; super; end; end
-; C1.new.m 1, 2}
-
-assert_equal %q{[:C0_m, [1, 2, 3]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m a, *r; super; end; end
-; C1.new.m 1, 2, 3}
-
-assert_equal %q{[:C0_m, []]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m; super; end; end
-; C1.new.m}
-
-assert_equal %q{[:C0_m, [1, :o]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m a, o=:o; super; end; end
-; C1.new.m 1}
-
-assert_equal %q{[:C0_m, [1, 2]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m a, o=:o; super; end; end
-; C1.new.m 1, 2}
-
-assert_equal %q{[:ok, :ok, :ok, :ok, :ok, :ok, :ng, :ng]}, %q{
- $ans = []
- class Foo
- def m
- end
- end
-
- c1 = c2 = nil
-
- lambda{
- $SAFE = 4
- c1 = Class.new{
- def m
- end
- }
- c2 = Class.new(Foo){
- alias mm m
- }
- }.call
-
- def test
- begin
- yield
- rescue SecurityError
- $ans << :ok
- else
- $ans << :ng
- end
- end
-
- o1 = c1.new
- o2 = c2.new
-
- test{o1.m}
- test{o2.mm}
- test{o1.send :m}
- test{o2.send :mm}
- test{o1.public_send :m}
- test{o2.public_send :mm}
- test{o1.method(:m).call}
- test{o2.method(:mm).call}
- $ans
-}
-
-assert_equal 'ok', %q{
- class C
- def x=(n)
- end
- def m
- self.x = :ok
- end
- end
- C.new.m
-}
-
-assert_equal 'ok', %q{
- proc{
- $SAFE = 1
- class C
- def m
- :ok
- end
- end
- }.call
- C.new.m
-}, '[ruby-core:11998]'
-
-assert_equal 'ok', %q{
- proc{
- $SAFE = 2
- class C
- def m
- :ok
- end
- end
- }.call
- C.new.m
-}, '[ruby-core:11998]'
-
-assert_equal 'ok', %q{
- proc{
- $SAFE = 3
- class C
- def m
- :ng
- end
- end
- }.call
- begin
- C.new.m
- rescue SecurityError
- :ok
- end
-}, '[ruby-core:11998]'
-
-assert_equal 'ok', %q{
- class B
- def m() :fail end
- end
- class C < B
- undef m
- begin
- remove_method :m
- rescue NameError
- end
- end
- begin
- C.new.m
- rescue NameError
- :ok
- end
-}, '[ruby-dev:31816], [ruby-dev:31817]'
-
-assert_normal_exit %q{
- begin
- Process.setrlimit(Process::RLIMIT_STACK, 4_202_496)
- # FreeBSD fails this less than 4M + 8K bytes.
- rescue Exception
- exit
- end
- class C
- attr "a" * (10*1024*1024)
- end
-}, '[ruby-dev:31818]'
-
-assert_equal 'ok', %q{
- class Module
- def define_method2(name, &block)
- define_method(name, &block)
- end
- end
- class C
- define_method2(:m) {|x, y| :fail }
- end
- begin
- C.new.m([1,2])
- rescue ArgumentError
- :ok
- end
-}
-
-assert_not_match /method_missing/, %q{
- STDERR.reopen(STDOUT)
- variable_or_mehtod_not_exist
-}
-
-assert_equal '[false, false, false, false, true, true]', %q{
- class C
- define_method(:foo) {
- block_given?
- }
- end
-
- C.new.foo {}
-
- class D
- def foo
- D.module_eval{
- define_method(:m1){
- block_given?
- }
- }
- end
- def bar
- D.module_eval{
- define_method(:m2){
- block_given?
- }
- }
- end
- end
-
- D.new.foo
- D.new.bar{}
- [C.new.foo, C.new.foo{}, D.new.m1, D.new.m1{}, D.new.m2, D.new.m2{}]
-}, '[ruby-core:14813]'
-
-assert_equal 'ok', %q{
- class Foo
- define_method(:foo) do |&b|
- b.call
- end
- end
- Foo.new.foo do
- break :ok
- end
-}, '[ruby-dev:36028]'
-
-assert_equal '[1, 2, [3, 4]]', %q{
- def regular(a, b, *c)
- [a, b, c]
- end
- regular(*[], 1, *[], *[2, 3], *[], 4)
-}, '[ruby-core:19413]'
-
-assert_equal '[1, [:foo, 3, 4, :foo]]', %q{
- def regular(a, *b)
- [a, b]
- end
- a = b = [:foo]
- regular(1, *a, *[3, 4], *b)
-}
-
-assert_equal '["B", "A"]', %q{
- class A
- def m
- 'A'
- end
- end
-
- class B < A
- define_method(:m) do
- ['B', super()]
- end
- end
-
- class C < B
- end
-
- C.new.m
-}
-
-assert_equal 'ok', %q{
- module Foo
- def foo
- begin
- super
- rescue NoMethodError
- :ok
- end
- end
- module_function :foo
- end
- Foo.foo
-}, '[ruby-dev:37587]'
-
-assert_equal 'Object#foo', %q{
- class Object
- def self.foo
- "Object.foo"
- end
- def foo
- "Object#foo"
- end
- end
-
- module Foo
- def foo
- begin
- super
- rescue NoMethodError
- :ok
- end
- end
- module_function :foo
- end
- Foo.foo
-}, '[ruby-dev:37587]'
-
-assert_normal_exit %q{
- class BasicObject
- remove_method :method_missing
- end
- begin
- "a".lalala!
- rescue NoMethodError => e
- e.message == "undefined method `lalala!' for \"a\":String" ? :ok : :ng
- end
-}, '[ruby-core:22298]'
-
-assert_equal 'ok', %q{
- "hello"[0] ||= "H"
- "ok"
-}
-
-assert_equal 'ok', %q{
- "hello"[0, 1] ||= "H"
- "ok"
-}
diff --git a/bootstraptest/test_objectspace.rb b/bootstraptest/test_objectspace.rb
deleted file mode 100644
index 486d5aff73..0000000000
--- a/bootstraptest/test_objectspace.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-assert_normal_exit %q{
- eval("", TOPLEVEL_BINDING)
- minobj = ObjectSpace.to_enum(:each_object).min_by {|a| a.object_id }
- maxobj = ObjectSpace.to_enum(:each_object).max_by {|a| a.object_id }
- (((minobj.object_id-100)..(minobj.object_id+100))+
- ((maxobj.object_id-100)..(maxobj.object_id+100))).each {|id|
- begin
- o = ObjectSpace._id2ref(id)
- rescue RangeError
- next
- end
- o.inspect if defined?(o.inspect)
- }
-}, '[ruby-dev:31911]'
-
-assert_normal_exit %q{
- ary = (1..10).to_a
- ary.permutation(2) {|x|
- if x == [1,2]
- ObjectSpace.each_object(String) {|s|
- s.clear if !s.frozen? && (s.length == 40 || s.length == 80)
- }
- end
- }
-}, '[ruby-dev:31982]'
-
-assert_normal_exit %q{
- ary = (1..100).to_a
- ary.permutation(2) {|x|
- if x == [1,2]
- ObjectSpace.each_object(Array) {|o| o.clear if o == ary && o.object_id != ary.object_id }
- end
- }
-}, '[ruby-dev:31985]'
diff --git a/bootstraptest/test_proc.rb b/bootstraptest/test_proc.rb
deleted file mode 100644
index 28a23777a3..0000000000
--- a/bootstraptest/test_proc.rb
+++ /dev/null
@@ -1,431 +0,0 @@
-assert_equal %q{[1, 2, 3]}, %q{
- def getproc &b
- b
- end
-
- def m
- yield
- end
-
- m{
- i = 1
- m{
- j = 2
- m{
- k = 3
- getproc{
- [i, j, k]
- }
- }
- }
- }.call
-}
-assert_equal %q{7}, %q{
- def make_proc(&b)
- b
- end
-
- def make_closure
- a = 0
- make_proc{
- a+=1
- }
- end
-
- cl = make_closure
- cl.call + cl.call * cl.call
-}
-assert_equal %q{ok}, %q{
- class C
- def foo
- :ok
- end
- end
-
- def block
- C.method(:new).to_proc
- end
- b = block()
- b.call.foo
-}
-assert_equal %q{[0, 1, :last, 0, 2, :last]}, %q{
- def proc &b
- b
- end
-
- pr = []
- proc{|i_b|
- p3 = proc{|j_b|
- pr << proc{|k_b|
- [i_b, j_b, k_b]
- }
- }
- p3.call(1)
- p3.call(2)
- }.call(0)
-
- pr[0].call(:last).concat pr[1].call(:last)
-}
-assert_equal %q{12}, %q{
- def iter
- yield
- end
-
- def getproc &b
- b
- end
-
- iter{
- bvar = 3
- getproc{
- bvar2 = 4
- bvar * bvar2
- }
- }.call
-}
-assert_equal %q{200}, %q{
- def iter
- yield
- end
-
- def getproc &b
- b
- end
-
- loc1 = 0
- pr1 = iter{
- bl1 = 1
- getproc{
- loc1 += 1
- bl1 += 1
- loc1 + bl1
- }
- }
-
- pr2 = iter{
- bl1 = 1
- getproc{
- loc1 += 1
- bl1 += 1
- loc1 + bl1
- }
- }
-
- pr1.call; pr2.call
- pr1.call; pr2.call
- pr1.call; pr2.call
- (pr1.call + pr2.call) * loc1
-}
-assert_equal %q{[1, 2]}, %q{
- def proc(&pr)
- pr
- end
-
- def m
- a = 1
- m2{
- a
- }
- end
-
- def m2
- b = 2
- proc{
- [yield, b]
- }
- end
-
- pr = m
- x = ['a', 1,2,3,4,5,6,7,8,9,0,
- 1,2,3,4,5,6,7,8,9,0,
- 1,2,3,4,5,6,7,8,9,0,
- 1,2,3,4,5,6,7,8,9,0,
- 1,2,3,4,5,6,7,8,9,0,]
- pr.call
-}
-assert_equal %q{1}, %q{
- def proc(&pr)
- pr
- end
-
- def m
- a = 1
- m2{
- a
- }
- end
-
- def m2
- b = 2
- proc{
- [yield, b]
- }
- 100000.times{|x|
- "#{x}"
- }
- yield
- end
- m
-}
-assert_equal %q{[:C, :C]}, %q{
- Const = :top
- class C
- Const = :C
- $pr = proc{
- (1..2).map{
- Const
- }
- }
- end
- $pr.call
-}
-assert_equal %q{top}, %q{
- Const = :top
- class C
- Const = :C
- end
- pr = proc{
- Const
- }
- C.class_eval %q{
- pr.call
- }
-}
-assert_equal %q{1}, %q{
- def m(&b)
- b
- end
-
- m{|e_proctest| e_proctest}.call(1)
-}
-assert_equal %q{12}, %q{
- def m(&b)
- b
- end
-
- m{|e_proctest1, e_proctest2|
- a = e_proctest1 * e_proctest2 * 2
- a * 3
- }.call(1, 2)
-}
-assert_equal %q{[[], [1], [1, 2], [1, 2, 3]]}, %q{
- [
- Proc.new{|*args| args}.call(),
- Proc.new{|*args| args}.call(1),
- Proc.new{|*args| args}.call(1, 2),
- Proc.new{|*args| args}.call(1, 2, 3),
- ]
-}
-assert_equal %q{[[nil, []], [1, []], [1, [2]], [1, [2, 3]]]}, %q{
- [
- Proc.new{|a, *b| [a, b]}.call(),
- Proc.new{|a, *b| [a, b]}.call(1),
- Proc.new{|a, *b| [a, b]}.call(1, 2),
- Proc.new{|a, *b| [a, b]}.call(1, 2, 3),
- ]
-}
-assert_equal %q{0}, %q{
- pr = proc{
- $SAFE
- }
- $SAFE = 1
- pr.call
-}
-assert_equal %q{[1, 0]}, %q{
- pr = proc{
- $SAFE += 1
- }
- [pr.call, $SAFE]
-}
-assert_equal %q{1}, %q{
- def m(&b)
- b
- end
- m{1}.call
-}
-assert_equal %q{3}, %q{
- def m(&b)
- b
- end
-
- m{
- a = 1
- a + 2
- }.call
-}
-assert_equal %Q{ok\n}, %q{
- class A; def get_block; proc {puts "ok"} end end
- block = A.new.get_block
- GC.start
- block.call
-}, '[ruby-core:14885]'
-
-assert_equal 'ok', %q{
- a = lambda {|x, y, &b| b }
- b = a.curry[1]
- if b.call(2){} == nil
- :ng
- else
- :ok
- end
-}, '[ruby-core:15551]'
-
-assert_equal 'ok', %q{
- lambda {
- break :ok
- :ng
- }.call
-}, '[ruby-dev:34646]'
-
-assert_equal %q{[:bar, :foo]}, %q{
- def foo
- klass = Class.new do
- define_method(:bar) do
- return :bar
- end
- end
- [klass.new.bar, :foo]
- end
- foo
-}, "[ ruby-Bugs-19304 ]"
-
-assert_equal 'ok', %q{
- $x = :ok
- def def7(x, y)
- x[y]
- $x = :ng
- end
- def test_def7
- def7(lambda {|x| x.call}, Proc.new {return})
- $x = :ng
- end
- test_def7
- $x
-}, '[ruby-core:17164]'
-
-assert_equal 'ok', %q{
- lambda { a = lambda { return }; $x = :ng; a[]; $x = :ok }.call
- $x
-}, '[ruby-core:17164]'
-
-assert_equal 'ok', %q{
- lambda { a = lambda { break }; $x = :ng; a[]; $x = :ok }.call
- $x
-}, '[ruby-core:17164]'
-
-assert_equal 'ok', %q{
- def def8
- $x = :ng
- lambda { a = Proc.new { return }; a[]}.call
- $x = :ok
- end
- def8
- $x
-}, '[ruby-core:17164]'
-
-
-assert_equal 'ok', %q{
- def def9
- lambda {|a| $x = :ok; a[]; $x = :ng }.call(Proc.new { return })
- $x = :ng
- end
- def9
- $x
-}, '[ruby-core:17164]'
-
-assert_equal 'ok', %q{
- def def10
- $x = :ng
- lambda { 1.times { return } }.call
- $x = :ok
- end
- $x = :ok
- def10
- $x
-}, '[ruby-core:17164]'
-
-assert_equal 'ok', %q{
- def def11
- yield
- end
- begin
- lambda { def11 { return } }.call
- rescue LocalJumpError
- :ng
- else
- :ok
- end
-}, '[ruby-core:17164]'
-
-assert_equal 'ok', %q{
- def def12
- b = Proc.new { $x = :ng; lambda { return }.call; $x = :ok }.call
- end
- def12
- $x
-}, '[ruby-core:17164]'
-
-assert_equal 'ok', %q{
- def m
- pr = proc{
- proc{
- return :ok
- }
- }.call
- pr.call
- :ng
- end
- m()
-}
-
-assert_equal 'ok', %q{
- class Foo
- def call_it
- p = Proc.new
- p.call
- end
- end
-
- def give_it
- proc { :ok }
- end
-
- f = Foo.new
- a_proc = give_it
- f.call_it(&give_it())
-}, '[ruby-core:15711]'
-
-assert_equal 'foo!', %q{
- class FooProc < Proc
- def initialize
- @foo = "foo!"
- end
-
- def bar
- @foo
- end
- end
-
- def bar
- FooProc.new &lambda{
- p 1
- }
- end
-
- fp = bar(&lambda{
- p 2
- })
-
- fp.bar
-}, 'Subclass of Proc'
-
-assert_equal 'ok', %q{
- o = Object.new
- def o.write(s); end
- $stderr = o
- at_exit{
- print $!.message
- }
- raise "ok"
-}
-
diff --git a/bootstraptest/test_struct.rb b/bootstraptest/test_struct.rb
deleted file mode 100644
index a65964d5f9..0000000000
--- a/bootstraptest/test_struct.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-assert_equal 'Struct::Foo', %q{
- Struct.instance_eval { const_set(:Foo, nil) }
- Struct.new("Foo")
- Struct::Foo
-}
diff --git a/bootstraptest/test_syntax.rb b/bootstraptest/test_syntax.rb
deleted file mode 100644
index 6843b23285..0000000000
--- a/bootstraptest/test_syntax.rb
+++ /dev/null
@@ -1,838 +0,0 @@
-assert_equal %q{4}, %q{1 && 2 && 3 && 4}
-assert_equal %q{}, %q{1 && nil && 3 && 4}
-assert_equal %q{}, %q{1 && 2 && 3 && nil}
-assert_equal %q{false}, %q{1 && 2 && 3 && false}
-assert_equal %q{4}, %q{1 and 2 and 3 and 4}
-assert_equal %q{}, %q{1 and nil and 3 and 4}
-assert_equal %q{}, %q{1 and 2 and 3 and nil}
-assert_equal %q{false}, %q{1 and 2 and 3 and false}
-assert_equal %q{}, %q{nil && true}
-assert_equal %q{false}, %q{false && true}
-assert_equal %q{}, %q{
- case 1
- when 2
- :ng
- end}
-assert_equal %q{ok}, %q{
- case 1
- when 10,20,30
- :ng1
- when 1,2,3
- :ok
- when 100,200,300
- :ng2
- else
- :elseng
- end}
-assert_equal %q{elseok}, %q{
- case 123
- when 10,20,30
- :ng1
- when 1,2,3
- :ng2
- when 100,200,300
- :ng3
- else
- :elseok
- end
-}
-assert_equal %q{ok}, %q{
- case 'test'
- when /testx/
- :ng1
- when /test/
- :ok
- when /tetxx/
- :ng2
- else
- :ng_else
- end
-}
-assert_equal %q{ok}, %q{
- case Object.new
- when Object
- :ok
- end
-}
-assert_equal %q{ok}, %q{
- case Object
- when Object.new
- :ng
- else
- :ok
- end
-}
-assert_equal %q{ok}, %q{
- case 'test'
- when 'tes'
- :ng
- when 'te'
- :ng
- else
- :ok
- end
-}
-assert_equal %q{ok}, %q{
- case 'test'
- when 'tes'
- :ng
- when 'te'
- :ng
- when 'test'
- :ok
- end
-}
-assert_equal %q{ng}, %q{
- case 'test'
- when 'tes'
- :ng
- when /te/
- :ng
- else
- :ok
- end
-}
-assert_equal %q{ok}, %q{
- case 'test'
- when 'tes'
- :ng
- when /test/
- :ok
- else
- :ng
- end
-}
-assert_equal %q{100}, %q{
- def test(arg)
- case 1
- when 2
- 3
- end
- return arg
- end
-
- test(100)
-}
-assert_equal %q{ok}, %q{
- ary = [1, 2]
- case 1
- when *ary
- :ok
- else
- :ng
- end
-}
-assert_equal %q{ok}, %q{
- ary = [1, 2]
- case 3
- when *ary
- :ng
- else
- :ok
- end
-}
-assert_equal %q{ok}, %q{
- ary = [1, 2]
- case 1
- when :x, *ary
- :ok
- when :z
- :ng1
- else
- :ng2
- end
-}
-assert_equal %q{ok}, %q{
- ary = [1, 2]
- case 3
- when :x, *ary
- :ng1
- when :z
- :ng2
- else
- :ok
- end
-}
-assert_equal %q{[:false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :then, :false, :false, :false, :then, :false, :then, :then, :then, :false, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :false, :false, :false, :false, :false, :then, :then, :then, :then, :then, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :then, :then, :then, :false, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :then, :false, :false, :false, :then, :then, :then, :then, :then, :then, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :false, :false, :false, :false, :false, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :false, :then, :then, :then, :false, :then, :false, :false, :false, :then, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :then, :then, :then, :then, :then, :false, :false, :false, :false, :false, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :false, :false, :false, :then, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :false, :then, :then, :then, :false, :false, :false, :false, :false, :false, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :then, :then, :then, :then, :then, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep]}, %q{
-
- def make_perm ary, num
- if num == 1
- ary.map{|e| [e]}
- else
- base = make_perm(ary, num-1)
- res = []
- base.each{|b|
- ary.each{|e|
- res << [e] + b
- }
- }
- res
- end
- end
-
- def each_test
- conds = make_perm(['fv', 'tv'], 3)
- bangs = make_perm(['', '!'], 3)
- exprs = make_perm(['and', 'or'], 3)
- ['if', 'unless'].each{|syn|
- conds.each{|cs|
- bangs.each{|bs|
- exprs.each{|es|
- yield(syn, cs, bs, es)
- }
- }
- }
- }
- end
-
- fv = false
- tv = true
-
- $ans = []
- each_test{|syn, conds, bangs, exprs|
- c1, c2, c3 = conds
- bang1, bang2, bang3 = bangs
- e1, e2 = exprs
- eval %Q{
- #{syn} #{bang1}#{c1} #{e1} #{bang2}#{c2} #{e2} #{bang3}#{c3}
- $ans << :then
- else
- $ans << :false
- end
- }
- }
-
- each_test{|syn, conds, bangs, exprs|
- c1, c2, c3 = conds
- bang1, bang2, bang3 = bangs
- e1, e2 = exprs
- eval %Q{
- #{syn} #{bang1}#{c1} #{e1} #{bang2}#{c2} #{e2} #{bang3}#{c3}
- $ans << :then
- end
- $ans << :sep
- }
- }
- $ans
-}
-assert_equal %q{}, %q{
- defined?(m)
-}
-assert_equal %q{method}, %q{
- def m
- end
- defined?(m)
-}
-assert_equal %q{}, %q{
- defined?(a.class)
-}
-assert_equal %q{method}, %q{
- a = 1
- defined?(a.class)
-}
-assert_equal %q{["method", "method", "method", "method", nil, nil, "method", "method", "method", nil]}, %q{
- class C
- def test
- [defined?(m1()), defined?(self.m1), defined?(C.new.m1),
- defined?(m2()), defined?(self.m2), defined?(C.new.m2),
- defined?(m3()), defined?(self.m3), defined?(C.new.m3)]
- end
- def m1
- end
- private
- def m2
- end
- protected
- def m3
- end
- end
- C.new.test + [defined?(C.new.m3)]
-}
-assert_equal %q{[nil, nil, nil, nil, "global-variable", "global-variable", nil, nil]}, %q{
- $ans = [defined?($1), defined?($2), defined?($3), defined?($4)]
- /(a)(b)/ =~ 'ab'
- $ans + [defined?($1), defined?($2), defined?($3), defined?($4)]
-}
-assert_equal %q{nilselftruefalse}, %q{
- defined?(nil) + defined?(self) +
- defined?(true) + defined?(false)
-}
-assert_equal %q{}, %q{
- defined?(@a)
-}
-assert_equal %q{instance-variable}, %q{
- @a = 1
- defined?(@a)
-}
-assert_equal %q{}, %q{
- defined?(@@a)
-}
-assert_equal %q{class variable}, %q{
- @@a = 1
- defined?(@@a)
-}
-assert_equal %q{}, %q{
- defined?($a)
-}
-assert_equal %q{global-variable}, %q{
- $a = 1
- defined?($a)
-}
-assert_equal %q{}, %q{
- defined?(C_definedtest)
-}
-assert_equal %q{constant}, %q{
- C_definedtest = 1
- defined?(C_definedtest)
-}
-assert_equal %q{}, %q{
- defined?(::C_definedtest)
-}
-assert_equal %q{constant}, %q{
- C_definedtest = 1
- defined?(::C_definedtest)
-}
-assert_equal %q{}, %q{
- defined?(C_definedtestA::C_definedtestB::C_definedtestC)
-}
-assert_equal %q{constant}, %q{
- class C_definedtestA
- class C_definedtestB
- C_definedtestC = 1
- end
- end
- defined?(C_definedtestA::C_definedtestB::C_definedtestC)
-}
-assert_equal %q{30}, %q{
- sum = 0
- 30.times{|ib|
- if ib % 10 == 0 .. true
- sum += ib
- end
- }
- sum
-}
-assert_equal %q{63}, %q{
- sum = 0
- 30.times{|ib|
- if ib % 10 == 0 ... true
- sum += ib
- end
- }
- sum
-}
-assert_equal %q{[["NUM", "Type: NUM\n"], ["NUM", "123\n"], ["NUM", "456\n"], ["NUM", "Type: ARP\n"], ["NUM", "aaa\n"], ["NUM", "bbb\n"], ["NUM", "\f\n"], ["ARP", "Type: ARP\n"], ["ARP", "aaa\n"], ["ARP", "bbb\n"]]}, %q{
- t = nil
- unless ''.respond_to? :lines
- class String
- def lines
- self
- end
- end
- end
- ary = []
-"this must not print
-Type: NUM
-123
-456
-Type: ARP
-aaa
-bbb
-\f
-this must not print
-hoge
-Type: ARP
-aaa
-bbb
-".lines.each{|l|
- if (t = l[/^Type: (.*)/, 1])..(/^\f/ =~ l)
- ary << [t, l]
- end
- }
- ary
-}
-assert_equal %q{1}, %q{if true then 1 ; end}
-assert_equal %q{}, %q{if false then 1 ; end}
-assert_equal %q{1}, %q{if true then 1 ; else; 2; end}
-assert_equal %q{2}, %q{if false then 1 ; else; 2; end}
-assert_equal %q{}, %q{if true then ; elsif true then ; 1 ; end}
-assert_equal %q{1}, %q{if false then ; elsif true then ; 1 ; end}
-assert_equal %q{}, %q{unless true then 1 ; end}
-assert_equal %q{1}, %q{unless false then 1 ; end}
-assert_equal %q{2}, %q{unless true then 1 ; else; 2; end}
-assert_equal %q{1}, %q{unless false then 1 ; else; 2; end}
-assert_equal %q{1}, %q{1 if true}
-assert_equal %q{}, %q{1 if false}
-assert_equal %q{}, %q{1 if nil}
-assert_equal %q{}, %q{1 unless true}
-assert_equal %q{1}, %q{1 unless false}
-assert_equal %q{1}, %q{1 unless nil}
-assert_equal %q{1}, %q{1 || 2 || 3 || 4}
-assert_equal %q{1}, %q{1 || false || 3 || 4}
-assert_equal %q{2}, %q{nil || 2 || 3 || 4}
-assert_equal %q{2}, %q{false || 2 || 3 || 4}
-assert_equal %q{false}, %q{nil || false || nil || false}
-assert_equal %q{1}, %q{1 or 2 or 3 or 4}
-assert_equal %q{1}, %q{1 or false or 3 or 4}
-assert_equal %q{2}, %q{nil or 2 or 3 or 4}
-assert_equal %q{2}, %q{false or 2 or 3 or 4}
-assert_equal %q{false}, %q{nil or false or nil or false}
-assert_equal %q{elseng}, %q{
- case
- when 1==2, 2==3
- :ng1
- when false, 4==5
- :ok
- when false
- :ng2
- else
- :elseng
- end
-}
-assert_equal %q{ok}, %q{
- case
- when nil, nil
- :ng1
- when 1,2,3
- :ok
- when false, false
- :ng2
- else
- :elseng
- end
-}
-assert_equal %q{elseok}, %q{
- case
- when nil
- :ng1
- when false
- :ng2
- else
- :elseok
- end}
-assert_equal %q{}, %q{
- case
- when 1
- end
-}
-assert_equal %q{ok}, %q{
- r = nil
- ary = []
- case
- when false
- r = :ng1
- when false, false
- r = :ng2
- when *ary
- r = :ng3
- when false, *ary
- r = :ng4
- when true, *ary
- r = :ok
- end
- r
-}
-assert_equal %q{ok}, %q{
- ary = []
- case
- when false, *ary
- :ng
- else
- :ok
- end
-}
-assert_equal %q{ok}, %q{
- ary = [false, nil]
- case
- when *ary
- :ng
- else
- :ok
- end
-}
-assert_equal %q{ok}, %q{
- ary = [false, nil]
- case
- when *ary
- :ng
- when true
- :ok
- else
- :ng2
- end
-}
-assert_equal %q{ng}, %q{
- ary = [false, nil]
- case
- when *ary
- :ok
- else
- :ng
- end
-}
-assert_equal %q{ok}, %q{
- ary = [false, true]
- case
- when *ary
- :ok
- else
- :ng
- end
-}
-assert_equal %q{ok}, %q{
- ary = [false, true]
- case
- when false, false
- when false, *ary
- :ok
- else
- :ng
- end
-}
-assert_equal %q{}, %q{
- i = 0
- while i < 10
- i+=1
- end}
-assert_equal %q{10}, %q{
- i = 0
- while i < 10
- i+=1
- end; i}
-assert_equal %q{}, %q{
- i = 0
- until i > 10
- i+=1
- end}
-assert_equal %q{11}, %q{
- i = 0
- until i > 10
- i+=1
- end; i}
-assert_equal %q{1}, %q{
- i = 0
- begin
- i+=1
- end while false
- i
-}
-assert_equal %q{1}, %q{
- i = 0
- begin
- i+=1
- end until true
- i
-}
-def assert_syntax_error expected, code, message = ''
- assert_equal "#{expected}",
- "begin eval(%q{#{code}}, nil, '', 0)"'; rescue SyntaxError => e; e.message[/\A:(?:\d+:)? (.*)/, 1] end', message
-end
-assert_syntax_error "unterminated string meets end of file", '().."', '[ruby-dev:29732]'
-assert_equal %q{[]}, %q{$&;[]}, '[ruby-dev:31068]'
-assert_syntax_error "syntax error, unexpected tSTAR, expecting '}'", %q{{*0}}, '[ruby-dev:31072]'
-assert_syntax_error "`@0' is not allowed as an instance variable name", %q{@0..0}, '[ruby-dev:31095]'
-assert_syntax_error "identifier $00 is not valid to get", %q{$00..0}, '[ruby-dev:31100]'
-assert_syntax_error "identifier $00 is not valid to set", %q{0..$00=1}
-assert_equal %q{0}, %q{[*0];0}, '[ruby-dev:31102]'
-assert_syntax_error "syntax error, unexpected ')'", %q{v0,(*,v1,) = 0}, '[ruby-dev:31104]'
-assert_equal %q{1}, %q{
- class << (ary=[]); def []; 0; end; def []=(x); super(0,x);end;end; ary[]+=1
-}, '[ruby-dev:31110]'
-assert_syntax_error "Can't set variable $1", %q{0..$1=1}, '[ruby-dev:31118]'
-assert_valid_syntax %q{1.times{1+(1&&next)}}, '[ruby-dev:31119]'
-assert_valid_syntax %q{x=-1;loop{x+=1&&redo if (x+=1).zero?}}, '[ruby-dev:31119]'
-assert_syntax_error %q{syntax error, unexpected $end}, %q{!}, '[ruby-dev:31243]'
-assert_equal %q{[nil]}, %q{[()]}, '[ruby-dev:31252]'
-assert_equal %q{true}, %q{!_=()}, '[ruby-dev:31263]'
-assert_equal 'ok', %q{while true; redo; end if 1 == 2; :ok}, '[ruby-dev:31360]'
-assert_equal 'ok', %q{
- 1.times {
- begin
- ensure
- next
- end
- }; :ok
-}, '[ruby-dev:31373]'
-assert_equal 'ok', %q{
- flag = false
- 1.times {
- next if flag
- flag = true
- begin
- ensure
- redo
- end
- }; :ok
-}, '[ruby-dev:31373]'
-
-assert_equal 'ok', %q{
- 1.times{
- p(1, (next; 2))
- }; :ok
-}
-assert_equal '3', %q{
- i = 0
- 1 + (while true
- break 2 if (i+=1) > 1
- next
- end)
-}
-assert_equal '3', %q{
- i = 0
- 1 + (while true
- break 2 if (i+=1) > 1
- p(1, (next; 2))
- end)
-}
-# redo
-assert_equal 'ok', %q{
- i = 0
- 1.times{
- break if i>1
- i+=1
- p(1, (redo; 2))
- }; :ok
-}
-assert_equal '3', %q{
- i = 0
- 1 + (while true
- break 2 if (i+=1) > 1
- redo
- end)
-}
-assert_equal '3', %q{
- i = 0
- 1 + (while true
- break 2 if (i+=1) > 1
- p(1, (redo; 2))
- end)
-}
-assert_equal '1', %q{
- a = [0]
- a[*a]+=1
-}
-assert_equal '2', %q{
- ary = [0]
- case 1
- when *ary, 1
- 1
- end +
- case
- when *ary
- 1
- end
-}
-
-assert_match /invalid multibyte char/, %q{
- STDERR.reopen(STDOUT)
- eval("\"\xf0".force_encoding("utf-8"))
-}, '[ruby-dev:32429]'
-
-# method ! and !=
-assert_equal 'true', %q{!false}
-assert_equal 'true', %q{1 == 1}
-assert_equal 'true', %q{1 != 2}
-assert_equal 'true', %q{
- class C; def !=(obj); true; end; end
- C.new != 1
-}
-assert_equal 'true', %q{
- class C; def !@; true; end; end
- !C.new
-}
-assert_normal_exit %q{
- eval "while true; return; end rescue p $!"
-}, '[ruby-dev:31663]'
-assert_equal '1', %q{
- def bar
- raise
- end
-
- def foo
- 1.times{
- begin
- return bar
- rescue
- :ok
- end
- }
- end
-
- foo
-}
-
-assert_equal 'ok', %q{
- counter = 2
- while true
- counter -= 1
- next if counter != 0
- break
- end
- :ok
-}, '[ruby-core:14385]'
-
-assert_equal 'ok', %q{
- counter = 2
- while true
- counter -= 1
- next if counter != 0
- break :ok
- end # direct
-}, '[ruby-core:14385]'
-
-assert_equal 'ok', %q{
- counter = 2
- while true
- counter -= 1
- break if counter == 0
- "#{next}"
- end
- :ok
-}, 'reported by Yusuke ENDOH'
-
-assert_equal 'ok', %q{
- counter = 2
- while true
- counter -= 1
- break if counter == 0
- next
- redo
- end
- :ok
-}, 'reported by Yusuke ENDOH'
-
-assert_equal 'ok', %q{
- counter = 2
- while true
- counter -= 1
- break if counter == 0
- next
- "#{ redo }"
- end
- :ok
-}, 'reported by Yusuke ENDOH'
-
-assert_normal_exit %q{
- begin
- raise
- rescue
- counter = 2
- while true
- counter -= 1
- break if counter == 0
- next
- retry
- end
- end
-}, 'reported by Yusuke ENDOH'
-
-assert_normal_exit %q{
- counter = 2
- while true
- counter -= 1
- break if counter == 0
- next
- "#{ break }"
- end
-}, 'reported by Yusuke ENDOH'
-
-assert_normal_exit %q{
- counter = 2
- while true
- counter -= 1
- next if counter != 0
- "#{ break }"
- end
-}, 'reported by Yusuke ENDOH'
-
-assert_equal 'ok', %q{
- 1.times do
- [
- 1, 2, 3, 4, 5, 6, 7, 8,
- begin
- false ? next : p
- break while true
- end
- ]
- end
- :ok
-}, '[ruby-dev:32882]'
-
-assert_equal "1\n2\n", %q{
- i = 0
- while i<2
- i += 1
- next p(i)
- end
-}
-
-assert_valid_syntax('1.times {|i|print (42),1;}', '[ruby-list:44479]')
-
-assert_equal 'ok', %q{
- def a() end
- begin
- if defined?(a(1).a)
- :ng
- else
- :ok
- end
- rescue
- :ng
- end
-}, '[ruby-core:16010]'
-
-assert_equal 'ok', %q{
- def a() end
- begin
- if defined?(a::B)
- :ng
- else
- :ok
- end
- rescue
- :ng
- end
-}, '[ruby-core:16010]'
-
-assert_normal_exit %q{
- defined? C && 0
-}
-
-assert_normal_exit %q{
- class C
- def m
- defined?(super())
- end
- end
- C.new.m
-}
-
-assert_equal 'ok', %q{
- class X < RuntimeError;end
- x = [X]
- begin
- raise X
- rescue *x
- :ok
- end
-}, '[ruby-core:14537]'
-
-assert_equal 'ok', %q{
- a = [false]
- (a[0] &&= true) == false ? :ok : :ng
-}, '[ruby-dev:34679]'
-
-assert_normal_exit %q{
- a = []
- 100.times {|i| a << i << nil << nil }
- p a.compact!
-}
-
-assert_equal 'ok', %q{
- "#{}""#{}ok"
-}, '[ruby-dev:38968]'
-
-
-assert_equal 'ok', %q{
- "o" "#{}k"
-}, '[ruby-dev:38980]'
diff --git a/bootstraptest/test_thread.rb b/bootstraptest/test_thread.rb
deleted file mode 100644
index c82ad22ebe..0000000000
--- a/bootstraptest/test_thread.rb
+++ /dev/null
@@ -1,387 +0,0 @@
-# Thread and Fiber
-
-assert_equal %q{ok}, %q{
- Thread.new{
- }.join
- :ok
-}
-assert_equal %q{ok}, %q{
- Thread.new{
- :ok
- }.value
-}
-assert_equal %q{20100}, %q{
- v = 0
- (1..200).map{|i|
- Thread.new{
- i
- }
- }.each{|t|
- v += t.value
- }
- v
-}
-assert_equal %q{5000}, %q{
- 5000.times{|e|
- (1..2).map{
- Thread.new{
- }
- }.each{|e|
- e.join()
- }
- }
-}
-assert_equal %q{5000}, %q{
- 5000.times{|e|
- (1..2).map{
- Thread.new{
- }
- }.each{|e|
- e.join(1000000000)
- }
- }
-}
-assert_equal %q{5000}, %q{
- 5000.times{
- t = Thread.new{}
- while t.alive?
- Thread.pass
- end
- }
-}
-assert_equal %q{100}, %q{
- 100.times{
- Thread.new{loop{Thread.pass}}
- }
-}
-assert_equal %q{ok}, %q{
- Thread.new{
- :ok
- }.join.value
-}
-assert_equal %q{ok}, %q{
- begin
- Thread.new{
- raise "ok"
- }.join
- rescue => e
- e
- end
-}
-assert_equal %q{ok}, %q{
- ans = nil
- t = Thread.new{
- begin
- sleep 0.5
- ensure
- ans = :ok
- end
- }
- Thread.pass
- t.kill
- t.join
- ans
-}
-assert_equal %q{ok}, %q{
- t = Thread.new{
- sleep
- }
- sleep 0.1
- t.raise
- begin
- t.join
- :ng
- rescue
- :ok
- end
-}
-assert_equal %q{ok}, %q{
- t = Thread.new{
- loop{}
- }
- Thread.pass
- t.raise
- begin
- t.join
- :ng
- rescue
- :ok
- end
-}
-assert_equal %q{ok}, %q{
- t = Thread.new{
- }
- Thread.pass
- t.join
- t.raise # raise to exited thread
- begin
- t.join
- :ok
- rescue
- :ng
- end
-}
-assert_equal %q{run}, %q{
- t = Thread.new{
- loop{}
- }
- st = t.status
- t.kill
- st
-}
-assert_equal %q{sleep}, %q{
- t = Thread.new{
- sleep
- }
- sleep 0.1
- st = t.status
- t.kill
- st
-}
-assert_equal %q{false}, %q{
- t = Thread.new{
- }
- t.kill
- sleep 0.1
- t.status
-}
-assert_equal %q{[ThreadGroup, true]}, %q{
- ptg = Thread.current.group
- Thread.new{
- ctg = Thread.current.group
- [ctg.class, ctg == ptg]
- }.value
-}
-assert_equal %q{[1, 1]}, %q{
- thg = ThreadGroup.new
-
- t = Thread.new{
- thg.add Thread.current
- sleep
- }
- sleep 0.1
- [thg.list.size, ThreadGroup::Default.list.size]
-}
-assert_equal %q{true}, %q{
- thg = ThreadGroup.new
-
- t = Thread.new{sleep 5}
- thg.add t
- thg.list.include?(t)
-}
-assert_equal %q{[true, nil, true]}, %q{
- /a/ =~ 'a'
- $a = $~
- Thread.new{
- $b = $~
- /a/ =~ 'a'
- $c = $~
- }
- $d = $~
- [$a == $d, $b, $c != $d]
-}
-assert_equal %q{11}, %q{
- Thread.current[:a] = 1
- Thread.new{
- Thread.current[:a] = 10
- Thread.pass
- Thread.current[:a]
- }.value + Thread.current[:a]
-}
-assert_equal %q{100}, %q{
-begin
- 100.times do |i|
- begin
- Thread.start(Thread.current) {|u| u.raise }
- raise
- rescue
- ensure
- end
- end
-rescue
- 100
-end
-}, '[ruby-dev:31371]'
-
-assert_equal 'true', %{
- t = Thread.new { loop {} }
- begin
- pid = fork {
- exit t.status != "run"
- }
- Process.wait pid
- $?.success?
- rescue NotImplementedError
- true
- end
-}
-
-assert_equal 'ok', %{
- open("zzz.rb", "w") do |f|
- f.puts <<-END
- begin
- Thread.new { fork { GC.start } }.join
- pid, status = Process.wait2
- $result = status.success? ? :ok : :ng
- rescue NotImplementedError
- $result = :ok
- end
- END
- end
- require "./zzz.rb"
- $result
-}
-
-assert_finish 3, %{
- th = Thread.new {sleep 2}
- th.join(1)
- th.join
-}
-
-assert_finish 3, %{
- require 'timeout'
- th = Thread.new {sleep 2}
- begin
- Timeout.timeout(1) {th.join}
- rescue Timeout::Error
- end
- th.join
-}
-
-assert_normal_exit %q{
- STDERR.reopen(STDOUT)
- exec "/"
-}
-
-assert_normal_exit %q{
- (0..10).map {
- Thread.new {
- 10000.times {
- Object.new.to_s
- }
- }
- }.each {|t|
- t.join
- }
-}
-
-assert_equal 'ok', %q{
- def m
- t = Thread.new { while true do // =~ "" end }
- sleep 0.1
- 10.times {
- if /((ab)*(ab)*)*(b)/ =~ "ab"*7
- return :ng if !$4
- return :ng if $~.size != 5
- end
- }
- :ok
- ensure
- Thread.kill t
- end
- m
-}, '[ruby-dev:34492]'
-
-assert_normal_exit %q{
- at_exit { Fiber.new{}.resume }
-}
-
-assert_normal_exit %q{
- g = enum_for(:local_variables)
- loop { g.next }
-}, '[ruby-dev:34128]'
-
-assert_normal_exit %q{
- g = enum_for(:block_given?)
- loop { g.next }
-}, '[ruby-dev:34128]'
-
-assert_normal_exit %q{
- g = enum_for(:binding)
- loop { g.next }
-}, '[ruby-dev:34128]'
-
-assert_normal_exit %q{
- g = "abc".enum_for(:scan, /./)
- loop { g.next }
-}, '[ruby-dev:34128]'
-
-assert_normal_exit %q{
- g = Module.enum_for(:new)
- loop { g.next }
-}, '[ruby-dev:34128]'
-
-assert_normal_exit %q{
- Fiber.new(&Object.method(:class_eval)).resume("foo")
-}, '[ruby-dev:34128]'
-
-assert_normal_exit %q{
- Thread.new("foo", &Object.method(:class_eval)).join
-}, '[ruby-dev:34128]'
-
-assert_equal 'ok', %q{
- begin
- Thread.new { Thread.stop }
- Thread.stop
- :ng
- rescue Exception
- :ok
- end
-}
-
-assert_equal 'ok', %q{
- begin
- m1, m2 = Mutex.new, Mutex.new
- Thread.new { m1.lock; sleep 1; m2.lock }
- m2.lock; sleep 1; m1.lock
- :ng
- rescue Exception
- :ok
- end
-}
-
-assert_equal 'ok', %q{
- m = Mutex.new
- Thread.new { m.lock }; sleep 1; m.lock
- :ok
-}
-
-assert_equal 'ok', %q{
- m = Mutex.new
- Thread.new { m.lock }; m.lock
- :ok
-}
-
-assert_equal 'ok', %q{
- m = Mutex.new
- Thread.new { m.lock }.join; m.lock
- :ok
-}
-
-assert_equal 'ok', %q{
- m = Mutex.new
- Thread.new { m.lock; sleep 2 }
- sleep 1; m.lock
- :ok
-}
-
-assert_equal 'ok', %q{
- m = Mutex.new
- Thread.new { m.lock; sleep 2; m.unlock }
- sleep 1; m.lock
- :ok
-}
-
-assert_equal 'ok', %q{
- t = Thread.new {`echo`}
- t.join
- $? ? :ng : :ok
-}, '[ruby-dev:35414]'
-
-assert_equal 'ok', %q{
- begin
- 10000.times { Thread.new(true) {|x| x == false } }
- rescue NoMemoryError, StandardError
- end
- :ok
-}
diff --git a/class.c b/class.c
index 865197b843..096c7fbdf1 100644
--- a/class.c
+++ b/class.c
@@ -3,117 +3,48 @@
class.c -
$Author$
+ $Date$
created at: Tue Aug 10 15:05:44 JST 1993
- Copyright (C) 1993-2007 Yukihiro Matsumoto
+ Copyright (C) 1993-2003 Yukihiro Matsumoto
**********************************************************************/
-/*!
- * \defgroup class Classes and their hierarchy.
- * \par Terminology
- * - class: same as in Ruby.
- * - singleton class: class for a particular object
- * - eigenclass: = singleton class
- * - metaclass: class of a class. metaclass is a kind of singleton class.
- * - metametaclass: class of a metaclass.
- * - meta^(n)-class: class of a meta^(n-1)-class.
- * - attached object: A singleton class knows its unique instance.
- * The instance is called the attached object for the singleton class.
- * \{
- */
-
-#include "ruby/ruby.h"
-#include "ruby/st.h"
-#include "method.h"
-#include "vm_core.h"
+#include "ruby.h"
+#include "rubysig.h"
+#include "node.h"
+#include "st.h"
#include <ctype.h>
extern st_table *rb_class_tbl;
-static ID id_attached;
-
-/**
- * Allocates a struct RClass for a new class.
- *
- * \param flags initial value for basic.flags of the returned class.
- * \param klass the class of the returned class.
- * \return an uninitialized Class object.
- * \pre \p klass must refer \c Class class or an ancestor of Class.
- * \pre \code (flags | T_CLASS) != 0 \endcode
- * \post the returned class can safely be \c #initialize 'd.
- *
- * \note this function is not Class#allocate.
- */
-static VALUE
-class_alloc(VALUE flags, VALUE klass)
-{
- rb_classext_t *ext = ALLOC(rb_classext_t);
- NEWOBJ(obj, struct RClass);
- OBJSETUP(obj, klass, flags);
- obj->ptr = ext;
- RCLASS_IV_TBL(obj) = 0;
- RCLASS_M_TBL(obj) = 0;
- RCLASS_SUPER(obj) = 0;
- RCLASS_IV_INDEX_TBL(obj) = 0;
- return (VALUE)obj;
-}
-
-/*!
- * A utility function that wraps class_alloc.
- *
- * allocates a class and initializes safely.
- * \param super a class from which the new class derives.
- * \return a class object.
- * \pre \a super must be a class.
- * \post the metaclass of the new class is Class.
- */
VALUE
-rb_class_boot(VALUE super)
+rb_class_boot(super)
+ VALUE super;
{
- VALUE klass = class_alloc(T_CLASS, rb_cClass);
+ NEWOBJ(klass, struct RClass);
+ OBJSETUP(klass, rb_cClass, T_CLASS);
- RCLASS_SUPER(klass) = super;
- RCLASS_M_TBL(klass) = st_init_numtable();
+ klass->super = super;
+ klass->iv_tbl = 0;
+ klass->m_tbl = 0; /* safe GC */
+ klass->m_tbl = st_init_numtable();
OBJ_INFECT(klass, super);
return (VALUE)klass;
}
-
-/*!
- * Ensures a class can be derived from super.
- *
- * \param super a reference to an object.
- * \exception TypeError if \a super is not a Class or \a super is a singleton class.
- */
-void
-rb_check_inheritable(VALUE super)
-{
- if (TYPE(super) != T_CLASS) {
- rb_raise(rb_eTypeError, "superclass must be a Class (%s given)",
- rb_obj_classname(super));
- }
- if (RBASIC(super)->flags & FL_SINGLETON) {
- rb_raise(rb_eTypeError, "can't make subclass of singleton class");
- }
-}
-
-
-/*!
- * Creates a new class.
- * \param super a class from which the new class derives.
- * \exception TypeError \a super is not inheritable.
- * \exception TypeError \a super is the Class class.
- */
VALUE
-rb_class_new(VALUE super)
+rb_class_new(super)
+ VALUE super;
{
Check_Type(super, T_CLASS);
- rb_check_inheritable(super);
if (super == rb_cClass) {
rb_raise(rb_eTypeError, "can't make subclass of Class");
}
+ if (FL_TEST(super, FL_SINGLETON)) {
+ rb_raise(rb_eTypeError, "can't make subclass of virtual class");
+ }
return rb_class_boot(super);
}
@@ -122,47 +53,48 @@ struct clone_method_data {
VALUE klass;
};
-VALUE rb_iseq_clone(VALUE iseqval, VALUE newcbase);
-
static int
-clone_method(ID mid, const rb_method_entry_t *me, struct clone_method_data *data)
+clone_method(mid, body, data)
+ ID mid;
+ NODE *body;
+ struct clone_method_data *data;
{
- if (me->def && me->def->type == VM_METHOD_TYPE_ISEQ) {
- VALUE newiseqval = rb_iseq_clone(me->def->body.iseq->self, data->klass);
- rb_iseq_t *iseq;
- GetISeqPtr(newiseqval, iseq);
- rb_add_method(data->klass, mid, VM_METHOD_TYPE_ISEQ, iseq, me->flag);
- }
- else {
- rb_add_method_me(data->klass, mid, me, me->flag);
+ NODE *fbody = body->nd_body;
+
+ if (fbody && nd_type(fbody) == NODE_SCOPE) {
+ fbody = rb_copy_node_scope(fbody, ruby_cref);
}
+ st_insert(data->tbl, mid, (st_data_t)NEW_METHOD(fbody, body->nd_noex));
return ST_CONTINUE;
}
/* :nodoc: */
VALUE
-rb_mod_init_copy(VALUE clone, VALUE orig)
+rb_mod_init_copy(clone, orig)
+ VALUE clone, orig;
{
rb_obj_init_copy(clone, orig);
if (!FL_TEST(CLASS_OF(clone), FL_SINGLETON)) {
- RBASIC(clone)->klass = rb_singleton_class_clone(orig);
+ RBASIC(clone)->klass = RBASIC(orig)->klass;
+ RBASIC(clone)->klass = rb_singleton_class_clone(clone);
}
- RCLASS_SUPER(clone) = RCLASS_SUPER(orig);
- if (RCLASS_IV_TBL(orig)) {
+ RCLASS(clone)->super = RCLASS(orig)->super;
+ if (RCLASS(orig)->iv_tbl) {
ID id;
- RCLASS_IV_TBL(clone) = st_copy(RCLASS_IV_TBL(orig));
- CONST_ID(id, "__classpath__");
- st_delete(RCLASS_IV_TBL(clone), (st_data_t*)&id, 0);
- CONST_ID(id, "__classid__");
- st_delete(RCLASS_IV_TBL(clone), (st_data_t*)&id, 0);
+ RCLASS(clone)->iv_tbl = st_copy(RCLASS(orig)->iv_tbl);
+ id = rb_intern("__classpath__");
+ st_delete(RCLASS(clone)->iv_tbl, (st_data_t*)&id, 0);
+ id = rb_intern("__classid__");
+ st_delete(RCLASS(clone)->iv_tbl, (st_data_t*)&id, 0);
}
- if (RCLASS_M_TBL(orig)) {
+ if (RCLASS(orig)->m_tbl) {
struct clone_method_data data;
- data.tbl = RCLASS_M_TBL(clone) = st_init_numtable();
- data.klass = clone;
- st_foreach(RCLASS_M_TBL(orig), clone_method,
- (st_data_t)&data);
+
+ data.tbl = RCLASS(clone)->m_tbl = st_init_numtable();
+ data.klass = (VALUE)clone;
+
+ st_foreach(RCLASS(orig)->m_tbl, clone_method, (st_data_t)&data);
}
return clone;
@@ -170,9 +102,10 @@ rb_mod_init_copy(VALUE clone, VALUE orig)
/* :nodoc: */
VALUE
-rb_class_init_copy(VALUE clone, VALUE orig)
+rb_class_init_copy(clone, orig)
+ VALUE clone, orig;
{
- if (RCLASS_SUPER(clone) != 0) {
+ if (RCLASS(clone)->super != 0) {
rb_raise(rb_eTypeError, "already initialized class");
}
if (FL_TEST(orig, FL_SINGLETON)) {
@@ -182,16 +115,17 @@ rb_class_init_copy(VALUE clone, VALUE orig)
}
VALUE
-rb_singleton_class_clone(VALUE obj)
+rb_singleton_class_clone(obj)
+ VALUE obj;
{
VALUE klass = RBASIC(obj)->klass;
if (!FL_TEST(klass, FL_SINGLETON))
return klass;
else {
- struct clone_method_data data;
/* copy singleton(unnamed) class */
- VALUE clone = class_alloc(RBASIC(klass)->flags, 0);
+ NEWOBJ(clone, struct RClass);
+ OBJSETUP(clone, 0, RBASIC(klass)->flags);
if (BUILTIN_TYPE(obj) == T_CLASS) {
RBASIC(clone)->klass = (VALUE)clone;
@@ -200,181 +134,74 @@ rb_singleton_class_clone(VALUE obj)
RBASIC(clone)->klass = rb_singleton_class_clone(klass);
}
- RCLASS_SUPER(clone) = RCLASS_SUPER(klass);
- if (RCLASS_IV_TBL(klass)) {
- RCLASS_IV_TBL(clone) = st_copy(RCLASS_IV_TBL(klass));
+ clone->super = RCLASS(klass)->super;
+ clone->iv_tbl = 0;
+ clone->m_tbl = 0;
+ if (RCLASS(klass)->iv_tbl) {
+ clone->iv_tbl = st_copy(RCLASS(klass)->iv_tbl);
+ }
+ {
+ struct clone_method_data data;
+
+ data.tbl = clone->m_tbl = st_init_numtable();
+ switch (TYPE(obj)) {
+ case T_CLASS:
+ case T_MODULE:
+ data.klass = obj;
+ break;
+ default:
+ data.klass = 0;
+ break;
+ }
+
+ st_foreach(RCLASS(klass)->m_tbl, clone_method, (st_data_t)&data);
}
- RCLASS_M_TBL(clone) = st_init_numtable();
- data.tbl = RCLASS_M_TBL(clone);
- data.klass = (VALUE)clone;
- st_foreach(RCLASS_M_TBL(klass), clone_method,
- (st_data_t)&data);
rb_singleton_class_attached(RBASIC(clone)->klass, (VALUE)clone);
FL_SET(clone, FL_SINGLETON);
return (VALUE)clone;
}
}
-/*!
- * Attach a object to a singleton class.
- * @pre \a klass is the singleton class of \a obj.
- */
void
-rb_singleton_class_attached(VALUE klass, VALUE obj)
+rb_singleton_class_attached(klass, obj)
+ VALUE klass, obj;
{
if (FL_TEST(klass, FL_SINGLETON)) {
- if (!RCLASS_IV_TBL(klass)) {
- RCLASS_IV_TBL(klass) = st_init_numtable();
+ if (!RCLASS(klass)->iv_tbl) {
+ RCLASS(klass)->iv_tbl = st_init_numtable();
}
- st_insert(RCLASS_IV_TBL(klass), id_attached, obj);
- }
-}
-
-
-
-#define METACLASS_OF(k) RBASIC(k)->klass
-
-/*!
- * whether k is a meta^(n)-class of Class class
- * @retval 1 if \a k is a meta^(n)-class of Class class (n >= 0)
- * @retval 0 otherwise
- */
-#define META_CLASS_OF_CLASS_CLASS_P(k) (METACLASS_OF(k) == k)
-
-
-/*!
- * ensures \a klass belongs to its own eigenclass.
- * @return the eigenclass of \a klass
- * @post \a klass belongs to the returned eigenclass.
- * i.e. the attached object of the eigenclass is \a klass.
- * @note this macro creates a new eigenclass if necessary.
- */
-#define ENSURE_EIGENCLASS(klass) \
- (rb_ivar_get(METACLASS_OF(klass), id_attached) == klass ? METACLASS_OF(klass) : make_metaclass(klass))
-
-
-/*!
- * Creates a metaclass of \a klass
- * \param klass a class
- * \return created metaclass for the class
- * \pre \a klass is a Class object
- * \pre \a klass has no singleton class.
- * \post the class of \a klass is the returned class.
- * \post the returned class is meta^(n+1)-class when \a klass is a meta^(n)-klass for n >= 0
- */
-static inline VALUE
-make_metaclass(VALUE klass)
-{
- VALUE super;
- VALUE metaclass = rb_class_boot(Qundef);
-
- FL_SET(metaclass, FL_SINGLETON);
- rb_singleton_class_attached(metaclass, klass);
-
- if (META_CLASS_OF_CLASS_CLASS_P(klass)) {
- METACLASS_OF(klass) = METACLASS_OF(metaclass) = metaclass;
+ st_insert(RCLASS(klass)->iv_tbl, rb_intern("__attached__"), obj);
}
- else {
- VALUE tmp = METACLASS_OF(klass); /* for a meta^(n)-class klass, tmp is meta^(n)-class of Class class */
- METACLASS_OF(klass) = metaclass;
- METACLASS_OF(metaclass) = ENSURE_EIGENCLASS(tmp);
- }
-
- super = RCLASS_SUPER(klass);
- while (FL_TEST(super, T_ICLASS)) super = RCLASS_SUPER(super);
- RCLASS_SUPER(metaclass) = super ? ENSURE_EIGENCLASS(super) : rb_cClass;
-
- OBJ_INFECT(metaclass, RCLASS_SUPER(metaclass));
-
- return metaclass;
}
-/*!
- * Creates a singleton class for \a obj.
- * \pre \a obj must not a immediate nor a special const.
- * \pre \a obj must not a Class object.
- * \pre \a obj has no singleton class.
- */
-static inline VALUE
-make_singleton_class(VALUE obj)
+VALUE
+rb_make_metaclass(obj, super)
+ VALUE obj, super;
{
- VALUE orig_class = RBASIC(obj)->klass;
- VALUE klass = rb_class_boot(orig_class);
-
+ VALUE klass = rb_class_boot(super);
FL_SET(klass, FL_SINGLETON);
RBASIC(obj)->klass = klass;
rb_singleton_class_attached(klass, obj);
-
- METACLASS_OF(klass) = METACLASS_OF(rb_class_real(orig_class));
- return klass;
-}
-
-
-static VALUE
-boot_defclass(const char *name, VALUE super)
-{
- extern st_table *rb_class_tbl;
- VALUE obj = rb_class_boot(super);
- ID id = rb_intern(name);
-
- rb_name_class(obj, id);
- st_add_direct(rb_class_tbl, id, obj);
- rb_const_set((rb_cObject ? rb_cObject : obj), id, obj);
- return obj;
-}
-
-void
-Init_class_hierarchy(void)
-{
- id_attached = rb_intern("__attached__");
-
- rb_cBasicObject = boot_defclass("BasicObject", 0);
- rb_cObject = boot_defclass("Object", rb_cBasicObject);
- rb_cModule = boot_defclass("Module", rb_cObject);
- rb_cClass = boot_defclass("Class", rb_cModule);
-
- RBASIC(rb_cClass)->klass
- = RBASIC(rb_cModule)->klass
- = RBASIC(rb_cObject)->klass
- = RBASIC(rb_cBasicObject)->klass
- = rb_cClass;
-}
-
-
-/*!
- * \internal
- * Creates a new *singleton class* for an object.
- *
- * \pre \a obj has no singleton class.
- * \note DO NOT USE the function in an extension libraries. Use \ref rb_singleton_class.
- * \param obj An object.
- * \param unused ignored.
- * \return The singleton class of the object.
- */
-VALUE
-rb_make_metaclass(VALUE obj, VALUE unused)
-{
- if (BUILTIN_TYPE(obj) == T_CLASS) {
- return make_metaclass(obj);
+ if (BUILTIN_TYPE(obj) == T_CLASS && FL_TEST(obj, FL_SINGLETON)) {
+ RBASIC(klass)->klass = klass;
+ RCLASS(klass)->super = RBASIC(rb_class_real(RCLASS(obj)->super))->klass;
}
else {
- return make_singleton_class(obj);
+ VALUE metasuper = RBASIC(rb_class_real(super))->klass;
+
+ /* metaclass of a superclass may be NULL at boot time */
+ if (metasuper) {
+ RBASIC(klass)->klass = metasuper;
+ }
}
-}
+ return klass;
+}
-/*!
- * Defines a new class.
- * \param id ignored
- * \param super A class from which the new class will derive. NULL means \c Object class.
- * \return the created class
- * \throw TypeError if super is not a \c Class object.
- *
- * \note the returned class will not be associated with \a id.
- * You must explicitly set a class name if necessary.
- */
VALUE
-rb_define_class_id(ID id, VALUE super)
+rb_define_class_id(id, super)
+ ID id;
+ VALUE super;
{
VALUE klass;
@@ -385,43 +212,31 @@ rb_define_class_id(ID id, VALUE super)
return klass;
}
+void
+rb_check_inheritable(super)
+ VALUE super;
+{
+ if (TYPE(super) != T_CLASS) {
+ rb_raise(rb_eTypeError, "superclass must be a Class (%s given)",
+ rb_obj_classname(super));
+ }
+ if (RBASIC(super)->flags & FL_SINGLETON) {
+ rb_raise(rb_eTypeError, "can't make subclass of virtual class");
+ }
+}
-/*!
- * Calls Class#inherited.
- * \param super A class which will be called #inherited.
- * NULL means Object class.
- * \param klass A Class object which derived from \a super
- * \return the value \c Class#inherited's returns
- * \pre Each of \a super and \a klass must be a \c Class object.
- */
VALUE
-rb_class_inherited(VALUE super, VALUE klass)
+rb_class_inherited(super, klass)
+ VALUE super, klass;
{
- ID inherited;
if (!super) super = rb_cObject;
- CONST_ID(inherited, "inherited");
- return rb_funcall(super, inherited, 1, klass);
+ return rb_funcall(super, rb_intern("inherited"), 1, klass);
}
-
-
-/*!
- * Defines a top-level class.
- * \param name name of the class
- * \param super a class from which the new class will derive.
- * NULL means \c Object class.
- * \return the created class
- * \throw TypeError if the constant name \a name is already taken but
- * the constant is not a \c Class.
- * \throw NameError if the class is already defined but the class can not
- * be reopened because its superclass is not \a super.
- * \post top-level constant named \a name refers the returned class.
- *
- * \note if a class named \a name is already defined and its superclass is
- * \a super, the function just returns the defined class.
- */
VALUE
-rb_define_class(const char *name, VALUE super)
+rb_define_class(name, super)
+ const char *name;
+ VALUE super;
{
VALUE klass;
ID id;
@@ -432,7 +247,7 @@ rb_define_class(const char *name, VALUE super)
if (TYPE(klass) != T_CLASS) {
rb_raise(rb_eTypeError, "%s is not a class", name);
}
- if (rb_class_real(RCLASS_SUPER(klass)) != super) {
+ if (rb_class_real(RCLASS(klass)->super) != super) {
rb_name_error(id, "%s is already defined", name);
}
return klass;
@@ -449,67 +264,32 @@ rb_define_class(const char *name, VALUE super)
return klass;
}
-
-/*!
- * Defines a class under the namespace of \a outer.
- * \param outer a class which contains the new class.
- * \param name name of the new class
- * \param super a class from which the new class will derive.
- * NULL means \c Object class.
- * \return the created class
- * \throw TypeError if the constant name \a name is already taken but
- * the constant is not a \c Class.
- * \throw NameError if the class is already defined but the class can not
- * be reopened because its superclass is not \a super.
- * \post top-level constant named \a name refers the returned class.
- *
- * \note if a class named \a name is already defined and its superclass is
- * \a super, the function just returns the defined class.
- */
VALUE
-rb_define_class_under(VALUE outer, const char *name, VALUE super)
-{
- return rb_define_class_id_under(outer, rb_intern(name), super);
-}
-
-
-/*!
- * Defines a class under the namespace of \a outer.
- * \param outer a class which contains the new class.
- * \param id name of the new class
- * \param super a class from which the new class will derive.
- * NULL means \c Object class.
- * \return the created class
- * \throw TypeError if the constant name \a name is already taken but
- * the constant is not a \c Class.
- * \throw NameError if the class is already defined but the class can not
- * be reopened because its superclass is not \a super.
- * \post top-level constant named \a name refers the returned class.
- *
- * \note if a class named \a name is already defined and its superclass is
- * \a super, the function just returns the defined class.
- */
-VALUE
-rb_define_class_id_under(VALUE outer, ID id, VALUE super)
+rb_define_class_under(outer, name, super)
+ VALUE outer;
+ const char *name;
+ VALUE super;
{
VALUE klass;
+ ID id;
+ id = rb_intern(name);
if (rb_const_defined_at(outer, id)) {
klass = rb_const_get_at(outer, id);
if (TYPE(klass) != T_CLASS) {
- rb_raise(rb_eTypeError, "%s is not a class", rb_id2name(id));
+ rb_raise(rb_eTypeError, "%s is not a class", name);
}
- if (rb_class_real(RCLASS_SUPER(klass)) != super) {
- rb_name_error(id, "%s is already defined", rb_id2name(id));
+ if (rb_class_real(RCLASS(klass)->super) != super) {
+ rb_name_error(id, "%s is already defined", name);
}
return klass;
}
if (!super) {
rb_warn("no super class for `%s::%s', Object assumed",
- rb_class2name(outer), rb_id2name(id));
+ rb_class2name(outer), name);
}
klass = rb_define_class_id(id, super);
- rb_set_class_path_string(klass, outer, rb_id2str(id));
+ rb_set_class_path(klass, outer, name);
rb_const_set(outer, id, klass);
rb_class_inherited(super, klass);
@@ -517,17 +297,22 @@ rb_define_class_id_under(VALUE outer, ID id, VALUE super)
}
VALUE
-rb_module_new(void)
+rb_module_new()
{
- VALUE mdl = class_alloc(T_MODULE, rb_cModule);
+ NEWOBJ(mdl, struct RClass);
+ OBJSETUP(mdl, rb_cModule, T_MODULE);
- RCLASS_M_TBL(mdl) = st_init_numtable();
+ mdl->super = 0;
+ mdl->iv_tbl = 0;
+ mdl->m_tbl = 0;
+ mdl->m_tbl = st_init_numtable();
return (VALUE)mdl;
}
VALUE
-rb_define_module_id(ID id)
+rb_define_module_id(id)
+ ID id;
{
VALUE mdl;
@@ -538,7 +323,8 @@ rb_define_module_id(ID id)
}
VALUE
-rb_define_module(const char *name)
+rb_define_module(name)
+ const char *name;
{
VALUE module;
ID id;
@@ -558,16 +344,14 @@ rb_define_module(const char *name)
}
VALUE
-rb_define_module_under(VALUE outer, const char *name)
-{
- return rb_define_module_id_under(outer, rb_intern(name));
-}
-
-VALUE
-rb_define_module_id_under(VALUE outer, ID id)
+rb_define_module_under(outer, name)
+ VALUE outer;
+ const char *name;
{
VALUE module;
+ ID id;
+ id = rb_intern(name);
if (rb_const_defined_at(outer, id)) {
module = rb_const_get_at(outer, id);
if (TYPE(module) == T_MODULE)
@@ -577,25 +361,27 @@ rb_define_module_id_under(VALUE outer, ID id)
}
module = rb_define_module_id(id);
rb_const_set(outer, id, module);
- rb_set_class_path_string(module, outer, rb_id2str(id));
+ rb_set_class_path(module, outer, name);
return module;
}
static VALUE
-include_class_new(VALUE module, VALUE super)
+include_class_new(module, super)
+ VALUE module, super;
{
- VALUE klass = class_alloc(T_ICLASS, rb_cClass);
+ NEWOBJ(klass, struct RClass);
+ OBJSETUP(klass, rb_cClass, T_ICLASS);
if (BUILTIN_TYPE(module) == T_ICLASS) {
module = RBASIC(module)->klass;
}
- if (!RCLASS_IV_TBL(module)) {
- RCLASS_IV_TBL(module) = st_init_numtable();
+ if (!RCLASS(module)->iv_tbl) {
+ RCLASS(module)->iv_tbl = st_init_numtable();
}
- RCLASS_IV_TBL(klass) = RCLASS_IV_TBL(module);
- RCLASS_M_TBL(klass) = RCLASS_M_TBL(module);
- RCLASS_SUPER(klass) = super;
+ klass->iv_tbl = RCLASS(module)->iv_tbl;
+ klass->m_tbl = RCLASS(module)->m_tbl;
+ klass->super = super;
if (TYPE(module) == T_ICLASS) {
RBASIC(klass)->klass = RBASIC(module)->klass;
}
@@ -609,16 +395,17 @@ include_class_new(VALUE module, VALUE super)
}
void
-rb_include_module(VALUE klass, VALUE module)
+rb_include_module(klass, module)
+ VALUE klass, module;
{
VALUE p, c;
int changed = 0;
rb_frozen_class_p(klass);
- if (!OBJ_UNTRUSTED(klass)) {
+ if (!OBJ_TAINTED(klass)) {
rb_secure(4);
}
-
+
if (TYPE(module) != T_MODULE) {
Check_Type(module, T_MODULE);
}
@@ -626,30 +413,30 @@ rb_include_module(VALUE klass, VALUE module)
OBJ_INFECT(klass, module);
c = klass;
while (module) {
- int superclass_seen = FALSE;
+ int superclass_seen = Qfalse;
- if (RCLASS_M_TBL(klass) == RCLASS_M_TBL(module))
+ if (RCLASS(klass)->m_tbl == RCLASS(module)->m_tbl)
rb_raise(rb_eArgError, "cyclic include detected");
/* ignore if the module included already in superclasses */
- for (p = RCLASS_SUPER(klass); p; p = RCLASS_SUPER(p)) {
+ for (p = RCLASS(klass)->super; p; p = RCLASS(p)->super) {
switch (BUILTIN_TYPE(p)) {
case T_ICLASS:
- if (RCLASS_M_TBL(p) == RCLASS_M_TBL(module)) {
+ if (RCLASS(p)->m_tbl == RCLASS(module)->m_tbl) {
if (!superclass_seen) {
- c = p; /* move insertion point */
+ c = p; /* move insertion point */
}
goto skip;
}
break;
case T_CLASS:
- superclass_seen = TRUE;
+ superclass_seen = Qtrue;
break;
}
}
- c = RCLASS_SUPER(c) = include_class_new(module, RCLASS_SUPER(c));
+ c = RCLASS(c)->super = include_class_new(module, RCLASS(c)->super);
changed = 1;
skip:
- module = RCLASS_SUPER(module);
+ module = RCLASS(module)->super;
}
if (changed) rb_clear_cache();
}
@@ -657,27 +444,28 @@ rb_include_module(VALUE klass, VALUE module)
/*
* call-seq:
* mod.included_modules -> array
- *
+ *
* Returns the list of modules included in <i>mod</i>.
- *
+ *
* module Mixin
* end
- *
+ *
* module Outer
* include Mixin
* end
- *
+ *
* Mixin.included_modules #=> []
* Outer.included_modules #=> [Mixin]
*/
VALUE
-rb_mod_included_modules(VALUE mod)
+rb_mod_included_modules(mod)
+ VALUE mod;
{
VALUE ary = rb_ary_new();
VALUE p;
- for (p = RCLASS_SUPER(mod); p; p = RCLASS_SUPER(p)) {
+ for (p = RCLASS(mod)->super; p; p = RCLASS(p)->super) {
if (BUILTIN_TYPE(p) == T_ICLASS) {
rb_ary_push(ary, RBASIC(p)->klass);
}
@@ -688,10 +476,10 @@ rb_mod_included_modules(VALUE mod)
/*
* call-seq:
* mod.include?(module) => true or false
- *
+ *
* Returns <code>true</code> if <i>module</i> is included in
* <i>mod</i> or one of <i>mod</i>'s ancestors.
- *
+ *
* module A
* end
* class B
@@ -705,12 +493,14 @@ rb_mod_included_modules(VALUE mod)
*/
VALUE
-rb_mod_include_p(VALUE mod, VALUE mod2)
+rb_mod_include_p(mod, mod2)
+ VALUE mod;
+ VALUE mod2;
{
VALUE p;
Check_Type(mod2, T_MODULE);
- for (p = RCLASS_SUPER(mod); p; p = RCLASS_SUPER(p)) {
+ for (p = RCLASS(mod)->super; p; p = RCLASS(p)->super) {
if (BUILTIN_TYPE(p) == T_ICLASS) {
if (RBASIC(p)->klass == mod2) return Qtrue;
}
@@ -721,25 +511,26 @@ rb_mod_include_p(VALUE mod, VALUE mod2)
/*
* call-seq:
* mod.ancestors -> array
- *
+ *
* Returns a list of modules included in <i>mod</i> (including
* <i>mod</i> itself).
- *
+ *
* module Mod
* include Math
* include Comparable
* end
- *
+ *
* Mod.ancestors #=> [Mod, Comparable, Math]
* Math.ancestors #=> [Math]
*/
VALUE
-rb_mod_ancestors(VALUE mod)
+rb_mod_ancestors(mod)
+ VALUE mod;
{
VALUE p, ary = rb_ary_new();
- for (p = mod; p; p = RCLASS_SUPER(p)) {
+ for (p = mod; p; p = RCLASS(p)->super) {
if (FL_TEST(p, FL_SINGLETON))
continue;
if (BUILTIN_TYPE(p) == T_ICLASS) {
@@ -756,10 +547,13 @@ rb_mod_ancestors(VALUE mod)
#define VISI_CHECK(x,f) (VISI(x) == (f))
static int
-ins_methods_push(ID name, long type, VALUE ary, long visi)
+ins_methods_push(name, type, ary, visi)
+ ID name;
+ long type;
+ VALUE ary;
+ long visi;
{
if (type == -1) return ST_CONTINUE;
-
switch (visi) {
case NOEX_PRIVATE:
case NOEX_PROTECTED:
@@ -771,65 +565,77 @@ ins_methods_push(ID name, long type, VALUE ary, long visi)
break;
}
if (visi) {
- rb_ary_push(ary, ID2SYM(name));
+ rb_ary_push(ary, rb_str_new2(rb_id2name(name)));
}
return ST_CONTINUE;
}
static int
-ins_methods_i(ID name, long type, VALUE ary)
+ins_methods_i(name, type, ary)
+ ID name;
+ long type;
+ VALUE ary;
{
return ins_methods_push(name, type, ary, -1); /* everything but private */
}
static int
-ins_methods_prot_i(ID name, long type, VALUE ary)
+ins_methods_prot_i(name, type, ary)
+ ID name;
+ long type;
+ VALUE ary;
{
return ins_methods_push(name, type, ary, NOEX_PROTECTED);
}
static int
-ins_methods_priv_i(ID name, long type, VALUE ary)
+ins_methods_priv_i(name, type, ary)
+ ID name;
+ long type;
+ VALUE ary;
{
return ins_methods_push(name, type, ary, NOEX_PRIVATE);
}
static int
-ins_methods_pub_i(ID name, long type, VALUE ary)
+ins_methods_pub_i(name, type, ary)
+ ID name;
+ long type;
+ VALUE ary;
{
return ins_methods_push(name, type, ary, NOEX_PUBLIC);
}
static int
-method_entry(ID key, const rb_method_entry_t *me, st_table *list)
+method_entry(key, body, list)
+ ID key;
+ NODE *body;
+ st_table *list;
{
long type;
- if (key == ID_ALLOCATOR) {
- return ST_CONTINUE;
- }
-
+ if (key == ID_ALLOCATOR) return ST_CONTINUE;
if (!st_lookup(list, key, 0)) {
- if (UNDEFINED_METHOD_ENTRY_P(me)) {
- type = -1; /* none */
- }
- else {
- type = VISI(me->flag);
- }
+ if (!body->nd_body) type = -1; /* none */
+ else type = VISI(body->nd_noex);
st_add_direct(list, key, type);
}
return ST_CONTINUE;
}
static VALUE
-class_instance_method_list(int argc, VALUE *argv, VALUE mod, int (*func) (ID, long, VALUE))
+class_instance_method_list(argc, argv, mod, func)
+ int argc;
+ VALUE *argv;
+ VALUE mod;
+ int (*func) _((ID, long, VALUE));
{
VALUE ary;
int recur;
st_table *list;
if (argc == 0) {
- recur = TRUE;
+ recur = Qtrue;
}
else {
VALUE r;
@@ -838,8 +644,8 @@ class_instance_method_list(int argc, VALUE *argv, VALUE mod, int (*func) (ID, lo
}
list = st_init_numtable();
- for (; mod; mod = RCLASS_SUPER(mod)) {
- st_foreach(RCLASS_M_TBL(mod), method_entry, (st_data_t)list);
+ for (; mod; mod = RCLASS(mod)->super) {
+ st_foreach(RCLASS(mod)->m_tbl, method_entry, (st_data_t)list);
if (BUILTIN_TYPE(mod) == T_ICLASS) continue;
if (FL_TEST(mod, FL_SINGLETON)) continue;
if (!recur) break;
@@ -854,14 +660,14 @@ class_instance_method_list(int argc, VALUE *argv, VALUE mod, int (*func) (ID, lo
/*
* call-seq:
* mod.instance_methods(include_super=true) => array
- *
- * Returns an array containing the names of instance methods that is callable
- * from outside in the receiver. For a module, these are the public methods;
- * for a class, they are the instance (not singleton) methods. With no
+ *
+ * Returns an array containing the names of public instance methods in
+ * the receiver. For a module, these are the public methods; for a
+ * class, they are the instance (not singleton) methods. With no
* argument, or with an argument that is <code>false</code>, the
* instance methods in <i>mod</i> are returned, otherwise the methods
* in <i>mod</i> and <i>mod</i>'s superclasses are returned.
- *
+ *
* module A
* def method1() end
* end
@@ -871,15 +677,18 @@ class_instance_method_list(int argc, VALUE *argv, VALUE mod, int (*func) (ID, lo
* class C < B
* def method3() end
* end
- *
- * A.instance_methods #=> [:method1]
- * B.instance_methods(false) #=> [:method2]
- * C.instance_methods(false) #=> [:method3]
+ *
+ * A.instance_methods #=> ["method1"]
+ * B.instance_methods(false) #=> ["method2"]
+ * C.instance_methods(false) #=> ["method3"]
* C.instance_methods(true).length #=> 43
*/
VALUE
-rb_class_instance_methods(int argc, VALUE *argv, VALUE mod)
+rb_class_instance_methods(argc, argv, mod)
+ int argc;
+ VALUE *argv;
+ VALUE mod;
{
return class_instance_method_list(argc, argv, mod, ins_methods_i);
}
@@ -887,14 +696,17 @@ rb_class_instance_methods(int argc, VALUE *argv, VALUE mod)
/*
* call-seq:
* mod.protected_instance_methods(include_super=true) => array
- *
+ *
* Returns a list of the protected instance methods defined in
* <i>mod</i>. If the optional parameter is not <code>false</code>, the
* methods of any ancestors are included.
*/
VALUE
-rb_class_protected_instance_methods(int argc, VALUE *argv, VALUE mod)
+rb_class_protected_instance_methods(argc, argv, mod)
+ int argc;
+ VALUE *argv;
+ VALUE mod;
{
return class_instance_method_list(argc, argv, mod, ins_methods_prot_i);
}
@@ -902,22 +714,25 @@ rb_class_protected_instance_methods(int argc, VALUE *argv, VALUE mod)
/*
* call-seq:
* mod.private_instance_methods(include_super=true) => array
- *
+ *
* Returns a list of the private instance methods defined in
* <i>mod</i>. If the optional parameter is not <code>false</code>, the
* methods of any ancestors are included.
- *
+ *
* module Mod
* def method1() end
* private :method1
* def method2() end
* end
- * Mod.instance_methods #=> [:method2]
- * Mod.private_instance_methods #=> [:method1]
+ * Mod.instance_methods #=> ["method2"]
+ * Mod.private_instance_methods #=> ["method1"]
*/
VALUE
-rb_class_private_instance_methods(int argc, VALUE *argv, VALUE mod)
+rb_class_private_instance_methods(argc, argv, mod)
+ int argc;
+ VALUE *argv;
+ VALUE mod;
{
return class_instance_method_list(argc, argv, mod, ins_methods_priv_i);
}
@@ -925,14 +740,17 @@ rb_class_private_instance_methods(int argc, VALUE *argv, VALUE mod)
/*
* call-seq:
* mod.public_instance_methods(include_super=true) => array
- *
+ *
* Returns a list of the public instance methods defined in <i>mod</i>.
* If the optional parameter is not <code>false</code>, the methods of
* any ancestors are included.
*/
VALUE
-rb_class_public_instance_methods(int argc, VALUE *argv, VALUE mod)
+rb_class_public_instance_methods(argc, argv, mod)
+ int argc;
+ VALUE *argv;
+ VALUE mod;
{
return class_instance_method_list(argc, argv, mod, ins_methods_pub_i);
}
@@ -940,57 +758,58 @@ rb_class_public_instance_methods(int argc, VALUE *argv, VALUE mod)
/*
* call-seq:
* obj.singleton_methods(all=true) => array
- *
+ *
* Returns an array of the names of singleton methods for <i>obj</i>.
* If the optional <i>all</i> parameter is true, the list will include
* methods in modules included in <i>obj</i>.
- *
+ *
* module Other
* def three() end
* end
- *
+ *
* class Single
* def Single.four() end
* end
- *
+ *
* a = Single.new
- *
+ *
* def a.one()
* end
- *
+ *
* class << a
* include Other
* def two()
* end
* end
- *
- * Single.singleton_methods #=> [:four]
- * a.singleton_methods(false) #=> [:two, :one]
- * a.singleton_methods #=> [:two, :one, :three]
+ *
+ * Single.singleton_methods #=> ["four"]
+ * a.singleton_methods(false) #=> ["two", "one"]
+ * a.singleton_methods #=> ["two", "one", "three"]
*/
VALUE
-rb_obj_singleton_methods(int argc, VALUE *argv, VALUE obj)
+rb_obj_singleton_methods(argc, argv, obj)
+ int argc;
+ VALUE *argv;
+ VALUE obj;
{
VALUE recur, ary, klass;
st_table *list;
+ rb_scan_args(argc, argv, "01", &recur);
if (argc == 0) {
recur = Qtrue;
}
- else {
- rb_scan_args(argc, argv, "01", &recur);
- }
klass = CLASS_OF(obj);
list = st_init_numtable();
if (klass && FL_TEST(klass, FL_SINGLETON)) {
- st_foreach(RCLASS_M_TBL(klass), method_entry, (st_data_t)list);
- klass = RCLASS_SUPER(klass);
+ st_foreach(RCLASS(klass)->m_tbl, method_entry, (st_data_t)list);
+ klass = RCLASS(klass)->super;
}
if (RTEST(recur)) {
while (klass && (FL_TEST(klass, FL_SINGLETON) || TYPE(klass) == T_ICLASS)) {
- st_foreach(RCLASS_M_TBL(klass), method_entry, (st_data_t)list);
- klass = RCLASS_SUPER(klass);
+ st_foreach(RCLASS(klass)->m_tbl, method_entry, (st_data_t)list);
+ klass = RCLASS(klass)->super;
}
}
ary = rb_ary_new();
@@ -1000,119 +819,67 @@ rb_obj_singleton_methods(int argc, VALUE *argv, VALUE obj)
return ary;
}
-/*!
- * \}
- */
-/*!
- * \defgroup defmethod Defining methods
- * There are some APIs to define a method from C.
- * These API takes a C function as a method body.
- *
- * \par Method body functions
- * Method body functions must return a VALUE and
- * can be one of the following form:
- * <dl>
- * <dt>Fixed number of parameters</dt>
- * <dd>
- * This form is a normal C function, excepting it takes
- * a receiver object as the first argument.
- *
- * \code
- * static VALUE my_method(VALUE self, VALUE x, VALUE y);
- * \endcode
- * </dd>
- * <dt>argc and argv style</dt>
- * <dd>
- * This form takes three parameters: \a argc, \a argv and \a self.
- * \a self is the receiver. \a argc is the number of arguments.
- * \a argv is a pointer to an array of the arguments.
- *
- * \code
- * static VALUE my_method(int argc, VALUE *argv, VALUE self);
- * \endcode
- * </dd>
- * <dt>Ruby array style</dt>
- * <dd>
- * This form takes two parameters: self and args.
- * \a self is the receiver. \a args is an Array object which
- * containts the arguments.
- *
- * \code
- * static VALUE my_method(VALUE self, VALUE args);
- * \endcode
- * </dd>
- *
- * \par Number of parameters
- * Method defining APIs takes the number of parameters which the
- * method will takes. This number is called \a argc.
- * \a argc can be:
- * <dl>
- * <dt>zero or positive number</dt>
- * <dd>This means the method body function takes a fixed number of parameters</dd>
- * <dt>-1</dt>
- * <dd>This means the method body function is "argc and argv" style.</dd>
- * <dt>-2</dt>
- * <dd>This means the method body function is "self and args" style.</dd>
- * </dl>
- * \{
- */
-
void
-rb_define_method_id(VALUE klass, ID mid, VALUE (*func)(ANYARGS), int argc)
+rb_define_method_id(klass, name, func, argc)
+ VALUE klass;
+ ID name;
+ VALUE (*func)();
+ int argc;
{
- rb_add_method_cfunc(klass, mid, func, argc, NOEX_PUBLIC);
+ rb_add_method(klass, name, NEW_CFUNC(func,argc), NOEX_PUBLIC);
}
void
-rb_define_method(VALUE klass, const char *name, VALUE (*func)(ANYARGS), int argc)
+rb_define_method(klass, name, func, argc)
+ VALUE klass;
+ const char *name;
+ VALUE (*func)();
+ int argc;
{
- rb_add_method_cfunc(klass, rb_intern(name), func, argc, NOEX_PUBLIC);
+ ID id = rb_intern(name);
+ int ex = NOEX_PUBLIC;
+
+
+ rb_add_method(klass, id, NEW_CFUNC(func, argc), ex);
}
void
-rb_define_protected_method(VALUE klass, const char *name, VALUE (*func)(ANYARGS), int argc)
+rb_define_protected_method(klass, name, func, argc)
+ VALUE klass;
+ const char *name;
+ VALUE (*func)();
+ int argc;
{
- rb_add_method_cfunc(klass, rb_intern(name), func, argc, NOEX_PROTECTED);
+ rb_add_method(klass, rb_intern(name), NEW_CFUNC(func, argc), NOEX_PROTECTED);
}
void
-rb_define_private_method(VALUE klass, const char *name, VALUE (*func)(ANYARGS), int argc)
+rb_define_private_method(klass, name, func, argc)
+ VALUE klass;
+ const char *name;
+ VALUE (*func)();
+ int argc;
{
- rb_add_method_cfunc(klass, rb_intern(name), func, argc, NOEX_PRIVATE);
+ rb_add_method(klass, rb_intern(name), NEW_CFUNC(func, argc), NOEX_PRIVATE);
}
void
-rb_undef_method(VALUE klass, const char *name)
+rb_undef_method(klass, name)
+ VALUE klass;
+ const char *name;
{
- rb_add_method(klass, rb_intern(name), VM_METHOD_TYPE_UNDEF, 0, NOEX_UNDEF);
+ rb_add_method(klass, rb_intern(name), 0, NOEX_UNDEF);
}
-/*!
- * \}
- */
-/*!
- * \addtogroup class
- * \{
- */
-
#define SPECIAL_SINGLETON(x,c) do {\
if (obj == (x)) {\
return c;\
}\
} while (0)
-
-/*!
- * \internal
- * Returns the singleton class of \a obj. Creates it if necessary.
- *
- * \note DO NOT expose the returned singleton class to
- * outside of class.c.
- * Use \ref rb_singleton_class instead for
- * consistency of the metaclass hierarchy.
- */
-static VALUE
-singleton_class_of(VALUE obj)
+VALUE
+rb_singleton_class(obj)
+ VALUE obj;
{
VALUE klass;
@@ -1126,248 +893,165 @@ singleton_class_of(VALUE obj)
rb_bug("unknown immediate %ld", obj);
}
+ DEFER_INTS;
if (FL_TEST(RBASIC(obj)->klass, FL_SINGLETON) &&
- rb_ivar_get(RBASIC(obj)->klass, id_attached) == obj) {
+ rb_iv_get(RBASIC(obj)->klass, "__attached__") == obj) {
klass = RBASIC(obj)->klass;
}
else {
klass = rb_make_metaclass(obj, RBASIC(obj)->klass);
}
-
if (OBJ_TAINTED(obj)) {
OBJ_TAINT(klass);
}
else {
FL_UNSET(klass, FL_TAINT);
}
- if (OBJ_UNTRUSTED(obj)) {
- OBJ_UNTRUST(klass);
- }
- else {
- FL_UNSET(klass, FL_UNTRUSTED);
- }
if (OBJ_FROZEN(obj)) OBJ_FREEZE(klass);
+ ALLOW_INTS;
return klass;
}
-
-/*!
- * Returns the singleton class of \a obj. Creates it if necessary.
- *
- * \param obj an arbitrary object.
- * \throw TypeError if \a obj is a Fixnum or a Symbol.
- * \return the singleton class.
- *
- * \post \a obj has its own singleton class.
- * \post if \a obj is a class,
- * the returned singleton class also has its own
- * singleton class in order to keep consistency of the
- * inheritance structure of metaclasses.
- * \note a new singleton class will be created
- * if \a obj does not have it.
- * \note the singleton classes for nil, true and false are:
- * NilClass, TrueClass and FalseClass.
- */
-VALUE
-rb_singleton_class(VALUE obj)
-{
- VALUE klass = singleton_class_of(obj);
-
- /* ensures an exposed class belongs to its own eigenclass */
- if (TYPE(obj) == T_CLASS) ENSURE_EIGENCLASS(klass);
-
- return klass;
-}
-
-/*!
- * \}
- */
-
-/*!
- * \addtogroup defmethod
- * \{
- */
-
-/*!
- * Defines a singleton method for \a obj.
- * \param obj an arbitrary object
- * \param name name of the singleton method
- * \param func the method body
- * \param argc the number of parameters, or -1 or -2. see \ref defmethod.
- */
void
-rb_define_singleton_method(VALUE obj, const char *name, VALUE (*func)(ANYARGS), int argc)
+rb_define_singleton_method(obj, name, func, argc)
+ VALUE obj;
+ const char *name;
+ VALUE (*func)();
+ int argc;
{
- rb_define_method(singleton_class_of(obj), name, func, argc);
+ rb_define_method(rb_singleton_class(obj), name, func, argc);
}
-
-
-/*!
- * Defines a module function for \a module.
- * \param module an module or a class.
- * \param name name of the function
- * \param func the method body
- * \param argc the number of parameters, or -1 or -2. see \ref defmethod.
- */
void
-rb_define_module_function(VALUE module, const char *name, VALUE (*func)(ANYARGS), int argc)
+rb_define_module_function(module, name, func, argc)
+ VALUE module;
+ const char *name;
+ VALUE (*func)();
+ int argc;
{
rb_define_private_method(module, name, func, argc);
rb_define_singleton_method(module, name, func, argc);
}
-
-/*!
- * Defines a global function
- * \param name name of the function
- * \param func the method body
- * \param argc the number of parameters, or -1 or -2. see \ref defmethod.
- */
void
-rb_define_global_function(const char *name, VALUE (*func)(ANYARGS), int argc)
+rb_define_global_function(name, func, argc)
+ const char *name;
+ VALUE (*func)();
+ int argc;
{
rb_define_module_function(rb_mKernel, name, func, argc);
}
-
-/*!
- * Defines an alias of a method.
- * \param klass the class which the original method belongs to
- * \param name1 a new name for the method
- * \param name2 the original name of the method
- */
void
-rb_define_alias(VALUE klass, const char *name1, const char *name2)
+rb_define_alias(klass, name1, name2)
+ VALUE klass;
+ const char *name1, *name2;
{
rb_alias(klass, rb_intern(name1), rb_intern(name2));
}
-/*!
- * Defines (a) public accessor method(s) for an attribute.
- * \param klass the class which the attribute will belongs to
- * \param name name of the attribute
- * \param read a getter method for the attribute will be defined if \a read is non-zero.
- * \param write a setter method for the attribute will be defined if \a write is non-zero.
- */
void
-rb_define_attr(VALUE klass, const char *name, int read, int write)
+rb_define_attr(klass, name, read, write)
+ VALUE klass;
+ const char *name;
+ int read, write;
{
- rb_attr(klass, rb_intern(name), read, write, FALSE);
+ rb_attr(klass, rb_intern(name), read, write, Qfalse);
}
+#ifdef HAVE_STDARG_PROTOTYPES
#include <stdarg.h>
+#define va_init_list(a,b) va_start(a,b)
+#else
+#include <varargs.h>
+#define va_init_list(a,b) va_start(a)
+#endif
int
+#ifdef HAVE_STDARG_PROTOTYPES
rb_scan_args(int argc, const VALUE *argv, const char *fmt, ...)
+#else
+rb_scan_args(argc, argv, fmt, va_alist)
+ int argc;
+ const VALUE *argv;
+ const char *fmt;
+ va_dcl
+#endif
{
- int i;
+ int n, i = 0;
const char *p = fmt;
VALUE *var;
va_list vargs;
- int f_var = 0, f_block = 0;
- int n_lead = 0, n_opt = 0, n_trail = 0, n_mand;
- int argi = 0;
+
+ va_init_list(vargs, fmt);
+
+ if (*p == '*') goto rest_arg;
if (ISDIGIT(*p)) {
- n_lead = *p - '0';
- p++;
- if (ISDIGIT(*p)) {
- n_opt = *p - '0';
- p++;
- if (ISDIGIT(*p)) {
- n_trail = *p - '0';
- p++;
- goto block_arg;
- }
+ n = *p - '0';
+ if (n > argc)
+ rb_raise(rb_eArgError, "wrong number of arguments (%d for %d)", argc, n);
+ for (i=0; i<n; i++) {
+ var = va_arg(vargs, VALUE*);
+ if (var) *var = argv[i];
}
- }
- if (*p == '*') {
- f_var = 1;
p++;
- if (ISDIGIT(*p)) {
- n_trail = *p - '0';
- p++;
- }
}
- block_arg:
- if (*p == '&') {
- f_block = 1;
- p++;
- }
- if (*p != '\0') {
- rb_fatal("bad scan arg format: %s", fmt);
+ else {
+ goto error;
}
- n_mand = n_lead + n_trail;
- if (argc < n_mand)
- goto argc_error;
-
- va_start(vargs, fmt);
-
- /* capture leading mandatory arguments */
- for (i = n_lead; i-- > 0; ) {
- var = va_arg(vargs, VALUE *);
- if (var) *var = argv[argi];
- argi++;
- }
- /* capture optional arguments */
- for (i = n_opt; i-- > 0; ) {
- var = va_arg(vargs, VALUE *);
- if (argi < argc - n_trail) {
- if (var) *var = argv[argi];
- argi++;
- }
- else {
- if (var) *var = Qnil;
+ if (ISDIGIT(*p)) {
+ n = i + *p - '0';
+ for (; i<n; i++) {
+ var = va_arg(vargs, VALUE*);
+ if (argc > i) {
+ if (var) *var = argv[i];
+ }
+ else {
+ if (var) *var = Qnil;
+ }
}
+ p++;
}
- /* capture variable length arguments */
- if (f_var) {
- int n_var = argc - argi - n_trail;
-
- var = va_arg(vargs, VALUE *);
- if (0 < n_var) {
- if (var) *var = rb_ary_new4(n_var, &argv[argi]);
- argi += n_var;
+
+ if(*p == '*') {
+ rest_arg:
+ var = va_arg(vargs, VALUE*);
+ if (argc > i) {
+ if (var) *var = rb_ary_new4(argc-i, argv+i);
+ i = argc;
}
else {
if (var) *var = rb_ary_new();
}
+ p++;
}
- /* capture trailing mandatory arguments */
- for (i = n_trail; i-- > 0; ) {
- var = va_arg(vargs, VALUE *);
- if (var) *var = argv[argi];
- argi++;
- }
- /* capture iterator block */
- if (f_block) {
- var = va_arg(vargs, VALUE *);
+
+ if (*p == '&') {
+ var = va_arg(vargs, VALUE*);
if (rb_block_given_p()) {
*var = rb_block_proc();
}
else {
*var = Qnil;
}
+ p++;
}
va_end(vargs);
- if (argi < argc)
- goto argc_error;
+ if (*p != '\0') {
+ goto error;
+ }
+
+ if (argc > i) {
+ rb_raise(rb_eArgError, "wrong number of arguments (%d for %d)", argc, i);
+ }
return argc;
- argc_error:
- if (0 < n_opt)
- rb_raise(rb_eArgError, "wrong number of arguments (%d for %d..%d%s)",
- argc, n_mand, n_mand + n_opt, f_var ? "+" : "");
- else
- rb_raise(rb_eArgError, "wrong number of arguments (%d for %d%s)",
- argc, n_mand, f_var ? "+" : "");
+ error:
+ rb_fatal("bad scan arg format: %s", fmt);
+ return 0;
}
-
-/*!
- * \}
- */
diff --git a/common.mk b/common.mk
index 18901abafe..7b861f845c 100644
--- a/common.mk
+++ b/common.mk
@@ -2,12 +2,10 @@ bin: $(PROGRAM) $(WPROGRAM)
lib: $(LIBRUBY)
dll: $(LIBRUBY_SO)
-.SUFFIXES: .inc .h .c .y .i
-
RUBYLIB = -
RUBYOPT = -
-SPEC_GIT_BASE = git://github.com/rubyspec
+SPEC_GIT_BASE = git://github.com/brixen
MSPEC_GIT_URL = $(SPEC_GIT_BASE)/mspec.git
RUBYSPEC_GIT_URL = $(SPEC_GIT_BASE)/rubyspec.git
@@ -16,30 +14,23 @@ STATIC_RUBY = static-ruby
EXTCONF = extconf.rb
RBCONFIG = ./.rbconfig.time
LIBRUBY_EXTS = ./.libruby-with-ext.time
-REVISION_H = ./.revision.time
RDOCOUT = $(EXTOUT)/rdoc
-ID_H_TARGET = -id.h-
DMYEXT = dmyext.$(OBJEXT)
-NORMALMAINOBJ = main.$(OBJEXT)
-MAINOBJ = $(NORMALMAINOBJ)
+MAINOBJ = main.$(OBJEXT)
EXTOBJS =
DLDOBJS = $(DMYEXT)
-MINIOBJS = $(ARCHMINIOBJS) dmyencoding.$(OBJEXT) miniprelude.$(OBJEXT)
-ENC_MK = enc.mk
-COMMONOBJS = array.$(OBJEXT) \
+OBJS = array.$(OBJEXT) \
bignum.$(OBJEXT) \
class.$(OBJEXT) \
compar.$(OBJEXT) \
- complex.$(OBJEXT) \
dir.$(OBJEXT) \
+ dln.$(OBJEXT) \
enum.$(OBJEXT) \
enumerator.$(OBJEXT) \
error.$(OBJEXT) \
eval.$(OBJEXT) \
- load.$(OBJEXT) \
- proc.$(OBJEXT) \
file.$(OBJEXT) \
gc.$(OBJEXT) \
hash.$(OBJEXT) \
@@ -52,59 +43,28 @@ COMMONOBJS = array.$(OBJEXT) \
pack.$(OBJEXT) \
parse.$(OBJEXT) \
process.$(OBJEXT) \
+ prec.$(OBJEXT) \
random.$(OBJEXT) \
range.$(OBJEXT) \
- rational.$(OBJEXT) \
re.$(OBJEXT) \
- regcomp.$(OBJEXT) \
- regenc.$(OBJEXT) \
- regerror.$(OBJEXT) \
- regexec.$(OBJEXT) \
- regparse.$(OBJEXT) \
- regsyntax.$(OBJEXT) \
+ regex.$(OBJEXT) \
ruby.$(OBJEXT) \
- safe.$(OBJEXT) \
signal.$(OBJEXT) \
sprintf.$(OBJEXT) \
st.$(OBJEXT) \
- strftime.$(OBJEXT) \
string.$(OBJEXT) \
struct.$(OBJEXT) \
time.$(OBJEXT) \
- transcode.$(OBJEXT) \
util.$(OBJEXT) \
variable.$(OBJEXT) \
version.$(OBJEXT) \
- compile.$(OBJEXT) \
- debug.$(OBJEXT) \
- iseq.$(OBJEXT) \
- vm.$(OBJEXT) \
- vm_dump.$(OBJEXT) \
- thread.$(OBJEXT) \
- cont.$(OBJEXT) \
- $(BUILTIN_ENCOBJS) \
- $(BUILTIN_TRANSOBJS) \
$(MISSING)
-EXPORTOBJS = dln.$(OBJEXT) \
- encoding.$(OBJEXT) \
- $(COMMONOBJS)
-
-OBJS = $(EXPORTOBJS) prelude.$(OBJEXT)
-
-GOLFOBJS = goruby.$(OBJEXT) golf_prelude.$(OBJEXT)
-
-PRELUDE_SCRIPTS = $(srcdir)/prelude.rb $(srcdir)/enc/prelude.rb $(srcdir)/gem_prelude.rb
-PRELUDES = prelude.c miniprelude.c
-GOLFPRELUDES = golf_prelude.c
-
SCRIPT_ARGS = --dest-dir="$(DESTDIR)" \
--extout="$(EXTOUT)" \
--mflags="$(MFLAGS)" \
--make-flags="$(MAKEFLAGS)"
-EXTMK_ARGS = $(SCRIPT_ARGS) --extension $(EXTS) --extstatic $(EXTSTATIC) \
- --make-flags="MINIRUBY='$(MINIRUBY)'" --
-INSTRUBY = $(MINIRUBY) $(srcdir)/tool/rbinstall.rb
+EXTMK_ARGS = $(SCRIPT_ARGS) --extension $(EXTS) --extstatic $(EXTSTATIC) --
INSTRUBY_ARGS = $(SCRIPT_ARGS) \
--data-mode=$(INSTALL_DATA_MODE) \
--prog-mode=$(INSTALL_PROG_MODE) \
@@ -118,49 +78,17 @@ PRE_LIBRUBY_UPDATE = $(MINIRUBY) -e 'ARGV[1] or File.unlink(ARGV[0]) rescue nil'
TESTSDIR = $(srcdir)/test
TESTWORKDIR = testwork
-TESTRUN_SCRIPT = $(srcdir)/test.rb
-
-BOOTSTRAPRUBY = $(BASERUBY)
-
-COMPILE_PRELUDE = $(MINIRUBY) -I$(srcdir) -I. -rrbconfig $(srcdir)/tool/compile_prelude.rb
-
-all: encs exts main
-
-main: exts
- @$(RUNCMD) $(MKMAIN_CMD) $(MAKE)
-
-exts: $(MKMAIN_CMD)
-
-$(MKMAIN_CMD): $(MKFILES) incs $(PREP) $(RBCONFIG) $(LIBRUBY)
- @$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" --command-output=$@ $(EXTMK_ARGS)
-
+all: $(MKFILES) $(PREP) $(RBCONFIG) $(LIBRUBY)
+ @$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" $(EXTMK_ARGS)
prog: $(PROGRAM) $(WPROGRAM)
-loadpath: $(PREP) PHONY
- $(MINIRUBY) -e 'p $$:'
-
-$(PREP): $(MKFILES)
-
-miniruby$(EXEEXT): config.status $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) $(ARCHFILE)
-
-GORUBY = go$(RUBY_INSTALL_NAME)
-golf: $(LIBRUBY) $(GOLFOBJS) PHONY
- $(MAKE) $(MFLAGS) MAINOBJ="$(GOLFOBJS)" PROGRAM=$(GORUBY)$(EXEEXT) program
-capi: Doxyfile PHONY $(PREP)
- @$(MAKEDIRS) doc/capi
- @$(DOXYGEN)
-
-Doxyfile: $(srcdir)/template/Doxyfile.tmpl $(PREP) $(srcdir)/tool/generic_erb.rb $(RBCONFIG)
- $(MINIRUBY) $(srcdir)/tool/generic_erb.rb -o $@ $(srcdir)/template/Doxyfile.tmpl \
- --srcdir="$(srcdir)" --miniruby="$(MINIRUBY)"
-
-program: $(PROGRAM)
+miniruby$(EXEEXT): config.status $(LIBRUBY_A) $(MAINOBJ) $(MINIOBJS) $(OBJS) $(DMYEXT)
$(PROGRAM): $(LIBRUBY) $(MAINOBJ) $(OBJS) $(EXTOBJS) $(SETUP) $(PREP)
$(LIBRUBY_A): $(OBJS) $(DMYEXT) $(ARCHFILE)
-$(LIBRUBY_SO): $(OBJS) $(DLDOBJS) $(LIBRUBY_A) $(PREP) $(LIBRUBY_SO_UPDATE) $(BUILTIN_ENCOBJS)
+$(LIBRUBY_SO): $(OBJS) $(DLDOBJS) $(LIBRUBY_A) $(PREP) $(LIBRUBY_SO_UPDATE)
$(LIBRUBY_EXTS):
@exit > $@
@@ -169,84 +97,80 @@ $(STATIC_RUBY)$(EXEEXT): $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A)
@$(RM) $@
$(PURIFY) $(CC) $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A) $(MAINLIBS) $(EXTLIBS) $(LIBS) $(OUTFLAG)$@ $(LDFLAGS) $(XLDFLAGS)
-ruby.imp: $(EXPORTOBJS)
- @$(NM) -Pgp $(EXPORTOBJS) | awk 'BEGIN{print "#!"}; $$2~/^[BD]$$/{print $$1}' | sort -u -o $@
+ruby.imp: $(OBJS)
+ @$(NM) -Pgp $(OBJS) | awk 'BEGIN{print "#!"}; $$2~/^[BD]$$/{print $$1}' | sort -u -o $@
install: install-nodoc $(RDOCTARGET)
-install-all: install-nodoc install-doc install-capi
+install-all: install-nodoc install-doc
install-nodoc: pre-install-nodoc do-install-nodoc post-install-nodoc
pre-install-nodoc:: pre-install-local pre-install-ext
-do-install-nodoc: $(PREP)
- $(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --mantype="$(MANTYPE)"
+do-install-nodoc:
+ $(MINIRUBY) $(srcdir)/instruby.rb --make="$(MAKE)" $(INSTRUBY_ARGS) --mantype="$(MANTYPE)"
post-install-nodoc:: post-install-local post-install-ext
install-local: pre-install-local do-install-local post-install-local
pre-install-local:: pre-install-bin pre-install-lib pre-install-man
-do-install-local: $(PREP)
- $(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=local --mantype="$(MANTYPE)"
+do-install-local:
+ $(MINIRUBY) $(srcdir)/instruby.rb --make="$(MAKE)" $(INSTRUBY_ARGS) --install=local --mantype="$(MANTYPE)"
+loadpath: $(PREP)
+ $(MINIRUBY) -e 'p $$:'
+
post-install-local:: post-install-bin post-install-lib post-install-man
install-ext: pre-install-ext do-install-ext post-install-ext
pre-install-ext:: pre-install-ext-arch pre-install-ext-comm
-do-install-ext: $(PREP)
- $(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=ext
+do-install-ext:
+ $(MINIRUBY) $(srcdir)/instruby.rb --make="$(MAKE)" $(INSTRUBY_ARGS) --install=ext
post-install-ext:: post-install-ext-arch post-install-ext-comm
install-arch: pre-install-arch do-install-arch post-install-arch
pre-install-arch:: pre-install-bin pre-install-ext-arch
-do-install-arch: $(PREP)
- $(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=bin --install=ext-arch
+do-install-arch:
+ $(MINIRUBY) $(srcdir)/instruby.rb --make="$(MAKE)" $(INSTRUBY_ARGS) --install=bin --install=ext-arch
post-install-arch:: post-install-bin post-install-ext-arch
install-comm: pre-install-comm do-install-comm post-install-comm
pre-install-comm:: pre-install-lib pre-install-ext-comm pre-install-man
-do-install-comm: $(PREP)
- $(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=lib --install=ext-comm --install=man
+do-install-comm:
+ $(MINIRUBY) $(srcdir)/instruby.rb --make="$(MAKE)" $(INSTRUBY_ARGS) --install=lib --install=ext-comm --install=man
post-install-comm:: post-install-lib post-install-ext-comm post-install-man
install-bin: pre-install-bin do-install-bin post-install-bin
pre-install-bin:: install-prereq
-do-install-bin: $(PREP)
- $(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=bin
+do-install-bin:
+ $(MINIRUBY) $(srcdir)/instruby.rb --make="$(MAKE)" $(INSTRUBY_ARGS) --install=bin
post-install-bin::
@$(NULLCMD)
install-lib: pre-install-lib do-install-lib post-install-lib
pre-install-lib:: install-prereq
-do-install-lib: $(PREP)
- $(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=lib
+do-install-lib:
+ $(MINIRUBY) $(srcdir)/instruby.rb --make="$(MAKE)" $(INSTRUBY_ARGS) --install=lib
post-install-lib::
@$(NULLCMD)
install-ext-comm: pre-install-ext-comm do-install-ext-comm post-install-ext-comm
pre-install-ext-comm:: install-prereq
-do-install-ext-comm: $(PREP)
- $(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=ext-comm
+do-install-ext-comm:
+ $(MINIRUBY) $(srcdir)/instruby.rb --make="$(MAKE)" $(INSTRUBY_ARGS) --install=ext-comm
post-install-ext-comm::
@$(NULLCMD)
install-ext-arch: pre-install-ext-arch do-install-ext-arch post-install-ext-arch
pre-install-ext-arch:: install-prereq
-do-install-ext-arch: $(PREP)
- $(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=ext-arch
+do-install-ext-arch:
+ $(MINIRUBY) $(srcdir)/instruby.rb --make="$(MAKE)" $(INSTRUBY_ARGS) --install=ext-arch
post-install-ext-arch::
@$(NULLCMD)
install-man: pre-install-man do-install-man post-install-man
pre-install-man:: install-prereq
-do-install-man: $(PREP)
- $(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=man --mantype="$(MANTYPE)"
+do-install-man:
+ $(MINIRUBY) $(srcdir)/instruby.rb --make="$(MAKE)" $(INSTRUBY_ARGS) --install=man --mantype="$(MANTYPE)"
post-install-man::
@$(NULLCMD)
-install-capi: capi pre-install-capi do-install-capi post-install-capi
-pre-install-capi:: install-prereq
-do-install-capi: $(PREP)
- $(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=capi
-post-install-capi::
- @$(NULLCMD)
-
what-where: no-install
no-install: no-install-nodoc no-install-doc
what-where-all: no-install-all
@@ -255,82 +179,82 @@ no-install-all: no-install-nodoc
what-where-nodoc: no-install-nodoc
no-install-nodoc: pre-no-install-nodoc dont-install-nodoc post-no-install-nodoc
pre-no-install-nodoc:: pre-no-install-local pre-no-install-ext
-dont-install-nodoc: $(PREP)
- $(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS) --mantype="$(MANTYPE)"
+dont-install-nodoc:
+ $(MINIRUBY) $(srcdir)/instruby.rb -n --make="$(MAKE)" $(INSTRUBY_ARGS) --mantype="$(MANTYPE)"
post-no-install-nodoc:: post-no-install-local post-no-install-ext
what-where-local: no-install-local
no-install-local: pre-no-install-local dont-install-local post-no-install-local
pre-no-install-local:: pre-no-install-bin pre-no-install-lib pre-no-install-man
-dont-install-local: $(PREP)
- $(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=local --mantype="$(MANTYPE)"
+dont-install-local:
+ $(MINIRUBY) $(srcdir)/instruby.rb -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=local --mantype="$(MANTYPE)"
post-no-install-local:: post-no-install-bin post-no-install-lib post-no-install-man
what-where-ext: no-install-ext
no-install-ext: pre-no-install-ext dont-install-ext post-no-install-ext
pre-no-install-ext:: pre-no-install-ext-arch pre-no-install-ext-comm
-dont-install-ext: $(PREP)
- $(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=ext
+dont-install-ext:
+ $(MINIRUBY) $(srcdir)/instruby.rb -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=ext
post-no-install-ext:: post-no-install-ext-arch post-no-install-ext-comm
what-where-arch: no-install-arch
no-install-arch: pre-no-install-arch dont-install-arch post-no-install-arch
pre-no-install-arch:: pre-no-install-bin pre-no-install-ext-arch
-dont-install-arch: $(PREP)
- $(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=bin --install=ext-arch
+dont-install-arch:
+ $(MINIRUBY) $(srcdir)/instruby.rb -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=bin --install=ext-arch
post-no-install-arch:: post-no-install-lib post-no-install-man post-no-install-ext-arch
what-where-comm: no-install-comm
no-install-comm: pre-no-install-comm dont-install-comm post-no-install-comm
pre-no-install-comm:: pre-no-install-lib pre-no-install-ext-comm pre-no-install-man
-dont-install-comm: $(PREP)
- $(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=lib --install=ext-comm --install=man
+dont-install-comm:
+ $(MINIRUBY) $(srcdir)/instruby.rb -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=lib --install=ext-comm --install=man
post-no-install-comm:: post-no-install-lib post-no-install-ext-comm post-no-install-man
what-where-bin: no-install-bin
no-install-bin: pre-no-install-bin dont-install-bin post-no-install-bin
pre-no-install-bin:: install-prereq
-dont-install-bin: $(PREP)
- $(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=bin
+dont-install-bin:
+ $(MINIRUBY) $(srcdir)/instruby.rb -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=bin
post-no-install-bin::
@$(NULLCMD)
what-where-lib: no-install-lib
no-install-lib: pre-no-install-lib dont-install-lib post-no-install-lib
pre-no-install-lib:: install-prereq
-dont-install-lib: $(PREP)
- $(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=lib
+dont-install-lib:
+ $(MINIRUBY) $(srcdir)/instruby.rb -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=lib
post-no-install-lib::
@$(NULLCMD)
what-where-ext-comm: no-install-ext-comm
no-install-ext-comm: pre-no-install-ext-comm dont-install-ext-comm post-no-install-ext-comm
pre-no-install-ext-comm:: install-prereq
-dont-install-ext-comm: $(PREP)
- $(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=ext-comm
+dont-install-ext-comm:
+ $(MINIRUBY) $(srcdir)/instruby.rb -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=ext-comm
post-no-install-ext-comm::
@$(NULLCMD)
what-where-ext-arch: no-install-ext-arch
no-install-ext-arch: pre-no-install-ext-arch dont-install-ext-arch post-no-install-ext-arch
pre-no-install-ext-arch:: install-prereq
-dont-install-ext-arch: $(PREP)
- $(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=ext-arch
+dont-install-ext-arch:
+ $(MINIRUBY) $(srcdir)/instruby.rb -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=ext-arch
post-no-install-ext-arch::
@$(NULLCMD)
what-where-man: no-install-man
no-install-man: pre-no-install-man dont-install-man post-no-install-man
pre-no-install-man:: install-prereq
-dont-install-man: $(PREP)
- $(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=man --mantype="$(MANTYPE)"
+dont-install-man:
+ $(MINIRUBY) $(srcdir)/instruby.rb -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=man --mantype="$(MANTYPE)"
post-no-install-man::
@$(NULLCMD)
install-doc: rdoc pre-install-doc do-install-doc post-install-doc
pre-install-doc:: install-prereq
do-install-doc: $(PROGRAM)
- $(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=rdoc --rdoc-output="$(RDOCOUT)"
+ $(MINIRUBY) $(srcdir)/instruby.rb --make="$(MAKE)" $(INSTRUBY_ARGS) --install=rdoc --rdoc-output="$(RDOCOUT)"
post-install-doc::
@$(NULLCMD)
@@ -341,129 +265,67 @@ rdoc: $(PROGRAM) PHONY
what-where-doc: no-install-doc
no-install-doc: pre-no-install-doc dont-install-doc post-no-install-doc
pre-no-install-doc:: install-prereq
-dont-install-doc:: $(PREP)
- $(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=rdoc --rdoc-output="$(RDOCOUT)"
+dont-install-doc::
+ $(MINIRUBY) $(srcdir)/instruby.rb -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=rdoc --rdoc-output="$(RDOCOUT)"
post-no-install-doc::
@$(NULLCMD)
CLEAR_INSTALLED_LIST = clear-installed-list
-install-prereq: $(CLEAR_INSTALLED_LIST) PHONY
+install-prereq: $(CLEAR_INSTALLED_LIST)
-clear-installed-list: PHONY
+clear-installed-list:
@exit > $(INSTALLED_LIST)
-clean: clean-ext clean-local clean-enc clean-golf clean-rdoc clean-extout
-clean-local:: PHONY
+clean: clean-ext clean-local
+clean-local::
@$(RM) $(OBJS) $(MINIOBJS) $(MAINOBJ) $(LIBRUBY_A) $(LIBRUBY_SO) $(LIBRUBY) $(LIBRUBY_ALIASES)
@$(RM) $(PROGRAM) $(WPROGRAM) miniruby$(EXEEXT) dmyext.$(OBJEXT) $(ARCHFILE) .*.time
- @$(RM) *.inc y.tab.c y.output encdb.h transdb.h
-clean-ext:: PHONY
-clean-golf: PHONY
- @$(RM) $(GORUBY)$(EXEEXT) $(GOLFOBJS)
-clean-rdoc: PHONY
-clean-extout: PHONY
- @-$(RMDIRS) $(EXTOUT)/$(arch)
-
-distclean: distclean-ext distclean-local distclean-enc distclean-golf distclean-extout
+ @$(RM) y.tab.c y.output
+clean-ext:
+ @-$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" $(EXTMK_ARGS) clean
+
+distclean: distclean-ext distclean-local
distclean-local:: clean-local
- @$(RM) $(MKFILES) rbconfig.rb yasmdata.rb encdb.h
- @$(RM) config.cache config.log config.status config.status.lineno $(PRELUDES)
+ @$(RM) $(MKFILES) config.h rbconfig.rb
+ @$(RM) config.cache config.log config.status
@$(RM) *~ *.bak *.stackdump core *.core gmon.out $(PREP)
-distclean-ext:: PHONY
-distclean-golf: clean-golf
- @$(RM) $(GOLFPRELUDES)
-distclean-rdoc: PHONY
-distclean-extout: clean-extout
- @-$(RMDIRS) $(EXTOUT)
-
-realclean:: realclean-ext realclean-local realclean-enc realclean-golf realclean-extout
+distclean-ext:
+ @-$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" $(EXTMK_ARGS) distclean
+
+realclean:: realclean-ext realclean-local
realclean-local:: distclean-local
- @$(RM) parse.c parse.h lex.c newline.c revision.h
+ @$(RM) parse.c lex.c
realclean-ext::
-realclean-golf: distclean-golf
-realclean-extout: distclean-extout
-
-clean-enc distclean-enc realclean-enc:
- @echo $(@:-enc=ing) encodings
- @-$(MAKE) -f $(ENC_MK) $(MFLAGS) $(@:-enc=)
+ @-$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" $(EXTMK_ARGS) realclean
check: test test-all
-btest: miniruby$(EXEEXT) $(TEST_RUNNABLE)-btest
-no-btest: PHONY
-yes-btest: PHONY
- $(BOOTSTRAPRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(MINIRUBY)" $(OPTS)
-
-btest-ruby: miniruby$(EXEEXT) $(RBCONFIG) $(PROGRAM) $(TEST_RUNNABLE)-btest-ruby
-no-btest-ruby: PHONY
-yes-btest-ruby: PHONY
- @$(RUNRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM) -I$(srcdir)/lib" -q $(OPTS)
-
-test-sample: miniruby$(EXEEXT) $(RBCONFIG) $(PROGRAM) $(TEST_RUNNABLE)-test-sample
-no-test-sample: PHONY
-yes-test-sample: PHONY
- @$(RUNRUBY) $(srcdir)/tool/rubytest.rb
-
-test-knownbug: miniruby$(EXEEXT) $(PROGRAM) $(RBCONFIG) $(TEST_RUNNABLE)-test-knownbug
-no-test-knownbug: PHONY
-yes-test-knownbug: PHONY
- $(RUNRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM)" $(OPTS) $(srcdir)/KNOWNBUGS.rb
+test: miniruby$(EXEEXT) $(RBCONFIG) $(PROGRAM) PHONY
+ @$(MINIRUBY) $(srcdir)/rubytest.rb
-test: test-sample btest-ruby test-knownbug
+test-all:
+ $(RUNRUBY) "$(srcdir)/test/runner.rb" --basedir="$(TESTSDIR)" --runner=$(TESTUI) $(TESTS)
-test-all: $(TEST_RUNNABLE)-test-all
-no-test-all: PHONY
-yes-test-all: PHONY
- $(RUNRUBY) "$(srcdir)/test/runner.rb" $(TESTS)
-
-extconf: $(PREP)
- $(MAKEDIRS) "$(EXTCONFDIR)"
+extconf:
+ $(MINIRUBY) -run -e mkdir -- -p "$(EXTCONFDIR)"
$(RUNRUBY) -C "$(EXTCONFDIR)" $(EXTCONF) $(EXTCONFARGS)
-$(RBCONFIG): $(srcdir)/tool/mkconfig.rb config.status $(PREP)
- @$(MINIRUBY) $(srcdir)/tool/mkconfig.rb -timestamp=$@ \
+$(RBCONFIG): $(srcdir)/mkconfig.rb config.status $(PREP)
+ @$(MINIRUBY) $(srcdir)/mkconfig.rb -timestamp=$@ \
-install_name=$(RUBY_INSTALL_NAME) \
-so_name=$(RUBY_SO_NAME) rbconfig.rb
-encs: enc trans
-encs enc trans: $(ENC_MK) $(LIBRUBY) $(PREP)
- $(MAKE) -f $(ENC_MK) RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" $(MFLAGS) $@
-
-enc: {$(VPATH)}encdb.h
-trans: {$(VPATH)}transdb.h
-
-$(ENC_MK): $(srcdir)/enc/make_encmake.rb $(srcdir)/enc/Makefile.in $(srcdir)/enc/depend \
- $(srcdir)/lib/mkmf.rb $(RBCONFIG)
- $(MINIRUBY) $(srcdir)/enc/make_encmake.rb --builtin-encs="$(BUILTIN_ENCOBJS)" --builtin-transes="$(BUILTIN_TRANSOBJS)" $@ $(ENCS)
-
.PRECIOUS: $(MKFILES)
-.PHONY: PHONY all fake prereq incs srcs preludes help
.PHONY: test install install-nodoc install-doc dist
-.PHONY: loadpath golf capi rdoc install-prereq clear-installed-list
-.PHONY: clean clean-ext clean-local clean-enc clean-golf clean-rdoc clean-extout
-.PHONY: distclean distclean-ext distclean-local distclean-enc distclean-golf distclean-extout
-.PHONY: realclean realclean-ext realclean-local realclean-enc realclean-golf realclean-extout
-.PHONY: check test test-all btest btest-ruby test-sample test-knownbug
-.PHONY: run runruby parse benchmark benchmark-each tbench gdb gdb-ruby
-.PHONY: update-mspec update-rubyspec test-rubyspec
PHONY:
-{$(VPATH)}parse.c: {$(VPATH)}parse.y $(srcdir)/tool/ytab.sed
-parse.h {$(VPATH)}parse.h: {$(VPATH)}parse.c
-
-{$(srcdir)}.y.c:
- $(YACC) -d $(YFLAGS) -o y.tab.c $(SRC_FILE)
- sed -f $(srcdir)/tool/ytab.sed -e "/^#/s!y\.tab\.c!$@!" y.tab.c > $@.new
- @$(MV) $@.new $@
- sed -e "/^#line.*y\.tab\.h/d;/^#line.*parse\.y/d" y.tab.h > $(@:.c=.h).new
- @$(IFCHANGE) $(@:.c=.h) $(@:.c=.h).new
- @$(RM) y.tab.c y.tab.h
+{$(VPATH)}parse.c: parse.y
acosh.$(OBJEXT): {$(VPATH)}acosh.c
-alloca.$(OBJEXT): {$(VPATH)}alloca.c {$(VPATH)}config.h
+alloca.$(OBJEXT): {$(VPATH)}alloca.c
crypt.$(OBJEXT): {$(VPATH)}crypt.c
dup2.$(OBJEXT): {$(VPATH)}dup2.c
erf.$(OBJEXT): {$(VPATH)}erf.c
@@ -472,341 +334,134 @@ flock.$(OBJEXT): {$(VPATH)}flock.c
memcmp.$(OBJEXT): {$(VPATH)}memcmp.c
memmove.$(OBJEXT): {$(VPATH)}memmove.c
mkdir.$(OBJEXT): {$(VPATH)}mkdir.c
+vsnprintf.$(OBJEXT): {$(VPATH)}vsnprintf.c
+strcasecmp.$(OBJEXT): {$(VPATH)}strcasecmp.c
+strncasecmp.$(OBJEXT): {$(VPATH)}strncasecmp.c
strchr.$(OBJEXT): {$(VPATH)}strchr.c
strdup.$(OBJEXT): {$(VPATH)}strdup.c
strerror.$(OBJEXT): {$(VPATH)}strerror.c
+strftime.$(OBJEXT): {$(VPATH)}strftime.c
strstr.$(OBJEXT): {$(VPATH)}strstr.c
strtod.$(OBJEXT): {$(VPATH)}strtod.c
strtol.$(OBJEXT): {$(VPATH)}strtol.c
+strtoul.$(OBJEXT): {$(VPATH)}strtoul.c
nt.$(OBJEXT): {$(VPATH)}nt.c
+x68.$(OBJEXT): {$(VPATH)}x68.c
os2.$(OBJEXT): {$(VPATH)}os2.c
dl_os2.$(OBJEXT): {$(VPATH)}dl_os2.c
ia64.$(OBJEXT): {$(VPATH)}ia64.s
$(CC) $(CFLAGS) -c $<
-win32.$(OBJEXT): {$(VPATH)}win32.c $(RUBY_H_INCLUDES)
+# when I use -I., there is confliction at "OpenFile"
+# so, set . into environment varible "include"
+win32.$(OBJEXT): {$(VPATH)}win32.c
###
-RUBY_H_INCLUDES = {$(VPATH)}ruby.h {$(VPATH)}config.h {$(VPATH)}defines.h \
- {$(VPATH)}intern.h {$(VPATH)}missing.h {$(VPATH)}st.h
-ENCODING_H_INCLUDES= {$(VPATH)}encoding.h {$(VPATH)}oniguruma.h
-ID_H_INCLUDES = {$(VPATH)}id.h
-VM_CORE_H_INCLUDES = {$(VPATH)}vm_core.h {$(VPATH)}vm_opts.h \
- {$(VPATH)}thread_$(THREAD_MODEL).h \
- {$(VPATH)}node.h {$(VPATH)}method.h $(ID_H_INCLUDES)
-
-array.$(OBJEXT): {$(VPATH)}array.c $(RUBY_H_INCLUDES) {$(VPATH)}util.h
-bignum.$(OBJEXT): {$(VPATH)}bignum.c $(RUBY_H_INCLUDES) {$(VPATH)}util.h
-class.$(OBJEXT): {$(VPATH)}class.c $(RUBY_H_INCLUDES) \
- $(VM_CORE_H_INCLUDES) {$(VPATH)}debug.h
-compar.$(OBJEXT): {$(VPATH)}compar.c $(RUBY_H_INCLUDES)
-complex.$(OBJEXT): {$(VPATH)}complex.c $(RUBY_H_INCLUDES)
-dir.$(OBJEXT): {$(VPATH)}dir.c $(RUBY_H_INCLUDES) {$(VPATH)}util.h \
- $(ENCODING_H_INCLUDES)
-dln.$(OBJEXT): {$(VPATH)}dln.c {$(VPATH)}dln.h $(RUBY_H_INCLUDES)
+array.$(OBJEXT): {$(VPATH)}array.c {$(VPATH)}ruby.h config.h \
+ {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
+ {$(VPATH)}util.h {$(VPATH)}st.h
+bignum.$(OBJEXT): {$(VPATH)}bignum.c {$(VPATH)}ruby.h config.h \
+ {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
+class.$(OBJEXT): {$(VPATH)}class.c {$(VPATH)}ruby.h config.h \
+ {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
+ {$(VPATH)}rubysig.h {$(VPATH)}node.h {$(VPATH)}st.h
+compar.$(OBJEXT): {$(VPATH)}compar.c {$(VPATH)}ruby.h config.h \
+ {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
+dir.$(OBJEXT): {$(VPATH)}dir.c {$(VPATH)}ruby.h config.h \
+ {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
+ {$(VPATH)}util.h
+dln.$(OBJEXT): {$(VPATH)}dln.c {$(VPATH)}ruby.h config.h \
+ {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
+ {$(VPATH)}dln.h
dmydln.$(OBJEXT): {$(VPATH)}dmydln.c dln.$(OBJEXT)
dmyext.$(OBJEXT): {$(VPATH)}dmyext.c
-dmyencoding.$(OBJEXT): {$(VPATH)}dmyencoding.c $(RUBY_H_INCLUDES) \
- {$(VPATH)}regenc.h {$(VPATH)}util.h $(ENCODING_H_INCLUDES) \
- {$(VPATH)}encoding.c
-encoding.$(OBJEXT): {$(VPATH)}encoding.c $(RUBY_H_INCLUDES) \
- $(ENCODING_H_INCLUDES) {$(VPATH)}regenc.h {$(VPATH)}util.h
-enum.$(OBJEXT): {$(VPATH)}enum.c $(RUBY_H_INCLUDES) {$(VPATH)}node.h \
+enum.$(OBJEXT): {$(VPATH)}enum.c {$(VPATH)}ruby.h config.h \
+ {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
+ {$(VPATH)}node.h {$(VPATH)}util.h
+enumerator.$(OBJEXT): {$(VPATH)}enumerator.c {$(VPATH)}ruby.h config.h \
+ {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
+error.$(OBJEXT): {$(VPATH)}error.c {$(VPATH)}ruby.h config.h \
+ {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
+ {$(VPATH)}env.h {$(VPATH)}st.h
+eval.$(OBJEXT): {$(VPATH)}eval.c {$(VPATH)}ruby.h config.h \
+ {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
+ {$(VPATH)}node.h {$(VPATH)}env.h {$(VPATH)}util.h \
+ {$(VPATH)}rubysig.h {$(VPATH)}st.h {$(VPATH)}dln.h
+file.$(OBJEXT): {$(VPATH)}file.c {$(VPATH)}ruby.h config.h \
+ {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
+ {$(VPATH)}rubyio.h {$(VPATH)}rubysig.h {$(VPATH)}util.h \
+ {$(VPATH)}dln.h
+gc.$(OBJEXT): {$(VPATH)}gc.c {$(VPATH)}ruby.h config.h \
+ {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
+ {$(VPATH)}rubysig.h {$(VPATH)}st.h {$(VPATH)}node.h \
+ {$(VPATH)}env.h {$(VPATH)}re.h {$(VPATH)}regex.h
+hash.$(OBJEXT): {$(VPATH)}hash.c {$(VPATH)}ruby.h config.h \
+ {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
+ {$(VPATH)}st.h {$(VPATH)}util.h {$(VPATH)}rubysig.h
+inits.$(OBJEXT): {$(VPATH)}inits.c {$(VPATH)}ruby.h config.h \
+ {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
+io.$(OBJEXT): {$(VPATH)}io.c {$(VPATH)}ruby.h config.h \
+ {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
+ {$(VPATH)}rubyio.h {$(VPATH)}rubysig.h {$(VPATH)}util.h \
+ {$(VPATH)}env.h
+main.$(OBJEXT): {$(VPATH)}main.c {$(VPATH)}ruby.h config.h \
+ {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
+marshal.$(OBJEXT): {$(VPATH)}marshal.c {$(VPATH)}ruby.h config.h \
+ {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
+ {$(VPATH)}rubyio.h {$(VPATH)}st.h {$(VPATH)}util.h
+math.$(OBJEXT): {$(VPATH)}math.c {$(VPATH)}ruby.h config.h \
+ {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
+numeric.$(OBJEXT): {$(VPATH)}numeric.c {$(VPATH)}ruby.h config.h \
+ {$(VPATH)}env.h {$(VPATH)}defines.h {$(VPATH)}intern.h \
+ {$(VPATH)}missing.h
+object.$(OBJEXT): {$(VPATH)}object.c {$(VPATH)}ruby.h config.h \
+ {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
+ {$(VPATH)}st.h {$(VPATH)}util.h
+pack.$(OBJEXT): {$(VPATH)}pack.c {$(VPATH)}ruby.h config.h \
+ {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
+parse.$(OBJEXT): {$(VPATH)}parse.c {$(VPATH)}ruby.h config.h \
+ {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
+ {$(VPATH)}env.h {$(VPATH)}node.h {$(VPATH)}st.h \
+ {$(VPATH)}regex.h {$(VPATH)}util.h {$(VPATH)}lex.c
+prec.$(OBJEXT): {$(VPATH)}prec.c {$(VPATH)}ruby.h config.h \
+ {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
+process.$(OBJEXT): {$(VPATH)}process.c {$(VPATH)}ruby.h config.h \
+ {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
+ {$(VPATH)}rubysig.h {$(VPATH)}st.h
+random.$(OBJEXT): {$(VPATH)}random.c {$(VPATH)}ruby.h config.h \
+ {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
+range.$(OBJEXT): {$(VPATH)}range.c {$(VPATH)}ruby.h config.h \
+ {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
+re.$(OBJEXT): {$(VPATH)}re.c {$(VPATH)}ruby.h config.h \
+ {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
+ {$(VPATH)}re.h {$(VPATH)}regex.h
+regex.$(OBJEXT): {$(VPATH)}regex.c config.h {$(VPATH)}regex.h
+ruby.$(OBJEXT): {$(VPATH)}ruby.c {$(VPATH)}ruby.h config.h \
+ {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
+ {$(VPATH)}dln.h {$(VPATH)}node.h {$(VPATH)}util.h
+signal.$(OBJEXT): {$(VPATH)}signal.c {$(VPATH)}ruby.h config.h \
+ {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
+ {$(VPATH)}rubysig.h
+sprintf.$(OBJEXT): {$(VPATH)}sprintf.c {$(VPATH)}ruby.h config.h \
+ {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
+st.$(OBJEXT): {$(VPATH)}st.c config.h {$(VPATH)}st.h
+string.$(OBJEXT): {$(VPATH)}string.c {$(VPATH)}ruby.h config.h \
+ {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
+ {$(VPATH)}re.h {$(VPATH)}regex.h
+struct.$(OBJEXT): {$(VPATH)}struct.c {$(VPATH)}ruby.h config.h \
+ {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
+time.$(OBJEXT): {$(VPATH)}time.c {$(VPATH)}ruby.h config.h \
+ {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
+util.$(OBJEXT): {$(VPATH)}util.c {$(VPATH)}ruby.h config.h \
+ {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
{$(VPATH)}util.h
-enumerator.$(OBJEXT): {$(VPATH)}enumerator.c $(RUBY_H_INCLUDES)
-error.$(OBJEXT): {$(VPATH)}error.c {$(VPATH)}known_errors.inc \
- $(RUBY_H_INCLUDES) $(VM_CORE_H_INCLUDES) {$(VPATH)}debug.h
-eval.$(OBJEXT): {$(VPATH)}eval.c {$(VPATH)}eval_intern.h \
- $(RUBY_H_INCLUDES) $(VM_CORE_H_INCLUDES) {$(VPATH)}eval_error.c \
- {$(VPATH)}eval_jump.c {$(VPATH)}debug.h {$(VPATH)}gc.h {$(VPATH)}iseq.h
-load.$(OBJEXT): {$(VPATH)}load.c {$(VPATH)}eval_intern.h \
- {$(VPATH)}util.h $(RUBY_H_INCLUDES) $(VM_CORE_H_INCLUDES) \
- {$(VPATH)}dln.h {$(VPATH)}debug.h
-file.$(OBJEXT): {$(VPATH)}file.c $(RUBY_H_INCLUDES) {$(VPATH)}io.h \
- $(ENCODING_H_INCLUDES) {$(VPATH)}util.h {$(VPATH)}dln.h
-gc.$(OBJEXT): {$(VPATH)}gc.c $(RUBY_H_INCLUDES) {$(VPATH)}re.h \
- {$(VPATH)}regex.h $(ENCODING_H_INCLUDES) $(VM_CORE_H_INCLUDES) \
- {$(VPATH)}gc.h {$(VPATH)}io.h {$(VPATH)}eval_intern.h {$(VPATH)}util.h \
- {$(VPATH)}debug.h
-hash.$(OBJEXT): {$(VPATH)}hash.c $(RUBY_H_INCLUDES) {$(VPATH)}util.h
-inits.$(OBJEXT): {$(VPATH)}inits.c $(RUBY_H_INCLUDES)
-io.$(OBJEXT): {$(VPATH)}io.c $(RUBY_H_INCLUDES) {$(VPATH)}io.h \
- {$(VPATH)}util.h $(ENCODING_H_INCLUDES) {$(VPATH)}dln.h
-main.$(OBJEXT): {$(VPATH)}main.c $(RUBY_H_INCLUDES) {$(VPATH)}debug.h \
- {$(VPATH)}node.h
-marshal.$(OBJEXT): {$(VPATH)}marshal.c $(RUBY_H_INCLUDES) {$(VPATH)}io.h \
- $(ENCODING_H_INCLUDES) {$(VPATH)}util.h
-math.$(OBJEXT): {$(VPATH)}math.c $(RUBY_H_INCLUDES)
-numeric.$(OBJEXT): {$(VPATH)}numeric.c $(RUBY_H_INCLUDES) \
- {$(VPATH)}util.h $(ENCODING_H_INCLUDES)
-object.$(OBJEXT): {$(VPATH)}object.c $(RUBY_H_INCLUDES) {$(VPATH)}util.h
-pack.$(OBJEXT): {$(VPATH)}pack.c $(RUBY_H_INCLUDES) {$(VPATH)}encoding.h \
- {$(VPATH)}oniguruma.h
-parse.$(OBJEXT): {$(VPATH)}parse.c $(RUBY_H_INCLUDES) {$(VPATH)}node.h \
- $(ENCODING_H_INCLUDES) $(ID_H_INCLUDES) {$(VPATH)}regenc.h \
- {$(VPATH)}regex.h {$(VPATH)}util.h {$(VPATH)}lex.c \
- {$(VPATH)}defs/keywords {$(VPATH)}id.c {$(VPATH)}parse.y \
- {$(VPATH)}parse.h
-proc.$(OBJEXT): {$(VPATH)}proc.c {$(VPATH)}eval_intern.h \
- $(RUBY_H_INCLUDES) {$(VPATH)}gc.h $(VM_CORE_H_INCLUDES) \
- {$(VPATH)}debug.h
-process.$(OBJEXT): {$(VPATH)}process.c $(RUBY_H_INCLUDES) \
- {$(VPATH)}util.h {$(VPATH)}io.h $(ENCODING_H_INCLUDES) {$(VPATH)}dln.h \
- $(VM_CORE_H_INCLUDES) {$(VPATH)}debug.h
-random.$(OBJEXT): {$(VPATH)}random.c $(RUBY_H_INCLUDES)
-range.$(OBJEXT): {$(VPATH)}range.c $(RUBY_H_INCLUDES) \
- $(ENCODING_H_INCLUDES)
-rational.$(OBJEXT): {$(VPATH)}rational.c $(RUBY_H_INCLUDES)
-re.$(OBJEXT): {$(VPATH)}re.c $(RUBY_H_INCLUDES) {$(VPATH)}re.h \
- {$(VPATH)}regex.h $(ENCODING_H_INCLUDES) {$(VPATH)}util.h \
- {$(VPATH)}regint.h {$(VPATH)}regenc.h
-regcomp.$(OBJEXT): {$(VPATH)}regcomp.c {$(VPATH)}regparse.h \
- {$(VPATH)}regint.h {$(VPATH)}regenc.h {$(VPATH)}oniguruma.h \
- $(RUBY_H_INCLUDES)
-regenc.$(OBJEXT): {$(VPATH)}regenc.c {$(VPATH)}regint.h \
- {$(VPATH)}regenc.h {$(VPATH)}oniguruma.h $(RUBY_H_INCLUDES)
-regerror.$(OBJEXT): {$(VPATH)}regerror.c {$(VPATH)}regint.h \
- {$(VPATH)}regenc.h {$(VPATH)}oniguruma.h $(RUBY_H_INCLUDES)
-regexec.$(OBJEXT): {$(VPATH)}regexec.c {$(VPATH)}regint.h \
- {$(VPATH)}regenc.h {$(VPATH)}oniguruma.h $(RUBY_H_INCLUDES)
-regparse.$(OBJEXT): {$(VPATH)}regparse.c {$(VPATH)}regparse.h \
- {$(VPATH)}regint.h {$(VPATH)}regenc.h {$(VPATH)}oniguruma.h \
- $(RUBY_H_INCLUDES)
-regsyntax.$(OBJEXT): {$(VPATH)}regsyntax.c {$(VPATH)}regint.h \
- {$(VPATH)}regenc.h {$(VPATH)}oniguruma.h $(RUBY_H_INCLUDES)
-ruby.$(OBJEXT): {$(VPATH)}ruby.c $(RUBY_H_INCLUDES) {$(VPATH)}util.h \
- $(ENCODING_H_INCLUDES) {$(VPATH)}eval_intern.h $(VM_CORE_H_INCLUDES) \
- {$(VPATH)}dln.h {$(VPATH)}debug.h
-safe.$(OBJEXT): {$(VPATH)}safe.c $(RUBY_H_INCLUDES) \
- $(VM_CORE_H_INCLUDES) {$(VPATH)}debug.h
-signal.$(OBJEXT): {$(VPATH)}signal.c $(RUBY_H_INCLUDES) \
- $(VM_CORE_H_INCLUDES) {$(VPATH)}debug.h
-sprintf.$(OBJEXT): {$(VPATH)}sprintf.c $(RUBY_H_INCLUDES) {$(VPATH)}re.h \
- {$(VPATH)}regex.h {$(VPATH)}vsnprintf.c $(ENCODING_H_INCLUDES)
-st.$(OBJEXT): {$(VPATH)}st.c {$(VPATH)}config.h {$(VPATH)}defines.h \
- {$(VPATH)}st.h {$(VPATH)}ruby.h {$(VPATH)}missing.h {$(VPATH)}intern.h
-strftime.$(OBJEXT): {$(VPATH)}strftime.c {$(VPATH)}ruby.h \
- {$(VPATH)}config.h {$(VPATH)}defines.h {$(VPATH)}missing.h \
- {$(VPATH)}intern.h {$(VPATH)}st.h {$(VPATH)}timev.h
-string.$(OBJEXT): {$(VPATH)}string.c $(RUBY_H_INCLUDES) {$(VPATH)}re.h \
- {$(VPATH)}regex.h $(ENCODING_H_INCLUDES)
-struct.$(OBJEXT): {$(VPATH)}struct.c $(RUBY_H_INCLUDES)
-thread.$(OBJEXT): {$(VPATH)}thread.c {$(VPATH)}eval_intern.h \
- $(RUBY_H_INCLUDES) {$(VPATH)}gc.h $(VM_CORE_H_INCLUDES) \
- {$(VPATH)}debug.h {$(VPATH)}thread_$(THREAD_MODEL).c
-transcode.$(OBJEXT): {$(VPATH)}transcode.c $(RUBY_H_INCLUDES) \
- $(ENCODING_H_INCLUDES) {$(VPATH)}transcode_data.h
-cont.$(OBJEXT): {$(VPATH)}cont.c $(RUBY_H_INCLUDES) \
- $(VM_CORE_H_INCLUDES) {$(VPATH)}gc.h {$(VPATH)}eval_intern.h \
- {$(VPATH)}debug.h
-time.$(OBJEXT): {$(VPATH)}time.c $(RUBY_H_INCLUDES) \
- $(ENCODING_H_INCLUDES) {$(VPATH)}timev.h
-util.$(OBJEXT): {$(VPATH)}util.c $(RUBY_H_INCLUDES) {$(VPATH)}util.h
-variable.$(OBJEXT): {$(VPATH)}variable.c $(RUBY_H_INCLUDES) \
- {$(VPATH)}node.h {$(VPATH)}util.h {$(VPATH)}encoding.h \
- {$(VPATH)}oniguruma.h
-version.$(OBJEXT): {$(VPATH)}version.c $(RUBY_H_INCLUDES) \
- {$(VPATH)}version.h $(srcdir)/revision.h
-
-compile.$(OBJEXT): {$(VPATH)}compile.c {$(VPATH)}iseq.h \
- $(RUBY_H_INCLUDES) $(VM_CORE_H_INCLUDES) {$(VPATH)}insns.inc \
- {$(VPATH)}insns_info.inc {$(VPATH)}optinsn.inc {$(VPATH)}debug.h
-iseq.$(OBJEXT): {$(VPATH)}iseq.c {$(VPATH)}gc.h {$(VPATH)}iseq.h \
- $(RUBY_H_INCLUDES) $(VM_CORE_H_INCLUDES) {$(VPATH)}insns.inc \
- {$(VPATH)}insns_info.inc {$(VPATH)}node_name.inc {$(VPATH)}debug.h
-vm.$(OBJEXT): {$(VPATH)}vm.c {$(VPATH)}gc.h {$(VPATH)}iseq.h \
- {$(VPATH)}eval_intern.h $(RUBY_H_INCLUDES) $(ENCODING_H_INCLUDES) \
- $(VM_CORE_H_INCLUDES) {$(VPATH)}vm_method.c {$(VPATH)}vm_eval.c \
- {$(VPATH)}vm_insnhelper.c {$(VPATH)}vm_insnhelper.h {$(VPATH)}vm_exec.c \
- {$(VPATH)}vm_exec.h {$(VPATH)}insns.def {$(VPATH)}vmtc.inc \
- {$(VPATH)}vm.inc {$(VPATH)}insns.inc {$(VPATH)}debug.h
-vm_dump.$(OBJEXT): {$(VPATH)}vm_dump.c $(RUBY_H_INCLUDES) \
- $(VM_CORE_H_INCLUDES) {$(VPATH)}debug.h
-debug.$(OBJEXT): {$(VPATH)}debug.c $(RUBY_H_INCLUDES) \
- $(ENCODING_H_INCLUDES) $(VM_CORE_H_INCLUDES) {$(VPATH)}eval_intern.h \
- {$(VPATH)}util.h {$(VPATH)}debug.h
-id.$(OBJEXT): {$(VPATH)}id.c $(RUBY_H_INCLUDES) $(ID_H_INCLUDES)
-miniprelude.$(OBJEXT): {$(VPATH)}miniprelude.c $(RUBY_H_INCLUDES) \
- $(VM_CORE_H_INCLUDES) {$(VPATH)}debug.h
-prelude.$(OBJEXT): {$(VPATH)}prelude.c $(RUBY_H_INCLUDES) \
- $(VM_CORE_H_INCLUDES) {$(VPATH)}debug.h
-golf_prelude.$(OBJEXT): {$(VPATH)}golf_prelude.c $(RUBY_H_INCLUDES) \
- $(VM_CORE_H_INCLUDES) {$(VPATH)}debug.h
-goruby.$(OBJEXT): {$(VPATH)}goruby.c {$(VPATH)}main.c $(RUBY_H_INCLUDES) \
- {$(VPATH)}debug.h {$(VPATH)}node.h
-
-ascii.$(OBJEXT): {$(VPATH)}ascii.c {$(VPATH)}regenc.h {$(VPATH)}config.h \
- {$(VPATH)}defines.h {$(VPATH)}oniguruma.h
-us_ascii.$(OBJEXT): {$(VPATH)}us_ascii.c {$(VPATH)}regenc.h \
- {$(VPATH)}config.h {$(VPATH)}defines.h {$(VPATH)}oniguruma.h
-unicode.$(OBJEXT): {$(VPATH)}unicode.c {$(VPATH)}regint.h \
- {$(VPATH)}config.h {$(VPATH)}defines.h {$(VPATH)}regenc.h \
- {$(VPATH)}oniguruma.h {$(VPATH)}st.h {$(VPATH)}ruby.h \
- {$(VPATH)}missing.h {$(VPATH)}intern.h {$(VPATH)}enc/unicode/name2ctype.h
-
-utf_8.$(OBJEXT): {$(VPATH)}utf_8.c {$(VPATH)}regenc.h {$(VPATH)}config.h \
- {$(VPATH)}defines.h {$(VPATH)}oniguruma.h
-
-newline.c: $(srcdir)/enc/trans/newline.trans $(srcdir)/tool/transcode-tblgen.rb
- $(BASERUBY) "$(srcdir)/tool/transcode-tblgen.rb" -vo newline.c $(srcdir)/enc/trans/newline.trans
-newline.$(OBJEXT): {$(VPATH)}newline.c {$(VPATH)}defines.h \
- {$(VPATH)}intern.h {$(VPATH)}missing.h {$(VPATH)}st.h \
- {$(VPATH)}transcode_data.h {$(VPATH)}ruby.h {$(VPATH)}config.h
-
-INSNS2VMOPT = --srcdir="$(srcdir)"
-
-{$(VPATH)}minsns.inc: $(srcdir)/template/minsns.inc.tmpl
-
-{$(VPATH)}opt_sc.inc: $(srcdir)/template/opt_sc.inc.tmpl
-
-{$(VPATH)}optinsn.inc: $(srcdir)/template/optinsn.inc.tmpl
-
-{$(VPATH)}optunifs.inc: $(srcdir)/template/optunifs.inc.tmpl
-
-{$(VPATH)}insns.inc: $(srcdir)/template/insns.inc.tmpl
-
-{$(VPATH)}insns_info.inc: $(srcdir)/template/insns_info.inc.tmpl
-
-{$(VPATH)}vmtc.inc: $(srcdir)/template/vmtc.inc.tmpl
-
-{$(VPATH)}vm.inc: $(srcdir)/template/vm.inc.tmpl
-
-srcs: {$(VPATH)}parse.c {$(VPATH)}lex.c {$(VPATH)}newline.c srcs-ext srcs-enc
-
-EXT_SRCS = $(srcdir)/ext/ripper/ripper.c $(srcdir)/ext/dl/callback/callback.c
-
-srcs-ext: $(EXT_SRCS)
-
-srcs-enc: $(ENC_MK)
- $(MAKE) -f $(ENC_MK) RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" $(MFLAGS) srcs
-
-incs: $(INSNS) {$(VPATH)}node_name.inc {$(VPATH)}encdb.h {$(VPATH)}transdb.h {$(VPATH)}known_errors.inc \
- $(srcdir)/revision.h $(REVISION_H) enc/unicode/name2ctype.h
-
-insns: $(INSNS)
-
-id.h: parse.h $(srcdir)/tool/generic_erb.rb $(srcdir)/template/id.h.tmpl
- $(BASERUBY) $(srcdir)/tool/generic_erb.rb --output=$@ \
- $(srcdir)/template/id.h.tmpl --vpath=$(VPATH) parse.h
-
-node_name.inc: {$(VPATH)}node.h
- $(BASERUBY) -n $(srcdir)/tool/node_name.rb $? > $@
-
-encdb.h: $(PREP) $(srcdir)/tool/generic_erb.rb $(srcdir)/template/encdb.h.tmpl
- $(MINIRUBY) $(srcdir)/tool/generic_erb.rb -c -o $@ $(srcdir)/template/encdb.h.tmpl $(srcdir)/enc enc
-
-transdb.h: $(PREP) srcs-enc $(srcdir)/tool/generic_erb.rb $(srcdir)/template/transdb.h.tmpl
- $(MINIRUBY) $(srcdir)/tool/generic_erb.rb -c -o $@ $(srcdir)/template/transdb.h.tmpl $(srcdir)/enc/trans enc/trans
-
-known_errors.inc: $(srcdir)/template/known_errors.inc.tmpl $(srcdir)/defs/known_errors.def
- $(BASERUBY) $(srcdir)/tool/generic_erb.rb -c -o $@ $(srcdir)/template/known_errors.inc.tmpl $(srcdir)/defs/known_errors.def
-
-miniprelude.c: $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb
- $(BASERUBY) -I$(srcdir) $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $@
-
-prelude.c: $(srcdir)/tool/compile_prelude.rb $(RBCONFIG) $(srcdir)/lib/rubygems/defaults.rb $(PRELUDE_SCRIPTS) $(PREP)
- $(COMPILE_PRELUDE) $(PRELUDE_SCRIPTS) $@
-
-golf_prelude.c: $(srcdir)/tool/compile_prelude.rb $(RBCONFIG) $(srcdir)/prelude.rb $(srcdir)/golf_prelude.rb $(PREP)
- $(COMPILE_PRELUDE) $(srcdir)/golf_prelude.rb $@
-
-prereq: incs srcs preludes
-
-preludes: {$(VPATH)}miniprelude.c
-preludes: {$(srcdir)}golf_prelude.c
-
-$(srcdir)/revision.h:
- @exit > $@
-
-$(REVISION_H): $(srcdir)/version.h $(srcdir)/ChangeLog $(srcdir)/tool/file2lastrev.rb $(REVISION_FORCE)
- @-$(BASERUBY) $(srcdir)/tool/file2lastrev.rb --revision.h "$(srcdir)" > "$(srcdir)/revision.tmp"
- @$(IFCHANGE) "--timestamp=$@" "$(srcdir)/revision.h" "$(srcdir)/revision.tmp"
-
-$(EXT_SRCS):
- $(CHDIR) $(@D) && $(exec) $(MAKE) -f depend $(MFLAGS) top_srcdir=../.. srcdir=.
-
-##
-
-run: miniruby$(EXEEXT) PHONY
- $(MINIRUBY) $(TESTRUN_SCRIPT) $(RUNOPT)
-
-runruby: $(PROGRAM) PHONY
- $(RUNRUBY) $(TESTRUN_SCRIPT)
-
-parse: miniruby$(EXEEXT) PHONY
- $(MINIRUBY) $(srcdir)/tool/parse.rb $(TESTRUN_SCRIPT)
-
-COMPARE_RUBY = $(BASERUBY)
-ITEM =
-OPTS =
-
-benchmark: $(PROGRAM) PHONY
- $(BASERUBY) $(srcdir)/benchmark/driver.rb -v \
- --executables="$(COMPARE_RUBY); $(RUNRUBY)" \
- --pattern='bm_' --directory=$(srcdir)/benchmark $(OPTS)
-
-benchmark-each: $(PROGRAM) PHONY
- $(BASERUBY) $(srcdir)/benchmark/driver.rb -v \
- --executables="$(COMPARE_RUBY); $(RUNRUBY)" \
- --pattern=$(ITEM) --directory=$(srcdir)/benchmark $(OPTS)
-
-tbench: $(PROGRAM) PHONY
- $(BASERUBY) $(srcdir)/benchmark/driver.rb -v \
- --executables="$(COMPARE_RUBY); $(RUNRUBY)" \
- --pattern='bmx_' --directory=$(srcdir)/benchmark $(OPTS)
-
-run.gdb:
- echo b ruby_debug_breakpoint > run.gdb
- echo '# handle SIGINT nostop' >> run.gdb
- echo '# handle SIGPIPE nostop' >> run.gdb
- echo '# b rb_longjmp' >> run.gdb
- echo source $(srcdir)/breakpoints.gdb >> run.gdb
- echo source $(srcdir)/.gdbinit >> run.gdb
- echo run >> run.gdb
-
-gdb: miniruby$(EXEEXT) run.gdb PHONY
- gdb -x run.gdb --quiet --args $(MINIRUBY) $(TESTRUN_SCRIPT)
-
-gdb-ruby: $(PROGRAM) run.gdb PHONY
- gdb -x run.gdb --quiet --args $(PROGRAM) $(TESTRUN_SCRIPT)
-
-dist:
- $(BASERUBY) $(srcdir)/tool/make-snapshot tmp $(RELNAME)
-
-up::
- -@$(MAKE) $(MFLAGS) REVISION_FORCE=PHONY "$(REVISION_H)"
-
-info: info-program info-libruby_a info-libruby_so info-arch
-info-program:
- @echo PROGRAM=$(PROGRAM)
-info-libruby_a:
- @echo LIBRUBY_A=$(LIBRUBY_A)
-info-libruby_so:
- @echo LIBRUBY_SO=$(LIBRUBY_SO)
-info-arch:
- @echo arch=$(arch)
-
-help: PHONY
- @echo " Makefile of Ruby"
- @echo ""
- @echo "targets:"
- @echo " all (default): builds ruby"
- @echo " miniruby: builds only miniruby"
- @echo " run: runs test.rb by miniruby"
- @echo " runruby: runs test.rb by ruby you just built"
- @echo " gdb: runs test.rb by miniruby under gdb"
- @echo " gdb-ruby: runs test.rb by ruby under gdb"
- @echo " all: compile ruby and extensions"
- @echo " check: equals make test test-all"
- @echo " test: ruby core tests"
- @echo " test-all: all ruby tests"
- @echo " test-rubyspec run RubySpec test suite"
- @echo " update-rubyspec update local copy of RubySpec"
- @echo " install: install all ruby distributions"
- @echo " install-nodoc: install without rdoc"
- @echo " clean: clean built objects"
- @echo " golf: for golfers"
- @echo
- @echo "see DeveloperHowto for more detail: "
- @echo " http://redmine.ruby-lang.org/wiki/ruby/DeveloperHowto"
+variable.$(OBJEXT): {$(VPATH)}variable.c {$(VPATH)}ruby.h config.h \
+ {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
+ {$(VPATH)}env.h {$(VPATH)}node.h {$(VPATH)}st.h {$(VPATH)}util.h
+version.$(OBJEXT): {$(VPATH)}version.c {$(VPATH)}ruby.h config.h \
+ {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
+ {$(VPATH)}version.h
+
+dist: $(PROGRAM)
+ $(RUNRUBY) $(srcdir)/distruby.rb
diff --git a/compar.c b/compar.c
index e8ebfc5bfa..1488b2c65d 100644
--- a/compar.c
+++ b/compar.c
@@ -3,20 +3,39 @@
compar.c -
$Author$
+ $Date$
created at: Thu Aug 26 14:39:48 JST 1993
- Copyright (C) 1993-2007 Yukihiro Matsumoto
+ Copyright (C) 1993-2003 Yukihiro Matsumoto
**********************************************************************/
-#include "ruby/ruby.h"
+#include "ruby.h"
VALUE rb_mComparable;
static ID cmp;
+int
+rb_cmpint(val, a, b)
+ VALUE val, a, b;
+{
+ if (NIL_P(val)) {
+ rb_cmperr(a, b);
+ }
+ if (FIXNUM_P(val)) return FIX2INT(val);
+ if (TYPE(val) == T_BIGNUM) {
+ if (RBIGNUM(val)->sign) return 1;
+ return -1;
+ }
+ if (RTEST(rb_funcall(val, '>', 1, INT2FIX(0)))) return 1;
+ if (RTEST(rb_funcall(val, '<', 1, INT2FIX(0)))) return -1;
+ return 0;
+}
+
void
-rb_cmperr(VALUE x, VALUE y)
+rb_cmperr(x, y)
+ VALUE x, y;
{
const char *classname;
@@ -31,33 +50,37 @@ rb_cmperr(VALUE x, VALUE y)
rb_obj_classname(x), classname);
}
+#define cmperr() (rb_cmperr(x, y), Qnil)
+
static VALUE
-cmp_eq(VALUE *a)
+cmp_eq(a)
+ VALUE *a;
{
VALUE c = rb_funcall(a[0], cmp, 1, a[1]);
- if (NIL_P(c)) return Qfalse;
+ if (NIL_P(c)) return Qnil;
if (rb_cmpint(c, a[0], a[1]) == 0) return Qtrue;
return Qfalse;
}
static VALUE
-cmp_failed(void)
+cmp_failed()
{
- return Qfalse;
+ return Qnil;
}
/*
* call-seq:
* obj == other => true or false
- *
+ *
* Compares two objects based on the receiver's <code><=></code>
* method, returning true if it returns 0. Also returns true if
* _obj_ and _other_ are the same object.
*/
static VALUE
-cmp_equal(VALUE x, VALUE y)
+cmp_equal(x, y)
+ VALUE x, y;
{
VALUE a[2];
@@ -70,16 +93,18 @@ cmp_equal(VALUE x, VALUE y)
/*
* call-seq:
* obj > other => true or false
- *
+ *
* Compares two objects based on the receiver's <code><=></code>
* method, returning true if it returns 1.
*/
static VALUE
-cmp_gt(VALUE x, VALUE y)
+cmp_gt(x, y)
+ VALUE x, y;
{
VALUE c = rb_funcall(x, cmp, 1, y);
+ if (NIL_P(c)) return cmperr();
if (rb_cmpint(c, x, y) > 0) return Qtrue;
return Qfalse;
}
@@ -87,16 +112,18 @@ cmp_gt(VALUE x, VALUE y)
/*
* call-seq:
* obj >= other => true or false
- *
+ *
* Compares two objects based on the receiver's <code><=></code>
* method, returning true if it returns 0 or 1.
*/
static VALUE
-cmp_ge(VALUE x, VALUE y)
+cmp_ge(x, y)
+ VALUE x, y;
{
VALUE c = rb_funcall(x, cmp, 1, y);
+ if (NIL_P(c)) return cmperr();
if (rb_cmpint(c, x, y) >= 0) return Qtrue;
return Qfalse;
}
@@ -104,33 +131,38 @@ cmp_ge(VALUE x, VALUE y)
/*
* call-seq:
* obj < other => true or false
- *
+ *
* Compares two objects based on the receiver's <code><=></code>
* method, returning true if it returns -1.
*/
static VALUE
-cmp_lt(VALUE x, VALUE y)
+cmp_lt(x, y)
+ VALUE x, y;
{
VALUE c = rb_funcall(x, cmp, 1, y);
+ if (NIL_P(c)) return cmperr();
if (rb_cmpint(c, x, y) < 0) return Qtrue;
return Qfalse;
}
+
/*
* call-seq:
* obj <= other => true or false
- *
+ *
* Compares two objects based on the receiver's <code><=></code>
* method, returning true if it returns -1 or 0.
*/
static VALUE
-cmp_le(VALUE x, VALUE y)
+cmp_le(x, y)
+ VALUE x, y;
{
VALUE c = rb_funcall(x, cmp, 1, y);
+ if (NIL_P(c)) return cmperr();
if (rb_cmpint(c, x, y) <= 0) return Qtrue;
return Qfalse;
}
@@ -138,20 +170,21 @@ cmp_le(VALUE x, VALUE y)
/*
* call-seq:
* obj.between?(min, max) => true or false
- *
+ *
* Returns <code>false</code> if <i>obj</i> <code><=></code>
* <i>min</i> is less than zero or if <i>anObject</i> <code><=></code>
* <i>max</i> is greater than zero, <code>true</code> otherwise.
- *
+ *
* 3.between?(1, 5) #=> true
* 6.between?(1, 5) #=> false
* 'cat'.between?('ant', 'dog') #=> true
* 'gnu'.between?('ant', 'dog') #=> false
- *
+ *
*/
static VALUE
-cmp_between(VALUE x, VALUE min, VALUE max)
+cmp_between(x, min, max)
+ VALUE x, min, max;
{
if (RTEST(cmp_lt(x, min))) return Qfalse;
if (RTEST(cmp_gt(x, max))) return Qfalse;
@@ -167,7 +200,7 @@ cmp_between(VALUE x, VALUE min, VALUE max)
* <code><=></code> to implement the conventional comparison operators
* (<code><</code>, <code><=</code>, <code>==</code>, <code>>=</code>,
* and <code>></code>) and the method <code>between?</code>.
- *
+ *
* class SizeMatters
* include Comparable
* attr :str
@@ -181,26 +214,23 @@ cmp_between(VALUE x, VALUE min, VALUE max)
* @str
* end
* end
- *
+ *
* s1 = SizeMatters.new("Z")
* s2 = SizeMatters.new("YY")
* s3 = SizeMatters.new("XXX")
* s4 = SizeMatters.new("WWWW")
* s5 = SizeMatters.new("VVVVV")
- *
+ *
* s1 < s2 #=> true
* s4.between?(s1, s3) #=> false
* s4.between?(s3, s5) #=> true
* [ s3, s2, s5, s4, s1 ].sort #=> [Z, YY, XXX, WWWW, VVVVV]
- *
+ *
*/
void
-Init_Comparable(void)
+Init_Comparable()
{
-#undef rb_intern
-#define rb_intern(str) rb_intern_const(str)
-
rb_mComparable = rb_define_module("Comparable");
rb_define_method(rb_mComparable, "==", cmp_equal, 1);
rb_define_method(rb_mComparable, ">", cmp_gt, 1);
diff --git a/compile.c b/compile.c
deleted file mode 100644
index d3c26671a6..0000000000
--- a/compile.c
+++ /dev/null
@@ -1,5435 +0,0 @@
-/**********************************************************************
-
- compile.c - ruby node tree -> VM instruction sequence
-
- $Author$
- created at: 04/01/01 03:42:15 JST
-
- Copyright (C) 2004-2007 Koichi Sasada
-
-**********************************************************************/
-
-#include "ruby/ruby.h"
-
-#define USE_INSN_STACK_INCREASE 1
-#define USE_INSN_ICLEN 1
-#include "vm_core.h"
-#include "iseq.h"
-#include "insns.inc"
-#include "insns_info.inc"
-
-#define numberof(array) (int)(sizeof(array) / sizeof((array)[0]))
-#define FIXNUM_INC(n, i) ((n)+(INT2FIX(i)&~FIXNUM_FLAG))
-#define FIXNUM_OR(n, i) ((n)|INT2FIX(i))
-
-typedef struct iseq_link_element {
- enum {
- ISEQ_ELEMENT_NONE = INT2FIX(0x00),
- ISEQ_ELEMENT_LABEL = INT2FIX(0x01),
- ISEQ_ELEMENT_INSN = INT2FIX(0x02),
- ISEQ_ELEMENT_ADJUST = INT2FIX(0x03)
- } type;
- struct iseq_link_element *next;
- struct iseq_link_element *prev;
-} LINK_ELEMENT;
-
-typedef struct iseq_link_anchor {
- LINK_ELEMENT anchor;
- LINK_ELEMENT *last;
-} LINK_ANCHOR;
-
-typedef struct iseq_label_data {
- LINK_ELEMENT link;
- int label_no;
- int position;
- int sc_state;
- int set;
- int sp;
-} LABEL;
-
-typedef struct iseq_insn_data {
- LINK_ELEMENT link;
- enum ruby_vminsn_type insn_id;
- long line_no;
- int operand_size;
- int sc_state;
- VALUE *operands;
-} INSN;
-
-typedef struct iseq_adjust_data {
- LINK_ELEMENT link;
- LABEL *label;
- long line_no;
-} ADJUST;
-
-struct ensure_range {
- LABEL *begin;
- LABEL *end;
- struct ensure_range *next;
-};
-
-struct iseq_compile_data_ensure_node_stack {
- NODE *ensure_node;
- struct iseq_compile_data_ensure_node_stack *prev;
- struct ensure_range *erange;
-};
-
-/**
- * debug function(macro) interface depend on CPDEBUG
- * if it is less than 0, runtime option is in effect.
- *
- * debug level:
- * 0: no debug output
- * 1: show node type
- * 2: show node important parameters
- * ...
- * 5: show other parameters
- * 10: show every AST array
- */
-
-#ifndef CPDEBUG
-#define CPDEBUG 0
-#endif
-
-#if CPDEBUG >= 0
-#define compile_debug CPDEBUG
-#else
-#define compile_debug iseq->compile_data->option->debug_level
-#endif
-
-NORETURN(PRINTF_ARGS(void rb_compile_bug(const char*, int, const char*, ...), 3, 4));
-
-#if CPDEBUG
-
-#define compile_debug_print_indent(level) \
- ruby_debug_print_indent(level, compile_debug, gl_node_level * 2)
-
-#define debugp(header, value) (void) \
- (compile_debug_print_indent(1) && \
- ruby_debug_print_value(1, compile_debug, header, value))
-
-#define debugi(header, id) (void) \
- (compile_debug_print_indent(1) && \
- ruby_debug_print_id(1, compile_debug, header, id))
-
-#define debugp_param(header, value) (void) \
- (compile_debug_print_indent(1) && \
- ruby_debug_print_value(1, compile_debug, header, value))
-
-#define debugp_verbose(header, value) (void) \
- (compile_debug_print_indent(2) && \
- ruby_debug_print_value(2, compile_debug, header, value))
-
-#define debugp_verbose_node(header, value) (void) \
- (compile_debug_print_indent(10) && \
- ruby_debug_print_value(10, compile_debug, header, value))
-
-#define debug_node_start(node) ((void) \
- (compile_debug_print_indent(1) && \
- (ruby_debug_print_node(1, CPDEBUG, "", (NODE *)node), gl_node_level)), \
- gl_node_level++)
-
-#define debug_node_end() gl_node_level --;
-
-#else
-
-static inline ID
-r_id(ID id)
-{
- return id;
-}
-
-static inline VALUE
-r_value(VALUE value)
-{
- return value;
-}
-
-#define debugi(header, id) r_id(id)
-#define debugp(header, value) r_value(value)
-#define debugp_verbose(header, value) r_value(value)
-#define debugp_verbose_node(header, value) r_value(value)
-#define debugp_param(header, value) r_value(value)
-#define debug_node_start(node) ((void)0)
-#define debug_node_end() ((void)0)
-#endif
-
-#if CPDEBUG > 1 || CPDEBUG < 0
-PRINTF_ARGS(void ruby_debug_printf(const char*, ...), 1, 2);
-#define debugs if (compile_debug_print_indent(1)) ruby_debug_printf
-#define debug_compile(msg, v) ((void)(compile_debug_print_indent(1) && fputs(msg, stderr)), (v))
-#else
-#define debugs if(0)printf
-#define debug_compile(msg, v) (v)
-#endif
-
-
-/* create new label */
-#define NEW_LABEL(l) new_label_body(iseq, l)
-
-#define iseq_filename(iseq) \
- (((rb_iseq_t*)DATA_PTR(iseq))->filename)
-
-#define NEW_ISEQVAL(node, name, type, line_no) \
- new_child_iseq(iseq, node, name, 0, type, line_no)
-
-#define NEW_CHILD_ISEQVAL(node, name, type, line_no) \
- new_child_iseq(iseq, node, name, iseq->self, type, line_no)
-
-/* add instructions */
-#define ADD_SEQ(seq1, seq2) \
- APPEND_LIST(seq1, seq2)
-
-/* add an instruction */
-#define ADD_INSN(seq, line, insn) \
- ADD_ELEM(seq, (LINK_ELEMENT *) new_insn_body(iseq, line, BIN(insn), 0))
-
-/* add an instruction with label operand */
-#define ADD_INSNL(seq, line, insn, label) \
- ADD_ELEM(seq, (LINK_ELEMENT *) \
- new_insn_body(iseq, line, BIN(insn), 1, (VALUE)label))
-
-/* add an instruction with some operands (1, 2, 3, 5) */
-#define ADD_INSN1(seq, line, insn, op1) \
- ADD_ELEM(seq, (LINK_ELEMENT *) \
- new_insn_body(iseq, line, BIN(insn), 1, (VALUE)op1))
-
-#define ADD_INSN2(seq, line, insn, op1, op2) \
- ADD_ELEM(seq, (LINK_ELEMENT *) \
- new_insn_body(iseq, line, BIN(insn), 2, (VALUE)op1, (VALUE)op2))
-
-#define ADD_INSN3(seq, line, insn, op1, op2, op3) \
- ADD_ELEM(seq, (LINK_ELEMENT *) \
- new_insn_body(iseq, line, BIN(insn), 3, (VALUE)op1, (VALUE)op2, (VALUE)op3))
-
-/* Specific Insn factory */
-#define ADD_SEND(seq, line, id, argc) \
- ADD_SEND_R(seq, line, id, argc, (VALUE)Qfalse, (VALUE)INT2FIX(0))
-
-#define ADD_CALL_RECEIVER(seq, line) \
- ADD_INSN(seq, line, putnil)
-
-#define ADD_CALL(seq, line, id, argc) \
- ADD_SEND_R(seq, line, id, argc, (VALUE)Qfalse, (VALUE)INT2FIX(VM_CALL_FCALL_BIT))
-
-#define ADD_CALL_WITH_BLOCK(seq, line, id, argc, block) \
- ADD_SEND_R(seq, line, id, argc, block, (VALUE)INT2FIX(VM_CALL_FCALL_BIT))
-
-#define ADD_SEND_R(seq, line, id, argc, block, flag) \
- ADD_ELEM(seq, (LINK_ELEMENT *) \
- new_insn_send(iseq, line, \
- (VALUE)id, (VALUE)argc, (VALUE)block, (VALUE)flag))
-
-#define ADD_TRACE(seq, line, event) \
- do { \
- if ((event) == RUBY_EVENT_LINE && iseq->coverage && \
- RARRAY_PTR(iseq->coverage)[(line) - 1] == Qnil) { \
- RARRAY_PTR(iseq->coverage)[(line) - 1] = INT2FIX(0); \
- ADD_INSN1(seq, line, trace, INT2FIX(RUBY_EVENT_COVERAGE)); \
- } \
- if (iseq->compile_data->option->trace_instruction) { \
- ADD_INSN1(seq, line, trace, INT2FIX(event)); \
- } \
- }while(0);
-
-/* add label */
-#define ADD_LABEL(seq, label) \
- ADD_ELEM(seq, (LINK_ELEMENT *) label)
-
-#define ADD_ADJUST(seq, line, label) \
- ADD_ELEM(seq, (LINK_ELEMENT *) new_adjust_body(iseq, label, line))
-
-#define ADD_ADJUST_RESTORE(seq, label) \
- ADD_ELEM(seq, (LINK_ELEMENT *) new_adjust_body(iseq, label, -1))
-
-#define ADD_CATCH_ENTRY(type, ls, le, iseqv, lc) \
- (rb_ary_push(iseq->compile_data->catch_table_ary, \
- rb_ary_new3(5, type, \
- (VALUE)(ls) | 1, (VALUE)(le) | 1, \
- iseqv, (VALUE)(lc) | 1)))
-
-/* compile node */
-#define COMPILE(anchor, desc, node) \
- (debug_compile("== " desc "\n", \
- iseq_compile_each(iseq, anchor, node, 0)))
-
-/* compile node, this node's value will be poped */
-#define COMPILE_POPED(anchor, desc, node) \
- (debug_compile("== " desc "\n", \
- iseq_compile_each(iseq, anchor, node, 1)))
-
-/* compile node, which is poped when 'poped' is true */
-#define COMPILE_(anchor, desc, node, poped) \
- (debug_compile("== " desc "\n", \
- iseq_compile_each(iseq, anchor, node, poped)))
-
-#define OPERAND_AT(insn, idx) \
- (((INSN*)(insn))->operands[idx])
-
-#define INSN_OF(insn) \
- (((INSN*)(insn))->insn_id)
-
-/* error */
-#define COMPILE_ERROR(strs) \
-{ \
- VALUE tmp = GET_THREAD()->errinfo; \
- if (compile_debug) rb_compile_bug strs; \
- GET_THREAD()->errinfo = iseq->compile_data->err_info; \
- rb_compile_error strs; \
- iseq->compile_data->err_info = GET_THREAD()->errinfo; \
- GET_THREAD()->errinfo = tmp; \
- ret = 0; \
- break; \
-}
-
-#define ERROR_ARGS ruby_sourcefile, nd_line(node),
-
-
-#define COMPILE_OK 1
-#define COMPILE_NG 0
-
-
-/* leave name uninitialized so that compiler warn if INIT_ANCHOR is
- * missing */
-#define DECL_ANCHOR(name) \
- LINK_ANCHOR *name, name##_body__ = {{0,},}
-#define INIT_ANCHOR(name) \
- (name##_body__.last = &name##_body__.anchor, name = &name##_body__)
-
-#define hide_obj(obj) do {OBJ_FREEZE(obj); RBASIC(obj)->klass = 0;} while (0)
-
-#include "optinsn.inc"
-#if OPT_INSTRUCTIONS_UNIFICATION
-#include "optunifs.inc"
-#endif
-
-/* for debug */
-#if CPDEBUG < 0
-#define ISEQ_ARG iseq,
-#define ISEQ_ARG_DECLARE rb_iseq_t *iseq,
-#else
-#define ISEQ_ARG
-#define ISEQ_ARG_DECLARE
-#endif
-
-#if CPDEBUG
-#define gl_node_level iseq->compile_data->node_level
-#if 0
-static void debug_list(ISEQ_ARG_DECLARE LINK_ANCHOR *anchor);
-#endif
-#endif
-
-static void dump_disasm_list(LINK_ELEMENT *elem);
-
-static int insn_data_length(INSN *iobj);
-static int insn_data_line_no(INSN *iobj);
-static int calc_sp_depth(int depth, INSN *iobj);
-
-static void ADD_ELEM(ISEQ_ARG_DECLARE LINK_ANCHOR *anchor, LINK_ELEMENT *elem);
-
-static INSN *new_insn_body(rb_iseq_t *iseq, long line_no, int insn_id, int argc, ...);
-static LABEL *new_label_body(rb_iseq_t *iseq, long line);
-static ADJUST *new_adjust_body(rb_iseq_t *iseq, LABEL *label, long line);
-
-static int iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *anchor, NODE * n, int);
-static int iseq_setup(rb_iseq_t *iseq, LINK_ANCHOR *anchor);
-static int iseq_optimize(rb_iseq_t *iseq, LINK_ANCHOR *anchor);
-static int iseq_insns_unification(rb_iseq_t *iseq, LINK_ANCHOR *anchor);
-
-static int iseq_set_local_table(rb_iseq_t *iseq, ID *tbl);
-static int iseq_set_exception_local_table(rb_iseq_t *iseq);
-static int iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *anchor, NODE * node);
-
-static int iseq_set_sequence_stackcaching(rb_iseq_t *iseq, LINK_ANCHOR *anchor);
-static int iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *anchor);
-static int iseq_set_exception_table(rb_iseq_t *iseq);
-static int iseq_set_optargs_table(rb_iseq_t *iseq);
-
-/*
- * To make Array to LinkedList, use link_anchor
- */
-
-static void
-verify_list(ISEQ_ARG_DECLARE const char *info, LINK_ANCHOR *anchor)
-{
-#if CPDEBUG
- int flag = 0;
- LINK_ELEMENT *list, *plist;
-
- if (!compile_debug) return;
-
- list = anchor->anchor.next;
- plist = &anchor->anchor;
- while (list) {
- if (plist != list->prev) {
- flag += 1;
- }
- plist = list;
- list = list->next;
- }
-
- if (anchor->last != plist && anchor->last != 0) {
- flag |= 0x70000;
- }
-
- if (flag != 0) {
- rb_bug("list verify error: %08x (%s)", flag, info);
- }
-#endif
-}
-#if CPDEBUG < 0
-#define verify_list(info, anchor) verify_list(iseq, info, anchor)
-#endif
-
-/*
- * elem1, elem2 => elem1, elem2, elem
- */
-static void
-ADD_ELEM(ISEQ_ARG_DECLARE LINK_ANCHOR *anchor, LINK_ELEMENT *elem)
-{
- elem->prev = anchor->last;
- anchor->last->next = elem;
- anchor->last = elem;
- verify_list("add", anchor);
-}
-#if CPDEBUG < 0
-#define ADD_ELEM(anchor, elem) ADD_ELEM(iseq, anchor, elem)
-#endif
-
-static int
-iseq_add_mark_object(rb_iseq_t *iseq, VALUE v)
-{
- if (!SPECIAL_CONST_P(v)) {
- rb_ary_push(iseq->mark_ary, v);
- }
- return COMPILE_OK;
-}
-
-#define ruby_sourcefile RSTRING_PTR(iseq->filename)
-
-static int
-iseq_add_mark_object_compile_time(rb_iseq_t *iseq, VALUE v)
-{
- if (!SPECIAL_CONST_P(v)) {
- rb_ary_push(iseq->compile_data->mark_ary, v);
- }
- return COMPILE_OK;
-}
-
-VALUE
-rb_iseq_compile_node(VALUE self, NODE *node)
-{
- DECL_ANCHOR(ret);
- rb_iseq_t *iseq;
- INIT_ANCHOR(ret);
- GetISeqPtr(self, iseq);
-
- if (node == 0) {
- COMPILE(ret, "nil", node);
- iseq_set_local_table(iseq, 0);
- }
- else if (nd_type(node) == NODE_SCOPE) {
- /* iseq type of top, method, class, block */
- iseq_set_local_table(iseq, node->nd_tbl);
- iseq_set_arguments(iseq, ret, node->nd_args);
-
- switch (iseq->type) {
- case ISEQ_TYPE_BLOCK: {
- LABEL *start = iseq->compile_data->start_label = NEW_LABEL(0);
- LABEL *end = iseq->compile_data->end_label = NEW_LABEL(0);
-
- ADD_LABEL(ret, start);
- COMPILE(ret, "block body", node->nd_body);
- ADD_LABEL(ret, end);
-
- /* wide range catch handler must put at last */
- ADD_CATCH_ENTRY(CATCH_TYPE_REDO, start, end, 0, start);
- ADD_CATCH_ENTRY(CATCH_TYPE_NEXT, start, end, 0, end);
- break;
- }
- case ISEQ_TYPE_CLASS: {
- ADD_TRACE(ret, FIX2INT(iseq->line_no), RUBY_EVENT_CLASS);
- COMPILE(ret, "scoped node", node->nd_body);
- ADD_TRACE(ret, nd_line(node), RUBY_EVENT_END);
- break;
- }
- case ISEQ_TYPE_METHOD: {
- ADD_TRACE(ret, FIX2INT(iseq->line_no), RUBY_EVENT_CALL);
- COMPILE(ret, "scoped node", node->nd_body);
- ADD_TRACE(ret, nd_line(node), RUBY_EVENT_RETURN);
- break;
- }
- default: {
- COMPILE(ret, "scoped node", node->nd_body);
- break;
- }
- }
- }
- else {
- switch (iseq->type) {
- case ISEQ_TYPE_METHOD:
- case ISEQ_TYPE_CLASS:
- case ISEQ_TYPE_BLOCK:
- case ISEQ_TYPE_EVAL:
- case ISEQ_TYPE_MAIN:
- case ISEQ_TYPE_TOP:
- rb_compile_error(ERROR_ARGS "compile/should not be reached: %s:%d",
- __FILE__, __LINE__);
- break;
- case ISEQ_TYPE_RESCUE:
- iseq_set_exception_local_table(iseq);
- COMPILE(ret, "rescue", node);
- break;
- case ISEQ_TYPE_ENSURE:
- iseq_set_exception_local_table(iseq);
- COMPILE_POPED(ret, "ensure", node);
- break;
- case ISEQ_TYPE_DEFINED_GUARD:
- iseq_set_local_table(iseq, 0);
- COMPILE(ret, "defined guard", node);
- break;
- default:
- rb_bug("unknown scope");
- }
- }
-
- if (iseq->type == ISEQ_TYPE_RESCUE || iseq->type == ISEQ_TYPE_ENSURE) {
- ADD_INSN2(ret, 0, getdynamic, INT2FIX(2), INT2FIX(0));
- ADD_INSN1(ret, 0, throw, INT2FIX(0) /* continue throw */ );
- }
- else {
- ADD_INSN(ret, iseq->compile_data->last_line, leave);
- }
-
- return iseq_setup(iseq, ret);
-}
-
-int
-rb_iseq_translate_threaded_code(rb_iseq_t *iseq)
-{
-#if OPT_DIRECT_THREADED_CODE || OPT_CALL_THREADED_CODE
- extern const void **rb_vm_get_insns_address_table(void);
-#if OPT_DIRECT_THREADED_CODE
- const void * const *table = rb_vm_get_insns_address_table();
-#else
- const void * const *table = rb_vm_get_insns_address_table();
-#endif
- unsigned long i;
-
- iseq->iseq_encoded = ALLOC_N(VALUE, iseq->iseq_size);
- MEMCPY(iseq->iseq_encoded, iseq->iseq, VALUE, iseq->iseq_size);
-
- for (i = 0; i < iseq->iseq_size; /* */ ) {
- int insn = (int)iseq->iseq_encoded[i];
- int len = insn_len(insn);
- iseq->iseq_encoded[i] = (VALUE)table[insn];
- i += len;
- }
-#else
- iseq->iseq_encoded = iseq->iseq;
-#endif
- return COMPILE_OK;
-}
-
-/*********************************************/
-/* definition of data structure for compiler */
-/*********************************************/
-
-static void *
-compile_data_alloc(rb_iseq_t *iseq, size_t size)
-{
- void *ptr = 0;
- struct iseq_compile_data_storage *storage =
- iseq->compile_data->storage_current;
-
- if (storage->pos + size > storage->size) {
- unsigned long alloc_size = storage->size * 2;
-
- retry:
- if (alloc_size < size) {
- alloc_size *= 2;
- goto retry;
- }
- storage->next = (void *)ALLOC_N(char, alloc_size +
- sizeof(struct
- iseq_compile_data_storage));
- storage = iseq->compile_data->storage_current = storage->next;
- storage->next = 0;
- storage->pos = 0;
- storage->size = alloc_size;
- storage->buff = (char *)(&storage->buff + 1);
- }
-
- ptr = (void *)&storage->buff[storage->pos];
- storage->pos += size;
- return ptr;
-}
-
-static INSN *
-compile_data_alloc_insn(rb_iseq_t *iseq)
-{
- return (INSN *)compile_data_alloc(iseq, sizeof(INSN));
-}
-
-static LABEL *
-compile_data_alloc_label(rb_iseq_t *iseq)
-{
- return (LABEL *)compile_data_alloc(iseq, sizeof(LABEL));
-}
-
-static ADJUST *
-compile_data_alloc_adjust(rb_iseq_t *iseq)
-{
- return (ADJUST *)compile_data_alloc(iseq, sizeof(ADJUST));
-}
-
-/*
- * elem1, elemX => elem1, elem2, elemX
- */
-static void
-INSERT_ELEM_NEXT(LINK_ELEMENT *elem1, LINK_ELEMENT *elem2)
-{
- elem2->next = elem1->next;
- elem2->prev = elem1;
- elem1->next = elem2;
- if (elem2->next) {
- elem2->next->prev = elem2;
- }
-}
-
-#if 0 /* unused */
-/*
- * elemX, elem1 => elemX, elem2, elem1
- */
-static void
-INSERT_ELEM_PREV(LINK_ELEMENT *elem1, LINK_ELEMENT *elem2)
-{
- elem2->prev = elem1->prev;
- elem2->next = elem1;
- elem1->prev = elem2;
- if (elem2->prev) {
- elem2->prev->next = elem2;
- }
-}
-#endif
-
-/*
- * elemX, elem1, elemY => elemX, elem2, elemY
- */
-static void
-REPLACE_ELEM(LINK_ELEMENT *elem1, LINK_ELEMENT *elem2)
-{
- elem2->prev = elem1->prev;
- elem2->next = elem1->next;
- if (elem1->prev) {
- elem1->prev->next = elem2;
- }
- if (elem1->next) {
- elem1->next->prev = elem2;
- }
-}
-
-static void
-REMOVE_ELEM(LINK_ELEMENT *elem)
-{
- elem->prev->next = elem->next;
- if (elem->next) {
- elem->next->prev = elem->prev;
- }
-}
-
-static LINK_ELEMENT *
-FIRST_ELEMENT(LINK_ANCHOR *anchor)
-{
- return anchor->anchor.next;
-}
-
-#if 0 /* unused */
-static LINK_ELEMENT *
-LAST_ELEMENT(LINK_ANCHOR *anchor)
-{
- return anchor->last;
-}
-#endif
-
-static LINK_ELEMENT *
-POP_ELEMENT(ISEQ_ARG_DECLARE LINK_ANCHOR *anchor)
-{
- LINK_ELEMENT *elem = anchor->last;
- anchor->last = anchor->last->prev;
- anchor->last->next = 0;
- verify_list("pop", anchor);
- return elem;
-}
-#if CPDEBUG < 0
-#define POP_ELEMENT(anchor) POP_ELEMENT(iseq, anchor)
-#endif
-
-#if 0 /* unused */
-static LINK_ELEMENT *
-SHIFT_ELEMENT(LINK_ANCHOR *anchor)
-{
- LINK_ELEMENT *elem = anchor->anchor.next;
- if (elem) {
- anchor->anchor.next = elem->next;
- }
- return elem;
-}
-#endif
-
-#if 0 /* unused */
-static int
-LIST_SIZE(LINK_ANCHOR *anchor)
-{
- LINK_ELEMENT *elem = anchor->anchor.next;
- int size = 0;
- while (elem) {
- size += 1;
- elem = elem->next;
- }
- return size;
-}
-#endif
-
-static int
-LIST_SIZE_ZERO(LINK_ANCHOR *anchor)
-{
- if (anchor->anchor.next == 0) {
- return 1;
- }
- else {
- return 0;
- }
-}
-
-/*
- * anc1: e1, e2, e3
- * anc2: e4, e5
- *#=>
- * anc1: e1, e2, e3, e4, e5
- * anc2: e4, e5 (broken)
- */
-static void
-APPEND_LIST(ISEQ_ARG_DECLARE LINK_ANCHOR *anc1, LINK_ANCHOR *anc2)
-{
- if (anc2->anchor.next) {
- anc1->last->next = anc2->anchor.next;
- anc2->anchor.next->prev = anc1->last;
- anc1->last = anc2->last;
- }
- verify_list("append", anc1);
-}
-#if CPDEBUG < 0
-#define APPEND_LIST(anc1, anc2) APPEND_LIST(iseq, anc1, anc2)
-#endif
-
-/*
- * anc1: e1, e2, e3
- * anc2: e4, e5
- *#=>
- * anc1: e4, e5, e1, e2, e3
- * anc2: e4, e5 (broken)
- */
-static void
-INSERT_LIST(ISEQ_ARG_DECLARE LINK_ANCHOR *anc1, LINK_ANCHOR *anc2)
-{
- if (anc2->anchor.next) {
- LINK_ELEMENT *first = anc1->anchor.next;
- anc1->anchor.next = anc2->anchor.next;
- anc1->anchor.next->prev = &anc1->anchor;
- anc2->last->next = first;
- if (first) {
- first->prev = anc2->last;
- }
- else {
- anc1->last = anc2->last;
- }
- }
-
- verify_list("append", anc1);
-}
-#if CPDEBUG < 0
-#define INSERT_LIST(anc1, anc2) INSERT_LIST(iseq, anc1, anc2)
-#endif
-
-#if 0 /* unused */
-/*
- * anc1: e1, e2, e3
- * anc2: e4, e5
- *#=>
- * anc1: e4, e5
- * anc2: e1, e2, e3
- */
-static void
-SWAP_LIST(ISEQ_ARG_DECLARE LINK_ANCHOR *anc1, LINK_ANCHOR *anc2)
-{
- LINK_ANCHOR tmp = *anc2;
-
- /* it has bug */
- *anc2 = *anc1;
- *anc1 = tmp;
-
- verify_list("swap1", anc1);
- verify_list("swap2", anc2);
-}
-#if CPDEBUG < 0
-#define SWAP_LIST(anc1, anc2) SWAP_LIST(iseq, anc1, anc2)
-#endif
-
-static LINK_ANCHOR *
-REVERSE_LIST(ISEQ_ARG_DECLARE LINK_ANCHOR *anc)
-{
- LINK_ELEMENT *first, *last, *elem, *e;
- first = &anc->anchor;
- elem = first->next;
- last = anc->last;
-
- if (elem != 0) {
- anc->anchor.next = last;
- anc->last = elem;
- }
- else {
- /* null list */
- return anc;
- }
- while (elem) {
- e = elem->next;
- elem->next = elem->prev;
- elem->prev = e;
- elem = e;
- }
-
- first->next = last;
- last->prev = first;
- anc->last->next = 0;
-
- verify_list("reverse", anc);
- return anc;
-}
-#if CPDEBUG < 0
-#define REVERSE_LIST(anc) REVERSE_LIST(iseq, anc)
-#endif
-#endif
-
-#if CPDEBUG && 0
-static void
-debug_list(ISEQ_ARG_DECLARE LINK_ANCHOR *anchor)
-{
- LINK_ELEMENT *list = FIRST_ELEMENT(anchor);
- printf("----\n");
- printf("anch: %p, frst: %p, last: %p\n", &anchor->anchor,
- anchor->anchor.next, anchor->last);
- while (list) {
- printf("curr: %p, next: %p, prev: %p, type: %d\n", list, list->next,
- list->prev, FIX2INT(list->type));
- list = list->next;
- }
- printf("----\n");
-
- dump_disasm_list(anchor->anchor.next);
- verify_list("debug list", anchor);
-}
-#if CPDEBUG < 0
-#define debug_list(anc) debug_list(iseq, anc)
-#endif
-#endif
-
-static LABEL *
-new_label_body(rb_iseq_t *iseq, long line)
-{
- LABEL *labelobj = compile_data_alloc_label(iseq);
-
- labelobj->link.type = ISEQ_ELEMENT_LABEL;
- labelobj->link.next = 0;
-
- labelobj->label_no = iseq->compile_data->label_no++;
- labelobj->sc_state = 0;
- labelobj->sp = -1;
- return labelobj;
-}
-
-static ADJUST *
-new_adjust_body(rb_iseq_t *iseq, LABEL *label, long line)
-{
- ADJUST *adjust = compile_data_alloc_adjust(iseq);
- adjust->link.type = ISEQ_ELEMENT_ADJUST;
- adjust->link.next = 0;
- adjust->label = label;
- adjust->line_no = line;
- return adjust;
-}
-
-static INSN *
-new_insn_core(rb_iseq_t *iseq, long line_no,
- int insn_id, int argc, VALUE *argv)
-{
- INSN *iobj = compile_data_alloc_insn(iseq);
-
- iobj->link.type = ISEQ_ELEMENT_INSN;
- iobj->link.next = 0;
- iobj->insn_id = insn_id;
- iobj->line_no = line_no;
- iobj->operands = argv;
- iobj->operand_size = argc;
- iobj->sc_state = 0;
- return iobj;
-}
-
-static INSN *
-new_insn_body(rb_iseq_t *iseq, long line_no, int insn_id, int argc, ...)
-{
- VALUE *operands = 0;
- va_list argv;
- if (argc > 0) {
- int i;
- va_init_list(argv, argc);
- operands = (VALUE *)compile_data_alloc(iseq, sizeof(VALUE) * argc);
- for (i = 0; i < argc; i++) {
- VALUE v = va_arg(argv, VALUE);
- operands[i] = v;
- }
- va_end(argv);
- }
- return new_insn_core(iseq, line_no, insn_id, argc, operands);
-}
-
-static INSN *
-new_insn_send(rb_iseq_t *iseq, int line_no,
- VALUE id, VALUE argc, VALUE block, VALUE flag)
-{
- INSN *iobj = 0;
- VALUE *operands =
- (VALUE *)compile_data_alloc(iseq, sizeof(VALUE) * 4);
- operands[0] = id;
- operands[1] = argc;
- operands[2] = block;
- operands[3] = flag;
- iobj = new_insn_core(iseq, line_no, BIN(send), 4, operands);
- return iobj;
-}
-
-static VALUE
-new_child_iseq(rb_iseq_t *iseq, NODE *node,
- VALUE name, VALUE parent, VALUE type, int line_no)
-{
- VALUE ret;
-
- debugs("[new_child_iseq]> ---------------------------------------\n");
- ret = rb_iseq_new_with_opt(node, name, iseq_filename(iseq->self), INT2FIX(line_no),
- parent, type, iseq->compile_data->option);
- debugs("[new_child_iseq]< ---------------------------------------\n");
- iseq_add_mark_object(iseq, ret);
- return ret;
-}
-
-static int
-iseq_setup(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
-{
- /* debugs("[compile step 2] (iseq_array_to_linkedlist)\n"); */
-
- if (compile_debug > 5)
- dump_disasm_list(FIRST_ELEMENT(anchor));
-
- debugs("[compile step 3.1 (iseq_optimize)]\n");
- iseq_optimize(iseq, anchor);
-
- if (compile_debug > 5)
- dump_disasm_list(FIRST_ELEMENT(anchor));
-
- if (iseq->compile_data->option->instructions_unification) {
- debugs("[compile step 3.2 (iseq_insns_unification)]\n");
- iseq_insns_unification(iseq, anchor);
- if (compile_debug > 5)
- dump_disasm_list(FIRST_ELEMENT(anchor));
- }
-
- if (iseq->compile_data->option->stack_caching) {
- debugs("[compile step 3.3 (iseq_set_sequence_stackcaching)]\n");
- iseq_set_sequence_stackcaching(iseq, anchor);
- if (compile_debug > 5)
- dump_disasm_list(FIRST_ELEMENT(anchor));
- }
-
- debugs("[compile step 4.1 (iseq_set_sequence)]\n");
- iseq_set_sequence(iseq, anchor);
- if (compile_debug > 5)
- dump_disasm_list(FIRST_ELEMENT(anchor));
-
- debugs("[compile step 4.2 (iseq_set_exception_table)]\n");
- iseq_set_exception_table(iseq);
-
- debugs("[compile step 4.3 (set_optargs_table)] \n");
- iseq_set_optargs_table(iseq);
-
- debugs("[compile step 5 (iseq_translate_threaded_code)] \n");
- rb_iseq_translate_threaded_code(iseq);
-
- if (compile_debug > 1) {
- VALUE str = rb_iseq_disasm(iseq->self);
- printf("%s\n", StringValueCStr(str));
- fflush(stdout);
- }
- debugs("[compile step: finish]\n");
-
- return 0;
-}
-
-static int
-iseq_set_exception_local_table(rb_iseq_t *iseq)
-{
- ID id_dollar_bang;
-
- CONST_ID(id_dollar_bang, "#$!");
- iseq->local_table = (ID *)ALLOC_N(ID *, 1);
- iseq->local_table_size = 1;
- iseq->local_size = iseq->local_table_size + 1;
- iseq->local_table[0] = id_dollar_bang;
- return COMPILE_OK;
-}
-
-static int
-get_dyna_var_idx_at_raw(rb_iseq_t *iseq, ID id)
-{
- int i;
-
- for (i = 0; i < iseq->local_table_size; i++) {
- if (iseq->local_table[i] == id) {
- return i;
- }
- }
- return -1;
-}
-
-static int
-get_local_var_idx(rb_iseq_t *iseq, ID id)
-{
- int idx = get_dyna_var_idx_at_raw(iseq->local_iseq, id);
-
- if (idx < 0) {
- rb_bug("get_local_var_idx: %d", idx);
- }
-
- return idx;
-}
-
-static int
-get_dyna_var_idx(rb_iseq_t *iseq, ID id, int *level, int *ls)
-{
- int lv = 0, idx = -1;
-
- while (iseq) {
- idx = get_dyna_var_idx_at_raw(iseq, id);
- if (idx >= 0) {
- break;
- }
- iseq = iseq->parent_iseq;
- lv++;
- }
-
- if (idx < 0) {
- rb_bug("get_dyna_var_idx: -1");
- }
-
- *level = lv;
- *ls = iseq->local_size;
- return idx;
-}
-
-static int
-iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *optargs, NODE *node_args)
-{
- debugs("iseq_set_arguments: %s\n", node_args ? "" : "0");
-
- if (node_args) {
- NODE *node_aux = node_args->nd_next;
- NODE *node_opt = node_args->nd_opt;
- ID rest_id = 0;
- int last_comma = 0;
- ID block_id = 0;
- NODE *node_init = 0;
-
- if (nd_type(node_args) != NODE_ARGS) {
- rb_bug("iseq_set_arguments: NODE_ARGS is expected, but %s",
- ruby_node_name(nd_type(node_args)));
- }
-
- /*
- * new argument infromation:
- * NODE_ARGS [m: int, o: NODE_OPT_ARG, ->]
- * NODE_ARGS_AUX [r: ID, b: ID, ->]
- * NODE_ARGS_AUX [Pst: id, Plen: int, init: NODE*]
- * optarg information:
- * NODE_OPT_ARGS [idx, expr, next ->]
- * init arg:
- * NODE_AND(m_init, p_init)
- * if "r" is 1, it's means "{|x,|}" type block parameter.
- */
-
- iseq->argc = (int)node_args->nd_frml;
- debugs(" - argc: %d\n", iseq->argc);
-
- if (node_aux) {
- rest_id = node_aux->nd_rest;
- if (rest_id == 1) {
- last_comma = 1;
- rest_id = 0;
- }
- block_id = (ID)node_aux->nd_body;
- node_aux = node_aux->nd_next;
-
- if (node_aux) {
- ID post_start_id = node_aux->nd_pid;
- iseq->arg_post_start = get_dyna_var_idx_at_raw(iseq, post_start_id);
- iseq->arg_post_len = (int)node_aux->nd_plen;
- node_init = node_aux->nd_next;
- }
- }
-
- if (node_opt) {
- NODE *node = node_opt;
- LABEL *label;
- VALUE labels = rb_ary_tmp_new(1);
- int i = 0, j;
-
- while (node) {
- label = NEW_LABEL(nd_line(node));
- rb_ary_push(labels, (VALUE)label | 1);
- ADD_LABEL(optargs, label);
- COMPILE_POPED(optargs, "optarg", node->nd_body);
- node = node->nd_next;
- i += 1;
- }
-
- /* last label */
- label = NEW_LABEL(nd_line(node_args));
- rb_ary_push(labels, (VALUE)label | 1);
- ADD_LABEL(optargs, label);
- i += 1;
-
- iseq->arg_opts = i;
- iseq->arg_opt_table = ALLOC_N(VALUE, i);
- MEMCPY(iseq->arg_opt_table, RARRAY_PTR(labels), VALUE, i);
- for (j = 0; j < i; j++) {
- iseq->arg_opt_table[j] &= ~1;
- }
- rb_ary_clear(labels);
- }
- else {
- iseq->arg_opts = 0;
- }
-
- if (node_init) {
- if (node_init->nd_1st) { /* m_init */
- COMPILE_POPED(optargs, "init arguments (m)", node_init->nd_1st);
- }
- if (node_init->nd_2nd) { /* p_init */
- COMPILE_POPED(optargs, "init arguments (p)", node_init->nd_2nd);
- }
- }
-
- if (rest_id) {
- iseq->arg_rest = get_dyna_var_idx_at_raw(iseq, rest_id);
-
- if (iseq->arg_rest == -1) {
- rb_bug("arg_rest: -1");
- }
-
- if (iseq->arg_post_start == 0) {
- iseq->arg_post_start = iseq->arg_rest + 1;
- }
- }
-
- if (block_id) {
- iseq->arg_block = get_dyna_var_idx_at_raw(iseq, block_id);
- }
-
- if (iseq->arg_opts != 0 || iseq->arg_post_len != 0 ||
- iseq->arg_rest != -1 || iseq->arg_block != -1) {
- iseq->arg_simple = 0;
-
- /* set arg_size: size of arguments */
- if (iseq->arg_block != -1) {
- iseq->arg_size = iseq->arg_block + 1;
- }
- else if (iseq->arg_post_len) {
- iseq->arg_size = iseq->arg_post_start + iseq->arg_post_len;
- }
- else if (iseq->arg_rest != -1) {
- iseq->arg_size = iseq->arg_rest + 1;
- }
- else if (iseq->arg_opts) {
- iseq->arg_size = iseq->argc + iseq->arg_opts - 1;
- }
- else {
- iseq->arg_size = iseq->argc;
- }
- }
- else {
- iseq->arg_simple = 1;
- iseq->arg_size = iseq->argc;
- }
-
- if (iseq->type == ISEQ_TYPE_BLOCK) {
- if (iseq->arg_opts == 0 && iseq->arg_post_len == 0 && iseq->arg_rest == -1) {
- if (iseq->argc == 1 && last_comma == 0) {
- /* {|a|} */
- iseq->arg_simple |= 0x02;
- }
- }
- }
- }
- else {
- iseq->arg_simple = 1;
- }
-
- return COMPILE_OK;
-}
-
-static int
-iseq_set_local_table(rb_iseq_t *iseq, ID *tbl)
-{
- int size;
-
- if (tbl) {
- size = (int)*tbl;
- tbl++;
- }
- else {
- size = 0;
- }
-
- if (size > 0) {
- iseq->local_table = (ID *)ALLOC_N(ID *, size);
- MEMCPY(iseq->local_table, tbl, ID *, size);
- }
-
- iseq->local_size = iseq->local_table_size = size;
- iseq->local_size += 1;
- /*
- if (lfp == dfp ) { // top, class, method
- dfp[-1]: svar
- else { // block
- dfp[-1]: cref
- }
- */
-
- debugs("iseq_set_local_table: %d, %d\n", iseq->local_size, iseq->local_table_size);
- return COMPILE_OK;
-}
-
-static int
-cdhash_cmp(VALUE val, VALUE lit)
-{
- if (val == lit) return 0;
- if (SPECIAL_CONST_P(lit)) {
- return val != lit;
- }
- if (SPECIAL_CONST_P(val) || BUILTIN_TYPE(val) != BUILTIN_TYPE(lit)) {
- return -1;
- }
- if (BUILTIN_TYPE(lit) == T_STRING) {
- return rb_str_hash_cmp(lit, val);
- }
- return !rb_eql(lit, val);
-}
-
-static int
-cdhash_hash(VALUE a)
-{
- if (SPECIAL_CONST_P(a)) return (int)a;
- if (TYPE(a) == T_STRING) return rb_str_hash(a);
- {
- VALUE hval = rb_hash(a);
- return (int)FIX2LONG(hval);
- }
-}
-
-static const struct st_hash_type cdhash_type = {
- cdhash_cmp,
- cdhash_hash,
-};
-
-/**
- ruby insn object array -> raw instruction sequence
- */
-static int
-iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
-{
- LABEL *lobj;
- INSN *iobj;
- struct iseq_insn_info_entry *insn_info_table;
- LINK_ELEMENT *list;
- VALUE *generated_iseq;
- int ic_size = 0;
- int ic_index = 0;
-
- int k, pos, sp, stack_max = 0, line = 0;
-
- /* set label position */
- list = FIRST_ELEMENT(anchor);
- k = pos = 0;
- while (list) {
- switch (list->type) {
- case ISEQ_ELEMENT_INSN:
- {
- iobj = (INSN *)list;
- line = iobj->line_no;
- pos += insn_data_length(iobj);
- ic_size += insn_iclen(iobj->insn_id);
- k++;
- break;
- }
- case ISEQ_ELEMENT_LABEL:
- {
- lobj = (LABEL *)list;
- lobj->position = pos;
- lobj->set = Qtrue;
- break;
- }
- case ISEQ_ELEMENT_NONE:
- {
- /* ignore */
- break;
- }
- case ISEQ_ELEMENT_ADJUST:
- {
- ADJUST *adjust = (ADJUST *)list;
- if (adjust->line_no != -1) {
- pos += 2 /* insn + 1 operand */;
- k++;
- }
- break;
- }
- default:
- dump_disasm_list(FIRST_ELEMENT(anchor));
- dump_disasm_list(list);
- rb_compile_error(RSTRING_PTR(iseq->filename), line,
- "error: set_sequence");
- break;
- }
- list = list->next;
- }
-
- /* make instruction sequence */
- generated_iseq = ALLOC_N(VALUE, pos);
- insn_info_table = ALLOC_N(struct iseq_insn_info_entry, k);
- iseq->ic_entries = ALLOC_N(struct iseq_inline_cache_entry, ic_size);
- MEMZERO(iseq->ic_entries, struct iseq_inline_cache_entry, ic_size);
- iseq->ic_size = ic_size;
-
- list = FIRST_ELEMENT(anchor);
- k = pos = sp = 0;
-
- while (list) {
- switch (list->type) {
- case ISEQ_ELEMENT_INSN:
- {
- int j, len, insn, iclen = 0;
- const char *types;
- VALUE *operands;
-
- iobj = (INSN *)list;
-
- /* update sp */
- sp = calc_sp_depth(sp, iobj);
- if (sp > stack_max) {
- stack_max = sp;
- }
-
- /* fprintf(stderr, "insn: %-16s, sp: %d\n", insn_name(iobj->insn_id), sp); */
-
- operands = iobj->operands;
- insn = iobj->insn_id;
- generated_iseq[pos] = insn;
- types = insn_op_types(insn);
- len = insn_len(insn);
- iclen = insn_iclen(insn);
-
- /* operand check */
- if (iobj->operand_size + iclen != len - 1) {
- printf("%d, %d, %d\n", iobj->operand_size, iclen, len);
- dump_disasm_list(list);
- rb_compile_error(RSTRING_PTR(iseq->filename), iobj->line_no,
- "operand size miss! (%d for %d)",
- iobj->operand_size + iclen, len - 1);
- xfree(generated_iseq);
- xfree(insn_info_table);
- return 0;
- }
-
- for (j = 0; types[j]; j++) {
- char type = types[j];
- /* printf("--> [%c - (%d-%d)]\n", type, k, j); */
- switch (type) {
- case TS_OFFSET:
- {
- /* label(destination position) */
- lobj = (LABEL *)operands[j];
- if (lobj->set != Qtrue) {
- rb_compile_error(RSTRING_PTR(iseq->filename), iobj->line_no,
- "unknown label");
- }
- if (lobj->sp == -1) {
- lobj->sp = sp;
- }
- generated_iseq[pos + 1 + j] =
- lobj->position - (pos + len);
- break;
- }
- case TS_CDHASH:
- {
- /*
- * [obj, label, ...]
- */
- int i;
- VALUE lits = operands[j];
- VALUE map = rb_hash_new();
- RHASH_TBL(map)->type = &cdhash_type;
-
- for (i=0; i < RARRAY_LEN(lits); i+=2) {
- VALUE obj = rb_ary_entry(lits, i);
- VALUE lv = rb_ary_entry(lits, i+1);
- lobj = (LABEL *)(lv & ~1);
-
- if (lobj->set != Qtrue) {
- rb_compile_error(RSTRING_PTR(iseq->filename), iobj->line_no,
- "unknown label");
- }
- if (!st_lookup(rb_hash_tbl(map), obj, 0)) {
- rb_hash_aset(map, obj, INT2FIX(lobj->position - (pos+len)));
- }
- else {
- rb_compile_warning(RSTRING_PTR(iseq->filename), iobj->line_no,
- "duplicated when clause is ignored");
- }
- }
- hide_obj(map);
- generated_iseq[pos + 1 + j] = map;
- iseq_add_mark_object(iseq, map);
- break;
- }
- case TS_LINDEX:
- case TS_DINDEX:
- case TS_NUM: /* ulong */
- generated_iseq[pos + 1 + j] = FIX2INT(operands[j]);
- break;
- case TS_ISEQ: /* iseq */
- {
- VALUE v = operands[j];
- rb_iseq_t *block = 0;
- if (v) {
- GetISeqPtr(v, block);
- }
- generated_iseq[pos + 1 + j] = (VALUE)block;
- break;
- }
- case TS_VALUE: /* VALUE */
- {
- VALUE v = operands[j];
- generated_iseq[pos + 1 + j] = v;
- /* to mark ruby object */
- iseq_add_mark_object(iseq, v);
- break;
- }
- case TS_IC: /* inline cache */
- {
- IC ic = &iseq->ic_entries[ic_index++];
- if (UNLIKELY(ic_index > ic_size)) {
- rb_bug("iseq_set_sequence: ic_index overflow: index: %d, size: %d",
- ic_index, ic_size);
- }
- generated_iseq[pos + 1 + j] = (VALUE)ic;
- break;
- }
- case TS_ID: /* ID */
- generated_iseq[pos + 1 + j] = SYM2ID(operands[j]);
- break;
- case TS_GENTRY:
- {
- struct rb_global_entry *entry =
- (struct rb_global_entry *)(operands[j] & (~1));
- generated_iseq[pos + 1 + j] = (VALUE)entry;
- }
- break;
- default:
- rb_compile_error(RSTRING_PTR(iseq->filename), iobj->line_no,
- "unknown operand type: %c", type);
- xfree(generated_iseq);
- xfree(insn_info_table);
- return 0;
- }
- }
- insn_info_table[k].line_no = iobj->line_no;
- insn_info_table[k].position = pos;
- insn_info_table[k].sp = sp;
- pos += len;
- k++;
- break;
- }
- case ISEQ_ELEMENT_LABEL:
- {
- lobj = (LABEL *)list;
- if (lobj->sp == -1) {
- lobj->sp = sp;
- }
- else {
- sp = lobj->sp;
- }
- break;
- }
- case ISEQ_ELEMENT_ADJUST:
- {
- ADJUST *adjust = (ADJUST *)list;
- int orig_sp = sp;
-
- if (adjust->label) {
- sp = adjust->label->sp;
- }
- else {
- sp = 0;
- }
-
- if (adjust->line_no != -1) {
- if (orig_sp - sp > 0) {
- insn_info_table[k].line_no = adjust->line_no;
- insn_info_table[k].position = pos;
- insn_info_table[k].sp = sp;
- k++;
- generated_iseq[pos++] = BIN(adjuststack);
- generated_iseq[pos++] = orig_sp - sp;
- }
- else if (orig_sp - sp == 0) {
- /* jump to next insn */
- insn_info_table[k].line_no = adjust->line_no;
- insn_info_table[k].position = pos;
- insn_info_table[k].sp = sp;
- k++;
- generated_iseq[pos++] = BIN(jump);
- generated_iseq[pos++] = 0;
- }
- else {
- rb_bug("iseq_set_sequence: adjust bug");
- }
- }
- break;
- }
- default:
- /* ignore */
- break;
- }
- list = list->next;
- }
-
-#if 0 /* XXX */
- /* this check need dead code elimination */
- if (sp != 1) {
- rb_bug("SP is not 0 on %s (%d)\n", RSTRING_PTR(iseq->name), sp);
- }
-#endif
-
- iseq->iseq = (void *)generated_iseq;
- iseq->iseq_size = pos;
- iseq->insn_info_table = insn_info_table;
- iseq->insn_info_size = k;
- iseq->stack_max = stack_max;
-
- return COMPILE_OK;
-}
-
-static int
-label_get_position(LABEL *lobj)
-{
- return lobj->position;
-}
-
-static int
-label_get_sp(LABEL *lobj)
-{
- return lobj->sp;
-}
-
-static int
-iseq_set_exception_table(rb_iseq_t *iseq)
-{
- VALUE *tptr, *ptr;
- int tlen, i;
- struct iseq_catch_table_entry *entry;
-
- tlen = (int)RARRAY_LEN(iseq->compile_data->catch_table_ary);
- tptr = RARRAY_PTR(iseq->compile_data->catch_table_ary);
-
- iseq->catch_table = tlen ? ALLOC_N(struct iseq_catch_table_entry, tlen) : 0;
- iseq->catch_table_size = tlen;
-
- for (i = 0; i < tlen; i++) {
- ptr = RARRAY_PTR(tptr[i]);
- entry = &iseq->catch_table[i];
- entry->type = ptr[0] & 0xffff;
- entry->start = label_get_position((LABEL *)(ptr[1] & ~1));
- entry->end = label_get_position((LABEL *)(ptr[2] & ~1));
- entry->iseq = ptr[3];
-
- /* register iseq as mark object */
- if (entry->iseq != 0) {
- iseq_add_mark_object(iseq, entry->iseq);
- }
-
- /* stack depth */
- if (ptr[4]) {
- LABEL *lobj = (LABEL *)(ptr[4] & ~1);
- entry->cont = label_get_position(lobj);
- entry->sp = label_get_sp(lobj);
-
- /* TODO: Dirty Hack! Fix me */
- if (entry->type == CATCH_TYPE_RESCUE ||
- entry->type == CATCH_TYPE_BREAK ||
- entry->type == CATCH_TYPE_NEXT) {
- entry->sp--;
- }
- }
- else {
- entry->cont = 0;
- }
- }
-
- iseq->compile_data->catch_table_ary = 0; /* free */
- return COMPILE_OK;
-}
-
-/*
- * set optional argument table
- * def foo(a, b=expr1, c=expr2)
- * =>
- * b:
- * expr1
- * c:
- * expr2
- */
-static int
-iseq_set_optargs_table(rb_iseq_t *iseq)
-{
- int i;
-
- if (iseq->arg_opts != 0) {
- for (i = 0; i < iseq->arg_opts; i++) {
- iseq->arg_opt_table[i] =
- label_get_position((LABEL *)iseq->arg_opt_table[i]);
- }
- }
- return COMPILE_OK;
-}
-
-static LINK_ELEMENT *
-get_destination_insn(INSN *iobj)
-{
- LABEL *lobj = (LABEL *)OPERAND_AT(iobj, 0);
- LINK_ELEMENT *list;
-
- list = lobj->link.next;
- while (list) {
- if (list->type == ISEQ_ELEMENT_INSN || list->type == ISEQ_ELEMENT_ADJUST) {
- break;
- }
- list = list->next;
- }
- return list;
-}
-
-static LINK_ELEMENT *
-get_next_insn(INSN *iobj)
-{
- LINK_ELEMENT *list = iobj->link.next;
-
- while (list) {
- if (list->type == ISEQ_ELEMENT_INSN || list->type == ISEQ_ELEMENT_ADJUST) {
- return list;
- }
- list = list->next;
- }
- return 0;
-}
-
-static LINK_ELEMENT *
-get_prev_insn(INSN *iobj)
-{
- LINK_ELEMENT *list = iobj->link.prev;
-
- while (list) {
- if (list->type == ISEQ_ELEMENT_INSN || list->type == ISEQ_ELEMENT_ADJUST) {
- return list;
- }
- list = list->prev;
- }
- return 0;
-}
-
-static int
-iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcallopt)
-{
- INSN *iobj = (INSN *)list;
- again:
- if (iobj->insn_id == BIN(jump)) {
- INSN *niobj, *diobj, *piobj;
- /*
- * useless jump elimination:
- * jump LABEL1
- * ...
- * LABEL1:
- * jump LABEL2
- *
- * => in this case, first jump instruction should jump to
- * LABEL2 directly
- */
- diobj = (INSN *)get_destination_insn(iobj);
- niobj = (INSN *)get_next_insn(iobj);
-
- if (diobj == niobj) {
- /*
- * jump LABEL
- * LABEL:
- * =>
- * LABEL:
- */
- REMOVE_ELEM(&iobj->link);
- }
- else if (iobj != diobj && diobj->insn_id == BIN(jump)) {
- if (OPERAND_AT(iobj, 0) != OPERAND_AT(diobj, 0)) {
- OPERAND_AT(iobj, 0) = OPERAND_AT(diobj, 0);
- goto again;
- }
- }
- else if (diobj->insn_id == BIN(leave)) {
- /*
- * jump LABEL
- * ...
- * LABEL:
- * leave
- * =>
- * leave
- * ...
- * LABEL:
- * leave
- */
- INSN *eiobj = new_insn_core(iseq, iobj->line_no, BIN(leave),
- diobj->operand_size, diobj->operands);
- INSN *popiobj = new_insn_core(iseq, iobj->line_no,
- BIN(pop), 0, 0);
- /* replace */
- REPLACE_ELEM((LINK_ELEMENT *)iobj, (LINK_ELEMENT *)eiobj);
- INSERT_ELEM_NEXT((LINK_ELEMENT *)eiobj, (LINK_ELEMENT *)popiobj);
- iobj = popiobj;
- }
- /*
- * useless jump elimination (if/unless destination):
- * if L1
- * jump L2
- * L1:
- * ...
- * L2:
- *
- * ==>
- * unless L2
- * L1:
- * ...
- * L2:
- */
- else if ((piobj = (INSN *)get_prev_insn(iobj)) != 0 &&
- (piobj->insn_id == BIN(branchif) ||
- piobj->insn_id == BIN(branchunless))) {
- if (niobj == (INSN *)get_destination_insn(piobj)) {
- piobj->insn_id = (piobj->insn_id == BIN(branchif))
- ? BIN(branchunless) : BIN(branchif);
- OPERAND_AT(piobj, 0) = OPERAND_AT(iobj, 0);
- REMOVE_ELEM(&iobj->link);
- }
- }
- }
-
- if (iobj->insn_id == BIN(branchif) ||
- iobj->insn_id == BIN(branchunless)) {
- /*
- * if L1
- * ...
- * L1:
- * jump L2
- * =>
- * if L2
- */
- INSN *nobj = (INSN *)get_destination_insn(iobj);
- if (nobj->insn_id == BIN(jump)) {
- OPERAND_AT(iobj, 0) = OPERAND_AT(nobj, 0);
- }
- }
-
- if (do_tailcallopt && iobj->insn_id == BIN(leave)) {
- /*
- * send ...
- * leave
- * =>
- * send ..., ... | VM_CALL_TAILCALL_BIT, ...
- * leave # unreachable
- */
- INSN *piobj = (INSN *)get_prev_insn((INSN *)list);
-
- if (piobj->insn_id == BIN(send) &&
- piobj->operands[2] == 0 /* block */
- ) {
- piobj->operands[3] = FIXNUM_OR(piobj->operands[3], VM_CALL_TAILCALL_BIT);
- }
- }
- return COMPILE_OK;
-}
-
-static int
-insn_set_specialized_instruction(INSN *iobj, int insn_id)
-{
- iobj->insn_id = insn_id;
- iobj->operand_size = 0;
- return COMPILE_OK;
-}
-
-static int
-iseq_specialized_instruction(rb_iseq_t *iseq, INSN *iobj)
-{
- if (iobj->insn_id == BIN(send)) {
- ID mid = SYM2ID(OPERAND_AT(iobj, 0));
- int argc = FIX2INT(OPERAND_AT(iobj, 1));
- VALUE block = OPERAND_AT(iobj, 2);
- VALUE flag = OPERAND_AT(iobj, 3);
-
- /* TODO: should be more sophisticated search */
- if (block == 0 && flag == INT2FIX(0)) {
- if (argc == 0) {
- if (mid == idLength) {
- insn_set_specialized_instruction(iobj, BIN(opt_length));
- }
- else if (mid == idSize) {
- insn_set_specialized_instruction(iobj, BIN(opt_size));
- }
- else if (mid == idSucc) {
- insn_set_specialized_instruction(iobj, BIN(opt_succ));
- }
- else if (mid == idNot) {
- insn_set_specialized_instruction(iobj, BIN(opt_not));
- }
- }
- else if (argc == 1) {
- if (0) {
- }
- else if (mid == idPLUS) {
- insn_set_specialized_instruction(iobj, BIN(opt_plus));
- }
- else if (mid == idMINUS) {
- insn_set_specialized_instruction(iobj, BIN(opt_minus));
- }
- else if (mid == idMULT) {
- insn_set_specialized_instruction(iobj, BIN(opt_mult));
- }
- else if (mid == idDIV) {
- insn_set_specialized_instruction(iobj, BIN(opt_div));
- }
- else if (mid == idMOD) {
- insn_set_specialized_instruction(iobj, BIN(opt_mod));
- }
- else if (mid == idEq) {
- insn_set_specialized_instruction(iobj, BIN(opt_eq));
- }
- else if (mid == idNeq) {
- insn_set_specialized_instruction(iobj, BIN(opt_neq));
- }
- else if (mid == idLT) {
- insn_set_specialized_instruction(iobj, BIN(opt_lt));
- }
- else if (mid == idLE) {
- insn_set_specialized_instruction(iobj, BIN(opt_le));
- }
- else if (mid == idGT) {
- insn_set_specialized_instruction(iobj, BIN(opt_gt));
- }
- else if (mid == idGE) {
- insn_set_specialized_instruction(iobj, BIN(opt_ge));
- }
- else if (mid == idLTLT) {
- insn_set_specialized_instruction(iobj, BIN(opt_ltlt));
- }
- else if (mid == idAREF) {
- insn_set_specialized_instruction(iobj, BIN(opt_aref));
- }
- }
- }
- }
- return COMPILE_OK;
-}
-
-static int
-iseq_optimize(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
-{
- LINK_ELEMENT *list;
- const int do_peepholeopt = iseq->compile_data->option->peephole_optimization;
- const int do_tailcallopt = iseq->compile_data->option->tailcall_optimization;
- const int do_si = iseq->compile_data->option->specialized_instruction;
- const int do_ou = iseq->compile_data->option->operands_unification;
- list = FIRST_ELEMENT(anchor);
-
- while (list) {
- if (list->type == ISEQ_ELEMENT_INSN) {
- if (do_peepholeopt) {
- iseq_peephole_optimize(iseq, list, do_tailcallopt);
- }
- if (do_si) {
- iseq_specialized_instruction(iseq, (INSN *)list);
- }
- if (do_ou) {
- insn_operands_unification((INSN *)list);
- }
- }
- list = list->next;
- }
- return COMPILE_OK;
-}
-
-#if OPT_INSTRUCTIONS_UNIFICATION
-static INSN *
-new_unified_insn(rb_iseq_t *iseq,
- int insn_id, int size, LINK_ELEMENT *seq_list)
-{
- INSN *iobj = 0;
- LINK_ELEMENT *list = seq_list;
- int i, argc = 0;
- VALUE *operands = 0, *ptr = 0;
-
-
- /* count argc */
- for (i = 0; i < size; i++) {
- iobj = (INSN *)list;
- argc += iobj->operand_size;
- list = list->next;
- }
-
- if (argc > 0) {
- ptr = operands =
- (VALUE *)compile_data_alloc(iseq, sizeof(VALUE) * argc);
- }
-
- /* copy operands */
- list = seq_list;
- for (i = 0; i < size; i++) {
- iobj = (INSN *)list;
- MEMCPY(ptr, iobj->operands, VALUE, iobj->operand_size);
- ptr += iobj->operand_size;
- list = list->next;
- }
-
- return new_insn_core(iseq, iobj->line_no, insn_id, argc, operands);
-}
-#endif
-
-/*
- * This scheme can get more performance if do this optimize with
- * label address resolving.
- * It's future work (if compile time was bottle neck).
- */
-static int
-iseq_insns_unification(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
-{
-#if OPT_INSTRUCTIONS_UNIFICATION
- LINK_ELEMENT *list;
- INSN *iobj, *niobj;
- int id, j, k;
-
- list = FIRST_ELEMENT(anchor);
- while (list) {
- if (list->type == ISEQ_ELEMENT_INSN) {
- iobj = (INSN *)list;
- id = iobj->insn_id;
- if (unified_insns_data[id] != 0) {
- const int *const *entry = unified_insns_data[id];
- for (j = 1; j < (int)entry[0]; j++) {
- const int *unified = entry[j];
- LINK_ELEMENT *li = list->next;
- for (k = 2; k < unified[1]; k++) {
- if (li->type != ISEQ_ELEMENT_INSN ||
- ((INSN *)li)->insn_id != unified[k]) {
- goto miss;
- }
- li = li->next;
- }
- /* matched */
- niobj =
- new_unified_insn(iseq, unified[0], unified[1] - 1,
- list);
-
- /* insert to list */
- niobj->link.prev = (LINK_ELEMENT *)iobj->link.prev;
- niobj->link.next = li;
- if (li) {
- li->prev = (LINK_ELEMENT *)niobj;
- }
-
- list->prev->next = (LINK_ELEMENT *)niobj;
- list = (LINK_ELEMENT *)niobj;
- break;
- miss:;
- }
- }
- }
- list = list->next;
- }
-#endif
- return COMPILE_OK;
-}
-
-#if OPT_STACK_CACHING
-
-#define SC_INSN(insn, stat) sc_insn_info[(insn)][(stat)]
-#define SC_NEXT(insn) sc_insn_next[insn]
-
-#include "opt_sc.inc"
-
-static int
-insn_set_sc_state(rb_iseq_t *iseq, INSN *iobj, int state)
-{
- int nstate;
- int insn_id;
-
- insn_id = iobj->insn_id;
- iobj->insn_id = SC_INSN(insn_id, state);
- nstate = SC_NEXT(iobj->insn_id);
-
- if (insn_id == BIN(jump) ||
- insn_id == BIN(branchif) || insn_id == BIN(branchunless)) {
- LABEL *lobj = (LABEL *)OPERAND_AT(iobj, 0);
-
- if (lobj->sc_state != 0) {
- if (lobj->sc_state != nstate) {
- dump_disasm_list((LINK_ELEMENT *)iobj);
- dump_disasm_list((LINK_ELEMENT *)lobj);
- printf("\n-- %d, %d\n", lobj->sc_state, nstate);
- rb_compile_error(RSTRING_PTR(iseq->filename), iobj->line_no,
- "insn_set_sc_state error\n");
- return 0;
- }
- }
- else {
- lobj->sc_state = nstate;
- }
- if (insn_id == BIN(jump)) {
- nstate = SCS_XX;
- }
- }
- else if (insn_id == BIN(leave)) {
- nstate = SCS_XX;
- }
-
- return nstate;
-}
-
-static int
-label_set_sc_state(LABEL *lobj, int state)
-{
- if (lobj->sc_state != 0) {
- if (lobj->sc_state != state) {
- state = lobj->sc_state;
- }
- }
- else {
- lobj->sc_state = state;
- }
-
- return state;
-}
-
-
-#endif
-
-static int
-iseq_set_sequence_stackcaching(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
-{
-#if OPT_STACK_CACHING
- LINK_ELEMENT *list;
- int state, insn_id;
-
- /* initialize */
- state = SCS_XX;
- list = FIRST_ELEMENT(anchor);
- /* dump_disasm_list(list); */
-
- /* for each list element */
- while (list) {
- redo_point:
- switch (list->type) {
- case ISEQ_ELEMENT_INSN:
- {
- INSN *iobj = (INSN *)list;
- insn_id = iobj->insn_id;
-
- /* dump_disasm_list(list); */
-
- switch (insn_id) {
- case BIN(nop):
- {
- /* exception merge point */
- if (state != SCS_AX) {
- INSN *rpobj =
- new_insn_body(iseq, 0, BIN(reput), 0);
-
- /* replace this insn */
- REPLACE_ELEM(list, (LINK_ELEMENT *)rpobj);
- list = (LINK_ELEMENT *)rpobj;
- goto redo_point;
- }
- break;
- }
- case BIN(swap):
- {
- if (state == SCS_AB || state == SCS_BA) {
- state = (state == SCS_AB ? SCS_BA : SCS_AB);
-
- REMOVE_ELEM(list);
- list = list->next;
- goto redo_point;
- }
- break;
- }
- case BIN(pop):
- {
- switch (state) {
- case SCS_AX:
- case SCS_BX:
- state = SCS_XX;
- break;
- case SCS_AB:
- state = SCS_AX;
- break;
- case SCS_BA:
- state = SCS_BX;
- break;
- case SCS_XX:
- goto normal_insn;
- default:
- rb_compile_error(RSTRING_PTR(iseq->filename), iobj->line_no,
- "unreachable");
- }
- /* remove useless pop */
- REMOVE_ELEM(list);
- list = list->next;
- goto redo_point;
- }
- default:;
- /* none */
- } /* end of switch */
- normal_insn:
- state = insn_set_sc_state(iseq, iobj, state);
- break;
- }
- case ISEQ_ELEMENT_LABEL:
- {
- LABEL *lobj;
- lobj = (LABEL *)list;
-
- state = label_set_sc_state(lobj, state);
- }
- default:
- break;
- }
- list = list->next;
- }
-#endif
- return COMPILE_OK;
-}
-
-
-
-static int
-compile_dstr_fragments(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int *cntp)
-{
- NODE *list = node->nd_next;
- VALUE lit = node->nd_lit;
- int cnt = 0;
-
- debugp_param("nd_lit", lit);
- if (!NIL_P(lit)) {
- hide_obj(lit);
- cnt++;
- ADD_INSN1(ret, nd_line(node), putobject, lit);
- }
-
- while (list) {
- COMPILE(ret, "each string", list->nd_head);
- cnt++;
- list = list->nd_next;
- }
- *cntp = cnt;
-
- return COMPILE_OK;
-}
-
-static int
-compile_dstr(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node)
-{
- int cnt;
- compile_dstr_fragments(iseq, ret, node, &cnt);
- ADD_INSN1(ret, nd_line(node), concatstrings, INT2FIX(cnt));
- return COMPILE_OK;
-}
-
-static int
-compile_dregx(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node)
-{
- int cnt;
- compile_dstr_fragments(iseq, ret, node, &cnt);
- ADD_INSN2(ret, nd_line(node), toregexp, INT2FIX(node->nd_cflag), INT2FIX(cnt));
- return COMPILE_OK;
-}
-
-static int
-compile_branch_condition(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * cond,
- LABEL *then_label, LABEL *else_label)
-{
- switch (nd_type(cond)) {
- case NODE_AND:
- {
- LABEL *label = NEW_LABEL(nd_line(cond));
- compile_branch_condition(iseq, ret, cond->nd_1st, label,
- else_label);
- ADD_LABEL(ret, label);
- compile_branch_condition(iseq, ret, cond->nd_2nd, then_label,
- else_label);
- break;
- }
- case NODE_OR:
- {
- LABEL *label = NEW_LABEL(nd_line(cond));
- compile_branch_condition(iseq, ret, cond->nd_1st, then_label,
- label);
- ADD_LABEL(ret, label);
- compile_branch_condition(iseq, ret, cond->nd_2nd, then_label,
- else_label);
- break;
- }
- case NODE_LIT: /* NODE_LIT is always not true */
- case NODE_TRUE:
- case NODE_STR:
- /* printf("useless conditon eliminate (%s)\n", ruby_node_name(nd_type(cond))); */
- ADD_INSNL(ret, nd_line(cond), jump, then_label);
- break;
- case NODE_FALSE:
- case NODE_NIL:
- /* printf("useless conditon eliminate (%s)\n", ruby_node_name(nd_type(cond))); */
- ADD_INSNL(ret, nd_line(cond), jump, else_label);
- break;
- default:
- COMPILE(ret, "branch condition", cond);
- ADD_INSNL(ret, nd_line(cond), branchunless, else_label);
- ADD_INSNL(ret, nd_line(cond), jump, then_label);
- break;
- }
- return COMPILE_OK;
-}
-
-static int
-compile_array_(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE* node_root,
- VALUE opt_p, int poped)
-{
- NODE *node = node_root;
- int len = (int)node->nd_alen, line = (int)nd_line(node), i=0;
- DECL_ANCHOR(anchor);
-
- INIT_ANCHOR(anchor);
- if (nd_type(node) != NODE_ZARRAY) {
- while (node) {
- if (nd_type(node) != NODE_ARRAY) {
- rb_bug("compile_array: This node is not NODE_ARRAY, but %s",
- ruby_node_name(nd_type(node)));
- }
-
- i++;
- if (opt_p && nd_type(node->nd_head) != NODE_LIT) {
- opt_p = Qfalse;
- }
- COMPILE_(anchor, "array element", node->nd_head, poped);
- node = node->nd_next;
- }
- }
-
- if (len != i) {
- if (0) {
- rb_bug("node error: compile_array (%d: %d-%d)",
- (int)nd_line(node_root), len, i);
- }
- len = i;
- }
-
- if (opt_p == Qtrue) {
- if (!poped) {
- VALUE ary = rb_ary_tmp_new(len);
- node = node_root;
- while (node) {
- rb_ary_push(ary, node->nd_head->nd_lit);
- node = node->nd_next;
- }
- OBJ_FREEZE(ary);
- iseq_add_mark_object_compile_time(iseq, ary);
- ADD_INSN1(ret, nd_line(node_root), duparray, ary);
- }
- }
- else {
- if (!poped) {
- ADD_INSN1(anchor, line, newarray, INT2FIX(len));
- }
- APPEND_LIST(ret, anchor);
- }
- return len;
-}
-
-static VALUE
-compile_array(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE* node_root, VALUE opt_p)
-{
- return compile_array_(iseq, ret, node_root, opt_p, 0);
-}
-
-static VALUE
-case_when_optimizable_literal(NODE * node)
-{
- switch (nd_type(node)) {
- case NODE_LIT: {
- VALUE v = node->nd_lit;
- if (SYMBOL_P(v) || rb_obj_is_kind_of(v, rb_cNumeric)) {
- return v;
- }
- break;
- }
- case NODE_STR:
- return node->nd_lit;
- }
- return Qfalse;
-}
-
-static VALUE
-when_vals(rb_iseq_t *iseq, LINK_ANCHOR *cond_seq, NODE *vals, LABEL *l1, VALUE special_literals)
-{
- while (vals) {
- VALUE lit;
- NODE* val;
-
- val = vals->nd_head;
-
- if (special_literals &&
- (lit = case_when_optimizable_literal(val)) != Qfalse) {
- rb_ary_push(special_literals, lit);
- rb_ary_push(special_literals, (VALUE)(l1) | 1);
- }
- else {
- special_literals = Qfalse;
- }
-
- COMPILE(cond_seq, "when cond", val);
- ADD_INSN1(cond_seq, nd_line(val), topn, INT2FIX(1));
- ADD_SEND(cond_seq, nd_line(val), ID2SYM(idEqq), INT2FIX(1));
- ADD_INSNL(cond_seq, nd_line(val), branchif, l1);
- vals = vals->nd_next;
- }
- return special_literals;
-}
-
-static int
-compile_massign_lhs(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE *node)
-{
- switch (nd_type(node)) {
- case NODE_ATTRASGN: {
- INSN *iobj;
- VALUE dupidx;
-
- COMPILE_POPED(ret, "masgn lhs (NODE_ATTRASGN)", node);
- POP_ELEMENT(ret); /* pop pop insn */
- iobj = (INSN *)POP_ELEMENT(ret); /* pop send insn */
-
- dupidx = iobj->operands[1];
- dupidx = FIXNUM_INC(dupidx, 1);
- iobj->operands[1] = dupidx;
-
- ADD_INSN1(ret, nd_line(node), topn, dupidx);
- ADD_ELEM(ret, (LINK_ELEMENT *)iobj);
- ADD_INSN(ret, nd_line(node), pop); /* result */
- ADD_INSN(ret, nd_line(node), pop); /* rhs */
- break;
- }
- case NODE_MASGN: {
- DECL_ANCHOR(anchor);
- INIT_ANCHOR(anchor);
- COMPILE_POPED(anchor, "nest masgn lhs", node);
- REMOVE_ELEM(FIRST_ELEMENT(anchor));
- ADD_SEQ(ret, anchor);
- break;
- }
- default: {
- DECL_ANCHOR(anchor);
- INIT_ANCHOR(anchor);
- COMPILE_POPED(anchor, "masgn lhs", node);
- REMOVE_ELEM(FIRST_ELEMENT(anchor));
- ADD_SEQ(ret, anchor);
- }
- }
-
- return COMPILE_OK;
-}
-
-static void
-compile_massign_opt_lhs(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE *lhsn)
-{
- if (lhsn) {
- compile_massign_opt_lhs(iseq, ret, lhsn->nd_next);
- compile_massign_lhs(iseq, ret, lhsn->nd_head);
- }
-}
-
-static int
-compile_massign_opt(rb_iseq_t *iseq, LINK_ANCHOR *ret,
- NODE *rhsn, NODE *orig_lhsn)
-{
- VALUE mem[64];
- const int memsize = numberof(mem);
- int memindex = 0;
- int llen = 0, rlen = 0;
- int i;
- NODE *lhsn = orig_lhsn;
-
-#define MEMORY(v) { \
- int i; \
- if (memindex == memsize) return 0; \
- for (i=0; i<memindex; i++) { \
- if (mem[i] == (v)) return 0; \
- } \
- mem[memindex++] = (v); \
-}
-
- if (rhsn == 0 || nd_type(rhsn) != NODE_ARRAY) {
- return 0;
- }
-
- while (lhsn) {
- NODE *ln = lhsn->nd_head;
- switch (nd_type(ln)) {
- case NODE_LASGN:
- MEMORY(ln->nd_vid);
- break;
- case NODE_DASGN:
- case NODE_DASGN_CURR:
- case NODE_IASGN:
- case NODE_IASGN2:
- case NODE_CVASGN:
- MEMORY(ln->nd_vid);
- break;
- default:
- return 0;
- }
- lhsn = lhsn->nd_next;
- llen++;
- }
-
- while (rhsn) {
- if (llen <= rlen) {
- COMPILE_POPED(ret, "masgn val (poped)", rhsn->nd_head);
- }
- else {
- COMPILE(ret, "masgn val", rhsn->nd_head);
- }
- rhsn = rhsn->nd_next;
- rlen++;
- }
-
- if (llen > rlen) {
- for (i=0; i<llen-rlen; i++) {
- ADD_INSN(ret, nd_line(orig_lhsn), putnil);
- }
- }
-
- compile_massign_opt_lhs(iseq, ret, orig_lhsn);
- return 1;
-}
-
-static int
-compile_massign(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE *node, int poped)
-{
- NODE *rhsn = node->nd_value;
- NODE *splatn = node->nd_args;
- NODE *lhsn = node->nd_head;
- int lhs_splat = (splatn && (VALUE)splatn != (VALUE)-1) ? 1 : 0;
-
- if (!poped || splatn || !compile_massign_opt(iseq, ret, rhsn, lhsn)) {
- int llen = 0;
- DECL_ANCHOR(lhsseq);
-
- INIT_ANCHOR(lhsseq);
-
- while (lhsn) {
- compile_massign_lhs(iseq, lhsseq, lhsn->nd_head);
- llen += 1;
- lhsn = lhsn->nd_next;
- }
-
- COMPILE(ret, "normal masgn rhs", rhsn);
-
- if (!poped) {
- ADD_INSN(ret, nd_line(node), dup);
- }
-
- ADD_INSN2(ret, nd_line(node), expandarray,
- INT2FIX(llen), INT2FIX(lhs_splat));
- ADD_SEQ(ret, lhsseq);
-
- if (lhs_splat) {
- if (nd_type(splatn) == NODE_POSTARG) {
- /*a, b, *r, p1, p2 */
- NODE *postn = splatn->nd_2nd;
- NODE *restn = splatn->nd_1st;
- int num = (int)postn->nd_alen;
- int flag = 0x02 | (((VALUE)restn == (VALUE)-1) ? 0x00 : 0x01);
-
- ADD_INSN2(ret, nd_line(splatn), expandarray,
- INT2FIX(num), INT2FIX(flag));
-
- if ((VALUE)restn != (VALUE)-1) {
- compile_massign_lhs(iseq, ret, restn);
- }
- while (postn) {
- compile_massign_lhs(iseq, ret, postn->nd_head);
- postn = postn->nd_next;
- }
- }
- else {
- /* a, b, *r */
- compile_massign_lhs(iseq, ret, splatn);
- }
- }
- }
- return COMPILE_OK;
-}
-
-static int
-compile_colon2(rb_iseq_t *iseq, NODE * node,
- LINK_ANCHOR *pref, LINK_ANCHOR *body)
-{
- switch (nd_type(node)) {
- case NODE_CONST:
- debugi("compile_colon2 - colon", node->nd_vid);
- ADD_INSN1(body, nd_line(node), getconstant, ID2SYM(node->nd_vid));
- break;
- case NODE_COLON3:
- debugi("compile_colon2 - colon3", node->nd_mid);
- ADD_INSN(body, nd_line(node), pop);
- ADD_INSN1(body, nd_line(node), putobject, rb_cObject);
- ADD_INSN1(body, nd_line(node), getconstant, ID2SYM(node->nd_mid));
- break;
- case NODE_COLON2:
- compile_colon2(iseq, node->nd_head, pref, body);
- debugi("compile_colon2 - colon2", node->nd_mid);
- ADD_INSN1(body, nd_line(node), getconstant, ID2SYM(node->nd_mid));
- break;
- default:
- COMPILE(pref, "const colon2 prefix", node);
- break;
- }
- return COMPILE_OK;
-}
-
-static VALUE
-compile_cpath(LINK_ANCHOR *ret, rb_iseq_t *iseq, NODE *cpath)
-{
- if (nd_type(cpath) == NODE_COLON3) {
- /* toplevel class ::Foo */
- ADD_INSN1(ret, nd_line(cpath), putobject, rb_cObject);
- return Qfalse;
- }
- else if (cpath->nd_head) {
- /* Bar::Foo */
- COMPILE(ret, "nd_else->nd_head", cpath->nd_head);
- return Qfalse;
- }
- else {
- /* class at cbase Foo */
- ADD_INSN1(ret, nd_line(cpath), putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_CBASE));
- return Qtrue;
- }
-}
-
-static int
-defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *ret,
- NODE *node, LABEL **lfinish, VALUE needstr)
-{
- const char *estr = 0;
- enum node_type type;
-
- switch (type = nd_type(node)) {
-
- /* easy literals */
- case NODE_NIL:
- estr = "nil";
- break;
- case NODE_SELF:
- estr = "self";
- break;
- case NODE_TRUE:
- estr = "true";
- break;
- case NODE_FALSE:
- estr = "false";
- break;
-
- case NODE_ARRAY:{
- NODE *vals = node;
-
- do {
- defined_expr(iseq, ret, vals->nd_head, lfinish, Qfalse);
-
- if (!lfinish[1]) {
- lfinish[1] = NEW_LABEL(nd_line(node));
- }
- ADD_INSNL(ret, nd_line(node), branchunless, lfinish[1]);
- } while ((vals = vals->nd_next) != NULL);
- }
- case NODE_STR:
- case NODE_LIT:
- case NODE_ZARRAY:
- case NODE_AND:
- case NODE_OR:
- default:
- estr = "expression";
- break;
-
- /* variables */
- case NODE_LVAR:
- case NODE_DVAR:
- estr = "local-variable";
- break;
-
- case NODE_IVAR:
- ADD_INSN(ret, nd_line(node), putnil);
- ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_IVAR),
- ID2SYM(node->nd_vid), needstr);
- return 1;
-
- case NODE_GVAR:
- ADD_INSN(ret, nd_line(node), putnil);
- ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_GVAR),
- ((VALUE)node->nd_entry) | 1, needstr);
- return 1;
-
- case NODE_CVAR:
- ADD_INSN(ret, nd_line(node), putnil);
- ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_CVAR),
- ID2SYM(node->nd_vid), needstr);
- return 1;
-
- case NODE_CONST:
- ADD_INSN(ret, nd_line(node), putnil);
- ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_CONST),
- ID2SYM(node->nd_vid), needstr);
- return 1;
- case NODE_COLON2:
- if (!lfinish[1]) {
- lfinish[1] = NEW_LABEL(nd_line(node));
- }
- defined_expr(iseq, ret, node->nd_head, lfinish, Qfalse);
- ADD_INSNL(ret, nd_line(node), branchunless, lfinish[1]);
-
- if (rb_is_const_id(node->nd_mid)) {
- COMPILE(ret, "defined/colon2#nd_head", node->nd_head);
- ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_CONST),
- ID2SYM(node->nd_mid), needstr);
- }
- else {
- COMPILE(ret, "defined/colon2#nd_head", node->nd_head);
- ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_METHOD),
- ID2SYM(node->nd_mid), needstr);
- }
- return 1;
- case NODE_COLON3:
- ADD_INSN1(ret, nd_line(node), putobject, rb_cObject);
- ADD_INSN3(ret, nd_line(node), defined,
- INT2FIX(DEFINED_CONST), ID2SYM(node->nd_mid), needstr);
- return 1;
-
- /* method dispatch */
- case NODE_CALL:
- case NODE_VCALL:
- case NODE_FCALL:
- case NODE_ATTRASGN:{
- int self = Qtrue;
-
- switch (type) {
- case NODE_ATTRASGN:
- if (node->nd_recv == (NODE *)1) break;
- case NODE_CALL:
- self = Qfalse;
- break;
- default:
- /* through */;
- }
- if (!lfinish[1]) {
- lfinish[1] = NEW_LABEL(nd_line(node));
- }
- if (node->nd_args) {
- defined_expr(iseq, ret, node->nd_args, lfinish, Qfalse);
- ADD_INSNL(ret, nd_line(node), branchunless, lfinish[1]);
- }
- if (!self) {
- LABEL *lstart = NEW_LABEL(nd_line(node));
- LABEL *lend = NEW_LABEL(nd_line(node));
- VALUE rescue = NEW_CHILD_ISEQVAL(NEW_NIL(),
- rb_str_concat(rb_str_new2
- ("defined guard in "),
- iseq->name),
- ISEQ_TYPE_DEFINED_GUARD, 0);
-
- defined_expr(iseq, ret, node->nd_recv, lfinish, Qfalse);
- ADD_INSNL(ret, nd_line(node), branchunless, lfinish[1]);
-
- ADD_LABEL(ret, lstart);
- COMPILE(ret, "defined/recv", node->nd_recv);
- ADD_LABEL(ret, lend);
- ADD_CATCH_ENTRY(CATCH_TYPE_RESCUE, lstart, lend, rescue, lfinish[1]);
- ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_METHOD),
- ID2SYM(node->nd_mid), needstr);
- }
- else {
- ADD_INSN(ret, nd_line(node), putself);
- ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_FUNC),
- ID2SYM(node->nd_mid), needstr);
- }
- return 1;
- }
-
- case NODE_YIELD:
- ADD_INSN(ret, nd_line(node), putnil);
- ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_YIELD), 0,
- needstr);
- return 1;
-
- case NODE_BACK_REF:
- case NODE_NTH_REF:
- ADD_INSN(ret, nd_line(node), putnil);
- ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_REF),
- INT2FIX((node->nd_nth << 1) | (type == NODE_BACK_REF)),
- needstr);
- return 1;
-
- case NODE_SUPER:
- case NODE_ZSUPER:
- ADD_INSN(ret, nd_line(node), putnil);
- ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_ZSUPER), 0,
- needstr);
- return 1;
-
- case NODE_OP_ASGN1:
- case NODE_OP_ASGN2:
- case NODE_OP_ASGN_OR:
- case NODE_OP_ASGN_AND:
- case NODE_MASGN:
- case NODE_LASGN:
- case NODE_DASGN:
- case NODE_DASGN_CURR:
- case NODE_GASGN:
- case NODE_IASGN:
- case NODE_CDECL:
- case NODE_CVDECL:
- case NODE_CVASGN:
- estr = "assignment";
- break;
- }
-
- if (estr != 0) {
- if (needstr != Qfalse) {
- VALUE str = rb_str_new2(estr);
- hide_obj(str);
- ADD_INSN1(ret, nd_line(node), putstring, str);
- iseq_add_mark_object_compile_time(iseq, str);
- }
- else {
- ADD_INSN1(ret, nd_line(node), putobject, Qtrue);
- }
- return 1;
- }
- return 0;
-}
-
-#define BUFSIZE 0x100
-
-static VALUE
-make_name_for_block(rb_iseq_t *iseq)
-{
- int level = 1;
- rb_iseq_t *ip = iseq;
-
- if (iseq->parent_iseq != 0) {
- while (ip->local_iseq != ip) {
- if (ip->type == ISEQ_TYPE_BLOCK) {
- level++;
- }
- ip = ip->parent_iseq;
- }
- }
-
- if (level == 1) {
- return rb_sprintf("block in %s", RSTRING_PTR(ip->name));
- }
- else {
- return rb_sprintf("block (%d levels) in %s", level, RSTRING_PTR(ip->name));
- }
-}
-
-static void
-push_ensure_entry(rb_iseq_t *iseq,
- struct iseq_compile_data_ensure_node_stack *enl,
- struct ensure_range *er, NODE *node)
-{
- enl->ensure_node = node;
- enl->prev = iseq->compile_data->ensure_node_stack; /* prev */
- enl->erange = er;
- iseq->compile_data->ensure_node_stack = enl;
-}
-
-static void
-add_ensure_range(rb_iseq_t *iseq, struct ensure_range *erange,
- LABEL *lstart, LABEL *lend)
-{
- struct ensure_range *ne =
- compile_data_alloc(iseq, sizeof(struct ensure_range));
-
- while (erange->next != 0) {
- erange = erange->next;
- }
- ne->next = 0;
- ne->begin = lend;
- ne->end = erange->end;
- erange->end = lstart;
-
- erange->next = ne;
-}
-
-static void
-add_ensure_iseq(LINK_ANCHOR *ret, rb_iseq_t *iseq, int is_return)
-{
- struct iseq_compile_data_ensure_node_stack *enlp =
- iseq->compile_data->ensure_node_stack;
- struct iseq_compile_data_ensure_node_stack *prev_enlp = enlp;
- DECL_ANCHOR(ensure);
-
- INIT_ANCHOR(ensure);
- while (enlp) {
- if (enlp->erange != 0) {
- DECL_ANCHOR(ensure_part);
- LABEL *lstart = NEW_LABEL(0);
- LABEL *lend = NEW_LABEL(0);
- INIT_ANCHOR(ensure_part);
-
- add_ensure_range(iseq, enlp->erange, lstart, lend);
-
- iseq->compile_data->ensure_node_stack = enlp->prev;
- ADD_LABEL(ensure_part, lstart);
- COMPILE_POPED(ensure_part, "ensure part", enlp->ensure_node);
- ADD_LABEL(ensure_part, lend);
- ADD_SEQ(ensure, ensure_part);
- }
- else {
- if (!is_return) {
- break;
- }
- }
- enlp = enlp->prev;
- }
- iseq->compile_data->ensure_node_stack = prev_enlp;
- ADD_SEQ(ret, ensure);
-}
-
-static VALUE
-setup_args(rb_iseq_t *iseq, LINK_ANCHOR *args, NODE *argn, unsigned long *flag)
-{
- VALUE argc = INT2FIX(0);
- int nsplat = 0;
- DECL_ANCHOR(arg_block);
- DECL_ANCHOR(args_splat);
-
- INIT_ANCHOR(arg_block);
- INIT_ANCHOR(args_splat);
- if (argn && nd_type(argn) == NODE_BLOCK_PASS) {
- COMPILE(arg_block, "block", argn->nd_body);
- *flag |= VM_CALL_ARGS_BLOCKARG_BIT;
- argn = argn->nd_head;
- }
-
- setup_argn:
- if (argn) {
- switch (nd_type(argn)) {
- case NODE_SPLAT: {
- COMPILE(args, "args (splat)", argn->nd_head);
- argc = INT2FIX(1);
- nsplat++;
- *flag |= VM_CALL_ARGS_SPLAT_BIT;
- break;
- }
- case NODE_ARGSCAT:
- case NODE_ARGSPUSH: {
- int next_is_array = (nd_type(argn->nd_head) == NODE_ARRAY);
- DECL_ANCHOR(tmp);
-
- INIT_ANCHOR(tmp);
- COMPILE(tmp, "args (cat: splat)", argn->nd_body);
- if (next_is_array && nsplat == 0) {
- /* none */
- }
- else {
- if (nd_type(argn) == NODE_ARGSCAT) {
- ADD_INSN1(tmp, nd_line(argn), splatarray, Qfalse);
- }
- else {
- ADD_INSN1(tmp, nd_line(argn), newarray, INT2FIX(1));
- }
- }
- INSERT_LIST(args_splat, tmp);
- nsplat++;
- *flag |= VM_CALL_ARGS_SPLAT_BIT;
-
- if (next_is_array) {
- argc = INT2FIX(compile_array(iseq, args, argn->nd_head, Qfalse) + 1);
- POP_ELEMENT(args);
- }
- else {
- argn = argn->nd_head;
- goto setup_argn;
- }
- break;
- }
- case NODE_ARRAY: {
- argc = INT2FIX(compile_array(iseq, args, argn, Qfalse));
- POP_ELEMENT(args);
- break;
- }
- default: {
- rb_bug("setup_arg: unknown node: %s\n", ruby_node_name(nd_type(argn)));
- }
- }
- }
-
- if (nsplat > 1) {
- int i;
- for (i=1; i<nsplat; i++) {
- ADD_INSN(args_splat, nd_line(args), concatarray);
- }
- }
-
- if (!LIST_SIZE_ZERO(args_splat)) {
- ADD_SEQ(args, args_splat);
- }
-
- if (*flag & VM_CALL_ARGS_BLOCKARG_BIT) {
- ADD_SEQ(args, arg_block);
- }
- return argc;
-}
-
-
-/**
- compile each node
-
- self: InstructionSequence
- node: Ruby compiled node
- poped: This node will be poped
- */
-static int
-iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
-{
- enum node_type type;
-
- if (node == 0) {
- if (!poped) {
- debugs("node: NODE_NIL(implicit)\n");
- ADD_INSN(ret, iseq->compile_data->last_line, putnil);
- }
- return COMPILE_OK;
- }
-
- iseq->compile_data->last_line = (int)nd_line(node);
- debug_node_start(node);
-
- type = nd_type(node);
-
- if (node->flags & NODE_FL_NEWLINE) {
- ADD_TRACE(ret, nd_line(node), RUBY_EVENT_LINE);
- }
-
- switch (type) {
- case NODE_BLOCK:{
- while (node && nd_type(node) == NODE_BLOCK) {
- COMPILE_(ret, "BLOCK body", node->nd_head,
- (node->nd_next == 0 && poped == 0) ? 0 : 1);
- node = node->nd_next;
- }
- if (node) {
- COMPILE_(ret, "BLOCK next", node->nd_next, poped);
- }
- break;
- }
- case NODE_IF:{
- DECL_ANCHOR(cond_seq);
- DECL_ANCHOR(then_seq);
- DECL_ANCHOR(else_seq);
- LABEL *then_label, *else_label, *end_label;
-
- INIT_ANCHOR(cond_seq);
- INIT_ANCHOR(then_seq);
- INIT_ANCHOR(else_seq);
- then_label = NEW_LABEL(nd_line(node));
- else_label = NEW_LABEL(nd_line(node));
- end_label = NEW_LABEL(nd_line(node));
-
- compile_branch_condition(iseq, cond_seq, node->nd_cond,
- then_label, else_label);
- COMPILE_(then_seq, "then", node->nd_body, poped);
- COMPILE_(else_seq, "else", node->nd_else, poped);
-
- ADD_SEQ(ret, cond_seq);
-
- ADD_LABEL(ret, then_label);
- ADD_SEQ(ret, then_seq);
- ADD_INSNL(ret, nd_line(node), jump, end_label);
-
- ADD_LABEL(ret, else_label);
- ADD_SEQ(ret, else_seq);
-
- ADD_LABEL(ret, end_label);
-
- break;
- }
- case NODE_CASE:{
- NODE *vals;
- NODE *tempnode = node;
- LABEL *endlabel, *elselabel;
- DECL_ANCHOR(head);
- DECL_ANCHOR(body_seq);
- DECL_ANCHOR(cond_seq);
- VALUE special_literals = rb_ary_tmp_new(1);
-
- INIT_ANCHOR(head);
- INIT_ANCHOR(body_seq);
- INIT_ANCHOR(cond_seq);
- if (node->nd_head == 0) {
- COMPILE_(ret, "when", node->nd_body, poped);
- break;
- }
- COMPILE(head, "case base", node->nd_head);
-
- node = node->nd_body;
- type = nd_type(node);
-
- if (type != NODE_WHEN) {
- COMPILE_ERROR((ERROR_ARGS "NODE_CASE: unexpected node. must be NODE_WHEN, but %s", ruby_node_name(type)));
- }
-
- endlabel = NEW_LABEL(nd_line(node));
- elselabel = NEW_LABEL(nd_line(node));
-
- ADD_SEQ(ret, head); /* case VAL */
-
- while (type == NODE_WHEN) {
- LABEL *l1;
-
- l1 = NEW_LABEL(nd_line(node));
- ADD_LABEL(body_seq, l1);
- ADD_INSN(body_seq, nd_line(node), pop);
- COMPILE_(body_seq, "when body", node->nd_body, poped);
- ADD_INSNL(body_seq, nd_line(node), jump, endlabel);
-
- vals = node->nd_head;
- if (vals) {
- switch (nd_type(vals)) {
- case NODE_ARRAY:
- special_literals = when_vals(iseq, cond_seq, vals, l1, special_literals);
- break;
- case NODE_SPLAT:
- case NODE_ARGSCAT:
- case NODE_ARGSPUSH:
- special_literals = 0;
- COMPILE(cond_seq, "when/cond splat", vals);
- ADD_INSN1(cond_seq, nd_line(vals), checkincludearray, Qtrue);
- ADD_INSNL(cond_seq, nd_line(vals), branchif, l1);
- break;
- default:
- rb_bug("NODE_CASE: unknown node (%s)",
- ruby_node_name(nd_type(vals)));
- }
- }
- else {
- rb_bug("NODE_CASE: must be NODE_ARRAY, but 0");
- }
-
- node = node->nd_next;
- if (!node) {
- break;
- }
- type = nd_type(node);
- }
- /* else */
- if (node) {
- ADD_LABEL(cond_seq, elselabel);
- ADD_INSN(cond_seq, nd_line(node), pop);
- COMPILE_(cond_seq, "else", node, poped);
- ADD_INSNL(cond_seq, nd_line(node), jump, endlabel);
- }
- else {
- debugs("== else (implicit)\n");
- ADD_LABEL(cond_seq, elselabel);
- ADD_INSN(cond_seq, nd_line(tempnode), pop);
- if (!poped) {
- ADD_INSN(cond_seq, nd_line(tempnode), putnil);
- }
- ADD_INSNL(cond_seq, nd_line(tempnode), jump, endlabel);
- }
-
- if (special_literals) {
- ADD_INSN(ret, nd_line(tempnode), dup);
- ADD_INSN2(ret, nd_line(tempnode), opt_case_dispatch,
- special_literals, elselabel);
- iseq_add_mark_object_compile_time(iseq, special_literals);
- }
-
- ADD_SEQ(ret, cond_seq);
- ADD_SEQ(ret, body_seq);
- ADD_LABEL(ret, endlabel);
- break;
- }
- case NODE_WHEN:{
- NODE *vals;
- NODE *val;
- NODE *orig_node = node;
- LABEL *endlabel;
- DECL_ANCHOR(body_seq);
-
- INIT_ANCHOR(body_seq);
- endlabel = NEW_LABEL(nd_line(node));
-
- while (node && nd_type(node) == NODE_WHEN) {
- LABEL *l1 = NEW_LABEL(nd_line(node));
- ADD_LABEL(body_seq, l1);
- COMPILE_(body_seq, "when", node->nd_body, poped);
- ADD_INSNL(body_seq, nd_line(node), jump, endlabel);
-
- vals = node->nd_head;
- if (vals && nd_type(vals) == NODE_ARRAY) {
- while (vals) {
- val = vals->nd_head;
- COMPILE(ret, "when2", val);
- ADD_INSNL(ret, nd_line(val), branchif, l1);
- vals = vals->nd_next;
- }
- }
- else if (nd_type(vals) == NODE_SPLAT ||
- nd_type(vals) == NODE_ARGSCAT ||
- nd_type(vals) == NODE_ARGSPUSH) {
-
- NODE *val = vals->nd_head;
-
- if (nd_type(vals) == NODE_ARGSCAT || nd_type(vals) == NODE_ARGSPUSH) {
- NODE *vs = vals->nd_head;
- val = vals->nd_body;
-
- while (vs) {
- NODE* val = vs->nd_head;
- COMPILE(ret, "when/argscat", val);
- ADD_INSNL(ret, nd_line(val), branchif, l1);
- vs = vs->nd_next;
- }
- }
-
- ADD_INSN(ret, nd_line(val), putnil);
- COMPILE(ret, "when2/splat", val);
- ADD_INSN1(ret, nd_line(val), checkincludearray, Qfalse);
- ADD_INSN(ret, nd_line(val), pop);
- ADD_INSNL(ret, nd_line(val), branchif, l1);
- }
- else {
- rb_bug("err");
- }
- node = node->nd_next;
- }
- /* else */
- COMPILE_(ret, "else", node, poped);
- ADD_INSNL(ret, nd_line(orig_node), jump, endlabel);
-
- ADD_SEQ(ret, body_seq);
- ADD_LABEL(ret, endlabel);
-
- break;
- }
- case NODE_OPT_N:
- case NODE_WHILE:
- case NODE_UNTIL:{
- LABEL *prev_start_label = iseq->compile_data->start_label;
- LABEL *prev_end_label = iseq->compile_data->end_label;
- LABEL *prev_redo_label = iseq->compile_data->redo_label;
- VALUE prev_loopval_popped = iseq->compile_data->loopval_popped;
-
- struct iseq_compile_data_ensure_node_stack enl;
-
- LABEL *next_label = iseq->compile_data->start_label = NEW_LABEL(nd_line(node)); /* next */
- LABEL *redo_label = iseq->compile_data->redo_label = NEW_LABEL(nd_line(node)); /* redo */
- LABEL *break_label = iseq->compile_data->end_label = NEW_LABEL(nd_line(node)); /* break */
- LABEL *end_label = NEW_LABEL(nd_line(node));
-
- LABEL *next_catch_label = NEW_LABEL(nd_line(node));
- LABEL *tmp_label = NULL;
-
- iseq->compile_data->loopval_popped = 0;
- push_ensure_entry(iseq, &enl, 0, 0);
-
- if (type == NODE_OPT_N || node->nd_state == 1) {
- ADD_INSNL(ret, nd_line(node), jump, next_label);
- }
- else {
- tmp_label = NEW_LABEL(nd_line(node));
- ADD_INSNL(ret, nd_line(node), jump, tmp_label);
- }
- ADD_INSN(ret, nd_line(node), putnil);
- ADD_LABEL(ret, next_catch_label);
- ADD_INSN(ret, nd_line(node), pop);
- ADD_INSNL(ret, nd_line(node), jump, next_label);
- if (tmp_label) ADD_LABEL(ret, tmp_label);
-
- ADD_LABEL(ret, redo_label);
- COMPILE_POPED(ret, "while body", node->nd_body);
- ADD_LABEL(ret, next_label); /* next */
-
- if (type == NODE_WHILE) {
- compile_branch_condition(iseq, ret, node->nd_cond,
- redo_label, end_label);
- }
- else if (type == NODE_UNTIL) {
- /* untile */
- compile_branch_condition(iseq, ret, node->nd_cond,
- end_label, redo_label);
- }
- else {
- ADD_CALL_RECEIVER(ret, nd_line(node));
- ADD_CALL(ret, nd_line(node), ID2SYM(idGets), INT2FIX(0));
- ADD_INSNL(ret, nd_line(node), branchif, redo_label);
- /* opt_n */
- }
-
- ADD_LABEL(ret, end_label);
-
- if (node->nd_state == Qundef) {
- /* ADD_INSN(ret, nd_line(node), putundef); */
- rb_bug("unsupported: putundef");
- }
- else {
- ADD_INSN(ret, nd_line(node), putnil);
- }
-
- ADD_LABEL(ret, break_label); /* break */
-
- if (poped) {
- ADD_INSN(ret, nd_line(node), pop);
- }
-
- ADD_CATCH_ENTRY(CATCH_TYPE_BREAK, redo_label, break_label,
- 0, break_label);
- ADD_CATCH_ENTRY(CATCH_TYPE_NEXT, redo_label, break_label, 0,
- next_catch_label);
- ADD_CATCH_ENTRY(CATCH_TYPE_REDO, redo_label, break_label, 0,
- iseq->compile_data->redo_label);
-
- iseq->compile_data->start_label = prev_start_label;
- iseq->compile_data->end_label = prev_end_label;
- iseq->compile_data->redo_label = prev_redo_label;
- iseq->compile_data->loopval_popped = prev_loopval_popped;
- iseq->compile_data->ensure_node_stack = iseq->compile_data->ensure_node_stack->prev;
- break;
- }
- case NODE_ITER:
- case NODE_FOR:{
- VALUE prevblock = iseq->compile_data->current_block;
- LABEL *retry_label = NEW_LABEL(nd_line(node));
- LABEL *retry_end_l = NEW_LABEL(nd_line(node));
- ID mid = 0;
-
- ADD_LABEL(ret, retry_label);
- if (nd_type(node) == NODE_FOR) {
- COMPILE(ret, "iter caller (for)", node->nd_iter);
-
- iseq->compile_data->current_block =
- NEW_CHILD_ISEQVAL(node->nd_body, make_name_for_block(iseq),
- ISEQ_TYPE_BLOCK, nd_line(node));
-
- mid = idEach;
- ADD_SEND_R(ret, nd_line(node), ID2SYM(idEach), INT2FIX(0),
- iseq->compile_data->current_block, INT2FIX(0));
- }
- else {
- iseq->compile_data->current_block =
- NEW_CHILD_ISEQVAL(node->nd_body, make_name_for_block(iseq),
- ISEQ_TYPE_BLOCK, nd_line(node));
- COMPILE(ret, "iter caller", node->nd_iter);
- }
- ADD_LABEL(ret, retry_end_l);
-
- if (poped) {
- ADD_INSN(ret, nd_line(node), pop);
- }
-
- iseq->compile_data->current_block = prevblock;
-
- ADD_CATCH_ENTRY(CATCH_TYPE_BREAK, retry_label, retry_end_l, 0, retry_end_l);
-
- break;
- }
- case NODE_BREAK:{
- unsigned long level = 0;
-
- if (iseq->compile_data->redo_label != 0) {
- /* while/until */
- LABEL *splabel = NEW_LABEL(0);
- ADD_LABEL(ret, splabel);
- ADD_ADJUST(ret, nd_line(node), iseq->compile_data->redo_label);
- COMPILE_(ret, "break val (while/until)", node->nd_stts, iseq->compile_data->loopval_popped);
- add_ensure_iseq(ret, iseq, 0);
- ADD_INSNL(ret, nd_line(node), jump, iseq->compile_data->end_label);
- ADD_ADJUST_RESTORE(ret, splabel);
-
- if (!poped) {
- ADD_INSN(ret, nd_line(node), putnil);
- }
- }
- else if (iseq->type == ISEQ_TYPE_BLOCK) {
- break_by_insn:
- /* escape from block */
- COMPILE(ret, "break val (block)", node->nd_stts);
- ADD_INSN1(ret, nd_line(node), throw, INT2FIX(level | 0x02) /* TAG_BREAK */ );
- if (poped) {
- ADD_INSN(ret, nd_line(node), pop);
- }
- }
- else if (iseq->type == ISEQ_TYPE_EVAL) {
- break_in_eval:
- COMPILE_ERROR((ERROR_ARGS "Can't escape from eval with break"));
- }
- else {
- rb_iseq_t *ip = iseq->parent_iseq;
- while (ip) {
- if (!ip->compile_data) {
- ip = 0;
- break;
- }
-
- level++;
- if (ip->compile_data->redo_label != 0) {
- level = 0x8000;
- if (ip->compile_data->loopval_popped == 0) {
- /* need value */
- level |= 0x4000;
- }
- goto break_by_insn;
- }
- else if (ip->type == ISEQ_TYPE_BLOCK) {
- level <<= 16;
- goto break_by_insn;
- }
- else if (ip->type == ISEQ_TYPE_EVAL) {
- goto break_in_eval;
- }
-
- ip = ip->parent_iseq;
- }
- COMPILE_ERROR((ERROR_ARGS "Invalid break"));
- }
- break;
- }
- case NODE_NEXT:{
- unsigned long level = 0;
-
- if (iseq->compile_data->redo_label != 0) {
- LABEL *splabel = NEW_LABEL(0);
- debugs("next in while loop\n");
- ADD_LABEL(ret, splabel);
- COMPILE(ret, "next val/valid syntax?", node->nd_stts);
- add_ensure_iseq(ret, iseq, 0);
- ADD_ADJUST(ret, nd_line(node), iseq->compile_data->redo_label);
- ADD_INSNL(ret, nd_line(node), jump, iseq->compile_data->start_label);
- ADD_ADJUST_RESTORE(ret, splabel);
- }
- else if (iseq->compile_data->end_label) {
- LABEL *splabel = NEW_LABEL(0);
- debugs("next in block\n");
- ADD_LABEL(ret, splabel);
- ADD_ADJUST(ret, nd_line(node), iseq->compile_data->start_label);
- COMPILE(ret, "next val", node->nd_stts);
- add_ensure_iseq(ret, iseq, 0);
- ADD_INSNL(ret, nd_line(node), jump, iseq->compile_data->end_label);
- ADD_ADJUST_RESTORE(ret, splabel);
-
- if (!poped) {
- ADD_INSN(ret, nd_line(node), putnil);
- }
- }
- else if (iseq->type == ISEQ_TYPE_EVAL) {
- next_in_eval:
- COMPILE_ERROR((ERROR_ARGS "Can't escape from eval with next"));
- }
- else {
- rb_iseq_t *ip;
- ip = iseq;
- while (ip) {
- if (!ip->compile_data) {
- ip = 0;
- break;
- }
-
- level = 0x8000 | 0x4000;
- if (ip->compile_data->redo_label != 0) {
- /* while loop */
- break;
- }
- else if (ip->type == ISEQ_TYPE_BLOCK) {
- break;
- }
- else if (ip->type == ISEQ_TYPE_EVAL) {
- goto next_in_eval;
- }
-
- ip = ip->parent_iseq;
- }
- if (ip != 0) {
- COMPILE(ret, "next val", node->nd_stts);
- ADD_INSN1(ret, nd_line(node), throw, INT2FIX(level | 0x03) /* TAG_NEXT */ );
-
- if (poped) {
- ADD_INSN(ret, nd_line(node), pop);
- }
- }
- else {
- COMPILE_ERROR((ERROR_ARGS "Invalid next"));
- }
- }
- break;
- }
- case NODE_REDO:{
- if (iseq->compile_data->redo_label) {
- LABEL *splabel = NEW_LABEL(0);
- debugs("redo in while");
- ADD_LABEL(ret, splabel);
- ADD_ADJUST(ret, nd_line(node), iseq->compile_data->redo_label);
- add_ensure_iseq(ret, iseq, 0);
- ADD_INSNL(ret, nd_line(node), jump, iseq->compile_data->redo_label);
- ADD_ADJUST_RESTORE(ret, splabel);
- }
- else if (iseq->type == ISEQ_TYPE_EVAL) {
- redo_in_eval:
- COMPILE_ERROR((ERROR_ARGS "Can't escape from eval with redo"));
- }
- else if (iseq->compile_data->start_label) {
- LABEL *splabel = NEW_LABEL(0);
-
- debugs("redo in block");
- ADD_LABEL(ret, splabel);
- add_ensure_iseq(ret, iseq, 0);
- ADD_ADJUST(ret, nd_line(node), iseq->compile_data->start_label);
- ADD_INSNL(ret, nd_line(node), jump, iseq->compile_data->start_label);
- ADD_ADJUST_RESTORE(ret, splabel);
-
- if (!poped) {
- ADD_INSN(ret, nd_line(node), putnil);
- }
- }
- else {
- rb_iseq_t *ip;
- unsigned long level;
- level = 0x8000 | 0x4000;
- ip = iseq;
- while (ip) {
- if (!ip->compile_data) {
- ip = 0;
- break;
- }
-
- if (ip->compile_data->redo_label != 0) {
- break;
- }
- else if (ip->type == ISEQ_TYPE_BLOCK) {
- break;
- }
- else if (ip->type == ISEQ_TYPE_EVAL) {
- goto redo_in_eval;
- }
-
- ip = ip->parent_iseq;
- }
- if (ip != 0) {
- ADD_INSN(ret, nd_line(node), putnil);
- ADD_INSN1(ret, nd_line(node), throw, INT2FIX(level | 0x05) /* TAG_REDO */ );
-
- if (poped) {
- ADD_INSN(ret, nd_line(node), pop);
- }
- }
- else {
- COMPILE_ERROR((ERROR_ARGS "Invalid redo"));
- }
- }
- break;
- }
- case NODE_RETRY:{
- if (iseq->type == ISEQ_TYPE_RESCUE) {
- ADD_INSN(ret, nd_line(node), putnil);
- ADD_INSN1(ret, nd_line(node), throw, INT2FIX(0x04) /* TAG_RETRY */ );
-
- if (poped) {
- ADD_INSN(ret, nd_line(node), pop);
- }
- }
- else {
- COMPILE_ERROR((ERROR_ARGS "Invalid retry"));
- }
- break;
- }
- case NODE_BEGIN:{
- COMPILE_(ret, "NODE_BEGIN", node->nd_body, poped);
- break;
- }
- case NODE_RESCUE:{
- LABEL *lstart = NEW_LABEL(nd_line(node));
- LABEL *lend = NEW_LABEL(nd_line(node));
- LABEL *lcont = NEW_LABEL(nd_line(node));
- VALUE rescue = NEW_CHILD_ISEQVAL(
- node->nd_resq,
- rb_str_concat(rb_str_new2("rescue in "), iseq->name),
- ISEQ_TYPE_RESCUE, nd_line(node));
-
- ADD_LABEL(ret, lstart);
- COMPILE(ret, "rescue head", node->nd_head);
- ADD_LABEL(ret, lend);
- if (node->nd_else) {
- ADD_INSN(ret, nd_line(node), pop);
- COMPILE(ret, "rescue else", node->nd_else);
- }
- ADD_INSN(ret, nd_line(node), nop);
- ADD_LABEL(ret, lcont);
-
- if (poped) {
- ADD_INSN(ret, nd_line(node), pop);
- }
-
- /* resgister catch entry */
- ADD_CATCH_ENTRY(CATCH_TYPE_RESCUE, lstart, lend, rescue, lcont);
- ADD_CATCH_ENTRY(CATCH_TYPE_RETRY, lend, lcont, 0, lstart);
- break;
- }
- case NODE_RESBODY:{
- NODE *resq = node;
- NODE *narg;
- LABEL *label_miss, *label_hit;
-
- while (resq) {
- label_miss = NEW_LABEL(nd_line(node));
- label_hit = NEW_LABEL(nd_line(node));
-
- narg = resq->nd_args;
- if (narg) {
- switch (nd_type(narg)) {
- case NODE_ARRAY:
- while (narg) {
- COMPILE(ret, "rescue arg", narg->nd_head);
- ADD_INSN2(ret, nd_line(node), getdynamic, INT2FIX(2), INT2FIX(0));
- ADD_SEND(ret, nd_line(node), ID2SYM(idEqq), INT2FIX(1));
- ADD_INSNL(ret, nd_line(node), branchif, label_hit);
- narg = narg->nd_next;
- }
- break;
- case NODE_SPLAT:
- case NODE_ARGSCAT:
- case NODE_ARGSPUSH:
- ADD_INSN2(ret, nd_line(node), getdynamic, INT2FIX(2), INT2FIX(0));
- COMPILE(ret, "rescue/cond splat", narg);
- ADD_INSN1(ret, nd_line(node), checkincludearray, Qtrue);
- ADD_INSN(ret, nd_line(node), swap);
- ADD_INSN(ret, nd_line(node), pop);
- ADD_INSNL(ret, nd_line(node), branchif, label_hit);
- break;
- default:
- rb_bug("NODE_RESBODY: unknown node (%s)",
- ruby_node_name(nd_type(narg)));
- }
- }
- else {
- ADD_INSN1(ret, nd_line(node), putobject,
- rb_eStandardError);
- ADD_INSN2(ret, nd_line(node), getdynamic, INT2FIX(2), INT2FIX(0));
- ADD_SEND(ret, nd_line(node), ID2SYM(idEqq), INT2FIX(1));
- ADD_INSNL(ret, nd_line(node), branchif, label_hit);
- }
- ADD_INSNL(ret, nd_line(node), jump, label_miss);
- ADD_LABEL(ret, label_hit);
- COMPILE(ret, "resbody body", resq->nd_body);
- if (iseq->compile_data->option->tailcall_optimization) {
- ADD_INSN(ret, nd_line(node), nop);
- }
- ADD_INSN(ret, nd_line(node), leave);
- ADD_LABEL(ret, label_miss);
- resq = resq->nd_head;
- }
- break;
- }
- case NODE_ENSURE:{
- DECL_ANCHOR(ensr);
- VALUE ensure = NEW_CHILD_ISEQVAL(node->nd_ensr,
- rb_str_concat(rb_str_new2
- ("ensure in "),
- iseq->name),
- ISEQ_TYPE_ENSURE, nd_line(node));
- LABEL *lstart = NEW_LABEL(nd_line(node));
- LABEL *lend = NEW_LABEL(nd_line(node));
- LABEL *lcont = NEW_LABEL(nd_line(node));
- struct ensure_range er;
- struct iseq_compile_data_ensure_node_stack enl;
- struct ensure_range *erange;
-
- INIT_ANCHOR(ensr);
- COMPILE_POPED(ensr, "ensure ensr", node->nd_ensr);
-
- er.begin = lstart;
- er.end = lend;
- er.next = 0;
- push_ensure_entry(iseq, &enl, &er, node->nd_ensr);
-
- ADD_LABEL(ret, lstart);
- COMPILE_(ret, "ensure head", node->nd_head, poped);
- ADD_LABEL(ret, lend);
- if (ensr->anchor.next == 0) {
- ADD_INSN(ret, nd_line(node), nop);
- }
- else {
- ADD_SEQ(ret, ensr);
- }
- ADD_LABEL(ret, lcont);
-
- erange = iseq->compile_data->ensure_node_stack->erange;
- while (erange) {
- ADD_CATCH_ENTRY(CATCH_TYPE_ENSURE, erange->begin, erange->end,
- ensure, lcont);
- erange = erange->next;
- }
-
- iseq->compile_data->ensure_node_stack = enl.prev;
- break;
- }
-
- case NODE_AND:
- case NODE_OR:{
- LABEL *end_label = NEW_LABEL(nd_line(node));
- COMPILE(ret, "nd_1st", node->nd_1st);
- if (!poped) {
- ADD_INSN(ret, nd_line(node), dup);
- }
- if (type == NODE_AND) {
- ADD_INSNL(ret, nd_line(node), branchunless, end_label);
- }
- else {
- ADD_INSNL(ret, nd_line(node), branchif, end_label);
- }
- if (!poped) {
- ADD_INSN(ret, nd_line(node), pop);
- }
- COMPILE_(ret, "nd_2nd", node->nd_2nd, poped);
- ADD_LABEL(ret, end_label);
- break;
- }
-
- case NODE_MASGN:{
- compile_massign(iseq, ret, node, poped);
- break;
- }
-
- case NODE_LASGN:{
- ID id = node->nd_vid;
- int idx = iseq->local_iseq->local_size - get_local_var_idx(iseq, id);
-
- debugs("lvar: %s idx: %d\n", rb_id2name(id), idx);
- COMPILE(ret, "rvalue", node->nd_value);
-
- if (!poped) {
- ADD_INSN(ret, nd_line(node), dup);
- }
- ADD_INSN1(ret, nd_line(node), setlocal, INT2FIX(idx));
-
- break;
- }
- case NODE_DASGN:
- case NODE_DASGN_CURR:{
- int idx, lv, ls;
- COMPILE(ret, "dvalue", node->nd_value);
- debugp_param("dassn id", rb_str_new2(rb_id2name(node->nd_vid) ? rb_id2name(node->nd_vid) : "*"));
-
- if (!poped) {
- ADD_INSN(ret, nd_line(node), dup);
- }
-
- idx = get_dyna_var_idx(iseq, node->nd_vid, &lv, &ls);
-
- if (idx < 0) {
- rb_bug("NODE_DASGN(_CURR): unknown id (%s)", rb_id2name(node->nd_vid));
- }
-
- ADD_INSN2(ret, nd_line(node), setdynamic,
- INT2FIX(ls - idx), INT2FIX(lv));
- break;
- }
- case NODE_GASGN:{
- COMPILE(ret, "lvalue", node->nd_value);
-
- if (!poped) {
- ADD_INSN(ret, nd_line(node), dup);
- }
- ADD_INSN1(ret, nd_line(node), setglobal,
- (((long)node->nd_entry) | 1));
- break;
- }
- case NODE_IASGN:
- case NODE_IASGN2:{
- COMPILE(ret, "lvalue", node->nd_value);
- if (!poped) {
- ADD_INSN(ret, nd_line(node), dup);
- }
- ADD_INSN1(ret, nd_line(node), setinstancevariable,
- ID2SYM(node->nd_vid));
- break;
- }
- case NODE_CDECL:{
- COMPILE(ret, "lvalue", node->nd_value);
-
- if (!poped) {
- ADD_INSN(ret, nd_line(node), dup);
- }
-
- if (node->nd_vid) {
- ADD_INSN1(ret, nd_line(node), putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_CBASE));
- ADD_INSN1(ret, nd_line(node), setconstant, ID2SYM(node->nd_vid));
- }
- else {
- compile_cpath(ret, iseq, node->nd_else);
- ADD_INSN1(ret, nd_line(node), setconstant, ID2SYM(node->nd_else->nd_mid));
- }
- break;
- }
- case NODE_CVASGN:{
- COMPILE(ret, "cvasgn val", node->nd_value);
- if (!poped) {
- ADD_INSN(ret, nd_line(node), dup);
- }
- ADD_INSN1(ret, nd_line(node), setclassvariable,
- ID2SYM(node->nd_vid));
- break;
- }
- case NODE_OP_ASGN1: {
- DECL_ANCHOR(args);
- VALUE argc;
- unsigned long flag = 0;
- ID id = node->nd_mid;
-
- /*
- * a[x] (op)= y
- *
- * nil # nil
- * eval a # nil a
- * eval x # nil a x
- * dupn 2 # nil a x a x
- * send :[] # nil a x a[x]
- * eval y # nil a x a[x] y
- * send op # nil a x ret
- * setn 3 # ret a x ret
- * send []= # ret ?
- * pop # ret
- */
-
- /*
- * nd_recv[nd_args->nd_body] (nd_mid)= nd_args->nd_head;
- * NODE_OP_ASGN nd_recv
- * nd_args->nd_head
- * nd_args->nd_body
- * nd_mid
- */
-
- if (!poped) {
- ADD_INSN(ret, nd_line(node), putnil);
- }
- COMPILE(ret, "NODE_OP_ASGN1 recv", node->nd_recv);
- if (nd_type(node->nd_args->nd_body) != NODE_ZARRAY) {
- INIT_ANCHOR(args);
- argc = setup_args(iseq, args, node->nd_args->nd_body, &flag);
- ADD_SEQ(ret, args);
- }
- else {
- argc = INT2FIX(0);
- }
- ADD_INSN1(ret, nd_line(node), dupn, FIXNUM_INC(argc, 1));
- ADD_SEND_R(ret, nd_line(node), ID2SYM(idAREF), argc, Qfalse, LONG2FIX(flag));
-
- if (id == 0 || id == 1) {
- /* 0: or, 1: and
- a[x] ||= y
-
- unless/if a[x]
- a[x]= y
- else
- nil
- end
- */
- LABEL *label = NEW_LABEL(nd_line(node));
- LABEL *lfin = NEW_LABEL(nd_line(node));
-
- ADD_INSN(ret, nd_line(node), dup);
- if (id == 0) {
- /* or */
- ADD_INSNL(ret, nd_line(node), branchif, label);
- }
- else {
- /* and */
- ADD_INSNL(ret, nd_line(node), branchunless, label);
- }
- ADD_INSN(ret, nd_line(node), pop);
-
- COMPILE(ret, "NODE_OP_ASGN1 args->head: ", node->nd_args->nd_head);
- if (!poped) {
- ADD_INSN1(ret, nd_line(node), setn, FIXNUM_INC(argc, 2));
- }
- if (flag & VM_CALL_ARGS_SPLAT_BIT) {
- ADD_INSN1(ret, nd_line(node), newarray, INT2FIX(1));
- ADD_INSN(ret, nd_line(node), concatarray);
- ADD_SEND_R(ret, nd_line(node), ID2SYM(idASET),
- argc, Qfalse, LONG2FIX(flag));
- }
- else {
- ADD_SEND_R(ret, nd_line(node), ID2SYM(idASET),
- FIXNUM_INC(argc, 1), Qfalse, LONG2FIX(flag));
- }
- ADD_INSN(ret, nd_line(node), pop);
- ADD_INSNL(ret, nd_line(node), jump, lfin);
- ADD_LABEL(ret, label);
- if (!poped) {
- ADD_INSN1(ret, nd_line(node), setn, FIXNUM_INC(argc, 2));
- }
- ADD_INSN1(ret, nd_line(node), adjuststack, FIXNUM_INC(argc, 2));
- ADD_LABEL(ret, lfin);
- }
- else {
- COMPILE(ret, "NODE_OP_ASGN1 args->head: ", node->nd_args->nd_head);
- ADD_SEND(ret, nd_line(node), ID2SYM(id), INT2FIX(1));
- if (!poped) {
- ADD_INSN1(ret, nd_line(node), setn, FIXNUM_INC(argc, 2));
- }
- if (flag & VM_CALL_ARGS_SPLAT_BIT) {
- ADD_INSN1(ret, nd_line(node), newarray, INT2FIX(1));
- ADD_INSN(ret, nd_line(node), concatarray);
- ADD_SEND_R(ret, nd_line(node), ID2SYM(idASET),
- argc, Qfalse, LONG2FIX(flag));
- }
- else {
- ADD_SEND_R(ret, nd_line(node), ID2SYM(idASET),
- FIXNUM_INC(argc, 1), Qfalse, LONG2FIX(flag));
- }
- ADD_INSN(ret, nd_line(node), pop);
- }
-
- break;
- }
- case NODE_OP_ASGN2:{
- ID atype = node->nd_next->nd_mid;
- LABEL *lfin = NEW_LABEL(nd_line(node));
- LABEL *lcfin = NEW_LABEL(nd_line(node));
- /*
- class C; attr_accessor :c; end
- r = C.new
- r.a &&= v # asgn2
-
- eval r # r
- dup # r r
- eval r.a # r o
-
- # or
- dup # r o o
- if lcfin # r o
- pop # r
- eval v # r v
- swap # v r
- topn 1 # v r v
- send a= # v ?
- jump lfin # v ?
-
- lcfin: # r o
- swap # o r
-
- lfin: # o ?
- pop # o
-
- # and
- dup # r o o
- unless lcfin
- pop # r
- eval v # r v
- swap # v r
- topn 1 # v r v
- send a= # v ?
- jump lfin # v ?
-
- # others
- eval v # r o v
- send ?? # r w
- send a= # w
-
- */
-
- COMPILE(ret, "NODE_OP_ASGN2#recv", node->nd_recv);
- ADD_INSN(ret, nd_line(node), dup);
- ADD_SEND(ret, nd_line(node), ID2SYM(node->nd_next->nd_vid),
- INT2FIX(0));
-
- if (atype == 0 || atype == 1) { /* 0: OR or 1: AND */
- ADD_INSN(ret, nd_line(node), dup);
- if (atype == 0) {
- ADD_INSNL(ret, nd_line(node), branchif, lcfin);
- }
- else {
- ADD_INSNL(ret, nd_line(node), branchunless, lcfin);
- }
- ADD_INSN(ret, nd_line(node), pop);
- COMPILE(ret, "NODE_OP_ASGN2 val", node->nd_value);
- ADD_INSN(ret, nd_line(node), swap);
- ADD_INSN1(ret, nd_line(node), topn, INT2FIX(1));
- ADD_SEND(ret, nd_line(node), ID2SYM(node->nd_next->nd_aid),
- INT2FIX(1));
- ADD_INSNL(ret, nd_line(node), jump, lfin);
-
- ADD_LABEL(ret, lcfin);
- ADD_INSN(ret, nd_line(node), swap);
-
- ADD_LABEL(ret, lfin);
- ADD_INSN(ret, nd_line(node), pop);
- if (poped) {
- /* we can apply more optimize */
- ADD_INSN(ret, nd_line(node), pop);
- }
- }
- else {
- COMPILE(ret, "NODE_OP_ASGN2 val", node->nd_value);
- ADD_SEND(ret, nd_line(node), ID2SYM(node->nd_next->nd_mid),
- INT2FIX(1));
- if (!poped) {
- ADD_INSN(ret, nd_line(node), swap);
- ADD_INSN1(ret, nd_line(node), topn, INT2FIX(1));
- }
- ADD_SEND(ret, nd_line(node), ID2SYM(node->nd_next->nd_aid),
- INT2FIX(1));
- ADD_INSN(ret, nd_line(node), pop);
- }
- break;
- }
- case NODE_OP_ASGN_AND:
- case NODE_OP_ASGN_OR:{
- LABEL *lfin = NEW_LABEL(nd_line(node));
- LABEL *lassign;
-
- if (nd_type(node) == NODE_OP_ASGN_OR) {
- LABEL *lfinish[2];
- lfinish[0] = lfin;
- lfinish[1] = 0;
- defined_expr(iseq, ret, node->nd_head, lfinish, Qfalse);
- lassign = lfinish[1];
- if (!lassign) {
- lassign = NEW_LABEL(nd_line(node));
- }
- ADD_INSNL(ret, nd_line(node), branchunless, lassign);
- }
- else {
- lassign = NEW_LABEL(nd_line(node));
- }
-
- COMPILE(ret, "NODE_OP_ASGN_AND/OR#nd_head", node->nd_head);
- ADD_INSN(ret, nd_line(node), dup);
-
- if (nd_type(node) == NODE_OP_ASGN_AND) {
- ADD_INSNL(ret, nd_line(node), branchunless, lfin);
- }
- else {
- ADD_INSNL(ret, nd_line(node), branchif, lfin);
- }
-
- ADD_INSN(ret, nd_line(node), pop);
- ADD_LABEL(ret, lassign);
- COMPILE(ret, "NODE_OP_ASGN_AND/OR#nd_value", node->nd_value);
- ADD_LABEL(ret, lfin);
-
- if (poped) {
- /* we can apply more optimize */
- ADD_INSN(ret, nd_line(node), pop);
- }
- break;
- }
- case NODE_CALL:
- case NODE_FCALL:
- case NODE_VCALL:{ /* VCALL: variable or call */
- /*
- call: obj.method(...)
- fcall: func(...)
- vcall: func
- */
- DECL_ANCHOR(recv);
- DECL_ANCHOR(args);
- ID mid = node->nd_mid;
- VALUE argc;
- unsigned long flag = 0;
- VALUE parent_block = iseq->compile_data->current_block;
- iseq->compile_data->current_block = Qfalse;
-
- INIT_ANCHOR(recv);
- INIT_ANCHOR(args);
-#if SUPPORT_JOKE
- if (nd_type(node) == NODE_VCALL) {
- if (mid == idBitblt) {
- ADD_INSN(ret, nd_line(node), bitblt);
- break;
- }
- else if (mid == idAnswer) {
- ADD_INSN(ret, nd_line(node), answer);
- break;
- }
- }
- /* only joke */
- {
- ID goto_id;
- ID label_id;
- VALUE label;
- VALUE label_sym;
-
- CONST_ID(goto_id, "__goto__");
- CONST_ID(label_id, "__label__");
-
- if (nd_type(node) == NODE_FCALL &&
- (mid == goto_id || mid == label_id)) {
- if (nd_type(node->nd_args->nd_head) == NODE_LIT &&
- SYMBOL_P(node->nd_args->nd_head->nd_lit)) {
-
- label_sym = label = node->nd_args->nd_head->nd_lit;
- if ((label =
- rb_hash_aref(iseq->compile_data,
- label_sym)) == Qnil) {
- rb_hash_aset(iseq->compile_data, label_sym,
- label = NEW_LABEL(nd_line(node)));
- }
- }
- else {
- rb_bug("invalid goto/label format");
- }
-
-
- if (mid == goto_id) {
- ADD_INSNL(ret, nd_line(node), jump, label);
- }
- else {
- ADD_LABEL(ret, label);
- }
- break;
- }
- }
-#endif
- /* reciever */
- if (type == NODE_CALL) {
- COMPILE(recv, "recv", node->nd_recv);
- }
- else if (type == NODE_FCALL || type == NODE_VCALL) {
- ADD_CALL_RECEIVER(recv, nd_line(node));
- }
-
- /* args */
- if (nd_type(node) != NODE_VCALL) {
- argc = setup_args(iseq, args, node->nd_args, &flag);
- }
- else {
- argc = INT2FIX(0);
- }
-
- ADD_SEQ(ret, recv);
- ADD_SEQ(ret, args);
-
- debugp_param("call args argc", argc);
- debugp_param("call method", ID2SYM(mid));
-
- switch (nd_type(node)) {
- case NODE_VCALL:
- flag |= VM_CALL_VCALL_BIT;
- /* VCALL is funcall, so fall through */
- case NODE_FCALL:
- flag |= VM_CALL_FCALL_BIT;
- }
-
- ADD_SEND_R(ret, nd_line(node), ID2SYM(mid),
- argc, parent_block, LONG2FIX(flag));
-
- if (poped) {
- ADD_INSN(ret, nd_line(node), pop);
- }
- break;
- }
- case NODE_SUPER:
- case NODE_ZSUPER:{
- DECL_ANCHOR(args);
- VALUE argc;
- unsigned long flag = 0;
- VALUE parent_block = iseq->compile_data->current_block;
-
- INIT_ANCHOR(args);
- iseq->compile_data->current_block = Qfalse;
- if (nd_type(node) == NODE_SUPER) {
- argc = setup_args(iseq, args, node->nd_args, &flag);
- }
- else {
- /* NODE_ZSUPER */
- int i;
- rb_iseq_t *liseq = iseq->local_iseq;
-
- argc = INT2FIX(liseq->argc);
-
- /* normal arguments */
- for (i = 0; i < liseq->argc; i++) {
- int idx = liseq->local_size - i;
- ADD_INSN1(args, nd_line(node), getlocal, INT2FIX(idx));
- }
-
- if (!liseq->arg_simple) {
- if (liseq->arg_opts) {
- /* optional arguments */
- int j;
- for (j = 0; j < liseq->arg_opts - 1; j++) {
- int idx = liseq->local_size - (i + j);
- ADD_INSN1(args, nd_line(node), getlocal, INT2FIX(idx));
- }
- i += j;
- argc = INT2FIX(i);
- }
-
- if (liseq->arg_rest != -1) {
- /* rest argument */
- int idx = liseq->local_size - liseq->arg_rest;
- ADD_INSN1(args, nd_line(node), getlocal, INT2FIX(idx));
- argc = INT2FIX(liseq->arg_rest + 1);
- flag |= VM_CALL_ARGS_SPLAT_BIT;
- }
-
- if (liseq->arg_post_len) {
- /* post arguments */
- int post_len = liseq->arg_post_len;
- int post_start = liseq->arg_post_start;
-
- if (liseq->arg_rest != -1) {
- int j;
- for (j=0; j<post_len; j++) {
- int idx = liseq->local_size - (post_start + j);
- ADD_INSN1(args, nd_line(node), getlocal, INT2FIX(idx));
- }
- ADD_INSN1(args, nd_line(node), newarray, INT2FIX(j));
- ADD_INSN (args, nd_line(node), concatarray);
- /* argc is setteled at above */
- }
- else {
- int j;
- for (j=0; j<post_len; j++) {
- int idx = liseq->local_size - (post_start + j);
- ADD_INSN1(args, nd_line(node), getlocal, INT2FIX(idx));
- }
- argc = INT2FIX(post_len + post_start);
- }
- }
- }
- }
-
- /* dummy reciever */
- ADD_INSN1(ret, nd_line(node), putobject,
- nd_type(node) == NODE_ZSUPER ? Qfalse : Qtrue);
- ADD_SEQ(ret, args);
- ADD_INSN3(ret, nd_line(node), invokesuper,
- argc, parent_block, LONG2FIX(flag));
-
- if (poped) {
- ADD_INSN(ret, nd_line(node), pop);
- }
- break;
- }
- case NODE_ARRAY:{
- compile_array_(iseq, ret, node, Qtrue, poped);
- break;
- }
- case NODE_ZARRAY:{
- if (!poped) {
- ADD_INSN1(ret, nd_line(node), newarray, INT2FIX(0));
- }
- break;
- }
- case NODE_VALUES:{
- NODE *n = node;
- while (n) {
- COMPILE(ret, "values item", n->nd_head);
- n = n->nd_next;
- }
- ADD_INSN1(ret, nd_line(node), newarray, INT2FIX(node->nd_alen));
- if (poped) {
- ADD_INSN(ret, nd_line(node), pop);
- }
- break;
- }
- case NODE_HASH:{
- DECL_ANCHOR(list);
- VALUE size = 0;
- int type = node->nd_head ? nd_type(node->nd_head) : NODE_ZARRAY;
-
- INIT_ANCHOR(list);
- switch (type) {
- case NODE_ARRAY:{
- compile_array(iseq, list, node->nd_head, Qfalse);
- size = OPERAND_AT(POP_ELEMENT(list), 0);
- ADD_SEQ(ret, list);
- break;
- }
- case NODE_ZARRAY:
- size = INT2FIX(0);
- break;
-
- default:
- rb_bug("can't make hash with this node: %s", ruby_node_name(type));
- }
-
- ADD_INSN1(ret, nd_line(node), newhash, size);
-
- if (poped) {
- ADD_INSN(ret, nd_line(node), pop);
- }
- break;
- }
- case NODE_RETURN:{
- rb_iseq_t *is = iseq;
-
- if (is) {
- if (is->type == ISEQ_TYPE_TOP || is->type == ISEQ_TYPE_CLASS) {
- COMPILE_ERROR((ERROR_ARGS "Invalid return"));
- }
- else {
- LABEL *splabel = 0;
-
- if (is->type == ISEQ_TYPE_METHOD) {
- splabel = NEW_LABEL(0);
- ADD_LABEL(ret, splabel);
- ADD_ADJUST(ret, nd_line(node), 0);
- }
-
- COMPILE(ret, "return nd_stts (return val)", node->nd_stts);
-
- if (is->type == ISEQ_TYPE_METHOD) {
- add_ensure_iseq(ret, iseq, 1);
- ADD_TRACE(ret, nd_line(node), RUBY_EVENT_RETURN);
- ADD_INSN(ret, nd_line(node), leave);
- ADD_ADJUST_RESTORE(ret, splabel);
-
- if (!poped) {
- ADD_INSN(ret, nd_line(node), putnil);
- }
- }
- else {
- ADD_INSN1(ret, nd_line(node), throw, INT2FIX(0x01) /* TAG_RETURN */ );
- if (poped) {
- ADD_INSN(ret, nd_line(node), pop);
- }
- }
- }
- }
- break;
- }
- case NODE_YIELD:{
- DECL_ANCHOR(args);
- VALUE argc;
- unsigned long flag = 0;
-
- INIT_ANCHOR(args);
- if (iseq->type == ISEQ_TYPE_TOP || iseq->type == ISEQ_TYPE_CLASS) {
- COMPILE_ERROR((ERROR_ARGS "Invalid yield"));
- }
-
- if (node->nd_head) {
- argc = setup_args(iseq, args, node->nd_head, &flag);
- }
- else {
- argc = INT2FIX(0);
- }
-
- ADD_SEQ(ret, args);
- ADD_INSN2(ret, nd_line(node), invokeblock, argc, LONG2FIX(flag));
-
- if (poped) {
- ADD_INSN(ret, nd_line(node), pop);
- }
- break;
- }
- case NODE_LVAR:{
- if (!poped) {
- ID id = node->nd_vid;
- int idx = iseq->local_iseq->local_size - get_local_var_idx(iseq, id);
-
- debugs("id: %s idx: %d\n", rb_id2name(id), idx);
- ADD_INSN1(ret, nd_line(node), getlocal, INT2FIX(idx));
- }
- break;
- }
- case NODE_DVAR:{
- int lv, idx, ls;
- debugi("nd_vid", node->nd_vid);
- if (!poped) {
- idx = get_dyna_var_idx(iseq, node->nd_vid, &lv, &ls);
- if (idx < 0) {
- rb_bug("unknown dvar (%s)", rb_id2name(node->nd_vid));
- }
- ADD_INSN2(ret, nd_line(node), getdynamic, INT2FIX(ls - idx), INT2FIX(lv));
- }
- break;
- }
- case NODE_GVAR:{
- ADD_INSN1(ret, nd_line(node), getglobal,
- (((long)node->nd_entry) | 1));
- if (poped) {
- ADD_INSN(ret, nd_line(node), pop);
- }
- break;
- }
- case NODE_IVAR:{
- debugi("nd_vid", node->nd_vid);
- if (!poped) {
- ADD_INSN1(ret, nd_line(node), getinstancevariable,
- ID2SYM(node->nd_vid));
- }
- break;
- }
- case NODE_CONST:{
- debugi("nd_vid", node->nd_vid);
-
- if (iseq->compile_data->option->inline_const_cache) {
- LABEL *lstart = NEW_LABEL(nd_line(node));
- LABEL *lend = NEW_LABEL(nd_line(node));
-
- ADD_LABEL(ret, lstart);
- ADD_INSN1(ret, nd_line(node), getinlinecache, lend);
- ADD_INSN1(ret, nd_line(node), getconstant, ID2SYM(node->nd_vid));
- ADD_INSN1(ret, nd_line(node), setinlinecache, lstart);
- ADD_LABEL(ret, lend);
- }
- else {
- ADD_INSN(ret, nd_line(node), putnil);
- ADD_INSN1(ret, nd_line(node), getconstant, ID2SYM(node->nd_vid));
- }
-
- if (poped) {
- ADD_INSN(ret, nd_line(node), pop);
- }
- break;
- }
- case NODE_CVAR:{
- if (!poped) {
- ADD_INSN1(ret, nd_line(node), getclassvariable,
- ID2SYM(node->nd_vid));
- }
- break;
- }
- case NODE_NTH_REF:{
- if (!poped) {
- ADD_INSN2(ret, nd_line(node), getspecial, INT2FIX(1) /* '~' */,
- INT2FIX(node->nd_nth << 1));
- }
- break;
- }
- case NODE_BACK_REF:{
- if (!poped) {
- ADD_INSN2(ret, nd_line(node), getspecial, INT2FIX(1) /* '~' */,
- INT2FIX(0x01 | (node->nd_nth << 1)));
- }
- break;
- }
- case NODE_MATCH:
- case NODE_MATCH2:
- case NODE_MATCH3:{
- DECL_ANCHOR(recv);
- DECL_ANCHOR(val);
-
- INIT_ANCHOR(recv);
- INIT_ANCHOR(val);
- switch(nd_type(node)) {
- case NODE_MATCH:
- ADD_INSN1(recv, nd_line(node), putobject, node->nd_lit);
- ADD_INSN2(val, nd_line(node), getspecial, INT2FIX(0),
- INT2FIX(0));
- break;
- case NODE_MATCH2:
- COMPILE(recv, "reciever", node->nd_recv);
- COMPILE(val, "value", node->nd_value);
- break;
- case NODE_MATCH3:
- COMPILE(recv, "reciever", node->nd_value);
- COMPILE(val, "value", node->nd_recv);
- break;
- }
-
- if (iseq->compile_data->option->specialized_instruction) {
- /* TODO: detect by node */
- if (recv->last == recv->anchor.next &&
- INSN_OF(recv->last) == BIN(putobject) &&
- nd_type(node) == NODE_MATCH2) {
- ADD_SEQ(ret, val);
- ADD_INSN1(ret, nd_line(node), opt_regexpmatch1,
- OPERAND_AT(recv->last, 0));
- }
- else {
- ADD_SEQ(ret, recv);
- ADD_SEQ(ret, val);
- ADD_INSN(ret, nd_line(node), opt_regexpmatch2);
- }
- }
- else {
- ADD_SEQ(ret, recv);
- ADD_SEQ(ret, val);
- ADD_SEND(ret, nd_line(node), ID2SYM(idEqTilde), INT2FIX(1));
- }
-
- if (poped) {
- ADD_INSN(ret, nd_line(node), pop);
- }
- break;
- }
- case NODE_LIT:{
- debugp_param("lit", node->nd_lit);
- if (!poped) {
- ADD_INSN1(ret, nd_line(node), putobject, node->nd_lit);
- }
- break;
- }
- case NODE_STR:{
- debugp_param("nd_lit", node->nd_lit);
- if (!poped) {
- hide_obj(node->nd_lit);
- ADD_INSN1(ret, nd_line(node), putstring, node->nd_lit);
- }
- break;
- }
- case NODE_DSTR:{
- compile_dstr(iseq, ret, node);
-
- if (poped) {
- ADD_INSN(ret, nd_line(node), pop);
- }
- break;
- }
- case NODE_XSTR:{
- OBJ_FREEZE(node->nd_lit);
- ADD_CALL_RECEIVER(ret, nd_line(node));
- ADD_INSN1(ret, nd_line(node), putobject, node->nd_lit);
- ADD_CALL(ret, nd_line(node), ID2SYM(idBackquote), INT2FIX(1));
-
- if (poped) {
- ADD_INSN(ret, nd_line(node), pop);
- }
- break;
- }
- case NODE_DXSTR:{
- ADD_CALL_RECEIVER(ret, nd_line(node));
- compile_dstr(iseq, ret, node);
- ADD_CALL(ret, nd_line(node), ID2SYM(idBackquote), INT2FIX(1));
-
- if (poped) {
- ADD_INSN(ret, nd_line(node), pop);
- }
- break;
- }
- case NODE_EVSTR:{
- COMPILE(ret, "nd_body", node->nd_body);
-
- if (poped) {
- ADD_INSN(ret, nd_line(node), pop);
- }
- else {
- ADD_INSN(ret, nd_line(node), tostring);
- }
- break;
- }
- case NODE_DREGX:{
- compile_dregx(iseq, ret, node);
-
- if (poped) {
- ADD_INSN(ret, nd_line(node), pop);
- }
- break;
- }
- case NODE_DREGX_ONCE:{
- /* TODO: once? */
- LABEL *lstart = NEW_LABEL(nd_line(node));
- LABEL *lend = NEW_LABEL(nd_line(node));
-
- ADD_LABEL(ret, lstart);
- ADD_INSN1(ret, nd_line(node), onceinlinecache, lend);
- ADD_INSN(ret, nd_line(node), pop);
-
- compile_dregx(iseq, ret, node);
-
- ADD_INSN1(ret, nd_line(node), setinlinecache, lstart);
- ADD_LABEL(ret, lend);
-
- if (poped) {
- ADD_INSN(ret, nd_line(node), pop);
- }
- break;
- }
- case NODE_ARGSCAT:{
- COMPILE(ret, "argscat head", node->nd_head);
- COMPILE(ret, "argscat body", node->nd_body);
- ADD_INSN(ret, nd_line(node), concatarray);
- break;
- }
- case NODE_ARGSPUSH:{
- COMPILE(ret, "arsgpush head", node->nd_head);
- COMPILE(ret, "argspush body", node->nd_body);
- ADD_INSN1(ret, nd_line(node), newarray, INT2FIX(1));
- ADD_INSN(ret, nd_line(node), concatarray);
- break;
- }
- case NODE_SPLAT:{
- COMPILE(ret, "splat", node->nd_head);
- ADD_INSN1(ret, nd_line(node), splatarray, Qfalse);
-
- if (poped) {
- ADD_INSN(ret, nd_line(node), pop);
- }
- break;
- }
- case NODE_DEFN:{
- VALUE iseqval = NEW_ISEQVAL(node->nd_defn,
- rb_str_dup(rb_id2str(node->nd_mid)),
- ISEQ_TYPE_METHOD, nd_line(node));
-
- debugp_param("defn/iseq", iseqval);
-
- ADD_INSN1(ret, nd_line(node), putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
- ADD_INSN1(ret, nd_line(node), putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_CBASE));
- ADD_INSN1(ret, nd_line(node), putobject, ID2SYM(node->nd_mid));
- ADD_INSN1(ret, nd_line(node), putiseq, iseqval);
- ADD_SEND (ret, nd_line(node), ID2SYM(id_core_define_method), INT2FIX(3));
-
- if (poped) {
- ADD_INSN(ret, nd_line(node), pop);
- }
-
- debugp_param("defn", iseqval);
- break;
- }
- case NODE_DEFS:{
- VALUE iseqval = NEW_ISEQVAL(node->nd_defn,
- rb_str_dup(rb_id2str(node->nd_mid)),
- ISEQ_TYPE_METHOD, nd_line(node));
-
- debugp_param("defs/iseq", iseqval);
-
- ADD_INSN1(ret, nd_line(node), putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
- COMPILE(ret, "defs: recv", node->nd_recv);
- ADD_INSN1(ret, nd_line(node), putobject, ID2SYM(node->nd_mid));
- ADD_INSN1(ret, nd_line(node), putiseq, iseqval);
- ADD_SEND (ret, nd_line(node), ID2SYM(id_core_define_singleton_method), INT2FIX(3));
-
- if (poped) {
- ADD_INSN(ret, nd_line(node), pop);
- }
- break;
- }
- case NODE_ALIAS:{
- ADD_INSN1(ret, nd_line(node), putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
- ADD_INSN1(ret, nd_line(node), putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_CBASE));
- COMPILE(ret, "alias arg1", node->u1.node);
- COMPILE(ret, "alias arg2", node->u2.node);
- ADD_SEND(ret, nd_line(node), ID2SYM(id_core_set_method_alias), INT2FIX(3));
-
- if (poped) {
- ADD_INSN(ret, nd_line(node), pop);
- }
- break;
- }
- case NODE_VALIAS:{
- ADD_INSN1(ret, nd_line(node), putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
- ADD_INSN1(ret, nd_line(node), putobject, ID2SYM(node->u1.id));
- ADD_INSN1(ret, nd_line(node), putobject, ID2SYM(node->u2.id));
- ADD_SEND(ret, nd_line(node), ID2SYM(id_core_set_variable_alias), INT2FIX(2));
-
- if (poped) {
- ADD_INSN(ret, nd_line(node), pop);
- }
- break;
- }
- case NODE_UNDEF:{
- ADD_INSN1(ret, nd_line(node), putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
- ADD_INSN1(ret, nd_line(node), putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_CBASE));
- COMPILE(ret, "undef arg", node->u2.node);
- ADD_SEND(ret, nd_line(node), ID2SYM(id_core_undef_method), INT2FIX(2));
-
- if (poped) {
- ADD_INSN(ret, nd_line(node), pop);
- }
- break;
- }
- case NODE_CLASS:{
- VALUE iseqval =
- NEW_CHILD_ISEQVAL(
- node->nd_body,
- rb_sprintf("<class:%s>", rb_id2name(node->nd_cpath->nd_mid)),
- ISEQ_TYPE_CLASS, nd_line(node));
- compile_cpath(ret, iseq, node->nd_cpath);
- COMPILE(ret, "super", node->nd_super);
- ADD_INSN3(ret, nd_line(node), defineclass,
- ID2SYM(node->nd_cpath->nd_mid), iseqval, INT2FIX(0));
-
- if (poped) {
- ADD_INSN(ret, nd_line(node), pop);
- }
- break;
- }
- case NODE_MODULE:{
- VALUE iseqval = NEW_CHILD_ISEQVAL(
- node->nd_body,
- rb_sprintf("<module:%s>", rb_id2name(node->nd_cpath->nd_mid)),
- ISEQ_TYPE_CLASS, nd_line(node));
-
- compile_cpath(ret, iseq, node->nd_cpath);
- ADD_INSN (ret, nd_line(node), putnil); /* dummy */
- ADD_INSN3(ret, nd_line(node), defineclass,
- ID2SYM(node->nd_cpath->nd_mid), iseqval, INT2FIX(2));
- if (poped) {
- ADD_INSN(ret, nd_line(node), pop);
- }
- break;
- }
- case NODE_SCLASS:{
- ID singletonclass;
- VALUE iseqval =
- NEW_ISEQVAL(node->nd_body, rb_str_new2("singletonclass"),
- ISEQ_TYPE_CLASS, nd_line(node));
-
- COMPILE(ret, "sclass#recv", node->nd_recv);
- ADD_INSN (ret, nd_line(node), putnil);
- CONST_ID(singletonclass, "singletonclass");
- ADD_INSN3(ret, nd_line(node), defineclass,
- ID2SYM(singletonclass), iseqval, INT2FIX(1));
-
- if (poped) {
- ADD_INSN(ret, nd_line(node), pop);
- }
- break;
- }
- case NODE_COLON2:{
- if (rb_is_const_id(node->nd_mid)) {
- /* constant */
- LABEL *lstart = NEW_LABEL(nd_line(node));
- LABEL *lend = NEW_LABEL(nd_line(node));
- DECL_ANCHOR(pref);
- DECL_ANCHOR(body);
-
- INIT_ANCHOR(pref);
- INIT_ANCHOR(body);
- compile_colon2(iseq, node, pref, body);
- if (LIST_SIZE_ZERO(pref)) {
- if (iseq->compile_data->option->inline_const_cache) {
- ADD_LABEL(ret, lstart);
- ADD_INSN1(ret, nd_line(node), getinlinecache, lend);
- }
- else {
- ADD_INSN(ret, nd_line(node), putnil);
- }
-
- ADD_SEQ(ret, body);
-
- if (iseq->compile_data->option->inline_const_cache) {
- ADD_INSN1(ret, nd_line(node), setinlinecache, lstart);
- ADD_LABEL(ret, lend);
- }
- }
- else {
- ADD_SEQ(ret, pref);
- ADD_SEQ(ret, body);
- }
- }
- else {
- /* function call */
- ADD_CALL_RECEIVER(ret, nd_line(node));
- COMPILE(ret, "colon2#nd_head", node->nd_head);
- ADD_CALL(ret, nd_line(node), ID2SYM(node->nd_mid),
- INT2FIX(1));
- }
- if (poped) {
- ADD_INSN(ret, nd_line(node), pop);
- }
- break;
- }
- case NODE_COLON3:{
- LABEL *lstart = NEW_LABEL(nd_line(node));
- LABEL *lend = NEW_LABEL(nd_line(node));
- debugi("colon3#nd_mid", node->nd_mid);
-
- /* add cache insn */
- if (iseq->compile_data->option->inline_const_cache) {
- ADD_LABEL(ret, lstart);
- ADD_INSN1(ret, nd_line(node), getinlinecache, lend);
- ADD_INSN(ret, nd_line(node), pop);
- }
-
- ADD_INSN1(ret, nd_line(node), putobject, rb_cObject);
- ADD_INSN1(ret, nd_line(node), getconstant, ID2SYM(node->nd_mid));
-
- if (iseq->compile_data->option->inline_const_cache) {
- ADD_INSN1(ret, nd_line(node), setinlinecache, lstart);
- ADD_LABEL(ret, lend);
- }
-
- if (poped) {
- ADD_INSN(ret, nd_line(node), pop);
- }
- break;
- }
- case NODE_DOT2:
- case NODE_DOT3:{
- int flag = type == NODE_DOT2 ? INT2FIX(0) : INT2FIX(1);
- COMPILE(ret, "min", (NODE *) node->nd_beg);
- COMPILE(ret, "max", (NODE *) node->nd_end);
- if (poped) {
- ADD_INSN(ret, nd_line(node), pop);
- ADD_INSN(ret, nd_line(node), pop);
- }
- else {
- ADD_INSN1(ret, nd_line(node), newrange, flag);
- }
- break;
- }
- case NODE_FLIP2:
- case NODE_FLIP3:{
- LABEL *lend = NEW_LABEL(nd_line(node));
- LABEL *lfin = NEW_LABEL(nd_line(node));
- LABEL *ltrue = NEW_LABEL(nd_line(node));
- VALUE key = rb_sprintf("flipflag/%s-%p-%d",
- RSTRING_PTR(iseq->name), (void *)iseq,
- iseq->compile_data->flip_cnt++);
-
- hide_obj(key);
- iseq_add_mark_object_compile_time(iseq, key);
- ADD_INSN2(ret, nd_line(node), getspecial, key, INT2FIX(0));
- ADD_INSNL(ret, nd_line(node), branchif, lend);
-
- /* *flip == 0 */
- COMPILE(ret, "flip2 beg", node->nd_beg);
- ADD_INSN(ret, nd_line(node), dup);
- ADD_INSNL(ret, nd_line(node), branchunless, lfin);
- if (nd_type(node) == NODE_FLIP3) {
- ADD_INSN(ret, nd_line(node), dup);
- ADD_INSN1(ret, nd_line(node), setspecial, key);
- ADD_INSNL(ret, nd_line(node), jump, lfin);
- }
- else {
- ADD_INSN1(ret, nd_line(node), setspecial, key);
- }
-
- /* *flip == 1 */
- ADD_LABEL(ret, lend);
- COMPILE(ret, "flip2 end", node->nd_end);
- ADD_INSNL(ret, nd_line(node), branchunless, ltrue);
- ADD_INSN1(ret, nd_line(node), putobject, Qfalse);
- ADD_INSN1(ret, nd_line(node), setspecial, key);
-
- ADD_LABEL(ret, ltrue);
- ADD_INSN1(ret, nd_line(node), putobject, Qtrue);
-
- ADD_LABEL(ret, lfin);
- break;
- }
- case NODE_SELF:{
- if (!poped) {
- ADD_INSN(ret, nd_line(node), putself);
- }
- break;
- }
- case NODE_NIL:{
- if (!poped) {
- ADD_INSN(ret, nd_line(node), putnil);
- }
- break;
- }
- case NODE_TRUE:{
- if (!poped) {
- ADD_INSN1(ret, nd_line(node), putobject, Qtrue);
- }
- break;
- }
- case NODE_FALSE:{
- if (!poped) {
- ADD_INSN1(ret, nd_line(node), putobject, Qfalse);
- }
- break;
- }
- case NODE_ERRINFO:{
- if (!poped) {
- if (iseq->type == ISEQ_TYPE_RESCUE) {
- ADD_INSN2(ret, nd_line(node), getdynamic, INT2FIX(2), INT2FIX(0));
- }
- else {
- rb_iseq_t *ip = iseq;
- int level = 0;
- while (ip) {
- if (ip->type == ISEQ_TYPE_RESCUE) {
- break;
- }
- ip = ip->parent_iseq;
- level++;
- }
- if (ip) {
- ADD_INSN2(ret, nd_line(node), getdynamic, INT2FIX(2), INT2FIX(level));
- }
- else {
- ADD_INSN(ret, nd_line(node), putnil);
- }
- }
- }
- break;
- }
- case NODE_DEFINED:{
- if (!poped) {
- LABEL *lfinish[2];
- lfinish[0] = NEW_LABEL(nd_line(node));
- lfinish[1] = 0;
- defined_expr(iseq, ret, node->nd_head, lfinish, Qtrue);
- if (lfinish[1]) {
- ADD_INSNL(ret, nd_line(node), jump, lfinish[0]);
- ADD_LABEL(ret, lfinish[1]);
- ADD_INSN(ret, nd_line(node), putnil);
- }
- ADD_LABEL(ret, lfinish[0]);
- }
- break;
- }
- case NODE_POSTEXE:{
- LABEL *lstart = NEW_LABEL(nd_line(node));
- LABEL *lend = NEW_LABEL(nd_line(node));
- VALUE block = NEW_CHILD_ISEQVAL(node->nd_body, make_name_for_block(iseq), ISEQ_TYPE_BLOCK, nd_line(node));
-
- ADD_LABEL(ret, lstart);
- ADD_INSN1(ret, nd_line(node), onceinlinecache, lend);
- ADD_INSN(ret, nd_line(node), pop);
-
- ADD_INSN1(ret, nd_line(node), putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
- ADD_INSN1(ret, nd_line(node), putiseq, block);
- ADD_SEND (ret, nd_line(node), ID2SYM(id_core_set_postexe), INT2FIX(1));
-
- ADD_INSN1(ret, nd_line(node), setinlinecache, lstart);
- ADD_LABEL(ret, lend);
-
- if (poped) {
- ADD_INSN(ret, nd_line(node), pop);
- }
- break;
- }
- case NODE_DSYM:{
- compile_dstr(iseq, ret, node);
- if (!poped) {
- ADD_SEND(ret, nd_line(node), ID2SYM(idIntern), INT2FIX(0));
- }
- else {
- ADD_INSN(ret, nd_line(node), pop);
- }
- break;
- }
- case NODE_ATTRASGN:{
- DECL_ANCHOR(recv);
- DECL_ANCHOR(args);
- unsigned long flag = 0;
- VALUE argc;
-
- INIT_ANCHOR(recv);
- INIT_ANCHOR(args);
- argc = setup_args(iseq, args, node->nd_args, &flag);
-
- if (node->nd_recv == (NODE *) 1) {
- flag |= VM_CALL_FCALL_BIT;
- ADD_INSN(recv, nd_line(node), putself);
- }
- else {
- COMPILE(recv, "recv", node->nd_recv);
- }
-
- debugp_param("argc", argc);
- debugp_param("nd_mid", ID2SYM(node->nd_mid));
-
- if (!poped) {
- ADD_INSN(ret, nd_line(node), putnil);
- ADD_SEQ(ret, recv);
- ADD_SEQ(ret, args);
-
- if (flag & VM_CALL_ARGS_BLOCKARG_BIT) {
- ADD_INSN1(ret, nd_line(node), topn, INT2FIX(1));
- ADD_INSN1(ret, nd_line(node), setn, FIXNUM_INC(argc, 3));
- ADD_INSN (ret, nd_line(node), pop);
- }
- else {
- ADD_INSN1(ret, nd_line(node), setn, FIXNUM_INC(argc, 1));
- }
- }
- else {
- ADD_SEQ(ret, recv);
- ADD_SEQ(ret, args);
- }
- ADD_SEND_R(ret, nd_line(node), ID2SYM(node->nd_mid), argc, 0, LONG2FIX(flag));
- ADD_INSN(ret, nd_line(node), pop);
-
- break;
- }
- case NODE_OPTBLOCK:{
- /* for optimize */
- LABEL *redo_label = NEW_LABEL(0);
- LABEL *next_label = NEW_LABEL(0);
-
- iseq->compile_data->start_label = next_label;
- iseq->compile_data->redo_label = redo_label;
-
- ADD_LABEL(ret, redo_label);
- COMPILE_(ret, "optblock body", node->nd_head, 1 /* pop */ );
- ADD_LABEL(ret, next_label);
- ADD_INSN(ret, 0, opt_checkenv);
- break;
- }
- case NODE_PRELUDE:{
- COMPILE_POPED(ret, "prelude", node->nd_head);
- COMPILE_(ret, "body", node->nd_body, poped);
- break;
- }
- case NODE_LAMBDA:{
- /* compile same as lambda{...} */
- VALUE block = NEW_CHILD_ISEQVAL(node->nd_body, make_name_for_block(iseq), ISEQ_TYPE_BLOCK, nd_line(node));
- VALUE argc = INT2FIX(0);
- ADD_CALL_RECEIVER(ret, nd_line(node));
- ADD_CALL_WITH_BLOCK(ret, nd_line(node), ID2SYM(idLambda), argc, block);
-
- if (poped) {
- ADD_INSN(ret, nd_line(node), pop);
- }
- break;
- }
- default:
- rb_bug("iseq_compile_each: unknown node: %s", ruby_node_name(type));
- return Qnil;
- }
-
- debug_node_end();
- return COMPILE_OK;
-}
-
-/***************************/
-/* instruction information */
-/***************************/
-
-static int
-insn_data_length(INSN *iobj)
-{
- return insn_len(iobj->insn_id);
-}
-
-static int
-calc_sp_depth(int depth, INSN *insn)
-{
- return insn_stack_increase(depth, insn->insn_id, insn->operands);
-}
-
-static int
-insn_data_line_no(INSN *iobj)
-{
- return insn_len(iobj->line_no);
-}
-
-static VALUE
-insn_data_to_s_detail(INSN *iobj)
-{
- VALUE str = rb_str_new(0, 0);
-
- str = rb_sprintf("%-16s", insn_name(iobj->insn_id));
- if (iobj->operands) {
- const char *types = insn_op_types(iobj->insn_id);
- int j;
-
- for (j = 0; types[j]; j++) {
- char type = types[j];
-
- switch (type) {
- case TS_OFFSET: /* label(destination position) */
- {
- LABEL *lobj = (LABEL *)OPERAND_AT(iobj, j);
- rb_str_catf(str, "<L%03d>", lobj->label_no);
- break;
- }
- break;
- case TS_ISEQ: /* iseq */
- {
- rb_iseq_t *iseq = (rb_iseq_t *)OPERAND_AT(iobj, j);
- VALUE val = Qnil;
- if (iseq) {
- val = iseq->self;
- }
- rb_str_concat(str, rb_inspect(val));
- }
- break;
- case TS_LINDEX:
- case TS_DINDEX:
- case TS_NUM: /* ulong */
- case TS_VALUE: /* VALUE */
- rb_str_concat(str, rb_inspect(OPERAND_AT(iobj, j)));
- break;
- case TS_ID: /* ID */
- rb_str_concat(str, rb_inspect(OPERAND_AT(iobj, j)));
- break;
- case TS_GENTRY:
- {
- struct rb_global_entry *entry = (struct rb_global_entry *)
- (OPERAND_AT(iobj, j) & (~1));
- rb_str_cat2(str, rb_id2name(entry->id));
- }
- case TS_IC: /* method cache */
- rb_str_cat2(str, "<ic>");
- break;
- case TS_CDHASH: /* case/when condition cache */
- rb_str_cat2(str, "<ch>");
- break;
- default:{
- rb_raise(rb_eSyntaxError, "unknown operand type: %c", type);
- }
- }
- if (types[j + 1]) {
- rb_str_cat2(str, ", ");
- }
- }
- }
- return str;
-}
-
-static void
-dump_disasm_list(struct iseq_link_element *link)
-{
- int pos = 0;
- INSN *iobj;
- LABEL *lobj;
- VALUE str;
-
- printf("-- raw disasm--------\n");
-
- while (link) {
- switch (link->type) {
- case ISEQ_ELEMENT_INSN:
- {
- iobj = (INSN *)link;
- str = insn_data_to_s_detail(iobj);
- printf("%04d %-65s(%4d)\n", pos, StringValueCStr(str),
- insn_data_line_no(iobj));
- pos += insn_data_length(iobj);
- break;
- }
- case ISEQ_ELEMENT_LABEL:
- {
- lobj = (LABEL *)link;
- printf("<L%03d>\n", lobj->label_no);
- break;
- }
- case ISEQ_ELEMENT_NONE:
- {
- printf("[none]\n");
- break;
- }
- case ISEQ_ELEMENT_ADJUST:
- {
- ADJUST *adjust = (ADJUST *)link;
- printf("adjust: [label: %d]\n", adjust->label->label_no);
- break;
- }
- default:
- /* ignore */
- rb_raise(rb_eSyntaxError, "dump_disasm_list error: %ld\n", FIX2LONG(link->type));
- }
- link = link->next;
- }
- printf("---------------------\n");
-}
-
-VALUE
-rb_insns_name_array(void)
-{
- VALUE ary = rb_ary_new();
- int i;
- for (i = 0; i < numberof(insn_name_info); i++) {
- rb_ary_push(ary, rb_obj_freeze(rb_str_new2(insn_name_info[i])));
- }
- return rb_obj_freeze(ary);
-}
-
-static LABEL *
-register_label(rb_iseq_t *iseq, struct st_table *labels_table, VALUE obj)
-{
- LABEL *label = 0;
- st_data_t tmp;
- obj = rb_convert_type(obj, T_SYMBOL, "Symbol", "to_sym");
-
- if (st_lookup(labels_table, obj, &tmp) == 0) {
- label = NEW_LABEL(0);
- st_insert(labels_table, obj, (st_data_t)label);
- }
- else {
- label = (LABEL *)tmp;
- }
- return label;
-}
-
-static VALUE
-get_exception_sym2type(VALUE sym)
-{
-#undef rb_intern
-#define rb_intern(str) rb_intern_const(str)
- static VALUE symRescue, symEnsure, symRetry;
- static VALUE symBreak, symRedo, symNext;
-
- if (symRescue == 0) {
- symRescue = ID2SYM(rb_intern("rescue"));
- symEnsure = ID2SYM(rb_intern("ensure"));
- symRetry = ID2SYM(rb_intern("retry"));
- symBreak = ID2SYM(rb_intern("break"));
- symRedo = ID2SYM(rb_intern("redo"));
- symNext = ID2SYM(rb_intern("next"));
- }
-
- if (sym == symRescue) return CATCH_TYPE_RESCUE;
- if (sym == symEnsure) return CATCH_TYPE_ENSURE;
- if (sym == symRetry) return CATCH_TYPE_RETRY;
- if (sym == symBreak) return CATCH_TYPE_BREAK;
- if (sym == symRedo) return CATCH_TYPE_REDO;
- if (sym == symNext) return CATCH_TYPE_NEXT;
- rb_raise(rb_eSyntaxError, "invalid exception symbol: %s",
- RSTRING_PTR(rb_inspect(sym)));
- return 0;
-}
-
-static int
-iseq_build_exception(rb_iseq_t *iseq, struct st_table *labels_table,
- VALUE exception)
-{
- int i;
-
- for (i=0; i<RARRAY_LEN(exception); i++) {
- VALUE v, type, *ptr, eiseqval;
- LABEL *lstart, *lend, *lcont;
- int sp;
-
- RB_GC_GUARD(v) = rb_convert_type(RARRAY_PTR(exception)[i], T_ARRAY,
- "Array", "to_ary");
- if (RARRAY_LEN(v) != 6) {
- rb_raise(rb_eSyntaxError, "wrong exception entry");
- }
- ptr = RARRAY_PTR(v);
- type = get_exception_sym2type(ptr[0]);
- if (ptr[1] == Qnil) {
- eiseqval = 0;
- }
- else {
- eiseqval = rb_iseq_load(ptr[1], iseq->self, Qnil);
- }
-
- lstart = register_label(iseq, labels_table, ptr[2]);
- lend = register_label(iseq, labels_table, ptr[3]);
- lcont = register_label(iseq, labels_table, ptr[4]);
- sp = NUM2INT(ptr[5]);
-
- ADD_CATCH_ENTRY(type, lstart, lend, eiseqval, lcont);
- }
- return COMPILE_OK;
-}
-
-static struct st_table *
-insn_make_insn_table(void)
-{
- struct st_table *table;
- int i;
- table = st_init_numtable();
-
- for (i=0; i<VM_INSTRUCTION_SIZE; i++) {
- st_insert(table, ID2SYM(rb_intern(insn_name(i))), i);
- }
-
- return table;
-}
-
-static int
-iseq_build_body(rb_iseq_t *iseq, LINK_ANCHOR *anchor,
- VALUE body, struct st_table *labels_table)
-{
- /* TODO: body should be freezed */
- VALUE *ptr = RARRAY_PTR(body);
- int len = RARRAY_LEN(body);
- int i, j;
- int line_no = 0;
- /*
- * index -> LABEL *label
- */
- static struct st_table *insn_table;
-
- if (insn_table == 0) {
- insn_table = insn_make_insn_table();
- }
-
- for (i=0; i<len; i++) {
- VALUE obj = ptr[i];
-
- if (SYMBOL_P(obj)) {
- LABEL *label = register_label(iseq, labels_table, obj);
- ADD_LABEL(anchor, label);
- }
- else if (FIXNUM_P(obj)) {
- line_no = NUM2INT(obj);
- }
- else if (TYPE(obj) == T_ARRAY) {
- VALUE *argv = 0;
- int argc = (int)RARRAY_LEN(obj) - 1;
- VALUE insn_id;
- VALUE insn;
-
- insn = (argc < 0) ? Qnil : RARRAY_PTR(obj)[0];
- if (st_lookup(insn_table, insn, &insn_id) == 0) {
- /* TODO: exception */
- RB_GC_GUARD(insn) = rb_inspect(insn);
- rb_compile_error(RSTRING_PTR(iseq->filename), line_no,
- "unknown instruction: %s", RSTRING_PTR(insn));
- }
-
- if (argc != insn_len(insn_id)-1) {
- rb_compile_error(RSTRING_PTR(iseq->filename), line_no,
- "operand size mismatch");
- }
-
- if (argc > 0) {
- argv = compile_data_alloc(iseq, sizeof(VALUE) * argc);
- for (j=0; j<argc; j++) {
- VALUE op = rb_ary_entry(obj, j+1);
- switch (insn_op_type(insn_id, j)) {
- case TS_OFFSET: {
- LABEL *label = register_label(iseq, labels_table, op);
- argv[j] = (VALUE)label;
- break;
- }
- case TS_LINDEX:
- case TS_DINDEX:
- case TS_NUM:
- (void)NUM2INT(op);
- argv[j] = op;
- break;
- case TS_VALUE:
- argv[j] = op;
- iseq_add_mark_object(iseq, op);
- break;
- case TS_ISEQ:
- {
- if (op != Qnil) {
- if (TYPE(op) == T_ARRAY) {
- argv[j] = rb_iseq_load(op, iseq->self, Qnil);
- }
- else if (CLASS_OF(op) == rb_cISeq) {
- argv[j] = op;
- }
- else {
- rb_raise(rb_eSyntaxError, "ISEQ is required");
- }
- iseq_add_mark_object(iseq, argv[j]);
- }
- else {
- argv[j] = 0;
- }
- }
- break;
- case TS_GENTRY:
- op = rb_convert_type(op, T_SYMBOL, "Symbol", "to_sym");
- argv[j] = (VALUE)rb_global_entry(SYM2ID(op));
- break;
- case TS_IC:
- break;
- case TS_ID:
- argv[j] = rb_convert_type(op, T_SYMBOL,
- "Symbol", "to_sym");
- break;
- case TS_CDHASH:
- {
- int i;
- op = rb_convert_type(op, T_ARRAY, "Array", "to_ary");
- op = rb_ary_dup(op);
- for (i=0; i<RARRAY_LEN(op); i+=2) {
- VALUE sym = rb_ary_entry(op, i+1);
- LABEL *label =
- register_label(iseq, labels_table, sym);
- rb_ary_store(op, i+1, (VALUE)label | 1);
- }
- argv[j] = op;
- }
- break;
- default:
- rb_raise(rb_eSyntaxError, "unknown operand: %c", insn_op_type(insn_id, j));
- }
- }
- }
- ADD_ELEM(anchor,
- (LINK_ELEMENT*)new_insn_core(iseq, line_no,
- insn_id, argc, argv));
- }
- else {
- rb_raise(rb_eTypeError, "unexpected object for instruction");
- }
- }
- st_free_table(labels_table);
- iseq_setup(iseq, anchor);
- return COMPILE_OK;
-}
-
-#define CHECK_ARRAY(v) rb_convert_type(v, T_ARRAY, "Array", "to_ary")
-#define CHECK_STRING(v) rb_convert_type(v, T_STRING, "String", "to_str")
-#define CHECK_SYMBOL(v) rb_convert_type(v, T_SYMBOL, "Symbol", "to_sym")
-static inline VALUE CHECK_INTEGER(VALUE v) {NUM2LONG(v); return v;}
-
-VALUE
-rb_iseq_build_from_ary(rb_iseq_t *iseq, VALUE locals, VALUE args,
- VALUE exception, VALUE body)
-{
- int i;
- ID *tbl;
- struct st_table *labels_table = st_init_numtable();
-
- DECL_ANCHOR(anchor);
-
- INIT_ANCHOR(anchor);
-
- iseq->local_table_size = RARRAY_LEN(locals);
- iseq->local_table = tbl = (ID *)ALLOC_N(ID *, iseq->local_table_size);
- iseq->local_size = iseq->local_table_size + 1;
-
- for (i=0; i<RARRAY_LEN(locals); i++) {
- VALUE lv = RARRAY_PTR(locals)[i];
- tbl[i] = FIXNUM_P(lv) ? (ID)FIX2LONG(lv) : SYM2ID(CHECK_SYMBOL(lv));
- }
-
- /* args */
- if (FIXNUM_P(args)) {
- iseq->arg_size = iseq->argc = FIX2INT(args);
- iseq->arg_simple = 1;
- }
- else {
- int i = 0;
- VALUE argc = CHECK_INTEGER(rb_ary_entry(args, i++));
- VALUE arg_opt_labels = CHECK_ARRAY(rb_ary_entry(args, i++));
- VALUE arg_post_len = CHECK_INTEGER(rb_ary_entry(args, i++));
- VALUE arg_post_start = CHECK_INTEGER(rb_ary_entry(args, i++));
- VALUE arg_rest = CHECK_INTEGER(rb_ary_entry(args, i++));
- VALUE arg_block = CHECK_INTEGER(rb_ary_entry(args, i++));
- VALUE arg_simple = CHECK_INTEGER(rb_ary_entry(args, i++));
-
- iseq->argc = FIX2INT(argc);
- iseq->arg_rest = FIX2INT(arg_rest);
- iseq->arg_post_len = FIX2INT(arg_post_len);
- iseq->arg_post_start = FIX2INT(arg_post_start);
- iseq->arg_block = FIX2INT(arg_block);
- iseq->arg_opts = RARRAY_LEN(arg_opt_labels);
- iseq->arg_opt_table = (VALUE *)ALLOC_N(VALUE, iseq->arg_opts);
-
- if (iseq->arg_block != -1) {
- iseq->arg_size = iseq->arg_block + 1;
- }
- else if (iseq->arg_post_len) {
- iseq->arg_size = iseq->arg_post_start + iseq->arg_post_len;
- }
- else if (iseq->arg_rest != -1) {
- iseq->arg_size = iseq->arg_rest + 1;
- }
- else {
- iseq->arg_size = iseq->argc + (iseq->arg_opts ? iseq->arg_opts - 1 : 0);
- }
-
- for (i=0; i<RARRAY_LEN(arg_opt_labels); i++) {
- iseq->arg_opt_table[i] =
- (VALUE)register_label(iseq, labels_table,
- rb_ary_entry(arg_opt_labels, i));
- }
-
- iseq->arg_simple = NUM2INT(arg_simple);
- }
-
- /* exception */
- iseq_build_exception(iseq, labels_table, exception);
-
- /* body */
- iseq_build_body(iseq, anchor, body, labels_table);
- return iseq->self;
-}
-
-/* for parser */
-
-int
-rb_dvar_defined(ID id)
-{
- rb_thread_t *th = GET_THREAD();
- rb_iseq_t *iseq;
- if (th->base_block && (iseq = th->base_block->iseq)) {
- while (iseq->type == ISEQ_TYPE_BLOCK ||
- iseq->type == ISEQ_TYPE_RESCUE ||
- iseq->type == ISEQ_TYPE_ENSURE ||
- iseq->type == ISEQ_TYPE_EVAL ||
- iseq->type == ISEQ_TYPE_MAIN
- ) {
- int i;
-
- for (i = 0; i < iseq->local_table_size; i++) {
- if (iseq->local_table[i] == id) {
- return 1;
- }
- }
- iseq = iseq->parent_iseq;
- }
- }
- return 0;
-}
-
-int
-rb_local_defined(ID id)
-{
- rb_thread_t *th = GET_THREAD();
- rb_iseq_t *iseq;
-
- if (th->base_block && th->base_block->iseq) {
- int i;
- iseq = th->base_block->iseq->local_iseq;
-
- for (i=0; i<iseq->local_table_size; i++) {
- if (iseq->local_table[i] == id) {
- return 1;
- }
- }
- }
- return 0;
-}
-
-int
-rb_parse_in_eval(void)
-{
- return GET_THREAD()->parse_in_eval > 0;
-}
-
-int
-rb_parse_in_main(void)
-{
- return GET_THREAD()->parse_in_eval < 0;
-}
diff --git a/complex.c b/complex.c
deleted file mode 100644
index 19d0c3c183..0000000000
--- a/complex.c
+++ /dev/null
@@ -1,2021 +0,0 @@
-/*
- complex.c: Coded by Tadayoshi Funaba 2008,2009
-
- This implementation is based on Keiju Ishitsuka's Complex library
- which is written in ruby.
-*/
-
-#include "ruby.h"
-#include <math.h>
-
-#define NDEBUG
-#include <assert.h>
-
-#define ZERO INT2FIX(0)
-#define ONE INT2FIX(1)
-#define TWO INT2FIX(2)
-
-VALUE rb_cComplex;
-
-static ID id_abs, id_abs2, id_arg, id_cmp, id_conj, id_convert,
- id_denominator, id_divmod, id_eqeq_p, id_expt, id_fdiv, id_floor,
- id_idiv, id_imag, id_inspect, id_negate, id_numerator, id_quo,
- id_real, id_real_p, id_to_f, id_to_i, id_to_r, id_to_s;
-
-#define f_boolcast(x) ((x) ? Qtrue : Qfalse)
-
-#define binop(n,op) \
-inline static VALUE \
-f_##n(VALUE x, VALUE y)\
-{\
- return rb_funcall(x, op, 1, y);\
-}
-
-#define fun1(n) \
-inline static VALUE \
-f_##n(VALUE x)\
-{\
- return rb_funcall(x, id_##n, 0);\
-}
-
-#define fun2(n) \
-inline static VALUE \
-f_##n(VALUE x, VALUE y)\
-{\
- return rb_funcall(x, id_##n, 1, y);\
-}
-
-#define math1(n) \
-inline static VALUE \
-m_##n(VALUE x)\
-{\
- return rb_funcall(rb_mMath, id_##n, 1, x);\
-}
-
-#define math2(n) \
-inline static VALUE \
-m_##n(VALUE x, VALUE y)\
-{\
- return rb_funcall(rb_mMath, id_##n, 2, x, y);\
-}
-
-#define PRESERVE_SIGNEDZERO
-
-inline static VALUE
-f_add(VALUE x, VALUE y)
-{
-#ifndef PRESERVE_SIGNEDZERO
- if (FIXNUM_P(y) && FIX2LONG(y) == 0)
- return x;
- else if (FIXNUM_P(x) && FIX2LONG(x) == 0)
- return y;
-#endif
- return rb_funcall(x, '+', 1, y);
-}
-
-inline static VALUE
-f_cmp(VALUE x, VALUE y)
-{
- if (FIXNUM_P(x) && FIXNUM_P(y)) {
- long c = FIX2LONG(x) - FIX2LONG(y);
- if (c > 0)
- c = 1;
- else if (c < 0)
- c = -1;
- return INT2FIX(c);
- }
- return rb_funcall(x, id_cmp, 1, y);
-}
-
-inline static VALUE
-f_div(VALUE x, VALUE y)
-{
- if (FIXNUM_P(y) && FIX2LONG(y) == 1)
- return x;
- return rb_funcall(x, '/', 1, y);
-}
-
-inline static VALUE
-f_gt_p(VALUE x, VALUE y)
-{
- if (FIXNUM_P(x) && FIXNUM_P(y))
- return f_boolcast(FIX2LONG(x) > FIX2LONG(y));
- return rb_funcall(x, '>', 1, y);
-}
-
-inline static VALUE
-f_lt_p(VALUE x, VALUE y)
-{
- if (FIXNUM_P(x) && FIXNUM_P(y))
- return f_boolcast(FIX2LONG(x) < FIX2LONG(y));
- return rb_funcall(x, '<', 1, y);
-}
-
-binop(mod, '%')
-
-inline static VALUE
-f_mul(VALUE x, VALUE y)
-{
-#ifndef PRESERVE_SIGNEDZERO
- if (FIXNUM_P(y)) {
- long iy = FIX2LONG(y);
- if (iy == 0) {
- if (FIXNUM_P(x) || TYPE(x) == T_BIGNUM)
- return ZERO;
- }
- else if (iy == 1)
- return x;
- }
- else if (FIXNUM_P(x)) {
- long ix = FIX2LONG(x);
- if (ix == 0) {
- if (FIXNUM_P(y) || TYPE(y) == T_BIGNUM)
- return ZERO;
- }
- else if (ix == 1)
- return y;
- }
-#endif
- return rb_funcall(x, '*', 1, y);
-}
-
-inline static VALUE
-f_sub(VALUE x, VALUE y)
-{
-#ifndef PRESERVE_SIGNEDZERO
- if (FIXNUM_P(y) && FIX2LONG(y) == 0)
- return x;
-#endif
- return rb_funcall(x, '-', 1, y);
-}
-
-fun1(abs)
-fun1(abs2)
-fun1(arg)
-fun1(conj)
-fun1(denominator)
-fun1(floor)
-fun1(imag)
-fun1(inspect)
-fun1(negate)
-fun1(numerator)
-fun1(real)
-fun1(real_p)
-
-fun1(to_f)
-fun1(to_i)
-fun1(to_r)
-fun1(to_s)
-
-fun2(divmod)
-
-inline static VALUE
-f_eqeq_p(VALUE x, VALUE y)
-{
- if (FIXNUM_P(x) && FIXNUM_P(y))
- return f_boolcast(FIX2LONG(x) == FIX2LONG(y));
- return rb_funcall(x, id_eqeq_p, 1, y);
-}
-
-fun2(expt)
-fun2(fdiv)
-fun2(idiv)
-fun2(quo)
-
-inline static VALUE
-f_negative_p(VALUE x)
-{
- if (FIXNUM_P(x))
- return f_boolcast(FIX2LONG(x) < 0);
- return rb_funcall(x, '<', 1, ZERO);
-}
-
-#define f_positive_p(x) (!f_negative_p(x))
-
-inline static VALUE
-f_zero_p(VALUE x)
-{
- switch (TYPE(x)) {
- case T_FIXNUM:
- return f_boolcast(FIX2LONG(x) == 0);
- case T_BIGNUM:
- return Qfalse;
- case T_RATIONAL:
- {
- VALUE num = RRATIONAL(x)->num;
-
- return f_boolcast(FIXNUM_P(num) && FIX2LONG(num) == 0);
- }
- }
- return rb_funcall(x, id_eqeq_p, 1, ZERO);
-}
-
-#define f_nonzero_p(x) (!f_zero_p(x))
-
-inline static VALUE
-f_one_p(VALUE x)
-{
- switch (TYPE(x)) {
- case T_FIXNUM:
- return f_boolcast(FIX2LONG(x) == 1);
- case T_BIGNUM:
- return Qfalse;
- case T_RATIONAL:
- {
- VALUE num = RRATIONAL(x)->num;
- VALUE den = RRATIONAL(x)->den;
-
- return f_boolcast(FIXNUM_P(num) && FIX2LONG(num) == 1 &&
- FIXNUM_P(den) && FIX2LONG(den) == 1);
- }
- }
- return rb_funcall(x, id_eqeq_p, 1, ONE);
-}
-
-inline static VALUE
-f_kind_of_p(VALUE x, VALUE c)
-{
- return rb_obj_is_kind_of(x, c);
-}
-
-inline static VALUE
-k_numeric_p(VALUE x)
-{
- return f_kind_of_p(x, rb_cNumeric);
-}
-
-inline static VALUE
-k_integer_p(VALUE x)
-{
- return f_kind_of_p(x, rb_cInteger);
-}
-
-inline static VALUE
-k_fixnum_p(VALUE x)
-{
- return f_kind_of_p(x, rb_cFixnum);
-}
-
-inline static VALUE
-k_bignum_p(VALUE x)
-{
- return f_kind_of_p(x, rb_cBignum);
-}
-
-inline static VALUE
-k_float_p(VALUE x)
-{
- return f_kind_of_p(x, rb_cFloat);
-}
-
-inline static VALUE
-k_rational_p(VALUE x)
-{
- return f_kind_of_p(x, rb_cRational);
-}
-
-inline static VALUE
-k_complex_p(VALUE x)
-{
- return f_kind_of_p(x, rb_cComplex);
-}
-
-#define k_exact_p(x) (!k_float_p(x))
-#define k_inexact_p(x) k_float_p(x)
-
-#define k_exact_zero_p(x) (k_exact_p(x) && f_zero_p(x))
-#define k_exact_one_p(x) (k_exact_p(x) && f_one_p(x))
-
-#define get_dat1(x) \
- struct RComplex *dat;\
- dat = ((struct RComplex *)(x))
-
-#define get_dat2(x,y) \
- struct RComplex *adat, *bdat;\
- adat = ((struct RComplex *)(x));\
- bdat = ((struct RComplex *)(y))
-
-inline static VALUE
-nucomp_s_new_internal(VALUE klass, VALUE real, VALUE imag)
-{
- NEWOBJ(obj, struct RComplex);
- OBJSETUP(obj, klass, T_COMPLEX);
-
- obj->real = real;
- obj->imag = imag;
-
- return (VALUE)obj;
-}
-
-static VALUE
-nucomp_s_alloc(VALUE klass)
-{
- return nucomp_s_new_internal(klass, ZERO, ZERO);
-}
-
-#if 0
-static VALUE
-nucomp_s_new_bang(int argc, VALUE *argv, VALUE klass)
-{
- VALUE real, imag;
-
- switch (rb_scan_args(argc, argv, "11", &real, &imag)) {
- case 1:
- if (!k_numeric_p(real))
- real = f_to_i(real);
- imag = ZERO;
- break;
- default:
- if (!k_numeric_p(real))
- real = f_to_i(real);
- if (!k_numeric_p(imag))
- imag = f_to_i(imag);
- break;
- }
-
- return nucomp_s_new_internal(klass, real, imag);
-}
-#endif
-
-inline static VALUE
-f_complex_new_bang1(VALUE klass, VALUE x)
-{
- assert(!k_complex_p(x));
- return nucomp_s_new_internal(klass, x, ZERO);
-}
-
-inline static VALUE
-f_complex_new_bang2(VALUE klass, VALUE x, VALUE y)
-{
- assert(!k_complex_p(x));
- assert(!k_complex_p(y));
- return nucomp_s_new_internal(klass, x, y);
-}
-
-#ifdef CANONICALIZATION_FOR_MATHN
-#define CANON
-#endif
-
-#ifdef CANON
-static int canonicalization = 0;
-
-void
-nucomp_canonicalization(int f)
-{
- canonicalization = f;
-}
-#endif
-
-inline static void
-nucomp_real_check(VALUE num)
-{
- switch (TYPE(num)) {
- case T_FIXNUM:
- case T_BIGNUM:
- case T_FLOAT:
- case T_RATIONAL:
- break;
- default:
- if (!k_numeric_p(num) || !f_real_p(num))
- rb_raise(rb_eArgError, "not a real");
- }
-}
-
-inline static VALUE
-nucomp_s_canonicalize_internal(VALUE klass, VALUE real, VALUE imag)
-{
-#ifdef CANON
-#define CL_CANON
-#ifdef CL_CANON
- if (k_exact_zero_p(imag) && canonicalization)
- return real;
-#else
- if (f_zero_p(imag) && canonicalization)
- return real;
-#endif
-#endif
- if (f_real_p(real) && f_real_p(imag))
- return nucomp_s_new_internal(klass, real, imag);
- else if (f_real_p(real)) {
- get_dat1(imag);
-
- return nucomp_s_new_internal(klass,
- f_sub(real, dat->imag),
- f_add(ZERO, dat->real));
- }
- else if (f_real_p(imag)) {
- get_dat1(real);
-
- return nucomp_s_new_internal(klass,
- dat->real,
- f_add(dat->imag, imag));
- }
- else {
- get_dat2(real, imag);
-
- return nucomp_s_new_internal(klass,
- f_sub(adat->real, bdat->imag),
- f_add(adat->imag, bdat->real));
- }
-}
-
-/*
- * call-seq:
- * Complex.rect(real[, imag]) -> complex
- * Complex.rectangular(real[, imag]) -> complex
- *
- * Returns a complex object which denotes the given rectangular form.
- */
-static VALUE
-nucomp_s_new(int argc, VALUE *argv, VALUE klass)
-{
- VALUE real, imag;
-
- switch (rb_scan_args(argc, argv, "11", &real, &imag)) {
- case 1:
- nucomp_real_check(real);
- imag = ZERO;
- break;
- default:
- nucomp_real_check(real);
- nucomp_real_check(imag);
- break;
- }
-
- return nucomp_s_canonicalize_internal(klass, real, imag);
-}
-
-inline static VALUE
-f_complex_new1(VALUE klass, VALUE x)
-{
- assert(!k_complex_p(x));
- return nucomp_s_canonicalize_internal(klass, x, ZERO);
-}
-
-inline static VALUE
-f_complex_new2(VALUE klass, VALUE x, VALUE y)
-{
- assert(!k_complex_p(x));
- return nucomp_s_canonicalize_internal(klass, x, y);
-}
-
-/*
- * call-seq:
- * Complex(x[, y]) -> numeric
- *
- * Returns x+i*y;
- */
-static VALUE
-nucomp_f_complex(int argc, VALUE *argv, VALUE klass)
-{
- return rb_funcall2(rb_cComplex, id_convert, argc, argv);
-}
-
-#define imp1(n) \
-extern VALUE rb_math_##n(VALUE x);\
-inline static VALUE \
-m_##n##_bang(VALUE x)\
-{\
- return rb_math_##n(x);\
-}
-
-#define imp2(n) \
-extern VALUE rb_math_##n(VALUE x, VALUE y);\
-inline static VALUE \
-m_##n##_bang(VALUE x, VALUE y)\
-{\
- return rb_math_##n(x, y);\
-}
-
-imp2(atan2)
-imp1(cos)
-imp1(cosh)
-imp1(exp)
-imp2(hypot)
-
-#define m_hypot(x,y) m_hypot_bang(x,y)
-
-extern VALUE rb_math_log(int argc, VALUE *argv);
-
-static VALUE
-m_log_bang(VALUE x)
-{
- return rb_math_log(1, &x);
-}
-
-imp1(sin)
-imp1(sinh)
-imp1(sqrt)
-
-static VALUE
-m_cos(VALUE x)
-{
- if (f_real_p(x))
- return m_cos_bang(x);
- {
- get_dat1(x);
- return f_complex_new2(rb_cComplex,
- f_mul(m_cos_bang(dat->real),
- m_cosh_bang(dat->imag)),
- f_mul(f_negate(m_sin_bang(dat->real)),
- m_sinh_bang(dat->imag)));
- }
-}
-
-static VALUE
-m_sin(VALUE x)
-{
- if (f_real_p(x))
- return m_sin_bang(x);
- {
- get_dat1(x);
- return f_complex_new2(rb_cComplex,
- f_mul(m_sin_bang(dat->real),
- m_cosh_bang(dat->imag)),
- f_mul(m_cos_bang(dat->real),
- m_sinh_bang(dat->imag)));
- }
-}
-
-#if 0
-static VALUE
-m_sqrt(VALUE x)
-{
- if (f_real_p(x)) {
- if (f_positive_p(x))
- return m_sqrt_bang(x);
- return f_complex_new2(rb_cComplex, ZERO, m_sqrt_bang(f_negate(x)));
- }
- else {
- get_dat1(x);
-
- if (f_negative_p(dat->imag))
- return f_conj(m_sqrt(f_conj(x)));
- else {
- VALUE a = f_abs(x);
- return f_complex_new2(rb_cComplex,
- m_sqrt_bang(f_div(f_add(a, dat->real), TWO)),
- m_sqrt_bang(f_div(f_sub(a, dat->real), TWO)));
- }
- }
-}
-#endif
-
-inline static VALUE
-f_complex_polar(VALUE klass, VALUE x, VALUE y)
-{
- assert(!k_complex_p(x));
- assert(!k_complex_p(y));
- return nucomp_s_canonicalize_internal(klass,
- f_mul(x, m_cos(y)),
- f_mul(x, m_sin(y)));
-}
-
-/*
- * call-seq:
- * Complex.polar(abs[, arg]) -> complex
- *
- * Returns a complex object which denotes the given polar form.
- */
-static VALUE
-nucomp_s_polar(int argc, VALUE *argv, VALUE klass)
-{
- VALUE abs, arg;
-
- switch (rb_scan_args(argc, argv, "11", &abs, &arg)) {
- case 1:
- nucomp_real_check(abs);
- arg = ZERO;
- break;
- default:
- nucomp_real_check(abs);
- nucomp_real_check(arg);
- break;
- }
- return f_complex_polar(klass, abs, arg);
-}
-
-/*
- * call-seq:
- * cmp.real -> real
- *
- * Returns the real part.
- */
-static VALUE
-nucomp_real(VALUE self)
-{
- get_dat1(self);
- return dat->real;
-}
-
-/*
- * call-seq:
- * cmp.imag -> real
- * cmp.imaginary -> real
- *
- * Returns the imaginary part.
- */
-static VALUE
-nucomp_imag(VALUE self)
-{
- get_dat1(self);
- return dat->imag;
-}
-
-/*
- * call-seq:
- * -cmp -> complex
- *
- * Returns negation of the value.
- */
-static VALUE
-nucomp_negate(VALUE self)
-{
- get_dat1(self);
- return f_complex_new2(CLASS_OF(self),
- f_negate(dat->real), f_negate(dat->imag));
-}
-
-inline static VALUE
-f_addsub(VALUE self, VALUE other,
- VALUE (*func)(VALUE, VALUE), ID id)
-{
- if (k_complex_p(other)) {
- VALUE real, imag;
-
- get_dat2(self, other);
-
- real = (*func)(adat->real, bdat->real);
- imag = (*func)(adat->imag, bdat->imag);
-
- return f_complex_new2(CLASS_OF(self), real, imag);
- }
- if (k_numeric_p(other) && f_real_p(other)) {
- get_dat1(self);
-
- return f_complex_new2(CLASS_OF(self),
- (*func)(dat->real, other), dat->imag);
- }
- return rb_num_coerce_bin(self, other, id);
-}
-
-/*
- * call-seq:
- * cmp + numeric -> complex
- *
- * Performs addition.
- */
-static VALUE
-nucomp_add(VALUE self, VALUE other)
-{
- return f_addsub(self, other, f_add, '+');
-}
-
-/*
- * call-seq:
- * cmp - numeric -> complex
- *
- * Performs subtraction.
- */
-static VALUE
-nucomp_sub(VALUE self, VALUE other)
-{
- return f_addsub(self, other, f_sub, '-');
-}
-
-/*
- * call-seq:
- * cmp * numeric -> complex
- *
- * Performs multiplication.
- */
-static VALUE
-nucomp_mul(VALUE self, VALUE other)
-{
- if (k_complex_p(other)) {
- VALUE real, imag;
-
- get_dat2(self, other);
-
- real = f_sub(f_mul(adat->real, bdat->real),
- f_mul(adat->imag, bdat->imag));
- imag = f_add(f_mul(adat->real, bdat->imag),
- f_mul(adat->imag, bdat->real));
-
- return f_complex_new2(CLASS_OF(self), real, imag);
- }
- if (k_numeric_p(other) && f_real_p(other)) {
- get_dat1(self);
-
- return f_complex_new2(CLASS_OF(self),
- f_mul(dat->real, other),
- f_mul(dat->imag, other));
- }
- return rb_num_coerce_bin(self, other, '*');
-}
-
-inline static VALUE
-f_divide(VALUE self, VALUE other,
- VALUE (*func)(VALUE, VALUE), ID id)
-{
- if (k_complex_p(other)) {
- int flo;
- get_dat2(self, other);
-
- flo = (k_float_p(adat->real) || k_float_p(adat->imag) ||
- k_float_p(bdat->real) || k_float_p(bdat->imag));
-
- if (f_gt_p(f_abs(bdat->real), f_abs(bdat->imag))) {
- VALUE r, n;
-
- r = (*func)(bdat->imag, bdat->real);
- n = f_mul(bdat->real, f_add(ONE, f_mul(r, r)));
- if (flo)
- return f_complex_new2(CLASS_OF(self),
- (*func)(self, n),
- (*func)(f_negate(f_mul(self, r)), n));
- return f_complex_new2(CLASS_OF(self),
- (*func)(f_add(adat->real,
- f_mul(adat->imag, r)), n),
- (*func)(f_sub(adat->imag,
- f_mul(adat->real, r)), n));
- }
- else {
- VALUE r, n;
-
- r = (*func)(bdat->real, bdat->imag);
- n = f_mul(bdat->imag, f_add(ONE, f_mul(r, r)));
- if (flo)
- return f_complex_new2(CLASS_OF(self),
- (*func)(f_mul(self, r), n),
- (*func)(f_negate(self), n));
- return f_complex_new2(CLASS_OF(self),
- (*func)(f_add(f_mul(adat->real, r),
- adat->imag), n),
- (*func)(f_sub(f_mul(adat->imag, r),
- adat->real), n));
- }
- }
- if (k_numeric_p(other) && f_real_p(other)) {
- get_dat1(self);
-
- return f_complex_new2(CLASS_OF(self),
- (*func)(dat->real, other),
- (*func)(dat->imag, other));
- }
- return rb_num_coerce_bin(self, other, id);
-}
-
-#define rb_raise_zerodiv() rb_raise(rb_eZeroDivError, "divided by 0")
-
-/*
- * call-seq:
- * cmp / numeric -> complex
- * cmp.quo(numeric) -> complex
- *
- * Performs division.
- *
- * For example:
- *
- * Complex(10.0) / 3 #=> (3.3333333333333335+(0/1)*i)
- * Complex(10) / 3 #=> ((10/3)+(0/1)*i) # not (3+0i)
- */
-static VALUE
-nucomp_div(VALUE self, VALUE other)
-{
- return f_divide(self, other, f_quo, id_quo);
-}
-
-#define nucomp_quo nucomp_div
-
-/*
- * call-seq:
- * cmp.fdiv(numeric) -> complex
- *
- * Performs division as each part is a float, never returns a float.
- *
- * For example:
- *
- * Complex(11,22).fdiv(3) #=> (3.6666666666666665+7.333333333333333i)
- */
-static VALUE
-nucomp_fdiv(VALUE self, VALUE other)
-{
- return f_divide(self, other, f_fdiv, id_fdiv);
-}
-
-static VALUE
-m_log(VALUE x)
-{
- if (f_real_p(x) && f_positive_p(x))
- return m_log_bang(x);
- return rb_complex_new2(m_log_bang(f_abs(x)), f_arg(x));
-}
-
-static VALUE
-m_exp(VALUE x)
-{
- VALUE ere, im;
-
- if (f_real_p(x))
- return m_exp_bang(x);
- ere = m_exp_bang(f_real(x));
- im = f_imag(x);
- return rb_complex_new2(f_mul(ere, m_cos_bang(im)),
- f_mul(ere, m_sin_bang(im)));
-}
-
-VALUE
-rb_fexpt(VALUE x, VALUE y)
-{
- if (f_zero_p(x) || (!k_float_p(x) && !k_float_p(y)))
- return f_expt(x, y);
- return m_exp(f_mul(m_log(x), y));
-}
-
-inline static VALUE
-f_reciprocal(VALUE x)
-{
- return f_quo(ONE, x);
-}
-
-/*
- * call-seq:
- * cmp ** numeric -> complex
- *
- * Performs exponentiation.
- *
- * For example:
- *
- * Complex('i') ** 2 #=> (-1+0i)
- * Complex(-8) ** Rational(1,3) #=> (1.0000000000000002+1.7320508075688772i)
- */
-static VALUE
-nucomp_expt(VALUE self, VALUE other)
-{
- if (k_exact_zero_p(other))
- return f_complex_new_bang1(CLASS_OF(self), ONE);
-
- if (k_rational_p(other) && f_one_p(f_denominator(other)))
- other = f_numerator(other); /* c14n */
-
- if (k_complex_p(other)) {
- get_dat1(other);
-
- if (k_exact_zero_p(dat->imag))
- other = dat->real; /* c14n */
- }
-
- if (k_complex_p(other)) {
- VALUE r, theta, nr, ntheta;
-
- get_dat1(other);
-
- r = f_abs(self);
- theta = f_arg(self);
-
- nr = m_exp_bang(f_sub(f_mul(dat->real, m_log_bang(r)),
- f_mul(dat->imag, theta)));
- ntheta = f_add(f_mul(theta, dat->real),
- f_mul(dat->imag, m_log_bang(r)));
- return f_complex_polar(CLASS_OF(self), nr, ntheta);
- }
- if (k_fixnum_p(other)) {
- if (f_gt_p(other, ZERO)) {
- VALUE x, z;
- long n;
-
- x = self;
- z = x;
- n = FIX2LONG(other) - 1;
-
- while (n) {
- long q, r;
-
- while (1) {
- get_dat1(x);
-
- q = n / 2;
- r = n % 2;
-
- if (r)
- break;
-
- x = f_complex_new2(CLASS_OF(self),
- f_sub(f_mul(dat->real, dat->real),
- f_mul(dat->imag, dat->imag)),
- f_mul(f_mul(TWO, dat->real), dat->imag));
- n = q;
- }
- z = f_mul(z, x);
- n--;
- }
- return z;
- }
- return f_expt(f_reciprocal(self), f_negate(other));
- }
- if (k_numeric_p(other) && f_real_p(other)) {
- VALUE r, theta;
-
- if (k_bignum_p(other))
- rb_warn("in a**b, b may be too big");
-
- r = f_abs(self);
- theta = f_arg(self);
-
- return f_complex_polar(CLASS_OF(self), f_expt(r, other),
- f_mul(theta, other));
- }
- return rb_num_coerce_bin(self, other, id_expt);
-}
-
-/*
- * call-seq:
- * cmp == object -> true or false
- *
- * Returns true if cmp equals object numerically.
- */
-static VALUE
-nucomp_eqeq_p(VALUE self, VALUE other)
-{
- if (k_complex_p(other)) {
- get_dat2(self, other);
-
- return f_boolcast(f_eqeq_p(adat->real, bdat->real) &&
- f_eqeq_p(adat->imag, bdat->imag));
- }
- if (k_numeric_p(other) && f_real_p(other)) {
- get_dat1(self);
-
- return f_boolcast(f_eqeq_p(dat->real, other) && f_zero_p(dat->imag));
- }
- return f_eqeq_p(other, self);
-}
-
-/* :nodoc: */
-static VALUE
-nucomp_coerce(VALUE self, VALUE other)
-{
- if (k_numeric_p(other) && f_real_p(other))
- return rb_assoc_new(f_complex_new_bang1(CLASS_OF(self), other), self);
- if (TYPE(other) == T_COMPLEX)
- return rb_assoc_new(other, self);
-
- rb_raise(rb_eTypeError, "%s can't be coerced into %s",
- rb_obj_classname(other), rb_obj_classname(self));
- return Qnil;
-}
-
-/*
- * call-seq:
- * cmp.abs -> real
- * cmp.magnitude -> real
- *
- * Returns the absolute part of its polar form.
- */
-static VALUE
-nucomp_abs(VALUE self)
-{
- get_dat1(self);
-
- if (f_zero_p(dat->real)) {
- VALUE a = f_abs(dat->imag);
- if (k_float_p(dat->real) && !k_float_p(dat->imag))
- a = f_to_f(a);
- return a;
- }
- if (f_zero_p(dat->imag)) {
- VALUE a = f_abs(dat->real);
- if (!k_float_p(dat->real) && k_float_p(dat->imag))
- a = f_to_f(a);
- return a;
- }
- return m_hypot(dat->real, dat->imag);
-}
-
-/*
- * call-seq:
- * cmp.abs2 -> real
- *
- * Returns square of the absolute value.
- */
-static VALUE
-nucomp_abs2(VALUE self)
-{
- get_dat1(self);
- return f_add(f_mul(dat->real, dat->real),
- f_mul(dat->imag, dat->imag));
-}
-
-/*
- * call-seq:
- * cmp.arg -> float
- * cmp.angle -> float
- * cmp.phase -> float
- *
- * Returns the angle part of its polar form.
- */
-static VALUE
-nucomp_arg(VALUE self)
-{
- get_dat1(self);
- return m_atan2_bang(dat->imag, dat->real);
-}
-
-/*
- * call-seq:
- * cmp.rect -> array
- * cmp.rectangular -> array
- *
- * Returns an array; [cmp.real, cmp.imag].
- */
-static VALUE
-nucomp_rect(VALUE self)
-{
- get_dat1(self);
- return rb_assoc_new(dat->real, dat->imag);
-}
-
-/*
- * call-seq:
- * cmp.polar -> array
- *
- * Returns an array; [cmp.abs, cmp.arg].
- */
-static VALUE
-nucomp_polar(VALUE self)
-{
- return rb_assoc_new(f_abs(self), f_arg(self));
-}
-
-/*
- * call-seq:
- * cmp.conj -> complex
- * cmp.conjucate -> complex
- *
- * Returns the complex conjucate.
- */
-static VALUE
-nucomp_conj(VALUE self)
-{
- get_dat1(self);
- return f_complex_new2(CLASS_OF(self), dat->real, f_negate(dat->imag));
-}
-
-#if 0
-/* :nodoc: */
-static VALUE
-nucomp_true(VALUE self)
-{
- return Qtrue;
-}
-#endif
-
-/*
- * call-seq:
- * cmp.real? -> false
- *
- * Returns false.
- */
-static VALUE
-nucomp_false(VALUE self)
-{
- return Qfalse;
-}
-
-#if 0
-/* :nodoc: */
-static VALUE
-nucomp_exact_p(VALUE self)
-{
- get_dat1(self);
- return f_boolcast(k_exact_p(dat->real) && k_exact_p(dat->imag));
-}
-
-/* :nodoc: */
-static VALUE
-nucomp_inexact_p(VALUE self)
-{
- return f_boolcast(!nucomp_exact_p(self));
-}
-#endif
-
-extern VALUE rb_lcm(VALUE x, VALUE y);
-
-/*
- * call-seq:
- * cmp.denominator -> integer
- *
- * Returns the denominator (lcm of both denominator, real and imag).
- *
- * See numerator.
- */
-static VALUE
-nucomp_denominator(VALUE self)
-{
- get_dat1(self);
- return rb_lcm(f_denominator(dat->real), f_denominator(dat->imag));
-}
-
-/*
- * call-seq:
- * cmp.numerator -> numeric
- *
- * Returns the numerator.
- *
- * For example:
- *
- * 1 2 3+4i <- numerator
- * - + -i -> ----
- * 2 3 6 <- denominator
- *
- * c = Complex('1/2+2/3i') #=> ((1/2)+(2/3)*i)
- * n = c.numerator #=> (3+4i)
- * d = c.denominator #=> 6
- * n / d #=> ((1/2)+(2/3)*i)
- * Complex(Rational(n.real, d), Rational(n.imag, d))
- * #=> ((1/2)+(2/3)*i)
- * See denominator.
- */
-static VALUE
-nucomp_numerator(VALUE self)
-{
- VALUE cd;
-
- get_dat1(self);
-
- cd = f_denominator(self);
- return f_complex_new2(CLASS_OF(self),
- f_mul(f_numerator(dat->real),
- f_div(cd, f_denominator(dat->real))),
- f_mul(f_numerator(dat->imag),
- f_div(cd, f_denominator(dat->imag))));
-}
-
-/* :nodoc: */
-static VALUE
-nucomp_hash(VALUE self)
-{
- long v, h[2];
- VALUE n;
-
- get_dat1(self);
- n = rb_hash(dat->real);
- h[0] = NUM2LONG(n);
- n = rb_hash(dat->imag);
- h[1] = NUM2LONG(n);
- v = rb_memhash(h, sizeof(h));
- return LONG2FIX(v);
-}
-
-/* :nodoc: */
-static VALUE
-nucomp_eql_p(VALUE self, VALUE other)
-{
- if (k_complex_p(other)) {
- get_dat2(self, other);
-
- return f_boolcast((CLASS_OF(adat->real) == CLASS_OF(bdat->real)) &&
- (CLASS_OF(adat->imag) == CLASS_OF(bdat->imag)) &&
- f_eqeq_p(self, other));
-
- }
- return Qfalse;
-}
-
-#ifndef HAVE_SIGNBIT
-#ifdef signbit
-#define HAVE_SIGNBIT 1
-#endif
-#endif
-
-inline static VALUE
-f_signbit(VALUE x)
-{
- switch (TYPE(x)) {
- case T_FLOAT: {
-#ifdef HAVE_SIGNBIT
- double f = RFLOAT_VALUE(x);
- return f_boolcast(!isnan(f) && signbit(f));
-#else
- char s[2];
- double f = RFLOAT_VALUE(x);
-
- if (isnan(f)) return Qfalse;
- (void)snprintf(s, sizeof s, "%.0f", f);
- return f_boolcast(s[0] == '-');
-#endif
- }
- }
- return f_negative_p(x);
-}
-
-inline static VALUE
-f_tpositive_p(VALUE x)
-{
- return f_boolcast(!f_signbit(x));
-}
-
-static VALUE
-f_format(VALUE self, VALUE (*func)(VALUE))
-{
- VALUE s, impos;
-
- get_dat1(self);
-
- impos = f_tpositive_p(dat->imag);
-
- s = (*func)(dat->real);
- rb_str_cat2(s, !impos ? "-" : "+");
-
- rb_str_concat(s, (*func)(f_abs(dat->imag)));
- if (!rb_isdigit(RSTRING_PTR(s)[RSTRING_LEN(s) - 1]))
- rb_str_cat2(s, "*");
- rb_str_cat2(s, "i");
-
- return s;
-}
-
-/*
- * call-seq:
- * cmp.to_s -> string
- *
- * Returns the value as a string.
- */
-static VALUE
-nucomp_to_s(VALUE self)
-{
- return f_format(self, f_to_s);
-}
-
-/*
- * call-seq:
- * cmp.inspect -> string
- *
- * Returns the value as a string for inspection.
- */
-static VALUE
-nucomp_inspect(VALUE self)
-{
- VALUE s;
-
- s = rb_usascii_str_new2("(");
- rb_str_concat(s, f_format(self, f_inspect));
- rb_str_cat2(s, ")");
-
- return s;
-}
-
-/* :nodoc: */
-static VALUE
-nucomp_marshal_dump(VALUE self)
-{
- VALUE a;
- get_dat1(self);
-
- a = rb_assoc_new(dat->real, dat->imag);
- rb_copy_generic_ivar(a, self);
- return a;
-}
-
-/* :nodoc: */
-static VALUE
-nucomp_marshal_load(VALUE self, VALUE a)
-{
- get_dat1(self);
- dat->real = RARRAY_PTR(a)[0];
- dat->imag = RARRAY_PTR(a)[1];
- rb_copy_generic_ivar(self, a);
- return self;
-}
-
-/* --- */
-
-VALUE
-rb_complex_raw(VALUE x, VALUE y)
-{
- return nucomp_s_new_internal(rb_cComplex, x, y);
-}
-
-VALUE
-rb_complex_new(VALUE x, VALUE y)
-{
- return nucomp_s_canonicalize_internal(rb_cComplex, x, y);
-}
-
-VALUE
-rb_complex_polar(VALUE x, VALUE y)
-{
- return f_complex_polar(rb_cComplex, x, y);
-}
-
-static VALUE nucomp_s_convert(int argc, VALUE *argv, VALUE klass);
-
-VALUE
-rb_Complex(VALUE x, VALUE y)
-{
- VALUE a[2];
- a[0] = x;
- a[1] = y;
- return nucomp_s_convert(2, a, rb_cComplex);
-}
-
-/*
- * call-seq:
- * cmp.to_i -> integer
- *
- * Returns the value as an integer if possible.
- */
-static VALUE
-nucomp_to_i(VALUE self)
-{
- get_dat1(self);
-
- if (k_inexact_p(dat->imag) || f_nonzero_p(dat->imag)) {
- VALUE s = f_to_s(self);
- rb_raise(rb_eRangeError, "can't convert %s into Integer",
- StringValuePtr(s));
- }
- return f_to_i(dat->real);
-}
-
-/*
- * call-seq:
- * cmp.to_f -> float
- *
- * Returns the value as a float if possible.
- */
-static VALUE
-nucomp_to_f(VALUE self)
-{
- get_dat1(self);
-
- if (k_inexact_p(dat->imag) || f_nonzero_p(dat->imag)) {
- VALUE s = f_to_s(self);
- rb_raise(rb_eRangeError, "can't convert %s into Float",
- StringValuePtr(s));
- }
- return f_to_f(dat->real);
-}
-
-/*
- * call-seq:
- * cmp.to_r -> rational
- *
- * Returns the value as a rational if possible.
- */
-static VALUE
-nucomp_to_r(VALUE self)
-{
- get_dat1(self);
-
- if (k_inexact_p(dat->imag) || f_nonzero_p(dat->imag)) {
- VALUE s = f_to_s(self);
- rb_raise(rb_eRangeError, "can't convert %s into Rational",
- StringValuePtr(s));
- }
- return f_to_r(dat->real);
-}
-
-/*
- * call-seq:
- * cmp.rationalize([eps]) -> rational
- *
- * Returns the value as a rational if possible. An optional argument
- * eps is always ignored.
- */
-static VALUE
-nucomp_rationalize(int argc, VALUE *argv, VALUE self)
-{
- rb_scan_args(argc, argv, "01", NULL);
- return nucomp_to_r(self);
-}
-
-/*
- * call-seq:
- * nil.to_c -> (0+0i)
- *
- * Returns zero as a complex.
- */
-static VALUE
-nilclass_to_c(VALUE self)
-{
- return rb_complex_new1(INT2FIX(0));
-}
-
-/*
- * call-seq:
- * num.to_c -> complex
- *
- * Returns the value as a complex.
- */
-static VALUE
-numeric_to_c(VALUE self)
-{
- return rb_complex_new1(self);
-}
-
-static VALUE comp_pat0, comp_pat1, comp_pat2, a_slash, a_dot_and_an_e,
- null_string, underscores_pat, an_underscore;
-
-#define WS "\\s*"
-#define DIGITS "(?:[0-9](?:_[0-9]|[0-9])*)"
-#define NUMERATOR "(?:" DIGITS "?\\.)?" DIGITS "(?:[eE][-+]?" DIGITS ")?"
-#define DENOMINATOR DIGITS
-#define NUMBER "[-+]?" NUMERATOR "(?:\\/" DENOMINATOR ")?"
-#define NUMBERNOS NUMERATOR "(?:\\/" DENOMINATOR ")?"
-#define PATTERN0 "\\A" WS "(" NUMBER ")@(" NUMBER ")" WS
-#define PATTERN1 "\\A" WS "([-+])?(" NUMBER ")?[iIjJ]" WS
-#define PATTERN2 "\\A" WS "(" NUMBER ")(([-+])(" NUMBERNOS ")?[iIjJ])?" WS
-
-static void
-make_patterns(void)
-{
- static const char comp_pat0_source[] = PATTERN0;
- static const char comp_pat1_source[] = PATTERN1;
- static const char comp_pat2_source[] = PATTERN2;
- static const char underscores_pat_source[] = "_+";
-
- if (comp_pat0) return;
-
- comp_pat0 = rb_reg_new(comp_pat0_source, sizeof comp_pat0_source - 1, 0);
- rb_gc_register_mark_object(comp_pat0);
-
- comp_pat1 = rb_reg_new(comp_pat1_source, sizeof comp_pat1_source - 1, 0);
- rb_gc_register_mark_object(comp_pat1);
-
- comp_pat2 = rb_reg_new(comp_pat2_source, sizeof comp_pat2_source - 1, 0);
- rb_gc_register_mark_object(comp_pat2);
-
- a_slash = rb_usascii_str_new2("/");
- rb_gc_register_mark_object(a_slash);
-
- a_dot_and_an_e = rb_usascii_str_new2(".eE");
- rb_gc_register_mark_object(a_dot_and_an_e);
-
- null_string = rb_usascii_str_new2("");
- rb_gc_register_mark_object(null_string);
-
- underscores_pat = rb_reg_new(underscores_pat_source,
- sizeof underscores_pat_source - 1, 0);
- rb_gc_register_mark_object(underscores_pat);
-
- an_underscore = rb_usascii_str_new2("_");
- rb_gc_register_mark_object(an_underscore);
-}
-
-#define id_match rb_intern("match")
-#define f_match(x,y) rb_funcall(x, id_match, 1, y)
-
-#define id_aref rb_intern("[]")
-#define f_aref(x,y) rb_funcall(x, id_aref, 1, y)
-
-#define id_post_match rb_intern("post_match")
-#define f_post_match(x) rb_funcall(x, id_post_match, 0)
-
-#define id_split rb_intern("split")
-#define f_split(x,y) rb_funcall(x, id_split, 1, y)
-
-#define id_include_p rb_intern("include?")
-#define f_include_p(x,y) rb_funcall(x, id_include_p, 1, y)
-
-#define id_count rb_intern("count")
-#define f_count(x,y) rb_funcall(x, id_count, 1, y)
-
-#define id_gsub_bang rb_intern("gsub!")
-#define f_gsub_bang(x,y,z) rb_funcall(x, id_gsub_bang, 2, y, z)
-
-static VALUE
-string_to_c_internal(VALUE self)
-{
- VALUE s;
-
- s = self;
-
- if (RSTRING_LEN(s) == 0)
- return rb_assoc_new(Qnil, self);
-
- {
- VALUE m, sr, si, re, r, i;
- int po;
-
- m = f_match(comp_pat0, s);
- if (!NIL_P(m)) {
- sr = f_aref(m, INT2FIX(1));
- si = f_aref(m, INT2FIX(2));
- re = f_post_match(m);
- po = 1;
- }
- if (NIL_P(m)) {
- m = f_match(comp_pat1, s);
- if (!NIL_P(m)) {
- sr = Qnil;
- si = f_aref(m, INT2FIX(1));
- if (NIL_P(si))
- si = rb_usascii_str_new2("");
- {
- VALUE t;
-
- t = f_aref(m, INT2FIX(2));
- if (NIL_P(t))
- t = rb_usascii_str_new2("1");
- rb_str_concat(si, t);
- }
- re = f_post_match(m);
- po = 0;
- }
- }
- if (NIL_P(m)) {
- m = f_match(comp_pat2, s);
- if (NIL_P(m))
- return rb_assoc_new(Qnil, self);
- sr = f_aref(m, INT2FIX(1));
- if (NIL_P(f_aref(m, INT2FIX(2))))
- si = Qnil;
- else {
- VALUE t;
-
- si = f_aref(m, INT2FIX(3));
- t = f_aref(m, INT2FIX(4));
- if (NIL_P(t))
- t = rb_usascii_str_new2("1");
- rb_str_concat(si, t);
- }
- re = f_post_match(m);
- po = 0;
- }
- r = INT2FIX(0);
- i = INT2FIX(0);
- if (!NIL_P(sr)) {
- if (f_include_p(sr, a_slash))
- r = f_to_r(sr);
- else if (f_gt_p(f_count(sr, a_dot_and_an_e), INT2FIX(0)))
- r = f_to_f(sr);
- else
- r = f_to_i(sr);
- }
- if (!NIL_P(si)) {
- if (f_include_p(si, a_slash))
- i = f_to_r(si);
- else if (f_gt_p(f_count(si, a_dot_and_an_e), INT2FIX(0)))
- i = f_to_f(si);
- else
- i = f_to_i(si);
- }
- if (po)
- return rb_assoc_new(rb_complex_polar(r, i), re);
- else
- return rb_assoc_new(rb_complex_new2(r, i), re);
- }
-}
-
-static VALUE
-string_to_c_strict(VALUE self)
-{
- VALUE a = string_to_c_internal(self);
- if (NIL_P(RARRAY_PTR(a)[0]) || RSTRING_LEN(RARRAY_PTR(a)[1]) > 0) {
- VALUE s = f_inspect(self);
- rb_raise(rb_eArgError, "invalid value for convert(): %s",
- StringValuePtr(s));
- }
- return RARRAY_PTR(a)[0];
-}
-
-#define id_gsub rb_intern("gsub")
-#define f_gsub(x,y,z) rb_funcall(x, id_gsub, 2, y, z)
-
-/*
- * call-seq:
- * str.to_c -> complex
- *
- * Returns a complex which denotes the string form. The parser
- * ignores leading whitespaces and trailing garbage. Any digit
- * sequences can be separeted by an underscore. Returns zero for null
- * or garbage string.
- *
- * For example:
- *
- * '9'.to_c #=> (9+0i)
- * '2.5'.to_c #=> (2.5+0i)
- * '2.5/1'.to_c #=> ((5/2)+0i)
- * '-3/2'.to_c #=> ((-3/2)+0i)
- * '-i'.to_c #=> (0-1i)
- * '45i'.to_c #=> (0+45i)
- * '3-4i'.to_c #=> (3-4i)
- * '-4e2-4e-2i'.to_c #=> (-400.0-0.04i)
- * '-0.0-0.0i'.to_c #=> (-0.0-0.0i)
- * '1/2+3/4i'.to_c #=> ((1/2)+(3/4)*i)
- * 'ruby'.to_c #=> (0+0i)
- */
-static VALUE
-string_to_c(VALUE self)
-{
- VALUE s, a, backref;
-
- backref = rb_backref_get();
- rb_match_busy(backref);
-
- s = f_gsub(self, underscores_pat, an_underscore);
- a = string_to_c_internal(s);
-
- rb_backref_set(backref);
-
- if (!NIL_P(RARRAY_PTR(a)[0]))
- return RARRAY_PTR(a)[0];
- return rb_complex_new1(INT2FIX(0));
-}
-
-static VALUE
-nucomp_s_convert(int argc, VALUE *argv, VALUE klass)
-{
- VALUE a1, a2, backref;
-
- rb_scan_args(argc, argv, "11", &a1, &a2);
-
- if (NIL_P(a1) || (argc == 2 && NIL_P(a2)))
- rb_raise(rb_eTypeError, "can't convert nil into Complex");
-
- backref = rb_backref_get();
- rb_match_busy(backref);
-
- switch (TYPE(a1)) {
- case T_FIXNUM:
- case T_BIGNUM:
- case T_FLOAT:
- break;
- case T_STRING:
- a1 = string_to_c_strict(a1);
- break;
- }
-
- switch (TYPE(a2)) {
- case T_FIXNUM:
- case T_BIGNUM:
- case T_FLOAT:
- break;
- case T_STRING:
- a2 = string_to_c_strict(a2);
- break;
- }
-
- rb_backref_set(backref);
-
- switch (TYPE(a1)) {
- case T_COMPLEX:
- {
- get_dat1(a1);
-
- if (k_exact_zero_p(dat->imag))
- a1 = dat->real;
- }
- }
-
- switch (TYPE(a2)) {
- case T_COMPLEX:
- {
- get_dat1(a2);
-
- if (k_exact_zero_p(dat->imag))
- a2 = dat->real;
- }
- }
-
- switch (TYPE(a1)) {
- case T_COMPLEX:
- if (argc == 1 || (k_exact_zero_p(a2)))
- return a1;
- }
-
- if (argc == 1) {
- if (k_numeric_p(a1) && !f_real_p(a1))
- return a1;
- /* expect raise exception for consistency */
- if (!k_numeric_p(a1))
- return rb_convert_type(a1, T_COMPLEX, "Complex", "to_c");
- }
- else {
- if ((k_numeric_p(a1) && k_numeric_p(a2)) &&
- (!f_real_p(a1) || !f_real_p(a2)))
- return f_add(a1,
- f_mul(a2,
- f_complex_new_bang2(rb_cComplex, ZERO, ONE)));
- }
-
- {
- VALUE argv2[2];
- argv2[0] = a1;
- argv2[1] = a2;
- return nucomp_s_new(argc, argv2, klass);
- }
-}
-
-/* --- */
-
-/*
- * call-seq:
- * num.real -> self
- *
- * Returns self.
- */
-static VALUE
-numeric_real(VALUE self)
-{
- return self;
-}
-
-/*
- * call-seq:
- * num.imag -> 0
- * num.imaginary -> 0
- *
- * Returns zero.
- */
-static VALUE
-numeric_imag(VALUE self)
-{
- return INT2FIX(0);
-}
-
-/*
- * call-seq:
- * num.abs2 -> real
- *
- * Returns square of self.
- */
-static VALUE
-numeric_abs2(VALUE self)
-{
- return f_mul(self, self);
-}
-
-#define id_PI rb_intern("PI")
-
-/*
- * call-seq:
- * num.arg -> 0 or float
- * num.angle -> 0 or float
- * num.phase -> 0 or float
- *
- * Returns 0 if the value is positive, pi otherwise.
- */
-static VALUE
-numeric_arg(VALUE self)
-{
- if (f_positive_p(self))
- return INT2FIX(0);
- return rb_const_get(rb_mMath, id_PI);
-}
-
-/*
- * call-seq:
- * num.rect -> array
- *
- * Returns an array; [num, 0].
- */
-static VALUE
-numeric_rect(VALUE self)
-{
- return rb_assoc_new(self, INT2FIX(0));
-}
-
-/*
- * call-seq:
- * num.polar -> array
- *
- * Returns an array; [num.abs, num.arg].
- */
-static VALUE
-numeric_polar(VALUE self)
-{
- return rb_assoc_new(f_abs(self), f_arg(self));
-}
-
-/*
- * call-seq:
- * num.conj -> self
- * num.conjucate -> self
- *
- * Returns self.
- */
-static VALUE
-numeric_conj(VALUE self)
-{
- return self;
-}
-
-/*
- * call-seq:
- * flo.arg -> 0 or float
- * flo.angle -> 0 or float
- * flo.phase -> 0 or float
- *
- * Returns 0 if the value is positive, pi otherwise.
- */
-static VALUE
-float_arg(VALUE self)
-{
- if (isnan(RFLOAT_VALUE(self)))
- return self;
- if (f_tpositive_p(self))
- return INT2FIX(0);
- return rb_const_get(rb_mMath, id_PI);
-}
-
-/*
- * A complex number can be represented as a paired real number with
- * imaginary unit; a+bi. Where a is real part, b is imaginary part
- * and i is imaginary unit. Real a equals complex a+0i
- * mathematically.
- *
- * In ruby, you can create complex object with Complex, Complex::rect,
- * Complex::polar or to_c method.
- *
- * Complex(1) #=> (1+0i)
- * Complex(2, 3) #=> (2+3i)
- * Complex.polar(2, 3) #=> (-1.9799849932008908+0.2822400161197344i)
- * 3.to_c #=> (3+0i)
- *
- * You can also create complex object from floating-point numbers or
- * strings.
- *
- * Complex(0.3) #=> (0.3+0i)
- * Complex('0.3-0.5i') #=> (0.3-0.5i)
- * Complex('2/3+3/4i') #=> ((2/3)+(3/4)*i)
- * Complex('1@2') #=> (-0.4161468365471424+0.9092974268256817i)
- *
- * 0.3.to_c #=> (0.3+0i)
- * '0.3-0.5i'.to_c #=> (0.3-0.5i)
- * '2/3+3/4i'.to_c #=> ((2/3)+(3/4)*i)
- * '1@2'.to_c #=> (-0.4161468365471424+0.9092974268256817i)
- *
- * A complex object is either an exact or an inexact number.
- *
- * Complex(1, 1) / 2 #=> ((1/2)+(1/2)*i)
- * Complex(1, 1) / 2.0 #=> (0.5+0.5i)
- */
-void
-Init_Complex(void)
-{
-#undef rb_intern
-#define rb_intern(str) rb_intern_const(str)
-
- assert(fprintf(stderr, "assert() is now active\n"));
-
- id_abs = rb_intern("abs");
- id_abs2 = rb_intern("abs2");
- id_arg = rb_intern("arg");
- id_cmp = rb_intern("<=>");
- id_conj = rb_intern("conj");
- id_convert = rb_intern("convert");
- id_denominator = rb_intern("denominator");
- id_divmod = rb_intern("divmod");
- id_eqeq_p = rb_intern("==");
- id_expt = rb_intern("**");
- id_fdiv = rb_intern("fdiv");
- id_floor = rb_intern("floor");
- id_idiv = rb_intern("div");
- id_imag = rb_intern("imag");
- id_inspect = rb_intern("inspect");
- id_negate = rb_intern("-@");
- id_numerator = rb_intern("numerator");
- id_quo = rb_intern("quo");
- id_real = rb_intern("real");
- id_real_p = rb_intern("real?");
- id_to_f = rb_intern("to_f");
- id_to_i = rb_intern("to_i");
- id_to_r = rb_intern("to_r");
- id_to_s = rb_intern("to_s");
-
- rb_cComplex = rb_define_class("Complex", rb_cNumeric);
-
- rb_define_alloc_func(rb_cComplex, nucomp_s_alloc);
- rb_undef_method(CLASS_OF(rb_cComplex), "allocate");
-
-#if 0
- rb_define_private_method(CLASS_OF(rb_cComplex), "new!", nucomp_s_new_bang, -1);
- rb_define_private_method(CLASS_OF(rb_cComplex), "new", nucomp_s_new, -1);
-#else
- rb_undef_method(CLASS_OF(rb_cComplex), "new");
-#endif
-
- rb_define_singleton_method(rb_cComplex, "rectangular", nucomp_s_new, -1);
- rb_define_singleton_method(rb_cComplex, "rect", nucomp_s_new, -1);
- rb_define_singleton_method(rb_cComplex, "polar", nucomp_s_polar, -1);
-
- rb_define_global_function("Complex", nucomp_f_complex, -1);
-
- rb_undef_method(rb_cComplex, "%");
- rb_undef_method(rb_cComplex, "<");
- rb_undef_method(rb_cComplex, "<=");
- rb_undef_method(rb_cComplex, "<=>");
- rb_undef_method(rb_cComplex, ">");
- rb_undef_method(rb_cComplex, ">=");
- rb_undef_method(rb_cComplex, "between?");
- rb_undef_method(rb_cComplex, "div");
- rb_undef_method(rb_cComplex, "divmod");
- rb_undef_method(rb_cComplex, "floor");
- rb_undef_method(rb_cComplex, "ceil");
- rb_undef_method(rb_cComplex, "modulo");
- rb_undef_method(rb_cComplex, "remainder");
- rb_undef_method(rb_cComplex, "round");
- rb_undef_method(rb_cComplex, "step");
- rb_undef_method(rb_cComplex, "truncate");
- rb_undef_method(rb_cComplex, "i");
-
-#if 0 /* NUBY */
- rb_undef_method(rb_cComplex, "//");
-#endif
-
- rb_define_method(rb_cComplex, "real", nucomp_real, 0);
- rb_define_method(rb_cComplex, "imaginary", nucomp_imag, 0);
- rb_define_method(rb_cComplex, "imag", nucomp_imag, 0);
-
- rb_define_method(rb_cComplex, "-@", nucomp_negate, 0);
- rb_define_method(rb_cComplex, "+", nucomp_add, 1);
- rb_define_method(rb_cComplex, "-", nucomp_sub, 1);
- rb_define_method(rb_cComplex, "*", nucomp_mul, 1);
- rb_define_method(rb_cComplex, "/", nucomp_div, 1);
- rb_define_method(rb_cComplex, "quo", nucomp_quo, 1);
- rb_define_method(rb_cComplex, "fdiv", nucomp_fdiv, 1);
- rb_define_method(rb_cComplex, "**", nucomp_expt, 1);
-
- rb_define_method(rb_cComplex, "==", nucomp_eqeq_p, 1);
- rb_define_method(rb_cComplex, "coerce", nucomp_coerce, 1);
-
- rb_define_method(rb_cComplex, "abs", nucomp_abs, 0);
- rb_define_method(rb_cComplex, "magnitude", nucomp_abs, 0);
- rb_define_method(rb_cComplex, "abs2", nucomp_abs2, 0);
- rb_define_method(rb_cComplex, "arg", nucomp_arg, 0);
- rb_define_method(rb_cComplex, "angle", nucomp_arg, 0);
- rb_define_method(rb_cComplex, "phase", nucomp_arg, 0);
- rb_define_method(rb_cComplex, "rectangular", nucomp_rect, 0);
- rb_define_method(rb_cComplex, "rect", nucomp_rect, 0);
- rb_define_method(rb_cComplex, "polar", nucomp_polar, 0);
- rb_define_method(rb_cComplex, "conjugate", nucomp_conj, 0);
- rb_define_method(rb_cComplex, "conj", nucomp_conj, 0);
-#if 0
- rb_define_method(rb_cComplex, "~", nucomp_conj, 0); /* gcc */
-#endif
-
- rb_define_method(rb_cComplex, "real?", nucomp_false, 0);
-#if 0
- rb_define_method(rb_cComplex, "complex?", nucomp_true, 0);
- rb_define_method(rb_cComplex, "exact?", nucomp_exact_p, 0);
- rb_define_method(rb_cComplex, "inexact?", nucomp_inexact_p, 0);
-#endif
-
- rb_define_method(rb_cComplex, "numerator", nucomp_numerator, 0);
- rb_define_method(rb_cComplex, "denominator", nucomp_denominator, 0);
-
- rb_define_method(rb_cComplex, "hash", nucomp_hash, 0);
- rb_define_method(rb_cComplex, "eql?", nucomp_eql_p, 1);
-
- rb_define_method(rb_cComplex, "to_s", nucomp_to_s, 0);
- rb_define_method(rb_cComplex, "inspect", nucomp_inspect, 0);
-
- rb_define_method(rb_cComplex, "marshal_dump", nucomp_marshal_dump, 0);
- rb_define_method(rb_cComplex, "marshal_load", nucomp_marshal_load, 1);
-
- /* --- */
-
- rb_define_method(rb_cComplex, "to_i", nucomp_to_i, 0);
- rb_define_method(rb_cComplex, "to_f", nucomp_to_f, 0);
- rb_define_method(rb_cComplex, "to_r", nucomp_to_r, 0);
- rb_define_method(rb_cComplex, "rationalize", nucomp_rationalize, -1);
- rb_define_method(rb_cNilClass, "to_c", nilclass_to_c, 0);
- rb_define_method(rb_cNumeric, "to_c", numeric_to_c, 0);
-
- make_patterns();
-
- rb_define_method(rb_cString, "to_c", string_to_c, 0);
-
- rb_define_private_method(CLASS_OF(rb_cComplex), "convert", nucomp_s_convert, -1);
-
- /* --- */
-
- rb_define_method(rb_cNumeric, "real", numeric_real, 0);
- rb_define_method(rb_cNumeric, "imaginary", numeric_imag, 0);
- rb_define_method(rb_cNumeric, "imag", numeric_imag, 0);
- rb_define_method(rb_cNumeric, "abs2", numeric_abs2, 0);
- rb_define_method(rb_cNumeric, "arg", numeric_arg, 0);
- rb_define_method(rb_cNumeric, "angle", numeric_arg, 0);
- rb_define_method(rb_cNumeric, "phase", numeric_arg, 0);
- rb_define_method(rb_cNumeric, "rectangular", numeric_rect, 0);
- rb_define_method(rb_cNumeric, "rect", numeric_rect, 0);
- rb_define_method(rb_cNumeric, "polar", numeric_polar, 0);
- rb_define_method(rb_cNumeric, "conjugate", numeric_conj, 0);
- rb_define_method(rb_cNumeric, "conj", numeric_conj, 0);
-
- rb_define_method(rb_cFloat, "arg", float_arg, 0);
- rb_define_method(rb_cFloat, "angle", float_arg, 0);
- rb_define_method(rb_cFloat, "phase", float_arg, 0);
-
- rb_define_const(rb_cComplex, "I",
- f_complex_new_bang2(rb_cComplex, ZERO, ONE));
-}
-
-/*
-Local variables:
-c-file-style: "ruby"
-End:
-*/
diff --git a/config.guess b/config.guess
new file mode 100644
index 0000000000..dd1688b7b5
--- /dev/null
+++ b/config.guess
@@ -0,0 +1,1459 @@
+#! /bin/sh
+# Attempt to guess a canonical system name.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+
+timestamp='2004-06-11'
+
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Originally written by Per Bothner <per@bothner.com>.
+# Please send patches to <config-patches@gnu.org>. Submit a context
+# diff and a properly formatted ChangeLog entry.
+#
+# This script attempts to guess a canonical system name similar to
+# config.sub. If it succeeds, it prints the system name on stdout, and
+# exits with 0. Otherwise, it exits with 1.
+#
+# The plan is that this can be called by configure scripts if you
+# don't specify an explicit build system type.
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION]
+
+Output the configuration name of the system \`$me' is run on.
+
+Operation modes:
+ -h, --help print this help, then exit
+ -t, --time-stamp print date of last modification, then exit
+ -v, --version print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.guess ($timestamp)
+
+Originally written by Per Bothner.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions. There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+ case $1 in
+ --time-stamp | --time* | -t )
+ echo "$timestamp" ; exit 0 ;;
+ --version | -v )
+ echo "$version" ; exit 0 ;;
+ --help | --h* | -h )
+ echo "$usage"; exit 0 ;;
+ -- ) # Stop option processing
+ shift; break ;;
+ - ) # Use stdin as input.
+ break ;;
+ -* )
+ echo "$me: invalid option $1$help" >&2
+ exit 1 ;;
+ * )
+ break ;;
+ esac
+done
+
+if test $# != 0; then
+ echo "$me: too many arguments$help" >&2
+ exit 1
+fi
+
+trap 'exit 1' 1 2 15
+
+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
+# compiler to aid in system detection is discouraged as it requires
+# temporary files to be created and, as you can see below, it is a
+# headache to deal with in a portable fashion.
+
+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
+# use `HOST_CC' if defined, but it is deprecated.
+
+# Portable tmp directory creation inspired by the Autoconf team.
+
+set_cc_for_build='
+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+: ${TMPDIR=/tmp} ;
+ { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+dummy=$tmp/dummy ;
+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
+case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,) echo "int x;" > $dummy.c ;
+ for c in cc gcc c89 c99 ; do
+ if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
+ CC_FOR_BUILD="$c"; break ;
+ fi ;
+ done ;
+ if test x"$CC_FOR_BUILD" = x ; then
+ CC_FOR_BUILD=no_compiler_found ;
+ fi
+ ;;
+ ,,*) CC_FOR_BUILD=$CC ;;
+ ,*,*) CC_FOR_BUILD=$HOST_CC ;;
+esac ;'
+
+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+# (ghazi@noc.rutgers.edu 1994-08-24)
+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+ PATH=$PATH:/.attbin ; export PATH
+fi
+
+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
+UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
+# Note: order is significant - the case branches are not exclusive.
+
+case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+ *:NetBSD:*:*)
+ # NetBSD (nbsd) targets should (where applicable) match one or
+ # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+ # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
+ # switched to ELF, *-*-netbsd* would select the old
+ # object file format. This provides both forward
+ # compatibility and a consistent mechanism for selecting the
+ # object file format.
+ #
+ # Note: NetBSD doesn't particularly care about the vendor
+ # portion of the name. We always set it to "unknown".
+ sysctl="sysctl -n hw.machine_arch"
+ UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
+ /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+ case "${UNAME_MACHINE_ARCH}" in
+ armeb) machine=armeb-unknown ;;
+ arm*) machine=arm-unknown ;;
+ sh3el) machine=shl-unknown ;;
+ sh3eb) machine=sh-unknown ;;
+ *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+ esac
+ # The Operating System including object format, if it has switched
+ # to ELF recently, or will in the future.
+ case "${UNAME_MACHINE_ARCH}" in
+ arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+ eval $set_cc_for_build
+ if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+ | grep __ELF__ >/dev/null
+ then
+ # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+ # Return netbsd for either. FIX?
+ os=netbsd
+ else
+ os=netbsdelf
+ fi
+ ;;
+ *)
+ os=netbsd
+ ;;
+ esac
+ # The OS release
+ # Debian GNU/NetBSD machines have a different userland, and
+ # thus, need a distinct triplet. However, they do not need
+ # kernel version information, so it can be replaced with a
+ # suitable tag, in the style of linux-gnu.
+ case "${UNAME_VERSION}" in
+ Debian*)
+ release='-gnu'
+ ;;
+ *)
+ release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+ ;;
+ esac
+ # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+ # contains redundant information, the shorter form:
+ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+ echo "${machine}-${os}${release}"
+ exit 0 ;;
+ amd64:OpenBSD:*:*)
+ echo x86_64-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ amiga:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ arc:OpenBSD:*:*)
+ echo mipsel-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ cats:OpenBSD:*:*)
+ echo arm-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ hp300:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ luna88k:OpenBSD:*:*)
+ echo m88k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ mac68k:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ macppc:OpenBSD:*:*)
+ echo powerpc-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ mvme68k:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ mvme88k:OpenBSD:*:*)
+ echo m88k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ mvmeppc:OpenBSD:*:*)
+ echo powerpc-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ pmax:OpenBSD:*:*)
+ echo mipsel-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ sgi:OpenBSD:*:*)
+ echo mipseb-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ sun3:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ wgrisc:OpenBSD:*:*)
+ echo mipsel-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ *:OpenBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ *:ekkoBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+ exit 0 ;;
+ macppc:MirBSD:*:*)
+ echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+ exit 0 ;;
+ *:MirBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+ exit 0 ;;
+ alpha:OSF1:*:*)
+ case $UNAME_RELEASE in
+ *4.0)
+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+ ;;
+ *5.*)
+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+ ;;
+ esac
+ # According to Compaq, /usr/sbin/psrinfo has been available on
+ # OSF/1 and Tru64 systems produced since 1995. I hope that
+ # covers most systems running today. This code pipes the CPU
+ # types through head -n 1, so we only detect the type of CPU 0.
+ ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1`
+ case "$ALPHA_CPU_TYPE" in
+ "EV4 (21064)")
+ UNAME_MACHINE="alpha" ;;
+ "EV4.5 (21064)")
+ UNAME_MACHINE="alpha" ;;
+ "LCA4 (21066/21068)")
+ UNAME_MACHINE="alpha" ;;
+ "EV5 (21164)")
+ UNAME_MACHINE="alphaev5" ;;
+ "EV5.6 (21164A)")
+ UNAME_MACHINE="alphaev56" ;;
+ "EV5.6 (21164PC)")
+ UNAME_MACHINE="alphapca56" ;;
+ "EV5.7 (21164PC)")
+ UNAME_MACHINE="alphapca57" ;;
+ "EV6 (21264)")
+ UNAME_MACHINE="alphaev6" ;;
+ "EV6.7 (21264A)")
+ UNAME_MACHINE="alphaev67" ;;
+ "EV6.8CB (21264C)")
+ UNAME_MACHINE="alphaev68" ;;
+ "EV6.8AL (21264B)")
+ UNAME_MACHINE="alphaev68" ;;
+ "EV6.8CX (21264D)")
+ UNAME_MACHINE="alphaev68" ;;
+ "EV6.9A (21264/EV69A)")
+ UNAME_MACHINE="alphaev69" ;;
+ "EV7 (21364)")
+ UNAME_MACHINE="alphaev7" ;;
+ "EV7.9 (21364A)")
+ UNAME_MACHINE="alphaev79" ;;
+ esac
+ # A Pn.n version is a patched version.
+ # A Vn.n version is a released version.
+ # A Tn.n version is a released field test version.
+ # A Xn.n version is an unreleased experimental baselevel.
+ # 1.2 uses "1.2" for uname -r.
+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ exit 0 ;;
+ Alpha*:OpenVMS:*:*)
+ echo alpha-hp-vms
+ exit 0 ;;
+ Alpha\ *:Windows_NT*:*)
+ # How do we know it's Interix rather than the generic POSIX subsystem?
+ # Should we change UNAME_MACHINE based on the output of uname instead
+ # of the specific Alpha model?
+ echo alpha-pc-interix
+ exit 0 ;;
+ 21064:Windows_NT:50:3)
+ echo alpha-dec-winnt3.5
+ exit 0 ;;
+ Amiga*:UNIX_System_V:4.0:*)
+ echo m68k-unknown-sysv4
+ exit 0;;
+ *:[Aa]miga[Oo][Ss]:*:*)
+ echo ${UNAME_MACHINE}-unknown-amigaos
+ exit 0 ;;
+ *:[Mm]orph[Oo][Ss]:*:*)
+ echo ${UNAME_MACHINE}-unknown-morphos
+ exit 0 ;;
+ *:OS/390:*:*)
+ echo i370-ibm-openedition
+ exit 0 ;;
+ *:OS400:*:*)
+ echo powerpc-ibm-os400
+ exit 0 ;;
+ arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+ echo arm-acorn-riscix${UNAME_RELEASE}
+ exit 0;;
+ SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+ echo hppa1.1-hitachi-hiuxmpp
+ exit 0;;
+ Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
+ # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
+ if test "`(/bin/universe) 2>/dev/null`" = att ; then
+ echo pyramid-pyramid-sysv3
+ else
+ echo pyramid-pyramid-bsd
+ fi
+ exit 0 ;;
+ NILE*:*:*:dcosx)
+ echo pyramid-pyramid-svr4
+ exit 0 ;;
+ DRS?6000:unix:4.0:6*)
+ echo sparc-icl-nx6
+ exit 0 ;;
+ DRS?6000:UNIX_SV:4.2*:7*)
+ case `/usr/bin/uname -p` in
+ sparc) echo sparc-icl-nx7 && exit 0 ;;
+ esac ;;
+ sun4H:SunOS:5.*:*)
+ echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit 0 ;;
+ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+ echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit 0 ;;
+ i86pc:SunOS:5.*:*)
+ echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit 0 ;;
+ sun4*:SunOS:6*:*)
+ # According to config.sub, this is the proper way to canonicalize
+ # SunOS6. Hard to guess exactly what SunOS6 will be like, but
+ # it's likely to be more like Solaris than SunOS4.
+ echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit 0 ;;
+ sun4*:SunOS:*:*)
+ case "`/usr/bin/arch -k`" in
+ Series*|S4*)
+ UNAME_RELEASE=`uname -v`
+ ;;
+ esac
+ # Japanese Language versions have a version number like `4.1.3-JL'.
+ echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
+ exit 0 ;;
+ sun3*:SunOS:*:*)
+ echo m68k-sun-sunos${UNAME_RELEASE}
+ exit 0 ;;
+ sun*:*:4.2BSD:*)
+ UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+ test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+ case "`/bin/arch`" in
+ sun3)
+ echo m68k-sun-sunos${UNAME_RELEASE}
+ ;;
+ sun4)
+ echo sparc-sun-sunos${UNAME_RELEASE}
+ ;;
+ esac
+ exit 0 ;;
+ aushp:SunOS:*:*)
+ echo sparc-auspex-sunos${UNAME_RELEASE}
+ exit 0 ;;
+ # The situation for MiNT is a little confusing. The machine name
+ # can be virtually everything (everything which is not
+ # "atarist" or "atariste" at least should have a processor
+ # > m68000). The system name ranges from "MiNT" over "FreeMiNT"
+ # to the lowercase version "mint" (or "freemint"). Finally
+ # the system name "TOS" denotes a system which is actually not
+ # MiNT. But MiNT is downward compatible to TOS, so this should
+ # be no problem.
+ atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+ echo m68k-atari-mint${UNAME_RELEASE}
+ exit 0 ;;
+ atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+ echo m68k-atari-mint${UNAME_RELEASE}
+ exit 0 ;;
+ *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+ echo m68k-atari-mint${UNAME_RELEASE}
+ exit 0 ;;
+ milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+ echo m68k-milan-mint${UNAME_RELEASE}
+ exit 0 ;;
+ hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+ echo m68k-hades-mint${UNAME_RELEASE}
+ exit 0 ;;
+ *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+ echo m68k-unknown-mint${UNAME_RELEASE}
+ exit 0 ;;
+ m68k:machten:*:*)
+ echo m68k-apple-machten${UNAME_RELEASE}
+ exit 0 ;;
+ powerpc:machten:*:*)
+ echo powerpc-apple-machten${UNAME_RELEASE}
+ exit 0 ;;
+ RISC*:Mach:*:*)
+ echo mips-dec-mach_bsd4.3
+ exit 0 ;;
+ RISC*:ULTRIX:*:*)
+ echo mips-dec-ultrix${UNAME_RELEASE}
+ exit 0 ;;
+ VAX*:ULTRIX*:*:*)
+ echo vax-dec-ultrix${UNAME_RELEASE}
+ exit 0 ;;
+ 2020:CLIX:*:* | 2430:CLIX:*:*)
+ echo clipper-intergraph-clix${UNAME_RELEASE}
+ exit 0 ;;
+ mips:*:*:UMIPS | mips:*:*:RISCos)
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+#ifdef __cplusplus
+#include <stdio.h> /* for printf() prototype */
+ int main (int argc, char *argv[]) {
+#else
+ int main (argc, argv) int argc; char *argv[]; {
+#endif
+ #if defined (host_mips) && defined (MIPSEB)
+ #if defined (SYSTYPE_SYSV)
+ printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+ #endif
+ #if defined (SYSTYPE_SVR4)
+ printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+ #endif
+ #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
+ printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+ #endif
+ #endif
+ exit (-1);
+ }
+EOF
+ $CC_FOR_BUILD -o $dummy $dummy.c \
+ && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+ && exit 0
+ echo mips-mips-riscos${UNAME_RELEASE}
+ exit 0 ;;
+ Motorola:PowerMAX_OS:*:*)
+ echo powerpc-motorola-powermax
+ exit 0 ;;
+ Motorola:*:4.3:PL8-*)
+ echo powerpc-harris-powermax
+ exit 0 ;;
+ Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
+ echo powerpc-harris-powermax
+ exit 0 ;;
+ Night_Hawk:Power_UNIX:*:*)
+ echo powerpc-harris-powerunix
+ exit 0 ;;
+ m88k:CX/UX:7*:*)
+ echo m88k-harris-cxux7
+ exit 0 ;;
+ m88k:*:4*:R4*)
+ echo m88k-motorola-sysv4
+ exit 0 ;;
+ m88k:*:3*:R3*)
+ echo m88k-motorola-sysv3
+ exit 0 ;;
+ AViiON:dgux:*:*)
+ # DG/UX returns AViiON for all architectures
+ UNAME_PROCESSOR=`/usr/bin/uname -p`
+ if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+ then
+ if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+ [ ${TARGET_BINARY_INTERFACE}x = x ]
+ then
+ echo m88k-dg-dgux${UNAME_RELEASE}
+ else
+ echo m88k-dg-dguxbcs${UNAME_RELEASE}
+ fi
+ else
+ echo i586-dg-dgux${UNAME_RELEASE}
+ fi
+ exit 0 ;;
+ M88*:DolphinOS:*:*) # DolphinOS (SVR3)
+ echo m88k-dolphin-sysv3
+ exit 0 ;;
+ M88*:*:R3*:*)
+ # Delta 88k system running SVR3
+ echo m88k-motorola-sysv3
+ exit 0 ;;
+ XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
+ echo m88k-tektronix-sysv3
+ exit 0 ;;
+ Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
+ echo m68k-tektronix-bsd
+ exit 0 ;;
+ *:IRIX*:*:*)
+ echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
+ exit 0 ;;
+ ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
+ exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX '
+ i*86:AIX:*:*)
+ echo i386-ibm-aix
+ exit 0 ;;
+ ia64:AIX:*:*)
+ if [ -x /usr/bin/oslevel ] ; then
+ IBM_REV=`/usr/bin/oslevel`
+ else
+ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+ fi
+ echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
+ exit 0 ;;
+ *:AIX:2:3)
+ if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #include <sys/systemcfg.h>
+
+ main()
+ {
+ if (!__power_pc())
+ exit(1);
+ puts("powerpc-ibm-aix3.2.5");
+ exit(0);
+ }
+EOF
+ $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+ echo rs6000-ibm-aix3.2.5
+ elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+ echo rs6000-ibm-aix3.2.4
+ else
+ echo rs6000-ibm-aix3.2
+ fi
+ exit 0 ;;
+ *:AIX:*:[45])
+ IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+ if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+ IBM_ARCH=rs6000
+ else
+ IBM_ARCH=powerpc
+ fi
+ if [ -x /usr/bin/oslevel ] ; then
+ IBM_REV=`/usr/bin/oslevel`
+ else
+ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+ fi
+ echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+ exit 0 ;;
+ *:AIX:*:*)
+ echo rs6000-ibm-aix
+ exit 0 ;;
+ ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+ echo romp-ibm-bsd4.4
+ exit 0 ;;
+ ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
+ echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
+ exit 0 ;; # report: romp-ibm BSD 4.3
+ *:BOSX:*:*)
+ echo rs6000-bull-bosx
+ exit 0 ;;
+ DPX/2?00:B.O.S.:*:*)
+ echo m68k-bull-sysv3
+ exit 0 ;;
+ 9000/[34]??:4.3bsd:1.*:*)
+ echo m68k-hp-bsd
+ exit 0 ;;
+ hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
+ echo m68k-hp-bsd4.4
+ exit 0 ;;
+ 9000/[34678]??:HP-UX:*:*)
+ HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+ case "${UNAME_MACHINE}" in
+ 9000/31? ) HP_ARCH=m68000 ;;
+ 9000/[34]?? ) HP_ARCH=m68k ;;
+ 9000/[678][0-9][0-9])
+ if [ -x /usr/bin/getconf ]; then
+ sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+ case "${sc_cpu_version}" in
+ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+ 532) # CPU_PA_RISC2_0
+ case "${sc_kernel_bits}" in
+ 32) HP_ARCH="hppa2.0n" ;;
+ 64) HP_ARCH="hppa2.0w" ;;
+ '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
+ esac ;;
+ esac
+ fi
+ if [ "${HP_ARCH}" = "" ]; then
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+
+ #define _HPUX_SOURCE
+ #include <stdlib.h>
+ #include <unistd.h>
+
+ int main ()
+ {
+ #if defined(_SC_KERNEL_BITS)
+ long bits = sysconf(_SC_KERNEL_BITS);
+ #endif
+ long cpu = sysconf (_SC_CPU_VERSION);
+
+ switch (cpu)
+ {
+ case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+ case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+ case CPU_PA_RISC2_0:
+ #if defined(_SC_KERNEL_BITS)
+ switch (bits)
+ {
+ case 64: puts ("hppa2.0w"); break;
+ case 32: puts ("hppa2.0n"); break;
+ default: puts ("hppa2.0"); break;
+ } break;
+ #else /* !defined(_SC_KERNEL_BITS) */
+ puts ("hppa2.0"); break;
+ #endif
+ default: puts ("hppa1.0"); break;
+ }
+ exit (0);
+ }
+EOF
+ (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+ test -z "$HP_ARCH" && HP_ARCH=hppa
+ fi ;;
+ esac
+ if [ ${HP_ARCH} = "hppa2.0w" ]
+ then
+ # avoid double evaluation of $set_cc_for_build
+ test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
+ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
+ then
+ HP_ARCH="hppa2.0w"
+ else
+ HP_ARCH="hppa64"
+ fi
+ fi
+ echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+ exit 0 ;;
+ ia64:HP-UX:*:*)
+ HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+ echo ia64-hp-hpux${HPUX_REV}
+ exit 0 ;;
+ 3050*:HI-UX:*:*)
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #include <unistd.h>
+ int
+ main ()
+ {
+ long cpu = sysconf (_SC_CPU_VERSION);
+ /* The order matters, because CPU_IS_HP_MC68K erroneously returns
+ true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct
+ results, however. */
+ if (CPU_IS_PA_RISC (cpu))
+ {
+ switch (cpu)
+ {
+ case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
+ case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
+ case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
+ default: puts ("hppa-hitachi-hiuxwe2"); break;
+ }
+ }
+ else if (CPU_IS_HP_MC68K (cpu))
+ puts ("m68k-hitachi-hiuxwe2");
+ else puts ("unknown-hitachi-hiuxwe2");
+ exit (0);
+ }
+EOF
+ $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+ echo unknown-hitachi-hiuxwe2
+ exit 0 ;;
+ 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+ echo hppa1.1-hp-bsd
+ exit 0 ;;
+ 9000/8??:4.3bsd:*:*)
+ echo hppa1.0-hp-bsd
+ exit 0 ;;
+ *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
+ echo hppa1.0-hp-mpeix
+ exit 0 ;;
+ hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+ echo hppa1.1-hp-osf
+ exit 0 ;;
+ hp8??:OSF1:*:*)
+ echo hppa1.0-hp-osf
+ exit 0 ;;
+ i*86:OSF1:*:*)
+ if [ -x /usr/sbin/sysversion ] ; then
+ echo ${UNAME_MACHINE}-unknown-osf1mk
+ else
+ echo ${UNAME_MACHINE}-unknown-osf1
+ fi
+ exit 0 ;;
+ parisc*:Lites*:*:*)
+ echo hppa1.1-hp-lites
+ exit 0 ;;
+ C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+ echo c1-convex-bsd
+ exit 0 ;;
+ C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+ if getsysinfo -f scalar_acc
+ then echo c32-convex-bsd
+ else echo c2-convex-bsd
+ fi
+ exit 0 ;;
+ C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+ echo c34-convex-bsd
+ exit 0 ;;
+ C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+ echo c38-convex-bsd
+ exit 0 ;;
+ C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+ echo c4-convex-bsd
+ exit 0 ;;
+ CRAY*Y-MP:*:*:*)
+ echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ exit 0 ;;
+ CRAY*[A-Z]90:*:*:*)
+ echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+ -e 's/\.[^.]*$/.X/'
+ exit 0 ;;
+ CRAY*TS:*:*:*)
+ echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ exit 0 ;;
+ CRAY*T3E:*:*:*)
+ echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ exit 0 ;;
+ CRAY*SV1:*:*:*)
+ echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ exit 0 ;;
+ *:UNICOS/mp:*:*)
+ echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ exit 0 ;;
+ F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+ FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+ exit 0 ;;
+ 5000:UNIX_System_V:4.*:*)
+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+ exit 0 ;;
+ i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+ echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+ exit 0 ;;
+ sparc*:BSD/OS:*:*)
+ echo sparc-unknown-bsdi${UNAME_RELEASE}
+ exit 0 ;;
+ *:BSD/OS:*:*)
+ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+ exit 0 ;;
+ *:FreeBSD:*:*)
+ # Determine whether the default compiler uses glibc.
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #include <features.h>
+ #if __GLIBC__ >= 2
+ LIBC=gnu
+ #else
+ LIBC=
+ #endif
+EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+ # GNU/KFreeBSD systems have a "k" prefix to indicate we are using
+ # FreeBSD's kernel, but not the complete OS.
+ case ${LIBC} in gnu) kernel_only='k' ;; esac
+ echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
+ exit 0 ;;
+ i*:CYGWIN*:*)
+ echo ${UNAME_MACHINE}-pc-cygwin
+ exit 0 ;;
+ i*:MINGW*:*)
+ echo ${UNAME_MACHINE}-pc-mingw32
+ exit 0 ;;
+ i*:PW*:*)
+ echo ${UNAME_MACHINE}-pc-pw32
+ exit 0 ;;
+ x86:Interix*:[34]*)
+ echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
+ exit 0 ;;
+ [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+ echo i${UNAME_MACHINE}-pc-mks
+ exit 0 ;;
+ i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+ # How do we know it's Interix rather than the generic POSIX subsystem?
+ # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+ # UNAME_MACHINE based on the output of uname instead of i386?
+ echo i586-pc-interix
+ exit 0 ;;
+ i*:UWIN*:*)
+ echo ${UNAME_MACHINE}-pc-uwin
+ exit 0 ;;
+ p*:CYGWIN*:*)
+ echo powerpcle-unknown-cygwin
+ exit 0 ;;
+ prep*:SunOS:5.*:*)
+ echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit 0 ;;
+ *:GNU:*:*)
+ # the GNU system
+ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+ exit 0 ;;
+ *:GNU/*:*:*)
+ # other systems with GNU libc and userland
+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+ exit 0 ;;
+ i*86:Minix:*:*)
+ echo ${UNAME_MACHINE}-pc-minix
+ exit 0 ;;
+ arm*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit 0 ;;
+ cris:Linux:*:*)
+ echo cris-axis-linux-gnu
+ exit 0 ;;
+ ia64:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit 0 ;;
+ m32r*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit 0 ;;
+ m68*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit 0 ;;
+ mips:Linux:*:*)
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #undef CPU
+ #undef mips
+ #undef mipsel
+ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+ CPU=mipsel
+ #else
+ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+ CPU=mips
+ #else
+ CPU=
+ #endif
+ #endif
+EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+ test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+ ;;
+ mips64:Linux:*:*)
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #undef CPU
+ #undef mips64
+ #undef mips64el
+ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+ CPU=mips64el
+ #else
+ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+ CPU=mips64
+ #else
+ CPU=
+ #endif
+ #endif
+EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+ test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+ ;;
+ ppc:Linux:*:*)
+ echo powerpc-unknown-linux-gnu
+ exit 0 ;;
+ ppc64:Linux:*:*)
+ echo powerpc64-unknown-linux-gnu
+ exit 0 ;;
+ alpha:Linux:*:*)
+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+ EV5) UNAME_MACHINE=alphaev5 ;;
+ EV56) UNAME_MACHINE=alphaev56 ;;
+ PCA56) UNAME_MACHINE=alphapca56 ;;
+ PCA57) UNAME_MACHINE=alphapca56 ;;
+ EV6) UNAME_MACHINE=alphaev6 ;;
+ EV67) UNAME_MACHINE=alphaev67 ;;
+ EV68*) UNAME_MACHINE=alphaev68 ;;
+ esac
+ objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+ exit 0 ;;
+ parisc:Linux:*:* | hppa:Linux:*:*)
+ # Look for CPU level
+ case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+ PA7*) echo hppa1.1-unknown-linux-gnu ;;
+ PA8*) echo hppa2.0-unknown-linux-gnu ;;
+ *) echo hppa-unknown-linux-gnu ;;
+ esac
+ exit 0 ;;
+ parisc64:Linux:*:* | hppa64:Linux:*:*)
+ echo hppa64-unknown-linux-gnu
+ exit 0 ;;
+ s390:Linux:*:* | s390x:Linux:*:*)
+ echo ${UNAME_MACHINE}-ibm-linux
+ exit 0 ;;
+ sh64*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit 0 ;;
+ sh*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit 0 ;;
+ sparc:Linux:*:* | sparc64:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit 0 ;;
+ x86_64:Linux:*:*)
+ echo x86_64-unknown-linux-gnu
+ exit 0 ;;
+ i*86:Linux:*:*)
+ # The BFD linker knows what the default object file format is, so
+ # first see if it will tell us. cd to the root directory to prevent
+ # problems with other programs or directories called `ld' in the path.
+ # Set LC_ALL=C to ensure ld outputs messages in English.
+ ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
+ | sed -ne '/supported targets:/!d
+ s/[ ][ ]*/ /g
+ s/.*supported targets: *//
+ s/ .*//
+ p'`
+ case "$ld_supported_targets" in
+ elf32-i386)
+ TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+ ;;
+ a.out-i386-linux)
+ echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+ exit 0 ;;
+ coff-i386)
+ echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+ exit 0 ;;
+ "")
+ # Either a pre-BFD a.out linker (linux-gnuoldld) or
+ # one that does not give us useful --help.
+ echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+ exit 0 ;;
+ esac
+ # Determine whether the default compiler is a.out or elf
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #include <features.h>
+ #ifdef __ELF__
+ # ifdef __GLIBC__
+ # if __GLIBC__ >= 2
+ LIBC=gnu
+ # else
+ LIBC=gnulibc1
+ # endif
+ # else
+ LIBC=gnulibc1
+ # endif
+ #else
+ #ifdef __INTEL_COMPILER
+ LIBC=gnu
+ #else
+ LIBC=gnuaout
+ #endif
+ #endif
+ #ifdef __dietlibc__
+ LIBC=dietlibc
+ #endif
+EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+ test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
+ test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
+ ;;
+ i*86:DYNIX/ptx:4*:*)
+ # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+ # earlier versions are messed up and put the nodename in both
+ # sysname and nodename.
+ echo i386-sequent-sysv4
+ exit 0 ;;
+ i*86:UNIX_SV:4.2MP:2.*)
+ # Unixware is an offshoot of SVR4, but it has its own version
+ # number series starting with 2...
+ # I am not positive that other SVR4 systems won't match this,
+ # I just have to hope. -- rms.
+ # Use sysv4.2uw... so that sysv4* matches it.
+ echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+ exit 0 ;;
+ i*86:OS/2:*:*)
+ # If we were able to find `uname', then EMX Unix compatibility
+ # is probably installed.
+ echo ${UNAME_MACHINE}-pc-os2-emx
+ exit 0 ;;
+ i*86:XTS-300:*:STOP)
+ echo ${UNAME_MACHINE}-unknown-stop
+ exit 0 ;;
+ i*86:atheos:*:*)
+ echo ${UNAME_MACHINE}-unknown-atheos
+ exit 0 ;;
+ i*86:syllable:*:*)
+ echo ${UNAME_MACHINE}-pc-syllable
+ exit 0 ;;
+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+ echo i386-unknown-lynxos${UNAME_RELEASE}
+ exit 0 ;;
+ i*86:*DOS:*:*)
+ echo ${UNAME_MACHINE}-pc-msdosdjgpp
+ exit 0 ;;
+ i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
+ UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+ if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+ echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
+ else
+ echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+ fi
+ exit 0 ;;
+ i*86:*:5:[78]*)
+ case `/bin/uname -X | grep "^Machine"` in
+ *486*) UNAME_MACHINE=i486 ;;
+ *Pentium) UNAME_MACHINE=i586 ;;
+ *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+ esac
+ echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+ exit 0 ;;
+ i*86:*:3.2:*)
+ if test -f /usr/options/cb.name; then
+ UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+ echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+ elif /bin/uname -X 2>/dev/null >/dev/null ; then
+ UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
+ (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
+ (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
+ && UNAME_MACHINE=i586
+ (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
+ && UNAME_MACHINE=i686
+ (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
+ && UNAME_MACHINE=i686
+ echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
+ else
+ echo ${UNAME_MACHINE}-pc-sysv32
+ fi
+ exit 0 ;;
+ pc:*:*:*)
+ # Left here for compatibility:
+ # uname -m prints for DJGPP always 'pc', but it prints nothing about
+ # the processor, so we play safe by assuming i386.
+ echo i386-pc-msdosdjgpp
+ exit 0 ;;
+ Intel:Mach:3*:*)
+ echo i386-pc-mach3
+ exit 0 ;;
+ paragon:*:*:*)
+ echo i860-intel-osf1
+ exit 0 ;;
+ i860:*:4.*:*) # i860-SVR4
+ if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+ echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+ else # Add other i860-SVR4 vendors below as they are discovered.
+ echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
+ fi
+ exit 0 ;;
+ mini*:CTIX:SYS*5:*)
+ # "miniframe"
+ echo m68010-convergent-sysv
+ exit 0 ;;
+ mc68k:UNIX:SYSTEM5:3.51m)
+ echo m68k-convergent-sysv
+ exit 0 ;;
+ M680?0:D-NIX:5.3:*)
+ echo m68k-diab-dnix
+ exit 0 ;;
+ M68*:*:R3V[5678]*:*)
+ test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
+ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
+ OS_REL=''
+ test -r /etc/.relid \
+ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+ && echo i486-ncr-sysv4.3${OS_REL} && exit 0
+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+ && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
+ 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+ && echo i486-ncr-sysv4 && exit 0 ;;
+ m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+ echo m68k-unknown-lynxos${UNAME_RELEASE}
+ exit 0 ;;
+ mc68030:UNIX_System_V:4.*:*)
+ echo m68k-atari-sysv4
+ exit 0 ;;
+ TSUNAMI:LynxOS:2.*:*)
+ echo sparc-unknown-lynxos${UNAME_RELEASE}
+ exit 0 ;;
+ rs6000:LynxOS:2.*:*)
+ echo rs6000-unknown-lynxos${UNAME_RELEASE}
+ exit 0 ;;
+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+ echo powerpc-unknown-lynxos${UNAME_RELEASE}
+ exit 0 ;;
+ SM[BE]S:UNIX_SV:*:*)
+ echo mips-dde-sysv${UNAME_RELEASE}
+ exit 0 ;;
+ RM*:ReliantUNIX-*:*:*)
+ echo mips-sni-sysv4
+ exit 0 ;;
+ RM*:SINIX-*:*:*)
+ echo mips-sni-sysv4
+ exit 0 ;;
+ *:SINIX-*:*:*)
+ if uname -p 2>/dev/null >/dev/null ; then
+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
+ echo ${UNAME_MACHINE}-sni-sysv4
+ else
+ echo ns32k-sni-sysv
+ fi
+ exit 0 ;;
+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+ # says <Richard.M.Bartel@ccMail.Census.GOV>
+ echo i586-unisys-sysv4
+ exit 0 ;;
+ *:UNIX_System_V:4*:FTX*)
+ # From Gerald Hewes <hewes@openmarket.com>.
+ # How about differentiating between stratus architectures? -djm
+ echo hppa1.1-stratus-sysv4
+ exit 0 ;;
+ *:*:*:FTX*)
+ # From seanf@swdc.stratus.com.
+ echo i860-stratus-sysv4
+ exit 0 ;;
+ *:VOS:*:*)
+ # From Paul.Green@stratus.com.
+ echo hppa1.1-stratus-vos
+ exit 0 ;;
+ mc68*:A/UX:*:*)
+ echo m68k-apple-aux${UNAME_RELEASE}
+ exit 0 ;;
+ news*:NEWS-OS:6*:*)
+ echo mips-sony-newsos6
+ exit 0 ;;
+ R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+ if [ -d /usr/nec ]; then
+ echo mips-nec-sysv${UNAME_RELEASE}
+ else
+ echo mips-unknown-sysv${UNAME_RELEASE}
+ fi
+ exit 0 ;;
+ BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
+ echo powerpc-be-beos
+ exit 0 ;;
+ BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only.
+ echo powerpc-apple-beos
+ exit 0 ;;
+ BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
+ echo i586-pc-beos
+ exit 0 ;;
+ SX-4:SUPER-UX:*:*)
+ echo sx4-nec-superux${UNAME_RELEASE}
+ exit 0 ;;
+ SX-5:SUPER-UX:*:*)
+ echo sx5-nec-superux${UNAME_RELEASE}
+ exit 0 ;;
+ SX-6:SUPER-UX:*:*)
+ echo sx6-nec-superux${UNAME_RELEASE}
+ exit 0 ;;
+ Power*:Rhapsody:*:*)
+ echo powerpc-apple-rhapsody${UNAME_RELEASE}
+ exit 0 ;;
+ *:Rhapsody:*:*)
+ echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+ exit 0 ;;
+ *:Darwin:*:*)
+ case `uname -p` in
+ *86) UNAME_PROCESSOR=i686 ;;
+ powerpc) UNAME_PROCESSOR=powerpc ;;
+ esac
+ echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+ exit 0 ;;
+ *:procnto*:*:* | *:QNX:[0123456789]*:*)
+ UNAME_PROCESSOR=`uname -p`
+ if test "$UNAME_PROCESSOR" = "x86"; then
+ UNAME_PROCESSOR=i386
+ UNAME_MACHINE=pc
+ fi
+ echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
+ exit 0 ;;
+ *:QNX:*:4*)
+ echo i386-pc-qnx
+ exit 0 ;;
+ NSR-?:NONSTOP_KERNEL:*:*)
+ echo nsr-tandem-nsk${UNAME_RELEASE}
+ exit 0 ;;
+ *:NonStop-UX:*:*)
+ echo mips-compaq-nonstopux
+ exit 0 ;;
+ BS2000:POSIX*:*:*)
+ echo bs2000-siemens-sysv
+ exit 0 ;;
+ DS/*:UNIX_System_V:*:*)
+ echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
+ exit 0 ;;
+ *:Plan9:*:*)
+ # "uname -m" is not consistent, so use $cputype instead. 386
+ # is converted to i386 for consistency with other x86
+ # operating systems.
+ if test "$cputype" = "386"; then
+ UNAME_MACHINE=i386
+ else
+ UNAME_MACHINE="$cputype"
+ fi
+ echo ${UNAME_MACHINE}-unknown-plan9
+ exit 0 ;;
+ *:TOPS-10:*:*)
+ echo pdp10-unknown-tops10
+ exit 0 ;;
+ *:TENEX:*:*)
+ echo pdp10-unknown-tenex
+ exit 0 ;;
+ KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
+ echo pdp10-dec-tops20
+ exit 0 ;;
+ XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
+ echo pdp10-xkl-tops20
+ exit 0 ;;
+ *:TOPS-20:*:*)
+ echo pdp10-unknown-tops20
+ exit 0 ;;
+ *:ITS:*:*)
+ echo pdp10-unknown-its
+ exit 0 ;;
+ SEI:*:*:SEIUX)
+ echo mips-sei-seiux${UNAME_RELEASE}
+ exit 0 ;;
+ *:DragonFly:*:*)
+ echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+ exit 0 ;;
+esac
+
+#echo '(No uname command or uname output not recognized.)' 1>&2
+#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
+
+eval $set_cc_for_build
+cat >$dummy.c <<EOF
+#ifdef _SEQUENT_
+# include <sys/types.h>
+# include <sys/utsname.h>
+#endif
+main ()
+{
+#if defined (sony)
+#if defined (MIPSEB)
+ /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed,
+ I don't know.... */
+ printf ("mips-sony-bsd\n"); exit (0);
+#else
+#include <sys/param.h>
+ printf ("m68k-sony-newsos%s\n",
+#ifdef NEWSOS4
+ "4"
+#else
+ ""
+#endif
+ ); exit (0);
+#endif
+#endif
+
+#if defined (__arm) && defined (__acorn) && defined (__unix)
+ printf ("arm-acorn-riscix"); exit (0);
+#endif
+
+#if defined (hp300) && !defined (hpux)
+ printf ("m68k-hp-bsd\n"); exit (0);
+#endif
+
+#if defined (NeXT)
+#if !defined (__ARCHITECTURE__)
+#define __ARCHITECTURE__ "m68k"
+#endif
+ int version;
+ version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
+ if (version < 4)
+ printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+ else
+ printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
+ exit (0);
+#endif
+
+#if defined (MULTIMAX) || defined (n16)
+#if defined (UMAXV)
+ printf ("ns32k-encore-sysv\n"); exit (0);
+#else
+#if defined (CMU)
+ printf ("ns32k-encore-mach\n"); exit (0);
+#else
+ printf ("ns32k-encore-bsd\n"); exit (0);
+#endif
+#endif
+#endif
+
+#if defined (__386BSD__)
+ printf ("i386-pc-bsd\n"); exit (0);
+#endif
+
+#if defined (sequent)
+#if defined (i386)
+ printf ("i386-sequent-dynix\n"); exit (0);
+#endif
+#if defined (ns32000)
+ printf ("ns32k-sequent-dynix\n"); exit (0);
+#endif
+#endif
+
+#if defined (_SEQUENT_)
+ struct utsname un;
+
+ uname(&un);
+
+ if (strncmp(un.version, "V2", 2) == 0) {
+ printf ("i386-sequent-ptx2\n"); exit (0);
+ }
+ if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+ printf ("i386-sequent-ptx1\n"); exit (0);
+ }
+ printf ("i386-sequent-ptx\n"); exit (0);
+
+#endif
+
+#if defined (vax)
+# if !defined (ultrix)
+# include <sys/param.h>
+# if defined (BSD)
+# if BSD == 43
+ printf ("vax-dec-bsd4.3\n"); exit (0);
+# else
+# if BSD == 199006
+ printf ("vax-dec-bsd4.3reno\n"); exit (0);
+# else
+ printf ("vax-dec-bsd\n"); exit (0);
+# endif
+# endif
+# else
+ printf ("vax-dec-bsd\n"); exit (0);
+# endif
+# else
+ printf ("vax-dec-ultrix\n"); exit (0);
+# endif
+#endif
+
+#if defined (alliant) && defined (i860)
+ printf ("i860-alliant-bsd\n"); exit (0);
+#endif
+
+ exit (1);
+}
+EOF
+
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
+
+# Apollos put the system type in the environment.
+
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
+
+# Convex versions that predate uname can use getsysinfo(1)
+
+if [ -x /usr/convex/getsysinfo ]
+then
+ case `getsysinfo -f cpu_type` in
+ c1*)
+ echo c1-convex-bsd
+ exit 0 ;;
+ c2*)
+ if getsysinfo -f scalar_acc
+ then echo c32-convex-bsd
+ else echo c2-convex-bsd
+ fi
+ exit 0 ;;
+ c34*)
+ echo c34-convex-bsd
+ exit 0 ;;
+ c38*)
+ echo c38-convex-bsd
+ exit 0 ;;
+ c4*)
+ echo c4-convex-bsd
+ exit 0 ;;
+ esac
+fi
+
+cat >&2 <<EOF
+$0: unable to guess system type
+
+This script, last modified $timestamp, has failed to recognize
+the operating system you are using. It is advised that you
+download the most up to date version of the config scripts from
+
+ ftp://ftp.gnu.org/pub/gnu/config/
+
+If the version you run ($0) is already up to date, please
+send the following data and any information you think might be
+pertinent to <config-patches@gnu.org> in order to provide the needed
+information to handle your system.
+
+config.guess timestamp = $timestamp
+
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
+/bin/uname -X = `(/bin/uname -X) 2>/dev/null`
+
+hostinfo = `(hostinfo) 2>/dev/null`
+/bin/universe = `(/bin/universe) 2>/dev/null`
+/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null`
+/bin/arch = `(/bin/arch) 2>/dev/null`
+/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
+
+UNAME_MACHINE = ${UNAME_MACHINE}
+UNAME_RELEASE = ${UNAME_RELEASE}
+UNAME_SYSTEM = ${UNAME_SYSTEM}
+UNAME_VERSION = ${UNAME_VERSION}
+EOF
+
+exit 1
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff --git a/config.sub b/config.sub
new file mode 100644
index 0000000000..506d3ab77f
--- /dev/null
+++ b/config.sub
@@ -0,0 +1,1537 @@
+#! /bin/sh
+# Configuration validation subroutine script.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+
+timestamp='2004-06-11'
+
+# This file is (in principle) common to ALL GNU software.
+# The presence of a machine in this file suggests that SOME GNU software
+# can handle that machine. It does not imply ALL GNU software can.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Please send patches to <config-patches@gnu.org>. Submit a context
+# diff and a properly formatted ChangeLog entry.
+#
+# Configuration subroutine to validate and canonicalize a configuration type.
+# Supply the specified configuration type as an argument.
+# If it is invalid, we print an error message on stderr and exit with code 1.
+# Otherwise, we print the canonical config type on stdout and succeed.
+
+# This file is supposed to be the same for all GNU packages
+# and recognize all the CPU types, system types and aliases
+# that are meaningful with *any* GNU software.
+# Each package is responsible for reporting which valid configurations
+# it does not support. The user should be able to distinguish
+# a failure to support a valid configuration from a meaningless
+# configuration.
+
+# The goal of this file is to map all the various variations of a given
+# machine specification into a single specification in the form:
+# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or in some cases, the newer four-part form:
+# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# It is wrong to echo any other type of specification.
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION] CPU-MFR-OPSYS
+ $0 [OPTION] ALIAS
+
+Canonicalize a configuration name.
+
+Operation modes:
+ -h, --help print this help, then exit
+ -t, --time-stamp print date of last modification, then exit
+ -v, --version print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.sub ($timestamp)
+
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions. There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+ case $1 in
+ --time-stamp | --time* | -t )
+ echo "$timestamp" ; exit 0 ;;
+ --version | -v )
+ echo "$version" ; exit 0 ;;
+ --help | --h* | -h )
+ echo "$usage"; exit 0 ;;
+ -- ) # Stop option processing
+ shift; break ;;
+ - ) # Use stdin as input.
+ break ;;
+ -* )
+ echo "$me: invalid option $1$help"
+ exit 1 ;;
+
+ *local*)
+ # First pass through any local machine types.
+ echo $1
+ exit 0;;
+
+ * )
+ break ;;
+ esac
+done
+
+case $# in
+ 0) echo "$me: missing argument$help" >&2
+ exit 1;;
+ 1) ;;
+ *) echo "$me: too many arguments$help" >&2
+ exit 1;;
+esac
+
+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+# Here we must recognize all the valid KERNEL-OS combinations.
+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+case $maybe_os in
+ nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
+ kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+ os=-$maybe_os
+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+ ;;
+ *)
+ basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+ if [ $basic_machine != $1 ]
+ then os=`echo $1 | sed 's/.*-/-/'`
+ else os=; fi
+ ;;
+esac
+
+### Let's recognize common machines as not being operating systems so
+### that things like config.sub decstation-3100 work. We also
+### recognize some manufacturers as not being operating systems, so we
+### can provide default operating systems below.
+case $os in
+ -sun*os*)
+ # Prevent following clause from handling this invalid input.
+ ;;
+ -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
+ -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
+ -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
+ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+ -apple | -axis)
+ os=
+ basic_machine=$1
+ ;;
+ -sim | -cisco | -oki | -wec | -winbond)
+ os=
+ basic_machine=$1
+ ;;
+ -scout)
+ ;;
+ -wrs)
+ os=-vxworks
+ basic_machine=$1
+ ;;
+ -chorusos*)
+ os=-chorusos
+ basic_machine=$1
+ ;;
+ -chorusrdb)
+ os=-chorusrdb
+ basic_machine=$1
+ ;;
+ -hiux*)
+ os=-hiuxwe2
+ ;;
+ -sco5)
+ os=-sco3.2v5
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -sco4)
+ os=-sco3.2v4
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -sco3.2.[4-9]*)
+ os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -sco3.2v[4-9]*)
+ # Don't forget version if it is 3.2v4 or newer.
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -sco*)
+ os=-sco3.2v2
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -udk*)
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -isc)
+ os=-isc2.2
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -clix*)
+ basic_machine=clipper-intergraph
+ ;;
+ -isc*)
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -lynx*)
+ os=-lynxos
+ ;;
+ -ptx*)
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+ ;;
+ -windowsnt*)
+ os=`echo $os | sed -e 's/windowsnt/winnt/'`
+ ;;
+ -psos*)
+ os=-psos
+ ;;
+ -mint | -mint[0-9]*)
+ basic_machine=m68k-atari
+ os=-mint
+ ;;
+esac
+
+# Decode aliases for certain CPU-COMPANY combinations.
+case $basic_machine in
+ # Recognize the basic CPU types without company name.
+ # Some are omitted here because they have special meanings below.
+ 1750a | 580 \
+ | a29k \
+ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+ | am33_2.0 \
+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+ | c4x | clipper \
+ | d10v | d30v | dlx | dsp16xx \
+ | fr30 | frv \
+ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+ | i370 | i860 | i960 | ia64 \
+ | ip2k | iq2000 \
+ | m32r | m68000 | m68k | m88k | mcore \
+ | mips | mipsbe | mipseb | mipsel | mipsle \
+ | mips16 \
+ | mips64 | mips64el \
+ | mips64vr | mips64vrel \
+ | mips64orion | mips64orionel \
+ | mips64vr4100 | mips64vr4100el \
+ | mips64vr4300 | mips64vr4300el \
+ | mips64vr5000 | mips64vr5000el \
+ | mipsisa32 | mipsisa32el \
+ | mipsisa32r2 | mipsisa32r2el \
+ | mipsisa64 | mipsisa64el \
+ | mipsisa64r2 | mipsisa64r2el \
+ | mipsisa64sb1 | mipsisa64sb1el \
+ | mipsisa64sr71k | mipsisa64sr71kel \
+ | mipstx39 | mipstx39el \
+ | mn10200 | mn10300 \
+ | msp430 \
+ | ns16k | ns32k \
+ | openrisc | or32 \
+ | pdp10 | pdp11 | pj | pjl \
+ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+ | pyramid \
+ | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+ | sh64 | sh64le \
+ | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
+ | strongarm \
+ | tahoe | thumb | tic4x | tic80 | tron \
+ | v850 | v850e \
+ | we32k \
+ | x86 | xscale | xstormy16 | xtensa \
+ | z8k)
+ basic_machine=$basic_machine-unknown
+ ;;
+ m6811 | m68hc11 | m6812 | m68hc12)
+ # Motorola 68HC11/12.
+ basic_machine=$basic_machine-unknown
+ os=-none
+ ;;
+ m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+ ;;
+
+ # We use `pc' rather than `unknown'
+ # because (1) that's what they normally are, and
+ # (2) the word "unknown" tends to confuse beginning users.
+ i*86 | x86_64)
+ basic_machine=$basic_machine-pc
+ ;;
+ # Object if more than one company name word.
+ *-*-*)
+ echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+ exit 1
+ ;;
+ # Recognize the basic CPU types with company name.
+ 580-* \
+ | a29k-* \
+ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
+ | avr-* \
+ | bs2000-* \
+ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+ | clipper-* | cydra-* \
+ | d10v-* | d30v-* | dlx-* \
+ | elxsi-* \
+ | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+ | h8300-* | h8500-* \
+ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+ | i*86-* | i860-* | i960-* | ia64-* \
+ | ip2k-* | iq2000-* \
+ | m32r-* \
+ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+ | m88110-* | m88k-* | mcore-* \
+ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+ | mips16-* \
+ | mips64-* | mips64el-* \
+ | mips64vr-* | mips64vrel-* \
+ | mips64orion-* | mips64orionel-* \
+ | mips64vr4100-* | mips64vr4100el-* \
+ | mips64vr4300-* | mips64vr4300el-* \
+ | mips64vr5000-* | mips64vr5000el-* \
+ | mipsisa32-* | mipsisa32el-* \
+ | mipsisa32r2-* | mipsisa32r2el-* \
+ | mipsisa64-* | mipsisa64el-* \
+ | mipsisa64r2-* | mipsisa64r2el-* \
+ | mipsisa64sb1-* | mipsisa64sb1el-* \
+ | mipsisa64sr71k-* | mipsisa64sr71kel-* \
+ | mipstx39-* | mipstx39el-* \
+ | msp430-* \
+ | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
+ | orion-* \
+ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+ | pyramid-* \
+ | romp-* | rs6000-* \
+ | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+ | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
+ | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+ | tahoe-* | thumb-* \
+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+ | tron-* \
+ | v850-* | v850e-* | vax-* \
+ | we32k-* \
+ | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
+ | xtensa-* \
+ | ymp-* \
+ | z8k-*)
+ ;;
+ # Recognize the various machine names and aliases which stand
+ # for a CPU type and a company and sometimes even an OS.
+ 386bsd)
+ basic_machine=i386-unknown
+ os=-bsd
+ ;;
+ 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+ basic_machine=m68000-att
+ ;;
+ 3b*)
+ basic_machine=we32k-att
+ ;;
+ a29khif)
+ basic_machine=a29k-amd
+ os=-udi
+ ;;
+ adobe68k)
+ basic_machine=m68010-adobe
+ os=-scout
+ ;;
+ alliant | fx80)
+ basic_machine=fx80-alliant
+ ;;
+ altos | altos3068)
+ basic_machine=m68k-altos
+ ;;
+ am29k)
+ basic_machine=a29k-none
+ os=-bsd
+ ;;
+ amd64)
+ basic_machine=x86_64-pc
+ ;;
+ amd64-*)
+ basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ amdahl)
+ basic_machine=580-amdahl
+ os=-sysv
+ ;;
+ amiga | amiga-*)
+ basic_machine=m68k-unknown
+ ;;
+ amigaos | amigados)
+ basic_machine=m68k-unknown
+ os=-amigaos
+ ;;
+ amigaunix | amix)
+ basic_machine=m68k-unknown
+ os=-sysv4
+ ;;
+ apollo68)
+ basic_machine=m68k-apollo
+ os=-sysv
+ ;;
+ apollo68bsd)
+ basic_machine=m68k-apollo
+ os=-bsd
+ ;;
+ aux)
+ basic_machine=m68k-apple
+ os=-aux
+ ;;
+ balance)
+ basic_machine=ns32k-sequent
+ os=-dynix
+ ;;
+ c90)
+ basic_machine=c90-cray
+ os=-unicos
+ ;;
+ convex-c1)
+ basic_machine=c1-convex
+ os=-bsd
+ ;;
+ convex-c2)
+ basic_machine=c2-convex
+ os=-bsd
+ ;;
+ convex-c32)
+ basic_machine=c32-convex
+ os=-bsd
+ ;;
+ convex-c34)
+ basic_machine=c34-convex
+ os=-bsd
+ ;;
+ convex-c38)
+ basic_machine=c38-convex
+ os=-bsd
+ ;;
+ cray | j90)
+ basic_machine=j90-cray
+ os=-unicos
+ ;;
+ crds | unos)
+ basic_machine=m68k-crds
+ ;;
+ cris | cris-* | etrax*)
+ basic_machine=cris-axis
+ ;;
+ da30 | da30-*)
+ basic_machine=m68k-da30
+ ;;
+ decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
+ basic_machine=mips-dec
+ ;;
+ decsystem10* | dec10*)
+ basic_machine=pdp10-dec
+ os=-tops10
+ ;;
+ decsystem20* | dec20*)
+ basic_machine=pdp10-dec
+ os=-tops20
+ ;;
+ delta | 3300 | motorola-3300 | motorola-delta \
+ | 3300-motorola | delta-motorola)
+ basic_machine=m68k-motorola
+ ;;
+ delta88)
+ basic_machine=m88k-motorola
+ os=-sysv3
+ ;;
+ dpx20 | dpx20-*)
+ basic_machine=rs6000-bull
+ os=-bosx
+ ;;
+ dpx2* | dpx2*-bull)
+ basic_machine=m68k-bull
+ os=-sysv3
+ ;;
+ ebmon29k)
+ basic_machine=a29k-amd
+ os=-ebmon
+ ;;
+ elxsi)
+ basic_machine=elxsi-elxsi
+ os=-bsd
+ ;;
+ encore | umax | mmax)
+ basic_machine=ns32k-encore
+ ;;
+ es1800 | OSE68k | ose68k | ose | OSE)
+ basic_machine=m68k-ericsson
+ os=-ose
+ ;;
+ fx2800)
+ basic_machine=i860-alliant
+ ;;
+ genix)
+ basic_machine=ns32k-ns
+ ;;
+ gmicro)
+ basic_machine=tron-gmicro
+ os=-sysv
+ ;;
+ go32)
+ basic_machine=i386-pc
+ os=-go32
+ ;;
+ h3050r* | hiux*)
+ basic_machine=hppa1.1-hitachi
+ os=-hiuxwe2
+ ;;
+ h8300hms)
+ basic_machine=h8300-hitachi
+ os=-hms
+ ;;
+ h8300xray)
+ basic_machine=h8300-hitachi
+ os=-xray
+ ;;
+ h8500hms)
+ basic_machine=h8500-hitachi
+ os=-hms
+ ;;
+ harris)
+ basic_machine=m88k-harris
+ os=-sysv3
+ ;;
+ hp300-*)
+ basic_machine=m68k-hp
+ ;;
+ hp300bsd)
+ basic_machine=m68k-hp
+ os=-bsd
+ ;;
+ hp300hpux)
+ basic_machine=m68k-hp
+ os=-hpux
+ ;;
+ hp3k9[0-9][0-9] | hp9[0-9][0-9])
+ basic_machine=hppa1.0-hp
+ ;;
+ hp9k2[0-9][0-9] | hp9k31[0-9])
+ basic_machine=m68000-hp
+ ;;
+ hp9k3[2-9][0-9])
+ basic_machine=m68k-hp
+ ;;
+ hp9k6[0-9][0-9] | hp6[0-9][0-9])
+ basic_machine=hppa1.0-hp
+ ;;
+ hp9k7[0-79][0-9] | hp7[0-79][0-9])
+ basic_machine=hppa1.1-hp
+ ;;
+ hp9k78[0-9] | hp78[0-9])
+ # FIXME: really hppa2.0-hp
+ basic_machine=hppa1.1-hp
+ ;;
+ hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
+ # FIXME: really hppa2.0-hp
+ basic_machine=hppa1.1-hp
+ ;;
+ hp9k8[0-9][13679] | hp8[0-9][13679])
+ basic_machine=hppa1.1-hp
+ ;;
+ hp9k8[0-9][0-9] | hp8[0-9][0-9])
+ basic_machine=hppa1.0-hp
+ ;;
+ hppa-next)
+ os=-nextstep3
+ ;;
+ hppaosf)
+ basic_machine=hppa1.1-hp
+ os=-osf
+ ;;
+ hppro)
+ basic_machine=hppa1.1-hp
+ os=-proelf
+ ;;
+ i370-ibm* | ibm*)
+ basic_machine=i370-ibm
+ ;;
+# I'm not sure what "Sysv32" means. Should this be sysv3.2?
+ i*86v32)
+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ os=-sysv32
+ ;;
+ i*86v4*)
+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ os=-sysv4
+ ;;
+ i*86v)
+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ os=-sysv
+ ;;
+ i*86sol2)
+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ os=-solaris2
+ ;;
+ i386mach)
+ basic_machine=i386-mach
+ os=-mach
+ ;;
+ i386-vsta | vsta)
+ basic_machine=i386-unknown
+ os=-vsta
+ ;;
+ iris | iris4d)
+ basic_machine=mips-sgi
+ case $os in
+ -irix*)
+ ;;
+ *)
+ os=-irix4
+ ;;
+ esac
+ ;;
+ isi68 | isi)
+ basic_machine=m68k-isi
+ os=-sysv
+ ;;
+ m88k-omron*)
+ basic_machine=m88k-omron
+ ;;
+ magnum | m3230)
+ basic_machine=mips-mips
+ os=-sysv
+ ;;
+ merlin)
+ basic_machine=ns32k-utek
+ os=-sysv
+ ;;
+ mingw32)
+ basic_machine=i386-pc
+ os=-mingw32
+ ;;
+ miniframe)
+ basic_machine=m68000-convergent
+ ;;
+ *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
+ basic_machine=m68k-atari
+ os=-mint
+ ;;
+ mips3*-*)
+ basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+ ;;
+ mips3*)
+ basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+ ;;
+ mmix*)
+ basic_machine=mmix-knuth
+ os=-mmixware
+ ;;
+ monitor)
+ basic_machine=m68k-rom68k
+ os=-coff
+ ;;
+ morphos)
+ basic_machine=powerpc-unknown
+ os=-morphos
+ ;;
+ msdos)
+ basic_machine=i386-pc
+ os=-msdos
+ ;;
+ mvs)
+ basic_machine=i370-ibm
+ os=-mvs
+ ;;
+ ncr3000)
+ basic_machine=i486-ncr
+ os=-sysv4
+ ;;
+ netbsd386)
+ basic_machine=i386-unknown
+ os=-netbsd
+ ;;
+ netwinder)
+ basic_machine=armv4l-rebel
+ os=-linux
+ ;;
+ news | news700 | news800 | news900)
+ basic_machine=m68k-sony
+ os=-newsos
+ ;;
+ news1000)
+ basic_machine=m68030-sony
+ os=-newsos
+ ;;
+ news-3600 | risc-news)
+ basic_machine=mips-sony
+ os=-newsos
+ ;;
+ necv70)
+ basic_machine=v70-nec
+ os=-sysv
+ ;;
+ next | m*-next )
+ basic_machine=m68k-next
+ case $os in
+ -nextstep* )
+ ;;
+ -ns2*)
+ os=-nextstep2
+ ;;
+ *)
+ os=-nextstep3
+ ;;
+ esac
+ ;;
+ nh3000)
+ basic_machine=m68k-harris
+ os=-cxux
+ ;;
+ nh[45]000)
+ basic_machine=m88k-harris
+ os=-cxux
+ ;;
+ nindy960)
+ basic_machine=i960-intel
+ os=-nindy
+ ;;
+ mon960)
+ basic_machine=i960-intel
+ os=-mon960
+ ;;
+ nonstopux)
+ basic_machine=mips-compaq
+ os=-nonstopux
+ ;;
+ np1)
+ basic_machine=np1-gould
+ ;;
+ nv1)
+ basic_machine=nv1-cray
+ os=-unicosmp
+ ;;
+ nsr-tandem)
+ basic_machine=nsr-tandem
+ ;;
+ op50n-* | op60c-*)
+ basic_machine=hppa1.1-oki
+ os=-proelf
+ ;;
+ or32 | or32-*)
+ basic_machine=or32-unknown
+ os=-coff
+ ;;
+ os400)
+ basic_machine=powerpc-ibm
+ os=-os400
+ ;;
+ OSE68000 | ose68000)
+ basic_machine=m68000-ericsson
+ os=-ose
+ ;;
+ os68k)
+ basic_machine=m68k-none
+ os=-os68k
+ ;;
+ pa-hitachi)
+ basic_machine=hppa1.1-hitachi
+ os=-hiuxwe2
+ ;;
+ paragon)
+ basic_machine=i860-intel
+ os=-osf
+ ;;
+ pbd)
+ basic_machine=sparc-tti
+ ;;
+ pbb)
+ basic_machine=m68k-tti
+ ;;
+ pc532 | pc532-*)
+ basic_machine=ns32k-pc532
+ ;;
+ pentium | p5 | k5 | k6 | nexgen | viac3)
+ basic_machine=i586-pc
+ ;;
+ pentiumpro | p6 | 6x86 | athlon | athlon_*)
+ basic_machine=i686-pc
+ ;;
+ pentiumii | pentium2 | pentiumiii | pentium3)
+ basic_machine=i686-pc
+ ;;
+ pentium4)
+ basic_machine=i786-pc
+ ;;
+ pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+ basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ pentiumpro-* | p6-* | 6x86-* | athlon-*)
+ basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+ basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ pentium4-*)
+ basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ pn)
+ basic_machine=pn-gould
+ ;;
+ power) basic_machine=power-ibm
+ ;;
+ ppc) basic_machine=powerpc-unknown
+ ;;
+ ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ ppcle | powerpclittle | ppc-le | powerpc-little)
+ basic_machine=powerpcle-unknown
+ ;;
+ ppcle-* | powerpclittle-*)
+ basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ ppc64) basic_machine=powerpc64-unknown
+ ;;
+ ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+ basic_machine=powerpc64le-unknown
+ ;;
+ ppc64le-* | powerpc64little-*)
+ basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ ps2)
+ basic_machine=i386-ibm
+ ;;
+ pw32)
+ basic_machine=i586-unknown
+ os=-pw32
+ ;;
+ rom68k)
+ basic_machine=m68k-rom68k
+ os=-coff
+ ;;
+ rm[46]00)
+ basic_machine=mips-siemens
+ ;;
+ rtpc | rtpc-*)
+ basic_machine=romp-ibm
+ ;;
+ s390 | s390-*)
+ basic_machine=s390-ibm
+ ;;
+ s390x | s390x-*)
+ basic_machine=s390x-ibm
+ ;;
+ sa29200)
+ basic_machine=a29k-amd
+ os=-udi
+ ;;
+ sb1)
+ basic_machine=mipsisa64sb1-unknown
+ ;;
+ sb1el)
+ basic_machine=mipsisa64sb1el-unknown
+ ;;
+ sei)
+ basic_machine=mips-sei
+ os=-seiux
+ ;;
+ sequent)
+ basic_machine=i386-sequent
+ ;;
+ sh)
+ basic_machine=sh-hitachi
+ os=-hms
+ ;;
+ sh64)
+ basic_machine=sh64-unknown
+ ;;
+ sparclite-wrs | simso-wrs)
+ basic_machine=sparclite-wrs
+ os=-vxworks
+ ;;
+ sps7)
+ basic_machine=m68k-bull
+ os=-sysv2
+ ;;
+ spur)
+ basic_machine=spur-unknown
+ ;;
+ st2000)
+ basic_machine=m68k-tandem
+ ;;
+ stratus)
+ basic_machine=i860-stratus
+ os=-sysv4
+ ;;
+ sun2)
+ basic_machine=m68000-sun
+ ;;
+ sun2os3)
+ basic_machine=m68000-sun
+ os=-sunos3
+ ;;
+ sun2os4)
+ basic_machine=m68000-sun
+ os=-sunos4
+ ;;
+ sun3os3)
+ basic_machine=m68k-sun
+ os=-sunos3
+ ;;
+ sun3os4)
+ basic_machine=m68k-sun
+ os=-sunos4
+ ;;
+ sun4os3)
+ basic_machine=sparc-sun
+ os=-sunos3
+ ;;
+ sun4os4)
+ basic_machine=sparc-sun
+ os=-sunos4
+ ;;
+ sun4sol2)
+ basic_machine=sparc-sun
+ os=-solaris2
+ ;;
+ sun3 | sun3-*)
+ basic_machine=m68k-sun
+ ;;
+ sun4)
+ basic_machine=sparc-sun
+ ;;
+ sun386 | sun386i | roadrunner)
+ basic_machine=i386-sun
+ ;;
+ sv1)
+ basic_machine=sv1-cray
+ os=-unicos
+ ;;
+ symmetry)
+ basic_machine=i386-sequent
+ os=-dynix
+ ;;
+ t3e)
+ basic_machine=alphaev5-cray
+ os=-unicos
+ ;;
+ t90)
+ basic_machine=t90-cray
+ os=-unicos
+ ;;
+ tic54x | c54x*)
+ basic_machine=tic54x-unknown
+ os=-coff
+ ;;
+ tic55x | c55x*)
+ basic_machine=tic55x-unknown
+ os=-coff
+ ;;
+ tic6x | c6x*)
+ basic_machine=tic6x-unknown
+ os=-coff
+ ;;
+ tx39)
+ basic_machine=mipstx39-unknown
+ ;;
+ tx39el)
+ basic_machine=mipstx39el-unknown
+ ;;
+ toad1)
+ basic_machine=pdp10-xkl
+ os=-tops20
+ ;;
+ tower | tower-32)
+ basic_machine=m68k-ncr
+ ;;
+ tpf)
+ basic_machine=s390x-ibm
+ os=-tpf
+ ;;
+ udi29k)
+ basic_machine=a29k-amd
+ os=-udi
+ ;;
+ ultra3)
+ basic_machine=a29k-nyu
+ os=-sym1
+ ;;
+ v810 | necv810)
+ basic_machine=v810-nec
+ os=-none
+ ;;
+ vaxv)
+ basic_machine=vax-dec
+ os=-sysv
+ ;;
+ vms)
+ basic_machine=vax-dec
+ os=-vms
+ ;;
+ vpp*|vx|vx-*)
+ basic_machine=f301-fujitsu
+ ;;
+ vxworks960)
+ basic_machine=i960-wrs
+ os=-vxworks
+ ;;
+ vxworks68)
+ basic_machine=m68k-wrs
+ os=-vxworks
+ ;;
+ vxworks29k)
+ basic_machine=a29k-wrs
+ os=-vxworks
+ ;;
+ w65*)
+ basic_machine=w65-wdc
+ os=-none
+ ;;
+ w89k-*)
+ basic_machine=hppa1.1-winbond
+ os=-proelf
+ ;;
+ xps | xps100)
+ basic_machine=xps100-honeywell
+ ;;
+ ymp)
+ basic_machine=ymp-cray
+ os=-unicos
+ ;;
+ z8k-*-coff)
+ basic_machine=z8k-unknown
+ os=-sim
+ ;;
+ none)
+ basic_machine=none-none
+ os=-none
+ ;;
+
+# Here we handle the default manufacturer of certain CPU types. It is in
+# some cases the only manufacturer, in others, it is the most popular.
+ w89k)
+ basic_machine=hppa1.1-winbond
+ ;;
+ op50n)
+ basic_machine=hppa1.1-oki
+ ;;
+ op60c)
+ basic_machine=hppa1.1-oki
+ ;;
+ romp)
+ basic_machine=romp-ibm
+ ;;
+ rs6000)
+ basic_machine=rs6000-ibm
+ ;;
+ vax)
+ basic_machine=vax-dec
+ ;;
+ pdp10)
+ # there are many clones, so DEC is not a safe bet
+ basic_machine=pdp10-unknown
+ ;;
+ pdp11)
+ basic_machine=pdp11-dec
+ ;;
+ we32k)
+ basic_machine=we32k-att
+ ;;
+ sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
+ basic_machine=sh-unknown
+ ;;
+ sh64)
+ basic_machine=sh64-unknown
+ ;;
+ sparc | sparcv9 | sparcv9b)
+ basic_machine=sparc-sun
+ ;;
+ cydra)
+ basic_machine=cydra-cydrome
+ ;;
+ orion)
+ basic_machine=orion-highlevel
+ ;;
+ orion105)
+ basic_machine=clipper-highlevel
+ ;;
+ mac | mpw | mac-mpw)
+ basic_machine=m68k-apple
+ ;;
+ pmac | pmac-mpw)
+ basic_machine=powerpc-apple
+ ;;
+ *-unknown)
+ # Make sure to match an already-canonicalized machine name.
+ ;;
+ *)
+ echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+ exit 1
+ ;;
+esac
+
+# Here we canonicalize certain aliases for manufacturers.
+case $basic_machine in
+ *-digital*)
+ basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+ ;;
+ *-commodore*)
+ basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+ ;;
+ *)
+ ;;
+esac
+
+# Decode manufacturer-specific aliases for certain operating systems.
+
+if [ x"$os" != x"" ]
+then
+case $os in
+ # First match some system type aliases
+ # that might get confused with valid system types.
+ # -solaris* is a basic system type, with this one exception.
+ -solaris1 | -solaris1.*)
+ os=`echo $os | sed -e 's|solaris1|sunos4|'`
+ ;;
+ -solaris)
+ os=-solaris2
+ ;;
+ -svr4*)
+ os=-sysv4
+ ;;
+ -unixware*)
+ os=-sysv4.2uw
+ ;;
+ -gnu/linux*)
+ os=`echo $os | sed -e 's|gnu/linux|linux|'`
+ ;;
+ # First accept the basic system types.
+ # The portable systems comes first.
+ # Each alternative MUST END IN A *, to match a version number.
+ # -sysv* is not here because it comes later, after sysvr4.
+ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+ | -aos* \
+ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+ | -hiux* | -386bsd* | -knetbsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \
+ | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ | -chorusos* | -chorusrdb* \
+ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
+ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
+ # Remember, each alternative MUST END IN *, to match a version number.
+ ;;
+ -qnx*)
+ case $basic_machine in
+ x86-* | i*86-*)
+ ;;
+ *)
+ os=-nto$os
+ ;;
+ esac
+ ;;
+ -nto-qnx*)
+ ;;
+ -nto*)
+ os=`echo $os | sed -e 's|nto|nto-qnx|'`
+ ;;
+ -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+ | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+ ;;
+ -mac*)
+ os=`echo $os | sed -e 's|mac|macos|'`
+ ;;
+ -linux-dietlibc)
+ os=-linux-dietlibc
+ ;;
+ -linux*)
+ os=-linux
+ ;;
+ -sunos5*)
+ os=`echo $os | sed -e 's|sunos5|solaris2|'`
+ ;;
+ -sunos6*)
+ os=`echo $os | sed -e 's|sunos6|solaris3|'`
+ ;;
+ -opened*)
+ os=-openedition
+ ;;
+ -os400*)
+ os=-os400
+ ;;
+ -wince*)
+ os=-wince
+ ;;
+ -osfrose*)
+ os=-osfrose
+ ;;
+ -osf*)
+ os=-osf
+ ;;
+ -utek*)
+ os=-bsd
+ ;;
+ -dynix*)
+ os=-bsd
+ ;;
+ -acis*)
+ os=-aos
+ ;;
+ -atheos*)
+ os=-atheos
+ ;;
+ -syllable*)
+ os=-syllable
+ ;;
+ -386bsd)
+ os=-bsd
+ ;;
+ -ctix* | -uts*)
+ os=-sysv
+ ;;
+ -nova*)
+ os=-rtmk-nova
+ ;;
+ -ns2 )
+ os=-nextstep2
+ ;;
+ -nsk*)
+ os=-nsk
+ ;;
+ # Preserve the version number of sinix5.
+ -sinix5.*)
+ os=`echo $os | sed -e 's|sinix|sysv|'`
+ ;;
+ -sinix*)
+ os=-sysv4
+ ;;
+ -tpf*)
+ os=-tpf
+ ;;
+ -triton*)
+ os=-sysv3
+ ;;
+ -oss*)
+ os=-sysv3
+ ;;
+ -svr4)
+ os=-sysv4
+ ;;
+ -svr3)
+ os=-sysv3
+ ;;
+ -sysvr4)
+ os=-sysv4
+ ;;
+ # This must come after -sysvr4.
+ -sysv*)
+ ;;
+ -ose*)
+ os=-ose
+ ;;
+ -es1800*)
+ os=-ose
+ ;;
+ -xenix)
+ os=-xenix
+ ;;
+ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+ os=-mint
+ ;;
+ -aros*)
+ os=-aros
+ ;;
+ -kaos*)
+ os=-kaos
+ ;;
+ -none)
+ ;;
+ *)
+ # Get rid of the `-' at the beginning of $os.
+ os=`echo $os | sed 's/[^-]*-//'`
+ echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
+ exit 1
+ ;;
+esac
+else
+
+# Here we handle the default operating systems that come with various machines.
+# The value should be what the vendor currently ships out the door with their
+# machine or put another way, the most popular os provided with the machine.
+
+# Note that if you're going to try to match "-MANUFACTURER" here (say,
+# "-sun"), then you have to tell the case statement up towards the top
+# that MANUFACTURER isn't an operating system. Otherwise, code above
+# will signal an error saying that MANUFACTURER isn't an operating
+# system, and we'll never get to this point.
+
+case $basic_machine in
+ *-acorn)
+ os=-riscix1.2
+ ;;
+ arm*-rebel)
+ os=-linux
+ ;;
+ arm*-semi)
+ os=-aout
+ ;;
+ c4x-* | tic4x-*)
+ os=-coff
+ ;;
+ # This must come before the *-dec entry.
+ pdp10-*)
+ os=-tops20
+ ;;
+ pdp11-*)
+ os=-none
+ ;;
+ *-dec | vax-*)
+ os=-ultrix4.2
+ ;;
+ m68*-apollo)
+ os=-domain
+ ;;
+ i386-sun)
+ os=-sunos4.0.2
+ ;;
+ m68000-sun)
+ os=-sunos3
+ # This also exists in the configure program, but was not the
+ # default.
+ # os=-sunos4
+ ;;
+ m68*-cisco)
+ os=-aout
+ ;;
+ mips*-cisco)
+ os=-elf
+ ;;
+ mips*-*)
+ os=-elf
+ ;;
+ or32-*)
+ os=-coff
+ ;;
+ *-tti) # must be before sparc entry or we get the wrong os.
+ os=-sysv3
+ ;;
+ sparc-* | *-sun)
+ os=-sunos4.1.1
+ ;;
+ *-be)
+ os=-beos
+ ;;
+ *-ibm)
+ os=-aix
+ ;;
+ *-wec)
+ os=-proelf
+ ;;
+ *-winbond)
+ os=-proelf
+ ;;
+ *-oki)
+ os=-proelf
+ ;;
+ *-hp)
+ os=-hpux
+ ;;
+ *-hitachi)
+ os=-hiux
+ ;;
+ i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
+ os=-sysv
+ ;;
+ *-cbm)
+ os=-amigaos
+ ;;
+ *-dg)
+ os=-dgux
+ ;;
+ *-dolphin)
+ os=-sysv3
+ ;;
+ m68k-ccur)
+ os=-rtu
+ ;;
+ m88k-omron*)
+ os=-luna
+ ;;
+ *-next )
+ os=-nextstep
+ ;;
+ *-sequent)
+ os=-ptx
+ ;;
+ *-crds)
+ os=-unos
+ ;;
+ *-ns)
+ os=-genix
+ ;;
+ i370-*)
+ os=-mvs
+ ;;
+ *-next)
+ os=-nextstep3
+ ;;
+ *-gould)
+ os=-sysv
+ ;;
+ *-highlevel)
+ os=-bsd
+ ;;
+ *-encore)
+ os=-bsd
+ ;;
+ *-sgi)
+ os=-irix
+ ;;
+ *-siemens)
+ os=-sysv4
+ ;;
+ *-masscomp)
+ os=-rtu
+ ;;
+ f30[01]-fujitsu | f700-fujitsu)
+ os=-uxpv
+ ;;
+ *-rom68k)
+ os=-coff
+ ;;
+ *-*bug)
+ os=-coff
+ ;;
+ *-apple)
+ os=-macos
+ ;;
+ *-atari*)
+ os=-mint
+ ;;
+ *)
+ os=-none
+ ;;
+esac
+fi
+
+# Here we handle the case where we know the os, and the CPU type, but not the
+# manufacturer. We pick the logical manufacturer.
+vendor=unknown
+case $basic_machine in
+ *-unknown)
+ case $os in
+ -riscix*)
+ vendor=acorn
+ ;;
+ -sunos*)
+ vendor=sun
+ ;;
+ -aix*)
+ vendor=ibm
+ ;;
+ -beos*)
+ vendor=be
+ ;;
+ -hpux*)
+ vendor=hp
+ ;;
+ -mpeix*)
+ vendor=hp
+ ;;
+ -hiux*)
+ vendor=hitachi
+ ;;
+ -unos*)
+ vendor=crds
+ ;;
+ -dgux*)
+ vendor=dg
+ ;;
+ -luna*)
+ vendor=omron
+ ;;
+ -genix*)
+ vendor=ns
+ ;;
+ -mvs* | -opened*)
+ vendor=ibm
+ ;;
+ -os400*)
+ vendor=ibm
+ ;;
+ -ptx*)
+ vendor=sequent
+ ;;
+ -tpf*)
+ vendor=ibm
+ ;;
+ -vxsim* | -vxworks* | -windiss*)
+ vendor=wrs
+ ;;
+ -aux*)
+ vendor=apple
+ ;;
+ -hms*)
+ vendor=hitachi
+ ;;
+ -mpw* | -macos*)
+ vendor=apple
+ ;;
+ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+ vendor=atari
+ ;;
+ -vos*)
+ vendor=stratus
+ ;;
+ esac
+ basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+ ;;
+esac
+
+echo $basic_machine$os
+exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff --git a/configure.in b/configure.in
index bc0a2c0e20..2a849cb979 100644
--- a/configure.in
+++ b/configure.in
@@ -1,42 +1,11 @@
dnl Process this file with autoconf to produce a configure script.
-dnl {
AC_INIT()
-AC_CONFIG_AUX_DIR(tool)
-AC_PREREQ(2.60)
-
-AC_DEFUN([RUBY_PREREQ_AC],
- [m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]), [$1]), [-1],
- AC_MSG_ERROR([Autoconf version ]$1[ or higher is required]$2))])
-
-AC_DEFUN([when], dnl [(] makes parentheses balanced.
-dnl note that spaces after comma need to be quoted.
-[[$*]][)])
-
-dnl environment section {
-
-AC_ARG_WITH(baseruby,
- AS_HELP_STRING([--with-baseruby=RUBY], [ use RUBY as baseruby; RUBY is the pathname of ruby]),
- [
- case "$withval" in
- when(*ruby*)
- BASERUBY=$withval
- ;;
- when(*)
- AC_MSG_ERROR(need ruby)
- ;;
- esac
- ],
- [
- BASERUBY="ruby"
- ])
-test "`RUBYOPT=- $BASERUBY -e 'p 42' 2>/dev/null`" = 42 ||
- BASERUBY="echo executable host ruby is required. use --with-baseruby option.; false"
-AC_SUBST(BASERUBY)
+AC_PREREQ(2.58)
AC_DEFUN([RUBY_MINGW32],
[case "$host_os" in
-when(cygwin*)
+cygwin*)
AC_CACHE_CHECK(for mingw32 environment, rb_cv_mingw32,
[AC_TRY_CPP([
#ifndef __MINGW32__
@@ -75,35 +44,31 @@ fi
GNU_LD=$rb_cv_prog_gnu_ld
AC_SUBST(GNU_LD)])
-eval `sed -n 's/^#define RUBY_VERSION_\([A-Z][A-Z_0-9]*\) \([0-9][0-9]*\)/\1=\2/p' $srcdir/version.h`
-for v in MAJOR MINOR TEENY; do
- if eval "test \"\$$v\" = ''"; then
- AC_MSG_ERROR(could not determine $v number from version.h)
- fi
-done
+unset GREP_OPTIONS
+rb_version=`grep RUBY_VERSION $srcdir/version.h`
+MAJOR=`expr "$rb_version" : '#define RUBY_VERSION "\([0-9][0-9]*\)\.[0-9][0-9]*\.[0-9][0-9]*"'`
+MINOR=`expr "$rb_version" : '#define RUBY_VERSION "[0-9][0-9]*\.\([0-9][0-9]*\)\.[0-9][0-9]*"'`
+TEENY=`expr "$rb_version" : '#define RUBY_VERSION "[0-9][0-9]*\.[0-9][0-9]*\.\([0-9][0-9]*\)"'`
+if test "$MAJOR" = ""; then
+ AC_MSG_ERROR(could not determine MAJOR number from version.h)
+fi
+if test "$MINOR" = ""; then
+ AC_MSG_ERROR(could not determine MINOR number from version.h)
+fi
+if test "$TEENY" = ""; then
+ AC_MSG_ERROR(could not determine TEENY number from version.h)
+fi
AC_SUBST(MAJOR)
AC_SUBST(MINOR)
AC_SUBST(TEENY)
-RUBY_PROGRAM_VERSION=`sed -n 's/^#define RUBY_VERSION "\(.*\)"/\1/p' $srcdir/version.h`
-AC_SUBST(RUBY_PROGRAM_VERSION)
-RUBY_RELEASE_DATE=`sed -n 's/^#define RUBY_RELEASE_DATE "\(.*\)"/\1/p' $srcdir/version.h`
-AC_SUBST(RUBY_RELEASE_DATE)
-if test "$MAJOR" = "1"; then
- AC_DEFINE(CANONICALIZATION_FOR_MATHN)
-fi
dnl checks for alternative programs
-AC_ARG_WITH(gcc,
- AS_HELP_STRING([--without-gcc], [never use gcc]),
- [
+AC_ARG_WITH(gcc, [ --without-gcc never use gcc], [
case $withval in
- when(no)
- : ${CC=cc}
+ no) : ${CC=cc}
;;
- when(yes)
- : ${CC=gcc}
+ yes) : ${CC=gcc}
;;
- when(*)
- CC=$withval
+ *) CC=$withval
;;
esac])
dnl If the user switches compilers, we can't believe the cache
@@ -116,133 +81,88 @@ fi
if test "$program_prefix" = NONE; then
program_prefix=
fi
-RUBY_BASE_NAME=`echo ruby | sed "$program_transform_name"`
-RUBYW_BASE_NAME=`echo rubyw | sed "$program_transform_name"`
-AC_SUBST(RUBY_BASE_NAME)
-AC_SUBST(RUBYW_BASE_NAME)
-
AC_CANONICAL_TARGET
target_os=`echo $target_os | sed 's/linux-gnu$/linux/;s/linux-gnu/linux-/'`
ac_install_sh='' # unusable for extension libraries.
-AC_DEFUN([RUBY_APPEND_OPTION],
- [case " [$]{$1-} " in # RUBY_APPEND_OPTION($1, $2)
- when(*' $2 '*);; when(' ') $1="$2";; when(*) $1="[$]$1 $2";;
- esac])
-AC_DEFUN([RUBY_APPEND_OPTIONS],
- [{ for rb_opt in $2; do # RUBY_APPEND_OPTIONS($1, $2)
- case " [$]{$1-} " in
- when(*" [$]{rb_opt} "*);; when(' ') $1="[$]{rb_opt}";; when(*) $1="[$]$1 [$]{rb_opt}";;
- esac
- done; }])
-AC_DEFUN([RUBY_PREPEND_OPTION],
- [case " [$]{$1-} " in # RUBY_PREPEND_OPTION($1, $2)
- when(*' $2 '*);; when(' ') $1="$2";; when(*) $1="$2 [$]$1";;
- esac])
-AC_DEFUN([RUBY_PREPEND_OPTIONS],
- [{ unset rb_opts; for rb_opt in $2; do # RUBY_PREPEND_OPTIONS($1, $2)
- case " [$]{rb_opts} [$]{$1-} " in
- when(*" [$]{rb_opt} "*);; when(' ') $1="[$]{rb_opt}";; when(*) rb_opts="[$]{rb_opts}[$]{rb_opt} ";;
- esac
- done
- $1="[$]{rb_opts}[$]$1"; }])
-
-AC_ARG_WITH(arch,
- AS_HELP_STRING([--with-arch=ARCHS],
- [build an Apple/NeXT Multi Architecture Binary (MAB);
+ifelse(currently,disabled, [
+dnl checks for fat-binary
+AC_ARG_ENABLE(fat-binary,
+ [ --enable-fat-binary=ARCHS
+ build an Apple/NeXT Multi Architecture Binary (MAB);
ARCHS is a comma-delimited list of architectures for
- which to build; if this option is disabled or omitted
- entirely, then the package will be built only for the
- target platform]),
- [target_archs="$withval"], [unset target_archs])
-test ${CFLAGS+set} && CFLAGS=`echo "$CFLAGS" | sed 's/ *-arch *[^ ]*//g'`
-test ${LDFLAGS+set} && LDFLAGS=`echo "$LDFLAGS" | sed 's/ *-arch *[^ ]*//g'`
-unset ARCH_FLAG universal_binary universal_archnames
-if test ${target_archs+set}; then
+ which to build; if ARCHS is omitted, then the package
+ will be built for all architectures supported by the
+ platform ("ppc" for MacOS/X and Darwin; "ppc,i386"
+ for Rhapsody; "m68k,i386,sparc" for OpenStep;
+ "m68k,i386,sparc,hppa" for NextStep); if this option
+ is disabled or omitted entirely, then the package
+ will be built only for the target platform],
+ [fat_binary=$enableval], [fat_binary=no])
+if test "$fat_binary" != no; then
+
AC_MSG_CHECKING([target architectures])
- target_archs=`echo $target_archs | tr , ' '`
+
+ # Respect TARGET_ARCHS setting from environment if available.
+ if test -z "$TARGET_ARCHS"; then
+ # Respect ARCH given to --enable-fat-binary if present.
+ if test "$fat_binary" != yes; then
+ TARGET_ARCHS=`echo "$fat_binary" | tr ',' ' '`
+ else
+ # Choose a default set of architectures based upon platform.
+ case "$target_os" in
+ darwin*)
+ TARGET_ARCHS="ppc"
+ ;;
+ rhapsody*)
+ TARGET_ARCHS="ppc i386"
+ ;;
+ openstep*)
+ TARGET_ARCHS="m68k i386 sparc"
+ ;;
+ nextstep*)
+ TARGET_ARCHS="m68k i386 sparc hppa"
+ ;;
+ *)
+ TARGET_ARCHS=`arch`
+ esac
+ fi
+ fi
+
+ AC_MSG_RESULT([$TARGET_ARCHS])
+
# /usr/lib/arch_tool -archify_list $TARGET_ARCHS
- for archs in $target_archs
+ ARCH_FLAG=
+ for archs in $TARGET_ARCHS
do
- case ",$universal_binary," in
- when(*",$archs,"*)
- ;;
- when(*)
- cpu=`$SHELL "$ac_aux_dir/config.sub" "${archs}-${target_os}" 2>&1` || {
- AC_MSG_RESULT([failed])
- AC_MSG_ERROR([$cpu])
- }
- cpu=`echo $cpu | sed 's/-.*-.*//'`
- universal_binary="${universal_binary+$universal_binary,}$cpu"
- universal_archnames="${universal_archnames} ${archs}=${cpu}"
- ARCH_FLAG="${ARCH_FLAG+$ARCH_FLAG }-arch $archs"
- ;;
- esac
+ ARCH_FLAG="$ARCH_FLAG -arch $archs"
done
- target_archs="$universal_binary"
- unset universal_binary
- case "$target_archs" in
- when(*,*) universal_binary=yes;;
- when(*) unset universal_archnames;;
- esac
- AC_MSG_RESULT([$target_archs])
-
- if test "${universal_binary-no}" = yes; then
- RUBY_PREREQ_AC(2.63, [ to compile universal binary])
- AC_SUBST(try_header,try_compile)
- target=`echo $target | sed "s/^$target_cpu-/universal-/"`
- target_alias=`echo $target_alias | sed "s/^$target_cpu-/universal-/"`
- target_cpu=universal
- real_cross_compiling=$cross_compiling
- else
- target=`echo $target | sed "s/^$target_cpu-/${target_archs}-/"`
- target_alias=`echo $target_alias | sed "s/^$target_cpu-/${target_archs}-/"`
- target_cpu=${target_archs}
- fi
- CFLAGS="$CFLAGS ${ARCH_FLAG}"
- LDFLAGS="${LDFLAGS+$LDFLAGS }${ARCH_FLAG}"
-else
- target_archs="$target_cpu"
+ AC_DEFINE(NEXT_FAT_BINARY)
fi
+], [fat_binary=no])
case $target_cpu in
- when(i?86) frame_address=yes;;
- when(*) frame_address=no;;
+ i?86) frame_address=yes;;
+ *) frame_address=no;;
esac
AC_ARG_ENABLE(frame-address,
- AS_HELP_STRING([--enable-frame-address], [use GCC __builtin_frame_address()]),
+ [ --enable-frame-address use GCC __builtin_frame_address(). ],
[frame_address=$enableval])
if test $frame_address = yes; then
AC_DEFINE(USE_BUILTIN_FRAME_ADDRESS)
fi
-AC_ARG_ENABLE(load-relative,
- AS_HELP_STRING([--enable-load-relative], [resolve load paths at run time]),
- [load_relative=$enableval])
-
AC_ARG_PROGRAM
dnl Checks for programs.
-if test -z "${CFLAGS+set}"; then
- orig_cflags="$cflags"
- cflags="$cflags "'${optflags} ${debugflags} ${warnflags}'
-fi
-if test -z "${CXXFLAGS+set}"; then
- orig_cxxflags="$cxxflags"
- cxxflags="$cxxflags "'${optflags} ${debugflags} ${warnflags}'
-fi
-
if test x"${build}" != x"${host}"; then
AC_CHECK_TOOL(CC, gcc)
fi
AC_PROG_CC
-AC_PROG_CXX
AC_PROG_GCC_TRADITIONAL
-test $ac_cv_prog_cc_g = yes && : ${debugflags=-g}
if test "$GCC" = yes; then
linker_flag=-Wl,
- : ${optflags=-O3}
else
linker_flag=
fi
@@ -251,12 +171,15 @@ RUBY_PROG_GNU_LD
RUBY_CPPOUTFILE
: ${OUTFLAG='-o '}
-: ${COUTFLAG=${OUTFLAG}}
AC_SUBST(OUTFLAG)
-AC_SUBST(COUTFLAG)
RUBY_MINGW32
+AC_PROG_YACC
+if test "$YACC" = "yacc"; then
+ AC_DEFINE([OLD_YACC])
+fi
+
AC_CHECK_TOOL(RANLIB, ranlib, :)
AC_CHECK_TOOL(AR, ar)
if test -z "$AR"; then
@@ -268,23 +191,15 @@ ASFLAGS=$ASFLAGS
AC_SUBST(ASFLAGS)
case "$target_os" in
-when(cygwin*|mingw*|darwin*)
- ac_cv_prog_ac_ct_OBJCOPY=":";;
-esac
-
-# BSD's ports and MacPorts prefix GNU binutils with 'g'
-AC_CHECK_TOOLS(OBJDUMP, [objdump gobjdump])
-AC_CHECK_TOOLS(OBJCOPY, [objcopy gobjcopy])
-
-case "$target_os" in
-when(cygwin*|mingw*)
+cygwin*|mingw*)
AC_CHECK_TOOL(NM, nm)
AC_CHECK_TOOL(WINDRES, windres)
AC_CHECK_TOOL(DLLWRAP, dllwrap)
target_cpu=`echo $target_cpu | sed s/i.86/i386/`
case "$target_os" in
- when(mingw*)
+ mingw*)
test "$rb_cv_msvcrt" = "" && unset rb_cv_msvcrt
+ AC_CHECK_TOOL(OBJDUMP, objdump)
AC_CACHE_CHECK(for mingw32 runtime DLL, rb_cv_msvcrt, [
AC_TRY_LINK([#include <stdio.h>],
[FILE* volatile f = stdin; return 0;],
@@ -293,13 +208,22 @@ when(cygwin*|mingw*)
sed -n '/^[[ ]]*dll name: \(msvc.*\)\.dll$/{s//\1/p;q;}'`],
[rb_cv_msvcrt=msvcrt])
test "$rb_cv_msvcrt" = "" && rb_cv_msvcrt=msvcrt])
+ AC_ARG_WITH(winsock2,
+ [ --with-winsock2 link winsock2 (MinGW only)], [
+ case $withval in
+ yes) with_winsock2=yes;;
+ *) with_winsock2=no;;
+ esac], [with_winsock2=no])
+ if test "$with_winsock2" = yes; then
+ AC_DEFINE(USE_WINSOCK2)
+ fi
esac
: ${enable_shared=yes}
;;
-when(aix*)
+aix*)
AC_CHECK_TOOL(NM, nm, /usr/ccs/bin/nm, /usr/ccs/bin:$PATH)
;;
-when(hiuxmpp*)
+hiuxmpp*)
# by TOYODA Eizi <toyoda@npd.kishou.go.jp>
AC_DEFINE(__HIUX_MPP__)
;;
@@ -308,66 +232,18 @@ esac
AC_PROG_LN_S
AC_PROG_MAKE_SET
AC_PROG_INSTALL
-AC_PROG_MKDIR_P
-if test "x$MKDIR_P" = "x -d"; then
- if test x"$as_mkdir_p" != xfalse; then
- MKDIR_P='mkdir -p'
- echo "use 'mkdir -p' as MKDIR_P"
- else
- AC_MSG_ERROR([mkdir -p is required])
- fi
-fi
-MAKEDIRS="$MKDIR_P"
-AC_SUBST(MAKEDIRS)
-
-AC_CHECK_TOOL(DOT, dot)
-AC_CHECK_TOOL(DOXYGEN, doxygen)
# checks for UNIX variants that set C preprocessor variables
-AC_USE_SYSTEM_EXTENSIONS
+AC_AIX
+AC_MINIX
AC_SUBST(RM, ['rm -f'])
AC_SUBST(CP, ['cp'])
-AC_SUBST(RMDIRS, ['$(top_srcdir)/tool/rmdirs'])
-AC_SUBST(RMALL, ['rm -fr'])
-
-AC_MSG_CHECKING([for cd using phisical directory])
-rm -fr conf$$.dir
-mkdir conf$$.dir &&
-(cd conf$$.dir && mkdir src build && cd src &&
-$as_ln_s ../build . > /dev/null 2>&1 && cd build &&
-for chdir in 'cd -P' 'PWD= cd'; do
- /bin/sh -c "$chdir ../src && echo '$chdir' > cdcmd" 2> /dev/null && break
-done)
-if test -e conf$$.dir/src/cdcmd; then
- read CHDIR < conf$$.dir/src/cdcmd 2> /dev/null
+if $as_mkdir_p; then
+ AC_SUBST(MAKEDIRS, ['mkdir -p'])
else
- CHDIR=cd
+ AC_SUBST(MAKEDIRS, ['install -d'])
fi
-rm -fr conf$$.dir
-AC_MSG_RESULT([$CHDIR])
-AC_SUBST(CHDIR)
-
-dnl }
-dnl compiler section {
-
-if test "$GCC:${warnflags+set}:no" = yes::no; then
- save_CFLAGS="$CFLAGS"
- for wflag in -Wno-missing-field-initializers -Wshorten-64-to-32; do
- CFLAGS="$CFLAGS $wflag"
- AC_MSG_CHECKING([whether $wflag is accepted])
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],
- [warnflags="${warnflags+$warnflags }$wflag"
- AC_MSG_RESULT(yes)],
- [AC_MSG_RESULT(no)])
- done
- CFLAGS="$save_CFLAGS"
- unset save_CFLAGS
- warnflags="-Wall -Wno-unused-parameter -Wno-parentheses ${warnflags+$warnflags }-Wpointer-arith -Wwrite-strings"
-fi
-
-test -z "${ac_env_CFLAGS_set}" -a -n "${cflags+set}" && eval CFLAGS="\"$cflags $ARCH_FLAG\""
-test -z "${ac_env_CXXFLAGS_set}" -a -n "${cxxflags+set}" && eval CXXFLAGS="\"$cxxflags $ARCH_FLAG\""
dnl check for large file stuff
mv confdefs.h confdefs1.h
@@ -377,163 +253,23 @@ mv confdefs.h largefile.h
mv confdefs1.h confdefs.h
cat largefile.h >> confdefs.h
-case "$target_os" in
-when(mingw*)
- ac_cv_type_off_t=yes
- ac_cv_sizeof_off_t=8
- ;;
-esac
-
AC_CHECK_TYPES([long long, off_t])
-AC_CACHE_CHECK([char bit], [rb_cv_char_bit],
- [test "$universal_binary" = yes && cross_compiling=yes
- AC_COMPUTE_INT([rb_cv_char_bit], [CHAR_BIT],
- [AC_INCLUDES_DEFAULT([@%:@include <limits.h>])], [rb_cv_char_bit=8])
- test "$universal_binary" = yes && cross_compiling=$real_cross_compiling])
-
-dnl RUBY_CHECK_SIZEOF [typename], [maybe same size types], [macros], [include]
-AC_DEFUN([RUBY_CHECK_SIZEOF],
-[m4_bmatch([$1], [\.], [], [if test "$universal_binary" = yes; then])
-AC_CACHE_CHECK([size of $1], [AS_TR_SH([ac_cv_sizeof_$1])], [
- unset AS_TR_SH(ac_cv_sizeof_$1)
- rbcv_var="
-typedef m4_bpatsubst([$1], [\..*]) ac__type_sizeof_;
-static ac__type_sizeof_ *rbcv_ptr;
-@%:@define AS_TR_CPP(SIZEOF_$1) sizeof((*rbcv_ptr)[]m4_bmatch([$1], [\.], .m4_bpatsubst([$1], [^[^.]*\.])))
-"
- m4_ifval([$2], [test -z "${AS_TR_SH(ac_cv_sizeof_$1)+set}" && {
- for t in $2; do
- AC_COMPILE_IFELSE(
- [AC_LANG_BOOL_COMPILE_TRY(AC_INCLUDES_DEFAULT([$4]
- [$rbcv_var]),
- [AS_TR_CPP(SIZEOF_$1) == sizeof($t)])], [
- AS_TR_SH(ac_cv_sizeof_$1)=AS_TR_CPP([SIZEOF_]$t)
- break])
- done
- }])
- unset cond
- m4_ifval([$3], [test -z "${AS_TR_SH(ac_cv_sizeof_$1)+set}" && {
- for s in 32 64 128; do
- for t in $3; do
- cond="${cond}
-@%:@${cond+el}if defined(__${t}${s}__) || defined(__${t}${s}) || defined(_${t}${s}) || defined(${t}${s})"
- hdr="AC_INCLUDES_DEFAULT([$4
-@%:@if defined(__${t}${s}__) || defined(__${t}${s}) || defined(_${t}${s}) || defined(${t}${s})
-@%:@ define AS_TR_CPP(HAVE_$1) 1
-@%:@else
-@%:@ define AS_TR_CPP(HAVE_$1) 0
-@%:@endif])"
- AC_COMPILE_IFELSE([AC_LANG_BOOL_COMPILE_TRY([$hdr], [!AS_TR_CPP(HAVE_$1)])], [continue])
- AC_COMPILE_IFELSE([AC_LANG_BOOL_COMPILE_TRY([$hdr]
- [$rbcv_var],
- [AS_TR_CPP(HAVE_$1) == (AS_TR_CPP(SIZEOF_$1) == ([$[s / rb_cv_char_bit]]))])],
- [AS_TR_SH(ac_cv_sizeof_$1)="${AS_TR_SH(ac_cv_sizeof_$1)+${AS_TR_SH(ac_cv_sizeof_$1)-} }${t}${s}"])
- done
- done
- }])
- m4_ifval([$2][$3], [case "${AS_TR_SH(ac_cv_sizeof_$1)}" in
- when([SIZEOF_*]);;
- when(*)])
- test "$universal_binary" = yes && cross_compiling=yes
- AC_COMPUTE_INT([t], AS_TR_CPP(SIZEOF_$1), [AC_INCLUDES_DEFAULT([$4])]
-[${cond+$cond
-@%:@else}
-$rbcv_var
-${cond+@%:@endif}
-@%:@ifndef AS_TR_CPP(SIZEOF_$1)
-@%:@define AS_TR_CPP(SIZEOF_$1) 0
-@%:@endif], [t=0])
- test "$universal_binary" = yes && cross_compiling=$real_cross_compiling
- if test ${t-0} != 0; then
- AS_TR_SH(ac_cv_sizeof_$1)="${AS_TR_SH(ac_cv_sizeof_$1)+${AS_TR_SH(ac_cv_sizeof_$1)-} }${t}"
- fi
- m4_ifval([$2][$3], [;; esac])
- : ${AS_TR_SH(ac_cv_sizeof_$1)=0}
-])
-{
- unset cond
- for t in ${AS_TR_SH(ac_cv_sizeof_$1)-}; do
- case "$t" in
- when([[0-9]*|SIZEOF_*])
- ${cond+echo "@%:@else"}
- echo "[@%:@define ]AS_TR_CPP(SIZEOF_$1) [$t]"
- break
- ;;
- when([*])
- s=`expr $t : ['.*[^0-9]\([0-9][0-9]*\)$']`
- echo "@%:@${cond+el}if defined(__${t}__) || defined(__${t}) || defined(_${t}) || defined($t)"
- echo "@%:@define AS_TR_CPP(SIZEOF_$1) [$[s / rb_cv_char_bit]]"
- cond=1
- ;;
- esac
- done
- ${cond+echo "@%:@endif"}
-} >> confdefs.h
-m4_bmatch([$1], [\.], [], [else
-AC_CHECK_SIZEOF([$1], 0, [$4])
-fi])
-])
-
-RUBY_CHECK_SIZEOF(int, [], [ILP])
-RUBY_CHECK_SIZEOF(short)
-RUBY_CHECK_SIZEOF(long, [int], [ILP LP])
-RUBY_CHECK_SIZEOF(long long)
-RUBY_CHECK_SIZEOF(__int64)
-RUBY_CHECK_SIZEOF(off_t)
-RUBY_CHECK_SIZEOF(void*, [int long "long long"], [ILP LP LLP])
-RUBY_CHECK_SIZEOF(float)
-RUBY_CHECK_SIZEOF(double)
-RUBY_CHECK_SIZEOF(time_t, [long "long long"], [], [@%:@include <time.h>])
-
-dnl RUBY_REPLACE_TYPE [typename] [default type] [macro type] [included]
-AC_DEFUN([RUBY_REPLACE_TYPE], [dnl
- AC_CHECK_TYPE([$1], [n=[$1]], [n=[$2]], [$4])
- AC_CACHE_CHECK([for convertible type of [$1]], rb_cv_[$1]_convertible, [
- u= t=
- case "$n " in
- when(*" signed "*) ;;
- when(*" unsigned "*)
- u=U;;
- when(*)
- AC_COMPILE_IFELSE(
- [AC_LANG_BOOL_COMPILE_TRY([AC_INCLUDES_DEFAULT([$4])], [($n)-1 > 0])],
- [u=U]);;
- esac
- if test x"$t" = x; then
- for t in "long long" long int short; do
- test -n "$u" && t="unsigned $t"
- AC_COMPILE_IFELSE(
- [AC_LANG_BOOL_COMPILE_TRY([AC_INCLUDES_DEFAULT([$4])]
- [typedef $n rbcv_conftest_target_type;
- typedef $t rbcv_conftest_replace_type;
- extern rbcv_conftest_target_type rbcv_conftest_var;
- extern rbcv_conftest_replace_type rbcv_conftest_var;
- extern rbcv_conftest_target_type rbcv_conftest_func(void);
- extern rbcv_conftest_replace_type rbcv_conftest_func(void);
- ], [sizeof(rbcv_conftest_target_type) == sizeof(rbcv_conftest_replace_type)])],
- [n="$t"; break])
- done
- fi
- case " $n " in
- when(*" long long "*)
- t=LL;;
- when(*" long "*)
- t=LONG;;
- when(*)
- t=INT;;
- esac
- rb_cv_[$1]_convertible=${u}${t}])
- m4_ifval([$2], AC_DEFINE_UNQUOTED(rb_[$1], $n))
- AC_DEFINE_UNQUOTED([$3]2NUM[(v)], [${rb_cv_[$1]_convertible}2NUM(v)])
- AC_DEFINE_UNQUOTED(NUM2[$3][(v)], [NUM2${rb_cv_[$1]_convertible}(v)])
- AC_DEFINE_UNQUOTED(PRI_[$3]_PREFIX,
- ["`echo ${rb_cv_[$1]_convertible} | sed ['s/^U//;s/[^L].*//;y/L/l/']`"])
-])
-RUBY_REPLACE_TYPE(pid_t, int, PIDT)
-RUBY_REPLACE_TYPE(uid_t, int, UIDT)
-RUBY_REPLACE_TYPE(gid_t, int, GIDT)
-RUBY_REPLACE_TYPE(time_t, [], TIMET, [@%:@include <time.h>])
+AC_CHECK_SIZEOF(int, 4)
+AC_CHECK_SIZEOF(short, 2)
+AC_CHECK_SIZEOF(long, 4)
+AC_CHECK_SIZEOF(long long, 0)
+AC_CHECK_SIZEOF(__int64, 0)
+AC_CHECK_SIZEOF(off_t, 0)
+AC_CHECK_SIZEOF(void*, 4)
+AC_CHECK_SIZEOF(float, 4)
+AC_CHECK_SIZEOF(double, 8)
+AC_CHECK_SIZEOF(time_t, 0)
+
+for id in pid_t gid_t uid_t; do
+ AC_CHECK_TYPE($id, [typ=$id], [typ=int])
+ AC_DEFINE_UNQUOTED(rb_$id, $typ)
+done
AC_CACHE_CHECK(for prototypes, rb_cv_have_prototypes,
[AC_TRY_COMPILE([int foo(int x) { return 0; }], [return foo(10);],
@@ -554,41 +290,6 @@ else
AC_DEFINE(TOKEN_PASTE(x,y),[x/**/y])
fi
-AC_CACHE_CHECK(stringization, rb_cv_stringization, [
- rb_cv_stringization=no
- for string in "#expr" '"expr"'; do
- AC_COMPILE_IFELSE([
- AC_LANG_BOOL_COMPILE_TRY([
-#define STRINGIZE0(expr) $string
-#define STRINGIZE(expr) STRINGIZE0(expr)
-#undef real_test_for_stringization
-#define test_for_stringization -.real_test_for_stringization.-
-const char stringized[[]] = STRINGIZE(test_for_stringization);
-], [sizeof(stringized) == 32])],
- [rb_cv_stringization="$string"; break],
- [rb_cv_stringization=no])
- done]
-)
-AC_DEFINE(STRINGIZE(expr),STRINGIZE0(expr))
-if test x"$rb_cv_stringization" != xno -a "$rb_cv_stringization" != "#expr"; then
- AC_DEFINE_UNQUOTED(STRINGIZE0(expr),$rb_cv_stringization)
- AC_DEFINE(OLD_FASHIONED_STRINGIZATION,1)
-fi
-
-AC_CACHE_CHECK([string literal concatenation],
- rb_cv_string_literal_concatenation, [
- AC_COMPILE_IFELSE([
- AC_LANG_BOOL_COMPILE_TRY([
-const char concatenated_literal[[]] = "literals" "to"
- "be" "concatenated.";
-], [sizeof(concatenated_literal) == 26])],
- [rb_cv_string_literal_concatenation=yes],
- [rb_cv_string_literal_concatenation=no])]
-)
-if test "$rb_cv_string_literal_concatenation" = no; then
- AC_DEFINE(NO_STRING_LITERAL_CONCATENATION,1)
-fi
-
AC_CACHE_CHECK(for variable length prototypes and stdarg.h, rb_cv_stdarg,
[AC_TRY_COMPILE([
#include <stdarg.h>
@@ -607,27 +308,6 @@ if test "$rb_cv_stdarg" = yes; then
AC_DEFINE(HAVE_STDARG_PROTOTYPES)
fi
-AC_CACHE_CHECK(for variable length macro, rb_cv_va_args_macro,
- [AC_TRY_COMPILE([@%:@define FOO(a, ...) foo(a, @%:@@%:@__VA_ARGS__)],
- [FOO(1);FOO(1,2);FOO(1,2,3);],
- rb_cv_va_args_macro=yes,
- rb_cv_va_args_macro=no)])
-if test "$rb_cv_va_args_macro" = yes; then
- AC_DEFINE(HAVE_VA_ARGS_MACRO)
-fi
-
-AC_DEFUN([RUBY_DEFINE_IF], [dnl
- m4_ifval([$1],[test "$1" && cat <<EOH >> confdefs.h
-@%:@if $1
-EOH
-])dnl
-AC_DEFINE_UNQUOTED($2, $3)
- m4_ifval([$1],[test "$1" && cat <<EOH >> confdefs.h
-@%:@endif /* $1 */
-EOH
-])dnl
-])dnl
-
AC_DEFUN([RUBY_FUNC_ATTRIBUTE], [dnl
m4_ifval([$2], dnl
[AS_VAR_PUSHDEF([attrib],[$2])], dnl
@@ -637,7 +317,6 @@ m4_ifval([$3], dnl
[AS_VAR_PUSHDEF([rbcv],[$3])], dnl
[AS_VAR_PUSHDEF([rbcv],[rb_cv_func_][$1])]dnl
)dnl
-m4_ifval([$4], [rbcv_cond=[$4]; test "$rbcv_cond" || unset rbcv_cond])
AC_CACHE_CHECK(for [$1] function attribute, rbcv,
[rbcv=x
if test "${ac_c_werror_flag+set}"; then
@@ -647,14 +326,9 @@ else
fi
ac_c_werror_flag=yes
for mac in "__attribute__ (($1)) x" "x __attribute__ (($1))" "__declspec($1) x" x; do
- m4_ifval([$4],mac="$mac"${rbcv_cond+" /* only if $rbcv_cond */"})
AC_TRY_COMPILE(
- m4_ifval([$4],${rbcv_cond+[@%:@if ]$rbcv_cond})
-[@%:@define ]attrib[(x) $mac]
-m4_ifval([$4],${rbcv_cond+[@%:@else]}
-${rbcv_cond+[@%:@define ]attrib[(x) x]}
-${rbcv_cond+[@%:@endif]})
- attrib[(void conftest_attribute_check(void));], [],
+ [#define ]attrib[(x) $mac
+ ]attrib[(void conftest_attribute_check(void));], [],
[rbcv="$mac"; break])
done
if test "${rb_c_werror_flag+set}"; then
@@ -663,38 +337,14 @@ else
unset ac_c_werror_flag
fi
])
-if test "$rbcv" != x; then
- RUBY_DEFINE_IF([${rbcv_cond}], attrib[(x)], $rbcv)
-fi
+AC_DEFINE_UNQUOTED(attrib[(x)], $rbcv)
AS_VAR_POPDEF([attrib])
AS_VAR_POPDEF([rbcv])
])
RUBY_FUNC_ATTRIBUTE(noreturn, NORETURN)
-RUBY_FUNC_ATTRIBUTE(deprecated, DEPRECATED)
RUBY_FUNC_ATTRIBUTE(noinline, NOINLINE)
-if_i386=${universal_binary+[defined __i386__]}
-RUBY_FUNC_ATTRIBUTE(stdcall, [], [], ${if_i386})
-RUBY_FUNC_ATTRIBUTE(cdecl, [], [], ${if_i386})
-RUBY_FUNC_ATTRIBUTE(fastcall, [], [], ${if_i386})
-
-if test "$GCC" = yes; then
- AC_CACHE_CHECK([for function alias], [rb_cv_gcc_function_alias],
- [rb_cv_gcc_function_alias=no
- for a in alias weak,alias; do
- AC_TRY_LINK([void foo(void) {}
- void bar(void) __attribute__(($a("foo")));], [bar()],
- [rb_cv_gcc_function_alias=$a; break])
- done])
- if test "$rb_cv_gcc_function_alias" != no; then
- AC_DEFINE_UNQUOTED([RUBY_ALIAS_FUNCTION_TYPE(type, prot, name, args)],
- [type prot __attribute__(($rb_cv_gcc_function_alias(@%:@name)));])
- AC_DEFINE_UNQUOTED([RUBY_ALIAS_FUNCTION_VOID(prot, name, args)],
- [RUBY_ALIAS_FUNCTION_TYPE(void, prot, name, args)])
- fi
-fi
-
AC_CACHE_CHECK([for RUBY_EXTERN], rb_cv_ruby_extern,
[rb_cv_ruby_extern=no
for mac in "__attribute__((dllimport))" "__declspec(dllimport)"; do
@@ -704,172 +354,63 @@ for mac in "__attribute__((dllimport))" "__declspec(dllimport)"; do
done])
test "x$rb_cv_ruby_extern" = xno || AC_DEFINE_UNQUOTED(RUBY_EXTERN, $rb_cv_ruby_extern)
-RUBY_APPEND_OPTION(XCFLAGS, -DRUBY_EXPORT)
-
-dnl }
-dnl header and library section {
+XCFLAGS="$XCFLAGS -DRUBY_EXPORT"
dnl Check whether we need to define sys_nerr locally
AC_CHECK_DECLS([sys_nerr], [], [], [$ac_includes_default
#include <errno.h>])
-AC_ARG_ENABLE(win95,
- AS_HELP_STRING([--enable-win95], [enable Windows 95 series support]),
- [case "$enableval" in
- when(yes|no) enable_win95=$enableval;;
- when(*) unset enable_win95;;
- esac])
-
-case "$target_os" in
-when(freebsd*)
- AC_CACHE_CHECK([whether pthread should be enabled by default],
- rb_cv_enable_pthread_default,
- [AC_TRY_CPP([
-#include <osreldate.h>
-#if __FreeBSD_version < 502102
-#error pthread should be disabled on this platform
-#endif
- ],
- rb_cv_enable_pthread_default=yes,
- rb_cv_enable_pthread_default=no)])
- enable_pthread_default=$rb_cv_enable_pthread_default
- ;;
-when(mingw*)
- enable_pthread_default=no
- ;;
-when(*)
- enable_pthread_default=yes
- ;;
-esac
+dnl whether link libc_r or not
+AC_ARG_WITH(libc_r,
+ [ --with-libc_r link libc_r if possible (FreeBSD only)], [
+ case $withval in
+ yes) with_libc_r=yes;;
+ *) with_libc_r=no;;
+ esac], [with_libc_r=no])
AC_ARG_ENABLE(pthread,
- AS_HELP_STRING([--enable-pthread], [use pthread library]),
- [enable_pthread=$enableval], [enable_pthread=$enable_pthread_default])
+ [ --enable-pthread use pthread library.],
+ [enable_pthread=$enableval], [enable_pthread=no])
-dnl Checks for libraries.
-case "$target_os" in
-when(*bsd*|dragonfly*)
- ;;
-when(*)
- ac_cv_func_daemon=no
- ;;
-esac
+AC_ARG_ENABLE(fastthread,
+ [ --disable-fastthread do not use the fastthread mutex], [
+ : handled by ext/thread/extconf.rb
+ ])
+dnl Checks for libraries.
case "$target_os" in
-when(solaris*)
- AC_DEFINE(SIZEOF_STRUCT_DIRENT_TOO_SMALL, 1)
- LIBS="-lm $LIBS"
- ;;
-when(nextstep*) ;;
-when(openstep*) ;;
-when(rhapsody*) ;;
-when(darwin*) RUBY_PREPEND_OPTION(LIBS, -lobjc)
- RUBY_APPEND_OPTIONS(CPPFLAGS, -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE)
- AC_MSG_CHECKING(whether Mac OS X 10.5 or later)
+nextstep*) ;;
+openstep*) ;;
+rhapsody*) ;;
+darwin*) LIBS="-lobjc $LIBS"
+ CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE"
AC_TRY_CPP([#include <AvailabilityMacros.h>
#if MAC_OS_X_VERSION_MAX_ALLOWED <= 1040
#error pre OS X 10.4
[!<===== pre OS X 10.4 =====>]
#endif
],
- [macosx_10_5=yes], [macosx_10_5=no])
- AC_MSG_RESULT($macosx_10_5)
- if test $macosx_10_5 = yes; then
- ac_cv_header_ucontext_h=no
- else
+ [
+ test "x$target_cpu" = xppc && ac_cv_header_ucontext_h=no
+ ],
+ [
AC_DEFINE(BROKEN_SETREUID, 1)
AC_DEFINE(BROKEN_SETREGID, 1)
- fi
- ac_cv_type_getgroups=gid_t # getgroups() on Rosetta fills garbage
- ac_cv_lib_crypt_crypt=no
- AC_CACHE_CHECK(for broken crypt with 8bit chars, rb_cv_broken_crypt,
- [AC_TRY_RUN([
-#include <stdio.h>
-#include <unistd.h>
-#include <string.h>
-
-int
-main()
-{
- int i;
- for (i = 0; i < 128*128; i++) {
- char salt[2], buf[256], *s;
- salt[0] = 0x80 | (i & 0x7f);
- salt[1] = 0x80 | (i >> 7);
- strcpy(buf, crypt("", salt));
- if (strcmp(buf, s = crypt("", salt))) {
-#if 0
- printf("%.2x%.2x: %s -> %s\n", (unsigned char)salt[0], (unsigned char)salt[1],
- buf+2, s+2);
-#endif
- return 1;
- }
- }
- return 0;
-}
-],
- rb_cv_broken_crypt=no,
- rb_cv_broken_crypt=yes,
- rb_cv_broken_crypt=yes)])
- if test "$rb_cv_broken_crypt" = yes; then
- AC_DEFINE(BROKEN_CRYPT, 1)
- fi
+ ])
;;
-when(hpux*) LIBS="-lm $LIBS"
+hpux*) LIBS="-lm $LIBS"
ac_cv_c_inline=no;;
-when(human*) ac_cv_func_getpgrp_void=yes
+human*) ac_cv_func_getpgrp_void=yes
ac_cv_func_setitimer=no
- AC_CHECK_LIB(signal, _harderr)
- AC_CHECK_LIB(hmem, hmemset)
- AC_CHECK_FUNCS(select)
- AC_CACHE_CHECK(whether PD libc _dtos18 fail to convert big number,
- rb_cv_missing__dtos18,
- [AC_TRY_RUN([
-#include <stdio.h>
-int
-main()
-{
- char buf[256];
- sprintf(buf, "%g", 1e+300);
- return (strcmp (buf, "1e+300") ? 0 : 1);
-}
-],
- rb_cv_missing__dtos18=yes, rb_cv_missing__dtos18=no, rb_cv_missing__dtos18=no)])
- if test "$rb_cv_missing__dtos18" = yes; then
- AC_DEFINE(MISSING__DTOS18)
- fi
- AC_CACHE_CHECK(whether PD libc fconvert fail to round,
- rb_cv_missing_fconvert,
- [AC_TRY_RUN([
-#include <stdio.h>
-#include <math.h>
-int
-main()
-{
- char buf[256];
- sprintf(buf, "%f", log(exp(1.0)));
- return (strcmp (buf, "1.000000") ? 0 : 1);
-}
-],
- rb_cv_missing_fconvert=yes, rb_cv_missing_fconvert=no, rb_cv_missing_fconvert=no)])
- if test "$rb_cv_missing_fconvert" = yes; then
- AC_DEFINE(MISSING_FCONVERT)
- fi
- ;;
-when(beos*|haiku*)
- ac_cv_func_link=no
- ac_cv_func_sched_yield=no
- ac_cv_func_pthread_attr_setinheritsched=no
- case "$target_os" in
- when(beos*) ac_cv_header_net_socket_h=yes;;
- when(haiku*) ac_cv_func_shutdown=no;;
- esac
- LIBS="$LIBS" # m lib is include in root under BeOS/Haiku
;;
-when(cygwin*) ac_cv_header_langinfo_h=yes
- AC_LIBOBJ([langinfo])
- ;;
-when(mingw*) LIBS="-lshell32 -lws2_32 $LIBS"
+beos*) ac_cv_func_link=no;;
+cygwin*) ;;
+mingw*) if test "$with_winsock2" = yes; then
+ LIBS="-lws2_32 $LIBS"
+ else
+ LIBS="-lwsock32 $LIBS"
+ fi
+ LIBS="-lshell32 $LIBS"
ac_cv_header_a_out_h=no
ac_cv_header_pwd_h=no
ac_cv_header_utime_h=no
@@ -879,19 +420,16 @@ when(mingw*) LIBS="-lshell32 -lws2_32 $LIBS"
ac_cv_header_sys_select_h=no
ac_cv_header_sys_time_h=no
ac_cv_header_sys_times_h=no
- ac_cv_header_sys_socket_h=no
ac_cv_func_times=yes
ac_cv_func_waitpid=yes
ac_cv_func_fsync=yes
+ ac_cv_func_vsnprintf=yes
ac_cv_func_seekdir=yes
ac_cv_func_telldir=yes
ac_cv_func_isinf=yes
ac_cv_func_isnan=yes
ac_cv_func_finite=yes
ac_cv_func_link=yes
- ac_cv_func_truncate=yes
- ac_cv_func_fseeko=yes
- ac_cv_func_ftello=yes
ac_cv_lib_crypt_crypt=no
ac_cv_func_getpgrp_void=no
ac_cv_func_setpgrp_void=yes
@@ -899,77 +437,90 @@ when(mingw*) LIBS="-lshell32 -lws2_32 $LIBS"
ac_cv_lib_dl_dlopen=no
rb_cv_binary_elf=no
rb_cv_negative_time_t=no
+ enable_pthread=no
ac_cv_func_fcntl=yes
- ac_cv_func_flock=yes
- AC_LIBOBJ([langinfo])
- : ${enable_win95=maybe}
;;
-when(os2-emx*) LIBS="-lm $LIBS"
+os2-emx*) LIBS="-lm $LIBS"
ac_cv_lib_dir_opendir=no;;
-when(msdosdjgpp*)
- LIBS="-lm $LIBS"
+msdosdjgpp*) LIBS="-lm $LIBS"
ac_cv_func_getpgrp_void=yes
ac_cv_func_setitimer=no
- ac_cv_sizeof_rlim_t=4
- ac_cv_func_fork=no
+ ac_cv_sizeof_rlim_t=4
ac_cv_func_setrlimit=no
- ac_cv_header_sys_socket_h=no
;;
-when(bsdi*) LIBS="-lm $LIBS"
+bsdi*) LIBS="-lm $LIBS"
AC_DEFINE(BROKEN_SETREUID, 1)
AC_DEFINE(BROKEN_SETREGID, 1)
ac_cv_sizeof_rlim_t=8;;
-when(freebsd*) LIBS="-lm $LIBS"
+freebsd*) LIBS="-lm $LIBS"
+ AC_CACHE_CHECK([whether -lxpg4 has to be linked],
+ rb_cv_lib_xpg4_needed,
+ [AC_TRY_CPP([
+#include <osreldate.h>
+#if __FreeBSD_version < 400020 || \
+ (__FreeBSD_version >= 500000 && __FreeBSD_version < 500005)
+#error needs libxpg4
+#endif
+ ],
+ rb_cv_lib_xpg4_needed=no,
+ rb_cv_lib_xpg4_needed=yes,
+ rb_cv_lib_xpg4_needed=yes)])
+ if test "$rb_cv_lib_xpg4_needed" = yes; then
+ AC_CHECK_LIB(xpg4, setlocale)
+ fi
+ if test "$with_libc_r" = yes; then
+ AC_CACHE_CHECK([whether libc_r is supplementary to libc],
+ rb_cv_supplementary_lib_c_r,
+ [AC_TRY_CPP([
+#include <osreldate.h>
+#if 500016 <= __FreeBSD_version
+#error libc_r is supplementary to libc
+#endif
+ ],
+ rb_cv_supplementary_lib_c_r=no,
+ rb_cv_supplementary_lib_c_r=yes,
+ rb_cv_supplementary_lib_c_r=yes)])
+ if test "$rb_cv_supplementary_lib_c_r" = yes; then
+ MAINLIBS="-lc_r $MAINLIBS"
+ fi
+ fi
;;
-when(dragonfly*) LIBS="-lm $LIBS"
+dragonfly*) LIBS="-lm $LIBS"
;;
-when(bow) ac_cv_func_setitimer=no
+bow) ac_cv_func_setitimer=no
;;
-when(superux*) ac_cv_func_setitimer=no
+superux*) ac_cv_func_setitimer=no
;;
-when(*) LIBS="-lm $LIBS";;
+solaris*2.1*) if test -z "$GCC"; then
+ ac_cv_func_isinf=yes
+ fi
+ LIBS="-lm $LIBS"
+ ;;
+*) LIBS="-lm $LIBS";;
esac
AC_CHECK_LIB(crypt, crypt)
AC_CHECK_LIB(dl, dlopen) # Dynamic linking for SunOS/Solaris and SYSV
AC_CHECK_LIB(dld, shl_load) # Dynamic linking for HP-UX
-AC_CHECK_LIB(socket, socketpair) # SunOS/Solaris
-AC_CHECK_LIB(rt, clock_gettime) # GNU/Linux
-if test "${enable_win95}" = maybe; then
- AC_HAVE_LIBRARY(unicows, [enable_win95=yes], [enable_win95=no])
-fi
-if test "${enable_win95}" = yes; then
- AC_DEFINE(WIN95)
- LIBS="-lunicows $LIBS"
-fi
case "$target_cpu" in
-when(alpha*) case "$target_os"::"$GCC" in
- when(*::yes) CFLAGS="-mieee $CFLAGS" ;; # gcc
- when(osf*) CFLAGS="-ieee $CFLAGS" ;; # ccc
+alpha*) case "$target_os"::"$GCC" in
+ *::yes) CFLAGS="-mieee $CFLAGS" ;; # gcc
+ osf*) CFLAGS="-ieee $CFLAGS" ;; # ccc
esac ;;
esac
-ac_cv_header_net_socket_h=${ac_cv_header_net_socket_h=no}
-if test "$ac_cv_header_net_socket_h" = yes; then
- ac_cv_header_sys_socket_h=${ac_cv_header_sys_socket_h=no}
-else
- ac_cv_header_sys_socket_h=${ac_cv_header_sys_socket_h=yes}
-fi
-
dnl Checks for header files.
AC_HEADER_DIRENT
-dnl AC_HEADER_STDC has been checked in AC_USE_SYSTEM_EXTENSIONS
-AC_HEADER_STDBOOL
+AC_HEADER_STDC
AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS(limits.h sys/file.h sys/ioctl.h sys/syscall.h\
+AC_CHECK_HEADERS(stdlib.h string.h unistd.h limits.h sys/file.h sys/ioctl.h sys/syscall.h\
fcntl.h sys/fcntl.h sys/select.h sys/time.h sys/times.h sys/param.h\
- syscall.h pwd.h grp.h a.out.h utime.h direct.h sys/resource.h \
- sys/mkdev.h sys/utime.h xti.h netinet/in_systm.h float.h ieeefp.h \
- ucontext.h intrinsics.h langinfo.h locale.h sys/sendfile.h time.h \
- net/socket.h sys/socket.h)
+ syscall.h pwd.h grp.h a.out.h utime.h memory.h direct.h sys/resource.h \
+ sys/mkdev.h sys/utime.h netinet/in_systm.h float.h ieeefp.h pthread.h \
+ ucontext.h intrinsics.h)
dnl Check additional types.
-RUBY_CHECK_SIZEOF(rlim_t, [int long "long long"], [], [
+AC_CHECK_SIZEOF(rlim_t, 0, [
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
@@ -985,143 +536,42 @@ RUBY_CHECK_SIZEOF(rlim_t, [int long "long long"], [], [
#include <stdio.h>
])
+dnl Checks for typedefs, structures, and compiler characteristics.
AC_TYPE_SIZE_T
-RUBY_CHECK_SIZEOF(size_t, [int long void*], [], [@%:@include <sys/types.h>])
-RUBY_CHECK_SIZEOF(ptrdiff_t, size_t, [], [@%:@include <stddef.h>])
AC_STRUCT_ST_BLKSIZE
AC_STRUCT_ST_BLOCKS
AC_STRUCT_ST_RDEV
-RUBY_CHECK_SIZEOF([struct stat.st_size], [int long "long long"])
-if test "$ac_cv_member_struct_stat_st_blocks" = yes; then
- RUBY_CHECK_SIZEOF([struct stat.st_blocks], [int long "long long"])
-fi
-AC_CHECK_MEMBERS([struct stat.st_atim])
-AC_CHECK_MEMBERS([struct stat.st_atimespec])
-AC_CHECK_MEMBERS([struct stat.st_atimensec])
-AC_CHECK_MEMBERS([struct stat.st_mtim])
-AC_CHECK_MEMBERS([struct stat.st_mtimespec])
-AC_CHECK_MEMBERS([struct stat.st_mtimensec])
-AC_CHECK_MEMBERS([struct stat.st_ctim])
-AC_CHECK_MEMBERS([struct stat.st_ctimespec])
-AC_CHECK_MEMBERS([struct stat.st_ctimensec])
-
-AC_CHECK_TYPES([struct timespec], [], [], [@%:@ifdef HAVE_TIME_H
-@%:@include <time.h>
-@%:@endif])
-
-AC_CHECK_TYPE(fd_mask, [AC_DEFINE(HAVE_RB_FD_INIT, 1)])
-
-dnl RUBY_DEFINT TYPENAME, SIZE, [SIGNED-OR-UNSIGNED], [INCLUDES = DEFAULT-INCLUDES]
-AC_DEFUN([RUBY_DEFINT], [dnl
-AC_CACHE_CHECK([for $1], [rb_cv_type_$1],
-[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT([$4])
-typedef $1 t; int s = sizeof(t) == 42;])],
- [rb_cv_type_$1=yes],
- [case m4_bmatch([$2], [^[1-9][0-9]*$], $2, [$ac_cv_sizeof_]AS_TR_SH($2)) in
- when("1") rb_cv_type_$1="m4_if([$3], [], [signed ], [$3 ])char";;
- when("$ac_cv_sizeof_short") rb_cv_type_$1="m4_if([$3], [], [], [$3 ])short";;
- when("$ac_cv_sizeof_int") rb_cv_type_$1="m4_if([$3], [], [], [$3 ])int";;
- when("$ac_cv_sizeof_long") rb_cv_type_$1="m4_if([$3], [], [], [$3 ])long";;
- when("$ac_cv_sizeof_long_long") rb_cv_type_$1="m4_if([$3], [], [], [$3 ])long long";;
- when("$ac_cv_sizeof___int64") rb_cv_type_$1="m4_if([$3], [], [], [$3 ])__int64";;
- when(*) rb_cv_type_$1=no;;
- esac])])
-if test "${rb_cv_type_$1}" != no; then
- AC_DEFINE([HAVE_]AS_TR_CPP($1), 1)
- if test "${rb_cv_type_$1}" = yes; then
- m4_bmatch([$2], [^[1-9][0-9]*$], [AC_CHECK_SIZEOF([$1], 0, [AC_INCLUDES_DEFAULT([$4])])],
- [RUBY_CHECK_SIZEOF([$1], [$2], [], [AC_INCLUDES_DEFAULT([$4])])])
- else
- AC_DEFINE_UNQUOTED($1, [$rb_cv_type_$1])
- AC_DEFINE_UNQUOTED([SIZEOF_]AS_TR_CPP($1), [SIZEOF_]AS_TR_CPP([$rb_cv_type_$1]))
- fi
-fi
-])
-
-RUBY_DEFINT(int8_t, 1)
-RUBY_DEFINT(uint8_t, 1, unsigned)
-RUBY_DEFINT(int16_t, 2)
-RUBY_DEFINT(uint16_t, 2, unsigned)
-RUBY_DEFINT(int32_t, 4)
-RUBY_DEFINT(uint32_t, 4, unsigned)
-RUBY_DEFINT(int64_t, 8)
-RUBY_DEFINT(uint64_t, 8, unsigned)
-RUBY_DEFINT(int128_t, 16)
-RUBY_DEFINT(uint128_t, 16, unsigned)
-RUBY_DEFINT(intptr_t, void*)
-RUBY_DEFINT(uintptr_t, void*, unsigned)
-RUBY_DEFINT(ssize_t, size_t, [], [@%:@include <sys/types.h>]) dnl may differ from int, so not use AC_TYPE_SSIZE_T.
-
-AC_CACHE_CHECK(for stack end address, rb_cv_stack_end_address,
-[rb_cv_stack_end_address=no
-for addr in __libc_stack_end _SEND; do
- AC_TRY_LINK(
- [extern void *$addr;],
- [if (!$addr) return 1;],
- [rb_cv_stack_end_address="$addr"; break])
-done])
-if test $rb_cv_stack_end_address != no; then
- AC_DEFINE_UNQUOTED(STACK_END_ADDRESS, $rb_cv_stack_end_address)
-fi
dnl Checks for library functions.
AC_TYPE_GETGROUPS
AC_TYPE_SIGNAL
-case "${target_cpu}-${target_os}:${target_archs}" in
-when(powerpc-darwin*)
+case "${target_cpu}-${target_os}" in
+powerpc-darwin*)
AC_LIBSOURCES(alloca.c)
AC_SUBST([ALLOCA], [\${LIBOBJDIR}alloca.${ac_objext}])
AC_DEFINE(C_ALLOCA)
AC_DEFINE_UNQUOTED(alloca, alloca)
;;
-when(universal-darwin*:*ppc*)
- AC_LIBSOURCES(alloca.c)
- AC_SUBST([ALLOCA], [\${LIBOBJDIR}alloca.${ac_objext}])
- RUBY_DEFINE_IF([defined __powerpc__], C_ALLOCA, 1)
- RUBY_DEFINE_IF([defined __powerpc__], alloca, alloca)
- ;;
-when(*)
+*)
AC_FUNC_ALLOCA
;;
esac
AC_FUNC_MEMCMP
-
-# http://sources.redhat.com/ml/libc-hacker/2005-08/msg00008.html
-# Debian GNU/Linux Etch's libc6.1 2.3.6.ds1-13etch5 has this problem.
-# Debian GNU/Linux Lenny's libc6.1 2.7-10 has no problem.
-AC_CACHE_CHECK(for broken erfc of glibc-2.3.6 on IA64, rb_cv_broken_glibc_ia64_erfc,
- [AC_TRY_RUN([
-#include <math.h>
-int
-main()
-{
- erfc(10000.0);
- return 0;
-}
-],
- rb_cv_broken_glibc_ia64_erfc=no,
- rb_cv_broken_glibc_ia64_erfc=yes,
- rb_cv_broken_glibc_ia64_erfc=no)])
-case $rb_cv_broken_glibc_ia64_erfc in
- when(yes) ac_cv_func_erf=no;;
-esac
-
-AC_REPLACE_FUNCS(dup2 memmove strerror\
- strchr strstr crypt flock vsnprintf\
- isnan finite isinf hypot acosh erf tgamma lgamma_r cbrt \
- strlcpy strlcat)
-AC_CHECK_FUNCS(fmod killpg wait4 waitpid fork spawnv syscall chroot getcwd eaccess\
- truncate ftruncate chsize times utimes utimensat fcntl lockf lstat\
- link symlink readlink readdir_r fsync fdatasync\
- setitimer setruid seteuid setreuid setresuid setproctitle socketpair\
- setrgid setegid setregid setresgid issetugid pause lchown lchmod\
- getpgrp setpgrp getpgid setpgid initgroups getgroups setgroups\
- getpriority getrlimit setrlimit sysconf group_member\
- dlopen sigprocmask sigaction sigsetjmp _setjmp _longjmp snprintf\
- setsid telldir seekdir fchmod cosh sinh tanh log2 round signbit\
- setuid setgid daemon select_large_fdset setenv unsetenv\
- mktime timegm gmtime_r clock_gettime gettimeofday\
- pread sendfile shutdown sigaltstack)
+AC_FUNC_FSEEKO
+AC_CHECK_FUNCS(ftello)
+AC_REPLACE_FUNCS(dup2 memmove strcasecmp strncasecmp strerror strftime\
+ strchr strstr strtoul crypt flock vsnprintf\
+ isnan finite isinf hypot acosh erf)
+AC_CHECK_FUNCS(fmod killpg wait4 waitpid syscall chroot fsync getcwd eaccess\
+ truncate ftruncate chsize times utimes fcntl lockf lstat symlink link\
+ readlink setitimer setruid seteuid setreuid setresuid\
+ setproctitle setrgid setegid setregid setresgid issetugid pause\
+ lchown lchmod getpgrp setpgrp getpgid setpgid initgroups\
+ getgroups setgroups getpriority getrlimit setrlimit sysconf\
+ group_member dlopen sigprocmask\
+ sigaction sigsetjmp _setjmp _longjmp setsid telldir seekdir fchmod\
+ mktime timegm gettimeofday\
+ cosh sinh tanh round setuid setgid setenv unsetenv)
AC_CACHE_CHECK(for __builtin_setjmp, ac_cv_func___builtin_setjmp,
[AC_TRY_LINK([@%:@include <setjmp.h>
@@ -1134,16 +584,15 @@ AC_CACHE_CHECK(for __builtin_setjmp, ac_cv_func___builtin_setjmp,
test x$ac_cv_func__longjmp = xno && ac_cv_func__setjmp=no
AC_MSG_CHECKING(for setjmp type)
-AC_ARG_WITH(setjmp-type,
- AS_HELP_STRING([--with-setjmp-type],[select setjmp type]),
- [
+AC_ARG_WITH(setjmp-type,
+ [ --with-setjmp-type select setjmp type], [
case $withval in
- when(__builtin_setjmp) setjmp_prefix=__builtin_;;
- when(_setjmp) setjmp_prefix=_;;
- when(sigsetjmp) setjmp_prefix=sig;;
- when(setjmp) setjmp_prefix=;;
- when('') unset setjmp_prefix;;
- when(*) AC_MSG_ERROR(invalid setjmp type: $withval);;
+ __builtin_setjmp) setjmp_prefix=__builtin_;;
+ _setjmp) setjmp_prefix=_;;
+ sigsetjmp) setjmp_prefix=sig;;
+ setjmp) setjmp_prefix=;;
+ '') unset setjmp_prefix;;
+ *) AC_MSG_ERROR(invalid setjmp type: $withval);;
esac], [unset setjmp_prefix])
if test ${setjmp_prefix+set}; then
if test "${setjmp_prefix}" && eval test '$ac_cv_func_'${setjmp_prefix}setjmp = no; then
@@ -1155,9 +604,9 @@ elif test "$ac_cv_func__setjmp" = yes; then
setjmp_prefix=_
elif test "$ac_cv_func_sigsetjmp" = yes; then
case $target_os in
- when(solaris*|cygwin*)
+ solaris*|cygwin*)
setjmp_prefix=;;
- when(*)
+ *)
setjmp_prefix=sig;;
esac
else
@@ -1174,7 +623,7 @@ AC_DEFINE_UNQUOTED([RUBY_LONGJMP(env,val)], [${setjmp_prefix}longjmp(env,val)])
AC_DEFINE_UNQUOTED(RUBY_JMP_BUF, ${setjmp_sigmask+${setjmp_prefix}}jmp_buf)
AC_ARG_ENABLE(setreuid,
- AS_HELP_STRING([--enable-setreuid], [use setreuid()/setregid() according to need even if obsolete]),
+ [ --enable-setreuid use setreuid()/setregid() according to need even if obsolete.],
[use_setreuid=$enableval])
if test "$use_setreuid" = yes; then
AC_DEFINE(USE_SETREUID)
@@ -1192,15 +641,15 @@ fi
AC_CACHE_CHECK(for external int daylight, rb_cv_have_daylight,
[AC_TRY_LINK([#include <time.h>
int i;],
- [i = daylight;],
+ [i = daylight;],
rb_cv_have_daylight=yes,
rb_cv_have_daylight=no)])
if test "$rb_cv_have_daylight" = yes; then
AC_DEFINE(HAVE_DAYLIGHT)
fi
AC_DEFUN([RUBY_CHECK_VARTYPE], [dnl
-AC_CACHE_CHECK([for external $1], AS_TR_SH(rb_cv_var_$1),
- [AS_TR_SH(rb_cv_var_$1)=no
+AC_CACHE_CHECK([for external $1], rb_cv_var_$1,
+ [rb_cv_var_$1=no
AC_TRY_COMPILE([
#ifndef _XOPEN_SOURCE
#define _XOPEN_SOURCE 1
@@ -1219,24 +668,26 @@ $2
extern $t $1;
const volatile void *volatile t;],
[t = &(&$1)[0];],
- [AS_TR_SH(rb_cv_var_$1)=$t; break])
+ [rb_cv_var_$1=$t; break])
done])])
-if test "${AS_TR_SH(rb_cv_var_$1)}" != no; then
- AC_DEFINE(AS_TR_CPP(HAVE_VAR_$1))
- AC_DEFINE_UNQUOTED(AS_TR_CPP(TYPEOF_VAR_$1), ${AS_TR_SH(rb_cv_var_$1)})
+if test "[$rb_cv_var_]$1" != no; then
+ AC_DEFINE([HAVE_VAR_]m4_toupper($1))
+ AC_DEFINE_UNQUOTED([TYPEOF_VAR_]m4_toupper($1), $rb_cv_var_$1)
fi])
RUBY_CHECK_VARTYPE(timezone, [@%:@include <time.h>], [long int])
RUBY_CHECK_VARTYPE(altzone, [@%:@include <time.h>], [long int])
-AC_CHECK_FUNCS(timezone)
-if test "$ac_cv_func_timezone" = yes; then
- AC_CACHE_CHECK([whether timezone requires zero arguments], rb_cv_func_timezone_void,
- [AC_TRY_COMPILE([@%:@include <time.h>],
- [(void)timezone(0, 0);],
- [rb_cv_func_timezone_void=no],
- [rb_cv_func_timezone_void=yes])]
- )
- if test $rb_cv_func_timezone_void = yes; then
- AC_DEFINE(TIMEZONE_VOID)
+if test "$rb_cv_var_timezone" = no; then
+ AC_CHECK_FUNCS(timezone)
+ if test "$ac_cv_func_timezone" = yes; then
+ AC_CACHE_CHECK([whether timezone requires zero arguments], rb_cv_func_timezone_void,
+ [AC_TRY_COMPILE([@%:@include <time.h>],
+ [(void)timezone(0, 0);],
+ [rb_cv_func_timezone_void=no],
+ [rb_cv_func_timezone_void=yes])]
+ )
+ if test $rb_cv_func_timezone_void = yes; then
+ AC_DEFINE(TIMEZONE_VOID)
+ fi
fi
fi
@@ -1311,7 +762,7 @@ main()
fi
AC_FUNC_GETPGRP
-AC_FUNC_SETPGRP
+AC_FUNC_SETPGRP
AC_C_BIGENDIAN
AC_C_CONST
@@ -1335,9 +786,18 @@ if test x"$target_cpu" = xia64; then
fi
AC_CACHE_CHECK(whether right shift preserve sign bit, rb_cv_rshift_sign,
- [AC_COMPILE_IFELSE(AC_LANG_BOOL_COMPILE_TRY([], [(-1==(-1>>1))]),
+ [AC_TRY_RUN([
+int
+main()
+{
+ if (-1==(-1>>1))
+ return 0;
+ return 1;
+}
+],
rb_cv_rshift_sign=yes,
- rb_cv_rshift_sign=no)])
+ rb_cv_rshift_sign=no,
+ rb_cv_rshift_sign=yes)])
if test "$rb_cv_rshift_sign" = yes; then
AC_DEFINE(RSHIFT(x,y), ((x)>>(int)y))
else
@@ -1374,7 +834,6 @@ AC_CACHE_VAL(rb_cv_frptr,
__ptr dnl
bufpos dnl
_p dnl
- __bufpos dnl
; do
AC_TRY_COMPILE([#include <stdio.h>
],
@@ -1394,13 +853,12 @@ else
[for frend in dnl
_IO_read_end dnl
bufread dnl
- __bufread dnl
; do
AC_TRY_COMPILE([#include <stdio.h>
],
- [FILE *f = stdin; char buf[256]; f->$frend = buf;],
- rb_cv_frend="$frend"; break,
- rb_cv_frend="not found")
+ [FILE *f = stdin; char buf[256]; f->$frend = buf;],
+ rb_cv_frend="$frend"; break,
+ rb_cv_frend="not found")
done])
if test "$rb_cv_frend" = "not found"; then
AC_MSG_RESULT([not found])
@@ -1411,7 +869,80 @@ else
fi
fi
-RUBY_CHECK_SIZEOF([struct stat.st_ino], [long "long long"], [], [@%:@include <sys/stat.h>])
+AC_DEFUN([RUBY_CHECK_IO_NEED],
+[AC_CACHE_CHECK(whether need to [$1], [$2],
+ [AC_TRY_RUN([
+#include <stdio.h>
+#ifndef SEEK_SET
+#define SEEK_SET 0
+#endif
+#ifndef SEEK_CUR
+#define SEEK_CUR 1
+#endif
+#define before_seek(f) ]ifelse(index($2,flush_before_seek),-1,[fflush(f)],[(f,0)])[
+#define reset_rw(f) ]ifelse(index($2,seek_between_rw),-1,[do_seek(f,SEEK_CUR)],[(f,0)])[
+#define do_seek(f, w) (before_seek(f), fseek(f,0,w))
+
+char *fn = "conftest.dat";
+char *wombat = "wombat\n";
+char *koara = "koara\n";
+char *kangaroo = "kangaroo\n";
+
+int main()
+{
+ char buf[BUFSIZ];
+ FILE *f;
+ int r = 1;
+
+ if (!(f = fopen(fn, "w+"))) return 1;
+ fputs(wombat, f);
+ do_seek(f, SEEK_SET);
+ if (!fgets(buf, BUFSIZ, f) || strcmp(buf, wombat)) goto fail;
+ reset_rw(f);
+ fputs(koara, f);
+ fputs(kangaroo, f);
+ do_seek(f, SEEK_SET);
+ if (!fgets(buf, BUFSIZ, f) || strcmp(buf, wombat)) goto fail;
+ if (!fgets(buf, BUFSIZ, f) || strcmp(buf, koara)) goto fail;
+ if (!fgets(buf, BUFSIZ, f) || strcmp(buf, kangaroo)) goto fail;
+ do_seek(f, SEEK_SET);
+ if (!fgets(buf, BUFSIZ, f) || strcmp(buf, wombat)) goto fail;
+ reset_rw(f);
+ fputc('X', f);
+ reset_rw(f);
+ if (!fgets(buf, BUFSIZ, f) || strcmp(buf, koara+1)) goto fail;
+ if (!fgets(buf, BUFSIZ, f) || strcmp(buf, kangaroo)) goto fail;
+ do_seek(f, SEEK_SET);
+ if (!fgets(buf, BUFSIZ, f) || strcmp(buf, wombat)) goto fail;
+ if (!fgets(buf, BUFSIZ, f) || buf[0] != 'X' || strcmp(buf+1, koara+1)) goto fail;
+ if (!fgets(buf, BUFSIZ, f) || strcmp(buf, kangaroo)) goto fail;
+ r = 0;
+ fail:
+ fclose(f);
+ unlink(fn);
+ return r;
+}
+], [$2]=no, [$2]=yes, [$2]=[$3])])])
+RUBY_CHECK_IO_NEED(seek between R/W, rb_cv_need_io_seek_between_rw, yes)
+if test "$rb_cv_need_io_seek_between_rw" = yes; then
+ AC_DEFINE(NEED_IO_SEEK_BETWEEN_RW, 1)
+fi
+dnl RUBY_CHECK_IO_NEED(flush before seek, rb_cv_need_io_flush_before_seek, no)
+dnl if test "$rb_cv_need_io_flush_before_seek" = yes; then
+dnl AC_DEFINE(NEED_IO_FLUSH_BEFORE_SEEK, 1)
+dnl fi
+
+AC_CACHE_CHECK([whether st_ino is huge], rb_cv_huge_st_ino,
+[AC_COMPILE_IFELSE([AC_LANG_BOOL_COMPILE_TRY([
+#include <sys/stat.h>
+struct stat test_stat;
+], [sizeof(test_stat.st_ino)>sizeof(long)])],
+rb_cv_huge_st_ino=yes,
+rb_cv_huge_st_ino=no)
+])
+if test $rb_cv_huge_st_ino = yes; then
+ AC_DEFINE(HUGE_ST_INO)
+fi
if test "$ac_cv_func_sysconf" = yes; then
AC_DEFUN([RUBY_CHECK_SYSCONF], [dnl
@@ -1430,8 +961,8 @@ if test "$ac_cv_func_sysconf" = yes; then
fi
case "$target_cpu" in
-when(m68*|i?86|ia64|sparc*|alpha*) rb_cv_stack_grow_dir=-1;;
-when(hppa*) rb_cv_stack_grow_dir=+1;;
+m68*|i?86|ia64|sparc*|alpha*) rb_cv_stack_grow_dir=-1;;
+hppa*) rb_cv_stack_grow_dir=+1;;
esac
AC_CACHE_CHECK(stack growing direction, rb_cv_stack_grow_dir,
[AC_TRY_RUN([
@@ -1455,8 +986,8 @@ int main()
AC_DEFINE_UNQUOTED(STACK_GROW_DIRECTION, $rb_cv_stack_grow_dir)
if test x"$enable_pthread" = xyes; then
- for pthread_lib in thr pthread pthreads c c_r root; do
- AC_CHECK_LIB($pthread_lib, pthread_kill,
+ for pthread_lib in pthread pthreads c c_r; do
+ AC_CHECK_LIB($pthread_lib, pthread_kill,
rb_with_pthread=yes, rb_with_pthread=no)
if test "$rb_with_pthread" = "yes"; then break; fi
done
@@ -1465,21 +996,19 @@ if test x"$enable_pthread" = xyes; then
AC_DEFINE(_THREAD_SAFE)
AC_DEFINE(HAVE_LIBPTHREAD)
case $pthread_lib in
- when(c)
- ;;
- when(root)
+ c)
;;
- when(c_r)
+ c_r)
MAINLIBS="-pthread $MAINLIBS"
;;
- when(*)
- LIBS="-l$pthread_lib $LIBS"
+ *)
+ LIBS="-l$pthread_lib $LIBS"
;;
esac
else
AC_MSG_WARN("Don't know how to find pthread library on your system -- thread support disabled")
fi
- AC_CHECK_FUNCS(nanosleep sched_yield pthread_attr_setinheritsched)
+ AC_CHECK_FUNCS(nanosleep)
if test x"$ac_cv_func_nanosleep" = xno; then
AC_CHECK_LIB(rt, nanosleep)
if test x"$ac_cv_lib_rt_nanosleep" = xyes; then
@@ -1493,113 +1022,56 @@ if test x"$ac_cv_header_ucontext_h" = xyes; then
fi
fi
-if test "$ac_cv_func_fork" = "yes" -a "$rb_with_pthread" = "yes"; then
- AC_CACHE_CHECK([if fork works with pthread], rb_cv_fork_with_pthread,
- [AC_TRY_RUN([
-#include <stdlib.h>
-#include <unistd.h>
-#include <pthread.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <signal.h>
-#ifndef EXIT_SUCCESS
-#define EXIT_SUCCESS 0
-#endif
-#ifndef EXIT_FAILURE
-#define EXIT_FAILURE 1
-#endif
+dnl default value for $KANJI
+DEFAULT_KCODE="KCODE_NONE"
-void *
-thread_func(void *dmy)
-{
- return dmy;
-}
-
-int
-use_threads(void)
-{
- pthread_t tid;
- if (pthread_create(&tid, 0, thread_func, 0) != 0) {
- return -1;
- }
- if (pthread_join(tid, 0) != 0) {
- return -1;
- }
- return 0;
-}
-
-int
-main(int argc, char *argv[])
-{
- pid_t pid;
- if (use_threads()) return EXIT_FAILURE;
- pid = fork();
-
- if (pid) {
- int loc;
- sleep(1);
- if (waitpid(pid, &loc, WNOHANG) == 0) {
- kill(pid, SIGKILL);
- return EXIT_FAILURE;
- }
- if (!WIFEXITED(loc) || WEXITSTATUS(loc) != EXIT_SUCCESS)
- return EXIT_FAILURE;
- }
- else {
- if (use_threads()) return EXIT_FAILURE;
- }
-
- return EXIT_SUCCESS;
-}],
- rb_cv_fork_with_pthread=yes,
- rb_cv_fork_with_pthread=no,
- rb_cv_fork_with_pthread=yes)])
- test x$rb_cv_fork_with_pthread = xyes || AC_DEFINE(CANNOT_FORK_WITH_PTHREAD)
-fi
-
-AC_CHECK_FUNCS(backtrace)
-
-AC_ARG_WITH(valgrind,
- AS_HELP_STRING([--with-valgrind],[enable valgrind memcheck support]),
- [AC_CHECK_HEADERS(valgrind/memcheck.h)])
-
-dnl }
-dnl runtime section {
+AC_ARG_WITH(default-kcode,
+ [ --with-default-kcode=CODE specify default value for \$KCODE (utf8|euc|sjis|none)],
+ [case $withval in
+ utf8) DEFAULT_KCODE="KCODE_UTF8";;
+ euc) DEFAULT_KCODE="KCODE_EUC";;
+ sjis) DEFAULT_KCODE="KCODE_SJIS";;
+ none) DEFAULT_KCODE="KCODE_NONE";;
+ *) AC_MSG_WARN($withval is not valid kcode; ignored);;
+ esac])
+AC_DEFINE_UNQUOTED(DEFAULT_KCODE, $DEFAULT_KCODE)
dnl wheather use dln_a_out or not
-AC_ARG_WITH(dln-a-out,
- AS_HELP_STRING([--with-dln-a-out], [use dln_a_out if possible]),
- [
+AC_ARG_WITH(dln-a-out,
+ [ --with-dln-a-out use dln_a_out if possible], [
case $withval in
- when(yes)
- if test "$enable_shared" = yes; then
- AC_MSG_ERROR(dln_a_out can not make shared library)
- fi
- with_dln_a_out=yes;;
- when(*)
- with_dln_a_out=no;;
+ yes) with_dln_a_out=yes;;
+ *) with_dln_a_out=no;;
esac], [with_dln_a_out=no])
AC_CACHE_CHECK(whether ELF binaries are produced, rb_cv_binary_elf,
-[AC_TRY_LINK([],[], [
-case "`head -1 conftest$EXEEXT | cat -e`" in
-when('^?ELF'*)
- rb_cv_binary_elf=yes;;
-when(*)
- rb_cv_binary_elf=no;;
-esac],
-rb_cv_binary_elf=no)])
+[AC_TRY_RUN([
+/* Test for whether ELF binaries are produced */
+#include <fcntl.h>
+#include <stdlib.h>
+main() {
+ char buffer[4];
+ int i=open("conftest",O_RDONLY);
+ if(i==-1)
+ exit(1); /* fail */
+ if(read(i,&buffer[0],4)<4)
+ exit(1); /* fail */
+ if(buffer[0] != 127 || buffer[1] != 'E' ||
+ buffer[2] != 'L' || buffer[3] != 'F')
+ exit(1); /* fail */
+ exit(0); /* succeed (yes, it's ELF) */
+}
+],
+rb_cv_binary_elf=yes,
+rb_cv_binary_elf=no,
+rb_cv_binary_elf=yes)])
if test "$rb_cv_binary_elf" = yes; then
AC_DEFINE(USE_ELF)
- if test "$with_dln_a_out" = yes; then
- AC_MSG_ERROR(dln_a_out does not work with ELF)
- fi
fi
case "$target_os" in
-when(linux* | gnu* | k*bsd*-gnu | bsdi* | kopensolaris*-gnu)
+linux* | gnu* | k*bsd*-gnu | bsdi*)
if test "$rb_cv_binary_elf" = no; then
with_dln_a_out=yes
else
@@ -1614,12 +1086,12 @@ AC_SUBST(ARCH_FLAG)dnl
AC_SUBST(STATIC)dnl
AC_SUBST(CCDLFLAGS)dnl
AC_SUBST(LDSHARED)dnl
-AC_SUBST(LDSHAREDXX)dnl
AC_SUBST(DLEXT)dnl
AC_SUBST(DLEXT2)dnl
AC_SUBST(LIBEXT)dnl
STATIC=
+: ${LIBPATHFLAG=' -L%s'}
: ${PATHFLAG=''}
if test "$with_dln_a_out" != yes; then
@@ -1627,39 +1099,34 @@ if test "$with_dln_a_out" != yes; then
AC_MSG_CHECKING(whether OS depend dynamic link works)
if test "$GCC" = yes; then
case "$target_os" in
- when(nextstep*|openstep*|rhapsody*|darwin*)
- # The -fno-common is needed if we wish to embed the Ruby interpreter
- # into a plugin module of some project (as opposed to embedding it
- # within the project's application). The -I/usr/local/include is
- # needed because CPP as discovered by configure (cc -E -traditional)
- # fails to consult /usr/local/include by default. This causes
- # mkmf.rb's have_header() to fail if the desired resource happens to be
- # installed in the /usr/local tree.
- RUBY_APPEND_OPTION(CCDLFLAGS, -fno-common);;
- when(human*|bsdi*|beos*|haiku*|cygwin*|mingw*|aix*|interix*) ;;
- when(*)
- RUBY_APPEND_OPTION(CCDLFLAGS, -fPIC);;
+ nextstep*) CCDLFLAGS="$CCDLFLAGS -fno-common";;
+ openstep*) CCDLFLAGS="$CCDLFLAGS -fno-common";;
+ rhapsody*) CCDLFLAGS="$CCDLFLAGS -fno-common";;
+ darwin*) CCDLFLAGS="$CCDLFLAGS -fno-common";;
+ human*|bsdi*|beos*|cygwin*|mingw*|aix*|interix*) ;;
+ *) CCDLFLAGS="$CCDLFLAGS -fPIC";;
esac
else
case "$target_os" in
- when(hpux*) CCDLFLAGS="$CCDLFLAGS +Z";;
- when(solaris*|irix*) CCDLFLAGS="$CCDLFLAGS -KPIC" ;;
- when(sunos*) CCDLFLAGS="$CCDLFLAGS -PIC" ;;
- when(esix*|uxpds*) CCDLFLAGS="$CCDLFLAGS -KPIC" ;;
- when(*) : ${CCDLFLAGS=""} ;;
+ hpux*) CCDLFLAGS="$CCDLFLAGS +Z";;
+ solaris*|irix*) CCDLFLAGS="$CCDLFLAGS -KPIC" ;;
+ sunos*) CCDLFLAGS="$CCDLFLAGS -PIC" ;;
+ esix*|uxpds*) CCDLFLAGS="$CCDLFLAGS -KPIC" ;;
+ *) : ${CCDLFLAGS=""} ;;
esac
fi
AC_ARG_ENABLE(rpath,
- AS_HELP_STRING([--disable-rpath], [embed run path into extension libraries]),
+ [ --disable-rpath embed run path into extension libraries.],
[enable_rpath=$enableval], [enable_rpath="$rb_cv_binary_elf"])
if test "$enable_rpath" = yes; then
+ LIBPATHFLAG=" -L%1\$-s"
RPATHFLAG=" ${linker_flag}-R%1\$-s"
fi
case "$target_os" in
- when(hpux*) DLDFLAGS="$DLDFLAGS -E"
+ hpux*) DLDFLAGS="$DLDFLAGS -E"
: ${LDSHARED='ld -b'}
XLDFLAGS="$XLDFLAGS -Wl,-E"
: ${LIBPATHENV=SHLIB_PATH}
@@ -1667,43 +1134,42 @@ if test "$with_dln_a_out" != yes; then
RPATHFLAG=' +b %1$-s'
fi
rb_cv_dlopen=yes;;
- when(solaris*) if test "$GCC" = yes; then
- : ${LDSHARED='$(CC) -shared'}
- if test "$rb_cv_prog_gnu_ld" = yes; then
- LDFLAGS="$LDFLAGS -Wl,-E"
- fi
+ solaris*) if test "$GCC" = yes; then
+ : ${LDSHARED='$(CC) -shared'}
+ if test "$rb_cv_prog_gnu_ld" = yes; then
+ LDFLAGS="$LDFLAGS -Wl,-E"
+ fi
else
- : ${LDSHARED='ld -G'}
+ : ${LDSHARED='ld -G'}
fi
rb_cv_dlopen=yes;;
- when(sunos*) : ${LDSHARED='ld -assert nodefinitions'}
+ sunos*) : ${LDSHARED='ld -assert nodefinitions'}
rb_cv_dlopen=yes;;
- when(irix*) : ${LDSHARED='ld -shared'}
+ irix*) : ${LDSHARED='ld -shared'}
rb_cv_dlopen=yes;;
- when(sysv4*) : ${LDSHARED='ld -G'}
+ sysv4*) : ${LDSHARED='ld -G'}
rb_cv_dlopen=yes;;
- when(nto-qnx*) : ${LDSHARED="qcc -shared"}
+ nto-qnx*) : ${LDSHARED="qcc -shared"}
rb_cv_dlopen=yes ;;
- when(esix*|uxpds*) : ${LDSHARED="ld -G"}
+ esix*|uxpds*) : ${LDSHARED="ld -G"}
rb_cv_dlopen=yes ;;
- when(osf*) : ${LDSHARED="ld -shared -expect_unresolved \"*\""}
+ osf*) : ${LDSHARED="ld -shared -expect_unresolved \"*\""}
rb_cv_dlopen=yes ;;
- when(bsdi3*) case "$CC" in
- when(*shlicc*) : ${LDSHARED="$CC -r"}
+ bsdi3*) case "$CC" in
+ *shlicc*) : ${LDSHARED="$CC -r"}
rb_cv_dlopen=yes ;;
esac ;;
- when(linux* | gnu* | k*bsd*-gnu | netbsd* | bsdi* | kopensolaris*-gnu)
+ linux* | gnu* | k*bsd*-gnu | netbsd* | bsdi*)
: ${LDSHARED='${CC} -shared'}
if test "$rb_cv_binary_elf" = yes; then
LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
fi
rb_cv_dlopen=yes ;;
- when(interix*) : ${LDSHARED="$CC -shared"}
+ interix*) : ${LDSHARED="$CC -shared"}
XLDFLAGS="$XLDFLAGS -Wl,-E"
LIBPATHFLAG=" -L%1\$-s"
rb_cv_dlopen=yes ;;
- when(freebsd*|dragonfly*)
- : ${LDSHARED="$CC -shared"}
+ freebsd*|dragonfly*) : ${LDSHARED="$CC -shared"}
if test "$rb_cv_binary_elf" = yes; then
LDFLAGS="$LDFLAGS -rdynamic"
DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$(.TARGET)'
@@ -1711,34 +1177,25 @@ if test "$with_dln_a_out" != yes; then
test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED="ld -Bshareable"
fi
rb_cv_dlopen=yes ;;
- when(openbsd*) : ${LDSHARED="\$(CC) -shared ${CCDLFLAGS}"}
+ openbsd*) : ${LDSHARED="\$(CC) -shared ${CCDLFLAGS}"}
if test "$rb_cv_binary_elf" = yes; then
LDFLAGS="$LDFLAGS -Wl,-E"
fi
rb_cv_dlopen=yes ;;
- when(nextstep*) : ${LDSHARED='cc -r -nostdlib'}
+ nextstep*) : ${LDSHARED='cc -r -nostdlib'}
LDFLAGS="$LDFLAGS -u libsys_s"
rb_cv_dlopen=yes ;;
- when(openstep*) : ${LDSHARED='cc -dynamic -bundle -undefined suppress'}
+ openstep*) : ${LDSHARED='cc -dynamic -bundle -undefined suppress'}
: ${LDFLAGS=""}
rb_cv_dlopen=yes ;;
- when(rhapsody*) : ${LDSHARED='cc -dynamic -bundle -undefined suppress'}
+ rhapsody*) : ${LDSHARED='cc -dynamic -bundle -undefined suppress'}
: ${LDFLAGS=""}
rb_cv_dlopen=yes ;;
- when(darwin*) : ${LDSHARED='$(CC) -dynamic -bundle'}
- : ${DLDFLAGS="${linker_flag}-undefined${linker_flag:+,}dynamic_lookup ${linker_flag}-multiply_defined${linker_flag:+,}suppress ${linker_flag}-flat_namespace"}
+ darwin*) : ${LDSHARED='cc -dynamic -bundle -undefined suppress -flat_namespace'}
: ${LDFLAGS=""}
: ${LIBPATHENV=DYLD_LIBRARY_PATH}
- # /usr/local/include is always searched for
- # some reason, but /usr/local/lib is not.
- hdr=`find /usr/local/include -name \*.h -type f | sed 's:^/usr/local/include/::;q'`
- if test -n "$hdr" && $CC -E -include "$hdr" -xc /dev/null | fgrep -q "$hdr"; then
- $CC -print-search-dirs | grep -q '^libraries:.*:/usr/local/lib/*' ||
- echo " $LDFLAGS " | grep -q ' -L */usr/local/lib/* ' ||
- LDFLAGS="${LDFLAGS:+$LDFLAGS }-L/usr/local/lib"
- fi
rb_cv_dlopen=yes ;;
- when(aix*) if test "$GCC" = yes; then
+ aix*) if test "$GCC" = yes; then
: ${LDSHARED='$(CC) -shared'}
else
: ${LDSHARED='$(CC)'}
@@ -1746,85 +1203,46 @@ if test "$with_dln_a_out" != yes; then
LDSHARED="$LDSHARED ${linker_flag}-G"
DLDFLAGS='-eInit_$(TARGET)'
XLDFLAGS="${linker_flag}-bE:ruby.imp ${linker_flag}-brtl"
- XLDFLAGS="$XLDFLAGS ${linker_flag}-blibpath:${prefix}/lib:${LIBPATH:-/usr/lib:/lib}"
- : ${ARCHFILE="ruby.imp"}
+ : ${ARCHFILE="ruby.imp"}
TRY_LINK='$(CC) $(LDFLAGS) -oconftest $(INCFLAGS) -I$(hdrdir) $(CPPFLAGS)'
TRY_LINK="$TRY_LINK"' $(CFLAGS) $(src) $(LIBPATH) $(LOCAL_LIBS) $(LIBS)'
- : ${LIBPATHENV=SHLIB_PATH}
- RPATHFLAG=" ${linker_flag}-blibpath:%1\$-s"
- rb_cv_dlopen=yes ;;
- when(human*) : ${DLDFLAGS=''}
+ : ${LIBPATHENV=SHLIB_PATH}
+ rb_cv_dlopen=yes ;;
+ human*) : ${DLDFLAGS=''}
: ${LDSHARED=''}
: ${LDFLAGS=''}
: ${LINK_SO='ar cru $@ $(OBJS)'}
rb_cv_dlopen=yes ;;
- when(beos*) case "$target_cpu" in
- when(powerpc*)
- : ${LDSHARED="ld -xms"}
- DLDFLAGS="$DLDFLAGS "'-export Init_$(TARGET) -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o'
- LDFLAGS="$LDFLAGS -L/boot/home/config/lib -lbe -lroot"
- ;;
- when(i586*)
- : ${LDSHARED="ld -shared"}
- DLDFLAGS="$DLDFLAGS -L/boot/develop/lib/x86 -L/boot/home/config/lib \$(topdir)/_APP_ -lbe -lroot"
- LDFLAGS="$LDFLAGS -L/boot/develop/lib/x86 -L/boot/home/config/lib -lbe -lroot"
- ;;
- esac
- : ${LIBPATHENV=LIBRARY_PATH}
- rb_cv_dlopen=yes ;;
- when(haiku*) case "$target_cpu" in
- when(powerpc*)
+ beos*) case "$target_cpu" in
+ powerpc*)
: ${LDSHARED="ld -xms"}
DLDFLAGS="$DLDFLAGS "'-export Init_$(TARGET) -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o'
;;
- when(i586*)
+ i586*)
: ${LDSHARED="ld -shared"}
DLDFLAGS="$DLDFLAGS -L/boot/develop/lib/x86 -lbe -lroot"
;;
esac
: ${LIBPATHENV=LIBRARY_PATH}
rb_cv_dlopen=yes ;;
- when(nto-qnx*) DLDFLAGS="$DLDFLAGS -L/lib -L/usr/lib -L/usr/local/lib"
+ nto-qnx*) DLDFLAGS="$DLDFLAGS -L/lib -L/usr/lib -L/usr/local/lib"
: ${LDSHARED='ld -Bshareable -x'}
LDFLAGS="$LDFLAGS -L/lib -L/usr/lib -L/usr/local/lib"
rb_cv_dlopen=yes;;
- when(cygwin*|mingw*)
- : ${LDSHARED="${CC} -shared "'$(if $(filter-out -g -g0,$(debugflags)),,-s)'}
- XLDFLAGS="$XLDFLAGS -Wl,--stack,0x00200000,--enable-auto-import"
- DLDFLAGS="${DLDFLAGS} -Wl,--enable-auto-image-base,--enable-auto-import"
+ cygwin*|mingw*) : ${LDSHARED="${CC} -shared -s"}
+ XLDFLAGS="$XLDFLAGS -Wl,--stack,0x02000000"
+ DLDFLAGS="${DLDFLAGS} -Wl,--enable-auto-image-base,--enable-auto-import,--export-all"
: ${LIBPATHENV=""}
rb_cv_dlopen=yes ;;
- when(hiuxmpp) : ${LDSHARED='ld -r'} ;;
- when(atheos*) : ${LDSHARED="$CC -shared"}
+ hiuxmpp) : ${LDSHARED='ld -r'} ;;
+ atheos*) : ${LDSHARED="$CC -shared"}
rb_cv_dlopen=yes ;;
- when(os2-emx*) LDFLAGS="$LDFLAGS -Zomf"
+ os2-emx*) LDFLAGS="$LDFLAGS -Zbsd-signals"
;;
- when(*) : ${LDSHARED='ld'} ;;
+ *) : ${LDSHARED='ld'} ;;
esac
AC_MSG_RESULT($rb_cv_dlopen)
fi
-if test "${LDSHAREDXX}" = ""; then
- case "${LDSHARED}" in
- when(*'$(CC)'*)
- LDSHAREDXX=`echo "${LDSHARED}" | sed 's/\$(CC)/$(CXX)/'`
- ;;
- when(*'${CC}'*)
- LDSHAREDXX=`echo "${LDSHARED}" | sed 's/\${CC}/${CXX}/'`
- ;;
- when(*$CC*)
- LDSHAREDXX=`echo "${LDSHARED}" | sed "s|$CC|$CXX|"`
- ;;
- when(ld" "*)
- ;;
- esac
-fi
-case ${RPATHFLAG} in
-when(*'%1$'*)
- : ${LIBPATHFLAG=' -L%1$-s'};;
-when(*)
- : ${LIBPATHFLAG=' -L%s'};;
-esac
-
AC_SUBST(LINK_SO)
AC_SUBST(LIBPATHFLAG)
AC_SUBST(RPATHFLAG)
@@ -1840,7 +1258,7 @@ if test "$ac_cv_header_a_out_h" = yes; then
#define USE_DLN_A_OUT
#include "dln.c"
],
- [],
+ [],
rb_cv_dln_a_out=yes,
rb_cv_dln_a_out=no)])
if test "$rb_cv_dln_a_out" = yes; then
@@ -1860,36 +1278,21 @@ if test "$dln_a_out_works" = yes; then
CCDLFLAGS=
else
case "$target_os" in
- when(hpux*)
- DLEXT=sl;;
- when(nextstep*|openstep*|rhapsody*|darwin*)
- DLEXT=bundle;;
- when(os2-emx*)
- LOAD_RELATIVE=1
- DLEXT=dll;;
- when(cygwin*|mingw*|*djgpp*)
- LOAD_RELATIVE=1
- DLEXT=so;;
- when(*)
- DLEXT=so;;
+ hpux*) DLEXT=sl;;
+ nextstep*|openstep*|rhapsody*|darwin*)
+ DLEXT=bundle;;
+ os2-emx*) DLEXT=dll;;
+ cygwin*|mingw*)
+ DLEXT=so DLEXT2=dll;;
+ *) DLEXT=so;;
esac
fi
-if test "$rb_cv_dlopen:$load_relative" = yes:yes; then
- AC_CHECK_FUNCS(dladdr)
- if test "$ac_cv_func_dladdr" = yes; then
- LOAD_RELATIVE=1
- else
- unset load_relative
- fi
-fi
-
len=2 # .rb
n=`expr "$DLEXT" : '.*'`; test "$n" -gt "$len" && len=$n
n=`expr "$DLEXT2" : '.*'`; test "$n" -gt "$len" && len=$n
AC_DEFINE_UNQUOTED(DLEXT_MAXLEN, `expr $len + 1`)
test ".$DLEXT" = "." || AC_DEFINE_UNQUOTED(DLEXT, ".$DLEXT")
test ".$DLEXT2" = "." || AC_DEFINE_UNQUOTED(DLEXT2, ".$DLEXT2")
-AC_SUBST(DLEXT)
AC_SUBST(STRIP)dnl
if test "$with_dln_a_out" = yes; then
@@ -1899,35 +1302,86 @@ else
fi
case "$target_os" in
- when(linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | gnu* | k*bsd*-gnu)
STRIP='strip -S -x';;
- when(nextstep* | openstep* | rhapsody* | darwin*)
+ nextstep*)
+ STRIP='strip -A -n';;
+ openstep*)
+ STRIP='strip -A -n';;
+ rhapsody*)
+ STRIP='strip -A -n';;
+ darwin*)
STRIP='strip -A -n';;
esac
EXTSTATIC=
AC_SUBST(EXTSTATIC)dnl
AC_ARG_WITH(static-linked-ext,
- AS_HELP_STRING([--with-static-linked-ext], [link external modules statically]),
+ [ --with-static-linked-ext link external modules statically],
[case $withval in
- when(yes)
- STATIC=
- EXTSTATIC=static;;
- when(*) ;;
+ yes) STATIC=
+ EXTSTATIC=static;;
+ *) ;;
esac])
case "$target_os" in
- when(human*)
+ human*)
+ AC_CHECK_LIB(signal, _harderr)
+ AC_CHECK_LIB(hmem, hmemset)
+ AC_CHECK_FUNCS(select)
+ AC_CACHE_CHECK(whether PD libc _dtos18 fail to convert big number,
+ rb_cv_missing__dtos18,
+ [AC_TRY_RUN(
+changequote(<<, >>)dnl
+<<
+#include <stdio.h>
+main ()
+{
+ char buf[256];
+ sprintf (buf, "%g", 1e+300);
+ exit (strcmp (buf, "1e+300") ? 0 : 1);
+}
+>>,
+changequote([, ])dnl
+rb_cv_missing__dtos18=yes, rb_cv_missing__dtos18=no, rb_cv_missing__dtos18=no)])
+ if test "$rb_cv_missing__dtos18" = yes; then
+ AC_DEFINE(MISSING__DTOS18)
+ fi
+ AC_CACHE_CHECK(whether PD libc fconvert fail to round,
+ rb_cv_missing_fconvert,
+ [AC_TRY_RUN(
+changequote(<<, >>)dnl
+<<
+#include <stdio.h>
+#include <math.h>
+main ()
+{
+ char buf[256];
+ sprintf (buf, "%f", log(exp(1.0)));
+ exit (strcmp (buf, "1.000000") ? 0 : 1);
+}
+>>,
+changequote([, ])dnl
+rb_cv_missing_fconvert=yes, rb_cv_missing_fconvert=no, rb_cv_missing_fconvert=no)])
+ if test "$rb_cv_missing_fconvert" = yes; then
+ AC_DEFINE(MISSING_FCONVERT)
+ fi
+ AC_LIBOBJ([x68.o])
+ CFLAGS="$CFLAGS -fansi-only"
+ XCFLAGS="$XCFLAGS -cc1-stack=262144 -cpp-stack=2694144"
+ EXEEXT=.x
+ OBJEXT=o
setup=Setup.x68
;;
dnl OS/2 environment w/ Autoconf 2.1x for EMX
- when(os2-emx)
+ os2-emx)
+ AC_LIBOBJ([os2])
setup=Setup.emx
;;
- when(*djgpp*)
+ *djgpp*)
setup=Setup.dj
;;
- when(*)
+ *)
setup=Setup
;;
esac
@@ -1938,23 +1392,24 @@ if test "$prefix" = NONE; then
prefix=$ac_default_prefix
fi
+#if test "$fat_binary" != no ; then
+# CFLAGS="$CFLAGS $ARCH_FLAG"
+#fi
+
if test x"$cross_compiling" = xyes; then
- test x"$MINIRUBY" = x && MINIRUBY="${RUBY-ruby} -I`pwd` "-r'$(arch)-fake'
- PREP='$(arch)-fake.rb'
+ test x"$MINIRUBY" = x && MINIRUBY="${RUBY-ruby} -I`pwd` -rfake"
+ PREP=fake.rb
RUNRUBY='$(MINIRUBY) -I`cd $(srcdir)/lib; pwd`'
- TEST_RUNNABLE=no
else
MINIRUBY='./miniruby$(EXEEXT) -I$(srcdir)/lib'
MINIRUBY="$MINIRUBY"' -I$(EXTOUT)/common -I./- -r$(srcdir)/ext/purelib.rb'
PREP='miniruby$(EXEEXT)'
- RUNRUBY='$(MINIRUBY) $(srcdir)/tool/runruby.rb --extout=$(EXTOUT)'
- TEST_RUNNABLE=yes
+ RUNRUBY='$(MINIRUBY) $(srcdir)/runruby.rb --extout=$(EXTOUT)'
fi
-AC_SUBST(TEST_RUNNABLE)
AC_SUBST(MINIRUBY)
AC_SUBST(PREP)
AC_SUBST(RUNRUBY)
-AC_SUBST(EXTOUT, [${EXTOUT=.ext}])
+AC_SUBST(EXTOUT, [${EXTOUT-.ext}])
FIRSTMAKEFILE=""
LIBRUBY_A='lib$(RUBY_SO_NAME)-static.a'
@@ -1964,18 +1419,15 @@ LIBRUBYARG='$(LIBRUBYARG_STATIC)'
SOLIBS=
case "$target_os" in
- when(cygwin*|mingw*|beos*|haiku*|openstep*|nextstep*|rhapsody*|darwin*|os2-emx*)
+ cygwin*|mingw*|beos*|openstep*|nextstep*|rhapsody*|darwin*|os2-emx*)
: ${DLDLIBS=""}
;;
- when(*)
+ *)
DLDLIBS="$DLDLIBS -lc"
;;
esac
-AC_ARG_WITH(soname,
- AS_HELP_STRING([--with-soname=SONAME], [base name of shared library]),
- [RUBY_SO_NAME=$withval], [RUBY_SO_NAME='$(RUBY_BASE_NAME)'])
-
+RUBY_SO_NAME='$(RUBY_INSTALL_NAME)'
LIBRUBY_LDSHARED=$LDSHARED
LIBRUBY_DLDFLAGS=$DLDFLAGS
LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR).$(TEENY)'
@@ -1983,26 +1435,26 @@ LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so'
ENABLE_SHARED=no
AC_ARG_ENABLE(shared,
- AS_HELP_STRING([--enable-shared], [build a shared library for Ruby]),
+ [ --enable-shared build a shared library for Ruby. ],
[enable_shared=$enableval])
-LIBRUBYARG_SHARED='-l$(RUBY_SO_NAME)'
if test "$enable_shared" = 'yes'; then
LIBRUBY='$(LIBRUBY_SO)'
+ LIBRUBYARG_SHARED='-l$(RUBY_SO_NAME)'
LIBRUBYARG='$(LIBRUBYARG_SHARED)'
- test -z "$CCDLFLAGS" || CFLAGS="$CFLAGS $CCDLFLAGS"
+ CFLAGS="$CFLAGS $CCDLFLAGS"
ENABLE_SHARED=yes
if test "$rb_cv_binary_elf" = yes; then
SOLIBS='$(LIBS)'
fi
case "$target_os" in
- when(sunos4*)
+ sunos4*)
LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so'
;;
- when(linux* | gnu* | k*bsd*-gnu | atheos* | kopensolaris*-gnu)
+ linux* | gnu* | k*bsd*-gnu | atheos*)
LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)'
LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so'
;;
- when(freebsd*|dragonfly*)
+ freebsd*|dragonfly*)
SOLIBS='$(LIBS)'
LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)'
if test "$rb_cv_binary_elf" != "yes" ; then
@@ -2010,7 +1462,7 @@ if test "$enable_shared" = 'yes'; then
LIBRUBY_ALIASES=''
fi
;;
- when(netbsd*)
+ netbsd*)
SOLIBS='$(LIBS)'
LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)'
LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)'
@@ -2019,12 +1471,12 @@ if test "$enable_shared" = 'yes'; then
else # a.out platforms
LIBRUBY_ALIASES=""
fi
- ;;
- when(openbsd*)
+ ;;
+ openbsd*)
SOLIBS='$(LIBS)'
LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).so.$(MAJOR).'`expr ${MINOR} \* 10 + ${TEENY}`
;;
- when(solaris*)
+ solaris*)
SOLIBS='$(LIBS)'
LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)'
LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR).$(TEENY) lib$(RUBY_SO_NAME).so'
@@ -2032,111 +1484,94 @@ if test "$enable_shared" = 'yes'; then
LIBRUBY_DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(@F)'
fi
XLDFLAGS="$XLDFLAGS "'-R${libdir}'
- ;;
- when(hpux*)
+ ;;
+ hpux*)
XLDFLAGS="$XLDFLAGS "'-Wl,+s,+b,$(libdir)'
LIBRUBY_SO='lib$(RUBY_SO_NAME).sl.$(MAJOR).$(MINOR).$(TEENY)'
LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).sl.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).sl'
;;
- when(aix*)
+ aix*)
LIBRUBY_DLDFLAGS="${linker_flag}-bnoentry $XLDFLAGS"
LIBRUBYARG_SHARED='-L${libdir} -l${RUBY_SO_NAME}'
SOLIBS='-lm -lc'
;;
- when(beos*)
+ beos*)
case "$target_cpu" in
- when(powerpc*)
+ powerpc*)
LIBRUBY_DLDFLAGS='-f ruby.exp -lnet -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o'
;;
esac
;;
- when(darwin*)
- RUBY_SO_NAME="$RUBY_SO_NAME"'.$(MAJOR).$(MINOR).$(TEENY)'
- LIBRUBY_LDSHARED='$(CC) -dynamiclib'
- if test "$load_relative" = yes; then
- libprefix='@executable_path/../lib'
- else
- libprefix='$(libdir)'
- fi
- LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-install_name '${libprefix}'/$(LIBRUBY_SO)'
- LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-current_version $(MAJOR).$(MINOR).$(TEENY)'
- LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-compatibility_version $(ruby_version)'
- LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-Wl,-unexported_symbol,_Init_* $(XLDFLAGS)'
- LIBRUBY_SO='lib$(RUBY_SO_NAME).dylib'
- LIBRUBY_ALIASES='lib$(RUBY_BASE_NAME).$(MAJOR).$(MINOR).dylib lib$(RUBY_INSTALL_NAME).dylib'
+ darwin*)
+ LIBRUBY_SO='lib$(RUBY_SO_NAME).$(MAJOR).$(MINOR).$(TEENY).dylib'
+ LIBRUBY_LDSHARED='cc -dynamiclib -undefined suppress -flat_namespace'
+ LIBRUBY_DLDFLAGS='-install_name $(libdir)/lib$(RUBY_SO_NAME).dylib -current_version $(MAJOR).$(MINOR).$(TEENY) -compatibility_version $(MAJOR).$(MINOR)'
+ LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).$(MAJOR).$(MINOR).dylib lib$(RUBY_SO_NAME).dylib'
;;
- when(interix*)
+ interix*)
LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)'
;;
- when(*)
+ *)
;;
esac
fi
if test "$enable_rpath" = yes; then
- LIBRUBY_RPATHFLAGS="${linker_flag}-R ${linker_flag}\$(libdir) -L\$(libdir)"
- LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED"
- LIBRUBYARG_STATIC="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_STATIC"
+ LIBRUBYARG_SHARED="${linker_flag}-R ${linker_flag}\$(libdir) -L\$(libdir) $LIBRUBYARG_SHARED"
fi
LDFLAGS="-L. $LDFLAGS"
AC_SUBST(ARCHFILE)
-dnl }
-dnl build section {
-
dnl build rdoc index if requested
RDOCTARGET=""
AC_ARG_ENABLE(install-doc,
- AS_HELP_STRING([--disable-install-doc], [do not install rdoc indexes during install]),
- [install_doc=$enableval], [install_doc=yes])
+ [ --enable-install-doc build and install rdoc indexes during install ],
+ [install_doc=$enableval], [install_doc=no])
if test "$install_doc" != no; then
RDOCTARGET="install-doc"
fi
AC_SUBST(RDOCTARGET)
-if test "$rb_with_pthread" = "yes"; then
- THREAD_MODEL=pthread
-fi
-MINIDLNOBJ=dln.o
case "$target_os" in
- when(linux*)
+ linux*)
+ XCFLAGS="$XCFLAGS -D_GNU_SOURCE=1"
;;
- when(netbsd*)
- RUBY_APPEND_OPTION(CFLAGS, -pipe)
+ netbsd*)
+ CFLAGS="$CFLAGS -pipe"
;;
- when(nextstep*|openstep*)
- RUBY_APPEND_OPTION(CPPFLAGS, -I/usr/local/include)
+ nextstep*|openstep*)
+ # The -fno-common is needed if we wish to embed the Ruby interpreter
+ # into a plugin module of some project (as opposed to embedding it
+ # within the project's application). The -I/usr/local/include is
+ # needed because CPP as discovered by configure (cc -E -traditional)
+ # fails to consult /usr/local/include by default. This causes
+ # mkmf.rb's have_header() to fail if the desired resource happens to be
+ # installed in the /usr/local tree.
+ CFLAGS="$CFLAGS -pipe -fno-common"
+ CPPFLAGS="$CPPFLAGS -I/usr/local/include"
;;
- when(rhapsody*)
- RUBY_APPEND_OPTIONS(CFLAGS, -pipe -no-precomp)
+ rhapsody*)
+ CFLAGS="$CFLAGS -pipe -no-precomp -fno-common"
;;
- when(darwin*)
- RUBY_APPEND_OPTION(CFLAGS, -pipe)
- MINIDLNOBJ=dmydln.o
+ darwin*)
+ CFLAGS="$CFLAGS -pipe -fno-common"
+ MINIOBJS=dmydln.o
;;
- when(human*)
- AC_LIBOBJ([x68.o])
- CFLAGS="$CFLAGS -fansi-only"
- XCFLAGS="$XCFLAGS -cc1-stack=262144 -cpp-stack=2694144"
- EXEEXT=.x
- OBJEXT=o
- ;;
- when(os2-emx)
- AC_LIBOBJ([os2])
- CFLAGS="$CFLAGS -DOS2"
+ os2-emx)
+ CFLAGS="$CFLAGS -DOS2 -Zmts"
LIBRUBY_A=`echo $LIBRUBY_A | sed 's/^lib//'`
LIBRUBY_SO=`echo $LIBRUBY_SO | sed 's/^lib//'`
LIBRUBY_ALIASES=`for i in $LIBRUBY_ALIASES; do echo "$i"; done | sed 's/^lib//'`
;;
- when(osf*)
+ osf*)
if test "$GCC" != "yes" ; then
# compile something small: taint.c is fine for this.
# the main point is the '-v' flag of 'cc'.
case "`cc -v -I. -c main.c -o /tmp/main.o 2>&1`" in
- when(*/gemc_cc*) # we have the new DEC GEM CC
+ */gemc_cc*) # we have the new DEC GEM CC
CFLAGS="$CFLAGS -oldc"
;;
- when(*) # we have the old MIPS CC
+ *) # we have the old MIPS CC
;;
esac
# cleanup
@@ -2144,154 +1579,68 @@ case "$target_os" in
CFLAGS="$CFLAGS -std"
fi
;;
- when(beos*)
+ beos*)
case "$target_cpu" in
- when(powerpc*)
+ powerpc*)
CFLAGS="$CFLAGS -relax_pointers"
;;
esac
- CPPFLAGS="$CPPFLAGS -I/boot/home/config/include"
;;
- when(cygwin*|mingw*)
- RUBY_SO_NAME="${RUBY_SO_NAME}${MAJOR}${MINOR}${TEENY}"
- LIBRUBY_DLDFLAGS="${DLDFLAGS}"' -Wl,--out-implib=$(LIBRUBY)'
+ cygwin*|mingw*)
case "$target_os" in
- when(cygwin*)
+ cygwin*)
if test x"$enable_shared" = xyes; then
- LIBRUBY_SO='cyg$(RUBY_SO_NAME)'.dll
- LIBRUBY_DLDFLAGS="${LIBRUBY_DLDFLAGS}"' $(RUBYDEF)'
+ LIBRUBY_SO='cyg$(RUBY_SO_NAME)'${MAJOR}${MINOR}.dll
+ LIBRUBY='lib$(RUBY_SO_NAME).dll.a'
fi
;;
- when(mingw*)
- RUBY_SO_NAME="${rb_cv_msvcrt}-${RUBY_SO_NAME}"
+ mingw*)
+ RUBY_SO_NAME=${rb_cv_msvcrt}-'$(RUBY_INSTALL_NAME)'${MAJOR}${MINOR}
if test x"$enable_shared" = xyes; then
LIBRUBY_SO='$(RUBY_SO_NAME)'.dll
- LIBRUBY_DLDFLAGS="${LIBRUBY_DLDFLAGS}"' $(RUBYDEF)'
+ LIBRUBY='lib$(LIBRUBY_SO).a'
fi
AC_LIBOBJ([win32])
COMMON_LIBS=m
# COMMON_MACROS="WIN32_LEAN_AND_MEAN="
- COMMON_HEADERS="winsock2.h windows.h"
- THREAD_MODEL=win32
+ COMMON_HEADERS="windows.h winsock.h"
;;
esac
+ LIBRUBY_DLDFLAGS="${DLDFLAGS}"' -Wl,--out-implib=$(LIBRUBY)'
LIBRUBY_ALIASES=''
FIRSTMAKEFILE=GNUmakefile:cygwin/GNUmakefile.in
SOLIBS='$(LIBS)'
- if test x"$enable_shared" = xyes; then
- LIBRUBY='lib$(RUBY_SO_NAME).dll.a'
- else
+ if test x"$enable_shared" = xno; then
LIBRUBY_SO=dummy
LIBRUBY='lib$(RUBY_SO_NAME).a'
LIBRUBYARG='-l$(RUBY_SO_NAME)'
fi
- MINIDLNOBJ=dmydln.o
+ MINIOBJS=dmydln.o
;;
- when(hpux*)
+ hpux*)
case "$YACC" in
- when(*yacc*)
+ *yacc*)
XCFLAGS="$XCFLAGS -DYYMAXDEPTH=300"
YACC="$YACC -Nl40000 -Nm40000"
;;
esac
- MINIDLNOBJ=dmydln.o
- ;;
- when(*msdosdjgpp*)
- FIRSTMAKEFILE=GNUmakefile:djgpp/GNUmakefile.in
+ MINIOBJS=dmydln.o
;;
- when(*)
+ *)
;;
esac
-MINIOBJS="$MINIDLNOBJ"
-case "$THREAD_MODEL" in
-when(pthread)
- AC_CHECK_HEADERS(pthread.h)
- ;;
-when(win32)
- ;;
-when(*)
- AC_MSG_ERROR(unknown thread model $THREAD_MODEL)
- ;;
-esac
-
-case "$FIRSTMAKEFILE" in
-when(*GNUmakefile:*)
- gnumake=yes
- ;;
-when(*)
- AC_MSG_CHECKING([for if ${MAKE-make} is GNU make])
- mkdir conftest.dir
- echo "all:; @echo yes" > conftest.dir/GNUmakefile
- echo "all:; @echo no" > conftest.dir/Makefile
- gnumake=`(cd conftest.dir; ${MAKE-make})`
- rm -fr conftest.dir
- case "$gnumake" in
- when(*yes*)
- echo "include Makefile" > GNUmakefile
- echo "-include uncommon.mk" >> GNUmakefile
- gnumake=yes;;
- when(*)
- gnumake=no;;
- esac
- AC_MSG_RESULT($gnumake)
- ;;
+case "$build_os" in
+ *msdosdjgpp*) FIRSTMAKEFILE=GNUmakefile:djgpp/GNUmakefile.in;;
esac
-if test "${universal_binary-no}" = yes ; then
- AC_MSG_CHECKING([for architecture macros])
- mv confdefs.h confdefs1.h
- : > confdefs.h
- AC_TRY_COMPILE([@%:@if defined __`echo ${universal_archnames} |
- sed 's/=[^ ]*//g;s/ /__ || defined __/g'`__
-@%:@else
-@%:@error
->>>>>><<<<<<
-@%:@endif], [],
-[
- AC_MSG_RESULT(yes)
- mv -f confdefs1.h confdefs.h
-], [
- AC_MSG_RESULT(no)
- archflagpat=`eval echo '"'"${ARCH_FLAG}"'"' | sed 's/[[][|.*]]/\\&/g'`
- new_cflags=`echo "$CFLAGS" | sed "s|$archflagpat"'||'`
- for archs in ${universal_archnames}; do
- cpu=${archs#*=}
- archs=${archs%=*}
- CFLAGS="$new_cflags -arch $archs"
- archs="__${archs}__"
- AC_MSG_CHECKING([for macro ${archs} on ${cpu}])
- AC_TRY_COMPILE([@%:@ifndef ${archs}
-@%:@error
-@%:@endif], [], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])])
- done
- mv -f confdefs1.h confdefs.h
- AC_MSG_ERROR([failed])
- ])
-fi
-
CPPFLAGS="$CPPFLAGS "'$(DEFS)'
+test -z "$CFLAGS" || CFLAGS="$CFLAGS "; CFLAGS="$CFLAGS"'${cflags}'
test -z "$CPPFLAGS" || CPPFLAGS="$CPPFLAGS "; CPPFLAGS="$CPPFLAGS"'${cppflags}'
-if test -n "${cflags+set}"; then
- cflagspat=`eval echo '"'"${cflags}"'"' | sed 's/[[][|.*]]/\\&/g;s/^ */ /;s/^ *$/ /'`
- CFLAGS=`echo " $CFLAGS " | sed "s|$cflagspat"'|${cflags}|;s/^ *//;s/ *$//'`
-fi
-if test -n "${cxxflags+set}"; then
- cxxflagspat=`eval echo '"'"${cxxflags}"'"' | sed 's/[[][|.*]]/\\&/g;s/^ */ /;s/^ *$/ /'`
- CXXFLAGS=`echo " $CXXFLAGS " | sed "s|$cxxflagspat"'|${cxxflags}|;s/^ *//;s/ *$//'`
-fi
-if test "${ARCH_FLAG}"; then
- archflagpat=`eval echo '"'"${ARCH_FLAG}"'"' | sed 's/[[][|.*]]/\\&/g'`
- CFLAGS=`echo "$CFLAGS" | sed "s|$archflagpat"'|$(ARCH_FLAG)|'`
- CXXFLAGS=`echo "$CXXFLAGS" | sed "s|$archflagpat"'|$(ARCH_FLAG)|'`
- LDFLAGS=`echo "$LDFLAGS" | sed "s|$archflagpat"'|$(ARCH_FLAG)|'`
-fi
AC_SUBST(cppflags, [])dnl
-AC_SUBST(cflags, ["$orig_cflags "'${optflags} ${debugflags} ${warnflags}'])dnl
-AC_SUBST(cxxflags, ["$orig_cxxflags "'${optflags} ${debugflags} ${warnflags}'])dnl
+AC_SUBST(cflags, ['${optflags} ${debugflags}'])dnl
AC_SUBST(optflags)dnl
AC_SUBST(debugflags)dnl
-AC_SUBST(warnflags)dnl
AC_SUBST(XCFLAGS)dnl
AC_SUBST(XLDFLAGS)dnl
AC_SUBST(LIBRUBY_LDSHARED)
@@ -2316,7 +1665,6 @@ AC_SUBST(COMMON_MACROS)
AC_SUBST(COMMON_HEADERS)
AC_SUBST(EXPORT_PREFIX)
AC_SUBST(MINIOBJS)
-AC_SUBST(THREAD_MODEL)
MAKEFILES="Makefile `echo $FIRSTMAKEFILE | sed 's/:.*//'`"
MAKEFILES="`echo $MAKEFILES`"
@@ -2330,209 +1678,111 @@ ri_suffix=
test "$program_suffix" != NONE &&
ri_suffix=$program_suffix
-RUBY_INSTALL_NAME="${ri_prefix}"'$(RUBY_BASE_NAME)'"${ri_suffix}"
+RUBY_INSTALL_NAME="${ri_prefix}ruby${ri_suffix}"
case "$target_os" in
- when(cygwin*|mingw*)
- RUBYW_INSTALL_NAME="${ri_prefix}"'$(RUBYW_BASE_NAME)'"${ri_suffix}"
- rubyw_install_name='$(RUBYW_INSTALL_NAME)'
+ cygwin*|mingw*)
+ RUBYW_INSTALL_NAME="${ri_prefix}rubyw${ri_suffix}"
+ rubyw_install_name="$RUBYW_INSTALL_NAME"
;;
esac
-
-rubylibprefix='${libdir}/${RUBY_BASE_NAME}'
-AC_ARG_WITH(rubylibprefix,
- AS_HELP_STRING([--with-rubylibprefix=DIR], [prefix for ruby libraries [[LIBDIR/RUBY_BASE_NAME]]]),
- [rubylibprefix=$withval])
-RUBY_LIB_PREFIX=`eval echo \\"${rubylibprefix}\\"`
-AC_SUBST(rubylibprefix)
-
-RI_BASE_NAME=`echo ${RUBY_BASE_NAME} | sed 's/ruby/ri/'`
-ridir='${datarootdir}/${RI_BASE_NAME}'
-AC_ARG_WITH(ridir,
- AS_HELP_STRING([--with-ridir=DIR], [ri documentation [[DATAROOTDIR/ri]]]),
- [ridir=$withval])
-RIDIR=`eval echo \\"${ridir}\\"`
-AC_SUBST(ridir)
-AC_SUBST(RI_BASE_NAME)
-
-AC_ARG_WITH(ruby-version,
- AS_HELP_STRING([--with-ruby-version=STR], [ruby version string for version specific directories [[full]] (full|minor|STR)]),
- [ruby_version=$withval],
- [ruby_version=full])
-unset RUBY_LIB_VERSION
-unset RUBY_LIB_VERSION_STYLE
-case "$ruby_version" in
- when(full)
- RUBY_LIB_VERSION_STYLE='3 /* full */'
- ;;
- when(minor)
- RUBY_LIB_VERSION_STYLE='2 /* minor */'
- ;;
-esac
-if test ${RUBY_LIB_VERSION_STYLE+set}; then
- {
- echo "#define RUBY_LIB_VERSION_STYLE $RUBY_LIB_VERSION_STYLE"
- echo '#define STRINGIZE(x) x'
- test -f revision.h -o -f "${srcdir}/revision.h" || echo '#define RUBY_REVISION 0'
- echo '#include "version.h"'
- echo 'ruby_version=RUBY_LIB_VERSION'
- } > conftest.c
- ruby_version="`$CPP -I"${srcdir}" -I"${srcdir}/include" conftest.c | sed '/^ruby_version=/!d;s/ //g'`"
- eval $ruby_version
-else
- RUBY_LIB_VERSION="\"${ruby_version}\""
-fi
+RUBY_LIB_PREFIX=`eval echo \\"${libdir}/ruby\\"`
AC_ARG_WITH(sitedir,
- AS_HELP_STRING([--with-sitedir=DIR], [site libraries in DIR [[RUBY_LIB_PREFIX/site_ruby]]]),
+ [ --with-sitedir=DIR site libraries in DIR [[LIBDIR/ruby/site_ruby]]],
[sitedir=$withval],
- [sitedir='${rubylibprefix}/site_ruby'])
-dir="${sitedir}"
-until SITE_DIR=`eval echo \\"${dir}\\"`; test "x${dir}" = "x${SITE_DIR}"; do
- dir="${SITE_DIR}"
-done
+ [sitedir='${libdir}/ruby/site_ruby'])
+SITE_DIR=`eval echo \\"${sitedir}\\"`
-AC_ARG_WITH(vendordir,
- AS_HELP_STRING([--with-vendordir=DIR], [vendor libraries in DIR [[RUBY_LIB_PREFIX/vendor_ruby]]]),
- [vendordir=$withval],
- [vendordir='${rubylibprefix}/vendor_ruby'])
-dir="${vendordir}"
-until VENDOR_DIR=`eval echo \\"${dir}\\"`; test "x${dir}" = "x${VENDOR_DIR}"; do
- dir="${VENDOR_DIR}"
-done
-
-if test "${LOAD_RELATIVE+set}"; then
- AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)
+case "$target_os" in
+ cygwin*|mingw*|*djgpp*|os2-emx*)
RUBY_LIB_PREFIX="`eval echo "$RUBY_LIB_PREFIX" | sed 's|^NONE/|/|;s|^'"$prefix"'/|/|'`"
RUBY_SITE_LIB_PATH="`eval echo "$SITE_DIR" | sed 's|^NONE/|/|;s|^'"$prefix"'/|/|'`"
- RUBY_VENDOR_LIB_PATH="`eval echo "$VENDOR_DIR" | sed 's|^NONE/|/|;s|^'"$prefix"'/|/|'`"
-else
+ ;;
+ *)
RUBY_LIB_PREFIX="`eval echo \\"$RUBY_LIB_PREFIX\\" | sed 's|^NONE/|'"$prefix"'/|'`"
RUBY_SITE_LIB_PATH="`eval echo \\"$SITE_DIR\\" | sed 's|^NONE/|'"$prefix"'/|'`"
- RUBY_VENDOR_LIB_PATH="`eval echo \\"$VENDOR_DIR\\" | sed 's|^NONE/|'"$prefix"'/|'`"
-fi
-
-pat="$RUBY_LIB_PREFIX/"'\(.*\)'
-RUBY_LIB_PATH='RUBY_LIB_PREFIX"/"RUBY_LIB_VERSION'
-case "$RUBY_SITE_LIB_PATH" in
- when("$RUBY_LIB_PREFIX/"*)
- RUBY_SITE_LIB_PATH='RUBY_LIB_PREFIX"/'"`expr \"$RUBY_SITE_LIB_PATH\" : \"$pat\"`"'"'
- ;;
- when(*)
- RUBY_SITE_LIB_PATH="\"${RUBY_SITE_LIB_PATH}\""
;;
esac
-RUBY_SITE_LIB_PATH2='RUBY_SITE_LIB"/"RUBY_LIB_VERSION'
-case "$RUBY_VENDOR_LIB_PATH" in
- when("$RUBY_LIB_PREFIX/"*)
- RUBY_VENDOR_LIB_PATH='RUBY_LIB_PREFIX"/'"`expr \"$RUBY_VENDOR_LIB_PATH\" : \"$pat\"`"'"'
+RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJOR}.${MINOR}"
+RUBY_SITE_LIB_PATH2="${RUBY_SITE_LIB_PATH}/${MAJOR}.${MINOR}"
+
+AC_DEFINE_UNQUOTED(RUBY_LIB, "${RUBY_LIB_PATH}")
+AC_DEFINE_UNQUOTED(RUBY_SITE_LIB, "${RUBY_SITE_LIB_PATH}")
+AC_DEFINE_UNQUOTED(RUBY_SITE_LIB2, "${RUBY_SITE_LIB_PATH2}")
+
+AC_ARG_WITH(vendordir,
+ [ --with-vendordir=DIR vendor libraries in DIR [[LIBDIR/ruby/vendor_ruby]]],
+ [vendordir=$withval],
+ [vendordir='${libdir}/ruby/vendor_ruby'])
+VENDOR_DIR=`eval echo \\"${vendordir}\\"`
+case "$target_os" in
+ cygwin*|mingw*|*djgpp*|os2-emx*)
+ RUBY_VENDOR_LIB_PATH="`eval echo "$VENDOR_DIR" | sed 's|^NONE/|/|;s|^'"$prefix"'/|/|'`"
;;
- when(*)
- RUBY_VENDOR_LIB_PATH="\"${RUBY_VENDOR_LIB_PATH}\""
+ *)
+ RUBY_VENDOR_LIB_PATH="`eval echo \\"$VENDOR_DIR\\" | sed 's|^NONE/|'"$prefix"'/|'`"
;;
esac
-RUBY_VENDOR_LIB_PATH2='RUBY_VENDOR_LIB"/"RUBY_LIB_VERSION'
+RUBY_VENDOR_LIB_PATH2="${RUBY_VENDOR_LIB_PATH}/${MAJOR}.${MINOR}"
-if test ${RUBY_LIB_VERSION_STYLE+set}; then
- AC_DEFINE_UNQUOTED(RUBY_LIB_VERSION_STYLE, $RUBY_LIB_VERSION_STYLE)
-else
- AC_DEFINE_UNQUOTED(RUBY_LIB_VERSION, [$RUBY_LIB_VERSION])
-fi
-AC_DEFINE_UNQUOTED(RUBY_LIB_PREFIX, "${RUBY_LIB_PREFIX}")
-AC_DEFINE_UNQUOTED(RUBY_LIB, ${RUBY_LIB_PATH})
-AC_DEFINE_UNQUOTED(RUBY_SITE_LIB, ${RUBY_SITE_LIB_PATH})
-AC_DEFINE_UNQUOTED(RUBY_SITE_LIB2, ${RUBY_SITE_LIB_PATH2})
-AC_DEFINE_UNQUOTED(RUBY_VENDOR_LIB, ${RUBY_VENDOR_LIB_PATH})
-AC_DEFINE_UNQUOTED(RUBY_VENDOR_LIB2, ${RUBY_VENDOR_LIB_PATH2})
+AC_DEFINE_UNQUOTED(RUBY_VENDOR_LIB, "${RUBY_VENDOR_LIB_PATH}")
+AC_DEFINE_UNQUOTED(RUBY_VENDOR_LIB2, "${RUBY_VENDOR_LIB_PATH2}")
AC_SUBST(arch)dnl
AC_SUBST(sitearch)dnl
-AC_SUBST(ruby_version)dnl
AC_SUBST(sitedir)dnl
AC_SUBST(vendordir)dnl
configure_args=$ac_configure_args
AC_SUBST(configure_args)dnl
-if test "${universal_binary-no}" = yes ; then
- arch="universal-${target_os}"
- AC_CACHE_CHECK(whether __ARCHITECTURE__ is available, rb_cv_architecture_available,
- AC_TRY_COMPILE([const char arch[] = __ARCHITECTURE__;], [puts(arch);],
- [rb_cv_architecture_available=yes], [rb_cv_architecture_available=no]))
- if test "${rb_cv_architecture_available}" = yes; then
- AC_DEFINE_UNQUOTED(RUBY_PLATFORM_CPU, __ARCHITECTURE__)
- else
- for archs in ${universal_archnames}; do
- cpu=`echo $archs | sed 's/.*=//'`
- archs=`echo $archs | sed 's/=.*//'`
- RUBY_DEFINE_IF([defined __${archs}__], RUBY_PLATFORM_CPU, ["${cpu}"])
- done
- fi
- ints='long int'
- test "$ac_cv_type_long_long" = yes && ints="'long long' $ints"
- AC_SUBST(UNIVERSAL_ARCHNAMES, "${universal_archnames}")
- AC_SUBST(UNIVERSAL_INTS, "${ints}")
- AC_DEFINE_UNQUOTED(RUBY_PLATFORM_OS, "${target_os}")
- AC_DEFINE_UNQUOTED(RUBY_ARCH, "universal-"RUBY_PLATFORM_OS)
- AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "universal."RUBY_PLATFORM_CPU"-"RUBY_PLATFORM_OS)
- AC_DEFINE_UNQUOTED(RUBY_THIN_ARCHLIB, RUBY_LIB"/"RUBY_PLATFORM_CPU"-"RUBY_PLATFORM_OS)
- AC_DEFINE_UNQUOTED(RUBY_SITE_THIN_ARCHLIB, RUBY_SITE_LIB2"/"RUBY_PLATFORM_CPU"-"RUBY_PLATFORM_OS)
- AC_DEFINE_UNQUOTED(RUBY_VENDOR_THIN_ARCHLIB, RUBY_VENDOR_LIB2"/"RUBY_PLATFORM_CPU"-"RUBY_PLATFORM_OS)
+if test "$fat_binary" != no ; then
+ arch="fat-${target_os}"
+
+ AC_DEFINE_UNQUOTED(RUBY_THIN_ARCHLIB,
+ "${RUBY_LIB_PATH}/" __ARCHITECTURE__ "-${target_os}")
+
+ AC_DEFINE_UNQUOTED(RUBY_SITE_THIN_ARCHLIB,
+ "${RUBY_SITE_LIB_PATH}/" __ARCHITECTURE__ "-${target_os}")
+ AC_DEFINE_UNQUOTED(RUBY_VENDOR_THIN_ARCHLIB,
+ "${RUBY_VENDOR_LIB_PATH}/" __ARCHITECTURE__ "-${target_os}")
+ AC_DEFINE_UNQUOTED(RUBY_PLATFORM, __ARCHITECTURE__ "-${target_os}")
else
arch="${target_cpu}-${target_os}"
AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "${arch}")
fi
-unset sitearch
case "$target_os" in
- when(mingw*) sitearch="$target_cpu-$rb_cv_msvcrt" ;;
+ mingw*) sitearch="$target_cpu-$rb_cv_msvcrt" ;;
+ *) sitearch="${arch}" ;;
esac
-test ${sitearch+set} && AC_DEFINE_UNQUOTED(RUBY_SITEARCH, "${sitearch}")
-AC_DEFINE_UNQUOTED(RUBY_ARCHLIB, RUBY_LIB"/"RUBY_ARCH)
-AC_DEFINE_UNQUOTED(RUBY_SITE_ARCHLIB, RUBY_SITE_LIB2"/"RUBY_SITEARCH)
-AC_DEFINE_UNQUOTED(RUBY_VENDOR_ARCHLIB, RUBY_VENDOR_LIB2"/"RUBY_SITEARCH)
+AC_DEFINE_UNQUOTED(RUBY_ARCHLIB, "${RUBY_LIB_PATH}/${arch}")
+AC_DEFINE_UNQUOTED(RUBY_SITE_ARCHLIB, "${RUBY_SITE_LIB_PATH2}/${sitearch}")
+AC_DEFINE_UNQUOTED(RUBY_VENDOR_ARCHLIB, "${RUBY_VENDOR_LIB_PATH2}/${sitearch}")
AC_ARG_WITH(search-path,
- AS_HELP_STRING([--with-search-path=DIR], [specify the additional search path]),
+ [ --with-search-path=DIR specify the additional search path],
[search_path=$withval])
if test "$search_path" != ""; then
AC_DEFINE_UNQUOTED(RUBY_SEARCH_PATH,"$search_path")
fi
-AC_ARG_WITH(rubyhdrdir,
- AS_HELP_STRING([--with-rubyhdrdir=DIR], [core headers in DIR [[INCLUDEDIR/RUBY_BASE_NAME-RUBY_VERSION]]]),
- [rubyhdrdir=$withval],
- [rubyhdrdir='${includedir}/${RUBY_BASE_NAME}-${ruby_version}'])
-
-AC_ARG_WITH(sitehdrdir,
- AS_HELP_STRING([--with-sitehdrdir=DIR], [core site headers in DIR [RUBYHDRDIR/site_ruby]]),
- [sitehdrdir=$withval],
- [sitehdrdir='${rubyhdrdir}/site_ruby'])
-
-AC_ARG_WITH(vendorhdrdir,
- AS_HELP_STRING([--with-vendorhdrdir=DIR], [ core vendor headers in DIR [RUBYHDRDIR/vendor_ruby]]),
- [vendorhdrdir=$withval],
- [vendorhdrdir='${rubyhdrdir}/vendor_ruby'])
-
-AC_SUBST(rubyhdrdir)dnl
-AC_SUBST(sitehdrdir)dnl
-AC_SUBST(vendorhdrdir)dnl
-
AC_ARG_WITH(mantype,
- AS_HELP_STRING([--with-mantype=TYPE], [specify man page type; TYPE is one of man and doc]),
+ [ --with-mantype=TYPE specify man page type; TYPE is one of man and doc],
[
case "$withval" in
- when(man|doc)
+ man|doc)
MANTYPE=$withval
;;
- when(*)
+ *)
AC_MSG_ERROR(invalid man type: $withval)
;;
esac
])
if test -z "$MANTYPE"; then
AC_PATH_PROGS(NROFF, nroff awf, /bin/false, "/usr/bin:/usr/ucb")
- if ${NROFF} -mdoc ${srcdir}/man/ruby.1 >/dev/null 2>&1; then
+ if ${NROFF} -mdoc ${srcdir}/ruby.1 >/dev/null 2>&1; then
MANTYPE=doc
else
MANTYPE=man
@@ -2540,64 +1790,21 @@ if test -z "$MANTYPE"; then
fi
AC_SUBST(MANTYPE)
-arch_hdrdir="${EXTOUT}/include/${arch}/ruby"
-AS_MKDIR_P("${arch_hdrdir}")
-config_h="${arch_hdrdir}/config.h"
-tr -d '\015' < confdefs.h | grep -v "^#define PACKAGE_" |
-${srcdir}/tool/ifchange "${config_h}" -
+if test -f config.h && tr -d '\015' < confdefs.h | cmp -s config.h -; then
+ echo "config.h unchanged"
+else
+ echo "creating config.h"
+ tr -d '\015' < confdefs.h > config.h
+fi
tr -d '\015' < largefile.h > confdefs.h
rm largefile.h
-BUILTIN_ENCS=["`sed -n -e '/^BUILTIN_ENCS[ ]*=/{' \
- -e s/// -e :l -e '/\\\\$/N' -e 's/\\\\\\n/ /' -e 't l' -e p \
- -e '}' "${srcdir}/enc/Makefile.in"`"]
-BUILTIN_ENCOBJS=
-for e in $BUILTIN_ENCS; do BUILTIN_ENCOBJS="$BUILTIN_ENCOBJS `basename $e .c`"'.$(OBJEXT)'; done
-AC_SUBST(BUILTIN_ENCOBJS)
-
-BUILTIN_TRANSES=["`sed -n -e '/^BUILTIN_TRANSES[ ]*=/{' \
- -e s/// -e :l -e '/\\\\$/N' -e 's/\\\\\\n/ /' -e 't l' -e p \
- -e '}' "${srcdir}/enc/Makefile.in"`"]
-BUILTIN_TRANSSRCS=
-BUILTIN_TRANSOBJS=
-for e in $BUILTIN_TRANSES; do
- BUILTIN_TRANSSRCS="$BUILTIN_TRANSSRCS `basename $e .trans`"'.c';
- BUILTIN_TRANSOBJS="$BUILTIN_TRANSOBJS `basename $e .trans`"'.$(OBJEXT)';
-done
-AC_SUBST(BUILTIN_TRANSSRCS)
-AC_SUBST(BUILTIN_TRANSOBJS)
-
-PACKAGE=$RUBY_BASE_NAME
-AC_SUBST(PACKAGE)
-AC_MSG_RESULT($PACKAGE library version = $ruby_version)
-
AC_CONFIG_FILES($FIRSTMAKEFILE)
AC_CONFIG_FILES(Makefile, [{
- if test -d "$srcdir/.svn"; then
- VCS='svn'
- VCSUP='$(VCS) up $(SVNUPOPTIONS)'
- elif test -d "$srcdir/.git/svn"; then
- VCS='git svn'
- VCSUP='$(VCS) rebase $(GITSVNREBASEOPTIONS)'
- elif test -d "$srcdir/.git"; then
- VCS='git'
- VCSUP='$(VCS) pull $(GITPULLOPTIONS)'
- else
- VCS='echo cannot'
- VCSUP='$(VCS)'
- fi
- sed '/^MISSING/s/\$U\././g;/^VCS *=/s#@VCS@#'"$VCS"'#;/^VCSUP *=/s#@VCSUP@#'"$VCSUP"'#' Makefile
+ sed '/^MISSING/s/\$U\././g' Makefile
echo; test x"$EXEEXT" = x || echo 'miniruby: miniruby$(EXEEXT)'
- if test "$gnumake" != yes; then
- echo ['$(MKFILES): $(srcdir)/common.mk']
- sed ['s/{\$([^(){}]*)[^{}]*}//g'] ${srcdir}/common.mk
- else
- echo 'distclean-local::; @$(RM) GNUmakefile uncommon.mk'
- fi
- } > confmk$$.tmp && mv -f confmk$$.tmp Makefile &&
- ${MAKE-make} info-program | grep '^PROGRAM=ruby$' > /dev/null ||
- echo 'ruby: $(PROGRAM);' >> Makefile],
-[EXEEXT=$EXEEXT gnumake=$gnumake])
+ test "$RUBY_INSTALL_NAME$EXEEXT" = ruby || echo 'ruby: $(PROGRAM);'
+ sed ['s/{\$([^(){}]*)[^{}]*}//g'] ${srcdir}/common.mk
+ } >> confmk$$.tmp && mv -f confmk$$.tmp Makefile],
+[RUBY_INSTALL_NAME=$RUBY_INSTALL_NAME EXEEXT=$EXEEXT])
AC_OUTPUT
-dnl }
-dnl }
diff --git a/cont.c b/cont.c
deleted file mode 100644
index c0a5dd78ef..0000000000
--- a/cont.c
+++ /dev/null
@@ -1,1050 +0,0 @@
-/**********************************************************************
-
- cont.c -
-
- $Author$
- created at: Thu May 23 09:03:43 2007
-
- Copyright (C) 2007 Koichi Sasada
-
-**********************************************************************/
-
-#include "ruby/ruby.h"
-#include "vm_core.h"
-#include "gc.h"
-#include "eval_intern.h"
-
-#define CAPTURE_JUST_VALID_VM_STACK 1
-
-enum context_type {
- CONTINUATION_CONTEXT = 0,
- FIBER_CONTEXT = 1,
- ROOT_FIBER_CONTEXT = 2
-};
-
-typedef struct rb_context_struct {
- enum context_type type;
- VALUE self;
- int argc;
- VALUE value;
- VALUE *vm_stack;
-#ifdef CAPTURE_JUST_VALID_VM_STACK
- size_t vm_stack_slen; /* length of stack (head of th->stack) */
- size_t vm_stack_clen; /* length of control frames (tail of th->stack) */
-#endif
- VALUE *machine_stack;
- VALUE *machine_stack_src;
-#ifdef __ia64
- VALUE *machine_register_stack;
- VALUE *machine_register_stack_src;
- int machine_register_stack_size;
-#endif
- rb_thread_t saved_thread;
- rb_jmpbuf_t jmpbuf;
- int machine_stack_size;
-} rb_context_t;
-
-enum fiber_status {
- CREATED,
- RUNNING,
- TERMINATED
-};
-
-typedef struct rb_fiber_struct {
- rb_context_t cont;
- VALUE prev;
- enum fiber_status status;
- struct rb_fiber_struct *prev_fiber;
- struct rb_fiber_struct *next_fiber;
-} rb_fiber_t;
-
-static VALUE rb_cContinuation;
-static VALUE rb_cFiber;
-static VALUE rb_eFiberError;
-
-#define GetContPtr(obj, ptr) \
- Data_Get_Struct(obj, rb_context_t, ptr)
-
-#define GetFiberPtr(obj, ptr) do {\
- ptr = (rb_fiber_t*)DATA_PTR(obj);\
- if (!ptr) rb_raise(rb_eFiberError, "uninitialized fiber");\
-} while(0)
-
-NOINLINE(static VALUE cont_capture(volatile int *stat));
-
-void rb_thread_mark(rb_thread_t *th);
-
-static void
-cont_mark(void *ptr)
-{
- RUBY_MARK_ENTER("cont");
- if (ptr) {
- rb_context_t *cont = ptr;
- rb_gc_mark(cont->value);
- rb_thread_mark(&cont->saved_thread);
-
- if (cont->vm_stack) {
-#ifdef CAPTURE_JUST_VALID_VM_STACK
- rb_gc_mark_locations(cont->vm_stack,
- cont->vm_stack + cont->vm_stack_slen + cont->vm_stack_clen);
-#else
- rb_gc_mark_localtion(cont->vm_stack,
- cont->vm_stack, cont->saved_thread.stack_size);
-#endif
- }
-
- if (cont->machine_stack) {
- rb_gc_mark_locations(cont->machine_stack,
- cont->machine_stack + cont->machine_stack_size);
- }
-#ifdef __ia64
- if (cont->machine_register_stack) {
- rb_gc_mark_locations(cont->machine_register_stack,
- cont->machine_register_stack + cont->machine_register_stack_size);
- }
-#endif
- }
- RUBY_MARK_LEAVE("cont");
-}
-
-static void
-cont_free(void *ptr)
-{
- RUBY_FREE_ENTER("cont");
- if (ptr) {
- rb_context_t *cont = ptr;
- RUBY_FREE_UNLESS_NULL(cont->saved_thread.stack); fflush(stdout);
- RUBY_FREE_UNLESS_NULL(cont->machine_stack);
-#ifdef __ia64
- RUBY_FREE_UNLESS_NULL(cont->machine_register_stack);
-#endif
- RUBY_FREE_UNLESS_NULL(cont->vm_stack);
-
- /* free rb_cont_t or rb_fiber_t */
- ruby_xfree(ptr);
- }
- RUBY_FREE_LEAVE("cont");
-}
-
-static void
-fiber_mark(void *ptr)
-{
- RUBY_MARK_ENTER("cont");
- if (ptr) {
- rb_fiber_t *fib = ptr;
- rb_gc_mark(fib->prev);
- cont_mark(&fib->cont);
- }
- RUBY_MARK_LEAVE("cont");
-}
-
-static void
-fiber_link_join(rb_fiber_t *fib)
-{
- VALUE current_fibval = rb_fiber_current();
- rb_fiber_t *current_fib;
- GetFiberPtr(current_fibval, current_fib);
-
- /* join fiber link */
- fib->next_fiber = current_fib->next_fiber;
- fib->prev_fiber = current_fib;
- current_fib->next_fiber->prev_fiber = fib;
- current_fib->next_fiber = fib;
-}
-
-static void
-fiber_link_remove(rb_fiber_t *fib)
-{
- fib->prev_fiber->next_fiber = fib->next_fiber;
- fib->next_fiber->prev_fiber = fib->prev_fiber;
-}
-
-static void
-fiber_free(void *ptr)
-{
- RUBY_FREE_ENTER("fiber");
- if (ptr) {
- rb_fiber_t *fib = ptr;
-
- if (fib->cont.type != ROOT_FIBER_CONTEXT) {
- st_free_table(fib->cont.saved_thread.local_storage);
- }
- fiber_link_remove(fib);
-
- cont_free(&fib->cont);
- }
- RUBY_FREE_LEAVE("fiber");
-}
-
-static void
-cont_save_machine_stack(rb_thread_t *th, rb_context_t *cont)
-{
- size_t size;
- rb_thread_t *sth = &cont->saved_thread;
-
- SET_MACHINE_STACK_END(&th->machine_stack_end);
-#ifdef __ia64
- th->machine_register_stack_end = rb_ia64_bsp();
-#endif
-
- if (th->machine_stack_start > th->machine_stack_end) {
- size = cont->machine_stack_size = th->machine_stack_start - th->machine_stack_end;
- cont->machine_stack_src = th->machine_stack_end;
- }
- else {
- size = cont->machine_stack_size = th->machine_stack_end - th->machine_stack_start;
- cont->machine_stack_src = th->machine_stack_start;
- }
-
- if (cont->machine_stack) {
- REALLOC_N(cont->machine_stack, VALUE, size);
- }
- else {
- cont->machine_stack = ALLOC_N(VALUE, size);
- }
-
- FLUSH_REGISTER_WINDOWS;
- MEMCPY(cont->machine_stack, cont->machine_stack_src, VALUE, size);
-
-#ifdef __ia64
- rb_ia64_flushrs();
- size = cont->machine_register_stack_size = th->machine_register_stack_end - th->machine_register_stack_start;
- cont->machine_register_stack_src = th->machine_register_stack_start;
- if (cont->machine_register_stack) {
- REALLOC_N(cont->machine_register_stack, VALUE, size);
- }
- else {
- cont->machine_register_stack = ALLOC_N(VALUE, size);
- }
-
- MEMCPY(cont->machine_register_stack, cont->machine_register_stack_src, VALUE, size);
-#endif
-
- sth->machine_stack_start = sth->machine_stack_end = 0;
-#ifdef __ia64
- sth->machine_register_stack_start = sth->machine_register_stack_end = 0;
-#endif
-}
-
-static void
-cont_init(rb_context_t *cont)
-{
- rb_thread_t *th = GET_THREAD();
-
- /* save thread context */
- cont->saved_thread = *th;
-}
-
-static rb_context_t *
-cont_new(VALUE klass)
-{
- rb_context_t *cont;
- volatile VALUE contval;
-
- contval = Data_Make_Struct(klass, rb_context_t, cont_mark, cont_free, cont);
- cont->self = contval;
- cont_init(cont);
- return cont;
-}
-
-void rb_vm_stack_to_heap(rb_thread_t *th);
-
-static VALUE
-cont_capture(volatile int *stat)
-{
- rb_context_t *cont;
- rb_thread_t *th = GET_THREAD(), *sth;
- volatile VALUE contval;
-
- rb_vm_stack_to_heap(th);
- cont = cont_new(rb_cContinuation);
- contval = cont->self;
- sth = &cont->saved_thread;
-
-#ifdef CAPTURE_JUST_VALID_VM_STACK
- cont->vm_stack_slen = th->cfp->sp + th->mark_stack_len - th->stack;
- cont->vm_stack_clen = th->stack + th->stack_size - (VALUE*)th->cfp;
- cont->vm_stack = ALLOC_N(VALUE, cont->vm_stack_slen + cont->vm_stack_clen);
- MEMCPY(cont->vm_stack, th->stack, VALUE, cont->vm_stack_slen);
- MEMCPY(cont->vm_stack + cont->vm_stack_slen, (VALUE*)th->cfp, VALUE, cont->vm_stack_clen);
-#else
- cont->vm_stack = ALLOC_N(VALUE, th->stack_size);
- MEMCPY(cont->vm_stack, th->stack, VALUE, th->stack_size);
-#endif
- sth->stack = 0;
-
- cont_save_machine_stack(th, cont);
-
- if (ruby_setjmp(cont->jmpbuf)) {
- VALUE value;
-
- value = cont->value;
- if (cont->argc == -1) rb_exc_raise(value);
- cont->value = Qnil;
- *stat = 1;
- return value;
- }
- else {
- *stat = 0;
- return cont->self;
- }
-}
-
-NOINLINE(NORETURN(static void cont_restore_1(rb_context_t *)));
-
-static void
-cont_restore_1(rb_context_t *cont)
-{
- rb_thread_t *th = GET_THREAD(), *sth = &cont->saved_thread;
-
- /* restore thread context */
- if (cont->type == CONTINUATION_CONTEXT) {
- /* continuation */
- VALUE fib;
-
- th->fiber = sth->fiber;
- fib = th->fiber ? th->fiber : th->root_fiber;
-
- if (fib) {
- rb_context_t *fcont;
- GetContPtr(fib, fcont);
- th->stack_size = fcont->saved_thread.stack_size;
- th->stack = fcont->saved_thread.stack;
- }
-#ifdef CAPTURE_JUST_VALID_VM_STACK
- MEMCPY(th->stack, cont->vm_stack, VALUE, cont->vm_stack_slen);
- MEMCPY(th->stack + sth->stack_size - cont->vm_stack_clen,
- cont->vm_stack + cont->vm_stack_slen, VALUE, cont->vm_stack_clen);
-#else
- MEMCPY(th->stack, cont->vm_stack, VALUE, sth->stack_size);
-#endif
- }
- else {
- /* fiber */
- th->stack = sth->stack;
- th->stack_size = sth->stack_size;
- th->local_storage = sth->local_storage;
- th->fiber = cont->self;
- }
-
- th->cfp = sth->cfp;
- th->safe_level = sth->safe_level;
- th->raised_flag = sth->raised_flag;
- th->state = sth->state;
- th->status = sth->status;
- th->tag = sth->tag;
- th->trap_tag = sth->trap_tag;
- th->errinfo = sth->errinfo;
- th->first_proc = sth->first_proc;
-
- /* restore machine stack */
-#ifdef _M_AMD64
- {
- /* workaround for x64 SEH */
- jmp_buf buf;
- setjmp(buf);
- ((_JUMP_BUFFER*)(&cont->jmpbuf))->Frame =
- ((_JUMP_BUFFER*)(&buf))->Frame;
- }
-#endif
- if (cont->machine_stack_src) {
- FLUSH_REGISTER_WINDOWS;
- MEMCPY(cont->machine_stack_src, cont->machine_stack,
- VALUE, cont->machine_stack_size);
- }
-
-#ifdef __ia64
- if (cont->machine_register_stack_src) {
- MEMCPY(cont->machine_register_stack_src, cont->machine_register_stack,
- VALUE, cont->machine_register_stack_size);
- }
-#endif
-
- ruby_longjmp(cont->jmpbuf, 1);
-}
-
-NORETURN(NOINLINE(static void cont_restore_0(rb_context_t *, VALUE *)));
-
-#ifdef __ia64
-#define C(a) rse_##a##0, rse_##a##1, rse_##a##2, rse_##a##3, rse_##a##4
-#define E(a) rse_##a##0= rse_##a##1= rse_##a##2= rse_##a##3= rse_##a##4
-static volatile int C(a), C(b), C(c), C(d), C(e);
-static volatile int C(f), C(g), C(h), C(i), C(j);
-static volatile int C(k), C(l), C(m), C(n), C(o);
-static volatile int C(p), C(q), C(r), C(s), C(t);
-#if 0
-{/* the above lines make cc-mode.el confused so much */}
-#endif
-int rb_dummy_false = 0;
-NORETURN(NOINLINE(static void register_stack_extend(rb_context_t *, VALUE *, VALUE *)));
-static void
-register_stack_extend(rb_context_t *cont, VALUE *vp, VALUE *curr_bsp)
-{
- if (rb_dummy_false) {
- /* use registers as much as possible */
- E(a) = E(b) = E(c) = E(d) = E(e) =
- E(f) = E(g) = E(h) = E(i) = E(j) =
- E(k) = E(l) = E(m) = E(n) = E(o) =
- E(p) = E(q) = E(r) = E(s) = E(t) = 0;
- E(a) = E(b) = E(c) = E(d) = E(e) =
- E(f) = E(g) = E(h) = E(i) = E(j) =
- E(k) = E(l) = E(m) = E(n) = E(o) =
- E(p) = E(q) = E(r) = E(s) = E(t) = 0;
- }
- if (curr_bsp < cont->machine_register_stack_src+cont->machine_register_stack_size) {
- register_stack_extend(cont, vp, (VALUE*)rb_ia64_bsp());
- }
- cont_restore_0(cont, vp);
-}
-#undef C
-#undef E
-#endif
-
-static void
-cont_restore_0(rb_context_t *cont, VALUE *addr_in_prev_frame)
-{
- if (cont->machine_stack_src) {
-#ifdef HAVE_ALLOCA
-#define STACK_PAD_SIZE 1
-#else
-#define STACK_PAD_SIZE 1024
-#endif
- VALUE space[STACK_PAD_SIZE];
-
-#if !STACK_GROW_DIRECTION
- if (addr_in_prev_frame > &space[0]) {
- /* Stack grows downward */
-#endif
-#if STACK_GROW_DIRECTION <= 0
- volatile VALUE *const end = cont->machine_stack_src;
- if (&space[0] > end) {
-# ifdef HAVE_ALLOCA
- volatile VALUE *sp = ALLOCA_N(VALUE, &space[0] - end);
- (void)sp;
-# else
- cont_restore_0(cont, &space[0]);
-# endif
- }
-#endif
-#if !STACK_GROW_DIRECTION
- }
- else {
- /* Stack grows upward */
-#endif
-#if STACK_GROW_DIRECTION >= 0
- volatile VALUE *const end = cont->machine_stack_src + cont->machine_stack_size;
- if (&space[STACK_PAD_SIZE] < end) {
-# ifdef HAVE_ALLOCA
- volatile VALUE *sp = ALLOCA_N(VALUE, end - &space[STACK_PAD_SIZE]);
- (void)sp;
-# else
- cont_restore_0(cont, &space[STACK_PAD_SIZE-1]);
-# endif
- }
-#endif
-#if !STACK_GROW_DIRECTION
- }
-#endif
- }
- cont_restore_1(cont);
-}
-#ifdef __ia64
-#define cont_restore_0(cont, vp) register_stack_extend(cont, vp, (VALUE*)rb_ia64_bsp());
-#endif
-
-/*
- * Document-class: Continuation
- *
- * Continuation objects are generated by
- * <code>Kernel#callcc</code>. They hold a return address and execution
- * context, allowing a nonlocal return to the end of the
- * <code>callcc</code> block from anywhere within a program.
- * Continuations are somewhat analogous to a structured version of C's
- * <code>setjmp/longjmp</code> (although they contain more state, so
- * you might consider them closer to threads).
- *
- * For instance:
- *
- * arr = [ "Freddie", "Herbie", "Ron", "Max", "Ringo" ]
- * callcc{|$cc|}
- * puts(message = arr.shift)
- * $cc.call unless message =~ /Max/
- *
- * <em>produces:</em>
- *
- * Freddie
- * Herbie
- * Ron
- * Max
- *
- * This (somewhat contrived) example allows the inner loop to abandon
- * processing early:
- *
- * callcc {|cont|
- * for i in 0..4
- * print "\n#{i}: "
- * for j in i*5...(i+1)*5
- * cont.call() if j == 17
- * printf "%3d", j
- * end
- * end
- * }
- * print "\n"
- *
- * <em>produces:</em>
- *
- * 0: 0 1 2 3 4
- * 1: 5 6 7 8 9
- * 2: 10 11 12 13 14
- * 3: 15 16
- */
-
-/*
- * call-seq:
- * callcc {|cont| block } => obj
- *
- * Generates a <code>Continuation</code> object, which it passes to the
- * associated block. Performing a <em>cont</em><code>.call</code> will
- * cause the <code>callcc</code> to return (as will falling through the
- * end of the block). The value returned by the <code>callcc</code> is
- * the value of the block, or the value passed to
- * <em>cont</em><code>.call</code>. See class <code>Continuation</code>
- * for more details. Also see <code>Kernel::throw</code> for
- * an alternative mechanism for unwinding a call stack.
- */
-
-static VALUE
-rb_callcc(VALUE self)
-{
- volatile int called;
- volatile VALUE val = cont_capture(&called);
-
- if (called) {
- return val;
- }
- else {
- return rb_yield(val);
- }
-}
-
-static VALUE
-make_passing_arg(int argc, VALUE *argv)
-{
- switch(argc) {
- case 0:
- return Qnil;
- case 1:
- return argv[0];
- default:
- return rb_ary_new4(argc, argv);
- }
-}
-
-/*
- * call-seq:
- * cont.call(args, ...)
- * cont[args, ...]
- *
- * Invokes the continuation. The program continues from the end of the
- * <code>callcc</code> block. If no arguments are given, the original
- * <code>callcc</code> returns <code>nil</code>. If one argument is
- * given, <code>callcc</code> returns it. Otherwise, an array
- * containing <i>args</i> is returned.
- *
- * callcc {|cont| cont.call } #=> nil
- * callcc {|cont| cont.call 1 } #=> 1
- * callcc {|cont| cont.call 1, 2, 3 } #=> [1, 2, 3]
- */
-
-static VALUE
-rb_cont_call(int argc, VALUE *argv, VALUE contval)
-{
- rb_context_t *cont;
- rb_thread_t *th = GET_THREAD();
- GetContPtr(contval, cont);
-
- if (cont->saved_thread.self != th->self) {
- rb_raise(rb_eRuntimeError, "continuation called across threads");
- }
- if (cont->saved_thread.trap_tag != th->trap_tag) {
- rb_raise(rb_eRuntimeError, "continuation called across trap");
- }
- if (cont->saved_thread.fiber) {
- rb_context_t *fcont;
- GetContPtr(cont->saved_thread.fiber, fcont);
-
- if (th->fiber != cont->saved_thread.fiber) {
- rb_raise(rb_eRuntimeError, "continuation called across fiber");
- }
- }
-
- cont->argc = argc;
- cont->value = make_passing_arg(argc, argv);
-
- cont_restore_0(cont, &contval);
- return Qnil; /* unreachable */
-}
-
-/*********/
-/* fiber */
-/*********/
-
-/*
- * Document-class: Fiber
- *
- * Fibers are primitives for implementing light weight cooperative
- * concurrency in Ruby. Basically they are a means of creating code blocks
- * that can be paused and resumed, much like threads. The main difference
- * is that they are never preempted and that the scheduling must be done by
- * the programmer and not the VM.
- *
- * As opposed to other stackless light weight concurrency models, each fiber
- * comes with a small 4KB stack. This enables the fiber to be paused from deeply
- * nested function calls within the fiber block.
- *
- * When a fiber is created it will not run automatically. Rather it must be
- * be explicitly asked to run using the <code>Fiber#resume</code> method.
- * The code running inside the fiber can give up control by calling
- * <code>Fiber.yield</code> in which case it yields control back to caller
- * (the caller of the <code>Fiber#resume</code>).
- *
- * Upon yielding or termination the Fiber returns the value of the last
- * executed expression
- *
- * For instance:
- *
- * fiber = Fiber.new do
- * Fiber.yield 1
- * 2
- * end
- *
- * puts fiber.resume
- * puts fiber.resume
- * puts fiber.resume
- *
- * <em>produces</em>
- *
- * 1
- * 2
- * FiberError: dead fiber called
- *
- * The <code>Fiber#resume</code> method accepts an arbitary number of
- * parameters, if it is the first call to <code>resume</code> then they
- * will be passed as block arguments. Otherwise they will be the return
- * value of the call to <code>Fiber.yield</code>
- *
- * Example:
- *
- * fiber = Fiber.new do |first|
- * second = Fiber.yield first + 2
- * end
- *
- * puts fiber.resume 10
- * puts fiber.resume 14
- * puts fiber.resume 18
- *
- * <em>produces</em>
- *
- * 12
- * 14
- * FiberError: dead fiber called
- *
- */
-
-#define FIBER_VM_STACK_SIZE (4 * 1024)
-
-static VALUE
-fiber_alloc(VALUE klass)
-{
- return Data_Wrap_Struct(klass, fiber_mark, fiber_free, 0);
-}
-
-static rb_fiber_t*
-fiber_t_alloc(VALUE fibval)
-{
- rb_fiber_t *fib = ALLOC(rb_fiber_t);
-
- memset(fib, 0, sizeof(rb_fiber_t));
- fib->cont.self = fibval;
- fib->cont.type = FIBER_CONTEXT;
- cont_init(&fib->cont);
- fib->prev = Qnil;
- fib->status = CREATED;
-
- DATA_PTR(fibval) = fib;
-
- return fib;
-}
-
-static VALUE
-fiber_init(VALUE fibval, VALUE proc)
-{
- rb_fiber_t *fib = fiber_t_alloc(fibval);
- rb_context_t *cont = &fib->cont;
- rb_thread_t *th = &cont->saved_thread;
-
- fiber_link_join(fib);
-
- /* initialize cont */
- cont->vm_stack = 0;
-
- th->stack = 0;
- th->stack_size = FIBER_VM_STACK_SIZE;
- th->stack = ALLOC_N(VALUE, th->stack_size);
-
- th->cfp = (void *)(th->stack + th->stack_size);
- th->cfp--;
- th->cfp->pc = 0;
- th->cfp->sp = th->stack + 1;
- th->cfp->bp = 0;
- th->cfp->lfp = th->stack;
- *th->cfp->lfp = 0;
- th->cfp->dfp = th->stack;
- th->cfp->self = Qnil;
- th->cfp->flag = 0;
- th->cfp->iseq = 0;
- th->cfp->proc = 0;
- th->cfp->block_iseq = 0;
- th->tag = 0;
- th->local_storage = st_init_numtable();
-
- th->first_proc = proc;
-
- MEMCPY(&cont->jmpbuf, &th->root_jmpbuf, rb_jmpbuf_t, 1);
-
- return fibval;
-}
-
-static VALUE
-rb_fiber_init(VALUE fibval)
-{
- return fiber_init(fibval, rb_block_proc());
-}
-
-VALUE
-rb_fiber_new(VALUE (*func)(ANYARGS), VALUE obj)
-{
- return fiber_init(fiber_alloc(rb_cFiber), rb_proc_new(func, obj));
-}
-
-static VALUE
-return_fiber(void)
-{
- rb_fiber_t *fib;
- VALUE curr = rb_fiber_current();
- GetFiberPtr(curr, fib);
-
- if (fib->prev == Qnil) {
- rb_thread_t *th = GET_THREAD();
-
- if (th->root_fiber != curr) {
- return th->root_fiber;
- }
- else {
- rb_raise(rb_eFiberError, "can't yield from root fiber");
- }
- }
- else {
- VALUE prev = fib->prev;
- fib->prev = Qnil;
- return prev;
- }
-}
-
-VALUE rb_fiber_transfer(VALUE fib, int argc, VALUE *argv);
-
-static void
-rb_fiber_terminate(rb_fiber_t *fib)
-{
- VALUE value = fib->cont.value;
- fib->status = TERMINATED;
- rb_fiber_transfer(return_fiber(), 1, &value);
-}
-
-void
-rb_fiber_start(void)
-{
- rb_thread_t *th = GET_THREAD();
- rb_fiber_t *fib;
- rb_context_t *cont;
- rb_proc_t *proc;
- int state;
-
- GetFiberPtr(th->fiber, fib);
- cont = &fib->cont;
-
- TH_PUSH_TAG(th);
- if ((state = EXEC_TAG()) == 0) {
- int argc;
- VALUE *argv, args;
- GetProcPtr(cont->saved_thread.first_proc, proc);
- args = cont->value;
- argv = (argc = cont->argc) > 1 ? RARRAY_PTR(args) : &args;
- cont->value = Qnil;
- th->errinfo = Qnil;
- th->local_lfp = proc->block.lfp;
- th->local_svar = Qnil;
-
- fib->status = RUNNING;
- cont->value = rb_vm_invoke_proc(th, proc, proc->block.self, argc, argv, 0);
- }
- TH_POP_TAG();
-
- if (state) {
- if (TAG_RAISE) {
- th->thrown_errinfo = th->errinfo;
- }
- else {
- th->thrown_errinfo =
- rb_vm_make_jump_tag_but_local_jump(state, th->errinfo);
- }
- RUBY_VM_SET_INTERRUPT(th);
- }
-
- rb_fiber_terminate(fib);
- rb_bug("rb_fiber_start: unreachable");
-}
-
-static rb_fiber_t *
-root_fiber_alloc(rb_thread_t *th)
-{
- rb_fiber_t *fib;
-
- /* no need to allocate vm stack */
- fib = fiber_t_alloc(fiber_alloc(rb_cFiber));
- fib->cont.type = ROOT_FIBER_CONTEXT;
- fib->prev_fiber = fib->next_fiber = fib;
-
- return fib;
-}
-
-VALUE
-rb_fiber_current(void)
-{
- rb_thread_t *th = GET_THREAD();
- if (th->fiber == 0) {
- /* save root */
- rb_fiber_t *fib = root_fiber_alloc(th);
- th->root_fiber = th->fiber = fib->cont.self;
- }
- return th->fiber;
-}
-
-static VALUE
-fiber_store(rb_fiber_t *next_fib)
-{
- rb_thread_t *th = GET_THREAD();
- rb_fiber_t *fib;
-
- if (th->fiber) {
- GetFiberPtr(th->fiber, fib);
- fib->cont.saved_thread = *th;
- }
- else {
- /* create current fiber */
- fib = root_fiber_alloc(th);
- th->root_fiber = th->fiber = fib->cont.self;
- }
-
- cont_save_machine_stack(th, &fib->cont);
-
- if (ruby_setjmp(fib->cont.jmpbuf)) {
- /* restored */
- GetFiberPtr(th->fiber, fib);
- if (fib->cont.argc == -1) rb_exc_raise(fib->cont.value);
- return fib->cont.value;
- }
- else {
- return Qundef;
- }
-}
-
-static inline VALUE
-fiber_switch(VALUE fibval, int argc, VALUE *argv, int is_resume)
-{
- VALUE value;
- rb_fiber_t *fib;
- rb_context_t *cont;
- rb_thread_t *th = GET_THREAD();
-
- GetFiberPtr(fibval, fib);
- cont = &fib->cont;
-
- if (cont->saved_thread.self != th->self) {
- rb_raise(rb_eFiberError, "fiber called across threads");
- }
- else if (cont->saved_thread.trap_tag != th->trap_tag) {
- rb_raise(rb_eFiberError, "fiber called across trap");
- }
- else if (fib->status == TERMINATED) {
- value = rb_exc_new2(rb_eFiberError, "dead fiber called");
- if (th->fiber != fibval) rb_exc_raise(value);
- fibval = fib->prev;
- if (NIL_P(fibval)) fibval = th->root_fiber;
- GetFiberPtr(fibval, fib);
- cont = &fib->cont;
- cont->argc = -1;
- cont->value = value;
- cont_restore_0(cont, &value);
- }
-
- if (is_resume) {
- fib->prev = rb_fiber_current();
- }
-
- cont->argc = argc;
- cont->value = make_passing_arg(argc, argv);
-
- if ((value = fiber_store(fib)) == Qundef) {
- cont_restore_0(cont, &value);
- rb_bug("rb_fiber_resume: unreachable");
- }
-
- RUBY_VM_CHECK_INTS();
-
- return value;
-}
-
-VALUE
-rb_fiber_transfer(VALUE fib, int argc, VALUE *argv)
-{
- return fiber_switch(fib, argc, argv, 0);
-}
-
-VALUE
-rb_fiber_resume(VALUE fibval, int argc, VALUE *argv)
-{
- rb_fiber_t *fib;
- GetFiberPtr(fibval, fib);
-
- if (fib->prev != Qnil) {
- rb_raise(rb_eFiberError, "double resume");
- }
-
- return fiber_switch(fibval, argc, argv, 1);
-}
-
-VALUE
-rb_fiber_yield(int argc, VALUE *argv)
-{
- return rb_fiber_transfer(return_fiber(), argc, argv);
-}
-
-/*
- * call-seq:
- * fiber.alive? -> true or false
- *
- * Returns true if the fiber can still be resumed (or transferred to).
- * After finishing execution of the fiber block this method will always
- * return false.
- */
-VALUE
-rb_fiber_alive_p(VALUE fibval)
-{
- rb_fiber_t *fib;
- GetFiberPtr(fibval, fib);
- return fib->status != TERMINATED ? Qtrue : Qfalse;
-}
-
-/*
- * call-seq:
- * fiber.resume(args, ...) -> obj
- *
- * Resumes the fiber from the point at which the last <code>Fiber.yield</code>
- * was called, or starts running it if it is the first call to
- * <code>resume</code>. Arguments passed to resume will be the value of
- * the <code>Fiber.yield</code> expression or will be passed as block
- * parameters to the fiber's block if this is the first <code>resume</code>.
- *
- * Alternatively, when resume is called it evaluates to the arguments passed
- * to the next <code>Fiber.yield</code> statement inside the fiber's block
- * or to the block value if it runs to completion without any
- * <code>Fiber.yield</code>
- */
-static VALUE
-rb_fiber_m_resume(int argc, VALUE *argv, VALUE fib)
-{
- return rb_fiber_resume(fib, argc, argv);
-}
-
-/*
- * call-seq:
- * fiber.transfer(args, ...) -> obj
- *
- * Transfer control to another fiber, resuming it from where it last
- * stopped or starting it if it was not resumed before. The calling
- * fiber will be suspended much like in a call to <code>Fiber.yield</code>.
- *
- * The fiber which recieves the transfer call is treats it much like
- * a resume call. Arguments passed to transfer are treated like those
- * passed to resume.
- *
- * You cannot resume a fiber that transferred control to another one.
- * This will cause a double resume error. You need to transfer control
- * back to this fiber before it can yield and resume.
- */
-static VALUE
-rb_fiber_m_transfer(int argc, VALUE *argv, VALUE fib)
-{
- return rb_fiber_transfer(fib, argc, argv);
-}
-
-/*
- * call-seq:
- * Fiber.yield(args, ...) -> obj
- *
- * Yields control back to the context that resumed the fiber, passing
- * along any arguments that were passed to it. The fiber will resume
- * processing at this point when <code>resume</code> is called next.
- * Any arguments passed to the next <code>resume</code> will be the
- * value that this <code>Fiber.yield</code> expression evaluates to.
- */
-static VALUE
-rb_fiber_s_yield(int argc, VALUE *argv, VALUE klass)
-{
- return rb_fiber_yield(argc, argv);
-}
-
-/*
- * call-seq:
- * Fiber.current() -> fiber
- *
- * Returns the current fiber. You need to <code>require 'fiber'</code>
- * before using this method. If you are not running in the context of
- * a fiber this method will return the root fiber.
- */
-static VALUE
-rb_fiber_s_current(VALUE klass)
-{
- return rb_fiber_current();
-}
-
-void
-Init_Cont(void)
-{
- rb_cFiber = rb_define_class("Fiber", rb_cObject);
- rb_define_alloc_func(rb_cFiber, fiber_alloc);
- rb_eFiberError = rb_define_class("FiberError", rb_eStandardError);
- rb_define_singleton_method(rb_cFiber, "yield", rb_fiber_s_yield, -1);
- rb_define_method(rb_cFiber, "initialize", rb_fiber_init, 0);
- rb_define_method(rb_cFiber, "resume", rb_fiber_m_resume, -1);
-}
-
-void
-ruby_Init_Continuation_body(void)
-{
- rb_cContinuation = rb_define_class("Continuation", rb_cObject);
- rb_undef_alloc_func(rb_cContinuation);
- rb_undef_method(CLASS_OF(rb_cContinuation), "new");
- rb_define_method(rb_cContinuation, "call", rb_cont_call, -1);
- rb_define_method(rb_cContinuation, "[]", rb_cont_call, -1);
- rb_define_global_function("callcc", rb_callcc, 0);
-}
-
-void
-ruby_Init_Fiber_as_Coroutine(void)
-{
- rb_define_method(rb_cFiber, "transfer", rb_fiber_m_transfer, -1);
- rb_define_method(rb_cFiber, "alive?", rb_fiber_alive_p, 0);
- rb_define_singleton_method(rb_cFiber, "current", rb_fiber_s_current, 0);
-}
diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in
index eb6967aef5..03208df11c 100644
--- a/cygwin/GNUmakefile.in
+++ b/cygwin/GNUmakefile.in
@@ -1,15 +1,14 @@
include Makefile
--include uncommon.mk
ENABLE_SHARED=@ENABLE_SHARED@
DLLWRAP = @DLLWRAP@ --target=@target_os@
ifeq (@target_os@,cygwin)
- DLL_BASE_NAME := $(LIBRUBY_SO:.dll=)
+ DLL_BASE_NAME := $(subst .dll,,$(LIBRUBY_SO))
else
DLL_BASE_NAME := $(RUBY_SO_NAME)
DLLWRAP += -mno-cygwin
- VPATH := $(VPATH):$(srcdir)/win32
+ VPATH += $(srcdir)/win32
endif
ifneq ($(ENABLE_SHARED),yes)
@@ -27,9 +26,8 @@ endif
WPROGRAM = $(RUBYW_INSTALL_NAME)$(EXEEXT)
SOLIBS := $(DLL_BASE_NAME).res.@OBJEXT@ $(SOLIBS)
-EXTOBJS += $(if $(filter-out $(RUBYW_INSTALL_NAME),$(@:$(EXEEXT)=)),$(RUBY_INSTALL_NAME),$(@:$(EXEEXT)=)).res.$(OBJEXT)
+EXTOBJS += $(@:$(EXEEXT)=.res.@OBJEXT@)
RCFILES = $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(DLL_BASE_NAME).rc
-RUBYDEF = $(DLL_BASE_NAME).def
ruby: $(PROGRAM)
rubyw: $(WPROGRAM)
@@ -62,22 +60,15 @@ $(RUBY_EXP): $(LIBRUBY_A)
GNUmakefile: $(srcdir)/cygwin/GNUmakefile.in
ifeq (@target_os@,mingw32)
-$(OBJS) $(MAINOBJ): win32.h
-
-dir.$(OBJEXT) win32.$(OBJEXT): win32/dir.h
+$(OBJS) $(MAINOBJ): win32/win32.h
endif
-$(LIBRUBY_SO): $(RUBYDEF)
-
-$(RUBYDEF): $(LIBRUBY_A) $(PREP) $(RBCONFIG)
- $(MINIRUBY) $(srcdir)/win32/mkexports.rb -output=$@ $(LIBRUBY_A)
-
-clean-local::
- @$(RM) $(RUBYDEF)
-
ifeq (@target_os@,cygwin)
-cygwin-$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR)$(TEENY).dll: $(LIBRUBY_A) $(RUBYDEF)
- @DLLWRAP@ -s --def=$(RUBYDEF) -o $@
+cygwin-$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR).dll: $(LIBRUBY_A)
+ @NM@ --extern --defined $(LIBRUBY_A) | \
+ $(MINIRUBY) -ne 'BEGIN{puts "EXPORTS"}; puts $$1+"=cyg$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR)."+$$1 if / [CDT] _(.*)$$/' >rubydll.def
+ @DLLWRAP@ -s --def=rubydll.def -o $@
+ @rm -f rubydll.def
endif
clean-local::
diff --git a/debug.c b/debug.c
deleted file mode 100644
index b3eafa14ea..0000000000
--- a/debug.c
+++ /dev/null
@@ -1,164 +0,0 @@
-/**********************************************************************
-
- debug.c -
-
- $Author$
- created at: 04/08/25 02:31:54 JST
-
- Copyright (C) 2004-2007 Koichi Sasada
-
-**********************************************************************/
-
-#include "ruby/ruby.h"
-#include "ruby/encoding.h"
-#include "ruby/util.h"
-#include "debug.h"
-#include "eval_intern.h"
-#include "vm_core.h"
-#include "id.h"
-
-/* for gdb */
-const union {
- enum ruby_special_consts special_consts;
- enum ruby_value_type value_type;
- enum ruby_tag_type tag_type;
- enum node_type node_type;
- enum ruby_method_ids method_ids;
- enum {
- RUBY_ENCODING_INLINE_MAX = ENCODING_INLINE_MAX,
- RUBY_ENCODING_SHIFT = ENCODING_SHIFT,
- RUBY_ENCODING_MASK = ENCODING_MASK,
- RUBY_ENC_CODERANGE_MASK = ENC_CODERANGE_MASK,
- RUBY_ENC_CODERANGE_UNKNOWN = ENC_CODERANGE_UNKNOWN,
- RUBY_ENC_CODERANGE_7BIT = ENC_CODERANGE_7BIT,
- RUBY_ENC_CODERANGE_VALID = ENC_CODERANGE_VALID,
- RUBY_ENC_CODERANGE_BROKEN = ENC_CODERANGE_BROKEN,
- RUBY_FL_MARK = FL_MARK,
- RUBY_FL_RESERVED = FL_RESERVED,
- RUBY_FL_FINALIZE = FL_FINALIZE,
- RUBY_FL_TAINT = FL_TAINT,
- RUBY_FL_UNTRUSTED = FL_UNTRUSTED,
- RUBY_FL_EXIVAR = FL_EXIVAR,
- RUBY_FL_FREEZE = FL_FREEZE,
- RUBY_FL_SINGLETON = FL_SINGLETON,
- RUBY_FL_USER0 = FL_USER0,
- RUBY_FL_USER1 = FL_USER1,
- RUBY_FL_USER2 = FL_USER2,
- RUBY_FL_USER3 = FL_USER3,
- RUBY_FL_USER4 = FL_USER4,
- RUBY_FL_USER5 = FL_USER5,
- RUBY_FL_USER6 = FL_USER6,
- RUBY_FL_USER7 = FL_USER7,
- RUBY_FL_USER8 = FL_USER8,
- RUBY_FL_USER9 = FL_USER9,
- RUBY_FL_USER10 = FL_USER10,
- RUBY_FL_USER11 = FL_USER11,
- RUBY_FL_USER12 = FL_USER12,
- RUBY_FL_USER13 = FL_USER13,
- RUBY_FL_USER14 = FL_USER14,
- RUBY_FL_USER15 = FL_USER15,
- RUBY_FL_USER16 = FL_USER16,
- RUBY_FL_USER17 = FL_USER17,
- RUBY_FL_USER18 = FL_USER18,
- RUBY_FL_USHIFT = FL_USHIFT,
- RUBY_NODE_TYPESHIFT = NODE_TYPESHIFT,
- RUBY_NODE_TYPEMASK = NODE_TYPEMASK,
- RUBY_NODE_LSHIFT = NODE_LSHIFT,
- RUBY_NODE_LMASK = NODE_LMASK,
- RUBY_NODE_FL_NEWLINE = NODE_FL_NEWLINE
- } various;
-} ruby_dummy_gdb_enums;
-
-const VALUE RUBY_FL_USER19 = FL_USER19;
-
-int
-ruby_debug_print_indent(int level, int debug_level, int indent_level)
-{
- if (level < debug_level) {
- fprintf(stderr, "%*s", indent_level, "");
- fflush(stderr);
- return Qtrue;
- }
- return Qfalse;
-}
-
-void
-ruby_debug_printf(const char *format, ...)
-{
- va_list ap;
- va_start(ap, format);
- vfprintf(stderr, format, ap);
- va_end(ap);
-}
-
-VALUE
-ruby_debug_print_value(int level, int debug_level, const char *header, VALUE obj)
-{
- if (level < debug_level) {
- VALUE str;
- str = rb_inspect(obj);
- fprintf(stderr, "DBG> %s: %s\n", header,
- obj == (VALUE)(SIGNED_VALUE)-1 ? "" : StringValueCStr(str));
- fflush(stderr);
- }
- return obj;
-}
-
-void
-ruby_debug_print_v(VALUE v)
-{
- ruby_debug_print_value(0, 1, "", v);
-}
-
-ID
-ruby_debug_print_id(int level, int debug_level, const char *header, ID id)
-{
- if (level < debug_level) {
- fprintf(stderr, "DBG> %s: %s\n", header, rb_id2name(id));
- fflush(stderr);
- }
- return id;
-}
-
-NODE *
-ruby_debug_print_node(int level, int debug_level, const char *header, const NODE *node)
-{
- if (level < debug_level) {
- fprintf(stderr, "DBG> %s: %s (%lu)\n", header,
- ruby_node_name(nd_type(node)), nd_line(node));
- }
- return (NODE *)node;
-}
-
-void
-ruby_debug_breakpoint(void)
-{
- /* */
-}
-
-#ifdef RUBY_DEBUG_ENV
-static void
-set_debug_option(const char *str, int len, void *arg)
-{
-#define SET_WHEN(name, var) do { \
- if (len == sizeof(name) - 1 && \
- strncmp(str, name, len) == 0) { \
- extern int var; \
- var = 1; \
- return; \
- } \
- } while (0)
- SET_WHEN("gc_stress", *ruby_initial_gc_stress_ptr);
- SET_WHEN("core", ruby_enable_coredump);
-#if defined _WIN32 && defined _MSC_VER && _MSC_VER >= 1400
- SET_WHEN("rtc_error", ruby_w32_rtc_error);
-#endif
- fprintf(stderr, "unexpected debug option: %.*s\n", len, str);
-}
-
-void
-ruby_set_debug_option(const char *str)
-{
- ruby_each_words(str, set_debug_option, 0);
-}
-#endif
diff --git a/debug.h b/debug.h
deleted file mode 100644
index d5670651a4..0000000000
--- a/debug.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/**********************************************************************
-
- debug.h - YARV Debug function interface
-
- $Author$
- created at: 04/08/25 02:33:49 JST
-
- Copyright (C) 2004-2007 Koichi Sasada
-
-**********************************************************************/
-
-#ifndef RUBY_DEBUG_H
-#define RUBY_DEBUG_H
-
-#include "ruby/ruby.h"
-#include "node.h"
-
-#define dpv(h,v) ruby_debug_print_value(-1, 0, h, v)
-#define dp(v) ruby_debug_print_value(-1, 0, "", v)
-#define dpi(i) ruby_debug_print_id(-1, 0, "", i)
-#define dpn(n) ruby_debug_print_node(-1, 0, "", n)
-
-#define bp() ruby_debug_breakpoint()
-
-VALUE ruby_debug_print_value(int level, int debug_level, const char *header, VALUE v);
-ID ruby_debug_print_id(int level, int debug_level, const char *header, ID id);
-NODE *ruby_debug_print_node(int level, int debug_level, const char *header, const NODE *node);
-int ruby_debug_print_indent(int level, int debug_level, int indent_level);
-void ruby_debug_breakpoint(void);
-void ruby_debug_gc_check_func(void);
-
-#ifdef RUBY_DEBUG_ENV
-void ruby_set_debug_option(const char *str);
-#endif
-
-#endif /* RUBY_DEBUG_H */
diff --git a/defines.h b/defines.h
new file mode 100644
index 0000000000..f39097fea4
--- /dev/null
+++ b/defines.h
@@ -0,0 +1,273 @@
+/************************************************
+
+ defines.h -
+
+ $Author$
+ $Date$
+ created at: Wed May 18 00:21:44 JST 1994
+
+************************************************/
+#ifndef DEFINES_H
+#define DEFINES_H
+
+#define RUBY
+
+#ifdef __cplusplus
+# ifndef HAVE_PROTOTYPES
+# define HAVE_PROTOTYPES 1
+# endif
+# ifndef HAVE_STDARG_PROTOTYPES
+# define HAVE_STDARG_PROTOTYPES 1
+# endif
+#endif
+
+#undef _
+#ifdef HAVE_PROTOTYPES
+# define _(args) args
+#else
+# define _(args) ()
+#endif
+
+#undef __
+#ifdef HAVE_STDARG_PROTOTYPES
+# define __(args) args
+#else
+# define __(args) ()
+#endif
+
+#ifdef __cplusplus
+#define ANYARGS ...
+#else
+#define ANYARGS
+#endif
+
+#define xmalloc ruby_xmalloc
+#define xcalloc ruby_xcalloc
+#define xrealloc ruby_xrealloc
+#define xfree ruby_xfree
+
+void *xmalloc _((long));
+void *xcalloc _((long,long));
+void *xrealloc _((void*,long));
+void xfree _((void*));
+
+#if SIZEOF_LONG_LONG > 0
+# define LONG_LONG long long
+#elif SIZEOF___INT64 > 0
+# define HAVE_LONG_LONG 1
+# define LONG_LONG __int64
+# undef SIZEOF_LONG_LONG
+# define SIZEOF_LONG_LONG SIZEOF___INT64
+#endif
+
+#if SIZEOF_INT*2 <= SIZEOF_LONG_LONG
+# define BDIGIT unsigned int
+# define SIZEOF_BDIGITS SIZEOF_INT
+# define BDIGIT_DBL unsigned LONG_LONG
+# define BDIGIT_DBL_SIGNED LONG_LONG
+#elif SIZEOF_INT*2 <= SIZEOF_LONG
+# define BDIGIT unsigned int
+# define SIZEOF_BDIGITS SIZEOF_INT
+# define BDIGIT_DBL unsigned long
+# define BDIGIT_DBL_SIGNED long
+#elif SIZEOF_SHORT*2 <= SIZEOF_LONG
+# define BDIGIT unsigned short
+# define SIZEOF_BDIGITS SIZEOF_SHORT
+# define BDIGIT_DBL unsigned long
+# define BDIGIT_DBL_SIGNED long
+#else
+# define BDIGIT unsigned short
+# define SIZEOF_BDIGITS (SIZEOF_LONG/2)
+# define BDIGIT_DBL unsigned long
+# define BDIGIT_DBL_SIGNED long
+#endif
+
+#ifdef __CYGWIN__
+#undef _WIN32
+#endif
+
+#if defined(MSDOS) || defined(_WIN32) || defined(__human68k__) || defined(__EMX__)
+#define DOSISH 1
+#ifndef _WIN32_WCE
+# define DOSISH_DRIVE_LETTER
+#endif
+#endif
+
+/* define RUBY_USE_EUC/SJIS for default kanji-code */
+#ifndef DEFAULT_KCODE
+#if defined(DOSISH) || defined(__CYGWIN__) || defined(__MACOS__) || defined(OS2)
+#define DEFAULT_KCODE KCODE_SJIS
+#else
+#define DEFAULT_KCODE KCODE_EUC
+#endif
+#endif
+
+#if defined(__NeXT__) || defined(__APPLE__)
+/* Do not trust WORDS_BIGENDIAN from configure since -arch compiler flag may
+ result in a different endian. Instead trust __BIG_ENDIAN__ and
+ __LITTLE_ENDIAN__ which are set correctly by -arch. */
+#undef WORDS_BIGENDIAN
+#ifdef __BIG_ENDIAN__
+#define WORDS_BIGENDIAN
+#endif
+#endif
+
+#ifdef __NeXT__
+/* NextStep, OpenStep, Rhapsody */
+#ifndef S_IRUSR
+#define S_IRUSR 0000400 /* read permission, owner */
+#endif
+#ifndef S_IRGRP
+#define S_IRGRP 0000040 /* read permission, group */
+#endif
+#ifndef S_IROTH
+#define S_IROTH 0000004 /* read permission, other */
+#endif
+#ifndef S_IWUSR
+#define S_IWUSR 0000200 /* write permission, owner */
+#endif
+#ifndef S_IWGRP
+#define S_IWGRP 0000020 /* write permission, group */
+#endif
+#ifndef S_IWOTH
+#define S_IWOTH 0000002 /* write permission, other */
+#endif
+#ifndef S_IXUSR
+#define S_IXUSR 0000100 /* execute/search permission, owner */
+#endif
+#ifndef S_IXGRP
+#define S_IXGRP 0000010 /* execute/search permission, group */
+#endif
+#ifndef S_IXOTH
+#define S_IXOTH 0000001 /* execute/search permission, other */
+#endif
+#ifndef S_IRWXU
+#define S_IRWXU 0000700 /* read, write, execute permissions, owner */
+#endif
+#ifndef S_IRWXG
+#define S_IRWXG 0000070 /* read, write, execute permissions, group */
+#endif
+#ifndef S_IRWXO
+#define S_IRWXO 0000007 /* read, write, execute permissions, other */
+#endif
+#ifndef S_ISBLK
+#define S_ISBLK(mode) (((mode) & (0170000)) == (0060000))
+#endif
+#ifndef S_ISCHR
+#define S_ISCHR(mode) (((mode) & (0170000)) == (0020000))
+#endif
+#ifndef S_ISDIR
+#define S_ISDIR(mode) (((mode) & (0170000)) == (0040000))
+#endif
+#ifndef S_ISFIFO
+#define S_ISFIFO(mode) (((mode) & (0170000)) == (0010000))
+#endif
+#ifndef S_ISREG
+#define S_ISREG(mode) (((mode) & (0170000)) == (0100000))
+#endif
+#ifndef __APPLE__
+/* NextStep, OpenStep (but not Rhapsody) */
+#ifndef GETPGRP_VOID
+#define GETPGRP_VOID 1
+#endif
+#ifndef WNOHANG
+#define WNOHANG 01
+#endif
+#ifndef WUNTRACED
+#define WUNTRACED 02
+#endif
+#ifndef X_OK
+#define X_OK 1
+#endif
+#endif /* __APPLE__ */
+#endif /* NeXT */
+
+#ifdef _WIN32
+#include "win32/win32.h"
+#endif
+
+#if defined(__VMS)
+#include "vms.h"
+#endif
+
+#if defined(__BEOS__)
+#include <net/socket.h> /* intern.h needs fd_set definition */
+#endif
+
+#ifdef RUBY_EXPORT
+#undef RUBY_EXTERN
+#endif
+
+#ifndef RUBY_EXTERN
+#define RUBY_EXTERN extern
+#endif
+
+#ifndef EXTERN
+#define EXTERN RUBY_EXTERN /* deprecated */
+#endif
+
+#ifndef RUBY_MBCHAR_MAXSIZE
+#define RUBY_MBCHAR_MAXSIZE INT_MAX
+ /* MB_CUR_MAX will not work well in C locale */
+#endif
+
+#if defined(sparc) || defined(__sparc__)
+static inline void
+flush_register_windows(void)
+{
+ asm
+#ifdef __GNUC__
+ volatile
+#endif
+# if defined(__sparc_v9__) || defined(__sparcv9) || defined(__arch64__)
+ ("flushw")
+# else
+ ("ta 0x03")
+# endif /* trap always to flush register windows if we are on a Sparc system */
+ ;
+}
+# define FLUSH_REGISTER_WINDOWS flush_register_windows()
+#elif defined(__ia64)
+void *rb_ia64_bsp(void);
+void rb_ia64_flushrs(void);
+# define FLUSH_REGISTER_WINDOWS rb_ia64_flushrs()
+#else
+# define FLUSH_REGISTER_WINDOWS ((void)0)
+#endif
+
+#if defined(DOSISH)
+#define PATH_SEP ";"
+#elif defined(riscos)
+#define PATH_SEP ","
+#else
+#define PATH_SEP ":"
+#endif
+#define PATH_SEP_CHAR PATH_SEP[0]
+
+#if defined(__human68k__)
+#define PATH_ENV "path"
+#else
+#define PATH_ENV "PATH"
+#endif
+
+#if defined(DOSISH) && !defined(__human68k__) && !defined(__EMX__)
+#define ENV_IGNORECASE
+#endif
+
+#ifndef CASEFOLD_FILESYSTEM
+# if defined DOSISH || defined __VMS
+# define CASEFOLD_FILESYSTEM 1
+# else
+# define CASEFOLD_FILESYSTEM 0
+# endif
+#endif
+
+#ifndef DLEXT_MAXLEN
+#define DLEXT_MAXLEN 4
+#endif
+
+#ifndef RUBY_PLATFORM
+#define RUBY_PLATFORM "unknown-unknown"
+#endif
+
+#endif
diff --git a/defs/keywords b/defs/keywords
deleted file mode 100644
index 1b5719aa85..0000000000
--- a/defs/keywords
+++ /dev/null
@@ -1,53 +0,0 @@
-%{
-struct kwtable {const char *name; int id[2]; enum lex_state_e state;};
-const struct kwtable *rb_reserved_word(const char *, unsigned int);
-#ifndef RIPPER
-static const struct kwtable *reserved_word(const char *, unsigned int);
-#define rb_reserved_word(str, len) reserved_word(str, len)
-%}
-
-struct kwtable;
-%%
-__ENCODING__, {keyword__ENCODING__, keyword__ENCODING__}, EXPR_END
-__LINE__, {keyword__LINE__, keyword__LINE__}, EXPR_END
-__FILE__, {keyword__FILE__, keyword__FILE__}, EXPR_END
-BEGIN, {keyword_BEGIN, keyword_BEGIN}, EXPR_END
-END, {keyword_END, keyword_END}, EXPR_END
-alias, {keyword_alias, keyword_alias}, EXPR_FNAME
-and, {keyword_and, keyword_and}, EXPR_VALUE
-begin, {keyword_begin, keyword_begin}, EXPR_BEG
-break, {keyword_break, keyword_break}, EXPR_MID
-case, {keyword_case, keyword_case}, EXPR_VALUE
-class, {keyword_class, keyword_class}, EXPR_CLASS
-def, {keyword_def, keyword_def}, EXPR_FNAME
-defined?, {keyword_defined, keyword_defined}, EXPR_ARG
-do, {keyword_do, keyword_do}, EXPR_BEG
-else, {keyword_else, keyword_else}, EXPR_BEG
-elsif, {keyword_elsif, keyword_elsif}, EXPR_VALUE
-end, {keyword_end, keyword_end}, EXPR_END
-ensure, {keyword_ensure, keyword_ensure}, EXPR_BEG
-false, {keyword_false, keyword_false}, EXPR_END
-for, {keyword_for, keyword_for}, EXPR_VALUE
-if, {keyword_if, modifier_if}, EXPR_VALUE
-in, {keyword_in, keyword_in}, EXPR_VALUE
-module, {keyword_module, keyword_module}, EXPR_VALUE
-next, {keyword_next, keyword_next}, EXPR_MID
-nil, {keyword_nil, keyword_nil}, EXPR_END
-not, {keyword_not, keyword_not}, EXPR_ARG
-or, {keyword_or, keyword_or}, EXPR_VALUE
-redo, {keyword_redo, keyword_redo}, EXPR_END
-rescue, {keyword_rescue, modifier_rescue}, EXPR_MID
-retry, {keyword_retry, keyword_retry}, EXPR_END
-return, {keyword_return, keyword_return}, EXPR_MID
-self, {keyword_self, keyword_self}, EXPR_END
-super, {keyword_super, keyword_super}, EXPR_ARG
-then, {keyword_then, keyword_then}, EXPR_BEG
-true, {keyword_true, keyword_true}, EXPR_END
-undef, {keyword_undef, keyword_undef}, EXPR_FNAME
-unless, {keyword_unless, modifier_unless}, EXPR_VALUE
-until, {keyword_until, modifier_until}, EXPR_VALUE
-when, {keyword_when, keyword_when}, EXPR_VALUE
-while, {keyword_while, modifier_while}, EXPR_VALUE
-yield, {keyword_yield, keyword_yield}, EXPR_ARG
-%%
-#endif
diff --git a/defs/known_errors.def b/defs/known_errors.def
deleted file mode 100644
index 9f09aa9c22..0000000000
--- a/defs/known_errors.def
+++ /dev/null
@@ -1,122 +0,0 @@
-EPERM
-ENOENT
-ESRCH
-EINTR
-EIO
-ENXIO
-E2BIG
-ENOEXEC
-EBADF
-ECHILD
-EAGAIN
-ENOMEM
-EACCES
-EFAULT
-ENOTBLK
-EBUSY
-EEXIST
-EXDEV
-ENODEV
-ENOTDIR
-EISDIR
-EINVAL
-ENFILE
-EMFILE
-ENOTTY
-ETXTBSY
-EFBIG
-ENOSPC
-ESPIPE
-EROFS
-EMLINK
-EPIPE
-EDOM
-ERANGE
-EDEADLK
-ENAMETOOLONG
-ENOLCK
-ENOSYS
-ENOTEMPTY
-ELOOP
-EWOULDBLOCK
-ENOMSG
-EIDRM
-ECHRNG
-EL2NSYNC
-EL3HLT
-EL3RST
-ELNRNG
-EUNATCH
-ENOCSI
-EL2HLT
-EBADE
-EBADR
-EXFULL
-ENOANO
-EBADRQC
-EBADSLT
-EDEADLOCK
-EBFONT
-ENOSTR
-ENODATA
-ETIME
-ENOSR
-ENONET
-ENOPKG
-EREMOTE
-ENOLINK
-EADV
-ESRMNT
-ECOMM
-EPROTO
-EMULTIHOP
-EDOTDOT
-EBADMSG
-EOVERFLOW
-ENOTUNIQ
-EBADFD
-EREMCHG
-ELIBACC
-ELIBBAD
-ELIBSCN
-ELIBMAX
-ELIBEXEC
-EILSEQ
-ERESTART
-ESTRPIPE
-EUSERS
-ENOTSOCK
-EDESTADDRREQ
-EMSGSIZE
-EPROTOTYPE
-ENOPROTOOPT
-EPROTONOSUPPORT
-ESOCKTNOSUPPORT
-EOPNOTSUPP
-EPFNOSUPPORT
-EAFNOSUPPORT
-EADDRINUSE
-EADDRNOTAVAIL
-ENETDOWN
-ENETUNREACH
-ENETRESET
-ECONNABORTED
-ECONNRESET
-ENOBUFS
-EISCONN
-ENOTCONN
-ESHUTDOWN
-ETOOMANYREFS
-ETIMEDOUT
-ECONNREFUSED
-EHOSTDOWN
-EHOSTUNREACH
-EALREADY
-EINPROGRESS
-ESTALE
-EUCLEAN
-ENOTNAM
-ENAVAIL
-EISNAM
-EREMOTEIO
-EDQUOT
diff --git a/defs/lex.c.src b/defs/lex.c.src
deleted file mode 100644
index 1b5719aa85..0000000000
--- a/defs/lex.c.src
+++ /dev/null
@@ -1,53 +0,0 @@
-%{
-struct kwtable {const char *name; int id[2]; enum lex_state_e state;};
-const struct kwtable *rb_reserved_word(const char *, unsigned int);
-#ifndef RIPPER
-static const struct kwtable *reserved_word(const char *, unsigned int);
-#define rb_reserved_word(str, len) reserved_word(str, len)
-%}
-
-struct kwtable;
-%%
-__ENCODING__, {keyword__ENCODING__, keyword__ENCODING__}, EXPR_END
-__LINE__, {keyword__LINE__, keyword__LINE__}, EXPR_END
-__FILE__, {keyword__FILE__, keyword__FILE__}, EXPR_END
-BEGIN, {keyword_BEGIN, keyword_BEGIN}, EXPR_END
-END, {keyword_END, keyword_END}, EXPR_END
-alias, {keyword_alias, keyword_alias}, EXPR_FNAME
-and, {keyword_and, keyword_and}, EXPR_VALUE
-begin, {keyword_begin, keyword_begin}, EXPR_BEG
-break, {keyword_break, keyword_break}, EXPR_MID
-case, {keyword_case, keyword_case}, EXPR_VALUE
-class, {keyword_class, keyword_class}, EXPR_CLASS
-def, {keyword_def, keyword_def}, EXPR_FNAME
-defined?, {keyword_defined, keyword_defined}, EXPR_ARG
-do, {keyword_do, keyword_do}, EXPR_BEG
-else, {keyword_else, keyword_else}, EXPR_BEG
-elsif, {keyword_elsif, keyword_elsif}, EXPR_VALUE
-end, {keyword_end, keyword_end}, EXPR_END
-ensure, {keyword_ensure, keyword_ensure}, EXPR_BEG
-false, {keyword_false, keyword_false}, EXPR_END
-for, {keyword_for, keyword_for}, EXPR_VALUE
-if, {keyword_if, modifier_if}, EXPR_VALUE
-in, {keyword_in, keyword_in}, EXPR_VALUE
-module, {keyword_module, keyword_module}, EXPR_VALUE
-next, {keyword_next, keyword_next}, EXPR_MID
-nil, {keyword_nil, keyword_nil}, EXPR_END
-not, {keyword_not, keyword_not}, EXPR_ARG
-or, {keyword_or, keyword_or}, EXPR_VALUE
-redo, {keyword_redo, keyword_redo}, EXPR_END
-rescue, {keyword_rescue, modifier_rescue}, EXPR_MID
-retry, {keyword_retry, keyword_retry}, EXPR_END
-return, {keyword_return, keyword_return}, EXPR_MID
-self, {keyword_self, keyword_self}, EXPR_END
-super, {keyword_super, keyword_super}, EXPR_ARG
-then, {keyword_then, keyword_then}, EXPR_BEG
-true, {keyword_true, keyword_true}, EXPR_END
-undef, {keyword_undef, keyword_undef}, EXPR_FNAME
-unless, {keyword_unless, modifier_unless}, EXPR_VALUE
-until, {keyword_until, modifier_until}, EXPR_VALUE
-when, {keyword_when, keyword_when}, EXPR_VALUE
-while, {keyword_while, modifier_while}, EXPR_VALUE
-yield, {keyword_yield, keyword_yield}, EXPR_ARG
-%%
-#endif
diff --git a/defs/opt_insn_unif.def b/defs/opt_insn_unif.def
deleted file mode 100644
index 1ac613dbea..0000000000
--- a/defs/opt_insn_unif.def
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# a definition of instruction unification
-#
-#
-
-__END__
-
-putobject putobject
-putobject putstring
-putobject setlocal
-putobject setdynamic
-
-putstring putstring
-putstring putobject
-putstring setlocal
-putstring setdynamic
-
-# putnil end
-
-dup setlocal
-
-# from tarai
-getlocal getlocal
-# getlocal send
-
-# from tak, ackermann
-getlocal putobject
-
-
diff --git a/defs/opt_operand.def b/defs/opt_operand.def
deleted file mode 100644
index 5ca1d74028..0000000000
--- a/defs/opt_operand.def
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# configration file for operand union optimization
-#
-# format:
-# [insn name] op1, op2 ...
-#
-# wildcard: *
-#
-
-__END__
-
-getlocal 2
-getlocal 3
-getlocal 4
-
-setlocal 2
-setlocal 3
-setlocal 4
-
-getdynamic *, 0
-getdynamic 1, 0
-getdynamic 2, 0
-getdynamic 3, 0
-getdynamic 4, 0
-
-setdynamic *, 0
-setdynamic 1, 0
-setdynamic 2, 0
-setdynamic 3, 0
-setdynamic 4, 0
-
-putobject INT2FIX(0)
-putobject INT2FIX(1)
-putobject Qtrue
-putobject Qfalse
-
-# CALL
-send *, *, Qfalse, 0, *
-send *, 0, Qfalse, 0, *
-send *, 1, Qfalse, 0, *
-send *, 2, Qfalse, 0, *
-send *, 3, Qfalse, 0, *
-
-# FCALL
-send *, *, Qfalse, 0x04, *
-send *, 0, Qfalse, 0x04, *
-send *, 1, Qfalse, 0x04, *
-send *, 2, Qfalse, 0x04, *
-send *, 3, Qfalse, 0x04, *
-
-# VCALL
-send *, 0, Qfalse, 0x0c, *
-
-
-__END__
-
-
-
-
diff --git a/dir.c b/dir.c
index 2459658f4d..c2c3f9452f 100644
--- a/dir.c
+++ b/dir.c
@@ -3,16 +3,16 @@
dir.c -
$Author$
+ $Date$
created at: Wed Jan 5 09:51:01 JST 1994
- Copyright (C) 1993-2007 Yukihiro Matsumoto
+ Copyright (C) 1993-2003 Yukihiro Matsumoto
Copyright (C) 2000 Network Applied Communication Laboratory, Inc.
Copyright (C) 2000 Information-technology Promotion Agency, Japan
**********************************************************************/
-#include "ruby/ruby.h"
-#include "ruby/encoding.h"
+#include "ruby.h"
#include <sys/types.h>
#include <sys/stat.h>
@@ -56,17 +56,25 @@ char *getenv();
#endif
#ifndef HAVE_STRING_H
-char *strchr(char*,char);
+char *strchr _((char*,char));
#endif
#include <ctype.h>
-#include "ruby/util.h"
+#include "util.h"
#if !defined HAVE_LSTAT && !defined lstat
#define lstat stat
#endif
+#ifndef CASEFOLD_FILESYSTEM
+# if defined DOSISH || defined __VMS
+# define CASEFOLD_FILESYSTEM 1
+# else
+# define CASEFOLD_FILESYSTEM 0
+# endif
+#endif
+
#define FNM_NOESCAPE 0x01
#define FNM_PATHNAME 0x02
#define FNM_DOTMATCH 0x04
@@ -80,22 +88,100 @@ char *strchr(char*,char);
#define FNM_NOMATCH 1
#define FNM_ERROR 2
-# define Next(p, e, enc) (p + rb_enc_mbclen(p, e, enc))
-# define Inc(p, e, enc) ((p) = Next(p, e, enc))
+#define downcase(c) (nocase && ISUPPER(c) ? tolower(c) : (c))
+#define compare(c1, c2) (((unsigned char)(c1)) - ((unsigned char)(c2)))
+
+/* caution: in case *p == '\0'
+ Next(p) == p + 1 in single byte environment
+ Next(p) == p in multi byte environment
+*/
+#if defined(CharNext)
+# define Next(p) CharNext(p)
+#elif defined(DJGPP)
+# define Next(p) ((p) + mblen(p, RUBY_MBCHAR_MAXSIZE))
+#elif defined(__EMX__)
+# define Next(p) ((p) + emx_mblen(p))
+static inline int
+emx_mblen(const char *p)
+{
+ int n = mblen(p, RUBY_MBCHAR_MAXSIZE);
+ return (n < 0) ? 1 : n;
+}
+#endif
+
+#ifndef Next /* single byte environment */
+# define Next(p) ((p) + 1)
+# define Inc(p) (++(p))
+# define Compare(p1, p2) (compare(downcase(*(p1)), downcase(*(p2))))
+#else /* multi byte environment */
+# define Inc(p) ((p) = Next(p))
+# define Compare(p1, p2) (CompareImpl(p1, p2, nocase))
+static int
+CompareImpl(const char *p1, const char *p2, int nocase)
+{
+ const int len1 = Next(p1) - p1;
+ const int len2 = Next(p2) - p2;
+#ifdef _WIN32
+ char buf1[10], buf2[10]; /* large enough? */
+#endif
+
+ if (len1 < 0 || len2 < 0) {
+ rb_fatal("CompareImpl: negative len");
+ }
+
+ if (len1 == 0) return len2;
+ if (len2 == 0) return -len1;
+
+#ifdef _WIN32
+ if (nocase && rb_w32_iswinnt()) {
+ if (len1 > 1) {
+ if (len1 >= sizeof(buf1)) {
+ rb_fatal("CompareImpl: too large len");
+ }
+ memcpy(buf1, p1, len1);
+ buf1[len1] = '\0';
+ CharLower(buf1);
+ p1 = buf1; /* trick */
+ }
+ if (len2 > 1) {
+ if (len2 >= sizeof(buf2)) {
+ rb_fatal("CompareImpl: too large len");
+ }
+ memcpy(buf2, p2, len2);
+ buf2[len2] = '\0';
+ CharLower(buf2);
+ p2 = buf2; /* trick */
+ }
+ }
+#endif
+ if (len1 == 1)
+ if (len2 == 1)
+ return compare(downcase(*p1), downcase(*p2));
+ else {
+ const int ret = compare(downcase(*p1), *p2);
+ return ret ? ret : -1;
+ }
+ else
+ if (len2 == 1) {
+ const int ret = compare(*p1, downcase(*p2));
+ return ret ? ret : 1;
+ }
+ else {
+ const int ret = memcmp(p1, p2, len1 < len2 ? len1 : len2);
+ return ret ? ret : len1 - len2;
+ }
+}
+#endif /* environment */
static char *
-bracket(
- const char *p, /* pattern (next to '[') */
- const char *pend,
- const char *s, /* string */
- const char *send,
- int flags,
- rb_encoding *enc)
+bracket(p, s, flags)
+ const char *p; /* pattern (next to '[') */
+ const char *s; /* string */
+ int flags;
{
const int nocase = flags & FNM_CASEFOLD;
const int escape = !(flags & FNM_NOESCAPE);
- unsigned int c1, c2;
- int r;
+
int ok = 0, not = 0;
if (*p == '!' || *p == '^') {
@@ -109,42 +195,20 @@ bracket(
t1++;
if (!*t1)
return NULL;
- p = t1 + (r = rb_enc_mbclen(t1, pend, enc));
+ p = Next(t1);
if (p[0] == '-' && p[1] != ']') {
const char *t2 = p + 1;
- int r2;
if (escape && *t2 == '\\')
t2++;
if (!*t2)
return NULL;
- p = t2 + (r2 = rb_enc_mbclen(t2, pend, enc));
- if (ok) continue;
- if ((r <= (send-s) && memcmp(t1, s, r) == 0) ||
- (r2 <= (send-s) && memcmp(t2, s, r) == 0)) {
+ p = Next(t2);
+ if (!ok && Compare(t1, s) <= 0 && Compare(s, t2) <= 0)
ok = 1;
- continue;
- }
- c1 = rb_enc_codepoint(s, send, enc);
- if (nocase) c1 = rb_enc_toupper(c1, enc);
- c2 = rb_enc_codepoint(t1, pend, enc);
- if (nocase) c2 = rb_enc_toupper(c2, enc);
- if (c1 < c2) continue;
- c2 = rb_enc_codepoint(t2, pend, enc);
- if (nocase) c2 = rb_enc_toupper(c2, enc);
- if (c1 > c2) continue;
}
- else {
- if (ok) continue;
- if (r <= (send-s) && memcmp(t1, s, r) == 0) {
+ else
+ if (!ok && Compare(t1, s) == 0)
ok = 1;
- continue;
- }
- if (!nocase) continue;
- c1 = rb_enc_toupper(rb_enc_codepoint(s, send, enc), enc);
- c2 = rb_enc_toupper(rb_enc_codepoint(p, pend, enc), enc);
- if (c1 != c2) continue;
- }
- ok = 1;
}
return ok == not ? NULL : (char *)p + 1;
@@ -160,11 +224,10 @@ bracket(
#define RETURN(val) return *pcur = p, *scur = s, (val);
static int
-fnmatch_helper(
- const char **pcur, /* pattern */
- const char **scur, /* string */
- int flags,
- rb_encoding *enc)
+fnmatch_helper(pcur, scur, flags)
+ const char **pcur; /* pattern */
+ const char **scur; /* string */
+ int flags;
{
const int period = !(flags & FNM_DOTMATCH);
const int pathname = flags & FNM_PATHNAME;
@@ -175,11 +238,7 @@ fnmatch_helper(
const char *stmp = 0;
const char *p = *pcur;
- const char *pend = p + strlen(p);
const char *s = *scur;
- const char *send = s + strlen(s);
-
- int r;
if (period && *s == '.' && *UNESCAPE(p) != '.') /* leading period */
RETURN(FNM_NOMATCH);
@@ -202,16 +261,16 @@ fnmatch_helper(
if (ISEND(s))
RETURN(FNM_NOMATCH);
p++;
- Inc(s, send, enc);
+ Inc(s);
continue;
case '[': {
const char *t;
if (ISEND(s))
RETURN(FNM_NOMATCH);
- if ((t = bracket(p + 1, pend, s, send, flags, enc)) != 0) {
+ if ((t = bracket(p + 1, s, flags)) != 0) {
p = t;
- Inc(s, send, enc);
+ Inc(s);
continue;
}
goto failed;
@@ -224,26 +283,16 @@ fnmatch_helper(
RETURN(ISEND(p) ? 0 : FNM_NOMATCH);
if (ISEND(p))
goto failed;
- r = rb_enc_precise_mbclen(p, pend, enc);
- if (!MBCLEN_CHARFOUND_P(r))
+ if (Compare(p, s) != 0)
goto failed;
- if (r <= (send-s) && memcmp(p, s, r) == 0) {
- p += r;
- s += r;
- continue;
- }
- if (!nocase) goto failed;
- if (rb_enc_toupper(rb_enc_codepoint(p, pend, enc), enc) !=
- rb_enc_toupper(rb_enc_codepoint(s, send, enc), enc))
- goto failed;
- p += r;
- Inc(s, send, enc);
+ Inc(p);
+ Inc(s);
continue;
failed: /* try next '*' position */
if (ptmp && stmp) {
p = ptmp;
- Inc(stmp, send, enc); /* !ISEND(*stmp) */
+ Inc(stmp); /* !ISEND(*stmp) */
s = stmp;
continue;
}
@@ -252,15 +301,11 @@ fnmatch_helper(
}
static int
-fnmatch(
- const char *pattern,
- rb_encoding *enc,
- const char *string,
- int flags)
+fnmatch(p, s, flags)
+ const char *p; /* pattern */
+ const char *s; /* string */
+ int flags;
{
- const char *p = pattern;
- const char *s = string;
- const char *send = s + strlen(string);
const int period = !(flags & FNM_DOTMATCH);
const int pathname = flags & FNM_PATHNAME;
@@ -274,8 +319,8 @@ fnmatch(
ptmp = p;
stmp = s;
}
- if (fnmatch_helper(&p, &s, flags, enc) == 0) {
- while (*s && *s != '/') Inc(s, send, enc);
+ if (fnmatch_helper(&p, &s, flags) == 0) {
+ while (*s && *s != '/') Inc(s);
if (*p && *s) {
p++;
s++;
@@ -286,7 +331,7 @@ fnmatch(
}
/* failed : try next recursion */
if (ptmp && stmp && !(period && *stmp == '.')) {
- while (*stmp && *stmp != '/') Inc(stmp, send, enc);
+ while (*stmp && *stmp != '/') Inc(stmp);
if (*stmp) {
p = ptmp;
stmp++;
@@ -298,43 +343,39 @@ fnmatch(
}
}
else
- return fnmatch_helper(&p, &s, flags, enc);
+ return fnmatch_helper(&p, &s, flags);
}
VALUE rb_cDir;
struct dir_data {
DIR *dir;
- VALUE path;
- rb_encoding *enc;
+ char *path;
};
static void
-mark_dir(struct dir_data *dir)
-{
- rb_gc_mark(dir->path);
-}
-
-static void
-free_dir(struct dir_data *dir)
+free_dir(dir)
+ struct dir_data *dir;
{
if (dir) {
if (dir->dir) closedir(dir->dir);
+ if (dir->path) free(dir->path);
}
- xfree(dir);
+ free(dir);
}
-static VALUE dir_close(VALUE);
+static VALUE dir_close _((VALUE));
+static VALUE dir_s_alloc _((VALUE));
static VALUE
-dir_s_alloc(VALUE klass)
+dir_s_alloc(klass)
+ VALUE klass;
{
struct dir_data *dirp;
- VALUE obj = Data_Make_Struct(klass, struct dir_data, mark_dir, free_dir, dirp);
+ VALUE obj = Data_Make_Struct(klass, struct dir_data, 0, free_dir, dirp);
dirp->dir = NULL;
- dirp->path = Qnil;
- dirp->enc = NULL;
+ dirp->path = NULL;
return obj;
}
@@ -346,50 +387,28 @@ dir_s_alloc(VALUE klass)
* Returns a new directory object for the named directory.
*/
static VALUE
-dir_initialize(int argc, VALUE *argv, VALUE dir)
+dir_initialize(dir, dirname)
+ VALUE dir, dirname;
{
struct dir_data *dp;
- rb_encoding *fsenc;
- VALUE dirname, opt;
- static VALUE sym_enc;
-
- if (!sym_enc) {
- sym_enc = ID2SYM(rb_intern("encoding"));
- }
- fsenc = rb_filesystem_encoding();
-
- rb_scan_args(argc, argv, "11", &dirname, &opt);
-
- if (!NIL_P(opt)) {
- VALUE v, enc=Qnil;
- opt = rb_convert_type(opt, T_HASH, "Hash", "to_hash");
-
- v = rb_hash_aref(opt, sym_enc);
- if (!NIL_P(v)) enc = v;
-
- if (!NIL_P(enc)) {
- fsenc = rb_to_encoding(enc);
- }
- }
-
- FilePathValue(dirname);
+ SafeStringValue(dirname);
Data_Get_Struct(dir, struct dir_data, dp);
if (dp->dir) closedir(dp->dir);
+ if (dp->path) free(dp->path);
dp->dir = NULL;
- dp->path = Qnil;
- dp->enc = fsenc;
- dp->dir = opendir(RSTRING_PTR(dirname));
+ dp->path = NULL;
+ dp->dir = opendir(RSTRING(dirname)->ptr);
if (dp->dir == NULL) {
if (errno == EMFILE || errno == ENFILE) {
rb_gc();
- dp->dir = opendir(RSTRING_PTR(dirname));
+ dp->dir = opendir(RSTRING(dirname)->ptr);
}
if (dp->dir == NULL) {
- rb_sys_fail(RSTRING_PTR(dirname));
+ rb_sys_fail(RSTRING(dirname)->ptr);
}
}
- dp->path = rb_str_dup_frozen(dirname);
+ dp->path = strdup(RSTRING(dirname)->ptr);
return dir;
}
@@ -405,13 +424,15 @@ dir_initialize(int argc, VALUE *argv, VALUE dir)
* the block, and <code>Dir::open</code> returns the value of the
* block.
*/
+
static VALUE
-dir_s_open(int argc, VALUE *argv, VALUE klass)
+dir_s_open(klass, dirname)
+ VALUE klass, dirname;
{
struct dir_data *dp;
- VALUE dir = Data_Make_Struct(klass, struct dir_data, mark_dir, free_dir, dp);
+ VALUE dir = Data_Make_Struct(klass, struct dir_data, 0, free_dir, dp);
- dir_initialize(argc, argv, dir);
+ dir_initialize(dir, dirname);
if (rb_block_given_p()) {
return rb_ensure(rb_yield, dir, dir_close, dir);
}
@@ -420,16 +441,17 @@ dir_s_open(int argc, VALUE *argv, VALUE klass)
}
static void
-dir_closed(void)
+dir_closed()
{
rb_raise(rb_eIOError, "closed directory");
}
static void
-dir_check(VALUE dir)
+dir_check(dir)
+ VALUE dir;
{
- if (!OBJ_UNTRUSTED(dir) && rb_safe_level() >= 4)
- rb_raise(rb_eSecurityError, "Insecure: operation on trusted Dir");
+ if (!OBJ_TAINTED(dir) && rb_safe_level() >= 4)
+ rb_raise(rb_eSecurityError, "Insecure: operation on untainted Dir");
rb_check_frozen(dir);
}
@@ -439,7 +461,6 @@ dir_check(VALUE dir)
if (dirp->dir == NULL) dir_closed();\
} while (0)
-
/*
* call-seq:
* dir.inspect => string
@@ -447,14 +468,18 @@ dir_check(VALUE dir)
* Return a string describing this Dir object.
*/
static VALUE
-dir_inspect(VALUE dir)
+dir_inspect(dir)
+ VALUE dir;
{
struct dir_data *dirp;
Data_Get_Struct(dir, struct dir_data, dirp);
- if (!NIL_P(dirp->path)) {
+ if (dirp->path) {
const char *c = rb_obj_classname(dir);
- return rb_sprintf("#<%s:%s>", c, RSTRING_PTR(dirp->path));
+ int len = strlen(c) + strlen(dirp->path) + 4;
+ VALUE s = rb_str_new(0, len);
+ snprintf(RSTRING_PTR(s), len+1, "#<%s:%s>", c, dirp->path);
+ return s;
}
return rb_funcall(dir, rb_intern("to_s"), 0, 0);
}
@@ -469,61 +494,16 @@ dir_inspect(VALUE dir)
* d.path #=> ".."
*/
static VALUE
-dir_path(VALUE dir)
+dir_path(dir)
+ VALUE dir;
{
struct dir_data *dirp;
Data_Get_Struct(dir, struct dir_data, dirp);
- if (NIL_P(dirp->path)) return Qnil;
- return rb_str_dup(dirp->path);
+ if (!dirp->path) return Qnil;
+ return rb_str_new2(dirp->path);
}
-#if defined HAVE_READDIR_R
-# define READDIR(dir, enc, entry, dp) (readdir_r(dir, entry, &(dp)) == 0 && dp != 0)
-#elif defined _WIN32
-# define READDIR(dir, enc, entry, dp) ((dp = rb_w32_readdir_with_enc(dir, enc)) != 0)
-#else
-# define READDIR(dir, enc, entry, dp) ((dp = readdir(dir)) != 0)
-#endif
-#if defined HAVE_READDIR_R
-# define IF_HAVE_READDIR_R(something) something
-#else
-# define IF_HAVE_READDIR_R(something) /* nothing */
-#endif
-
-#if defined SIZEOF_STRUCT_DIRENT_TOO_SMALL
-# include <limits.h>
-# define NAME_MAX_FOR_STRUCT_DIRENT 255
-# if defined NAME_MAX
-# if NAME_MAX_FOR_STRUCT_DIRENT < NAME_MAX
-# undef NAME_MAX_FOR_STRUCT_DIRENT
-# define NAME_MAX_FOR_STRUCT_DIRENT NAME_MAX
-# endif
-# endif
-# if defined _POSIX_NAME_MAX
-# if NAME_MAX_FOR_STRUCT_DIRENT < _POSIX_NAME_MAX
-# undef NAME_MAX_FOR_STRUCT_DIRENT
-# define NAME_MAX_FOR_STRUCT_DIRENT _POSIX_NAME_MAX
-# endif
-# endif
-# if defined _XOPEN_NAME_MAX
-# if NAME_MAX_FOR_STRUCT_DIRENT < _XOPEN_NAME_MAX
-# undef NAME_MAX_FOR_STRUCT_DIRENT
-# define NAME_MAX_FOR_STRUCT_DIRENT _XOPEN_NAME_MAX
-# endif
-# endif
-# define DEFINE_STRUCT_DIRENT \
- union { \
- struct dirent dirent; \
- char dummy[offsetof(struct dirent, d_name) + \
- NAME_MAX_FOR_STRUCT_DIRENT + 1]; \
- }
-# define STRUCT_DIRENT(entry) ((entry).dirent)
-#else
-# define DEFINE_STRUCT_DIRENT struct dirent
-# define STRUCT_DIRENT(entry) (entry)
-#endif
-
/*
* call-seq:
* dir.read => string or nil
@@ -537,16 +517,17 @@ dir_path(VALUE dir)
* d.read #=> "config.h"
*/
static VALUE
-dir_read(VALUE dir)
+dir_read(dir)
+ VALUE dir;
{
struct dir_data *dirp;
struct dirent *dp;
- IF_HAVE_READDIR_R(DEFINE_STRUCT_DIRENT entry);
GetDIR(dir, dirp);
errno = 0;
- if (READDIR(dirp->dir, dirp->enc, &STRUCT_DIRENT(entry), dp)) {
- return rb_external_str_new_with_enc(dp->d_name, NAMLEN(dp), dirp->enc);
+ dp = readdir(dirp->dir);
+ if (dp) {
+ return rb_tainted_str_new(dp->d_name, NAMLEN(dp));
}
else if (errno == 0) { /* end of stream */
return Qnil;
@@ -575,23 +556,22 @@ dir_read(VALUE dir)
* Got main.rb
*/
static VALUE
-dir_each(VALUE dir)
+dir_each(dir)
+ VALUE dir;
{
struct dir_data *dirp;
struct dirent *dp;
- IF_HAVE_READDIR_R(DEFINE_STRUCT_DIRENT entry);
RETURN_ENUMERATOR(dir, 0, 0);
GetDIR(dir, dirp);
rewinddir(dirp->dir);
- while (READDIR(dirp->dir, dirp->enc, &STRUCT_DIRENT(entry), dp)) {
- rb_yield(rb_external_str_new_with_enc(dp->d_name, NAMLEN(dp), dirp->enc));
+ for (dp = readdir(dirp->dir); dp != NULL; dp = readdir(dirp->dir)) {
+ rb_yield(rb_tainted_str_new(dp->d_name, NAMLEN(dp)));
if (dirp->dir == NULL) dir_closed();
}
return dir;
}
-#ifdef HAVE_TELLDIR
/*
* call-seq:
* dir.pos => integer
@@ -606,20 +586,21 @@ dir_each(VALUE dir)
* d.tell #=> 12
*/
static VALUE
-dir_tell(VALUE dir)
+dir_tell(dir)
+ VALUE dir;
{
+#ifdef HAVE_TELLDIR
struct dir_data *dirp;
long pos;
GetDIR(dir, dirp);
pos = telldir(dirp->dir);
return rb_int2inum(pos);
-}
#else
-#define dir_tell rb_f_notimplement
+ rb_notimplement();
#endif
+}
-#ifdef HAVE_SEEKDIR
/*
* call-seq:
* dir.seek( integer ) => dir
@@ -635,18 +616,20 @@ dir_tell(VALUE dir)
* d.read #=> ".."
*/
static VALUE
-dir_seek(VALUE dir, VALUE pos)
+dir_seek(dir, pos)
+ VALUE dir, pos;
{
struct dir_data *dirp;
- long p = NUM2LONG(pos);
+ off_t p = NUM2OFFT(pos);
GetDIR(dir, dirp);
+#ifdef HAVE_SEEKDIR
seekdir(dirp->dir, p);
return dir;
-}
#else
-#define dir_seek rb_f_notimplement
+ rb_notimplement();
#endif
+}
/*
* call-seq:
@@ -663,7 +646,8 @@ dir_seek(VALUE dir, VALUE pos)
* d.read #=> ".."
*/
static VALUE
-dir_set_pos(VALUE dir, VALUE pos)
+dir_set_pos(dir, pos)
+ VALUE dir, pos;
{
dir_seek(dir, pos);
return pos;
@@ -681,11 +665,12 @@ dir_set_pos(VALUE dir, VALUE pos)
* d.read #=> "."
*/
static VALUE
-dir_rewind(VALUE dir)
+dir_rewind(dir)
+ VALUE dir;
{
struct dir_data *dirp;
- if (rb_safe_level() >= 4 && !OBJ_UNTRUSTED(dir)) {
+ if (rb_safe_level() >= 4 && !OBJ_TAINTED(dir)) {
rb_raise(rb_eSecurityError, "Insecure: can't close");
}
GetDIR(dir, dirp);
@@ -704,7 +689,8 @@ dir_rewind(VALUE dir)
* d.close #=> nil
*/
static VALUE
-dir_close(VALUE dir)
+dir_close(dir)
+ VALUE dir;
{
struct dir_data *dirp;
@@ -716,10 +702,11 @@ dir_close(VALUE dir)
}
static void
-dir_chdir(VALUE path)
+dir_chdir(path)
+ VALUE path;
{
- if (chdir(RSTRING_PTR(path)) < 0)
- rb_sys_fail(RSTRING_PTR(path));
+ if (chdir(RSTRING(path)->ptr) < 0)
+ rb_sys_fail(RSTRING(path)->ptr);
}
static int chdir_blocking = 0;
@@ -731,10 +718,11 @@ struct chdir_data {
};
static VALUE
-chdir_yield(struct chdir_data *args)
+chdir_yield(args)
+ struct chdir_data *args;
{
dir_chdir(args->new_path);
- args->done = TRUE;
+ args->done = Qtrue;
chdir_blocking++;
if (chdir_thread == Qnil)
chdir_thread = rb_thread_current();
@@ -742,7 +730,8 @@ chdir_yield(struct chdir_data *args)
}
static VALUE
-chdir_restore(struct chdir_data *args)
+chdir_restore(args)
+ struct chdir_data *args;
{
if (args->done) {
chdir_blocking--;
@@ -793,13 +782,16 @@ chdir_restore(struct chdir_data *args)
* /var/spool/mail
*/
static VALUE
-dir_s_chdir(int argc, VALUE *argv, VALUE obj)
+dir_s_chdir(argc, argv, obj)
+ int argc;
+ VALUE *argv;
+ VALUE obj;
{
VALUE path = Qnil;
rb_secure(2);
if (rb_scan_args(argc, argv, "01", &path) == 1) {
- FilePathValue(path);
+ SafeStringValue(path);
}
else {
const char *dist = getenv("HOME");
@@ -819,9 +811,9 @@ dir_s_chdir(int argc, VALUE *argv, VALUE obj)
struct chdir_data args;
char *cwd = my_getcwd();
- args.old_path = rb_tainted_str_new2(cwd); xfree(cwd);
+ args.old_path = rb_tainted_str_new2(cwd); free(cwd);
args.new_path = path;
- args.done = FALSE;
+ args.done = Qfalse;
return rb_ensure(chdir_yield, (VALUE)&args, chdir_restore, (VALUE)&args);
}
dir_chdir(path);
@@ -841,7 +833,8 @@ dir_s_chdir(int argc, VALUE *argv, VALUE obj)
* Dir.getwd #=> "/tmp"
*/
static VALUE
-dir_s_getwd(VALUE dir)
+dir_s_getwd(dir)
+ VALUE dir;
{
char *path;
VALUE cwd;
@@ -849,26 +842,26 @@ dir_s_getwd(VALUE dir)
rb_secure(4);
path = my_getcwd();
cwd = rb_tainted_str_new2(path);
- rb_enc_associate(cwd, rb_filesystem_encoding());
- xfree(path);
+ free(path);
return cwd;
}
+static void check_dirname _((volatile VALUE *));
static void
-check_dirname(volatile VALUE *dir)
+check_dirname(dir)
+ volatile VALUE *dir;
{
char *path, *pend;
+ SafeStringValue(*dir);
rb_secure(2);
- FilePathValue(*dir);
- path = RSTRING_PTR(*dir);
+ path = RSTRING(*dir)->ptr;
if (path && *(pend = rb_path_end(rb_path_skip_prefix(path)))) {
*dir = rb_str_new(path, pend - path);
}
}
-#if defined(HAVE_CHROOT)
/*
* call-seq:
* Dir.chroot( string ) => 0
@@ -879,18 +872,21 @@ check_dirname(volatile VALUE *dir)
* information.
*/
static VALUE
-dir_s_chroot(VALUE dir, VALUE path)
+dir_s_chroot(dir, path)
+ VALUE dir, path;
{
+#if defined(HAVE_CHROOT) && !defined(__CHECKER__)
check_dirname(&path);
- if (chroot(RSTRING_PTR(path)) == -1)
- rb_sys_fail(RSTRING_PTR(path));
+ if (chroot(RSTRING(path)->ptr) == -1)
+ rb_sys_fail(RSTRING(path)->ptr);
return INT2FIX(0);
-}
#else
-#define dir_s_chroot rb_f_notimplement
+ rb_notimplement();
+ return Qnil; /* not reached */
#endif
+}
/*
* call-seq:
@@ -906,7 +902,10 @@ dir_s_chroot(VALUE dir, VALUE path)
*
*/
static VALUE
-dir_s_mkdir(int argc, VALUE *argv, VALUE obj)
+dir_s_mkdir(argc, argv, obj)
+ int argc;
+ VALUE *argv;
+ VALUE obj;
{
VALUE path, vmode;
int mode;
@@ -919,8 +918,8 @@ dir_s_mkdir(int argc, VALUE *argv, VALUE obj)
}
check_dirname(&path);
- if (mkdir(RSTRING_PTR(path), mode) == -1)
- rb_sys_fail(RSTRING_PTR(path));
+ if (mkdir(RSTRING(path)->ptr, mode) == -1)
+ rb_sys_fail(RSTRING(path)->ptr);
return INT2FIX(0);
}
@@ -935,29 +934,29 @@ dir_s_mkdir(int argc, VALUE *argv, VALUE obj)
* <code>SystemCallError</code> if the directory isn't empty.
*/
static VALUE
-dir_s_rmdir(VALUE obj, VALUE dir)
+dir_s_rmdir(obj, dir)
+ VALUE obj, dir;
{
check_dirname(&dir);
- if (rmdir(RSTRING_PTR(dir)) < 0)
- rb_sys_fail(RSTRING_PTR(dir));
+ if (rmdir(RSTRING(dir)->ptr) < 0)
+ rb_sys_fail(RSTRING(dir)->ptr);
return INT2FIX(0);
}
-static VALUE
-sys_warning_1(VALUE mesg)
+static void
+sys_warning_1(mesg)
+ const char* mesg;
{
- rb_sys_warning("%s", (const char *)mesg);
- return Qnil;
+ rb_sys_warning("%s", mesg);
}
-#define GLOB_VERBOSE (1U << (sizeof(int) * CHAR_BIT - 1))
+#define GLOB_VERBOSE (1UL << (sizeof(int) * CHAR_BIT - 1))
#define sys_warning(val) \
- (void)((flags & GLOB_VERBOSE) && rb_protect(sys_warning_1, (VALUE)(val), 0))
+ (void)((flags & GLOB_VERBOSE) && rb_protect((VALUE (*)_((VALUE)))sys_warning_1, (VALUE)(val), 0))
#define GLOB_ALLOC(type) (type *)malloc(sizeof(type))
#define GLOB_ALLOC_N(type, n) (type *)malloc(sizeof(type) * (n))
-#define GLOB_FREE(ptr) free(ptr)
#define GLOB_JUMP_TAG(status) ((status == -1) ? rb_memerror() : rb_jump_tag(status))
/*
@@ -1000,13 +999,14 @@ do_opendir(const char *path, int flags)
/* Return nonzero if S has any special globbing chars in it. */
static int
-has_magic(const char *s, int flags, rb_encoding *enc)
+has_magic(s, flags)
+ const char *s;
+ int flags;
{
const int escape = !(flags & FNM_NOESCAPE);
const int nocase = flags & FNM_CASEFOLD;
register const char *p = s;
- register const char *pend = p + strlen(p);
register char c;
while ((c = *p++) != 0) {
@@ -1026,7 +1026,7 @@ has_magic(const char *s, int flags, rb_encoding *enc)
return 1;
}
- p = Next(p-1, pend, enc);
+ p = Next(p-1);
}
return 0;
@@ -1034,12 +1034,11 @@ has_magic(const char *s, int flags, rb_encoding *enc)
/* Find separator in globbing pattern. */
static char *
-find_dirsep(const char *s, int flags, rb_encoding *enc)
+find_dirsep(const char *s, int flags)
{
const int escape = !(flags & FNM_NOESCAPE);
register const char *p = s;
- register const char *pend = p + strlen(p);
register char c;
int open = 0;
@@ -1063,7 +1062,7 @@ find_dirsep(const char *s, int flags, rb_encoding *enc)
continue;
}
- p = Next(p-1, pend, enc);
+ p = Next(p-1);
}
return (char *)p-1;
@@ -1071,9 +1070,9 @@ find_dirsep(const char *s, int flags, rb_encoding *enc)
/* Remove escaping backslashes */
static void
-remove_backslashes(char *p, rb_encoding *enc)
+remove_backslashes(p)
+ char *p;
{
- register const char *pend = p + strlen(p);
char *t = p;
char *s = p;
@@ -1085,7 +1084,7 @@ remove_backslashes(char *p, rb_encoding *enc)
s = ++p;
if (!*p) break;
}
- Inc(p, pend, enc);
+ Inc(p);
}
while (*p++);
@@ -1106,7 +1105,7 @@ struct glob_pattern {
static void glob_free_pattern(struct glob_pattern *list);
static struct glob_pattern *
-glob_make_pattern(const char *p, int flags, rb_encoding *enc)
+glob_make_pattern(const char *p, int flags)
{
struct glob_pattern *list, *tmp, **tail = &list;
int dirsep = 0; /* pattern is terminated with '/' */
@@ -1122,15 +1121,15 @@ glob_make_pattern(const char *p, int flags, rb_encoding *enc)
dirsep = 1;
}
else {
- const char *m = find_dirsep(p, flags, enc);
+ const char *m = find_dirsep(p, flags);
char *buf = GLOB_ALLOC_N(char, m-p+1);
if (!buf) {
- GLOB_FREE(tmp);
+ free(tmp);
goto error;
}
memcpy(buf, p, m-p);
buf[m-p] = '\0';
- tmp->type = has_magic(buf, flags, enc) ? MAGICAL : PLAIN;
+ tmp->type = has_magic(buf, flags) ? MAGICAL : PLAIN;
tmp->str = buf;
if (*m) {
dirsep = 1;
@@ -1167,8 +1166,8 @@ glob_free_pattern(struct glob_pattern *list)
struct glob_pattern *tmp = list;
list = list->next;
if (tmp->str)
- GLOB_FREE(tmp->str);
- GLOB_FREE(tmp);
+ free(tmp->str);
+ free(tmp);
}
}
@@ -1176,25 +1175,20 @@ static char *
join_path(const char *path, int dirsep, const char *name)
{
long len = strlen(path);
- long len2 = strlen(name)+(dirsep?1:0)+1;
- char *buf = GLOB_ALLOC_N(char, len+len2);
+ char *buf = GLOB_ALLOC_N(char, len+strlen(name)+(dirsep?1:0)+1);
if (!buf) return 0;
memcpy(buf, path, len);
if (dirsep) {
- buf[len++] = '/';
+ strcpy(buf+len, "/");
+ len++;
}
- buf[len] = '\0';
- strlcat(buf+len, name, len2);
+ strcpy(buf+len, name);
return buf;
}
enum answer { YES, NO, UNKNOWN };
-#ifndef S_ISDIR
-# define S_ISDIR(m) ((m & S_IFMT) == S_IFDIR)
-#endif
-
#ifndef S_ISLNK
# ifndef S_IFLNK
# define S_ISLNK(m) (0)
@@ -1203,36 +1197,43 @@ enum answer { YES, NO, UNKNOWN };
# endif
#endif
+#ifndef S_ISDIR
+# define S_ISDIR(m) ((m & S_IFMT) == S_IFDIR)
+#endif
+
struct glob_args {
- void (*func)(const char *, VALUE, void *);
- const char *path;
- VALUE value;
- rb_encoding *enc;
+ void (*func) _((const char*, VALUE));
+ const char *c;
+ VALUE v;
};
+static VALUE glob_func_caller _((VALUE));
+
static VALUE
-glob_func_caller(VALUE val)
+glob_func_caller(val)
+ VALUE val;
{
struct glob_args *args = (struct glob_args *)val;
- (*args->func)(args->path, args->value, args->enc);
+ (*args->func)(args->c, args->v);
return Qnil;
}
-#define glob_call_func(func, path, arg, enc) (*func)(path, arg, enc)
+#define glob_call_func(func, path, arg) (*func)(path, arg)
+
+static int glob_helper _((const char *, int, enum answer, enum answer, struct glob_pattern **, struct glob_pattern **, int, ruby_glob_func *, VALUE));
static int
-glob_helper(
- const char *path,
- int dirsep, /* '/' should be placed before appending child entry's name to 'path'. */
- enum answer exist, /* Does 'path' indicate an existing entry? */
- enum answer isdir, /* Does 'path' indicate a directory or a symlink to a directory? */
- struct glob_pattern **beg,
- struct glob_pattern **end,
- int flags,
- ruby_glob_func *func,
- VALUE arg,
- rb_encoding *enc)
+glob_helper(path, dirsep, exist, isdir, beg, end, flags, func, arg)
+ const char *path;
+ int dirsep; /* '/' should be placed before appending child entry's name to 'path'. */
+ enum answer exist; /* Does 'path' indicate an existing entry? */
+ enum answer isdir; /* Does 'path' indicate a directory or a symlink to a directory? */
+ struct glob_pattern **beg;
+ struct glob_pattern **end;
+ int flags;
+ ruby_glob_func *func;
+ VALUE arg;
{
struct stat st;
int status = 0;
@@ -1247,19 +1248,19 @@ glob_helper(
p = p->next;
}
switch (p->type) {
- case PLAIN:
+ case PLAIN:
plain = 1;
break;
- case MAGICAL:
+ case MAGICAL:
magical = 1;
break;
- case MATCH_ALL:
+ case MATCH_ALL:
match_all = 1;
break;
- case MATCH_DIR:
+ case MATCH_DIR:
match_dir = 1;
break;
- case RECURSIVE:
+ case RECURSIVE:
rb_bug("continuous RECURSIVEs");
}
}
@@ -1286,14 +1287,14 @@ glob_helper(
}
}
if (match_all && exist == YES) {
- status = glob_call_func(func, path, arg, enc);
+ status = glob_call_func(func, path, arg);
if (status) return status;
}
if (match_dir && isdir == YES) {
char *tmp = join_path(path, dirsep, "");
if (!tmp) return -1;
- status = glob_call_func(func, tmp, arg, enc);
- GLOB_FREE(tmp);
+ status = glob_call_func(func, tmp, arg);
+ free(tmp);
if (status) return status;
}
}
@@ -1302,12 +1303,10 @@ glob_helper(
if (magical || recursive) {
struct dirent *dp;
- DIR *dirp;
- IF_HAVE_READDIR_R(DEFINE_STRUCT_DIRENT entry);
- dirp = do_opendir(*path ? path : ".", flags);
+ DIR *dirp = do_opendir(*path ? path : ".", flags);
if (dirp == NULL) return 0;
- while (READDIR(dirp, enc, &STRUCT_DIRENT(entry), dp)) {
+ for (dp = readdir(dirp); dp != NULL; dp = readdir(dirp)) {
char *buf = join_path(path, dirsep, dp->d_name);
enum answer new_isdir = UNKNOWN;
@@ -1316,7 +1315,7 @@ glob_helper(
break;
}
if (recursive && strcmp(dp->d_name, ".") != 0 && strcmp(dp->d_name, "..") != 0
- && fnmatch("*", rb_usascii_encoding(), dp->d_name, flags) == 0) {
+ && fnmatch("*", dp->d_name, flags) == 0) {
#ifndef _WIN32
if (do_lstat(buf, &st, flags) == 0)
new_isdir = S_ISDIR(st.st_mode) ? YES : S_ISLNK(st.st_mode) ? UNKNOWN : NO;
@@ -1329,7 +1328,6 @@ glob_helper(
new_beg = new_end = GLOB_ALLOC_N(struct glob_pattern *, (end - beg) * 2);
if (!new_beg) {
- GLOB_FREE(buf);
status = -1;
break;
}
@@ -1342,15 +1340,14 @@ glob_helper(
p = p->next; /* 0 times recursion */
}
if (p->type == PLAIN || p->type == MAGICAL) {
- if (fnmatch(p->str, enc, dp->d_name, flags) == 0)
+ if (fnmatch(p->str, dp->d_name, flags) == 0)
*new_end++ = p->next;
}
}
- status = glob_helper(buf, 1, YES, new_isdir, new_beg, new_end,
- flags, func, arg, enc);
- GLOB_FREE(buf);
- GLOB_FREE(new_beg);
+ status = glob_helper(buf, 1, YES, new_isdir, new_beg, new_end, flags, func, arg);
+ free(buf);
+ free(new_beg);
if (status) break;
}
@@ -1368,57 +1365,59 @@ glob_helper(
if (*cur) {
char *buf;
char *name;
- size_t len = strlen((*cur)->str) + 1;
- name = GLOB_ALLOC_N(char, len);
+ name = GLOB_ALLOC_N(char, strlen((*cur)->str) + 1);
if (!name) {
status = -1;
break;
}
- memcpy(name, (*cur)->str, len);
- if (escape) remove_backslashes(name, enc);
+ strcpy(name, (*cur)->str);
+ if (escape) remove_backslashes(name);
new_beg = new_end = GLOB_ALLOC_N(struct glob_pattern *, end - beg);
if (!new_beg) {
- GLOB_FREE(name);
+ free(name);
status = -1;
break;
}
*new_end++ = (*cur)->next;
for (cur2 = cur + 1; cur2 < copy_end; ++cur2) {
- if (*cur2 && fnmatch((*cur2)->str, enc, name, flags) == 0) {
+ if (*cur2 && fnmatch((*cur2)->str, name, flags) == 0) {
*new_end++ = (*cur2)->next;
*cur2 = 0;
}
}
buf = join_path(path, dirsep, name);
- GLOB_FREE(name);
+ free(name);
if (!buf) {
- GLOB_FREE(new_beg);
+ free(new_beg);
status = -1;
break;
}
- status = glob_helper(buf, 1, UNKNOWN, UNKNOWN, new_beg,
- new_end, flags, func, arg, enc);
- GLOB_FREE(buf);
- GLOB_FREE(new_beg);
+ status = glob_helper(buf, 1, UNKNOWN, UNKNOWN, new_beg, new_end, flags, func, arg);
+ free(buf);
+ free(new_beg);
if (status) break;
}
}
- GLOB_FREE(copy_beg);
+ free(copy_beg);
}
return status;
}
static int
-ruby_glob0(const char *path, int flags, ruby_glob_func *func, VALUE arg, rb_encoding *enc)
+ruby_glob0(path, flags, func, arg)
+ const char *path;
+ int flags;
+ ruby_glob_func *func;
+ VALUE arg;
{
struct glob_pattern *list;
const char *root, *start;
char *buf;
- size_t n;
+ int n;
int status;
start = root = path;
@@ -1435,75 +1434,90 @@ ruby_glob0(const char *path, int flags, ruby_glob_func *func, VALUE arg, rb_enco
MEMCPY(buf, start, char, n);
buf[n] = '\0';
- list = glob_make_pattern(root, flags, enc);
+ list = glob_make_pattern(root, flags);
if (!list) {
- GLOB_FREE(buf);
+ free(buf);
return -1;
}
- status = glob_helper(buf, 0, UNKNOWN, UNKNOWN, &list, &list + 1, flags, func, arg, enc);
+ status = glob_helper(buf, 0, UNKNOWN, UNKNOWN, &list, &list + 1, flags, func, arg);
glob_free_pattern(list);
- GLOB_FREE(buf);
+ free(buf);
return status;
}
int
-ruby_glob(const char *path, int flags, ruby_glob_func *func, VALUE arg)
+ruby_glob(path, flags, func, arg)
+ const char *path;
+ int flags;
+ ruby_glob_func *func;
+ VALUE arg;
{
- return ruby_glob0(path, flags & ~GLOB_VERBOSE, func, arg,
- rb_ascii8bit_encoding());
+ return ruby_glob0(path, flags & ~GLOB_VERBOSE, func, arg);
}
+static int rb_glob_caller _((const char *, VALUE));
+
static int
-rb_glob_caller(const char *path, VALUE a, void *enc)
+rb_glob_caller(path, a)
+ const char *path;
+ VALUE a;
{
int status;
struct glob_args *args = (struct glob_args *)a;
- args->path = path;
+ args->c = path;
rb_protect(glob_func_caller, a, &status);
return status;
}
static int
-rb_glob2(const char *path, int flags,
- void (*func)(const char *, VALUE, void *), VALUE arg,
- rb_encoding* enc)
+rb_glob2(path, flags, func, arg)
+ const char *path;
+ int flags;
+ void (*func) _((const char *, VALUE));
+ VALUE arg;
{
struct glob_args args;
args.func = func;
- args.value = arg;
- args.enc = enc;
+ args.v = arg;
if (flags & FNM_SYSCASE) {
rb_warning("Dir.glob() ignores File::FNM_CASEFOLD");
}
- return ruby_glob0(path, flags | GLOB_VERBOSE, rb_glob_caller, (VALUE)&args,
- enc);
+ return ruby_glob0(path, flags | GLOB_VERBOSE, rb_glob_caller, (VALUE)&args);
}
void
-rb_glob(const char *path, void (*func)(const char *, VALUE, void *), VALUE arg)
+rb_glob(path, func, arg)
+ const char *path;
+ void (*func) _((const char*, VALUE));
+ VALUE arg;
{
- int status = rb_glob2(path, 0, func, arg, rb_ascii8bit_encoding());
+ int status = rb_glob2(path, 0, func, arg);
if (status) GLOB_JUMP_TAG(status);
}
+static void push_pattern _((const char* path, VALUE ary));
static void
-push_pattern(const char *path, VALUE ary, void *enc)
+push_pattern(path, ary)
+ const char *path;
+ VALUE ary;
{
- rb_ary_push(ary, rb_external_str_new_with_enc(path, strlen(path), enc));
+ rb_ary_push(ary, rb_tainted_str_new2(path));
}
-static int
-ruby_brace_expand(const char *str, int flags, ruby_glob_func *func, VALUE arg,
- rb_encoding *enc)
+int
+ruby_brace_expand(str, flags, func, arg)
+ const char *str;
+ int flags;
+ ruby_glob_func *func;
+ VALUE arg;
{
const int escape = !(flags & FNM_NOESCAPE);
const char *p = str;
- const char *pend = p + strlen(p);
const char *s = p;
const char *lbrace = 0, *rbrace = 0;
int nest = 0, status = 0;
@@ -1519,12 +1533,11 @@ ruby_brace_expand(const char *str, int flags, ruby_glob_func *func, VALUE arg,
if (*p == '\\' && escape) {
if (!*++p) break;
}
- Inc(p, pend, enc);
+ Inc(p);
}
if (lbrace && rbrace) {
- size_t len = strlen(s) + 1;
- char *buf = GLOB_ALLOC_N(char, len);
+ char *buf = GLOB_ALLOC_N(char, strlen(s) + 1);
long shift;
if (!buf) return -1;
@@ -1540,17 +1553,17 @@ ruby_brace_expand(const char *str, int flags, ruby_glob_func *func, VALUE arg,
if (*p == '\\' && escape) {
if (++p == rbrace) break;
}
- Inc(p, pend, enc);
+ Inc(p);
}
memcpy(buf+shift, t, p-t);
- strlcpy(buf+shift+(p-t), rbrace+1, len-(shift+(p-t)));
- status = ruby_brace_expand(buf, flags, func, arg, enc);
+ strcpy(buf+shift+(p-t), rbrace+1);
+ status = ruby_brace_expand(buf, flags, func, arg);
if (status) break;
}
- GLOB_FREE(buf);
+ free(buf);
}
else if (!lbrace && !rbrace) {
- status = (*func)(s, arg, enc);
+ status = (*func)(s, arg);
}
return status;
@@ -1562,77 +1575,84 @@ struct brace_args {
int flags;
};
+static int glob_brace _((const char *, VALUE));
static int
-glob_brace(const char *path, VALUE val, void *enc)
+glob_brace(path, val)
+ const char *path;
+ VALUE val;
{
struct brace_args *arg = (struct brace_args *)val;
- return ruby_glob0(path, arg->flags, arg->func, arg->value, enc);
+ return ruby_glob0(path, arg->flags, arg->func, arg->value);
}
static int
-ruby_brace_glob0(const char *str, int flags, ruby_glob_func *func, VALUE arg,
- rb_encoding* enc)
+ruby_brace_glob0(str, flags, func, arg)
+ const char *str;
+ int flags;
+ ruby_glob_func *func;
+ VALUE arg;
{
struct brace_args args;
args.func = func;
args.value = arg;
args.flags = flags;
- return ruby_brace_expand(str, flags, glob_brace, (VALUE)&args, enc);
+ return ruby_brace_expand(str, flags, glob_brace, (VALUE)&args);
}
int
-ruby_brace_glob(const char *str, int flags, ruby_glob_func *func, VALUE arg)
+ruby_brace_glob(str, flags, func, arg)
+ const char *str;
+ int flags;
+ ruby_glob_func *func;
+ VALUE arg;
{
- return ruby_brace_glob0(str, flags & ~GLOB_VERBOSE, func, arg,
- rb_ascii8bit_encoding());
+ return ruby_brace_glob0(str, flags & ~GLOB_VERBOSE, func, arg);
}
static int
-push_glob(VALUE ary, VALUE str, int flags)
+push_glob(VALUE ary, const char *str, int flags)
{
struct glob_args args;
- rb_encoding *enc = rb_enc_get(str);
- if (enc == rb_usascii_encoding()) enc = rb_filesystem_encoding();
args.func = push_pattern;
- args.value = ary;
- args.enc = enc;
-
- return ruby_brace_glob0(StringValuePtr(str), flags | GLOB_VERBOSE,
- rb_glob_caller, (VALUE)&args, enc);
+ args.v = ary;
+ return ruby_brace_glob0(str, flags | GLOB_VERBOSE, rb_glob_caller, (VALUE)&args);
}
static VALUE
-rb_push_glob(VALUE str, int flags) /* '\0' is delimiter */
+rb_push_glob(str, flags) /* '\0' is delimiter */
+ VALUE str;
+ int flags;
{
long offset = 0;
VALUE ary;
- StringValue(str);
ary = rb_ary_new();
+ SafeStringValue(str);
while (offset < RSTRING_LEN(str)) {
+ int status = push_glob(ary, RSTRING(str)->ptr + offset, flags);
char *p, *pend;
- int status;
- p = RSTRING_PTR(str) + offset;
- status = push_glob(ary, rb_enc_str_new(p, strlen(p), rb_enc_get(str)),
- flags);
if (status) GLOB_JUMP_TAG(status);
if (offset >= RSTRING_LEN(str)) break;
+ p = RSTRING(str)->ptr + offset;
p += strlen(p) + 1;
- pend = RSTRING_PTR(str) + RSTRING_LEN(str);
+ pend = RSTRING(str)->ptr + RSTRING_LEN(str);
while (p < pend && !*p)
p++;
- offset = p - RSTRING_PTR(str);
+ offset = p - RSTRING(str)->ptr;
}
return ary;
}
static VALUE
-dir_globs(long argc, VALUE *argv, int flags)
+dir_globs(argc, argv, flags)
+ long argc;
+ VALUE *argv;
+ int flags;
{
VALUE ary = rb_ary_new();
long i;
@@ -1640,8 +1660,8 @@ dir_globs(long argc, VALUE *argv, int flags)
for (i = 0; i < argc; ++i) {
int status;
VALUE str = argv[i];
- SafeStringValue(str);
- status = push_glob(ary, str, flags);
+ StringValue(str);
+ status = push_glob(ary, RSTRING(str)->ptr, flags);
if (status) GLOB_JUMP_TAG(status);
}
@@ -1654,18 +1674,18 @@ dir_globs(long argc, VALUE *argv, int flags)
* Dir[ string [, string ...] ] => array
*
* Equivalent to calling
- * <code>Dir.glob(</code><i>array,</i><code>0)</code> and
+ * <code>Dir.glob(</code><i>array,</i><code>0)</code> and
* <code>Dir.glob([</code><i>string,...</i><code>],0)</code>.
*
*/
static VALUE
dir_s_aref(int argc, VALUE *argv, VALUE obj)
-{
+ {
if (argc == 1) {
return rb_push_glob(argv[0], 0);
}
return dir_globs(argc, argv, 0);
-}
+ }
/*
* call-seq:
@@ -1686,7 +1706,7 @@ dir_s_aref(int argc, VALUE *argv, VALUE obj)
* match all files beginning with
* <code>c</code>; <code>*c</code> will match
* all files ending with <code>c</code>; and
- * <code>\*c\*</code> will match all files that
+ * <code>*c*</code> will match all files that
* have <code>c</code> in them (including at
* the beginning or end). Equivalent to
* <code>/ .* /x</code> in regexp.
@@ -1715,20 +1735,23 @@ dir_s_aref(int argc, VALUE *argv, VALUE obj)
*
* rbfiles = File.join("**", "*.rb")
* Dir.glob(rbfiles) #=> ["main.rb",
- * # "lib/song.rb",
- * # "lib/song/karaoke.rb"]
+ * "lib/song.rb",
+ * "lib/song/karaoke.rb"]
* libdirs = File.join("**", "lib")
* Dir.glob(libdirs) #=> ["lib"]
*
* librbfiles = File.join("**", "lib", "**", "*.rb")
* Dir.glob(librbfiles) #=> ["lib/song.rb",
- * # "lib/song/karaoke.rb"]
+ * "lib/song/karaoke.rb"]
*
* librbfiles = File.join("**", "lib", "*.rb")
* Dir.glob(librbfiles) #=> ["lib/song.rb"]
*/
static VALUE
-dir_s_glob(int argc, VALUE *argv, VALUE obj)
+dir_s_glob(argc, argv, obj)
+ int argc;
+ VALUE *argv;
+ VALUE obj;
{
VALUE str, rflags, ary;
int flags;
@@ -1755,9 +1778,10 @@ dir_s_glob(int argc, VALUE *argv, VALUE obj)
}
static VALUE
-dir_open_dir(int argc, VALUE *argv)
+dir_open_dir(path)
+ VALUE path;
{
- VALUE dir = rb_funcall2(rb_cDir, rb_intern("open"), argc, argv);
+ VALUE dir = rb_funcall(rb_cDir, rb_intern("open"), 1, path);
if (TYPE(dir) != T_DATA ||
RDATA(dir)->dfree != (RUBY_DATA_FUNC)free_dir) {
@@ -1786,12 +1810,13 @@ dir_open_dir(int argc, VALUE *argv)
*
*/
static VALUE
-dir_foreach(int argc, VALUE *argv, VALUE io)
+dir_foreach(io, dirname)
+ VALUE io, dirname;
{
VALUE dir;
- RETURN_ENUMERATOR(io, argc, argv);
- dir = dir_open_dir(argc, argv);
+ RETURN_ENUMERATOR(io, 1, &dirname);
+ dir = dir_open_dir(dirname);
rb_ensure(dir_each, dir, dir_close, dir);
return Qnil;
}
@@ -1808,11 +1833,12 @@ dir_foreach(int argc, VALUE *argv, VALUE io)
*
*/
static VALUE
-dir_entries(int argc, VALUE *argv, VALUE io)
+dir_entries(io, dirname)
+ VALUE io, dirname;
{
VALUE dir;
- dir = dir_open_dir(argc, argv);
+ dir = dir_open_dir(dirname);
return rb_ensure(rb_Array, dir, dir_close, dir);
}
@@ -1850,31 +1876,31 @@ dir_entries(int argc, VALUE *argv, VALUE io)
* parameters. The same glob pattern and flags are used by
* <code>Dir::glob</code>.
*
- * File.fnmatch('cat', 'cat') #=> true # match entire string
- * File.fnmatch('cat', 'category') #=> false # only match partial string
- * File.fnmatch('c{at,ub}s', 'cats') #=> false # { } isn't supported
+ * File.fnmatch('cat', 'cat') #=> true : match entire string
+ * File.fnmatch('cat', 'category') #=> false : only match partial string
+ * File.fnmatch('c{at,ub}s', 'cats') #=> false : { } isn't supported
*
- * File.fnmatch('c?t', 'cat') #=> true # '?' match only 1 character
- * File.fnmatch('c??t', 'cat') #=> false # ditto
- * File.fnmatch('c*', 'cats') #=> true # '*' match 0 or more characters
- * File.fnmatch('c*t', 'c/a/b/t') #=> true # ditto
- * File.fnmatch('ca[a-z]', 'cat') #=> true # inclusive bracket expression
- * File.fnmatch('ca[^t]', 'cat') #=> false # exclusive bracket expression ('^' or '!')
+ * File.fnmatch('c?t', 'cat') #=> true : '?' match only 1 character
+ * File.fnmatch('c??t', 'cat') #=> false : ditto
+ * File.fnmatch('c*', 'cats') #=> true : '*' match 0 or more characters
+ * File.fnmatch('c*t', 'c/a/b/t') #=> true : ditto
+ * File.fnmatch('ca[a-z]', 'cat') #=> true : inclusive bracket expression
+ * File.fnmatch('ca[^t]', 'cat') #=> false : exclusive bracket expression ('^' or '!')
*
- * File.fnmatch('cat', 'CAT') #=> false # case sensitive
- * File.fnmatch('cat', 'CAT', File::FNM_CASEFOLD) #=> true # case insensitive
+ * File.fnmatch('cat', 'CAT') #=> false : case sensitive
+ * File.fnmatch('cat', 'CAT', File::FNM_CASEFOLD) #=> true : case insensitive
*
- * File.fnmatch('?', '/', File::FNM_PATHNAME) #=> false # wildcard doesn't match '/' on FNM_PATHNAME
- * File.fnmatch('*', '/', File::FNM_PATHNAME) #=> false # ditto
- * File.fnmatch('[/]', '/', File::FNM_PATHNAME) #=> false # ditto
+ * File.fnmatch('?', '/', File::FNM_PATHNAME) #=> false : wildcard doesn't match '/' on FNM_PATHNAME
+ * File.fnmatch('*', '/', File::FNM_PATHNAME) #=> false : ditto
+ * File.fnmatch('[/]', '/', File::FNM_PATHNAME) #=> false : ditto
*
- * File.fnmatch('\?', '?') #=> true # escaped wildcard becomes ordinary
- * File.fnmatch('\a', 'a') #=> true # escaped ordinary remains ordinary
- * File.fnmatch('\a', '\a', File::FNM_NOESCAPE) #=> true # FNM_NOESACPE makes '\' ordinary
- * File.fnmatch('[\?]', '?') #=> true # can escape inside bracket expression
+ * File.fnmatch('\?', '?') #=> true : escaped wildcard becomes ordinary
+ * File.fnmatch('\a', 'a') #=> true : escaped ordinary remains ordinary
+ * File.fnmatch('\a', '\a', File::FNM_NOESCAPE) #=> true : FNM_NOESACPE makes '\' ordinary
+ * File.fnmatch('[\?]', '?') #=> true : can escape inside bracket expression
*
- * File.fnmatch('*', '.profile') #=> false # wildcard doesn't match leading
- * File.fnmatch('*', '.profile', File::FNM_DOTMATCH) #=> true # period by default.
+ * File.fnmatch('*', '.profile') #=> false : wildcard doesn't match leading
+ * File.fnmatch('*', '.profile', File::FNM_DOTMATCH) #=> true period by default.
* File.fnmatch('.*', '.profile') #=> true
*
* rbfiles = '**' '/' '*.rb' # you don't have to do like this. just write in single string.
@@ -1898,7 +1924,10 @@ dir_entries(int argc, VALUE *argv, VALUE io)
* File.fnmatch(pattern, 'a/.b/c/foo', File::FNM_PATHNAME | File::FNM_DOTMATCH) #=> true
*/
static VALUE
-file_s_fnmatch(int argc, VALUE *argv, VALUE obj)
+file_s_fnmatch(argc, argv, obj)
+ int argc;
+ VALUE *argv;
+ VALUE obj;
{
VALUE pattern, path;
VALUE rflags;
@@ -1910,39 +1939,14 @@ file_s_fnmatch(int argc, VALUE *argv, VALUE obj)
flags = 0;
StringValue(pattern);
- FilePathStringValue(path);
+ StringValue(path);
- if (fnmatch(RSTRING_PTR(pattern), rb_enc_get(pattern), RSTRING_PTR(path),
- flags) == 0)
+ if (fnmatch(RSTRING(pattern)->ptr, RSTRING(path)->ptr, flags) == 0)
return Qtrue;
return Qfalse;
}
-VALUE rb_home_dir(const char *user, VALUE result);
-
-/*
- * call-seq:
- * Dir.home() => "/home/me"
- * Dir.home("root") => "/root"
- *
- * Returns the home directory of the current user or the named user
- * if given.
- */
-static VALUE
-dir_s_home(int argc, VALUE *argv, VALUE obj)
-{
- VALUE user;
- const char *u = 0;
-
- rb_scan_args(argc, argv, "01", &user);
- if (!NIL_P(user)) {
- SafeStringValue(user);
- u = StringValueCStr(user);
- }
- return rb_home_dir(u, rb_str_new(0, 0));
-}
-
/*
* Objects of class <code>Dir</code> are directory streams representing
* directories in the underlying file system. They provide a variety of
@@ -1955,20 +1959,19 @@ dir_s_home(int argc, VALUE *argv, VALUE obj)
* (<code>.</code>).
*/
void
-Init_Dir(void)
+Init_Dir()
{
rb_cDir = rb_define_class("Dir", rb_cObject);
rb_include_module(rb_cDir, rb_mEnumerable);
rb_define_alloc_func(rb_cDir, dir_s_alloc);
- rb_define_singleton_method(rb_cDir, "open", dir_s_open, -1);
- rb_define_singleton_method(rb_cDir, "foreach", dir_foreach, -1);
- rb_define_singleton_method(rb_cDir, "entries", dir_entries, -1);
+ rb_define_singleton_method(rb_cDir, "open", dir_s_open, 1);
+ rb_define_singleton_method(rb_cDir, "foreach", dir_foreach, 1);
+ rb_define_singleton_method(rb_cDir, "entries", dir_entries, 1);
- rb_define_method(rb_cDir,"initialize", dir_initialize, -1);
+ rb_define_method(rb_cDir,"initialize", dir_initialize, 1);
rb_define_method(rb_cDir,"path", dir_path, 0);
- rb_define_method(rb_cDir,"to_path", dir_path, 0);
rb_define_method(rb_cDir,"inspect", dir_inspect, 0);
rb_define_method(rb_cDir,"read", dir_read, 0);
rb_define_method(rb_cDir,"each", dir_each, 0);
@@ -1987,12 +1990,9 @@ Init_Dir(void)
rb_define_singleton_method(rb_cDir,"rmdir", dir_s_rmdir, 1);
rb_define_singleton_method(rb_cDir,"delete", dir_s_rmdir, 1);
rb_define_singleton_method(rb_cDir,"unlink", dir_s_rmdir, 1);
- rb_define_singleton_method(rb_cDir,"home", dir_s_home, -1);
rb_define_singleton_method(rb_cDir,"glob", dir_s_glob, -1);
rb_define_singleton_method(rb_cDir,"[]", dir_s_aref, -1);
- rb_define_singleton_method(rb_cDir,"exist?", rb_file_directory_p, 1); /* in file.c */
- rb_define_singleton_method(rb_cDir,"exists?", rb_file_directory_p, 1); /* in file.c */
rb_define_singleton_method(rb_cFile,"fnmatch", file_s_fnmatch, -1);
rb_define_singleton_method(rb_cFile,"fnmatch?", file_s_fnmatch, -1);
diff --git a/distruby.rb b/distruby.rb
new file mode 100644
index 0000000000..613da0eb9c
--- /dev/null
+++ b/distruby.rb
@@ -0,0 +1,59 @@
+#!./miniruby
+
+if RUBY_PATCHLEVEL.zero?
+ dirname = sprintf 'ruby-%s', RUBY_VERSION
+ tagname = dirname.gsub /ruby-(\d)\.(\d)\.(\d)/, 'v\1_\2_\3'
+else
+ dirname = sprintf 'ruby-%s-p%u', RUBY_VERSION, RUBY_PATCHLEVEL
+ tagname = dirname.gsub /ruby-(\d)\.(\d)\.(\d)-p/, 'v\1_\2_\3_'
+end
+tgzname = dirname + '.tar.gz'
+tbzname = dirname + '.tar.bz2'
+zipname = dirname + '.zip'
+repos = 'http://svn.ruby-lang.org/repos/ruby/tags/' + tagname
+
+STDERR.puts 'exporting sources...'
+system 'svn', 'export', '-q', repos, dirname
+Dir.chdir dirname do
+ STDERR.puts 'generating configure...'
+ system 'autoconf'
+ system 'rm', '-rf', 'autom4te.cache'
+
+ STDERR.puts 'generating parse.c...'
+ system 'bison', '-y', '-o', 'parse.c', 'parse.y'
+end
+
+STDERR.puts 'generating tarballs...'
+ENV['GZIP'] = '-9'
+system 'tar', 'chofzp', tgzname, dirname
+system 'tar', 'chojfp', tbzname, dirname
+system 'zip', '-q9r', zipname, dirname
+
+require 'digest/md5'
+require 'digest/sha2'
+for name in [tgzname, tbzname, zipname] do
+ open name, 'rb' do |fp|
+ str = fp.read
+ md5 = Digest::MD5.hexdigest str
+ sha = Digest::SHA256.hexdigest str
+ printf "MD5(%s)= %s\nSHA256(%s)= %s\nSIZE(%s)= %s\n\n",
+ name, md5,
+ name, sha,
+ name, str.size
+ end
+end
+
+
+
+#
+# Local Variables:
+# mode: ruby
+# code: utf-8
+# indent-tabs-mode: t
+# tab-width: 3
+# ruby-indent-level: 3
+# fill-column: 79
+# default-justification: full
+# End:
+# vi: ts=3 sw=3
+
diff --git a/djgpp/GNUmakefile.in b/djgpp/GNUmakefile.in
new file mode 100644
index 0000000000..0a7e1fb131
--- /dev/null
+++ b/djgpp/GNUmakefile.in
@@ -0,0 +1,2 @@
+include Makefile
+VPATH = $(srcdir) $(srcdir)/missing
diff --git a/djgpp/README.djgpp b/djgpp/README.djgpp
new file mode 100644
index 0000000000..f1f413a478
--- /dev/null
+++ b/djgpp/README.djgpp
@@ -0,0 +1,21 @@
+* How to compile and install on djgpp
+
+This is what you need to do to compile and install Ruby:
+
+ 1. Run configure.bat, which will generate config.h and Makefile
+ (GNU sed required).
+ Message like this is normal:
+ sed.exe: can't read 123456789: No such file or directory (ENOENT)
+
+ 2. Edit defines.h if you need. Probably this step will not need.
+
+ 3. Remove comment mark(#) before the module names from ext/Setup.dj (or
+ add module names if not present).
+
+ 4. Run make.
+
+ 5. Optionally, run 'make test' to check whether the compiled Ruby
+ interpreter works well. If you see the message "test succeeded",
+ your ruby works as it should (hopefully).
+
+ 6. Run 'make install'
diff --git a/djgpp/config.hin b/djgpp/config.hin
new file mode 100644
index 0000000000..8ee427c92f
--- /dev/null
+++ b/djgpp/config.hin
@@ -0,0 +1,114 @@
+
+#define PACKAGE_NAME ""
+#define PACKAGE_TARNAME ""
+#define PACKAGE_VERSION ""
+#define PACKAGE_STRING ""
+#define PACKAGE_BUGREPORT ""
+#define USE_BUILTIN_FRAME_ADDRESS 1
+#define STDC_HEADERS 1
+#define HAVE_SYS_TYPES_H 1
+#define HAVE_SYS_STAT_H 1
+#define HAVE_STDLIB_H 1
+#define HAVE_STRING_H 1
+#define HAVE_MEMORY_H 1
+#define HAVE_STRINGS_H 1
+#define HAVE_UNISTD_H 1
+#define HAVE_LONG_LONG 1
+#define HAVE_OFF_T 1
+#define SIZEOF_INT 4
+#define SIZEOF_SHORT 2
+#define SIZEOF_LONG 4
+#define SIZEOF_LONG_LONG 8
+#define SIZEOF___INT64 0
+#define SIZEOF_OFF_T 4
+#define SIZEOF_VOIDP 4
+#define SIZEOF_FLOAT 4
+#define SIZEOF_DOUBLE 8
+#define HAVE_PROTOTYPES 1
+#define TOKEN_PASTE(x,y) x##y
+#define HAVE_STDARG_PROTOTYPES 1
+#define NORETURN(x) x __attribute__ ((noreturn))
+#define HAVE_DECL_SYS_NERR 1
+#define HAVE_DIRENT_H 1
+#define STDC_HEADERS 1
+#define HAVE_SYS_WAIT_H 1
+#define HAVE_STDLIB_H 1
+#define HAVE_STRING_H 1
+#define HAVE_UNISTD_H 1
+#define HAVE_LIMITS_H 1
+#define HAVE_SYS_FILE_H 1
+#define HAVE_SYS_IOCTL_H 1
+#define HAVE_FCNTL_H 1
+#define HAVE_SYS_FCNTL_H 1
+#define HAVE_SYS_TIME_H 1
+#define HAVE_SYS_TIMES_H 1
+#define HAVE_SYS_PARAM_H 1
+#define HAVE_PWD_H 1
+#define HAVE_UTIME_H 1
+#define HAVE_MEMORY_H 1
+#define HAVE_DIRECT_H 1
+#define HAVE_SYS_RESOURCE_H 1
+#define HAVE_STRUCT_STAT_ST_BLKSIZE 1
+#define HAVE_ST_BLKSIZE 1
+#define HAVE_STRUCT_STAT_ST_RDEV 1
+#define HAVE_ST_RDEV 1
+#define GETGROUPS_T gid_t
+#define RETSIGTYPE void
+#define HAVE_ALLOCA 1
+#define HAVE_DUP2 1
+#define HAVE_MEMMOVE 1
+#define HAVE_MKDIR 1
+#define HAVE_STRCASECMP 1
+#define HAVE_STRNCASECMP 1
+#define HAVE_STRERROR 1
+#define HAVE_STRFTIME 1
+#define HAVE_STRCHR 1
+#define HAVE_STRSTR 1
+#define HAVE_STRTOUL 1
+#define HAVE_ISINF 1
+#define HAVE_ISNAN 1
+#define HAVE_FINITE 1
+#define HAVE_HYPOT 1
+#define HAVE_ACOSH 1
+#define HAVE_FMOD 1
+#define HAVE_WAITPID 1
+#define HAVE_FSYNC 1
+#define HAVE_TRUNCATE 1
+#define HAVE_CHSIZE 1
+#define HAVE_TIMES 1
+#define HAVE_UTIMES 1
+#define HAVE_FCNTL 1
+#define HAVE_SYMLINK 1
+#define HAVE_SETITIMER 1
+#define HAVE_PAUSE 1
+#define HAVE_GETPGRP 1
+#define HAVE_SETPGID 1
+#define HAVE_GETGROUPS 1
+#define HAVE_GETRLIMIT 1
+#define HAVE_SIGPROCMASK 1
+#define HAVE_SIGACTION 1
+#define HAVE_SETSID 1
+#define HAVE_TELLDIR 1
+#define HAVE_SEEKDIR 1
+#define HAVE_MKTIME 1
+#define HAVE_COSH 1
+#define HAVE_SINH 1
+#define HAVE_TANH 1
+#define HAVE_STRUCT_TM_TM_ZONE 1
+#define HAVE_TM_ZONE 1
+#define HAVE_STRUCT_TM_TM_GMTOFF 1
+#define POSIX_SIGNAL 1
+#define GETPGRP_VOID 1
+#define SETPGRP_VOID 1
+#define RSHIFT(x,y) ((x)>>(int)y)
+#define FILE_COUNT _cnt
+#define FILE_READPTR _ptr
+#define NEED_IO_FLUSH_BETWEEN_RW 1
+#define DEFAULT_KCODE KCODE_NONE
+#define DLEXT ".so"
+#define RUBY_LIB "/lib/ruby/@MAJOR@.@MINOR@"
+#define RUBY_SITE_LIB "/lib/ruby/site_ruby"
+#define RUBY_SITE_LIB2 "/lib/ruby/site_ruby/@MAJOR@.@MINOR@"
+#define RUBY_PLATFORM "i386-msdosdjgpp"
+#define RUBY_ARCHLIB "/lib/ruby/@MAJOR@.@MINOR@/i386-msdosdjgpp"
+#define RUBY_SITE_ARCHLIB "/lib/ruby/site_ruby/@MAJOR@.@MINOR@/i386-msdosdjgpp"
diff --git a/djgpp/config.sed b/djgpp/config.sed
new file mode 100644
index 0000000000..1805789520
--- /dev/null
+++ b/djgpp/config.sed
@@ -0,0 +1,128 @@
+/^SHELL/s,/bin/sh,$(COMSPEC),
+;s%/bin/rm%rm%
+;s%|| true%%
+;/\/dev\/null/ {
+;s,/dev/null 2>&1, nul,
+;s,2> /dev/null,,
+;}
+;/^config.status/ {
+; N;N;N;N;N;d
+;}
+:t
+ /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+s,@srcdir@,.,g;t t
+s,@top_srcdir@,..,;t t
+s,@PATH_SEPARATOR@,:,;t t
+s,@PACKAGE_NAME@,,;t t
+s,@PACKAGE_TARNAME@,,;t t
+s,@PACKAGE_VERSION@,,;t t
+s,@PACKAGE_STRING@,,;t t
+s,@PACKAGE_BUGREPORT@,,;t t
+s,@exec_prefix@,${prefix},;t t
+s,@prefix@,/dev/env/DJDIR,;t t
+s%@program_transform_name@%s,^,,%;t t
+s,@bindir@,${exec_prefix}/bin,;t t
+s,@sbindir@,${exec_prefix}/sbin,;t t
+s,@libexecdir@,${exec_prefix}/libexec,;t t
+s,@datadir@,${prefix}/share,;t t
+s,@sysconfdir@,${prefix}/etc,;t t
+s,@sharedstatedir@,${prefix}/com,;t t
+s,@localstatedir@,${prefix}/var,;t t
+s,@libdir@,${exec_prefix}/lib,;t t
+s,@includedir@,${prefix}/include,;t t
+s,@oldincludedir@,/usr/include,;t t
+s,@infodir@,${prefix}/info,;t t
+s,@mandir@,${prefix}/man,;t t
+s,@build_alias@,i586-pc-msdosdjgpp,;t t
+s,@host_alias@,i586-pc-msdosdjgpp,;t t
+s,@target_alias@,i386-msdosdjgpp,;t t
+s,@DEFS@,,;t t
+s,@ECHO_C@,,;t t
+s,@ECHO_N@,-n,;t t
+s,@ECHO_T@,,;t t
+s,@LIBS@,-lm ,;t t
+s,@MAJOR@,1,;t t
+s,@MINOR@,7,;t t
+s,@TEENY@,3,;t t
+s,@build@,i586-pc-msdosdjgpp,;t t
+s,@build_cpu@,i586,;t t
+s,@build_vendor@,pc,;t t
+s,@build_os@,msdosdjgpp,;t t
+s,@host@,i586-pc-msdosdjgpp,;t t
+s,@host_cpu@,i586,;t t
+s,@host_vendor@,pc,;t t
+s,@host_os@,msdosdjgpp,;t t
+s,@target@,i386-pc-msdosdjgpp,;t t
+s,@target_cpu@,i386,;t t
+s,@target_vendor@,pc,;t t
+s,@target_os@,msdosdjgpp,;t t
+s,@CC@,gcc,;t t
+s,@ac_ct_CC@,,;t t
+s,@CFLAGS@,-Os,;t t
+s,@LDFLAGS@,,;t t
+s,@CPPFLAGS@,,;t t
+s,@EXEEXT@,.exe,;t t
+s,@OBJEXT@,o,;t t
+s,@CPP@,gcc -E,;t t
+s,@EGREP@,grep -E,;t t
+s,@GNU_LD@,yes,;t t
+s,@CPPOUTFILE@,-o conftest.i,;t t
+s,@OUTFLAG@,-o ,;t t
+s,@YACC@,bison -y,;t t
+s,@RANLIB@,ranlib,;t t
+s,@ac_ct_RANLIB@,,;t t
+s,@AR@,ar,;t t
+s,@ac_ct_AR@,,;t t
+s,@NM@,,;t t
+s,@ac_ct_NM@,,;t t
+s,@WINDRES@,,;t t
+s,@ac_ct_WINDRES@,,;t t
+s,@DLLWRAP@,,;t t
+s,@ac_ct_DLLWRAP@,,;t t
+s,@LN_S@,ln -s,;t t
+s,@SET_MAKE@,,;t t
+s,@LIBOBJS@,crypt.o flock.o vsnprintf.o,;t t
+s,@ALLOCA@,,;t t
+s,@XCFLAGS@,,;t t
+s,@XLDFLAGS@, -L.,;t t
+s,@DLDFLAGS@,,;t t
+s,@STATIC@,,;t t
+s,@CCDLFLAGS@,,;t t
+s,@LDSHARED@,ld,;t t
+s,@DLEXT@,so,;t t
+s,@DLEXT2@,,;t t
+s,@LIBEXT@,a,;t t
+s,@LINK_SO@,,;t t
+s,@LIBPATHFLAG@, -L%s,;t t
+s,@STRIP@,strip,;t t
+s,@EXTSTATIC@,,;t t
+s,@setup@,Setup.dj,;t t
+s,@MINIRUBY@,./miniruby,;t t
+s,@PREP@,,;t t
+s,@ARCHFILE@,,;t t
+s,@LIBRUBY_LDSHARED@,ld,;t t
+s,@LIBRUBY_DLDFLAGS@,,;t t
+s,@RUBY_INSTALL_NAME@,ruby,;t t
+s,@rubyw_install_name@,,;t t
+s,@RUBYW_INSTALL_NAME@,,;t t
+s,@RUBY_SO_NAME@,$(RUBY_INSTALL_NAME),;t t
+s,@LIBRUBY_A@,lib$(RUBY_INSTALL_NAME).a,;t t
+s,@LIBRUBY_SO@,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR).$(TEENY),;t t
+s,@LIBRUBY_ALIASES@,lib$(RUBY_SO_NAME).so,;t t
+s,@LIBRUBY@,$(LIBRUBY_A),;t t
+s,@LIBRUBYARG@,-l$(RUBY_INSTALL_NAME),;t t
+s,@SOLIBS@,,;t t
+s,@DLDLIBS@,-lc,;t t
+s,@ENABLE_SHARED@,no,;t t
+s,@MAINLIBS@,,;t t
+s,@COMMON_LIBS@,,;t t
+s,@COMMON_MACROS@,,;t t
+s,@COMMON_HEADERS@,,;t t
+s,@EXPORT_PREFIX@,,;t t
+s,@MAKEFILES@,Makefile,;t t
+s,@arch@,i386-msdosdjgpp,;t t
+s,@sitearch@,i386-msdosdjgpp,;t t
+s,@sitedir@,${prefix}/lib/ruby/site_ruby,;t t
+s,@configure_args@,,;t t
+/^,THIS_IS_DUMMY_PATTERN_/i\
+ac_given_srcdir=.
diff --git a/djgpp/configure.bat b/djgpp/configure.bat
new file mode 100755
index 0000000000..e6a5d79d4a
--- /dev/null
+++ b/djgpp/configure.bat
@@ -0,0 +1,20 @@
+@echo off
+if exist configure.bat cd ..
+if exist djgpp\version.sed goto exist
+ sed -n -f djgpp\mkver.sed < version.h > djgpp\version.sed
+:exist
+set _conv_=-f djgpp\config.sed -f djgpp\version.sed
+sed %_conv_% < Makefile.in > Makefile
+sed %_conv_% < djgpp\config.hin > config.h
+echo LFN check > 12345678
+sed -n /LFN/d 123456789 > nul
+if errorlevel 2 goto LFN
+ copy missing\vsnprintf.c missing\vsnprint.c > nul
+ copy djgpp\config.sed config.sta > nul
+goto end
+:LFN
+ copy djgpp\config.sed config.status > nul
+:end
+set _conv_=
+del 12345678
+echo Now you must run a make.
diff --git a/djgpp/mkver.sed b/djgpp/mkver.sed
new file mode 100644
index 0000000000..f29b9ddd3e
--- /dev/null
+++ b/djgpp/mkver.sed
@@ -0,0 +1 @@
+/RUBY_VERSION /s/^.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*$/s,@MAJOR@,\1,;s,@MINOR@,\2,;s,@TEENY@,\3,/p
diff --git a/dln.c b/dln.c
index b939dc3460..5ba25b6415 100644
--- a/dln.c
+++ b/dln.c
@@ -3,19 +3,26 @@
dln.c -
$Author$
+ $Date$
created at: Tue Jan 18 17:05:06 JST 1994
- Copyright (C) 1993-2007 Yukihiro Matsumoto
+ Copyright (C) 1993-2003 Yukihiro Matsumoto
**********************************************************************/
-#include "ruby/ruby.h"
+#include "ruby.h"
#include "dln.h"
#ifdef HAVE_STDLIB_H
# include <stdlib.h>
#endif
+#ifdef __CHECKER__
+#undef HAVE_DLOPEN
+#undef USE_DLN_A_OUT
+#undef USE_DLN_DLOPEN
+#endif
+
#ifdef USE_DLN_A_OUT
char *dln_argv0;
#endif
@@ -36,10 +43,8 @@ void *xcalloc();
void *xrealloc();
#endif
-#define free(x) xfree(x)
-
#include <stdio.h>
-#if defined(_WIN32)
+#if defined(_WIN32) || defined(__VMS)
#include "missing/file.h"
#endif
#include <sys/types.h>
@@ -64,6 +69,18 @@ void *xrealloc();
char *getenv();
#endif
+#if defined(__VMS)
+#pragma builtins
+#include <dlfcn.h>
+#endif
+
+#ifdef __MACOS__
+# include <TextUtils.h>
+# include <CodeFragments.h>
+# include <Aliases.h>
+# include "macruby_private.h"
+#endif
+
#if defined(__APPLE__) && defined(__MACH__) /* Mac OS X */
# if defined(HAVE_DLOPEN)
/* Mac OS X with dlopen (10.3 or later) */
@@ -85,23 +102,29 @@ char *getenv();
#endif
#ifndef FUNCNAME_PATTERN
-# if defined(__hp9000s300) || ((defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)) && !defined(__ELF__)) || defined(__BORLANDC__) || defined(NeXT) || defined(__WATCOMC__) || defined(MACOSX_DYLD)
+# if defined(__hp9000s300) || (defined(__NetBSD__) && !defined(__ELF__)) || defined(__BORLANDC__) || (defined(__FreeBSD__) && !defined(__ELF__)) || (defined(__OpenBSD__) && !defined(__ELF__)) || defined(NeXT) || defined(__WATCOMC__) || defined(MACOSX_DYLD)
# define FUNCNAME_PATTERN "_Init_%s"
# else
# define FUNCNAME_PATTERN "Init_%s"
# endif
#endif
-static size_t
-init_funcname_len(char **buf, const char *file)
+static int
+init_funcname_len(buf, file)
+ char **buf;
+ const char *file;
{
char *p;
const char *slash;
- size_t len;
+ int len;
/* Load the file as an object one */
for (slash = file-1; *file; file++) /* Find position of last '/' */
+#ifdef __MACOS__
+ if (*file == ':') slash = file;
+#else
if (*file == '/') slash = file;
+#endif
len = strlen(FUNCNAME_PATTERN) + strlen(slash + 1);
*buf = xmalloc(len);
@@ -115,13 +138,13 @@ init_funcname_len(char **buf, const char *file)
}
#define init_funcname(buf, file) do {\
- size_t len = init_funcname_len(buf, file);\
+ int len = init_funcname_len(buf, file);\
char *tmp = ALLOCA_N(char, len+1);\
if (!tmp) {\
free(*buf);\
rb_memerror();\
}\
- strlcpy(tmp, *buf, len + 1);\
+ strcpy(tmp, *buf);\
free(*buf);\
*buf = tmp;\
} while (0)
@@ -161,8 +184,8 @@ static int dln_init_p = 0;
#define INVALID_OBJECT(h) (N_MAGIC(h) != OMAGIC)
-#include "ruby/util.h"
-#include "ruby/st.h"
+#include "util.h"
+#include "st.h"
static st_table *sym_tbl;
static st_table *undef_tbl;
@@ -170,7 +193,10 @@ static st_table *undef_tbl;
static int load_lib();
static int
-load_header(int fd, struct exec *hdrp, long disp)
+load_header(fd, hdrp, disp)
+ int fd;
+ struct exec *hdrp;
+ long disp;
{
int size;
@@ -240,7 +266,10 @@ static int reloc_r_length[] = {
#endif
static struct relocation_info *
-load_reloc(int fd, struct exec *hdrp, long disp)
+load_reloc(fd, hdrp, disp)
+ int fd;
+ struct exec *hdrp;
+ long disp;
{
struct relocation_info *reloc;
int size;
@@ -263,7 +292,10 @@ load_reloc(int fd, struct exec *hdrp, long disp)
}
static struct nlist *
-load_sym(int fd, struct exec *hdrp, long disp)
+load_sym(fd, hdrp, disp)
+ int fd;
+ struct exec *hdrp;
+ long disp;
{
struct nlist * buffer;
struct nlist * sym;
@@ -304,7 +336,9 @@ load_sym(int fd, struct exec *hdrp, long disp)
}
static st_table *
-sym_hash(struct exec *hdrp, struct nlist *syms)
+sym_hash(hdrp, syms)
+ struct exec *hdrp;
+ struct nlist *syms;
{
st_table *tbl;
struct nlist *sym = syms;
@@ -324,16 +358,17 @@ sym_hash(struct exec *hdrp, struct nlist *syms)
}
static int
-dln_init(const char *prog)
+dln_init(prog)
+ const char *prog;
{
- char *file, fbuf[MAXPATHLEN];
+ char *file;
int fd;
struct exec hdr;
struct nlist *syms;
if (dln_init_p == 1) return 0;
- file = dln_find_exe_r(prog, NULL, fbuf, sizeof(fbuf));
+ file = dln_find_exe(prog, NULL);
if (file == NULL || (fd = open(file, O_RDONLY)) < 0) {
dln_errno = errno;
return -1;
@@ -398,7 +433,11 @@ dln_init(const char *prog)
}
static long
-load_text_data(int fd, struct exec *hdrp, int bss, long disp)
+load_text_data(fd, hdrp, bss, disp)
+ int fd;
+ struct exec *hdrp;
+ int bss;
+ long disp;
{
int size;
unsigned char* addr;
@@ -432,21 +471,22 @@ load_text_data(int fd, struct exec *hdrp, int bss, long disp)
}
static int
-undef_print(char *key, char *value)
+undef_print(key, value)
+ char *key, *value;
{
fprintf(stderr, " %s\n", key);
return ST_CONTINUE;
}
static void
-dln_print_undef(void)
+dln_print_undef()
{
fprintf(stderr, " Undefined symbols:\n");
st_foreach(undef_tbl, undef_print, NULL);
}
static void
-dln_undefined(void)
+dln_undefined()
{
if (undef_tbl->num_entries > 0) {
fprintf(stderr, "dln: Calling undefined function\n");
@@ -469,7 +509,10 @@ struct undef {
static st_table *reloc_tbl = NULL;
static void
-link_undef(const char *name, long base, struct relocation_info *reloc)
+link_undef(name, base, reloc)
+ const char *name;
+ long base;
+ struct relocation_info *reloc;
{
static int u_no = 0;
struct undef *obj;
@@ -502,7 +545,10 @@ struct reloc_arg {
};
static int
-reloc_undef(int no, struct undef *undef, struct reloc_arg *arg)
+reloc_undef(no, undef, arg)
+ int no;
+ struct undef *undef;
+ struct reloc_arg *arg;
{
int datum;
char *address;
@@ -563,7 +609,9 @@ reloc_undef(int no, struct undef *undef, struct reloc_arg *arg)
}
static void
-unlink_undef(const char *name, long value)
+unlink_undef(name, value)
+ const char *name;
+ long value;
{
struct reloc_arg arg;
@@ -578,7 +626,10 @@ struct indr_data {
};
static int
-reloc_repl(int no, struct undef *undef, struct indr_data *data)
+reloc_repl(no, undef, data)
+ int no;
+ struct undef *undef;
+ struct indr_data *data;
{
if (strcmp(data->name0, undef->name) == 0) {
free(undef->name);
@@ -589,7 +640,10 @@ reloc_repl(int no, struct undef *undef, struct indr_data *data)
#endif
static int
-load_1(int fd, long disp, const char *need_init)
+load_1(fd, disp, need_init)
+ int fd;
+ long disp;
+ const char *need_init;
{
static const char *libc = LIBC_NAME;
struct exec hdr;
@@ -760,7 +814,7 @@ load_1(int fd, long disp, const char *need_init)
}
} /* end.. look it up */
else { /* is static */
- switch (R_SYMBOL(rel)) {
+ switch (R_SYMBOL(rel)) {
case N_TEXT:
case N_DATA:
datum = block;
@@ -870,7 +924,10 @@ load_1(int fd, long disp, const char *need_init)
static int target_offset;
static int
-search_undef(const char *key, int value, st_table *lib_tbl)
+search_undef(key, value, lib_tbl)
+ const char *key;
+ int value;
+ st_table *lib_tbl;
{
long offset;
@@ -887,9 +944,10 @@ struct symdef {
char *dln_librrb_ary_path = DLN_DEFAULT_LIB_PATH;
static int
-load_lib(const char *lib)
+load_lib(lib)
+ const char *lib;
{
- char *path, *file, fbuf[MAXPATHLEN];
+ char *path, *file;
char armagic[SARMAG];
int fd, size;
struct ar_hdr ahdr;
@@ -920,7 +978,7 @@ load_lib(const char *lib)
path = getenv("DLN_LIBRARY_PATH");
if (path == NULL) path = dln_librrb_ary_path;
- file = dln_find_file_r(lib, path, fbuf, sizeof(fbuf));
+ file = dln_find_file(lib, path);
fd = open(file, O_RDONLY);
if (fd == -1) goto syserr;
size = read(fd, armagic, SARMAG);
@@ -1024,7 +1082,8 @@ load_lib(const char *lib)
}
static int
-load(const char *file)
+load(file)
+ const char *file;
{
int fd;
int result;
@@ -1049,7 +1108,8 @@ load(const char *file)
}
void*
-dln_sym(const char *name)
+dln_sym(name)
+ const char *name;
{
struct nlist *sym;
@@ -1061,7 +1121,12 @@ dln_sym(const char *name)
#endif /* USE_DLN_A_OUT */
#ifdef USE_DLN_DLOPEN
-# include <dlfcn.h>
+# if defined(__NetBSD__) && defined(__NetBSD_Version__) && __NetBSD_Version__ < 105000000
+# include <nlist.h>
+# include <link.h>
+# else
+# include <dlfcn.h>
+# endif
#endif
#ifdef __hpux
@@ -1094,8 +1159,17 @@ dln_sym(const char *name)
#include <windows.h>
#endif
+#ifdef _WIN32_WCE
+#undef FormatMessage
+#define FormatMessage FormatMessageA
+#undef LoadLibrary
+#define LoadLibrary LoadLibraryA
+#undef GetProcAddress
+#define GetProcAddress GetProcAddressA
+#endif
+
static const char *
-dln_strerror(void)
+dln_strerror()
{
#ifdef USE_DLN_A_OUT
char *strerror();
@@ -1152,7 +1226,7 @@ aix_loaderror(const char *pathname)
char *message[8], errbuf[1024];
int i,j;
- struct errtab {
+ struct errtab {
int errnum;
char *errstr;
} load_errtab[] = {
@@ -1175,7 +1249,7 @@ aix_loaderror(const char *pathname)
snprintf(errbuf, 1024, "load failed - %s ", pathname);
- if (!loadquery(1, &message[0], sizeof(message)))
+ if (!loadquery(1, &message[0], sizeof(message)))
ERRBUF_APPEND(strerror(errno));
for(i = 0; message[i] && *message[i]; i++) {
int nerr = atoi(message[i]);
@@ -1183,7 +1257,7 @@ aix_loaderror(const char *pathname)
if (nerr == load_errtab[i].errnum && load_errtab[i].errstr)
ERRBUF_APPEND(load_errtab[i].errstr);
}
- while (isdigit(*message[i])) message[i]++;
+ while (isdigit(*message[i])) message[i]++;
ERRBUF_APPEND(message[i]);
ERRBUF_APPEND("\n");
}
@@ -1193,10 +1267,24 @@ aix_loaderror(const char *pathname)
}
#endif
+#if defined(__VMS)
+#include <starlet.h>
+#include <rms.h>
+#include <stsdef.h>
+#include <unixlib.h>
+#include <descrip.h>
+#include <lib$routines.h>
+
+static char *vms_filespec;
+static int vms_fileact(char *filespec, int type);
+static long vms_fisexh(long *sigarr, long *mecarr);
+#endif
+
#endif /* NO_DLN_LOAD */
void*
-dln_load(const char *file)
+dln_load(file)
+ const char *file;
{
#ifdef NO_DLN_LOAD
rb_raise(rb_eLoadError, "this executable file can't load extension libraries");
@@ -1218,7 +1306,7 @@ dln_load(const char *file)
/* Load the file as an object one */
init_funcname(&buf, file);
- strlcpy(winfile, file, sizeof(winfile));
+ strcpy(winfile, file);
/* Load file */
if ((handle = LoadLibrary(winfile)) == NULL) {
@@ -1269,11 +1357,6 @@ dln_load(const char *file)
}
init_fct = (void(*)())dlsym(handle, buf);
-#if defined __SYMBIAN32__
- if (init_fct == NULL) {
- init_fct = (void(*)())dlsym(handle, "1"); /* Some Symbian versions do not support symbol table in DLL, ordinal numbers only */
- }
-#endif
if (init_fct == NULL) {
error = DLN_ERROR();
dlclose(handle);
@@ -1333,7 +1416,7 @@ dln_load(const char *file)
#define DLN_DEFINED
/*----------------------------------------------------
By SHIROYAMA Takayuki Psi@fortune.nest.or.jp
-
+
Special Thanks...
Yu tomoak-i@is.aist-nara.ac.jp,
Mi hisho@tasihara.nest.or.jp,
@@ -1348,9 +1431,9 @@ dln_load(const char *file)
char *object_files[2] = {NULL, NULL};
void (*init_fct)();
-
+
object_files[0] = (char*)file;
-
+
s = NXOpenFile(2,NX_WRITEONLY);
/* Load object file, if return value ==0 , load failed*/
@@ -1397,7 +1480,7 @@ dln_load(const char *file)
/* lookup the initial function */
if(!NSIsSymbolNameDefined(buf)) {
rb_loaderror("Failed to lookup Init function %.200s",file);
- }
+ }
init_fct = NSAddressOfSymbol(NSLookupAndBindSymbol(buf));
(*init_fct)();
@@ -1416,10 +1499,9 @@ dln_load(const char *file)
/* load extention module */
img_id = load_add_on(file);
if (img_id <= 0) {
- rb_loaderror("Failed to load add_on %.200s error_code=%x",
- file, img_id);
+ rb_loaderror("Failed to load %.200s", file);
}
-
+
/* find symbol for module initialize function. */
/* The Be Book KernelKit Images section described to use
B_SYMBOL_TYPE_TEXT for symbol of function, not
@@ -1432,8 +1514,8 @@ dln_load(const char *file)
if (err_stat != B_NO_ERROR) {
char real_name[MAXPATHLEN];
- strlcpy(real_name, buf, MAXPATHLEN);
- strlcat(real_name, "__Fv", MAXPATHLEN);
+ strcpy(real_name, buf);
+ strcat(real_name, "__Fv");
err_stat = get_image_symbol(img_id, real_name,
B_SYMBOL_TYPE_TEXT, (void **)&init_fct);
}
@@ -1454,6 +1536,105 @@ dln_load(const char *file)
}
#endif /* __BEOS__*/
+#ifdef __MACOS__ /* Mac OS 9 or before */
+# define DLN_DEFINED
+ {
+ OSErr err;
+ FSSpec libspec;
+ CFragConnectionID connID;
+ Ptr mainAddr;
+ char errMessage[1024];
+ Boolean isfolder, didsomething;
+ Str63 fragname;
+ Ptr symAddr;
+ CFragSymbolClass class;
+ void (*init_fct)();
+ char fullpath[MAXPATHLEN];
+
+ strcpy(fullpath, file);
+
+ /* resolve any aliases to find the real file */
+ c2pstr(fullpath);
+ (void)FSMakeFSSpec(0, 0, fullpath, &libspec);
+ err = ResolveAliasFile(&libspec, 1, &isfolder, &didsomething);
+ if (err) {
+ rb_loaderror("Unresolved Alias - %s", file);
+ }
+
+ /* Load the fragment (or return the connID if it is already loaded */
+ fragname[0] = 0;
+ err = GetDiskFragment(&libspec, 0, 0, fragname,
+ kLoadCFrag, &connID, &mainAddr,
+ errMessage);
+ if (err) {
+ p2cstr(errMessage);
+ rb_loaderror("%s - %s",errMessage , file);
+ }
+
+ /* Locate the address of the correct init function */
+ c2pstr(buf);
+ err = FindSymbol(connID, buf, &symAddr, &class);
+ if (err) {
+ rb_loaderror("Unresolved symbols - %s" , file);
+ }
+ init_fct = (void (*)())symAddr;
+ (*init_fct)();
+ return (void*)init_fct;
+ }
+#endif /* __MACOS__ */
+
+#if defined(__VMS)
+#define DLN_DEFINED
+ {
+ long status;
+ void (*init_fct)();
+ char *fname, *p1, *p2;
+
+ $DESCRIPTOR(fname_d, "");
+ $DESCRIPTOR(image_d, "");
+ $DESCRIPTOR(buf_d, "");
+
+ decc$to_vms(file, vms_fileact, 0, 0);
+
+ fname = (char *)__alloca(strlen(file)+1);
+ strcpy(fname,file);
+ if (p1 = strrchr(fname,'/'))
+ fname = p1 + 1;
+ if (p2 = strrchr(fname,'.'))
+ *p2 = '\0';
+
+ fname_d.dsc$w_length = strlen(fname);
+ fname_d.dsc$a_pointer = fname;
+ image_d.dsc$w_length = strlen(vms_filespec);
+ image_d.dsc$a_pointer = vms_filespec;
+ buf_d.dsc$w_length = strlen(buf);
+ buf_d.dsc$a_pointer = buf;
+
+ lib$establish(vms_fisexh);
+
+ status = lib$find_image_symbol (
+ &fname_d,
+ &buf_d,
+ &init_fct,
+ &image_d);
+
+ lib$establish(0);
+
+ if (status == RMS$_FNF) {
+ error = dln_strerror();
+ goto failed;
+ } else if (!$VMS_STATUS_SUCCESS(status)) {
+ error = DLN_ERROR();
+ goto failed;
+ }
+
+ /* Call the init code */
+ (*init_fct)();
+
+ return 1;
+ }
+#endif /* __VMS */
+
#ifndef DLN_DEFINED
rb_notimplement();
#endif
@@ -1469,131 +1650,76 @@ dln_load(const char *file)
return 0; /* dummy return */
}
-static char *dln_find_1(const char *fname, const char *path, char *buf, size_t size, int exe_flag);
+static char *dln_find_1();
char *
-dln_find_exe_r(const char *fname, const char *path, char *buf, size_t size)
+dln_find_exe(fname, path)
+ const char *fname;
+ const char *path;
{
if (!path) {
path = getenv(PATH_ENV);
}
if (!path) {
-#if defined(_WIN32)
+#if defined(MSDOS) || defined(_WIN32) || defined(__human68k__) || defined(__MACOS__)
path = "/usr/local/bin;/usr/ucb;/usr/bin;/bin;.";
#else
path = "/usr/local/bin:/usr/ucb:/usr/bin:/bin:.";
#endif
}
- return dln_find_1(fname, path, buf, size, 1);
+ return dln_find_1(fname, path, 1);
}
char *
-dln_find_file_r(const char *fname, const char *path, char *buf, size_t size)
+dln_find_file(fname, path)
+ const char *fname;
+ const char *path;
{
+#ifndef __MACOS__
if (!path) path = ".";
- return dln_find_1(fname, path, buf, size, 0);
+ return dln_find_1(fname, path, 0);
+#else
+ if (!path) path = ".";
+ return _macruby_path_conv_posix_to_macos(dln_find_1(fname, path, 0));
+#endif
}
static char fbuf[MAXPATHLEN];
-char *
-dln_find_exe(const char *fname, const char *path)
-{
- return dln_find_exe_r(fname, path, fbuf, sizeof(fbuf));
-}
-
-char *
-dln_find_file(const char *fname, const char *path)
-{
- return dln_find_file_r(fname, path, fbuf, sizeof(fbuf));
-}
-
static char *
-dln_find_1(const char *fname, const char *path, char *fbuf, size_t size,
- int exe_flag /* non 0 if looking for executable. */)
+dln_find_1(fname, path, exe_flag)
+ const char *fname;
+ const char *path;
+ int exe_flag; /* non 0 if looking for executable. */
{
register const char *dp;
register const char *ep;
register char *bp;
struct stat st;
- size_t i, fspace;
-#ifdef DOSISH
- static const char extension[][5] = {
- ".exe", ".com", ".cmd", ".bat",
- };
- size_t j;
- int is_abs = 0, has_path = 0;
- const char *ext = 0;
- const char *p = fname;
+#ifdef __MACOS__
+ const char* mac_fullpath;
#endif
-#define RETURN_IF(expr) if (expr) return (char *)fname;
-
- RETURN_IF(!fname);
+ if (!fname) return (char *)fname;
+ if (fname[0] == '/') return (char *)fname;
+ if (strncmp("./", fname, 2) == 0 || strncmp("../", fname, 3) == 0)
+ return (char *)fname;
+ if (exe_flag && strchr(fname, '/')) return (char *)fname;
#ifdef DOSISH
-# ifndef CharNext
-# define CharNext(p) ((p)+1)
-# endif
+ if (fname[0] == '\\') return (char *)fname;
# ifdef DOSISH_DRIVE_LETTER
- if (((p[0] | 0x20) - 'a') < 26 && p[1] == ':') {
- p += 2;
- is_abs = 1;
- }
+ if (strlen(fname) > 2 && fname[1] == ':') return (char *)fname;
# endif
- switch (*p) {
- case '/': case '\\':
- is_abs = 1;
- p++;
- }
- has_path = is_abs;
- while (*p) {
- switch (*p) {
- case '/': case '\\':
- has_path = 1;
- ext = 0;
- p++;
- break;
- case '.':
- ext = p;
- p++;
- break;
- default:
- p = CharNext(p);
- }
- }
- if (ext) {
- for (j = 0; STRCASECMP(ext, extension[j]); ) {
- if (++j == sizeof(extension) / sizeof(extension[0])) {
- ext = 0;
- break;
- }
- }
- }
- ep = bp = 0;
- if (!exe_flag) {
- RETURN_IF(is_abs);
- }
- else if (has_path) {
- RETURN_IF(ext);
- i = p - fname;
- if (i + 1 > size) goto toolong;
- fspace = size - i - 1;
- bp = fbuf;
- ep = p;
- memcpy(fbuf, fname, i + 1);
- goto needs_extension;
- }
+ if (strncmp(".\\", fname, 2) == 0 || strncmp("..\\", fname, 3) == 0)
+ return (char *)fname;
+ if (exe_flag && strchr(fname, '\\')) return (char *)fname;
#endif
- RETURN_IF(fname[0] == '/');
- RETURN_IF(strncmp("./", fname, 2) == 0 || strncmp("../", fname, 3) == 0);
- RETURN_IF(exe_flag && strchr(fname, '/'));
-
-#undef RETURN_IF
-
for (dp = path;; dp = ++ep) {
- register size_t l;
+ register int l;
+ int i;
+ int fspace;
/* extract a component */
ep = strchr(dp, PATH_SEP[0]);
@@ -1603,7 +1729,7 @@ dln_find_1(const char *fname, const char *path, char *fbuf, size_t size,
/* find the length of that component */
l = ep - dp;
bp = fbuf;
- fspace = size - 2;
+ fspace = sizeof fbuf - 2;
if (l > 0) {
/*
** If the length of the component is zero length,
@@ -1615,7 +1741,7 @@ dln_find_1(const char *fname, const char *path, char *fbuf, size_t size,
if (*dp == '~' && (l == 1 ||
#if defined(DOSISH)
- dp[1] == '\\' ||
+ dp[1] == '\\' ||
#endif
dp[1] == '/')) {
char *home;
@@ -1623,9 +1749,8 @@ dln_find_1(const char *fname, const char *path, char *fbuf, size_t size,
home = getenv("HOME");
if (home != NULL) {
i = strlen(home);
- if (fspace < i)
+ if ((fspace -= i) < 0)
goto toolong;
- fspace -= i;
memcpy(bp, home, i);
bp += i;
}
@@ -1633,9 +1758,8 @@ dln_find_1(const char *fname, const char *path, char *fbuf, size_t size,
l--;
}
if (l > 0) {
- if (fspace < l)
+ if ((fspace -= l) < 0)
goto toolong;
- fspace -= l;
memcpy(bp, dp, l);
bp += l;
}
@@ -1647,7 +1771,7 @@ dln_find_1(const char *fname, const char *path, char *fbuf, size_t size,
/* now append the file name */
i = strlen(fname);
- if (fspace < i) {
+ if ((fspace -= i) < 0) {
toolong:
fprintf(stderr, "openpath: pathname too long (ignored)\n");
*bp = '\0';
@@ -1655,12 +1779,26 @@ dln_find_1(const char *fname, const char *path, char *fbuf, size_t size,
fprintf(stderr, "\tFile \"%s\"\n", fname);
goto next;
}
- fspace -= i;
memcpy(bp, fname, i + 1);
#if defined(DOSISH)
- if (exe_flag && !ext) {
- needs_extension:
+ if (exe_flag) {
+ static const char extension[][5] = {
+#if defined(MSDOS)
+ ".com", ".exe", ".bat",
+#if defined(DJGPP)
+ ".btm", ".sh", ".ksh", ".pl", ".sed",
+#endif
+#elif defined(__EMX__) || defined(_WIN32)
+ ".exe", ".com", ".cmd", ".bat",
+/* end of __EMX__ or _WIN32 */
+#else
+ ".r", ".R", ".x", ".X", ".bat", ".BAT",
+/* __human68k__ */
+#endif
+ };
+ int j;
+
for (j = 0; j < sizeof(extension) / sizeof(extension[0]); j++) {
if (fspace < strlen(extension[j])) {
fprintf(stderr, "openpath: pathname too long (ignored)\n");
@@ -1668,20 +1806,38 @@ dln_find_1(const char *fname, const char *path, char *fbuf, size_t size,
fprintf(stderr, "\tFile \"%s%s\"\n", fname, extension[j]);
continue;
}
- strlcpy(bp + i, extension[j], fspace);
+ strcpy(bp + i, extension[j]);
+#ifndef __MACOS__
if (stat(fbuf, &st) == 0)
return fbuf;
+#else
+ if (mac_fullpath = _macruby_exist_file_in_libdir_as_posix_name(fbuf))
+ return mac_fullpath;
+
+#endif
}
goto next;
}
-#endif /* _WIN32 or __EMX__ */
+#endif /* MSDOS or _WIN32 or __human68k__ or __EMX__ */
+#ifndef __MACOS__
if (stat(fbuf, &st) == 0) {
if (exe_flag == 0) return fbuf;
/* looking for executable */
if (!S_ISDIR(st.st_mode) && eaccess(fbuf, X_OK) == 0)
return fbuf;
}
+#else
+ if (mac_fullpath = _macruby_exist_file_in_libdir_as_posix_name(fbuf)) {
+ if (exe_flag == 0) return mac_fullpath;
+ /* looking for executable */
+ if (stat(mac_fullpath, &st) == 0) {
+ if (!S_ISDIR(st.st_mode) && eaccess(mac_fullpath, X_OK) == 0)
+ return mac_fullpath;
+ }
+ }
+#endif
+
next:
/* if not, and no other alternatives, life is bleak */
if (*ep == '\0') {
@@ -1691,3 +1847,24 @@ dln_find_1(const char *fname, const char *path, char *fbuf, size_t size,
/* otherwise try the next component in the search path */
}
}
+
+#if defined(__VMS)
+
+/* action routine for decc$to_vms */
+static int vms_fileact(char *filespec, int type)
+{
+ if (vms_filespec)
+ free(vms_filespec);
+ vms_filespec = malloc(strlen(filespec)+1);
+ strcpy(vms_filespec, filespec);
+ return 1;
+}
+
+/* exception handler for LIB$FIND_IMAGE_SYMBOL */
+static long vms_fisexh(long *sigarr, long *mecarr)
+{
+ sys$unwind(1, 0);
+ return 1;
+}
+
+#endif /* __VMS */
diff --git a/dln.h b/dln.h
index 47ff3eaf59..182cf9f9f4 100644
--- a/dln.h
+++ b/dln.h
@@ -3,9 +3,10 @@
dln.h -
$Author$
+ $Date$
created at: Wed Jan 19 16:53:09 JST 1994
- Copyright (C) 1993-2007 Yukihiro Matsumoto
+ Copyright (C) 1993-2003 Yukihiro Matsumoto
**********************************************************************/
@@ -28,14 +29,12 @@
# define _(args) ()
#endif
-DEPRECATED(char *dln_find_exe(const char*,const char*));
-DEPRECATED(char *dln_find_file(const char*,const char*));
-char *dln_find_exe_r(const char*,const char*,char*,size_t);
-char *dln_find_file_r(const char*,const char*,char*,size_t);
+char *dln_find_exe _((const char*,const char*));
+char *dln_find_file _((const char*,const char*));
#ifdef USE_DLN_A_OUT
extern char *dln_argv0;
#endif
-void *dln_load(const char*);
+void *dln_load _((const char*));
#endif
diff --git a/dmyencoding.c b/dmyencoding.c
deleted file mode 100644
index 1bd1106e69..0000000000
--- a/dmyencoding.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define NO_LOCALE_CHARMAP 1
-#include "encoding.c"
diff --git a/dmyext.c b/dmyext.c
index 4d273f7faf..4120d493c3 100644
--- a/dmyext.c
+++ b/dmyext.c
@@ -1,4 +1,4 @@
void
-Init_ext(void)
+Init_ext()
{
}
diff --git a/doc/ChangeLog-1.8.0 b/doc/ChangeLog-1.8.0
index e16c7f4f20..d168a50f80 100644
--- a/doc/ChangeLog-1.8.0
+++ b/doc/ChangeLog-1.8.0
@@ -10516,11 +10516,6 @@ Thu Jan 17 16:21:42 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (block_pass): should allow block argument relay even in
the tainted mode.
-Thu Jan 17 09:43:05 2002 TAKAHASHI Kaoru <kaoru@kaisei.org>
-
- * misc/ruby-mode.el (ruby-add-log-current-method): New function
- for `add-log-current-defun-function'.
-
Thu Jan 17 04:51:48 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
* ext/socket/socket.c: support subclassing by proper "initialize"
diff --git a/doc/ChangeLog-YARV b/doc/ChangeLog-YARV
deleted file mode 100644
index c9d32916cf..0000000000
--- a/doc/ChangeLog-YARV
+++ /dev/null
@@ -1,6917 +0,0 @@
-# $Id: ChangeLog 590 2006-12-31 09:02:34Z ko1 $
-#
-# YARV ChangeLog
-# from Mon, 03 May 2004 01:24:19 +0900
-#
-
-Sun Dec 31 18:01:50 2006 Koichi Sasada <ko1@atdot.net>
-
- * bin/* : ruby/trunk/bin 11437
-
-
-Sun Dec 31 17:42:05 2006 Koichi Sasada <ko1@atdot.net>
-
- * eval.c : remove old Kernel#funcall definition
-
-
-2006-12-30(Sat) 07:59:26 +0900 Koichi Sasada <ko1@atdot.net>
-
- * catch up ruby/trunk 11437
-
- * eval_intern.h : reorder tag initialization
-
- * eval.c : fix to support __send!, funcall and prohibit funcall as
- send
-
- * eval_error.h, eval_jump.h, eval_safe.h : fix prototypes
-
- * eval_method.h, vm.c : check re-definition at rb_add_method()
-
- * yarvcore.h : fix typo
-
- * compile.c : fix white spaces
-
- * lib/delegate.rb : fix to support __send, ...
-
- * lib/getoptlong.rb : fix to work on YARV
-
- * lib/rss/parser.rb : use __send! instead of __send__
-
- * sample/test.rb : comment out codes which use |&b| type block parameter
-
- * ext/ripper/extconf.rb : turn off
-
- * test/ripper/test_files.rb, test_parser_events.rb,
- test_scanner_events.rb : fix to check it has ripper module
-
- * vm_dump.c : remove showing file path length limitation
-
- * yarvtest/test_eval.rb : use __send! instead of __send__
-
-
-2006-12-19(Tue) 11:46:08 +0900 Koichi Sasada <ko1@atdot.net>
-
- * doc/* : added
-
- * ext/openssl : added
-
- * ext/ripper : added
-
- * test/openssl : added
-
- * test/ripper : added
-
- * misc : added
-
- * rb/ -> tool/ : renamed
-
- * common.mk : fixed for above change
-
- * ruby_doc/* : move to topdir
-
- * sample/* : added
-
- * test2.rb : removed
-
-
-2006-12-15(Fri) 09:42:46 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c : remove obsolete codes
-
- * insns.def : fix a comment of getconstant
-
-
-2006-12-13(Wed) 16:26:06 +0900 Koichi Sasada <ko1@atdot.net>
-
- * blockinlining.c, compile.c, compile.h, debug.c, debug.h,
- insnhelper.h, insns.def, iseq.c, thread.c, thread_pthread.ci,
- thread_pthread.h, thread_win32.ci, thread_win32.h, vm.c, vm.h,
- vm_dump.c, vm_evalbody.ci, vm_opts.h.base, yarv.h,
- yarv_version.h, yarvcore.c, yarvcore.h :
- add a header includes copyright
-
-
-2006-12-12(Tue) 13:13:32 +0900 Koichi Sasada <ko1@atdot.net>
-
- * rb/insns2vm.rb : add PREFETCH() statement
-
- * vm.h : ditto
-
- * yarvcore.h : fix LIKELY(x) and
- remove main_thread_val field from yarv_vm_t
-
- * yarvcore.c : ditto
-
- * thread.c : support fork
-
- * eval_thread.c : ditto
-
- * process.c : ditto
-
- * signal.c : ditto
-
- * test/ruby/test_signal.rb :
-
- * thread_pthread.ci : rename timer thread functions
-
- * thread_win32.ci : ditto
-
-
-2006-11-10(Fri) 21:29:13 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c : fix to compile arguments
-
- * insns.def : fix to duplicate first array value on concatarray
- instruction
-
- * yarvtest/test_bin.rb : add a test for above change
-
- * sample/test.rb : fix to catch up Ruby HEAD (fix to remove test about
- module duplicate)
-
-
-2006-11-10(Fri) 12:49:11 +0900 Koichi Sasada <ko1@atdot.net>
-
- * vm_macro.def : fix to inherit visibility on
- NODE_SUPER method invocation
-
-
-2006-11-10(Fri) 09:13:46 +0900 Koichi Sasada <ko1@atdot.net>
-
- * class.c : revert module duplicate inclusion
-
- * parse.y : catch up current Ruby HEAD
-
- * node.h : ditto
-
- * compile.c : ditto
-
- * gc.c : ditto
-
- * iseq.c : ditto
-
- * eval_thread.c : define Continuation (null class)
-
- * vm_dump.c : fix to output backtrae to stderr
-
- * yarvtest/test_block.rb : remove unsupported test
-
- * yarvtest/test_class.rb : add a test about super
-
- * yarvtest/test_syntax.rb : add a test about case/when
-
-
-2006-11-09(Thu) 10:22:59 +0900 Koichi Sasada <ko1@atdot.net>
-
- * call_cfunc.h -> call_cfunc.ci : renamed
-
- * vm_evalbody.h, vm_evalbody.ci : ditto
-
- * thread_pthread.h, thread_pthread.ci : separate declaration and
- implementation
-
- * thread_win32.h, thread_win32.ci : ditto
-
- * thread.c : use *.ci instead of *.c as implementation
-
- * vm.c : ditto
-
- * common.mk : fix rules for above changes
-
-
-2006-11-08(Wed) 17:23:23 +0900 Koichi Sasada <ko1@atdot.net>
-
- * vm_dump.c : show C level backtrace (pointer only) with
- backtrace() function (glibc feature)
-
- * configure.in : ditto
-
- * yarvcore.c : add NSDR method (show C level backtrace)
-
- * error.c : fix indent
-
-
-2006-11-07(Tue) 13:17:10 +0900 Koichi Sasada <ko1@atdot.net>
-
- * eval.c (rb_set_errinfo) : added
-
- * ruby.h : ditto
-
- * version.h : fix version number
-
- * lib/webrick/utils.rb : fix to remove Thread.critical
-
- * ext/dbm, dl, gdbm, iconv, io, pty, sdbm : added
-
- * test/dbm, gdbm, io, logger, net, readline, sdbm, soap,
- webrick, win32ole, wsdl, xsd : added
-
-
-2006-11-06(Mon) 22:32:18 +0900 Koichi Sasada <ko1@atdot.net>
-
- * array.c : import Ruby HEAD
-
- * ext/socket/extconf.rb : ditto
-
- * ext/socket/socket.c : ditto
-
- * gc.c : ditto
-
- * lib/date.rb : ditto
-
- * lib/net/imap.rb : ditto
-
- * lib/rss/0.9.rb : ditto
-
- * lib/set.rb : ditto
-
- * lib/soap/mapping/rubytypeFactory.rb : ditto
-
- * lib/soap/mimemessage.rb : ditto
-
- * lib/soap/property.rb : ditto
-
- * lib/webrick/httprequest.rb : ditto
-
- * lib/webrick/httputils.rb : ditto
-
- * lib/xmlrpc/create.rb : ditto
-
- * lib/xsd/codegen/gensupport.rb : ditto
-
- * object.c : ditto
-
- * ruby.h : ditto
-
- * string.c : ditto
-
- * version.h : ditto
-
- * rb/ir.rb : fix to use "diffs" directory
-
- * vm_dump.c : add "const"
-
-
-2006-11-06(Mon) 16:36:47 +0900 Koichi Sasada <ko1@atdot.net>
-
- * eval_proc.c : remove "static" from external global variables
-
- * eval_thread.c : ditto
-
- * array.c : fix indent
-
- * insns.def : add a suitable cast
-
- * vm_macro.def : allow scalar value on splat arguments
-
- * yarvtest/test_block.rb : fix to synchronize Ruby HEAD
-
- * rb/insns2vm.rb : remove String#each for 1.9
-
- * template/vm.inc.tmpl : ditto (remove String#each_with_index)
-
-
-2006-11-06(Mon) 13:22:34 +0900 Koichi Sasada <ko1@atdot.net>
-
- * iseq.c : fixed GC debugging outputs
-
- * rb/parse.rb : fixed output format
-
-
-2006-11-04(Sat) 09:46:50 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c : fix to duplicate "#{'foo'}" string
-
- * yarvtest/test_bin.rb : add a test for above
-
- * ext/readline/readline.c : import Ruby HEAD
-
- * keywords : ditto
-
- * lex.c : ditto
-
- * parse.y : ditto
-
- * lib/mkmf.rb : ditto
-
- * test/ruby/test_hash.rb : fix to current specification
-
- * test/ruby/test_string.rb : ditto
-
-
-2006-11-03(Fri) 20:58:36 +0900 Koichi Sasada <ko1@atdot.net>
-
- * ext/nkf/nkf-utf8/utf8tbl.h : missed to add
-
- * configure.in : import ruby HEAD
-
- * test/ruby/test_array.rb : ditto
-
- * test/ruby/test_assignment.rb : ditto
-
- * test/ruby/test_clone.rb : ditto
-
- * test/socket/test_socket.rb : ditto
-
- * test/socket/test_unix.rb : ditto
-
- * test/strscan/test_stringscanner.rb : ditto
-
- * test/testunit/collector/test_dir.rb : ditto
-
-
-2006-11-03(Fri) 20:22:24 +0900 Koichi Sasada <ko1@atdot.net>
-
- * array.c : import current ruby HEAD and apply API changes
- This version has some known bugs
-
- * bignum.c : ditto
-
- * blockinlining.c : ditto
-
- * class.c : ditto
-
- * compile.c : ditto
-
- * dir.c : ditto
-
- * dln.c : ditto
-
- * enum.c : ditto
-
- * enumerator.c : ditto
-
- * error.c : ditto
-
- * eval.c : ditto
-
- * eval_error.h : ditto
-
- * eval_jump.h : ditto
-
- * eval_load.c : ditto
-
- * eval_proc.c : ditto
-
- * ext/*
-
- * file.c : ditto
-
- * gc.c : ditto
-
- * hash.c : ditto
-
- * insns.def : ditto
-
- * instruby.rb : ditto
-
- * intern.h : ditto
-
- * io.c : ditto
-
- * iseq.c : ditto
-
- * lib/*
-
- * marshal.c : ditto
-
- * math.c : ditto
-
- * missing/vsnprintf.c : ditto
-
- * mkconfig.rb : ditto
-
- * node.h : ditto
-
- * numeric.c : ditto
-
- * object.c : ditto
-
- * oniguruma.h : ditto
-
- * pack.c : ditto
-
- * parse.y : ditto
-
- * prec.c : ditto
-
- * process.c : ditto
-
- * random.c : ditto
-
- * range.c : ditto
-
- * rb/ir.rb : ditto
-
- * re.c : ditto
-
- * regcomp.c : ditto
-
- * regerror.c : ditto
-
- * regexec.c : ditto
-
- * regint.h : ditto
-
- * regparse.c : ditto
-
- * regparse.h : ditto
-
- * ruby.c : ditto
-
- * ruby.h : ditto
-
- * rubytest.rb : ditto
-
- * runruby.rb : ditto
-
- * sample/test.rb : ditto
-
- * signal.c : ditto
-
- * sprintf.c : ditto
-
- * st.c : ditto
-
- * st.h : ditto
-
- * string.c : ditto
-
- * struct.c : ditto
-
- * test/*
-
- * thread.c : ditto
-
- * time.c : ditto
-
- * util.c : ditto
-
- * variable.c : ditto
-
- * version.h : ditto
-
- * vm.c : ditto
-
- * vm_dump.c : ditto
-
- * vm_macro.def : ditto
-
- * win32/*
-
-
-2006-10-31(Tue) 22:47:50 +0900 Koichi Sasada <ko1@atdot.net>
-
- * parse.y : fix NEWHEAP bugs (import HEAD)
-
- * ruby.c, intern.h, yarvcore.c (rb_load_file) : change to
- return parsed node pointer
-
- * rb/ir.rb : add check mode
-
-
-2006-09-01(Fri) 22:05:28 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c : fix a bug of peephole optimization and enable
- regexp optimization
-
-
-2006-08-21(Mon) 05:27:48 +0900 Koichi Sasada <ko1@atdot.net>
-
- * lib/mathn.rb : remove "remove_method :gcd2"
-
- * opt_insn_unif.def : unset opt setting
-
- * opt_operand.def : ditto
-
-
-2006-08-18(Fri) 17:55:31 +0900 Koichi Sasada <ko1@atdot.net>
-
- * common.mk : add dependency of yarvcore.h to thread.o
-
- * gc.c : change comment line
-
- * thread.c : remove some line break
-
- * yarvcore.c : reoder initialize sequence to mark main thread
-
-
-2006-08-18(Fri) 16:51:34 +0900 Koichi Sasada <ko1@atdot.net>
-
- * yarvcore.h : add a support for cache values per thread
-
- * yarvcore.c : ditto
-
- * gc.c : ditto
-
- * thread.c : move a expression after acquiring lock
-
- * compile.c : add a cast to remove warning
-
-
-2006-08-18(Fri) 02:07:45 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c : fix to return rhs value on ATTRASGIN
-
- * insns.def (setn) : add insn setn
-
- * yarvtest/test_bin.rb : add tests for above
-
-
-2006-08-17(Thu) 22:46:08 +0900 Koichi Sasada <ko1@atdot.net>
-
- * vm.c : clear callee_id ([yarv-dev:1073])
-
-
-2006-08-17(Thu) 22:14:15 +0900 Koichi Sasada <ko1@atdot.net>
-
- * thread_pthread.h : fix error message
-
-
-2006-08-17(Thu) 12:23:52 +0900 Koichi Sasada <ko1@atdot.net>
-
- * eval.c : change initilize routine order ([yarv-dev:1067])
-
- * yarvcore.c (Init_yarv) : init th->machine_stack_start
-
- * thread_pthread.h : add malloc value check ([yarv-dev:1066])
-
- * insns.def (opt_eq) : fix typo ([yarv-dev:1072])
-
- * yarvtest/test_opts.rb : add a test for above
-
- * yarvtest/test_class.rb : add a test for last commit
-
-
-2006-08-17(Thu) 11:02:16 +0900 Koichi Sasada <ko1@atdot.net>
-
- * class.c (clone_method) : check undef-ed method ([yarv-dev:1068])
-
-
-2006-08-15(Tue) 15:07:43 +0900 Koichi Sasada <ko1@atdot.net>
-
- * insns.def : fix opt_plus routine ([yarv-dev-en:149])
-
- * yarvtest/test_opts.rb : add tests for above
-
-
-2006-08-06(Sun) 06:24:51 +0900 Koichi Sasada <ko1@atdot.net>
-
- * common.mk : fix build rule (build only ruby binary when benchmark)
-
- * yarvcore.[ch] : fix and add yarv_iseq_new_with_* API
-
- * blockinlining.c : ditto
-
- * compile.c : ditto
-
- * compile.h : ditto
-
- * iseq.c : ditto
-
- * eval_method.h : check redefinition for specialized instruction
-
- * insnhelper.h : ditto
-
- * insns.def : ditto
-
- * vm.c : ditto
-
- * vm.h : ditto
-
- * numeric.c : add Fixnum#succ
-
- * thread.c : remove duplicated method Thread#current
-
- * yarvcore.c : remove duplicated method Proc#clone
-
- * yarvtest/test_opts.rb : added
-
-
-2006-07-20(Thu) 04:10:13 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c : fix [yarv-dev:1041] problem (raise TypeError)
-
- * eval.c : rb_funcall2 send as NOEX_PRIVATE and check scope
-
-
-2006-07-20(Thu) 03:38:46 +0900 Koichi Sasada <ko1@atdot.net>
-
- * yarvcore.c : fix [yarv-dev:1040] bug
-
-
-2006-07-18(Tue) 18:45:52 +0900 Koichi Sasada <ko1@atdot.net>
-
- * some files : set property "svn:eol-style" as native
-
-
-2006-07-18(Tue) 18:35:55 +0900 Koichi Sasada <ko1@atdot.net>
-
- * gc.h : fix a static function name
-
- * vm.c : remove Japanese comments
-
- * yarvcore.c : add a comment
-
- * some files : set property "svn:eol-style" as native
-
-
-2006-07-18(Tue) 16:48:01 +0900 Koichi Sasada <ko1@atdot.net>
-
- * vm.c : remove unused code
-
- * compile.c : add checking value
-
- * iseq.c : ditto
-
- * yarvcore.c : fix yarv_th_eval prototype declaration
-
- * yarvtest/yarvtest.rb : use compile instead of parse method
-
-
-2006-07-12(Wed) 15:18:58 +0900 Koichi Sasada <ko1@atdot.net>
-
- * yarv_version.h : 0.4.1
-
- * Changes : ditto
-
-
-2006-07-12(Wed) 13:38:03 +0900 Koichi Sasada <ko1@atdot.net>
-
- * eval.c : fix indent
-
- * gc.h : fix syntax bug
-
- * thread_pthread.h : vanish warnning message
-
- * iseq.c : ditto
-
- * compile.c : ditto
-
- * thread.c : ditto
-
- * vm.c : ditto
-
- * yarvcore.c : prohibit tail call optimization to mark
- iseq object
-
- * yarvcore.h : add some allocator function declaration
-
- * yarvtest/test_eval.rb : remove output
-
-
-2006-07-12(Wed) 05:01:23 +0900 Koichi Sasada <ko1@atdot.net>
-
- * yarvcore.c : undef alloc funcs
-
- * eval_proc.c : ditto (use factory faction)
-
- * thread.c : ditto
-
- * vm.c : ditto
-
- * iseq.c : fix compile option creation
-
- * rb/allload.rb : use compile_file method
-
- * rb/compile.rb : ditto
-
- * rb/parse.rb : ditto
-
- * template/insnstbl.html : hide mail addr
-
-
-2006-07-11(Tue) 21:34:29 +0900 Minero Aoki <aamine@loveruby.net>
-
- * test/ruby/test_dir.rb: new test test_JVN_13947696.
-
-
-2006-07-11(Tue) 21:26:41 +0900 Minero Aoki <aamine@loveruby.net>
-
- * test/ruby/test_alias.rb: new test test_JVN_83768862.
-
-
-2006-07-11(Tue) 11:33:49 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c : fix compile error on C90
-
-
-2006-07-11(Tue) 10:40:23 +0900 Koichi Sasada <ko1@atdot.net>
-
- * disasm.c : removed
-
- * iseq.c : added
-
- * common.mk : ditto
-
- * blockinlining.c : Get*Val => Get*Ptr
-
- * eval.c : ditto
-
- * yarvcore.c : ditto
-
- * eval_proc.c : ditto
-
- * vm_dump.c : ditto
-
- * vm_macro.def : ditto
-
- * signal.c : ditto
-
- * vm.c : ditto
-
- * thread.c : ditto
-
- * compile.c : rename local variable insnobj => iobj
-
- * compile.c : support yarv_compile_option_t
-
- * gc.h : added
-
- * insns.def : use OPT_CHECKED_RUN instead of IGNORE_OPTIMIZE
-
- * rb/compile.rb : use compile option
-
- * template/optinsn.inc.tmpl : fix function name
-
- * vm_opts.h.base : change macros
-
- * rb/insns2vm.rb : ditto
-
- * yarv.h : fix yarvcore_eval_parsed parameter type
-
- * yarvcore.c : fix some interfaces (functions)
-
- * yarvcore.h : add a type yarv_compile_option_t
-
-
-2006-07-06(Thu) 13:45:20 +0900 Koichi Sasada <ko1@atdot.net>
-
- * lib/yasm.rb : pass builder object if block arity == 1
-
-
-2006-07-05(Wed) 11:23:50 +0900 Koichi Sasada <ko1@atdot.net>
-
- * lib/yasm.rb : fix method name
-
- * vm.c (th_set_top_stack) : check toplevel or not
-
-
-2006-07-04(Tue) 20:05:38 +0900 Koichi Sasada <ko1@atdot.net>
-
- * rb/compile.rb : added
-
- * yarvtest/yarvtest.rb : disable load/store test
-
-
-2006-07-04(Tue) 18:17:15 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c : fix some bugs about load iseq data
-
- * disasm.c : ditto (store)
-
- * eval.c (rb_f_local_variables) : fix bugs
-
- * insns.def : fix otp_ltlt condition bug
-
- * vm.c : ditto
-
- * yarvcore.c : rename some functions
-
- * yarvtest/yarvtest.rb : add iseq load/store tests
- (to enable this, remove comment)
-
-
-2006-07-03(Mon) 01:54:23 +0900 Koichi Sasada <ko1@atdot.net>
-
- * eval_thread.c : add parameter "th" to thread_set_raised
-
- * yarvcore.h : ditto
-
- * eval_intern.h : ditto
-
- * eval.c : ditto
-
- * eval_error.h : declare with ANSI style
-
- * disasm.c : rename iseq_iseq2simpledata() to iseq_data_to_ary
-
- * lib/yasm.rb : rename Instruction#to_simpledata to
- Instruction#to_a
-
- * yarvcore.c : ditto
-
- * vm.c : fix bug (Proc.new{|*args| p args}.call(1) #=> 1)
-
- * yarvtest/test_proc.rb : add a tests for above
-
-
-2006-06-21(Wed) 09:19:06 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c : remove yarv_iseq_t#catch_table_ary and
- add yarv_iseq_t#compile_data#catch_table_ary
-
- * compile.h : ditto
-
- * yarvcore.c : ditto
-
- * yarvcore.h : ditto
-
- * eval_thread.c : remove unused code
-
- * thread.c : add rb_gc_mark_threads() (from eval_thread.c)
-
-
-2006-05-31(Wed) 21:26:38 +0900 Koichi Sasada <ko1@atdot.net>
-
- * parse.y : prohibit tail call optimization to mark vparsr
- object
-
-
-2006-05-25(Thu) 15:37:11 +0900 Koichi Sasada <ko1@atdot.net>
-
- * blockinlining.c : support NEW_ATTRASGN node
-
- * class.c : skip undefined method to collect ([yarv-dev:999])
-
- * yarvtest/test_class.rb : add a test for above
-
- * compile.c : fix opt_regexpmatch1 condition
-
- * lib/monitor.rb : fix [yarv-dev:1009]
-
- * rb/insns2vm.rb : fix typo
-
- * thread.c : prohibit unlock by not mutex owner thread
-
- * vm_opts.h.base : change default option
-
-
-2006-05-18(Thu) 16:00:50 +0900 Koichi Sasada <ko1@atdot.net>
-
- * intern.h : fix prototype declarations for last re.c change
-
-
-2006-05-18(Thu) 12:12:03 +0900 Koichi Sasada <ko1@atdot.net>
-
- * rb/runruby.rb : added
-
- * thread.c (rb_thread_alone) : check if vm->living_threads
- is available
-
-
-2006-05-18(Thu) 12:05:35 +0900 Koichi Sasada <ko1@atdot.net>
-
- * signal.c : not mask SIGSEGV
-
- * thread.c : fix debug output on Win32
-
- * thread.c, thread_pthread.h : add some debug prints
-
- * yarvcore.c : mark machine registers on thread_mark
-
-
-2006-05-17(Wed) 18:09:20 +900 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * dir.c (sys_warning): should not call a vararg function
- rb_sys_warning() indirectly. [ruby-core:07886]
-
-
-2006-05-17(Wed) 16:41:41 +900 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * re.c (rb_reg_initialize): should not allow modifying literal
- regexps. frozen check moved from rb_reg_initialize_m as well.
-
- * re.c (rb_reg_initialize): should not modify untainted objects in
- safe levels higher than 3.
-
- * re.c (rb_memcmp): type change from char* to const void*.
-
- * dir.c (dir_close): should not close untainted dir stream.
-
- * dir.c (GetDIR): add tainted/frozen check for each dir operation.
-
-
-2006-05-07(Sun) 21:06:28 +0900 Koichi Sasada <ko1@atdot.net>
-
- * thread.c : remove Mutex#unlock_and_stop and add Mutex#sleep
-
- * lib/monitor.rb : ditto
-
- * lib/thread.rb : ditto
-
- * thread_pthread.h : fix stack size
-
- * thread_win32.h : fix sleep
-
- * yarvcore.h : disable to use get/setcontext
-
- * lib/webrick/server.rb : add experimental implementation
- using thraeds pool
-
-
-2006-05-05(Fri) 13:59:00 +0900 Koichi Sasada <ko1@atdot.net>
-
- * test/ruby/test_signal.rb : disable a test
-
- * thread.c : do trylock before lock on mutex_lock
-
- * thread_win32.h : use CriticalSection instead of Mutex
-
-
-2006-05-05(Fri) 03:03:22 +0900 Koichi Sasada <ko1@atdot.net>
-
- * common.mk : vtune rule make run test.rb
-
- * disasm.c : fix syntax errors (on VC)
-
- * yarvcore.c : ditto
-
- * lib/thread.rb : Mutex#synchronize is defined here
-
- * lib/*.rb : ditto
-
- * signal.c : separate pthread or not
-
- * thread.c : support lightweight wakeup
-
- * thread_pthread.h : ditto
-
- * thread_win32.h : ditto
-
- * yarvcore.h : ditto
-
- * yarvtest/test_thread.rb : restore last change
-
-
-2006-05-04(Thu) 18:11:43 +0900 Koichi Sasada <ko1@atdot.net>
-
- * eval_thread.c : remove rb_thread_interrupt
-
- * intern.h : ditto
-
- * signal.c : change signal transfer route
-
- * thread.c : ditto
-
- * thread_pthread.h : ditto
-
- * thread_win32.h : ditto
-
- * yarv.h : support GET_VM()
-
- * yarvcore.h : change yarv_thread_t/yarv_vm_t structure
-
- * yarvtest/test_thread.rb : decrease threads to test
-
-
-2006-05-04(Thu) 00:26:18 +0900 Koichi Sasada <ko1@atdot.net>
-
- * thread_pthread.h : experimental support of thread cache
-
-
-2006-04-25(Tue) 22:30:14 +0900 Koichi Sasada <ko1@atdot.net>
-
- * yarvcore.h : remove struct yarv_cmethod_info, add
- data structure for profiling and extend yarv_control_frame_t
-
- * vm.c : make pop_frame() and apply above change
-
- * eval.c : ditto
-
- * vm_dump.c : ditto
-
- * vm_macro.def : ditto
-
- * insns.def (leave): use pop_frame() instead of
- POP_CONTROL_STACK_FRAME() macro
-
- * insnhelper.h : remove some macros
-
- * yarvcore.c : change th_set_top_stack() prototype
-
-
-2006-04-18(Tue) 18:37:08 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c, disasm.c : support export/import exception
- information
-
- * yarvcore.h : change "struct catch_table_entry" member variable
- order
-
-
-2006-04-13(Thu) 17:11:30 +0900 Koichi Sasada <ko1@atdot.net>
-
- * bignum.c : import ruby 1.9 HEAD (Ruby 1.9.0 2006-04-08)
-
- * dir.c : ditto
-
- * enumerator.c : ditto
-
- * ext/.document : ditto
-
- * ext/extmk.rb : ditto
-
- * ext/nkf/lib/kconv.rb : ditto
-
- * ext/nkf/nkf-utf8/nkf.c : ditto
-
- * ext/nkf/nkf-utf8/utf8tbl.c : ditto
-
- * ext/nkf/nkf.c : ditto
-
- * ext/nkf/test.rb : ditto
-
- * ext/socket/.cvsignore : ditto
-
- * ext/win32ole/sample/excel2.rb : ditto
-
- * ext/win32ole/tests/testOLEMETHOD.rb : ditto
-
- * ext/win32ole/tests/testOLEPARAM.rb : ditto
-
- * ext/win32ole/tests/testOLETYPE.rb : ditto
-
- * ext/win32ole/tests/testOLETYPELIB.rb : ditto
-
- * ext/win32ole/tests/testOLEVARIABLE.rb : ditto
-
- * ext/win32ole/tests/testOLEVARIANT.rb : ditto
-
- * ext/win32ole/tests/testWIN32OLE.rb : ditto
-
- * ext/win32ole/tests/testall.rb : ditto
-
- * ext/win32ole/win32ole.c : ditto
-
- * gc.c : ditto
-
- * instruby.rb : ditto
-
- * io.c : ditto
-
- * lib/delegate.rb : ditto
-
- * lib/fileutils.rb : ditto
-
- * lib/find.rb : ditto
-
- * lib/irb/ruby-lex.rb : ditto
-
- * lib/mkmf.rb : ditto
-
- * lib/net/http.rb : ditto
-
- * lib/open-uri.rb : ditto
-
- * lib/pathname.rb : ditto
-
- * lib/rational.rb : ditto
-
- * lib/rdoc/parsers/parse_rb.rb : ditto
-
- * lib/rdoc/ri/ri_paths.rb : ditto
-
- * lib/resolv.rb : ditto
-
- * lib/test/unit/collector/objectspace.rb : ditto
-
- * lib/webrick/httpservlet/cgihandler.rb : ditto
-
- * math.c : ditto
-
- * mkconfig.rb : ditto
-
- * object.c : ditto
-
- * oniguruma.h : ditto
-
- * pack.c : ditto
-
- * parse.y : ditto
-
- * re.c : ditto
-
- * re.h : ditto
-
- * regcomp.c : ditto
-
- * regerror.c : ditto
-
- * regparse.c : ditto
-
- * ruby.h : ditto
-
- * rubytest.rb : ditto
-
- * runruby.rb : ditto
-
- * string.c : ditto
-
- * test/digest/test_digest.rb : ditto
-
- * test/pathname/test_pathname.rb : ditto
-
- * test/ruby/envutil.rb : ditto
-
- * test/ruby/test_float.rb : ditto
-
- * test/ruby/test_pack.rb : ditto
-
- * time.c : ditto
-
- * util.c : ditto
-
- * version.h : ditto
-
- * win32/mkexports.rb : ditto
-
- * win32/resource.rb : ditto
-
- * win32/win32.c : ditto
-
-
-2006-04-11(Tue) 11:26:53 +0900 Koichi Sasada <ko1@atdot.net>
-
- * rb/yasm.rb : move to lib/yasm.rb
-
-
-2006-04-09(Sun) 03:04:04 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c : change to accept method iseq object when loading from
- simple data
-
- * yarvcore.c : add a debug output
-
- * rb/yasm.rb : change some interfaces
-
-
-2006-04-07(Fri) 20:25:03 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c : fix miss about range of catch "next"
-
- * eval.c : add braces
-
-
-2006-04-07(Fri) 11:09:43 +0900 Koichi Sasada <ko1@atdot.net>
-
- * common.mk : fix some make rules
-
- * insns.def : rename some instructions name
-
- * rb/insns2vm.rb : change some operand type name
-
- * vm_evalbody.h : ditto
-
- * template/insns.inc.tmpl : add YARV_MAX_INSTRUCTION_SIZE macro
-
- * compile.c, disasm.c, yarvcore.c : support load/store iseq from/to simple
- data structure such as array, literals, and so on
-
- * rb/yasm.rb : supported
-
- * vm.c : change interface of eval_define_method
-
- * yarvcore.h : remove unused externals
-
-
-2006-03-08(Wed) 10:31:29 +0900 Minero Aoki <aamine@loveruby.net>
-
- * lib/delegate.rb (DelegateClass): do not delegate #send and
- #funcall.
-
-
-2006-02-27(Mon) 22:39:17 +0900 Minero Aoki <aamine@loveruby.net>
-
- * lib/thread.rb: last commit causes busy loop, revert it. [yarv-dev:990]
-
- * lib/thread.rb: non_block=true wrongly caused ThreadError.
-
-
-2006-02-27(Mon) 21:33:49 +0900 Koichi Sasada <ko1@atdot.net>
-
- * common.mk : fix to display command line
-
- * compile.c : fix comparison between a pointer and 0
-
- * debug.c : fix to output stder
-
- * disasm.c : add debug function
-
- * vm_dump.c : ditto
-
- * eval_proc.c : fix to skip class definition
-
- * ruby.h : fix T_VALUE to T_VALUES
-
- * gc.c : ditto
-
- * node.h : fix prototypes
-
- * vm.c : add VM_DEBUG macro
-
- * vm.c : fix compile error on VC++
-
- * vm.c : fix to inherit last lfp[0] on th_set_finish_env
-
- * vm.c : fix to add one svar location for any frame
-
- * vm_macro.def : ditto
-
- * yarvcore.h : add YARV_CLASS_SPECIAL_P() and YARV_BLOCK_PTR_P()
-
- * rdoc/ : removed
-
- * insns.def : fix to propagete throw state
-
-
-2006-02-27(Mon) 13:54:47 +0900 Minero Aoki <aamine@loveruby.net>
-
- * ext/syslog: imported from Ruby CVS trunk HEAD.
-
- * ext/racc: ditto.
-
-
-2006-02-27(Mon) 12:47:10 +0900 Minero Aoki <aamine@loveruby.net>
-
- * parse.y: follow coding style change.
-
-
-2006-02-27(Mon) 11:53:07 +0900 Minero Aoki <aamine@loveruby.net>
-
- * lib/README: imported from Ruby CVS trunk HEAD.
-
- * lib/gserver.rb: ditto.
-
- * lib/readbytes.rb: ditto.
-
- * lib/parsearg.rb: ditto.
-
- * lib/racc: ditto.
-
- * lib/rinda: ditto.
-
-
-2006-02-27(Mon) 11:27:19 +0900 Minero Aoki <aamine@loveruby.net>
-
- * lib/thread.rb (Queue#pop): faster code. [yarv-dev:973]
-
- * lib/thread.rb (Queue#pop): avoid to push same thread in to
- @waiting.
-
-
-2006-02-23(Thu) 23:32:53 +0900 Minero Aoki <aamine@loveruby.net>
-
- * lib/open3.rb: imported from Ruby CVS trunk HEAD (rev 1.12).
-
-
-2006-02-23(Thu) 15:10:09 +0900 Koichi Sasada <ko1@atdot.net>
-
- * eval.c : support rb_frame_self()
-
- * eval_intern.h (th_get_ruby_level_cfp) : return 0 if no cfp
-
- * eval_load.c : comment out scope set
-
- * yarvcore.c : fix to initialize/free process of iseq
-
- * vm.c (th_invoke_proc) : fix to set special cref always
-
- * yarvtest/test_proc.rb : add a test for above
-
-
-2006-02-22(Wed) 23:33:47 +0900 Koichi Sasada <ko1@atdot.net>
-
- * common.mk : add rule "runruby"
-
- * eval_thread.c : remove obsolete comment
-
- * eval.c : remove unused functions
-
- * signal.c : ditto
-
- * gc.c : add rb_register_mark_object() and use it
-
- * eval_load.c : ditto
-
- * eval_proc.c : ditto
-
- * ext/etc/etc.c : ditto
-
- * ext/win32ole/win32ole.c : ditto
-
- * ruby.h : ditto
-
- * yarvcore.h : ditto
-
- * thread.c : add rb_thread_run_parallel()
-
- * yarvcore.c : change bootstrap
-
-
-2006-02-22(Wed) 19:27:33 +0900 Koichi Sasada <ko1@atdot.net>
-
- * ext/win32ole/.cvsignore : removed
-
- * ext/win32ole/.document : ditto
-
-
-2006-02-22(Wed) 18:17:06 +0900 Koichi Sasada <ko1@atdot.net>
-
- * yarvcore.c : set Binding as YARVCore::VM::Binding
-
-
-2006-02-22(Wed) 12:54:45 +0900 Koichi Sasada <ko1@atdot.net>
-
- * ChangeLog : remove needless line
-
-
-2006-02-22(Wed) 12:49:02 +0900 Koichi Sasada <ko1@atdot.net>
-
- * rubysig.h : remove CHECK_INTS
-
- * eval.c : ditto
-
- * eval_load.c : ditto
-
- * ext/readline/readline.c : ditto
-
- * thread.c : ditto
-
- * win32/win32.c : ditto
-
- * yarv_version.h : 0.4.0
-
- * Changes : ditto
-
-
-2006-02-22(Wed) 11:36:04 +0900 Koichi Sasada <ko1@atdot.net>
-
- * test.rb : removed
-
-
-2006-02-22(Wed) 11:12:17 +0900 Koichi Sasada <ko1@atdot.net>
-
- * README : renewed
-
- * version.c : fixed version message
-
- * yarvext/ : removed
-
-
-2006-02-22(Wed) 10:33:04 +0900 Koichi Sasada <ko1@atdot.net>
-
- * lib/.document : imported from Ruby 1.9 HEAD
-
- * .document : ditto
-
- * ext/.document : ditto
-
- * lib/ftools.rb : ditto
-
- * lib/rdoc/ : ditto
-
- * eval_thread.c : remove unused functions
-
- * process.c : ditto
-
- * rb/insns2vm.rb : compare modified date of vm_opts.h and
- vm_opts.h.base
-
- * ruby.h : rename RValue to RValues
-
- * gc.c : ditto
-
- * vm.c : ditto
-
-
-2006-02-22(Wed) 06:32:10 +0900 Koichi Sasada <ko1@atdot.net>
-
- * configure.in : remove last commit
-
-
-2006-02-22(Wed) 06:18:53 +0900 Koichi Sasada <ko1@atdot.net>
-
- * configure.in : add default program prefix "-yarv"
-
-
-2006-02-22(Wed) 06:11:36 +0900 Koichi Sasada <ko1@atdot.net>
-
- * common.mk : change default rule (same as HEAD)
-
- * configure : removed
-
- * eval.c : remove last commit
-
- * vm.c : fix stack traverse
-
- * yarvcore.c : initialize top of control frame
-
- * version.c : 2.0
-
- * version.h : ditto
-
-
-2006-02-22(Wed) 04:50:42 +0900 Koichi Sasada <ko1@atdot.net>
-
- * eval.c : change to rewind C level control frame
-
- * vm.c : change to initialize cfp#proc and fix comparison of
- cfp and limit_cfp
-
- * yarvcore.c : remove last commit
-
-
-2006-02-22(Wed) 03:25:56 +0900 Koichi Sasada <ko1@atdot.net>
-
- * yarvcore.c : initialize each stack of thread
-
-
-2006-02-22(Wed) 00:02:08 +0900 Koichi Sasada <ko1@atdot.net>
-
- * thread.c : fix synchornize return value ([yarv-dev:957])
- and some synchornization error
-
- * thread_pthread.h : add debug helper function
-
-
-2006-02-21(Tue) 20:54:28 +0900 Koichi Sasada <ko1@atdot.net>
-
- * eval.c : fix place of rb_thread_terminate_all()
-
- * eval_thread.c : remove unused functions
-
- * yarv.h : remove GET_VM()
-
- * eval_jump.h : ditto
-
- * insns.def : ditto
-
- * vm_dump.c :
-
- * intern.h : change rb_thread_signal_raise/exit interface
-
- * signal.c : ditto
-
- * thread.c : ditto
-
- * test/ruby/test_beginendblock.rb : use block with IO.popen
-
- * thread_pthread.h : fix interrupt process
-
- * thread_win32.h : ditto
-
- * yarvcore.c : fix thread free process
-
- * yarvcore.h : remove yarv_vm_t#thread_critical, etc
-
-
-2006-02-21(Tue) 12:42:44 +0900 Koichi Sasada <ko1@atdot.net>
-
- * eval_thread.c : remove unused function rb_thread_schedule()
-
- * thread.c : rename yarv_thread_schedule to rb_thread_schedule()
-
- * thread.c, eval.c : fix to terminate all thread and barrier at
- eval.c#ruby_cleanup()
-
- * thread_win32.h : remove native_thread_cleanup()
-
- * thread_pthread.h : ditto
-
- * yarvcore.c : ditto
-
- * yarvtest/test_thread.rb : separete assersions to tests
-
-
-2006-02-21(Tue) 02:13:33 +900 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (f_arglist): should set command_start = Qtrue for
- command body. [ruby-talk:180648]
-
-
-2006-02-20(Mon) 20:41:07 +0900 Koichi Sasada <ko1@atdot.net>
-
- * thread.c : fix to synchronize signal_thread_list access
- and fix typo
-
-
-2006-02-20(Mon) 17:54:58 +0900 Koichi Sasada <ko1@atdot.net>
-
- * eval_proc.c : remove unused Binding functions and
- set is_lambda of Proc used define_method
-
- * yarvcore.c : support Proc#dup/clone, Binding#dup/clone
-
- * sample/test.rb : remove unsupport features (Proc as Binding)
-
-
-2006-02-20(Mon) 16:28:59 +0900 Koichi Sasada <ko1@atdot.net>
-
- * common.mk : add a dependency to vm.c on eval_intern.h
-
- * eval_intern.h : fix to initialize tag->tag
-
- * yarvtest/test_jump.rb : add tests for above
-
- * eval_jump.h : use local variable
-
-
-2006-02-20(Mon) 15:13:24 +0900 Koichi Sasada <ko1@atdot.net>
-
- * benchmark/bm_vm3_thread_create_join.rb : added
-
- * test/yaml/test_yaml.rb : imported from Ruby CVS trunk HEAD
-
-
-2006-02-20(Mon) 14:49:46 +0900 Minero Aoki <aamine@loveruby.net>
-
- * lib/yaml.rb: imported from Ruby CVS trunk HEAD.
-
- * lib/yaml: ditto.
-
- * ext/syck: ditto.
-
-
-2006-02-20(Mon) 13:58:03 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c : support block parameter which is NODE_ATTRASGN
-
- * yarvtest/test_block.rb : add tests for above
-
- * compile.c : fix NODE_DASGN_CURR level check
-
- * compile.c : fix "||=" (at firtst, check "defined? val")
-
- * compile.c : fix NODE_MATCH3 (permute receiver and argument)
-
- * yarvtest/test_bin.rb : add tests for above
-
- * eval.c : add rb_each()
-
- * test/ruby/test_signal.rb : increment a timeout value
-
- * thread.c, yarvcore.h : fix "join" flow
-
- * thread_pthread.h : ditto
-
- * thread_win32.h : ditto
-
- * yarvtest/test_thread.rb : add a test for above
-
- * vm.h, vm.c, vm_dump.c, insns.def : add FRAME_MAGIC_LAMBDA and
- support return from lambda (especially retrun from method defined
- by "define_method")
-
- * yarvtest/test_method.rb : add a test for above
-
- * yarvcore.c : remove unused functions
-
-
-2006-02-20(Mon) 11:22:31 +0900 Minero Aoki <aamine@loveruby.net>
-
- * test/ruby/test_eval.rb: now Object#funcall is defined.
-
-
-2006-02-20(Mon) 11:04:32 +0900 Minero Aoki <aamine@loveruby.net>
-
- * lib/irb/lc/ja/CVS: removed.
-
-
-2006-02-20(Mon) 10:55:59 +0900 Minero Aoki <aamine@loveruby.net>
-
- * lib/mutex_m.rb: imported from Ruby CVS trunk HEAD.
-
- * lib/observer.rb: ditto.
-
- * lib/wsdl: ditto.
-
- * lib/monitor.rb: ditto (removing Thread.critical=).
-
- * lib/xsd: ditto.
-
- * lib/soap: ditto.
-
- * lib/drb.rb: ditto.
-
- * lib/drb: ditto.
-
-
-2006-02-20(Mon) 10:49:31 +0900 Minero Aoki <aamine@loveruby.net>
-
- * yarvcore.c (Init_yarvcore): fix typo (duo -> dup).
-
-
-2006-02-19(Sun) 01:27:08 +0900 Koichi Sasada <ko1@atdot.net>
-
- * vm.c : "return" from lambda{} break block
-
- * eval.c : Unsupport Proc as Binding
-
- * test/ruby/test_eval.rb : apply above changes
-
- * yarvcore.c : remove unused function yarv_yield_values()
-
-
-2006-02-18(Sat) 03:19:36 +0900 Koichi Sasada <ko1@atdot.net>
-
- * thread.c, insns.def : fix passing value when thread killed
-
- * yarvtest/test_thread.rb : add tests for above
-
-
-2006-02-19(Sun) 01:19:42 +0900 Minero Aoki <aamine@loveruby.net>
-
- * lib/thread.rb (SizedQueue): didn't work. This patch was
- contributed by yukimizake. [yarv-dev:916]
-
-
-2006-02-18(Sat) 03:19:36 +0900 Koichi Sasada <ko1@atdot.net>
-
- * thread.c, insns.def : fix passing value when thread killed
-
- * yarvtest/test_thread.rb : add tests for above
-
-
-2006-02-18(Sat) 02:40:18 +0900 Koichi Sasada <ko1@atdot.net>
-
- * insns.def, vm.c, vm_macro.def : change BMETHOD algorithm
- ([yarv-dev:914])
-
- * yarvtest/test_class.rb : add a test for above
-
-
-2006-02-17(Fri) 23:59:51 +0900 Koichi Sasada <ko1@atdot.net>
-
- * vm.c, yarv.h : change th_invoke_proc() interface
-
- * eval_proc.c : ditto
-
- * signal.c : ditto
-
- * thread.c : ditto
-
- * yarvcore.c : ditto
-
- * vm_macro.def : ditto and fix NODE_BMETHOD call
-
- * vm.c : change name ("th_set_env()" to "push_frame()") and
- change interface
-
- * insns.def : ditto
-
- * eval.c : remove proc_jump_error()
-
- * benchmark/bm_app_answer.rb : added
-
- * vm_opts.h.base : add optimize option
-
-
-2006-02-17(Fri) 13:37:57 +0900 Koichi Sasada <ko1@atdot.net>
-
- * eval.c, ruby.h : add rb_errinfo()
-
- * eval_error.h (error_pos) : fix process order
-
- * bin/erb : imported from ruby 1.9
-
- * bin/irb : ditto
-
- * bin/rdoc : ditto
-
- * bin/ri : ditto
-
- * bin/testrb : ditto
-
- * ext/curses/.cvsignore : ditto
-
- * ext/curses/curses.c : ditto
-
- * ext/curses/depend : ditto
-
- * ext/curses/extconf.rb : ditto
-
- * ext/curses/hello.rb : ditto
-
- * ext/curses/mouse.rb : ditto
-
- * ext/curses/rain.rb : ditto
-
- * ext/curses/view.rb : ditto
-
- * ext/curses/view2.rb : ditto
-
- * ext/fcntl/.cvsignore : ditto
-
- * ext/fcntl/depend : ditto
-
- * ext/fcntl/extconf.rb : ditto
-
- * ext/fcntl/fcntl.c : ditto
-
- * ext/readline/README : ditto
-
- * ext/readline/README.ja : ditto
-
- * ext/readline/depend : ditto
-
- * ext/readline/extconf.rb : ditto
-
- * ext/readline/readline.c : ditto
-
- * ext/win32ole/.document : ditto
-
- * ext/zlib/doc/zlib.rd : ditto
-
- * ext/zlib/extconf.rb : ditto
-
- * ext/zlib/zlib.c : ditto
-
- * lib/cgi/.document : ditto
-
- * lib/cgi/session.rb : ditto
-
- * lib/cgi/session/pstore.rb : ditto
-
- * lib/shell/builtin-command.rb : ditto
-
- * lib/shell/command-processor.rb : ditto
-
- * lib/shell/error.rb : ditto
-
- * lib/shell/filter.rb : ditto
-
- * lib/shell/process-controller.rb : ditto
-
- * lib/shell/system-command.rb : ditto
-
- * lib/shell/version.rb : ditto
-
- * lib/xmlrpc/.document : ditto
-
- * lib/xmlrpc/README.rdoc : ditto
-
- * lib/xmlrpc/README.txt : ditto
-
- * lib/xmlrpc/base64.rb : ditto
-
- * lib/xmlrpc/client.rb : ditto
-
- * lib/xmlrpc/config.rb : ditto
-
- * lib/xmlrpc/create.rb : ditto
-
- * lib/xmlrpc/datetime.rb : ditto
-
- * lib/xmlrpc/httpserver.rb : ditto
-
- * lib/xmlrpc/marshal.rb : ditto
-
- * lib/xmlrpc/parser.rb : ditto
-
- * lib/xmlrpc/server.rb : ditto
-
- * lib/xmlrpc/utils.rb : ditto
-
- * rdoc/README : ditto
-
- * rdoc/code_objects.rb : ditto
-
- * rdoc/diagram.rb : ditto
-
- * rdoc/dot/dot.rb : ditto
-
- * rdoc/generators/chm_generator.rb : ditto
-
- * rdoc/generators/html_generator.rb : ditto
-
- * rdoc/generators/ri_generator.rb : ditto
-
- * rdoc/generators/template/chm/chm.rb : ditto
-
- * rdoc/generators/template/html/hefss.rb : ditto
-
- * rdoc/generators/template/html/html.rb : ditto
-
- * rdoc/generators/template/html/kilmer.rb : ditto
-
- * rdoc/generators/template/html/old_html.rb : ditto
-
- * rdoc/generators/template/html/one_page_html.rb : ditto
-
- * rdoc/generators/template/xml/rdf.rb : ditto
-
- * rdoc/generators/template/xml/xml.rb : ditto
-
- * rdoc/generators/xml_generator.rb : ditto
-
- * rdoc/markup/sample/rdoc2latex.rb : ditto
-
- * rdoc/markup/sample/sample.rb : ditto
-
- * rdoc/markup/simple_markup.rb : ditto
-
- * rdoc/markup/simple_markup/fragments.rb : ditto
-
- * rdoc/markup/simple_markup/inline.rb : ditto
-
- * rdoc/markup/simple_markup/lines.rb : ditto
-
- * rdoc/markup/simple_markup/preprocess.rb : ditto
-
- * rdoc/markup/simple_markup/to_flow.rb : ditto
-
- * rdoc/markup/simple_markup/to_html.rb : ditto
-
- * rdoc/markup/simple_markup/to_latex.rb : ditto
-
- * rdoc/markup/test/AllTests.rb : ditto
-
- * rdoc/markup/test/TestInline.rb : ditto
-
- * rdoc/markup/test/TestParse.rb : ditto
-
- * rdoc/options.rb : ditto
-
- * rdoc/parsers/parse_c.rb : ditto
-
- * rdoc/parsers/parse_f95.rb : ditto
-
- * rdoc/parsers/parse_rb.rb : ditto
-
- * rdoc/parsers/parse_simple.rb : ditto
-
- * rdoc/parsers/parserfactory.rb : ditto
-
- * rdoc/rdoc.rb : ditto
-
- * rdoc/ri/ri_cache.rb : ditto
-
- * rdoc/ri/ri_descriptions.rb : ditto
-
- * rdoc/ri/ri_display.rb : ditto
-
- * rdoc/ri/ri_driver.rb : ditto
-
- * rdoc/ri/ri_formatter.rb : ditto
-
- * rdoc/ri/ri_options.rb : ditto
-
- * rdoc/ri/ri_paths.rb : ditto
-
- * rdoc/ri/ri_reader.rb : ditto
-
- * rdoc/ri/ri_util.rb : ditto
-
- * rdoc/ri/ri_writer.rb : ditto
-
- * rdoc/template.rb : ditto
-
- * rdoc/tokenstream.rb : ditto
-
- * rdoc/usage.rb : ditto
-
- * test/xmlrpc/data/bug_bool.expected : ditto
-
- * test/xmlrpc/data/bug_bool.xml : ditto
-
- * test/xmlrpc/data/bug_cdata.expected : ditto
-
- * test/xmlrpc/data/bug_cdata.xml : ditto
-
- * test/xmlrpc/data/bug_covert.expected : ditto
-
- * test/xmlrpc/data/bug_covert.xml : ditto
-
- * test/xmlrpc/data/datetime_iso8601.xml : ditto
-
- * test/xmlrpc/data/fault.xml : ditto
-
- * test/xmlrpc/data/value.expected : ditto
-
- * test/xmlrpc/data/value.xml : ditto
-
- * test/xmlrpc/data/xml1.expected : ditto
-
- * test/xmlrpc/data/xml1.xml : ditto
-
- * test/xmlrpc/test_datetime.rb : ditto
-
- * test/xmlrpc/test_features.rb : ditto
-
- * test/xmlrpc/test_marshal.rb : ditto
-
- * test/xmlrpc/test_parser.rb : ditto
-
- * test/xmlrpc/test_webrick_server.rb : ditto
-
- * test/xmlrpc/webrick_testing.rb : ditto
-
- * test/zlib/test_zlib.rb : ditto
-
-
-2006-02-17(Fri) 09:41:35 +900 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * thread.c (sleep_timeval): sleep should always sleep for
- specified amount of time. [ruby-talk:180067]
-
-
-2006-02-17(Fri) 02:20:32 +0900 Koichi Sasada <ko1@atdot.net>
-
- * eval_safe.h, ruby.h : remove ruby_safe_level and add
- rb_safe_level() and rb_set_safe_level_force()
-
- * eval.c : use above functions
-
- * eval_jump.h : ditto
-
- * eval_load.c : ditto
-
- * eval_method.h : ditto
-
- * eval_proc.c : ditto
-
- * eval_thread.c : ditto
-
- * gc.c : ditto
-
- * signal.c : ditto
-
- * variable.c : ditto
-
- * ext/win32ole/win32ole.c : ditto
-
- * vm.c (th_invoke_proc) : save and restore safe level
-
- * yarvtest/test_proc.rb : add tests for above
-
- * thread.c : remove unused functions
-
-
-2006-02-17(Fri) 01:08:23 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c, insns.def : remove a setspecial second unused operand
-
- * eval_load.c : remove unused variable th
-
- * eval_proc.c, yarvcore.c : remove some functions from eval_proc.c
- and move to yarvcore.c
-
- * insns.def : fix to delete warnings
-
- * sample/test.rb : comment out Proc#clone tests
-
- * version.c : add constant RUBY_VM_DATE
-
- * vm.c : fix some functions
-
-
-2006-02-16(Thu) 22:58:27 +0900 Koichi Sasada <ko1@atdot.net>
-
- * insns.def, vm.c : use th_yield_setup_args at yield and Proc#call
-
-
-2006-02-16(Thu) 19:51:52 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c : fix analysis of block parameter
-
- * disasm.c : remove rb_bug() (temporarily)
-
- * insns.def, vm.c : fix passing block parameter
-
- * sample/test.rb : add "Proc = YARVCore::VM::Proc"
-
- * test/ruby/test_readpartial.rb : disable on mswin32
-
- * test/socket/test_tcp.rb : ditto
-
- * thread.c : fix syntax error (for non GCC)
-
-
-2006-02-15(Wed) 22:34:04 +0900 Koichi Sasada <ko1@atdot.net>
-
- * eval_method.h : move rb_clear_cache_by_id position
-
- * thread.c : fix Thread#kill
-
- * test/ruby/test_readpartial.rb : enable tests except cygwin version
-
- * test/ruby/test_signal.rb : ditto and enable timeout
-
-
-2006-02-15(Wed) 22:13:29 +0900 Minero Aoki <aamine@loveruby.net>
-
- * lib/runit: forgot to commit.
-
-
-2006-02-15(Wed) 22:12:25 +0900 Minero Aoki <aamine@loveruby.net>
-
- * lib/weakref.rb: do not use Thread.critical=.
-
- * lib/singleton.rb: ditto.
-
- * lib/timeout.rb: ditto.
-
- * lib/thread.rb: ditto.
-
- * test/inlinetest.rb: forgot to commit.
-
-
-2006-02-15(Wed) 21:34:17 +0900 Minero Aoki <aamine@loveruby.net>
-
- * test/test_pp.rb: imported from Ruby CVS trunk HEAD.
-
- * test/test_shellwords.rb: ditto.
-
- * test/test_set.rb: ditto.
-
- * test/test_time.rb: ditto.
-
- * test/test_ipaddr.rb: ditto.
-
- * test/test_prettyprint.rb: ditto.
-
- * test/test_tsort.rb: ditto.
-
- * test/strscan: ditto.
-
- * test/testunit: ditto.
-
-
-2006-02-15(Wed) 20:03:21 +0900 Koichi Sasada <ko1@atdot.net>
-
- * eval_method.h : duplicate NODE_METHOD at make an alias
-
- * yarvtest/test_method.rb : add a test for above
-
-
-2006-02-15(Wed) 19:48:59 +0900 Minero Aoki <aamine@loveruby.net>
-
- * test/rss: imported from Ruby CVS trunk HEAD.
-
-
-2006-02-15(Wed) 19:47:51 +0900 Koichi Sasada <ko1@atdot.net>
-
- * insns.def, compile.c, vm.c : remove methoddef, singletonmethoddef
- instructions and make new insn definemethod
-
- * yarvcore.c : set toplevel visibility to private
-
-
-2006-02-15(Wed) 17:39:16 +0900 Koichi Sasada <ko1@atdot.net>
-
- * eval_intern.h :
-
- * eval_jump.h, vm.c : localjump_error() and jump_tag_but_local_jump()
- move to th_localjump_error and th_jump_tag_but_local_jump at vm.c
-
- * eval.c : ditto
-
- * eval_load.c : ditto
-
- * insns.def : ditto
-
- * vm.c : ditto
-
- * vm.c (th_make_jump_tag_but_local_jump) : added
-
- * opt_insn_unif.def : fix indnet (revert change)
-
- * opt_operand.def : ditto
-
- * rb/insns2vm.rb : fix error message
-
- * thread.c : raise exception at join if illegal local jump
-
-
-2006-02-15(Wed) 14:21:45 +900 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ChangeLog: add local variables line to support Emacs.
-
- * eval.c (rb_obj_instance_exec): add new method from 1.9.
-
- * eval.c (rb_mod_module_exec): ditto.
-
- * eval.c (yield_under_i): should not pass self as an argument to
- the block for instance_eval. [ruby-core:07364]
-
- * eval.c (rb_obj_instance_eval): should be no singleton classes for
- true, false, and nil. [ruby-dev:28186]
-
-
-2006-02-14(Tue) 19:30:20 +0900 Koichi Sasada <ko1@atdot.net>
-
- * array.c : fix indent
-
- * eval.c : fix block_given
-
- * gc.c : add STACK_START and use it as a substitute for
- rb_gc_stack_start
-
- * vm.c : fix to raise error if th_yield doesn't have block given
-
- * yarvcore.c : fix to skip iseq mark array at ObjectSpace.each_object
-
-
-2006-02-14(Tue) 18:15:03 +0900 Koichi Sasada <ko1@atdot.net>
-
- * configure.in : enable pthread by deafult
-
- * ascii.c : import ruby 1.9 HEAD
-
- * bignum.c : ditto
-
- * compar.c : ditto
-
- * configure : ditto
-
- * defines.h : ditto
-
- * dln.c : ditto
-
- * dln.h : ditto
-
- * enum.c : ditto
-
- * enumerator.c : ditto
-
- * euc_jp.c : ditto
-
- * ext/win32ole/tests/testWIN32OLE.rb : ditto
-
- * ext/win32ole/win32ole.c : ditto
-
- * file.c : ditto
-
- * hash.c : ditto
-
- * io.c : ditto
-
- * lex.c : ditto
-
- * lib/irb/init.rb : ditto
-
- * lib/rexml/document.rb : ditto
-
- * main.c : ditto
-
- * marshal.c : ditto
-
- * math.c : ditto
-
- * missing.h : ditto
-
- * object.c : ditto
-
- * oniguruma.h : ditto
-
- * pack.c : ditto
-
- * process.c : ditto
-
- * random.c : ditto
-
- * range.c : ditto
-
- * rb/ir.rb : ditto
-
- * re.c : ditto
-
- * regcomp.c : ditto
-
- * regenc.c : ditto
-
- * regenc.h : ditto
-
- * regerror.c : ditto
-
- * regexec.c : ditto
-
- * regint.h : ditto
-
- * regparse.c : ditto
-
- * regparse.h : ditto
-
- * ruby.c : ditto
-
- * ruby.h : ditto
-
- * rubyio.h : ditto
-
- * sjis.c : ditto
-
- * sprintf.c : ditto
-
- * st.c : ditto
-
- * st.h : ditto
-
- * struct.c : ditto
-
- * test/ruby/envutil.rb : ditto
-
- * test/ruby/test_struct.rb : ditto
-
- * time.c : ditto
-
- * utf8.c : ditto
-
- * util.c : ditto
-
- * util.h : ditto
-
- * version.h : ditto
-
- * win32/Makefile.sub : ditto
-
- * win32/win32.c : ditto
-
-
-2006-02-14(Tue) 16:40:01 +0900 Koichi Sasada <ko1@atdot.net>
-
- * yarvcore.c, eval_proc.c : fix rb_proc_arity
-
- * eval.c : declare funcall same as send (temporarily)
-
- * lib/thread.rb : added
-
- * test/pathname/test_pathname.rb : imported from ruby 1.9
-
- * test/scanf/data.txt : ditto
-
- * test/scanf/test_scanf.rb : ditto
-
- * test/scanf/test_scanfblocks.rb : ditto
-
- * test/scanf/test_scanfio.rb : ditto
-
- * test/socket/test_socket.rb : ditto
-
- * test/socket/test_tcp.rb : ditto
-
- * test/socket/test_udp.rb : ditto
-
- * test/socket/test_unix.rb : ditto
-
- * test/stringio/test_stringio.rb : ditto
-
- * test/uri/test_common.rb : ditto
-
- * test/uri/test_ftp.rb : ditto
-
- * test/uri/test_generic.rb : ditto
-
- * test/uri/test_http.rb : ditto
-
- * test/uri/test_ldap.rb : ditto
-
- * test/uri/test_mailto.rb : ditto
-
-
-2006-02-14(Tue) 15:59:28 +0900 Koichi Sasada <ko1@atdot.net>
-
- * thread.c : Change Thread.critical warnning message
-
- * lib/webrick.rb : imported from ruby 1.9
-
- * lib/webrick/accesslog.rb : ditto
-
- * lib/webrick/cgi.rb : ditto
-
- * lib/webrick/compat.rb : ditto
-
- * lib/webrick/config.rb : ditto
-
- * lib/webrick/cookie.rb : ditto
-
- * lib/webrick/htmlutils.rb : ditto
-
- * lib/webrick/httpauth.rb : ditto
-
- * lib/webrick/httpauth/authenticator.rb : ditto
-
- * lib/webrick/httpauth/basicauth.rb : ditto
-
- * lib/webrick/httpauth/digestauth.rb : ditto
-
- * lib/webrick/httpauth/htdigest.rb : ditto
-
- * lib/webrick/httpauth/htgroup.rb : ditto
-
- * lib/webrick/httpauth/htpasswd.rb : ditto
-
- * lib/webrick/httpauth/userdb.rb : ditto
-
- * lib/webrick/httpproxy.rb : ditto
-
- * lib/webrick/httprequest.rb : ditto
-
- * lib/webrick/httpresponse.rb : ditto
-
- * lib/webrick/https.rb : ditto
-
- * lib/webrick/httpserver.rb : ditto
-
- * lib/webrick/httpservlet.rb : ditto
-
- * lib/webrick/httpservlet/abstract.rb : ditto
-
- * lib/webrick/httpservlet/cgi_runner.rb : ditto
-
- * lib/webrick/httpservlet/cgihandler.rb : ditto
-
- * lib/webrick/httpservlet/erbhandler.rb : ditto
-
- * lib/webrick/httpservlet/filehandler.rb : ditto
-
- * lib/webrick/httpservlet/prochandler.rb : ditto
-
- * lib/webrick/httpstatus.rb : ditto
-
- * lib/webrick/httputils.rb : ditto
-
- * lib/webrick/httpversion.rb : ditto
-
- * lib/webrick/log.rb : ditto
-
- * lib/webrick/server.rb : ditto
-
- * lib/webrick/ssl.rb : ditto
-
- * lib/webrick/utils.rb : ditto
-
- * lib/webrick/version.rb : ditto
-
-
-2006-02-14(Tue) 14:55:51 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c, insns.def : support "defined?($1)", ...
-
- * yarvtest/test_syntax.rb : add a test for above
-
- * rb/makedocs.rb : fix template directory path
-
- * vm.c : fix to handle break from proc
-
-
-2006-02-14(Tue) 12:42:59 +0900 Koichi Sasada <ko1@atdot.net>
-
- * eval.c : fix rb_iterate hook
-
- * yarvtest/test_block.rb : add a tests for above
-
- * vm.c : remove unused comment
-
-
-2006-02-14(Tue) 12:01:06 +0900 Koichi Sasada <ko1@atdot.net>
-
- * eval.c : fix to check passed block at block_given_p
-
- * eval_proc.c : fix to pass block at Method#call
-
- * runruby.rb : fix to apply ruby
-
- * test/runner.rb : GC.stress (comment out)
-
- * vm.c : fix indnet
-
-
-2006-02-14(Tue) 08:04:33 +0900 Minero Aoki <aamine@loveruby.net>
-
- * lib/tempfile.rb: use Mutex instead of Thread.critical.
-
- * lib/rss/dublincore.rb: |x,| -> |x,_| to avoid YARV bug (tmp).
-
- * lib/rexml: imported from ruby CVS trunk HEAD.
-
- * test/digest: ditto.
-
- * test/fileutils: ditto.
-
- * test/ostruct: ditto.
-
- * test/erb: ditto.
-
- * test/optparse: ditto.
-
- * test/ruby/test_signal.rb: turn off a test to avoid unknown error
- (tmp).
-
-
-2006-02-14(Tue) 07:52:03 +0900 Minero Aoki <aamine@loveruby.net>
-
- * test/digest: imported from ruby CVS trunk HEAD.
-
- * test/fileutils: ditto.
-
- * test/ostruct: ditto.
-
- * test/erb: ditto.
-
- * test/optparse: ditto.
-
-
-2006-02-14(Tue) 06:26:21 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c, parse.y : support BEGIN{} (remove local scope)
-
- * test/ruby/beginmainend.rb : fix to apply YARV's specification
-
- * test/ruby/test_beginendblock.rb : enable BEGIN{} test
-
- * signal.c : exit at double segv
-
- * insns.def (preexe) : remove instruction "preexe"
-
-
-2006-02-14(Tue) 05:53:56 +0900 Minero Aoki <aamine@loveruby.net>
-
- * eval.c (ruby_cleanup): th->errinfo contains a NODE while
- break'ing, check it before refering klass.
-
-
-2006-02-14(Tue) 05:45:07 +0900 Koichi Sasada <ko1@atdot.net>
-
- * insns.def : fix stack calc of send
-
- * sample/test.rb : remove SEGV causing code
-
-
-2006-02-14(Tue) 02:24:21 +0900 Minero Aoki <aamine@loveruby.net>
-
- * test/ruby/test_module.rb: list order is not a matter.
-
- * test/csv: imported from ruby CVS trunk HEAD.
-
-
-2006-02-14(Tue) 02:06:25 +0900 Minero Aoki <aamine@loveruby.net>
-
- * test/ruby/test_beginendblock.rb: unlock tests.
-
- * test/ruby/beginmainend.rb: new file (imported from ruby CVS
- trunk HEAD).
-
- * test/ruby/endblockwarn.rb: new file (imported from ruby CVS
- trunk HEAD).
-
- * test/ruby/test_file.rb: new file (imported from ruby CVS trunk
- HEAD).
-
-
-2006-02-14(Tue) 01:42:11 +0900 Koichi Sasada <ko1@atdot.net>
-
- * error.c : fix include file positon
-
- * test/ruby/test_signal.rb : skip test_exit_action on cygwin
-
-
-2006-02-14(Tue) 01:36:57 +0900 Minero Aoki <aamine@loveruby.net>
-
- * test/ruby/test_class.rb: new file (imported from rubicon).
-
-
-2006-02-14(Tue) 01:32:23 +0900 Minero Aoki <aamine@loveruby.net>
-
- * test/ruby/test_module.rb: ignore PP mixins.
-
-
-2006-02-14(Tue) 01:24:56 +0900 Minero Aoki <aamine@loveruby.net>
-
- * test/ruby/test_lambda.rb: removed (->(){...} syntax is
- obsolete).
-
-
-2006-02-14(Tue) 01:20:54 +0900 Minero Aoki <aamine@loveruby.net>
-
- * test/ruby/test_module.rb: import many tests from rubicon.
-
-
-2006-02-14(Tue) 01:06:57 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c : fix to avoid stack consistency error
-
- * yarvtest/test_exception.rb : add a test for above
-
-
-2006-02-14(Tue) 00:42:47 +0900 Koichi Sasada <ko1@atdot.net>
-
- * yarvcore.h, vm_macro.def : rename VM_CALL_SUPER to VM_CALL_SUPER_BIT
-
- * insns.def (send) : set a flag of super as fcall
-
- * yarvtest/test_class.rb : add a test for above
-
-
-2006-02-14(Tue) 00:31:24 +0900 Minero Aoki <aamine@loveruby.net>
-
- * test/ruby/test_eval.rb: fix typo.
-
- * test/ruby/test_signal.rb: unlock tests.
-
-
-2006-02-13(Mon) 23:53:27 +0900 Koichi Sasada <ko1@atdot.net>
-
- * insns.def, vm_macro.def : fix NODE_ZSUPER dispatch and
- fix error message when super without suitable method ([yarv-dev:846])
-
- * yarvcore.h : add VM_CALL_SUPER definition
-
- * yarvtest/test_method.rb : add a test of Module#private_class_method
-
-
-2006-02-13(Mon) 22:49:42 +0900 Koichi Sasada <ko1@atdot.net>
-
- * insns.def : traverse all iseq to find super method ([yarv-dev:859])
-
- * yarvtest/test_class.rb : add a test for above
-
- * yarvcore.c : add clear iseq->defined_method_id
-
- * signal.c : fix to prohibit double segv handler kicked
-
-
-2006-02-13(Mon) 22:09:12 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c : support NODE_DECL, NODE_CLASS with NODE_CLON3 prefix
-
- * yarvtest/test_class.rb : add tests for above
-
-
-2006-02-13(Mon) 21:20:57 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c : fix indent
-
- * compile.c : fix to prohibit "redo" from eval expression
-
-
-2006-02-13(Mon) 20:36:06 +0900 Koichi Sasada <ko1@atdot.net>
-
- * vm.c : fix constant search bug ([yarv-dev:788])
-
- * yarvtest/test_class.rb : add a test of [yarv-dev:788]
-
-
-2006-02-13(Mon) 18:09:28 +0900 Koichi Sasada <ko1@atdot.net>
-
- * test/ruby/test_clone.rb : enable tests with Class#clone
-
- * test/ruby/test_marshal.rb : ditto
-
-
-2006-02-13(Mon) 17:42:37 +0900 Koichi Sasada <ko1@atdot.net>
-
- * class.c : support Class#clone
-
- * compile.c, insns.def : remove popcref
-
- * yarvcore.h, vm.c, insns.def : remove yarv_thread_t#cref_stack
-
- * eval.c, eval_intern.h, eval_load.c : ditto
-
- * yarvtest/test_class.rb : add tests for singleton class
-
- * gc.c : remove "FRAME *" unused variable
-
- * insnhelper.h : fix COPY_CREF
-
- * rb/mklog.rb : add default message
-
- * vm_macro.def : support NODE_ZSUPER as method type
-
-
-2006-02-13(Mon) 00:11:17 +0900 Koichi Sasada <ko1@atdot.net>
-
- * blockinlining.c : refoctoring with CFLAGS+=-Wunused
-
- * eval.c : ditto
-
- * eval_intern.h : ditto
-
- * eval_load.c : ditto
-
- * eval_method.h : ditto
-
- * eval_proc.c : ditto
-
- * eval_thread.c : ditto
-
- * insns.def : ditto
-
- * parse.y : ditto
-
- * thread.c : ditto
-
- * vm.c : ditto
-
-
-2006-02-13(Mon) 02:32:34 +0900 Minero Aoki <aamine@loveruby.net>
-
- * test/ruby/test_const.rb: show better message.
-
- * test/ruby/test_eval.rb: ditto.
-
- * test/ruby/test_module.rb: new file.
-
-
-2006-02-12(Sun) 22:22:35 +0900 Koichi Sasada <ko1@atdot.net>
-
- * array.c : revert last commit
-
- * ascii.c : ditto
-
- * bignum.c : ditto
-
- * class.c : ditto
-
- * compar.c : ditto
-
- * defines.h : ditto
-
- * dir.c : ditto
-
- * dln.c : ditto
-
- * dln.h : ditto
-
- * enum.c : ditto
-
- * enumerator.c : ditto
-
- * error.c : ditto
-
- * euc_jp.c : ditto
-
- * file.c : ditto
-
- * gc.c : ditto
-
- * hash.c : ditto
-
- * intern.h : ditto
-
- * io.c : ditto
-
- * lex.c : ditto
-
- * main.c : ditto
-
- * marshal.c : ditto
-
- * math.c : ditto
-
- * missing.h : ditto
-
- * node.h : ditto
-
- * numeric.c : ditto
-
- * object.c : ditto
-
- * oniguruma.h : ditto
-
- * pack.c : ditto
-
- * prec.c : ditto
-
- * process.c : ditto
-
- * random.c : ditto
-
- * range.c : ditto
-
- * rb/mklog.rb : ditto
-
- * re.c : ditto
-
- * regcomp.c : ditto
-
- * regenc.c : ditto
-
- * regenc.h : ditto
-
- * regerror.c : ditto
-
- * regex.h : ditto
-
- * regexec.c : ditto
-
- * regint.h : ditto
-
- * regparse.c : ditto
-
- * regparse.h : ditto
-
- * ruby.c : ditto
-
- * ruby.h : ditto
-
- * rubyio.h : ditto
-
- * rubysig.h : ditto
-
- * signal.c : ditto
-
- * sjis.c : ditto
-
- * sprintf.c : ditto
-
- * st.c : ditto
-
- * st.h : ditto
-
- * string.c : ditto
-
- * struct.c : ditto
-
- * time.c : ditto
-
- * utf8.c : ditto
-
- * util.c : ditto
-
- * util.h : ditto
-
- * variable.c : ditto
-
- * version.c : ditto
-
-
-2006-02-12(Sun) 21:33:10 +0900 Koichi Sasada <ko1@atdot.net>
-
- * array.c : fix to ruby's indent
-
- * ascii.c : ditto
-
- * bignum.c : ditto
-
- * blockinlining.c : ditto
-
- * call_cfunc.h : ditto
-
- * class.c : ditto
-
- * compar.c : ditto
-
- * compile.c : ditto
-
- * compile.h : ditto
-
- * debug.c : ditto
-
- * debug.h : ditto
-
- * defines.h : ditto
-
- * dir.c : ditto
-
- * disasm.c : ditto
-
- * dln.c : ditto
-
- * dln.h : ditto
-
- * enum.c : ditto
-
- * enumerator.c : ditto
-
- * error.c : ditto
-
- * euc_jp.c : ditto
-
- * eval.c : ditto
-
- * eval_error.h : ditto
-
- * eval_intern.h : ditto
-
- * eval_jump.h : ditto
-
- * eval_load.c : ditto
-
- * eval_method.h : ditto
-
- * eval_proc.c : ditto
-
- * eval_safe.h : ditto
-
- * eval_thread.c : ditto
-
- * file.c : ditto
-
- * gc.c : ditto
-
- * hash.c : ditto
-
- * insnhelper.h : ditto
-
- * insns.def : ditto
-
- * intern.h : ditto
-
- * io.c : ditto
-
- * lex.c : ditto
-
- * main.c : ditto
-
- * marshal.c : ditto
-
- * math.c : ditto
-
- * missing.h : ditto
-
- * node.h : ditto
-
- * numeric.c : ditto
-
- * object.c : ditto
-
- * oniguruma.h : ditto
-
- * opt_insn_unif.def : ditto
-
- * opt_operand.def : ditto
-
- * pack.c : ditto
-
- * prec.c : ditto
-
- * process.c : ditto
-
- * random.c : ditto
-
- * range.c : ditto
-
- * re.c : ditto
-
- * re.h : ditto
-
- * regcomp.c : ditto
-
- * regenc.c : ditto
-
- * regenc.h : ditto
-
- * regerror.c : ditto
-
- * regex.h : ditto
-
- * regexec.c : ditto
-
- * regint.h : ditto
-
- * regparse.c : ditto
-
- * regparse.h : ditto
-
- * ruby.c : ditto
-
- * ruby.h : ditto
-
- * rubyio.h : ditto
-
- * rubysig.h : ditto
-
- * signal.c : ditto
-
- * sjis.c : ditto
-
- * sprintf.c : ditto
-
- * st.c : ditto
-
- * st.h : ditto
-
- * string.c : ditto
-
- * struct.c : ditto
-
- * test.rb : ditto
-
- * thread.c : ditto
-
- * thread_pthread.h : ditto
-
- * thread_win32.h : ditto
-
- * time.c : ditto
-
- * utf8.c : ditto
-
- * util.c : ditto
-
- * util.h : ditto
-
- * variable.c : ditto
-
- * version.c : ditto
-
- * vm.c : ditto
-
- * vm.h : ditto
-
- * vm_dump.c : ditto
-
- * vm_evalbody.h : ditto
-
- * vm_macro.def : ditto
-
- * yarv.h : ditto
-
- * yarv_version.h : ditto
-
- * yarvcore.c : ditto
-
- * yarvcore.h : ditto
-
-
-2006-02-12(Sun) 15:53:21 +0900 Koichi Sasada <ko1@atdot.net>
-
- * lib/abbrev.rb : added
-
- * lib/base64.rb : ditto
-
- * lib/cgi-lib.rb : ditto
-
- * lib/csv.rb : ditto
-
- * lib/date2.rb : ditto
-
- * lib/eregex.rb : ditto
-
- * lib/ipaddr.rb : ditto
-
- * lib/irb.rb : ditto
-
- * lib/irb/cmd/chws.rb : ditto
-
- * lib/irb/cmd/fork.rb : ditto
-
- * lib/irb/cmd/help.rb : ditto
-
- * lib/irb/cmd/load.rb : ditto
-
- * lib/irb/cmd/nop.rb : ditto
-
- * lib/irb/cmd/pushws.rb : ditto
-
- * lib/irb/cmd/subirb.rb : ditto
-
- * lib/irb/completion.rb : ditto
-
- * lib/irb/context.rb : ditto
-
- * lib/irb/ext/change-ws.rb : ditto
-
- * lib/irb/ext/history.rb : ditto
-
- * lib/irb/ext/loader.rb : ditto
-
- * lib/irb/ext/math-mode.rb : ditto
-
- * lib/irb/ext/multi-irb.rb : ditto
-
- * lib/irb/ext/save-history.rb : ditto
-
- * lib/irb/ext/tracer.rb : ditto
-
- * lib/irb/ext/use-loader.rb : ditto
-
- * lib/irb/ext/workspaces.rb : ditto
-
- * lib/irb/extend-command.rb : ditto
-
- * lib/irb/frame.rb : ditto
-
- * lib/irb/help.rb : ditto
-
- * lib/irb/init.rb : ditto
-
- * lib/irb/input-method.rb : ditto
-
- * lib/irb/lc/error.rb : ditto
-
- * lib/irb/lc/help-message : ditto
-
- * lib/irb/lc/ja/CVS/Entries : ditto
-
- * lib/irb/lc/ja/CVS/Repository : ditto
-
- * lib/irb/lc/ja/CVS/Root : ditto
-
- * lib/irb/lc/ja/error.rb : ditto
-
- * lib/irb/lc/ja/help-message : ditto
-
- * lib/irb/locale.rb : ditto
-
- * lib/irb/notifier.rb : ditto
-
- * lib/irb/output-method.rb : ditto
-
- * lib/irb/ruby-lex.rb : ditto
-
- * lib/irb/ruby-token.rb : ditto
-
- * lib/irb/slex.rb : ditto
-
- * lib/irb/version.rb : ditto
-
- * lib/irb/workspace.rb : ditto
-
- * lib/irb/ws-for-case-2.rb : ditto
-
- * lib/irb/xmp.rb : ditto
-
- * lib/jcode.rb : ditto
-
- * lib/logger.rb : ditto
-
- * lib/mailread.rb : ditto
-
- * lib/mathn.rb : ditto
-
- * lib/parsedate.rb : ditto
-
- * lib/pathname.rb : ditto
-
- * lib/ping.rb : ditto
-
- * lib/pstore.rb : ditto
-
- * lib/resolv-replace.rb : ditto
-
- * lib/resolv.rb : ditto
-
- * lib/rss.rb : ditto
-
- * lib/rss/0.9.rb : ditto
-
- * lib/rss/1.0.rb : ditto
-
- * lib/rss/2.0.rb : ditto
-
- * lib/rss/content.rb : ditto
-
- * lib/rss/converter.rb : ditto
-
- * lib/rss/dublincore.rb : ditto
-
- * lib/rss/image.rb : ditto
-
- * lib/rss/maker.rb : ditto
-
- * lib/rss/maker/0.9.rb : ditto
-
- * lib/rss/maker/1.0.rb : ditto
-
- * lib/rss/maker/2.0.rb : ditto
-
- * lib/rss/maker/base.rb : ditto
-
- * lib/rss/maker/content.rb : ditto
-
- * lib/rss/maker/dublincore.rb : ditto
-
- * lib/rss/maker/image.rb : ditto
-
- * lib/rss/maker/syndication.rb : ditto
-
- * lib/rss/maker/taxonomy.rb : ditto
-
- * lib/rss/maker/trackback.rb : ditto
-
- * lib/rss/parser.rb : ditto
-
- * lib/rss/rexmlparser.rb : ditto
-
- * lib/rss/rss.rb : ditto
-
- * lib/rss/syndication.rb : ditto
-
- * lib/rss/taxonomy.rb : ditto
-
- * lib/rss/trackback.rb : ditto
-
- * lib/rss/utils.rb : ditto
-
- * lib/rss/xml-stylesheet.rb : ditto
-
- * lib/rss/xmlparser.rb : ditto
-
- * lib/rss/xmlscanner.rb : ditto
-
- * lib/rubyunit.rb : ditto
-
- * lib/scanf.rb : ditto
-
- * lib/shell.rb : ditto
-
- * lib/singleton.rb : ditto
-
- * lib/tsort.rb : ditto
-
- * lib/weakref.rb : ditto
-
- * eval_jump.c : removed
-
-
-2006-02-12(Sun) 15:39:09 +0900 Koichi Sasada <ko1@atdot.net>
-
- * parse.y : fix to remove including env.h
-
- * yarvtest/test_exception.rb : fix syntax (add 'end')
-
-
-2006-02-12(Sun) 15:14:44 +0900 Koichi Sasada <ko1@atdot.net>
-
- * env.h : removed
-
- * common.mk : remove env.h dependency
-
- * compile.c, eval_intern.h : remove include env.h
-
- * vm.c : ditto
-
- * ruby.h, gc.c, error.c : remove T_SCOPE, T_VARMAP
-
- * parse.y, eval.c : use rb_parse_in_eval() instead of ruby_in_eval
-
- * yarvcore.c, yarvcore.h : add a prase_in_eval member to yarv_thread_t
-
- * insns.def : add push value to throw instruction
- for stack consistency
-
- * yarvtest/test_exception.rb : add a test for above
-
- * test/ruby/test_gc.rb : fix typo
-
-
-2006-02-12(Sun) 05:05:02 +0900 Koichi Sasada <ko1@atdot.net>
-
- * eval.c, eval_intern.h, eval_load.c, eval_proc.c, node.h,
- insnhelper.h, insns.def, vm.c, yarvcore.c, yarvcore.h :
- change cref data structure and unify ruby_class and ruby_cbase
- and some refoctoring
-
-
-2006-02-11(Sat) 23:41:11 +0900 Koichi Sasada <ko1@atdot.net>
-
- * insns.def (methoddef) : fix method declaration in method
-
- * thread.c : Thread.critical to show warning (no effect)
-
-
-2006-02-11(Sat) 20:20:18 +0900 Koichi Sasada <ko1@atdot.net>
-
- * insns.def : fix [yarv-dev:831]
-
- * yarvtest/test_class.rb : add a test for above
-
-
-2006-02-11(Sat) 14:29:01 +0900 Koichi Sasada <ko1@atdot.net>
-
- * rb/mklog.rb : use svk
-
- * error.c : remove newline
-
- * eval.c (rb_block_call) : added
-
- * eval_thread.c : remove some unused functions, comments
-
- * thread.c : add comments (move from eval_thread.c) and support Mutex
-
- * thread.c (rb_thread_select) : supported
-
- * thread_pthread.h (native_mutex_trylock) : added (macro)
-
- * thread_win32.h (native_mutex_trylock) : added
-
- * yarvcore.c : remove unused code
-
- * array.c : import ruby 1.9
-
- * compar.c : ditto
-
- * dln.c : ditto
-
- * enum.c : ditto
-
- * enumerator.c : ditto
-
- * ext/digest/digest.c : ditto
-
- * ext/digest/digest.h : ditto
-
- * ext/digest/sha2/sha2.c : ditto
-
- * ext/etc/etc.c : ditto
-
- * ext/win32ole/win32ole.c : ditto
-
- * hash.c : ditto
-
- * intern.h : ditto
-
- * io.c : ditto
-
- * main.c : ditto
-
- * missing.h : ditto
-
- * missing/flock.c : ditto
-
- * missing/isinf.c : ditto
-
- * missing/vsnprintf.c : ditto
-
- * lib/cgi.rb : ditto
-
- * lib/complex.rb : ditto
-
- * lib/delegate.rb : ditto
-
- * lib/erb.rb : ditto
-
- * lib/fileutils.rb : ditto
-
- * lib/matrix.rb : ditto
-
- * lib/mkmf.rb : ditto
-
- * lib/optparse.rb : ditto
-
- * lib/ostruct.rb : ditto
-
- * lib/pp.rb : ditto
-
- * lib/timeout.rb : ditto
-
- * lib/tmpdir.rb : ditto
-
- * lib/test/unit/autorunner.rb : ditto
-
- * node.h : ditto
-
- * object.c : ditto
-
- * parse.y : ditto
-
- * ruby.c : ditto
-
- * sample/test.rb : ditto
-
- * sprintf.c : ditto
-
- * st.c : ditto
-
- * test/ruby/test_whileuntil.rb : ditto
-
- * test/runner.rb : ditto
-
- * time.c : ditto
-
- * lib/net/.document : added
-
- * lib/net/ftp.rb : ditto
-
- * lib/net/http.rb : ditto
-
- * lib/net/https.rb : ditto
-
- * lib/net/imap.rb : ditto
-
- * lib/net/pop.rb : ditto
-
- * lib/net/protocol.rb : ditto
-
- * lib/net/smtp.rb : ditto
-
- * lib/net/telnet.rb : ditto
-
- * lib/open-uri.rb : ditto
-
-
-2006-02-10(Fri) 08:07:34 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c, insns.def, yarvcore.h : support defined?(private_method) and
- defined?(protected_method) (separate DEFINE_METHOD / DEFINE_FUNC)
-
- * yarvtest/test_syntax.rb : add a test for above
-
- * compile.c (iseq_compile_each) : fix NODE_RETURN bug
- (double ensure invoke)
-
- * yarvtest/test_flow.rb : add a test for above
-
- * eval.c (get_errinfo) : fix to search $!
-
- * yarvtest/test_exception.rb : add tests for above
-
- * eval_safe.h : support $SAFE
-
- * ext/socket/socket.c : import ruby 1.9
-
- * gc.c (gc_mark_children) : fix making T_VALUE
-
- * test/ruby/test_gc.rb : use GC.stress
-
- * signal.c (sighandler) : send interrupt signal if thread blocked
-
- * test/ruby/test_proc.rb : remove assert false
-
- * test/ruby/test_readpartial.rb : change fail message
-
- * test/ruby/test_signal.rb : remove assert false
-
- * thread.c (thread_start_func_2) : set local_lfp/local_svar
- at thread creation
-
- * thread_pthread.h : export native_thread_interrupt
-
- * thread_win32.h : export native_thread_interrupt
-
- * version.h : import ruby 1.9
-
- * vm.c (lfp_svar), yarvcore.h : fix to use Thread local svar
-
- * yarvtest/test_thread.rb : add a test for above
-
- * win32/Makefile.sub : import ruby 1.9
-
- * win32/dir.h : ditto
-
- * win32/setup.mak : ditto
-
- * win32/win32.c : ditto
-
- * yarvtest/yarvtest.rb : fix to remove using ARGV
-
-
-2006-02-10(Fri) 01:04:58 +0900 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * gc.c (rb_gc_call_finalizer_at_exit): turn on during_gc while
- invoking finalizers.
-
- * gc.c (rb_gc_finalize_deferred): ditto.
-
-
-2006-02-08(Wed) 23:17:44 +0900 Minero Aoki <aamine@loveruby.net>
-
- * test/ruby/test_proc.rb: method names were wrongly duplicated.
-
-
-2006-02-08(Wed) 21:30:01 +0900 Minero Aoki <aamine@loveruby.net>
-
- * ext/nkf: added (imported from ruby CVS trunk HEAD).
-
- * ext/nkf/depend: new file (rev 1.5).
-
- * ext/nkf/extconf.rb: new file (rev 1.2).
-
- * ext/nkf/nkf.c: new file (rev 1.12).
-
- * ext/nkf/test.rb: new file (rev 1.7).
-
- * ext/nkf/nkf-utf8/nkf.c: new file (rev 1.17).
-
- * ext/nkf/nkf-utf8/config.h: new file (rev 1.4).
-
- * ext/nkf/nkf-utf8/utf8tbl.c: new file (rev 1.6).
-
- * ext/nkf/lib/kconv.rb: new file (rev 1.13).
-
- * test/nkf: added (imported from ruby CVS trunk HEAD).
-
- * test/nkf/test_kconv.rb: new file (rev 1.1).
-
- * test/nkf/test_nkf.rb: new file (rev 1.1).
-
-
-2006-02-08(Wed) 21:07:36 +0900 Minero Aoki <aamine@loveruby.net>
-
- * lib/find.rb: new file (imported from ruby CVS trunk HEAD,
- rev 1.15).
-
-
-2006-02-07(Tue) 17:58:18 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c, insns.def : support BEGIN{} and add preexe instruction
-
- * insns.def : fix getspecial/setspecial instructions
- to catch up svar change
-
- * test/ruby/test_system.rb : remove stopper
-
- * thread.c (rb_thread_fd_writable) : add a debug output
-
- * thread.c (rb_thread_wait_fd) : add a debug output
-
- * vm.c (lfp_svar) : refactoring and fix some problems
-
- * vm_dump.c (yarv_bug) : add branch
-
- * yarv.h : remove unused declarations
-
- * yarvcore.c (vm_free) : VM object should not free by GC
-
-
-2006-02-07(Tue) 14:42:25 +0900 Koichi Sasada <ko1@atdot.net>
-
- * eval.c, eval_load.c : remove rb_thread_start_1()
-
- * eval.c : fix some prototypes and indents
-
- * eval_thread.c, thread.c : move some functions
- from eval_thread.c to thread.c
-
- * signal.c (sighandler) : add line braek in error message
-
- * yarvcore.c, yarvcore.h, thread.c : support ThreadGroup
-
- * ruby.h, gc.c, vm.c : make new basic type RValue and T_VALUE.
- RValue includes three values in itself. RValue is used as
- svar
-
-
-2006-02-06(Mon) 23:51:41 +0900 Minero Aoki <aamine@loveruby.net>
-
- * test/ruby/test_hash.rb: import many tests from rubicon.
-
-
-2006-02-04(Sat) 18:36:41 +0900 Minero Aoki <aamine@loveruby.net>
-
- * test/ruby/test_array.rb: import many tests from rubicon.
-
-
-2006-02-04(Sat) 17:47:44 +0900 Minero Aoki <aamine@loveruby.net>
-
- * test/ruby/test_signal.rb (test_exit_action): lib/timeout.rb is
- not implemented yet.
-
-
-2006-02-04(Sat) 17:42:31 +0900 Minero Aoki <aamine@loveruby.net>
-
- * test/ruby/test_readpartial.rb: lib/timeout.rb is not implemented
- yet.
-
-
-2006-02-04(Sat) 16:22:38 +0900 Minero Aoki <aamine@loveruby.net>
-
- * test/ruby/test_pipe.rb: remove useless require.
-
- * test/ruby/test_signal.rb: turn off the test case which causes
- segmentation fault (tmp).
-
-
-2006-02-04(Sat) 08:19:50 +0900 Koichi Sasada <ko1@atdot.net>
-
- * common.mk : add dependency to yarvcore.h on signal.o
-
- * compile.c (iseq_compile_each) : fix [yarv-dev:795] problem
- (prohibit "break", "next" jump from eval)
-
- * eval.c : fix indent
-
- * eval_thread.c, thread.c : remove some functions and move to thread.c
-
- * insns.def, vm.c : fix [yarv-dev:799] and [yarv-dev:800]
-
- * yarvtest/test_class.rb : add a test for above
-
- * test/ruby/test_gc.rb : remove GC.debug_flag control
-
- * test/ruby/test_readpartial.rb : disable
-
- * test/ruby/test_signal.rb : disable
-
- * thread.c : fix thread_debug() and many bugs
-
- * thread.c (yarv_thread_s_new) : move living_threads setting
-
- * thread.c (yarv_thread_join) : fix
-
- * thread_pthread.h : add type native_thread_data_t (dummy)
- and support interrupt blocking thread
-
- * thread_pthread.h (native_thread_apply_priority) : added
-
- * thread_win32.h : add type native_thread_data_t (dummy)
- and support interrupt blocking thread
-
- * yarvcore.h : use win32 thread system on cygwin and fix
- some struct members
-
- * yarvtest/test_thread.rb : added
-
-
-2006-02-03(Fri) 00:08:09 +0900 Minero Aoki <aamine@loveruby.net>
-
- * test/ruby/test_string.rb: import many tests from rubicon.
-
-
-2006-02-02(Thu) 23:20:13 +0900 Minero Aoki <aamine@loveruby.net>
-
- * test/ruby/envutil.rb: new file (imported from ruby trunk HEAD).
-
- * test/ruby/marshaltestlib.rb: ditto.
-
- * test/ruby/test_array.rb: ditto.
-
- * test/ruby/test_beginendblock.rb: ditto.
-
- * test/ruby/test_clone.rb: ditto.
-
- * test/ruby/test_dir.rb: ditto.
-
- * test/ruby/test_env.rb: ditto.
-
- * test/ruby/test_file.rb: ditto.
-
- * test/ruby/test_float.rb: ditto.
-
- * test/ruby/test_fnmatch.rb: ditto.
-
- * test/ruby/test_hash.rb: ditto.
-
- * test/ruby/test_io.rb: ditto.
-
- * test/ruby/test_marshal.rb: ditto.
-
- * test/ruby/test_math.rb: ditto.
-
- * test/ruby/test_pack.rb: ditto.
-
- * test/ruby/test_path.rb: ditto.
-
- * test/ruby/test_pipe.rb: ditto.
-
- * test/ruby/test_rand.rb: ditto.
-
- * test/ruby/test_range.rb: ditto.
-
- * test/ruby/test_readpartial.rb: ditto.
-
- * test/ruby/test_regexp.rb: ditto.
-
- * test/ruby/test_settracefunc.rb: ditto.
-
- * test/ruby/test_signal.rb: ditto.
-
- * test/ruby/test_sprintf.rb: ditto.
-
- * test/ruby/test_string.rb: ditto.
-
- * test/ruby/test_stringchar.rb: ditto.
-
- * test/ruby/test_struct.rb: ditto.
-
- * test/ruby/test_symbol.rb: ditto.
-
- * test/ruby/test_system.rb: ditto.
-
- * test/ruby/test_time.rb: ditto.
-
- * test/ruby/ut_eof.rb: ditto.
-
-
-2006-02-02(Thu) 22:53:44 +0900 Minero Aoki <aamine@loveruby.net>
-
- * test/ruby/test_proc.rb: test [yarv-dev:777].
-
-
-2006-02-01(Wed) 03:51:39 +0900 Koichi Sasada <ko1@atdot.net>
-
- * gc.c : add GC.debug_flag= method
-
- * insns.def : support method definition in method
-
- * yarvtest/test_method.rb : add tests for above
-
-
-2006-01-29(Sun) 11:40:26 +0900 Koichi Sasada <ko1@atdot.net>
-
- * eval_proc.c (proc_alloc) : fix [yarv-dev:777]
-
- * yarvtest/test_proc.rb : add a test for above
-
- * insns.def : fix [yarv-dev:782] and add YARV_CHECK_INTS()
-
- * yarvtest/test_class.rb : add a test for above
-
- * thread_win32.h : fix [yarv-dev-en:23]
-
- * vm.c (th_call0) : add YARV_CHECK_INTS()
-
-
-2006-01-09(Mon) 11:56:34 +0900 Minero Aoki <aamine@loveruby.net>
-
- * yarvcore.h: add prototype (remove warning).
-
- * vm.c (th_invoke_proc): make save variables volatile.
-
- * eval.c (eval): initialize local variables (remove warnings).
-
- * eval_thread.c (rb_exec_recursive): ditto.
-
- * yarvcore.c (thread_mark): ditto.
-
- * vm.c (th_invoke_proc): ditto.
-
- * eval.c: remove useless prototypes.
-
-
-2006-01-09(Mon) 10:25:12 +0900 Minero Aoki <aamine@loveruby.net>
-
- * eval_thread.c: rb_thread_join is required to build ruby on
- Linux.
-
- * compile.c: unify coding style.
-
- * yarvcore.c: ditto.
-
-
-2006-01-06(Fri) 09:21:34 +0900 Minero Aoki <aamine@loveruby.net>
-
- * vm.c: coding style change only.
-
-
-2006-01-04(Wed) 14:12:47 +0900 Koichi Sasada <ko1@atdot.net>
-
- * eval.c (ruby_init), eval_intern.h : use POP_TAG_INIT() at bootstrap
-
- * eval_thread.c : remove unused functions and comments
-
- * intern.h : expose rb_make_exception()
-
- * signal.c : support signal
-
- * thread.c (yarv_thread_execute_interrupts) : added
-
- * thread_pthread.h (thread_timer) : set interrupt_flag of
- current runnning threads
-
- * vm.c (th_invoke_proc) : jump with JUMP_TAG() if some exception
- occurres
-
- * yarv.h : add yarv_set_current_running_thread_raw() for bootstrap
-
- * yarvcore.c : add yarv_segv() and segv() method for test
-
- * yarvcore.c (Init_yarvcore) : set yarv_thread_t#running_thread
-
- * yarvcore.h : fix yarv_thread_t members
-
-
-2006-01-03(Tue) 22:25:04 +0900 Koichi Sasada <ko1@atdot.net>
-
- * disasm.c (insn_operand_intern) : fix to add child iseq
-
- * eval.c, gc.c : remove obsolete static variables (ruby_scope,
- ruby_dyna_vars, ruby_frame)
-
- * eval.c (rb_mod_s_constants) : use ruby_cref()
-
- * eval.c (eval) : use th_restore_klass()
-
- * eval_proc.c (rb_f_binding) : use th_store_klass()
-
- * insns.def (concatarray) : fix insn ([expr, *nil] => [expr])
-
- * vm.c (th_set_env), insnhelper.h : remove macro
-
- * vm.c (eval_get_cvar_base) : use get_cref
-
- * vm.c (th_make_proc) : use th_store_klass()
-
- * vm_macro.def (macro_eval_invoke_func) : fix option args size
-
- * vm_macro.def (macro_eval_invoke_func) : raise stack overflow error
-
- * yarvcore.h : add yarv_stored_klass_t type
-
- * yarvcore.c : fix mark functions around yarv_stored_klass_t
-
-
-2006-01-01(Sun) 05:14:26 +0900 Minero Aoki <aamine@loveruby.net>
-
- * lib/benchmark.rb: new file (imported from original ruby, rev
- 1.10).
-
-
-2006-01-01(Sun) 03:51:10 +0900 Minero Aoki <aamine@loveruby.net>
-
- * yarvcore.c: add prototype.
-
- * re.c: remove warning: long -> unsigned long.
-
- * debug.c: adjust coding style.
-
- * yarv.h: ditto.
-
-
-2006-01-01(Sun) 03:43:33 +0900 Minero Aoki <aamine@loveruby.net>
-
- * variable.c: add prototype.
-
- * eval.c: ditto.
-
- * eval_load.c: ditto.
-
-
-2006-01-01(Sun) 02:41:21 +0900 Koichi Sasada <ko1@atdot.net>
-
- * common.mk : add address analyse to vtune rule
-
- * rb/vtlh.rb : added for above
-
- * rb/insns2vm.rb, template/vm.inc.tmpl : insert #line directive
- to reference above
-
- * vm_macro.def (macro_eval_invoke_cfunc) : fix indent
-
- * yarvtest/test_method.rb : fix indent, spacing
- and add a test for alias
-
-
-2005-12-31(Sat) 12:42:05 +0900 Koichi Sasada <ko1@atdot.net>
-
- * common.mk : add Intel VTune rule (make vtune)
-
- * eval.c, yarvcore.h : fix to remove yarv_thread_t#local_*
-
- * parse.y (top_local_init_gen) : fix a problem ([yarv-dev:765])
-
- * yarvtest/test_eval.rb : add a test for above
-
- * vm.c (thread_eval) :remove unused function
-
- * yarvcore.c (Init_yarvcore) : remove YARVCore::Thread::eval method
-
- * yarvcore.c (thread_eval) : remove unused function
-
-
-2005-12-31(Sat) 06:05:00 +0900 Koichi Sasada <ko1@atdot.net>
-
- * vm.c (eval_search_super_klass) : pass block to method missing
-
- * vm_macro.def (macro_eval_invoke_method) : ditto
-
- * yarvtest/test_method.rb : add a test for above
-
-
-2005-12-31(Sat) 03:11:14 +0900 Koichi Sasada <ko1@atdot.net>
-
- * eval.c (eval), eval_proc.c (rb_f_binding) : save klass, etc to
- binding and use it at eval
-
- * eval_intern.h : ditto
-
- * yarvtest/test_eval.rb : add tests for above
-
- * yarvcore.c (th_get_special_cref) : added
-
- * yarvcore.h : add a prototype of above
-
- * vm.c (th_get_cref) : refactoring
-
- * vm.c (eval_get_ev_const) : fix SEGV at A::B (A is not class/module)
- ([yarv-dev:758])
-
- * yarvtest/test_bin.rb : add a test for above
-
- * rb/mklog.rb : use external diff command and show function name
-
-
-2005-12-30(Fri) 19:07:51 +0900 Koichi Sasada <ko1@atdot.net>
-
- * yarvcore.c, yarvcore.h, eval.c, eval_proc.c : support
- Ruby's Binding
-
- * yarvcore.c : support TOPLEVEL_BINDING
-
- * yarvtest/test_eval.rb : add tests for above
-
-
-2005-12-30(Fri) 13:12:28 +0900 Minero Aoki <aamine@loveruby.net>
-
- * test/ruby/test_eval.rb: more tests for
- module_eval/instance_eval.
-
-
-2005-12-30(Fri) 05:06:49 +0900 Koichi Sasada <ko1@atdot.net>
-
- * common.mk : add dependency (yarvcore.h) for gc.c
-
- * eval.c, eval_intern.h, eval_load.c, eval_method.h,
- insns.def, insnhelper.h, vm.c, yarvcore.c, yarvcore.h :
- re-write class reference
-
- * yarvtest/test_eval.rb : added
-
- * yarvtest/test_proc.rb :
-
-
-2005-12-29(Thu) 12:27:12 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c, yarvcore.h :
- remvoe needless yarv_iseq_t#rewind_frame_size
-
-
-2005-12-29(Thu) 11:17:58 +0900 Koichi Sasada <ko1@atdot.net>
-
- * common.mk : add dependency to test-all rule
-
- * eval.c (rb_sourceline), vm.c (th_get_sourceline) :
- fix to skip process if iseq is ifunc
-
- * test/ruby/test_lambda.rb : assert(fail, ...) instead of assert_fail
-
- * test/ruby/test_proc.rb : ditto
-
- * vm_dump.c : fix stack dump (iseq name)
-
- * vm_macro.def : store proc (block proc) to cfp#proc for GC mark
-
- * yarvcore.c : mark above on thread_mark
-
- * eval.c (exec_under) : replace block#self ([yarv-dev:751])
-
-
-2005-12-29(Thu) 01:56:46 +0900 Koichi Sasada <ko1@atdot.net>
-
- * vm.c : fix setting of Proc cref ([yarv-dev:741])
-
- * yarvcore.c : fix indent
-
-
-2005-12-29(Thu) 00:17:03 +0900 Koichi Sasada <ko1@atdot.net>
-
- * disasm.c : show (block) local variable simple (not as symbol)
-
- * gc.c : fix syntax error
-
-
-2005-12-28(Wed) 23:35:06 +0900 Koichi Sasada <ko1@atdot.net>
-
- * class.c (method_entry) : fixed for undefed method ([yarv-dev:743])
-
- * compile.c : fix errinfo dvar id (#$!)
- and fix NODE_ERRINFO compilation
-
- * eval_proc.c, yarvcore.c : support YARVCore::VM::Proc.new
-
- * insns.def : remove useless TODO comments
-
- * insns.def : fix to use strict array conversion on
- checkarrayinclude
-
- * insns.def : fix defined?(yield) ([yarv-dev:744])
-
- * yarvcore.h : change yarv_iseq_t layout
-
-
-2005-12-28(Wed) 16:49:55 +0900 Minero Aoki <aamine@loveruby.net>
-
- * test/ruby/test_eval.rb: add TODO comment.
-
- * test/ruby/test_iterator.rb: rename YARVCore::VM::Proc -> Proc
- (tmp).
-
- * test/ruby/test_lambda.rb: use assert_fail.
-
- * test/ruby/test_proc.rb: ditto.
-
-
-2005-12-28(Wed) 16:28:35 +0900 Minero Aoki <aamine@loveruby.net>
-
- * test/ruby/test_clone.rb: removed (tmp).
-
- * test/ruby/test_eval.rb: define missing method Object#funcall
- (tmp).
-
- * test/ruby/test_lambda.rb: turn off tests for "->".
-
- * test/ruby/test_proc.rb: turn off tests for |&b|.
-
- * test/ruby/test_proc.rb: turn off tests for $SAFE setter.
-
-
-2005-12-28(Wed) 15:31:46 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c : fix calculation of stack_max
-
- * eval.c (rb_iter) : fix block/retry handling
-
- * yarvtest/test_flow.rb : add tests for above
-
- * insns.def : fix block passing on super (super(&nil))
-
- * vm_macro.def, insns.def : fix convert method of object to array
-
- * yarvtest/test_method.rb : fix a test for above
-
- * vm.c : fix backtrace generate algorithm
-
-
-2005-12-28(Wed) 10:36:45 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c, compile.h : refactoring (remove self passing, etc)
-
- * disasm.c : support showing ID of method/dynamic local variables
-
- * rb/allload.rb : add verbose version (it's enable by $DEBUG)
-
- * template/insns.inc.tmpl, template/insns_info.inc.tmpl,
- template/minsns.inc.tmpl, template/opt_sc.inc.tmpl,
- template/optinsn.inc.tmpl, template/optunifs.inc.tmpl,
- template/vmtc.inc.tmpl : fix a comment
-
- * variable.c (mod_av_set) : fix to clear inline cache ([yarv-dev:720])
-
- * eval_method.h : fix to clear inline method cache
-
- * vm.c, rb/insns2vm.rb, template/insns_info.inc.tmpl, compile.c,
- insns.def, vm_evalbody.h, vm_macro.def :
- fix operands types (ulong -> num_t, ...)
-
- * vm_macro.def : fix to check SPECIAL_CONST_P() at splat array
- ([yarv-dev:722])
-
- * yarvcore.c : fix to throw syntax error
-
- * yarvcore.h, eval.c, eval_error.h, eval_jump.h :
- add yarv_vm_t#exit_code to fix problem at cleanup ([yarv-dev:723])
-
- * insns.def : fix to invoke zsuper in method defined by define_method
- ([yarv-dev:704])
-
- * yarvtest/test_class.rb : add tests for above
-
- * yarvtest/test_method.rb : fix comments
-
-
-2005-12-27(Tue) 01:52:07 +0900 Koichi Sasada <ko1@atdot.net>
-
- * array.c, intern.h, insns.def : expose rb_ary_replace and use it
- in insns.def
-
- * eval.c : fix to use SCOPE_* to NOEX_*
-
- * eval_intern.h : remove SCOPE_*
- and fix SCOPE_TEST() and SCOPE_SET(f)
-
- * eval_load.c : save and store klass and visibility
- at require and load
-
- * eval_method.h : fix undefed method node ([yarv-dev-en:8])
-
- * eval_proc.c : fix define_method ([yarv-dev:704])
-
- * insnhelper.h, vm.h : remove GET_VM_STATE_VERSION(),
- INC_VM_STATE_VERSION() and move these to vm.h
-
- * insns.def : supportintg visibility
-
- * node.h : remove NOEX_RECV
-
- * variable.c, vm.c : add rb_vm_change_state() and use it in
- remove_const
-
- * vm.c, insns.def, yarvcore.h, yarvcore.c : add eval_push_cref(),
- eval_pop_cref() and th_cref_init to manage current visibility
-
- * yarv.h : add a prototype of rb_vm_change_state()
-
- * yarvcore.h, insns.def : add defined_method_id and support
- super in define_method scope
-
- * yarvtest/test_class.rb : add tests for above
-
-
-2005-12-26(Mon) 20:44:38 +0900 Minero Aoki <aamine@loveruby.net>
-
- * test/ruby/test_basicinstructions.rb: new file.
-
-
-2005-12-26(Mon) 08:40:02 +0900 Koichi Sasada <ko1@atdot.net>
-
- * vm.c (eval_get_ev_const) : fix to skip nil
-
-
-2005-12-26(Mon) 08:27:15 +0900 Koichi Sasada <ko1@atdot.net>
-
- * insnhelper.h : fix GET_CVAR_EV_KLASS [yarv-dev:703]
-
-
-2005-12-26(Mon) 07:51:01 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c : add emptstack insn for all NODE_RETURN
- and optimize it if it's not needed
-
- * yarvtest/test_flow.rb : add a test for above
-
-
-2005-12-26(Mon) 07:08:22 +0900 Koichi Sasada <ko1@atdot.net>
-
- * eval.c, gc.c : add "gc_debug_flag" to debug gc
-
- * insns.def : add emptstack
-
- * compile.c, rb/insns2vm.rb, template/insns_info.inc.tmpl :
- change interface of insn_stack_increase
-
- * compile.c : fix return from ensure in method [yarv-dev:702]
-
- * yarvtest/test_flow.rb : add tests for above
-
-
-2005-12-26(Mon) 02:15:02 +0900 Minero Aoki <aamine@loveruby.net>
-
- * test/ruby/test_alias.rb: do not use unimplemented defined?.
-
-
-2005-12-26(Mon) 02:00:11 +0900 Minero Aoki <aamine@loveruby.net>
-
- * test/runner.rb: new file.
-
- * test/ruby/test_alias.rb: new file.
-
- * test/ruby/test_clone.rb: new file.
-
- * test/ruby/test_eval.rb: new file.
-
- * test/ruby/test_iterator.rb: new file.
-
- * test/ruby/test_lambda.rb: new file.
-
- * test/ruby/test_proc.rb: new file.
-
- * test/ruby/test_super.rb: new file.
-
- * test/ruby/test_assignment.rb: new file.
-
- * test/ruby/test_bignum.rb: new file.
-
- * test/ruby/test_call.rb: new file.
-
- * test/ruby/test_case.rb: new file.
-
- * test/ruby/test_condition.rb: new file.
-
- * test/ruby/test_const.rb: new file.
-
- * test/ruby/test_defined.rb: new file.
-
- * test/ruby/test_exception.rb: new file.
-
- * test/ruby/test_gc.rb: new file.
-
- * test/ruby/test_ifunless.rb: new file.
-
- * test/ruby/test_method.rb: new file.
-
- * test/ruby/test_trace.rb: new file.
-
- * test/ruby/test_variable.rb: new file.
-
- * test/ruby/test_whileuntil.rb: new file.
-
-
-2005-12-25(Sun) 07:40:08 +0900 Koichi Sasada <ko1@atdot.net>
-
- * blockinlining.c, compile.c : fix block inlining
-
- * rb/insns2vm.rb : fix to support tracing stack depth
- with operands unification
-
- * vm_dump.c : fix to print Qundef on stack dump
-
-
-2005-12-25(Sun) 01:45:55 +0900 Koichi Sasada <ko1@atdot.net>
-
- * insns.def, compile.c, rb/insns2vm.rb, template/insns_info.inc.tmpl :
- trace stack depth at compile time
- and use it as cont_sp for exception handling
-
- * yarvtest/test_exception.rb : add tests for above
-
- * yarvtest/test_flow.rb : ditto
-
- * Merry Xmas :)
-
-
-2005-12-24(Sat) 19:34:04 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c, compile.h : fix ADD_CATCH_ENTRY and add LABEL#sp
-
- * eval_jump.h : fix catch to remove illegal error
-
-
-2005-12-24(Sat) 09:05:23 +0900 Koichi Sasada <ko1@atdot.net>
-
- * eval_method.h : change data structure for RClass#m_tbl
-
- * class.c, eval.c, eval_proc.c : fix for above changes
-
- * node.h, gc.c : change NODE_FBODY, NODE_METHOD members
- for above changes
-
- * insns.def : support private/protected visibility
-
- * vm_macro.def : ditto
-
- * vm.c : ditto
-
- * thread.c : fix typo
-
- * thread_pthread.h : fix typo
-
- * thread_win32.h : fix typo
-
- * eval.c, yarvcore.h : add yarv_thread_t#method_missing_reason
- to pass method_missing reason and use it to build error message
-
- * compile.c : use ADD_CALL instead of ADD_SEND for
- NODE_X(D)STR, NODE_CONST (func)
-
-
-2005-12-22(Thu) 02:45:27 +0900 Koichi Sasada <ko1@atdot.net>
-
- * yarv_version.h, Changes : 0.3.3
-
-
-2005-12-20(Tue) 04:04:45 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c : fix self::Const access
-
- * yarvtest/test_bin.rb : add a test for above
-
-
-2005-12-20(Tue) 01:52:52 +0900 Koichi Sasada <ko1@atdot.net>
-
- * insns.def : fix to expand VALUES value
-
- * yarvtest/test_massign.rb : add a test for above
-
-
-2005-12-20(Tue) 01:32:35 +0900 Koichi Sasada <ko1@atdot.net>
-
- * insns.def, insnhelper.h : fix cvar in singleton method/class
-
- * yarvtest/test_bin.rb : add tests for above
-
-
-2005-12-20(Tue) 01:03:34 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c, yarvcore.h : support all defined?() syntax
-
- * compile.c : fix NODE_COLON2
-
- * yarvtest/test_bin.rb : add or fix tests for above
-
- * win32/* : update all
-
-
-2005-12-17(Sat) 10:46:08 +0900 Minero Aoki <aamine@loveruby.net>
-
- * vm_macro.def: fix printf type mismatch for LP64 system (again).
-
- * parse.y: introduce descriptive macro for special values of
- lvtbl->dvars.
-
-
-2005-12-17(Sat) 09:39:27 +0900 Minero Aoki <aamine@loveruby.net>
-
- * vm_macro.def (macro_eval_invoke_method): fix printf type mismatch
- for LP64 system.
-
-
-2005-12-14(Wed) 03:49:40 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c : change rescue/ensure iseq name
-
- * eval.c, intern.h : fix a prototype
-
- * insns.def, yarvcore.h : add trace_function
-
- * vm.c : fix deadly bug (illegal pointer cast)
-
- * vm_dump.c : remove unused local variables
-
- * vm_macro.def : add parameter size check
-
- * yarvtest/test_bin.rb : comment out 2 assertions
-
-
-2005-12-13(Tue) 03:55:27 +0900 Koichi Sasada <ko1@atdot.net>
-
- * eval_proc.c : fix indent
-
- * insns.def : fix getspecial instruction to return nil
- if no entry
-
- * yarvtest/test_syntax.rb : add a test for above
-
- * lib/un.rb : added
-
- * template/*.tmpl : fix typo
-
-
-2005-12-13(Mon) 01:38:17 +0900 Minero Aoki <aamine@loveruby.net>
-
- * yarv.h: add prototypes.
-
- * intern.h: ditto.
-
- * eval.c: ditto.
-
- * debug.c: ditto.
-
- * thread_pthread.h: fix printf type mismatch for LP64 system
- (Linux/AMD64).
-
- * variable.c: ditto.
-
- * object.c: ditto.
-
- * gc.c: ditto.
-
- * process.c: ditto.
-
- * error.c: ditto.
-
- * vm.c: ditto.
-
- * vm.h: ditto.
-
- * vm_dump.c: ditto.
-
- * disasm.c: ditto.
-
- * marshal.c: ditto.
-
- * eval_thread.c: ditto.
-
-
-2005-12-11(Sun) 22:00:34 +0900 Koichi Sasada <ko1@atdot.net>
-
- * insns.def : call "inherited" method when a class is inherited
-
- * yarvcore.h : fix yarv_iseq_t field layout
-
- * common.mk : add dependence on yarvcore.h to eval*.o files
-
- * compile.c : fix NODE_POSTEXE logic
-
- * insnhelper.h : use GC_GUARDED_PTR_REF instead of magic number
-
- * eval_proc.c : fix indent
-
- * configure : re-autoconf
-
-
-2005-12-10(Sat) 03:57:20 +0900 Koichi Sasada <ko1@atdot.net>
-
- * common.mk : fix blockinlining.o build rule
-
- * insns.def : remove logic for zsuper
-
- * template/optinsn.inc.tmpl :
-
- * vm.c : remove thread_yield_light_prepare, thread_yield_light_invoke
-
- * compile.c : support NODE_ZSUPER with optargs, restarg
-
- * yarvtest/test_class.rb : add tests for above
-
-
-2005-12-09(Fri) 01:13:37 +0900 Koichi Sasada <ko1@atdot.net>
-
- * array.c, numeric.c, range.c : add prototype of
- block inlining function
-
- * blockinlining.c, vm_opts.h.base : add block inlining flag
-
- * common.mk, debug.h, debug.c : add debug_breakpoint() for gdb
-
- * compile.c : fix to use size_t on compile_data_alloc(),
- fix illegal cast, fix to set arg_simple at compiling block,
-
- * compile.c, vm.c : fix NODE_NEXT, NODE_BREAK logic
-
- * yarvtest/test_flow.rb : add a test for above
-
- * yarvcore.c, yarvcore.h, compile.c, eval.c : remove
- yarv_iseq_t#root_iseq and add yarv_iseq_t#local_iseq and fix
- to use this member field
-
- * eval_method.h : fix indent
-
- * gc.c : fix indent
-
- * insns.def, compile.c : remove "zsuper" instruction (use "super"
- instead). This is because NODE_ZSUPER represent with only "super"
- instruction
-
- * yarvcore.c : add proc_arity
-
-
-2005-12-05(Mon) 03:58:30 +0900 Koichi Sasada <ko1@atdot.net>
-
- * array.c, blockinlining.c : support block inlining for Array#each
-
- * disasm.c : fix catch table format
-
- * insns.def : fix stack consistency error message
-
- * vm.c : fix to skip pushing value at "next"
-
- * yarvcore.h : move definision of
- "struct iseq_compile_data_ensure_node_stack" to compile.c
-
- * compile.c : fix ensure catch table creation
-
- * yarvtest/test_flow.rb : add tests for above
-
-
-2005-12-03(Sat) 22:27:08 +0900 Koichi Sasada <ko1@atdot.net>
-
- * blockinlining.c, compile.c, yarvcore.c, yarvcore.h,
- numeric.c, range.c : collect block inlining logic to blockinlining.c
-
-
-2005-12-03(Sat) 20:24:07 +0900 Koichi Sasada <ko1@atdot.net>
-
- * blockinlining.c, common.mk : add blockinlining.c
-
- * yarvcore.c, yarvcore.h, blockinlining.c, compile.c, compile.h,
- gc.c, node.h, numeric.c, range.c :
- support block inlining for Integer#times, Range#each
-
- * compile.c : fix to set block redo/next point at last,
- and fix NODE_OP_ASGN1
-
- * compile.c, vm.c : add specialized instruction "opt_le"
-
- * disasm.c : fix to show block, and to show catch type as string
- and change node_name logic
-
- * eval_thread.c : fix function type declaration
-
- * insns.def : add instruction "putundef", "opt_checkenv"
- to support block inlining and add stack check routine
-
- * lib/cgi.rb : add global variable $CGI_DONTINPUT
-
- * opt_operand.def : add some operand unification rules
-
- * rb/insns2vm.rb : fix operand unification logic for BLOCKISEQ
-
- * vm.c : fix exception handling routine (collect stack operations)
-
- * vm_macro.def : fix macro_eval_invoke_bmethod
-
- * yarvsubst.c : removed
-
- * yarvtest/test_syn.rb : rename to yarvtest/test_syntax.rb
-
- * yarvtest/yarvtest.rb : remove tempfile explicitly
-
-
-2005-11-30(Wed) 01:13:57 +0900 Koichi Sasada <ko1@atdot.net>
-
- * common.mk : add vm_opts.h rule
-
- * vm.c, insns.def : fix proc creation under class and block
- environment
-
-
-2005-11-29(Tue) 16:39:07 +0900 Koichi Sasada <ko1@atdot.net>
-
- * eval.c, eval_proc.c, vm.c, vm_macro.def :
- support define_method and invoke NODE_BMETHOD method
-
-
-2005-11-29(Tue) 13:18:06 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c : add iseq_add_mark_object, iseq_add_mark_object_compile_time
- and use it to mark objects on iseq
-
- * compile.h, compile.c : remove cast on NEW_CHILD_ISEQVAL, NEW_ISEQVAL
- and interface
-
- * compile.c, disasm.c, insns.def, vm_macro.def, rb/insns2vm.rb :
- add BLOCKISEQ parameter type
-
- * gc.c : fix garbage_collect to return true if only allocate memory
-
- * vm.c : fix insertion order of proc/env
-
- * vm_evalbody.h : add typedef yarv_iseq_t *BLOCKISEQ
-
- * yarvcore.c, yarvcore.c : add idTimes
-
- * yarvcore.c : fix proc_mark, env_mark around iseq mark
-
-
-2005-11-28(Mon) 09:02:57 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c, insns.def, vm_evalbody.h : support super
- with splat argument and block (and zsuper with block)
-
- * yarvtest/test_class.rb : add tests for above
-
- * compile.c, yarvcore.h, yarvcore.c, insns.def, time.c, string.c :
- add opt_succ insn
-
- * eval_method.h : fix indent
-
- * eval_thread.c : apply cast to vanish a warning
-
- * lib/tempfile.rb, lib/tmpdir.rb : added
-
- * vm.c : eval_method_missing added
-
- * vm_macro.def : refactoring
-
-
-2005-11-21(Mon) 21:21:33 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c, compile.h, yarvcore.c : remove "iseqobj"
- variables and rename to "iseq"
-
-
-2005-11-21(Mon) 07:31:50 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c : fix block parameter error
-
- * ext/* : added
-
- * lib/optparse* : added
-
- * benchmark/bm_so_sieve.rb : fix parameter
-
-
-
-2005-11-21(Mon) 03:47:28 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c : optimize condition in literal
-
- * thread_win32.h : fix win32 thread function prototype
-
-
-2005-11-20(Sun) 17:58:24 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c : fix NODE_AND/OR bug
-
- * eval.c : support rb_frame_this_func()
-
-
-2005-11-20(Sun) 12:32:31 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c, yarvcore.c, yarvcore.h : support NODE_OPT_N
-
- * compile.h : add macro ADD_CALL
-
- * debug.c : add debug_v() and change to use only printf
- on debug_id()
-
- * sample/test.rb :
-
- * vm.c : fix make_proc_from_block
-
-
-2005-11-19(Sat) 14:55:17 +0900 Koichi Sasada <ko1@atdot.net>
-
- * import ruby 1.9.0 (2005-11-18)
-
-
-2005-11-19(Sat) 06:08:37 +0900 Koichi Sasada <ko1@atdot.net>
-
- * lib/test : added
-
-
-2005-11-19(Sat) 05:48:50 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c : useless jump elimination (if/unless destination)
-
- * eval.c : rb_iter_break support,
- fix rb_iterate (clear errinfo if break)
-
- * eval_proc.c : support rb_node_arity (YARV_METHOD_NODE)
-
- * insns.def : change variable name
-
- * vm.c : fix th_invoke_yield and add th_iter_break()
-
- * vm_dump.c : fix yarv_bug()
-
- * yarvcore.c : fix proc_mark to check IFUNC node and add
- global ruby method SDR() for debug
-
- * yarvtest/test_syn.rb : add a test for all condition combination
-
-
-2005-11-15(Tue) 05:52:58 +0900 Koichi Sasada <ko1@atdot.net>
-
- * lib/forwardable.rb : added
-
- * common.mk : remove "vm.o : CFLAGS += -fno-crossjumping" rule
-
- * compile.c, yarvcore.h, insns.def : add FCALL/VCALL flag
-
- * compile.c, insns.def : add onceinlinecache instruction
-
- * eval.c : support $!, $@, raise (== raise $!)
-
- * opt_operand.def : add some unification rule (send flags)
-
- * vm.c : fix return process
-
- * vm_macro.def : fix option prameters
-
- * yarvtest/test_method.rb : add tests for above
-
-
-2005-11-15(Tue) 00:42:49 +0900 Koichi Sasada <ko1@atdot.net>
-
- * eval.c : support rb_frame_pop() and rb_frame_callee(),
- add rb_sourcefile(), rb_souceline(),
-
-
- * compile.c : support postposition while/until,
- fix block parameter index
-
- * yarvtest/test_syn.rb : add tests for above
-
- * yarvcore.c : fix env_mark
-
- * vm.h, yarvcore.h : move vm.h#cmethod_info to
- yarvcore.h#yarv_cmethod_info
-
- * vm.c : add th_get_sourceline()
-
- * eval_intern.h : fix PASS_PASSED_BLOCK()
-
- * eval_load.c : fix re-enter require (temporalily)
-
- * insns.def : permit re-open class when superclass is same
-
-
-2005-11-11(Fri) 01:20:15 +0900 Koichi Sasada <ko1@atdot.net>
-
- * common.mk : add "allload" rule
-
- * compile.c, yarvcore.h, insns.def, vm_macro.def, disasm.c :
- change arg_rest, arg_block offset (1)
-
- * insns.def : add postexe instruction
-
- * insns.def, vm.c : support rest block parameter
-
- * yarvtest/test_block.rb : add tests for above
-
- * rb/allload.rb : get path from ARGV
-
- * vm_opts.h.base : set default off
-
-
-2005-11-01(Tue) 08:28:19 +0900 Koichi Sasada <ko1@atdot.net>
-
- * benchmark/other-lang/eval.rb : fix path
-
- * lib/English.rb, lib/cgi.rb, lib/complex.rb, lib/delegate.rb :
- added
-
-
-2005-11-01(Tue) 08:18:33 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c : push and pop values after checkincludearray for
- stack caching
-
-
-2005-10-31(Mon) 15:37:09 +0900 Koichi Sasada <ko1@atdot.net>
-
- * benchmark/bm_app_mandelbrot.rb : added
-
- * benchmark/bm_app_factorial.rb : fixed parameter
-
- * benchmark/bm_so_count_words.rb, benchmark/run_rite.rb : use
- real file
-
- * common.mk : add "ext" rule, add some dependencies and add option
- to bench-each rule (renamed from bench-item)
-
- * compile.c : fix get_root_iseq_object (check iseq type),
- support splat case/when. support //o (regexp)
-
- * eval.c : support *_eval, fix rb_obj_call_init to pass block
-
- * eval_jump.h : support throw/catch
-
- * eval_load.c : save klass_nest_stack when require
-
- * eval_method.h : fix ruby_cbase()
-
- * insnhelper.h : GET_EV_KLASS checks toplevel or not
-
- * insns.def, yarvcore.c : fix singleton method definition and fix
- super class's method
-
- * lib/shellwords.rb : use String() instead of String.new()
-
- * vm.c : check class iseq or not when making Proc and
- add eval_search_super_klass function
-
- * vm.h : CMETHOD_INFO_P to yarvcore.h
-
- * vm_macro.def : splat if object type is T_ARRAY
-
- * vm_opts.h, vm_opts.h.base : rename to vm_opts.h.base
- insns2vm.rb will copy it to build directory
-
- * yarvcore.c : add Proc#[]
-
- * yarvcore.h : change INITIAL_ISEQ_COMPILE_DATA_STORAGE_BUFF_SIZE
- to 512
-
- * yarvtest/test_* : invalidate splat non array code (like: "*1")
-
- * yarvtest/yarvtest.rb : use tempfile instead of popen
-
-
-2005-10-28(Fri) 09:11:53 +0900 Koichi Sasada <ko1@atdot.net>
-
- * yarvtest/test_method.rb : fix test
-
-
-2005-10-28(Fri) 08:43:29 +0900 Koichi Sasada <ko1@atdot.net>
-
- * benchmark/run_rite.rb : add -I options to run benchmark
-
- * common.mk : pass options to some rules with RUNOPT
- and add -I options
-
- * compile.c : fix massign with constant
-
- * yarvtest/test_massign.rb : add tests for above
-
- * eval_load.c : fix load_wait()
-
- * eval_method.h : support ruby_cbase()
-
- * lib/*.rb : add or modify libraries to run on yarv
- * parse.y : change to ANSI C style
-
- * vm.c : fix making proc process under cfunc/ifunc environment
-
- * vm_macro.def : fix block pass
-
- * yarvtest/test_method.rb : add tests for above
-
- * yarvcore.c : add yarv_obj_is_proc()
-
- * eval.c : fix rb_obj_is_proc to use yarv_obj_is_proc()
-
-
-2005-10-27(Thu) 11:50:15 +0900 Koichi Sasada <ko1@atdot.net>
-
- * some files : import from ruby 1.9.0 (2005-10-12)
-
-
-2005-10-16(Sun) 14:50:02 +0900 Koichi Sasada <ko1@atdot.net>
-
- * insns.def, compile.c, yarvcore.h, yarvcore.c : add insns "bitblt" and "answer"
-
-
-2005-10-11(Tue) 17:01:13 +0900 Koichi Sasada <ko1@atdot.net>
-
- * yarv_version.h, Changes : 0.3.2
-
-
-2005-10-11(Tue) 13:35:25 +0900 Koichi Sasada <ko1@atdot.net>
-
- * insns.def : add YARV_CHECK_INTS()
-
- * thread.c, thread_pthread.h, thread_win32.h : kick timer thread
- when another thread kicked
-
- * vm.c : remove debug print
-
- * vm_opts.h : add OPT_CALL_THREADED_CODE
-
- * yarvtest/yarvtest.rb : remove "\r" from answer
-
-
-2005-10-07(Fri) 09:36:36 +0900 Koichi Sasada <ko1@atdot.net>
-
- * yarvcore.h : add member variable "interrupt_flag" to yarv_thread_t
-
-
-2005-10-05(Wed) 21:20:13 +0900 Koichi Sasada <ko1@atdot.net>
-
- * eva.c, eval_thread.c, ruby.h, eval_error.h, eval_jump.h,
- eval_load.c, thread.c, error.c, compile.h : remove ruby_errinfo
-
- * thread_win32.h, thread_pthread.h : set stack size to 4KB
-
- * vm.c : fix making env routine
-
- * vm_dump.c, vm.h : support frame type "EVAL" and fix magic number
-
- * yarvcore.c : fix some mark/free routine
-
-
-2005-10-05(Wed) 09:08:11 +0900 Koichi Sasada <ko1@atdot.net>
-
- * eval.c, eval_intern.h, vm.c, eval_jump.h, yarvcore.h :
- re-define PUSH/POP/EXEC/JUMP_TAG to use thread local tag
-
- * inits.c, yarvcore.c : fix boostrap
-
-
-2005-10-03(Mon) 22:28:24 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c : fix NODE_COLON2 bugs
-
- * compile.h : fix debug routine
-
- * disasm.c : add space between insn and operand
-
- * insns.def : add comment of classdef, singletonclassdef
-
- * vm.c, yarv.h : fix invoke_light routine
-
- * yarvcore.c : fix to mark each threads
-
-
-2005-10-02(Sun) 05:55:34 +0900 Koichi Sasada <ko1@atdot.net>
-
- * thread_pthread.h : add "system_working" global variable
-
-
-2005-10-02(Sun) 01:23:44 +0900 Koichi Sasada <ko1@atdot.net>
-
- * thread.c : add raw gets (for test), and fix indent
-
-
-2005-10-01(Sat) 23:06:21 +0900 Koichi Sasada <ko1@atdot.net>
-
- * thread_win32.h, common.mk : add thread_win32.h
-
- * thread.c : support _WIN32 thread
-
- * thread.c, thread_pthread.h : fix some interface
-
- * eval_thread.c : remove debug print
-
- * gc.c : fix stack region
-
- * win32/Makefile.sub : add -MD flag to LDFLAGS
-
- * yarvcore.c : fix mark and sweep debug print
-
- * yarvcore.h : fix VM#living_threads data type to st_table
-
-
-2005-10-01(Sat) 00:25:28 +0900 Koichi Sasada <ko1@atdot.net>
-
- * thread.c, yarvcore.h : rename GIL (Global Interpreter Lock) to
- GVL (Global VM Lock)
-
- * thread_pthread.h : fix pthread mutex initialize
-
-
-2005-09-30(Fri) 20:11:19 +0900 Koichi Sasada <ko1@atdot.net>
-
- * thread.c : support join with timeout
-
- * yarvcore.h : use GET_VM()
-
-
-2005-09-30(Fri) 14:59:29 +0900 Koichi Sasada <ko1@atdot.net>
-
- * thread.c, common.mk : add thread.c
-
- * thread.c, gc.c, eval_thread.c, yarvcore.c, yarvcore.h :
- support native thread (on pthread)
-
- * insns.def : add YARV_CHECK_INTS() check
-
- * yarv.h : add GET_VM() macro
-
-
-2005-09-29(Thu) 22:43:08 +0900 Koichi Sasada <ko1@atdot.net>
-
- * eval_intern.h, eval_thread.c : move thread_status to eval_intern.h
-
- * yarvcore.c : fix thread/vm value
-
- * yarvcore.h : add some parameter to yarv_thread_t
-
-
-2005-09-29(Thu) 01:52:33 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c, yarvcore.h : add line number on last end instruction
-
- * vm.c : fix line no detection
-
-
-2005-09-28(Wed) 00:02:10 +0900 Koichi Sasada <ko1@atdot.net>
-
- * common.mk, eval_load.c, eval.c, eval_intern.h : add eval_load.c
-
- * disasm.c : fix around block local variables
-
- * eval_proc.c : fix typo
-
-
-2005-09-27(Tue) 16:45:20 +0900 Koichi Sasada <ko1@atdot.net>
-
- * eval.c : remove debug print
-
-
-2005-09-27(Tue) 16:41:47 +0900 Koichi Sasada <ko1@atdot.net>
-
- * eval.c : support Kernel.local_variables
-
- * parse.y, yarvcore.c : move some functions
- (rb_(backref|lastline)_(get|set)) from parse.y to yarvcore.c
-
- * yarvcore.h : fix typo of YARV_PREVIOUS_CONTROL_FRAME
-
-
-2005-09-26(Mon) 18:51:29 +0900 Koichi Sasada <ko1@atdot.net>
-
- * eval.c, compile.c, parse.y, vm.c, yarvcore.h :
- eval() works with binding (Env)
-
- * vm.c : add th_set_eval_stack
-
- * yarvtest/test_syn.rb : remove an assert "defined?(local_var)"
-
-
-2005-09-25(Sun) 19:30:59 +0900 Koichi Sasada <ko1@atdot.net>
-
- * benchmark/bm_vm2_send.rb : added
-
- * common.mk : add rule "bench-item"
-
- * eval_intern.h : add PASS_PASSED_BLOCK()
-
- * eval_proc.c : support some functions
-
- * rb/mklog.rb : added
-
- * vm.c : fix prototype style and coding style
-
- * yarv.h : add some prototypes of functions
-
- * yarvcore.c, yarvcore.h, eval.c : yarv_thread_t#ifuncnode -> passed_block,
- and add yarv_proc_t#safe_level
-
-
-2005-09-25(Sun) 11:01:17 +0900 Koichi Sasada <ko1@atdot.net>
-
- * some files : import from ruby 1.9.0 (2005-09-25)
-
- * eval*, vm.c, vm_macro.def : remove frame, scope, ...
-
- * yarvcore.c : remove yarv_block_given_p()
-
- * yarvcore.h, insnhelper.h : move some macro from insnhelper.h to yarvcore.h
- to use these in eval.c
-
-
-2005-09-24(Sat) 15:51:42 +0900 Koichi Sasada <ko1@atdot.net>
-
- * eval* : remove dependency to ruby_dyna_vars and ruby_class
-
-
-2005-09-23(Fri) 20:39:14 +0900 Koichi Sasada <ko1@atdot.net>
-
- * eval_*.[ch] : split eval.c to some files
-
- * *.[ch] : import ruby 1.9.0 (2004-09-23)
-
- * parse.y : remove dependency to ruby_dyna_vars and ruby_scope
-
-
-2005-09-15(Thu) 16:51:06 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c, yarvcore.h : fix "for" scope
-
- * yarvtest/test_block.rb : add tests for above
-
-
-2005-09-14(Wed) 06:11:43 +0900 Koichi Sasada <ko1@atdot.net>
-
- * yarvcore.h, vm_evalbody.h, vm.h, vm_dump.c,
- compile.c, yarvcore.c : use #ifdef insted of #if for recognize
- vm options
-
- * vm_opts.h : fix default options
-
-
-2005-09-10(Sat) 14:10:08 +0900 Koichi Sasada <ko1@atdot.net>
-
- * vm_opts.h : added
-
- * yarvcore.h, rb/insns2vm.h : use vm_opts.h
-
-
-2005-09-10(Sat) 04:53:22 +0900 Koichi Sasada <ko1@atdot.net>
-
- * yarvcore.h, insns.def, compile.c : add DEFINED_YIELD
-
- * yarvtest/test_yield.rb : add test_1_ary_and_1_params
-
- * insns.def : fix splat and svalue
-
- * vm.c : fix to perform with proc with ifunc (incomplete)
-
- * sample/test.rb : added (comment out unsupported features)
-
- * common.mk : add rule "runtest"
-
-
-2005-09-09(Fri) 19:32:11 +0900 Koichi Sasada <ko1@atdot.net>
-
- * insns.def, compile.c : add splatarray
-
- * yarvtest/test_massign.rb : add tests for above
-
-
-2005-08-31(Wed) 22:55:15 +0900 Koichi Sasada <ko1@atdot.net>
-
- * yarvcore.c (yarvcore_eval_parsed): fix to return value
-
- * yarv_version.h, Changes : 0.3.1
-
-
-2005-08-20(Sat) 10:19:27 +0900 Koichi Sasada <ko1@atdot.net>
-
- * rb/ir.rb : add some check
-
- * import today's ruby HEAD
-
-
-2005-08-18(Thu) 23:29:52 +0900 Koichi Sasada <ko1@atdot.net>
-
- * common.mk : fix object file extension
-
- * rb/ir.rb : added (import ruby script)
-
- * rb/diff.rb : removed
-
- * import today's ruby HEAD
-
-
-2005-08-18(Thu) 12:59:38 +0900 Koichi Sasada <ko1@atdot.net>
-
- * common.mk : rule test -> test2, test1 -> test
-
- * compile.c : fix when clause bug and splat arugment
-
-
-2005-08-17(Wed) 05:22:31 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c : fix block local parameter setting routine and support
- massign in block parameter initialze
-
- * yarvtest/test_yield.rb : add tests for above
-
- * insns.def, compile.c : support array concat (ex: "[x, *y]")
-
- * yarvtest/test_bin.rb : add tests for above
-
-
-2005-08-16(Tue) 19:51:19 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c : support nested massign
-
- * yarvtest/test_massign.rb : add tests for above
-
-
-2005-08-16(Tue) 10:25:29 +0900 Koichi Sasada <ko1@atdot.net>
-
- * eval.c : support rb_yield_0 with 0 args
-
-
-2005-08-16(Tue) 09:09:21 +0900 Koichi Sasada <ko1@atdot.net>
-
- * lib/fileutils.rb : imported
-
- * insns.def : fix yield argument (same as last commit)
-
- * yarvtest/test_yield.rb : add tests for above
-
-
-2005-08-16(Tue) 08:29:47 +0900 Koichi Sasada <ko1@atdot.net>
-
- * eval.c : fix to support rb_yield_0 with multiple values
-
- * common.mk : add parse, run1p ruelse
-
- * compile.c : support yield with ARGSCAT/SPLAT
-
- * vm.c, insns.def : fix yield arguments to do compatible behaviour
-
- * yarvtest/test_yield.rb : added for above
-
-
-2005-08-16(Tue) 06:00:17 +0900 Koichi Sasada <ko1@atdot.net>
-
- * insns.def : fix to set klass_nest_stack on singleton
- method definition
-
- * yarvtest/test_method.rb : add a test for above
-
-
-2005-08-16(Tue) 05:34:48 +0900 Koichi Sasada <ko1@atdot.net>
-
- * test1.rb : added. gdb and run1 rule run this script
-
- * compile.c : fix error handled variable access
-
- * yarvtest/test_exception.rb : add tests for above
-
-
-2005-08-16(Tue) 04:26:08 +0900 Koichi Sasada <ko1@atdot.net>
-
- * base ruby : ruby 1.9.0 (2005-08-15)
-
-
-2005-08-16(Tue) 03:54:17 +0900 Koichi Sasada <ko1@atdot.net>
-
- * common.mk, Makefile.in : move some rules to common.mk
-
- * rb/diff.rb : added
-
- * yarvtest/yarvtest.rb : fix to compare output last value
-
-
-2005-08-15(Mon) 18:27:58 +0900 Koichi Sasada <ko1@atdot.net>
-
- * Changes : 0.3.0
-
-
-2005-08-15(Mon) 17:56:09 +0900 Koichi Sasada <ko1@atdot.net>
-
- * yarvcore.c : fix to add prototype
-
- * all files : propset svn:eol-style native
-
-
-2005-08-15(Mon) 10:48:53 +0900 Koichi Sasada <ko1@atdot.net>
-
- * eval.c : support rb_load
-
-
-2005-08-15(Mon) 09:42:01 +0900 Koichi Sasada <ko1@atdot.net>
-
- * yarvcore.h : define SDR()
-
- * vm_dump.c : stack_dump_raw() -> vm_stack_dump_raw()
-
- * yarvtest/yarvtest.rb : add rite test scheme
-
- * benchmark/run_rite.rb : added
-
- * yarvcore.c, inits.c : add Init_vm()
-
- * yarv.h : add some prototype declarations, GET_THREAD()
-
- * eval.c : remove unused functions
-
- * eval.c : support Kernel.eval, some schemes (same as evalc.patch)
-
-
-2005-08-15(Mon) 00:53:28 +0900 Koichi Sasada <ko1@atdot.net>
-
- * yarv_version.h : move configurations to yarvcore.h
-
- * yarvcore.c : remove VALUE yarv_get_current_running_thread() and
- add yarv_thread_t *yarv_get_current_running_thread(), ...
-
- * yarvcore.h : yarv_thread_t#vm -> vm_value
-
- * compile.c : fix "break from nested classes"
-
- * yarvext/extconf.rb : use have_func instead of defined?(YARV_PACHED)
-
- * depend : fix pass
-
- * eval.c : change to kick VM
-
- * version.c : fix to show yarv version
-
- * common.mk : fix dependent
-
- * inits.c : fix to kick Init_yarvcore
-
-
-2005-08-14(Sun) 02:05:15 +0900 Koichi Sasada <ko1@atdot.net>
-
- * README : add description
-
- * yarvext/depend : move to topdir/depend
-
-2005-08-14(Sun) 01:50:43 +0900 Koichi Sasada <ko1@atdot.net>
-
- * merge yarv to ruby (prepare)
-
- * make yarvext/ to build as extension
-
-
-2005-08-13(Sat) 09:36:26 +0900 Koichi Sasada <ko1@atdot.net>
-
- * evalc.patch, insns.def, compile.c : fix to support current
- ruby HEAD.
-
- * 0.2.3
-
-
-2005-08-08(Mon) 19:13:02 +0900 Koichi Sasada <ko1@atdot.net>
-
- * version.h, Changes : 0.2.2
-
-
-2005-08-08(Mon) 17:17:50 +0900 Koichi Sasada <ko1@atdot.net>
-
- * vm.h, vm.c, insns.def, yarvcore.h, yarvcore.c :
- remove yarv_iseq_t#iseq_dt and add yarv_iseq_t#encoded.
- use yarv_iseq_t#encoded anytime
-
- * vm_evalbody.h, vm.h, extconf.rb, version.h :
- support call threaded code (incomplete)
-
-
-2005-08-01(Mon) 05:26:12 +0900 Koichi Sasada <ko1@atdot.net>
-
- * yarvcore.c : support yield with multiple values
-
- * compile.c : fix dynavars
-
- * yarvcore.h : fix to mark defined method
-
-
-2005-07-31(Sun) 23:27:24 +0900 Koichi Sasada <ko1@atdot.net>
-
- * yarvcore.c, vm.c, insns.def : fix search object path
-
- * compile.c : fix "for" statement
-
- * vm_macro.def : fix rest, opt arguments
-
-
-2005-07-31(Sun) 14:52:06 +0900 Koichi Sasada <ko1@atdot.net>
-
- * vm_macro.def : fix block parameter
-
- * compile.c : fix to unuse compile_data->in_ensure
-
- * insns.def : add orphan check when return
-
-
-2005-07-31(Sun) 03:25:05 +0900 Koichi Sasada <ko1@atdot.net>
-
- * vm.c, compile.c, yarvcore.h, insns.def :
- support jump from rescue/ensure/class/module
-
- * test/test_flow.rb : add tests for above fix
-
-
-2005-07-30(Sat) 04:44:33 +0900 Koichi Sasada <ko1@atdot.net>
-
- * yarvcore.h : struct iseq_compile_data_ensure_node_stack is added
-
- * compile.c : insert ensure clause before break/next/redo
-
- * vm.c : fix return/break handling
-
- * yarv.h, vm.c : fix lightweight yield
-
- * vm.c, insns.def, vm_macro.def : change arguments of th_set_env (add sp)
-
- * test/test_flow.rb : added
-
- * test/yarvtest.rb : add ae_flow
-
- * compile.c, vm_macro.def : add tail-call/tail-recursion optimization
- (experimental)
-
-
-2005-07-29(Fri) 20:14:11 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c : make_name_for_block and make_name_with_str
- are added
-
- * insns.def : fix if unmatched size arg size to yield
-
- * test/test_block.rb : add test for above fix
-
- * vm.c : add th_backtrace_each and fix backtrace notation
-
- * yarvcore.c : set top level iseq name to "<main>"
-
-
-2005-07-29(Fri) 13:20:19 +0900 Koichi Sasada <ko1@atdot.net>
-
- * yarvcore.h : fix yarv_iseq_t to pass VC (cl)
-
- * vm_dump.c : ditto
-
- * compile.h : ditto
-
- * insnhelper.h : ditto
-
- * vm_evalbody.h : include 'math.h'
-
- * insns.def, vm.c : raise error when yield without block
-
- * vm.c : implement thread_backtrace
-
- * vm.c, yarvsubst.c, yarv.h : implement thread_yield_light_prepare and
- thread_yield_light_invoke
-
- * yarvcore.c : Integer#times uses yarv specific version
-
-
-2005-07-28(Thu) 21:35:09 +0900 Koichi Sasada <ko1@atdot.net>
-
- * yarvcore.c : add another mark function for thread/stack
-
- * vm_evalbody.h : fix register allocation for x86_64
-
- * vm.h : use asm for tc on x86_64
-
-
-2005-07-28(Thu) 20:17:09 +0900 Koichi Sasada <ko1@atdot.net>
-
- * yarvcore.c : add mark/free message to debug gc
-
- * insnhelper.h, insns.def, vm_macro.def : remove and
- add new RESTORE_REGS
-
- * vm_evalbody.h : fix register allocation
-
-
-2005-07-28(Thu) 02:00:42 +0900 Koichi Sasada <ko1@atdot.net>
-
- * vm.c, etc : change VM stack structure. re-write all
- vm functions to do it
-
- * vm_macro.def : added
-
-
-2005-07-08(Fri) 01:36:49 +0900 Koichi Sasada <ko1@atdot.net>
-
- * insns.def : don't use fmod on AMD64
-
-
-2005-07-08(Fri) 00:14:22 +0900 Koichi Sasada <ko1@atdot.net>
-
- * Changes : added
-
-
-2005-07-07(Thu) 23:54:37 +0900 Koichi Sasada <ko1@atdot.net>
-
- * version.h : 0.3.0
-
-
-2005-07-07(Thu) 23:52:03 +0900 Koichi Sasada <ko1@atdot.net>
-
- * 0.2.1 : released
-
-
-2005-07-07(Thu) 23:50:22 +0900 Koichi Sasada <ko1@atdot.net>
-
- * version.h : 0.2.1
-
-
-2005-07-07(Thu) 23:47:55 +0900 Koichi Sasada <ko1@atdot.net>
-
- * rb/insns2vm.rb, extconf.rb : add --[enable|disable]-opt-unify-all-combination
- and --disable-opts
-
- * vm.h : DISPATCH_ARCH_DEPEND_WAY is only enabled on GCC 3.x
-
-
-2005-07-06(Wed) 13:20:27 +0900 Koichi Sasada <ko1@atdot.net>
-
- * depend, rb/eval.rb : add ITEMS option to benchmark rule
-
- * benchmark/* : changed
-
- * benchmark/other-lang/* : added
-
-
-2005-07-04(Mon) 04:02:15 +0900 Koichi Sasada <ko1@atdot.net>
-
- * yarvcore.h. yarvcore.c : add idDIV, idMOD, idEq, idLength
-
- * compile.c, insns.def : add specialized insn for above method id
-
- * test/test_bin.rb : add tests for above
-
-
-2005-07-03(Sun) 20:31:09 +0900 Koichi Sasada <ko1@atdot.net>
-
- * yarvcore.c, yarvcore.h : remove cYarvThrowObject (unused)
-
- * yarvcore.c, yarvcore.h, insns.def :
- thread_object#stack_mark_poinetr
-
- * depend, rb/eval.rb : BOPT, TOPT -> OPT
-
-
-2005-07-03(Sun) 13:53:47 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c, compile.h : INSN_OBJECT, LABEL_OBJECT -> INSN, LABEL,
- ISEQ_LINK_ELEMENT, ISEQ_LINK_ANCHOR -> LINK_ELEMENT, LINK_ANCHOR,
- and some fixes
-
- * tmpl/optinsn.inc.tmpl : ditto
-
- * yarvcore.c, yarvcore.h : remove label_object, insn_object
- prepare_iseq_build, cleanup_iseq_build are added
-
- * insns.def : remove unused variable from send
-
-
-2005-07-02(Sat) 04:19:22 +0900 Koichi Sasada <ko1@atdot.net>
-
- * insns.def : add GC protect for opt_aset
-
-
-2005-07-02(Sat) 03:49:17 +0900 Koichi Sasada <ko1@atdot.net>
-
- * extconf.rb : add option -fno-reorder-blocks to vm.asm rule
-
- * insns.def : fix opt_aset bugs
-
- * test/test_bin.rb : add tests for aset, aref
-
-
-2005-07-02(Sat) 03:05:12 +0900 Koichi Sasada <ko1@atdot.net>
-
- * benchmark/run.rb : fix output
-
- * vm_evalbody.h : add register for x86_64
-
- * rb/asm_parse.rb : fix to shor size and length
-
-
-2005-07-02(Sat) 02:56:31 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c : move specialized instruction point (new_insn_send)
-
- * insns.def : add opt_aref, opt_aset
-
-
-2005-07-01(Fri) 11:04:11 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.h : fix to pass VALUE type to new_insn_body
-
- * insnhelper.h : add cast
-
- * compile.c : fix getdynamic argument (0 == Qfalse -> I2F(0))
-
-
-2005-06-30(Thu) 23:34:10 +0900 Koichi Sasada <ko1@atdot.net>
-
- * rb/eval.rb : add and fix some rules
-
- * rb/insns2vm.rb : generate all
-
- * benchmark/run.rb : add -r (ruby only) option
-
-
-2005-06-30(Thu) 23:25:23 +0900 Koichi Sasada <ko1@atdot.net>
-
- * tmpl/vmtc.inc.tmpl : add const prefix
-
- * /rb/asm_parse.rb, extconf.rb : added and make assembler analised output
-
- * opt_operand.def : add send operands unification
-
- * insnhelper.h : add HEAP_CLASS_OF(obj)
-
- * insns.def : fix opt_plus, opt_ltlt
-
- * vm_evalbody.h : move _tag
-
- * benchmark/run.rb : fix file select
-
-
-2005-06-30(Thu) 06:07:04 +0900 Koichi Sasada <ko1@atdot.net>
-
- * extconf.rb : add collect-usage-analysis option
-
- * opt_operand.def, opt_insn_unif.def : add some rules
-
-
-2005-06-29(Wed) 23:28:44 +0900 Koichi Sasada <ko1@atdot.net>
-
- * yarvcore.h, extconf.rb, vm.h, compile.c :
- DISPATCH_DIRECT_THREADED_CODE, DISPATCH_THREADED_CODE
- -> OPT_DIRECT_THREADED_CODE, OPT_INDIRECT_THREADED_CODE.
- if at least one of then is defined, OPT_THREADED_CODE is defined
-
- * benchmark/* : fix name and parameters
-
- * rb/eval.rb : added for YARV evaluation
-
-
-2005-06-29(Wed) 16:16:52 +0900 Koichi Sasada <ko1@atdot.net>
-
- * benchmark/run.rb : fix output format
-
- * call_cfunc.inc -> call_cfunc.h
-
- * vm.h : add sign by asm statement
-
-
-2005-06-28(Tue) 22:28:40 +0900 Koichi Sasada <ko1@atdot.net>
-
- * vm.c : fix method search
-
-
-2005-06-28(Tue) 22:26:34 +0900 Koichi Sasada <ko1@atdot.net>
-
- * extconf.rb : fix options
-
-
-2005-06-28(Tue) 21:50:58 +0900 Koichi Sasada <ko1@atdot.net>
-
- * benchmark/run.rb : fix output format
-
-
-2005-06-28(Tue) 21:34:54 +0900 Koichi Sasada <ko1@atdot.net>
-
- * depend : add option TOPT to test rules
-
- * benchmark/run.rb : fix output format
-
-
-2005-06-28(Tue) 21:15:54 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c : fix opt_case_dispatch instruction
-
- * benchmark/run.rb : output all usertimes when exit benchmark
-
-
-2005-06-28(Tue) 20:35:55 +0900 Koichi Sasada <ko1@atdot.net>
-
- * extconf.rb, compile.c, tmpl/optinsn.inc.tmpl, vm.c :
- change extconf options
-
-2005-06-28(Tue) 13:20:59 +0900 Koichi Sasada <ko1@atdot.net>
-
- * benchmark/run.rb : add -y, --yarv-only option
-
- * depend : add BOPT to tbench rule
-
-
-2005-06-27(Mon) 23:31:12 +0900 Koichi Sasada <ko1@atdot.net>
-
- * depend : add gdb rule
-
- * vm.h : use inline assembler for x86 (to support gcc 3.4.x)
-
-
-2005-06-27(Mon) 20:04:10 +0900 Koichi Sasada <ko1@atdot.net>
-
- * yarvcore.c, compile.c, disasm.c : remove unused variables
-
- * vm.h, insnhelper.h, debug.h : fix to reduce warning
-
- * vm.c, vm_dump.c : move VM state dump (debug) functions to vm_dump.c
-
- * depend : adde reconf rule
-
- * insnhelper.h :
-
- * vm_evalbody.inc : rename to vm_evalbody.h
-
-
-2005-06-27(Mon) 16:50:31 +0900 Koichi Sasada <ko1@atdot.net>
-
- * insns2vm.rb : fix generating unif insn
-
- * compile.c : add useless pop/swap insn elimination with stack caching
-
- * depend : remove compiled.o dependency
-
-
-2005-06-26(Sun) 14:06:22 +0900 Koichi Sasada <ko1@atdot.net>
-
- * benchmark/run.rb : use tmpfile instead of popen
-
- * rb/insns2vm.rb : fix generating insn unification logic
-
- * opt_insn_unif.def : add some unification rules
-
- * compile.c : add verify_list function and fix unification logic
-
-
-2005-06-22(Wed) 12:58:26 +0900 Koichi Sasada <ko1@atdot.net>
-
- * yarvcore.h, yarvcore.c, insns.def, compile.c : add mult optimization
-
- * test/test_bin.rb : add test_fact
-
-
-2005-06-21(Tue) 22:34:07 +0900 Koichi Sasada <ko1@atdot.net>
-
- * yarvcore.h, compile.[ch], tmpl/optinsn.inc.tmpl, rb/insns2vm.rb :
- change data structure (don't use Ruby's array to represent a
- instruction sequence)
-
- * disasm.c : add separator
-
-
-2005-06-14(Tue) 07:48:58 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c : support "for" statement
-
- * test/test_block.rb : add test for above
-
- * yarvcore.[ch] : add global id idEach
-
-
-2005-06-08(Wed) 22:30:44 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c : add if/unless(L1) jump (L2) :L1 => unless/if(L2)
- optimize (condition reversal) and fix typo
-
-
-2005-06-07(Tue) 08:29:41 +0900 Koichi Sasada <ko1@atdot.net>
-
- * yarvcore.c : fix to remove compiler warning
-
- * version.h : 0.2.1
-
-
-2005-06-07(Tue) 08:16:22 +0900 Koichi Sasada <ko1@atdot.net>
-
- * yarvcore.h : iseq_link_element changed to double linked list
-
- * disasm.c : support dump struct iseq_link_element
-
- * compile.c : use double linked list instead of array
- for intermediate representation
-
-
-2005-06-06(Mon) 15:38:44 +0900 Koichi Sasada <ko1@atdot.net>
-
- * yarvcore.h, yarvcore.c : add link structure to insn and label object
-
- * compile.h, compile.c : remove some variables in function top scope
- of iseq_compile_each and some optimization (now working)
-
-
-2005-06-04(Sat) 16:12:59 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c : fix previous commit
-
-
-2005-06-04(Sat) 15:56:21 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c : fix stack caching (after jump state)
-
-
-2005-06-04(Sat) 09:12:13 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c : fix some point for previous commit
-
-
-2005-06-04(Sat) 07:31:21 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c, insns.def : optimize case/when statement
- (dispatch on constant time)
-
- * yarvcore.h, disasm.c, rb/insns2vm.rb : fixed for above
- (CDHASH)
-
- * test/test_syn.rb : add test for above
-
-
-2005-06-04(Sat) 03:41:29 +0900 Koichi Sasada <ko1@atdot.net>
-
- * yarvcore.h, yarvcore.c : add some temporary variable test
- (it'll be vanished)
-
- * compile.c : NODE_CASE optimize (use topn instead of dup/swap)
-
-
-2005-06-03(Fri) 00:54:38 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c : apply flow optimization for while/until statement
-
-
-2005-03-04(Fri) 19:34:32 +0900 Koichi Sasada <ko1@atdot.net>
-
- * rb/insns2vm.rb : fix category (comment)
-
- * depend : remove space betweeen target name and colon
-
-
-2005-03-04(Fri) 15:55:51 +0900 Koichi Sasada <ko1@atdot.net>
-
- * tmpl/yarvarch.ja : fix typo
-
-
-2005-03-04(Fri) 13:30:19 +0900 Koichi Sasada <ko1@atdot.net>
-
- * depend : add a rule for jitcompile.o
-
- * vm.h : fix a macro argument
-
- * version.h : 0.2.0
-
-
-2005-03-03(Thu) 08:35:14 +0900 Koichi Sasada <ko1@atdot.net>
-
- * extconf.rb : remove vm_evalbody.inc call_cfunc.inc from clean target
-
-
-2005-03-03(Thu) 00:54:15 +0900 Koichi Sasada <ko1@atdot.net>
-
- * tmpl/insns.inc.tmpl : fixed typo
-
- * insns.def : store th->pc to current pc
-
-
-2005-03-03(Thu) 00:31:47 +0900 Koichi Sasada <ko1@atdot.net>
-
- * tmpl/yarvarch.ja, doc/yarv.rb : write current architecture of yarv
-
-
-2005-03-01(Tue) 13:50:04 +0900 Koichi Sasada <ko1@atdot.net>
-
- * yarvcore.c (yarvcore_eval_parsed) : added
- (separeted from yarvcore_eval)
-
- * yarvcore.c, compile.c : iseq_translate_direct_threaded_code
- is moved to compile.c
-
- * depend : add rule for yasmdata.rb
-
- * rb/yasm.rb : support top-level and method-level assemble
-
-
-2005-02-26(Sat) 08:09:57 +0900 Koichi Sasada <ko1@atdot.net>
-
- * rb/insns2vm.rb, compile.c, vm.h : change type long to OFFSET
-
- * tmpl/yasmdata.rb.tmpl : added
-
- * rb/insns2vm.rb : add yasmdata_rb method
-
- * rb/yasm.rb : fix some interface (incomplete)
-
- * compile.c : iseq_setup added
-
- * yarvcore.c : YARVCore::InstructionSequence::Instruction#make added
-
-
-2005-02-24(Thu) 07:45:37 +0900 Koichi Sasada <ko1@atdot.net>
-
- * rb/yasm.rb : added
-
-
-2005-02-24(Thu) 01:13:33 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c : remove useless statements
-
-
-2005-02-24(Thu) 00:46:44 +0900 Koichi Sasada <ko1@atdot.net>
-
- * rb/insns2vm.rb (InsnInfo) : add @is_sc attr and remove
- is_sc method
-
- * compile.c : fix NODE_CASE/NODE_WHEN bug (cond at 'when'
- must not be popped)
-
- * compile.c : support NODE_OP_ASGN1 to &&= and ||=
-
- * test/test_bin.rb : add tests for above
-
-
-2005-02-23(Wed) 09:17:01 +0900 Koichi Sasada <ko1@atdot.net>
-
- * vm.c, yarvcore.c : thread_svar added and fix svar location
-
-
-2005-02-21(Mon) 08:38:02 +0900 Koichi Sasada <ko1@atdot.net>
-
- * yarvcore.h : make type "struct iseq_compile_data"
-
- * yarvcore.h : iseq_object#insn_info_ary to iseq_object#insn_info_tbl
-
-
-2005-02-21(Mon) 05:24:01 +0900 Koichi Sasada <ko1@atdot.net>
-
- * yarvcore.c (compile_string) : remove null check of node
-
-
-2005-02-19(Sat) 03:52:45 +0900 Koichi Sasada <ko1@atdot.net>
-
- * version.h : 0.1.1
-
-
-2005-02-18(Fri) 20:57:18 +0900 Koichi Sasada <ko1@atdot.net>
-
- * yarvcore.h, yarvcore.c : add idLTLT, idMethodMissing
-
- * compile.c : suopport lval (or others) block parameter
-
- * test/test_block.rb : add tests for above
-
- * insns.def (send) : support method_missing
-
- * test/test_method.rb : add tests for above
-
- * insns.def : opt_ltlt and
-
-
-2005-02-18(Fri) 08:54:40 +0900 Koichi Sasada <ko1@atdot.net>
-
- * benchmark/runc.rb : added
-
- * benchmark/contrib/pentomino.rb : added opt_ltlt
- and Float, String plus specialization
-
-
-2005-02-18(Fri) 07:49:42 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c : remove debug print
-
- * rb/aotcompile.rb : skip if yarvcore.so is not created
-
-
-2005-02-18(Fri) 06:46:13 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c : fix block passing
- and block argument
-
-
-2005-02-18(Fri) 05:52:41 +0900 Koichi Sasada <ko1@atdot.net>
-
- * vm.c : thread_get_ev_const, thread_get_ev_defined is added
- (separated from insns.def)
-
- * insnhelper.h : GET_EV_KLASS(klass) is added
- (separated from insns.def)
-
- * yarvcore.h, insns.def, compile.c : support defined? expression (limited)
-
- * test/test_syn.rb : tests for above is added
-
- * compile.c, insns.def : support block passed method dispatch
-
- * test/test_method.rb : tests for above is added
-
- * compile.h : CALL_ARGS_SPLAT is removed
-
-
-2005-02-16(Wed) 13:32:37 +0900 Koichi Sasada <ko1@atdot.net>
-
- * disasm.c : fix ID to String method
-
- * compile.c : NODE_SUPER, NODE_ZSUPER check 'poped'
- and NODE_RETURN check outer type
- and NODE_DREGX_ONCE supported (temporarily)
-
- * test/test_syn.rb : add a test
-
- * test/test_jump.rb : add a test
-
-
-2005-02-16(Wed) 06:07:41 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.[hc] : use Symbol instead of Fixnum to represent ID
-
- * rb/insns2vm.rb : add attr_reader :insns, :insn_map
-
- * vm.h, rb/insns2vm.rb : END_INSN have one arg
-
- * jitcompile.c : jit compiler framework (experimental)
-
- * rb/aotcompile.rb : refactoring
-
- * compiled.c : add constant pool
-
- * vm_evalbody.inc, call_cfunc.inc, vm.c : separeted from vm.c
-
- * insns.def : fix return val
-
- * depend : add rules for compiled.o
-
-
-2005-02-14(Mon) 13:09:01 +0900 Koichi Sasada <ko1@atdot.net>
-
- * insnhelper.h, yarvcore.h: move YARV_METHOD_NODE to yarvcore.h
-
- * yarvcore.h : add 2 members jit_compiled and iseq_orig
- to struct iseq_object
-
- * yarvcore.c : add yarv_jitcompile and global function jitcompile
-
- * insns.def : insn opt_call_native_compiled added
-
- * jitcompile.c : added
-
-
-2005-02-12(Sat) 05:38:51 +0900 Koichi Sasada <ko1@atdot.net>
-
- * insns.def (putstring) : fixed to duplicate string object
-
- * rb/insns2vm.rb, tmpl/optunifs.inc.tmpl, compile.c : support
- instructions unification (aka super instruction)
-
- * opt_insn_unif.def : added for above
-
- * benchmark/bm_unif1.rb : added to measure efficiency of unification
-
- * depend : fixed for above
-
- * extconf.rb : add option --(enable|disalbe)-opt-insns-unification
-
-
-2005-02-11(Fri) 12:14:39 +0900 Koichi Sasada <ko1@atdot.net>
-
- * yarvcore.c, vm.c, insns.def : permit to access svar from
- cfunc environment
-
- * test/test_method.rb : add tests for above
-
-
-2005-02-09(Wed) 19:31:06 +0900 Koichi Sasada <ko1@atdot.net>
-
- * ite.rb : added (ruby -rite [script file])
-
-
-2005-02-09(Wed) 02:25:43 +0900 Koichi Sasada <ko1@atdot.net>
-
- * yarvcore.[hc] : add member compile_data (hash) to iseq_object
-
- * compile.c, yarvcore.h : check label is already set
-
- * compile.c, extconf.rb : support __goto__ and __label__ statement
-
-
-2005-01-25(Tue) 12:49:27 +0900 Koichi Sasada <ko1@atdot.net>
-
- * test/test_block.rb : add break test to test_times
-
-
-2005-01-25(Tue) 03:34:04 +0900 Koichi Sasada <ko1@atdot.net>
-
- * extconf.rb : check ruby version if yarv patch is applied or not
-
- * evalc.patch : fixed for rb_call_super and above check
-
-
-2005-01-25(Tue) 03:21:48 +0900 Koichi Sasada <ko1@atdot.net>
-
- * rb/insns2vm.rb : refactoring (mainly, make InsnsDef::InsnInfo
- to represent each instruction information)
-
- * depend, rb/makedocs.rb : fixed for above
-
- * yarvcore.c (thread_call_super) : added
-
- * vm.c (thread_call_super) : added
-
- * vm.h : add struct cmethod_info
-
- * insns.def, vm.c : use cmethod_info to represent C method info
-
- * insns.def : use iseq_object#klass_nest_stack
- to search super/zsuper's class
-
- * prosym.rb : removed
-
- * ToDo : write todo things on wiki
-
-
-
-2005-01-18(Tue) 23:44:47 +0900 Koichi Sasada <ko1@atdot.net>
-
- * benchmark/run.rb : check ENV['RUBY'] to use ruby binary
-
-
-2005-01-10(Mon) 08:44:40 +0900 Koichi Sasada <ko1@atdot.net>
-
- * version.h : 0.1.0
-
-
-2005-01-09(Sun) 22:01:29 +0900 Koichi Sasada <ko1@atdot.net>
-
- * repository : svn propset svn:eol-style native *.c *.h tmpl/*.tmpl
-
-
-2005-01-09(Sun) 21:48:38 +0900 Koichi Sasada <ko1@atdot.net>
-
- * yarvcore.c : FREE_UNLESS_NULL, MARK_UNLESS_NULL macros are added
-
- * yarvcore.c : some insn/label methods are added
-
- * yarvcore.h : add structure menber "insns_ary" to iseq_object
-
- * vm.c, insns.def (thread_eval_body) : return values with throw
-
- * prosym.rb : added
-
- * insns.def : add YARV_AOT_COMPILED and some procedure
-
- * depend : add compiled.c
-
- * compiled.c : added to build compiled Ruby program (C source)
- by AOT compiler
-
- * rb/aotcompile.rb : AOT compiler
-
- * aotct.rb, rb/aotctest.rb : test and benchmark AOT compiler
-
- * rb/allload.rb : added
-
-
-2005-01-09(Sun) 08:30:38 +0900 Koichi Sasada <ko1@atdot.net>
-
- * yarvcore.c (yarv_yield_values) : added
-
- * vm.c (thread_call0) : change interface. substitute rb_call0 in
- yarv environment
-
- * yarvcore.c (yarv_call0) : fix for above
-
- * yarvcore.c (yarv_call0_cfunc) : removed
-
- * yarvcore.c : change passing items for yarv_setup
-
- * evalc.patch : fix for above
-
- * benchmark/bm_lists.rb : fix (unsupport block passing)
-
- * benchmark/run.rb : use full path to ruby
-
- * insns.def (yield): raise error if argc > expected argc
-
-
-2005-01-08(Sat) 16:07:48 +0900 Koichi Sasada <ko1@atdot.net>
-
- * extconf.rb : add descrioptions
-
- * compile.c : fix bugs (getinlinecache operands)
-
- * yarvcore.c : initial value of yarvGlobalStateVersion
- to 1
-
-
-2005-01-08(Sat) 14:39:04 +0900 Koichi Sasada <ko1@atdot.net>
-
- * yarvcore.c, vm.c, evalc.patch : support making backtrace
- (incompatible with current ruby interpreter)
-
-
-2005-01-08(Sat) 11:25:46 +0900 Koichi Sasada <ko1@atdot.net>
-
- * evalc.patch : commit for previous commit change
-
- * yarvcore.h, compile.c, insns.def : MC to IC (inline cache),
- and changed to using IC by set/getinlinecache
-
-
-2005-01-08(Sat) 10:04:33 +0900 Koichi Sasada <ko1@atdot.net>
-
- * yarvcore.c : add global variable sym[IC]FUNC
-
- * yarvcore.c (yarv_iterate, yarv_call0_cfunc) : added
- (each called from rb_iterate, rb_call0 with NODE_CFUNC)
-
- * vm.c (stack_dump_raw) : fixed to prints more detail
-
- * vm.c (stack_dump_th, stack_dump_thobj) : added to
- dumps thread_object states (for VALUE, struct pointer)
-
- * vm.c (thread_dump_regs) : added
-
- * vm.c (thread_call0, thread_call0_cfunc, thread_invoke_yield,
- thread_invoke_yield_cfunc), insns.def (yield, send) :
- fixed, added to support IFUNC
-
- * vm.c, yarvcore.c, insns.def : change type purpose
- thread_object#block_ptr (it holds IFUNC block information,
- so this type was changed to 'NODE *')
-
- * vm.c (stack_dump_each) : fixed for above
-
- * test/test_block.rb (test_ifunc) : test for above
-
- * vm.c (get_block_objec, thread_make_env_object) : fixed bugs
-
- * test/test_bin.rb (test_xstr) : remove `ls` test
-
-
-2005-01-06(Thu) 21:35:18 +0900 Koichi Sasada <ko1@atdot.net>
-
- * yarv : trying to support NODE_IFUNC (rb_iterate)
-
-
-2005-01-05(Wed) 06:50:42 +0900 Koichi Sasada <ko1@atdot.net>
-
- * yarvcore.h, insns.def, disasm.c, rb/insns2vm.rb, compile.[ch] :
- support inline method cache
-
- * extconf.rb : add -*-inline-method-cache (default: enable)
-
- * test/test_method.rb : add a test for above
-
- * benchmark/bm_poly_method.rb : added
-
- * yarvcore.c : add option string
-
-
-2005-01-04(Tue) 17:15:41 +0900 Koichi Sasada <ko1@atdot.net>
-
- * insns.def, compile.c : add compile_array and duparray insn
- to optimize only literal array creation
-
- * benchmark/bm_array.rb : added
-
-
-2005-01-04(Tue) 10:02:40 +0900 Koichi Sasada <ko1@atdot.net>
-
- * README : fix version
-
-
-2005-01-04(Tue) 09:57:25 +0900 Koichi Sasada <ko1@atdot.net>
-
- * ToDo : reflect current status
-
-
-2005-01-04(Tue) 09:43:54 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c : support NODE_VALUES, NODE_ARGSCAT, NODE_SPLAT
-
- * test/test_massign.rb : add tests for above
-
- * benchmark/bm_swap.rb : added
-
-
-2005-01-04(Tue) 06:25:45 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.h : COMPILE_ERROR break contol (instead of return)
-
- * compile.c : support NODE_MASGN
-
- * insns.def : change expandarray for massign and add topn insn
-
- * test/test_massign.rb : added
-
-
-2005-01-03(Mon) 21:20:28 +0900 Koichi Sasada <ko1@atdot.net>
-
- * vm.c : store block when create proc
-
- * test/test_proc.rb : add a test for above change
-
- * yarvcore.c : add global function "once"
-
-
-2005-01-02(Sun) 00:40:08 +0900 Koichi Sasada <ko1@atdot.net>
-
- * benchmark/bm_super.rb : fix bug (remove infinite loop)
-
-
-2005-01-01(Sat) 23:45:49 +0900 Koichi Sasada <ko1@atdot.net>
-
- * benchmark/bm_z?super.rb : added
-
-
-2005-01-01(Sat) 23:37:38 +0900 Koichi Sasada <ko1@atdot.net>
-
- * benchmark/bmx_so_object.rb : rename to benchmark/bm_so_object.rb
-
-
-2005-01-01(Sat) 23:19:02 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c : support NODE_OP_ASGN2, NODE_OP_ASGN_AND, NODE_OP_ASGN_OR,
- NODE_SUPER, NODE_ZSUPER, NODE_MATCH
-
- * insns.def : support super, zsuper (currently, super can't
- handle with block)
-
- * test/test_bin.rb : add test for op_asgin2, op_assgin_and/or
-
- * test/test_class.rb : add test for super, zsuper
-
-
-2005-01-01(Sat) 20:39:29 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c : support NODE_MATCH
-
- * yarvcore.c : fix yarv_svar bug (fix condition boundary)
-
- * insnhelper.h : save cfp/lfp/dfp vars to thread_object (th)
-
-
-2005-01-01(Sat) 20:03:10 +0900 Koichi Sasada <ko1@atdot.net>
-
- * version.h : 0.0.1
-
- * yarvcore.h : add idIntern declaration
-
- * insns.def : add getspecial, setspecial.
- implement getclassvariable, setclassvariable.
- store lfp before reg match (opt_regexpmatch1)
-
- * compile.c : support ditto, flipflop
-
- * yarvcore.c : support svar
-
- * test/test_syn.rb : add test for flipflop
-
- * test/test_bin.rb : add test for dsym, cvar, backref
-
-
-2005-01-01(Sat) 09:09:32 +0900 Koichi Sasada <ko1@atdot.net>
-
- * insns.def : add getspecial insn
-
- * compile.c : support NODE_NTH_REF, NODE_BACK_REF
-
-
-2005-01-01(Sat) 06:53:38 +0900 Koichi Sasada <ko1@atdot.net>
-
- * insns.def, compile.c : support alias, undef
-
- * test/test_method.rb : test for above
-
- * rb/insns2vm.rb : fix enbug
-
-
-2005-01-01(Sat) 06:00:32 +0900 Koichi Sasada <ko1@atdot.net>
-
- * test/test_jump.rb : add test (next with value)
-
- * yarvcore.h, yarvcore.c, compile.c, compile.h :
- raise compile error exception instead of rb_bug
-
- * yarvcore.c, evalc.patch : support "require"
-
- * test.rb : restore $" after evaluation with ruby
-
- * rb/insns2vm.rb : remove unnecesary each
-
-
-2004-12-17(Fri) 18:56:38 +0900 Koichi Sasada <ko1@atdot.net>
-
- * insns.def : fix newhash
-
-
-2004-12-15(Wed) 13:29:27 +0900 Koichi Sasada <ko1@atdot.net>
-
- * yarvcore.c : add version string
-
- * compile.c : fix rescure clause bug
-
-
-2004-12-14(Tue) 22:46:30 +0900 Koichi Sasada <ko1@atdot.net>
-
- * insns.def : add reput insn
-
- * vm.h : show stack cache registers when stack dump
-
- * rb/insns2vm.rb, compile.c : fix stack caching bugs
-
-
-2004-12-14(Tue) 00:51:58 +0900 Koichi Sasada <ko1@atdot.net>
-
- * insns2vm.rb, compile.c, tmpl/opt_sc.inc.tmpl : fix bugs
-
- * rb/mixc-asm.rb : added
-
-
-2004-12-14(Tue) 00:17:02 +0900 Koichi Sasada <ko1@atdot.net>
-
- * yarvcore.h, yarvcore.c, compile.c : fix SC bugs
- (SC state management)
-
- * extconf.rb : add option -[enable|disable]-opt-stack-caching
-
- * insns2vm.rb : accept CPPFLAGS options
-
- * vm.c : support restrore register for pc
-
-
-2004-12-13(Mon) 16:53:42 +0900 Koichi Sasada <ko1@atdot.net>
-
- * rb/insns2vm.rb : add macro INSN_IS_SC()
-
-
-2004-12-11(Sat) 10:51:44 +0900 Koichi Sasada <ko1@atdot.net>
-
- * insns.def, compile.c : support singleton method definition
-
- * test/test_method.rb : add test for above
-
-
-2004-12-11(Sat) 03:17:54 +0900 Koichi Sasada <ko1@atdot.net>
-
- * benchmark/*.rb : modify
-
- * extconf.rb : add $cleanfiles
-
-
-2004-12-08(Wed) 13:01:38 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c, insns.def : change to disable stack caching
-
-
-2004-12-07(Tue) 19:37:13 +0900 Koichi Sasada <ko1@atdot.net>
-
- * rb/insns2vm.rb : add default after
-
- * insns.def : fix to work on stack caching
-
-
-2004-12-07(Tue) 15:07:13 +0900 Koichi Sasada <ko1@atdot.net>
-
- * depend : add some dependency to *.inc files
-
- * vm.c : add "register" and asm("regname") descriptor
-
- * rb/insns2vm.rb, compile.c : add stack caching support
-
- * tmpl/opt_sc.inc.tmpl : added to above change
-
- * rb/makedocs.rb : fix file path
-
- * extconf.rb : fix option selection
-
-
-2004-12-06(Mon) 11:20:11 +0900 Koichi Sasada <ko1@atdot.net>
-
- * extconf.rb : add vm.asm target if compiler is gcc
-
-
-2004-12-06(Mon) 09:56:24 +0900 Koichi Sasada <ko1@atdot.net>
-
- * vm.h : rename method_frame's member block to block_ptr
-
- * extconf.rb : add "-fno-crossjumping" option when compiler
- is gcc
-
- * opt_operand.def : add unification insn send
-
- * rb/insns2vm.rb : define symbol instead of declare const
- variable (for more optmize on VC)
-
- * insns.def : move enter point in send
-
-
-2004-12-06(Mon) 04:53:51 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c, opt_operand.def, rb/insns2vm.rb, depend :
- support operand unification
-
-
-2004-12-05(Sun) 03:16:10 +0900 Koichi Sasada <ko1@atdot.net>
-
- * vm.c, insns.def : speed up throw/catch scheme
-
-
-2004-12-05(Sun) 01:47:05 +0900 Koichi Sasada <ko1@atdot.net>
-
- * vm.c : fix catch handler bugs
-
- * test/test_jump.rb : test_complex_jump added
-
-
-2004-12-03(Fri) 20:39:05 +0900 Koichi Sasada <ko1@atdot.net>
-
- * benchmark/contrib/mcq.rb : added
- (from URABE Syouhei)
-
-
-2004-12-03(Fri) 20:35:28 +0900 Koichi Sasada <ko1@atdot.net>
-
- * vm.c : support break in rb_yield block
-
-
-2004-12-03(Fri) 14:26:35 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c : support block local variable in current
- ruby specification (patche from Kent Sibilev)
-
- * insns.def : support attr_* (patch from Kent Sibilev)
-
-
-2004-12-02(Thu) 21:04:27 +0900 Koichi Sasada <ko1@atdot.net>
-
- * opt_operand.def : added
-
-
-2004-12-02(Thu) 13:20:41 +0900 Koichi Sasada <ko1@atdot.net>
-
- * yarvcore.c, vm.h, vm.c, insns.def, insnhelper.h, yarvutil.rb :
- add usage analisys framework
-
- * disasm.c : insn_operand_intern to separate function
-
- * benchmark/run.rb : run each benchmark on another process
-
-
-2004-12-01(Wed) 10:26:49 +0900 Koichi Sasada <ko1@atdot.net>
-
- * vm.c : yield check block is given
-
- * benchmark/bm_lists.rb : rename to bmx_lists.rb
- (because it's not work ... bug?)
-
- * insns.def : opt_* support other type calc
-
-
-2004-11-30(Tue) 16:14:54 +0900 Koichi Sasada <ko1@atdot.net>
-
- * benchmark/bm_so_array.rb : added
-
- * benchmark/bm_so_matrix.rb : added
-
-
-2004-11-30(Tue) 14:11:30 +0900 Koichi Sasada <ko1@atdot.net>
-
- * rb/getrev.rb : added
-
- * yarvcore.c : add YARVCore::REV, YARVCore::DATE constant
-
-
-2004-11-30(Tue) 13:05:42 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c : support NODE_OP_ASGN1 (incomplete)
-
- * insns.def : add dupn
-
-
-2004-11-30(Tue) 08:52:01 +0900 Koichi Sasada <ko1@atdot.net>
-
- * version.h : 0.0.0.f
-
-
-2004-11-30(Tue) 08:43:59 +0900 Koichi Sasada <ko1@atdot.net>
-
- * test/test_class.rb : add test_initialize and test_to_s
-
- * yarvsubst.c : use rb_funcall instead of yarv_funcall
-
- * evalc.patch : fix ruby's patch
-
- * benchmark/bm_so_*.rb : change naming rule. "bm_so_*" from
- language shootout
-
- * depend : tbench target item is ITEM env val (default: bmx_temp)
-
- * vm.c : show raw address if environment is in heap at dumping stack trace
-
- * vm.c : thread_call0 added
-
- * vm.c : fix thread_yield_light_invoke
-
- * yarv.h, yarvcore.c : remove yarv_funcall
-
-
-2004-11-29(Mon) 11:37:08 +0900 Koichi Sasada <ko1@atdot.net>
-
- * test/test/test_proc.rb : add test test_nestproc
-
- * yarvsubst.c : comment out yarv_Array_each
-
- * insns.def : restore lfp/dfp after call_cfunc
-
- * vm.c : fix stack dump routine
-
- * vm.c : impliment thread_funcall (temporarily)
-
- * yarv.h : add IS_YARV_WORKING(), SET_YARV_START(), SET_YARV_STOP()
-
- * yarvcore.c : remove check with yarv_in_work
-
- * evalc.patch : added
-
-
-2004-11-27(Sat) 00:19:52 +0900 Koichi Sasada <ko1@atdot.net>
-
- * yarvcore.c : free -> ruby_xfree
-
-
-2004-11-26(Fri) 02:11:11 +0900 Koichi Sasada <ko1@atdot.net>
-
- * vm,c : fix bug
-
-
-2004-11-22(Mon) 11:19:48 +0900 Koichi Sasada <ko1@atdot.net>
-
- * benchmark/bm_ackermann.rb, bm_proc.rb, bm_simpleiter.rb,
- bm_so_exception.rb, bm_wc.rb, wc.input added
-
-
-2004-11-22(Mon) 02:31:56 +0900 Koichi Sasada <ko1@atdot.net>
-
- * test/test_proc.rb : add some test
-
- * yarvcore.c, vm.c : support yield in C method (as rb_yield)
-
- * vm.c (thread_yield_light_(prepare|invoke)) : support lightweight
- yield
-
- * yarv.h : added
-
- * yarvcore.c, yarv.h : support yarv_is_working, yarv_block_given_p,
- yarv_yield, yarv_funcall (only dummy function)
-
- * vm.c : thread_eval_body changed return value
-
- * yarvsubst.c : added and add yarv_Integer_times, yarv_Array_each
-
- * yarvcore.h : block_ptr is added to struct thread_object
-
- * insns.def : pass block when C method call
-
- * insnhelper.h : add GET_ISEQOBJ(cfp) macro
-
-
-2004-11-21(Sun) 07:25:49 +0900 Koichi Sasada <ko1@atdot.net>
-
- * vm.c : support Proc#call
-
- * test/test_proc.rb : added
-
-
-2004-11-19(Fri) 18:04:10 +0900 Koichi Sasada <ko1@atdot.net>
-
- * insns.def, vm.c : support creating Proc object
-
-
-2004-11-15(Mon) 14:19:27 +0900 Koichi Sasada <ko1@atdot.net>
-
- * insns.def (send) : use clear_local_size to specify
- clear local table vars.
-
- * insns.def : block represent data shares lfp, dfp with frame data
-
-
-2004-11-13(Sat) 18:19:41 +0900 Koichi Sasada <ko1@atdot.net>
-
- * yarvcore.h, insns.def : add VM_CALL_ARGS_SPLAT_BIT and
- VM_CALL_ARGS_BLOCKARG_BIT
-
- * compile.c, compile.h : add ADD_SEND, ADD_SEND_R
-
-
-2004-11-10(Wed) 08:26:25 +0900 Koichi Sasada <ko1@atdot.net>
-
- * add "vm_" prefix to (block_object, proc_object, env_object)
-
-
-2004-11-03(Wed) 15:52:14 +0900 Koichi Sasada <ko1@atdot.net>
-
- * yarvcore.h, yarvcore.c, disasm.c, compile.c, insns.def, vm.c :
- fix to move x86_64 (illegal cast, etc)
-
-
-2004-11-01(Mon) 04:45:54 +0900 Koichi Sasada <ko1@atdot.net>
-
- * yarvcore.h, compile.c, debug.c, version.h :
- redesgin gc debug scheme (GC_CHECK())
-
- * yarvcore.c : mark iseqobj->current_block on GC
-
- * insns.def, compile.c : last "throw" in ensure/rescue block
- use operand throwobj and before this insn, use "getdynamic 0, 1"
-
- * benchmark/bm_temp.rb : move to benchmark bmx_temp.rb
-
- * depend : change some targets
-
-
-2004-10-25(Mon) 19:57:58 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c : push exception iseq to iseqobj->iseq_mark_ary
- to mark for GC
-
-
-2004-10-10(Sun) 16:25:03 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c : remove $_, $' area from method local frame
- and provide that's special method local variables pointer(LFP[-1])
-
- * disasm.c : change environment showing format
-
- * yarvcore.(h|c) : add YarvProc, YarvEnv
-
- * yarvcore.h : add arg_block field to iseq_object
- and init -1 as default value
-
-
-2004-09-30(Thu) 19:50:48 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c, insns.def : support passing splat argument
-
- * compile.c, insns.def : support rest argument
-
- * compile.c, insns.def : support optional argument initializer
-
- * test/test_method.rb : add tests for above
-
-
-2004-09-29(Wed) 10:50:03 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c : fix rescue clause popped
-
- * benchmark/bm_random.rb : move to benchmark/bmx_random.rb
-
-
-2004-09-29(Wed) 01:25:35 +0900 Koichi Sasada <ko1@atdot.net>
-
- * many many files: change stack frame design
-
-
-2004-09-16(Thu) 08:51:37 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c, yarvcore.h : support 'return' from method
- in ensure clause
-
-
-2004-09-13(Mon) 21:56:40 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c : support inline cache constant access
- on NODE_COLON2, NODE_COLON3
-
- * depend : add 'vtest' rule(verbose test)
-
-
-2004-09-13(Mon) 10:58:44 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c, yarvcore.h : support redo/next/break in
- while/until
-
-
-2004-09-13(Mon) 08:50:19 +0900 Koichi Sasada <ko1@atdot.net>
-
- * test/test_jump.rb : added(correctly)
-
- * benchamark/bm_(ensure|rescue|simplereturn).rb added
-
-
-2004-09-12(Sun) 23:30:20 +0900 Koichi Sasada <ko1@atdot.net>
-
- * test/test_jump.rb : added
-
- * insns.def, compile.c : add 'putnil' insn
-
- * compile.c : use '===' when rescue check
-
- * insns.def : remove 'rescuecheck' insn
-
- * compile.c : support retry in begin/rescue clause
-
- * ToDo : added
-
-
-2004-09-08(Wed) 12:34:04 +0900 Koichi Sasada <ko1@atdot.net>
-
- * yarvcore.h, yarvcore.c : add idThrow*
-
- * insns.def, compile.c, vm.c : support retry, break,
- next, redo, return(imcomplete)
-
-
-2004-09-03(Fri) 13:40:08 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c : add nop after rescue body
-
- * insns.def, vm.c : support stack rewind when thrown
-
-
-2004-09-01(Wed) 17:31:01 +0900 Koichi Sasada <ko1@atdot.net>
-
- * test/test_exception.rb : added
-
-
-2004-09-01(Wed) 13:15:14 +0900 Koichi Sasada <ko1@atdot.net>
-
- * vm.c, insns.def : implementing exception handling
-
-
-2004-09-01(Wed) 00:18:54 +0900 Koichi Sasada <ko1@atdot.net>
-
- * insns.def : add 'throw' insn
-
- * compile.c : support 'rescue' and 'ensure' clause
-
- * yarvcore.c, yarvcore.h : add 'catch_table' to iseq_struct
-
-
-2004-08-30(Mon) 19:06:12 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.h : NEW_ISEQOBJ don't pass self as parent
-
- * compile.c : use NEW_CHILD_ISEQOBJ explicitly
-
-
-2004-08-29(Sun) 21:09:55 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c : trying to implement rescue/ensure
-
- * insns.def : fix yield bug(lfp, dfp link)
-
-
-2004-08-28(Sat) 13:52:15 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c : fix dvar bug
-
- * test/test_block.rb : add test
-
- * insns.def, insnhelper.h : remove unused source code
-
-
-2004-08-28(Sat) 08:51:26 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c : support NODE_DASGN
-
- * test/test_block.rb : add test
-
-
-2004-08-28(Sat) 08:13:04 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c, insns.def : support access to instance variable
-
- * test/test_class.rb : add test of instance variable
-
- * benchmark/bm_block.rb : added
-
-
-2004-08-28(Sat) 07:48:43 +0900 Koichi Sasada <ko1@atdot.net>
-
- * test/test_block.rb : fix block parameter name
-
-
-2004-08-28(Sat) 07:27:52 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c, insns.def : support method call with block
- and yield and add some functions
-
- * compile.c, insns.def : support dynavars accessor
-
- * test/test_block.rb : added
-
- * vm.c : fix block parameter stack dump
-
-
-2004-08-27(Fri) 23:56:47 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c(iseq_compile) : remove parameter iseqtype
- (this information can access via self)
-
-2004-08-27(Fri) 17:13:35 +0900 Koichi Sasada <ko1@atdot.net>
-
- * test/test_bin.rb : add test(absolute path constant)
-
- * yarvcore.h, compile.c(iseq_compile) : change parameter
-
- * insns.def(classdef) : fix bug
-
-
-2004-08-27(Fri) 04:53:13 +0900 Koichi Sasada <ko1@atdot.net>
-
- * insns.def : support setconstant, getconstant, classdef,
- moduledef
-
- * vm.h : fix debug levels and so on
-
- * vm.h : foo_WORD -> foo_WC
-
- * test/test_class.rb : added
-
-
-2004-08-25(Wed) 17:51:50 +0900 Koichi Sasada <ko1@atdot.net>
-
- * insns.def : fix getconstant/setconstant/classdef
-
-
-2004-08-25(Wed) 14:27:10 +0900 Koichi Sasada <ko1@atdot.net>
-
- * debug.[ch] : added
-
- * compile.c, disasm.c : use debug interface
-
- * compile.c : support some nodes
-
- * compile.c, rb/insns2vm.rb : remove TS_CPATH
-
- * insns.def : modify classdef/moduledef/singletonclassdef
- and add popcref
-
- * and others...
-
-
-2004-08-18(Wed) 20:16:45 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c : fix case/when statement with empty else clause
-
- * insns.def : enable compile
-
- * yarvcore.h : add class search path scheme
-
- * test/test_syn.rb : add switch/case test case
-
- * tmpl/yarvarch.ja : update documents
-
-
-2004-05-22(Sat) 01:30:44 +0900 Koichi Sasada <ko1@atdot.net>
-
- * yarvutil.rb : add eval_in_wrap
-
- * test/test_*.rb : change to use eval_in_wrap
-
-
-2004-05-20(Thu) 02:50:32 +0900 Koichi Sasada <ko1@atdot.net>
-
- * support global variables
-
- * benchmark/bm_*.rb : add some benchmarks
-
- * compile.c : support NODE_ATTRASGN
-
- * compile.c : add debugi(...)
-
-
-2004-05-19(Wed) 23:19:38 +0900 Koichi Sasada <ko1@atdot.net>
-
- * test/test_method.rb : added
-
-
-2004-05-19(Wed) 22:56:09 +0900 Koichi Sasada <ko1@atdot.net>
-
- * insns.def : fix typo
-
- * benchmark/run.rb : sort benchmark order by filename
-
- * extconf.rb : use --enable/disable-xxx
-
- * version.h : ditto(don't touch to change yarv options)
-
-
-2004-05-19(Wed) 21:18:55 +0900 Koichi Sasada <ko1@atdot.net>
-
- * yarvutil.rb : added
-
- * test.rb, test/*, benchmark/run.rb : use yarvutil.rb
-
- * version.h : USE_OPTIMIZED_REGEXP_MATCH added
-
- * yarvcore.h : add idEqTilde
-
- * yarvcore.c(yarvcore_parse, yarvcore_eval) : require file and line
- parameter
-
- * test/test_bin.rb : add regexp test
-
- * benchmark/bm_regexp.rb : added
-
-
-2004-05-19(Wed) 13:57:31 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c : add compile_dstr(self, node)
-
- * compile.c : support NODE_MATCH2, NODE_MATCH3, NODE_DXSTR
-
- * insns.def : add toregexp
-
-
-2004-05-18(Tue) 10:12:20 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c : support NODE_XDSTR
-
- * test/test_bin.rb : add test for above change
-
-
-2004-05-18(Tue) 09:46:33 +0900 Koichi Sasada <ko1@atdot.net>
-
- * insns.def(send) : store regs before call_cfunc
-
-
-2004-05-18(Tue) 08:55:17 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c : support NODE_DSTR, NODE_EVSTR
-
- * compile.c : support NODE_XSTR
-
- * insns.def : add tostring operation
-
- * rb/makedocs.rb : fix directory path
-
- * depend : add tbench rule
-
- * yarvcore.h : add 'exten ID idBackquote'
-
-
-2004-05-18(Tue) 00:09:48 +0900 Koichi Sasada <ko1@atdot.net>
-
- * version.h : add USE_OPTIMIZED_BASIC_OPERATION
-
- * yarvcore.h(struct thread_object) : add 'VALUE stat_insn_usage'
-
-
-2004-05-17(Mon) 11:28:55 +0900 Koichi Sasada <ko1@atdot.net>
-
- * version.h, insns.def, yarvcore.c : add FAKE_INLINE_METHOD_CACHE
-
-
-2004-05-17(Mon) 09:05:53 +0900 Koichi Sasada <ko1@atdot.net>
-
- * compile.c : fix generating opt_* insn process
-
-
-2004-05-17(Mon) 08:58:49 +0900 Koichi Sasada <ko1@atdot.net>
-
- * benchmark/(bm_tarai.rb, bm_fib.rb) : added
-
-
-2004-05-17(Mon) 08:20:12 +0900 Koichi Sasada <ko1@atdot.net>
-
- * benchmark/(bm_tak.rb, bm_reccount.rb) : added
-
- * insns.def : test method cache(incomplete)
-
- * insns.def : add expandarray insn
-
- * yarvcore.c(iseq_init) : add parameter 'parent'
-
-
-2004-05-17(Mon) 01:49:48 +0900 Koichi Sasada <ko1@atdot.net>
-
- * benchmark/run.rb, bm_factorial.rb, bm_whileloop.rb : added
-
- * insns.def(send) : set id to ruby_frame->orig_func
-
- * check behavior on mswin32 and cygwin
-
- * insns.def(send) : check stack overflow
-
-
-2004-05-16(Sun) 08:00:55 +0900 Koichi Sasada <ko1@atdot.net>
-
- * change frame structure(debugging)
-
-
-2004-05-14(Fri) 15:06:02 +0900 Koichi Sasada <ko1@atdot.net>
-
- * insns2vm.rb : support file name arguments
-
-
-2004-05-14(Fri) 04:33:09 +0900 Koichi Sasada <ko1@atdot.net>
-
- * insns.def : support (easy) constant
-
-
-2004-05-12(Wed) 01:51:48 +0900 Koichi Sasada <ko1@atdot.net>
-
- * rb/insns2vm.b : set directory prefix
-
- * disasm.c : fix bug
-
-
-2004-05-12(Wed) 00:00:17 +0900 Koichi Sasada <ko1@atdot.net>
-
- * vm.h, compiler.h, version.h : move *DEBUG defs to version.h
-
-
-2004-05-11(Tue) 23:00:11 +0900 Koichi Sasada <ko1@atdot.net>
-
- * vm.h, version.h, yarvcore.h : move gcc ver check to version.h
- and include version.h from yarvcore.h
-
-
-2004-05-11(Tue) 19:16:26 +0900 Koichi Sasada <ko1@atdot.net>
-
- * 0.0.0.d : imported
-
-
-Local variables:
-add-log-time-format: (lambda ()
- (let* ((time (current-time))
- (diff (+ (cadr time) 32400))
- (lo (% diff 65536))
- (hi (+ (car time) (/ diff 65536))))
- (format-time-string "%Y-%m-%d(%a) %H:%M:%S +900" (list hi lo) t)))
-indent-tabs-mode: t
-tab-width: 8
-end:
diff --git a/doc/NEWS-1.8.0 b/doc/NEWS-1.8.0
new file mode 100644
index 0000000000..b4445fa59f
--- /dev/null
+++ b/doc/NEWS-1.8.0
@@ -0,0 +1,837 @@
+= command line options
+
+: -W option
+
+ new option to specify warning level. -W0 to shut up warnings, -W1 for normal level,
+ -W2 for verbose level. -w equals to -W2.
+
+= language syntax
+
+: arbitrary delimited string array
+
+ %W(...) notation, word list literal like %w(...) with the
+ exception that #{} interpolation is allowed.
+
+: arbitrary delimited symbol literl
+
+ :"foo", :"foo#{bar}", etc.
+
+: expression interpolation in strings
+
+ Now arbitrary statements are allowed inside #{} interpolation
+ without escapes. In other hand, they can no longer access to
+ variables defined in eval.
+
+: negative number literals
+
+ Digits preceded minus sign is a literal integer.
+
+: array expansion
+
+ Fixed with the following behavior:
+
+ a = *[1]
+ p a #=> [1]
+
+ Now 1-element array in rhs is expanded properly.
+
+ a = *[1]
+ p a #=> 1
+
+: break and next
+
+ Extended to take an optional expression, which is used as a value
+ for termination.
+
+: direct assignment to Foo::Bar is allowed
+
+ also, you can define "class Foo::Bar; end".
+
+= language core
+
+: $stdin, $stdout, $stderr
+
+ can be assignable again. the original stdio are preserved as STDIN,
+ STDOUT, STDERR.
+
+: $VERBOSE now has 3 levels
+
+ nil - silence, false - medium (default), true - verbose
+
+: allocation framework
+
+ any instance of class can be allocated by class.allocate,
+ (except for a few classes).
+
+: comparison of exception classes in a rescue clause
+
+ changed to use Module#=== for comparing $! with the exception
+ class specified in each rescue clause.
+
+ as the previous behavior was to use kind_of?, the effect is limited
+ to the SystemCallError case. SystemCallError.=== has been newly
+ defined to return true when the two have the same errno. With this
+ change, SystemCallError's with the same errno, such as Errno::EAGAIN
+ and Errno::EWOULDBLOCK, can both be rescued by listing just one of
+ them.
+
+: constants lookup
+
+ improved at the performance of searching by using an internal hash
+ table.
+
+ calls const_missing method of the class/module, if constant is not
+ found in the look up path.
+
+: expression parenthesis in the first argument
+
+ altered to get the following code (note the space after p):
+
+ p ("xx"*2).to_i
+
+ Interpreted as:
+
+ p (("xx"*2).to_i)
+
+ Instead of:
+
+ (p("xx"*2)).to_i
+
+: implicit comparison in conditional expressions
+
+ Obsoleted except when it is used in -e.
+
+ : between Range and $.
+ Use explicit comparison instead.
+
+ : between Regexp and $_
+ Use the unary method ~/re/ instead.
+
+: to_str
+
+ added to get objects which define to_str() treated as String's.
+
+ now almost all the built-in methods try each argument with to_str()
+ when they expect it to be a String.
+
+ foo = Object.new
+ class <<foo
+ def to_str
+ "foo"
+ end
+ end
+ p File.open(foo)
+ => -:7:in `open': wrong argument type Object (expected String) (TypeError)
+ ruby 1.6.4 (2001-04-19) [i586-linux]
+ => -:7:in `open': No such file or directory - "foo" (Errno::ENOENT)
+ ruby 1.7.0 (2001-05-02) [i586-linux]
+
+: multiple assignment behavior
+
+ Fixed so that "*a = nil" results in "a == []".
+
+= changes in core class library
+
+: open
+
+ Extended so that when the third argument is permission flags it
+ calls open(2) instead of fopen(3).
+
+: sprintf
+
+ new format specifier "%p" is available.
+
+: lambda and proc
+
+ Proc object returns from these methods has the following attributes:
+
+ * strict argument number check
+ * break and return terminates the proc execution.
+
+: warn(message)
+
+ a method to give warnings.
+
+: abort()
+
+ takes optional terminate message argument.
+
+: Object#initialize_copy
+
+ copy constructor for clone and dup.
+
+: Object#instance_variable_set, Object#instance_variable_get
+
+ added.
+
+: Object#singleton_method_removed
+: Object#singleton_method_undefined
+
+ Added.
+
+: Array#transpose
+
+ added.
+
+: Array#fetch(index [, default])
+
+ Added. If a default value isn't given, raises index error if index
+ is out of range.
+
+: Array#insert(n, other, ...)
+
+ Added. [ruby-talk:14289]
+
+ This is much the same as (({ary[n,0] = [other,...]})) except
+ returing self.
+
+ ary = [0,1,2,3]
+ ary[2, 0] = [4, 5, 6]
+ p ary
+
+ ary = [0,1,2,3]
+ ary.insert(2, 4, 5, 6)
+ p ary
+
+: Array#sort!
+
+ Changed to always return self without checking whether the sequence
+ of the elements was modified or not.
+
+ Beware that this behavior is not guaranteed to continue in the
+ future. Do not rely on its return value. [ruby-dev:12506]
+
+: Array#filter
+
+ Previously deprecated, now removed. Use Array#collect!.
+
+: Array#pack, String#unpack
+
+ Allows comment in template strings.
+
+: Array#pack, String#unpack
+
+ New templates 'q' and 'Q' for 64bit integer (signed and unsigned respectively).
+
+: Array#new
+
+ Now takes block to fill initial values. E.g.
+
+ Array.new(10) { |i| i + 1 }
+ => [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
+
+: Array#fill
+
+ Takes block to get the values to fill.
+
+: Array#fetch
+
+ Takes block to get the default value.
+
+: Array#zip
+
+ added.
+
+: Hash#update
+
+ Takes block to resolve key conflict.
+
+: Hash#merge and Hash#merge!
+
+ update hash. Hash#merge! is a synonym of Hash#update.
+
+: String#split
+
+ if "sep" argument is a string, regular expression meta characters
+ are escaped internally.
+
+: String#rstrip
+
+ chop off NULs at the end of strings.
+
+: String#to_i
+
+ Now accepts optional base argument.
+
+ "101".to_i(10) => 101
+ "101".to_i(2) => 5
+ "101".to_i(8) => 65
+ "101".to_i(16) => 257
+
+ A base argument of 0 guesses at the base.
+
+ "101".to_i(0) => 101
+ "0b101".to_i(0) => 5
+ "0101".to_i(0) => 65
+ "0x101".to_i(0) => 257
+
+: String#[regexp, nth]
+
+ Extended to accepts optional second argument.
+
+ It tries match between self and REGEXP, then returns the
+ content of the NTH regexp register.
+
+: String#casecmp
+
+ Added. This is a case insensitive version of String#<=>.
+
+: String#chomp
+
+ If $/ == "\n", chops off last newlines (any of \n, \r, \r\n).
+
+: String#eql?
+
+ Changed to be always case sensitive.
+
+: String#insert(n, other)
+
+ Added.
+
+ This is much the same as (({str[n, 0] = other})) except returing
+ self.
+
+: String#lstrip, rstrip, lstrip!, rstrip!
+
+ Added. These strip only left or right part of a string.
+
+: String#match
+
+ Added.
+
+: String/Array methods
+
+ Returns an instance of receivers class.
+
+: String.new
+
+ The first argument becomes optional.
+
+: Symbol#intern
+
+ Added.
+
+: Symbol.all_symbols
+
+ Added. [ruby-dev:12921]
+
+: IO
+
+ 64bit off_t support by Janathan Baker.
+
+: IO#read
+: IO#sysread
+
+ takes optinal second argument for read buffer.
+
+: IO::sysopen
+
+ New method to get a raw file descriptor.
+
+: IO#sysseek
+
+ Added.
+
+: IO#fsync
+
+ new method that copies all in-memory parts of a file to disk and
+ waits until the device reports that all parts are on stable storage.
+ Implemented with fsync(2) or equivalent.
+
+: IO.open
+
+ Made public. Can only associate an IO object with a file number
+ like IO.new and IO.for_fd, but can take a block.
+
+: IO.for_fd
+
+ Added as a synonym for IO.new.
+
+: IO.read
+
+ Added. Like IO.readlines, except it returns the entire file as a
+ string. [ruby-talk:9460]
+
+: File#fnmatch, File::Constants::FNM_*
+
+ Added. Refer to the fnmatch(3) manpage for details.
+
+ Localism is FNM_DOTMATCH which has the opposite meaning of the
+ commonly known FNM_PERIOD, which does not exist in Ruby.
+
+ e.g.
+
+ # exclude files matching "*.bak" case-insensitively.
+ files.reject! {|fn| File.fnmatch?("*.bak", fn, File::FNM_CASEFOLD) }
+
+: File.lchmod
+: File.lchown
+
+ Added.
+
+: File.open, IO.open
+
+ File mode can be specified by flags like open(2),
+ e.g. File::open(path, File::CREAT|File::WRONLY).
+
+: Regexp#options
+
+ Added.
+
+: Regexp.last_match(n)
+
+ Extended to take an optional argument.
+
+: MatchData#captures
+
+ added.
+
+: Dir#path
+
+ Added.
+
+: Dir.chdir
+
+ Extended to take a block.
+
+: Dir.glob
+
+ Made to support meta-character escaping by a backslash. Wildcards
+ and spaces may now be escaped using a backslash.
+
+: Dir.open
+
+ Changed to return what the block returns when a block is given, just
+ as File.open does. (It always returned (({nil})) in 1.6 and
+ prior)
+
+: Dir.chdir
+
+ Changed to warn only when invoked from multiple threads or no block
+ is given. [ruby-dev:13823]
+
+ Dir.chdir('foo') {
+ Dir.chdir('bar') { # previously warned
+ puts Dir.pwd
+ }
+ }
+
+: Dir#pos=
+
+ Returns the new position instead of self.
+
+: Dir::glob
+
+ Now accepts optional FNM_* flags via the second argument, whereas
+ Dir::[] doesn't.
+
+ Dir.glob("makefile", File::FNM_CASEFOLD) #=> ['Makefile', 'makefile']
+
+: Class#inherited
+
+ Method is called when Class is inherited by another class.
+
+ class A; end
+ def A.inherited(by)
+ puts "A inherited by #{by.inspect}"
+ end
+ class B < A; end
+
+ Prints out "A inherited by B"
+
+: Module#include?
+
+ Added. [ruby-dev:13941]
+
+: Module#included
+
+ Added. This is a hook called after Module#append_feature.
+
+: Module#method_removed
+: Module#method_undefined
+
+ Added.
+
+: Module.new, Class.new
+
+ Extended to take block.
+
+: Time
+
+ Extended to accept a negative time_t. (Only when the platform
+ supports it)
+
+ p Time.at(-1)
+ => Thu Jan 01 08:59:59 JST 1970
+
+: Time#to_a
+: Time#zone
+
+ Made to return "UTC" under gmtime. It used to return a platform
+ dependent value, typically "GMT", in 1.6 and prior.
+
+: Marshal to use marshal_dump and marshal_load
+
+ if a dumping object responds to 'marshal_dump', Marshal.dump calls
+ it, and dumps object returned. Marshal.load allocates a new instance
+ using "allocate", then calls its "marshal_load" with dumped data.
+ Marshal format version is now 4.8 (was 4.6 in 1.6.8).
+
+: Marshal
+
+ Fixed not to dump anonymous classes/modules.
+
+ Fixed with loading modules.
+
+: Thread#group
+
+ new method to get belonging ThreadGroup.
+
+: Thread#terminate
+
+ synonym of Thread#exit
+
+: Thread#join
+
+ Optional argument limits maximum time to wait the thread in second.
+ And returns nil if timed out.
+
+: ThreagGroup#enclose
+
+ prohibits thread movement from/to enclosed groups.
+
+: Range#step([step=1])
+
+ Added.
+
+: SystemCallError
+
+ SystemCallError's "===" match (used in rescue also) is now based on its errno.
+
+: Interrupt
+
+ Made a subclass of SignalException. (It was a subclass of
+ Exception in 1.6 and prior)
+
+: NameError and NoMethodError
+
+ Moved and now NoMethodError < NameError < StandardError.
+
+: NoMethodError
+
+ Added. [ruby-dev:12763]
+
+: NotImplementError
+
+ Finally obsoleted. Use NotImplementedError.
+
+: SystemCallError.===
+
+ Added. (See the "Comparison of exception classes in a rescue clause"
+ paragraph above) [ruby-dev:12670]
+
+: SystemExit#status
+
+ Added.
+
+: Proc#==
+
+ Added.
+
+: Method#==
+
+ Added.
+
+: UnboundMethod is no longer subclass of Method
+
+ class hierarchy changed.
+
+: Enumerable#all?
+: Enumerable#any?
+: Enumerable#inject
+: Enumerable#sort_by
+
+ Added.
+
+: Math.acos(x)
+: Math.asin(x)
+: Math.atan(x)
+: Math.cosh(x)
+: Math.hypot(x,y)
+: Math.sinh(x)
+: Math.tanh(x)
+
+ Added.
+
+: Process.abort
+: Process.exit
+
+ synonym of Kernel#abort, and Kernel#exit respectively.
+
+: Process::detach(pid)
+
+ new method to detach child process. child process will be "wait"ed
+ automagically.
+
+: Process.times
+
+ Moved from Time.times. (Time.times still remains but emits a
+ warning)
+
+: Process.waitall
+
+ Added.
+
+: Process::Status
+
+ Added. (({$?})) is now an instance of this class.
+
+: Process::UID, Process::GID, Process::Sys,
+
+ Added.
+
+: Signal
+
+ Added. This module has module functions Signal.trap and Signal.list.
+
+= changes in bundled libraries
+
+: lib/cgi.rb
+
+ cgi[name] returns CGI::QueryExtension::Value that wraps string
+ value, no longer array.
+
+: lib/timeout
+
+ timeout "function" wrapped in Timeout module.
+
+: TCPServer#accept, UNIXServer#accept, Socket#accept
+
+ New methods to return an accepted socket fd.
+
+: Date and DateTime
+
+ lib/date.rb now provides both Date and DateTime.
+
+ Some methods have been renamed. But the old names are still alive.
+
+ Some new methods have been added (Date::parse, Date#strftime, etc.).
+
+ Date#mjd now returns the chronological modified Julian day number.
+
+ All facilities about tjd have been removed.
+
+: Curses
+
+ Updated. New methods and constants for using the mouse, character
+ attributes, colors and key codes have been added.
+
+: Net::HTTP
+
+ New version of Net::HTTP has introduced seriously incompatible
+ changes. For details, see document embedded in net/http.rb itself.
+
+: Socket.pack_sockaddr_in, Socket.unpack_sockaddr_in
+
+ Added. Utility for direct Socket access.
+
+: Socket.pack_sockaddr_un, Socket.unpack_sockaddr_un
+
+ Added. Utility for direct Socket access.
+
+: TCPServer#listen, UNIXServer#listen
+
+ Added.
+
+: TCPSocket.new
+: TCPSocket.open
+
+ Extended to take an address and a port number for the local side in
+ optional 3rd and 4th arguments.
+
+= newly bundled library
+
+: ext/bigdecimal
+
+ variable precision decimal number
+
+: ext/dl
+
+ an interface to the dynamic linker.
+
+: ext/enumerator
+
+ a helper module for the Enumerable interface.
+
+: ext/io/wait
+
+ IO wait methods.
+
+: ext/iconv
+
+ wrapper library of (({iconv})).
+
+: ext/openssl
+
+ OpenSSL for Ruby
+
+: ext/racc/cparse
+
+ Racc runtime library in C. (Racc is a parser generator for ruby)
+
+: ext/stringio
+
+ Pseudo (({IO})) class from/to (({String})).
+
+: ext/strscan
+
+ Fast string scanner library.
+
+: ext/syck
+
+ fast YAML parser.
+
+: lib/abbrev
+
+ creates an abbreviation table from a list
+
+: lib/benchmark
+
+ Ruby scripts benchmarker
+
+: lib/cgi/session/pstore
+
+ cgi/session back-end using pstore
+
+: lib/csv
+
+ reads/writes CSV files.
+
+: lib/date/format
+
+ strftime for Date class
+
+: lib/drb
+
+ dRuby or distributed Ruby
+
+: lib/fileutils
+
+ file utility library.
+
+: lib/generator
+
+ converts an internal iterator to an external iterator
+
+: lib/gserver
+
+ generic server used by xmlrpc
+
+: lib/ipaddr
+
+ manipulates IP address.
+
+: lib/multi-tk
+
+ to allow safe Tk, etc.
+
+: lib/open-uri
+
+ easy-to-use wrapper for net/http and net/ftp
+
+: lib/optparse
+
+ command line options utility library
+
+: lib/pathname
+
+ handles pathname in OO manner.
+
+: lib/pp
+
+ prettyprinter for Ruby objects
+
+: lib/prettyprint
+
+ implements prettyprint algorithm.
+
+: lib/profiler
+
+ library to implement -r "profile"
+
+: lib/racc/parser
+
+ RACC parser generator runtime in Ruby.
+
+: lib/scanf
+
+ scan string and retrieve object with format
+
+: lib/set
+
+ Set class
+
+: lib/runit
+
+ RubyUnit compatible layer for test/unit
+
+: lib/test/unit
+
+ unit testing framework for Ruby
+
+: lib/tmpdir
+
+ get temporary directory path.
+
+: lib/tsort
+
+ topological sorting library.
+
+: lib/rexml
+
+ REXML XML library
+
+: lib/webrick
+
+ generic internet server kit
+
+: lib/xmlrpc
+
+ simple RPC via XML
+
+: lib/un
+
+ used like 'ruby -run -e cp -- -p foo bar'. neat, isn't it?
+
+: lib/win32/registry
+
+ win32/registry is registry accessor
+
+: lib/yaml
+
+ YAML Ain't Mark-up Language
+
+= removed libraries
+
+: lib/ftplib
+
+ use net/ftp instead.
+
+: lib/telnet
+
+ use net/telnet instead.
+
+= new port
+
+: WindowsCE port
+: Win32 BCC
+
+= interpreter implementation
+
+: garbage collector
+
+ faster, but uses more memory for the worst case.
+
+: string concatenation
+
+ faster by avoiding too frequent realloc(3).
diff --git a/doc/NEWS-1.8.7 b/doc/NEWS-1.8.7
deleted file mode 100644
index 460a7c9328..0000000000
--- a/doc/NEWS-1.8.7
+++ /dev/null
@@ -1,648 +0,0 @@
-= NEWS
-
-This document is a list of user visible feature changes made between
-releases except for bug fixes.
-
-Note that each entry is kept so brief that no reason behind or
-reference information is supplied with. For a full list of changes
-with all sufficient information, see the ChangeLog file.
-
-== Changes since the 1.8.6 release
-
-=== Configuration changes
-
-* default C flags
-
- Some C compiler flags may be added by default depending on your
- environment. Specify optflags=.. and warnflags=.. as necessary to
- override them.
-
-* vendor_ruby directory
-
- A new library directory named `vendor_ruby' is introduced in
- addition to `site_ruby'. The idea is to separate libraries
- installed by the package system (`vendor') from manually (`site')
- installed libraries preventing the former from getting overwritten
- by the latter, while preserving the user option to override vendor
- libraries with site libraries. (`site_ruby' takes precedence over
- `vendor_ruby')
-
- If you are a package maintainer, make each library package configure
- the library passing the `--vendor' option to `extconf.rb' so that
- the library files will get installed under `vendor_ruby'.
-
- You can change the directory locations using configure options such
- as `--with-sitedir=DIR' and `--with-vendordir=DIR'.
-
-=== Global constants
-
-* new constants
-
- * RUBY_COPYRIGHT
- * RUBY_DESCRIPTION
-
-=== Library updates (outstanding ones only)
-
-* new library
-
- * securerandom
-
-* builtin classes
-
- * Array#flatten
- * Array#flatten!
-
- Take an optional argument that determines the level of recursion
- to flatten.
-
- * Array#eql?
- * Array#hash
- * Array#==
- * Array#<=>
-
- Handle recursive data properly.
-
- * Array#index
- * Array#rindex
-
- Use a given block if no argument is given.
-
- * Array#collect!
- * Array#map!
- * Array#each
- * Array#each_index
- * Array#reverse_each
- * Array#reject
- * Array#reject!
- * Array#delete_if
-
- Return an enumerator if no block is given.
-
- Note that #map and #collect still return an array unlike Ruby 1.9
- to keep compatibility.
-
- * Array#pop
- * Array#shift
-
- Take an optional argument specifying the number of elements to
- remove.
-
- * Array#choice
- * Array#combination
- * Array#cycle
- * Array#drop
- * Array#drop_while
- * Array#permutation
- * Array#product
- * Array#shuffle
- * Array#shuffle!
- * Array#take,
- * Array#take_while
-
- New methods.
-
- * Binding#eval
-
- New method.
-
- * Dir#each
- * Dir#foreach
-
- Return an enumerator if no block is given.
-
- * Enumerable::Enumerator
-
- New class for various enumeration defined by the enumerator library.
-
- * Enumerable#each_slice
- * Enumerable#each_cons
- * Object#to_enum
- * Object#enum_for
-
- New methods for various enumeration defined by the enumerator library.
-
- * Enumerable#count
- * Enumerable#cycle
- * Enumerable#drop
- * Enumerable#drop_while
- * Enumerable#find_index
- * Enumerable#first
- * Enumerable#group_by
- * Enumerable#max_by
- * Enumerable#min_by
- * Enumerable#minmax
- * Enumerable#minmax_by
- * Enumerable#none?
- * Enumerable#one?
- * Enumerable#take
- * Enumerable#take_while
-
- New methods.
-
- * Enumerable#find
- * Enumerable#find_all
- * Enumerable#partition
- * Enumerable#reject
- * Enumerable#select
- * Enumerable#sort_by
-
- Return an enumerator if no block is given.
-
- Note that #map and #collect still return an array unlike Ruby 1.9
- to keep compatibility.
-
- * Enumerable#inject
-
- Accepts a binary operator instead of a block.
-
- * Enumerable#reduce
-
- New alias to #inject.
-
- * Hash#eql?
- * Hash#hash
- * Hash#==
-
- Handle recursive data properly.
-
- * Hash#delete_if
- * Hash#each
- * Hash#each_key
- * Hash#each_pair
- * Hash#each_value
- * Hash#reject!
- * Hash#select
- * ENV.delete_if
- * ENV.each
- * ENV.each_key
- * ENV.each_pair
- * ENV.each_value
- * ENV.reject!
- * ENV.select
-
- Return an enumerator if no block is given.
-
- * GC.stress
- * GC.stress=
-
- New methods.
-
- * Integer#ord
- * Integer#odd?
- * Integer#even?
- * Integer#pred
-
- New methods.
-
- * Integer#downto
- * Integer#times
- * Integer#upto
-
- Return an enumerator if no block is given.
-
- * IO#each
- * IO#each_line
- * IO#each_byte
- * IO.foreach
- * ARGF.each
- * ARGF.each_line
- * ARGF.each_byte
-
- Return an enumerator if no block is given.
-
- * IO#bytes
- * IO#chars
- * IO#each_char
- * IO#getbyte
- * IO#lines
- * IO#readbyte
- * ARGF.bytes
- * ARGF.chars
- * ARGF.each_char
- * ARGF.getbyte
- * ARGF.lines
- * ARGF.readbyte
-
- New methods.
-
- * Method#name
- * Method#owner
- * Method#receiver
- * UnboundMethod#name
- * UnboundMethod#owner
-
- New methods.
-
- * Module#class_exec
- * Module#module_exec
-
- New methods.
-
- * Numeric#step
-
- Return an enumerator if no block is given.
-
- * Object#instance_exec
- * Object#tap
-
- New methods.
-
- * ObjectSpace.each_object
-
- Return an enumerator if no block is given.
-
- * Process.exec implemented.
-
- * Range#each
- * Range#step
-
- Return an enumerator if no block is given.
-
- * Regexp.union accepts an array of patterns.
-
- * String#bytesize
-
- New method, returning the size in bytes. (alias length and size)
-
- * String#chars
- * String#each_char
- * String#partition
- * String#rpartition
- * String#start_with?
- * String#end_with?
-
- New methods. These are $KCODE aware unlike #index, #rindex and
- #include?.
-
- * String#each_byte
- * String#each
- * String#each_line
- * String#gsub(pattern)
-
- Return an enumerator if no block is given.
-
- * String#upto
-
- An optional second argument is added to specify if the last value
- should be included.
-
- * StopIteration
-
- New exception class that causes Kernel#loop to stop iteration when
- raised.
-
- * Struct#each
- * Struct#each_pair
-
- Return an enumerator if no block is given.
-
- * Symbol#to_proc
-
- New method.
-
- * __method__
-
- New global function that returns the name of the current method as
- a Symbol.
-
-* enumerator
-
- * Enumerator is now a built-in module. The #next and #rewind
- methods are implemented using the "generator" library. Use with
- care and be aware of the performance loss.
-
-* ipaddr
-
- * New methods
- * IPAddr#<=>
- * IPAddr#succ
-
- IPAddr objects are now comparable and enumerable having these
- methods. This also means that it is possible to have a Range
- object between two IPAddr objects.
-
- * IPAddr#to_range
-
- A new method to create a Range object for the (network) address.
-
- * Type coercion support
- * IPAddr#&
- * IPAddr#|
- * IPAddr#==
- * IPAddr#include?
-
- These methods now accept a string or an integer instead of an
- IPAddr object as the argument.
-
-* net/smtp
-
- * Support SSL/TLS.
-
-* openssl
-
- * New classes
- * OpenSSL::PKey::EC
- * OpenSSL::PKey::EC::Group
- * OpenSSL::PKey::EC::Point
- * OpenSSL::PKey::PKCS5
- * OpenSSL::SSL::Session
-
- * Documentation!
-
- * Various new methods (see documentation).
-
- * Remove redundant module namespace in Cipher, Digest, PKCS7, PKCS12.
- Compatibility classes are provided which will be removed in Ruby 1.9.
-
-* shellwords
-
- * Add methods for escaping shell-unsafe characters:
- * Shellwords.join
- * Shellwords.escape
- * Array#shelljoin
- * String#shellescape
-
- * Add shorthand methods:
- * Shellwords.split (alias shellwords)
- * String#shellsplit
-
-* stringio
-
- * StringIO#getbyte
- * StringIO#readbyte
-
- New methods. (aliases for compatibility with 1.9)
-
- * StringIO#each_char
- * StringIO#chars
-
- New methods.
-
- * StringIO#each
- * StringIO#each_line
- * StringIO#each_byte
-
- Return an enumerator if no block is given.
-
-* tempfile
-
- * Tempfile.open and Tempfile.new now accept a suffix for the
- temporary file to be created. To specify a suffix, pass an array
- of [basename, suffix] as the first argument.
-
- Tempfile.open(['image', 'jpg']) { |tempfile| ... }
-
-* tmpdir
-
- * New method:
-
- * Dir.mktmpdir
-
-* uri
-
- * added LDAPS scheme.
- * Change for RFC3986:
- * FTP
- * URI('ftp://example.com/foo').path #=> 'foo'
- * URI('ftp://example.com/%2Ffoo').path #=> '/foo'
- * URI::FTP.build([nil, 'example.com', nil, '/foo', 'i').to_s #=> 'ftp://example.com/%2Ffoo;type=i'
- * URI merge
- * URI('http://a/b/c/d;p?q').merge('?y') == URI('http://a/b/c/d;p?y')
- * URI('http://a/b/c/d;p?q').merge('/./g') == URI('http://a/g')
- * URI('http://a/b/c/d;p?q').merge('/../g') == URI('http://a/g')
- * URI('http://a/b/c/d;p?q').merge('../../../g') == URI('http://a/g')
- * URI('http://a/b/c/d;p?q').merge('../../../../g') == URI('http://a/g')
-
-* rss
-
- * 0.1.6 -> 0.2.4
-
- * Fix image module URI
-
- * Atom support
-
- * ITunes module support
-
- * Slash module support
-
- * content:encoded with RSS 2.0 support
-
-=== Interpreter Implementation
-
-* passing a block to a Proc [experimental]
-
- This implementation in current shape is known to be buggy/broken,
- especially with nested block invocation. Take this as an
- experimental feature.
-
-* stack trace
-
- On non-SystemStackError exception, full stack trace is shown.
-
-=== Compatibility issues (excluding feature bug fixes)
-
-* String#slice! had some unintentional bugs and they have been fixed
- because either they disagreed with documentation or their respective
- behavior of #slice. Unfortunately, this causes some
- incompatibilities in the following (somewhat rare) cases.
-
- * #slice! no longer expands the array when an out-of-boundary value
- is given.
-
- # Ruby 1.8.6
- a = [1,2]
- a.slice!(4,0) #=> nil
- a #=> [1,2,nil,nil]
-
- # Ruby 1.8.7
- a = [1,2]
- a.slice!(4,0) #=> nil
- a #=> [1,2]
-
- * #slice! no longer raises an exception but returns nil when a
- negative length or out-of-boundary negative position is given.
-
- # Ruby 1.8.6
- a = [1,2]
- a.slice!(1,-1) #=> (raises IndexError)
- a.slice!(-5,1) #=> (raises IndexError)
-
- # Ruby 1.8.7
- a = [1,2]
- a.slice!(1,-1) #=> nil
- a.slice!(-5,1) #=> nil
-
-* String#to_i, String#hex and String#oct no longer accept a sequence
- of underscores (`__') as part of a number.
-
- # Ruby 1.8.6
- '1__0'.to_i #=> 10
- '1__0'.to_i(2) #=> 2 # 0b10
- '1__0'.oct #=> 8 # 010
- '1__0'.hex #=> 16 # 0x10
-
- # Ruby 1.8.7
- '1__0'.to_i #=> 1
- '1__0'.to_i(2) #=> 1
- '1__0'.oct #=> 1
- '1__0'.hex #=> 1
-
- The old behavior was inconsistent with Ruby syntax and considered as
- a bug.
-
-* date
-
- * Date.parse
-
- '##.##.##' (where each '#' is a digit) is now taken as 'YY.MM.DD'
- instead of 'MM.DD.YY'. While the change may confuse you, you can
- always use Date.strptime() when you know what you are dealing
- with.
-
-* stringio
-
- * StringIO#each_byte
-
- The return value changed from nil to self. This is what the
- document says and the same as each_line() does.
-
-* tempfile
-
- * The file name format has changed. No dots are included by default
- in temporary file names any more. See above for how to specify a
- suffix.
-
-* uri
-
- * See above for details.
-
-== Changes since the 1.8.5 release
-
-=== New platforms/build tools support
-
-* IA64 HP-UX
-
-* Visual C++ 8 SP1
-
-* autoconf 2.6x
-
-=== Global constants
-
-* RUBY_PATCHLEVEL
-
- New constant since 1.8.5-p1.
-
-=== Library updates (outstanding ones only)
-
-* builtin classes
-
- * New method: Kernel#instance_variable_defined?
-
- * New method: Module#class_variable_defined?
-
- * New feature: Dir::glob() can now take an array of glob patterns.
-
-* date
-
- * Updated based on date2 4.0.3.
-
-* digest
-
- * New internal APIs for C and Ruby.
-
- * Support for autoloading.
-
- require 'digest'
-
- # autoloads digest/md5
- md = Digest::MD5.digest("string")
-
- * New digest class methods: file
-
- * New digest instance methods: clone, reset, new, inspect,
- digest_length (alias size or length), block_length()
-
- * New library: digest/bubblebabble
-
- * New function: Digest(name)
-
-* fileutils
-
- * New option for FileUtils.cp_r(): :remove_destination
-
-* nkf
-
- * Updated based on nkf as of 2007-01-28.
-
-* thread
-
- * Replaced with much faster mutex implementation in C. The former
- implementation, which is slow but considered to be stable, is
- available with a configure option `--disable-fastthread'.
-
-* tk
-
- * Updated Tile extension support based on Tile 0.7.8.
-
- * Support --without-X11 configure option for non-X11 versions of
- Tcl/Tk (e.g. Tcl/Tk Aqua).
-
- * New sample script: irbtkw.rbw -- IRB on Ruby/Tk. It has no trouble
- about STDIN blocking on Windows.
-
-* webrick
-
- * New method: WEBrick::Cookie.parse_set_cookies()
-
-=== Compatibility issues (excluding feature bug fixes)
-
-* builtin classes
-
- * String#intern now raises SecurityError when $SAFE level is greater
- than zero.
-
-* date
-
- * Time#to_date and Time#to_datetime are added as private methods.
- They cause name conflict error in ActiveSupport 1.4.1 and prior,
- which comes with Rails 1.2.2 and prior. Updating ActiveSupport
- and/or Rails to the latest versions fixes the problem.
-
-* digest
-
- * The constructor does no longer take an initial string to feed.
- The following examples show how to migrate:
-
- # Before
- md = Digest::MD5.new("string")
- # After (works with any version)
- md = Digest::MD5.new.update("string")
-
- # Before
- hd = Digest::MD5.new("string").hexdigest
- # After (works with any version)
- hd = Digest::MD5.hexdigest("string")
-
- * Digest::Base#==
-
- * self == string
-
- Automatic detection between binary digest values and hexadecimal
- digest values has been dropped. It is always assumed that a
- hexadecimal digest value is given for comparison.
-
- * self == md
-
- Digest objects are compared by the resulting digest values, not
- by the exact vector states.
-
-* fileutils
-
- * A minor implementation change breaks Rake <=0.7.1.
- Updating Rake to 0.7.2 or higher fixes the problem.
-
-* tk
-
- * Tk::X_Scrollable (Y_Scrollable) is renamed to Tk::XScrollable
- (YScrollable). Tk::X_Scrollable (Y_Scrollable) is still available,
- but it is an alias name.
diff --git a/doc/NEWS-1.9.1 b/doc/NEWS-1.9.1
deleted file mode 100644
index 05752330eb..0000000000
--- a/doc/NEWS-1.9.1
+++ /dev/null
@@ -1,420 +0,0 @@
-= NEWS
-
-This document is a list of user visible feature changes made between
-releases except for bug fixes.
-
-Note that each entry is kept so brief that no reason behind or
-reference information is supplied with. For a full list of changes
-with all sufficient information, see the ChangeLog file.
-
-== Changes since the 1.8.7 release
-See doc/NEWS-1.8.7 for changes between 1.8.6 and 1.8.7.
-
-=== Compatibility issues
-
-* language core
-
- * New syntax and semantics
- o Block arguments are always local
- o New semantics for block arguments
- o defined? and local variables
- o Parser expects that your source code has only valid byte
- sequence in some character encoding. Use magic comments
- to tell the parser which encoding you use.
- o New semantics for constant definition in instance_eval
- or in module_eval.
-
- * Deprecated syntax
- o colon (:) instead of "then" in if/unless or case expression.
- o retry in a loop or an iterator.
-
-* builtin classes and objects
-
- * Kernel and Object
- o Kernel#methods and #singleton_methods used to return an
- array of strings but now they return an array of symbols.
- * Class and Module
- o Module#attr works as Module#attr_reader by default.
- Optional boolean argument is obsolete.
- o Module#instance_methods, #private_instance_methods and
- #public_instance_methods used to return an array of
- strings but now they return an array of symbols.
- o Extra subclassing check when binding UnboundMethods
-
- * Exceptions
- o Exceptions are equal to each other if they belong to
- the same class and have the same message and backtrace.
- o SystemStackError used to be a subclass of StandardError
- but not it is a direct subclass of Exception.
- o SecurityError: ditto
- o Removed Exception#to_str [Ruby2]
-
- * Enumerable and Enumerator
- o Enumerable::Enumerator, compatibility alias of Enumerator,
- is removed.
- o Enumerable#{map,collect} called without a block returns
- an enumerator.
- o Even more builtin and bundled libraries have been made to
- return an enumerator when called without a block.
- * Array
- o Array#nitems was removed (use count {|i| !i.nil?})
- o Array#choice was removed (use sample)
- o Array#[m,n] = nil places nil in the array.
- * Hash
- o Hash#to_s is equivalent to Hash#inspect
- o Semantics for Hash#each and Hash#each_pair
- o Hash#select returns a hash
- o Hash#key is the new name for #index which has been
- deprecated.
- o Hash preserves order. It enumerates its elements in the
- order in which the keys are inserted.
- o Most of the changes in Hash apply to hash like interfaces
- such as ENV and *DBM.
- * IO operations
- o Many methods used to act byte-wise but now some of those act
- character-wise. You can use alternate byte-wise methods.
- o IO#getc
- o Non-blocking IO
- o Kernel#open takes "t" for newline conversion
- o Kernel#open takes encoding specified
- o IO automatically converts byte sequence from a character
- encodings into another if specified.
- o StringIO#readpartial
- o IO.try_convert
- o IO.binread
- o IO.copy_stream
- o IO#binmode?
- o IO#close_on_exec= and IO#close_on_exec?
- o Limit input in IO#gets, IO#readline, IO#readlines,
- IO#each_line, IO#lines, IO.foreach, IO.readlines,
- StringIO#gets, StringIO#readline, StringIO#each,
- StringIO#readlines
- o IO#ungetc, StringIO#ungetc
- o IO#ungetbyte, StringIO#ungetbyte
- o IO#internal_encoding, IO#external_encoding,
- IO#set_encoding
- o IO.pipe takes encoding option
- o Directive %u behaves like %d for negative values in
- printf-style formatting.
- * File and Dir operations
- o #to_path is called as necessary in File.path, File.chmod,
- File.lchmod, File.chown, File.lchown, File.utime,
- File.unlink, etc..
- o File.world_readable?
- o File.world_writable?
- o Dir.[], Dir.glob
- o Dir.exist?
- o Dir.exists?
- * File::Stat
- o File::Stat#world_readable?
- o File::Stat#world_writable?
- * String
- o No longer an Enumerable: use each_line/lines for line
- oriented operation
- o Encoding-awareness
- o Character-wise semantics in many methods instead of
- byte-wise.
- o String#[]: Indexing a String with an integer returns a
- single character String instead of an integer.
- o String#[]=: No longer takes an integer as right
- side value. Note that "str[i] = ?c" because of
- the following change.
- o ?c is evaluated to a single character string
- instead of an integer.
- * Regexp
- o Encoding-awareness
- o Regexp matches only with strings which is encoded in a
- compatible character encoding to the regexp's.
- o Regexp#kcode is removed. use Regexp#encoding.
- * Symbols: restriction on literal symbols
- * Numeric
- o Numeric#div always rounds as Integer#div has done.
- o Numeric#fdiv: ditto.
- * Integer
- o Integer(nil) raises TypeError
- * Fixnum
- o Fixnum#id2name removed
- o Fixnum#to_sym removed
- * Struct
- o Struct#inspect
- * Time
- o New format in Time#to_s
- o Timezone information preserved on Marshal.dump/load
- * $SAFE and bound methods
- o New trusted/untrusted model in addition to
- tainted/untainted model.
-
- * Deprecation
- o $= (global flag for case-sensitiveness on string matching)
- o Kernel#to_a
- o Kernel#getc, #gsub, #sub
- o Kernel#callcc and Continuation now become 'continuation'
- bundled library.
- o Object#type
- o Removed Array and Hash #indices, #indexes
- o Hash#index
- o ENV.index
- o Process::Status#to_int
- o Numeric#rdiv
- o Precision is removed. Don't cry, it will be redesigned
- and come back in future version.
- o Symbol#to_int and Symbol#to_i
- o $KCODE is no longer effective. Use Encoding related
- features of each class.
- o VERSION and friends
-
-* bundled libraries
-
- * Pathname
- o No longer has #to_str nor #=~.
- * time and date
- o Time.parse and Date.parse interprets slashed numerical dates
- as "dd/mm/yyyy".
- * Readline
- o If Readline uses libedit, Readline::HISTORY[0] returns the
- first of the history.
- * Continuation
- o as above
-
- * Deprecation
- o Complex#image: use Complex#imag
- o All SSL-related class methods in Net::SMTP
- o Prime#cache, Prime#primes, Prime#primes_so_far
- o mailread library: use tmail gem.
- o cgi-lib library: use cgi.
- o date2 library: use date.
- o eregex library
- o finalize library: use ObjectSpace.define_finalizer if you
- really need a finalizer. really?
- o ftools library: use fileutils.
- o generator library: use Enumerator.
- o importenv library and Env library
- o jcode library: use multilingualization support of String
- o parsedate library
- o ping library
- o readbytes library
- o getopts library and parsearg library: use optparse or
- getoptlong.
- o soap, wsdl and xsd libraries: use soap4r gem.
- o Win32API library: use dl.
- o dl library: Reimplemented and API changed. use the new
- version of dl or ffi gem.
- o rubyunit library and runit library: use minitest or
- test/unit. Or use anything you love through RubyGems.
- o test/unit is reimplemented on top of minitest. This is
- not fully compatible with the original.
-
-=== Language core changes
-
- * New syntax and semantics
- o Magic comments to declare in which encoding your source
- code is written
- o New literal hash syntax and new syntax for hash style
- arguments
- o New syntax for lambdas
- o .() and calling Procs without #call/#[]
- o Block in block arguments
- o Block local variables
- o Mandatory arguments after optional arguments allowed
- o Multiple splats allowed
- o #[] can take splatted arguments, hash style arguments
- and a block.
- o New directives in printf-style formatted strings (%).
- o Newlines allowed before ternary colon operator (:) and
- method call dot operator (.)
- o Negative operators such as !, != and !~ are now
- overloadable
- o Encoding.default_external and default_internal
- o __ENCODING__: New pseudo variable to hold the current
- script's encoding
-
-=== Library updates
-
-* builtin classes and objects
- * Kernel and Object
- o BasicObject
- o Object#=~ returns nil instead of false by default.
- o Kernel#define_singleton_method
- o Kernel#load can load a library from the highest versions
- of gems by default.
- * Class and Module
- o Module#const_defined?, #const_get and #method_defined?
- take an optional parameter.
- o #class_variable_{set,get} are public.
- o Class of singleton classes
-
- * Errno::EXXX
- o All of those are always defined. Errno::EXXX will be
- defined as an alias to Errno::NOERROR if your platform
- does not have one.
-
- * Binding#eval
- * Blocks and Procs
- o Arity of blocks without arguments
- o proc is now a synonym of Proc.new
- o Proc#yield
- o Passing blocks to #[]
- o Proc#lambda?
- o Proc#curry
- * Fiber: coroutines/micro-threads
- * Thread
- o Thread.critical and Thread.critical= removed
- o Thread#exit!, Thread#kill! and Thread#terminate! removed.
-
- * Enumerable and Enumerator
- o Enumerator#enum_cons and Enumerator#enum_slice are
- removed. Use #each_cons and #each_slice without a block.
- o Enumerable#each_with_index can take optional arguments
- and passes them to #each.
- o Enumerable#each_with_object
- o Enumerator#with_object
- o Enumerator.new { ... }
- * Array
- o Array#delete returns a deleted element rather than a given
- object
- o Array#to_s is equivalent to Array#inspect
- o Array.try_convert
- o Array#pack('m0') complies with RFC 4648.
- * Hash
- o preserving item insertion order
- o Hash#default_proc=
- o Hash#_compare_by_identity and Hash#compare_by_identity?
- o Hash.try_convert
- o Hash#assoc
- o Hash#rassoc
- o Hash#flatten
- * Range
- o Range#cover?
- o Range#include? iterates over elements and compares the
- given value with each element unless the range is numeric.
- Use Range#cover? for the old behavior, i.e. comparison
- with boundary values.
- o Range#min, Range#max
-
- * File and Dir operations
- o New methods
- * Process
- o Process.spawn
- o Process.daemon
- * String
- o String#clear
- o String#ord
- o String#getbyte, String#setbyte
- o String#chars and String#each_char act as character-wise.
- o String#codepoints, String#each_codepoint
- o String#unpack with a block
- o String#hash
- o String.try_convert
- o String#encoding
- o String#force_encoding, String#encode and String#encode!
- o String#ascii_only?
- o String#valid_encoding?
- o String#match
- * Symbol
- o Zero-length symbols allowed
- o Symbol#intern
- o Symbol#encoding
- o Symbol methods similar to those in String
- * Regexp
- o Regexp#=== matches symbols
- o Regexp.try_convert
- o Regexp#match
- o Regexp#fixed_encoding?
- o Regexp#encoding
- o Regexp#named_captures
- o Regexp#names
- * MatchData
- o MatchData#names
- o MatchData#regexp
- * Encoding
- * Encoding::Converter
- o supports conversion between many encodings
- * Numeric
- o Numeric#upto, #downto, #times, #step
- o Numeric#real?, Complex#real?
- o Numeric#magnitude
- * Rational / Complex
- o They are in the core library now
- * Math
- o Math#log takes an optional argument.
- o Math#log2
- o Math#cbrt, Math#lgamma, Math#gamma
- * Time
- o Time.times removed. Use Process.times.
- o Time#sunday?
- o Time#monday?
- o Time#tuesday?
- o Time#wednesday?
- o Time#thursday?
- o Time#friday?
- o Time#saturday?
- o Time#tv_nsec and Time#nsec
- * Misc. new methods
- o RUBY_ENGINE to distinguish between Ruby processor implementation
- o public_method
- o public_send
- o GC.count
- o ObjectSpace.count_objects
- o Method#hash, Proc#hash
- o Method#source_location, UnboundMethod#source_location and
- Proc#source_location
- o __callee__
- o Elements in $LOAD_PATH and $LOADED_FEATURES are expanded
-
-* bundled libraries
- * RubyGems
- o Package management system for Ruby.
- o Integrated with Ruby's library loader.
- * Rake
- o Ruby make. A simple ruby build program with capabilities
- similar to make.
- * minitest
- o Our new testing library which is faster, cleaner and easier
- to read than the old test/unit.
- o You can introduce the old test/unit as testunit gem through
- RubyGems if you want.
- * CMath
- o Complex number version of Math
- * Prime
- o Extracted from Mathn and improved. You can easily enumerate
- prime numbers.
- o Prime.new is obsolete. Use its class methods.
- * ripper
- o Ruby script parser
- * Readline
- o Readline.vi_editing_mode?
- o Readline.emacs_editing_mode?
- o Readline::HISTORY.clear
- * Tk
- o TkXXX widget classes are removed and redefined as aliases of
- Tk::XXX classes.
- * RDoc
- o Updated to version 2.2.2. See:
- http://rubyforge.org/frs/shownotes.php?group_id=627&release_id=26434
-
-* commandline options
- * -E, --encoding
- * -U
- * --enable-gems, --disable-gems
- * --enable-rubyopt, --disable-rubyopt
- * long options are allowed in RUBYOPT environment variable.
-
-=== Implementation changes
-
-* Memory Diet
- * Object Compaction - Object, Array, String, Hash, Struct, Class,
- Module
- * st_table compaction (inlining small tables)
-* YARV
- * Ruby codes are compiled into opcodes before executed.
- * Native thread
-
-* Platform supports
- * Support levels
- (0) Supported
- (1) Best effort
- (2) Perhaps
- (3) Not supported
- * Dropped
- o No longer supports djgpp, bcc32, human68k, MacOS 9 or earlier,
- VMS nor Windows CE.
diff --git a/doc/forwardable.rd b/doc/forwardable.rd
index 0eca25b90a..7272c374b6 100644
--- a/doc/forwardable.rd
+++ b/doc/forwardable.rd
@@ -2,6 +2,7 @@
$Release Version: 1.1 $
$Revision$
+ $Date$
Original version by Tosh
=begin
diff --git a/doc/forwardable.rd.ja b/doc/forwardable.rd.ja
index 48186b111f..d928fddc5e 100644
--- a/doc/forwardable.rd.ja
+++ b/doc/forwardable.rd.ja
@@ -1,6 +1,7 @@
-- forwatable.rb
$Release Version: 1.1 $
$Revision$
+ $Date$
=begin
= Forwardable
diff --git a/doc/images/boottime-classes.png b/doc/images/boottime-classes.png
deleted file mode 100644
index b5fab75c41..0000000000
--- a/doc/images/boottime-classes.png
+++ /dev/null
Binary files differ
diff --git a/doc/irb/irb-tools.rd.ja b/doc/irb/irb-tools.rd.ja
index 7711f96e08..64d9ab29c8 100644
--- a/doc/irb/irb-tools.rd.ja
+++ b/doc/irb/irb-tools.rd.ja
@@ -1,6 +1,7 @@
irb´ØÏ¢¤ª¤Þ¤±¥³¥Þ¥ó¥É¤È¥é¥¤¥Ö¥é¥ê
$Release Version: 0.7.1 $
$Revision$
+ $Date$
by Keiju ISHITSUKA(Nihon Rational Co.,Ltd.)
=begin
diff --git a/doc/irb/irb.rd b/doc/irb/irb.rd
index 8468809d2b..a42cd46680 100644
--- a/doc/irb/irb.rd
+++ b/doc/irb/irb.rd
@@ -1,6 +1,7 @@
irb -- interactive ruby
$Release Version: 0.9 $
$Revision$
+ $Date$
by Keiju ISHITSUKA(keiju@ishitsuka.com)
by gotoken-san who is original translater from japanese version
diff --git a/doc/irb/irb.rd.ja b/doc/irb/irb.rd.ja
index 53f76180ec..338dcc644e 100644
--- a/doc/irb/irb.rd.ja
+++ b/doc/irb/irb.rd.ja
@@ -1,6 +1,7 @@
irb -- interactive ruby
$Release Version: 0.9.5 $
$Revision$
+ $Date$
by Keiju ISHITSUKA(keiju@ruby-lang.org)
=begin
= irb¤È¤Ï?
diff --git a/doc/shell.rd b/doc/shell.rd
index 8a1f7c5a80..02ee1b020a 100644
--- a/doc/shell.rd
+++ b/doc/shell.rd
@@ -1,6 +1,7 @@
-- shell.rb
$Release Version: 0.6.0 $
$Revision$
+ $Date$
by Keiju ISHITSUKA(keiju@ishitsuka.com)
=begin
diff --git a/doc/shell.rd.ja b/doc/shell.rd.ja
index 33e5a9ed9b..073e71ea42 100644
--- a/doc/shell.rd.ja
+++ b/doc/shell.rd.ja
@@ -1,6 +1,7 @@
-- shell.rb
$Release Version: 0.6.0 $
$Revision$
+ $Date$
by Keiju ISHITSUKA(keiju@ishitsuka.com)
=begin
diff --git a/enc/Makefile.in b/enc/Makefile.in
deleted file mode 100644
index 8ba04f374a..0000000000
--- a/enc/Makefile.in
+++ /dev/null
@@ -1,63 +0,0 @@
-encsrcdir = @srcdir@
-topdir = .
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-libdir = @libdir@
-top_srcdir = $(encsrcdir:/enc=)
-srcdir = $(top_srcdir)
-arch = @arch@
-EXTOUT = @EXTOUT@
-hdrdir = $(srcdir)/include
-arch_hdrdir = $(EXTOUT)/include/$(arch)
-ENCSODIR = $(EXTOUT)/$(arch)/enc
-TRANSSODIR = $(ENCSODIR)/trans
-DLEXT = @DLEXT@
-OBJEXT = @OBJEXT@
-
-BUILTIN_ENCS = ascii.c us_ascii.c\
- unicode.c utf_8.c
-
-BUILTIN_TRANSES = newline.trans
-
-RUBY_SO_NAME = @RUBY_SO_NAME@
-LIBRUBY = @LIBRUBY@
-LIBRUBYARG_SHARED = @LIBRUBYARG_SHARED@
-LIBRUBYARG_STATIC = $(LIBRUBYARG_SHARED)
-
-empty =
-CC = @CC@
-OUTFLAG = @OUTFLAG@$(empty)
-COUTFLAG = @COUTFLAG@$(empty)
-CFLAGS = $(CCDLFLAGS) @CFLAGS@ @ARCH_FLAG@
-cflags = @cflags@
-optflags = @optflags@
-debugflags = @debugflags@
-warnflags = @warnflags@
-CCDLFLAGS = @CCDLFLAGS@
-INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir) -I$(top_srcdir)
-DEFS = @DEFS@
-CPPFLAGS = @CPPFLAGS@ -DONIG_ENC_REGISTER=rb_enc_register
-LDFLAGS = @LDFLAGS@
-LDSHARED = @LDSHARED@
-ldflags = $(LDFLAGS)
-dldflags = @DLDFLAGS@
-archflag = @ARCH_FLAG@
-DLDFLAGS = $(ldflags) $(dldflags) $(archflag)
-RUBY = $(MINIRUBY)
-
-WORKDIRS = $(ENCSODIR) $(TRANSSODIR) enc enc/trans
-
-RM = @RM@
-MAKEDIRS = @MAKEDIRS@
-
-.SUFFIXES: .trans
-
-all: make-workdir
-
-make-workdir:
- $(MAKEDIRS) $(WORKDIRS)
-
-clean:
-
-distclean: clean clean-srcs
- @$(RM) enc.mk
diff --git a/enc/ascii.c b/enc/ascii.c
deleted file mode 100644
index 3d62ec9bf7..0000000000
--- a/enc/ascii.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/**********************************************************************
- ascii.c - Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2006 K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regenc.h"
-
-OnigEncodingDefine(ascii, ASCII) = {
- onigenc_single_byte_mbc_enc_len,
- "ASCII-8BIT",/* name */
- 1, /* max byte length */
- 1, /* min byte length */
- onigenc_is_mbc_newline_0x0a,
- onigenc_single_byte_mbc_to_code,
- onigenc_single_byte_code_to_mbclen,
- onigenc_single_byte_code_to_mbc,
- onigenc_ascii_mbc_case_fold,
- onigenc_ascii_apply_all_case_fold,
- onigenc_ascii_get_case_fold_codes_by_str,
- onigenc_minimum_property_name_to_ctype,
- onigenc_ascii_is_code_ctype,
- onigenc_not_support_get_ctype_code_range,
- onigenc_single_byte_left_adjust_char_head,
- onigenc_always_true_is_allowed_reverse_match
-};
-ENC_ALIAS("BINARY", "ASCII-8BIT")
-ENC_REPLICATE("IBM437", "ASCII-8BIT")
-ENC_ALIAS("CP437", "IBM437")
-ENC_REPLICATE("IBM737", "ASCII-8BIT")
-ENC_ALIAS("CP737", "IBM737")
-ENC_REPLICATE("IBM775", "ASCII-8BIT")
-ENC_ALIAS("CP775", "IBM775")
-ENC_REPLICATE("CP850", "ASCII-8BIT")
-ENC_ALIAS("IBM850", "CP850")
-ENC_REPLICATE("IBM852", "ASCII-8BIT")
-ENC_REPLICATE("CP852", "IBM852")
-ENC_REPLICATE("IBM855", "ASCII-8BIT")
-ENC_REPLICATE("CP855", "IBM855")
-ENC_REPLICATE("IBM857", "ASCII-8BIT")
-ENC_ALIAS("CP857", "IBM857")
-ENC_REPLICATE("IBM860", "ASCII-8BIT")
-ENC_ALIAS("CP860", "IBM860")
-ENC_REPLICATE("IBM861", "ASCII-8BIT")
-ENC_ALIAS("CP861", "IBM861")
-ENC_REPLICATE("IBM862", "ASCII-8BIT")
-ENC_ALIAS("CP862", "IBM862")
-ENC_REPLICATE("IBM863", "ASCII-8BIT")
-ENC_ALIAS("CP863", "IBM863")
-ENC_REPLICATE("IBM864", "ASCII-8BIT")
-ENC_ALIAS("CP864", "IBM864")
-ENC_REPLICATE("IBM865", "ASCII-8BIT")
-ENC_ALIAS("CP865", "IBM865")
-ENC_REPLICATE("IBM866", "ASCII-8BIT")
-ENC_ALIAS("CP866", "IBM866")
-ENC_REPLICATE("IBM869", "ASCII-8BIT")
-ENC_ALIAS("CP869", "IBM869")
-ENC_REPLICATE("Windows-1258", "ASCII-8BIT")
-ENC_ALIAS("CP1258", "Windows-1258")
-ENC_REPLICATE("GB1988", "ASCII-8BIT")
-ENC_REPLICATE("macCentEuro", "ASCII-8BIT")
-ENC_REPLICATE("macCroatian", "ASCII-8BIT")
-ENC_REPLICATE("macCyrillic", "ASCII-8BIT")
-ENC_REPLICATE("macGreek", "ASCII-8BIT")
-ENC_REPLICATE("macIceland", "ASCII-8BIT")
-ENC_REPLICATE("macRoman", "ASCII-8BIT")
-ENC_REPLICATE("macRomania", "ASCII-8BIT")
-ENC_REPLICATE("macThai", "ASCII-8BIT")
-ENC_REPLICATE("macTurkish", "ASCII-8BIT")
-ENC_REPLICATE("macUkraine", "ASCII-8BIT")
diff --git a/enc/big5.c b/enc/big5.c
deleted file mode 100644
index 4a7a91a231..0000000000
--- a/enc/big5.c
+++ /dev/null
@@ -1,302 +0,0 @@
-/**********************************************************************
- big5.c - Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2007 K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regenc.h"
-
-static const int EncLen_BIG5[] = {
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1
-};
-static const int EncLen_BIG5_HKSCS[] = {
- /* LEN 0 1 2 3 4 5 6 7 8 9 A B C D E F */
- /* 0 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* 1 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* 2 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* 3 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* 4 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* 5 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* 6 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* 7 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* 8 */ 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- /* 9 */ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- /* A */ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- /* B */ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- /* C */ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- /* D */ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- /* E */ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- /* F */ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1,
-};
-
-typedef enum { FAILURE = -2, ACCEPT = -1, S0 = 0, S1 } state_t;
-#define A ACCEPT
-#define F FAILURE
-static const signed char trans[][0x100] = {
- { /* S0 0 1 2 3 4 5 6 7 8 9 a b c d e f */
- /* 0 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 1 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 2 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 3 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 4 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 5 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 6 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 7 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 8 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 9 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* a */ F, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* b */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* c */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* d */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* e */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* f */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, F
- },
- { /* S1 0 1 2 3 4 5 6 7 8 9 a b c d e f */
- /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 4 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 5 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 6 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 7 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, F,
- /* 8 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 9 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* a */ F, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* b */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* c */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* d */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* e */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* f */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, F
- },
- { /* S2 0 1 2 3 4 5 6 7 8 9 a b c d e f */
- /* 0 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 1 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 2 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 3 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 4 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 5 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 6 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 7 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 8 */ F, F, F, F, F, F, F, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* 9 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* a */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* b */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* c */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* d */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* e */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* f */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, F
- }
-};
-#undef A
-#undef F
-
-static int
-big5_mbc_enc_len0(const UChar* p, const UChar* e, int tridx, const int tbl[])
-{
- int firstbyte = *p++;
- state_t s = trans[tridx][firstbyte];
-#define RETURN(n) \
- return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(n) : \
- ONIGENC_CONSTRUCT_MBCLEN_INVALID()
- if (s < 0) RETURN(1);
- if (p == e) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(tbl[firstbyte]-1);
- s = trans[s][*p++];
- RETURN(2);
-#undef RETURN
-}
-
-static int
-big5_mbc_enc_len(const UChar* p, const UChar* e, OnigEncoding enc ARG_UNUSED)
-{
- return big5_mbc_enc_len0(p, e, 0, EncLen_BIG5);
-}
-
-static int
-big5_hkscs_mbc_enc_len(const UChar* p, const UChar* e, OnigEncoding enc ARG_UNUSED)
-{
- return big5_mbc_enc_len0(p, e, 2, EncLen_BIG5_HKSCS);
-}
-
-static OnigCodePoint
-big5_mbc_to_code(const UChar* p, const UChar* end, OnigEncoding enc)
-{
- return onigenc_mbn_mbc_to_code(enc, p, end);
-}
-
-static int
-big5_code_to_mbc(OnigCodePoint code, UChar *buf, OnigEncoding enc)
-{
- return onigenc_mb2_code_to_mbc(enc, code, buf);
-}
-
-static int
-big5_mbc_case_fold(OnigCaseFoldType flag, const UChar** pp, const UChar* end,
- UChar* lower, OnigEncoding enc)
-{
- return onigenc_mbn_mbc_case_fold(enc, flag,
- pp, end, lower);
-}
-
-#if 0
-static int
-big5_is_mbc_ambiguous(OnigCaseFoldType flag,
- const UChar** pp, const UChar* end, OnigEncoding enc)
-{
- return onigenc_mbn_is_mbc_ambiguous(enc, flag, pp, end);
-}
-#endif
-
-static int
-big5_is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc)
-{
- return onigenc_mb2_is_code_ctype(enc, code, ctype);
-}
-
-static const char BIG5_CAN_BE_TRAIL_TABLE[256] = {
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0
-};
-
-#define BIG5_HKSCS_P(enc) ((enc)->precise_mbc_enc_len == big5_hkscs_mbc_enc_len)
-#define BIG5_ISMB_FIRST(byte) ( \
- BIG5_HKSCS_P(enc) ? EncLen_BIG5_HKSCS[byte] > 1 : \
- EncLen_BIG5[byte] > 1 \
- )
-#define BIG5_ISMB_TRAIL(byte) BIG5_CAN_BE_TRAIL_TABLE[(byte)]
-
-static UChar*
-big5_left_adjust_char_head(const UChar* start, const UChar* s, const UChar* end, OnigEncoding enc)
-{
- const UChar *p;
- int len;
-
- if (s <= start) return (UChar* )s;
- p = s;
-
- if (BIG5_ISMB_TRAIL(*p)) {
- while (p > start) {
- if (! BIG5_ISMB_FIRST(*--p)) {
- p++;
- break;
- }
- }
- }
- len = enclen(enc, p, end);
- if (p + len > s) return (UChar* )p;
- p += len;
- return (UChar* )(p + ((s - p) & ~1));
-}
-
-static int
-big5_is_allowed_reverse_match(const UChar* s, const UChar* end ARG_UNUSED, OnigEncoding enc ARG_UNUSED)
-{
- const UChar c = *s;
-
- return (BIG5_ISMB_TRAIL(c) ? FALSE : TRUE);
-}
-
-/*
- * Name: Big5 (preferred MIME name)
- * MIBenum: 2026
- * Source: Chinese for Taiwan Multi-byte set.
- * PCL Symbol Set Id: 18T
- * Alias: csBig5
- */
-OnigEncodingDefine(big5, BIG5) = {
- big5_mbc_enc_len,
- "Big5", /* name */
- 2, /* max enc length */
- 1, /* min enc length */
- onigenc_is_mbc_newline_0x0a,
- big5_mbc_to_code,
- onigenc_mb2_code_to_mbclen,
- big5_code_to_mbc,
- big5_mbc_case_fold,
- onigenc_ascii_apply_all_case_fold,
- onigenc_ascii_get_case_fold_codes_by_str,
- onigenc_minimum_property_name_to_ctype,
- big5_is_code_ctype,
- onigenc_not_support_get_ctype_code_range,
- big5_left_adjust_char_head,
- big5_is_allowed_reverse_match
-};
-ENC_ALIAS("CP950", "Big5")
-
-/*
- * Name: Big5-HKSCS
- * MIBenum: 2101
- * Source: See (http://www.iana.org/assignments/charset-reg/Big5-HKSCS)
- * Alias: None
- */
-OnigEncodingDefine(big5_hkscs, BIG5_HKSCS) = {
- big5_hkscs_mbc_enc_len,
- "Big5-HKSCS", /* name */
- 2, /* max enc length */
- 1, /* min enc length */
- onigenc_is_mbc_newline_0x0a,
- big5_mbc_to_code,
- onigenc_mb2_code_to_mbclen,
- big5_code_to_mbc,
- big5_mbc_case_fold,
- onigenc_ascii_apply_all_case_fold,
- onigenc_ascii_get_case_fold_codes_by_str,
- onigenc_minimum_property_name_to_ctype,
- big5_is_code_ctype,
- onigenc_not_support_get_ctype_code_range,
- big5_left_adjust_char_head,
- big5_is_allowed_reverse_match
-};
-ENC_ALIAS("CP951", "Big5-HKSCS")
diff --git a/enc/cp949.c b/enc/cp949.c
deleted file mode 100644
index 009443aed4..0000000000
--- a/enc/cp949.c
+++ /dev/null
@@ -1,219 +0,0 @@
-/**********************************************************************
- cp949.c - Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2007 K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regenc.h"
-
-static const int EncLen_CP949[] = {
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1
-};
-
-static const char CP949_CAN_BE_TRAIL_TABLE[256] = {
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0
-};
-
-#define CP949_ISMB_FIRST(byte) (EncLen_CP949[byte] > 1)
-#define CP949_ISMB_TRAIL(byte) CP949_CAN_BE_TRAIL_TABLE[(byte)]
-
-typedef enum { FAILURE = -2, ACCEPT = -1, S0 = 0, S1 } state_t;
-#define A ACCEPT
-#define F FAILURE
-static const signed char trans[][0x100] = {
- { /* S0 0 1 2 3 4 5 6 7 8 9 a b c d e f */
- /* 0 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 1 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 2 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 3 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 4 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 5 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 6 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 7 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 8 */ A, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* 9 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* a */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* b */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* c */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* d */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* e */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* f */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, F
- },
- { /* S1 0 1 2 3 4 5 6 7 8 9 a b c d e f */
- /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 4 */ F, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 5 */ A, A, A, A, A, A, A, A, A, A, A, F, F, F, F, F,
- /* 6 */ F, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 7 */ A, A, A, A, A, A, A, A, A, A, A, F, F, F, F, F,
- /* 8 */ F, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 9 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* a */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* b */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* c */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* d */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* e */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* f */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, F
- }
-};
-#undef A
-#undef F
-
-static int
-cp949_mbc_enc_len(const UChar* p, const UChar* e, OnigEncoding enc ARG_UNUSED)
-{
- int firstbyte = *p++;
- state_t s = trans[0][firstbyte];
-#define RETURN(n) \
- return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(n) : \
- ONIGENC_CONSTRUCT_MBCLEN_INVALID()
- if (s < 0) RETURN(1);
- if (p == e) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(EncLen_CP949[firstbyte]-1);
- s = trans[s][*p++];
- RETURN(2);
-#undef RETURN
-}
-
-static OnigCodePoint
-cp949_mbc_to_code(const UChar* p, const UChar* end, OnigEncoding enc)
-{
- return onigenc_mbn_mbc_to_code(enc, p, end);
-}
-
-static int
-cp949_code_to_mbc(OnigCodePoint code, UChar *buf, OnigEncoding enc)
-{
- return onigenc_mb2_code_to_mbc(enc, code, buf);
-}
-
-static int
-cp949_mbc_case_fold(OnigCaseFoldType flag, const UChar** pp, const UChar* end,
- UChar* lower, OnigEncoding enc)
-{
- return onigenc_mbn_mbc_case_fold(enc, flag,
- pp, end, lower);
-}
-
-#if 0
-static int
-cp949_is_mbc_ambiguous(OnigCaseFoldType flag,
- const UChar** pp, const UChar* end, OnigEncoding enc)
-{
- return onigenc_mbn_is_mbc_ambiguous(enc, flag, pp, end);
-}
-#endif
-
-static int
-cp949_is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc)
-{
- return onigenc_mb2_is_code_ctype(enc, code, ctype);
-}
-
-static UChar*
-cp949_left_adjust_char_head(const UChar* start, const UChar* s, const UChar* end, OnigEncoding enc)
-{
- const UChar *p;
- int len;
-
- if (s <= start) return (UChar* )s;
- p = s;
-
- if (CP949_ISMB_TRAIL(*p)) {
- while (p > start) {
- if (! CP949_ISMB_FIRST(*--p)) {
- p++;
- break;
- }
- }
- }
- len = enclen(enc, p, end);
- if (p + len > s) return (UChar* )p;
- p += len;
- return (UChar* )(p + ((s - p) & ~1));
-}
-
-static int
-cp949_is_allowed_reverse_match(const UChar* s, const UChar* end ARG_UNUSED, OnigEncoding enc ARG_UNUSED)
-{
- const UChar c = *s;
- return (CP949_ISMB_TRAIL(c) ? FALSE : TRUE);
-}
-
-OnigEncodingDefine(cp949, CP949) = {
- cp949_mbc_enc_len,
- "CP949", /* name */
- 2, /* max enc length */
- 1, /* min enc length */
- onigenc_is_mbc_newline_0x0a,
- cp949_mbc_to_code,
- onigenc_mb2_code_to_mbclen,
- cp949_code_to_mbc,
- cp949_mbc_case_fold,
- onigenc_ascii_apply_all_case_fold,
- onigenc_ascii_get_case_fold_codes_by_str,
- onigenc_minimum_property_name_to_ctype,
- cp949_is_code_ctype,
- onigenc_not_support_get_ctype_code_range,
- cp949_left_adjust_char_head,
- cp949_is_allowed_reverse_match
-};
-/*
- * Name: CP949
- * Link: http://www.microsoft.com/globaldev/reference/dbcs/949.mspx
- * Link: http://en.wikipedia.org/wiki/EUC-KR#EUC-KR
- */
diff --git a/enc/depend b/enc/depend
deleted file mode 100644
index 7186179ef0..0000000000
--- a/enc/depend
+++ /dev/null
@@ -1,143 +0,0 @@
-% CONFIG["DLDFLAGS"].sub!(/(\A|\s)(-\S+(?:\s*\w*)?\$\(TARGET\)\S*)/, '\1')
-% dldflags = $2
-% enable_shared = CONFIG['ENABLE_SHARED'] == 'yes'
-% deffile = (true if /\$\(DEFFILE\)/ =~ CONFIG["LINK_SO"])
-% encs = Dir.open($srcdir) {|d| d.grep(/.+\.c\z/)} - BUILTIN_ENCS
-% encs.each {|e| e.chomp!(".c")}
-% encs.reject! {|e| !ENC_PATTERNS.any? {|p| File.fnmatch?(p, e)}} if !ENC_PATTERNS.empty?
-% encs.reject! {|e| NOENC_PATTERNS.any? {|p| File.fnmatch?(p, e)}}
-% alphanumeric_order = proc {|e| e.scan(/(\d+)|(\D+)/).map {|n,a| a||[n.size,n.to_i]}.flatten}
-% encs = encs.sort_by(&alphanumeric_order)
-% encs.unshift(encs.delete("encdb"))
-% atrans = []
-% trans = Dir.open($srcdir+"/trans") {|d|
-% d.select {|e|
-% if e.chomp!('.trans')
-% atrans << e
-% true
-% elsif e.chomp!('.c')
-% true
-% end
-% }
-% }
-% trans -= BUILTIN_TRANSES
-% atrans -= BUILTIN_TRANSES
-% trans.uniq!
-% atrans = atrans.sort_by(&alphanumeric_order)
-% trans = trans.sort_by(&alphanumeric_order)
-% trans.unshift(trans.delete("transdb"))
-% trans.compact!
-% trans |= atrans
-% trans.map! {|e| "trans/#{e}"}
-% dependencies = encs + trans
-% cleanlibs = Shellwords.shellwords(CONFIG["cleanlibs"] || "")
-% cleanobjs = Shellwords.shellwords(CONFIG["cleanobjs"] || "")
-% cleanobjs << "$*.def" if deffile
-% rule_subst = CONFIG["RULE_SUBST"] || "%s"
-% transvpath = rule_subst.dup.sub!(/\{[^{}]+\}/, '$(TRANSVPATH)/') || "enc/trans/%s"
-% transvpath_prefix = (rule_subst.dup.sub!(/\{[^{}]+\}/, '{$(TRANSVPATH)}') || "") % ""
-% if File::ALT_SEPARATOR
-% pathrep = proc {|path| path.gsub('/', File::ALT_SEPARATOR).gsub(/\$\(([@<?*]\w?|\w+)\)/, "$(\\1:/=\\#{File::ALT_SEPARATOR})")}
-% else
-% pathrep = proc {|path| path}
-% end
-
-VPATH = <%=%w[$(arch_hdrdir)/ruby $(hdrdir)/ruby $(srcdir) $(encsrcdir)].join(CONFIG["PATH_SEPARATOR"])%>
-LIBPATH = <%=libpathflag($DEFLIBPATH)%>
-LIBS = <%=
-if enable_shared or RbConfig.expand(CONFIG["LIBRUBY"].dup) != RbConfig.expand(CONFIG["LIBRUBY_A"].dup)
- CONFIG['LIBRUBYARG']
-else
- ''
-end %> <%=CONFIG['LIBS']%> $(EXTLIBS)
-
-ENCOBJS = <%=encs.map {|e|"enc/#{e}.$(OBJEXT)"}.join(" \\\n\t ")%><%="\n" if encs.size>1%>
-ENCSOS = <%=encs.map {|e|"$(ENCSODIR)/#{e}.$(DLEXT)"}.join(" \\\n\t ")%><%="\n" if encs.size>1%>
-ENCCLEANLIBS = <%=cleanlibs.map {|clean|
- clean.gsub(/\$\*(\.\w+)?/) {"$(ENCOBJS#{$1 ? ":.#{CONFIG["OBJEXT"]}=#{$1}" : ""})"}
-}.join(" ")%>
-ENCCLEANOBJS = <%=cleanobjs.map {|clean|
- clean.gsub(/\$\*(\.\w+)?/) {"$(ENCOBJS#{$1 ? ":.#{CONFIG["OBJEXT"]}=#{$1}" : ""})"}
-}.join(" ")%>
-
-TRANSVPATH = $(srcdir)/enc/trans
-
-TRANSCSRCS = <%=atrans.map {|e| transvpath % "#{e}.c"}.join(" \\\n\t ")%><%="\n" if trans.size>1%>
-TRANSOBJS = <%=trans.map {|e|"enc/#{e}.$(OBJEXT)"}.join(" \\\n\t ")%><%="\n" if trans.size>1%>
-TRANSSOS = <%=trans.map {|e|"$(ENCSODIR)/#{e}.$(DLEXT)"}.join(" \\\n\t ")%><%="\n" if trans.size>1%>
-TRANSCLEANLIBS = <%=cleanlibs.map {|clean|
- clean.gsub(/\$\*(\.\w+)?/) {"$(TRANSOBJS#{$1 ? ":.#{CONFIG["OBJEXT"]}=#{$1}" : ""})"}
-}.join(" ")%>
-TRANSCLEANOBJS = <%=cleanobjs.map {|clean|
- clean.gsub(/\$\*(\.\w+)?/) {"$(TRANSOBJS#{$1 ? ":.#{CONFIG["OBJEXT"]}=#{$1}" : ""})"}
-}.join(" ")%>
-
-encs: all
-all: enc trans
-enc: $(ENCSOS)
-trans: $(TRANSSOS)
-
-srcs: $(TRANSCSRCS)
-
-<%=transvpath_prefix%>.trans<%=transvpath_prefix%>.c:
- $(MINIRUBY) "$(srcdir)/tool/transcode-tblgen.rb" -vo "$@" "$<"
-
-% unless encs.empty? or trans.empty?
-
-% unless encs.empty?
-$(ENCOBJS): regenc.h oniguruma.h config.h defines.h
-% end
-% unless trans.empty?
-$(TRANSOBJS): ruby.h intern.h config.h defines.h missing.h encoding.h oniguruma.h st.h transcode_data.h
-% end
-% atrans.each do |e|
-% src = "#{e}.trans"
-
-<%=transvpath % "#{e}.c"%>: <%= transvpath % "#{e}.trans"%>
-% src = [*IO.read(File.join($srcdir, "trans", src)).scan(/^\s*require\s+[\'\"]([^\'\"]*)/).flatten.map{|c|c+".rb"}]
-<%=transvpath % "#{e}.c"%>: <%= src.map {|e| transvpath % "#{e}"}.join(" ")%> $(srcdir)/tool/transcode-tblgen.rb
-% end
-
-% end
-% link_so = LINK_SO.gsub(/\n/, "\n\t")
-% link_so.gsub!(/(-(?:implib|pdb):\S+)-\$\(arch\)\./, '\1.')
-% dependencies.each do |e|
-% obj = "enc/#{e}.$(OBJEXT)"
-% df = ("enc/#{e}.def" if deffile)
-$(ENCSODIR)/<%=e%>.$(DLEXT): <%=obj%>
-% cmd = link_so.sub(/\$\(OBJS\)/) {obj}
-% base = File.basename(e)
-% cmd.sub!(/(?=\$\(DLDFLAGS\))/) {dldflags.sub(/\$\(TARGET\)/) {base} + " "} if dldflags
-% if df
- echo> <%=df%> EXPORTS
- echo>> <%=df%> <%=EXPORT_PREFIX%>Init_<%=base%>
-% cmd.sub!(/\$\(DEFFILE\)/) {df}
-% cmd.gsub!(/-(?:implib|pdb):/) {|s|"#{s}enc/#{e.sub(/[^\/]+\z/, '')}"}
-% end
- @$(MAKEDIRS) "$(@D)"
- <%=cmd%>
-
-% end
-% dependencies.each do |e|
-<%="enc/#{e}.$(OBJEXT)"%>: <%="$(encsrcdir)/#{e}.c"%>
- -@$(MAKEDIRS) "$(@D)"
- <%=COMPILE_C.gsub(/\$(\()?<(\:[^)]+)?(\))?/){"$(encsrcdir)/#{e}.c"}%>
-
-% end
-
-enc/encdb.$(OBJEXT): encdb.h
-enc/trans/transdb.$(OBJEXT): transdb.h
-
-clean:
-% %w[$(ENCSOS) $(ENCOBJS) $(ENCCLEANOBJS) $(ENCCLEANLIBS) $(TRANSSOS) $(TRANSOBJS) $(TRANSCLEANOBJS) $(TRANSCLEANLIBS)].each do |clean|
- @$(RM) <%=pathrep[clean]%>
-% end
-% %w[$(TRANSSODIR) $(ENCSODIR)].each do|dir|
- @-rmdir <%=pathrep[dir]%>
-% end
-
-clean-srcs:
- @$(RM) <%=pathrep['$(TRANSCSRCS)']%>
-% %w[enc/trans enc].each do|dir|
- @-rmdir <%=pathrep[dir]%>
-% end
diff --git a/enc/emacs_mule.c b/enc/emacs_mule.c
deleted file mode 100644
index be7f842259..0000000000
--- a/enc/emacs_mule.c
+++ /dev/null
@@ -1,340 +0,0 @@
-/**********************************************************************
- emacs_mule.c - Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2007 K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regint.h"
-
-
-#define emacsmule_islead(c) ((UChar )((c) - 0x81) > 0x9d - 0x81)
-
-/*
- CHARACTER := ASCII_CHAR | MULTIBYTE_CHAR
- MULTIBYTE_CHAR := PRIMARY_CHAR_1 | PRIMARY_CHAR_2
- | SECONDARY_CHAR_1 | SECONDARY_CHAR_2
- PRIMARY_CHAR_1 := LEADING_CODE_PRI C1
- PRIMARY_CHAR_2 := LEADING_CODE_PRI C1 C2
- SECONDARY_CHAR_1 := LEADING_CODE_SEC LEADING_CODE_EXT C1
- SECONDARY_CHAR_2 := LEADING_CODE_SEC LEADING_CODE_EXT C1 C2
- ASCII_CHAR := 0 | 1 | ... | 127
- LEADING_CODE_PRI := 129 | 130 | ... | 153
- LEADING_CODE_SEC := 154 | 155 | 156 | 157
- C1, C2, LEADING_CODE_EXT := 160 | 161 | ... | 255
- */
-
-static const int EncLen_EmacsMule[] = {
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-};
-
-typedef enum { FAILURE = -2, ACCEPT = -1, S0 = 0, S1, S2, S3, S4, S5, S6 } state_t;
-#define A ACCEPT
-#define F FAILURE
-static const signed char trans[][0x100] = {
- { /* S0 0 1 2 3 4 5 6 7 8 9 a b c d e f */
- /* 0 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 1 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 2 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 3 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 4 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 5 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 6 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 7 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 8 */ F, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* 9 */ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 4, 4, 5, 6, F, F,
- /* a */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* b */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* c */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* d */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* e */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* f */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F
- },
- { /* S1 0 1 2 3 4 5 6 7 8 9 a b c d e f */
- /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 4 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 5 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 6 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 7 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 8 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 9 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* a */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* b */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* c */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* d */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* e */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* f */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A
- },
- { /* S2 0 1 2 3 4 5 6 7 8 9 a b c d e f */
- /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 4 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 5 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 6 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 7 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 8 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 9 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* a */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* b */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* c */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* d */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* e */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* f */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
- },
- { /* S3 0 1 2 3 4 5 6 7 8 9 a b c d e f */
- /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 4 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 5 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 6 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 7 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 8 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 9 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* a */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* b */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* c */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* d */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* e */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* f */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F
- },
- { /* S4 0 1 2 3 4 5 6 7 8 9 a b c d e f */
- /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 4 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 5 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 6 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 7 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 8 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 9 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* a */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* b */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* c */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* d */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* e */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* f */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F
- },
- { /* S5 0 1 2 3 4 5 6 7 8 9 a b c d e f */
- /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 4 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 5 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 6 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 7 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 8 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 9 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* a */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* b */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* c */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* d */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* e */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* f */ 2, 2, 2, 2, 2, F, F, F, F, F, F, F, F, F, F, F
- },
- { /* S6 0 1 2 3 4 5 6 7 8 9 a b c d e f */
- /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 4 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 5 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 6 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 7 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 8 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 9 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* a */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* b */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* c */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* d */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* e */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* f */ F, F, F, F, F, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, F
- },
-
-};
-#undef A
-#undef F
-
-static int
-mbc_enc_len(const UChar* p, const UChar* e, OnigEncoding enc ARG_UNUSED)
-{
- int firstbyte = *p++;
- state_t s;
- s = trans[0][firstbyte];
- if (s < 0) return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(1) :
- ONIGENC_CONSTRUCT_MBCLEN_INVALID();
- if (p == e) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(EncLen_EmacsMule[firstbyte]-1);
- s = trans[s][*p++];
- if (s < 0) return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(2) :
- ONIGENC_CONSTRUCT_MBCLEN_INVALID();
- if (p == e) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(EncLen_EmacsMule[firstbyte]-2);
- s = trans[s][*p++];
- if (s < 0) return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(3) :
- ONIGENC_CONSTRUCT_MBCLEN_INVALID();
- if (p == e) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(EncLen_EmacsMule[firstbyte]-3);
- s = trans[s][*p++];
- return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(4) :
- ONIGENC_CONSTRUCT_MBCLEN_INVALID();
-}
-
-static OnigCodePoint
-mbc_to_code(const UChar* p, const UChar* end, OnigEncoding enc)
-{
- int c, i, len;
- OnigCodePoint n;
-
- len = enclen(enc, p, end);
- n = (OnigCodePoint )*p++;
- if (len == 1) return n;
-
- for (i = 1; i < len; i++) {
- if (p >= end) break;
- c = *p++;
- n <<= 8; n += c;
- }
- return n;
-}
-
-static int
-code_to_mbclen(OnigCodePoint code, OnigEncoding enc ARG_UNUSED)
-{
- if (ONIGENC_IS_CODE_ASCII(code)) return 1;
- else if (code > 0xffffffff) return 0;
- else if ((code & 0xff000000) >= 0x80000000) return 4;
- else if ((code & 0xff0000) >= 0x800000) return 3;
- else if ((code & 0xff00) >= 0x8000) return 2;
- else
- return ONIGERR_INVALID_CODE_POINT_VALUE;
-}
-
-static int
-code_to_mbc(OnigCodePoint code, UChar *buf, OnigEncoding enc)
-{
- UChar *p = buf;
-
- if ((code & 0xff000000) != 0) *p++ = (UChar )(((code >> 24) & 0xff));
- if ((code & 0xff0000) != 0) *p++ = (UChar )(((code >> 16) & 0xff));
- if ((code & 0xff00) != 0) *p++ = (UChar )(((code >> 8) & 0xff));
- *p++ = (UChar )(code & 0xff);
-
- if (enclen(enc, buf, p) != (p - buf))
- return ONIGERR_INVALID_CODE_POINT_VALUE;
- return p - buf;
-}
-
-static int
-mbc_case_fold(OnigCaseFoldType flag,
- const UChar** pp, const UChar* end, UChar* lower,
- OnigEncoding enc)
-{
- int len;
- const UChar* p = *pp;
-
- if (ONIGENC_IS_MBC_ASCII(p)) {
- *lower = ONIGENC_ASCII_CODE_TO_LOWER_CASE(*p);
- (*pp)++;
- return 1;
- }
- else {
- int i;
-
- len = mbc_enc_len(p, end, enc);
- for (i = 0; i < len; i++) {
- *lower++ = *p++;
- }
- (*pp) += len;
- return len; /* return byte length of converted char to lower */
- }
-}
-
-static UChar*
-left_adjust_char_head(const UChar* start, const UChar* s, const UChar* end, OnigEncoding enc)
-{
- const UChar *p;
-
- if (s <= start) return (UChar* )s;
- p = s;
-
- while (!emacsmule_islead(*p) && p > start) p--;
- return (UChar* )p;
-}
-
-static int
-is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSED)
-{
- if (code < 128)
- return ONIGENC_IS_ASCII_CODE_CTYPE(code, ctype);
- else
- return (code_to_mbclen(code, enc) > 1 ? TRUE : FALSE);
-}
-
-/*
- * Name: Emacs-Mule
- * Link: http://www.m17n.org/mule/pricai96/mule.en.html
- */
-OnigEncodingDefine(emacs_mule, Emacs_Mule) = {
- mbc_enc_len,
- "Emacs-Mule", /* name */
- 4, /* max enc length */
- 1, /* min enc length */
- onigenc_is_mbc_newline_0x0a,
- mbc_to_code,
- code_to_mbclen,
- code_to_mbc,
- mbc_case_fold,
- onigenc_ascii_apply_all_case_fold,
- onigenc_ascii_get_case_fold_codes_by_str,
- onigenc_minimum_property_name_to_ctype,
- is_code_ctype,
- onigenc_not_support_get_ctype_code_range,
- left_adjust_char_head,
- onigenc_always_true_is_allowed_reverse_match,
- 0
-};
-
-ENC_REPLICATE("stateless-ISO-2022-JP", "Emacs-Mule")
diff --git a/enc/encdb.c b/enc/encdb.c
deleted file mode 100644
index 11f80e8640..0000000000
--- a/enc/encdb.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/**********************************************************************
-
- enc/encdb.c -
-
- $Author$
- created at: Mon Apr 7 15:51:31 2008
-
- Copyright (C) 2008 Yukihiro Matsumoto
-
-**********************************************************************/
-
-int rb_encdb_replicate(const char *alias, const char *orig);
-int rb_encdb_alias(const char *alias, const char *orig);
-int rb_encdb_dummy(const char *name);
-void rb_encdb_declare(const char *name);
-void rb_enc_set_base(const char *name, const char *orig);
-#define ENC_REPLICATE(name, orig) rb_encdb_replicate(name, orig)
-#define ENC_ALIAS(name, orig) rb_encdb_alias(name, orig)
-#define ENC_DUMMY(name) rb_encdb_dummy(name)
-#define ENC_DEFINE(name) rb_encdb_declare(name)
-#define ENC_SET_BASE(name, orig) rb_enc_set_base(name, orig)
-
-void
-Init_encdb(void)
-{
-#include "encdb.h"
-}
diff --git a/enc/euc_jp.c b/enc/euc_jp.c
deleted file mode 100644
index 21f30ad2f3..0000000000
--- a/enc/euc_jp.c
+++ /dev/null
@@ -1,388 +0,0 @@
-/**********************************************************************
- euc_jp.c - Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2007 K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regint.h"
-
-
-#define eucjp_islead(c) ((UChar )((c) - 0xa1) > 0xfe - 0xa1)
-
-static const int EncLen_EUCJP[] = {
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 3,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1
-};
-
-typedef enum { FAILURE = -2, ACCEPT = -1, S0 = 0, S1, S2 } state_t;
-#define A ACCEPT
-#define F FAILURE
-static const signed char trans[][0x100] = {
- { /* S0 0 1 2 3 4 5 6 7 8 9 a b c d e f */
- /* 0 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 1 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 2 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 3 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 4 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 5 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 6 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 7 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 8 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, 1, 2,
- /* 9 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* a */ F, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* b */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* c */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* d */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* e */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* f */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, F
- },
- { /* S1 0 1 2 3 4 5 6 7 8 9 a b c d e f */
- /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 4 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 5 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 6 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 7 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 8 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 9 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* a */ F, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* b */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* c */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* d */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* e */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* f */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, F
- },
- { /* S2 0 1 2 3 4 5 6 7 8 9 a b c d e f */
- /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 4 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 5 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 6 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 7 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 8 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 9 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* a */ F, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* b */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* c */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* d */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* e */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* f */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, F
- },
-
-};
-#undef A
-#undef F
-
-static int
-mbc_enc_len(const UChar* p, const UChar* e, OnigEncoding enc ARG_UNUSED)
-{
- int firstbyte = *p++;
- state_t s;
- s = trans[0][firstbyte];
- if (s < 0) return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(1) :
- ONIGENC_CONSTRUCT_MBCLEN_INVALID();
- if (p == e) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(EncLen_EUCJP[firstbyte]-1);
- s = trans[s][*p++];
- if (s < 0) return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(2) :
- ONIGENC_CONSTRUCT_MBCLEN_INVALID();
- if (p == e) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(EncLen_EUCJP[firstbyte]-2);
- s = trans[s][*p++];
- return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(3) :
- ONIGENC_CONSTRUCT_MBCLEN_INVALID();
-}
-
-static OnigCodePoint
-mbc_to_code(const UChar* p, const UChar* end, OnigEncoding enc)
-{
- int c, i, len;
- OnigCodePoint n;
-
- len = enclen(enc, p, end);
- n = (OnigCodePoint )*p++;
- if (len == 1) return n;
-
- for (i = 1; i < len; i++) {
- if (p >= end) break;
- c = *p++;
- n <<= 8; n += c;
- }
- return n;
-}
-
-static int
-code_to_mbclen(OnigCodePoint code, OnigEncoding enc ARG_UNUSED)
-{
- if (ONIGENC_IS_CODE_ASCII(code)) return 1;
- else if (code > 0xffffff) return 0;
- else if ((code & 0xff0000) >= 0x800000) return 3;
- else if ((code & 0xff00) >= 0x8000) return 2;
- else
- return ONIGERR_INVALID_CODE_POINT_VALUE;
-}
-
-#if 0
-static int
-code_to_mbc_first(OnigCodePoint code)
-{
- int first;
-
- if ((code & 0xff0000) != 0) {
- first = (code >> 16) & 0xff;
- }
- else if ((code & 0xff00) != 0) {
- first = (code >> 8) & 0xff;
- }
- else {
- return (int )code;
- }
- return first;
-}
-#endif
-
-static int
-code_to_mbc(OnigCodePoint code, UChar *buf, OnigEncoding enc)
-{
- UChar *p = buf;
-
- if ((code & 0xff0000) != 0) *p++ = (UChar )(((code >> 16) & 0xff));
- if ((code & 0xff00) != 0) *p++ = (UChar )(((code >> 8) & 0xff));
- *p++ = (UChar )(code & 0xff);
-
-#if 1
- if (enclen(enc, buf, p) != (p - buf))
- return ONIGERR_INVALID_CODE_POINT_VALUE;
-#endif
- return p - buf;
-}
-
-static int
-mbc_case_fold(OnigCaseFoldType flag,
- const UChar** pp, const UChar* end, UChar* lower,
- OnigEncoding enc)
-{
- int len;
- const UChar* p = *pp;
-
- if (ONIGENC_IS_MBC_ASCII(p)) {
- *lower = ONIGENC_ASCII_CODE_TO_LOWER_CASE(*p);
- (*pp)++;
- return 1;
- }
- else {
- int i;
-
- len = enclen(enc, p, end);
- for (i = 0; i < len; i++) {
- *lower++ = *p++;
- }
- (*pp) += len;
- return len; /* return byte length of converted char to lower */
- }
-}
-
-static UChar*
-left_adjust_char_head(const UChar* start, const UChar* s, const UChar* end, OnigEncoding enc)
-{
- /* In this encoding
- mb-trail bytes doesn't mix with single bytes.
- */
- const UChar *p;
- int len;
-
- if (s <= start) return (UChar* )s;
- p = s;
-
- while (!eucjp_islead(*p) && p > start) p--;
- len = enclen(enc, p, end);
- if (p + len > s) return (UChar* )p;
- p += len;
- return (UChar* )(p + ((s - p) & ~1));
-}
-
-static int
-is_allowed_reverse_match(const UChar* s, const UChar* end, OnigEncoding enc ARG_UNUSED)
-{
- const UChar c = *s;
- if (c <= 0x7e || c == 0x8e || c == 0x8f)
- return TRUE;
- else
- return FALSE;
-}
-
-
-static int PropertyInited = 0;
-static const OnigCodePoint** PropertyList;
-static int PropertyListNum;
-static int PropertyListSize;
-static hash_table_type* PropertyNameTable;
-
-static const OnigCodePoint CR_Hiragana[] = {
- 1,
- 0xa4a1, 0xa4f3
-}; /* CR_Hiragana */
-
-static const OnigCodePoint CR_Katakana[] = {
- 3,
- 0xa5a1, 0xa5f6,
- 0xaaa6, 0xaaaf,
- 0xaab1, 0xaadd
-}; /* CR_Katakana */
-
-static int
-init_property_list(void)
-{
- int r;
-
- PROPERTY_LIST_ADD_PROP("Hiragana", CR_Hiragana);
- PROPERTY_LIST_ADD_PROP("Katakana", CR_Katakana);
- PropertyInited = 1;
-
- end:
- return r;
-}
-
-static int
-property_name_to_ctype(OnigEncoding enc, UChar* p, UChar* end)
-{
- st_data_t ctype;
-
- PROPERTY_LIST_INIT_CHECK;
-
- if (onig_st_lookup_strend(PropertyNameTable, p, end, &ctype) == 0) {
- return onigenc_minimum_property_name_to_ctype(enc, p, end);
- }
-
- return ctype;
-}
-
-static int
-is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSED)
-{
- if (ctype <= ONIGENC_MAX_STD_CTYPE) {
- if (code < 128)
- return ONIGENC_IS_ASCII_CODE_CTYPE(code, ctype);
- else {
- if (CTYPE_IS_WORD_GRAPH_PRINT(ctype)) {
- return (code_to_mbclen(code, enc) > 1 ? TRUE : FALSE);
- }
- }
- }
- else {
- PROPERTY_LIST_INIT_CHECK;
-
- ctype -= (ONIGENC_MAX_STD_CTYPE + 1);
- if (ctype >= (unsigned int )PropertyListNum)
- return ONIGERR_TYPE_BUG;
-
- return onig_is_in_code_range((UChar* )PropertyList[ctype], code);
- }
-
- return FALSE;
-}
-
-static int
-get_ctype_code_range(OnigCtype ctype, OnigCodePoint* sb_out,
- const OnigCodePoint* ranges[], OnigEncoding enc ARG_UNUSED)
-{
- if (ctype <= ONIGENC_MAX_STD_CTYPE) {
- return ONIG_NO_SUPPORT_CONFIG;
- }
- else {
- *sb_out = 0x80;
-
- PROPERTY_LIST_INIT_CHECK;
-
- ctype -= (ONIGENC_MAX_STD_CTYPE + 1);
- if (ctype >= (OnigCtype )PropertyListNum)
- return ONIGERR_TYPE_BUG;
-
- *ranges = PropertyList[ctype];
- return 0;
- }
-}
-
-
-OnigEncodingDefine(euc_jp, EUC_JP) = {
- mbc_enc_len,
- "EUC-JP", /* name */
- 3, /* max enc length */
- 1, /* min enc length */
- onigenc_is_mbc_newline_0x0a,
- mbc_to_code,
- code_to_mbclen,
- code_to_mbc,
- mbc_case_fold,
- onigenc_ascii_apply_all_case_fold,
- onigenc_ascii_get_case_fold_codes_by_str,
- property_name_to_ctype,
- is_code_ctype,
- get_ctype_code_range,
- left_adjust_char_head,
- is_allowed_reverse_match,
- 0
-};
-/*
- * Name: EUC-JP
- * MIBenum: 18
- * Link: http://www.iana.org/assignments/character-sets
- * Link: http://home.m05.itscom.net/numa/cde/sjis-euc/sjis-euc.html
- */
-ENC_ALIAS("eucJP", "EUC-JP") /* UI-OSF Application Platform Profile for Japanese Environment Version 1.1 */
-
-/*
- * Name: eucJP-ms
- * Link: http://home.m05.itscom.net/numa/cde/ucs-conv/ucs-conv.html
- * Link: http://www2d.biglobe.ne.jp/~msyk/charcode/cp932/eucJP-ms.html
- * Link: http://ja.wikipedia.org/wiki/EUC-JP
- */
-ENC_REPLICATE("eucJP-ms", "EUC-JP") /* TOG/JVC CDE/Motif Technical WG */
-ENC_ALIAS("euc-jp-ms", "eucJP-ms")
-
-/*
- * Name: CP51932
- * Link: http://search.cpan.org/src/NARUSE/Encode-EUCJPMS-0.07/ucm/cp51932.ucm
- * Link: http://legacy-encoding.sourceforge.jp/wiki/index.php?cp51932
- * Link: http://msyk.at.webry.info/200511/article_2.html
- */
-ENC_REPLICATE("CP51932", "EUC-JP")
diff --git a/enc/euc_kr.c b/enc/euc_kr.c
deleted file mode 100644
index f20a57e69a..0000000000
--- a/enc/euc_kr.c
+++ /dev/null
@@ -1,192 +0,0 @@
-/**********************************************************************
- euc_kr.c - Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2007 K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regenc.h"
-
-static const int EncLen_EUCKR[] = {
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1
-};
-
-typedef enum { FAILURE = -2, ACCEPT = -1, S0 = 0, S1 } state_t;
-#define A ACCEPT
-#define F FAILURE
-static const signed char trans[][0x100] = {
- { /* S0 0 1 2 3 4 5 6 7 8 9 a b c d e f */
- /* 0 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 1 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 2 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 3 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 4 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 5 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 6 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 7 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 8 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 9 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* a */ F, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* b */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* c */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* d */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* e */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* f */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, F
- },
- { /* S1 0 1 2 3 4 5 6 7 8 9 a b c d e f */
- /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 4 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 5 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 6 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 7 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 8 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 9 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* a */ F, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* b */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* c */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* d */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* e */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* f */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, F
- }
-};
-#undef A
-#undef F
-
-static int
-euckr_mbc_enc_len(const UChar* p, const UChar* e, OnigEncoding enc ARG_UNUSED)
-{
- int firstbyte = *p++;
- state_t s = trans[0][firstbyte];
-#define RETURN(n) \
- return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(n) : \
- ONIGENC_CONSTRUCT_MBCLEN_INVALID()
- if (s < 0) RETURN(1);
- if (p == e) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(EncLen_EUCKR[firstbyte]-1);
- s = trans[s][*p++];
- RETURN(2);
-#undef RETURN
-}
-
-static OnigCodePoint
-euckr_mbc_to_code(const UChar* p, const UChar* end, OnigEncoding enc)
-{
- return onigenc_mbn_mbc_to_code(enc, p, end);
-}
-
-static int
-euckr_code_to_mbc(OnigCodePoint code, UChar *buf, OnigEncoding enc)
-{
- return onigenc_mb2_code_to_mbc(enc, code, buf);
-}
-
-static int
-euckr_mbc_case_fold(OnigCaseFoldType flag, const UChar** pp, const UChar* end,
- UChar* lower, OnigEncoding enc)
-{
- return onigenc_mbn_mbc_case_fold(enc, flag,
- pp, end, lower);
-}
-
-#if 0
-static int
-euckr_is_mbc_ambiguous(OnigCaseFoldType flag,
- const UChar** pp, const UChar* end, OnigEncoding enc)
-{
- return onigenc_mbn_is_mbc_ambiguous(enc, flag, pp, end);
-}
-#endif
-
-static int
-euckr_is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc)
-{
- return onigenc_mb2_is_code_ctype(enc, code, ctype);
-}
-
-#define euckr_islead(c) ((c) < 0xa1 || (c) == 0xff)
-
-static UChar*
-euckr_left_adjust_char_head(const UChar* start, const UChar* s, const UChar* end, OnigEncoding enc)
-{
- /* Assumed in this encoding,
- mb-trail bytes don't mix with single bytes.
- */
- const UChar *p;
- int len;
-
- if (s <= start) return (UChar* )s;
- p = s;
-
- while (!euckr_islead(*p) && p > start) p--;
- len = enclen(enc, p, end);
- if (p + len > s) return (UChar* )p;
- p += len;
- return (UChar* )(p + ((s - p) & ~1));
-}
-
-static int
-euckr_is_allowed_reverse_match(const UChar* s, const UChar* end ARG_UNUSED, OnigEncoding enc ARG_UNUSED)
-{
- const UChar c = *s;
- if (c <= 0x7e) return TRUE;
- else return FALSE;
-}
-
-OnigEncodingDefine(euc_kr, EUC_KR) = {
- euckr_mbc_enc_len,
- "EUC-KR", /* name */
- 2, /* max enc length */
- 1, /* min enc length */
- onigenc_is_mbc_newline_0x0a,
- euckr_mbc_to_code,
- onigenc_mb2_code_to_mbclen,
- euckr_code_to_mbc,
- euckr_mbc_case_fold,
- onigenc_ascii_apply_all_case_fold,
- onigenc_ascii_get_case_fold_codes_by_str,
- onigenc_minimum_property_name_to_ctype,
- euckr_is_code_ctype,
- onigenc_not_support_get_ctype_code_range,
- euckr_left_adjust_char_head,
- euckr_is_allowed_reverse_match
-};
-ENC_ALIAS("eucKR", "EUC-KR")
diff --git a/enc/euc_tw.c b/enc/euc_tw.c
deleted file mode 100644
index d025a0dd45..0000000000
--- a/enc/euc_tw.c
+++ /dev/null
@@ -1,234 +0,0 @@
-/**********************************************************************
- euc_tw.c - Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2007 K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regenc.h"
-
-static const int EncLen_EUCTW[] = {
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1
-};
-
-typedef enum { FAILURE = -2, ACCEPT = -1, S0 = 0, S1, S2, S3 } state_t;
-#define A ACCEPT
-#define F FAILURE
-static const signed char trans[][0x100] = {
- { /* S0 0 1 2 3 4 5 6 7 8 9 a b c d e f */
- /* 0 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 1 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 2 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 3 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 4 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 5 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 6 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 7 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 8 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, 2, F,
- /* 9 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* a */ F, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* b */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* c */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* d */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* e */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* f */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, F
- },
- { /* S1 0 1 2 3 4 5 6 7 8 9 a b c d e f */
- /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 4 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 5 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 6 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 7 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 8 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 9 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* a */ F, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* b */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* c */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* d */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* e */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* f */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, F
- },
- { /* S2 0 1 2 3 4 5 6 7 8 9 a b c d e f */
- /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 4 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 5 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 6 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 7 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 8 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 9 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* a */ F, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
- /* b */ 3, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* c */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* d */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* e */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* f */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F
- },
- { /* S3 0 1 2 3 4 5 6 7 8 9 a b c d e f */
- /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 4 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 5 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 6 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 7 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 8 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 9 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* a */ F, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* b */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* c */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* d */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* e */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* f */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, F
- }
-};
-#undef A
-#undef F
-
-static int
-euctw_mbc_enc_len(const UChar* p, const UChar* e, OnigEncoding enc ARG_UNUSED)
-{
- int firstbyte = *p++;
- state_t s = trans[0][firstbyte];
-#define RETURN(n) \
- return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(n) : \
- ONIGENC_CONSTRUCT_MBCLEN_INVALID()
- if (s < 0) RETURN(1);
- if (p == e) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(EncLen_EUCTW[firstbyte]-1);
- s = trans[s][*p++];
- if (s < 0) RETURN(2);
- if (p == e) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(4-2);
- s = trans[s][*p++];
- if (s < 0) RETURN(3);
- if (p == e) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(4-3);
- s = trans[s][*p++];
- RETURN(4);
-#undef RETURN
-}
-
-static OnigCodePoint
-euctw_mbc_to_code(const UChar* p, const UChar* end, OnigEncoding enc ARG_UNUSED)
-{
- return onigenc_mbn_mbc_to_code(enc, p, end);
-}
-
-static int
-euctw_code_to_mbc(OnigCodePoint code, UChar *buf, OnigEncoding enc)
-{
- return onigenc_mb4_code_to_mbc(enc, code, buf);
-}
-
-static int
-euctw_mbc_case_fold(OnigCaseFoldType flag, const UChar** pp, const UChar* end,
- UChar* lower, OnigEncoding enc)
-{
- return onigenc_mbn_mbc_case_fold(enc, flag,
- pp, end, lower);
-}
-
-#if 0
-static int
-euctw_is_mbc_ambiguous(OnigCaseFoldType flag,
- const UChar** pp, const UChar* end, OnigEncoding enc)
-{
- return onigenc_mbn_is_mbc_ambiguous(enc, flag, pp, end);
-}
-#endif
-
-static int
-euctw_is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc)
-{
- return onigenc_mb4_is_code_ctype(enc, code, ctype);
-}
-
-#define euctw_islead(c) ((UChar )((c) - 0xa1) > 0xfe - 0xa1)
-
-static UChar*
-euctw_left_adjust_char_head(const UChar* start, const UChar* s, const UChar* end, OnigEncoding enc)
-{
- /* Assumed in this encoding,
- mb-trail bytes don't mix with single bytes.
- */
- const UChar *p;
- int len;
-
- if (s <= start) return (UChar* )s;
- p = s;
-
- while (!euctw_islead(*p) && p > start) p--;
- len = enclen(enc, p, end);
- if (p + len > s) return (UChar* )p;
- p += len;
- return (UChar* )(p + ((s - p) & ~1));
-}
-
-static int
-euctw_is_allowed_reverse_match(const UChar* s, const UChar* end ARG_UNUSED, OnigEncoding enc ARG_UNUSED)
-{
- const UChar c = *s;
- if (c <= 0x7e) return TRUE;
- else return FALSE;
-}
-
-OnigEncodingDefine(euc_tw, EUC_TW) = {
- euctw_mbc_enc_len,
- "EUC-TW", /* name */
- 4, /* max enc length */
- 1, /* min enc length */
- onigenc_is_mbc_newline_0x0a,
- euctw_mbc_to_code,
- onigenc_mb4_code_to_mbclen,
- euctw_code_to_mbc,
- euctw_mbc_case_fold,
- onigenc_ascii_apply_all_case_fold,
- onigenc_ascii_get_case_fold_codes_by_str,
- onigenc_minimum_property_name_to_ctype,
- euctw_is_code_ctype,
- onigenc_not_support_get_ctype_code_range,
- euctw_left_adjust_char_head,
- euctw_is_allowed_reverse_match
-};
-ENC_ALIAS("eucTW", "EUC-TW")
diff --git a/enc/gb18030.c b/enc/gb18030.c
deleted file mode 100644
index 16c8c1c17f..0000000000
--- a/enc/gb18030.c
+++ /dev/null
@@ -1,596 +0,0 @@
-/**********************************************************************
- gb18030.c - Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2005-2007 KUBO Takehiro <kubo AT jiubao DOT org>
- * K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regenc.h"
-
-#if 1
-#define DEBUG_GB18030(arg)
-#else
-#define DEBUG_GB18030(arg) printf arg
-#endif
-
-enum {
- C1, /* one-byte char */
- C2, /* one-byte or second of two-byte char */
- C4, /* one-byte or second or fourth of four-byte char */
- CM /* first of two- or four-byte char or second of two-byte char */
-};
-
-static const char GB18030_MAP[] = {
- C1, C1, C1, C1, C1, C1, C1, C1, C1, C1, C1, C1, C1, C1, C1, C1,
- C1, C1, C1, C1, C1, C1, C1, C1, C1, C1, C1, C1, C1, C1, C1, C1,
- C1, C1, C1, C1, C1, C1, C1, C1, C1, C1, C1, C1, C1, C1, C1, C1,
- C4, C4, C4, C4, C4, C4, C4, C4, C4, C4, C1, C1, C1, C1, C1, C1,
- C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2,
- C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2,
- C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2,
- C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C1,
- C2, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM,
- CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM,
- CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM,
- CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM,
- CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM,
- CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM,
- CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM,
- CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, C1
-};
-
-typedef enum { FAILURE = -2, ACCEPT = -1, S0 = 0, S1, S2, S3 } state_t;
-#define A ACCEPT
-#define F FAILURE
-static const signed char trans[][0x100] = {
- { /* S0 0 1 2 3 4 5 6 7 8 9 a b c d e f */
- /* 0 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 1 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 2 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 3 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 4 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 5 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 6 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 7 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 8 */ F, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* 9 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* a */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* b */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* c */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* d */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* e */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* f */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, F
- },
- { /* S1 0 1 2 3 4 5 6 7 8 9 a b c d e f */
- /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 3 */ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, F, F, F, F, F, F,
- /* 4 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 5 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 6 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 7 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, F,
- /* 8 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 9 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* a */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* b */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* c */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* d */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* e */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* f */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, F
- },
- { /* S2 0 1 2 3 4 5 6 7 8 9 a b c d e f */
- /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 4 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 5 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 6 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 7 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 8 */ F, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
- /* 9 */ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
- /* a */ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
- /* b */ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
- /* c */ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
- /* d */ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
- /* e */ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
- /* f */ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, F
- },
- { /* S3 0 1 2 3 4 5 6 7 8 9 a b c d e f */
- /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 3 */ A, A, A, A, A, A, A, A, A, A, F, F, F, F, F, F,
- /* 4 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 5 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 6 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 7 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 8 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 9 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* a */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* b */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* c */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* d */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* e */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* f */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F
- }
-};
-#undef A
-#undef F
-
-static int
-gb18030_mbc_enc_len(const UChar* p, const UChar* e, OnigEncoding enc ARG_UNUSED)
-{
- int firstbyte = *p++;
- state_t s = trans[0][firstbyte];
-#define RETURN(n) \
- return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(n) : \
- ONIGENC_CONSTRUCT_MBCLEN_INVALID()
- if (s < 0) RETURN(1);
- if (p == e) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(2-1);
- s = trans[s][*p++];
- if (s < 0) RETURN(2);
- if (p == e) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(4-2);
- s = trans[s][*p++];
- if (s < 0) RETURN(3);
- if (p == e) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(4-3);
- s = trans[s][*p++];
- RETURN(4);
-#undef RETURN
-}
-
-static OnigCodePoint
-gb18030_mbc_to_code(const UChar* p, const UChar* end, OnigEncoding enc)
-{
- int c, i, len;
- OnigCodePoint n;
-
- len = enclen(enc, p, end);
- n = (OnigCodePoint )(*p++);
- if (len == 1) return n;
-
- for (i = 1; i < len; i++) {
- if (p >= end) break;
- c = *p++;
- n <<= 8; n += c;
- }
- return n;
-}
-
-static int
-gb18030_code_to_mbc(OnigCodePoint code, UChar *buf, OnigEncoding enc)
-{
- return onigenc_mb4_code_to_mbc(enc, code, buf);
-}
-
-static int
-gb18030_mbc_case_fold(OnigCaseFoldType flag, const UChar** pp, const UChar* end,
- UChar* lower, OnigEncoding enc)
-{
- return onigenc_mbn_mbc_case_fold(enc, flag,
- pp, end, lower);
-}
-
-#if 0
-static int
-gb18030_is_mbc_ambiguous(OnigCaseFoldType flag,
- const UChar** pp, const UChar* end, OnigEncoding enc)
-{
- return onigenc_mbn_is_mbc_ambiguous(enc, flag, pp, end);
-}
-#endif
-
-static int
-gb18030_is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc)
-{
- return onigenc_mb4_is_code_ctype(enc, code, ctype);
-}
-
-enum state {
- S_START,
- S_one_C2,
- S_one_C4,
- S_one_CM,
-
- S_odd_CM_one_CX,
- S_even_CM_one_CX,
-
- /* CMC4 : pair of "CM C4" */
- S_one_CMC4,
- S_odd_CMC4,
- S_one_C4_odd_CMC4,
- S_even_CMC4,
- S_one_C4_even_CMC4,
-
- S_odd_CM_odd_CMC4,
- S_even_CM_odd_CMC4,
-
- S_odd_CM_even_CMC4,
- S_even_CM_even_CMC4,
-
- /* C4CM : pair of "C4 CM" */
- S_odd_C4CM,
- S_one_CM_odd_C4CM,
- S_even_C4CM,
- S_one_CM_even_C4CM,
-
- S_even_CM_odd_C4CM,
- S_odd_CM_odd_C4CM,
- S_even_CM_even_C4CM,
- S_odd_CM_even_C4CM
-};
-
-static UChar*
-gb18030_left_adjust_char_head(const UChar* start, const UChar* s, const UChar* end, OnigEncoding enc)
-{
- const UChar *p;
- enum state state = S_START;
-
- DEBUG_GB18030(("----------------\n"));
- for (p = s; p >= start; p--) {
- DEBUG_GB18030(("state %d --(%02x)-->\n", state, *p));
- switch (state) {
- case S_START:
- switch (GB18030_MAP[*p]) {
- case C1:
- return (UChar *)s;
- case C2:
- state = S_one_C2; /* C2 */
- break;
- case C4:
- state = S_one_C4; /* C4 */
- break;
- case CM:
- state = S_one_CM; /* CM */
- break;
- }
- break;
- case S_one_C2: /* C2 */
- switch (GB18030_MAP[*p]) {
- case C1:
- case C2:
- case C4:
- return (UChar *)s;
- case CM:
- state = S_odd_CM_one_CX; /* CM C2 */
- break;
- }
- break;
- case S_one_C4: /* C4 */
- switch (GB18030_MAP[*p]) {
- case C1:
- case C2:
- case C4:
- return (UChar *)s;
- case CM:
- state = S_one_CMC4;
- break;
- }
- break;
- case S_one_CM: /* CM */
- switch (GB18030_MAP[*p]) {
- case C1:
- case C2:
- return (UChar *)s;
- case C4:
- state = S_odd_C4CM;
- break;
- case CM:
- state = S_odd_CM_one_CX; /* CM CM */
- break;
- }
- break;
-
- case S_odd_CM_one_CX: /* CM C2 */ /* CM CM */ /* CM CM CM C4 */
- switch (GB18030_MAP[*p]) {
- case C1:
- case C2:
- case C4:
- return (UChar *)(s - 1);
- case CM:
- state = S_even_CM_one_CX;
- break;
- }
- break;
- case S_even_CM_one_CX: /* CM CM C2 */ /* CM CM CM */ /* CM CM C4 */
- switch (GB18030_MAP[*p]) {
- case C1:
- case C2:
- case C4:
- return (UChar *)s;
- case CM:
- state = S_odd_CM_one_CX;
- break;
- }
- break;
-
- case S_one_CMC4: /* CM C4 */
- switch (GB18030_MAP[*p]) {
- case C1:
- case C2:
- return (UChar *)(s - 1);
- case C4:
- state = S_one_C4_odd_CMC4; /* C4 CM C4 */
- break;
- case CM:
- state = S_even_CM_one_CX; /* CM CM C4 */
- break;
- }
- break;
- case S_odd_CMC4: /* CM C4 CM C4 CM C4 */
- switch (GB18030_MAP[*p]) {
- case C1:
- case C2:
- return (UChar *)(s - 1);
- case C4:
- state = S_one_C4_odd_CMC4;
- break;
- case CM:
- state = S_odd_CM_odd_CMC4;
- break;
- }
- break;
- case S_one_C4_odd_CMC4: /* C4 CM C4 */
- switch (GB18030_MAP[*p]) {
- case C1:
- case C2:
- case C4:
- return (UChar *)(s - 1);
- case CM:
- state = S_even_CMC4; /* CM C4 CM C4 */
- break;
- }
- break;
- case S_even_CMC4: /* CM C4 CM C4 */
- switch (GB18030_MAP[*p]) {
- case C1:
- case C2:
- return (UChar *)(s - 3);
- case C4:
- state = S_one_C4_even_CMC4;
- break;
- case CM:
- state = S_odd_CM_even_CMC4;
- break;
- }
- break;
- case S_one_C4_even_CMC4: /* C4 CM C4 CM C4 */
- switch (GB18030_MAP[*p]) {
- case C1:
- case C2:
- case C4:
- return (UChar *)(s - 3);
- case CM:
- state = S_odd_CMC4;
- break;
- }
- break;
-
- case S_odd_CM_odd_CMC4: /* CM CM C4 CM C4 CM C4 */
- switch (GB18030_MAP[*p]) {
- case C1:
- case C2:
- case C4:
- return (UChar *)(s - 3);
- case CM:
- state = S_even_CM_odd_CMC4;
- break;
- }
- break;
- case S_even_CM_odd_CMC4: /* CM CM CM C4 CM C4 CM C4 */
- switch (GB18030_MAP[*p]) {
- case C1:
- case C2:
- case C4:
- return (UChar *)(s - 1);
- case CM:
- state = S_odd_CM_odd_CMC4;
- break;
- }
- break;
-
- case S_odd_CM_even_CMC4: /* CM CM C4 CM C4 */
- switch (GB18030_MAP[*p]) {
- case C1:
- case C2:
- case C4:
- return (UChar *)(s - 1);
- case CM:
- state = S_even_CM_even_CMC4;
- break;
- }
- break;
- case S_even_CM_even_CMC4: /* CM CM CM C4 CM C4 */
- switch (GB18030_MAP[*p]) {
- case C1:
- case C2:
- case C4:
- return (UChar *)(s - 3);
- case CM:
- state = S_odd_CM_even_CMC4;
- break;
- }
- break;
-
- case S_odd_C4CM: /* C4 CM */ /* C4 CM C4 CM C4 CM*/
- switch (GB18030_MAP[*p]) {
- case C1:
- case C2:
- case C4:
- return (UChar *)s;
- case CM:
- state = S_one_CM_odd_C4CM; /* CM C4 CM */
- break;
- }
- break;
- case S_one_CM_odd_C4CM: /* CM C4 CM */ /* CM C4 CM C4 CM C4 CM */
- switch (GB18030_MAP[*p]) {
- case C1:
- case C2:
- return (UChar *)(s - 2); /* |CM C4 CM */
- case C4:
- state = S_even_C4CM;
- break;
- case CM:
- state = S_even_CM_odd_C4CM;
- break;
- }
- break;
- case S_even_C4CM: /* C4 CM C4 CM */
- switch (GB18030_MAP[*p]) {
- case C1:
- case C2:
- case C4:
- return (UChar *)(s - 2); /* C4|CM C4 CM */
- case CM:
- state = S_one_CM_even_C4CM;
- break;
- }
- break;
- case S_one_CM_even_C4CM: /* CM C4 CM C4 CM */
- switch (GB18030_MAP[*p]) {
- case C1:
- case C2:
- return (UChar *)(s - 0); /*|CM C4 CM C4|CM */
- case C4:
- state = S_odd_C4CM;
- break;
- case CM:
- state = S_even_CM_even_C4CM;
- break;
- }
- break;
-
- case S_even_CM_odd_C4CM: /* CM CM C4 CM */
- switch (GB18030_MAP[*p]) {
- case C1:
- case C2:
- case C4:
- return (UChar *)(s - 0); /* |CM CM|C4|CM */
- case CM:
- state = S_odd_CM_odd_C4CM;
- break;
- }
- break;
- case S_odd_CM_odd_C4CM: /* CM CM CM C4 CM */
- switch (GB18030_MAP[*p]) {
- case C1:
- case C2:
- case C4:
- return (UChar *)(s - 2); /* |CM CM|CM C4 CM */
- case CM:
- state = S_even_CM_odd_C4CM;
- break;
- }
- break;
-
- case S_even_CM_even_C4CM: /* CM CM C4 CM C4 CM */
- switch (GB18030_MAP[*p]) {
- case C1:
- case C2:
- case C4:
- return (UChar *)(s - 2); /* |CM CM|C4|CM C4 CM */
- case CM:
- state = S_odd_CM_even_C4CM;
- break;
- }
- break;
- case S_odd_CM_even_C4CM: /* CM CM CM C4 CM C4 CM */
- switch (GB18030_MAP[*p]) {
- case C1:
- case C2:
- case C4:
- return (UChar *)(s - 0); /* |CM CM|CM C4 CM C4|CM */
- case CM:
- state = S_even_CM_even_C4CM;
- break;
- }
- break;
- }
- }
-
- DEBUG_GB18030(("state %d\n", state));
- switch (state) {
- case S_START: return (UChar *)(s - 0);
- case S_one_C2: return (UChar *)(s - 0);
- case S_one_C4: return (UChar *)(s - 0);
- case S_one_CM: return (UChar *)(s - 0);
-
- case S_odd_CM_one_CX: return (UChar *)(s - 1);
- case S_even_CM_one_CX: return (UChar *)(s - 0);
-
- case S_one_CMC4: return (UChar *)(s - 1);
- case S_odd_CMC4: return (UChar *)(s - 1);
- case S_one_C4_odd_CMC4: return (UChar *)(s - 1);
- case S_even_CMC4: return (UChar *)(s - 3);
- case S_one_C4_even_CMC4: return (UChar *)(s - 3);
-
- case S_odd_CM_odd_CMC4: return (UChar *)(s - 3);
- case S_even_CM_odd_CMC4: return (UChar *)(s - 1);
-
- case S_odd_CM_even_CMC4: return (UChar *)(s - 1);
- case S_even_CM_even_CMC4: return (UChar *)(s - 3);
-
- case S_odd_C4CM: return (UChar *)(s - 0);
- case S_one_CM_odd_C4CM: return (UChar *)(s - 2);
- case S_even_C4CM: return (UChar *)(s - 2);
- case S_one_CM_even_C4CM: return (UChar *)(s - 0);
-
- case S_even_CM_odd_C4CM: return (UChar *)(s - 0);
- case S_odd_CM_odd_C4CM: return (UChar *)(s - 2);
- case S_even_CM_even_C4CM: return (UChar *)(s - 2);
- case S_odd_CM_even_C4CM: return (UChar *)(s - 0);
- }
-
- return (UChar* )s; /* never come here. (escape warning) */
-}
-
-static int
-gb18030_is_allowed_reverse_match(const UChar* s, const UChar* end ARG_UNUSED, OnigEncoding enc ARG_UNUSED)
-{
- return GB18030_MAP[*s] == C1 ? TRUE : FALSE;
-}
-
-OnigEncodingDefine(gb18030, GB18030) = {
- gb18030_mbc_enc_len,
- "GB18030", /* name */
- 4, /* max enc length */
- 1, /* min enc length */
- onigenc_is_mbc_newline_0x0a,
- gb18030_mbc_to_code,
- onigenc_mb4_code_to_mbclen,
- gb18030_code_to_mbc,
- gb18030_mbc_case_fold,
- onigenc_ascii_apply_all_case_fold,
- onigenc_ascii_get_case_fold_codes_by_str,
- onigenc_minimum_property_name_to_ctype,
- gb18030_is_code_ctype,
- onigenc_not_support_get_ctype_code_range,
- gb18030_left_adjust_char_head,
- gb18030_is_allowed_reverse_match
-};
-
diff --git a/enc/gb2312.c b/enc/gb2312.c
deleted file mode 100644
index 6fc15735fc..0000000000
--- a/enc/gb2312.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <ruby/ruby.h>
-#include <ruby/encoding.h>
-#include "regenc.h"
-
-void
-Init_gb2312(void)
-{
- rb_enc_register("GB2312", rb_enc_find("EUC-KR"));
-}
-
-ENC_ALIAS("EUC-CN", "GB2312")
-ENC_ALIAS("eucCN", "GB2312")
-ENC_REPLICATE("GB12345", "GB2312")
diff --git a/enc/gbk.c b/enc/gbk.c
deleted file mode 100644
index 3efb1bf636..0000000000
--- a/enc/gbk.c
+++ /dev/null
@@ -1,222 +0,0 @@
-/**********************************************************************
- gbk.c - Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2007 K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regenc.h"
-
-static const int EncLen_GBK[] = {
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1
-};
-
-static const char GBK_CAN_BE_TRAIL_TABLE[256] = {
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0
-};
-
-#define GBK_ISMB_FIRST(byte) (EncLen_GBK[byte] > 1)
-#define GBK_ISMB_TRAIL(byte) GBK_CAN_BE_TRAIL_TABLE[(byte)]
-
-typedef enum { FAILURE = -2, ACCEPT = -1, S0 = 0, S1 } state_t;
-#define A ACCEPT
-#define F FAILURE
-static const signed char trans[][0x100] = {
- { /* S0 0 1 2 3 4 5 6 7 8 9 a b c d e f */
- /* 0 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 1 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 2 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 3 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 4 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 5 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 6 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 7 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 8 */ A, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* 9 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* a */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* b */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* c */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* d */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* e */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* f */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, F
- },
- { /* S1 0 1 2 3 4 5 6 7 8 9 a b c d e f */
- /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 4 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 5 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 6 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 7 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, F,
- /* 8 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 9 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* a */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* b */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* c */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* d */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* e */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* f */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, F
- }
-};
-#undef A
-#undef F
-
-static int
-gbk_mbc_enc_len(const UChar* p, const UChar* e, OnigEncoding enc ARG_UNUSED)
-{
- int firstbyte = *p++;
- state_t s = trans[0][firstbyte];
-#define RETURN(n) \
- return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(n) : \
- ONIGENC_CONSTRUCT_MBCLEN_INVALID()
- if (s < 0) RETURN(1);
- if (p == e) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(EncLen_GBK[firstbyte]-1);
- s = trans[s][*p++];
- RETURN(2);
-#undef RETURN
-}
-
-static OnigCodePoint
-gbk_mbc_to_code(const UChar* p, const UChar* end, OnigEncoding enc)
-{
- return onigenc_mbn_mbc_to_code(enc, p, end);
-}
-
-static int
-gbk_code_to_mbc(OnigCodePoint code, UChar *buf, OnigEncoding enc)
-{
- return onigenc_mb2_code_to_mbc(enc, code, buf);
-}
-
-static int
-gbk_mbc_case_fold(OnigCaseFoldType flag, const UChar** pp, const UChar* end,
- UChar* lower, OnigEncoding enc)
-{
- return onigenc_mbn_mbc_case_fold(enc, flag,
- pp, end, lower);
-}
-
-#if 0
-static int
-gbk_is_mbc_ambiguous(OnigCaseFoldType flag,
- const UChar** pp, const UChar* end, OnigEncoding enc)
-{
- return onigenc_mbn_is_mbc_ambiguous(enc, flag, pp, end);
-}
-#endif
-
-static int
-gbk_is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc)
-{
- return onigenc_mb2_is_code_ctype(enc, code, ctype);
-}
-
-static UChar*
-gbk_left_adjust_char_head(const UChar* start, const UChar* s, const UChar* end, OnigEncoding enc)
-{
- const UChar *p;
- int len;
-
- if (s <= start) return (UChar* )s;
- p = s;
-
- if (GBK_ISMB_TRAIL(*p)) {
- while (p > start) {
- if (! GBK_ISMB_FIRST(*--p)) {
- p++;
- break;
- }
- }
- }
- len = enclen(enc, p, end);
- if (p + len > s) return (UChar* )p;
- p += len;
- return (UChar* )(p + ((s - p) & ~1));
-}
-
-static int
-gbk_is_allowed_reverse_match(const UChar* s, const UChar* end ARG_UNUSED, OnigEncoding enc ARG_UNUSED)
-{
- const UChar c = *s;
- return (GBK_ISMB_TRAIL(c) ? FALSE : TRUE);
-}
-
-OnigEncodingDefine(gbk, GBK) = {
- gbk_mbc_enc_len,
- "GBK", /* name */
- 2, /* max enc length */
- 1, /* min enc length */
- onigenc_is_mbc_newline_0x0a,
- gbk_mbc_to_code,
- onigenc_mb2_code_to_mbclen,
- gbk_code_to_mbc,
- gbk_mbc_case_fold,
- onigenc_ascii_apply_all_case_fold,
- onigenc_ascii_get_case_fold_codes_by_str,
- onigenc_minimum_property_name_to_ctype,
- gbk_is_code_ctype,
- onigenc_not_support_get_ctype_code_range,
- gbk_left_adjust_char_head,
- gbk_is_allowed_reverse_match
-};
-/*
- * Name: GBK
- * MIBenum: 113
- * Link: http://www.iana.org/assignments/character-sets
- * Link: http://www.iana.org/assignments/charset-reg/GBK
- * Link: http://www.microsoft.com/globaldev/reference/dbcs/936.mspx
- */
-ENC_ALIAS("CP936", "GBK")
diff --git a/enc/iso_2022_jp.h b/enc/iso_2022_jp.h
deleted file mode 100644
index 8ba272bfa2..0000000000
--- a/enc/iso_2022_jp.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#include "regenc.h"
-/* dummy for unsupported, statefull encoding */
-ENC_DUMMY("ISO-2022-JP");
-ENC_ALIAS("ISO2022-JP", "ISO-2022-JP");
-ENC_REPLICATE("ISO-2022-JP-2", "ISO-2022-JP");
-ENC_ALIAS("ISO2022-JP2", "ISO-2022-JP-2");
-
-/* Windows Codepage 50221
- * a ISO-2022-JP variant.
- * This includes
- * * US-ASCII
- * * JIS X 0201 Katakana
- * * JIS X 0208
- * * NEC special characters
- * * NEC selected IBM extended characters
- * and this implementation doesn't include
- * * JIS X 0201 Latin
- * * User Defined Characters
- *
- * So this CP50221 has the same characters of CP51932.
- *
- * See http://legacy-encoding.sourceforge.jp/wiki/index.php?cp50221
- */
-ENC_REPLICATE("CP50221", "ISO-2022-JP");
diff --git a/enc/iso_8859_1.c b/enc/iso_8859_1.c
deleted file mode 100644
index b73f8ca379..0000000000
--- a/enc/iso_8859_1.c
+++ /dev/null
@@ -1,285 +0,0 @@
-/**********************************************************************
- iso8859_1.c - Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2007 K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regenc.h"
-
-#define ENC_IS_ISO_8859_1_CTYPE(code,ctype) \
- ((EncISO_8859_1_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
-
-static const unsigned short EncISO_8859_1_CtypeTable[256] = {
- 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
- 0x4008, 0x420c, 0x4209, 0x4208, 0x4208, 0x4208, 0x4008, 0x4008,
- 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
- 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
- 0x4284, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
- 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
- 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0,
- 0x78b0, 0x78b0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
- 0x41a0, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x74a2,
- 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
- 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
- 0x74a2, 0x74a2, 0x74a2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x51a0,
- 0x41a0, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x70e2,
- 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
- 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
- 0x70e2, 0x70e2, 0x70e2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x4008,
- 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
- 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
- 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
- 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
- 0x0284, 0x01a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0,
- 0x00a0, 0x00a0, 0x30e2, 0x01a0, 0x00a0, 0x01a0, 0x00a0, 0x00a0,
- 0x00a0, 0x00a0, 0x10a0, 0x10a0, 0x00a0, 0x30e2, 0x00a0, 0x01a0,
- 0x00a0, 0x10a0, 0x30e2, 0x01a0, 0x10a0, 0x10a0, 0x10a0, 0x01a0,
- 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
- 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
- 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x00a0,
- 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x30e2,
- 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
- 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
- 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x00a0,
- 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2
-};
-
-static const OnigPairCaseFoldCodes CaseFoldMap[] = {
- { 0xc0, 0xe0 },
- { 0xc1, 0xe1 },
- { 0xc2, 0xe2 },
- { 0xc3, 0xe3 },
- { 0xc4, 0xe4 },
- { 0xc5, 0xe5 },
- { 0xc6, 0xe6 },
- { 0xc7, 0xe7 },
- { 0xc8, 0xe8 },
- { 0xc9, 0xe9 },
- { 0xca, 0xea },
- { 0xcb, 0xeb },
- { 0xcc, 0xec },
- { 0xcd, 0xed },
- { 0xce, 0xee },
- { 0xcf, 0xef },
-
- { 0xd0, 0xf0 },
- { 0xd1, 0xf1 },
- { 0xd2, 0xf2 },
- { 0xd3, 0xf3 },
- { 0xd4, 0xf4 },
- { 0xd5, 0xf5 },
- { 0xd6, 0xf6 },
- { 0xd8, 0xf8 },
- { 0xd9, 0xf9 },
- { 0xda, 0xfa },
- { 0xdb, 0xfb },
- { 0xdc, 0xfc },
- { 0xdd, 0xfd },
- { 0xde, 0xfe }
-};
-
-static int
-apply_all_case_fold(OnigCaseFoldType flag,
- OnigApplyAllCaseFoldFunc f, void* arg,
- OnigEncoding enc ARG_UNUSED)
-{
- return onigenc_apply_all_case_fold_with_map(
- sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
- flag, f, arg);
-}
-
-static int
-get_case_fold_codes_by_str(OnigCaseFoldType flag,
- const OnigUChar* p, const OnigUChar* end,
- OnigCaseFoldCodeItem items[],
- OnigEncoding enc ARG_UNUSED)
-{
- if (0x41 <= *p && *p <= 0x5a) {
- items[0].byte_len = 1;
- items[0].code_len = 1;
- items[0].code[0] = (OnigCodePoint )(*p + 0x20);
- if (*p == 0x53 && end > p + 1
- && (*(p+1) == 0x53 || *(p+1) == 0x73)) { /* SS */
- items[1].byte_len = 2;
- items[1].code_len = 1;
- items[1].code[0] = (OnigCodePoint )0xdf;
- return 2;
- }
- else
- return 1;
- }
- else if (0x61 <= *p && *p <= 0x7a) {
- items[0].byte_len = 1;
- items[0].code_len = 1;
- items[0].code[0] = (OnigCodePoint )(*p - 0x20);
- if (*p == 0x73 && end > p + 1
- && (*(p+1) == 0x73 || *(p+1) == 0x53)) { /* ss */
- items[1].byte_len = 2;
- items[1].code_len = 1;
- items[1].code[0] = (OnigCodePoint )0xdf;
- return 2;
- }
- else
- return 1;
- }
- else if (0xc0 <= *p && *p <= 0xcf) {
- items[0].byte_len = 1;
- items[0].code_len = 1;
- items[0].code[0] = (OnigCodePoint )(*p + 0x20);
- return 1;
- }
- else if (0xd0 <= *p && *p <= 0xdf) {
- if (*p == 0xdf) {
- items[0].byte_len = 1;
- items[0].code_len = 2;
- items[0].code[0] = (OnigCodePoint )'s';
- items[0].code[1] = (OnigCodePoint )'s';
-
- items[1].byte_len = 1;
- items[1].code_len = 2;
- items[1].code[0] = (OnigCodePoint )'S';
- items[1].code[1] = (OnigCodePoint )'S';
-
- items[2].byte_len = 1;
- items[2].code_len = 2;
- items[2].code[0] = (OnigCodePoint )'s';
- items[2].code[1] = (OnigCodePoint )'S';
-
- items[3].byte_len = 1;
- items[3].code_len = 2;
- items[3].code[0] = (OnigCodePoint )'S';
- items[3].code[1] = (OnigCodePoint )'s';
-
- return 4;
- }
- else if (*p != 0xd7) {
- items[0].byte_len = 1;
- items[0].code_len = 1;
- items[0].code[0] = (OnigCodePoint )(*p + 0x20);
- return 1;
- }
- }
- else if (0xe0 <= *p && *p <= 0xef) {
- items[0].byte_len = 1;
- items[0].code_len = 1;
- items[0].code[0] = (OnigCodePoint )(*p - 0x20);
- return 1;
- }
- else if (0xf0 <= *p && *p <= 0xfe) {
- if (*p != 0xf7) {
- items[0].byte_len = 1;
- items[0].code_len = 1;
- items[0].code[0] = (OnigCodePoint )(*p - 0x20);
- return 1;
- }
- }
-
- return 0;
-}
-
-static int
-mbc_case_fold(OnigCaseFoldType flag, const UChar** pp, const UChar* end ARG_UNUSED,
- UChar* lower, OnigEncoding enc ARG_UNUSED)
-{
- const UChar* p = *pp;
-
- if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
- *lower++ = 's';
- *lower = 's';
- (*pp)++;
- return 2;
- }
-
- *lower = ONIGENC_ISO_8859_1_TO_LOWER_CASE(*p);
- (*pp)++;
- return 1;
-}
-
-#if 0
-static int
-is_mbc_ambiguous(OnigCaseFoldType flag,
- const UChar** pp, const UChar* end)
-{
- int v;
- const UChar* p = *pp;
-
- if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
- (*pp)++;
- return TRUE;
- }
-
- (*pp)++;
- v = (EncISO_8859_1_CtypeTable[*p] & (BIT_CTYPE_UPPER | BIT_CTYPE_LOWER));
- if ((v | BIT_CTYPE_LOWER) != 0) {
- /* 0xdf, 0xaa, 0xb5, 0xba are lower case letter, but can't convert. */
- if (*p >= 0xaa && *p <= 0xba)
- return FALSE;
- else
- return TRUE;
- }
-
- return (v != 0 ? TRUE : FALSE);
-}
-#endif
-
-static int
-is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSED)
-{
- if (code < 256)
- return ENC_IS_ISO_8859_1_CTYPE(code, ctype);
- else
- return FALSE;
-}
-
-OnigEncodingDefine(iso_8859_1, ISO_8859_1) = {
- onigenc_single_byte_mbc_enc_len,
- "ISO-8859-1", /* name */
- 1, /* max enc length */
- 1, /* min enc length */
- onigenc_is_mbc_newline_0x0a,
- onigenc_single_byte_mbc_to_code,
- onigenc_single_byte_code_to_mbclen,
- onigenc_single_byte_code_to_mbc,
- mbc_case_fold,
- apply_all_case_fold,
- get_case_fold_codes_by_str,
- onigenc_minimum_property_name_to_ctype,
- is_code_ctype,
- onigenc_not_support_get_ctype_code_range,
- onigenc_single_byte_left_adjust_char_head,
- onigenc_always_true_is_allowed_reverse_match
-};
-ENC_ALIAS("ISO8859-1", "ISO-8859-1")
-
-/*
- * Name: windows-1252
- * MIBenum: 2252
- * Link: http://www.iana.org/assignments/character-sets
- * Link: http://www.microsoft.com/globaldev/reference/sbcs/1252.mspx
- * Link: http://en.wikipedia.org/wiki/Windows-1252
- */
-ENC_REPLICATE("Windows-1252", "ISO-8859-1")
-ENC_ALIAS("CP1252", "Windows-1252")
diff --git a/enc/iso_8859_10.c b/enc/iso_8859_10.c
deleted file mode 100644
index 1643278dfd..0000000000
--- a/enc/iso_8859_10.c
+++ /dev/null
@@ -1,244 +0,0 @@
-/**********************************************************************
- iso8859_10.c - Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2007 K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regenc.h"
-
-#define ENC_ISO_8859_10_TO_LOWER_CASE(c) EncISO_8859_10_ToLowerCaseTable[c]
-#define ENC_IS_ISO_8859_10_CTYPE(code,ctype) \
- ((EncISO_8859_10_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
-
-static const UChar EncISO_8859_10_ToLowerCaseTable[256] = {
- '\000', '\001', '\002', '\003', '\004', '\005', '\006', '\007',
- '\010', '\011', '\012', '\013', '\014', '\015', '\016', '\017',
- '\020', '\021', '\022', '\023', '\024', '\025', '\026', '\027',
- '\030', '\031', '\032', '\033', '\034', '\035', '\036', '\037',
- '\040', '\041', '\042', '\043', '\044', '\045', '\046', '\047',
- '\050', '\051', '\052', '\053', '\054', '\055', '\056', '\057',
- '\060', '\061', '\062', '\063', '\064', '\065', '\066', '\067',
- '\070', '\071', '\072', '\073', '\074', '\075', '\076', '\077',
- '\100', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
- '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
- '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
- '\170', '\171', '\172', '\133', '\134', '\135', '\136', '\137',
- '\140', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
- '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
- '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
- '\170', '\171', '\172', '\173', '\174', '\175', '\176', '\177',
- '\200', '\201', '\202', '\203', '\204', '\205', '\206', '\207',
- '\210', '\211', '\212', '\213', '\214', '\215', '\216', '\217',
- '\220', '\221', '\222', '\223', '\224', '\225', '\226', '\227',
- '\230', '\231', '\232', '\233', '\234', '\235', '\236', '\237',
- '\240', '\261', '\262', '\263', '\264', '\265', '\266', '\247',
- '\270', '\271', '\272', '\273', '\274', '\255', '\276', '\277',
- '\260', '\261', '\262', '\263', '\264', '\265', '\266', '\267',
- '\270', '\271', '\272', '\273', '\274', '\275', '\276', '\277',
- '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
- '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
- '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
- '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\337',
- '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
- '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
- '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
- '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\377'
-};
-
-static const unsigned short EncISO_8859_10_CtypeTable[256] = {
- 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
- 0x4008, 0x420c, 0x4209, 0x4208, 0x4208, 0x4208, 0x4008, 0x4008,
- 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
- 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
- 0x4284, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
- 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
- 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0,
- 0x78b0, 0x78b0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
- 0x41a0, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x74a2,
- 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
- 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
- 0x74a2, 0x74a2, 0x74a2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x51a0,
- 0x41a0, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x70e2,
- 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
- 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
- 0x70e2, 0x70e2, 0x70e2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x4008,
- 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
- 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
- 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
- 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
- 0x0284, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x00a0,
- 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x01a0, 0x34a2, 0x34a2,
- 0x00a0, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x01a0,
- 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x01a0, 0x30e2, 0x30e2,
- 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
- 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
- 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
- 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x30e2,
- 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
- 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
- 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
- 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2
-};
-
-static int
-mbc_case_fold(OnigCaseFoldType flag,
- const UChar** pp, const UChar* end ARG_UNUSED,
- UChar* lower, OnigEncoding enc ARG_UNUSED)
-{
- const UChar* p = *pp;
-
- if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
- *lower++ = 's';
- *lower = 's';
- (*pp)++;
- return 2;
- }
-
- *lower = ENC_ISO_8859_10_TO_LOWER_CASE(*p);
- (*pp)++;
- return 1;
-}
-
-#if 0
-static int
-is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* end)
-{
- int v;
- const UChar* p = *pp;
-
- if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
- (*pp)++;
- return TRUE;
- }
-
- (*pp)++;
- v = (EncISO_8859_10_CtypeTable[*p] & (BIT_CTYPE_UPPER | BIT_CTYPE_LOWER));
- if ((v | BIT_CTYPE_LOWER) != 0) {
- return TRUE;
- }
-
- return (v != 0 ? TRUE : FALSE);
-}
-#endif
-
-static int
-is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSED)
-{
- if (code < 256)
- return ENC_IS_ISO_8859_10_CTYPE(code, ctype);
- else
- return FALSE;
-}
-
-static const OnigPairCaseFoldCodes CaseFoldMap[] = {
- { 0xa1, 0xb1 },
- { 0xa2, 0xb2 },
- { 0xa3, 0xb3 },
- { 0xa4, 0xb4 },
- { 0xa5, 0xb5 },
- { 0xa6, 0xb6 },
- { 0xa8, 0xb8 },
- { 0xa9, 0xb9 },
- { 0xaa, 0xba },
- { 0xab, 0xbb },
- { 0xac, 0xbc },
- { 0xae, 0xbe },
- { 0xaf, 0xbf },
-
- { 0xc0, 0xe0 },
- { 0xc1, 0xe1 },
- { 0xc2, 0xe2 },
- { 0xc3, 0xe3 },
- { 0xc4, 0xe4 },
- { 0xc5, 0xe5 },
- { 0xc6, 0xe6 },
- { 0xc7, 0xe7 },
- { 0xc8, 0xe8 },
- { 0xc9, 0xe9 },
- { 0xca, 0xea },
- { 0xcb, 0xeb },
- { 0xcc, 0xec },
- { 0xcd, 0xed },
- { 0xce, 0xee },
- { 0xcf, 0xef },
-
- { 0xd0, 0xf0 },
- { 0xd1, 0xf1 },
- { 0xd2, 0xf2 },
- { 0xd3, 0xf3 },
- { 0xd4, 0xf4 },
- { 0xd5, 0xf5 },
- { 0xd6, 0xf6 },
- { 0xd7, 0xf7 },
- { 0xd8, 0xf8 },
- { 0xd9, 0xf9 },
- { 0xda, 0xfa },
- { 0xdb, 0xfb },
- { 0xdc, 0xfc },
- { 0xdd, 0xfd },
- { 0xde, 0xfe }
-};
-
-static int
-apply_all_case_fold(OnigCaseFoldType flag,
- OnigApplyAllCaseFoldFunc f, void* arg,
- OnigEncoding enc ARG_UNUSED)
-{
- return onigenc_apply_all_case_fold_with_map(
- sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
- flag, f, arg);
-}
-
-static int
-get_case_fold_codes_by_str(OnigCaseFoldType flag,
- const OnigUChar* p, const OnigUChar* end,
- OnigCaseFoldCodeItem items[],
- OnigEncoding enc ARG_UNUSED)
-{
- return onigenc_get_case_fold_codes_by_str_with_map(
- sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
- flag, p, end, items);
-}
-
-OnigEncodingDefine(iso_8859_10, ISO_8859_10) = {
- onigenc_single_byte_mbc_enc_len,
- "ISO-8859-10", /* name */
- 1, /* max enc length */
- 1, /* min enc length */
- onigenc_is_mbc_newline_0x0a,
- onigenc_single_byte_mbc_to_code,
- onigenc_single_byte_code_to_mbclen,
- onigenc_single_byte_code_to_mbc,
- mbc_case_fold,
- apply_all_case_fold,
- get_case_fold_codes_by_str,
- onigenc_minimum_property_name_to_ctype,
- is_code_ctype,
- onigenc_not_support_get_ctype_code_range,
- onigenc_single_byte_left_adjust_char_head,
- onigenc_always_true_is_allowed_reverse_match
-};
-ENC_ALIAS("ISO8859-10", "ISO-8859-10")
diff --git a/enc/iso_8859_11.c b/enc/iso_8859_11.c
deleted file mode 100644
index 257d9d8919..0000000000
--- a/enc/iso_8859_11.c
+++ /dev/null
@@ -1,111 +0,0 @@
-/**********************************************************************
- iso8859_11.c - Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2007 K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regenc.h"
-
-#define ENC_IS_ISO_8859_11_CTYPE(code,ctype) \
- ((EncISO_8859_11_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
-
-static const unsigned short EncISO_8859_11_CtypeTable[256] = {
- 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
- 0x4008, 0x420c, 0x4209, 0x4208, 0x4208, 0x4208, 0x4008, 0x4008,
- 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
- 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
- 0x4284, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
- 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
- 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0,
- 0x78b0, 0x78b0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
- 0x41a0, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x74a2,
- 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
- 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
- 0x74a2, 0x74a2, 0x74a2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x51a0,
- 0x41a0, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x70e2,
- 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
- 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
- 0x70e2, 0x70e2, 0x70e2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x4008,
- 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
- 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
- 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
- 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
- 0x0284, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2,
- 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2,
- 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2,
- 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2,
- 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2,
- 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2,
- 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2,
- 0x30a2, 0x30a2, 0x30a2, 0x0000, 0x0000, 0x0000, 0x0000, 0x30a2,
- 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2,
- 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2,
- 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2,
- 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x0000, 0x0000, 0x0000, 0x0000
-};
-
-static int
-is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSED)
-{
- if (code < 256)
- return ENC_IS_ISO_8859_11_CTYPE(code, ctype);
- else
- return FALSE;
-}
-
-OnigEncodingDefine(iso_8859_11, ISO_8859_11) = {
- onigenc_single_byte_mbc_enc_len,
- "ISO-8859-11", /* name */
- 1, /* max enc length */
- 1, /* min enc length */
- onigenc_is_mbc_newline_0x0a,
- onigenc_single_byte_mbc_to_code,
- onigenc_single_byte_code_to_mbclen,
- onigenc_single_byte_code_to_mbc,
- onigenc_ascii_mbc_case_fold,
- onigenc_ascii_apply_all_case_fold,
- onigenc_ascii_get_case_fold_codes_by_str,
- onigenc_minimum_property_name_to_ctype,
- is_code_ctype,
- onigenc_not_support_get_ctype_code_range,
- onigenc_single_byte_left_adjust_char_head,
- onigenc_always_true_is_allowed_reverse_match
-};
-ENC_ALIAS("ISO8859-11", "ISO-8859-11")
-
-/*
- * Name: TIS-620
- * MIBenum: 2259
- * Link: http://en.wikipedia.org/wiki/Thai_Industrial_Standard_620-2533
- */
-ENC_REPLICATE("TIS-620", "ISO-8859-11")
-
-/*
- * Name: Windows-874
- * Link: http://www.microsoft.com/globaldev/reference/sbcs/874.mspx
- */
-ENC_REPLICATE("Windows-874", "ISO-8859-11")
-ENC_ALIAS("CP874", "Windows-874")
diff --git a/enc/iso_8859_13.c b/enc/iso_8859_13.c
deleted file mode 100644
index f29cb2e281..0000000000
--- a/enc/iso_8859_13.c
+++ /dev/null
@@ -1,243 +0,0 @@
-/**********************************************************************
- iso8859_13.c - Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2007 K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regenc.h"
-
-#define ENC_ISO_8859_13_TO_LOWER_CASE(c) EncISO_8859_13_ToLowerCaseTable[c]
-#define ENC_IS_ISO_8859_13_CTYPE(code,ctype) \
- ((EncISO_8859_13_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
-
-static const UChar EncISO_8859_13_ToLowerCaseTable[256] = {
- '\000', '\001', '\002', '\003', '\004', '\005', '\006', '\007',
- '\010', '\011', '\012', '\013', '\014', '\015', '\016', '\017',
- '\020', '\021', '\022', '\023', '\024', '\025', '\026', '\027',
- '\030', '\031', '\032', '\033', '\034', '\035', '\036', '\037',
- '\040', '\041', '\042', '\043', '\044', '\045', '\046', '\047',
- '\050', '\051', '\052', '\053', '\054', '\055', '\056', '\057',
- '\060', '\061', '\062', '\063', '\064', '\065', '\066', '\067',
- '\070', '\071', '\072', '\073', '\074', '\075', '\076', '\077',
- '\100', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
- '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
- '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
- '\170', '\171', '\172', '\133', '\134', '\135', '\136', '\137',
- '\140', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
- '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
- '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
- '\170', '\171', '\172', '\173', '\174', '\175', '\176', '\177',
- '\200', '\201', '\202', '\203', '\204', '\205', '\206', '\207',
- '\210', '\211', '\212', '\213', '\214', '\215', '\216', '\217',
- '\220', '\221', '\222', '\223', '\224', '\225', '\226', '\227',
- '\230', '\231', '\232', '\233', '\234', '\235', '\236', '\237',
- '\240', '\241', '\242', '\243', '\244', '\245', '\246', '\247',
- '\270', '\251', '\272', '\253', '\254', '\255', '\256', '\277',
- '\260', '\261', '\262', '\263', '\264', '\265', '\266', '\267',
- '\270', '\271', '\272', '\273', '\274', '\275', '\276', '\277',
- '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
- '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
- '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\327',
- '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\337',
- '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
- '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
- '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
- '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\377'
-};
-
-static const unsigned short EncISO_8859_13_CtypeTable[256] = {
- 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
- 0x4008, 0x420c, 0x4209, 0x4208, 0x4208, 0x4208, 0x4008, 0x4008,
- 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
- 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
- 0x4284, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
- 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
- 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0,
- 0x78b0, 0x78b0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
- 0x41a0, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x74a2,
- 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
- 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
- 0x74a2, 0x74a2, 0x74a2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x51a0,
- 0x41a0, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x70e2,
- 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
- 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
- 0x70e2, 0x70e2, 0x70e2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x4008,
- 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
- 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
- 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
- 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
- 0x0284, 0x01a0, 0x00a0, 0x00a0, 0x00a0, 0x01a0, 0x00a0, 0x00a0,
- 0x34a2, 0x00a0, 0x34a2, 0x01a0, 0x00a0, 0x01a0, 0x00a0, 0x34a2,
- 0x00a0, 0x00a0, 0x10a0, 0x10a0, 0x01a0, 0x30e2, 0x00a0, 0x01a0,
- 0x30e2, 0x10a0, 0x30e2, 0x01a0, 0x10a0, 0x10a0, 0x10a0, 0x30e2,
- 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
- 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
- 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x00a0,
- 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x30e2,
- 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
- 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
- 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x00a0,
- 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x01a0
-};
-
-static int
-mbc_case_fold(OnigCaseFoldType flag,
- const UChar** pp, const UChar* end ARG_UNUSED,
- UChar* lower, OnigEncoding enc ARG_UNUSED)
-{
- const UChar* p = *pp;
-
- if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
- *lower++ = 's';
- *lower = 's';
- (*pp)++;
- return 2;
- }
-
- *lower = ENC_ISO_8859_13_TO_LOWER_CASE(*p);
- (*pp)++;
- return 1;
-}
-
-#if 0
-static int
-is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* end)
-{
- int v;
- const UChar* p = *pp;
-
- if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
- (*pp)++;
- return TRUE;
- }
-
- (*pp)++;
- v = (EncISO_8859_13_CtypeTable[*p] & (BIT_CTYPE_UPPER | BIT_CTYPE_LOWER));
- if ((v | BIT_CTYPE_LOWER) != 0) {
- /* 0xdf, 0xb5 are lower case letter, but can't convert. */
- if (*p == 0xb5)
- return FALSE;
- else
- return TRUE;
- }
-
- return (v != 0 ? TRUE : FALSE);
-}
-#endif
-
-static int
-is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSED)
-{
- if (code < 256)
- return ENC_IS_ISO_8859_13_CTYPE(code, ctype);
- else
- return FALSE;
-}
-
-static const OnigPairCaseFoldCodes CaseFoldMap[] = {
- { 0xc0, 0xe0 },
- { 0xc1, 0xe1 },
- { 0xc2, 0xe2 },
- { 0xc3, 0xe3 },
- { 0xc4, 0xe4 },
- { 0xc5, 0xe5 },
- { 0xc6, 0xe6 },
- { 0xc7, 0xe7 },
- { 0xc8, 0xe8 },
- { 0xc9, 0xe9 },
- { 0xca, 0xea },
- { 0xcb, 0xeb },
- { 0xcc, 0xec },
- { 0xcd, 0xed },
- { 0xce, 0xee },
- { 0xcf, 0xef },
-
- { 0xd0, 0xf0 },
- { 0xd1, 0xf1 },
- { 0xd2, 0xf2 },
- { 0xd3, 0xf3 },
- { 0xd4, 0xf4 },
- { 0xd5, 0xf5 },
- { 0xd6, 0xf6 },
- { 0xd8, 0xf8 },
- { 0xd9, 0xf9 },
- { 0xda, 0xfa },
- { 0xdb, 0xfb },
- { 0xdc, 0xfc },
- { 0xdd, 0xfd },
- { 0xde, 0xfe }
-};
-
-static int
-apply_all_case_fold(OnigCaseFoldType flag,
- OnigApplyAllCaseFoldFunc f, void* arg,
- OnigEncoding enc ARG_UNUSED)
-{
- return onigenc_apply_all_case_fold_with_map(
- sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
- flag, f, arg);
-}
-
-static int
-get_case_fold_codes_by_str(OnigCaseFoldType flag,
- const OnigUChar* p, const OnigUChar* end,
- OnigCaseFoldCodeItem items[],
- OnigEncoding enc ARG_UNUSED)
-{
- return onigenc_get_case_fold_codes_by_str_with_map(
- sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
- flag, p, end, items);
-}
-
-OnigEncodingDefine(iso_8859_13, ISO_8859_13) = {
- onigenc_single_byte_mbc_enc_len,
- "ISO-8859-13", /* name */
- 1, /* max enc length */
- 1, /* min enc length */
- onigenc_is_mbc_newline_0x0a,
- onigenc_single_byte_mbc_to_code,
- onigenc_single_byte_code_to_mbclen,
- onigenc_single_byte_code_to_mbc,
- mbc_case_fold,
- apply_all_case_fold,
- get_case_fold_codes_by_str,
- onigenc_minimum_property_name_to_ctype,
- is_code_ctype,
- onigenc_not_support_get_ctype_code_range,
- onigenc_single_byte_left_adjust_char_head,
- onigenc_always_true_is_allowed_reverse_match
-};
-ENC_ALIAS("ISO8859-13", "ISO-8859-13")
-
-/*
- * Name: windows-1257
- * MIBenum: 2257
- * Link: http://www.iana.org/assignments/character-sets
- * Link: http://www.microsoft.com/globaldev/reference/sbcs/1257.mspx
- * Link: http://en.wikipedia.org/wiki/Windows-1257
- */
-ENC_REPLICATE("Windows-1257", "ISO-8859-13")
-ENC_ALIAS("CP1257", "Windows-1257")
diff --git a/enc/iso_8859_14.c b/enc/iso_8859_14.c
deleted file mode 100644
index be83f93f80..0000000000
--- a/enc/iso_8859_14.c
+++ /dev/null
@@ -1,246 +0,0 @@
-/**********************************************************************
- iso8859_14.c - Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2007 K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regenc.h"
-
-#define ENC_ISO_8859_14_TO_LOWER_CASE(c) EncISO_8859_14_ToLowerCaseTable[c]
-#define ENC_IS_ISO_8859_14_CTYPE(code,ctype) \
- ((EncISO_8859_14_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
-
-static const UChar EncISO_8859_14_ToLowerCaseTable[256] = {
- '\000', '\001', '\002', '\003', '\004', '\005', '\006', '\007',
- '\010', '\011', '\012', '\013', '\014', '\015', '\016', '\017',
- '\020', '\021', '\022', '\023', '\024', '\025', '\026', '\027',
- '\030', '\031', '\032', '\033', '\034', '\035', '\036', '\037',
- '\040', '\041', '\042', '\043', '\044', '\045', '\046', '\047',
- '\050', '\051', '\052', '\053', '\054', '\055', '\056', '\057',
- '\060', '\061', '\062', '\063', '\064', '\065', '\066', '\067',
- '\070', '\071', '\072', '\073', '\074', '\075', '\076', '\077',
- '\100', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
- '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
- '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
- '\170', '\171', '\172', '\133', '\134', '\135', '\136', '\137',
- '\140', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
- '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
- '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
- '\170', '\171', '\172', '\173', '\174', '\175', '\176', '\177',
- '\200', '\201', '\202', '\203', '\204', '\205', '\206', '\207',
- '\210', '\211', '\212', '\213', '\214', '\215', '\216', '\217',
- '\220', '\221', '\222', '\223', '\224', '\225', '\226', '\227',
- '\230', '\231', '\232', '\233', '\234', '\235', '\236', '\237',
- '\240', '\242', '\242', '\243', '\245', '\245', '\253', '\247',
- '\270', '\251', '\272', '\253', '\274', '\255', '\256', '\377',
- '\261', '\261', '\263', '\263', '\265', '\265', '\266', '\271',
- '\270', '\271', '\272', '\277', '\274', '\276', '\276', '\277',
- '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
- '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
- '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
- '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\337',
- '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
- '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
- '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
- '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\377'
-};
-
-static const unsigned short EncISO_8859_14_CtypeTable[256] = {
- 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
- 0x4008, 0x420c, 0x4209, 0x4208, 0x4208, 0x4208, 0x4008, 0x4008,
- 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
- 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
- 0x4284, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
- 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
- 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0,
- 0x78b0, 0x78b0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
- 0x41a0, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x74a2,
- 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
- 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
- 0x74a2, 0x74a2, 0x74a2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x51a0,
- 0x41a0, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x70e2,
- 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
- 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
- 0x70e2, 0x70e2, 0x70e2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x4008,
- 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
- 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
- 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
- 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
- 0x0284, 0x34a2, 0x30e2, 0x00a0, 0x34a2, 0x30e2, 0x34a2, 0x00a0,
- 0x34a2, 0x00a0, 0x34a2, 0x30e2, 0x34a2, 0x01a0, 0x00a0, 0x34a2,
- 0x34a2, 0x30e2, 0x34a2, 0x30e2, 0x34a2, 0x30e2, 0x00a0, 0x34a2,
- 0x30e2, 0x30e2, 0x30e2, 0x34a2, 0x30e2, 0x34a2, 0x30e2, 0x30e2,
- 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
- 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
- 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
- 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x30e2,
- 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
- 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
- 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
- 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2
-};
-
-static int
-mbc_case_fold(OnigCaseFoldType flag,
- const UChar** pp, const UChar* end ARG_UNUSED,
- UChar* lower, OnigEncoding enc ARG_UNUSED)
-{
- const UChar* p = *pp;
-
- if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
- *lower++ = 's';
- *lower = 's';
- (*pp)++;
- return 2;
- }
-
- *lower = ENC_ISO_8859_14_TO_LOWER_CASE(*p);
- (*pp)++;
- return 1; /* return byte length of converted char to lower */
-}
-
-#if 0
-static int
-is_mbc_ambiguous(OnigCaseFoldType flag,
- const UChar** pp, const UChar* end)
-{
- int v;
- const UChar* p = *pp;
-
- if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
- (*pp)++;
- return TRUE;
- }
-
- (*pp)++;
- v = (EncISO_8859_14_CtypeTable[*p] & (BIT_CTYPE_UPPER | BIT_CTYPE_LOWER));
- if ((v | BIT_CTYPE_LOWER) != 0) {
- return TRUE;
- }
-
- return (v != 0 ? TRUE : FALSE);
-}
-#endif
-
-static int
-is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSED)
-{
- if (code < 256)
- return ENC_IS_ISO_8859_14_CTYPE(code, ctype);
- else
- return FALSE;
-}
-
-static const OnigPairCaseFoldCodes CaseFoldMap[] = {
- { 0xa1, 0xa2 },
- { 0xa4, 0xa5 },
- { 0xa6, 0xab },
- { 0xa8, 0xb8 },
- { 0xaa, 0xba },
- { 0xac, 0xbc },
- { 0xaf, 0xff },
-
- { 0xb0, 0xb1 },
- { 0xb2, 0xb3 },
- { 0xb4, 0xb5 },
- { 0xb7, 0xb9 },
- { 0xbb, 0xbf },
- { 0xbd, 0xbe },
-
- { 0xc0, 0xe0 },
- { 0xc1, 0xe1 },
- { 0xc2, 0xe2 },
- { 0xc3, 0xe3 },
- { 0xc4, 0xe4 },
- { 0xc5, 0xe5 },
- { 0xc6, 0xe6 },
- { 0xc7, 0xe7 },
- { 0xc8, 0xe8 },
- { 0xc9, 0xe9 },
- { 0xca, 0xea },
- { 0xcb, 0xeb },
- { 0xcc, 0xec },
- { 0xcd, 0xed },
- { 0xce, 0xee },
- { 0xcf, 0xef },
-
- { 0xd0, 0xf0 },
- { 0xd1, 0xf1 },
- { 0xd2, 0xf2 },
- { 0xd3, 0xf3 },
- { 0xd4, 0xf4 },
- { 0xd5, 0xf5 },
- { 0xd6, 0xf6 },
- { 0xd7, 0xf7 },
- { 0xd8, 0xf8 },
- { 0xd9, 0xf9 },
- { 0xda, 0xfa },
- { 0xdb, 0xfb },
- { 0xdc, 0xfc },
- { 0xdd, 0xfd },
- { 0xde, 0xfe }
-};
-
-static int
-apply_all_case_fold(OnigCaseFoldType flag,
- OnigApplyAllCaseFoldFunc f, void* arg,
- OnigEncoding enc ARG_UNUSED)
-{
- return onigenc_apply_all_case_fold_with_map(
- sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
- flag, f, arg);
-}
-
-static int
-get_case_fold_codes_by_str(OnigCaseFoldType flag,
- const OnigUChar* p, const OnigUChar* end,
- OnigCaseFoldCodeItem items[],
- OnigEncoding enc ARG_UNUSED)
-{
- return onigenc_get_case_fold_codes_by_str_with_map(
- sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
- flag, p, end, items);
-}
-
-OnigEncodingDefine(iso_8859_14, ISO_8859_14) = {
- onigenc_single_byte_mbc_enc_len,
- "ISO-8859-14", /* name */
- 1, /* max enc length */
- 1, /* min enc length */
- onigenc_is_mbc_newline_0x0a,
- onigenc_single_byte_mbc_to_code,
- onigenc_single_byte_code_to_mbclen,
- onigenc_single_byte_code_to_mbc,
- mbc_case_fold,
- apply_all_case_fold,
- get_case_fold_codes_by_str,
- onigenc_minimum_property_name_to_ctype,
- is_code_ctype,
- onigenc_not_support_get_ctype_code_range,
- onigenc_single_byte_left_adjust_char_head,
- onigenc_always_true_is_allowed_reverse_match
-};
-ENC_ALIAS("ISO8859-14", "ISO-8859-14")
diff --git a/enc/iso_8859_15.c b/enc/iso_8859_15.c
deleted file mode 100644
index 2ec41b66c0..0000000000
--- a/enc/iso_8859_15.c
+++ /dev/null
@@ -1,240 +0,0 @@
-/**********************************************************************
- iso8859_15.c - Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2007 K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regenc.h"
-
-#define ENC_ISO_8859_15_TO_LOWER_CASE(c) EncISO_8859_15_ToLowerCaseTable[c]
-#define ENC_IS_ISO_8859_15_CTYPE(code,ctype) \
- ((EncISO_8859_15_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
-
-static const UChar EncISO_8859_15_ToLowerCaseTable[256] = {
- '\000', '\001', '\002', '\003', '\004', '\005', '\006', '\007',
- '\010', '\011', '\012', '\013', '\014', '\015', '\016', '\017',
- '\020', '\021', '\022', '\023', '\024', '\025', '\026', '\027',
- '\030', '\031', '\032', '\033', '\034', '\035', '\036', '\037',
- '\040', '\041', '\042', '\043', '\044', '\045', '\046', '\047',
- '\050', '\051', '\052', '\053', '\054', '\055', '\056', '\057',
- '\060', '\061', '\062', '\063', '\064', '\065', '\066', '\067',
- '\070', '\071', '\072', '\073', '\074', '\075', '\076', '\077',
- '\100', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
- '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
- '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
- '\170', '\171', '\172', '\133', '\134', '\135', '\136', '\137',
- '\140', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
- '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
- '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
- '\170', '\171', '\172', '\173', '\174', '\175', '\176', '\177',
- '\200', '\201', '\202', '\203', '\204', '\205', '\206', '\207',
- '\210', '\211', '\212', '\213', '\214', '\215', '\216', '\217',
- '\220', '\221', '\222', '\223', '\224', '\225', '\226', '\227',
- '\230', '\231', '\232', '\233', '\234', '\235', '\236', '\237',
- '\240', '\241', '\242', '\243', '\244', '\245', '\250', '\247',
- '\250', '\251', '\252', '\253', '\254', '\255', '\256', '\257',
- '\260', '\261', '\262', '\263', '\270', '\265', '\266', '\267',
- '\270', '\271', '\272', '\273', '\275', '\275', '\377', '\277',
- '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
- '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
- '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\327',
- '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\337',
- '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
- '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
- '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
- '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\377'
-};
-
-static const unsigned short EncISO_8859_15_CtypeTable[256] = {
- 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
- 0x4008, 0x420c, 0x4209, 0x4208, 0x4208, 0x4208, 0x4008, 0x4008,
- 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
- 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
- 0x4284, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
- 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
- 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0,
- 0x78b0, 0x78b0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
- 0x41a0, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x74a2,
- 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
- 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
- 0x74a2, 0x74a2, 0x74a2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x51a0,
- 0x41a0, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x70e2,
- 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
- 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
- 0x70e2, 0x70e2, 0x70e2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x4008,
- 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
- 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
- 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
- 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
- 0x0284, 0x01a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x34a2, 0x00a0,
- 0x30e2, 0x00a0, 0x30e2, 0x01a0, 0x00a0, 0x01a0, 0x00a0, 0x00a0,
- 0x00a0, 0x00a0, 0x10a0, 0x10a0, 0x34a2, 0x30e2, 0x00a0, 0x01a0,
- 0x30e2, 0x10a0, 0x30e2, 0x01a0, 0x34a2, 0x30e2, 0x34a2, 0x01a0,
- 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
- 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
- 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x00a0,
- 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x30e2,
- 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
- 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
- 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x00a0,
- 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2
-};
-
-static int
-mbc_case_fold(OnigCaseFoldType flag,
- const UChar** pp, const UChar* end ARG_UNUSED,
- UChar* lower, OnigEncoding enc ARG_UNUSED)
-{
- const UChar* p = *pp;
-
- if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
- *lower++ = 's';
- *lower = 's';
- (*pp)++;
- return 2;
- }
-
- *lower = ENC_ISO_8859_15_TO_LOWER_CASE(*p);
- (*pp)++;
- return 1; /* return byte length of converted char to lower */
-}
-
-#if 0
-static int
-is_mbc_ambiguous(OnigCaseFoldType flag,
- const UChar** pp, const UChar* end)
-{
- int v;
- const UChar* p = *pp;
-
- if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
- (*pp)++;
- return TRUE;
- }
-
- (*pp)++;
- v = (EncISO_8859_15_CtypeTable[*p] & (BIT_CTYPE_UPPER | BIT_CTYPE_LOWER));
- if ((v | BIT_CTYPE_LOWER) != 0) {
- /* 0xdf etc.. are lower case letter, but can't convert. */
- if (*p == 0xaa || *p == 0xb5 || *p == 0xba)
- return FALSE;
- else
- return TRUE;
- }
-
- return (v != 0 ? TRUE : FALSE);
-}
-#endif
-
-static int
-is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSED)
-{
- if (code < 256)
- return ENC_IS_ISO_8859_15_CTYPE(code, ctype);
- else
- return FALSE;
-}
-
-static const OnigPairCaseFoldCodes CaseFoldMap[] = {
- { 0xa6, 0xa8 },
-
- { 0xb4, 0xb8 },
- { 0xbc, 0xbd },
- { 0xbe, 0xff },
-
- { 0xc0, 0xe0 },
- { 0xc1, 0xe1 },
- { 0xc2, 0xe2 },
- { 0xc3, 0xe3 },
- { 0xc4, 0xe4 },
- { 0xc5, 0xe5 },
- { 0xc6, 0xe6 },
- { 0xc7, 0xe7 },
- { 0xc8, 0xe8 },
- { 0xc9, 0xe9 },
- { 0xca, 0xea },
- { 0xcb, 0xeb },
- { 0xcc, 0xec },
- { 0xcd, 0xed },
- { 0xce, 0xee },
- { 0xcf, 0xef },
-
- { 0xd0, 0xf0 },
- { 0xd1, 0xf1 },
- { 0xd2, 0xf2 },
- { 0xd3, 0xf3 },
- { 0xd4, 0xf4 },
- { 0xd5, 0xf5 },
- { 0xd6, 0xf6 },
- { 0xd8, 0xf8 },
- { 0xd9, 0xf9 },
- { 0xda, 0xfa },
- { 0xdb, 0xfb },
- { 0xdc, 0xfc },
- { 0xdd, 0xfd },
- { 0xde, 0xfe }
-};
-
-static int
-apply_all_case_fold(OnigCaseFoldType flag,
- OnigApplyAllCaseFoldFunc f, void* arg,
- OnigEncoding enc ARG_UNUSED)
-{
- return onigenc_apply_all_case_fold_with_map(
- sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
- flag, f, arg);
-}
-
-static int
-get_case_fold_codes_by_str(OnigCaseFoldType flag,
- const OnigUChar* p, const OnigUChar* end,
- OnigCaseFoldCodeItem items[],
- OnigEncoding enc ARG_UNUSED)
-{
- return onigenc_get_case_fold_codes_by_str_with_map(
- sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
- flag, p, end, items);
-}
-
-OnigEncodingDefine(iso_8859_15, ISO_8859_15) = {
- onigenc_single_byte_mbc_enc_len,
- "ISO-8859-15", /* name */
- 1, /* max enc length */
- 1, /* min enc length */
- onigenc_is_mbc_newline_0x0a,
- onigenc_single_byte_mbc_to_code,
- onigenc_single_byte_code_to_mbclen,
- onigenc_single_byte_code_to_mbc,
- mbc_case_fold,
- apply_all_case_fold,
- get_case_fold_codes_by_str,
- onigenc_minimum_property_name_to_ctype,
- is_code_ctype,
- onigenc_not_support_get_ctype_code_range,
- onigenc_single_byte_left_adjust_char_head,
- onigenc_always_true_is_allowed_reverse_match
-};
-ENC_ALIAS("ISO8859-15", "ISO-8859-15")
diff --git a/enc/iso_8859_16.c b/enc/iso_8859_16.c
deleted file mode 100644
index 3ddc1d91c6..0000000000
--- a/enc/iso_8859_16.c
+++ /dev/null
@@ -1,242 +0,0 @@
-/**********************************************************************
- iso8859_16.c - Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2007 K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regenc.h"
-
-#define ENC_ISO_8859_16_TO_LOWER_CASE(c) EncISO_8859_16_ToLowerCaseTable[c]
-#define ENC_IS_ISO_8859_16_CTYPE(code,ctype) \
- ((EncISO_8859_16_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
-
-static const UChar EncISO_8859_16_ToLowerCaseTable[256] = {
- '\000', '\001', '\002', '\003', '\004', '\005', '\006', '\007',
- '\010', '\011', '\012', '\013', '\014', '\015', '\016', '\017',
- '\020', '\021', '\022', '\023', '\024', '\025', '\026', '\027',
- '\030', '\031', '\032', '\033', '\034', '\035', '\036', '\037',
- '\040', '\041', '\042', '\043', '\044', '\045', '\046', '\047',
- '\050', '\051', '\052', '\053', '\054', '\055', '\056', '\057',
- '\060', '\061', '\062', '\063', '\064', '\065', '\066', '\067',
- '\070', '\071', '\072', '\073', '\074', '\075', '\076', '\077',
- '\100', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
- '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
- '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
- '\170', '\171', '\172', '\133', '\134', '\135', '\136', '\137',
- '\140', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
- '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
- '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
- '\170', '\171', '\172', '\173', '\174', '\175', '\176', '\177',
- '\200', '\201', '\202', '\203', '\204', '\205', '\206', '\207',
- '\210', '\211', '\212', '\213', '\214', '\215', '\216', '\217',
- '\220', '\221', '\222', '\223', '\224', '\225', '\226', '\227',
- '\230', '\231', '\232', '\233', '\234', '\235', '\236', '\237',
- '\240', '\242', '\242', '\263', '\245', '\245', '\250', '\247',
- '\250', '\251', '\272', '\253', '\256', '\255', '\256', '\277',
- '\260', '\261', '\271', '\263', '\270', '\265', '\266', '\267',
- '\270', '\271', '\272', '\273', '\275', '\275', '\377', '\277',
- '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
- '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
- '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
- '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\337',
- '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
- '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
- '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
- '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\377'
-};
-
-static const unsigned short EncISO_8859_16_CtypeTable[256] = {
- 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
- 0x4008, 0x420c, 0x4209, 0x4208, 0x4208, 0x4208, 0x4008, 0x4008,
- 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
- 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
- 0x4284, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
- 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
- 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0,
- 0x78b0, 0x78b0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
- 0x41a0, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x74a2,
- 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
- 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
- 0x74a2, 0x74a2, 0x74a2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x51a0,
- 0x41a0, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x70e2,
- 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
- 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
- 0x70e2, 0x70e2, 0x70e2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x4008,
- 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
- 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
- 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
- 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
- 0x0284, 0x34a2, 0x30e2, 0x34a2, 0x00a0, 0x01a0, 0x34a2, 0x00a0,
- 0x30e2, 0x00a0, 0x34a2, 0x01a0, 0x34a2, 0x01a0, 0x30e2, 0x34a2,
- 0x00a0, 0x00a0, 0x34a2, 0x30e2, 0x34a2, 0x01a0, 0x00a0, 0x01a0,
- 0x30e2, 0x30e2, 0x30e2, 0x01a0, 0x34a2, 0x30e2, 0x34a2, 0x30e2,
- 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
- 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
- 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
- 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x30e2,
- 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
- 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
- 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
- 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2
-};
-
-static int
-mbc_case_fold(OnigCaseFoldType flag,
- const UChar** pp, const UChar* end ARG_UNUSED, UChar* lower,
- OnigEncoding enc ARG_UNUSED)
-{
- const UChar* p = *pp;
-
- if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
- *lower++ = 's';
- *lower = 's';
- (*pp)++;
- return 2;
- }
-
- *lower = ENC_ISO_8859_16_TO_LOWER_CASE(*p);
- (*pp)++;
- return 1; /* return byte length of converted char to lower */
-}
-
-#if 0
-static int
-is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* end)
-{
- int v;
- const UChar* p = *pp;
-
- if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
- (*pp)++;
- return TRUE;
- }
-
- (*pp)++;
- v = (EncISO_8859_16_CtypeTable[*p] & (BIT_CTYPE_UPPER | BIT_CTYPE_LOWER));
- if ((v | BIT_CTYPE_LOWER) != 0) {
- return TRUE;
- }
-
- return (v != 0 ? TRUE : FALSE);
-}
-#endif
-
-static int
-is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSED)
-{
- if (code < 256)
- return ENC_IS_ISO_8859_16_CTYPE(code, ctype);
- else
- return FALSE;
-}
-
-static const OnigPairCaseFoldCodes CaseFoldMap[] = {
- { 0xa1, 0xa2 },
- { 0xa3, 0xb3 },
- { 0xa6, 0xa8 },
- { 0xaa, 0xba },
- { 0xac, 0xae },
- { 0xaf, 0xbf },
-
- { 0xb2, 0xb9 },
- { 0xb4, 0xb8 },
- { 0xbc, 0xbd },
- { 0xbe, 0xff },
-
- { 0xc0, 0xe0 },
- { 0xc1, 0xe1 },
- { 0xc2, 0xe2 },
- { 0xc3, 0xe3 },
- { 0xc4, 0xe4 },
- { 0xc5, 0xe5 },
- { 0xc6, 0xe6 },
- { 0xc7, 0xe7 },
- { 0xc8, 0xe8 },
- { 0xc9, 0xe9 },
- { 0xca, 0xea },
- { 0xcb, 0xeb },
- { 0xcc, 0xec },
- { 0xcd, 0xed },
- { 0xce, 0xee },
- { 0xcf, 0xef },
-
- { 0xd0, 0xf0 },
- { 0xd1, 0xf1 },
- { 0xd2, 0xf2 },
- { 0xd3, 0xf3 },
- { 0xd4, 0xf4 },
- { 0xd5, 0xf5 },
- { 0xd6, 0xf6 },
- { 0xd7, 0xf7 },
- { 0xd8, 0xf8 },
- { 0xd9, 0xf9 },
- { 0xda, 0xfa },
- { 0xdb, 0xfb },
- { 0xdc, 0xfc },
- { 0xdd, 0xfd },
- { 0xde, 0xfe }
-};
-
-static int
-apply_all_case_fold(OnigCaseFoldType flag,
- OnigApplyAllCaseFoldFunc f, void* arg,
- OnigEncoding enc ARG_UNUSED)
-{
- return onigenc_apply_all_case_fold_with_map(
- sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
- flag, f, arg);
-}
-
-static int
-get_case_fold_codes_by_str(OnigCaseFoldType flag,
- const OnigUChar* p, const OnigUChar* end,
- OnigCaseFoldCodeItem items[],
- OnigEncoding enc ARG_UNUSED)
-{
- return onigenc_get_case_fold_codes_by_str_with_map(
- sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
- flag, p, end, items);
-}
-
-OnigEncodingDefine(iso_8859_16, ISO_8859_16) = {
- onigenc_single_byte_mbc_enc_len,
- "ISO-8859-16", /* name */
- 1, /* max enc length */
- 1, /* min enc length */
- onigenc_is_mbc_newline_0x0a,
- onigenc_single_byte_mbc_to_code,
- onigenc_single_byte_code_to_mbclen,
- onigenc_single_byte_code_to_mbc,
- mbc_case_fold,
- apply_all_case_fold,
- get_case_fold_codes_by_str,
- onigenc_minimum_property_name_to_ctype,
- is_code_ctype,
- onigenc_not_support_get_ctype_code_range,
- onigenc_single_byte_left_adjust_char_head,
- onigenc_always_true_is_allowed_reverse_match
-};
-ENC_ALIAS("ISO8859-16", "ISO-8859-16")
diff --git a/enc/iso_8859_2.c b/enc/iso_8859_2.c
deleted file mode 100644
index 9783f1cd02..0000000000
--- a/enc/iso_8859_2.c
+++ /dev/null
@@ -1,250 +0,0 @@
-/**********************************************************************
- iso8859_2.c - Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2007 K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regenc.h"
-
-#define ENC_ISO_8859_2_TO_LOWER_CASE(c) EncISO_8859_2_ToLowerCaseTable[c]
-#define ENC_IS_ISO_8859_2_CTYPE(code,ctype) \
- ((EncISO_8859_2_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
-
-static const UChar EncISO_8859_2_ToLowerCaseTable[256] = {
- '\000', '\001', '\002', '\003', '\004', '\005', '\006', '\007',
- '\010', '\011', '\012', '\013', '\014', '\015', '\016', '\017',
- '\020', '\021', '\022', '\023', '\024', '\025', '\026', '\027',
- '\030', '\031', '\032', '\033', '\034', '\035', '\036', '\037',
- '\040', '\041', '\042', '\043', '\044', '\045', '\046', '\047',
- '\050', '\051', '\052', '\053', '\054', '\055', '\056', '\057',
- '\060', '\061', '\062', '\063', '\064', '\065', '\066', '\067',
- '\070', '\071', '\072', '\073', '\074', '\075', '\076', '\077',
- '\100', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
- '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
- '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
- '\170', '\171', '\172', '\133', '\134', '\135', '\136', '\137',
- '\140', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
- '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
- '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
- '\170', '\171', '\172', '\173', '\174', '\175', '\176', '\177',
- '\200', '\201', '\202', '\203', '\204', '\205', '\206', '\207',
- '\210', '\211', '\212', '\213', '\214', '\215', '\216', '\217',
- '\220', '\221', '\222', '\223', '\224', '\225', '\226', '\227',
- '\230', '\231', '\232', '\233', '\234', '\235', '\236', '\237',
- '\240', '\261', '\242', '\263', '\244', '\265', '\266', '\247',
- '\250', '\271', '\272', '\273', '\274', '\255', '\276', '\277',
- '\260', '\261', '\262', '\263', '\264', '\265', '\266', '\267',
- '\270', '\271', '\272', '\273', '\274', '\275', '\276', '\277',
- '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
- '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
- '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\327',
- '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\337',
- '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
- '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
- '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
- '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\377'
-};
-
-static const unsigned short EncISO_8859_2_CtypeTable[256] = {
- 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
- 0x4008, 0x420c, 0x4209, 0x4208, 0x4208, 0x4208, 0x4008, 0x4008,
- 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
- 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
- 0x4284, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
- 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
- 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0,
- 0x78b0, 0x78b0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
- 0x41a0, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x74a2,
- 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
- 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
- 0x74a2, 0x74a2, 0x74a2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x51a0,
- 0x41a0, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x70e2,
- 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
- 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
- 0x70e2, 0x70e2, 0x70e2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x4008,
- 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
- 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
- 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
- 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
- 0x0284, 0x34a2, 0x00a0, 0x34a2, 0x00a0, 0x34a2, 0x34a2, 0x00a0,
- 0x00a0, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x01a0, 0x34a2, 0x34a2,
- 0x00a0, 0x30e2, 0x00a0, 0x30e2, 0x00a0, 0x30e2, 0x30e2, 0x00a0,
- 0x00a0, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x00a0, 0x30e2, 0x30e2,
- 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
- 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
- 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x00a0,
- 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x30e2,
- 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
- 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
- 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x00a0,
- 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x00a0
-};
-
-static int
-mbc_case_fold(OnigCaseFoldType flag,
- const UChar** pp, const UChar* end ARG_UNUSED, UChar* lower,
- OnigEncoding enc ARG_UNUSED)
-{
- const UChar* p = *pp;
-
- if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
- *lower++ = 's';
- *lower = 's';
- (*pp)++;
- return 2;
- }
-
- *lower = ENC_ISO_8859_2_TO_LOWER_CASE(*p);
- (*pp)++;
- return 1; /* return byte length of converted char to lower */
-}
-
-#if 0
-static int
-is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* end)
-{
- int v;
- const UChar* p = *pp;
-
- if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
- (*pp)++;
- return TRUE;
- }
-
- (*pp)++;
- v = (EncISO_8859_2_CtypeTable[*p] & (BIT_CTYPE_UPPER | BIT_CTYPE_LOWER));
- if ((v | BIT_CTYPE_LOWER) != 0) {
- return TRUE;
- }
-
- return (v != 0 ? TRUE : FALSE);
-}
-#endif
-
-static const OnigPairCaseFoldCodes CaseFoldMap[] = {
- { 0xa1, 0xb1 },
- { 0xa3, 0xb3 },
- { 0xa5, 0xb5 },
- { 0xa6, 0xb6 },
- { 0xa9, 0xb9 },
- { 0xaa, 0xba },
- { 0xab, 0xbb },
- { 0xac, 0xbc },
- { 0xae, 0xbe },
- { 0xaf, 0xbf },
-
- { 0xc0, 0xe0 },
- { 0xc1, 0xe1 },
- { 0xc2, 0xe2 },
- { 0xc3, 0xe3 },
- { 0xc4, 0xe4 },
- { 0xc5, 0xe5 },
- { 0xc6, 0xe6 },
- { 0xc7, 0xe7 },
- { 0xc8, 0xe8 },
- { 0xc9, 0xe9 },
- { 0xca, 0xea },
- { 0xcb, 0xeb },
- { 0xcc, 0xec },
- { 0xcd, 0xed },
- { 0xce, 0xee },
- { 0xcf, 0xef },
-
- { 0xd0, 0xf0 },
- { 0xd1, 0xf1 },
- { 0xd2, 0xf2 },
- { 0xd3, 0xf3 },
- { 0xd4, 0xf4 },
- { 0xd5, 0xf5 },
- { 0xd6, 0xf6 },
- { 0xd8, 0xf8 },
- { 0xd9, 0xf9 },
- { 0xda, 0xfa },
- { 0xdb, 0xfb },
- { 0xdc, 0xfc },
- { 0xdd, 0xfd },
- { 0xde, 0xfe }
-};
-
-static int
-apply_all_case_fold(OnigCaseFoldType flag,
- OnigApplyAllCaseFoldFunc f, void* arg,
- OnigEncoding enc ARG_UNUSED)
-{
- return onigenc_apply_all_case_fold_with_map(
- sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
- flag, f, arg);
-}
-
-static int
-get_case_fold_codes_by_str(OnigCaseFoldType flag,
- const OnigUChar* p, const OnigUChar* end,
- OnigCaseFoldCodeItem items[],
- OnigEncoding enc ARG_UNUSED)
-{
- return onigenc_get_case_fold_codes_by_str_with_map(
- sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
- flag, p, end, items);
-}
-
-static int
-is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSED)
-{
- if (code < 256)
- return ENC_IS_ISO_8859_2_CTYPE(code, ctype);
- else
- return FALSE;
-}
-
-OnigEncodingDefine(iso_8859_2, ISO_8859_2) = {
- onigenc_single_byte_mbc_enc_len,
- "ISO-8859-2", /* name */
- 1, /* max enc length */
- 1, /* min enc length */
- onigenc_is_mbc_newline_0x0a,
- onigenc_single_byte_mbc_to_code,
- onigenc_single_byte_code_to_mbclen,
- onigenc_single_byte_code_to_mbc,
- mbc_case_fold,
- apply_all_case_fold,
- get_case_fold_codes_by_str,
- onigenc_minimum_property_name_to_ctype,
- is_code_ctype,
- onigenc_not_support_get_ctype_code_range,
- onigenc_single_byte_left_adjust_char_head,
- onigenc_always_true_is_allowed_reverse_match
-};
-ENC_ALIAS("ISO8859-2", "ISO-8859-2")
-
-/*
- * Name: windows-1250
- * MIBenum: 2250
- * Link: http://www.iana.org/assignments/character-sets
- * Link: http://www.microsoft.com/globaldev/reference/sbcs/1250.mspx
- * Link: http://en.wikipedia.org/wiki/Windows-1250
- */
-ENC_REPLICATE("Windows-1250", "ISO-8859-2")
-ENC_ALIAS("CP1250", "Windows-1250")
diff --git a/enc/iso_8859_3.c b/enc/iso_8859_3.c
deleted file mode 100644
index 81c0c742b6..0000000000
--- a/enc/iso_8859_3.c
+++ /dev/null
@@ -1,240 +0,0 @@
-/**********************************************************************
- iso8859_3.c - Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2007 K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regenc.h"
-
-#define ENC_ISO_8859_3_TO_LOWER_CASE(c) EncISO_8859_3_ToLowerCaseTable[c]
-#define ENC_IS_ISO_8859_3_CTYPE(code,ctype) \
- ((EncISO_8859_3_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
-
-static const UChar EncISO_8859_3_ToLowerCaseTable[256] = {
- '\000', '\001', '\002', '\003', '\004', '\005', '\006', '\007',
- '\010', '\011', '\012', '\013', '\014', '\015', '\016', '\017',
- '\020', '\021', '\022', '\023', '\024', '\025', '\026', '\027',
- '\030', '\031', '\032', '\033', '\034', '\035', '\036', '\037',
- '\040', '\041', '\042', '\043', '\044', '\045', '\046', '\047',
- '\050', '\051', '\052', '\053', '\054', '\055', '\056', '\057',
- '\060', '\061', '\062', '\063', '\064', '\065', '\066', '\067',
- '\070', '\071', '\072', '\073', '\074', '\075', '\076', '\077',
- '\100', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
- '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
- '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
- '\170', '\171', '\172', '\133', '\134', '\135', '\136', '\137',
- '\140', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
- '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
- '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
- '\170', '\171', '\172', '\173', '\174', '\175', '\176', '\177',
- '\200', '\201', '\202', '\203', '\204', '\205', '\206', '\207',
- '\210', '\211', '\212', '\213', '\214', '\215', '\216', '\217',
- '\220', '\221', '\222', '\223', '\224', '\225', '\226', '\227',
- '\230', '\231', '\232', '\233', '\234', '\235', '\236', '\237',
- '\240', '\261', '\242', '\243', '\244', '\245', '\266', '\247',
- '\250', '\271', '\272', '\273', '\274', '\255', '\256', '\277',
- '\260', '\261', '\262', '\263', '\264', '\265', '\266', '\267',
- '\270', '\271', '\272', '\273', '\274', '\275', '\276', '\277',
- '\340', '\341', '\342', '\303', '\344', '\345', '\346', '\347',
- '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
- '\320', '\361', '\362', '\363', '\364', '\365', '\366', '\327',
- '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\337',
- '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
- '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
- '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
- '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\377'
-};
-
-static const unsigned short EncISO_8859_3_CtypeTable[256] = {
- 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
- 0x4008, 0x420c, 0x4209, 0x4208, 0x4208, 0x4208, 0x4008, 0x4008,
- 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
- 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
- 0x4284, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
- 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
- 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0,
- 0x78b0, 0x78b0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
- 0x41a0, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x74a2,
- 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
- 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
- 0x74a2, 0x74a2, 0x74a2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x51a0,
- 0x41a0, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x70e2,
- 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
- 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
- 0x70e2, 0x70e2, 0x70e2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x4008,
- 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
- 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
- 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
- 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
- 0x0284, 0x34a2, 0x00a0, 0x00a0, 0x00a0, 0x0000, 0x34a2, 0x00a0,
- 0x00a0, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x01a0, 0x0000, 0x34a2,
- 0x00a0, 0x30e2, 0x10a0, 0x10a0, 0x00a0, 0x30e2, 0x30e2, 0x01a0,
- 0x00a0, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x11a0, 0x0000, 0x30e2,
- 0x34a2, 0x34a2, 0x34a2, 0x0000, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
- 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
- 0x0000, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x00a0,
- 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x30e2,
- 0x30e2, 0x30e2, 0x30e2, 0x0000, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
- 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
- 0x0000, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x00a0,
- 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x00a0
-};
-
-static int
-mbc_case_fold(OnigCaseFoldType flag,
- const UChar** pp, const UChar* end ARG_UNUSED, UChar* lower,
- OnigEncoding enc ARG_UNUSED)
-{
- const UChar* p = *pp;
-
- if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
- *lower++ = 's';
- *lower = 's';
- (*pp)++;
- return 2;
- }
-
- *lower = ENC_ISO_8859_3_TO_LOWER_CASE(*p);
- (*pp)++;
- return 1;
-}
-
-#if 0
-static int
-is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* end)
-{
- int v;
- const UChar* p = *pp;
-
- if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
- (*pp)++;
- return TRUE;
- }
-
- (*pp)++;
- v = (EncISO_8859_3_CtypeTable[*p] & (BIT_CTYPE_UPPER | BIT_CTYPE_LOWER));
- if ((v | BIT_CTYPE_LOWER) != 0) {
- /* 0xaa, 0xb5, 0xba are lower case letter, but can't convert. */
- if (*p == 0xb5)
- return FALSE;
- else
- return TRUE;
- }
-
- return (v != 0 ? TRUE : FALSE);
-}
-#endif
-
-static int
-is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSED)
-{
- if (code < 256)
- return ENC_IS_ISO_8859_3_CTYPE(code, ctype);
- else
- return FALSE;
-}
-
-static const OnigPairCaseFoldCodes CaseFoldMap[] = {
- { 0xa1, 0xb1 },
- { 0xa6, 0xb6 },
- { 0xa9, 0xb9 },
- { 0xaa, 0xba },
- { 0xab, 0xbb },
- { 0xac, 0xbc },
- { 0xaf, 0xbf },
-
- { 0xc0, 0xe0 },
- { 0xc1, 0xe1 },
- { 0xc2, 0xe2 },
- { 0xc4, 0xe4 },
- { 0xc5, 0xe5 },
- { 0xc6, 0xe6 },
- { 0xc7, 0xe7 },
- { 0xc8, 0xe8 },
- { 0xc9, 0xe9 },
- { 0xca, 0xea },
- { 0xcb, 0xeb },
- { 0xcc, 0xec },
- { 0xcd, 0xed },
- { 0xce, 0xee },
- { 0xcf, 0xef },
-
- { 0xd1, 0xf1 },
- { 0xd2, 0xf2 },
- { 0xd3, 0xf3 },
- { 0xd4, 0xf4 },
- { 0xd5, 0xf5 },
- { 0xd6, 0xf6 },
- { 0xd8, 0xf8 },
- { 0xd9, 0xf9 },
- { 0xda, 0xfa },
- { 0xdb, 0xfb },
- { 0xdc, 0xfc },
- { 0xdd, 0xfd },
- { 0xde, 0xfe }
-};
-
-
-static int
-apply_all_case_fold(OnigCaseFoldType flag,
- OnigApplyAllCaseFoldFunc f, void* arg,
- OnigEncoding enc ARG_UNUSED)
-{
- return onigenc_apply_all_case_fold_with_map(
- sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
- flag, f, arg);
-}
-
-static int
-get_case_fold_codes_by_str(OnigCaseFoldType flag,
- const OnigUChar* p, const OnigUChar* end,
- OnigCaseFoldCodeItem items[],
- OnigEncoding enc ARG_UNUSED)
-{
- return onigenc_get_case_fold_codes_by_str_with_map(
- sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
- flag, p, end, items);
-}
-
-OnigEncodingDefine(iso_8859_3, ISO_8859_3) = {
- onigenc_single_byte_mbc_enc_len,
- "ISO-8859-3", /* name */
- 1, /* max enc length */
- 1, /* min enc length */
- onigenc_is_mbc_newline_0x0a,
- onigenc_single_byte_mbc_to_code,
- onigenc_single_byte_code_to_mbclen,
- onigenc_single_byte_code_to_mbc,
- mbc_case_fold,
- apply_all_case_fold,
- get_case_fold_codes_by_str,
- onigenc_minimum_property_name_to_ctype,
- is_code_ctype,
- onigenc_not_support_get_ctype_code_range,
- onigenc_single_byte_left_adjust_char_head,
- onigenc_always_true_is_allowed_reverse_match
-};
-ENC_ALIAS("ISO8859-3", "ISO-8859-3")
diff --git a/enc/iso_8859_4.c b/enc/iso_8859_4.c
deleted file mode 100644
index ec71c4bcbf..0000000000
--- a/enc/iso_8859_4.c
+++ /dev/null
@@ -1,242 +0,0 @@
-/**********************************************************************
- iso8859_4.c - Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2007 K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regenc.h"
-
-#define ENC_ISO_8859_4_TO_LOWER_CASE(c) EncISO_8859_4_ToLowerCaseTable[c]
-#define ENC_IS_ISO_8859_4_CTYPE(code,ctype) \
- ((EncISO_8859_4_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
-
-static const UChar EncISO_8859_4_ToLowerCaseTable[256] = {
- '\000', '\001', '\002', '\003', '\004', '\005', '\006', '\007',
- '\010', '\011', '\012', '\013', '\014', '\015', '\016', '\017',
- '\020', '\021', '\022', '\023', '\024', '\025', '\026', '\027',
- '\030', '\031', '\032', '\033', '\034', '\035', '\036', '\037',
- '\040', '\041', '\042', '\043', '\044', '\045', '\046', '\047',
- '\050', '\051', '\052', '\053', '\054', '\055', '\056', '\057',
- '\060', '\061', '\062', '\063', '\064', '\065', '\066', '\067',
- '\070', '\071', '\072', '\073', '\074', '\075', '\076', '\077',
- '\100', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
- '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
- '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
- '\170', '\171', '\172', '\133', '\134', '\135', '\136', '\137',
- '\140', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
- '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
- '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
- '\170', '\171', '\172', '\173', '\174', '\175', '\176', '\177',
- '\200', '\201', '\202', '\203', '\204', '\205', '\206', '\207',
- '\210', '\211', '\212', '\213', '\214', '\215', '\216', '\217',
- '\220', '\221', '\222', '\223', '\224', '\225', '\226', '\227',
- '\230', '\231', '\232', '\233', '\234', '\235', '\236', '\237',
- '\240', '\261', '\242', '\263', '\244', '\265', '\266', '\247',
- '\250', '\271', '\272', '\273', '\274', '\255', '\276', '\257',
- '\260', '\261', '\262', '\263', '\264', '\265', '\266', '\267',
- '\270', '\271', '\272', '\273', '\274', '\277', '\276', '\277',
- '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
- '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
- '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\327',
- '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\337',
- '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
- '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
- '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
- '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\377'
-};
-
-static const unsigned short EncISO_8859_4_CtypeTable[256] = {
- 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
- 0x4008, 0x420c, 0x4209, 0x4208, 0x4208, 0x4208, 0x4008, 0x4008,
- 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
- 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
- 0x4284, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
- 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
- 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0,
- 0x78b0, 0x78b0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
- 0x41a0, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x74a2,
- 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
- 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
- 0x74a2, 0x74a2, 0x74a2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x51a0,
- 0x41a0, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x70e2,
- 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
- 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
- 0x70e2, 0x70e2, 0x70e2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x4008,
- 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
- 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
- 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
- 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
- 0x0284, 0x34a2, 0x30e2, 0x34a2, 0x00a0, 0x34a2, 0x34a2, 0x00a0,
- 0x00a0, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x01a0, 0x34a2, 0x00a0,
- 0x00a0, 0x30e2, 0x00a0, 0x30e2, 0x00a0, 0x30e2, 0x30e2, 0x00a0,
- 0x00a0, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x34a2, 0x30e2, 0x30e2,
- 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
- 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
- 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x00a0,
- 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x30e2,
- 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
- 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
- 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x00a0,
- 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x00a0
-};
-
-static int
-mbc_case_fold(OnigCaseFoldType flag,
- const UChar** pp, const UChar* end ARG_UNUSED, UChar* lower,
- OnigEncoding enc ARG_UNUSED)
-{
- const UChar* p = *pp;
-
- if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
- *lower++ = 's';
- *lower = 's';
- (*pp)++;
- return 2;
- }
-
- *lower = ENC_ISO_8859_4_TO_LOWER_CASE(*p);
- (*pp)++;
- return 1; /* return byte length of converted char to lower */
-}
-
-#if 0
-static int
-is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* end)
-{
- int v;
- const UChar* p = *pp;
-
- if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
- (*pp)++;
- return TRUE;
- }
-
- (*pp)++;
- v = (EncISO_8859_4_CtypeTable[*p] & (BIT_CTYPE_UPPER | BIT_CTYPE_LOWER));
- if ((v | BIT_CTYPE_LOWER) != 0) {
- if (*p == 0xa2)
- return FALSE;
- else
- return TRUE;
- }
-
- return (v != 0 ? TRUE : FALSE);
-}
-#endif
-
-static int
-is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSED)
-{
- if (code < 256)
- return ENC_IS_ISO_8859_4_CTYPE(code, ctype);
- else
- return FALSE;
-}
-
-static const OnigPairCaseFoldCodes CaseFoldMap[] = {
- { 0xa1, 0xb1 },
- { 0xa3, 0xb3 },
- { 0xa5, 0xb5 },
- { 0xa6, 0xb6 },
- { 0xa9, 0xb9 },
- { 0xaa, 0xba },
- { 0xab, 0xbb },
- { 0xac, 0xbc },
- { 0xae, 0xbe },
-
- { 0xc0, 0xe0 },
- { 0xc1, 0xe1 },
- { 0xc2, 0xe2 },
- { 0xc3, 0xe3 },
- { 0xc4, 0xe4 },
- { 0xc5, 0xe5 },
- { 0xc6, 0xe6 },
- { 0xc7, 0xe7 },
- { 0xc8, 0xe8 },
- { 0xc9, 0xe9 },
- { 0xca, 0xea },
- { 0xcb, 0xeb },
- { 0xcc, 0xec },
- { 0xcd, 0xed },
- { 0xce, 0xee },
- { 0xcf, 0xef },
-
- { 0xd0, 0xf0 },
- { 0xd1, 0xf1 },
- { 0xd2, 0xf2 },
- { 0xd3, 0xf3 },
- { 0xd4, 0xf4 },
- { 0xd5, 0xf5 },
- { 0xd6, 0xf6 },
- { 0xd8, 0xf8 },
- { 0xd9, 0xf9 },
- { 0xda, 0xfa },
- { 0xdb, 0xfb },
- { 0xdc, 0xfc },
- { 0xdd, 0xfd },
- { 0xde, 0xfe }
-};
-
-static int
-apply_all_case_fold(OnigCaseFoldType flag,
- OnigApplyAllCaseFoldFunc f, void* arg,
- OnigEncoding enc ARG_UNUSED)
-{
- return onigenc_apply_all_case_fold_with_map(
- sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
- flag, f, arg);
-}
-
-static int
-get_case_fold_codes_by_str(OnigCaseFoldType flag,
- const OnigUChar* p, const OnigUChar* end,
- OnigCaseFoldCodeItem items[],
- OnigEncoding enc ARG_UNUSED)
-{
- return onigenc_get_case_fold_codes_by_str_with_map(
- sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
- flag, p, end, items);
-}
-
-OnigEncodingDefine(iso_8859_4, ISO_8859_4) = {
- onigenc_single_byte_mbc_enc_len,
- "ISO-8859-4", /* name */
- 1, /* max enc length */
- 1, /* min enc length */
- onigenc_is_mbc_newline_0x0a,
- onigenc_single_byte_mbc_to_code,
- onigenc_single_byte_code_to_mbclen,
- onigenc_single_byte_code_to_mbc,
- mbc_case_fold,
- apply_all_case_fold,
- get_case_fold_codes_by_str,
- onigenc_minimum_property_name_to_ctype,
- is_code_ctype,
- onigenc_not_support_get_ctype_code_range,
- onigenc_single_byte_left_adjust_char_head,
- onigenc_always_true_is_allowed_reverse_match
-};
-ENC_ALIAS("ISO8859-4", "ISO-8859-4")
diff --git a/enc/iso_8859_5.c b/enc/iso_8859_5.c
deleted file mode 100644
index 1550763323..0000000000
--- a/enc/iso_8859_5.c
+++ /dev/null
@@ -1,230 +0,0 @@
-/**********************************************************************
- iso8859_5.c - Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2007 K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regenc.h"
-
-#define ENC_ISO_8859_5_TO_LOWER_CASE(c) EncISO_8859_5_ToLowerCaseTable[c]
-#define ENC_IS_ISO_8859_5_CTYPE(code,ctype) \
- ((EncISO_8859_5_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
-
-static const UChar EncISO_8859_5_ToLowerCaseTable[256] = {
- '\000', '\001', '\002', '\003', '\004', '\005', '\006', '\007',
- '\010', '\011', '\012', '\013', '\014', '\015', '\016', '\017',
- '\020', '\021', '\022', '\023', '\024', '\025', '\026', '\027',
- '\030', '\031', '\032', '\033', '\034', '\035', '\036', '\037',
- '\040', '\041', '\042', '\043', '\044', '\045', '\046', '\047',
- '\050', '\051', '\052', '\053', '\054', '\055', '\056', '\057',
- '\060', '\061', '\062', '\063', '\064', '\065', '\066', '\067',
- '\070', '\071', '\072', '\073', '\074', '\075', '\076', '\077',
- '\100', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
- '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
- '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
- '\170', '\171', '\172', '\133', '\134', '\135', '\136', '\137',
- '\140', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
- '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
- '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
- '\170', '\171', '\172', '\173', '\174', '\175', '\176', '\177',
- '\200', '\201', '\202', '\203', '\204', '\205', '\206', '\207',
- '\210', '\211', '\212', '\213', '\214', '\215', '\216', '\217',
- '\220', '\221', '\222', '\223', '\224', '\225', '\226', '\227',
- '\230', '\231', '\232', '\233', '\234', '\235', '\236', '\237',
- '\240', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
- '\370', '\371', '\372', '\373', '\374', '\255', '\376', '\377',
- '\320', '\321', '\322', '\323', '\324', '\325', '\326', '\327',
- '\330', '\331', '\332', '\333', '\334', '\335', '\336', '\337',
- '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
- '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
- '\320', '\321', '\322', '\323', '\324', '\325', '\326', '\327',
- '\330', '\331', '\332', '\333', '\334', '\335', '\336', '\337',
- '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
- '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
- '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
- '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\377'
-};
-
-static const unsigned short EncISO_8859_5_CtypeTable[256] = {
- 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
- 0x4008, 0x420c, 0x4209, 0x4208, 0x4208, 0x4208, 0x4008, 0x4008,
- 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
- 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
- 0x4284, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
- 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
- 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0,
- 0x78b0, 0x78b0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
- 0x41a0, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x74a2,
- 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
- 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
- 0x74a2, 0x74a2, 0x74a2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x51a0,
- 0x41a0, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x70e2,
- 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
- 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
- 0x70e2, 0x70e2, 0x70e2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x4008,
- 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
- 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
- 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
- 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
- 0x0284, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
- 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x01a0, 0x34a2, 0x34a2,
- 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
- 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
- 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
- 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
- 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
- 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
- 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
- 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
- 0x00a0, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
- 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x00a0, 0x30e2, 0x30e2
-};
-
-static int
-mbc_case_fold(OnigCaseFoldType flag,
- const UChar** pp, const UChar* end ARG_UNUSED, UChar* lower,
- OnigEncoding enc ARG_UNUSED)
-{
- const UChar* p = *pp;
-
- *lower = ENC_ISO_8859_5_TO_LOWER_CASE(*p);
- (*pp)++;
- return 1;
-}
-
-#if 0
-static int
-is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* end)
-{
- int v;
- const UChar* p = *pp;
-
- (*pp)++;
- v = (EncISO_8859_5_CtypeTable[*p] & (BIT_CTYPE_UPPER | BIT_CTYPE_LOWER));
- return (v != 0 ? TRUE : FALSE);
-}
-#endif
-
-static int
-is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSED)
-{
- if (code < 256)
- return ENC_IS_ISO_8859_5_CTYPE(code, ctype);
- else
- return FALSE;
-}
-
-static const OnigPairCaseFoldCodes CaseFoldMap[] = {
- { 0xa1, 0xf1 },
- { 0xa2, 0xf2 },
- { 0xa3, 0xf3 },
- { 0xa4, 0xf4 },
- { 0xa5, 0xf5 },
- { 0xa6, 0xf6 },
- { 0xa7, 0xf7 },
- { 0xa8, 0xf8 },
- { 0xa9, 0xf9 },
- { 0xaa, 0xfa },
- { 0xab, 0xfb },
- { 0xac, 0xfc },
- { 0xae, 0xfe },
- { 0xaf, 0xff },
-
- { 0xb0, 0xd0 },
- { 0xb1, 0xd1 },
- { 0xb2, 0xd2 },
- { 0xb3, 0xd3 },
- { 0xb4, 0xd4 },
- { 0xb5, 0xd5 },
- { 0xb6, 0xd6 },
- { 0xb7, 0xd7 },
- { 0xb8, 0xd8 },
- { 0xb9, 0xd9 },
- { 0xba, 0xda },
- { 0xbb, 0xdb },
- { 0xbc, 0xdc },
- { 0xbd, 0xdd },
- { 0xbe, 0xde },
- { 0xbf, 0xdf },
-
- { 0xc0, 0xe0 },
- { 0xc1, 0xe1 },
- { 0xc2, 0xe2 },
- { 0xc3, 0xe3 },
- { 0xc4, 0xe4 },
- { 0xc5, 0xe5 },
- { 0xc6, 0xe6 },
- { 0xc7, 0xe7 },
- { 0xc8, 0xe8 },
- { 0xc9, 0xe9 },
- { 0xca, 0xea },
- { 0xcb, 0xeb },
- { 0xcc, 0xec },
- { 0xcd, 0xed },
- { 0xce, 0xee },
- { 0xcf, 0xef }
-};
-
-static int
-apply_all_case_fold(OnigCaseFoldType flag,
- OnigApplyAllCaseFoldFunc f, void* arg,
- OnigEncoding enc ARG_UNUSED)
-{
- return onigenc_apply_all_case_fold_with_map(
- sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0,
- flag, f, arg);
-}
-
-static int
-get_case_fold_codes_by_str(OnigCaseFoldType flag,
- const OnigUChar* p, const OnigUChar* end,
- OnigCaseFoldCodeItem items[],
- OnigEncoding enc ARG_UNUSED)
-{
- return onigenc_get_case_fold_codes_by_str_with_map(
- sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0,
- flag, p, end, items);
-}
-
-OnigEncodingDefine(iso_8859_5, ISO_8859_5) = {
- onigenc_single_byte_mbc_enc_len,
- "ISO-8859-5", /* name */
- 1, /* max enc length */
- 1, /* min enc length */
- onigenc_is_mbc_newline_0x0a,
- onigenc_single_byte_mbc_to_code,
- onigenc_single_byte_code_to_mbclen,
- onigenc_single_byte_code_to_mbc,
- mbc_case_fold,
- apply_all_case_fold,
- get_case_fold_codes_by_str,
- onigenc_minimum_property_name_to_ctype,
- is_code_ctype,
- onigenc_not_support_get_ctype_code_range,
- onigenc_single_byte_left_adjust_char_head,
- onigenc_always_true_is_allowed_reverse_match
-};
-ENC_ALIAS("ISO8859-5", "ISO-8859-5")
diff --git a/enc/iso_8859_6.c b/enc/iso_8859_6.c
deleted file mode 100644
index 7384061a1f..0000000000
--- a/enc/iso_8859_6.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/**********************************************************************
- iso8859_6.c - Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2007 K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regenc.h"
-
-#define ENC_IS_ISO_8859_6_CTYPE(code,ctype) \
- ((EncISO_8859_6_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
-
-static const unsigned short EncISO_8859_6_CtypeTable[256] = {
- 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
- 0x4008, 0x420c, 0x4209, 0x4208, 0x4208, 0x4208, 0x4008, 0x4008,
- 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
- 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
- 0x4284, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
- 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
- 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0,
- 0x78b0, 0x78b0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
- 0x41a0, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x74a2,
- 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
- 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
- 0x74a2, 0x74a2, 0x74a2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x51a0,
- 0x41a0, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x70e2,
- 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
- 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
- 0x70e2, 0x70e2, 0x70e2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x4008,
- 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
- 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
- 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
- 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
- 0x0284, 0x0000, 0x0000, 0x0000, 0x00a0, 0x0000, 0x0000, 0x0000,
- 0x0000, 0x0000, 0x0000, 0x0000, 0x01a0, 0x01a0, 0x0000, 0x0000,
- 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
- 0x0000, 0x0000, 0x0000, 0x01a0, 0x0000, 0x0000, 0x0000, 0x01a0,
- 0x0000, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2,
- 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2,
- 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2,
- 0x30a2, 0x30a2, 0x30a2, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
- 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2,
- 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2,
- 0x30a2, 0x30a2, 0x30a2, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
- 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
-};
-
-static int
-is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSED)
-{
- if (code < 256)
- return ENC_IS_ISO_8859_6_CTYPE(code, ctype);
- else
- return FALSE;
-}
-
-OnigEncodingDefine(iso_8859_6, ISO_8859_6) = {
- onigenc_single_byte_mbc_enc_len,
- "ISO-8859-6", /* name */
- 1, /* max enc length */
- 1, /* min enc length */
- onigenc_is_mbc_newline_0x0a,
- onigenc_single_byte_mbc_to_code,
- onigenc_single_byte_code_to_mbclen,
- onigenc_single_byte_code_to_mbc,
- onigenc_ascii_mbc_case_fold,
- onigenc_ascii_apply_all_case_fold,
- onigenc_ascii_get_case_fold_codes_by_str,
- onigenc_minimum_property_name_to_ctype,
- is_code_ctype,
- onigenc_not_support_get_ctype_code_range,
- onigenc_single_byte_left_adjust_char_head,
- onigenc_always_true_is_allowed_reverse_match
-};
-ENC_ALIAS("ISO8859-6", "ISO-8859-6")
-
-/*
- * Name: windows-1256
- * MIBenum: 2256
- * Link: http://www.iana.org/assignments/character-sets
- * Link: http://www.microsoft.com/globaldev/reference/sbcs/1256.mspx
- * Link: http://en.wikipedia.org/wiki/Windows-1256
- */
-ENC_REPLICATE("Windows-1256", "ISO-8859-6")
-ENC_ALIAS("CP1256", "Windows-1256")
diff --git a/enc/iso_8859_7.c b/enc/iso_8859_7.c
deleted file mode 100644
index 2f916171db..0000000000
--- a/enc/iso_8859_7.c
+++ /dev/null
@@ -1,237 +0,0 @@
-/**********************************************************************
- iso8859_7.c - Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2007 K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regenc.h"
-
-#define ENC_ISO_8859_7_TO_LOWER_CASE(c) EncISO_8859_7_ToLowerCaseTable[c]
-#define ENC_IS_ISO_8859_7_CTYPE(code,ctype) \
- ((EncISO_8859_7_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
-
-static const UChar EncISO_8859_7_ToLowerCaseTable[256] = {
- '\000', '\001', '\002', '\003', '\004', '\005', '\006', '\007',
- '\010', '\011', '\012', '\013', '\014', '\015', '\016', '\017',
- '\020', '\021', '\022', '\023', '\024', '\025', '\026', '\027',
- '\030', '\031', '\032', '\033', '\034', '\035', '\036', '\037',
- '\040', '\041', '\042', '\043', '\044', '\045', '\046', '\047',
- '\050', '\051', '\052', '\053', '\054', '\055', '\056', '\057',
- '\060', '\061', '\062', '\063', '\064', '\065', '\066', '\067',
- '\070', '\071', '\072', '\073', '\074', '\075', '\076', '\077',
- '\100', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
- '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
- '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
- '\170', '\171', '\172', '\133', '\134', '\135', '\136', '\137',
- '\140', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
- '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
- '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
- '\170', '\171', '\172', '\173', '\174', '\175', '\176', '\177',
- '\200', '\201', '\202', '\203', '\204', '\205', '\206', '\207',
- '\210', '\211', '\212', '\213', '\214', '\215', '\216', '\217',
- '\220', '\221', '\222', '\223', '\224', '\225', '\226', '\227',
- '\230', '\231', '\232', '\233', '\234', '\235', '\236', '\237',
- '\240', '\241', '\242', '\243', '\244', '\245', '\246', '\247',
- '\250', '\251', '\252', '\253', '\254', '\255', '\256', '\257',
- '\260', '\261', '\262', '\263', '\264', '\265', '\334', '\267',
- '\335', '\336', '\337', '\273', '\374', '\275', '\375', '\376',
- '\300', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
- '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
- '\360', '\361', '\322', '\363', '\364', '\365', '\366', '\367',
- '\370', '\371', '\372', '\373', '\334', '\335', '\336', '\337',
- '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
- '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
- '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
- '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\377'
-};
-
-static const unsigned short EncISO_8859_7_CtypeTable[256] = {
- 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
- 0x4008, 0x420c, 0x4209, 0x4208, 0x4208, 0x4208, 0x4008, 0x4008,
- 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
- 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
- 0x4284, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
- 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
- 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0,
- 0x78b0, 0x78b0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
- 0x41a0, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x74a2,
- 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
- 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
- 0x74a2, 0x74a2, 0x74a2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x51a0,
- 0x41a0, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x70e2,
- 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
- 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
- 0x70e2, 0x70e2, 0x70e2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x4008,
- 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
- 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
- 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
- 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
- 0x0284, 0x01a0, 0x01a0, 0x00a0, 0x0000, 0x0000, 0x00a0, 0x00a0,
- 0x00a0, 0x00a0, 0x0000, 0x01a0, 0x00a0, 0x01a0, 0x0000, 0x01a0,
- 0x00a0, 0x00a0, 0x10a0, 0x10a0, 0x00a0, 0x00a0, 0x34a2, 0x01a0,
- 0x34a2, 0x34a2, 0x34a2, 0x01a0, 0x34a2, 0x10a0, 0x34a2, 0x34a2,
- 0x30e2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
- 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
- 0x34a2, 0x34a2, 0x0000, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
- 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
- 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
- 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
- 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
- 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x0000
-};
-
-static int
-mbc_case_fold(OnigCaseFoldType flag,
- const UChar** pp, const UChar* end ARG_UNUSED, UChar* lower,
- OnigEncoding enc ARG_UNUSED)
-{
- const UChar* p = *pp;
-
- *lower = ENC_ISO_8859_7_TO_LOWER_CASE(*p);
- (*pp)++;
- return 1;
-}
-
-#if 0
-static int
-is_mbc_ambiguous(OnigCaseFoldType flag,
- const UChar** pp, const UChar* end)
-{
- int v;
- const UChar* p = *pp;
-
- (*pp)++;
- v = (EncISO_8859_7_CtypeTable[*p] & (BIT_CTYPE_UPPER | BIT_CTYPE_LOWER));
- if ((v | BIT_CTYPE_LOWER) != 0) {
- if (*p == 0xc0 || *p == 0xe0)
- return FALSE;
- else
- return TRUE;
- }
-
- return (v != 0 ? TRUE : FALSE);
-}
-#endif
-
-static int
-is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSED)
-{
- if (code < 256)
- return ENC_IS_ISO_8859_7_CTYPE(code, ctype);
- else
- return FALSE;
-}
-
-static const OnigPairCaseFoldCodes CaseFoldMap[] = {
- { 0xb6, 0xdc },
- { 0xb8, 0xdd },
- { 0xb9, 0xde },
- { 0xba, 0xdf },
- { 0xbc, 0xfc },
- { 0xbe, 0xfd },
- { 0xbf, 0xfe },
-
- { 0xc1, 0xe1 },
- { 0xc2, 0xe2 },
- { 0xc3, 0xe3 },
- { 0xc4, 0xe4 },
- { 0xc5, 0xe5 },
- { 0xc6, 0xe6 },
- { 0xc7, 0xe7 },
- { 0xc8, 0xe8 },
- { 0xc9, 0xe9 },
- { 0xca, 0xea },
- { 0xcb, 0xeb },
- { 0xcc, 0xec },
- { 0xcd, 0xed },
- { 0xce, 0xee },
- { 0xcf, 0xef },
-
- { 0xd0, 0xf0 },
- { 0xd1, 0xf1 },
- { 0xd2, 0xf2 },
- { 0xd3, 0xf3 },
- { 0xd4, 0xf4 },
- { 0xd5, 0xf5 },
- { 0xd6, 0xf6 },
- { 0xd7, 0xf7 },
- { 0xd8, 0xf8 },
- { 0xd9, 0xf9 },
- { 0xda, 0xfa },
- { 0xdb, 0xfb }
-};
-
-static int
-apply_all_case_fold(OnigCaseFoldType flag,
- OnigApplyAllCaseFoldFunc f, void* arg,
- OnigEncoding enc ARG_UNUSED)
-{
- return onigenc_apply_all_case_fold_with_map(
- sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0,
- flag, f, arg);
-}
-
-static int
-get_case_fold_codes_by_str(OnigCaseFoldType flag,
- const OnigUChar* p, const OnigUChar* end,
- OnigCaseFoldCodeItem items[],
- OnigEncoding enc ARG_UNUSED)
-{
- return onigenc_get_case_fold_codes_by_str_with_map(
- sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0,
- flag, p, end, items);
-}
-
-
-OnigEncodingDefine(iso_8859_7, ISO_8859_7) = {
- onigenc_single_byte_mbc_enc_len,
- "ISO-8859-7", /* name */
- 1, /* max enc length */
- 1, /* min enc length */
- onigenc_is_mbc_newline_0x0a,
- onigenc_single_byte_mbc_to_code,
- onigenc_single_byte_code_to_mbclen,
- onigenc_single_byte_code_to_mbc,
- mbc_case_fold,
- apply_all_case_fold,
- get_case_fold_codes_by_str,
- onigenc_minimum_property_name_to_ctype,
- is_code_ctype,
- onigenc_not_support_get_ctype_code_range,
- onigenc_single_byte_left_adjust_char_head,
- onigenc_always_true_is_allowed_reverse_match
-};
-ENC_ALIAS("ISO8859-7", "ISO-8859-7")
-
-/*
- * Name: windows-1253
- * MIBenum: 2253
- * Link: http://www.iana.org/assignments/character-sets
- * Link: http://www.microsoft.com/globaldev/reference/sbcs/1253.mspx
- * Link: http://en.wikipedia.org/wiki/Windows-1253
- */
-ENC_REPLICATE("Windows-1253", "ISO-8859-7")
-ENC_ALIAS("CP1253", "Windows-1253")
diff --git a/enc/iso_8859_8.c b/enc/iso_8859_8.c
deleted file mode 100644
index bd0754c2b1..0000000000
--- a/enc/iso_8859_8.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/**********************************************************************
- iso8859_8.c - Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2007 K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regenc.h"
-
-#define ENC_IS_ISO_8859_8_CTYPE(code,ctype) \
- ((EncISO_8859_8_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
-
-static const unsigned short EncISO_8859_8_CtypeTable[256] = {
- 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
- 0x4008, 0x420c, 0x4209, 0x4208, 0x4208, 0x4208, 0x4008, 0x4008,
- 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
- 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
- 0x4284, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
- 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
- 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0,
- 0x78b0, 0x78b0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
- 0x41a0, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x74a2,
- 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
- 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
- 0x74a2, 0x74a2, 0x74a2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x51a0,
- 0x41a0, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x70e2,
- 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
- 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
- 0x70e2, 0x70e2, 0x70e2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x4008,
- 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
- 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
- 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
- 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
- 0x0284, 0x0000, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0,
- 0x00a0, 0x00a0, 0x00a0, 0x01a0, 0x00a0, 0x01a0, 0x00a0, 0x00a0,
- 0x00a0, 0x00a0, 0x10a0, 0x10a0, 0x00a0, 0x30e2, 0x00a0, 0x01a0,
- 0x00a0, 0x10a0, 0x00a0, 0x01a0, 0x10a0, 0x10a0, 0x10a0, 0x0000,
- 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
- 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
- 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
- 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x01a0,
- 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2,
- 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2,
- 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2,
- 0x30a2, 0x30a2, 0x30a2, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
-};
-
-static int
-is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSED)
-{
- if (code < 256)
- return ENC_IS_ISO_8859_8_CTYPE(code, ctype);
- else
- return FALSE;
-}
-
-OnigEncodingDefine(iso_8859_8, ISO_8859_8) = {
- onigenc_single_byte_mbc_enc_len,
- "ISO-8859-8", /* name */
- 1, /* max enc length */
- 1, /* min enc length */
- onigenc_is_mbc_newline_0x0a,
- onigenc_single_byte_mbc_to_code,
- onigenc_single_byte_code_to_mbclen,
- onigenc_single_byte_code_to_mbc,
- onigenc_ascii_mbc_case_fold,
- onigenc_ascii_apply_all_case_fold,
- onigenc_ascii_get_case_fold_codes_by_str,
- onigenc_minimum_property_name_to_ctype,
- is_code_ctype,
- onigenc_not_support_get_ctype_code_range,
- onigenc_single_byte_left_adjust_char_head,
- onigenc_always_true_is_allowed_reverse_match
-};
-ENC_ALIAS("ISO8859-8", "ISO-8859-8")
-
-/*
- * Name: windows-1255
- * MIBenum: 2255
- * Link: http://www.iana.org/assignments/character-sets
- * Link: http://www.microsoft.com/globaldev/reference/sbcs/1255.mspx
- * Link: http://en.wikipedia.org/wiki/Windows-1255
- */
-ENC_REPLICATE("Windows-1255", "ISO-8859-8")
-ENC_ALIAS("CP1255", "Windows-1255")
diff --git a/enc/iso_8859_9.c b/enc/iso_8859_9.c
deleted file mode 100644
index 4d46e742e2..0000000000
--- a/enc/iso_8859_9.c
+++ /dev/null
@@ -1,243 +0,0 @@
-/**********************************************************************
- iso8859_9.c - Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2007 K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regenc.h"
-
-#define ENC_ISO_8859_9_TO_LOWER_CASE(c) EncISO_8859_9_ToLowerCaseTable[c]
-#define ENC_IS_ISO_8859_9_CTYPE(code,ctype) \
- ((EncISO_8859_9_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
-
-static const UChar EncISO_8859_9_ToLowerCaseTable[256] = {
- '\000', '\001', '\002', '\003', '\004', '\005', '\006', '\007',
- '\010', '\011', '\012', '\013', '\014', '\015', '\016', '\017',
- '\020', '\021', '\022', '\023', '\024', '\025', '\026', '\027',
- '\030', '\031', '\032', '\033', '\034', '\035', '\036', '\037',
- '\040', '\041', '\042', '\043', '\044', '\045', '\046', '\047',
- '\050', '\051', '\052', '\053', '\054', '\055', '\056', '\057',
- '\060', '\061', '\062', '\063', '\064', '\065', '\066', '\067',
- '\070', '\071', '\072', '\073', '\074', '\075', '\076', '\077',
- '\100', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
- '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
- '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
- '\170', '\171', '\172', '\133', '\134', '\135', '\136', '\137',
- '\140', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
- '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
- '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
- '\170', '\171', '\172', '\173', '\174', '\175', '\176', '\177',
- '\200', '\201', '\202', '\203', '\204', '\205', '\206', '\207',
- '\210', '\211', '\212', '\213', '\214', '\215', '\216', '\217',
- '\220', '\221', '\222', '\223', '\224', '\225', '\226', '\227',
- '\230', '\231', '\232', '\233', '\234', '\235', '\236', '\237',
- '\240', '\241', '\242', '\243', '\244', '\245', '\246', '\247',
- '\250', '\251', '\252', '\253', '\254', '\255', '\256', '\257',
- '\260', '\261', '\262', '\263', '\264', '\265', '\266', '\267',
- '\270', '\271', '\272', '\273', '\274', '\275', '\276', '\277',
- '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
- '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
- '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\327',
- '\370', '\371', '\372', '\373', '\374', '\335', '\376', '\337',
- '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
- '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
- '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
- '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\377'
-};
-
-static const unsigned short EncISO_8859_9_CtypeTable[256] = {
- 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
- 0x4008, 0x420c, 0x4209, 0x4208, 0x4208, 0x4208, 0x4008, 0x4008,
- 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
- 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
- 0x4284, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
- 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
- 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0,
- 0x78b0, 0x78b0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
- 0x41a0, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x74a2,
- 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
- 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
- 0x74a2, 0x74a2, 0x74a2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x51a0,
- 0x41a0, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x70e2,
- 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
- 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
- 0x70e2, 0x70e2, 0x70e2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x4008,
- 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
- 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
- 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
- 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
- 0x0284, 0x01a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0,
- 0x00a0, 0x00a0, 0x30e2, 0x01a0, 0x00a0, 0x01a0, 0x00a0, 0x00a0,
- 0x00a0, 0x00a0, 0x10a0, 0x10a0, 0x00a0, 0x30e2, 0x00a0, 0x01a0,
- 0x00a0, 0x10a0, 0x30e2, 0x01a0, 0x10a0, 0x10a0, 0x10a0, 0x01a0,
- 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
- 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
- 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x00a0,
- 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x30e2,
- 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
- 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
- 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x00a0,
- 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2
-};
-
-static int
-mbc_case_fold(OnigCaseFoldType flag,
- const UChar** pp, const UChar* end ARG_UNUSED, UChar* lower,
- OnigEncoding enc ARG_UNUSED)
-{
- const UChar* p = *pp;
-
- if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
- *lower++ = 's';
- *lower = 's';
- (*pp)++;
- return 2;
- }
-
- *lower = ENC_ISO_8859_9_TO_LOWER_CASE(*p);
- (*pp)++;
- return 1;
-}
-
-#if 0
-static int
-is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* end)
-{
- int v;
- const UChar* p = *pp;
-
- if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
- (*pp)++;
- return TRUE;
- }
-
- (*pp)++;
- v = (EncISO_8859_9_CtypeTable[*p] & (BIT_CTYPE_UPPER | BIT_CTYPE_LOWER));
- if ((v | BIT_CTYPE_LOWER) != 0) {
- /* 0xdf etc.. are lower case letter, but can't convert. */
- if (*p >= 0xaa && *p <= 0xba)
- return FALSE;
- else
- return TRUE;
- }
-
- return (v != 0 ? TRUE : FALSE);
-}
-#endif
-
-static int
-is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSED)
-{
- if (code < 256)
- return ENC_IS_ISO_8859_9_CTYPE(code, ctype);
- else
- return FALSE;
-}
-
-static const OnigPairCaseFoldCodes CaseFoldMap[] = {
- { 0xc0, 0xe0 },
- { 0xc1, 0xe1 },
- { 0xc2, 0xe2 },
- { 0xc3, 0xe3 },
- { 0xc4, 0xe4 },
- { 0xc5, 0xe5 },
- { 0xc6, 0xe6 },
- { 0xc7, 0xe7 },
- { 0xc8, 0xe8 },
- { 0xc9, 0xe9 },
- { 0xca, 0xea },
- { 0xcb, 0xeb },
- { 0xcc, 0xec },
- { 0xcd, 0xed },
- { 0xce, 0xee },
- { 0xcf, 0xef },
-
- { 0xd0, 0xf0 },
- { 0xd1, 0xf1 },
- { 0xd2, 0xf2 },
- { 0xd3, 0xf3 },
- { 0xd4, 0xf4 },
- { 0xd5, 0xf5 },
- { 0xd6, 0xf6 },
- { 0xd8, 0xf8 },
- { 0xd9, 0xf9 },
- { 0xda, 0xfa },
- { 0xdb, 0xfb },
- { 0xdc, 0xfc },
- { 0xdd, 0xfd },
- { 0xde, 0xfe }
-};
-
-static int
-apply_all_case_fold(OnigCaseFoldType flag,
- OnigApplyAllCaseFoldFunc f, void* arg,
- OnigEncoding enc ARG_UNUSED)
-{
- return onigenc_apply_all_case_fold_with_map(
- sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
- flag, f, arg);
-}
-
-static int
-get_case_fold_codes_by_str(OnigCaseFoldType flag,
- const OnigUChar* p, const OnigUChar* end,
- OnigCaseFoldCodeItem items[],
- OnigEncoding enc ARG_UNUSED)
-{
- return onigenc_get_case_fold_codes_by_str_with_map(
- sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
- flag, p, end, items);
-}
-
-OnigEncodingDefine(iso_8859_9, ISO_8859_9) = {
- onigenc_single_byte_mbc_enc_len,
- "ISO-8859-9", /* name */
- 1, /* max enc length */
- 1, /* min enc length */
- onigenc_is_mbc_newline_0x0a,
- onigenc_single_byte_mbc_to_code,
- onigenc_single_byte_code_to_mbclen,
- onigenc_single_byte_code_to_mbc,
- mbc_case_fold,
- apply_all_case_fold,
- get_case_fold_codes_by_str,
- onigenc_minimum_property_name_to_ctype,
- is_code_ctype,
- onigenc_not_support_get_ctype_code_range,
- onigenc_single_byte_left_adjust_char_head,
- onigenc_always_true_is_allowed_reverse_match
-};
-ENC_ALIAS("ISO8859-9", "ISO-8859-9")
-
-/*
- * Name: windows-1254
- * MIBenum: 2254
- * Link: http://www.iana.org/assignments/character-sets
- * Link: http://www.microsoft.com/globaldev/reference/sbcs/1254.mspx
- * Link: http://en.wikipedia.org/wiki/Windows-1254
- */
-ENC_REPLICATE("Windows-1254", "ISO-8859-9")
-ENC_ALIAS("CP1254", "Windows-1254")
diff --git a/enc/koi8_r.c b/enc/koi8_r.c
deleted file mode 100644
index fb6e10eadc..0000000000
--- a/enc/koi8_r.c
+++ /dev/null
@@ -1,219 +0,0 @@
-/**********************************************************************
- koi8_r.c - Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2007 K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regenc.h"
-
-#define ENC_KOI8_R_TO_LOWER_CASE(c) EncKOI8_R_ToLowerCaseTable[c]
-#define ENC_IS_KOI8_R_CTYPE(code,ctype) \
- ((EncKOI8_R_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
-
-static const UChar EncKOI8_R_ToLowerCaseTable[256] = {
- '\000', '\001', '\002', '\003', '\004', '\005', '\006', '\007',
- '\010', '\011', '\012', '\013', '\014', '\015', '\016', '\017',
- '\020', '\021', '\022', '\023', '\024', '\025', '\026', '\027',
- '\030', '\031', '\032', '\033', '\034', '\035', '\036', '\037',
- '\040', '\041', '\042', '\043', '\044', '\045', '\046', '\047',
- '\050', '\051', '\052', '\053', '\054', '\055', '\056', '\057',
- '\060', '\061', '\062', '\063', '\064', '\065', '\066', '\067',
- '\070', '\071', '\072', '\073', '\074', '\075', '\076', '\077',
- '\100', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
- '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
- '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
- '\170', '\171', '\172', '\133', '\134', '\135', '\136', '\137',
- '\140', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
- '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
- '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
- '\170', '\171', '\172', '\173', '\174', '\175', '\176', '\177',
- '\200', '\201', '\202', '\203', '\204', '\205', '\206', '\207',
- '\210', '\211', '\212', '\213', '\214', '\215', '\216', '\217',
- '\220', '\221', '\222', '\223', '\224', '\225', '\226', '\227',
- '\230', '\231', '\232', '\233', '\234', '\235', '\236', '\237',
- '\240', '\241', '\242', '\243', '\244', '\245', '\246', '\247',
- '\250', '\251', '\252', '\253', '\254', '\255', '\256', '\257',
- '\260', '\261', '\262', '\243', '\264', '\265', '\266', '\267',
- '\270', '\271', '\272', '\273', '\274', '\275', '\276', '\277',
- '\300', '\301', '\302', '\303', '\304', '\305', '\306', '\307',
- '\310', '\311', '\312', '\313', '\314', '\315', '\316', '\317',
- '\320', '\321', '\322', '\323', '\324', '\325', '\326', '\327',
- '\330', '\331', '\332', '\333', '\334', '\335', '\336', '\337',
- '\300', '\301', '\302', '\303', '\304', '\305', '\306', '\307',
- '\310', '\311', '\312', '\313', '\314', '\315', '\316', '\317',
- '\320', '\321', '\322', '\323', '\324', '\325', '\326', '\327',
- '\330', '\331', '\332', '\333', '\334', '\335', '\336', '\337'
-};
-
-static const unsigned short EncKOI8_R_CtypeTable[256] = {
- 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
- 0x4008, 0x420c, 0x4209, 0x4208, 0x4208, 0x4208, 0x4008, 0x4008,
- 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
- 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
- 0x4284, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
- 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
- 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0,
- 0x78b0, 0x78b0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
- 0x41a0, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x74a2,
- 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
- 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
- 0x74a2, 0x74a2, 0x74a2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x51a0,
- 0x41a0, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x70e2,
- 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
- 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
- 0x70e2, 0x70e2, 0x70e2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x4008,
- 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0,
- 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0,
- 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0,
- 0x00a0, 0x00a0, 0x0284, 0x00a0, 0x00a0, 0x10a0, 0x01a0, 0x00a0,
- 0x00a0, 0x00a0, 0x00a0, 0x30e2, 0x00a0, 0x00a0, 0x00a0, 0x00a0,
- 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0,
- 0x00a0, 0x00a0, 0x00a0, 0x34a2, 0x00a0, 0x00a0, 0x00a0, 0x00a0,
- 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0,
- 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
- 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
- 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
- 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
- 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
- 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
- 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
- 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2
-};
-
-static int
-koi8_r_mbc_case_fold(OnigCaseFoldType flag ARG_UNUSED,
- const UChar** pp, const UChar* end ARG_UNUSED,
- UChar* lower, OnigEncoding enc ARG_UNUSED)
-{
- const UChar* p = *pp;
-
- *lower = ENC_KOI8_R_TO_LOWER_CASE(*p);
- (*pp)++;
- return 1;
-}
-
-#if 0
-static int
-koi8_r_is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp,
- const UChar* end, OnigEncoding enc ARG_UNUSED)
-{
- int v;
- const UChar* p = *pp;
-
- (*pp)++;
- v = (EncKOI8_R_CtypeTable[*p] & (BIT_CTYPE_UPPER | BIT_CTYPE_LOWER));
- return (v != 0 ? TRUE : FALSE);
-}
-#endif
-
-static int
-koi8_r_is_code_ctype(OnigCodePoint code, unsigned int ctype,
- OnigEncoding enc ARG_UNUSED)
-{
- if (code < 256)
- return ENC_IS_KOI8_R_CTYPE(code, ctype);
- else
- return FALSE;
-}
-
-static const OnigPairCaseFoldCodes CaseFoldMap[] = {
- { 0xa3, 0xb3 },
-
- { 0xc0, 0xe0 },
- { 0xc1, 0xe1 },
- { 0xc2, 0xe2 },
- { 0xc3, 0xe3 },
- { 0xc4, 0xe4 },
- { 0xc5, 0xe5 },
- { 0xc6, 0xe6 },
- { 0xc7, 0xe7 },
- { 0xc8, 0xe8 },
- { 0xc9, 0xe9 },
- { 0xca, 0xea },
- { 0xcb, 0xeb },
- { 0xcc, 0xec },
- { 0xcd, 0xed },
- { 0xce, 0xee },
- { 0xcf, 0xef },
-
- { 0xd0, 0xf0 },
- { 0xd1, 0xf1 },
- { 0xd2, 0xf2 },
- { 0xd3, 0xf3 },
- { 0xd4, 0xf4 },
- { 0xd5, 0xf5 },
- { 0xd6, 0xf6 },
- { 0xd7, 0xf7 },
- { 0xd8, 0xf8 },
- { 0xd9, 0xf9 },
- { 0xda, 0xfa },
- { 0xdb, 0xfb },
- { 0xdc, 0xfc },
- { 0xdd, 0xfd },
- { 0xde, 0xfe },
- { 0xdf, 0xff }
-};
-
-static int
-koi8_r_apply_all_case_fold(OnigCaseFoldType flag,
- OnigApplyAllCaseFoldFunc f,
- void* arg, OnigEncoding enc ARG_UNUSED)
-{
- return onigenc_apply_all_case_fold_with_map(
- sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0,
- flag, f, arg);
-}
-
-static int
-koi8_r_get_case_fold_codes_by_str(OnigCaseFoldType flag,
- const OnigUChar* p, const OnigUChar* end,
- OnigCaseFoldCodeItem items[], OnigEncoding enc ARG_UNUSED)
-{
- return onigenc_get_case_fold_codes_by_str_with_map(
- sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0,
- flag, p, end, items);
-}
-
-OnigEncodingDefine(koi8_r, KOI8_R) = {
- onigenc_single_byte_mbc_enc_len,
- "KOI8-R", /* name */
- 1, /* max enc length */
- 1, /* min enc length */
- onigenc_is_mbc_newline_0x0a,
- onigenc_single_byte_mbc_to_code,
- onigenc_single_byte_code_to_mbclen,
- onigenc_single_byte_code_to_mbc,
- koi8_r_mbc_case_fold,
- koi8_r_apply_all_case_fold,
- koi8_r_get_case_fold_codes_by_str,
- onigenc_minimum_property_name_to_ctype,
- koi8_r_is_code_ctype,
- onigenc_not_support_get_ctype_code_range,
- onigenc_single_byte_left_adjust_char_head,
- onigenc_always_true_is_allowed_reverse_match
-};
-ENC_ALIAS("CP878", "KOI8-R")
-
diff --git a/enc/koi8_u.c b/enc/koi8_u.c
deleted file mode 100644
index 9bd363df12..0000000000
--- a/enc/koi8_u.c
+++ /dev/null
@@ -1,221 +0,0 @@
-/**********************************************************************
- koi8_u.c - Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2007 K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regenc.h"
-
-#define ENC_KOI8_U_TO_LOWER_CASE(c) EncKOI8_U_ToLowerCaseTable[c]
-#define ENC_IS_KOI8_U_CTYPE(code,ctype) \
- ((EncKOI8_U_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
-
-static const UChar EncKOI8_U_ToLowerCaseTable[256] = {
- '\000', '\001', '\002', '\003', '\004', '\005', '\006', '\007',
- '\010', '\011', '\012', '\013', '\014', '\015', '\016', '\017',
- '\020', '\021', '\022', '\023', '\024', '\025', '\026', '\027',
- '\030', '\031', '\032', '\033', '\034', '\035', '\036', '\037',
- '\040', '\041', '\042', '\043', '\044', '\045', '\046', '\047',
- '\050', '\051', '\052', '\053', '\054', '\055', '\056', '\057',
- '\060', '\061', '\062', '\063', '\064', '\065', '\066', '\067',
- '\070', '\071', '\072', '\073', '\074', '\075', '\076', '\077',
- '\100', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
- '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
- '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
- '\170', '\171', '\172', '\133', '\134', '\135', '\136', '\137',
- '\140', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
- '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
- '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
- '\170', '\171', '\172', '\173', '\174', '\175', '\176', '\177',
- '\200', '\201', '\202', '\203', '\204', '\205', '\206', '\207',
- '\210', '\211', '\212', '\213', '\214', '\215', '\216', '\217',
- '\220', '\221', '\222', '\223', '\224', '\225', '\226', '\227',
- '\230', '\231', '\232', '\233', '\234', '\235', '\236', '\237',
- '\240', '\241', '\242', '\243', '\244', '\245', '\246', '\247',
- '\250', '\251', '\252', '\253', '\254', '\255', '\256', '\257',
- '\260', '\261', '\262', '\243', '\244', '\265', '\246', '\247',
- '\270', '\271', '\272', '\273', '\274', '\255', '\276', '\277',
- '\300', '\301', '\302', '\303', '\304', '\305', '\306', '\307',
- '\310', '\311', '\312', '\313', '\314', '\315', '\316', '\317',
- '\320', '\321', '\322', '\323', '\324', '\325', '\326', '\327',
- '\330', '\331', '\332', '\333', '\334', '\335', '\336', '\337',
- '\300', '\301', '\302', '\303', '\304', '\305', '\306', '\307',
- '\310', '\311', '\312', '\313', '\314', '\315', '\316', '\317',
- '\320', '\321', '\322', '\323', '\324', '\325', '\326', '\327',
- '\330', '\331', '\332', '\333', '\334', '\335', '\336', '\337'
-};
-
-static const unsigned short EncKOI8_U_CtypeTable[256] = {
- 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
- 0x4008, 0x420c, 0x4209, 0x4208, 0x4208, 0x4208, 0x4008, 0x4008,
- 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
- 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
- 0x4284, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
- 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
- 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0,
- 0x78b0, 0x78b0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
- 0x41a0, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x74a2,
- 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
- 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
- 0x74a2, 0x74a2, 0x74a2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x51a0,
- 0x41a0, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x70e2,
- 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
- 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
- 0x70e2, 0x70e2, 0x70e2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x4008,
- 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0,
- 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0,
- 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0,
- 0x00a0, 0x00a0, 0x0284, 0x00a0, 0x00a0, 0x10a0, 0x01a0, 0x00a0,
- 0x00a0, 0x00a0, 0x00a0, 0x30e2, 0x30e2, 0x00a0, 0x30e2, 0x30e2,
- 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x30e2, 0x00a0, 0x00a0,
- 0x00a0, 0x00a0, 0x00a0, 0x34a2, 0x34a2, 0x00a0, 0x34a2, 0x34a2,
- 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x34a2, 0x00a0, 0x00a0,
- 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
- 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
- 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
- 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
- 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
- 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
- 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
- 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2
-};
-
-static int
-koi8_u_mbc_case_fold(OnigCaseFoldType flag ARG_UNUSED,
- const UChar** pp, const UChar* end ARG_UNUSED,
- UChar* lower, OnigEncoding enc ARG_UNUSED)
-{
- const UChar* p = *pp;
-
- *lower = ENC_KOI8_U_TO_LOWER_CASE(*p);
- (*pp)++;
- return 1;
-}
-
-#if 0
-static int
-koi8_u_is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp,
- const UChar* end, OnigEncoding enc ARG_UNUSED)
-{
- int v;
- const UChar* p = *pp;
-
- (*pp)++;
- v = (EncKOI8_U_CtypeTable[*p] & (BIT_CTYPE_UPPER | BIT_CTYPE_LOWER));
- return (v != 0 ? TRUE : FALSE);
-}
-#endif
-
-static int
-koi8_u_is_code_ctype(OnigCodePoint code, unsigned int ctype,
- OnigEncoding enc ARG_UNUSED)
-{
- if (code < 256)
- return ENC_IS_KOI8_U_CTYPE(code, ctype);
- else
- return FALSE;
-}
-
-static const OnigPairCaseFoldCodes CaseFoldMap[] = {
- { 0xa3, 0xb3 },
- { 0xa4, 0xb4 },
- { 0xa6, 0xb6 },
- { 0xa7, 0xb7 },
- { 0xad, 0xbd },
-
- { 0xc0, 0xe0 },
- { 0xc1, 0xe1 },
- { 0xc2, 0xe2 },
- { 0xc3, 0xe3 },
- { 0xc4, 0xe4 },
- { 0xc5, 0xe5 },
- { 0xc6, 0xe6 },
- { 0xc7, 0xe7 },
- { 0xc8, 0xe8 },
- { 0xc9, 0xe9 },
- { 0xca, 0xea },
- { 0xcb, 0xeb },
- { 0xcc, 0xec },
- { 0xcd, 0xed },
- { 0xce, 0xee },
- { 0xcf, 0xef },
-
- { 0xd0, 0xf0 },
- { 0xd1, 0xf1 },
- { 0xd2, 0xf2 },
- { 0xd3, 0xf3 },
- { 0xd4, 0xf4 },
- { 0xd5, 0xf5 },
- { 0xd6, 0xf6 },
- { 0xd7, 0xf7 },
- { 0xd8, 0xf8 },
- { 0xd9, 0xf9 },
- { 0xda, 0xfa },
- { 0xdb, 0xfb },
- { 0xdc, 0xfc },
- { 0xdd, 0xfd },
- { 0xde, 0xfe },
- { 0xdf, 0xff }
-};
-
-static int
-koi8_u_apply_all_case_fold(OnigCaseFoldType flag,
- OnigApplyAllCaseFoldFunc f,
- void* arg, OnigEncoding enc ARG_UNUSED)
-{
- return onigenc_apply_all_case_fold_with_map(
- sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0,
- flag, f, arg);
-}
-
-static int
-koi8_u_get_case_fold_codes_by_str(OnigCaseFoldType flag,
- const OnigUChar* p, const OnigUChar* end,
- OnigCaseFoldCodeItem items[], OnigEncoding enc ARG_UNUSED)
-{
- return onigenc_get_case_fold_codes_by_str_with_map(
- sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0,
- flag, p, end, items);
-}
-
-OnigEncodingDefine(koi8_u, KOI8_U) = {
- onigenc_single_byte_mbc_enc_len,
- "KOI8-U", /* name */
- 1, /* max enc length */
- 1, /* min enc length */
- onigenc_is_mbc_newline_0x0a,
- onigenc_single_byte_mbc_to_code,
- onigenc_single_byte_code_to_mbclen,
- onigenc_single_byte_code_to_mbc,
- koi8_u_mbc_case_fold,
- koi8_u_apply_all_case_fold,
- koi8_u_get_case_fold_codes_by_str,
- onigenc_minimum_property_name_to_ctype,
- koi8_u_is_code_ctype,
- onigenc_not_support_get_ctype_code_range,
- onigenc_single_byte_left_adjust_char_head,
- onigenc_always_true_is_allowed_reverse_match
-};
diff --git a/enc/make_encmake.rb b/enc/make_encmake.rb
deleted file mode 100644
index 107a387571..0000000000
--- a/enc/make_encmake.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-#! ./miniruby
-
-dir = File.expand_path("../..", __FILE__)
-$:.unshift(dir)
-$:.unshift(".")
-if $".grep(/mkmf/).empty?
- $" << "mkmf.rb"
- load File.expand_path("lib/mkmf.rb", dir)
-end
-require 'erb'
-
-CONFIG["MAKEDIRS"] ||= '@$(MINIRUBY) -run -e mkdir -- -p'
-
-BUILTIN_ENCS = []
-BUILTIN_TRANSES = []
-ENC_PATTERNS = []
-NOENC_PATTERNS = []
-
-until ARGV.empty?
- case ARGV[0]
- when /\A--builtin-encs=/
- BUILTIN_ENCS.concat $'.split.map {|e| File.basename(e, '.*') << '.c'}
- ARGV.shift
- when /\A--builtin-transes=/
- BUILTIN_TRANSES.concat $'.split.map {|e| File.basename(e, '.*') }
- ARGV.shift
- when /\A--encs=/
- ENC_PATTERNS.concat $'.split
- ARGV.shift
- when /\A--no-encs=/
- NOENC_PATTERNS.concat $'.split
- ARGV.shift
- else
- break
- end
-end
-
-if File.exist?(depend = File.join($srcdir, "depend"))
- erb = ERB.new(File.read(depend), nil, '%')
- erb.filename = depend
- tmp = erb.result(binding)
- dep = "\n#### depend ####\n\n" << depend_rules(tmp).join
-else
- dep = ""
-end
-mkin = File.read(File.join($srcdir, "Makefile.in"))
-mkin.gsub!(/@(#{CONFIG.keys.join('|')})@/) {CONFIG[$1]}
-open(ARGV[0], 'wb') {|f|
- f.puts mkin, dep
-}
diff --git a/enc/prelude.rb b/enc/prelude.rb
deleted file mode 100644
index 8ce59f957a..0000000000
--- a/enc/prelude.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-%w'enc/encdb.so enc/trans/transdb.so'.each do |init|
- begin
- require(init)
- rescue LoadError
- end
-end
diff --git a/enc/shift_jis.c b/enc/shift_jis.c
deleted file mode 100644
index b4d8592a27..0000000000
--- a/enc/shift_jis.c
+++ /dev/null
@@ -1,399 +0,0 @@
-/**********************************************************************
- sjis.c - Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2007 K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regint.h"
-
-static const int EncLen_SJIS[] = {
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1
-};
-
-static const char SJIS_CAN_BE_TRAIL_TABLE[256] = {
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0
-};
-
-#define SJIS_ISMB_FIRST(byte) (EncLen_SJIS[byte] > 1)
-#define SJIS_ISMB_TRAIL(byte) SJIS_CAN_BE_TRAIL_TABLE[(byte)]
-
-typedef enum { FAILURE = -2, ACCEPT = -1, S0 = 0, S1 } state_t;
-#define A ACCEPT
-#define F FAILURE
-static const signed char trans[][0x100] = {
- { /* S0 0 1 2 3 4 5 6 7 8 9 a b c d e f */
- /* 0 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 1 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 2 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 3 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 4 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 5 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 6 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 7 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 8 */ F, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* 9 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* a */ F, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* b */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* c */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* d */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* e */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* f */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, F, F, F
- },
- { /* S1 0 1 2 3 4 5 6 7 8 9 a b c d e f */
- /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 4 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 5 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 6 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 7 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, F,
- /* 8 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 9 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* a */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* b */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* c */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* d */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* e */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* f */ A, A, A, A, A, A, A, A, A, A, A, A, A, F, F, F
- }
-};
-#undef A
-#undef F
-
-static int
-mbc_enc_len(const UChar* p, const UChar* e, OnigEncoding enc ARG_UNUSED)
-{
- int firstbyte = *p++;
- state_t s;
- s = trans[0][firstbyte];
- if (s < 0) return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(1) :
- ONIGENC_CONSTRUCT_MBCLEN_INVALID();
- if (p == e) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(EncLen_SJIS[firstbyte]-1);
- s = trans[s][*p++];
- return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(2) :
- ONIGENC_CONSTRUCT_MBCLEN_INVALID();
-}
-
-static int
-code_to_mbclen(OnigCodePoint code, OnigEncoding enc ARG_UNUSED)
-{
- if (code < 256) {
- if (EncLen_SJIS[(int )code] == 1)
- return 1;
- else
- return 0;
- }
- else if (code <= 0xffff) {
- return 2;
- }
- else
- return ONIGERR_INVALID_CODE_POINT_VALUE;
-}
-
-static OnigCodePoint
-mbc_to_code(const UChar* p, const UChar* end, OnigEncoding enc)
-{
- int c, i, len;
- OnigCodePoint n;
-
- len = enclen(enc, p, end);
- c = *p++;
- n = c;
- if (len == 1) return n;
-
- for (i = 1; i < len; i++) {
- if (p >= end) break;
- c = *p++;
- n <<= 8; n += c;
- }
- return n;
-}
-
-static int
-code_to_mbc(OnigCodePoint code, UChar *buf, OnigEncoding enc)
-{
- UChar *p = buf;
-
- if ((code & 0xff00) != 0) *p++ = (UChar )(((code >> 8) & 0xff));
- *p++ = (UChar )(code & 0xff);
-
-#if 0
- if (enclen(enc, buf) != (p - buf))
- return REGERR_INVALID_CODE_POINT_VALUE;
-#endif
- return p - buf;
-}
-
-static int
-mbc_case_fold(OnigCaseFoldType flag,
- const UChar** pp, const UChar* end, UChar* lower,
- OnigEncoding enc)
-{
- const UChar* p = *pp;
-
- if (ONIGENC_IS_MBC_ASCII(p)) {
- *lower = ONIGENC_ASCII_CODE_TO_LOWER_CASE(*p);
- (*pp)++;
- return 1;
- }
- else {
- int i;
- int len = enclen(enc, p, end);
-
- for (i = 0; i < len; i++) {
- *lower++ = *p++;
- }
- (*pp) += len;
- return len; /* return byte length of converted char to lower */
- }
-}
-
-#if 0
-static int
-is_mbc_ambiguous(OnigCaseFoldType flag,
- const UChar** pp, const UChar* end)
-{
- return onigenc_mbn_is_mbc_ambiguous(enc, flag, pp, end);
-
-}
-#endif
-
-#if 0
-static int
-is_code_ctype(OnigCodePoint code, unsigned int ctype)
-{
- if (code < 128)
- return ONIGENC_IS_ASCII_CODE_CTYPE(code, ctype);
- else {
- if (CTYPE_IS_WORD_GRAPH_PRINT(ctype)) {
- return (code_to_mbclen(code) > 1 ? TRUE : FALSE);
- }
- }
-
- return FALSE;
-}
-#endif
-
-static UChar*
-left_adjust_char_head(const UChar* start, const UChar* s, const UChar* end, OnigEncoding enc)
-{
- const UChar *p;
- int len;
-
- if (s <= start) return (UChar* )s;
- p = s;
-
- if (SJIS_ISMB_TRAIL(*p)) {
- while (p > start) {
- if (! SJIS_ISMB_FIRST(*--p)) {
- p++;
- break;
- }
- }
- }
- len = enclen(enc, p, end);
- if (p + len > s) return (UChar* )p;
- p += len;
- return (UChar* )(p + ((s - p) & ~1));
-}
-
-static int
-is_allowed_reverse_match(const UChar* s, const UChar* end, OnigEncoding enc ARG_UNUSED)
-{
- const UChar c = *s;
- return (SJIS_ISMB_TRAIL(c) ? FALSE : TRUE);
-}
-
-
-static int PropertyInited = 0;
-static const OnigCodePoint** PropertyList;
-static int PropertyListNum;
-static int PropertyListSize;
-static hash_table_type* PropertyNameTable;
-
-static const OnigCodePoint CR_Hiragana[] = {
- 1,
- 0x829f, 0x82f1
-}; /* CR_Hiragana */
-
-static const OnigCodePoint CR_Katakana[] = {
- 4,
- 0x00a6, 0x00af,
- 0x00b1, 0x00dd,
- 0x8340, 0x837e,
- 0x8380, 0x8396,
-}; /* CR_Katakana */
-
-static int
-init_property_list(void)
-{
- int r;
-
- PROPERTY_LIST_ADD_PROP("Hiragana", CR_Hiragana);
- PROPERTY_LIST_ADD_PROP("Katakana", CR_Katakana);
- PropertyInited = 1;
-
- end:
- return r;
-}
-
-static int
-property_name_to_ctype(OnigEncoding enc, UChar* p, UChar* end)
-{
- st_data_t ctype;
-
- PROPERTY_LIST_INIT_CHECK;
-
- if (onig_st_lookup_strend(PropertyNameTable, p, end, &ctype) == 0) {
- return onigenc_minimum_property_name_to_ctype(enc, p, end);
- }
-
- return ctype;
-}
-
-static int
-is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc)
-{
- if (ctype <= ONIGENC_MAX_STD_CTYPE) {
- if (code < 128)
- return ONIGENC_IS_ASCII_CODE_CTYPE(code, ctype);
- else {
- if (CTYPE_IS_WORD_GRAPH_PRINT(ctype)) {
- return TRUE;
- }
- }
- }
- else {
- PROPERTY_LIST_INIT_CHECK;
-
- ctype -= (ONIGENC_MAX_STD_CTYPE + 1);
- if (ctype >= (unsigned int )PropertyListNum)
- return ONIGERR_TYPE_BUG;
-
- return onig_is_in_code_range((UChar* )PropertyList[ctype], code);
- }
-
- return FALSE;
-}
-
-static int
-get_ctype_code_range(OnigCtype ctype, OnigCodePoint* sb_out,
- const OnigCodePoint* ranges[], OnigEncoding enc ARG_UNUSED)
-{
- if (ctype <= ONIGENC_MAX_STD_CTYPE) {
- return ONIG_NO_SUPPORT_CONFIG;
- }
- else {
- *sb_out = 0x80;
-
- PROPERTY_LIST_INIT_CHECK;
-
- ctype -= (ONIGENC_MAX_STD_CTYPE + 1);
- if (ctype >= (OnigCtype )PropertyListNum)
- return ONIGERR_TYPE_BUG;
-
- *ranges = PropertyList[ctype];
- return 0;
- }
-}
-
-OnigEncodingDefine(shift_jis, Shift_JIS) = {
- mbc_enc_len,
- "Shift_JIS", /* name */
- 2, /* max byte length */
- 1, /* min byte length */
- onigenc_is_mbc_newline_0x0a,
- mbc_to_code,
- code_to_mbclen,
- code_to_mbc,
- mbc_case_fold,
- onigenc_ascii_apply_all_case_fold,
- onigenc_ascii_get_case_fold_codes_by_str,
- property_name_to_ctype,
- is_code_ctype,
- get_ctype_code_range,
- left_adjust_char_head,
- is_allowed_reverse_match,
- 0
-};
-/*
- * Name: Shift_JIS
- * MIBenum: 17
- * Link: http://www.iana.org/assignments/character-sets
- * Link: http://ja.wikipedia.org/wiki/Shift_JIS
- */
-ENC_ALIAS("SJIS", "Shift_JIS")
-
-/*
- * Name: Windows-31J
- * MIBenum: 2024
- * Link: http://www.iana.org/assignments/character-sets
- * Link: http://www.microsoft.com/globaldev/reference/dbcs/932.mspx
- * Link: http://ja.wikipedia.org/wiki/Windows-31J
- * Link: http://source.icu-project.org/repos/icu/data/trunk/charset/data/ucm/windows-932-2000.ucm
- */
-ENC_REPLICATE("Windows-31J", "Shift_JIS")
-ENC_ALIAS("CP932", "Windows-31J")
-ENC_ALIAS("csWindows31J", "Windows-31J") /* IANA. IE6 don't accept Windows-31J but csWindows31J. */
-
-/*
- * Name: MacJapanese
- * Link: http://unicode.org/Public/MAPPINGS/VENDORS/APPLE/JAPANESE.TXT
- * Link: http://ja.wikipedia.org/wiki/MacJapanese
- */
-ENC_REPLICATE("MacJapanese", "Shift_JIS")
-ENC_ALIAS("MacJapan", "MacJapanese")
diff --git a/enc/trans/CP/CP932UDA%UCS.src b/enc/trans/CP/CP932UDA%UCS.src
deleted file mode 100644
index c49048510e..0000000000
--- a/enc/trans/CP/CP932UDA%UCS.src
+++ /dev/null
@@ -1,1912 +0,0 @@
-# $NetBSD: CP932UDA%UCS.src,v 1.1 2006/11/04 03:46:19 tnozaki Exp $
-
-TYPE ROWCOL
-NAME "CP932UDA/UCS"
-SRC_ZONE 0x7F-0x92 / 0x21-0x7E / 8
-OOB_MODE INVALID
-DST_INVALID 0xFFFE
-DST_UNIT_BITS 16
-
-BEGIN_MAP
-#
-# This mapping data is made from the mapping data provided by Unicode, Inc.
-# Original notice:
-#
-# Name: cp932 to Unicode table
-# Unicode version: 2.0
-# Table version: 2.01
-# Table format: Format A
-# Date: 04/15/98
-#
-# Contact: cpxlate@microsoft.com
-#
-# General notes: none
-#
-# Format: Three tab-separated columns
-# Column #1 is the cp932 code (in hex)
-# Column #2 is the Unicode (in hex as 0xXXXX)
-# Column #3 is the Unicode name (follows a comment sign, '#')
-#
-# The entries are in cp932 order
-#
-0x7F21 = 0xE000
-0x7F22 = 0xE001
-0x7F23 = 0xE002
-0x7F24 = 0xE003
-0x7F25 = 0xE004
-0x7F26 = 0xE005
-0x7F27 = 0xE006
-0x7F28 = 0xE007
-0x7F29 = 0xE008
-0x7F2A = 0xE009
-0x7F2B = 0xE00A
-0x7F2C = 0xE00B
-0x7F2D = 0xE00C
-0x7F2E = 0xE00D
-0x7F2F = 0xE00E
-0x7F30 = 0xE00F
-0x7F31 = 0xE010
-0x7F32 = 0xE011
-0x7F33 = 0xE012
-0x7F34 = 0xE013
-0x7F35 = 0xE014
-0x7F36 = 0xE015
-0x7F37 = 0xE016
-0x7F38 = 0xE017
-0x7F39 = 0xE018
-0x7F3A = 0xE019
-0x7F3B = 0xE01A
-0x7F3C = 0xE01B
-0x7F3D = 0xE01C
-0x7F3E = 0xE01D
-0x7F3F = 0xE01E
-0x7F40 = 0xE01F
-0x7F41 = 0xE020
-0x7F42 = 0xE021
-0x7F43 = 0xE022
-0x7F44 = 0xE023
-0x7F45 = 0xE024
-0x7F46 = 0xE025
-0x7F47 = 0xE026
-0x7F48 = 0xE027
-0x7F49 = 0xE028
-0x7F4A = 0xE029
-0x7F4B = 0xE02A
-0x7F4C = 0xE02B
-0x7F4D = 0xE02C
-0x7F4E = 0xE02D
-0x7F4F = 0xE02E
-0x7F50 = 0xE02F
-0x7F51 = 0xE030
-0x7F52 = 0xE031
-0x7F53 = 0xE032
-0x7F54 = 0xE033
-0x7F55 = 0xE034
-0x7F56 = 0xE035
-0x7F57 = 0xE036
-0x7F58 = 0xE037
-0x7F59 = 0xE038
-0x7F5A = 0xE039
-0x7F5B = 0xE03A
-0x7F5C = 0xE03B
-0x7F5D = 0xE03C
-0x7F5E = 0xE03D
-0x7F5F = 0xE03E
-0x7F60 = 0xE03F
-0x7F61 = 0xE040
-0x7F62 = 0xE041
-0x7F63 = 0xE042
-0x7F64 = 0xE043
-0x7F65 = 0xE044
-0x7F66 = 0xE045
-0x7F67 = 0xE046
-0x7F68 = 0xE047
-0x7F69 = 0xE048
-0x7F6A = 0xE049
-0x7F6B = 0xE04A
-0x7F6C = 0xE04B
-0x7F6D = 0xE04C
-0x7F6E = 0xE04D
-0x7F6F = 0xE04E
-0x7F70 = 0xE04F
-0x7F71 = 0xE050
-0x7F72 = 0xE051
-0x7F73 = 0xE052
-0x7F74 = 0xE053
-0x7F75 = 0xE054
-0x7F76 = 0xE055
-0x7F77 = 0xE056
-0x7F78 = 0xE057
-0x7F79 = 0xE058
-0x7F7A = 0xE059
-0x7F7B = 0xE05A
-0x7F7C = 0xE05B
-0x7F7D = 0xE05C
-0x7F7E = 0xE05D
-0x8021 = 0xE05E
-0x8022 = 0xE05F
-0x8023 = 0xE060
-0x8024 = 0xE061
-0x8025 = 0xE062
-0x8026 = 0xE063
-0x8027 = 0xE064
-0x8028 = 0xE065
-0x8029 = 0xE066
-0x802A = 0xE067
-0x802B = 0xE068
-0x802C = 0xE069
-0x802D = 0xE06A
-0x802E = 0xE06B
-0x802F = 0xE06C
-0x8030 = 0xE06D
-0x8031 = 0xE06E
-0x8032 = 0xE06F
-0x8033 = 0xE070
-0x8034 = 0xE071
-0x8035 = 0xE072
-0x8036 = 0xE073
-0x8037 = 0xE074
-0x8038 = 0xE075
-0x8039 = 0xE076
-0x803A = 0xE077
-0x803B = 0xE078
-0x803C = 0xE079
-0x803D = 0xE07A
-0x803E = 0xE07B
-0x803F = 0xE07C
-0x8040 = 0xE07D
-0x8041 = 0xE07E
-0x8042 = 0xE07F
-0x8043 = 0xE080
-0x8044 = 0xE081
-0x8045 = 0xE082
-0x8046 = 0xE083
-0x8047 = 0xE084
-0x8048 = 0xE085
-0x8049 = 0xE086
-0x804A = 0xE087
-0x804B = 0xE088
-0x804C = 0xE089
-0x804D = 0xE08A
-0x804E = 0xE08B
-0x804F = 0xE08C
-0x8050 = 0xE08D
-0x8051 = 0xE08E
-0x8052 = 0xE08F
-0x8053 = 0xE090
-0x8054 = 0xE091
-0x8055 = 0xE092
-0x8056 = 0xE093
-0x8057 = 0xE094
-0x8058 = 0xE095
-0x8059 = 0xE096
-0x805A = 0xE097
-0x805B = 0xE098
-0x805C = 0xE099
-0x805D = 0xE09A
-0x805E = 0xE09B
-0x805F = 0xE09C
-0x8060 = 0xE09D
-0x8061 = 0xE09E
-0x8062 = 0xE09F
-0x8063 = 0xE0A0
-0x8064 = 0xE0A1
-0x8065 = 0xE0A2
-0x8066 = 0xE0A3
-0x8067 = 0xE0A4
-0x8068 = 0xE0A5
-0x8069 = 0xE0A6
-0x806A = 0xE0A7
-0x806B = 0xE0A8
-0x806C = 0xE0A9
-0x806D = 0xE0AA
-0x806E = 0xE0AB
-0x806F = 0xE0AC
-0x8070 = 0xE0AD
-0x8071 = 0xE0AE
-0x8072 = 0xE0AF
-0x8073 = 0xE0B0
-0x8074 = 0xE0B1
-0x8075 = 0xE0B2
-0x8076 = 0xE0B3
-0x8077 = 0xE0B4
-0x8078 = 0xE0B5
-0x8079 = 0xE0B6
-0x807A = 0xE0B7
-0x807B = 0xE0B8
-0x807C = 0xE0B9
-0x807D = 0xE0BA
-0x807E = 0xE0BB
-0x8121 = 0xE0BC
-0x8122 = 0xE0BD
-0x8123 = 0xE0BE
-0x8124 = 0xE0BF
-0x8125 = 0xE0C0
-0x8126 = 0xE0C1
-0x8127 = 0xE0C2
-0x8128 = 0xE0C3
-0x8129 = 0xE0C4
-0x812A = 0xE0C5
-0x812B = 0xE0C6
-0x812C = 0xE0C7
-0x812D = 0xE0C8
-0x812E = 0xE0C9
-0x812F = 0xE0CA
-0x8130 = 0xE0CB
-0x8131 = 0xE0CC
-0x8132 = 0xE0CD
-0x8133 = 0xE0CE
-0x8134 = 0xE0CF
-0x8135 = 0xE0D0
-0x8136 = 0xE0D1
-0x8137 = 0xE0D2
-0x8138 = 0xE0D3
-0x8139 = 0xE0D4
-0x813A = 0xE0D5
-0x813B = 0xE0D6
-0x813C = 0xE0D7
-0x813D = 0xE0D8
-0x813E = 0xE0D9
-0x813F = 0xE0DA
-0x8140 = 0xE0DB
-0x8141 = 0xE0DC
-0x8142 = 0xE0DD
-0x8143 = 0xE0DE
-0x8144 = 0xE0DF
-0x8145 = 0xE0E0
-0x8146 = 0xE0E1
-0x8147 = 0xE0E2
-0x8148 = 0xE0E3
-0x8149 = 0xE0E4
-0x814A = 0xE0E5
-0x814B = 0xE0E6
-0x814C = 0xE0E7
-0x814D = 0xE0E8
-0x814E = 0xE0E9
-0x814F = 0xE0EA
-0x8150 = 0xE0EB
-0x8151 = 0xE0EC
-0x8152 = 0xE0ED
-0x8153 = 0xE0EE
-0x8154 = 0xE0EF
-0x8155 = 0xE0F0
-0x8156 = 0xE0F1
-0x8157 = 0xE0F2
-0x8158 = 0xE0F3
-0x8159 = 0xE0F4
-0x815A = 0xE0F5
-0x815B = 0xE0F6
-0x815C = 0xE0F7
-0x815D = 0xE0F8
-0x815E = 0xE0F9
-0x815F = 0xE0FA
-0x8160 = 0xE0FB
-0x8161 = 0xE0FC
-0x8162 = 0xE0FD
-0x8163 = 0xE0FE
-0x8164 = 0xE0FF
-0x8165 = 0xE100
-0x8166 = 0xE101
-0x8167 = 0xE102
-0x8168 = 0xE103
-0x8169 = 0xE104
-0x816A = 0xE105
-0x816B = 0xE106
-0x816C = 0xE107
-0x816D = 0xE108
-0x816E = 0xE109
-0x816F = 0xE10A
-0x8170 = 0xE10B
-0x8171 = 0xE10C
-0x8172 = 0xE10D
-0x8173 = 0xE10E
-0x8174 = 0xE10F
-0x8175 = 0xE110
-0x8176 = 0xE111
-0x8177 = 0xE112
-0x8178 = 0xE113
-0x8179 = 0xE114
-0x817A = 0xE115
-0x817B = 0xE116
-0x817C = 0xE117
-0x817D = 0xE118
-0x817E = 0xE119
-0x8221 = 0xE11A
-0x8222 = 0xE11B
-0x8223 = 0xE11C
-0x8224 = 0xE11D
-0x8225 = 0xE11E
-0x8226 = 0xE11F
-0x8227 = 0xE120
-0x8228 = 0xE121
-0x8229 = 0xE122
-0x822A = 0xE123
-0x822B = 0xE124
-0x822C = 0xE125
-0x822D = 0xE126
-0x822E = 0xE127
-0x822F = 0xE128
-0x8230 = 0xE129
-0x8231 = 0xE12A
-0x8232 = 0xE12B
-0x8233 = 0xE12C
-0x8234 = 0xE12D
-0x8235 = 0xE12E
-0x8236 = 0xE12F
-0x8237 = 0xE130
-0x8238 = 0xE131
-0x8239 = 0xE132
-0x823A = 0xE133
-0x823B = 0xE134
-0x823C = 0xE135
-0x823D = 0xE136
-0x823E = 0xE137
-0x823F = 0xE138
-0x8240 = 0xE139
-0x8241 = 0xE13A
-0x8242 = 0xE13B
-0x8243 = 0xE13C
-0x8244 = 0xE13D
-0x8245 = 0xE13E
-0x8246 = 0xE13F
-0x8247 = 0xE140
-0x8248 = 0xE141
-0x8249 = 0xE142
-0x824A = 0xE143
-0x824B = 0xE144
-0x824C = 0xE145
-0x824D = 0xE146
-0x824E = 0xE147
-0x824F = 0xE148
-0x8250 = 0xE149
-0x8251 = 0xE14A
-0x8252 = 0xE14B
-0x8253 = 0xE14C
-0x8254 = 0xE14D
-0x8255 = 0xE14E
-0x8256 = 0xE14F
-0x8257 = 0xE150
-0x8258 = 0xE151
-0x8259 = 0xE152
-0x825A = 0xE153
-0x825B = 0xE154
-0x825C = 0xE155
-0x825D = 0xE156
-0x825E = 0xE157
-0x825F = 0xE158
-0x8260 = 0xE159
-0x8261 = 0xE15A
-0x8262 = 0xE15B
-0x8263 = 0xE15C
-0x8264 = 0xE15D
-0x8265 = 0xE15E
-0x8266 = 0xE15F
-0x8267 = 0xE160
-0x8268 = 0xE161
-0x8269 = 0xE162
-0x826A = 0xE163
-0x826B = 0xE164
-0x826C = 0xE165
-0x826D = 0xE166
-0x826E = 0xE167
-0x826F = 0xE168
-0x8270 = 0xE169
-0x8271 = 0xE16A
-0x8272 = 0xE16B
-0x8273 = 0xE16C
-0x8274 = 0xE16D
-0x8275 = 0xE16E
-0x8276 = 0xE16F
-0x8277 = 0xE170
-0x8278 = 0xE171
-0x8279 = 0xE172
-0x827A = 0xE173
-0x827B = 0xE174
-0x827C = 0xE175
-0x827D = 0xE176
-0x827E = 0xE177
-0x8321 = 0xE178
-0x8322 = 0xE179
-0x8323 = 0xE17A
-0x8324 = 0xE17B
-0x8325 = 0xE17C
-0x8326 = 0xE17D
-0x8327 = 0xE17E
-0x8328 = 0xE17F
-0x8329 = 0xE180
-0x832A = 0xE181
-0x832B = 0xE182
-0x832C = 0xE183
-0x832D = 0xE184
-0x832E = 0xE185
-0x832F = 0xE186
-0x8330 = 0xE187
-0x8331 = 0xE188
-0x8332 = 0xE189
-0x8333 = 0xE18A
-0x8334 = 0xE18B
-0x8335 = 0xE18C
-0x8336 = 0xE18D
-0x8337 = 0xE18E
-0x8338 = 0xE18F
-0x8339 = 0xE190
-0x833A = 0xE191
-0x833B = 0xE192
-0x833C = 0xE193
-0x833D = 0xE194
-0x833E = 0xE195
-0x833F = 0xE196
-0x8340 = 0xE197
-0x8341 = 0xE198
-0x8342 = 0xE199
-0x8343 = 0xE19A
-0x8344 = 0xE19B
-0x8345 = 0xE19C
-0x8346 = 0xE19D
-0x8347 = 0xE19E
-0x8348 = 0xE19F
-0x8349 = 0xE1A0
-0x834A = 0xE1A1
-0x834B = 0xE1A2
-0x834C = 0xE1A3
-0x834D = 0xE1A4
-0x834E = 0xE1A5
-0x834F = 0xE1A6
-0x8350 = 0xE1A7
-0x8351 = 0xE1A8
-0x8352 = 0xE1A9
-0x8353 = 0xE1AA
-0x8354 = 0xE1AB
-0x8355 = 0xE1AC
-0x8356 = 0xE1AD
-0x8357 = 0xE1AE
-0x8358 = 0xE1AF
-0x8359 = 0xE1B0
-0x835A = 0xE1B1
-0x835B = 0xE1B2
-0x835C = 0xE1B3
-0x835D = 0xE1B4
-0x835E = 0xE1B5
-0x835F = 0xE1B6
-0x8360 = 0xE1B7
-0x8361 = 0xE1B8
-0x8362 = 0xE1B9
-0x8363 = 0xE1BA
-0x8364 = 0xE1BB
-0x8365 = 0xE1BC
-0x8366 = 0xE1BD
-0x8367 = 0xE1BE
-0x8368 = 0xE1BF
-0x8369 = 0xE1C0
-0x836A = 0xE1C1
-0x836B = 0xE1C2
-0x836C = 0xE1C3
-0x836D = 0xE1C4
-0x836E = 0xE1C5
-0x836F = 0xE1C6
-0x8370 = 0xE1C7
-0x8371 = 0xE1C8
-0x8372 = 0xE1C9
-0x8373 = 0xE1CA
-0x8374 = 0xE1CB
-0x8375 = 0xE1CC
-0x8376 = 0xE1CD
-0x8377 = 0xE1CE
-0x8378 = 0xE1CF
-0x8379 = 0xE1D0
-0x837A = 0xE1D1
-0x837B = 0xE1D2
-0x837C = 0xE1D3
-0x837D = 0xE1D4
-0x837E = 0xE1D5
-0x8421 = 0xE1D6
-0x8422 = 0xE1D7
-0x8423 = 0xE1D8
-0x8424 = 0xE1D9
-0x8425 = 0xE1DA
-0x8426 = 0xE1DB
-0x8427 = 0xE1DC
-0x8428 = 0xE1DD
-0x8429 = 0xE1DE
-0x842A = 0xE1DF
-0x842B = 0xE1E0
-0x842C = 0xE1E1
-0x842D = 0xE1E2
-0x842E = 0xE1E3
-0x842F = 0xE1E4
-0x8430 = 0xE1E5
-0x8431 = 0xE1E6
-0x8432 = 0xE1E7
-0x8433 = 0xE1E8
-0x8434 = 0xE1E9
-0x8435 = 0xE1EA
-0x8436 = 0xE1EB
-0x8437 = 0xE1EC
-0x8438 = 0xE1ED
-0x8439 = 0xE1EE
-0x843A = 0xE1EF
-0x843B = 0xE1F0
-0x843C = 0xE1F1
-0x843D = 0xE1F2
-0x843E = 0xE1F3
-0x843F = 0xE1F4
-0x8440 = 0xE1F5
-0x8441 = 0xE1F6
-0x8442 = 0xE1F7
-0x8443 = 0xE1F8
-0x8444 = 0xE1F9
-0x8445 = 0xE1FA
-0x8446 = 0xE1FB
-0x8447 = 0xE1FC
-0x8448 = 0xE1FD
-0x8449 = 0xE1FE
-0x844A = 0xE1FF
-0x844B = 0xE200
-0x844C = 0xE201
-0x844D = 0xE202
-0x844E = 0xE203
-0x844F = 0xE204
-0x8450 = 0xE205
-0x8451 = 0xE206
-0x8452 = 0xE207
-0x8453 = 0xE208
-0x8454 = 0xE209
-0x8455 = 0xE20A
-0x8456 = 0xE20B
-0x8457 = 0xE20C
-0x8458 = 0xE20D
-0x8459 = 0xE20E
-0x845A = 0xE20F
-0x845B = 0xE210
-0x845C = 0xE211
-0x845D = 0xE212
-0x845E = 0xE213
-0x845F = 0xE214
-0x8460 = 0xE215
-0x8461 = 0xE216
-0x8462 = 0xE217
-0x8463 = 0xE218
-0x8464 = 0xE219
-0x8465 = 0xE21A
-0x8466 = 0xE21B
-0x8467 = 0xE21C
-0x8468 = 0xE21D
-0x8469 = 0xE21E
-0x846A = 0xE21F
-0x846B = 0xE220
-0x846C = 0xE221
-0x846D = 0xE222
-0x846E = 0xE223
-0x846F = 0xE224
-0x8470 = 0xE225
-0x8471 = 0xE226
-0x8472 = 0xE227
-0x8473 = 0xE228
-0x8474 = 0xE229
-0x8475 = 0xE22A
-0x8476 = 0xE22B
-0x8477 = 0xE22C
-0x8478 = 0xE22D
-0x8479 = 0xE22E
-0x847A = 0xE22F
-0x847B = 0xE230
-0x847C = 0xE231
-0x847D = 0xE232
-0x847E = 0xE233
-0x8521 = 0xE234
-0x8522 = 0xE235
-0x8523 = 0xE236
-0x8524 = 0xE237
-0x8525 = 0xE238
-0x8526 = 0xE239
-0x8527 = 0xE23A
-0x8528 = 0xE23B
-0x8529 = 0xE23C
-0x852A = 0xE23D
-0x852B = 0xE23E
-0x852C = 0xE23F
-0x852D = 0xE240
-0x852E = 0xE241
-0x852F = 0xE242
-0x8530 = 0xE243
-0x8531 = 0xE244
-0x8532 = 0xE245
-0x8533 = 0xE246
-0x8534 = 0xE247
-0x8535 = 0xE248
-0x8536 = 0xE249
-0x8537 = 0xE24A
-0x8538 = 0xE24B
-0x8539 = 0xE24C
-0x853A = 0xE24D
-0x853B = 0xE24E
-0x853C = 0xE24F
-0x853D = 0xE250
-0x853E = 0xE251
-0x853F = 0xE252
-0x8540 = 0xE253
-0x8541 = 0xE254
-0x8542 = 0xE255
-0x8543 = 0xE256
-0x8544 = 0xE257
-0x8545 = 0xE258
-0x8546 = 0xE259
-0x8547 = 0xE25A
-0x8548 = 0xE25B
-0x8549 = 0xE25C
-0x854A = 0xE25D
-0x854B = 0xE25E
-0x854C = 0xE25F
-0x854D = 0xE260
-0x854E = 0xE261
-0x854F = 0xE262
-0x8550 = 0xE263
-0x8551 = 0xE264
-0x8552 = 0xE265
-0x8553 = 0xE266
-0x8554 = 0xE267
-0x8555 = 0xE268
-0x8556 = 0xE269
-0x8557 = 0xE26A
-0x8558 = 0xE26B
-0x8559 = 0xE26C
-0x855A = 0xE26D
-0x855B = 0xE26E
-0x855C = 0xE26F
-0x855D = 0xE270
-0x855E = 0xE271
-0x855F = 0xE272
-0x8560 = 0xE273
-0x8561 = 0xE274
-0x8562 = 0xE275
-0x8563 = 0xE276
-0x8564 = 0xE277
-0x8565 = 0xE278
-0x8566 = 0xE279
-0x8567 = 0xE27A
-0x8568 = 0xE27B
-0x8569 = 0xE27C
-0x856A = 0xE27D
-0x856B = 0xE27E
-0x856C = 0xE27F
-0x856D = 0xE280
-0x856E = 0xE281
-0x856F = 0xE282
-0x8570 = 0xE283
-0x8571 = 0xE284
-0x8572 = 0xE285
-0x8573 = 0xE286
-0x8574 = 0xE287
-0x8575 = 0xE288
-0x8576 = 0xE289
-0x8577 = 0xE28A
-0x8578 = 0xE28B
-0x8579 = 0xE28C
-0x857A = 0xE28D
-0x857B = 0xE28E
-0x857C = 0xE28F
-0x857D = 0xE290
-0x857E = 0xE291
-0x8621 = 0xE292
-0x8622 = 0xE293
-0x8623 = 0xE294
-0x8624 = 0xE295
-0x8625 = 0xE296
-0x8626 = 0xE297
-0x8627 = 0xE298
-0x8628 = 0xE299
-0x8629 = 0xE29A
-0x862A = 0xE29B
-0x862B = 0xE29C
-0x862C = 0xE29D
-0x862D = 0xE29E
-0x862E = 0xE29F
-0x862F = 0xE2A0
-0x8630 = 0xE2A1
-0x8631 = 0xE2A2
-0x8632 = 0xE2A3
-0x8633 = 0xE2A4
-0x8634 = 0xE2A5
-0x8635 = 0xE2A6
-0x8636 = 0xE2A7
-0x8637 = 0xE2A8
-0x8638 = 0xE2A9
-0x8639 = 0xE2AA
-0x863A = 0xE2AB
-0x863B = 0xE2AC
-0x863C = 0xE2AD
-0x863D = 0xE2AE
-0x863E = 0xE2AF
-0x863F = 0xE2B0
-0x8640 = 0xE2B1
-0x8641 = 0xE2B2
-0x8642 = 0xE2B3
-0x8643 = 0xE2B4
-0x8644 = 0xE2B5
-0x8645 = 0xE2B6
-0x8646 = 0xE2B7
-0x8647 = 0xE2B8
-0x8648 = 0xE2B9
-0x8649 = 0xE2BA
-0x864A = 0xE2BB
-0x864B = 0xE2BC
-0x864C = 0xE2BD
-0x864D = 0xE2BE
-0x864E = 0xE2BF
-0x864F = 0xE2C0
-0x8650 = 0xE2C1
-0x8651 = 0xE2C2
-0x8652 = 0xE2C3
-0x8653 = 0xE2C4
-0x8654 = 0xE2C5
-0x8655 = 0xE2C6
-0x8656 = 0xE2C7
-0x8657 = 0xE2C8
-0x8658 = 0xE2C9
-0x8659 = 0xE2CA
-0x865A = 0xE2CB
-0x865B = 0xE2CC
-0x865C = 0xE2CD
-0x865D = 0xE2CE
-0x865E = 0xE2CF
-0x865F = 0xE2D0
-0x8660 = 0xE2D1
-0x8661 = 0xE2D2
-0x8662 = 0xE2D3
-0x8663 = 0xE2D4
-0x8664 = 0xE2D5
-0x8665 = 0xE2D6
-0x8666 = 0xE2D7
-0x8667 = 0xE2D8
-0x8668 = 0xE2D9
-0x8669 = 0xE2DA
-0x866A = 0xE2DB
-0x866B = 0xE2DC
-0x866C = 0xE2DD
-0x866D = 0xE2DE
-0x866E = 0xE2DF
-0x866F = 0xE2E0
-0x8670 = 0xE2E1
-0x8671 = 0xE2E2
-0x8672 = 0xE2E3
-0x8673 = 0xE2E4
-0x8674 = 0xE2E5
-0x8675 = 0xE2E6
-0x8676 = 0xE2E7
-0x8677 = 0xE2E8
-0x8678 = 0xE2E9
-0x8679 = 0xE2EA
-0x867A = 0xE2EB
-0x867B = 0xE2EC
-0x867C = 0xE2ED
-0x867D = 0xE2EE
-0x867E = 0xE2EF
-0x8721 = 0xE2F0
-0x8722 = 0xE2F1
-0x8723 = 0xE2F2
-0x8724 = 0xE2F3
-0x8725 = 0xE2F4
-0x8726 = 0xE2F5
-0x8727 = 0xE2F6
-0x8728 = 0xE2F7
-0x8729 = 0xE2F8
-0x872A = 0xE2F9
-0x872B = 0xE2FA
-0x872C = 0xE2FB
-0x872D = 0xE2FC
-0x872E = 0xE2FD
-0x872F = 0xE2FE
-0x8730 = 0xE2FF
-0x8731 = 0xE300
-0x8732 = 0xE301
-0x8733 = 0xE302
-0x8734 = 0xE303
-0x8735 = 0xE304
-0x8736 = 0xE305
-0x8737 = 0xE306
-0x8738 = 0xE307
-0x8739 = 0xE308
-0x873A = 0xE309
-0x873B = 0xE30A
-0x873C = 0xE30B
-0x873D = 0xE30C
-0x873E = 0xE30D
-0x873F = 0xE30E
-0x8740 = 0xE30F
-0x8741 = 0xE310
-0x8742 = 0xE311
-0x8743 = 0xE312
-0x8744 = 0xE313
-0x8745 = 0xE314
-0x8746 = 0xE315
-0x8747 = 0xE316
-0x8748 = 0xE317
-0x8749 = 0xE318
-0x874A = 0xE319
-0x874B = 0xE31A
-0x874C = 0xE31B
-0x874D = 0xE31C
-0x874E = 0xE31D
-0x874F = 0xE31E
-0x8750 = 0xE31F
-0x8751 = 0xE320
-0x8752 = 0xE321
-0x8753 = 0xE322
-0x8754 = 0xE323
-0x8755 = 0xE324
-0x8756 = 0xE325
-0x8757 = 0xE326
-0x8758 = 0xE327
-0x8759 = 0xE328
-0x875A = 0xE329
-0x875B = 0xE32A
-0x875C = 0xE32B
-0x875D = 0xE32C
-0x875E = 0xE32D
-0x875F = 0xE32E
-0x8760 = 0xE32F
-0x8761 = 0xE330
-0x8762 = 0xE331
-0x8763 = 0xE332
-0x8764 = 0xE333
-0x8765 = 0xE334
-0x8766 = 0xE335
-0x8767 = 0xE336
-0x8768 = 0xE337
-0x8769 = 0xE338
-0x876A = 0xE339
-0x876B = 0xE33A
-0x876C = 0xE33B
-0x876D = 0xE33C
-0x876E = 0xE33D
-0x876F = 0xE33E
-0x8770 = 0xE33F
-0x8771 = 0xE340
-0x8772 = 0xE341
-0x8773 = 0xE342
-0x8774 = 0xE343
-0x8775 = 0xE344
-0x8776 = 0xE345
-0x8777 = 0xE346
-0x8778 = 0xE347
-0x8779 = 0xE348
-0x877A = 0xE349
-0x877B = 0xE34A
-0x877C = 0xE34B
-0x877D = 0xE34C
-0x877E = 0xE34D
-0x8821 = 0xE34E
-0x8822 = 0xE34F
-0x8823 = 0xE350
-0x8824 = 0xE351
-0x8825 = 0xE352
-0x8826 = 0xE353
-0x8827 = 0xE354
-0x8828 = 0xE355
-0x8829 = 0xE356
-0x882A = 0xE357
-0x882B = 0xE358
-0x882C = 0xE359
-0x882D = 0xE35A
-0x882E = 0xE35B
-0x882F = 0xE35C
-0x8830 = 0xE35D
-0x8831 = 0xE35E
-0x8832 = 0xE35F
-0x8833 = 0xE360
-0x8834 = 0xE361
-0x8835 = 0xE362
-0x8836 = 0xE363
-0x8837 = 0xE364
-0x8838 = 0xE365
-0x8839 = 0xE366
-0x883A = 0xE367
-0x883B = 0xE368
-0x883C = 0xE369
-0x883D = 0xE36A
-0x883E = 0xE36B
-0x883F = 0xE36C
-0x8840 = 0xE36D
-0x8841 = 0xE36E
-0x8842 = 0xE36F
-0x8843 = 0xE370
-0x8844 = 0xE371
-0x8845 = 0xE372
-0x8846 = 0xE373
-0x8847 = 0xE374
-0x8848 = 0xE375
-0x8849 = 0xE376
-0x884A = 0xE377
-0x884B = 0xE378
-0x884C = 0xE379
-0x884D = 0xE37A
-0x884E = 0xE37B
-0x884F = 0xE37C
-0x8850 = 0xE37D
-0x8851 = 0xE37E
-0x8852 = 0xE37F
-0x8853 = 0xE380
-0x8854 = 0xE381
-0x8855 = 0xE382
-0x8856 = 0xE383
-0x8857 = 0xE384
-0x8858 = 0xE385
-0x8859 = 0xE386
-0x885A = 0xE387
-0x885B = 0xE388
-0x885C = 0xE389
-0x885D = 0xE38A
-0x885E = 0xE38B
-0x885F = 0xE38C
-0x8860 = 0xE38D
-0x8861 = 0xE38E
-0x8862 = 0xE38F
-0x8863 = 0xE390
-0x8864 = 0xE391
-0x8865 = 0xE392
-0x8866 = 0xE393
-0x8867 = 0xE394
-0x8868 = 0xE395
-0x8869 = 0xE396
-0x886A = 0xE397
-0x886B = 0xE398
-0x886C = 0xE399
-0x886D = 0xE39A
-0x886E = 0xE39B
-0x886F = 0xE39C
-0x8870 = 0xE39D
-0x8871 = 0xE39E
-0x8872 = 0xE39F
-0x8873 = 0xE3A0
-0x8874 = 0xE3A1
-0x8875 = 0xE3A2
-0x8876 = 0xE3A3
-0x8877 = 0xE3A4
-0x8878 = 0xE3A5
-0x8879 = 0xE3A6
-0x887A = 0xE3A7
-0x887B = 0xE3A8
-0x887C = 0xE3A9
-0x887D = 0xE3AA
-0x887E = 0xE3AB
-0x8921 = 0xE3AC
-0x8922 = 0xE3AD
-0x8923 = 0xE3AE
-0x8924 = 0xE3AF
-0x8925 = 0xE3B0
-0x8926 = 0xE3B1
-0x8927 = 0xE3B2
-0x8928 = 0xE3B3
-0x8929 = 0xE3B4
-0x892A = 0xE3B5
-0x892B = 0xE3B6
-0x892C = 0xE3B7
-0x892D = 0xE3B8
-0x892E = 0xE3B9
-0x892F = 0xE3BA
-0x8930 = 0xE3BB
-0x8931 = 0xE3BC
-0x8932 = 0xE3BD
-0x8933 = 0xE3BE
-0x8934 = 0xE3BF
-0x8935 = 0xE3C0
-0x8936 = 0xE3C1
-0x8937 = 0xE3C2
-0x8938 = 0xE3C3
-0x8939 = 0xE3C4
-0x893A = 0xE3C5
-0x893B = 0xE3C6
-0x893C = 0xE3C7
-0x893D = 0xE3C8
-0x893E = 0xE3C9
-0x893F = 0xE3CA
-0x8940 = 0xE3CB
-0x8941 = 0xE3CC
-0x8942 = 0xE3CD
-0x8943 = 0xE3CE
-0x8944 = 0xE3CF
-0x8945 = 0xE3D0
-0x8946 = 0xE3D1
-0x8947 = 0xE3D2
-0x8948 = 0xE3D3
-0x8949 = 0xE3D4
-0x894A = 0xE3D5
-0x894B = 0xE3D6
-0x894C = 0xE3D7
-0x894D = 0xE3D8
-0x894E = 0xE3D9
-0x894F = 0xE3DA
-0x8950 = 0xE3DB
-0x8951 = 0xE3DC
-0x8952 = 0xE3DD
-0x8953 = 0xE3DE
-0x8954 = 0xE3DF
-0x8955 = 0xE3E0
-0x8956 = 0xE3E1
-0x8957 = 0xE3E2
-0x8958 = 0xE3E3
-0x8959 = 0xE3E4
-0x895A = 0xE3E5
-0x895B = 0xE3E6
-0x895C = 0xE3E7
-0x895D = 0xE3E8
-0x895E = 0xE3E9
-0x895F = 0xE3EA
-0x8960 = 0xE3EB
-0x8961 = 0xE3EC
-0x8962 = 0xE3ED
-0x8963 = 0xE3EE
-0x8964 = 0xE3EF
-0x8965 = 0xE3F0
-0x8966 = 0xE3F1
-0x8967 = 0xE3F2
-0x8968 = 0xE3F3
-0x8969 = 0xE3F4
-0x896A = 0xE3F5
-0x896B = 0xE3F6
-0x896C = 0xE3F7
-0x896D = 0xE3F8
-0x896E = 0xE3F9
-0x896F = 0xE3FA
-0x8970 = 0xE3FB
-0x8971 = 0xE3FC
-0x8972 = 0xE3FD
-0x8973 = 0xE3FE
-0x8974 = 0xE3FF
-0x8975 = 0xE400
-0x8976 = 0xE401
-0x8977 = 0xE402
-0x8978 = 0xE403
-0x8979 = 0xE404
-0x897A = 0xE405
-0x897B = 0xE406
-0x897C = 0xE407
-0x897D = 0xE408
-0x897E = 0xE409
-0x8A21 = 0xE40A
-0x8A22 = 0xE40B
-0x8A23 = 0xE40C
-0x8A24 = 0xE40D
-0x8A25 = 0xE40E
-0x8A26 = 0xE40F
-0x8A27 = 0xE410
-0x8A28 = 0xE411
-0x8A29 = 0xE412
-0x8A2A = 0xE413
-0x8A2B = 0xE414
-0x8A2C = 0xE415
-0x8A2D = 0xE416
-0x8A2E = 0xE417
-0x8A2F = 0xE418
-0x8A30 = 0xE419
-0x8A31 = 0xE41A
-0x8A32 = 0xE41B
-0x8A33 = 0xE41C
-0x8A34 = 0xE41D
-0x8A35 = 0xE41E
-0x8A36 = 0xE41F
-0x8A37 = 0xE420
-0x8A38 = 0xE421
-0x8A39 = 0xE422
-0x8A3A = 0xE423
-0x8A3B = 0xE424
-0x8A3C = 0xE425
-0x8A3D = 0xE426
-0x8A3E = 0xE427
-0x8A3F = 0xE428
-0x8A40 = 0xE429
-0x8A41 = 0xE42A
-0x8A42 = 0xE42B
-0x8A43 = 0xE42C
-0x8A44 = 0xE42D
-0x8A45 = 0xE42E
-0x8A46 = 0xE42F
-0x8A47 = 0xE430
-0x8A48 = 0xE431
-0x8A49 = 0xE432
-0x8A4A = 0xE433
-0x8A4B = 0xE434
-0x8A4C = 0xE435
-0x8A4D = 0xE436
-0x8A4E = 0xE437
-0x8A4F = 0xE438
-0x8A50 = 0xE439
-0x8A51 = 0xE43A
-0x8A52 = 0xE43B
-0x8A53 = 0xE43C
-0x8A54 = 0xE43D
-0x8A55 = 0xE43E
-0x8A56 = 0xE43F
-0x8A57 = 0xE440
-0x8A58 = 0xE441
-0x8A59 = 0xE442
-0x8A5A = 0xE443
-0x8A5B = 0xE444
-0x8A5C = 0xE445
-0x8A5D = 0xE446
-0x8A5E = 0xE447
-0x8A5F = 0xE448
-0x8A60 = 0xE449
-0x8A61 = 0xE44A
-0x8A62 = 0xE44B
-0x8A63 = 0xE44C
-0x8A64 = 0xE44D
-0x8A65 = 0xE44E
-0x8A66 = 0xE44F
-0x8A67 = 0xE450
-0x8A68 = 0xE451
-0x8A69 = 0xE452
-0x8A6A = 0xE453
-0x8A6B = 0xE454
-0x8A6C = 0xE455
-0x8A6D = 0xE456
-0x8A6E = 0xE457
-0x8A6F = 0xE458
-0x8A70 = 0xE459
-0x8A71 = 0xE45A
-0x8A72 = 0xE45B
-0x8A73 = 0xE45C
-0x8A74 = 0xE45D
-0x8A75 = 0xE45E
-0x8A76 = 0xE45F
-0x8A77 = 0xE460
-0x8A78 = 0xE461
-0x8A79 = 0xE462
-0x8A7A = 0xE463
-0x8A7B = 0xE464
-0x8A7C = 0xE465
-0x8A7D = 0xE466
-0x8A7E = 0xE467
-0x8B21 = 0xE468
-0x8B22 = 0xE469
-0x8B23 = 0xE46A
-0x8B24 = 0xE46B
-0x8B25 = 0xE46C
-0x8B26 = 0xE46D
-0x8B27 = 0xE46E
-0x8B28 = 0xE46F
-0x8B29 = 0xE470
-0x8B2A = 0xE471
-0x8B2B = 0xE472
-0x8B2C = 0xE473
-0x8B2D = 0xE474
-0x8B2E = 0xE475
-0x8B2F = 0xE476
-0x8B30 = 0xE477
-0x8B31 = 0xE478
-0x8B32 = 0xE479
-0x8B33 = 0xE47A
-0x8B34 = 0xE47B
-0x8B35 = 0xE47C
-0x8B36 = 0xE47D
-0x8B37 = 0xE47E
-0x8B38 = 0xE47F
-0x8B39 = 0xE480
-0x8B3A = 0xE481
-0x8B3B = 0xE482
-0x8B3C = 0xE483
-0x8B3D = 0xE484
-0x8B3E = 0xE485
-0x8B3F = 0xE486
-0x8B40 = 0xE487
-0x8B41 = 0xE488
-0x8B42 = 0xE489
-0x8B43 = 0xE48A
-0x8B44 = 0xE48B
-0x8B45 = 0xE48C
-0x8B46 = 0xE48D
-0x8B47 = 0xE48E
-0x8B48 = 0xE48F
-0x8B49 = 0xE490
-0x8B4A = 0xE491
-0x8B4B = 0xE492
-0x8B4C = 0xE493
-0x8B4D = 0xE494
-0x8B4E = 0xE495
-0x8B4F = 0xE496
-0x8B50 = 0xE497
-0x8B51 = 0xE498
-0x8B52 = 0xE499
-0x8B53 = 0xE49A
-0x8B54 = 0xE49B
-0x8B55 = 0xE49C
-0x8B56 = 0xE49D
-0x8B57 = 0xE49E
-0x8B58 = 0xE49F
-0x8B59 = 0xE4A0
-0x8B5A = 0xE4A1
-0x8B5B = 0xE4A2
-0x8B5C = 0xE4A3
-0x8B5D = 0xE4A4
-0x8B5E = 0xE4A5
-0x8B5F = 0xE4A6
-0x8B60 = 0xE4A7
-0x8B61 = 0xE4A8
-0x8B62 = 0xE4A9
-0x8B63 = 0xE4AA
-0x8B64 = 0xE4AB
-0x8B65 = 0xE4AC
-0x8B66 = 0xE4AD
-0x8B67 = 0xE4AE
-0x8B68 = 0xE4AF
-0x8B69 = 0xE4B0
-0x8B6A = 0xE4B1
-0x8B6B = 0xE4B2
-0x8B6C = 0xE4B3
-0x8B6D = 0xE4B4
-0x8B6E = 0xE4B5
-0x8B6F = 0xE4B6
-0x8B70 = 0xE4B7
-0x8B71 = 0xE4B8
-0x8B72 = 0xE4B9
-0x8B73 = 0xE4BA
-0x8B74 = 0xE4BB
-0x8B75 = 0xE4BC
-0x8B76 = 0xE4BD
-0x8B77 = 0xE4BE
-0x8B78 = 0xE4BF
-0x8B79 = 0xE4C0
-0x8B7A = 0xE4C1
-0x8B7B = 0xE4C2
-0x8B7C = 0xE4C3
-0x8B7D = 0xE4C4
-0x8B7E = 0xE4C5
-0x8C21 = 0xE4C6
-0x8C22 = 0xE4C7
-0x8C23 = 0xE4C8
-0x8C24 = 0xE4C9
-0x8C25 = 0xE4CA
-0x8C26 = 0xE4CB
-0x8C27 = 0xE4CC
-0x8C28 = 0xE4CD
-0x8C29 = 0xE4CE
-0x8C2A = 0xE4CF
-0x8C2B = 0xE4D0
-0x8C2C = 0xE4D1
-0x8C2D = 0xE4D2
-0x8C2E = 0xE4D3
-0x8C2F = 0xE4D4
-0x8C30 = 0xE4D5
-0x8C31 = 0xE4D6
-0x8C32 = 0xE4D7
-0x8C33 = 0xE4D8
-0x8C34 = 0xE4D9
-0x8C35 = 0xE4DA
-0x8C36 = 0xE4DB
-0x8C37 = 0xE4DC
-0x8C38 = 0xE4DD
-0x8C39 = 0xE4DE
-0x8C3A = 0xE4DF
-0x8C3B = 0xE4E0
-0x8C3C = 0xE4E1
-0x8C3D = 0xE4E2
-0x8C3E = 0xE4E3
-0x8C3F = 0xE4E4
-0x8C40 = 0xE4E5
-0x8C41 = 0xE4E6
-0x8C42 = 0xE4E7
-0x8C43 = 0xE4E8
-0x8C44 = 0xE4E9
-0x8C45 = 0xE4EA
-0x8C46 = 0xE4EB
-0x8C47 = 0xE4EC
-0x8C48 = 0xE4ED
-0x8C49 = 0xE4EE
-0x8C4A = 0xE4EF
-0x8C4B = 0xE4F0
-0x8C4C = 0xE4F1
-0x8C4D = 0xE4F2
-0x8C4E = 0xE4F3
-0x8C4F = 0xE4F4
-0x8C50 = 0xE4F5
-0x8C51 = 0xE4F6
-0x8C52 = 0xE4F7
-0x8C53 = 0xE4F8
-0x8C54 = 0xE4F9
-0x8C55 = 0xE4FA
-0x8C56 = 0xE4FB
-0x8C57 = 0xE4FC
-0x8C58 = 0xE4FD
-0x8C59 = 0xE4FE
-0x8C5A = 0xE4FF
-0x8C5B = 0xE500
-0x8C5C = 0xE501
-0x8C5D = 0xE502
-0x8C5E = 0xE503
-0x8C5F = 0xE504
-0x8C60 = 0xE505
-0x8C61 = 0xE506
-0x8C62 = 0xE507
-0x8C63 = 0xE508
-0x8C64 = 0xE509
-0x8C65 = 0xE50A
-0x8C66 = 0xE50B
-0x8C67 = 0xE50C
-0x8C68 = 0xE50D
-0x8C69 = 0xE50E
-0x8C6A = 0xE50F
-0x8C6B = 0xE510
-0x8C6C = 0xE511
-0x8C6D = 0xE512
-0x8C6E = 0xE513
-0x8C6F = 0xE514
-0x8C70 = 0xE515
-0x8C71 = 0xE516
-0x8C72 = 0xE517
-0x8C73 = 0xE518
-0x8C74 = 0xE519
-0x8C75 = 0xE51A
-0x8C76 = 0xE51B
-0x8C77 = 0xE51C
-0x8C78 = 0xE51D
-0x8C79 = 0xE51E
-0x8C7A = 0xE51F
-0x8C7B = 0xE520
-0x8C7C = 0xE521
-0x8C7D = 0xE522
-0x8C7E = 0xE523
-0x8D21 = 0xE524
-0x8D22 = 0xE525
-0x8D23 = 0xE526
-0x8D24 = 0xE527
-0x8D25 = 0xE528
-0x8D26 = 0xE529
-0x8D27 = 0xE52A
-0x8D28 = 0xE52B
-0x8D29 = 0xE52C
-0x8D2A = 0xE52D
-0x8D2B = 0xE52E
-0x8D2C = 0xE52F
-0x8D2D = 0xE530
-0x8D2E = 0xE531
-0x8D2F = 0xE532
-0x8D30 = 0xE533
-0x8D31 = 0xE534
-0x8D32 = 0xE535
-0x8D33 = 0xE536
-0x8D34 = 0xE537
-0x8D35 = 0xE538
-0x8D36 = 0xE539
-0x8D37 = 0xE53A
-0x8D38 = 0xE53B
-0x8D39 = 0xE53C
-0x8D3A = 0xE53D
-0x8D3B = 0xE53E
-0x8D3C = 0xE53F
-0x8D3D = 0xE540
-0x8D3E = 0xE541
-0x8D3F = 0xE542
-0x8D40 = 0xE543
-0x8D41 = 0xE544
-0x8D42 = 0xE545
-0x8D43 = 0xE546
-0x8D44 = 0xE547
-0x8D45 = 0xE548
-0x8D46 = 0xE549
-0x8D47 = 0xE54A
-0x8D48 = 0xE54B
-0x8D49 = 0xE54C
-0x8D4A = 0xE54D
-0x8D4B = 0xE54E
-0x8D4C = 0xE54F
-0x8D4D = 0xE550
-0x8D4E = 0xE551
-0x8D4F = 0xE552
-0x8D50 = 0xE553
-0x8D51 = 0xE554
-0x8D52 = 0xE555
-0x8D53 = 0xE556
-0x8D54 = 0xE557
-0x8D55 = 0xE558
-0x8D56 = 0xE559
-0x8D57 = 0xE55A
-0x8D58 = 0xE55B
-0x8D59 = 0xE55C
-0x8D5A = 0xE55D
-0x8D5B = 0xE55E
-0x8D5C = 0xE55F
-0x8D5D = 0xE560
-0x8D5E = 0xE561
-0x8D5F = 0xE562
-0x8D60 = 0xE563
-0x8D61 = 0xE564
-0x8D62 = 0xE565
-0x8D63 = 0xE566
-0x8D64 = 0xE567
-0x8D65 = 0xE568
-0x8D66 = 0xE569
-0x8D67 = 0xE56A
-0x8D68 = 0xE56B
-0x8D69 = 0xE56C
-0x8D6A = 0xE56D
-0x8D6B = 0xE56E
-0x8D6C = 0xE56F
-0x8D6D = 0xE570
-0x8D6E = 0xE571
-0x8D6F = 0xE572
-0x8D70 = 0xE573
-0x8D71 = 0xE574
-0x8D72 = 0xE575
-0x8D73 = 0xE576
-0x8D74 = 0xE577
-0x8D75 = 0xE578
-0x8D76 = 0xE579
-0x8D77 = 0xE57A
-0x8D78 = 0xE57B
-0x8D79 = 0xE57C
-0x8D7A = 0xE57D
-0x8D7B = 0xE57E
-0x8D7C = 0xE57F
-0x8D7D = 0xE580
-0x8D7E = 0xE581
-0x8E21 = 0xE582
-0x8E22 = 0xE583
-0x8E23 = 0xE584
-0x8E24 = 0xE585
-0x8E25 = 0xE586
-0x8E26 = 0xE587
-0x8E27 = 0xE588
-0x8E28 = 0xE589
-0x8E29 = 0xE58A
-0x8E2A = 0xE58B
-0x8E2B = 0xE58C
-0x8E2C = 0xE58D
-0x8E2D = 0xE58E
-0x8E2E = 0xE58F
-0x8E2F = 0xE590
-0x8E30 = 0xE591
-0x8E31 = 0xE592
-0x8E32 = 0xE593
-0x8E33 = 0xE594
-0x8E34 = 0xE595
-0x8E35 = 0xE596
-0x8E36 = 0xE597
-0x8E37 = 0xE598
-0x8E38 = 0xE599
-0x8E39 = 0xE59A
-0x8E3A = 0xE59B
-0x8E3B = 0xE59C
-0x8E3C = 0xE59D
-0x8E3D = 0xE59E
-0x8E3E = 0xE59F
-0x8E3F = 0xE5A0
-0x8E40 = 0xE5A1
-0x8E41 = 0xE5A2
-0x8E42 = 0xE5A3
-0x8E43 = 0xE5A4
-0x8E44 = 0xE5A5
-0x8E45 = 0xE5A6
-0x8E46 = 0xE5A7
-0x8E47 = 0xE5A8
-0x8E48 = 0xE5A9
-0x8E49 = 0xE5AA
-0x8E4A = 0xE5AB
-0x8E4B = 0xE5AC
-0x8E4C = 0xE5AD
-0x8E4D = 0xE5AE
-0x8E4E = 0xE5AF
-0x8E4F = 0xE5B0
-0x8E50 = 0xE5B1
-0x8E51 = 0xE5B2
-0x8E52 = 0xE5B3
-0x8E53 = 0xE5B4
-0x8E54 = 0xE5B5
-0x8E55 = 0xE5B6
-0x8E56 = 0xE5B7
-0x8E57 = 0xE5B8
-0x8E58 = 0xE5B9
-0x8E59 = 0xE5BA
-0x8E5A = 0xE5BB
-0x8E5B = 0xE5BC
-0x8E5C = 0xE5BD
-0x8E5D = 0xE5BE
-0x8E5E = 0xE5BF
-0x8E5F = 0xE5C0
-0x8E60 = 0xE5C1
-0x8E61 = 0xE5C2
-0x8E62 = 0xE5C3
-0x8E63 = 0xE5C4
-0x8E64 = 0xE5C5
-0x8E65 = 0xE5C6
-0x8E66 = 0xE5C7
-0x8E67 = 0xE5C8
-0x8E68 = 0xE5C9
-0x8E69 = 0xE5CA
-0x8E6A = 0xE5CB
-0x8E6B = 0xE5CC
-0x8E6C = 0xE5CD
-0x8E6D = 0xE5CE
-0x8E6E = 0xE5CF
-0x8E6F = 0xE5D0
-0x8E70 = 0xE5D1
-0x8E71 = 0xE5D2
-0x8E72 = 0xE5D3
-0x8E73 = 0xE5D4
-0x8E74 = 0xE5D5
-0x8E75 = 0xE5D6
-0x8E76 = 0xE5D7
-0x8E77 = 0xE5D8
-0x8E78 = 0xE5D9
-0x8E79 = 0xE5DA
-0x8E7A = 0xE5DB
-0x8E7B = 0xE5DC
-0x8E7C = 0xE5DD
-0x8E7D = 0xE5DE
-0x8E7E = 0xE5DF
-0x8F21 = 0xE5E0
-0x8F22 = 0xE5E1
-0x8F23 = 0xE5E2
-0x8F24 = 0xE5E3
-0x8F25 = 0xE5E4
-0x8F26 = 0xE5E5
-0x8F27 = 0xE5E6
-0x8F28 = 0xE5E7
-0x8F29 = 0xE5E8
-0x8F2A = 0xE5E9
-0x8F2B = 0xE5EA
-0x8F2C = 0xE5EB
-0x8F2D = 0xE5EC
-0x8F2E = 0xE5ED
-0x8F2F = 0xE5EE
-0x8F30 = 0xE5EF
-0x8F31 = 0xE5F0
-0x8F32 = 0xE5F1
-0x8F33 = 0xE5F2
-0x8F34 = 0xE5F3
-0x8F35 = 0xE5F4
-0x8F36 = 0xE5F5
-0x8F37 = 0xE5F6
-0x8F38 = 0xE5F7
-0x8F39 = 0xE5F8
-0x8F3A = 0xE5F9
-0x8F3B = 0xE5FA
-0x8F3C = 0xE5FB
-0x8F3D = 0xE5FC
-0x8F3E = 0xE5FD
-0x8F3F = 0xE5FE
-0x8F40 = 0xE5FF
-0x8F41 = 0xE600
-0x8F42 = 0xE601
-0x8F43 = 0xE602
-0x8F44 = 0xE603
-0x8F45 = 0xE604
-0x8F46 = 0xE605
-0x8F47 = 0xE606
-0x8F48 = 0xE607
-0x8F49 = 0xE608
-0x8F4A = 0xE609
-0x8F4B = 0xE60A
-0x8F4C = 0xE60B
-0x8F4D = 0xE60C
-0x8F4E = 0xE60D
-0x8F4F = 0xE60E
-0x8F50 = 0xE60F
-0x8F51 = 0xE610
-0x8F52 = 0xE611
-0x8F53 = 0xE612
-0x8F54 = 0xE613
-0x8F55 = 0xE614
-0x8F56 = 0xE615
-0x8F57 = 0xE616
-0x8F58 = 0xE617
-0x8F59 = 0xE618
-0x8F5A = 0xE619
-0x8F5B = 0xE61A
-0x8F5C = 0xE61B
-0x8F5D = 0xE61C
-0x8F5E = 0xE61D
-0x8F5F = 0xE61E
-0x8F60 = 0xE61F
-0x8F61 = 0xE620
-0x8F62 = 0xE621
-0x8F63 = 0xE622
-0x8F64 = 0xE623
-0x8F65 = 0xE624
-0x8F66 = 0xE625
-0x8F67 = 0xE626
-0x8F68 = 0xE627
-0x8F69 = 0xE628
-0x8F6A = 0xE629
-0x8F6B = 0xE62A
-0x8F6C = 0xE62B
-0x8F6D = 0xE62C
-0x8F6E = 0xE62D
-0x8F6F = 0xE62E
-0x8F70 = 0xE62F
-0x8F71 = 0xE630
-0x8F72 = 0xE631
-0x8F73 = 0xE632
-0x8F74 = 0xE633
-0x8F75 = 0xE634
-0x8F76 = 0xE635
-0x8F77 = 0xE636
-0x8F78 = 0xE637
-0x8F79 = 0xE638
-0x8F7A = 0xE639
-0x8F7B = 0xE63A
-0x8F7C = 0xE63B
-0x8F7D = 0xE63C
-0x8F7E = 0xE63D
-0x9021 = 0xE63E
-0x9022 = 0xE63F
-0x9023 = 0xE640
-0x9024 = 0xE641
-0x9025 = 0xE642
-0x9026 = 0xE643
-0x9027 = 0xE644
-0x9028 = 0xE645
-0x9029 = 0xE646
-0x902A = 0xE647
-0x902B = 0xE648
-0x902C = 0xE649
-0x902D = 0xE64A
-0x902E = 0xE64B
-0x902F = 0xE64C
-0x9030 = 0xE64D
-0x9031 = 0xE64E
-0x9032 = 0xE64F
-0x9033 = 0xE650
-0x9034 = 0xE651
-0x9035 = 0xE652
-0x9036 = 0xE653
-0x9037 = 0xE654
-0x9038 = 0xE655
-0x9039 = 0xE656
-0x903A = 0xE657
-0x903B = 0xE658
-0x903C = 0xE659
-0x903D = 0xE65A
-0x903E = 0xE65B
-0x903F = 0xE65C
-0x9040 = 0xE65D
-0x9041 = 0xE65E
-0x9042 = 0xE65F
-0x9043 = 0xE660
-0x9044 = 0xE661
-0x9045 = 0xE662
-0x9046 = 0xE663
-0x9047 = 0xE664
-0x9048 = 0xE665
-0x9049 = 0xE666
-0x904A = 0xE667
-0x904B = 0xE668
-0x904C = 0xE669
-0x904D = 0xE66A
-0x904E = 0xE66B
-0x904F = 0xE66C
-0x9050 = 0xE66D
-0x9051 = 0xE66E
-0x9052 = 0xE66F
-0x9053 = 0xE670
-0x9054 = 0xE671
-0x9055 = 0xE672
-0x9056 = 0xE673
-0x9057 = 0xE674
-0x9058 = 0xE675
-0x9059 = 0xE676
-0x905A = 0xE677
-0x905B = 0xE678
-0x905C = 0xE679
-0x905D = 0xE67A
-0x905E = 0xE67B
-0x905F = 0xE67C
-0x9060 = 0xE67D
-0x9061 = 0xE67E
-0x9062 = 0xE67F
-0x9063 = 0xE680
-0x9064 = 0xE681
-0x9065 = 0xE682
-0x9066 = 0xE683
-0x9067 = 0xE684
-0x9068 = 0xE685
-0x9069 = 0xE686
-0x906A = 0xE687
-0x906B = 0xE688
-0x906C = 0xE689
-0x906D = 0xE68A
-0x906E = 0xE68B
-0x906F = 0xE68C
-0x9070 = 0xE68D
-0x9071 = 0xE68E
-0x9072 = 0xE68F
-0x9073 = 0xE690
-0x9074 = 0xE691
-0x9075 = 0xE692
-0x9076 = 0xE693
-0x9077 = 0xE694
-0x9078 = 0xE695
-0x9079 = 0xE696
-0x907A = 0xE697
-0x907B = 0xE698
-0x907C = 0xE699
-0x907D = 0xE69A
-0x907E = 0xE69B
-0x9121 = 0xE69C
-0x9122 = 0xE69D
-0x9123 = 0xE69E
-0x9124 = 0xE69F
-0x9125 = 0xE6A0
-0x9126 = 0xE6A1
-0x9127 = 0xE6A2
-0x9128 = 0xE6A3
-0x9129 = 0xE6A4
-0x912A = 0xE6A5
-0x912B = 0xE6A6
-0x912C = 0xE6A7
-0x912D = 0xE6A8
-0x912E = 0xE6A9
-0x912F = 0xE6AA
-0x9130 = 0xE6AB
-0x9131 = 0xE6AC
-0x9132 = 0xE6AD
-0x9133 = 0xE6AE
-0x9134 = 0xE6AF
-0x9135 = 0xE6B0
-0x9136 = 0xE6B1
-0x9137 = 0xE6B2
-0x9138 = 0xE6B3
-0x9139 = 0xE6B4
-0x913A = 0xE6B5
-0x913B = 0xE6B6
-0x913C = 0xE6B7
-0x913D = 0xE6B8
-0x913E = 0xE6B9
-0x913F = 0xE6BA
-0x9140 = 0xE6BB
-0x9141 = 0xE6BC
-0x9142 = 0xE6BD
-0x9143 = 0xE6BE
-0x9144 = 0xE6BF
-0x9145 = 0xE6C0
-0x9146 = 0xE6C1
-0x9147 = 0xE6C2
-0x9148 = 0xE6C3
-0x9149 = 0xE6C4
-0x914A = 0xE6C5
-0x914B = 0xE6C6
-0x914C = 0xE6C7
-0x914D = 0xE6C8
-0x914E = 0xE6C9
-0x914F = 0xE6CA
-0x9150 = 0xE6CB
-0x9151 = 0xE6CC
-0x9152 = 0xE6CD
-0x9153 = 0xE6CE
-0x9154 = 0xE6CF
-0x9155 = 0xE6D0
-0x9156 = 0xE6D1
-0x9157 = 0xE6D2
-0x9158 = 0xE6D3
-0x9159 = 0xE6D4
-0x915A = 0xE6D5
-0x915B = 0xE6D6
-0x915C = 0xE6D7
-0x915D = 0xE6D8
-0x915E = 0xE6D9
-0x915F = 0xE6DA
-0x9160 = 0xE6DB
-0x9161 = 0xE6DC
-0x9162 = 0xE6DD
-0x9163 = 0xE6DE
-0x9164 = 0xE6DF
-0x9165 = 0xE6E0
-0x9166 = 0xE6E1
-0x9167 = 0xE6E2
-0x9168 = 0xE6E3
-0x9169 = 0xE6E4
-0x916A = 0xE6E5
-0x916B = 0xE6E6
-0x916C = 0xE6E7
-0x916D = 0xE6E8
-0x916E = 0xE6E9
-0x916F = 0xE6EA
-0x9170 = 0xE6EB
-0x9171 = 0xE6EC
-0x9172 = 0xE6ED
-0x9173 = 0xE6EE
-0x9174 = 0xE6EF
-0x9175 = 0xE6F0
-0x9176 = 0xE6F1
-0x9177 = 0xE6F2
-0x9178 = 0xE6F3
-0x9179 = 0xE6F4
-0x917A = 0xE6F5
-0x917B = 0xE6F6
-0x917C = 0xE6F7
-0x917D = 0xE6F8
-0x917E = 0xE6F9
-0x9221 = 0xE6FA
-0x9222 = 0xE6FB
-0x9223 = 0xE6FC
-0x9224 = 0xE6FD
-0x9225 = 0xE6FE
-0x9226 = 0xE6FF
-0x9227 = 0xE700
-0x9228 = 0xE701
-0x9229 = 0xE702
-0x922A = 0xE703
-0x922B = 0xE704
-0x922C = 0xE705
-0x922D = 0xE706
-0x922E = 0xE707
-0x922F = 0xE708
-0x9230 = 0xE709
-0x9231 = 0xE70A
-0x9232 = 0xE70B
-0x9233 = 0xE70C
-0x9234 = 0xE70D
-0x9235 = 0xE70E
-0x9236 = 0xE70F
-0x9237 = 0xE710
-0x9238 = 0xE711
-0x9239 = 0xE712
-0x923A = 0xE713
-0x923B = 0xE714
-0x923C = 0xE715
-0x923D = 0xE716
-0x923E = 0xE717
-0x923F = 0xE718
-0x9240 = 0xE719
-0x9241 = 0xE71A
-0x9242 = 0xE71B
-0x9243 = 0xE71C
-0x9244 = 0xE71D
-0x9245 = 0xE71E
-0x9246 = 0xE71F
-0x9247 = 0xE720
-0x9248 = 0xE721
-0x9249 = 0xE722
-0x924A = 0xE723
-0x924B = 0xE724
-0x924C = 0xE725
-0x924D = 0xE726
-0x924E = 0xE727
-0x924F = 0xE728
-0x9250 = 0xE729
-0x9251 = 0xE72A
-0x9252 = 0xE72B
-0x9253 = 0xE72C
-0x9254 = 0xE72D
-0x9255 = 0xE72E
-0x9256 = 0xE72F
-0x9257 = 0xE730
-0x9258 = 0xE731
-0x9259 = 0xE732
-0x925A = 0xE733
-0x925B = 0xE734
-0x925C = 0xE735
-0x925D = 0xE736
-0x925E = 0xE737
-0x925F = 0xE738
-0x9260 = 0xE739
-0x9261 = 0xE73A
-0x9262 = 0xE73B
-0x9263 = 0xE73C
-0x9264 = 0xE73D
-0x9265 = 0xE73E
-0x9266 = 0xE73F
-0x9267 = 0xE740
-0x9268 = 0xE741
-0x9269 = 0xE742
-0x926A = 0xE743
-0x926B = 0xE744
-0x926C = 0xE745
-0x926D = 0xE746
-0x926E = 0xE747
-0x926F = 0xE748
-0x9270 = 0xE749
-0x9271 = 0xE74A
-0x9272 = 0xE74B
-0x9273 = 0xE74C
-0x9274 = 0xE74D
-0x9275 = 0xE74E
-0x9276 = 0xE74F
-0x9277 = 0xE750
-0x9278 = 0xE751
-0x9279 = 0xE752
-0x927A = 0xE753
-0x927B = 0xE754
-0x927C = 0xE755
-0x927D = 0xE756
-0x927E = 0xE757
-END_MAP
diff --git a/enc/trans/CP/CP932VDC@IBM%UCS.src b/enc/trans/CP/CP932VDC@IBM%UCS.src
deleted file mode 100644
index 3b9b360dd4..0000000000
--- a/enc/trans/CP/CP932VDC@IBM%UCS.src
+++ /dev/null
@@ -1,420 +0,0 @@
-# $NetBSD: CP932VDC@IBM%UCS.src,v 1.1 2006/11/04 03:46:19 tnozaki Exp $
-
-TYPE ROWCOL
-NAME "CP932VDC:IBM/UCS"
-SRC_ZONE 0x93-0x97 / 0x21-0x7E / 8
-OOB_MODE INVALID
-DST_INVALID 0xFFFE
-DST_UNIT_BITS 16
-
-BEGIN_MAP
-#
-# This mapping data is made from the mapping data provided by Unicode, Inc.
-# Original notice:
-#
-# Name: cp932 to Unicode table
-# Unicode version: 2.0
-# Table version: 2.01
-# Table format: Format A
-# Date: 04/15/98
-#
-# Contact: cpxlate@microsoft.com
-#
-# General notes: none
-#
-# Format: Three tab-separated columns
-# Column #1 is the cp932 code (in hex)
-# Column #2 is the Unicode (in hex as 0xXXXX)
-# Column #3 is the Unicode name (follows a comment sign, '#')
-#
-# The entries are in cp932 order
-#
-0x9321 = 0x2170
-0x9322 = 0x2171
-0x9323 = 0x2172
-0x9324 = 0x2173
-0x9325 = 0x2174
-0x9326 = 0x2175
-0x9327 = 0x2176
-0x9328 = 0x2177
-0x9329 = 0x2178
-0x932A = 0x2179
-0x932B = 0x2160
-0x932C = 0x2161
-0x932D = 0x2162
-0x932E = 0x2163
-0x932F = 0x2164
-0x9330 = 0x2165
-0x9331 = 0x2166
-0x9332 = 0x2167
-0x9333 = 0x2168
-0x9334 = 0x2169
-0x9335 = 0xFFE2
-0x9336 = 0xFFE4
-0x9337 = 0xFF07
-0x9338 = 0xFF02
-0x9339 = 0x3231
-0x933A = 0x2116
-0x933B = 0x2121
-0x933C = 0x2235
-0x933D = 0x7E8A
-0x933E = 0x891C
-0x933F = 0x9348
-0x9340 = 0x9288
-0x9341 = 0x84DC
-0x9342 = 0x4FC9
-0x9343 = 0x70BB
-0x9344 = 0x6631
-0x9345 = 0x68C8
-0x9346 = 0x92F9
-0x9347 = 0x66FB
-0x9348 = 0x5F45
-0x9349 = 0x4E28
-0x934A = 0x4EE1
-0x934B = 0x4EFC
-0x934C = 0x4F00
-0x934D = 0x4F03
-0x934E = 0x4F39
-0x934F = 0x4F56
-0x9350 = 0x4F92
-0x9351 = 0x4F8A
-0x9352 = 0x4F9A
-0x9353 = 0x4F94
-0x9354 = 0x4FCD
-0x9355 = 0x5040
-0x9356 = 0x5022
-0x9357 = 0x4FFF
-0x9358 = 0x501E
-0x9359 = 0x5046
-0x935A = 0x5070
-0x935B = 0x5042
-0x935C = 0x5094
-0x935D = 0x50F4
-0x935E = 0x50D8
-0x935F = 0x514A
-0x9360 = 0x5164
-0x9361 = 0x519D
-0x9362 = 0x51BE
-0x9363 = 0x51EC
-0x9364 = 0x5215
-0x9365 = 0x529C
-0x9366 = 0x52A6
-0x9367 = 0x52C0
-0x9368 = 0x52DB
-0x9369 = 0x5300
-0x936A = 0x5307
-0x936B = 0x5324
-0x936C = 0x5372
-0x936D = 0x5393
-0x936E = 0x53B2
-0x936F = 0x53DD
-0x9370 = 0xFA0E
-0x9371 = 0x549C
-0x9372 = 0x548A
-0x9373 = 0x54A9
-0x9374 = 0x54FF
-0x9375 = 0x5586
-0x9376 = 0x5759
-0x9377 = 0x5765
-0x9378 = 0x57AC
-0x9379 = 0x57C8
-0x937A = 0x57C7
-0x937B = 0xFA0F
-0x937C = 0xFA10
-0x937D = 0x589E
-0x937E = 0x58B2
-0x9421 = 0x590B
-0x9422 = 0x5953
-0x9423 = 0x595B
-0x9424 = 0x595D
-0x9425 = 0x5963
-0x9426 = 0x59A4
-0x9427 = 0x59BA
-0x9428 = 0x5B56
-0x9429 = 0x5BC0
-0x942A = 0x752F
-0x942B = 0x5BD8
-0x942C = 0x5BEC
-0x942D = 0x5C1E
-0x942E = 0x5CA6
-0x942F = 0x5CBA
-0x9430 = 0x5CF5
-0x9431 = 0x5D27
-0x9432 = 0x5D53
-0x9433 = 0xFA11
-0x9434 = 0x5D42
-0x9435 = 0x5D6D
-0x9436 = 0x5DB8
-0x9437 = 0x5DB9
-0x9438 = 0x5DD0
-0x9439 = 0x5F21
-0x943A = 0x5F34
-0x943B = 0x5F67
-0x943C = 0x5FB7
-0x943D = 0x5FDE
-0x943E = 0x605D
-0x943F = 0x6085
-0x9440 = 0x608A
-0x9441 = 0x60DE
-0x9442 = 0x60D5
-0x9443 = 0x6120
-0x9444 = 0x60F2
-0x9445 = 0x6111
-0x9446 = 0x6137
-0x9447 = 0x6130
-0x9448 = 0x6198
-0x9449 = 0x6213
-0x944A = 0x62A6
-0x944B = 0x63F5
-0x944C = 0x6460
-0x944D = 0x649D
-0x944E = 0x64CE
-0x944F = 0x654E
-0x9450 = 0x6600
-0x9451 = 0x6615
-0x9452 = 0x663B
-0x9453 = 0x6609
-0x9454 = 0x662E
-0x9455 = 0x661E
-0x9456 = 0x6624
-0x9457 = 0x6665
-0x9458 = 0x6657
-0x9459 = 0x6659
-0x945A = 0xFA12
-0x945B = 0x6673
-0x945C = 0x6699
-0x945D = 0x66A0
-0x945E = 0x66B2
-0x945F = 0x66BF
-0x9460 = 0x66FA
-0x9461 = 0x670E
-0x9462 = 0xF929
-0x9463 = 0x6766
-0x9464 = 0x67BB
-0x9465 = 0x6852
-0x9466 = 0x67C0
-0x9467 = 0x6801
-0x9468 = 0x6844
-0x9469 = 0x68CF
-0x946A = 0xFA13
-0x946B = 0x6968
-0x946C = 0xFA14
-0x946D = 0x6998
-0x946E = 0x69E2
-0x946F = 0x6A30
-0x9470 = 0x6A6B
-0x9471 = 0x6A46
-0x9472 = 0x6A73
-0x9473 = 0x6A7E
-0x9474 = 0x6AE2
-0x9475 = 0x6AE4
-0x9476 = 0x6BD6
-0x9477 = 0x6C3F
-0x9478 = 0x6C5C
-0x9479 = 0x6C86
-0x947A = 0x6C6F
-0x947B = 0x6CDA
-0x947C = 0x6D04
-0x947D = 0x6D87
-0x947E = 0x6D6F
-0x9521 = 0x6D96
-0x9522 = 0x6DAC
-0x9523 = 0x6DCF
-0x9524 = 0x6DF8
-0x9525 = 0x6DF2
-0x9526 = 0x6DFC
-0x9527 = 0x6E39
-0x9528 = 0x6E5C
-0x9529 = 0x6E27
-0x952A = 0x6E3C
-0x952B = 0x6EBF
-0x952C = 0x6F88
-0x952D = 0x6FB5
-0x952E = 0x6FF5
-0x952F = 0x7005
-0x9530 = 0x7007
-0x9531 = 0x7028
-0x9532 = 0x7085
-0x9533 = 0x70AB
-0x9534 = 0x710F
-0x9535 = 0x7104
-0x9536 = 0x715C
-0x9537 = 0x7146
-0x9538 = 0x7147
-0x9539 = 0xFA15
-0x953A = 0x71C1
-0x953B = 0x71FE
-0x953C = 0x72B1
-0x953D = 0x72BE
-0x953E = 0x7324
-0x953F = 0xFA16
-0x9540 = 0x7377
-0x9541 = 0x73BD
-0x9542 = 0x73C9
-0x9543 = 0x73D6
-0x9544 = 0x73E3
-0x9545 = 0x73D2
-0x9546 = 0x7407
-0x9547 = 0x73F5
-0x9548 = 0x7426
-0x9549 = 0x742A
-0x954A = 0x7429
-0x954B = 0x742E
-0x954C = 0x7462
-0x954D = 0x7489
-0x954E = 0x749F
-0x954F = 0x7501
-0x9550 = 0x756F
-0x9551 = 0x7682
-0x9552 = 0x769C
-0x9553 = 0x769E
-0x9554 = 0x769B
-0x9555 = 0x76A6
-0x9556 = 0xFA17
-0x9557 = 0x7746
-0x9558 = 0x52AF
-0x9559 = 0x7821
-0x955A = 0x784E
-0x955B = 0x7864
-0x955C = 0x787A
-0x955D = 0x7930
-0x955E = 0xFA18
-0x955F = 0xFA19
-0x9560 = 0xFA1A
-0x9561 = 0x7994
-0x9562 = 0xFA1B
-0x9563 = 0x799B
-0x9564 = 0x7AD1
-0x9565 = 0x7AE7
-0x9566 = 0xFA1C
-0x9567 = 0x7AEB
-0x9568 = 0x7B9E
-0x9569 = 0xFA1D
-0x956A = 0x7D48
-0x956B = 0x7D5C
-0x956C = 0x7DB7
-0x956D = 0x7DA0
-0x956E = 0x7DD6
-0x956F = 0x7E52
-0x9570 = 0x7F47
-0x9571 = 0x7FA1
-0x9572 = 0xFA1E
-0x9573 = 0x8301
-0x9574 = 0x8362
-0x9575 = 0x837F
-0x9576 = 0x83C7
-0x9577 = 0x83F6
-0x9578 = 0x8448
-0x9579 = 0x84B4
-0x957A = 0x8553
-0x957B = 0x8559
-0x957C = 0x856B
-0x957D = 0xFA1F
-0x957E = 0x85B0
-0x9621 = 0xFA20
-0x9622 = 0xFA21
-0x9623 = 0x8807
-0x9624 = 0x88F5
-0x9625 = 0x8A12
-0x9626 = 0x8A37
-0x9627 = 0x8A79
-0x9628 = 0x8AA7
-0x9629 = 0x8ABE
-0x962A = 0x8ADF
-0x962B = 0xFA22
-0x962C = 0x8AF6
-0x962D = 0x8B53
-0x962E = 0x8B7F
-0x962F = 0x8CF0
-0x9630 = 0x8CF4
-0x9631 = 0x8D12
-0x9632 = 0x8D76
-0x9633 = 0xFA23
-0x9634 = 0x8ECF
-0x9635 = 0xFA24
-0x9636 = 0xFA25
-0x9637 = 0x9067
-0x9638 = 0x90DE
-0x9639 = 0xFA26
-0x963A = 0x9115
-0x963B = 0x9127
-0x963C = 0x91DA
-0x963D = 0x91D7
-0x963E = 0x91DE
-0x963F = 0x91ED
-0x9640 = 0x91EE
-0x9641 = 0x91E4
-0x9642 = 0x91E5
-0x9643 = 0x9206
-0x9644 = 0x9210
-0x9645 = 0x920A
-0x9646 = 0x923A
-0x9647 = 0x9240
-0x9648 = 0x923C
-0x9649 = 0x924E
-0x964A = 0x9259
-0x964B = 0x9251
-0x964C = 0x9239
-0x964D = 0x9267
-0x964E = 0x92A7
-0x964F = 0x9277
-0x9650 = 0x9278
-0x9651 = 0x92E7
-0x9652 = 0x92D7
-0x9653 = 0x92D9
-0x9654 = 0x92D0
-0x9655 = 0xFA27
-0x9656 = 0x92D5
-0x9657 = 0x92E0
-0x9658 = 0x92D3
-0x9659 = 0x9325
-0x965A = 0x9321
-0x965B = 0x92FB
-0x965C = 0xFA28
-0x965D = 0x931E
-0x965E = 0x92FF
-0x965F = 0x931D
-0x9660 = 0x9302
-0x9661 = 0x9370
-0x9662 = 0x9357
-0x9663 = 0x93A4
-0x9664 = 0x93C6
-0x9665 = 0x93DE
-0x9666 = 0x93F8
-0x9667 = 0x9431
-0x9668 = 0x9445
-0x9669 = 0x9448
-0x966A = 0x9592
-0x966B = 0xF9DC
-0x966C = 0xFA29
-0x966D = 0x969D
-0x966E = 0x96AF
-0x966F = 0x9733
-0x9670 = 0x973B
-0x9671 = 0x9743
-0x9672 = 0x974D
-0x9673 = 0x974F
-0x9674 = 0x9751
-0x9675 = 0x9755
-0x9676 = 0x9857
-0x9677 = 0x9865
-0x9678 = 0xFA2A
-0x9679 = 0xFA2B
-0x967A = 0x9927
-0x967B = 0xFA2C
-0x967C = 0x999E
-0x967D = 0x9A4E
-0x967E = 0x9AD9
-0x9721 = 0x9ADC
-0x9722 = 0x9B75
-0x9723 = 0x9B72
-0x9724 = 0x9B8F
-0x9725 = 0x9BB1
-0x9726 = 0x9BBB
-0x9727 = 0x9C00
-0x9728 = 0x9D70
-0x9729 = 0x9D6B
-0x972A = 0xFA2D
-0x972B = 0x9E19
-0x972C = 0x9ED1
-END_MAP
diff --git a/enc/trans/CP/CP932VDC@NEC_IBM%UCS.src b/enc/trans/CP/CP932VDC@NEC_IBM%UCS.src
deleted file mode 100644
index 7696d909e0..0000000000
--- a/enc/trans/CP/CP932VDC@NEC_IBM%UCS.src
+++ /dev/null
@@ -1,406 +0,0 @@
-# $NetBSD: CP932VDC@NEC_IBM%UCS.src,v 1.1 2006/11/04 03:46:19 tnozaki Exp $
-
-TYPE ROWCOL
-NAME "CP932VDC:NEC_IBM/UCS"
-SRC_ZONE 0x79-0x7C / 0x21-0x7E / 8
-OOB_MODE INVALID
-DST_INVALID 0xFFFE
-DST_UNIT_BITS 16
-
-BEGIN_MAP
-#
-# This mapping data is made from the mapping data provided by Unicode, Inc.
-# Original notice:
-#
-# Name: cp932 to Unicode table
-# Unicode version: 2.0
-# Table version: 2.01
-# Table format: Format A
-# Date: 04/15/98
-#
-# Contact: cpxlate@microsoft.com
-#
-# General notes: none
-#
-# Format: Three tab-separated columns
-# Column #1 is the cp932 code (in hex)
-# Column #2 is the Unicode (in hex as 0xXXXX)
-# Column #3 is the Unicode name (follows a comment sign, '#')
-#
-# The entries are in cp932 order
-#
-0x7921 = 0x7E8A
-0x7922 = 0x891C
-0x7923 = 0x9348
-0x7924 = 0x9288
-0x7925 = 0x84DC
-0x7926 = 0x4FC9
-0x7927 = 0x70BB
-0x7928 = 0x6631
-0x7929 = 0x68C8
-0x792A = 0x92F9
-0x792B = 0x66FB
-0x792C = 0x5F45
-0x792D = 0x4E28
-0x792E = 0x4EE1
-0x792F = 0x4EFC
-0x7930 = 0x4F00
-0x7931 = 0x4F03
-0x7932 = 0x4F39
-0x7933 = 0x4F56
-0x7934 = 0x4F92
-0x7935 = 0x4F8A
-0x7936 = 0x4F9A
-0x7937 = 0x4F94
-0x7938 = 0x4FCD
-0x7939 = 0x5040
-0x793A = 0x5022
-0x793B = 0x4FFF
-0x793C = 0x501E
-0x793D = 0x5046
-0x793E = 0x5070
-0x793F = 0x5042
-0x7940 = 0x5094
-0x7941 = 0x50F4
-0x7942 = 0x50D8
-0x7943 = 0x514A
-0x7944 = 0x5164
-0x7945 = 0x519D
-0x7946 = 0x51BE
-0x7947 = 0x51EC
-0x7948 = 0x5215
-0x7949 = 0x529C
-0x794A = 0x52A6
-0x794B = 0x52C0
-0x794C = 0x52DB
-0x794D = 0x5300
-0x794E = 0x5307
-0x794F = 0x5324
-0x7950 = 0x5372
-0x7951 = 0x5393
-0x7952 = 0x53B2
-0x7953 = 0x53DD
-0x7954 = 0xFA0E
-0x7955 = 0x549C
-0x7956 = 0x548A
-0x7957 = 0x54A9
-0x7958 = 0x54FF
-0x7959 = 0x5586
-0x795A = 0x5759
-0x795B = 0x5765
-0x795C = 0x57AC
-0x795D = 0x57C8
-0x795E = 0x57C7
-0x795F = 0xFA0F
-0x7960 = 0xFA10
-0x7961 = 0x589E
-0x7962 = 0x58B2
-0x7963 = 0x590B
-0x7964 = 0x5953
-0x7965 = 0x595B
-0x7966 = 0x595D
-0x7967 = 0x5963
-0x7968 = 0x59A4
-0x7969 = 0x59BA
-0x796A = 0x5B56
-0x796B = 0x5BC0
-0x796C = 0x752F
-0x796D = 0x5BD8
-0x796E = 0x5BEC
-0x796F = 0x5C1E
-0x7970 = 0x5CA6
-0x7971 = 0x5CBA
-0x7972 = 0x5CF5
-0x7973 = 0x5D27
-0x7974 = 0x5D53
-0x7975 = 0xFA11
-0x7976 = 0x5D42
-0x7977 = 0x5D6D
-0x7978 = 0x5DB8
-0x7979 = 0x5DB9
-0x797A = 0x5DD0
-0x797B = 0x5F21
-0x797C = 0x5F34
-0x797D = 0x5F67
-0x797E = 0x5FB7
-0x7A21 = 0x5FDE
-0x7A22 = 0x605D
-0x7A23 = 0x6085
-0x7A24 = 0x608A
-0x7A25 = 0x60DE
-0x7A26 = 0x60D5
-0x7A27 = 0x6120
-0x7A28 = 0x60F2
-0x7A29 = 0x6111
-0x7A2A = 0x6137
-0x7A2B = 0x6130
-0x7A2C = 0x6198
-0x7A2D = 0x6213
-0x7A2E = 0x62A6
-0x7A2F = 0x63F5
-0x7A30 = 0x6460
-0x7A31 = 0x649D
-0x7A32 = 0x64CE
-0x7A33 = 0x654E
-0x7A34 = 0x6600
-0x7A35 = 0x6615
-0x7A36 = 0x663B
-0x7A37 = 0x6609
-0x7A38 = 0x662E
-0x7A39 = 0x661E
-0x7A3A = 0x6624
-0x7A3B = 0x6665
-0x7A3C = 0x6657
-0x7A3D = 0x6659
-0x7A3E = 0xFA12
-0x7A3F = 0x6673
-0x7A40 = 0x6699
-0x7A41 = 0x66A0
-0x7A42 = 0x66B2
-0x7A43 = 0x66BF
-0x7A44 = 0x66FA
-0x7A45 = 0x670E
-0x7A46 = 0xF929
-0x7A47 = 0x6766
-0x7A48 = 0x67BB
-0x7A49 = 0x6852
-0x7A4A = 0x67C0
-0x7A4B = 0x6801
-0x7A4C = 0x6844
-0x7A4D = 0x68CF
-0x7A4E = 0xFA13
-0x7A4F = 0x6968
-0x7A50 = 0xFA14
-0x7A51 = 0x6998
-0x7A52 = 0x69E2
-0x7A53 = 0x6A30
-0x7A54 = 0x6A6B
-0x7A55 = 0x6A46
-0x7A56 = 0x6A73
-0x7A57 = 0x6A7E
-0x7A58 = 0x6AE2
-0x7A59 = 0x6AE4
-0x7A5A = 0x6BD6
-0x7A5B = 0x6C3F
-0x7A5C = 0x6C5C
-0x7A5D = 0x6C86
-0x7A5E = 0x6C6F
-0x7A5F = 0x6CDA
-0x7A60 = 0x6D04
-0x7A61 = 0x6D87
-0x7A62 = 0x6D6F
-0x7A63 = 0x6D96
-0x7A64 = 0x6DAC
-0x7A65 = 0x6DCF
-0x7A66 = 0x6DF8
-0x7A67 = 0x6DF2
-0x7A68 = 0x6DFC
-0x7A69 = 0x6E39
-0x7A6A = 0x6E5C
-0x7A6B = 0x6E27
-0x7A6C = 0x6E3C
-0x7A6D = 0x6EBF
-0x7A6E = 0x6F88
-0x7A6F = 0x6FB5
-0x7A70 = 0x6FF5
-0x7A71 = 0x7005
-0x7A72 = 0x7007
-0x7A73 = 0x7028
-0x7A74 = 0x7085
-0x7A75 = 0x70AB
-0x7A76 = 0x710F
-0x7A77 = 0x7104
-0x7A78 = 0x715C
-0x7A79 = 0x7146
-0x7A7A = 0x7147
-0x7A7B = 0xFA15
-0x7A7C = 0x71C1
-0x7A7D = 0x71FE
-0x7A7E = 0x72B1
-0x7B21 = 0x72BE
-0x7B22 = 0x7324
-0x7B23 = 0xFA16
-0x7B24 = 0x7377
-0x7B25 = 0x73BD
-0x7B26 = 0x73C9
-0x7B27 = 0x73D6
-0x7B28 = 0x73E3
-0x7B29 = 0x73D2
-0x7B2A = 0x7407
-0x7B2B = 0x73F5
-0x7B2C = 0x7426
-0x7B2D = 0x742A
-0x7B2E = 0x7429
-0x7B2F = 0x742E
-0x7B30 = 0x7462
-0x7B31 = 0x7489
-0x7B32 = 0x749F
-0x7B33 = 0x7501
-0x7B34 = 0x756F
-0x7B35 = 0x7682
-0x7B36 = 0x769C
-0x7B37 = 0x769E
-0x7B38 = 0x769B
-0x7B39 = 0x76A6
-0x7B3A = 0xFA17
-0x7B3B = 0x7746
-0x7B3C = 0x52AF
-0x7B3D = 0x7821
-0x7B3E = 0x784E
-0x7B3F = 0x7864
-0x7B40 = 0x787A
-0x7B41 = 0x7930
-0x7B42 = 0xFA18
-0x7B43 = 0xFA19
-0x7B44 = 0xFA1A
-0x7B45 = 0x7994
-0x7B46 = 0xFA1B
-0x7B47 = 0x799B
-0x7B48 = 0x7AD1
-0x7B49 = 0x7AE7
-0x7B4A = 0xFA1C
-0x7B4B = 0x7AEB
-0x7B4C = 0x7B9E
-0x7B4D = 0xFA1D
-0x7B4E = 0x7D48
-0x7B4F = 0x7D5C
-0x7B50 = 0x7DB7
-0x7B51 = 0x7DA0
-0x7B52 = 0x7DD6
-0x7B53 = 0x7E52
-0x7B54 = 0x7F47
-0x7B55 = 0x7FA1
-0x7B56 = 0xFA1E
-0x7B57 = 0x8301
-0x7B58 = 0x8362
-0x7B59 = 0x837F
-0x7B5A = 0x83C7
-0x7B5B = 0x83F6
-0x7B5C = 0x8448
-0x7B5D = 0x84B4
-0x7B5E = 0x8553
-0x7B5F = 0x8559
-0x7B60 = 0x856B
-0x7B61 = 0xFA1F
-0x7B62 = 0x85B0
-0x7B63 = 0xFA20
-0x7B64 = 0xFA21
-0x7B65 = 0x8807
-0x7B66 = 0x88F5
-0x7B67 = 0x8A12
-0x7B68 = 0x8A37
-0x7B69 = 0x8A79
-0x7B6A = 0x8AA7
-0x7B6B = 0x8ABE
-0x7B6C = 0x8ADF
-0x7B6D = 0xFA22
-0x7B6E = 0x8AF6
-0x7B6F = 0x8B53
-0x7B70 = 0x8B7F
-0x7B71 = 0x8CF0
-0x7B72 = 0x8CF4
-0x7B73 = 0x8D12
-0x7B74 = 0x8D76
-0x7B75 = 0xFA23
-0x7B76 = 0x8ECF
-0x7B77 = 0xFA24
-0x7B78 = 0xFA25
-0x7B79 = 0x9067
-0x7B7A = 0x90DE
-0x7B7B = 0xFA26
-0x7B7C = 0x9115
-0x7B7D = 0x9127
-0x7B7E = 0x91DA
-0x7C21 = 0x91D7
-0x7C22 = 0x91DE
-0x7C23 = 0x91ED
-0x7C24 = 0x91EE
-0x7C25 = 0x91E4
-0x7C26 = 0x91E5
-0x7C27 = 0x9206
-0x7C28 = 0x9210
-0x7C29 = 0x920A
-0x7C2A = 0x923A
-0x7C2B = 0x9240
-0x7C2C = 0x923C
-0x7C2D = 0x924E
-0x7C2E = 0x9259
-0x7C2F = 0x9251
-0x7C30 = 0x9239
-0x7C31 = 0x9267
-0x7C32 = 0x92A7
-0x7C33 = 0x9277
-0x7C34 = 0x9278
-0x7C35 = 0x92E7
-0x7C36 = 0x92D7
-0x7C37 = 0x92D9
-0x7C38 = 0x92D0
-0x7C39 = 0xFA27
-0x7C3A = 0x92D5
-0x7C3B = 0x92E0
-0x7C3C = 0x92D3
-0x7C3D = 0x9325
-0x7C3E = 0x9321
-0x7C3F = 0x92FB
-0x7C40 = 0xFA28
-0x7C41 = 0x931E
-0x7C42 = 0x92FF
-0x7C43 = 0x931D
-0x7C44 = 0x9302
-0x7C45 = 0x9370
-0x7C46 = 0x9357
-0x7C47 = 0x93A4
-0x7C48 = 0x93C6
-0x7C49 = 0x93DE
-0x7C4A = 0x93F8
-0x7C4B = 0x9431
-0x7C4C = 0x9445
-0x7C4D = 0x9448
-0x7C4E = 0x9592
-0x7C4F = 0xF9DC
-0x7C50 = 0xFA29
-0x7C51 = 0x969D
-0x7C52 = 0x96AF
-0x7C53 = 0x9733
-0x7C54 = 0x973B
-0x7C55 = 0x9743
-0x7C56 = 0x974D
-0x7C57 = 0x974F
-0x7C58 = 0x9751
-0x7C59 = 0x9755
-0x7C5A = 0x9857
-0x7C5B = 0x9865
-0x7C5C = 0xFA2A
-0x7C5D = 0xFA2B
-0x7C5E = 0x9927
-0x7C5F = 0xFA2C
-0x7C60 = 0x999E
-0x7C61 = 0x9A4E
-0x7C62 = 0x9AD9
-0x7C63 = 0x9ADC
-0x7C64 = 0x9B75
-0x7C65 = 0x9B72
-0x7C66 = 0x9B8F
-0x7C67 = 0x9BB1
-0x7C68 = 0x9BBB
-0x7C69 = 0x9C00
-0x7C6A = 0x9D70
-0x7C6B = 0x9D6B
-0x7C6C = 0xFA2D
-0x7C6D = 0x9E19
-0x7C6E = 0x9ED1
-0x7C71 = 0x2170
-0x7C72 = 0x2171
-0x7C73 = 0x2172
-0x7C74 = 0x2173
-0x7C75 = 0x2174
-0x7C76 = 0x2175
-0x7C77 = 0x2176
-0x7C78 = 0x2177
-0x7C79 = 0x2178
-0x7C7A = 0x2179
-0x7C7B = 0xFFE2
-0x7C7C = 0xFFE4
-0x7C7D = 0xFF07
-0x7C7E = 0xFF02
-END_MAP
diff --git a/enc/trans/CP/UCS%CP932UDA.src b/enc/trans/CP/UCS%CP932UDA.src
deleted file mode 100644
index f34e9ed829..0000000000
--- a/enc/trans/CP/UCS%CP932UDA.src
+++ /dev/null
@@ -1,1912 +0,0 @@
-# $NetBSD: UCS%CP932UDA.src,v 1.1 2006/11/04 03:46:19 tnozaki Exp $
-
-TYPE ROWCOL
-NAME "UCS/CP932UDA"
-SRC_ZONE 0xE000-0xE757
-OOB_MODE INVALID
-DST_INVALID 0xFFFF
-DST_UNIT_BITS 16
-
-BEGIN_MAP
-#
-# This mapping data is made from the mapping data provided by Unicode, Inc.
-# Original notice:
-#
-# Name: cp932 to Unicode table
-# Unicode version: 2.0
-# Table version: 2.01
-# Table format: Format A
-# Date: 04/15/98
-#
-# Contact: cpxlate@microsoft.com
-#
-# General notes: none
-#
-# Format: Three tab-separated columns
-# Column #1 is the cp932 code (in hex)
-# Column #2 is the Unicode (in hex as 0xXXXX)
-# Column #3 is the Unicode name (follows a comment sign, '#')
-#
-# The entries are in cp932 order
-#
-0xE000 = 0x7F21
-0xE001 = 0x7F22
-0xE002 = 0x7F23
-0xE003 = 0x7F24
-0xE004 = 0x7F25
-0xE005 = 0x7F26
-0xE006 = 0x7F27
-0xE007 = 0x7F28
-0xE008 = 0x7F29
-0xE009 = 0x7F2A
-0xE00A = 0x7F2B
-0xE00B = 0x7F2C
-0xE00C = 0x7F2D
-0xE00D = 0x7F2E
-0xE00E = 0x7F2F
-0xE00F = 0x7F30
-0xE010 = 0x7F31
-0xE011 = 0x7F32
-0xE012 = 0x7F33
-0xE013 = 0x7F34
-0xE014 = 0x7F35
-0xE015 = 0x7F36
-0xE016 = 0x7F37
-0xE017 = 0x7F38
-0xE018 = 0x7F39
-0xE019 = 0x7F3A
-0xE01A = 0x7F3B
-0xE01B = 0x7F3C
-0xE01C = 0x7F3D
-0xE01D = 0x7F3E
-0xE01E = 0x7F3F
-0xE01F = 0x7F40
-0xE020 = 0x7F41
-0xE021 = 0x7F42
-0xE022 = 0x7F43
-0xE023 = 0x7F44
-0xE024 = 0x7F45
-0xE025 = 0x7F46
-0xE026 = 0x7F47
-0xE027 = 0x7F48
-0xE028 = 0x7F49
-0xE029 = 0x7F4A
-0xE02A = 0x7F4B
-0xE02B = 0x7F4C
-0xE02C = 0x7F4D
-0xE02D = 0x7F4E
-0xE02E = 0x7F4F
-0xE02F = 0x7F50
-0xE030 = 0x7F51
-0xE031 = 0x7F52
-0xE032 = 0x7F53
-0xE033 = 0x7F54
-0xE034 = 0x7F55
-0xE035 = 0x7F56
-0xE036 = 0x7F57
-0xE037 = 0x7F58
-0xE038 = 0x7F59
-0xE039 = 0x7F5A
-0xE03A = 0x7F5B
-0xE03B = 0x7F5C
-0xE03C = 0x7F5D
-0xE03D = 0x7F5E
-0xE03E = 0x7F5F
-0xE03F = 0x7F60
-0xE040 = 0x7F61
-0xE041 = 0x7F62
-0xE042 = 0x7F63
-0xE043 = 0x7F64
-0xE044 = 0x7F65
-0xE045 = 0x7F66
-0xE046 = 0x7F67
-0xE047 = 0x7F68
-0xE048 = 0x7F69
-0xE049 = 0x7F6A
-0xE04A = 0x7F6B
-0xE04B = 0x7F6C
-0xE04C = 0x7F6D
-0xE04D = 0x7F6E
-0xE04E = 0x7F6F
-0xE04F = 0x7F70
-0xE050 = 0x7F71
-0xE051 = 0x7F72
-0xE052 = 0x7F73
-0xE053 = 0x7F74
-0xE054 = 0x7F75
-0xE055 = 0x7F76
-0xE056 = 0x7F77
-0xE057 = 0x7F78
-0xE058 = 0x7F79
-0xE059 = 0x7F7A
-0xE05A = 0x7F7B
-0xE05B = 0x7F7C
-0xE05C = 0x7F7D
-0xE05D = 0x7F7E
-0xE05E = 0x8021
-0xE05F = 0x8022
-0xE060 = 0x8023
-0xE061 = 0x8024
-0xE062 = 0x8025
-0xE063 = 0x8026
-0xE064 = 0x8027
-0xE065 = 0x8028
-0xE066 = 0x8029
-0xE067 = 0x802A
-0xE068 = 0x802B
-0xE069 = 0x802C
-0xE06A = 0x802D
-0xE06B = 0x802E
-0xE06C = 0x802F
-0xE06D = 0x8030
-0xE06E = 0x8031
-0xE06F = 0x8032
-0xE070 = 0x8033
-0xE071 = 0x8034
-0xE072 = 0x8035
-0xE073 = 0x8036
-0xE074 = 0x8037
-0xE075 = 0x8038
-0xE076 = 0x8039
-0xE077 = 0x803A
-0xE078 = 0x803B
-0xE079 = 0x803C
-0xE07A = 0x803D
-0xE07B = 0x803E
-0xE07C = 0x803F
-0xE07D = 0x8040
-0xE07E = 0x8041
-0xE07F = 0x8042
-0xE080 = 0x8043
-0xE081 = 0x8044
-0xE082 = 0x8045
-0xE083 = 0x8046
-0xE084 = 0x8047
-0xE085 = 0x8048
-0xE086 = 0x8049
-0xE087 = 0x804A
-0xE088 = 0x804B
-0xE089 = 0x804C
-0xE08A = 0x804D
-0xE08B = 0x804E
-0xE08C = 0x804F
-0xE08D = 0x8050
-0xE08E = 0x8051
-0xE08F = 0x8052
-0xE090 = 0x8053
-0xE091 = 0x8054
-0xE092 = 0x8055
-0xE093 = 0x8056
-0xE094 = 0x8057
-0xE095 = 0x8058
-0xE096 = 0x8059
-0xE097 = 0x805A
-0xE098 = 0x805B
-0xE099 = 0x805C
-0xE09A = 0x805D
-0xE09B = 0x805E
-0xE09C = 0x805F
-0xE09D = 0x8060
-0xE09E = 0x8061
-0xE09F = 0x8062
-0xE0A0 = 0x8063
-0xE0A1 = 0x8064
-0xE0A2 = 0x8065
-0xE0A3 = 0x8066
-0xE0A4 = 0x8067
-0xE0A5 = 0x8068
-0xE0A6 = 0x8069
-0xE0A7 = 0x806A
-0xE0A8 = 0x806B
-0xE0A9 = 0x806C
-0xE0AA = 0x806D
-0xE0AB = 0x806E
-0xE0AC = 0x806F
-0xE0AD = 0x8070
-0xE0AE = 0x8071
-0xE0AF = 0x8072
-0xE0B0 = 0x8073
-0xE0B1 = 0x8074
-0xE0B2 = 0x8075
-0xE0B3 = 0x8076
-0xE0B4 = 0x8077
-0xE0B5 = 0x8078
-0xE0B6 = 0x8079
-0xE0B7 = 0x807A
-0xE0B8 = 0x807B
-0xE0B9 = 0x807C
-0xE0BA = 0x807D
-0xE0BB = 0x807E
-0xE0BC = 0x8121
-0xE0BD = 0x8122
-0xE0BE = 0x8123
-0xE0BF = 0x8124
-0xE0C0 = 0x8125
-0xE0C1 = 0x8126
-0xE0C2 = 0x8127
-0xE0C3 = 0x8128
-0xE0C4 = 0x8129
-0xE0C5 = 0x812A
-0xE0C6 = 0x812B
-0xE0C7 = 0x812C
-0xE0C8 = 0x812D
-0xE0C9 = 0x812E
-0xE0CA = 0x812F
-0xE0CB = 0x8130
-0xE0CC = 0x8131
-0xE0CD = 0x8132
-0xE0CE = 0x8133
-0xE0CF = 0x8134
-0xE0D0 = 0x8135
-0xE0D1 = 0x8136
-0xE0D2 = 0x8137
-0xE0D3 = 0x8138
-0xE0D4 = 0x8139
-0xE0D5 = 0x813A
-0xE0D6 = 0x813B
-0xE0D7 = 0x813C
-0xE0D8 = 0x813D
-0xE0D9 = 0x813E
-0xE0DA = 0x813F
-0xE0DB = 0x8140
-0xE0DC = 0x8141
-0xE0DD = 0x8142
-0xE0DE = 0x8143
-0xE0DF = 0x8144
-0xE0E0 = 0x8145
-0xE0E1 = 0x8146
-0xE0E2 = 0x8147
-0xE0E3 = 0x8148
-0xE0E4 = 0x8149
-0xE0E5 = 0x814A
-0xE0E6 = 0x814B
-0xE0E7 = 0x814C
-0xE0E8 = 0x814D
-0xE0E9 = 0x814E
-0xE0EA = 0x814F
-0xE0EB = 0x8150
-0xE0EC = 0x8151
-0xE0ED = 0x8152
-0xE0EE = 0x8153
-0xE0EF = 0x8154
-0xE0F0 = 0x8155
-0xE0F1 = 0x8156
-0xE0F2 = 0x8157
-0xE0F3 = 0x8158
-0xE0F4 = 0x8159
-0xE0F5 = 0x815A
-0xE0F6 = 0x815B
-0xE0F7 = 0x815C
-0xE0F8 = 0x815D
-0xE0F9 = 0x815E
-0xE0FA = 0x815F
-0xE0FB = 0x8160
-0xE0FC = 0x8161
-0xE0FD = 0x8162
-0xE0FE = 0x8163
-0xE0FF = 0x8164
-0xE100 = 0x8165
-0xE101 = 0x8166
-0xE102 = 0x8167
-0xE103 = 0x8168
-0xE104 = 0x8169
-0xE105 = 0x816A
-0xE106 = 0x816B
-0xE107 = 0x816C
-0xE108 = 0x816D
-0xE109 = 0x816E
-0xE10A = 0x816F
-0xE10B = 0x8170
-0xE10C = 0x8171
-0xE10D = 0x8172
-0xE10E = 0x8173
-0xE10F = 0x8174
-0xE110 = 0x8175
-0xE111 = 0x8176
-0xE112 = 0x8177
-0xE113 = 0x8178
-0xE114 = 0x8179
-0xE115 = 0x817A
-0xE116 = 0x817B
-0xE117 = 0x817C
-0xE118 = 0x817D
-0xE119 = 0x817E
-0xE11A = 0x8221
-0xE11B = 0x8222
-0xE11C = 0x8223
-0xE11D = 0x8224
-0xE11E = 0x8225
-0xE11F = 0x8226
-0xE120 = 0x8227
-0xE121 = 0x8228
-0xE122 = 0x8229
-0xE123 = 0x822A
-0xE124 = 0x822B
-0xE125 = 0x822C
-0xE126 = 0x822D
-0xE127 = 0x822E
-0xE128 = 0x822F
-0xE129 = 0x8230
-0xE12A = 0x8231
-0xE12B = 0x8232
-0xE12C = 0x8233
-0xE12D = 0x8234
-0xE12E = 0x8235
-0xE12F = 0x8236
-0xE130 = 0x8237
-0xE131 = 0x8238
-0xE132 = 0x8239
-0xE133 = 0x823A
-0xE134 = 0x823B
-0xE135 = 0x823C
-0xE136 = 0x823D
-0xE137 = 0x823E
-0xE138 = 0x823F
-0xE139 = 0x8240
-0xE13A = 0x8241
-0xE13B = 0x8242
-0xE13C = 0x8243
-0xE13D = 0x8244
-0xE13E = 0x8245
-0xE13F = 0x8246
-0xE140 = 0x8247
-0xE141 = 0x8248
-0xE142 = 0x8249
-0xE143 = 0x824A
-0xE144 = 0x824B
-0xE145 = 0x824C
-0xE146 = 0x824D
-0xE147 = 0x824E
-0xE148 = 0x824F
-0xE149 = 0x8250
-0xE14A = 0x8251
-0xE14B = 0x8252
-0xE14C = 0x8253
-0xE14D = 0x8254
-0xE14E = 0x8255
-0xE14F = 0x8256
-0xE150 = 0x8257
-0xE151 = 0x8258
-0xE152 = 0x8259
-0xE153 = 0x825A
-0xE154 = 0x825B
-0xE155 = 0x825C
-0xE156 = 0x825D
-0xE157 = 0x825E
-0xE158 = 0x825F
-0xE159 = 0x8260
-0xE15A = 0x8261
-0xE15B = 0x8262
-0xE15C = 0x8263
-0xE15D = 0x8264
-0xE15E = 0x8265
-0xE15F = 0x8266
-0xE160 = 0x8267
-0xE161 = 0x8268
-0xE162 = 0x8269
-0xE163 = 0x826A
-0xE164 = 0x826B
-0xE165 = 0x826C
-0xE166 = 0x826D
-0xE167 = 0x826E
-0xE168 = 0x826F
-0xE169 = 0x8270
-0xE16A = 0x8271
-0xE16B = 0x8272
-0xE16C = 0x8273
-0xE16D = 0x8274
-0xE16E = 0x8275
-0xE16F = 0x8276
-0xE170 = 0x8277
-0xE171 = 0x8278
-0xE172 = 0x8279
-0xE173 = 0x827A
-0xE174 = 0x827B
-0xE175 = 0x827C
-0xE176 = 0x827D
-0xE177 = 0x827E
-0xE178 = 0x8321
-0xE179 = 0x8322
-0xE17A = 0x8323
-0xE17B = 0x8324
-0xE17C = 0x8325
-0xE17D = 0x8326
-0xE17E = 0x8327
-0xE17F = 0x8328
-0xE180 = 0x8329
-0xE181 = 0x832A
-0xE182 = 0x832B
-0xE183 = 0x832C
-0xE184 = 0x832D
-0xE185 = 0x832E
-0xE186 = 0x832F
-0xE187 = 0x8330
-0xE188 = 0x8331
-0xE189 = 0x8332
-0xE18A = 0x8333
-0xE18B = 0x8334
-0xE18C = 0x8335
-0xE18D = 0x8336
-0xE18E = 0x8337
-0xE18F = 0x8338
-0xE190 = 0x8339
-0xE191 = 0x833A
-0xE192 = 0x833B
-0xE193 = 0x833C
-0xE194 = 0x833D
-0xE195 = 0x833E
-0xE196 = 0x833F
-0xE197 = 0x8340
-0xE198 = 0x8341
-0xE199 = 0x8342
-0xE19A = 0x8343
-0xE19B = 0x8344
-0xE19C = 0x8345
-0xE19D = 0x8346
-0xE19E = 0x8347
-0xE19F = 0x8348
-0xE1A0 = 0x8349
-0xE1A1 = 0x834A
-0xE1A2 = 0x834B
-0xE1A3 = 0x834C
-0xE1A4 = 0x834D
-0xE1A5 = 0x834E
-0xE1A6 = 0x834F
-0xE1A7 = 0x8350
-0xE1A8 = 0x8351
-0xE1A9 = 0x8352
-0xE1AA = 0x8353
-0xE1AB = 0x8354
-0xE1AC = 0x8355
-0xE1AD = 0x8356
-0xE1AE = 0x8357
-0xE1AF = 0x8358
-0xE1B0 = 0x8359
-0xE1B1 = 0x835A
-0xE1B2 = 0x835B
-0xE1B3 = 0x835C
-0xE1B4 = 0x835D
-0xE1B5 = 0x835E
-0xE1B6 = 0x835F
-0xE1B7 = 0x8360
-0xE1B8 = 0x8361
-0xE1B9 = 0x8362
-0xE1BA = 0x8363
-0xE1BB = 0x8364
-0xE1BC = 0x8365
-0xE1BD = 0x8366
-0xE1BE = 0x8367
-0xE1BF = 0x8368
-0xE1C0 = 0x8369
-0xE1C1 = 0x836A
-0xE1C2 = 0x836B
-0xE1C3 = 0x836C
-0xE1C4 = 0x836D
-0xE1C5 = 0x836E
-0xE1C6 = 0x836F
-0xE1C7 = 0x8370
-0xE1C8 = 0x8371
-0xE1C9 = 0x8372
-0xE1CA = 0x8373
-0xE1CB = 0x8374
-0xE1CC = 0x8375
-0xE1CD = 0x8376
-0xE1CE = 0x8377
-0xE1CF = 0x8378
-0xE1D0 = 0x8379
-0xE1D1 = 0x837A
-0xE1D2 = 0x837B
-0xE1D3 = 0x837C
-0xE1D4 = 0x837D
-0xE1D5 = 0x837E
-0xE1D6 = 0x8421
-0xE1D7 = 0x8422
-0xE1D8 = 0x8423
-0xE1D9 = 0x8424
-0xE1DA = 0x8425
-0xE1DB = 0x8426
-0xE1DC = 0x8427
-0xE1DD = 0x8428
-0xE1DE = 0x8429
-0xE1DF = 0x842A
-0xE1E0 = 0x842B
-0xE1E1 = 0x842C
-0xE1E2 = 0x842D
-0xE1E3 = 0x842E
-0xE1E4 = 0x842F
-0xE1E5 = 0x8430
-0xE1E6 = 0x8431
-0xE1E7 = 0x8432
-0xE1E8 = 0x8433
-0xE1E9 = 0x8434
-0xE1EA = 0x8435
-0xE1EB = 0x8436
-0xE1EC = 0x8437
-0xE1ED = 0x8438
-0xE1EE = 0x8439
-0xE1EF = 0x843A
-0xE1F0 = 0x843B
-0xE1F1 = 0x843C
-0xE1F2 = 0x843D
-0xE1F3 = 0x843E
-0xE1F4 = 0x843F
-0xE1F5 = 0x8440
-0xE1F6 = 0x8441
-0xE1F7 = 0x8442
-0xE1F8 = 0x8443
-0xE1F9 = 0x8444
-0xE1FA = 0x8445
-0xE1FB = 0x8446
-0xE1FC = 0x8447
-0xE1FD = 0x8448
-0xE1FE = 0x8449
-0xE1FF = 0x844A
-0xE200 = 0x844B
-0xE201 = 0x844C
-0xE202 = 0x844D
-0xE203 = 0x844E
-0xE204 = 0x844F
-0xE205 = 0x8450
-0xE206 = 0x8451
-0xE207 = 0x8452
-0xE208 = 0x8453
-0xE209 = 0x8454
-0xE20A = 0x8455
-0xE20B = 0x8456
-0xE20C = 0x8457
-0xE20D = 0x8458
-0xE20E = 0x8459
-0xE20F = 0x845A
-0xE210 = 0x845B
-0xE211 = 0x845C
-0xE212 = 0x845D
-0xE213 = 0x845E
-0xE214 = 0x845F
-0xE215 = 0x8460
-0xE216 = 0x8461
-0xE217 = 0x8462
-0xE218 = 0x8463
-0xE219 = 0x8464
-0xE21A = 0x8465
-0xE21B = 0x8466
-0xE21C = 0x8467
-0xE21D = 0x8468
-0xE21E = 0x8469
-0xE21F = 0x846A
-0xE220 = 0x846B
-0xE221 = 0x846C
-0xE222 = 0x846D
-0xE223 = 0x846E
-0xE224 = 0x846F
-0xE225 = 0x8470
-0xE226 = 0x8471
-0xE227 = 0x8472
-0xE228 = 0x8473
-0xE229 = 0x8474
-0xE22A = 0x8475
-0xE22B = 0x8476
-0xE22C = 0x8477
-0xE22D = 0x8478
-0xE22E = 0x8479
-0xE22F = 0x847A
-0xE230 = 0x847B
-0xE231 = 0x847C
-0xE232 = 0x847D
-0xE233 = 0x847E
-0xE234 = 0x8521
-0xE235 = 0x8522
-0xE236 = 0x8523
-0xE237 = 0x8524
-0xE238 = 0x8525
-0xE239 = 0x8526
-0xE23A = 0x8527
-0xE23B = 0x8528
-0xE23C = 0x8529
-0xE23D = 0x852A
-0xE23E = 0x852B
-0xE23F = 0x852C
-0xE240 = 0x852D
-0xE241 = 0x852E
-0xE242 = 0x852F
-0xE243 = 0x8530
-0xE244 = 0x8531
-0xE245 = 0x8532
-0xE246 = 0x8533
-0xE247 = 0x8534
-0xE248 = 0x8535
-0xE249 = 0x8536
-0xE24A = 0x8537
-0xE24B = 0x8538
-0xE24C = 0x8539
-0xE24D = 0x853A
-0xE24E = 0x853B
-0xE24F = 0x853C
-0xE250 = 0x853D
-0xE251 = 0x853E
-0xE252 = 0x853F
-0xE253 = 0x8540
-0xE254 = 0x8541
-0xE255 = 0x8542
-0xE256 = 0x8543
-0xE257 = 0x8544
-0xE258 = 0x8545
-0xE259 = 0x8546
-0xE25A = 0x8547
-0xE25B = 0x8548
-0xE25C = 0x8549
-0xE25D = 0x854A
-0xE25E = 0x854B
-0xE25F = 0x854C
-0xE260 = 0x854D
-0xE261 = 0x854E
-0xE262 = 0x854F
-0xE263 = 0x8550
-0xE264 = 0x8551
-0xE265 = 0x8552
-0xE266 = 0x8553
-0xE267 = 0x8554
-0xE268 = 0x8555
-0xE269 = 0x8556
-0xE26A = 0x8557
-0xE26B = 0x8558
-0xE26C = 0x8559
-0xE26D = 0x855A
-0xE26E = 0x855B
-0xE26F = 0x855C
-0xE270 = 0x855D
-0xE271 = 0x855E
-0xE272 = 0x855F
-0xE273 = 0x8560
-0xE274 = 0x8561
-0xE275 = 0x8562
-0xE276 = 0x8563
-0xE277 = 0x8564
-0xE278 = 0x8565
-0xE279 = 0x8566
-0xE27A = 0x8567
-0xE27B = 0x8568
-0xE27C = 0x8569
-0xE27D = 0x856A
-0xE27E = 0x856B
-0xE27F = 0x856C
-0xE280 = 0x856D
-0xE281 = 0x856E
-0xE282 = 0x856F
-0xE283 = 0x8570
-0xE284 = 0x8571
-0xE285 = 0x8572
-0xE286 = 0x8573
-0xE287 = 0x8574
-0xE288 = 0x8575
-0xE289 = 0x8576
-0xE28A = 0x8577
-0xE28B = 0x8578
-0xE28C = 0x8579
-0xE28D = 0x857A
-0xE28E = 0x857B
-0xE28F = 0x857C
-0xE290 = 0x857D
-0xE291 = 0x857E
-0xE292 = 0x8621
-0xE293 = 0x8622
-0xE294 = 0x8623
-0xE295 = 0x8624
-0xE296 = 0x8625
-0xE297 = 0x8626
-0xE298 = 0x8627
-0xE299 = 0x8628
-0xE29A = 0x8629
-0xE29B = 0x862A
-0xE29C = 0x862B
-0xE29D = 0x862C
-0xE29E = 0x862D
-0xE29F = 0x862E
-0xE2A0 = 0x862F
-0xE2A1 = 0x8630
-0xE2A2 = 0x8631
-0xE2A3 = 0x8632
-0xE2A4 = 0x8633
-0xE2A5 = 0x8634
-0xE2A6 = 0x8635
-0xE2A7 = 0x8636
-0xE2A8 = 0x8637
-0xE2A9 = 0x8638
-0xE2AA = 0x8639
-0xE2AB = 0x863A
-0xE2AC = 0x863B
-0xE2AD = 0x863C
-0xE2AE = 0x863D
-0xE2AF = 0x863E
-0xE2B0 = 0x863F
-0xE2B1 = 0x8640
-0xE2B2 = 0x8641
-0xE2B3 = 0x8642
-0xE2B4 = 0x8643
-0xE2B5 = 0x8644
-0xE2B6 = 0x8645
-0xE2B7 = 0x8646
-0xE2B8 = 0x8647
-0xE2B9 = 0x8648
-0xE2BA = 0x8649
-0xE2BB = 0x864A
-0xE2BC = 0x864B
-0xE2BD = 0x864C
-0xE2BE = 0x864D
-0xE2BF = 0x864E
-0xE2C0 = 0x864F
-0xE2C1 = 0x8650
-0xE2C2 = 0x8651
-0xE2C3 = 0x8652
-0xE2C4 = 0x8653
-0xE2C5 = 0x8654
-0xE2C6 = 0x8655
-0xE2C7 = 0x8656
-0xE2C8 = 0x8657
-0xE2C9 = 0x8658
-0xE2CA = 0x8659
-0xE2CB = 0x865A
-0xE2CC = 0x865B
-0xE2CD = 0x865C
-0xE2CE = 0x865D
-0xE2CF = 0x865E
-0xE2D0 = 0x865F
-0xE2D1 = 0x8660
-0xE2D2 = 0x8661
-0xE2D3 = 0x8662
-0xE2D4 = 0x8663
-0xE2D5 = 0x8664
-0xE2D6 = 0x8665
-0xE2D7 = 0x8666
-0xE2D8 = 0x8667
-0xE2D9 = 0x8668
-0xE2DA = 0x8669
-0xE2DB = 0x866A
-0xE2DC = 0x866B
-0xE2DD = 0x866C
-0xE2DE = 0x866D
-0xE2DF = 0x866E
-0xE2E0 = 0x866F
-0xE2E1 = 0x8670
-0xE2E2 = 0x8671
-0xE2E3 = 0x8672
-0xE2E4 = 0x8673
-0xE2E5 = 0x8674
-0xE2E6 = 0x8675
-0xE2E7 = 0x8676
-0xE2E8 = 0x8677
-0xE2E9 = 0x8678
-0xE2EA = 0x8679
-0xE2EB = 0x867A
-0xE2EC = 0x867B
-0xE2ED = 0x867C
-0xE2EE = 0x867D
-0xE2EF = 0x867E
-0xE2F0 = 0x8721
-0xE2F1 = 0x8722
-0xE2F2 = 0x8723
-0xE2F3 = 0x8724
-0xE2F4 = 0x8725
-0xE2F5 = 0x8726
-0xE2F6 = 0x8727
-0xE2F7 = 0x8728
-0xE2F8 = 0x8729
-0xE2F9 = 0x872A
-0xE2FA = 0x872B
-0xE2FB = 0x872C
-0xE2FC = 0x872D
-0xE2FD = 0x872E
-0xE2FE = 0x872F
-0xE2FF = 0x8730
-0xE300 = 0x8731
-0xE301 = 0x8732
-0xE302 = 0x8733
-0xE303 = 0x8734
-0xE304 = 0x8735
-0xE305 = 0x8736
-0xE306 = 0x8737
-0xE307 = 0x8738
-0xE308 = 0x8739
-0xE309 = 0x873A
-0xE30A = 0x873B
-0xE30B = 0x873C
-0xE30C = 0x873D
-0xE30D = 0x873E
-0xE30E = 0x873F
-0xE30F = 0x8740
-0xE310 = 0x8741
-0xE311 = 0x8742
-0xE312 = 0x8743
-0xE313 = 0x8744
-0xE314 = 0x8745
-0xE315 = 0x8746
-0xE316 = 0x8747
-0xE317 = 0x8748
-0xE318 = 0x8749
-0xE319 = 0x874A
-0xE31A = 0x874B
-0xE31B = 0x874C
-0xE31C = 0x874D
-0xE31D = 0x874E
-0xE31E = 0x874F
-0xE31F = 0x8750
-0xE320 = 0x8751
-0xE321 = 0x8752
-0xE322 = 0x8753
-0xE323 = 0x8754
-0xE324 = 0x8755
-0xE325 = 0x8756
-0xE326 = 0x8757
-0xE327 = 0x8758
-0xE328 = 0x8759
-0xE329 = 0x875A
-0xE32A = 0x875B
-0xE32B = 0x875C
-0xE32C = 0x875D
-0xE32D = 0x875E
-0xE32E = 0x875F
-0xE32F = 0x8760
-0xE330 = 0x8761
-0xE331 = 0x8762
-0xE332 = 0x8763
-0xE333 = 0x8764
-0xE334 = 0x8765
-0xE335 = 0x8766
-0xE336 = 0x8767
-0xE337 = 0x8768
-0xE338 = 0x8769
-0xE339 = 0x876A
-0xE33A = 0x876B
-0xE33B = 0x876C
-0xE33C = 0x876D
-0xE33D = 0x876E
-0xE33E = 0x876F
-0xE33F = 0x8770
-0xE340 = 0x8771
-0xE341 = 0x8772
-0xE342 = 0x8773
-0xE343 = 0x8774
-0xE344 = 0x8775
-0xE345 = 0x8776
-0xE346 = 0x8777
-0xE347 = 0x8778
-0xE348 = 0x8779
-0xE349 = 0x877A
-0xE34A = 0x877B
-0xE34B = 0x877C
-0xE34C = 0x877D
-0xE34D = 0x877E
-0xE34E = 0x8821
-0xE34F = 0x8822
-0xE350 = 0x8823
-0xE351 = 0x8824
-0xE352 = 0x8825
-0xE353 = 0x8826
-0xE354 = 0x8827
-0xE355 = 0x8828
-0xE356 = 0x8829
-0xE357 = 0x882A
-0xE358 = 0x882B
-0xE359 = 0x882C
-0xE35A = 0x882D
-0xE35B = 0x882E
-0xE35C = 0x882F
-0xE35D = 0x8830
-0xE35E = 0x8831
-0xE35F = 0x8832
-0xE360 = 0x8833
-0xE361 = 0x8834
-0xE362 = 0x8835
-0xE363 = 0x8836
-0xE364 = 0x8837
-0xE365 = 0x8838
-0xE366 = 0x8839
-0xE367 = 0x883A
-0xE368 = 0x883B
-0xE369 = 0x883C
-0xE36A = 0x883D
-0xE36B = 0x883E
-0xE36C = 0x883F
-0xE36D = 0x8840
-0xE36E = 0x8841
-0xE36F = 0x8842
-0xE370 = 0x8843
-0xE371 = 0x8844
-0xE372 = 0x8845
-0xE373 = 0x8846
-0xE374 = 0x8847
-0xE375 = 0x8848
-0xE376 = 0x8849
-0xE377 = 0x884A
-0xE378 = 0x884B
-0xE379 = 0x884C
-0xE37A = 0x884D
-0xE37B = 0x884E
-0xE37C = 0x884F
-0xE37D = 0x8850
-0xE37E = 0x8851
-0xE37F = 0x8852
-0xE380 = 0x8853
-0xE381 = 0x8854
-0xE382 = 0x8855
-0xE383 = 0x8856
-0xE384 = 0x8857
-0xE385 = 0x8858
-0xE386 = 0x8859
-0xE387 = 0x885A
-0xE388 = 0x885B
-0xE389 = 0x885C
-0xE38A = 0x885D
-0xE38B = 0x885E
-0xE38C = 0x885F
-0xE38D = 0x8860
-0xE38E = 0x8861
-0xE38F = 0x8862
-0xE390 = 0x8863
-0xE391 = 0x8864
-0xE392 = 0x8865
-0xE393 = 0x8866
-0xE394 = 0x8867
-0xE395 = 0x8868
-0xE396 = 0x8869
-0xE397 = 0x886A
-0xE398 = 0x886B
-0xE399 = 0x886C
-0xE39A = 0x886D
-0xE39B = 0x886E
-0xE39C = 0x886F
-0xE39D = 0x8870
-0xE39E = 0x8871
-0xE39F = 0x8872
-0xE3A0 = 0x8873
-0xE3A1 = 0x8874
-0xE3A2 = 0x8875
-0xE3A3 = 0x8876
-0xE3A4 = 0x8877
-0xE3A5 = 0x8878
-0xE3A6 = 0x8879
-0xE3A7 = 0x887A
-0xE3A8 = 0x887B
-0xE3A9 = 0x887C
-0xE3AA = 0x887D
-0xE3AB = 0x887E
-0xE3AC = 0x8921
-0xE3AD = 0x8922
-0xE3AE = 0x8923
-0xE3AF = 0x8924
-0xE3B0 = 0x8925
-0xE3B1 = 0x8926
-0xE3B2 = 0x8927
-0xE3B3 = 0x8928
-0xE3B4 = 0x8929
-0xE3B5 = 0x892A
-0xE3B6 = 0x892B
-0xE3B7 = 0x892C
-0xE3B8 = 0x892D
-0xE3B9 = 0x892E
-0xE3BA = 0x892F
-0xE3BB = 0x8930
-0xE3BC = 0x8931
-0xE3BD = 0x8932
-0xE3BE = 0x8933
-0xE3BF = 0x8934
-0xE3C0 = 0x8935
-0xE3C1 = 0x8936
-0xE3C2 = 0x8937
-0xE3C3 = 0x8938
-0xE3C4 = 0x8939
-0xE3C5 = 0x893A
-0xE3C6 = 0x893B
-0xE3C7 = 0x893C
-0xE3C8 = 0x893D
-0xE3C9 = 0x893E
-0xE3CA = 0x893F
-0xE3CB = 0x8940
-0xE3CC = 0x8941
-0xE3CD = 0x8942
-0xE3CE = 0x8943
-0xE3CF = 0x8944
-0xE3D0 = 0x8945
-0xE3D1 = 0x8946
-0xE3D2 = 0x8947
-0xE3D3 = 0x8948
-0xE3D4 = 0x8949
-0xE3D5 = 0x894A
-0xE3D6 = 0x894B
-0xE3D7 = 0x894C
-0xE3D8 = 0x894D
-0xE3D9 = 0x894E
-0xE3DA = 0x894F
-0xE3DB = 0x8950
-0xE3DC = 0x8951
-0xE3DD = 0x8952
-0xE3DE = 0x8953
-0xE3DF = 0x8954
-0xE3E0 = 0x8955
-0xE3E1 = 0x8956
-0xE3E2 = 0x8957
-0xE3E3 = 0x8958
-0xE3E4 = 0x8959
-0xE3E5 = 0x895A
-0xE3E6 = 0x895B
-0xE3E7 = 0x895C
-0xE3E8 = 0x895D
-0xE3E9 = 0x895E
-0xE3EA = 0x895F
-0xE3EB = 0x8960
-0xE3EC = 0x8961
-0xE3ED = 0x8962
-0xE3EE = 0x8963
-0xE3EF = 0x8964
-0xE3F0 = 0x8965
-0xE3F1 = 0x8966
-0xE3F2 = 0x8967
-0xE3F3 = 0x8968
-0xE3F4 = 0x8969
-0xE3F5 = 0x896A
-0xE3F6 = 0x896B
-0xE3F7 = 0x896C
-0xE3F8 = 0x896D
-0xE3F9 = 0x896E
-0xE3FA = 0x896F
-0xE3FB = 0x8970
-0xE3FC = 0x8971
-0xE3FD = 0x8972
-0xE3FE = 0x8973
-0xE3FF = 0x8974
-0xE400 = 0x8975
-0xE401 = 0x8976
-0xE402 = 0x8977
-0xE403 = 0x8978
-0xE404 = 0x8979
-0xE405 = 0x897A
-0xE406 = 0x897B
-0xE407 = 0x897C
-0xE408 = 0x897D
-0xE409 = 0x897E
-0xE40A = 0x8A21
-0xE40B = 0x8A22
-0xE40C = 0x8A23
-0xE40D = 0x8A24
-0xE40E = 0x8A25
-0xE40F = 0x8A26
-0xE410 = 0x8A27
-0xE411 = 0x8A28
-0xE412 = 0x8A29
-0xE413 = 0x8A2A
-0xE414 = 0x8A2B
-0xE415 = 0x8A2C
-0xE416 = 0x8A2D
-0xE417 = 0x8A2E
-0xE418 = 0x8A2F
-0xE419 = 0x8A30
-0xE41A = 0x8A31
-0xE41B = 0x8A32
-0xE41C = 0x8A33
-0xE41D = 0x8A34
-0xE41E = 0x8A35
-0xE41F = 0x8A36
-0xE420 = 0x8A37
-0xE421 = 0x8A38
-0xE422 = 0x8A39
-0xE423 = 0x8A3A
-0xE424 = 0x8A3B
-0xE425 = 0x8A3C
-0xE426 = 0x8A3D
-0xE427 = 0x8A3E
-0xE428 = 0x8A3F
-0xE429 = 0x8A40
-0xE42A = 0x8A41
-0xE42B = 0x8A42
-0xE42C = 0x8A43
-0xE42D = 0x8A44
-0xE42E = 0x8A45
-0xE42F = 0x8A46
-0xE430 = 0x8A47
-0xE431 = 0x8A48
-0xE432 = 0x8A49
-0xE433 = 0x8A4A
-0xE434 = 0x8A4B
-0xE435 = 0x8A4C
-0xE436 = 0x8A4D
-0xE437 = 0x8A4E
-0xE438 = 0x8A4F
-0xE439 = 0x8A50
-0xE43A = 0x8A51
-0xE43B = 0x8A52
-0xE43C = 0x8A53
-0xE43D = 0x8A54
-0xE43E = 0x8A55
-0xE43F = 0x8A56
-0xE440 = 0x8A57
-0xE441 = 0x8A58
-0xE442 = 0x8A59
-0xE443 = 0x8A5A
-0xE444 = 0x8A5B
-0xE445 = 0x8A5C
-0xE446 = 0x8A5D
-0xE447 = 0x8A5E
-0xE448 = 0x8A5F
-0xE449 = 0x8A60
-0xE44A = 0x8A61
-0xE44B = 0x8A62
-0xE44C = 0x8A63
-0xE44D = 0x8A64
-0xE44E = 0x8A65
-0xE44F = 0x8A66
-0xE450 = 0x8A67
-0xE451 = 0x8A68
-0xE452 = 0x8A69
-0xE453 = 0x8A6A
-0xE454 = 0x8A6B
-0xE455 = 0x8A6C
-0xE456 = 0x8A6D
-0xE457 = 0x8A6E
-0xE458 = 0x8A6F
-0xE459 = 0x8A70
-0xE45A = 0x8A71
-0xE45B = 0x8A72
-0xE45C = 0x8A73
-0xE45D = 0x8A74
-0xE45E = 0x8A75
-0xE45F = 0x8A76
-0xE460 = 0x8A77
-0xE461 = 0x8A78
-0xE462 = 0x8A79
-0xE463 = 0x8A7A
-0xE464 = 0x8A7B
-0xE465 = 0x8A7C
-0xE466 = 0x8A7D
-0xE467 = 0x8A7E
-0xE468 = 0x8B21
-0xE469 = 0x8B22
-0xE46A = 0x8B23
-0xE46B = 0x8B24
-0xE46C = 0x8B25
-0xE46D = 0x8B26
-0xE46E = 0x8B27
-0xE46F = 0x8B28
-0xE470 = 0x8B29
-0xE471 = 0x8B2A
-0xE472 = 0x8B2B
-0xE473 = 0x8B2C
-0xE474 = 0x8B2D
-0xE475 = 0x8B2E
-0xE476 = 0x8B2F
-0xE477 = 0x8B30
-0xE478 = 0x8B31
-0xE479 = 0x8B32
-0xE47A = 0x8B33
-0xE47B = 0x8B34
-0xE47C = 0x8B35
-0xE47D = 0x8B36
-0xE47E = 0x8B37
-0xE47F = 0x8B38
-0xE480 = 0x8B39
-0xE481 = 0x8B3A
-0xE482 = 0x8B3B
-0xE483 = 0x8B3C
-0xE484 = 0x8B3D
-0xE485 = 0x8B3E
-0xE486 = 0x8B3F
-0xE487 = 0x8B40
-0xE488 = 0x8B41
-0xE489 = 0x8B42
-0xE48A = 0x8B43
-0xE48B = 0x8B44
-0xE48C = 0x8B45
-0xE48D = 0x8B46
-0xE48E = 0x8B47
-0xE48F = 0x8B48
-0xE490 = 0x8B49
-0xE491 = 0x8B4A
-0xE492 = 0x8B4B
-0xE493 = 0x8B4C
-0xE494 = 0x8B4D
-0xE495 = 0x8B4E
-0xE496 = 0x8B4F
-0xE497 = 0x8B50
-0xE498 = 0x8B51
-0xE499 = 0x8B52
-0xE49A = 0x8B53
-0xE49B = 0x8B54
-0xE49C = 0x8B55
-0xE49D = 0x8B56
-0xE49E = 0x8B57
-0xE49F = 0x8B58
-0xE4A0 = 0x8B59
-0xE4A1 = 0x8B5A
-0xE4A2 = 0x8B5B
-0xE4A3 = 0x8B5C
-0xE4A4 = 0x8B5D
-0xE4A5 = 0x8B5E
-0xE4A6 = 0x8B5F
-0xE4A7 = 0x8B60
-0xE4A8 = 0x8B61
-0xE4A9 = 0x8B62
-0xE4AA = 0x8B63
-0xE4AB = 0x8B64
-0xE4AC = 0x8B65
-0xE4AD = 0x8B66
-0xE4AE = 0x8B67
-0xE4AF = 0x8B68
-0xE4B0 = 0x8B69
-0xE4B1 = 0x8B6A
-0xE4B2 = 0x8B6B
-0xE4B3 = 0x8B6C
-0xE4B4 = 0x8B6D
-0xE4B5 = 0x8B6E
-0xE4B6 = 0x8B6F
-0xE4B7 = 0x8B70
-0xE4B8 = 0x8B71
-0xE4B9 = 0x8B72
-0xE4BA = 0x8B73
-0xE4BB = 0x8B74
-0xE4BC = 0x8B75
-0xE4BD = 0x8B76
-0xE4BE = 0x8B77
-0xE4BF = 0x8B78
-0xE4C0 = 0x8B79
-0xE4C1 = 0x8B7A
-0xE4C2 = 0x8B7B
-0xE4C3 = 0x8B7C
-0xE4C4 = 0x8B7D
-0xE4C5 = 0x8B7E
-0xE4C6 = 0x8C21
-0xE4C7 = 0x8C22
-0xE4C8 = 0x8C23
-0xE4C9 = 0x8C24
-0xE4CA = 0x8C25
-0xE4CB = 0x8C26
-0xE4CC = 0x8C27
-0xE4CD = 0x8C28
-0xE4CE = 0x8C29
-0xE4CF = 0x8C2A
-0xE4D0 = 0x8C2B
-0xE4D1 = 0x8C2C
-0xE4D2 = 0x8C2D
-0xE4D3 = 0x8C2E
-0xE4D4 = 0x8C2F
-0xE4D5 = 0x8C30
-0xE4D6 = 0x8C31
-0xE4D7 = 0x8C32
-0xE4D8 = 0x8C33
-0xE4D9 = 0x8C34
-0xE4DA = 0x8C35
-0xE4DB = 0x8C36
-0xE4DC = 0x8C37
-0xE4DD = 0x8C38
-0xE4DE = 0x8C39
-0xE4DF = 0x8C3A
-0xE4E0 = 0x8C3B
-0xE4E1 = 0x8C3C
-0xE4E2 = 0x8C3D
-0xE4E3 = 0x8C3E
-0xE4E4 = 0x8C3F
-0xE4E5 = 0x8C40
-0xE4E6 = 0x8C41
-0xE4E7 = 0x8C42
-0xE4E8 = 0x8C43
-0xE4E9 = 0x8C44
-0xE4EA = 0x8C45
-0xE4EB = 0x8C46
-0xE4EC = 0x8C47
-0xE4ED = 0x8C48
-0xE4EE = 0x8C49
-0xE4EF = 0x8C4A
-0xE4F0 = 0x8C4B
-0xE4F1 = 0x8C4C
-0xE4F2 = 0x8C4D
-0xE4F3 = 0x8C4E
-0xE4F4 = 0x8C4F
-0xE4F5 = 0x8C50
-0xE4F6 = 0x8C51
-0xE4F7 = 0x8C52
-0xE4F8 = 0x8C53
-0xE4F9 = 0x8C54
-0xE4FA = 0x8C55
-0xE4FB = 0x8C56
-0xE4FC = 0x8C57
-0xE4FD = 0x8C58
-0xE4FE = 0x8C59
-0xE4FF = 0x8C5A
-0xE500 = 0x8C5B
-0xE501 = 0x8C5C
-0xE502 = 0x8C5D
-0xE503 = 0x8C5E
-0xE504 = 0x8C5F
-0xE505 = 0x8C60
-0xE506 = 0x8C61
-0xE507 = 0x8C62
-0xE508 = 0x8C63
-0xE509 = 0x8C64
-0xE50A = 0x8C65
-0xE50B = 0x8C66
-0xE50C = 0x8C67
-0xE50D = 0x8C68
-0xE50E = 0x8C69
-0xE50F = 0x8C6A
-0xE510 = 0x8C6B
-0xE511 = 0x8C6C
-0xE512 = 0x8C6D
-0xE513 = 0x8C6E
-0xE514 = 0x8C6F
-0xE515 = 0x8C70
-0xE516 = 0x8C71
-0xE517 = 0x8C72
-0xE518 = 0x8C73
-0xE519 = 0x8C74
-0xE51A = 0x8C75
-0xE51B = 0x8C76
-0xE51C = 0x8C77
-0xE51D = 0x8C78
-0xE51E = 0x8C79
-0xE51F = 0x8C7A
-0xE520 = 0x8C7B
-0xE521 = 0x8C7C
-0xE522 = 0x8C7D
-0xE523 = 0x8C7E
-0xE524 = 0x8D21
-0xE525 = 0x8D22
-0xE526 = 0x8D23
-0xE527 = 0x8D24
-0xE528 = 0x8D25
-0xE529 = 0x8D26
-0xE52A = 0x8D27
-0xE52B = 0x8D28
-0xE52C = 0x8D29
-0xE52D = 0x8D2A
-0xE52E = 0x8D2B
-0xE52F = 0x8D2C
-0xE530 = 0x8D2D
-0xE531 = 0x8D2E
-0xE532 = 0x8D2F
-0xE533 = 0x8D30
-0xE534 = 0x8D31
-0xE535 = 0x8D32
-0xE536 = 0x8D33
-0xE537 = 0x8D34
-0xE538 = 0x8D35
-0xE539 = 0x8D36
-0xE53A = 0x8D37
-0xE53B = 0x8D38
-0xE53C = 0x8D39
-0xE53D = 0x8D3A
-0xE53E = 0x8D3B
-0xE53F = 0x8D3C
-0xE540 = 0x8D3D
-0xE541 = 0x8D3E
-0xE542 = 0x8D3F
-0xE543 = 0x8D40
-0xE544 = 0x8D41
-0xE545 = 0x8D42
-0xE546 = 0x8D43
-0xE547 = 0x8D44
-0xE548 = 0x8D45
-0xE549 = 0x8D46
-0xE54A = 0x8D47
-0xE54B = 0x8D48
-0xE54C = 0x8D49
-0xE54D = 0x8D4A
-0xE54E = 0x8D4B
-0xE54F = 0x8D4C
-0xE550 = 0x8D4D
-0xE551 = 0x8D4E
-0xE552 = 0x8D4F
-0xE553 = 0x8D50
-0xE554 = 0x8D51
-0xE555 = 0x8D52
-0xE556 = 0x8D53
-0xE557 = 0x8D54
-0xE558 = 0x8D55
-0xE559 = 0x8D56
-0xE55A = 0x8D57
-0xE55B = 0x8D58
-0xE55C = 0x8D59
-0xE55D = 0x8D5A
-0xE55E = 0x8D5B
-0xE55F = 0x8D5C
-0xE560 = 0x8D5D
-0xE561 = 0x8D5E
-0xE562 = 0x8D5F
-0xE563 = 0x8D60
-0xE564 = 0x8D61
-0xE565 = 0x8D62
-0xE566 = 0x8D63
-0xE567 = 0x8D64
-0xE568 = 0x8D65
-0xE569 = 0x8D66
-0xE56A = 0x8D67
-0xE56B = 0x8D68
-0xE56C = 0x8D69
-0xE56D = 0x8D6A
-0xE56E = 0x8D6B
-0xE56F = 0x8D6C
-0xE570 = 0x8D6D
-0xE571 = 0x8D6E
-0xE572 = 0x8D6F
-0xE573 = 0x8D70
-0xE574 = 0x8D71
-0xE575 = 0x8D72
-0xE576 = 0x8D73
-0xE577 = 0x8D74
-0xE578 = 0x8D75
-0xE579 = 0x8D76
-0xE57A = 0x8D77
-0xE57B = 0x8D78
-0xE57C = 0x8D79
-0xE57D = 0x8D7A
-0xE57E = 0x8D7B
-0xE57F = 0x8D7C
-0xE580 = 0x8D7D
-0xE581 = 0x8D7E
-0xE582 = 0x8E21
-0xE583 = 0x8E22
-0xE584 = 0x8E23
-0xE585 = 0x8E24
-0xE586 = 0x8E25
-0xE587 = 0x8E26
-0xE588 = 0x8E27
-0xE589 = 0x8E28
-0xE58A = 0x8E29
-0xE58B = 0x8E2A
-0xE58C = 0x8E2B
-0xE58D = 0x8E2C
-0xE58E = 0x8E2D
-0xE58F = 0x8E2E
-0xE590 = 0x8E2F
-0xE591 = 0x8E30
-0xE592 = 0x8E31
-0xE593 = 0x8E32
-0xE594 = 0x8E33
-0xE595 = 0x8E34
-0xE596 = 0x8E35
-0xE597 = 0x8E36
-0xE598 = 0x8E37
-0xE599 = 0x8E38
-0xE59A = 0x8E39
-0xE59B = 0x8E3A
-0xE59C = 0x8E3B
-0xE59D = 0x8E3C
-0xE59E = 0x8E3D
-0xE59F = 0x8E3E
-0xE5A0 = 0x8E3F
-0xE5A1 = 0x8E40
-0xE5A2 = 0x8E41
-0xE5A3 = 0x8E42
-0xE5A4 = 0x8E43
-0xE5A5 = 0x8E44
-0xE5A6 = 0x8E45
-0xE5A7 = 0x8E46
-0xE5A8 = 0x8E47
-0xE5A9 = 0x8E48
-0xE5AA = 0x8E49
-0xE5AB = 0x8E4A
-0xE5AC = 0x8E4B
-0xE5AD = 0x8E4C
-0xE5AE = 0x8E4D
-0xE5AF = 0x8E4E
-0xE5B0 = 0x8E4F
-0xE5B1 = 0x8E50
-0xE5B2 = 0x8E51
-0xE5B3 = 0x8E52
-0xE5B4 = 0x8E53
-0xE5B5 = 0x8E54
-0xE5B6 = 0x8E55
-0xE5B7 = 0x8E56
-0xE5B8 = 0x8E57
-0xE5B9 = 0x8E58
-0xE5BA = 0x8E59
-0xE5BB = 0x8E5A
-0xE5BC = 0x8E5B
-0xE5BD = 0x8E5C
-0xE5BE = 0x8E5D
-0xE5BF = 0x8E5E
-0xE5C0 = 0x8E5F
-0xE5C1 = 0x8E60
-0xE5C2 = 0x8E61
-0xE5C3 = 0x8E62
-0xE5C4 = 0x8E63
-0xE5C5 = 0x8E64
-0xE5C6 = 0x8E65
-0xE5C7 = 0x8E66
-0xE5C8 = 0x8E67
-0xE5C9 = 0x8E68
-0xE5CA = 0x8E69
-0xE5CB = 0x8E6A
-0xE5CC = 0x8E6B
-0xE5CD = 0x8E6C
-0xE5CE = 0x8E6D
-0xE5CF = 0x8E6E
-0xE5D0 = 0x8E6F
-0xE5D1 = 0x8E70
-0xE5D2 = 0x8E71
-0xE5D3 = 0x8E72
-0xE5D4 = 0x8E73
-0xE5D5 = 0x8E74
-0xE5D6 = 0x8E75
-0xE5D7 = 0x8E76
-0xE5D8 = 0x8E77
-0xE5D9 = 0x8E78
-0xE5DA = 0x8E79
-0xE5DB = 0x8E7A
-0xE5DC = 0x8E7B
-0xE5DD = 0x8E7C
-0xE5DE = 0x8E7D
-0xE5DF = 0x8E7E
-0xE5E0 = 0x8F21
-0xE5E1 = 0x8F22
-0xE5E2 = 0x8F23
-0xE5E3 = 0x8F24
-0xE5E4 = 0x8F25
-0xE5E5 = 0x8F26
-0xE5E6 = 0x8F27
-0xE5E7 = 0x8F28
-0xE5E8 = 0x8F29
-0xE5E9 = 0x8F2A
-0xE5EA = 0x8F2B
-0xE5EB = 0x8F2C
-0xE5EC = 0x8F2D
-0xE5ED = 0x8F2E
-0xE5EE = 0x8F2F
-0xE5EF = 0x8F30
-0xE5F0 = 0x8F31
-0xE5F1 = 0x8F32
-0xE5F2 = 0x8F33
-0xE5F3 = 0x8F34
-0xE5F4 = 0x8F35
-0xE5F5 = 0x8F36
-0xE5F6 = 0x8F37
-0xE5F7 = 0x8F38
-0xE5F8 = 0x8F39
-0xE5F9 = 0x8F3A
-0xE5FA = 0x8F3B
-0xE5FB = 0x8F3C
-0xE5FC = 0x8F3D
-0xE5FD = 0x8F3E
-0xE5FE = 0x8F3F
-0xE5FF = 0x8F40
-0xE600 = 0x8F41
-0xE601 = 0x8F42
-0xE602 = 0x8F43
-0xE603 = 0x8F44
-0xE604 = 0x8F45
-0xE605 = 0x8F46
-0xE606 = 0x8F47
-0xE607 = 0x8F48
-0xE608 = 0x8F49
-0xE609 = 0x8F4A
-0xE60A = 0x8F4B
-0xE60B = 0x8F4C
-0xE60C = 0x8F4D
-0xE60D = 0x8F4E
-0xE60E = 0x8F4F
-0xE60F = 0x8F50
-0xE610 = 0x8F51
-0xE611 = 0x8F52
-0xE612 = 0x8F53
-0xE613 = 0x8F54
-0xE614 = 0x8F55
-0xE615 = 0x8F56
-0xE616 = 0x8F57
-0xE617 = 0x8F58
-0xE618 = 0x8F59
-0xE619 = 0x8F5A
-0xE61A = 0x8F5B
-0xE61B = 0x8F5C
-0xE61C = 0x8F5D
-0xE61D = 0x8F5E
-0xE61E = 0x8F5F
-0xE61F = 0x8F60
-0xE620 = 0x8F61
-0xE621 = 0x8F62
-0xE622 = 0x8F63
-0xE623 = 0x8F64
-0xE624 = 0x8F65
-0xE625 = 0x8F66
-0xE626 = 0x8F67
-0xE627 = 0x8F68
-0xE628 = 0x8F69
-0xE629 = 0x8F6A
-0xE62A = 0x8F6B
-0xE62B = 0x8F6C
-0xE62C = 0x8F6D
-0xE62D = 0x8F6E
-0xE62E = 0x8F6F
-0xE62F = 0x8F70
-0xE630 = 0x8F71
-0xE631 = 0x8F72
-0xE632 = 0x8F73
-0xE633 = 0x8F74
-0xE634 = 0x8F75
-0xE635 = 0x8F76
-0xE636 = 0x8F77
-0xE637 = 0x8F78
-0xE638 = 0x8F79
-0xE639 = 0x8F7A
-0xE63A = 0x8F7B
-0xE63B = 0x8F7C
-0xE63C = 0x8F7D
-0xE63D = 0x8F7E
-0xE63E = 0x9021
-0xE63F = 0x9022
-0xE640 = 0x9023
-0xE641 = 0x9024
-0xE642 = 0x9025
-0xE643 = 0x9026
-0xE644 = 0x9027
-0xE645 = 0x9028
-0xE646 = 0x9029
-0xE647 = 0x902A
-0xE648 = 0x902B
-0xE649 = 0x902C
-0xE64A = 0x902D
-0xE64B = 0x902E
-0xE64C = 0x902F
-0xE64D = 0x9030
-0xE64E = 0x9031
-0xE64F = 0x9032
-0xE650 = 0x9033
-0xE651 = 0x9034
-0xE652 = 0x9035
-0xE653 = 0x9036
-0xE654 = 0x9037
-0xE655 = 0x9038
-0xE656 = 0x9039
-0xE657 = 0x903A
-0xE658 = 0x903B
-0xE659 = 0x903C
-0xE65A = 0x903D
-0xE65B = 0x903E
-0xE65C = 0x903F
-0xE65D = 0x9040
-0xE65E = 0x9041
-0xE65F = 0x9042
-0xE660 = 0x9043
-0xE661 = 0x9044
-0xE662 = 0x9045
-0xE663 = 0x9046
-0xE664 = 0x9047
-0xE665 = 0x9048
-0xE666 = 0x9049
-0xE667 = 0x904A
-0xE668 = 0x904B
-0xE669 = 0x904C
-0xE66A = 0x904D
-0xE66B = 0x904E
-0xE66C = 0x904F
-0xE66D = 0x9050
-0xE66E = 0x9051
-0xE66F = 0x9052
-0xE670 = 0x9053
-0xE671 = 0x9054
-0xE672 = 0x9055
-0xE673 = 0x9056
-0xE674 = 0x9057
-0xE675 = 0x9058
-0xE676 = 0x9059
-0xE677 = 0x905A
-0xE678 = 0x905B
-0xE679 = 0x905C
-0xE67A = 0x905D
-0xE67B = 0x905E
-0xE67C = 0x905F
-0xE67D = 0x9060
-0xE67E = 0x9061
-0xE67F = 0x9062
-0xE680 = 0x9063
-0xE681 = 0x9064
-0xE682 = 0x9065
-0xE683 = 0x9066
-0xE684 = 0x9067
-0xE685 = 0x9068
-0xE686 = 0x9069
-0xE687 = 0x906A
-0xE688 = 0x906B
-0xE689 = 0x906C
-0xE68A = 0x906D
-0xE68B = 0x906E
-0xE68C = 0x906F
-0xE68D = 0x9070
-0xE68E = 0x9071
-0xE68F = 0x9072
-0xE690 = 0x9073
-0xE691 = 0x9074
-0xE692 = 0x9075
-0xE693 = 0x9076
-0xE694 = 0x9077
-0xE695 = 0x9078
-0xE696 = 0x9079
-0xE697 = 0x907A
-0xE698 = 0x907B
-0xE699 = 0x907C
-0xE69A = 0x907D
-0xE69B = 0x907E
-0xE69C = 0x9121
-0xE69D = 0x9122
-0xE69E = 0x9123
-0xE69F = 0x9124
-0xE6A0 = 0x9125
-0xE6A1 = 0x9126
-0xE6A2 = 0x9127
-0xE6A3 = 0x9128
-0xE6A4 = 0x9129
-0xE6A5 = 0x912A
-0xE6A6 = 0x912B
-0xE6A7 = 0x912C
-0xE6A8 = 0x912D
-0xE6A9 = 0x912E
-0xE6AA = 0x912F
-0xE6AB = 0x9130
-0xE6AC = 0x9131
-0xE6AD = 0x9132
-0xE6AE = 0x9133
-0xE6AF = 0x9134
-0xE6B0 = 0x9135
-0xE6B1 = 0x9136
-0xE6B2 = 0x9137
-0xE6B3 = 0x9138
-0xE6B4 = 0x9139
-0xE6B5 = 0x913A
-0xE6B6 = 0x913B
-0xE6B7 = 0x913C
-0xE6B8 = 0x913D
-0xE6B9 = 0x913E
-0xE6BA = 0x913F
-0xE6BB = 0x9140
-0xE6BC = 0x9141
-0xE6BD = 0x9142
-0xE6BE = 0x9143
-0xE6BF = 0x9144
-0xE6C0 = 0x9145
-0xE6C1 = 0x9146
-0xE6C2 = 0x9147
-0xE6C3 = 0x9148
-0xE6C4 = 0x9149
-0xE6C5 = 0x914A
-0xE6C6 = 0x914B
-0xE6C7 = 0x914C
-0xE6C8 = 0x914D
-0xE6C9 = 0x914E
-0xE6CA = 0x914F
-0xE6CB = 0x9150
-0xE6CC = 0x9151
-0xE6CD = 0x9152
-0xE6CE = 0x9153
-0xE6CF = 0x9154
-0xE6D0 = 0x9155
-0xE6D1 = 0x9156
-0xE6D2 = 0x9157
-0xE6D3 = 0x9158
-0xE6D4 = 0x9159
-0xE6D5 = 0x915A
-0xE6D6 = 0x915B
-0xE6D7 = 0x915C
-0xE6D8 = 0x915D
-0xE6D9 = 0x915E
-0xE6DA = 0x915F
-0xE6DB = 0x9160
-0xE6DC = 0x9161
-0xE6DD = 0x9162
-0xE6DE = 0x9163
-0xE6DF = 0x9164
-0xE6E0 = 0x9165
-0xE6E1 = 0x9166
-0xE6E2 = 0x9167
-0xE6E3 = 0x9168
-0xE6E4 = 0x9169
-0xE6E5 = 0x916A
-0xE6E6 = 0x916B
-0xE6E7 = 0x916C
-0xE6E8 = 0x916D
-0xE6E9 = 0x916E
-0xE6EA = 0x916F
-0xE6EB = 0x9170
-0xE6EC = 0x9171
-0xE6ED = 0x9172
-0xE6EE = 0x9173
-0xE6EF = 0x9174
-0xE6F0 = 0x9175
-0xE6F1 = 0x9176
-0xE6F2 = 0x9177
-0xE6F3 = 0x9178
-0xE6F4 = 0x9179
-0xE6F5 = 0x917A
-0xE6F6 = 0x917B
-0xE6F7 = 0x917C
-0xE6F8 = 0x917D
-0xE6F9 = 0x917E
-0xE6FA = 0x9221
-0xE6FB = 0x9222
-0xE6FC = 0x9223
-0xE6FD = 0x9224
-0xE6FE = 0x9225
-0xE6FF = 0x9226
-0xE700 = 0x9227
-0xE701 = 0x9228
-0xE702 = 0x9229
-0xE703 = 0x922A
-0xE704 = 0x922B
-0xE705 = 0x922C
-0xE706 = 0x922D
-0xE707 = 0x922E
-0xE708 = 0x922F
-0xE709 = 0x9230
-0xE70A = 0x9231
-0xE70B = 0x9232
-0xE70C = 0x9233
-0xE70D = 0x9234
-0xE70E = 0x9235
-0xE70F = 0x9236
-0xE710 = 0x9237
-0xE711 = 0x9238
-0xE712 = 0x9239
-0xE713 = 0x923A
-0xE714 = 0x923B
-0xE715 = 0x923C
-0xE716 = 0x923D
-0xE717 = 0x923E
-0xE718 = 0x923F
-0xE719 = 0x9240
-0xE71A = 0x9241
-0xE71B = 0x9242
-0xE71C = 0x9243
-0xE71D = 0x9244
-0xE71E = 0x9245
-0xE71F = 0x9246
-0xE720 = 0x9247
-0xE721 = 0x9248
-0xE722 = 0x9249
-0xE723 = 0x924A
-0xE724 = 0x924B
-0xE725 = 0x924C
-0xE726 = 0x924D
-0xE727 = 0x924E
-0xE728 = 0x924F
-0xE729 = 0x9250
-0xE72A = 0x9251
-0xE72B = 0x9252
-0xE72C = 0x9253
-0xE72D = 0x9254
-0xE72E = 0x9255
-0xE72F = 0x9256
-0xE730 = 0x9257
-0xE731 = 0x9258
-0xE732 = 0x9259
-0xE733 = 0x925A
-0xE734 = 0x925B
-0xE735 = 0x925C
-0xE736 = 0x925D
-0xE737 = 0x925E
-0xE738 = 0x925F
-0xE739 = 0x9260
-0xE73A = 0x9261
-0xE73B = 0x9262
-0xE73C = 0x9263
-0xE73D = 0x9264
-0xE73E = 0x9265
-0xE73F = 0x9266
-0xE740 = 0x9267
-0xE741 = 0x9268
-0xE742 = 0x9269
-0xE743 = 0x926A
-0xE744 = 0x926B
-0xE745 = 0x926C
-0xE746 = 0x926D
-0xE747 = 0x926E
-0xE748 = 0x926F
-0xE749 = 0x9270
-0xE74A = 0x9271
-0xE74B = 0x9272
-0xE74C = 0x9273
-0xE74D = 0x9274
-0xE74E = 0x9275
-0xE74F = 0x9276
-0xE750 = 0x9277
-0xE751 = 0x9278
-0xE752 = 0x9279
-0xE753 = 0x927A
-0xE754 = 0x927B
-0xE755 = 0x927C
-0xE756 = 0x927D
-0xE757 = 0x927E
-END_MAP
diff --git a/enc/trans/CP/UCS%CP932VDC@IBM.src b/enc/trans/CP/UCS%CP932VDC@IBM.src
deleted file mode 100644
index 78e9b316b4..0000000000
--- a/enc/trans/CP/UCS%CP932VDC@IBM.src
+++ /dev/null
@@ -1,420 +0,0 @@
-# $NetBSD: UCS%CP932VDC@IBM.src,v 1.1 2006/11/04 03:46:19 tnozaki Exp $
-
-TYPE ROWCOL
-NAME "UCS/CP932VDC:IBM"
-SRC_ZONE 0x2116-0xFFE4
-OOB_MODE INVALID
-DST_INVALID 0xFFFF
-DST_UNIT_BITS 16
-
-BEGIN_MAP
-#
-# This mapping data is made from the mapping data provided by Unicode, Inc.
-# Original notice:
-#
-# Name: cp932 to Unicode table
-# Unicode version: 2.0
-# Table version: 2.01
-# Table format: Format A
-# Date: 04/15/98
-#
-# Contact: cpxlate@microsoft.com
-#
-# General notes: none
-#
-# Format: Three tab-separated columns
-# Column #1 is the cp932 code (in hex)
-# Column #2 is the Unicode (in hex as 0xXXXX)
-# Column #3 is the Unicode name (follows a comment sign, '#')
-#
-# The entries are in cp932 order
-#
-0x2116 = 0x933A
-0x2121 = 0x933B
-0x2160 = 0x932B
-0x2161 = 0x932C
-0x2162 = 0x932D
-0x2163 = 0x932E
-0x2164 = 0x932F
-0x2165 = 0x9330
-0x2166 = 0x9331
-0x2167 = 0x9332
-0x2168 = 0x9333
-0x2169 = 0x9334
-0x2170 = 0x9321
-0x2171 = 0x9322
-0x2172 = 0x9323
-0x2173 = 0x9324
-0x2174 = 0x9325
-0x2175 = 0x9326
-0x2176 = 0x9327
-0x2177 = 0x9328
-0x2178 = 0x9329
-0x2179 = 0x932A
-0x2235 = 0x933C
-0x3231 = 0x9339
-0x4E28 = 0x9349
-0x4EE1 = 0x934A
-0x4EFC = 0x934B
-0x4F00 = 0x934C
-0x4F03 = 0x934D
-0x4F39 = 0x934E
-0x4F56 = 0x934F
-0x4F8A = 0x9351
-0x4F92 = 0x9350
-0x4F94 = 0x9353
-0x4F9A = 0x9352
-0x4FC9 = 0x9342
-0x4FCD = 0x9354
-0x4FFF = 0x9357
-0x501E = 0x9358
-0x5022 = 0x9356
-0x5040 = 0x9355
-0x5042 = 0x935B
-0x5046 = 0x9359
-0x5070 = 0x935A
-0x5094 = 0x935C
-0x50D8 = 0x935E
-0x50F4 = 0x935D
-0x514A = 0x935F
-0x5164 = 0x9360
-0x519D = 0x9361
-0x51BE = 0x9362
-0x51EC = 0x9363
-0x5215 = 0x9364
-0x529C = 0x9365
-0x52A6 = 0x9366
-0x52AF = 0x9558
-0x52C0 = 0x9367
-0x52DB = 0x9368
-0x5300 = 0x9369
-0x5307 = 0x936A
-0x5324 = 0x936B
-0x5372 = 0x936C
-0x5393 = 0x936D
-0x53B2 = 0x936E
-0x53DD = 0x936F
-0x548A = 0x9372
-0x549C = 0x9371
-0x54A9 = 0x9373
-0x54FF = 0x9374
-0x5586 = 0x9375
-0x5759 = 0x9376
-0x5765 = 0x9377
-0x57AC = 0x9378
-0x57C7 = 0x937A
-0x57C8 = 0x9379
-0x589E = 0x937D
-0x58B2 = 0x937E
-0x590B = 0x9421
-0x5953 = 0x9422
-0x595B = 0x9423
-0x595D = 0x9424
-0x5963 = 0x9425
-0x59A4 = 0x9426
-0x59BA = 0x9427
-0x5B56 = 0x9428
-0x5BC0 = 0x9429
-0x5BD8 = 0x942B
-0x5BEC = 0x942C
-0x5C1E = 0x942D
-0x5CA6 = 0x942E
-0x5CBA = 0x942F
-0x5CF5 = 0x9430
-0x5D27 = 0x9431
-0x5D42 = 0x9434
-0x5D53 = 0x9432
-0x5D6D = 0x9435
-0x5DB8 = 0x9436
-0x5DB9 = 0x9437
-0x5DD0 = 0x9438
-0x5F21 = 0x9439
-0x5F34 = 0x943A
-0x5F45 = 0x9348
-0x5F67 = 0x943B
-0x5FB7 = 0x943C
-0x5FDE = 0x943D
-0x605D = 0x943E
-0x6085 = 0x943F
-0x608A = 0x9440
-0x60D5 = 0x9442
-0x60DE = 0x9441
-0x60F2 = 0x9444
-0x6111 = 0x9445
-0x6120 = 0x9443
-0x6130 = 0x9447
-0x6137 = 0x9446
-0x6198 = 0x9448
-0x6213 = 0x9449
-0x62A6 = 0x944A
-0x63F5 = 0x944B
-0x6460 = 0x944C
-0x649D = 0x944D
-0x64CE = 0x944E
-0x654E = 0x944F
-0x6600 = 0x9450
-0x6609 = 0x9453
-0x6615 = 0x9451
-0x661E = 0x9455
-0x6624 = 0x9456
-0x662E = 0x9454
-0x6631 = 0x9344
-0x663B = 0x9452
-0x6657 = 0x9458
-0x6659 = 0x9459
-0x6665 = 0x9457
-0x6673 = 0x945B
-0x6699 = 0x945C
-0x66A0 = 0x945D
-0x66B2 = 0x945E
-0x66BF = 0x945F
-0x66FA = 0x9460
-0x66FB = 0x9347
-0x670E = 0x9461
-0x6766 = 0x9463
-0x67BB = 0x9464
-0x67C0 = 0x9466
-0x6801 = 0x9467
-0x6844 = 0x9468
-0x6852 = 0x9465
-0x68C8 = 0x9345
-0x68CF = 0x9469
-0x6968 = 0x946B
-0x6998 = 0x946D
-0x69E2 = 0x946E
-0x6A30 = 0x946F
-0x6A46 = 0x9471
-0x6A6B = 0x9470
-0x6A73 = 0x9472
-0x6A7E = 0x9473
-0x6AE2 = 0x9474
-0x6AE4 = 0x9475
-0x6BD6 = 0x9476
-0x6C3F = 0x9477
-0x6C5C = 0x9478
-0x6C6F = 0x947A
-0x6C86 = 0x9479
-0x6CDA = 0x947B
-0x6D04 = 0x947C
-0x6D6F = 0x947E
-0x6D87 = 0x947D
-0x6D96 = 0x9521
-0x6DAC = 0x9522
-0x6DCF = 0x9523
-0x6DF2 = 0x9525
-0x6DF8 = 0x9524
-0x6DFC = 0x9526
-0x6E27 = 0x9529
-0x6E39 = 0x9527
-0x6E3C = 0x952A
-0x6E5C = 0x9528
-0x6EBF = 0x952B
-0x6F88 = 0x952C
-0x6FB5 = 0x952D
-0x6FF5 = 0x952E
-0x7005 = 0x952F
-0x7007 = 0x9530
-0x7028 = 0x9531
-0x7085 = 0x9532
-0x70AB = 0x9533
-0x70BB = 0x9343
-0x7104 = 0x9535
-0x710F = 0x9534
-0x7146 = 0x9537
-0x7147 = 0x9538
-0x715C = 0x9536
-0x71C1 = 0x953A
-0x71FE = 0x953B
-0x72B1 = 0x953C
-0x72BE = 0x953D
-0x7324 = 0x953E
-0x7377 = 0x9540
-0x73BD = 0x9541
-0x73C9 = 0x9542
-0x73D2 = 0x9545
-0x73D6 = 0x9543
-0x73E3 = 0x9544
-0x73F5 = 0x9547
-0x7407 = 0x9546
-0x7426 = 0x9548
-0x7429 = 0x954A
-0x742A = 0x9549
-0x742E = 0x954B
-0x7462 = 0x954C
-0x7489 = 0x954D
-0x749F = 0x954E
-0x7501 = 0x954F
-0x752F = 0x942A
-0x756F = 0x9550
-0x7682 = 0x9551
-0x769B = 0x9554
-0x769C = 0x9552
-0x769E = 0x9553
-0x76A6 = 0x9555
-0x7746 = 0x9557
-0x7821 = 0x9559
-0x784E = 0x955A
-0x7864 = 0x955B
-0x787A = 0x955C
-0x7930 = 0x955D
-0x7994 = 0x9561
-0x799B = 0x9563
-0x7AD1 = 0x9564
-0x7AE7 = 0x9565
-0x7AEB = 0x9567
-0x7B9E = 0x9568
-0x7D48 = 0x956A
-0x7D5C = 0x956B
-0x7DA0 = 0x956D
-0x7DB7 = 0x956C
-0x7DD6 = 0x956E
-0x7E52 = 0x956F
-0x7E8A = 0x933D
-0x7F47 = 0x9570
-0x7FA1 = 0x9571
-0x8301 = 0x9573
-0x8362 = 0x9574
-0x837F = 0x9575
-0x83C7 = 0x9576
-0x83F6 = 0x9577
-0x8448 = 0x9578
-0x84B4 = 0x9579
-0x84DC = 0x9341
-0x8553 = 0x957A
-0x8559 = 0x957B
-0x856B = 0x957C
-0x85B0 = 0x957E
-0x8807 = 0x9623
-0x88F5 = 0x9624
-0x891C = 0x933E
-0x8A12 = 0x9625
-0x8A37 = 0x9626
-0x8A79 = 0x9627
-0x8AA7 = 0x9628
-0x8ABE = 0x9629
-0x8ADF = 0x962A
-0x8AF6 = 0x962C
-0x8B53 = 0x962D
-0x8B7F = 0x962E
-0x8CF0 = 0x962F
-0x8CF4 = 0x9630
-0x8D12 = 0x9631
-0x8D76 = 0x9632
-0x8ECF = 0x9634
-0x9067 = 0x9637
-0x90DE = 0x9638
-0x9115 = 0x963A
-0x9127 = 0x963B
-0x91D7 = 0x963D
-0x91DA = 0x963C
-0x91DE = 0x963E
-0x91E4 = 0x9641
-0x91E5 = 0x9642
-0x91ED = 0x963F
-0x91EE = 0x9640
-0x9206 = 0x9643
-0x920A = 0x9645
-0x9210 = 0x9644
-0x9239 = 0x964C
-0x923A = 0x9646
-0x923C = 0x9648
-0x9240 = 0x9647
-0x924E = 0x9649
-0x9251 = 0x964B
-0x9259 = 0x964A
-0x9267 = 0x964D
-0x9277 = 0x964F
-0x9278 = 0x9650
-0x9288 = 0x9340
-0x92A7 = 0x964E
-0x92D0 = 0x9654
-0x92D3 = 0x9658
-0x92D5 = 0x9656
-0x92D7 = 0x9652
-0x92D9 = 0x9653
-0x92E0 = 0x9657
-0x92E7 = 0x9651
-0x92F9 = 0x9346
-0x92FB = 0x965B
-0x92FF = 0x965E
-0x9302 = 0x9660
-0x931D = 0x965F
-0x931E = 0x965D
-0x9321 = 0x965A
-0x9325 = 0x9659
-0x9348 = 0x933F
-0x9357 = 0x9662
-0x9370 = 0x9661
-0x93A4 = 0x9663
-0x93C6 = 0x9664
-0x93DE = 0x9665
-0x93F8 = 0x9666
-0x9431 = 0x9667
-0x9445 = 0x9668
-0x9448 = 0x9669
-0x9592 = 0x966A
-0x969D = 0x966D
-0x96AF = 0x966E
-0x9733 = 0x966F
-0x973B = 0x9670
-0x9743 = 0x9671
-0x974D = 0x9672
-0x974F = 0x9673
-0x9751 = 0x9674
-0x9755 = 0x9675
-0x9857 = 0x9676
-0x9865 = 0x9677
-0x9927 = 0x967A
-0x999E = 0x967C
-0x9A4E = 0x967D
-0x9AD9 = 0x967E
-0x9ADC = 0x9721
-0x9B72 = 0x9723
-0x9B75 = 0x9722
-0x9B8F = 0x9724
-0x9BB1 = 0x9725
-0x9BBB = 0x9726
-0x9C00 = 0x9727
-0x9D6B = 0x9729
-0x9D70 = 0x9728
-0x9E19 = 0x972B
-0x9ED1 = 0x972C
-0xF929 = 0x9462
-0xF9DC = 0x966B
-0xFA0E = 0x9370
-0xFA0F = 0x937B
-0xFA10 = 0x937C
-0xFA11 = 0x9433
-0xFA12 = 0x945A
-0xFA13 = 0x946A
-0xFA14 = 0x946C
-0xFA15 = 0x9539
-0xFA16 = 0x953F
-0xFA17 = 0x9556
-0xFA18 = 0x955E
-0xFA19 = 0x955F
-0xFA1A = 0x9560
-0xFA1B = 0x9562
-0xFA1C = 0x9566
-0xFA1D = 0x9569
-0xFA1E = 0x9572
-0xFA1F = 0x957D
-0xFA20 = 0x9621
-0xFA21 = 0x9622
-0xFA22 = 0x962B
-0xFA23 = 0x9633
-0xFA24 = 0x9635
-0xFA25 = 0x9636
-0xFA26 = 0x9639
-0xFA27 = 0x9655
-0xFA28 = 0x965C
-0xFA29 = 0x966C
-0xFA2A = 0x9678
-0xFA2B = 0x9679
-0xFA2C = 0x967B
-0xFA2D = 0x972A
-0xFF02 = 0x9338
-0xFF07 = 0x9337
-0xFFE2 = 0x9335
-0xFFE4 = 0x9336
-END_MAP
diff --git a/enc/trans/CP/UCS%CP932VDC@NEC_IBM.src b/enc/trans/CP/UCS%CP932VDC@NEC_IBM.src
deleted file mode 100644
index f94167aaa4..0000000000
--- a/enc/trans/CP/UCS%CP932VDC@NEC_IBM.src
+++ /dev/null
@@ -1,406 +0,0 @@
-# $NetBSD: UCS%CP932VDC@NEC_IBM.src,v 1.1 2006/11/04 03:46:19 tnozaki Exp $
-
-TYPE ROWCOL
-NAME "UCS/CP932VDC:NEC_IBM"
-SRC_ZONE 0x2170-0xFFE4
-OOB_MODE INVALID
-DST_INVALID 0xFFFF
-DST_UNIT_BITS 16
-
-BEGIN_MAP
-#
-# This mapping data is made from the mapping data provided by Unicode, Inc.
-# Original notice:
-#
-# Name: cp932 to Unicode table
-# Unicode version: 2.0
-# Table version: 2.01
-# Table format: Format A
-# Date: 04/15/98
-#
-# Contact: cpxlate@microsoft.com
-#
-# General notes: none
-#
-# Format: Three tab-separated columns
-# Column #1 is the cp932 code (in hex)
-# Column #2 is the Unicode (in hex as 0xXXXX)
-# Column #3 is the Unicode name (follows a comment sign, '#')
-#
-# The entries are in cp932 order
-#
-0x2170 = 0x7C71
-0x2171 = 0x7C72
-0x2172 = 0x7C73
-0x2173 = 0x7C74
-0x2174 = 0x7C75
-0x2175 = 0x7C76
-0x2176 = 0x7C77
-0x2177 = 0x7C78
-0x2178 = 0x7C79
-0x2179 = 0x7C7A
-0x4E28 = 0x792D
-0x4EE1 = 0x792E
-0x4EFC = 0x792F
-0x4F00 = 0x7930
-0x4F03 = 0x7931
-0x4F39 = 0x7932
-0x4F56 = 0x7933
-0x4F8A = 0x7935
-0x4F92 = 0x7934
-0x4F94 = 0x7937
-0x4F9A = 0x7936
-0x4FC9 = 0x7926
-0x4FCD = 0x7938
-0x4FFF = 0x793B
-0x501E = 0x793C
-0x5022 = 0x793A
-0x5040 = 0x7939
-0x5042 = 0x793F
-0x5046 = 0x793D
-0x5070 = 0x793E
-0x5094 = 0x7940
-0x50D8 = 0x7942
-0x50F4 = 0x7941
-0x514A = 0x7943
-0x5164 = 0x7944
-0x519D = 0x7945
-0x51BE = 0x7946
-0x51EC = 0x7947
-0x5215 = 0x7948
-0x529C = 0x7949
-0x52A6 = 0x794A
-0x52AF = 0x7B3C
-0x52C0 = 0x794B
-0x52DB = 0x794C
-0x5300 = 0x794D
-0x5307 = 0x794E
-0x5324 = 0x794F
-0x5372 = 0x7950
-0x5393 = 0x7951
-0x53B2 = 0x7952
-0x53DD = 0x7953
-0x548A = 0x7956
-0x549C = 0x7955
-0x54A9 = 0x7957
-0x54FF = 0x7958
-0x5586 = 0x7959
-0x5759 = 0x795A
-0x5765 = 0x795B
-0x57AC = 0x795C
-0x57C7 = 0x795E
-0x57C8 = 0x795D
-0x589E = 0x7961
-0x58B2 = 0x7962
-0x590B = 0x7963
-0x5953 = 0x7964
-0x595B = 0x7965
-0x595D = 0x7966
-0x5963 = 0x7967
-0x59A4 = 0x7968
-0x59BA = 0x7969
-0x5B56 = 0x796A
-0x5BC0 = 0x796B
-0x5BD8 = 0x796D
-0x5BEC = 0x796E
-0x5C1E = 0x796F
-0x5CA6 = 0x7970
-0x5CBA = 0x7971
-0x5CF5 = 0x7972
-0x5D27 = 0x7973
-0x5D42 = 0x7976
-0x5D53 = 0x7974
-0x5D6D = 0x7977
-0x5DB8 = 0x7978
-0x5DB9 = 0x7979
-0x5DD0 = 0x797A
-0x5F21 = 0x797B
-0x5F34 = 0x797C
-0x5F45 = 0x792C
-0x5F67 = 0x797D
-0x5FB7 = 0x797E
-0x5FDE = 0x7A21
-0x605D = 0x7A22
-0x6085 = 0x7A23
-0x608A = 0x7A24
-0x60D5 = 0x7A26
-0x60DE = 0x7A25
-0x60F2 = 0x7A28
-0x6111 = 0x7A29
-0x6120 = 0x7A27
-0x6130 = 0x7A2B
-0x6137 = 0x7A2A
-0x6198 = 0x7A2C
-0x6213 = 0x7A2D
-0x62A6 = 0x7A2E
-0x63F5 = 0x7A2F
-0x6460 = 0x7A30
-0x649D = 0x7A31
-0x64CE = 0x7A32
-0x654E = 0x7A33
-0x6600 = 0x7A34
-0x6609 = 0x7A37
-0x6615 = 0x7A35
-0x661E = 0x7A39
-0x6624 = 0x7A3A
-0x662E = 0x7A38
-0x6631 = 0x7928
-0x663B = 0x7A36
-0x6657 = 0x7A3C
-0x6659 = 0x7A3D
-0x6665 = 0x7A3B
-0x6673 = 0x7A3F
-0x6699 = 0x7A40
-0x66A0 = 0x7A41
-0x66B2 = 0x7A42
-0x66BF = 0x7A43
-0x66FA = 0x7A44
-0x66FB = 0x792B
-0x670E = 0x7A45
-0x6766 = 0x7A47
-0x67BB = 0x7A48
-0x67C0 = 0x7A4A
-0x6801 = 0x7A4B
-0x6844 = 0x7A4C
-0x6852 = 0x7A49
-0x68C8 = 0x7929
-0x68CF = 0x7A4D
-0x6968 = 0x7A4F
-0x6998 = 0x7A51
-0x69E2 = 0x7A52
-0x6A30 = 0x7A53
-0x6A46 = 0x7A55
-0x6A6B = 0x7A54
-0x6A73 = 0x7A56
-0x6A7E = 0x7A57
-0x6AE2 = 0x7A58
-0x6AE4 = 0x7A59
-0x6BD6 = 0x7A5A
-0x6C3F = 0x7A5B
-0x6C5C = 0x7A5C
-0x6C6F = 0x7A5E
-0x6C86 = 0x7A5D
-0x6CDA = 0x7A5F
-0x6D04 = 0x7A60
-0x6D6F = 0x7A62
-0x6D87 = 0x7A61
-0x6D96 = 0x7A63
-0x6DAC = 0x7A64
-0x6DCF = 0x7A65
-0x6DF2 = 0x7A67
-0x6DF8 = 0x7A66
-0x6DFC = 0x7A68
-0x6E27 = 0x7A6B
-0x6E39 = 0x7A69
-0x6E3C = 0x7A6C
-0x6E5C = 0x7A6A
-0x6EBF = 0x7A6D
-0x6F88 = 0x7A6E
-0x6FB5 = 0x7A6F
-0x6FF5 = 0x7A70
-0x7005 = 0x7A71
-0x7007 = 0x7A72
-0x7028 = 0x7A73
-0x7085 = 0x7A74
-0x70AB = 0x7A75
-0x70BB = 0x7927
-0x7104 = 0x7A77
-0x710F = 0x7A76
-0x7146 = 0x7A79
-0x7147 = 0x7A7A
-0x715C = 0x7A78
-0x71C1 = 0x7A7C
-0x71FE = 0x7A7D
-0x72B1 = 0x7A7E
-0x72BE = 0x7B21
-0x7324 = 0x7B22
-0x7377 = 0x7B24
-0x73BD = 0x7B25
-0x73C9 = 0x7B26
-0x73D2 = 0x7B29
-0x73D6 = 0x7B27
-0x73E3 = 0x7B28
-0x73F5 = 0x7B2B
-0x7407 = 0x7B2A
-0x7426 = 0x7B2C
-0x7429 = 0x7B2E
-0x742A = 0x7B2D
-0x742E = 0x7B2F
-0x7462 = 0x7B30
-0x7489 = 0x7B31
-0x749F = 0x7B32
-0x7501 = 0x7B33
-0x752F = 0x796C
-0x756F = 0x7B34
-0x7682 = 0x7B35
-0x769B = 0x7B38
-0x769C = 0x7B36
-0x769E = 0x7B37
-0x76A6 = 0x7B39
-0x7746 = 0x7B3B
-0x7821 = 0x7B3D
-0x784E = 0x7B3E
-0x7864 = 0x7B3F
-0x787A = 0x7B40
-0x7930 = 0x7B41
-0x7994 = 0x7B45
-0x799B = 0x7B47
-0x7AD1 = 0x7B48
-0x7AE7 = 0x7B49
-0x7AEB = 0x7B4B
-0x7B9E = 0x7B4C
-0x7D48 = 0x7B4E
-0x7D5C = 0x7B4F
-0x7DA0 = 0x7B51
-0x7DB7 = 0x7B50
-0x7DD6 = 0x7B52
-0x7E52 = 0x7B53
-0x7E8A = 0x7921
-0x7F47 = 0x7B54
-0x7FA1 = 0x7B55
-0x8301 = 0x7B57
-0x8362 = 0x7B58
-0x837F = 0x7B59
-0x83C7 = 0x7B5A
-0x83F6 = 0x7B5B
-0x8448 = 0x7B5C
-0x84B4 = 0x7B5D
-0x84DC = 0x7925
-0x8553 = 0x7B5E
-0x8559 = 0x7B5F
-0x856B = 0x7B60
-0x85B0 = 0x7B62
-0x8807 = 0x7B65
-0x88F5 = 0x7B66
-0x891C = 0x7922
-0x8A12 = 0x7B67
-0x8A37 = 0x7B68
-0x8A79 = 0x7B69
-0x8AA7 = 0x7B6A
-0x8ABE = 0x7B6B
-0x8ADF = 0x7B6C
-0x8AF6 = 0x7B6E
-0x8B53 = 0x7B6F
-0x8B7F = 0x7B70
-0x8CF0 = 0x7B71
-0x8CF4 = 0x7B72
-0x8D12 = 0x7B73
-0x8D76 = 0x7B74
-0x8ECF = 0x7B76
-0x9067 = 0x7B79
-0x90DE = 0x7B7A
-0x9115 = 0x7B7C
-0x9127 = 0x7B7D
-0x91D7 = 0x7C21
-0x91DA = 0x7B7E
-0x91DE = 0x7C22
-0x91E4 = 0x7C25
-0x91E5 = 0x7C26
-0x91ED = 0x7C23
-0x91EE = 0x7C24
-0x9206 = 0x7C27
-0x920A = 0x7C29
-0x9210 = 0x7C28
-0x9239 = 0x7C30
-0x923A = 0x7C2A
-0x923C = 0x7C2C
-0x9240 = 0x7C2B
-0x924E = 0x7C2D
-0x9251 = 0x7C2F
-0x9259 = 0x7C2E
-0x9267 = 0x7C31
-0x9277 = 0x7C33
-0x9278 = 0x7C34
-0x9288 = 0x7924
-0x92A7 = 0x7C32
-0x92D0 = 0x7C38
-0x92D3 = 0x7C3C
-0x92D5 = 0x7C3A
-0x92D7 = 0x7C36
-0x92D9 = 0x7C37
-0x92E0 = 0x7C3B
-0x92E7 = 0x7C35
-0x92F9 = 0x792A
-0x92FB = 0x7C3F
-0x92FF = 0x7C42
-0x9302 = 0x7C44
-0x931D = 0x7C43
-0x931E = 0x7C41
-0x9321 = 0x7C3E
-0x9325 = 0x7C3D
-0x9348 = 0x7923
-0x9357 = 0x7C46
-0x9370 = 0x7C45
-0x93A4 = 0x7C47
-0x93C6 = 0x7C48
-0x93DE = 0x7C49
-0x93F8 = 0x7C4A
-0x9431 = 0x7C4B
-0x9445 = 0x7C4C
-0x9448 = 0x7C4D
-0x9592 = 0x7C4E
-0x969D = 0x7C51
-0x96AF = 0x7C52
-0x9733 = 0x7C53
-0x973B = 0x7C54
-0x9743 = 0x7C55
-0x974D = 0x7C56
-0x974F = 0x7C57
-0x9751 = 0x7C58
-0x9755 = 0x7C59
-0x9857 = 0x7C5A
-0x9865 = 0x7C5B
-0x9927 = 0x7C5E
-0x999E = 0x7C60
-0x9A4E = 0x7C61
-0x9AD9 = 0x7C62
-0x9ADC = 0x7C63
-0x9B72 = 0x7C65
-0x9B75 = 0x7C64
-0x9B8F = 0x7C66
-0x9BB1 = 0x7C67
-0x9BBB = 0x7C68
-0x9C00 = 0x7C69
-0x9D6B = 0x7C6B
-0x9D70 = 0x7C6A
-0x9E19 = 0x7C6D
-0x9ED1 = 0x7C6E
-0xF929 = 0x7A46
-0xF9DC = 0x7C4F
-0xFA0E = 0x7954
-0xFA0F = 0x795F
-0xFA10 = 0x7960
-0xFA11 = 0x7975
-0xFA12 = 0x7A3E
-0xFA13 = 0x7A4E
-0xFA14 = 0x7A50
-0xFA15 = 0x7A7B
-0xFA16 = 0x7B23
-0xFA17 = 0x7B3A
-0xFA18 = 0x7B42
-0xFA19 = 0x7B43
-0xFA1A = 0x7B44
-0xFA1B = 0x7B46
-0xFA1C = 0x7B4A
-0xFA1D = 0x7B4D
-0xFA1E = 0x7B56
-0xFA1F = 0x7B61
-0xFA20 = 0x7B63
-0xFA21 = 0x7B64
-0xFA22 = 0x7B6D
-0xFA23 = 0x7B75
-0xFA24 = 0x7B77
-0xFA25 = 0x7B78
-0xFA26 = 0x7B7B
-0xFA27 = 0x7C39
-0xFA28 = 0x7C40
-0xFA29 = 0x7C50
-0xFA2A = 0x7C5C
-0xFA2B = 0x7C5D
-0xFA2C = 0x7C5F
-0xFA2D = 0x7C6C
-0xFF02 = 0x7C7E
-0xFF07 = 0x7C7D
-0xFFE2 = 0x7C7B
-0xFFE4 = 0x7C7C
-END_MAP
diff --git a/enc/trans/GB/GB12345%UCS.src b/enc/trans/GB/GB12345%UCS.src
deleted file mode 100644
index 0b4115bed9..0000000000
--- a/enc/trans/GB/GB12345%UCS.src
+++ /dev/null
@@ -1,7618 +0,0 @@
-# $NetBSD: GB12345%UCS.src,v 1.1 2006/11/23 03:25:24 tnozaki Exp $
-
-TYPE ROWCOL
-NAME "GB12345/UCS"
-SRC_ZONE 0x21-0x79 / 0x21-0x7E / 8
-OOB_MODE ILSEQ
-DST_ILSEQ 0xFFFE
-DST_UNIT_BITS 16
-
-BEGIN_MAP
-#
-# This mapping data is made from the mapping data provided by Unicode, Inc.
-# Original notice:
-#
-# Name: GB12345-80 to Unicode table (complete, hex format)
-# Unicode version: 1.1
-# Table version: 0.0d1
-# Table format: Format A
-# Date: 6 December 1993
-# Author: Glenn Adams <glenn@metis.com>
-# John H. Jenkins <John_Jenkins@taligent.com>
-#
-# Copyright (c) 1991-1994 Unicode, Inc. All Rights reserved.
-#
-# This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
-# No claims are made as to fitness for any particular purpose. No
-# warranties of any kind are expressed or implied. The recipient
-# agrees to determine applicability of information provided. If this
-# file has been provided on magnetic media by Unicode, Inc., the sole
-# remedy for any claim will be exchange of defective media within 90
-# days of receipt.
-#
-# Recipient is granted the right to make copies in any form for
-# internal distribution and to freely use the information supplied
-# in the creation of products supporting Unicode. Unicode, Inc.
-# specifically excludes the right to re-distribute this file directly
-# to third parties or other organizations whether for profit or not.
-#
-# General notes:
-#
-# This table contains the data Metis and Taligent currently have on how
-# GB12345-90 characters map into Unicode.
-#
-# Format: Three tab-separated columns
-# Column #1 is the GB12345 code (in hex as 0xXXXX)
-# Column #2 is the Unicode (in hex as 0xXXXX)
-# Column #3 the Unicode name (follows a comment sign, '#')
-# The official names for Unicode characters U+4E00
-# to U+9FA5, inclusive, is "CJK UNIFIED IDEOGRAPH-XXXX",
-# where XXXX is the code point. Including all these
-# names in this file increases its size substantially
-# and needlessly. The token "<CJK>" is used for the
-# name of these characters. If necessary, it can be
-# expanded algorithmically by a parser or editor.
-#
-# The entries are in GB12345 order
-#
-# The following algorithms can be used to change the hex form
-# of GB12345 to other standard forms:
-#
-# To change hex to EUC form, add 0x8080
-# To change hex to kuten form, first subtract 0x2020. Then
-# the high and low bytes correspond to the ku and ten of
-# the kuten form. For example, 0x2121 -> 0x0101 -> 0101;
-# 0x777E -> 0x575E -> 8794
-#
-# Any comments or problems, contact <John_Jenkins@taligent.com>
-#
-#
-0x2121 = 0x3000
-0x2122 = 0x3001
-0x2123 = 0x3002
-0x2124 = 0x00B7
-0x2125 = 0x02C9
-0x2126 = 0x02C7
-0x2127 = 0x00A8
-0x2128 = 0x3003
-0x2129 = 0x3005
-0x212A = 0x2014
-0x212B = 0xFF5E
-0x212C = 0x2016
-0x212D = 0x2026
-0x212E = 0x2018
-0x212F = 0x2019
-0x2130 = 0x201C
-0x2131 = 0x201D
-0x2132 = 0x3014
-0x2133 = 0x3015
-0x2134 = 0x3008
-0x2135 = 0x3009
-0x2136 = 0x300A
-0x2137 = 0x300B
-0x2138 = 0x300C
-0x2139 = 0x300D
-0x213A = 0x300E
-0x213B = 0x300F
-0x213C = 0x3016
-0x213D = 0x3017
-0x213E = 0x3010
-0x213F = 0x3011
-0x2140 = 0x00B1
-0x2141 = 0x00D7
-0x2142 = 0x00F7
-0x2143 = 0x2236
-0x2144 = 0x2227
-0x2145 = 0x2228
-0x2146 = 0x2211
-0x2147 = 0x220F
-0x2148 = 0x222A
-0x2149 = 0x2229
-0x214A = 0x2208
-0x214B = 0x2237
-0x214C = 0x221A
-0x214D = 0x22A5
-0x214E = 0x2225
-0x214F = 0x2220
-0x2150 = 0x2312
-0x2151 = 0x2299
-0x2152 = 0x222B
-0x2153 = 0x222E
-0x2154 = 0x2261
-0x2155 = 0x224C
-0x2156 = 0x2248
-0x2157 = 0x223D
-0x2158 = 0x221D
-0x2159 = 0x2260
-0x215A = 0x226E
-0x215B = 0x226F
-0x215C = 0x2264
-0x215D = 0x2265
-0x215E = 0x221E
-0x215F = 0x2235
-0x2160 = 0x2234
-0x2161 = 0x2642
-0x2162 = 0x2640
-0x2163 = 0x00B0
-0x2164 = 0x2032
-0x2165 = 0x2033
-0x2166 = 0x2103
-0x2167 = 0xFF04
-0x2168 = 0x00A4
-0x2169 = 0xFFE0
-0x216A = 0xFFE1
-0x216B = 0x2030
-0x216C = 0x00A7
-0x216D = 0x2116
-0x216E = 0x2606
-0x216F = 0x2605
-0x2170 = 0x25CB
-0x2171 = 0x25CF
-0x2172 = 0x25CE
-0x2173 = 0x25C7
-0x2174 = 0x25C6
-0x2175 = 0x25A1
-0x2176 = 0x25A0
-0x2177 = 0x25B3
-0x2178 = 0x25B2
-0x2179 = 0x203B
-0x217A = 0x2192
-0x217B = 0x2190
-0x217C = 0x2191
-0x217D = 0x2193
-0x217E = 0x3013
-0x2231 = 0x2488
-0x2232 = 0x2489
-0x2233 = 0x248A
-0x2234 = 0x248B
-0x2235 = 0x248C
-0x2236 = 0x248D
-0x2237 = 0x248E
-0x2238 = 0x248F
-0x2239 = 0x2490
-0x223A = 0x2491
-0x223B = 0x2492
-0x223C = 0x2493
-0x223D = 0x2494
-0x223E = 0x2495
-0x223F = 0x2496
-0x2240 = 0x2497
-0x2241 = 0x2498
-0x2242 = 0x2499
-0x2243 = 0x249A
-0x2244 = 0x249B
-0x2245 = 0x2474
-0x2246 = 0x2475
-0x2247 = 0x2476
-0x2248 = 0x2477
-0x2249 = 0x2478
-0x224A = 0x2479
-0x224B = 0x247A
-0x224C = 0x247B
-0x224D = 0x247C
-0x224E = 0x247D
-0x224F = 0x247E
-0x2250 = 0x247F
-0x2251 = 0x2480
-0x2252 = 0x2481
-0x2253 = 0x2482
-0x2254 = 0x2483
-0x2255 = 0x2484
-0x2256 = 0x2485
-0x2257 = 0x2486
-0x2258 = 0x2487
-0x2259 = 0x2460
-0x225A = 0x2461
-0x225B = 0x2462
-0x225C = 0x2463
-0x225D = 0x2464
-0x225E = 0x2465
-0x225F = 0x2466
-0x2260 = 0x2467
-0x2261 = 0x2468
-0x2262 = 0x2469
-0x2265 = 0x3220
-0x2266 = 0x3221
-0x2267 = 0x3222
-0x2268 = 0x3223
-0x2269 = 0x3224
-0x226A = 0x3225
-0x226B = 0x3226
-0x226C = 0x3227
-0x226D = 0x3228
-0x226E = 0x3229
-0x2271 = 0x2160
-0x2272 = 0x2161
-0x2273 = 0x2162
-0x2274 = 0x2163
-0x2275 = 0x2164
-0x2276 = 0x2165
-0x2277 = 0x2166
-0x2278 = 0x2167
-0x2279 = 0x2168
-0x227A = 0x2169
-0x227B = 0x216A
-0x227C = 0x216B
-0x2321 = 0xFF01
-0x2322 = 0xFF02
-0x2323 = 0xFF03
-0x2324 = 0xFFE5
-0x2325 = 0xFF05
-0x2326 = 0xFF06
-0x2327 = 0xFF07
-0x2328 = 0xFF08
-0x2329 = 0xFF09
-0x232A = 0xFF0A
-0x232B = 0xFF0B
-0x232C = 0xFF0C
-0x232D = 0xFF0D
-0x232E = 0xFF0E
-0x232F = 0xFF0F
-0x2330 = 0xFF10
-0x2331 = 0xFF11
-0x2332 = 0xFF12
-0x2333 = 0xFF13
-0x2334 = 0xFF14
-0x2335 = 0xFF15
-0x2336 = 0xFF16
-0x2337 = 0xFF17
-0x2338 = 0xFF18
-0x2339 = 0xFF19
-0x233A = 0xFF1A
-0x233B = 0xFF1B
-0x233C = 0xFF1C
-0x233D = 0xFF1D
-0x233E = 0xFF1E
-0x233F = 0xFF1F
-0x2340 = 0xFF20
-0x2341 = 0xFF21
-0x2342 = 0xFF22
-0x2343 = 0xFF23
-0x2344 = 0xFF24
-0x2345 = 0xFF25
-0x2346 = 0xFF26
-0x2347 = 0xFF27
-0x2348 = 0xFF28
-0x2349 = 0xFF29
-0x234A = 0xFF2A
-0x234B = 0xFF2B
-0x234C = 0xFF2C
-0x234D = 0xFF2D
-0x234E = 0xFF2E
-0x234F = 0xFF2F
-0x2350 = 0xFF30
-0x2351 = 0xFF31
-0x2352 = 0xFF32
-0x2353 = 0xFF33
-0x2354 = 0xFF34
-0x2355 = 0xFF35
-0x2356 = 0xFF36
-0x2357 = 0xFF37
-0x2358 = 0xFF38
-0x2359 = 0xFF39
-0x235A = 0xFF3A
-0x235B = 0xFF3B
-0x235C = 0xFF3C
-0x235D = 0xFF3D
-0x235E = 0xFF3E
-0x235F = 0xFF3F
-0x2360 = 0xFF40
-0x2361 = 0xFF41
-0x2362 = 0xFF42
-0x2363 = 0xFF43
-0x2364 = 0xFF44
-0x2365 = 0xFF45
-0x2366 = 0xFF46
-0x2367 = 0xFF47
-0x2368 = 0xFF48
-0x2369 = 0xFF49
-0x236A = 0xFF4A
-0x236B = 0xFF4B
-0x236C = 0xFF4C
-0x236D = 0xFF4D
-0x236E = 0xFF4E
-0x236F = 0xFF4F
-0x2370 = 0xFF50
-0x2371 = 0xFF51
-0x2372 = 0xFF52
-0x2373 = 0xFF53
-0x2374 = 0xFF54
-0x2375 = 0xFF55
-0x2376 = 0xFF56
-0x2377 = 0xFF57
-0x2378 = 0xFF58
-0x2379 = 0xFF59
-0x237A = 0xFF5A
-0x237B = 0xFF5B
-0x237C = 0xFF5C
-0x237D = 0xFF5D
-0x237E = 0xFFE3
-0x2421 = 0x3041
-0x2422 = 0x3042
-0x2423 = 0x3043
-0x2424 = 0x3044
-0x2425 = 0x3045
-0x2426 = 0x3046
-0x2427 = 0x3047
-0x2428 = 0x3048
-0x2429 = 0x3049
-0x242A = 0x304A
-0x242B = 0x304B
-0x242C = 0x304C
-0x242D = 0x304D
-0x242E = 0x304E
-0x242F = 0x304F
-0x2430 = 0x3050
-0x2431 = 0x3051
-0x2432 = 0x3052
-0x2433 = 0x3053
-0x2434 = 0x3054
-0x2435 = 0x3055
-0x2436 = 0x3056
-0x2437 = 0x3057
-0x2438 = 0x3058
-0x2439 = 0x3059
-0x243A = 0x305A
-0x243B = 0x305B
-0x243C = 0x305C
-0x243D = 0x305D
-0x243E = 0x305E
-0x243F = 0x305F
-0x2440 = 0x3060
-0x2441 = 0x3061
-0x2442 = 0x3062
-0x2443 = 0x3063
-0x2444 = 0x3064
-0x2445 = 0x3065
-0x2446 = 0x3066
-0x2447 = 0x3067
-0x2448 = 0x3068
-0x2449 = 0x3069
-0x244A = 0x306A
-0x244B = 0x306B
-0x244C = 0x306C
-0x244D = 0x306D
-0x244E = 0x306E
-0x244F = 0x306F
-0x2450 = 0x3070
-0x2451 = 0x3071
-0x2452 = 0x3072
-0x2453 = 0x3073
-0x2454 = 0x3074
-0x2455 = 0x3075
-0x2456 = 0x3076
-0x2457 = 0x3077
-0x2458 = 0x3078
-0x2459 = 0x3079
-0x245A = 0x307A
-0x245B = 0x307B
-0x245C = 0x307C
-0x245D = 0x307D
-0x245E = 0x307E
-0x245F = 0x307F
-0x2460 = 0x3080
-0x2461 = 0x3081
-0x2462 = 0x3082
-0x2463 = 0x3083
-0x2464 = 0x3084
-0x2465 = 0x3085
-0x2466 = 0x3086
-0x2467 = 0x3087
-0x2468 = 0x3088
-0x2469 = 0x3089
-0x246A = 0x308A
-0x246B = 0x308B
-0x246C = 0x308C
-0x246D = 0x308D
-0x246E = 0x308E
-0x246F = 0x308F
-0x2470 = 0x3090
-0x2471 = 0x3091
-0x2472 = 0x3092
-0x2473 = 0x3093
-0x2521 = 0x30A1
-0x2522 = 0x30A2
-0x2523 = 0x30A3
-0x2524 = 0x30A4
-0x2525 = 0x30A5
-0x2526 = 0x30A6
-0x2527 = 0x30A7
-0x2528 = 0x30A8
-0x2529 = 0x30A9
-0x252A = 0x30AA
-0x252B = 0x30AB
-0x252C = 0x30AC
-0x252D = 0x30AD
-0x252E = 0x30AE
-0x252F = 0x30AF
-0x2530 = 0x30B0
-0x2531 = 0x30B1
-0x2532 = 0x30B2
-0x2533 = 0x30B3
-0x2534 = 0x30B4
-0x2535 = 0x30B5
-0x2536 = 0x30B6
-0x2537 = 0x30B7
-0x2538 = 0x30B8
-0x2539 = 0x30B9
-0x253A = 0x30BA
-0x253B = 0x30BB
-0x253C = 0x30BC
-0x253D = 0x30BD
-0x253E = 0x30BE
-0x253F = 0x30BF
-0x2540 = 0x30C0
-0x2541 = 0x30C1
-0x2542 = 0x30C2
-0x2543 = 0x30C3
-0x2544 = 0x30C4
-0x2545 = 0x30C5
-0x2546 = 0x30C6
-0x2547 = 0x30C7
-0x2548 = 0x30C8
-0x2549 = 0x30C9
-0x254A = 0x30CA
-0x254B = 0x30CB
-0x254C = 0x30CC
-0x254D = 0x30CD
-0x254E = 0x30CE
-0x254F = 0x30CF
-0x2550 = 0x30D0
-0x2551 = 0x30D1
-0x2552 = 0x30D2
-0x2553 = 0x30D3
-0x2554 = 0x30D4
-0x2555 = 0x30D5
-0x2556 = 0x30D6
-0x2557 = 0x30D7
-0x2558 = 0x30D8
-0x2559 = 0x30D9
-0x255A = 0x30DA
-0x255B = 0x30DB
-0x255C = 0x30DC
-0x255D = 0x30DD
-0x255E = 0x30DE
-0x255F = 0x30DF
-0x2560 = 0x30E0
-0x2561 = 0x30E1
-0x2562 = 0x30E2
-0x2563 = 0x30E3
-0x2564 = 0x30E4
-0x2565 = 0x30E5
-0x2566 = 0x30E6
-0x2567 = 0x30E7
-0x2568 = 0x30E8
-0x2569 = 0x30E9
-0x256A = 0x30EA
-0x256B = 0x30EB
-0x256C = 0x30EC
-0x256D = 0x30ED
-0x256E = 0x30EE
-0x256F = 0x30EF
-0x2570 = 0x30F0
-0x2571 = 0x30F1
-0x2572 = 0x30F2
-0x2573 = 0x30F3
-0x2574 = 0x30F4
-0x2575 = 0x30F5
-0x2576 = 0x30F6
-0x2621 = 0x0391
-0x2622 = 0x0392
-0x2623 = 0x0393
-0x2624 = 0x0394
-0x2625 = 0x0395
-0x2626 = 0x0396
-0x2627 = 0x0397
-0x2628 = 0x0398
-0x2629 = 0x0399
-0x262A = 0x039A
-0x262B = 0x039B
-0x262C = 0x039C
-0x262D = 0x039D
-0x262E = 0x039E
-0x262F = 0x039F
-0x2630 = 0x03A0
-0x2631 = 0x03A1
-0x2632 = 0x03A3
-0x2633 = 0x03A4
-0x2634 = 0x03A5
-0x2635 = 0x03A6
-0x2636 = 0x03A7
-0x2637 = 0x03A8
-0x2638 = 0x03A9
-0x2641 = 0x03B1
-0x2642 = 0x03B2
-0x2643 = 0x03B3
-0x2644 = 0x03B4
-0x2645 = 0x03B5
-0x2646 = 0x03B6
-0x2647 = 0x03B7
-0x2648 = 0x03B8
-0x2649 = 0x03B9
-0x264A = 0x03BA
-0x264B = 0x03BB
-0x264C = 0x03BC
-0x264D = 0x03BD
-0x264E = 0x03BE
-0x264F = 0x03BF
-0x2650 = 0x03C0
-0x2651 = 0x03C1
-0x2652 = 0x03C3
-0x2653 = 0x03C4
-0x2654 = 0x03C5
-0x2655 = 0x03C6
-0x2656 = 0x03C7
-0x2657 = 0x03C8
-0x2658 = 0x03C9
-0x2721 = 0x0410
-0x2722 = 0x0411
-0x2723 = 0x0412
-0x2724 = 0x0413
-0x2725 = 0x0414
-0x2726 = 0x0415
-0x2727 = 0x0401
-0x2728 = 0x0416
-0x2729 = 0x0417
-0x272A = 0x0418
-0x272B = 0x0419
-0x272C = 0x041A
-0x272D = 0x041B
-0x272E = 0x041C
-0x272F = 0x041D
-0x2730 = 0x041E
-0x2731 = 0x041F
-0x2732 = 0x0420
-0x2733 = 0x0421
-0x2734 = 0x0422
-0x2735 = 0x0423
-0x2736 = 0x0424
-0x2737 = 0x0425
-0x2738 = 0x0426
-0x2739 = 0x0427
-0x273A = 0x0428
-0x273B = 0x0429
-0x273C = 0x042A
-0x273D = 0x042B
-0x273E = 0x042C
-0x273F = 0x042D
-0x2740 = 0x042E
-0x2741 = 0x042F
-0x2751 = 0x0430
-0x2752 = 0x0431
-0x2753 = 0x0432
-0x2754 = 0x0433
-0x2755 = 0x0434
-0x2756 = 0x0435
-0x2757 = 0x0451
-0x2758 = 0x0436
-0x2759 = 0x0437
-0x275A = 0x0438
-0x275B = 0x0439
-0x275C = 0x043A
-0x275D = 0x043B
-0x275E = 0x043C
-0x275F = 0x043D
-0x2760 = 0x043E
-0x2761 = 0x043F
-0x2762 = 0x0440
-0x2763 = 0x0441
-0x2764 = 0x0442
-0x2765 = 0x0443
-0x2766 = 0x0444
-0x2767 = 0x0445
-0x2768 = 0x0446
-0x2769 = 0x0447
-0x276A = 0x0448
-0x276B = 0x0449
-0x276C = 0x044A
-0x276D = 0x044B
-0x276E = 0x044C
-0x276F = 0x044D
-0x2770 = 0x044E
-0x2771 = 0x044F
-0x2821 = 0x0101
-0x2822 = 0x00E1
-0x2823 = 0x01CE
-0x2824 = 0x00E0
-0x2825 = 0x0113
-0x2826 = 0x00E9
-0x2827 = 0x011B
-0x2828 = 0x00E8
-0x2829 = 0x012B
-0x282A = 0x00ED
-0x282B = 0x01D0
-0x282C = 0x00EC
-0x282D = 0x014D
-0x282E = 0x00F3
-0x282F = 0x01D2
-0x2830 = 0x00F2
-0x2831 = 0x016B
-0x2832 = 0x00FA
-0x2833 = 0x01D4
-0x2834 = 0x00F9
-0x2835 = 0x01D6
-0x2836 = 0x01D8
-0x2837 = 0x01DA
-0x2838 = 0x01DC
-0x2839 = 0x00FC
-0x283A = 0x00EA
-0x2845 = 0x3105
-0x2846 = 0x3106
-0x2847 = 0x3107
-0x2848 = 0x3108
-0x2849 = 0x3109
-0x284A = 0x310A
-0x284B = 0x310B
-0x284C = 0x310C
-0x284D = 0x310D
-0x284E = 0x310E
-0x284F = 0x310F
-0x2850 = 0x3110
-0x2851 = 0x3111
-0x2852 = 0x3112
-0x2853 = 0x3113
-0x2854 = 0x3114
-0x2855 = 0x3115
-0x2856 = 0x3116
-0x2857 = 0x3117
-0x2858 = 0x3118
-0x2859 = 0x3119
-0x285A = 0x311A
-0x285B = 0x311B
-0x285C = 0x311C
-0x285D = 0x311D
-0x285E = 0x311E
-0x285F = 0x311F
-0x2860 = 0x3120
-0x2861 = 0x3121
-0x2862 = 0x3122
-0x2863 = 0x3123
-0x2864 = 0x3124
-0x2865 = 0x3125
-0x2866 = 0x3126
-0x2867 = 0x3127
-0x2868 = 0x3128
-0x2869 = 0x3129
-0x2924 = 0x2500
-0x2925 = 0x2501
-0x2926 = 0x2502
-0x2927 = 0x2503
-0x2928 = 0x2504
-0x2929 = 0x2505
-0x292A = 0x2506
-0x292B = 0x2507
-0x292C = 0x2508
-0x292D = 0x2509
-0x292E = 0x250A
-0x292F = 0x250B
-0x2930 = 0x250C
-0x2931 = 0x250D
-0x2932 = 0x250E
-0x2933 = 0x250F
-0x2934 = 0x2510
-0x2935 = 0x2511
-0x2936 = 0x2512
-0x2937 = 0x2513
-0x2938 = 0x2514
-0x2939 = 0x2515
-0x293A = 0x2516
-0x293B = 0x2517
-0x293C = 0x2518
-0x293D = 0x2519
-0x293E = 0x251A
-0x293F = 0x251B
-0x2940 = 0x251C
-0x2941 = 0x251D
-0x2942 = 0x251E
-0x2943 = 0x251F
-0x2944 = 0x2520
-0x2945 = 0x2521
-0x2946 = 0x2522
-0x2947 = 0x2523
-0x2948 = 0x2524
-0x2949 = 0x2525
-0x294A = 0x2526
-0x294B = 0x2527
-0x294C = 0x2528
-0x294D = 0x2529
-0x294E = 0x252A
-0x294F = 0x252B
-0x2950 = 0x252C
-0x2951 = 0x252D
-0x2952 = 0x252E
-0x2953 = 0x252F
-0x2954 = 0x2530
-0x2955 = 0x2531
-0x2956 = 0x2532
-0x2957 = 0x2533
-0x2958 = 0x2534
-0x2959 = 0x2535
-0x295A = 0x2536
-0x295B = 0x2537
-0x295C = 0x2538
-0x295D = 0x2539
-0x295E = 0x253A
-0x295F = 0x253B
-0x2960 = 0x253C
-0x2961 = 0x253D
-0x2962 = 0x253E
-0x2963 = 0x253F
-0x2964 = 0x2540
-0x2965 = 0x2541
-0x2966 = 0x2542
-0x2967 = 0x2543
-0x2968 = 0x2544
-0x2969 = 0x2545
-0x296A = 0x2546
-0x296B = 0x2547
-0x296C = 0x2548
-0x296D = 0x2549
-0x296E = 0x254A
-0x296F = 0x254B
-0x3021 = 0x554A
-0x3022 = 0x963F
-0x3023 = 0x57C3
-0x3024 = 0x6328
-0x3025 = 0x54CE
-0x3026 = 0x5509
-0x3027 = 0x54C0
-0x3028 = 0x769A
-0x3029 = 0x764C
-0x302A = 0x85F9
-0x302B = 0x77EE
-0x302C = 0x827E
-0x302D = 0x7919
-0x302E = 0x611B
-0x302F = 0x9698
-0x3030 = 0x978D
-0x3031 = 0x6C28
-0x3032 = 0x5B89
-0x3033 = 0x4FFA
-0x3034 = 0x6309
-0x3035 = 0x6697
-0x3036 = 0x5CB8
-0x3037 = 0x80FA
-0x3038 = 0x6848
-0x3039 = 0x9AAF
-0x303A = 0x6602
-0x303B = 0x76CE
-0x303C = 0x51F9
-0x303D = 0x6556
-0x303E = 0x71AC
-0x303F = 0x7FF1
-0x3040 = 0x8956
-0x3041 = 0x50B2
-0x3042 = 0x5965
-0x3043 = 0x61CA
-0x3044 = 0x6FB3
-0x3045 = 0x82AD
-0x3046 = 0x634C
-0x3047 = 0x6252
-0x3048 = 0x53ED
-0x3049 = 0x5427
-0x304A = 0x7B06
-0x304B = 0x516B
-0x304C = 0x75A4
-0x304D = 0x5DF4
-0x304E = 0x62D4
-0x304F = 0x8DCB
-0x3050 = 0x9776
-0x3051 = 0x628A
-0x3052 = 0x8019
-0x3053 = 0x58E9
-0x3054 = 0x9738
-0x3055 = 0x7F77
-0x3056 = 0x7238
-0x3057 = 0x767D
-0x3058 = 0x67CF
-0x3059 = 0x767E
-0x305A = 0x64FA
-0x305B = 0x4F70
-0x305C = 0x6557
-0x305D = 0x62DC
-0x305E = 0x7A17
-0x305F = 0x6591
-0x3060 = 0x73ED
-0x3061 = 0x642C
-0x3062 = 0x6273
-0x3063 = 0x822C
-0x3064 = 0x9812
-0x3065 = 0x677F
-0x3066 = 0x7248
-0x3067 = 0x626E
-0x3068 = 0x62CC
-0x3069 = 0x4F34
-0x306A = 0x74E3
-0x306B = 0x534A
-0x306C = 0x8FA6
-0x306D = 0x7D46
-0x306E = 0x90A6
-0x306F = 0x5E6B
-0x3070 = 0x6886
-0x3071 = 0x699C
-0x3072 = 0x8180
-0x3073 = 0x7D81
-0x3074 = 0x68D2
-0x3075 = 0x78C5
-0x3076 = 0x868C
-0x3077 = 0x938A
-0x3078 = 0x508D
-0x3079 = 0x8B17
-0x307A = 0x82DE
-0x307B = 0x80DE
-0x307C = 0x5305
-0x307D = 0x8912
-0x307E = 0x5265
-0x3121 = 0x8584
-0x3122 = 0x96F9
-0x3123 = 0x4FDD
-0x3124 = 0x5821
-0x3125 = 0x98FD
-0x3126 = 0x5BF6
-0x3127 = 0x62B1
-0x3128 = 0x5831
-0x3129 = 0x66B4
-0x312A = 0x8C79
-0x312B = 0x9B91
-0x312C = 0x7206
-0x312D = 0x676F
-0x312E = 0x7891
-0x312F = 0x60B2
-0x3130 = 0x5351
-0x3131 = 0x5317
-0x3132 = 0x8F29
-0x3133 = 0x80CC
-0x3134 = 0x8C9D
-0x3135 = 0x92C7
-0x3136 = 0x500D
-0x3137 = 0x72FD
-0x3138 = 0x5099
-0x3139 = 0x618A
-0x313A = 0x7119
-0x313B = 0x88AB
-0x313C = 0x5954
-0x313D = 0x82EF
-0x313E = 0x672C
-0x313F = 0x7B28
-0x3140 = 0x5D29
-0x3141 = 0x7DB3
-0x3142 = 0x752D
-0x3143 = 0x6CF5
-0x3144 = 0x8E66
-0x3145 = 0x8FF8
-0x3146 = 0x903C
-0x3147 = 0x9F3B
-0x3148 = 0x6BD4
-0x3149 = 0x9119
-0x314A = 0x7B46
-0x314B = 0x5F7C
-0x314C = 0x78A7
-0x314D = 0x84D6
-0x314E = 0x853D
-0x314F = 0x7562
-0x3150 = 0x6583
-0x3151 = 0x6BD6
-0x3152 = 0x5E63
-0x3153 = 0x5E87
-0x3154 = 0x75F9
-0x3155 = 0x9589
-0x3156 = 0x655D
-0x3157 = 0x5F0A
-0x3158 = 0x5FC5
-0x3159 = 0x8F9F
-0x315A = 0x58C1
-0x315B = 0x81C2
-0x315C = 0x907F
-0x315D = 0x965B
-0x315E = 0x97AD
-0x315F = 0x908A
-0x3160 = 0x7DE8
-0x3161 = 0x8CB6
-0x3162 = 0x6241
-0x3163 = 0x4FBF
-0x3164 = 0x8B8A
-0x3165 = 0x535E
-0x3166 = 0x8FA8
-0x3167 = 0x8FAF
-0x3168 = 0x8FAE
-0x3169 = 0x904D
-0x316A = 0x6A19
-0x316B = 0x5F6A
-0x316C = 0x8198
-0x316D = 0x8868
-0x316E = 0x9C49
-0x316F = 0x618B
-0x3170 = 0x522B
-0x3171 = 0x765F
-0x3172 = 0x5F6C
-0x3173 = 0x658C
-0x3174 = 0x7015
-0x3175 = 0x6FF1
-0x3176 = 0x8CD3
-0x3177 = 0x64EF
-0x3178 = 0x5175
-0x3179 = 0x51B0
-0x317A = 0x67C4
-0x317B = 0x4E19
-0x317C = 0x79C9
-0x317D = 0x9905
-0x317E = 0x70B3
-0x3221 = 0x75C5
-0x3222 = 0x5E76
-0x3223 = 0x73BB
-0x3224 = 0x83E0
-0x3225 = 0x64AD
-0x3226 = 0x64A5
-0x3227 = 0x9262
-0x3228 = 0x6CE2
-0x3229 = 0x535A
-0x322A = 0x52C3
-0x322B = 0x640F
-0x322C = 0x9251
-0x322D = 0x7B94
-0x322E = 0x4F2F
-0x322F = 0x5E1B
-0x3230 = 0x8236
-0x3231 = 0x8116
-0x3232 = 0x818A
-0x3233 = 0x6E24
-0x3234 = 0x6CCA
-0x3235 = 0x99C1
-0x3236 = 0x6355
-0x3237 = 0x535C
-0x3238 = 0x54FA
-0x3239 = 0x88DC
-0x323A = 0x57E0
-0x323B = 0x4E0D
-0x323C = 0x5E03
-0x323D = 0x6B65
-0x323E = 0x7C3F
-0x323F = 0x90E8
-0x3240 = 0x6016
-0x3241 = 0x64E6
-0x3242 = 0x731C
-0x3243 = 0x88C1
-0x3244 = 0x6750
-0x3245 = 0x624D
-0x3246 = 0x8CA1
-0x3247 = 0x776C
-0x3248 = 0x8E29
-0x3249 = 0x91C7
-0x324A = 0x5F69
-0x324B = 0x83DC
-0x324C = 0x8521
-0x324D = 0x9910
-0x324E = 0x53C3
-0x324F = 0x8836
-0x3250 = 0x6B98
-0x3251 = 0x615A
-0x3252 = 0x6158
-0x3253 = 0x71E6
-0x3254 = 0x84BC
-0x3255 = 0x8259
-0x3256 = 0x5009
-0x3257 = 0x6EC4
-0x3258 = 0x85CF
-0x3259 = 0x64CD
-0x325A = 0x7CD9
-0x325B = 0x69FD
-0x325C = 0x66F9
-0x325D = 0x8349
-0x325E = 0x53A0
-0x325F = 0x7B56
-0x3260 = 0x5074
-0x3261 = 0x518C
-0x3262 = 0x6E2C
-0x3263 = 0x5C64
-0x3264 = 0x8E6D
-0x3265 = 0x63D2
-0x3266 = 0x53C9
-0x3267 = 0x832C
-0x3268 = 0x8336
-0x3269 = 0x67E5
-0x326A = 0x78B4
-0x326B = 0x643D
-0x326C = 0x5BDF
-0x326D = 0x5C94
-0x326E = 0x5DEE
-0x326F = 0x8A6B
-0x3270 = 0x62C6
-0x3271 = 0x67F4
-0x3272 = 0x8C7A
-0x3273 = 0x6519
-0x3274 = 0x647B
-0x3275 = 0x87EC
-0x3276 = 0x995E
-0x3277 = 0x8B92
-0x3278 = 0x7E8F
-0x3279 = 0x93DF
-0x327A = 0x7523
-0x327B = 0x95E1
-0x327C = 0x986B
-0x327D = 0x660C
-0x327E = 0x7316
-0x3321 = 0x5834
-0x3322 = 0x5617
-0x3323 = 0x5E38
-0x3324 = 0x9577
-0x3325 = 0x511F
-0x3326 = 0x8178
-0x3327 = 0x5EE0
-0x3328 = 0x655E
-0x3329 = 0x66A2
-0x332A = 0x5531
-0x332B = 0x5021
-0x332C = 0x8D85
-0x332D = 0x6284
-0x332E = 0x9214
-0x332F = 0x671D
-0x3330 = 0x5632
-0x3331 = 0x6F6E
-0x3332 = 0x5DE2
-0x3333 = 0x5435
-0x3334 = 0x7092
-0x3335 = 0x8ECA
-0x3336 = 0x626F
-0x3337 = 0x64A4
-0x3338 = 0x63A3
-0x3339 = 0x5FB9
-0x333A = 0x6F88
-0x333B = 0x90F4
-0x333C = 0x81E3
-0x333D = 0x8FB0
-0x333E = 0x5875
-0x333F = 0x6668
-0x3340 = 0x5FF1
-0x3341 = 0x6C89
-0x3342 = 0x9673
-0x3343 = 0x8D81
-0x3344 = 0x896F
-0x3345 = 0x6491
-0x3346 = 0x7A31
-0x3347 = 0x57CE
-0x3348 = 0x6A59
-0x3349 = 0x6210
-0x334A = 0x5448
-0x334B = 0x4E58
-0x334C = 0x7A0B
-0x334D = 0x61F2
-0x334E = 0x6F84
-0x334F = 0x8AA0
-0x3350 = 0x627F
-0x3351 = 0x901E
-0x3352 = 0x9A01
-0x3353 = 0x79E4
-0x3354 = 0x5403
-0x3355 = 0x75F4
-0x3356 = 0x6301
-0x3357 = 0x5319
-0x3358 = 0x6C60
-0x3359 = 0x9072
-0x335A = 0x5F1B
-0x335B = 0x99B3
-0x335C = 0x803B
-0x335D = 0x9F52
-0x335E = 0x4F88
-0x335F = 0x5C3A
-0x3360 = 0x8D64
-0x3361 = 0x7FC5
-0x3362 = 0x65A5
-0x3363 = 0x71BE
-0x3364 = 0x5145
-0x3365 = 0x885D
-0x3366 = 0x87F2
-0x3367 = 0x5D07
-0x3368 = 0x5BF5
-0x3369 = 0x62BD
-0x336A = 0x916C
-0x336B = 0x7587
-0x336C = 0x8E8A
-0x336D = 0x7A20
-0x336E = 0x6101
-0x336F = 0x7C4C
-0x3370 = 0x4EC7
-0x3371 = 0x7DA2
-0x3372 = 0x7785
-0x3373 = 0x919C
-0x3374 = 0x81ED
-0x3375 = 0x521D
-0x3376 = 0x51FA
-0x3377 = 0x6A71
-0x3378 = 0x53A8
-0x3379 = 0x8E87
-0x337A = 0x92E4
-0x337B = 0x96DB
-0x337C = 0x6EC1
-0x337D = 0x9664
-0x337E = 0x695A
-0x3421 = 0x790E
-0x3422 = 0x5132
-0x3423 = 0x77D7
-0x3424 = 0x6410
-0x3425 = 0x89F8
-0x3426 = 0x8655
-0x3427 = 0x63E3
-0x3428 = 0x5DDD
-0x3429 = 0x7A7F
-0x342A = 0x693D
-0x342B = 0x50B3
-0x342C = 0x8239
-0x342D = 0x5598
-0x342E = 0x4E32
-0x342F = 0x7621
-0x3430 = 0x7A97
-0x3431 = 0x5E62
-0x3432 = 0x5E8A
-0x3433 = 0x95D6
-0x3434 = 0x5275
-0x3435 = 0x5439
-0x3436 = 0x708A
-0x3437 = 0x6376
-0x3438 = 0x9318
-0x3439 = 0x5782
-0x343A = 0x6625
-0x343B = 0x693F
-0x343C = 0x9187
-0x343D = 0x5507
-0x343E = 0x6DF3
-0x343F = 0x7D14
-0x3440 = 0x8822
-0x3441 = 0x6233
-0x3442 = 0x7DBD
-0x3443 = 0x75B5
-0x3444 = 0x8328
-0x3445 = 0x78C1
-0x3446 = 0x96CC
-0x3447 = 0x8FAD
-0x3448 = 0x6148
-0x3449 = 0x74F7
-0x344A = 0x8A5E
-0x344B = 0x6B64
-0x344C = 0x523A
-0x344D = 0x8CDC
-0x344E = 0x6B21
-0x344F = 0x8070
-0x3450 = 0x8471
-0x3451 = 0x56F1
-0x3452 = 0x5306
-0x3453 = 0x5F9E
-0x3454 = 0x53E2
-0x3455 = 0x51D1
-0x3456 = 0x7C97
-0x3457 = 0x918B
-0x3458 = 0x7C07
-0x3459 = 0x4FC3
-0x345A = 0x8EA5
-0x345B = 0x7BE1
-0x345C = 0x7AC4
-0x345D = 0x6467
-0x345E = 0x5D14
-0x345F = 0x50AC
-0x3460 = 0x8106
-0x3461 = 0x7601
-0x3462 = 0x7CB9
-0x3463 = 0x6DEC
-0x3464 = 0x7FE0
-0x3465 = 0x6751
-0x3466 = 0x5B58
-0x3467 = 0x5BF8
-0x3468 = 0x78CB
-0x3469 = 0x64AE
-0x346A = 0x6413
-0x346B = 0x63AA
-0x346C = 0x632B
-0x346D = 0x932F
-0x346E = 0x642D
-0x346F = 0x9054
-0x3470 = 0x7B54
-0x3471 = 0x7629
-0x3472 = 0x6253
-0x3473 = 0x5927
-0x3474 = 0x5446
-0x3475 = 0x6B79
-0x3476 = 0x50A3
-0x3477 = 0x6234
-0x3478 = 0x5E36
-0x3479 = 0x6B86
-0x347A = 0x4EE3
-0x347B = 0x8CB8
-0x347C = 0x888B
-0x347D = 0x5F85
-0x347E = 0x902E
-0x3521 = 0x6020
-0x3522 = 0x803D
-0x3523 = 0x64D4
-0x3524 = 0x4E39
-0x3525 = 0x55AE
-0x3526 = 0x9132
-0x3527 = 0x64A3
-0x3528 = 0x81BD
-0x3529 = 0x65E6
-0x352A = 0x6C2E
-0x352B = 0x4F46
-0x352C = 0x619A
-0x352D = 0x6DE1
-0x352E = 0x8A95
-0x352F = 0x5F48
-0x3530 = 0x86CB
-0x3531 = 0x7576
-0x3532 = 0x64CB
-0x3533 = 0x9EE8
-0x3534 = 0x8569
-0x3535 = 0x6A94
-0x3536 = 0x5200
-0x3537 = 0x6417
-0x3538 = 0x8E48
-0x3539 = 0x5012
-0x353A = 0x5CF6
-0x353B = 0x79B1
-0x353C = 0x5C0E
-0x353D = 0x5230
-0x353E = 0x7A3B
-0x353F = 0x60BC
-0x3540 = 0x9053
-0x3541 = 0x76D7
-0x3542 = 0x5FB7
-0x3543 = 0x5F97
-0x3544 = 0x7684
-0x3545 = 0x8E6C
-0x3546 = 0x71C8
-0x3547 = 0x767B
-0x3548 = 0x7B49
-0x3549 = 0x77AA
-0x354A = 0x51F3
-0x354B = 0x9127
-0x354C = 0x5824
-0x354D = 0x4F4E
-0x354E = 0x6EF4
-0x354F = 0x8FEA
-0x3550 = 0x6575
-0x3551 = 0x7B1B
-0x3552 = 0x72C4
-0x3553 = 0x6ECC
-0x3554 = 0x7FDF
-0x3555 = 0x5AE1
-0x3556 = 0x62B5
-0x3557 = 0x5E95
-0x3558 = 0x5730
-0x3559 = 0x8482
-0x355A = 0x7B2C
-0x355B = 0x5E1D
-0x355C = 0x5F1F
-0x355D = 0x905E
-0x355E = 0x7DE0
-0x355F = 0x985B
-0x3560 = 0x6382
-0x3561 = 0x6EC7
-0x3562 = 0x7898
-0x3563 = 0x9EDE
-0x3564 = 0x5178
-0x3565 = 0x975B
-0x3566 = 0x588A
-0x3567 = 0x96FB
-0x3568 = 0x4F43
-0x3569 = 0x7538
-0x356A = 0x5E97
-0x356B = 0x60E6
-0x356C = 0x5960
-0x356D = 0x6FB1
-0x356E = 0x6BBF
-0x356F = 0x7889
-0x3570 = 0x53FC
-0x3571 = 0x96D5
-0x3572 = 0x51CB
-0x3573 = 0x5201
-0x3574 = 0x6389
-0x3575 = 0x540A
-0x3576 = 0x91E3
-0x3577 = 0x8ABF
-0x3578 = 0x8DCC
-0x3579 = 0x7239
-0x357A = 0x789F
-0x357B = 0x8776
-0x357C = 0x8FED
-0x357D = 0x8ADC
-0x357E = 0x758A
-0x3621 = 0x4E01
-0x3622 = 0x76EF
-0x3623 = 0x53EE
-0x3624 = 0x91D8
-0x3625 = 0x9802
-0x3626 = 0x9F0E
-0x3627 = 0x9320
-0x3628 = 0x5B9A
-0x3629 = 0x8A02
-0x362A = 0x4E22
-0x362B = 0x6771
-0x362C = 0x51AC
-0x362D = 0x8463
-0x362E = 0x61C2
-0x362F = 0x52D5
-0x3630 = 0x68DF
-0x3631 = 0x4F97
-0x3632 = 0x606B
-0x3633 = 0x51CD
-0x3634 = 0x6D1E
-0x3635 = 0x515C
-0x3636 = 0x6296
-0x3637 = 0x9B25
-0x3638 = 0x9661
-0x3639 = 0x8C46
-0x363A = 0x9017
-0x363B = 0x75D8
-0x363C = 0x90FD
-0x363D = 0x7763
-0x363E = 0x6BD2
-0x363F = 0x72A2
-0x3640 = 0x7368
-0x3641 = 0x8B80
-0x3642 = 0x5835
-0x3643 = 0x7779
-0x3644 = 0x8CED
-0x3645 = 0x675C
-0x3646 = 0x934D
-0x3647 = 0x809A
-0x3648 = 0x5EA6
-0x3649 = 0x6E21
-0x364A = 0x5992
-0x364B = 0x7AEF
-0x364C = 0x77ED
-0x364D = 0x935B
-0x364E = 0x6BB5
-0x364F = 0x65B7
-0x3650 = 0x7DDE
-0x3651 = 0x5806
-0x3652 = 0x5151
-0x3653 = 0x968A
-0x3654 = 0x5C0D
-0x3655 = 0x58A9
-0x3656 = 0x5678
-0x3657 = 0x8E72
-0x3658 = 0x6566
-0x3659 = 0x9813
-0x365A = 0x56E4
-0x365B = 0x920D
-0x365C = 0x76FE
-0x365D = 0x9041
-0x365E = 0x6387
-0x365F = 0x54C6
-0x3660 = 0x591A
-0x3661 = 0x596A
-0x3662 = 0x579B
-0x3663 = 0x8EB2
-0x3664 = 0x6735
-0x3665 = 0x8DFA
-0x3666 = 0x8235
-0x3667 = 0x5241
-0x3668 = 0x60F0
-0x3669 = 0x58AE
-0x366A = 0x86FE
-0x366B = 0x5CE8
-0x366C = 0x9D5D
-0x366D = 0x4FC4
-0x366E = 0x984D
-0x366F = 0x8A1B
-0x3670 = 0x5A25
-0x3671 = 0x60E1
-0x3672 = 0x5384
-0x3673 = 0x627C
-0x3674 = 0x904F
-0x3675 = 0x9102
-0x3676 = 0x9913
-0x3677 = 0x6069
-0x3678 = 0x800C
-0x3679 = 0x5152
-0x367A = 0x8033
-0x367B = 0x723E
-0x367C = 0x990C
-0x367D = 0x6D31
-0x367E = 0x4E8C
-0x3721 = 0x8CB3
-0x3722 = 0x767C
-0x3723 = 0x7F70
-0x3724 = 0x7B4F
-0x3725 = 0x4F10
-0x3726 = 0x4E4F
-0x3727 = 0x95A5
-0x3728 = 0x6CD5
-0x3729 = 0x73D0
-0x372A = 0x85E9
-0x372B = 0x5E06
-0x372C = 0x756A
-0x372D = 0x7FFB
-0x372E = 0x6A0A
-0x372F = 0x792C
-0x3730 = 0x91E9
-0x3731 = 0x7E41
-0x3732 = 0x51E1
-0x3733 = 0x7169
-0x3734 = 0x53CD
-0x3735 = 0x8FD4
-0x3736 = 0x7BC4
-0x3737 = 0x8CA9
-0x3738 = 0x72AF
-0x3739 = 0x98EF
-0x373A = 0x6CDB
-0x373B = 0x574A
-0x373C = 0x82B3
-0x373D = 0x65B9
-0x373E = 0x80AA
-0x373F = 0x623F
-0x3740 = 0x9632
-0x3741 = 0x59A8
-0x3742 = 0x4EFF
-0x3743 = 0x8A2A
-0x3744 = 0x7D21
-0x3745 = 0x653E
-0x3746 = 0x83F2
-0x3747 = 0x975E
-0x3748 = 0x5561
-0x3749 = 0x98DB
-0x374A = 0x80A5
-0x374B = 0x532A
-0x374C = 0x8AB9
-0x374D = 0x5420
-0x374E = 0x80BA
-0x374F = 0x5EE2
-0x3750 = 0x6CB8
-0x3751 = 0x8CBB
-0x3752 = 0x82AC
-0x3753 = 0x915A
-0x3754 = 0x5429
-0x3755 = 0x6C1B
-0x3756 = 0x5206
-0x3757 = 0x7D1B
-0x3758 = 0x58B3
-0x3759 = 0x711A
-0x375A = 0x6C7E
-0x375B = 0x7C89
-0x375C = 0x596E
-0x375D = 0x4EFD
-0x375E = 0x5FFF
-0x375F = 0x61A4
-0x3760 = 0x7CDE
-0x3761 = 0x8C50
-0x3762 = 0x5C01
-0x3763 = 0x6953
-0x3764 = 0x8702
-0x3765 = 0x5CF0
-0x3766 = 0x92D2
-0x3767 = 0x98A8
-0x3768 = 0x760B
-0x3769 = 0x70FD
-0x376A = 0x9022
-0x376B = 0x99AE
-0x376C = 0x7E2B
-0x376D = 0x8AF7
-0x376E = 0x5949
-0x376F = 0x9CF3
-0x3770 = 0x4F5B
-0x3771 = 0x5426
-0x3772 = 0x592B
-0x3773 = 0x6577
-0x3774 = 0x819A
-0x3775 = 0x5B75
-0x3776 = 0x6276
-0x3777 = 0x62C2
-0x3778 = 0x8F3B
-0x3779 = 0x5E45
-0x377A = 0x6C1F
-0x377B = 0x7B26
-0x377C = 0x4F0F
-0x377D = 0x4FD8
-0x377E = 0x670D
-0x3821 = 0x6D6E
-0x3822 = 0x6DAA
-0x3823 = 0x798F
-0x3824 = 0x88B1
-0x3825 = 0x5F17
-0x3826 = 0x752B
-0x3827 = 0x64AB
-0x3828 = 0x8F14
-0x3829 = 0x4FEF
-0x382A = 0x91DC
-0x382B = 0x65A7
-0x382C = 0x812F
-0x382D = 0x8151
-0x382E = 0x5E9C
-0x382F = 0x8150
-0x3830 = 0x8D74
-0x3831 = 0x526F
-0x3832 = 0x8986
-0x3833 = 0x8CE6
-0x3834 = 0x5FA9
-0x3835 = 0x5085
-0x3836 = 0x4ED8
-0x3837 = 0x961C
-0x3838 = 0x7236
-0x3839 = 0x8179
-0x383A = 0x8CA0
-0x383B = 0x5BCC
-0x383C = 0x8A03
-0x383D = 0x9644
-0x383E = 0x5A66
-0x383F = 0x7E1B
-0x3840 = 0x5490
-0x3841 = 0x5676
-0x3842 = 0x560E
-0x3843 = 0x8A72
-0x3844 = 0x6539
-0x3845 = 0x6982
-0x3846 = 0x9223
-0x3847 = 0x84CB
-0x3848 = 0x6E89
-0x3849 = 0x5E79
-0x384A = 0x7518
-0x384B = 0x6746
-0x384C = 0x67D1
-0x384D = 0x7AFF
-0x384E = 0x809D
-0x384F = 0x8D95
-0x3850 = 0x611F
-0x3851 = 0x79C6
-0x3852 = 0x6562
-0x3853 = 0x8D1B
-0x3854 = 0x5CA1
-0x3855 = 0x525B
-0x3856 = 0x92FC
-0x3857 = 0x7F38
-0x3858 = 0x809B
-0x3859 = 0x7DB1
-0x385A = 0x5D17
-0x385B = 0x6E2F
-0x385C = 0x6760
-0x385D = 0x7BD9
-0x385E = 0x768B
-0x385F = 0x9AD8
-0x3860 = 0x818F
-0x3861 = 0x7F94
-0x3862 = 0x7CD5
-0x3863 = 0x641E
-0x3864 = 0x93AC
-0x3865 = 0x7A3F
-0x3866 = 0x544A
-0x3867 = 0x54E5
-0x3868 = 0x6B4C
-0x3869 = 0x64F1
-0x386A = 0x6208
-0x386B = 0x9D3F
-0x386C = 0x80F3
-0x386D = 0x7599
-0x386E = 0x5272
-0x386F = 0x9769
-0x3870 = 0x845B
-0x3871 = 0x683C
-0x3872 = 0x86E4
-0x3873 = 0x95A3
-0x3874 = 0x9694
-0x3875 = 0x927B
-0x3876 = 0x500B
-0x3877 = 0x5404
-0x3878 = 0x7D66
-0x3879 = 0x6839
-0x387A = 0x8DDF
-0x387B = 0x8015
-0x387C = 0x66F4
-0x387D = 0x5E9A
-0x387E = 0x7FB9
-0x3921 = 0x57C2
-0x3922 = 0x803F
-0x3923 = 0x6897
-0x3924 = 0x5DE5
-0x3925 = 0x653B
-0x3926 = 0x529F
-0x3927 = 0x606D
-0x3928 = 0x9F94
-0x3929 = 0x4F9B
-0x392A = 0x8EAC
-0x392B = 0x516C
-0x392C = 0x5BAB
-0x392D = 0x5F13
-0x392E = 0x978F
-0x392F = 0x6C5E
-0x3930 = 0x62F1
-0x3931 = 0x8CA2
-0x3932 = 0x5171
-0x3933 = 0x920E
-0x3934 = 0x52FE
-0x3935 = 0x6E9D
-0x3936 = 0x82DF
-0x3937 = 0x72D7
-0x3938 = 0x57A2
-0x3939 = 0x69CB
-0x393A = 0x8CFC
-0x393B = 0x591F
-0x393C = 0x8F9C
-0x393D = 0x83C7
-0x393E = 0x5495
-0x393F = 0x7B8D
-0x3940 = 0x4F30
-0x3941 = 0x6CBD
-0x3942 = 0x5B64
-0x3943 = 0x59D1
-0x3944 = 0x9F13
-0x3945 = 0x53E4
-0x3946 = 0x8831
-0x3947 = 0x9AA8
-0x3948 = 0x8C37
-0x3949 = 0x80A1
-0x394A = 0x6545
-0x394B = 0x9867
-0x394C = 0x56FA
-0x394D = 0x96C7
-0x394E = 0x522E
-0x394F = 0x74DC
-0x3950 = 0x526E
-0x3951 = 0x5BE1
-0x3952 = 0x6302
-0x3953 = 0x8902
-0x3954 = 0x4E56
-0x3955 = 0x62D0
-0x3956 = 0x602A
-0x3957 = 0x68FA
-0x3958 = 0x95DC
-0x3959 = 0x5B98
-0x395A = 0x51A0
-0x395B = 0x89C0
-0x395C = 0x7BA1
-0x395D = 0x9928
-0x395E = 0x7F50
-0x395F = 0x6163
-0x3960 = 0x704C
-0x3961 = 0x8CAB
-0x3962 = 0x5149
-0x3963 = 0x5EE3
-0x3964 = 0x901B
-0x3965 = 0x7470
-0x3966 = 0x898F
-0x3967 = 0x572D
-0x3968 = 0x7845
-0x3969 = 0x6B78
-0x396A = 0x9F9C
-0x396B = 0x95A8
-0x396C = 0x8ECC
-0x396D = 0x9B3C
-0x396E = 0x8A6D
-0x396F = 0x7678
-0x3970 = 0x6842
-0x3971 = 0x6AC3
-0x3972 = 0x8DEA
-0x3973 = 0x8CB4
-0x3974 = 0x528A
-0x3975 = 0x8F25
-0x3976 = 0x6EDA
-0x3977 = 0x68CD
-0x3978 = 0x934B
-0x3979 = 0x90ED
-0x397A = 0x570B
-0x397B = 0x679C
-0x397C = 0x88F9
-0x397D = 0x904E
-0x397E = 0x54C8
-0x3A21 = 0x9AB8
-0x3A22 = 0x5B69
-0x3A23 = 0x6D77
-0x3A24 = 0x6C26
-0x3A25 = 0x4EA5
-0x3A26 = 0x5BB3
-0x3A27 = 0x99ED
-0x3A28 = 0x9163
-0x3A29 = 0x61A8
-0x3A2A = 0x90AF
-0x3A2B = 0x97D3
-0x3A2C = 0x542B
-0x3A2D = 0x6DB5
-0x3A2E = 0x5BD2
-0x3A2F = 0x51FD
-0x3A30 = 0x558A
-0x3A31 = 0x7F55
-0x3A32 = 0x7FF0
-0x3A33 = 0x64BC
-0x3A34 = 0x634D
-0x3A35 = 0x65F1
-0x3A36 = 0x61BE
-0x3A37 = 0x608D
-0x3A38 = 0x710A
-0x3A39 = 0x6C57
-0x3A3A = 0x6F22
-0x3A3B = 0x592F
-0x3A3C = 0x676D
-0x3A3D = 0x822A
-0x3A3E = 0x58D5
-0x3A3F = 0x568E
-0x3A40 = 0x8C6A
-0x3A41 = 0x6BEB
-0x3A42 = 0x90DD
-0x3A43 = 0x597D
-0x3A44 = 0x8017
-0x3A45 = 0x865F
-0x3A46 = 0x6D69
-0x3A47 = 0x5475
-0x3A48 = 0x559D
-0x3A49 = 0x8377
-0x3A4A = 0x83CF
-0x3A4B = 0x6838
-0x3A4C = 0x79BE
-0x3A4D = 0x548C
-0x3A4E = 0x4F55
-0x3A4F = 0x5408
-0x3A50 = 0x76D2
-0x3A51 = 0x8C89
-0x3A52 = 0x95A1
-0x3A53 = 0x6CB3
-0x3A54 = 0x6DB8
-0x3A55 = 0x8D6B
-0x3A56 = 0x8910
-0x3A57 = 0x9DB4
-0x3A58 = 0x8CC0
-0x3A59 = 0x563F
-0x3A5A = 0x9ED1
-0x3A5B = 0x75D5
-0x3A5C = 0x5F88
-0x3A5D = 0x72E0
-0x3A5E = 0x6068
-0x3A5F = 0x54FC
-0x3A60 = 0x4EA8
-0x3A61 = 0x6A2A
-0x3A62 = 0x8861
-0x3A63 = 0x6052
-0x3A64 = 0x8F5F
-0x3A65 = 0x54C4
-0x3A66 = 0x70D8
-0x3A67 = 0x8679
-0x3A68 = 0x9D3B
-0x3A69 = 0x6D2A
-0x3A6A = 0x5B8F
-0x3A6B = 0x5F18
-0x3A6C = 0x7D05
-0x3A6D = 0x5589
-0x3A6E = 0x4FAF
-0x3A6F = 0x7334
-0x3A70 = 0x543C
-0x3A71 = 0x539A
-0x3A72 = 0x5019
-0x3A73 = 0x5F8C
-0x3A74 = 0x547C
-0x3A75 = 0x4E4E
-0x3A76 = 0x5FFD
-0x3A77 = 0x745A
-0x3A78 = 0x58FA
-0x3A79 = 0x846B
-0x3A7A = 0x80E1
-0x3A7B = 0x8774
-0x3A7C = 0x72D0
-0x3A7D = 0x7CCA
-0x3A7E = 0x6E56
-0x3B21 = 0x5F27
-0x3B22 = 0x864E
-0x3B23 = 0x552C
-0x3B24 = 0x8B77
-0x3B25 = 0x4E92
-0x3B26 = 0x6EEC
-0x3B27 = 0x6237
-0x3B28 = 0x82B1
-0x3B29 = 0x5629
-0x3B2A = 0x83EF
-0x3B2B = 0x733E
-0x3B2C = 0x6ED1
-0x3B2D = 0x756B
-0x3B2E = 0x5283
-0x3B2F = 0x5316
-0x3B30 = 0x8A71
-0x3B31 = 0x69D0
-0x3B32 = 0x5F8A
-0x3B33 = 0x61F7
-0x3B34 = 0x6DEE
-0x3B35 = 0x58DE
-0x3B36 = 0x6B61
-0x3B37 = 0x74B0
-0x3B38 = 0x6853
-0x3B39 = 0x9084
-0x3B3A = 0x7DE9
-0x3B3B = 0x63DB
-0x3B3C = 0x60A3
-0x3B3D = 0x559A
-0x3B3E = 0x7613
-0x3B3F = 0x8C62
-0x3B40 = 0x7165
-0x3B41 = 0x6E19
-0x3B42 = 0x5BA6
-0x3B43 = 0x5E7B
-0x3B44 = 0x8352
-0x3B45 = 0x614C
-0x3B46 = 0x9EC4
-0x3B47 = 0x78FA
-0x3B48 = 0x8757
-0x3B49 = 0x7C27
-0x3B4A = 0x7687
-0x3B4B = 0x51F0
-0x3B4C = 0x60F6
-0x3B4D = 0x714C
-0x3B4E = 0x6643
-0x3B4F = 0x5E4C
-0x3B50 = 0x604D
-0x3B51 = 0x8B0A
-0x3B52 = 0x7070
-0x3B53 = 0x63EE
-0x3B54 = 0x8F1D
-0x3B55 = 0x5FBD
-0x3B56 = 0x6062
-0x3B57 = 0x86D4
-0x3B58 = 0x56DE
-0x3B59 = 0x6BC1
-0x3B5A = 0x6094
-0x3B5B = 0x6167
-0x3B5C = 0x5349
-0x3B5D = 0x60E0
-0x3B5E = 0x6666
-0x3B5F = 0x8CC4
-0x3B60 = 0x7A62
-0x3B61 = 0x6703
-0x3B62 = 0x71F4
-0x3B63 = 0x532F
-0x3B64 = 0x8AF1
-0x3B65 = 0x8AA8
-0x3B66 = 0x7E6A
-0x3B67 = 0x8477
-0x3B68 = 0x660F
-0x3B69 = 0x5A5A
-0x3B6A = 0x9B42
-0x3B6B = 0x6E3E
-0x3B6C = 0x6DF7
-0x3B6D = 0x8C41
-0x3B6E = 0x6D3B
-0x3B6F = 0x4F19
-0x3B70 = 0x706B
-0x3B71 = 0x7372
-0x3B72 = 0x6216
-0x3B73 = 0x60D1
-0x3B74 = 0x970D
-0x3B75 = 0x8CA8
-0x3B76 = 0x798D
-0x3B77 = 0x64CA
-0x3B78 = 0x573E
-0x3B79 = 0x57FA
-0x3B7A = 0x6A5F
-0x3B7B = 0x7578
-0x3B7C = 0x7A3D
-0x3B7D = 0x7A4D
-0x3B7E = 0x7B95
-0x3C21 = 0x808C
-0x3C22 = 0x9951
-0x3C23 = 0x8FF9
-0x3C24 = 0x6FC0
-0x3C25 = 0x8B4F
-0x3C26 = 0x9DC4
-0x3C27 = 0x59EC
-0x3C28 = 0x7E3E
-0x3C29 = 0x7DDD
-0x3C2A = 0x5409
-0x3C2B = 0x6975
-0x3C2C = 0x68D8
-0x3C2D = 0x8F2F
-0x3C2E = 0x7C4D
-0x3C2F = 0x96C6
-0x3C30 = 0x53CA
-0x3C31 = 0x6025
-0x3C32 = 0x75BE
-0x3C33 = 0x6C72
-0x3C34 = 0x5373
-0x3C35 = 0x5AC9
-0x3C36 = 0x7D1A
-0x3C37 = 0x64E0
-0x3C38 = 0x5E7E
-0x3C39 = 0x810A
-0x3C3A = 0x5DF1
-0x3C3B = 0x858A
-0x3C3C = 0x6280
-0x3C3D = 0x5180
-0x3C3E = 0x5B63
-0x3C3F = 0x4F0E
-0x3C40 = 0x796D
-0x3C41 = 0x5291
-0x3C42 = 0x60B8
-0x3C43 = 0x6FDF
-0x3C44 = 0x5BC4
-0x3C45 = 0x5BC2
-0x3C46 = 0x8A08
-0x3C47 = 0x8A18
-0x3C48 = 0x65E2
-0x3C49 = 0x5FCC
-0x3C4A = 0x969B
-0x3C4B = 0x5993
-0x3C4C = 0x7E7C
-0x3C4D = 0x7D00
-0x3C4E = 0x5609
-0x3C4F = 0x67B7
-0x3C50 = 0x593E
-0x3C51 = 0x4F73
-0x3C52 = 0x5BB6
-0x3C53 = 0x52A0
-0x3C54 = 0x83A2
-0x3C55 = 0x9830
-0x3C56 = 0x8CC8
-0x3C57 = 0x7532
-0x3C58 = 0x9240
-0x3C59 = 0x5047
-0x3C5A = 0x7A3C
-0x3C5B = 0x50F9
-0x3C5C = 0x67B6
-0x3C5D = 0x99D5
-0x3C5E = 0x5AC1
-0x3C5F = 0x6BB2
-0x3C60 = 0x76E3
-0x3C61 = 0x5805
-0x3C62 = 0x5C16
-0x3C63 = 0x7B8B
-0x3C64 = 0x9593
-0x3C65 = 0x714E
-0x3C66 = 0x517C
-0x3C67 = 0x80A9
-0x3C68 = 0x8271
-0x3C69 = 0x5978
-0x3C6A = 0x7DD8
-0x3C6B = 0x7E6D
-0x3C6C = 0x6AA2
-0x3C6D = 0x67EC
-0x3C6E = 0x78B1
-0x3C6F = 0x9E7C
-0x3C70 = 0x63C0
-0x3C71 = 0x64BF
-0x3C72 = 0x7C21
-0x3C73 = 0x5109
-0x3C74 = 0x526A
-0x3C75 = 0x51CF
-0x3C76 = 0x85A6
-0x3C77 = 0x6ABB
-0x3C78 = 0x9452
-0x3C79 = 0x8E10
-0x3C7A = 0x8CE4
-0x3C7B = 0x898B
-0x3C7C = 0x9375
-0x3C7D = 0x7BAD
-0x3C7E = 0x4EF6
-0x3D21 = 0x5065
-0x3D22 = 0x8266
-0x3D23 = 0x528D
-0x3D24 = 0x991E
-0x3D25 = 0x6F38
-0x3D26 = 0x6FFA
-0x3D27 = 0x6F97
-0x3D28 = 0x5EFA
-0x3D29 = 0x50F5
-0x3D2A = 0x59DC
-0x3D2B = 0x5C07
-0x3D2C = 0x6F3F
-0x3D2D = 0x6C5F
-0x3D2E = 0x7586
-0x3D2F = 0x8523
-0x3D30 = 0x69F3
-0x3D31 = 0x596C
-0x3D32 = 0x8B1B
-0x3D33 = 0x5320
-0x3D34 = 0x91AC
-0x3D35 = 0x964D
-0x3D36 = 0x8549
-0x3D37 = 0x6912
-0x3D38 = 0x7901
-0x3D39 = 0x7126
-0x3D3A = 0x81A0
-0x3D3B = 0x4EA4
-0x3D3C = 0x90CA
-0x3D3D = 0x6F86
-0x3D3E = 0x9A55
-0x3D3F = 0x5B0C
-0x3D40 = 0x56BC
-0x3D41 = 0x652A
-0x3D42 = 0x9278
-0x3D43 = 0x77EF
-0x3D44 = 0x50E5
-0x3D45 = 0x811A
-0x3D46 = 0x72E1
-0x3D47 = 0x89D2
-0x3D48 = 0x9903
-0x3D49 = 0x7E73
-0x3D4A = 0x7D5E
-0x3D4B = 0x527F
-0x3D4C = 0x6559
-0x3D4D = 0x9175
-0x3D4E = 0x8F4E
-0x3D4F = 0x8F03
-0x3D50 = 0x53EB
-0x3D51 = 0x7A96
-0x3D52 = 0x63ED
-0x3D53 = 0x63A5
-0x3D54 = 0x7686
-0x3D55 = 0x79F8
-0x3D56 = 0x8857
-0x3D57 = 0x968E
-0x3D58 = 0x622A
-0x3D59 = 0x52AB
-0x3D5A = 0x7BC0
-0x3D5B = 0x6854
-0x3D5C = 0x6770
-0x3D5D = 0x6377
-0x3D5E = 0x776B
-0x3D5F = 0x7AED
-0x3D60 = 0x6F54
-0x3D61 = 0x7D50
-0x3D62 = 0x89E3
-0x3D63 = 0x59D0
-0x3D64 = 0x6212
-0x3D65 = 0x85C9
-0x3D66 = 0x82A5
-0x3D67 = 0x754C
-0x3D68 = 0x501F
-0x3D69 = 0x4ECB
-0x3D6A = 0x75A5
-0x3D6B = 0x8AA1
-0x3D6C = 0x5C4A
-0x3D6D = 0x5DFE
-0x3D6E = 0x7B4B
-0x3D6F = 0x65A4
-0x3D70 = 0x91D1
-0x3D71 = 0x4ECA
-0x3D72 = 0x6D25
-0x3D73 = 0x895F
-0x3D74 = 0x7DCA
-0x3D75 = 0x9326
-0x3D76 = 0x50C5
-0x3D77 = 0x8B39
-0x3D78 = 0x9032
-0x3D79 = 0x9773
-0x3D7A = 0x6649
-0x3D7B = 0x7981
-0x3D7C = 0x8FD1
-0x3D7D = 0x71FC
-0x3D7E = 0x6D78
-0x3E21 = 0x76E1
-0x3E22 = 0x52C1
-0x3E23 = 0x8346
-0x3E24 = 0x5162
-0x3E25 = 0x8396
-0x3E26 = 0x775B
-0x3E27 = 0x6676
-0x3E28 = 0x9BE8
-0x3E29 = 0x4EAC
-0x3E2A = 0x9A5A
-0x3E2B = 0x7CBE
-0x3E2C = 0x7CB3
-0x3E2D = 0x7D93
-0x3E2E = 0x4E95
-0x3E2F = 0x8B66
-0x3E30 = 0x666F
-0x3E31 = 0x9838
-0x3E32 = 0x975C
-0x3E33 = 0x5883
-0x3E34 = 0x656C
-0x3E35 = 0x93E1
-0x3E36 = 0x5F91
-0x3E37 = 0x75D9
-0x3E38 = 0x9756
-0x3E39 = 0x7ADF
-0x3E3A = 0x7AF6
-0x3E3B = 0x51C8
-0x3E3C = 0x70AF
-0x3E3D = 0x7A98
-0x3E3E = 0x63EA
-0x3E3F = 0x7A76
-0x3E40 = 0x7CFE
-0x3E41 = 0x7396
-0x3E42 = 0x97ED
-0x3E43 = 0x4E45
-0x3E44 = 0x7078
-0x3E45 = 0x4E5D
-0x3E46 = 0x9152
-0x3E47 = 0x53A9
-0x3E48 = 0x6551
-0x3E49 = 0x820A
-0x3E4A = 0x81FC
-0x3E4B = 0x8205
-0x3E4C = 0x548E
-0x3E4D = 0x5C31
-0x3E4E = 0x759A
-0x3E4F = 0x97A0
-0x3E50 = 0x62D8
-0x3E51 = 0x72D9
-0x3E52 = 0x75BD
-0x3E53 = 0x5C45
-0x3E54 = 0x99D2
-0x3E55 = 0x83CA
-0x3E56 = 0x5C40
-0x3E57 = 0x5480
-0x3E58 = 0x77E9
-0x3E59 = 0x8209
-0x3E5A = 0x6CAE
-0x3E5B = 0x805A
-0x3E5C = 0x62D2
-0x3E5D = 0x64DA
-0x3E5E = 0x5DE8
-0x3E5F = 0x5177
-0x3E60 = 0x8DDD
-0x3E61 = 0x8E1E
-0x3E62 = 0x92F8
-0x3E63 = 0x4FF1
-0x3E64 = 0x53E5
-0x3E65 = 0x61FC
-0x3E66 = 0x70AC
-0x3E67 = 0x5287
-0x3E68 = 0x6350
-0x3E69 = 0x9D51
-0x3E6A = 0x5A1F
-0x3E6B = 0x5026
-0x3E6C = 0x7737
-0x3E6D = 0x5377
-0x3E6E = 0x7D79
-0x3E6F = 0x6485
-0x3E70 = 0x652B
-0x3E71 = 0x6289
-0x3E72 = 0x6398
-0x3E73 = 0x5014
-0x3E74 = 0x7235
-0x3E75 = 0x89BA
-0x3E76 = 0x51B3
-0x3E77 = 0x8A23
-0x3E78 = 0x7D76
-0x3E79 = 0x5747
-0x3E7A = 0x83CC
-0x3E7B = 0x921E
-0x3E7C = 0x8ECD
-0x3E7D = 0x541B
-0x3E7E = 0x5CFB
-0x3F21 = 0x4FCA
-0x3F22 = 0x7AE3
-0x3F23 = 0x6D5A
-0x3F24 = 0x90E1
-0x3F25 = 0x99FF
-0x3F26 = 0x5580
-0x3F27 = 0x5496
-0x3F28 = 0x5361
-0x3F29 = 0x54AF
-0x3F2A = 0x958B
-0x3F2B = 0x63E9
-0x3F2C = 0x6977
-0x3F2D = 0x51F1
-0x3F2E = 0x6168
-0x3F2F = 0x520A
-0x3F30 = 0x582A
-0x3F31 = 0x52D8
-0x3F32 = 0x574E
-0x3F33 = 0x780D
-0x3F34 = 0x770B
-0x3F35 = 0x5EB7
-0x3F36 = 0x6177
-0x3F37 = 0x7CE0
-0x3F38 = 0x625B
-0x3F39 = 0x6297
-0x3F3A = 0x4EA2
-0x3F3B = 0x7095
-0x3F3C = 0x8003
-0x3F3D = 0x62F7
-0x3F3E = 0x70E4
-0x3F3F = 0x9760
-0x3F40 = 0x5777
-0x3F41 = 0x82DB
-0x3F42 = 0x67EF
-0x3F43 = 0x68F5
-0x3F44 = 0x78D5
-0x3F45 = 0x9846
-0x3F46 = 0x79D1
-0x3F47 = 0x6BBB
-0x3F48 = 0x54B3
-0x3F49 = 0x53EF
-0x3F4A = 0x6E34
-0x3F4B = 0x514B
-0x3F4C = 0x523B
-0x3F4D = 0x5BA2
-0x3F4E = 0x8AB2
-0x3F4F = 0x80AF
-0x3F50 = 0x5543
-0x3F51 = 0x58BE
-0x3F52 = 0x61C7
-0x3F53 = 0x5751
-0x3F54 = 0x542D
-0x3F55 = 0x7A7A
-0x3F56 = 0x6050
-0x3F57 = 0x5B54
-0x3F58 = 0x63A7
-0x3F59 = 0x6473
-0x3F5A = 0x53E3
-0x3F5B = 0x6263
-0x3F5C = 0x5BC7
-0x3F5D = 0x67AF
-0x3F5E = 0x54ED
-0x3F5F = 0x7A9F
-0x3F60 = 0x82E6
-0x3F61 = 0x9177
-0x3F62 = 0x5EAB
-0x3F63 = 0x8932
-0x3F64 = 0x8A87
-0x3F65 = 0x57AE
-0x3F66 = 0x630E
-0x3F67 = 0x8DE8
-0x3F68 = 0x80EF
-0x3F69 = 0x584A
-0x3F6A = 0x7B77
-0x3F6B = 0x5108
-0x3F6C = 0x5FEB
-0x3F6D = 0x5BEC
-0x3F6E = 0x6B3E
-0x3F6F = 0x5321
-0x3F70 = 0x7B50
-0x3F71 = 0x72C2
-0x3F72 = 0x6846
-0x3F73 = 0x7926
-0x3F74 = 0x7736
-0x3F75 = 0x66E0
-0x3F76 = 0x51B5
-0x3F77 = 0x8667
-0x3F78 = 0x76D4
-0x3F79 = 0x5DCB
-0x3F7A = 0x7ABA
-0x3F7B = 0x8475
-0x3F7C = 0x594E
-0x3F7D = 0x9B41
-0x3F7E = 0x5080
-0x4021 = 0x994B
-0x4022 = 0x6127
-0x4023 = 0x6F70
-0x4024 = 0x5764
-0x4025 = 0x6606
-0x4026 = 0x6346
-0x4027 = 0x56F0
-0x4028 = 0x62EC
-0x4029 = 0x64F4
-0x402A = 0x5ED3
-0x402B = 0x95CA
-0x402C = 0x5783
-0x402D = 0x62C9
-0x402E = 0x5587
-0x402F = 0x881F
-0x4030 = 0x81D8
-0x4031 = 0x8FA3
-0x4032 = 0x5566
-0x4033 = 0x840A
-0x4034 = 0x4F86
-0x4035 = 0x8CF4
-0x4036 = 0x85CD
-0x4037 = 0x5A6A
-0x4038 = 0x6B04
-0x4039 = 0x6514
-0x403A = 0x7C43
-0x403B = 0x95CC
-0x403C = 0x862D
-0x403D = 0x703E
-0x403E = 0x8B95
-0x403F = 0x652C
-0x4040 = 0x89BD
-0x4041 = 0x61F6
-0x4042 = 0x7E9C
-0x4043 = 0x721B
-0x4044 = 0x6FEB
-0x4045 = 0x7405
-0x4046 = 0x6994
-0x4047 = 0x72FC
-0x4048 = 0x5ECA
-0x4049 = 0x90CE
-0x404A = 0x6717
-0x404B = 0x6D6A
-0x404C = 0x6488
-0x404D = 0x52DE
-0x404E = 0x7262
-0x404F = 0x8001
-0x4050 = 0x4F6C
-0x4051 = 0x59E5
-0x4052 = 0x916A
-0x4053 = 0x70D9
-0x4054 = 0x6F87
-0x4055 = 0x52D2
-0x4056 = 0x6A02
-0x4057 = 0x96F7
-0x4058 = 0x9433
-0x4059 = 0x857E
-0x405A = 0x78CA
-0x405B = 0x7D2F
-0x405C = 0x5121
-0x405D = 0x58D8
-0x405E = 0x64C2
-0x405F = 0x808B
-0x4060 = 0x985E
-0x4061 = 0x6CEA
-0x4062 = 0x68F1
-0x4063 = 0x695E
-0x4064 = 0x51B7
-0x4065 = 0x5398
-0x4066 = 0x68A8
-0x4067 = 0x7281
-0x4068 = 0x9ECE
-0x4069 = 0x7C6C
-0x406A = 0x72F8
-0x406B = 0x96E2
-0x406C = 0x7055
-0x406D = 0x7406
-0x406E = 0x674E
-0x406F = 0x88CF
-0x4070 = 0x9BC9
-0x4071 = 0x79AE
-0x4072 = 0x8389
-0x4073 = 0x8354
-0x4074 = 0x540F
-0x4075 = 0x6817
-0x4076 = 0x9E97
-0x4077 = 0x53B2
-0x4078 = 0x52F5
-0x4079 = 0x792B
-0x407A = 0x6B77
-0x407B = 0x5229
-0x407C = 0x5088
-0x407D = 0x4F8B
-0x407E = 0x4FD0
-0x4121 = 0x75E2
-0x4122 = 0x7ACB
-0x4123 = 0x7C92
-0x4124 = 0x701D
-0x4125 = 0x96B8
-0x4126 = 0x529B
-0x4127 = 0x7483
-0x4128 = 0x54E9
-0x4129 = 0x5006
-0x412A = 0x806F
-0x412B = 0x84EE
-0x412C = 0x9023
-0x412D = 0x942E
-0x412E = 0x5EC9
-0x412F = 0x6190
-0x4130 = 0x6F23
-0x4131 = 0x7C3E
-0x4132 = 0x6582
-0x4133 = 0x81C9
-0x4134 = 0x93C8
-0x4135 = 0x6200
-0x4136 = 0x7149
-0x4137 = 0x7DF4
-0x4138 = 0x7CE7
-0x4139 = 0x51C9
-0x413A = 0x6881
-0x413B = 0x7CB1
-0x413C = 0x826F
-0x413D = 0x5169
-0x413E = 0x8F1B
-0x413F = 0x91CF
-0x4140 = 0x667E
-0x4141 = 0x4EAE
-0x4142 = 0x8AD2
-0x4143 = 0x64A9
-0x4144 = 0x804A
-0x4145 = 0x50DA
-0x4146 = 0x7642
-0x4147 = 0x71CE
-0x4148 = 0x5BE5
-0x4149 = 0x907C
-0x414A = 0x6F66
-0x414B = 0x4E86
-0x414C = 0x6482
-0x414D = 0x9410
-0x414E = 0x5ED6
-0x414F = 0x6599
-0x4150 = 0x5217
-0x4151 = 0x88C2
-0x4152 = 0x70C8
-0x4153 = 0x52A3
-0x4154 = 0x7375
-0x4155 = 0x7433
-0x4156 = 0x6797
-0x4157 = 0x78F7
-0x4158 = 0x9716
-0x4159 = 0x81E8
-0x415A = 0x9130
-0x415B = 0x9C57
-0x415C = 0x6DCB
-0x415D = 0x51DB
-0x415E = 0x8CC3
-0x415F = 0x541D
-0x4160 = 0x62CE
-0x4161 = 0x73B2
-0x4162 = 0x83F1
-0x4163 = 0x96F6
-0x4164 = 0x9F61
-0x4165 = 0x9234
-0x4166 = 0x4F36
-0x4167 = 0x7F9A
-0x4168 = 0x51CC
-0x4169 = 0x9748
-0x416A = 0x9675
-0x416B = 0x5DBA
-0x416C = 0x9818
-0x416D = 0x53E6
-0x416E = 0x4EE4
-0x416F = 0x6E9C
-0x4170 = 0x7409
-0x4171 = 0x69B4
-0x4172 = 0x786B
-0x4173 = 0x993E
-0x4174 = 0x7559
-0x4175 = 0x5289
-0x4176 = 0x7624
-0x4177 = 0x6D41
-0x4178 = 0x67F3
-0x4179 = 0x516D
-0x417A = 0x9F8D
-0x417B = 0x807E
-0x417C = 0x56A8
-0x417D = 0x7C60
-0x417E = 0x7ABF
-0x4221 = 0x9686
-0x4222 = 0x58DF
-0x4223 = 0x650F
-0x4224 = 0x96B4
-0x4225 = 0x6A13
-0x4226 = 0x5A41
-0x4227 = 0x645F
-0x4228 = 0x7C0D
-0x4229 = 0x6F0F
-0x422A = 0x964B
-0x422B = 0x8606
-0x422C = 0x76E7
-0x422D = 0x9871
-0x422E = 0x5EEC
-0x422F = 0x7210
-0x4230 = 0x64C4
-0x4231 = 0x6EF7
-0x4232 = 0x865C
-0x4233 = 0x9B6F
-0x4234 = 0x9E93
-0x4235 = 0x788C
-0x4236 = 0x9732
-0x4237 = 0x8DEF
-0x4238 = 0x8CC2
-0x4239 = 0x9E7F
-0x423A = 0x6F5E
-0x423B = 0x7984
-0x423C = 0x9332
-0x423D = 0x9678
-0x423E = 0x622E
-0x423F = 0x9A62
-0x4240 = 0x5415
-0x4241 = 0x92C1
-0x4242 = 0x4FA3
-0x4243 = 0x65C5
-0x4244 = 0x5C65
-0x4245 = 0x5C62
-0x4246 = 0x7E37
-0x4247 = 0x616E
-0x4248 = 0x6C2F
-0x4249 = 0x5F8B
-0x424A = 0x7387
-0x424B = 0x6FFE
-0x424C = 0x7DD1
-0x424D = 0x5DD2
-0x424E = 0x6523
-0x424F = 0x5B7F
-0x4250 = 0x7064
-0x4251 = 0x5375
-0x4252 = 0x4E82
-0x4253 = 0x63A0
-0x4254 = 0x7565
-0x4255 = 0x6384
-0x4256 = 0x8F2A
-0x4257 = 0x502B
-0x4258 = 0x4F96
-0x4259 = 0x6DEA
-0x425A = 0x7DB8
-0x425B = 0x8AD6
-0x425C = 0x863F
-0x425D = 0x87BA
-0x425E = 0x7F85
-0x425F = 0x908F
-0x4260 = 0x947C
-0x4261 = 0x7C6E
-0x4262 = 0x9A3E
-0x4263 = 0x88F8
-0x4264 = 0x843D
-0x4265 = 0x6D1B
-0x4266 = 0x99F1
-0x4267 = 0x7D61
-0x4268 = 0x5ABD
-0x4269 = 0x9EBB
-0x426A = 0x746A
-0x426B = 0x78BC
-0x426C = 0x879E
-0x426D = 0x99AC
-0x426E = 0x99E1
-0x426F = 0x561B
-0x4270 = 0x55CE
-0x4271 = 0x57CB
-0x4272 = 0x8CB7
-0x4273 = 0x9EA5
-0x4274 = 0x8CE3
-0x4275 = 0x9081
-0x4276 = 0x8109
-0x4277 = 0x779E
-0x4278 = 0x9945
-0x4279 = 0x883B
-0x427A = 0x6EFF
-0x427B = 0x8513
-0x427C = 0x66FC
-0x427D = 0x6162
-0x427E = 0x6F2B
-0x4321 = 0x8B3E
-0x4322 = 0x8292
-0x4323 = 0x832B
-0x4324 = 0x76F2
-0x4325 = 0x6C13
-0x4326 = 0x5FD9
-0x4327 = 0x83BD
-0x4328 = 0x732B
-0x4329 = 0x8305
-0x432A = 0x9328
-0x432B = 0x6BDB
-0x432C = 0x77DB
-0x432D = 0x925A
-0x432E = 0x536F
-0x432F = 0x8302
-0x4330 = 0x5192
-0x4331 = 0x5E3D
-0x4332 = 0x8C8C
-0x4333 = 0x8CBF
-0x4334 = 0x9EBD
-0x4335 = 0x73AB
-0x4336 = 0x679A
-0x4337 = 0x6885
-0x4338 = 0x9176
-0x4339 = 0x9709
-0x433A = 0x7164
-0x433B = 0x6CA1
-0x433C = 0x7709
-0x433D = 0x5A92
-0x433E = 0x9382
-0x433F = 0x6BCF
-0x4340 = 0x7F8E
-0x4341 = 0x6627
-0x4342 = 0x5BD0
-0x4343 = 0x59B9
-0x4344 = 0x5A9A
-0x4345 = 0x9580
-0x4346 = 0x60B6
-0x4347 = 0x5011
-0x4348 = 0x840C
-0x4349 = 0x8499
-0x434A = 0x6AAC
-0x434B = 0x76DF
-0x434C = 0x9333
-0x434D = 0x731B
-0x434E = 0x5922
-0x434F = 0x5B5F
-0x4350 = 0x772F
-0x4351 = 0x919A
-0x4352 = 0x9761
-0x4353 = 0x7CDC
-0x4354 = 0x8FF7
-0x4355 = 0x8B0E
-0x4356 = 0x5F4C
-0x4357 = 0x7C73
-0x4358 = 0x79D8
-0x4359 = 0x8993
-0x435A = 0x6CCC
-0x435B = 0x871C
-0x435C = 0x5BC6
-0x435D = 0x5E42
-0x435E = 0x68C9
-0x435F = 0x7720
-0x4360 = 0x7DBF
-0x4361 = 0x5195
-0x4362 = 0x514D
-0x4363 = 0x52C9
-0x4364 = 0x5A29
-0x4365 = 0x7DEC
-0x4366 = 0x9762
-0x4367 = 0x82D7
-0x4368 = 0x63CF
-0x4369 = 0x7784
-0x436A = 0x85D0
-0x436B = 0x79D2
-0x436C = 0x6E3A
-0x436D = 0x5EDF
-0x436E = 0x5999
-0x436F = 0x8511
-0x4370 = 0x6EC5
-0x4371 = 0x6C11
-0x4372 = 0x62BF
-0x4373 = 0x76BF
-0x4374 = 0x654F
-0x4375 = 0x61AB
-0x4376 = 0x95A9
-0x4377 = 0x660E
-0x4378 = 0x879F
-0x4379 = 0x9CF4
-0x437A = 0x9298
-0x437B = 0x540D
-0x437C = 0x547D
-0x437D = 0x8B2C
-0x437E = 0x6478
-0x4421 = 0x6479
-0x4422 = 0x8611
-0x4423 = 0x6A21
-0x4424 = 0x819C
-0x4425 = 0x78E8
-0x4426 = 0x6469
-0x4427 = 0x9B54
-0x4428 = 0x62B9
-0x4429 = 0x672B
-0x442A = 0x83AB
-0x442B = 0x58A8
-0x442C = 0x9ED8
-0x442D = 0x6CAB
-0x442E = 0x6F20
-0x442F = 0x5BDE
-0x4430 = 0x964C
-0x4431 = 0x8B00
-0x4432 = 0x725F
-0x4433 = 0x67D0
-0x4434 = 0x62C7
-0x4435 = 0x7261
-0x4436 = 0x755D
-0x4437 = 0x59C6
-0x4438 = 0x6BCD
-0x4439 = 0x5893
-0x443A = 0x66AE
-0x443B = 0x5E55
-0x443C = 0x52DF
-0x443D = 0x6155
-0x443E = 0x6728
-0x443F = 0x76EE
-0x4440 = 0x7766
-0x4441 = 0x7267
-0x4442 = 0x7A46
-0x4443 = 0x62FF
-0x4444 = 0x54EA
-0x4445 = 0x5450
-0x4446 = 0x9209
-0x4447 = 0x90A3
-0x4448 = 0x5A1C
-0x4449 = 0x7D0D
-0x444A = 0x6C16
-0x444B = 0x4E43
-0x444C = 0x5976
-0x444D = 0x8010
-0x444E = 0x5948
-0x444F = 0x5357
-0x4450 = 0x7537
-0x4451 = 0x96E3
-0x4452 = 0x56CA
-0x4453 = 0x6493
-0x4454 = 0x8166
-0x4455 = 0x60F1
-0x4456 = 0x9B27
-0x4457 = 0x6DD6
-0x4458 = 0x5462
-0x4459 = 0x9912
-0x445A = 0x5185
-0x445B = 0x5AE9
-0x445C = 0x80FD
-0x445D = 0x59AE
-0x445E = 0x9713
-0x445F = 0x502A
-0x4460 = 0x6CE5
-0x4461 = 0x5C3C
-0x4462 = 0x64EC
-0x4463 = 0x4F60
-0x4464 = 0x533F
-0x4465 = 0x81A9
-0x4466 = 0x9006
-0x4467 = 0x6EBA
-0x4468 = 0x852B
-0x4469 = 0x62C8
-0x446A = 0x5E74
-0x446B = 0x78BE
-0x446C = 0x6506
-0x446D = 0x637B
-0x446E = 0x5FF5
-0x446F = 0x5A18
-0x4470 = 0x91C0
-0x4471 = 0x9CE5
-0x4472 = 0x5C3F
-0x4473 = 0x634F
-0x4474 = 0x8076
-0x4475 = 0x5B7D
-0x4476 = 0x5699
-0x4477 = 0x9477
-0x4478 = 0x93B3
-0x4479 = 0x6D85
-0x447A = 0x60A8
-0x447B = 0x6AB8
-0x447C = 0x7370
-0x447D = 0x51DD
-0x447E = 0x5BE7
-0x4521 = 0x64F0
-0x4522 = 0x6FD8
-0x4523 = 0x725B
-0x4524 = 0x626D
-0x4525 = 0x9215
-0x4526 = 0x7D10
-0x4527 = 0x81BF
-0x4528 = 0x6FC3
-0x4529 = 0x8FB2
-0x452A = 0x5F04
-0x452B = 0x5974
-0x452C = 0x52AA
-0x452D = 0x6012
-0x452E = 0x5973
-0x452F = 0x6696
-0x4530 = 0x8650
-0x4531 = 0x7627
-0x4532 = 0x632A
-0x4533 = 0x61E6
-0x4534 = 0x7CEF
-0x4535 = 0x8AFE
-0x4536 = 0x54E6
-0x4537 = 0x6B50
-0x4538 = 0x9DD7
-0x4539 = 0x6BC6
-0x453A = 0x85D5
-0x453B = 0x5614
-0x453C = 0x5076
-0x453D = 0x6F1A
-0x453E = 0x556A
-0x453F = 0x8DB4
-0x4540 = 0x722C
-0x4541 = 0x5E15
-0x4542 = 0x6015
-0x4543 = 0x7436
-0x4544 = 0x62CD
-0x4545 = 0x6392
-0x4546 = 0x724C
-0x4547 = 0x5F98
-0x4548 = 0x6E43
-0x4549 = 0x6D3E
-0x454A = 0x6500
-0x454B = 0x6F58
-0x454C = 0x76E4
-0x454D = 0x78D0
-0x454E = 0x76FC
-0x454F = 0x7554
-0x4550 = 0x5224
-0x4551 = 0x53DB
-0x4552 = 0x4E53
-0x4553 = 0x9F90
-0x4554 = 0x65C1
-0x4555 = 0x802A
-0x4556 = 0x80D6
-0x4557 = 0x629B
-0x4558 = 0x5486
-0x4559 = 0x5228
-0x455A = 0x70AE
-0x455B = 0x888D
-0x455C = 0x8DD1
-0x455D = 0x6CE1
-0x455E = 0x5478
-0x455F = 0x80DA
-0x4560 = 0x57F9
-0x4561 = 0x88F4
-0x4562 = 0x8CE0
-0x4563 = 0x966A
-0x4564 = 0x914D
-0x4565 = 0x4F69
-0x4566 = 0x6C9B
-0x4567 = 0x5674
-0x4568 = 0x76C6
-0x4569 = 0x7830
-0x456A = 0x62A8
-0x456B = 0x70F9
-0x456C = 0x6F8E
-0x456D = 0x5F6D
-0x456E = 0x84EC
-0x456F = 0x68DA
-0x4570 = 0x787C
-0x4571 = 0x7BF7
-0x4572 = 0x81A8
-0x4573 = 0x670B
-0x4574 = 0x9D6C
-0x4575 = 0x6367
-0x4576 = 0x78B0
-0x4577 = 0x576F
-0x4578 = 0x7812
-0x4579 = 0x9739
-0x457A = 0x6279
-0x457B = 0x62AB
-0x457C = 0x5288
-0x457D = 0x7435
-0x457E = 0x6BD7
-0x4621 = 0x5564
-0x4622 = 0x813E
-0x4623 = 0x75B2
-0x4624 = 0x76AE
-0x4625 = 0x5339
-0x4626 = 0x75DE
-0x4627 = 0x50FB
-0x4628 = 0x5C41
-0x4629 = 0x8B6C
-0x462A = 0x7BC7
-0x462B = 0x504F
-0x462C = 0x7247
-0x462D = 0x9A19
-0x462E = 0x98C4
-0x462F = 0x6F02
-0x4630 = 0x74E2
-0x4631 = 0x7968
-0x4632 = 0x6487
-0x4633 = 0x77A5
-0x4634 = 0x62FC
-0x4635 = 0x983B
-0x4636 = 0x8CA7
-0x4637 = 0x54C1
-0x4638 = 0x8058
-0x4639 = 0x4E52
-0x463A = 0x576A
-0x463B = 0x860B
-0x463C = 0x840D
-0x463D = 0x5E73
-0x463E = 0x6191
-0x463F = 0x74F6
-0x4640 = 0x8A55
-0x4641 = 0x5C4F
-0x4642 = 0x5761
-0x4643 = 0x6F51
-0x4644 = 0x9817
-0x4645 = 0x5A46
-0x4646 = 0x7834
-0x4647 = 0x9B44
-0x4648 = 0x8FEB
-0x4649 = 0x7C95
-0x464A = 0x5256
-0x464B = 0x64B2
-0x464C = 0x92EA
-0x464D = 0x50D5
-0x464E = 0x8386
-0x464F = 0x8461
-0x4650 = 0x83E9
-0x4651 = 0x84B2
-0x4652 = 0x57D4
-0x4653 = 0x6A38
-0x4654 = 0x5703
-0x4655 = 0x666E
-0x4656 = 0x6D66
-0x4657 = 0x8B5C
-0x4658 = 0x66DD
-0x4659 = 0x7011
-0x465A = 0x671F
-0x465B = 0x6B3A
-0x465C = 0x68F2
-0x465D = 0x621A
-0x465E = 0x59BB
-0x465F = 0x4E03
-0x4660 = 0x51C4
-0x4661 = 0x6F06
-0x4662 = 0x67D2
-0x4663 = 0x6C8F
-0x4664 = 0x5176
-0x4665 = 0x68CB
-0x4666 = 0x5947
-0x4667 = 0x6B67
-0x4668 = 0x7566
-0x4669 = 0x5D0E
-0x466A = 0x81CD
-0x466B = 0x9F4A
-0x466C = 0x65D7
-0x466D = 0x7948
-0x466E = 0x7941
-0x466F = 0x9A0E
-0x4670 = 0x8D77
-0x4671 = 0x8C48
-0x4672 = 0x4E5E
-0x4673 = 0x4F01
-0x4674 = 0x5553
-0x4675 = 0x5951
-0x4676 = 0x780C
-0x4677 = 0x5668
-0x4678 = 0x6C23
-0x4679 = 0x8FC4
-0x467A = 0x68C4
-0x467B = 0x6C7D
-0x467C = 0x6CE3
-0x467D = 0x8A16
-0x467E = 0x6390
-0x4721 = 0x6070
-0x4722 = 0x6D3D
-0x4723 = 0x727D
-0x4724 = 0x6266
-0x4725 = 0x91FA
-0x4726 = 0x925B
-0x4727 = 0x5343
-0x4728 = 0x9077
-0x4729 = 0x7C3D
-0x472A = 0x4EDF
-0x472B = 0x8B19
-0x472C = 0x4E7E
-0x472D = 0x9ED4
-0x472E = 0x9322
-0x472F = 0x9257
-0x4730 = 0x524D
-0x4731 = 0x6F5B
-0x4732 = 0x9063
-0x4733 = 0x6DFA
-0x4734 = 0x8B74
-0x4735 = 0x5879
-0x4736 = 0x5D4C
-0x4737 = 0x6B20
-0x4738 = 0x6B49
-0x4739 = 0x69CD
-0x473A = 0x55C6
-0x473B = 0x8154
-0x473C = 0x7F8C
-0x473D = 0x58BB
-0x473E = 0x8594
-0x473F = 0x5F3A
-0x4740 = 0x6436
-0x4741 = 0x6A47
-0x4742 = 0x936C
-0x4743 = 0x6572
-0x4744 = 0x6084
-0x4745 = 0x6A4B
-0x4746 = 0x77A7
-0x4747 = 0x55AC
-0x4748 = 0x50D1
-0x4749 = 0x5DE7
-0x474A = 0x9798
-0x474B = 0x64AC
-0x474C = 0x7FF9
-0x474D = 0x5CED
-0x474E = 0x4FCF
-0x474F = 0x7AC5
-0x4750 = 0x5207
-0x4751 = 0x8304
-0x4752 = 0x4E14
-0x4753 = 0x602F
-0x4754 = 0x7ACA
-0x4755 = 0x6B3D
-0x4756 = 0x4FB5
-0x4757 = 0x89AA
-0x4758 = 0x79E6
-0x4759 = 0x7434
-0x475A = 0x52E4
-0x475B = 0x82B9
-0x475C = 0x64D2
-0x475D = 0x79BD
-0x475E = 0x5BE2
-0x475F = 0x6C81
-0x4760 = 0x9752
-0x4761 = 0x8F15
-0x4762 = 0x6C2B
-0x4763 = 0x50BE
-0x4764 = 0x537F
-0x4765 = 0x6E05
-0x4766 = 0x64CE
-0x4767 = 0x6674
-0x4768 = 0x6C30
-0x4769 = 0x60C5
-0x476A = 0x9803
-0x476B = 0x8ACB
-0x476C = 0x6176
-0x476D = 0x74CA
-0x476E = 0x7AAE
-0x476F = 0x79CB
-0x4770 = 0x4E18
-0x4771 = 0x90B1
-0x4772 = 0x7403
-0x4773 = 0x6C42
-0x4774 = 0x56DA
-0x4775 = 0x914B
-0x4776 = 0x6CC5
-0x4777 = 0x8DA8
-0x4778 = 0x5340
-0x4779 = 0x86C6
-0x477A = 0x66F2
-0x477B = 0x8EC0
-0x477C = 0x5C48
-0x477D = 0x9A45
-0x477E = 0x6E20
-0x4821 = 0x53D6
-0x4822 = 0x5A36
-0x4823 = 0x9F72
-0x4824 = 0x8DA3
-0x4825 = 0x53BB
-0x4826 = 0x5708
-0x4827 = 0x9874
-0x4828 = 0x6B0A
-0x4829 = 0x919B
-0x482A = 0x6CC9
-0x482B = 0x5168
-0x482C = 0x75CA
-0x482D = 0x62F3
-0x482E = 0x72AC
-0x482F = 0x5238
-0x4830 = 0x52F8
-0x4831 = 0x7F3A
-0x4832 = 0x7094
-0x4833 = 0x7638
-0x4834 = 0x5374
-0x4835 = 0x9D72
-0x4836 = 0x69B7
-0x4837 = 0x78BA
-0x4838 = 0x96C0
-0x4839 = 0x88D9
-0x483A = 0x7FA4
-0x483B = 0x7136
-0x483C = 0x71C3
-0x483D = 0x5189
-0x483E = 0x67D3
-0x483F = 0x74E4
-0x4840 = 0x58E4
-0x4841 = 0x6518
-0x4842 = 0x56B7
-0x4843 = 0x8B93
-0x4844 = 0x9952
-0x4845 = 0x64FE
-0x4846 = 0x7E5E
-0x4847 = 0x60F9
-0x4848 = 0x71B1
-0x4849 = 0x58EC
-0x484A = 0x4EC1
-0x484B = 0x4EBA
-0x484C = 0x5FCD
-0x484D = 0x97CC
-0x484E = 0x4EFB
-0x484F = 0x8A8D
-0x4850 = 0x5203
-0x4851 = 0x598A
-0x4852 = 0x7D09
-0x4853 = 0x6254
-0x4854 = 0x4ECD
-0x4855 = 0x65E5
-0x4856 = 0x620E
-0x4857 = 0x8338
-0x4858 = 0x84C9
-0x4859 = 0x69AE
-0x485A = 0x878D
-0x485B = 0x7194
-0x485C = 0x6EB6
-0x485D = 0x5BB9
-0x485E = 0x7D68
-0x485F = 0x5197
-0x4860 = 0x63C9
-0x4861 = 0x67D4
-0x4862 = 0x8089
-0x4863 = 0x8339
-0x4864 = 0x8815
-0x4865 = 0x5112
-0x4866 = 0x5B7A
-0x4867 = 0x5982
-0x4868 = 0x8FB1
-0x4869 = 0x4E73
-0x486A = 0x6C5D
-0x486B = 0x5165
-0x486C = 0x8925
-0x486D = 0x8EDF
-0x486E = 0x962E
-0x486F = 0x854A
-0x4870 = 0x745E
-0x4871 = 0x92ED
-0x4872 = 0x958F
-0x4873 = 0x6F64
-0x4874 = 0x82E5
-0x4875 = 0x5F31
-0x4876 = 0x6492
-0x4877 = 0x7051
-0x4878 = 0x85A9
-0x4879 = 0x816E
-0x487A = 0x9C13
-0x487B = 0x585E
-0x487C = 0x8CFD
-0x487D = 0x4E09
-0x487E = 0x53C1
-0x4921 = 0x5098
-0x4922 = 0x6563
-0x4923 = 0x6851
-0x4924 = 0x55D3
-0x4925 = 0x55AA
-0x4926 = 0x6414
-0x4927 = 0x9A37
-0x4928 = 0x6383
-0x4929 = 0x5AC2
-0x492A = 0x745F
-0x492B = 0x8272
-0x492C = 0x6F80
-0x492D = 0x68EE
-0x492E = 0x50E7
-0x492F = 0x838E
-0x4930 = 0x7802
-0x4931 = 0x6BBA
-0x4932 = 0x5239
-0x4933 = 0x6C99
-0x4934 = 0x7D17
-0x4935 = 0x50BB
-0x4936 = 0x5565
-0x4937 = 0x715E
-0x4938 = 0x7BE9
-0x4939 = 0x66EC
-0x493A = 0x73CA
-0x493B = 0x82EB
-0x493C = 0x6749
-0x493D = 0x5C71
-0x493E = 0x5220
-0x493F = 0x717D
-0x4940 = 0x886B
-0x4941 = 0x9583
-0x4942 = 0x965D
-0x4943 = 0x64C5
-0x4944 = 0x8D0D
-0x4945 = 0x81B3
-0x4946 = 0x5584
-0x4947 = 0x6C55
-0x4948 = 0x6247
-0x4949 = 0x7E55
-0x494A = 0x5892
-0x494B = 0x50B7
-0x494C = 0x5546
-0x494D = 0x8CDE
-0x494E = 0x664C
-0x494F = 0x4E0A
-0x4950 = 0x5C1A
-0x4951 = 0x88F3
-0x4952 = 0x68A2
-0x4953 = 0x634E
-0x4954 = 0x7A0D
-0x4955 = 0x71D2
-0x4956 = 0x828D
-0x4957 = 0x52FA
-0x4958 = 0x97F6
-0x4959 = 0x5C11
-0x495A = 0x54E8
-0x495B = 0x90B5
-0x495C = 0x7D39
-0x495D = 0x5962
-0x495E = 0x8CD2
-0x495F = 0x86C7
-0x4960 = 0x820C
-0x4961 = 0x6368
-0x4962 = 0x8D66
-0x4963 = 0x651D
-0x4964 = 0x5C04
-0x4965 = 0x61FE
-0x4966 = 0x6D89
-0x4967 = 0x793E
-0x4968 = 0x8A2D
-0x4969 = 0x7837
-0x496A = 0x7533
-0x496B = 0x547B
-0x496C = 0x4F38
-0x496D = 0x8EAB
-0x496E = 0x6DF1
-0x496F = 0x5A20
-0x4970 = 0x7D33
-0x4971 = 0x795E
-0x4972 = 0x6C88
-0x4973 = 0x5BE9
-0x4974 = 0x5B38
-0x4975 = 0x751A
-0x4976 = 0x814E
-0x4977 = 0x614E
-0x4978 = 0x6EF2
-0x4979 = 0x8072
-0x497A = 0x751F
-0x497B = 0x7525
-0x497C = 0x7272
-0x497D = 0x5347
-0x497E = 0x7E69
-0x4A21 = 0x7701
-0x4A22 = 0x76DB
-0x4A23 = 0x5269
-0x4A24 = 0x52DD
-0x4A25 = 0x8056
-0x4A26 = 0x5E2B
-0x4A27 = 0x5931
-0x4A28 = 0x7345
-0x4A29 = 0x65BD
-0x4A2A = 0x6FD5
-0x4A2B = 0x8A69
-0x4A2C = 0x5C38
-0x4A2D = 0x8671
-0x4A2E = 0x5341
-0x4A2F = 0x77F3
-0x4A30 = 0x62FE
-0x4A31 = 0x6642
-0x4A32 = 0x4EC0
-0x4A33 = 0x98DF
-0x4A34 = 0x8755
-0x4A35 = 0x5BE6
-0x4A36 = 0x8B58
-0x4A37 = 0x53F2
-0x4A38 = 0x77E2
-0x4A39 = 0x4F7F
-0x4A3A = 0x5C4E
-0x4A3B = 0x99DB
-0x4A3C = 0x59CB
-0x4A3D = 0x5F0F
-0x4A3E = 0x793A
-0x4A3F = 0x58EB
-0x4A40 = 0x4E16
-0x4A41 = 0x67FF
-0x4A42 = 0x4E8B
-0x4A43 = 0x62ED
-0x4A44 = 0x8A93
-0x4A45 = 0x901D
-0x4A46 = 0x52E2
-0x4A47 = 0x662F
-0x4A48 = 0x55DC
-0x4A49 = 0x566C
-0x4A4A = 0x9069
-0x4A4B = 0x4ED5
-0x4A4C = 0x4F8D
-0x4A4D = 0x91CB
-0x4A4E = 0x98FE
-0x4A4F = 0x6C0F
-0x4A50 = 0x5E02
-0x4A51 = 0x6043
-0x4A52 = 0x5BA4
-0x4A53 = 0x8996
-0x4A54 = 0x8A66
-0x4A55 = 0x6536
-0x4A56 = 0x624B
-0x4A57 = 0x9996
-0x4A58 = 0x5B88
-0x4A59 = 0x58FD
-0x4A5A = 0x6388
-0x4A5B = 0x552E
-0x4A5C = 0x53D7
-0x4A5D = 0x7626
-0x4A5E = 0x7378
-0x4A5F = 0x852C
-0x4A60 = 0x6A1E
-0x4A61 = 0x68B3
-0x4A62 = 0x6B8A
-0x4A63 = 0x6292
-0x4A64 = 0x8F38
-0x4A65 = 0x53D4
-0x4A66 = 0x8212
-0x4A67 = 0x6DD1
-0x4A68 = 0x758F
-0x4A69 = 0x66F8
-0x4A6A = 0x8D16
-0x4A6B = 0x5B70
-0x4A6C = 0x719F
-0x4A6D = 0x85AF
-0x4A6E = 0x6691
-0x4A6F = 0x66D9
-0x4A70 = 0x7F72
-0x4A71 = 0x8700
-0x4A72 = 0x9ECD
-0x4A73 = 0x9F20
-0x4A74 = 0x5C6C
-0x4A75 = 0x8853
-0x4A76 = 0x8FF0
-0x4A77 = 0x6A39
-0x4A78 = 0x675F
-0x4A79 = 0x620D
-0x4A7A = 0x7AEA
-0x4A7B = 0x5885
-0x4A7C = 0x5EB6
-0x4A7D = 0x6578
-0x4A7E = 0x6F31
-0x4B21 = 0x6055
-0x4B22 = 0x5237
-0x4B23 = 0x800D
-0x4B24 = 0x6454
-0x4B25 = 0x8870
-0x4B26 = 0x7529
-0x4B27 = 0x5E25
-0x4B28 = 0x6813
-0x4B29 = 0x62F4
-0x4B2A = 0x971C
-0x4B2B = 0x96D9
-0x4B2C = 0x723D
-0x4B2D = 0x8AB0
-0x4B2E = 0x6C34
-0x4B2F = 0x7761
-0x4B30 = 0x7A0E
-0x4B31 = 0x542E
-0x4B32 = 0x77AC
-0x4B33 = 0x9806
-0x4B34 = 0x821C
-0x4B35 = 0x8AAC
-0x4B36 = 0x78A9
-0x4B37 = 0x6714
-0x4B38 = 0x720D
-0x4B39 = 0x65AF
-0x4B3A = 0x6495
-0x4B3B = 0x5636
-0x4B3C = 0x601D
-0x4B3D = 0x79C1
-0x4B3E = 0x53F8
-0x4B3F = 0x7D72
-0x4B40 = 0x6B7B
-0x4B41 = 0x8086
-0x4B42 = 0x5BFA
-0x4B43 = 0x55E3
-0x4B44 = 0x56DB
-0x4B45 = 0x4F3A
-0x4B46 = 0x4F3C
-0x4B47 = 0x98FC
-0x4B48 = 0x5DF3
-0x4B49 = 0x9B06
-0x4B4A = 0x8073
-0x4B4B = 0x616B
-0x4B4C = 0x980C
-0x4B4D = 0x9001
-0x4B4E = 0x5B8B
-0x4B4F = 0x8A1F
-0x4B50 = 0x8AA6
-0x4B51 = 0x641C
-0x4B52 = 0x8258
-0x4B53 = 0x64FB
-0x4B54 = 0x55FD
-0x4B55 = 0x8607
-0x4B56 = 0x9165
-0x4B57 = 0x4FD7
-0x4B58 = 0x7D20
-0x4B59 = 0x901F
-0x4B5A = 0x7C9F
-0x4B5B = 0x50F3
-0x4B5C = 0x5851
-0x4B5D = 0x6EAF
-0x4B5E = 0x5BBF
-0x4B5F = 0x8A34
-0x4B60 = 0x8085
-0x4B61 = 0x9178
-0x4B62 = 0x849C
-0x4B63 = 0x7B97
-0x4B64 = 0x96D6
-0x4B65 = 0x968B
-0x4B66 = 0x96A8
-0x4B67 = 0x7D8F
-0x4B68 = 0x9AD3
-0x4B69 = 0x788E
-0x4B6A = 0x6B72
-0x4B6B = 0x7A57
-0x4B6C = 0x9042
-0x4B6D = 0x96A7
-0x4B6E = 0x795F
-0x4B6F = 0x5B6B
-0x4B70 = 0x640D
-0x4B71 = 0x7B0B
-0x4B72 = 0x84D1
-0x4B73 = 0x68AD
-0x4B74 = 0x5506
-0x4B75 = 0x7E2E
-0x4B76 = 0x7463
-0x4B77 = 0x7D22
-0x4B78 = 0x9396
-0x4B79 = 0x6240
-0x4B7A = 0x584C
-0x4B7B = 0x4ED6
-0x4B7C = 0x5B83
-0x4B7D = 0x5979
-0x4B7E = 0x5854
-0x4C21 = 0x737A
-0x4C22 = 0x64BB
-0x4C23 = 0x8E4B
-0x4C24 = 0x8E0F
-0x4C25 = 0x80CE
-0x4C26 = 0x82D4
-0x4C27 = 0x62AC
-0x4C28 = 0x81FA
-0x4C29 = 0x6CF0
-0x4C2A = 0x915E
-0x4C2B = 0x592A
-0x4C2C = 0x614B
-0x4C2D = 0x6C70
-0x4C2E = 0x574D
-0x4C2F = 0x6524
-0x4C30 = 0x8CAA
-0x4C31 = 0x7671
-0x4C32 = 0x7058
-0x4C33 = 0x58C7
-0x4C34 = 0x6A80
-0x4C35 = 0x75F0
-0x4C36 = 0x6F6D
-0x4C37 = 0x8B5A
-0x4C38 = 0x8AC7
-0x4C39 = 0x5766
-0x4C3A = 0x6BEF
-0x4C3B = 0x8892
-0x4C3C = 0x78B3
-0x4C3D = 0x63A2
-0x4C3E = 0x5606
-0x4C3F = 0x70AD
-0x4C40 = 0x6E6F
-0x4C41 = 0x5858
-0x4C42 = 0x642A
-0x4C43 = 0x5802
-0x4C44 = 0x68E0
-0x4C45 = 0x819B
-0x4C46 = 0x5510
-0x4C47 = 0x7CD6
-0x4C48 = 0x5018
-0x4C49 = 0x8EBA
-0x4C4A = 0x6DCC
-0x4C4B = 0x8D9F
-0x4C4C = 0x71D9
-0x4C4D = 0x638F
-0x4C4E = 0x6FE4
-0x4C4F = 0x6ED4
-0x4C50 = 0x7E27
-0x4C51 = 0x8404
-0x4C52 = 0x6843
-0x4C53 = 0x9003
-0x4C54 = 0x6DD8
-0x4C55 = 0x9676
-0x4C56 = 0x8A0E
-0x4C57 = 0x5957
-0x4C58 = 0x7279
-0x4C59 = 0x85E4
-0x4C5A = 0x9A30
-0x4C5B = 0x75BC
-0x4C5C = 0x8B04
-0x4C5D = 0x68AF
-0x4C5E = 0x5254
-0x4C5F = 0x8E22
-0x4C60 = 0x92BB
-0x4C61 = 0x63D0
-0x4C62 = 0x984C
-0x4C63 = 0x8E44
-0x4C64 = 0x557C
-0x4C65 = 0x9AD4
-0x4C66 = 0x66FF
-0x4C67 = 0x568F
-0x4C68 = 0x60D5
-0x4C69 = 0x6D95
-0x4C6A = 0x5243
-0x4C6B = 0x5C49
-0x4C6C = 0x5929
-0x4C6D = 0x6DFB
-0x4C6E = 0x586B
-0x4C6F = 0x7530
-0x4C70 = 0x751C
-0x4C71 = 0x606C
-0x4C72 = 0x8214
-0x4C73 = 0x8146
-0x4C74 = 0x6311
-0x4C75 = 0x689D
-0x4C76 = 0x8FE2
-0x4C77 = 0x773A
-0x4C78 = 0x8DF3
-0x4C79 = 0x8CBC
-0x4C7A = 0x9435
-0x4C7B = 0x5E16
-0x4C7C = 0x5EF3
-0x4C7D = 0x807D
-0x4C7E = 0x70F4
-0x4D21 = 0x6C40
-0x4D22 = 0x5EF7
-0x4D23 = 0x505C
-0x4D24 = 0x4EAD
-0x4D25 = 0x5EAD
-0x4D26 = 0x633A
-0x4D27 = 0x8247
-0x4D28 = 0x901A
-0x4D29 = 0x6850
-0x4D2A = 0x916E
-0x4D2B = 0x77B3
-0x4D2C = 0x540C
-0x4D2D = 0x9285
-0x4D2E = 0x5F64
-0x4D2F = 0x7AE5
-0x4D30 = 0x6876
-0x4D31 = 0x6345
-0x4D32 = 0x7B52
-0x4D33 = 0x7D71
-0x4D34 = 0x75DB
-0x4D35 = 0x5077
-0x4D36 = 0x6295
-0x4D37 = 0x982D
-0x4D38 = 0x900F
-0x4D39 = 0x51F8
-0x4D3A = 0x79C3
-0x4D3B = 0x7A81
-0x4D3C = 0x5716
-0x4D3D = 0x5F92
-0x4D3E = 0x9014
-0x4D3F = 0x5857
-0x4D40 = 0x5C60
-0x4D41 = 0x571F
-0x4D42 = 0x5410
-0x4D43 = 0x5154
-0x4D44 = 0x6E4D
-0x4D45 = 0x5718
-0x4D46 = 0x63A8
-0x4D47 = 0x983D
-0x4D48 = 0x817F
-0x4D49 = 0x8715
-0x4D4A = 0x892A
-0x4D4B = 0x9000
-0x4D4C = 0x541E
-0x4D4D = 0x5C6F
-0x4D4E = 0x81C0
-0x4D4F = 0x62D6
-0x4D50 = 0x6258
-0x4D51 = 0x8131
-0x4D52 = 0x9D15
-0x4D53 = 0x9640
-0x4D54 = 0x99B1
-0x4D55 = 0x99DD
-0x4D56 = 0x6A62
-0x4D57 = 0x59A5
-0x4D58 = 0x62D3
-0x4D59 = 0x553E
-0x4D5A = 0x6316
-0x4D5B = 0x54C7
-0x4D5C = 0x86D9
-0x4D5D = 0x7AAA
-0x4D5E = 0x5A03
-0x4D5F = 0x74E6
-0x4D60 = 0x896A
-0x4D61 = 0x6B6A
-0x4D62 = 0x5916
-0x4D63 = 0x8C4C
-0x4D64 = 0x5F4E
-0x4D65 = 0x7063
-0x4D66 = 0x73A9
-0x4D67 = 0x9811
-0x4D68 = 0x4E38
-0x4D69 = 0x70F7
-0x4D6A = 0x5B8C
-0x4D6B = 0x7897
-0x4D6C = 0x633D
-0x4D6D = 0x665A
-0x4D6E = 0x7696
-0x4D6F = 0x60CB
-0x4D70 = 0x5B9B
-0x4D71 = 0x5A49
-0x4D72 = 0x842C
-0x4D73 = 0x8155
-0x4D74 = 0x6C6A
-0x4D75 = 0x738B
-0x4D76 = 0x4EA1
-0x4D77 = 0x6789
-0x4D78 = 0x7DB2
-0x4D79 = 0x5F80
-0x4D7A = 0x65FA
-0x4D7B = 0x671B
-0x4D7C = 0x5FD8
-0x4D7D = 0x5984
-0x4D7E = 0x5A01
-0x4E21 = 0x5DCD
-0x4E22 = 0x5FAE
-0x4E23 = 0x5371
-0x4E24 = 0x97CB
-0x4E25 = 0x9055
-0x4E26 = 0x6845
-0x4E27 = 0x570D
-0x4E28 = 0x552F
-0x4E29 = 0x60DF
-0x4E2A = 0x7232
-0x4E2B = 0x6FF0
-0x4E2C = 0x7DAD
-0x4E2D = 0x8466
-0x4E2E = 0x840E
-0x4E2F = 0x59D4
-0x4E30 = 0x5049
-0x4E31 = 0x50DE
-0x4E32 = 0x5C3E
-0x4E33 = 0x7DEF
-0x4E34 = 0x672A
-0x4E35 = 0x851A
-0x4E36 = 0x5473
-0x4E37 = 0x754F
-0x4E38 = 0x80C3
-0x4E39 = 0x5582
-0x4E3A = 0x9B4F
-0x4E3B = 0x4F4D
-0x4E3C = 0x6E2D
-0x4E3D = 0x8B02
-0x4E3E = 0x5C09
-0x4E3F = 0x6170
-0x4E40 = 0x885B
-0x4E41 = 0x761F
-0x4E42 = 0x6E29
-0x4E43 = 0x868A
-0x4E44 = 0x6587
-0x4E45 = 0x805E
-0x4E46 = 0x7D0B
-0x4E47 = 0x543B
-0x4E48 = 0x7A69
-0x4E49 = 0x7D0A
-0x4E4A = 0x554F
-0x4E4B = 0x55E1
-0x4E4C = 0x7FC1
-0x4E4D = 0x74EE
-0x4E4E = 0x64BE
-0x4E4F = 0x8778
-0x4E50 = 0x6E26
-0x4E51 = 0x7AA9
-0x4E52 = 0x6211
-0x4E53 = 0x65A1
-0x4E54 = 0x5367
-0x4E55 = 0x63E1
-0x4E56 = 0x6C83
-0x4E57 = 0x5DEB
-0x4E58 = 0x55DA
-0x4E59 = 0x93A2
-0x4E5A = 0x70CF
-0x4E5B = 0x6C61
-0x4E5C = 0x8AA3
-0x4E5D = 0x5C4B
-0x4E5E = 0x7121
-0x4E5F = 0x856A
-0x4E60 = 0x68A7
-0x4E61 = 0x543E
-0x4E62 = 0x5434
-0x4E63 = 0x6BCB
-0x4E64 = 0x6B66
-0x4E65 = 0x4E94
-0x4E66 = 0x6342
-0x4E67 = 0x5348
-0x4E68 = 0x821E
-0x4E69 = 0x4F0D
-0x4E6A = 0x4FAE
-0x4E6B = 0x5862
-0x4E6C = 0x620A
-0x4E6D = 0x9727
-0x4E6E = 0x6664
-0x4E6F = 0x7269
-0x4E70 = 0x52FF
-0x4E71 = 0x52D9
-0x4E72 = 0x609F
-0x4E73 = 0x8AA4
-0x4E74 = 0x6614
-0x4E75 = 0x7199
-0x4E76 = 0x6790
-0x4E77 = 0x897F
-0x4E78 = 0x7852
-0x4E79 = 0x77FD
-0x4E7A = 0x6670
-0x4E7B = 0x563B
-0x4E7C = 0x5438
-0x4E7D = 0x932B
-0x4E7E = 0x72A7
-0x4F21 = 0x7A00
-0x4F22 = 0x606F
-0x4F23 = 0x5E0C
-0x4F24 = 0x6089
-0x4F25 = 0x819D
-0x4F26 = 0x5915
-0x4F27 = 0x60DC
-0x4F28 = 0x7184
-0x4F29 = 0x70EF
-0x4F2A = 0x6EAA
-0x4F2B = 0x6C50
-0x4F2C = 0x7280
-0x4F2D = 0x6A84
-0x4F2E = 0x8972
-0x4F2F = 0x5E2D
-0x4F30 = 0x7FD2
-0x4F31 = 0x5AB3
-0x4F32 = 0x559C
-0x4F33 = 0x9291
-0x4F34 = 0x6D17
-0x4F35 = 0x7CFB
-0x4F36 = 0x9699
-0x4F37 = 0x6232
-0x4F38 = 0x7D30
-0x4F39 = 0x778E
-0x4F3A = 0x8766
-0x4F3B = 0x5323
-0x4F3C = 0x971E
-0x4F3D = 0x8F44
-0x4F3E = 0x6687
-0x4F3F = 0x5CFD
-0x4F40 = 0x4FE0
-0x4F41 = 0x72F9
-0x4F42 = 0x4E0B
-0x4F43 = 0x53A6
-0x4F44 = 0x590F
-0x4F45 = 0x5687
-0x4F46 = 0x6380
-0x4F47 = 0x9341
-0x4F48 = 0x5148
-0x4F49 = 0x4ED9
-0x4F4A = 0x9BAE
-0x4F4B = 0x7E96
-0x4F4C = 0x54B8
-0x4F4D = 0x8CE2
-0x4F4E = 0x929C
-0x4F4F = 0x8237
-0x4F50 = 0x9591
-0x4F51 = 0x6D8E
-0x4F52 = 0x5F26
-0x4F53 = 0x5ACC
-0x4F54 = 0x986F
-0x4F55 = 0x96AA
-0x4F56 = 0x73FE
-0x4F57 = 0x737B
-0x4F58 = 0x7E23
-0x4F59 = 0x817A
-0x4F5A = 0x9921
-0x4F5B = 0x7FA1
-0x4F5C = 0x61B2
-0x4F5D = 0x9677
-0x4F5E = 0x9650
-0x4F5F = 0x7DAB
-0x4F60 = 0x76F8
-0x4F61 = 0x53A2
-0x4F62 = 0x9472
-0x4F63 = 0x9999
-0x4F64 = 0x7BB1
-0x4F65 = 0x8944
-0x4F66 = 0x6E58
-0x4F67 = 0x9109
-0x4F68 = 0x7FD4
-0x4F69 = 0x7965
-0x4F6A = 0x8A73
-0x4F6B = 0x60F3
-0x4F6C = 0x97FF
-0x4F6D = 0x4EAB
-0x4F6E = 0x9805
-0x4F6F = 0x5DF7
-0x4F70 = 0x6A61
-0x4F71 = 0x50CF
-0x4F72 = 0x5411
-0x4F73 = 0x8C61
-0x4F74 = 0x856D
-0x4F75 = 0x785D
-0x4F76 = 0x9704
-0x4F77 = 0x524A
-0x4F78 = 0x54EE
-0x4F79 = 0x56C2
-0x4F7A = 0x92B7
-0x4F7B = 0x6D88
-0x4F7C = 0x5BB5
-0x4F7D = 0x6DC6
-0x4F7E = 0x66C9
-0x5021 = 0x5C0F
-0x5022 = 0x5B5D
-0x5023 = 0x6821
-0x5024 = 0x8096
-0x5025 = 0x562F
-0x5026 = 0x7B11
-0x5027 = 0x6548
-0x5028 = 0x6954
-0x5029 = 0x4E9B
-0x502A = 0x6B47
-0x502B = 0x874E
-0x502C = 0x978B
-0x502D = 0x5354
-0x502E = 0x633E
-0x502F = 0x643A
-0x5030 = 0x90AA
-0x5031 = 0x659C
-0x5032 = 0x8105
-0x5033 = 0x8AE7
-0x5034 = 0x5BEB
-0x5035 = 0x68B0
-0x5036 = 0x5378
-0x5037 = 0x87F9
-0x5038 = 0x61C8
-0x5039 = 0x6CC4
-0x503A = 0x7009
-0x503B = 0x8B1D
-0x503C = 0x5C51
-0x503D = 0x85AA
-0x503E = 0x82AF
-0x503F = 0x92C5
-0x5040 = 0x6B23
-0x5041 = 0x8F9B
-0x5042 = 0x65B0
-0x5043 = 0x5FFB
-0x5044 = 0x5FC3
-0x5045 = 0x4FE1
-0x5046 = 0x91C1
-0x5047 = 0x661F
-0x5048 = 0x8165
-0x5049 = 0x7329
-0x504A = 0x60FA
-0x504B = 0x8208
-0x504C = 0x5211
-0x504D = 0x578B
-0x504E = 0x5F62
-0x504F = 0x90A2
-0x5050 = 0x884C
-0x5051 = 0x9192
-0x5052 = 0x5E78
-0x5053 = 0x674F
-0x5054 = 0x6027
-0x5055 = 0x59D3
-0x5056 = 0x5144
-0x5057 = 0x51F6
-0x5058 = 0x80F8
-0x5059 = 0x5308
-0x505A = 0x6C79
-0x505B = 0x96C4
-0x505C = 0x718A
-0x505D = 0x4F11
-0x505E = 0x4FEE
-0x505F = 0x7F9E
-0x5060 = 0x673D
-0x5061 = 0x55C5
-0x5062 = 0x92B9
-0x5063 = 0x79C0
-0x5064 = 0x8896
-0x5065 = 0x7D89
-0x5066 = 0x589F
-0x5067 = 0x620C
-0x5068 = 0x9700
-0x5069 = 0x865A
-0x506A = 0x5618
-0x506B = 0x9808
-0x506C = 0x5F90
-0x506D = 0x8A31
-0x506E = 0x84C4
-0x506F = 0x9157
-0x5070 = 0x53D9
-0x5071 = 0x65ED
-0x5072 = 0x5E8F
-0x5073 = 0x755C
-0x5074 = 0x6064
-0x5075 = 0x7D6E
-0x5076 = 0x5A7F
-0x5077 = 0x7DD2
-0x5078 = 0x7E8C
-0x5079 = 0x8ED2
-0x507A = 0x55A7
-0x507B = 0x5BA3
-0x507C = 0x61F8
-0x507D = 0x65CB
-0x507E = 0x7384
-0x5121 = 0x9078
-0x5122 = 0x766C
-0x5123 = 0x7729
-0x5124 = 0x7D62
-0x5125 = 0x9774
-0x5126 = 0x859B
-0x5127 = 0x5B78
-0x5128 = 0x7A74
-0x5129 = 0x96EA
-0x512A = 0x8840
-0x512B = 0x52DB
-0x512C = 0x718F
-0x512D = 0x5FAA
-0x512E = 0x65EC
-0x512F = 0x8A62
-0x5130 = 0x5C0B
-0x5131 = 0x99B4
-0x5132 = 0x5DE1
-0x5133 = 0x6B89
-0x5134 = 0x6C5B
-0x5135 = 0x8A13
-0x5136 = 0x8A0A
-0x5137 = 0x905C
-0x5138 = 0x8FC5
-0x5139 = 0x58D3
-0x513A = 0x62BC
-0x513B = 0x9D09
-0x513C = 0x9D28
-0x513D = 0x5440
-0x513E = 0x4E2B
-0x513F = 0x82BD
-0x5140 = 0x7259
-0x5141 = 0x869C
-0x5142 = 0x5D16
-0x5143 = 0x8859
-0x5144 = 0x6DAF
-0x5145 = 0x96C5
-0x5146 = 0x555E
-0x5147 = 0x4E9E
-0x5148 = 0x8A1D
-0x5149 = 0x7109
-0x514A = 0x54BD
-0x514B = 0x95B9
-0x514C = 0x70DF
-0x514D = 0x6DF9
-0x514E = 0x9E7D
-0x514F = 0x56B4
-0x5150 = 0x7814
-0x5151 = 0x8712
-0x5152 = 0x5CA9
-0x5153 = 0x5EF6
-0x5154 = 0x8A00
-0x5155 = 0x9854
-0x5156 = 0x95BB
-0x5157 = 0x708E
-0x5158 = 0x6CBF
-0x5159 = 0x5944
-0x515A = 0x63A9
-0x515B = 0x773C
-0x515C = 0x884D
-0x515D = 0x6F14
-0x515E = 0x8277
-0x515F = 0x5830
-0x5160 = 0x71D5
-0x5161 = 0x53AD
-0x5162 = 0x786F
-0x5163 = 0x96C1
-0x5164 = 0x5501
-0x5165 = 0x5F66
-0x5166 = 0x7130
-0x5167 = 0x5BB4
-0x5168 = 0x8AFA
-0x5169 = 0x9A57
-0x516A = 0x6B83
-0x516B = 0x592E
-0x516C = 0x9D26
-0x516D = 0x79E7
-0x516E = 0x694A
-0x516F = 0x63DA
-0x5170 = 0x4F6F
-0x5171 = 0x760D
-0x5172 = 0x7F8A
-0x5173 = 0x6D0B
-0x5174 = 0x967D
-0x5175 = 0x6C27
-0x5176 = 0x4EF0
-0x5177 = 0x7662
-0x5178 = 0x990A
-0x5179 = 0x6A23
-0x517A = 0x6F3E
-0x517B = 0x9080
-0x517C = 0x8170
-0x517D = 0x5996
-0x517E = 0x7476
-0x5221 = 0x6447
-0x5222 = 0x582F
-0x5223 = 0x9065
-0x5224 = 0x7A91
-0x5225 = 0x8B21
-0x5226 = 0x59DA
-0x5227 = 0x54AC
-0x5228 = 0x8200
-0x5229 = 0x85E5
-0x522A = 0x8981
-0x522B = 0x8000
-0x522C = 0x6930
-0x522D = 0x564E
-0x522E = 0x8036
-0x522F = 0x723A
-0x5230 = 0x91CE
-0x5231 = 0x51B6
-0x5232 = 0x4E5F
-0x5233 = 0x9801
-0x5234 = 0x6396
-0x5235 = 0x696D
-0x5236 = 0x8449
-0x5237 = 0x66F3
-0x5238 = 0x814B
-0x5239 = 0x591C
-0x523A = 0x6DB2
-0x523B = 0x4E00
-0x523C = 0x58F9
-0x523D = 0x91AB
-0x523E = 0x63D6
-0x523F = 0x92A5
-0x5240 = 0x4F9D
-0x5241 = 0x4F0A
-0x5242 = 0x8863
-0x5243 = 0x9824
-0x5244 = 0x5937
-0x5245 = 0x907A
-0x5246 = 0x79FB
-0x5247 = 0x5100
-0x5248 = 0x80F0
-0x5249 = 0x7591
-0x524A = 0x6C82
-0x524B = 0x5B9C
-0x524C = 0x59E8
-0x524D = 0x5F5D
-0x524E = 0x6905
-0x524F = 0x87FB
-0x5250 = 0x501A
-0x5251 = 0x5DF2
-0x5252 = 0x4E59
-0x5253 = 0x77E3
-0x5254 = 0x4EE5
-0x5255 = 0x85DD
-0x5256 = 0x6291
-0x5257 = 0x6613
-0x5258 = 0x9091
-0x5259 = 0x5C79
-0x525A = 0x5104
-0x525B = 0x5F79
-0x525C = 0x81C6
-0x525D = 0x9038
-0x525E = 0x8084
-0x525F = 0x75AB
-0x5260 = 0x4EA6
-0x5261 = 0x88D4
-0x5262 = 0x610F
-0x5263 = 0x6BC5
-0x5264 = 0x61B6
-0x5265 = 0x7FA9
-0x5266 = 0x76CA
-0x5267 = 0x6EA2
-0x5268 = 0x8A63
-0x5269 = 0x8B70
-0x526A = 0x8ABC
-0x526B = 0x8B6F
-0x526C = 0x5F02
-0x526D = 0x7FFC
-0x526E = 0x7FCC
-0x526F = 0x7E79
-0x5270 = 0x8335
-0x5271 = 0x852D
-0x5272 = 0x56E0
-0x5273 = 0x6BB7
-0x5274 = 0x97F3
-0x5275 = 0x9670
-0x5276 = 0x59FB
-0x5277 = 0x541F
-0x5278 = 0x9280
-0x5279 = 0x6DEB
-0x527A = 0x5BC5
-0x527B = 0x98F2
-0x527C = 0x5C39
-0x527D = 0x5F15
-0x527E = 0x96B1
-0x5321 = 0x5370
-0x5322 = 0x82F1
-0x5323 = 0x6AFB
-0x5324 = 0x5B30
-0x5325 = 0x9DF9
-0x5326 = 0x61C9
-0x5327 = 0x7E93
-0x5328 = 0x7469
-0x5329 = 0x87A2
-0x532A = 0x71DF
-0x532B = 0x7192
-0x532C = 0x8805
-0x532D = 0x8FCE
-0x532E = 0x8D0F
-0x532F = 0x76C8
-0x5330 = 0x5F71
-0x5331 = 0x7A4E
-0x5332 = 0x786C
-0x5333 = 0x6620
-0x5334 = 0x55B2
-0x5335 = 0x64C1
-0x5336 = 0x50AD
-0x5337 = 0x81C3
-0x5338 = 0x7670
-0x5339 = 0x5EB8
-0x533A = 0x96CD
-0x533B = 0x8E34
-0x533C = 0x86F9
-0x533D = 0x548F
-0x533E = 0x6CF3
-0x533F = 0x6D8C
-0x5340 = 0x6C38
-0x5341 = 0x607F
-0x5342 = 0x52C7
-0x5343 = 0x7528
-0x5344 = 0x5E7D
-0x5345 = 0x512A
-0x5346 = 0x60A0
-0x5347 = 0x6182
-0x5348 = 0x5C24
-0x5349 = 0x7531
-0x534A = 0x90F5
-0x534B = 0x923E
-0x534C = 0x7336
-0x534D = 0x6CB9
-0x534E = 0x6E38
-0x534F = 0x9149
-0x5350 = 0x6709
-0x5351 = 0x53CB
-0x5352 = 0x53F3
-0x5353 = 0x4F51
-0x5354 = 0x91C9
-0x5355 = 0x8A98
-0x5356 = 0x53C8
-0x5357 = 0x5E7C
-0x5358 = 0x8FC2
-0x5359 = 0x6DE4
-0x535A = 0x4E8E
-0x535B = 0x76C2
-0x535C = 0x6986
-0x535D = 0x865E
-0x535E = 0x611A
-0x535F = 0x8F3F
-0x5360 = 0x9918
-0x5361 = 0x4FDE
-0x5362 = 0x903E
-0x5363 = 0x9B5A
-0x5364 = 0x6109
-0x5365 = 0x6E1D
-0x5366 = 0x6F01
-0x5367 = 0x9685
-0x5368 = 0x4E88
-0x5369 = 0x5A31
-0x536A = 0x96E8
-0x536B = 0x8207
-0x536C = 0x5DBC
-0x536D = 0x79B9
-0x536E = 0x5B87
-0x536F = 0x8A9E
-0x5370 = 0x7FBD
-0x5371 = 0x7389
-0x5372 = 0x57DF
-0x5373 = 0x828B
-0x5374 = 0x9B31
-0x5375 = 0x5401
-0x5376 = 0x9047
-0x5377 = 0x55BB
-0x5378 = 0x5CEA
-0x5379 = 0x5FA1
-0x537A = 0x6108
-0x537B = 0x6B32
-0x537C = 0x7344
-0x537D = 0x80B2
-0x537E = 0x8B7D
-0x5421 = 0x6D74
-0x5422 = 0x5BD3
-0x5423 = 0x88D5
-0x5424 = 0x9810
-0x5425 = 0x8C6B
-0x5426 = 0x99AD
-0x5427 = 0x9D1B
-0x5428 = 0x6DF5
-0x5429 = 0x51A4
-0x542A = 0x5143
-0x542B = 0x57A3
-0x542C = 0x8881
-0x542D = 0x539F
-0x542E = 0x63F4
-0x542F = 0x8F45
-0x5430 = 0x5712
-0x5431 = 0x54E1
-0x5432 = 0x5713
-0x5433 = 0x733F
-0x5434 = 0x6E90
-0x5435 = 0x7DE3
-0x5436 = 0x9060
-0x5437 = 0x82D1
-0x5438 = 0x9858
-0x5439 = 0x6028
-0x543A = 0x9662
-0x543B = 0x66F0
-0x543C = 0x7D04
-0x543D = 0x8D8A
-0x543E = 0x8E8D
-0x543F = 0x9470
-0x5440 = 0x5CB3
-0x5441 = 0x7CA4
-0x5442 = 0x6708
-0x5443 = 0x60A6
-0x5444 = 0x95B2
-0x5445 = 0x8018
-0x5446 = 0x96F2
-0x5447 = 0x9116
-0x5448 = 0x5300
-0x5449 = 0x9695
-0x544A = 0x5141
-0x544B = 0x904B
-0x544C = 0x85F4
-0x544D = 0x9196
-0x544E = 0x6688
-0x544F = 0x97F5
-0x5450 = 0x5B55
-0x5451 = 0x531D
-0x5452 = 0x7838
-0x5453 = 0x96DC
-0x5454 = 0x683D
-0x5455 = 0x54C9
-0x5456 = 0x707E
-0x5457 = 0x5BB0
-0x5458 = 0x8F09
-0x5459 = 0x518D
-0x545A = 0x5728
-0x545B = 0x54B1
-0x545C = 0x6522
-0x545D = 0x66AB
-0x545E = 0x8D0A
-0x545F = 0x8D1C
-0x5460 = 0x81DF
-0x5461 = 0x846C
-0x5462 = 0x906D
-0x5463 = 0x7CDF
-0x5464 = 0x947F
-0x5465 = 0x85FB
-0x5466 = 0x68D7
-0x5467 = 0x65E9
-0x5468 = 0x6FA1
-0x5469 = 0x86A4
-0x546A = 0x8E81
-0x546B = 0x566A
-0x546C = 0x9020
-0x546D = 0x7682
-0x546E = 0x7AC8
-0x546F = 0x71E5
-0x5470 = 0x8CAC
-0x5471 = 0x64C7
-0x5472 = 0x5247
-0x5473 = 0x6FA4
-0x5474 = 0x8CCA
-0x5475 = 0x600E
-0x5476 = 0x589E
-0x5477 = 0x618E
-0x5478 = 0x66FE
-0x5479 = 0x8D08
-0x547A = 0x624E
-0x547B = 0x55B3
-0x547C = 0x6E23
-0x547D = 0x672D
-0x547E = 0x8ECB
-0x5521 = 0x9358
-0x5522 = 0x9598
-0x5523 = 0x7728
-0x5524 = 0x6805
-0x5525 = 0x69A8
-0x5526 = 0x548B
-0x5527 = 0x4E4D
-0x5528 = 0x70B8
-0x5529 = 0x8A50
-0x552A = 0x6458
-0x552B = 0x9F4B
-0x552C = 0x5B85
-0x552D = 0x7A84
-0x552E = 0x50B5
-0x552F = 0x5BE8
-0x5530 = 0x77BB
-0x5531 = 0x6C08
-0x5532 = 0x8A79
-0x5533 = 0x7C98
-0x5534 = 0x6CBE
-0x5535 = 0x76DE
-0x5536 = 0x65AC
-0x5537 = 0x8F3E
-0x5538 = 0x5D84
-0x5539 = 0x5C55
-0x553A = 0x8638
-0x553B = 0x68E7
-0x553C = 0x5360
-0x553D = 0x6230
-0x553E = 0x7AD9
-0x553F = 0x6E5B
-0x5540 = 0x7DBB
-0x5541 = 0x6A1F
-0x5542 = 0x7AE0
-0x5543 = 0x5F70
-0x5544 = 0x6F33
-0x5545 = 0x5F35
-0x5546 = 0x638C
-0x5547 = 0x6F32
-0x5548 = 0x6756
-0x5549 = 0x4E08
-0x554A = 0x5E33
-0x554B = 0x8CEC
-0x554C = 0x4ED7
-0x554D = 0x8139
-0x554E = 0x7634
-0x554F = 0x969C
-0x5550 = 0x62DB
-0x5551 = 0x662D
-0x5552 = 0x627E
-0x5553 = 0x6CBC
-0x5554 = 0x8D99
-0x5555 = 0x7167
-0x5556 = 0x7F69
-0x5557 = 0x5146
-0x5558 = 0x8087
-0x5559 = 0x53EC
-0x555A = 0x906E
-0x555B = 0x6298
-0x555C = 0x54F2
-0x555D = 0x87C4
-0x555E = 0x8F4D
-0x555F = 0x8005
-0x5560 = 0x937A
-0x5561 = 0x8517
-0x5562 = 0x9019
-0x5563 = 0x6D59
-0x5564 = 0x73CD
-0x5565 = 0x659F
-0x5566 = 0x771F
-0x5567 = 0x7504
-0x5568 = 0x7827
-0x5569 = 0x81FB
-0x556A = 0x8C9E
-0x556B = 0x91DD
-0x556C = 0x5075
-0x556D = 0x6795
-0x556E = 0x75B9
-0x556F = 0x8A3A
-0x5570 = 0x9707
-0x5571 = 0x632F
-0x5572 = 0x93AE
-0x5573 = 0x9663
-0x5574 = 0x84B8
-0x5575 = 0x6399
-0x5576 = 0x775C
-0x5577 = 0x5F81
-0x5578 = 0x7319
-0x5579 = 0x722D
-0x557A = 0x6014
-0x557B = 0x6574
-0x557C = 0x62EF
-0x557D = 0x6B63
-0x557E = 0x653F
-0x5621 = 0x5E40
-0x5622 = 0x7665
-0x5623 = 0x912D
-0x5624 = 0x8B49
-0x5625 = 0x829D
-0x5626 = 0x679D
-0x5627 = 0x652F
-0x5628 = 0x5431
-0x5629 = 0x8718
-0x562A = 0x77E5
-0x562B = 0x80A2
-0x562C = 0x8102
-0x562D = 0x6C41
-0x562E = 0x4E4B
-0x562F = 0x7E54
-0x5630 = 0x8077
-0x5631 = 0x76F4
-0x5632 = 0x690D
-0x5633 = 0x6B96
-0x5634 = 0x57F7
-0x5635 = 0x503C
-0x5636 = 0x4F84
-0x5637 = 0x5740
-0x5638 = 0x6307
-0x5639 = 0x6B62
-0x563A = 0x8DBE
-0x563B = 0x8879
-0x563C = 0x65E8
-0x563D = 0x7D19
-0x563E = 0x5FD7
-0x563F = 0x646F
-0x5640 = 0x64F2
-0x5641 = 0x81F3
-0x5642 = 0x81F4
-0x5643 = 0x7F6E
-0x5644 = 0x5E5F
-0x5645 = 0x5CD9
-0x5646 = 0x5236
-0x5647 = 0x667A
-0x5648 = 0x79E9
-0x5649 = 0x7A1A
-0x564A = 0x8CEA
-0x564B = 0x7099
-0x564C = 0x75D4
-0x564D = 0x6EEF
-0x564E = 0x6CBB
-0x564F = 0x7A92
-0x5650 = 0x4E2D
-0x5651 = 0x76C5
-0x5652 = 0x5FE0
-0x5653 = 0x9418
-0x5654 = 0x8877
-0x5655 = 0x7D42
-0x5656 = 0x7A2E
-0x5657 = 0x816B
-0x5658 = 0x91CD
-0x5659 = 0x4EF2
-0x565A = 0x8846
-0x565B = 0x821F
-0x565C = 0x5468
-0x565D = 0x5DDE
-0x565E = 0x6D32
-0x565F = 0x8B05
-0x5660 = 0x7CA5
-0x5661 = 0x8EF8
-0x5662 = 0x8098
-0x5663 = 0x5E1A
-0x5664 = 0x5492
-0x5665 = 0x76BA
-0x5666 = 0x5B99
-0x5667 = 0x665D
-0x5668 = 0x9A5F
-0x5669 = 0x73E0
-0x566A = 0x682A
-0x566B = 0x86DB
-0x566C = 0x6731
-0x566D = 0x732A
-0x566E = 0x8AF8
-0x566F = 0x8A85
-0x5670 = 0x9010
-0x5671 = 0x7AF9
-0x5672 = 0x71ED
-0x5673 = 0x716E
-0x5674 = 0x62C4
-0x5675 = 0x77DA
-0x5676 = 0x56D1
-0x5677 = 0x4E3B
-0x5678 = 0x8457
-0x5679 = 0x67F1
-0x567A = 0x52A9
-0x567B = 0x86C0
-0x567C = 0x8CAF
-0x567D = 0x9444
-0x567E = 0x7BC9
-0x5721 = 0x4F4F
-0x5722 = 0x6CE8
-0x5723 = 0x795D
-0x5724 = 0x99D0
-0x5725 = 0x6293
-0x5726 = 0x722A
-0x5727 = 0x62FD
-0x5728 = 0x5C08
-0x5729 = 0x78DA
-0x572A = 0x8F49
-0x572B = 0x64B0
-0x572C = 0x8CFA
-0x572D = 0x7BC6
-0x572E = 0x6A01
-0x572F = 0x838A
-0x5730 = 0x88DD
-0x5731 = 0x599D
-0x5732 = 0x649E
-0x5733 = 0x58EF
-0x5734 = 0x72C0
-0x5735 = 0x690E
-0x5736 = 0x9310
-0x5737 = 0x8FFD
-0x5738 = 0x8D05
-0x5739 = 0x589C
-0x573A = 0x7DB4
-0x573B = 0x8AC4
-0x573C = 0x6E96
-0x573D = 0x6349
-0x573E = 0x62D9
-0x573F = 0x5353
-0x5740 = 0x684C
-0x5741 = 0x7422
-0x5742 = 0x8301
-0x5743 = 0x914C
-0x5744 = 0x5544
-0x5745 = 0x7740
-0x5746 = 0x707C
-0x5747 = 0x6FC1
-0x5748 = 0x5179
-0x5749 = 0x54A8
-0x574A = 0x8CC7
-0x574B = 0x59FF
-0x574C = 0x6ECB
-0x574D = 0x6DC4
-0x574E = 0x5B5C
-0x574F = 0x7D2B
-0x5750 = 0x4ED4
-0x5751 = 0x7C7D
-0x5752 = 0x6ED3
-0x5753 = 0x5B50
-0x5754 = 0x81EA
-0x5755 = 0x6F2C
-0x5756 = 0x5B57
-0x5757 = 0x9B03
-0x5758 = 0x68D5
-0x5759 = 0x8E2A
-0x575A = 0x5B97
-0x575B = 0x7D9C
-0x575C = 0x7E3D
-0x575D = 0x7E31
-0x575E = 0x9112
-0x575F = 0x8D70
-0x5760 = 0x594F
-0x5761 = 0x63CD
-0x5762 = 0x79DF
-0x5763 = 0x8DB3
-0x5764 = 0x5352
-0x5765 = 0x65CF
-0x5766 = 0x7956
-0x5767 = 0x8A5B
-0x5768 = 0x963B
-0x5769 = 0x7D44
-0x576A = 0x947D
-0x576B = 0x7E82
-0x576C = 0x5634
-0x576D = 0x9189
-0x576E = 0x6700
-0x576F = 0x7F6A
-0x5770 = 0x5C0A
-0x5771 = 0x9075
-0x5772 = 0x6628
-0x5773 = 0x5DE6
-0x5774 = 0x4F50
-0x5775 = 0x67DE
-0x5776 = 0x505A
-0x5777 = 0x4F5C
-0x5778 = 0x5750
-0x5779 = 0x5EA7
-0x5821 = 0x4E8D
-0x5822 = 0x4E0C
-0x5823 = 0x5140
-0x5824 = 0x4E10
-0x5825 = 0x5EFF
-0x5826 = 0x5345
-0x5827 = 0x4E15
-0x5828 = 0x4E98
-0x5829 = 0x4E1E
-0x582A = 0x9B32
-0x582B = 0x5B6C
-0x582C = 0x5669
-0x582D = 0x4E28
-0x582E = 0x79BA
-0x582F = 0x4E3F
-0x5830 = 0x5315
-0x5831 = 0x4E47
-0x5832 = 0x592D
-0x5833 = 0x723B
-0x5834 = 0x536E
-0x5835 = 0x6C10
-0x5836 = 0x56DF
-0x5837 = 0x80E4
-0x5838 = 0x9997
-0x5839 = 0x6BD3
-0x583A = 0x777E
-0x583B = 0x9F17
-0x583C = 0x4E36
-0x583D = 0x4E9F
-0x583E = 0x9F10
-0x583F = 0x4E5C
-0x5840 = 0x4E69
-0x5841 = 0x4E93
-0x5842 = 0x8288
-0x5843 = 0x5B5B
-0x5844 = 0x55C7
-0x5845 = 0x560F
-0x5846 = 0x4EC4
-0x5847 = 0x5399
-0x5848 = 0x539D
-0x5849 = 0x53B4
-0x584A = 0x53A5
-0x584B = 0x53AE
-0x584C = 0x9768
-0x584D = 0x8D0B
-0x584E = 0x531A
-0x584F = 0x53F5
-0x5850 = 0x532D
-0x5851 = 0x5331
-0x5852 = 0x533E
-0x5853 = 0x8CFE
-0x5854 = 0x5366
-0x5855 = 0x5363
-0x5856 = 0x5202
-0x5857 = 0x5208
-0x5858 = 0x520E
-0x5859 = 0x5244
-0x585A = 0x5233
-0x585B = 0x528C
-0x585C = 0x5274
-0x585D = 0x524C
-0x585E = 0x525E
-0x585F = 0x5261
-0x5860 = 0x525C
-0x5861 = 0x84AF
-0x5862 = 0x527D
-0x5863 = 0x5282
-0x5864 = 0x5281
-0x5865 = 0x5290
-0x5866 = 0x5293
-0x5867 = 0x5182
-0x5868 = 0x7F54
-0x5869 = 0x4EBB
-0x586A = 0x4EC3
-0x586B = 0x4EC9
-0x586C = 0x4EC2
-0x586D = 0x4EE8
-0x586E = 0x4EE1
-0x586F = 0x4EEB
-0x5870 = 0x4EDE
-0x5871 = 0x50B4
-0x5872 = 0x4EF3
-0x5873 = 0x4F22
-0x5874 = 0x4F64
-0x5875 = 0x4EF5
-0x5876 = 0x5000
-0x5877 = 0x5096
-0x5878 = 0x4F09
-0x5879 = 0x4F47
-0x587A = 0x4F5E
-0x587B = 0x4F67
-0x587C = 0x6538
-0x587D = 0x4F5A
-0x587E = 0x4F5D
-0x5921 = 0x4F5F
-0x5922 = 0x4F57
-0x5923 = 0x4F32
-0x5924 = 0x4F3D
-0x5925 = 0x4F76
-0x5926 = 0x4F74
-0x5927 = 0x4F91
-0x5928 = 0x4F89
-0x5929 = 0x4F83
-0x592A = 0x4F8F
-0x592B = 0x4F7E
-0x592C = 0x4F7B
-0x592D = 0x5115
-0x592E = 0x4F7C
-0x592F = 0x5102
-0x5930 = 0x4F94
-0x5931 = 0x5114
-0x5932 = 0x513C
-0x5933 = 0x5137
-0x5934 = 0x4FC5
-0x5935 = 0x4FDA
-0x5936 = 0x4FE3
-0x5937 = 0x4FDC
-0x5938 = 0x4FD1
-0x5939 = 0x4FDF
-0x593A = 0x4FF8
-0x593B = 0x5029
-0x593C = 0x504C
-0x593D = 0x4FF3
-0x593E = 0x502C
-0x593F = 0x500F
-0x5940 = 0x502E
-0x5941 = 0x502D
-0x5942 = 0x4FFE
-0x5943 = 0x501C
-0x5944 = 0x500C
-0x5945 = 0x5025
-0x5946 = 0x5028
-0x5947 = 0x50E8
-0x5948 = 0x5043
-0x5949 = 0x5055
-0x594A = 0x5048
-0x594B = 0x504E
-0x594C = 0x506C
-0x594D = 0x50C2
-0x594E = 0x513B
-0x594F = 0x5110
-0x5950 = 0x513A
-0x5951 = 0x50BA
-0x5952 = 0x50D6
-0x5953 = 0x5106
-0x5954 = 0x50ED
-0x5955 = 0x50EC
-0x5956 = 0x50E6
-0x5957 = 0x50EE
-0x5958 = 0x5107
-0x5959 = 0x510B
-0x595A = 0x4EDD
-0x595B = 0x6C3D
-0x595C = 0x4F58
-0x595D = 0x50C9
-0x595E = 0x4FCE
-0x595F = 0x9FA0
-0x5960 = 0x6C46
-0x5961 = 0x7CF4
-0x5962 = 0x516E
-0x5963 = 0x5DFD
-0x5964 = 0x9ECC
-0x5965 = 0x9998
-0x5966 = 0x56C5
-0x5967 = 0x5914
-0x5968 = 0x52F9
-0x5969 = 0x530D
-0x596A = 0x8A07
-0x596B = 0x5310
-0x596C = 0x9CEC
-0x596D = 0x5919
-0x596E = 0x5155
-0x596F = 0x4EA0
-0x5970 = 0x5156
-0x5971 = 0x4EB3
-0x5972 = 0x886E
-0x5973 = 0x88A4
-0x5974 = 0x893B
-0x5975 = 0x81E0
-0x5976 = 0x88D2
-0x5977 = 0x7980
-0x5978 = 0x5B34
-0x5979 = 0x8803
-0x597A = 0x7FB8
-0x597B = 0x51AB
-0x597C = 0x51B1
-0x597D = 0x51BD
-0x597E = 0x51BC
-0x5A21 = 0x51C7
-0x5A22 = 0x5196
-0x5A23 = 0x51A2
-0x5A24 = 0x51A5
-0x5A25 = 0x8A01
-0x5A26 = 0x8A10
-0x5A27 = 0x8A0C
-0x5A28 = 0x8A15
-0x5A29 = 0x8B33
-0x5A2A = 0x8A4E
-0x5A2B = 0x8A25
-0x5A2C = 0x8A41
-0x5A2D = 0x8A36
-0x5A2E = 0x8A46
-0x5A2F = 0x8A54
-0x5A30 = 0x8A58
-0x5A31 = 0x8A52
-0x5A32 = 0x8A86
-0x5A33 = 0x8A84
-0x5A34 = 0x8A7F
-0x5A35 = 0x8A70
-0x5A36 = 0x8A7C
-0x5A37 = 0x8A75
-0x5A38 = 0x8A6C
-0x5A39 = 0x8A6E
-0x5A3A = 0x8ACD
-0x5A3B = 0x8AE2
-0x5A3C = 0x8A61
-0x5A3D = 0x8A9A
-0x5A3E = 0x8AA5
-0x5A3F = 0x8A91
-0x5A40 = 0x8A92
-0x5A41 = 0x8ACF
-0x5A42 = 0x8AD1
-0x5A43 = 0x8AC9
-0x5A44 = 0x8ADB
-0x5A45 = 0x8AD7
-0x5A46 = 0x8AC2
-0x5A47 = 0x8AB6
-0x5A48 = 0x8AF6
-0x5A49 = 0x8AEB
-0x5A4A = 0x8B14
-0x5A4B = 0x8B01
-0x5A4C = 0x8AE4
-0x5A4D = 0x8AED
-0x5A4E = 0x8AFC
-0x5A4F = 0x8AF3
-0x5A50 = 0x8AE6
-0x5A51 = 0x8AEE
-0x5A52 = 0x8ADE
-0x5A53 = 0x8B28
-0x5A54 = 0x8B9C
-0x5A55 = 0x8B16
-0x5A56 = 0x8B1A
-0x5A57 = 0x8B10
-0x5A58 = 0x8B2B
-0x5A59 = 0x8B2D
-0x5A5A = 0x8B56
-0x5A5B = 0x8B59
-0x5A5C = 0x8B4E
-0x5A5D = 0x8B9E
-0x5A5E = 0x8B6B
-0x5A5F = 0x8B96
-0x5A60 = 0x5369
-0x5A61 = 0x537A
-0x5A62 = 0x961D
-0x5A63 = 0x9622
-0x5A64 = 0x9621
-0x5A65 = 0x9631
-0x5A66 = 0x962A
-0x5A67 = 0x963D
-0x5A68 = 0x963C
-0x5A69 = 0x9642
-0x5A6A = 0x9658
-0x5A6B = 0x9654
-0x5A6C = 0x965F
-0x5A6D = 0x9689
-0x5A6E = 0x966C
-0x5A6F = 0x9672
-0x5A70 = 0x9674
-0x5A71 = 0x9688
-0x5A72 = 0x968D
-0x5A73 = 0x9697
-0x5A74 = 0x96B0
-0x5A75 = 0x9097
-0x5A76 = 0x909B
-0x5A77 = 0x913A
-0x5A78 = 0x9099
-0x5A79 = 0x9114
-0x5A7A = 0x90A1
-0x5A7B = 0x90B4
-0x5A7C = 0x90B3
-0x5A7D = 0x90B6
-0x5A7E = 0x9134
-0x5B21 = 0x90B8
-0x5B22 = 0x90B0
-0x5B23 = 0x90DF
-0x5B24 = 0x90C5
-0x5B25 = 0x90BE
-0x5B26 = 0x9136
-0x5B27 = 0x90C4
-0x5B28 = 0x90C7
-0x5B29 = 0x9106
-0x5B2A = 0x9148
-0x5B2B = 0x90E2
-0x5B2C = 0x90DC
-0x5B2D = 0x90D7
-0x5B2E = 0x90DB
-0x5B2F = 0x90EB
-0x5B30 = 0x90EF
-0x5B31 = 0x90FE
-0x5B32 = 0x9104
-0x5B33 = 0x9122
-0x5B34 = 0x911E
-0x5B35 = 0x9123
-0x5B36 = 0x9131
-0x5B37 = 0x912F
-0x5B38 = 0x9139
-0x5B39 = 0x9143
-0x5B3A = 0x9146
-0x5B3B = 0x82BB
-0x5B3C = 0x5950
-0x5B3D = 0x52F1
-0x5B3E = 0x52AC
-0x5B3F = 0x52AD
-0x5B40 = 0x52BE
-0x5B41 = 0x54FF
-0x5B42 = 0x52D0
-0x5B43 = 0x52D6
-0x5B44 = 0x52F0
-0x5B45 = 0x53DF
-0x5B46 = 0x71EE
-0x5B47 = 0x77CD
-0x5B48 = 0x5EF4
-0x5B49 = 0x51F5
-0x5B4A = 0x51FC
-0x5B4B = 0x9B2F
-0x5B4C = 0x53B6
-0x5B4D = 0x5F01
-0x5B4E = 0x755A
-0x5B4F = 0x5DF0
-0x5B50 = 0x574C
-0x5B51 = 0x580A
-0x5B52 = 0x57A1
-0x5B53 = 0x587E
-0x5B54 = 0x58BC
-0x5B55 = 0x58C5
-0x5B56 = 0x58D1
-0x5B57 = 0x5729
-0x5B58 = 0x572C
-0x5B59 = 0x572A
-0x5B5A = 0x5733
-0x5B5B = 0x58D9
-0x5B5C = 0x572E
-0x5B5D = 0x572F
-0x5B5E = 0x58E2
-0x5B5F = 0x573B
-0x5B60 = 0x5742
-0x5B61 = 0x5769
-0x5B62 = 0x58E0
-0x5B63 = 0x576B
-0x5B64 = 0x58DA
-0x5B65 = 0x577C
-0x5B66 = 0x577B
-0x5B67 = 0x5768
-0x5B68 = 0x576D
-0x5B69 = 0x5776
-0x5B6A = 0x5773
-0x5B6B = 0x57E1
-0x5B6C = 0x57A4
-0x5B6D = 0x578C
-0x5B6E = 0x584F
-0x5B6F = 0x57CF
-0x5B70 = 0x57A7
-0x5B71 = 0x5816
-0x5B72 = 0x5793
-0x5B73 = 0x57A0
-0x5B74 = 0x57D5
-0x5B75 = 0x5852
-0x5B76 = 0x581D
-0x5B77 = 0x5864
-0x5B78 = 0x57D2
-0x5B79 = 0x57B8
-0x5B7A = 0x57F4
-0x5B7B = 0x57EF
-0x5B7C = 0x57F8
-0x5B7D = 0x57E4
-0x5B7E = 0x57DD
-0x5C21 = 0x580B
-0x5C22 = 0x580D
-0x5C23 = 0x57FD
-0x5C24 = 0x57ED
-0x5C25 = 0x5800
-0x5C26 = 0x581E
-0x5C27 = 0x5819
-0x5C28 = 0x5844
-0x5C29 = 0x5820
-0x5C2A = 0x5865
-0x5C2B = 0x586C
-0x5C2C = 0x5881
-0x5C2D = 0x5889
-0x5C2E = 0x589A
-0x5C2F = 0x5880
-0x5C30 = 0x99A8
-0x5C31 = 0x9F19
-0x5C32 = 0x61FF
-0x5C33 = 0x8279
-0x5C34 = 0x827D
-0x5C35 = 0x827F
-0x5C36 = 0x828F
-0x5C37 = 0x828A
-0x5C38 = 0x82A8
-0x5C39 = 0x8284
-0x5C3A = 0x828E
-0x5C3B = 0x8291
-0x5C3C = 0x858C
-0x5C3D = 0x8299
-0x5C3E = 0x82AB
-0x5C3F = 0x8553
-0x5C40 = 0x82BE
-0x5C41 = 0x82B0
-0x5C42 = 0x85F6
-0x5C43 = 0x82CA
-0x5C44 = 0x82E3
-0x5C45 = 0x8298
-0x5C46 = 0x82B7
-0x5C47 = 0x82AE
-0x5C48 = 0x83A7
-0x5C49 = 0x8407
-0x5C4A = 0x84EF
-0x5C4B = 0x82A9
-0x5C4C = 0x82B4
-0x5C4D = 0x82A1
-0x5C4E = 0x82AA
-0x5C4F = 0x829F
-0x5C50 = 0x82C4
-0x5C51 = 0x82E7
-0x5C52 = 0x82A4
-0x5C53 = 0x82E1
-0x5C54 = 0x8309
-0x5C55 = 0x82F7
-0x5C56 = 0x82E4
-0x5C57 = 0x8622
-0x5C58 = 0x8307
-0x5C59 = 0x82DC
-0x5C5A = 0x82F4
-0x5C5B = 0x82D2
-0x5C5C = 0x82D8
-0x5C5D = 0x830C
-0x5C5E = 0x82FB
-0x5C5F = 0x82D3
-0x5C60 = 0x8526
-0x5C61 = 0x831A
-0x5C62 = 0x8306
-0x5C63 = 0x584B
-0x5C64 = 0x7162
-0x5C65 = 0x82E0
-0x5C66 = 0x82D5
-0x5C67 = 0x831C
-0x5C68 = 0x8351
-0x5C69 = 0x8558
-0x5C6A = 0x84FD
-0x5C6B = 0x8308
-0x5C6C = 0x8392
-0x5C6D = 0x833C
-0x5C6E = 0x8334
-0x5C6F = 0x8331
-0x5C70 = 0x839B
-0x5C71 = 0x854E
-0x5C72 = 0x832F
-0x5C73 = 0x834F
-0x5C74 = 0x8347
-0x5C75 = 0x8343
-0x5C76 = 0x8588
-0x5C77 = 0x8340
-0x5C78 = 0x8317
-0x5C79 = 0x85BA
-0x5C7A = 0x832D
-0x5C7B = 0x833A
-0x5C7C = 0x8333
-0x5C7D = 0x7296
-0x5C7E = 0x6ECE
-0x5D21 = 0x8541
-0x5D22 = 0x831B
-0x5D23 = 0x85CE
-0x5D24 = 0x8552
-0x5D25 = 0x84C0
-0x5D26 = 0x8452
-0x5D27 = 0x8464
-0x5D28 = 0x83B0
-0x5D29 = 0x8378
-0x5D2A = 0x8494
-0x5D2B = 0x8435
-0x5D2C = 0x83A0
-0x5D2D = 0x83AA
-0x5D2E = 0x8393
-0x5D2F = 0x839C
-0x5D30 = 0x8385
-0x5D31 = 0x837C
-0x5D32 = 0x859F
-0x5D33 = 0x83A9
-0x5D34 = 0x837D
-0x5D35 = 0x8555
-0x5D36 = 0x837B
-0x5D37 = 0x8398
-0x5D38 = 0x839E
-0x5D39 = 0x83A8
-0x5D3A = 0x9DAF
-0x5D3B = 0x8493
-0x5D3C = 0x83C1
-0x5D3D = 0x8401
-0x5D3E = 0x83E5
-0x5D3F = 0x83D8
-0x5D40 = 0x5807
-0x5D41 = 0x8418
-0x5D42 = 0x840B
-0x5D43 = 0x83DD
-0x5D44 = 0x83FD
-0x5D45 = 0x83D6
-0x5D46 = 0x841C
-0x5D47 = 0x8438
-0x5D48 = 0x8411
-0x5D49 = 0x8406
-0x5D4A = 0x83D4
-0x5D4B = 0x83DF
-0x5D4C = 0x840F
-0x5D4D = 0x8403
-0x5D4E = 0x83F8
-0x5D4F = 0x83F9
-0x5D50 = 0x83EA
-0x5D51 = 0x83C5
-0x5D52 = 0x83C0
-0x5D53 = 0x7E08
-0x5D54 = 0x83F0
-0x5D55 = 0x83E1
-0x5D56 = 0x845C
-0x5D57 = 0x8451
-0x5D58 = 0x845A
-0x5D59 = 0x8459
-0x5D5A = 0x8473
-0x5D5B = 0x8546
-0x5D5C = 0x8488
-0x5D5D = 0x847A
-0x5D5E = 0x8562
-0x5D5F = 0x8478
-0x5D60 = 0x843C
-0x5D61 = 0x8446
-0x5D62 = 0x8469
-0x5D63 = 0x8476
-0x5D64 = 0x851E
-0x5D65 = 0x848E
-0x5D66 = 0x8431
-0x5D67 = 0x846D
-0x5D68 = 0x84C1
-0x5D69 = 0x84CD
-0x5D6A = 0x84D0
-0x5D6B = 0x9A40
-0x5D6C = 0x84BD
-0x5D6D = 0x84D3
-0x5D6E = 0x84CA
-0x5D6F = 0x84BF
-0x5D70 = 0x84BA
-0x5D71 = 0x863A
-0x5D72 = 0x84A1
-0x5D73 = 0x84B9
-0x5D74 = 0x84B4
-0x5D75 = 0x8497
-0x5D76 = 0x93A3
-0x5D77 = 0x8577
-0x5D78 = 0x850C
-0x5D79 = 0x750D
-0x5D7A = 0x8538
-0x5D7B = 0x84F0
-0x5D7C = 0x861E
-0x5D7D = 0x851F
-0x5D7E = 0x85FA
-0x5E21 = 0x8556
-0x5E22 = 0x853B
-0x5E23 = 0x84FF
-0x5E24 = 0x84FC
-0x5E25 = 0x8559
-0x5E26 = 0x8548
-0x5E27 = 0x8568
-0x5E28 = 0x8564
-0x5E29 = 0x855E
-0x5E2A = 0x857A
-0x5E2B = 0x77A2
-0x5E2C = 0x8543
-0x5E2D = 0x8604
-0x5E2E = 0x857B
-0x5E2F = 0x85A4
-0x5E30 = 0x85A8
-0x5E31 = 0x8587
-0x5E32 = 0x858F
-0x5E33 = 0x8579
-0x5E34 = 0x85EA
-0x5E35 = 0x859C
-0x5E36 = 0x8585
-0x5E37 = 0x85B9
-0x5E38 = 0x85B7
-0x5E39 = 0x85B0
-0x5E3A = 0x861A
-0x5E3B = 0x85C1
-0x5E3C = 0x85DC
-0x5E3D = 0x85FF
-0x5E3E = 0x8627
-0x5E3F = 0x8605
-0x5E40 = 0x8629
-0x5E41 = 0x8616
-0x5E42 = 0x863C
-0x5E43 = 0x5EFE
-0x5E44 = 0x5F08
-0x5E45 = 0x593C
-0x5E46 = 0x5969
-0x5E47 = 0x8037
-0x5E48 = 0x5955
-0x5E49 = 0x595A
-0x5E4A = 0x5958
-0x5E4B = 0x530F
-0x5E4C = 0x5C22
-0x5E4D = 0x5C25
-0x5E4E = 0x5C2C
-0x5E4F = 0x5C37
-0x5E50 = 0x624C
-0x5E51 = 0x636B
-0x5E52 = 0x6476
-0x5E53 = 0x62BB
-0x5E54 = 0x62CA
-0x5E55 = 0x62DA
-0x5E56 = 0x62D7
-0x5E57 = 0x62EE
-0x5E58 = 0x649F
-0x5E59 = 0x62F6
-0x5E5A = 0x6339
-0x5E5B = 0x634B
-0x5E5C = 0x6343
-0x5E5D = 0x63AD
-0x5E5E = 0x63F6
-0x5E5F = 0x6371
-0x5E60 = 0x637A
-0x5E61 = 0x638E
-0x5E62 = 0x6451
-0x5E63 = 0x636D
-0x5E64 = 0x63AC
-0x5E65 = 0x638A
-0x5E66 = 0x6369
-0x5E67 = 0x63AE
-0x5E68 = 0x645C
-0x5E69 = 0x63F2
-0x5E6A = 0x63F8
-0x5E6B = 0x63E0
-0x5E6C = 0x64B3
-0x5E6D = 0x63C4
-0x5E6E = 0x63DE
-0x5E6F = 0x63CE
-0x5E70 = 0x6452
-0x5E71 = 0x63C6
-0x5E72 = 0x63BE
-0x5E73 = 0x6504
-0x5E74 = 0x6441
-0x5E75 = 0x640B
-0x5E76 = 0x641B
-0x5E77 = 0x6420
-0x5E78 = 0x640C
-0x5E79 = 0x6426
-0x5E7A = 0x6421
-0x5E7B = 0x645E
-0x5E7C = 0x6516
-0x5E7D = 0x646D
-0x5E7E = 0x6496
-0x5F21 = 0x647A
-0x5F22 = 0x64F7
-0x5F23 = 0x64FC
-0x5F24 = 0x6499
-0x5F25 = 0x651B
-0x5F26 = 0x64C0
-0x5F27 = 0x64D0
-0x5F28 = 0x64D7
-0x5F29 = 0x64E4
-0x5F2A = 0x64E2
-0x5F2B = 0x6509
-0x5F2C = 0x6525
-0x5F2D = 0x652E
-0x5F2E = 0x5F0B
-0x5F2F = 0x5FD2
-0x5F30 = 0x7519
-0x5F31 = 0x5F11
-0x5F32 = 0x535F
-0x5F33 = 0x53F1
-0x5F34 = 0x5630
-0x5F35 = 0x53E9
-0x5F36 = 0x53E8
-0x5F37 = 0x53FB
-0x5F38 = 0x5412
-0x5F39 = 0x5416
-0x5F3A = 0x5406
-0x5F3B = 0x544B
-0x5F3C = 0x5638
-0x5F3D = 0x56C8
-0x5F3E = 0x5454
-0x5F3F = 0x56A6
-0x5F40 = 0x5443
-0x5F41 = 0x5421
-0x5F42 = 0x5504
-0x5F43 = 0x54BC
-0x5F44 = 0x5423
-0x5F45 = 0x5432
-0x5F46 = 0x5482
-0x5F47 = 0x5494
-0x5F48 = 0x5477
-0x5F49 = 0x5471
-0x5F4A = 0x5464
-0x5F4B = 0x549A
-0x5F4C = 0x5680
-0x5F4D = 0x5484
-0x5F4E = 0x5476
-0x5F4F = 0x5466
-0x5F50 = 0x565D
-0x5F51 = 0x54D0
-0x5F52 = 0x54AD
-0x5F53 = 0x54C2
-0x5F54 = 0x54B4
-0x5F55 = 0x5660
-0x5F56 = 0x54A7
-0x5F57 = 0x54A6
-0x5F58 = 0x5635
-0x5F59 = 0x55F6
-0x5F5A = 0x5472
-0x5F5B = 0x54A3
-0x5F5C = 0x5666
-0x5F5D = 0x54BB
-0x5F5E = 0x54BF
-0x5F5F = 0x54CC
-0x5F60 = 0x5672
-0x5F61 = 0x54DA
-0x5F62 = 0x568C
-0x5F63 = 0x54A9
-0x5F64 = 0x54AA
-0x5F65 = 0x54A4
-0x5F66 = 0x5665
-0x5F67 = 0x54CF
-0x5F68 = 0x54DE
-0x5F69 = 0x561C
-0x5F6A = 0x54E7
-0x5F6B = 0x562E
-0x5F6C = 0x54FD
-0x5F6D = 0x5514
-0x5F6E = 0x54F3
-0x5F6F = 0x55E9
-0x5F70 = 0x5523
-0x5F71 = 0x550F
-0x5F72 = 0x5511
-0x5F73 = 0x5527
-0x5F74 = 0x552A
-0x5F75 = 0x5616
-0x5F76 = 0x558F
-0x5F77 = 0x55B5
-0x5F78 = 0x5549
-0x5F79 = 0x56C0
-0x5F7A = 0x5541
-0x5F7B = 0x5555
-0x5F7C = 0x553F
-0x5F7D = 0x5550
-0x5F7E = 0x553C
-0x6021 = 0x5537
-0x6022 = 0x5556
-0x6023 = 0x5575
-0x6024 = 0x5576
-0x6025 = 0x5577
-0x6026 = 0x5533
-0x6027 = 0x5530
-0x6028 = 0x555C
-0x6029 = 0x558B
-0x602A = 0x55D2
-0x602B = 0x5583
-0x602C = 0x55B1
-0x602D = 0x55B9
-0x602E = 0x5588
-0x602F = 0x5581
-0x6030 = 0x559F
-0x6031 = 0x557E
-0x6032 = 0x55D6
-0x6033 = 0x5591
-0x6034 = 0x557B
-0x6035 = 0x55DF
-0x6036 = 0x560D
-0x6037 = 0x56B3
-0x6038 = 0x5594
-0x6039 = 0x5599
-0x603A = 0x55EA
-0x603B = 0x55F7
-0x603C = 0x55C9
-0x603D = 0x561F
-0x603E = 0x55D1
-0x603F = 0x56C1
-0x6040 = 0x55EC
-0x6041 = 0x55D4
-0x6042 = 0x55E6
-0x6043 = 0x55DD
-0x6044 = 0x55C4
-0x6045 = 0x55EF
-0x6046 = 0x55E5
-0x6047 = 0x55F2
-0x6048 = 0x566F
-0x6049 = 0x55CC
-0x604A = 0x55CD
-0x604B = 0x55E8
-0x604C = 0x55F5
-0x604D = 0x55E4
-0x604E = 0x8F61
-0x604F = 0x561E
-0x6050 = 0x5608
-0x6051 = 0x560C
-0x6052 = 0x5601
-0x6053 = 0x56B6
-0x6054 = 0x5623
-0x6055 = 0x55FE
-0x6056 = 0x5600
-0x6057 = 0x5627
-0x6058 = 0x562D
-0x6059 = 0x5658
-0x605A = 0x5639
-0x605B = 0x5657
-0x605C = 0x562C
-0x605D = 0x564D
-0x605E = 0x5662
-0x605F = 0x5659
-0x6060 = 0x5695
-0x6061 = 0x564C
-0x6062 = 0x5654
-0x6063 = 0x5686
-0x6064 = 0x5664
-0x6065 = 0x5671
-0x6066 = 0x566B
-0x6067 = 0x567B
-0x6068 = 0x567C
-0x6069 = 0x5685
-0x606A = 0x5693
-0x606B = 0x56AF
-0x606C = 0x56D4
-0x606D = 0x56D7
-0x606E = 0x56DD
-0x606F = 0x56E1
-0x6070 = 0x5707
-0x6071 = 0x56EB
-0x6072 = 0x56F9
-0x6073 = 0x56FF
-0x6074 = 0x5704
-0x6075 = 0x570A
-0x6076 = 0x5709
-0x6077 = 0x571C
-0x6078 = 0x5E43
-0x6079 = 0x5E19
-0x607A = 0x5E14
-0x607B = 0x5E11
-0x607C = 0x5E6C
-0x607D = 0x5E58
-0x607E = 0x5E57
-0x6121 = 0x5E37
-0x6122 = 0x5E44
-0x6123 = 0x5E54
-0x6124 = 0x5E5B
-0x6125 = 0x5E5E
-0x6126 = 0x5E61
-0x6127 = 0x5C8C
-0x6128 = 0x5C7A
-0x6129 = 0x5C8D
-0x612A = 0x5C90
-0x612B = 0x5D87
-0x612C = 0x5C88
-0x612D = 0x5CF4
-0x612E = 0x5C99
-0x612F = 0x5C91
-0x6130 = 0x5D50
-0x6131 = 0x5C9C
-0x6132 = 0x5CB5
-0x6133 = 0x5CA2
-0x6134 = 0x5D2C
-0x6135 = 0x5CAC
-0x6136 = 0x5CAB
-0x6137 = 0x5CB1
-0x6138 = 0x5CA3
-0x6139 = 0x5CC1
-0x613A = 0x5CB7
-0x613B = 0x5DA7
-0x613C = 0x5CD2
-0x613D = 0x5DA0
-0x613E = 0x5CCB
-0x613F = 0x5D22
-0x6140 = 0x5D97
-0x6141 = 0x5D0D
-0x6142 = 0x5D27
-0x6143 = 0x5D26
-0x6144 = 0x5D2E
-0x6145 = 0x5D24
-0x6146 = 0x5D1E
-0x6147 = 0x5D06
-0x6148 = 0x5D1B
-0x6149 = 0x5DB8
-0x614A = 0x5D3E
-0x614B = 0x5D34
-0x614C = 0x5D3D
-0x614D = 0x5D6C
-0x614E = 0x5D5B
-0x614F = 0x5D6F
-0x6150 = 0x5D81
-0x6151 = 0x5D6B
-0x6152 = 0x5D4B
-0x6153 = 0x5D4A
-0x6154 = 0x5D69
-0x6155 = 0x5D74
-0x6156 = 0x5D82
-0x6157 = 0x5D99
-0x6158 = 0x5D9D
-0x6159 = 0x8C73
-0x615A = 0x5DB7
-0x615B = 0x5DD4
-0x615C = 0x5F73
-0x615D = 0x5F77
-0x615E = 0x5F82
-0x615F = 0x5F87
-0x6160 = 0x5F89
-0x6161 = 0x540E
-0x6162 = 0x5FA0
-0x6163 = 0x5F99
-0x6164 = 0x5F9C
-0x6165 = 0x5FA8
-0x6166 = 0x5FAD
-0x6167 = 0x5FB5
-0x6168 = 0x5FBC
-0x6169 = 0x8862
-0x616A = 0x5F61
-0x616B = 0x72AD
-0x616C = 0x72B0
-0x616D = 0x72B4
-0x616E = 0x7377
-0x616F = 0x7341
-0x6170 = 0x72C3
-0x6171 = 0x72C1
-0x6172 = 0x72CE
-0x6173 = 0x72CD
-0x6174 = 0x72D2
-0x6175 = 0x72E8
-0x6176 = 0x736A
-0x6177 = 0x72E9
-0x6178 = 0x733B
-0x6179 = 0x72F4
-0x617A = 0x72F7
-0x617B = 0x7301
-0x617C = 0x72F3
-0x617D = 0x736B
-0x617E = 0x72FA
-0x6221 = 0x72FB
-0x6222 = 0x7317
-0x6223 = 0x7313
-0x6224 = 0x7380
-0x6225 = 0x730A
-0x6226 = 0x731E
-0x6227 = 0x731D
-0x6228 = 0x737C
-0x6229 = 0x7322
-0x622A = 0x7339
-0x622B = 0x7325
-0x622C = 0x732C
-0x622D = 0x7338
-0x622E = 0x7331
-0x622F = 0x7350
-0x6230 = 0x734D
-0x6231 = 0x7357
-0x6232 = 0x7360
-0x6233 = 0x736C
-0x6234 = 0x736F
-0x6235 = 0x737E
-0x6236 = 0x821B
-0x6237 = 0x5925
-0x6238 = 0x98E7
-0x6239 = 0x5924
-0x623A = 0x5902
-0x623B = 0x98E0
-0x623C = 0x9933
-0x623D = 0x98E9
-0x623E = 0x993C
-0x623F = 0x98EA
-0x6240 = 0x98EB
-0x6241 = 0x98ED
-0x6242 = 0x98F4
-0x6243 = 0x9909
-0x6244 = 0x9911
-0x6245 = 0x4F59
-0x6246 = 0x991B
-0x6247 = 0x9937
-0x6248 = 0x993F
-0x6249 = 0x9943
-0x624A = 0x9948
-0x624B = 0x9949
-0x624C = 0x994A
-0x624D = 0x994C
-0x624E = 0x9962
-0x624F = 0x5E80
-0x6250 = 0x5EE1
-0x6251 = 0x5E8B
-0x6252 = 0x5E96
-0x6253 = 0x5EA5
-0x6254 = 0x5EA0
-0x6255 = 0x5EB9
-0x6256 = 0x5EB5
-0x6257 = 0x5EBE
-0x6258 = 0x5EB3
-0x6259 = 0x8CE1
-0x625A = 0x5ED2
-0x625B = 0x5ED1
-0x625C = 0x5EDB
-0x625D = 0x5EE8
-0x625E = 0x5EEA
-0x625F = 0x81BA
-0x6260 = 0x5FC4
-0x6261 = 0x5FC9
-0x6262 = 0x5FD6
-0x6263 = 0x61FA
-0x6264 = 0x61AE
-0x6265 = 0x5FEE
-0x6266 = 0x616A
-0x6267 = 0x5FE1
-0x6268 = 0x5FE4
-0x6269 = 0x613E
-0x626A = 0x60B5
-0x626B = 0x6134
-0x626C = 0x5FEA
-0x626D = 0x5FED
-0x626E = 0x5FF8
-0x626F = 0x6019
-0x6270 = 0x6035
-0x6271 = 0x6026
-0x6272 = 0x601B
-0x6273 = 0x600F
-0x6274 = 0x600D
-0x6275 = 0x6029
-0x6276 = 0x602B
-0x6277 = 0x600A
-0x6278 = 0x61CC
-0x6279 = 0x6021
-0x627A = 0x615F
-0x627B = 0x61E8
-0x627C = 0x60FB
-0x627D = 0x6137
-0x627E = 0x6042
-0x6321 = 0x606A
-0x6322 = 0x60F2
-0x6323 = 0x6096
-0x6324 = 0x609A
-0x6325 = 0x6173
-0x6326 = 0x609D
-0x6327 = 0x6083
-0x6328 = 0x6092
-0x6329 = 0x608C
-0x632A = 0x609B
-0x632B = 0x611C
-0x632C = 0x60BB
-0x632D = 0x60B1
-0x632E = 0x60DD
-0x632F = 0x60D8
-0x6330 = 0x60C6
-0x6331 = 0x60DA
-0x6332 = 0x60B4
-0x6333 = 0x6120
-0x6334 = 0x6192
-0x6335 = 0x6115
-0x6336 = 0x6123
-0x6337 = 0x60F4
-0x6338 = 0x6100
-0x6339 = 0x610E
-0x633A = 0x612B
-0x633B = 0x614A
-0x633C = 0x6175
-0x633D = 0x61AC
-0x633E = 0x6194
-0x633F = 0x61A7
-0x6340 = 0x61B7
-0x6341 = 0x61D4
-0x6342 = 0x61F5
-0x6343 = 0x5FDD
-0x6344 = 0x96B3
-0x6345 = 0x9582
-0x6346 = 0x9586
-0x6347 = 0x95C8
-0x6348 = 0x958E
-0x6349 = 0x9594
-0x634A = 0x958C
-0x634B = 0x95E5
-0x634C = 0x95AD
-0x634D = 0x95AB
-0x634E = 0x9B2E
-0x634F = 0x95AC
-0x6350 = 0x95BE
-0x6351 = 0x95B6
-0x6352 = 0x9B29
-0x6353 = 0x95BF
-0x6354 = 0x95BD
-0x6355 = 0x95BC
-0x6356 = 0x95C3
-0x6357 = 0x95CB
-0x6358 = 0x95D4
-0x6359 = 0x95D0
-0x635A = 0x95D5
-0x635B = 0x95DE
-0x635C = 0x4E2C
-0x635D = 0x723F
-0x635E = 0x6215
-0x635F = 0x6C35
-0x6360 = 0x6C54
-0x6361 = 0x6C5C
-0x6362 = 0x6C4A
-0x6363 = 0x7043
-0x6364 = 0x6C85
-0x6365 = 0x6C90
-0x6366 = 0x6C94
-0x6367 = 0x6C8C
-0x6368 = 0x6C68
-0x6369 = 0x6C69
-0x636A = 0x6C74
-0x636B = 0x6C76
-0x636C = 0x6C86
-0x636D = 0x6F59
-0x636E = 0x6CD0
-0x636F = 0x6CD4
-0x6370 = 0x6CAD
-0x6371 = 0x7027
-0x6372 = 0x7018
-0x6373 = 0x6CF1
-0x6374 = 0x6CD7
-0x6375 = 0x6CB2
-0x6376 = 0x6CE0
-0x6377 = 0x6CD6
-0x6378 = 0x6FFC
-0x6379 = 0x6CEB
-0x637A = 0x6CEE
-0x637B = 0x6CB1
-0x637C = 0x6CD3
-0x637D = 0x6CEF
-0x637E = 0x6D87
-0x6421 = 0x6D39
-0x6422 = 0x6D27
-0x6423 = 0x6D0C
-0x6424 = 0x6D79
-0x6425 = 0x6E5E
-0x6426 = 0x6D07
-0x6427 = 0x6D04
-0x6428 = 0x6D19
-0x6429 = 0x6D0E
-0x642A = 0x6D2B
-0x642B = 0x6FAE
-0x642C = 0x6D2E
-0x642D = 0x6D35
-0x642E = 0x6D1A
-0x642F = 0x700F
-0x6430 = 0x6EF8
-0x6431 = 0x6F6F
-0x6432 = 0x6D33
-0x6433 = 0x6D91
-0x6434 = 0x6D6F
-0x6435 = 0x6DF6
-0x6436 = 0x6F7F
-0x6437 = 0x6D5E
-0x6438 = 0x6D93
-0x6439 = 0x6D94
-0x643A = 0x6D5C
-0x643B = 0x6D60
-0x643C = 0x6D7C
-0x643D = 0x6D63
-0x643E = 0x6E1A
-0x643F = 0x6DC7
-0x6440 = 0x6DC5
-0x6441 = 0x6DDE
-0x6442 = 0x7006
-0x6443 = 0x6DBF
-0x6444 = 0x6DE0
-0x6445 = 0x6FA0
-0x6446 = 0x6DE6
-0x6447 = 0x6DDD
-0x6448 = 0x6DD9
-0x6449 = 0x700B
-0x644A = 0x6DAB
-0x644B = 0x6E0C
-0x644C = 0x6DAE
-0x644D = 0x6E2B
-0x644E = 0x6E6E
-0x644F = 0x6E4E
-0x6450 = 0x6E6B
-0x6451 = 0x6EB2
-0x6452 = 0x6E5F
-0x6453 = 0x6E86
-0x6454 = 0x6E53
-0x6455 = 0x6E54
-0x6456 = 0x6E32
-0x6457 = 0x6E25
-0x6458 = 0x6E44
-0x6459 = 0x7067
-0x645A = 0x6EB1
-0x645B = 0x6E98
-0x645C = 0x7044
-0x645D = 0x6F2D
-0x645E = 0x7005
-0x645F = 0x6EA5
-0x6460 = 0x6EA7
-0x6461 = 0x6EBD
-0x6462 = 0x6EBB
-0x6463 = 0x6EB7
-0x6464 = 0x6F77
-0x6465 = 0x6EB4
-0x6466 = 0x6ECF
-0x6467 = 0x6E8F
-0x6468 = 0x6EC2
-0x6469 = 0x6E9F
-0x646A = 0x6F62
-0x646B = 0x7020
-0x646C = 0x701F
-0x646D = 0x6F24
-0x646E = 0x6F15
-0x646F = 0x6EF9
-0x6470 = 0x6F2F
-0x6471 = 0x6F36
-0x6472 = 0x7032
-0x6473 = 0x6F74
-0x6474 = 0x6F2A
-0x6475 = 0x6F09
-0x6476 = 0x6F29
-0x6477 = 0x6F89
-0x6478 = 0x6F8D
-0x6479 = 0x6F8C
-0x647A = 0x6F78
-0x647B = 0x6F72
-0x647C = 0x6F7C
-0x647D = 0x6F7A
-0x647E = 0x7028
-0x6521 = 0x6FC9
-0x6522 = 0x6FA7
-0x6523 = 0x6FB9
-0x6524 = 0x6FB6
-0x6525 = 0x6FC2
-0x6526 = 0x6FE1
-0x6527 = 0x6FEE
-0x6528 = 0x6FDE
-0x6529 = 0x6FE0
-0x652A = 0x6FEF
-0x652B = 0x701A
-0x652C = 0x7023
-0x652D = 0x701B
-0x652E = 0x7039
-0x652F = 0x7035
-0x6530 = 0x705D
-0x6531 = 0x705E
-0x6532 = 0x5B80
-0x6533 = 0x5B84
-0x6534 = 0x5B95
-0x6535 = 0x5B93
-0x6536 = 0x5BA5
-0x6537 = 0x5BB8
-0x6538 = 0x752F
-0x6539 = 0x9A2B
-0x653A = 0x6434
-0x653B = 0x5BE4
-0x653C = 0x5BEE
-0x653D = 0x8930
-0x653E = 0x5BF0
-0x653F = 0x8E47
-0x6540 = 0x8B07
-0x6541 = 0x8FB6
-0x6542 = 0x8FD3
-0x6543 = 0x8FD5
-0x6544 = 0x8FE5
-0x6545 = 0x8FEE
-0x6546 = 0x8FE4
-0x6547 = 0x9087
-0x6548 = 0x8FE6
-0x6549 = 0x9015
-0x654A = 0x8FE8
-0x654B = 0x9005
-0x654C = 0x9004
-0x654D = 0x900B
-0x654E = 0x9090
-0x654F = 0x9011
-0x6550 = 0x900D
-0x6551 = 0x9016
-0x6552 = 0x9021
-0x6553 = 0x9035
-0x6554 = 0x9036
-0x6555 = 0x902D
-0x6556 = 0x902F
-0x6557 = 0x9044
-0x6558 = 0x9051
-0x6559 = 0x9052
-0x655A = 0x9050
-0x655B = 0x9068
-0x655C = 0x9058
-0x655D = 0x9062
-0x655E = 0x905B
-0x655F = 0x66B9
-0x6560 = 0x9074
-0x6561 = 0x907D
-0x6562 = 0x9082
-0x6563 = 0x9088
-0x6564 = 0x9083
-0x6565 = 0x908B
-0x6566 = 0x5F50
-0x6567 = 0x5F57
-0x6568 = 0x5F56
-0x6569 = 0x5F58
-0x656A = 0x5C3B
-0x656B = 0x54AB
-0x656C = 0x5C50
-0x656D = 0x5C59
-0x656E = 0x5B71
-0x656F = 0x5C63
-0x6570 = 0x5C68
-0x6571 = 0x7FBC
-0x6572 = 0x5F33
-0x6573 = 0x5F29
-0x6574 = 0x5F2D
-0x6575 = 0x8274
-0x6576 = 0x5F3C
-0x6577 = 0x9B3B
-0x6578 = 0x5C6E
-0x6579 = 0x5981
-0x657A = 0x5983
-0x657B = 0x598D
-0x657C = 0x5AF5
-0x657D = 0x5AD7
-0x657E = 0x59A3
-0x6621 = 0x5997
-0x6622 = 0x59CA
-0x6623 = 0x5B00
-0x6624 = 0x599E
-0x6625 = 0x59A4
-0x6626 = 0x59D2
-0x6627 = 0x59B2
-0x6628 = 0x59AF
-0x6629 = 0x59D7
-0x662A = 0x59BE
-0x662B = 0x5A6D
-0x662C = 0x5B08
-0x662D = 0x59DD
-0x662E = 0x5B4C
-0x662F = 0x59E3
-0x6630 = 0x59D8
-0x6631 = 0x59F9
-0x6632 = 0x5A0C
-0x6633 = 0x5A09
-0x6634 = 0x5AA7
-0x6635 = 0x5AFB
-0x6636 = 0x5A11
-0x6637 = 0x5A23
-0x6638 = 0x5A13
-0x6639 = 0x5A40
-0x663A = 0x5A67
-0x663B = 0x5A4A
-0x663C = 0x5A55
-0x663D = 0x5A3C
-0x663E = 0x5A62
-0x663F = 0x5B0B
-0x6640 = 0x80EC
-0x6641 = 0x5AAA
-0x6642 = 0x5A9B
-0x6643 = 0x5A77
-0x6644 = 0x5A7A
-0x6645 = 0x5ABE
-0x6646 = 0x5AEB
-0x6647 = 0x5AB2
-0x6648 = 0x5B21
-0x6649 = 0x5B2A
-0x664A = 0x5AB8
-0x664B = 0x5AE0
-0x664C = 0x5AE3
-0x664D = 0x5B19
-0x664E = 0x5AD6
-0x664F = 0x5AE6
-0x6650 = 0x5AD8
-0x6651 = 0x5ADC
-0x6652 = 0x5B09
-0x6653 = 0x5B17
-0x6654 = 0x5B16
-0x6655 = 0x5B32
-0x6656 = 0x5B37
-0x6657 = 0x5B40
-0x6658 = 0x5C15
-0x6659 = 0x5C1C
-0x665A = 0x5B5A
-0x665B = 0x5B65
-0x665C = 0x5B73
-0x665D = 0x5B51
-0x665E = 0x5B53
-0x665F = 0x5B62
-0x6660 = 0x99D4
-0x6661 = 0x99DF
-0x6662 = 0x99D9
-0x6663 = 0x9A36
-0x6664 = 0x9A5B
-0x6665 = 0x99D1
-0x6666 = 0x99D8
-0x6667 = 0x9A4D
-0x6668 = 0x9A4A
-0x6669 = 0x99E2
-0x666A = 0x9A6A
-0x666B = 0x9A0F
-0x666C = 0x9A0D
-0x666D = 0x9A05
-0x666E = 0x9A42
-0x666F = 0x9A2D
-0x6670 = 0x9A16
-0x6671 = 0x9A41
-0x6672 = 0x9A2E
-0x6673 = 0x9A38
-0x6674 = 0x9A43
-0x6675 = 0x9A44
-0x6676 = 0x9A4F
-0x6677 = 0x9A65
-0x6678 = 0x9A64
-0x6679 = 0x7CF9
-0x667A = 0x7D06
-0x667B = 0x7D02
-0x667C = 0x7D07
-0x667D = 0x7D08
-0x667E = 0x7E8A
-0x6721 = 0x7D1C
-0x6722 = 0x7D15
-0x6723 = 0x7D13
-0x6724 = 0x7D3A
-0x6725 = 0x7D32
-0x6726 = 0x7D31
-0x6727 = 0x7E10
-0x6728 = 0x7D3C
-0x6729 = 0x7D40
-0x672A = 0x7D3F
-0x672B = 0x7D5D
-0x672C = 0x7D4E
-0x672D = 0x7D73
-0x672E = 0x7D86
-0x672F = 0x7D83
-0x6730 = 0x7D88
-0x6731 = 0x7DBE
-0x6732 = 0x7DBA
-0x6733 = 0x7DCB
-0x6734 = 0x7DD4
-0x6735 = 0x7DC4
-0x6736 = 0x7D9E
-0x6737 = 0x7DAC
-0x6738 = 0x7DB9
-0x6739 = 0x7DA3
-0x673A = 0x7DB0
-0x673B = 0x7DC7
-0x673C = 0x7DD9
-0x673D = 0x7DD7
-0x673E = 0x7DF9
-0x673F = 0x7DF2
-0x6740 = 0x7E62
-0x6741 = 0x7DE6
-0x6742 = 0x7DF6
-0x6743 = 0x7DF1
-0x6744 = 0x7E0B
-0x6745 = 0x7DE1
-0x6746 = 0x7E09
-0x6747 = 0x7E1D
-0x6748 = 0x7E1F
-0x6749 = 0x7E1E
-0x674A = 0x7E2D
-0x674B = 0x7E0A
-0x674C = 0x7E11
-0x674D = 0x7E7D
-0x674E = 0x7E39
-0x674F = 0x7E35
-0x6750 = 0x7E32
-0x6751 = 0x7E46
-0x6752 = 0x7E45
-0x6753 = 0x7E88
-0x6754 = 0x7E5A
-0x6755 = 0x7E52
-0x6756 = 0x7E6E
-0x6757 = 0x7E7E
-0x6758 = 0x7E70
-0x6759 = 0x7E6F
-0x675A = 0x7E98
-0x675B = 0x5E7A
-0x675C = 0x757F
-0x675D = 0x5DDB
-0x675E = 0x753E
-0x675F = 0x9095
-0x6760 = 0x738E
-0x6761 = 0x74A3
-0x6762 = 0x744B
-0x6763 = 0x73A2
-0x6764 = 0x739F
-0x6765 = 0x73CF
-0x6766 = 0x73C2
-0x6767 = 0x74CF
-0x6768 = 0x73B7
-0x6769 = 0x73B3
-0x676A = 0x73C0
-0x676B = 0x73C9
-0x676C = 0x73C8
-0x676D = 0x73E5
-0x676E = 0x73D9
-0x676F = 0x980A
-0x6770 = 0x740A
-0x6771 = 0x73E9
-0x6772 = 0x73E7
-0x6773 = 0x73DE
-0x6774 = 0x74BD
-0x6775 = 0x743F
-0x6776 = 0x7489
-0x6777 = 0x742A
-0x6778 = 0x745B
-0x6779 = 0x7426
-0x677A = 0x7425
-0x677B = 0x7428
-0x677C = 0x7430
-0x677D = 0x742E
-0x677E = 0x742C
-0x6821 = 0x741B
-0x6822 = 0x741A
-0x6823 = 0x7441
-0x6824 = 0x745C
-0x6825 = 0x7457
-0x6826 = 0x7455
-0x6827 = 0x7459
-0x6828 = 0x74A6
-0x6829 = 0x746D
-0x682A = 0x747E
-0x682B = 0x749C
-0x682C = 0x74D4
-0x682D = 0x7480
-0x682E = 0x7481
-0x682F = 0x7487
-0x6830 = 0x748B
-0x6831 = 0x749E
-0x6832 = 0x74A8
-0x6833 = 0x74A9
-0x6834 = 0x7490
-0x6835 = 0x74A7
-0x6836 = 0x74DA
-0x6837 = 0x74BA
-0x6838 = 0x97D9
-0x6839 = 0x97DE
-0x683A = 0x97DC
-0x683B = 0x674C
-0x683C = 0x6753
-0x683D = 0x675E
-0x683E = 0x6748
-0x683F = 0x69AA
-0x6840 = 0x6AEA
-0x6841 = 0x6787
-0x6842 = 0x676A
-0x6843 = 0x6773
-0x6844 = 0x6798
-0x6845 = 0x6898
-0x6846 = 0x6775
-0x6847 = 0x68D6
-0x6848 = 0x6A05
-0x6849 = 0x689F
-0x684A = 0x678B
-0x684B = 0x6777
-0x684C = 0x677C
-0x684D = 0x67F0
-0x684E = 0x6ADB
-0x684F = 0x67D8
-0x6850 = 0x6AF3
-0x6851 = 0x67E9
-0x6852 = 0x67B0
-0x6853 = 0x6AE8
-0x6854 = 0x67D9
-0x6855 = 0x67B5
-0x6856 = 0x67DA
-0x6857 = 0x67B3
-0x6858 = 0x67DD
-0x6859 = 0x6800
-0x685A = 0x67C3
-0x685B = 0x67B8
-0x685C = 0x67E2
-0x685D = 0x6ADF
-0x685E = 0x67C1
-0x685F = 0x6A89
-0x6860 = 0x6832
-0x6861 = 0x6833
-0x6862 = 0x690F
-0x6863 = 0x6A48
-0x6864 = 0x684E
-0x6865 = 0x6968
-0x6866 = 0x6844
-0x6867 = 0x69BF
-0x6868 = 0x6883
-0x6869 = 0x681D
-0x686A = 0x6855
-0x686B = 0x6A3A
-0x686C = 0x6841
-0x686D = 0x6A9C
-0x686E = 0x6840
-0x686F = 0x6B12
-0x6870 = 0x684A
-0x6871 = 0x6849
-0x6872 = 0x6829
-0x6873 = 0x68B5
-0x6874 = 0x688F
-0x6875 = 0x6874
-0x6876 = 0x6877
-0x6877 = 0x6893
-0x6878 = 0x686B
-0x6879 = 0x6B1E
-0x687A = 0x696E
-0x687B = 0x68FC
-0x687C = 0x6ADD
-0x687D = 0x69E7
-0x687E = 0x68F9
-0x6921 = 0x6B0F
-0x6922 = 0x68F0
-0x6923 = 0x690B
-0x6924 = 0x6901
-0x6925 = 0x6957
-0x6926 = 0x68E3
-0x6927 = 0x6910
-0x6928 = 0x6971
-0x6929 = 0x6939
-0x692A = 0x6960
-0x692B = 0x6942
-0x692C = 0x695D
-0x692D = 0x6B16
-0x692E = 0x696B
-0x692F = 0x6980
-0x6930 = 0x6998
-0x6931 = 0x6978
-0x6932 = 0x6934
-0x6933 = 0x69CC
-0x6934 = 0x6AEC
-0x6935 = 0x6ADA
-0x6936 = 0x69CE
-0x6937 = 0x6AF8
-0x6938 = 0x6966
-0x6939 = 0x6963
-0x693A = 0x6979
-0x693B = 0x699B
-0x693C = 0x69A7
-0x693D = 0x69BB
-0x693E = 0x69AB
-0x693F = 0x69AD
-0x6940 = 0x69D4
-0x6941 = 0x69B1
-0x6942 = 0x69C1
-0x6943 = 0x69CA
-0x6944 = 0x6AB3
-0x6945 = 0x6995
-0x6946 = 0x6AE7
-0x6947 = 0x698D
-0x6948 = 0x69FF
-0x6949 = 0x6AA3
-0x694A = 0x69ED
-0x694B = 0x6A17
-0x694C = 0x6A18
-0x694D = 0x6A65
-0x694E = 0x69F2
-0x694F = 0x6A44
-0x6950 = 0x6A3E
-0x6951 = 0x6AA0
-0x6952 = 0x6A50
-0x6953 = 0x6A5B
-0x6954 = 0x6A35
-0x6955 = 0x6A8E
-0x6956 = 0x6AD3
-0x6957 = 0x6A3D
-0x6958 = 0x6A28
-0x6959 = 0x6A58
-0x695A = 0x6ADE
-0x695B = 0x6A91
-0x695C = 0x6A90
-0x695D = 0x6AA9
-0x695E = 0x6A97
-0x695F = 0x6AAB
-0x6960 = 0x7337
-0x6961 = 0x7352
-0x6962 = 0x6B81
-0x6963 = 0x6B82
-0x6964 = 0x6BA4
-0x6965 = 0x6B84
-0x6966 = 0x6B9E
-0x6967 = 0x6BAE
-0x6968 = 0x6B8D
-0x6969 = 0x6BAB
-0x696A = 0x6B9B
-0x696B = 0x6BAF
-0x696C = 0x6BAA
-0x696D = 0x8ED4
-0x696E = 0x8EDB
-0x696F = 0x8EF2
-0x6970 = 0x8EFB
-0x6971 = 0x8F64
-0x6972 = 0x8EF9
-0x6973 = 0x8EFC
-0x6974 = 0x8EEB
-0x6975 = 0x8EE4
-0x6976 = 0x8F62
-0x6977 = 0x8EFA
-0x6978 = 0x8EFE
-0x6979 = 0x8F0A
-0x697A = 0x8F07
-0x697B = 0x8F05
-0x697C = 0x8F12
-0x697D = 0x8F26
-0x697E = 0x8F1E
-0x6A21 = 0x8F1F
-0x6A22 = 0x8F1C
-0x6A23 = 0x8F33
-0x6A24 = 0x8F46
-0x6A25 = 0x8F54
-0x6A26 = 0x8ECE
-0x6A27 = 0x6214
-0x6A28 = 0x6227
-0x6A29 = 0x621B
-0x6A2A = 0x621F
-0x6A2B = 0x6222
-0x6A2C = 0x6221
-0x6A2D = 0x6225
-0x6A2E = 0x6224
-0x6A2F = 0x6229
-0x6A30 = 0x81E7
-0x6A31 = 0x750C
-0x6A32 = 0x74F4
-0x6A33 = 0x74FF
-0x6A34 = 0x750F
-0x6A35 = 0x7511
-0x6A36 = 0x7513
-0x6A37 = 0x6534
-0x6A38 = 0x65EE
-0x6A39 = 0x65EF
-0x6A3A = 0x65F0
-0x6A3B = 0x660A
-0x6A3C = 0x66C7
-0x6A3D = 0x6772
-0x6A3E = 0x6603
-0x6A3F = 0x6615
-0x6A40 = 0x6600
-0x6A41 = 0x7085
-0x6A42 = 0x66F7
-0x6A43 = 0x661D
-0x6A44 = 0x6634
-0x6A45 = 0x6631
-0x6A46 = 0x6636
-0x6A47 = 0x6635
-0x6A48 = 0x8006
-0x6A49 = 0x665F
-0x6A4A = 0x66C4
-0x6A4B = 0x6641
-0x6A4C = 0x664F
-0x6A4D = 0x6689
-0x6A4E = 0x6661
-0x6A4F = 0x6657
-0x6A50 = 0x6677
-0x6A51 = 0x6684
-0x6A52 = 0x668C
-0x6A53 = 0x66D6
-0x6A54 = 0x669D
-0x6A55 = 0x66BE
-0x6A56 = 0x66DB
-0x6A57 = 0x66DC
-0x6A58 = 0x66E6
-0x6A59 = 0x66E9
-0x6A5A = 0x8CC1
-0x6A5B = 0x8CB0
-0x6A5C = 0x8CBA
-0x6A5D = 0x8CBD
-0x6A5E = 0x8D04
-0x6A5F = 0x8CB2
-0x6A60 = 0x8CC5
-0x6A61 = 0x8D10
-0x6A62 = 0x8CD1
-0x6A63 = 0x8CDA
-0x6A64 = 0x8CD5
-0x6A65 = 0x8CEB
-0x6A66 = 0x8CE7
-0x6A67 = 0x8CFB
-0x6A68 = 0x8998
-0x6A69 = 0x89AC
-0x6A6A = 0x89A1
-0x6A6B = 0x89BF
-0x6A6C = 0x89A6
-0x6A6D = 0x89AF
-0x6A6E = 0x89B2
-0x6A6F = 0x89B7
-0x6A70 = 0x726E
-0x6A71 = 0x729F
-0x6A72 = 0x725D
-0x6A73 = 0x7266
-0x6A74 = 0x726F
-0x6A75 = 0x727E
-0x6A76 = 0x727F
-0x6A77 = 0x7284
-0x6A78 = 0x728B
-0x6A79 = 0x728D
-0x6A7A = 0x728F
-0x6A7B = 0x7292
-0x6A7C = 0x6308
-0x6A7D = 0x6332
-0x6A7E = 0x63B0
-0x6B21 = 0x643F
-0x6B22 = 0x64D8
-0x6B23 = 0x8004
-0x6B24 = 0x6BEA
-0x6B25 = 0x6BF3
-0x6B26 = 0x6BFD
-0x6B27 = 0x6BFF
-0x6B28 = 0x6BF9
-0x6B29 = 0x6C05
-0x6B2A = 0x6C0C
-0x6B2B = 0x6C06
-0x6B2C = 0x6C0D
-0x6B2D = 0x6C15
-0x6B2E = 0x6C18
-0x6B2F = 0x6C19
-0x6B30 = 0x6C1A
-0x6B31 = 0x6C21
-0x6B32 = 0x6C2C
-0x6B33 = 0x6C24
-0x6B34 = 0x6C2A
-0x6B35 = 0x6C32
-0x6B36 = 0x6535
-0x6B37 = 0x6555
-0x6B38 = 0x656B
-0x6B39 = 0x7258
-0x6B3A = 0x7252
-0x6B3B = 0x7256
-0x6B3C = 0x7230
-0x6B3D = 0x8662
-0x6B3E = 0x5216
-0x6B3F = 0x809F
-0x6B40 = 0x809C
-0x6B41 = 0x8093
-0x6B42 = 0x80BC
-0x6B43 = 0x670A
-0x6B44 = 0x80BD
-0x6B45 = 0x80B1
-0x6B46 = 0x80AB
-0x6B47 = 0x80AD
-0x6B48 = 0x80B4
-0x6B49 = 0x80B7
-0x6B4A = 0x6727
-0x6B4B = 0x8156
-0x6B4C = 0x80E9
-0x6B4D = 0x81DA
-0x6B4E = 0x80DB
-0x6B4F = 0x80C2
-0x6B50 = 0x80C4
-0x6B51 = 0x80D9
-0x6B52 = 0x80CD
-0x6B53 = 0x80D7
-0x6B54 = 0x6710
-0x6B55 = 0x80DD
-0x6B56 = 0x811B
-0x6B57 = 0x80F1
-0x6B58 = 0x80F4
-0x6B59 = 0x80ED
-0x6B5A = 0x81BE
-0x6B5B = 0x810E
-0x6B5C = 0x80F2
-0x6B5D = 0x80FC
-0x6B5E = 0x6715
-0x6B5F = 0x8112
-0x6B60 = 0x8C5A
-0x6B61 = 0x8161
-0x6B62 = 0x811E
-0x6B63 = 0x812C
-0x6B64 = 0x8118
-0x6B65 = 0x8132
-0x6B66 = 0x8148
-0x6B67 = 0x814C
-0x6B68 = 0x8153
-0x6B69 = 0x8174
-0x6B6A = 0x8159
-0x6B6B = 0x815A
-0x6B6C = 0x8171
-0x6B6D = 0x8160
-0x6B6E = 0x8169
-0x6B6F = 0x817C
-0x6B70 = 0x817D
-0x6B71 = 0x816D
-0x6B72 = 0x8167
-0x6B73 = 0x584D
-0x6B74 = 0x5AB5
-0x6B75 = 0x8188
-0x6B76 = 0x8182
-0x6B77 = 0x81CF
-0x6B78 = 0x6ED5
-0x6B79 = 0x81A3
-0x6B7A = 0x81AA
-0x6B7B = 0x81CC
-0x6B7C = 0x6726
-0x6B7D = 0x81CA
-0x6B7E = 0x81BB
-0x6C21 = 0x81C1
-0x6C22 = 0x81A6
-0x6C23 = 0x6B5F
-0x6C24 = 0x6B37
-0x6C25 = 0x6B39
-0x6C26 = 0x6B43
-0x6C27 = 0x6B46
-0x6C28 = 0x6B59
-0x6C29 = 0x98AE
-0x6C2A = 0x98AF
-0x6C2B = 0x98B6
-0x6C2C = 0x98BC
-0x6C2D = 0x98C6
-0x6C2E = 0x98C8
-0x6C2F = 0x6BB3
-0x6C30 = 0x5F40
-0x6C31 = 0x8F42
-0x6C32 = 0x89F3
-0x6C33 = 0x6590
-0x6C34 = 0x9F4F
-0x6C35 = 0x6595
-0x6C36 = 0x65BC
-0x6C37 = 0x65C6
-0x6C38 = 0x65C4
-0x6C39 = 0x65C3
-0x6C3A = 0x65CC
-0x6C3B = 0x65CE
-0x6C3C = 0x65D2
-0x6C3D = 0x65D6
-0x6C3E = 0x716C
-0x6C3F = 0x7152
-0x6C40 = 0x7096
-0x6C41 = 0x7197
-0x6C42 = 0x70BB
-0x6C43 = 0x70C0
-0x6C44 = 0x70B7
-0x6C45 = 0x70AB
-0x6C46 = 0x70B1
-0x6C47 = 0x71C1
-0x6C48 = 0x70CA
-0x6C49 = 0x7110
-0x6C4A = 0x7113
-0x6C4B = 0x71DC
-0x6C4C = 0x712F
-0x6C4D = 0x7131
-0x6C4E = 0x7173
-0x6C4F = 0x715C
-0x6C50 = 0x7168
-0x6C51 = 0x7145
-0x6C52 = 0x7172
-0x6C53 = 0x714A
-0x6C54 = 0x7178
-0x6C55 = 0x717A
-0x6C56 = 0x7198
-0x6C57 = 0x71B3
-0x6C58 = 0x71B5
-0x6C59 = 0x71A8
-0x6C5A = 0x71A0
-0x6C5B = 0x71E0
-0x6C5C = 0x71D4
-0x6C5D = 0x71E7
-0x6C5E = 0x71F9
-0x6C5F = 0x721D
-0x6C60 = 0x7228
-0x6C61 = 0x706C
-0x6C62 = 0x71FE
-0x6C63 = 0x7166
-0x6C64 = 0x71B9
-0x6C65 = 0x623E
-0x6C66 = 0x623D
-0x6C67 = 0x6243
-0x6C68 = 0x6248
-0x6C69 = 0x6249
-0x6C6A = 0x793B
-0x6C6B = 0x7940
-0x6C6C = 0x7946
-0x6C6D = 0x7949
-0x6C6E = 0x795B
-0x6C6F = 0x795C
-0x6C70 = 0x7953
-0x6C71 = 0x795A
-0x6C72 = 0x79B0
-0x6C73 = 0x7957
-0x6C74 = 0x7960
-0x6C75 = 0x798E
-0x6C76 = 0x7967
-0x6C77 = 0x797A
-0x6C78 = 0x79AA
-0x6C79 = 0x798A
-0x6C7A = 0x799A
-0x6C7B = 0x79A7
-0x6C7C = 0x79B3
-0x6C7D = 0x5FD1
-0x6C7E = 0x5FD0
-0x6D21 = 0x61DF
-0x6D22 = 0x605D
-0x6D23 = 0x605A
-0x6D24 = 0x6067
-0x6D25 = 0x6041
-0x6D26 = 0x6059
-0x6D27 = 0x6063
-0x6D28 = 0x6164
-0x6D29 = 0x6106
-0x6D2A = 0x610D
-0x6D2B = 0x615D
-0x6D2C = 0x61A9
-0x6D2D = 0x619D
-0x6D2E = 0x61CB
-0x6D2F = 0x61E3
-0x6D30 = 0x6207
-0x6D31 = 0x8080
-0x6D32 = 0x807F
-0x6D33 = 0x6C93
-0x6D34 = 0x6FA9
-0x6D35 = 0x6DFC
-0x6D36 = 0x78EF
-0x6D37 = 0x77F8
-0x6D38 = 0x78AD
-0x6D39 = 0x7809
-0x6D3A = 0x7868
-0x6D3B = 0x7818
-0x6D3C = 0x7811
-0x6D3D = 0x65AB
-0x6D3E = 0x782D
-0x6D3F = 0x78B8
-0x6D40 = 0x781D
-0x6D41 = 0x7839
-0x6D42 = 0x792A
-0x6D43 = 0x7931
-0x6D44 = 0x781F
-0x6D45 = 0x783C
-0x6D46 = 0x7825
-0x6D47 = 0x782C
-0x6D48 = 0x7823
-0x6D49 = 0x7829
-0x6D4A = 0x784E
-0x6D4B = 0x786D
-0x6D4C = 0x7864
-0x6D4D = 0x78FD
-0x6D4E = 0x7826
-0x6D4F = 0x7850
-0x6D50 = 0x7847
-0x6D51 = 0x784C
-0x6D52 = 0x786A
-0x6D53 = 0x78E7
-0x6D54 = 0x7893
-0x6D55 = 0x789A
-0x6D56 = 0x7887
-0x6D57 = 0x78E3
-0x6D58 = 0x78A1
-0x6D59 = 0x78A3
-0x6D5A = 0x78B2
-0x6D5B = 0x78B9
-0x6D5C = 0x78A5
-0x6D5D = 0x78D4
-0x6D5E = 0x78D9
-0x6D5F = 0x78C9
-0x6D60 = 0x78EC
-0x6D61 = 0x78F2
-0x6D62 = 0x7905
-0x6D63 = 0x78F4
-0x6D64 = 0x7913
-0x6D65 = 0x7924
-0x6D66 = 0x791E
-0x6D67 = 0x7934
-0x6D68 = 0x9F95
-0x6D69 = 0x9EF9
-0x6D6A = 0x9EFB
-0x6D6B = 0x9EFC
-0x6D6C = 0x76F1
-0x6D6D = 0x7704
-0x6D6E = 0x7798
-0x6D6F = 0x76F9
-0x6D70 = 0x7707
-0x6D71 = 0x7708
-0x6D72 = 0x771A
-0x6D73 = 0x7722
-0x6D74 = 0x7719
-0x6D75 = 0x772D
-0x6D76 = 0x7726
-0x6D77 = 0x7735
-0x6D78 = 0x7738
-0x6D79 = 0x775E
-0x6D7A = 0x77BC
-0x6D7B = 0x7747
-0x6D7C = 0x7743
-0x6D7D = 0x775A
-0x6D7E = 0x7768
-0x6E21 = 0x7762
-0x6E22 = 0x7765
-0x6E23 = 0x777F
-0x6E24 = 0x778D
-0x6E25 = 0x777D
-0x6E26 = 0x7780
-0x6E27 = 0x778C
-0x6E28 = 0x7791
-0x6E29 = 0x779F
-0x6E2A = 0x77A0
-0x6E2B = 0x77B0
-0x6E2C = 0x77B5
-0x6E2D = 0x77BD
-0x6E2E = 0x753A
-0x6E2F = 0x7540
-0x6E30 = 0x754E
-0x6E31 = 0x754B
-0x6E32 = 0x7548
-0x6E33 = 0x755B
-0x6E34 = 0x7572
-0x6E35 = 0x7579
-0x6E36 = 0x7583
-0x6E37 = 0x7F58
-0x6E38 = 0x7F61
-0x6E39 = 0x7F5F
-0x6E3A = 0x8A48
-0x6E3B = 0x7F68
-0x6E3C = 0x7F86
-0x6E3D = 0x7F71
-0x6E3E = 0x7F79
-0x6E3F = 0x7F88
-0x6E40 = 0x7F7E
-0x6E41 = 0x76CD
-0x6E42 = 0x76E5
-0x6E43 = 0x8832
-0x6E44 = 0x91D2
-0x6E45 = 0x91D3
-0x6E46 = 0x91D4
-0x6E47 = 0x91D9
-0x6E48 = 0x91D7
-0x6E49 = 0x91D5
-0x6E4A = 0x91F7
-0x6E4B = 0x91E7
-0x6E4C = 0x91E4
-0x6E4D = 0x9346
-0x6E4E = 0x91F5
-0x6E4F = 0x91F9
-0x6E50 = 0x9208
-0x6E51 = 0x9226
-0x6E52 = 0x9245
-0x6E53 = 0x9211
-0x6E54 = 0x9210
-0x6E55 = 0x9201
-0x6E56 = 0x9227
-0x6E57 = 0x9204
-0x6E58 = 0x9225
-0x6E59 = 0x9200
-0x6E5A = 0x923A
-0x6E5B = 0x9266
-0x6E5C = 0x9237
-0x6E5D = 0x9233
-0x6E5E = 0x9255
-0x6E5F = 0x923D
-0x6E60 = 0x9238
-0x6E61 = 0x925E
-0x6E62 = 0x926C
-0x6E63 = 0x926D
-0x6E64 = 0x923F
-0x6E65 = 0x9460
-0x6E66 = 0x9230
-0x6E67 = 0x9249
-0x6E68 = 0x9248
-0x6E69 = 0x924D
-0x6E6A = 0x922E
-0x6E6B = 0x9239
-0x6E6C = 0x9438
-0x6E6D = 0x92AC
-0x6E6E = 0x92A0
-0x6E6F = 0x927A
-0x6E70 = 0x92AA
-0x6E71 = 0x92EE
-0x6E72 = 0x92CF
-0x6E73 = 0x9403
-0x6E74 = 0x92E3
-0x6E75 = 0x943A
-0x6E76 = 0x92B1
-0x6E77 = 0x92A6
-0x6E78 = 0x93A7
-0x6E79 = 0x9296
-0x6E7A = 0x92CC
-0x6E7B = 0x92A9
-0x6E7C = 0x93F5
-0x6E7D = 0x9293
-0x6E7E = 0x927F
-0x6F21 = 0x93A9
-0x6F22 = 0x929A
-0x6F23 = 0x931A
-0x6F24 = 0x92AB
-0x6F25 = 0x9283
-0x6F26 = 0x940B
-0x6F27 = 0x92A8
-0x6F28 = 0x92A3
-0x6F29 = 0x9412
-0x6F2A = 0x9338
-0x6F2B = 0x92F1
-0x6F2C = 0x93D7
-0x6F2D = 0x92E5
-0x6F2E = 0x92F0
-0x6F2F = 0x92EF
-0x6F30 = 0x92E8
-0x6F31 = 0x92BC
-0x6F32 = 0x92DD
-0x6F33 = 0x92F6
-0x6F34 = 0x9426
-0x6F35 = 0x9427
-0x6F36 = 0x92C3
-0x6F37 = 0x92DF
-0x6F38 = 0x92E6
-0x6F39 = 0x9312
-0x6F3A = 0x9306
-0x6F3B = 0x9369
-0x6F3C = 0x931B
-0x6F3D = 0x9340
-0x6F3E = 0x9301
-0x6F3F = 0x9315
-0x6F40 = 0x932E
-0x6F41 = 0x9343
-0x6F42 = 0x9307
-0x6F43 = 0x9308
-0x6F44 = 0x931F
-0x6F45 = 0x9319
-0x6F46 = 0x9365
-0x6F47 = 0x9347
-0x6F48 = 0x9376
-0x6F49 = 0x9354
-0x6F4A = 0x9364
-0x6F4B = 0x93AA
-0x6F4C = 0x9370
-0x6F4D = 0x9384
-0x6F4E = 0x93E4
-0x6F4F = 0x93D8
-0x6F50 = 0x9428
-0x6F51 = 0x9387
-0x6F52 = 0x93CC
-0x6F53 = 0x9398
-0x6F54 = 0x93B8
-0x6F55 = 0x93BF
-0x6F56 = 0x93A6
-0x6F57 = 0x93B0
-0x6F58 = 0x93B5
-0x6F59 = 0x944C
-0x6F5A = 0x93E2
-0x6F5B = 0x93DC
-0x6F5C = 0x93DD
-0x6F5D = 0x93CD
-0x6F5E = 0x93DE
-0x6F5F = 0x93C3
-0x6F60 = 0x93C7
-0x6F61 = 0x93D1
-0x6F62 = 0x9414
-0x6F63 = 0x941D
-0x6F64 = 0x93F7
-0x6F65 = 0x9465
-0x6F66 = 0x9413
-0x6F67 = 0x946D
-0x6F68 = 0x9420
-0x6F69 = 0x9479
-0x6F6A = 0x93F9
-0x6F6B = 0x9419
-0x6F6C = 0x944A
-0x6F6D = 0x9432
-0x6F6E = 0x943F
-0x6F6F = 0x9454
-0x6F70 = 0x9463
-0x6F71 = 0x937E
-0x6F72 = 0x77E7
-0x6F73 = 0x77EC
-0x6F74 = 0x96C9
-0x6F75 = 0x79D5
-0x6F76 = 0x79ED
-0x6F77 = 0x79E3
-0x6F78 = 0x79EB
-0x6F79 = 0x7A06
-0x6F7A = 0x5D47
-0x6F7B = 0x7A03
-0x6F7C = 0x7A02
-0x6F7D = 0x7A1E
-0x6F7E = 0x7A14
-0x7021 = 0x7A39
-0x7022 = 0x7A37
-0x7023 = 0x7A61
-0x7024 = 0x9ECF
-0x7025 = 0x99A5
-0x7026 = 0x7A70
-0x7027 = 0x7688
-0x7028 = 0x768E
-0x7029 = 0x7693
-0x702A = 0x7699
-0x702B = 0x76A4
-0x702C = 0x74DE
-0x702D = 0x74E0
-0x702E = 0x752C
-0x702F = 0x9CE9
-0x7030 = 0x9CF6
-0x7031 = 0x9D07
-0x7032 = 0x9D06
-0x7033 = 0x9D23
-0x7034 = 0x9D87
-0x7035 = 0x9E15
-0x7036 = 0x9D1D
-0x7037 = 0x9D1F
-0x7038 = 0x9DE5
-0x7039 = 0x9D2F
-0x703A = 0x9DD9
-0x703B = 0x9D30
-0x703C = 0x9D42
-0x703D = 0x9E1E
-0x703E = 0x9D53
-0x703F = 0x9E1D
-0x7040 = 0x9D60
-0x7041 = 0x9D52
-0x7042 = 0x9DF3
-0x7043 = 0x9D5C
-0x7044 = 0x9D61
-0x7045 = 0x9D93
-0x7046 = 0x9D6A
-0x7047 = 0x9D6F
-0x7048 = 0x9D89
-0x7049 = 0x9D98
-0x704A = 0x9D9A
-0x704B = 0x9DC0
-0x704C = 0x9DA5
-0x704D = 0x9DA9
-0x704E = 0x9DC2
-0x704F = 0x9DBC
-0x7050 = 0x9E1A
-0x7051 = 0x9DD3
-0x7052 = 0x9DDA
-0x7053 = 0x9DEF
-0x7054 = 0x9DE6
-0x7055 = 0x9DF2
-0x7056 = 0x9DF8
-0x7057 = 0x9E0C
-0x7058 = 0x9DFA
-0x7059 = 0x9E1B
-0x705A = 0x7592
-0x705B = 0x7594
-0x705C = 0x7664
-0x705D = 0x7658
-0x705E = 0x759D
-0x705F = 0x7667
-0x7060 = 0x75A3
-0x7061 = 0x75B3
-0x7062 = 0x75B4
-0x7063 = 0x75B8
-0x7064 = 0x75C4
-0x7065 = 0x75B1
-0x7066 = 0x75B0
-0x7067 = 0x75C3
-0x7068 = 0x75C2
-0x7069 = 0x7602
-0x706A = 0x75CD
-0x706B = 0x75E3
-0x706C = 0x7646
-0x706D = 0x75E6
-0x706E = 0x75E4
-0x706F = 0x7647
-0x7070 = 0x75E7
-0x7071 = 0x7603
-0x7072 = 0x75F1
-0x7073 = 0x75FC
-0x7074 = 0x75FF
-0x7075 = 0x7610
-0x7076 = 0x7600
-0x7077 = 0x7649
-0x7078 = 0x760C
-0x7079 = 0x761E
-0x707A = 0x760A
-0x707B = 0x7625
-0x707C = 0x763B
-0x707D = 0x7615
-0x707E = 0x7619
-0x7121 = 0x761B
-0x7122 = 0x763C
-0x7123 = 0x7622
-0x7124 = 0x7620
-0x7125 = 0x7640
-0x7126 = 0x762D
-0x7127 = 0x7630
-0x7128 = 0x766D
-0x7129 = 0x7635
-0x712A = 0x7643
-0x712B = 0x766E
-0x712C = 0x7633
-0x712D = 0x764D
-0x712E = 0x7669
-0x712F = 0x7654
-0x7130 = 0x765C
-0x7131 = 0x7656
-0x7132 = 0x7672
-0x7133 = 0x766F
-0x7134 = 0x7FCA
-0x7135 = 0x7AE6
-0x7136 = 0x7A78
-0x7137 = 0x7A79
-0x7138 = 0x7A80
-0x7139 = 0x7A86
-0x713A = 0x7A88
-0x713B = 0x7A95
-0x713C = 0x7AC7
-0x713D = 0x7AA0
-0x713E = 0x7AAC
-0x713F = 0x7AA8
-0x7140 = 0x7AB6
-0x7141 = 0x7AB3
-0x7142 = 0x8864
-0x7143 = 0x8869
-0x7144 = 0x8872
-0x7145 = 0x887D
-0x7146 = 0x887F
-0x7147 = 0x8882
-0x7148 = 0x88A2
-0x7149 = 0x8960
-0x714A = 0x88B7
-0x714B = 0x88BC
-0x714C = 0x88C9
-0x714D = 0x8933
-0x714E = 0x88CE
-0x714F = 0x895D
-0x7150 = 0x8947
-0x7151 = 0x88F1
-0x7152 = 0x891A
-0x7153 = 0x88FC
-0x7154 = 0x88E8
-0x7155 = 0x88FE
-0x7156 = 0x88F0
-0x7157 = 0x8921
-0x7158 = 0x8919
-0x7159 = 0x8913
-0x715A = 0x8938
-0x715B = 0x890A
-0x715C = 0x8964
-0x715D = 0x892B
-0x715E = 0x8936
-0x715F = 0x8941
-0x7160 = 0x8966
-0x7161 = 0x897B
-0x7162 = 0x758B
-0x7163 = 0x80E5
-0x7164 = 0x76B8
-0x7165 = 0x76B4
-0x7166 = 0x77DC
-0x7167 = 0x8012
-0x7168 = 0x8014
-0x7169 = 0x8016
-0x716A = 0x801C
-0x716B = 0x8020
-0x716C = 0x802E
-0x716D = 0x8025
-0x716E = 0x8026
-0x716F = 0x802C
-0x7170 = 0x8029
-0x7171 = 0x8028
-0x7172 = 0x8031
-0x7173 = 0x800B
-0x7174 = 0x8035
-0x7175 = 0x8043
-0x7176 = 0x8046
-0x7177 = 0x8079
-0x7178 = 0x8052
-0x7179 = 0x8075
-0x717A = 0x8071
-0x717B = 0x8983
-0x717C = 0x9807
-0x717D = 0x980E
-0x717E = 0x980F
-0x7221 = 0x9821
-0x7222 = 0x981C
-0x7223 = 0x6F41
-0x7224 = 0x9826
-0x7225 = 0x9837
-0x7226 = 0x984E
-0x7227 = 0x9853
-0x7228 = 0x9873
-0x7229 = 0x9862
-0x722A = 0x9859
-0x722B = 0x9865
-0x722C = 0x986C
-0x722D = 0x9870
-0x722E = 0x864D
-0x722F = 0x8654
-0x7230 = 0x866C
-0x7231 = 0x87E3
-0x7232 = 0x8806
-0x7233 = 0x867A
-0x7234 = 0x867C
-0x7235 = 0x867B
-0x7236 = 0x86A8
-0x7237 = 0x868D
-0x7238 = 0x868B
-0x7239 = 0x8706
-0x723A = 0x869D
-0x723B = 0x86A7
-0x723C = 0x86A3
-0x723D = 0x86AA
-0x723E = 0x8693
-0x723F = 0x86A9
-0x7240 = 0x86B6
-0x7241 = 0x86C4
-0x7242 = 0x86B5
-0x7243 = 0x8823
-0x7244 = 0x86B0
-0x7245 = 0x86BA
-0x7246 = 0x86B1
-0x7247 = 0x86AF
-0x7248 = 0x86C9
-0x7249 = 0x87F6
-0x724A = 0x86B4
-0x724B = 0x86E9
-0x724C = 0x86FA
-0x724D = 0x87EF
-0x724E = 0x86ED
-0x724F = 0x8784
-0x7250 = 0x86D0
-0x7251 = 0x8713
-0x7252 = 0x86DE
-0x7253 = 0x8810
-0x7254 = 0x86DF
-0x7255 = 0x86D8
-0x7256 = 0x86D1
-0x7257 = 0x8703
-0x7258 = 0x8707
-0x7259 = 0x86F8
-0x725A = 0x8708
-0x725B = 0x870A
-0x725C = 0x870D
-0x725D = 0x8709
-0x725E = 0x8723
-0x725F = 0x873B
-0x7260 = 0x871E
-0x7261 = 0x8725
-0x7262 = 0x872E
-0x7263 = 0x871A
-0x7264 = 0x873E
-0x7265 = 0x87C8
-0x7266 = 0x8734
-0x7267 = 0x8731
-0x7268 = 0x8729
-0x7269 = 0x8737
-0x726A = 0x873F
-0x726B = 0x8782
-0x726C = 0x8722
-0x726D = 0x877D
-0x726E = 0x8811
-0x726F = 0x877B
-0x7270 = 0x8760
-0x7271 = 0x8770
-0x7272 = 0x874C
-0x7273 = 0x876E
-0x7274 = 0x878B
-0x7275 = 0x8753
-0x7276 = 0x8763
-0x7277 = 0x87BB
-0x7278 = 0x8764
-0x7279 = 0x8759
-0x727A = 0x8765
-0x727B = 0x8793
-0x727C = 0x87AF
-0x727D = 0x87CE
-0x727E = 0x87D2
-0x7321 = 0x87C6
-0x7322 = 0x8788
-0x7323 = 0x8785
-0x7324 = 0x87AD
-0x7325 = 0x8797
-0x7326 = 0x8783
-0x7327 = 0x87AB
-0x7328 = 0x87E5
-0x7329 = 0x87AC
-0x732A = 0x87B5
-0x732B = 0x87B3
-0x732C = 0x87CB
-0x732D = 0x87D3
-0x732E = 0x87BD
-0x732F = 0x87D1
-0x7330 = 0x87C0
-0x7331 = 0x87CA
-0x7332 = 0x87DB
-0x7333 = 0x87EA
-0x7334 = 0x87E0
-0x7335 = 0x87EE
-0x7336 = 0x8816
-0x7337 = 0x8813
-0x7338 = 0x87FE
-0x7339 = 0x880A
-0x733A = 0x881B
-0x733B = 0x8821
-0x733C = 0x8839
-0x733D = 0x883C
-0x733E = 0x7F36
-0x733F = 0x7F4C
-0x7340 = 0x7F44
-0x7341 = 0x7F45
-0x7342 = 0x8210
-0x7343 = 0x7AFA
-0x7344 = 0x7AFD
-0x7345 = 0x7B08
-0x7346 = 0x7BE4
-0x7347 = 0x7B04
-0x7348 = 0x7B67
-0x7349 = 0x7B0A
-0x734A = 0x7B2B
-0x734B = 0x7B0F
-0x734C = 0x7B47
-0x734D = 0x7B38
-0x734E = 0x7B2A
-0x734F = 0x7B19
-0x7350 = 0x7B2E
-0x7351 = 0x7B31
-0x7352 = 0x7B20
-0x7353 = 0x7B25
-0x7354 = 0x7B24
-0x7355 = 0x7B33
-0x7356 = 0x7C69
-0x7357 = 0x7B1E
-0x7358 = 0x7B58
-0x7359 = 0x7BF3
-0x735A = 0x7B45
-0x735B = 0x7B75
-0x735C = 0x7B4C
-0x735D = 0x7B8F
-0x735E = 0x7B60
-0x735F = 0x7B6E
-0x7360 = 0x7B7B
-0x7361 = 0x7B62
-0x7362 = 0x7B72
-0x7363 = 0x7B71
-0x7364 = 0x7B90
-0x7365 = 0x7C00
-0x7366 = 0x7BCB
-0x7367 = 0x7BB8
-0x7368 = 0x7BAC
-0x7369 = 0x7B9D
-0x736A = 0x7C5C
-0x736B = 0x7B85
-0x736C = 0x7C1E
-0x736D = 0x7B9C
-0x736E = 0x7BA2
-0x736F = 0x7C2B
-0x7370 = 0x7BB4
-0x7371 = 0x7C23
-0x7372 = 0x7BC1
-0x7373 = 0x7BCC
-0x7374 = 0x7BDD
-0x7375 = 0x7BDA
-0x7376 = 0x7BE5
-0x7377 = 0x7BE6
-0x7378 = 0x7BEA
-0x7379 = 0x7C0C
-0x737A = 0x7BFE
-0x737B = 0x7BFC
-0x737C = 0x7C0F
-0x737D = 0x7C6A
-0x737E = 0x7C0B
-0x7421 = 0x7C1F
-0x7422 = 0x7C2A
-0x7423 = 0x7C26
-0x7424 = 0x7C38
-0x7425 = 0x7C5F
-0x7426 = 0x7C40
-0x7427 = 0x81FE
-0x7428 = 0x8201
-0x7429 = 0x8202
-0x742A = 0x8204
-0x742B = 0x81EC
-0x742C = 0x8844
-0x742D = 0x8221
-0x742E = 0x8222
-0x742F = 0x8264
-0x7430 = 0x822D
-0x7431 = 0x822F
-0x7432 = 0x8228
-0x7433 = 0x822B
-0x7434 = 0x8238
-0x7435 = 0x826B
-0x7436 = 0x8233
-0x7437 = 0x8234
-0x7438 = 0x823E
-0x7439 = 0x8244
-0x743A = 0x8249
-0x743B = 0x824B
-0x743C = 0x824F
-0x743D = 0x825A
-0x743E = 0x825F
-0x743F = 0x8268
-0x7440 = 0x887E
-0x7441 = 0x88CA
-0x7442 = 0x8888
-0x7443 = 0x88D8
-0x7444 = 0x88DF
-0x7445 = 0x895E
-0x7446 = 0x7F9D
-0x7447 = 0x7FA5
-0x7448 = 0x7FA7
-0x7449 = 0x7FAF
-0x744A = 0x7FB0
-0x744B = 0x7FB2
-0x744C = 0x7C7C
-0x744D = 0x6549
-0x744E = 0x7C91
-0x744F = 0x7CF2
-0x7450 = 0x7CF6
-0x7451 = 0x7C9E
-0x7452 = 0x7CA2
-0x7453 = 0x7CB2
-0x7454 = 0x7CBC
-0x7455 = 0x7CBD
-0x7456 = 0x7CDD
-0x7457 = 0x7CC7
-0x7458 = 0x7CCC
-0x7459 = 0x7CCD
-0x745A = 0x7CC8
-0x745B = 0x7CC5
-0x745C = 0x7CD7
-0x745D = 0x7CE8
-0x745E = 0x826E
-0x745F = 0x66A8
-0x7460 = 0x7FBF
-0x7461 = 0x7FCE
-0x7462 = 0x7FD5
-0x7463 = 0x7FE5
-0x7464 = 0x7FE1
-0x7465 = 0x7FE6
-0x7466 = 0x7FE9
-0x7467 = 0x7FEE
-0x7468 = 0x7FF3
-0x7469 = 0x7CF8
-0x746A = 0x7E36
-0x746B = 0x7DA6
-0x746C = 0x7DAE
-0x746D = 0x7E47
-0x746E = 0x7E9B
-0x746F = 0x9EA9
-0x7470 = 0x9EB4
-0x7471 = 0x8D73
-0x7472 = 0x8D84
-0x7473 = 0x8D94
-0x7474 = 0x8D91
-0x7475 = 0x8DB2
-0x7476 = 0x8D67
-0x7477 = 0x8D6D
-0x7478 = 0x8C47
-0x7479 = 0x8C49
-0x747A = 0x914A
-0x747B = 0x9150
-0x747C = 0x914E
-0x747D = 0x914F
-0x747E = 0x9164
-0x7521 = 0x9162
-0x7522 = 0x9161
-0x7523 = 0x9170
-0x7524 = 0x9169
-0x7525 = 0x916F
-0x7526 = 0x91C5
-0x7527 = 0x91C3
-0x7528 = 0x9172
-0x7529 = 0x9174
-0x752A = 0x9179
-0x752B = 0x918C
-0x752C = 0x9185
-0x752D = 0x9190
-0x752E = 0x918D
-0x752F = 0x9191
-0x7530 = 0x91A2
-0x7531 = 0x91A3
-0x7532 = 0x91AA
-0x7533 = 0x91AD
-0x7534 = 0x91AE
-0x7535 = 0x91AF
-0x7536 = 0x91B5
-0x7537 = 0x91B4
-0x7538 = 0x91BA
-0x7539 = 0x8C55
-0x753A = 0x9E7A
-0x753B = 0x8E89
-0x753C = 0x8DEB
-0x753D = 0x8E05
-0x753E = 0x8E59
-0x753F = 0x8E69
-0x7540 = 0x8DB5
-0x7541 = 0x8DBF
-0x7542 = 0x8DBC
-0x7543 = 0x8DBA
-0x7544 = 0x8E4C
-0x7545 = 0x8DD6
-0x7546 = 0x8DD7
-0x7547 = 0x8DDA
-0x7548 = 0x8E92
-0x7549 = 0x8DCE
-0x754A = 0x8DCF
-0x754B = 0x8DDB
-0x754C = 0x8DC6
-0x754D = 0x8DEC
-0x754E = 0x8E7A
-0x754F = 0x8E55
-0x7550 = 0x8DE3
-0x7551 = 0x8E9A
-0x7552 = 0x8E8B
-0x7553 = 0x8DE4
-0x7554 = 0x8E09
-0x7555 = 0x8DFD
-0x7556 = 0x8E14
-0x7557 = 0x8E1D
-0x7558 = 0x8E1F
-0x7559 = 0x8E93
-0x755A = 0x8E2E
-0x755B = 0x8E23
-0x755C = 0x8E91
-0x755D = 0x8E3A
-0x755E = 0x8E40
-0x755F = 0x8E39
-0x7560 = 0x8E35
-0x7561 = 0x8E3D
-0x7562 = 0x8E31
-0x7563 = 0x8E49
-0x7564 = 0x8E41
-0x7565 = 0x8E42
-0x7566 = 0x8EA1
-0x7567 = 0x8E63
-0x7568 = 0x8E4A
-0x7569 = 0x8E70
-0x756A = 0x8E76
-0x756B = 0x8E7C
-0x756C = 0x8E6F
-0x756D = 0x8E74
-0x756E = 0x8E85
-0x756F = 0x8EAA
-0x7570 = 0x8E94
-0x7571 = 0x8E90
-0x7572 = 0x8EA6
-0x7573 = 0x8E9E
-0x7574 = 0x8C78
-0x7575 = 0x8C82
-0x7576 = 0x8C8A
-0x7577 = 0x8C85
-0x7578 = 0x8C98
-0x7579 = 0x8C94
-0x757A = 0x659B
-0x757B = 0x89D6
-0x757C = 0x89F4
-0x757D = 0x89DA
-0x757E = 0x89DC
-0x7621 = 0x89E5
-0x7622 = 0x89EB
-0x7623 = 0x89F6
-0x7624 = 0x8A3E
-0x7625 = 0x8B26
-0x7626 = 0x975A
-0x7627 = 0x96E9
-0x7628 = 0x9742
-0x7629 = 0x96EF
-0x762A = 0x9706
-0x762B = 0x973D
-0x762C = 0x9708
-0x762D = 0x970F
-0x762E = 0x970E
-0x762F = 0x972A
-0x7630 = 0x9744
-0x7631 = 0x9730
-0x7632 = 0x973E
-0x7633 = 0x9F54
-0x7634 = 0x9F5F
-0x7635 = 0x9F59
-0x7636 = 0x9F60
-0x7637 = 0x9F5C
-0x7638 = 0x9F66
-0x7639 = 0x9F6C
-0x763A = 0x9F6A
-0x763B = 0x9F77
-0x763C = 0x9EFD
-0x763D = 0x9EFF
-0x763E = 0x9F09
-0x763F = 0x96B9
-0x7640 = 0x96BC
-0x7641 = 0x96BD
-0x7642 = 0x96CE
-0x7643 = 0x96D2
-0x7644 = 0x77BF
-0x7645 = 0x8B8E
-0x7646 = 0x928E
-0x7647 = 0x947E
-0x7648 = 0x92C8
-0x7649 = 0x93E8
-0x764A = 0x936A
-0x764B = 0x93CA
-0x764C = 0x938F
-0x764D = 0x943E
-0x764E = 0x946B
-0x764F = 0x9B77
-0x7650 = 0x9B74
-0x7651 = 0x9B81
-0x7652 = 0x9B83
-0x7653 = 0x9B8E
-0x7654 = 0x9C78
-0x7655 = 0x7A4C
-0x7656 = 0x9B92
-0x7657 = 0x9C5F
-0x7658 = 0x9B90
-0x7659 = 0x9BAD
-0x765A = 0x9B9A
-0x765B = 0x9BAA
-0x765C = 0x9B9E
-0x765D = 0x9C6D
-0x765E = 0x9BAB
-0x765F = 0x9B9D
-0x7660 = 0x9C58
-0x7661 = 0x9BC1
-0x7662 = 0x9C7A
-0x7663 = 0x9C31
-0x7664 = 0x9C39
-0x7665 = 0x9C23
-0x7666 = 0x9C37
-0x7667 = 0x9BC0
-0x7668 = 0x9BCA
-0x7669 = 0x9BC7
-0x766A = 0x9BFD
-0x766B = 0x9BD6
-0x766C = 0x9BEA
-0x766D = 0x9BEB
-0x766E = 0x9BE1
-0x766F = 0x9BE4
-0x7670 = 0x9BE7
-0x7671 = 0x9BDD
-0x7672 = 0x9BE2
-0x7673 = 0x9BF0
-0x7674 = 0x9BDB
-0x7675 = 0x9BF4
-0x7676 = 0x9BD4
-0x7677 = 0x9C5D
-0x7678 = 0x9C08
-0x7679 = 0x9C10
-0x767A = 0x9C0D
-0x767B = 0x9C12
-0x767C = 0x9C09
-0x767D = 0x9BFF
-0x767E = 0x9C20
-0x7721 = 0x9C32
-0x7722 = 0x9C2D
-0x7723 = 0x9C28
-0x7724 = 0x9C25
-0x7725 = 0x9C29
-0x7726 = 0x9C33
-0x7727 = 0x9C3E
-0x7728 = 0x9C48
-0x7729 = 0x9C3B
-0x772A = 0x9C35
-0x772B = 0x9C45
-0x772C = 0x9C56
-0x772D = 0x9C54
-0x772E = 0x9C52
-0x772F = 0x9C67
-0x7730 = 0x977C
-0x7731 = 0x9785
-0x7732 = 0x97C3
-0x7733 = 0x97BD
-0x7734 = 0x9794
-0x7735 = 0x97C9
-0x7736 = 0x97AB
-0x7737 = 0x97A3
-0x7738 = 0x97B2
-0x7739 = 0x97B4
-0x773A = 0x9AB1
-0x773B = 0x9AB0
-0x773C = 0x9AB7
-0x773D = 0x9DBB
-0x773E = 0x9AB6
-0x773F = 0x9ABA
-0x7740 = 0x9ABC
-0x7741 = 0x9AC1
-0x7742 = 0x9AC0
-0x7743 = 0x9ACF
-0x7744 = 0x9AC2
-0x7745 = 0x9AD6
-0x7746 = 0x9AD5
-0x7747 = 0x9AD1
-0x7748 = 0x9B45
-0x7749 = 0x9B43
-0x774A = 0x9B58
-0x774B = 0x9B4E
-0x774C = 0x9B48
-0x774D = 0x9B4D
-0x774E = 0x9B51
-0x774F = 0x9957
-0x7750 = 0x995C
-0x7751 = 0x992E
-0x7752 = 0x9955
-0x7753 = 0x9954
-0x7754 = 0x9ADF
-0x7755 = 0x9AE1
-0x7756 = 0x9AE6
-0x7757 = 0x9AEF
-0x7758 = 0x9AEB
-0x7759 = 0x9AFB
-0x775A = 0x9AED
-0x775B = 0x9AF9
-0x775C = 0x9B08
-0x775D = 0x9B0F
-0x775E = 0x9B22
-0x775F = 0x9B1F
-0x7760 = 0x9B23
-0x7761 = 0x4E48
-0x7762 = 0x9EBE
-0x7763 = 0x7E3B
-0x7764 = 0x9E82
-0x7765 = 0x9E87
-0x7766 = 0x9E88
-0x7767 = 0x9E8B
-0x7768 = 0x9E92
-0x7769 = 0x93D6
-0x776A = 0x9E9D
-0x776B = 0x9E9F
-0x776C = 0x9EDB
-0x776D = 0x9EDC
-0x776E = 0x9EDD
-0x776F = 0x9EE0
-0x7770 = 0x9EDF
-0x7771 = 0x9EE2
-0x7772 = 0x9EF7
-0x7773 = 0x9EE7
-0x7774 = 0x9EE5
-0x7775 = 0x9EF2
-0x7776 = 0x9EEF
-0x7777 = 0x9F22
-0x7778 = 0x9F2C
-0x7779 = 0x9F2F
-0x777A = 0x9F39
-0x777B = 0x9F37
-0x777C = 0x9F3D
-0x777D = 0x9F3E
-0x777E = 0x9F44
-0x7821 = 0x896C
-0x7822 = 0x95C6
-0x7823 = 0x9336
-0x7824 = 0x5F46
-0x7825 = 0x8514
-0x7826 = 0x7E94
-0x7827 = 0x5382
-0x7828 = 0x51B2
-0x7829 = 0x4E11
-0x782A = 0x9F63
-0x782B = 0x5679
-0x782C = 0x515A
-0x782D = 0x6DC0
-0x782E = 0x9F15
-0x782F = 0x6597
-0x7830 = 0x5641
-0x7831 = 0x9AEE
-0x7832 = 0x8303
-0x7833 = 0x4E30
-0x7834 = 0x8907
-0x7835 = 0x5E72
-0x7836 = 0x7A40
-0x7837 = 0x98B3
-0x7838 = 0x5E7F
-0x7839 = 0x95A4
-0x783A = 0x9B0D
-0x783B = 0x5212
-0x783C = 0x8FF4
-0x783D = 0x5F59
-0x783E = 0x7A6B
-0x783F = 0x98E2
-0x7840 = 0x51E0
-0x7841 = 0x50A2
-0x7842 = 0x4EF7
-0x7843 = 0x8350
-0x7844 = 0x8591
-0x7845 = 0x5118
-0x7846 = 0x636E
-0x7847 = 0x6372
-0x7848 = 0x524B
-0x7849 = 0x5938
-0x784A = 0x774F
-0x784B = 0x8721
-0x784C = 0x814A
-0x784D = 0x7E8D
-0x784E = 0x91CC
-0x784F = 0x66C6
-0x7850 = 0x5E18
-0x7851 = 0x77AD
-0x7852 = 0x9E75
-0x7853 = 0x56C9
-0x7854 = 0x9EF4
-0x7855 = 0x6FDB
-0x7856 = 0x61DE
-0x7857 = 0x77C7
-0x7858 = 0x7030
-0x7859 = 0x9EB5
-0x785A = 0x884A
-0x785B = 0x95E2
-0x785C = 0x82F9
-0x785D = 0x51ED
-0x785E = 0x6251
-0x785F = 0x4EC6
-0x7860 = 0x6734
-0x7861 = 0x97C6
-0x7862 = 0x7C64
-0x7863 = 0x7E34
-0x7864 = 0x97A6
-0x7865 = 0x9EAF
-0x7866 = 0x786E
-0x7867 = 0x820D
-0x7868 = 0x672F
-0x7869 = 0x677E
-0x786A = 0x56CC
-0x786B = 0x53F0
-0x786C = 0x98B1
-0x786D = 0x6AAF
-0x786E = 0x7F4E
-0x786F = 0x6D82
-0x7870 = 0x7CF0
-0x7871 = 0x4E07
-0x7872 = 0x4FC2
-0x7873 = 0x7E6B
-0x7874 = 0x9E79
-0x7875 = 0x56AE
-0x7876 = 0x9B1A
-0x7877 = 0x846F
-0x7878 = 0x53F6
-0x7879 = 0x90C1
-0x787A = 0x79A6
-0x787B = 0x7C72
-0x787C = 0x613F
-0x787D = 0x4E91
-0x787E = 0x9AD2
-0x7921 = 0x75C7
-0x7922 = 0x96BB
-0x7923 = 0x53EA
-0x7924 = 0x7DFB
-0x7925 = 0x88FD
-0x7926 = 0x79CD
-0x7927 = 0x7843
-0x7928 = 0x7B51
-0x7929 = 0x51C6
-END_MAP
diff --git a/enc/trans/GB/GB2312%UCS.src b/enc/trans/GB/GB2312%UCS.src
deleted file mode 100644
index d196bab535..0000000000
--- a/enc/trans/GB/GB2312%UCS.src
+++ /dev/null
@@ -1,7535 +0,0 @@
-# $NetBSD: GB2312%UCS.src,v 1.4 2006/08/19 10:58:41 tnozaki Exp $
-
-TYPE ROWCOL
-NAME "GB2312/UCS"
-SRC_ZONE 0x21-0x77 / 0x21-0x7E / 8
-OOB_MODE ILSEQ
-DST_ILSEQ 0xFFFE
-DST_UNIT_BITS 16
-
-BEGIN_MAP
-#
-# This mapping data is made from the mapping data provided by Unicode, Inc.
-# Original notice:
-#
-# Name: GB2312-80 to Unicode table (complete, hex format)
-# Unicode version: 3.0
-# Table version: 1.0
-# Table format: Format A
-# Date: 1999 October 8
-#
-# Copyright (c) 1991-1999 Unicode, Inc. All Rights reserved.
-#
-# This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
-# No claims are made as to fitness for any particular purpose. No
-# warranties of any kind are expressed or implied. The recipient
-# agrees to determine applicability of information provided. If this
-# file has been provided on optical media by Unicode, Inc., the sole
-# remedy for any claim will be exchange of defective media within 90
-# days of receipt.
-#
-# Unicode, Inc. hereby grants the right to freely use the information
-# supplied in this file in the creation of products supporting the
-# Unicode Standard, and to make copies of this file in any form for
-# internal or external distribution as long as this notice remains
-# attached.
-#
-# General notes:
-#
-#
-# This table contains one set of mappings from GB2312-80 into Unicode.
-# Note that these data are *possible* mappings only and may not be the
-# same as those used by actual products, nor may they be the best suited
-# for all uses. For more information on the mappings between various code
-# pages incorporating the repertoire of GB2312-80 and Unicode, consult the
-# VENDORS mapping data. Normative information on the mapping between
-# GB2312-80 and Unicode may be found in the Unihan.txt file in the
-# latest Unicode Character Database.
-#
-# If you have carefully considered the fact that the mappings in
-# this table are only one possible set of mappings between GB2312-80 and
-# Unicode and have no normative status, but still feel that you
-# have located an error in the table that requires fixing, you may
-# report any such error to errata@unicode.org.
-#
-#
-# Format: Three tab-separated columns
-# Column #1 is the GB2312 code (in hex as 0xXXXX)
-# Column #2 is the Unicode (in hex as 0xXXXX)
-# Column #3 the Unicode name (follows a comment sign, '#')
-# The official names for Unicode characters U+4E00
-# to U+9FA5, inclusive, is "CJK UNIFIED IDEOGRAPH-XXXX",
-# where XXXX is the code point. Including all these
-# names in this file increases its size substantially
-# and needlessly. The token "<CJK>" is used for the
-# name of these characters. If necessary, it can be
-# expanded algorithmically by a parser or editor.
-#
-# The entries are in GB2312 order
-#
-# The following algorithms can be used to change the hex form
-# of GB2312 to other standard forms:
-#
-# To change hex to EUC form, add 0x8080
-# To change hex to kuten form, first subtract 0x2020. Then
-# the high and low bytes correspond to the ku and ten of
-# the kuten form. For example, 0x2121 -> 0x0101 -> 0101;
-# 0x777E -> 0x575E -> 8794
-#
-# Version history
-# 1.0 version updates 0.0d2 version by correcting mapping for 0x212C
-# from U+2225 to U+2016.
-#
-#
-
-# GBK1
-0x2121 = 0x3000
-0x2122 = 0x3001
-0x2123 = 0x3002
-0x2124 = 0x00B7
-0x2125 = 0x02C9
-0x2126 = 0x02C7
-0x2127 = 0x00A8
-0x2128 = 0x3003
-0x2129 = 0x3005
-0x212A = 0x2014
-0x212B = 0xFF5E
-0x212C = 0x2016
-0x212D = 0x2026
-0x212E = 0x2018
-0x212F = 0x2019
-0x2130 = 0x201C
-0x2131 = 0x201D
-0x2132 = 0x3014
-0x2133 = 0x3015
-0x2134 = 0x3008
-0x2135 = 0x3009
-0x2136 = 0x300A
-0x2137 = 0x300B
-0x2138 = 0x300C
-0x2139 = 0x300D
-0x213A = 0x300E
-0x213B = 0x300F
-0x213C = 0x3016
-0x213D = 0x3017
-0x213E = 0x3010
-0x213F = 0x3011
-0x2140 = 0x00B1
-0x2141 = 0x00D7
-0x2142 = 0x00F7
-0x2143 = 0x2236
-0x2144 = 0x2227
-0x2145 = 0x2228
-0x2146 = 0x2211
-0x2147 = 0x220F
-0x2148 = 0x222A
-0x2149 = 0x2229
-0x214A = 0x2208
-0x214B = 0x2237
-0x214C = 0x221A
-0x214D = 0x22A5
-0x214E = 0x2225
-0x214F = 0x2220
-0x2150 = 0x2312
-0x2151 = 0x2299
-0x2152 = 0x222B
-0x2153 = 0x222E
-0x2154 = 0x2261
-0x2155 = 0x224C
-0x2156 = 0x2248
-0x2157 = 0x223D
-0x2158 = 0x221D
-0x2159 = 0x2260
-0x215A = 0x226E
-0x215B = 0x226F
-0x215C = 0x2264
-0x215D = 0x2265
-0x215E = 0x221E
-0x215F = 0x2235
-0x2160 = 0x2234
-0x2161 = 0x2642
-0x2162 = 0x2640
-0x2163 = 0x00B0
-0x2164 = 0x2032
-0x2165 = 0x2033
-0x2166 = 0x2103
-0x2167 = 0xFF04
-0x2168 = 0x00A4
-0x2169 = 0xFFE0
-0x216A = 0xFFE1
-0x216B = 0x2030
-0x216C = 0x00A7
-0x216D = 0x2116
-0x216E = 0x2606
-0x216F = 0x2605
-0x2170 = 0x25CB
-0x2171 = 0x25CF
-0x2172 = 0x25CE
-0x2173 = 0x25C7
-0x2174 = 0x25C6
-0x2175 = 0x25A1
-0x2176 = 0x25A0
-0x2177 = 0x25B3
-0x2178 = 0x25B2
-0x2179 = 0x203B
-0x217A = 0x2192
-0x217B = 0x2190
-0x217C = 0x2191
-0x217D = 0x2193
-0x217E = 0x3013
-0x2231 = 0x2488
-0x2232 = 0x2489
-0x2233 = 0x248A
-0x2234 = 0x248B
-0x2235 = 0x248C
-0x2236 = 0x248D
-0x2237 = 0x248E
-0x2238 = 0x248F
-0x2239 = 0x2490
-0x223A = 0x2491
-0x223B = 0x2492
-0x223C = 0x2493
-0x223D = 0x2494
-0x223E = 0x2495
-0x223F = 0x2496
-0x2240 = 0x2497
-0x2241 = 0x2498
-0x2242 = 0x2499
-0x2243 = 0x249A
-0x2244 = 0x249B
-0x2245 = 0x2474
-0x2246 = 0x2475
-0x2247 = 0x2476
-0x2248 = 0x2477
-0x2249 = 0x2478
-0x224A = 0x2479
-0x224B = 0x247A
-0x224C = 0x247B
-0x224D = 0x247C
-0x224E = 0x247D
-0x224F = 0x247E
-0x2250 = 0x247F
-0x2251 = 0x2480
-0x2252 = 0x2481
-0x2253 = 0x2482
-0x2254 = 0x2483
-0x2255 = 0x2484
-0x2256 = 0x2485
-0x2257 = 0x2486
-0x2258 = 0x2487
-0x2259 = 0x2460
-0x225A = 0x2461
-0x225B = 0x2462
-0x225C = 0x2463
-0x225D = 0x2464
-0x225E = 0x2465
-0x225F = 0x2466
-0x2260 = 0x2467
-0x2261 = 0x2468
-0x2262 = 0x2469
-0x2265 = 0x3220
-0x2266 = 0x3221
-0x2267 = 0x3222
-0x2268 = 0x3223
-0x2269 = 0x3224
-0x226A = 0x3225
-0x226B = 0x3226
-0x226C = 0x3227
-0x226D = 0x3228
-0x226E = 0x3229
-0x2271 = 0x2160
-0x2272 = 0x2161
-0x2273 = 0x2162
-0x2274 = 0x2163
-0x2275 = 0x2164
-0x2276 = 0x2165
-0x2277 = 0x2166
-0x2278 = 0x2167
-0x2279 = 0x2168
-0x227A = 0x2169
-0x227B = 0x216A
-0x227C = 0x216B
-0x2321 = 0xFF01
-0x2322 = 0xFF02
-0x2323 = 0xFF03
-0x2324 = 0xFFE5
-0x2325 = 0xFF05
-0x2326 = 0xFF06
-0x2327 = 0xFF07
-0x2328 = 0xFF08
-0x2329 = 0xFF09
-0x232A = 0xFF0A
-0x232B = 0xFF0B
-0x232C = 0xFF0C
-0x232D = 0xFF0D
-0x232E = 0xFF0E
-0x232F = 0xFF0F
-0x2330 = 0xFF10
-0x2331 = 0xFF11
-0x2332 = 0xFF12
-0x2333 = 0xFF13
-0x2334 = 0xFF14
-0x2335 = 0xFF15
-0x2336 = 0xFF16
-0x2337 = 0xFF17
-0x2338 = 0xFF18
-0x2339 = 0xFF19
-0x233A = 0xFF1A
-0x233B = 0xFF1B
-0x233C = 0xFF1C
-0x233D = 0xFF1D
-0x233E = 0xFF1E
-0x233F = 0xFF1F
-0x2340 = 0xFF20
-0x2341 = 0xFF21
-0x2342 = 0xFF22
-0x2343 = 0xFF23
-0x2344 = 0xFF24
-0x2345 = 0xFF25
-0x2346 = 0xFF26
-0x2347 = 0xFF27
-0x2348 = 0xFF28
-0x2349 = 0xFF29
-0x234A = 0xFF2A
-0x234B = 0xFF2B
-0x234C = 0xFF2C
-0x234D = 0xFF2D
-0x234E = 0xFF2E
-0x234F = 0xFF2F
-0x2350 = 0xFF30
-0x2351 = 0xFF31
-0x2352 = 0xFF32
-0x2353 = 0xFF33
-0x2354 = 0xFF34
-0x2355 = 0xFF35
-0x2356 = 0xFF36
-0x2357 = 0xFF37
-0x2358 = 0xFF38
-0x2359 = 0xFF39
-0x235A = 0xFF3A
-0x235B = 0xFF3B
-0x235C = 0xFF3C
-0x235D = 0xFF3D
-0x235E = 0xFF3E
-0x235F = 0xFF3F
-0x2360 = 0xFF40
-0x2361 = 0xFF41
-0x2362 = 0xFF42
-0x2363 = 0xFF43
-0x2364 = 0xFF44
-0x2365 = 0xFF45
-0x2366 = 0xFF46
-0x2367 = 0xFF47
-0x2368 = 0xFF48
-0x2369 = 0xFF49
-0x236A = 0xFF4A
-0x236B = 0xFF4B
-0x236C = 0xFF4C
-0x236D = 0xFF4D
-0x236E = 0xFF4E
-0x236F = 0xFF4F
-0x2370 = 0xFF50
-0x2371 = 0xFF51
-0x2372 = 0xFF52
-0x2373 = 0xFF53
-0x2374 = 0xFF54
-0x2375 = 0xFF55
-0x2376 = 0xFF56
-0x2377 = 0xFF57
-0x2378 = 0xFF58
-0x2379 = 0xFF59
-0x237A = 0xFF5A
-0x237B = 0xFF5B
-0x237C = 0xFF5C
-0x237D = 0xFF5D
-0x237E = 0xFFE3
-0x2421 = 0x3041
-0x2422 = 0x3042
-0x2423 = 0x3043
-0x2424 = 0x3044
-0x2425 = 0x3045
-0x2426 = 0x3046
-0x2427 = 0x3047
-0x2428 = 0x3048
-0x2429 = 0x3049
-0x242A = 0x304A
-0x242B = 0x304B
-0x242C = 0x304C
-0x242D = 0x304D
-0x242E = 0x304E
-0x242F = 0x304F
-0x2430 = 0x3050
-0x2431 = 0x3051
-0x2432 = 0x3052
-0x2433 = 0x3053
-0x2434 = 0x3054
-0x2435 = 0x3055
-0x2436 = 0x3056
-0x2437 = 0x3057
-0x2438 = 0x3058
-0x2439 = 0x3059
-0x243A = 0x305A
-0x243B = 0x305B
-0x243C = 0x305C
-0x243D = 0x305D
-0x243E = 0x305E
-0x243F = 0x305F
-0x2440 = 0x3060
-0x2441 = 0x3061
-0x2442 = 0x3062
-0x2443 = 0x3063
-0x2444 = 0x3064
-0x2445 = 0x3065
-0x2446 = 0x3066
-0x2447 = 0x3067
-0x2448 = 0x3068
-0x2449 = 0x3069
-0x244A = 0x306A
-0x244B = 0x306B
-0x244C = 0x306C
-0x244D = 0x306D
-0x244E = 0x306E
-0x244F = 0x306F
-0x2450 = 0x3070
-0x2451 = 0x3071
-0x2452 = 0x3072
-0x2453 = 0x3073
-0x2454 = 0x3074
-0x2455 = 0x3075
-0x2456 = 0x3076
-0x2457 = 0x3077
-0x2458 = 0x3078
-0x2459 = 0x3079
-0x245A = 0x307A
-0x245B = 0x307B
-0x245C = 0x307C
-0x245D = 0x307D
-0x245E = 0x307E
-0x245F = 0x307F
-0x2460 = 0x3080
-0x2461 = 0x3081
-0x2462 = 0x3082
-0x2463 = 0x3083
-0x2464 = 0x3084
-0x2465 = 0x3085
-0x2466 = 0x3086
-0x2467 = 0x3087
-0x2468 = 0x3088
-0x2469 = 0x3089
-0x246A = 0x308A
-0x246B = 0x308B
-0x246C = 0x308C
-0x246D = 0x308D
-0x246E = 0x308E
-0x246F = 0x308F
-0x2470 = 0x3090
-0x2471 = 0x3091
-0x2472 = 0x3092
-0x2473 = 0x3093
-0x2521 = 0x30A1
-0x2522 = 0x30A2
-0x2523 = 0x30A3
-0x2524 = 0x30A4
-0x2525 = 0x30A5
-0x2526 = 0x30A6
-0x2527 = 0x30A7
-0x2528 = 0x30A8
-0x2529 = 0x30A9
-0x252A = 0x30AA
-0x252B = 0x30AB
-0x252C = 0x30AC
-0x252D = 0x30AD
-0x252E = 0x30AE
-0x252F = 0x30AF
-0x2530 = 0x30B0
-0x2531 = 0x30B1
-0x2532 = 0x30B2
-0x2533 = 0x30B3
-0x2534 = 0x30B4
-0x2535 = 0x30B5
-0x2536 = 0x30B6
-0x2537 = 0x30B7
-0x2538 = 0x30B8
-0x2539 = 0x30B9
-0x253A = 0x30BA
-0x253B = 0x30BB
-0x253C = 0x30BC
-0x253D = 0x30BD
-0x253E = 0x30BE
-0x253F = 0x30BF
-0x2540 = 0x30C0
-0x2541 = 0x30C1
-0x2542 = 0x30C2
-0x2543 = 0x30C3
-0x2544 = 0x30C4
-0x2545 = 0x30C5
-0x2546 = 0x30C6
-0x2547 = 0x30C7
-0x2548 = 0x30C8
-0x2549 = 0x30C9
-0x254A = 0x30CA
-0x254B = 0x30CB
-0x254C = 0x30CC
-0x254D = 0x30CD
-0x254E = 0x30CE
-0x254F = 0x30CF
-0x2550 = 0x30D0
-0x2551 = 0x30D1
-0x2552 = 0x30D2
-0x2553 = 0x30D3
-0x2554 = 0x30D4
-0x2555 = 0x30D5
-0x2556 = 0x30D6
-0x2557 = 0x30D7
-0x2558 = 0x30D8
-0x2559 = 0x30D9
-0x255A = 0x30DA
-0x255B = 0x30DB
-0x255C = 0x30DC
-0x255D = 0x30DD
-0x255E = 0x30DE
-0x255F = 0x30DF
-0x2560 = 0x30E0
-0x2561 = 0x30E1
-0x2562 = 0x30E2
-0x2563 = 0x30E3
-0x2564 = 0x30E4
-0x2565 = 0x30E5
-0x2566 = 0x30E6
-0x2567 = 0x30E7
-0x2568 = 0x30E8
-0x2569 = 0x30E9
-0x256A = 0x30EA
-0x256B = 0x30EB
-0x256C = 0x30EC
-0x256D = 0x30ED
-0x256E = 0x30EE
-0x256F = 0x30EF
-0x2570 = 0x30F0
-0x2571 = 0x30F1
-0x2572 = 0x30F2
-0x2573 = 0x30F3
-0x2574 = 0x30F4
-0x2575 = 0x30F5
-0x2576 = 0x30F6
-0x2621 = 0x0391
-0x2622 = 0x0392
-0x2623 = 0x0393
-0x2624 = 0x0394
-0x2625 = 0x0395
-0x2626 = 0x0396
-0x2627 = 0x0397
-0x2628 = 0x0398
-0x2629 = 0x0399
-0x262A = 0x039A
-0x262B = 0x039B
-0x262C = 0x039C
-0x262D = 0x039D
-0x262E = 0x039E
-0x262F = 0x039F
-0x2630 = 0x03A0
-0x2631 = 0x03A1
-0x2632 = 0x03A3
-0x2633 = 0x03A4
-0x2634 = 0x03A5
-0x2635 = 0x03A6
-0x2636 = 0x03A7
-0x2637 = 0x03A8
-0x2638 = 0x03A9
-0x2641 = 0x03B1
-0x2642 = 0x03B2
-0x2643 = 0x03B3
-0x2644 = 0x03B4
-0x2645 = 0x03B5
-0x2646 = 0x03B6
-0x2647 = 0x03B7
-0x2648 = 0x03B8
-0x2649 = 0x03B9
-0x264A = 0x03BA
-0x264B = 0x03BB
-0x264C = 0x03BC
-0x264D = 0x03BD
-0x264E = 0x03BE
-0x264F = 0x03BF
-0x2650 = 0x03C0
-0x2651 = 0x03C1
-0x2652 = 0x03C3
-0x2653 = 0x03C4
-0x2654 = 0x03C5
-0x2655 = 0x03C6
-0x2656 = 0x03C7
-0x2657 = 0x03C8
-0x2658 = 0x03C9
-0x2721 = 0x0410
-0x2722 = 0x0411
-0x2723 = 0x0412
-0x2724 = 0x0413
-0x2725 = 0x0414
-0x2726 = 0x0415
-0x2727 = 0x0401
-0x2728 = 0x0416
-0x2729 = 0x0417
-0x272A = 0x0418
-0x272B = 0x0419
-0x272C = 0x041A
-0x272D = 0x041B
-0x272E = 0x041C
-0x272F = 0x041D
-0x2730 = 0x041E
-0x2731 = 0x041F
-0x2732 = 0x0420
-0x2733 = 0x0421
-0x2734 = 0x0422
-0x2735 = 0x0423
-0x2736 = 0x0424
-0x2737 = 0x0425
-0x2738 = 0x0426
-0x2739 = 0x0427
-0x273A = 0x0428
-0x273B = 0x0429
-0x273C = 0x042A
-0x273D = 0x042B
-0x273E = 0x042C
-0x273F = 0x042D
-0x2740 = 0x042E
-0x2741 = 0x042F
-0x2751 = 0x0430
-0x2752 = 0x0431
-0x2753 = 0x0432
-0x2754 = 0x0433
-0x2755 = 0x0434
-0x2756 = 0x0435
-0x2757 = 0x0451
-0x2758 = 0x0436
-0x2759 = 0x0437
-0x275A = 0x0438
-0x275B = 0x0439
-0x275C = 0x043A
-0x275D = 0x043B
-0x275E = 0x043C
-0x275F = 0x043D
-0x2760 = 0x043E
-0x2761 = 0x043F
-0x2762 = 0x0440
-0x2763 = 0x0441
-0x2764 = 0x0442
-0x2765 = 0x0443
-0x2766 = 0x0444
-0x2767 = 0x0445
-0x2768 = 0x0446
-0x2769 = 0x0447
-0x276A = 0x0448
-0x276B = 0x0449
-0x276C = 0x044A
-0x276D = 0x044B
-0x276E = 0x044C
-0x276F = 0x044D
-0x2770 = 0x044E
-0x2771 = 0x044F
-0x2821 = 0x0101
-0x2822 = 0x00E1
-0x2823 = 0x01CE
-0x2824 = 0x00E0
-0x2825 = 0x0113
-0x2826 = 0x00E9
-0x2827 = 0x011B
-0x2828 = 0x00E8
-0x2829 = 0x012B
-0x282A = 0x00ED
-0x282B = 0x01D0
-0x282C = 0x00EC
-0x282D = 0x014D
-0x282E = 0x00F3
-0x282F = 0x01D2
-0x2830 = 0x00F2
-0x2831 = 0x016B
-0x2832 = 0x00FA
-0x2833 = 0x01D4
-0x2834 = 0x00F9
-0x2835 = 0x01D6
-0x2836 = 0x01D8
-0x2837 = 0x01DA
-0x2838 = 0x01DC
-0x2839 = 0x00FC
-0x283A = 0x00EA
-0x2845 = 0x3105
-0x2846 = 0x3106
-0x2847 = 0x3107
-0x2848 = 0x3108
-0x2849 = 0x3109
-0x284A = 0x310A
-0x284B = 0x310B
-0x284C = 0x310C
-0x284D = 0x310D
-0x284E = 0x310E
-0x284F = 0x310F
-0x2850 = 0x3110
-0x2851 = 0x3111
-0x2852 = 0x3112
-0x2853 = 0x3113
-0x2854 = 0x3114
-0x2855 = 0x3115
-0x2856 = 0x3116
-0x2857 = 0x3117
-0x2858 = 0x3118
-0x2859 = 0x3119
-0x285A = 0x311A
-0x285B = 0x311B
-0x285C = 0x311C
-0x285D = 0x311D
-0x285E = 0x311E
-0x285F = 0x311F
-0x2860 = 0x3120
-0x2861 = 0x3121
-0x2862 = 0x3122
-0x2863 = 0x3123
-0x2864 = 0x3124
-0x2865 = 0x3125
-0x2866 = 0x3126
-0x2867 = 0x3127
-0x2868 = 0x3128
-0x2869 = 0x3129
-0x2924 = 0x2500
-0x2925 = 0x2501
-0x2926 = 0x2502
-0x2927 = 0x2503
-0x2928 = 0x2504
-0x2929 = 0x2505
-0x292A = 0x2506
-0x292B = 0x2507
-0x292C = 0x2508
-0x292D = 0x2509
-0x292E = 0x250A
-0x292F = 0x250B
-0x2930 = 0x250C
-0x2931 = 0x250D
-0x2932 = 0x250E
-0x2933 = 0x250F
-0x2934 = 0x2510
-0x2935 = 0x2511
-0x2936 = 0x2512
-0x2937 = 0x2513
-0x2938 = 0x2514
-0x2939 = 0x2515
-0x293A = 0x2516
-0x293B = 0x2517
-0x293C = 0x2518
-0x293D = 0x2519
-0x293E = 0x251A
-0x293F = 0x251B
-0x2940 = 0x251C
-0x2941 = 0x251D
-0x2942 = 0x251E
-0x2943 = 0x251F
-0x2944 = 0x2520
-0x2945 = 0x2521
-0x2946 = 0x2522
-0x2947 = 0x2523
-0x2948 = 0x2524
-0x2949 = 0x2525
-0x294A = 0x2526
-0x294B = 0x2527
-0x294C = 0x2528
-0x294D = 0x2529
-0x294E = 0x252A
-0x294F = 0x252B
-0x2950 = 0x252C
-0x2951 = 0x252D
-0x2952 = 0x252E
-0x2953 = 0x252F
-0x2954 = 0x2530
-0x2955 = 0x2531
-0x2956 = 0x2532
-0x2957 = 0x2533
-0x2958 = 0x2534
-0x2959 = 0x2535
-0x295A = 0x2536
-0x295B = 0x2537
-0x295C = 0x2538
-0x295D = 0x2539
-0x295E = 0x253A
-0x295F = 0x253B
-0x2960 = 0x253C
-0x2961 = 0x253D
-0x2962 = 0x253E
-0x2963 = 0x253F
-0x2964 = 0x2540
-0x2965 = 0x2541
-0x2966 = 0x2542
-0x2967 = 0x2543
-0x2968 = 0x2544
-0x2969 = 0x2545
-0x296A = 0x2546
-0x296B = 0x2547
-0x296C = 0x2548
-0x296D = 0x2549
-0x296E = 0x254A
-0x296F = 0x254B
-
-# GBK2 / GB2312 plane1
-0x3021 = 0x554A
-0x3022 = 0x963F
-0x3023 = 0x57C3
-0x3024 = 0x6328
-0x3025 = 0x54CE
-0x3026 = 0x5509
-0x3027 = 0x54C0
-0x3028 = 0x7691
-0x3029 = 0x764C
-0x302A = 0x853C
-0x302B = 0x77EE
-0x302C = 0x827E
-0x302D = 0x788D
-0x302E = 0x7231
-0x302F = 0x9698
-0x3030 = 0x978D
-0x3031 = 0x6C28
-0x3032 = 0x5B89
-0x3033 = 0x4FFA
-0x3034 = 0x6309
-0x3035 = 0x6697
-0x3036 = 0x5CB8
-0x3037 = 0x80FA
-0x3038 = 0x6848
-0x3039 = 0x80AE
-0x303A = 0x6602
-0x303B = 0x76CE
-0x303C = 0x51F9
-0x303D = 0x6556
-0x303E = 0x71AC
-0x303F = 0x7FF1
-0x3040 = 0x8884
-0x3041 = 0x50B2
-0x3042 = 0x5965
-0x3043 = 0x61CA
-0x3044 = 0x6FB3
-0x3045 = 0x82AD
-0x3046 = 0x634C
-0x3047 = 0x6252
-0x3048 = 0x53ED
-0x3049 = 0x5427
-0x304A = 0x7B06
-0x304B = 0x516B
-0x304C = 0x75A4
-0x304D = 0x5DF4
-0x304E = 0x62D4
-0x304F = 0x8DCB
-0x3050 = 0x9776
-0x3051 = 0x628A
-0x3052 = 0x8019
-0x3053 = 0x575D
-0x3054 = 0x9738
-0x3055 = 0x7F62
-0x3056 = 0x7238
-0x3057 = 0x767D
-0x3058 = 0x67CF
-0x3059 = 0x767E
-0x305A = 0x6446
-0x305B = 0x4F70
-0x305C = 0x8D25
-0x305D = 0x62DC
-0x305E = 0x7A17
-0x305F = 0x6591
-0x3060 = 0x73ED
-0x3061 = 0x642C
-0x3062 = 0x6273
-0x3063 = 0x822C
-0x3064 = 0x9881
-0x3065 = 0x677F
-0x3066 = 0x7248
-0x3067 = 0x626E
-0x3068 = 0x62CC
-0x3069 = 0x4F34
-0x306A = 0x74E3
-0x306B = 0x534A
-0x306C = 0x529E
-0x306D = 0x7ECA
-0x306E = 0x90A6
-0x306F = 0x5E2E
-0x3070 = 0x6886
-0x3071 = 0x699C
-0x3072 = 0x8180
-0x3073 = 0x7ED1
-0x3074 = 0x68D2
-0x3075 = 0x78C5
-0x3076 = 0x868C
-0x3077 = 0x9551
-0x3078 = 0x508D
-0x3079 = 0x8C24
-0x307A = 0x82DE
-0x307B = 0x80DE
-0x307C = 0x5305
-0x307D = 0x8912
-0x307E = 0x5265
-0x3121 = 0x8584
-0x3122 = 0x96F9
-0x3123 = 0x4FDD
-0x3124 = 0x5821
-0x3125 = 0x9971
-0x3126 = 0x5B9D
-0x3127 = 0x62B1
-0x3128 = 0x62A5
-0x3129 = 0x66B4
-0x312A = 0x8C79
-0x312B = 0x9C8D
-0x312C = 0x7206
-0x312D = 0x676F
-0x312E = 0x7891
-0x312F = 0x60B2
-0x3130 = 0x5351
-0x3131 = 0x5317
-0x3132 = 0x8F88
-0x3133 = 0x80CC
-0x3134 = 0x8D1D
-0x3135 = 0x94A1
-0x3136 = 0x500D
-0x3137 = 0x72C8
-0x3138 = 0x5907
-0x3139 = 0x60EB
-0x313A = 0x7119
-0x313B = 0x88AB
-0x313C = 0x5954
-0x313D = 0x82EF
-0x313E = 0x672C
-0x313F = 0x7B28
-0x3140 = 0x5D29
-0x3141 = 0x7EF7
-0x3142 = 0x752D
-0x3143 = 0x6CF5
-0x3144 = 0x8E66
-0x3145 = 0x8FF8
-0x3146 = 0x903C
-0x3147 = 0x9F3B
-0x3148 = 0x6BD4
-0x3149 = 0x9119
-0x314A = 0x7B14
-0x314B = 0x5F7C
-0x314C = 0x78A7
-0x314D = 0x84D6
-0x314E = 0x853D
-0x314F = 0x6BD5
-0x3150 = 0x6BD9
-0x3151 = 0x6BD6
-0x3152 = 0x5E01
-0x3153 = 0x5E87
-0x3154 = 0x75F9
-0x3155 = 0x95ED
-0x3156 = 0x655D
-0x3157 = 0x5F0A
-0x3158 = 0x5FC5
-0x3159 = 0x8F9F
-0x315A = 0x58C1
-0x315B = 0x81C2
-0x315C = 0x907F
-0x315D = 0x965B
-0x315E = 0x97AD
-0x315F = 0x8FB9
-0x3160 = 0x7F16
-0x3161 = 0x8D2C
-0x3162 = 0x6241
-0x3163 = 0x4FBF
-0x3164 = 0x53D8
-0x3165 = 0x535E
-0x3166 = 0x8FA8
-0x3167 = 0x8FA9
-0x3168 = 0x8FAB
-0x3169 = 0x904D
-0x316A = 0x6807
-0x316B = 0x5F6A
-0x316C = 0x8198
-0x316D = 0x8868
-0x316E = 0x9CD6
-0x316F = 0x618B
-0x3170 = 0x522B
-0x3171 = 0x762A
-0x3172 = 0x5F6C
-0x3173 = 0x658C
-0x3174 = 0x6FD2
-0x3175 = 0x6EE8
-0x3176 = 0x5BBE
-0x3177 = 0x6448
-0x3178 = 0x5175
-0x3179 = 0x51B0
-0x317A = 0x67C4
-0x317B = 0x4E19
-0x317C = 0x79C9
-0x317D = 0x997C
-0x317E = 0x70B3
-0x3221 = 0x75C5
-0x3222 = 0x5E76
-0x3223 = 0x73BB
-0x3224 = 0x83E0
-0x3225 = 0x64AD
-0x3226 = 0x62E8
-0x3227 = 0x94B5
-0x3228 = 0x6CE2
-0x3229 = 0x535A
-0x322A = 0x52C3
-0x322B = 0x640F
-0x322C = 0x94C2
-0x322D = 0x7B94
-0x322E = 0x4F2F
-0x322F = 0x5E1B
-0x3230 = 0x8236
-0x3231 = 0x8116
-0x3232 = 0x818A
-0x3233 = 0x6E24
-0x3234 = 0x6CCA
-0x3235 = 0x9A73
-0x3236 = 0x6355
-0x3237 = 0x535C
-0x3238 = 0x54FA
-0x3239 = 0x8865
-0x323A = 0x57E0
-0x323B = 0x4E0D
-0x323C = 0x5E03
-0x323D = 0x6B65
-0x323E = 0x7C3F
-0x323F = 0x90E8
-0x3240 = 0x6016
-0x3241 = 0x64E6
-0x3242 = 0x731C
-0x3243 = 0x88C1
-0x3244 = 0x6750
-0x3245 = 0x624D
-0x3246 = 0x8D22
-0x3247 = 0x776C
-0x3248 = 0x8E29
-0x3249 = 0x91C7
-0x324A = 0x5F69
-0x324B = 0x83DC
-0x324C = 0x8521
-0x324D = 0x9910
-0x324E = 0x53C2
-0x324F = 0x8695
-0x3250 = 0x6B8B
-0x3251 = 0x60ED
-0x3252 = 0x60E8
-0x3253 = 0x707F
-0x3254 = 0x82CD
-0x3255 = 0x8231
-0x3256 = 0x4ED3
-0x3257 = 0x6CA7
-0x3258 = 0x85CF
-0x3259 = 0x64CD
-0x325A = 0x7CD9
-0x325B = 0x69FD
-0x325C = 0x66F9
-0x325D = 0x8349
-0x325E = 0x5395
-0x325F = 0x7B56
-0x3260 = 0x4FA7
-0x3261 = 0x518C
-0x3262 = 0x6D4B
-0x3263 = 0x5C42
-0x3264 = 0x8E6D
-0x3265 = 0x63D2
-0x3266 = 0x53C9
-0x3267 = 0x832C
-0x3268 = 0x8336
-0x3269 = 0x67E5
-0x326A = 0x78B4
-0x326B = 0x643D
-0x326C = 0x5BDF
-0x326D = 0x5C94
-0x326E = 0x5DEE
-0x326F = 0x8BE7
-0x3270 = 0x62C6
-0x3271 = 0x67F4
-0x3272 = 0x8C7A
-0x3273 = 0x6400
-0x3274 = 0x63BA
-0x3275 = 0x8749
-0x3276 = 0x998B
-0x3277 = 0x8C17
-0x3278 = 0x7F20
-0x3279 = 0x94F2
-0x327A = 0x4EA7
-0x327B = 0x9610
-0x327C = 0x98A4
-0x327D = 0x660C
-0x327E = 0x7316
-0x3321 = 0x573A
-0x3322 = 0x5C1D
-0x3323 = 0x5E38
-0x3324 = 0x957F
-0x3325 = 0x507F
-0x3326 = 0x80A0
-0x3327 = 0x5382
-0x3328 = 0x655E
-0x3329 = 0x7545
-0x332A = 0x5531
-0x332B = 0x5021
-0x332C = 0x8D85
-0x332D = 0x6284
-0x332E = 0x949E
-0x332F = 0x671D
-0x3330 = 0x5632
-0x3331 = 0x6F6E
-0x3332 = 0x5DE2
-0x3333 = 0x5435
-0x3334 = 0x7092
-0x3335 = 0x8F66
-0x3336 = 0x626F
-0x3337 = 0x64A4
-0x3338 = 0x63A3
-0x3339 = 0x5F7B
-0x333A = 0x6F88
-0x333B = 0x90F4
-0x333C = 0x81E3
-0x333D = 0x8FB0
-0x333E = 0x5C18
-0x333F = 0x6668
-0x3340 = 0x5FF1
-0x3341 = 0x6C89
-0x3342 = 0x9648
-0x3343 = 0x8D81
-0x3344 = 0x886C
-0x3345 = 0x6491
-0x3346 = 0x79F0
-0x3347 = 0x57CE
-0x3348 = 0x6A59
-0x3349 = 0x6210
-0x334A = 0x5448
-0x334B = 0x4E58
-0x334C = 0x7A0B
-0x334D = 0x60E9
-0x334E = 0x6F84
-0x334F = 0x8BDA
-0x3350 = 0x627F
-0x3351 = 0x901E
-0x3352 = 0x9A8B
-0x3353 = 0x79E4
-0x3354 = 0x5403
-0x3355 = 0x75F4
-0x3356 = 0x6301
-0x3357 = 0x5319
-0x3358 = 0x6C60
-0x3359 = 0x8FDF
-0x335A = 0x5F1B
-0x335B = 0x9A70
-0x335C = 0x803B
-0x335D = 0x9F7F
-0x335E = 0x4F88
-0x335F = 0x5C3A
-0x3360 = 0x8D64
-0x3361 = 0x7FC5
-0x3362 = 0x65A5
-0x3363 = 0x70BD
-0x3364 = 0x5145
-0x3365 = 0x51B2
-0x3366 = 0x866B
-0x3367 = 0x5D07
-0x3368 = 0x5BA0
-0x3369 = 0x62BD
-0x336A = 0x916C
-0x336B = 0x7574
-0x336C = 0x8E0C
-0x336D = 0x7A20
-0x336E = 0x6101
-0x336F = 0x7B79
-0x3370 = 0x4EC7
-0x3371 = 0x7EF8
-0x3372 = 0x7785
-0x3373 = 0x4E11
-0x3374 = 0x81ED
-0x3375 = 0x521D
-0x3376 = 0x51FA
-0x3377 = 0x6A71
-0x3378 = 0x53A8
-0x3379 = 0x8E87
-0x337A = 0x9504
-0x337B = 0x96CF
-0x337C = 0x6EC1
-0x337D = 0x9664
-0x337E = 0x695A
-0x3421 = 0x7840
-0x3422 = 0x50A8
-0x3423 = 0x77D7
-0x3424 = 0x6410
-0x3425 = 0x89E6
-0x3426 = 0x5904
-0x3427 = 0x63E3
-0x3428 = 0x5DDD
-0x3429 = 0x7A7F
-0x342A = 0x693D
-0x342B = 0x4F20
-0x342C = 0x8239
-0x342D = 0x5598
-0x342E = 0x4E32
-0x342F = 0x75AE
-0x3430 = 0x7A97
-0x3431 = 0x5E62
-0x3432 = 0x5E8A
-0x3433 = 0x95EF
-0x3434 = 0x521B
-0x3435 = 0x5439
-0x3436 = 0x708A
-0x3437 = 0x6376
-0x3438 = 0x9524
-0x3439 = 0x5782
-0x343A = 0x6625
-0x343B = 0x693F
-0x343C = 0x9187
-0x343D = 0x5507
-0x343E = 0x6DF3
-0x343F = 0x7EAF
-0x3440 = 0x8822
-0x3441 = 0x6233
-0x3442 = 0x7EF0
-0x3443 = 0x75B5
-0x3444 = 0x8328
-0x3445 = 0x78C1
-0x3446 = 0x96CC
-0x3447 = 0x8F9E
-0x3448 = 0x6148
-0x3449 = 0x74F7
-0x344A = 0x8BCD
-0x344B = 0x6B64
-0x344C = 0x523A
-0x344D = 0x8D50
-0x344E = 0x6B21
-0x344F = 0x806A
-0x3450 = 0x8471
-0x3451 = 0x56F1
-0x3452 = 0x5306
-0x3453 = 0x4ECE
-0x3454 = 0x4E1B
-0x3455 = 0x51D1
-0x3456 = 0x7C97
-0x3457 = 0x918B
-0x3458 = 0x7C07
-0x3459 = 0x4FC3
-0x345A = 0x8E7F
-0x345B = 0x7BE1
-0x345C = 0x7A9C
-0x345D = 0x6467
-0x345E = 0x5D14
-0x345F = 0x50AC
-0x3460 = 0x8106
-0x3461 = 0x7601
-0x3462 = 0x7CB9
-0x3463 = 0x6DEC
-0x3464 = 0x7FE0
-0x3465 = 0x6751
-0x3466 = 0x5B58
-0x3467 = 0x5BF8
-0x3468 = 0x78CB
-0x3469 = 0x64AE
-0x346A = 0x6413
-0x346B = 0x63AA
-0x346C = 0x632B
-0x346D = 0x9519
-0x346E = 0x642D
-0x346F = 0x8FBE
-0x3470 = 0x7B54
-0x3471 = 0x7629
-0x3472 = 0x6253
-0x3473 = 0x5927
-0x3474 = 0x5446
-0x3475 = 0x6B79
-0x3476 = 0x50A3
-0x3477 = 0x6234
-0x3478 = 0x5E26
-0x3479 = 0x6B86
-0x347A = 0x4EE3
-0x347B = 0x8D37
-0x347C = 0x888B
-0x347D = 0x5F85
-0x347E = 0x902E
-0x3521 = 0x6020
-0x3522 = 0x803D
-0x3523 = 0x62C5
-0x3524 = 0x4E39
-0x3525 = 0x5355
-0x3526 = 0x90F8
-0x3527 = 0x63B8
-0x3528 = 0x80C6
-0x3529 = 0x65E6
-0x352A = 0x6C2E
-0x352B = 0x4F46
-0x352C = 0x60EE
-0x352D = 0x6DE1
-0x352E = 0x8BDE
-0x352F = 0x5F39
-0x3530 = 0x86CB
-0x3531 = 0x5F53
-0x3532 = 0x6321
-0x3533 = 0x515A
-0x3534 = 0x8361
-0x3535 = 0x6863
-0x3536 = 0x5200
-0x3537 = 0x6363
-0x3538 = 0x8E48
-0x3539 = 0x5012
-0x353A = 0x5C9B
-0x353B = 0x7977
-0x353C = 0x5BFC
-0x353D = 0x5230
-0x353E = 0x7A3B
-0x353F = 0x60BC
-0x3540 = 0x9053
-0x3541 = 0x76D7
-0x3542 = 0x5FB7
-0x3543 = 0x5F97
-0x3544 = 0x7684
-0x3545 = 0x8E6C
-0x3546 = 0x706F
-0x3547 = 0x767B
-0x3548 = 0x7B49
-0x3549 = 0x77AA
-0x354A = 0x51F3
-0x354B = 0x9093
-0x354C = 0x5824
-0x354D = 0x4F4E
-0x354E = 0x6EF4
-0x354F = 0x8FEA
-0x3550 = 0x654C
-0x3551 = 0x7B1B
-0x3552 = 0x72C4
-0x3553 = 0x6DA4
-0x3554 = 0x7FDF
-0x3555 = 0x5AE1
-0x3556 = 0x62B5
-0x3557 = 0x5E95
-0x3558 = 0x5730
-0x3559 = 0x8482
-0x355A = 0x7B2C
-0x355B = 0x5E1D
-0x355C = 0x5F1F
-0x355D = 0x9012
-0x355E = 0x7F14
-0x355F = 0x98A0
-0x3560 = 0x6382
-0x3561 = 0x6EC7
-0x3562 = 0x7898
-0x3563 = 0x70B9
-0x3564 = 0x5178
-0x3565 = 0x975B
-0x3566 = 0x57AB
-0x3567 = 0x7535
-0x3568 = 0x4F43
-0x3569 = 0x7538
-0x356A = 0x5E97
-0x356B = 0x60E6
-0x356C = 0x5960
-0x356D = 0x6DC0
-0x356E = 0x6BBF
-0x356F = 0x7889
-0x3570 = 0x53FC
-0x3571 = 0x96D5
-0x3572 = 0x51CB
-0x3573 = 0x5201
-0x3574 = 0x6389
-0x3575 = 0x540A
-0x3576 = 0x9493
-0x3577 = 0x8C03
-0x3578 = 0x8DCC
-0x3579 = 0x7239
-0x357A = 0x789F
-0x357B = 0x8776
-0x357C = 0x8FED
-0x357D = 0x8C0D
-0x357E = 0x53E0
-0x3621 = 0x4E01
-0x3622 = 0x76EF
-0x3623 = 0x53EE
-0x3624 = 0x9489
-0x3625 = 0x9876
-0x3626 = 0x9F0E
-0x3627 = 0x952D
-0x3628 = 0x5B9A
-0x3629 = 0x8BA2
-0x362A = 0x4E22
-0x362B = 0x4E1C
-0x362C = 0x51AC
-0x362D = 0x8463
-0x362E = 0x61C2
-0x362F = 0x52A8
-0x3630 = 0x680B
-0x3631 = 0x4F97
-0x3632 = 0x606B
-0x3633 = 0x51BB
-0x3634 = 0x6D1E
-0x3635 = 0x515C
-0x3636 = 0x6296
-0x3637 = 0x6597
-0x3638 = 0x9661
-0x3639 = 0x8C46
-0x363A = 0x9017
-0x363B = 0x75D8
-0x363C = 0x90FD
-0x363D = 0x7763
-0x363E = 0x6BD2
-0x363F = 0x728A
-0x3640 = 0x72EC
-0x3641 = 0x8BFB
-0x3642 = 0x5835
-0x3643 = 0x7779
-0x3644 = 0x8D4C
-0x3645 = 0x675C
-0x3646 = 0x9540
-0x3647 = 0x809A
-0x3648 = 0x5EA6
-0x3649 = 0x6E21
-0x364A = 0x5992
-0x364B = 0x7AEF
-0x364C = 0x77ED
-0x364D = 0x953B
-0x364E = 0x6BB5
-0x364F = 0x65AD
-0x3650 = 0x7F0E
-0x3651 = 0x5806
-0x3652 = 0x5151
-0x3653 = 0x961F
-0x3654 = 0x5BF9
-0x3655 = 0x58A9
-0x3656 = 0x5428
-0x3657 = 0x8E72
-0x3658 = 0x6566
-0x3659 = 0x987F
-0x365A = 0x56E4
-0x365B = 0x949D
-0x365C = 0x76FE
-0x365D = 0x9041
-0x365E = 0x6387
-0x365F = 0x54C6
-0x3660 = 0x591A
-0x3661 = 0x593A
-0x3662 = 0x579B
-0x3663 = 0x8EB2
-0x3664 = 0x6735
-0x3665 = 0x8DFA
-0x3666 = 0x8235
-0x3667 = 0x5241
-0x3668 = 0x60F0
-0x3669 = 0x5815
-0x366A = 0x86FE
-0x366B = 0x5CE8
-0x366C = 0x9E45
-0x366D = 0x4FC4
-0x366E = 0x989D
-0x366F = 0x8BB9
-0x3670 = 0x5A25
-0x3671 = 0x6076
-0x3672 = 0x5384
-0x3673 = 0x627C
-0x3674 = 0x904F
-0x3675 = 0x9102
-0x3676 = 0x997F
-0x3677 = 0x6069
-0x3678 = 0x800C
-0x3679 = 0x513F
-0x367A = 0x8033
-0x367B = 0x5C14
-0x367C = 0x9975
-0x367D = 0x6D31
-0x367E = 0x4E8C
-0x3721 = 0x8D30
-0x3722 = 0x53D1
-0x3723 = 0x7F5A
-0x3724 = 0x7B4F
-0x3725 = 0x4F10
-0x3726 = 0x4E4F
-0x3727 = 0x9600
-0x3728 = 0x6CD5
-0x3729 = 0x73D0
-0x372A = 0x85E9
-0x372B = 0x5E06
-0x372C = 0x756A
-0x372D = 0x7FFB
-0x372E = 0x6A0A
-0x372F = 0x77FE
-0x3730 = 0x9492
-0x3731 = 0x7E41
-0x3732 = 0x51E1
-0x3733 = 0x70E6
-0x3734 = 0x53CD
-0x3735 = 0x8FD4
-0x3736 = 0x8303
-0x3737 = 0x8D29
-0x3738 = 0x72AF
-0x3739 = 0x996D
-0x373A = 0x6CDB
-0x373B = 0x574A
-0x373C = 0x82B3
-0x373D = 0x65B9
-0x373E = 0x80AA
-0x373F = 0x623F
-0x3740 = 0x9632
-0x3741 = 0x59A8
-0x3742 = 0x4EFF
-0x3743 = 0x8BBF
-0x3744 = 0x7EBA
-0x3745 = 0x653E
-0x3746 = 0x83F2
-0x3747 = 0x975E
-0x3748 = 0x5561
-0x3749 = 0x98DE
-0x374A = 0x80A5
-0x374B = 0x532A
-0x374C = 0x8BFD
-0x374D = 0x5420
-0x374E = 0x80BA
-0x374F = 0x5E9F
-0x3750 = 0x6CB8
-0x3751 = 0x8D39
-0x3752 = 0x82AC
-0x3753 = 0x915A
-0x3754 = 0x5429
-0x3755 = 0x6C1B
-0x3756 = 0x5206
-0x3757 = 0x7EB7
-0x3758 = 0x575F
-0x3759 = 0x711A
-0x375A = 0x6C7E
-0x375B = 0x7C89
-0x375C = 0x594B
-0x375D = 0x4EFD
-0x375E = 0x5FFF
-0x375F = 0x6124
-0x3760 = 0x7CAA
-0x3761 = 0x4E30
-0x3762 = 0x5C01
-0x3763 = 0x67AB
-0x3764 = 0x8702
-0x3765 = 0x5CF0
-0x3766 = 0x950B
-0x3767 = 0x98CE
-0x3768 = 0x75AF
-0x3769 = 0x70FD
-0x376A = 0x9022
-0x376B = 0x51AF
-0x376C = 0x7F1D
-0x376D = 0x8BBD
-0x376E = 0x5949
-0x376F = 0x51E4
-0x3770 = 0x4F5B
-0x3771 = 0x5426
-0x3772 = 0x592B
-0x3773 = 0x6577
-0x3774 = 0x80A4
-0x3775 = 0x5B75
-0x3776 = 0x6276
-0x3777 = 0x62C2
-0x3778 = 0x8F90
-0x3779 = 0x5E45
-0x377A = 0x6C1F
-0x377B = 0x7B26
-0x377C = 0x4F0F
-0x377D = 0x4FD8
-0x377E = 0x670D
-0x3821 = 0x6D6E
-0x3822 = 0x6DAA
-0x3823 = 0x798F
-0x3824 = 0x88B1
-0x3825 = 0x5F17
-0x3826 = 0x752B
-0x3827 = 0x629A
-0x3828 = 0x8F85
-0x3829 = 0x4FEF
-0x382A = 0x91DC
-0x382B = 0x65A7
-0x382C = 0x812F
-0x382D = 0x8151
-0x382E = 0x5E9C
-0x382F = 0x8150
-0x3830 = 0x8D74
-0x3831 = 0x526F
-0x3832 = 0x8986
-0x3833 = 0x8D4B
-0x3834 = 0x590D
-0x3835 = 0x5085
-0x3836 = 0x4ED8
-0x3837 = 0x961C
-0x3838 = 0x7236
-0x3839 = 0x8179
-0x383A = 0x8D1F
-0x383B = 0x5BCC
-0x383C = 0x8BA3
-0x383D = 0x9644
-0x383E = 0x5987
-0x383F = 0x7F1A
-0x3840 = 0x5490
-0x3841 = 0x5676
-0x3842 = 0x560E
-0x3843 = 0x8BE5
-0x3844 = 0x6539
-0x3845 = 0x6982
-0x3846 = 0x9499
-0x3847 = 0x76D6
-0x3848 = 0x6E89
-0x3849 = 0x5E72
-0x384A = 0x7518
-0x384B = 0x6746
-0x384C = 0x67D1
-0x384D = 0x7AFF
-0x384E = 0x809D
-0x384F = 0x8D76
-0x3850 = 0x611F
-0x3851 = 0x79C6
-0x3852 = 0x6562
-0x3853 = 0x8D63
-0x3854 = 0x5188
-0x3855 = 0x521A
-0x3856 = 0x94A2
-0x3857 = 0x7F38
-0x3858 = 0x809B
-0x3859 = 0x7EB2
-0x385A = 0x5C97
-0x385B = 0x6E2F
-0x385C = 0x6760
-0x385D = 0x7BD9
-0x385E = 0x768B
-0x385F = 0x9AD8
-0x3860 = 0x818F
-0x3861 = 0x7F94
-0x3862 = 0x7CD5
-0x3863 = 0x641E
-0x3864 = 0x9550
-0x3865 = 0x7A3F
-0x3866 = 0x544A
-0x3867 = 0x54E5
-0x3868 = 0x6B4C
-0x3869 = 0x6401
-0x386A = 0x6208
-0x386B = 0x9E3D
-0x386C = 0x80F3
-0x386D = 0x7599
-0x386E = 0x5272
-0x386F = 0x9769
-0x3870 = 0x845B
-0x3871 = 0x683C
-0x3872 = 0x86E4
-0x3873 = 0x9601
-0x3874 = 0x9694
-0x3875 = 0x94EC
-0x3876 = 0x4E2A
-0x3877 = 0x5404
-0x3878 = 0x7ED9
-0x3879 = 0x6839
-0x387A = 0x8DDF
-0x387B = 0x8015
-0x387C = 0x66F4
-0x387D = 0x5E9A
-0x387E = 0x7FB9
-0x3921 = 0x57C2
-0x3922 = 0x803F
-0x3923 = 0x6897
-0x3924 = 0x5DE5
-0x3925 = 0x653B
-0x3926 = 0x529F
-0x3927 = 0x606D
-0x3928 = 0x9F9A
-0x3929 = 0x4F9B
-0x392A = 0x8EAC
-0x392B = 0x516C
-0x392C = 0x5BAB
-0x392D = 0x5F13
-0x392E = 0x5DE9
-0x392F = 0x6C5E
-0x3930 = 0x62F1
-0x3931 = 0x8D21
-0x3932 = 0x5171
-0x3933 = 0x94A9
-0x3934 = 0x52FE
-0x3935 = 0x6C9F
-0x3936 = 0x82DF
-0x3937 = 0x72D7
-0x3938 = 0x57A2
-0x3939 = 0x6784
-0x393A = 0x8D2D
-0x393B = 0x591F
-0x393C = 0x8F9C
-0x393D = 0x83C7
-0x393E = 0x5495
-0x393F = 0x7B8D
-0x3940 = 0x4F30
-0x3941 = 0x6CBD
-0x3942 = 0x5B64
-0x3943 = 0x59D1
-0x3944 = 0x9F13
-0x3945 = 0x53E4
-0x3946 = 0x86CA
-0x3947 = 0x9AA8
-0x3948 = 0x8C37
-0x3949 = 0x80A1
-0x394A = 0x6545
-0x394B = 0x987E
-0x394C = 0x56FA
-0x394D = 0x96C7
-0x394E = 0x522E
-0x394F = 0x74DC
-0x3950 = 0x5250
-0x3951 = 0x5BE1
-0x3952 = 0x6302
-0x3953 = 0x8902
-0x3954 = 0x4E56
-0x3955 = 0x62D0
-0x3956 = 0x602A
-0x3957 = 0x68FA
-0x3958 = 0x5173
-0x3959 = 0x5B98
-0x395A = 0x51A0
-0x395B = 0x89C2
-0x395C = 0x7BA1
-0x395D = 0x9986
-0x395E = 0x7F50
-0x395F = 0x60EF
-0x3960 = 0x704C
-0x3961 = 0x8D2F
-0x3962 = 0x5149
-0x3963 = 0x5E7F
-0x3964 = 0x901B
-0x3965 = 0x7470
-0x3966 = 0x89C4
-0x3967 = 0x572D
-0x3968 = 0x7845
-0x3969 = 0x5F52
-0x396A = 0x9F9F
-0x396B = 0x95FA
-0x396C = 0x8F68
-0x396D = 0x9B3C
-0x396E = 0x8BE1
-0x396F = 0x7678
-0x3970 = 0x6842
-0x3971 = 0x67DC
-0x3972 = 0x8DEA
-0x3973 = 0x8D35
-0x3974 = 0x523D
-0x3975 = 0x8F8A
-0x3976 = 0x6EDA
-0x3977 = 0x68CD
-0x3978 = 0x9505
-0x3979 = 0x90ED
-0x397A = 0x56FD
-0x397B = 0x679C
-0x397C = 0x88F9
-0x397D = 0x8FC7
-0x397E = 0x54C8
-0x3A21 = 0x9AB8
-0x3A22 = 0x5B69
-0x3A23 = 0x6D77
-0x3A24 = 0x6C26
-0x3A25 = 0x4EA5
-0x3A26 = 0x5BB3
-0x3A27 = 0x9A87
-0x3A28 = 0x9163
-0x3A29 = 0x61A8
-0x3A2A = 0x90AF
-0x3A2B = 0x97E9
-0x3A2C = 0x542B
-0x3A2D = 0x6DB5
-0x3A2E = 0x5BD2
-0x3A2F = 0x51FD
-0x3A30 = 0x558A
-0x3A31 = 0x7F55
-0x3A32 = 0x7FF0
-0x3A33 = 0x64BC
-0x3A34 = 0x634D
-0x3A35 = 0x65F1
-0x3A36 = 0x61BE
-0x3A37 = 0x608D
-0x3A38 = 0x710A
-0x3A39 = 0x6C57
-0x3A3A = 0x6C49
-0x3A3B = 0x592F
-0x3A3C = 0x676D
-0x3A3D = 0x822A
-0x3A3E = 0x58D5
-0x3A3F = 0x568E
-0x3A40 = 0x8C6A
-0x3A41 = 0x6BEB
-0x3A42 = 0x90DD
-0x3A43 = 0x597D
-0x3A44 = 0x8017
-0x3A45 = 0x53F7
-0x3A46 = 0x6D69
-0x3A47 = 0x5475
-0x3A48 = 0x559D
-0x3A49 = 0x8377
-0x3A4A = 0x83CF
-0x3A4B = 0x6838
-0x3A4C = 0x79BE
-0x3A4D = 0x548C
-0x3A4E = 0x4F55
-0x3A4F = 0x5408
-0x3A50 = 0x76D2
-0x3A51 = 0x8C89
-0x3A52 = 0x9602
-0x3A53 = 0x6CB3
-0x3A54 = 0x6DB8
-0x3A55 = 0x8D6B
-0x3A56 = 0x8910
-0x3A57 = 0x9E64
-0x3A58 = 0x8D3A
-0x3A59 = 0x563F
-0x3A5A = 0x9ED1
-0x3A5B = 0x75D5
-0x3A5C = 0x5F88
-0x3A5D = 0x72E0
-0x3A5E = 0x6068
-0x3A5F = 0x54FC
-0x3A60 = 0x4EA8
-0x3A61 = 0x6A2A
-0x3A62 = 0x8861
-0x3A63 = 0x6052
-0x3A64 = 0x8F70
-0x3A65 = 0x54C4
-0x3A66 = 0x70D8
-0x3A67 = 0x8679
-0x3A68 = 0x9E3F
-0x3A69 = 0x6D2A
-0x3A6A = 0x5B8F
-0x3A6B = 0x5F18
-0x3A6C = 0x7EA2
-0x3A6D = 0x5589
-0x3A6E = 0x4FAF
-0x3A6F = 0x7334
-0x3A70 = 0x543C
-0x3A71 = 0x539A
-0x3A72 = 0x5019
-0x3A73 = 0x540E
-0x3A74 = 0x547C
-0x3A75 = 0x4E4E
-0x3A76 = 0x5FFD
-0x3A77 = 0x745A
-0x3A78 = 0x58F6
-0x3A79 = 0x846B
-0x3A7A = 0x80E1
-0x3A7B = 0x8774
-0x3A7C = 0x72D0
-0x3A7D = 0x7CCA
-0x3A7E = 0x6E56
-0x3B21 = 0x5F27
-0x3B22 = 0x864E
-0x3B23 = 0x552C
-0x3B24 = 0x62A4
-0x3B25 = 0x4E92
-0x3B26 = 0x6CAA
-0x3B27 = 0x6237
-0x3B28 = 0x82B1
-0x3B29 = 0x54D7
-0x3B2A = 0x534E
-0x3B2B = 0x733E
-0x3B2C = 0x6ED1
-0x3B2D = 0x753B
-0x3B2E = 0x5212
-0x3B2F = 0x5316
-0x3B30 = 0x8BDD
-0x3B31 = 0x69D0
-0x3B32 = 0x5F8A
-0x3B33 = 0x6000
-0x3B34 = 0x6DEE
-0x3B35 = 0x574F
-0x3B36 = 0x6B22
-0x3B37 = 0x73AF
-0x3B38 = 0x6853
-0x3B39 = 0x8FD8
-0x3B3A = 0x7F13
-0x3B3B = 0x6362
-0x3B3C = 0x60A3
-0x3B3D = 0x5524
-0x3B3E = 0x75EA
-0x3B3F = 0x8C62
-0x3B40 = 0x7115
-0x3B41 = 0x6DA3
-0x3B42 = 0x5BA6
-0x3B43 = 0x5E7B
-0x3B44 = 0x8352
-0x3B45 = 0x614C
-0x3B46 = 0x9EC4
-0x3B47 = 0x78FA
-0x3B48 = 0x8757
-0x3B49 = 0x7C27
-0x3B4A = 0x7687
-0x3B4B = 0x51F0
-0x3B4C = 0x60F6
-0x3B4D = 0x714C
-0x3B4E = 0x6643
-0x3B4F = 0x5E4C
-0x3B50 = 0x604D
-0x3B51 = 0x8C0E
-0x3B52 = 0x7070
-0x3B53 = 0x6325
-0x3B54 = 0x8F89
-0x3B55 = 0x5FBD
-0x3B56 = 0x6062
-0x3B57 = 0x86D4
-0x3B58 = 0x56DE
-0x3B59 = 0x6BC1
-0x3B5A = 0x6094
-0x3B5B = 0x6167
-0x3B5C = 0x5349
-0x3B5D = 0x60E0
-0x3B5E = 0x6666
-0x3B5F = 0x8D3F
-0x3B60 = 0x79FD
-0x3B61 = 0x4F1A
-0x3B62 = 0x70E9
-0x3B63 = 0x6C47
-0x3B64 = 0x8BB3
-0x3B65 = 0x8BF2
-0x3B66 = 0x7ED8
-0x3B67 = 0x8364
-0x3B68 = 0x660F
-0x3B69 = 0x5A5A
-0x3B6A = 0x9B42
-0x3B6B = 0x6D51
-0x3B6C = 0x6DF7
-0x3B6D = 0x8C41
-0x3B6E = 0x6D3B
-0x3B6F = 0x4F19
-0x3B70 = 0x706B
-0x3B71 = 0x83B7
-0x3B72 = 0x6216
-0x3B73 = 0x60D1
-0x3B74 = 0x970D
-0x3B75 = 0x8D27
-0x3B76 = 0x7978
-0x3B77 = 0x51FB
-0x3B78 = 0x573E
-0x3B79 = 0x57FA
-0x3B7A = 0x673A
-0x3B7B = 0x7578
-0x3B7C = 0x7A3D
-0x3B7D = 0x79EF
-0x3B7E = 0x7B95
-0x3C21 = 0x808C
-0x3C22 = 0x9965
-0x3C23 = 0x8FF9
-0x3C24 = 0x6FC0
-0x3C25 = 0x8BA5
-0x3C26 = 0x9E21
-0x3C27 = 0x59EC
-0x3C28 = 0x7EE9
-0x3C29 = 0x7F09
-0x3C2A = 0x5409
-0x3C2B = 0x6781
-0x3C2C = 0x68D8
-0x3C2D = 0x8F91
-0x3C2E = 0x7C4D
-0x3C2F = 0x96C6
-0x3C30 = 0x53CA
-0x3C31 = 0x6025
-0x3C32 = 0x75BE
-0x3C33 = 0x6C72
-0x3C34 = 0x5373
-0x3C35 = 0x5AC9
-0x3C36 = 0x7EA7
-0x3C37 = 0x6324
-0x3C38 = 0x51E0
-0x3C39 = 0x810A
-0x3C3A = 0x5DF1
-0x3C3B = 0x84DF
-0x3C3C = 0x6280
-0x3C3D = 0x5180
-0x3C3E = 0x5B63
-0x3C3F = 0x4F0E
-0x3C40 = 0x796D
-0x3C41 = 0x5242
-0x3C42 = 0x60B8
-0x3C43 = 0x6D4E
-0x3C44 = 0x5BC4
-0x3C45 = 0x5BC2
-0x3C46 = 0x8BA1
-0x3C47 = 0x8BB0
-0x3C48 = 0x65E2
-0x3C49 = 0x5FCC
-0x3C4A = 0x9645
-0x3C4B = 0x5993
-0x3C4C = 0x7EE7
-0x3C4D = 0x7EAA
-0x3C4E = 0x5609
-0x3C4F = 0x67B7
-0x3C50 = 0x5939
-0x3C51 = 0x4F73
-0x3C52 = 0x5BB6
-0x3C53 = 0x52A0
-0x3C54 = 0x835A
-0x3C55 = 0x988A
-0x3C56 = 0x8D3E
-0x3C57 = 0x7532
-0x3C58 = 0x94BE
-0x3C59 = 0x5047
-0x3C5A = 0x7A3C
-0x3C5B = 0x4EF7
-0x3C5C = 0x67B6
-0x3C5D = 0x9A7E
-0x3C5E = 0x5AC1
-0x3C5F = 0x6B7C
-0x3C60 = 0x76D1
-0x3C61 = 0x575A
-0x3C62 = 0x5C16
-0x3C63 = 0x7B3A
-0x3C64 = 0x95F4
-0x3C65 = 0x714E
-0x3C66 = 0x517C
-0x3C67 = 0x80A9
-0x3C68 = 0x8270
-0x3C69 = 0x5978
-0x3C6A = 0x7F04
-0x3C6B = 0x8327
-0x3C6C = 0x68C0
-0x3C6D = 0x67EC
-0x3C6E = 0x78B1
-0x3C6F = 0x7877
-0x3C70 = 0x62E3
-0x3C71 = 0x6361
-0x3C72 = 0x7B80
-0x3C73 = 0x4FED
-0x3C74 = 0x526A
-0x3C75 = 0x51CF
-0x3C76 = 0x8350
-0x3C77 = 0x69DB
-0x3C78 = 0x9274
-0x3C79 = 0x8DF5
-0x3C7A = 0x8D31
-0x3C7B = 0x89C1
-0x3C7C = 0x952E
-0x3C7D = 0x7BAD
-0x3C7E = 0x4EF6
-0x3D21 = 0x5065
-0x3D22 = 0x8230
-0x3D23 = 0x5251
-0x3D24 = 0x996F
-0x3D25 = 0x6E10
-0x3D26 = 0x6E85
-0x3D27 = 0x6DA7
-0x3D28 = 0x5EFA
-0x3D29 = 0x50F5
-0x3D2A = 0x59DC
-0x3D2B = 0x5C06
-0x3D2C = 0x6D46
-0x3D2D = 0x6C5F
-0x3D2E = 0x7586
-0x3D2F = 0x848B
-0x3D30 = 0x6868
-0x3D31 = 0x5956
-0x3D32 = 0x8BB2
-0x3D33 = 0x5320
-0x3D34 = 0x9171
-0x3D35 = 0x964D
-0x3D36 = 0x8549
-0x3D37 = 0x6912
-0x3D38 = 0x7901
-0x3D39 = 0x7126
-0x3D3A = 0x80F6
-0x3D3B = 0x4EA4
-0x3D3C = 0x90CA
-0x3D3D = 0x6D47
-0x3D3E = 0x9A84
-0x3D3F = 0x5A07
-0x3D40 = 0x56BC
-0x3D41 = 0x6405
-0x3D42 = 0x94F0
-0x3D43 = 0x77EB
-0x3D44 = 0x4FA5
-0x3D45 = 0x811A
-0x3D46 = 0x72E1
-0x3D47 = 0x89D2
-0x3D48 = 0x997A
-0x3D49 = 0x7F34
-0x3D4A = 0x7EDE
-0x3D4B = 0x527F
-0x3D4C = 0x6559
-0x3D4D = 0x9175
-0x3D4E = 0x8F7F
-0x3D4F = 0x8F83
-0x3D50 = 0x53EB
-0x3D51 = 0x7A96
-0x3D52 = 0x63ED
-0x3D53 = 0x63A5
-0x3D54 = 0x7686
-0x3D55 = 0x79F8
-0x3D56 = 0x8857
-0x3D57 = 0x9636
-0x3D58 = 0x622A
-0x3D59 = 0x52AB
-0x3D5A = 0x8282
-0x3D5B = 0x6854
-0x3D5C = 0x6770
-0x3D5D = 0x6377
-0x3D5E = 0x776B
-0x3D5F = 0x7AED
-0x3D60 = 0x6D01
-0x3D61 = 0x7ED3
-0x3D62 = 0x89E3
-0x3D63 = 0x59D0
-0x3D64 = 0x6212
-0x3D65 = 0x85C9
-0x3D66 = 0x82A5
-0x3D67 = 0x754C
-0x3D68 = 0x501F
-0x3D69 = 0x4ECB
-0x3D6A = 0x75A5
-0x3D6B = 0x8BEB
-0x3D6C = 0x5C4A
-0x3D6D = 0x5DFE
-0x3D6E = 0x7B4B
-0x3D6F = 0x65A4
-0x3D70 = 0x91D1
-0x3D71 = 0x4ECA
-0x3D72 = 0x6D25
-0x3D73 = 0x895F
-0x3D74 = 0x7D27
-0x3D75 = 0x9526
-0x3D76 = 0x4EC5
-0x3D77 = 0x8C28
-0x3D78 = 0x8FDB
-0x3D79 = 0x9773
-0x3D7A = 0x664B
-0x3D7B = 0x7981
-0x3D7C = 0x8FD1
-0x3D7D = 0x70EC
-0x3D7E = 0x6D78
-0x3E21 = 0x5C3D
-0x3E22 = 0x52B2
-0x3E23 = 0x8346
-0x3E24 = 0x5162
-0x3E25 = 0x830E
-0x3E26 = 0x775B
-0x3E27 = 0x6676
-0x3E28 = 0x9CB8
-0x3E29 = 0x4EAC
-0x3E2A = 0x60CA
-0x3E2B = 0x7CBE
-0x3E2C = 0x7CB3
-0x3E2D = 0x7ECF
-0x3E2E = 0x4E95
-0x3E2F = 0x8B66
-0x3E30 = 0x666F
-0x3E31 = 0x9888
-0x3E32 = 0x9759
-0x3E33 = 0x5883
-0x3E34 = 0x656C
-0x3E35 = 0x955C
-0x3E36 = 0x5F84
-0x3E37 = 0x75C9
-0x3E38 = 0x9756
-0x3E39 = 0x7ADF
-0x3E3A = 0x7ADE
-0x3E3B = 0x51C0
-0x3E3C = 0x70AF
-0x3E3D = 0x7A98
-0x3E3E = 0x63EA
-0x3E3F = 0x7A76
-0x3E40 = 0x7EA0
-0x3E41 = 0x7396
-0x3E42 = 0x97ED
-0x3E43 = 0x4E45
-0x3E44 = 0x7078
-0x3E45 = 0x4E5D
-0x3E46 = 0x9152
-0x3E47 = 0x53A9
-0x3E48 = 0x6551
-0x3E49 = 0x65E7
-0x3E4A = 0x81FC
-0x3E4B = 0x8205
-0x3E4C = 0x548E
-0x3E4D = 0x5C31
-0x3E4E = 0x759A
-0x3E4F = 0x97A0
-0x3E50 = 0x62D8
-0x3E51 = 0x72D9
-0x3E52 = 0x75BD
-0x3E53 = 0x5C45
-0x3E54 = 0x9A79
-0x3E55 = 0x83CA
-0x3E56 = 0x5C40
-0x3E57 = 0x5480
-0x3E58 = 0x77E9
-0x3E59 = 0x4E3E
-0x3E5A = 0x6CAE
-0x3E5B = 0x805A
-0x3E5C = 0x62D2
-0x3E5D = 0x636E
-0x3E5E = 0x5DE8
-0x3E5F = 0x5177
-0x3E60 = 0x8DDD
-0x3E61 = 0x8E1E
-0x3E62 = 0x952F
-0x3E63 = 0x4FF1
-0x3E64 = 0x53E5
-0x3E65 = 0x60E7
-0x3E66 = 0x70AC
-0x3E67 = 0x5267
-0x3E68 = 0x6350
-0x3E69 = 0x9E43
-0x3E6A = 0x5A1F
-0x3E6B = 0x5026
-0x3E6C = 0x7737
-0x3E6D = 0x5377
-0x3E6E = 0x7EE2
-0x3E6F = 0x6485
-0x3E70 = 0x652B
-0x3E71 = 0x6289
-0x3E72 = 0x6398
-0x3E73 = 0x5014
-0x3E74 = 0x7235
-0x3E75 = 0x89C9
-0x3E76 = 0x51B3
-0x3E77 = 0x8BC0
-0x3E78 = 0x7EDD
-0x3E79 = 0x5747
-0x3E7A = 0x83CC
-0x3E7B = 0x94A7
-0x3E7C = 0x519B
-0x3E7D = 0x541B
-0x3E7E = 0x5CFB
-0x3F21 = 0x4FCA
-0x3F22 = 0x7AE3
-0x3F23 = 0x6D5A
-0x3F24 = 0x90E1
-0x3F25 = 0x9A8F
-0x3F26 = 0x5580
-0x3F27 = 0x5496
-0x3F28 = 0x5361
-0x3F29 = 0x54AF
-0x3F2A = 0x5F00
-0x3F2B = 0x63E9
-0x3F2C = 0x6977
-0x3F2D = 0x51EF
-0x3F2E = 0x6168
-0x3F2F = 0x520A
-0x3F30 = 0x582A
-0x3F31 = 0x52D8
-0x3F32 = 0x574E
-0x3F33 = 0x780D
-0x3F34 = 0x770B
-0x3F35 = 0x5EB7
-0x3F36 = 0x6177
-0x3F37 = 0x7CE0
-0x3F38 = 0x625B
-0x3F39 = 0x6297
-0x3F3A = 0x4EA2
-0x3F3B = 0x7095
-0x3F3C = 0x8003
-0x3F3D = 0x62F7
-0x3F3E = 0x70E4
-0x3F3F = 0x9760
-0x3F40 = 0x5777
-0x3F41 = 0x82DB
-0x3F42 = 0x67EF
-0x3F43 = 0x68F5
-0x3F44 = 0x78D5
-0x3F45 = 0x9897
-0x3F46 = 0x79D1
-0x3F47 = 0x58F3
-0x3F48 = 0x54B3
-0x3F49 = 0x53EF
-0x3F4A = 0x6E34
-0x3F4B = 0x514B
-0x3F4C = 0x523B
-0x3F4D = 0x5BA2
-0x3F4E = 0x8BFE
-0x3F4F = 0x80AF
-0x3F50 = 0x5543
-0x3F51 = 0x57A6
-0x3F52 = 0x6073
-0x3F53 = 0x5751
-0x3F54 = 0x542D
-0x3F55 = 0x7A7A
-0x3F56 = 0x6050
-0x3F57 = 0x5B54
-0x3F58 = 0x63A7
-0x3F59 = 0x62A0
-0x3F5A = 0x53E3
-0x3F5B = 0x6263
-0x3F5C = 0x5BC7
-0x3F5D = 0x67AF
-0x3F5E = 0x54ED
-0x3F5F = 0x7A9F
-0x3F60 = 0x82E6
-0x3F61 = 0x9177
-0x3F62 = 0x5E93
-0x3F63 = 0x88E4
-0x3F64 = 0x5938
-0x3F65 = 0x57AE
-0x3F66 = 0x630E
-0x3F67 = 0x8DE8
-0x3F68 = 0x80EF
-0x3F69 = 0x5757
-0x3F6A = 0x7B77
-0x3F6B = 0x4FA9
-0x3F6C = 0x5FEB
-0x3F6D = 0x5BBD
-0x3F6E = 0x6B3E
-0x3F6F = 0x5321
-0x3F70 = 0x7B50
-0x3F71 = 0x72C2
-0x3F72 = 0x6846
-0x3F73 = 0x77FF
-0x3F74 = 0x7736
-0x3F75 = 0x65F7
-0x3F76 = 0x51B5
-0x3F77 = 0x4E8F
-0x3F78 = 0x76D4
-0x3F79 = 0x5CBF
-0x3F7A = 0x7AA5
-0x3F7B = 0x8475
-0x3F7C = 0x594E
-0x3F7D = 0x9B41
-0x3F7E = 0x5080
-0x4021 = 0x9988
-0x4022 = 0x6127
-0x4023 = 0x6E83
-0x4024 = 0x5764
-0x4025 = 0x6606
-0x4026 = 0x6346
-0x4027 = 0x56F0
-0x4028 = 0x62EC
-0x4029 = 0x6269
-0x402A = 0x5ED3
-0x402B = 0x9614
-0x402C = 0x5783
-0x402D = 0x62C9
-0x402E = 0x5587
-0x402F = 0x8721
-0x4030 = 0x814A
-0x4031 = 0x8FA3
-0x4032 = 0x5566
-0x4033 = 0x83B1
-0x4034 = 0x6765
-0x4035 = 0x8D56
-0x4036 = 0x84DD
-0x4037 = 0x5A6A
-0x4038 = 0x680F
-0x4039 = 0x62E6
-0x403A = 0x7BEE
-0x403B = 0x9611
-0x403C = 0x5170
-0x403D = 0x6F9C
-0x403E = 0x8C30
-0x403F = 0x63FD
-0x4040 = 0x89C8
-0x4041 = 0x61D2
-0x4042 = 0x7F06
-0x4043 = 0x70C2
-0x4044 = 0x6EE5
-0x4045 = 0x7405
-0x4046 = 0x6994
-0x4047 = 0x72FC
-0x4048 = 0x5ECA
-0x4049 = 0x90CE
-0x404A = 0x6717
-0x404B = 0x6D6A
-0x404C = 0x635E
-0x404D = 0x52B3
-0x404E = 0x7262
-0x404F = 0x8001
-0x4050 = 0x4F6C
-0x4051 = 0x59E5
-0x4052 = 0x916A
-0x4053 = 0x70D9
-0x4054 = 0x6D9D
-0x4055 = 0x52D2
-0x4056 = 0x4E50
-0x4057 = 0x96F7
-0x4058 = 0x956D
-0x4059 = 0x857E
-0x405A = 0x78CA
-0x405B = 0x7D2F
-0x405C = 0x5121
-0x405D = 0x5792
-0x405E = 0x64C2
-0x405F = 0x808B
-0x4060 = 0x7C7B
-0x4061 = 0x6CEA
-0x4062 = 0x68F1
-0x4063 = 0x695E
-0x4064 = 0x51B7
-0x4065 = 0x5398
-0x4066 = 0x68A8
-0x4067 = 0x7281
-0x4068 = 0x9ECE
-0x4069 = 0x7BF1
-0x406A = 0x72F8
-0x406B = 0x79BB
-0x406C = 0x6F13
-0x406D = 0x7406
-0x406E = 0x674E
-0x406F = 0x91CC
-0x4070 = 0x9CA4
-0x4071 = 0x793C
-0x4072 = 0x8389
-0x4073 = 0x8354
-0x4074 = 0x540F
-0x4075 = 0x6817
-0x4076 = 0x4E3D
-0x4077 = 0x5389
-0x4078 = 0x52B1
-0x4079 = 0x783E
-0x407A = 0x5386
-0x407B = 0x5229
-0x407C = 0x5088
-0x407D = 0x4F8B
-0x407E = 0x4FD0
-0x4121 = 0x75E2
-0x4122 = 0x7ACB
-0x4123 = 0x7C92
-0x4124 = 0x6CA5
-0x4125 = 0x96B6
-0x4126 = 0x529B
-0x4127 = 0x7483
-0x4128 = 0x54E9
-0x4129 = 0x4FE9
-0x412A = 0x8054
-0x412B = 0x83B2
-0x412C = 0x8FDE
-0x412D = 0x9570
-0x412E = 0x5EC9
-0x412F = 0x601C
-0x4130 = 0x6D9F
-0x4131 = 0x5E18
-0x4132 = 0x655B
-0x4133 = 0x8138
-0x4134 = 0x94FE
-0x4135 = 0x604B
-0x4136 = 0x70BC
-0x4137 = 0x7EC3
-0x4138 = 0x7CAE
-0x4139 = 0x51C9
-0x413A = 0x6881
-0x413B = 0x7CB1
-0x413C = 0x826F
-0x413D = 0x4E24
-0x413E = 0x8F86
-0x413F = 0x91CF
-0x4140 = 0x667E
-0x4141 = 0x4EAE
-0x4142 = 0x8C05
-0x4143 = 0x64A9
-0x4144 = 0x804A
-0x4145 = 0x50DA
-0x4146 = 0x7597
-0x4147 = 0x71CE
-0x4148 = 0x5BE5
-0x4149 = 0x8FBD
-0x414A = 0x6F66
-0x414B = 0x4E86
-0x414C = 0x6482
-0x414D = 0x9563
-0x414E = 0x5ED6
-0x414F = 0x6599
-0x4150 = 0x5217
-0x4151 = 0x88C2
-0x4152 = 0x70C8
-0x4153 = 0x52A3
-0x4154 = 0x730E
-0x4155 = 0x7433
-0x4156 = 0x6797
-0x4157 = 0x78F7
-0x4158 = 0x9716
-0x4159 = 0x4E34
-0x415A = 0x90BB
-0x415B = 0x9CDE
-0x415C = 0x6DCB
-0x415D = 0x51DB
-0x415E = 0x8D41
-0x415F = 0x541D
-0x4160 = 0x62CE
-0x4161 = 0x73B2
-0x4162 = 0x83F1
-0x4163 = 0x96F6
-0x4164 = 0x9F84
-0x4165 = 0x94C3
-0x4166 = 0x4F36
-0x4167 = 0x7F9A
-0x4168 = 0x51CC
-0x4169 = 0x7075
-0x416A = 0x9675
-0x416B = 0x5CAD
-0x416C = 0x9886
-0x416D = 0x53E6
-0x416E = 0x4EE4
-0x416F = 0x6E9C
-0x4170 = 0x7409
-0x4171 = 0x69B4
-0x4172 = 0x786B
-0x4173 = 0x998F
-0x4174 = 0x7559
-0x4175 = 0x5218
-0x4176 = 0x7624
-0x4177 = 0x6D41
-0x4178 = 0x67F3
-0x4179 = 0x516D
-0x417A = 0x9F99
-0x417B = 0x804B
-0x417C = 0x5499
-0x417D = 0x7B3C
-0x417E = 0x7ABF
-0x4221 = 0x9686
-0x4222 = 0x5784
-0x4223 = 0x62E2
-0x4224 = 0x9647
-0x4225 = 0x697C
-0x4226 = 0x5A04
-0x4227 = 0x6402
-0x4228 = 0x7BD3
-0x4229 = 0x6F0F
-0x422A = 0x964B
-0x422B = 0x82A6
-0x422C = 0x5362
-0x422D = 0x9885
-0x422E = 0x5E90
-0x422F = 0x7089
-0x4230 = 0x63B3
-0x4231 = 0x5364
-0x4232 = 0x864F
-0x4233 = 0x9C81
-0x4234 = 0x9E93
-0x4235 = 0x788C
-0x4236 = 0x9732
-0x4237 = 0x8DEF
-0x4238 = 0x8D42
-0x4239 = 0x9E7F
-0x423A = 0x6F5E
-0x423B = 0x7984
-0x423C = 0x5F55
-0x423D = 0x9646
-0x423E = 0x622E
-0x423F = 0x9A74
-0x4240 = 0x5415
-0x4241 = 0x94DD
-0x4242 = 0x4FA3
-0x4243 = 0x65C5
-0x4244 = 0x5C65
-0x4245 = 0x5C61
-0x4246 = 0x7F15
-0x4247 = 0x8651
-0x4248 = 0x6C2F
-0x4249 = 0x5F8B
-0x424A = 0x7387
-0x424B = 0x6EE4
-0x424C = 0x7EFF
-0x424D = 0x5CE6
-0x424E = 0x631B
-0x424F = 0x5B6A
-0x4250 = 0x6EE6
-0x4251 = 0x5375
-0x4252 = 0x4E71
-0x4253 = 0x63A0
-0x4254 = 0x7565
-0x4255 = 0x62A1
-0x4256 = 0x8F6E
-0x4257 = 0x4F26
-0x4258 = 0x4ED1
-0x4259 = 0x6CA6
-0x425A = 0x7EB6
-0x425B = 0x8BBA
-0x425C = 0x841D
-0x425D = 0x87BA
-0x425E = 0x7F57
-0x425F = 0x903B
-0x4260 = 0x9523
-0x4261 = 0x7BA9
-0x4262 = 0x9AA1
-0x4263 = 0x88F8
-0x4264 = 0x843D
-0x4265 = 0x6D1B
-0x4266 = 0x9A86
-0x4267 = 0x7EDC
-0x4268 = 0x5988
-0x4269 = 0x9EBB
-0x426A = 0x739B
-0x426B = 0x7801
-0x426C = 0x8682
-0x426D = 0x9A6C
-0x426E = 0x9A82
-0x426F = 0x561B
-0x4270 = 0x5417
-0x4271 = 0x57CB
-0x4272 = 0x4E70
-0x4273 = 0x9EA6
-0x4274 = 0x5356
-0x4275 = 0x8FC8
-0x4276 = 0x8109
-0x4277 = 0x7792
-0x4278 = 0x9992
-0x4279 = 0x86EE
-0x427A = 0x6EE1
-0x427B = 0x8513
-0x427C = 0x66FC
-0x427D = 0x6162
-0x427E = 0x6F2B
-0x4321 = 0x8C29
-0x4322 = 0x8292
-0x4323 = 0x832B
-0x4324 = 0x76F2
-0x4325 = 0x6C13
-0x4326 = 0x5FD9
-0x4327 = 0x83BD
-0x4328 = 0x732B
-0x4329 = 0x8305
-0x432A = 0x951A
-0x432B = 0x6BDB
-0x432C = 0x77DB
-0x432D = 0x94C6
-0x432E = 0x536F
-0x432F = 0x8302
-0x4330 = 0x5192
-0x4331 = 0x5E3D
-0x4332 = 0x8C8C
-0x4333 = 0x8D38
-0x4334 = 0x4E48
-0x4335 = 0x73AB
-0x4336 = 0x679A
-0x4337 = 0x6885
-0x4338 = 0x9176
-0x4339 = 0x9709
-0x433A = 0x7164
-0x433B = 0x6CA1
-0x433C = 0x7709
-0x433D = 0x5A92
-0x433E = 0x9541
-0x433F = 0x6BCF
-0x4340 = 0x7F8E
-0x4341 = 0x6627
-0x4342 = 0x5BD0
-0x4343 = 0x59B9
-0x4344 = 0x5A9A
-0x4345 = 0x95E8
-0x4346 = 0x95F7
-0x4347 = 0x4EEC
-0x4348 = 0x840C
-0x4349 = 0x8499
-0x434A = 0x6AAC
-0x434B = 0x76DF
-0x434C = 0x9530
-0x434D = 0x731B
-0x434E = 0x68A6
-0x434F = 0x5B5F
-0x4350 = 0x772F
-0x4351 = 0x919A
-0x4352 = 0x9761
-0x4353 = 0x7CDC
-0x4354 = 0x8FF7
-0x4355 = 0x8C1C
-0x4356 = 0x5F25
-0x4357 = 0x7C73
-0x4358 = 0x79D8
-0x4359 = 0x89C5
-0x435A = 0x6CCC
-0x435B = 0x871C
-0x435C = 0x5BC6
-0x435D = 0x5E42
-0x435E = 0x68C9
-0x435F = 0x7720
-0x4360 = 0x7EF5
-0x4361 = 0x5195
-0x4362 = 0x514D
-0x4363 = 0x52C9
-0x4364 = 0x5A29
-0x4365 = 0x7F05
-0x4366 = 0x9762
-0x4367 = 0x82D7
-0x4368 = 0x63CF
-0x4369 = 0x7784
-0x436A = 0x85D0
-0x436B = 0x79D2
-0x436C = 0x6E3A
-0x436D = 0x5E99
-0x436E = 0x5999
-0x436F = 0x8511
-0x4370 = 0x706D
-0x4371 = 0x6C11
-0x4372 = 0x62BF
-0x4373 = 0x76BF
-0x4374 = 0x654F
-0x4375 = 0x60AF
-0x4376 = 0x95FD
-0x4377 = 0x660E
-0x4378 = 0x879F
-0x4379 = 0x9E23
-0x437A = 0x94ED
-0x437B = 0x540D
-0x437C = 0x547D
-0x437D = 0x8C2C
-0x437E = 0x6478
-0x4421 = 0x6479
-0x4422 = 0x8611
-0x4423 = 0x6A21
-0x4424 = 0x819C
-0x4425 = 0x78E8
-0x4426 = 0x6469
-0x4427 = 0x9B54
-0x4428 = 0x62B9
-0x4429 = 0x672B
-0x442A = 0x83AB
-0x442B = 0x58A8
-0x442C = 0x9ED8
-0x442D = 0x6CAB
-0x442E = 0x6F20
-0x442F = 0x5BDE
-0x4430 = 0x964C
-0x4431 = 0x8C0B
-0x4432 = 0x725F
-0x4433 = 0x67D0
-0x4434 = 0x62C7
-0x4435 = 0x7261
-0x4436 = 0x4EA9
-0x4437 = 0x59C6
-0x4438 = 0x6BCD
-0x4439 = 0x5893
-0x443A = 0x66AE
-0x443B = 0x5E55
-0x443C = 0x52DF
-0x443D = 0x6155
-0x443E = 0x6728
-0x443F = 0x76EE
-0x4440 = 0x7766
-0x4441 = 0x7267
-0x4442 = 0x7A46
-0x4443 = 0x62FF
-0x4444 = 0x54EA
-0x4445 = 0x5450
-0x4446 = 0x94A0
-0x4447 = 0x90A3
-0x4448 = 0x5A1C
-0x4449 = 0x7EB3
-0x444A = 0x6C16
-0x444B = 0x4E43
-0x444C = 0x5976
-0x444D = 0x8010
-0x444E = 0x5948
-0x444F = 0x5357
-0x4450 = 0x7537
-0x4451 = 0x96BE
-0x4452 = 0x56CA
-0x4453 = 0x6320
-0x4454 = 0x8111
-0x4455 = 0x607C
-0x4456 = 0x95F9
-0x4457 = 0x6DD6
-0x4458 = 0x5462
-0x4459 = 0x9981
-0x445A = 0x5185
-0x445B = 0x5AE9
-0x445C = 0x80FD
-0x445D = 0x59AE
-0x445E = 0x9713
-0x445F = 0x502A
-0x4460 = 0x6CE5
-0x4461 = 0x5C3C
-0x4462 = 0x62DF
-0x4463 = 0x4F60
-0x4464 = 0x533F
-0x4465 = 0x817B
-0x4466 = 0x9006
-0x4467 = 0x6EBA
-0x4468 = 0x852B
-0x4469 = 0x62C8
-0x446A = 0x5E74
-0x446B = 0x78BE
-0x446C = 0x64B5
-0x446D = 0x637B
-0x446E = 0x5FF5
-0x446F = 0x5A18
-0x4470 = 0x917F
-0x4471 = 0x9E1F
-0x4472 = 0x5C3F
-0x4473 = 0x634F
-0x4474 = 0x8042
-0x4475 = 0x5B7D
-0x4476 = 0x556E
-0x4477 = 0x954A
-0x4478 = 0x954D
-0x4479 = 0x6D85
-0x447A = 0x60A8
-0x447B = 0x67E0
-0x447C = 0x72DE
-0x447D = 0x51DD
-0x447E = 0x5B81
-0x4521 = 0x62E7
-0x4522 = 0x6CDE
-0x4523 = 0x725B
-0x4524 = 0x626D
-0x4525 = 0x94AE
-0x4526 = 0x7EBD
-0x4527 = 0x8113
-0x4528 = 0x6D53
-0x4529 = 0x519C
-0x452A = 0x5F04
-0x452B = 0x5974
-0x452C = 0x52AA
-0x452D = 0x6012
-0x452E = 0x5973
-0x452F = 0x6696
-0x4530 = 0x8650
-0x4531 = 0x759F
-0x4532 = 0x632A
-0x4533 = 0x61E6
-0x4534 = 0x7CEF
-0x4535 = 0x8BFA
-0x4536 = 0x54E6
-0x4537 = 0x6B27
-0x4538 = 0x9E25
-0x4539 = 0x6BB4
-0x453A = 0x85D5
-0x453B = 0x5455
-0x453C = 0x5076
-0x453D = 0x6CA4
-0x453E = 0x556A
-0x453F = 0x8DB4
-0x4540 = 0x722C
-0x4541 = 0x5E15
-0x4542 = 0x6015
-0x4543 = 0x7436
-0x4544 = 0x62CD
-0x4545 = 0x6392
-0x4546 = 0x724C
-0x4547 = 0x5F98
-0x4548 = 0x6E43
-0x4549 = 0x6D3E
-0x454A = 0x6500
-0x454B = 0x6F58
-0x454C = 0x76D8
-0x454D = 0x78D0
-0x454E = 0x76FC
-0x454F = 0x7554
-0x4550 = 0x5224
-0x4551 = 0x53DB
-0x4552 = 0x4E53
-0x4553 = 0x5E9E
-0x4554 = 0x65C1
-0x4555 = 0x802A
-0x4556 = 0x80D6
-0x4557 = 0x629B
-0x4558 = 0x5486
-0x4559 = 0x5228
-0x455A = 0x70AE
-0x455B = 0x888D
-0x455C = 0x8DD1
-0x455D = 0x6CE1
-0x455E = 0x5478
-0x455F = 0x80DA
-0x4560 = 0x57F9
-0x4561 = 0x88F4
-0x4562 = 0x8D54
-0x4563 = 0x966A
-0x4564 = 0x914D
-0x4565 = 0x4F69
-0x4566 = 0x6C9B
-0x4567 = 0x55B7
-0x4568 = 0x76C6
-0x4569 = 0x7830
-0x456A = 0x62A8
-0x456B = 0x70F9
-0x456C = 0x6F8E
-0x456D = 0x5F6D
-0x456E = 0x84EC
-0x456F = 0x68DA
-0x4570 = 0x787C
-0x4571 = 0x7BF7
-0x4572 = 0x81A8
-0x4573 = 0x670B
-0x4574 = 0x9E4F
-0x4575 = 0x6367
-0x4576 = 0x78B0
-0x4577 = 0x576F
-0x4578 = 0x7812
-0x4579 = 0x9739
-0x457A = 0x6279
-0x457B = 0x62AB
-0x457C = 0x5288
-0x457D = 0x7435
-0x457E = 0x6BD7
-0x4621 = 0x5564
-0x4622 = 0x813E
-0x4623 = 0x75B2
-0x4624 = 0x76AE
-0x4625 = 0x5339
-0x4626 = 0x75DE
-0x4627 = 0x50FB
-0x4628 = 0x5C41
-0x4629 = 0x8B6C
-0x462A = 0x7BC7
-0x462B = 0x504F
-0x462C = 0x7247
-0x462D = 0x9A97
-0x462E = 0x98D8
-0x462F = 0x6F02
-0x4630 = 0x74E2
-0x4631 = 0x7968
-0x4632 = 0x6487
-0x4633 = 0x77A5
-0x4634 = 0x62FC
-0x4635 = 0x9891
-0x4636 = 0x8D2B
-0x4637 = 0x54C1
-0x4638 = 0x8058
-0x4639 = 0x4E52
-0x463A = 0x576A
-0x463B = 0x82F9
-0x463C = 0x840D
-0x463D = 0x5E73
-0x463E = 0x51ED
-0x463F = 0x74F6
-0x4640 = 0x8BC4
-0x4641 = 0x5C4F
-0x4642 = 0x5761
-0x4643 = 0x6CFC
-0x4644 = 0x9887
-0x4645 = 0x5A46
-0x4646 = 0x7834
-0x4647 = 0x9B44
-0x4648 = 0x8FEB
-0x4649 = 0x7C95
-0x464A = 0x5256
-0x464B = 0x6251
-0x464C = 0x94FA
-0x464D = 0x4EC6
-0x464E = 0x8386
-0x464F = 0x8461
-0x4650 = 0x83E9
-0x4651 = 0x84B2
-0x4652 = 0x57D4
-0x4653 = 0x6734
-0x4654 = 0x5703
-0x4655 = 0x666E
-0x4656 = 0x6D66
-0x4657 = 0x8C31
-0x4658 = 0x66DD
-0x4659 = 0x7011
-0x465A = 0x671F
-0x465B = 0x6B3A
-0x465C = 0x6816
-0x465D = 0x621A
-0x465E = 0x59BB
-0x465F = 0x4E03
-0x4660 = 0x51C4
-0x4661 = 0x6F06
-0x4662 = 0x67D2
-0x4663 = 0x6C8F
-0x4664 = 0x5176
-0x4665 = 0x68CB
-0x4666 = 0x5947
-0x4667 = 0x6B67
-0x4668 = 0x7566
-0x4669 = 0x5D0E
-0x466A = 0x8110
-0x466B = 0x9F50
-0x466C = 0x65D7
-0x466D = 0x7948
-0x466E = 0x7941
-0x466F = 0x9A91
-0x4670 = 0x8D77
-0x4671 = 0x5C82
-0x4672 = 0x4E5E
-0x4673 = 0x4F01
-0x4674 = 0x542F
-0x4675 = 0x5951
-0x4676 = 0x780C
-0x4677 = 0x5668
-0x4678 = 0x6C14
-0x4679 = 0x8FC4
-0x467A = 0x5F03
-0x467B = 0x6C7D
-0x467C = 0x6CE3
-0x467D = 0x8BAB
-0x467E = 0x6390
-0x4721 = 0x6070
-0x4722 = 0x6D3D
-0x4723 = 0x7275
-0x4724 = 0x6266
-0x4725 = 0x948E
-0x4726 = 0x94C5
-0x4727 = 0x5343
-0x4728 = 0x8FC1
-0x4729 = 0x7B7E
-0x472A = 0x4EDF
-0x472B = 0x8C26
-0x472C = 0x4E7E
-0x472D = 0x9ED4
-0x472E = 0x94B1
-0x472F = 0x94B3
-0x4730 = 0x524D
-0x4731 = 0x6F5C
-0x4732 = 0x9063
-0x4733 = 0x6D45
-0x4734 = 0x8C34
-0x4735 = 0x5811
-0x4736 = 0x5D4C
-0x4737 = 0x6B20
-0x4738 = 0x6B49
-0x4739 = 0x67AA
-0x473A = 0x545B
-0x473B = 0x8154
-0x473C = 0x7F8C
-0x473D = 0x5899
-0x473E = 0x8537
-0x473F = 0x5F3A
-0x4740 = 0x62A2
-0x4741 = 0x6A47
-0x4742 = 0x9539
-0x4743 = 0x6572
-0x4744 = 0x6084
-0x4745 = 0x6865
-0x4746 = 0x77A7
-0x4747 = 0x4E54
-0x4748 = 0x4FA8
-0x4749 = 0x5DE7
-0x474A = 0x9798
-0x474B = 0x64AC
-0x474C = 0x7FD8
-0x474D = 0x5CED
-0x474E = 0x4FCF
-0x474F = 0x7A8D
-0x4750 = 0x5207
-0x4751 = 0x8304
-0x4752 = 0x4E14
-0x4753 = 0x602F
-0x4754 = 0x7A83
-0x4755 = 0x94A6
-0x4756 = 0x4FB5
-0x4757 = 0x4EB2
-0x4758 = 0x79E6
-0x4759 = 0x7434
-0x475A = 0x52E4
-0x475B = 0x82B9
-0x475C = 0x64D2
-0x475D = 0x79BD
-0x475E = 0x5BDD
-0x475F = 0x6C81
-0x4760 = 0x9752
-0x4761 = 0x8F7B
-0x4762 = 0x6C22
-0x4763 = 0x503E
-0x4764 = 0x537F
-0x4765 = 0x6E05
-0x4766 = 0x64CE
-0x4767 = 0x6674
-0x4768 = 0x6C30
-0x4769 = 0x60C5
-0x476A = 0x9877
-0x476B = 0x8BF7
-0x476C = 0x5E86
-0x476D = 0x743C
-0x476E = 0x7A77
-0x476F = 0x79CB
-0x4770 = 0x4E18
-0x4771 = 0x90B1
-0x4772 = 0x7403
-0x4773 = 0x6C42
-0x4774 = 0x56DA
-0x4775 = 0x914B
-0x4776 = 0x6CC5
-0x4777 = 0x8D8B
-0x4778 = 0x533A
-0x4779 = 0x86C6
-0x477A = 0x66F2
-0x477B = 0x8EAF
-0x477C = 0x5C48
-0x477D = 0x9A71
-0x477E = 0x6E20
-0x4821 = 0x53D6
-0x4822 = 0x5A36
-0x4823 = 0x9F8B
-0x4824 = 0x8DA3
-0x4825 = 0x53BB
-0x4826 = 0x5708
-0x4827 = 0x98A7
-0x4828 = 0x6743
-0x4829 = 0x919B
-0x482A = 0x6CC9
-0x482B = 0x5168
-0x482C = 0x75CA
-0x482D = 0x62F3
-0x482E = 0x72AC
-0x482F = 0x5238
-0x4830 = 0x529D
-0x4831 = 0x7F3A
-0x4832 = 0x7094
-0x4833 = 0x7638
-0x4834 = 0x5374
-0x4835 = 0x9E4A
-0x4836 = 0x69B7
-0x4837 = 0x786E
-0x4838 = 0x96C0
-0x4839 = 0x88D9
-0x483A = 0x7FA4
-0x483B = 0x7136
-0x483C = 0x71C3
-0x483D = 0x5189
-0x483E = 0x67D3
-0x483F = 0x74E4
-0x4840 = 0x58E4
-0x4841 = 0x6518
-0x4842 = 0x56B7
-0x4843 = 0x8BA9
-0x4844 = 0x9976
-0x4845 = 0x6270
-0x4846 = 0x7ED5
-0x4847 = 0x60F9
-0x4848 = 0x70ED
-0x4849 = 0x58EC
-0x484A = 0x4EC1
-0x484B = 0x4EBA
-0x484C = 0x5FCD
-0x484D = 0x97E7
-0x484E = 0x4EFB
-0x484F = 0x8BA4
-0x4850 = 0x5203
-0x4851 = 0x598A
-0x4852 = 0x7EAB
-0x4853 = 0x6254
-0x4854 = 0x4ECD
-0x4855 = 0x65E5
-0x4856 = 0x620E
-0x4857 = 0x8338
-0x4858 = 0x84C9
-0x4859 = 0x8363
-0x485A = 0x878D
-0x485B = 0x7194
-0x485C = 0x6EB6
-0x485D = 0x5BB9
-0x485E = 0x7ED2
-0x485F = 0x5197
-0x4860 = 0x63C9
-0x4861 = 0x67D4
-0x4862 = 0x8089
-0x4863 = 0x8339
-0x4864 = 0x8815
-0x4865 = 0x5112
-0x4866 = 0x5B7A
-0x4867 = 0x5982
-0x4868 = 0x8FB1
-0x4869 = 0x4E73
-0x486A = 0x6C5D
-0x486B = 0x5165
-0x486C = 0x8925
-0x486D = 0x8F6F
-0x486E = 0x962E
-0x486F = 0x854A
-0x4870 = 0x745E
-0x4871 = 0x9510
-0x4872 = 0x95F0
-0x4873 = 0x6DA6
-0x4874 = 0x82E5
-0x4875 = 0x5F31
-0x4876 = 0x6492
-0x4877 = 0x6D12
-0x4878 = 0x8428
-0x4879 = 0x816E
-0x487A = 0x9CC3
-0x487B = 0x585E
-0x487C = 0x8D5B
-0x487D = 0x4E09
-0x487E = 0x53C1
-0x4921 = 0x4F1E
-0x4922 = 0x6563
-0x4923 = 0x6851
-0x4924 = 0x55D3
-0x4925 = 0x4E27
-0x4926 = 0x6414
-0x4927 = 0x9A9A
-0x4928 = 0x626B
-0x4929 = 0x5AC2
-0x492A = 0x745F
-0x492B = 0x8272
-0x492C = 0x6DA9
-0x492D = 0x68EE
-0x492E = 0x50E7
-0x492F = 0x838E
-0x4930 = 0x7802
-0x4931 = 0x6740
-0x4932 = 0x5239
-0x4933 = 0x6C99
-0x4934 = 0x7EB1
-0x4935 = 0x50BB
-0x4936 = 0x5565
-0x4937 = 0x715E
-0x4938 = 0x7B5B
-0x4939 = 0x6652
-0x493A = 0x73CA
-0x493B = 0x82EB
-0x493C = 0x6749
-0x493D = 0x5C71
-0x493E = 0x5220
-0x493F = 0x717D
-0x4940 = 0x886B
-0x4941 = 0x95EA
-0x4942 = 0x9655
-0x4943 = 0x64C5
-0x4944 = 0x8D61
-0x4945 = 0x81B3
-0x4946 = 0x5584
-0x4947 = 0x6C55
-0x4948 = 0x6247
-0x4949 = 0x7F2E
-0x494A = 0x5892
-0x494B = 0x4F24
-0x494C = 0x5546
-0x494D = 0x8D4F
-0x494E = 0x664C
-0x494F = 0x4E0A
-0x4950 = 0x5C1A
-0x4951 = 0x88F3
-0x4952 = 0x68A2
-0x4953 = 0x634E
-0x4954 = 0x7A0D
-0x4955 = 0x70E7
-0x4956 = 0x828D
-0x4957 = 0x52FA
-0x4958 = 0x97F6
-0x4959 = 0x5C11
-0x495A = 0x54E8
-0x495B = 0x90B5
-0x495C = 0x7ECD
-0x495D = 0x5962
-0x495E = 0x8D4A
-0x495F = 0x86C7
-0x4960 = 0x820C
-0x4961 = 0x820D
-0x4962 = 0x8D66
-0x4963 = 0x6444
-0x4964 = 0x5C04
-0x4965 = 0x6151
-0x4966 = 0x6D89
-0x4967 = 0x793E
-0x4968 = 0x8BBE
-0x4969 = 0x7837
-0x496A = 0x7533
-0x496B = 0x547B
-0x496C = 0x4F38
-0x496D = 0x8EAB
-0x496E = 0x6DF1
-0x496F = 0x5A20
-0x4970 = 0x7EC5
-0x4971 = 0x795E
-0x4972 = 0x6C88
-0x4973 = 0x5BA1
-0x4974 = 0x5A76
-0x4975 = 0x751A
-0x4976 = 0x80BE
-0x4977 = 0x614E
-0x4978 = 0x6E17
-0x4979 = 0x58F0
-0x497A = 0x751F
-0x497B = 0x7525
-0x497C = 0x7272
-0x497D = 0x5347
-0x497E = 0x7EF3
-0x4A21 = 0x7701
-0x4A22 = 0x76DB
-0x4A23 = 0x5269
-0x4A24 = 0x80DC
-0x4A25 = 0x5723
-0x4A26 = 0x5E08
-0x4A27 = 0x5931
-0x4A28 = 0x72EE
-0x4A29 = 0x65BD
-0x4A2A = 0x6E7F
-0x4A2B = 0x8BD7
-0x4A2C = 0x5C38
-0x4A2D = 0x8671
-0x4A2E = 0x5341
-0x4A2F = 0x77F3
-0x4A30 = 0x62FE
-0x4A31 = 0x65F6
-0x4A32 = 0x4EC0
-0x4A33 = 0x98DF
-0x4A34 = 0x8680
-0x4A35 = 0x5B9E
-0x4A36 = 0x8BC6
-0x4A37 = 0x53F2
-0x4A38 = 0x77E2
-0x4A39 = 0x4F7F
-0x4A3A = 0x5C4E
-0x4A3B = 0x9A76
-0x4A3C = 0x59CB
-0x4A3D = 0x5F0F
-0x4A3E = 0x793A
-0x4A3F = 0x58EB
-0x4A40 = 0x4E16
-0x4A41 = 0x67FF
-0x4A42 = 0x4E8B
-0x4A43 = 0x62ED
-0x4A44 = 0x8A93
-0x4A45 = 0x901D
-0x4A46 = 0x52BF
-0x4A47 = 0x662F
-0x4A48 = 0x55DC
-0x4A49 = 0x566C
-0x4A4A = 0x9002
-0x4A4B = 0x4ED5
-0x4A4C = 0x4F8D
-0x4A4D = 0x91CA
-0x4A4E = 0x9970
-0x4A4F = 0x6C0F
-0x4A50 = 0x5E02
-0x4A51 = 0x6043
-0x4A52 = 0x5BA4
-0x4A53 = 0x89C6
-0x4A54 = 0x8BD5
-0x4A55 = 0x6536
-0x4A56 = 0x624B
-0x4A57 = 0x9996
-0x4A58 = 0x5B88
-0x4A59 = 0x5BFF
-0x4A5A = 0x6388
-0x4A5B = 0x552E
-0x4A5C = 0x53D7
-0x4A5D = 0x7626
-0x4A5E = 0x517D
-0x4A5F = 0x852C
-0x4A60 = 0x67A2
-0x4A61 = 0x68B3
-0x4A62 = 0x6B8A
-0x4A63 = 0x6292
-0x4A64 = 0x8F93
-0x4A65 = 0x53D4
-0x4A66 = 0x8212
-0x4A67 = 0x6DD1
-0x4A68 = 0x758F
-0x4A69 = 0x4E66
-0x4A6A = 0x8D4E
-0x4A6B = 0x5B70
-0x4A6C = 0x719F
-0x4A6D = 0x85AF
-0x4A6E = 0x6691
-0x4A6F = 0x66D9
-0x4A70 = 0x7F72
-0x4A71 = 0x8700
-0x4A72 = 0x9ECD
-0x4A73 = 0x9F20
-0x4A74 = 0x5C5E
-0x4A75 = 0x672F
-0x4A76 = 0x8FF0
-0x4A77 = 0x6811
-0x4A78 = 0x675F
-0x4A79 = 0x620D
-0x4A7A = 0x7AD6
-0x4A7B = 0x5885
-0x4A7C = 0x5EB6
-0x4A7D = 0x6570
-0x4A7E = 0x6F31
-0x4B21 = 0x6055
-0x4B22 = 0x5237
-0x4B23 = 0x800D
-0x4B24 = 0x6454
-0x4B25 = 0x8870
-0x4B26 = 0x7529
-0x4B27 = 0x5E05
-0x4B28 = 0x6813
-0x4B29 = 0x62F4
-0x4B2A = 0x971C
-0x4B2B = 0x53CC
-0x4B2C = 0x723D
-0x4B2D = 0x8C01
-0x4B2E = 0x6C34
-0x4B2F = 0x7761
-0x4B30 = 0x7A0E
-0x4B31 = 0x542E
-0x4B32 = 0x77AC
-0x4B33 = 0x987A
-0x4B34 = 0x821C
-0x4B35 = 0x8BF4
-0x4B36 = 0x7855
-0x4B37 = 0x6714
-0x4B38 = 0x70C1
-0x4B39 = 0x65AF
-0x4B3A = 0x6495
-0x4B3B = 0x5636
-0x4B3C = 0x601D
-0x4B3D = 0x79C1
-0x4B3E = 0x53F8
-0x4B3F = 0x4E1D
-0x4B40 = 0x6B7B
-0x4B41 = 0x8086
-0x4B42 = 0x5BFA
-0x4B43 = 0x55E3
-0x4B44 = 0x56DB
-0x4B45 = 0x4F3A
-0x4B46 = 0x4F3C
-0x4B47 = 0x9972
-0x4B48 = 0x5DF3
-0x4B49 = 0x677E
-0x4B4A = 0x8038
-0x4B4B = 0x6002
-0x4B4C = 0x9882
-0x4B4D = 0x9001
-0x4B4E = 0x5B8B
-0x4B4F = 0x8BBC
-0x4B50 = 0x8BF5
-0x4B51 = 0x641C
-0x4B52 = 0x8258
-0x4B53 = 0x64DE
-0x4B54 = 0x55FD
-0x4B55 = 0x82CF
-0x4B56 = 0x9165
-0x4B57 = 0x4FD7
-0x4B58 = 0x7D20
-0x4B59 = 0x901F
-0x4B5A = 0x7C9F
-0x4B5B = 0x50F3
-0x4B5C = 0x5851
-0x4B5D = 0x6EAF
-0x4B5E = 0x5BBF
-0x4B5F = 0x8BC9
-0x4B60 = 0x8083
-0x4B61 = 0x9178
-0x4B62 = 0x849C
-0x4B63 = 0x7B97
-0x4B64 = 0x867D
-0x4B65 = 0x968B
-0x4B66 = 0x968F
-0x4B67 = 0x7EE5
-0x4B68 = 0x9AD3
-0x4B69 = 0x788E
-0x4B6A = 0x5C81
-0x4B6B = 0x7A57
-0x4B6C = 0x9042
-0x4B6D = 0x96A7
-0x4B6E = 0x795F
-0x4B6F = 0x5B59
-0x4B70 = 0x635F
-0x4B71 = 0x7B0B
-0x4B72 = 0x84D1
-0x4B73 = 0x68AD
-0x4B74 = 0x5506
-0x4B75 = 0x7F29
-0x4B76 = 0x7410
-0x4B77 = 0x7D22
-0x4B78 = 0x9501
-0x4B79 = 0x6240
-0x4B7A = 0x584C
-0x4B7B = 0x4ED6
-0x4B7C = 0x5B83
-0x4B7D = 0x5979
-0x4B7E = 0x5854
-0x4C21 = 0x736D
-0x4C22 = 0x631E
-0x4C23 = 0x8E4B
-0x4C24 = 0x8E0F
-0x4C25 = 0x80CE
-0x4C26 = 0x82D4
-0x4C27 = 0x62AC
-0x4C28 = 0x53F0
-0x4C29 = 0x6CF0
-0x4C2A = 0x915E
-0x4C2B = 0x592A
-0x4C2C = 0x6001
-0x4C2D = 0x6C70
-0x4C2E = 0x574D
-0x4C2F = 0x644A
-0x4C30 = 0x8D2A
-0x4C31 = 0x762B
-0x4C32 = 0x6EE9
-0x4C33 = 0x575B
-0x4C34 = 0x6A80
-0x4C35 = 0x75F0
-0x4C36 = 0x6F6D
-0x4C37 = 0x8C2D
-0x4C38 = 0x8C08
-0x4C39 = 0x5766
-0x4C3A = 0x6BEF
-0x4C3B = 0x8892
-0x4C3C = 0x78B3
-0x4C3D = 0x63A2
-0x4C3E = 0x53F9
-0x4C3F = 0x70AD
-0x4C40 = 0x6C64
-0x4C41 = 0x5858
-0x4C42 = 0x642A
-0x4C43 = 0x5802
-0x4C44 = 0x68E0
-0x4C45 = 0x819B
-0x4C46 = 0x5510
-0x4C47 = 0x7CD6
-0x4C48 = 0x5018
-0x4C49 = 0x8EBA
-0x4C4A = 0x6DCC
-0x4C4B = 0x8D9F
-0x4C4C = 0x70EB
-0x4C4D = 0x638F
-0x4C4E = 0x6D9B
-0x4C4F = 0x6ED4
-0x4C50 = 0x7EE6
-0x4C51 = 0x8404
-0x4C52 = 0x6843
-0x4C53 = 0x9003
-0x4C54 = 0x6DD8
-0x4C55 = 0x9676
-0x4C56 = 0x8BA8
-0x4C57 = 0x5957
-0x4C58 = 0x7279
-0x4C59 = 0x85E4
-0x4C5A = 0x817E
-0x4C5B = 0x75BC
-0x4C5C = 0x8A8A
-0x4C5D = 0x68AF
-0x4C5E = 0x5254
-0x4C5F = 0x8E22
-0x4C60 = 0x9511
-0x4C61 = 0x63D0
-0x4C62 = 0x9898
-0x4C63 = 0x8E44
-0x4C64 = 0x557C
-0x4C65 = 0x4F53
-0x4C66 = 0x66FF
-0x4C67 = 0x568F
-0x4C68 = 0x60D5
-0x4C69 = 0x6D95
-0x4C6A = 0x5243
-0x4C6B = 0x5C49
-0x4C6C = 0x5929
-0x4C6D = 0x6DFB
-0x4C6E = 0x586B
-0x4C6F = 0x7530
-0x4C70 = 0x751C
-0x4C71 = 0x606C
-0x4C72 = 0x8214
-0x4C73 = 0x8146
-0x4C74 = 0x6311
-0x4C75 = 0x6761
-0x4C76 = 0x8FE2
-0x4C77 = 0x773A
-0x4C78 = 0x8DF3
-0x4C79 = 0x8D34
-0x4C7A = 0x94C1
-0x4C7B = 0x5E16
-0x4C7C = 0x5385
-0x4C7D = 0x542C
-0x4C7E = 0x70C3
-0x4D21 = 0x6C40
-0x4D22 = 0x5EF7
-0x4D23 = 0x505C
-0x4D24 = 0x4EAD
-0x4D25 = 0x5EAD
-0x4D26 = 0x633A
-0x4D27 = 0x8247
-0x4D28 = 0x901A
-0x4D29 = 0x6850
-0x4D2A = 0x916E
-0x4D2B = 0x77B3
-0x4D2C = 0x540C
-0x4D2D = 0x94DC
-0x4D2E = 0x5F64
-0x4D2F = 0x7AE5
-0x4D30 = 0x6876
-0x4D31 = 0x6345
-0x4D32 = 0x7B52
-0x4D33 = 0x7EDF
-0x4D34 = 0x75DB
-0x4D35 = 0x5077
-0x4D36 = 0x6295
-0x4D37 = 0x5934
-0x4D38 = 0x900F
-0x4D39 = 0x51F8
-0x4D3A = 0x79C3
-0x4D3B = 0x7A81
-0x4D3C = 0x56FE
-0x4D3D = 0x5F92
-0x4D3E = 0x9014
-0x4D3F = 0x6D82
-0x4D40 = 0x5C60
-0x4D41 = 0x571F
-0x4D42 = 0x5410
-0x4D43 = 0x5154
-0x4D44 = 0x6E4D
-0x4D45 = 0x56E2
-0x4D46 = 0x63A8
-0x4D47 = 0x9893
-0x4D48 = 0x817F
-0x4D49 = 0x8715
-0x4D4A = 0x892A
-0x4D4B = 0x9000
-0x4D4C = 0x541E
-0x4D4D = 0x5C6F
-0x4D4E = 0x81C0
-0x4D4F = 0x62D6
-0x4D50 = 0x6258
-0x4D51 = 0x8131
-0x4D52 = 0x9E35
-0x4D53 = 0x9640
-0x4D54 = 0x9A6E
-0x4D55 = 0x9A7C
-0x4D56 = 0x692D
-0x4D57 = 0x59A5
-0x4D58 = 0x62D3
-0x4D59 = 0x553E
-0x4D5A = 0x6316
-0x4D5B = 0x54C7
-0x4D5C = 0x86D9
-0x4D5D = 0x6D3C
-0x4D5E = 0x5A03
-0x4D5F = 0x74E6
-0x4D60 = 0x889C
-0x4D61 = 0x6B6A
-0x4D62 = 0x5916
-0x4D63 = 0x8C4C
-0x4D64 = 0x5F2F
-0x4D65 = 0x6E7E
-0x4D66 = 0x73A9
-0x4D67 = 0x987D
-0x4D68 = 0x4E38
-0x4D69 = 0x70F7
-0x4D6A = 0x5B8C
-0x4D6B = 0x7897
-0x4D6C = 0x633D
-0x4D6D = 0x665A
-0x4D6E = 0x7696
-0x4D6F = 0x60CB
-0x4D70 = 0x5B9B
-0x4D71 = 0x5A49
-0x4D72 = 0x4E07
-0x4D73 = 0x8155
-0x4D74 = 0x6C6A
-0x4D75 = 0x738B
-0x4D76 = 0x4EA1
-0x4D77 = 0x6789
-0x4D78 = 0x7F51
-0x4D79 = 0x5F80
-0x4D7A = 0x65FA
-0x4D7B = 0x671B
-0x4D7C = 0x5FD8
-0x4D7D = 0x5984
-0x4D7E = 0x5A01
-0x4E21 = 0x5DCD
-0x4E22 = 0x5FAE
-0x4E23 = 0x5371
-0x4E24 = 0x97E6
-0x4E25 = 0x8FDD
-0x4E26 = 0x6845
-0x4E27 = 0x56F4
-0x4E28 = 0x552F
-0x4E29 = 0x60DF
-0x4E2A = 0x4E3A
-0x4E2B = 0x6F4D
-0x4E2C = 0x7EF4
-0x4E2D = 0x82C7
-0x4E2E = 0x840E
-0x4E2F = 0x59D4
-0x4E30 = 0x4F1F
-0x4E31 = 0x4F2A
-0x4E32 = 0x5C3E
-0x4E33 = 0x7EAC
-0x4E34 = 0x672A
-0x4E35 = 0x851A
-0x4E36 = 0x5473
-0x4E37 = 0x754F
-0x4E38 = 0x80C3
-0x4E39 = 0x5582
-0x4E3A = 0x9B4F
-0x4E3B = 0x4F4D
-0x4E3C = 0x6E2D
-0x4E3D = 0x8C13
-0x4E3E = 0x5C09
-0x4E3F = 0x6170
-0x4E40 = 0x536B
-0x4E41 = 0x761F
-0x4E42 = 0x6E29
-0x4E43 = 0x868A
-0x4E44 = 0x6587
-0x4E45 = 0x95FB
-0x4E46 = 0x7EB9
-0x4E47 = 0x543B
-0x4E48 = 0x7A33
-0x4E49 = 0x7D0A
-0x4E4A = 0x95EE
-0x4E4B = 0x55E1
-0x4E4C = 0x7FC1
-0x4E4D = 0x74EE
-0x4E4E = 0x631D
-0x4E4F = 0x8717
-0x4E50 = 0x6DA1
-0x4E51 = 0x7A9D
-0x4E52 = 0x6211
-0x4E53 = 0x65A1
-0x4E54 = 0x5367
-0x4E55 = 0x63E1
-0x4E56 = 0x6C83
-0x4E57 = 0x5DEB
-0x4E58 = 0x545C
-0x4E59 = 0x94A8
-0x4E5A = 0x4E4C
-0x4E5B = 0x6C61
-0x4E5C = 0x8BEC
-0x4E5D = 0x5C4B
-0x4E5E = 0x65E0
-0x4E5F = 0x829C
-0x4E60 = 0x68A7
-0x4E61 = 0x543E
-0x4E62 = 0x5434
-0x4E63 = 0x6BCB
-0x4E64 = 0x6B66
-0x4E65 = 0x4E94
-0x4E66 = 0x6342
-0x4E67 = 0x5348
-0x4E68 = 0x821E
-0x4E69 = 0x4F0D
-0x4E6A = 0x4FAE
-0x4E6B = 0x575E
-0x4E6C = 0x620A
-0x4E6D = 0x96FE
-0x4E6E = 0x6664
-0x4E6F = 0x7269
-0x4E70 = 0x52FF
-0x4E71 = 0x52A1
-0x4E72 = 0x609F
-0x4E73 = 0x8BEF
-0x4E74 = 0x6614
-0x4E75 = 0x7199
-0x4E76 = 0x6790
-0x4E77 = 0x897F
-0x4E78 = 0x7852
-0x4E79 = 0x77FD
-0x4E7A = 0x6670
-0x4E7B = 0x563B
-0x4E7C = 0x5438
-0x4E7D = 0x9521
-0x4E7E = 0x727A
-0x4F21 = 0x7A00
-0x4F22 = 0x606F
-0x4F23 = 0x5E0C
-0x4F24 = 0x6089
-0x4F25 = 0x819D
-0x4F26 = 0x5915
-0x4F27 = 0x60DC
-0x4F28 = 0x7184
-0x4F29 = 0x70EF
-0x4F2A = 0x6EAA
-0x4F2B = 0x6C50
-0x4F2C = 0x7280
-0x4F2D = 0x6A84
-0x4F2E = 0x88AD
-0x4F2F = 0x5E2D
-0x4F30 = 0x4E60
-0x4F31 = 0x5AB3
-0x4F32 = 0x559C
-0x4F33 = 0x94E3
-0x4F34 = 0x6D17
-0x4F35 = 0x7CFB
-0x4F36 = 0x9699
-0x4F37 = 0x620F
-0x4F38 = 0x7EC6
-0x4F39 = 0x778E
-0x4F3A = 0x867E
-0x4F3B = 0x5323
-0x4F3C = 0x971E
-0x4F3D = 0x8F96
-0x4F3E = 0x6687
-0x4F3F = 0x5CE1
-0x4F40 = 0x4FA0
-0x4F41 = 0x72ED
-0x4F42 = 0x4E0B
-0x4F43 = 0x53A6
-0x4F44 = 0x590F
-0x4F45 = 0x5413
-0x4F46 = 0x6380
-0x4F47 = 0x9528
-0x4F48 = 0x5148
-0x4F49 = 0x4ED9
-0x4F4A = 0x9C9C
-0x4F4B = 0x7EA4
-0x4F4C = 0x54B8
-0x4F4D = 0x8D24
-0x4F4E = 0x8854
-0x4F4F = 0x8237
-0x4F50 = 0x95F2
-0x4F51 = 0x6D8E
-0x4F52 = 0x5F26
-0x4F53 = 0x5ACC
-0x4F54 = 0x663E
-0x4F55 = 0x9669
-0x4F56 = 0x73B0
-0x4F57 = 0x732E
-0x4F58 = 0x53BF
-0x4F59 = 0x817A
-0x4F5A = 0x9985
-0x4F5B = 0x7FA1
-0x4F5C = 0x5BAA
-0x4F5D = 0x9677
-0x4F5E = 0x9650
-0x4F5F = 0x7EBF
-0x4F60 = 0x76F8
-0x4F61 = 0x53A2
-0x4F62 = 0x9576
-0x4F63 = 0x9999
-0x4F64 = 0x7BB1
-0x4F65 = 0x8944
-0x4F66 = 0x6E58
-0x4F67 = 0x4E61
-0x4F68 = 0x7FD4
-0x4F69 = 0x7965
-0x4F6A = 0x8BE6
-0x4F6B = 0x60F3
-0x4F6C = 0x54CD
-0x4F6D = 0x4EAB
-0x4F6E = 0x9879
-0x4F6F = 0x5DF7
-0x4F70 = 0x6A61
-0x4F71 = 0x50CF
-0x4F72 = 0x5411
-0x4F73 = 0x8C61
-0x4F74 = 0x8427
-0x4F75 = 0x785D
-0x4F76 = 0x9704
-0x4F77 = 0x524A
-0x4F78 = 0x54EE
-0x4F79 = 0x56A3
-0x4F7A = 0x9500
-0x4F7B = 0x6D88
-0x4F7C = 0x5BB5
-0x4F7D = 0x6DC6
-0x4F7E = 0x6653
-0x5021 = 0x5C0F
-0x5022 = 0x5B5D
-0x5023 = 0x6821
-0x5024 = 0x8096
-0x5025 = 0x5578
-0x5026 = 0x7B11
-0x5027 = 0x6548
-0x5028 = 0x6954
-0x5029 = 0x4E9B
-0x502A = 0x6B47
-0x502B = 0x874E
-0x502C = 0x978B
-0x502D = 0x534F
-0x502E = 0x631F
-0x502F = 0x643A
-0x5030 = 0x90AA
-0x5031 = 0x659C
-0x5032 = 0x80C1
-0x5033 = 0x8C10
-0x5034 = 0x5199
-0x5035 = 0x68B0
-0x5036 = 0x5378
-0x5037 = 0x87F9
-0x5038 = 0x61C8
-0x5039 = 0x6CC4
-0x503A = 0x6CFB
-0x503B = 0x8C22
-0x503C = 0x5C51
-0x503D = 0x85AA
-0x503E = 0x82AF
-0x503F = 0x950C
-0x5040 = 0x6B23
-0x5041 = 0x8F9B
-0x5042 = 0x65B0
-0x5043 = 0x5FFB
-0x5044 = 0x5FC3
-0x5045 = 0x4FE1
-0x5046 = 0x8845
-0x5047 = 0x661F
-0x5048 = 0x8165
-0x5049 = 0x7329
-0x504A = 0x60FA
-0x504B = 0x5174
-0x504C = 0x5211
-0x504D = 0x578B
-0x504E = 0x5F62
-0x504F = 0x90A2
-0x5050 = 0x884C
-0x5051 = 0x9192
-0x5052 = 0x5E78
-0x5053 = 0x674F
-0x5054 = 0x6027
-0x5055 = 0x59D3
-0x5056 = 0x5144
-0x5057 = 0x51F6
-0x5058 = 0x80F8
-0x5059 = 0x5308
-0x505A = 0x6C79
-0x505B = 0x96C4
-0x505C = 0x718A
-0x505D = 0x4F11
-0x505E = 0x4FEE
-0x505F = 0x7F9E
-0x5060 = 0x673D
-0x5061 = 0x55C5
-0x5062 = 0x9508
-0x5063 = 0x79C0
-0x5064 = 0x8896
-0x5065 = 0x7EE3
-0x5066 = 0x589F
-0x5067 = 0x620C
-0x5068 = 0x9700
-0x5069 = 0x865A
-0x506A = 0x5618
-0x506B = 0x987B
-0x506C = 0x5F90
-0x506D = 0x8BB8
-0x506E = 0x84C4
-0x506F = 0x9157
-0x5070 = 0x53D9
-0x5071 = 0x65ED
-0x5072 = 0x5E8F
-0x5073 = 0x755C
-0x5074 = 0x6064
-0x5075 = 0x7D6E
-0x5076 = 0x5A7F
-0x5077 = 0x7EEA
-0x5078 = 0x7EED
-0x5079 = 0x8F69
-0x507A = 0x55A7
-0x507B = 0x5BA3
-0x507C = 0x60AC
-0x507D = 0x65CB
-0x507E = 0x7384
-0x5121 = 0x9009
-0x5122 = 0x7663
-0x5123 = 0x7729
-0x5124 = 0x7EDA
-0x5125 = 0x9774
-0x5126 = 0x859B
-0x5127 = 0x5B66
-0x5128 = 0x7A74
-0x5129 = 0x96EA
-0x512A = 0x8840
-0x512B = 0x52CB
-0x512C = 0x718F
-0x512D = 0x5FAA
-0x512E = 0x65EC
-0x512F = 0x8BE2
-0x5130 = 0x5BFB
-0x5131 = 0x9A6F
-0x5132 = 0x5DE1
-0x5133 = 0x6B89
-0x5134 = 0x6C5B
-0x5135 = 0x8BAD
-0x5136 = 0x8BAF
-0x5137 = 0x900A
-0x5138 = 0x8FC5
-0x5139 = 0x538B
-0x513A = 0x62BC
-0x513B = 0x9E26
-0x513C = 0x9E2D
-0x513D = 0x5440
-0x513E = 0x4E2B
-0x513F = 0x82BD
-0x5140 = 0x7259
-0x5141 = 0x869C
-0x5142 = 0x5D16
-0x5143 = 0x8859
-0x5144 = 0x6DAF
-0x5145 = 0x96C5
-0x5146 = 0x54D1
-0x5147 = 0x4E9A
-0x5148 = 0x8BB6
-0x5149 = 0x7109
-0x514A = 0x54BD
-0x514B = 0x9609
-0x514C = 0x70DF
-0x514D = 0x6DF9
-0x514E = 0x76D0
-0x514F = 0x4E25
-0x5150 = 0x7814
-0x5151 = 0x8712
-0x5152 = 0x5CA9
-0x5153 = 0x5EF6
-0x5154 = 0x8A00
-0x5155 = 0x989C
-0x5156 = 0x960E
-0x5157 = 0x708E
-0x5158 = 0x6CBF
-0x5159 = 0x5944
-0x515A = 0x63A9
-0x515B = 0x773C
-0x515C = 0x884D
-0x515D = 0x6F14
-0x515E = 0x8273
-0x515F = 0x5830
-0x5160 = 0x71D5
-0x5161 = 0x538C
-0x5162 = 0x781A
-0x5163 = 0x96C1
-0x5164 = 0x5501
-0x5165 = 0x5F66
-0x5166 = 0x7130
-0x5167 = 0x5BB4
-0x5168 = 0x8C1A
-0x5169 = 0x9A8C
-0x516A = 0x6B83
-0x516B = 0x592E
-0x516C = 0x9E2F
-0x516D = 0x79E7
-0x516E = 0x6768
-0x516F = 0x626C
-0x5170 = 0x4F6F
-0x5171 = 0x75A1
-0x5172 = 0x7F8A
-0x5173 = 0x6D0B
-0x5174 = 0x9633
-0x5175 = 0x6C27
-0x5176 = 0x4EF0
-0x5177 = 0x75D2
-0x5178 = 0x517B
-0x5179 = 0x6837
-0x517A = 0x6F3E
-0x517B = 0x9080
-0x517C = 0x8170
-0x517D = 0x5996
-0x517E = 0x7476
-0x5221 = 0x6447
-0x5222 = 0x5C27
-0x5223 = 0x9065
-0x5224 = 0x7A91
-0x5225 = 0x8C23
-0x5226 = 0x59DA
-0x5227 = 0x54AC
-0x5228 = 0x8200
-0x5229 = 0x836F
-0x522A = 0x8981
-0x522B = 0x8000
-0x522C = 0x6930
-0x522D = 0x564E
-0x522E = 0x8036
-0x522F = 0x7237
-0x5230 = 0x91CE
-0x5231 = 0x51B6
-0x5232 = 0x4E5F
-0x5233 = 0x9875
-0x5234 = 0x6396
-0x5235 = 0x4E1A
-0x5236 = 0x53F6
-0x5237 = 0x66F3
-0x5238 = 0x814B
-0x5239 = 0x591C
-0x523A = 0x6DB2
-0x523B = 0x4E00
-0x523C = 0x58F9
-0x523D = 0x533B
-0x523E = 0x63D6
-0x523F = 0x94F1
-0x5240 = 0x4F9D
-0x5241 = 0x4F0A
-0x5242 = 0x8863
-0x5243 = 0x9890
-0x5244 = 0x5937
-0x5245 = 0x9057
-0x5246 = 0x79FB
-0x5247 = 0x4EEA
-0x5248 = 0x80F0
-0x5249 = 0x7591
-0x524A = 0x6C82
-0x524B = 0x5B9C
-0x524C = 0x59E8
-0x524D = 0x5F5D
-0x524E = 0x6905
-0x524F = 0x8681
-0x5250 = 0x501A
-0x5251 = 0x5DF2
-0x5252 = 0x4E59
-0x5253 = 0x77E3
-0x5254 = 0x4EE5
-0x5255 = 0x827A
-0x5256 = 0x6291
-0x5257 = 0x6613
-0x5258 = 0x9091
-0x5259 = 0x5C79
-0x525A = 0x4EBF
-0x525B = 0x5F79
-0x525C = 0x81C6
-0x525D = 0x9038
-0x525E = 0x8084
-0x525F = 0x75AB
-0x5260 = 0x4EA6
-0x5261 = 0x88D4
-0x5262 = 0x610F
-0x5263 = 0x6BC5
-0x5264 = 0x5FC6
-0x5265 = 0x4E49
-0x5266 = 0x76CA
-0x5267 = 0x6EA2
-0x5268 = 0x8BE3
-0x5269 = 0x8BAE
-0x526A = 0x8C0A
-0x526B = 0x8BD1
-0x526C = 0x5F02
-0x526D = 0x7FFC
-0x526E = 0x7FCC
-0x526F = 0x7ECE
-0x5270 = 0x8335
-0x5271 = 0x836B
-0x5272 = 0x56E0
-0x5273 = 0x6BB7
-0x5274 = 0x97F3
-0x5275 = 0x9634
-0x5276 = 0x59FB
-0x5277 = 0x541F
-0x5278 = 0x94F6
-0x5279 = 0x6DEB
-0x527A = 0x5BC5
-0x527B = 0x996E
-0x527C = 0x5C39
-0x527D = 0x5F15
-0x527E = 0x9690
-0x5321 = 0x5370
-0x5322 = 0x82F1
-0x5323 = 0x6A31
-0x5324 = 0x5A74
-0x5325 = 0x9E70
-0x5326 = 0x5E94
-0x5327 = 0x7F28
-0x5328 = 0x83B9
-0x5329 = 0x8424
-0x532A = 0x8425
-0x532B = 0x8367
-0x532C = 0x8747
-0x532D = 0x8FCE
-0x532E = 0x8D62
-0x532F = 0x76C8
-0x5330 = 0x5F71
-0x5331 = 0x9896
-0x5332 = 0x786C
-0x5333 = 0x6620
-0x5334 = 0x54DF
-0x5335 = 0x62E5
-0x5336 = 0x4F63
-0x5337 = 0x81C3
-0x5338 = 0x75C8
-0x5339 = 0x5EB8
-0x533A = 0x96CD
-0x533B = 0x8E0A
-0x533C = 0x86F9
-0x533D = 0x548F
-0x533E = 0x6CF3
-0x533F = 0x6D8C
-0x5340 = 0x6C38
-0x5341 = 0x607F
-0x5342 = 0x52C7
-0x5343 = 0x7528
-0x5344 = 0x5E7D
-0x5345 = 0x4F18
-0x5346 = 0x60A0
-0x5347 = 0x5FE7
-0x5348 = 0x5C24
-0x5349 = 0x7531
-0x534A = 0x90AE
-0x534B = 0x94C0
-0x534C = 0x72B9
-0x534D = 0x6CB9
-0x534E = 0x6E38
-0x534F = 0x9149
-0x5350 = 0x6709
-0x5351 = 0x53CB
-0x5352 = 0x53F3
-0x5353 = 0x4F51
-0x5354 = 0x91C9
-0x5355 = 0x8BF1
-0x5356 = 0x53C8
-0x5357 = 0x5E7C
-0x5358 = 0x8FC2
-0x5359 = 0x6DE4
-0x535A = 0x4E8E
-0x535B = 0x76C2
-0x535C = 0x6986
-0x535D = 0x865E
-0x535E = 0x611A
-0x535F = 0x8206
-0x5360 = 0x4F59
-0x5361 = 0x4FDE
-0x5362 = 0x903E
-0x5363 = 0x9C7C
-0x5364 = 0x6109
-0x5365 = 0x6E1D
-0x5366 = 0x6E14
-0x5367 = 0x9685
-0x5368 = 0x4E88
-0x5369 = 0x5A31
-0x536A = 0x96E8
-0x536B = 0x4E0E
-0x536C = 0x5C7F
-0x536D = 0x79B9
-0x536E = 0x5B87
-0x536F = 0x8BED
-0x5370 = 0x7FBD
-0x5371 = 0x7389
-0x5372 = 0x57DF
-0x5373 = 0x828B
-0x5374 = 0x90C1
-0x5375 = 0x5401
-0x5376 = 0x9047
-0x5377 = 0x55BB
-0x5378 = 0x5CEA
-0x5379 = 0x5FA1
-0x537A = 0x6108
-0x537B = 0x6B32
-0x537C = 0x72F1
-0x537D = 0x80B2
-0x537E = 0x8A89
-0x5421 = 0x6D74
-0x5422 = 0x5BD3
-0x5423 = 0x88D5
-0x5424 = 0x9884
-0x5425 = 0x8C6B
-0x5426 = 0x9A6D
-0x5427 = 0x9E33
-0x5428 = 0x6E0A
-0x5429 = 0x51A4
-0x542A = 0x5143
-0x542B = 0x57A3
-0x542C = 0x8881
-0x542D = 0x539F
-0x542E = 0x63F4
-0x542F = 0x8F95
-0x5430 = 0x56ED
-0x5431 = 0x5458
-0x5432 = 0x5706
-0x5433 = 0x733F
-0x5434 = 0x6E90
-0x5435 = 0x7F18
-0x5436 = 0x8FDC
-0x5437 = 0x82D1
-0x5438 = 0x613F
-0x5439 = 0x6028
-0x543A = 0x9662
-0x543B = 0x66F0
-0x543C = 0x7EA6
-0x543D = 0x8D8A
-0x543E = 0x8DC3
-0x543F = 0x94A5
-0x5440 = 0x5CB3
-0x5441 = 0x7CA4
-0x5442 = 0x6708
-0x5443 = 0x60A6
-0x5444 = 0x9605
-0x5445 = 0x8018
-0x5446 = 0x4E91
-0x5447 = 0x90E7
-0x5448 = 0x5300
-0x5449 = 0x9668
-0x544A = 0x5141
-0x544B = 0x8FD0
-0x544C = 0x8574
-0x544D = 0x915D
-0x544E = 0x6655
-0x544F = 0x97F5
-0x5450 = 0x5B55
-0x5451 = 0x531D
-0x5452 = 0x7838
-0x5453 = 0x6742
-0x5454 = 0x683D
-0x5455 = 0x54C9
-0x5456 = 0x707E
-0x5457 = 0x5BB0
-0x5458 = 0x8F7D
-0x5459 = 0x518D
-0x545A = 0x5728
-0x545B = 0x54B1
-0x545C = 0x6512
-0x545D = 0x6682
-0x545E = 0x8D5E
-0x545F = 0x8D43
-0x5460 = 0x810F
-0x5461 = 0x846C
-0x5462 = 0x906D
-0x5463 = 0x7CDF
-0x5464 = 0x51FF
-0x5465 = 0x85FB
-0x5466 = 0x67A3
-0x5467 = 0x65E9
-0x5468 = 0x6FA1
-0x5469 = 0x86A4
-0x546A = 0x8E81
-0x546B = 0x566A
-0x546C = 0x9020
-0x546D = 0x7682
-0x546E = 0x7076
-0x546F = 0x71E5
-0x5470 = 0x8D23
-0x5471 = 0x62E9
-0x5472 = 0x5219
-0x5473 = 0x6CFD
-0x5474 = 0x8D3C
-0x5475 = 0x600E
-0x5476 = 0x589E
-0x5477 = 0x618E
-0x5478 = 0x66FE
-0x5479 = 0x8D60
-0x547A = 0x624E
-0x547B = 0x55B3
-0x547C = 0x6E23
-0x547D = 0x672D
-0x547E = 0x8F67
-0x5521 = 0x94E1
-0x5522 = 0x95F8
-0x5523 = 0x7728
-0x5524 = 0x6805
-0x5525 = 0x69A8
-0x5526 = 0x548B
-0x5527 = 0x4E4D
-0x5528 = 0x70B8
-0x5529 = 0x8BC8
-0x552A = 0x6458
-0x552B = 0x658B
-0x552C = 0x5B85
-0x552D = 0x7A84
-0x552E = 0x503A
-0x552F = 0x5BE8
-0x5530 = 0x77BB
-0x5531 = 0x6BE1
-0x5532 = 0x8A79
-0x5533 = 0x7C98
-0x5534 = 0x6CBE
-0x5535 = 0x76CF
-0x5536 = 0x65A9
-0x5537 = 0x8F97
-0x5538 = 0x5D2D
-0x5539 = 0x5C55
-0x553A = 0x8638
-0x553B = 0x6808
-0x553C = 0x5360
-0x553D = 0x6218
-0x553E = 0x7AD9
-0x553F = 0x6E5B
-0x5540 = 0x7EFD
-0x5541 = 0x6A1F
-0x5542 = 0x7AE0
-0x5543 = 0x5F70
-0x5544 = 0x6F33
-0x5545 = 0x5F20
-0x5546 = 0x638C
-0x5547 = 0x6DA8
-0x5548 = 0x6756
-0x5549 = 0x4E08
-0x554A = 0x5E10
-0x554B = 0x8D26
-0x554C = 0x4ED7
-0x554D = 0x80C0
-0x554E = 0x7634
-0x554F = 0x969C
-0x5550 = 0x62DB
-0x5551 = 0x662D
-0x5552 = 0x627E
-0x5553 = 0x6CBC
-0x5554 = 0x8D75
-0x5555 = 0x7167
-0x5556 = 0x7F69
-0x5557 = 0x5146
-0x5558 = 0x8087
-0x5559 = 0x53EC
-0x555A = 0x906E
-0x555B = 0x6298
-0x555C = 0x54F2
-0x555D = 0x86F0
-0x555E = 0x8F99
-0x555F = 0x8005
-0x5560 = 0x9517
-0x5561 = 0x8517
-0x5562 = 0x8FD9
-0x5563 = 0x6D59
-0x5564 = 0x73CD
-0x5565 = 0x659F
-0x5566 = 0x771F
-0x5567 = 0x7504
-0x5568 = 0x7827
-0x5569 = 0x81FB
-0x556A = 0x8D1E
-0x556B = 0x9488
-0x556C = 0x4FA6
-0x556D = 0x6795
-0x556E = 0x75B9
-0x556F = 0x8BCA
-0x5570 = 0x9707
-0x5571 = 0x632F
-0x5572 = 0x9547
-0x5573 = 0x9635
-0x5574 = 0x84B8
-0x5575 = 0x6323
-0x5576 = 0x7741
-0x5577 = 0x5F81
-0x5578 = 0x72F0
-0x5579 = 0x4E89
-0x557A = 0x6014
-0x557B = 0x6574
-0x557C = 0x62EF
-0x557D = 0x6B63
-0x557E = 0x653F
-0x5621 = 0x5E27
-0x5622 = 0x75C7
-0x5623 = 0x90D1
-0x5624 = 0x8BC1
-0x5625 = 0x829D
-0x5626 = 0x679D
-0x5627 = 0x652F
-0x5628 = 0x5431
-0x5629 = 0x8718
-0x562A = 0x77E5
-0x562B = 0x80A2
-0x562C = 0x8102
-0x562D = 0x6C41
-0x562E = 0x4E4B
-0x562F = 0x7EC7
-0x5630 = 0x804C
-0x5631 = 0x76F4
-0x5632 = 0x690D
-0x5633 = 0x6B96
-0x5634 = 0x6267
-0x5635 = 0x503C
-0x5636 = 0x4F84
-0x5637 = 0x5740
-0x5638 = 0x6307
-0x5639 = 0x6B62
-0x563A = 0x8DBE
-0x563B = 0x53EA
-0x563C = 0x65E8
-0x563D = 0x7EB8
-0x563E = 0x5FD7
-0x563F = 0x631A
-0x5640 = 0x63B7
-0x5641 = 0x81F3
-0x5642 = 0x81F4
-0x5643 = 0x7F6E
-0x5644 = 0x5E1C
-0x5645 = 0x5CD9
-0x5646 = 0x5236
-0x5647 = 0x667A
-0x5648 = 0x79E9
-0x5649 = 0x7A1A
-0x564A = 0x8D28
-0x564B = 0x7099
-0x564C = 0x75D4
-0x564D = 0x6EDE
-0x564E = 0x6CBB
-0x564F = 0x7A92
-0x5650 = 0x4E2D
-0x5651 = 0x76C5
-0x5652 = 0x5FE0
-0x5653 = 0x949F
-0x5654 = 0x8877
-0x5655 = 0x7EC8
-0x5656 = 0x79CD
-0x5657 = 0x80BF
-0x5658 = 0x91CD
-0x5659 = 0x4EF2
-0x565A = 0x4F17
-0x565B = 0x821F
-0x565C = 0x5468
-0x565D = 0x5DDE
-0x565E = 0x6D32
-0x565F = 0x8BCC
-0x5660 = 0x7CA5
-0x5661 = 0x8F74
-0x5662 = 0x8098
-0x5663 = 0x5E1A
-0x5664 = 0x5492
-0x5665 = 0x76B1
-0x5666 = 0x5B99
-0x5667 = 0x663C
-0x5668 = 0x9AA4
-0x5669 = 0x73E0
-0x566A = 0x682A
-0x566B = 0x86DB
-0x566C = 0x6731
-0x566D = 0x732A
-0x566E = 0x8BF8
-0x566F = 0x8BDB
-0x5670 = 0x9010
-0x5671 = 0x7AF9
-0x5672 = 0x70DB
-0x5673 = 0x716E
-0x5674 = 0x62C4
-0x5675 = 0x77A9
-0x5676 = 0x5631
-0x5677 = 0x4E3B
-0x5678 = 0x8457
-0x5679 = 0x67F1
-0x567A = 0x52A9
-0x567B = 0x86C0
-0x567C = 0x8D2E
-0x567D = 0x94F8
-0x567E = 0x7B51
-0x5721 = 0x4F4F
-0x5722 = 0x6CE8
-0x5723 = 0x795D
-0x5724 = 0x9A7B
-0x5725 = 0x6293
-0x5726 = 0x722A
-0x5727 = 0x62FD
-0x5728 = 0x4E13
-0x5729 = 0x7816
-0x572A = 0x8F6C
-0x572B = 0x64B0
-0x572C = 0x8D5A
-0x572D = 0x7BC6
-0x572E = 0x6869
-0x572F = 0x5E84
-0x5730 = 0x88C5
-0x5731 = 0x5986
-0x5732 = 0x649E
-0x5733 = 0x58EE
-0x5734 = 0x72B6
-0x5735 = 0x690E
-0x5736 = 0x9525
-0x5737 = 0x8FFD
-0x5738 = 0x8D58
-0x5739 = 0x5760
-0x573A = 0x7F00
-0x573B = 0x8C06
-0x573C = 0x51C6
-0x573D = 0x6349
-0x573E = 0x62D9
-0x573F = 0x5353
-0x5740 = 0x684C
-0x5741 = 0x7422
-0x5742 = 0x8301
-0x5743 = 0x914C
-0x5744 = 0x5544
-0x5745 = 0x7740
-0x5746 = 0x707C
-0x5747 = 0x6D4A
-0x5748 = 0x5179
-0x5749 = 0x54A8
-0x574A = 0x8D44
-0x574B = 0x59FF
-0x574C = 0x6ECB
-0x574D = 0x6DC4
-0x574E = 0x5B5C
-0x574F = 0x7D2B
-0x5750 = 0x4ED4
-0x5751 = 0x7C7D
-0x5752 = 0x6ED3
-0x5753 = 0x5B50
-0x5754 = 0x81EA
-0x5755 = 0x6E0D
-0x5756 = 0x5B57
-0x5757 = 0x9B03
-0x5758 = 0x68D5
-0x5759 = 0x8E2A
-0x575A = 0x5B97
-0x575B = 0x7EFC
-0x575C = 0x603B
-0x575D = 0x7EB5
-0x575E = 0x90B9
-0x575F = 0x8D70
-0x5760 = 0x594F
-0x5761 = 0x63CD
-0x5762 = 0x79DF
-0x5763 = 0x8DB3
-0x5764 = 0x5352
-0x5765 = 0x65CF
-0x5766 = 0x7956
-0x5767 = 0x8BC5
-0x5768 = 0x963B
-0x5769 = 0x7EC4
-0x576A = 0x94BB
-0x576B = 0x7E82
-0x576C = 0x5634
-0x576D = 0x9189
-0x576E = 0x6700
-0x576F = 0x7F6A
-0x5770 = 0x5C0A
-0x5771 = 0x9075
-0x5772 = 0x6628
-0x5773 = 0x5DE6
-0x5774 = 0x4F50
-0x5775 = 0x67DE
-0x5776 = 0x505A
-0x5777 = 0x4F5C
-0x5778 = 0x5750
-0x5779 = 0x5EA7
-
-# GBK2 / GB2312 plane2
-0x5821 = 0x4E8D
-0x5822 = 0x4E0C
-0x5823 = 0x5140
-0x5824 = 0x4E10
-0x5825 = 0x5EFF
-0x5826 = 0x5345
-0x5827 = 0x4E15
-0x5828 = 0x4E98
-0x5829 = 0x4E1E
-0x582A = 0x9B32
-0x582B = 0x5B6C
-0x582C = 0x5669
-0x582D = 0x4E28
-0x582E = 0x79BA
-0x582F = 0x4E3F
-0x5830 = 0x5315
-0x5831 = 0x4E47
-0x5832 = 0x592D
-0x5833 = 0x723B
-0x5834 = 0x536E
-0x5835 = 0x6C10
-0x5836 = 0x56DF
-0x5837 = 0x80E4
-0x5838 = 0x9997
-0x5839 = 0x6BD3
-0x583A = 0x777E
-0x583B = 0x9F17
-0x583C = 0x4E36
-0x583D = 0x4E9F
-0x583E = 0x9F10
-0x583F = 0x4E5C
-0x5840 = 0x4E69
-0x5841 = 0x4E93
-0x5842 = 0x8288
-0x5843 = 0x5B5B
-0x5844 = 0x556C
-0x5845 = 0x560F
-0x5846 = 0x4EC4
-0x5847 = 0x538D
-0x5848 = 0x539D
-0x5849 = 0x53A3
-0x584A = 0x53A5
-0x584B = 0x53AE
-0x584C = 0x9765
-0x584D = 0x8D5D
-0x584E = 0x531A
-0x584F = 0x53F5
-0x5850 = 0x5326
-0x5851 = 0x532E
-0x5852 = 0x533E
-0x5853 = 0x8D5C
-0x5854 = 0x5366
-0x5855 = 0x5363
-0x5856 = 0x5202
-0x5857 = 0x5208
-0x5858 = 0x520E
-0x5859 = 0x522D
-0x585A = 0x5233
-0x585B = 0x523F
-0x585C = 0x5240
-0x585D = 0x524C
-0x585E = 0x525E
-0x585F = 0x5261
-0x5860 = 0x525C
-0x5861 = 0x84AF
-0x5862 = 0x527D
-0x5863 = 0x5282
-0x5864 = 0x5281
-0x5865 = 0x5290
-0x5866 = 0x5293
-0x5867 = 0x5182
-0x5868 = 0x7F54
-0x5869 = 0x4EBB
-0x586A = 0x4EC3
-0x586B = 0x4EC9
-0x586C = 0x4EC2
-0x586D = 0x4EE8
-0x586E = 0x4EE1
-0x586F = 0x4EEB
-0x5870 = 0x4EDE
-0x5871 = 0x4F1B
-0x5872 = 0x4EF3
-0x5873 = 0x4F22
-0x5874 = 0x4F64
-0x5875 = 0x4EF5
-0x5876 = 0x4F25
-0x5877 = 0x4F27
-0x5878 = 0x4F09
-0x5879 = 0x4F2B
-0x587A = 0x4F5E
-0x587B = 0x4F67
-0x587C = 0x6538
-0x587D = 0x4F5A
-0x587E = 0x4F5D
-0x5921 = 0x4F5F
-0x5922 = 0x4F57
-0x5923 = 0x4F32
-0x5924 = 0x4F3D
-0x5925 = 0x4F76
-0x5926 = 0x4F74
-0x5927 = 0x4F91
-0x5928 = 0x4F89
-0x5929 = 0x4F83
-0x592A = 0x4F8F
-0x592B = 0x4F7E
-0x592C = 0x4F7B
-0x592D = 0x4FAA
-0x592E = 0x4F7C
-0x592F = 0x4FAC
-0x5930 = 0x4F94
-0x5931 = 0x4FE6
-0x5932 = 0x4FE8
-0x5933 = 0x4FEA
-0x5934 = 0x4FC5
-0x5935 = 0x4FDA
-0x5936 = 0x4FE3
-0x5937 = 0x4FDC
-0x5938 = 0x4FD1
-0x5939 = 0x4FDF
-0x593A = 0x4FF8
-0x593B = 0x5029
-0x593C = 0x504C
-0x593D = 0x4FF3
-0x593E = 0x502C
-0x593F = 0x500F
-0x5940 = 0x502E
-0x5941 = 0x502D
-0x5942 = 0x4FFE
-0x5943 = 0x501C
-0x5944 = 0x500C
-0x5945 = 0x5025
-0x5946 = 0x5028
-0x5947 = 0x507E
-0x5948 = 0x5043
-0x5949 = 0x5055
-0x594A = 0x5048
-0x594B = 0x504E
-0x594C = 0x506C
-0x594D = 0x507B
-0x594E = 0x50A5
-0x594F = 0x50A7
-0x5950 = 0x50A9
-0x5951 = 0x50BA
-0x5952 = 0x50D6
-0x5953 = 0x5106
-0x5954 = 0x50ED
-0x5955 = 0x50EC
-0x5956 = 0x50E6
-0x5957 = 0x50EE
-0x5958 = 0x5107
-0x5959 = 0x510B
-0x595A = 0x4EDD
-0x595B = 0x6C3D
-0x595C = 0x4F58
-0x595D = 0x4F65
-0x595E = 0x4FCE
-0x595F = 0x9FA0
-0x5960 = 0x6C46
-0x5961 = 0x7C74
-0x5962 = 0x516E
-0x5963 = 0x5DFD
-0x5964 = 0x9EC9
-0x5965 = 0x9998
-0x5966 = 0x5181
-0x5967 = 0x5914
-0x5968 = 0x52F9
-0x5969 = 0x530D
-0x596A = 0x8A07
-0x596B = 0x5310
-0x596C = 0x51EB
-0x596D = 0x5919
-0x596E = 0x5155
-0x596F = 0x4EA0
-0x5970 = 0x5156
-0x5971 = 0x4EB3
-0x5972 = 0x886E
-0x5973 = 0x88A4
-0x5974 = 0x4EB5
-0x5975 = 0x8114
-0x5976 = 0x88D2
-0x5977 = 0x7980
-0x5978 = 0x5B34
-0x5979 = 0x8803
-0x597A = 0x7FB8
-0x597B = 0x51AB
-0x597C = 0x51B1
-0x597D = 0x51BD
-0x597E = 0x51BC
-0x5A21 = 0x51C7
-0x5A22 = 0x5196
-0x5A23 = 0x51A2
-0x5A24 = 0x51A5
-0x5A25 = 0x8BA0
-0x5A26 = 0x8BA6
-0x5A27 = 0x8BA7
-0x5A28 = 0x8BAA
-0x5A29 = 0x8BB4
-0x5A2A = 0x8BB5
-0x5A2B = 0x8BB7
-0x5A2C = 0x8BC2
-0x5A2D = 0x8BC3
-0x5A2E = 0x8BCB
-0x5A2F = 0x8BCF
-0x5A30 = 0x8BCE
-0x5A31 = 0x8BD2
-0x5A32 = 0x8BD3
-0x5A33 = 0x8BD4
-0x5A34 = 0x8BD6
-0x5A35 = 0x8BD8
-0x5A36 = 0x8BD9
-0x5A37 = 0x8BDC
-0x5A38 = 0x8BDF
-0x5A39 = 0x8BE0
-0x5A3A = 0x8BE4
-0x5A3B = 0x8BE8
-0x5A3C = 0x8BE9
-0x5A3D = 0x8BEE
-0x5A3E = 0x8BF0
-0x5A3F = 0x8BF3
-0x5A40 = 0x8BF6
-0x5A41 = 0x8BF9
-0x5A42 = 0x8BFC
-0x5A43 = 0x8BFF
-0x5A44 = 0x8C00
-0x5A45 = 0x8C02
-0x5A46 = 0x8C04
-0x5A47 = 0x8C07
-0x5A48 = 0x8C0C
-0x5A49 = 0x8C0F
-0x5A4A = 0x8C11
-0x5A4B = 0x8C12
-0x5A4C = 0x8C14
-0x5A4D = 0x8C15
-0x5A4E = 0x8C16
-0x5A4F = 0x8C19
-0x5A50 = 0x8C1B
-0x5A51 = 0x8C18
-0x5A52 = 0x8C1D
-0x5A53 = 0x8C1F
-0x5A54 = 0x8C20
-0x5A55 = 0x8C21
-0x5A56 = 0x8C25
-0x5A57 = 0x8C27
-0x5A58 = 0x8C2A
-0x5A59 = 0x8C2B
-0x5A5A = 0x8C2E
-0x5A5B = 0x8C2F
-0x5A5C = 0x8C32
-0x5A5D = 0x8C33
-0x5A5E = 0x8C35
-0x5A5F = 0x8C36
-0x5A60 = 0x5369
-0x5A61 = 0x537A
-0x5A62 = 0x961D
-0x5A63 = 0x9622
-0x5A64 = 0x9621
-0x5A65 = 0x9631
-0x5A66 = 0x962A
-0x5A67 = 0x963D
-0x5A68 = 0x963C
-0x5A69 = 0x9642
-0x5A6A = 0x9649
-0x5A6B = 0x9654
-0x5A6C = 0x965F
-0x5A6D = 0x9667
-0x5A6E = 0x966C
-0x5A6F = 0x9672
-0x5A70 = 0x9674
-0x5A71 = 0x9688
-0x5A72 = 0x968D
-0x5A73 = 0x9697
-0x5A74 = 0x96B0
-0x5A75 = 0x9097
-0x5A76 = 0x909B
-0x5A77 = 0x909D
-0x5A78 = 0x9099
-0x5A79 = 0x90AC
-0x5A7A = 0x90A1
-0x5A7B = 0x90B4
-0x5A7C = 0x90B3
-0x5A7D = 0x90B6
-0x5A7E = 0x90BA
-0x5B21 = 0x90B8
-0x5B22 = 0x90B0
-0x5B23 = 0x90CF
-0x5B24 = 0x90C5
-0x5B25 = 0x90BE
-0x5B26 = 0x90D0
-0x5B27 = 0x90C4
-0x5B28 = 0x90C7
-0x5B29 = 0x90D3
-0x5B2A = 0x90E6
-0x5B2B = 0x90E2
-0x5B2C = 0x90DC
-0x5B2D = 0x90D7
-0x5B2E = 0x90DB
-0x5B2F = 0x90EB
-0x5B30 = 0x90EF
-0x5B31 = 0x90FE
-0x5B32 = 0x9104
-0x5B33 = 0x9122
-0x5B34 = 0x911E
-0x5B35 = 0x9123
-0x5B36 = 0x9131
-0x5B37 = 0x912F
-0x5B38 = 0x9139
-0x5B39 = 0x9143
-0x5B3A = 0x9146
-0x5B3B = 0x520D
-0x5B3C = 0x5942
-0x5B3D = 0x52A2
-0x5B3E = 0x52AC
-0x5B3F = 0x52AD
-0x5B40 = 0x52BE
-0x5B41 = 0x54FF
-0x5B42 = 0x52D0
-0x5B43 = 0x52D6
-0x5B44 = 0x52F0
-0x5B45 = 0x53DF
-0x5B46 = 0x71EE
-0x5B47 = 0x77CD
-0x5B48 = 0x5EF4
-0x5B49 = 0x51F5
-0x5B4A = 0x51FC
-0x5B4B = 0x9B2F
-0x5B4C = 0x53B6
-0x5B4D = 0x5F01
-0x5B4E = 0x755A
-0x5B4F = 0x5DEF
-0x5B50 = 0x574C
-0x5B51 = 0x57A9
-0x5B52 = 0x57A1
-0x5B53 = 0x587E
-0x5B54 = 0x58BC
-0x5B55 = 0x58C5
-0x5B56 = 0x58D1
-0x5B57 = 0x5729
-0x5B58 = 0x572C
-0x5B59 = 0x572A
-0x5B5A = 0x5733
-0x5B5B = 0x5739
-0x5B5C = 0x572E
-0x5B5D = 0x572F
-0x5B5E = 0x575C
-0x5B5F = 0x573B
-0x5B60 = 0x5742
-0x5B61 = 0x5769
-0x5B62 = 0x5785
-0x5B63 = 0x576B
-0x5B64 = 0x5786
-0x5B65 = 0x577C
-0x5B66 = 0x577B
-0x5B67 = 0x5768
-0x5B68 = 0x576D
-0x5B69 = 0x5776
-0x5B6A = 0x5773
-0x5B6B = 0x57AD
-0x5B6C = 0x57A4
-0x5B6D = 0x578C
-0x5B6E = 0x57B2
-0x5B6F = 0x57CF
-0x5B70 = 0x57A7
-0x5B71 = 0x57B4
-0x5B72 = 0x5793
-0x5B73 = 0x57A0
-0x5B74 = 0x57D5
-0x5B75 = 0x57D8
-0x5B76 = 0x57DA
-0x5B77 = 0x57D9
-0x5B78 = 0x57D2
-0x5B79 = 0x57B8
-0x5B7A = 0x57F4
-0x5B7B = 0x57EF
-0x5B7C = 0x57F8
-0x5B7D = 0x57E4
-0x5B7E = 0x57DD
-0x5C21 = 0x580B
-0x5C22 = 0x580D
-0x5C23 = 0x57FD
-0x5C24 = 0x57ED
-0x5C25 = 0x5800
-0x5C26 = 0x581E
-0x5C27 = 0x5819
-0x5C28 = 0x5844
-0x5C29 = 0x5820
-0x5C2A = 0x5865
-0x5C2B = 0x586C
-0x5C2C = 0x5881
-0x5C2D = 0x5889
-0x5C2E = 0x589A
-0x5C2F = 0x5880
-0x5C30 = 0x99A8
-0x5C31 = 0x9F19
-0x5C32 = 0x61FF
-0x5C33 = 0x8279
-0x5C34 = 0x827D
-0x5C35 = 0x827F
-0x5C36 = 0x828F
-0x5C37 = 0x828A
-0x5C38 = 0x82A8
-0x5C39 = 0x8284
-0x5C3A = 0x828E
-0x5C3B = 0x8291
-0x5C3C = 0x8297
-0x5C3D = 0x8299
-0x5C3E = 0x82AB
-0x5C3F = 0x82B8
-0x5C40 = 0x82BE
-0x5C41 = 0x82B0
-0x5C42 = 0x82C8
-0x5C43 = 0x82CA
-0x5C44 = 0x82E3
-0x5C45 = 0x8298
-0x5C46 = 0x82B7
-0x5C47 = 0x82AE
-0x5C48 = 0x82CB
-0x5C49 = 0x82CC
-0x5C4A = 0x82C1
-0x5C4B = 0x82A9
-0x5C4C = 0x82B4
-0x5C4D = 0x82A1
-0x5C4E = 0x82AA
-0x5C4F = 0x829F
-0x5C50 = 0x82C4
-0x5C51 = 0x82CE
-0x5C52 = 0x82A4
-0x5C53 = 0x82E1
-0x5C54 = 0x8309
-0x5C55 = 0x82F7
-0x5C56 = 0x82E4
-0x5C57 = 0x830F
-0x5C58 = 0x8307
-0x5C59 = 0x82DC
-0x5C5A = 0x82F4
-0x5C5B = 0x82D2
-0x5C5C = 0x82D8
-0x5C5D = 0x830C
-0x5C5E = 0x82FB
-0x5C5F = 0x82D3
-0x5C60 = 0x8311
-0x5C61 = 0x831A
-0x5C62 = 0x8306
-0x5C63 = 0x8314
-0x5C64 = 0x8315
-0x5C65 = 0x82E0
-0x5C66 = 0x82D5
-0x5C67 = 0x831C
-0x5C68 = 0x8351
-0x5C69 = 0x835B
-0x5C6A = 0x835C
-0x5C6B = 0x8308
-0x5C6C = 0x8392
-0x5C6D = 0x833C
-0x5C6E = 0x8334
-0x5C6F = 0x8331
-0x5C70 = 0x839B
-0x5C71 = 0x835E
-0x5C72 = 0x832F
-0x5C73 = 0x834F
-0x5C74 = 0x8347
-0x5C75 = 0x8343
-0x5C76 = 0x835F
-0x5C77 = 0x8340
-0x5C78 = 0x8317
-0x5C79 = 0x8360
-0x5C7A = 0x832D
-0x5C7B = 0x833A
-0x5C7C = 0x8333
-0x5C7D = 0x8366
-0x5C7E = 0x8365
-0x5D21 = 0x8368
-0x5D22 = 0x831B
-0x5D23 = 0x8369
-0x5D24 = 0x836C
-0x5D25 = 0x836A
-0x5D26 = 0x836D
-0x5D27 = 0x836E
-0x5D28 = 0x83B0
-0x5D29 = 0x8378
-0x5D2A = 0x83B3
-0x5D2B = 0x83B4
-0x5D2C = 0x83A0
-0x5D2D = 0x83AA
-0x5D2E = 0x8393
-0x5D2F = 0x839C
-0x5D30 = 0x8385
-0x5D31 = 0x837C
-0x5D32 = 0x83B6
-0x5D33 = 0x83A9
-0x5D34 = 0x837D
-0x5D35 = 0x83B8
-0x5D36 = 0x837B
-0x5D37 = 0x8398
-0x5D38 = 0x839E
-0x5D39 = 0x83A8
-0x5D3A = 0x83BA
-0x5D3B = 0x83BC
-0x5D3C = 0x83C1
-0x5D3D = 0x8401
-0x5D3E = 0x83E5
-0x5D3F = 0x83D8
-0x5D40 = 0x5807
-0x5D41 = 0x8418
-0x5D42 = 0x840B
-0x5D43 = 0x83DD
-0x5D44 = 0x83FD
-0x5D45 = 0x83D6
-0x5D46 = 0x841C
-0x5D47 = 0x8438
-0x5D48 = 0x8411
-0x5D49 = 0x8406
-0x5D4A = 0x83D4
-0x5D4B = 0x83DF
-0x5D4C = 0x840F
-0x5D4D = 0x8403
-0x5D4E = 0x83F8
-0x5D4F = 0x83F9
-0x5D50 = 0x83EA
-0x5D51 = 0x83C5
-0x5D52 = 0x83C0
-0x5D53 = 0x8426
-0x5D54 = 0x83F0
-0x5D55 = 0x83E1
-0x5D56 = 0x845C
-0x5D57 = 0x8451
-0x5D58 = 0x845A
-0x5D59 = 0x8459
-0x5D5A = 0x8473
-0x5D5B = 0x8487
-0x5D5C = 0x8488
-0x5D5D = 0x847A
-0x5D5E = 0x8489
-0x5D5F = 0x8478
-0x5D60 = 0x843C
-0x5D61 = 0x8446
-0x5D62 = 0x8469
-0x5D63 = 0x8476
-0x5D64 = 0x848C
-0x5D65 = 0x848E
-0x5D66 = 0x8431
-0x5D67 = 0x846D
-0x5D68 = 0x84C1
-0x5D69 = 0x84CD
-0x5D6A = 0x84D0
-0x5D6B = 0x84E6
-0x5D6C = 0x84BD
-0x5D6D = 0x84D3
-0x5D6E = 0x84CA
-0x5D6F = 0x84BF
-0x5D70 = 0x84BA
-0x5D71 = 0x84E0
-0x5D72 = 0x84A1
-0x5D73 = 0x84B9
-0x5D74 = 0x84B4
-0x5D75 = 0x8497
-0x5D76 = 0x84E5
-0x5D77 = 0x84E3
-0x5D78 = 0x850C
-0x5D79 = 0x750D
-0x5D7A = 0x8538
-0x5D7B = 0x84F0
-0x5D7C = 0x8539
-0x5D7D = 0x851F
-0x5D7E = 0x853A
-0x5E21 = 0x8556
-0x5E22 = 0x853B
-0x5E23 = 0x84FF
-0x5E24 = 0x84FC
-0x5E25 = 0x8559
-0x5E26 = 0x8548
-0x5E27 = 0x8568
-0x5E28 = 0x8564
-0x5E29 = 0x855E
-0x5E2A = 0x857A
-0x5E2B = 0x77A2
-0x5E2C = 0x8543
-0x5E2D = 0x8572
-0x5E2E = 0x857B
-0x5E2F = 0x85A4
-0x5E30 = 0x85A8
-0x5E31 = 0x8587
-0x5E32 = 0x858F
-0x5E33 = 0x8579
-0x5E34 = 0x85AE
-0x5E35 = 0x859C
-0x5E36 = 0x8585
-0x5E37 = 0x85B9
-0x5E38 = 0x85B7
-0x5E39 = 0x85B0
-0x5E3A = 0x85D3
-0x5E3B = 0x85C1
-0x5E3C = 0x85DC
-0x5E3D = 0x85FF
-0x5E3E = 0x8627
-0x5E3F = 0x8605
-0x5E40 = 0x8629
-0x5E41 = 0x8616
-0x5E42 = 0x863C
-0x5E43 = 0x5EFE
-0x5E44 = 0x5F08
-0x5E45 = 0x593C
-0x5E46 = 0x5941
-0x5E47 = 0x8037
-0x5E48 = 0x5955
-0x5E49 = 0x595A
-0x5E4A = 0x5958
-0x5E4B = 0x530F
-0x5E4C = 0x5C22
-0x5E4D = 0x5C25
-0x5E4E = 0x5C2C
-0x5E4F = 0x5C34
-0x5E50 = 0x624C
-0x5E51 = 0x626A
-0x5E52 = 0x629F
-0x5E53 = 0x62BB
-0x5E54 = 0x62CA
-0x5E55 = 0x62DA
-0x5E56 = 0x62D7
-0x5E57 = 0x62EE
-0x5E58 = 0x6322
-0x5E59 = 0x62F6
-0x5E5A = 0x6339
-0x5E5B = 0x634B
-0x5E5C = 0x6343
-0x5E5D = 0x63AD
-0x5E5E = 0x63F6
-0x5E5F = 0x6371
-0x5E60 = 0x637A
-0x5E61 = 0x638E
-0x5E62 = 0x63B4
-0x5E63 = 0x636D
-0x5E64 = 0x63AC
-0x5E65 = 0x638A
-0x5E66 = 0x6369
-0x5E67 = 0x63AE
-0x5E68 = 0x63BC
-0x5E69 = 0x63F2
-0x5E6A = 0x63F8
-0x5E6B = 0x63E0
-0x5E6C = 0x63FF
-0x5E6D = 0x63C4
-0x5E6E = 0x63DE
-0x5E6F = 0x63CE
-0x5E70 = 0x6452
-0x5E71 = 0x63C6
-0x5E72 = 0x63BE
-0x5E73 = 0x6445
-0x5E74 = 0x6441
-0x5E75 = 0x640B
-0x5E76 = 0x641B
-0x5E77 = 0x6420
-0x5E78 = 0x640C
-0x5E79 = 0x6426
-0x5E7A = 0x6421
-0x5E7B = 0x645E
-0x5E7C = 0x6484
-0x5E7D = 0x646D
-0x5E7E = 0x6496
-0x5F21 = 0x647A
-0x5F22 = 0x64B7
-0x5F23 = 0x64B8
-0x5F24 = 0x6499
-0x5F25 = 0x64BA
-0x5F26 = 0x64C0
-0x5F27 = 0x64D0
-0x5F28 = 0x64D7
-0x5F29 = 0x64E4
-0x5F2A = 0x64E2
-0x5F2B = 0x6509
-0x5F2C = 0x6525
-0x5F2D = 0x652E
-0x5F2E = 0x5F0B
-0x5F2F = 0x5FD2
-0x5F30 = 0x7519
-0x5F31 = 0x5F11
-0x5F32 = 0x535F
-0x5F33 = 0x53F1
-0x5F34 = 0x53FD
-0x5F35 = 0x53E9
-0x5F36 = 0x53E8
-0x5F37 = 0x53FB
-0x5F38 = 0x5412
-0x5F39 = 0x5416
-0x5F3A = 0x5406
-0x5F3B = 0x544B
-0x5F3C = 0x5452
-0x5F3D = 0x5453
-0x5F3E = 0x5454
-0x5F3F = 0x5456
-0x5F40 = 0x5443
-0x5F41 = 0x5421
-0x5F42 = 0x5457
-0x5F43 = 0x5459
-0x5F44 = 0x5423
-0x5F45 = 0x5432
-0x5F46 = 0x5482
-0x5F47 = 0x5494
-0x5F48 = 0x5477
-0x5F49 = 0x5471
-0x5F4A = 0x5464
-0x5F4B = 0x549A
-0x5F4C = 0x549B
-0x5F4D = 0x5484
-0x5F4E = 0x5476
-0x5F4F = 0x5466
-0x5F50 = 0x549D
-0x5F51 = 0x54D0
-0x5F52 = 0x54AD
-0x5F53 = 0x54C2
-0x5F54 = 0x54B4
-0x5F55 = 0x54D2
-0x5F56 = 0x54A7
-0x5F57 = 0x54A6
-0x5F58 = 0x54D3
-0x5F59 = 0x54D4
-0x5F5A = 0x5472
-0x5F5B = 0x54A3
-0x5F5C = 0x54D5
-0x5F5D = 0x54BB
-0x5F5E = 0x54BF
-0x5F5F = 0x54CC
-0x5F60 = 0x54D9
-0x5F61 = 0x54DA
-0x5F62 = 0x54DC
-0x5F63 = 0x54A9
-0x5F64 = 0x54AA
-0x5F65 = 0x54A4
-0x5F66 = 0x54DD
-0x5F67 = 0x54CF
-0x5F68 = 0x54DE
-0x5F69 = 0x551B
-0x5F6A = 0x54E7
-0x5F6B = 0x5520
-0x5F6C = 0x54FD
-0x5F6D = 0x5514
-0x5F6E = 0x54F3
-0x5F6F = 0x5522
-0x5F70 = 0x5523
-0x5F71 = 0x550F
-0x5F72 = 0x5511
-0x5F73 = 0x5527
-0x5F74 = 0x552A
-0x5F75 = 0x5567
-0x5F76 = 0x558F
-0x5F77 = 0x55B5
-0x5F78 = 0x5549
-0x5F79 = 0x556D
-0x5F7A = 0x5541
-0x5F7B = 0x5555
-0x5F7C = 0x553F
-0x5F7D = 0x5550
-0x5F7E = 0x553C
-0x6021 = 0x5537
-0x6022 = 0x5556
-0x6023 = 0x5575
-0x6024 = 0x5576
-0x6025 = 0x5577
-0x6026 = 0x5533
-0x6027 = 0x5530
-0x6028 = 0x555C
-0x6029 = 0x558B
-0x602A = 0x55D2
-0x602B = 0x5583
-0x602C = 0x55B1
-0x602D = 0x55B9
-0x602E = 0x5588
-0x602F = 0x5581
-0x6030 = 0x559F
-0x6031 = 0x557E
-0x6032 = 0x55D6
-0x6033 = 0x5591
-0x6034 = 0x557B
-0x6035 = 0x55DF
-0x6036 = 0x55BD
-0x6037 = 0x55BE
-0x6038 = 0x5594
-0x6039 = 0x5599
-0x603A = 0x55EA
-0x603B = 0x55F7
-0x603C = 0x55C9
-0x603D = 0x561F
-0x603E = 0x55D1
-0x603F = 0x55EB
-0x6040 = 0x55EC
-0x6041 = 0x55D4
-0x6042 = 0x55E6
-0x6043 = 0x55DD
-0x6044 = 0x55C4
-0x6045 = 0x55EF
-0x6046 = 0x55E5
-0x6047 = 0x55F2
-0x6048 = 0x55F3
-0x6049 = 0x55CC
-0x604A = 0x55CD
-0x604B = 0x55E8
-0x604C = 0x55F5
-0x604D = 0x55E4
-0x604E = 0x8F94
-0x604F = 0x561E
-0x6050 = 0x5608
-0x6051 = 0x560C
-0x6052 = 0x5601
-0x6053 = 0x5624
-0x6054 = 0x5623
-0x6055 = 0x55FE
-0x6056 = 0x5600
-0x6057 = 0x5627
-0x6058 = 0x562D
-0x6059 = 0x5658
-0x605A = 0x5639
-0x605B = 0x5657
-0x605C = 0x562C
-0x605D = 0x564D
-0x605E = 0x5662
-0x605F = 0x5659
-0x6060 = 0x565C
-0x6061 = 0x564C
-0x6062 = 0x5654
-0x6063 = 0x5686
-0x6064 = 0x5664
-0x6065 = 0x5671
-0x6066 = 0x566B
-0x6067 = 0x567B
-0x6068 = 0x567C
-0x6069 = 0x5685
-0x606A = 0x5693
-0x606B = 0x56AF
-0x606C = 0x56D4
-0x606D = 0x56D7
-0x606E = 0x56DD
-0x606F = 0x56E1
-0x6070 = 0x56F5
-0x6071 = 0x56EB
-0x6072 = 0x56F9
-0x6073 = 0x56FF
-0x6074 = 0x5704
-0x6075 = 0x570A
-0x6076 = 0x5709
-0x6077 = 0x571C
-0x6078 = 0x5E0F
-0x6079 = 0x5E19
-0x607A = 0x5E14
-0x607B = 0x5E11
-0x607C = 0x5E31
-0x607D = 0x5E3B
-0x607E = 0x5E3C
-0x6121 = 0x5E37
-0x6122 = 0x5E44
-0x6123 = 0x5E54
-0x6124 = 0x5E5B
-0x6125 = 0x5E5E
-0x6126 = 0x5E61
-0x6127 = 0x5C8C
-0x6128 = 0x5C7A
-0x6129 = 0x5C8D
-0x612A = 0x5C90
-0x612B = 0x5C96
-0x612C = 0x5C88
-0x612D = 0x5C98
-0x612E = 0x5C99
-0x612F = 0x5C91
-0x6130 = 0x5C9A
-0x6131 = 0x5C9C
-0x6132 = 0x5CB5
-0x6133 = 0x5CA2
-0x6134 = 0x5CBD
-0x6135 = 0x5CAC
-0x6136 = 0x5CAB
-0x6137 = 0x5CB1
-0x6138 = 0x5CA3
-0x6139 = 0x5CC1
-0x613A = 0x5CB7
-0x613B = 0x5CC4
-0x613C = 0x5CD2
-0x613D = 0x5CE4
-0x613E = 0x5CCB
-0x613F = 0x5CE5
-0x6140 = 0x5D02
-0x6141 = 0x5D03
-0x6142 = 0x5D27
-0x6143 = 0x5D26
-0x6144 = 0x5D2E
-0x6145 = 0x5D24
-0x6146 = 0x5D1E
-0x6147 = 0x5D06
-0x6148 = 0x5D1B
-0x6149 = 0x5D58
-0x614A = 0x5D3E
-0x614B = 0x5D34
-0x614C = 0x5D3D
-0x614D = 0x5D6C
-0x614E = 0x5D5B
-0x614F = 0x5D6F
-0x6150 = 0x5D5D
-0x6151 = 0x5D6B
-0x6152 = 0x5D4B
-0x6153 = 0x5D4A
-0x6154 = 0x5D69
-0x6155 = 0x5D74
-0x6156 = 0x5D82
-0x6157 = 0x5D99
-0x6158 = 0x5D9D
-0x6159 = 0x8C73
-0x615A = 0x5DB7
-0x615B = 0x5DC5
-0x615C = 0x5F73
-0x615D = 0x5F77
-0x615E = 0x5F82
-0x615F = 0x5F87
-0x6160 = 0x5F89
-0x6161 = 0x5F8C
-0x6162 = 0x5F95
-0x6163 = 0x5F99
-0x6164 = 0x5F9C
-0x6165 = 0x5FA8
-0x6166 = 0x5FAD
-0x6167 = 0x5FB5
-0x6168 = 0x5FBC
-0x6169 = 0x8862
-0x616A = 0x5F61
-0x616B = 0x72AD
-0x616C = 0x72B0
-0x616D = 0x72B4
-0x616E = 0x72B7
-0x616F = 0x72B8
-0x6170 = 0x72C3
-0x6171 = 0x72C1
-0x6172 = 0x72CE
-0x6173 = 0x72CD
-0x6174 = 0x72D2
-0x6175 = 0x72E8
-0x6176 = 0x72EF
-0x6177 = 0x72E9
-0x6178 = 0x72F2
-0x6179 = 0x72F4
-0x617A = 0x72F7
-0x617B = 0x7301
-0x617C = 0x72F3
-0x617D = 0x7303
-0x617E = 0x72FA
-0x6221 = 0x72FB
-0x6222 = 0x7317
-0x6223 = 0x7313
-0x6224 = 0x7321
-0x6225 = 0x730A
-0x6226 = 0x731E
-0x6227 = 0x731D
-0x6228 = 0x7315
-0x6229 = 0x7322
-0x622A = 0x7339
-0x622B = 0x7325
-0x622C = 0x732C
-0x622D = 0x7338
-0x622E = 0x7331
-0x622F = 0x7350
-0x6230 = 0x734D
-0x6231 = 0x7357
-0x6232 = 0x7360
-0x6233 = 0x736C
-0x6234 = 0x736F
-0x6235 = 0x737E
-0x6236 = 0x821B
-0x6237 = 0x5925
-0x6238 = 0x98E7
-0x6239 = 0x5924
-0x623A = 0x5902
-0x623B = 0x9963
-0x623C = 0x9967
-0x623D = 0x9968
-0x623E = 0x9969
-0x623F = 0x996A
-0x6240 = 0x996B
-0x6241 = 0x996C
-0x6242 = 0x9974
-0x6243 = 0x9977
-0x6244 = 0x997D
-0x6245 = 0x9980
-0x6246 = 0x9984
-0x6247 = 0x9987
-0x6248 = 0x998A
-0x6249 = 0x998D
-0x624A = 0x9990
-0x624B = 0x9991
-0x624C = 0x9993
-0x624D = 0x9994
-0x624E = 0x9995
-0x624F = 0x5E80
-0x6250 = 0x5E91
-0x6251 = 0x5E8B
-0x6252 = 0x5E96
-0x6253 = 0x5EA5
-0x6254 = 0x5EA0
-0x6255 = 0x5EB9
-0x6256 = 0x5EB5
-0x6257 = 0x5EBE
-0x6258 = 0x5EB3
-0x6259 = 0x8D53
-0x625A = 0x5ED2
-0x625B = 0x5ED1
-0x625C = 0x5EDB
-0x625D = 0x5EE8
-0x625E = 0x5EEA
-0x625F = 0x81BA
-0x6260 = 0x5FC4
-0x6261 = 0x5FC9
-0x6262 = 0x5FD6
-0x6263 = 0x5FCF
-0x6264 = 0x6003
-0x6265 = 0x5FEE
-0x6266 = 0x6004
-0x6267 = 0x5FE1
-0x6268 = 0x5FE4
-0x6269 = 0x5FFE
-0x626A = 0x6005
-0x626B = 0x6006
-0x626C = 0x5FEA
-0x626D = 0x5FED
-0x626E = 0x5FF8
-0x626F = 0x6019
-0x6270 = 0x6035
-0x6271 = 0x6026
-0x6272 = 0x601B
-0x6273 = 0x600F
-0x6274 = 0x600D
-0x6275 = 0x6029
-0x6276 = 0x602B
-0x6277 = 0x600A
-0x6278 = 0x603F
-0x6279 = 0x6021
-0x627A = 0x6078
-0x627B = 0x6079
-0x627C = 0x607B
-0x627D = 0x607A
-0x627E = 0x6042
-0x6321 = 0x606A
-0x6322 = 0x607D
-0x6323 = 0x6096
-0x6324 = 0x609A
-0x6325 = 0x60AD
-0x6326 = 0x609D
-0x6327 = 0x6083
-0x6328 = 0x6092
-0x6329 = 0x608C
-0x632A = 0x609B
-0x632B = 0x60EC
-0x632C = 0x60BB
-0x632D = 0x60B1
-0x632E = 0x60DD
-0x632F = 0x60D8
-0x6330 = 0x60C6
-0x6331 = 0x60DA
-0x6332 = 0x60B4
-0x6333 = 0x6120
-0x6334 = 0x6126
-0x6335 = 0x6115
-0x6336 = 0x6123
-0x6337 = 0x60F4
-0x6338 = 0x6100
-0x6339 = 0x610E
-0x633A = 0x612B
-0x633B = 0x614A
-0x633C = 0x6175
-0x633D = 0x61AC
-0x633E = 0x6194
-0x633F = 0x61A7
-0x6340 = 0x61B7
-0x6341 = 0x61D4
-0x6342 = 0x61F5
-0x6343 = 0x5FDD
-0x6344 = 0x96B3
-0x6345 = 0x95E9
-0x6346 = 0x95EB
-0x6347 = 0x95F1
-0x6348 = 0x95F3
-0x6349 = 0x95F5
-0x634A = 0x95F6
-0x634B = 0x95FC
-0x634C = 0x95FE
-0x634D = 0x9603
-0x634E = 0x9604
-0x634F = 0x9606
-0x6350 = 0x9608
-0x6351 = 0x960A
-0x6352 = 0x960B
-0x6353 = 0x960C
-0x6354 = 0x960D
-0x6355 = 0x960F
-0x6356 = 0x9612
-0x6357 = 0x9615
-0x6358 = 0x9616
-0x6359 = 0x9617
-0x635A = 0x9619
-0x635B = 0x961A
-0x635C = 0x4E2C
-0x635D = 0x723F
-0x635E = 0x6215
-0x635F = 0x6C35
-0x6360 = 0x6C54
-0x6361 = 0x6C5C
-0x6362 = 0x6C4A
-0x6363 = 0x6CA3
-0x6364 = 0x6C85
-0x6365 = 0x6C90
-0x6366 = 0x6C94
-0x6367 = 0x6C8C
-0x6368 = 0x6C68
-0x6369 = 0x6C69
-0x636A = 0x6C74
-0x636B = 0x6C76
-0x636C = 0x6C86
-0x636D = 0x6CA9
-0x636E = 0x6CD0
-0x636F = 0x6CD4
-0x6370 = 0x6CAD
-0x6371 = 0x6CF7
-0x6372 = 0x6CF8
-0x6373 = 0x6CF1
-0x6374 = 0x6CD7
-0x6375 = 0x6CB2
-0x6376 = 0x6CE0
-0x6377 = 0x6CD6
-0x6378 = 0x6CFA
-0x6379 = 0x6CEB
-0x637A = 0x6CEE
-0x637B = 0x6CB1
-0x637C = 0x6CD3
-0x637D = 0x6CEF
-0x637E = 0x6CFE
-0x6421 = 0x6D39
-0x6422 = 0x6D27
-0x6423 = 0x6D0C
-0x6424 = 0x6D43
-0x6425 = 0x6D48
-0x6426 = 0x6D07
-0x6427 = 0x6D04
-0x6428 = 0x6D19
-0x6429 = 0x6D0E
-0x642A = 0x6D2B
-0x642B = 0x6D4D
-0x642C = 0x6D2E
-0x642D = 0x6D35
-0x642E = 0x6D1A
-0x642F = 0x6D4F
-0x6430 = 0x6D52
-0x6431 = 0x6D54
-0x6432 = 0x6D33
-0x6433 = 0x6D91
-0x6434 = 0x6D6F
-0x6435 = 0x6D9E
-0x6436 = 0x6DA0
-0x6437 = 0x6D5E
-0x6438 = 0x6D93
-0x6439 = 0x6D94
-0x643A = 0x6D5C
-0x643B = 0x6D60
-0x643C = 0x6D7C
-0x643D = 0x6D63
-0x643E = 0x6E1A
-0x643F = 0x6DC7
-0x6440 = 0x6DC5
-0x6441 = 0x6DDE
-0x6442 = 0x6E0E
-0x6443 = 0x6DBF
-0x6444 = 0x6DE0
-0x6445 = 0x6E11
-0x6446 = 0x6DE6
-0x6447 = 0x6DDD
-0x6448 = 0x6DD9
-0x6449 = 0x6E16
-0x644A = 0x6DAB
-0x644B = 0x6E0C
-0x644C = 0x6DAE
-0x644D = 0x6E2B
-0x644E = 0x6E6E
-0x644F = 0x6E4E
-0x6450 = 0x6E6B
-0x6451 = 0x6EB2
-0x6452 = 0x6E5F
-0x6453 = 0x6E86
-0x6454 = 0x6E53
-0x6455 = 0x6E54
-0x6456 = 0x6E32
-0x6457 = 0x6E25
-0x6458 = 0x6E44
-0x6459 = 0x6EDF
-0x645A = 0x6EB1
-0x645B = 0x6E98
-0x645C = 0x6EE0
-0x645D = 0x6F2D
-0x645E = 0x6EE2
-0x645F = 0x6EA5
-0x6460 = 0x6EA7
-0x6461 = 0x6EBD
-0x6462 = 0x6EBB
-0x6463 = 0x6EB7
-0x6464 = 0x6ED7
-0x6465 = 0x6EB4
-0x6466 = 0x6ECF
-0x6467 = 0x6E8F
-0x6468 = 0x6EC2
-0x6469 = 0x6E9F
-0x646A = 0x6F62
-0x646B = 0x6F46
-0x646C = 0x6F47
-0x646D = 0x6F24
-0x646E = 0x6F15
-0x646F = 0x6EF9
-0x6470 = 0x6F2F
-0x6471 = 0x6F36
-0x6472 = 0x6F4B
-0x6473 = 0x6F74
-0x6474 = 0x6F2A
-0x6475 = 0x6F09
-0x6476 = 0x6F29
-0x6477 = 0x6F89
-0x6478 = 0x6F8D
-0x6479 = 0x6F8C
-0x647A = 0x6F78
-0x647B = 0x6F72
-0x647C = 0x6F7C
-0x647D = 0x6F7A
-0x647E = 0x6FD1
-0x6521 = 0x6FC9
-0x6522 = 0x6FA7
-0x6523 = 0x6FB9
-0x6524 = 0x6FB6
-0x6525 = 0x6FC2
-0x6526 = 0x6FE1
-0x6527 = 0x6FEE
-0x6528 = 0x6FDE
-0x6529 = 0x6FE0
-0x652A = 0x6FEF
-0x652B = 0x701A
-0x652C = 0x7023
-0x652D = 0x701B
-0x652E = 0x7039
-0x652F = 0x7035
-0x6530 = 0x704F
-0x6531 = 0x705E
-0x6532 = 0x5B80
-0x6533 = 0x5B84
-0x6534 = 0x5B95
-0x6535 = 0x5B93
-0x6536 = 0x5BA5
-0x6537 = 0x5BB8
-0x6538 = 0x752F
-0x6539 = 0x9A9E
-0x653A = 0x6434
-0x653B = 0x5BE4
-0x653C = 0x5BEE
-0x653D = 0x8930
-0x653E = 0x5BF0
-0x653F = 0x8E47
-0x6540 = 0x8B07
-0x6541 = 0x8FB6
-0x6542 = 0x8FD3
-0x6543 = 0x8FD5
-0x6544 = 0x8FE5
-0x6545 = 0x8FEE
-0x6546 = 0x8FE4
-0x6547 = 0x8FE9
-0x6548 = 0x8FE6
-0x6549 = 0x8FF3
-0x654A = 0x8FE8
-0x654B = 0x9005
-0x654C = 0x9004
-0x654D = 0x900B
-0x654E = 0x9026
-0x654F = 0x9011
-0x6550 = 0x900D
-0x6551 = 0x9016
-0x6552 = 0x9021
-0x6553 = 0x9035
-0x6554 = 0x9036
-0x6555 = 0x902D
-0x6556 = 0x902F
-0x6557 = 0x9044
-0x6558 = 0x9051
-0x6559 = 0x9052
-0x655A = 0x9050
-0x655B = 0x9068
-0x655C = 0x9058
-0x655D = 0x9062
-0x655E = 0x905B
-0x655F = 0x66B9
-0x6560 = 0x9074
-0x6561 = 0x907D
-0x6562 = 0x9082
-0x6563 = 0x9088
-0x6564 = 0x9083
-0x6565 = 0x908B
-0x6566 = 0x5F50
-0x6567 = 0x5F57
-0x6568 = 0x5F56
-0x6569 = 0x5F58
-0x656A = 0x5C3B
-0x656B = 0x54AB
-0x656C = 0x5C50
-0x656D = 0x5C59
-0x656E = 0x5B71
-0x656F = 0x5C63
-0x6570 = 0x5C66
-0x6571 = 0x7FBC
-0x6572 = 0x5F2A
-0x6573 = 0x5F29
-0x6574 = 0x5F2D
-0x6575 = 0x8274
-0x6576 = 0x5F3C
-0x6577 = 0x9B3B
-0x6578 = 0x5C6E
-0x6579 = 0x5981
-0x657A = 0x5983
-0x657B = 0x598D
-0x657C = 0x59A9
-0x657D = 0x59AA
-0x657E = 0x59A3
-0x6621 = 0x5997
-0x6622 = 0x59CA
-0x6623 = 0x59AB
-0x6624 = 0x599E
-0x6625 = 0x59A4
-0x6626 = 0x59D2
-0x6627 = 0x59B2
-0x6628 = 0x59AF
-0x6629 = 0x59D7
-0x662A = 0x59BE
-0x662B = 0x5A05
-0x662C = 0x5A06
-0x662D = 0x59DD
-0x662E = 0x5A08
-0x662F = 0x59E3
-0x6630 = 0x59D8
-0x6631 = 0x59F9
-0x6632 = 0x5A0C
-0x6633 = 0x5A09
-0x6634 = 0x5A32
-0x6635 = 0x5A34
-0x6636 = 0x5A11
-0x6637 = 0x5A23
-0x6638 = 0x5A13
-0x6639 = 0x5A40
-0x663A = 0x5A67
-0x663B = 0x5A4A
-0x663C = 0x5A55
-0x663D = 0x5A3C
-0x663E = 0x5A62
-0x663F = 0x5A75
-0x6640 = 0x80EC
-0x6641 = 0x5AAA
-0x6642 = 0x5A9B
-0x6643 = 0x5A77
-0x6644 = 0x5A7A
-0x6645 = 0x5ABE
-0x6646 = 0x5AEB
-0x6647 = 0x5AB2
-0x6648 = 0x5AD2
-0x6649 = 0x5AD4
-0x664A = 0x5AB8
-0x664B = 0x5AE0
-0x664C = 0x5AE3
-0x664D = 0x5AF1
-0x664E = 0x5AD6
-0x664F = 0x5AE6
-0x6650 = 0x5AD8
-0x6651 = 0x5ADC
-0x6652 = 0x5B09
-0x6653 = 0x5B17
-0x6654 = 0x5B16
-0x6655 = 0x5B32
-0x6656 = 0x5B37
-0x6657 = 0x5B40
-0x6658 = 0x5C15
-0x6659 = 0x5C1C
-0x665A = 0x5B5A
-0x665B = 0x5B65
-0x665C = 0x5B73
-0x665D = 0x5B51
-0x665E = 0x5B53
-0x665F = 0x5B62
-0x6660 = 0x9A75
-0x6661 = 0x9A77
-0x6662 = 0x9A78
-0x6663 = 0x9A7A
-0x6664 = 0x9A7F
-0x6665 = 0x9A7D
-0x6666 = 0x9A80
-0x6667 = 0x9A81
-0x6668 = 0x9A85
-0x6669 = 0x9A88
-0x666A = 0x9A8A
-0x666B = 0x9A90
-0x666C = 0x9A92
-0x666D = 0x9A93
-0x666E = 0x9A96
-0x666F = 0x9A98
-0x6670 = 0x9A9B
-0x6671 = 0x9A9C
-0x6672 = 0x9A9D
-0x6673 = 0x9A9F
-0x6674 = 0x9AA0
-0x6675 = 0x9AA2
-0x6676 = 0x9AA3
-0x6677 = 0x9AA5
-0x6678 = 0x9AA7
-0x6679 = 0x7E9F
-0x667A = 0x7EA1
-0x667B = 0x7EA3
-0x667C = 0x7EA5
-0x667D = 0x7EA8
-0x667E = 0x7EA9
-0x6721 = 0x7EAD
-0x6722 = 0x7EB0
-0x6723 = 0x7EBE
-0x6724 = 0x7EC0
-0x6725 = 0x7EC1
-0x6726 = 0x7EC2
-0x6727 = 0x7EC9
-0x6728 = 0x7ECB
-0x6729 = 0x7ECC
-0x672A = 0x7ED0
-0x672B = 0x7ED4
-0x672C = 0x7ED7
-0x672D = 0x7EDB
-0x672E = 0x7EE0
-0x672F = 0x7EE1
-0x6730 = 0x7EE8
-0x6731 = 0x7EEB
-0x6732 = 0x7EEE
-0x6733 = 0x7EEF
-0x6734 = 0x7EF1
-0x6735 = 0x7EF2
-0x6736 = 0x7F0D
-0x6737 = 0x7EF6
-0x6738 = 0x7EFA
-0x6739 = 0x7EFB
-0x673A = 0x7EFE
-0x673B = 0x7F01
-0x673C = 0x7F02
-0x673D = 0x7F03
-0x673E = 0x7F07
-0x673F = 0x7F08
-0x6740 = 0x7F0B
-0x6741 = 0x7F0C
-0x6742 = 0x7F0F
-0x6743 = 0x7F11
-0x6744 = 0x7F12
-0x6745 = 0x7F17
-0x6746 = 0x7F19
-0x6747 = 0x7F1C
-0x6748 = 0x7F1B
-0x6749 = 0x7F1F
-0x674A = 0x7F21
-0x674B = 0x7F22
-0x674C = 0x7F23
-0x674D = 0x7F24
-0x674E = 0x7F25
-0x674F = 0x7F26
-0x6750 = 0x7F27
-0x6751 = 0x7F2A
-0x6752 = 0x7F2B
-0x6753 = 0x7F2C
-0x6754 = 0x7F2D
-0x6755 = 0x7F2F
-0x6756 = 0x7F30
-0x6757 = 0x7F31
-0x6758 = 0x7F32
-0x6759 = 0x7F33
-0x675A = 0x7F35
-0x675B = 0x5E7A
-0x675C = 0x757F
-0x675D = 0x5DDB
-0x675E = 0x753E
-0x675F = 0x9095
-0x6760 = 0x738E
-0x6761 = 0x7391
-0x6762 = 0x73AE
-0x6763 = 0x73A2
-0x6764 = 0x739F
-0x6765 = 0x73CF
-0x6766 = 0x73C2
-0x6767 = 0x73D1
-0x6768 = 0x73B7
-0x6769 = 0x73B3
-0x676A = 0x73C0
-0x676B = 0x73C9
-0x676C = 0x73C8
-0x676D = 0x73E5
-0x676E = 0x73D9
-0x676F = 0x987C
-0x6770 = 0x740A
-0x6771 = 0x73E9
-0x6772 = 0x73E7
-0x6773 = 0x73DE
-0x6774 = 0x73BA
-0x6775 = 0x73F2
-0x6776 = 0x740F
-0x6777 = 0x742A
-0x6778 = 0x745B
-0x6779 = 0x7426
-0x677A = 0x7425
-0x677B = 0x7428
-0x677C = 0x7430
-0x677D = 0x742E
-0x677E = 0x742C
-0x6821 = 0x741B
-0x6822 = 0x741A
-0x6823 = 0x7441
-0x6824 = 0x745C
-0x6825 = 0x7457
-0x6826 = 0x7455
-0x6827 = 0x7459
-0x6828 = 0x7477
-0x6829 = 0x746D
-0x682A = 0x747E
-0x682B = 0x749C
-0x682C = 0x748E
-0x682D = 0x7480
-0x682E = 0x7481
-0x682F = 0x7487
-0x6830 = 0x748B
-0x6831 = 0x749E
-0x6832 = 0x74A8
-0x6833 = 0x74A9
-0x6834 = 0x7490
-0x6835 = 0x74A7
-0x6836 = 0x74D2
-0x6837 = 0x74BA
-0x6838 = 0x97EA
-0x6839 = 0x97EB
-0x683A = 0x97EC
-0x683B = 0x674C
-0x683C = 0x6753
-0x683D = 0x675E
-0x683E = 0x6748
-0x683F = 0x6769
-0x6840 = 0x67A5
-0x6841 = 0x6787
-0x6842 = 0x676A
-0x6843 = 0x6773
-0x6844 = 0x6798
-0x6845 = 0x67A7
-0x6846 = 0x6775
-0x6847 = 0x67A8
-0x6848 = 0x679E
-0x6849 = 0x67AD
-0x684A = 0x678B
-0x684B = 0x6777
-0x684C = 0x677C
-0x684D = 0x67F0
-0x684E = 0x6809
-0x684F = 0x67D8
-0x6850 = 0x680A
-0x6851 = 0x67E9
-0x6852 = 0x67B0
-0x6853 = 0x680C
-0x6854 = 0x67D9
-0x6855 = 0x67B5
-0x6856 = 0x67DA
-0x6857 = 0x67B3
-0x6858 = 0x67DD
-0x6859 = 0x6800
-0x685A = 0x67C3
-0x685B = 0x67B8
-0x685C = 0x67E2
-0x685D = 0x680E
-0x685E = 0x67C1
-0x685F = 0x67FD
-0x6860 = 0x6832
-0x6861 = 0x6833
-0x6862 = 0x6860
-0x6863 = 0x6861
-0x6864 = 0x684E
-0x6865 = 0x6862
-0x6866 = 0x6844
-0x6867 = 0x6864
-0x6868 = 0x6883
-0x6869 = 0x681D
-0x686A = 0x6855
-0x686B = 0x6866
-0x686C = 0x6841
-0x686D = 0x6867
-0x686E = 0x6840
-0x686F = 0x683E
-0x6870 = 0x684A
-0x6871 = 0x6849
-0x6872 = 0x6829
-0x6873 = 0x68B5
-0x6874 = 0x688F
-0x6875 = 0x6874
-0x6876 = 0x6877
-0x6877 = 0x6893
-0x6878 = 0x686B
-0x6879 = 0x68C2
-0x687A = 0x696E
-0x687B = 0x68FC
-0x687C = 0x691F
-0x687D = 0x6920
-0x687E = 0x68F9
-0x6921 = 0x6924
-0x6922 = 0x68F0
-0x6923 = 0x690B
-0x6924 = 0x6901
-0x6925 = 0x6957
-0x6926 = 0x68E3
-0x6927 = 0x6910
-0x6928 = 0x6971
-0x6929 = 0x6939
-0x692A = 0x6960
-0x692B = 0x6942
-0x692C = 0x695D
-0x692D = 0x6984
-0x692E = 0x696B
-0x692F = 0x6980
-0x6930 = 0x6998
-0x6931 = 0x6978
-0x6932 = 0x6934
-0x6933 = 0x69CC
-0x6934 = 0x6987
-0x6935 = 0x6988
-0x6936 = 0x69CE
-0x6937 = 0x6989
-0x6938 = 0x6966
-0x6939 = 0x6963
-0x693A = 0x6979
-0x693B = 0x699B
-0x693C = 0x69A7
-0x693D = 0x69BB
-0x693E = 0x69AB
-0x693F = 0x69AD
-0x6940 = 0x69D4
-0x6941 = 0x69B1
-0x6942 = 0x69C1
-0x6943 = 0x69CA
-0x6944 = 0x69DF
-0x6945 = 0x6995
-0x6946 = 0x69E0
-0x6947 = 0x698D
-0x6948 = 0x69FF
-0x6949 = 0x6A2F
-0x694A = 0x69ED
-0x694B = 0x6A17
-0x694C = 0x6A18
-0x694D = 0x6A65
-0x694E = 0x69F2
-0x694F = 0x6A44
-0x6950 = 0x6A3E
-0x6951 = 0x6AA0
-0x6952 = 0x6A50
-0x6953 = 0x6A5B
-0x6954 = 0x6A35
-0x6955 = 0x6A8E
-0x6956 = 0x6A79
-0x6957 = 0x6A3D
-0x6958 = 0x6A28
-0x6959 = 0x6A58
-0x695A = 0x6A7C
-0x695B = 0x6A91
-0x695C = 0x6A90
-0x695D = 0x6AA9
-0x695E = 0x6A97
-0x695F = 0x6AAB
-0x6960 = 0x7337
-0x6961 = 0x7352
-0x6962 = 0x6B81
-0x6963 = 0x6B82
-0x6964 = 0x6B87
-0x6965 = 0x6B84
-0x6966 = 0x6B92
-0x6967 = 0x6B93
-0x6968 = 0x6B8D
-0x6969 = 0x6B9A
-0x696A = 0x6B9B
-0x696B = 0x6BA1
-0x696C = 0x6BAA
-0x696D = 0x8F6B
-0x696E = 0x8F6D
-0x696F = 0x8F71
-0x6970 = 0x8F72
-0x6971 = 0x8F73
-0x6972 = 0x8F75
-0x6973 = 0x8F76
-0x6974 = 0x8F78
-0x6975 = 0x8F77
-0x6976 = 0x8F79
-0x6977 = 0x8F7A
-0x6978 = 0x8F7C
-0x6979 = 0x8F7E
-0x697A = 0x8F81
-0x697B = 0x8F82
-0x697C = 0x8F84
-0x697D = 0x8F87
-0x697E = 0x8F8B
-0x6A21 = 0x8F8D
-0x6A22 = 0x8F8E
-0x6A23 = 0x8F8F
-0x6A24 = 0x8F98
-0x6A25 = 0x8F9A
-0x6A26 = 0x8ECE
-0x6A27 = 0x620B
-0x6A28 = 0x6217
-0x6A29 = 0x621B
-0x6A2A = 0x621F
-0x6A2B = 0x6222
-0x6A2C = 0x6221
-0x6A2D = 0x6225
-0x6A2E = 0x6224
-0x6A2F = 0x622C
-0x6A30 = 0x81E7
-0x6A31 = 0x74EF
-0x6A32 = 0x74F4
-0x6A33 = 0x74FF
-0x6A34 = 0x750F
-0x6A35 = 0x7511
-0x6A36 = 0x7513
-0x6A37 = 0x6534
-0x6A38 = 0x65EE
-0x6A39 = 0x65EF
-0x6A3A = 0x65F0
-0x6A3B = 0x660A
-0x6A3C = 0x6619
-0x6A3D = 0x6772
-0x6A3E = 0x6603
-0x6A3F = 0x6615
-0x6A40 = 0x6600
-0x6A41 = 0x7085
-0x6A42 = 0x66F7
-0x6A43 = 0x661D
-0x6A44 = 0x6634
-0x6A45 = 0x6631
-0x6A46 = 0x6636
-0x6A47 = 0x6635
-0x6A48 = 0x8006
-0x6A49 = 0x665F
-0x6A4A = 0x6654
-0x6A4B = 0x6641
-0x6A4C = 0x664F
-0x6A4D = 0x6656
-0x6A4E = 0x6661
-0x6A4F = 0x6657
-0x6A50 = 0x6677
-0x6A51 = 0x6684
-0x6A52 = 0x668C
-0x6A53 = 0x66A7
-0x6A54 = 0x669D
-0x6A55 = 0x66BE
-0x6A56 = 0x66DB
-0x6A57 = 0x66DC
-0x6A58 = 0x66E6
-0x6A59 = 0x66E9
-0x6A5A = 0x8D32
-0x6A5B = 0x8D33
-0x6A5C = 0x8D36
-0x6A5D = 0x8D3B
-0x6A5E = 0x8D3D
-0x6A5F = 0x8D40
-0x6A60 = 0x8D45
-0x6A61 = 0x8D46
-0x6A62 = 0x8D48
-0x6A63 = 0x8D49
-0x6A64 = 0x8D47
-0x6A65 = 0x8D4D
-0x6A66 = 0x8D55
-0x6A67 = 0x8D59
-0x6A68 = 0x89C7
-0x6A69 = 0x89CA
-0x6A6A = 0x89CB
-0x6A6B = 0x89CC
-0x6A6C = 0x89CE
-0x6A6D = 0x89CF
-0x6A6E = 0x89D0
-0x6A6F = 0x89D1
-0x6A70 = 0x726E
-0x6A71 = 0x729F
-0x6A72 = 0x725D
-0x6A73 = 0x7266
-0x6A74 = 0x726F
-0x6A75 = 0x727E
-0x6A76 = 0x727F
-0x6A77 = 0x7284
-0x6A78 = 0x728B
-0x6A79 = 0x728D
-0x6A7A = 0x728F
-0x6A7B = 0x7292
-0x6A7C = 0x6308
-0x6A7D = 0x6332
-0x6A7E = 0x63B0
-0x6B21 = 0x643F
-0x6B22 = 0x64D8
-0x6B23 = 0x8004
-0x6B24 = 0x6BEA
-0x6B25 = 0x6BF3
-0x6B26 = 0x6BFD
-0x6B27 = 0x6BF5
-0x6B28 = 0x6BF9
-0x6B29 = 0x6C05
-0x6B2A = 0x6C07
-0x6B2B = 0x6C06
-0x6B2C = 0x6C0D
-0x6B2D = 0x6C15
-0x6B2E = 0x6C18
-0x6B2F = 0x6C19
-0x6B30 = 0x6C1A
-0x6B31 = 0x6C21
-0x6B32 = 0x6C29
-0x6B33 = 0x6C24
-0x6B34 = 0x6C2A
-0x6B35 = 0x6C32
-0x6B36 = 0x6535
-0x6B37 = 0x6555
-0x6B38 = 0x656B
-0x6B39 = 0x724D
-0x6B3A = 0x7252
-0x6B3B = 0x7256
-0x6B3C = 0x7230
-0x6B3D = 0x8662
-0x6B3E = 0x5216
-0x6B3F = 0x809F
-0x6B40 = 0x809C
-0x6B41 = 0x8093
-0x6B42 = 0x80BC
-0x6B43 = 0x670A
-0x6B44 = 0x80BD
-0x6B45 = 0x80B1
-0x6B46 = 0x80AB
-0x6B47 = 0x80AD
-0x6B48 = 0x80B4
-0x6B49 = 0x80B7
-0x6B4A = 0x80E7
-0x6B4B = 0x80E8
-0x6B4C = 0x80E9
-0x6B4D = 0x80EA
-0x6B4E = 0x80DB
-0x6B4F = 0x80C2
-0x6B50 = 0x80C4
-0x6B51 = 0x80D9
-0x6B52 = 0x80CD
-0x6B53 = 0x80D7
-0x6B54 = 0x6710
-0x6B55 = 0x80DD
-0x6B56 = 0x80EB
-0x6B57 = 0x80F1
-0x6B58 = 0x80F4
-0x6B59 = 0x80ED
-0x6B5A = 0x810D
-0x6B5B = 0x810E
-0x6B5C = 0x80F2
-0x6B5D = 0x80FC
-0x6B5E = 0x6715
-0x6B5F = 0x8112
-0x6B60 = 0x8C5A
-0x6B61 = 0x8136
-0x6B62 = 0x811E
-0x6B63 = 0x812C
-0x6B64 = 0x8118
-0x6B65 = 0x8132
-0x6B66 = 0x8148
-0x6B67 = 0x814C
-0x6B68 = 0x8153
-0x6B69 = 0x8174
-0x6B6A = 0x8159
-0x6B6B = 0x815A
-0x6B6C = 0x8171
-0x6B6D = 0x8160
-0x6B6E = 0x8169
-0x6B6F = 0x817C
-0x6B70 = 0x817D
-0x6B71 = 0x816D
-0x6B72 = 0x8167
-0x6B73 = 0x584D
-0x6B74 = 0x5AB5
-0x6B75 = 0x8188
-0x6B76 = 0x8182
-0x6B77 = 0x8191
-0x6B78 = 0x6ED5
-0x6B79 = 0x81A3
-0x6B7A = 0x81AA
-0x6B7B = 0x81CC
-0x6B7C = 0x6726
-0x6B7D = 0x81CA
-0x6B7E = 0x81BB
-0x6C21 = 0x81C1
-0x6C22 = 0x81A6
-0x6C23 = 0x6B24
-0x6C24 = 0x6B37
-0x6C25 = 0x6B39
-0x6C26 = 0x6B43
-0x6C27 = 0x6B46
-0x6C28 = 0x6B59
-0x6C29 = 0x98D1
-0x6C2A = 0x98D2
-0x6C2B = 0x98D3
-0x6C2C = 0x98D5
-0x6C2D = 0x98D9
-0x6C2E = 0x98DA
-0x6C2F = 0x6BB3
-0x6C30 = 0x5F40
-0x6C31 = 0x6BC2
-0x6C32 = 0x89F3
-0x6C33 = 0x6590
-0x6C34 = 0x9F51
-0x6C35 = 0x6593
-0x6C36 = 0x65BC
-0x6C37 = 0x65C6
-0x6C38 = 0x65C4
-0x6C39 = 0x65C3
-0x6C3A = 0x65CC
-0x6C3B = 0x65CE
-0x6C3C = 0x65D2
-0x6C3D = 0x65D6
-0x6C3E = 0x7080
-0x6C3F = 0x709C
-0x6C40 = 0x7096
-0x6C41 = 0x709D
-0x6C42 = 0x70BB
-0x6C43 = 0x70C0
-0x6C44 = 0x70B7
-0x6C45 = 0x70AB
-0x6C46 = 0x70B1
-0x6C47 = 0x70E8
-0x6C48 = 0x70CA
-0x6C49 = 0x7110
-0x6C4A = 0x7113
-0x6C4B = 0x7116
-0x6C4C = 0x712F
-0x6C4D = 0x7131
-0x6C4E = 0x7173
-0x6C4F = 0x715C
-0x6C50 = 0x7168
-0x6C51 = 0x7145
-0x6C52 = 0x7172
-0x6C53 = 0x714A
-0x6C54 = 0x7178
-0x6C55 = 0x717A
-0x6C56 = 0x7198
-0x6C57 = 0x71B3
-0x6C58 = 0x71B5
-0x6C59 = 0x71A8
-0x6C5A = 0x71A0
-0x6C5B = 0x71E0
-0x6C5C = 0x71D4
-0x6C5D = 0x71E7
-0x6C5E = 0x71F9
-0x6C5F = 0x721D
-0x6C60 = 0x7228
-0x6C61 = 0x706C
-0x6C62 = 0x7118
-0x6C63 = 0x7166
-0x6C64 = 0x71B9
-0x6C65 = 0x623E
-0x6C66 = 0x623D
-0x6C67 = 0x6243
-0x6C68 = 0x6248
-0x6C69 = 0x6249
-0x6C6A = 0x793B
-0x6C6B = 0x7940
-0x6C6C = 0x7946
-0x6C6D = 0x7949
-0x6C6E = 0x795B
-0x6C6F = 0x795C
-0x6C70 = 0x7953
-0x6C71 = 0x795A
-0x6C72 = 0x7962
-0x6C73 = 0x7957
-0x6C74 = 0x7960
-0x6C75 = 0x796F
-0x6C76 = 0x7967
-0x6C77 = 0x797A
-0x6C78 = 0x7985
-0x6C79 = 0x798A
-0x6C7A = 0x799A
-0x6C7B = 0x79A7
-0x6C7C = 0x79B3
-0x6C7D = 0x5FD1
-0x6C7E = 0x5FD0
-0x6D21 = 0x603C
-0x6D22 = 0x605D
-0x6D23 = 0x605A
-0x6D24 = 0x6067
-0x6D25 = 0x6041
-0x6D26 = 0x6059
-0x6D27 = 0x6063
-0x6D28 = 0x60AB
-0x6D29 = 0x6106
-0x6D2A = 0x610D
-0x6D2B = 0x615D
-0x6D2C = 0x61A9
-0x6D2D = 0x619D
-0x6D2E = 0x61CB
-0x6D2F = 0x61D1
-0x6D30 = 0x6206
-0x6D31 = 0x8080
-0x6D32 = 0x807F
-0x6D33 = 0x6C93
-0x6D34 = 0x6CF6
-0x6D35 = 0x6DFC
-0x6D36 = 0x77F6
-0x6D37 = 0x77F8
-0x6D38 = 0x7800
-0x6D39 = 0x7809
-0x6D3A = 0x7817
-0x6D3B = 0x7818
-0x6D3C = 0x7811
-0x6D3D = 0x65AB
-0x6D3E = 0x782D
-0x6D3F = 0x781C
-0x6D40 = 0x781D
-0x6D41 = 0x7839
-0x6D42 = 0x783A
-0x6D43 = 0x783B
-0x6D44 = 0x781F
-0x6D45 = 0x783C
-0x6D46 = 0x7825
-0x6D47 = 0x782C
-0x6D48 = 0x7823
-0x6D49 = 0x7829
-0x6D4A = 0x784E
-0x6D4B = 0x786D
-0x6D4C = 0x7856
-0x6D4D = 0x7857
-0x6D4E = 0x7826
-0x6D4F = 0x7850
-0x6D50 = 0x7847
-0x6D51 = 0x784C
-0x6D52 = 0x786A
-0x6D53 = 0x789B
-0x6D54 = 0x7893
-0x6D55 = 0x789A
-0x6D56 = 0x7887
-0x6D57 = 0x789C
-0x6D58 = 0x78A1
-0x6D59 = 0x78A3
-0x6D5A = 0x78B2
-0x6D5B = 0x78B9
-0x6D5C = 0x78A5
-0x6D5D = 0x78D4
-0x6D5E = 0x78D9
-0x6D5F = 0x78C9
-0x6D60 = 0x78EC
-0x6D61 = 0x78F2
-0x6D62 = 0x7905
-0x6D63 = 0x78F4
-0x6D64 = 0x7913
-0x6D65 = 0x7924
-0x6D66 = 0x791E
-0x6D67 = 0x7934
-0x6D68 = 0x9F9B
-0x6D69 = 0x9EF9
-0x6D6A = 0x9EFB
-0x6D6B = 0x9EFC
-0x6D6C = 0x76F1
-0x6D6D = 0x7704
-0x6D6E = 0x770D
-0x6D6F = 0x76F9
-0x6D70 = 0x7707
-0x6D71 = 0x7708
-0x6D72 = 0x771A
-0x6D73 = 0x7722
-0x6D74 = 0x7719
-0x6D75 = 0x772D
-0x6D76 = 0x7726
-0x6D77 = 0x7735
-0x6D78 = 0x7738
-0x6D79 = 0x7750
-0x6D7A = 0x7751
-0x6D7B = 0x7747
-0x6D7C = 0x7743
-0x6D7D = 0x775A
-0x6D7E = 0x7768
-0x6E21 = 0x7762
-0x6E22 = 0x7765
-0x6E23 = 0x777F
-0x6E24 = 0x778D
-0x6E25 = 0x777D
-0x6E26 = 0x7780
-0x6E27 = 0x778C
-0x6E28 = 0x7791
-0x6E29 = 0x779F
-0x6E2A = 0x77A0
-0x6E2B = 0x77B0
-0x6E2C = 0x77B5
-0x6E2D = 0x77BD
-0x6E2E = 0x753A
-0x6E2F = 0x7540
-0x6E30 = 0x754E
-0x6E31 = 0x754B
-0x6E32 = 0x7548
-0x6E33 = 0x755B
-0x6E34 = 0x7572
-0x6E35 = 0x7579
-0x6E36 = 0x7583
-0x6E37 = 0x7F58
-0x6E38 = 0x7F61
-0x6E39 = 0x7F5F
-0x6E3A = 0x8A48
-0x6E3B = 0x7F68
-0x6E3C = 0x7F74
-0x6E3D = 0x7F71
-0x6E3E = 0x7F79
-0x6E3F = 0x7F81
-0x6E40 = 0x7F7E
-0x6E41 = 0x76CD
-0x6E42 = 0x76E5
-0x6E43 = 0x8832
-0x6E44 = 0x9485
-0x6E45 = 0x9486
-0x6E46 = 0x9487
-0x6E47 = 0x948B
-0x6E48 = 0x948A
-0x6E49 = 0x948C
-0x6E4A = 0x948D
-0x6E4B = 0x948F
-0x6E4C = 0x9490
-0x6E4D = 0x9494
-0x6E4E = 0x9497
-0x6E4F = 0x9495
-0x6E50 = 0x949A
-0x6E51 = 0x949B
-0x6E52 = 0x949C
-0x6E53 = 0x94A3
-0x6E54 = 0x94A4
-0x6E55 = 0x94AB
-0x6E56 = 0x94AA
-0x6E57 = 0x94AD
-0x6E58 = 0x94AC
-0x6E59 = 0x94AF
-0x6E5A = 0x94B0
-0x6E5B = 0x94B2
-0x6E5C = 0x94B4
-0x6E5D = 0x94B6
-0x6E5E = 0x94B7
-0x6E5F = 0x94B8
-0x6E60 = 0x94B9
-0x6E61 = 0x94BA
-0x6E62 = 0x94BC
-0x6E63 = 0x94BD
-0x6E64 = 0x94BF
-0x6E65 = 0x94C4
-0x6E66 = 0x94C8
-0x6E67 = 0x94C9
-0x6E68 = 0x94CA
-0x6E69 = 0x94CB
-0x6E6A = 0x94CC
-0x6E6B = 0x94CD
-0x6E6C = 0x94CE
-0x6E6D = 0x94D0
-0x6E6E = 0x94D1
-0x6E6F = 0x94D2
-0x6E70 = 0x94D5
-0x6E71 = 0x94D6
-0x6E72 = 0x94D7
-0x6E73 = 0x94D9
-0x6E74 = 0x94D8
-0x6E75 = 0x94DB
-0x6E76 = 0x94DE
-0x6E77 = 0x94DF
-0x6E78 = 0x94E0
-0x6E79 = 0x94E2
-0x6E7A = 0x94E4
-0x6E7B = 0x94E5
-0x6E7C = 0x94E7
-0x6E7D = 0x94E8
-0x6E7E = 0x94EA
-0x6F21 = 0x94E9
-0x6F22 = 0x94EB
-0x6F23 = 0x94EE
-0x6F24 = 0x94EF
-0x6F25 = 0x94F3
-0x6F26 = 0x94F4
-0x6F27 = 0x94F5
-0x6F28 = 0x94F7
-0x6F29 = 0x94F9
-0x6F2A = 0x94FC
-0x6F2B = 0x94FD
-0x6F2C = 0x94FF
-0x6F2D = 0x9503
-0x6F2E = 0x9502
-0x6F2F = 0x9506
-0x6F30 = 0x9507
-0x6F31 = 0x9509
-0x6F32 = 0x950A
-0x6F33 = 0x950D
-0x6F34 = 0x950E
-0x6F35 = 0x950F
-0x6F36 = 0x9512
-0x6F37 = 0x9513
-0x6F38 = 0x9514
-0x6F39 = 0x9515
-0x6F3A = 0x9516
-0x6F3B = 0x9518
-0x6F3C = 0x951B
-0x6F3D = 0x951D
-0x6F3E = 0x951E
-0x6F3F = 0x951F
-0x6F40 = 0x9522
-0x6F41 = 0x952A
-0x6F42 = 0x952B
-0x6F43 = 0x9529
-0x6F44 = 0x952C
-0x6F45 = 0x9531
-0x6F46 = 0x9532
-0x6F47 = 0x9534
-0x6F48 = 0x9536
-0x6F49 = 0x9537
-0x6F4A = 0x9538
-0x6F4B = 0x953C
-0x6F4C = 0x953E
-0x6F4D = 0x953F
-0x6F4E = 0x9542
-0x6F4F = 0x9535
-0x6F50 = 0x9544
-0x6F51 = 0x9545
-0x6F52 = 0x9546
-0x6F53 = 0x9549
-0x6F54 = 0x954C
-0x6F55 = 0x954E
-0x6F56 = 0x954F
-0x6F57 = 0x9552
-0x6F58 = 0x9553
-0x6F59 = 0x9554
-0x6F5A = 0x9556
-0x6F5B = 0x9557
-0x6F5C = 0x9558
-0x6F5D = 0x9559
-0x6F5E = 0x955B
-0x6F5F = 0x955E
-0x6F60 = 0x955F
-0x6F61 = 0x955D
-0x6F62 = 0x9561
-0x6F63 = 0x9562
-0x6F64 = 0x9564
-0x6F65 = 0x9565
-0x6F66 = 0x9566
-0x6F67 = 0x9567
-0x6F68 = 0x9568
-0x6F69 = 0x9569
-0x6F6A = 0x956A
-0x6F6B = 0x956B
-0x6F6C = 0x956C
-0x6F6D = 0x956F
-0x6F6E = 0x9571
-0x6F6F = 0x9572
-0x6F70 = 0x9573
-0x6F71 = 0x953A
-0x6F72 = 0x77E7
-0x6F73 = 0x77EC
-0x6F74 = 0x96C9
-0x6F75 = 0x79D5
-0x6F76 = 0x79ED
-0x6F77 = 0x79E3
-0x6F78 = 0x79EB
-0x6F79 = 0x7A06
-0x6F7A = 0x5D47
-0x6F7B = 0x7A03
-0x6F7C = 0x7A02
-0x6F7D = 0x7A1E
-0x6F7E = 0x7A14
-0x7021 = 0x7A39
-0x7022 = 0x7A37
-0x7023 = 0x7A51
-0x7024 = 0x9ECF
-0x7025 = 0x99A5
-0x7026 = 0x7A70
-0x7027 = 0x7688
-0x7028 = 0x768E
-0x7029 = 0x7693
-0x702A = 0x7699
-0x702B = 0x76A4
-0x702C = 0x74DE
-0x702D = 0x74E0
-0x702E = 0x752C
-0x702F = 0x9E20
-0x7030 = 0x9E22
-0x7031 = 0x9E28
-0x7032 = 0x9E29
-0x7033 = 0x9E2A
-0x7034 = 0x9E2B
-0x7035 = 0x9E2C
-0x7036 = 0x9E32
-0x7037 = 0x9E31
-0x7038 = 0x9E36
-0x7039 = 0x9E38
-0x703A = 0x9E37
-0x703B = 0x9E39
-0x703C = 0x9E3A
-0x703D = 0x9E3E
-0x703E = 0x9E41
-0x703F = 0x9E42
-0x7040 = 0x9E44
-0x7041 = 0x9E46
-0x7042 = 0x9E47
-0x7043 = 0x9E48
-0x7044 = 0x9E49
-0x7045 = 0x9E4B
-0x7046 = 0x9E4C
-0x7047 = 0x9E4E
-0x7048 = 0x9E51
-0x7049 = 0x9E55
-0x704A = 0x9E57
-0x704B = 0x9E5A
-0x704C = 0x9E5B
-0x704D = 0x9E5C
-0x704E = 0x9E5E
-0x704F = 0x9E63
-0x7050 = 0x9E66
-0x7051 = 0x9E67
-0x7052 = 0x9E68
-0x7053 = 0x9E69
-0x7054 = 0x9E6A
-0x7055 = 0x9E6B
-0x7056 = 0x9E6C
-0x7057 = 0x9E71
-0x7058 = 0x9E6D
-0x7059 = 0x9E73
-0x705A = 0x7592
-0x705B = 0x7594
-0x705C = 0x7596
-0x705D = 0x75A0
-0x705E = 0x759D
-0x705F = 0x75AC
-0x7060 = 0x75A3
-0x7061 = 0x75B3
-0x7062 = 0x75B4
-0x7063 = 0x75B8
-0x7064 = 0x75C4
-0x7065 = 0x75B1
-0x7066 = 0x75B0
-0x7067 = 0x75C3
-0x7068 = 0x75C2
-0x7069 = 0x75D6
-0x706A = 0x75CD
-0x706B = 0x75E3
-0x706C = 0x75E8
-0x706D = 0x75E6
-0x706E = 0x75E4
-0x706F = 0x75EB
-0x7070 = 0x75E7
-0x7071 = 0x7603
-0x7072 = 0x75F1
-0x7073 = 0x75FC
-0x7074 = 0x75FF
-0x7075 = 0x7610
-0x7076 = 0x7600
-0x7077 = 0x7605
-0x7078 = 0x760C
-0x7079 = 0x7617
-0x707A = 0x760A
-0x707B = 0x7625
-0x707C = 0x7618
-0x707D = 0x7615
-0x707E = 0x7619
-0x7121 = 0x761B
-0x7122 = 0x763C
-0x7123 = 0x7622
-0x7124 = 0x7620
-0x7125 = 0x7640
-0x7126 = 0x762D
-0x7127 = 0x7630
-0x7128 = 0x763F
-0x7129 = 0x7635
-0x712A = 0x7643
-0x712B = 0x763E
-0x712C = 0x7633
-0x712D = 0x764D
-0x712E = 0x765E
-0x712F = 0x7654
-0x7130 = 0x765C
-0x7131 = 0x7656
-0x7132 = 0x766B
-0x7133 = 0x766F
-0x7134 = 0x7FCA
-0x7135 = 0x7AE6
-0x7136 = 0x7A78
-0x7137 = 0x7A79
-0x7138 = 0x7A80
-0x7139 = 0x7A86
-0x713A = 0x7A88
-0x713B = 0x7A95
-0x713C = 0x7AA6
-0x713D = 0x7AA0
-0x713E = 0x7AAC
-0x713F = 0x7AA8
-0x7140 = 0x7AAD
-0x7141 = 0x7AB3
-0x7142 = 0x8864
-0x7143 = 0x8869
-0x7144 = 0x8872
-0x7145 = 0x887D
-0x7146 = 0x887F
-0x7147 = 0x8882
-0x7148 = 0x88A2
-0x7149 = 0x88C6
-0x714A = 0x88B7
-0x714B = 0x88BC
-0x714C = 0x88C9
-0x714D = 0x88E2
-0x714E = 0x88CE
-0x714F = 0x88E3
-0x7150 = 0x88E5
-0x7151 = 0x88F1
-0x7152 = 0x891A
-0x7153 = 0x88FC
-0x7154 = 0x88E8
-0x7155 = 0x88FE
-0x7156 = 0x88F0
-0x7157 = 0x8921
-0x7158 = 0x8919
-0x7159 = 0x8913
-0x715A = 0x891B
-0x715B = 0x890A
-0x715C = 0x8934
-0x715D = 0x892B
-0x715E = 0x8936
-0x715F = 0x8941
-0x7160 = 0x8966
-0x7161 = 0x897B
-0x7162 = 0x758B
-0x7163 = 0x80E5
-0x7164 = 0x76B2
-0x7165 = 0x76B4
-0x7166 = 0x77DC
-0x7167 = 0x8012
-0x7168 = 0x8014
-0x7169 = 0x8016
-0x716A = 0x801C
-0x716B = 0x8020
-0x716C = 0x8022
-0x716D = 0x8025
-0x716E = 0x8026
-0x716F = 0x8027
-0x7170 = 0x8029
-0x7171 = 0x8028
-0x7172 = 0x8031
-0x7173 = 0x800B
-0x7174 = 0x8035
-0x7175 = 0x8043
-0x7176 = 0x8046
-0x7177 = 0x804D
-0x7178 = 0x8052
-0x7179 = 0x8069
-0x717A = 0x8071
-0x717B = 0x8983
-0x717C = 0x9878
-0x717D = 0x9880
-0x717E = 0x9883
-0x7221 = 0x9889
-0x7222 = 0x988C
-0x7223 = 0x988D
-0x7224 = 0x988F
-0x7225 = 0x9894
-0x7226 = 0x989A
-0x7227 = 0x989B
-0x7228 = 0x989E
-0x7229 = 0x989F
-0x722A = 0x98A1
-0x722B = 0x98A2
-0x722C = 0x98A5
-0x722D = 0x98A6
-0x722E = 0x864D
-0x722F = 0x8654
-0x7230 = 0x866C
-0x7231 = 0x866E
-0x7232 = 0x867F
-0x7233 = 0x867A
-0x7234 = 0x867C
-0x7235 = 0x867B
-0x7236 = 0x86A8
-0x7237 = 0x868D
-0x7238 = 0x868B
-0x7239 = 0x86AC
-0x723A = 0x869D
-0x723B = 0x86A7
-0x723C = 0x86A3
-0x723D = 0x86AA
-0x723E = 0x8693
-0x723F = 0x86A9
-0x7240 = 0x86B6
-0x7241 = 0x86C4
-0x7242 = 0x86B5
-0x7243 = 0x86CE
-0x7244 = 0x86B0
-0x7245 = 0x86BA
-0x7246 = 0x86B1
-0x7247 = 0x86AF
-0x7248 = 0x86C9
-0x7249 = 0x86CF
-0x724A = 0x86B4
-0x724B = 0x86E9
-0x724C = 0x86F1
-0x724D = 0x86F2
-0x724E = 0x86ED
-0x724F = 0x86F3
-0x7250 = 0x86D0
-0x7251 = 0x8713
-0x7252 = 0x86DE
-0x7253 = 0x86F4
-0x7254 = 0x86DF
-0x7255 = 0x86D8
-0x7256 = 0x86D1
-0x7257 = 0x8703
-0x7258 = 0x8707
-0x7259 = 0x86F8
-0x725A = 0x8708
-0x725B = 0x870A
-0x725C = 0x870D
-0x725D = 0x8709
-0x725E = 0x8723
-0x725F = 0x873B
-0x7260 = 0x871E
-0x7261 = 0x8725
-0x7262 = 0x872E
-0x7263 = 0x871A
-0x7264 = 0x873E
-0x7265 = 0x8748
-0x7266 = 0x8734
-0x7267 = 0x8731
-0x7268 = 0x8729
-0x7269 = 0x8737
-0x726A = 0x873F
-0x726B = 0x8782
-0x726C = 0x8722
-0x726D = 0x877D
-0x726E = 0x877E
-0x726F = 0x877B
-0x7270 = 0x8760
-0x7271 = 0x8770
-0x7272 = 0x874C
-0x7273 = 0x876E
-0x7274 = 0x878B
-0x7275 = 0x8753
-0x7276 = 0x8763
-0x7277 = 0x877C
-0x7278 = 0x8764
-0x7279 = 0x8759
-0x727A = 0x8765
-0x727B = 0x8793
-0x727C = 0x87AF
-0x727D = 0x87A8
-0x727E = 0x87D2
-0x7321 = 0x87C6
-0x7322 = 0x8788
-0x7323 = 0x8785
-0x7324 = 0x87AD
-0x7325 = 0x8797
-0x7326 = 0x8783
-0x7327 = 0x87AB
-0x7328 = 0x87E5
-0x7329 = 0x87AC
-0x732A = 0x87B5
-0x732B = 0x87B3
-0x732C = 0x87CB
-0x732D = 0x87D3
-0x732E = 0x87BD
-0x732F = 0x87D1
-0x7330 = 0x87C0
-0x7331 = 0x87CA
-0x7332 = 0x87DB
-0x7333 = 0x87EA
-0x7334 = 0x87E0
-0x7335 = 0x87EE
-0x7336 = 0x8816
-0x7337 = 0x8813
-0x7338 = 0x87FE
-0x7339 = 0x880A
-0x733A = 0x881B
-0x733B = 0x8821
-0x733C = 0x8839
-0x733D = 0x883C
-0x733E = 0x7F36
-0x733F = 0x7F42
-0x7340 = 0x7F44
-0x7341 = 0x7F45
-0x7342 = 0x8210
-0x7343 = 0x7AFA
-0x7344 = 0x7AFD
-0x7345 = 0x7B08
-0x7346 = 0x7B03
-0x7347 = 0x7B04
-0x7348 = 0x7B15
-0x7349 = 0x7B0A
-0x734A = 0x7B2B
-0x734B = 0x7B0F
-0x734C = 0x7B47
-0x734D = 0x7B38
-0x734E = 0x7B2A
-0x734F = 0x7B19
-0x7350 = 0x7B2E
-0x7351 = 0x7B31
-0x7352 = 0x7B20
-0x7353 = 0x7B25
-0x7354 = 0x7B24
-0x7355 = 0x7B33
-0x7356 = 0x7B3E
-0x7357 = 0x7B1E
-0x7358 = 0x7B58
-0x7359 = 0x7B5A
-0x735A = 0x7B45
-0x735B = 0x7B75
-0x735C = 0x7B4C
-0x735D = 0x7B5D
-0x735E = 0x7B60
-0x735F = 0x7B6E
-0x7360 = 0x7B7B
-0x7361 = 0x7B62
-0x7362 = 0x7B72
-0x7363 = 0x7B71
-0x7364 = 0x7B90
-0x7365 = 0x7BA6
-0x7366 = 0x7BA7
-0x7367 = 0x7BB8
-0x7368 = 0x7BAC
-0x7369 = 0x7B9D
-0x736A = 0x7BA8
-0x736B = 0x7B85
-0x736C = 0x7BAA
-0x736D = 0x7B9C
-0x736E = 0x7BA2
-0x736F = 0x7BAB
-0x7370 = 0x7BB4
-0x7371 = 0x7BD1
-0x7372 = 0x7BC1
-0x7373 = 0x7BCC
-0x7374 = 0x7BDD
-0x7375 = 0x7BDA
-0x7376 = 0x7BE5
-0x7377 = 0x7BE6
-0x7378 = 0x7BEA
-0x7379 = 0x7C0C
-0x737A = 0x7BFE
-0x737B = 0x7BFC
-0x737C = 0x7C0F
-0x737D = 0x7C16
-0x737E = 0x7C0B
-0x7421 = 0x7C1F
-0x7422 = 0x7C2A
-0x7423 = 0x7C26
-0x7424 = 0x7C38
-0x7425 = 0x7C41
-0x7426 = 0x7C40
-0x7427 = 0x81FE
-0x7428 = 0x8201
-0x7429 = 0x8202
-0x742A = 0x8204
-0x742B = 0x81EC
-0x742C = 0x8844
-0x742D = 0x8221
-0x742E = 0x8222
-0x742F = 0x8223
-0x7430 = 0x822D
-0x7431 = 0x822F
-0x7432 = 0x8228
-0x7433 = 0x822B
-0x7434 = 0x8238
-0x7435 = 0x823B
-0x7436 = 0x8233
-0x7437 = 0x8234
-0x7438 = 0x823E
-0x7439 = 0x8244
-0x743A = 0x8249
-0x743B = 0x824B
-0x743C = 0x824F
-0x743D = 0x825A
-0x743E = 0x825F
-0x743F = 0x8268
-0x7440 = 0x887E
-0x7441 = 0x8885
-0x7442 = 0x8888
-0x7443 = 0x88D8
-0x7444 = 0x88DF
-0x7445 = 0x895E
-0x7446 = 0x7F9D
-0x7447 = 0x7F9F
-0x7448 = 0x7FA7
-0x7449 = 0x7FAF
-0x744A = 0x7FB0
-0x744B = 0x7FB2
-0x744C = 0x7C7C
-0x744D = 0x6549
-0x744E = 0x7C91
-0x744F = 0x7C9D
-0x7450 = 0x7C9C
-0x7451 = 0x7C9E
-0x7452 = 0x7CA2
-0x7453 = 0x7CB2
-0x7454 = 0x7CBC
-0x7455 = 0x7CBD
-0x7456 = 0x7CC1
-0x7457 = 0x7CC7
-0x7458 = 0x7CCC
-0x7459 = 0x7CCD
-0x745A = 0x7CC8
-0x745B = 0x7CC5
-0x745C = 0x7CD7
-0x745D = 0x7CE8
-0x745E = 0x826E
-0x745F = 0x66A8
-0x7460 = 0x7FBF
-0x7461 = 0x7FCE
-0x7462 = 0x7FD5
-0x7463 = 0x7FE5
-0x7464 = 0x7FE1
-0x7465 = 0x7FE6
-0x7466 = 0x7FE9
-0x7467 = 0x7FEE
-0x7468 = 0x7FF3
-0x7469 = 0x7CF8
-0x746A = 0x7D77
-0x746B = 0x7DA6
-0x746C = 0x7DAE
-0x746D = 0x7E47
-0x746E = 0x7E9B
-0x746F = 0x9EB8
-0x7470 = 0x9EB4
-0x7471 = 0x8D73
-0x7472 = 0x8D84
-0x7473 = 0x8D94
-0x7474 = 0x8D91
-0x7475 = 0x8DB1
-0x7476 = 0x8D67
-0x7477 = 0x8D6D
-0x7478 = 0x8C47
-0x7479 = 0x8C49
-0x747A = 0x914A
-0x747B = 0x9150
-0x747C = 0x914E
-0x747D = 0x914F
-0x747E = 0x9164
-0x7521 = 0x9162
-0x7522 = 0x9161
-0x7523 = 0x9170
-0x7524 = 0x9169
-0x7525 = 0x916F
-0x7526 = 0x917D
-0x7527 = 0x917E
-0x7528 = 0x9172
-0x7529 = 0x9174
-0x752A = 0x9179
-0x752B = 0x918C
-0x752C = 0x9185
-0x752D = 0x9190
-0x752E = 0x918D
-0x752F = 0x9191
-0x7530 = 0x91A2
-0x7531 = 0x91A3
-0x7532 = 0x91AA
-0x7533 = 0x91AD
-0x7534 = 0x91AE
-0x7535 = 0x91AF
-0x7536 = 0x91B5
-0x7537 = 0x91B4
-0x7538 = 0x91BA
-0x7539 = 0x8C55
-0x753A = 0x9E7E
-0x753B = 0x8DB8
-0x753C = 0x8DEB
-0x753D = 0x8E05
-0x753E = 0x8E59
-0x753F = 0x8E69
-0x7540 = 0x8DB5
-0x7541 = 0x8DBF
-0x7542 = 0x8DBC
-0x7543 = 0x8DBA
-0x7544 = 0x8DC4
-0x7545 = 0x8DD6
-0x7546 = 0x8DD7
-0x7547 = 0x8DDA
-0x7548 = 0x8DDE
-0x7549 = 0x8DCE
-0x754A = 0x8DCF
-0x754B = 0x8DDB
-0x754C = 0x8DC6
-0x754D = 0x8DEC
-0x754E = 0x8DF7
-0x754F = 0x8DF8
-0x7550 = 0x8DE3
-0x7551 = 0x8DF9
-0x7552 = 0x8DFB
-0x7553 = 0x8DE4
-0x7554 = 0x8E09
-0x7555 = 0x8DFD
-0x7556 = 0x8E14
-0x7557 = 0x8E1D
-0x7558 = 0x8E1F
-0x7559 = 0x8E2C
-0x755A = 0x8E2E
-0x755B = 0x8E23
-0x755C = 0x8E2F
-0x755D = 0x8E3A
-0x755E = 0x8E40
-0x755F = 0x8E39
-0x7560 = 0x8E35
-0x7561 = 0x8E3D
-0x7562 = 0x8E31
-0x7563 = 0x8E49
-0x7564 = 0x8E41
-0x7565 = 0x8E42
-0x7566 = 0x8E51
-0x7567 = 0x8E52
-0x7568 = 0x8E4A
-0x7569 = 0x8E70
-0x756A = 0x8E76
-0x756B = 0x8E7C
-0x756C = 0x8E6F
-0x756D = 0x8E74
-0x756E = 0x8E85
-0x756F = 0x8E8F
-0x7570 = 0x8E94
-0x7571 = 0x8E90
-0x7572 = 0x8E9C
-0x7573 = 0x8E9E
-0x7574 = 0x8C78
-0x7575 = 0x8C82
-0x7576 = 0x8C8A
-0x7577 = 0x8C85
-0x7578 = 0x8C98
-0x7579 = 0x8C94
-0x757A = 0x659B
-0x757B = 0x89D6
-0x757C = 0x89DE
-0x757D = 0x89DA
-0x757E = 0x89DC
-0x7621 = 0x89E5
-0x7622 = 0x89EB
-0x7623 = 0x89EF
-0x7624 = 0x8A3E
-0x7625 = 0x8B26
-0x7626 = 0x9753
-0x7627 = 0x96E9
-0x7628 = 0x96F3
-0x7629 = 0x96EF
-0x762A = 0x9706
-0x762B = 0x9701
-0x762C = 0x9708
-0x762D = 0x970F
-0x762E = 0x970E
-0x762F = 0x972A
-0x7630 = 0x972D
-0x7631 = 0x9730
-0x7632 = 0x973E
-0x7633 = 0x9F80
-0x7634 = 0x9F83
-0x7635 = 0x9F85
-0x7636 = 0x9F86
-0x7637 = 0x9F87
-0x7638 = 0x9F88
-0x7639 = 0x9F89
-0x763A = 0x9F8A
-0x763B = 0x9F8C
-0x763C = 0x9EFE
-0x763D = 0x9F0B
-0x763E = 0x9F0D
-0x763F = 0x96B9
-0x7640 = 0x96BC
-0x7641 = 0x96BD
-0x7642 = 0x96CE
-0x7643 = 0x96D2
-0x7644 = 0x77BF
-0x7645 = 0x96E0
-0x7646 = 0x928E
-0x7647 = 0x92AE
-0x7648 = 0x92C8
-0x7649 = 0x933E
-0x764A = 0x936A
-0x764B = 0x93CA
-0x764C = 0x938F
-0x764D = 0x943E
-0x764E = 0x946B
-0x764F = 0x9C7F
-0x7650 = 0x9C82
-0x7651 = 0x9C85
-0x7652 = 0x9C86
-0x7653 = 0x9C87
-0x7654 = 0x9C88
-0x7655 = 0x7A23
-0x7656 = 0x9C8B
-0x7657 = 0x9C8E
-0x7658 = 0x9C90
-0x7659 = 0x9C91
-0x765A = 0x9C92
-0x765B = 0x9C94
-0x765C = 0x9C95
-0x765D = 0x9C9A
-0x765E = 0x9C9B
-0x765F = 0x9C9E
-0x7660 = 0x9C9F
-0x7661 = 0x9CA0
-0x7662 = 0x9CA1
-0x7663 = 0x9CA2
-0x7664 = 0x9CA3
-0x7665 = 0x9CA5
-0x7666 = 0x9CA6
-0x7667 = 0x9CA7
-0x7668 = 0x9CA8
-0x7669 = 0x9CA9
-0x766A = 0x9CAB
-0x766B = 0x9CAD
-0x766C = 0x9CAE
-0x766D = 0x9CB0
-0x766E = 0x9CB1
-0x766F = 0x9CB2
-0x7670 = 0x9CB3
-0x7671 = 0x9CB4
-0x7672 = 0x9CB5
-0x7673 = 0x9CB6
-0x7674 = 0x9CB7
-0x7675 = 0x9CBA
-0x7676 = 0x9CBB
-0x7677 = 0x9CBC
-0x7678 = 0x9CBD
-0x7679 = 0x9CC4
-0x767A = 0x9CC5
-0x767B = 0x9CC6
-0x767C = 0x9CC7
-0x767D = 0x9CCA
-0x767E = 0x9CCB
-0x7721 = 0x9CCC
-0x7722 = 0x9CCD
-0x7723 = 0x9CCE
-0x7724 = 0x9CCF
-0x7725 = 0x9CD0
-0x7726 = 0x9CD3
-0x7727 = 0x9CD4
-0x7728 = 0x9CD5
-0x7729 = 0x9CD7
-0x772A = 0x9CD8
-0x772B = 0x9CD9
-0x772C = 0x9CDC
-0x772D = 0x9CDD
-0x772E = 0x9CDF
-0x772F = 0x9CE2
-0x7730 = 0x977C
-0x7731 = 0x9785
-0x7732 = 0x9791
-0x7733 = 0x9792
-0x7734 = 0x9794
-0x7735 = 0x97AF
-0x7736 = 0x97AB
-0x7737 = 0x97A3
-0x7738 = 0x97B2
-0x7739 = 0x97B4
-0x773A = 0x9AB1
-0x773B = 0x9AB0
-0x773C = 0x9AB7
-0x773D = 0x9E58
-0x773E = 0x9AB6
-0x773F = 0x9ABA
-0x7740 = 0x9ABC
-0x7741 = 0x9AC1
-0x7742 = 0x9AC0
-0x7743 = 0x9AC5
-0x7744 = 0x9AC2
-0x7745 = 0x9ACB
-0x7746 = 0x9ACC
-0x7747 = 0x9AD1
-0x7748 = 0x9B45
-0x7749 = 0x9B43
-0x774A = 0x9B47
-0x774B = 0x9B49
-0x774C = 0x9B48
-0x774D = 0x9B4D
-0x774E = 0x9B51
-0x774F = 0x98E8
-0x7750 = 0x990D
-0x7751 = 0x992E
-0x7752 = 0x9955
-0x7753 = 0x9954
-0x7754 = 0x9ADF
-0x7755 = 0x9AE1
-0x7756 = 0x9AE6
-0x7757 = 0x9AEF
-0x7758 = 0x9AEB
-0x7759 = 0x9AFB
-0x775A = 0x9AED
-0x775B = 0x9AF9
-0x775C = 0x9B08
-0x775D = 0x9B0F
-0x775E = 0x9B13
-0x775F = 0x9B1F
-0x7760 = 0x9B23
-0x7761 = 0x9EBD
-0x7762 = 0x9EBE
-0x7763 = 0x7E3B
-0x7764 = 0x9E82
-0x7765 = 0x9E87
-0x7766 = 0x9E88
-0x7767 = 0x9E8B
-0x7768 = 0x9E92
-0x7769 = 0x93D6
-0x776A = 0x9E9D
-0x776B = 0x9E9F
-0x776C = 0x9EDB
-0x776D = 0x9EDC
-0x776E = 0x9EDD
-0x776F = 0x9EE0
-0x7770 = 0x9EDF
-0x7771 = 0x9EE2
-0x7772 = 0x9EE9
-0x7773 = 0x9EE7
-0x7774 = 0x9EE5
-0x7775 = 0x9EEA
-0x7776 = 0x9EEF
-0x7777 = 0x9F22
-0x7778 = 0x9F2C
-0x7779 = 0x9F2F
-0x777A = 0x9F39
-0x777B = 0x9F37
-0x777C = 0x9F3D
-0x777D = 0x9F3E
-0x777E = 0x9F44
-END_MAP
diff --git a/enc/trans/GB/UCS%GB12345.src b/enc/trans/GB/UCS%GB12345.src
deleted file mode 100644
index 8ec8318438..0000000000
--- a/enc/trans/GB/UCS%GB12345.src
+++ /dev/null
@@ -1,7620 +0,0 @@
-# $NetBSD: UCS%GB12345.src,v 1.1 2006/11/23 03:25:24 tnozaki Exp $
-
-TYPE ROWCOL
-NAME "UCS/GB12345"
-SRC_ZONE 0x00A4 - 0xFFE5
-OOB_MODE INVALID
-DST_INVALID 0xFFFF
-DST_UNIT_BITS 16
-
-BEGIN_MAP
-#
-# This mapping data is made from the mapping data provided by Unicode, Inc.
-# Original notice:
-#
-# Name: GB12345-80 to Unicode table (complete, hex format)
-# Unicode version: 1.1
-# Table version: 0.0d1
-# Table format: Format A
-# Date: 6 December 1993
-# Author: Glenn Adams <glenn@metis.com>
-# John H. Jenkins <John_Jenkins@taligent.com>
-#
-# Copyright (c) 1991-1994 Unicode, Inc. All Rights reserved.
-#
-# This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
-# No claims are made as to fitness for any particular purpose. No
-# warranties of any kind are expressed or implied. The recipient
-# agrees to determine applicability of information provided. If this
-# file has been provided on magnetic media by Unicode, Inc., the sole
-# remedy for any claim will be exchange of defective media within 90
-# days of receipt.
-#
-# Recipient is granted the right to make copies in any form for
-# internal distribution and to freely use the information supplied
-# in the creation of products supporting Unicode. Unicode, Inc.
-# specifically excludes the right to re-distribute this file directly
-# to third parties or other organizations whether for profit or not.
-#
-# General notes:
-#
-# This table contains the data Metis and Taligent currently have on how
-# GB12345-90 characters map into Unicode.
-#
-# Format: Three tab-separated columns
-# Column #1 is the GB12345 code (in hex as 0xXXXX)
-# Column #2 is the Unicode (in hex as 0xXXXX)
-# Column #3 the Unicode name (follows a comment sign, '#')
-# The official names for Unicode characters U+4E00
-# to U+9FA5, inclusive, is "CJK UNIFIED IDEOGRAPH-XXXX",
-# where XXXX is the code point. Including all these
-# names in this file increases its size substantially
-# and needlessly. The token "<CJK>" is used for the
-# name of these characters. If necessary, it can be
-# expanded algorithmically by a parser or editor.
-#
-# The entries are in GB12345 order
-#
-# The following algorithms can be used to change the hex form
-# of GB12345 to other standard forms:
-#
-# To change hex to EUC form, add 0x8080
-# To change hex to kuten form, first subtract 0x2020. Then
-# the high and low bytes correspond to the ku and ten of
-# the kuten form. For example, 0x2121 -> 0x0101 -> 0101;
-# 0x777E -> 0x575E -> 8794
-#
-# Any comments or problems, contact <John_Jenkins@taligent.com>
-#
-#
-0x00A4 = 0x2168
-0x00A7 = 0x216C
-0x00A8 = 0x2127
-0x00B0 = 0x2163
-0x00B1 = 0x2140
-0x00B7 = 0x2124
-0x00D7 = 0x2141
-0x00E0 = 0x2824
-0x00E1 = 0x2822
-0x00E8 = 0x2828
-0x00E9 = 0x2826
-0x00EA = 0x283A
-0x00EC = 0x282C
-0x00ED = 0x282A
-0x00F2 = 0x2830
-0x00F3 = 0x282E
-0x00F7 = 0x2142
-0x00F9 = 0x2834
-0x00FA = 0x2832
-0x00FC = 0x2839
-0x0101 = 0x2821
-0x0113 = 0x2825
-0x011B = 0x2827
-0x012B = 0x2829
-0x014D = 0x282D
-0x016B = 0x2831
-0x01CE = 0x2823
-0x01D0 = 0x282B
-0x01D2 = 0x282F
-0x01D4 = 0x2833
-0x01D6 = 0x2835
-0x01D8 = 0x2836
-0x01DA = 0x2837
-0x01DC = 0x2838
-0x02C7 = 0x2126
-0x02C9 = 0x2125
-0x0391 = 0x2621
-0x0392 = 0x2622
-0x0393 = 0x2623
-0x0394 = 0x2624
-0x0395 = 0x2625
-0x0396 = 0x2626
-0x0397 = 0x2627
-0x0398 = 0x2628
-0x0399 = 0x2629
-0x039A = 0x262A
-0x039B = 0x262B
-0x039C = 0x262C
-0x039D = 0x262D
-0x039E = 0x262E
-0x039F = 0x262F
-0x03A0 = 0x2630
-0x03A1 = 0x2631
-0x03A3 = 0x2632
-0x03A4 = 0x2633
-0x03A5 = 0x2634
-0x03A6 = 0x2635
-0x03A7 = 0x2636
-0x03A8 = 0x2637
-0x03A9 = 0x2638
-0x03B1 = 0x2641
-0x03B2 = 0x2642
-0x03B3 = 0x2643
-0x03B4 = 0x2644
-0x03B5 = 0x2645
-0x03B6 = 0x2646
-0x03B7 = 0x2647
-0x03B8 = 0x2648
-0x03B9 = 0x2649
-0x03BA = 0x264A
-0x03BB = 0x264B
-0x03BC = 0x264C
-0x03BD = 0x264D
-0x03BE = 0x264E
-0x03BF = 0x264F
-0x03C0 = 0x2650
-0x03C1 = 0x2651
-0x03C3 = 0x2652
-0x03C4 = 0x2653
-0x03C5 = 0x2654
-0x03C6 = 0x2655
-0x03C7 = 0x2656
-0x03C8 = 0x2657
-0x03C9 = 0x2658
-0x0401 = 0x2727
-0x0410 = 0x2721
-0x0411 = 0x2722
-0x0412 = 0x2723
-0x0413 = 0x2724
-0x0414 = 0x2725
-0x0415 = 0x2726
-0x0416 = 0x2728
-0x0417 = 0x2729
-0x0418 = 0x272A
-0x0419 = 0x272B
-0x041A = 0x272C
-0x041B = 0x272D
-0x041C = 0x272E
-0x041D = 0x272F
-0x041E = 0x2730
-0x041F = 0x2731
-0x0420 = 0x2732
-0x0421 = 0x2733
-0x0422 = 0x2734
-0x0423 = 0x2735
-0x0424 = 0x2736
-0x0425 = 0x2737
-0x0426 = 0x2738
-0x0427 = 0x2739
-0x0428 = 0x273A
-0x0429 = 0x273B
-0x042A = 0x273C
-0x042B = 0x273D
-0x042C = 0x273E
-0x042D = 0x273F
-0x042E = 0x2740
-0x042F = 0x2741
-0x0430 = 0x2751
-0x0431 = 0x2752
-0x0432 = 0x2753
-0x0433 = 0x2754
-0x0434 = 0x2755
-0x0435 = 0x2756
-0x0436 = 0x2758
-0x0437 = 0x2759
-0x0438 = 0x275A
-0x0439 = 0x275B
-0x043A = 0x275C
-0x043B = 0x275D
-0x043C = 0x275E
-0x043D = 0x275F
-0x043E = 0x2760
-0x043F = 0x2761
-0x0440 = 0x2762
-0x0441 = 0x2763
-0x0442 = 0x2764
-0x0443 = 0x2765
-0x0444 = 0x2766
-0x0445 = 0x2767
-0x0446 = 0x2768
-0x0447 = 0x2769
-0x0448 = 0x276A
-0x0449 = 0x276B
-0x044A = 0x276C
-0x044B = 0x276D
-0x044C = 0x276E
-0x044D = 0x276F
-0x044E = 0x2770
-0x044F = 0x2771
-0x0451 = 0x2757
-0x2014 = 0x212A
-0x2015 = 0x212A # fallback -> 0x2014
-0x2016 = 0x212C
-0x2018 = 0x212E
-0x2019 = 0x212F
-0x201C = 0x2130
-0x201D = 0x2131
-0x2026 = 0x212D
-0x2030 = 0x216B
-0x2032 = 0x2164
-0x2033 = 0x2165
-0x203B = 0x2179
-0x2103 = 0x2166
-0x2116 = 0x216D
-0x2160 = 0x2271
-0x2161 = 0x2272
-0x2162 = 0x2273
-0x2163 = 0x2274
-0x2164 = 0x2275
-0x2165 = 0x2276
-0x2166 = 0x2277
-0x2167 = 0x2278
-0x2168 = 0x2279
-0x2169 = 0x227A
-0x216A = 0x227B
-0x216B = 0x227C
-0x2190 = 0x217B
-0x2191 = 0x217C
-0x2192 = 0x217A
-0x2193 = 0x217D
-0x2208 = 0x214A
-0x220F = 0x2147
-0x2211 = 0x2146
-0x221A = 0x214C
-0x221D = 0x2158
-0x221E = 0x215E
-0x2220 = 0x214F
-0x2225 = 0x214E
-0x2227 = 0x2144
-0x2228 = 0x2145
-0x2229 = 0x2149
-0x222A = 0x2148
-0x222B = 0x2152
-0x222E = 0x2153
-0x2234 = 0x2160
-0x2235 = 0x215F
-0x2236 = 0x2143
-0x2237 = 0x214B
-0x223D = 0x2157
-0x2248 = 0x2156
-0x224C = 0x2155
-0x2260 = 0x2159
-0x2261 = 0x2154
-0x2264 = 0x215C
-0x2265 = 0x215D
-0x226E = 0x215A
-0x226F = 0x215B
-0x2299 = 0x2151
-0x22A5 = 0x214D
-0x2312 = 0x2150
-0x2460 = 0x2259
-0x2461 = 0x225A
-0x2462 = 0x225B
-0x2463 = 0x225C
-0x2464 = 0x225D
-0x2465 = 0x225E
-0x2466 = 0x225F
-0x2467 = 0x2260
-0x2468 = 0x2261
-0x2469 = 0x2262
-0x2474 = 0x2245
-0x2475 = 0x2246
-0x2476 = 0x2247
-0x2477 = 0x2248
-0x2478 = 0x2249
-0x2479 = 0x224A
-0x247A = 0x224B
-0x247B = 0x224C
-0x247C = 0x224D
-0x247D = 0x224E
-0x247E = 0x224F
-0x247F = 0x2250
-0x2480 = 0x2251
-0x2481 = 0x2252
-0x2482 = 0x2253
-0x2483 = 0x2254
-0x2484 = 0x2255
-0x2485 = 0x2256
-0x2486 = 0x2257
-0x2487 = 0x2258
-0x2488 = 0x2231
-0x2489 = 0x2232
-0x248A = 0x2233
-0x248B = 0x2234
-0x248C = 0x2235
-0x248D = 0x2236
-0x248E = 0x2237
-0x248F = 0x2238
-0x2490 = 0x2239
-0x2491 = 0x223A
-0x2492 = 0x223B
-0x2493 = 0x223C
-0x2494 = 0x223D
-0x2495 = 0x223E
-0x2496 = 0x223F
-0x2497 = 0x2240
-0x2498 = 0x2241
-0x2499 = 0x2242
-0x249A = 0x2243
-0x249B = 0x2244
-0x2500 = 0x2924
-0x2501 = 0x2925
-0x2502 = 0x2926
-0x2503 = 0x2927
-0x2504 = 0x2928
-0x2505 = 0x2929
-0x2506 = 0x292A
-0x2507 = 0x292B
-0x2508 = 0x292C
-0x2509 = 0x292D
-0x250A = 0x292E
-0x250B = 0x292F
-0x250C = 0x2930
-0x250D = 0x2931
-0x250E = 0x2932
-0x250F = 0x2933
-0x2510 = 0x2934
-0x2511 = 0x2935
-0x2512 = 0x2936
-0x2513 = 0x2937
-0x2514 = 0x2938
-0x2515 = 0x2939
-0x2516 = 0x293A
-0x2517 = 0x293B
-0x2518 = 0x293C
-0x2519 = 0x293D
-0x251A = 0x293E
-0x251B = 0x293F
-0x251C = 0x2940
-0x251D = 0x2941
-0x251E = 0x2942
-0x251F = 0x2943
-0x2520 = 0x2944
-0x2521 = 0x2945
-0x2522 = 0x2946
-0x2523 = 0x2947
-0x2524 = 0x2948
-0x2525 = 0x2949
-0x2526 = 0x294A
-0x2527 = 0x294B
-0x2528 = 0x294C
-0x2529 = 0x294D
-0x252A = 0x294E
-0x252B = 0x294F
-0x252C = 0x2950
-0x252D = 0x2951
-0x252E = 0x2952
-0x252F = 0x2953
-0x2530 = 0x2954
-0x2531 = 0x2955
-0x2532 = 0x2956
-0x2533 = 0x2957
-0x2534 = 0x2958
-0x2535 = 0x2959
-0x2536 = 0x295A
-0x2537 = 0x295B
-0x2538 = 0x295C
-0x2539 = 0x295D
-0x253A = 0x295E
-0x253B = 0x295F
-0x253C = 0x2960
-0x253D = 0x2961
-0x253E = 0x2962
-0x253F = 0x2963
-0x2540 = 0x2964
-0x2541 = 0x2965
-0x2542 = 0x2966
-0x2543 = 0x2967
-0x2544 = 0x2968
-0x2545 = 0x2969
-0x2546 = 0x296A
-0x2547 = 0x296B
-0x2548 = 0x296C
-0x2549 = 0x296D
-0x254A = 0x296E
-0x254B = 0x296F
-0x25A0 = 0x2176
-0x25A1 = 0x2175
-0x25B2 = 0x2178
-0x25B3 = 0x2177
-0x25C6 = 0x2174
-0x25C7 = 0x2173
-0x25CB = 0x2170
-0x25CE = 0x2172
-0x25CF = 0x2171
-0x2605 = 0x216F
-0x2606 = 0x216E
-0x2640 = 0x2162
-0x2642 = 0x2161
-0x3000 = 0x2121
-0x3001 = 0x2122
-0x3002 = 0x2123
-0x3003 = 0x2128
-0x3005 = 0x2129
-0x3008 = 0x2134
-0x3009 = 0x2135
-0x300A = 0x2136
-0x300B = 0x2137
-0x300C = 0x2138
-0x300D = 0x2139
-0x300E = 0x213A
-0x300F = 0x213B
-0x3010 = 0x213E
-0x3011 = 0x213F
-0x3013 = 0x217E
-0x3014 = 0x2132
-0x3015 = 0x2133
-0x3016 = 0x213C
-0x3017 = 0x213D
-0x3041 = 0x2421
-0x3042 = 0x2422
-0x3043 = 0x2423
-0x3044 = 0x2424
-0x3045 = 0x2425
-0x3046 = 0x2426
-0x3047 = 0x2427
-0x3048 = 0x2428
-0x3049 = 0x2429
-0x304A = 0x242A
-0x304B = 0x242B
-0x304C = 0x242C
-0x304D = 0x242D
-0x304E = 0x242E
-0x304F = 0x242F
-0x3050 = 0x2430
-0x3051 = 0x2431
-0x3052 = 0x2432
-0x3053 = 0x2433
-0x3054 = 0x2434
-0x3055 = 0x2435
-0x3056 = 0x2436
-0x3057 = 0x2437
-0x3058 = 0x2438
-0x3059 = 0x2439
-0x305A = 0x243A
-0x305B = 0x243B
-0x305C = 0x243C
-0x305D = 0x243D
-0x305E = 0x243E
-0x305F = 0x243F
-0x3060 = 0x2440
-0x3061 = 0x2441
-0x3062 = 0x2442
-0x3063 = 0x2443
-0x3064 = 0x2444
-0x3065 = 0x2445
-0x3066 = 0x2446
-0x3067 = 0x2447
-0x3068 = 0x2448
-0x3069 = 0x2449
-0x306A = 0x244A
-0x306B = 0x244B
-0x306C = 0x244C
-0x306D = 0x244D
-0x306E = 0x244E
-0x306F = 0x244F
-0x3070 = 0x2450
-0x3071 = 0x2451
-0x3072 = 0x2452
-0x3073 = 0x2453
-0x3074 = 0x2454
-0x3075 = 0x2455
-0x3076 = 0x2456
-0x3077 = 0x2457
-0x3078 = 0x2458
-0x3079 = 0x2459
-0x307A = 0x245A
-0x307B = 0x245B
-0x307C = 0x245C
-0x307D = 0x245D
-0x307E = 0x245E
-0x307F = 0x245F
-0x3080 = 0x2460
-0x3081 = 0x2461
-0x3082 = 0x2462
-0x3083 = 0x2463
-0x3084 = 0x2464
-0x3085 = 0x2465
-0x3086 = 0x2466
-0x3087 = 0x2467
-0x3088 = 0x2468
-0x3089 = 0x2469
-0x308A = 0x246A
-0x308B = 0x246B
-0x308C = 0x246C
-0x308D = 0x246D
-0x308E = 0x246E
-0x308F = 0x246F
-0x3090 = 0x2470
-0x3091 = 0x2471
-0x3092 = 0x2472
-0x3093 = 0x2473
-0x30A1 = 0x2521
-0x30A2 = 0x2522
-0x30A3 = 0x2523
-0x30A4 = 0x2524
-0x30A5 = 0x2525
-0x30A6 = 0x2526
-0x30A7 = 0x2527
-0x30A8 = 0x2528
-0x30A9 = 0x2529
-0x30AA = 0x252A
-0x30AB = 0x252B
-0x30AC = 0x252C
-0x30AD = 0x252D
-0x30AE = 0x252E
-0x30AF = 0x252F
-0x30B0 = 0x2530
-0x30B1 = 0x2531
-0x30B2 = 0x2532
-0x30B3 = 0x2533
-0x30B4 = 0x2534
-0x30B5 = 0x2535
-0x30B6 = 0x2536
-0x30B7 = 0x2537
-0x30B8 = 0x2538
-0x30B9 = 0x2539
-0x30BA = 0x253A
-0x30BB = 0x253B
-0x30BC = 0x253C
-0x30BD = 0x253D
-0x30BE = 0x253E
-0x30BF = 0x253F
-0x30C0 = 0x2540
-0x30C1 = 0x2541
-0x30C2 = 0x2542
-0x30C3 = 0x2543
-0x30C4 = 0x2544
-0x30C5 = 0x2545
-0x30C6 = 0x2546
-0x30C7 = 0x2547
-0x30C8 = 0x2548
-0x30C9 = 0x2549
-0x30CA = 0x254A
-0x30CB = 0x254B
-0x30CC = 0x254C
-0x30CD = 0x254D
-0x30CE = 0x254E
-0x30CF = 0x254F
-0x30D0 = 0x2550
-0x30D1 = 0x2551
-0x30D2 = 0x2552
-0x30D3 = 0x2553
-0x30D4 = 0x2554
-0x30D5 = 0x2555
-0x30D6 = 0x2556
-0x30D7 = 0x2557
-0x30D8 = 0x2558
-0x30D9 = 0x2559
-0x30DA = 0x255A
-0x30DB = 0x255B
-0x30DC = 0x255C
-0x30DD = 0x255D
-0x30DE = 0x255E
-0x30DF = 0x255F
-0x30E0 = 0x2560
-0x30E1 = 0x2561
-0x30E2 = 0x2562
-0x30E3 = 0x2563
-0x30E4 = 0x2564
-0x30E5 = 0x2565
-0x30E6 = 0x2566
-0x30E7 = 0x2567
-0x30E8 = 0x2568
-0x30E9 = 0x2569
-0x30EA = 0x256A
-0x30EB = 0x256B
-0x30EC = 0x256C
-0x30ED = 0x256D
-0x30EE = 0x256E
-0x30EF = 0x256F
-0x30F0 = 0x2570
-0x30F1 = 0x2571
-0x30F2 = 0x2572
-0x30F3 = 0x2573
-0x30F4 = 0x2574
-0x30F5 = 0x2575
-0x30F6 = 0x2576
-0x30FB = 0x2124 # fallback -> 0x00B7
-0x3105 = 0x2845
-0x3106 = 0x2846
-0x3107 = 0x2847
-0x3108 = 0x2848
-0x3109 = 0x2849
-0x310A = 0x284A
-0x310B = 0x284B
-0x310C = 0x284C
-0x310D = 0x284D
-0x310E = 0x284E
-0x310F = 0x284F
-0x3110 = 0x2850
-0x3111 = 0x2851
-0x3112 = 0x2852
-0x3113 = 0x2853
-0x3114 = 0x2854
-0x3115 = 0x2855
-0x3116 = 0x2856
-0x3117 = 0x2857
-0x3118 = 0x2858
-0x3119 = 0x2859
-0x311A = 0x285A
-0x311B = 0x285B
-0x311C = 0x285C
-0x311D = 0x285D
-0x311E = 0x285E
-0x311F = 0x285F
-0x3120 = 0x2860
-0x3121 = 0x2861
-0x3122 = 0x2862
-0x3123 = 0x2863
-0x3124 = 0x2864
-0x3125 = 0x2865
-0x3126 = 0x2866
-0x3127 = 0x2867
-0x3128 = 0x2868
-0x3129 = 0x2869
-0x3220 = 0x2265
-0x3221 = 0x2266
-0x3222 = 0x2267
-0x3223 = 0x2268
-0x3224 = 0x2269
-0x3225 = 0x226A
-0x3226 = 0x226B
-0x3227 = 0x226C
-0x3228 = 0x226D
-0x3229 = 0x226E
-0x4E00 = 0x523B
-0x4E01 = 0x3621
-0x4E03 = 0x465F
-0x4E07 = 0x7871
-0x4E08 = 0x5549
-0x4E09 = 0x487D
-0x4E0A = 0x494F
-0x4E0B = 0x4F42
-0x4E0C = 0x5822
-0x4E0D = 0x323B
-0x4E10 = 0x5824
-0x4E11 = 0x7829
-0x4E14 = 0x4752
-0x4E15 = 0x5827
-0x4E16 = 0x4A40
-0x4E18 = 0x4770
-0x4E19 = 0x317B
-0x4E1E = 0x5829
-0x4E22 = 0x362A
-0x4E28 = 0x582D
-0x4E2B = 0x513E
-0x4E2C = 0x635C
-0x4E2D = 0x5650
-0x4E30 = 0x7833
-0x4E32 = 0x342E
-0x4E36 = 0x583C
-0x4E38 = 0x4D68
-0x4E39 = 0x3524
-0x4E3B = 0x5677
-0x4E3F = 0x582F
-0x4E43 = 0x444B
-0x4E45 = 0x3E43
-0x4E47 = 0x5831
-0x4E48 = 0x7761
-0x4E4B = 0x562E
-0x4E4D = 0x5527
-0x4E4E = 0x3A75
-0x4E4F = 0x3726
-0x4E52 = 0x4639
-0x4E53 = 0x4552
-0x4E56 = 0x3954
-0x4E58 = 0x334B
-0x4E59 = 0x5252
-0x4E5C = 0x583F
-0x4E5D = 0x3E45
-0x4E5E = 0x4672
-0x4E5F = 0x5232
-0x4E69 = 0x5840
-0x4E73 = 0x4869
-0x4E7E = 0x472C
-0x4E82 = 0x4252
-0x4E86 = 0x414B
-0x4E88 = 0x5368
-0x4E8B = 0x4A42
-0x4E8C = 0x367E
-0x4E8D = 0x5821
-0x4E8E = 0x535A
-0x4E91 = 0x787D
-0x4E92 = 0x3B25
-0x4E93 = 0x5841
-0x4E94 = 0x4E65
-0x4E95 = 0x3E2E
-0x4E98 = 0x5828
-0x4E9B = 0x5029
-0x4E9E = 0x5147
-0x4E9F = 0x583D
-0x4EA0 = 0x596F
-0x4EA1 = 0x4D76
-0x4EA2 = 0x3F3A
-0x4EA4 = 0x3D3B
-0x4EA5 = 0x3A25
-0x4EA6 = 0x5260
-0x4EA8 = 0x3A60
-0x4EAB = 0x4F6D
-0x4EAC = 0x3E29
-0x4EAD = 0x4D24
-0x4EAE = 0x4141
-0x4EB3 = 0x5971
-0x4EBA = 0x484B
-0x4EBB = 0x5869
-0x4EC0 = 0x4A32
-0x4EC1 = 0x484A
-0x4EC2 = 0x586C
-0x4EC3 = 0x586A
-0x4EC4 = 0x5846
-0x4EC6 = 0x785F
-0x4EC7 = 0x3370
-0x4EC9 = 0x586B
-0x4ECA = 0x3D71
-0x4ECB = 0x3D69
-0x4ECD = 0x4854
-0x4ED4 = 0x5750
-0x4ED5 = 0x4A4B
-0x4ED6 = 0x4B7B
-0x4ED7 = 0x554C
-0x4ED8 = 0x3836
-0x4ED9 = 0x4F49
-0x4EDD = 0x595A
-0x4EDE = 0x5870
-0x4EDF = 0x472A
-0x4EE1 = 0x586E
-0x4EE3 = 0x347A
-0x4EE4 = 0x416E
-0x4EE5 = 0x5254
-0x4EE8 = 0x586D
-0x4EEB = 0x586F
-0x4EF0 = 0x5176
-0x4EF2 = 0x5659
-0x4EF3 = 0x5872
-0x4EF5 = 0x5875
-0x4EF6 = 0x3C7E
-0x4EF7 = 0x7842
-0x4EFB = 0x484E
-0x4EFD = 0x375D
-0x4EFF = 0x3742
-0x4F01 = 0x4673
-0x4F09 = 0x5878
-0x4F0A = 0x5241
-0x4F0D = 0x4E69
-0x4F0E = 0x3C3F
-0x4F0F = 0x377C
-0x4F10 = 0x3725
-0x4F11 = 0x505D
-0x4F19 = 0x3B6F
-0x4F22 = 0x5873
-0x4F2F = 0x322E
-0x4F30 = 0x3940
-0x4F32 = 0x5923
-0x4F34 = 0x3069
-0x4F36 = 0x4166
-0x4F38 = 0x496C
-0x4F3A = 0x4B45
-0x4F3C = 0x4B46
-0x4F3D = 0x5924
-0x4F43 = 0x3568
-0x4F46 = 0x352B
-0x4F47 = 0x5879
-0x4F4D = 0x4E3B
-0x4F4E = 0x354D
-0x4F4F = 0x5721
-0x4F50 = 0x5774
-0x4F51 = 0x5353
-0x4F55 = 0x3A4E
-0x4F57 = 0x5922
-0x4F58 = 0x595C
-0x4F59 = 0x6245
-0x4F5A = 0x587D
-0x4F5B = 0x3770
-0x4F5C = 0x5777
-0x4F5D = 0x587E
-0x4F5E = 0x587A
-0x4F5F = 0x5921
-0x4F60 = 0x4463
-0x4F64 = 0x5874
-0x4F67 = 0x587B
-0x4F69 = 0x4565
-0x4F6C = 0x4050
-0x4F6F = 0x5170
-0x4F70 = 0x305B
-0x4F73 = 0x3C51
-0x4F74 = 0x5926
-0x4F76 = 0x5925
-0x4F7B = 0x592C
-0x4F7C = 0x592E
-0x4F7E = 0x592B
-0x4F7F = 0x4A39
-0x4F83 = 0x5929
-0x4F84 = 0x5636
-0x4F86 = 0x4034
-0x4F88 = 0x335E
-0x4F89 = 0x5928
-0x4F8B = 0x407D
-0x4F8D = 0x4A4C
-0x4F8F = 0x592A
-0x4F91 = 0x5927
-0x4F94 = 0x5930
-0x4F96 = 0x4258
-0x4F97 = 0x3631
-0x4F9B = 0x3929
-0x4F9D = 0x5240
-0x4FA3 = 0x4242
-0x4FAE = 0x4E6A
-0x4FAF = 0x3A6E
-0x4FB5 = 0x4756
-0x4FBF = 0x3163
-0x4FC2 = 0x7872
-0x4FC3 = 0x3459
-0x4FC4 = 0x366D
-0x4FC5 = 0x5934
-0x4FCA = 0x3F21
-0x4FCE = 0x595E
-0x4FCF = 0x474E
-0x4FD0 = 0x407E
-0x4FD1 = 0x5938
-0x4FD7 = 0x4B57
-0x4FD8 = 0x377D
-0x4FDA = 0x5935
-0x4FDC = 0x5937
-0x4FDD = 0x3123
-0x4FDE = 0x5361
-0x4FDF = 0x5939
-0x4FE0 = 0x4F40
-0x4FE1 = 0x5045
-0x4FE3 = 0x5936
-0x4FEE = 0x505E
-0x4FEF = 0x3829
-0x4FF1 = 0x3E63
-0x4FF3 = 0x593D
-0x4FF8 = 0x593A
-0x4FFA = 0x3033
-0x4FFE = 0x5942
-0x5000 = 0x5876
-0x5006 = 0x4129
-0x5009 = 0x3256
-0x500B = 0x3876
-0x500C = 0x5944
-0x500D = 0x3136
-0x500F = 0x593F
-0x5011 = 0x4347
-0x5012 = 0x3539
-0x5014 = 0x3E73
-0x5018 = 0x4C48
-0x5019 = 0x3A72
-0x501A = 0x5250
-0x501C = 0x5943
-0x501F = 0x3D68
-0x5021 = 0x332B
-0x5025 = 0x5945
-0x5026 = 0x3E6B
-0x5028 = 0x5946
-0x5029 = 0x593B
-0x502A = 0x445F
-0x502B = 0x4257
-0x502C = 0x593E
-0x502D = 0x5941
-0x502E = 0x5940
-0x503C = 0x5635
-0x5043 = 0x5948
-0x5047 = 0x3C59
-0x5048 = 0x594A
-0x5049 = 0x4E30
-0x504C = 0x593C
-0x504E = 0x594B
-0x504F = 0x462B
-0x5055 = 0x5949
-0x505A = 0x5776
-0x505C = 0x4D23
-0x5065 = 0x3D21
-0x506C = 0x594C
-0x5074 = 0x3260
-0x5075 = 0x556C
-0x5076 = 0x453C
-0x5077 = 0x4D35
-0x5080 = 0x3F7E
-0x5085 = 0x3835
-0x5088 = 0x407C
-0x508D = 0x3078
-0x5096 = 0x5877
-0x5098 = 0x4921
-0x5099 = 0x3138
-0x50A2 = 0x7841
-0x50A3 = 0x3476
-0x50AC = 0x345F
-0x50AD = 0x5336
-0x50B2 = 0x3041
-0x50B3 = 0x342B
-0x50B4 = 0x5871
-0x50B5 = 0x552E
-0x50B7 = 0x494B
-0x50BA = 0x5951
-0x50BB = 0x4935
-0x50BE = 0x4763
-0x50C2 = 0x594D
-0x50C5 = 0x3D76
-0x50C9 = 0x595D
-0x50CF = 0x4F71
-0x50D1 = 0x4748
-0x50D5 = 0x464D
-0x50D6 = 0x5952
-0x50DA = 0x4145
-0x50DE = 0x4E31
-0x50E5 = 0x3D44
-0x50E6 = 0x5956
-0x50E7 = 0x492E
-0x50E8 = 0x5947
-0x50EC = 0x5955
-0x50ED = 0x5954
-0x50EE = 0x5957
-0x50F3 = 0x4B5B
-0x50F5 = 0x3D29
-0x50F9 = 0x3C5B
-0x50FB = 0x4627
-0x5100 = 0x5247
-0x5102 = 0x592F
-0x5104 = 0x525A
-0x5106 = 0x5953
-0x5107 = 0x5958
-0x5108 = 0x3F6B
-0x5109 = 0x3C73
-0x510B = 0x5959
-0x5110 = 0x594F
-0x5112 = 0x4865
-0x5114 = 0x5931
-0x5115 = 0x592D
-0x5118 = 0x7845
-0x511F = 0x3325
-0x5121 = 0x405C
-0x512A = 0x5345
-0x5132 = 0x3422
-0x5137 = 0x5933
-0x513A = 0x5950
-0x513B = 0x594E
-0x513C = 0x5932
-0x5140 = 0x5823
-0x5141 = 0x544A
-0x5143 = 0x542A
-0x5144 = 0x5056
-0x5145 = 0x3364
-0x5146 = 0x5557
-0x5148 = 0x4F48
-0x5149 = 0x3962
-0x514B = 0x3F4B
-0x514D = 0x4362
-0x5151 = 0x3652
-0x5152 = 0x3679
-0x5154 = 0x4D43
-0x5155 = 0x596E
-0x5156 = 0x5970
-0x515A = 0x782C
-0x515C = 0x3635
-0x5162 = 0x3E24
-0x5165 = 0x486B
-0x5168 = 0x482B
-0x5169 = 0x413D
-0x516B = 0x304B
-0x516C = 0x392B
-0x516D = 0x4179
-0x516E = 0x5962
-0x5171 = 0x3932
-0x5175 = 0x3178
-0x5176 = 0x4664
-0x5177 = 0x3E5F
-0x5178 = 0x3564
-0x5179 = 0x5748
-0x517C = 0x3C66
-0x5180 = 0x3C3D
-0x5182 = 0x5867
-0x5185 = 0x445A
-0x5189 = 0x483D
-0x518C = 0x3261
-0x518D = 0x5459
-0x5192 = 0x4330
-0x5195 = 0x4361
-0x5196 = 0x5A22
-0x5197 = 0x485F
-0x51A0 = 0x395A
-0x51A2 = 0x5A23
-0x51A4 = 0x5429
-0x51A5 = 0x5A24
-0x51AB = 0x597B
-0x51AC = 0x362C
-0x51B0 = 0x3179
-0x51B1 = 0x597C
-0x51B2 = 0x7828
-0x51B3 = 0x3E76
-0x51B5 = 0x3F76
-0x51B6 = 0x5231
-0x51B7 = 0x4064
-0x51BC = 0x597E
-0x51BD = 0x597D
-0x51C4 = 0x4660
-0x51C6 = 0x7929
-0x51C7 = 0x5A21
-0x51C8 = 0x3E3B
-0x51C9 = 0x4139
-0x51CB = 0x3572
-0x51CC = 0x4168
-0x51CD = 0x3633
-0x51CF = 0x3C75
-0x51D1 = 0x3455
-0x51DB = 0x415D
-0x51DD = 0x447D
-0x51E0 = 0x7840
-0x51E1 = 0x3732
-0x51ED = 0x785D
-0x51F0 = 0x3B4B
-0x51F1 = 0x3F2D
-0x51F3 = 0x354A
-0x51F5 = 0x5B49
-0x51F6 = 0x5057
-0x51F8 = 0x4D39
-0x51F9 = 0x303C
-0x51FA = 0x3376
-0x51FC = 0x5B4A
-0x51FD = 0x3A2F
-0x5200 = 0x3536
-0x5201 = 0x3573
-0x5202 = 0x5856
-0x5203 = 0x4850
-0x5206 = 0x3756
-0x5207 = 0x4750
-0x5208 = 0x5857
-0x520A = 0x3F2F
-0x520E = 0x5858
-0x5211 = 0x504C
-0x5212 = 0x783B
-0x5216 = 0x6B3E
-0x5217 = 0x4150
-0x521D = 0x3375
-0x5220 = 0x493E
-0x5224 = 0x4550
-0x5228 = 0x4559
-0x5229 = 0x407B
-0x522B = 0x3170
-0x522E = 0x394E
-0x5230 = 0x353D
-0x5233 = 0x585A
-0x5236 = 0x5646
-0x5237 = 0x4B22
-0x5238 = 0x482F
-0x5239 = 0x4932
-0x523A = 0x344C
-0x523B = 0x3F4C
-0x5241 = 0x3667
-0x5243 = 0x4C6A
-0x5244 = 0x5859
-0x5247 = 0x5472
-0x524A = 0x4F77
-0x524B = 0x7848
-0x524C = 0x585D
-0x524D = 0x4730
-0x5254 = 0x4C5E
-0x5256 = 0x464A
-0x525B = 0x3855
-0x525C = 0x5860
-0x525E = 0x585E
-0x5261 = 0x585F
-0x5265 = 0x307E
-0x5269 = 0x4A23
-0x526A = 0x3C74
-0x526E = 0x3950
-0x526F = 0x3831
-0x5272 = 0x386E
-0x5274 = 0x585C
-0x5275 = 0x3434
-0x527D = 0x5862
-0x527F = 0x3D4B
-0x5281 = 0x5864
-0x5282 = 0x5863
-0x5283 = 0x3B2E
-0x5287 = 0x3E67
-0x5288 = 0x457C
-0x5289 = 0x4175
-0x528A = 0x3974
-0x528C = 0x585B
-0x528D = 0x3D23
-0x5290 = 0x5865
-0x5291 = 0x3C41
-0x5293 = 0x5866
-0x529B = 0x4126
-0x529F = 0x3926
-0x52A0 = 0x3C53
-0x52A3 = 0x4153
-0x52A9 = 0x567A
-0x52AA = 0x452C
-0x52AB = 0x3D59
-0x52AC = 0x5B3E
-0x52AD = 0x5B3F
-0x52BE = 0x5B40
-0x52C1 = 0x3E22
-0x52C3 = 0x322A
-0x52C7 = 0x5342
-0x52C9 = 0x4363
-0x52D0 = 0x5B42
-0x52D2 = 0x4055
-0x52D5 = 0x362F
-0x52D6 = 0x5B43
-0x52D8 = 0x3F31
-0x52D9 = 0x4E71
-0x52DB = 0x512B
-0x52DD = 0x4A24
-0x52DE = 0x404D
-0x52DF = 0x443C
-0x52E2 = 0x4A46
-0x52E4 = 0x475A
-0x52F0 = 0x5B44
-0x52F1 = 0x5B3D
-0x52F5 = 0x4078
-0x52F8 = 0x4830
-0x52F9 = 0x5968
-0x52FA = 0x4957
-0x52FE = 0x3934
-0x52FF = 0x4E70
-0x5300 = 0x5448
-0x5305 = 0x307C
-0x5306 = 0x3452
-0x5308 = 0x5059
-0x530D = 0x5969
-0x530F = 0x5E4B
-0x5310 = 0x596B
-0x5315 = 0x5830
-0x5316 = 0x3B2F
-0x5317 = 0x3131
-0x5319 = 0x3357
-0x531A = 0x584E
-0x531D = 0x5451
-0x5320 = 0x3D33
-0x5321 = 0x3F6F
-0x5323 = 0x4F3B
-0x532A = 0x374B
-0x532D = 0x5850
-0x532F = 0x3B63
-0x5331 = 0x5851
-0x5339 = 0x4625
-0x533E = 0x5852
-0x533F = 0x4464
-0x5340 = 0x4778
-0x5341 = 0x4A2E
-0x5343 = 0x4727
-0x5345 = 0x5826
-0x5347 = 0x497D
-0x5348 = 0x4E67
-0x5349 = 0x3B5C
-0x534A = 0x306B
-0x5351 = 0x3130
-0x5352 = 0x5764
-0x5353 = 0x573F
-0x5354 = 0x502D
-0x5357 = 0x444F
-0x535A = 0x3229
-0x535C = 0x3237
-0x535E = 0x3165
-0x535F = 0x5F32
-0x5360 = 0x553C
-0x5361 = 0x3F28
-0x5363 = 0x5855
-0x5366 = 0x5854
-0x5367 = 0x4E54
-0x5369 = 0x5A60
-0x536E = 0x5834
-0x536F = 0x432E
-0x5370 = 0x5321
-0x5371 = 0x4E23
-0x5373 = 0x3C34
-0x5374 = 0x4834
-0x5375 = 0x4251
-0x5377 = 0x3E6D
-0x5378 = 0x5036
-0x537A = 0x5A61
-0x537F = 0x4764
-0x5382 = 0x7827
-0x5384 = 0x3672
-0x5398 = 0x4065
-0x5399 = 0x5847
-0x539A = 0x3A71
-0x539D = 0x5848
-0x539F = 0x542D
-0x53A0 = 0x325E
-0x53A2 = 0x4F61
-0x53A5 = 0x584A
-0x53A6 = 0x4F43
-0x53A8 = 0x3378
-0x53A9 = 0x3E47
-0x53AD = 0x5161
-0x53AE = 0x584B
-0x53B2 = 0x4077
-0x53B4 = 0x5849
-0x53B6 = 0x5B4C
-0x53BB = 0x4825
-0x53C1 = 0x487E
-0x53C3 = 0x324E
-0x53C8 = 0x5356
-0x53C9 = 0x3266
-0x53CA = 0x3C30
-0x53CB = 0x5351
-0x53CD = 0x3734
-0x53D4 = 0x4A65
-0x53D6 = 0x4821
-0x53D7 = 0x4A5C
-0x53D9 = 0x5070
-0x53DB = 0x4551
-0x53DF = 0x5B45
-0x53E2 = 0x3454
-0x53E3 = 0x3F5A
-0x53E4 = 0x3945
-0x53E5 = 0x3E64
-0x53E6 = 0x416D
-0x53E8 = 0x5F36
-0x53E9 = 0x5F35
-0x53EA = 0x7923
-0x53EB = 0x3D50
-0x53EC = 0x5559
-0x53ED = 0x3048
-0x53EE = 0x3623
-0x53EF = 0x3F49
-0x53F0 = 0x786B
-0x53F1 = 0x5F33
-0x53F2 = 0x4A37
-0x53F3 = 0x5352
-0x53F5 = 0x584F
-0x53F6 = 0x7878
-0x53F8 = 0x4B3E
-0x53FB = 0x5F37
-0x53FC = 0x3570
-0x5401 = 0x5375
-0x5403 = 0x3354
-0x5404 = 0x3877
-0x5406 = 0x5F3A
-0x5408 = 0x3A4F
-0x5409 = 0x3C2A
-0x540A = 0x3575
-0x540C = 0x4D2C
-0x540D = 0x437B
-0x540E = 0x6161
-0x540F = 0x4074
-0x5410 = 0x4D42
-0x5411 = 0x4F72
-0x5412 = 0x5F38
-0x5415 = 0x4240
-0x5416 = 0x5F39
-0x541B = 0x3E7D
-0x541D = 0x415F
-0x541E = 0x4D4C
-0x541F = 0x5277
-0x5420 = 0x374D
-0x5421 = 0x5F41
-0x5423 = 0x5F44
-0x5426 = 0x3771
-0x5427 = 0x3049
-0x5429 = 0x3754
-0x542B = 0x3A2C
-0x542D = 0x3F54
-0x542E = 0x4B31
-0x5431 = 0x5628
-0x5432 = 0x5F45
-0x5434 = 0x4E62
-0x5435 = 0x3333
-0x5438 = 0x4E7C
-0x5439 = 0x3435
-0x543B = 0x4E47
-0x543C = 0x3A70
-0x543E = 0x4E61
-0x5440 = 0x513D
-0x5443 = 0x5F40
-0x5446 = 0x3474
-0x5448 = 0x334A
-0x544A = 0x3866
-0x544B = 0x5F3B
-0x5450 = 0x4445
-0x5454 = 0x5F3E
-0x5462 = 0x4458
-0x5464 = 0x5F4A
-0x5466 = 0x5F4F
-0x5468 = 0x565C
-0x5471 = 0x5F49
-0x5472 = 0x5F5A
-0x5473 = 0x4E36
-0x5475 = 0x3A47
-0x5476 = 0x5F4E
-0x5477 = 0x5F48
-0x5478 = 0x455E
-0x547B = 0x496B
-0x547C = 0x3A74
-0x547D = 0x437C
-0x5480 = 0x3E57
-0x5482 = 0x5F46
-0x5484 = 0x5F4D
-0x5486 = 0x4558
-0x548B = 0x5526
-0x548C = 0x3A4D
-0x548E = 0x3E4C
-0x548F = 0x533D
-0x5490 = 0x3840
-0x5492 = 0x5664
-0x5494 = 0x5F47
-0x5495 = 0x393E
-0x5496 = 0x3F27
-0x549A = 0x5F4B
-0x54A3 = 0x5F5B
-0x54A4 = 0x5F65
-0x54A6 = 0x5F57
-0x54A7 = 0x5F56
-0x54A8 = 0x5749
-0x54A9 = 0x5F63
-0x54AA = 0x5F64
-0x54AB = 0x656B
-0x54AC = 0x5227
-0x54AD = 0x5F52
-0x54AF = 0x3F29
-0x54B1 = 0x545B
-0x54B3 = 0x3F48
-0x54B4 = 0x5F54
-0x54B8 = 0x4F4C
-0x54BB = 0x5F5D
-0x54BC = 0x5F43
-0x54BD = 0x514A
-0x54BF = 0x5F5E
-0x54C0 = 0x3027
-0x54C1 = 0x4637
-0x54C2 = 0x5F53
-0x54C4 = 0x3A65
-0x54C6 = 0x365F
-0x54C7 = 0x4D5B
-0x54C8 = 0x397E
-0x54C9 = 0x5455
-0x54CC = 0x5F5F
-0x54CE = 0x3025
-0x54CF = 0x5F67
-0x54D0 = 0x5F51
-0x54DA = 0x5F61
-0x54DE = 0x5F68
-0x54E1 = 0x5431
-0x54E5 = 0x3867
-0x54E6 = 0x4536
-0x54E7 = 0x5F6A
-0x54E8 = 0x495A
-0x54E9 = 0x4128
-0x54EA = 0x4444
-0x54ED = 0x3F5E
-0x54EE = 0x4F78
-0x54F2 = 0x555C
-0x54F3 = 0x5F6E
-0x54FA = 0x3238
-0x54FC = 0x3A5F
-0x54FD = 0x5F6C
-0x54FF = 0x5B41
-0x5501 = 0x5164
-0x5504 = 0x5F42
-0x5506 = 0x4B74
-0x5507 = 0x343D
-0x5509 = 0x3026
-0x550F = 0x5F71
-0x5510 = 0x4C46
-0x5511 = 0x5F72
-0x5514 = 0x5F6D
-0x5523 = 0x5F70
-0x5527 = 0x5F73
-0x552A = 0x5F74
-0x552C = 0x3B23
-0x552E = 0x4A5B
-0x552F = 0x4E28
-0x5530 = 0x6027
-0x5531 = 0x332A
-0x5533 = 0x6026
-0x5537 = 0x6021
-0x553C = 0x5F7E
-0x553E = 0x4D59
-0x553F = 0x5F7C
-0x5541 = 0x5F7A
-0x5543 = 0x3F50
-0x5544 = 0x5744
-0x5546 = 0x494C
-0x5549 = 0x5F78
-0x554A = 0x3021
-0x554F = 0x4E4A
-0x5550 = 0x5F7D
-0x5553 = 0x4674
-0x5555 = 0x5F7B
-0x5556 = 0x6022
-0x555C = 0x6028
-0x555E = 0x5146
-0x5561 = 0x3748
-0x5564 = 0x4621
-0x5565 = 0x4936
-0x5566 = 0x4032
-0x556A = 0x453E
-0x5575 = 0x6023
-0x5576 = 0x6024
-0x5577 = 0x6025
-0x557B = 0x6034
-0x557C = 0x4C64
-0x557E = 0x6031
-0x5580 = 0x3F26
-0x5581 = 0x602F
-0x5582 = 0x4E39
-0x5583 = 0x602B
-0x5584 = 0x4946
-0x5587 = 0x402E
-0x5588 = 0x602E
-0x5589 = 0x3A6D
-0x558A = 0x3A30
-0x558B = 0x6029
-0x558F = 0x5F76
-0x5591 = 0x6033
-0x5594 = 0x6038
-0x5598 = 0x342D
-0x5599 = 0x6039
-0x559A = 0x3B3D
-0x559C = 0x4F32
-0x559D = 0x3A48
-0x559F = 0x6030
-0x55A7 = 0x507A
-0x55AA = 0x4925
-0x55AC = 0x4747
-0x55AE = 0x3525
-0x55B1 = 0x602C
-0x55B2 = 0x5334
-0x55B3 = 0x547B
-0x55B5 = 0x5F77
-0x55B9 = 0x602D
-0x55BB = 0x5377
-0x55C4 = 0x6044
-0x55C5 = 0x5061
-0x55C6 = 0x473A
-0x55C7 = 0x5844
-0x55C9 = 0x603C
-0x55CC = 0x6049
-0x55CD = 0x604A
-0x55CE = 0x4270
-0x55D1 = 0x603E
-0x55D2 = 0x602A
-0x55D3 = 0x4924
-0x55D4 = 0x6041
-0x55D6 = 0x6032
-0x55DA = 0x4E58
-0x55DC = 0x4A48
-0x55DD = 0x6043
-0x55DF = 0x6035
-0x55E1 = 0x4E4B
-0x55E3 = 0x4B43
-0x55E4 = 0x604D
-0x55E5 = 0x6046
-0x55E6 = 0x6042
-0x55E8 = 0x604B
-0x55E9 = 0x5F6F
-0x55EA = 0x603A
-0x55EC = 0x6040
-0x55EF = 0x6045
-0x55F2 = 0x6047
-0x55F5 = 0x604C
-0x55F6 = 0x5F59
-0x55F7 = 0x603B
-0x55FD = 0x4B54
-0x55FE = 0x6055
-0x5600 = 0x6056
-0x5601 = 0x6052
-0x5606 = 0x4C3E
-0x5608 = 0x6050
-0x5609 = 0x3C4E
-0x560C = 0x6051
-0x560D = 0x6036
-0x560E = 0x3842
-0x560F = 0x5845
-0x5614 = 0x453B
-0x5616 = 0x5F75
-0x5617 = 0x3322
-0x5618 = 0x506A
-0x561B = 0x426F
-0x561C = 0x5F69
-0x561E = 0x604F
-0x561F = 0x603D
-0x5623 = 0x6054
-0x5627 = 0x6057
-0x5629 = 0x3B29
-0x562C = 0x605C
-0x562D = 0x6058
-0x562E = 0x5F6B
-0x562F = 0x5025
-0x5630 = 0x5F34
-0x5632 = 0x3330
-0x5634 = 0x576C
-0x5635 = 0x5F58
-0x5636 = 0x4B3B
-0x5638 = 0x5F3C
-0x5639 = 0x605A
-0x563B = 0x4E7B
-0x563F = 0x3A59
-0x5641 = 0x7830
-0x564C = 0x6061
-0x564D = 0x605D
-0x564E = 0x522D
-0x5654 = 0x6062
-0x5657 = 0x605B
-0x5658 = 0x6059
-0x5659 = 0x605F
-0x565D = 0x5F50
-0x5660 = 0x5F55
-0x5662 = 0x605E
-0x5664 = 0x6064
-0x5665 = 0x5F66
-0x5666 = 0x5F5C
-0x5668 = 0x4677
-0x5669 = 0x582C
-0x566A = 0x546B
-0x566B = 0x6066
-0x566C = 0x4A49
-0x566F = 0x6048
-0x5671 = 0x6065
-0x5672 = 0x5F60
-0x5674 = 0x4567
-0x5676 = 0x3841
-0x5678 = 0x3656
-0x5679 = 0x782B
-0x567B = 0x6067
-0x567C = 0x6068
-0x5680 = 0x5F4C
-0x5685 = 0x6069
-0x5686 = 0x6063
-0x5687 = 0x4F45
-0x568C = 0x5F62
-0x568E = 0x3A3F
-0x568F = 0x4C67
-0x5693 = 0x606A
-0x5695 = 0x6060
-0x5699 = 0x4476
-0x56A6 = 0x5F3F
-0x56A8 = 0x417C
-0x56AE = 0x7875
-0x56AF = 0x606B
-0x56B3 = 0x6037
-0x56B4 = 0x514F
-0x56B6 = 0x6053
-0x56B7 = 0x4842
-0x56BC = 0x3D40
-0x56C0 = 0x5F79
-0x56C1 = 0x603F
-0x56C2 = 0x4F79
-0x56C5 = 0x5966
-0x56C8 = 0x5F3D
-0x56C9 = 0x7853
-0x56CA = 0x4452
-0x56CC = 0x786A
-0x56D1 = 0x5676
-0x56D4 = 0x606C
-0x56D7 = 0x606D
-0x56DA = 0x4774
-0x56DB = 0x4B44
-0x56DD = 0x606E
-0x56DE = 0x3B58
-0x56DF = 0x5836
-0x56E0 = 0x5272
-0x56E1 = 0x606F
-0x56E4 = 0x365A
-0x56EB = 0x6071
-0x56F0 = 0x4027
-0x56F1 = 0x3451
-0x56F9 = 0x6072
-0x56FA = 0x394C
-0x56FF = 0x6073
-0x5703 = 0x4654
-0x5704 = 0x6074
-0x5707 = 0x6070
-0x5708 = 0x4826
-0x5709 = 0x6076
-0x570A = 0x6075
-0x570B = 0x397A
-0x570D = 0x4E27
-0x5712 = 0x5430
-0x5713 = 0x5432
-0x5716 = 0x4D3C
-0x5718 = 0x4D45
-0x571C = 0x6077
-0x571F = 0x4D41
-0x5728 = 0x545A
-0x5729 = 0x5B57
-0x572A = 0x5B59
-0x572C = 0x5B58
-0x572D = 0x3967
-0x572E = 0x5B5C
-0x572F = 0x5B5D
-0x5730 = 0x3558
-0x5733 = 0x5B5A
-0x573B = 0x5B5F
-0x573E = 0x3B78
-0x5740 = 0x5637
-0x5742 = 0x5B60
-0x5747 = 0x3E79
-0x574A = 0x373B
-0x574C = 0x5B50
-0x574D = 0x4C2E
-0x574E = 0x3F32
-0x5750 = 0x5778
-0x5751 = 0x3F53
-0x5761 = 0x4642
-0x5764 = 0x4024
-0x5766 = 0x4C39
-0x5768 = 0x5B67
-0x5769 = 0x5B61
-0x576A = 0x463A
-0x576B = 0x5B63
-0x576D = 0x5B68
-0x576F = 0x4577
-0x5773 = 0x5B6A
-0x5776 = 0x5B69
-0x5777 = 0x3F40
-0x577B = 0x5B66
-0x577C = 0x5B65
-0x5782 = 0x3439
-0x5783 = 0x402C
-0x578B = 0x504D
-0x578C = 0x5B6D
-0x5793 = 0x5B72
-0x579B = 0x3662
-0x57A0 = 0x5B73
-0x57A1 = 0x5B52
-0x57A2 = 0x3938
-0x57A3 = 0x542B
-0x57A4 = 0x5B6C
-0x57A7 = 0x5B70
-0x57AE = 0x3F65
-0x57B8 = 0x5B79
-0x57C2 = 0x3921
-0x57C3 = 0x3023
-0x57CB = 0x4271
-0x57CE = 0x3347
-0x57CF = 0x5B6F
-0x57D2 = 0x5B78
-0x57D4 = 0x4652
-0x57D5 = 0x5B74
-0x57DD = 0x5B7E
-0x57DF = 0x5372
-0x57E0 = 0x323A
-0x57E1 = 0x5B6B
-0x57E4 = 0x5B7D
-0x57ED = 0x5C24
-0x57EF = 0x5B7B
-0x57F4 = 0x5B7A
-0x57F7 = 0x5634
-0x57F8 = 0x5B7C
-0x57F9 = 0x4560
-0x57FA = 0x3B79
-0x57FD = 0x5C23
-0x5800 = 0x5C25
-0x5802 = 0x4C43
-0x5805 = 0x3C61
-0x5806 = 0x3651
-0x5807 = 0x5D40
-0x580A = 0x5B51
-0x580B = 0x5C21
-0x580D = 0x5C22
-0x5816 = 0x5B71
-0x5819 = 0x5C27
-0x581D = 0x5B76
-0x581E = 0x5C26
-0x5820 = 0x5C29
-0x5821 = 0x3124
-0x5824 = 0x354C
-0x582A = 0x3F30
-0x582F = 0x5222
-0x5830 = 0x515F
-0x5831 = 0x3128
-0x5834 = 0x3321
-0x5835 = 0x3642
-0x5844 = 0x5C28
-0x584A = 0x3F69
-0x584B = 0x5C63
-0x584C = 0x4B7A
-0x584D = 0x6B73
-0x584F = 0x5B6E
-0x5851 = 0x4B5C
-0x5852 = 0x5B75
-0x5854 = 0x4B7E
-0x5857 = 0x4D3F
-0x5858 = 0x4C41
-0x585E = 0x487B
-0x5862 = 0x4E6B
-0x5864 = 0x5B77
-0x5865 = 0x5C2A
-0x586B = 0x4C6E
-0x586C = 0x5C2B
-0x5875 = 0x333E
-0x5879 = 0x4735
-0x587E = 0x5B53
-0x5880 = 0x5C2F
-0x5881 = 0x5C2C
-0x5883 = 0x3E33
-0x5885 = 0x4A7B
-0x5889 = 0x5C2D
-0x588A = 0x3566
-0x5892 = 0x494A
-0x5893 = 0x4439
-0x589A = 0x5C2E
-0x589C = 0x5739
-0x589E = 0x5476
-0x589F = 0x5066
-0x58A8 = 0x442B
-0x58A9 = 0x3655
-0x58AE = 0x3669
-0x58B3 = 0x3758
-0x58BB = 0x473D
-0x58BC = 0x5B54
-0x58BE = 0x3F51
-0x58C1 = 0x315A
-0x58C5 = 0x5B55
-0x58C7 = 0x4C33
-0x58D1 = 0x5B56
-0x58D3 = 0x5139
-0x58D5 = 0x3A3E
-0x58D8 = 0x405D
-0x58D9 = 0x5B5B
-0x58DA = 0x5B64
-0x58DE = 0x3B35
-0x58DF = 0x4222
-0x58E0 = 0x5B62
-0x58E2 = 0x5B5E
-0x58E4 = 0x4840
-0x58E9 = 0x3053
-0x58EB = 0x4A3F
-0x58EC = 0x4849
-0x58EF = 0x5733
-0x58F9 = 0x523C
-0x58FA = 0x3A78
-0x58FD = 0x4A59
-0x5902 = 0x623A
-0x590F = 0x4F44
-0x5914 = 0x5967
-0x5915 = 0x4F26
-0x5916 = 0x4D62
-0x5919 = 0x596D
-0x591A = 0x3660
-0x591C = 0x5239
-0x591F = 0x393B
-0x5922 = 0x434E
-0x5924 = 0x6239
-0x5925 = 0x6237
-0x5927 = 0x3473
-0x5929 = 0x4C6C
-0x592A = 0x4C2B
-0x592B = 0x3772
-0x592D = 0x5832
-0x592E = 0x516B
-0x592F = 0x3A3B
-0x5931 = 0x4A27
-0x5937 = 0x5244
-0x5938 = 0x7849
-0x593C = 0x5E45
-0x593E = 0x3C50
-0x5944 = 0x5159
-0x5947 = 0x4666
-0x5948 = 0x444E
-0x5949 = 0x376E
-0x594E = 0x3F7C
-0x594F = 0x5760
-0x5950 = 0x5B3C
-0x5951 = 0x4675
-0x5954 = 0x313C
-0x5955 = 0x5E48
-0x5957 = 0x4C57
-0x5958 = 0x5E4A
-0x595A = 0x5E49
-0x5960 = 0x356C
-0x5962 = 0x495D
-0x5965 = 0x3042
-0x5969 = 0x5E46
-0x596A = 0x3661
-0x596C = 0x3D31
-0x596E = 0x375C
-0x5973 = 0x452E
-0x5974 = 0x452B
-0x5976 = 0x444C
-0x5978 = 0x3C69
-0x5979 = 0x4B7D
-0x597D = 0x3A43
-0x5981 = 0x6579
-0x5982 = 0x4867
-0x5983 = 0x657A
-0x5984 = 0x4D7D
-0x598A = 0x4851
-0x598D = 0x657B
-0x5992 = 0x364A
-0x5993 = 0x3C4B
-0x5996 = 0x517D
-0x5997 = 0x6621
-0x5999 = 0x436E
-0x599D = 0x5731
-0x599E = 0x6624
-0x59A3 = 0x657E
-0x59A4 = 0x6625
-0x59A5 = 0x4D57
-0x59A8 = 0x3741
-0x59AE = 0x445D
-0x59AF = 0x6628
-0x59B2 = 0x6627
-0x59B9 = 0x4343
-0x59BB = 0x465E
-0x59BE = 0x662A
-0x59C6 = 0x4437
-0x59CA = 0x6622
-0x59CB = 0x4A3C
-0x59D0 = 0x3D63
-0x59D1 = 0x3943
-0x59D2 = 0x6626
-0x59D3 = 0x5055
-0x59D4 = 0x4E2F
-0x59D7 = 0x6629
-0x59D8 = 0x6630
-0x59DA = 0x5226
-0x59DC = 0x3D2A
-0x59DD = 0x662D
-0x59E3 = 0x662F
-0x59E5 = 0x4051
-0x59E8 = 0x524C
-0x59EC = 0x3C27
-0x59F9 = 0x6631
-0x59FB = 0x5276
-0x59FF = 0x574B
-0x5A01 = 0x4D7E
-0x5A03 = 0x4D5E
-0x5A09 = 0x6633
-0x5A0C = 0x6632
-0x5A11 = 0x6636
-0x5A13 = 0x6638
-0x5A18 = 0x446F
-0x5A1C = 0x4448
-0x5A1F = 0x3E6A
-0x5A20 = 0x496F
-0x5A23 = 0x6637
-0x5A25 = 0x3670
-0x5A29 = 0x4364
-0x5A31 = 0x5369
-0x5A36 = 0x4822
-0x5A3C = 0x663D
-0x5A40 = 0x6639
-0x5A41 = 0x4226
-0x5A46 = 0x4645
-0x5A49 = 0x4D71
-0x5A4A = 0x663B
-0x5A55 = 0x663C
-0x5A5A = 0x3B69
-0x5A62 = 0x663E
-0x5A66 = 0x383E
-0x5A67 = 0x663A
-0x5A6A = 0x4037
-0x5A6D = 0x662B
-0x5A77 = 0x6643
-0x5A7A = 0x6644
-0x5A7F = 0x5076
-0x5A92 = 0x433D
-0x5A9A = 0x4344
-0x5A9B = 0x6642
-0x5AA7 = 0x6634
-0x5AAA = 0x6641
-0x5AB2 = 0x6647
-0x5AB3 = 0x4F31
-0x5AB5 = 0x6B74
-0x5AB8 = 0x664A
-0x5ABD = 0x4268
-0x5ABE = 0x6645
-0x5AC1 = 0x3C5E
-0x5AC2 = 0x4929
-0x5AC9 = 0x3C35
-0x5ACC = 0x4F53
-0x5AD6 = 0x664E
-0x5AD7 = 0x657D
-0x5AD8 = 0x6650
-0x5ADC = 0x6651
-0x5AE0 = 0x664B
-0x5AE1 = 0x3555
-0x5AE3 = 0x664C
-0x5AE6 = 0x664F
-0x5AE9 = 0x445B
-0x5AEB = 0x6646
-0x5AF5 = 0x657C
-0x5AFB = 0x6635
-0x5B00 = 0x6623
-0x5B08 = 0x662C
-0x5B09 = 0x6652
-0x5B0B = 0x663F
-0x5B0C = 0x3D3F
-0x5B16 = 0x6654
-0x5B17 = 0x6653
-0x5B19 = 0x664D
-0x5B21 = 0x6648
-0x5B2A = 0x6649
-0x5B30 = 0x5324
-0x5B32 = 0x6655
-0x5B34 = 0x5978
-0x5B37 = 0x6656
-0x5B38 = 0x4974
-0x5B40 = 0x6657
-0x5B4C = 0x662E
-0x5B50 = 0x5753
-0x5B51 = 0x665D
-0x5B53 = 0x665E
-0x5B54 = 0x3F57
-0x5B55 = 0x5450
-0x5B57 = 0x5756
-0x5B58 = 0x3466
-0x5B5A = 0x665A
-0x5B5B = 0x5843
-0x5B5C = 0x574E
-0x5B5D = 0x5022
-0x5B5F = 0x434F
-0x5B62 = 0x665F
-0x5B63 = 0x3C3E
-0x5B64 = 0x3942
-0x5B65 = 0x665B
-0x5B69 = 0x3A22
-0x5B6B = 0x4B6F
-0x5B6C = 0x582B
-0x5B70 = 0x4A6B
-0x5B71 = 0x656E
-0x5B73 = 0x665C
-0x5B75 = 0x3775
-0x5B78 = 0x5127
-0x5B7A = 0x4866
-0x5B7D = 0x4475
-0x5B7F = 0x424F
-0x5B80 = 0x6532
-0x5B83 = 0x4B7C
-0x5B84 = 0x6533
-0x5B85 = 0x552C
-0x5B87 = 0x536E
-0x5B88 = 0x4A58
-0x5B89 = 0x3032
-0x5B8B = 0x4B4E
-0x5B8C = 0x4D6A
-0x5B8F = 0x3A6A
-0x5B93 = 0x6535
-0x5B95 = 0x6534
-0x5B97 = 0x575A
-0x5B98 = 0x3959
-0x5B99 = 0x5666
-0x5B9A = 0x3628
-0x5B9B = 0x4D70
-0x5B9C = 0x524B
-0x5BA2 = 0x3F4D
-0x5BA3 = 0x507B
-0x5BA4 = 0x4A52
-0x5BA5 = 0x6536
-0x5BA6 = 0x3B42
-0x5BAB = 0x392C
-0x5BB0 = 0x5457
-0x5BB3 = 0x3A26
-0x5BB4 = 0x5167
-0x5BB5 = 0x4F7C
-0x5BB6 = 0x3C52
-0x5BB8 = 0x6537
-0x5BB9 = 0x485D
-0x5BBF = 0x4B5E
-0x5BC2 = 0x3C45
-0x5BC4 = 0x3C44
-0x5BC5 = 0x527A
-0x5BC6 = 0x435C
-0x5BC7 = 0x3F5C
-0x5BCC = 0x383B
-0x5BD0 = 0x4342
-0x5BD2 = 0x3A2E
-0x5BD3 = 0x5422
-0x5BDE = 0x442F
-0x5BDF = 0x326C
-0x5BE1 = 0x3951
-0x5BE2 = 0x475E
-0x5BE4 = 0x653B
-0x5BE5 = 0x4148
-0x5BE6 = 0x4A35
-0x5BE7 = 0x447E
-0x5BE8 = 0x552F
-0x5BE9 = 0x4973
-0x5BEB = 0x5034
-0x5BEC = 0x3F6D
-0x5BEE = 0x653C
-0x5BF0 = 0x653E
-0x5BF5 = 0x3368
-0x5BF6 = 0x3126
-0x5BF8 = 0x3467
-0x5BFA = 0x4B42
-0x5C01 = 0x3762
-0x5C04 = 0x4964
-0x5C07 = 0x3D2B
-0x5C08 = 0x5728
-0x5C09 = 0x4E3E
-0x5C0A = 0x5770
-0x5C0B = 0x5130
-0x5C0D = 0x3654
-0x5C0E = 0x353C
-0x5C0F = 0x5021
-0x5C11 = 0x4959
-0x5C15 = 0x6658
-0x5C16 = 0x3C62
-0x5C1A = 0x4950
-0x5C1C = 0x6659
-0x5C22 = 0x5E4C
-0x5C24 = 0x5348
-0x5C25 = 0x5E4D
-0x5C2C = 0x5E4E
-0x5C31 = 0x3E4D
-0x5C37 = 0x5E4F
-0x5C38 = 0x4A2C
-0x5C39 = 0x527C
-0x5C3A = 0x335F
-0x5C3B = 0x656A
-0x5C3C = 0x4461
-0x5C3E = 0x4E32
-0x5C3F = 0x4472
-0x5C40 = 0x3E56
-0x5C41 = 0x4628
-0x5C45 = 0x3E53
-0x5C48 = 0x477C
-0x5C49 = 0x4C6B
-0x5C4A = 0x3D6C
-0x5C4B = 0x4E5D
-0x5C4E = 0x4A3A
-0x5C4F = 0x4641
-0x5C50 = 0x656C
-0x5C51 = 0x503C
-0x5C55 = 0x5539
-0x5C59 = 0x656D
-0x5C60 = 0x4D40
-0x5C62 = 0x4245
-0x5C63 = 0x656F
-0x5C64 = 0x3263
-0x5C65 = 0x4244
-0x5C68 = 0x6570
-0x5C6C = 0x4A74
-0x5C6E = 0x6578
-0x5C6F = 0x4D4D
-0x5C71 = 0x493D
-0x5C79 = 0x5259
-0x5C7A = 0x6128
-0x5C88 = 0x612C
-0x5C8C = 0x6127
-0x5C8D = 0x6129
-0x5C90 = 0x612A
-0x5C91 = 0x612F
-0x5C94 = 0x326D
-0x5C99 = 0x612E
-0x5C9C = 0x6131
-0x5CA1 = 0x3854
-0x5CA2 = 0x6133
-0x5CA3 = 0x6138
-0x5CA9 = 0x5152
-0x5CAB = 0x6136
-0x5CAC = 0x6135
-0x5CB1 = 0x6137
-0x5CB3 = 0x5440
-0x5CB5 = 0x6132
-0x5CB7 = 0x613A
-0x5CB8 = 0x3036
-0x5CC1 = 0x6139
-0x5CCB = 0x613E
-0x5CD2 = 0x613C
-0x5CD9 = 0x5645
-0x5CE8 = 0x366B
-0x5CEA = 0x5378
-0x5CED = 0x474D
-0x5CF0 = 0x3765
-0x5CF4 = 0x612D
-0x5CF6 = 0x353A
-0x5CFB = 0x3E7E
-0x5CFD = 0x4F3F
-0x5D06 = 0x6147
-0x5D07 = 0x3367
-0x5D0D = 0x6141
-0x5D0E = 0x4669
-0x5D14 = 0x345E
-0x5D16 = 0x5142
-0x5D17 = 0x385A
-0x5D1B = 0x6148
-0x5D1E = 0x6146
-0x5D22 = 0x613F
-0x5D24 = 0x6145
-0x5D26 = 0x6143
-0x5D27 = 0x6142
-0x5D29 = 0x3140
-0x5D2C = 0x6134
-0x5D2E = 0x6144
-0x5D34 = 0x614B
-0x5D3D = 0x614C
-0x5D3E = 0x614A
-0x5D47 = 0x6F7A
-0x5D4A = 0x6153
-0x5D4B = 0x6152
-0x5D4C = 0x4736
-0x5D50 = 0x6130
-0x5D5B = 0x614E
-0x5D69 = 0x6154
-0x5D6B = 0x6151
-0x5D6C = 0x614D
-0x5D6F = 0x614F
-0x5D74 = 0x6155
-0x5D81 = 0x6150
-0x5D82 = 0x6156
-0x5D84 = 0x5538
-0x5D87 = 0x612B
-0x5D97 = 0x6140
-0x5D99 = 0x6157
-0x5D9D = 0x6158
-0x5DA0 = 0x613D
-0x5DA7 = 0x613B
-0x5DB7 = 0x615A
-0x5DB8 = 0x6149
-0x5DBA = 0x416B
-0x5DBC = 0x536C
-0x5DCB = 0x3F79
-0x5DCD = 0x4E21
-0x5DD2 = 0x424D
-0x5DD4 = 0x615B
-0x5DDB = 0x675D
-0x5DDD = 0x3428
-0x5DDE = 0x565D
-0x5DE1 = 0x5132
-0x5DE2 = 0x3332
-0x5DE5 = 0x3924
-0x5DE6 = 0x5773
-0x5DE7 = 0x4749
-0x5DE8 = 0x3E5E
-0x5DEB = 0x4E57
-0x5DEE = 0x326E
-0x5DF0 = 0x5B4F
-0x5DF1 = 0x3C3A
-0x5DF2 = 0x5251
-0x5DF3 = 0x4B48
-0x5DF4 = 0x304D
-0x5DF7 = 0x4F6F
-0x5DFD = 0x5963
-0x5DFE = 0x3D6D
-0x5E02 = 0x4A50
-0x5E03 = 0x323C
-0x5E06 = 0x372B
-0x5E0C = 0x4F23
-0x5E11 = 0x607B
-0x5E14 = 0x607A
-0x5E15 = 0x4541
-0x5E16 = 0x4C7B
-0x5E18 = 0x7850
-0x5E19 = 0x6079
-0x5E1A = 0x5663
-0x5E1B = 0x322F
-0x5E1D = 0x355B
-0x5E25 = 0x4B27
-0x5E2B = 0x4A26
-0x5E2D = 0x4F2F
-0x5E33 = 0x554A
-0x5E36 = 0x3478
-0x5E37 = 0x6121
-0x5E38 = 0x3323
-0x5E3D = 0x4331
-0x5E40 = 0x5621
-0x5E42 = 0x435D
-0x5E43 = 0x6078
-0x5E44 = 0x6122
-0x5E45 = 0x3779
-0x5E4C = 0x3B4F
-0x5E54 = 0x6123
-0x5E55 = 0x443B
-0x5E57 = 0x607E
-0x5E58 = 0x607D
-0x5E5B = 0x6124
-0x5E5E = 0x6125
-0x5E5F = 0x5644
-0x5E61 = 0x6126
-0x5E62 = 0x3431
-0x5E63 = 0x3152
-0x5E6B = 0x306F
-0x5E6C = 0x607C
-0x5E72 = 0x7835
-0x5E73 = 0x463D
-0x5E74 = 0x446A
-0x5E76 = 0x3222
-0x5E78 = 0x5052
-0x5E79 = 0x3849
-0x5E7A = 0x675B
-0x5E7B = 0x3B43
-0x5E7C = 0x5357
-0x5E7D = 0x5344
-0x5E7E = 0x3C38
-0x5E7F = 0x7838
-0x5E80 = 0x624F
-0x5E87 = 0x3153
-0x5E8A = 0x3432
-0x5E8B = 0x6251
-0x5E8F = 0x5072
-0x5E95 = 0x3557
-0x5E96 = 0x6252
-0x5E97 = 0x356A
-0x5E9A = 0x387D
-0x5E9C = 0x382E
-0x5EA0 = 0x6254
-0x5EA5 = 0x6253
-0x5EA6 = 0x3648
-0x5EA7 = 0x5779
-0x5EAB = 0x3F62
-0x5EAD = 0x4D25
-0x5EB3 = 0x6258
-0x5EB5 = 0x6256
-0x5EB6 = 0x4A7C
-0x5EB7 = 0x3F35
-0x5EB8 = 0x5339
-0x5EB9 = 0x6255
-0x5EBE = 0x6257
-0x5EC9 = 0x412E
-0x5ECA = 0x4048
-0x5ED1 = 0x625B
-0x5ED2 = 0x625A
-0x5ED3 = 0x402A
-0x5ED6 = 0x414E
-0x5EDB = 0x625C
-0x5EDF = 0x436D
-0x5EE0 = 0x3327
-0x5EE1 = 0x6250
-0x5EE2 = 0x374F
-0x5EE3 = 0x3963
-0x5EE8 = 0x625D
-0x5EEA = 0x625E
-0x5EEC = 0x422E
-0x5EF3 = 0x4C7C
-0x5EF4 = 0x5B48
-0x5EF6 = 0x5153
-0x5EF7 = 0x4D22
-0x5EFA = 0x3D28
-0x5EFE = 0x5E43
-0x5EFF = 0x5825
-0x5F01 = 0x5B4D
-0x5F02 = 0x526C
-0x5F04 = 0x452A
-0x5F08 = 0x5E44
-0x5F0A = 0x3157
-0x5F0B = 0x5F2E
-0x5F0F = 0x4A3D
-0x5F11 = 0x5F31
-0x5F13 = 0x392D
-0x5F15 = 0x527D
-0x5F17 = 0x3825
-0x5F18 = 0x3A6B
-0x5F1B = 0x335A
-0x5F1F = 0x355C
-0x5F26 = 0x4F52
-0x5F27 = 0x3B21
-0x5F29 = 0x6573
-0x5F2D = 0x6574
-0x5F31 = 0x4875
-0x5F33 = 0x6572
-0x5F35 = 0x5545
-0x5F3A = 0x473F
-0x5F3C = 0x6576
-0x5F40 = 0x6C30
-0x5F46 = 0x7824
-0x5F48 = 0x352F
-0x5F4C = 0x4356
-0x5F4E = 0x4D64
-0x5F50 = 0x6566
-0x5F56 = 0x6568
-0x5F57 = 0x6567
-0x5F58 = 0x6569
-0x5F59 = 0x783D
-0x5F5D = 0x524D
-0x5F61 = 0x616A
-0x5F62 = 0x504E
-0x5F64 = 0x4D2E
-0x5F66 = 0x5165
-0x5F69 = 0x324A
-0x5F6A = 0x316B
-0x5F6C = 0x3172
-0x5F6D = 0x456D
-0x5F70 = 0x5543
-0x5F71 = 0x5330
-0x5F73 = 0x615C
-0x5F77 = 0x615D
-0x5F79 = 0x525B
-0x5F7C = 0x314B
-0x5F80 = 0x4D79
-0x5F81 = 0x5577
-0x5F82 = 0x615E
-0x5F85 = 0x347D
-0x5F87 = 0x615F
-0x5F88 = 0x3A5C
-0x5F89 = 0x6160
-0x5F8A = 0x3B32
-0x5F8B = 0x4249
-0x5F8C = 0x3A73
-0x5F90 = 0x506C
-0x5F91 = 0x3E36
-0x5F92 = 0x4D3D
-0x5F97 = 0x3543
-0x5F98 = 0x4547
-0x5F99 = 0x6163
-0x5F9C = 0x6164
-0x5F9E = 0x3453
-0x5FA0 = 0x6162
-0x5FA1 = 0x5379
-0x5FA8 = 0x6165
-0x5FA9 = 0x3834
-0x5FAA = 0x512D
-0x5FAD = 0x6166
-0x5FAE = 0x4E22
-0x5FB5 = 0x6167
-0x5FB7 = 0x3542
-0x5FB9 = 0x3339
-0x5FBC = 0x6168
-0x5FBD = 0x3B55
-0x5FC3 = 0x5044
-0x5FC4 = 0x6260
-0x5FC5 = 0x3158
-0x5FC9 = 0x6261
-0x5FCC = 0x3C49
-0x5FCD = 0x484C
-0x5FD0 = 0x6C7E
-0x5FD1 = 0x6C7D
-0x5FD2 = 0x5F2F
-0x5FD6 = 0x6262
-0x5FD7 = 0x563E
-0x5FD8 = 0x4D7C
-0x5FD9 = 0x4326
-0x5FDD = 0x6343
-0x5FE0 = 0x5652
-0x5FE1 = 0x6267
-0x5FE4 = 0x6268
-0x5FEA = 0x626C
-0x5FEB = 0x3F6C
-0x5FED = 0x626D
-0x5FEE = 0x6265
-0x5FF1 = 0x3340
-0x5FF5 = 0x446E
-0x5FF8 = 0x626E
-0x5FFB = 0x5043
-0x5FFD = 0x3A76
-0x5FFF = 0x375E
-0x600A = 0x6277
-0x600D = 0x6274
-0x600E = 0x5475
-0x600F = 0x6273
-0x6012 = 0x452D
-0x6014 = 0x557A
-0x6015 = 0x4542
-0x6016 = 0x3240
-0x6019 = 0x626F
-0x601B = 0x6272
-0x601D = 0x4B3C
-0x6020 = 0x3521
-0x6021 = 0x6279
-0x6025 = 0x3C31
-0x6026 = 0x6271
-0x6027 = 0x5054
-0x6028 = 0x5439
-0x6029 = 0x6275
-0x602A = 0x3956
-0x602B = 0x6276
-0x602F = 0x4753
-0x6035 = 0x6270
-0x6041 = 0x6D25
-0x6042 = 0x627E
-0x6043 = 0x4A51
-0x604D = 0x3B50
-0x6050 = 0x3F56
-0x6052 = 0x3A63
-0x6055 = 0x4B21
-0x6059 = 0x6D26
-0x605A = 0x6D23
-0x605D = 0x6D22
-0x6062 = 0x3B56
-0x6063 = 0x6D27
-0x6064 = 0x5074
-0x6067 = 0x6D24
-0x6068 = 0x3A5E
-0x6069 = 0x3677
-0x606A = 0x6321
-0x606B = 0x3632
-0x606C = 0x4C71
-0x606D = 0x3927
-0x606F = 0x4F22
-0x6070 = 0x4721
-0x607F = 0x5341
-0x6083 = 0x6327
-0x6084 = 0x4744
-0x6089 = 0x4F24
-0x608C = 0x6329
-0x608D = 0x3A37
-0x6092 = 0x6328
-0x6094 = 0x3B5A
-0x6096 = 0x6323
-0x609A = 0x6324
-0x609B = 0x632A
-0x609D = 0x6326
-0x609F = 0x4E72
-0x60A0 = 0x5346
-0x60A3 = 0x3B3C
-0x60A6 = 0x5443
-0x60A8 = 0x447A
-0x60B1 = 0x632D
-0x60B2 = 0x312F
-0x60B4 = 0x6332
-0x60B5 = 0x626A
-0x60B6 = 0x4346
-0x60B8 = 0x3C42
-0x60BB = 0x632C
-0x60BC = 0x353F
-0x60C5 = 0x4769
-0x60C6 = 0x6330
-0x60CB = 0x4D6F
-0x60D1 = 0x3B73
-0x60D5 = 0x4C68
-0x60D8 = 0x632F
-0x60DA = 0x6331
-0x60DC = 0x4F27
-0x60DD = 0x632E
-0x60DF = 0x4E29
-0x60E0 = 0x3B5D
-0x60E1 = 0x3671
-0x60E6 = 0x356B
-0x60F0 = 0x3668
-0x60F1 = 0x4455
-0x60F2 = 0x6322
-0x60F3 = 0x4F6B
-0x60F4 = 0x6337
-0x60F6 = 0x3B4C
-0x60F9 = 0x4847
-0x60FA = 0x504A
-0x60FB = 0x627C
-0x6100 = 0x6338
-0x6101 = 0x336E
-0x6106 = 0x6D29
-0x6108 = 0x537A
-0x6109 = 0x5364
-0x610D = 0x6D2A
-0x610E = 0x6339
-0x610F = 0x5262
-0x6115 = 0x6335
-0x611A = 0x535E
-0x611B = 0x302E
-0x611C = 0x632B
-0x611F = 0x3850
-0x6120 = 0x6333
-0x6123 = 0x6336
-0x6127 = 0x4022
-0x612B = 0x633A
-0x6134 = 0x626B
-0x6137 = 0x627D
-0x613E = 0x6269
-0x613F = 0x787C
-0x6148 = 0x3448
-0x614A = 0x633B
-0x614B = 0x4C2C
-0x614C = 0x3B45
-0x614E = 0x4977
-0x6155 = 0x443D
-0x6158 = 0x3252
-0x615A = 0x3251
-0x615D = 0x6D2B
-0x615F = 0x627A
-0x6162 = 0x427D
-0x6163 = 0x395F
-0x6164 = 0x6D28
-0x6167 = 0x3B5B
-0x6168 = 0x3F2E
-0x616A = 0x6266
-0x616B = 0x4B4B
-0x616E = 0x4247
-0x6170 = 0x4E3F
-0x6173 = 0x6325
-0x6175 = 0x633C
-0x6176 = 0x476C
-0x6177 = 0x3F36
-0x6182 = 0x5347
-0x618A = 0x3139
-0x618B = 0x316F
-0x618E = 0x5477
-0x6190 = 0x412F
-0x6191 = 0x463E
-0x6192 = 0x6334
-0x6194 = 0x633E
-0x619A = 0x352C
-0x619D = 0x6D2D
-0x61A4 = 0x375F
-0x61A7 = 0x633F
-0x61A8 = 0x3A29
-0x61A9 = 0x6D2C
-0x61AB = 0x4375
-0x61AC = 0x633D
-0x61AE = 0x6264
-0x61B2 = 0x4F5C
-0x61B6 = 0x5264
-0x61B7 = 0x6340
-0x61BE = 0x3A36
-0x61C2 = 0x362E
-0x61C7 = 0x3F52
-0x61C8 = 0x5038
-0x61C9 = 0x5326
-0x61CA = 0x3043
-0x61CB = 0x6D2E
-0x61CC = 0x6278
-0x61D4 = 0x6341
-0x61DE = 0x7856
-0x61DF = 0x6D21
-0x61E3 = 0x6D2F
-0x61E6 = 0x4533
-0x61E8 = 0x627B
-0x61F2 = 0x334D
-0x61F5 = 0x6342
-0x61F6 = 0x4041
-0x61F7 = 0x3B33
-0x61F8 = 0x507C
-0x61FA = 0x6263
-0x61FC = 0x3E65
-0x61FE = 0x4965
-0x61FF = 0x5C32
-0x6200 = 0x4135
-0x6207 = 0x6D30
-0x6208 = 0x386A
-0x620A = 0x4E6C
-0x620C = 0x5067
-0x620D = 0x4A79
-0x620E = 0x4856
-0x6210 = 0x3349
-0x6211 = 0x4E52
-0x6212 = 0x3D64
-0x6214 = 0x6A27
-0x6215 = 0x635E
-0x6216 = 0x3B72
-0x621A = 0x465D
-0x621B = 0x6A29
-0x621F = 0x6A2A
-0x6221 = 0x6A2C
-0x6222 = 0x6A2B
-0x6224 = 0x6A2E
-0x6225 = 0x6A2D
-0x6227 = 0x6A28
-0x6229 = 0x6A2F
-0x622A = 0x3D58
-0x622E = 0x423E
-0x6230 = 0x553D
-0x6232 = 0x4F37
-0x6233 = 0x3441
-0x6234 = 0x3477
-0x6237 = 0x3B27
-0x623D = 0x6C66
-0x623E = 0x6C65
-0x623F = 0x373F
-0x6240 = 0x4B79
-0x6241 = 0x3162
-0x6243 = 0x6C67
-0x6247 = 0x4948
-0x6248 = 0x6C68
-0x6249 = 0x6C69
-0x624B = 0x4A56
-0x624C = 0x5E50
-0x624D = 0x3245
-0x624E = 0x547A
-0x6251 = 0x785E
-0x6252 = 0x3047
-0x6253 = 0x3472
-0x6254 = 0x4853
-0x6258 = 0x4D50
-0x625B = 0x3F38
-0x6263 = 0x3F5B
-0x6266 = 0x4724
-0x626D = 0x4524
-0x626E = 0x3067
-0x626F = 0x3336
-0x6273 = 0x3062
-0x6276 = 0x3776
-0x6279 = 0x457A
-0x627C = 0x3673
-0x627E = 0x5552
-0x627F = 0x3350
-0x6280 = 0x3C3C
-0x6284 = 0x332D
-0x6289 = 0x3E71
-0x628A = 0x3051
-0x6291 = 0x5256
-0x6292 = 0x4A63
-0x6293 = 0x5725
-0x6295 = 0x4D36
-0x6296 = 0x3636
-0x6297 = 0x3F39
-0x6298 = 0x555B
-0x629B = 0x4557
-0x62A8 = 0x456A
-0x62AB = 0x457B
-0x62AC = 0x4C27
-0x62B1 = 0x3127
-0x62B5 = 0x3556
-0x62B9 = 0x4428
-0x62BB = 0x5E53
-0x62BC = 0x513A
-0x62BD = 0x3369
-0x62BF = 0x4372
-0x62C2 = 0x3777
-0x62C4 = 0x5674
-0x62C6 = 0x3270
-0x62C7 = 0x4434
-0x62C8 = 0x4469
-0x62C9 = 0x402D
-0x62CA = 0x5E54
-0x62CC = 0x3068
-0x62CD = 0x4544
-0x62CE = 0x4160
-0x62D0 = 0x3955
-0x62D2 = 0x3E5C
-0x62D3 = 0x4D58
-0x62D4 = 0x304E
-0x62D6 = 0x4D4F
-0x62D7 = 0x5E56
-0x62D8 = 0x3E50
-0x62D9 = 0x573E
-0x62DA = 0x5E55
-0x62DB = 0x5550
-0x62DC = 0x305D
-0x62EC = 0x4028
-0x62ED = 0x4A43
-0x62EE = 0x5E57
-0x62EF = 0x557C
-0x62F1 = 0x3930
-0x62F3 = 0x482D
-0x62F4 = 0x4B29
-0x62F6 = 0x5E59
-0x62F7 = 0x3F3D
-0x62FC = 0x4634
-0x62FD = 0x5727
-0x62FE = 0x4A30
-0x62FF = 0x4443
-0x6301 = 0x3356
-0x6302 = 0x3952
-0x6307 = 0x5638
-0x6308 = 0x6A7C
-0x6309 = 0x3034
-0x630E = 0x3F66
-0x6311 = 0x4C74
-0x6316 = 0x4D5A
-0x6328 = 0x3024
-0x632A = 0x4532
-0x632B = 0x346C
-0x632F = 0x5571
-0x6332 = 0x6A7D
-0x6339 = 0x5E5A
-0x633A = 0x4D26
-0x633D = 0x4D6C
-0x633E = 0x502E
-0x6342 = 0x4E66
-0x6343 = 0x5E5C
-0x6345 = 0x4D31
-0x6346 = 0x4026
-0x6349 = 0x573D
-0x634B = 0x5E5B
-0x634C = 0x3046
-0x634D = 0x3A34
-0x634E = 0x4953
-0x634F = 0x4473
-0x6350 = 0x3E68
-0x6355 = 0x3236
-0x6367 = 0x4575
-0x6368 = 0x4961
-0x6369 = 0x5E66
-0x636B = 0x5E51
-0x636D = 0x5E63
-0x636E = 0x7846
-0x6371 = 0x5E5F
-0x6372 = 0x7847
-0x6376 = 0x3437
-0x6377 = 0x3D5D
-0x637A = 0x5E60
-0x637B = 0x446D
-0x6380 = 0x4F46
-0x6382 = 0x3560
-0x6383 = 0x4928
-0x6384 = 0x4255
-0x6387 = 0x365E
-0x6388 = 0x4A5A
-0x6389 = 0x3574
-0x638A = 0x5E65
-0x638C = 0x5546
-0x638E = 0x5E61
-0x638F = 0x4C4D
-0x6390 = 0x467E
-0x6392 = 0x4545
-0x6396 = 0x5234
-0x6398 = 0x3E72
-0x6399 = 0x5575
-0x63A0 = 0x4253
-0x63A2 = 0x4C3D
-0x63A3 = 0x3338
-0x63A5 = 0x3D53
-0x63A7 = 0x3F58
-0x63A8 = 0x4D46
-0x63A9 = 0x515A
-0x63AA = 0x346B
-0x63AC = 0x5E64
-0x63AD = 0x5E5D
-0x63AE = 0x5E67
-0x63B0 = 0x6A7E
-0x63BE = 0x5E72
-0x63C0 = 0x3C70
-0x63C4 = 0x5E6D
-0x63C6 = 0x5E71
-0x63C9 = 0x4860
-0x63CD = 0x5761
-0x63CE = 0x5E6F
-0x63CF = 0x4368
-0x63D0 = 0x4C61
-0x63D2 = 0x3265
-0x63D6 = 0x523E
-0x63DA = 0x516F
-0x63DB = 0x3B3B
-0x63DE = 0x5E6E
-0x63E0 = 0x5E6B
-0x63E1 = 0x4E55
-0x63E3 = 0x3427
-0x63E9 = 0x3F2B
-0x63EA = 0x3E3E
-0x63ED = 0x3D52
-0x63EE = 0x3B53
-0x63F2 = 0x5E69
-0x63F4 = 0x542E
-0x63F6 = 0x5E5E
-0x63F8 = 0x5E6A
-0x640B = 0x5E75
-0x640C = 0x5E78
-0x640D = 0x4B70
-0x640F = 0x322B
-0x6410 = 0x3424
-0x6413 = 0x346A
-0x6414 = 0x4926
-0x6417 = 0x3537
-0x641B = 0x5E76
-0x641C = 0x4B51
-0x641E = 0x3863
-0x6420 = 0x5E77
-0x6421 = 0x5E7A
-0x6426 = 0x5E79
-0x642A = 0x4C42
-0x642C = 0x3061
-0x642D = 0x346E
-0x6434 = 0x653A
-0x6436 = 0x4740
-0x643A = 0x502F
-0x643D = 0x326B
-0x643F = 0x6B21
-0x6441 = 0x5E74
-0x6447 = 0x5221
-0x6451 = 0x5E62
-0x6452 = 0x5E70
-0x6454 = 0x4B24
-0x6458 = 0x552A
-0x645C = 0x5E68
-0x645E = 0x5E7B
-0x645F = 0x4227
-0x6467 = 0x345D
-0x6469 = 0x4426
-0x646D = 0x5E7D
-0x646F = 0x563F
-0x6473 = 0x3F59
-0x6476 = 0x5E52
-0x6478 = 0x437E
-0x6479 = 0x4421
-0x647A = 0x5F21
-0x647B = 0x3274
-0x6482 = 0x414C
-0x6485 = 0x3E6F
-0x6487 = 0x4632
-0x6488 = 0x404C
-0x6491 = 0x3345
-0x6492 = 0x4876
-0x6493 = 0x4453
-0x6495 = 0x4B3A
-0x6496 = 0x5E7E
-0x6499 = 0x5F24
-0x649E = 0x5732
-0x649F = 0x5E58
-0x64A3 = 0x3527
-0x64A4 = 0x3337
-0x64A5 = 0x3226
-0x64A9 = 0x4143
-0x64AB = 0x3827
-0x64AC = 0x474B
-0x64AD = 0x3225
-0x64AE = 0x3469
-0x64B0 = 0x572B
-0x64B2 = 0x464B
-0x64B3 = 0x5E6C
-0x64BB = 0x4C22
-0x64BC = 0x3A33
-0x64BE = 0x4E4E
-0x64BF = 0x3C71
-0x64C0 = 0x5F26
-0x64C1 = 0x5335
-0x64C2 = 0x405E
-0x64C4 = 0x4230
-0x64C5 = 0x4943
-0x64C7 = 0x5471
-0x64CA = 0x3B77
-0x64CB = 0x3532
-0x64CD = 0x3259
-0x64CE = 0x4766
-0x64D0 = 0x5F27
-0x64D2 = 0x475C
-0x64D4 = 0x3523
-0x64D7 = 0x5F28
-0x64D8 = 0x6B22
-0x64DA = 0x3E5D
-0x64E0 = 0x3C37
-0x64E2 = 0x5F2A
-0x64E4 = 0x5F29
-0x64E6 = 0x3241
-0x64EC = 0x4462
-0x64EF = 0x3177
-0x64F0 = 0x4521
-0x64F1 = 0x3869
-0x64F2 = 0x5640
-0x64F4 = 0x4029
-0x64F7 = 0x5F22
-0x64FA = 0x305A
-0x64FB = 0x4B53
-0x64FC = 0x5F23
-0x64FE = 0x4845
-0x6500 = 0x454A
-0x6504 = 0x5E73
-0x6506 = 0x446C
-0x6509 = 0x5F2B
-0x650F = 0x4223
-0x6514 = 0x4039
-0x6516 = 0x5E7C
-0x6518 = 0x4841
-0x6519 = 0x3273
-0x651B = 0x5F25
-0x651D = 0x4963
-0x6522 = 0x545C
-0x6523 = 0x424E
-0x6524 = 0x4C2F
-0x6525 = 0x5F2C
-0x652A = 0x3D41
-0x652B = 0x3E70
-0x652C = 0x403F
-0x652E = 0x5F2D
-0x652F = 0x5627
-0x6534 = 0x6A37
-0x6535 = 0x6B36
-0x6536 = 0x4A55
-0x6538 = 0x587C
-0x6539 = 0x3844
-0x653B = 0x3925
-0x653E = 0x3745
-0x653F = 0x557E
-0x6545 = 0x394A
-0x6548 = 0x5027
-0x6549 = 0x744D
-0x654F = 0x4374
-0x6551 = 0x3E48
-0x6555 = 0x6B37
-0x6556 = 0x303D
-0x6557 = 0x305C
-0x6559 = 0x3D4C
-0x655D = 0x3156
-0x655E = 0x3328
-0x6562 = 0x3852
-0x6563 = 0x4922
-0x6566 = 0x3658
-0x656B = 0x6B38
-0x656C = 0x3E34
-0x6572 = 0x4743
-0x6574 = 0x557B
-0x6575 = 0x3550
-0x6577 = 0x3773
-0x6578 = 0x4A7D
-0x6582 = 0x4132
-0x6583 = 0x3150
-0x6587 = 0x4E44
-0x658C = 0x3173
-0x6590 = 0x6C33
-0x6591 = 0x305F
-0x6595 = 0x6C35
-0x6597 = 0x782F
-0x6599 = 0x414F
-0x659B = 0x757A
-0x659C = 0x5031
-0x659F = 0x5565
-0x65A1 = 0x4E53
-0x65A4 = 0x3D6F
-0x65A5 = 0x3362
-0x65A7 = 0x382B
-0x65AB = 0x6D3D
-0x65AC = 0x5536
-0x65AF = 0x4B39
-0x65B0 = 0x5042
-0x65B7 = 0x364F
-0x65B9 = 0x373D
-0x65BC = 0x6C36
-0x65BD = 0x4A29
-0x65C1 = 0x4554
-0x65C3 = 0x6C39
-0x65C4 = 0x6C38
-0x65C5 = 0x4243
-0x65C6 = 0x6C37
-0x65CB = 0x507D
-0x65CC = 0x6C3A
-0x65CE = 0x6C3B
-0x65CF = 0x5765
-0x65D2 = 0x6C3C
-0x65D6 = 0x6C3D
-0x65D7 = 0x466C
-0x65E2 = 0x3C48
-0x65E5 = 0x4855
-0x65E6 = 0x3529
-0x65E8 = 0x563C
-0x65E9 = 0x5467
-0x65EC = 0x512E
-0x65ED = 0x5071
-0x65EE = 0x6A38
-0x65EF = 0x6A39
-0x65F0 = 0x6A3A
-0x65F1 = 0x3A35
-0x65FA = 0x4D7A
-0x6600 = 0x6A40
-0x6602 = 0x303A
-0x6603 = 0x6A3E
-0x6606 = 0x4025
-0x660A = 0x6A3B
-0x660C = 0x327D
-0x660E = 0x4377
-0x660F = 0x3B68
-0x6613 = 0x5257
-0x6614 = 0x4E74
-0x6615 = 0x6A3F
-0x661D = 0x6A43
-0x661F = 0x5047
-0x6620 = 0x5333
-0x6625 = 0x343A
-0x6627 = 0x4341
-0x6628 = 0x5772
-0x662D = 0x5551
-0x662F = 0x4A47
-0x6631 = 0x6A45
-0x6634 = 0x6A44
-0x6635 = 0x6A47
-0x6636 = 0x6A46
-0x6641 = 0x6A4B
-0x6642 = 0x4A31
-0x6643 = 0x3B4E
-0x6649 = 0x3D7A
-0x664C = 0x494E
-0x664F = 0x6A4C
-0x6657 = 0x6A4F
-0x665A = 0x4D6D
-0x665D = 0x5667
-0x665F = 0x6A49
-0x6661 = 0x6A4E
-0x6664 = 0x4E6E
-0x6666 = 0x3B5E
-0x6668 = 0x333F
-0x666E = 0x4655
-0x666F = 0x3E30
-0x6670 = 0x4E7A
-0x6674 = 0x4767
-0x6676 = 0x3E27
-0x6677 = 0x6A50
-0x667A = 0x5647
-0x667E = 0x4140
-0x6684 = 0x6A51
-0x6687 = 0x4F3E
-0x6688 = 0x544E
-0x6689 = 0x6A4D
-0x668C = 0x6A52
-0x6691 = 0x4A6E
-0x6696 = 0x452F
-0x6697 = 0x3035
-0x669D = 0x6A54
-0x66A2 = 0x3329
-0x66A8 = 0x745F
-0x66AB = 0x545D
-0x66AE = 0x443A
-0x66B4 = 0x3129
-0x66B9 = 0x655F
-0x66BE = 0x6A55
-0x66C4 = 0x6A4A
-0x66C6 = 0x784F
-0x66C7 = 0x6A3C
-0x66C9 = 0x4F7E
-0x66D6 = 0x6A53
-0x66D9 = 0x4A6F
-0x66DB = 0x6A56
-0x66DC = 0x6A57
-0x66DD = 0x4658
-0x66E0 = 0x3F75
-0x66E6 = 0x6A58
-0x66E9 = 0x6A59
-0x66EC = 0x4939
-0x66F0 = 0x543B
-0x66F2 = 0x477A
-0x66F3 = 0x5237
-0x66F4 = 0x387C
-0x66F7 = 0x6A42
-0x66F8 = 0x4A69
-0x66F9 = 0x325C
-0x66FC = 0x427C
-0x66FE = 0x5478
-0x66FF = 0x4C66
-0x6700 = 0x576E
-0x6703 = 0x3B61
-0x6708 = 0x5442
-0x6709 = 0x5350
-0x670A = 0x6B43
-0x670B = 0x4573
-0x670D = 0x377E
-0x6710 = 0x6B54
-0x6714 = 0x4B37
-0x6715 = 0x6B5E
-0x6717 = 0x404A
-0x671B = 0x4D7B
-0x671D = 0x332F
-0x671F = 0x465A
-0x6726 = 0x6B7C
-0x6727 = 0x6B4A
-0x6728 = 0x443E
-0x672A = 0x4E34
-0x672B = 0x4429
-0x672C = 0x313E
-0x672D = 0x547D
-0x672F = 0x7868
-0x6731 = 0x566C
-0x6734 = 0x7860
-0x6735 = 0x3664
-0x673D = 0x5060
-0x6746 = 0x384B
-0x6748 = 0x683E
-0x6749 = 0x493C
-0x674C = 0x683B
-0x674E = 0x406E
-0x674F = 0x5053
-0x6750 = 0x3244
-0x6751 = 0x3465
-0x6753 = 0x683C
-0x6756 = 0x5548
-0x675C = 0x3645
-0x675E = 0x683D
-0x675F = 0x4A78
-0x6760 = 0x385C
-0x676A = 0x6842
-0x676D = 0x3A3C
-0x676F = 0x312D
-0x6770 = 0x3D5C
-0x6771 = 0x362B
-0x6772 = 0x6A3D
-0x6773 = 0x6843
-0x6775 = 0x6846
-0x6777 = 0x684B
-0x677C = 0x684C
-0x677E = 0x7869
-0x677F = 0x3065
-0x6787 = 0x6841
-0x6789 = 0x4D77
-0x678B = 0x684A
-0x6790 = 0x4E76
-0x6795 = 0x556D
-0x6797 = 0x4156
-0x6798 = 0x6844
-0x679A = 0x4336
-0x679C = 0x397B
-0x679D = 0x5626
-0x67AF = 0x3F5D
-0x67B0 = 0x6852
-0x67B3 = 0x6857
-0x67B5 = 0x6855
-0x67B6 = 0x3C5C
-0x67B7 = 0x3C4F
-0x67B8 = 0x685B
-0x67C1 = 0x685E
-0x67C3 = 0x685A
-0x67C4 = 0x317A
-0x67CF = 0x3058
-0x67D0 = 0x4433
-0x67D1 = 0x384C
-0x67D2 = 0x4662
-0x67D3 = 0x483E
-0x67D4 = 0x4861
-0x67D8 = 0x684F
-0x67D9 = 0x6854
-0x67DA = 0x6856
-0x67DD = 0x6858
-0x67DE = 0x5775
-0x67E2 = 0x685C
-0x67E5 = 0x3269
-0x67E9 = 0x6851
-0x67EC = 0x3C6D
-0x67EF = 0x3F42
-0x67F0 = 0x684D
-0x67F1 = 0x5679
-0x67F3 = 0x4178
-0x67F4 = 0x3271
-0x67FF = 0x4A41
-0x6800 = 0x6859
-0x6805 = 0x5524
-0x6813 = 0x4B28
-0x6817 = 0x4075
-0x681D = 0x6869
-0x6821 = 0x5023
-0x6829 = 0x6872
-0x682A = 0x566A
-0x6832 = 0x6860
-0x6833 = 0x6861
-0x6838 = 0x3A4B
-0x6839 = 0x3879
-0x683C = 0x3871
-0x683D = 0x5454
-0x6840 = 0x686E
-0x6841 = 0x686C
-0x6842 = 0x3970
-0x6843 = 0x4C52
-0x6844 = 0x6866
-0x6845 = 0x4E26
-0x6846 = 0x3F72
-0x6848 = 0x3038
-0x6849 = 0x6871
-0x684A = 0x6870
-0x684C = 0x5740
-0x684E = 0x6864
-0x6850 = 0x4D29
-0x6851 = 0x4923
-0x6853 = 0x3B38
-0x6854 = 0x3D5B
-0x6855 = 0x686A
-0x686B = 0x6878
-0x6874 = 0x6875
-0x6876 = 0x4D30
-0x6877 = 0x6876
-0x6881 = 0x413A
-0x6883 = 0x6868
-0x6885 = 0x4337
-0x6886 = 0x3070
-0x688F = 0x6874
-0x6893 = 0x6877
-0x6897 = 0x3923
-0x6898 = 0x6845
-0x689D = 0x4C75
-0x689F = 0x6849
-0x68A2 = 0x4952
-0x68A7 = 0x4E60
-0x68A8 = 0x4066
-0x68AD = 0x4B73
-0x68AF = 0x4C5D
-0x68B0 = 0x5035
-0x68B3 = 0x4A61
-0x68B5 = 0x6873
-0x68C4 = 0x467A
-0x68C9 = 0x435E
-0x68CB = 0x4665
-0x68CD = 0x3977
-0x68D2 = 0x3074
-0x68D5 = 0x5758
-0x68D6 = 0x6847
-0x68D7 = 0x5466
-0x68D8 = 0x3C2C
-0x68DA = 0x456F
-0x68DF = 0x3630
-0x68E0 = 0x4C44
-0x68E3 = 0x6926
-0x68E7 = 0x553B
-0x68EE = 0x492D
-0x68F0 = 0x6922
-0x68F1 = 0x4062
-0x68F2 = 0x465C
-0x68F5 = 0x3F43
-0x68F9 = 0x687E
-0x68FA = 0x3957
-0x68FC = 0x687B
-0x6901 = 0x6924
-0x6905 = 0x524E
-0x690B = 0x6923
-0x690D = 0x5632
-0x690E = 0x5735
-0x690F = 0x6862
-0x6910 = 0x6927
-0x6912 = 0x3D37
-0x6930 = 0x522C
-0x6934 = 0x6932
-0x6939 = 0x6929
-0x693D = 0x342A
-0x693F = 0x343B
-0x6942 = 0x692B
-0x694A = 0x516E
-0x6953 = 0x3763
-0x6954 = 0x5028
-0x6957 = 0x6925
-0x695A = 0x337E
-0x695D = 0x692C
-0x695E = 0x4063
-0x6960 = 0x692A
-0x6963 = 0x6939
-0x6966 = 0x6938
-0x6968 = 0x6865
-0x696B = 0x692E
-0x696D = 0x5235
-0x696E = 0x687A
-0x6971 = 0x6928
-0x6975 = 0x3C2B
-0x6977 = 0x3F2C
-0x6978 = 0x6931
-0x6979 = 0x693A
-0x6980 = 0x692F
-0x6982 = 0x3845
-0x6986 = 0x535C
-0x698D = 0x6947
-0x6994 = 0x4046
-0x6995 = 0x6945
-0x6998 = 0x6930
-0x699B = 0x693B
-0x699C = 0x3071
-0x69A7 = 0x693C
-0x69A8 = 0x5525
-0x69AA = 0x683F
-0x69AB = 0x693E
-0x69AD = 0x693F
-0x69AE = 0x4859
-0x69B1 = 0x6941
-0x69B4 = 0x4171
-0x69B7 = 0x4836
-0x69BB = 0x693D
-0x69BF = 0x6867
-0x69C1 = 0x6942
-0x69CA = 0x6943
-0x69CB = 0x3939
-0x69CC = 0x6933
-0x69CD = 0x4739
-0x69CE = 0x6936
-0x69D0 = 0x3B31
-0x69D4 = 0x6940
-0x69E7 = 0x687D
-0x69ED = 0x694A
-0x69F2 = 0x694E
-0x69F3 = 0x3D30
-0x69FD = 0x325B
-0x69FF = 0x6948
-0x6A01 = 0x572E
-0x6A02 = 0x4056
-0x6A05 = 0x6848
-0x6A0A = 0x372E
-0x6A13 = 0x4225
-0x6A17 = 0x694B
-0x6A18 = 0x694C
-0x6A19 = 0x316A
-0x6A1E = 0x4A60
-0x6A1F = 0x5541
-0x6A21 = 0x4423
-0x6A23 = 0x5179
-0x6A28 = 0x6958
-0x6A2A = 0x3A61
-0x6A35 = 0x6954
-0x6A38 = 0x4653
-0x6A39 = 0x4A77
-0x6A3A = 0x686B
-0x6A3D = 0x6957
-0x6A3E = 0x6950
-0x6A44 = 0x694F
-0x6A47 = 0x4741
-0x6A48 = 0x6863
-0x6A4B = 0x4745
-0x6A50 = 0x6952
-0x6A58 = 0x6959
-0x6A59 = 0x3348
-0x6A5B = 0x6953
-0x6A5F = 0x3B7A
-0x6A61 = 0x4F70
-0x6A62 = 0x4D56
-0x6A65 = 0x694D
-0x6A71 = 0x3377
-0x6A80 = 0x4C34
-0x6A84 = 0x4F2D
-0x6A89 = 0x685F
-0x6A8E = 0x6955
-0x6A90 = 0x695C
-0x6A91 = 0x695B
-0x6A94 = 0x3535
-0x6A97 = 0x695E
-0x6A9C = 0x686D
-0x6AA0 = 0x6951
-0x6AA2 = 0x3C6C
-0x6AA3 = 0x6949
-0x6AA9 = 0x695D
-0x6AAB = 0x695F
-0x6AAC = 0x434A
-0x6AAF = 0x786D
-0x6AB3 = 0x6944
-0x6AB8 = 0x447B
-0x6ABB = 0x3C77
-0x6AC3 = 0x3971
-0x6AD3 = 0x6956
-0x6ADA = 0x6935
-0x6ADB = 0x684E
-0x6ADD = 0x687C
-0x6ADE = 0x695A
-0x6ADF = 0x685D
-0x6AE7 = 0x6946
-0x6AE8 = 0x6853
-0x6AEA = 0x6840
-0x6AEC = 0x6934
-0x6AF3 = 0x6850
-0x6AF8 = 0x6937
-0x6AFB = 0x5323
-0x6B04 = 0x4038
-0x6B0A = 0x4828
-0x6B0F = 0x6921
-0x6B12 = 0x686F
-0x6B16 = 0x692D
-0x6B1E = 0x6879
-0x6B20 = 0x4737
-0x6B21 = 0x344E
-0x6B23 = 0x5040
-0x6B32 = 0x537B
-0x6B37 = 0x6C24
-0x6B39 = 0x6C25
-0x6B3A = 0x465B
-0x6B3D = 0x4755
-0x6B3E = 0x3F6E
-0x6B43 = 0x6C26
-0x6B46 = 0x6C27
-0x6B47 = 0x502A
-0x6B49 = 0x4738
-0x6B4C = 0x3868
-0x6B50 = 0x4537
-0x6B59 = 0x6C28
-0x6B5F = 0x6C23
-0x6B61 = 0x3B36
-0x6B62 = 0x5639
-0x6B63 = 0x557D
-0x6B64 = 0x344B
-0x6B65 = 0x323D
-0x6B66 = 0x4E64
-0x6B67 = 0x4667
-0x6B6A = 0x4D61
-0x6B72 = 0x4B6A
-0x6B77 = 0x407A
-0x6B78 = 0x3969
-0x6B79 = 0x3475
-0x6B7B = 0x4B40
-0x6B81 = 0x6962
-0x6B82 = 0x6963
-0x6B83 = 0x516A
-0x6B84 = 0x6965
-0x6B86 = 0x3479
-0x6B89 = 0x5133
-0x6B8A = 0x4A62
-0x6B8D = 0x6968
-0x6B96 = 0x5633
-0x6B98 = 0x3250
-0x6B9B = 0x696A
-0x6B9E = 0x6966
-0x6BA4 = 0x6964
-0x6BAA = 0x696C
-0x6BAB = 0x6969
-0x6BAE = 0x6967
-0x6BAF = 0x696B
-0x6BB2 = 0x3C5F
-0x6BB3 = 0x6C2F
-0x6BB5 = 0x364E
-0x6BB7 = 0x5273
-0x6BBA = 0x4931
-0x6BBB = 0x3F47
-0x6BBF = 0x356E
-0x6BC1 = 0x3B59
-0x6BC5 = 0x5263
-0x6BC6 = 0x4539
-0x6BCB = 0x4E63
-0x6BCD = 0x4438
-0x6BCF = 0x433F
-0x6BD2 = 0x363E
-0x6BD3 = 0x5839
-0x6BD4 = 0x3148
-0x6BD6 = 0x3151
-0x6BD7 = 0x457E
-0x6BDB = 0x432B
-0x6BEA = 0x6B24
-0x6BEB = 0x3A41
-0x6BEF = 0x4C3A
-0x6BF3 = 0x6B25
-0x6BF9 = 0x6B28
-0x6BFD = 0x6B26
-0x6BFF = 0x6B27
-0x6C05 = 0x6B29
-0x6C06 = 0x6B2B
-0x6C08 = 0x5531
-0x6C0C = 0x6B2A
-0x6C0D = 0x6B2C
-0x6C0F = 0x4A4F
-0x6C10 = 0x5835
-0x6C11 = 0x4371
-0x6C13 = 0x4325
-0x6C15 = 0x6B2D
-0x6C16 = 0x444A
-0x6C18 = 0x6B2E
-0x6C19 = 0x6B2F
-0x6C1A = 0x6B30
-0x6C1B = 0x3755
-0x6C1F = 0x377A
-0x6C21 = 0x6B31
-0x6C23 = 0x4678
-0x6C24 = 0x6B33
-0x6C26 = 0x3A24
-0x6C27 = 0x5175
-0x6C28 = 0x3031
-0x6C2A = 0x6B34
-0x6C2B = 0x4762
-0x6C2C = 0x6B32
-0x6C2E = 0x352A
-0x6C2F = 0x4248
-0x6C30 = 0x4768
-0x6C32 = 0x6B35
-0x6C34 = 0x4B2E
-0x6C35 = 0x635F
-0x6C38 = 0x5340
-0x6C3D = 0x595B
-0x6C40 = 0x4D21
-0x6C41 = 0x562D
-0x6C42 = 0x4773
-0x6C46 = 0x5960
-0x6C4A = 0x6362
-0x6C50 = 0x4F2B
-0x6C54 = 0x6360
-0x6C55 = 0x4947
-0x6C57 = 0x3A39
-0x6C5B = 0x5134
-0x6C5C = 0x6361
-0x6C5D = 0x486A
-0x6C5E = 0x392F
-0x6C5F = 0x3D2D
-0x6C60 = 0x3358
-0x6C61 = 0x4E5B
-0x6C68 = 0x6368
-0x6C69 = 0x6369
-0x6C6A = 0x4D74
-0x6C70 = 0x4C2D
-0x6C72 = 0x3C33
-0x6C74 = 0x636A
-0x6C76 = 0x636B
-0x6C79 = 0x505A
-0x6C7D = 0x467B
-0x6C7E = 0x375A
-0x6C81 = 0x475F
-0x6C82 = 0x524A
-0x6C83 = 0x4E56
-0x6C85 = 0x6364
-0x6C86 = 0x636C
-0x6C88 = 0x4972
-0x6C89 = 0x3341
-0x6C8C = 0x6367
-0x6C8F = 0x4663
-0x6C90 = 0x6365
-0x6C93 = 0x6D33
-0x6C94 = 0x6366
-0x6C99 = 0x4933
-0x6C9B = 0x4566
-0x6CA1 = 0x433B
-0x6CAB = 0x442D
-0x6CAD = 0x6370
-0x6CAE = 0x3E5A
-0x6CB1 = 0x637B
-0x6CB2 = 0x6375
-0x6CB3 = 0x3A53
-0x6CB8 = 0x3750
-0x6CB9 = 0x534D
-0x6CBB = 0x564E
-0x6CBC = 0x5553
-0x6CBD = 0x3941
-0x6CBE = 0x5534
-0x6CBF = 0x5158
-0x6CC4 = 0x5039
-0x6CC5 = 0x4776
-0x6CC9 = 0x482A
-0x6CCA = 0x3234
-0x6CCC = 0x435A
-0x6CD0 = 0x636E
-0x6CD3 = 0x637C
-0x6CD4 = 0x636F
-0x6CD5 = 0x3728
-0x6CD6 = 0x6377
-0x6CD7 = 0x6374
-0x6CDB = 0x373A
-0x6CE0 = 0x6376
-0x6CE1 = 0x455D
-0x6CE2 = 0x3228
-0x6CE3 = 0x467C
-0x6CE5 = 0x4460
-0x6CE8 = 0x5722
-0x6CEA = 0x4061
-0x6CEB = 0x6379
-0x6CEE = 0x637A
-0x6CEF = 0x637D
-0x6CF0 = 0x4C29
-0x6CF1 = 0x6373
-0x6CF3 = 0x533E
-0x6CF5 = 0x3143
-0x6D04 = 0x6427
-0x6D07 = 0x6426
-0x6D0B = 0x5173
-0x6D0C = 0x6423
-0x6D0E = 0x6429
-0x6D17 = 0x4F34
-0x6D19 = 0x6428
-0x6D1A = 0x642E
-0x6D1B = 0x4265
-0x6D1E = 0x3634
-0x6D25 = 0x3D72
-0x6D27 = 0x6422
-0x6D2A = 0x3A69
-0x6D2B = 0x642A
-0x6D2E = 0x642C
-0x6D31 = 0x367D
-0x6D32 = 0x565E
-0x6D33 = 0x6432
-0x6D35 = 0x642D
-0x6D39 = 0x6421
-0x6D3B = 0x3B6E
-0x6D3D = 0x4722
-0x6D3E = 0x4549
-0x6D41 = 0x4177
-0x6D59 = 0x5563
-0x6D5A = 0x3F23
-0x6D5C = 0x643A
-0x6D5E = 0x6437
-0x6D60 = 0x643B
-0x6D63 = 0x643D
-0x6D66 = 0x4656
-0x6D69 = 0x3A46
-0x6D6A = 0x404B
-0x6D6E = 0x3821
-0x6D6F = 0x6434
-0x6D74 = 0x5421
-0x6D77 = 0x3A23
-0x6D78 = 0x3D7E
-0x6D79 = 0x6424
-0x6D7C = 0x643C
-0x6D82 = 0x786F
-0x6D85 = 0x4479
-0x6D87 = 0x637E
-0x6D88 = 0x4F7B
-0x6D89 = 0x4966
-0x6D8C = 0x533F
-0x6D8E = 0x4F51
-0x6D91 = 0x6433
-0x6D93 = 0x6438
-0x6D94 = 0x6439
-0x6D95 = 0x4C69
-0x6DAA = 0x3822
-0x6DAB = 0x644A
-0x6DAE = 0x644C
-0x6DAF = 0x5144
-0x6DB2 = 0x523A
-0x6DB5 = 0x3A2D
-0x6DB8 = 0x3A54
-0x6DBF = 0x6443
-0x6DC0 = 0x782D
-0x6DC4 = 0x574D
-0x6DC5 = 0x6440
-0x6DC6 = 0x4F7D
-0x6DC7 = 0x643F
-0x6DCB = 0x415C
-0x6DCC = 0x4C4A
-0x6DD1 = 0x4A67
-0x6DD6 = 0x4457
-0x6DD8 = 0x4C54
-0x6DD9 = 0x6448
-0x6DDD = 0x6447
-0x6DDE = 0x6441
-0x6DE0 = 0x6444
-0x6DE1 = 0x352D
-0x6DE4 = 0x5359
-0x6DE6 = 0x6446
-0x6DEA = 0x4259
-0x6DEB = 0x5279
-0x6DEC = 0x3463
-0x6DEE = 0x3B34
-0x6DF1 = 0x496E
-0x6DF3 = 0x343E
-0x6DF5 = 0x5428
-0x6DF6 = 0x6435
-0x6DF7 = 0x3B6C
-0x6DF9 = 0x514D
-0x6DFA = 0x4733
-0x6DFB = 0x4C6D
-0x6DFC = 0x6D35
-0x6E05 = 0x4765
-0x6E0C = 0x644B
-0x6E19 = 0x3B41
-0x6E1A = 0x643E
-0x6E1D = 0x5365
-0x6E20 = 0x477E
-0x6E21 = 0x3649
-0x6E23 = 0x547C
-0x6E24 = 0x3233
-0x6E25 = 0x6457
-0x6E26 = 0x4E50
-0x6E29 = 0x4E42
-0x6E2B = 0x644D
-0x6E2C = 0x3262
-0x6E2D = 0x4E3C
-0x6E2F = 0x385B
-0x6E32 = 0x6456
-0x6E34 = 0x3F4A
-0x6E38 = 0x534E
-0x6E3A = 0x436C
-0x6E3E = 0x3B6B
-0x6E43 = 0x4548
-0x6E44 = 0x6458
-0x6E4D = 0x4D44
-0x6E4E = 0x644F
-0x6E53 = 0x6454
-0x6E54 = 0x6455
-0x6E56 = 0x3A7E
-0x6E58 = 0x4F66
-0x6E5B = 0x553F
-0x6E5E = 0x6425
-0x6E5F = 0x6452
-0x6E6B = 0x6450
-0x6E6E = 0x644E
-0x6E6F = 0x4C40
-0x6E86 = 0x6453
-0x6E89 = 0x3848
-0x6E8F = 0x6467
-0x6E90 = 0x5434
-0x6E96 = 0x573C
-0x6E98 = 0x645B
-0x6E9C = 0x416F
-0x6E9D = 0x3935
-0x6E9F = 0x6469
-0x6EA2 = 0x5267
-0x6EA5 = 0x645F
-0x6EA7 = 0x6460
-0x6EAA = 0x4F2A
-0x6EAF = 0x4B5D
-0x6EB1 = 0x645A
-0x6EB2 = 0x6451
-0x6EB4 = 0x6465
-0x6EB6 = 0x485C
-0x6EB7 = 0x6463
-0x6EBA = 0x4467
-0x6EBB = 0x6462
-0x6EBD = 0x6461
-0x6EC1 = 0x337C
-0x6EC2 = 0x6468
-0x6EC4 = 0x3257
-0x6EC5 = 0x4370
-0x6EC7 = 0x3561
-0x6ECB = 0x574C
-0x6ECC = 0x3553
-0x6ECE = 0x5C7E
-0x6ECF = 0x6466
-0x6ED1 = 0x3B2C
-0x6ED3 = 0x5752
-0x6ED4 = 0x4C4F
-0x6ED5 = 0x6B78
-0x6EDA = 0x3976
-0x6EEC = 0x3B26
-0x6EEF = 0x564D
-0x6EF2 = 0x4978
-0x6EF4 = 0x354E
-0x6EF7 = 0x4231
-0x6EF8 = 0x6430
-0x6EF9 = 0x646F
-0x6EFF = 0x427A
-0x6F01 = 0x5366
-0x6F02 = 0x462F
-0x6F06 = 0x4661
-0x6F09 = 0x6475
-0x6F0F = 0x4229
-0x6F14 = 0x515D
-0x6F15 = 0x646E
-0x6F1A = 0x453D
-0x6F20 = 0x442E
-0x6F22 = 0x3A3A
-0x6F23 = 0x4130
-0x6F24 = 0x646D
-0x6F29 = 0x6476
-0x6F2A = 0x6474
-0x6F2B = 0x427E
-0x6F2C = 0x5755
-0x6F2D = 0x645D
-0x6F2F = 0x6470
-0x6F31 = 0x4A7E
-0x6F32 = 0x5547
-0x6F33 = 0x5544
-0x6F36 = 0x6471
-0x6F38 = 0x3D25
-0x6F3E = 0x517A
-0x6F3F = 0x3D2C
-0x6F41 = 0x7223
-0x6F51 = 0x4643
-0x6F54 = 0x3D60
-0x6F58 = 0x454B
-0x6F59 = 0x636D
-0x6F5B = 0x4731
-0x6F5E = 0x423A
-0x6F62 = 0x646A
-0x6F64 = 0x4873
-0x6F66 = 0x414A
-0x6F6D = 0x4C36
-0x6F6E = 0x3331
-0x6F6F = 0x6431
-0x6F70 = 0x4023
-0x6F72 = 0x647B
-0x6F74 = 0x6473
-0x6F77 = 0x6464
-0x6F78 = 0x647A
-0x6F7A = 0x647D
-0x6F7C = 0x647C
-0x6F7F = 0x6436
-0x6F80 = 0x492C
-0x6F84 = 0x334E
-0x6F86 = 0x3D3D
-0x6F87 = 0x4054
-0x6F88 = 0x333A
-0x6F89 = 0x6477
-0x6F8C = 0x6479
-0x6F8D = 0x6478
-0x6F8E = 0x456C
-0x6F97 = 0x3D27
-0x6FA0 = 0x6445
-0x6FA1 = 0x5468
-0x6FA4 = 0x5473
-0x6FA7 = 0x6522
-0x6FA9 = 0x6D34
-0x6FAE = 0x642B
-0x6FB1 = 0x356D
-0x6FB3 = 0x3044
-0x6FB6 = 0x6524
-0x6FB9 = 0x6523
-0x6FC0 = 0x3C24
-0x6FC1 = 0x5747
-0x6FC2 = 0x6525
-0x6FC3 = 0x4528
-0x6FC9 = 0x6521
-0x6FD5 = 0x4A2A
-0x6FD8 = 0x4522
-0x6FDB = 0x7855
-0x6FDE = 0x6528
-0x6FDF = 0x3C43
-0x6FE0 = 0x6529
-0x6FE1 = 0x6526
-0x6FE4 = 0x4C4E
-0x6FEB = 0x4044
-0x6FEE = 0x6527
-0x6FEF = 0x652A
-0x6FF0 = 0x4E2B
-0x6FF1 = 0x3175
-0x6FFA = 0x3D26
-0x6FFC = 0x6378
-0x6FFE = 0x424B
-0x7005 = 0x645E
-0x7006 = 0x6442
-0x7009 = 0x503A
-0x700B = 0x6449
-0x700F = 0x642F
-0x7011 = 0x4659
-0x7015 = 0x3174
-0x7018 = 0x6372
-0x701A = 0x652B
-0x701B = 0x652D
-0x701D = 0x4124
-0x701F = 0x646C
-0x7020 = 0x646B
-0x7023 = 0x652C
-0x7027 = 0x6371
-0x7028 = 0x647E
-0x7030 = 0x7858
-0x7032 = 0x6472
-0x7035 = 0x652F
-0x7039 = 0x652E
-0x703E = 0x403D
-0x7043 = 0x6363
-0x7044 = 0x645C
-0x704C = 0x3960
-0x7051 = 0x4877
-0x7055 = 0x406C
-0x7058 = 0x4C32
-0x705D = 0x6530
-0x705E = 0x6531
-0x7063 = 0x4D65
-0x7064 = 0x4250
-0x7067 = 0x6459
-0x706B = 0x3B70
-0x706C = 0x6C61
-0x7070 = 0x3B52
-0x7078 = 0x3E44
-0x707C = 0x5746
-0x707E = 0x5456
-0x7085 = 0x6A41
-0x708A = 0x3436
-0x708E = 0x5157
-0x7092 = 0x3334
-0x7094 = 0x4832
-0x7095 = 0x3F3B
-0x7096 = 0x6C40
-0x7099 = 0x564B
-0x70AB = 0x6C45
-0x70AC = 0x3E66
-0x70AD = 0x4C3F
-0x70AE = 0x455A
-0x70AF = 0x3E3C
-0x70B1 = 0x6C46
-0x70B3 = 0x317E
-0x70B7 = 0x6C44
-0x70B8 = 0x5528
-0x70BB = 0x6C42
-0x70C0 = 0x6C43
-0x70C8 = 0x4152
-0x70CA = 0x6C48
-0x70CF = 0x4E5A
-0x70D8 = 0x3A66
-0x70D9 = 0x4053
-0x70DF = 0x514C
-0x70E4 = 0x3F3E
-0x70EF = 0x4F29
-0x70F4 = 0x4C7E
-0x70F7 = 0x4D69
-0x70F9 = 0x456B
-0x70FD = 0x3769
-0x7109 = 0x5149
-0x710A = 0x3A38
-0x7110 = 0x6C49
-0x7113 = 0x6C4A
-0x7119 = 0x313A
-0x711A = 0x3759
-0x7121 = 0x4E5E
-0x7126 = 0x3D39
-0x712F = 0x6C4C
-0x7130 = 0x5166
-0x7131 = 0x6C4D
-0x7136 = 0x483B
-0x7145 = 0x6C51
-0x7149 = 0x4136
-0x714A = 0x6C53
-0x714C = 0x3B4D
-0x714E = 0x3C65
-0x7152 = 0x6C3F
-0x715C = 0x6C4F
-0x715E = 0x4937
-0x7162 = 0x5C64
-0x7164 = 0x433A
-0x7165 = 0x3B40
-0x7166 = 0x6C63
-0x7167 = 0x5555
-0x7168 = 0x6C50
-0x7169 = 0x3733
-0x716C = 0x6C3E
-0x716E = 0x5673
-0x7172 = 0x6C52
-0x7173 = 0x6C4E
-0x7178 = 0x6C54
-0x717A = 0x6C55
-0x717D = 0x493F
-0x7184 = 0x4F28
-0x718A = 0x505C
-0x718F = 0x512C
-0x7192 = 0x532B
-0x7194 = 0x485B
-0x7197 = 0x6C41
-0x7198 = 0x6C56
-0x7199 = 0x4E75
-0x719F = 0x4A6C
-0x71A0 = 0x6C5A
-0x71A8 = 0x6C59
-0x71AC = 0x303E
-0x71B1 = 0x4848
-0x71B3 = 0x6C57
-0x71B5 = 0x6C58
-0x71B9 = 0x6C64
-0x71BE = 0x3363
-0x71C1 = 0x6C47
-0x71C3 = 0x483C
-0x71C8 = 0x3546
-0x71CE = 0x4147
-0x71D2 = 0x4955
-0x71D4 = 0x6C5C
-0x71D5 = 0x5160
-0x71D9 = 0x4C4C
-0x71DC = 0x6C4B
-0x71DF = 0x532A
-0x71E0 = 0x6C5B
-0x71E5 = 0x546F
-0x71E6 = 0x3253
-0x71E7 = 0x6C5D
-0x71ED = 0x5672
-0x71EE = 0x5B46
-0x71F4 = 0x3B62
-0x71F9 = 0x6C5E
-0x71FC = 0x3D7D
-0x71FE = 0x6C62
-0x7206 = 0x312C
-0x720D = 0x4B38
-0x7210 = 0x422F
-0x721B = 0x4043
-0x721D = 0x6C5F
-0x7228 = 0x6C60
-0x722A = 0x5726
-0x722C = 0x4540
-0x722D = 0x5579
-0x7230 = 0x6B3C
-0x7232 = 0x4E2A
-0x7235 = 0x3E74
-0x7236 = 0x3838
-0x7238 = 0x3056
-0x7239 = 0x3579
-0x723A = 0x522F
-0x723B = 0x5833
-0x723D = 0x4B2C
-0x723E = 0x367B
-0x723F = 0x635D
-0x7247 = 0x462C
-0x7248 = 0x3066
-0x724C = 0x4546
-0x7252 = 0x6B3A
-0x7256 = 0x6B3B
-0x7258 = 0x6B39
-0x7259 = 0x5140
-0x725B = 0x4523
-0x725D = 0x6A72
-0x725F = 0x4432
-0x7261 = 0x4435
-0x7262 = 0x404E
-0x7266 = 0x6A73
-0x7267 = 0x4441
-0x7269 = 0x4E6F
-0x726E = 0x6A70
-0x726F = 0x6A74
-0x7272 = 0x497C
-0x7279 = 0x4C58
-0x727D = 0x4723
-0x727E = 0x6A75
-0x727F = 0x6A76
-0x7280 = 0x4F2C
-0x7281 = 0x4067
-0x7284 = 0x6A77
-0x728B = 0x6A78
-0x728D = 0x6A79
-0x728F = 0x6A7A
-0x7292 = 0x6A7B
-0x7296 = 0x5C7D
-0x729F = 0x6A71
-0x72A2 = 0x363F
-0x72A7 = 0x4E7E
-0x72AC = 0x482E
-0x72AD = 0x616B
-0x72AF = 0x3738
-0x72B0 = 0x616C
-0x72B4 = 0x616D
-0x72C0 = 0x5734
-0x72C1 = 0x6171
-0x72C2 = 0x3F71
-0x72C3 = 0x6170
-0x72C4 = 0x3552
-0x72CD = 0x6173
-0x72CE = 0x6172
-0x72D0 = 0x3A7C
-0x72D2 = 0x6174
-0x72D7 = 0x3937
-0x72D9 = 0x3E51
-0x72E0 = 0x3A5D
-0x72E1 = 0x3D46
-0x72E8 = 0x6175
-0x72E9 = 0x6177
-0x72F3 = 0x617C
-0x72F4 = 0x6179
-0x72F7 = 0x617A
-0x72F8 = 0x406A
-0x72F9 = 0x4F41
-0x72FA = 0x617E
-0x72FB = 0x6221
-0x72FC = 0x4047
-0x72FD = 0x3137
-0x7301 = 0x617B
-0x730A = 0x6225
-0x7313 = 0x6223
-0x7316 = 0x327E
-0x7317 = 0x6222
-0x7319 = 0x5578
-0x731B = 0x434D
-0x731C = 0x3242
-0x731D = 0x6227
-0x731E = 0x6226
-0x7322 = 0x6229
-0x7325 = 0x622B
-0x7329 = 0x5049
-0x732A = 0x566D
-0x732B = 0x4328
-0x732C = 0x622C
-0x7331 = 0x622E
-0x7334 = 0x3A6F
-0x7336 = 0x534C
-0x7337 = 0x6960
-0x7338 = 0x622D
-0x7339 = 0x622A
-0x733B = 0x6178
-0x733E = 0x3B2B
-0x733F = 0x5433
-0x7341 = 0x616F
-0x7344 = 0x537C
-0x7345 = 0x4A28
-0x734D = 0x6230
-0x7350 = 0x622F
-0x7352 = 0x6961
-0x7357 = 0x6231
-0x7360 = 0x6232
-0x7368 = 0x3640
-0x736A = 0x6176
-0x736B = 0x617D
-0x736C = 0x6233
-0x736F = 0x6234
-0x7370 = 0x447C
-0x7372 = 0x3B71
-0x7375 = 0x4154
-0x7377 = 0x616E
-0x7378 = 0x4A5E
-0x737A = 0x4C21
-0x737B = 0x4F57
-0x737C = 0x6228
-0x737E = 0x6235
-0x7380 = 0x6224
-0x7384 = 0x507E
-0x7387 = 0x424A
-0x7389 = 0x5371
-0x738B = 0x4D75
-0x738E = 0x6760
-0x7396 = 0x3E41
-0x739F = 0x6764
-0x73A2 = 0x6763
-0x73A9 = 0x4D66
-0x73AB = 0x4335
-0x73B2 = 0x4161
-0x73B3 = 0x6769
-0x73B7 = 0x6768
-0x73BB = 0x3223
-0x73C0 = 0x676A
-0x73C2 = 0x6766
-0x73C8 = 0x676C
-0x73C9 = 0x676B
-0x73CA = 0x493A
-0x73CD = 0x5564
-0x73CF = 0x6765
-0x73D0 = 0x3729
-0x73D9 = 0x676E
-0x73DE = 0x6773
-0x73E0 = 0x5669
-0x73E5 = 0x676D
-0x73E7 = 0x6772
-0x73E9 = 0x6771
-0x73ED = 0x3060
-0x73FE = 0x4F56
-0x7403 = 0x4772
-0x7405 = 0x4045
-0x7406 = 0x406D
-0x7409 = 0x4170
-0x740A = 0x6770
-0x741A = 0x6822
-0x741B = 0x6821
-0x7422 = 0x5741
-0x7425 = 0x677A
-0x7426 = 0x6779
-0x7428 = 0x677B
-0x742A = 0x6777
-0x742C = 0x677E
-0x742E = 0x677D
-0x7430 = 0x677C
-0x7433 = 0x4155
-0x7434 = 0x4759
-0x7435 = 0x457D
-0x7436 = 0x4543
-0x743F = 0x6775
-0x7441 = 0x6823
-0x744B = 0x6762
-0x7455 = 0x6826
-0x7457 = 0x6825
-0x7459 = 0x6827
-0x745A = 0x3A77
-0x745B = 0x6778
-0x745C = 0x6824
-0x745E = 0x4870
-0x745F = 0x492A
-0x7463 = 0x4B76
-0x7469 = 0x5328
-0x746A = 0x426A
-0x746D = 0x6829
-0x7470 = 0x3965
-0x7476 = 0x517E
-0x747E = 0x682A
-0x7480 = 0x682D
-0x7481 = 0x682E
-0x7483 = 0x4127
-0x7487 = 0x682F
-0x7489 = 0x6776
-0x748B = 0x6830
-0x7490 = 0x6834
-0x749C = 0x682B
-0x749E = 0x6831
-0x74A3 = 0x6761
-0x74A6 = 0x6828
-0x74A7 = 0x6835
-0x74A8 = 0x6832
-0x74A9 = 0x6833
-0x74B0 = 0x3B37
-0x74BA = 0x6837
-0x74BD = 0x6774
-0x74CA = 0x476D
-0x74CF = 0x6767
-0x74D4 = 0x682C
-0x74DA = 0x6836
-0x74DC = 0x394F
-0x74DE = 0x702C
-0x74E0 = 0x702D
-0x74E2 = 0x4630
-0x74E3 = 0x306A
-0x74E4 = 0x483F
-0x74E6 = 0x4D5F
-0x74EE = 0x4E4D
-0x74F4 = 0x6A32
-0x74F6 = 0x463F
-0x74F7 = 0x3449
-0x74FF = 0x6A33
-0x7504 = 0x5567
-0x750C = 0x6A31
-0x750D = 0x5D79
-0x750F = 0x6A34
-0x7511 = 0x6A35
-0x7513 = 0x6A36
-0x7518 = 0x384A
-0x7519 = 0x5F30
-0x751A = 0x4975
-0x751C = 0x4C70
-0x751F = 0x497A
-0x7523 = 0x327A
-0x7525 = 0x497B
-0x7528 = 0x5343
-0x7529 = 0x4B26
-0x752B = 0x3826
-0x752C = 0x702E
-0x752D = 0x3142
-0x752F = 0x6538
-0x7530 = 0x4C6F
-0x7531 = 0x5349
-0x7532 = 0x3C57
-0x7533 = 0x496A
-0x7537 = 0x4450
-0x7538 = 0x3569
-0x753A = 0x6E2E
-0x753E = 0x675E
-0x7540 = 0x6E2F
-0x7548 = 0x6E32
-0x754B = 0x6E31
-0x754C = 0x3D67
-0x754E = 0x6E30
-0x754F = 0x4E37
-0x7554 = 0x454F
-0x7559 = 0x4174
-0x755A = 0x5B4E
-0x755B = 0x6E33
-0x755C = 0x5073
-0x755D = 0x4436
-0x7562 = 0x314F
-0x7565 = 0x4254
-0x7566 = 0x4668
-0x756A = 0x372C
-0x756B = 0x3B2D
-0x7572 = 0x6E34
-0x7576 = 0x3531
-0x7578 = 0x3B7B
-0x7579 = 0x6E35
-0x757F = 0x675C
-0x7583 = 0x6E36
-0x7586 = 0x3D2E
-0x7587 = 0x336B
-0x758A = 0x357E
-0x758B = 0x7162
-0x758F = 0x4A68
-0x7591 = 0x5249
-0x7592 = 0x705A
-0x7594 = 0x705B
-0x7599 = 0x386D
-0x759A = 0x3E4E
-0x759D = 0x705E
-0x75A3 = 0x7060
-0x75A4 = 0x304C
-0x75A5 = 0x3D6A
-0x75AB = 0x525F
-0x75B0 = 0x7066
-0x75B1 = 0x7065
-0x75B2 = 0x4623
-0x75B3 = 0x7061
-0x75B4 = 0x7062
-0x75B5 = 0x3443
-0x75B8 = 0x7063
-0x75B9 = 0x556E
-0x75BC = 0x4C5B
-0x75BD = 0x3E52
-0x75BE = 0x3C32
-0x75C2 = 0x7068
-0x75C3 = 0x7067
-0x75C4 = 0x7064
-0x75C5 = 0x3221
-0x75C7 = 0x7921
-0x75CA = 0x482C
-0x75CD = 0x706A
-0x75D4 = 0x564C
-0x75D5 = 0x3A5B
-0x75D8 = 0x363B
-0x75D9 = 0x3E37
-0x75DB = 0x4D34
-0x75DE = 0x4626
-0x75E2 = 0x4121
-0x75E3 = 0x706B
-0x75E4 = 0x706E
-0x75E6 = 0x706D
-0x75E7 = 0x7070
-0x75F0 = 0x4C35
-0x75F1 = 0x7072
-0x75F4 = 0x3355
-0x75F9 = 0x3154
-0x75FC = 0x7073
-0x75FF = 0x7074
-0x7600 = 0x7076
-0x7601 = 0x3461
-0x7602 = 0x7069
-0x7603 = 0x7071
-0x760A = 0x707A
-0x760B = 0x3768
-0x760C = 0x7078
-0x760D = 0x5171
-0x7610 = 0x7075
-0x7613 = 0x3B3E
-0x7615 = 0x707D
-0x7619 = 0x707E
-0x761B = 0x7121
-0x761E = 0x7079
-0x761F = 0x4E41
-0x7620 = 0x7124
-0x7621 = 0x342F
-0x7622 = 0x7123
-0x7624 = 0x4176
-0x7625 = 0x707B
-0x7626 = 0x4A5D
-0x7627 = 0x4531
-0x7629 = 0x3471
-0x762D = 0x7126
-0x7630 = 0x7127
-0x7633 = 0x712C
-0x7634 = 0x554E
-0x7635 = 0x7129
-0x7638 = 0x4833
-0x763B = 0x707C
-0x763C = 0x7122
-0x7640 = 0x7125
-0x7642 = 0x4146
-0x7643 = 0x712A
-0x7646 = 0x706C
-0x7647 = 0x706F
-0x7649 = 0x7077
-0x764C = 0x3029
-0x764D = 0x712D
-0x7654 = 0x712F
-0x7656 = 0x7131
-0x7658 = 0x705D
-0x765C = 0x7130
-0x765F = 0x3171
-0x7662 = 0x5177
-0x7664 = 0x705C
-0x7665 = 0x5622
-0x7667 = 0x705F
-0x7669 = 0x712E
-0x766C = 0x5122
-0x766D = 0x7128
-0x766E = 0x712B
-0x766F = 0x7133
-0x7670 = 0x5338
-0x7671 = 0x4C31
-0x7672 = 0x7132
-0x7678 = 0x396F
-0x767B = 0x3547
-0x767C = 0x3722
-0x767D = 0x3057
-0x767E = 0x3059
-0x7682 = 0x546D
-0x7684 = 0x3544
-0x7686 = 0x3D54
-0x7687 = 0x3B4A
-0x7688 = 0x7027
-0x768B = 0x385E
-0x768E = 0x7028
-0x7693 = 0x7029
-0x7696 = 0x4D6E
-0x7699 = 0x702A
-0x769A = 0x3028
-0x76A4 = 0x702B
-0x76AE = 0x4624
-0x76B4 = 0x7165
-0x76B8 = 0x7164
-0x76BA = 0x5665
-0x76BF = 0x4373
-0x76C2 = 0x535B
-0x76C5 = 0x5651
-0x76C6 = 0x4568
-0x76C8 = 0x532F
-0x76CA = 0x5266
-0x76CD = 0x6E41
-0x76CE = 0x303B
-0x76D2 = 0x3A50
-0x76D4 = 0x3F78
-0x76D7 = 0x3541
-0x76DB = 0x4A22
-0x76DE = 0x5535
-0x76DF = 0x434B
-0x76E1 = 0x3E21
-0x76E3 = 0x3C60
-0x76E4 = 0x454C
-0x76E5 = 0x6E42
-0x76E7 = 0x422C
-0x76EE = 0x443F
-0x76EF = 0x3622
-0x76F1 = 0x6D6C
-0x76F2 = 0x4324
-0x76F4 = 0x5631
-0x76F8 = 0x4F60
-0x76F9 = 0x6D6F
-0x76FC = 0x454E
-0x76FE = 0x365C
-0x7701 = 0x4A21
-0x7704 = 0x6D6D
-0x7707 = 0x6D70
-0x7708 = 0x6D71
-0x7709 = 0x433C
-0x770B = 0x3F34
-0x7719 = 0x6D74
-0x771A = 0x6D72
-0x771F = 0x5566
-0x7720 = 0x435F
-0x7722 = 0x6D73
-0x7726 = 0x6D76
-0x7728 = 0x5523
-0x7729 = 0x5123
-0x772D = 0x6D75
-0x772F = 0x4350
-0x7735 = 0x6D77
-0x7736 = 0x3F74
-0x7737 = 0x3E6C
-0x7738 = 0x6D78
-0x773A = 0x4C77
-0x773C = 0x515B
-0x7740 = 0x5745
-0x7743 = 0x6D7C
-0x7747 = 0x6D7B
-0x774F = 0x784A
-0x775A = 0x6D7D
-0x775B = 0x3E26
-0x775C = 0x5576
-0x775E = 0x6D79
-0x7761 = 0x4B2F
-0x7762 = 0x6E21
-0x7763 = 0x363D
-0x7765 = 0x6E22
-0x7766 = 0x4440
-0x7768 = 0x6D7E
-0x776B = 0x3D5E
-0x776C = 0x3247
-0x7779 = 0x3643
-0x777D = 0x6E25
-0x777E = 0x583A
-0x777F = 0x6E23
-0x7780 = 0x6E26
-0x7784 = 0x4369
-0x7785 = 0x3372
-0x778C = 0x6E27
-0x778D = 0x6E24
-0x778E = 0x4F39
-0x7791 = 0x6E28
-0x7798 = 0x6D6E
-0x779E = 0x4277
-0x779F = 0x6E29
-0x77A0 = 0x6E2A
-0x77A2 = 0x5E2B
-0x77A5 = 0x4633
-0x77A7 = 0x4746
-0x77AA = 0x3549
-0x77AC = 0x4B32
-0x77AD = 0x7851
-0x77B0 = 0x6E2B
-0x77B3 = 0x4D2B
-0x77B5 = 0x6E2C
-0x77BB = 0x5530
-0x77BC = 0x6D7A
-0x77BD = 0x6E2D
-0x77BF = 0x7644
-0x77C7 = 0x7857
-0x77CD = 0x5B47
-0x77D7 = 0x3423
-0x77DA = 0x5675
-0x77DB = 0x432C
-0x77DC = 0x7166
-0x77E2 = 0x4A38
-0x77E3 = 0x5253
-0x77E5 = 0x562A
-0x77E7 = 0x6F72
-0x77E9 = 0x3E58
-0x77EC = 0x6F73
-0x77ED = 0x364C
-0x77EE = 0x302B
-0x77EF = 0x3D43
-0x77F3 = 0x4A2F
-0x77F8 = 0x6D37
-0x77FD = 0x4E79
-0x7802 = 0x4930
-0x7809 = 0x6D39
-0x780C = 0x4676
-0x780D = 0x3F33
-0x7811 = 0x6D3C
-0x7812 = 0x4578
-0x7814 = 0x5150
-0x7818 = 0x6D3B
-0x781D = 0x6D40
-0x781F = 0x6D44
-0x7823 = 0x6D48
-0x7825 = 0x6D46
-0x7826 = 0x6D4E
-0x7827 = 0x5568
-0x7829 = 0x6D49
-0x782C = 0x6D47
-0x782D = 0x6D3E
-0x7830 = 0x4569
-0x7834 = 0x4646
-0x7837 = 0x4969
-0x7838 = 0x5452
-0x7839 = 0x6D41
-0x783C = 0x6D45
-0x7843 = 0x7927
-0x7845 = 0x3968
-0x7847 = 0x6D50
-0x784C = 0x6D51
-0x784E = 0x6D4A
-0x7850 = 0x6D4F
-0x7852 = 0x4E78
-0x785D = 0x4F75
-0x7864 = 0x6D4C
-0x7868 = 0x6D3A
-0x786A = 0x6D52
-0x786B = 0x4172
-0x786C = 0x5332
-0x786D = 0x6D4B
-0x786E = 0x7866
-0x786F = 0x5162
-0x787C = 0x4570
-0x7887 = 0x6D56
-0x7889 = 0x356F
-0x788C = 0x4235
-0x788E = 0x4B69
-0x7891 = 0x312E
-0x7893 = 0x6D54
-0x7897 = 0x4D6B
-0x7898 = 0x3562
-0x789A = 0x6D55
-0x789F = 0x357A
-0x78A1 = 0x6D58
-0x78A3 = 0x6D59
-0x78A5 = 0x6D5C
-0x78A7 = 0x314C
-0x78A9 = 0x4B36
-0x78AD = 0x6D38
-0x78B0 = 0x4576
-0x78B1 = 0x3C6E
-0x78B2 = 0x6D5A
-0x78B3 = 0x4C3C
-0x78B4 = 0x326A
-0x78B8 = 0x6D3F
-0x78B9 = 0x6D5B
-0x78BA = 0x4837
-0x78BC = 0x426B
-0x78BE = 0x446B
-0x78C1 = 0x3445
-0x78C5 = 0x3075
-0x78C9 = 0x6D5F
-0x78CA = 0x405A
-0x78CB = 0x3468
-0x78D0 = 0x454D
-0x78D4 = 0x6D5D
-0x78D5 = 0x3F44
-0x78D9 = 0x6D5E
-0x78DA = 0x5729
-0x78E3 = 0x6D57
-0x78E7 = 0x6D53
-0x78E8 = 0x4425
-0x78EC = 0x6D60
-0x78EF = 0x6D36
-0x78F2 = 0x6D61
-0x78F4 = 0x6D63
-0x78F7 = 0x4157
-0x78FA = 0x3B47
-0x78FD = 0x6D4D
-0x7901 = 0x3D38
-0x7905 = 0x6D62
-0x790E = 0x3421
-0x7913 = 0x6D64
-0x7919 = 0x302D
-0x791E = 0x6D66
-0x7924 = 0x6D65
-0x7926 = 0x3F73
-0x792A = 0x6D42
-0x792B = 0x4079
-0x792C = 0x372F
-0x7931 = 0x6D43
-0x7934 = 0x6D67
-0x793A = 0x4A3E
-0x793B = 0x6C6A
-0x793E = 0x4967
-0x7940 = 0x6C6B
-0x7941 = 0x466E
-0x7946 = 0x6C6C
-0x7948 = 0x466D
-0x7949 = 0x6C6D
-0x7953 = 0x6C70
-0x7956 = 0x5766
-0x7957 = 0x6C73
-0x795A = 0x6C71
-0x795B = 0x6C6E
-0x795C = 0x6C6F
-0x795D = 0x5723
-0x795E = 0x4971
-0x795F = 0x4B6E
-0x7960 = 0x6C74
-0x7965 = 0x4F69
-0x7967 = 0x6C76
-0x7968 = 0x4631
-0x796D = 0x3C40
-0x797A = 0x6C77
-0x7980 = 0x5977
-0x7981 = 0x3D7B
-0x7984 = 0x423B
-0x798A = 0x6C79
-0x798D = 0x3B76
-0x798E = 0x6C75
-0x798F = 0x3823
-0x799A = 0x6C7A
-0x79A6 = 0x787A
-0x79A7 = 0x6C7B
-0x79AA = 0x6C78
-0x79AE = 0x4071
-0x79B0 = 0x6C72
-0x79B1 = 0x353B
-0x79B3 = 0x6C7C
-0x79B9 = 0x536D
-0x79BA = 0x582E
-0x79BD = 0x475D
-0x79BE = 0x3A4C
-0x79C0 = 0x5063
-0x79C1 = 0x4B3D
-0x79C3 = 0x4D3A
-0x79C6 = 0x3851
-0x79C9 = 0x317C
-0x79CB = 0x476F
-0x79CD = 0x7926
-0x79D1 = 0x3F46
-0x79D2 = 0x436B
-0x79D5 = 0x6F75
-0x79D8 = 0x4358
-0x79DF = 0x5762
-0x79E3 = 0x6F77
-0x79E4 = 0x3353
-0x79E6 = 0x4758
-0x79E7 = 0x516D
-0x79E9 = 0x5648
-0x79EB = 0x6F78
-0x79ED = 0x6F76
-0x79F8 = 0x3D55
-0x79FB = 0x5246
-0x7A00 = 0x4F21
-0x7A02 = 0x6F7C
-0x7A03 = 0x6F7B
-0x7A06 = 0x6F79
-0x7A0B = 0x334C
-0x7A0D = 0x4954
-0x7A0E = 0x4B30
-0x7A14 = 0x6F7E
-0x7A17 = 0x305E
-0x7A1A = 0x5649
-0x7A1E = 0x6F7D
-0x7A20 = 0x336D
-0x7A2E = 0x5656
-0x7A31 = 0x3346
-0x7A37 = 0x7022
-0x7A39 = 0x7021
-0x7A3B = 0x353E
-0x7A3C = 0x3C5A
-0x7A3D = 0x3B7C
-0x7A3F = 0x3865
-0x7A40 = 0x7836
-0x7A46 = 0x4442
-0x7A4C = 0x7655
-0x7A4D = 0x3B7D
-0x7A4E = 0x5331
-0x7A57 = 0x4B6B
-0x7A61 = 0x7023
-0x7A62 = 0x3B60
-0x7A69 = 0x4E48
-0x7A6B = 0x783E
-0x7A70 = 0x7026
-0x7A74 = 0x5128
-0x7A76 = 0x3E3F
-0x7A78 = 0x7136
-0x7A79 = 0x7137
-0x7A7A = 0x3F55
-0x7A7F = 0x3429
-0x7A80 = 0x7138
-0x7A81 = 0x4D3B
-0x7A84 = 0x552D
-0x7A86 = 0x7139
-0x7A88 = 0x713A
-0x7A91 = 0x5224
-0x7A92 = 0x564F
-0x7A95 = 0x713B
-0x7A96 = 0x3D51
-0x7A97 = 0x3430
-0x7A98 = 0x3E3D
-0x7A9F = 0x3F5F
-0x7AA0 = 0x713D
-0x7AA8 = 0x713F
-0x7AA9 = 0x4E51
-0x7AAA = 0x4D5D
-0x7AAC = 0x713E
-0x7AAE = 0x476E
-0x7AB3 = 0x7141
-0x7AB6 = 0x7140
-0x7ABA = 0x3F7A
-0x7ABF = 0x417E
-0x7AC4 = 0x345C
-0x7AC5 = 0x474F
-0x7AC7 = 0x713C
-0x7AC8 = 0x546E
-0x7ACA = 0x4754
-0x7ACB = 0x4122
-0x7AD9 = 0x553E
-0x7ADF = 0x3E39
-0x7AE0 = 0x5542
-0x7AE3 = 0x3F22
-0x7AE5 = 0x4D2F
-0x7AE6 = 0x7135
-0x7AEA = 0x4A7A
-0x7AED = 0x3D5F
-0x7AEF = 0x364B
-0x7AF6 = 0x3E3A
-0x7AF9 = 0x5671
-0x7AFA = 0x7343
-0x7AFD = 0x7344
-0x7AFF = 0x384D
-0x7B04 = 0x7347
-0x7B06 = 0x304A
-0x7B08 = 0x7345
-0x7B0A = 0x7349
-0x7B0B = 0x4B71
-0x7B0F = 0x734B
-0x7B11 = 0x5026
-0x7B19 = 0x734F
-0x7B1B = 0x3551
-0x7B1E = 0x7357
-0x7B20 = 0x7352
-0x7B24 = 0x7354
-0x7B25 = 0x7353
-0x7B26 = 0x377B
-0x7B28 = 0x313F
-0x7B2A = 0x734E
-0x7B2B = 0x734A
-0x7B2C = 0x355A
-0x7B2E = 0x7350
-0x7B31 = 0x7351
-0x7B33 = 0x7355
-0x7B38 = 0x734D
-0x7B45 = 0x735A
-0x7B46 = 0x314A
-0x7B47 = 0x734C
-0x7B49 = 0x3548
-0x7B4B = 0x3D6E
-0x7B4C = 0x735C
-0x7B4F = 0x3724
-0x7B50 = 0x3F70
-0x7B51 = 0x7928
-0x7B52 = 0x4D32
-0x7B54 = 0x3470
-0x7B56 = 0x325F
-0x7B58 = 0x7358
-0x7B60 = 0x735E
-0x7B62 = 0x7361
-0x7B67 = 0x7348
-0x7B6E = 0x735F
-0x7B71 = 0x7363
-0x7B72 = 0x7362
-0x7B75 = 0x735B
-0x7B77 = 0x3F6A
-0x7B7B = 0x7360
-0x7B85 = 0x736B
-0x7B8B = 0x3C63
-0x7B8D = 0x393F
-0x7B8F = 0x735D
-0x7B90 = 0x7364
-0x7B94 = 0x322D
-0x7B95 = 0x3B7E
-0x7B97 = 0x4B63
-0x7B9C = 0x736D
-0x7B9D = 0x7369
-0x7BA1 = 0x395C
-0x7BA2 = 0x736E
-0x7BAC = 0x7368
-0x7BAD = 0x3C7D
-0x7BB1 = 0x4F64
-0x7BB4 = 0x7370
-0x7BB8 = 0x7367
-0x7BC0 = 0x3D5A
-0x7BC1 = 0x7372
-0x7BC4 = 0x3736
-0x7BC6 = 0x572D
-0x7BC7 = 0x462A
-0x7BC9 = 0x567E
-0x7BCB = 0x7366
-0x7BCC = 0x7373
-0x7BD9 = 0x385D
-0x7BDA = 0x7375
-0x7BDD = 0x7374
-0x7BE1 = 0x345B
-0x7BE4 = 0x7346
-0x7BE5 = 0x7376
-0x7BE6 = 0x7377
-0x7BE9 = 0x4938
-0x7BEA = 0x7378
-0x7BF3 = 0x7359
-0x7BF7 = 0x4571
-0x7BFC = 0x737B
-0x7BFE = 0x737A
-0x7C00 = 0x7365
-0x7C07 = 0x3458
-0x7C0B = 0x737E
-0x7C0C = 0x7379
-0x7C0D = 0x4228
-0x7C0F = 0x737C
-0x7C1E = 0x736C
-0x7C1F = 0x7421
-0x7C21 = 0x3C72
-0x7C23 = 0x7371
-0x7C26 = 0x7423
-0x7C27 = 0x3B49
-0x7C2A = 0x7422
-0x7C2B = 0x736F
-0x7C38 = 0x7424
-0x7C3D = 0x4729
-0x7C3E = 0x4131
-0x7C3F = 0x323E
-0x7C40 = 0x7426
-0x7C43 = 0x403A
-0x7C4C = 0x336F
-0x7C4D = 0x3C2E
-0x7C5C = 0x736A
-0x7C5F = 0x7425
-0x7C60 = 0x417D
-0x7C64 = 0x7862
-0x7C69 = 0x7356
-0x7C6A = 0x737D
-0x7C6C = 0x4069
-0x7C6E = 0x4261
-0x7C72 = 0x787B
-0x7C73 = 0x4357
-0x7C7C = 0x744C
-0x7C7D = 0x5751
-0x7C89 = 0x375B
-0x7C91 = 0x744E
-0x7C92 = 0x4123
-0x7C95 = 0x4649
-0x7C97 = 0x3456
-0x7C98 = 0x5533
-0x7C9E = 0x7451
-0x7C9F = 0x4B5A
-0x7CA2 = 0x7452
-0x7CA4 = 0x5441
-0x7CA5 = 0x5660
-0x7CB1 = 0x413B
-0x7CB2 = 0x7453
-0x7CB3 = 0x3E2C
-0x7CB9 = 0x3462
-0x7CBC = 0x7454
-0x7CBD = 0x7455
-0x7CBE = 0x3E2B
-0x7CC5 = 0x745B
-0x7CC7 = 0x7457
-0x7CC8 = 0x745A
-0x7CCA = 0x3A7D
-0x7CCC = 0x7458
-0x7CCD = 0x7459
-0x7CD5 = 0x3862
-0x7CD6 = 0x4C47
-0x7CD7 = 0x745C
-0x7CD9 = 0x325A
-0x7CDC = 0x4353
-0x7CDD = 0x7456
-0x7CDE = 0x3760
-0x7CDF = 0x5463
-0x7CE0 = 0x3F37
-0x7CE7 = 0x4138
-0x7CE8 = 0x745D
-0x7CEF = 0x4534
-0x7CF0 = 0x7870
-0x7CF2 = 0x744F
-0x7CF4 = 0x5961
-0x7CF6 = 0x7450
-0x7CF8 = 0x7469
-0x7CF9 = 0x6679
-0x7CFB = 0x4F35
-0x7CFE = 0x3E40
-0x7D00 = 0x3C4D
-0x7D02 = 0x667B
-0x7D04 = 0x543C
-0x7D05 = 0x3A6C
-0x7D06 = 0x667A
-0x7D07 = 0x667C
-0x7D08 = 0x667D
-0x7D09 = 0x4852
-0x7D0A = 0x4E49
-0x7D0B = 0x4E46
-0x7D0D = 0x4449
-0x7D10 = 0x4526
-0x7D13 = 0x6723
-0x7D14 = 0x343F
-0x7D15 = 0x6722
-0x7D17 = 0x4934
-0x7D19 = 0x563D
-0x7D1A = 0x3C36
-0x7D1B = 0x3757
-0x7D1C = 0x6721
-0x7D20 = 0x4B58
-0x7D21 = 0x3744
-0x7D22 = 0x4B77
-0x7D2B = 0x574F
-0x7D2F = 0x405B
-0x7D30 = 0x4F38
-0x7D31 = 0x6726
-0x7D32 = 0x6725
-0x7D33 = 0x4970
-0x7D39 = 0x495C
-0x7D3A = 0x6724
-0x7D3C = 0x6728
-0x7D3F = 0x672A
-0x7D40 = 0x6729
-0x7D42 = 0x5655
-0x7D44 = 0x5769
-0x7D46 = 0x306D
-0x7D4E = 0x672C
-0x7D50 = 0x3D61
-0x7D5D = 0x672B
-0x7D5E = 0x3D4A
-0x7D61 = 0x4267
-0x7D62 = 0x5124
-0x7D66 = 0x3878
-0x7D68 = 0x485E
-0x7D6E = 0x5075
-0x7D71 = 0x4D33
-0x7D72 = 0x4B3F
-0x7D73 = 0x672D
-0x7D76 = 0x3E78
-0x7D79 = 0x3E6E
-0x7D81 = 0x3073
-0x7D83 = 0x672F
-0x7D86 = 0x672E
-0x7D88 = 0x6730
-0x7D89 = 0x5065
-0x7D8F = 0x4B67
-0x7D93 = 0x3E2D
-0x7D9C = 0x575B
-0x7D9E = 0x6736
-0x7DA2 = 0x3371
-0x7DA3 = 0x6739
-0x7DA6 = 0x746B
-0x7DAB = 0x4F5F
-0x7DAC = 0x6737
-0x7DAD = 0x4E2C
-0x7DAE = 0x746C
-0x7DB0 = 0x673A
-0x7DB1 = 0x3859
-0x7DB2 = 0x4D78
-0x7DB3 = 0x3141
-0x7DB4 = 0x573A
-0x7DB8 = 0x425A
-0x7DB9 = 0x6738
-0x7DBA = 0x6732
-0x7DBB = 0x5540
-0x7DBD = 0x3442
-0x7DBE = 0x6731
-0x7DBF = 0x4360
-0x7DC4 = 0x6735
-0x7DC7 = 0x673B
-0x7DCA = 0x3D74
-0x7DCB = 0x6733
-0x7DD1 = 0x424C
-0x7DD2 = 0x5077
-0x7DD4 = 0x6734
-0x7DD7 = 0x673D
-0x7DD8 = 0x3C6A
-0x7DD9 = 0x673C
-0x7DDD = 0x3C29
-0x7DDE = 0x3650
-0x7DE0 = 0x355E
-0x7DE1 = 0x6745
-0x7DE3 = 0x5435
-0x7DE6 = 0x6741
-0x7DE8 = 0x3160
-0x7DE9 = 0x3B3A
-0x7DEC = 0x4365
-0x7DEF = 0x4E33
-0x7DF1 = 0x6743
-0x7DF2 = 0x673F
-0x7DF4 = 0x4137
-0x7DF6 = 0x6742
-0x7DF9 = 0x673E
-0x7DFB = 0x7924
-0x7E08 = 0x5D53
-0x7E09 = 0x6746
-0x7E0A = 0x674B
-0x7E0B = 0x6744
-0x7E10 = 0x6727
-0x7E11 = 0x674C
-0x7E1B = 0x383F
-0x7E1D = 0x6747
-0x7E1E = 0x6749
-0x7E1F = 0x6748
-0x7E23 = 0x4F58
-0x7E27 = 0x4C50
-0x7E2B = 0x376C
-0x7E2D = 0x674A
-0x7E2E = 0x4B75
-0x7E31 = 0x575D
-0x7E32 = 0x6750
-0x7E34 = 0x7863
-0x7E35 = 0x674F
-0x7E36 = 0x746A
-0x7E37 = 0x4246
-0x7E39 = 0x674E
-0x7E3B = 0x7763
-0x7E3D = 0x575C
-0x7E3E = 0x3C28
-0x7E41 = 0x3731
-0x7E45 = 0x6752
-0x7E46 = 0x6751
-0x7E47 = 0x746D
-0x7E52 = 0x6755
-0x7E54 = 0x562F
-0x7E55 = 0x4949
-0x7E5A = 0x6754
-0x7E5E = 0x4846
-0x7E62 = 0x6740
-0x7E69 = 0x497E
-0x7E6A = 0x3B66
-0x7E6B = 0x7873
-0x7E6D = 0x3C6B
-0x7E6E = 0x6756
-0x7E6F = 0x6759
-0x7E70 = 0x6758
-0x7E73 = 0x3D49
-0x7E79 = 0x526F
-0x7E7C = 0x3C4C
-0x7E7D = 0x674D
-0x7E7E = 0x6757
-0x7E82 = 0x576B
-0x7E88 = 0x6753
-0x7E8A = 0x667E
-0x7E8C = 0x5078
-0x7E8D = 0x784D
-0x7E8F = 0x3278
-0x7E93 = 0x5327
-0x7E94 = 0x7826
-0x7E96 = 0x4F4B
-0x7E98 = 0x675A
-0x7E9B = 0x746E
-0x7E9C = 0x4042
-0x7F36 = 0x733E
-0x7F38 = 0x3857
-0x7F3A = 0x4831
-0x7F44 = 0x7340
-0x7F45 = 0x7341
-0x7F4C = 0x733F
-0x7F4E = 0x786E
-0x7F50 = 0x395E
-0x7F54 = 0x5868
-0x7F55 = 0x3A31
-0x7F58 = 0x6E37
-0x7F5F = 0x6E39
-0x7F61 = 0x6E38
-0x7F68 = 0x6E3B
-0x7F69 = 0x5556
-0x7F6A = 0x576F
-0x7F6E = 0x5643
-0x7F70 = 0x3723
-0x7F71 = 0x6E3D
-0x7F72 = 0x4A70
-0x7F77 = 0x3055
-0x7F79 = 0x6E3E
-0x7F7E = 0x6E40
-0x7F85 = 0x425E
-0x7F86 = 0x6E3C
-0x7F88 = 0x6E3F
-0x7F8A = 0x5172
-0x7F8C = 0x473C
-0x7F8E = 0x4340
-0x7F94 = 0x3861
-0x7F9A = 0x4167
-0x7F9D = 0x7446
-0x7F9E = 0x505F
-0x7FA1 = 0x4F5B
-0x7FA4 = 0x483A
-0x7FA5 = 0x7447
-0x7FA7 = 0x7448
-0x7FA9 = 0x5265
-0x7FAF = 0x7449
-0x7FB0 = 0x744A
-0x7FB2 = 0x744B
-0x7FB8 = 0x597A
-0x7FB9 = 0x387E
-0x7FBC = 0x6571
-0x7FBD = 0x5370
-0x7FBF = 0x7460
-0x7FC1 = 0x4E4C
-0x7FC5 = 0x3361
-0x7FCA = 0x7134
-0x7FCC = 0x526E
-0x7FCE = 0x7461
-0x7FD2 = 0x4F30
-0x7FD4 = 0x4F68
-0x7FD5 = 0x7462
-0x7FDF = 0x3554
-0x7FE0 = 0x3464
-0x7FE1 = 0x7464
-0x7FE5 = 0x7463
-0x7FE6 = 0x7465
-0x7FE9 = 0x7466
-0x7FEE = 0x7467
-0x7FF0 = 0x3A32
-0x7FF1 = 0x303F
-0x7FF3 = 0x7468
-0x7FF9 = 0x474C
-0x7FFB = 0x372D
-0x7FFC = 0x526D
-0x8000 = 0x522B
-0x8001 = 0x404F
-0x8003 = 0x3F3C
-0x8004 = 0x6B23
-0x8005 = 0x555F
-0x8006 = 0x6A48
-0x800B = 0x7173
-0x800C = 0x3678
-0x800D = 0x4B23
-0x8010 = 0x444D
-0x8012 = 0x7167
-0x8014 = 0x7168
-0x8015 = 0x387B
-0x8016 = 0x7169
-0x8017 = 0x3A44
-0x8018 = 0x5445
-0x8019 = 0x3052
-0x801C = 0x716A
-0x8020 = 0x716B
-0x8025 = 0x716D
-0x8026 = 0x716E
-0x8028 = 0x7171
-0x8029 = 0x7170
-0x802A = 0x4555
-0x802C = 0x716F
-0x802E = 0x716C
-0x8031 = 0x7172
-0x8033 = 0x367A
-0x8035 = 0x7174
-0x8036 = 0x522E
-0x8037 = 0x5E47
-0x803B = 0x335C
-0x803D = 0x3522
-0x803F = 0x3922
-0x8043 = 0x7175
-0x8046 = 0x7176
-0x804A = 0x4144
-0x8052 = 0x7178
-0x8056 = 0x4A25
-0x8058 = 0x4638
-0x805A = 0x3E5B
-0x805E = 0x4E45
-0x806F = 0x412A
-0x8070 = 0x344F
-0x8071 = 0x717A
-0x8072 = 0x4979
-0x8073 = 0x4B4A
-0x8075 = 0x7179
-0x8076 = 0x4474
-0x8077 = 0x5630
-0x8079 = 0x7177
-0x807D = 0x4C7D
-0x807E = 0x417B
-0x807F = 0x6D32
-0x8080 = 0x6D31
-0x8084 = 0x525E
-0x8085 = 0x4B60
-0x8086 = 0x4B41
-0x8087 = 0x5558
-0x8089 = 0x4862
-0x808B = 0x405F
-0x808C = 0x3C21
-0x8093 = 0x6B41
-0x8096 = 0x5024
-0x8098 = 0x5662
-0x809A = 0x3647
-0x809B = 0x3858
-0x809C = 0x6B40
-0x809D = 0x384E
-0x809F = 0x6B3F
-0x80A1 = 0x3949
-0x80A2 = 0x562B
-0x80A5 = 0x374A
-0x80A9 = 0x3C67
-0x80AA = 0x373E
-0x80AB = 0x6B46
-0x80AD = 0x6B47
-0x80AF = 0x3F4F
-0x80B1 = 0x6B45
-0x80B2 = 0x537D
-0x80B4 = 0x6B48
-0x80B7 = 0x6B49
-0x80BA = 0x374E
-0x80BC = 0x6B42
-0x80BD = 0x6B44
-0x80C2 = 0x6B4F
-0x80C3 = 0x4E38
-0x80C4 = 0x6B50
-0x80CC = 0x3133
-0x80CD = 0x6B52
-0x80CE = 0x4C25
-0x80D6 = 0x4556
-0x80D7 = 0x6B53
-0x80D9 = 0x6B51
-0x80DA = 0x455F
-0x80DB = 0x6B4E
-0x80DD = 0x6B55
-0x80DE = 0x307B
-0x80E1 = 0x3A7A
-0x80E4 = 0x5837
-0x80E5 = 0x7163
-0x80E9 = 0x6B4C
-0x80EC = 0x6640
-0x80ED = 0x6B59
-0x80EF = 0x3F68
-0x80F0 = 0x5248
-0x80F1 = 0x6B57
-0x80F2 = 0x6B5C
-0x80F3 = 0x386C
-0x80F4 = 0x6B58
-0x80F8 = 0x5058
-0x80FA = 0x3037
-0x80FC = 0x6B5D
-0x80FD = 0x445C
-0x8102 = 0x562C
-0x8105 = 0x5032
-0x8106 = 0x3460
-0x8109 = 0x4276
-0x810A = 0x3C39
-0x810E = 0x6B5B
-0x8112 = 0x6B5F
-0x8116 = 0x3231
-0x8118 = 0x6B64
-0x811A = 0x3D45
-0x811B = 0x6B56
-0x811E = 0x6B62
-0x812C = 0x6B63
-0x812F = 0x382C
-0x8131 = 0x4D51
-0x8132 = 0x6B65
-0x8139 = 0x554D
-0x813E = 0x4622
-0x8146 = 0x4C73
-0x8148 = 0x6B66
-0x814A = 0x784C
-0x814B = 0x5238
-0x814C = 0x6B67
-0x814E = 0x4976
-0x8150 = 0x382F
-0x8151 = 0x382D
-0x8153 = 0x6B68
-0x8154 = 0x473B
-0x8155 = 0x4D73
-0x8156 = 0x6B4B
-0x8159 = 0x6B6A
-0x815A = 0x6B6B
-0x8160 = 0x6B6D
-0x8161 = 0x6B61
-0x8165 = 0x5048
-0x8166 = 0x4454
-0x8167 = 0x6B72
-0x8169 = 0x6B6E
-0x816B = 0x5657
-0x816D = 0x6B71
-0x816E = 0x4879
-0x8170 = 0x517C
-0x8171 = 0x6B6C
-0x8174 = 0x6B69
-0x8178 = 0x3326
-0x8179 = 0x3839
-0x817A = 0x4F59
-0x817C = 0x6B6F
-0x817D = 0x6B70
-0x817F = 0x4D48
-0x8180 = 0x3072
-0x8182 = 0x6B76
-0x8188 = 0x6B75
-0x818A = 0x3232
-0x818F = 0x3860
-0x8198 = 0x316C
-0x819A = 0x3774
-0x819B = 0x4C45
-0x819C = 0x4424
-0x819D = 0x4F25
-0x81A0 = 0x3D3A
-0x81A3 = 0x6B79
-0x81A6 = 0x6C22
-0x81A8 = 0x4572
-0x81A9 = 0x4465
-0x81AA = 0x6B7A
-0x81B3 = 0x4945
-0x81BA = 0x625F
-0x81BB = 0x6B7E
-0x81BD = 0x3528
-0x81BE = 0x6B5A
-0x81BF = 0x4527
-0x81C0 = 0x4D4E
-0x81C1 = 0x6C21
-0x81C2 = 0x315B
-0x81C3 = 0x5337
-0x81C6 = 0x525C
-0x81C9 = 0x4133
-0x81CA = 0x6B7D
-0x81CC = 0x6B7B
-0x81CD = 0x466A
-0x81CF = 0x6B77
-0x81D8 = 0x4030
-0x81DA = 0x6B4D
-0x81DF = 0x5460
-0x81E0 = 0x5975
-0x81E3 = 0x333C
-0x81E7 = 0x6A30
-0x81E8 = 0x4159
-0x81EA = 0x5754
-0x81EC = 0x742B
-0x81ED = 0x3374
-0x81F3 = 0x5641
-0x81F4 = 0x5642
-0x81FA = 0x4C28
-0x81FB = 0x5569
-0x81FC = 0x3E4A
-0x81FE = 0x7427
-0x8200 = 0x5228
-0x8201 = 0x7428
-0x8202 = 0x7429
-0x8204 = 0x742A
-0x8205 = 0x3E4B
-0x8207 = 0x536B
-0x8208 = 0x504B
-0x8209 = 0x3E59
-0x820A = 0x3E49
-0x820C = 0x4960
-0x820D = 0x7867
-0x8210 = 0x7342
-0x8212 = 0x4A66
-0x8214 = 0x4C72
-0x821B = 0x6236
-0x821C = 0x4B34
-0x821E = 0x4E68
-0x821F = 0x565B
-0x8221 = 0x742D
-0x8222 = 0x742E
-0x8228 = 0x7432
-0x822A = 0x3A3D
-0x822B = 0x7433
-0x822C = 0x3063
-0x822D = 0x7430
-0x822F = 0x7431
-0x8233 = 0x7436
-0x8234 = 0x7437
-0x8235 = 0x3666
-0x8236 = 0x3230
-0x8237 = 0x4F4F
-0x8238 = 0x7434
-0x8239 = 0x342C
-0x823E = 0x7438
-0x8244 = 0x7439
-0x8247 = 0x4D27
-0x8249 = 0x743A
-0x824B = 0x743B
-0x824F = 0x743C
-0x8258 = 0x4B52
-0x8259 = 0x3255
-0x825A = 0x743D
-0x825F = 0x743E
-0x8264 = 0x742F
-0x8266 = 0x3D22
-0x8268 = 0x743F
-0x826B = 0x7435
-0x826E = 0x745E
-0x826F = 0x413C
-0x8271 = 0x3C68
-0x8272 = 0x492B
-0x8274 = 0x6575
-0x8277 = 0x515E
-0x8279 = 0x5C33
-0x827D = 0x5C34
-0x827E = 0x302C
-0x827F = 0x5C35
-0x8284 = 0x5C39
-0x8288 = 0x5842
-0x828A = 0x5C37
-0x828B = 0x5373
-0x828D = 0x4956
-0x828E = 0x5C3A
-0x828F = 0x5C36
-0x8291 = 0x5C3B
-0x8292 = 0x4322
-0x8298 = 0x5C45
-0x8299 = 0x5C3D
-0x829D = 0x5625
-0x829F = 0x5C4F
-0x82A1 = 0x5C4D
-0x82A4 = 0x5C52
-0x82A5 = 0x3D66
-0x82A8 = 0x5C38
-0x82A9 = 0x5C4B
-0x82AA = 0x5C4E
-0x82AB = 0x5C3E
-0x82AC = 0x3752
-0x82AD = 0x3045
-0x82AE = 0x5C47
-0x82AF = 0x503E
-0x82B0 = 0x5C41
-0x82B1 = 0x3B28
-0x82B3 = 0x373C
-0x82B4 = 0x5C4C
-0x82B7 = 0x5C46
-0x82B9 = 0x475B
-0x82BB = 0x5B3B
-0x82BD = 0x513F
-0x82BE = 0x5C40
-0x82C4 = 0x5C50
-0x82CA = 0x5C43
-0x82D1 = 0x5437
-0x82D2 = 0x5C5B
-0x82D3 = 0x5C5F
-0x82D4 = 0x4C26
-0x82D5 = 0x5C66
-0x82D7 = 0x4367
-0x82D8 = 0x5C5C
-0x82DB = 0x3F41
-0x82DC = 0x5C59
-0x82DE = 0x307A
-0x82DF = 0x3936
-0x82E0 = 0x5C65
-0x82E1 = 0x5C53
-0x82E3 = 0x5C44
-0x82E4 = 0x5C56
-0x82E5 = 0x4874
-0x82E6 = 0x3F60
-0x82E7 = 0x5C51
-0x82EB = 0x493B
-0x82EF = 0x313D
-0x82F1 = 0x5322
-0x82F4 = 0x5C5A
-0x82F7 = 0x5C55
-0x82F9 = 0x785C
-0x82FB = 0x5C5E
-0x8301 = 0x5742
-0x8302 = 0x432F
-0x8303 = 0x7832
-0x8304 = 0x4751
-0x8305 = 0x4329
-0x8306 = 0x5C62
-0x8307 = 0x5C58
-0x8308 = 0x5C6B
-0x8309 = 0x5C54
-0x830C = 0x5C5D
-0x8317 = 0x5C78
-0x831A = 0x5C61
-0x831B = 0x5D22
-0x831C = 0x5C67
-0x8328 = 0x3444
-0x832B = 0x4323
-0x832C = 0x3267
-0x832D = 0x5C7A
-0x832F = 0x5C72
-0x8331 = 0x5C6F
-0x8333 = 0x5C7C
-0x8334 = 0x5C6E
-0x8335 = 0x5270
-0x8336 = 0x3268
-0x8338 = 0x4857
-0x8339 = 0x4863
-0x833A = 0x5C7B
-0x833C = 0x5C6D
-0x8340 = 0x5C77
-0x8343 = 0x5C75
-0x8346 = 0x3E23
-0x8347 = 0x5C74
-0x8349 = 0x325D
-0x834F = 0x5C73
-0x8350 = 0x7843
-0x8351 = 0x5C68
-0x8352 = 0x3B44
-0x8354 = 0x4073
-0x8377 = 0x3A49
-0x8378 = 0x5D29
-0x837B = 0x5D36
-0x837C = 0x5D31
-0x837D = 0x5D34
-0x8385 = 0x5D30
-0x8386 = 0x464E
-0x8389 = 0x4072
-0x838A = 0x572F
-0x838E = 0x492F
-0x8392 = 0x5C6C
-0x8393 = 0x5D2E
-0x8396 = 0x3E25
-0x8398 = 0x5D37
-0x839B = 0x5C70
-0x839C = 0x5D2F
-0x839E = 0x5D38
-0x83A0 = 0x5D2C
-0x83A2 = 0x3C54
-0x83A7 = 0x5C48
-0x83A8 = 0x5D39
-0x83A9 = 0x5D33
-0x83AA = 0x5D2D
-0x83AB = 0x442A
-0x83B0 = 0x5D28
-0x83BD = 0x4327
-0x83C0 = 0x5D52
-0x83C1 = 0x5D3C
-0x83C5 = 0x5D51
-0x83C7 = 0x393D
-0x83CA = 0x3E55
-0x83CC = 0x3E7A
-0x83CF = 0x3A4A
-0x83D4 = 0x5D4A
-0x83D6 = 0x5D45
-0x83D8 = 0x5D3F
-0x83DC = 0x324B
-0x83DD = 0x5D43
-0x83DF = 0x5D4B
-0x83E0 = 0x3224
-0x83E1 = 0x5D55
-0x83E5 = 0x5D3E
-0x83E9 = 0x4650
-0x83EA = 0x5D50
-0x83EF = 0x3B2A
-0x83F0 = 0x5D54
-0x83F1 = 0x4162
-0x83F2 = 0x3746
-0x83F8 = 0x5D4E
-0x83F9 = 0x5D4F
-0x83FD = 0x5D44
-0x8401 = 0x5D3D
-0x8403 = 0x5D4D
-0x8404 = 0x4C51
-0x8406 = 0x5D49
-0x8407 = 0x5C49
-0x840A = 0x4033
-0x840B = 0x5D42
-0x840C = 0x4348
-0x840D = 0x463C
-0x840E = 0x4E2E
-0x840F = 0x5D4C
-0x8411 = 0x5D48
-0x8418 = 0x5D41
-0x841C = 0x5D46
-0x842C = 0x4D72
-0x8431 = 0x5D66
-0x8435 = 0x5D2B
-0x8438 = 0x5D47
-0x843C = 0x5D60
-0x843D = 0x4264
-0x8446 = 0x5D61
-0x8449 = 0x5236
-0x8451 = 0x5D57
-0x8452 = 0x5D26
-0x8457 = 0x5678
-0x8459 = 0x5D59
-0x845A = 0x5D58
-0x845B = 0x3870
-0x845C = 0x5D56
-0x8461 = 0x464F
-0x8463 = 0x362D
-0x8464 = 0x5D27
-0x8466 = 0x4E2D
-0x8469 = 0x5D62
-0x846B = 0x3A79
-0x846C = 0x5461
-0x846D = 0x5D67
-0x846F = 0x7877
-0x8471 = 0x3450
-0x8473 = 0x5D5A
-0x8475 = 0x3F7B
-0x8476 = 0x5D63
-0x8477 = 0x3B67
-0x8478 = 0x5D5F
-0x847A = 0x5D5D
-0x8482 = 0x3559
-0x8488 = 0x5D5C
-0x848E = 0x5D65
-0x8493 = 0x5D3B
-0x8494 = 0x5D2A
-0x8497 = 0x5D75
-0x8499 = 0x4349
-0x849C = 0x4B62
-0x84A1 = 0x5D72
-0x84AF = 0x5861
-0x84B2 = 0x4651
-0x84B4 = 0x5D74
-0x84B8 = 0x5574
-0x84B9 = 0x5D73
-0x84BA = 0x5D70
-0x84BC = 0x3254
-0x84BD = 0x5D6C
-0x84BF = 0x5D6F
-0x84C0 = 0x5D25
-0x84C1 = 0x5D68
-0x84C4 = 0x506E
-0x84C9 = 0x4858
-0x84CA = 0x5D6E
-0x84CB = 0x3847
-0x84CD = 0x5D69
-0x84D0 = 0x5D6A
-0x84D1 = 0x4B72
-0x84D3 = 0x5D6D
-0x84D6 = 0x314D
-0x84EC = 0x456E
-0x84EE = 0x412B
-0x84EF = 0x5C4A
-0x84F0 = 0x5D7B
-0x84FC = 0x5E24
-0x84FD = 0x5C6A
-0x84FF = 0x5E23
-0x850C = 0x5D78
-0x8511 = 0x436F
-0x8513 = 0x427B
-0x8514 = 0x7825
-0x8517 = 0x5561
-0x851A = 0x4E35
-0x851E = 0x5D64
-0x851F = 0x5D7D
-0x8521 = 0x324C
-0x8523 = 0x3D2F
-0x8526 = 0x5C60
-0x852B = 0x4468
-0x852C = 0x4A5F
-0x852D = 0x5271
-0x8538 = 0x5D7A
-0x853B = 0x5E22
-0x853D = 0x314E
-0x8541 = 0x5D21
-0x8543 = 0x5E2C
-0x8546 = 0x5D5B
-0x8548 = 0x5E26
-0x8549 = 0x3D36
-0x854A = 0x486F
-0x854E = 0x5C71
-0x8552 = 0x5D24
-0x8553 = 0x5C3F
-0x8555 = 0x5D35
-0x8556 = 0x5E21
-0x8558 = 0x5C69
-0x8559 = 0x5E25
-0x855E = 0x5E29
-0x8562 = 0x5D5E
-0x8564 = 0x5E28
-0x8568 = 0x5E27
-0x8569 = 0x3534
-0x856A = 0x4E5F
-0x856D = 0x4F74
-0x8577 = 0x5D77
-0x8579 = 0x5E33
-0x857A = 0x5E2A
-0x857B = 0x5E2E
-0x857E = 0x4059
-0x8584 = 0x3121
-0x8585 = 0x5E36
-0x8587 = 0x5E31
-0x8588 = 0x5C76
-0x858A = 0x3C3B
-0x858C = 0x5C3C
-0x858F = 0x5E32
-0x8591 = 0x7844
-0x8594 = 0x473E
-0x859B = 0x5126
-0x859C = 0x5E35
-0x859F = 0x5D32
-0x85A4 = 0x5E2F
-0x85A6 = 0x3C76
-0x85A8 = 0x5E30
-0x85A9 = 0x4878
-0x85AA = 0x503D
-0x85AF = 0x4A6D
-0x85B0 = 0x5E39
-0x85B7 = 0x5E38
-0x85B9 = 0x5E37
-0x85BA = 0x5C79
-0x85C1 = 0x5E3B
-0x85C9 = 0x3D65
-0x85CD = 0x4036
-0x85CE = 0x5D23
-0x85CF = 0x3258
-0x85D0 = 0x436A
-0x85D5 = 0x453A
-0x85DC = 0x5E3C
-0x85DD = 0x5255
-0x85E4 = 0x4C59
-0x85E5 = 0x5229
-0x85E9 = 0x372A
-0x85EA = 0x5E34
-0x85F4 = 0x544C
-0x85F6 = 0x5C42
-0x85F9 = 0x302A
-0x85FA = 0x5D7E
-0x85FB = 0x5465
-0x85FF = 0x5E3D
-0x8604 = 0x5E2D
-0x8605 = 0x5E3F
-0x8606 = 0x422B
-0x8607 = 0x4B55
-0x860B = 0x463B
-0x8611 = 0x4422
-0x8616 = 0x5E41
-0x861A = 0x5E3A
-0x861E = 0x5D7C
-0x8622 = 0x5C57
-0x8627 = 0x5E3E
-0x8629 = 0x5E40
-0x862D = 0x403C
-0x8638 = 0x553A
-0x863A = 0x5D71
-0x863C = 0x5E42
-0x863F = 0x425C
-0x864D = 0x722E
-0x864E = 0x3B22
-0x8650 = 0x4530
-0x8654 = 0x722F
-0x8655 = 0x3426
-0x865A = 0x5069
-0x865C = 0x4232
-0x865E = 0x535D
-0x865F = 0x3A45
-0x8662 = 0x6B3D
-0x8667 = 0x3F77
-0x866C = 0x7230
-0x8671 = 0x4A2D
-0x8679 = 0x3A67
-0x867A = 0x7233
-0x867B = 0x7235
-0x867C = 0x7234
-0x868A = 0x4E43
-0x868B = 0x7238
-0x868C = 0x3076
-0x868D = 0x7237
-0x8693 = 0x723E
-0x869C = 0x5141
-0x869D = 0x723A
-0x86A3 = 0x723C
-0x86A4 = 0x5469
-0x86A7 = 0x723B
-0x86A8 = 0x7236
-0x86A9 = 0x723F
-0x86AA = 0x723D
-0x86AF = 0x7247
-0x86B0 = 0x7244
-0x86B1 = 0x7246
-0x86B4 = 0x724A
-0x86B5 = 0x7242
-0x86B6 = 0x7240
-0x86BA = 0x7245
-0x86C0 = 0x567B
-0x86C4 = 0x7241
-0x86C6 = 0x4779
-0x86C7 = 0x495F
-0x86C9 = 0x7248
-0x86CB = 0x3530
-0x86D0 = 0x7250
-0x86D1 = 0x7256
-0x86D4 = 0x3B57
-0x86D8 = 0x7255
-0x86D9 = 0x4D5C
-0x86DB = 0x566B
-0x86DE = 0x7252
-0x86DF = 0x7254
-0x86E4 = 0x3872
-0x86E9 = 0x724B
-0x86ED = 0x724E
-0x86F8 = 0x7259
-0x86F9 = 0x533C
-0x86FA = 0x724C
-0x86FE = 0x366A
-0x8700 = 0x4A71
-0x8702 = 0x3764
-0x8703 = 0x7257
-0x8706 = 0x7239
-0x8707 = 0x7258
-0x8708 = 0x725A
-0x8709 = 0x725D
-0x870A = 0x725B
-0x870D = 0x725C
-0x8712 = 0x5151
-0x8713 = 0x7251
-0x8715 = 0x4D49
-0x8718 = 0x5629
-0x871A = 0x7263
-0x871C = 0x435B
-0x871E = 0x7260
-0x8721 = 0x784B
-0x8722 = 0x726C
-0x8723 = 0x725E
-0x8725 = 0x7261
-0x8729 = 0x7268
-0x872E = 0x7262
-0x8731 = 0x7267
-0x8734 = 0x7266
-0x8737 = 0x7269
-0x873B = 0x725F
-0x873E = 0x7264
-0x873F = 0x726A
-0x874C = 0x7272
-0x874E = 0x502B
-0x8753 = 0x7275
-0x8755 = 0x4A34
-0x8757 = 0x3B48
-0x8759 = 0x7279
-0x8760 = 0x7270
-0x8763 = 0x7276
-0x8764 = 0x7278
-0x8765 = 0x727A
-0x8766 = 0x4F3A
-0x876E = 0x7273
-0x8770 = 0x7271
-0x8774 = 0x3A7B
-0x8776 = 0x357B
-0x8778 = 0x4E4F
-0x877B = 0x726F
-0x877D = 0x726D
-0x8782 = 0x726B
-0x8783 = 0x7326
-0x8784 = 0x724F
-0x8785 = 0x7323
-0x8788 = 0x7322
-0x878B = 0x7274
-0x878D = 0x485A
-0x8793 = 0x727B
-0x8797 = 0x7325
-0x879E = 0x426C
-0x879F = 0x4378
-0x87A2 = 0x5329
-0x87AB = 0x7327
-0x87AC = 0x7329
-0x87AD = 0x7324
-0x87AF = 0x727C
-0x87B3 = 0x732B
-0x87B5 = 0x732A
-0x87BA = 0x425D
-0x87BB = 0x7277
-0x87BD = 0x732E
-0x87C0 = 0x7330
-0x87C4 = 0x555D
-0x87C6 = 0x7321
-0x87C8 = 0x7265
-0x87CA = 0x7331
-0x87CB = 0x732C
-0x87CE = 0x727D
-0x87D1 = 0x732F
-0x87D2 = 0x727E
-0x87D3 = 0x732D
-0x87DB = 0x7332
-0x87E0 = 0x7334
-0x87E3 = 0x7231
-0x87E5 = 0x7328
-0x87EA = 0x7333
-0x87EC = 0x3275
-0x87EE = 0x7335
-0x87EF = 0x724D
-0x87F2 = 0x3366
-0x87F6 = 0x7249
-0x87F9 = 0x5037
-0x87FB = 0x524F
-0x87FE = 0x7338
-0x8803 = 0x5979
-0x8805 = 0x532C
-0x8806 = 0x7232
-0x880A = 0x7339
-0x8810 = 0x7253
-0x8811 = 0x726E
-0x8813 = 0x7337
-0x8815 = 0x4864
-0x8816 = 0x7336
-0x881B = 0x733A
-0x881F = 0x402F
-0x8821 = 0x733B
-0x8822 = 0x3440
-0x8823 = 0x7243
-0x8831 = 0x3946
-0x8832 = 0x6E43
-0x8836 = 0x324F
-0x8839 = 0x733C
-0x883B = 0x4279
-0x883C = 0x733D
-0x8840 = 0x512A
-0x8844 = 0x742C
-0x8846 = 0x565A
-0x884A = 0x785A
-0x884C = 0x5050
-0x884D = 0x515C
-0x8853 = 0x4A75
-0x8857 = 0x3D56
-0x8859 = 0x5143
-0x885B = 0x4E40
-0x885D = 0x3365
-0x8861 = 0x3A62
-0x8862 = 0x6169
-0x8863 = 0x5242
-0x8864 = 0x7142
-0x8868 = 0x316D
-0x8869 = 0x7143
-0x886B = 0x4940
-0x886E = 0x5972
-0x8870 = 0x4B25
-0x8872 = 0x7144
-0x8877 = 0x5654
-0x8879 = 0x563B
-0x887D = 0x7145
-0x887E = 0x7440
-0x887F = 0x7146
-0x8881 = 0x542C
-0x8882 = 0x7147
-0x8888 = 0x7442
-0x888B = 0x347C
-0x888D = 0x455B
-0x8892 = 0x4C3B
-0x8896 = 0x5064
-0x88A2 = 0x7148
-0x88A4 = 0x5973
-0x88AB = 0x313B
-0x88B1 = 0x3824
-0x88B7 = 0x714A
-0x88BC = 0x714B
-0x88C1 = 0x3243
-0x88C2 = 0x4151
-0x88C9 = 0x714C
-0x88CA = 0x7441
-0x88CE = 0x714E
-0x88CF = 0x406F
-0x88D2 = 0x5976
-0x88D4 = 0x5261
-0x88D5 = 0x5423
-0x88D8 = 0x7443
-0x88D9 = 0x4839
-0x88DC = 0x3239
-0x88DD = 0x5730
-0x88DF = 0x7444
-0x88E8 = 0x7154
-0x88F0 = 0x7156
-0x88F1 = 0x7151
-0x88F3 = 0x4951
-0x88F4 = 0x4561
-0x88F8 = 0x4263
-0x88F9 = 0x397C
-0x88FC = 0x7153
-0x88FD = 0x7925
-0x88FE = 0x7155
-0x8902 = 0x3953
-0x8907 = 0x7834
-0x890A = 0x715B
-0x8910 = 0x3A56
-0x8912 = 0x307D
-0x8913 = 0x7159
-0x8919 = 0x7158
-0x891A = 0x7152
-0x8921 = 0x7157
-0x8925 = 0x486C
-0x892A = 0x4D4A
-0x892B = 0x715D
-0x8930 = 0x653D
-0x8932 = 0x3F63
-0x8933 = 0x714D
-0x8936 = 0x715E
-0x8938 = 0x715A
-0x893B = 0x5974
-0x8941 = 0x715F
-0x8944 = 0x4F65
-0x8947 = 0x7150
-0x8956 = 0x3040
-0x895D = 0x714F
-0x895E = 0x7445
-0x895F = 0x3D73
-0x8960 = 0x7149
-0x8964 = 0x715C
-0x8966 = 0x7160
-0x896A = 0x4D60
-0x896C = 0x7821
-0x896F = 0x3344
-0x8972 = 0x4F2E
-0x897B = 0x7161
-0x897F = 0x4E77
-0x8981 = 0x522A
-0x8983 = 0x717B
-0x8986 = 0x3832
-0x898B = 0x3C7B
-0x898F = 0x3966
-0x8993 = 0x4359
-0x8996 = 0x4A53
-0x8998 = 0x6A68
-0x89A1 = 0x6A6A
-0x89A6 = 0x6A6C
-0x89AA = 0x4757
-0x89AC = 0x6A69
-0x89AF = 0x6A6D
-0x89B2 = 0x6A6E
-0x89B7 = 0x6A6F
-0x89BA = 0x3E75
-0x89BD = 0x4040
-0x89BF = 0x6A6B
-0x89C0 = 0x395B
-0x89D2 = 0x3D47
-0x89D6 = 0x757B
-0x89DA = 0x757D
-0x89DC = 0x757E
-0x89E3 = 0x3D62
-0x89E5 = 0x7621
-0x89EB = 0x7622
-0x89F3 = 0x6C32
-0x89F4 = 0x757C
-0x89F6 = 0x7623
-0x89F8 = 0x3425
-0x8A00 = 0x5154
-0x8A01 = 0x5A25
-0x8A02 = 0x3629
-0x8A03 = 0x383C
-0x8A07 = 0x596A
-0x8A08 = 0x3C46
-0x8A0A = 0x5136
-0x8A0C = 0x5A27
-0x8A0E = 0x4C56
-0x8A10 = 0x5A26
-0x8A13 = 0x5135
-0x8A15 = 0x5A28
-0x8A16 = 0x467D
-0x8A18 = 0x3C47
-0x8A1B = 0x366F
-0x8A1D = 0x5148
-0x8A1F = 0x4B4F
-0x8A23 = 0x3E77
-0x8A25 = 0x5A2B
-0x8A2A = 0x3743
-0x8A2D = 0x4968
-0x8A31 = 0x506D
-0x8A34 = 0x4B5F
-0x8A36 = 0x5A2D
-0x8A3A = 0x556F
-0x8A3E = 0x7624
-0x8A41 = 0x5A2C
-0x8A46 = 0x5A2E
-0x8A48 = 0x6E3A
-0x8A4E = 0x5A2A
-0x8A50 = 0x5529
-0x8A52 = 0x5A31
-0x8A54 = 0x5A2F
-0x8A55 = 0x4640
-0x8A58 = 0x5A30
-0x8A5B = 0x5767
-0x8A5E = 0x344A
-0x8A61 = 0x5A3C
-0x8A62 = 0x512F
-0x8A63 = 0x5268
-0x8A66 = 0x4A54
-0x8A69 = 0x4A2B
-0x8A6B = 0x326F
-0x8A6C = 0x5A38
-0x8A6D = 0x396E
-0x8A6E = 0x5A39
-0x8A70 = 0x5A35
-0x8A71 = 0x3B30
-0x8A72 = 0x3843
-0x8A73 = 0x4F6A
-0x8A75 = 0x5A37
-0x8A79 = 0x5532
-0x8A7C = 0x5A36
-0x8A7F = 0x5A34
-0x8A84 = 0x5A33
-0x8A85 = 0x566F
-0x8A86 = 0x5A32
-0x8A87 = 0x3F64
-0x8A8D = 0x484F
-0x8A91 = 0x5A3F
-0x8A92 = 0x5A40
-0x8A93 = 0x4A44
-0x8A95 = 0x352E
-0x8A98 = 0x5355
-0x8A9A = 0x5A3D
-0x8A9E = 0x536F
-0x8AA0 = 0x334F
-0x8AA1 = 0x3D6B
-0x8AA3 = 0x4E5C
-0x8AA4 = 0x4E73
-0x8AA5 = 0x5A3E
-0x8AA6 = 0x4B50
-0x8AA8 = 0x3B65
-0x8AAC = 0x4B35
-0x8AB0 = 0x4B2D
-0x8AB2 = 0x3F4E
-0x8AB6 = 0x5A47
-0x8AB9 = 0x374C
-0x8ABC = 0x526A
-0x8ABF = 0x3577
-0x8AC2 = 0x5A46
-0x8AC4 = 0x573B
-0x8AC7 = 0x4C38
-0x8AC9 = 0x5A43
-0x8ACB = 0x476B
-0x8ACD = 0x5A3A
-0x8ACF = 0x5A41
-0x8AD1 = 0x5A42
-0x8AD2 = 0x4142
-0x8AD6 = 0x425B
-0x8AD7 = 0x5A45
-0x8ADB = 0x5A44
-0x8ADC = 0x357D
-0x8ADE = 0x5A52
-0x8AE2 = 0x5A3B
-0x8AE4 = 0x5A4C
-0x8AE6 = 0x5A50
-0x8AE7 = 0x5033
-0x8AEB = 0x5A49
-0x8AED = 0x5A4D
-0x8AEE = 0x5A51
-0x8AF1 = 0x3B64
-0x8AF3 = 0x5A4F
-0x8AF6 = 0x5A48
-0x8AF7 = 0x376D
-0x8AF8 = 0x566E
-0x8AFA = 0x5168
-0x8AFC = 0x5A4E
-0x8AFE = 0x4535
-0x8B00 = 0x4431
-0x8B01 = 0x5A4B
-0x8B02 = 0x4E3D
-0x8B04 = 0x4C5C
-0x8B05 = 0x565F
-0x8B07 = 0x6540
-0x8B0A = 0x3B51
-0x8B0E = 0x4355
-0x8B10 = 0x5A57
-0x8B14 = 0x5A4A
-0x8B16 = 0x5A55
-0x8B17 = 0x3079
-0x8B19 = 0x472B
-0x8B1A = 0x5A56
-0x8B1B = 0x3D32
-0x8B1D = 0x503B
-0x8B21 = 0x5225
-0x8B26 = 0x7625
-0x8B28 = 0x5A53
-0x8B2B = 0x5A58
-0x8B2C = 0x437D
-0x8B2D = 0x5A59
-0x8B33 = 0x5A29
-0x8B39 = 0x3D77
-0x8B3E = 0x4321
-0x8B49 = 0x5624
-0x8B4E = 0x5A5C
-0x8B4F = 0x3C25
-0x8B56 = 0x5A5A
-0x8B58 = 0x4A36
-0x8B59 = 0x5A5B
-0x8B5A = 0x4C37
-0x8B5C = 0x4657
-0x8B66 = 0x3E2F
-0x8B6B = 0x5A5E
-0x8B6C = 0x4629
-0x8B6F = 0x526B
-0x8B70 = 0x5269
-0x8B74 = 0x4734
-0x8B77 = 0x3B24
-0x8B7D = 0x537E
-0x8B80 = 0x3641
-0x8B8A = 0x3164
-0x8B8E = 0x7645
-0x8B92 = 0x3277
-0x8B93 = 0x4843
-0x8B95 = 0x403E
-0x8B96 = 0x5A5F
-0x8B9C = 0x5A54
-0x8B9E = 0x5A5D
-0x8C37 = 0x3948
-0x8C41 = 0x3B6D
-0x8C46 = 0x3639
-0x8C47 = 0x7478
-0x8C48 = 0x4671
-0x8C49 = 0x7479
-0x8C4C = 0x4D63
-0x8C50 = 0x3761
-0x8C55 = 0x7539
-0x8C5A = 0x6B60
-0x8C61 = 0x4F73
-0x8C62 = 0x3B3F
-0x8C6A = 0x3A40
-0x8C6B = 0x5425
-0x8C73 = 0x6159
-0x8C78 = 0x7574
-0x8C79 = 0x312A
-0x8C7A = 0x3272
-0x8C82 = 0x7575
-0x8C85 = 0x7577
-0x8C89 = 0x3A51
-0x8C8A = 0x7576
-0x8C8C = 0x4332
-0x8C94 = 0x7579
-0x8C98 = 0x7578
-0x8C9D = 0x3134
-0x8C9E = 0x556A
-0x8CA0 = 0x383A
-0x8CA1 = 0x3246
-0x8CA2 = 0x3931
-0x8CA7 = 0x4636
-0x8CA8 = 0x3B75
-0x8CA9 = 0x3737
-0x8CAA = 0x4C30
-0x8CAB = 0x3961
-0x8CAC = 0x5470
-0x8CAF = 0x567C
-0x8CB0 = 0x6A5B
-0x8CB2 = 0x6A5F
-0x8CB3 = 0x3721
-0x8CB4 = 0x3973
-0x8CB6 = 0x3161
-0x8CB7 = 0x4272
-0x8CB8 = 0x347B
-0x8CBA = 0x6A5C
-0x8CBB = 0x3751
-0x8CBC = 0x4C79
-0x8CBD = 0x6A5D
-0x8CBF = 0x4333
-0x8CC0 = 0x3A58
-0x8CC1 = 0x6A5A
-0x8CC2 = 0x4238
-0x8CC3 = 0x415E
-0x8CC4 = 0x3B5F
-0x8CC5 = 0x6A60
-0x8CC7 = 0x574A
-0x8CC8 = 0x3C56
-0x8CCA = 0x5474
-0x8CD1 = 0x6A62
-0x8CD2 = 0x495E
-0x8CD3 = 0x3176
-0x8CD5 = 0x6A64
-0x8CDA = 0x6A63
-0x8CDC = 0x344D
-0x8CDE = 0x494D
-0x8CE0 = 0x4562
-0x8CE1 = 0x6259
-0x8CE2 = 0x4F4D
-0x8CE3 = 0x4274
-0x8CE4 = 0x3C7A
-0x8CE6 = 0x3833
-0x8CE7 = 0x6A66
-0x8CEA = 0x564A
-0x8CEB = 0x6A65
-0x8CEC = 0x554B
-0x8CED = 0x3644
-0x8CF4 = 0x4035
-0x8CFA = 0x572C
-0x8CFB = 0x6A67
-0x8CFC = 0x393A
-0x8CFD = 0x487C
-0x8CFE = 0x5853
-0x8D04 = 0x6A5E
-0x8D05 = 0x5738
-0x8D08 = 0x5479
-0x8D0A = 0x545E
-0x8D0B = 0x584D
-0x8D0D = 0x4944
-0x8D0F = 0x532E
-0x8D10 = 0x6A61
-0x8D16 = 0x4A6A
-0x8D1B = 0x3853
-0x8D1C = 0x545F
-0x8D64 = 0x3360
-0x8D66 = 0x4962
-0x8D67 = 0x7476
-0x8D6B = 0x3A55
-0x8D6D = 0x7477
-0x8D70 = 0x575F
-0x8D73 = 0x7471
-0x8D74 = 0x3830
-0x8D77 = 0x4670
-0x8D81 = 0x3343
-0x8D84 = 0x7472
-0x8D85 = 0x332C
-0x8D8A = 0x543D
-0x8D91 = 0x7474
-0x8D94 = 0x7473
-0x8D95 = 0x384F
-0x8D99 = 0x5554
-0x8D9F = 0x4C4B
-0x8DA3 = 0x4824
-0x8DA8 = 0x4777
-0x8DB2 = 0x7475
-0x8DB3 = 0x5763
-0x8DB4 = 0x453F
-0x8DB5 = 0x7540
-0x8DBA = 0x7543
-0x8DBC = 0x7542
-0x8DBE = 0x563A
-0x8DBF = 0x7541
-0x8DC6 = 0x754C
-0x8DCB = 0x304F
-0x8DCC = 0x3578
-0x8DCE = 0x7549
-0x8DCF = 0x754A
-0x8DD1 = 0x455C
-0x8DD6 = 0x7545
-0x8DD7 = 0x7546
-0x8DDA = 0x7547
-0x8DDB = 0x754B
-0x8DDD = 0x3E60
-0x8DDF = 0x387A
-0x8DE3 = 0x7550
-0x8DE4 = 0x7553
-0x8DE8 = 0x3F67
-0x8DEA = 0x3972
-0x8DEB = 0x753C
-0x8DEC = 0x754D
-0x8DEF = 0x4237
-0x8DF3 = 0x4C78
-0x8DFA = 0x3665
-0x8DFD = 0x7555
-0x8E05 = 0x753D
-0x8E09 = 0x7554
-0x8E0F = 0x4C24
-0x8E10 = 0x3C79
-0x8E14 = 0x7556
-0x8E1D = 0x7557
-0x8E1E = 0x3E61
-0x8E1F = 0x7558
-0x8E22 = 0x4C5F
-0x8E23 = 0x755B
-0x8E29 = 0x3248
-0x8E2A = 0x5759
-0x8E2E = 0x755A
-0x8E31 = 0x7562
-0x8E34 = 0x533B
-0x8E35 = 0x7560
-0x8E39 = 0x755F
-0x8E3A = 0x755D
-0x8E3D = 0x7561
-0x8E40 = 0x755E
-0x8E41 = 0x7564
-0x8E42 = 0x7565
-0x8E44 = 0x4C63
-0x8E47 = 0x653F
-0x8E48 = 0x3538
-0x8E49 = 0x7563
-0x8E4A = 0x7568
-0x8E4B = 0x4C23
-0x8E4C = 0x7544
-0x8E55 = 0x754F
-0x8E59 = 0x753E
-0x8E63 = 0x7567
-0x8E66 = 0x3144
-0x8E69 = 0x753F
-0x8E6C = 0x3545
-0x8E6D = 0x3264
-0x8E6F = 0x756C
-0x8E70 = 0x7569
-0x8E72 = 0x3657
-0x8E74 = 0x756D
-0x8E76 = 0x756A
-0x8E7A = 0x754E
-0x8E7C = 0x756B
-0x8E81 = 0x546A
-0x8E85 = 0x756E
-0x8E87 = 0x3379
-0x8E89 = 0x753B
-0x8E8A = 0x336C
-0x8E8B = 0x7552
-0x8E8D = 0x543E
-0x8E90 = 0x7571
-0x8E91 = 0x755C
-0x8E92 = 0x7548
-0x8E93 = 0x7559
-0x8E94 = 0x7570
-0x8E9A = 0x7551
-0x8E9E = 0x7573
-0x8EA1 = 0x7566
-0x8EA5 = 0x345A
-0x8EA6 = 0x7572
-0x8EAA = 0x756F
-0x8EAB = 0x496D
-0x8EAC = 0x392A
-0x8EB2 = 0x3663
-0x8EBA = 0x4C49
-0x8EC0 = 0x477B
-0x8ECA = 0x3335
-0x8ECB = 0x547E
-0x8ECC = 0x396C
-0x8ECD = 0x3E7C
-0x8ECE = 0x6A26
-0x8ED2 = 0x5079
-0x8ED4 = 0x696D
-0x8EDB = 0x696E
-0x8EDF = 0x486D
-0x8EE4 = 0x6975
-0x8EEB = 0x6974
-0x8EF2 = 0x696F
-0x8EF8 = 0x5661
-0x8EF9 = 0x6972
-0x8EFA = 0x6977
-0x8EFB = 0x6970
-0x8EFC = 0x6973
-0x8EFE = 0x6978
-0x8F03 = 0x3D4F
-0x8F05 = 0x697B
-0x8F07 = 0x697A
-0x8F09 = 0x5458
-0x8F0A = 0x6979
-0x8F12 = 0x697C
-0x8F14 = 0x3828
-0x8F15 = 0x4761
-0x8F1B = 0x413E
-0x8F1C = 0x6A22
-0x8F1D = 0x3B54
-0x8F1E = 0x697E
-0x8F1F = 0x6A21
-0x8F25 = 0x3975
-0x8F26 = 0x697D
-0x8F29 = 0x3132
-0x8F2A = 0x4256
-0x8F2F = 0x3C2D
-0x8F33 = 0x6A23
-0x8F38 = 0x4A64
-0x8F3B = 0x3778
-0x8F3E = 0x5537
-0x8F3F = 0x535F
-0x8F42 = 0x6C31
-0x8F44 = 0x4F3D
-0x8F45 = 0x542F
-0x8F46 = 0x6A24
-0x8F49 = 0x572A
-0x8F4D = 0x555E
-0x8F4E = 0x3D4E
-0x8F54 = 0x6A25
-0x8F5F = 0x3A64
-0x8F61 = 0x604E
-0x8F62 = 0x6976
-0x8F64 = 0x6971
-0x8F9B = 0x5041
-0x8F9C = 0x393C
-0x8F9F = 0x3159
-0x8FA3 = 0x4031
-0x8FA6 = 0x306C
-0x8FA8 = 0x3166
-0x8FAD = 0x3447
-0x8FAE = 0x3168
-0x8FAF = 0x3167
-0x8FB0 = 0x333D
-0x8FB1 = 0x4868
-0x8FB2 = 0x4529
-0x8FB6 = 0x6541
-0x8FC2 = 0x5358
-0x8FC4 = 0x4679
-0x8FC5 = 0x5138
-0x8FCE = 0x532D
-0x8FD1 = 0x3D7C
-0x8FD3 = 0x6542
-0x8FD4 = 0x3735
-0x8FD5 = 0x6543
-0x8FE2 = 0x4C76
-0x8FE4 = 0x6546
-0x8FE5 = 0x6544
-0x8FE6 = 0x6548
-0x8FE8 = 0x654A
-0x8FEA = 0x354F
-0x8FEB = 0x4648
-0x8FED = 0x357C
-0x8FEE = 0x6545
-0x8FF0 = 0x4A76
-0x8FF4 = 0x783C
-0x8FF7 = 0x4354
-0x8FF8 = 0x3145
-0x8FF9 = 0x3C23
-0x8FFD = 0x5737
-0x9000 = 0x4D4B
-0x9001 = 0x4B4D
-0x9003 = 0x4C53
-0x9004 = 0x654C
-0x9005 = 0x654B
-0x9006 = 0x4466
-0x900B = 0x654D
-0x900D = 0x6550
-0x900F = 0x4D38
-0x9010 = 0x5670
-0x9011 = 0x654F
-0x9014 = 0x4D3E
-0x9015 = 0x6549
-0x9016 = 0x6551
-0x9017 = 0x363A
-0x9019 = 0x5562
-0x901A = 0x4D28
-0x901B = 0x3964
-0x901D = 0x4A45
-0x901E = 0x3351
-0x901F = 0x4B59
-0x9020 = 0x546C
-0x9021 = 0x6552
-0x9022 = 0x376A
-0x9023 = 0x412C
-0x902D = 0x6555
-0x902E = 0x347E
-0x902F = 0x6556
-0x9032 = 0x3D78
-0x9035 = 0x6553
-0x9036 = 0x6554
-0x9038 = 0x525D
-0x903C = 0x3146
-0x903E = 0x5362
-0x9041 = 0x365D
-0x9042 = 0x4B6C
-0x9044 = 0x6557
-0x9047 = 0x5376
-0x904B = 0x544B
-0x904D = 0x3169
-0x904E = 0x397D
-0x904F = 0x3674
-0x9050 = 0x655A
-0x9051 = 0x6558
-0x9052 = 0x6559
-0x9053 = 0x3540
-0x9054 = 0x346F
-0x9055 = 0x4E25
-0x9058 = 0x655C
-0x905B = 0x655E
-0x905C = 0x5137
-0x905E = 0x355D
-0x9060 = 0x5436
-0x9062 = 0x655D
-0x9063 = 0x4732
-0x9065 = 0x5223
-0x9068 = 0x655B
-0x9069 = 0x4A4A
-0x906D = 0x5462
-0x906E = 0x555A
-0x9072 = 0x3359
-0x9074 = 0x6560
-0x9075 = 0x5771
-0x9077 = 0x4728
-0x9078 = 0x5121
-0x907A = 0x5245
-0x907C = 0x4149
-0x907D = 0x6561
-0x907F = 0x315C
-0x9080 = 0x517B
-0x9081 = 0x4275
-0x9082 = 0x6562
-0x9083 = 0x6564
-0x9084 = 0x3B39
-0x9087 = 0x6547
-0x9088 = 0x6563
-0x908A = 0x315F
-0x908B = 0x6565
-0x908F = 0x425F
-0x9090 = 0x654E
-0x9091 = 0x5258
-0x9095 = 0x675F
-0x9097 = 0x5A75
-0x9099 = 0x5A78
-0x909B = 0x5A76
-0x90A1 = 0x5A7A
-0x90A2 = 0x504F
-0x90A3 = 0x4447
-0x90A6 = 0x306E
-0x90AA = 0x5030
-0x90AF = 0x3A2A
-0x90B0 = 0x5B22
-0x90B1 = 0x4771
-0x90B3 = 0x5A7C
-0x90B4 = 0x5A7B
-0x90B5 = 0x495B
-0x90B6 = 0x5A7D
-0x90B8 = 0x5B21
-0x90BE = 0x5B25
-0x90C1 = 0x7879
-0x90C4 = 0x5B27
-0x90C5 = 0x5B24
-0x90C7 = 0x5B28
-0x90CA = 0x3D3C
-0x90CE = 0x4049
-0x90D7 = 0x5B2D
-0x90DB = 0x5B2E
-0x90DC = 0x5B2C
-0x90DD = 0x3A42
-0x90DF = 0x5B23
-0x90E1 = 0x3F24
-0x90E2 = 0x5B2B
-0x90E8 = 0x323F
-0x90EB = 0x5B2F
-0x90ED = 0x3979
-0x90EF = 0x5B30
-0x90F4 = 0x333B
-0x90F5 = 0x534A
-0x90FD = 0x363C
-0x90FE = 0x5B31
-0x9102 = 0x3675
-0x9104 = 0x5B32
-0x9106 = 0x5B29
-0x9109 = 0x4F67
-0x9112 = 0x575E
-0x9114 = 0x5A79
-0x9116 = 0x5447
-0x9119 = 0x3149
-0x911E = 0x5B34
-0x9122 = 0x5B33
-0x9123 = 0x5B35
-0x9127 = 0x354B
-0x912D = 0x5623
-0x912F = 0x5B37
-0x9130 = 0x415A
-0x9131 = 0x5B36
-0x9132 = 0x3526
-0x9134 = 0x5A7E
-0x9136 = 0x5B26
-0x9139 = 0x5B38
-0x913A = 0x5A77
-0x9143 = 0x5B39
-0x9146 = 0x5B3A
-0x9148 = 0x5B2A
-0x9149 = 0x534F
-0x914A = 0x747A
-0x914B = 0x4775
-0x914C = 0x5743
-0x914D = 0x4564
-0x914E = 0x747C
-0x914F = 0x747D
-0x9150 = 0x747B
-0x9152 = 0x3E46
-0x9157 = 0x506F
-0x915A = 0x3753
-0x915E = 0x4C2A
-0x9161 = 0x7522
-0x9162 = 0x7521
-0x9163 = 0x3A28
-0x9164 = 0x747E
-0x9165 = 0x4B56
-0x9169 = 0x7524
-0x916A = 0x4052
-0x916C = 0x336A
-0x916E = 0x4D2A
-0x916F = 0x7525
-0x9170 = 0x7523
-0x9172 = 0x7528
-0x9174 = 0x7529
-0x9175 = 0x3D4D
-0x9176 = 0x4338
-0x9177 = 0x3F61
-0x9178 = 0x4B61
-0x9179 = 0x752A
-0x9185 = 0x752C
-0x9187 = 0x343C
-0x9189 = 0x576D
-0x918B = 0x3457
-0x918C = 0x752B
-0x918D = 0x752E
-0x9190 = 0x752D
-0x9191 = 0x752F
-0x9192 = 0x5051
-0x9196 = 0x544D
-0x919A = 0x4351
-0x919B = 0x4829
-0x919C = 0x3373
-0x91A2 = 0x7530
-0x91A3 = 0x7531
-0x91AA = 0x7532
-0x91AB = 0x523D
-0x91AC = 0x3D34
-0x91AD = 0x7533
-0x91AE = 0x7534
-0x91AF = 0x7535
-0x91B4 = 0x7537
-0x91B5 = 0x7536
-0x91BA = 0x7538
-0x91C0 = 0x4470
-0x91C1 = 0x5046
-0x91C3 = 0x7527
-0x91C5 = 0x7526
-0x91C7 = 0x3249
-0x91C9 = 0x5354
-0x91CB = 0x4A4D
-0x91CC = 0x784E
-0x91CD = 0x5658
-0x91CE = 0x5230
-0x91CF = 0x413F
-0x91D1 = 0x3D70
-0x91D2 = 0x6E44
-0x91D3 = 0x6E45
-0x91D4 = 0x6E46
-0x91D5 = 0x6E49
-0x91D7 = 0x6E48
-0x91D8 = 0x3624
-0x91D9 = 0x6E47
-0x91DC = 0x382A
-0x91DD = 0x556B
-0x91E3 = 0x3576
-0x91E4 = 0x6E4C
-0x91E7 = 0x6E4B
-0x91E9 = 0x3730
-0x91F5 = 0x6E4E
-0x91F7 = 0x6E4A
-0x91F9 = 0x6E4F
-0x91FA = 0x4725
-0x9200 = 0x6E59
-0x9201 = 0x6E55
-0x9204 = 0x6E57
-0x9208 = 0x6E50
-0x9209 = 0x4446
-0x920D = 0x365B
-0x920E = 0x3933
-0x9210 = 0x6E54
-0x9211 = 0x6E53
-0x9214 = 0x332E
-0x9215 = 0x4525
-0x921E = 0x3E7B
-0x9223 = 0x3846
-0x9225 = 0x6E58
-0x9226 = 0x6E51
-0x9227 = 0x6E56
-0x922E = 0x6E6A
-0x9230 = 0x6E66
-0x9233 = 0x6E5D
-0x9234 = 0x4165
-0x9237 = 0x6E5C
-0x9238 = 0x6E60
-0x9239 = 0x6E6B
-0x923A = 0x6E5A
-0x923D = 0x6E5F
-0x923E = 0x534B
-0x923F = 0x6E64
-0x9240 = 0x3C58
-0x9245 = 0x6E52
-0x9248 = 0x6E68
-0x9249 = 0x6E67
-0x924D = 0x6E69
-0x9251 = 0x322C
-0x9255 = 0x6E5E
-0x9257 = 0x472F
-0x925A = 0x432D
-0x925B = 0x4726
-0x925E = 0x6E61
-0x9262 = 0x3227
-0x9266 = 0x6E5B
-0x926C = 0x6E62
-0x926D = 0x6E63
-0x9278 = 0x3D42
-0x927A = 0x6E6F
-0x927B = 0x3875
-0x927F = 0x6E7E
-0x9280 = 0x5278
-0x9283 = 0x6F25
-0x9285 = 0x4D2D
-0x928E = 0x7646
-0x9291 = 0x4F33
-0x9293 = 0x6E7D
-0x9296 = 0x6E79
-0x9298 = 0x437A
-0x929A = 0x6F22
-0x929C = 0x4F4E
-0x92A0 = 0x6E6E
-0x92A3 = 0x6F28
-0x92A5 = 0x523F
-0x92A6 = 0x6E77
-0x92A8 = 0x6F27
-0x92A9 = 0x6E7B
-0x92AA = 0x6E70
-0x92AB = 0x6F24
-0x92AC = 0x6E6D
-0x92B1 = 0x6E76
-0x92B7 = 0x4F7A
-0x92B9 = 0x5062
-0x92BB = 0x4C60
-0x92BC = 0x6F31
-0x92C1 = 0x4241
-0x92C3 = 0x6F36
-0x92C5 = 0x503F
-0x92C7 = 0x3135
-0x92C8 = 0x7648
-0x92CC = 0x6E7A
-0x92CF = 0x6E72
-0x92D2 = 0x3766
-0x92DD = 0x6F32
-0x92DF = 0x6F37
-0x92E3 = 0x6E74
-0x92E4 = 0x337A
-0x92E5 = 0x6F2D
-0x92E6 = 0x6F38
-0x92E8 = 0x6F30
-0x92EA = 0x464C
-0x92ED = 0x4871
-0x92EE = 0x6E71
-0x92EF = 0x6F2F
-0x92F0 = 0x6F2E
-0x92F1 = 0x6F2B
-0x92F6 = 0x6F33
-0x92F8 = 0x3E62
-0x92FC = 0x3856
-0x9301 = 0x6F3E
-0x9306 = 0x6F3A
-0x9307 = 0x6F42
-0x9308 = 0x6F43
-0x9310 = 0x5736
-0x9312 = 0x6F39
-0x9315 = 0x6F3F
-0x9318 = 0x3438
-0x9319 = 0x6F45
-0x931A = 0x6F23
-0x931B = 0x6F3C
-0x931F = 0x6F44
-0x9320 = 0x3627
-0x9322 = 0x472E
-0x9326 = 0x3D75
-0x9328 = 0x432A
-0x932B = 0x4E7D
-0x932E = 0x6F40
-0x932F = 0x346D
-0x9332 = 0x423C
-0x9333 = 0x434C
-0x9336 = 0x7823
-0x9338 = 0x6F2A
-0x9340 = 0x6F3D
-0x9341 = 0x4F47
-0x9343 = 0x6F41
-0x9346 = 0x6E4D
-0x9347 = 0x6F47
-0x934B = 0x3978
-0x934D = 0x3646
-0x9354 = 0x6F49
-0x9358 = 0x5521
-0x935B = 0x364D
-0x9364 = 0x6F4A
-0x9365 = 0x6F46
-0x9369 = 0x6F3B
-0x936A = 0x764A
-0x936C = 0x4742
-0x9370 = 0x6F4C
-0x9375 = 0x3C7C
-0x9376 = 0x6F48
-0x937A = 0x5560
-0x937E = 0x6F71
-0x9382 = 0x433E
-0x9384 = 0x6F4D
-0x9387 = 0x6F51
-0x938A = 0x3077
-0x938F = 0x764C
-0x9396 = 0x4B78
-0x9398 = 0x6F53
-0x93A2 = 0x4E59
-0x93A3 = 0x5D76
-0x93A6 = 0x6F56
-0x93A7 = 0x6E78
-0x93A9 = 0x6F21
-0x93AA = 0x6F4B
-0x93AC = 0x3864
-0x93AE = 0x5572
-0x93B0 = 0x6F57
-0x93B3 = 0x4478
-0x93B5 = 0x6F58
-0x93B8 = 0x6F54
-0x93BF = 0x6F55
-0x93C3 = 0x6F5F
-0x93C7 = 0x6F60
-0x93C8 = 0x4134
-0x93CA = 0x764B
-0x93CC = 0x6F52
-0x93CD = 0x6F5D
-0x93D1 = 0x6F61
-0x93D6 = 0x7769
-0x93D7 = 0x6F2C
-0x93D8 = 0x6F4F
-0x93DC = 0x6F5B
-0x93DD = 0x6F5C
-0x93DE = 0x6F5E
-0x93DF = 0x3279
-0x93E1 = 0x3E35
-0x93E2 = 0x6F5A
-0x93E4 = 0x6F4E
-0x93E8 = 0x7649
-0x93F5 = 0x6E7C
-0x93F7 = 0x6F64
-0x93F9 = 0x6F6A
-0x9403 = 0x6E73
-0x940B = 0x6F26
-0x9410 = 0x414D
-0x9412 = 0x6F29
-0x9413 = 0x6F66
-0x9414 = 0x6F62
-0x9418 = 0x5653
-0x9419 = 0x6F6B
-0x941D = 0x6F63
-0x9420 = 0x6F68
-0x9426 = 0x6F34
-0x9427 = 0x6F35
-0x9428 = 0x6F50
-0x942E = 0x412D
-0x9432 = 0x6F6D
-0x9433 = 0x4058
-0x9435 = 0x4C7A
-0x9438 = 0x6E6C
-0x943A = 0x6E75
-0x943E = 0x764D
-0x943F = 0x6F6E
-0x9444 = 0x567D
-0x944A = 0x6F6C
-0x944C = 0x6F59
-0x9452 = 0x3C78
-0x9454 = 0x6F6F
-0x9460 = 0x6E65
-0x9463 = 0x6F70
-0x9465 = 0x6F65
-0x946B = 0x764E
-0x946D = 0x6F67
-0x9470 = 0x543F
-0x9472 = 0x4F62
-0x9477 = 0x4477
-0x9479 = 0x6F69
-0x947C = 0x4260
-0x947D = 0x576A
-0x947E = 0x7647
-0x947F = 0x5464
-0x9577 = 0x3324
-0x9580 = 0x4345
-0x9582 = 0x6345
-0x9583 = 0x4941
-0x9586 = 0x6346
-0x9589 = 0x3155
-0x958B = 0x3F2A
-0x958C = 0x634A
-0x958E = 0x6348
-0x958F = 0x4872
-0x9591 = 0x4F50
-0x9593 = 0x3C64
-0x9594 = 0x6349
-0x9598 = 0x5522
-0x95A1 = 0x3A52
-0x95A3 = 0x3873
-0x95A4 = 0x7839
-0x95A5 = 0x3727
-0x95A8 = 0x396B
-0x95A9 = 0x4376
-0x95AB = 0x634D
-0x95AC = 0x634F
-0x95AD = 0x634C
-0x95B2 = 0x5444
-0x95B6 = 0x6351
-0x95B9 = 0x514B
-0x95BB = 0x5156
-0x95BC = 0x6355
-0x95BD = 0x6354
-0x95BE = 0x6350
-0x95BF = 0x6353
-0x95C3 = 0x6356
-0x95C6 = 0x7822
-0x95C8 = 0x6347
-0x95CA = 0x402B
-0x95CB = 0x6357
-0x95CC = 0x403B
-0x95D0 = 0x6359
-0x95D4 = 0x6358
-0x95D5 = 0x635A
-0x95D6 = 0x3433
-0x95DC = 0x3958
-0x95DE = 0x635B
-0x95E1 = 0x327B
-0x95E2 = 0x785B
-0x95E5 = 0x634B
-0x961C = 0x3837
-0x961D = 0x5A62
-0x9621 = 0x5A64
-0x9622 = 0x5A63
-0x962A = 0x5A66
-0x962E = 0x486E
-0x9631 = 0x5A65
-0x9632 = 0x3740
-0x963B = 0x5768
-0x963C = 0x5A68
-0x963D = 0x5A67
-0x963F = 0x3022
-0x9640 = 0x4D53
-0x9642 = 0x5A69
-0x9644 = 0x383D
-0x964B = 0x422A
-0x964C = 0x4430
-0x964D = 0x3D35
-0x9650 = 0x4F5E
-0x9654 = 0x5A6B
-0x9658 = 0x5A6A
-0x965B = 0x315D
-0x965D = 0x4942
-0x965F = 0x5A6C
-0x9661 = 0x3638
-0x9662 = 0x543A
-0x9663 = 0x5573
-0x9664 = 0x337D
-0x966A = 0x4563
-0x966C = 0x5A6E
-0x9670 = 0x5275
-0x9672 = 0x5A6F
-0x9673 = 0x3342
-0x9674 = 0x5A70
-0x9675 = 0x416A
-0x9676 = 0x4C55
-0x9677 = 0x4F5D
-0x9678 = 0x423D
-0x967D = 0x5174
-0x9685 = 0x5367
-0x9686 = 0x4221
-0x9688 = 0x5A71
-0x9689 = 0x5A6D
-0x968A = 0x3653
-0x968B = 0x4B65
-0x968D = 0x5A72
-0x968E = 0x3D57
-0x9694 = 0x3874
-0x9695 = 0x5449
-0x9697 = 0x5A73
-0x9698 = 0x302F
-0x9699 = 0x4F36
-0x969B = 0x3C4A
-0x969C = 0x554F
-0x96A7 = 0x4B6D
-0x96A8 = 0x4B66
-0x96AA = 0x4F55
-0x96B0 = 0x5A74
-0x96B1 = 0x527E
-0x96B3 = 0x6344
-0x96B4 = 0x4224
-0x96B8 = 0x4125
-0x96B9 = 0x763F
-0x96BB = 0x7922
-0x96BC = 0x7640
-0x96BD = 0x7641
-0x96C0 = 0x4838
-0x96C1 = 0x5163
-0x96C4 = 0x505B
-0x96C5 = 0x5145
-0x96C6 = 0x3C2F
-0x96C7 = 0x394D
-0x96C9 = 0x6F74
-0x96CC = 0x3446
-0x96CD = 0x533A
-0x96CE = 0x7642
-0x96D2 = 0x7643
-0x96D5 = 0x3571
-0x96D6 = 0x4B64
-0x96D9 = 0x4B2B
-0x96DB = 0x337B
-0x96DC = 0x5453
-0x96E2 = 0x406B
-0x96E3 = 0x4451
-0x96E8 = 0x536A
-0x96E9 = 0x7627
-0x96EA = 0x5129
-0x96EF = 0x7629
-0x96F2 = 0x5446
-0x96F6 = 0x4163
-0x96F7 = 0x4057
-0x96F9 = 0x3122
-0x96FB = 0x3567
-0x9700 = 0x5068
-0x9704 = 0x4F76
-0x9706 = 0x762A
-0x9707 = 0x5570
-0x9708 = 0x762C
-0x9709 = 0x4339
-0x970D = 0x3B74
-0x970E = 0x762E
-0x970F = 0x762D
-0x9713 = 0x445E
-0x9716 = 0x4158
-0x971C = 0x4B2A
-0x971E = 0x4F3C
-0x9727 = 0x4E6D
-0x972A = 0x762F
-0x9730 = 0x7631
-0x9732 = 0x4236
-0x9738 = 0x3054
-0x9739 = 0x4579
-0x973D = 0x762B
-0x973E = 0x7632
-0x9742 = 0x7628
-0x9744 = 0x7630
-0x9748 = 0x4169
-0x9752 = 0x4760
-0x9756 = 0x3E38
-0x975A = 0x7626
-0x975B = 0x3565
-0x975C = 0x3E32
-0x975E = 0x3747
-0x9760 = 0x3F3F
-0x9761 = 0x4352
-0x9762 = 0x4366
-0x9768 = 0x584C
-0x9769 = 0x386F
-0x9773 = 0x3D79
-0x9774 = 0x5125
-0x9776 = 0x3050
-0x977C = 0x7730
-0x9785 = 0x7731
-0x978B = 0x502C
-0x978D = 0x3030
-0x978F = 0x392E
-0x9794 = 0x7734
-0x9798 = 0x474A
-0x97A0 = 0x3E4F
-0x97A3 = 0x7737
-0x97A6 = 0x7864
-0x97AB = 0x7736
-0x97AD = 0x315E
-0x97B2 = 0x7738
-0x97B4 = 0x7739
-0x97BD = 0x7733
-0x97C3 = 0x7732
-0x97C6 = 0x7861
-0x97C9 = 0x7735
-0x97CB = 0x4E24
-0x97CC = 0x484D
-0x97D3 = 0x3A2B
-0x97D9 = 0x6838
-0x97DC = 0x683A
-0x97DE = 0x6839
-0x97ED = 0x3E42
-0x97F3 = 0x5274
-0x97F5 = 0x544F
-0x97F6 = 0x4958
-0x97FF = 0x4F6C
-0x9801 = 0x5233
-0x9802 = 0x3625
-0x9803 = 0x476A
-0x9805 = 0x4F6E
-0x9806 = 0x4B33
-0x9807 = 0x717C
-0x9808 = 0x506B
-0x980A = 0x676F
-0x980C = 0x4B4C
-0x980E = 0x717D
-0x980F = 0x717E
-0x9810 = 0x5424
-0x9811 = 0x4D67
-0x9812 = 0x3064
-0x9813 = 0x3659
-0x9817 = 0x4644
-0x9818 = 0x416C
-0x981C = 0x7222
-0x9821 = 0x7221
-0x9824 = 0x5243
-0x9826 = 0x7224
-0x982D = 0x4D37
-0x9830 = 0x3C55
-0x9837 = 0x7225
-0x9838 = 0x3E31
-0x983B = 0x4635
-0x983D = 0x4D47
-0x9846 = 0x3F45
-0x984C = 0x4C62
-0x984D = 0x366E
-0x984E = 0x7226
-0x9853 = 0x7227
-0x9854 = 0x5155
-0x9858 = 0x5438
-0x9859 = 0x722A
-0x985B = 0x355F
-0x985E = 0x4060
-0x9862 = 0x7229
-0x9865 = 0x722B
-0x9867 = 0x394B
-0x986B = 0x327C
-0x986C = 0x722C
-0x986F = 0x4F54
-0x9870 = 0x722D
-0x9871 = 0x422D
-0x9873 = 0x7228
-0x9874 = 0x4827
-0x98A8 = 0x3767
-0x98AE = 0x6C29
-0x98AF = 0x6C2A
-0x98B1 = 0x786C
-0x98B3 = 0x7837
-0x98B6 = 0x6C2B
-0x98BC = 0x6C2C
-0x98C4 = 0x462E
-0x98C6 = 0x6C2D
-0x98C8 = 0x6C2E
-0x98DB = 0x3749
-0x98DF = 0x4A33
-0x98E0 = 0x623B
-0x98E2 = 0x783F
-0x98E7 = 0x6238
-0x98E9 = 0x623D
-0x98EA = 0x623F
-0x98EB = 0x6240
-0x98ED = 0x6241
-0x98EF = 0x3739
-0x98F2 = 0x527B
-0x98F4 = 0x6242
-0x98FC = 0x4B47
-0x98FD = 0x3125
-0x98FE = 0x4A4E
-0x9903 = 0x3D48
-0x9905 = 0x317D
-0x9909 = 0x6243
-0x990A = 0x5178
-0x990C = 0x367C
-0x9910 = 0x324D
-0x9911 = 0x6244
-0x9912 = 0x4459
-0x9913 = 0x3676
-0x9918 = 0x5360
-0x991B = 0x6246
-0x991E = 0x3D24
-0x9921 = 0x4F5A
-0x9928 = 0x395D
-0x992E = 0x7751
-0x9933 = 0x623C
-0x9937 = 0x6247
-0x993C = 0x623E
-0x993E = 0x4173
-0x993F = 0x6248
-0x9943 = 0x6249
-0x9945 = 0x4278
-0x9948 = 0x624A
-0x9949 = 0x624B
-0x994A = 0x624C
-0x994B = 0x4021
-0x994C = 0x624D
-0x9951 = 0x3C22
-0x9952 = 0x4844
-0x9954 = 0x7753
-0x9955 = 0x7752
-0x9957 = 0x774F
-0x995C = 0x7750
-0x995E = 0x3276
-0x9962 = 0x624E
-0x9996 = 0x4A57
-0x9997 = 0x5838
-0x9998 = 0x5965
-0x9999 = 0x4F63
-0x99A5 = 0x7025
-0x99A8 = 0x5C30
-0x99AC = 0x426D
-0x99AD = 0x5426
-0x99AE = 0x376B
-0x99B1 = 0x4D54
-0x99B3 = 0x335B
-0x99B4 = 0x5131
-0x99C1 = 0x3235
-0x99D0 = 0x5724
-0x99D1 = 0x6665
-0x99D2 = 0x3E54
-0x99D4 = 0x6660
-0x99D5 = 0x3C5D
-0x99D8 = 0x6666
-0x99D9 = 0x6662
-0x99DB = 0x4A3B
-0x99DD = 0x4D55
-0x99DF = 0x6661
-0x99E1 = 0x426E
-0x99E2 = 0x6669
-0x99ED = 0x3A27
-0x99F1 = 0x4266
-0x99FF = 0x3F25
-0x9A01 = 0x3352
-0x9A05 = 0x666D
-0x9A0D = 0x666C
-0x9A0E = 0x466F
-0x9A0F = 0x666B
-0x9A16 = 0x6670
-0x9A19 = 0x462D
-0x9A2B = 0x6539
-0x9A2D = 0x666F
-0x9A2E = 0x6672
-0x9A30 = 0x4C5A
-0x9A36 = 0x6663
-0x9A37 = 0x4927
-0x9A38 = 0x6673
-0x9A3E = 0x4262
-0x9A40 = 0x5D6B
-0x9A41 = 0x6671
-0x9A42 = 0x666E
-0x9A43 = 0x6674
-0x9A44 = 0x6675
-0x9A45 = 0x477D
-0x9A4A = 0x6668
-0x9A4D = 0x6667
-0x9A4F = 0x6676
-0x9A55 = 0x3D3E
-0x9A57 = 0x5169
-0x9A5A = 0x3E2A
-0x9A5B = 0x6664
-0x9A5F = 0x5668
-0x9A62 = 0x423F
-0x9A64 = 0x6678
-0x9A65 = 0x6677
-0x9A6A = 0x666A
-0x9AA8 = 0x3947
-0x9AAF = 0x3039
-0x9AB0 = 0x773B
-0x9AB1 = 0x773A
-0x9AB6 = 0x773E
-0x9AB7 = 0x773C
-0x9AB8 = 0x3A21
-0x9ABA = 0x773F
-0x9ABC = 0x7740
-0x9AC0 = 0x7742
-0x9AC1 = 0x7741
-0x9AC2 = 0x7744
-0x9ACF = 0x7743
-0x9AD1 = 0x7747
-0x9AD2 = 0x787E
-0x9AD3 = 0x4B68
-0x9AD4 = 0x4C65
-0x9AD5 = 0x7746
-0x9AD6 = 0x7745
-0x9AD8 = 0x385F
-0x9ADF = 0x7754
-0x9AE1 = 0x7755
-0x9AE6 = 0x7756
-0x9AEB = 0x7758
-0x9AED = 0x775A
-0x9AEE = 0x7831
-0x9AEF = 0x7757
-0x9AF9 = 0x775B
-0x9AFB = 0x7759
-0x9B03 = 0x5757
-0x9B06 = 0x4B49
-0x9B08 = 0x775C
-0x9B0D = 0x783A
-0x9B0F = 0x775D
-0x9B1A = 0x7876
-0x9B1F = 0x775F
-0x9B22 = 0x775E
-0x9B23 = 0x7760
-0x9B25 = 0x3637
-0x9B27 = 0x4456
-0x9B29 = 0x6352
-0x9B2E = 0x634E
-0x9B2F = 0x5B4B
-0x9B31 = 0x5374
-0x9B32 = 0x582A
-0x9B3B = 0x6577
-0x9B3C = 0x396D
-0x9B41 = 0x3F7D
-0x9B42 = 0x3B6A
-0x9B43 = 0x7749
-0x9B44 = 0x4647
-0x9B45 = 0x7748
-0x9B48 = 0x774C
-0x9B4D = 0x774D
-0x9B4E = 0x774B
-0x9B4F = 0x4E3A
-0x9B51 = 0x774E
-0x9B54 = 0x4427
-0x9B58 = 0x774A
-0x9B5A = 0x5363
-0x9B6F = 0x4233
-0x9B74 = 0x7650
-0x9B77 = 0x764F
-0x9B81 = 0x7651
-0x9B83 = 0x7652
-0x9B8E = 0x7653
-0x9B90 = 0x7658
-0x9B91 = 0x312B
-0x9B92 = 0x7656
-0x9B9A = 0x765A
-0x9B9D = 0x765F
-0x9B9E = 0x765C
-0x9BAA = 0x765B
-0x9BAB = 0x765E
-0x9BAD = 0x7659
-0x9BAE = 0x4F4A
-0x9BC0 = 0x7667
-0x9BC1 = 0x7661
-0x9BC7 = 0x7669
-0x9BC9 = 0x4070
-0x9BCA = 0x7668
-0x9BD4 = 0x7676
-0x9BD6 = 0x766B
-0x9BDB = 0x7674
-0x9BDD = 0x7671
-0x9BE1 = 0x766E
-0x9BE2 = 0x7672
-0x9BE4 = 0x766F
-0x9BE7 = 0x7670
-0x9BE8 = 0x3E28
-0x9BEA = 0x766C
-0x9BEB = 0x766D
-0x9BF0 = 0x7673
-0x9BF4 = 0x7675
-0x9BFD = 0x766A
-0x9BFF = 0x767D
-0x9C08 = 0x7678
-0x9C09 = 0x767C
-0x9C0D = 0x767A
-0x9C10 = 0x7679
-0x9C12 = 0x767B
-0x9C13 = 0x487A
-0x9C20 = 0x767E
-0x9C23 = 0x7665
-0x9C25 = 0x7724
-0x9C28 = 0x7723
-0x9C29 = 0x7725
-0x9C2D = 0x7722
-0x9C31 = 0x7663
-0x9C32 = 0x7721
-0x9C33 = 0x7726
-0x9C35 = 0x772A
-0x9C37 = 0x7666
-0x9C39 = 0x7664
-0x9C3B = 0x7729
-0x9C3E = 0x7727
-0x9C45 = 0x772B
-0x9C48 = 0x7728
-0x9C49 = 0x316E
-0x9C52 = 0x772E
-0x9C54 = 0x772D
-0x9C56 = 0x772C
-0x9C57 = 0x415B
-0x9C58 = 0x7660
-0x9C5D = 0x7677
-0x9C5F = 0x7657
-0x9C67 = 0x772F
-0x9C6D = 0x765D
-0x9C78 = 0x7654
-0x9C7A = 0x7662
-0x9CE5 = 0x4471
-0x9CE9 = 0x702F
-0x9CEC = 0x596C
-0x9CF3 = 0x376F
-0x9CF4 = 0x4379
-0x9CF6 = 0x7030
-0x9D06 = 0x7032
-0x9D07 = 0x7031
-0x9D09 = 0x513B
-0x9D15 = 0x4D52
-0x9D1B = 0x5427
-0x9D1D = 0x7036
-0x9D1F = 0x7037
-0x9D23 = 0x7033
-0x9D26 = 0x516C
-0x9D28 = 0x513C
-0x9D2F = 0x7039
-0x9D30 = 0x703B
-0x9D3B = 0x3A68
-0x9D3F = 0x386B
-0x9D42 = 0x703C
-0x9D51 = 0x3E69
-0x9D52 = 0x7041
-0x9D53 = 0x703E
-0x9D5C = 0x7043
-0x9D5D = 0x366C
-0x9D60 = 0x7040
-0x9D61 = 0x7044
-0x9D6A = 0x7046
-0x9D6C = 0x4574
-0x9D6F = 0x7047
-0x9D72 = 0x4835
-0x9D87 = 0x7034
-0x9D89 = 0x7048
-0x9D93 = 0x7045
-0x9D98 = 0x7049
-0x9D9A = 0x704A
-0x9DA5 = 0x704C
-0x9DA9 = 0x704D
-0x9DAF = 0x5D3A
-0x9DB4 = 0x3A57
-0x9DBB = 0x773D
-0x9DBC = 0x704F
-0x9DC0 = 0x704B
-0x9DC2 = 0x704E
-0x9DC4 = 0x3C26
-0x9DD3 = 0x7051
-0x9DD7 = 0x4538
-0x9DD9 = 0x703A
-0x9DDA = 0x7052
-0x9DE5 = 0x7038
-0x9DE6 = 0x7054
-0x9DEF = 0x7053
-0x9DF2 = 0x7055
-0x9DF3 = 0x7042
-0x9DF8 = 0x7056
-0x9DF9 = 0x5325
-0x9DFA = 0x7058
-0x9E0C = 0x7057
-0x9E15 = 0x7035
-0x9E1A = 0x7050
-0x9E1B = 0x7059
-0x9E1D = 0x703F
-0x9E1E = 0x703D
-0x9E75 = 0x7852
-0x9E79 = 0x7874
-0x9E7A = 0x753A
-0x9E7C = 0x3C6F
-0x9E7D = 0x514E
-0x9E7F = 0x4239
-0x9E82 = 0x7764
-0x9E87 = 0x7765
-0x9E88 = 0x7766
-0x9E8B = 0x7767
-0x9E92 = 0x7768
-0x9E93 = 0x4234
-0x9E97 = 0x4076
-0x9E9D = 0x776A
-0x9E9F = 0x776B
-0x9EA5 = 0x4273
-0x9EA9 = 0x746F
-0x9EAF = 0x7865
-0x9EB4 = 0x7470
-0x9EB5 = 0x7859
-0x9EBB = 0x4269
-0x9EBD = 0x4334
-0x9EBE = 0x7762
-0x9EC4 = 0x3B46
-0x9ECC = 0x5964
-0x9ECD = 0x4A72
-0x9ECE = 0x4068
-0x9ECF = 0x7024
-0x9ED1 = 0x3A5A
-0x9ED4 = 0x472D
-0x9ED8 = 0x442C
-0x9EDB = 0x776C
-0x9EDC = 0x776D
-0x9EDD = 0x776E
-0x9EDE = 0x3563
-0x9EDF = 0x7770
-0x9EE0 = 0x776F
-0x9EE2 = 0x7771
-0x9EE5 = 0x7774
-0x9EE7 = 0x7773
-0x9EE8 = 0x3533
-0x9EEF = 0x7776
-0x9EF2 = 0x7775
-0x9EF4 = 0x7854
-0x9EF7 = 0x7772
-0x9EF9 = 0x6D69
-0x9EFB = 0x6D6A
-0x9EFC = 0x6D6B
-0x9EFD = 0x763C
-0x9EFF = 0x763D
-0x9F09 = 0x763E
-0x9F0E = 0x3626
-0x9F10 = 0x583E
-0x9F13 = 0x3944
-0x9F15 = 0x782E
-0x9F17 = 0x583B
-0x9F19 = 0x5C31
-0x9F20 = 0x4A73
-0x9F22 = 0x7777
-0x9F2C = 0x7778
-0x9F2F = 0x7779
-0x9F37 = 0x777B
-0x9F39 = 0x777A
-0x9F3B = 0x3147
-0x9F3D = 0x777C
-0x9F3E = 0x777D
-0x9F44 = 0x777E
-0x9F4A = 0x466B
-0x9F4B = 0x552B
-0x9F4F = 0x6C34
-0x9F52 = 0x335D
-0x9F54 = 0x7633
-0x9F59 = 0x7635
-0x9F5C = 0x7637
-0x9F5F = 0x7634
-0x9F60 = 0x7636
-0x9F61 = 0x4164
-0x9F63 = 0x782A
-0x9F66 = 0x7638
-0x9F6A = 0x763A
-0x9F6C = 0x7639
-0x9F72 = 0x4823
-0x9F77 = 0x763B
-0x9F8D = 0x417A
-0x9F90 = 0x4553
-0x9F94 = 0x3928
-0x9F95 = 0x6D68
-0x9F9C = 0x396A
-0x9FA0 = 0x595F
-0xFF01 = 0x2321
-0xFF02 = 0x2322
-0xFF03 = 0x2323
-0xFF04 = 0x2167
-0xFF05 = 0x2325
-0xFF06 = 0x2326
-0xFF07 = 0x2327
-0xFF08 = 0x2328
-0xFF09 = 0x2329
-0xFF0A = 0x232A
-0xFF0B = 0x232B
-0xFF0C = 0x232C
-0xFF0D = 0x232D
-0xFF0E = 0x232E
-0xFF0F = 0x232F
-0xFF10 = 0x2330
-0xFF11 = 0x2331
-0xFF12 = 0x2332
-0xFF13 = 0x2333
-0xFF14 = 0x2334
-0xFF15 = 0x2335
-0xFF16 = 0x2336
-0xFF17 = 0x2337
-0xFF18 = 0x2338
-0xFF19 = 0x2339
-0xFF1A = 0x233A
-0xFF1B = 0x233B
-0xFF1C = 0x233C
-0xFF1D = 0x233D
-0xFF1E = 0x233E
-0xFF1F = 0x233F
-0xFF20 = 0x2340
-0xFF21 = 0x2341
-0xFF22 = 0x2342
-0xFF23 = 0x2343
-0xFF24 = 0x2344
-0xFF25 = 0x2345
-0xFF26 = 0x2346
-0xFF27 = 0x2347
-0xFF28 = 0x2348
-0xFF29 = 0x2349
-0xFF2A = 0x234A
-0xFF2B = 0x234B
-0xFF2C = 0x234C
-0xFF2D = 0x234D
-0xFF2E = 0x234E
-0xFF2F = 0x234F
-0xFF30 = 0x2350
-0xFF31 = 0x2351
-0xFF32 = 0x2352
-0xFF33 = 0x2353
-0xFF34 = 0x2354
-0xFF35 = 0x2355
-0xFF36 = 0x2356
-0xFF37 = 0x2357
-0xFF38 = 0x2358
-0xFF39 = 0x2359
-0xFF3A = 0x235A
-0xFF3B = 0x235B
-0xFF3C = 0x235C
-0xFF3D = 0x235D
-0xFF3E = 0x235E
-0xFF3F = 0x235F
-0xFF40 = 0x2360
-0xFF41 = 0x2361
-0xFF42 = 0x2362
-0xFF43 = 0x2363
-0xFF44 = 0x2364
-0xFF45 = 0x2365
-0xFF46 = 0x2366
-0xFF47 = 0x2367
-0xFF48 = 0x2368
-0xFF49 = 0x2369
-0xFF4A = 0x236A
-0xFF4B = 0x236B
-0xFF4C = 0x236C
-0xFF4D = 0x236D
-0xFF4E = 0x236E
-0xFF4F = 0x236F
-0xFF50 = 0x2370
-0xFF51 = 0x2371
-0xFF52 = 0x2372
-0xFF53 = 0x2373
-0xFF54 = 0x2374
-0xFF55 = 0x2375
-0xFF56 = 0x2376
-0xFF57 = 0x2377
-0xFF58 = 0x2378
-0xFF59 = 0x2379
-0xFF5A = 0x237A
-0xFF5B = 0x237B
-0xFF5C = 0x237C
-0xFF5D = 0x237D
-0xFF5E = 0x212B
-0xFFE0 = 0x2169
-0xFFE1 = 0x216A
-0xFFE3 = 0x237E
-0xFFE5 = 0x2324
-END_MAP
diff --git a/enc/trans/GB/UCS%GB2312.src b/enc/trans/GB/UCS%GB2312.src
deleted file mode 100644
index 3293fea604..0000000000
--- a/enc/trans/GB/UCS%GB2312.src
+++ /dev/null
@@ -1,7531 +0,0 @@
-# $NetBSD: UCS%GB2312.src,v 1.6 2006/11/22 20:22:30 tnozaki Exp $
-
-TYPE ROWCOL
-NAME "UCS/GB2312"
-SRC_ZONE 0x00A4 - 0xFFE5
-OOB_MODE INVALID
-DST_INVALID 0xFFFF
-DST_UNIT_BITS 16
-
-BEGIN_MAP
-#
-# This mapping data is made from the mapping data provided by Unicode, Inc.
-# Original notice:
-#
-# Name: GB2312-80 to Unicode table (complete, hex format)
-# Unicode version: 3.0
-# Table version: 1.0
-# Table format: Format A
-# Date: 1999 October 8
-#
-# Copyright (c) 1991-1999 Unicode, Inc. All Rights reserved.
-#
-# This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
-# No claims are made as to fitness for any particular purpose. No
-# warranties of any kind are expressed or implied. The recipient
-# agrees to determine applicability of information provided. If this
-# file has been provided on optical media by Unicode, Inc., the sole
-# remedy for any claim will be exchange of defective media within 90
-# days of receipt.
-#
-# Unicode, Inc. hereby grants the right to freely use the information
-# supplied in this file in the creation of products supporting the
-# Unicode Standard, and to make copies of this file in any form for
-# internal or external distribution as long as this notice remains
-# attached.
-#
-# General notes:
-#
-#
-# This table contains one set of mappings from GB2312-80 into Unicode.
-# Note that these data are *possible* mappings only and may not be the
-# same as those used by actual products, nor may they be the best suited
-# for all uses. For more information on the mappings between various code
-# pages incorporating the repertoire of GB2312-80 and Unicode, consult the
-# VENDORS mapping data. Normative information on the mapping between
-# GB2312-80 and Unicode may be found in the Unihan.txt file in the
-# latest Unicode Character Database.
-#
-# If you have carefully considered the fact that the mappings in
-# this table are only one possible set of mappings between GB2312-80 and
-# Unicode and have no normative status, but still feel that you
-# have located an error in the table that requires fixing, you may
-# report any such error to errata@unicode.org.
-#
-#
-# Format: Three tab-separated columns
-# Column #1 is the GB2312 code (in hex as 0xXXXX)
-# Column #2 is the Unicode (in hex as 0xXXXX)
-# Column #3 the Unicode name (follows a comment sign, '#')
-# The official names for Unicode characters U+4E00
-# to U+9FA5, inclusive, is "CJK UNIFIED IDEOGRAPH-XXXX",
-# where XXXX is the code point. Including all these
-# names in this file increases its size substantially
-# and needlessly. The token "<CJK>" is used for the
-# name of these characters. If necessary, it can be
-# expanded algorithmically by a parser or editor.
-#
-# The entries are in GB2312 order
-#
-# The following algorithms can be used to change the hex form
-# of GB2312 to other standard forms:
-#
-# To change hex to EUC form, add 0x8080
-# To change hex to kuten form, first subtract 0x2020. Then
-# the high and low bytes correspond to the ku and ten of
-# the kuten form. For example, 0x2121 -> 0x0101 -> 0101;
-# 0x777E -> 0x575E -> 8794
-#
-# Version history
-# 1.0 version updates 0.0d2 version by correcting mapping for 0x212C
-# from U+2225 to U+2016.
-#
-#
-0x00A4 = 0x2168
-0x00A7 = 0x216C
-0x00A8 = 0x2127
-0x00B0 = 0x2163
-0x00B1 = 0x2140
-0x00B7 = 0x2124
-0x00D7 = 0x2141
-0x00E0 = 0x2824
-0x00E1 = 0x2822
-0x00E8 = 0x2828
-0x00E9 = 0x2826
-0x00EA = 0x283A
-0x00EC = 0x282C
-0x00ED = 0x282A
-0x00F2 = 0x2830
-0x00F3 = 0x282E
-0x00F7 = 0x2142
-0x00F9 = 0x2834
-0x00FA = 0x2832
-0x00FC = 0x2839
-0x0101 = 0x2821
-0x0113 = 0x2825
-0x011B = 0x2827
-0x012B = 0x2829
-0x014D = 0x282D
-0x016B = 0x2831
-0x01CE = 0x2823
-0x01D0 = 0x282B
-0x01D2 = 0x282F
-0x01D4 = 0x2833
-0x01D6 = 0x2835
-0x01D8 = 0x2836
-0x01DA = 0x2837
-0x01DC = 0x2838
-0x02C7 = 0x2126
-0x02C9 = 0x2125
-0x0391 = 0x2621
-0x0392 = 0x2622
-0x0393 = 0x2623
-0x0394 = 0x2624
-0x0395 = 0x2625
-0x0396 = 0x2626
-0x0397 = 0x2627
-0x0398 = 0x2628
-0x0399 = 0x2629
-0x039A = 0x262A
-0x039B = 0x262B
-0x039C = 0x262C
-0x039D = 0x262D
-0x039E = 0x262E
-0x039F = 0x262F
-0x03A0 = 0x2630
-0x03A1 = 0x2631
-0x03A3 = 0x2632
-0x03A4 = 0x2633
-0x03A5 = 0x2634
-0x03A6 = 0x2635
-0x03A7 = 0x2636
-0x03A8 = 0x2637
-0x03A9 = 0x2638
-0x03B1 = 0x2641
-0x03B2 = 0x2642
-0x03B3 = 0x2643
-0x03B4 = 0x2644
-0x03B5 = 0x2645
-0x03B6 = 0x2646
-0x03B7 = 0x2647
-0x03B8 = 0x2648
-0x03B9 = 0x2649
-0x03BA = 0x264A
-0x03BB = 0x264B
-0x03BC = 0x264C
-0x03BD = 0x264D
-0x03BE = 0x264E
-0x03BF = 0x264F
-0x03C0 = 0x2650
-0x03C1 = 0x2651
-0x03C3 = 0x2652
-0x03C4 = 0x2653
-0x03C5 = 0x2654
-0x03C6 = 0x2655
-0x03C7 = 0x2656
-0x03C8 = 0x2657
-0x03C9 = 0x2658
-0x0401 = 0x2727
-0x0410 = 0x2721
-0x0411 = 0x2722
-0x0412 = 0x2723
-0x0413 = 0x2724
-0x0414 = 0x2725
-0x0415 = 0x2726
-0x0416 = 0x2728
-0x0417 = 0x2729
-0x0418 = 0x272A
-0x0419 = 0x272B
-0x041A = 0x272C
-0x041B = 0x272D
-0x041C = 0x272E
-0x041D = 0x272F
-0x041E = 0x2730
-0x041F = 0x2731
-0x0420 = 0x2732
-0x0421 = 0x2733
-0x0422 = 0x2734
-0x0423 = 0x2735
-0x0424 = 0x2736
-0x0425 = 0x2737
-0x0426 = 0x2738
-0x0427 = 0x2739
-0x0428 = 0x273A
-0x0429 = 0x273B
-0x042A = 0x273C
-0x042B = 0x273D
-0x042C = 0x273E
-0x042D = 0x273F
-0x042E = 0x2740
-0x042F = 0x2741
-0x0430 = 0x2751
-0x0431 = 0x2752
-0x0432 = 0x2753
-0x0433 = 0x2754
-0x0434 = 0x2755
-0x0435 = 0x2756
-0x0436 = 0x2758
-0x0437 = 0x2759
-0x0438 = 0x275A
-0x0439 = 0x275B
-0x043A = 0x275C
-0x043B = 0x275D
-0x043C = 0x275E
-0x043D = 0x275F
-0x043E = 0x2760
-0x043F = 0x2761
-0x0440 = 0x2762
-0x0441 = 0x2763
-0x0442 = 0x2764
-0x0443 = 0x2765
-0x0444 = 0x2766
-0x0445 = 0x2767
-0x0446 = 0x2768
-0x0447 = 0x2769
-0x0448 = 0x276A
-0x0449 = 0x276B
-0x044A = 0x276C
-0x044B = 0x276D
-0x044C = 0x276E
-0x044D = 0x276F
-0x044E = 0x2770
-0x044F = 0x2771
-0x0451 = 0x2757
-0x2014 = 0x212A
-0x2015 = 0x212A # fallback -> 0x2014
-0x2016 = 0x212C
-0x2018 = 0x212E
-0x2019 = 0x212F
-0x201C = 0x2130
-0x201D = 0x2131
-0x2026 = 0x212D
-0x2030 = 0x216B
-0x2032 = 0x2164
-0x2033 = 0x2165
-0x203B = 0x2179
-0x2103 = 0x2166
-0x2116 = 0x216D
-0x2160 = 0x2271
-0x2161 = 0x2272
-0x2162 = 0x2273
-0x2163 = 0x2274
-0x2164 = 0x2275
-0x2165 = 0x2276
-0x2166 = 0x2277
-0x2167 = 0x2278
-0x2168 = 0x2279
-0x2169 = 0x227A
-0x216A = 0x227B
-0x216B = 0x227C
-0x2190 = 0x217B
-0x2191 = 0x217C
-0x2192 = 0x217A
-0x2193 = 0x217D
-0x2208 = 0x214A
-0x220F = 0x2147
-0x2211 = 0x2146
-0x221A = 0x214C
-0x221D = 0x2158
-0x221E = 0x215E
-0x2220 = 0x214F
-0x2225 = 0x214E
-0x2227 = 0x2144
-0x2228 = 0x2145
-0x2229 = 0x2149
-0x222A = 0x2148
-0x222B = 0x2152
-0x222E = 0x2153
-0x2234 = 0x2160
-0x2235 = 0x215F
-0x2236 = 0x2143
-0x2237 = 0x214B
-0x223D = 0x2157
-0x2248 = 0x2156
-0x224C = 0x2155
-0x2260 = 0x2159
-0x2261 = 0x2154
-0x2264 = 0x215C
-0x2265 = 0x215D
-0x226E = 0x215A
-0x226F = 0x215B
-0x2299 = 0x2151
-0x22A5 = 0x214D
-0x2312 = 0x2150
-0x2460 = 0x2259
-0x2461 = 0x225A
-0x2462 = 0x225B
-0x2463 = 0x225C
-0x2464 = 0x225D
-0x2465 = 0x225E
-0x2466 = 0x225F
-0x2467 = 0x2260
-0x2468 = 0x2261
-0x2469 = 0x2262
-0x2474 = 0x2245
-0x2475 = 0x2246
-0x2476 = 0x2247
-0x2477 = 0x2248
-0x2478 = 0x2249
-0x2479 = 0x224A
-0x247A = 0x224B
-0x247B = 0x224C
-0x247C = 0x224D
-0x247D = 0x224E
-0x247E = 0x224F
-0x247F = 0x2250
-0x2480 = 0x2251
-0x2481 = 0x2252
-0x2482 = 0x2253
-0x2483 = 0x2254
-0x2484 = 0x2255
-0x2485 = 0x2256
-0x2486 = 0x2257
-0x2487 = 0x2258
-0x2488 = 0x2231
-0x2489 = 0x2232
-0x248A = 0x2233
-0x248B = 0x2234
-0x248C = 0x2235
-0x248D = 0x2236
-0x248E = 0x2237
-0x248F = 0x2238
-0x2490 = 0x2239
-0x2491 = 0x223A
-0x2492 = 0x223B
-0x2493 = 0x223C
-0x2494 = 0x223D
-0x2495 = 0x223E
-0x2496 = 0x223F
-0x2497 = 0x2240
-0x2498 = 0x2241
-0x2499 = 0x2242
-0x249A = 0x2243
-0x249B = 0x2244
-0x2500 = 0x2924
-0x2501 = 0x2925
-0x2502 = 0x2926
-0x2503 = 0x2927
-0x2504 = 0x2928
-0x2505 = 0x2929
-0x2506 = 0x292A
-0x2507 = 0x292B
-0x2508 = 0x292C
-0x2509 = 0x292D
-0x250A = 0x292E
-0x250B = 0x292F
-0x250C = 0x2930
-0x250D = 0x2931
-0x250E = 0x2932
-0x250F = 0x2933
-0x2510 = 0x2934
-0x2511 = 0x2935
-0x2512 = 0x2936
-0x2513 = 0x2937
-0x2514 = 0x2938
-0x2515 = 0x2939
-0x2516 = 0x293A
-0x2517 = 0x293B
-0x2518 = 0x293C
-0x2519 = 0x293D
-0x251A = 0x293E
-0x251B = 0x293F
-0x251C = 0x2940
-0x251D = 0x2941
-0x251E = 0x2942
-0x251F = 0x2943
-0x2520 = 0x2944
-0x2521 = 0x2945
-0x2522 = 0x2946
-0x2523 = 0x2947
-0x2524 = 0x2948
-0x2525 = 0x2949
-0x2526 = 0x294A
-0x2527 = 0x294B
-0x2528 = 0x294C
-0x2529 = 0x294D
-0x252A = 0x294E
-0x252B = 0x294F
-0x252C = 0x2950
-0x252D = 0x2951
-0x252E = 0x2952
-0x252F = 0x2953
-0x2530 = 0x2954
-0x2531 = 0x2955
-0x2532 = 0x2956
-0x2533 = 0x2957
-0x2534 = 0x2958
-0x2535 = 0x2959
-0x2536 = 0x295A
-0x2537 = 0x295B
-0x2538 = 0x295C
-0x2539 = 0x295D
-0x253A = 0x295E
-0x253B = 0x295F
-0x253C = 0x2960
-0x253D = 0x2961
-0x253E = 0x2962
-0x253F = 0x2963
-0x2540 = 0x2964
-0x2541 = 0x2965
-0x2542 = 0x2966
-0x2543 = 0x2967
-0x2544 = 0x2968
-0x2545 = 0x2969
-0x2546 = 0x296A
-0x2547 = 0x296B
-0x2548 = 0x296C
-0x2549 = 0x296D
-0x254A = 0x296E
-0x254B = 0x296F
-0x25A0 = 0x2176
-0x25A1 = 0x2175
-0x25B2 = 0x2178
-0x25B3 = 0x2177
-0x25C6 = 0x2174
-0x25C7 = 0x2173
-0x25CB = 0x2170
-0x25CE = 0x2172
-0x25CF = 0x2171
-0x2605 = 0x216F
-0x2606 = 0x216E
-0x2640 = 0x2162
-0x2642 = 0x2161
-0x3000 = 0x2121
-0x3001 = 0x2122
-0x3002 = 0x2123
-0x3003 = 0x2128
-0x3005 = 0x2129
-0x3008 = 0x2134
-0x3009 = 0x2135
-0x300A = 0x2136
-0x300B = 0x2137
-0x300C = 0x2138
-0x300D = 0x2139
-0x300E = 0x213A
-0x300F = 0x213B
-0x3010 = 0x213E
-0x3011 = 0x213F
-0x3013 = 0x217E
-0x3014 = 0x2132
-0x3015 = 0x2133
-0x3016 = 0x213C
-0x3017 = 0x213D
-0x3041 = 0x2421
-0x3042 = 0x2422
-0x3043 = 0x2423
-0x3044 = 0x2424
-0x3045 = 0x2425
-0x3046 = 0x2426
-0x3047 = 0x2427
-0x3048 = 0x2428
-0x3049 = 0x2429
-0x304A = 0x242A
-0x304B = 0x242B
-0x304C = 0x242C
-0x304D = 0x242D
-0x304E = 0x242E
-0x304F = 0x242F
-0x3050 = 0x2430
-0x3051 = 0x2431
-0x3052 = 0x2432
-0x3053 = 0x2433
-0x3054 = 0x2434
-0x3055 = 0x2435
-0x3056 = 0x2436
-0x3057 = 0x2437
-0x3058 = 0x2438
-0x3059 = 0x2439
-0x305A = 0x243A
-0x305B = 0x243B
-0x305C = 0x243C
-0x305D = 0x243D
-0x305E = 0x243E
-0x305F = 0x243F
-0x3060 = 0x2440
-0x3061 = 0x2441
-0x3062 = 0x2442
-0x3063 = 0x2443
-0x3064 = 0x2444
-0x3065 = 0x2445
-0x3066 = 0x2446
-0x3067 = 0x2447
-0x3068 = 0x2448
-0x3069 = 0x2449
-0x306A = 0x244A
-0x306B = 0x244B
-0x306C = 0x244C
-0x306D = 0x244D
-0x306E = 0x244E
-0x306F = 0x244F
-0x3070 = 0x2450
-0x3071 = 0x2451
-0x3072 = 0x2452
-0x3073 = 0x2453
-0x3074 = 0x2454
-0x3075 = 0x2455
-0x3076 = 0x2456
-0x3077 = 0x2457
-0x3078 = 0x2458
-0x3079 = 0x2459
-0x307A = 0x245A
-0x307B = 0x245B
-0x307C = 0x245C
-0x307D = 0x245D
-0x307E = 0x245E
-0x307F = 0x245F
-0x3080 = 0x2460
-0x3081 = 0x2461
-0x3082 = 0x2462
-0x3083 = 0x2463
-0x3084 = 0x2464
-0x3085 = 0x2465
-0x3086 = 0x2466
-0x3087 = 0x2467
-0x3088 = 0x2468
-0x3089 = 0x2469
-0x308A = 0x246A
-0x308B = 0x246B
-0x308C = 0x246C
-0x308D = 0x246D
-0x308E = 0x246E
-0x308F = 0x246F
-0x3090 = 0x2470
-0x3091 = 0x2471
-0x3092 = 0x2472
-0x3093 = 0x2473
-0x30A1 = 0x2521
-0x30A2 = 0x2522
-0x30A3 = 0x2523
-0x30A4 = 0x2524
-0x30A5 = 0x2525
-0x30A6 = 0x2526
-0x30A7 = 0x2527
-0x30A8 = 0x2528
-0x30A9 = 0x2529
-0x30AA = 0x252A
-0x30AB = 0x252B
-0x30AC = 0x252C
-0x30AD = 0x252D
-0x30AE = 0x252E
-0x30AF = 0x252F
-0x30B0 = 0x2530
-0x30B1 = 0x2531
-0x30B2 = 0x2532
-0x30B3 = 0x2533
-0x30B4 = 0x2534
-0x30B5 = 0x2535
-0x30B6 = 0x2536
-0x30B7 = 0x2537
-0x30B8 = 0x2538
-0x30B9 = 0x2539
-0x30BA = 0x253A
-0x30BB = 0x253B
-0x30BC = 0x253C
-0x30BD = 0x253D
-0x30BE = 0x253E
-0x30BF = 0x253F
-0x30C0 = 0x2540
-0x30C1 = 0x2541
-0x30C2 = 0x2542
-0x30C3 = 0x2543
-0x30C4 = 0x2544
-0x30C5 = 0x2545
-0x30C6 = 0x2546
-0x30C7 = 0x2547
-0x30C8 = 0x2548
-0x30C9 = 0x2549
-0x30CA = 0x254A
-0x30CB = 0x254B
-0x30CC = 0x254C
-0x30CD = 0x254D
-0x30CE = 0x254E
-0x30CF = 0x254F
-0x30D0 = 0x2550
-0x30D1 = 0x2551
-0x30D2 = 0x2552
-0x30D3 = 0x2553
-0x30D4 = 0x2554
-0x30D5 = 0x2555
-0x30D6 = 0x2556
-0x30D7 = 0x2557
-0x30D8 = 0x2558
-0x30D9 = 0x2559
-0x30DA = 0x255A
-0x30DB = 0x255B
-0x30DC = 0x255C
-0x30DD = 0x255D
-0x30DE = 0x255E
-0x30DF = 0x255F
-0x30E0 = 0x2560
-0x30E1 = 0x2561
-0x30E2 = 0x2562
-0x30E3 = 0x2563
-0x30E4 = 0x2564
-0x30E5 = 0x2565
-0x30E6 = 0x2566
-0x30E7 = 0x2567
-0x30E8 = 0x2568
-0x30E9 = 0x2569
-0x30EA = 0x256A
-0x30EB = 0x256B
-0x30EC = 0x256C
-0x30ED = 0x256D
-0x30EE = 0x256E
-0x30EF = 0x256F
-0x30F0 = 0x2570
-0x30F1 = 0x2571
-0x30F2 = 0x2572
-0x30F3 = 0x2573
-0x30F4 = 0x2574
-0x30F5 = 0x2575
-0x30F6 = 0x2576
-0x30FB = 0x2124 # fallback -> 0x00B7
-0x3105 = 0x2845
-0x3106 = 0x2846
-0x3107 = 0x2847
-0x3108 = 0x2848
-0x3109 = 0x2849
-0x310A = 0x284A
-0x310B = 0x284B
-0x310C = 0x284C
-0x310D = 0x284D
-0x310E = 0x284E
-0x310F = 0x284F
-0x3110 = 0x2850
-0x3111 = 0x2851
-0x3112 = 0x2852
-0x3113 = 0x2853
-0x3114 = 0x2854
-0x3115 = 0x2855
-0x3116 = 0x2856
-0x3117 = 0x2857
-0x3118 = 0x2858
-0x3119 = 0x2859
-0x311A = 0x285A
-0x311B = 0x285B
-0x311C = 0x285C
-0x311D = 0x285D
-0x311E = 0x285E
-0x311F = 0x285F
-0x3120 = 0x2860
-0x3121 = 0x2861
-0x3122 = 0x2862
-0x3123 = 0x2863
-0x3124 = 0x2864
-0x3125 = 0x2865
-0x3126 = 0x2866
-0x3127 = 0x2867
-0x3128 = 0x2868
-0x3129 = 0x2869
-0x3220 = 0x2265
-0x3221 = 0x2266
-0x3222 = 0x2267
-0x3223 = 0x2268
-0x3224 = 0x2269
-0x3225 = 0x226A
-0x3226 = 0x226B
-0x3227 = 0x226C
-0x3228 = 0x226D
-0x3229 = 0x226E
-0x4E00 = 0x523B
-0x4E01 = 0x3621
-0x4E03 = 0x465F
-0x4E07 = 0x4D72
-0x4E08 = 0x5549
-0x4E09 = 0x487D
-0x4E0A = 0x494F
-0x4E0B = 0x4F42
-0x4E0C = 0x5822
-0x4E0D = 0x323B
-0x4E0E = 0x536B
-0x4E10 = 0x5824
-0x4E11 = 0x3373
-0x4E13 = 0x5728
-0x4E14 = 0x4752
-0x4E15 = 0x5827
-0x4E16 = 0x4A40
-0x4E18 = 0x4770
-0x4E19 = 0x317B
-0x4E1A = 0x5235
-0x4E1B = 0x3454
-0x4E1C = 0x362B
-0x4E1D = 0x4B3F
-0x4E1E = 0x5829
-0x4E22 = 0x362A
-0x4E24 = 0x413D
-0x4E25 = 0x514F
-0x4E27 = 0x4925
-0x4E28 = 0x582D
-0x4E2A = 0x3876
-0x4E2B = 0x513E
-0x4E2C = 0x635C
-0x4E2D = 0x5650
-0x4E30 = 0x3761
-0x4E32 = 0x342E
-0x4E34 = 0x4159
-0x4E36 = 0x583C
-0x4E38 = 0x4D68
-0x4E39 = 0x3524
-0x4E3A = 0x4E2A
-0x4E3B = 0x5677
-0x4E3D = 0x4076
-0x4E3E = 0x3E59
-0x4E3F = 0x582F
-0x4E43 = 0x444B
-0x4E45 = 0x3E43
-0x4E47 = 0x5831
-0x4E48 = 0x4334
-0x4E49 = 0x5265
-0x4E4B = 0x562E
-0x4E4C = 0x4E5A
-0x4E4D = 0x5527
-0x4E4E = 0x3A75
-0x4E4F = 0x3726
-0x4E50 = 0x4056
-0x4E52 = 0x4639
-0x4E53 = 0x4552
-0x4E54 = 0x4747
-0x4E56 = 0x3954
-0x4E58 = 0x334B
-0x4E59 = 0x5252
-0x4E5C = 0x583F
-0x4E5D = 0x3E45
-0x4E5E = 0x4672
-0x4E5F = 0x5232
-0x4E60 = 0x4F30
-0x4E61 = 0x4F67
-0x4E66 = 0x4A69
-0x4E69 = 0x5840
-0x4E70 = 0x4272
-0x4E71 = 0x4252
-0x4E73 = 0x4869
-0x4E7E = 0x472C
-0x4E86 = 0x414B
-0x4E88 = 0x5368
-0x4E89 = 0x5579
-0x4E8B = 0x4A42
-0x4E8C = 0x367E
-0x4E8D = 0x5821
-0x4E8E = 0x535A
-0x4E8F = 0x3F77
-0x4E91 = 0x5446
-0x4E92 = 0x3B25
-0x4E93 = 0x5841
-0x4E94 = 0x4E65
-0x4E95 = 0x3E2E
-0x4E98 = 0x5828
-0x4E9A = 0x5147
-0x4E9B = 0x5029
-0x4E9F = 0x583D
-0x4EA0 = 0x596F
-0x4EA1 = 0x4D76
-0x4EA2 = 0x3F3A
-0x4EA4 = 0x3D3B
-0x4EA5 = 0x3A25
-0x4EA6 = 0x5260
-0x4EA7 = 0x327A
-0x4EA8 = 0x3A60
-0x4EA9 = 0x4436
-0x4EAB = 0x4F6D
-0x4EAC = 0x3E29
-0x4EAD = 0x4D24
-0x4EAE = 0x4141
-0x4EB2 = 0x4757
-0x4EB3 = 0x5971
-0x4EB5 = 0x5974
-0x4EBA = 0x484B
-0x4EBB = 0x5869
-0x4EBF = 0x525A
-0x4EC0 = 0x4A32
-0x4EC1 = 0x484A
-0x4EC2 = 0x586C
-0x4EC3 = 0x586A
-0x4EC4 = 0x5846
-0x4EC5 = 0x3D76
-0x4EC6 = 0x464D
-0x4EC7 = 0x3370
-0x4EC9 = 0x586B
-0x4ECA = 0x3D71
-0x4ECB = 0x3D69
-0x4ECD = 0x4854
-0x4ECE = 0x3453
-0x4ED1 = 0x4258
-0x4ED3 = 0x3256
-0x4ED4 = 0x5750
-0x4ED5 = 0x4A4B
-0x4ED6 = 0x4B7B
-0x4ED7 = 0x554C
-0x4ED8 = 0x3836
-0x4ED9 = 0x4F49
-0x4EDD = 0x595A
-0x4EDE = 0x5870
-0x4EDF = 0x472A
-0x4EE1 = 0x586E
-0x4EE3 = 0x347A
-0x4EE4 = 0x416E
-0x4EE5 = 0x5254
-0x4EE8 = 0x586D
-0x4EEA = 0x5247
-0x4EEB = 0x586F
-0x4EEC = 0x4347
-0x4EF0 = 0x5176
-0x4EF2 = 0x5659
-0x4EF3 = 0x5872
-0x4EF5 = 0x5875
-0x4EF6 = 0x3C7E
-0x4EF7 = 0x3C5B
-0x4EFB = 0x484E
-0x4EFD = 0x375D
-0x4EFF = 0x3742
-0x4F01 = 0x4673
-0x4F09 = 0x5878
-0x4F0A = 0x5241
-0x4F0D = 0x4E69
-0x4F0E = 0x3C3F
-0x4F0F = 0x377C
-0x4F10 = 0x3725
-0x4F11 = 0x505D
-0x4F17 = 0x565A
-0x4F18 = 0x5345
-0x4F19 = 0x3B6F
-0x4F1A = 0x3B61
-0x4F1B = 0x5871
-0x4F1E = 0x4921
-0x4F1F = 0x4E30
-0x4F20 = 0x342B
-0x4F22 = 0x5873
-0x4F24 = 0x494B
-0x4F25 = 0x5876
-0x4F26 = 0x4257
-0x4F27 = 0x5877
-0x4F2A = 0x4E31
-0x4F2B = 0x5879
-0x4F2F = 0x322E
-0x4F30 = 0x3940
-0x4F32 = 0x5923
-0x4F34 = 0x3069
-0x4F36 = 0x4166
-0x4F38 = 0x496C
-0x4F3A = 0x4B45
-0x4F3C = 0x4B46
-0x4F3D = 0x5924
-0x4F43 = 0x3568
-0x4F46 = 0x352B
-0x4F4D = 0x4E3B
-0x4F4E = 0x354D
-0x4F4F = 0x5721
-0x4F50 = 0x5774
-0x4F51 = 0x5353
-0x4F53 = 0x4C65
-0x4F55 = 0x3A4E
-0x4F57 = 0x5922
-0x4F58 = 0x595C
-0x4F59 = 0x5360
-0x4F5A = 0x587D
-0x4F5B = 0x3770
-0x4F5C = 0x5777
-0x4F5D = 0x587E
-0x4F5E = 0x587A
-0x4F5F = 0x5921
-0x4F60 = 0x4463
-0x4F63 = 0x5336
-0x4F64 = 0x5874
-0x4F65 = 0x595D
-0x4F67 = 0x587B
-0x4F69 = 0x4565
-0x4F6C = 0x4050
-0x4F6F = 0x5170
-0x4F70 = 0x305B
-0x4F73 = 0x3C51
-0x4F74 = 0x5926
-0x4F76 = 0x5925
-0x4F7B = 0x592C
-0x4F7C = 0x592E
-0x4F7E = 0x592B
-0x4F7F = 0x4A39
-0x4F83 = 0x5929
-0x4F84 = 0x5636
-0x4F88 = 0x335E
-0x4F89 = 0x5928
-0x4F8B = 0x407D
-0x4F8D = 0x4A4C
-0x4F8F = 0x592A
-0x4F91 = 0x5927
-0x4F94 = 0x5930
-0x4F97 = 0x3631
-0x4F9B = 0x3929
-0x4F9D = 0x5240
-0x4FA0 = 0x4F40
-0x4FA3 = 0x4242
-0x4FA5 = 0x3D44
-0x4FA6 = 0x556C
-0x4FA7 = 0x3260
-0x4FA8 = 0x4748
-0x4FA9 = 0x3F6B
-0x4FAA = 0x592D
-0x4FAC = 0x592F
-0x4FAE = 0x4E6A
-0x4FAF = 0x3A6E
-0x4FB5 = 0x4756
-0x4FBF = 0x3163
-0x4FC3 = 0x3459
-0x4FC4 = 0x366D
-0x4FC5 = 0x5934
-0x4FCA = 0x3F21
-0x4FCE = 0x595E
-0x4FCF = 0x474E
-0x4FD0 = 0x407E
-0x4FD1 = 0x5938
-0x4FD7 = 0x4B57
-0x4FD8 = 0x377D
-0x4FDA = 0x5935
-0x4FDC = 0x5937
-0x4FDD = 0x3123
-0x4FDE = 0x5361
-0x4FDF = 0x5939
-0x4FE1 = 0x5045
-0x4FE3 = 0x5936
-0x4FE6 = 0x5931
-0x4FE8 = 0x5932
-0x4FE9 = 0x4129
-0x4FEA = 0x5933
-0x4FED = 0x3C73
-0x4FEE = 0x505E
-0x4FEF = 0x3829
-0x4FF1 = 0x3E63
-0x4FF3 = 0x593D
-0x4FF8 = 0x593A
-0x4FFA = 0x3033
-0x4FFE = 0x5942
-0x500C = 0x5944
-0x500D = 0x3136
-0x500F = 0x593F
-0x5012 = 0x3539
-0x5014 = 0x3E73
-0x5018 = 0x4C48
-0x5019 = 0x3A72
-0x501A = 0x5250
-0x501C = 0x5943
-0x501F = 0x3D68
-0x5021 = 0x332B
-0x5025 = 0x5945
-0x5026 = 0x3E6B
-0x5028 = 0x5946
-0x5029 = 0x593B
-0x502A = 0x445F
-0x502C = 0x593E
-0x502D = 0x5941
-0x502E = 0x5940
-0x503A = 0x552E
-0x503C = 0x5635
-0x503E = 0x4763
-0x5043 = 0x5948
-0x5047 = 0x3C59
-0x5048 = 0x594A
-0x504C = 0x593C
-0x504E = 0x594B
-0x504F = 0x462B
-0x5055 = 0x5949
-0x505A = 0x5776
-0x505C = 0x4D23
-0x5065 = 0x3D21
-0x506C = 0x594C
-0x5076 = 0x453C
-0x5077 = 0x4D35
-0x507B = 0x594D
-0x507E = 0x5947
-0x507F = 0x3325
-0x5080 = 0x3F7E
-0x5085 = 0x3835
-0x5088 = 0x407C
-0x508D = 0x3078
-0x50A3 = 0x3476
-0x50A5 = 0x594E
-0x50A7 = 0x594F
-0x50A8 = 0x3422
-0x50A9 = 0x5950
-0x50AC = 0x345F
-0x50B2 = 0x3041
-0x50BA = 0x5951
-0x50BB = 0x4935
-0x50CF = 0x4F71
-0x50D6 = 0x5952
-0x50DA = 0x4145
-0x50E6 = 0x5956
-0x50E7 = 0x492E
-0x50EC = 0x5955
-0x50ED = 0x5954
-0x50EE = 0x5957
-0x50F3 = 0x4B5B
-0x50F5 = 0x3D29
-0x50FB = 0x4627
-0x5106 = 0x5953
-0x5107 = 0x5958
-0x510B = 0x5959
-0x5112 = 0x4865
-0x5121 = 0x405C
-0x513F = 0x3679
-0x5140 = 0x5823
-0x5141 = 0x544A
-0x5143 = 0x542A
-0x5144 = 0x5056
-0x5145 = 0x3364
-0x5146 = 0x5557
-0x5148 = 0x4F48
-0x5149 = 0x3962
-0x514B = 0x3F4B
-0x514D = 0x4362
-0x5151 = 0x3652
-0x5154 = 0x4D43
-0x5155 = 0x596E
-0x5156 = 0x5970
-0x515A = 0x3533
-0x515C = 0x3635
-0x5162 = 0x3E24
-0x5165 = 0x486B
-0x5168 = 0x482B
-0x516B = 0x304B
-0x516C = 0x392B
-0x516D = 0x4179
-0x516E = 0x5962
-0x5170 = 0x403C
-0x5171 = 0x3932
-0x5173 = 0x3958
-0x5174 = 0x504B
-0x5175 = 0x3178
-0x5176 = 0x4664
-0x5177 = 0x3E5F
-0x5178 = 0x3564
-0x5179 = 0x5748
-0x517B = 0x5178
-0x517C = 0x3C66
-0x517D = 0x4A5E
-0x5180 = 0x3C3D
-0x5181 = 0x5966
-0x5182 = 0x5867
-0x5185 = 0x445A
-0x5188 = 0x3854
-0x5189 = 0x483D
-0x518C = 0x3261
-0x518D = 0x5459
-0x5192 = 0x4330
-0x5195 = 0x4361
-0x5196 = 0x5A22
-0x5197 = 0x485F
-0x5199 = 0x5034
-0x519B = 0x3E7C
-0x519C = 0x4529
-0x51A0 = 0x395A
-0x51A2 = 0x5A23
-0x51A4 = 0x5429
-0x51A5 = 0x5A24
-0x51AB = 0x597B
-0x51AC = 0x362C
-0x51AF = 0x376B
-0x51B0 = 0x3179
-0x51B1 = 0x597C
-0x51B2 = 0x3365
-0x51B3 = 0x3E76
-0x51B5 = 0x3F76
-0x51B6 = 0x5231
-0x51B7 = 0x4064
-0x51BB = 0x3633
-0x51BC = 0x597E
-0x51BD = 0x597D
-0x51C0 = 0x3E3B
-0x51C4 = 0x4660
-0x51C6 = 0x573C
-0x51C7 = 0x5A21
-0x51C9 = 0x4139
-0x51CB = 0x3572
-0x51CC = 0x4168
-0x51CF = 0x3C75
-0x51D1 = 0x3455
-0x51DB = 0x415D
-0x51DD = 0x447D
-0x51E0 = 0x3C38
-0x51E1 = 0x3732
-0x51E4 = 0x376F
-0x51EB = 0x596C
-0x51ED = 0x463E
-0x51EF = 0x3F2D
-0x51F0 = 0x3B4B
-0x51F3 = 0x354A
-0x51F5 = 0x5B49
-0x51F6 = 0x5057
-0x51F8 = 0x4D39
-0x51F9 = 0x303C
-0x51FA = 0x3376
-0x51FB = 0x3B77
-0x51FC = 0x5B4A
-0x51FD = 0x3A2F
-0x51FF = 0x5464
-0x5200 = 0x3536
-0x5201 = 0x3573
-0x5202 = 0x5856
-0x5203 = 0x4850
-0x5206 = 0x3756
-0x5207 = 0x4750
-0x5208 = 0x5857
-0x520A = 0x3F2F
-0x520D = 0x5B3B
-0x520E = 0x5858
-0x5211 = 0x504C
-0x5212 = 0x3B2E
-0x5216 = 0x6B3E
-0x5217 = 0x4150
-0x5218 = 0x4175
-0x5219 = 0x5472
-0x521A = 0x3855
-0x521B = 0x3434
-0x521D = 0x3375
-0x5220 = 0x493E
-0x5224 = 0x4550
-0x5228 = 0x4559
-0x5229 = 0x407B
-0x522B = 0x3170
-0x522D = 0x5859
-0x522E = 0x394E
-0x5230 = 0x353D
-0x5233 = 0x585A
-0x5236 = 0x5646
-0x5237 = 0x4B22
-0x5238 = 0x482F
-0x5239 = 0x4932
-0x523A = 0x344C
-0x523B = 0x3F4C
-0x523D = 0x3974
-0x523F = 0x585B
-0x5240 = 0x585C
-0x5241 = 0x3667
-0x5242 = 0x3C41
-0x5243 = 0x4C6A
-0x524A = 0x4F77
-0x524C = 0x585D
-0x524D = 0x4730
-0x5250 = 0x3950
-0x5251 = 0x3D23
-0x5254 = 0x4C5E
-0x5256 = 0x464A
-0x525C = 0x5860
-0x525E = 0x585E
-0x5261 = 0x585F
-0x5265 = 0x307E
-0x5267 = 0x3E67
-0x5269 = 0x4A23
-0x526A = 0x3C74
-0x526F = 0x3831
-0x5272 = 0x386E
-0x527D = 0x5862
-0x527F = 0x3D4B
-0x5281 = 0x5864
-0x5282 = 0x5863
-0x5288 = 0x457C
-0x5290 = 0x5865
-0x5293 = 0x5866
-0x529B = 0x4126
-0x529D = 0x4830
-0x529E = 0x306C
-0x529F = 0x3926
-0x52A0 = 0x3C53
-0x52A1 = 0x4E71
-0x52A2 = 0x5B3D
-0x52A3 = 0x4153
-0x52A8 = 0x362F
-0x52A9 = 0x567A
-0x52AA = 0x452C
-0x52AB = 0x3D59
-0x52AC = 0x5B3E
-0x52AD = 0x5B3F
-0x52B1 = 0x4078
-0x52B2 = 0x3E22
-0x52B3 = 0x404D
-0x52BE = 0x5B40
-0x52BF = 0x4A46
-0x52C3 = 0x322A
-0x52C7 = 0x5342
-0x52C9 = 0x4363
-0x52CB = 0x512B
-0x52D0 = 0x5B42
-0x52D2 = 0x4055
-0x52D6 = 0x5B43
-0x52D8 = 0x3F31
-0x52DF = 0x443C
-0x52E4 = 0x475A
-0x52F0 = 0x5B44
-0x52F9 = 0x5968
-0x52FA = 0x4957
-0x52FE = 0x3934
-0x52FF = 0x4E70
-0x5300 = 0x5448
-0x5305 = 0x307C
-0x5306 = 0x3452
-0x5308 = 0x5059
-0x530D = 0x5969
-0x530F = 0x5E4B
-0x5310 = 0x596B
-0x5315 = 0x5830
-0x5316 = 0x3B2F
-0x5317 = 0x3131
-0x5319 = 0x3357
-0x531A = 0x584E
-0x531D = 0x5451
-0x5320 = 0x3D33
-0x5321 = 0x3F6F
-0x5323 = 0x4F3B
-0x5326 = 0x5850
-0x532A = 0x374B
-0x532E = 0x5851
-0x5339 = 0x4625
-0x533A = 0x4778
-0x533B = 0x523D
-0x533E = 0x5852
-0x533F = 0x4464
-0x5341 = 0x4A2E
-0x5343 = 0x4727
-0x5345 = 0x5826
-0x5347 = 0x497D
-0x5348 = 0x4E67
-0x5349 = 0x3B5C
-0x534A = 0x306B
-0x534E = 0x3B2A
-0x534F = 0x502D
-0x5351 = 0x3130
-0x5352 = 0x5764
-0x5353 = 0x573F
-0x5355 = 0x3525
-0x5356 = 0x4274
-0x5357 = 0x444F
-0x535A = 0x3229
-0x535C = 0x3237
-0x535E = 0x3165
-0x535F = 0x5F32
-0x5360 = 0x553C
-0x5361 = 0x3F28
-0x5362 = 0x422C
-0x5363 = 0x5855
-0x5364 = 0x4231
-0x5366 = 0x5854
-0x5367 = 0x4E54
-0x5369 = 0x5A60
-0x536B = 0x4E40
-0x536E = 0x5834
-0x536F = 0x432E
-0x5370 = 0x5321
-0x5371 = 0x4E23
-0x5373 = 0x3C34
-0x5374 = 0x4834
-0x5375 = 0x4251
-0x5377 = 0x3E6D
-0x5378 = 0x5036
-0x537A = 0x5A61
-0x537F = 0x4764
-0x5382 = 0x3327
-0x5384 = 0x3672
-0x5385 = 0x4C7C
-0x5386 = 0x407A
-0x5389 = 0x4077
-0x538B = 0x5139
-0x538C = 0x5161
-0x538D = 0x5847
-0x5395 = 0x325E
-0x5398 = 0x4065
-0x539A = 0x3A71
-0x539D = 0x5848
-0x539F = 0x542D
-0x53A2 = 0x4F61
-0x53A3 = 0x5849
-0x53A5 = 0x584A
-0x53A6 = 0x4F43
-0x53A8 = 0x3378
-0x53A9 = 0x3E47
-0x53AE = 0x584B
-0x53B6 = 0x5B4C
-0x53BB = 0x4825
-0x53BF = 0x4F58
-0x53C1 = 0x487E
-0x53C2 = 0x324E
-0x53C8 = 0x5356
-0x53C9 = 0x3266
-0x53CA = 0x3C30
-0x53CB = 0x5351
-0x53CC = 0x4B2B
-0x53CD = 0x3734
-0x53D1 = 0x3722
-0x53D4 = 0x4A65
-0x53D6 = 0x4821
-0x53D7 = 0x4A5C
-0x53D8 = 0x3164
-0x53D9 = 0x5070
-0x53DB = 0x4551
-0x53DF = 0x5B45
-0x53E0 = 0x357E
-0x53E3 = 0x3F5A
-0x53E4 = 0x3945
-0x53E5 = 0x3E64
-0x53E6 = 0x416D
-0x53E8 = 0x5F36
-0x53E9 = 0x5F35
-0x53EA = 0x563B
-0x53EB = 0x3D50
-0x53EC = 0x5559
-0x53ED = 0x3048
-0x53EE = 0x3623
-0x53EF = 0x3F49
-0x53F0 = 0x4C28
-0x53F1 = 0x5F33
-0x53F2 = 0x4A37
-0x53F3 = 0x5352
-0x53F5 = 0x584F
-0x53F6 = 0x5236
-0x53F7 = 0x3A45
-0x53F8 = 0x4B3E
-0x53F9 = 0x4C3E
-0x53FB = 0x5F37
-0x53FC = 0x3570
-0x53FD = 0x5F34
-0x5401 = 0x5375
-0x5403 = 0x3354
-0x5404 = 0x3877
-0x5406 = 0x5F3A
-0x5408 = 0x3A4F
-0x5409 = 0x3C2A
-0x540A = 0x3575
-0x540C = 0x4D2C
-0x540D = 0x437B
-0x540E = 0x3A73
-0x540F = 0x4074
-0x5410 = 0x4D42
-0x5411 = 0x4F72
-0x5412 = 0x5F38
-0x5413 = 0x4F45
-0x5415 = 0x4240
-0x5416 = 0x5F39
-0x5417 = 0x4270
-0x541B = 0x3E7D
-0x541D = 0x415F
-0x541E = 0x4D4C
-0x541F = 0x5277
-0x5420 = 0x374D
-0x5421 = 0x5F41
-0x5423 = 0x5F44
-0x5426 = 0x3771
-0x5427 = 0x3049
-0x5428 = 0x3656
-0x5429 = 0x3754
-0x542B = 0x3A2C
-0x542C = 0x4C7D
-0x542D = 0x3F54
-0x542E = 0x4B31
-0x542F = 0x4674
-0x5431 = 0x5628
-0x5432 = 0x5F45
-0x5434 = 0x4E62
-0x5435 = 0x3333
-0x5438 = 0x4E7C
-0x5439 = 0x3435
-0x543B = 0x4E47
-0x543C = 0x3A70
-0x543E = 0x4E61
-0x5440 = 0x513D
-0x5443 = 0x5F40
-0x5446 = 0x3474
-0x5448 = 0x334A
-0x544A = 0x3866
-0x544B = 0x5F3B
-0x5450 = 0x4445
-0x5452 = 0x5F3C
-0x5453 = 0x5F3D
-0x5454 = 0x5F3E
-0x5455 = 0x453B
-0x5456 = 0x5F3F
-0x5457 = 0x5F42
-0x5458 = 0x5431
-0x5459 = 0x5F43
-0x545B = 0x473A
-0x545C = 0x4E58
-0x5462 = 0x4458
-0x5464 = 0x5F4A
-0x5466 = 0x5F4F
-0x5468 = 0x565C
-0x5471 = 0x5F49
-0x5472 = 0x5F5A
-0x5473 = 0x4E36
-0x5475 = 0x3A47
-0x5476 = 0x5F4E
-0x5477 = 0x5F48
-0x5478 = 0x455E
-0x547B = 0x496B
-0x547C = 0x3A74
-0x547D = 0x437C
-0x5480 = 0x3E57
-0x5482 = 0x5F46
-0x5484 = 0x5F4D
-0x5486 = 0x4558
-0x548B = 0x5526
-0x548C = 0x3A4D
-0x548E = 0x3E4C
-0x548F = 0x533D
-0x5490 = 0x3840
-0x5492 = 0x5664
-0x5494 = 0x5F47
-0x5495 = 0x393E
-0x5496 = 0x3F27
-0x5499 = 0x417C
-0x549A = 0x5F4B
-0x549B = 0x5F4C
-0x549D = 0x5F50
-0x54A3 = 0x5F5B
-0x54A4 = 0x5F65
-0x54A6 = 0x5F57
-0x54A7 = 0x5F56
-0x54A8 = 0x5749
-0x54A9 = 0x5F63
-0x54AA = 0x5F64
-0x54AB = 0x656B
-0x54AC = 0x5227
-0x54AD = 0x5F52
-0x54AF = 0x3F29
-0x54B1 = 0x545B
-0x54B3 = 0x3F48
-0x54B4 = 0x5F54
-0x54B8 = 0x4F4C
-0x54BB = 0x5F5D
-0x54BD = 0x514A
-0x54BF = 0x5F5E
-0x54C0 = 0x3027
-0x54C1 = 0x4637
-0x54C2 = 0x5F53
-0x54C4 = 0x3A65
-0x54C6 = 0x365F
-0x54C7 = 0x4D5B
-0x54C8 = 0x397E
-0x54C9 = 0x5455
-0x54CC = 0x5F5F
-0x54CD = 0x4F6C
-0x54CE = 0x3025
-0x54CF = 0x5F67
-0x54D0 = 0x5F51
-0x54D1 = 0x5146
-0x54D2 = 0x5F55
-0x54D3 = 0x5F58
-0x54D4 = 0x5F59
-0x54D5 = 0x5F5C
-0x54D7 = 0x3B29
-0x54D9 = 0x5F60
-0x54DA = 0x5F61
-0x54DC = 0x5F62
-0x54DD = 0x5F66
-0x54DE = 0x5F68
-0x54DF = 0x5334
-0x54E5 = 0x3867
-0x54E6 = 0x4536
-0x54E7 = 0x5F6A
-0x54E8 = 0x495A
-0x54E9 = 0x4128
-0x54EA = 0x4444
-0x54ED = 0x3F5E
-0x54EE = 0x4F78
-0x54F2 = 0x555C
-0x54F3 = 0x5F6E
-0x54FA = 0x3238
-0x54FC = 0x3A5F
-0x54FD = 0x5F6C
-0x54FF = 0x5B41
-0x5501 = 0x5164
-0x5506 = 0x4B74
-0x5507 = 0x343D
-0x5509 = 0x3026
-0x550F = 0x5F71
-0x5510 = 0x4C46
-0x5511 = 0x5F72
-0x5514 = 0x5F6D
-0x551B = 0x5F69
-0x5520 = 0x5F6B
-0x5522 = 0x5F6F
-0x5523 = 0x5F70
-0x5524 = 0x3B3D
-0x5527 = 0x5F73
-0x552A = 0x5F74
-0x552C = 0x3B23
-0x552E = 0x4A5B
-0x552F = 0x4E28
-0x5530 = 0x6027
-0x5531 = 0x332A
-0x5533 = 0x6026
-0x5537 = 0x6021
-0x553C = 0x5F7E
-0x553E = 0x4D59
-0x553F = 0x5F7C
-0x5541 = 0x5F7A
-0x5543 = 0x3F50
-0x5544 = 0x5744
-0x5546 = 0x494C
-0x5549 = 0x5F78
-0x554A = 0x3021
-0x5550 = 0x5F7D
-0x5555 = 0x5F7B
-0x5556 = 0x6022
-0x555C = 0x6028
-0x5561 = 0x3748
-0x5564 = 0x4621
-0x5565 = 0x4936
-0x5566 = 0x4032
-0x5567 = 0x5F75
-0x556A = 0x453E
-0x556C = 0x5844
-0x556D = 0x5F79
-0x556E = 0x4476
-0x5575 = 0x6023
-0x5576 = 0x6024
-0x5577 = 0x6025
-0x5578 = 0x5025
-0x557B = 0x6034
-0x557C = 0x4C64
-0x557E = 0x6031
-0x5580 = 0x3F26
-0x5581 = 0x602F
-0x5582 = 0x4E39
-0x5583 = 0x602B
-0x5584 = 0x4946
-0x5587 = 0x402E
-0x5588 = 0x602E
-0x5589 = 0x3A6D
-0x558A = 0x3A30
-0x558B = 0x6029
-0x558F = 0x5F76
-0x5591 = 0x6033
-0x5594 = 0x6038
-0x5598 = 0x342D
-0x5599 = 0x6039
-0x559C = 0x4F32
-0x559D = 0x3A48
-0x559F = 0x6030
-0x55A7 = 0x507A
-0x55B1 = 0x602C
-0x55B3 = 0x547B
-0x55B5 = 0x5F77
-0x55B7 = 0x4567
-0x55B9 = 0x602D
-0x55BB = 0x5377
-0x55BD = 0x6036
-0x55BE = 0x6037
-0x55C4 = 0x6044
-0x55C5 = 0x5061
-0x55C9 = 0x603C
-0x55CC = 0x6049
-0x55CD = 0x604A
-0x55D1 = 0x603E
-0x55D2 = 0x602A
-0x55D3 = 0x4924
-0x55D4 = 0x6041
-0x55D6 = 0x6032
-0x55DC = 0x4A48
-0x55DD = 0x6043
-0x55DF = 0x6035
-0x55E1 = 0x4E4B
-0x55E3 = 0x4B43
-0x55E4 = 0x604D
-0x55E5 = 0x6046
-0x55E6 = 0x6042
-0x55E8 = 0x604B
-0x55EA = 0x603A
-0x55EB = 0x603F
-0x55EC = 0x6040
-0x55EF = 0x6045
-0x55F2 = 0x6047
-0x55F3 = 0x6048
-0x55F5 = 0x604C
-0x55F7 = 0x603B
-0x55FD = 0x4B54
-0x55FE = 0x6055
-0x5600 = 0x6056
-0x5601 = 0x6052
-0x5608 = 0x6050
-0x5609 = 0x3C4E
-0x560C = 0x6051
-0x560E = 0x3842
-0x560F = 0x5845
-0x5618 = 0x506A
-0x561B = 0x426F
-0x561E = 0x604F
-0x561F = 0x603D
-0x5623 = 0x6054
-0x5624 = 0x6053
-0x5627 = 0x6057
-0x562C = 0x605C
-0x562D = 0x6058
-0x5631 = 0x5676
-0x5632 = 0x3330
-0x5634 = 0x576C
-0x5636 = 0x4B3B
-0x5639 = 0x605A
-0x563B = 0x4E7B
-0x563F = 0x3A59
-0x564C = 0x6061
-0x564D = 0x605D
-0x564E = 0x522D
-0x5654 = 0x6062
-0x5657 = 0x605B
-0x5658 = 0x6059
-0x5659 = 0x605F
-0x565C = 0x6060
-0x5662 = 0x605E
-0x5664 = 0x6064
-0x5668 = 0x4677
-0x5669 = 0x582C
-0x566A = 0x546B
-0x566B = 0x6066
-0x566C = 0x4A49
-0x5671 = 0x6065
-0x5676 = 0x3841
-0x567B = 0x6067
-0x567C = 0x6068
-0x5685 = 0x6069
-0x5686 = 0x6063
-0x568E = 0x3A3F
-0x568F = 0x4C67
-0x5693 = 0x606A
-0x56A3 = 0x4F79
-0x56AF = 0x606B
-0x56B7 = 0x4842
-0x56BC = 0x3D40
-0x56CA = 0x4452
-0x56D4 = 0x606C
-0x56D7 = 0x606D
-0x56DA = 0x4774
-0x56DB = 0x4B44
-0x56DD = 0x606E
-0x56DE = 0x3B58
-0x56DF = 0x5836
-0x56E0 = 0x5272
-0x56E1 = 0x606F
-0x56E2 = 0x4D45
-0x56E4 = 0x365A
-0x56EB = 0x6071
-0x56ED = 0x5430
-0x56F0 = 0x4027
-0x56F1 = 0x3451
-0x56F4 = 0x4E27
-0x56F5 = 0x6070
-0x56F9 = 0x6072
-0x56FA = 0x394C
-0x56FD = 0x397A
-0x56FE = 0x4D3C
-0x56FF = 0x6073
-0x5703 = 0x4654
-0x5704 = 0x6074
-0x5706 = 0x5432
-0x5708 = 0x4826
-0x5709 = 0x6076
-0x570A = 0x6075
-0x571C = 0x6077
-0x571F = 0x4D41
-0x5723 = 0x4A25
-0x5728 = 0x545A
-0x5729 = 0x5B57
-0x572A = 0x5B59
-0x572C = 0x5B58
-0x572D = 0x3967
-0x572E = 0x5B5C
-0x572F = 0x5B5D
-0x5730 = 0x3558
-0x5733 = 0x5B5A
-0x5739 = 0x5B5B
-0x573A = 0x3321
-0x573B = 0x5B5F
-0x573E = 0x3B78
-0x5740 = 0x5637
-0x5742 = 0x5B60
-0x5747 = 0x3E79
-0x574A = 0x373B
-0x574C = 0x5B50
-0x574D = 0x4C2E
-0x574E = 0x3F32
-0x574F = 0x3B35
-0x5750 = 0x5778
-0x5751 = 0x3F53
-0x5757 = 0x3F69
-0x575A = 0x3C61
-0x575B = 0x4C33
-0x575C = 0x5B5E
-0x575D = 0x3053
-0x575E = 0x4E6B
-0x575F = 0x3758
-0x5760 = 0x5739
-0x5761 = 0x4642
-0x5764 = 0x4024
-0x5766 = 0x4C39
-0x5768 = 0x5B67
-0x5769 = 0x5B61
-0x576A = 0x463A
-0x576B = 0x5B63
-0x576D = 0x5B68
-0x576F = 0x4577
-0x5773 = 0x5B6A
-0x5776 = 0x5B69
-0x5777 = 0x3F40
-0x577B = 0x5B66
-0x577C = 0x5B65
-0x5782 = 0x3439
-0x5783 = 0x402C
-0x5784 = 0x4222
-0x5785 = 0x5B62
-0x5786 = 0x5B64
-0x578B = 0x504D
-0x578C = 0x5B6D
-0x5792 = 0x405D
-0x5793 = 0x5B72
-0x579B = 0x3662
-0x57A0 = 0x5B73
-0x57A1 = 0x5B52
-0x57A2 = 0x3938
-0x57A3 = 0x542B
-0x57A4 = 0x5B6C
-0x57A6 = 0x3F51
-0x57A7 = 0x5B70
-0x57A9 = 0x5B51
-0x57AB = 0x3566
-0x57AD = 0x5B6B
-0x57AE = 0x3F65
-0x57B2 = 0x5B6E
-0x57B4 = 0x5B71
-0x57B8 = 0x5B79
-0x57C2 = 0x3921
-0x57C3 = 0x3023
-0x57CB = 0x4271
-0x57CE = 0x3347
-0x57CF = 0x5B6F
-0x57D2 = 0x5B78
-0x57D4 = 0x4652
-0x57D5 = 0x5B74
-0x57D8 = 0x5B75
-0x57D9 = 0x5B77
-0x57DA = 0x5B76
-0x57DD = 0x5B7E
-0x57DF = 0x5372
-0x57E0 = 0x323A
-0x57E4 = 0x5B7D
-0x57ED = 0x5C24
-0x57EF = 0x5B7B
-0x57F4 = 0x5B7A
-0x57F8 = 0x5B7C
-0x57F9 = 0x4560
-0x57FA = 0x3B79
-0x57FD = 0x5C23
-0x5800 = 0x5C25
-0x5802 = 0x4C43
-0x5806 = 0x3651
-0x5807 = 0x5D40
-0x580B = 0x5C21
-0x580D = 0x5C22
-0x5811 = 0x4735
-0x5815 = 0x3669
-0x5819 = 0x5C27
-0x581E = 0x5C26
-0x5820 = 0x5C29
-0x5821 = 0x3124
-0x5824 = 0x354C
-0x582A = 0x3F30
-0x5830 = 0x515F
-0x5835 = 0x3642
-0x5844 = 0x5C28
-0x584C = 0x4B7A
-0x584D = 0x6B73
-0x5851 = 0x4B5C
-0x5854 = 0x4B7E
-0x5858 = 0x4C41
-0x585E = 0x487B
-0x5865 = 0x5C2A
-0x586B = 0x4C6E
-0x586C = 0x5C2B
-0x587E = 0x5B53
-0x5880 = 0x5C2F
-0x5881 = 0x5C2C
-0x5883 = 0x3E33
-0x5885 = 0x4A7B
-0x5889 = 0x5C2D
-0x5892 = 0x494A
-0x5893 = 0x4439
-0x5899 = 0x473D
-0x589A = 0x5C2E
-0x589E = 0x5476
-0x589F = 0x5066
-0x58A8 = 0x442B
-0x58A9 = 0x3655
-0x58BC = 0x5B54
-0x58C1 = 0x315A
-0x58C5 = 0x5B55
-0x58D1 = 0x5B56
-0x58D5 = 0x3A3E
-0x58E4 = 0x4840
-0x58EB = 0x4A3F
-0x58EC = 0x4849
-0x58EE = 0x5733
-0x58F0 = 0x4979
-0x58F3 = 0x3F47
-0x58F6 = 0x3A78
-0x58F9 = 0x523C
-0x5902 = 0x623A
-0x5904 = 0x3426
-0x5907 = 0x3138
-0x590D = 0x3834
-0x590F = 0x4F44
-0x5914 = 0x5967
-0x5915 = 0x4F26
-0x5916 = 0x4D62
-0x5919 = 0x596D
-0x591A = 0x3660
-0x591C = 0x5239
-0x591F = 0x393B
-0x5924 = 0x6239
-0x5925 = 0x6237
-0x5927 = 0x3473
-0x5929 = 0x4C6C
-0x592A = 0x4C2B
-0x592B = 0x3772
-0x592D = 0x5832
-0x592E = 0x516B
-0x592F = 0x3A3B
-0x5931 = 0x4A27
-0x5934 = 0x4D37
-0x5937 = 0x5244
-0x5938 = 0x3F64
-0x5939 = 0x3C50
-0x593A = 0x3661
-0x593C = 0x5E45
-0x5941 = 0x5E46
-0x5942 = 0x5B3C
-0x5944 = 0x5159
-0x5947 = 0x4666
-0x5948 = 0x444E
-0x5949 = 0x376E
-0x594B = 0x375C
-0x594E = 0x3F7C
-0x594F = 0x5760
-0x5951 = 0x4675
-0x5954 = 0x313C
-0x5955 = 0x5E48
-0x5956 = 0x3D31
-0x5957 = 0x4C57
-0x5958 = 0x5E4A
-0x595A = 0x5E49
-0x5960 = 0x356C
-0x5962 = 0x495D
-0x5965 = 0x3042
-0x5973 = 0x452E
-0x5974 = 0x452B
-0x5976 = 0x444C
-0x5978 = 0x3C69
-0x5979 = 0x4B7D
-0x597D = 0x3A43
-0x5981 = 0x6579
-0x5982 = 0x4867
-0x5983 = 0x657A
-0x5984 = 0x4D7D
-0x5986 = 0x5731
-0x5987 = 0x383E
-0x5988 = 0x4268
-0x598A = 0x4851
-0x598D = 0x657B
-0x5992 = 0x364A
-0x5993 = 0x3C4B
-0x5996 = 0x517D
-0x5997 = 0x6621
-0x5999 = 0x436E
-0x599E = 0x6624
-0x59A3 = 0x657E
-0x59A4 = 0x6625
-0x59A5 = 0x4D57
-0x59A8 = 0x3741
-0x59A9 = 0x657C
-0x59AA = 0x657D
-0x59AB = 0x6623
-0x59AE = 0x445D
-0x59AF = 0x6628
-0x59B2 = 0x6627
-0x59B9 = 0x4343
-0x59BB = 0x465E
-0x59BE = 0x662A
-0x59C6 = 0x4437
-0x59CA = 0x6622
-0x59CB = 0x4A3C
-0x59D0 = 0x3D63
-0x59D1 = 0x3943
-0x59D2 = 0x6626
-0x59D3 = 0x5055
-0x59D4 = 0x4E2F
-0x59D7 = 0x6629
-0x59D8 = 0x6630
-0x59DA = 0x5226
-0x59DC = 0x3D2A
-0x59DD = 0x662D
-0x59E3 = 0x662F
-0x59E5 = 0x4051
-0x59E8 = 0x524C
-0x59EC = 0x3C27
-0x59F9 = 0x6631
-0x59FB = 0x5276
-0x59FF = 0x574B
-0x5A01 = 0x4D7E
-0x5A03 = 0x4D5E
-0x5A04 = 0x4226
-0x5A05 = 0x662B
-0x5A06 = 0x662C
-0x5A07 = 0x3D3F
-0x5A08 = 0x662E
-0x5A09 = 0x6633
-0x5A0C = 0x6632
-0x5A11 = 0x6636
-0x5A13 = 0x6638
-0x5A18 = 0x446F
-0x5A1C = 0x4448
-0x5A1F = 0x3E6A
-0x5A20 = 0x496F
-0x5A23 = 0x6637
-0x5A25 = 0x3670
-0x5A29 = 0x4364
-0x5A31 = 0x5369
-0x5A32 = 0x6634
-0x5A34 = 0x6635
-0x5A36 = 0x4822
-0x5A3C = 0x663D
-0x5A40 = 0x6639
-0x5A46 = 0x4645
-0x5A49 = 0x4D71
-0x5A4A = 0x663B
-0x5A55 = 0x663C
-0x5A5A = 0x3B69
-0x5A62 = 0x663E
-0x5A67 = 0x663A
-0x5A6A = 0x4037
-0x5A74 = 0x5324
-0x5A75 = 0x663F
-0x5A76 = 0x4974
-0x5A77 = 0x6643
-0x5A7A = 0x6644
-0x5A7F = 0x5076
-0x5A92 = 0x433D
-0x5A9A = 0x4344
-0x5A9B = 0x6642
-0x5AAA = 0x6641
-0x5AB2 = 0x6647
-0x5AB3 = 0x4F31
-0x5AB5 = 0x6B74
-0x5AB8 = 0x664A
-0x5ABE = 0x6645
-0x5AC1 = 0x3C5E
-0x5AC2 = 0x4929
-0x5AC9 = 0x3C35
-0x5ACC = 0x4F53
-0x5AD2 = 0x6648
-0x5AD4 = 0x6649
-0x5AD6 = 0x664E
-0x5AD8 = 0x6650
-0x5ADC = 0x6651
-0x5AE0 = 0x664B
-0x5AE1 = 0x3555
-0x5AE3 = 0x664C
-0x5AE6 = 0x664F
-0x5AE9 = 0x445B
-0x5AEB = 0x6646
-0x5AF1 = 0x664D
-0x5B09 = 0x6652
-0x5B16 = 0x6654
-0x5B17 = 0x6653
-0x5B32 = 0x6655
-0x5B34 = 0x5978
-0x5B37 = 0x6656
-0x5B40 = 0x6657
-0x5B50 = 0x5753
-0x5B51 = 0x665D
-0x5B53 = 0x665E
-0x5B54 = 0x3F57
-0x5B55 = 0x5450
-0x5B57 = 0x5756
-0x5B58 = 0x3466
-0x5B59 = 0x4B6F
-0x5B5A = 0x665A
-0x5B5B = 0x5843
-0x5B5C = 0x574E
-0x5B5D = 0x5022
-0x5B5F = 0x434F
-0x5B62 = 0x665F
-0x5B63 = 0x3C3E
-0x5B64 = 0x3942
-0x5B65 = 0x665B
-0x5B66 = 0x5127
-0x5B69 = 0x3A22
-0x5B6A = 0x424F
-0x5B6C = 0x582B
-0x5B70 = 0x4A6B
-0x5B71 = 0x656E
-0x5B73 = 0x665C
-0x5B75 = 0x3775
-0x5B7A = 0x4866
-0x5B7D = 0x4475
-0x5B80 = 0x6532
-0x5B81 = 0x447E
-0x5B83 = 0x4B7C
-0x5B84 = 0x6533
-0x5B85 = 0x552C
-0x5B87 = 0x536E
-0x5B88 = 0x4A58
-0x5B89 = 0x3032
-0x5B8B = 0x4B4E
-0x5B8C = 0x4D6A
-0x5B8F = 0x3A6A
-0x5B93 = 0x6535
-0x5B95 = 0x6534
-0x5B97 = 0x575A
-0x5B98 = 0x3959
-0x5B99 = 0x5666
-0x5B9A = 0x3628
-0x5B9B = 0x4D70
-0x5B9C = 0x524B
-0x5B9D = 0x3126
-0x5B9E = 0x4A35
-0x5BA0 = 0x3368
-0x5BA1 = 0x4973
-0x5BA2 = 0x3F4D
-0x5BA3 = 0x507B
-0x5BA4 = 0x4A52
-0x5BA5 = 0x6536
-0x5BA6 = 0x3B42
-0x5BAA = 0x4F5C
-0x5BAB = 0x392C
-0x5BB0 = 0x5457
-0x5BB3 = 0x3A26
-0x5BB4 = 0x5167
-0x5BB5 = 0x4F7C
-0x5BB6 = 0x3C52
-0x5BB8 = 0x6537
-0x5BB9 = 0x485D
-0x5BBD = 0x3F6D
-0x5BBE = 0x3176
-0x5BBF = 0x4B5E
-0x5BC2 = 0x3C45
-0x5BC4 = 0x3C44
-0x5BC5 = 0x527A
-0x5BC6 = 0x435C
-0x5BC7 = 0x3F5C
-0x5BCC = 0x383B
-0x5BD0 = 0x4342
-0x5BD2 = 0x3A2E
-0x5BD3 = 0x5422
-0x5BDD = 0x475E
-0x5BDE = 0x442F
-0x5BDF = 0x326C
-0x5BE1 = 0x3951
-0x5BE4 = 0x653B
-0x5BE5 = 0x4148
-0x5BE8 = 0x552F
-0x5BEE = 0x653C
-0x5BF0 = 0x653E
-0x5BF8 = 0x3467
-0x5BF9 = 0x3654
-0x5BFA = 0x4B42
-0x5BFB = 0x5130
-0x5BFC = 0x353C
-0x5BFF = 0x4A59
-0x5C01 = 0x3762
-0x5C04 = 0x4964
-0x5C06 = 0x3D2B
-0x5C09 = 0x4E3E
-0x5C0A = 0x5770
-0x5C0F = 0x5021
-0x5C11 = 0x4959
-0x5C14 = 0x367B
-0x5C15 = 0x6658
-0x5C16 = 0x3C62
-0x5C18 = 0x333E
-0x5C1A = 0x4950
-0x5C1C = 0x6659
-0x5C1D = 0x3322
-0x5C22 = 0x5E4C
-0x5C24 = 0x5348
-0x5C25 = 0x5E4D
-0x5C27 = 0x5222
-0x5C2C = 0x5E4E
-0x5C31 = 0x3E4D
-0x5C34 = 0x5E4F
-0x5C38 = 0x4A2C
-0x5C39 = 0x527C
-0x5C3A = 0x335F
-0x5C3B = 0x656A
-0x5C3C = 0x4461
-0x5C3D = 0x3E21
-0x5C3E = 0x4E32
-0x5C3F = 0x4472
-0x5C40 = 0x3E56
-0x5C41 = 0x4628
-0x5C42 = 0x3263
-0x5C45 = 0x3E53
-0x5C48 = 0x477C
-0x5C49 = 0x4C6B
-0x5C4A = 0x3D6C
-0x5C4B = 0x4E5D
-0x5C4E = 0x4A3A
-0x5C4F = 0x4641
-0x5C50 = 0x656C
-0x5C51 = 0x503C
-0x5C55 = 0x5539
-0x5C59 = 0x656D
-0x5C5E = 0x4A74
-0x5C60 = 0x4D40
-0x5C61 = 0x4245
-0x5C63 = 0x656F
-0x5C65 = 0x4244
-0x5C66 = 0x6570
-0x5C6E = 0x6578
-0x5C6F = 0x4D4D
-0x5C71 = 0x493D
-0x5C79 = 0x5259
-0x5C7A = 0x6128
-0x5C7F = 0x536C
-0x5C81 = 0x4B6A
-0x5C82 = 0x4671
-0x5C88 = 0x612C
-0x5C8C = 0x6127
-0x5C8D = 0x6129
-0x5C90 = 0x612A
-0x5C91 = 0x612F
-0x5C94 = 0x326D
-0x5C96 = 0x612B
-0x5C97 = 0x385A
-0x5C98 = 0x612D
-0x5C99 = 0x612E
-0x5C9A = 0x6130
-0x5C9B = 0x353A
-0x5C9C = 0x6131
-0x5CA2 = 0x6133
-0x5CA3 = 0x6138
-0x5CA9 = 0x5152
-0x5CAB = 0x6136
-0x5CAC = 0x6135
-0x5CAD = 0x416B
-0x5CB1 = 0x6137
-0x5CB3 = 0x5440
-0x5CB5 = 0x6132
-0x5CB7 = 0x613A
-0x5CB8 = 0x3036
-0x5CBD = 0x6134
-0x5CBF = 0x3F79
-0x5CC1 = 0x6139
-0x5CC4 = 0x613B
-0x5CCB = 0x613E
-0x5CD2 = 0x613C
-0x5CD9 = 0x5645
-0x5CE1 = 0x4F3F
-0x5CE4 = 0x613D
-0x5CE5 = 0x613F
-0x5CE6 = 0x424D
-0x5CE8 = 0x366B
-0x5CEA = 0x5378
-0x5CED = 0x474D
-0x5CF0 = 0x3765
-0x5CFB = 0x3E7E
-0x5D02 = 0x6140
-0x5D03 = 0x6141
-0x5D06 = 0x6147
-0x5D07 = 0x3367
-0x5D0E = 0x4669
-0x5D14 = 0x345E
-0x5D16 = 0x5142
-0x5D1B = 0x6148
-0x5D1E = 0x6146
-0x5D24 = 0x6145
-0x5D26 = 0x6143
-0x5D27 = 0x6142
-0x5D29 = 0x3140
-0x5D2D = 0x5538
-0x5D2E = 0x6144
-0x5D34 = 0x614B
-0x5D3D = 0x614C
-0x5D3E = 0x614A
-0x5D47 = 0x6F7A
-0x5D4A = 0x6153
-0x5D4B = 0x6152
-0x5D4C = 0x4736
-0x5D58 = 0x6149
-0x5D5B = 0x614E
-0x5D5D = 0x6150
-0x5D69 = 0x6154
-0x5D6B = 0x6151
-0x5D6C = 0x614D
-0x5D6F = 0x614F
-0x5D74 = 0x6155
-0x5D82 = 0x6156
-0x5D99 = 0x6157
-0x5D9D = 0x6158
-0x5DB7 = 0x615A
-0x5DC5 = 0x615B
-0x5DCD = 0x4E21
-0x5DDB = 0x675D
-0x5DDD = 0x3428
-0x5DDE = 0x565D
-0x5DE1 = 0x5132
-0x5DE2 = 0x3332
-0x5DE5 = 0x3924
-0x5DE6 = 0x5773
-0x5DE7 = 0x4749
-0x5DE8 = 0x3E5E
-0x5DE9 = 0x392E
-0x5DEB = 0x4E57
-0x5DEE = 0x326E
-0x5DEF = 0x5B4F
-0x5DF1 = 0x3C3A
-0x5DF2 = 0x5251
-0x5DF3 = 0x4B48
-0x5DF4 = 0x304D
-0x5DF7 = 0x4F6F
-0x5DFD = 0x5963
-0x5DFE = 0x3D6D
-0x5E01 = 0x3152
-0x5E02 = 0x4A50
-0x5E03 = 0x323C
-0x5E05 = 0x4B27
-0x5E06 = 0x372B
-0x5E08 = 0x4A26
-0x5E0C = 0x4F23
-0x5E0F = 0x6078
-0x5E10 = 0x554A
-0x5E11 = 0x607B
-0x5E14 = 0x607A
-0x5E15 = 0x4541
-0x5E16 = 0x4C7B
-0x5E18 = 0x4131
-0x5E19 = 0x6079
-0x5E1A = 0x5663
-0x5E1B = 0x322F
-0x5E1C = 0x5644
-0x5E1D = 0x355B
-0x5E26 = 0x3478
-0x5E27 = 0x5621
-0x5E2D = 0x4F2F
-0x5E2E = 0x306F
-0x5E31 = 0x607C
-0x5E37 = 0x6121
-0x5E38 = 0x3323
-0x5E3B = 0x607D
-0x5E3C = 0x607E
-0x5E3D = 0x4331
-0x5E42 = 0x435D
-0x5E44 = 0x6122
-0x5E45 = 0x3779
-0x5E4C = 0x3B4F
-0x5E54 = 0x6123
-0x5E55 = 0x443B
-0x5E5B = 0x6124
-0x5E5E = 0x6125
-0x5E61 = 0x6126
-0x5E62 = 0x3431
-0x5E72 = 0x3849
-0x5E73 = 0x463D
-0x5E74 = 0x446A
-0x5E76 = 0x3222
-0x5E78 = 0x5052
-0x5E7A = 0x675B
-0x5E7B = 0x3B43
-0x5E7C = 0x5357
-0x5E7D = 0x5344
-0x5E7F = 0x3963
-0x5E80 = 0x624F
-0x5E84 = 0x572F
-0x5E86 = 0x476C
-0x5E87 = 0x3153
-0x5E8A = 0x3432
-0x5E8B = 0x6251
-0x5E8F = 0x5072
-0x5E90 = 0x422E
-0x5E91 = 0x6250
-0x5E93 = 0x3F62
-0x5E94 = 0x5326
-0x5E95 = 0x3557
-0x5E96 = 0x6252
-0x5E97 = 0x356A
-0x5E99 = 0x436D
-0x5E9A = 0x387D
-0x5E9C = 0x382E
-0x5E9E = 0x4553
-0x5E9F = 0x374F
-0x5EA0 = 0x6254
-0x5EA5 = 0x6253
-0x5EA6 = 0x3648
-0x5EA7 = 0x5779
-0x5EAD = 0x4D25
-0x5EB3 = 0x6258
-0x5EB5 = 0x6256
-0x5EB6 = 0x4A7C
-0x5EB7 = 0x3F35
-0x5EB8 = 0x5339
-0x5EB9 = 0x6255
-0x5EBE = 0x6257
-0x5EC9 = 0x412E
-0x5ECA = 0x4048
-0x5ED1 = 0x625B
-0x5ED2 = 0x625A
-0x5ED3 = 0x402A
-0x5ED6 = 0x414E
-0x5EDB = 0x625C
-0x5EE8 = 0x625D
-0x5EEA = 0x625E
-0x5EF4 = 0x5B48
-0x5EF6 = 0x5153
-0x5EF7 = 0x4D22
-0x5EFA = 0x3D28
-0x5EFE = 0x5E43
-0x5EFF = 0x5825
-0x5F00 = 0x3F2A
-0x5F01 = 0x5B4D
-0x5F02 = 0x526C
-0x5F03 = 0x467A
-0x5F04 = 0x452A
-0x5F08 = 0x5E44
-0x5F0A = 0x3157
-0x5F0B = 0x5F2E
-0x5F0F = 0x4A3D
-0x5F11 = 0x5F31
-0x5F13 = 0x392D
-0x5F15 = 0x527D
-0x5F17 = 0x3825
-0x5F18 = 0x3A6B
-0x5F1B = 0x335A
-0x5F1F = 0x355C
-0x5F20 = 0x5545
-0x5F25 = 0x4356
-0x5F26 = 0x4F52
-0x5F27 = 0x3B21
-0x5F29 = 0x6573
-0x5F2A = 0x6572
-0x5F2D = 0x6574
-0x5F2F = 0x4D64
-0x5F31 = 0x4875
-0x5F39 = 0x352F
-0x5F3A = 0x473F
-0x5F3C = 0x6576
-0x5F40 = 0x6C30
-0x5F50 = 0x6566
-0x5F52 = 0x3969
-0x5F53 = 0x3531
-0x5F55 = 0x423C
-0x5F56 = 0x6568
-0x5F57 = 0x6567
-0x5F58 = 0x6569
-0x5F5D = 0x524D
-0x5F61 = 0x616A
-0x5F62 = 0x504E
-0x5F64 = 0x4D2E
-0x5F66 = 0x5165
-0x5F69 = 0x324A
-0x5F6A = 0x316B
-0x5F6C = 0x3172
-0x5F6D = 0x456D
-0x5F70 = 0x5543
-0x5F71 = 0x5330
-0x5F73 = 0x615C
-0x5F77 = 0x615D
-0x5F79 = 0x525B
-0x5F7B = 0x3339
-0x5F7C = 0x314B
-0x5F80 = 0x4D79
-0x5F81 = 0x5577
-0x5F82 = 0x615E
-0x5F84 = 0x3E36
-0x5F85 = 0x347D
-0x5F87 = 0x615F
-0x5F88 = 0x3A5C
-0x5F89 = 0x6160
-0x5F8A = 0x3B32
-0x5F8B = 0x4249
-0x5F8C = 0x6161
-0x5F90 = 0x506C
-0x5F92 = 0x4D3D
-0x5F95 = 0x6162
-0x5F97 = 0x3543
-0x5F98 = 0x4547
-0x5F99 = 0x6163
-0x5F9C = 0x6164
-0x5FA1 = 0x5379
-0x5FA8 = 0x6165
-0x5FAA = 0x512D
-0x5FAD = 0x6166
-0x5FAE = 0x4E22
-0x5FB5 = 0x6167
-0x5FB7 = 0x3542
-0x5FBC = 0x6168
-0x5FBD = 0x3B55
-0x5FC3 = 0x5044
-0x5FC4 = 0x6260
-0x5FC5 = 0x3158
-0x5FC6 = 0x5264
-0x5FC9 = 0x6261
-0x5FCC = 0x3C49
-0x5FCD = 0x484C
-0x5FCF = 0x6263
-0x5FD0 = 0x6C7E
-0x5FD1 = 0x6C7D
-0x5FD2 = 0x5F2F
-0x5FD6 = 0x6262
-0x5FD7 = 0x563E
-0x5FD8 = 0x4D7C
-0x5FD9 = 0x4326
-0x5FDD = 0x6343
-0x5FE0 = 0x5652
-0x5FE1 = 0x6267
-0x5FE4 = 0x6268
-0x5FE7 = 0x5347
-0x5FEA = 0x626C
-0x5FEB = 0x3F6C
-0x5FED = 0x626D
-0x5FEE = 0x6265
-0x5FF1 = 0x3340
-0x5FF5 = 0x446E
-0x5FF8 = 0x626E
-0x5FFB = 0x5043
-0x5FFD = 0x3A76
-0x5FFE = 0x6269
-0x5FFF = 0x375E
-0x6000 = 0x3B33
-0x6001 = 0x4C2C
-0x6002 = 0x4B4B
-0x6003 = 0x6264
-0x6004 = 0x6266
-0x6005 = 0x626A
-0x6006 = 0x626B
-0x600A = 0x6277
-0x600D = 0x6274
-0x600E = 0x5475
-0x600F = 0x6273
-0x6012 = 0x452D
-0x6014 = 0x557A
-0x6015 = 0x4542
-0x6016 = 0x3240
-0x6019 = 0x626F
-0x601B = 0x6272
-0x601C = 0x412F
-0x601D = 0x4B3C
-0x6020 = 0x3521
-0x6021 = 0x6279
-0x6025 = 0x3C31
-0x6026 = 0x6271
-0x6027 = 0x5054
-0x6028 = 0x5439
-0x6029 = 0x6275
-0x602A = 0x3956
-0x602B = 0x6276
-0x602F = 0x4753
-0x6035 = 0x6270
-0x603B = 0x575C
-0x603C = 0x6D21
-0x603F = 0x6278
-0x6041 = 0x6D25
-0x6042 = 0x627E
-0x6043 = 0x4A51
-0x604B = 0x4135
-0x604D = 0x3B50
-0x6050 = 0x3F56
-0x6052 = 0x3A63
-0x6055 = 0x4B21
-0x6059 = 0x6D26
-0x605A = 0x6D23
-0x605D = 0x6D22
-0x6062 = 0x3B56
-0x6063 = 0x6D27
-0x6064 = 0x5074
-0x6067 = 0x6D24
-0x6068 = 0x3A5E
-0x6069 = 0x3677
-0x606A = 0x6321
-0x606B = 0x3632
-0x606C = 0x4C71
-0x606D = 0x3927
-0x606F = 0x4F22
-0x6070 = 0x4721
-0x6073 = 0x3F52
-0x6076 = 0x3671
-0x6078 = 0x627A
-0x6079 = 0x627B
-0x607A = 0x627D
-0x607B = 0x627C
-0x607C = 0x4455
-0x607D = 0x6322
-0x607F = 0x5341
-0x6083 = 0x6327
-0x6084 = 0x4744
-0x6089 = 0x4F24
-0x608C = 0x6329
-0x608D = 0x3A37
-0x6092 = 0x6328
-0x6094 = 0x3B5A
-0x6096 = 0x6323
-0x609A = 0x6324
-0x609B = 0x632A
-0x609D = 0x6326
-0x609F = 0x4E72
-0x60A0 = 0x5346
-0x60A3 = 0x3B3C
-0x60A6 = 0x5443
-0x60A8 = 0x447A
-0x60AB = 0x6D28
-0x60AC = 0x507C
-0x60AD = 0x6325
-0x60AF = 0x4375
-0x60B1 = 0x632D
-0x60B2 = 0x312F
-0x60B4 = 0x6332
-0x60B8 = 0x3C42
-0x60BB = 0x632C
-0x60BC = 0x353F
-0x60C5 = 0x4769
-0x60C6 = 0x6330
-0x60CA = 0x3E2A
-0x60CB = 0x4D6F
-0x60D1 = 0x3B73
-0x60D5 = 0x4C68
-0x60D8 = 0x632F
-0x60DA = 0x6331
-0x60DC = 0x4F27
-0x60DD = 0x632E
-0x60DF = 0x4E29
-0x60E0 = 0x3B5D
-0x60E6 = 0x356B
-0x60E7 = 0x3E65
-0x60E8 = 0x3252
-0x60E9 = 0x334D
-0x60EB = 0x3139
-0x60EC = 0x632B
-0x60ED = 0x3251
-0x60EE = 0x352C
-0x60EF = 0x395F
-0x60F0 = 0x3668
-0x60F3 = 0x4F6B
-0x60F4 = 0x6337
-0x60F6 = 0x3B4C
-0x60F9 = 0x4847
-0x60FA = 0x504A
-0x6100 = 0x6338
-0x6101 = 0x336E
-0x6106 = 0x6D29
-0x6108 = 0x537A
-0x6109 = 0x5364
-0x610D = 0x6D2A
-0x610E = 0x6339
-0x610F = 0x5262
-0x6115 = 0x6335
-0x611A = 0x535E
-0x611F = 0x3850
-0x6120 = 0x6333
-0x6123 = 0x6336
-0x6124 = 0x375F
-0x6126 = 0x6334
-0x6127 = 0x4022
-0x612B = 0x633A
-0x613F = 0x5438
-0x6148 = 0x3448
-0x614A = 0x633B
-0x614C = 0x3B45
-0x614E = 0x4977
-0x6151 = 0x4965
-0x6155 = 0x443D
-0x615D = 0x6D2B
-0x6162 = 0x427D
-0x6167 = 0x3B5B
-0x6168 = 0x3F2E
-0x6170 = 0x4E3F
-0x6175 = 0x633C
-0x6177 = 0x3F36
-0x618B = 0x316F
-0x618E = 0x5477
-0x6194 = 0x633E
-0x619D = 0x6D2D
-0x61A7 = 0x633F
-0x61A8 = 0x3A29
-0x61A9 = 0x6D2C
-0x61AC = 0x633D
-0x61B7 = 0x6340
-0x61BE = 0x3A36
-0x61C2 = 0x362E
-0x61C8 = 0x5038
-0x61CA = 0x3043
-0x61CB = 0x6D2E
-0x61D1 = 0x6D2F
-0x61D2 = 0x4041
-0x61D4 = 0x6341
-0x61E6 = 0x4533
-0x61F5 = 0x6342
-0x61FF = 0x5C32
-0x6206 = 0x6D30
-0x6208 = 0x386A
-0x620A = 0x4E6C
-0x620B = 0x6A27
-0x620C = 0x5067
-0x620D = 0x4A79
-0x620E = 0x4856
-0x620F = 0x4F37
-0x6210 = 0x3349
-0x6211 = 0x4E52
-0x6212 = 0x3D64
-0x6215 = 0x635E
-0x6216 = 0x3B72
-0x6217 = 0x6A28
-0x6218 = 0x553D
-0x621A = 0x465D
-0x621B = 0x6A29
-0x621F = 0x6A2A
-0x6221 = 0x6A2C
-0x6222 = 0x6A2B
-0x6224 = 0x6A2E
-0x6225 = 0x6A2D
-0x622A = 0x3D58
-0x622C = 0x6A2F
-0x622E = 0x423E
-0x6233 = 0x3441
-0x6234 = 0x3477
-0x6237 = 0x3B27
-0x623D = 0x6C66
-0x623E = 0x6C65
-0x623F = 0x373F
-0x6240 = 0x4B79
-0x6241 = 0x3162
-0x6243 = 0x6C67
-0x6247 = 0x4948
-0x6248 = 0x6C68
-0x6249 = 0x6C69
-0x624B = 0x4A56
-0x624C = 0x5E50
-0x624D = 0x3245
-0x624E = 0x547A
-0x6251 = 0x464B
-0x6252 = 0x3047
-0x6253 = 0x3472
-0x6254 = 0x4853
-0x6258 = 0x4D50
-0x625B = 0x3F38
-0x6263 = 0x3F5B
-0x6266 = 0x4724
-0x6267 = 0x5634
-0x6269 = 0x4029
-0x626A = 0x5E51
-0x626B = 0x4928
-0x626C = 0x516F
-0x626D = 0x4524
-0x626E = 0x3067
-0x626F = 0x3336
-0x6270 = 0x4845
-0x6273 = 0x3062
-0x6276 = 0x3776
-0x6279 = 0x457A
-0x627C = 0x3673
-0x627E = 0x5552
-0x627F = 0x3350
-0x6280 = 0x3C3C
-0x6284 = 0x332D
-0x6289 = 0x3E71
-0x628A = 0x3051
-0x6291 = 0x5256
-0x6292 = 0x4A63
-0x6293 = 0x5725
-0x6295 = 0x4D36
-0x6296 = 0x3636
-0x6297 = 0x3F39
-0x6298 = 0x555B
-0x629A = 0x3827
-0x629B = 0x4557
-0x629F = 0x5E52
-0x62A0 = 0x3F59
-0x62A1 = 0x4255
-0x62A2 = 0x4740
-0x62A4 = 0x3B24
-0x62A5 = 0x3128
-0x62A8 = 0x456A
-0x62AB = 0x457B
-0x62AC = 0x4C27
-0x62B1 = 0x3127
-0x62B5 = 0x3556
-0x62B9 = 0x4428
-0x62BB = 0x5E53
-0x62BC = 0x513A
-0x62BD = 0x3369
-0x62BF = 0x4372
-0x62C2 = 0x3777
-0x62C4 = 0x5674
-0x62C5 = 0x3523
-0x62C6 = 0x3270
-0x62C7 = 0x4434
-0x62C8 = 0x4469
-0x62C9 = 0x402D
-0x62CA = 0x5E54
-0x62CC = 0x3068
-0x62CD = 0x4544
-0x62CE = 0x4160
-0x62D0 = 0x3955
-0x62D2 = 0x3E5C
-0x62D3 = 0x4D58
-0x62D4 = 0x304E
-0x62D6 = 0x4D4F
-0x62D7 = 0x5E56
-0x62D8 = 0x3E50
-0x62D9 = 0x573E
-0x62DA = 0x5E55
-0x62DB = 0x5550
-0x62DC = 0x305D
-0x62DF = 0x4462
-0x62E2 = 0x4223
-0x62E3 = 0x3C70
-0x62E5 = 0x5335
-0x62E6 = 0x4039
-0x62E7 = 0x4521
-0x62E8 = 0x3226
-0x62E9 = 0x5471
-0x62EC = 0x4028
-0x62ED = 0x4A43
-0x62EE = 0x5E57
-0x62EF = 0x557C
-0x62F1 = 0x3930
-0x62F3 = 0x482D
-0x62F4 = 0x4B29
-0x62F6 = 0x5E59
-0x62F7 = 0x3F3D
-0x62FC = 0x4634
-0x62FD = 0x5727
-0x62FE = 0x4A30
-0x62FF = 0x4443
-0x6301 = 0x3356
-0x6302 = 0x3952
-0x6307 = 0x5638
-0x6308 = 0x6A7C
-0x6309 = 0x3034
-0x630E = 0x3F66
-0x6311 = 0x4C74
-0x6316 = 0x4D5A
-0x631A = 0x563F
-0x631B = 0x424E
-0x631D = 0x4E4E
-0x631E = 0x4C22
-0x631F = 0x502E
-0x6320 = 0x4453
-0x6321 = 0x3532
-0x6322 = 0x5E58
-0x6323 = 0x5575
-0x6324 = 0x3C37
-0x6325 = 0x3B53
-0x6328 = 0x3024
-0x632A = 0x4532
-0x632B = 0x346C
-0x632F = 0x5571
-0x6332 = 0x6A7D
-0x6339 = 0x5E5A
-0x633A = 0x4D26
-0x633D = 0x4D6C
-0x6342 = 0x4E66
-0x6343 = 0x5E5C
-0x6345 = 0x4D31
-0x6346 = 0x4026
-0x6349 = 0x573D
-0x634B = 0x5E5B
-0x634C = 0x3046
-0x634D = 0x3A34
-0x634E = 0x4953
-0x634F = 0x4473
-0x6350 = 0x3E68
-0x6355 = 0x3236
-0x635E = 0x404C
-0x635F = 0x4B70
-0x6361 = 0x3C71
-0x6362 = 0x3B3B
-0x6363 = 0x3537
-0x6367 = 0x4575
-0x6369 = 0x5E66
-0x636D = 0x5E63
-0x636E = 0x3E5D
-0x6371 = 0x5E5F
-0x6376 = 0x3437
-0x6377 = 0x3D5D
-0x637A = 0x5E60
-0x637B = 0x446D
-0x6380 = 0x4F46
-0x6382 = 0x3560
-0x6387 = 0x365E
-0x6388 = 0x4A5A
-0x6389 = 0x3574
-0x638A = 0x5E65
-0x638C = 0x5546
-0x638E = 0x5E61
-0x638F = 0x4C4D
-0x6390 = 0x467E
-0x6392 = 0x4545
-0x6396 = 0x5234
-0x6398 = 0x3E72
-0x63A0 = 0x4253
-0x63A2 = 0x4C3D
-0x63A3 = 0x3338
-0x63A5 = 0x3D53
-0x63A7 = 0x3F58
-0x63A8 = 0x4D46
-0x63A9 = 0x515A
-0x63AA = 0x346B
-0x63AC = 0x5E64
-0x63AD = 0x5E5D
-0x63AE = 0x5E67
-0x63B0 = 0x6A7E
-0x63B3 = 0x4230
-0x63B4 = 0x5E62
-0x63B7 = 0x5640
-0x63B8 = 0x3527
-0x63BA = 0x3274
-0x63BC = 0x5E68
-0x63BE = 0x5E72
-0x63C4 = 0x5E6D
-0x63C6 = 0x5E71
-0x63C9 = 0x4860
-0x63CD = 0x5761
-0x63CE = 0x5E6F
-0x63CF = 0x4368
-0x63D0 = 0x4C61
-0x63D2 = 0x3265
-0x63D6 = 0x523E
-0x63DE = 0x5E6E
-0x63E0 = 0x5E6B
-0x63E1 = 0x4E55
-0x63E3 = 0x3427
-0x63E9 = 0x3F2B
-0x63EA = 0x3E3E
-0x63ED = 0x3D52
-0x63F2 = 0x5E69
-0x63F4 = 0x542E
-0x63F6 = 0x5E5E
-0x63F8 = 0x5E6A
-0x63FD = 0x403F
-0x63FF = 0x5E6C
-0x6400 = 0x3273
-0x6401 = 0x3869
-0x6402 = 0x4227
-0x6405 = 0x3D41
-0x640B = 0x5E75
-0x640C = 0x5E78
-0x640F = 0x322B
-0x6410 = 0x3424
-0x6413 = 0x346A
-0x6414 = 0x4926
-0x641B = 0x5E76
-0x641C = 0x4B51
-0x641E = 0x3863
-0x6420 = 0x5E77
-0x6421 = 0x5E7A
-0x6426 = 0x5E79
-0x642A = 0x4C42
-0x642C = 0x3061
-0x642D = 0x346E
-0x6434 = 0x653A
-0x643A = 0x502F
-0x643D = 0x326B
-0x643F = 0x6B21
-0x6441 = 0x5E74
-0x6444 = 0x4963
-0x6445 = 0x5E73
-0x6446 = 0x305A
-0x6447 = 0x5221
-0x6448 = 0x3177
-0x644A = 0x4C2F
-0x6452 = 0x5E70
-0x6454 = 0x4B24
-0x6458 = 0x552A
-0x645E = 0x5E7B
-0x6467 = 0x345D
-0x6469 = 0x4426
-0x646D = 0x5E7D
-0x6478 = 0x437E
-0x6479 = 0x4421
-0x647A = 0x5F21
-0x6482 = 0x414C
-0x6484 = 0x5E7C
-0x6485 = 0x3E6F
-0x6487 = 0x4632
-0x6491 = 0x3345
-0x6492 = 0x4876
-0x6495 = 0x4B3A
-0x6496 = 0x5E7E
-0x6499 = 0x5F24
-0x649E = 0x5732
-0x64A4 = 0x3337
-0x64A9 = 0x4143
-0x64AC = 0x474B
-0x64AD = 0x3225
-0x64AE = 0x3469
-0x64B0 = 0x572B
-0x64B5 = 0x446C
-0x64B7 = 0x5F22
-0x64B8 = 0x5F23
-0x64BA = 0x5F25
-0x64BC = 0x3A33
-0x64C0 = 0x5F26
-0x64C2 = 0x405E
-0x64C5 = 0x4943
-0x64CD = 0x3259
-0x64CE = 0x4766
-0x64D0 = 0x5F27
-0x64D2 = 0x475C
-0x64D7 = 0x5F28
-0x64D8 = 0x6B22
-0x64DE = 0x4B53
-0x64E2 = 0x5F2A
-0x64E4 = 0x5F29
-0x64E6 = 0x3241
-0x6500 = 0x454A
-0x6509 = 0x5F2B
-0x6512 = 0x545C
-0x6518 = 0x4841
-0x6525 = 0x5F2C
-0x652B = 0x3E70
-0x652E = 0x5F2D
-0x652F = 0x5627
-0x6534 = 0x6A37
-0x6535 = 0x6B36
-0x6536 = 0x4A55
-0x6538 = 0x587C
-0x6539 = 0x3844
-0x653B = 0x3925
-0x653E = 0x3745
-0x653F = 0x557E
-0x6545 = 0x394A
-0x6548 = 0x5027
-0x6549 = 0x744D
-0x654C = 0x3550
-0x654F = 0x4374
-0x6551 = 0x3E48
-0x6555 = 0x6B37
-0x6556 = 0x303D
-0x6559 = 0x3D4C
-0x655B = 0x4132
-0x655D = 0x3156
-0x655E = 0x3328
-0x6562 = 0x3852
-0x6563 = 0x4922
-0x6566 = 0x3658
-0x656B = 0x6B38
-0x656C = 0x3E34
-0x6570 = 0x4A7D
-0x6572 = 0x4743
-0x6574 = 0x557B
-0x6577 = 0x3773
-0x6587 = 0x4E44
-0x658B = 0x552B
-0x658C = 0x3173
-0x6590 = 0x6C33
-0x6591 = 0x305F
-0x6593 = 0x6C35
-0x6597 = 0x3637
-0x6599 = 0x414F
-0x659B = 0x757A
-0x659C = 0x5031
-0x659F = 0x5565
-0x65A1 = 0x4E53
-0x65A4 = 0x3D6F
-0x65A5 = 0x3362
-0x65A7 = 0x382B
-0x65A9 = 0x5536
-0x65AB = 0x6D3D
-0x65AD = 0x364F
-0x65AF = 0x4B39
-0x65B0 = 0x5042
-0x65B9 = 0x373D
-0x65BC = 0x6C36
-0x65BD = 0x4A29
-0x65C1 = 0x4554
-0x65C3 = 0x6C39
-0x65C4 = 0x6C38
-0x65C5 = 0x4243
-0x65C6 = 0x6C37
-0x65CB = 0x507D
-0x65CC = 0x6C3A
-0x65CE = 0x6C3B
-0x65CF = 0x5765
-0x65D2 = 0x6C3C
-0x65D6 = 0x6C3D
-0x65D7 = 0x466C
-0x65E0 = 0x4E5E
-0x65E2 = 0x3C48
-0x65E5 = 0x4855
-0x65E6 = 0x3529
-0x65E7 = 0x3E49
-0x65E8 = 0x563C
-0x65E9 = 0x5467
-0x65EC = 0x512E
-0x65ED = 0x5071
-0x65EE = 0x6A38
-0x65EF = 0x6A39
-0x65F0 = 0x6A3A
-0x65F1 = 0x3A35
-0x65F6 = 0x4A31
-0x65F7 = 0x3F75
-0x65FA = 0x4D7A
-0x6600 = 0x6A40
-0x6602 = 0x303A
-0x6603 = 0x6A3E
-0x6606 = 0x4025
-0x660A = 0x6A3B
-0x660C = 0x327D
-0x660E = 0x4377
-0x660F = 0x3B68
-0x6613 = 0x5257
-0x6614 = 0x4E74
-0x6615 = 0x6A3F
-0x6619 = 0x6A3C
-0x661D = 0x6A43
-0x661F = 0x5047
-0x6620 = 0x5333
-0x6625 = 0x343A
-0x6627 = 0x4341
-0x6628 = 0x5772
-0x662D = 0x5551
-0x662F = 0x4A47
-0x6631 = 0x6A45
-0x6634 = 0x6A44
-0x6635 = 0x6A47
-0x6636 = 0x6A46
-0x663C = 0x5667
-0x663E = 0x4F54
-0x6641 = 0x6A4B
-0x6643 = 0x3B4E
-0x664B = 0x3D7A
-0x664C = 0x494E
-0x664F = 0x6A4C
-0x6652 = 0x4939
-0x6653 = 0x4F7E
-0x6654 = 0x6A4A
-0x6655 = 0x544E
-0x6656 = 0x6A4D
-0x6657 = 0x6A4F
-0x665A = 0x4D6D
-0x665F = 0x6A49
-0x6661 = 0x6A4E
-0x6664 = 0x4E6E
-0x6666 = 0x3B5E
-0x6668 = 0x333F
-0x666E = 0x4655
-0x666F = 0x3E30
-0x6670 = 0x4E7A
-0x6674 = 0x4767
-0x6676 = 0x3E27
-0x6677 = 0x6A50
-0x667A = 0x5647
-0x667E = 0x4140
-0x6682 = 0x545D
-0x6684 = 0x6A51
-0x6687 = 0x4F3E
-0x668C = 0x6A52
-0x6691 = 0x4A6E
-0x6696 = 0x452F
-0x6697 = 0x3035
-0x669D = 0x6A54
-0x66A7 = 0x6A53
-0x66A8 = 0x745F
-0x66AE = 0x443A
-0x66B4 = 0x3129
-0x66B9 = 0x655F
-0x66BE = 0x6A55
-0x66D9 = 0x4A6F
-0x66DB = 0x6A56
-0x66DC = 0x6A57
-0x66DD = 0x4658
-0x66E6 = 0x6A58
-0x66E9 = 0x6A59
-0x66F0 = 0x543B
-0x66F2 = 0x477A
-0x66F3 = 0x5237
-0x66F4 = 0x387C
-0x66F7 = 0x6A42
-0x66F9 = 0x325C
-0x66FC = 0x427C
-0x66FE = 0x5478
-0x66FF = 0x4C66
-0x6700 = 0x576E
-0x6708 = 0x5442
-0x6709 = 0x5350
-0x670A = 0x6B43
-0x670B = 0x4573
-0x670D = 0x377E
-0x6710 = 0x6B54
-0x6714 = 0x4B37
-0x6715 = 0x6B5E
-0x6717 = 0x404A
-0x671B = 0x4D7B
-0x671D = 0x332F
-0x671F = 0x465A
-0x6726 = 0x6B7C
-0x6728 = 0x443E
-0x672A = 0x4E34
-0x672B = 0x4429
-0x672C = 0x313E
-0x672D = 0x547D
-0x672F = 0x4A75
-0x6731 = 0x566C
-0x6734 = 0x4653
-0x6735 = 0x3664
-0x673A = 0x3B7A
-0x673D = 0x5060
-0x6740 = 0x4931
-0x6742 = 0x5453
-0x6743 = 0x4828
-0x6746 = 0x384B
-0x6748 = 0x683E
-0x6749 = 0x493C
-0x674C = 0x683B
-0x674E = 0x406E
-0x674F = 0x5053
-0x6750 = 0x3244
-0x6751 = 0x3465
-0x6753 = 0x683C
-0x6756 = 0x5548
-0x675C = 0x3645
-0x675E = 0x683D
-0x675F = 0x4A78
-0x6760 = 0x385C
-0x6761 = 0x4C75
-0x6765 = 0x4034
-0x6768 = 0x516E
-0x6769 = 0x683F
-0x676A = 0x6842
-0x676D = 0x3A3C
-0x676F = 0x312D
-0x6770 = 0x3D5C
-0x6772 = 0x6A3D
-0x6773 = 0x6843
-0x6775 = 0x6846
-0x6777 = 0x684B
-0x677C = 0x684C
-0x677E = 0x4B49
-0x677F = 0x3065
-0x6781 = 0x3C2B
-0x6784 = 0x3939
-0x6787 = 0x6841
-0x6789 = 0x4D77
-0x678B = 0x684A
-0x6790 = 0x4E76
-0x6795 = 0x556D
-0x6797 = 0x4156
-0x6798 = 0x6844
-0x679A = 0x4336
-0x679C = 0x397B
-0x679D = 0x5626
-0x679E = 0x6848
-0x67A2 = 0x4A60
-0x67A3 = 0x5466
-0x67A5 = 0x6840
-0x67A7 = 0x6845
-0x67A8 = 0x6847
-0x67AA = 0x4739
-0x67AB = 0x3763
-0x67AD = 0x6849
-0x67AF = 0x3F5D
-0x67B0 = 0x6852
-0x67B3 = 0x6857
-0x67B5 = 0x6855
-0x67B6 = 0x3C5C
-0x67B7 = 0x3C4F
-0x67B8 = 0x685B
-0x67C1 = 0x685E
-0x67C3 = 0x685A
-0x67C4 = 0x317A
-0x67CF = 0x3058
-0x67D0 = 0x4433
-0x67D1 = 0x384C
-0x67D2 = 0x4662
-0x67D3 = 0x483E
-0x67D4 = 0x4861
-0x67D8 = 0x684F
-0x67D9 = 0x6854
-0x67DA = 0x6856
-0x67DC = 0x3971
-0x67DD = 0x6858
-0x67DE = 0x5775
-0x67E0 = 0x447B
-0x67E2 = 0x685C
-0x67E5 = 0x3269
-0x67E9 = 0x6851
-0x67EC = 0x3C6D
-0x67EF = 0x3F42
-0x67F0 = 0x684D
-0x67F1 = 0x5679
-0x67F3 = 0x4178
-0x67F4 = 0x3271
-0x67FD = 0x685F
-0x67FF = 0x4A41
-0x6800 = 0x6859
-0x6805 = 0x5524
-0x6807 = 0x316A
-0x6808 = 0x553B
-0x6809 = 0x684E
-0x680A = 0x6850
-0x680B = 0x3630
-0x680C = 0x6853
-0x680E = 0x685D
-0x680F = 0x4038
-0x6811 = 0x4A77
-0x6813 = 0x4B28
-0x6816 = 0x465C
-0x6817 = 0x4075
-0x681D = 0x6869
-0x6821 = 0x5023
-0x6829 = 0x6872
-0x682A = 0x566A
-0x6832 = 0x6860
-0x6833 = 0x6861
-0x6837 = 0x5179
-0x6838 = 0x3A4B
-0x6839 = 0x3879
-0x683C = 0x3871
-0x683D = 0x5454
-0x683E = 0x686F
-0x6840 = 0x686E
-0x6841 = 0x686C
-0x6842 = 0x3970
-0x6843 = 0x4C52
-0x6844 = 0x6866
-0x6845 = 0x4E26
-0x6846 = 0x3F72
-0x6848 = 0x3038
-0x6849 = 0x6871
-0x684A = 0x6870
-0x684C = 0x5740
-0x684E = 0x6864
-0x6850 = 0x4D29
-0x6851 = 0x4923
-0x6853 = 0x3B38
-0x6854 = 0x3D5B
-0x6855 = 0x686A
-0x6860 = 0x6862
-0x6861 = 0x6863
-0x6862 = 0x6865
-0x6863 = 0x3535
-0x6864 = 0x6867
-0x6865 = 0x4745
-0x6866 = 0x686B
-0x6867 = 0x686D
-0x6868 = 0x3D30
-0x6869 = 0x572E
-0x686B = 0x6878
-0x6874 = 0x6875
-0x6876 = 0x4D30
-0x6877 = 0x6876
-0x6881 = 0x413A
-0x6883 = 0x6868
-0x6885 = 0x4337
-0x6886 = 0x3070
-0x688F = 0x6874
-0x6893 = 0x6877
-0x6897 = 0x3923
-0x68A2 = 0x4952
-0x68A6 = 0x434E
-0x68A7 = 0x4E60
-0x68A8 = 0x4066
-0x68AD = 0x4B73
-0x68AF = 0x4C5D
-0x68B0 = 0x5035
-0x68B3 = 0x4A61
-0x68B5 = 0x6873
-0x68C0 = 0x3C6C
-0x68C2 = 0x6879
-0x68C9 = 0x435E
-0x68CB = 0x4665
-0x68CD = 0x3977
-0x68D2 = 0x3074
-0x68D5 = 0x5758
-0x68D8 = 0x3C2C
-0x68DA = 0x456F
-0x68E0 = 0x4C44
-0x68E3 = 0x6926
-0x68EE = 0x492D
-0x68F0 = 0x6922
-0x68F1 = 0x4062
-0x68F5 = 0x3F43
-0x68F9 = 0x687E
-0x68FA = 0x3957
-0x68FC = 0x687B
-0x6901 = 0x6924
-0x6905 = 0x524E
-0x690B = 0x6923
-0x690D = 0x5632
-0x690E = 0x5735
-0x6910 = 0x6927
-0x6912 = 0x3D37
-0x691F = 0x687C
-0x6920 = 0x687D
-0x6924 = 0x6921
-0x692D = 0x4D56
-0x6930 = 0x522C
-0x6934 = 0x6932
-0x6939 = 0x6929
-0x693D = 0x342A
-0x693F = 0x343B
-0x6942 = 0x692B
-0x6954 = 0x5028
-0x6957 = 0x6925
-0x695A = 0x337E
-0x695D = 0x692C
-0x695E = 0x4063
-0x6960 = 0x692A
-0x6963 = 0x6939
-0x6966 = 0x6938
-0x696B = 0x692E
-0x696E = 0x687A
-0x6971 = 0x6928
-0x6977 = 0x3F2C
-0x6978 = 0x6931
-0x6979 = 0x693A
-0x697C = 0x4225
-0x6980 = 0x692F
-0x6982 = 0x3845
-0x6984 = 0x692D
-0x6986 = 0x535C
-0x6987 = 0x6934
-0x6988 = 0x6935
-0x6989 = 0x6937
-0x698D = 0x6947
-0x6994 = 0x4046
-0x6995 = 0x6945
-0x6998 = 0x6930
-0x699B = 0x693B
-0x699C = 0x3071
-0x69A7 = 0x693C
-0x69A8 = 0x5525
-0x69AB = 0x693E
-0x69AD = 0x693F
-0x69B1 = 0x6941
-0x69B4 = 0x4171
-0x69B7 = 0x4836
-0x69BB = 0x693D
-0x69C1 = 0x6942
-0x69CA = 0x6943
-0x69CC = 0x6933
-0x69CE = 0x6936
-0x69D0 = 0x3B31
-0x69D4 = 0x6940
-0x69DB = 0x3C77
-0x69DF = 0x6944
-0x69E0 = 0x6946
-0x69ED = 0x694A
-0x69F2 = 0x694E
-0x69FD = 0x325B
-0x69FF = 0x6948
-0x6A0A = 0x372E
-0x6A17 = 0x694B
-0x6A18 = 0x694C
-0x6A1F = 0x5541
-0x6A21 = 0x4423
-0x6A28 = 0x6958
-0x6A2A = 0x3A61
-0x6A2F = 0x6949
-0x6A31 = 0x5323
-0x6A35 = 0x6954
-0x6A3D = 0x6957
-0x6A3E = 0x6950
-0x6A44 = 0x694F
-0x6A47 = 0x4741
-0x6A50 = 0x6952
-0x6A58 = 0x6959
-0x6A59 = 0x3348
-0x6A5B = 0x6953
-0x6A61 = 0x4F70
-0x6A65 = 0x694D
-0x6A71 = 0x3377
-0x6A79 = 0x6956
-0x6A7C = 0x695A
-0x6A80 = 0x4C34
-0x6A84 = 0x4F2D
-0x6A8E = 0x6955
-0x6A90 = 0x695C
-0x6A91 = 0x695B
-0x6A97 = 0x695E
-0x6AA0 = 0x6951
-0x6AA9 = 0x695D
-0x6AAB = 0x695F
-0x6AAC = 0x434A
-0x6B20 = 0x4737
-0x6B21 = 0x344E
-0x6B22 = 0x3B36
-0x6B23 = 0x5040
-0x6B24 = 0x6C23
-0x6B27 = 0x4537
-0x6B32 = 0x537B
-0x6B37 = 0x6C24
-0x6B39 = 0x6C25
-0x6B3A = 0x465B
-0x6B3E = 0x3F6E
-0x6B43 = 0x6C26
-0x6B46 = 0x6C27
-0x6B47 = 0x502A
-0x6B49 = 0x4738
-0x6B4C = 0x3868
-0x6B59 = 0x6C28
-0x6B62 = 0x5639
-0x6B63 = 0x557D
-0x6B64 = 0x344B
-0x6B65 = 0x323D
-0x6B66 = 0x4E64
-0x6B67 = 0x4667
-0x6B6A = 0x4D61
-0x6B79 = 0x3475
-0x6B7B = 0x4B40
-0x6B7C = 0x3C5F
-0x6B81 = 0x6962
-0x6B82 = 0x6963
-0x6B83 = 0x516A
-0x6B84 = 0x6965
-0x6B86 = 0x3479
-0x6B87 = 0x6964
-0x6B89 = 0x5133
-0x6B8A = 0x4A62
-0x6B8B = 0x3250
-0x6B8D = 0x6968
-0x6B92 = 0x6966
-0x6B93 = 0x6967
-0x6B96 = 0x5633
-0x6B9A = 0x6969
-0x6B9B = 0x696A
-0x6BA1 = 0x696B
-0x6BAA = 0x696C
-0x6BB3 = 0x6C2F
-0x6BB4 = 0x4539
-0x6BB5 = 0x364E
-0x6BB7 = 0x5273
-0x6BBF = 0x356E
-0x6BC1 = 0x3B59
-0x6BC2 = 0x6C31
-0x6BC5 = 0x5263
-0x6BCB = 0x4E63
-0x6BCD = 0x4438
-0x6BCF = 0x433F
-0x6BD2 = 0x363E
-0x6BD3 = 0x5839
-0x6BD4 = 0x3148
-0x6BD5 = 0x314F
-0x6BD6 = 0x3151
-0x6BD7 = 0x457E
-0x6BD9 = 0x3150
-0x6BDB = 0x432B
-0x6BE1 = 0x5531
-0x6BEA = 0x6B24
-0x6BEB = 0x3A41
-0x6BEF = 0x4C3A
-0x6BF3 = 0x6B25
-0x6BF5 = 0x6B27
-0x6BF9 = 0x6B28
-0x6BFD = 0x6B26
-0x6C05 = 0x6B29
-0x6C06 = 0x6B2B
-0x6C07 = 0x6B2A
-0x6C0D = 0x6B2C
-0x6C0F = 0x4A4F
-0x6C10 = 0x5835
-0x6C11 = 0x4371
-0x6C13 = 0x4325
-0x6C14 = 0x4678
-0x6C15 = 0x6B2D
-0x6C16 = 0x444A
-0x6C18 = 0x6B2E
-0x6C19 = 0x6B2F
-0x6C1A = 0x6B30
-0x6C1B = 0x3755
-0x6C1F = 0x377A
-0x6C21 = 0x6B31
-0x6C22 = 0x4762
-0x6C24 = 0x6B33
-0x6C26 = 0x3A24
-0x6C27 = 0x5175
-0x6C28 = 0x3031
-0x6C29 = 0x6B32
-0x6C2A = 0x6B34
-0x6C2E = 0x352A
-0x6C2F = 0x4248
-0x6C30 = 0x4768
-0x6C32 = 0x6B35
-0x6C34 = 0x4B2E
-0x6C35 = 0x635F
-0x6C38 = 0x5340
-0x6C3D = 0x595B
-0x6C40 = 0x4D21
-0x6C41 = 0x562D
-0x6C42 = 0x4773
-0x6C46 = 0x5960
-0x6C47 = 0x3B63
-0x6C49 = 0x3A3A
-0x6C4A = 0x6362
-0x6C50 = 0x4F2B
-0x6C54 = 0x6360
-0x6C55 = 0x4947
-0x6C57 = 0x3A39
-0x6C5B = 0x5134
-0x6C5C = 0x6361
-0x6C5D = 0x486A
-0x6C5E = 0x392F
-0x6C5F = 0x3D2D
-0x6C60 = 0x3358
-0x6C61 = 0x4E5B
-0x6C64 = 0x4C40
-0x6C68 = 0x6368
-0x6C69 = 0x6369
-0x6C6A = 0x4D74
-0x6C70 = 0x4C2D
-0x6C72 = 0x3C33
-0x6C74 = 0x636A
-0x6C76 = 0x636B
-0x6C79 = 0x505A
-0x6C7D = 0x467B
-0x6C7E = 0x375A
-0x6C81 = 0x475F
-0x6C82 = 0x524A
-0x6C83 = 0x4E56
-0x6C85 = 0x6364
-0x6C86 = 0x636C
-0x6C88 = 0x4972
-0x6C89 = 0x3341
-0x6C8C = 0x6367
-0x6C8F = 0x4663
-0x6C90 = 0x6365
-0x6C93 = 0x6D33
-0x6C94 = 0x6366
-0x6C99 = 0x4933
-0x6C9B = 0x4566
-0x6C9F = 0x3935
-0x6CA1 = 0x433B
-0x6CA3 = 0x6363
-0x6CA4 = 0x453D
-0x6CA5 = 0x4124
-0x6CA6 = 0x4259
-0x6CA7 = 0x3257
-0x6CA9 = 0x636D
-0x6CAA = 0x3B26
-0x6CAB = 0x442D
-0x6CAD = 0x6370
-0x6CAE = 0x3E5A
-0x6CB1 = 0x637B
-0x6CB2 = 0x6375
-0x6CB3 = 0x3A53
-0x6CB8 = 0x3750
-0x6CB9 = 0x534D
-0x6CBB = 0x564E
-0x6CBC = 0x5553
-0x6CBD = 0x3941
-0x6CBE = 0x5534
-0x6CBF = 0x5158
-0x6CC4 = 0x5039
-0x6CC5 = 0x4776
-0x6CC9 = 0x482A
-0x6CCA = 0x3234
-0x6CCC = 0x435A
-0x6CD0 = 0x636E
-0x6CD3 = 0x637C
-0x6CD4 = 0x636F
-0x6CD5 = 0x3728
-0x6CD6 = 0x6377
-0x6CD7 = 0x6374
-0x6CDB = 0x373A
-0x6CDE = 0x4522
-0x6CE0 = 0x6376
-0x6CE1 = 0x455D
-0x6CE2 = 0x3228
-0x6CE3 = 0x467C
-0x6CE5 = 0x4460
-0x6CE8 = 0x5722
-0x6CEA = 0x4061
-0x6CEB = 0x6379
-0x6CEE = 0x637A
-0x6CEF = 0x637D
-0x6CF0 = 0x4C29
-0x6CF1 = 0x6373
-0x6CF3 = 0x533E
-0x6CF5 = 0x3143
-0x6CF6 = 0x6D34
-0x6CF7 = 0x6371
-0x6CF8 = 0x6372
-0x6CFA = 0x6378
-0x6CFB = 0x503A
-0x6CFC = 0x4643
-0x6CFD = 0x5473
-0x6CFE = 0x637E
-0x6D01 = 0x3D60
-0x6D04 = 0x6427
-0x6D07 = 0x6426
-0x6D0B = 0x5173
-0x6D0C = 0x6423
-0x6D0E = 0x6429
-0x6D12 = 0x4877
-0x6D17 = 0x4F34
-0x6D19 = 0x6428
-0x6D1A = 0x642E
-0x6D1B = 0x4265
-0x6D1E = 0x3634
-0x6D25 = 0x3D72
-0x6D27 = 0x6422
-0x6D2A = 0x3A69
-0x6D2B = 0x642A
-0x6D2E = 0x642C
-0x6D31 = 0x367D
-0x6D32 = 0x565E
-0x6D33 = 0x6432
-0x6D35 = 0x642D
-0x6D39 = 0x6421
-0x6D3B = 0x3B6E
-0x6D3C = 0x4D5D
-0x6D3D = 0x4722
-0x6D3E = 0x4549
-0x6D41 = 0x4177
-0x6D43 = 0x6424
-0x6D45 = 0x4733
-0x6D46 = 0x3D2C
-0x6D47 = 0x3D3D
-0x6D48 = 0x6425
-0x6D4A = 0x5747
-0x6D4B = 0x3262
-0x6D4D = 0x642B
-0x6D4E = 0x3C43
-0x6D4F = 0x642F
-0x6D51 = 0x3B6B
-0x6D52 = 0x6430
-0x6D53 = 0x4528
-0x6D54 = 0x6431
-0x6D59 = 0x5563
-0x6D5A = 0x3F23
-0x6D5C = 0x643A
-0x6D5E = 0x6437
-0x6D60 = 0x643B
-0x6D63 = 0x643D
-0x6D66 = 0x4656
-0x6D69 = 0x3A46
-0x6D6A = 0x404B
-0x6D6E = 0x3821
-0x6D6F = 0x6434
-0x6D74 = 0x5421
-0x6D77 = 0x3A23
-0x6D78 = 0x3D7E
-0x6D7C = 0x643C
-0x6D82 = 0x4D3F
-0x6D85 = 0x4479
-0x6D88 = 0x4F7B
-0x6D89 = 0x4966
-0x6D8C = 0x533F
-0x6D8E = 0x4F51
-0x6D91 = 0x6433
-0x6D93 = 0x6438
-0x6D94 = 0x6439
-0x6D95 = 0x4C69
-0x6D9B = 0x4C4E
-0x6D9D = 0x4054
-0x6D9E = 0x6435
-0x6D9F = 0x4130
-0x6DA0 = 0x6436
-0x6DA1 = 0x4E50
-0x6DA3 = 0x3B41
-0x6DA4 = 0x3553
-0x6DA6 = 0x4873
-0x6DA7 = 0x3D27
-0x6DA8 = 0x5547
-0x6DA9 = 0x492C
-0x6DAA = 0x3822
-0x6DAB = 0x644A
-0x6DAE = 0x644C
-0x6DAF = 0x5144
-0x6DB2 = 0x523A
-0x6DB5 = 0x3A2D
-0x6DB8 = 0x3A54
-0x6DBF = 0x6443
-0x6DC0 = 0x356D
-0x6DC4 = 0x574D
-0x6DC5 = 0x6440
-0x6DC6 = 0x4F7D
-0x6DC7 = 0x643F
-0x6DCB = 0x415C
-0x6DCC = 0x4C4A
-0x6DD1 = 0x4A67
-0x6DD6 = 0x4457
-0x6DD8 = 0x4C54
-0x6DD9 = 0x6448
-0x6DDD = 0x6447
-0x6DDE = 0x6441
-0x6DE0 = 0x6444
-0x6DE1 = 0x352D
-0x6DE4 = 0x5359
-0x6DE6 = 0x6446
-0x6DEB = 0x5279
-0x6DEC = 0x3463
-0x6DEE = 0x3B34
-0x6DF1 = 0x496E
-0x6DF3 = 0x343E
-0x6DF7 = 0x3B6C
-0x6DF9 = 0x514D
-0x6DFB = 0x4C6D
-0x6DFC = 0x6D35
-0x6E05 = 0x4765
-0x6E0A = 0x5428
-0x6E0C = 0x644B
-0x6E0D = 0x5755
-0x6E0E = 0x6442
-0x6E10 = 0x3D25
-0x6E11 = 0x6445
-0x6E14 = 0x5366
-0x6E16 = 0x6449
-0x6E17 = 0x4978
-0x6E1A = 0x643E
-0x6E1D = 0x5365
-0x6E20 = 0x477E
-0x6E21 = 0x3649
-0x6E23 = 0x547C
-0x6E24 = 0x3233
-0x6E25 = 0x6457
-0x6E29 = 0x4E42
-0x6E2B = 0x644D
-0x6E2D = 0x4E3C
-0x6E2F = 0x385B
-0x6E32 = 0x6456
-0x6E34 = 0x3F4A
-0x6E38 = 0x534E
-0x6E3A = 0x436C
-0x6E43 = 0x4548
-0x6E44 = 0x6458
-0x6E4D = 0x4D44
-0x6E4E = 0x644F
-0x6E53 = 0x6454
-0x6E54 = 0x6455
-0x6E56 = 0x3A7E
-0x6E58 = 0x4F66
-0x6E5B = 0x553F
-0x6E5F = 0x6452
-0x6E6B = 0x6450
-0x6E6E = 0x644E
-0x6E7E = 0x4D65
-0x6E7F = 0x4A2A
-0x6E83 = 0x4023
-0x6E85 = 0x3D26
-0x6E86 = 0x6453
-0x6E89 = 0x3848
-0x6E8F = 0x6467
-0x6E90 = 0x5434
-0x6E98 = 0x645B
-0x6E9C = 0x416F
-0x6E9F = 0x6469
-0x6EA2 = 0x5267
-0x6EA5 = 0x645F
-0x6EA7 = 0x6460
-0x6EAA = 0x4F2A
-0x6EAF = 0x4B5D
-0x6EB1 = 0x645A
-0x6EB2 = 0x6451
-0x6EB4 = 0x6465
-0x6EB6 = 0x485C
-0x6EB7 = 0x6463
-0x6EBA = 0x4467
-0x6EBB = 0x6462
-0x6EBD = 0x6461
-0x6EC1 = 0x337C
-0x6EC2 = 0x6468
-0x6EC7 = 0x3561
-0x6ECB = 0x574C
-0x6ECF = 0x6466
-0x6ED1 = 0x3B2C
-0x6ED3 = 0x5752
-0x6ED4 = 0x4C4F
-0x6ED5 = 0x6B78
-0x6ED7 = 0x6464
-0x6EDA = 0x3976
-0x6EDE = 0x564D
-0x6EDF = 0x6459
-0x6EE0 = 0x645C
-0x6EE1 = 0x427A
-0x6EE2 = 0x645E
-0x6EE4 = 0x424B
-0x6EE5 = 0x4044
-0x6EE6 = 0x4250
-0x6EE8 = 0x3175
-0x6EE9 = 0x4C32
-0x6EF4 = 0x354E
-0x6EF9 = 0x646F
-0x6F02 = 0x462F
-0x6F06 = 0x4661
-0x6F09 = 0x6475
-0x6F0F = 0x4229
-0x6F13 = 0x406C
-0x6F14 = 0x515D
-0x6F15 = 0x646E
-0x6F20 = 0x442E
-0x6F24 = 0x646D
-0x6F29 = 0x6476
-0x6F2A = 0x6474
-0x6F2B = 0x427E
-0x6F2D = 0x645D
-0x6F2F = 0x6470
-0x6F31 = 0x4A7E
-0x6F33 = 0x5544
-0x6F36 = 0x6471
-0x6F3E = 0x517A
-0x6F46 = 0x646B
-0x6F47 = 0x646C
-0x6F4B = 0x6472
-0x6F4D = 0x4E2B
-0x6F58 = 0x454B
-0x6F5C = 0x4731
-0x6F5E = 0x423A
-0x6F62 = 0x646A
-0x6F66 = 0x414A
-0x6F6D = 0x4C36
-0x6F6E = 0x3331
-0x6F72 = 0x647B
-0x6F74 = 0x6473
-0x6F78 = 0x647A
-0x6F7A = 0x647D
-0x6F7C = 0x647C
-0x6F84 = 0x334E
-0x6F88 = 0x333A
-0x6F89 = 0x6477
-0x6F8C = 0x6479
-0x6F8D = 0x6478
-0x6F8E = 0x456C
-0x6F9C = 0x403D
-0x6FA1 = 0x5468
-0x6FA7 = 0x6522
-0x6FB3 = 0x3044
-0x6FB6 = 0x6524
-0x6FB9 = 0x6523
-0x6FC0 = 0x3C24
-0x6FC2 = 0x6525
-0x6FC9 = 0x6521
-0x6FD1 = 0x647E
-0x6FD2 = 0x3174
-0x6FDE = 0x6528
-0x6FE0 = 0x6529
-0x6FE1 = 0x6526
-0x6FEE = 0x6527
-0x6FEF = 0x652A
-0x7011 = 0x4659
-0x701A = 0x652B
-0x701B = 0x652D
-0x7023 = 0x652C
-0x7035 = 0x652F
-0x7039 = 0x652E
-0x704C = 0x3960
-0x704F = 0x6530
-0x705E = 0x6531
-0x706B = 0x3B70
-0x706C = 0x6C61
-0x706D = 0x4370
-0x706F = 0x3546
-0x7070 = 0x3B52
-0x7075 = 0x4169
-0x7076 = 0x546E
-0x7078 = 0x3E44
-0x707C = 0x5746
-0x707E = 0x5456
-0x707F = 0x3253
-0x7080 = 0x6C3E
-0x7085 = 0x6A41
-0x7089 = 0x422F
-0x708A = 0x3436
-0x708E = 0x5157
-0x7092 = 0x3334
-0x7094 = 0x4832
-0x7095 = 0x3F3B
-0x7096 = 0x6C40
-0x7099 = 0x564B
-0x709C = 0x6C3F
-0x709D = 0x6C41
-0x70AB = 0x6C45
-0x70AC = 0x3E66
-0x70AD = 0x4C3F
-0x70AE = 0x455A
-0x70AF = 0x3E3C
-0x70B1 = 0x6C46
-0x70B3 = 0x317E
-0x70B7 = 0x6C44
-0x70B8 = 0x5528
-0x70B9 = 0x3563
-0x70BB = 0x6C42
-0x70BC = 0x4136
-0x70BD = 0x3363
-0x70C0 = 0x6C43
-0x70C1 = 0x4B38
-0x70C2 = 0x4043
-0x70C3 = 0x4C7E
-0x70C8 = 0x4152
-0x70CA = 0x6C48
-0x70D8 = 0x3A66
-0x70D9 = 0x4053
-0x70DB = 0x5672
-0x70DF = 0x514C
-0x70E4 = 0x3F3E
-0x70E6 = 0x3733
-0x70E7 = 0x4955
-0x70E8 = 0x6C47
-0x70E9 = 0x3B62
-0x70EB = 0x4C4C
-0x70EC = 0x3D7D
-0x70ED = 0x4848
-0x70EF = 0x4F29
-0x70F7 = 0x4D69
-0x70F9 = 0x456B
-0x70FD = 0x3769
-0x7109 = 0x5149
-0x710A = 0x3A38
-0x7110 = 0x6C49
-0x7113 = 0x6C4A
-0x7115 = 0x3B40
-0x7116 = 0x6C4B
-0x7118 = 0x6C62
-0x7119 = 0x313A
-0x711A = 0x3759
-0x7126 = 0x3D39
-0x712F = 0x6C4C
-0x7130 = 0x5166
-0x7131 = 0x6C4D
-0x7136 = 0x483B
-0x7145 = 0x6C51
-0x714A = 0x6C53
-0x714C = 0x3B4D
-0x714E = 0x3C65
-0x715C = 0x6C4F
-0x715E = 0x4937
-0x7164 = 0x433A
-0x7166 = 0x6C63
-0x7167 = 0x5555
-0x7168 = 0x6C50
-0x716E = 0x5673
-0x7172 = 0x6C52
-0x7173 = 0x6C4E
-0x7178 = 0x6C54
-0x717A = 0x6C55
-0x717D = 0x493F
-0x7184 = 0x4F28
-0x718A = 0x505C
-0x718F = 0x512C
-0x7194 = 0x485B
-0x7198 = 0x6C56
-0x7199 = 0x4E75
-0x719F = 0x4A6C
-0x71A0 = 0x6C5A
-0x71A8 = 0x6C59
-0x71AC = 0x303E
-0x71B3 = 0x6C57
-0x71B5 = 0x6C58
-0x71B9 = 0x6C64
-0x71C3 = 0x483C
-0x71CE = 0x4147
-0x71D4 = 0x6C5C
-0x71D5 = 0x5160
-0x71E0 = 0x6C5B
-0x71E5 = 0x546F
-0x71E7 = 0x6C5D
-0x71EE = 0x5B46
-0x71F9 = 0x6C5E
-0x7206 = 0x312C
-0x721D = 0x6C5F
-0x7228 = 0x6C60
-0x722A = 0x5726
-0x722C = 0x4540
-0x7230 = 0x6B3C
-0x7231 = 0x302E
-0x7235 = 0x3E74
-0x7236 = 0x3838
-0x7237 = 0x522F
-0x7238 = 0x3056
-0x7239 = 0x3579
-0x723B = 0x5833
-0x723D = 0x4B2C
-0x723F = 0x635D
-0x7247 = 0x462C
-0x7248 = 0x3066
-0x724C = 0x4546
-0x724D = 0x6B39
-0x7252 = 0x6B3A
-0x7256 = 0x6B3B
-0x7259 = 0x5140
-0x725B = 0x4523
-0x725D = 0x6A72
-0x725F = 0x4432
-0x7261 = 0x4435
-0x7262 = 0x404E
-0x7266 = 0x6A73
-0x7267 = 0x4441
-0x7269 = 0x4E6F
-0x726E = 0x6A70
-0x726F = 0x6A74
-0x7272 = 0x497C
-0x7275 = 0x4723
-0x7279 = 0x4C58
-0x727A = 0x4E7E
-0x727E = 0x6A75
-0x727F = 0x6A76
-0x7280 = 0x4F2C
-0x7281 = 0x4067
-0x7284 = 0x6A77
-0x728A = 0x363F
-0x728B = 0x6A78
-0x728D = 0x6A79
-0x728F = 0x6A7A
-0x7292 = 0x6A7B
-0x729F = 0x6A71
-0x72AC = 0x482E
-0x72AD = 0x616B
-0x72AF = 0x3738
-0x72B0 = 0x616C
-0x72B4 = 0x616D
-0x72B6 = 0x5734
-0x72B7 = 0x616E
-0x72B8 = 0x616F
-0x72B9 = 0x534C
-0x72C1 = 0x6171
-0x72C2 = 0x3F71
-0x72C3 = 0x6170
-0x72C4 = 0x3552
-0x72C8 = 0x3137
-0x72CD = 0x6173
-0x72CE = 0x6172
-0x72D0 = 0x3A7C
-0x72D2 = 0x6174
-0x72D7 = 0x3937
-0x72D9 = 0x3E51
-0x72DE = 0x447C
-0x72E0 = 0x3A5D
-0x72E1 = 0x3D46
-0x72E8 = 0x6175
-0x72E9 = 0x6177
-0x72EC = 0x3640
-0x72ED = 0x4F41
-0x72EE = 0x4A28
-0x72EF = 0x6176
-0x72F0 = 0x5578
-0x72F1 = 0x537C
-0x72F2 = 0x6178
-0x72F3 = 0x617C
-0x72F4 = 0x6179
-0x72F7 = 0x617A
-0x72F8 = 0x406A
-0x72FA = 0x617E
-0x72FB = 0x6221
-0x72FC = 0x4047
-0x7301 = 0x617B
-0x7303 = 0x617D
-0x730A = 0x6225
-0x730E = 0x4154
-0x7313 = 0x6223
-0x7315 = 0x6228
-0x7316 = 0x327E
-0x7317 = 0x6222
-0x731B = 0x434D
-0x731C = 0x3242
-0x731D = 0x6227
-0x731E = 0x6226
-0x7321 = 0x6224
-0x7322 = 0x6229
-0x7325 = 0x622B
-0x7329 = 0x5049
-0x732A = 0x566D
-0x732B = 0x4328
-0x732C = 0x622C
-0x732E = 0x4F57
-0x7331 = 0x622E
-0x7334 = 0x3A6F
-0x7337 = 0x6960
-0x7338 = 0x622D
-0x7339 = 0x622A
-0x733E = 0x3B2B
-0x733F = 0x5433
-0x734D = 0x6230
-0x7350 = 0x622F
-0x7352 = 0x6961
-0x7357 = 0x6231
-0x7360 = 0x6232
-0x736C = 0x6233
-0x736D = 0x4C21
-0x736F = 0x6234
-0x737E = 0x6235
-0x7384 = 0x507E
-0x7387 = 0x424A
-0x7389 = 0x5371
-0x738B = 0x4D75
-0x738E = 0x6760
-0x7391 = 0x6761
-0x7396 = 0x3E41
-0x739B = 0x426A
-0x739F = 0x6764
-0x73A2 = 0x6763
-0x73A9 = 0x4D66
-0x73AB = 0x4335
-0x73AE = 0x6762
-0x73AF = 0x3B37
-0x73B0 = 0x4F56
-0x73B2 = 0x4161
-0x73B3 = 0x6769
-0x73B7 = 0x6768
-0x73BA = 0x6774
-0x73BB = 0x3223
-0x73C0 = 0x676A
-0x73C2 = 0x6766
-0x73C8 = 0x676C
-0x73C9 = 0x676B
-0x73CA = 0x493A
-0x73CD = 0x5564
-0x73CF = 0x6765
-0x73D0 = 0x3729
-0x73D1 = 0x6767
-0x73D9 = 0x676E
-0x73DE = 0x6773
-0x73E0 = 0x5669
-0x73E5 = 0x676D
-0x73E7 = 0x6772
-0x73E9 = 0x6771
-0x73ED = 0x3060
-0x73F2 = 0x6775
-0x7403 = 0x4772
-0x7405 = 0x4045
-0x7406 = 0x406D
-0x7409 = 0x4170
-0x740A = 0x6770
-0x740F = 0x6776
-0x7410 = 0x4B76
-0x741A = 0x6822
-0x741B = 0x6821
-0x7422 = 0x5741
-0x7425 = 0x677A
-0x7426 = 0x6779
-0x7428 = 0x677B
-0x742A = 0x6777
-0x742C = 0x677E
-0x742E = 0x677D
-0x7430 = 0x677C
-0x7433 = 0x4155
-0x7434 = 0x4759
-0x7435 = 0x457D
-0x7436 = 0x4543
-0x743C = 0x476D
-0x7441 = 0x6823
-0x7455 = 0x6826
-0x7457 = 0x6825
-0x7459 = 0x6827
-0x745A = 0x3A77
-0x745B = 0x6778
-0x745C = 0x6824
-0x745E = 0x4870
-0x745F = 0x492A
-0x746D = 0x6829
-0x7470 = 0x3965
-0x7476 = 0x517E
-0x7477 = 0x6828
-0x747E = 0x682A
-0x7480 = 0x682D
-0x7481 = 0x682E
-0x7483 = 0x4127
-0x7487 = 0x682F
-0x748B = 0x6830
-0x748E = 0x682C
-0x7490 = 0x6834
-0x749C = 0x682B
-0x749E = 0x6831
-0x74A7 = 0x6835
-0x74A8 = 0x6832
-0x74A9 = 0x6833
-0x74BA = 0x6837
-0x74D2 = 0x6836
-0x74DC = 0x394F
-0x74DE = 0x702C
-0x74E0 = 0x702D
-0x74E2 = 0x4630
-0x74E3 = 0x306A
-0x74E4 = 0x483F
-0x74E6 = 0x4D5F
-0x74EE = 0x4E4D
-0x74EF = 0x6A31
-0x74F4 = 0x6A32
-0x74F6 = 0x463F
-0x74F7 = 0x3449
-0x74FF = 0x6A33
-0x7504 = 0x5567
-0x750D = 0x5D79
-0x750F = 0x6A34
-0x7511 = 0x6A35
-0x7513 = 0x6A36
-0x7518 = 0x384A
-0x7519 = 0x5F30
-0x751A = 0x4975
-0x751C = 0x4C70
-0x751F = 0x497A
-0x7525 = 0x497B
-0x7528 = 0x5343
-0x7529 = 0x4B26
-0x752B = 0x3826
-0x752C = 0x702E
-0x752D = 0x3142
-0x752F = 0x6538
-0x7530 = 0x4C6F
-0x7531 = 0x5349
-0x7532 = 0x3C57
-0x7533 = 0x496A
-0x7535 = 0x3567
-0x7537 = 0x4450
-0x7538 = 0x3569
-0x753A = 0x6E2E
-0x753B = 0x3B2D
-0x753E = 0x675E
-0x7540 = 0x6E2F
-0x7545 = 0x3329
-0x7548 = 0x6E32
-0x754B = 0x6E31
-0x754C = 0x3D67
-0x754E = 0x6E30
-0x754F = 0x4E37
-0x7554 = 0x454F
-0x7559 = 0x4174
-0x755A = 0x5B4E
-0x755B = 0x6E33
-0x755C = 0x5073
-0x7565 = 0x4254
-0x7566 = 0x4668
-0x756A = 0x372C
-0x7572 = 0x6E34
-0x7574 = 0x336B
-0x7578 = 0x3B7B
-0x7579 = 0x6E35
-0x757F = 0x675C
-0x7583 = 0x6E36
-0x7586 = 0x3D2E
-0x758B = 0x7162
-0x758F = 0x4A68
-0x7591 = 0x5249
-0x7592 = 0x705A
-0x7594 = 0x705B
-0x7596 = 0x705C
-0x7597 = 0x4146
-0x7599 = 0x386D
-0x759A = 0x3E4E
-0x759D = 0x705E
-0x759F = 0x4531
-0x75A0 = 0x705D
-0x75A1 = 0x5171
-0x75A3 = 0x7060
-0x75A4 = 0x304C
-0x75A5 = 0x3D6A
-0x75AB = 0x525F
-0x75AC = 0x705F
-0x75AE = 0x342F
-0x75AF = 0x3768
-0x75B0 = 0x7066
-0x75B1 = 0x7065
-0x75B2 = 0x4623
-0x75B3 = 0x7061
-0x75B4 = 0x7062
-0x75B5 = 0x3443
-0x75B8 = 0x7063
-0x75B9 = 0x556E
-0x75BC = 0x4C5B
-0x75BD = 0x3E52
-0x75BE = 0x3C32
-0x75C2 = 0x7068
-0x75C3 = 0x7067
-0x75C4 = 0x7064
-0x75C5 = 0x3221
-0x75C7 = 0x5622
-0x75C8 = 0x5338
-0x75C9 = 0x3E37
-0x75CA = 0x482C
-0x75CD = 0x706A
-0x75D2 = 0x5177
-0x75D4 = 0x564C
-0x75D5 = 0x3A5B
-0x75D6 = 0x7069
-0x75D8 = 0x363B
-0x75DB = 0x4D34
-0x75DE = 0x4626
-0x75E2 = 0x4121
-0x75E3 = 0x706B
-0x75E4 = 0x706E
-0x75E6 = 0x706D
-0x75E7 = 0x7070
-0x75E8 = 0x706C
-0x75EA = 0x3B3E
-0x75EB = 0x706F
-0x75F0 = 0x4C35
-0x75F1 = 0x7072
-0x75F4 = 0x3355
-0x75F9 = 0x3154
-0x75FC = 0x7073
-0x75FF = 0x7074
-0x7600 = 0x7076
-0x7601 = 0x3461
-0x7603 = 0x7071
-0x7605 = 0x7077
-0x760A = 0x707A
-0x760C = 0x7078
-0x7610 = 0x7075
-0x7615 = 0x707D
-0x7617 = 0x7079
-0x7618 = 0x707C
-0x7619 = 0x707E
-0x761B = 0x7121
-0x761F = 0x4E41
-0x7620 = 0x7124
-0x7622 = 0x7123
-0x7624 = 0x4176
-0x7625 = 0x707B
-0x7626 = 0x4A5D
-0x7629 = 0x3471
-0x762A = 0x3171
-0x762B = 0x4C31
-0x762D = 0x7126
-0x7630 = 0x7127
-0x7633 = 0x712C
-0x7634 = 0x554E
-0x7635 = 0x7129
-0x7638 = 0x4833
-0x763C = 0x7122
-0x763E = 0x712B
-0x763F = 0x7128
-0x7640 = 0x7125
-0x7643 = 0x712A
-0x764C = 0x3029
-0x764D = 0x712D
-0x7654 = 0x712F
-0x7656 = 0x7131
-0x765C = 0x7130
-0x765E = 0x712E
-0x7663 = 0x5122
-0x766B = 0x7132
-0x766F = 0x7133
-0x7678 = 0x396F
-0x767B = 0x3547
-0x767D = 0x3057
-0x767E = 0x3059
-0x7682 = 0x546D
-0x7684 = 0x3544
-0x7686 = 0x3D54
-0x7687 = 0x3B4A
-0x7688 = 0x7027
-0x768B = 0x385E
-0x768E = 0x7028
-0x7691 = 0x3028
-0x7693 = 0x7029
-0x7696 = 0x4D6E
-0x7699 = 0x702A
-0x76A4 = 0x702B
-0x76AE = 0x4624
-0x76B1 = 0x5665
-0x76B2 = 0x7164
-0x76B4 = 0x7165
-0x76BF = 0x4373
-0x76C2 = 0x535B
-0x76C5 = 0x5651
-0x76C6 = 0x4568
-0x76C8 = 0x532F
-0x76CA = 0x5266
-0x76CD = 0x6E41
-0x76CE = 0x303B
-0x76CF = 0x5535
-0x76D0 = 0x514E
-0x76D1 = 0x3C60
-0x76D2 = 0x3A50
-0x76D4 = 0x3F78
-0x76D6 = 0x3847
-0x76D7 = 0x3541
-0x76D8 = 0x454C
-0x76DB = 0x4A22
-0x76DF = 0x434B
-0x76E5 = 0x6E42
-0x76EE = 0x443F
-0x76EF = 0x3622
-0x76F1 = 0x6D6C
-0x76F2 = 0x4324
-0x76F4 = 0x5631
-0x76F8 = 0x4F60
-0x76F9 = 0x6D6F
-0x76FC = 0x454E
-0x76FE = 0x365C
-0x7701 = 0x4A21
-0x7704 = 0x6D6D
-0x7707 = 0x6D70
-0x7708 = 0x6D71
-0x7709 = 0x433C
-0x770B = 0x3F34
-0x770D = 0x6D6E
-0x7719 = 0x6D74
-0x771A = 0x6D72
-0x771F = 0x5566
-0x7720 = 0x435F
-0x7722 = 0x6D73
-0x7726 = 0x6D76
-0x7728 = 0x5523
-0x7729 = 0x5123
-0x772D = 0x6D75
-0x772F = 0x4350
-0x7735 = 0x6D77
-0x7736 = 0x3F74
-0x7737 = 0x3E6C
-0x7738 = 0x6D78
-0x773A = 0x4C77
-0x773C = 0x515B
-0x7740 = 0x5745
-0x7741 = 0x5576
-0x7743 = 0x6D7C
-0x7747 = 0x6D7B
-0x7750 = 0x6D79
-0x7751 = 0x6D7A
-0x775A = 0x6D7D
-0x775B = 0x3E26
-0x7761 = 0x4B2F
-0x7762 = 0x6E21
-0x7763 = 0x363D
-0x7765 = 0x6E22
-0x7766 = 0x4440
-0x7768 = 0x6D7E
-0x776B = 0x3D5E
-0x776C = 0x3247
-0x7779 = 0x3643
-0x777D = 0x6E25
-0x777E = 0x583A
-0x777F = 0x6E23
-0x7780 = 0x6E26
-0x7784 = 0x4369
-0x7785 = 0x3372
-0x778C = 0x6E27
-0x778D = 0x6E24
-0x778E = 0x4F39
-0x7791 = 0x6E28
-0x7792 = 0x4277
-0x779F = 0x6E29
-0x77A0 = 0x6E2A
-0x77A2 = 0x5E2B
-0x77A5 = 0x4633
-0x77A7 = 0x4746
-0x77A9 = 0x5675
-0x77AA = 0x3549
-0x77AC = 0x4B32
-0x77B0 = 0x6E2B
-0x77B3 = 0x4D2B
-0x77B5 = 0x6E2C
-0x77BB = 0x5530
-0x77BD = 0x6E2D
-0x77BF = 0x7644
-0x77CD = 0x5B47
-0x77D7 = 0x3423
-0x77DB = 0x432C
-0x77DC = 0x7166
-0x77E2 = 0x4A38
-0x77E3 = 0x5253
-0x77E5 = 0x562A
-0x77E7 = 0x6F72
-0x77E9 = 0x3E58
-0x77EB = 0x3D43
-0x77EC = 0x6F73
-0x77ED = 0x364C
-0x77EE = 0x302B
-0x77F3 = 0x4A2F
-0x77F6 = 0x6D36
-0x77F8 = 0x6D37
-0x77FD = 0x4E79
-0x77FE = 0x372F
-0x77FF = 0x3F73
-0x7800 = 0x6D38
-0x7801 = 0x426B
-0x7802 = 0x4930
-0x7809 = 0x6D39
-0x780C = 0x4676
-0x780D = 0x3F33
-0x7811 = 0x6D3C
-0x7812 = 0x4578
-0x7814 = 0x5150
-0x7816 = 0x5729
-0x7817 = 0x6D3A
-0x7818 = 0x6D3B
-0x781A = 0x5162
-0x781C = 0x6D3F
-0x781D = 0x6D40
-0x781F = 0x6D44
-0x7823 = 0x6D48
-0x7825 = 0x6D46
-0x7826 = 0x6D4E
-0x7827 = 0x5568
-0x7829 = 0x6D49
-0x782C = 0x6D47
-0x782D = 0x6D3E
-0x7830 = 0x4569
-0x7834 = 0x4646
-0x7837 = 0x4969
-0x7838 = 0x5452
-0x7839 = 0x6D41
-0x783A = 0x6D42
-0x783B = 0x6D43
-0x783C = 0x6D45
-0x783E = 0x4079
-0x7840 = 0x3421
-0x7845 = 0x3968
-0x7847 = 0x6D50
-0x784C = 0x6D51
-0x784E = 0x6D4A
-0x7850 = 0x6D4F
-0x7852 = 0x4E78
-0x7855 = 0x4B36
-0x7856 = 0x6D4C
-0x7857 = 0x6D4D
-0x785D = 0x4F75
-0x786A = 0x6D52
-0x786B = 0x4172
-0x786C = 0x5332
-0x786D = 0x6D4B
-0x786E = 0x4837
-0x7877 = 0x3C6F
-0x787C = 0x4570
-0x7887 = 0x6D56
-0x7889 = 0x356F
-0x788C = 0x4235
-0x788D = 0x302D
-0x788E = 0x4B69
-0x7891 = 0x312E
-0x7893 = 0x6D54
-0x7897 = 0x4D6B
-0x7898 = 0x3562
-0x789A = 0x6D55
-0x789B = 0x6D53
-0x789C = 0x6D57
-0x789F = 0x357A
-0x78A1 = 0x6D58
-0x78A3 = 0x6D59
-0x78A5 = 0x6D5C
-0x78A7 = 0x314C
-0x78B0 = 0x4576
-0x78B1 = 0x3C6E
-0x78B2 = 0x6D5A
-0x78B3 = 0x4C3C
-0x78B4 = 0x326A
-0x78B9 = 0x6D5B
-0x78BE = 0x446B
-0x78C1 = 0x3445
-0x78C5 = 0x3075
-0x78C9 = 0x6D5F
-0x78CA = 0x405A
-0x78CB = 0x3468
-0x78D0 = 0x454D
-0x78D4 = 0x6D5D
-0x78D5 = 0x3F44
-0x78D9 = 0x6D5E
-0x78E8 = 0x4425
-0x78EC = 0x6D60
-0x78F2 = 0x6D61
-0x78F4 = 0x6D63
-0x78F7 = 0x4157
-0x78FA = 0x3B47
-0x7901 = 0x3D38
-0x7905 = 0x6D62
-0x7913 = 0x6D64
-0x791E = 0x6D66
-0x7924 = 0x6D65
-0x7934 = 0x6D67
-0x793A = 0x4A3E
-0x793B = 0x6C6A
-0x793C = 0x4071
-0x793E = 0x4967
-0x7940 = 0x6C6B
-0x7941 = 0x466E
-0x7946 = 0x6C6C
-0x7948 = 0x466D
-0x7949 = 0x6C6D
-0x7953 = 0x6C70
-0x7956 = 0x5766
-0x7957 = 0x6C73
-0x795A = 0x6C71
-0x795B = 0x6C6E
-0x795C = 0x6C6F
-0x795D = 0x5723
-0x795E = 0x4971
-0x795F = 0x4B6E
-0x7960 = 0x6C74
-0x7962 = 0x6C72
-0x7965 = 0x4F69
-0x7967 = 0x6C76
-0x7968 = 0x4631
-0x796D = 0x3C40
-0x796F = 0x6C75
-0x7977 = 0x353B
-0x7978 = 0x3B76
-0x797A = 0x6C77
-0x7980 = 0x5977
-0x7981 = 0x3D7B
-0x7984 = 0x423B
-0x7985 = 0x6C78
-0x798A = 0x6C79
-0x798F = 0x3823
-0x799A = 0x6C7A
-0x79A7 = 0x6C7B
-0x79B3 = 0x6C7C
-0x79B9 = 0x536D
-0x79BA = 0x582E
-0x79BB = 0x406B
-0x79BD = 0x475D
-0x79BE = 0x3A4C
-0x79C0 = 0x5063
-0x79C1 = 0x4B3D
-0x79C3 = 0x4D3A
-0x79C6 = 0x3851
-0x79C9 = 0x317C
-0x79CB = 0x476F
-0x79CD = 0x5656
-0x79D1 = 0x3F46
-0x79D2 = 0x436B
-0x79D5 = 0x6F75
-0x79D8 = 0x4358
-0x79DF = 0x5762
-0x79E3 = 0x6F77
-0x79E4 = 0x3353
-0x79E6 = 0x4758
-0x79E7 = 0x516D
-0x79E9 = 0x5648
-0x79EB = 0x6F78
-0x79ED = 0x6F76
-0x79EF = 0x3B7D
-0x79F0 = 0x3346
-0x79F8 = 0x3D55
-0x79FB = 0x5246
-0x79FD = 0x3B60
-0x7A00 = 0x4F21
-0x7A02 = 0x6F7C
-0x7A03 = 0x6F7B
-0x7A06 = 0x6F79
-0x7A0B = 0x334C
-0x7A0D = 0x4954
-0x7A0E = 0x4B30
-0x7A14 = 0x6F7E
-0x7A17 = 0x305E
-0x7A1A = 0x5649
-0x7A1E = 0x6F7D
-0x7A20 = 0x336D
-0x7A23 = 0x7655
-0x7A33 = 0x4E48
-0x7A37 = 0x7022
-0x7A39 = 0x7021
-0x7A3B = 0x353E
-0x7A3C = 0x3C5A
-0x7A3D = 0x3B7C
-0x7A3F = 0x3865
-0x7A46 = 0x4442
-0x7A51 = 0x7023
-0x7A57 = 0x4B6B
-0x7A70 = 0x7026
-0x7A74 = 0x5128
-0x7A76 = 0x3E3F
-0x7A77 = 0x476E
-0x7A78 = 0x7136
-0x7A79 = 0x7137
-0x7A7A = 0x3F55
-0x7A7F = 0x3429
-0x7A80 = 0x7138
-0x7A81 = 0x4D3B
-0x7A83 = 0x4754
-0x7A84 = 0x552D
-0x7A86 = 0x7139
-0x7A88 = 0x713A
-0x7A8D = 0x474F
-0x7A91 = 0x5224
-0x7A92 = 0x564F
-0x7A95 = 0x713B
-0x7A96 = 0x3D51
-0x7A97 = 0x3430
-0x7A98 = 0x3E3D
-0x7A9C = 0x345C
-0x7A9D = 0x4E51
-0x7A9F = 0x3F5F
-0x7AA0 = 0x713D
-0x7AA5 = 0x3F7A
-0x7AA6 = 0x713C
-0x7AA8 = 0x713F
-0x7AAC = 0x713E
-0x7AAD = 0x7140
-0x7AB3 = 0x7141
-0x7ABF = 0x417E
-0x7ACB = 0x4122
-0x7AD6 = 0x4A7A
-0x7AD9 = 0x553E
-0x7ADE = 0x3E3A
-0x7ADF = 0x3E39
-0x7AE0 = 0x5542
-0x7AE3 = 0x3F22
-0x7AE5 = 0x4D2F
-0x7AE6 = 0x7135
-0x7AED = 0x3D5F
-0x7AEF = 0x364B
-0x7AF9 = 0x5671
-0x7AFA = 0x7343
-0x7AFD = 0x7344
-0x7AFF = 0x384D
-0x7B03 = 0x7346
-0x7B04 = 0x7347
-0x7B06 = 0x304A
-0x7B08 = 0x7345
-0x7B0A = 0x7349
-0x7B0B = 0x4B71
-0x7B0F = 0x734B
-0x7B11 = 0x5026
-0x7B14 = 0x314A
-0x7B15 = 0x7348
-0x7B19 = 0x734F
-0x7B1B = 0x3551
-0x7B1E = 0x7357
-0x7B20 = 0x7352
-0x7B24 = 0x7354
-0x7B25 = 0x7353
-0x7B26 = 0x377B
-0x7B28 = 0x313F
-0x7B2A = 0x734E
-0x7B2B = 0x734A
-0x7B2C = 0x355A
-0x7B2E = 0x7350
-0x7B31 = 0x7351
-0x7B33 = 0x7355
-0x7B38 = 0x734D
-0x7B3A = 0x3C63
-0x7B3C = 0x417D
-0x7B3E = 0x7356
-0x7B45 = 0x735A
-0x7B47 = 0x734C
-0x7B49 = 0x3548
-0x7B4B = 0x3D6E
-0x7B4C = 0x735C
-0x7B4F = 0x3724
-0x7B50 = 0x3F70
-0x7B51 = 0x567E
-0x7B52 = 0x4D32
-0x7B54 = 0x3470
-0x7B56 = 0x325F
-0x7B58 = 0x7358
-0x7B5A = 0x7359
-0x7B5B = 0x4938
-0x7B5D = 0x735D
-0x7B60 = 0x735E
-0x7B62 = 0x7361
-0x7B6E = 0x735F
-0x7B71 = 0x7363
-0x7B72 = 0x7362
-0x7B75 = 0x735B
-0x7B77 = 0x3F6A
-0x7B79 = 0x336F
-0x7B7B = 0x7360
-0x7B7E = 0x4729
-0x7B80 = 0x3C72
-0x7B85 = 0x736B
-0x7B8D = 0x393F
-0x7B90 = 0x7364
-0x7B94 = 0x322D
-0x7B95 = 0x3B7E
-0x7B97 = 0x4B63
-0x7B9C = 0x736D
-0x7B9D = 0x7369
-0x7BA1 = 0x395C
-0x7BA2 = 0x736E
-0x7BA6 = 0x7365
-0x7BA7 = 0x7366
-0x7BA8 = 0x736A
-0x7BA9 = 0x4261
-0x7BAA = 0x736C
-0x7BAB = 0x736F
-0x7BAC = 0x7368
-0x7BAD = 0x3C7D
-0x7BB1 = 0x4F64
-0x7BB4 = 0x7370
-0x7BB8 = 0x7367
-0x7BC1 = 0x7372
-0x7BC6 = 0x572D
-0x7BC7 = 0x462A
-0x7BCC = 0x7373
-0x7BD1 = 0x7371
-0x7BD3 = 0x4228
-0x7BD9 = 0x385D
-0x7BDA = 0x7375
-0x7BDD = 0x7374
-0x7BE1 = 0x345B
-0x7BE5 = 0x7376
-0x7BE6 = 0x7377
-0x7BEA = 0x7378
-0x7BEE = 0x403A
-0x7BF1 = 0x4069
-0x7BF7 = 0x4571
-0x7BFC = 0x737B
-0x7BFE = 0x737A
-0x7C07 = 0x3458
-0x7C0B = 0x737E
-0x7C0C = 0x7379
-0x7C0F = 0x737C
-0x7C16 = 0x737D
-0x7C1F = 0x7421
-0x7C26 = 0x7423
-0x7C27 = 0x3B49
-0x7C2A = 0x7422
-0x7C38 = 0x7424
-0x7C3F = 0x323E
-0x7C40 = 0x7426
-0x7C41 = 0x7425
-0x7C4D = 0x3C2E
-0x7C73 = 0x4357
-0x7C74 = 0x5961
-0x7C7B = 0x4060
-0x7C7C = 0x744C
-0x7C7D = 0x5751
-0x7C89 = 0x375B
-0x7C91 = 0x744E
-0x7C92 = 0x4123
-0x7C95 = 0x4649
-0x7C97 = 0x3456
-0x7C98 = 0x5533
-0x7C9C = 0x7450
-0x7C9D = 0x744F
-0x7C9E = 0x7451
-0x7C9F = 0x4B5A
-0x7CA2 = 0x7452
-0x7CA4 = 0x5441
-0x7CA5 = 0x5660
-0x7CAA = 0x3760
-0x7CAE = 0x4138
-0x7CB1 = 0x413B
-0x7CB2 = 0x7453
-0x7CB3 = 0x3E2C
-0x7CB9 = 0x3462
-0x7CBC = 0x7454
-0x7CBD = 0x7455
-0x7CBE = 0x3E2B
-0x7CC1 = 0x7456
-0x7CC5 = 0x745B
-0x7CC7 = 0x7457
-0x7CC8 = 0x745A
-0x7CCA = 0x3A7D
-0x7CCC = 0x7458
-0x7CCD = 0x7459
-0x7CD5 = 0x3862
-0x7CD6 = 0x4C47
-0x7CD7 = 0x745C
-0x7CD9 = 0x325A
-0x7CDC = 0x4353
-0x7CDF = 0x5463
-0x7CE0 = 0x3F37
-0x7CE8 = 0x745D
-0x7CEF = 0x4534
-0x7CF8 = 0x7469
-0x7CFB = 0x4F35
-0x7D0A = 0x4E49
-0x7D20 = 0x4B58
-0x7D22 = 0x4B77
-0x7D27 = 0x3D74
-0x7D2B = 0x574F
-0x7D2F = 0x405B
-0x7D6E = 0x5075
-0x7D77 = 0x746A
-0x7DA6 = 0x746B
-0x7DAE = 0x746C
-0x7E3B = 0x7763
-0x7E41 = 0x3731
-0x7E47 = 0x746D
-0x7E82 = 0x576B
-0x7E9B = 0x746E
-0x7E9F = 0x6679
-0x7EA0 = 0x3E40
-0x7EA1 = 0x667A
-0x7EA2 = 0x3A6C
-0x7EA3 = 0x667B
-0x7EA4 = 0x4F4B
-0x7EA5 = 0x667C
-0x7EA6 = 0x543C
-0x7EA7 = 0x3C36
-0x7EA8 = 0x667D
-0x7EA9 = 0x667E
-0x7EAA = 0x3C4D
-0x7EAB = 0x4852
-0x7EAC = 0x4E33
-0x7EAD = 0x6721
-0x7EAF = 0x343F
-0x7EB0 = 0x6722
-0x7EB1 = 0x4934
-0x7EB2 = 0x3859
-0x7EB3 = 0x4449
-0x7EB5 = 0x575D
-0x7EB6 = 0x425A
-0x7EB7 = 0x3757
-0x7EB8 = 0x563D
-0x7EB9 = 0x4E46
-0x7EBA = 0x3744
-0x7EBD = 0x4526
-0x7EBE = 0x6723
-0x7EBF = 0x4F5F
-0x7EC0 = 0x6724
-0x7EC1 = 0x6725
-0x7EC2 = 0x6726
-0x7EC3 = 0x4137
-0x7EC4 = 0x5769
-0x7EC5 = 0x4970
-0x7EC6 = 0x4F38
-0x7EC7 = 0x562F
-0x7EC8 = 0x5655
-0x7EC9 = 0x6727
-0x7ECA = 0x306D
-0x7ECB = 0x6728
-0x7ECC = 0x6729
-0x7ECD = 0x495C
-0x7ECE = 0x526F
-0x7ECF = 0x3E2D
-0x7ED0 = 0x672A
-0x7ED1 = 0x3073
-0x7ED2 = 0x485E
-0x7ED3 = 0x3D61
-0x7ED4 = 0x672B
-0x7ED5 = 0x4846
-0x7ED7 = 0x672C
-0x7ED8 = 0x3B66
-0x7ED9 = 0x3878
-0x7EDA = 0x5124
-0x7EDB = 0x672D
-0x7EDC = 0x4267
-0x7EDD = 0x3E78
-0x7EDE = 0x3D4A
-0x7EDF = 0x4D33
-0x7EE0 = 0x672E
-0x7EE1 = 0x672F
-0x7EE2 = 0x3E6E
-0x7EE3 = 0x5065
-0x7EE5 = 0x4B67
-0x7EE6 = 0x4C50
-0x7EE7 = 0x3C4C
-0x7EE8 = 0x6730
-0x7EE9 = 0x3C28
-0x7EEA = 0x5077
-0x7EEB = 0x6731
-0x7EED = 0x5078
-0x7EEE = 0x6732
-0x7EEF = 0x6733
-0x7EF0 = 0x3442
-0x7EF1 = 0x6734
-0x7EF2 = 0x6735
-0x7EF3 = 0x497E
-0x7EF4 = 0x4E2C
-0x7EF5 = 0x4360
-0x7EF6 = 0x6737
-0x7EF7 = 0x3141
-0x7EF8 = 0x3371
-0x7EFA = 0x6738
-0x7EFB = 0x6739
-0x7EFC = 0x575B
-0x7EFD = 0x5540
-0x7EFE = 0x673A
-0x7EFF = 0x424C
-0x7F00 = 0x573A
-0x7F01 = 0x673B
-0x7F02 = 0x673C
-0x7F03 = 0x673D
-0x7F04 = 0x3C6A
-0x7F05 = 0x4365
-0x7F06 = 0x4042
-0x7F07 = 0x673E
-0x7F08 = 0x673F
-0x7F09 = 0x3C29
-0x7F0B = 0x6740
-0x7F0C = 0x6741
-0x7F0D = 0x6736
-0x7F0E = 0x3650
-0x7F0F = 0x6742
-0x7F11 = 0x6743
-0x7F12 = 0x6744
-0x7F13 = 0x3B3A
-0x7F14 = 0x355E
-0x7F15 = 0x4246
-0x7F16 = 0x3160
-0x7F17 = 0x6745
-0x7F18 = 0x5435
-0x7F19 = 0x6746
-0x7F1A = 0x383F
-0x7F1B = 0x6748
-0x7F1C = 0x6747
-0x7F1D = 0x376C
-0x7F1F = 0x6749
-0x7F20 = 0x3278
-0x7F21 = 0x674A
-0x7F22 = 0x674B
-0x7F23 = 0x674C
-0x7F24 = 0x674D
-0x7F25 = 0x674E
-0x7F26 = 0x674F
-0x7F27 = 0x6750
-0x7F28 = 0x5327
-0x7F29 = 0x4B75
-0x7F2A = 0x6751
-0x7F2B = 0x6752
-0x7F2C = 0x6753
-0x7F2D = 0x6754
-0x7F2E = 0x4949
-0x7F2F = 0x6755
-0x7F30 = 0x6756
-0x7F31 = 0x6757
-0x7F32 = 0x6758
-0x7F33 = 0x6759
-0x7F34 = 0x3D49
-0x7F35 = 0x675A
-0x7F36 = 0x733E
-0x7F38 = 0x3857
-0x7F3A = 0x4831
-0x7F42 = 0x733F
-0x7F44 = 0x7340
-0x7F45 = 0x7341
-0x7F50 = 0x395E
-0x7F51 = 0x4D78
-0x7F54 = 0x5868
-0x7F55 = 0x3A31
-0x7F57 = 0x425E
-0x7F58 = 0x6E37
-0x7F5A = 0x3723
-0x7F5F = 0x6E39
-0x7F61 = 0x6E38
-0x7F62 = 0x3055
-0x7F68 = 0x6E3B
-0x7F69 = 0x5556
-0x7F6A = 0x576F
-0x7F6E = 0x5643
-0x7F71 = 0x6E3D
-0x7F72 = 0x4A70
-0x7F74 = 0x6E3C
-0x7F79 = 0x6E3E
-0x7F7E = 0x6E40
-0x7F81 = 0x6E3F
-0x7F8A = 0x5172
-0x7F8C = 0x473C
-0x7F8E = 0x4340
-0x7F94 = 0x3861
-0x7F9A = 0x4167
-0x7F9D = 0x7446
-0x7F9E = 0x505F
-0x7F9F = 0x7447
-0x7FA1 = 0x4F5B
-0x7FA4 = 0x483A
-0x7FA7 = 0x7448
-0x7FAF = 0x7449
-0x7FB0 = 0x744A
-0x7FB2 = 0x744B
-0x7FB8 = 0x597A
-0x7FB9 = 0x387E
-0x7FBC = 0x6571
-0x7FBD = 0x5370
-0x7FBF = 0x7460
-0x7FC1 = 0x4E4C
-0x7FC5 = 0x3361
-0x7FCA = 0x7134
-0x7FCC = 0x526E
-0x7FCE = 0x7461
-0x7FD4 = 0x4F68
-0x7FD5 = 0x7462
-0x7FD8 = 0x474C
-0x7FDF = 0x3554
-0x7FE0 = 0x3464
-0x7FE1 = 0x7464
-0x7FE5 = 0x7463
-0x7FE6 = 0x7465
-0x7FE9 = 0x7466
-0x7FEE = 0x7467
-0x7FF0 = 0x3A32
-0x7FF1 = 0x303F
-0x7FF3 = 0x7468
-0x7FFB = 0x372D
-0x7FFC = 0x526D
-0x8000 = 0x522B
-0x8001 = 0x404F
-0x8003 = 0x3F3C
-0x8004 = 0x6B23
-0x8005 = 0x555F
-0x8006 = 0x6A48
-0x800B = 0x7173
-0x800C = 0x3678
-0x800D = 0x4B23
-0x8010 = 0x444D
-0x8012 = 0x7167
-0x8014 = 0x7168
-0x8015 = 0x387B
-0x8016 = 0x7169
-0x8017 = 0x3A44
-0x8018 = 0x5445
-0x8019 = 0x3052
-0x801C = 0x716A
-0x8020 = 0x716B
-0x8022 = 0x716C
-0x8025 = 0x716D
-0x8026 = 0x716E
-0x8027 = 0x716F
-0x8028 = 0x7171
-0x8029 = 0x7170
-0x802A = 0x4555
-0x8031 = 0x7172
-0x8033 = 0x367A
-0x8035 = 0x7174
-0x8036 = 0x522E
-0x8037 = 0x5E47
-0x8038 = 0x4B4A
-0x803B = 0x335C
-0x803D = 0x3522
-0x803F = 0x3922
-0x8042 = 0x4474
-0x8043 = 0x7175
-0x8046 = 0x7176
-0x804A = 0x4144
-0x804B = 0x417B
-0x804C = 0x5630
-0x804D = 0x7177
-0x8052 = 0x7178
-0x8054 = 0x412A
-0x8058 = 0x4638
-0x805A = 0x3E5B
-0x8069 = 0x7179
-0x806A = 0x344F
-0x8071 = 0x717A
-0x807F = 0x6D32
-0x8080 = 0x6D31
-0x8083 = 0x4B60
-0x8084 = 0x525E
-0x8086 = 0x4B41
-0x8087 = 0x5558
-0x8089 = 0x4862
-0x808B = 0x405F
-0x808C = 0x3C21
-0x8093 = 0x6B41
-0x8096 = 0x5024
-0x8098 = 0x5662
-0x809A = 0x3647
-0x809B = 0x3858
-0x809C = 0x6B40
-0x809D = 0x384E
-0x809F = 0x6B3F
-0x80A0 = 0x3326
-0x80A1 = 0x3949
-0x80A2 = 0x562B
-0x80A4 = 0x3774
-0x80A5 = 0x374A
-0x80A9 = 0x3C67
-0x80AA = 0x373E
-0x80AB = 0x6B46
-0x80AD = 0x6B47
-0x80AE = 0x3039
-0x80AF = 0x3F4F
-0x80B1 = 0x6B45
-0x80B2 = 0x537D
-0x80B4 = 0x6B48
-0x80B7 = 0x6B49
-0x80BA = 0x374E
-0x80BC = 0x6B42
-0x80BD = 0x6B44
-0x80BE = 0x4976
-0x80BF = 0x5657
-0x80C0 = 0x554D
-0x80C1 = 0x5032
-0x80C2 = 0x6B4F
-0x80C3 = 0x4E38
-0x80C4 = 0x6B50
-0x80C6 = 0x3528
-0x80CC = 0x3133
-0x80CD = 0x6B52
-0x80CE = 0x4C25
-0x80D6 = 0x4556
-0x80D7 = 0x6B53
-0x80D9 = 0x6B51
-0x80DA = 0x455F
-0x80DB = 0x6B4E
-0x80DC = 0x4A24
-0x80DD = 0x6B55
-0x80DE = 0x307B
-0x80E1 = 0x3A7A
-0x80E4 = 0x5837
-0x80E5 = 0x7163
-0x80E7 = 0x6B4A
-0x80E8 = 0x6B4B
-0x80E9 = 0x6B4C
-0x80EA = 0x6B4D
-0x80EB = 0x6B56
-0x80EC = 0x6640
-0x80ED = 0x6B59
-0x80EF = 0x3F68
-0x80F0 = 0x5248
-0x80F1 = 0x6B57
-0x80F2 = 0x6B5C
-0x80F3 = 0x386C
-0x80F4 = 0x6B58
-0x80F6 = 0x3D3A
-0x80F8 = 0x5058
-0x80FA = 0x3037
-0x80FC = 0x6B5D
-0x80FD = 0x445C
-0x8102 = 0x562C
-0x8106 = 0x3460
-0x8109 = 0x4276
-0x810A = 0x3C39
-0x810D = 0x6B5A
-0x810E = 0x6B5B
-0x810F = 0x5460
-0x8110 = 0x466A
-0x8111 = 0x4454
-0x8112 = 0x6B5F
-0x8113 = 0x4527
-0x8114 = 0x5975
-0x8116 = 0x3231
-0x8118 = 0x6B64
-0x811A = 0x3D45
-0x811E = 0x6B62
-0x812C = 0x6B63
-0x812F = 0x382C
-0x8131 = 0x4D51
-0x8132 = 0x6B65
-0x8136 = 0x6B61
-0x8138 = 0x4133
-0x813E = 0x4622
-0x8146 = 0x4C73
-0x8148 = 0x6B66
-0x814A = 0x4030
-0x814B = 0x5238
-0x814C = 0x6B67
-0x8150 = 0x382F
-0x8151 = 0x382D
-0x8153 = 0x6B68
-0x8154 = 0x473B
-0x8155 = 0x4D73
-0x8159 = 0x6B6A
-0x815A = 0x6B6B
-0x8160 = 0x6B6D
-0x8165 = 0x5048
-0x8167 = 0x6B72
-0x8169 = 0x6B6E
-0x816D = 0x6B71
-0x816E = 0x4879
-0x8170 = 0x517C
-0x8171 = 0x6B6C
-0x8174 = 0x6B69
-0x8179 = 0x3839
-0x817A = 0x4F59
-0x817B = 0x4465
-0x817C = 0x6B6F
-0x817D = 0x6B70
-0x817E = 0x4C5A
-0x817F = 0x4D48
-0x8180 = 0x3072
-0x8182 = 0x6B76
-0x8188 = 0x6B75
-0x818A = 0x3232
-0x818F = 0x3860
-0x8191 = 0x6B77
-0x8198 = 0x316C
-0x819B = 0x4C45
-0x819C = 0x4424
-0x819D = 0x4F25
-0x81A3 = 0x6B79
-0x81A6 = 0x6C22
-0x81A8 = 0x4572
-0x81AA = 0x6B7A
-0x81B3 = 0x4945
-0x81BA = 0x625F
-0x81BB = 0x6B7E
-0x81C0 = 0x4D4E
-0x81C1 = 0x6C21
-0x81C2 = 0x315B
-0x81C3 = 0x5337
-0x81C6 = 0x525C
-0x81CA = 0x6B7D
-0x81CC = 0x6B7B
-0x81E3 = 0x333C
-0x81E7 = 0x6A30
-0x81EA = 0x5754
-0x81EC = 0x742B
-0x81ED = 0x3374
-0x81F3 = 0x5641
-0x81F4 = 0x5642
-0x81FB = 0x5569
-0x81FC = 0x3E4A
-0x81FE = 0x7427
-0x8200 = 0x5228
-0x8201 = 0x7428
-0x8202 = 0x7429
-0x8204 = 0x742A
-0x8205 = 0x3E4B
-0x8206 = 0x535F
-0x820C = 0x4960
-0x820D = 0x4961
-0x8210 = 0x7342
-0x8212 = 0x4A66
-0x8214 = 0x4C72
-0x821B = 0x6236
-0x821C = 0x4B34
-0x821E = 0x4E68
-0x821F = 0x565B
-0x8221 = 0x742D
-0x8222 = 0x742E
-0x8223 = 0x742F
-0x8228 = 0x7432
-0x822A = 0x3A3D
-0x822B = 0x7433
-0x822C = 0x3063
-0x822D = 0x7430
-0x822F = 0x7431
-0x8230 = 0x3D22
-0x8231 = 0x3255
-0x8233 = 0x7436
-0x8234 = 0x7437
-0x8235 = 0x3666
-0x8236 = 0x3230
-0x8237 = 0x4F4F
-0x8238 = 0x7434
-0x8239 = 0x342C
-0x823B = 0x7435
-0x823E = 0x7438
-0x8244 = 0x7439
-0x8247 = 0x4D27
-0x8249 = 0x743A
-0x824B = 0x743B
-0x824F = 0x743C
-0x8258 = 0x4B52
-0x825A = 0x743D
-0x825F = 0x743E
-0x8268 = 0x743F
-0x826E = 0x745E
-0x826F = 0x413C
-0x8270 = 0x3C68
-0x8272 = 0x492B
-0x8273 = 0x515E
-0x8274 = 0x6575
-0x8279 = 0x5C33
-0x827A = 0x5255
-0x827D = 0x5C34
-0x827E = 0x302C
-0x827F = 0x5C35
-0x8282 = 0x3D5A
-0x8284 = 0x5C39
-0x8288 = 0x5842
-0x828A = 0x5C37
-0x828B = 0x5373
-0x828D = 0x4956
-0x828E = 0x5C3A
-0x828F = 0x5C36
-0x8291 = 0x5C3B
-0x8292 = 0x4322
-0x8297 = 0x5C3C
-0x8298 = 0x5C45
-0x8299 = 0x5C3D
-0x829C = 0x4E5F
-0x829D = 0x5625
-0x829F = 0x5C4F
-0x82A1 = 0x5C4D
-0x82A4 = 0x5C52
-0x82A5 = 0x3D66
-0x82A6 = 0x422B
-0x82A8 = 0x5C38
-0x82A9 = 0x5C4B
-0x82AA = 0x5C4E
-0x82AB = 0x5C3E
-0x82AC = 0x3752
-0x82AD = 0x3045
-0x82AE = 0x5C47
-0x82AF = 0x503E
-0x82B0 = 0x5C41
-0x82B1 = 0x3B28
-0x82B3 = 0x373C
-0x82B4 = 0x5C4C
-0x82B7 = 0x5C46
-0x82B8 = 0x5C3F
-0x82B9 = 0x475B
-0x82BD = 0x513F
-0x82BE = 0x5C40
-0x82C1 = 0x5C4A
-0x82C4 = 0x5C50
-0x82C7 = 0x4E2D
-0x82C8 = 0x5C42
-0x82CA = 0x5C43
-0x82CB = 0x5C48
-0x82CC = 0x5C49
-0x82CD = 0x3254
-0x82CE = 0x5C51
-0x82CF = 0x4B55
-0x82D1 = 0x5437
-0x82D2 = 0x5C5B
-0x82D3 = 0x5C5F
-0x82D4 = 0x4C26
-0x82D5 = 0x5C66
-0x82D7 = 0x4367
-0x82D8 = 0x5C5C
-0x82DB = 0x3F41
-0x82DC = 0x5C59
-0x82DE = 0x307A
-0x82DF = 0x3936
-0x82E0 = 0x5C65
-0x82E1 = 0x5C53
-0x82E3 = 0x5C44
-0x82E4 = 0x5C56
-0x82E5 = 0x4874
-0x82E6 = 0x3F60
-0x82EB = 0x493B
-0x82EF = 0x313D
-0x82F1 = 0x5322
-0x82F4 = 0x5C5A
-0x82F7 = 0x5C55
-0x82F9 = 0x463B
-0x82FB = 0x5C5E
-0x8301 = 0x5742
-0x8302 = 0x432F
-0x8303 = 0x3736
-0x8304 = 0x4751
-0x8305 = 0x4329
-0x8306 = 0x5C62
-0x8307 = 0x5C58
-0x8308 = 0x5C6B
-0x8309 = 0x5C54
-0x830C = 0x5C5D
-0x830E = 0x3E25
-0x830F = 0x5C57
-0x8311 = 0x5C60
-0x8314 = 0x5C63
-0x8315 = 0x5C64
-0x8317 = 0x5C78
-0x831A = 0x5C61
-0x831B = 0x5D22
-0x831C = 0x5C67
-0x8327 = 0x3C6B
-0x8328 = 0x3444
-0x832B = 0x4323
-0x832C = 0x3267
-0x832D = 0x5C7A
-0x832F = 0x5C72
-0x8331 = 0x5C6F
-0x8333 = 0x5C7C
-0x8334 = 0x5C6E
-0x8335 = 0x5270
-0x8336 = 0x3268
-0x8338 = 0x4857
-0x8339 = 0x4863
-0x833A = 0x5C7B
-0x833C = 0x5C6D
-0x8340 = 0x5C77
-0x8343 = 0x5C75
-0x8346 = 0x3E23
-0x8347 = 0x5C74
-0x8349 = 0x325D
-0x834F = 0x5C73
-0x8350 = 0x3C76
-0x8351 = 0x5C68
-0x8352 = 0x3B44
-0x8354 = 0x4073
-0x835A = 0x3C54
-0x835B = 0x5C69
-0x835C = 0x5C6A
-0x835E = 0x5C71
-0x835F = 0x5C76
-0x8360 = 0x5C79
-0x8361 = 0x3534
-0x8363 = 0x4859
-0x8364 = 0x3B67
-0x8365 = 0x5C7E
-0x8366 = 0x5C7D
-0x8367 = 0x532B
-0x8368 = 0x5D21
-0x8369 = 0x5D23
-0x836A = 0x5D25
-0x836B = 0x5271
-0x836C = 0x5D24
-0x836D = 0x5D26
-0x836E = 0x5D27
-0x836F = 0x5229
-0x8377 = 0x3A49
-0x8378 = 0x5D29
-0x837B = 0x5D36
-0x837C = 0x5D31
-0x837D = 0x5D34
-0x8385 = 0x5D30
-0x8386 = 0x464E
-0x8389 = 0x4072
-0x838E = 0x492F
-0x8392 = 0x5C6C
-0x8393 = 0x5D2E
-0x8398 = 0x5D37
-0x839B = 0x5C70
-0x839C = 0x5D2F
-0x839E = 0x5D38
-0x83A0 = 0x5D2C
-0x83A8 = 0x5D39
-0x83A9 = 0x5D33
-0x83AA = 0x5D2D
-0x83AB = 0x442A
-0x83B0 = 0x5D28
-0x83B1 = 0x4033
-0x83B2 = 0x412B
-0x83B3 = 0x5D2A
-0x83B4 = 0x5D2B
-0x83B6 = 0x5D32
-0x83B7 = 0x3B71
-0x83B8 = 0x5D35
-0x83B9 = 0x5328
-0x83BA = 0x5D3A
-0x83BC = 0x5D3B
-0x83BD = 0x4327
-0x83C0 = 0x5D52
-0x83C1 = 0x5D3C
-0x83C5 = 0x5D51
-0x83C7 = 0x393D
-0x83CA = 0x3E55
-0x83CC = 0x3E7A
-0x83CF = 0x3A4A
-0x83D4 = 0x5D4A
-0x83D6 = 0x5D45
-0x83D8 = 0x5D3F
-0x83DC = 0x324B
-0x83DD = 0x5D43
-0x83DF = 0x5D4B
-0x83E0 = 0x3224
-0x83E1 = 0x5D55
-0x83E5 = 0x5D3E
-0x83E9 = 0x4650
-0x83EA = 0x5D50
-0x83F0 = 0x5D54
-0x83F1 = 0x4162
-0x83F2 = 0x3746
-0x83F8 = 0x5D4E
-0x83F9 = 0x5D4F
-0x83FD = 0x5D44
-0x8401 = 0x5D3D
-0x8403 = 0x5D4D
-0x8404 = 0x4C51
-0x8406 = 0x5D49
-0x840B = 0x5D42
-0x840C = 0x4348
-0x840D = 0x463C
-0x840E = 0x4E2E
-0x840F = 0x5D4C
-0x8411 = 0x5D48
-0x8418 = 0x5D41
-0x841C = 0x5D46
-0x841D = 0x425C
-0x8424 = 0x5329
-0x8425 = 0x532A
-0x8426 = 0x5D53
-0x8427 = 0x4F74
-0x8428 = 0x4878
-0x8431 = 0x5D66
-0x8438 = 0x5D47
-0x843C = 0x5D60
-0x843D = 0x4264
-0x8446 = 0x5D61
-0x8451 = 0x5D57
-0x8457 = 0x5678
-0x8459 = 0x5D59
-0x845A = 0x5D58
-0x845B = 0x3870
-0x845C = 0x5D56
-0x8461 = 0x464F
-0x8463 = 0x362D
-0x8469 = 0x5D62
-0x846B = 0x3A79
-0x846C = 0x5461
-0x846D = 0x5D67
-0x8471 = 0x3450
-0x8473 = 0x5D5A
-0x8475 = 0x3F7B
-0x8476 = 0x5D63
-0x8478 = 0x5D5F
-0x847A = 0x5D5D
-0x8482 = 0x3559
-0x8487 = 0x5D5B
-0x8488 = 0x5D5C
-0x8489 = 0x5D5E
-0x848B = 0x3D2F
-0x848C = 0x5D64
-0x848E = 0x5D65
-0x8497 = 0x5D75
-0x8499 = 0x4349
-0x849C = 0x4B62
-0x84A1 = 0x5D72
-0x84AF = 0x5861
-0x84B2 = 0x4651
-0x84B4 = 0x5D74
-0x84B8 = 0x5574
-0x84B9 = 0x5D73
-0x84BA = 0x5D70
-0x84BD = 0x5D6C
-0x84BF = 0x5D6F
-0x84C1 = 0x5D68
-0x84C4 = 0x506E
-0x84C9 = 0x4858
-0x84CA = 0x5D6E
-0x84CD = 0x5D69
-0x84D0 = 0x5D6A
-0x84D1 = 0x4B72
-0x84D3 = 0x5D6D
-0x84D6 = 0x314D
-0x84DD = 0x4036
-0x84DF = 0x3C3B
-0x84E0 = 0x5D71
-0x84E3 = 0x5D77
-0x84E5 = 0x5D76
-0x84E6 = 0x5D6B
-0x84EC = 0x456E
-0x84F0 = 0x5D7B
-0x84FC = 0x5E24
-0x84FF = 0x5E23
-0x850C = 0x5D78
-0x8511 = 0x436F
-0x8513 = 0x427B
-0x8517 = 0x5561
-0x851A = 0x4E35
-0x851F = 0x5D7D
-0x8521 = 0x324C
-0x852B = 0x4468
-0x852C = 0x4A5F
-0x8537 = 0x473E
-0x8538 = 0x5D7A
-0x8539 = 0x5D7C
-0x853A = 0x5D7E
-0x853B = 0x5E22
-0x853C = 0x302A
-0x853D = 0x314E
-0x8543 = 0x5E2C
-0x8548 = 0x5E26
-0x8549 = 0x3D36
-0x854A = 0x486F
-0x8556 = 0x5E21
-0x8559 = 0x5E25
-0x855E = 0x5E29
-0x8564 = 0x5E28
-0x8568 = 0x5E27
-0x8572 = 0x5E2D
-0x8574 = 0x544C
-0x8579 = 0x5E33
-0x857A = 0x5E2A
-0x857B = 0x5E2E
-0x857E = 0x4059
-0x8584 = 0x3121
-0x8585 = 0x5E36
-0x8587 = 0x5E31
-0x858F = 0x5E32
-0x859B = 0x5126
-0x859C = 0x5E35
-0x85A4 = 0x5E2F
-0x85A8 = 0x5E30
-0x85AA = 0x503D
-0x85AE = 0x5E34
-0x85AF = 0x4A6D
-0x85B0 = 0x5E39
-0x85B7 = 0x5E38
-0x85B9 = 0x5E37
-0x85C1 = 0x5E3B
-0x85C9 = 0x3D65
-0x85CF = 0x3258
-0x85D0 = 0x436A
-0x85D3 = 0x5E3A
-0x85D5 = 0x453A
-0x85DC = 0x5E3C
-0x85E4 = 0x4C59
-0x85E9 = 0x372A
-0x85FB = 0x5465
-0x85FF = 0x5E3D
-0x8605 = 0x5E3F
-0x8611 = 0x4422
-0x8616 = 0x5E41
-0x8627 = 0x5E3E
-0x8629 = 0x5E40
-0x8638 = 0x553A
-0x863C = 0x5E42
-0x864D = 0x722E
-0x864E = 0x3B22
-0x864F = 0x4232
-0x8650 = 0x4530
-0x8651 = 0x4247
-0x8654 = 0x722F
-0x865A = 0x5069
-0x865E = 0x535D
-0x8662 = 0x6B3D
-0x866B = 0x3366
-0x866C = 0x7230
-0x866E = 0x7231
-0x8671 = 0x4A2D
-0x8679 = 0x3A67
-0x867A = 0x7233
-0x867B = 0x7235
-0x867C = 0x7234
-0x867D = 0x4B64
-0x867E = 0x4F3A
-0x867F = 0x7232
-0x8680 = 0x4A34
-0x8681 = 0x524F
-0x8682 = 0x426C
-0x868A = 0x4E43
-0x868B = 0x7238
-0x868C = 0x3076
-0x868D = 0x7237
-0x8693 = 0x723E
-0x8695 = 0x324F
-0x869C = 0x5141
-0x869D = 0x723A
-0x86A3 = 0x723C
-0x86A4 = 0x5469
-0x86A7 = 0x723B
-0x86A8 = 0x7236
-0x86A9 = 0x723F
-0x86AA = 0x723D
-0x86AC = 0x7239
-0x86AF = 0x7247
-0x86B0 = 0x7244
-0x86B1 = 0x7246
-0x86B4 = 0x724A
-0x86B5 = 0x7242
-0x86B6 = 0x7240
-0x86BA = 0x7245
-0x86C0 = 0x567B
-0x86C4 = 0x7241
-0x86C6 = 0x4779
-0x86C7 = 0x495F
-0x86C9 = 0x7248
-0x86CA = 0x3946
-0x86CB = 0x3530
-0x86CE = 0x7243
-0x86CF = 0x7249
-0x86D0 = 0x7250
-0x86D1 = 0x7256
-0x86D4 = 0x3B57
-0x86D8 = 0x7255
-0x86D9 = 0x4D5C
-0x86DB = 0x566B
-0x86DE = 0x7252
-0x86DF = 0x7254
-0x86E4 = 0x3872
-0x86E9 = 0x724B
-0x86ED = 0x724E
-0x86EE = 0x4279
-0x86F0 = 0x555D
-0x86F1 = 0x724C
-0x86F2 = 0x724D
-0x86F3 = 0x724F
-0x86F4 = 0x7253
-0x86F8 = 0x7259
-0x86F9 = 0x533C
-0x86FE = 0x366A
-0x8700 = 0x4A71
-0x8702 = 0x3764
-0x8703 = 0x7257
-0x8707 = 0x7258
-0x8708 = 0x725A
-0x8709 = 0x725D
-0x870A = 0x725B
-0x870D = 0x725C
-0x8712 = 0x5151
-0x8713 = 0x7251
-0x8715 = 0x4D49
-0x8717 = 0x4E4F
-0x8718 = 0x5629
-0x871A = 0x7263
-0x871C = 0x435B
-0x871E = 0x7260
-0x8721 = 0x402F
-0x8722 = 0x726C
-0x8723 = 0x725E
-0x8725 = 0x7261
-0x8729 = 0x7268
-0x872E = 0x7262
-0x8731 = 0x7267
-0x8734 = 0x7266
-0x8737 = 0x7269
-0x873B = 0x725F
-0x873E = 0x7264
-0x873F = 0x726A
-0x8747 = 0x532C
-0x8748 = 0x7265
-0x8749 = 0x3275
-0x874C = 0x7272
-0x874E = 0x502B
-0x8753 = 0x7275
-0x8757 = 0x3B48
-0x8759 = 0x7279
-0x8760 = 0x7270
-0x8763 = 0x7276
-0x8764 = 0x7278
-0x8765 = 0x727A
-0x876E = 0x7273
-0x8770 = 0x7271
-0x8774 = 0x3A7B
-0x8776 = 0x357B
-0x877B = 0x726F
-0x877C = 0x7277
-0x877D = 0x726D
-0x877E = 0x726E
-0x8782 = 0x726B
-0x8783 = 0x7326
-0x8785 = 0x7323
-0x8788 = 0x7322
-0x878B = 0x7274
-0x878D = 0x485A
-0x8793 = 0x727B
-0x8797 = 0x7325
-0x879F = 0x4378
-0x87A8 = 0x727D
-0x87AB = 0x7327
-0x87AC = 0x7329
-0x87AD = 0x7324
-0x87AF = 0x727C
-0x87B3 = 0x732B
-0x87B5 = 0x732A
-0x87BA = 0x425D
-0x87BD = 0x732E
-0x87C0 = 0x7330
-0x87C6 = 0x7321
-0x87CA = 0x7331
-0x87CB = 0x732C
-0x87D1 = 0x732F
-0x87D2 = 0x727E
-0x87D3 = 0x732D
-0x87DB = 0x7332
-0x87E0 = 0x7334
-0x87E5 = 0x7328
-0x87EA = 0x7333
-0x87EE = 0x7335
-0x87F9 = 0x5037
-0x87FE = 0x7338
-0x8803 = 0x5979
-0x880A = 0x7339
-0x8813 = 0x7337
-0x8815 = 0x4864
-0x8816 = 0x7336
-0x881B = 0x733A
-0x8821 = 0x733B
-0x8822 = 0x3440
-0x8832 = 0x6E43
-0x8839 = 0x733C
-0x883C = 0x733D
-0x8840 = 0x512A
-0x8844 = 0x742C
-0x8845 = 0x5046
-0x884C = 0x5050
-0x884D = 0x515C
-0x8854 = 0x4F4E
-0x8857 = 0x3D56
-0x8859 = 0x5143
-0x8861 = 0x3A62
-0x8862 = 0x6169
-0x8863 = 0x5242
-0x8864 = 0x7142
-0x8865 = 0x3239
-0x8868 = 0x316D
-0x8869 = 0x7143
-0x886B = 0x4940
-0x886C = 0x3344
-0x886E = 0x5972
-0x8870 = 0x4B25
-0x8872 = 0x7144
-0x8877 = 0x5654
-0x887D = 0x7145
-0x887E = 0x7440
-0x887F = 0x7146
-0x8881 = 0x542C
-0x8882 = 0x7147
-0x8884 = 0x3040
-0x8885 = 0x7441
-0x8888 = 0x7442
-0x888B = 0x347C
-0x888D = 0x455B
-0x8892 = 0x4C3B
-0x8896 = 0x5064
-0x889C = 0x4D60
-0x88A2 = 0x7148
-0x88A4 = 0x5973
-0x88AB = 0x313B
-0x88AD = 0x4F2E
-0x88B1 = 0x3824
-0x88B7 = 0x714A
-0x88BC = 0x714B
-0x88C1 = 0x3243
-0x88C2 = 0x4151
-0x88C5 = 0x5730
-0x88C6 = 0x7149
-0x88C9 = 0x714C
-0x88CE = 0x714E
-0x88D2 = 0x5976
-0x88D4 = 0x5261
-0x88D5 = 0x5423
-0x88D8 = 0x7443
-0x88D9 = 0x4839
-0x88DF = 0x7444
-0x88E2 = 0x714D
-0x88E3 = 0x714F
-0x88E4 = 0x3F63
-0x88E5 = 0x7150
-0x88E8 = 0x7154
-0x88F0 = 0x7156
-0x88F1 = 0x7151
-0x88F3 = 0x4951
-0x88F4 = 0x4561
-0x88F8 = 0x4263
-0x88F9 = 0x397C
-0x88FC = 0x7153
-0x88FE = 0x7155
-0x8902 = 0x3953
-0x890A = 0x715B
-0x8910 = 0x3A56
-0x8912 = 0x307D
-0x8913 = 0x7159
-0x8919 = 0x7158
-0x891A = 0x7152
-0x891B = 0x715A
-0x8921 = 0x7157
-0x8925 = 0x486C
-0x892A = 0x4D4A
-0x892B = 0x715D
-0x8930 = 0x653D
-0x8934 = 0x715C
-0x8936 = 0x715E
-0x8941 = 0x715F
-0x8944 = 0x4F65
-0x895E = 0x7445
-0x895F = 0x3D73
-0x8966 = 0x7160
-0x897B = 0x7161
-0x897F = 0x4E77
-0x8981 = 0x522A
-0x8983 = 0x717B
-0x8986 = 0x3832
-0x89C1 = 0x3C7B
-0x89C2 = 0x395B
-0x89C4 = 0x3966
-0x89C5 = 0x4359
-0x89C6 = 0x4A53
-0x89C7 = 0x6A68
-0x89C8 = 0x4040
-0x89C9 = 0x3E75
-0x89CA = 0x6A69
-0x89CB = 0x6A6A
-0x89CC = 0x6A6B
-0x89CE = 0x6A6C
-0x89CF = 0x6A6D
-0x89D0 = 0x6A6E
-0x89D1 = 0x6A6F
-0x89D2 = 0x3D47
-0x89D6 = 0x757B
-0x89DA = 0x757D
-0x89DC = 0x757E
-0x89DE = 0x757C
-0x89E3 = 0x3D62
-0x89E5 = 0x7621
-0x89E6 = 0x3425
-0x89EB = 0x7622
-0x89EF = 0x7623
-0x89F3 = 0x6C32
-0x8A00 = 0x5154
-0x8A07 = 0x596A
-0x8A3E = 0x7624
-0x8A48 = 0x6E3A
-0x8A79 = 0x5532
-0x8A89 = 0x537E
-0x8A8A = 0x4C5C
-0x8A93 = 0x4A44
-0x8B07 = 0x6540
-0x8B26 = 0x7625
-0x8B66 = 0x3E2F
-0x8B6C = 0x4629
-0x8BA0 = 0x5A25
-0x8BA1 = 0x3C46
-0x8BA2 = 0x3629
-0x8BA3 = 0x383C
-0x8BA4 = 0x484F
-0x8BA5 = 0x3C25
-0x8BA6 = 0x5A26
-0x8BA7 = 0x5A27
-0x8BA8 = 0x4C56
-0x8BA9 = 0x4843
-0x8BAA = 0x5A28
-0x8BAB = 0x467D
-0x8BAD = 0x5135
-0x8BAE = 0x5269
-0x8BAF = 0x5136
-0x8BB0 = 0x3C47
-0x8BB2 = 0x3D32
-0x8BB3 = 0x3B64
-0x8BB4 = 0x5A29
-0x8BB5 = 0x5A2A
-0x8BB6 = 0x5148
-0x8BB7 = 0x5A2B
-0x8BB8 = 0x506D
-0x8BB9 = 0x366F
-0x8BBA = 0x425B
-0x8BBC = 0x4B4F
-0x8BBD = 0x376D
-0x8BBE = 0x4968
-0x8BBF = 0x3743
-0x8BC0 = 0x3E77
-0x8BC1 = 0x5624
-0x8BC2 = 0x5A2C
-0x8BC3 = 0x5A2D
-0x8BC4 = 0x4640
-0x8BC5 = 0x5767
-0x8BC6 = 0x4A36
-0x8BC8 = 0x5529
-0x8BC9 = 0x4B5F
-0x8BCA = 0x556F
-0x8BCB = 0x5A2E
-0x8BCC = 0x565F
-0x8BCD = 0x344A
-0x8BCE = 0x5A30
-0x8BCF = 0x5A2F
-0x8BD1 = 0x526B
-0x8BD2 = 0x5A31
-0x8BD3 = 0x5A32
-0x8BD4 = 0x5A33
-0x8BD5 = 0x4A54
-0x8BD6 = 0x5A34
-0x8BD7 = 0x4A2B
-0x8BD8 = 0x5A35
-0x8BD9 = 0x5A36
-0x8BDA = 0x334F
-0x8BDB = 0x566F
-0x8BDC = 0x5A37
-0x8BDD = 0x3B30
-0x8BDE = 0x352E
-0x8BDF = 0x5A38
-0x8BE0 = 0x5A39
-0x8BE1 = 0x396E
-0x8BE2 = 0x512F
-0x8BE3 = 0x5268
-0x8BE4 = 0x5A3A
-0x8BE5 = 0x3843
-0x8BE6 = 0x4F6A
-0x8BE7 = 0x326F
-0x8BE8 = 0x5A3B
-0x8BE9 = 0x5A3C
-0x8BEB = 0x3D6B
-0x8BEC = 0x4E5C
-0x8BED = 0x536F
-0x8BEE = 0x5A3D
-0x8BEF = 0x4E73
-0x8BF0 = 0x5A3E
-0x8BF1 = 0x5355
-0x8BF2 = 0x3B65
-0x8BF3 = 0x5A3F
-0x8BF4 = 0x4B35
-0x8BF5 = 0x4B50
-0x8BF6 = 0x5A40
-0x8BF7 = 0x476B
-0x8BF8 = 0x566E
-0x8BF9 = 0x5A41
-0x8BFA = 0x4535
-0x8BFB = 0x3641
-0x8BFC = 0x5A42
-0x8BFD = 0x374C
-0x8BFE = 0x3F4E
-0x8BFF = 0x5A43
-0x8C00 = 0x5A44
-0x8C01 = 0x4B2D
-0x8C02 = 0x5A45
-0x8C03 = 0x3577
-0x8C04 = 0x5A46
-0x8C05 = 0x4142
-0x8C06 = 0x573B
-0x8C07 = 0x5A47
-0x8C08 = 0x4C38
-0x8C0A = 0x526A
-0x8C0B = 0x4431
-0x8C0C = 0x5A48
-0x8C0D = 0x357D
-0x8C0E = 0x3B51
-0x8C0F = 0x5A49
-0x8C10 = 0x5033
-0x8C11 = 0x5A4A
-0x8C12 = 0x5A4B
-0x8C13 = 0x4E3D
-0x8C14 = 0x5A4C
-0x8C15 = 0x5A4D
-0x8C16 = 0x5A4E
-0x8C17 = 0x3277
-0x8C18 = 0x5A51
-0x8C19 = 0x5A4F
-0x8C1A = 0x5168
-0x8C1B = 0x5A50
-0x8C1C = 0x4355
-0x8C1D = 0x5A52
-0x8C1F = 0x5A53
-0x8C20 = 0x5A54
-0x8C21 = 0x5A55
-0x8C22 = 0x503B
-0x8C23 = 0x5225
-0x8C24 = 0x3079
-0x8C25 = 0x5A56
-0x8C26 = 0x472B
-0x8C27 = 0x5A57
-0x8C28 = 0x3D77
-0x8C29 = 0x4321
-0x8C2A = 0x5A58
-0x8C2B = 0x5A59
-0x8C2C = 0x437D
-0x8C2D = 0x4C37
-0x8C2E = 0x5A5A
-0x8C2F = 0x5A5B
-0x8C30 = 0x403E
-0x8C31 = 0x4657
-0x8C32 = 0x5A5C
-0x8C33 = 0x5A5D
-0x8C34 = 0x4734
-0x8C35 = 0x5A5E
-0x8C36 = 0x5A5F
-0x8C37 = 0x3948
-0x8C41 = 0x3B6D
-0x8C46 = 0x3639
-0x8C47 = 0x7478
-0x8C49 = 0x7479
-0x8C4C = 0x4D63
-0x8C55 = 0x7539
-0x8C5A = 0x6B60
-0x8C61 = 0x4F73
-0x8C62 = 0x3B3F
-0x8C6A = 0x3A40
-0x8C6B = 0x5425
-0x8C73 = 0x6159
-0x8C78 = 0x7574
-0x8C79 = 0x312A
-0x8C7A = 0x3272
-0x8C82 = 0x7575
-0x8C85 = 0x7577
-0x8C89 = 0x3A51
-0x8C8A = 0x7576
-0x8C8C = 0x4332
-0x8C94 = 0x7579
-0x8C98 = 0x7578
-0x8D1D = 0x3134
-0x8D1E = 0x556A
-0x8D1F = 0x383A
-0x8D21 = 0x3931
-0x8D22 = 0x3246
-0x8D23 = 0x5470
-0x8D24 = 0x4F4D
-0x8D25 = 0x305C
-0x8D26 = 0x554B
-0x8D27 = 0x3B75
-0x8D28 = 0x564A
-0x8D29 = 0x3737
-0x8D2A = 0x4C30
-0x8D2B = 0x4636
-0x8D2C = 0x3161
-0x8D2D = 0x393A
-0x8D2E = 0x567C
-0x8D2F = 0x3961
-0x8D30 = 0x3721
-0x8D31 = 0x3C7A
-0x8D32 = 0x6A5A
-0x8D33 = 0x6A5B
-0x8D34 = 0x4C79
-0x8D35 = 0x3973
-0x8D36 = 0x6A5C
-0x8D37 = 0x347B
-0x8D38 = 0x4333
-0x8D39 = 0x3751
-0x8D3A = 0x3A58
-0x8D3B = 0x6A5D
-0x8D3C = 0x5474
-0x8D3D = 0x6A5E
-0x8D3E = 0x3C56
-0x8D3F = 0x3B5F
-0x8D40 = 0x6A5F
-0x8D41 = 0x415E
-0x8D42 = 0x4238
-0x8D43 = 0x545F
-0x8D44 = 0x574A
-0x8D45 = 0x6A60
-0x8D46 = 0x6A61
-0x8D47 = 0x6A64
-0x8D48 = 0x6A62
-0x8D49 = 0x6A63
-0x8D4A = 0x495E
-0x8D4B = 0x3833
-0x8D4C = 0x3644
-0x8D4D = 0x6A65
-0x8D4E = 0x4A6A
-0x8D4F = 0x494D
-0x8D50 = 0x344D
-0x8D53 = 0x6259
-0x8D54 = 0x4562
-0x8D55 = 0x6A66
-0x8D56 = 0x4035
-0x8D58 = 0x5738
-0x8D59 = 0x6A67
-0x8D5A = 0x572C
-0x8D5B = 0x487C
-0x8D5C = 0x5853
-0x8D5D = 0x584D
-0x8D5E = 0x545E
-0x8D60 = 0x5479
-0x8D61 = 0x4944
-0x8D62 = 0x532E
-0x8D63 = 0x3853
-0x8D64 = 0x3360
-0x8D66 = 0x4962
-0x8D67 = 0x7476
-0x8D6B = 0x3A55
-0x8D6D = 0x7477
-0x8D70 = 0x575F
-0x8D73 = 0x7471
-0x8D74 = 0x3830
-0x8D75 = 0x5554
-0x8D76 = 0x384F
-0x8D77 = 0x4670
-0x8D81 = 0x3343
-0x8D84 = 0x7472
-0x8D85 = 0x332C
-0x8D8A = 0x543D
-0x8D8B = 0x4777
-0x8D91 = 0x7474
-0x8D94 = 0x7473
-0x8D9F = 0x4C4B
-0x8DA3 = 0x4824
-0x8DB1 = 0x7475
-0x8DB3 = 0x5763
-0x8DB4 = 0x453F
-0x8DB5 = 0x7540
-0x8DB8 = 0x753B
-0x8DBA = 0x7543
-0x8DBC = 0x7542
-0x8DBE = 0x563A
-0x8DBF = 0x7541
-0x8DC3 = 0x543E
-0x8DC4 = 0x7544
-0x8DC6 = 0x754C
-0x8DCB = 0x304F
-0x8DCC = 0x3578
-0x8DCE = 0x7549
-0x8DCF = 0x754A
-0x8DD1 = 0x455C
-0x8DD6 = 0x7545
-0x8DD7 = 0x7546
-0x8DDA = 0x7547
-0x8DDB = 0x754B
-0x8DDD = 0x3E60
-0x8DDE = 0x7548
-0x8DDF = 0x387A
-0x8DE3 = 0x7550
-0x8DE4 = 0x7553
-0x8DE8 = 0x3F67
-0x8DEA = 0x3972
-0x8DEB = 0x753C
-0x8DEC = 0x754D
-0x8DEF = 0x4237
-0x8DF3 = 0x4C78
-0x8DF5 = 0x3C79
-0x8DF7 = 0x754E
-0x8DF8 = 0x754F
-0x8DF9 = 0x7551
-0x8DFA = 0x3665
-0x8DFB = 0x7552
-0x8DFD = 0x7555
-0x8E05 = 0x753D
-0x8E09 = 0x7554
-0x8E0A = 0x533B
-0x8E0C = 0x336C
-0x8E0F = 0x4C24
-0x8E14 = 0x7556
-0x8E1D = 0x7557
-0x8E1E = 0x3E61
-0x8E1F = 0x7558
-0x8E22 = 0x4C5F
-0x8E23 = 0x755B
-0x8E29 = 0x3248
-0x8E2A = 0x5759
-0x8E2C = 0x7559
-0x8E2E = 0x755A
-0x8E2F = 0x755C
-0x8E31 = 0x7562
-0x8E35 = 0x7560
-0x8E39 = 0x755F
-0x8E3A = 0x755D
-0x8E3D = 0x7561
-0x8E40 = 0x755E
-0x8E41 = 0x7564
-0x8E42 = 0x7565
-0x8E44 = 0x4C63
-0x8E47 = 0x653F
-0x8E48 = 0x3538
-0x8E49 = 0x7563
-0x8E4A = 0x7568
-0x8E4B = 0x4C23
-0x8E51 = 0x7566
-0x8E52 = 0x7567
-0x8E59 = 0x753E
-0x8E66 = 0x3144
-0x8E69 = 0x753F
-0x8E6C = 0x3545
-0x8E6D = 0x3264
-0x8E6F = 0x756C
-0x8E70 = 0x7569
-0x8E72 = 0x3657
-0x8E74 = 0x756D
-0x8E76 = 0x756A
-0x8E7C = 0x756B
-0x8E7F = 0x345A
-0x8E81 = 0x546A
-0x8E85 = 0x756E
-0x8E87 = 0x3379
-0x8E8F = 0x756F
-0x8E90 = 0x7571
-0x8E94 = 0x7570
-0x8E9C = 0x7572
-0x8E9E = 0x7573
-0x8EAB = 0x496D
-0x8EAC = 0x392A
-0x8EAF = 0x477B
-0x8EB2 = 0x3663
-0x8EBA = 0x4C49
-0x8ECE = 0x6A26
-0x8F66 = 0x3335
-0x8F67 = 0x547E
-0x8F68 = 0x396C
-0x8F69 = 0x5079
-0x8F6B = 0x696D
-0x8F6C = 0x572A
-0x8F6D = 0x696E
-0x8F6E = 0x4256
-0x8F6F = 0x486D
-0x8F70 = 0x3A64
-0x8F71 = 0x696F
-0x8F72 = 0x6970
-0x8F73 = 0x6971
-0x8F74 = 0x5661
-0x8F75 = 0x6972
-0x8F76 = 0x6973
-0x8F77 = 0x6975
-0x8F78 = 0x6974
-0x8F79 = 0x6976
-0x8F7A = 0x6977
-0x8F7B = 0x4761
-0x8F7C = 0x6978
-0x8F7D = 0x5458
-0x8F7E = 0x6979
-0x8F7F = 0x3D4E
-0x8F81 = 0x697A
-0x8F82 = 0x697B
-0x8F83 = 0x3D4F
-0x8F84 = 0x697C
-0x8F85 = 0x3828
-0x8F86 = 0x413E
-0x8F87 = 0x697D
-0x8F88 = 0x3132
-0x8F89 = 0x3B54
-0x8F8A = 0x3975
-0x8F8B = 0x697E
-0x8F8D = 0x6A21
-0x8F8E = 0x6A22
-0x8F8F = 0x6A23
-0x8F90 = 0x3778
-0x8F91 = 0x3C2D
-0x8F93 = 0x4A64
-0x8F94 = 0x604E
-0x8F95 = 0x542F
-0x8F96 = 0x4F3D
-0x8F97 = 0x5537
-0x8F98 = 0x6A24
-0x8F99 = 0x555E
-0x8F9A = 0x6A25
-0x8F9B = 0x5041
-0x8F9C = 0x393C
-0x8F9E = 0x3447
-0x8F9F = 0x3159
-0x8FA3 = 0x4031
-0x8FA8 = 0x3166
-0x8FA9 = 0x3167
-0x8FAB = 0x3168
-0x8FB0 = 0x333D
-0x8FB1 = 0x4868
-0x8FB6 = 0x6541
-0x8FB9 = 0x315F
-0x8FBD = 0x4149
-0x8FBE = 0x346F
-0x8FC1 = 0x4728
-0x8FC2 = 0x5358
-0x8FC4 = 0x4679
-0x8FC5 = 0x5138
-0x8FC7 = 0x397D
-0x8FC8 = 0x4275
-0x8FCE = 0x532D
-0x8FD0 = 0x544B
-0x8FD1 = 0x3D7C
-0x8FD3 = 0x6542
-0x8FD4 = 0x3735
-0x8FD5 = 0x6543
-0x8FD8 = 0x3B39
-0x8FD9 = 0x5562
-0x8FDB = 0x3D78
-0x8FDC = 0x5436
-0x8FDD = 0x4E25
-0x8FDE = 0x412C
-0x8FDF = 0x3359
-0x8FE2 = 0x4C76
-0x8FE4 = 0x6546
-0x8FE5 = 0x6544
-0x8FE6 = 0x6548
-0x8FE8 = 0x654A
-0x8FE9 = 0x6547
-0x8FEA = 0x354F
-0x8FEB = 0x4648
-0x8FED = 0x357C
-0x8FEE = 0x6545
-0x8FF0 = 0x4A76
-0x8FF3 = 0x6549
-0x8FF7 = 0x4354
-0x8FF8 = 0x3145
-0x8FF9 = 0x3C23
-0x8FFD = 0x5737
-0x9000 = 0x4D4B
-0x9001 = 0x4B4D
-0x9002 = 0x4A4A
-0x9003 = 0x4C53
-0x9004 = 0x654C
-0x9005 = 0x654B
-0x9006 = 0x4466
-0x9009 = 0x5121
-0x900A = 0x5137
-0x900B = 0x654D
-0x900D = 0x6550
-0x900F = 0x4D38
-0x9010 = 0x5670
-0x9011 = 0x654F
-0x9012 = 0x355D
-0x9014 = 0x4D3E
-0x9016 = 0x6551
-0x9017 = 0x363A
-0x901A = 0x4D28
-0x901B = 0x3964
-0x901D = 0x4A45
-0x901E = 0x3351
-0x901F = 0x4B59
-0x9020 = 0x546C
-0x9021 = 0x6552
-0x9022 = 0x376A
-0x9026 = 0x654E
-0x902D = 0x6555
-0x902E = 0x347E
-0x902F = 0x6556
-0x9035 = 0x6553
-0x9036 = 0x6554
-0x9038 = 0x525D
-0x903B = 0x425F
-0x903C = 0x3146
-0x903E = 0x5362
-0x9041 = 0x365D
-0x9042 = 0x4B6C
-0x9044 = 0x6557
-0x9047 = 0x5376
-0x904D = 0x3169
-0x904F = 0x3674
-0x9050 = 0x655A
-0x9051 = 0x6558
-0x9052 = 0x6559
-0x9053 = 0x3540
-0x9057 = 0x5245
-0x9058 = 0x655C
-0x905B = 0x655E
-0x9062 = 0x655D
-0x9063 = 0x4732
-0x9065 = 0x5223
-0x9068 = 0x655B
-0x906D = 0x5462
-0x906E = 0x555A
-0x9074 = 0x6560
-0x9075 = 0x5771
-0x907D = 0x6561
-0x907F = 0x315C
-0x9080 = 0x517B
-0x9082 = 0x6562
-0x9083 = 0x6564
-0x9088 = 0x6563
-0x908B = 0x6565
-0x9091 = 0x5258
-0x9093 = 0x354B
-0x9095 = 0x675F
-0x9097 = 0x5A75
-0x9099 = 0x5A78
-0x909B = 0x5A76
-0x909D = 0x5A77
-0x90A1 = 0x5A7A
-0x90A2 = 0x504F
-0x90A3 = 0x4447
-0x90A6 = 0x306E
-0x90AA = 0x5030
-0x90AC = 0x5A79
-0x90AE = 0x534A
-0x90AF = 0x3A2A
-0x90B0 = 0x5B22
-0x90B1 = 0x4771
-0x90B3 = 0x5A7C
-0x90B4 = 0x5A7B
-0x90B5 = 0x495B
-0x90B6 = 0x5A7D
-0x90B8 = 0x5B21
-0x90B9 = 0x575E
-0x90BA = 0x5A7E
-0x90BB = 0x415A
-0x90BE = 0x5B25
-0x90C1 = 0x5374
-0x90C4 = 0x5B27
-0x90C5 = 0x5B24
-0x90C7 = 0x5B28
-0x90CA = 0x3D3C
-0x90CE = 0x4049
-0x90CF = 0x5B23
-0x90D0 = 0x5B26
-0x90D1 = 0x5623
-0x90D3 = 0x5B29
-0x90D7 = 0x5B2D
-0x90DB = 0x5B2E
-0x90DC = 0x5B2C
-0x90DD = 0x3A42
-0x90E1 = 0x3F24
-0x90E2 = 0x5B2B
-0x90E6 = 0x5B2A
-0x90E7 = 0x5447
-0x90E8 = 0x323F
-0x90EB = 0x5B2F
-0x90ED = 0x3979
-0x90EF = 0x5B30
-0x90F4 = 0x333B
-0x90F8 = 0x3526
-0x90FD = 0x363C
-0x90FE = 0x5B31
-0x9102 = 0x3675
-0x9104 = 0x5B32
-0x9119 = 0x3149
-0x911E = 0x5B34
-0x9122 = 0x5B33
-0x9123 = 0x5B35
-0x912F = 0x5B37
-0x9131 = 0x5B36
-0x9139 = 0x5B38
-0x9143 = 0x5B39
-0x9146 = 0x5B3A
-0x9149 = 0x534F
-0x914A = 0x747A
-0x914B = 0x4775
-0x914C = 0x5743
-0x914D = 0x4564
-0x914E = 0x747C
-0x914F = 0x747D
-0x9150 = 0x747B
-0x9152 = 0x3E46
-0x9157 = 0x506F
-0x915A = 0x3753
-0x915D = 0x544D
-0x915E = 0x4C2A
-0x9161 = 0x7522
-0x9162 = 0x7521
-0x9163 = 0x3A28
-0x9164 = 0x747E
-0x9165 = 0x4B56
-0x9169 = 0x7524
-0x916A = 0x4052
-0x916C = 0x336A
-0x916E = 0x4D2A
-0x916F = 0x7525
-0x9170 = 0x7523
-0x9171 = 0x3D34
-0x9172 = 0x7528
-0x9174 = 0x7529
-0x9175 = 0x3D4D
-0x9176 = 0x4338
-0x9177 = 0x3F61
-0x9178 = 0x4B61
-0x9179 = 0x752A
-0x917D = 0x7526
-0x917E = 0x7527
-0x917F = 0x4470
-0x9185 = 0x752C
-0x9187 = 0x343C
-0x9189 = 0x576D
-0x918B = 0x3457
-0x918C = 0x752B
-0x918D = 0x752E
-0x9190 = 0x752D
-0x9191 = 0x752F
-0x9192 = 0x5051
-0x919A = 0x4351
-0x919B = 0x4829
-0x91A2 = 0x7530
-0x91A3 = 0x7531
-0x91AA = 0x7532
-0x91AD = 0x7533
-0x91AE = 0x7534
-0x91AF = 0x7535
-0x91B4 = 0x7537
-0x91B5 = 0x7536
-0x91BA = 0x7538
-0x91C7 = 0x3249
-0x91C9 = 0x5354
-0x91CA = 0x4A4D
-0x91CC = 0x406F
-0x91CD = 0x5658
-0x91CE = 0x5230
-0x91CF = 0x413F
-0x91D1 = 0x3D70
-0x91DC = 0x382A
-0x9274 = 0x3C78
-0x928E = 0x7646
-0x92AE = 0x7647
-0x92C8 = 0x7648
-0x933E = 0x7649
-0x936A = 0x764A
-0x938F = 0x764C
-0x93CA = 0x764B
-0x93D6 = 0x7769
-0x943E = 0x764D
-0x946B = 0x764E
-0x9485 = 0x6E44
-0x9486 = 0x6E45
-0x9487 = 0x6E46
-0x9488 = 0x556B
-0x9489 = 0x3624
-0x948A = 0x6E48
-0x948B = 0x6E47
-0x948C = 0x6E49
-0x948D = 0x6E4A
-0x948E = 0x4725
-0x948F = 0x6E4B
-0x9490 = 0x6E4C
-0x9492 = 0x3730
-0x9493 = 0x3576
-0x9494 = 0x6E4D
-0x9495 = 0x6E4F
-0x9497 = 0x6E4E
-0x9499 = 0x3846
-0x949A = 0x6E50
-0x949B = 0x6E51
-0x949C = 0x6E52
-0x949D = 0x365B
-0x949E = 0x332E
-0x949F = 0x5653
-0x94A0 = 0x4446
-0x94A1 = 0x3135
-0x94A2 = 0x3856
-0x94A3 = 0x6E53
-0x94A4 = 0x6E54
-0x94A5 = 0x543F
-0x94A6 = 0x4755
-0x94A7 = 0x3E7B
-0x94A8 = 0x4E59
-0x94A9 = 0x3933
-0x94AA = 0x6E56
-0x94AB = 0x6E55
-0x94AC = 0x6E58
-0x94AD = 0x6E57
-0x94AE = 0x4525
-0x94AF = 0x6E59
-0x94B0 = 0x6E5A
-0x94B1 = 0x472E
-0x94B2 = 0x6E5B
-0x94B3 = 0x472F
-0x94B4 = 0x6E5C
-0x94B5 = 0x3227
-0x94B6 = 0x6E5D
-0x94B7 = 0x6E5E
-0x94B8 = 0x6E5F
-0x94B9 = 0x6E60
-0x94BA = 0x6E61
-0x94BB = 0x576A
-0x94BC = 0x6E62
-0x94BD = 0x6E63
-0x94BE = 0x3C58
-0x94BF = 0x6E64
-0x94C0 = 0x534B
-0x94C1 = 0x4C7A
-0x94C2 = 0x322C
-0x94C3 = 0x4165
-0x94C4 = 0x6E65
-0x94C5 = 0x4726
-0x94C6 = 0x432D
-0x94C8 = 0x6E66
-0x94C9 = 0x6E67
-0x94CA = 0x6E68
-0x94CB = 0x6E69
-0x94CC = 0x6E6A
-0x94CD = 0x6E6B
-0x94CE = 0x6E6C
-0x94D0 = 0x6E6D
-0x94D1 = 0x6E6E
-0x94D2 = 0x6E6F
-0x94D5 = 0x6E70
-0x94D6 = 0x6E71
-0x94D7 = 0x6E72
-0x94D8 = 0x6E74
-0x94D9 = 0x6E73
-0x94DB = 0x6E75
-0x94DC = 0x4D2D
-0x94DD = 0x4241
-0x94DE = 0x6E76
-0x94DF = 0x6E77
-0x94E0 = 0x6E78
-0x94E1 = 0x5521
-0x94E2 = 0x6E79
-0x94E3 = 0x4F33
-0x94E4 = 0x6E7A
-0x94E5 = 0x6E7B
-0x94E7 = 0x6E7C
-0x94E8 = 0x6E7D
-0x94E9 = 0x6F21
-0x94EA = 0x6E7E
-0x94EB = 0x6F22
-0x94EC = 0x3875
-0x94ED = 0x437A
-0x94EE = 0x6F23
-0x94EF = 0x6F24
-0x94F0 = 0x3D42
-0x94F1 = 0x523F
-0x94F2 = 0x3279
-0x94F3 = 0x6F25
-0x94F4 = 0x6F26
-0x94F5 = 0x6F27
-0x94F6 = 0x5278
-0x94F7 = 0x6F28
-0x94F8 = 0x567D
-0x94F9 = 0x6F29
-0x94FA = 0x464C
-0x94FC = 0x6F2A
-0x94FD = 0x6F2B
-0x94FE = 0x4134
-0x94FF = 0x6F2C
-0x9500 = 0x4F7A
-0x9501 = 0x4B78
-0x9502 = 0x6F2E
-0x9503 = 0x6F2D
-0x9504 = 0x337A
-0x9505 = 0x3978
-0x9506 = 0x6F2F
-0x9507 = 0x6F30
-0x9508 = 0x5062
-0x9509 = 0x6F31
-0x950A = 0x6F32
-0x950B = 0x3766
-0x950C = 0x503F
-0x950D = 0x6F33
-0x950E = 0x6F34
-0x950F = 0x6F35
-0x9510 = 0x4871
-0x9511 = 0x4C60
-0x9512 = 0x6F36
-0x9513 = 0x6F37
-0x9514 = 0x6F38
-0x9515 = 0x6F39
-0x9516 = 0x6F3A
-0x9517 = 0x5560
-0x9518 = 0x6F3B
-0x9519 = 0x346D
-0x951A = 0x432A
-0x951B = 0x6F3C
-0x951D = 0x6F3D
-0x951E = 0x6F3E
-0x951F = 0x6F3F
-0x9521 = 0x4E7D
-0x9522 = 0x6F40
-0x9523 = 0x4260
-0x9524 = 0x3438
-0x9525 = 0x5736
-0x9526 = 0x3D75
-0x9528 = 0x4F47
-0x9529 = 0x6F43
-0x952A = 0x6F41
-0x952B = 0x6F42
-0x952C = 0x6F44
-0x952D = 0x3627
-0x952E = 0x3C7C
-0x952F = 0x3E62
-0x9530 = 0x434C
-0x9531 = 0x6F45
-0x9532 = 0x6F46
-0x9534 = 0x6F47
-0x9535 = 0x6F4F
-0x9536 = 0x6F48
-0x9537 = 0x6F49
-0x9538 = 0x6F4A
-0x9539 = 0x4742
-0x953A = 0x6F71
-0x953B = 0x364D
-0x953C = 0x6F4B
-0x953E = 0x6F4C
-0x953F = 0x6F4D
-0x9540 = 0x3646
-0x9541 = 0x433E
-0x9542 = 0x6F4E
-0x9544 = 0x6F50
-0x9545 = 0x6F51
-0x9546 = 0x6F52
-0x9547 = 0x5572
-0x9549 = 0x6F53
-0x954A = 0x4477
-0x954C = 0x6F54
-0x954D = 0x4478
-0x954E = 0x6F55
-0x954F = 0x6F56
-0x9550 = 0x3864
-0x9551 = 0x3077
-0x9552 = 0x6F57
-0x9553 = 0x6F58
-0x9554 = 0x6F59
-0x9556 = 0x6F5A
-0x9557 = 0x6F5B
-0x9558 = 0x6F5C
-0x9559 = 0x6F5D
-0x955B = 0x6F5E
-0x955C = 0x3E35
-0x955D = 0x6F61
-0x955E = 0x6F5F
-0x955F = 0x6F60
-0x9561 = 0x6F62
-0x9562 = 0x6F63
-0x9563 = 0x414D
-0x9564 = 0x6F64
-0x9565 = 0x6F65
-0x9566 = 0x6F66
-0x9567 = 0x6F67
-0x9568 = 0x6F68
-0x9569 = 0x6F69
-0x956A = 0x6F6A
-0x956B = 0x6F6B
-0x956C = 0x6F6C
-0x956D = 0x4058
-0x956F = 0x6F6D
-0x9570 = 0x412D
-0x9571 = 0x6F6E
-0x9572 = 0x6F6F
-0x9573 = 0x6F70
-0x9576 = 0x4F62
-0x957F = 0x3324
-0x95E8 = 0x4345
-0x95E9 = 0x6345
-0x95EA = 0x4941
-0x95EB = 0x6346
-0x95ED = 0x3155
-0x95EE = 0x4E4A
-0x95EF = 0x3433
-0x95F0 = 0x4872
-0x95F1 = 0x6347
-0x95F2 = 0x4F50
-0x95F3 = 0x6348
-0x95F4 = 0x3C64
-0x95F5 = 0x6349
-0x95F6 = 0x634A
-0x95F7 = 0x4346
-0x95F8 = 0x5522
-0x95F9 = 0x4456
-0x95FA = 0x396B
-0x95FB = 0x4E45
-0x95FC = 0x634B
-0x95FD = 0x4376
-0x95FE = 0x634C
-0x9600 = 0x3727
-0x9601 = 0x3873
-0x9602 = 0x3A52
-0x9603 = 0x634D
-0x9604 = 0x634E
-0x9605 = 0x5444
-0x9606 = 0x634F
-0x9608 = 0x6350
-0x9609 = 0x514B
-0x960A = 0x6351
-0x960B = 0x6352
-0x960C = 0x6353
-0x960D = 0x6354
-0x960E = 0x5156
-0x960F = 0x6355
-0x9610 = 0x327B
-0x9611 = 0x403B
-0x9612 = 0x6356
-0x9614 = 0x402B
-0x9615 = 0x6357
-0x9616 = 0x6358
-0x9617 = 0x6359
-0x9619 = 0x635A
-0x961A = 0x635B
-0x961C = 0x3837
-0x961D = 0x5A62
-0x961F = 0x3653
-0x9621 = 0x5A64
-0x9622 = 0x5A63
-0x962A = 0x5A66
-0x962E = 0x486E
-0x9631 = 0x5A65
-0x9632 = 0x3740
-0x9633 = 0x5174
-0x9634 = 0x5275
-0x9635 = 0x5573
-0x9636 = 0x3D57
-0x963B = 0x5768
-0x963C = 0x5A68
-0x963D = 0x5A67
-0x963F = 0x3022
-0x9640 = 0x4D53
-0x9642 = 0x5A69
-0x9644 = 0x383D
-0x9645 = 0x3C4A
-0x9646 = 0x423D
-0x9647 = 0x4224
-0x9648 = 0x3342
-0x9649 = 0x5A6A
-0x964B = 0x422A
-0x964C = 0x4430
-0x964D = 0x3D35
-0x9650 = 0x4F5E
-0x9654 = 0x5A6B
-0x9655 = 0x4942
-0x965B = 0x315D
-0x965F = 0x5A6C
-0x9661 = 0x3638
-0x9662 = 0x543A
-0x9664 = 0x337D
-0x9667 = 0x5A6D
-0x9668 = 0x5449
-0x9669 = 0x4F55
-0x966A = 0x4563
-0x966C = 0x5A6E
-0x9672 = 0x5A6F
-0x9674 = 0x5A70
-0x9675 = 0x416A
-0x9676 = 0x4C55
-0x9677 = 0x4F5D
-0x9685 = 0x5367
-0x9686 = 0x4221
-0x9688 = 0x5A71
-0x968B = 0x4B65
-0x968D = 0x5A72
-0x968F = 0x4B66
-0x9690 = 0x527E
-0x9694 = 0x3874
-0x9697 = 0x5A73
-0x9698 = 0x302F
-0x9699 = 0x4F36
-0x969C = 0x554F
-0x96A7 = 0x4B6D
-0x96B0 = 0x5A74
-0x96B3 = 0x6344
-0x96B6 = 0x4125
-0x96B9 = 0x763F
-0x96BC = 0x7640
-0x96BD = 0x7641
-0x96BE = 0x4451
-0x96C0 = 0x4838
-0x96C1 = 0x5163
-0x96C4 = 0x505B
-0x96C5 = 0x5145
-0x96C6 = 0x3C2F
-0x96C7 = 0x394D
-0x96C9 = 0x6F74
-0x96CC = 0x3446
-0x96CD = 0x533A
-0x96CE = 0x7642
-0x96CF = 0x337B
-0x96D2 = 0x7643
-0x96D5 = 0x3571
-0x96E0 = 0x7645
-0x96E8 = 0x536A
-0x96E9 = 0x7627
-0x96EA = 0x5129
-0x96EF = 0x7629
-0x96F3 = 0x7628
-0x96F6 = 0x4163
-0x96F7 = 0x4057
-0x96F9 = 0x3122
-0x96FE = 0x4E6D
-0x9700 = 0x5068
-0x9701 = 0x762B
-0x9704 = 0x4F76
-0x9706 = 0x762A
-0x9707 = 0x5570
-0x9708 = 0x762C
-0x9709 = 0x4339
-0x970D = 0x3B74
-0x970E = 0x762E
-0x970F = 0x762D
-0x9713 = 0x445E
-0x9716 = 0x4158
-0x971C = 0x4B2A
-0x971E = 0x4F3C
-0x972A = 0x762F
-0x972D = 0x7630
-0x9730 = 0x7631
-0x9732 = 0x4236
-0x9738 = 0x3054
-0x9739 = 0x4579
-0x973E = 0x7632
-0x9752 = 0x4760
-0x9753 = 0x7626
-0x9756 = 0x3E38
-0x9759 = 0x3E32
-0x975B = 0x3565
-0x975E = 0x3747
-0x9760 = 0x3F3F
-0x9761 = 0x4352
-0x9762 = 0x4366
-0x9765 = 0x584C
-0x9769 = 0x386F
-0x9773 = 0x3D79
-0x9774 = 0x5125
-0x9776 = 0x3050
-0x977C = 0x7730
-0x9785 = 0x7731
-0x978B = 0x502C
-0x978D = 0x3030
-0x9791 = 0x7732
-0x9792 = 0x7733
-0x9794 = 0x7734
-0x9798 = 0x474A
-0x97A0 = 0x3E4F
-0x97A3 = 0x7737
-0x97AB = 0x7736
-0x97AD = 0x315E
-0x97AF = 0x7735
-0x97B2 = 0x7738
-0x97B4 = 0x7739
-0x97E6 = 0x4E24
-0x97E7 = 0x484D
-0x97E9 = 0x3A2B
-0x97EA = 0x6838
-0x97EB = 0x6839
-0x97EC = 0x683A
-0x97ED = 0x3E42
-0x97F3 = 0x5274
-0x97F5 = 0x544F
-0x97F6 = 0x4958
-0x9875 = 0x5233
-0x9876 = 0x3625
-0x9877 = 0x476A
-0x9878 = 0x717C
-0x9879 = 0x4F6E
-0x987A = 0x4B33
-0x987B = 0x506B
-0x987C = 0x676F
-0x987D = 0x4D67
-0x987E = 0x394B
-0x987F = 0x3659
-0x9880 = 0x717D
-0x9881 = 0x3064
-0x9882 = 0x4B4C
-0x9883 = 0x717E
-0x9884 = 0x5424
-0x9885 = 0x422D
-0x9886 = 0x416C
-0x9887 = 0x4644
-0x9888 = 0x3E31
-0x9889 = 0x7221
-0x988A = 0x3C55
-0x988C = 0x7222
-0x988D = 0x7223
-0x988F = 0x7224
-0x9890 = 0x5243
-0x9891 = 0x4635
-0x9893 = 0x4D47
-0x9894 = 0x7225
-0x9896 = 0x5331
-0x9897 = 0x3F45
-0x9898 = 0x4C62
-0x989A = 0x7226
-0x989B = 0x7227
-0x989C = 0x5155
-0x989D = 0x366E
-0x989E = 0x7228
-0x989F = 0x7229
-0x98A0 = 0x355F
-0x98A1 = 0x722A
-0x98A2 = 0x722B
-0x98A4 = 0x327C
-0x98A5 = 0x722C
-0x98A6 = 0x722D
-0x98A7 = 0x4827
-0x98CE = 0x3767
-0x98D1 = 0x6C29
-0x98D2 = 0x6C2A
-0x98D3 = 0x6C2B
-0x98D5 = 0x6C2C
-0x98D8 = 0x462E
-0x98D9 = 0x6C2D
-0x98DA = 0x6C2E
-0x98DE = 0x3749
-0x98DF = 0x4A33
-0x98E7 = 0x6238
-0x98E8 = 0x774F
-0x990D = 0x7750
-0x9910 = 0x324D
-0x992E = 0x7751
-0x9954 = 0x7753
-0x9955 = 0x7752
-0x9963 = 0x623B
-0x9965 = 0x3C22
-0x9967 = 0x623C
-0x9968 = 0x623D
-0x9969 = 0x623E
-0x996A = 0x623F
-0x996B = 0x6240
-0x996C = 0x6241
-0x996D = 0x3739
-0x996E = 0x527B
-0x996F = 0x3D24
-0x9970 = 0x4A4E
-0x9971 = 0x3125
-0x9972 = 0x4B47
-0x9974 = 0x6242
-0x9975 = 0x367C
-0x9976 = 0x4844
-0x9977 = 0x6243
-0x997A = 0x3D48
-0x997C = 0x317D
-0x997D = 0x6244
-0x997F = 0x3676
-0x9980 = 0x6245
-0x9981 = 0x4459
-0x9984 = 0x6246
-0x9985 = 0x4F5A
-0x9986 = 0x395D
-0x9987 = 0x6247
-0x9988 = 0x4021
-0x998A = 0x6248
-0x998B = 0x3276
-0x998D = 0x6249
-0x998F = 0x4173
-0x9990 = 0x624A
-0x9991 = 0x624B
-0x9992 = 0x4278
-0x9993 = 0x624C
-0x9994 = 0x624D
-0x9995 = 0x624E
-0x9996 = 0x4A57
-0x9997 = 0x5838
-0x9998 = 0x5965
-0x9999 = 0x4F63
-0x99A5 = 0x7025
-0x99A8 = 0x5C30
-0x9A6C = 0x426D
-0x9A6D = 0x5426
-0x9A6E = 0x4D54
-0x9A6F = 0x5131
-0x9A70 = 0x335B
-0x9A71 = 0x477D
-0x9A73 = 0x3235
-0x9A74 = 0x423F
-0x9A75 = 0x6660
-0x9A76 = 0x4A3B
-0x9A77 = 0x6661
-0x9A78 = 0x6662
-0x9A79 = 0x3E54
-0x9A7A = 0x6663
-0x9A7B = 0x5724
-0x9A7C = 0x4D55
-0x9A7D = 0x6665
-0x9A7E = 0x3C5D
-0x9A7F = 0x6664
-0x9A80 = 0x6666
-0x9A81 = 0x6667
-0x9A82 = 0x426E
-0x9A84 = 0x3D3E
-0x9A85 = 0x6668
-0x9A86 = 0x4266
-0x9A87 = 0x3A27
-0x9A88 = 0x6669
-0x9A8A = 0x666A
-0x9A8B = 0x3352
-0x9A8C = 0x5169
-0x9A8F = 0x3F25
-0x9A90 = 0x666B
-0x9A91 = 0x466F
-0x9A92 = 0x666C
-0x9A93 = 0x666D
-0x9A96 = 0x666E
-0x9A97 = 0x462D
-0x9A98 = 0x666F
-0x9A9A = 0x4927
-0x9A9B = 0x6670
-0x9A9C = 0x6671
-0x9A9D = 0x6672
-0x9A9E = 0x6539
-0x9A9F = 0x6673
-0x9AA0 = 0x6674
-0x9AA1 = 0x4262
-0x9AA2 = 0x6675
-0x9AA3 = 0x6676
-0x9AA4 = 0x5668
-0x9AA5 = 0x6677
-0x9AA7 = 0x6678
-0x9AA8 = 0x3947
-0x9AB0 = 0x773B
-0x9AB1 = 0x773A
-0x9AB6 = 0x773E
-0x9AB7 = 0x773C
-0x9AB8 = 0x3A21
-0x9ABA = 0x773F
-0x9ABC = 0x7740
-0x9AC0 = 0x7742
-0x9AC1 = 0x7741
-0x9AC2 = 0x7744
-0x9AC5 = 0x7743
-0x9ACB = 0x7745
-0x9ACC = 0x7746
-0x9AD1 = 0x7747
-0x9AD3 = 0x4B68
-0x9AD8 = 0x385F
-0x9ADF = 0x7754
-0x9AE1 = 0x7755
-0x9AE6 = 0x7756
-0x9AEB = 0x7758
-0x9AED = 0x775A
-0x9AEF = 0x7757
-0x9AF9 = 0x775B
-0x9AFB = 0x7759
-0x9B03 = 0x5757
-0x9B08 = 0x775C
-0x9B0F = 0x775D
-0x9B13 = 0x775E
-0x9B1F = 0x775F
-0x9B23 = 0x7760
-0x9B2F = 0x5B4B
-0x9B32 = 0x582A
-0x9B3B = 0x6577
-0x9B3C = 0x396D
-0x9B41 = 0x3F7D
-0x9B42 = 0x3B6A
-0x9B43 = 0x7749
-0x9B44 = 0x4647
-0x9B45 = 0x7748
-0x9B47 = 0x774A
-0x9B48 = 0x774C
-0x9B49 = 0x774B
-0x9B4D = 0x774D
-0x9B4F = 0x4E3A
-0x9B51 = 0x774E
-0x9B54 = 0x4427
-0x9C7C = 0x5363
-0x9C7F = 0x764F
-0x9C81 = 0x4233
-0x9C82 = 0x7650
-0x9C85 = 0x7651
-0x9C86 = 0x7652
-0x9C87 = 0x7653
-0x9C88 = 0x7654
-0x9C8B = 0x7656
-0x9C8D = 0x312B
-0x9C8E = 0x7657
-0x9C90 = 0x7658
-0x9C91 = 0x7659
-0x9C92 = 0x765A
-0x9C94 = 0x765B
-0x9C95 = 0x765C
-0x9C9A = 0x765D
-0x9C9B = 0x765E
-0x9C9C = 0x4F4A
-0x9C9E = 0x765F
-0x9C9F = 0x7660
-0x9CA0 = 0x7661
-0x9CA1 = 0x7662
-0x9CA2 = 0x7663
-0x9CA3 = 0x7664
-0x9CA4 = 0x4070
-0x9CA5 = 0x7665
-0x9CA6 = 0x7666
-0x9CA7 = 0x7667
-0x9CA8 = 0x7668
-0x9CA9 = 0x7669
-0x9CAB = 0x766A
-0x9CAD = 0x766B
-0x9CAE = 0x766C
-0x9CB0 = 0x766D
-0x9CB1 = 0x766E
-0x9CB2 = 0x766F
-0x9CB3 = 0x7670
-0x9CB4 = 0x7671
-0x9CB5 = 0x7672
-0x9CB6 = 0x7673
-0x9CB7 = 0x7674
-0x9CB8 = 0x3E28
-0x9CBA = 0x7675
-0x9CBB = 0x7676
-0x9CBC = 0x7677
-0x9CBD = 0x7678
-0x9CC3 = 0x487A
-0x9CC4 = 0x7679
-0x9CC5 = 0x767A
-0x9CC6 = 0x767B
-0x9CC7 = 0x767C
-0x9CCA = 0x767D
-0x9CCB = 0x767E
-0x9CCC = 0x7721
-0x9CCD = 0x7722
-0x9CCE = 0x7723
-0x9CCF = 0x7724
-0x9CD0 = 0x7725
-0x9CD3 = 0x7726
-0x9CD4 = 0x7727
-0x9CD5 = 0x7728
-0x9CD6 = 0x316E
-0x9CD7 = 0x7729
-0x9CD8 = 0x772A
-0x9CD9 = 0x772B
-0x9CDC = 0x772C
-0x9CDD = 0x772D
-0x9CDE = 0x415B
-0x9CDF = 0x772E
-0x9CE2 = 0x772F
-0x9E1F = 0x4471
-0x9E20 = 0x702F
-0x9E21 = 0x3C26
-0x9E22 = 0x7030
-0x9E23 = 0x4379
-0x9E25 = 0x4538
-0x9E26 = 0x513B
-0x9E28 = 0x7031
-0x9E29 = 0x7032
-0x9E2A = 0x7033
-0x9E2B = 0x7034
-0x9E2C = 0x7035
-0x9E2D = 0x513C
-0x9E2F = 0x516C
-0x9E31 = 0x7037
-0x9E32 = 0x7036
-0x9E33 = 0x5427
-0x9E35 = 0x4D52
-0x9E36 = 0x7038
-0x9E37 = 0x703A
-0x9E38 = 0x7039
-0x9E39 = 0x703B
-0x9E3A = 0x703C
-0x9E3D = 0x386B
-0x9E3E = 0x703D
-0x9E3F = 0x3A68
-0x9E41 = 0x703E
-0x9E42 = 0x703F
-0x9E43 = 0x3E69
-0x9E44 = 0x7040
-0x9E45 = 0x366C
-0x9E46 = 0x7041
-0x9E47 = 0x7042
-0x9E48 = 0x7043
-0x9E49 = 0x7044
-0x9E4A = 0x4835
-0x9E4B = 0x7045
-0x9E4C = 0x7046
-0x9E4E = 0x7047
-0x9E4F = 0x4574
-0x9E51 = 0x7048
-0x9E55 = 0x7049
-0x9E57 = 0x704A
-0x9E58 = 0x773D
-0x9E5A = 0x704B
-0x9E5B = 0x704C
-0x9E5C = 0x704D
-0x9E5E = 0x704E
-0x9E63 = 0x704F
-0x9E64 = 0x3A57
-0x9E66 = 0x7050
-0x9E67 = 0x7051
-0x9E68 = 0x7052
-0x9E69 = 0x7053
-0x9E6A = 0x7054
-0x9E6B = 0x7055
-0x9E6C = 0x7056
-0x9E6D = 0x7058
-0x9E70 = 0x5325
-0x9E71 = 0x7057
-0x9E73 = 0x7059
-0x9E7E = 0x753A
-0x9E7F = 0x4239
-0x9E82 = 0x7764
-0x9E87 = 0x7765
-0x9E88 = 0x7766
-0x9E8B = 0x7767
-0x9E92 = 0x7768
-0x9E93 = 0x4234
-0x9E9D = 0x776A
-0x9E9F = 0x776B
-0x9EA6 = 0x4273
-0x9EB4 = 0x7470
-0x9EB8 = 0x746F
-0x9EBB = 0x4269
-0x9EBD = 0x7761
-0x9EBE = 0x7762
-0x9EC4 = 0x3B46
-0x9EC9 = 0x5964
-0x9ECD = 0x4A72
-0x9ECE = 0x4068
-0x9ECF = 0x7024
-0x9ED1 = 0x3A5A
-0x9ED4 = 0x472D
-0x9ED8 = 0x442C
-0x9EDB = 0x776C
-0x9EDC = 0x776D
-0x9EDD = 0x776E
-0x9EDF = 0x7770
-0x9EE0 = 0x776F
-0x9EE2 = 0x7771
-0x9EE5 = 0x7774
-0x9EE7 = 0x7773
-0x9EE9 = 0x7772
-0x9EEA = 0x7775
-0x9EEF = 0x7776
-0x9EF9 = 0x6D69
-0x9EFB = 0x6D6A
-0x9EFC = 0x6D6B
-0x9EFE = 0x763C
-0x9F0B = 0x763D
-0x9F0D = 0x763E
-0x9F0E = 0x3626
-0x9F10 = 0x583E
-0x9F13 = 0x3944
-0x9F17 = 0x583B
-0x9F19 = 0x5C31
-0x9F20 = 0x4A73
-0x9F22 = 0x7777
-0x9F2C = 0x7778
-0x9F2F = 0x7779
-0x9F37 = 0x777B
-0x9F39 = 0x777A
-0x9F3B = 0x3147
-0x9F3D = 0x777C
-0x9F3E = 0x777D
-0x9F44 = 0x777E
-0x9F50 = 0x466B
-0x9F51 = 0x6C34
-0x9F7F = 0x335D
-0x9F80 = 0x7633
-0x9F83 = 0x7634
-0x9F84 = 0x4164
-0x9F85 = 0x7635
-0x9F86 = 0x7636
-0x9F87 = 0x7637
-0x9F88 = 0x7638
-0x9F89 = 0x7639
-0x9F8A = 0x763A
-0x9F8B = 0x4823
-0x9F8C = 0x763B
-0x9F99 = 0x417A
-0x9F9A = 0x3928
-0x9F9B = 0x6D68
-0x9F9F = 0x396A
-0x9FA0 = 0x595F
-0xFF01 = 0x2321
-0xFF02 = 0x2322
-0xFF03 = 0x2323
-0xFF04 = 0x2167
-0xFF05 = 0x2325
-0xFF06 = 0x2326
-0xFF07 = 0x2327
-0xFF08 = 0x2328
-0xFF09 = 0x2329
-0xFF0A = 0x232A
-0xFF0B = 0x232B
-0xFF0C = 0x232C
-0xFF0D = 0x232D
-0xFF0E = 0x232E
-0xFF0F = 0x232F
-0xFF10 = 0x2330
-0xFF11 = 0x2331
-0xFF12 = 0x2332
-0xFF13 = 0x2333
-0xFF14 = 0x2334
-0xFF15 = 0x2335
-0xFF16 = 0x2336
-0xFF17 = 0x2337
-0xFF18 = 0x2338
-0xFF19 = 0x2339
-0xFF1A = 0x233A
-0xFF1B = 0x233B
-0xFF1C = 0x233C
-0xFF1D = 0x233D
-0xFF1E = 0x233E
-0xFF1F = 0x233F
-0xFF20 = 0x2340
-0xFF21 = 0x2341
-0xFF22 = 0x2342
-0xFF23 = 0x2343
-0xFF24 = 0x2344
-0xFF25 = 0x2345
-0xFF26 = 0x2346
-0xFF27 = 0x2347
-0xFF28 = 0x2348
-0xFF29 = 0x2349
-0xFF2A = 0x234A
-0xFF2B = 0x234B
-0xFF2C = 0x234C
-0xFF2D = 0x234D
-0xFF2E = 0x234E
-0xFF2F = 0x234F
-0xFF30 = 0x2350
-0xFF31 = 0x2351
-0xFF32 = 0x2352
-0xFF33 = 0x2353
-0xFF34 = 0x2354
-0xFF35 = 0x2355
-0xFF36 = 0x2356
-0xFF37 = 0x2357
-0xFF38 = 0x2358
-0xFF39 = 0x2359
-0xFF3A = 0x235A
-0xFF3B = 0x235B
-0xFF3C = 0x235C
-0xFF3D = 0x235D
-0xFF3E = 0x235E
-0xFF3F = 0x235F
-0xFF40 = 0x2360
-0xFF41 = 0x2361
-0xFF42 = 0x2362
-0xFF43 = 0x2363
-0xFF44 = 0x2364
-0xFF45 = 0x2365
-0xFF46 = 0x2366
-0xFF47 = 0x2367
-0xFF48 = 0x2368
-0xFF49 = 0x2369
-0xFF4A = 0x236A
-0xFF4B = 0x236B
-0xFF4C = 0x236C
-0xFF4D = 0x236D
-0xFF4E = 0x236E
-0xFF4F = 0x236F
-0xFF50 = 0x2370
-0xFF51 = 0x2371
-0xFF52 = 0x2372
-0xFF53 = 0x2373
-0xFF54 = 0x2374
-0xFF55 = 0x2375
-0xFF56 = 0x2376
-0xFF57 = 0x2377
-0xFF58 = 0x2378
-0xFF59 = 0x2379
-0xFF5A = 0x237A
-0xFF5B = 0x237B
-0xFF5C = 0x237C
-0xFF5D = 0x237D
-0xFF5E = 0x212B
-0xFFE0 = 0x2169
-0xFFE1 = 0x216A
-0xFFE3 = 0x237E
-0xFFE5 = 0x2324
-END_MAP
diff --git a/enc/trans/JIS/JISX0201-KANA%UCS.src b/enc/trans/JIS/JISX0201-KANA%UCS.src
deleted file mode 100644
index d25b580fed..0000000000
--- a/enc/trans/JIS/JISX0201-KANA%UCS.src
+++ /dev/null
@@ -1,127 +0,0 @@
-# $NetBSD: JISX0201-KANA%UCS.src,v 1.3 2006/10/26 16:19:02 tnozaki Exp $
-
-TYPE ROWCOL
-NAME JISX0201-KANA/UCS
-SRC_ZONE 0x21-0x5F
-OOB_MODE ILSEQ
-DST_ILSEQ 0xFFFE
-DST_UNIT_BITS 16
-
-BEGIN_MAP
-#
-# This mapping data is made from the mapping data provided by Unicode, Inc.
-# Original notice:
-#
-# Name: JIS X 0201 (1976) to Unicode 1.1 Table
-# Unicode version: 1.1
-# Table version: 0.9
-# Table format: Format A
-# Date: 8 March 1994
-#
-# Copyright (c) 1991-1994 Unicode, Inc. All Rights reserved.
-#
-# This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
-# No claims are made as to fitness for any particular purpose. No
-# warranties of any kind are expressed or implied. The recipient
-# agrees to determine applicability of information provided. If this
-# file has been provided on magnetic media by Unicode, Inc., the sole
-# remedy for any claim will be exchange of defective media within 90
-# days of receipt.
-#
-# Recipient is granted the right to make copies in any form for
-# internal distribution and to freely use the information supplied
-# in the creation of products supporting Unicode. Unicode, Inc.
-# specifically excludes the right to re-distribute this file directly
-# to third parties or other organizations whether for profit or not.
-#
-# General notes:
-#
-#
-# This table contains one set of mappings from JIS X 0201 into Unicode.
-# Note that these data are *possible* mappings only and may not be the
-# same as those used by actual products, nor may they be the best suited
-# for all uses. For more information on the mappings between various code
-# pages incorporating the repertoire of JIS X 0201 and Unicode, consult the
-# VENDORS mapping data. Normative information on the mapping between
-# JIS X 0201 and Unicode may be found in the Unihan.txt file in the
-# latest Unicode Character Database.
-#
-# If you have carefully considered the fact that the mappings in
-# this table are only one possible set of mappings between JIS X 0201 and
-# Unicode and have no normative status, but still feel that you
-# have located an error in the table that requires fixing, you may
-# report any such error to errata@unicode.org.
-#
-#
-# Format: Three tab-separated columns
-# Column #1 is the shift JIS code (in hex as 0xXX)
-# Column #2 is the Unicode (in hex as 0xXXXX)
-# Column #3 the Unicode (ISO 10646) name (follows a comment sign)
-#
-# The entries are in JIS order
-#
-#
-0x21 = 0xFF61
-0x22 = 0xFF62
-0x23 = 0xFF63
-0x24 = 0xFF64
-0x25 = 0xFF65
-0x26 = 0xFF66
-0x27 = 0xFF67
-0x28 = 0xFF68
-0x29 = 0xFF69
-0x2A = 0xFF6A
-0x2B = 0xFF6B
-0x2C = 0xFF6C
-0x2D = 0xFF6D
-0x2E = 0xFF6E
-0x2F = 0xFF6F
-0x30 = 0xFF70
-0x31 = 0xFF71
-0x32 = 0xFF72
-0x33 = 0xFF73
-0x34 = 0xFF74
-0x35 = 0xFF75
-0x36 = 0xFF76
-0x37 = 0xFF77
-0x38 = 0xFF78
-0x39 = 0xFF79
-0x3A = 0xFF7A
-0x3B = 0xFF7B
-0x3C = 0xFF7C
-0x3D = 0xFF7D
-0x3E = 0xFF7E
-0x3F = 0xFF7F
-0x40 = 0xFF80
-0x41 = 0xFF81
-0x42 = 0xFF82
-0x43 = 0xFF83
-0x44 = 0xFF84
-0x45 = 0xFF85
-0x46 = 0xFF86
-0x47 = 0xFF87
-0x48 = 0xFF88
-0x49 = 0xFF89
-0x4A = 0xFF8A
-0x4B = 0xFF8B
-0x4C = 0xFF8C
-0x4D = 0xFF8D
-0x4E = 0xFF8E
-0x4F = 0xFF8F
-0x50 = 0xFF90
-0x51 = 0xFF91
-0x52 = 0xFF92
-0x53 = 0xFF93
-0x54 = 0xFF94
-0x55 = 0xFF95
-0x56 = 0xFF96
-0x57 = 0xFF97
-0x58 = 0xFF98
-0x59 = 0xFF99
-0x5A = 0xFF9A
-0x5B = 0xFF9B
-0x5C = 0xFF9C
-0x5D = 0xFF9D
-0x5E = 0xFF9E
-0x5F = 0xFF9F
-END_MAP
diff --git a/enc/trans/JIS/JISX0208@1990%UCS.src b/enc/trans/JIS/JISX0208@1990%UCS.src
deleted file mode 100644
index c2cacd422e..0000000000
--- a/enc/trans/JIS/JISX0208@1990%UCS.src
+++ /dev/null
@@ -1,6972 +0,0 @@
-# $NetBSD: JISX0208@1990%UCS.src,v 1.5 2006/12/02 14:36:13 tnozaki Exp $
-
-TYPE ROWCOL
-NAME JISX0208:1990/UCS
-SRC_ZONE 0x21-0x74 / 0x21-0x7E / 8
-OOB_MODE ILSEQ
-DST_ILSEQ 0xFFFE
-DST_UNIT_BITS 16
-
-BEGIN_MAP
-#
-# This mapping data is made from the mapping data provided by Unicode, Inc.
-# Original notice:
-#
-# Name: JIS X 0208 (1990) to Unicode
-# Unicode version: 1.1
-# Table version: 0.9
-# Table format: Format A
-# Date: 8 March 1994
-#
-# Copyright (c) 1991-1994 Unicode, Inc. All Rights reserved.
-#
-# This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
-# No claims are made as to fitness for any particular purpose. No
-# warranties of any kind are expressed or implied. The recipient
-# agrees to determine applicability of information provided. If this
-# file has been provided on magnetic media by Unicode, Inc., the sole
-# remedy for any claim will be exchange of defective media within 90
-# days of receipt.
-#
-# Recipient is granted the right to make copies in any form for
-# internal distribution and to freely use the information supplied
-# in the creation of products supporting Unicode. Unicode, Inc.
-# specifically excludes the right to re-distribute this file directly
-# to third parties or other organizations whether for profit or not.
-#
-# General notes:
-#
-#
-# This table contains one set of mappings from JIS X 0208 (1990) into Unicode.
-# Note that these data are *possible* mappings only and may not be the
-# same as those used by actual products, nor may they be the best suited
-# for all uses. For more information on the mappings between various code
-# pages incorporating the repertoire of JIS X 0208 (1990) and Unicode, consult the
-# VENDORS mapping data. Normative information on the mapping between
-# JIS X 0208 (1990) and Unicode may be found in the Unihan.txt file in the
-# latest Unicode Character Database.
-#
-# If you have carefully considered the fact that the mappings in
-# this table are only one possible set of mappings between JIS X 0208 (1990)
-# and Unicode and have no normative status, but still feel that you
-# have located an error in the table that requires fixing, you may
-# report any such error to errata@unicode.org.
-#
-#
-# Format: Four tab-separated columns
-# Column #1 is the shift-JIS code (in hex)
-# Column #2 is the JIS X 0208 code (in hex as 0xXXXX)
-# Column #3 is the Unicode (in hex as 0xXXXX)
-# Column #4 the Unicode name (follows a comment sign, '#')
-# The official names for Unicode characters U+4E00
-# to U+9FA5, inclusive, is "CJK UNIFIED IDEOGRAPH-XXXX",
-# where XXXX is the code point. Including all these
-# names in this file increases its size substantially
-# and needlessly. The token "<CJK>" is used for the
-# name of these characters. If necessary, it can be
-# expanded algorithmically by a parser or editor.
-#
-# The entries are in JIS X 0208 order
-#
-# The following algorithms can be used to change the hex form
-# of JIS 0208 to other standard forms:
-#
-# To change hex to EUC form, add 0x8080
-# To change hex to kuten form, first subtract 0x2020. Then
-# the high and low bytes correspond to the ku and ten of
-# the kuten form. For example, 0x2121 -> 0x0101 -> 0101;
-# 0x7426 -> 0x5406 -> 8406
-#
-# The kanji mappings are a normative part of ISO/IEC 10646. The
-# non-kanji mappings are provisional, pending definition of
-# official mappings by Japanese standards bodies
-#
-# Any comments or problems, contact <John_Jenkins@taligent.com>
-#
-#
-# NetBSD specific modification:
-# 2003-08-18 : change the conversion for reverse solidus (0x2140).
-# Unicode Inc.'s table converts it to U+005C,
-# but this may conflict in the case of compound encoding,
-# e.g. EUC-JP. Instead, we use U+FF3C.
-#
-0x2121 = 0x3000
-0x2122 = 0x3001
-0x2123 = 0x3002
-0x2124 = 0xFF0C
-0x2125 = 0xFF0E
-0x2126 = 0x30FB
-0x2127 = 0xFF1A
-0x2128 = 0xFF1B
-0x2129 = 0xFF1F
-0x212A = 0xFF01
-0x212B = 0x309B
-0x212C = 0x309C
-0x212D = 0x00B4
-0x212E = 0xFF40
-0x212F = 0x00A8
-0x2130 = 0xFF3E
-0x2131 = 0xFFE3
-0x2132 = 0xFF3F
-0x2133 = 0x30FD
-0x2134 = 0x30FE
-0x2135 = 0x309D
-0x2136 = 0x309E
-0x2137 = 0x3003
-0x2138 = 0x4EDD
-0x2139 = 0x3005
-0x213A = 0x3006
-0x213B = 0x3007
-0x213C = 0x30FC
-0x213D = 0x2014
-0x213E = 0x2010
-0x213F = 0xFF0F
-0x2140 = 0xFF3C
-0x2141 = 0x301C
-0x2142 = 0x2016
-0x2143 = 0xFF5C
-0x2144 = 0x2026
-0x2145 = 0x2025
-0x2146 = 0x2018
-0x2147 = 0x2019
-0x2148 = 0x201C
-0x2149 = 0x201D
-0x214A = 0xFF08
-0x214B = 0xFF09
-0x214C = 0x3014
-0x214D = 0x3015
-0x214E = 0xFF3B
-0x214F = 0xFF3D
-0x2150 = 0xFF5B
-0x2151 = 0xFF5D
-0x2152 = 0x3008
-0x2153 = 0x3009
-0x2154 = 0x300A
-0x2155 = 0x300B
-0x2156 = 0x300C
-0x2157 = 0x300D
-0x2158 = 0x300E
-0x2159 = 0x300F
-0x215A = 0x3010
-0x215B = 0x3011
-0x215C = 0xFF0B
-0x215D = 0x2212
-0x215E = 0x00B1
-0x215F = 0x00D7
-0x2160 = 0x00F7
-0x2161 = 0xFF1D
-0x2162 = 0x2260
-0x2163 = 0xFF1C
-0x2164 = 0xFF1E
-0x2165 = 0x2266
-0x2166 = 0x2267
-0x2167 = 0x221E
-0x2168 = 0x2234
-0x2169 = 0x2642
-0x216A = 0x2640
-0x216B = 0x00B0
-0x216C = 0x2032
-0x216D = 0x2033
-0x216E = 0x2103
-0x216F = 0xFFE5
-0x2170 = 0xFF04
-0x2171 = 0x00A2
-0x2172 = 0x00A3
-0x2173 = 0xFF05
-0x2174 = 0xFF03
-0x2175 = 0xFF06
-0x2176 = 0xFF0A
-0x2177 = 0xFF20
-0x2178 = 0x00A7
-0x2179 = 0x2606
-0x217A = 0x2605
-0x217B = 0x25CB
-0x217C = 0x25CF
-0x217D = 0x25CE
-0x217E = 0x25C7
-0x2221 = 0x25C6
-0x2222 = 0x25A1
-0x2223 = 0x25A0
-0x2224 = 0x25B3
-0x2225 = 0x25B2
-0x2226 = 0x25BD
-0x2227 = 0x25BC
-0x2228 = 0x203B
-0x2229 = 0x3012
-0x222A = 0x2192
-0x222B = 0x2190
-0x222C = 0x2191
-0x222D = 0x2193
-0x222E = 0x3013
-0x223A = 0x2208
-0x223B = 0x220B
-0x223C = 0x2286
-0x223D = 0x2287
-0x223E = 0x2282
-0x223F = 0x2283
-0x2240 = 0x222A
-0x2241 = 0x2229
-0x224A = 0x2227
-0x224B = 0x2228
-0x224C = 0x00AC
-0x224D = 0x21D2
-0x224E = 0x21D4
-0x224F = 0x2200
-0x2250 = 0x2203
-0x225C = 0x2220
-0x225D = 0x22A5
-0x225E = 0x2312
-0x225F = 0x2202
-0x2260 = 0x2207
-0x2261 = 0x2261
-0x2262 = 0x2252
-0x2263 = 0x226A
-0x2264 = 0x226B
-0x2265 = 0x221A
-0x2266 = 0x223D
-0x2267 = 0x221D
-0x2268 = 0x2235
-0x2269 = 0x222B
-0x226A = 0x222C
-0x2272 = 0x212B
-0x2273 = 0x2030
-0x2274 = 0x266F
-0x2275 = 0x266D
-0x2276 = 0x266A
-0x2277 = 0x2020
-0x2278 = 0x2021
-0x2279 = 0x00B6
-0x227E = 0x25EF
-0x2330 = 0xFF10
-0x2331 = 0xFF11
-0x2332 = 0xFF12
-0x2333 = 0xFF13
-0x2334 = 0xFF14
-0x2335 = 0xFF15
-0x2336 = 0xFF16
-0x2337 = 0xFF17
-0x2338 = 0xFF18
-0x2339 = 0xFF19
-0x2341 = 0xFF21
-0x2342 = 0xFF22
-0x2343 = 0xFF23
-0x2344 = 0xFF24
-0x2345 = 0xFF25
-0x2346 = 0xFF26
-0x2347 = 0xFF27
-0x2348 = 0xFF28
-0x2349 = 0xFF29
-0x234A = 0xFF2A
-0x234B = 0xFF2B
-0x234C = 0xFF2C
-0x234D = 0xFF2D
-0x234E = 0xFF2E
-0x234F = 0xFF2F
-0x2350 = 0xFF30
-0x2351 = 0xFF31
-0x2352 = 0xFF32
-0x2353 = 0xFF33
-0x2354 = 0xFF34
-0x2355 = 0xFF35
-0x2356 = 0xFF36
-0x2357 = 0xFF37
-0x2358 = 0xFF38
-0x2359 = 0xFF39
-0x235A = 0xFF3A
-0x2361 = 0xFF41
-0x2362 = 0xFF42
-0x2363 = 0xFF43
-0x2364 = 0xFF44
-0x2365 = 0xFF45
-0x2366 = 0xFF46
-0x2367 = 0xFF47
-0x2368 = 0xFF48
-0x2369 = 0xFF49
-0x236A = 0xFF4A
-0x236B = 0xFF4B
-0x236C = 0xFF4C
-0x236D = 0xFF4D
-0x236E = 0xFF4E
-0x236F = 0xFF4F
-0x2370 = 0xFF50
-0x2371 = 0xFF51
-0x2372 = 0xFF52
-0x2373 = 0xFF53
-0x2374 = 0xFF54
-0x2375 = 0xFF55
-0x2376 = 0xFF56
-0x2377 = 0xFF57
-0x2378 = 0xFF58
-0x2379 = 0xFF59
-0x237A = 0xFF5A
-0x2421 = 0x3041
-0x2422 = 0x3042
-0x2423 = 0x3043
-0x2424 = 0x3044
-0x2425 = 0x3045
-0x2426 = 0x3046
-0x2427 = 0x3047
-0x2428 = 0x3048
-0x2429 = 0x3049
-0x242A = 0x304A
-0x242B = 0x304B
-0x242C = 0x304C
-0x242D = 0x304D
-0x242E = 0x304E
-0x242F = 0x304F
-0x2430 = 0x3050
-0x2431 = 0x3051
-0x2432 = 0x3052
-0x2433 = 0x3053
-0x2434 = 0x3054
-0x2435 = 0x3055
-0x2436 = 0x3056
-0x2437 = 0x3057
-0x2438 = 0x3058
-0x2439 = 0x3059
-0x243A = 0x305A
-0x243B = 0x305B
-0x243C = 0x305C
-0x243D = 0x305D
-0x243E = 0x305E
-0x243F = 0x305F
-0x2440 = 0x3060
-0x2441 = 0x3061
-0x2442 = 0x3062
-0x2443 = 0x3063
-0x2444 = 0x3064
-0x2445 = 0x3065
-0x2446 = 0x3066
-0x2447 = 0x3067
-0x2448 = 0x3068
-0x2449 = 0x3069
-0x244A = 0x306A
-0x244B = 0x306B
-0x244C = 0x306C
-0x244D = 0x306D
-0x244E = 0x306E
-0x244F = 0x306F
-0x2450 = 0x3070
-0x2451 = 0x3071
-0x2452 = 0x3072
-0x2453 = 0x3073
-0x2454 = 0x3074
-0x2455 = 0x3075
-0x2456 = 0x3076
-0x2457 = 0x3077
-0x2458 = 0x3078
-0x2459 = 0x3079
-0x245A = 0x307A
-0x245B = 0x307B
-0x245C = 0x307C
-0x245D = 0x307D
-0x245E = 0x307E
-0x245F = 0x307F
-0x2460 = 0x3080
-0x2461 = 0x3081
-0x2462 = 0x3082
-0x2463 = 0x3083
-0x2464 = 0x3084
-0x2465 = 0x3085
-0x2466 = 0x3086
-0x2467 = 0x3087
-0x2468 = 0x3088
-0x2469 = 0x3089
-0x246A = 0x308A
-0x246B = 0x308B
-0x246C = 0x308C
-0x246D = 0x308D
-0x246E = 0x308E
-0x246F = 0x308F
-0x2470 = 0x3090
-0x2471 = 0x3091
-0x2472 = 0x3092
-0x2473 = 0x3093
-0x2521 = 0x30A1
-0x2522 = 0x30A2
-0x2523 = 0x30A3
-0x2524 = 0x30A4
-0x2525 = 0x30A5
-0x2526 = 0x30A6
-0x2527 = 0x30A7
-0x2528 = 0x30A8
-0x2529 = 0x30A9
-0x252A = 0x30AA
-0x252B = 0x30AB
-0x252C = 0x30AC
-0x252D = 0x30AD
-0x252E = 0x30AE
-0x252F = 0x30AF
-0x2530 = 0x30B0
-0x2531 = 0x30B1
-0x2532 = 0x30B2
-0x2533 = 0x30B3
-0x2534 = 0x30B4
-0x2535 = 0x30B5
-0x2536 = 0x30B6
-0x2537 = 0x30B7
-0x2538 = 0x30B8
-0x2539 = 0x30B9
-0x253A = 0x30BA
-0x253B = 0x30BB
-0x253C = 0x30BC
-0x253D = 0x30BD
-0x253E = 0x30BE
-0x253F = 0x30BF
-0x2540 = 0x30C0
-0x2541 = 0x30C1
-0x2542 = 0x30C2
-0x2543 = 0x30C3
-0x2544 = 0x30C4
-0x2545 = 0x30C5
-0x2546 = 0x30C6
-0x2547 = 0x30C7
-0x2548 = 0x30C8
-0x2549 = 0x30C9
-0x254A = 0x30CA
-0x254B = 0x30CB
-0x254C = 0x30CC
-0x254D = 0x30CD
-0x254E = 0x30CE
-0x254F = 0x30CF
-0x2550 = 0x30D0
-0x2551 = 0x30D1
-0x2552 = 0x30D2
-0x2553 = 0x30D3
-0x2554 = 0x30D4
-0x2555 = 0x30D5
-0x2556 = 0x30D6
-0x2557 = 0x30D7
-0x2558 = 0x30D8
-0x2559 = 0x30D9
-0x255A = 0x30DA
-0x255B = 0x30DB
-0x255C = 0x30DC
-0x255D = 0x30DD
-0x255E = 0x30DE
-0x255F = 0x30DF
-0x2560 = 0x30E0
-0x2561 = 0x30E1
-0x2562 = 0x30E2
-0x2563 = 0x30E3
-0x2564 = 0x30E4
-0x2565 = 0x30E5
-0x2566 = 0x30E6
-0x2567 = 0x30E7
-0x2568 = 0x30E8
-0x2569 = 0x30E9
-0x256A = 0x30EA
-0x256B = 0x30EB
-0x256C = 0x30EC
-0x256D = 0x30ED
-0x256E = 0x30EE
-0x256F = 0x30EF
-0x2570 = 0x30F0
-0x2571 = 0x30F1
-0x2572 = 0x30F2
-0x2573 = 0x30F3
-0x2574 = 0x30F4
-0x2575 = 0x30F5
-0x2576 = 0x30F6
-0x2621 = 0x0391
-0x2622 = 0x0392
-0x2623 = 0x0393
-0x2624 = 0x0394
-0x2625 = 0x0395
-0x2626 = 0x0396
-0x2627 = 0x0397
-0x2628 = 0x0398
-0x2629 = 0x0399
-0x262A = 0x039A
-0x262B = 0x039B
-0x262C = 0x039C
-0x262D = 0x039D
-0x262E = 0x039E
-0x262F = 0x039F
-0x2630 = 0x03A0
-0x2631 = 0x03A1
-0x2632 = 0x03A3
-0x2633 = 0x03A4
-0x2634 = 0x03A5
-0x2635 = 0x03A6
-0x2636 = 0x03A7
-0x2637 = 0x03A8
-0x2638 = 0x03A9
-0x2641 = 0x03B1
-0x2642 = 0x03B2
-0x2643 = 0x03B3
-0x2644 = 0x03B4
-0x2645 = 0x03B5
-0x2646 = 0x03B6
-0x2647 = 0x03B7
-0x2648 = 0x03B8
-0x2649 = 0x03B9
-0x264A = 0x03BA
-0x264B = 0x03BB
-0x264C = 0x03BC
-0x264D = 0x03BD
-0x264E = 0x03BE
-0x264F = 0x03BF
-0x2650 = 0x03C0
-0x2651 = 0x03C1
-0x2652 = 0x03C3
-0x2653 = 0x03C4
-0x2654 = 0x03C5
-0x2655 = 0x03C6
-0x2656 = 0x03C7
-0x2657 = 0x03C8
-0x2658 = 0x03C9
-0x2721 = 0x0410
-0x2722 = 0x0411
-0x2723 = 0x0412
-0x2724 = 0x0413
-0x2725 = 0x0414
-0x2726 = 0x0415
-0x2727 = 0x0401
-0x2728 = 0x0416
-0x2729 = 0x0417
-0x272A = 0x0418
-0x272B = 0x0419
-0x272C = 0x041A
-0x272D = 0x041B
-0x272E = 0x041C
-0x272F = 0x041D
-0x2730 = 0x041E
-0x2731 = 0x041F
-0x2732 = 0x0420
-0x2733 = 0x0421
-0x2734 = 0x0422
-0x2735 = 0x0423
-0x2736 = 0x0424
-0x2737 = 0x0425
-0x2738 = 0x0426
-0x2739 = 0x0427
-0x273A = 0x0428
-0x273B = 0x0429
-0x273C = 0x042A
-0x273D = 0x042B
-0x273E = 0x042C
-0x273F = 0x042D
-0x2740 = 0x042E
-0x2741 = 0x042F
-0x2751 = 0x0430
-0x2752 = 0x0431
-0x2753 = 0x0432
-0x2754 = 0x0433
-0x2755 = 0x0434
-0x2756 = 0x0435
-0x2757 = 0x0451
-0x2758 = 0x0436
-0x2759 = 0x0437
-0x275A = 0x0438
-0x275B = 0x0439
-0x275C = 0x043A
-0x275D = 0x043B
-0x275E = 0x043C
-0x275F = 0x043D
-0x2760 = 0x043E
-0x2761 = 0x043F
-0x2762 = 0x0440
-0x2763 = 0x0441
-0x2764 = 0x0442
-0x2765 = 0x0443
-0x2766 = 0x0444
-0x2767 = 0x0445
-0x2768 = 0x0446
-0x2769 = 0x0447
-0x276A = 0x0448
-0x276B = 0x0449
-0x276C = 0x044A
-0x276D = 0x044B
-0x276E = 0x044C
-0x276F = 0x044D
-0x2770 = 0x044E
-0x2771 = 0x044F
-0x2821 = 0x2500
-0x2822 = 0x2502
-0x2823 = 0x250C
-0x2824 = 0x2510
-0x2825 = 0x2518
-0x2826 = 0x2514
-0x2827 = 0x251C
-0x2828 = 0x252C
-0x2829 = 0x2524
-0x282A = 0x2534
-0x282B = 0x253C
-0x282C = 0x2501
-0x282D = 0x2503
-0x282E = 0x250F
-0x282F = 0x2513
-0x2830 = 0x251B
-0x2831 = 0x2517
-0x2832 = 0x2523
-0x2833 = 0x2533
-0x2834 = 0x252B
-0x2835 = 0x253B
-0x2836 = 0x254B
-0x2837 = 0x2520
-0x2838 = 0x252F
-0x2839 = 0x2528
-0x283A = 0x2537
-0x283B = 0x253F
-0x283C = 0x251D
-0x283D = 0x2530
-0x283E = 0x2525
-0x283F = 0x2538
-0x2840 = 0x2542
-0x3021 = 0x4E9C
-0x3022 = 0x5516
-0x3023 = 0x5A03
-0x3024 = 0x963F
-0x3025 = 0x54C0
-0x3026 = 0x611B
-0x3027 = 0x6328
-0x3028 = 0x59F6
-0x3029 = 0x9022
-0x302A = 0x8475
-0x302B = 0x831C
-0x302C = 0x7A50
-0x302D = 0x60AA
-0x302E = 0x63E1
-0x302F = 0x6E25
-0x3030 = 0x65ED
-0x3031 = 0x8466
-0x3032 = 0x82A6
-0x3033 = 0x9BF5
-0x3034 = 0x6893
-0x3035 = 0x5727
-0x3036 = 0x65A1
-0x3037 = 0x6271
-0x3038 = 0x5B9B
-0x3039 = 0x59D0
-0x303A = 0x867B
-0x303B = 0x98F4
-0x303C = 0x7D62
-0x303D = 0x7DBE
-0x303E = 0x9B8E
-0x303F = 0x6216
-0x3040 = 0x7C9F
-0x3041 = 0x88B7
-0x3042 = 0x5B89
-0x3043 = 0x5EB5
-0x3044 = 0x6309
-0x3045 = 0x6697
-0x3046 = 0x6848
-0x3047 = 0x95C7
-0x3048 = 0x978D
-0x3049 = 0x674F
-0x304A = 0x4EE5
-0x304B = 0x4F0A
-0x304C = 0x4F4D
-0x304D = 0x4F9D
-0x304E = 0x5049
-0x304F = 0x56F2
-0x3050 = 0x5937
-0x3051 = 0x59D4
-0x3052 = 0x5A01
-0x3053 = 0x5C09
-0x3054 = 0x60DF
-0x3055 = 0x610F
-0x3056 = 0x6170
-0x3057 = 0x6613
-0x3058 = 0x6905
-0x3059 = 0x70BA
-0x305A = 0x754F
-0x305B = 0x7570
-0x305C = 0x79FB
-0x305D = 0x7DAD
-0x305E = 0x7DEF
-0x305F = 0x80C3
-0x3060 = 0x840E
-0x3061 = 0x8863
-0x3062 = 0x8B02
-0x3063 = 0x9055
-0x3064 = 0x907A
-0x3065 = 0x533B
-0x3066 = 0x4E95
-0x3067 = 0x4EA5
-0x3068 = 0x57DF
-0x3069 = 0x80B2
-0x306A = 0x90C1
-0x306B = 0x78EF
-0x306C = 0x4E00
-0x306D = 0x58F1
-0x306E = 0x6EA2
-0x306F = 0x9038
-0x3070 = 0x7A32
-0x3071 = 0x8328
-0x3072 = 0x828B
-0x3073 = 0x9C2F
-0x3074 = 0x5141
-0x3075 = 0x5370
-0x3076 = 0x54BD
-0x3077 = 0x54E1
-0x3078 = 0x56E0
-0x3079 = 0x59FB
-0x307A = 0x5F15
-0x307B = 0x98F2
-0x307C = 0x6DEB
-0x307D = 0x80E4
-0x307E = 0x852D
-0x3121 = 0x9662
-0x3122 = 0x9670
-0x3123 = 0x96A0
-0x3124 = 0x97FB
-0x3125 = 0x540B
-0x3126 = 0x53F3
-0x3127 = 0x5B87
-0x3128 = 0x70CF
-0x3129 = 0x7FBD
-0x312A = 0x8FC2
-0x312B = 0x96E8
-0x312C = 0x536F
-0x312D = 0x9D5C
-0x312E = 0x7ABA
-0x312F = 0x4E11
-0x3130 = 0x7893
-0x3131 = 0x81FC
-0x3132 = 0x6E26
-0x3133 = 0x5618
-0x3134 = 0x5504
-0x3135 = 0x6B1D
-0x3136 = 0x851A
-0x3137 = 0x9C3B
-0x3138 = 0x59E5
-0x3139 = 0x53A9
-0x313A = 0x6D66
-0x313B = 0x74DC
-0x313C = 0x958F
-0x313D = 0x5642
-0x313E = 0x4E91
-0x313F = 0x904B
-0x3140 = 0x96F2
-0x3141 = 0x834F
-0x3142 = 0x990C
-0x3143 = 0x53E1
-0x3144 = 0x55B6
-0x3145 = 0x5B30
-0x3146 = 0x5F71
-0x3147 = 0x6620
-0x3148 = 0x66F3
-0x3149 = 0x6804
-0x314A = 0x6C38
-0x314B = 0x6CF3
-0x314C = 0x6D29
-0x314D = 0x745B
-0x314E = 0x76C8
-0x314F = 0x7A4E
-0x3150 = 0x9834
-0x3151 = 0x82F1
-0x3152 = 0x885B
-0x3153 = 0x8A60
-0x3154 = 0x92ED
-0x3155 = 0x6DB2
-0x3156 = 0x75AB
-0x3157 = 0x76CA
-0x3158 = 0x99C5
-0x3159 = 0x60A6
-0x315A = 0x8B01
-0x315B = 0x8D8A
-0x315C = 0x95B2
-0x315D = 0x698E
-0x315E = 0x53AD
-0x315F = 0x5186
-0x3160 = 0x5712
-0x3161 = 0x5830
-0x3162 = 0x5944
-0x3163 = 0x5BB4
-0x3164 = 0x5EF6
-0x3165 = 0x6028
-0x3166 = 0x63A9
-0x3167 = 0x63F4
-0x3168 = 0x6CBF
-0x3169 = 0x6F14
-0x316A = 0x708E
-0x316B = 0x7114
-0x316C = 0x7159
-0x316D = 0x71D5
-0x316E = 0x733F
-0x316F = 0x7E01
-0x3170 = 0x8276
-0x3171 = 0x82D1
-0x3172 = 0x8597
-0x3173 = 0x9060
-0x3174 = 0x925B
-0x3175 = 0x9D1B
-0x3176 = 0x5869
-0x3177 = 0x65BC
-0x3178 = 0x6C5A
-0x3179 = 0x7525
-0x317A = 0x51F9
-0x317B = 0x592E
-0x317C = 0x5965
-0x317D = 0x5F80
-0x317E = 0x5FDC
-0x3221 = 0x62BC
-0x3222 = 0x65FA
-0x3223 = 0x6A2A
-0x3224 = 0x6B27
-0x3225 = 0x6BB4
-0x3226 = 0x738B
-0x3227 = 0x7FC1
-0x3228 = 0x8956
-0x3229 = 0x9D2C
-0x322A = 0x9D0E
-0x322B = 0x9EC4
-0x322C = 0x5CA1
-0x322D = 0x6C96
-0x322E = 0x837B
-0x322F = 0x5104
-0x3230 = 0x5C4B
-0x3231 = 0x61B6
-0x3232 = 0x81C6
-0x3233 = 0x6876
-0x3234 = 0x7261
-0x3235 = 0x4E59
-0x3236 = 0x4FFA
-0x3237 = 0x5378
-0x3238 = 0x6069
-0x3239 = 0x6E29
-0x323A = 0x7A4F
-0x323B = 0x97F3
-0x323C = 0x4E0B
-0x323D = 0x5316
-0x323E = 0x4EEE
-0x323F = 0x4F55
-0x3240 = 0x4F3D
-0x3241 = 0x4FA1
-0x3242 = 0x4F73
-0x3243 = 0x52A0
-0x3244 = 0x53EF
-0x3245 = 0x5609
-0x3246 = 0x590F
-0x3247 = 0x5AC1
-0x3248 = 0x5BB6
-0x3249 = 0x5BE1
-0x324A = 0x79D1
-0x324B = 0x6687
-0x324C = 0x679C
-0x324D = 0x67B6
-0x324E = 0x6B4C
-0x324F = 0x6CB3
-0x3250 = 0x706B
-0x3251 = 0x73C2
-0x3252 = 0x798D
-0x3253 = 0x79BE
-0x3254 = 0x7A3C
-0x3255 = 0x7B87
-0x3256 = 0x82B1
-0x3257 = 0x82DB
-0x3258 = 0x8304
-0x3259 = 0x8377
-0x325A = 0x83EF
-0x325B = 0x83D3
-0x325C = 0x8766
-0x325D = 0x8AB2
-0x325E = 0x5629
-0x325F = 0x8CA8
-0x3260 = 0x8FE6
-0x3261 = 0x904E
-0x3262 = 0x971E
-0x3263 = 0x868A
-0x3264 = 0x4FC4
-0x3265 = 0x5CE8
-0x3266 = 0x6211
-0x3267 = 0x7259
-0x3268 = 0x753B
-0x3269 = 0x81E5
-0x326A = 0x82BD
-0x326B = 0x86FE
-0x326C = 0x8CC0
-0x326D = 0x96C5
-0x326E = 0x9913
-0x326F = 0x99D5
-0x3270 = 0x4ECB
-0x3271 = 0x4F1A
-0x3272 = 0x89E3
-0x3273 = 0x56DE
-0x3274 = 0x584A
-0x3275 = 0x58CA
-0x3276 = 0x5EFB
-0x3277 = 0x5FEB
-0x3278 = 0x602A
-0x3279 = 0x6094
-0x327A = 0x6062
-0x327B = 0x61D0
-0x327C = 0x6212
-0x327D = 0x62D0
-0x327E = 0x6539
-0x3321 = 0x9B41
-0x3322 = 0x6666
-0x3323 = 0x68B0
-0x3324 = 0x6D77
-0x3325 = 0x7070
-0x3326 = 0x754C
-0x3327 = 0x7686
-0x3328 = 0x7D75
-0x3329 = 0x82A5
-0x332A = 0x87F9
-0x332B = 0x958B
-0x332C = 0x968E
-0x332D = 0x8C9D
-0x332E = 0x51F1
-0x332F = 0x52BE
-0x3330 = 0x5916
-0x3331 = 0x54B3
-0x3332 = 0x5BB3
-0x3333 = 0x5D16
-0x3334 = 0x6168
-0x3335 = 0x6982
-0x3336 = 0x6DAF
-0x3337 = 0x788D
-0x3338 = 0x84CB
-0x3339 = 0x8857
-0x333A = 0x8A72
-0x333B = 0x93A7
-0x333C = 0x9AB8
-0x333D = 0x6D6C
-0x333E = 0x99A8
-0x333F = 0x86D9
-0x3340 = 0x57A3
-0x3341 = 0x67FF
-0x3342 = 0x86CE
-0x3343 = 0x920E
-0x3344 = 0x5283
-0x3345 = 0x5687
-0x3346 = 0x5404
-0x3347 = 0x5ED3
-0x3348 = 0x62E1
-0x3349 = 0x64B9
-0x334A = 0x683C
-0x334B = 0x6838
-0x334C = 0x6BBB
-0x334D = 0x7372
-0x334E = 0x78BA
-0x334F = 0x7A6B
-0x3350 = 0x899A
-0x3351 = 0x89D2
-0x3352 = 0x8D6B
-0x3353 = 0x8F03
-0x3354 = 0x90ED
-0x3355 = 0x95A3
-0x3356 = 0x9694
-0x3357 = 0x9769
-0x3358 = 0x5B66
-0x3359 = 0x5CB3
-0x335A = 0x697D
-0x335B = 0x984D
-0x335C = 0x984E
-0x335D = 0x639B
-0x335E = 0x7B20
-0x335F = 0x6A2B
-0x3360 = 0x6A7F
-0x3361 = 0x68B6
-0x3362 = 0x9C0D
-0x3363 = 0x6F5F
-0x3364 = 0x5272
-0x3365 = 0x559D
-0x3366 = 0x6070
-0x3367 = 0x62EC
-0x3368 = 0x6D3B
-0x3369 = 0x6E07
-0x336A = 0x6ED1
-0x336B = 0x845B
-0x336C = 0x8910
-0x336D = 0x8F44
-0x336E = 0x4E14
-0x336F = 0x9C39
-0x3370 = 0x53F6
-0x3371 = 0x691B
-0x3372 = 0x6A3A
-0x3373 = 0x9784
-0x3374 = 0x682A
-0x3375 = 0x515C
-0x3376 = 0x7AC3
-0x3377 = 0x84B2
-0x3378 = 0x91DC
-0x3379 = 0x938C
-0x337A = 0x565B
-0x337B = 0x9D28
-0x337C = 0x6822
-0x337D = 0x8305
-0x337E = 0x8431
-0x3421 = 0x7CA5
-0x3422 = 0x5208
-0x3423 = 0x82C5
-0x3424 = 0x74E6
-0x3425 = 0x4E7E
-0x3426 = 0x4F83
-0x3427 = 0x51A0
-0x3428 = 0x5BD2
-0x3429 = 0x520A
-0x342A = 0x52D8
-0x342B = 0x52E7
-0x342C = 0x5DFB
-0x342D = 0x559A
-0x342E = 0x582A
-0x342F = 0x59E6
-0x3430 = 0x5B8C
-0x3431 = 0x5B98
-0x3432 = 0x5BDB
-0x3433 = 0x5E72
-0x3434 = 0x5E79
-0x3435 = 0x60A3
-0x3436 = 0x611F
-0x3437 = 0x6163
-0x3438 = 0x61BE
-0x3439 = 0x63DB
-0x343A = 0x6562
-0x343B = 0x67D1
-0x343C = 0x6853
-0x343D = 0x68FA
-0x343E = 0x6B3E
-0x343F = 0x6B53
-0x3440 = 0x6C57
-0x3441 = 0x6F22
-0x3442 = 0x6F97
-0x3443 = 0x6F45
-0x3444 = 0x74B0
-0x3445 = 0x7518
-0x3446 = 0x76E3
-0x3447 = 0x770B
-0x3448 = 0x7AFF
-0x3449 = 0x7BA1
-0x344A = 0x7C21
-0x344B = 0x7DE9
-0x344C = 0x7F36
-0x344D = 0x7FF0
-0x344E = 0x809D
-0x344F = 0x8266
-0x3450 = 0x839E
-0x3451 = 0x89B3
-0x3452 = 0x8ACC
-0x3453 = 0x8CAB
-0x3454 = 0x9084
-0x3455 = 0x9451
-0x3456 = 0x9593
-0x3457 = 0x9591
-0x3458 = 0x95A2
-0x3459 = 0x9665
-0x345A = 0x97D3
-0x345B = 0x9928
-0x345C = 0x8218
-0x345D = 0x4E38
-0x345E = 0x542B
-0x345F = 0x5CB8
-0x3460 = 0x5DCC
-0x3461 = 0x73A9
-0x3462 = 0x764C
-0x3463 = 0x773C
-0x3464 = 0x5CA9
-0x3465 = 0x7FEB
-0x3466 = 0x8D0B
-0x3467 = 0x96C1
-0x3468 = 0x9811
-0x3469 = 0x9854
-0x346A = 0x9858
-0x346B = 0x4F01
-0x346C = 0x4F0E
-0x346D = 0x5371
-0x346E = 0x559C
-0x346F = 0x5668
-0x3470 = 0x57FA
-0x3471 = 0x5947
-0x3472 = 0x5B09
-0x3473 = 0x5BC4
-0x3474 = 0x5C90
-0x3475 = 0x5E0C
-0x3476 = 0x5E7E
-0x3477 = 0x5FCC
-0x3478 = 0x63EE
-0x3479 = 0x673A
-0x347A = 0x65D7
-0x347B = 0x65E2
-0x347C = 0x671F
-0x347D = 0x68CB
-0x347E = 0x68C4
-0x3521 = 0x6A5F
-0x3522 = 0x5E30
-0x3523 = 0x6BC5
-0x3524 = 0x6C17
-0x3525 = 0x6C7D
-0x3526 = 0x757F
-0x3527 = 0x7948
-0x3528 = 0x5B63
-0x3529 = 0x7A00
-0x352A = 0x7D00
-0x352B = 0x5FBD
-0x352C = 0x898F
-0x352D = 0x8A18
-0x352E = 0x8CB4
-0x352F = 0x8D77
-0x3530 = 0x8ECC
-0x3531 = 0x8F1D
-0x3532 = 0x98E2
-0x3533 = 0x9A0E
-0x3534 = 0x9B3C
-0x3535 = 0x4E80
-0x3536 = 0x507D
-0x3537 = 0x5100
-0x3538 = 0x5993
-0x3539 = 0x5B9C
-0x353A = 0x622F
-0x353B = 0x6280
-0x353C = 0x64EC
-0x353D = 0x6B3A
-0x353E = 0x72A0
-0x353F = 0x7591
-0x3540 = 0x7947
-0x3541 = 0x7FA9
-0x3542 = 0x87FB
-0x3543 = 0x8ABC
-0x3544 = 0x8B70
-0x3545 = 0x63AC
-0x3546 = 0x83CA
-0x3547 = 0x97A0
-0x3548 = 0x5409
-0x3549 = 0x5403
-0x354A = 0x55AB
-0x354B = 0x6854
-0x354C = 0x6A58
-0x354D = 0x8A70
-0x354E = 0x7827
-0x354F = 0x6775
-0x3550 = 0x9ECD
-0x3551 = 0x5374
-0x3552 = 0x5BA2
-0x3553 = 0x811A
-0x3554 = 0x8650
-0x3555 = 0x9006
-0x3556 = 0x4E18
-0x3557 = 0x4E45
-0x3558 = 0x4EC7
-0x3559 = 0x4F11
-0x355A = 0x53CA
-0x355B = 0x5438
-0x355C = 0x5BAE
-0x355D = 0x5F13
-0x355E = 0x6025
-0x355F = 0x6551
-0x3560 = 0x673D
-0x3561 = 0x6C42
-0x3562 = 0x6C72
-0x3563 = 0x6CE3
-0x3564 = 0x7078
-0x3565 = 0x7403
-0x3566 = 0x7A76
-0x3567 = 0x7AAE
-0x3568 = 0x7B08
-0x3569 = 0x7D1A
-0x356A = 0x7CFE
-0x356B = 0x7D66
-0x356C = 0x65E7
-0x356D = 0x725B
-0x356E = 0x53BB
-0x356F = 0x5C45
-0x3570 = 0x5DE8
-0x3571 = 0x62D2
-0x3572 = 0x62E0
-0x3573 = 0x6319
-0x3574 = 0x6E20
-0x3575 = 0x865A
-0x3576 = 0x8A31
-0x3577 = 0x8DDD
-0x3578 = 0x92F8
-0x3579 = 0x6F01
-0x357A = 0x79A6
-0x357B = 0x9B5A
-0x357C = 0x4EA8
-0x357D = 0x4EAB
-0x357E = 0x4EAC
-0x3621 = 0x4F9B
-0x3622 = 0x4FA0
-0x3623 = 0x50D1
-0x3624 = 0x5147
-0x3625 = 0x7AF6
-0x3626 = 0x5171
-0x3627 = 0x51F6
-0x3628 = 0x5354
-0x3629 = 0x5321
-0x362A = 0x537F
-0x362B = 0x53EB
-0x362C = 0x55AC
-0x362D = 0x5883
-0x362E = 0x5CE1
-0x362F = 0x5F37
-0x3630 = 0x5F4A
-0x3631 = 0x602F
-0x3632 = 0x6050
-0x3633 = 0x606D
-0x3634 = 0x631F
-0x3635 = 0x6559
-0x3636 = 0x6A4B
-0x3637 = 0x6CC1
-0x3638 = 0x72C2
-0x3639 = 0x72ED
-0x363A = 0x77EF
-0x363B = 0x80F8
-0x363C = 0x8105
-0x363D = 0x8208
-0x363E = 0x854E
-0x363F = 0x90F7
-0x3640 = 0x93E1
-0x3641 = 0x97FF
-0x3642 = 0x9957
-0x3643 = 0x9A5A
-0x3644 = 0x4EF0
-0x3645 = 0x51DD
-0x3646 = 0x5C2D
-0x3647 = 0x6681
-0x3648 = 0x696D
-0x3649 = 0x5C40
-0x364A = 0x66F2
-0x364B = 0x6975
-0x364C = 0x7389
-0x364D = 0x6850
-0x364E = 0x7C81
-0x364F = 0x50C5
-0x3650 = 0x52E4
-0x3651 = 0x5747
-0x3652 = 0x5DFE
-0x3653 = 0x9326
-0x3654 = 0x65A4
-0x3655 = 0x6B23
-0x3656 = 0x6B3D
-0x3657 = 0x7434
-0x3658 = 0x7981
-0x3659 = 0x79BD
-0x365A = 0x7B4B
-0x365B = 0x7DCA
-0x365C = 0x82B9
-0x365D = 0x83CC
-0x365E = 0x887F
-0x365F = 0x895F
-0x3660 = 0x8B39
-0x3661 = 0x8FD1
-0x3662 = 0x91D1
-0x3663 = 0x541F
-0x3664 = 0x9280
-0x3665 = 0x4E5D
-0x3666 = 0x5036
-0x3667 = 0x53E5
-0x3668 = 0x533A
-0x3669 = 0x72D7
-0x366A = 0x7396
-0x366B = 0x77E9
-0x366C = 0x82E6
-0x366D = 0x8EAF
-0x366E = 0x99C6
-0x366F = 0x99C8
-0x3670 = 0x99D2
-0x3671 = 0x5177
-0x3672 = 0x611A
-0x3673 = 0x865E
-0x3674 = 0x55B0
-0x3675 = 0x7A7A
-0x3676 = 0x5076
-0x3677 = 0x5BD3
-0x3678 = 0x9047
-0x3679 = 0x9685
-0x367A = 0x4E32
-0x367B = 0x6ADB
-0x367C = 0x91E7
-0x367D = 0x5C51
-0x367E = 0x5C48
-0x3721 = 0x6398
-0x3722 = 0x7A9F
-0x3723 = 0x6C93
-0x3724 = 0x9774
-0x3725 = 0x8F61
-0x3726 = 0x7AAA
-0x3727 = 0x718A
-0x3728 = 0x9688
-0x3729 = 0x7C82
-0x372A = 0x6817
-0x372B = 0x7E70
-0x372C = 0x6851
-0x372D = 0x936C
-0x372E = 0x52F2
-0x372F = 0x541B
-0x3730 = 0x85AB
-0x3731 = 0x8A13
-0x3732 = 0x7FA4
-0x3733 = 0x8ECD
-0x3734 = 0x90E1
-0x3735 = 0x5366
-0x3736 = 0x8888
-0x3737 = 0x7941
-0x3738 = 0x4FC2
-0x3739 = 0x50BE
-0x373A = 0x5211
-0x373B = 0x5144
-0x373C = 0x5553
-0x373D = 0x572D
-0x373E = 0x73EA
-0x373F = 0x578B
-0x3740 = 0x5951
-0x3741 = 0x5F62
-0x3742 = 0x5F84
-0x3743 = 0x6075
-0x3744 = 0x6176
-0x3745 = 0x6167
-0x3746 = 0x61A9
-0x3747 = 0x63B2
-0x3748 = 0x643A
-0x3749 = 0x656C
-0x374A = 0x666F
-0x374B = 0x6842
-0x374C = 0x6E13
-0x374D = 0x7566
-0x374E = 0x7A3D
-0x374F = 0x7CFB
-0x3750 = 0x7D4C
-0x3751 = 0x7D99
-0x3752 = 0x7E4B
-0x3753 = 0x7F6B
-0x3754 = 0x830E
-0x3755 = 0x834A
-0x3756 = 0x86CD
-0x3757 = 0x8A08
-0x3758 = 0x8A63
-0x3759 = 0x8B66
-0x375A = 0x8EFD
-0x375B = 0x981A
-0x375C = 0x9D8F
-0x375D = 0x82B8
-0x375E = 0x8FCE
-0x375F = 0x9BE8
-0x3760 = 0x5287
-0x3761 = 0x621F
-0x3762 = 0x6483
-0x3763 = 0x6FC0
-0x3764 = 0x9699
-0x3765 = 0x6841
-0x3766 = 0x5091
-0x3767 = 0x6B20
-0x3768 = 0x6C7A
-0x3769 = 0x6F54
-0x376A = 0x7A74
-0x376B = 0x7D50
-0x376C = 0x8840
-0x376D = 0x8A23
-0x376E = 0x6708
-0x376F = 0x4EF6
-0x3770 = 0x5039
-0x3771 = 0x5026
-0x3772 = 0x5065
-0x3773 = 0x517C
-0x3774 = 0x5238
-0x3775 = 0x5263
-0x3776 = 0x55A7
-0x3777 = 0x570F
-0x3778 = 0x5805
-0x3779 = 0x5ACC
-0x377A = 0x5EFA
-0x377B = 0x61B2
-0x377C = 0x61F8
-0x377D = 0x62F3
-0x377E = 0x6372
-0x3821 = 0x691C
-0x3822 = 0x6A29
-0x3823 = 0x727D
-0x3824 = 0x72AC
-0x3825 = 0x732E
-0x3826 = 0x7814
-0x3827 = 0x786F
-0x3828 = 0x7D79
-0x3829 = 0x770C
-0x382A = 0x80A9
-0x382B = 0x898B
-0x382C = 0x8B19
-0x382D = 0x8CE2
-0x382E = 0x8ED2
-0x382F = 0x9063
-0x3830 = 0x9375
-0x3831 = 0x967A
-0x3832 = 0x9855
-0x3833 = 0x9A13
-0x3834 = 0x9E78
-0x3835 = 0x5143
-0x3836 = 0x539F
-0x3837 = 0x53B3
-0x3838 = 0x5E7B
-0x3839 = 0x5F26
-0x383A = 0x6E1B
-0x383B = 0x6E90
-0x383C = 0x7384
-0x383D = 0x73FE
-0x383E = 0x7D43
-0x383F = 0x8237
-0x3840 = 0x8A00
-0x3841 = 0x8AFA
-0x3842 = 0x9650
-0x3843 = 0x4E4E
-0x3844 = 0x500B
-0x3845 = 0x53E4
-0x3846 = 0x547C
-0x3847 = 0x56FA
-0x3848 = 0x59D1
-0x3849 = 0x5B64
-0x384A = 0x5DF1
-0x384B = 0x5EAB
-0x384C = 0x5F27
-0x384D = 0x6238
-0x384E = 0x6545
-0x384F = 0x67AF
-0x3850 = 0x6E56
-0x3851 = 0x72D0
-0x3852 = 0x7CCA
-0x3853 = 0x88B4
-0x3854 = 0x80A1
-0x3855 = 0x80E1
-0x3856 = 0x83F0
-0x3857 = 0x864E
-0x3858 = 0x8A87
-0x3859 = 0x8DE8
-0x385A = 0x9237
-0x385B = 0x96C7
-0x385C = 0x9867
-0x385D = 0x9F13
-0x385E = 0x4E94
-0x385F = 0x4E92
-0x3860 = 0x4F0D
-0x3861 = 0x5348
-0x3862 = 0x5449
-0x3863 = 0x543E
-0x3864 = 0x5A2F
-0x3865 = 0x5F8C
-0x3866 = 0x5FA1
-0x3867 = 0x609F
-0x3868 = 0x68A7
-0x3869 = 0x6A8E
-0x386A = 0x745A
-0x386B = 0x7881
-0x386C = 0x8A9E
-0x386D = 0x8AA4
-0x386E = 0x8B77
-0x386F = 0x9190
-0x3870 = 0x4E5E
-0x3871 = 0x9BC9
-0x3872 = 0x4EA4
-0x3873 = 0x4F7C
-0x3874 = 0x4FAF
-0x3875 = 0x5019
-0x3876 = 0x5016
-0x3877 = 0x5149
-0x3878 = 0x516C
-0x3879 = 0x529F
-0x387A = 0x52B9
-0x387B = 0x52FE
-0x387C = 0x539A
-0x387D = 0x53E3
-0x387E = 0x5411
-0x3921 = 0x540E
-0x3922 = 0x5589
-0x3923 = 0x5751
-0x3924 = 0x57A2
-0x3925 = 0x597D
-0x3926 = 0x5B54
-0x3927 = 0x5B5D
-0x3928 = 0x5B8F
-0x3929 = 0x5DE5
-0x392A = 0x5DE7
-0x392B = 0x5DF7
-0x392C = 0x5E78
-0x392D = 0x5E83
-0x392E = 0x5E9A
-0x392F = 0x5EB7
-0x3930 = 0x5F18
-0x3931 = 0x6052
-0x3932 = 0x614C
-0x3933 = 0x6297
-0x3934 = 0x62D8
-0x3935 = 0x63A7
-0x3936 = 0x653B
-0x3937 = 0x6602
-0x3938 = 0x6643
-0x3939 = 0x66F4
-0x393A = 0x676D
-0x393B = 0x6821
-0x393C = 0x6897
-0x393D = 0x69CB
-0x393E = 0x6C5F
-0x393F = 0x6D2A
-0x3940 = 0x6D69
-0x3941 = 0x6E2F
-0x3942 = 0x6E9D
-0x3943 = 0x7532
-0x3944 = 0x7687
-0x3945 = 0x786C
-0x3946 = 0x7A3F
-0x3947 = 0x7CE0
-0x3948 = 0x7D05
-0x3949 = 0x7D18
-0x394A = 0x7D5E
-0x394B = 0x7DB1
-0x394C = 0x8015
-0x394D = 0x8003
-0x394E = 0x80AF
-0x394F = 0x80B1
-0x3950 = 0x8154
-0x3951 = 0x818F
-0x3952 = 0x822A
-0x3953 = 0x8352
-0x3954 = 0x884C
-0x3955 = 0x8861
-0x3956 = 0x8B1B
-0x3957 = 0x8CA2
-0x3958 = 0x8CFC
-0x3959 = 0x90CA
-0x395A = 0x9175
-0x395B = 0x9271
-0x395C = 0x783F
-0x395D = 0x92FC
-0x395E = 0x95A4
-0x395F = 0x964D
-0x3960 = 0x9805
-0x3961 = 0x9999
-0x3962 = 0x9AD8
-0x3963 = 0x9D3B
-0x3964 = 0x525B
-0x3965 = 0x52AB
-0x3966 = 0x53F7
-0x3967 = 0x5408
-0x3968 = 0x58D5
-0x3969 = 0x62F7
-0x396A = 0x6FE0
-0x396B = 0x8C6A
-0x396C = 0x8F5F
-0x396D = 0x9EB9
-0x396E = 0x514B
-0x396F = 0x523B
-0x3970 = 0x544A
-0x3971 = 0x56FD
-0x3972 = 0x7A40
-0x3973 = 0x9177
-0x3974 = 0x9D60
-0x3975 = 0x9ED2
-0x3976 = 0x7344
-0x3977 = 0x6F09
-0x3978 = 0x8170
-0x3979 = 0x7511
-0x397A = 0x5FFD
-0x397B = 0x60DA
-0x397C = 0x9AA8
-0x397D = 0x72DB
-0x397E = 0x8FBC
-0x3A21 = 0x6B64
-0x3A22 = 0x9803
-0x3A23 = 0x4ECA
-0x3A24 = 0x56F0
-0x3A25 = 0x5764
-0x3A26 = 0x58BE
-0x3A27 = 0x5A5A
-0x3A28 = 0x6068
-0x3A29 = 0x61C7
-0x3A2A = 0x660F
-0x3A2B = 0x6606
-0x3A2C = 0x6839
-0x3A2D = 0x68B1
-0x3A2E = 0x6DF7
-0x3A2F = 0x75D5
-0x3A30 = 0x7D3A
-0x3A31 = 0x826E
-0x3A32 = 0x9B42
-0x3A33 = 0x4E9B
-0x3A34 = 0x4F50
-0x3A35 = 0x53C9
-0x3A36 = 0x5506
-0x3A37 = 0x5D6F
-0x3A38 = 0x5DE6
-0x3A39 = 0x5DEE
-0x3A3A = 0x67FB
-0x3A3B = 0x6C99
-0x3A3C = 0x7473
-0x3A3D = 0x7802
-0x3A3E = 0x8A50
-0x3A3F = 0x9396
-0x3A40 = 0x88DF
-0x3A41 = 0x5750
-0x3A42 = 0x5EA7
-0x3A43 = 0x632B
-0x3A44 = 0x50B5
-0x3A45 = 0x50AC
-0x3A46 = 0x518D
-0x3A47 = 0x6700
-0x3A48 = 0x54C9
-0x3A49 = 0x585E
-0x3A4A = 0x59BB
-0x3A4B = 0x5BB0
-0x3A4C = 0x5F69
-0x3A4D = 0x624D
-0x3A4E = 0x63A1
-0x3A4F = 0x683D
-0x3A50 = 0x6B73
-0x3A51 = 0x6E08
-0x3A52 = 0x707D
-0x3A53 = 0x91C7
-0x3A54 = 0x7280
-0x3A55 = 0x7815
-0x3A56 = 0x7826
-0x3A57 = 0x796D
-0x3A58 = 0x658E
-0x3A59 = 0x7D30
-0x3A5A = 0x83DC
-0x3A5B = 0x88C1
-0x3A5C = 0x8F09
-0x3A5D = 0x969B
-0x3A5E = 0x5264
-0x3A5F = 0x5728
-0x3A60 = 0x6750
-0x3A61 = 0x7F6A
-0x3A62 = 0x8CA1
-0x3A63 = 0x51B4
-0x3A64 = 0x5742
-0x3A65 = 0x962A
-0x3A66 = 0x583A
-0x3A67 = 0x698A
-0x3A68 = 0x80B4
-0x3A69 = 0x54B2
-0x3A6A = 0x5D0E
-0x3A6B = 0x57FC
-0x3A6C = 0x7895
-0x3A6D = 0x9DFA
-0x3A6E = 0x4F5C
-0x3A6F = 0x524A
-0x3A70 = 0x548B
-0x3A71 = 0x643E
-0x3A72 = 0x6628
-0x3A73 = 0x6714
-0x3A74 = 0x67F5
-0x3A75 = 0x7A84
-0x3A76 = 0x7B56
-0x3A77 = 0x7D22
-0x3A78 = 0x932F
-0x3A79 = 0x685C
-0x3A7A = 0x9BAD
-0x3A7B = 0x7B39
-0x3A7C = 0x5319
-0x3A7D = 0x518A
-0x3A7E = 0x5237
-0x3B21 = 0x5BDF
-0x3B22 = 0x62F6
-0x3B23 = 0x64AE
-0x3B24 = 0x64E6
-0x3B25 = 0x672D
-0x3B26 = 0x6BBA
-0x3B27 = 0x85A9
-0x3B28 = 0x96D1
-0x3B29 = 0x7690
-0x3B2A = 0x9BD6
-0x3B2B = 0x634C
-0x3B2C = 0x9306
-0x3B2D = 0x9BAB
-0x3B2E = 0x76BF
-0x3B2F = 0x6652
-0x3B30 = 0x4E09
-0x3B31 = 0x5098
-0x3B32 = 0x53C2
-0x3B33 = 0x5C71
-0x3B34 = 0x60E8
-0x3B35 = 0x6492
-0x3B36 = 0x6563
-0x3B37 = 0x685F
-0x3B38 = 0x71E6
-0x3B39 = 0x73CA
-0x3B3A = 0x7523
-0x3B3B = 0x7B97
-0x3B3C = 0x7E82
-0x3B3D = 0x8695
-0x3B3E = 0x8B83
-0x3B3F = 0x8CDB
-0x3B40 = 0x9178
-0x3B41 = 0x9910
-0x3B42 = 0x65AC
-0x3B43 = 0x66AB
-0x3B44 = 0x6B8B
-0x3B45 = 0x4ED5
-0x3B46 = 0x4ED4
-0x3B47 = 0x4F3A
-0x3B48 = 0x4F7F
-0x3B49 = 0x523A
-0x3B4A = 0x53F8
-0x3B4B = 0x53F2
-0x3B4C = 0x55E3
-0x3B4D = 0x56DB
-0x3B4E = 0x58EB
-0x3B4F = 0x59CB
-0x3B50 = 0x59C9
-0x3B51 = 0x59FF
-0x3B52 = 0x5B50
-0x3B53 = 0x5C4D
-0x3B54 = 0x5E02
-0x3B55 = 0x5E2B
-0x3B56 = 0x5FD7
-0x3B57 = 0x601D
-0x3B58 = 0x6307
-0x3B59 = 0x652F
-0x3B5A = 0x5B5C
-0x3B5B = 0x65AF
-0x3B5C = 0x65BD
-0x3B5D = 0x65E8
-0x3B5E = 0x679D
-0x3B5F = 0x6B62
-0x3B60 = 0x6B7B
-0x3B61 = 0x6C0F
-0x3B62 = 0x7345
-0x3B63 = 0x7949
-0x3B64 = 0x79C1
-0x3B65 = 0x7CF8
-0x3B66 = 0x7D19
-0x3B67 = 0x7D2B
-0x3B68 = 0x80A2
-0x3B69 = 0x8102
-0x3B6A = 0x81F3
-0x3B6B = 0x8996
-0x3B6C = 0x8A5E
-0x3B6D = 0x8A69
-0x3B6E = 0x8A66
-0x3B6F = 0x8A8C
-0x3B70 = 0x8AEE
-0x3B71 = 0x8CC7
-0x3B72 = 0x8CDC
-0x3B73 = 0x96CC
-0x3B74 = 0x98FC
-0x3B75 = 0x6B6F
-0x3B76 = 0x4E8B
-0x3B77 = 0x4F3C
-0x3B78 = 0x4F8D
-0x3B79 = 0x5150
-0x3B7A = 0x5B57
-0x3B7B = 0x5BFA
-0x3B7C = 0x6148
-0x3B7D = 0x6301
-0x3B7E = 0x6642
-0x3C21 = 0x6B21
-0x3C22 = 0x6ECB
-0x3C23 = 0x6CBB
-0x3C24 = 0x723E
-0x3C25 = 0x74BD
-0x3C26 = 0x75D4
-0x3C27 = 0x78C1
-0x3C28 = 0x793A
-0x3C29 = 0x800C
-0x3C2A = 0x8033
-0x3C2B = 0x81EA
-0x3C2C = 0x8494
-0x3C2D = 0x8F9E
-0x3C2E = 0x6C50
-0x3C2F = 0x9E7F
-0x3C30 = 0x5F0F
-0x3C31 = 0x8B58
-0x3C32 = 0x9D2B
-0x3C33 = 0x7AFA
-0x3C34 = 0x8EF8
-0x3C35 = 0x5B8D
-0x3C36 = 0x96EB
-0x3C37 = 0x4E03
-0x3C38 = 0x53F1
-0x3C39 = 0x57F7
-0x3C3A = 0x5931
-0x3C3B = 0x5AC9
-0x3C3C = 0x5BA4
-0x3C3D = 0x6089
-0x3C3E = 0x6E7F
-0x3C3F = 0x6F06
-0x3C40 = 0x75BE
-0x3C41 = 0x8CEA
-0x3C42 = 0x5B9F
-0x3C43 = 0x8500
-0x3C44 = 0x7BE0
-0x3C45 = 0x5072
-0x3C46 = 0x67F4
-0x3C47 = 0x829D
-0x3C48 = 0x5C61
-0x3C49 = 0x854A
-0x3C4A = 0x7E1E
-0x3C4B = 0x820E
-0x3C4C = 0x5199
-0x3C4D = 0x5C04
-0x3C4E = 0x6368
-0x3C4F = 0x8D66
-0x3C50 = 0x659C
-0x3C51 = 0x716E
-0x3C52 = 0x793E
-0x3C53 = 0x7D17
-0x3C54 = 0x8005
-0x3C55 = 0x8B1D
-0x3C56 = 0x8ECA
-0x3C57 = 0x906E
-0x3C58 = 0x86C7
-0x3C59 = 0x90AA
-0x3C5A = 0x501F
-0x3C5B = 0x52FA
-0x3C5C = 0x5C3A
-0x3C5D = 0x6753
-0x3C5E = 0x707C
-0x3C5F = 0x7235
-0x3C60 = 0x914C
-0x3C61 = 0x91C8
-0x3C62 = 0x932B
-0x3C63 = 0x82E5
-0x3C64 = 0x5BC2
-0x3C65 = 0x5F31
-0x3C66 = 0x60F9
-0x3C67 = 0x4E3B
-0x3C68 = 0x53D6
-0x3C69 = 0x5B88
-0x3C6A = 0x624B
-0x3C6B = 0x6731
-0x3C6C = 0x6B8A
-0x3C6D = 0x72E9
-0x3C6E = 0x73E0
-0x3C6F = 0x7A2E
-0x3C70 = 0x816B
-0x3C71 = 0x8DA3
-0x3C72 = 0x9152
-0x3C73 = 0x9996
-0x3C74 = 0x5112
-0x3C75 = 0x53D7
-0x3C76 = 0x546A
-0x3C77 = 0x5BFF
-0x3C78 = 0x6388
-0x3C79 = 0x6A39
-0x3C7A = 0x7DAC
-0x3C7B = 0x9700
-0x3C7C = 0x56DA
-0x3C7D = 0x53CE
-0x3C7E = 0x5468
-0x3D21 = 0x5B97
-0x3D22 = 0x5C31
-0x3D23 = 0x5DDE
-0x3D24 = 0x4FEE
-0x3D25 = 0x6101
-0x3D26 = 0x62FE
-0x3D27 = 0x6D32
-0x3D28 = 0x79C0
-0x3D29 = 0x79CB
-0x3D2A = 0x7D42
-0x3D2B = 0x7E4D
-0x3D2C = 0x7FD2
-0x3D2D = 0x81ED
-0x3D2E = 0x821F
-0x3D2F = 0x8490
-0x3D30 = 0x8846
-0x3D31 = 0x8972
-0x3D32 = 0x8B90
-0x3D33 = 0x8E74
-0x3D34 = 0x8F2F
-0x3D35 = 0x9031
-0x3D36 = 0x914B
-0x3D37 = 0x916C
-0x3D38 = 0x96C6
-0x3D39 = 0x919C
-0x3D3A = 0x4EC0
-0x3D3B = 0x4F4F
-0x3D3C = 0x5145
-0x3D3D = 0x5341
-0x3D3E = 0x5F93
-0x3D3F = 0x620E
-0x3D40 = 0x67D4
-0x3D41 = 0x6C41
-0x3D42 = 0x6E0B
-0x3D43 = 0x7363
-0x3D44 = 0x7E26
-0x3D45 = 0x91CD
-0x3D46 = 0x9283
-0x3D47 = 0x53D4
-0x3D48 = 0x5919
-0x3D49 = 0x5BBF
-0x3D4A = 0x6DD1
-0x3D4B = 0x795D
-0x3D4C = 0x7E2E
-0x3D4D = 0x7C9B
-0x3D4E = 0x587E
-0x3D4F = 0x719F
-0x3D50 = 0x51FA
-0x3D51 = 0x8853
-0x3D52 = 0x8FF0
-0x3D53 = 0x4FCA
-0x3D54 = 0x5CFB
-0x3D55 = 0x6625
-0x3D56 = 0x77AC
-0x3D57 = 0x7AE3
-0x3D58 = 0x821C
-0x3D59 = 0x99FF
-0x3D5A = 0x51C6
-0x3D5B = 0x5FAA
-0x3D5C = 0x65EC
-0x3D5D = 0x696F
-0x3D5E = 0x6B89
-0x3D5F = 0x6DF3
-0x3D60 = 0x6E96
-0x3D61 = 0x6F64
-0x3D62 = 0x76FE
-0x3D63 = 0x7D14
-0x3D64 = 0x5DE1
-0x3D65 = 0x9075
-0x3D66 = 0x9187
-0x3D67 = 0x9806
-0x3D68 = 0x51E6
-0x3D69 = 0x521D
-0x3D6A = 0x6240
-0x3D6B = 0x6691
-0x3D6C = 0x66D9
-0x3D6D = 0x6E1A
-0x3D6E = 0x5EB6
-0x3D6F = 0x7DD2
-0x3D70 = 0x7F72
-0x3D71 = 0x66F8
-0x3D72 = 0x85AF
-0x3D73 = 0x85F7
-0x3D74 = 0x8AF8
-0x3D75 = 0x52A9
-0x3D76 = 0x53D9
-0x3D77 = 0x5973
-0x3D78 = 0x5E8F
-0x3D79 = 0x5F90
-0x3D7A = 0x6055
-0x3D7B = 0x92E4
-0x3D7C = 0x9664
-0x3D7D = 0x50B7
-0x3D7E = 0x511F
-0x3E21 = 0x52DD
-0x3E22 = 0x5320
-0x3E23 = 0x5347
-0x3E24 = 0x53EC
-0x3E25 = 0x54E8
-0x3E26 = 0x5546
-0x3E27 = 0x5531
-0x3E28 = 0x5617
-0x3E29 = 0x5968
-0x3E2A = 0x59BE
-0x3E2B = 0x5A3C
-0x3E2C = 0x5BB5
-0x3E2D = 0x5C06
-0x3E2E = 0x5C0F
-0x3E2F = 0x5C11
-0x3E30 = 0x5C1A
-0x3E31 = 0x5E84
-0x3E32 = 0x5E8A
-0x3E33 = 0x5EE0
-0x3E34 = 0x5F70
-0x3E35 = 0x627F
-0x3E36 = 0x6284
-0x3E37 = 0x62DB
-0x3E38 = 0x638C
-0x3E39 = 0x6377
-0x3E3A = 0x6607
-0x3E3B = 0x660C
-0x3E3C = 0x662D
-0x3E3D = 0x6676
-0x3E3E = 0x677E
-0x3E3F = 0x68A2
-0x3E40 = 0x6A1F
-0x3E41 = 0x6A35
-0x3E42 = 0x6CBC
-0x3E43 = 0x6D88
-0x3E44 = 0x6E09
-0x3E45 = 0x6E58
-0x3E46 = 0x713C
-0x3E47 = 0x7126
-0x3E48 = 0x7167
-0x3E49 = 0x75C7
-0x3E4A = 0x7701
-0x3E4B = 0x785D
-0x3E4C = 0x7901
-0x3E4D = 0x7965
-0x3E4E = 0x79F0
-0x3E4F = 0x7AE0
-0x3E50 = 0x7B11
-0x3E51 = 0x7CA7
-0x3E52 = 0x7D39
-0x3E53 = 0x8096
-0x3E54 = 0x83D6
-0x3E55 = 0x848B
-0x3E56 = 0x8549
-0x3E57 = 0x885D
-0x3E58 = 0x88F3
-0x3E59 = 0x8A1F
-0x3E5A = 0x8A3C
-0x3E5B = 0x8A54
-0x3E5C = 0x8A73
-0x3E5D = 0x8C61
-0x3E5E = 0x8CDE
-0x3E5F = 0x91A4
-0x3E60 = 0x9266
-0x3E61 = 0x937E
-0x3E62 = 0x9418
-0x3E63 = 0x969C
-0x3E64 = 0x9798
-0x3E65 = 0x4E0A
-0x3E66 = 0x4E08
-0x3E67 = 0x4E1E
-0x3E68 = 0x4E57
-0x3E69 = 0x5197
-0x3E6A = 0x5270
-0x3E6B = 0x57CE
-0x3E6C = 0x5834
-0x3E6D = 0x58CC
-0x3E6E = 0x5B22
-0x3E6F = 0x5E38
-0x3E70 = 0x60C5
-0x3E71 = 0x64FE
-0x3E72 = 0x6761
-0x3E73 = 0x6756
-0x3E74 = 0x6D44
-0x3E75 = 0x72B6
-0x3E76 = 0x7573
-0x3E77 = 0x7A63
-0x3E78 = 0x84B8
-0x3E79 = 0x8B72
-0x3E7A = 0x91B8
-0x3E7B = 0x9320
-0x3E7C = 0x5631
-0x3E7D = 0x57F4
-0x3E7E = 0x98FE
-0x3F21 = 0x62ED
-0x3F22 = 0x690D
-0x3F23 = 0x6B96
-0x3F24 = 0x71ED
-0x3F25 = 0x7E54
-0x3F26 = 0x8077
-0x3F27 = 0x8272
-0x3F28 = 0x89E6
-0x3F29 = 0x98DF
-0x3F2A = 0x8755
-0x3F2B = 0x8FB1
-0x3F2C = 0x5C3B
-0x3F2D = 0x4F38
-0x3F2E = 0x4FE1
-0x3F2F = 0x4FB5
-0x3F30 = 0x5507
-0x3F31 = 0x5A20
-0x3F32 = 0x5BDD
-0x3F33 = 0x5BE9
-0x3F34 = 0x5FC3
-0x3F35 = 0x614E
-0x3F36 = 0x632F
-0x3F37 = 0x65B0
-0x3F38 = 0x664B
-0x3F39 = 0x68EE
-0x3F3A = 0x699B
-0x3F3B = 0x6D78
-0x3F3C = 0x6DF1
-0x3F3D = 0x7533
-0x3F3E = 0x75B9
-0x3F3F = 0x771F
-0x3F40 = 0x795E
-0x3F41 = 0x79E6
-0x3F42 = 0x7D33
-0x3F43 = 0x81E3
-0x3F44 = 0x82AF
-0x3F45 = 0x85AA
-0x3F46 = 0x89AA
-0x3F47 = 0x8A3A
-0x3F48 = 0x8EAB
-0x3F49 = 0x8F9B
-0x3F4A = 0x9032
-0x3F4B = 0x91DD
-0x3F4C = 0x9707
-0x3F4D = 0x4EBA
-0x3F4E = 0x4EC1
-0x3F4F = 0x5203
-0x3F50 = 0x5875
-0x3F51 = 0x58EC
-0x3F52 = 0x5C0B
-0x3F53 = 0x751A
-0x3F54 = 0x5C3D
-0x3F55 = 0x814E
-0x3F56 = 0x8A0A
-0x3F57 = 0x8FC5
-0x3F58 = 0x9663
-0x3F59 = 0x976D
-0x3F5A = 0x7B25
-0x3F5B = 0x8ACF
-0x3F5C = 0x9808
-0x3F5D = 0x9162
-0x3F5E = 0x56F3
-0x3F5F = 0x53A8
-0x3F60 = 0x9017
-0x3F61 = 0x5439
-0x3F62 = 0x5782
-0x3F63 = 0x5E25
-0x3F64 = 0x63A8
-0x3F65 = 0x6C34
-0x3F66 = 0x708A
-0x3F67 = 0x7761
-0x3F68 = 0x7C8B
-0x3F69 = 0x7FE0
-0x3F6A = 0x8870
-0x3F6B = 0x9042
-0x3F6C = 0x9154
-0x3F6D = 0x9310
-0x3F6E = 0x9318
-0x3F6F = 0x968F
-0x3F70 = 0x745E
-0x3F71 = 0x9AC4
-0x3F72 = 0x5D07
-0x3F73 = 0x5D69
-0x3F74 = 0x6570
-0x3F75 = 0x67A2
-0x3F76 = 0x8DA8
-0x3F77 = 0x96DB
-0x3F78 = 0x636E
-0x3F79 = 0x6749
-0x3F7A = 0x6919
-0x3F7B = 0x83C5
-0x3F7C = 0x9817
-0x3F7D = 0x96C0
-0x3F7E = 0x88FE
-0x4021 = 0x6F84
-0x4022 = 0x647A
-0x4023 = 0x5BF8
-0x4024 = 0x4E16
-0x4025 = 0x702C
-0x4026 = 0x755D
-0x4027 = 0x662F
-0x4028 = 0x51C4
-0x4029 = 0x5236
-0x402A = 0x52E2
-0x402B = 0x59D3
-0x402C = 0x5F81
-0x402D = 0x6027
-0x402E = 0x6210
-0x402F = 0x653F
-0x4030 = 0x6574
-0x4031 = 0x661F
-0x4032 = 0x6674
-0x4033 = 0x68F2
-0x4034 = 0x6816
-0x4035 = 0x6B63
-0x4036 = 0x6E05
-0x4037 = 0x7272
-0x4038 = 0x751F
-0x4039 = 0x76DB
-0x403A = 0x7CBE
-0x403B = 0x8056
-0x403C = 0x58F0
-0x403D = 0x88FD
-0x403E = 0x897F
-0x403F = 0x8AA0
-0x4040 = 0x8A93
-0x4041 = 0x8ACB
-0x4042 = 0x901D
-0x4043 = 0x9192
-0x4044 = 0x9752
-0x4045 = 0x9759
-0x4046 = 0x6589
-0x4047 = 0x7A0E
-0x4048 = 0x8106
-0x4049 = 0x96BB
-0x404A = 0x5E2D
-0x404B = 0x60DC
-0x404C = 0x621A
-0x404D = 0x65A5
-0x404E = 0x6614
-0x404F = 0x6790
-0x4050 = 0x77F3
-0x4051 = 0x7A4D
-0x4052 = 0x7C4D
-0x4053 = 0x7E3E
-0x4054 = 0x810A
-0x4055 = 0x8CAC
-0x4056 = 0x8D64
-0x4057 = 0x8DE1
-0x4058 = 0x8E5F
-0x4059 = 0x78A9
-0x405A = 0x5207
-0x405B = 0x62D9
-0x405C = 0x63A5
-0x405D = 0x6442
-0x405E = 0x6298
-0x405F = 0x8A2D
-0x4060 = 0x7A83
-0x4061 = 0x7BC0
-0x4062 = 0x8AAC
-0x4063 = 0x96EA
-0x4064 = 0x7D76
-0x4065 = 0x820C
-0x4066 = 0x8749
-0x4067 = 0x4ED9
-0x4068 = 0x5148
-0x4069 = 0x5343
-0x406A = 0x5360
-0x406B = 0x5BA3
-0x406C = 0x5C02
-0x406D = 0x5C16
-0x406E = 0x5DDD
-0x406F = 0x6226
-0x4070 = 0x6247
-0x4071 = 0x64B0
-0x4072 = 0x6813
-0x4073 = 0x6834
-0x4074 = 0x6CC9
-0x4075 = 0x6D45
-0x4076 = 0x6D17
-0x4077 = 0x67D3
-0x4078 = 0x6F5C
-0x4079 = 0x714E
-0x407A = 0x717D
-0x407B = 0x65CB
-0x407C = 0x7A7F
-0x407D = 0x7BAD
-0x407E = 0x7DDA
-0x4121 = 0x7E4A
-0x4122 = 0x7FA8
-0x4123 = 0x817A
-0x4124 = 0x821B
-0x4125 = 0x8239
-0x4126 = 0x85A6
-0x4127 = 0x8A6E
-0x4128 = 0x8CCE
-0x4129 = 0x8DF5
-0x412A = 0x9078
-0x412B = 0x9077
-0x412C = 0x92AD
-0x412D = 0x9291
-0x412E = 0x9583
-0x412F = 0x9BAE
-0x4130 = 0x524D
-0x4131 = 0x5584
-0x4132 = 0x6F38
-0x4133 = 0x7136
-0x4134 = 0x5168
-0x4135 = 0x7985
-0x4136 = 0x7E55
-0x4137 = 0x81B3
-0x4138 = 0x7CCE
-0x4139 = 0x564C
-0x413A = 0x5851
-0x413B = 0x5CA8
-0x413C = 0x63AA
-0x413D = 0x66FE
-0x413E = 0x66FD
-0x413F = 0x695A
-0x4140 = 0x72D9
-0x4141 = 0x758F
-0x4142 = 0x758E
-0x4143 = 0x790E
-0x4144 = 0x7956
-0x4145 = 0x79DF
-0x4146 = 0x7C97
-0x4147 = 0x7D20
-0x4148 = 0x7D44
-0x4149 = 0x8607
-0x414A = 0x8A34
-0x414B = 0x963B
-0x414C = 0x9061
-0x414D = 0x9F20
-0x414E = 0x50E7
-0x414F = 0x5275
-0x4150 = 0x53CC
-0x4151 = 0x53E2
-0x4152 = 0x5009
-0x4153 = 0x55AA
-0x4154 = 0x58EE
-0x4155 = 0x594F
-0x4156 = 0x723D
-0x4157 = 0x5B8B
-0x4158 = 0x5C64
-0x4159 = 0x531D
-0x415A = 0x60E3
-0x415B = 0x60F3
-0x415C = 0x635C
-0x415D = 0x6383
-0x415E = 0x633F
-0x415F = 0x63BB
-0x4160 = 0x64CD
-0x4161 = 0x65E9
-0x4162 = 0x66F9
-0x4163 = 0x5DE3
-0x4164 = 0x69CD
-0x4165 = 0x69FD
-0x4166 = 0x6F15
-0x4167 = 0x71E5
-0x4168 = 0x4E89
-0x4169 = 0x75E9
-0x416A = 0x76F8
-0x416B = 0x7A93
-0x416C = 0x7CDF
-0x416D = 0x7DCF
-0x416E = 0x7D9C
-0x416F = 0x8061
-0x4170 = 0x8349
-0x4171 = 0x8358
-0x4172 = 0x846C
-0x4173 = 0x84BC
-0x4174 = 0x85FB
-0x4175 = 0x88C5
-0x4176 = 0x8D70
-0x4177 = 0x9001
-0x4178 = 0x906D
-0x4179 = 0x9397
-0x417A = 0x971C
-0x417B = 0x9A12
-0x417C = 0x50CF
-0x417D = 0x5897
-0x417E = 0x618E
-0x4221 = 0x81D3
-0x4222 = 0x8535
-0x4223 = 0x8D08
-0x4224 = 0x9020
-0x4225 = 0x4FC3
-0x4226 = 0x5074
-0x4227 = 0x5247
-0x4228 = 0x5373
-0x4229 = 0x606F
-0x422A = 0x6349
-0x422B = 0x675F
-0x422C = 0x6E2C
-0x422D = 0x8DB3
-0x422E = 0x901F
-0x422F = 0x4FD7
-0x4230 = 0x5C5E
-0x4231 = 0x8CCA
-0x4232 = 0x65CF
-0x4233 = 0x7D9A
-0x4234 = 0x5352
-0x4235 = 0x8896
-0x4236 = 0x5176
-0x4237 = 0x63C3
-0x4238 = 0x5B58
-0x4239 = 0x5B6B
-0x423A = 0x5C0A
-0x423B = 0x640D
-0x423C = 0x6751
-0x423D = 0x905C
-0x423E = 0x4ED6
-0x423F = 0x591A
-0x4240 = 0x592A
-0x4241 = 0x6C70
-0x4242 = 0x8A51
-0x4243 = 0x553E
-0x4244 = 0x5815
-0x4245 = 0x59A5
-0x4246 = 0x60F0
-0x4247 = 0x6253
-0x4248 = 0x67C1
-0x4249 = 0x8235
-0x424A = 0x6955
-0x424B = 0x9640
-0x424C = 0x99C4
-0x424D = 0x9A28
-0x424E = 0x4F53
-0x424F = 0x5806
-0x4250 = 0x5BFE
-0x4251 = 0x8010
-0x4252 = 0x5CB1
-0x4253 = 0x5E2F
-0x4254 = 0x5F85
-0x4255 = 0x6020
-0x4256 = 0x614B
-0x4257 = 0x6234
-0x4258 = 0x66FF
-0x4259 = 0x6CF0
-0x425A = 0x6EDE
-0x425B = 0x80CE
-0x425C = 0x817F
-0x425D = 0x82D4
-0x425E = 0x888B
-0x425F = 0x8CB8
-0x4260 = 0x9000
-0x4261 = 0x902E
-0x4262 = 0x968A
-0x4263 = 0x9EDB
-0x4264 = 0x9BDB
-0x4265 = 0x4EE3
-0x4266 = 0x53F0
-0x4267 = 0x5927
-0x4268 = 0x7B2C
-0x4269 = 0x918D
-0x426A = 0x984C
-0x426B = 0x9DF9
-0x426C = 0x6EDD
-0x426D = 0x7027
-0x426E = 0x5353
-0x426F = 0x5544
-0x4270 = 0x5B85
-0x4271 = 0x6258
-0x4272 = 0x629E
-0x4273 = 0x62D3
-0x4274 = 0x6CA2
-0x4275 = 0x6FEF
-0x4276 = 0x7422
-0x4277 = 0x8A17
-0x4278 = 0x9438
-0x4279 = 0x6FC1
-0x427A = 0x8AFE
-0x427B = 0x8338
-0x427C = 0x51E7
-0x427D = 0x86F8
-0x427E = 0x53EA
-0x4321 = 0x53E9
-0x4322 = 0x4F46
-0x4323 = 0x9054
-0x4324 = 0x8FB0
-0x4325 = 0x596A
-0x4326 = 0x8131
-0x4327 = 0x5DFD
-0x4328 = 0x7AEA
-0x4329 = 0x8FBF
-0x432A = 0x68DA
-0x432B = 0x8C37
-0x432C = 0x72F8
-0x432D = 0x9C48
-0x432E = 0x6A3D
-0x432F = 0x8AB0
-0x4330 = 0x4E39
-0x4331 = 0x5358
-0x4332 = 0x5606
-0x4333 = 0x5766
-0x4334 = 0x62C5
-0x4335 = 0x63A2
-0x4336 = 0x65E6
-0x4337 = 0x6B4E
-0x4338 = 0x6DE1
-0x4339 = 0x6E5B
-0x433A = 0x70AD
-0x433B = 0x77ED
-0x433C = 0x7AEF
-0x433D = 0x7BAA
-0x433E = 0x7DBB
-0x433F = 0x803D
-0x4340 = 0x80C6
-0x4341 = 0x86CB
-0x4342 = 0x8A95
-0x4343 = 0x935B
-0x4344 = 0x56E3
-0x4345 = 0x58C7
-0x4346 = 0x5F3E
-0x4347 = 0x65AD
-0x4348 = 0x6696
-0x4349 = 0x6A80
-0x434A = 0x6BB5
-0x434B = 0x7537
-0x434C = 0x8AC7
-0x434D = 0x5024
-0x434E = 0x77E5
-0x434F = 0x5730
-0x4350 = 0x5F1B
-0x4351 = 0x6065
-0x4352 = 0x667A
-0x4353 = 0x6C60
-0x4354 = 0x75F4
-0x4355 = 0x7A1A
-0x4356 = 0x7F6E
-0x4357 = 0x81F4
-0x4358 = 0x8718
-0x4359 = 0x9045
-0x435A = 0x99B3
-0x435B = 0x7BC9
-0x435C = 0x755C
-0x435D = 0x7AF9
-0x435E = 0x7B51
-0x435F = 0x84C4
-0x4360 = 0x9010
-0x4361 = 0x79E9
-0x4362 = 0x7A92
-0x4363 = 0x8336
-0x4364 = 0x5AE1
-0x4365 = 0x7740
-0x4366 = 0x4E2D
-0x4367 = 0x4EF2
-0x4368 = 0x5B99
-0x4369 = 0x5FE0
-0x436A = 0x62BD
-0x436B = 0x663C
-0x436C = 0x67F1
-0x436D = 0x6CE8
-0x436E = 0x866B
-0x436F = 0x8877
-0x4370 = 0x8A3B
-0x4371 = 0x914E
-0x4372 = 0x92F3
-0x4373 = 0x99D0
-0x4374 = 0x6A17
-0x4375 = 0x7026
-0x4376 = 0x732A
-0x4377 = 0x82E7
-0x4378 = 0x8457
-0x4379 = 0x8CAF
-0x437A = 0x4E01
-0x437B = 0x5146
-0x437C = 0x51CB
-0x437D = 0x558B
-0x437E = 0x5BF5
-0x4421 = 0x5E16
-0x4422 = 0x5E33
-0x4423 = 0x5E81
-0x4424 = 0x5F14
-0x4425 = 0x5F35
-0x4426 = 0x5F6B
-0x4427 = 0x5FB4
-0x4428 = 0x61F2
-0x4429 = 0x6311
-0x442A = 0x66A2
-0x442B = 0x671D
-0x442C = 0x6F6E
-0x442D = 0x7252
-0x442E = 0x753A
-0x442F = 0x773A
-0x4430 = 0x8074
-0x4431 = 0x8139
-0x4432 = 0x8178
-0x4433 = 0x8776
-0x4434 = 0x8ABF
-0x4435 = 0x8ADC
-0x4436 = 0x8D85
-0x4437 = 0x8DF3
-0x4438 = 0x929A
-0x4439 = 0x9577
-0x443A = 0x9802
-0x443B = 0x9CE5
-0x443C = 0x52C5
-0x443D = 0x6357
-0x443E = 0x76F4
-0x443F = 0x6715
-0x4440 = 0x6C88
-0x4441 = 0x73CD
-0x4442 = 0x8CC3
-0x4443 = 0x93AE
-0x4444 = 0x9673
-0x4445 = 0x6D25
-0x4446 = 0x589C
-0x4447 = 0x690E
-0x4448 = 0x69CC
-0x4449 = 0x8FFD
-0x444A = 0x939A
-0x444B = 0x75DB
-0x444C = 0x901A
-0x444D = 0x585A
-0x444E = 0x6802
-0x444F = 0x63B4
-0x4450 = 0x69FB
-0x4451 = 0x4F43
-0x4452 = 0x6F2C
-0x4453 = 0x67D8
-0x4454 = 0x8FBB
-0x4455 = 0x8526
-0x4456 = 0x7DB4
-0x4457 = 0x9354
-0x4458 = 0x693F
-0x4459 = 0x6F70
-0x445A = 0x576A
-0x445B = 0x58F7
-0x445C = 0x5B2C
-0x445D = 0x7D2C
-0x445E = 0x722A
-0x445F = 0x540A
-0x4460 = 0x91E3
-0x4461 = 0x9DB4
-0x4462 = 0x4EAD
-0x4463 = 0x4F4E
-0x4464 = 0x505C
-0x4465 = 0x5075
-0x4466 = 0x5243
-0x4467 = 0x8C9E
-0x4468 = 0x5448
-0x4469 = 0x5824
-0x446A = 0x5B9A
-0x446B = 0x5E1D
-0x446C = 0x5E95
-0x446D = 0x5EAD
-0x446E = 0x5EF7
-0x446F = 0x5F1F
-0x4470 = 0x608C
-0x4471 = 0x62B5
-0x4472 = 0x633A
-0x4473 = 0x63D0
-0x4474 = 0x68AF
-0x4475 = 0x6C40
-0x4476 = 0x7887
-0x4477 = 0x798E
-0x4478 = 0x7A0B
-0x4479 = 0x7DE0
-0x447A = 0x8247
-0x447B = 0x8A02
-0x447C = 0x8AE6
-0x447D = 0x8E44
-0x447E = 0x9013
-0x4521 = 0x90B8
-0x4522 = 0x912D
-0x4523 = 0x91D8
-0x4524 = 0x9F0E
-0x4525 = 0x6CE5
-0x4526 = 0x6458
-0x4527 = 0x64E2
-0x4528 = 0x6575
-0x4529 = 0x6EF4
-0x452A = 0x7684
-0x452B = 0x7B1B
-0x452C = 0x9069
-0x452D = 0x93D1
-0x452E = 0x6EBA
-0x452F = 0x54F2
-0x4530 = 0x5FB9
-0x4531 = 0x64A4
-0x4532 = 0x8F4D
-0x4533 = 0x8FED
-0x4534 = 0x9244
-0x4535 = 0x5178
-0x4536 = 0x586B
-0x4537 = 0x5929
-0x4538 = 0x5C55
-0x4539 = 0x5E97
-0x453A = 0x6DFB
-0x453B = 0x7E8F
-0x453C = 0x751C
-0x453D = 0x8CBC
-0x453E = 0x8EE2
-0x453F = 0x985B
-0x4540 = 0x70B9
-0x4541 = 0x4F1D
-0x4542 = 0x6BBF
-0x4543 = 0x6FB1
-0x4544 = 0x7530
-0x4545 = 0x96FB
-0x4546 = 0x514E
-0x4547 = 0x5410
-0x4548 = 0x5835
-0x4549 = 0x5857
-0x454A = 0x59AC
-0x454B = 0x5C60
-0x454C = 0x5F92
-0x454D = 0x6597
-0x454E = 0x675C
-0x454F = 0x6E21
-0x4550 = 0x767B
-0x4551 = 0x83DF
-0x4552 = 0x8CED
-0x4553 = 0x9014
-0x4554 = 0x90FD
-0x4555 = 0x934D
-0x4556 = 0x7825
-0x4557 = 0x783A
-0x4558 = 0x52AA
-0x4559 = 0x5EA6
-0x455A = 0x571F
-0x455B = 0x5974
-0x455C = 0x6012
-0x455D = 0x5012
-0x455E = 0x515A
-0x455F = 0x51AC
-0x4560 = 0x51CD
-0x4561 = 0x5200
-0x4562 = 0x5510
-0x4563 = 0x5854
-0x4564 = 0x5858
-0x4565 = 0x5957
-0x4566 = 0x5B95
-0x4567 = 0x5CF6
-0x4568 = 0x5D8B
-0x4569 = 0x60BC
-0x456A = 0x6295
-0x456B = 0x642D
-0x456C = 0x6771
-0x456D = 0x6843
-0x456E = 0x68BC
-0x456F = 0x68DF
-0x4570 = 0x76D7
-0x4571 = 0x6DD8
-0x4572 = 0x6E6F
-0x4573 = 0x6D9B
-0x4574 = 0x706F
-0x4575 = 0x71C8
-0x4576 = 0x5F53
-0x4577 = 0x75D8
-0x4578 = 0x7977
-0x4579 = 0x7B49
-0x457A = 0x7B54
-0x457B = 0x7B52
-0x457C = 0x7CD6
-0x457D = 0x7D71
-0x457E = 0x5230
-0x4621 = 0x8463
-0x4622 = 0x8569
-0x4623 = 0x85E4
-0x4624 = 0x8A0E
-0x4625 = 0x8B04
-0x4626 = 0x8C46
-0x4627 = 0x8E0F
-0x4628 = 0x9003
-0x4629 = 0x900F
-0x462A = 0x9419
-0x462B = 0x9676
-0x462C = 0x982D
-0x462D = 0x9A30
-0x462E = 0x95D8
-0x462F = 0x50CD
-0x4630 = 0x52D5
-0x4631 = 0x540C
-0x4632 = 0x5802
-0x4633 = 0x5C0E
-0x4634 = 0x61A7
-0x4635 = 0x649E
-0x4636 = 0x6D1E
-0x4637 = 0x77B3
-0x4638 = 0x7AE5
-0x4639 = 0x80F4
-0x463A = 0x8404
-0x463B = 0x9053
-0x463C = 0x9285
-0x463D = 0x5CE0
-0x463E = 0x9D07
-0x463F = 0x533F
-0x4640 = 0x5F97
-0x4641 = 0x5FB3
-0x4642 = 0x6D9C
-0x4643 = 0x7279
-0x4644 = 0x7763
-0x4645 = 0x79BF
-0x4646 = 0x7BE4
-0x4647 = 0x6BD2
-0x4648 = 0x72EC
-0x4649 = 0x8AAD
-0x464A = 0x6803
-0x464B = 0x6A61
-0x464C = 0x51F8
-0x464D = 0x7A81
-0x464E = 0x6934
-0x464F = 0x5C4A
-0x4650 = 0x9CF6
-0x4651 = 0x82EB
-0x4652 = 0x5BC5
-0x4653 = 0x9149
-0x4654 = 0x701E
-0x4655 = 0x5678
-0x4656 = 0x5C6F
-0x4657 = 0x60C7
-0x4658 = 0x6566
-0x4659 = 0x6C8C
-0x465A = 0x8C5A
-0x465B = 0x9041
-0x465C = 0x9813
-0x465D = 0x5451
-0x465E = 0x66C7
-0x465F = 0x920D
-0x4660 = 0x5948
-0x4661 = 0x90A3
-0x4662 = 0x5185
-0x4663 = 0x4E4D
-0x4664 = 0x51EA
-0x4665 = 0x8599
-0x4666 = 0x8B0E
-0x4667 = 0x7058
-0x4668 = 0x637A
-0x4669 = 0x934B
-0x466A = 0x6962
-0x466B = 0x99B4
-0x466C = 0x7E04
-0x466D = 0x7577
-0x466E = 0x5357
-0x466F = 0x6960
-0x4670 = 0x8EDF
-0x4671 = 0x96E3
-0x4672 = 0x6C5D
-0x4673 = 0x4E8C
-0x4674 = 0x5C3C
-0x4675 = 0x5F10
-0x4676 = 0x8FE9
-0x4677 = 0x5302
-0x4678 = 0x8CD1
-0x4679 = 0x8089
-0x467A = 0x8679
-0x467B = 0x5EFF
-0x467C = 0x65E5
-0x467D = 0x4E73
-0x467E = 0x5165
-0x4721 = 0x5982
-0x4722 = 0x5C3F
-0x4723 = 0x97EE
-0x4724 = 0x4EFB
-0x4725 = 0x598A
-0x4726 = 0x5FCD
-0x4727 = 0x8A8D
-0x4728 = 0x6FE1
-0x4729 = 0x79B0
-0x472A = 0x7962
-0x472B = 0x5BE7
-0x472C = 0x8471
-0x472D = 0x732B
-0x472E = 0x71B1
-0x472F = 0x5E74
-0x4730 = 0x5FF5
-0x4731 = 0x637B
-0x4732 = 0x649A
-0x4733 = 0x71C3
-0x4734 = 0x7C98
-0x4735 = 0x4E43
-0x4736 = 0x5EFC
-0x4737 = 0x4E4B
-0x4738 = 0x57DC
-0x4739 = 0x56A2
-0x473A = 0x60A9
-0x473B = 0x6FC3
-0x473C = 0x7D0D
-0x473D = 0x80FD
-0x473E = 0x8133
-0x473F = 0x81BF
-0x4740 = 0x8FB2
-0x4741 = 0x8997
-0x4742 = 0x86A4
-0x4743 = 0x5DF4
-0x4744 = 0x628A
-0x4745 = 0x64AD
-0x4746 = 0x8987
-0x4747 = 0x6777
-0x4748 = 0x6CE2
-0x4749 = 0x6D3E
-0x474A = 0x7436
-0x474B = 0x7834
-0x474C = 0x5A46
-0x474D = 0x7F75
-0x474E = 0x82AD
-0x474F = 0x99AC
-0x4750 = 0x4FF3
-0x4751 = 0x5EC3
-0x4752 = 0x62DD
-0x4753 = 0x6392
-0x4754 = 0x6557
-0x4755 = 0x676F
-0x4756 = 0x76C3
-0x4757 = 0x724C
-0x4758 = 0x80CC
-0x4759 = 0x80BA
-0x475A = 0x8F29
-0x475B = 0x914D
-0x475C = 0x500D
-0x475D = 0x57F9
-0x475E = 0x5A92
-0x475F = 0x6885
-0x4760 = 0x6973
-0x4761 = 0x7164
-0x4762 = 0x72FD
-0x4763 = 0x8CB7
-0x4764 = 0x58F2
-0x4765 = 0x8CE0
-0x4766 = 0x966A
-0x4767 = 0x9019
-0x4768 = 0x877F
-0x4769 = 0x79E4
-0x476A = 0x77E7
-0x476B = 0x8429
-0x476C = 0x4F2F
-0x476D = 0x5265
-0x476E = 0x535A
-0x476F = 0x62CD
-0x4770 = 0x67CF
-0x4771 = 0x6CCA
-0x4772 = 0x767D
-0x4773 = 0x7B94
-0x4774 = 0x7C95
-0x4775 = 0x8236
-0x4776 = 0x8584
-0x4777 = 0x8FEB
-0x4778 = 0x66DD
-0x4779 = 0x6F20
-0x477A = 0x7206
-0x477B = 0x7E1B
-0x477C = 0x83AB
-0x477D = 0x99C1
-0x477E = 0x9EA6
-0x4821 = 0x51FD
-0x4822 = 0x7BB1
-0x4823 = 0x7872
-0x4824 = 0x7BB8
-0x4825 = 0x8087
-0x4826 = 0x7B48
-0x4827 = 0x6AE8
-0x4828 = 0x5E61
-0x4829 = 0x808C
-0x482A = 0x7551
-0x482B = 0x7560
-0x482C = 0x516B
-0x482D = 0x9262
-0x482E = 0x6E8C
-0x482F = 0x767A
-0x4830 = 0x9197
-0x4831 = 0x9AEA
-0x4832 = 0x4F10
-0x4833 = 0x7F70
-0x4834 = 0x629C
-0x4835 = 0x7B4F
-0x4836 = 0x95A5
-0x4837 = 0x9CE9
-0x4838 = 0x567A
-0x4839 = 0x5859
-0x483A = 0x86E4
-0x483B = 0x96BC
-0x483C = 0x4F34
-0x483D = 0x5224
-0x483E = 0x534A
-0x483F = 0x53CD
-0x4840 = 0x53DB
-0x4841 = 0x5E06
-0x4842 = 0x642C
-0x4843 = 0x6591
-0x4844 = 0x677F
-0x4845 = 0x6C3E
-0x4846 = 0x6C4E
-0x4847 = 0x7248
-0x4848 = 0x72AF
-0x4849 = 0x73ED
-0x484A = 0x7554
-0x484B = 0x7E41
-0x484C = 0x822C
-0x484D = 0x85E9
-0x484E = 0x8CA9
-0x484F = 0x7BC4
-0x4850 = 0x91C6
-0x4851 = 0x7169
-0x4852 = 0x9812
-0x4853 = 0x98EF
-0x4854 = 0x633D
-0x4855 = 0x6669
-0x4856 = 0x756A
-0x4857 = 0x76E4
-0x4858 = 0x78D0
-0x4859 = 0x8543
-0x485A = 0x86EE
-0x485B = 0x532A
-0x485C = 0x5351
-0x485D = 0x5426
-0x485E = 0x5983
-0x485F = 0x5E87
-0x4860 = 0x5F7C
-0x4861 = 0x60B2
-0x4862 = 0x6249
-0x4863 = 0x6279
-0x4864 = 0x62AB
-0x4865 = 0x6590
-0x4866 = 0x6BD4
-0x4867 = 0x6CCC
-0x4868 = 0x75B2
-0x4869 = 0x76AE
-0x486A = 0x7891
-0x486B = 0x79D8
-0x486C = 0x7DCB
-0x486D = 0x7F77
-0x486E = 0x80A5
-0x486F = 0x88AB
-0x4870 = 0x8AB9
-0x4871 = 0x8CBB
-0x4872 = 0x907F
-0x4873 = 0x975E
-0x4874 = 0x98DB
-0x4875 = 0x6A0B
-0x4876 = 0x7C38
-0x4877 = 0x5099
-0x4878 = 0x5C3E
-0x4879 = 0x5FAE
-0x487A = 0x6787
-0x487B = 0x6BD8
-0x487C = 0x7435
-0x487D = 0x7709
-0x487E = 0x7F8E
-0x4921 = 0x9F3B
-0x4922 = 0x67CA
-0x4923 = 0x7A17
-0x4924 = 0x5339
-0x4925 = 0x758B
-0x4926 = 0x9AED
-0x4927 = 0x5F66
-0x4928 = 0x819D
-0x4929 = 0x83F1
-0x492A = 0x8098
-0x492B = 0x5F3C
-0x492C = 0x5FC5
-0x492D = 0x7562
-0x492E = 0x7B46
-0x492F = 0x903C
-0x4930 = 0x6867
-0x4931 = 0x59EB
-0x4932 = 0x5A9B
-0x4933 = 0x7D10
-0x4934 = 0x767E
-0x4935 = 0x8B2C
-0x4936 = 0x4FF5
-0x4937 = 0x5F6A
-0x4938 = 0x6A19
-0x4939 = 0x6C37
-0x493A = 0x6F02
-0x493B = 0x74E2
-0x493C = 0x7968
-0x493D = 0x8868
-0x493E = 0x8A55
-0x493F = 0x8C79
-0x4940 = 0x5EDF
-0x4941 = 0x63CF
-0x4942 = 0x75C5
-0x4943 = 0x79D2
-0x4944 = 0x82D7
-0x4945 = 0x9328
-0x4946 = 0x92F2
-0x4947 = 0x849C
-0x4948 = 0x86ED
-0x4949 = 0x9C2D
-0x494A = 0x54C1
-0x494B = 0x5F6C
-0x494C = 0x658C
-0x494D = 0x6D5C
-0x494E = 0x7015
-0x494F = 0x8CA7
-0x4950 = 0x8CD3
-0x4951 = 0x983B
-0x4952 = 0x654F
-0x4953 = 0x74F6
-0x4954 = 0x4E0D
-0x4955 = 0x4ED8
-0x4956 = 0x57E0
-0x4957 = 0x592B
-0x4958 = 0x5A66
-0x4959 = 0x5BCC
-0x495A = 0x51A8
-0x495B = 0x5E03
-0x495C = 0x5E9C
-0x495D = 0x6016
-0x495E = 0x6276
-0x495F = 0x6577
-0x4960 = 0x65A7
-0x4961 = 0x666E
-0x4962 = 0x6D6E
-0x4963 = 0x7236
-0x4964 = 0x7B26
-0x4965 = 0x8150
-0x4966 = 0x819A
-0x4967 = 0x8299
-0x4968 = 0x8B5C
-0x4969 = 0x8CA0
-0x496A = 0x8CE6
-0x496B = 0x8D74
-0x496C = 0x961C
-0x496D = 0x9644
-0x496E = 0x4FAE
-0x496F = 0x64AB
-0x4970 = 0x6B66
-0x4971 = 0x821E
-0x4972 = 0x8461
-0x4973 = 0x856A
-0x4974 = 0x90E8
-0x4975 = 0x5C01
-0x4976 = 0x6953
-0x4977 = 0x98A8
-0x4978 = 0x847A
-0x4979 = 0x8557
-0x497A = 0x4F0F
-0x497B = 0x526F
-0x497C = 0x5FA9
-0x497D = 0x5E45
-0x497E = 0x670D
-0x4A21 = 0x798F
-0x4A22 = 0x8179
-0x4A23 = 0x8907
-0x4A24 = 0x8986
-0x4A25 = 0x6DF5
-0x4A26 = 0x5F17
-0x4A27 = 0x6255
-0x4A28 = 0x6CB8
-0x4A29 = 0x4ECF
-0x4A2A = 0x7269
-0x4A2B = 0x9B92
-0x4A2C = 0x5206
-0x4A2D = 0x543B
-0x4A2E = 0x5674
-0x4A2F = 0x58B3
-0x4A30 = 0x61A4
-0x4A31 = 0x626E
-0x4A32 = 0x711A
-0x4A33 = 0x596E
-0x4A34 = 0x7C89
-0x4A35 = 0x7CDE
-0x4A36 = 0x7D1B
-0x4A37 = 0x96F0
-0x4A38 = 0x6587
-0x4A39 = 0x805E
-0x4A3A = 0x4E19
-0x4A3B = 0x4F75
-0x4A3C = 0x5175
-0x4A3D = 0x5840
-0x4A3E = 0x5E63
-0x4A3F = 0x5E73
-0x4A40 = 0x5F0A
-0x4A41 = 0x67C4
-0x4A42 = 0x4E26
-0x4A43 = 0x853D
-0x4A44 = 0x9589
-0x4A45 = 0x965B
-0x4A46 = 0x7C73
-0x4A47 = 0x9801
-0x4A48 = 0x50FB
-0x4A49 = 0x58C1
-0x4A4A = 0x7656
-0x4A4B = 0x78A7
-0x4A4C = 0x5225
-0x4A4D = 0x77A5
-0x4A4E = 0x8511
-0x4A4F = 0x7B86
-0x4A50 = 0x504F
-0x4A51 = 0x5909
-0x4A52 = 0x7247
-0x4A53 = 0x7BC7
-0x4A54 = 0x7DE8
-0x4A55 = 0x8FBA
-0x4A56 = 0x8FD4
-0x4A57 = 0x904D
-0x4A58 = 0x4FBF
-0x4A59 = 0x52C9
-0x4A5A = 0x5A29
-0x4A5B = 0x5F01
-0x4A5C = 0x97AD
-0x4A5D = 0x4FDD
-0x4A5E = 0x8217
-0x4A5F = 0x92EA
-0x4A60 = 0x5703
-0x4A61 = 0x6355
-0x4A62 = 0x6B69
-0x4A63 = 0x752B
-0x4A64 = 0x88DC
-0x4A65 = 0x8F14
-0x4A66 = 0x7A42
-0x4A67 = 0x52DF
-0x4A68 = 0x5893
-0x4A69 = 0x6155
-0x4A6A = 0x620A
-0x4A6B = 0x66AE
-0x4A6C = 0x6BCD
-0x4A6D = 0x7C3F
-0x4A6E = 0x83E9
-0x4A6F = 0x5023
-0x4A70 = 0x4FF8
-0x4A71 = 0x5305
-0x4A72 = 0x5446
-0x4A73 = 0x5831
-0x4A74 = 0x5949
-0x4A75 = 0x5B9D
-0x4A76 = 0x5CF0
-0x4A77 = 0x5CEF
-0x4A78 = 0x5D29
-0x4A79 = 0x5E96
-0x4A7A = 0x62B1
-0x4A7B = 0x6367
-0x4A7C = 0x653E
-0x4A7D = 0x65B9
-0x4A7E = 0x670B
-0x4B21 = 0x6CD5
-0x4B22 = 0x6CE1
-0x4B23 = 0x70F9
-0x4B24 = 0x7832
-0x4B25 = 0x7E2B
-0x4B26 = 0x80DE
-0x4B27 = 0x82B3
-0x4B28 = 0x840C
-0x4B29 = 0x84EC
-0x4B2A = 0x8702
-0x4B2B = 0x8912
-0x4B2C = 0x8A2A
-0x4B2D = 0x8C4A
-0x4B2E = 0x90A6
-0x4B2F = 0x92D2
-0x4B30 = 0x98FD
-0x4B31 = 0x9CF3
-0x4B32 = 0x9D6C
-0x4B33 = 0x4E4F
-0x4B34 = 0x4EA1
-0x4B35 = 0x508D
-0x4B36 = 0x5256
-0x4B37 = 0x574A
-0x4B38 = 0x59A8
-0x4B39 = 0x5E3D
-0x4B3A = 0x5FD8
-0x4B3B = 0x5FD9
-0x4B3C = 0x623F
-0x4B3D = 0x66B4
-0x4B3E = 0x671B
-0x4B3F = 0x67D0
-0x4B40 = 0x68D2
-0x4B41 = 0x5192
-0x4B42 = 0x7D21
-0x4B43 = 0x80AA
-0x4B44 = 0x81A8
-0x4B45 = 0x8B00
-0x4B46 = 0x8C8C
-0x4B47 = 0x8CBF
-0x4B48 = 0x927E
-0x4B49 = 0x9632
-0x4B4A = 0x5420
-0x4B4B = 0x982C
-0x4B4C = 0x5317
-0x4B4D = 0x50D5
-0x4B4E = 0x535C
-0x4B4F = 0x58A8
-0x4B50 = 0x64B2
-0x4B51 = 0x6734
-0x4B52 = 0x7267
-0x4B53 = 0x7766
-0x4B54 = 0x7A46
-0x4B55 = 0x91E6
-0x4B56 = 0x52C3
-0x4B57 = 0x6CA1
-0x4B58 = 0x6B86
-0x4B59 = 0x5800
-0x4B5A = 0x5E4C
-0x4B5B = 0x5954
-0x4B5C = 0x672C
-0x4B5D = 0x7FFB
-0x4B5E = 0x51E1
-0x4B5F = 0x76C6
-0x4B60 = 0x6469
-0x4B61 = 0x78E8
-0x4B62 = 0x9B54
-0x4B63 = 0x9EBB
-0x4B64 = 0x57CB
-0x4B65 = 0x59B9
-0x4B66 = 0x6627
-0x4B67 = 0x679A
-0x4B68 = 0x6BCE
-0x4B69 = 0x54E9
-0x4B6A = 0x69D9
-0x4B6B = 0x5E55
-0x4B6C = 0x819C
-0x4B6D = 0x6795
-0x4B6E = 0x9BAA
-0x4B6F = 0x67FE
-0x4B70 = 0x9C52
-0x4B71 = 0x685D
-0x4B72 = 0x4EA6
-0x4B73 = 0x4FE3
-0x4B74 = 0x53C8
-0x4B75 = 0x62B9
-0x4B76 = 0x672B
-0x4B77 = 0x6CAB
-0x4B78 = 0x8FC4
-0x4B79 = 0x4FAD
-0x4B7A = 0x7E6D
-0x4B7B = 0x9EBF
-0x4B7C = 0x4E07
-0x4B7D = 0x6162
-0x4B7E = 0x6E80
-0x4C21 = 0x6F2B
-0x4C22 = 0x8513
-0x4C23 = 0x5473
-0x4C24 = 0x672A
-0x4C25 = 0x9B45
-0x4C26 = 0x5DF3
-0x4C27 = 0x7B95
-0x4C28 = 0x5CAC
-0x4C29 = 0x5BC6
-0x4C2A = 0x871C
-0x4C2B = 0x6E4A
-0x4C2C = 0x84D1
-0x4C2D = 0x7A14
-0x4C2E = 0x8108
-0x4C2F = 0x5999
-0x4C30 = 0x7C8D
-0x4C31 = 0x6C11
-0x4C32 = 0x7720
-0x4C33 = 0x52D9
-0x4C34 = 0x5922
-0x4C35 = 0x7121
-0x4C36 = 0x725F
-0x4C37 = 0x77DB
-0x4C38 = 0x9727
-0x4C39 = 0x9D61
-0x4C3A = 0x690B
-0x4C3B = 0x5A7F
-0x4C3C = 0x5A18
-0x4C3D = 0x51A5
-0x4C3E = 0x540D
-0x4C3F = 0x547D
-0x4C40 = 0x660E
-0x4C41 = 0x76DF
-0x4C42 = 0x8FF7
-0x4C43 = 0x9298
-0x4C44 = 0x9CF4
-0x4C45 = 0x59EA
-0x4C46 = 0x725D
-0x4C47 = 0x6EC5
-0x4C48 = 0x514D
-0x4C49 = 0x68C9
-0x4C4A = 0x7DBF
-0x4C4B = 0x7DEC
-0x4C4C = 0x9762
-0x4C4D = 0x9EBA
-0x4C4E = 0x6478
-0x4C4F = 0x6A21
-0x4C50 = 0x8302
-0x4C51 = 0x5984
-0x4C52 = 0x5B5F
-0x4C53 = 0x6BDB
-0x4C54 = 0x731B
-0x4C55 = 0x76F2
-0x4C56 = 0x7DB2
-0x4C57 = 0x8017
-0x4C58 = 0x8499
-0x4C59 = 0x5132
-0x4C5A = 0x6728
-0x4C5B = 0x9ED9
-0x4C5C = 0x76EE
-0x4C5D = 0x6762
-0x4C5E = 0x52FF
-0x4C5F = 0x9905
-0x4C60 = 0x5C24
-0x4C61 = 0x623B
-0x4C62 = 0x7C7E
-0x4C63 = 0x8CB0
-0x4C64 = 0x554F
-0x4C65 = 0x60B6
-0x4C66 = 0x7D0B
-0x4C67 = 0x9580
-0x4C68 = 0x5301
-0x4C69 = 0x4E5F
-0x4C6A = 0x51B6
-0x4C6B = 0x591C
-0x4C6C = 0x723A
-0x4C6D = 0x8036
-0x4C6E = 0x91CE
-0x4C6F = 0x5F25
-0x4C70 = 0x77E2
-0x4C71 = 0x5384
-0x4C72 = 0x5F79
-0x4C73 = 0x7D04
-0x4C74 = 0x85AC
-0x4C75 = 0x8A33
-0x4C76 = 0x8E8D
-0x4C77 = 0x9756
-0x4C78 = 0x67F3
-0x4C79 = 0x85AE
-0x4C7A = 0x9453
-0x4C7B = 0x6109
-0x4C7C = 0x6108
-0x4C7D = 0x6CB9
-0x4C7E = 0x7652
-0x4D21 = 0x8AED
-0x4D22 = 0x8F38
-0x4D23 = 0x552F
-0x4D24 = 0x4F51
-0x4D25 = 0x512A
-0x4D26 = 0x52C7
-0x4D27 = 0x53CB
-0x4D28 = 0x5BA5
-0x4D29 = 0x5E7D
-0x4D2A = 0x60A0
-0x4D2B = 0x6182
-0x4D2C = 0x63D6
-0x4D2D = 0x6709
-0x4D2E = 0x67DA
-0x4D2F = 0x6E67
-0x4D30 = 0x6D8C
-0x4D31 = 0x7336
-0x4D32 = 0x7337
-0x4D33 = 0x7531
-0x4D34 = 0x7950
-0x4D35 = 0x88D5
-0x4D36 = 0x8A98
-0x4D37 = 0x904A
-0x4D38 = 0x9091
-0x4D39 = 0x90F5
-0x4D3A = 0x96C4
-0x4D3B = 0x878D
-0x4D3C = 0x5915
-0x4D3D = 0x4E88
-0x4D3E = 0x4F59
-0x4D3F = 0x4E0E
-0x4D40 = 0x8A89
-0x4D41 = 0x8F3F
-0x4D42 = 0x9810
-0x4D43 = 0x50AD
-0x4D44 = 0x5E7C
-0x4D45 = 0x5996
-0x4D46 = 0x5BB9
-0x4D47 = 0x5EB8
-0x4D48 = 0x63DA
-0x4D49 = 0x63FA
-0x4D4A = 0x64C1
-0x4D4B = 0x66DC
-0x4D4C = 0x694A
-0x4D4D = 0x69D8
-0x4D4E = 0x6D0B
-0x4D4F = 0x6EB6
-0x4D50 = 0x7194
-0x4D51 = 0x7528
-0x4D52 = 0x7AAF
-0x4D53 = 0x7F8A
-0x4D54 = 0x8000
-0x4D55 = 0x8449
-0x4D56 = 0x84C9
-0x4D57 = 0x8981
-0x4D58 = 0x8B21
-0x4D59 = 0x8E0A
-0x4D5A = 0x9065
-0x4D5B = 0x967D
-0x4D5C = 0x990A
-0x4D5D = 0x617E
-0x4D5E = 0x6291
-0x4D5F = 0x6B32
-0x4D60 = 0x6C83
-0x4D61 = 0x6D74
-0x4D62 = 0x7FCC
-0x4D63 = 0x7FFC
-0x4D64 = 0x6DC0
-0x4D65 = 0x7F85
-0x4D66 = 0x87BA
-0x4D67 = 0x88F8
-0x4D68 = 0x6765
-0x4D69 = 0x83B1
-0x4D6A = 0x983C
-0x4D6B = 0x96F7
-0x4D6C = 0x6D1B
-0x4D6D = 0x7D61
-0x4D6E = 0x843D
-0x4D6F = 0x916A
-0x4D70 = 0x4E71
-0x4D71 = 0x5375
-0x4D72 = 0x5D50
-0x4D73 = 0x6B04
-0x4D74 = 0x6FEB
-0x4D75 = 0x85CD
-0x4D76 = 0x862D
-0x4D77 = 0x89A7
-0x4D78 = 0x5229
-0x4D79 = 0x540F
-0x4D7A = 0x5C65
-0x4D7B = 0x674E
-0x4D7C = 0x68A8
-0x4D7D = 0x7406
-0x4D7E = 0x7483
-0x4E21 = 0x75E2
-0x4E22 = 0x88CF
-0x4E23 = 0x88E1
-0x4E24 = 0x91CC
-0x4E25 = 0x96E2
-0x4E26 = 0x9678
-0x4E27 = 0x5F8B
-0x4E28 = 0x7387
-0x4E29 = 0x7ACB
-0x4E2A = 0x844E
-0x4E2B = 0x63A0
-0x4E2C = 0x7565
-0x4E2D = 0x5289
-0x4E2E = 0x6D41
-0x4E2F = 0x6E9C
-0x4E30 = 0x7409
-0x4E31 = 0x7559
-0x4E32 = 0x786B
-0x4E33 = 0x7C92
-0x4E34 = 0x9686
-0x4E35 = 0x7ADC
-0x4E36 = 0x9F8D
-0x4E37 = 0x4FB6
-0x4E38 = 0x616E
-0x4E39 = 0x65C5
-0x4E3A = 0x865C
-0x4E3B = 0x4E86
-0x4E3C = 0x4EAE
-0x4E3D = 0x50DA
-0x4E3E = 0x4E21
-0x4E3F = 0x51CC
-0x4E40 = 0x5BEE
-0x4E41 = 0x6599
-0x4E42 = 0x6881
-0x4E43 = 0x6DBC
-0x4E44 = 0x731F
-0x4E45 = 0x7642
-0x4E46 = 0x77AD
-0x4E47 = 0x7A1C
-0x4E48 = 0x7CE7
-0x4E49 = 0x826F
-0x4E4A = 0x8AD2
-0x4E4B = 0x907C
-0x4E4C = 0x91CF
-0x4E4D = 0x9675
-0x4E4E = 0x9818
-0x4E4F = 0x529B
-0x4E50 = 0x7DD1
-0x4E51 = 0x502B
-0x4E52 = 0x5398
-0x4E53 = 0x6797
-0x4E54 = 0x6DCB
-0x4E55 = 0x71D0
-0x4E56 = 0x7433
-0x4E57 = 0x81E8
-0x4E58 = 0x8F2A
-0x4E59 = 0x96A3
-0x4E5A = 0x9C57
-0x4E5B = 0x9E9F
-0x4E5C = 0x7460
-0x4E5D = 0x5841
-0x4E5E = 0x6D99
-0x4E5F = 0x7D2F
-0x4E60 = 0x985E
-0x4E61 = 0x4EE4
-0x4E62 = 0x4F36
-0x4E63 = 0x4F8B
-0x4E64 = 0x51B7
-0x4E65 = 0x52B1
-0x4E66 = 0x5DBA
-0x4E67 = 0x601C
-0x4E68 = 0x73B2
-0x4E69 = 0x793C
-0x4E6A = 0x82D3
-0x4E6B = 0x9234
-0x4E6C = 0x96B7
-0x4E6D = 0x96F6
-0x4E6E = 0x970A
-0x4E6F = 0x9E97
-0x4E70 = 0x9F62
-0x4E71 = 0x66A6
-0x4E72 = 0x6B74
-0x4E73 = 0x5217
-0x4E74 = 0x52A3
-0x4E75 = 0x70C8
-0x4E76 = 0x88C2
-0x4E77 = 0x5EC9
-0x4E78 = 0x604B
-0x4E79 = 0x6190
-0x4E7A = 0x6F23
-0x4E7B = 0x7149
-0x4E7C = 0x7C3E
-0x4E7D = 0x7DF4
-0x4E7E = 0x806F
-0x4F21 = 0x84EE
-0x4F22 = 0x9023
-0x4F23 = 0x932C
-0x4F24 = 0x5442
-0x4F25 = 0x9B6F
-0x4F26 = 0x6AD3
-0x4F27 = 0x7089
-0x4F28 = 0x8CC2
-0x4F29 = 0x8DEF
-0x4F2A = 0x9732
-0x4F2B = 0x52B4
-0x4F2C = 0x5A41
-0x4F2D = 0x5ECA
-0x4F2E = 0x5F04
-0x4F2F = 0x6717
-0x4F30 = 0x697C
-0x4F31 = 0x6994
-0x4F32 = 0x6D6A
-0x4F33 = 0x6F0F
-0x4F34 = 0x7262
-0x4F35 = 0x72FC
-0x4F36 = 0x7BED
-0x4F37 = 0x8001
-0x4F38 = 0x807E
-0x4F39 = 0x874B
-0x4F3A = 0x90CE
-0x4F3B = 0x516D
-0x4F3C = 0x9E93
-0x4F3D = 0x7984
-0x4F3E = 0x808B
-0x4F3F = 0x9332
-0x4F40 = 0x8AD6
-0x4F41 = 0x502D
-0x4F42 = 0x548C
-0x4F43 = 0x8A71
-0x4F44 = 0x6B6A
-0x4F45 = 0x8CC4
-0x4F46 = 0x8107
-0x4F47 = 0x60D1
-0x4F48 = 0x67A0
-0x4F49 = 0x9DF2
-0x4F4A = 0x4E99
-0x4F4B = 0x4E98
-0x4F4C = 0x9C10
-0x4F4D = 0x8A6B
-0x4F4E = 0x85C1
-0x4F4F = 0x8568
-0x4F50 = 0x6900
-0x4F51 = 0x6E7E
-0x4F52 = 0x7897
-0x4F53 = 0x8155
-0x5021 = 0x5F0C
-0x5022 = 0x4E10
-0x5023 = 0x4E15
-0x5024 = 0x4E2A
-0x5025 = 0x4E31
-0x5026 = 0x4E36
-0x5027 = 0x4E3C
-0x5028 = 0x4E3F
-0x5029 = 0x4E42
-0x502A = 0x4E56
-0x502B = 0x4E58
-0x502C = 0x4E82
-0x502D = 0x4E85
-0x502E = 0x8C6B
-0x502F = 0x4E8A
-0x5030 = 0x8212
-0x5031 = 0x5F0D
-0x5032 = 0x4E8E
-0x5033 = 0x4E9E
-0x5034 = 0x4E9F
-0x5035 = 0x4EA0
-0x5036 = 0x4EA2
-0x5037 = 0x4EB0
-0x5038 = 0x4EB3
-0x5039 = 0x4EB6
-0x503A = 0x4ECE
-0x503B = 0x4ECD
-0x503C = 0x4EC4
-0x503D = 0x4EC6
-0x503E = 0x4EC2
-0x503F = 0x4ED7
-0x5040 = 0x4EDE
-0x5041 = 0x4EED
-0x5042 = 0x4EDF
-0x5043 = 0x4EF7
-0x5044 = 0x4F09
-0x5045 = 0x4F5A
-0x5046 = 0x4F30
-0x5047 = 0x4F5B
-0x5048 = 0x4F5D
-0x5049 = 0x4F57
-0x504A = 0x4F47
-0x504B = 0x4F76
-0x504C = 0x4F88
-0x504D = 0x4F8F
-0x504E = 0x4F98
-0x504F = 0x4F7B
-0x5050 = 0x4F69
-0x5051 = 0x4F70
-0x5052 = 0x4F91
-0x5053 = 0x4F6F
-0x5054 = 0x4F86
-0x5055 = 0x4F96
-0x5056 = 0x5118
-0x5057 = 0x4FD4
-0x5058 = 0x4FDF
-0x5059 = 0x4FCE
-0x505A = 0x4FD8
-0x505B = 0x4FDB
-0x505C = 0x4FD1
-0x505D = 0x4FDA
-0x505E = 0x4FD0
-0x505F = 0x4FE4
-0x5060 = 0x4FE5
-0x5061 = 0x501A
-0x5062 = 0x5028
-0x5063 = 0x5014
-0x5064 = 0x502A
-0x5065 = 0x5025
-0x5066 = 0x5005
-0x5067 = 0x4F1C
-0x5068 = 0x4FF6
-0x5069 = 0x5021
-0x506A = 0x5029
-0x506B = 0x502C
-0x506C = 0x4FFE
-0x506D = 0x4FEF
-0x506E = 0x5011
-0x506F = 0x5006
-0x5070 = 0x5043
-0x5071 = 0x5047
-0x5072 = 0x6703
-0x5073 = 0x5055
-0x5074 = 0x5050
-0x5075 = 0x5048
-0x5076 = 0x505A
-0x5077 = 0x5056
-0x5078 = 0x506C
-0x5079 = 0x5078
-0x507A = 0x5080
-0x507B = 0x509A
-0x507C = 0x5085
-0x507D = 0x50B4
-0x507E = 0x50B2
-0x5121 = 0x50C9
-0x5122 = 0x50CA
-0x5123 = 0x50B3
-0x5124 = 0x50C2
-0x5125 = 0x50D6
-0x5126 = 0x50DE
-0x5127 = 0x50E5
-0x5128 = 0x50ED
-0x5129 = 0x50E3
-0x512A = 0x50EE
-0x512B = 0x50F9
-0x512C = 0x50F5
-0x512D = 0x5109
-0x512E = 0x5101
-0x512F = 0x5102
-0x5130 = 0x5116
-0x5131 = 0x5115
-0x5132 = 0x5114
-0x5133 = 0x511A
-0x5134 = 0x5121
-0x5135 = 0x513A
-0x5136 = 0x5137
-0x5137 = 0x513C
-0x5138 = 0x513B
-0x5139 = 0x513F
-0x513A = 0x5140
-0x513B = 0x5152
-0x513C = 0x514C
-0x513D = 0x5154
-0x513E = 0x5162
-0x513F = 0x7AF8
-0x5140 = 0x5169
-0x5141 = 0x516A
-0x5142 = 0x516E
-0x5143 = 0x5180
-0x5144 = 0x5182
-0x5145 = 0x56D8
-0x5146 = 0x518C
-0x5147 = 0x5189
-0x5148 = 0x518F
-0x5149 = 0x5191
-0x514A = 0x5193
-0x514B = 0x5195
-0x514C = 0x5196
-0x514D = 0x51A4
-0x514E = 0x51A6
-0x514F = 0x51A2
-0x5150 = 0x51A9
-0x5151 = 0x51AA
-0x5152 = 0x51AB
-0x5153 = 0x51B3
-0x5154 = 0x51B1
-0x5155 = 0x51B2
-0x5156 = 0x51B0
-0x5157 = 0x51B5
-0x5158 = 0x51BD
-0x5159 = 0x51C5
-0x515A = 0x51C9
-0x515B = 0x51DB
-0x515C = 0x51E0
-0x515D = 0x8655
-0x515E = 0x51E9
-0x515F = 0x51ED
-0x5160 = 0x51F0
-0x5161 = 0x51F5
-0x5162 = 0x51FE
-0x5163 = 0x5204
-0x5164 = 0x520B
-0x5165 = 0x5214
-0x5166 = 0x520E
-0x5167 = 0x5227
-0x5168 = 0x522A
-0x5169 = 0x522E
-0x516A = 0x5233
-0x516B = 0x5239
-0x516C = 0x524F
-0x516D = 0x5244
-0x516E = 0x524B
-0x516F = 0x524C
-0x5170 = 0x525E
-0x5171 = 0x5254
-0x5172 = 0x526A
-0x5173 = 0x5274
-0x5174 = 0x5269
-0x5175 = 0x5273
-0x5176 = 0x527F
-0x5177 = 0x527D
-0x5178 = 0x528D
-0x5179 = 0x5294
-0x517A = 0x5292
-0x517B = 0x5271
-0x517C = 0x5288
-0x517D = 0x5291
-0x517E = 0x8FA8
-0x5221 = 0x8FA7
-0x5222 = 0x52AC
-0x5223 = 0x52AD
-0x5224 = 0x52BC
-0x5225 = 0x52B5
-0x5226 = 0x52C1
-0x5227 = 0x52CD
-0x5228 = 0x52D7
-0x5229 = 0x52DE
-0x522A = 0x52E3
-0x522B = 0x52E6
-0x522C = 0x98ED
-0x522D = 0x52E0
-0x522E = 0x52F3
-0x522F = 0x52F5
-0x5230 = 0x52F8
-0x5231 = 0x52F9
-0x5232 = 0x5306
-0x5233 = 0x5308
-0x5234 = 0x7538
-0x5235 = 0x530D
-0x5236 = 0x5310
-0x5237 = 0x530F
-0x5238 = 0x5315
-0x5239 = 0x531A
-0x523A = 0x5323
-0x523B = 0x532F
-0x523C = 0x5331
-0x523D = 0x5333
-0x523E = 0x5338
-0x523F = 0x5340
-0x5240 = 0x5346
-0x5241 = 0x5345
-0x5242 = 0x4E17
-0x5243 = 0x5349
-0x5244 = 0x534D
-0x5245 = 0x51D6
-0x5246 = 0x535E
-0x5247 = 0x5369
-0x5248 = 0x536E
-0x5249 = 0x5918
-0x524A = 0x537B
-0x524B = 0x5377
-0x524C = 0x5382
-0x524D = 0x5396
-0x524E = 0x53A0
-0x524F = 0x53A6
-0x5250 = 0x53A5
-0x5251 = 0x53AE
-0x5252 = 0x53B0
-0x5253 = 0x53B6
-0x5254 = 0x53C3
-0x5255 = 0x7C12
-0x5256 = 0x96D9
-0x5257 = 0x53DF
-0x5258 = 0x66FC
-0x5259 = 0x71EE
-0x525A = 0x53EE
-0x525B = 0x53E8
-0x525C = 0x53ED
-0x525D = 0x53FA
-0x525E = 0x5401
-0x525F = 0x543D
-0x5260 = 0x5440
-0x5261 = 0x542C
-0x5262 = 0x542D
-0x5263 = 0x543C
-0x5264 = 0x542E
-0x5265 = 0x5436
-0x5266 = 0x5429
-0x5267 = 0x541D
-0x5268 = 0x544E
-0x5269 = 0x548F
-0x526A = 0x5475
-0x526B = 0x548E
-0x526C = 0x545F
-0x526D = 0x5471
-0x526E = 0x5477
-0x526F = 0x5470
-0x5270 = 0x5492
-0x5271 = 0x547B
-0x5272 = 0x5480
-0x5273 = 0x5476
-0x5274 = 0x5484
-0x5275 = 0x5490
-0x5276 = 0x5486
-0x5277 = 0x54C7
-0x5278 = 0x54A2
-0x5279 = 0x54B8
-0x527A = 0x54A5
-0x527B = 0x54AC
-0x527C = 0x54C4
-0x527D = 0x54C8
-0x527E = 0x54A8
-0x5321 = 0x54AB
-0x5322 = 0x54C2
-0x5323 = 0x54A4
-0x5324 = 0x54BE
-0x5325 = 0x54BC
-0x5326 = 0x54D8
-0x5327 = 0x54E5
-0x5328 = 0x54E6
-0x5329 = 0x550F
-0x532A = 0x5514
-0x532B = 0x54FD
-0x532C = 0x54EE
-0x532D = 0x54ED
-0x532E = 0x54FA
-0x532F = 0x54E2
-0x5330 = 0x5539
-0x5331 = 0x5540
-0x5332 = 0x5563
-0x5333 = 0x554C
-0x5334 = 0x552E
-0x5335 = 0x555C
-0x5336 = 0x5545
-0x5337 = 0x5556
-0x5338 = 0x5557
-0x5339 = 0x5538
-0x533A = 0x5533
-0x533B = 0x555D
-0x533C = 0x5599
-0x533D = 0x5580
-0x533E = 0x54AF
-0x533F = 0x558A
-0x5340 = 0x559F
-0x5341 = 0x557B
-0x5342 = 0x557E
-0x5343 = 0x5598
-0x5344 = 0x559E
-0x5345 = 0x55AE
-0x5346 = 0x557C
-0x5347 = 0x5583
-0x5348 = 0x55A9
-0x5349 = 0x5587
-0x534A = 0x55A8
-0x534B = 0x55DA
-0x534C = 0x55C5
-0x534D = 0x55DF
-0x534E = 0x55C4
-0x534F = 0x55DC
-0x5350 = 0x55E4
-0x5351 = 0x55D4
-0x5352 = 0x5614
-0x5353 = 0x55F7
-0x5354 = 0x5616
-0x5355 = 0x55FE
-0x5356 = 0x55FD
-0x5357 = 0x561B
-0x5358 = 0x55F9
-0x5359 = 0x564E
-0x535A = 0x5650
-0x535B = 0x71DF
-0x535C = 0x5634
-0x535D = 0x5636
-0x535E = 0x5632
-0x535F = 0x5638
-0x5360 = 0x566B
-0x5361 = 0x5664
-0x5362 = 0x562F
-0x5363 = 0x566C
-0x5364 = 0x566A
-0x5365 = 0x5686
-0x5366 = 0x5680
-0x5367 = 0x568A
-0x5368 = 0x56A0
-0x5369 = 0x5694
-0x536A = 0x568F
-0x536B = 0x56A5
-0x536C = 0x56AE
-0x536D = 0x56B6
-0x536E = 0x56B4
-0x536F = 0x56C2
-0x5370 = 0x56BC
-0x5371 = 0x56C1
-0x5372 = 0x56C3
-0x5373 = 0x56C0
-0x5374 = 0x56C8
-0x5375 = 0x56CE
-0x5376 = 0x56D1
-0x5377 = 0x56D3
-0x5378 = 0x56D7
-0x5379 = 0x56EE
-0x537A = 0x56F9
-0x537B = 0x5700
-0x537C = 0x56FF
-0x537D = 0x5704
-0x537E = 0x5709
-0x5421 = 0x5708
-0x5422 = 0x570B
-0x5423 = 0x570D
-0x5424 = 0x5713
-0x5425 = 0x5718
-0x5426 = 0x5716
-0x5427 = 0x55C7
-0x5428 = 0x571C
-0x5429 = 0x5726
-0x542A = 0x5737
-0x542B = 0x5738
-0x542C = 0x574E
-0x542D = 0x573B
-0x542E = 0x5740
-0x542F = 0x574F
-0x5430 = 0x5769
-0x5431 = 0x57C0
-0x5432 = 0x5788
-0x5433 = 0x5761
-0x5434 = 0x577F
-0x5435 = 0x5789
-0x5436 = 0x5793
-0x5437 = 0x57A0
-0x5438 = 0x57B3
-0x5439 = 0x57A4
-0x543A = 0x57AA
-0x543B = 0x57B0
-0x543C = 0x57C3
-0x543D = 0x57C6
-0x543E = 0x57D4
-0x543F = 0x57D2
-0x5440 = 0x57D3
-0x5441 = 0x580A
-0x5442 = 0x57D6
-0x5443 = 0x57E3
-0x5444 = 0x580B
-0x5445 = 0x5819
-0x5446 = 0x581D
-0x5447 = 0x5872
-0x5448 = 0x5821
-0x5449 = 0x5862
-0x544A = 0x584B
-0x544B = 0x5870
-0x544C = 0x6BC0
-0x544D = 0x5852
-0x544E = 0x583D
-0x544F = 0x5879
-0x5450 = 0x5885
-0x5451 = 0x58B9
-0x5452 = 0x589F
-0x5453 = 0x58AB
-0x5454 = 0x58BA
-0x5455 = 0x58DE
-0x5456 = 0x58BB
-0x5457 = 0x58B8
-0x5458 = 0x58AE
-0x5459 = 0x58C5
-0x545A = 0x58D3
-0x545B = 0x58D1
-0x545C = 0x58D7
-0x545D = 0x58D9
-0x545E = 0x58D8
-0x545F = 0x58E5
-0x5460 = 0x58DC
-0x5461 = 0x58E4
-0x5462 = 0x58DF
-0x5463 = 0x58EF
-0x5464 = 0x58FA
-0x5465 = 0x58F9
-0x5466 = 0x58FB
-0x5467 = 0x58FC
-0x5468 = 0x58FD
-0x5469 = 0x5902
-0x546A = 0x590A
-0x546B = 0x5910
-0x546C = 0x591B
-0x546D = 0x68A6
-0x546E = 0x5925
-0x546F = 0x592C
-0x5470 = 0x592D
-0x5471 = 0x5932
-0x5472 = 0x5938
-0x5473 = 0x593E
-0x5474 = 0x7AD2
-0x5475 = 0x5955
-0x5476 = 0x5950
-0x5477 = 0x594E
-0x5478 = 0x595A
-0x5479 = 0x5958
-0x547A = 0x5962
-0x547B = 0x5960
-0x547C = 0x5967
-0x547D = 0x596C
-0x547E = 0x5969
-0x5521 = 0x5978
-0x5522 = 0x5981
-0x5523 = 0x599D
-0x5524 = 0x4F5E
-0x5525 = 0x4FAB
-0x5526 = 0x59A3
-0x5527 = 0x59B2
-0x5528 = 0x59C6
-0x5529 = 0x59E8
-0x552A = 0x59DC
-0x552B = 0x598D
-0x552C = 0x59D9
-0x552D = 0x59DA
-0x552E = 0x5A25
-0x552F = 0x5A1F
-0x5530 = 0x5A11
-0x5531 = 0x5A1C
-0x5532 = 0x5A09
-0x5533 = 0x5A1A
-0x5534 = 0x5A40
-0x5535 = 0x5A6C
-0x5536 = 0x5A49
-0x5537 = 0x5A35
-0x5538 = 0x5A36
-0x5539 = 0x5A62
-0x553A = 0x5A6A
-0x553B = 0x5A9A
-0x553C = 0x5ABC
-0x553D = 0x5ABE
-0x553E = 0x5ACB
-0x553F = 0x5AC2
-0x5540 = 0x5ABD
-0x5541 = 0x5AE3
-0x5542 = 0x5AD7
-0x5543 = 0x5AE6
-0x5544 = 0x5AE9
-0x5545 = 0x5AD6
-0x5546 = 0x5AFA
-0x5547 = 0x5AFB
-0x5548 = 0x5B0C
-0x5549 = 0x5B0B
-0x554A = 0x5B16
-0x554B = 0x5B32
-0x554C = 0x5AD0
-0x554D = 0x5B2A
-0x554E = 0x5B36
-0x554F = 0x5B3E
-0x5550 = 0x5B43
-0x5551 = 0x5B45
-0x5552 = 0x5B40
-0x5553 = 0x5B51
-0x5554 = 0x5B55
-0x5555 = 0x5B5A
-0x5556 = 0x5B5B
-0x5557 = 0x5B65
-0x5558 = 0x5B69
-0x5559 = 0x5B70
-0x555A = 0x5B73
-0x555B = 0x5B75
-0x555C = 0x5B78
-0x555D = 0x6588
-0x555E = 0x5B7A
-0x555F = 0x5B80
-0x5560 = 0x5B83
-0x5561 = 0x5BA6
-0x5562 = 0x5BB8
-0x5563 = 0x5BC3
-0x5564 = 0x5BC7
-0x5565 = 0x5BC9
-0x5566 = 0x5BD4
-0x5567 = 0x5BD0
-0x5568 = 0x5BE4
-0x5569 = 0x5BE6
-0x556A = 0x5BE2
-0x556B = 0x5BDE
-0x556C = 0x5BE5
-0x556D = 0x5BEB
-0x556E = 0x5BF0
-0x556F = 0x5BF6
-0x5570 = 0x5BF3
-0x5571 = 0x5C05
-0x5572 = 0x5C07
-0x5573 = 0x5C08
-0x5574 = 0x5C0D
-0x5575 = 0x5C13
-0x5576 = 0x5C20
-0x5577 = 0x5C22
-0x5578 = 0x5C28
-0x5579 = 0x5C38
-0x557A = 0x5C39
-0x557B = 0x5C41
-0x557C = 0x5C46
-0x557D = 0x5C4E
-0x557E = 0x5C53
-0x5621 = 0x5C50
-0x5622 = 0x5C4F
-0x5623 = 0x5B71
-0x5624 = 0x5C6C
-0x5625 = 0x5C6E
-0x5626 = 0x4E62
-0x5627 = 0x5C76
-0x5628 = 0x5C79
-0x5629 = 0x5C8C
-0x562A = 0x5C91
-0x562B = 0x5C94
-0x562C = 0x599B
-0x562D = 0x5CAB
-0x562E = 0x5CBB
-0x562F = 0x5CB6
-0x5630 = 0x5CBC
-0x5631 = 0x5CB7
-0x5632 = 0x5CC5
-0x5633 = 0x5CBE
-0x5634 = 0x5CC7
-0x5635 = 0x5CD9
-0x5636 = 0x5CE9
-0x5637 = 0x5CFD
-0x5638 = 0x5CFA
-0x5639 = 0x5CED
-0x563A = 0x5D8C
-0x563B = 0x5CEA
-0x563C = 0x5D0B
-0x563D = 0x5D15
-0x563E = 0x5D17
-0x563F = 0x5D5C
-0x5640 = 0x5D1F
-0x5641 = 0x5D1B
-0x5642 = 0x5D11
-0x5643 = 0x5D14
-0x5644 = 0x5D22
-0x5645 = 0x5D1A
-0x5646 = 0x5D19
-0x5647 = 0x5D18
-0x5648 = 0x5D4C
-0x5649 = 0x5D52
-0x564A = 0x5D4E
-0x564B = 0x5D4B
-0x564C = 0x5D6C
-0x564D = 0x5D73
-0x564E = 0x5D76
-0x564F = 0x5D87
-0x5650 = 0x5D84
-0x5651 = 0x5D82
-0x5652 = 0x5DA2
-0x5653 = 0x5D9D
-0x5654 = 0x5DAC
-0x5655 = 0x5DAE
-0x5656 = 0x5DBD
-0x5657 = 0x5D90
-0x5658 = 0x5DB7
-0x5659 = 0x5DBC
-0x565A = 0x5DC9
-0x565B = 0x5DCD
-0x565C = 0x5DD3
-0x565D = 0x5DD2
-0x565E = 0x5DD6
-0x565F = 0x5DDB
-0x5660 = 0x5DEB
-0x5661 = 0x5DF2
-0x5662 = 0x5DF5
-0x5663 = 0x5E0B
-0x5664 = 0x5E1A
-0x5665 = 0x5E19
-0x5666 = 0x5E11
-0x5667 = 0x5E1B
-0x5668 = 0x5E36
-0x5669 = 0x5E37
-0x566A = 0x5E44
-0x566B = 0x5E43
-0x566C = 0x5E40
-0x566D = 0x5E4E
-0x566E = 0x5E57
-0x566F = 0x5E54
-0x5670 = 0x5E5F
-0x5671 = 0x5E62
-0x5672 = 0x5E64
-0x5673 = 0x5E47
-0x5674 = 0x5E75
-0x5675 = 0x5E76
-0x5676 = 0x5E7A
-0x5677 = 0x9EBC
-0x5678 = 0x5E7F
-0x5679 = 0x5EA0
-0x567A = 0x5EC1
-0x567B = 0x5EC2
-0x567C = 0x5EC8
-0x567D = 0x5ED0
-0x567E = 0x5ECF
-0x5721 = 0x5ED6
-0x5722 = 0x5EE3
-0x5723 = 0x5EDD
-0x5724 = 0x5EDA
-0x5725 = 0x5EDB
-0x5726 = 0x5EE2
-0x5727 = 0x5EE1
-0x5728 = 0x5EE8
-0x5729 = 0x5EE9
-0x572A = 0x5EEC
-0x572B = 0x5EF1
-0x572C = 0x5EF3
-0x572D = 0x5EF0
-0x572E = 0x5EF4
-0x572F = 0x5EF8
-0x5730 = 0x5EFE
-0x5731 = 0x5F03
-0x5732 = 0x5F09
-0x5733 = 0x5F5D
-0x5734 = 0x5F5C
-0x5735 = 0x5F0B
-0x5736 = 0x5F11
-0x5737 = 0x5F16
-0x5738 = 0x5F29
-0x5739 = 0x5F2D
-0x573A = 0x5F38
-0x573B = 0x5F41
-0x573C = 0x5F48
-0x573D = 0x5F4C
-0x573E = 0x5F4E
-0x573F = 0x5F2F
-0x5740 = 0x5F51
-0x5741 = 0x5F56
-0x5742 = 0x5F57
-0x5743 = 0x5F59
-0x5744 = 0x5F61
-0x5745 = 0x5F6D
-0x5746 = 0x5F73
-0x5747 = 0x5F77
-0x5748 = 0x5F83
-0x5749 = 0x5F82
-0x574A = 0x5F7F
-0x574B = 0x5F8A
-0x574C = 0x5F88
-0x574D = 0x5F91
-0x574E = 0x5F87
-0x574F = 0x5F9E
-0x5750 = 0x5F99
-0x5751 = 0x5F98
-0x5752 = 0x5FA0
-0x5753 = 0x5FA8
-0x5754 = 0x5FAD
-0x5755 = 0x5FBC
-0x5756 = 0x5FD6
-0x5757 = 0x5FFB
-0x5758 = 0x5FE4
-0x5759 = 0x5FF8
-0x575A = 0x5FF1
-0x575B = 0x5FDD
-0x575C = 0x60B3
-0x575D = 0x5FFF
-0x575E = 0x6021
-0x575F = 0x6060
-0x5760 = 0x6019
-0x5761 = 0x6010
-0x5762 = 0x6029
-0x5763 = 0x600E
-0x5764 = 0x6031
-0x5765 = 0x601B
-0x5766 = 0x6015
-0x5767 = 0x602B
-0x5768 = 0x6026
-0x5769 = 0x600F
-0x576A = 0x603A
-0x576B = 0x605A
-0x576C = 0x6041
-0x576D = 0x606A
-0x576E = 0x6077
-0x576F = 0x605F
-0x5770 = 0x604A
-0x5771 = 0x6046
-0x5772 = 0x604D
-0x5773 = 0x6063
-0x5774 = 0x6043
-0x5775 = 0x6064
-0x5776 = 0x6042
-0x5777 = 0x606C
-0x5778 = 0x606B
-0x5779 = 0x6059
-0x577A = 0x6081
-0x577B = 0x608D
-0x577C = 0x60E7
-0x577D = 0x6083
-0x577E = 0x609A
-0x5821 = 0x6084
-0x5822 = 0x609B
-0x5823 = 0x6096
-0x5824 = 0x6097
-0x5825 = 0x6092
-0x5826 = 0x60A7
-0x5827 = 0x608B
-0x5828 = 0x60E1
-0x5829 = 0x60B8
-0x582A = 0x60E0
-0x582B = 0x60D3
-0x582C = 0x60B4
-0x582D = 0x5FF0
-0x582E = 0x60BD
-0x582F = 0x60C6
-0x5830 = 0x60B5
-0x5831 = 0x60D8
-0x5832 = 0x614D
-0x5833 = 0x6115
-0x5834 = 0x6106
-0x5835 = 0x60F6
-0x5836 = 0x60F7
-0x5837 = 0x6100
-0x5838 = 0x60F4
-0x5839 = 0x60FA
-0x583A = 0x6103
-0x583B = 0x6121
-0x583C = 0x60FB
-0x583D = 0x60F1
-0x583E = 0x610D
-0x583F = 0x610E
-0x5840 = 0x6147
-0x5841 = 0x613E
-0x5842 = 0x6128
-0x5843 = 0x6127
-0x5844 = 0x614A
-0x5845 = 0x613F
-0x5846 = 0x613C
-0x5847 = 0x612C
-0x5848 = 0x6134
-0x5849 = 0x613D
-0x584A = 0x6142
-0x584B = 0x6144
-0x584C = 0x6173
-0x584D = 0x6177
-0x584E = 0x6158
-0x584F = 0x6159
-0x5850 = 0x615A
-0x5851 = 0x616B
-0x5852 = 0x6174
-0x5853 = 0x616F
-0x5854 = 0x6165
-0x5855 = 0x6171
-0x5856 = 0x615F
-0x5857 = 0x615D
-0x5858 = 0x6153
-0x5859 = 0x6175
-0x585A = 0x6199
-0x585B = 0x6196
-0x585C = 0x6187
-0x585D = 0x61AC
-0x585E = 0x6194
-0x585F = 0x619A
-0x5860 = 0x618A
-0x5861 = 0x6191
-0x5862 = 0x61AB
-0x5863 = 0x61AE
-0x5864 = 0x61CC
-0x5865 = 0x61CA
-0x5866 = 0x61C9
-0x5867 = 0x61F7
-0x5868 = 0x61C8
-0x5869 = 0x61C3
-0x586A = 0x61C6
-0x586B = 0x61BA
-0x586C = 0x61CB
-0x586D = 0x7F79
-0x586E = 0x61CD
-0x586F = 0x61E6
-0x5870 = 0x61E3
-0x5871 = 0x61F6
-0x5872 = 0x61FA
-0x5873 = 0x61F4
-0x5874 = 0x61FF
-0x5875 = 0x61FD
-0x5876 = 0x61FC
-0x5877 = 0x61FE
-0x5878 = 0x6200
-0x5879 = 0x6208
-0x587A = 0x6209
-0x587B = 0x620D
-0x587C = 0x620C
-0x587D = 0x6214
-0x587E = 0x621B
-0x5921 = 0x621E
-0x5922 = 0x6221
-0x5923 = 0x622A
-0x5924 = 0x622E
-0x5925 = 0x6230
-0x5926 = 0x6232
-0x5927 = 0x6233
-0x5928 = 0x6241
-0x5929 = 0x624E
-0x592A = 0x625E
-0x592B = 0x6263
-0x592C = 0x625B
-0x592D = 0x6260
-0x592E = 0x6268
-0x592F = 0x627C
-0x5930 = 0x6282
-0x5931 = 0x6289
-0x5932 = 0x627E
-0x5933 = 0x6292
-0x5934 = 0x6293
-0x5935 = 0x6296
-0x5936 = 0x62D4
-0x5937 = 0x6283
-0x5938 = 0x6294
-0x5939 = 0x62D7
-0x593A = 0x62D1
-0x593B = 0x62BB
-0x593C = 0x62CF
-0x593D = 0x62FF
-0x593E = 0x62C6
-0x593F = 0x64D4
-0x5940 = 0x62C8
-0x5941 = 0x62DC
-0x5942 = 0x62CC
-0x5943 = 0x62CA
-0x5944 = 0x62C2
-0x5945 = 0x62C7
-0x5946 = 0x629B
-0x5947 = 0x62C9
-0x5948 = 0x630C
-0x5949 = 0x62EE
-0x594A = 0x62F1
-0x594B = 0x6327
-0x594C = 0x6302
-0x594D = 0x6308
-0x594E = 0x62EF
-0x594F = 0x62F5
-0x5950 = 0x6350
-0x5951 = 0x633E
-0x5952 = 0x634D
-0x5953 = 0x641C
-0x5954 = 0x634F
-0x5955 = 0x6396
-0x5956 = 0x638E
-0x5957 = 0x6380
-0x5958 = 0x63AB
-0x5959 = 0x6376
-0x595A = 0x63A3
-0x595B = 0x638F
-0x595C = 0x6389
-0x595D = 0x639F
-0x595E = 0x63B5
-0x595F = 0x636B
-0x5960 = 0x6369
-0x5961 = 0x63BE
-0x5962 = 0x63E9
-0x5963 = 0x63C0
-0x5964 = 0x63C6
-0x5965 = 0x63E3
-0x5966 = 0x63C9
-0x5967 = 0x63D2
-0x5968 = 0x63F6
-0x5969 = 0x63C4
-0x596A = 0x6416
-0x596B = 0x6434
-0x596C = 0x6406
-0x596D = 0x6413
-0x596E = 0x6426
-0x596F = 0x6436
-0x5970 = 0x651D
-0x5971 = 0x6417
-0x5972 = 0x6428
-0x5973 = 0x640F
-0x5974 = 0x6467
-0x5975 = 0x646F
-0x5976 = 0x6476
-0x5977 = 0x644E
-0x5978 = 0x652A
-0x5979 = 0x6495
-0x597A = 0x6493
-0x597B = 0x64A5
-0x597C = 0x64A9
-0x597D = 0x6488
-0x597E = 0x64BC
-0x5A21 = 0x64DA
-0x5A22 = 0x64D2
-0x5A23 = 0x64C5
-0x5A24 = 0x64C7
-0x5A25 = 0x64BB
-0x5A26 = 0x64D8
-0x5A27 = 0x64C2
-0x5A28 = 0x64F1
-0x5A29 = 0x64E7
-0x5A2A = 0x8209
-0x5A2B = 0x64E0
-0x5A2C = 0x64E1
-0x5A2D = 0x62AC
-0x5A2E = 0x64E3
-0x5A2F = 0x64EF
-0x5A30 = 0x652C
-0x5A31 = 0x64F6
-0x5A32 = 0x64F4
-0x5A33 = 0x64F2
-0x5A34 = 0x64FA
-0x5A35 = 0x6500
-0x5A36 = 0x64FD
-0x5A37 = 0x6518
-0x5A38 = 0x651C
-0x5A39 = 0x6505
-0x5A3A = 0x6524
-0x5A3B = 0x6523
-0x5A3C = 0x652B
-0x5A3D = 0x6534
-0x5A3E = 0x6535
-0x5A3F = 0x6537
-0x5A40 = 0x6536
-0x5A41 = 0x6538
-0x5A42 = 0x754B
-0x5A43 = 0x6548
-0x5A44 = 0x6556
-0x5A45 = 0x6555
-0x5A46 = 0x654D
-0x5A47 = 0x6558
-0x5A48 = 0x655E
-0x5A49 = 0x655D
-0x5A4A = 0x6572
-0x5A4B = 0x6578
-0x5A4C = 0x6582
-0x5A4D = 0x6583
-0x5A4E = 0x8B8A
-0x5A4F = 0x659B
-0x5A50 = 0x659F
-0x5A51 = 0x65AB
-0x5A52 = 0x65B7
-0x5A53 = 0x65C3
-0x5A54 = 0x65C6
-0x5A55 = 0x65C1
-0x5A56 = 0x65C4
-0x5A57 = 0x65CC
-0x5A58 = 0x65D2
-0x5A59 = 0x65DB
-0x5A5A = 0x65D9
-0x5A5B = 0x65E0
-0x5A5C = 0x65E1
-0x5A5D = 0x65F1
-0x5A5E = 0x6772
-0x5A5F = 0x660A
-0x5A60 = 0x6603
-0x5A61 = 0x65FB
-0x5A62 = 0x6773
-0x5A63 = 0x6635
-0x5A64 = 0x6636
-0x5A65 = 0x6634
-0x5A66 = 0x661C
-0x5A67 = 0x664F
-0x5A68 = 0x6644
-0x5A69 = 0x6649
-0x5A6A = 0x6641
-0x5A6B = 0x665E
-0x5A6C = 0x665D
-0x5A6D = 0x6664
-0x5A6E = 0x6667
-0x5A6F = 0x6668
-0x5A70 = 0x665F
-0x5A71 = 0x6662
-0x5A72 = 0x6670
-0x5A73 = 0x6683
-0x5A74 = 0x6688
-0x5A75 = 0x668E
-0x5A76 = 0x6689
-0x5A77 = 0x6684
-0x5A78 = 0x6698
-0x5A79 = 0x669D
-0x5A7A = 0x66C1
-0x5A7B = 0x66B9
-0x5A7C = 0x66C9
-0x5A7D = 0x66BE
-0x5A7E = 0x66BC
-0x5B21 = 0x66C4
-0x5B22 = 0x66B8
-0x5B23 = 0x66D6
-0x5B24 = 0x66DA
-0x5B25 = 0x66E0
-0x5B26 = 0x663F
-0x5B27 = 0x66E6
-0x5B28 = 0x66E9
-0x5B29 = 0x66F0
-0x5B2A = 0x66F5
-0x5B2B = 0x66F7
-0x5B2C = 0x670F
-0x5B2D = 0x6716
-0x5B2E = 0x671E
-0x5B2F = 0x6726
-0x5B30 = 0x6727
-0x5B31 = 0x9738
-0x5B32 = 0x672E
-0x5B33 = 0x673F
-0x5B34 = 0x6736
-0x5B35 = 0x6741
-0x5B36 = 0x6738
-0x5B37 = 0x6737
-0x5B38 = 0x6746
-0x5B39 = 0x675E
-0x5B3A = 0x6760
-0x5B3B = 0x6759
-0x5B3C = 0x6763
-0x5B3D = 0x6764
-0x5B3E = 0x6789
-0x5B3F = 0x6770
-0x5B40 = 0x67A9
-0x5B41 = 0x677C
-0x5B42 = 0x676A
-0x5B43 = 0x678C
-0x5B44 = 0x678B
-0x5B45 = 0x67A6
-0x5B46 = 0x67A1
-0x5B47 = 0x6785
-0x5B48 = 0x67B7
-0x5B49 = 0x67EF
-0x5B4A = 0x67B4
-0x5B4B = 0x67EC
-0x5B4C = 0x67B3
-0x5B4D = 0x67E9
-0x5B4E = 0x67B8
-0x5B4F = 0x67E4
-0x5B50 = 0x67DE
-0x5B51 = 0x67DD
-0x5B52 = 0x67E2
-0x5B53 = 0x67EE
-0x5B54 = 0x67B9
-0x5B55 = 0x67CE
-0x5B56 = 0x67C6
-0x5B57 = 0x67E7
-0x5B58 = 0x6A9C
-0x5B59 = 0x681E
-0x5B5A = 0x6846
-0x5B5B = 0x6829
-0x5B5C = 0x6840
-0x5B5D = 0x684D
-0x5B5E = 0x6832
-0x5B5F = 0x684E
-0x5B60 = 0x68B3
-0x5B61 = 0x682B
-0x5B62 = 0x6859
-0x5B63 = 0x6863
-0x5B64 = 0x6877
-0x5B65 = 0x687F
-0x5B66 = 0x689F
-0x5B67 = 0x688F
-0x5B68 = 0x68AD
-0x5B69 = 0x6894
-0x5B6A = 0x689D
-0x5B6B = 0x689B
-0x5B6C = 0x6883
-0x5B6D = 0x6AAE
-0x5B6E = 0x68B9
-0x5B6F = 0x6874
-0x5B70 = 0x68B5
-0x5B71 = 0x68A0
-0x5B72 = 0x68BA
-0x5B73 = 0x690F
-0x5B74 = 0x688D
-0x5B75 = 0x687E
-0x5B76 = 0x6901
-0x5B77 = 0x68CA
-0x5B78 = 0x6908
-0x5B79 = 0x68D8
-0x5B7A = 0x6922
-0x5B7B = 0x6926
-0x5B7C = 0x68E1
-0x5B7D = 0x690C
-0x5B7E = 0x68CD
-0x5C21 = 0x68D4
-0x5C22 = 0x68E7
-0x5C23 = 0x68D5
-0x5C24 = 0x6936
-0x5C25 = 0x6912
-0x5C26 = 0x6904
-0x5C27 = 0x68D7
-0x5C28 = 0x68E3
-0x5C29 = 0x6925
-0x5C2A = 0x68F9
-0x5C2B = 0x68E0
-0x5C2C = 0x68EF
-0x5C2D = 0x6928
-0x5C2E = 0x692A
-0x5C2F = 0x691A
-0x5C30 = 0x6923
-0x5C31 = 0x6921
-0x5C32 = 0x68C6
-0x5C33 = 0x6979
-0x5C34 = 0x6977
-0x5C35 = 0x695C
-0x5C36 = 0x6978
-0x5C37 = 0x696B
-0x5C38 = 0x6954
-0x5C39 = 0x697E
-0x5C3A = 0x696E
-0x5C3B = 0x6939
-0x5C3C = 0x6974
-0x5C3D = 0x693D
-0x5C3E = 0x6959
-0x5C3F = 0x6930
-0x5C40 = 0x6961
-0x5C41 = 0x695E
-0x5C42 = 0x695D
-0x5C43 = 0x6981
-0x5C44 = 0x696A
-0x5C45 = 0x69B2
-0x5C46 = 0x69AE
-0x5C47 = 0x69D0
-0x5C48 = 0x69BF
-0x5C49 = 0x69C1
-0x5C4A = 0x69D3
-0x5C4B = 0x69BE
-0x5C4C = 0x69CE
-0x5C4D = 0x5BE8
-0x5C4E = 0x69CA
-0x5C4F = 0x69DD
-0x5C50 = 0x69BB
-0x5C51 = 0x69C3
-0x5C52 = 0x69A7
-0x5C53 = 0x6A2E
-0x5C54 = 0x6991
-0x5C55 = 0x69A0
-0x5C56 = 0x699C
-0x5C57 = 0x6995
-0x5C58 = 0x69B4
-0x5C59 = 0x69DE
-0x5C5A = 0x69E8
-0x5C5B = 0x6A02
-0x5C5C = 0x6A1B
-0x5C5D = 0x69FF
-0x5C5E = 0x6B0A
-0x5C5F = 0x69F9
-0x5C60 = 0x69F2
-0x5C61 = 0x69E7
-0x5C62 = 0x6A05
-0x5C63 = 0x69B1
-0x5C64 = 0x6A1E
-0x5C65 = 0x69ED
-0x5C66 = 0x6A14
-0x5C67 = 0x69EB
-0x5C68 = 0x6A0A
-0x5C69 = 0x6A12
-0x5C6A = 0x6AC1
-0x5C6B = 0x6A23
-0x5C6C = 0x6A13
-0x5C6D = 0x6A44
-0x5C6E = 0x6A0C
-0x5C6F = 0x6A72
-0x5C70 = 0x6A36
-0x5C71 = 0x6A78
-0x5C72 = 0x6A47
-0x5C73 = 0x6A62
-0x5C74 = 0x6A59
-0x5C75 = 0x6A66
-0x5C76 = 0x6A48
-0x5C77 = 0x6A38
-0x5C78 = 0x6A22
-0x5C79 = 0x6A90
-0x5C7A = 0x6A8D
-0x5C7B = 0x6AA0
-0x5C7C = 0x6A84
-0x5C7D = 0x6AA2
-0x5C7E = 0x6AA3
-0x5D21 = 0x6A97
-0x5D22 = 0x8617
-0x5D23 = 0x6ABB
-0x5D24 = 0x6AC3
-0x5D25 = 0x6AC2
-0x5D26 = 0x6AB8
-0x5D27 = 0x6AB3
-0x5D28 = 0x6AAC
-0x5D29 = 0x6ADE
-0x5D2A = 0x6AD1
-0x5D2B = 0x6ADF
-0x5D2C = 0x6AAA
-0x5D2D = 0x6ADA
-0x5D2E = 0x6AEA
-0x5D2F = 0x6AFB
-0x5D30 = 0x6B05
-0x5D31 = 0x8616
-0x5D32 = 0x6AFA
-0x5D33 = 0x6B12
-0x5D34 = 0x6B16
-0x5D35 = 0x9B31
-0x5D36 = 0x6B1F
-0x5D37 = 0x6B38
-0x5D38 = 0x6B37
-0x5D39 = 0x76DC
-0x5D3A = 0x6B39
-0x5D3B = 0x98EE
-0x5D3C = 0x6B47
-0x5D3D = 0x6B43
-0x5D3E = 0x6B49
-0x5D3F = 0x6B50
-0x5D40 = 0x6B59
-0x5D41 = 0x6B54
-0x5D42 = 0x6B5B
-0x5D43 = 0x6B5F
-0x5D44 = 0x6B61
-0x5D45 = 0x6B78
-0x5D46 = 0x6B79
-0x5D47 = 0x6B7F
-0x5D48 = 0x6B80
-0x5D49 = 0x6B84
-0x5D4A = 0x6B83
-0x5D4B = 0x6B8D
-0x5D4C = 0x6B98
-0x5D4D = 0x6B95
-0x5D4E = 0x6B9E
-0x5D4F = 0x6BA4
-0x5D50 = 0x6BAA
-0x5D51 = 0x6BAB
-0x5D52 = 0x6BAF
-0x5D53 = 0x6BB2
-0x5D54 = 0x6BB1
-0x5D55 = 0x6BB3
-0x5D56 = 0x6BB7
-0x5D57 = 0x6BBC
-0x5D58 = 0x6BC6
-0x5D59 = 0x6BCB
-0x5D5A = 0x6BD3
-0x5D5B = 0x6BDF
-0x5D5C = 0x6BEC
-0x5D5D = 0x6BEB
-0x5D5E = 0x6BF3
-0x5D5F = 0x6BEF
-0x5D60 = 0x9EBE
-0x5D61 = 0x6C08
-0x5D62 = 0x6C13
-0x5D63 = 0x6C14
-0x5D64 = 0x6C1B
-0x5D65 = 0x6C24
-0x5D66 = 0x6C23
-0x5D67 = 0x6C5E
-0x5D68 = 0x6C55
-0x5D69 = 0x6C62
-0x5D6A = 0x6C6A
-0x5D6B = 0x6C82
-0x5D6C = 0x6C8D
-0x5D6D = 0x6C9A
-0x5D6E = 0x6C81
-0x5D6F = 0x6C9B
-0x5D70 = 0x6C7E
-0x5D71 = 0x6C68
-0x5D72 = 0x6C73
-0x5D73 = 0x6C92
-0x5D74 = 0x6C90
-0x5D75 = 0x6CC4
-0x5D76 = 0x6CF1
-0x5D77 = 0x6CD3
-0x5D78 = 0x6CBD
-0x5D79 = 0x6CD7
-0x5D7A = 0x6CC5
-0x5D7B = 0x6CDD
-0x5D7C = 0x6CAE
-0x5D7D = 0x6CB1
-0x5D7E = 0x6CBE
-0x5E21 = 0x6CBA
-0x5E22 = 0x6CDB
-0x5E23 = 0x6CEF
-0x5E24 = 0x6CD9
-0x5E25 = 0x6CEA
-0x5E26 = 0x6D1F
-0x5E27 = 0x884D
-0x5E28 = 0x6D36
-0x5E29 = 0x6D2B
-0x5E2A = 0x6D3D
-0x5E2B = 0x6D38
-0x5E2C = 0x6D19
-0x5E2D = 0x6D35
-0x5E2E = 0x6D33
-0x5E2F = 0x6D12
-0x5E30 = 0x6D0C
-0x5E31 = 0x6D63
-0x5E32 = 0x6D93
-0x5E33 = 0x6D64
-0x5E34 = 0x6D5A
-0x5E35 = 0x6D79
-0x5E36 = 0x6D59
-0x5E37 = 0x6D8E
-0x5E38 = 0x6D95
-0x5E39 = 0x6FE4
-0x5E3A = 0x6D85
-0x5E3B = 0x6DF9
-0x5E3C = 0x6E15
-0x5E3D = 0x6E0A
-0x5E3E = 0x6DB5
-0x5E3F = 0x6DC7
-0x5E40 = 0x6DE6
-0x5E41 = 0x6DB8
-0x5E42 = 0x6DC6
-0x5E43 = 0x6DEC
-0x5E44 = 0x6DDE
-0x5E45 = 0x6DCC
-0x5E46 = 0x6DE8
-0x5E47 = 0x6DD2
-0x5E48 = 0x6DC5
-0x5E49 = 0x6DFA
-0x5E4A = 0x6DD9
-0x5E4B = 0x6DE4
-0x5E4C = 0x6DD5
-0x5E4D = 0x6DEA
-0x5E4E = 0x6DEE
-0x5E4F = 0x6E2D
-0x5E50 = 0x6E6E
-0x5E51 = 0x6E2E
-0x5E52 = 0x6E19
-0x5E53 = 0x6E72
-0x5E54 = 0x6E5F
-0x5E55 = 0x6E3E
-0x5E56 = 0x6E23
-0x5E57 = 0x6E6B
-0x5E58 = 0x6E2B
-0x5E59 = 0x6E76
-0x5E5A = 0x6E4D
-0x5E5B = 0x6E1F
-0x5E5C = 0x6E43
-0x5E5D = 0x6E3A
-0x5E5E = 0x6E4E
-0x5E5F = 0x6E24
-0x5E60 = 0x6EFF
-0x5E61 = 0x6E1D
-0x5E62 = 0x6E38
-0x5E63 = 0x6E82
-0x5E64 = 0x6EAA
-0x5E65 = 0x6E98
-0x5E66 = 0x6EC9
-0x5E67 = 0x6EB7
-0x5E68 = 0x6ED3
-0x5E69 = 0x6EBD
-0x5E6A = 0x6EAF
-0x5E6B = 0x6EC4
-0x5E6C = 0x6EB2
-0x5E6D = 0x6ED4
-0x5E6E = 0x6ED5
-0x5E6F = 0x6E8F
-0x5E70 = 0x6EA5
-0x5E71 = 0x6EC2
-0x5E72 = 0x6E9F
-0x5E73 = 0x6F41
-0x5E74 = 0x6F11
-0x5E75 = 0x704C
-0x5E76 = 0x6EEC
-0x5E77 = 0x6EF8
-0x5E78 = 0x6EFE
-0x5E79 = 0x6F3F
-0x5E7A = 0x6EF2
-0x5E7B = 0x6F31
-0x5E7C = 0x6EEF
-0x5E7D = 0x6F32
-0x5E7E = 0x6ECC
-0x5F21 = 0x6F3E
-0x5F22 = 0x6F13
-0x5F23 = 0x6EF7
-0x5F24 = 0x6F86
-0x5F25 = 0x6F7A
-0x5F26 = 0x6F78
-0x5F27 = 0x6F81
-0x5F28 = 0x6F80
-0x5F29 = 0x6F6F
-0x5F2A = 0x6F5B
-0x5F2B = 0x6FF3
-0x5F2C = 0x6F6D
-0x5F2D = 0x6F82
-0x5F2E = 0x6F7C
-0x5F2F = 0x6F58
-0x5F30 = 0x6F8E
-0x5F31 = 0x6F91
-0x5F32 = 0x6FC2
-0x5F33 = 0x6F66
-0x5F34 = 0x6FB3
-0x5F35 = 0x6FA3
-0x5F36 = 0x6FA1
-0x5F37 = 0x6FA4
-0x5F38 = 0x6FB9
-0x5F39 = 0x6FC6
-0x5F3A = 0x6FAA
-0x5F3B = 0x6FDF
-0x5F3C = 0x6FD5
-0x5F3D = 0x6FEC
-0x5F3E = 0x6FD4
-0x5F3F = 0x6FD8
-0x5F40 = 0x6FF1
-0x5F41 = 0x6FEE
-0x5F42 = 0x6FDB
-0x5F43 = 0x7009
-0x5F44 = 0x700B
-0x5F45 = 0x6FFA
-0x5F46 = 0x7011
-0x5F47 = 0x7001
-0x5F48 = 0x700F
-0x5F49 = 0x6FFE
-0x5F4A = 0x701B
-0x5F4B = 0x701A
-0x5F4C = 0x6F74
-0x5F4D = 0x701D
-0x5F4E = 0x7018
-0x5F4F = 0x701F
-0x5F50 = 0x7030
-0x5F51 = 0x703E
-0x5F52 = 0x7032
-0x5F53 = 0x7051
-0x5F54 = 0x7063
-0x5F55 = 0x7099
-0x5F56 = 0x7092
-0x5F57 = 0x70AF
-0x5F58 = 0x70F1
-0x5F59 = 0x70AC
-0x5F5A = 0x70B8
-0x5F5B = 0x70B3
-0x5F5C = 0x70AE
-0x5F5D = 0x70DF
-0x5F5E = 0x70CB
-0x5F5F = 0x70DD
-0x5F60 = 0x70D9
-0x5F61 = 0x7109
-0x5F62 = 0x70FD
-0x5F63 = 0x711C
-0x5F64 = 0x7119
-0x5F65 = 0x7165
-0x5F66 = 0x7155
-0x5F67 = 0x7188
-0x5F68 = 0x7166
-0x5F69 = 0x7162
-0x5F6A = 0x714C
-0x5F6B = 0x7156
-0x5F6C = 0x716C
-0x5F6D = 0x718F
-0x5F6E = 0x71FB
-0x5F6F = 0x7184
-0x5F70 = 0x7195
-0x5F71 = 0x71A8
-0x5F72 = 0x71AC
-0x5F73 = 0x71D7
-0x5F74 = 0x71B9
-0x5F75 = 0x71BE
-0x5F76 = 0x71D2
-0x5F77 = 0x71C9
-0x5F78 = 0x71D4
-0x5F79 = 0x71CE
-0x5F7A = 0x71E0
-0x5F7B = 0x71EC
-0x5F7C = 0x71E7
-0x5F7D = 0x71F5
-0x5F7E = 0x71FC
-0x6021 = 0x71F9
-0x6022 = 0x71FF
-0x6023 = 0x720D
-0x6024 = 0x7210
-0x6025 = 0x721B
-0x6026 = 0x7228
-0x6027 = 0x722D
-0x6028 = 0x722C
-0x6029 = 0x7230
-0x602A = 0x7232
-0x602B = 0x723B
-0x602C = 0x723C
-0x602D = 0x723F
-0x602E = 0x7240
-0x602F = 0x7246
-0x6030 = 0x724B
-0x6031 = 0x7258
-0x6032 = 0x7274
-0x6033 = 0x727E
-0x6034 = 0x7282
-0x6035 = 0x7281
-0x6036 = 0x7287
-0x6037 = 0x7292
-0x6038 = 0x7296
-0x6039 = 0x72A2
-0x603A = 0x72A7
-0x603B = 0x72B9
-0x603C = 0x72B2
-0x603D = 0x72C3
-0x603E = 0x72C6
-0x603F = 0x72C4
-0x6040 = 0x72CE
-0x6041 = 0x72D2
-0x6042 = 0x72E2
-0x6043 = 0x72E0
-0x6044 = 0x72E1
-0x6045 = 0x72F9
-0x6046 = 0x72F7
-0x6047 = 0x500F
-0x6048 = 0x7317
-0x6049 = 0x730A
-0x604A = 0x731C
-0x604B = 0x7316
-0x604C = 0x731D
-0x604D = 0x7334
-0x604E = 0x732F
-0x604F = 0x7329
-0x6050 = 0x7325
-0x6051 = 0x733E
-0x6052 = 0x734E
-0x6053 = 0x734F
-0x6054 = 0x9ED8
-0x6055 = 0x7357
-0x6056 = 0x736A
-0x6057 = 0x7368
-0x6058 = 0x7370
-0x6059 = 0x7378
-0x605A = 0x7375
-0x605B = 0x737B
-0x605C = 0x737A
-0x605D = 0x73C8
-0x605E = 0x73B3
-0x605F = 0x73CE
-0x6060 = 0x73BB
-0x6061 = 0x73C0
-0x6062 = 0x73E5
-0x6063 = 0x73EE
-0x6064 = 0x73DE
-0x6065 = 0x74A2
-0x6066 = 0x7405
-0x6067 = 0x746F
-0x6068 = 0x7425
-0x6069 = 0x73F8
-0x606A = 0x7432
-0x606B = 0x743A
-0x606C = 0x7455
-0x606D = 0x743F
-0x606E = 0x745F
-0x606F = 0x7459
-0x6070 = 0x7441
-0x6071 = 0x745C
-0x6072 = 0x7469
-0x6073 = 0x7470
-0x6074 = 0x7463
-0x6075 = 0x746A
-0x6076 = 0x7476
-0x6077 = 0x747E
-0x6078 = 0x748B
-0x6079 = 0x749E
-0x607A = 0x74A7
-0x607B = 0x74CA
-0x607C = 0x74CF
-0x607D = 0x74D4
-0x607E = 0x73F1
-0x6121 = 0x74E0
-0x6122 = 0x74E3
-0x6123 = 0x74E7
-0x6124 = 0x74E9
-0x6125 = 0x74EE
-0x6126 = 0x74F2
-0x6127 = 0x74F0
-0x6128 = 0x74F1
-0x6129 = 0x74F8
-0x612A = 0x74F7
-0x612B = 0x7504
-0x612C = 0x7503
-0x612D = 0x7505
-0x612E = 0x750C
-0x612F = 0x750E
-0x6130 = 0x750D
-0x6131 = 0x7515
-0x6132 = 0x7513
-0x6133 = 0x751E
-0x6134 = 0x7526
-0x6135 = 0x752C
-0x6136 = 0x753C
-0x6137 = 0x7544
-0x6138 = 0x754D
-0x6139 = 0x754A
-0x613A = 0x7549
-0x613B = 0x755B
-0x613C = 0x7546
-0x613D = 0x755A
-0x613E = 0x7569
-0x613F = 0x7564
-0x6140 = 0x7567
-0x6141 = 0x756B
-0x6142 = 0x756D
-0x6143 = 0x7578
-0x6144 = 0x7576
-0x6145 = 0x7586
-0x6146 = 0x7587
-0x6147 = 0x7574
-0x6148 = 0x758A
-0x6149 = 0x7589
-0x614A = 0x7582
-0x614B = 0x7594
-0x614C = 0x759A
-0x614D = 0x759D
-0x614E = 0x75A5
-0x614F = 0x75A3
-0x6150 = 0x75C2
-0x6151 = 0x75B3
-0x6152 = 0x75C3
-0x6153 = 0x75B5
-0x6154 = 0x75BD
-0x6155 = 0x75B8
-0x6156 = 0x75BC
-0x6157 = 0x75B1
-0x6158 = 0x75CD
-0x6159 = 0x75CA
-0x615A = 0x75D2
-0x615B = 0x75D9
-0x615C = 0x75E3
-0x615D = 0x75DE
-0x615E = 0x75FE
-0x615F = 0x75FF
-0x6160 = 0x75FC
-0x6161 = 0x7601
-0x6162 = 0x75F0
-0x6163 = 0x75FA
-0x6164 = 0x75F2
-0x6165 = 0x75F3
-0x6166 = 0x760B
-0x6167 = 0x760D
-0x6168 = 0x7609
-0x6169 = 0x761F
-0x616A = 0x7627
-0x616B = 0x7620
-0x616C = 0x7621
-0x616D = 0x7622
-0x616E = 0x7624
-0x616F = 0x7634
-0x6170 = 0x7630
-0x6171 = 0x763B
-0x6172 = 0x7647
-0x6173 = 0x7648
-0x6174 = 0x7646
-0x6175 = 0x765C
-0x6176 = 0x7658
-0x6177 = 0x7661
-0x6178 = 0x7662
-0x6179 = 0x7668
-0x617A = 0x7669
-0x617B = 0x766A
-0x617C = 0x7667
-0x617D = 0x766C
-0x617E = 0x7670
-0x6221 = 0x7672
-0x6222 = 0x7676
-0x6223 = 0x7678
-0x6224 = 0x767C
-0x6225 = 0x7680
-0x6226 = 0x7683
-0x6227 = 0x7688
-0x6228 = 0x768B
-0x6229 = 0x768E
-0x622A = 0x7696
-0x622B = 0x7693
-0x622C = 0x7699
-0x622D = 0x769A
-0x622E = 0x76B0
-0x622F = 0x76B4
-0x6230 = 0x76B8
-0x6231 = 0x76B9
-0x6232 = 0x76BA
-0x6233 = 0x76C2
-0x6234 = 0x76CD
-0x6235 = 0x76D6
-0x6236 = 0x76D2
-0x6237 = 0x76DE
-0x6238 = 0x76E1
-0x6239 = 0x76E5
-0x623A = 0x76E7
-0x623B = 0x76EA
-0x623C = 0x862F
-0x623D = 0x76FB
-0x623E = 0x7708
-0x623F = 0x7707
-0x6240 = 0x7704
-0x6241 = 0x7729
-0x6242 = 0x7724
-0x6243 = 0x771E
-0x6244 = 0x7725
-0x6245 = 0x7726
-0x6246 = 0x771B
-0x6247 = 0x7737
-0x6248 = 0x7738
-0x6249 = 0x7747
-0x624A = 0x775A
-0x624B = 0x7768
-0x624C = 0x776B
-0x624D = 0x775B
-0x624E = 0x7765
-0x624F = 0x777F
-0x6250 = 0x777E
-0x6251 = 0x7779
-0x6252 = 0x778E
-0x6253 = 0x778B
-0x6254 = 0x7791
-0x6255 = 0x77A0
-0x6256 = 0x779E
-0x6257 = 0x77B0
-0x6258 = 0x77B6
-0x6259 = 0x77B9
-0x625A = 0x77BF
-0x625B = 0x77BC
-0x625C = 0x77BD
-0x625D = 0x77BB
-0x625E = 0x77C7
-0x625F = 0x77CD
-0x6260 = 0x77D7
-0x6261 = 0x77DA
-0x6262 = 0x77DC
-0x6263 = 0x77E3
-0x6264 = 0x77EE
-0x6265 = 0x77FC
-0x6266 = 0x780C
-0x6267 = 0x7812
-0x6268 = 0x7926
-0x6269 = 0x7820
-0x626A = 0x792A
-0x626B = 0x7845
-0x626C = 0x788E
-0x626D = 0x7874
-0x626E = 0x7886
-0x626F = 0x787C
-0x6270 = 0x789A
-0x6271 = 0x788C
-0x6272 = 0x78A3
-0x6273 = 0x78B5
-0x6274 = 0x78AA
-0x6275 = 0x78AF
-0x6276 = 0x78D1
-0x6277 = 0x78C6
-0x6278 = 0x78CB
-0x6279 = 0x78D4
-0x627A = 0x78BE
-0x627B = 0x78BC
-0x627C = 0x78C5
-0x627D = 0x78CA
-0x627E = 0x78EC
-0x6321 = 0x78E7
-0x6322 = 0x78DA
-0x6323 = 0x78FD
-0x6324 = 0x78F4
-0x6325 = 0x7907
-0x6326 = 0x7912
-0x6327 = 0x7911
-0x6328 = 0x7919
-0x6329 = 0x792C
-0x632A = 0x792B
-0x632B = 0x7940
-0x632C = 0x7960
-0x632D = 0x7957
-0x632E = 0x795F
-0x632F = 0x795A
-0x6330 = 0x7955
-0x6331 = 0x7953
-0x6332 = 0x797A
-0x6333 = 0x797F
-0x6334 = 0x798A
-0x6335 = 0x799D
-0x6336 = 0x79A7
-0x6337 = 0x9F4B
-0x6338 = 0x79AA
-0x6339 = 0x79AE
-0x633A = 0x79B3
-0x633B = 0x79B9
-0x633C = 0x79BA
-0x633D = 0x79C9
-0x633E = 0x79D5
-0x633F = 0x79E7
-0x6340 = 0x79EC
-0x6341 = 0x79E1
-0x6342 = 0x79E3
-0x6343 = 0x7A08
-0x6344 = 0x7A0D
-0x6345 = 0x7A18
-0x6346 = 0x7A19
-0x6347 = 0x7A20
-0x6348 = 0x7A1F
-0x6349 = 0x7980
-0x634A = 0x7A31
-0x634B = 0x7A3B
-0x634C = 0x7A3E
-0x634D = 0x7A37
-0x634E = 0x7A43
-0x634F = 0x7A57
-0x6350 = 0x7A49
-0x6351 = 0x7A61
-0x6352 = 0x7A62
-0x6353 = 0x7A69
-0x6354 = 0x9F9D
-0x6355 = 0x7A70
-0x6356 = 0x7A79
-0x6357 = 0x7A7D
-0x6358 = 0x7A88
-0x6359 = 0x7A97
-0x635A = 0x7A95
-0x635B = 0x7A98
-0x635C = 0x7A96
-0x635D = 0x7AA9
-0x635E = 0x7AC8
-0x635F = 0x7AB0
-0x6360 = 0x7AB6
-0x6361 = 0x7AC5
-0x6362 = 0x7AC4
-0x6363 = 0x7ABF
-0x6364 = 0x9083
-0x6365 = 0x7AC7
-0x6366 = 0x7ACA
-0x6367 = 0x7ACD
-0x6368 = 0x7ACF
-0x6369 = 0x7AD5
-0x636A = 0x7AD3
-0x636B = 0x7AD9
-0x636C = 0x7ADA
-0x636D = 0x7ADD
-0x636E = 0x7AE1
-0x636F = 0x7AE2
-0x6370 = 0x7AE6
-0x6371 = 0x7AED
-0x6372 = 0x7AF0
-0x6373 = 0x7B02
-0x6374 = 0x7B0F
-0x6375 = 0x7B0A
-0x6376 = 0x7B06
-0x6377 = 0x7B33
-0x6378 = 0x7B18
-0x6379 = 0x7B19
-0x637A = 0x7B1E
-0x637B = 0x7B35
-0x637C = 0x7B28
-0x637D = 0x7B36
-0x637E = 0x7B50
-0x6421 = 0x7B7A
-0x6422 = 0x7B04
-0x6423 = 0x7B4D
-0x6424 = 0x7B0B
-0x6425 = 0x7B4C
-0x6426 = 0x7B45
-0x6427 = 0x7B75
-0x6428 = 0x7B65
-0x6429 = 0x7B74
-0x642A = 0x7B67
-0x642B = 0x7B70
-0x642C = 0x7B71
-0x642D = 0x7B6C
-0x642E = 0x7B6E
-0x642F = 0x7B9D
-0x6430 = 0x7B98
-0x6431 = 0x7B9F
-0x6432 = 0x7B8D
-0x6433 = 0x7B9C
-0x6434 = 0x7B9A
-0x6435 = 0x7B8B
-0x6436 = 0x7B92
-0x6437 = 0x7B8F
-0x6438 = 0x7B5D
-0x6439 = 0x7B99
-0x643A = 0x7BCB
-0x643B = 0x7BC1
-0x643C = 0x7BCC
-0x643D = 0x7BCF
-0x643E = 0x7BB4
-0x643F = 0x7BC6
-0x6440 = 0x7BDD
-0x6441 = 0x7BE9
-0x6442 = 0x7C11
-0x6443 = 0x7C14
-0x6444 = 0x7BE6
-0x6445 = 0x7BE5
-0x6446 = 0x7C60
-0x6447 = 0x7C00
-0x6448 = 0x7C07
-0x6449 = 0x7C13
-0x644A = 0x7BF3
-0x644B = 0x7BF7
-0x644C = 0x7C17
-0x644D = 0x7C0D
-0x644E = 0x7BF6
-0x644F = 0x7C23
-0x6450 = 0x7C27
-0x6451 = 0x7C2A
-0x6452 = 0x7C1F
-0x6453 = 0x7C37
-0x6454 = 0x7C2B
-0x6455 = 0x7C3D
-0x6456 = 0x7C4C
-0x6457 = 0x7C43
-0x6458 = 0x7C54
-0x6459 = 0x7C4F
-0x645A = 0x7C40
-0x645B = 0x7C50
-0x645C = 0x7C58
-0x645D = 0x7C5F
-0x645E = 0x7C64
-0x645F = 0x7C56
-0x6460 = 0x7C65
-0x6461 = 0x7C6C
-0x6462 = 0x7C75
-0x6463 = 0x7C83
-0x6464 = 0x7C90
-0x6465 = 0x7CA4
-0x6466 = 0x7CAD
-0x6467 = 0x7CA2
-0x6468 = 0x7CAB
-0x6469 = 0x7CA1
-0x646A = 0x7CA8
-0x646B = 0x7CB3
-0x646C = 0x7CB2
-0x646D = 0x7CB1
-0x646E = 0x7CAE
-0x646F = 0x7CB9
-0x6470 = 0x7CBD
-0x6471 = 0x7CC0
-0x6472 = 0x7CC5
-0x6473 = 0x7CC2
-0x6474 = 0x7CD8
-0x6475 = 0x7CD2
-0x6476 = 0x7CDC
-0x6477 = 0x7CE2
-0x6478 = 0x9B3B
-0x6479 = 0x7CEF
-0x647A = 0x7CF2
-0x647B = 0x7CF4
-0x647C = 0x7CF6
-0x647D = 0x7CFA
-0x647E = 0x7D06
-0x6521 = 0x7D02
-0x6522 = 0x7D1C
-0x6523 = 0x7D15
-0x6524 = 0x7D0A
-0x6525 = 0x7D45
-0x6526 = 0x7D4B
-0x6527 = 0x7D2E
-0x6528 = 0x7D32
-0x6529 = 0x7D3F
-0x652A = 0x7D35
-0x652B = 0x7D46
-0x652C = 0x7D73
-0x652D = 0x7D56
-0x652E = 0x7D4E
-0x652F = 0x7D72
-0x6530 = 0x7D68
-0x6531 = 0x7D6E
-0x6532 = 0x7D4F
-0x6533 = 0x7D63
-0x6534 = 0x7D93
-0x6535 = 0x7D89
-0x6536 = 0x7D5B
-0x6537 = 0x7D8F
-0x6538 = 0x7D7D
-0x6539 = 0x7D9B
-0x653A = 0x7DBA
-0x653B = 0x7DAE
-0x653C = 0x7DA3
-0x653D = 0x7DB5
-0x653E = 0x7DC7
-0x653F = 0x7DBD
-0x6540 = 0x7DAB
-0x6541 = 0x7E3D
-0x6542 = 0x7DA2
-0x6543 = 0x7DAF
-0x6544 = 0x7DDC
-0x6545 = 0x7DB8
-0x6546 = 0x7D9F
-0x6547 = 0x7DB0
-0x6548 = 0x7DD8
-0x6549 = 0x7DDD
-0x654A = 0x7DE4
-0x654B = 0x7DDE
-0x654C = 0x7DFB
-0x654D = 0x7DF2
-0x654E = 0x7DE1
-0x654F = 0x7E05
-0x6550 = 0x7E0A
-0x6551 = 0x7E23
-0x6552 = 0x7E21
-0x6553 = 0x7E12
-0x6554 = 0x7E31
-0x6555 = 0x7E1F
-0x6556 = 0x7E09
-0x6557 = 0x7E0B
-0x6558 = 0x7E22
-0x6559 = 0x7E46
-0x655A = 0x7E66
-0x655B = 0x7E3B
-0x655C = 0x7E35
-0x655D = 0x7E39
-0x655E = 0x7E43
-0x655F = 0x7E37
-0x6560 = 0x7E32
-0x6561 = 0x7E3A
-0x6562 = 0x7E67
-0x6563 = 0x7E5D
-0x6564 = 0x7E56
-0x6565 = 0x7E5E
-0x6566 = 0x7E59
-0x6567 = 0x7E5A
-0x6568 = 0x7E79
-0x6569 = 0x7E6A
-0x656A = 0x7E69
-0x656B = 0x7E7C
-0x656C = 0x7E7B
-0x656D = 0x7E83
-0x656E = 0x7DD5
-0x656F = 0x7E7D
-0x6570 = 0x8FAE
-0x6571 = 0x7E7F
-0x6572 = 0x7E88
-0x6573 = 0x7E89
-0x6574 = 0x7E8C
-0x6575 = 0x7E92
-0x6576 = 0x7E90
-0x6577 = 0x7E93
-0x6578 = 0x7E94
-0x6579 = 0x7E96
-0x657A = 0x7E8E
-0x657B = 0x7E9B
-0x657C = 0x7E9C
-0x657D = 0x7F38
-0x657E = 0x7F3A
-0x6621 = 0x7F45
-0x6622 = 0x7F4C
-0x6623 = 0x7F4D
-0x6624 = 0x7F4E
-0x6625 = 0x7F50
-0x6626 = 0x7F51
-0x6627 = 0x7F55
-0x6628 = 0x7F54
-0x6629 = 0x7F58
-0x662A = 0x7F5F
-0x662B = 0x7F60
-0x662C = 0x7F68
-0x662D = 0x7F69
-0x662E = 0x7F67
-0x662F = 0x7F78
-0x6630 = 0x7F82
-0x6631 = 0x7F86
-0x6632 = 0x7F83
-0x6633 = 0x7F88
-0x6634 = 0x7F87
-0x6635 = 0x7F8C
-0x6636 = 0x7F94
-0x6637 = 0x7F9E
-0x6638 = 0x7F9D
-0x6639 = 0x7F9A
-0x663A = 0x7FA3
-0x663B = 0x7FAF
-0x663C = 0x7FB2
-0x663D = 0x7FB9
-0x663E = 0x7FAE
-0x663F = 0x7FB6
-0x6640 = 0x7FB8
-0x6641 = 0x8B71
-0x6642 = 0x7FC5
-0x6643 = 0x7FC6
-0x6644 = 0x7FCA
-0x6645 = 0x7FD5
-0x6646 = 0x7FD4
-0x6647 = 0x7FE1
-0x6648 = 0x7FE6
-0x6649 = 0x7FE9
-0x664A = 0x7FF3
-0x664B = 0x7FF9
-0x664C = 0x98DC
-0x664D = 0x8006
-0x664E = 0x8004
-0x664F = 0x800B
-0x6650 = 0x8012
-0x6651 = 0x8018
-0x6652 = 0x8019
-0x6653 = 0x801C
-0x6654 = 0x8021
-0x6655 = 0x8028
-0x6656 = 0x803F
-0x6657 = 0x803B
-0x6658 = 0x804A
-0x6659 = 0x8046
-0x665A = 0x8052
-0x665B = 0x8058
-0x665C = 0x805A
-0x665D = 0x805F
-0x665E = 0x8062
-0x665F = 0x8068
-0x6660 = 0x8073
-0x6661 = 0x8072
-0x6662 = 0x8070
-0x6663 = 0x8076
-0x6664 = 0x8079
-0x6665 = 0x807D
-0x6666 = 0x807F
-0x6667 = 0x8084
-0x6668 = 0x8086
-0x6669 = 0x8085
-0x666A = 0x809B
-0x666B = 0x8093
-0x666C = 0x809A
-0x666D = 0x80AD
-0x666E = 0x5190
-0x666F = 0x80AC
-0x6670 = 0x80DB
-0x6671 = 0x80E5
-0x6672 = 0x80D9
-0x6673 = 0x80DD
-0x6674 = 0x80C4
-0x6675 = 0x80DA
-0x6676 = 0x80D6
-0x6677 = 0x8109
-0x6678 = 0x80EF
-0x6679 = 0x80F1
-0x667A = 0x811B
-0x667B = 0x8129
-0x667C = 0x8123
-0x667D = 0x812F
-0x667E = 0x814B
-0x6721 = 0x968B
-0x6722 = 0x8146
-0x6723 = 0x813E
-0x6724 = 0x8153
-0x6725 = 0x8151
-0x6726 = 0x80FC
-0x6727 = 0x8171
-0x6728 = 0x816E
-0x6729 = 0x8165
-0x672A = 0x8166
-0x672B = 0x8174
-0x672C = 0x8183
-0x672D = 0x8188
-0x672E = 0x818A
-0x672F = 0x8180
-0x6730 = 0x8182
-0x6731 = 0x81A0
-0x6732 = 0x8195
-0x6733 = 0x81A4
-0x6734 = 0x81A3
-0x6735 = 0x815F
-0x6736 = 0x8193
-0x6737 = 0x81A9
-0x6738 = 0x81B0
-0x6739 = 0x81B5
-0x673A = 0x81BE
-0x673B = 0x81B8
-0x673C = 0x81BD
-0x673D = 0x81C0
-0x673E = 0x81C2
-0x673F = 0x81BA
-0x6740 = 0x81C9
-0x6741 = 0x81CD
-0x6742 = 0x81D1
-0x6743 = 0x81D9
-0x6744 = 0x81D8
-0x6745 = 0x81C8
-0x6746 = 0x81DA
-0x6747 = 0x81DF
-0x6748 = 0x81E0
-0x6749 = 0x81E7
-0x674A = 0x81FA
-0x674B = 0x81FB
-0x674C = 0x81FE
-0x674D = 0x8201
-0x674E = 0x8202
-0x674F = 0x8205
-0x6750 = 0x8207
-0x6751 = 0x820A
-0x6752 = 0x820D
-0x6753 = 0x8210
-0x6754 = 0x8216
-0x6755 = 0x8229
-0x6756 = 0x822B
-0x6757 = 0x8238
-0x6758 = 0x8233
-0x6759 = 0x8240
-0x675A = 0x8259
-0x675B = 0x8258
-0x675C = 0x825D
-0x675D = 0x825A
-0x675E = 0x825F
-0x675F = 0x8264
-0x6760 = 0x8262
-0x6761 = 0x8268
-0x6762 = 0x826A
-0x6763 = 0x826B
-0x6764 = 0x822E
-0x6765 = 0x8271
-0x6766 = 0x8277
-0x6767 = 0x8278
-0x6768 = 0x827E
-0x6769 = 0x828D
-0x676A = 0x8292
-0x676B = 0x82AB
-0x676C = 0x829F
-0x676D = 0x82BB
-0x676E = 0x82AC
-0x676F = 0x82E1
-0x6770 = 0x82E3
-0x6771 = 0x82DF
-0x6772 = 0x82D2
-0x6773 = 0x82F4
-0x6774 = 0x82F3
-0x6775 = 0x82FA
-0x6776 = 0x8393
-0x6777 = 0x8303
-0x6778 = 0x82FB
-0x6779 = 0x82F9
-0x677A = 0x82DE
-0x677B = 0x8306
-0x677C = 0x82DC
-0x677D = 0x8309
-0x677E = 0x82D9
-0x6821 = 0x8335
-0x6822 = 0x8334
-0x6823 = 0x8316
-0x6824 = 0x8332
-0x6825 = 0x8331
-0x6826 = 0x8340
-0x6827 = 0x8339
-0x6828 = 0x8350
-0x6829 = 0x8345
-0x682A = 0x832F
-0x682B = 0x832B
-0x682C = 0x8317
-0x682D = 0x8318
-0x682E = 0x8385
-0x682F = 0x839A
-0x6830 = 0x83AA
-0x6831 = 0x839F
-0x6832 = 0x83A2
-0x6833 = 0x8396
-0x6834 = 0x8323
-0x6835 = 0x838E
-0x6836 = 0x8387
-0x6837 = 0x838A
-0x6838 = 0x837C
-0x6839 = 0x83B5
-0x683A = 0x8373
-0x683B = 0x8375
-0x683C = 0x83A0
-0x683D = 0x8389
-0x683E = 0x83A8
-0x683F = 0x83F4
-0x6840 = 0x8413
-0x6841 = 0x83EB
-0x6842 = 0x83CE
-0x6843 = 0x83FD
-0x6844 = 0x8403
-0x6845 = 0x83D8
-0x6846 = 0x840B
-0x6847 = 0x83C1
-0x6848 = 0x83F7
-0x6849 = 0x8407
-0x684A = 0x83E0
-0x684B = 0x83F2
-0x684C = 0x840D
-0x684D = 0x8422
-0x684E = 0x8420
-0x684F = 0x83BD
-0x6850 = 0x8438
-0x6851 = 0x8506
-0x6852 = 0x83FB
-0x6853 = 0x846D
-0x6854 = 0x842A
-0x6855 = 0x843C
-0x6856 = 0x855A
-0x6857 = 0x8484
-0x6858 = 0x8477
-0x6859 = 0x846B
-0x685A = 0x84AD
-0x685B = 0x846E
-0x685C = 0x8482
-0x685D = 0x8469
-0x685E = 0x8446
-0x685F = 0x842C
-0x6860 = 0x846F
-0x6861 = 0x8479
-0x6862 = 0x8435
-0x6863 = 0x84CA
-0x6864 = 0x8462
-0x6865 = 0x84B9
-0x6866 = 0x84BF
-0x6867 = 0x849F
-0x6868 = 0x84D9
-0x6869 = 0x84CD
-0x686A = 0x84BB
-0x686B = 0x84DA
-0x686C = 0x84D0
-0x686D = 0x84C1
-0x686E = 0x84C6
-0x686F = 0x84D6
-0x6870 = 0x84A1
-0x6871 = 0x8521
-0x6872 = 0x84FF
-0x6873 = 0x84F4
-0x6874 = 0x8517
-0x6875 = 0x8518
-0x6876 = 0x852C
-0x6877 = 0x851F
-0x6878 = 0x8515
-0x6879 = 0x8514
-0x687A = 0x84FC
-0x687B = 0x8540
-0x687C = 0x8563
-0x687D = 0x8558
-0x687E = 0x8548
-0x6921 = 0x8541
-0x6922 = 0x8602
-0x6923 = 0x854B
-0x6924 = 0x8555
-0x6925 = 0x8580
-0x6926 = 0x85A4
-0x6927 = 0x8588
-0x6928 = 0x8591
-0x6929 = 0x858A
-0x692A = 0x85A8
-0x692B = 0x856D
-0x692C = 0x8594
-0x692D = 0x859B
-0x692E = 0x85EA
-0x692F = 0x8587
-0x6930 = 0x859C
-0x6931 = 0x8577
-0x6932 = 0x857E
-0x6933 = 0x8590
-0x6934 = 0x85C9
-0x6935 = 0x85BA
-0x6936 = 0x85CF
-0x6937 = 0x85B9
-0x6938 = 0x85D0
-0x6939 = 0x85D5
-0x693A = 0x85DD
-0x693B = 0x85E5
-0x693C = 0x85DC
-0x693D = 0x85F9
-0x693E = 0x860A
-0x693F = 0x8613
-0x6940 = 0x860B
-0x6941 = 0x85FE
-0x6942 = 0x85FA
-0x6943 = 0x8606
-0x6944 = 0x8622
-0x6945 = 0x861A
-0x6946 = 0x8630
-0x6947 = 0x863F
-0x6948 = 0x864D
-0x6949 = 0x4E55
-0x694A = 0x8654
-0x694B = 0x865F
-0x694C = 0x8667
-0x694D = 0x8671
-0x694E = 0x8693
-0x694F = 0x86A3
-0x6950 = 0x86A9
-0x6951 = 0x86AA
-0x6952 = 0x868B
-0x6953 = 0x868C
-0x6954 = 0x86B6
-0x6955 = 0x86AF
-0x6956 = 0x86C4
-0x6957 = 0x86C6
-0x6958 = 0x86B0
-0x6959 = 0x86C9
-0x695A = 0x8823
-0x695B = 0x86AB
-0x695C = 0x86D4
-0x695D = 0x86DE
-0x695E = 0x86E9
-0x695F = 0x86EC
-0x6960 = 0x86DF
-0x6961 = 0x86DB
-0x6962 = 0x86EF
-0x6963 = 0x8712
-0x6964 = 0x8706
-0x6965 = 0x8708
-0x6966 = 0x8700
-0x6967 = 0x8703
-0x6968 = 0x86FB
-0x6969 = 0x8711
-0x696A = 0x8709
-0x696B = 0x870D
-0x696C = 0x86F9
-0x696D = 0x870A
-0x696E = 0x8734
-0x696F = 0x873F
-0x6970 = 0x8737
-0x6971 = 0x873B
-0x6972 = 0x8725
-0x6973 = 0x8729
-0x6974 = 0x871A
-0x6975 = 0x8760
-0x6976 = 0x875F
-0x6977 = 0x8778
-0x6978 = 0x874C
-0x6979 = 0x874E
-0x697A = 0x8774
-0x697B = 0x8757
-0x697C = 0x8768
-0x697D = 0x876E
-0x697E = 0x8759
-0x6A21 = 0x8753
-0x6A22 = 0x8763
-0x6A23 = 0x876A
-0x6A24 = 0x8805
-0x6A25 = 0x87A2
-0x6A26 = 0x879F
-0x6A27 = 0x8782
-0x6A28 = 0x87AF
-0x6A29 = 0x87CB
-0x6A2A = 0x87BD
-0x6A2B = 0x87C0
-0x6A2C = 0x87D0
-0x6A2D = 0x96D6
-0x6A2E = 0x87AB
-0x6A2F = 0x87C4
-0x6A30 = 0x87B3
-0x6A31 = 0x87C7
-0x6A32 = 0x87C6
-0x6A33 = 0x87BB
-0x6A34 = 0x87EF
-0x6A35 = 0x87F2
-0x6A36 = 0x87E0
-0x6A37 = 0x880F
-0x6A38 = 0x880D
-0x6A39 = 0x87FE
-0x6A3A = 0x87F6
-0x6A3B = 0x87F7
-0x6A3C = 0x880E
-0x6A3D = 0x87D2
-0x6A3E = 0x8811
-0x6A3F = 0x8816
-0x6A40 = 0x8815
-0x6A41 = 0x8822
-0x6A42 = 0x8821
-0x6A43 = 0x8831
-0x6A44 = 0x8836
-0x6A45 = 0x8839
-0x6A46 = 0x8827
-0x6A47 = 0x883B
-0x6A48 = 0x8844
-0x6A49 = 0x8842
-0x6A4A = 0x8852
-0x6A4B = 0x8859
-0x6A4C = 0x885E
-0x6A4D = 0x8862
-0x6A4E = 0x886B
-0x6A4F = 0x8881
-0x6A50 = 0x887E
-0x6A51 = 0x889E
-0x6A52 = 0x8875
-0x6A53 = 0x887D
-0x6A54 = 0x88B5
-0x6A55 = 0x8872
-0x6A56 = 0x8882
-0x6A57 = 0x8897
-0x6A58 = 0x8892
-0x6A59 = 0x88AE
-0x6A5A = 0x8899
-0x6A5B = 0x88A2
-0x6A5C = 0x888D
-0x6A5D = 0x88A4
-0x6A5E = 0x88B0
-0x6A5F = 0x88BF
-0x6A60 = 0x88B1
-0x6A61 = 0x88C3
-0x6A62 = 0x88C4
-0x6A63 = 0x88D4
-0x6A64 = 0x88D8
-0x6A65 = 0x88D9
-0x6A66 = 0x88DD
-0x6A67 = 0x88F9
-0x6A68 = 0x8902
-0x6A69 = 0x88FC
-0x6A6A = 0x88F4
-0x6A6B = 0x88E8
-0x6A6C = 0x88F2
-0x6A6D = 0x8904
-0x6A6E = 0x890C
-0x6A6F = 0x890A
-0x6A70 = 0x8913
-0x6A71 = 0x8943
-0x6A72 = 0x891E
-0x6A73 = 0x8925
-0x6A74 = 0x892A
-0x6A75 = 0x892B
-0x6A76 = 0x8941
-0x6A77 = 0x8944
-0x6A78 = 0x893B
-0x6A79 = 0x8936
-0x6A7A = 0x8938
-0x6A7B = 0x894C
-0x6A7C = 0x891D
-0x6A7D = 0x8960
-0x6A7E = 0x895E
-0x6B21 = 0x8966
-0x6B22 = 0x8964
-0x6B23 = 0x896D
-0x6B24 = 0x896A
-0x6B25 = 0x896F
-0x6B26 = 0x8974
-0x6B27 = 0x8977
-0x6B28 = 0x897E
-0x6B29 = 0x8983
-0x6B2A = 0x8988
-0x6B2B = 0x898A
-0x6B2C = 0x8993
-0x6B2D = 0x8998
-0x6B2E = 0x89A1
-0x6B2F = 0x89A9
-0x6B30 = 0x89A6
-0x6B31 = 0x89AC
-0x6B32 = 0x89AF
-0x6B33 = 0x89B2
-0x6B34 = 0x89BA
-0x6B35 = 0x89BD
-0x6B36 = 0x89BF
-0x6B37 = 0x89C0
-0x6B38 = 0x89DA
-0x6B39 = 0x89DC
-0x6B3A = 0x89DD
-0x6B3B = 0x89E7
-0x6B3C = 0x89F4
-0x6B3D = 0x89F8
-0x6B3E = 0x8A03
-0x6B3F = 0x8A16
-0x6B40 = 0x8A10
-0x6B41 = 0x8A0C
-0x6B42 = 0x8A1B
-0x6B43 = 0x8A1D
-0x6B44 = 0x8A25
-0x6B45 = 0x8A36
-0x6B46 = 0x8A41
-0x6B47 = 0x8A5B
-0x6B48 = 0x8A52
-0x6B49 = 0x8A46
-0x6B4A = 0x8A48
-0x6B4B = 0x8A7C
-0x6B4C = 0x8A6D
-0x6B4D = 0x8A6C
-0x6B4E = 0x8A62
-0x6B4F = 0x8A85
-0x6B50 = 0x8A82
-0x6B51 = 0x8A84
-0x6B52 = 0x8AA8
-0x6B53 = 0x8AA1
-0x6B54 = 0x8A91
-0x6B55 = 0x8AA5
-0x6B56 = 0x8AA6
-0x6B57 = 0x8A9A
-0x6B58 = 0x8AA3
-0x6B59 = 0x8AC4
-0x6B5A = 0x8ACD
-0x6B5B = 0x8AC2
-0x6B5C = 0x8ADA
-0x6B5D = 0x8AEB
-0x6B5E = 0x8AF3
-0x6B5F = 0x8AE7
-0x6B60 = 0x8AE4
-0x6B61 = 0x8AF1
-0x6B62 = 0x8B14
-0x6B63 = 0x8AE0
-0x6B64 = 0x8AE2
-0x6B65 = 0x8AF7
-0x6B66 = 0x8ADE
-0x6B67 = 0x8ADB
-0x6B68 = 0x8B0C
-0x6B69 = 0x8B07
-0x6B6A = 0x8B1A
-0x6B6B = 0x8AE1
-0x6B6C = 0x8B16
-0x6B6D = 0x8B10
-0x6B6E = 0x8B17
-0x6B6F = 0x8B20
-0x6B70 = 0x8B33
-0x6B71 = 0x97AB
-0x6B72 = 0x8B26
-0x6B73 = 0x8B2B
-0x6B74 = 0x8B3E
-0x6B75 = 0x8B28
-0x6B76 = 0x8B41
-0x6B77 = 0x8B4C
-0x6B78 = 0x8B4F
-0x6B79 = 0x8B4E
-0x6B7A = 0x8B49
-0x6B7B = 0x8B56
-0x6B7C = 0x8B5B
-0x6B7D = 0x8B5A
-0x6B7E = 0x8B6B
-0x6C21 = 0x8B5F
-0x6C22 = 0x8B6C
-0x6C23 = 0x8B6F
-0x6C24 = 0x8B74
-0x6C25 = 0x8B7D
-0x6C26 = 0x8B80
-0x6C27 = 0x8B8C
-0x6C28 = 0x8B8E
-0x6C29 = 0x8B92
-0x6C2A = 0x8B93
-0x6C2B = 0x8B96
-0x6C2C = 0x8B99
-0x6C2D = 0x8B9A
-0x6C2E = 0x8C3A
-0x6C2F = 0x8C41
-0x6C30 = 0x8C3F
-0x6C31 = 0x8C48
-0x6C32 = 0x8C4C
-0x6C33 = 0x8C4E
-0x6C34 = 0x8C50
-0x6C35 = 0x8C55
-0x6C36 = 0x8C62
-0x6C37 = 0x8C6C
-0x6C38 = 0x8C78
-0x6C39 = 0x8C7A
-0x6C3A = 0x8C82
-0x6C3B = 0x8C89
-0x6C3C = 0x8C85
-0x6C3D = 0x8C8A
-0x6C3E = 0x8C8D
-0x6C3F = 0x8C8E
-0x6C40 = 0x8C94
-0x6C41 = 0x8C7C
-0x6C42 = 0x8C98
-0x6C43 = 0x621D
-0x6C44 = 0x8CAD
-0x6C45 = 0x8CAA
-0x6C46 = 0x8CBD
-0x6C47 = 0x8CB2
-0x6C48 = 0x8CB3
-0x6C49 = 0x8CAE
-0x6C4A = 0x8CB6
-0x6C4B = 0x8CC8
-0x6C4C = 0x8CC1
-0x6C4D = 0x8CE4
-0x6C4E = 0x8CE3
-0x6C4F = 0x8CDA
-0x6C50 = 0x8CFD
-0x6C51 = 0x8CFA
-0x6C52 = 0x8CFB
-0x6C53 = 0x8D04
-0x6C54 = 0x8D05
-0x6C55 = 0x8D0A
-0x6C56 = 0x8D07
-0x6C57 = 0x8D0F
-0x6C58 = 0x8D0D
-0x6C59 = 0x8D10
-0x6C5A = 0x9F4E
-0x6C5B = 0x8D13
-0x6C5C = 0x8CCD
-0x6C5D = 0x8D14
-0x6C5E = 0x8D16
-0x6C5F = 0x8D67
-0x6C60 = 0x8D6D
-0x6C61 = 0x8D71
-0x6C62 = 0x8D73
-0x6C63 = 0x8D81
-0x6C64 = 0x8D99
-0x6C65 = 0x8DC2
-0x6C66 = 0x8DBE
-0x6C67 = 0x8DBA
-0x6C68 = 0x8DCF
-0x6C69 = 0x8DDA
-0x6C6A = 0x8DD6
-0x6C6B = 0x8DCC
-0x6C6C = 0x8DDB
-0x6C6D = 0x8DCB
-0x6C6E = 0x8DEA
-0x6C6F = 0x8DEB
-0x6C70 = 0x8DDF
-0x6C71 = 0x8DE3
-0x6C72 = 0x8DFC
-0x6C73 = 0x8E08
-0x6C74 = 0x8E09
-0x6C75 = 0x8DFF
-0x6C76 = 0x8E1D
-0x6C77 = 0x8E1E
-0x6C78 = 0x8E10
-0x6C79 = 0x8E1F
-0x6C7A = 0x8E42
-0x6C7B = 0x8E35
-0x6C7C = 0x8E30
-0x6C7D = 0x8E34
-0x6C7E = 0x8E4A
-0x6D21 = 0x8E47
-0x6D22 = 0x8E49
-0x6D23 = 0x8E4C
-0x6D24 = 0x8E50
-0x6D25 = 0x8E48
-0x6D26 = 0x8E59
-0x6D27 = 0x8E64
-0x6D28 = 0x8E60
-0x6D29 = 0x8E2A
-0x6D2A = 0x8E63
-0x6D2B = 0x8E55
-0x6D2C = 0x8E76
-0x6D2D = 0x8E72
-0x6D2E = 0x8E7C
-0x6D2F = 0x8E81
-0x6D30 = 0x8E87
-0x6D31 = 0x8E85
-0x6D32 = 0x8E84
-0x6D33 = 0x8E8B
-0x6D34 = 0x8E8A
-0x6D35 = 0x8E93
-0x6D36 = 0x8E91
-0x6D37 = 0x8E94
-0x6D38 = 0x8E99
-0x6D39 = 0x8EAA
-0x6D3A = 0x8EA1
-0x6D3B = 0x8EAC
-0x6D3C = 0x8EB0
-0x6D3D = 0x8EC6
-0x6D3E = 0x8EB1
-0x6D3F = 0x8EBE
-0x6D40 = 0x8EC5
-0x6D41 = 0x8EC8
-0x6D42 = 0x8ECB
-0x6D43 = 0x8EDB
-0x6D44 = 0x8EE3
-0x6D45 = 0x8EFC
-0x6D46 = 0x8EFB
-0x6D47 = 0x8EEB
-0x6D48 = 0x8EFE
-0x6D49 = 0x8F0A
-0x6D4A = 0x8F05
-0x6D4B = 0x8F15
-0x6D4C = 0x8F12
-0x6D4D = 0x8F19
-0x6D4E = 0x8F13
-0x6D4F = 0x8F1C
-0x6D50 = 0x8F1F
-0x6D51 = 0x8F1B
-0x6D52 = 0x8F0C
-0x6D53 = 0x8F26
-0x6D54 = 0x8F33
-0x6D55 = 0x8F3B
-0x6D56 = 0x8F39
-0x6D57 = 0x8F45
-0x6D58 = 0x8F42
-0x6D59 = 0x8F3E
-0x6D5A = 0x8F4C
-0x6D5B = 0x8F49
-0x6D5C = 0x8F46
-0x6D5D = 0x8F4E
-0x6D5E = 0x8F57
-0x6D5F = 0x8F5C
-0x6D60 = 0x8F62
-0x6D61 = 0x8F63
-0x6D62 = 0x8F64
-0x6D63 = 0x8F9C
-0x6D64 = 0x8F9F
-0x6D65 = 0x8FA3
-0x6D66 = 0x8FAD
-0x6D67 = 0x8FAF
-0x6D68 = 0x8FB7
-0x6D69 = 0x8FDA
-0x6D6A = 0x8FE5
-0x6D6B = 0x8FE2
-0x6D6C = 0x8FEA
-0x6D6D = 0x8FEF
-0x6D6E = 0x9087
-0x6D6F = 0x8FF4
-0x6D70 = 0x9005
-0x6D71 = 0x8FF9
-0x6D72 = 0x8FFA
-0x6D73 = 0x9011
-0x6D74 = 0x9015
-0x6D75 = 0x9021
-0x6D76 = 0x900D
-0x6D77 = 0x901E
-0x6D78 = 0x9016
-0x6D79 = 0x900B
-0x6D7A = 0x9027
-0x6D7B = 0x9036
-0x6D7C = 0x9035
-0x6D7D = 0x9039
-0x6D7E = 0x8FF8
-0x6E21 = 0x904F
-0x6E22 = 0x9050
-0x6E23 = 0x9051
-0x6E24 = 0x9052
-0x6E25 = 0x900E
-0x6E26 = 0x9049
-0x6E27 = 0x903E
-0x6E28 = 0x9056
-0x6E29 = 0x9058
-0x6E2A = 0x905E
-0x6E2B = 0x9068
-0x6E2C = 0x906F
-0x6E2D = 0x9076
-0x6E2E = 0x96A8
-0x6E2F = 0x9072
-0x6E30 = 0x9082
-0x6E31 = 0x907D
-0x6E32 = 0x9081
-0x6E33 = 0x9080
-0x6E34 = 0x908A
-0x6E35 = 0x9089
-0x6E36 = 0x908F
-0x6E37 = 0x90A8
-0x6E38 = 0x90AF
-0x6E39 = 0x90B1
-0x6E3A = 0x90B5
-0x6E3B = 0x90E2
-0x6E3C = 0x90E4
-0x6E3D = 0x6248
-0x6E3E = 0x90DB
-0x6E3F = 0x9102
-0x6E40 = 0x9112
-0x6E41 = 0x9119
-0x6E42 = 0x9132
-0x6E43 = 0x9130
-0x6E44 = 0x914A
-0x6E45 = 0x9156
-0x6E46 = 0x9158
-0x6E47 = 0x9163
-0x6E48 = 0x9165
-0x6E49 = 0x9169
-0x6E4A = 0x9173
-0x6E4B = 0x9172
-0x6E4C = 0x918B
-0x6E4D = 0x9189
-0x6E4E = 0x9182
-0x6E4F = 0x91A2
-0x6E50 = 0x91AB
-0x6E51 = 0x91AF
-0x6E52 = 0x91AA
-0x6E53 = 0x91B5
-0x6E54 = 0x91B4
-0x6E55 = 0x91BA
-0x6E56 = 0x91C0
-0x6E57 = 0x91C1
-0x6E58 = 0x91C9
-0x6E59 = 0x91CB
-0x6E5A = 0x91D0
-0x6E5B = 0x91D6
-0x6E5C = 0x91DF
-0x6E5D = 0x91E1
-0x6E5E = 0x91DB
-0x6E5F = 0x91FC
-0x6E60 = 0x91F5
-0x6E61 = 0x91F6
-0x6E62 = 0x921E
-0x6E63 = 0x91FF
-0x6E64 = 0x9214
-0x6E65 = 0x922C
-0x6E66 = 0x9215
-0x6E67 = 0x9211
-0x6E68 = 0x925E
-0x6E69 = 0x9257
-0x6E6A = 0x9245
-0x6E6B = 0x9249
-0x6E6C = 0x9264
-0x6E6D = 0x9248
-0x6E6E = 0x9295
-0x6E6F = 0x923F
-0x6E70 = 0x924B
-0x6E71 = 0x9250
-0x6E72 = 0x929C
-0x6E73 = 0x9296
-0x6E74 = 0x9293
-0x6E75 = 0x929B
-0x6E76 = 0x925A
-0x6E77 = 0x92CF
-0x6E78 = 0x92B9
-0x6E79 = 0x92B7
-0x6E7A = 0x92E9
-0x6E7B = 0x930F
-0x6E7C = 0x92FA
-0x6E7D = 0x9344
-0x6E7E = 0x932E
-0x6F21 = 0x9319
-0x6F22 = 0x9322
-0x6F23 = 0x931A
-0x6F24 = 0x9323
-0x6F25 = 0x933A
-0x6F26 = 0x9335
-0x6F27 = 0x933B
-0x6F28 = 0x935C
-0x6F29 = 0x9360
-0x6F2A = 0x937C
-0x6F2B = 0x936E
-0x6F2C = 0x9356
-0x6F2D = 0x93B0
-0x6F2E = 0x93AC
-0x6F2F = 0x93AD
-0x6F30 = 0x9394
-0x6F31 = 0x93B9
-0x6F32 = 0x93D6
-0x6F33 = 0x93D7
-0x6F34 = 0x93E8
-0x6F35 = 0x93E5
-0x6F36 = 0x93D8
-0x6F37 = 0x93C3
-0x6F38 = 0x93DD
-0x6F39 = 0x93D0
-0x6F3A = 0x93C8
-0x6F3B = 0x93E4
-0x6F3C = 0x941A
-0x6F3D = 0x9414
-0x6F3E = 0x9413
-0x6F3F = 0x9403
-0x6F40 = 0x9407
-0x6F41 = 0x9410
-0x6F42 = 0x9436
-0x6F43 = 0x942B
-0x6F44 = 0x9435
-0x6F45 = 0x9421
-0x6F46 = 0x943A
-0x6F47 = 0x9441
-0x6F48 = 0x9452
-0x6F49 = 0x9444
-0x6F4A = 0x945B
-0x6F4B = 0x9460
-0x6F4C = 0x9462
-0x6F4D = 0x945E
-0x6F4E = 0x946A
-0x6F4F = 0x9229
-0x6F50 = 0x9470
-0x6F51 = 0x9475
-0x6F52 = 0x9477
-0x6F53 = 0x947D
-0x6F54 = 0x945A
-0x6F55 = 0x947C
-0x6F56 = 0x947E
-0x6F57 = 0x9481
-0x6F58 = 0x947F
-0x6F59 = 0x9582
-0x6F5A = 0x9587
-0x6F5B = 0x958A
-0x6F5C = 0x9594
-0x6F5D = 0x9596
-0x6F5E = 0x9598
-0x6F5F = 0x9599
-0x6F60 = 0x95A0
-0x6F61 = 0x95A8
-0x6F62 = 0x95A7
-0x6F63 = 0x95AD
-0x6F64 = 0x95BC
-0x6F65 = 0x95BB
-0x6F66 = 0x95B9
-0x6F67 = 0x95BE
-0x6F68 = 0x95CA
-0x6F69 = 0x6FF6
-0x6F6A = 0x95C3
-0x6F6B = 0x95CD
-0x6F6C = 0x95CC
-0x6F6D = 0x95D5
-0x6F6E = 0x95D4
-0x6F6F = 0x95D6
-0x6F70 = 0x95DC
-0x6F71 = 0x95E1
-0x6F72 = 0x95E5
-0x6F73 = 0x95E2
-0x6F74 = 0x9621
-0x6F75 = 0x9628
-0x6F76 = 0x962E
-0x6F77 = 0x962F
-0x6F78 = 0x9642
-0x6F79 = 0x964C
-0x6F7A = 0x964F
-0x6F7B = 0x964B
-0x6F7C = 0x9677
-0x6F7D = 0x965C
-0x6F7E = 0x965E
-0x7021 = 0x965D
-0x7022 = 0x965F
-0x7023 = 0x9666
-0x7024 = 0x9672
-0x7025 = 0x966C
-0x7026 = 0x968D
-0x7027 = 0x9698
-0x7028 = 0x9695
-0x7029 = 0x9697
-0x702A = 0x96AA
-0x702B = 0x96A7
-0x702C = 0x96B1
-0x702D = 0x96B2
-0x702E = 0x96B0
-0x702F = 0x96B4
-0x7030 = 0x96B6
-0x7031 = 0x96B8
-0x7032 = 0x96B9
-0x7033 = 0x96CE
-0x7034 = 0x96CB
-0x7035 = 0x96C9
-0x7036 = 0x96CD
-0x7037 = 0x894D
-0x7038 = 0x96DC
-0x7039 = 0x970D
-0x703A = 0x96D5
-0x703B = 0x96F9
-0x703C = 0x9704
-0x703D = 0x9706
-0x703E = 0x9708
-0x703F = 0x9713
-0x7040 = 0x970E
-0x7041 = 0x9711
-0x7042 = 0x970F
-0x7043 = 0x9716
-0x7044 = 0x9719
-0x7045 = 0x9724
-0x7046 = 0x972A
-0x7047 = 0x9730
-0x7048 = 0x9739
-0x7049 = 0x973D
-0x704A = 0x973E
-0x704B = 0x9744
-0x704C = 0x9746
-0x704D = 0x9748
-0x704E = 0x9742
-0x704F = 0x9749
-0x7050 = 0x975C
-0x7051 = 0x9760
-0x7052 = 0x9764
-0x7053 = 0x9766
-0x7054 = 0x9768
-0x7055 = 0x52D2
-0x7056 = 0x976B
-0x7057 = 0x9771
-0x7058 = 0x9779
-0x7059 = 0x9785
-0x705A = 0x977C
-0x705B = 0x9781
-0x705C = 0x977A
-0x705D = 0x9786
-0x705E = 0x978B
-0x705F = 0x978F
-0x7060 = 0x9790
-0x7061 = 0x979C
-0x7062 = 0x97A8
-0x7063 = 0x97A6
-0x7064 = 0x97A3
-0x7065 = 0x97B3
-0x7066 = 0x97B4
-0x7067 = 0x97C3
-0x7068 = 0x97C6
-0x7069 = 0x97C8
-0x706A = 0x97CB
-0x706B = 0x97DC
-0x706C = 0x97ED
-0x706D = 0x9F4F
-0x706E = 0x97F2
-0x706F = 0x7ADF
-0x7070 = 0x97F6
-0x7071 = 0x97F5
-0x7072 = 0x980F
-0x7073 = 0x980C
-0x7074 = 0x9838
-0x7075 = 0x9824
-0x7076 = 0x9821
-0x7077 = 0x9837
-0x7078 = 0x983D
-0x7079 = 0x9846
-0x707A = 0x984F
-0x707B = 0x984B
-0x707C = 0x986B
-0x707D = 0x986F
-0x707E = 0x9870
-0x7121 = 0x9871
-0x7122 = 0x9874
-0x7123 = 0x9873
-0x7124 = 0x98AA
-0x7125 = 0x98AF
-0x7126 = 0x98B1
-0x7127 = 0x98B6
-0x7128 = 0x98C4
-0x7129 = 0x98C3
-0x712A = 0x98C6
-0x712B = 0x98E9
-0x712C = 0x98EB
-0x712D = 0x9903
-0x712E = 0x9909
-0x712F = 0x9912
-0x7130 = 0x9914
-0x7131 = 0x9918
-0x7132 = 0x9921
-0x7133 = 0x991D
-0x7134 = 0x991E
-0x7135 = 0x9924
-0x7136 = 0x9920
-0x7137 = 0x992C
-0x7138 = 0x992E
-0x7139 = 0x993D
-0x713A = 0x993E
-0x713B = 0x9942
-0x713C = 0x9949
-0x713D = 0x9945
-0x713E = 0x9950
-0x713F = 0x994B
-0x7140 = 0x9951
-0x7141 = 0x9952
-0x7142 = 0x994C
-0x7143 = 0x9955
-0x7144 = 0x9997
-0x7145 = 0x9998
-0x7146 = 0x99A5
-0x7147 = 0x99AD
-0x7148 = 0x99AE
-0x7149 = 0x99BC
-0x714A = 0x99DF
-0x714B = 0x99DB
-0x714C = 0x99DD
-0x714D = 0x99D8
-0x714E = 0x99D1
-0x714F = 0x99ED
-0x7150 = 0x99EE
-0x7151 = 0x99F1
-0x7152 = 0x99F2
-0x7153 = 0x99FB
-0x7154 = 0x99F8
-0x7155 = 0x9A01
-0x7156 = 0x9A0F
-0x7157 = 0x9A05
-0x7158 = 0x99E2
-0x7159 = 0x9A19
-0x715A = 0x9A2B
-0x715B = 0x9A37
-0x715C = 0x9A45
-0x715D = 0x9A42
-0x715E = 0x9A40
-0x715F = 0x9A43
-0x7160 = 0x9A3E
-0x7161 = 0x9A55
-0x7162 = 0x9A4D
-0x7163 = 0x9A5B
-0x7164 = 0x9A57
-0x7165 = 0x9A5F
-0x7166 = 0x9A62
-0x7167 = 0x9A65
-0x7168 = 0x9A64
-0x7169 = 0x9A69
-0x716A = 0x9A6B
-0x716B = 0x9A6A
-0x716C = 0x9AAD
-0x716D = 0x9AB0
-0x716E = 0x9ABC
-0x716F = 0x9AC0
-0x7170 = 0x9ACF
-0x7171 = 0x9AD1
-0x7172 = 0x9AD3
-0x7173 = 0x9AD4
-0x7174 = 0x9ADE
-0x7175 = 0x9ADF
-0x7176 = 0x9AE2
-0x7177 = 0x9AE3
-0x7178 = 0x9AE6
-0x7179 = 0x9AEF
-0x717A = 0x9AEB
-0x717B = 0x9AEE
-0x717C = 0x9AF4
-0x717D = 0x9AF1
-0x717E = 0x9AF7
-0x7221 = 0x9AFB
-0x7222 = 0x9B06
-0x7223 = 0x9B18
-0x7224 = 0x9B1A
-0x7225 = 0x9B1F
-0x7226 = 0x9B22
-0x7227 = 0x9B23
-0x7228 = 0x9B25
-0x7229 = 0x9B27
-0x722A = 0x9B28
-0x722B = 0x9B29
-0x722C = 0x9B2A
-0x722D = 0x9B2E
-0x722E = 0x9B2F
-0x722F = 0x9B32
-0x7230 = 0x9B44
-0x7231 = 0x9B43
-0x7232 = 0x9B4F
-0x7233 = 0x9B4D
-0x7234 = 0x9B4E
-0x7235 = 0x9B51
-0x7236 = 0x9B58
-0x7237 = 0x9B74
-0x7238 = 0x9B93
-0x7239 = 0x9B83
-0x723A = 0x9B91
-0x723B = 0x9B96
-0x723C = 0x9B97
-0x723D = 0x9B9F
-0x723E = 0x9BA0
-0x723F = 0x9BA8
-0x7240 = 0x9BB4
-0x7241 = 0x9BC0
-0x7242 = 0x9BCA
-0x7243 = 0x9BB9
-0x7244 = 0x9BC6
-0x7245 = 0x9BCF
-0x7246 = 0x9BD1
-0x7247 = 0x9BD2
-0x7248 = 0x9BE3
-0x7249 = 0x9BE2
-0x724A = 0x9BE4
-0x724B = 0x9BD4
-0x724C = 0x9BE1
-0x724D = 0x9C3A
-0x724E = 0x9BF2
-0x724F = 0x9BF1
-0x7250 = 0x9BF0
-0x7251 = 0x9C15
-0x7252 = 0x9C14
-0x7253 = 0x9C09
-0x7254 = 0x9C13
-0x7255 = 0x9C0C
-0x7256 = 0x9C06
-0x7257 = 0x9C08
-0x7258 = 0x9C12
-0x7259 = 0x9C0A
-0x725A = 0x9C04
-0x725B = 0x9C2E
-0x725C = 0x9C1B
-0x725D = 0x9C25
-0x725E = 0x9C24
-0x725F = 0x9C21
-0x7260 = 0x9C30
-0x7261 = 0x9C47
-0x7262 = 0x9C32
-0x7263 = 0x9C46
-0x7264 = 0x9C3E
-0x7265 = 0x9C5A
-0x7266 = 0x9C60
-0x7267 = 0x9C67
-0x7268 = 0x9C76
-0x7269 = 0x9C78
-0x726A = 0x9CE7
-0x726B = 0x9CEC
-0x726C = 0x9CF0
-0x726D = 0x9D09
-0x726E = 0x9D08
-0x726F = 0x9CEB
-0x7270 = 0x9D03
-0x7271 = 0x9D06
-0x7272 = 0x9D2A
-0x7273 = 0x9D26
-0x7274 = 0x9DAF
-0x7275 = 0x9D23
-0x7276 = 0x9D1F
-0x7277 = 0x9D44
-0x7278 = 0x9D15
-0x7279 = 0x9D12
-0x727A = 0x9D41
-0x727B = 0x9D3F
-0x727C = 0x9D3E
-0x727D = 0x9D46
-0x727E = 0x9D48
-0x7321 = 0x9D5D
-0x7322 = 0x9D5E
-0x7323 = 0x9D64
-0x7324 = 0x9D51
-0x7325 = 0x9D50
-0x7326 = 0x9D59
-0x7327 = 0x9D72
-0x7328 = 0x9D89
-0x7329 = 0x9D87
-0x732A = 0x9DAB
-0x732B = 0x9D6F
-0x732C = 0x9D7A
-0x732D = 0x9D9A
-0x732E = 0x9DA4
-0x732F = 0x9DA9
-0x7330 = 0x9DB2
-0x7331 = 0x9DC4
-0x7332 = 0x9DC1
-0x7333 = 0x9DBB
-0x7334 = 0x9DB8
-0x7335 = 0x9DBA
-0x7336 = 0x9DC6
-0x7337 = 0x9DCF
-0x7338 = 0x9DC2
-0x7339 = 0x9DD9
-0x733A = 0x9DD3
-0x733B = 0x9DF8
-0x733C = 0x9DE6
-0x733D = 0x9DED
-0x733E = 0x9DEF
-0x733F = 0x9DFD
-0x7340 = 0x9E1A
-0x7341 = 0x9E1B
-0x7342 = 0x9E1E
-0x7343 = 0x9E75
-0x7344 = 0x9E79
-0x7345 = 0x9E7D
-0x7346 = 0x9E81
-0x7347 = 0x9E88
-0x7348 = 0x9E8B
-0x7349 = 0x9E8C
-0x734A = 0x9E92
-0x734B = 0x9E95
-0x734C = 0x9E91
-0x734D = 0x9E9D
-0x734E = 0x9EA5
-0x734F = 0x9EA9
-0x7350 = 0x9EB8
-0x7351 = 0x9EAA
-0x7352 = 0x9EAD
-0x7353 = 0x9761
-0x7354 = 0x9ECC
-0x7355 = 0x9ECE
-0x7356 = 0x9ECF
-0x7357 = 0x9ED0
-0x7358 = 0x9ED4
-0x7359 = 0x9EDC
-0x735A = 0x9EDE
-0x735B = 0x9EDD
-0x735C = 0x9EE0
-0x735D = 0x9EE5
-0x735E = 0x9EE8
-0x735F = 0x9EEF
-0x7360 = 0x9EF4
-0x7361 = 0x9EF6
-0x7362 = 0x9EF7
-0x7363 = 0x9EF9
-0x7364 = 0x9EFB
-0x7365 = 0x9EFC
-0x7366 = 0x9EFD
-0x7367 = 0x9F07
-0x7368 = 0x9F08
-0x7369 = 0x76B7
-0x736A = 0x9F15
-0x736B = 0x9F21
-0x736C = 0x9F2C
-0x736D = 0x9F3E
-0x736E = 0x9F4A
-0x736F = 0x9F52
-0x7370 = 0x9F54
-0x7371 = 0x9F63
-0x7372 = 0x9F5F
-0x7373 = 0x9F60
-0x7374 = 0x9F61
-0x7375 = 0x9F66
-0x7376 = 0x9F67
-0x7377 = 0x9F6C
-0x7378 = 0x9F6A
-0x7379 = 0x9F77
-0x737A = 0x9F72
-0x737B = 0x9F76
-0x737C = 0x9F95
-0x737D = 0x9F9C
-0x737E = 0x9FA0
-0x7421 = 0x582F
-0x7422 = 0x69C7
-0x7423 = 0x9059
-0x7424 = 0x7464
-0x7425 = 0x51DC
-0x7426 = 0x7199
-END_MAP
diff --git a/enc/trans/JIS/JISX0208@MS%UCS.src b/enc/trans/JIS/JISX0208@MS%UCS.src
deleted file mode 100644
index 768e037f5d..0000000000
--- a/enc/trans/JIS/JISX0208@MS%UCS.src
+++ /dev/null
@@ -1,6893 +0,0 @@
-# $NetBSD: JISX0208@MS%UCS.src,v 1.1 2003/07/19 20:20:40 tshiozak Exp $
-
-TYPE ROWCOL
-NAME "JISX0208:MS/UCS"
-SRC_ZONE 0x21-0x7E / 0x21-0x7E / 8
-OOB_MODE ILSEQ
-DST_ILSEQ 0xFFFE
-DST_UNIT_BITS 16
-
-BEGIN_MAP
-#
-# This data is derived from http://www.opengroup.or.jp/jvc/cde/
-#
-0x2121 = 0x3000
-0x2122 = 0x3001
-0x2123 = 0x3002
-0x2124 = 0xFF0C
-0x2125 = 0xFF0E
-0x2126 = 0x30FB
-0x2127 = 0xFF1A
-0x2128 = 0xFF1B
-0x2129 = 0xFF1F
-0x212A = 0xFF01
-0x212B = 0x309B
-0x212C = 0x309C
-0x212D = 0x00B4
-0x212E = 0xFF40
-0x212F = 0x00A8
-0x2130 = 0xFF3E
-0x2131 = 0xFFE3
-0x2132 = 0xFF3F
-0x2133 = 0x30FD
-0x2134 = 0x30FE
-0x2135 = 0x309D
-0x2136 = 0x309E
-0x2137 = 0x3003
-0x2138 = 0x4EDD
-0x2139 = 0x3005
-0x213A = 0x3006
-0x213B = 0x3007
-0x213C = 0x30FC
-0x213D = 0x2015
-0x213E = 0x2010
-0x213F = 0xFF0F
-0x2140 = 0xFF3C
-0x2141 = 0xFF5E
-0x2142 = 0x2225
-0x2143 = 0xFF5C
-0x2144 = 0x2026
-0x2145 = 0x2025
-0x2146 = 0x2018
-0x2147 = 0x2019
-0x2148 = 0x201C
-0x2149 = 0x201D
-0x214A = 0xFF08
-0x214B = 0xFF09
-0x214C = 0x3014
-0x214D = 0x3015
-0x214E = 0xFF3B
-0x214F = 0xFF3D
-0x2150 = 0xFF5B
-0x2151 = 0xFF5D
-0x2152 = 0x3008
-0x2153 = 0x3009
-0x2154 = 0x300A
-0x2155 = 0x300B
-0x2156 = 0x300C
-0x2157 = 0x300D
-0x2158 = 0x300E
-0x2159 = 0x300F
-0x215A = 0x3010
-0x215B = 0x3011
-0x215C = 0xFF0B
-0x215D = 0xFF0D
-0x215E = 0x00B1
-0x215F = 0x00D7
-0x2160 = 0x00F7
-0x2161 = 0xFF1D
-0x2162 = 0x2260
-0x2163 = 0xFF1C
-0x2164 = 0xFF1E
-0x2165 = 0x2266
-0x2166 = 0x2267
-0x2167 = 0x221E
-0x2168 = 0x2234
-0x2169 = 0x2642
-0x216A = 0x2640
-0x216B = 0x00B0
-0x216C = 0x2032
-0x216D = 0x2033
-0x216E = 0x2103
-0x216F = 0xFFE5
-0x2170 = 0xFF04
-0x2171 = 0xFFE0
-0x2172 = 0xFFE1
-0x2173 = 0xFF05
-0x2174 = 0xFF03
-0x2175 = 0xFF06
-0x2176 = 0xFF0A
-0x2177 = 0xFF20
-0x2178 = 0x00A7
-0x2179 = 0x2606
-0x217A = 0x2605
-0x217B = 0x25CB
-0x217C = 0x25CF
-0x217D = 0x25CE
-0x217E = 0x25C7
-0x2221 = 0x25C6
-0x2222 = 0x25A1
-0x2223 = 0x25A0
-0x2224 = 0x25B3
-0x2225 = 0x25B2
-0x2226 = 0x25BD
-0x2227 = 0x25BC
-0x2228 = 0x203B
-0x2229 = 0x3012
-0x222A = 0x2192
-0x222B = 0x2190
-0x222C = 0x2191
-0x222D = 0x2193
-0x222E = 0x3013
-0x223A = 0x2208
-0x223B = 0x220B
-0x223C = 0x2286
-0x223D = 0x2287
-0x223E = 0x2282
-0x223F = 0x2283
-0x2240 = 0x222A
-0x2241 = 0x2229
-0x224A = 0x2227
-0x224B = 0x2228
-0x224C = 0xFFE2
-0x224D = 0x21D2
-0x224E = 0x21D4
-0x224F = 0x2200
-0x2250 = 0x2203
-0x225C = 0x2220
-0x225D = 0x22A5
-0x225E = 0x2312
-0x225F = 0x2202
-0x2260 = 0x2207
-0x2261 = 0x2261
-0x2262 = 0x2252
-0x2263 = 0x226A
-0x2264 = 0x226B
-0x2265 = 0x221A
-0x2266 = 0x223D
-0x2267 = 0x221D
-0x2268 = 0x2235
-0x2269 = 0x222B
-0x226A = 0x222C
-0x2272 = 0x212B
-0x2273 = 0x2030
-0x2274 = 0x266F
-0x2275 = 0x266D
-0x2276 = 0x266A
-0x2277 = 0x2020
-0x2278 = 0x2021
-0x2279 = 0x00B6
-0x227E = 0x25EF
-0x2330 = 0xFF10
-0x2331 = 0xFF11
-0x2332 = 0xFF12
-0x2333 = 0xFF13
-0x2334 = 0xFF14
-0x2335 = 0xFF15
-0x2336 = 0xFF16
-0x2337 = 0xFF17
-0x2338 = 0xFF18
-0x2339 = 0xFF19
-0x2341 = 0xFF21
-0x2342 = 0xFF22
-0x2343 = 0xFF23
-0x2344 = 0xFF24
-0x2345 = 0xFF25
-0x2346 = 0xFF26
-0x2347 = 0xFF27
-0x2348 = 0xFF28
-0x2349 = 0xFF29
-0x234A = 0xFF2A
-0x234B = 0xFF2B
-0x234C = 0xFF2C
-0x234D = 0xFF2D
-0x234E = 0xFF2E
-0x234F = 0xFF2F
-0x2350 = 0xFF30
-0x2351 = 0xFF31
-0x2352 = 0xFF32
-0x2353 = 0xFF33
-0x2354 = 0xFF34
-0x2355 = 0xFF35
-0x2356 = 0xFF36
-0x2357 = 0xFF37
-0x2358 = 0xFF38
-0x2359 = 0xFF39
-0x235A = 0xFF3A
-0x2361 = 0xFF41
-0x2362 = 0xFF42
-0x2363 = 0xFF43
-0x2364 = 0xFF44
-0x2365 = 0xFF45
-0x2366 = 0xFF46
-0x2367 = 0xFF47
-0x2368 = 0xFF48
-0x2369 = 0xFF49
-0x236A = 0xFF4A
-0x236B = 0xFF4B
-0x236C = 0xFF4C
-0x236D = 0xFF4D
-0x236E = 0xFF4E
-0x236F = 0xFF4F
-0x2370 = 0xFF50
-0x2371 = 0xFF51
-0x2372 = 0xFF52
-0x2373 = 0xFF53
-0x2374 = 0xFF54
-0x2375 = 0xFF55
-0x2376 = 0xFF56
-0x2377 = 0xFF57
-0x2378 = 0xFF58
-0x2379 = 0xFF59
-0x237A = 0xFF5A
-0x2421 = 0x3041
-0x2422 = 0x3042
-0x2423 = 0x3043
-0x2424 = 0x3044
-0x2425 = 0x3045
-0x2426 = 0x3046
-0x2427 = 0x3047
-0x2428 = 0x3048
-0x2429 = 0x3049
-0x242A = 0x304A
-0x242B = 0x304B
-0x242C = 0x304C
-0x242D = 0x304D
-0x242E = 0x304E
-0x242F = 0x304F
-0x2430 = 0x3050
-0x2431 = 0x3051
-0x2432 = 0x3052
-0x2433 = 0x3053
-0x2434 = 0x3054
-0x2435 = 0x3055
-0x2436 = 0x3056
-0x2437 = 0x3057
-0x2438 = 0x3058
-0x2439 = 0x3059
-0x243A = 0x305A
-0x243B = 0x305B
-0x243C = 0x305C
-0x243D = 0x305D
-0x243E = 0x305E
-0x243F = 0x305F
-0x2440 = 0x3060
-0x2441 = 0x3061
-0x2442 = 0x3062
-0x2443 = 0x3063
-0x2444 = 0x3064
-0x2445 = 0x3065
-0x2446 = 0x3066
-0x2447 = 0x3067
-0x2448 = 0x3068
-0x2449 = 0x3069
-0x244A = 0x306A
-0x244B = 0x306B
-0x244C = 0x306C
-0x244D = 0x306D
-0x244E = 0x306E
-0x244F = 0x306F
-0x2450 = 0x3070
-0x2451 = 0x3071
-0x2452 = 0x3072
-0x2453 = 0x3073
-0x2454 = 0x3074
-0x2455 = 0x3075
-0x2456 = 0x3076
-0x2457 = 0x3077
-0x2458 = 0x3078
-0x2459 = 0x3079
-0x245A = 0x307A
-0x245B = 0x307B
-0x245C = 0x307C
-0x245D = 0x307D
-0x245E = 0x307E
-0x245F = 0x307F
-0x2460 = 0x3080
-0x2461 = 0x3081
-0x2462 = 0x3082
-0x2463 = 0x3083
-0x2464 = 0x3084
-0x2465 = 0x3085
-0x2466 = 0x3086
-0x2467 = 0x3087
-0x2468 = 0x3088
-0x2469 = 0x3089
-0x246A = 0x308A
-0x246B = 0x308B
-0x246C = 0x308C
-0x246D = 0x308D
-0x246E = 0x308E
-0x246F = 0x308F
-0x2470 = 0x3090
-0x2471 = 0x3091
-0x2472 = 0x3092
-0x2473 = 0x3093
-0x2521 = 0x30A1
-0x2522 = 0x30A2
-0x2523 = 0x30A3
-0x2524 = 0x30A4
-0x2525 = 0x30A5
-0x2526 = 0x30A6
-0x2527 = 0x30A7
-0x2528 = 0x30A8
-0x2529 = 0x30A9
-0x252A = 0x30AA
-0x252B = 0x30AB
-0x252C = 0x30AC
-0x252D = 0x30AD
-0x252E = 0x30AE
-0x252F = 0x30AF
-0x2530 = 0x30B0
-0x2531 = 0x30B1
-0x2532 = 0x30B2
-0x2533 = 0x30B3
-0x2534 = 0x30B4
-0x2535 = 0x30B5
-0x2536 = 0x30B6
-0x2537 = 0x30B7
-0x2538 = 0x30B8
-0x2539 = 0x30B9
-0x253A = 0x30BA
-0x253B = 0x30BB
-0x253C = 0x30BC
-0x253D = 0x30BD
-0x253E = 0x30BE
-0x253F = 0x30BF
-0x2540 = 0x30C0
-0x2541 = 0x30C1
-0x2542 = 0x30C2
-0x2543 = 0x30C3
-0x2544 = 0x30C4
-0x2545 = 0x30C5
-0x2546 = 0x30C6
-0x2547 = 0x30C7
-0x2548 = 0x30C8
-0x2549 = 0x30C9
-0x254A = 0x30CA
-0x254B = 0x30CB
-0x254C = 0x30CC
-0x254D = 0x30CD
-0x254E = 0x30CE
-0x254F = 0x30CF
-0x2550 = 0x30D0
-0x2551 = 0x30D1
-0x2552 = 0x30D2
-0x2553 = 0x30D3
-0x2554 = 0x30D4
-0x2555 = 0x30D5
-0x2556 = 0x30D6
-0x2557 = 0x30D7
-0x2558 = 0x30D8
-0x2559 = 0x30D9
-0x255A = 0x30DA
-0x255B = 0x30DB
-0x255C = 0x30DC
-0x255D = 0x30DD
-0x255E = 0x30DE
-0x255F = 0x30DF
-0x2560 = 0x30E0
-0x2561 = 0x30E1
-0x2562 = 0x30E2
-0x2563 = 0x30E3
-0x2564 = 0x30E4
-0x2565 = 0x30E5
-0x2566 = 0x30E6
-0x2567 = 0x30E7
-0x2568 = 0x30E8
-0x2569 = 0x30E9
-0x256A = 0x30EA
-0x256B = 0x30EB
-0x256C = 0x30EC
-0x256D = 0x30ED
-0x256E = 0x30EE
-0x256F = 0x30EF
-0x2570 = 0x30F0
-0x2571 = 0x30F1
-0x2572 = 0x30F2
-0x2573 = 0x30F3
-0x2574 = 0x30F4
-0x2575 = 0x30F5
-0x2576 = 0x30F6
-0x2621 = 0x0391
-0x2622 = 0x0392
-0x2623 = 0x0393
-0x2624 = 0x0394
-0x2625 = 0x0395
-0x2626 = 0x0396
-0x2627 = 0x0397
-0x2628 = 0x0398
-0x2629 = 0x0399
-0x262A = 0x039A
-0x262B = 0x039B
-0x262C = 0x039C
-0x262D = 0x039D
-0x262E = 0x039E
-0x262F = 0x039F
-0x2630 = 0x03A0
-0x2631 = 0x03A1
-0x2632 = 0x03A3
-0x2633 = 0x03A4
-0x2634 = 0x03A5
-0x2635 = 0x03A6
-0x2636 = 0x03A7
-0x2637 = 0x03A8
-0x2638 = 0x03A9
-0x2641 = 0x03B1
-0x2642 = 0x03B2
-0x2643 = 0x03B3
-0x2644 = 0x03B4
-0x2645 = 0x03B5
-0x2646 = 0x03B6
-0x2647 = 0x03B7
-0x2648 = 0x03B8
-0x2649 = 0x03B9
-0x264A = 0x03BA
-0x264B = 0x03BB
-0x264C = 0x03BC
-0x264D = 0x03BD
-0x264E = 0x03BE
-0x264F = 0x03BF
-0x2650 = 0x03C0
-0x2651 = 0x03C1
-0x2652 = 0x03C3
-0x2653 = 0x03C4
-0x2654 = 0x03C5
-0x2655 = 0x03C6
-0x2656 = 0x03C7
-0x2657 = 0x03C8
-0x2658 = 0x03C9
-0x2721 = 0x0410
-0x2722 = 0x0411
-0x2723 = 0x0412
-0x2724 = 0x0413
-0x2725 = 0x0414
-0x2726 = 0x0415
-0x2727 = 0x0401
-0x2728 = 0x0416
-0x2729 = 0x0417
-0x272A = 0x0418
-0x272B = 0x0419
-0x272C = 0x041A
-0x272D = 0x041B
-0x272E = 0x041C
-0x272F = 0x041D
-0x2730 = 0x041E
-0x2731 = 0x041F
-0x2732 = 0x0420
-0x2733 = 0x0421
-0x2734 = 0x0422
-0x2735 = 0x0423
-0x2736 = 0x0424
-0x2737 = 0x0425
-0x2738 = 0x0426
-0x2739 = 0x0427
-0x273A = 0x0428
-0x273B = 0x0429
-0x273C = 0x042A
-0x273D = 0x042B
-0x273E = 0x042C
-0x273F = 0x042D
-0x2740 = 0x042E
-0x2741 = 0x042F
-0x2751 = 0x0430
-0x2752 = 0x0431
-0x2753 = 0x0432
-0x2754 = 0x0433
-0x2755 = 0x0434
-0x2756 = 0x0435
-0x2757 = 0x0451
-0x2758 = 0x0436
-0x2759 = 0x0437
-0x275A = 0x0438
-0x275B = 0x0439
-0x275C = 0x043A
-0x275D = 0x043B
-0x275E = 0x043C
-0x275F = 0x043D
-0x2760 = 0x043E
-0x2761 = 0x043F
-0x2762 = 0x0440
-0x2763 = 0x0441
-0x2764 = 0x0442
-0x2765 = 0x0443
-0x2766 = 0x0444
-0x2767 = 0x0445
-0x2768 = 0x0446
-0x2769 = 0x0447
-0x276A = 0x0448
-0x276B = 0x0449
-0x276C = 0x044A
-0x276D = 0x044B
-0x276E = 0x044C
-0x276F = 0x044D
-0x2770 = 0x044E
-0x2771 = 0x044F
-0x2821 = 0x2500
-0x2822 = 0x2502
-0x2823 = 0x250C
-0x2824 = 0x2510
-0x2825 = 0x2518
-0x2826 = 0x2514
-0x2827 = 0x251C
-0x2828 = 0x252C
-0x2829 = 0x2524
-0x282A = 0x2534
-0x282B = 0x253C
-0x282C = 0x2501
-0x282D = 0x2503
-0x282E = 0x250F
-0x282F = 0x2513
-0x2830 = 0x251B
-0x2831 = 0x2517
-0x2832 = 0x2523
-0x2833 = 0x2533
-0x2834 = 0x252B
-0x2835 = 0x253B
-0x2836 = 0x254B
-0x2837 = 0x2520
-0x2838 = 0x252F
-0x2839 = 0x2528
-0x283A = 0x2537
-0x283B = 0x253F
-0x283C = 0x251D
-0x283D = 0x2530
-0x283E = 0x2525
-0x283F = 0x2538
-0x2840 = 0x2542
-0x3021 = 0x4E9C
-0x3022 = 0x5516
-0x3023 = 0x5A03
-0x3024 = 0x963F
-0x3025 = 0x54C0
-0x3026 = 0x611B
-0x3027 = 0x6328
-0x3028 = 0x59F6
-0x3029 = 0x9022
-0x302A = 0x8475
-0x302B = 0x831C
-0x302C = 0x7A50
-0x302D = 0x60AA
-0x302E = 0x63E1
-0x302F = 0x6E25
-0x3030 = 0x65ED
-0x3031 = 0x8466
-0x3032 = 0x82A6
-0x3033 = 0x9BF5
-0x3034 = 0x6893
-0x3035 = 0x5727
-0x3036 = 0x65A1
-0x3037 = 0x6271
-0x3038 = 0x5B9B
-0x3039 = 0x59D0
-0x303A = 0x867B
-0x303B = 0x98F4
-0x303C = 0x7D62
-0x303D = 0x7DBE
-0x303E = 0x9B8E
-0x303F = 0x6216
-0x3040 = 0x7C9F
-0x3041 = 0x88B7
-0x3042 = 0x5B89
-0x3043 = 0x5EB5
-0x3044 = 0x6309
-0x3045 = 0x6697
-0x3046 = 0x6848
-0x3047 = 0x95C7
-0x3048 = 0x978D
-0x3049 = 0x674F
-0x304A = 0x4EE5
-0x304B = 0x4F0A
-0x304C = 0x4F4D
-0x304D = 0x4F9D
-0x304E = 0x5049
-0x304F = 0x56F2
-0x3050 = 0x5937
-0x3051 = 0x59D4
-0x3052 = 0x5A01
-0x3053 = 0x5C09
-0x3054 = 0x60DF
-0x3055 = 0x610F
-0x3056 = 0x6170
-0x3057 = 0x6613
-0x3058 = 0x6905
-0x3059 = 0x70BA
-0x305A = 0x754F
-0x305B = 0x7570
-0x305C = 0x79FB
-0x305D = 0x7DAD
-0x305E = 0x7DEF
-0x305F = 0x80C3
-0x3060 = 0x840E
-0x3061 = 0x8863
-0x3062 = 0x8B02
-0x3063 = 0x9055
-0x3064 = 0x907A
-0x3065 = 0x533B
-0x3066 = 0x4E95
-0x3067 = 0x4EA5
-0x3068 = 0x57DF
-0x3069 = 0x80B2
-0x306A = 0x90C1
-0x306B = 0x78EF
-0x306C = 0x4E00
-0x306D = 0x58F1
-0x306E = 0x6EA2
-0x306F = 0x9038
-0x3070 = 0x7A32
-0x3071 = 0x8328
-0x3072 = 0x828B
-0x3073 = 0x9C2F
-0x3074 = 0x5141
-0x3075 = 0x5370
-0x3076 = 0x54BD
-0x3077 = 0x54E1
-0x3078 = 0x56E0
-0x3079 = 0x59FB
-0x307A = 0x5F15
-0x307B = 0x98F2
-0x307C = 0x6DEB
-0x307D = 0x80E4
-0x307E = 0x852D
-0x3121 = 0x9662
-0x3122 = 0x9670
-0x3123 = 0x96A0
-0x3124 = 0x97FB
-0x3125 = 0x540B
-0x3126 = 0x53F3
-0x3127 = 0x5B87
-0x3128 = 0x70CF
-0x3129 = 0x7FBD
-0x312A = 0x8FC2
-0x312B = 0x96E8
-0x312C = 0x536F
-0x312D = 0x9D5C
-0x312E = 0x7ABA
-0x312F = 0x4E11
-0x3130 = 0x7893
-0x3131 = 0x81FC
-0x3132 = 0x6E26
-0x3133 = 0x5618
-0x3134 = 0x5504
-0x3135 = 0x6B1D
-0x3136 = 0x851A
-0x3137 = 0x9C3B
-0x3138 = 0x59E5
-0x3139 = 0x53A9
-0x313A = 0x6D66
-0x313B = 0x74DC
-0x313C = 0x958F
-0x313D = 0x5642
-0x313E = 0x4E91
-0x313F = 0x904B
-0x3140 = 0x96F2
-0x3141 = 0x834F
-0x3142 = 0x990C
-0x3143 = 0x53E1
-0x3144 = 0x55B6
-0x3145 = 0x5B30
-0x3146 = 0x5F71
-0x3147 = 0x6620
-0x3148 = 0x66F3
-0x3149 = 0x6804
-0x314A = 0x6C38
-0x314B = 0x6CF3
-0x314C = 0x6D29
-0x314D = 0x745B
-0x314E = 0x76C8
-0x314F = 0x7A4E
-0x3150 = 0x9834
-0x3151 = 0x82F1
-0x3152 = 0x885B
-0x3153 = 0x8A60
-0x3154 = 0x92ED
-0x3155 = 0x6DB2
-0x3156 = 0x75AB
-0x3157 = 0x76CA
-0x3158 = 0x99C5
-0x3159 = 0x60A6
-0x315A = 0x8B01
-0x315B = 0x8D8A
-0x315C = 0x95B2
-0x315D = 0x698E
-0x315E = 0x53AD
-0x315F = 0x5186
-0x3160 = 0x5712
-0x3161 = 0x5830
-0x3162 = 0x5944
-0x3163 = 0x5BB4
-0x3164 = 0x5EF6
-0x3165 = 0x6028
-0x3166 = 0x63A9
-0x3167 = 0x63F4
-0x3168 = 0x6CBF
-0x3169 = 0x6F14
-0x316A = 0x708E
-0x316B = 0x7114
-0x316C = 0x7159
-0x316D = 0x71D5
-0x316E = 0x733F
-0x316F = 0x7E01
-0x3170 = 0x8276
-0x3171 = 0x82D1
-0x3172 = 0x8597
-0x3173 = 0x9060
-0x3174 = 0x925B
-0x3175 = 0x9D1B
-0x3176 = 0x5869
-0x3177 = 0x65BC
-0x3178 = 0x6C5A
-0x3179 = 0x7525
-0x317A = 0x51F9
-0x317B = 0x592E
-0x317C = 0x5965
-0x317D = 0x5F80
-0x317E = 0x5FDC
-0x3221 = 0x62BC
-0x3222 = 0x65FA
-0x3223 = 0x6A2A
-0x3224 = 0x6B27
-0x3225 = 0x6BB4
-0x3226 = 0x738B
-0x3227 = 0x7FC1
-0x3228 = 0x8956
-0x3229 = 0x9D2C
-0x322A = 0x9D0E
-0x322B = 0x9EC4
-0x322C = 0x5CA1
-0x322D = 0x6C96
-0x322E = 0x837B
-0x322F = 0x5104
-0x3230 = 0x5C4B
-0x3231 = 0x61B6
-0x3232 = 0x81C6
-0x3233 = 0x6876
-0x3234 = 0x7261
-0x3235 = 0x4E59
-0x3236 = 0x4FFA
-0x3237 = 0x5378
-0x3238 = 0x6069
-0x3239 = 0x6E29
-0x323A = 0x7A4F
-0x323B = 0x97F3
-0x323C = 0x4E0B
-0x323D = 0x5316
-0x323E = 0x4EEE
-0x323F = 0x4F55
-0x3240 = 0x4F3D
-0x3241 = 0x4FA1
-0x3242 = 0x4F73
-0x3243 = 0x52A0
-0x3244 = 0x53EF
-0x3245 = 0x5609
-0x3246 = 0x590F
-0x3247 = 0x5AC1
-0x3248 = 0x5BB6
-0x3249 = 0x5BE1
-0x324A = 0x79D1
-0x324B = 0x6687
-0x324C = 0x679C
-0x324D = 0x67B6
-0x324E = 0x6B4C
-0x324F = 0x6CB3
-0x3250 = 0x706B
-0x3251 = 0x73C2
-0x3252 = 0x798D
-0x3253 = 0x79BE
-0x3254 = 0x7A3C
-0x3255 = 0x7B87
-0x3256 = 0x82B1
-0x3257 = 0x82DB
-0x3258 = 0x8304
-0x3259 = 0x8377
-0x325A = 0x83EF
-0x325B = 0x83D3
-0x325C = 0x8766
-0x325D = 0x8AB2
-0x325E = 0x5629
-0x325F = 0x8CA8
-0x3260 = 0x8FE6
-0x3261 = 0x904E
-0x3262 = 0x971E
-0x3263 = 0x868A
-0x3264 = 0x4FC4
-0x3265 = 0x5CE8
-0x3266 = 0x6211
-0x3267 = 0x7259
-0x3268 = 0x753B
-0x3269 = 0x81E5
-0x326A = 0x82BD
-0x326B = 0x86FE
-0x326C = 0x8CC0
-0x326D = 0x96C5
-0x326E = 0x9913
-0x326F = 0x99D5
-0x3270 = 0x4ECB
-0x3271 = 0x4F1A
-0x3272 = 0x89E3
-0x3273 = 0x56DE
-0x3274 = 0x584A
-0x3275 = 0x58CA
-0x3276 = 0x5EFB
-0x3277 = 0x5FEB
-0x3278 = 0x602A
-0x3279 = 0x6094
-0x327A = 0x6062
-0x327B = 0x61D0
-0x327C = 0x6212
-0x327D = 0x62D0
-0x327E = 0x6539
-0x3321 = 0x9B41
-0x3322 = 0x6666
-0x3323 = 0x68B0
-0x3324 = 0x6D77
-0x3325 = 0x7070
-0x3326 = 0x754C
-0x3327 = 0x7686
-0x3328 = 0x7D75
-0x3329 = 0x82A5
-0x332A = 0x87F9
-0x332B = 0x958B
-0x332C = 0x968E
-0x332D = 0x8C9D
-0x332E = 0x51F1
-0x332F = 0x52BE
-0x3330 = 0x5916
-0x3331 = 0x54B3
-0x3332 = 0x5BB3
-0x3333 = 0x5D16
-0x3334 = 0x6168
-0x3335 = 0x6982
-0x3336 = 0x6DAF
-0x3337 = 0x788D
-0x3338 = 0x84CB
-0x3339 = 0x8857
-0x333A = 0x8A72
-0x333B = 0x93A7
-0x333C = 0x9AB8
-0x333D = 0x6D6C
-0x333E = 0x99A8
-0x333F = 0x86D9
-0x3340 = 0x57A3
-0x3341 = 0x67FF
-0x3342 = 0x86CE
-0x3343 = 0x920E
-0x3344 = 0x5283
-0x3345 = 0x5687
-0x3346 = 0x5404
-0x3347 = 0x5ED3
-0x3348 = 0x62E1
-0x3349 = 0x64B9
-0x334A = 0x683C
-0x334B = 0x6838
-0x334C = 0x6BBB
-0x334D = 0x7372
-0x334E = 0x78BA
-0x334F = 0x7A6B
-0x3350 = 0x899A
-0x3351 = 0x89D2
-0x3352 = 0x8D6B
-0x3353 = 0x8F03
-0x3354 = 0x90ED
-0x3355 = 0x95A3
-0x3356 = 0x9694
-0x3357 = 0x9769
-0x3358 = 0x5B66
-0x3359 = 0x5CB3
-0x335A = 0x697D
-0x335B = 0x984D
-0x335C = 0x984E
-0x335D = 0x639B
-0x335E = 0x7B20
-0x335F = 0x6A2B
-0x3360 = 0x6A7F
-0x3361 = 0x68B6
-0x3362 = 0x9C0D
-0x3363 = 0x6F5F
-0x3364 = 0x5272
-0x3365 = 0x559D
-0x3366 = 0x6070
-0x3367 = 0x62EC
-0x3368 = 0x6D3B
-0x3369 = 0x6E07
-0x336A = 0x6ED1
-0x336B = 0x845B
-0x336C = 0x8910
-0x336D = 0x8F44
-0x336E = 0x4E14
-0x336F = 0x9C39
-0x3370 = 0x53F6
-0x3371 = 0x691B
-0x3372 = 0x6A3A
-0x3373 = 0x9784
-0x3374 = 0x682A
-0x3375 = 0x515C
-0x3376 = 0x7AC3
-0x3377 = 0x84B2
-0x3378 = 0x91DC
-0x3379 = 0x938C
-0x337A = 0x565B
-0x337B = 0x9D28
-0x337C = 0x6822
-0x337D = 0x8305
-0x337E = 0x8431
-0x3421 = 0x7CA5
-0x3422 = 0x5208
-0x3423 = 0x82C5
-0x3424 = 0x74E6
-0x3425 = 0x4E7E
-0x3426 = 0x4F83
-0x3427 = 0x51A0
-0x3428 = 0x5BD2
-0x3429 = 0x520A
-0x342A = 0x52D8
-0x342B = 0x52E7
-0x342C = 0x5DFB
-0x342D = 0x559A
-0x342E = 0x582A
-0x342F = 0x59E6
-0x3430 = 0x5B8C
-0x3431 = 0x5B98
-0x3432 = 0x5BDB
-0x3433 = 0x5E72
-0x3434 = 0x5E79
-0x3435 = 0x60A3
-0x3436 = 0x611F
-0x3437 = 0x6163
-0x3438 = 0x61BE
-0x3439 = 0x63DB
-0x343A = 0x6562
-0x343B = 0x67D1
-0x343C = 0x6853
-0x343D = 0x68FA
-0x343E = 0x6B3E
-0x343F = 0x6B53
-0x3440 = 0x6C57
-0x3441 = 0x6F22
-0x3442 = 0x6F97
-0x3443 = 0x6F45
-0x3444 = 0x74B0
-0x3445 = 0x7518
-0x3446 = 0x76E3
-0x3447 = 0x770B
-0x3448 = 0x7AFF
-0x3449 = 0x7BA1
-0x344A = 0x7C21
-0x344B = 0x7DE9
-0x344C = 0x7F36
-0x344D = 0x7FF0
-0x344E = 0x809D
-0x344F = 0x8266
-0x3450 = 0x839E
-0x3451 = 0x89B3
-0x3452 = 0x8ACC
-0x3453 = 0x8CAB
-0x3454 = 0x9084
-0x3455 = 0x9451
-0x3456 = 0x9593
-0x3457 = 0x9591
-0x3458 = 0x95A2
-0x3459 = 0x9665
-0x345A = 0x97D3
-0x345B = 0x9928
-0x345C = 0x8218
-0x345D = 0x4E38
-0x345E = 0x542B
-0x345F = 0x5CB8
-0x3460 = 0x5DCC
-0x3461 = 0x73A9
-0x3462 = 0x764C
-0x3463 = 0x773C
-0x3464 = 0x5CA9
-0x3465 = 0x7FEB
-0x3466 = 0x8D0B
-0x3467 = 0x96C1
-0x3468 = 0x9811
-0x3469 = 0x9854
-0x346A = 0x9858
-0x346B = 0x4F01
-0x346C = 0x4F0E
-0x346D = 0x5371
-0x346E = 0x559C
-0x346F = 0x5668
-0x3470 = 0x57FA
-0x3471 = 0x5947
-0x3472 = 0x5B09
-0x3473 = 0x5BC4
-0x3474 = 0x5C90
-0x3475 = 0x5E0C
-0x3476 = 0x5E7E
-0x3477 = 0x5FCC
-0x3478 = 0x63EE
-0x3479 = 0x673A
-0x347A = 0x65D7
-0x347B = 0x65E2
-0x347C = 0x671F
-0x347D = 0x68CB
-0x347E = 0x68C4
-0x3521 = 0x6A5F
-0x3522 = 0x5E30
-0x3523 = 0x6BC5
-0x3524 = 0x6C17
-0x3525 = 0x6C7D
-0x3526 = 0x757F
-0x3527 = 0x7948
-0x3528 = 0x5B63
-0x3529 = 0x7A00
-0x352A = 0x7D00
-0x352B = 0x5FBD
-0x352C = 0x898F
-0x352D = 0x8A18
-0x352E = 0x8CB4
-0x352F = 0x8D77
-0x3530 = 0x8ECC
-0x3531 = 0x8F1D
-0x3532 = 0x98E2
-0x3533 = 0x9A0E
-0x3534 = 0x9B3C
-0x3535 = 0x4E80
-0x3536 = 0x507D
-0x3537 = 0x5100
-0x3538 = 0x5993
-0x3539 = 0x5B9C
-0x353A = 0x622F
-0x353B = 0x6280
-0x353C = 0x64EC
-0x353D = 0x6B3A
-0x353E = 0x72A0
-0x353F = 0x7591
-0x3540 = 0x7947
-0x3541 = 0x7FA9
-0x3542 = 0x87FB
-0x3543 = 0x8ABC
-0x3544 = 0x8B70
-0x3545 = 0x63AC
-0x3546 = 0x83CA
-0x3547 = 0x97A0
-0x3548 = 0x5409
-0x3549 = 0x5403
-0x354A = 0x55AB
-0x354B = 0x6854
-0x354C = 0x6A58
-0x354D = 0x8A70
-0x354E = 0x7827
-0x354F = 0x6775
-0x3550 = 0x9ECD
-0x3551 = 0x5374
-0x3552 = 0x5BA2
-0x3553 = 0x811A
-0x3554 = 0x8650
-0x3555 = 0x9006
-0x3556 = 0x4E18
-0x3557 = 0x4E45
-0x3558 = 0x4EC7
-0x3559 = 0x4F11
-0x355A = 0x53CA
-0x355B = 0x5438
-0x355C = 0x5BAE
-0x355D = 0x5F13
-0x355E = 0x6025
-0x355F = 0x6551
-0x3560 = 0x673D
-0x3561 = 0x6C42
-0x3562 = 0x6C72
-0x3563 = 0x6CE3
-0x3564 = 0x7078
-0x3565 = 0x7403
-0x3566 = 0x7A76
-0x3567 = 0x7AAE
-0x3568 = 0x7B08
-0x3569 = 0x7D1A
-0x356A = 0x7CFE
-0x356B = 0x7D66
-0x356C = 0x65E7
-0x356D = 0x725B
-0x356E = 0x53BB
-0x356F = 0x5C45
-0x3570 = 0x5DE8
-0x3571 = 0x62D2
-0x3572 = 0x62E0
-0x3573 = 0x6319
-0x3574 = 0x6E20
-0x3575 = 0x865A
-0x3576 = 0x8A31
-0x3577 = 0x8DDD
-0x3578 = 0x92F8
-0x3579 = 0x6F01
-0x357A = 0x79A6
-0x357B = 0x9B5A
-0x357C = 0x4EA8
-0x357D = 0x4EAB
-0x357E = 0x4EAC
-0x3621 = 0x4F9B
-0x3622 = 0x4FA0
-0x3623 = 0x50D1
-0x3624 = 0x5147
-0x3625 = 0x7AF6
-0x3626 = 0x5171
-0x3627 = 0x51F6
-0x3628 = 0x5354
-0x3629 = 0x5321
-0x362A = 0x537F
-0x362B = 0x53EB
-0x362C = 0x55AC
-0x362D = 0x5883
-0x362E = 0x5CE1
-0x362F = 0x5F37
-0x3630 = 0x5F4A
-0x3631 = 0x602F
-0x3632 = 0x6050
-0x3633 = 0x606D
-0x3634 = 0x631F
-0x3635 = 0x6559
-0x3636 = 0x6A4B
-0x3637 = 0x6CC1
-0x3638 = 0x72C2
-0x3639 = 0x72ED
-0x363A = 0x77EF
-0x363B = 0x80F8
-0x363C = 0x8105
-0x363D = 0x8208
-0x363E = 0x854E
-0x363F = 0x90F7
-0x3640 = 0x93E1
-0x3641 = 0x97FF
-0x3642 = 0x9957
-0x3643 = 0x9A5A
-0x3644 = 0x4EF0
-0x3645 = 0x51DD
-0x3646 = 0x5C2D
-0x3647 = 0x6681
-0x3648 = 0x696D
-0x3649 = 0x5C40
-0x364A = 0x66F2
-0x364B = 0x6975
-0x364C = 0x7389
-0x364D = 0x6850
-0x364E = 0x7C81
-0x364F = 0x50C5
-0x3650 = 0x52E4
-0x3651 = 0x5747
-0x3652 = 0x5DFE
-0x3653 = 0x9326
-0x3654 = 0x65A4
-0x3655 = 0x6B23
-0x3656 = 0x6B3D
-0x3657 = 0x7434
-0x3658 = 0x7981
-0x3659 = 0x79BD
-0x365A = 0x7B4B
-0x365B = 0x7DCA
-0x365C = 0x82B9
-0x365D = 0x83CC
-0x365E = 0x887F
-0x365F = 0x895F
-0x3660 = 0x8B39
-0x3661 = 0x8FD1
-0x3662 = 0x91D1
-0x3663 = 0x541F
-0x3664 = 0x9280
-0x3665 = 0x4E5D
-0x3666 = 0x5036
-0x3667 = 0x53E5
-0x3668 = 0x533A
-0x3669 = 0x72D7
-0x366A = 0x7396
-0x366B = 0x77E9
-0x366C = 0x82E6
-0x366D = 0x8EAF
-0x366E = 0x99C6
-0x366F = 0x99C8
-0x3670 = 0x99D2
-0x3671 = 0x5177
-0x3672 = 0x611A
-0x3673 = 0x865E
-0x3674 = 0x55B0
-0x3675 = 0x7A7A
-0x3676 = 0x5076
-0x3677 = 0x5BD3
-0x3678 = 0x9047
-0x3679 = 0x9685
-0x367A = 0x4E32
-0x367B = 0x6ADB
-0x367C = 0x91E7
-0x367D = 0x5C51
-0x367E = 0x5C48
-0x3721 = 0x6398
-0x3722 = 0x7A9F
-0x3723 = 0x6C93
-0x3724 = 0x9774
-0x3725 = 0x8F61
-0x3726 = 0x7AAA
-0x3727 = 0x718A
-0x3728 = 0x9688
-0x3729 = 0x7C82
-0x372A = 0x6817
-0x372B = 0x7E70
-0x372C = 0x6851
-0x372D = 0x936C
-0x372E = 0x52F2
-0x372F = 0x541B
-0x3730 = 0x85AB
-0x3731 = 0x8A13
-0x3732 = 0x7FA4
-0x3733 = 0x8ECD
-0x3734 = 0x90E1
-0x3735 = 0x5366
-0x3736 = 0x8888
-0x3737 = 0x7941
-0x3738 = 0x4FC2
-0x3739 = 0x50BE
-0x373A = 0x5211
-0x373B = 0x5144
-0x373C = 0x5553
-0x373D = 0x572D
-0x373E = 0x73EA
-0x373F = 0x578B
-0x3740 = 0x5951
-0x3741 = 0x5F62
-0x3742 = 0x5F84
-0x3743 = 0x6075
-0x3744 = 0x6176
-0x3745 = 0x6167
-0x3746 = 0x61A9
-0x3747 = 0x63B2
-0x3748 = 0x643A
-0x3749 = 0x656C
-0x374A = 0x666F
-0x374B = 0x6842
-0x374C = 0x6E13
-0x374D = 0x7566
-0x374E = 0x7A3D
-0x374F = 0x7CFB
-0x3750 = 0x7D4C
-0x3751 = 0x7D99
-0x3752 = 0x7E4B
-0x3753 = 0x7F6B
-0x3754 = 0x830E
-0x3755 = 0x834A
-0x3756 = 0x86CD
-0x3757 = 0x8A08
-0x3758 = 0x8A63
-0x3759 = 0x8B66
-0x375A = 0x8EFD
-0x375B = 0x981A
-0x375C = 0x9D8F
-0x375D = 0x82B8
-0x375E = 0x8FCE
-0x375F = 0x9BE8
-0x3760 = 0x5287
-0x3761 = 0x621F
-0x3762 = 0x6483
-0x3763 = 0x6FC0
-0x3764 = 0x9699
-0x3765 = 0x6841
-0x3766 = 0x5091
-0x3767 = 0x6B20
-0x3768 = 0x6C7A
-0x3769 = 0x6F54
-0x376A = 0x7A74
-0x376B = 0x7D50
-0x376C = 0x8840
-0x376D = 0x8A23
-0x376E = 0x6708
-0x376F = 0x4EF6
-0x3770 = 0x5039
-0x3771 = 0x5026
-0x3772 = 0x5065
-0x3773 = 0x517C
-0x3774 = 0x5238
-0x3775 = 0x5263
-0x3776 = 0x55A7
-0x3777 = 0x570F
-0x3778 = 0x5805
-0x3779 = 0x5ACC
-0x377A = 0x5EFA
-0x377B = 0x61B2
-0x377C = 0x61F8
-0x377D = 0x62F3
-0x377E = 0x6372
-0x3821 = 0x691C
-0x3822 = 0x6A29
-0x3823 = 0x727D
-0x3824 = 0x72AC
-0x3825 = 0x732E
-0x3826 = 0x7814
-0x3827 = 0x786F
-0x3828 = 0x7D79
-0x3829 = 0x770C
-0x382A = 0x80A9
-0x382B = 0x898B
-0x382C = 0x8B19
-0x382D = 0x8CE2
-0x382E = 0x8ED2
-0x382F = 0x9063
-0x3830 = 0x9375
-0x3831 = 0x967A
-0x3832 = 0x9855
-0x3833 = 0x9A13
-0x3834 = 0x9E78
-0x3835 = 0x5143
-0x3836 = 0x539F
-0x3837 = 0x53B3
-0x3838 = 0x5E7B
-0x3839 = 0x5F26
-0x383A = 0x6E1B
-0x383B = 0x6E90
-0x383C = 0x7384
-0x383D = 0x73FE
-0x383E = 0x7D43
-0x383F = 0x8237
-0x3840 = 0x8A00
-0x3841 = 0x8AFA
-0x3842 = 0x9650
-0x3843 = 0x4E4E
-0x3844 = 0x500B
-0x3845 = 0x53E4
-0x3846 = 0x547C
-0x3847 = 0x56FA
-0x3848 = 0x59D1
-0x3849 = 0x5B64
-0x384A = 0x5DF1
-0x384B = 0x5EAB
-0x384C = 0x5F27
-0x384D = 0x6238
-0x384E = 0x6545
-0x384F = 0x67AF
-0x3850 = 0x6E56
-0x3851 = 0x72D0
-0x3852 = 0x7CCA
-0x3853 = 0x88B4
-0x3854 = 0x80A1
-0x3855 = 0x80E1
-0x3856 = 0x83F0
-0x3857 = 0x864E
-0x3858 = 0x8A87
-0x3859 = 0x8DE8
-0x385A = 0x9237
-0x385B = 0x96C7
-0x385C = 0x9867
-0x385D = 0x9F13
-0x385E = 0x4E94
-0x385F = 0x4E92
-0x3860 = 0x4F0D
-0x3861 = 0x5348
-0x3862 = 0x5449
-0x3863 = 0x543E
-0x3864 = 0x5A2F
-0x3865 = 0x5F8C
-0x3866 = 0x5FA1
-0x3867 = 0x609F
-0x3868 = 0x68A7
-0x3869 = 0x6A8E
-0x386A = 0x745A
-0x386B = 0x7881
-0x386C = 0x8A9E
-0x386D = 0x8AA4
-0x386E = 0x8B77
-0x386F = 0x9190
-0x3870 = 0x4E5E
-0x3871 = 0x9BC9
-0x3872 = 0x4EA4
-0x3873 = 0x4F7C
-0x3874 = 0x4FAF
-0x3875 = 0x5019
-0x3876 = 0x5016
-0x3877 = 0x5149
-0x3878 = 0x516C
-0x3879 = 0x529F
-0x387A = 0x52B9
-0x387B = 0x52FE
-0x387C = 0x539A
-0x387D = 0x53E3
-0x387E = 0x5411
-0x3921 = 0x540E
-0x3922 = 0x5589
-0x3923 = 0x5751
-0x3924 = 0x57A2
-0x3925 = 0x597D
-0x3926 = 0x5B54
-0x3927 = 0x5B5D
-0x3928 = 0x5B8F
-0x3929 = 0x5DE5
-0x392A = 0x5DE7
-0x392B = 0x5DF7
-0x392C = 0x5E78
-0x392D = 0x5E83
-0x392E = 0x5E9A
-0x392F = 0x5EB7
-0x3930 = 0x5F18
-0x3931 = 0x6052
-0x3932 = 0x614C
-0x3933 = 0x6297
-0x3934 = 0x62D8
-0x3935 = 0x63A7
-0x3936 = 0x653B
-0x3937 = 0x6602
-0x3938 = 0x6643
-0x3939 = 0x66F4
-0x393A = 0x676D
-0x393B = 0x6821
-0x393C = 0x6897
-0x393D = 0x69CB
-0x393E = 0x6C5F
-0x393F = 0x6D2A
-0x3940 = 0x6D69
-0x3941 = 0x6E2F
-0x3942 = 0x6E9D
-0x3943 = 0x7532
-0x3944 = 0x7687
-0x3945 = 0x786C
-0x3946 = 0x7A3F
-0x3947 = 0x7CE0
-0x3948 = 0x7D05
-0x3949 = 0x7D18
-0x394A = 0x7D5E
-0x394B = 0x7DB1
-0x394C = 0x8015
-0x394D = 0x8003
-0x394E = 0x80AF
-0x394F = 0x80B1
-0x3950 = 0x8154
-0x3951 = 0x818F
-0x3952 = 0x822A
-0x3953 = 0x8352
-0x3954 = 0x884C
-0x3955 = 0x8861
-0x3956 = 0x8B1B
-0x3957 = 0x8CA2
-0x3958 = 0x8CFC
-0x3959 = 0x90CA
-0x395A = 0x9175
-0x395B = 0x9271
-0x395C = 0x783F
-0x395D = 0x92FC
-0x395E = 0x95A4
-0x395F = 0x964D
-0x3960 = 0x9805
-0x3961 = 0x9999
-0x3962 = 0x9AD8
-0x3963 = 0x9D3B
-0x3964 = 0x525B
-0x3965 = 0x52AB
-0x3966 = 0x53F7
-0x3967 = 0x5408
-0x3968 = 0x58D5
-0x3969 = 0x62F7
-0x396A = 0x6FE0
-0x396B = 0x8C6A
-0x396C = 0x8F5F
-0x396D = 0x9EB9
-0x396E = 0x514B
-0x396F = 0x523B
-0x3970 = 0x544A
-0x3971 = 0x56FD
-0x3972 = 0x7A40
-0x3973 = 0x9177
-0x3974 = 0x9D60
-0x3975 = 0x9ED2
-0x3976 = 0x7344
-0x3977 = 0x6F09
-0x3978 = 0x8170
-0x3979 = 0x7511
-0x397A = 0x5FFD
-0x397B = 0x60DA
-0x397C = 0x9AA8
-0x397D = 0x72DB
-0x397E = 0x8FBC
-0x3A21 = 0x6B64
-0x3A22 = 0x9803
-0x3A23 = 0x4ECA
-0x3A24 = 0x56F0
-0x3A25 = 0x5764
-0x3A26 = 0x58BE
-0x3A27 = 0x5A5A
-0x3A28 = 0x6068
-0x3A29 = 0x61C7
-0x3A2A = 0x660F
-0x3A2B = 0x6606
-0x3A2C = 0x6839
-0x3A2D = 0x68B1
-0x3A2E = 0x6DF7
-0x3A2F = 0x75D5
-0x3A30 = 0x7D3A
-0x3A31 = 0x826E
-0x3A32 = 0x9B42
-0x3A33 = 0x4E9B
-0x3A34 = 0x4F50
-0x3A35 = 0x53C9
-0x3A36 = 0x5506
-0x3A37 = 0x5D6F
-0x3A38 = 0x5DE6
-0x3A39 = 0x5DEE
-0x3A3A = 0x67FB
-0x3A3B = 0x6C99
-0x3A3C = 0x7473
-0x3A3D = 0x7802
-0x3A3E = 0x8A50
-0x3A3F = 0x9396
-0x3A40 = 0x88DF
-0x3A41 = 0x5750
-0x3A42 = 0x5EA7
-0x3A43 = 0x632B
-0x3A44 = 0x50B5
-0x3A45 = 0x50AC
-0x3A46 = 0x518D
-0x3A47 = 0x6700
-0x3A48 = 0x54C9
-0x3A49 = 0x585E
-0x3A4A = 0x59BB
-0x3A4B = 0x5BB0
-0x3A4C = 0x5F69
-0x3A4D = 0x624D
-0x3A4E = 0x63A1
-0x3A4F = 0x683D
-0x3A50 = 0x6B73
-0x3A51 = 0x6E08
-0x3A52 = 0x707D
-0x3A53 = 0x91C7
-0x3A54 = 0x7280
-0x3A55 = 0x7815
-0x3A56 = 0x7826
-0x3A57 = 0x796D
-0x3A58 = 0x658E
-0x3A59 = 0x7D30
-0x3A5A = 0x83DC
-0x3A5B = 0x88C1
-0x3A5C = 0x8F09
-0x3A5D = 0x969B
-0x3A5E = 0x5264
-0x3A5F = 0x5728
-0x3A60 = 0x6750
-0x3A61 = 0x7F6A
-0x3A62 = 0x8CA1
-0x3A63 = 0x51B4
-0x3A64 = 0x5742
-0x3A65 = 0x962A
-0x3A66 = 0x583A
-0x3A67 = 0x698A
-0x3A68 = 0x80B4
-0x3A69 = 0x54B2
-0x3A6A = 0x5D0E
-0x3A6B = 0x57FC
-0x3A6C = 0x7895
-0x3A6D = 0x9DFA
-0x3A6E = 0x4F5C
-0x3A6F = 0x524A
-0x3A70 = 0x548B
-0x3A71 = 0x643E
-0x3A72 = 0x6628
-0x3A73 = 0x6714
-0x3A74 = 0x67F5
-0x3A75 = 0x7A84
-0x3A76 = 0x7B56
-0x3A77 = 0x7D22
-0x3A78 = 0x932F
-0x3A79 = 0x685C
-0x3A7A = 0x9BAD
-0x3A7B = 0x7B39
-0x3A7C = 0x5319
-0x3A7D = 0x518A
-0x3A7E = 0x5237
-0x3B21 = 0x5BDF
-0x3B22 = 0x62F6
-0x3B23 = 0x64AE
-0x3B24 = 0x64E6
-0x3B25 = 0x672D
-0x3B26 = 0x6BBA
-0x3B27 = 0x85A9
-0x3B28 = 0x96D1
-0x3B29 = 0x7690
-0x3B2A = 0x9BD6
-0x3B2B = 0x634C
-0x3B2C = 0x9306
-0x3B2D = 0x9BAB
-0x3B2E = 0x76BF
-0x3B2F = 0x6652
-0x3B30 = 0x4E09
-0x3B31 = 0x5098
-0x3B32 = 0x53C2
-0x3B33 = 0x5C71
-0x3B34 = 0x60E8
-0x3B35 = 0x6492
-0x3B36 = 0x6563
-0x3B37 = 0x685F
-0x3B38 = 0x71E6
-0x3B39 = 0x73CA
-0x3B3A = 0x7523
-0x3B3B = 0x7B97
-0x3B3C = 0x7E82
-0x3B3D = 0x8695
-0x3B3E = 0x8B83
-0x3B3F = 0x8CDB
-0x3B40 = 0x9178
-0x3B41 = 0x9910
-0x3B42 = 0x65AC
-0x3B43 = 0x66AB
-0x3B44 = 0x6B8B
-0x3B45 = 0x4ED5
-0x3B46 = 0x4ED4
-0x3B47 = 0x4F3A
-0x3B48 = 0x4F7F
-0x3B49 = 0x523A
-0x3B4A = 0x53F8
-0x3B4B = 0x53F2
-0x3B4C = 0x55E3
-0x3B4D = 0x56DB
-0x3B4E = 0x58EB
-0x3B4F = 0x59CB
-0x3B50 = 0x59C9
-0x3B51 = 0x59FF
-0x3B52 = 0x5B50
-0x3B53 = 0x5C4D
-0x3B54 = 0x5E02
-0x3B55 = 0x5E2B
-0x3B56 = 0x5FD7
-0x3B57 = 0x601D
-0x3B58 = 0x6307
-0x3B59 = 0x652F
-0x3B5A = 0x5B5C
-0x3B5B = 0x65AF
-0x3B5C = 0x65BD
-0x3B5D = 0x65E8
-0x3B5E = 0x679D
-0x3B5F = 0x6B62
-0x3B60 = 0x6B7B
-0x3B61 = 0x6C0F
-0x3B62 = 0x7345
-0x3B63 = 0x7949
-0x3B64 = 0x79C1
-0x3B65 = 0x7CF8
-0x3B66 = 0x7D19
-0x3B67 = 0x7D2B
-0x3B68 = 0x80A2
-0x3B69 = 0x8102
-0x3B6A = 0x81F3
-0x3B6B = 0x8996
-0x3B6C = 0x8A5E
-0x3B6D = 0x8A69
-0x3B6E = 0x8A66
-0x3B6F = 0x8A8C
-0x3B70 = 0x8AEE
-0x3B71 = 0x8CC7
-0x3B72 = 0x8CDC
-0x3B73 = 0x96CC
-0x3B74 = 0x98FC
-0x3B75 = 0x6B6F
-0x3B76 = 0x4E8B
-0x3B77 = 0x4F3C
-0x3B78 = 0x4F8D
-0x3B79 = 0x5150
-0x3B7A = 0x5B57
-0x3B7B = 0x5BFA
-0x3B7C = 0x6148
-0x3B7D = 0x6301
-0x3B7E = 0x6642
-0x3C21 = 0x6B21
-0x3C22 = 0x6ECB
-0x3C23 = 0x6CBB
-0x3C24 = 0x723E
-0x3C25 = 0x74BD
-0x3C26 = 0x75D4
-0x3C27 = 0x78C1
-0x3C28 = 0x793A
-0x3C29 = 0x800C
-0x3C2A = 0x8033
-0x3C2B = 0x81EA
-0x3C2C = 0x8494
-0x3C2D = 0x8F9E
-0x3C2E = 0x6C50
-0x3C2F = 0x9E7F
-0x3C30 = 0x5F0F
-0x3C31 = 0x8B58
-0x3C32 = 0x9D2B
-0x3C33 = 0x7AFA
-0x3C34 = 0x8EF8
-0x3C35 = 0x5B8D
-0x3C36 = 0x96EB
-0x3C37 = 0x4E03
-0x3C38 = 0x53F1
-0x3C39 = 0x57F7
-0x3C3A = 0x5931
-0x3C3B = 0x5AC9
-0x3C3C = 0x5BA4
-0x3C3D = 0x6089
-0x3C3E = 0x6E7F
-0x3C3F = 0x6F06
-0x3C40 = 0x75BE
-0x3C41 = 0x8CEA
-0x3C42 = 0x5B9F
-0x3C43 = 0x8500
-0x3C44 = 0x7BE0
-0x3C45 = 0x5072
-0x3C46 = 0x67F4
-0x3C47 = 0x829D
-0x3C48 = 0x5C61
-0x3C49 = 0x854A
-0x3C4A = 0x7E1E
-0x3C4B = 0x820E
-0x3C4C = 0x5199
-0x3C4D = 0x5C04
-0x3C4E = 0x6368
-0x3C4F = 0x8D66
-0x3C50 = 0x659C
-0x3C51 = 0x716E
-0x3C52 = 0x793E
-0x3C53 = 0x7D17
-0x3C54 = 0x8005
-0x3C55 = 0x8B1D
-0x3C56 = 0x8ECA
-0x3C57 = 0x906E
-0x3C58 = 0x86C7
-0x3C59 = 0x90AA
-0x3C5A = 0x501F
-0x3C5B = 0x52FA
-0x3C5C = 0x5C3A
-0x3C5D = 0x6753
-0x3C5E = 0x707C
-0x3C5F = 0x7235
-0x3C60 = 0x914C
-0x3C61 = 0x91C8
-0x3C62 = 0x932B
-0x3C63 = 0x82E5
-0x3C64 = 0x5BC2
-0x3C65 = 0x5F31
-0x3C66 = 0x60F9
-0x3C67 = 0x4E3B
-0x3C68 = 0x53D6
-0x3C69 = 0x5B88
-0x3C6A = 0x624B
-0x3C6B = 0x6731
-0x3C6C = 0x6B8A
-0x3C6D = 0x72E9
-0x3C6E = 0x73E0
-0x3C6F = 0x7A2E
-0x3C70 = 0x816B
-0x3C71 = 0x8DA3
-0x3C72 = 0x9152
-0x3C73 = 0x9996
-0x3C74 = 0x5112
-0x3C75 = 0x53D7
-0x3C76 = 0x546A
-0x3C77 = 0x5BFF
-0x3C78 = 0x6388
-0x3C79 = 0x6A39
-0x3C7A = 0x7DAC
-0x3C7B = 0x9700
-0x3C7C = 0x56DA
-0x3C7D = 0x53CE
-0x3C7E = 0x5468
-0x3D21 = 0x5B97
-0x3D22 = 0x5C31
-0x3D23 = 0x5DDE
-0x3D24 = 0x4FEE
-0x3D25 = 0x6101
-0x3D26 = 0x62FE
-0x3D27 = 0x6D32
-0x3D28 = 0x79C0
-0x3D29 = 0x79CB
-0x3D2A = 0x7D42
-0x3D2B = 0x7E4D
-0x3D2C = 0x7FD2
-0x3D2D = 0x81ED
-0x3D2E = 0x821F
-0x3D2F = 0x8490
-0x3D30 = 0x8846
-0x3D31 = 0x8972
-0x3D32 = 0x8B90
-0x3D33 = 0x8E74
-0x3D34 = 0x8F2F
-0x3D35 = 0x9031
-0x3D36 = 0x914B
-0x3D37 = 0x916C
-0x3D38 = 0x96C6
-0x3D39 = 0x919C
-0x3D3A = 0x4EC0
-0x3D3B = 0x4F4F
-0x3D3C = 0x5145
-0x3D3D = 0x5341
-0x3D3E = 0x5F93
-0x3D3F = 0x620E
-0x3D40 = 0x67D4
-0x3D41 = 0x6C41
-0x3D42 = 0x6E0B
-0x3D43 = 0x7363
-0x3D44 = 0x7E26
-0x3D45 = 0x91CD
-0x3D46 = 0x9283
-0x3D47 = 0x53D4
-0x3D48 = 0x5919
-0x3D49 = 0x5BBF
-0x3D4A = 0x6DD1
-0x3D4B = 0x795D
-0x3D4C = 0x7E2E
-0x3D4D = 0x7C9B
-0x3D4E = 0x587E
-0x3D4F = 0x719F
-0x3D50 = 0x51FA
-0x3D51 = 0x8853
-0x3D52 = 0x8FF0
-0x3D53 = 0x4FCA
-0x3D54 = 0x5CFB
-0x3D55 = 0x6625
-0x3D56 = 0x77AC
-0x3D57 = 0x7AE3
-0x3D58 = 0x821C
-0x3D59 = 0x99FF
-0x3D5A = 0x51C6
-0x3D5B = 0x5FAA
-0x3D5C = 0x65EC
-0x3D5D = 0x696F
-0x3D5E = 0x6B89
-0x3D5F = 0x6DF3
-0x3D60 = 0x6E96
-0x3D61 = 0x6F64
-0x3D62 = 0x76FE
-0x3D63 = 0x7D14
-0x3D64 = 0x5DE1
-0x3D65 = 0x9075
-0x3D66 = 0x9187
-0x3D67 = 0x9806
-0x3D68 = 0x51E6
-0x3D69 = 0x521D
-0x3D6A = 0x6240
-0x3D6B = 0x6691
-0x3D6C = 0x66D9
-0x3D6D = 0x6E1A
-0x3D6E = 0x5EB6
-0x3D6F = 0x7DD2
-0x3D70 = 0x7F72
-0x3D71 = 0x66F8
-0x3D72 = 0x85AF
-0x3D73 = 0x85F7
-0x3D74 = 0x8AF8
-0x3D75 = 0x52A9
-0x3D76 = 0x53D9
-0x3D77 = 0x5973
-0x3D78 = 0x5E8F
-0x3D79 = 0x5F90
-0x3D7A = 0x6055
-0x3D7B = 0x92E4
-0x3D7C = 0x9664
-0x3D7D = 0x50B7
-0x3D7E = 0x511F
-0x3E21 = 0x52DD
-0x3E22 = 0x5320
-0x3E23 = 0x5347
-0x3E24 = 0x53EC
-0x3E25 = 0x54E8
-0x3E26 = 0x5546
-0x3E27 = 0x5531
-0x3E28 = 0x5617
-0x3E29 = 0x5968
-0x3E2A = 0x59BE
-0x3E2B = 0x5A3C
-0x3E2C = 0x5BB5
-0x3E2D = 0x5C06
-0x3E2E = 0x5C0F
-0x3E2F = 0x5C11
-0x3E30 = 0x5C1A
-0x3E31 = 0x5E84
-0x3E32 = 0x5E8A
-0x3E33 = 0x5EE0
-0x3E34 = 0x5F70
-0x3E35 = 0x627F
-0x3E36 = 0x6284
-0x3E37 = 0x62DB
-0x3E38 = 0x638C
-0x3E39 = 0x6377
-0x3E3A = 0x6607
-0x3E3B = 0x660C
-0x3E3C = 0x662D
-0x3E3D = 0x6676
-0x3E3E = 0x677E
-0x3E3F = 0x68A2
-0x3E40 = 0x6A1F
-0x3E41 = 0x6A35
-0x3E42 = 0x6CBC
-0x3E43 = 0x6D88
-0x3E44 = 0x6E09
-0x3E45 = 0x6E58
-0x3E46 = 0x713C
-0x3E47 = 0x7126
-0x3E48 = 0x7167
-0x3E49 = 0x75C7
-0x3E4A = 0x7701
-0x3E4B = 0x785D
-0x3E4C = 0x7901
-0x3E4D = 0x7965
-0x3E4E = 0x79F0
-0x3E4F = 0x7AE0
-0x3E50 = 0x7B11
-0x3E51 = 0x7CA7
-0x3E52 = 0x7D39
-0x3E53 = 0x8096
-0x3E54 = 0x83D6
-0x3E55 = 0x848B
-0x3E56 = 0x8549
-0x3E57 = 0x885D
-0x3E58 = 0x88F3
-0x3E59 = 0x8A1F
-0x3E5A = 0x8A3C
-0x3E5B = 0x8A54
-0x3E5C = 0x8A73
-0x3E5D = 0x8C61
-0x3E5E = 0x8CDE
-0x3E5F = 0x91A4
-0x3E60 = 0x9266
-0x3E61 = 0x937E
-0x3E62 = 0x9418
-0x3E63 = 0x969C
-0x3E64 = 0x9798
-0x3E65 = 0x4E0A
-0x3E66 = 0x4E08
-0x3E67 = 0x4E1E
-0x3E68 = 0x4E57
-0x3E69 = 0x5197
-0x3E6A = 0x5270
-0x3E6B = 0x57CE
-0x3E6C = 0x5834
-0x3E6D = 0x58CC
-0x3E6E = 0x5B22
-0x3E6F = 0x5E38
-0x3E70 = 0x60C5
-0x3E71 = 0x64FE
-0x3E72 = 0x6761
-0x3E73 = 0x6756
-0x3E74 = 0x6D44
-0x3E75 = 0x72B6
-0x3E76 = 0x7573
-0x3E77 = 0x7A63
-0x3E78 = 0x84B8
-0x3E79 = 0x8B72
-0x3E7A = 0x91B8
-0x3E7B = 0x9320
-0x3E7C = 0x5631
-0x3E7D = 0x57F4
-0x3E7E = 0x98FE
-0x3F21 = 0x62ED
-0x3F22 = 0x690D
-0x3F23 = 0x6B96
-0x3F24 = 0x71ED
-0x3F25 = 0x7E54
-0x3F26 = 0x8077
-0x3F27 = 0x8272
-0x3F28 = 0x89E6
-0x3F29 = 0x98DF
-0x3F2A = 0x8755
-0x3F2B = 0x8FB1
-0x3F2C = 0x5C3B
-0x3F2D = 0x4F38
-0x3F2E = 0x4FE1
-0x3F2F = 0x4FB5
-0x3F30 = 0x5507
-0x3F31 = 0x5A20
-0x3F32 = 0x5BDD
-0x3F33 = 0x5BE9
-0x3F34 = 0x5FC3
-0x3F35 = 0x614E
-0x3F36 = 0x632F
-0x3F37 = 0x65B0
-0x3F38 = 0x664B
-0x3F39 = 0x68EE
-0x3F3A = 0x699B
-0x3F3B = 0x6D78
-0x3F3C = 0x6DF1
-0x3F3D = 0x7533
-0x3F3E = 0x75B9
-0x3F3F = 0x771F
-0x3F40 = 0x795E
-0x3F41 = 0x79E6
-0x3F42 = 0x7D33
-0x3F43 = 0x81E3
-0x3F44 = 0x82AF
-0x3F45 = 0x85AA
-0x3F46 = 0x89AA
-0x3F47 = 0x8A3A
-0x3F48 = 0x8EAB
-0x3F49 = 0x8F9B
-0x3F4A = 0x9032
-0x3F4B = 0x91DD
-0x3F4C = 0x9707
-0x3F4D = 0x4EBA
-0x3F4E = 0x4EC1
-0x3F4F = 0x5203
-0x3F50 = 0x5875
-0x3F51 = 0x58EC
-0x3F52 = 0x5C0B
-0x3F53 = 0x751A
-0x3F54 = 0x5C3D
-0x3F55 = 0x814E
-0x3F56 = 0x8A0A
-0x3F57 = 0x8FC5
-0x3F58 = 0x9663
-0x3F59 = 0x976D
-0x3F5A = 0x7B25
-0x3F5B = 0x8ACF
-0x3F5C = 0x9808
-0x3F5D = 0x9162
-0x3F5E = 0x56F3
-0x3F5F = 0x53A8
-0x3F60 = 0x9017
-0x3F61 = 0x5439
-0x3F62 = 0x5782
-0x3F63 = 0x5E25
-0x3F64 = 0x63A8
-0x3F65 = 0x6C34
-0x3F66 = 0x708A
-0x3F67 = 0x7761
-0x3F68 = 0x7C8B
-0x3F69 = 0x7FE0
-0x3F6A = 0x8870
-0x3F6B = 0x9042
-0x3F6C = 0x9154
-0x3F6D = 0x9310
-0x3F6E = 0x9318
-0x3F6F = 0x968F
-0x3F70 = 0x745E
-0x3F71 = 0x9AC4
-0x3F72 = 0x5D07
-0x3F73 = 0x5D69
-0x3F74 = 0x6570
-0x3F75 = 0x67A2
-0x3F76 = 0x8DA8
-0x3F77 = 0x96DB
-0x3F78 = 0x636E
-0x3F79 = 0x6749
-0x3F7A = 0x6919
-0x3F7B = 0x83C5
-0x3F7C = 0x9817
-0x3F7D = 0x96C0
-0x3F7E = 0x88FE
-0x4021 = 0x6F84
-0x4022 = 0x647A
-0x4023 = 0x5BF8
-0x4024 = 0x4E16
-0x4025 = 0x702C
-0x4026 = 0x755D
-0x4027 = 0x662F
-0x4028 = 0x51C4
-0x4029 = 0x5236
-0x402A = 0x52E2
-0x402B = 0x59D3
-0x402C = 0x5F81
-0x402D = 0x6027
-0x402E = 0x6210
-0x402F = 0x653F
-0x4030 = 0x6574
-0x4031 = 0x661F
-0x4032 = 0x6674
-0x4033 = 0x68F2
-0x4034 = 0x6816
-0x4035 = 0x6B63
-0x4036 = 0x6E05
-0x4037 = 0x7272
-0x4038 = 0x751F
-0x4039 = 0x76DB
-0x403A = 0x7CBE
-0x403B = 0x8056
-0x403C = 0x58F0
-0x403D = 0x88FD
-0x403E = 0x897F
-0x403F = 0x8AA0
-0x4040 = 0x8A93
-0x4041 = 0x8ACB
-0x4042 = 0x901D
-0x4043 = 0x9192
-0x4044 = 0x9752
-0x4045 = 0x9759
-0x4046 = 0x6589
-0x4047 = 0x7A0E
-0x4048 = 0x8106
-0x4049 = 0x96BB
-0x404A = 0x5E2D
-0x404B = 0x60DC
-0x404C = 0x621A
-0x404D = 0x65A5
-0x404E = 0x6614
-0x404F = 0x6790
-0x4050 = 0x77F3
-0x4051 = 0x7A4D
-0x4052 = 0x7C4D
-0x4053 = 0x7E3E
-0x4054 = 0x810A
-0x4055 = 0x8CAC
-0x4056 = 0x8D64
-0x4057 = 0x8DE1
-0x4058 = 0x8E5F
-0x4059 = 0x78A9
-0x405A = 0x5207
-0x405B = 0x62D9
-0x405C = 0x63A5
-0x405D = 0x6442
-0x405E = 0x6298
-0x405F = 0x8A2D
-0x4060 = 0x7A83
-0x4061 = 0x7BC0
-0x4062 = 0x8AAC
-0x4063 = 0x96EA
-0x4064 = 0x7D76
-0x4065 = 0x820C
-0x4066 = 0x8749
-0x4067 = 0x4ED9
-0x4068 = 0x5148
-0x4069 = 0x5343
-0x406A = 0x5360
-0x406B = 0x5BA3
-0x406C = 0x5C02
-0x406D = 0x5C16
-0x406E = 0x5DDD
-0x406F = 0x6226
-0x4070 = 0x6247
-0x4071 = 0x64B0
-0x4072 = 0x6813
-0x4073 = 0x6834
-0x4074 = 0x6CC9
-0x4075 = 0x6D45
-0x4076 = 0x6D17
-0x4077 = 0x67D3
-0x4078 = 0x6F5C
-0x4079 = 0x714E
-0x407A = 0x717D
-0x407B = 0x65CB
-0x407C = 0x7A7F
-0x407D = 0x7BAD
-0x407E = 0x7DDA
-0x4121 = 0x7E4A
-0x4122 = 0x7FA8
-0x4123 = 0x817A
-0x4124 = 0x821B
-0x4125 = 0x8239
-0x4126 = 0x85A6
-0x4127 = 0x8A6E
-0x4128 = 0x8CCE
-0x4129 = 0x8DF5
-0x412A = 0x9078
-0x412B = 0x9077
-0x412C = 0x92AD
-0x412D = 0x9291
-0x412E = 0x9583
-0x412F = 0x9BAE
-0x4130 = 0x524D
-0x4131 = 0x5584
-0x4132 = 0x6F38
-0x4133 = 0x7136
-0x4134 = 0x5168
-0x4135 = 0x7985
-0x4136 = 0x7E55
-0x4137 = 0x81B3
-0x4138 = 0x7CCE
-0x4139 = 0x564C
-0x413A = 0x5851
-0x413B = 0x5CA8
-0x413C = 0x63AA
-0x413D = 0x66FE
-0x413E = 0x66FD
-0x413F = 0x695A
-0x4140 = 0x72D9
-0x4141 = 0x758F
-0x4142 = 0x758E
-0x4143 = 0x790E
-0x4144 = 0x7956
-0x4145 = 0x79DF
-0x4146 = 0x7C97
-0x4147 = 0x7D20
-0x4148 = 0x7D44
-0x4149 = 0x8607
-0x414A = 0x8A34
-0x414B = 0x963B
-0x414C = 0x9061
-0x414D = 0x9F20
-0x414E = 0x50E7
-0x414F = 0x5275
-0x4150 = 0x53CC
-0x4151 = 0x53E2
-0x4152 = 0x5009
-0x4153 = 0x55AA
-0x4154 = 0x58EE
-0x4155 = 0x594F
-0x4156 = 0x723D
-0x4157 = 0x5B8B
-0x4158 = 0x5C64
-0x4159 = 0x531D
-0x415A = 0x60E3
-0x415B = 0x60F3
-0x415C = 0x635C
-0x415D = 0x6383
-0x415E = 0x633F
-0x415F = 0x63BB
-0x4160 = 0x64CD
-0x4161 = 0x65E9
-0x4162 = 0x66F9
-0x4163 = 0x5DE3
-0x4164 = 0x69CD
-0x4165 = 0x69FD
-0x4166 = 0x6F15
-0x4167 = 0x71E5
-0x4168 = 0x4E89
-0x4169 = 0x75E9
-0x416A = 0x76F8
-0x416B = 0x7A93
-0x416C = 0x7CDF
-0x416D = 0x7DCF
-0x416E = 0x7D9C
-0x416F = 0x8061
-0x4170 = 0x8349
-0x4171 = 0x8358
-0x4172 = 0x846C
-0x4173 = 0x84BC
-0x4174 = 0x85FB
-0x4175 = 0x88C5
-0x4176 = 0x8D70
-0x4177 = 0x9001
-0x4178 = 0x906D
-0x4179 = 0x9397
-0x417A = 0x971C
-0x417B = 0x9A12
-0x417C = 0x50CF
-0x417D = 0x5897
-0x417E = 0x618E
-0x4221 = 0x81D3
-0x4222 = 0x8535
-0x4223 = 0x8D08
-0x4224 = 0x9020
-0x4225 = 0x4FC3
-0x4226 = 0x5074
-0x4227 = 0x5247
-0x4228 = 0x5373
-0x4229 = 0x606F
-0x422A = 0x6349
-0x422B = 0x675F
-0x422C = 0x6E2C
-0x422D = 0x8DB3
-0x422E = 0x901F
-0x422F = 0x4FD7
-0x4230 = 0x5C5E
-0x4231 = 0x8CCA
-0x4232 = 0x65CF
-0x4233 = 0x7D9A
-0x4234 = 0x5352
-0x4235 = 0x8896
-0x4236 = 0x5176
-0x4237 = 0x63C3
-0x4238 = 0x5B58
-0x4239 = 0x5B6B
-0x423A = 0x5C0A
-0x423B = 0x640D
-0x423C = 0x6751
-0x423D = 0x905C
-0x423E = 0x4ED6
-0x423F = 0x591A
-0x4240 = 0x592A
-0x4241 = 0x6C70
-0x4242 = 0x8A51
-0x4243 = 0x553E
-0x4244 = 0x5815
-0x4245 = 0x59A5
-0x4246 = 0x60F0
-0x4247 = 0x6253
-0x4248 = 0x67C1
-0x4249 = 0x8235
-0x424A = 0x6955
-0x424B = 0x9640
-0x424C = 0x99C4
-0x424D = 0x9A28
-0x424E = 0x4F53
-0x424F = 0x5806
-0x4250 = 0x5BFE
-0x4251 = 0x8010
-0x4252 = 0x5CB1
-0x4253 = 0x5E2F
-0x4254 = 0x5F85
-0x4255 = 0x6020
-0x4256 = 0x614B
-0x4257 = 0x6234
-0x4258 = 0x66FF
-0x4259 = 0x6CF0
-0x425A = 0x6EDE
-0x425B = 0x80CE
-0x425C = 0x817F
-0x425D = 0x82D4
-0x425E = 0x888B
-0x425F = 0x8CB8
-0x4260 = 0x9000
-0x4261 = 0x902E
-0x4262 = 0x968A
-0x4263 = 0x9EDB
-0x4264 = 0x9BDB
-0x4265 = 0x4EE3
-0x4266 = 0x53F0
-0x4267 = 0x5927
-0x4268 = 0x7B2C
-0x4269 = 0x918D
-0x426A = 0x984C
-0x426B = 0x9DF9
-0x426C = 0x6EDD
-0x426D = 0x7027
-0x426E = 0x5353
-0x426F = 0x5544
-0x4270 = 0x5B85
-0x4271 = 0x6258
-0x4272 = 0x629E
-0x4273 = 0x62D3
-0x4274 = 0x6CA2
-0x4275 = 0x6FEF
-0x4276 = 0x7422
-0x4277 = 0x8A17
-0x4278 = 0x9438
-0x4279 = 0x6FC1
-0x427A = 0x8AFE
-0x427B = 0x8338
-0x427C = 0x51E7
-0x427D = 0x86F8
-0x427E = 0x53EA
-0x4321 = 0x53E9
-0x4322 = 0x4F46
-0x4323 = 0x9054
-0x4324 = 0x8FB0
-0x4325 = 0x596A
-0x4326 = 0x8131
-0x4327 = 0x5DFD
-0x4328 = 0x7AEA
-0x4329 = 0x8FBF
-0x432A = 0x68DA
-0x432B = 0x8C37
-0x432C = 0x72F8
-0x432D = 0x9C48
-0x432E = 0x6A3D
-0x432F = 0x8AB0
-0x4330 = 0x4E39
-0x4331 = 0x5358
-0x4332 = 0x5606
-0x4333 = 0x5766
-0x4334 = 0x62C5
-0x4335 = 0x63A2
-0x4336 = 0x65E6
-0x4337 = 0x6B4E
-0x4338 = 0x6DE1
-0x4339 = 0x6E5B
-0x433A = 0x70AD
-0x433B = 0x77ED
-0x433C = 0x7AEF
-0x433D = 0x7BAA
-0x433E = 0x7DBB
-0x433F = 0x803D
-0x4340 = 0x80C6
-0x4341 = 0x86CB
-0x4342 = 0x8A95
-0x4343 = 0x935B
-0x4344 = 0x56E3
-0x4345 = 0x58C7
-0x4346 = 0x5F3E
-0x4347 = 0x65AD
-0x4348 = 0x6696
-0x4349 = 0x6A80
-0x434A = 0x6BB5
-0x434B = 0x7537
-0x434C = 0x8AC7
-0x434D = 0x5024
-0x434E = 0x77E5
-0x434F = 0x5730
-0x4350 = 0x5F1B
-0x4351 = 0x6065
-0x4352 = 0x667A
-0x4353 = 0x6C60
-0x4354 = 0x75F4
-0x4355 = 0x7A1A
-0x4356 = 0x7F6E
-0x4357 = 0x81F4
-0x4358 = 0x8718
-0x4359 = 0x9045
-0x435A = 0x99B3
-0x435B = 0x7BC9
-0x435C = 0x755C
-0x435D = 0x7AF9
-0x435E = 0x7B51
-0x435F = 0x84C4
-0x4360 = 0x9010
-0x4361 = 0x79E9
-0x4362 = 0x7A92
-0x4363 = 0x8336
-0x4364 = 0x5AE1
-0x4365 = 0x7740
-0x4366 = 0x4E2D
-0x4367 = 0x4EF2
-0x4368 = 0x5B99
-0x4369 = 0x5FE0
-0x436A = 0x62BD
-0x436B = 0x663C
-0x436C = 0x67F1
-0x436D = 0x6CE8
-0x436E = 0x866B
-0x436F = 0x8877
-0x4370 = 0x8A3B
-0x4371 = 0x914E
-0x4372 = 0x92F3
-0x4373 = 0x99D0
-0x4374 = 0x6A17
-0x4375 = 0x7026
-0x4376 = 0x732A
-0x4377 = 0x82E7
-0x4378 = 0x8457
-0x4379 = 0x8CAF
-0x437A = 0x4E01
-0x437B = 0x5146
-0x437C = 0x51CB
-0x437D = 0x558B
-0x437E = 0x5BF5
-0x4421 = 0x5E16
-0x4422 = 0x5E33
-0x4423 = 0x5E81
-0x4424 = 0x5F14
-0x4425 = 0x5F35
-0x4426 = 0x5F6B
-0x4427 = 0x5FB4
-0x4428 = 0x61F2
-0x4429 = 0x6311
-0x442A = 0x66A2
-0x442B = 0x671D
-0x442C = 0x6F6E
-0x442D = 0x7252
-0x442E = 0x753A
-0x442F = 0x773A
-0x4430 = 0x8074
-0x4431 = 0x8139
-0x4432 = 0x8178
-0x4433 = 0x8776
-0x4434 = 0x8ABF
-0x4435 = 0x8ADC
-0x4436 = 0x8D85
-0x4437 = 0x8DF3
-0x4438 = 0x929A
-0x4439 = 0x9577
-0x443A = 0x9802
-0x443B = 0x9CE5
-0x443C = 0x52C5
-0x443D = 0x6357
-0x443E = 0x76F4
-0x443F = 0x6715
-0x4440 = 0x6C88
-0x4441 = 0x73CD
-0x4442 = 0x8CC3
-0x4443 = 0x93AE
-0x4444 = 0x9673
-0x4445 = 0x6D25
-0x4446 = 0x589C
-0x4447 = 0x690E
-0x4448 = 0x69CC
-0x4449 = 0x8FFD
-0x444A = 0x939A
-0x444B = 0x75DB
-0x444C = 0x901A
-0x444D = 0x585A
-0x444E = 0x6802
-0x444F = 0x63B4
-0x4450 = 0x69FB
-0x4451 = 0x4F43
-0x4452 = 0x6F2C
-0x4453 = 0x67D8
-0x4454 = 0x8FBB
-0x4455 = 0x8526
-0x4456 = 0x7DB4
-0x4457 = 0x9354
-0x4458 = 0x693F
-0x4459 = 0x6F70
-0x445A = 0x576A
-0x445B = 0x58F7
-0x445C = 0x5B2C
-0x445D = 0x7D2C
-0x445E = 0x722A
-0x445F = 0x540A
-0x4460 = 0x91E3
-0x4461 = 0x9DB4
-0x4462 = 0x4EAD
-0x4463 = 0x4F4E
-0x4464 = 0x505C
-0x4465 = 0x5075
-0x4466 = 0x5243
-0x4467 = 0x8C9E
-0x4468 = 0x5448
-0x4469 = 0x5824
-0x446A = 0x5B9A
-0x446B = 0x5E1D
-0x446C = 0x5E95
-0x446D = 0x5EAD
-0x446E = 0x5EF7
-0x446F = 0x5F1F
-0x4470 = 0x608C
-0x4471 = 0x62B5
-0x4472 = 0x633A
-0x4473 = 0x63D0
-0x4474 = 0x68AF
-0x4475 = 0x6C40
-0x4476 = 0x7887
-0x4477 = 0x798E
-0x4478 = 0x7A0B
-0x4479 = 0x7DE0
-0x447A = 0x8247
-0x447B = 0x8A02
-0x447C = 0x8AE6
-0x447D = 0x8E44
-0x447E = 0x9013
-0x4521 = 0x90B8
-0x4522 = 0x912D
-0x4523 = 0x91D8
-0x4524 = 0x9F0E
-0x4525 = 0x6CE5
-0x4526 = 0x6458
-0x4527 = 0x64E2
-0x4528 = 0x6575
-0x4529 = 0x6EF4
-0x452A = 0x7684
-0x452B = 0x7B1B
-0x452C = 0x9069
-0x452D = 0x93D1
-0x452E = 0x6EBA
-0x452F = 0x54F2
-0x4530 = 0x5FB9
-0x4531 = 0x64A4
-0x4532 = 0x8F4D
-0x4533 = 0x8FED
-0x4534 = 0x9244
-0x4535 = 0x5178
-0x4536 = 0x586B
-0x4537 = 0x5929
-0x4538 = 0x5C55
-0x4539 = 0x5E97
-0x453A = 0x6DFB
-0x453B = 0x7E8F
-0x453C = 0x751C
-0x453D = 0x8CBC
-0x453E = 0x8EE2
-0x453F = 0x985B
-0x4540 = 0x70B9
-0x4541 = 0x4F1D
-0x4542 = 0x6BBF
-0x4543 = 0x6FB1
-0x4544 = 0x7530
-0x4545 = 0x96FB
-0x4546 = 0x514E
-0x4547 = 0x5410
-0x4548 = 0x5835
-0x4549 = 0x5857
-0x454A = 0x59AC
-0x454B = 0x5C60
-0x454C = 0x5F92
-0x454D = 0x6597
-0x454E = 0x675C
-0x454F = 0x6E21
-0x4550 = 0x767B
-0x4551 = 0x83DF
-0x4552 = 0x8CED
-0x4553 = 0x9014
-0x4554 = 0x90FD
-0x4555 = 0x934D
-0x4556 = 0x7825
-0x4557 = 0x783A
-0x4558 = 0x52AA
-0x4559 = 0x5EA6
-0x455A = 0x571F
-0x455B = 0x5974
-0x455C = 0x6012
-0x455D = 0x5012
-0x455E = 0x515A
-0x455F = 0x51AC
-0x4560 = 0x51CD
-0x4561 = 0x5200
-0x4562 = 0x5510
-0x4563 = 0x5854
-0x4564 = 0x5858
-0x4565 = 0x5957
-0x4566 = 0x5B95
-0x4567 = 0x5CF6
-0x4568 = 0x5D8B
-0x4569 = 0x60BC
-0x456A = 0x6295
-0x456B = 0x642D
-0x456C = 0x6771
-0x456D = 0x6843
-0x456E = 0x68BC
-0x456F = 0x68DF
-0x4570 = 0x76D7
-0x4571 = 0x6DD8
-0x4572 = 0x6E6F
-0x4573 = 0x6D9B
-0x4574 = 0x706F
-0x4575 = 0x71C8
-0x4576 = 0x5F53
-0x4577 = 0x75D8
-0x4578 = 0x7977
-0x4579 = 0x7B49
-0x457A = 0x7B54
-0x457B = 0x7B52
-0x457C = 0x7CD6
-0x457D = 0x7D71
-0x457E = 0x5230
-0x4621 = 0x8463
-0x4622 = 0x8569
-0x4623 = 0x85E4
-0x4624 = 0x8A0E
-0x4625 = 0x8B04
-0x4626 = 0x8C46
-0x4627 = 0x8E0F
-0x4628 = 0x9003
-0x4629 = 0x900F
-0x462A = 0x9419
-0x462B = 0x9676
-0x462C = 0x982D
-0x462D = 0x9A30
-0x462E = 0x95D8
-0x462F = 0x50CD
-0x4630 = 0x52D5
-0x4631 = 0x540C
-0x4632 = 0x5802
-0x4633 = 0x5C0E
-0x4634 = 0x61A7
-0x4635 = 0x649E
-0x4636 = 0x6D1E
-0x4637 = 0x77B3
-0x4638 = 0x7AE5
-0x4639 = 0x80F4
-0x463A = 0x8404
-0x463B = 0x9053
-0x463C = 0x9285
-0x463D = 0x5CE0
-0x463E = 0x9D07
-0x463F = 0x533F
-0x4640 = 0x5F97
-0x4641 = 0x5FB3
-0x4642 = 0x6D9C
-0x4643 = 0x7279
-0x4644 = 0x7763
-0x4645 = 0x79BF
-0x4646 = 0x7BE4
-0x4647 = 0x6BD2
-0x4648 = 0x72EC
-0x4649 = 0x8AAD
-0x464A = 0x6803
-0x464B = 0x6A61
-0x464C = 0x51F8
-0x464D = 0x7A81
-0x464E = 0x6934
-0x464F = 0x5C4A
-0x4650 = 0x9CF6
-0x4651 = 0x82EB
-0x4652 = 0x5BC5
-0x4653 = 0x9149
-0x4654 = 0x701E
-0x4655 = 0x5678
-0x4656 = 0x5C6F
-0x4657 = 0x60C7
-0x4658 = 0x6566
-0x4659 = 0x6C8C
-0x465A = 0x8C5A
-0x465B = 0x9041
-0x465C = 0x9813
-0x465D = 0x5451
-0x465E = 0x66C7
-0x465F = 0x920D
-0x4660 = 0x5948
-0x4661 = 0x90A3
-0x4662 = 0x5185
-0x4663 = 0x4E4D
-0x4664 = 0x51EA
-0x4665 = 0x8599
-0x4666 = 0x8B0E
-0x4667 = 0x7058
-0x4668 = 0x637A
-0x4669 = 0x934B
-0x466A = 0x6962
-0x466B = 0x99B4
-0x466C = 0x7E04
-0x466D = 0x7577
-0x466E = 0x5357
-0x466F = 0x6960
-0x4670 = 0x8EDF
-0x4671 = 0x96E3
-0x4672 = 0x6C5D
-0x4673 = 0x4E8C
-0x4674 = 0x5C3C
-0x4675 = 0x5F10
-0x4676 = 0x8FE9
-0x4677 = 0x5302
-0x4678 = 0x8CD1
-0x4679 = 0x8089
-0x467A = 0x8679
-0x467B = 0x5EFF
-0x467C = 0x65E5
-0x467D = 0x4E73
-0x467E = 0x5165
-0x4721 = 0x5982
-0x4722 = 0x5C3F
-0x4723 = 0x97EE
-0x4724 = 0x4EFB
-0x4725 = 0x598A
-0x4726 = 0x5FCD
-0x4727 = 0x8A8D
-0x4728 = 0x6FE1
-0x4729 = 0x79B0
-0x472A = 0x7962
-0x472B = 0x5BE7
-0x472C = 0x8471
-0x472D = 0x732B
-0x472E = 0x71B1
-0x472F = 0x5E74
-0x4730 = 0x5FF5
-0x4731 = 0x637B
-0x4732 = 0x649A
-0x4733 = 0x71C3
-0x4734 = 0x7C98
-0x4735 = 0x4E43
-0x4736 = 0x5EFC
-0x4737 = 0x4E4B
-0x4738 = 0x57DC
-0x4739 = 0x56A2
-0x473A = 0x60A9
-0x473B = 0x6FC3
-0x473C = 0x7D0D
-0x473D = 0x80FD
-0x473E = 0x8133
-0x473F = 0x81BF
-0x4740 = 0x8FB2
-0x4741 = 0x8997
-0x4742 = 0x86A4
-0x4743 = 0x5DF4
-0x4744 = 0x628A
-0x4745 = 0x64AD
-0x4746 = 0x8987
-0x4747 = 0x6777
-0x4748 = 0x6CE2
-0x4749 = 0x6D3E
-0x474A = 0x7436
-0x474B = 0x7834
-0x474C = 0x5A46
-0x474D = 0x7F75
-0x474E = 0x82AD
-0x474F = 0x99AC
-0x4750 = 0x4FF3
-0x4751 = 0x5EC3
-0x4752 = 0x62DD
-0x4753 = 0x6392
-0x4754 = 0x6557
-0x4755 = 0x676F
-0x4756 = 0x76C3
-0x4757 = 0x724C
-0x4758 = 0x80CC
-0x4759 = 0x80BA
-0x475A = 0x8F29
-0x475B = 0x914D
-0x475C = 0x500D
-0x475D = 0x57F9
-0x475E = 0x5A92
-0x475F = 0x6885
-0x4760 = 0x6973
-0x4761 = 0x7164
-0x4762 = 0x72FD
-0x4763 = 0x8CB7
-0x4764 = 0x58F2
-0x4765 = 0x8CE0
-0x4766 = 0x966A
-0x4767 = 0x9019
-0x4768 = 0x877F
-0x4769 = 0x79E4
-0x476A = 0x77E7
-0x476B = 0x8429
-0x476C = 0x4F2F
-0x476D = 0x5265
-0x476E = 0x535A
-0x476F = 0x62CD
-0x4770 = 0x67CF
-0x4771 = 0x6CCA
-0x4772 = 0x767D
-0x4773 = 0x7B94
-0x4774 = 0x7C95
-0x4775 = 0x8236
-0x4776 = 0x8584
-0x4777 = 0x8FEB
-0x4778 = 0x66DD
-0x4779 = 0x6F20
-0x477A = 0x7206
-0x477B = 0x7E1B
-0x477C = 0x83AB
-0x477D = 0x99C1
-0x477E = 0x9EA6
-0x4821 = 0x51FD
-0x4822 = 0x7BB1
-0x4823 = 0x7872
-0x4824 = 0x7BB8
-0x4825 = 0x8087
-0x4826 = 0x7B48
-0x4827 = 0x6AE8
-0x4828 = 0x5E61
-0x4829 = 0x808C
-0x482A = 0x7551
-0x482B = 0x7560
-0x482C = 0x516B
-0x482D = 0x9262
-0x482E = 0x6E8C
-0x482F = 0x767A
-0x4830 = 0x9197
-0x4831 = 0x9AEA
-0x4832 = 0x4F10
-0x4833 = 0x7F70
-0x4834 = 0x629C
-0x4835 = 0x7B4F
-0x4836 = 0x95A5
-0x4837 = 0x9CE9
-0x4838 = 0x567A
-0x4839 = 0x5859
-0x483A = 0x86E4
-0x483B = 0x96BC
-0x483C = 0x4F34
-0x483D = 0x5224
-0x483E = 0x534A
-0x483F = 0x53CD
-0x4840 = 0x53DB
-0x4841 = 0x5E06
-0x4842 = 0x642C
-0x4843 = 0x6591
-0x4844 = 0x677F
-0x4845 = 0x6C3E
-0x4846 = 0x6C4E
-0x4847 = 0x7248
-0x4848 = 0x72AF
-0x4849 = 0x73ED
-0x484A = 0x7554
-0x484B = 0x7E41
-0x484C = 0x822C
-0x484D = 0x85E9
-0x484E = 0x8CA9
-0x484F = 0x7BC4
-0x4850 = 0x91C6
-0x4851 = 0x7169
-0x4852 = 0x9812
-0x4853 = 0x98EF
-0x4854 = 0x633D
-0x4855 = 0x6669
-0x4856 = 0x756A
-0x4857 = 0x76E4
-0x4858 = 0x78D0
-0x4859 = 0x8543
-0x485A = 0x86EE
-0x485B = 0x532A
-0x485C = 0x5351
-0x485D = 0x5426
-0x485E = 0x5983
-0x485F = 0x5E87
-0x4860 = 0x5F7C
-0x4861 = 0x60B2
-0x4862 = 0x6249
-0x4863 = 0x6279
-0x4864 = 0x62AB
-0x4865 = 0x6590
-0x4866 = 0x6BD4
-0x4867 = 0x6CCC
-0x4868 = 0x75B2
-0x4869 = 0x76AE
-0x486A = 0x7891
-0x486B = 0x79D8
-0x486C = 0x7DCB
-0x486D = 0x7F77
-0x486E = 0x80A5
-0x486F = 0x88AB
-0x4870 = 0x8AB9
-0x4871 = 0x8CBB
-0x4872 = 0x907F
-0x4873 = 0x975E
-0x4874 = 0x98DB
-0x4875 = 0x6A0B
-0x4876 = 0x7C38
-0x4877 = 0x5099
-0x4878 = 0x5C3E
-0x4879 = 0x5FAE
-0x487A = 0x6787
-0x487B = 0x6BD8
-0x487C = 0x7435
-0x487D = 0x7709
-0x487E = 0x7F8E
-0x4921 = 0x9F3B
-0x4922 = 0x67CA
-0x4923 = 0x7A17
-0x4924 = 0x5339
-0x4925 = 0x758B
-0x4926 = 0x9AED
-0x4927 = 0x5F66
-0x4928 = 0x819D
-0x4929 = 0x83F1
-0x492A = 0x8098
-0x492B = 0x5F3C
-0x492C = 0x5FC5
-0x492D = 0x7562
-0x492E = 0x7B46
-0x492F = 0x903C
-0x4930 = 0x6867
-0x4931 = 0x59EB
-0x4932 = 0x5A9B
-0x4933 = 0x7D10
-0x4934 = 0x767E
-0x4935 = 0x8B2C
-0x4936 = 0x4FF5
-0x4937 = 0x5F6A
-0x4938 = 0x6A19
-0x4939 = 0x6C37
-0x493A = 0x6F02
-0x493B = 0x74E2
-0x493C = 0x7968
-0x493D = 0x8868
-0x493E = 0x8A55
-0x493F = 0x8C79
-0x4940 = 0x5EDF
-0x4941 = 0x63CF
-0x4942 = 0x75C5
-0x4943 = 0x79D2
-0x4944 = 0x82D7
-0x4945 = 0x9328
-0x4946 = 0x92F2
-0x4947 = 0x849C
-0x4948 = 0x86ED
-0x4949 = 0x9C2D
-0x494A = 0x54C1
-0x494B = 0x5F6C
-0x494C = 0x658C
-0x494D = 0x6D5C
-0x494E = 0x7015
-0x494F = 0x8CA7
-0x4950 = 0x8CD3
-0x4951 = 0x983B
-0x4952 = 0x654F
-0x4953 = 0x74F6
-0x4954 = 0x4E0D
-0x4955 = 0x4ED8
-0x4956 = 0x57E0
-0x4957 = 0x592B
-0x4958 = 0x5A66
-0x4959 = 0x5BCC
-0x495A = 0x51A8
-0x495B = 0x5E03
-0x495C = 0x5E9C
-0x495D = 0x6016
-0x495E = 0x6276
-0x495F = 0x6577
-0x4960 = 0x65A7
-0x4961 = 0x666E
-0x4962 = 0x6D6E
-0x4963 = 0x7236
-0x4964 = 0x7B26
-0x4965 = 0x8150
-0x4966 = 0x819A
-0x4967 = 0x8299
-0x4968 = 0x8B5C
-0x4969 = 0x8CA0
-0x496A = 0x8CE6
-0x496B = 0x8D74
-0x496C = 0x961C
-0x496D = 0x9644
-0x496E = 0x4FAE
-0x496F = 0x64AB
-0x4970 = 0x6B66
-0x4971 = 0x821E
-0x4972 = 0x8461
-0x4973 = 0x856A
-0x4974 = 0x90E8
-0x4975 = 0x5C01
-0x4976 = 0x6953
-0x4977 = 0x98A8
-0x4978 = 0x847A
-0x4979 = 0x8557
-0x497A = 0x4F0F
-0x497B = 0x526F
-0x497C = 0x5FA9
-0x497D = 0x5E45
-0x497E = 0x670D
-0x4A21 = 0x798F
-0x4A22 = 0x8179
-0x4A23 = 0x8907
-0x4A24 = 0x8986
-0x4A25 = 0x6DF5
-0x4A26 = 0x5F17
-0x4A27 = 0x6255
-0x4A28 = 0x6CB8
-0x4A29 = 0x4ECF
-0x4A2A = 0x7269
-0x4A2B = 0x9B92
-0x4A2C = 0x5206
-0x4A2D = 0x543B
-0x4A2E = 0x5674
-0x4A2F = 0x58B3
-0x4A30 = 0x61A4
-0x4A31 = 0x626E
-0x4A32 = 0x711A
-0x4A33 = 0x596E
-0x4A34 = 0x7C89
-0x4A35 = 0x7CDE
-0x4A36 = 0x7D1B
-0x4A37 = 0x96F0
-0x4A38 = 0x6587
-0x4A39 = 0x805E
-0x4A3A = 0x4E19
-0x4A3B = 0x4F75
-0x4A3C = 0x5175
-0x4A3D = 0x5840
-0x4A3E = 0x5E63
-0x4A3F = 0x5E73
-0x4A40 = 0x5F0A
-0x4A41 = 0x67C4
-0x4A42 = 0x4E26
-0x4A43 = 0x853D
-0x4A44 = 0x9589
-0x4A45 = 0x965B
-0x4A46 = 0x7C73
-0x4A47 = 0x9801
-0x4A48 = 0x50FB
-0x4A49 = 0x58C1
-0x4A4A = 0x7656
-0x4A4B = 0x78A7
-0x4A4C = 0x5225
-0x4A4D = 0x77A5
-0x4A4E = 0x8511
-0x4A4F = 0x7B86
-0x4A50 = 0x504F
-0x4A51 = 0x5909
-0x4A52 = 0x7247
-0x4A53 = 0x7BC7
-0x4A54 = 0x7DE8
-0x4A55 = 0x8FBA
-0x4A56 = 0x8FD4
-0x4A57 = 0x904D
-0x4A58 = 0x4FBF
-0x4A59 = 0x52C9
-0x4A5A = 0x5A29
-0x4A5B = 0x5F01
-0x4A5C = 0x97AD
-0x4A5D = 0x4FDD
-0x4A5E = 0x8217
-0x4A5F = 0x92EA
-0x4A60 = 0x5703
-0x4A61 = 0x6355
-0x4A62 = 0x6B69
-0x4A63 = 0x752B
-0x4A64 = 0x88DC
-0x4A65 = 0x8F14
-0x4A66 = 0x7A42
-0x4A67 = 0x52DF
-0x4A68 = 0x5893
-0x4A69 = 0x6155
-0x4A6A = 0x620A
-0x4A6B = 0x66AE
-0x4A6C = 0x6BCD
-0x4A6D = 0x7C3F
-0x4A6E = 0x83E9
-0x4A6F = 0x5023
-0x4A70 = 0x4FF8
-0x4A71 = 0x5305
-0x4A72 = 0x5446
-0x4A73 = 0x5831
-0x4A74 = 0x5949
-0x4A75 = 0x5B9D
-0x4A76 = 0x5CF0
-0x4A77 = 0x5CEF
-0x4A78 = 0x5D29
-0x4A79 = 0x5E96
-0x4A7A = 0x62B1
-0x4A7B = 0x6367
-0x4A7C = 0x653E
-0x4A7D = 0x65B9
-0x4A7E = 0x670B
-0x4B21 = 0x6CD5
-0x4B22 = 0x6CE1
-0x4B23 = 0x70F9
-0x4B24 = 0x7832
-0x4B25 = 0x7E2B
-0x4B26 = 0x80DE
-0x4B27 = 0x82B3
-0x4B28 = 0x840C
-0x4B29 = 0x84EC
-0x4B2A = 0x8702
-0x4B2B = 0x8912
-0x4B2C = 0x8A2A
-0x4B2D = 0x8C4A
-0x4B2E = 0x90A6
-0x4B2F = 0x92D2
-0x4B30 = 0x98FD
-0x4B31 = 0x9CF3
-0x4B32 = 0x9D6C
-0x4B33 = 0x4E4F
-0x4B34 = 0x4EA1
-0x4B35 = 0x508D
-0x4B36 = 0x5256
-0x4B37 = 0x574A
-0x4B38 = 0x59A8
-0x4B39 = 0x5E3D
-0x4B3A = 0x5FD8
-0x4B3B = 0x5FD9
-0x4B3C = 0x623F
-0x4B3D = 0x66B4
-0x4B3E = 0x671B
-0x4B3F = 0x67D0
-0x4B40 = 0x68D2
-0x4B41 = 0x5192
-0x4B42 = 0x7D21
-0x4B43 = 0x80AA
-0x4B44 = 0x81A8
-0x4B45 = 0x8B00
-0x4B46 = 0x8C8C
-0x4B47 = 0x8CBF
-0x4B48 = 0x927E
-0x4B49 = 0x9632
-0x4B4A = 0x5420
-0x4B4B = 0x982C
-0x4B4C = 0x5317
-0x4B4D = 0x50D5
-0x4B4E = 0x535C
-0x4B4F = 0x58A8
-0x4B50 = 0x64B2
-0x4B51 = 0x6734
-0x4B52 = 0x7267
-0x4B53 = 0x7766
-0x4B54 = 0x7A46
-0x4B55 = 0x91E6
-0x4B56 = 0x52C3
-0x4B57 = 0x6CA1
-0x4B58 = 0x6B86
-0x4B59 = 0x5800
-0x4B5A = 0x5E4C
-0x4B5B = 0x5954
-0x4B5C = 0x672C
-0x4B5D = 0x7FFB
-0x4B5E = 0x51E1
-0x4B5F = 0x76C6
-0x4B60 = 0x6469
-0x4B61 = 0x78E8
-0x4B62 = 0x9B54
-0x4B63 = 0x9EBB
-0x4B64 = 0x57CB
-0x4B65 = 0x59B9
-0x4B66 = 0x6627
-0x4B67 = 0x679A
-0x4B68 = 0x6BCE
-0x4B69 = 0x54E9
-0x4B6A = 0x69D9
-0x4B6B = 0x5E55
-0x4B6C = 0x819C
-0x4B6D = 0x6795
-0x4B6E = 0x9BAA
-0x4B6F = 0x67FE
-0x4B70 = 0x9C52
-0x4B71 = 0x685D
-0x4B72 = 0x4EA6
-0x4B73 = 0x4FE3
-0x4B74 = 0x53C8
-0x4B75 = 0x62B9
-0x4B76 = 0x672B
-0x4B77 = 0x6CAB
-0x4B78 = 0x8FC4
-0x4B79 = 0x4FAD
-0x4B7A = 0x7E6D
-0x4B7B = 0x9EBF
-0x4B7C = 0x4E07
-0x4B7D = 0x6162
-0x4B7E = 0x6E80
-0x4C21 = 0x6F2B
-0x4C22 = 0x8513
-0x4C23 = 0x5473
-0x4C24 = 0x672A
-0x4C25 = 0x9B45
-0x4C26 = 0x5DF3
-0x4C27 = 0x7B95
-0x4C28 = 0x5CAC
-0x4C29 = 0x5BC6
-0x4C2A = 0x871C
-0x4C2B = 0x6E4A
-0x4C2C = 0x84D1
-0x4C2D = 0x7A14
-0x4C2E = 0x8108
-0x4C2F = 0x5999
-0x4C30 = 0x7C8D
-0x4C31 = 0x6C11
-0x4C32 = 0x7720
-0x4C33 = 0x52D9
-0x4C34 = 0x5922
-0x4C35 = 0x7121
-0x4C36 = 0x725F
-0x4C37 = 0x77DB
-0x4C38 = 0x9727
-0x4C39 = 0x9D61
-0x4C3A = 0x690B
-0x4C3B = 0x5A7F
-0x4C3C = 0x5A18
-0x4C3D = 0x51A5
-0x4C3E = 0x540D
-0x4C3F = 0x547D
-0x4C40 = 0x660E
-0x4C41 = 0x76DF
-0x4C42 = 0x8FF7
-0x4C43 = 0x9298
-0x4C44 = 0x9CF4
-0x4C45 = 0x59EA
-0x4C46 = 0x725D
-0x4C47 = 0x6EC5
-0x4C48 = 0x514D
-0x4C49 = 0x68C9
-0x4C4A = 0x7DBF
-0x4C4B = 0x7DEC
-0x4C4C = 0x9762
-0x4C4D = 0x9EBA
-0x4C4E = 0x6478
-0x4C4F = 0x6A21
-0x4C50 = 0x8302
-0x4C51 = 0x5984
-0x4C52 = 0x5B5F
-0x4C53 = 0x6BDB
-0x4C54 = 0x731B
-0x4C55 = 0x76F2
-0x4C56 = 0x7DB2
-0x4C57 = 0x8017
-0x4C58 = 0x8499
-0x4C59 = 0x5132
-0x4C5A = 0x6728
-0x4C5B = 0x9ED9
-0x4C5C = 0x76EE
-0x4C5D = 0x6762
-0x4C5E = 0x52FF
-0x4C5F = 0x9905
-0x4C60 = 0x5C24
-0x4C61 = 0x623B
-0x4C62 = 0x7C7E
-0x4C63 = 0x8CB0
-0x4C64 = 0x554F
-0x4C65 = 0x60B6
-0x4C66 = 0x7D0B
-0x4C67 = 0x9580
-0x4C68 = 0x5301
-0x4C69 = 0x4E5F
-0x4C6A = 0x51B6
-0x4C6B = 0x591C
-0x4C6C = 0x723A
-0x4C6D = 0x8036
-0x4C6E = 0x91CE
-0x4C6F = 0x5F25
-0x4C70 = 0x77E2
-0x4C71 = 0x5384
-0x4C72 = 0x5F79
-0x4C73 = 0x7D04
-0x4C74 = 0x85AC
-0x4C75 = 0x8A33
-0x4C76 = 0x8E8D
-0x4C77 = 0x9756
-0x4C78 = 0x67F3
-0x4C79 = 0x85AE
-0x4C7A = 0x9453
-0x4C7B = 0x6109
-0x4C7C = 0x6108
-0x4C7D = 0x6CB9
-0x4C7E = 0x7652
-0x4D21 = 0x8AED
-0x4D22 = 0x8F38
-0x4D23 = 0x552F
-0x4D24 = 0x4F51
-0x4D25 = 0x512A
-0x4D26 = 0x52C7
-0x4D27 = 0x53CB
-0x4D28 = 0x5BA5
-0x4D29 = 0x5E7D
-0x4D2A = 0x60A0
-0x4D2B = 0x6182
-0x4D2C = 0x63D6
-0x4D2D = 0x6709
-0x4D2E = 0x67DA
-0x4D2F = 0x6E67
-0x4D30 = 0x6D8C
-0x4D31 = 0x7336
-0x4D32 = 0x7337
-0x4D33 = 0x7531
-0x4D34 = 0x7950
-0x4D35 = 0x88D5
-0x4D36 = 0x8A98
-0x4D37 = 0x904A
-0x4D38 = 0x9091
-0x4D39 = 0x90F5
-0x4D3A = 0x96C4
-0x4D3B = 0x878D
-0x4D3C = 0x5915
-0x4D3D = 0x4E88
-0x4D3E = 0x4F59
-0x4D3F = 0x4E0E
-0x4D40 = 0x8A89
-0x4D41 = 0x8F3F
-0x4D42 = 0x9810
-0x4D43 = 0x50AD
-0x4D44 = 0x5E7C
-0x4D45 = 0x5996
-0x4D46 = 0x5BB9
-0x4D47 = 0x5EB8
-0x4D48 = 0x63DA
-0x4D49 = 0x63FA
-0x4D4A = 0x64C1
-0x4D4B = 0x66DC
-0x4D4C = 0x694A
-0x4D4D = 0x69D8
-0x4D4E = 0x6D0B
-0x4D4F = 0x6EB6
-0x4D50 = 0x7194
-0x4D51 = 0x7528
-0x4D52 = 0x7AAF
-0x4D53 = 0x7F8A
-0x4D54 = 0x8000
-0x4D55 = 0x8449
-0x4D56 = 0x84C9
-0x4D57 = 0x8981
-0x4D58 = 0x8B21
-0x4D59 = 0x8E0A
-0x4D5A = 0x9065
-0x4D5B = 0x967D
-0x4D5C = 0x990A
-0x4D5D = 0x617E
-0x4D5E = 0x6291
-0x4D5F = 0x6B32
-0x4D60 = 0x6C83
-0x4D61 = 0x6D74
-0x4D62 = 0x7FCC
-0x4D63 = 0x7FFC
-0x4D64 = 0x6DC0
-0x4D65 = 0x7F85
-0x4D66 = 0x87BA
-0x4D67 = 0x88F8
-0x4D68 = 0x6765
-0x4D69 = 0x83B1
-0x4D6A = 0x983C
-0x4D6B = 0x96F7
-0x4D6C = 0x6D1B
-0x4D6D = 0x7D61
-0x4D6E = 0x843D
-0x4D6F = 0x916A
-0x4D70 = 0x4E71
-0x4D71 = 0x5375
-0x4D72 = 0x5D50
-0x4D73 = 0x6B04
-0x4D74 = 0x6FEB
-0x4D75 = 0x85CD
-0x4D76 = 0x862D
-0x4D77 = 0x89A7
-0x4D78 = 0x5229
-0x4D79 = 0x540F
-0x4D7A = 0x5C65
-0x4D7B = 0x674E
-0x4D7C = 0x68A8
-0x4D7D = 0x7406
-0x4D7E = 0x7483
-0x4E21 = 0x75E2
-0x4E22 = 0x88CF
-0x4E23 = 0x88E1
-0x4E24 = 0x91CC
-0x4E25 = 0x96E2
-0x4E26 = 0x9678
-0x4E27 = 0x5F8B
-0x4E28 = 0x7387
-0x4E29 = 0x7ACB
-0x4E2A = 0x844E
-0x4E2B = 0x63A0
-0x4E2C = 0x7565
-0x4E2D = 0x5289
-0x4E2E = 0x6D41
-0x4E2F = 0x6E9C
-0x4E30 = 0x7409
-0x4E31 = 0x7559
-0x4E32 = 0x786B
-0x4E33 = 0x7C92
-0x4E34 = 0x9686
-0x4E35 = 0x7ADC
-0x4E36 = 0x9F8D
-0x4E37 = 0x4FB6
-0x4E38 = 0x616E
-0x4E39 = 0x65C5
-0x4E3A = 0x865C
-0x4E3B = 0x4E86
-0x4E3C = 0x4EAE
-0x4E3D = 0x50DA
-0x4E3E = 0x4E21
-0x4E3F = 0x51CC
-0x4E40 = 0x5BEE
-0x4E41 = 0x6599
-0x4E42 = 0x6881
-0x4E43 = 0x6DBC
-0x4E44 = 0x731F
-0x4E45 = 0x7642
-0x4E46 = 0x77AD
-0x4E47 = 0x7A1C
-0x4E48 = 0x7CE7
-0x4E49 = 0x826F
-0x4E4A = 0x8AD2
-0x4E4B = 0x907C
-0x4E4C = 0x91CF
-0x4E4D = 0x9675
-0x4E4E = 0x9818
-0x4E4F = 0x529B
-0x4E50 = 0x7DD1
-0x4E51 = 0x502B
-0x4E52 = 0x5398
-0x4E53 = 0x6797
-0x4E54 = 0x6DCB
-0x4E55 = 0x71D0
-0x4E56 = 0x7433
-0x4E57 = 0x81E8
-0x4E58 = 0x8F2A
-0x4E59 = 0x96A3
-0x4E5A = 0x9C57
-0x4E5B = 0x9E9F
-0x4E5C = 0x7460
-0x4E5D = 0x5841
-0x4E5E = 0x6D99
-0x4E5F = 0x7D2F
-0x4E60 = 0x985E
-0x4E61 = 0x4EE4
-0x4E62 = 0x4F36
-0x4E63 = 0x4F8B
-0x4E64 = 0x51B7
-0x4E65 = 0x52B1
-0x4E66 = 0x5DBA
-0x4E67 = 0x601C
-0x4E68 = 0x73B2
-0x4E69 = 0x793C
-0x4E6A = 0x82D3
-0x4E6B = 0x9234
-0x4E6C = 0x96B7
-0x4E6D = 0x96F6
-0x4E6E = 0x970A
-0x4E6F = 0x9E97
-0x4E70 = 0x9F62
-0x4E71 = 0x66A6
-0x4E72 = 0x6B74
-0x4E73 = 0x5217
-0x4E74 = 0x52A3
-0x4E75 = 0x70C8
-0x4E76 = 0x88C2
-0x4E77 = 0x5EC9
-0x4E78 = 0x604B
-0x4E79 = 0x6190
-0x4E7A = 0x6F23
-0x4E7B = 0x7149
-0x4E7C = 0x7C3E
-0x4E7D = 0x7DF4
-0x4E7E = 0x806F
-0x4F21 = 0x84EE
-0x4F22 = 0x9023
-0x4F23 = 0x932C
-0x4F24 = 0x5442
-0x4F25 = 0x9B6F
-0x4F26 = 0x6AD3
-0x4F27 = 0x7089
-0x4F28 = 0x8CC2
-0x4F29 = 0x8DEF
-0x4F2A = 0x9732
-0x4F2B = 0x52B4
-0x4F2C = 0x5A41
-0x4F2D = 0x5ECA
-0x4F2E = 0x5F04
-0x4F2F = 0x6717
-0x4F30 = 0x697C
-0x4F31 = 0x6994
-0x4F32 = 0x6D6A
-0x4F33 = 0x6F0F
-0x4F34 = 0x7262
-0x4F35 = 0x72FC
-0x4F36 = 0x7BED
-0x4F37 = 0x8001
-0x4F38 = 0x807E
-0x4F39 = 0x874B
-0x4F3A = 0x90CE
-0x4F3B = 0x516D
-0x4F3C = 0x9E93
-0x4F3D = 0x7984
-0x4F3E = 0x808B
-0x4F3F = 0x9332
-0x4F40 = 0x8AD6
-0x4F41 = 0x502D
-0x4F42 = 0x548C
-0x4F43 = 0x8A71
-0x4F44 = 0x6B6A
-0x4F45 = 0x8CC4
-0x4F46 = 0x8107
-0x4F47 = 0x60D1
-0x4F48 = 0x67A0
-0x4F49 = 0x9DF2
-0x4F4A = 0x4E99
-0x4F4B = 0x4E98
-0x4F4C = 0x9C10
-0x4F4D = 0x8A6B
-0x4F4E = 0x85C1
-0x4F4F = 0x8568
-0x4F50 = 0x6900
-0x4F51 = 0x6E7E
-0x4F52 = 0x7897
-0x4F53 = 0x8155
-0x5021 = 0x5F0C
-0x5022 = 0x4E10
-0x5023 = 0x4E15
-0x5024 = 0x4E2A
-0x5025 = 0x4E31
-0x5026 = 0x4E36
-0x5027 = 0x4E3C
-0x5028 = 0x4E3F
-0x5029 = 0x4E42
-0x502A = 0x4E56
-0x502B = 0x4E58
-0x502C = 0x4E82
-0x502D = 0x4E85
-0x502E = 0x8C6B
-0x502F = 0x4E8A
-0x5030 = 0x8212
-0x5031 = 0x5F0D
-0x5032 = 0x4E8E
-0x5033 = 0x4E9E
-0x5034 = 0x4E9F
-0x5035 = 0x4EA0
-0x5036 = 0x4EA2
-0x5037 = 0x4EB0
-0x5038 = 0x4EB3
-0x5039 = 0x4EB6
-0x503A = 0x4ECE
-0x503B = 0x4ECD
-0x503C = 0x4EC4
-0x503D = 0x4EC6
-0x503E = 0x4EC2
-0x503F = 0x4ED7
-0x5040 = 0x4EDE
-0x5041 = 0x4EED
-0x5042 = 0x4EDF
-0x5043 = 0x4EF7
-0x5044 = 0x4F09
-0x5045 = 0x4F5A
-0x5046 = 0x4F30
-0x5047 = 0x4F5B
-0x5048 = 0x4F5D
-0x5049 = 0x4F57
-0x504A = 0x4F47
-0x504B = 0x4F76
-0x504C = 0x4F88
-0x504D = 0x4F8F
-0x504E = 0x4F98
-0x504F = 0x4F7B
-0x5050 = 0x4F69
-0x5051 = 0x4F70
-0x5052 = 0x4F91
-0x5053 = 0x4F6F
-0x5054 = 0x4F86
-0x5055 = 0x4F96
-0x5056 = 0x5118
-0x5057 = 0x4FD4
-0x5058 = 0x4FDF
-0x5059 = 0x4FCE
-0x505A = 0x4FD8
-0x505B = 0x4FDB
-0x505C = 0x4FD1
-0x505D = 0x4FDA
-0x505E = 0x4FD0
-0x505F = 0x4FE4
-0x5060 = 0x4FE5
-0x5061 = 0x501A
-0x5062 = 0x5028
-0x5063 = 0x5014
-0x5064 = 0x502A
-0x5065 = 0x5025
-0x5066 = 0x5005
-0x5067 = 0x4F1C
-0x5068 = 0x4FF6
-0x5069 = 0x5021
-0x506A = 0x5029
-0x506B = 0x502C
-0x506C = 0x4FFE
-0x506D = 0x4FEF
-0x506E = 0x5011
-0x506F = 0x5006
-0x5070 = 0x5043
-0x5071 = 0x5047
-0x5072 = 0x6703
-0x5073 = 0x5055
-0x5074 = 0x5050
-0x5075 = 0x5048
-0x5076 = 0x505A
-0x5077 = 0x5056
-0x5078 = 0x506C
-0x5079 = 0x5078
-0x507A = 0x5080
-0x507B = 0x509A
-0x507C = 0x5085
-0x507D = 0x50B4
-0x507E = 0x50B2
-0x5121 = 0x50C9
-0x5122 = 0x50CA
-0x5123 = 0x50B3
-0x5124 = 0x50C2
-0x5125 = 0x50D6
-0x5126 = 0x50DE
-0x5127 = 0x50E5
-0x5128 = 0x50ED
-0x5129 = 0x50E3
-0x512A = 0x50EE
-0x512B = 0x50F9
-0x512C = 0x50F5
-0x512D = 0x5109
-0x512E = 0x5101
-0x512F = 0x5102
-0x5130 = 0x5116
-0x5131 = 0x5115
-0x5132 = 0x5114
-0x5133 = 0x511A
-0x5134 = 0x5121
-0x5135 = 0x513A
-0x5136 = 0x5137
-0x5137 = 0x513C
-0x5138 = 0x513B
-0x5139 = 0x513F
-0x513A = 0x5140
-0x513B = 0x5152
-0x513C = 0x514C
-0x513D = 0x5154
-0x513E = 0x5162
-0x513F = 0x7AF8
-0x5140 = 0x5169
-0x5141 = 0x516A
-0x5142 = 0x516E
-0x5143 = 0x5180
-0x5144 = 0x5182
-0x5145 = 0x56D8
-0x5146 = 0x518C
-0x5147 = 0x5189
-0x5148 = 0x518F
-0x5149 = 0x5191
-0x514A = 0x5193
-0x514B = 0x5195
-0x514C = 0x5196
-0x514D = 0x51A4
-0x514E = 0x51A6
-0x514F = 0x51A2
-0x5150 = 0x51A9
-0x5151 = 0x51AA
-0x5152 = 0x51AB
-0x5153 = 0x51B3
-0x5154 = 0x51B1
-0x5155 = 0x51B2
-0x5156 = 0x51B0
-0x5157 = 0x51B5
-0x5158 = 0x51BD
-0x5159 = 0x51C5
-0x515A = 0x51C9
-0x515B = 0x51DB
-0x515C = 0x51E0
-0x515D = 0x8655
-0x515E = 0x51E9
-0x515F = 0x51ED
-0x5160 = 0x51F0
-0x5161 = 0x51F5
-0x5162 = 0x51FE
-0x5163 = 0x5204
-0x5164 = 0x520B
-0x5165 = 0x5214
-0x5166 = 0x520E
-0x5167 = 0x5227
-0x5168 = 0x522A
-0x5169 = 0x522E
-0x516A = 0x5233
-0x516B = 0x5239
-0x516C = 0x524F
-0x516D = 0x5244
-0x516E = 0x524B
-0x516F = 0x524C
-0x5170 = 0x525E
-0x5171 = 0x5254
-0x5172 = 0x526A
-0x5173 = 0x5274
-0x5174 = 0x5269
-0x5175 = 0x5273
-0x5176 = 0x527F
-0x5177 = 0x527D
-0x5178 = 0x528D
-0x5179 = 0x5294
-0x517A = 0x5292
-0x517B = 0x5271
-0x517C = 0x5288
-0x517D = 0x5291
-0x517E = 0x8FA8
-0x5221 = 0x8FA7
-0x5222 = 0x52AC
-0x5223 = 0x52AD
-0x5224 = 0x52BC
-0x5225 = 0x52B5
-0x5226 = 0x52C1
-0x5227 = 0x52CD
-0x5228 = 0x52D7
-0x5229 = 0x52DE
-0x522A = 0x52E3
-0x522B = 0x52E6
-0x522C = 0x98ED
-0x522D = 0x52E0
-0x522E = 0x52F3
-0x522F = 0x52F5
-0x5230 = 0x52F8
-0x5231 = 0x52F9
-0x5232 = 0x5306
-0x5233 = 0x5308
-0x5234 = 0x7538
-0x5235 = 0x530D
-0x5236 = 0x5310
-0x5237 = 0x530F
-0x5238 = 0x5315
-0x5239 = 0x531A
-0x523A = 0x5323
-0x523B = 0x532F
-0x523C = 0x5331
-0x523D = 0x5333
-0x523E = 0x5338
-0x523F = 0x5340
-0x5240 = 0x5346
-0x5241 = 0x5345
-0x5242 = 0x4E17
-0x5243 = 0x5349
-0x5244 = 0x534D
-0x5245 = 0x51D6
-0x5246 = 0x535E
-0x5247 = 0x5369
-0x5248 = 0x536E
-0x5249 = 0x5918
-0x524A = 0x537B
-0x524B = 0x5377
-0x524C = 0x5382
-0x524D = 0x5396
-0x524E = 0x53A0
-0x524F = 0x53A6
-0x5250 = 0x53A5
-0x5251 = 0x53AE
-0x5252 = 0x53B0
-0x5253 = 0x53B6
-0x5254 = 0x53C3
-0x5255 = 0x7C12
-0x5256 = 0x96D9
-0x5257 = 0x53DF
-0x5258 = 0x66FC
-0x5259 = 0x71EE
-0x525A = 0x53EE
-0x525B = 0x53E8
-0x525C = 0x53ED
-0x525D = 0x53FA
-0x525E = 0x5401
-0x525F = 0x543D
-0x5260 = 0x5440
-0x5261 = 0x542C
-0x5262 = 0x542D
-0x5263 = 0x543C
-0x5264 = 0x542E
-0x5265 = 0x5436
-0x5266 = 0x5429
-0x5267 = 0x541D
-0x5268 = 0x544E
-0x5269 = 0x548F
-0x526A = 0x5475
-0x526B = 0x548E
-0x526C = 0x545F
-0x526D = 0x5471
-0x526E = 0x5477
-0x526F = 0x5470
-0x5270 = 0x5492
-0x5271 = 0x547B
-0x5272 = 0x5480
-0x5273 = 0x5476
-0x5274 = 0x5484
-0x5275 = 0x5490
-0x5276 = 0x5486
-0x5277 = 0x54C7
-0x5278 = 0x54A2
-0x5279 = 0x54B8
-0x527A = 0x54A5
-0x527B = 0x54AC
-0x527C = 0x54C4
-0x527D = 0x54C8
-0x527E = 0x54A8
-0x5321 = 0x54AB
-0x5322 = 0x54C2
-0x5323 = 0x54A4
-0x5324 = 0x54BE
-0x5325 = 0x54BC
-0x5326 = 0x54D8
-0x5327 = 0x54E5
-0x5328 = 0x54E6
-0x5329 = 0x550F
-0x532A = 0x5514
-0x532B = 0x54FD
-0x532C = 0x54EE
-0x532D = 0x54ED
-0x532E = 0x54FA
-0x532F = 0x54E2
-0x5330 = 0x5539
-0x5331 = 0x5540
-0x5332 = 0x5563
-0x5333 = 0x554C
-0x5334 = 0x552E
-0x5335 = 0x555C
-0x5336 = 0x5545
-0x5337 = 0x5556
-0x5338 = 0x5557
-0x5339 = 0x5538
-0x533A = 0x5533
-0x533B = 0x555D
-0x533C = 0x5599
-0x533D = 0x5580
-0x533E = 0x54AF
-0x533F = 0x558A
-0x5340 = 0x559F
-0x5341 = 0x557B
-0x5342 = 0x557E
-0x5343 = 0x5598
-0x5344 = 0x559E
-0x5345 = 0x55AE
-0x5346 = 0x557C
-0x5347 = 0x5583
-0x5348 = 0x55A9
-0x5349 = 0x5587
-0x534A = 0x55A8
-0x534B = 0x55DA
-0x534C = 0x55C5
-0x534D = 0x55DF
-0x534E = 0x55C4
-0x534F = 0x55DC
-0x5350 = 0x55E4
-0x5351 = 0x55D4
-0x5352 = 0x5614
-0x5353 = 0x55F7
-0x5354 = 0x5616
-0x5355 = 0x55FE
-0x5356 = 0x55FD
-0x5357 = 0x561B
-0x5358 = 0x55F9
-0x5359 = 0x564E
-0x535A = 0x5650
-0x535B = 0x71DF
-0x535C = 0x5634
-0x535D = 0x5636
-0x535E = 0x5632
-0x535F = 0x5638
-0x5360 = 0x566B
-0x5361 = 0x5664
-0x5362 = 0x562F
-0x5363 = 0x566C
-0x5364 = 0x566A
-0x5365 = 0x5686
-0x5366 = 0x5680
-0x5367 = 0x568A
-0x5368 = 0x56A0
-0x5369 = 0x5694
-0x536A = 0x568F
-0x536B = 0x56A5
-0x536C = 0x56AE
-0x536D = 0x56B6
-0x536E = 0x56B4
-0x536F = 0x56C2
-0x5370 = 0x56BC
-0x5371 = 0x56C1
-0x5372 = 0x56C3
-0x5373 = 0x56C0
-0x5374 = 0x56C8
-0x5375 = 0x56CE
-0x5376 = 0x56D1
-0x5377 = 0x56D3
-0x5378 = 0x56D7
-0x5379 = 0x56EE
-0x537A = 0x56F9
-0x537B = 0x5700
-0x537C = 0x56FF
-0x537D = 0x5704
-0x537E = 0x5709
-0x5421 = 0x5708
-0x5422 = 0x570B
-0x5423 = 0x570D
-0x5424 = 0x5713
-0x5425 = 0x5718
-0x5426 = 0x5716
-0x5427 = 0x55C7
-0x5428 = 0x571C
-0x5429 = 0x5726
-0x542A = 0x5737
-0x542B = 0x5738
-0x542C = 0x574E
-0x542D = 0x573B
-0x542E = 0x5740
-0x542F = 0x574F
-0x5430 = 0x5769
-0x5431 = 0x57C0
-0x5432 = 0x5788
-0x5433 = 0x5761
-0x5434 = 0x577F
-0x5435 = 0x5789
-0x5436 = 0x5793
-0x5437 = 0x57A0
-0x5438 = 0x57B3
-0x5439 = 0x57A4
-0x543A = 0x57AA
-0x543B = 0x57B0
-0x543C = 0x57C3
-0x543D = 0x57C6
-0x543E = 0x57D4
-0x543F = 0x57D2
-0x5440 = 0x57D3
-0x5441 = 0x580A
-0x5442 = 0x57D6
-0x5443 = 0x57E3
-0x5444 = 0x580B
-0x5445 = 0x5819
-0x5446 = 0x581D
-0x5447 = 0x5872
-0x5448 = 0x5821
-0x5449 = 0x5862
-0x544A = 0x584B
-0x544B = 0x5870
-0x544C = 0x6BC0
-0x544D = 0x5852
-0x544E = 0x583D
-0x544F = 0x5879
-0x5450 = 0x5885
-0x5451 = 0x58B9
-0x5452 = 0x589F
-0x5453 = 0x58AB
-0x5454 = 0x58BA
-0x5455 = 0x58DE
-0x5456 = 0x58BB
-0x5457 = 0x58B8
-0x5458 = 0x58AE
-0x5459 = 0x58C5
-0x545A = 0x58D3
-0x545B = 0x58D1
-0x545C = 0x58D7
-0x545D = 0x58D9
-0x545E = 0x58D8
-0x545F = 0x58E5
-0x5460 = 0x58DC
-0x5461 = 0x58E4
-0x5462 = 0x58DF
-0x5463 = 0x58EF
-0x5464 = 0x58FA
-0x5465 = 0x58F9
-0x5466 = 0x58FB
-0x5467 = 0x58FC
-0x5468 = 0x58FD
-0x5469 = 0x5902
-0x546A = 0x590A
-0x546B = 0x5910
-0x546C = 0x591B
-0x546D = 0x68A6
-0x546E = 0x5925
-0x546F = 0x592C
-0x5470 = 0x592D
-0x5471 = 0x5932
-0x5472 = 0x5938
-0x5473 = 0x593E
-0x5474 = 0x7AD2
-0x5475 = 0x5955
-0x5476 = 0x5950
-0x5477 = 0x594E
-0x5478 = 0x595A
-0x5479 = 0x5958
-0x547A = 0x5962
-0x547B = 0x5960
-0x547C = 0x5967
-0x547D = 0x596C
-0x547E = 0x5969
-0x5521 = 0x5978
-0x5522 = 0x5981
-0x5523 = 0x599D
-0x5524 = 0x4F5E
-0x5525 = 0x4FAB
-0x5526 = 0x59A3
-0x5527 = 0x59B2
-0x5528 = 0x59C6
-0x5529 = 0x59E8
-0x552A = 0x59DC
-0x552B = 0x598D
-0x552C = 0x59D9
-0x552D = 0x59DA
-0x552E = 0x5A25
-0x552F = 0x5A1F
-0x5530 = 0x5A11
-0x5531 = 0x5A1C
-0x5532 = 0x5A09
-0x5533 = 0x5A1A
-0x5534 = 0x5A40
-0x5535 = 0x5A6C
-0x5536 = 0x5A49
-0x5537 = 0x5A35
-0x5538 = 0x5A36
-0x5539 = 0x5A62
-0x553A = 0x5A6A
-0x553B = 0x5A9A
-0x553C = 0x5ABC
-0x553D = 0x5ABE
-0x553E = 0x5ACB
-0x553F = 0x5AC2
-0x5540 = 0x5ABD
-0x5541 = 0x5AE3
-0x5542 = 0x5AD7
-0x5543 = 0x5AE6
-0x5544 = 0x5AE9
-0x5545 = 0x5AD6
-0x5546 = 0x5AFA
-0x5547 = 0x5AFB
-0x5548 = 0x5B0C
-0x5549 = 0x5B0B
-0x554A = 0x5B16
-0x554B = 0x5B32
-0x554C = 0x5AD0
-0x554D = 0x5B2A
-0x554E = 0x5B36
-0x554F = 0x5B3E
-0x5550 = 0x5B43
-0x5551 = 0x5B45
-0x5552 = 0x5B40
-0x5553 = 0x5B51
-0x5554 = 0x5B55
-0x5555 = 0x5B5A
-0x5556 = 0x5B5B
-0x5557 = 0x5B65
-0x5558 = 0x5B69
-0x5559 = 0x5B70
-0x555A = 0x5B73
-0x555B = 0x5B75
-0x555C = 0x5B78
-0x555D = 0x6588
-0x555E = 0x5B7A
-0x555F = 0x5B80
-0x5560 = 0x5B83
-0x5561 = 0x5BA6
-0x5562 = 0x5BB8
-0x5563 = 0x5BC3
-0x5564 = 0x5BC7
-0x5565 = 0x5BC9
-0x5566 = 0x5BD4
-0x5567 = 0x5BD0
-0x5568 = 0x5BE4
-0x5569 = 0x5BE6
-0x556A = 0x5BE2
-0x556B = 0x5BDE
-0x556C = 0x5BE5
-0x556D = 0x5BEB
-0x556E = 0x5BF0
-0x556F = 0x5BF6
-0x5570 = 0x5BF3
-0x5571 = 0x5C05
-0x5572 = 0x5C07
-0x5573 = 0x5C08
-0x5574 = 0x5C0D
-0x5575 = 0x5C13
-0x5576 = 0x5C20
-0x5577 = 0x5C22
-0x5578 = 0x5C28
-0x5579 = 0x5C38
-0x557A = 0x5C39
-0x557B = 0x5C41
-0x557C = 0x5C46
-0x557D = 0x5C4E
-0x557E = 0x5C53
-0x5621 = 0x5C50
-0x5622 = 0x5C4F
-0x5623 = 0x5B71
-0x5624 = 0x5C6C
-0x5625 = 0x5C6E
-0x5626 = 0x4E62
-0x5627 = 0x5C76
-0x5628 = 0x5C79
-0x5629 = 0x5C8C
-0x562A = 0x5C91
-0x562B = 0x5C94
-0x562C = 0x599B
-0x562D = 0x5CAB
-0x562E = 0x5CBB
-0x562F = 0x5CB6
-0x5630 = 0x5CBC
-0x5631 = 0x5CB7
-0x5632 = 0x5CC5
-0x5633 = 0x5CBE
-0x5634 = 0x5CC7
-0x5635 = 0x5CD9
-0x5636 = 0x5CE9
-0x5637 = 0x5CFD
-0x5638 = 0x5CFA
-0x5639 = 0x5CED
-0x563A = 0x5D8C
-0x563B = 0x5CEA
-0x563C = 0x5D0B
-0x563D = 0x5D15
-0x563E = 0x5D17
-0x563F = 0x5D5C
-0x5640 = 0x5D1F
-0x5641 = 0x5D1B
-0x5642 = 0x5D11
-0x5643 = 0x5D14
-0x5644 = 0x5D22
-0x5645 = 0x5D1A
-0x5646 = 0x5D19
-0x5647 = 0x5D18
-0x5648 = 0x5D4C
-0x5649 = 0x5D52
-0x564A = 0x5D4E
-0x564B = 0x5D4B
-0x564C = 0x5D6C
-0x564D = 0x5D73
-0x564E = 0x5D76
-0x564F = 0x5D87
-0x5650 = 0x5D84
-0x5651 = 0x5D82
-0x5652 = 0x5DA2
-0x5653 = 0x5D9D
-0x5654 = 0x5DAC
-0x5655 = 0x5DAE
-0x5656 = 0x5DBD
-0x5657 = 0x5D90
-0x5658 = 0x5DB7
-0x5659 = 0x5DBC
-0x565A = 0x5DC9
-0x565B = 0x5DCD
-0x565C = 0x5DD3
-0x565D = 0x5DD2
-0x565E = 0x5DD6
-0x565F = 0x5DDB
-0x5660 = 0x5DEB
-0x5661 = 0x5DF2
-0x5662 = 0x5DF5
-0x5663 = 0x5E0B
-0x5664 = 0x5E1A
-0x5665 = 0x5E19
-0x5666 = 0x5E11
-0x5667 = 0x5E1B
-0x5668 = 0x5E36
-0x5669 = 0x5E37
-0x566A = 0x5E44
-0x566B = 0x5E43
-0x566C = 0x5E40
-0x566D = 0x5E4E
-0x566E = 0x5E57
-0x566F = 0x5E54
-0x5670 = 0x5E5F
-0x5671 = 0x5E62
-0x5672 = 0x5E64
-0x5673 = 0x5E47
-0x5674 = 0x5E75
-0x5675 = 0x5E76
-0x5676 = 0x5E7A
-0x5677 = 0x9EBC
-0x5678 = 0x5E7F
-0x5679 = 0x5EA0
-0x567A = 0x5EC1
-0x567B = 0x5EC2
-0x567C = 0x5EC8
-0x567D = 0x5ED0
-0x567E = 0x5ECF
-0x5721 = 0x5ED6
-0x5722 = 0x5EE3
-0x5723 = 0x5EDD
-0x5724 = 0x5EDA
-0x5725 = 0x5EDB
-0x5726 = 0x5EE2
-0x5727 = 0x5EE1
-0x5728 = 0x5EE8
-0x5729 = 0x5EE9
-0x572A = 0x5EEC
-0x572B = 0x5EF1
-0x572C = 0x5EF3
-0x572D = 0x5EF0
-0x572E = 0x5EF4
-0x572F = 0x5EF8
-0x5730 = 0x5EFE
-0x5731 = 0x5F03
-0x5732 = 0x5F09
-0x5733 = 0x5F5D
-0x5734 = 0x5F5C
-0x5735 = 0x5F0B
-0x5736 = 0x5F11
-0x5737 = 0x5F16
-0x5738 = 0x5F29
-0x5739 = 0x5F2D
-0x573A = 0x5F38
-0x573B = 0x5F41
-0x573C = 0x5F48
-0x573D = 0x5F4C
-0x573E = 0x5F4E
-0x573F = 0x5F2F
-0x5740 = 0x5F51
-0x5741 = 0x5F56
-0x5742 = 0x5F57
-0x5743 = 0x5F59
-0x5744 = 0x5F61
-0x5745 = 0x5F6D
-0x5746 = 0x5F73
-0x5747 = 0x5F77
-0x5748 = 0x5F83
-0x5749 = 0x5F82
-0x574A = 0x5F7F
-0x574B = 0x5F8A
-0x574C = 0x5F88
-0x574D = 0x5F91
-0x574E = 0x5F87
-0x574F = 0x5F9E
-0x5750 = 0x5F99
-0x5751 = 0x5F98
-0x5752 = 0x5FA0
-0x5753 = 0x5FA8
-0x5754 = 0x5FAD
-0x5755 = 0x5FBC
-0x5756 = 0x5FD6
-0x5757 = 0x5FFB
-0x5758 = 0x5FE4
-0x5759 = 0x5FF8
-0x575A = 0x5FF1
-0x575B = 0x5FDD
-0x575C = 0x60B3
-0x575D = 0x5FFF
-0x575E = 0x6021
-0x575F = 0x6060
-0x5760 = 0x6019
-0x5761 = 0x6010
-0x5762 = 0x6029
-0x5763 = 0x600E
-0x5764 = 0x6031
-0x5765 = 0x601B
-0x5766 = 0x6015
-0x5767 = 0x602B
-0x5768 = 0x6026
-0x5769 = 0x600F
-0x576A = 0x603A
-0x576B = 0x605A
-0x576C = 0x6041
-0x576D = 0x606A
-0x576E = 0x6077
-0x576F = 0x605F
-0x5770 = 0x604A
-0x5771 = 0x6046
-0x5772 = 0x604D
-0x5773 = 0x6063
-0x5774 = 0x6043
-0x5775 = 0x6064
-0x5776 = 0x6042
-0x5777 = 0x606C
-0x5778 = 0x606B
-0x5779 = 0x6059
-0x577A = 0x6081
-0x577B = 0x608D
-0x577C = 0x60E7
-0x577D = 0x6083
-0x577E = 0x609A
-0x5821 = 0x6084
-0x5822 = 0x609B
-0x5823 = 0x6096
-0x5824 = 0x6097
-0x5825 = 0x6092
-0x5826 = 0x60A7
-0x5827 = 0x608B
-0x5828 = 0x60E1
-0x5829 = 0x60B8
-0x582A = 0x60E0
-0x582B = 0x60D3
-0x582C = 0x60B4
-0x582D = 0x5FF0
-0x582E = 0x60BD
-0x582F = 0x60C6
-0x5830 = 0x60B5
-0x5831 = 0x60D8
-0x5832 = 0x614D
-0x5833 = 0x6115
-0x5834 = 0x6106
-0x5835 = 0x60F6
-0x5836 = 0x60F7
-0x5837 = 0x6100
-0x5838 = 0x60F4
-0x5839 = 0x60FA
-0x583A = 0x6103
-0x583B = 0x6121
-0x583C = 0x60FB
-0x583D = 0x60F1
-0x583E = 0x610D
-0x583F = 0x610E
-0x5840 = 0x6147
-0x5841 = 0x613E
-0x5842 = 0x6128
-0x5843 = 0x6127
-0x5844 = 0x614A
-0x5845 = 0x613F
-0x5846 = 0x613C
-0x5847 = 0x612C
-0x5848 = 0x6134
-0x5849 = 0x613D
-0x584A = 0x6142
-0x584B = 0x6144
-0x584C = 0x6173
-0x584D = 0x6177
-0x584E = 0x6158
-0x584F = 0x6159
-0x5850 = 0x615A
-0x5851 = 0x616B
-0x5852 = 0x6174
-0x5853 = 0x616F
-0x5854 = 0x6165
-0x5855 = 0x6171
-0x5856 = 0x615F
-0x5857 = 0x615D
-0x5858 = 0x6153
-0x5859 = 0x6175
-0x585A = 0x6199
-0x585B = 0x6196
-0x585C = 0x6187
-0x585D = 0x61AC
-0x585E = 0x6194
-0x585F = 0x619A
-0x5860 = 0x618A
-0x5861 = 0x6191
-0x5862 = 0x61AB
-0x5863 = 0x61AE
-0x5864 = 0x61CC
-0x5865 = 0x61CA
-0x5866 = 0x61C9
-0x5867 = 0x61F7
-0x5868 = 0x61C8
-0x5869 = 0x61C3
-0x586A = 0x61C6
-0x586B = 0x61BA
-0x586C = 0x61CB
-0x586D = 0x7F79
-0x586E = 0x61CD
-0x586F = 0x61E6
-0x5870 = 0x61E3
-0x5871 = 0x61F6
-0x5872 = 0x61FA
-0x5873 = 0x61F4
-0x5874 = 0x61FF
-0x5875 = 0x61FD
-0x5876 = 0x61FC
-0x5877 = 0x61FE
-0x5878 = 0x6200
-0x5879 = 0x6208
-0x587A = 0x6209
-0x587B = 0x620D
-0x587C = 0x620C
-0x587D = 0x6214
-0x587E = 0x621B
-0x5921 = 0x621E
-0x5922 = 0x6221
-0x5923 = 0x622A
-0x5924 = 0x622E
-0x5925 = 0x6230
-0x5926 = 0x6232
-0x5927 = 0x6233
-0x5928 = 0x6241
-0x5929 = 0x624E
-0x592A = 0x625E
-0x592B = 0x6263
-0x592C = 0x625B
-0x592D = 0x6260
-0x592E = 0x6268
-0x592F = 0x627C
-0x5930 = 0x6282
-0x5931 = 0x6289
-0x5932 = 0x627E
-0x5933 = 0x6292
-0x5934 = 0x6293
-0x5935 = 0x6296
-0x5936 = 0x62D4
-0x5937 = 0x6283
-0x5938 = 0x6294
-0x5939 = 0x62D7
-0x593A = 0x62D1
-0x593B = 0x62BB
-0x593C = 0x62CF
-0x593D = 0x62FF
-0x593E = 0x62C6
-0x593F = 0x64D4
-0x5940 = 0x62C8
-0x5941 = 0x62DC
-0x5942 = 0x62CC
-0x5943 = 0x62CA
-0x5944 = 0x62C2
-0x5945 = 0x62C7
-0x5946 = 0x629B
-0x5947 = 0x62C9
-0x5948 = 0x630C
-0x5949 = 0x62EE
-0x594A = 0x62F1
-0x594B = 0x6327
-0x594C = 0x6302
-0x594D = 0x6308
-0x594E = 0x62EF
-0x594F = 0x62F5
-0x5950 = 0x6350
-0x5951 = 0x633E
-0x5952 = 0x634D
-0x5953 = 0x641C
-0x5954 = 0x634F
-0x5955 = 0x6396
-0x5956 = 0x638E
-0x5957 = 0x6380
-0x5958 = 0x63AB
-0x5959 = 0x6376
-0x595A = 0x63A3
-0x595B = 0x638F
-0x595C = 0x6389
-0x595D = 0x639F
-0x595E = 0x63B5
-0x595F = 0x636B
-0x5960 = 0x6369
-0x5961 = 0x63BE
-0x5962 = 0x63E9
-0x5963 = 0x63C0
-0x5964 = 0x63C6
-0x5965 = 0x63E3
-0x5966 = 0x63C9
-0x5967 = 0x63D2
-0x5968 = 0x63F6
-0x5969 = 0x63C4
-0x596A = 0x6416
-0x596B = 0x6434
-0x596C = 0x6406
-0x596D = 0x6413
-0x596E = 0x6426
-0x596F = 0x6436
-0x5970 = 0x651D
-0x5971 = 0x6417
-0x5972 = 0x6428
-0x5973 = 0x640F
-0x5974 = 0x6467
-0x5975 = 0x646F
-0x5976 = 0x6476
-0x5977 = 0x644E
-0x5978 = 0x652A
-0x5979 = 0x6495
-0x597A = 0x6493
-0x597B = 0x64A5
-0x597C = 0x64A9
-0x597D = 0x6488
-0x597E = 0x64BC
-0x5A21 = 0x64DA
-0x5A22 = 0x64D2
-0x5A23 = 0x64C5
-0x5A24 = 0x64C7
-0x5A25 = 0x64BB
-0x5A26 = 0x64D8
-0x5A27 = 0x64C2
-0x5A28 = 0x64F1
-0x5A29 = 0x64E7
-0x5A2A = 0x8209
-0x5A2B = 0x64E0
-0x5A2C = 0x64E1
-0x5A2D = 0x62AC
-0x5A2E = 0x64E3
-0x5A2F = 0x64EF
-0x5A30 = 0x652C
-0x5A31 = 0x64F6
-0x5A32 = 0x64F4
-0x5A33 = 0x64F2
-0x5A34 = 0x64FA
-0x5A35 = 0x6500
-0x5A36 = 0x64FD
-0x5A37 = 0x6518
-0x5A38 = 0x651C
-0x5A39 = 0x6505
-0x5A3A = 0x6524
-0x5A3B = 0x6523
-0x5A3C = 0x652B
-0x5A3D = 0x6534
-0x5A3E = 0x6535
-0x5A3F = 0x6537
-0x5A40 = 0x6536
-0x5A41 = 0x6538
-0x5A42 = 0x754B
-0x5A43 = 0x6548
-0x5A44 = 0x6556
-0x5A45 = 0x6555
-0x5A46 = 0x654D
-0x5A47 = 0x6558
-0x5A48 = 0x655E
-0x5A49 = 0x655D
-0x5A4A = 0x6572
-0x5A4B = 0x6578
-0x5A4C = 0x6582
-0x5A4D = 0x6583
-0x5A4E = 0x8B8A
-0x5A4F = 0x659B
-0x5A50 = 0x659F
-0x5A51 = 0x65AB
-0x5A52 = 0x65B7
-0x5A53 = 0x65C3
-0x5A54 = 0x65C6
-0x5A55 = 0x65C1
-0x5A56 = 0x65C4
-0x5A57 = 0x65CC
-0x5A58 = 0x65D2
-0x5A59 = 0x65DB
-0x5A5A = 0x65D9
-0x5A5B = 0x65E0
-0x5A5C = 0x65E1
-0x5A5D = 0x65F1
-0x5A5E = 0x6772
-0x5A5F = 0x660A
-0x5A60 = 0x6603
-0x5A61 = 0x65FB
-0x5A62 = 0x6773
-0x5A63 = 0x6635
-0x5A64 = 0x6636
-0x5A65 = 0x6634
-0x5A66 = 0x661C
-0x5A67 = 0x664F
-0x5A68 = 0x6644
-0x5A69 = 0x6649
-0x5A6A = 0x6641
-0x5A6B = 0x665E
-0x5A6C = 0x665D
-0x5A6D = 0x6664
-0x5A6E = 0x6667
-0x5A6F = 0x6668
-0x5A70 = 0x665F
-0x5A71 = 0x6662
-0x5A72 = 0x6670
-0x5A73 = 0x6683
-0x5A74 = 0x6688
-0x5A75 = 0x668E
-0x5A76 = 0x6689
-0x5A77 = 0x6684
-0x5A78 = 0x6698
-0x5A79 = 0x669D
-0x5A7A = 0x66C1
-0x5A7B = 0x66B9
-0x5A7C = 0x66C9
-0x5A7D = 0x66BE
-0x5A7E = 0x66BC
-0x5B21 = 0x66C4
-0x5B22 = 0x66B8
-0x5B23 = 0x66D6
-0x5B24 = 0x66DA
-0x5B25 = 0x66E0
-0x5B26 = 0x663F
-0x5B27 = 0x66E6
-0x5B28 = 0x66E9
-0x5B29 = 0x66F0
-0x5B2A = 0x66F5
-0x5B2B = 0x66F7
-0x5B2C = 0x670F
-0x5B2D = 0x6716
-0x5B2E = 0x671E
-0x5B2F = 0x6726
-0x5B30 = 0x6727
-0x5B31 = 0x9738
-0x5B32 = 0x672E
-0x5B33 = 0x673F
-0x5B34 = 0x6736
-0x5B35 = 0x6741
-0x5B36 = 0x6738
-0x5B37 = 0x6737
-0x5B38 = 0x6746
-0x5B39 = 0x675E
-0x5B3A = 0x6760
-0x5B3B = 0x6759
-0x5B3C = 0x6763
-0x5B3D = 0x6764
-0x5B3E = 0x6789
-0x5B3F = 0x6770
-0x5B40 = 0x67A9
-0x5B41 = 0x677C
-0x5B42 = 0x676A
-0x5B43 = 0x678C
-0x5B44 = 0x678B
-0x5B45 = 0x67A6
-0x5B46 = 0x67A1
-0x5B47 = 0x6785
-0x5B48 = 0x67B7
-0x5B49 = 0x67EF
-0x5B4A = 0x67B4
-0x5B4B = 0x67EC
-0x5B4C = 0x67B3
-0x5B4D = 0x67E9
-0x5B4E = 0x67B8
-0x5B4F = 0x67E4
-0x5B50 = 0x67DE
-0x5B51 = 0x67DD
-0x5B52 = 0x67E2
-0x5B53 = 0x67EE
-0x5B54 = 0x67B9
-0x5B55 = 0x67CE
-0x5B56 = 0x67C6
-0x5B57 = 0x67E7
-0x5B58 = 0x6A9C
-0x5B59 = 0x681E
-0x5B5A = 0x6846
-0x5B5B = 0x6829
-0x5B5C = 0x6840
-0x5B5D = 0x684D
-0x5B5E = 0x6832
-0x5B5F = 0x684E
-0x5B60 = 0x68B3
-0x5B61 = 0x682B
-0x5B62 = 0x6859
-0x5B63 = 0x6863
-0x5B64 = 0x6877
-0x5B65 = 0x687F
-0x5B66 = 0x689F
-0x5B67 = 0x688F
-0x5B68 = 0x68AD
-0x5B69 = 0x6894
-0x5B6A = 0x689D
-0x5B6B = 0x689B
-0x5B6C = 0x6883
-0x5B6D = 0x6AAE
-0x5B6E = 0x68B9
-0x5B6F = 0x6874
-0x5B70 = 0x68B5
-0x5B71 = 0x68A0
-0x5B72 = 0x68BA
-0x5B73 = 0x690F
-0x5B74 = 0x688D
-0x5B75 = 0x687E
-0x5B76 = 0x6901
-0x5B77 = 0x68CA
-0x5B78 = 0x6908
-0x5B79 = 0x68D8
-0x5B7A = 0x6922
-0x5B7B = 0x6926
-0x5B7C = 0x68E1
-0x5B7D = 0x690C
-0x5B7E = 0x68CD
-0x5C21 = 0x68D4
-0x5C22 = 0x68E7
-0x5C23 = 0x68D5
-0x5C24 = 0x6936
-0x5C25 = 0x6912
-0x5C26 = 0x6904
-0x5C27 = 0x68D7
-0x5C28 = 0x68E3
-0x5C29 = 0x6925
-0x5C2A = 0x68F9
-0x5C2B = 0x68E0
-0x5C2C = 0x68EF
-0x5C2D = 0x6928
-0x5C2E = 0x692A
-0x5C2F = 0x691A
-0x5C30 = 0x6923
-0x5C31 = 0x6921
-0x5C32 = 0x68C6
-0x5C33 = 0x6979
-0x5C34 = 0x6977
-0x5C35 = 0x695C
-0x5C36 = 0x6978
-0x5C37 = 0x696B
-0x5C38 = 0x6954
-0x5C39 = 0x697E
-0x5C3A = 0x696E
-0x5C3B = 0x6939
-0x5C3C = 0x6974
-0x5C3D = 0x693D
-0x5C3E = 0x6959
-0x5C3F = 0x6930
-0x5C40 = 0x6961
-0x5C41 = 0x695E
-0x5C42 = 0x695D
-0x5C43 = 0x6981
-0x5C44 = 0x696A
-0x5C45 = 0x69B2
-0x5C46 = 0x69AE
-0x5C47 = 0x69D0
-0x5C48 = 0x69BF
-0x5C49 = 0x69C1
-0x5C4A = 0x69D3
-0x5C4B = 0x69BE
-0x5C4C = 0x69CE
-0x5C4D = 0x5BE8
-0x5C4E = 0x69CA
-0x5C4F = 0x69DD
-0x5C50 = 0x69BB
-0x5C51 = 0x69C3
-0x5C52 = 0x69A7
-0x5C53 = 0x6A2E
-0x5C54 = 0x6991
-0x5C55 = 0x69A0
-0x5C56 = 0x699C
-0x5C57 = 0x6995
-0x5C58 = 0x69B4
-0x5C59 = 0x69DE
-0x5C5A = 0x69E8
-0x5C5B = 0x6A02
-0x5C5C = 0x6A1B
-0x5C5D = 0x69FF
-0x5C5E = 0x6B0A
-0x5C5F = 0x69F9
-0x5C60 = 0x69F2
-0x5C61 = 0x69E7
-0x5C62 = 0x6A05
-0x5C63 = 0x69B1
-0x5C64 = 0x6A1E
-0x5C65 = 0x69ED
-0x5C66 = 0x6A14
-0x5C67 = 0x69EB
-0x5C68 = 0x6A0A
-0x5C69 = 0x6A12
-0x5C6A = 0x6AC1
-0x5C6B = 0x6A23
-0x5C6C = 0x6A13
-0x5C6D = 0x6A44
-0x5C6E = 0x6A0C
-0x5C6F = 0x6A72
-0x5C70 = 0x6A36
-0x5C71 = 0x6A78
-0x5C72 = 0x6A47
-0x5C73 = 0x6A62
-0x5C74 = 0x6A59
-0x5C75 = 0x6A66
-0x5C76 = 0x6A48
-0x5C77 = 0x6A38
-0x5C78 = 0x6A22
-0x5C79 = 0x6A90
-0x5C7A = 0x6A8D
-0x5C7B = 0x6AA0
-0x5C7C = 0x6A84
-0x5C7D = 0x6AA2
-0x5C7E = 0x6AA3
-0x5D21 = 0x6A97
-0x5D22 = 0x8617
-0x5D23 = 0x6ABB
-0x5D24 = 0x6AC3
-0x5D25 = 0x6AC2
-0x5D26 = 0x6AB8
-0x5D27 = 0x6AB3
-0x5D28 = 0x6AAC
-0x5D29 = 0x6ADE
-0x5D2A = 0x6AD1
-0x5D2B = 0x6ADF
-0x5D2C = 0x6AAA
-0x5D2D = 0x6ADA
-0x5D2E = 0x6AEA
-0x5D2F = 0x6AFB
-0x5D30 = 0x6B05
-0x5D31 = 0x8616
-0x5D32 = 0x6AFA
-0x5D33 = 0x6B12
-0x5D34 = 0x6B16
-0x5D35 = 0x9B31
-0x5D36 = 0x6B1F
-0x5D37 = 0x6B38
-0x5D38 = 0x6B37
-0x5D39 = 0x76DC
-0x5D3A = 0x6B39
-0x5D3B = 0x98EE
-0x5D3C = 0x6B47
-0x5D3D = 0x6B43
-0x5D3E = 0x6B49
-0x5D3F = 0x6B50
-0x5D40 = 0x6B59
-0x5D41 = 0x6B54
-0x5D42 = 0x6B5B
-0x5D43 = 0x6B5F
-0x5D44 = 0x6B61
-0x5D45 = 0x6B78
-0x5D46 = 0x6B79
-0x5D47 = 0x6B7F
-0x5D48 = 0x6B80
-0x5D49 = 0x6B84
-0x5D4A = 0x6B83
-0x5D4B = 0x6B8D
-0x5D4C = 0x6B98
-0x5D4D = 0x6B95
-0x5D4E = 0x6B9E
-0x5D4F = 0x6BA4
-0x5D50 = 0x6BAA
-0x5D51 = 0x6BAB
-0x5D52 = 0x6BAF
-0x5D53 = 0x6BB2
-0x5D54 = 0x6BB1
-0x5D55 = 0x6BB3
-0x5D56 = 0x6BB7
-0x5D57 = 0x6BBC
-0x5D58 = 0x6BC6
-0x5D59 = 0x6BCB
-0x5D5A = 0x6BD3
-0x5D5B = 0x6BDF
-0x5D5C = 0x6BEC
-0x5D5D = 0x6BEB
-0x5D5E = 0x6BF3
-0x5D5F = 0x6BEF
-0x5D60 = 0x9EBE
-0x5D61 = 0x6C08
-0x5D62 = 0x6C13
-0x5D63 = 0x6C14
-0x5D64 = 0x6C1B
-0x5D65 = 0x6C24
-0x5D66 = 0x6C23
-0x5D67 = 0x6C5E
-0x5D68 = 0x6C55
-0x5D69 = 0x6C62
-0x5D6A = 0x6C6A
-0x5D6B = 0x6C82
-0x5D6C = 0x6C8D
-0x5D6D = 0x6C9A
-0x5D6E = 0x6C81
-0x5D6F = 0x6C9B
-0x5D70 = 0x6C7E
-0x5D71 = 0x6C68
-0x5D72 = 0x6C73
-0x5D73 = 0x6C92
-0x5D74 = 0x6C90
-0x5D75 = 0x6CC4
-0x5D76 = 0x6CF1
-0x5D77 = 0x6CD3
-0x5D78 = 0x6CBD
-0x5D79 = 0x6CD7
-0x5D7A = 0x6CC5
-0x5D7B = 0x6CDD
-0x5D7C = 0x6CAE
-0x5D7D = 0x6CB1
-0x5D7E = 0x6CBE
-0x5E21 = 0x6CBA
-0x5E22 = 0x6CDB
-0x5E23 = 0x6CEF
-0x5E24 = 0x6CD9
-0x5E25 = 0x6CEA
-0x5E26 = 0x6D1F
-0x5E27 = 0x884D
-0x5E28 = 0x6D36
-0x5E29 = 0x6D2B
-0x5E2A = 0x6D3D
-0x5E2B = 0x6D38
-0x5E2C = 0x6D19
-0x5E2D = 0x6D35
-0x5E2E = 0x6D33
-0x5E2F = 0x6D12
-0x5E30 = 0x6D0C
-0x5E31 = 0x6D63
-0x5E32 = 0x6D93
-0x5E33 = 0x6D64
-0x5E34 = 0x6D5A
-0x5E35 = 0x6D79
-0x5E36 = 0x6D59
-0x5E37 = 0x6D8E
-0x5E38 = 0x6D95
-0x5E39 = 0x6FE4
-0x5E3A = 0x6D85
-0x5E3B = 0x6DF9
-0x5E3C = 0x6E15
-0x5E3D = 0x6E0A
-0x5E3E = 0x6DB5
-0x5E3F = 0x6DC7
-0x5E40 = 0x6DE6
-0x5E41 = 0x6DB8
-0x5E42 = 0x6DC6
-0x5E43 = 0x6DEC
-0x5E44 = 0x6DDE
-0x5E45 = 0x6DCC
-0x5E46 = 0x6DE8
-0x5E47 = 0x6DD2
-0x5E48 = 0x6DC5
-0x5E49 = 0x6DFA
-0x5E4A = 0x6DD9
-0x5E4B = 0x6DE4
-0x5E4C = 0x6DD5
-0x5E4D = 0x6DEA
-0x5E4E = 0x6DEE
-0x5E4F = 0x6E2D
-0x5E50 = 0x6E6E
-0x5E51 = 0x6E2E
-0x5E52 = 0x6E19
-0x5E53 = 0x6E72
-0x5E54 = 0x6E5F
-0x5E55 = 0x6E3E
-0x5E56 = 0x6E23
-0x5E57 = 0x6E6B
-0x5E58 = 0x6E2B
-0x5E59 = 0x6E76
-0x5E5A = 0x6E4D
-0x5E5B = 0x6E1F
-0x5E5C = 0x6E43
-0x5E5D = 0x6E3A
-0x5E5E = 0x6E4E
-0x5E5F = 0x6E24
-0x5E60 = 0x6EFF
-0x5E61 = 0x6E1D
-0x5E62 = 0x6E38
-0x5E63 = 0x6E82
-0x5E64 = 0x6EAA
-0x5E65 = 0x6E98
-0x5E66 = 0x6EC9
-0x5E67 = 0x6EB7
-0x5E68 = 0x6ED3
-0x5E69 = 0x6EBD
-0x5E6A = 0x6EAF
-0x5E6B = 0x6EC4
-0x5E6C = 0x6EB2
-0x5E6D = 0x6ED4
-0x5E6E = 0x6ED5
-0x5E6F = 0x6E8F
-0x5E70 = 0x6EA5
-0x5E71 = 0x6EC2
-0x5E72 = 0x6E9F
-0x5E73 = 0x6F41
-0x5E74 = 0x6F11
-0x5E75 = 0x704C
-0x5E76 = 0x6EEC
-0x5E77 = 0x6EF8
-0x5E78 = 0x6EFE
-0x5E79 = 0x6F3F
-0x5E7A = 0x6EF2
-0x5E7B = 0x6F31
-0x5E7C = 0x6EEF
-0x5E7D = 0x6F32
-0x5E7E = 0x6ECC
-0x5F21 = 0x6F3E
-0x5F22 = 0x6F13
-0x5F23 = 0x6EF7
-0x5F24 = 0x6F86
-0x5F25 = 0x6F7A
-0x5F26 = 0x6F78
-0x5F27 = 0x6F81
-0x5F28 = 0x6F80
-0x5F29 = 0x6F6F
-0x5F2A = 0x6F5B
-0x5F2B = 0x6FF3
-0x5F2C = 0x6F6D
-0x5F2D = 0x6F82
-0x5F2E = 0x6F7C
-0x5F2F = 0x6F58
-0x5F30 = 0x6F8E
-0x5F31 = 0x6F91
-0x5F32 = 0x6FC2
-0x5F33 = 0x6F66
-0x5F34 = 0x6FB3
-0x5F35 = 0x6FA3
-0x5F36 = 0x6FA1
-0x5F37 = 0x6FA4
-0x5F38 = 0x6FB9
-0x5F39 = 0x6FC6
-0x5F3A = 0x6FAA
-0x5F3B = 0x6FDF
-0x5F3C = 0x6FD5
-0x5F3D = 0x6FEC
-0x5F3E = 0x6FD4
-0x5F3F = 0x6FD8
-0x5F40 = 0x6FF1
-0x5F41 = 0x6FEE
-0x5F42 = 0x6FDB
-0x5F43 = 0x7009
-0x5F44 = 0x700B
-0x5F45 = 0x6FFA
-0x5F46 = 0x7011
-0x5F47 = 0x7001
-0x5F48 = 0x700F
-0x5F49 = 0x6FFE
-0x5F4A = 0x701B
-0x5F4B = 0x701A
-0x5F4C = 0x6F74
-0x5F4D = 0x701D
-0x5F4E = 0x7018
-0x5F4F = 0x701F
-0x5F50 = 0x7030
-0x5F51 = 0x703E
-0x5F52 = 0x7032
-0x5F53 = 0x7051
-0x5F54 = 0x7063
-0x5F55 = 0x7099
-0x5F56 = 0x7092
-0x5F57 = 0x70AF
-0x5F58 = 0x70F1
-0x5F59 = 0x70AC
-0x5F5A = 0x70B8
-0x5F5B = 0x70B3
-0x5F5C = 0x70AE
-0x5F5D = 0x70DF
-0x5F5E = 0x70CB
-0x5F5F = 0x70DD
-0x5F60 = 0x70D9
-0x5F61 = 0x7109
-0x5F62 = 0x70FD
-0x5F63 = 0x711C
-0x5F64 = 0x7119
-0x5F65 = 0x7165
-0x5F66 = 0x7155
-0x5F67 = 0x7188
-0x5F68 = 0x7166
-0x5F69 = 0x7162
-0x5F6A = 0x714C
-0x5F6B = 0x7156
-0x5F6C = 0x716C
-0x5F6D = 0x718F
-0x5F6E = 0x71FB
-0x5F6F = 0x7184
-0x5F70 = 0x7195
-0x5F71 = 0x71A8
-0x5F72 = 0x71AC
-0x5F73 = 0x71D7
-0x5F74 = 0x71B9
-0x5F75 = 0x71BE
-0x5F76 = 0x71D2
-0x5F77 = 0x71C9
-0x5F78 = 0x71D4
-0x5F79 = 0x71CE
-0x5F7A = 0x71E0
-0x5F7B = 0x71EC
-0x5F7C = 0x71E7
-0x5F7D = 0x71F5
-0x5F7E = 0x71FC
-0x6021 = 0x71F9
-0x6022 = 0x71FF
-0x6023 = 0x720D
-0x6024 = 0x7210
-0x6025 = 0x721B
-0x6026 = 0x7228
-0x6027 = 0x722D
-0x6028 = 0x722C
-0x6029 = 0x7230
-0x602A = 0x7232
-0x602B = 0x723B
-0x602C = 0x723C
-0x602D = 0x723F
-0x602E = 0x7240
-0x602F = 0x7246
-0x6030 = 0x724B
-0x6031 = 0x7258
-0x6032 = 0x7274
-0x6033 = 0x727E
-0x6034 = 0x7282
-0x6035 = 0x7281
-0x6036 = 0x7287
-0x6037 = 0x7292
-0x6038 = 0x7296
-0x6039 = 0x72A2
-0x603A = 0x72A7
-0x603B = 0x72B9
-0x603C = 0x72B2
-0x603D = 0x72C3
-0x603E = 0x72C6
-0x603F = 0x72C4
-0x6040 = 0x72CE
-0x6041 = 0x72D2
-0x6042 = 0x72E2
-0x6043 = 0x72E0
-0x6044 = 0x72E1
-0x6045 = 0x72F9
-0x6046 = 0x72F7
-0x6047 = 0x500F
-0x6048 = 0x7317
-0x6049 = 0x730A
-0x604A = 0x731C
-0x604B = 0x7316
-0x604C = 0x731D
-0x604D = 0x7334
-0x604E = 0x732F
-0x604F = 0x7329
-0x6050 = 0x7325
-0x6051 = 0x733E
-0x6052 = 0x734E
-0x6053 = 0x734F
-0x6054 = 0x9ED8
-0x6055 = 0x7357
-0x6056 = 0x736A
-0x6057 = 0x7368
-0x6058 = 0x7370
-0x6059 = 0x7378
-0x605A = 0x7375
-0x605B = 0x737B
-0x605C = 0x737A
-0x605D = 0x73C8
-0x605E = 0x73B3
-0x605F = 0x73CE
-0x6060 = 0x73BB
-0x6061 = 0x73C0
-0x6062 = 0x73E5
-0x6063 = 0x73EE
-0x6064 = 0x73DE
-0x6065 = 0x74A2
-0x6066 = 0x7405
-0x6067 = 0x746F
-0x6068 = 0x7425
-0x6069 = 0x73F8
-0x606A = 0x7432
-0x606B = 0x743A
-0x606C = 0x7455
-0x606D = 0x743F
-0x606E = 0x745F
-0x606F = 0x7459
-0x6070 = 0x7441
-0x6071 = 0x745C
-0x6072 = 0x7469
-0x6073 = 0x7470
-0x6074 = 0x7463
-0x6075 = 0x746A
-0x6076 = 0x7476
-0x6077 = 0x747E
-0x6078 = 0x748B
-0x6079 = 0x749E
-0x607A = 0x74A7
-0x607B = 0x74CA
-0x607C = 0x74CF
-0x607D = 0x74D4
-0x607E = 0x73F1
-0x6121 = 0x74E0
-0x6122 = 0x74E3
-0x6123 = 0x74E7
-0x6124 = 0x74E9
-0x6125 = 0x74EE
-0x6126 = 0x74F2
-0x6127 = 0x74F0
-0x6128 = 0x74F1
-0x6129 = 0x74F8
-0x612A = 0x74F7
-0x612B = 0x7504
-0x612C = 0x7503
-0x612D = 0x7505
-0x612E = 0x750C
-0x612F = 0x750E
-0x6130 = 0x750D
-0x6131 = 0x7515
-0x6132 = 0x7513
-0x6133 = 0x751E
-0x6134 = 0x7526
-0x6135 = 0x752C
-0x6136 = 0x753C
-0x6137 = 0x7544
-0x6138 = 0x754D
-0x6139 = 0x754A
-0x613A = 0x7549
-0x613B = 0x755B
-0x613C = 0x7546
-0x613D = 0x755A
-0x613E = 0x7569
-0x613F = 0x7564
-0x6140 = 0x7567
-0x6141 = 0x756B
-0x6142 = 0x756D
-0x6143 = 0x7578
-0x6144 = 0x7576
-0x6145 = 0x7586
-0x6146 = 0x7587
-0x6147 = 0x7574
-0x6148 = 0x758A
-0x6149 = 0x7589
-0x614A = 0x7582
-0x614B = 0x7594
-0x614C = 0x759A
-0x614D = 0x759D
-0x614E = 0x75A5
-0x614F = 0x75A3
-0x6150 = 0x75C2
-0x6151 = 0x75B3
-0x6152 = 0x75C3
-0x6153 = 0x75B5
-0x6154 = 0x75BD
-0x6155 = 0x75B8
-0x6156 = 0x75BC
-0x6157 = 0x75B1
-0x6158 = 0x75CD
-0x6159 = 0x75CA
-0x615A = 0x75D2
-0x615B = 0x75D9
-0x615C = 0x75E3
-0x615D = 0x75DE
-0x615E = 0x75FE
-0x615F = 0x75FF
-0x6160 = 0x75FC
-0x6161 = 0x7601
-0x6162 = 0x75F0
-0x6163 = 0x75FA
-0x6164 = 0x75F2
-0x6165 = 0x75F3
-0x6166 = 0x760B
-0x6167 = 0x760D
-0x6168 = 0x7609
-0x6169 = 0x761F
-0x616A = 0x7627
-0x616B = 0x7620
-0x616C = 0x7621
-0x616D = 0x7622
-0x616E = 0x7624
-0x616F = 0x7634
-0x6170 = 0x7630
-0x6171 = 0x763B
-0x6172 = 0x7647
-0x6173 = 0x7648
-0x6174 = 0x7646
-0x6175 = 0x765C
-0x6176 = 0x7658
-0x6177 = 0x7661
-0x6178 = 0x7662
-0x6179 = 0x7668
-0x617A = 0x7669
-0x617B = 0x766A
-0x617C = 0x7667
-0x617D = 0x766C
-0x617E = 0x7670
-0x6221 = 0x7672
-0x6222 = 0x7676
-0x6223 = 0x7678
-0x6224 = 0x767C
-0x6225 = 0x7680
-0x6226 = 0x7683
-0x6227 = 0x7688
-0x6228 = 0x768B
-0x6229 = 0x768E
-0x622A = 0x7696
-0x622B = 0x7693
-0x622C = 0x7699
-0x622D = 0x769A
-0x622E = 0x76B0
-0x622F = 0x76B4
-0x6230 = 0x76B8
-0x6231 = 0x76B9
-0x6232 = 0x76BA
-0x6233 = 0x76C2
-0x6234 = 0x76CD
-0x6235 = 0x76D6
-0x6236 = 0x76D2
-0x6237 = 0x76DE
-0x6238 = 0x76E1
-0x6239 = 0x76E5
-0x623A = 0x76E7
-0x623B = 0x76EA
-0x623C = 0x862F
-0x623D = 0x76FB
-0x623E = 0x7708
-0x623F = 0x7707
-0x6240 = 0x7704
-0x6241 = 0x7729
-0x6242 = 0x7724
-0x6243 = 0x771E
-0x6244 = 0x7725
-0x6245 = 0x7726
-0x6246 = 0x771B
-0x6247 = 0x7737
-0x6248 = 0x7738
-0x6249 = 0x7747
-0x624A = 0x775A
-0x624B = 0x7768
-0x624C = 0x776B
-0x624D = 0x775B
-0x624E = 0x7765
-0x624F = 0x777F
-0x6250 = 0x777E
-0x6251 = 0x7779
-0x6252 = 0x778E
-0x6253 = 0x778B
-0x6254 = 0x7791
-0x6255 = 0x77A0
-0x6256 = 0x779E
-0x6257 = 0x77B0
-0x6258 = 0x77B6
-0x6259 = 0x77B9
-0x625A = 0x77BF
-0x625B = 0x77BC
-0x625C = 0x77BD
-0x625D = 0x77BB
-0x625E = 0x77C7
-0x625F = 0x77CD
-0x6260 = 0x77D7
-0x6261 = 0x77DA
-0x6262 = 0x77DC
-0x6263 = 0x77E3
-0x6264 = 0x77EE
-0x6265 = 0x77FC
-0x6266 = 0x780C
-0x6267 = 0x7812
-0x6268 = 0x7926
-0x6269 = 0x7820
-0x626A = 0x792A
-0x626B = 0x7845
-0x626C = 0x788E
-0x626D = 0x7874
-0x626E = 0x7886
-0x626F = 0x787C
-0x6270 = 0x789A
-0x6271 = 0x788C
-0x6272 = 0x78A3
-0x6273 = 0x78B5
-0x6274 = 0x78AA
-0x6275 = 0x78AF
-0x6276 = 0x78D1
-0x6277 = 0x78C6
-0x6278 = 0x78CB
-0x6279 = 0x78D4
-0x627A = 0x78BE
-0x627B = 0x78BC
-0x627C = 0x78C5
-0x627D = 0x78CA
-0x627E = 0x78EC
-0x6321 = 0x78E7
-0x6322 = 0x78DA
-0x6323 = 0x78FD
-0x6324 = 0x78F4
-0x6325 = 0x7907
-0x6326 = 0x7912
-0x6327 = 0x7911
-0x6328 = 0x7919
-0x6329 = 0x792C
-0x632A = 0x792B
-0x632B = 0x7940
-0x632C = 0x7960
-0x632D = 0x7957
-0x632E = 0x795F
-0x632F = 0x795A
-0x6330 = 0x7955
-0x6331 = 0x7953
-0x6332 = 0x797A
-0x6333 = 0x797F
-0x6334 = 0x798A
-0x6335 = 0x799D
-0x6336 = 0x79A7
-0x6337 = 0x9F4B
-0x6338 = 0x79AA
-0x6339 = 0x79AE
-0x633A = 0x79B3
-0x633B = 0x79B9
-0x633C = 0x79BA
-0x633D = 0x79C9
-0x633E = 0x79D5
-0x633F = 0x79E7
-0x6340 = 0x79EC
-0x6341 = 0x79E1
-0x6342 = 0x79E3
-0x6343 = 0x7A08
-0x6344 = 0x7A0D
-0x6345 = 0x7A18
-0x6346 = 0x7A19
-0x6347 = 0x7A20
-0x6348 = 0x7A1F
-0x6349 = 0x7980
-0x634A = 0x7A31
-0x634B = 0x7A3B
-0x634C = 0x7A3E
-0x634D = 0x7A37
-0x634E = 0x7A43
-0x634F = 0x7A57
-0x6350 = 0x7A49
-0x6351 = 0x7A61
-0x6352 = 0x7A62
-0x6353 = 0x7A69
-0x6354 = 0x9F9D
-0x6355 = 0x7A70
-0x6356 = 0x7A79
-0x6357 = 0x7A7D
-0x6358 = 0x7A88
-0x6359 = 0x7A97
-0x635A = 0x7A95
-0x635B = 0x7A98
-0x635C = 0x7A96
-0x635D = 0x7AA9
-0x635E = 0x7AC8
-0x635F = 0x7AB0
-0x6360 = 0x7AB6
-0x6361 = 0x7AC5
-0x6362 = 0x7AC4
-0x6363 = 0x7ABF
-0x6364 = 0x9083
-0x6365 = 0x7AC7
-0x6366 = 0x7ACA
-0x6367 = 0x7ACD
-0x6368 = 0x7ACF
-0x6369 = 0x7AD5
-0x636A = 0x7AD3
-0x636B = 0x7AD9
-0x636C = 0x7ADA
-0x636D = 0x7ADD
-0x636E = 0x7AE1
-0x636F = 0x7AE2
-0x6370 = 0x7AE6
-0x6371 = 0x7AED
-0x6372 = 0x7AF0
-0x6373 = 0x7B02
-0x6374 = 0x7B0F
-0x6375 = 0x7B0A
-0x6376 = 0x7B06
-0x6377 = 0x7B33
-0x6378 = 0x7B18
-0x6379 = 0x7B19
-0x637A = 0x7B1E
-0x637B = 0x7B35
-0x637C = 0x7B28
-0x637D = 0x7B36
-0x637E = 0x7B50
-0x6421 = 0x7B7A
-0x6422 = 0x7B04
-0x6423 = 0x7B4D
-0x6424 = 0x7B0B
-0x6425 = 0x7B4C
-0x6426 = 0x7B45
-0x6427 = 0x7B75
-0x6428 = 0x7B65
-0x6429 = 0x7B74
-0x642A = 0x7B67
-0x642B = 0x7B70
-0x642C = 0x7B71
-0x642D = 0x7B6C
-0x642E = 0x7B6E
-0x642F = 0x7B9D
-0x6430 = 0x7B98
-0x6431 = 0x7B9F
-0x6432 = 0x7B8D
-0x6433 = 0x7B9C
-0x6434 = 0x7B9A
-0x6435 = 0x7B8B
-0x6436 = 0x7B92
-0x6437 = 0x7B8F
-0x6438 = 0x7B5D
-0x6439 = 0x7B99
-0x643A = 0x7BCB
-0x643B = 0x7BC1
-0x643C = 0x7BCC
-0x643D = 0x7BCF
-0x643E = 0x7BB4
-0x643F = 0x7BC6
-0x6440 = 0x7BDD
-0x6441 = 0x7BE9
-0x6442 = 0x7C11
-0x6443 = 0x7C14
-0x6444 = 0x7BE6
-0x6445 = 0x7BE5
-0x6446 = 0x7C60
-0x6447 = 0x7C00
-0x6448 = 0x7C07
-0x6449 = 0x7C13
-0x644A = 0x7BF3
-0x644B = 0x7BF7
-0x644C = 0x7C17
-0x644D = 0x7C0D
-0x644E = 0x7BF6
-0x644F = 0x7C23
-0x6450 = 0x7C27
-0x6451 = 0x7C2A
-0x6452 = 0x7C1F
-0x6453 = 0x7C37
-0x6454 = 0x7C2B
-0x6455 = 0x7C3D
-0x6456 = 0x7C4C
-0x6457 = 0x7C43
-0x6458 = 0x7C54
-0x6459 = 0x7C4F
-0x645A = 0x7C40
-0x645B = 0x7C50
-0x645C = 0x7C58
-0x645D = 0x7C5F
-0x645E = 0x7C64
-0x645F = 0x7C56
-0x6460 = 0x7C65
-0x6461 = 0x7C6C
-0x6462 = 0x7C75
-0x6463 = 0x7C83
-0x6464 = 0x7C90
-0x6465 = 0x7CA4
-0x6466 = 0x7CAD
-0x6467 = 0x7CA2
-0x6468 = 0x7CAB
-0x6469 = 0x7CA1
-0x646A = 0x7CA8
-0x646B = 0x7CB3
-0x646C = 0x7CB2
-0x646D = 0x7CB1
-0x646E = 0x7CAE
-0x646F = 0x7CB9
-0x6470 = 0x7CBD
-0x6471 = 0x7CC0
-0x6472 = 0x7CC5
-0x6473 = 0x7CC2
-0x6474 = 0x7CD8
-0x6475 = 0x7CD2
-0x6476 = 0x7CDC
-0x6477 = 0x7CE2
-0x6478 = 0x9B3B
-0x6479 = 0x7CEF
-0x647A = 0x7CF2
-0x647B = 0x7CF4
-0x647C = 0x7CF6
-0x647D = 0x7CFA
-0x647E = 0x7D06
-0x6521 = 0x7D02
-0x6522 = 0x7D1C
-0x6523 = 0x7D15
-0x6524 = 0x7D0A
-0x6525 = 0x7D45
-0x6526 = 0x7D4B
-0x6527 = 0x7D2E
-0x6528 = 0x7D32
-0x6529 = 0x7D3F
-0x652A = 0x7D35
-0x652B = 0x7D46
-0x652C = 0x7D73
-0x652D = 0x7D56
-0x652E = 0x7D4E
-0x652F = 0x7D72
-0x6530 = 0x7D68
-0x6531 = 0x7D6E
-0x6532 = 0x7D4F
-0x6533 = 0x7D63
-0x6534 = 0x7D93
-0x6535 = 0x7D89
-0x6536 = 0x7D5B
-0x6537 = 0x7D8F
-0x6538 = 0x7D7D
-0x6539 = 0x7D9B
-0x653A = 0x7DBA
-0x653B = 0x7DAE
-0x653C = 0x7DA3
-0x653D = 0x7DB5
-0x653E = 0x7DC7
-0x653F = 0x7DBD
-0x6540 = 0x7DAB
-0x6541 = 0x7E3D
-0x6542 = 0x7DA2
-0x6543 = 0x7DAF
-0x6544 = 0x7DDC
-0x6545 = 0x7DB8
-0x6546 = 0x7D9F
-0x6547 = 0x7DB0
-0x6548 = 0x7DD8
-0x6549 = 0x7DDD
-0x654A = 0x7DE4
-0x654B = 0x7DDE
-0x654C = 0x7DFB
-0x654D = 0x7DF2
-0x654E = 0x7DE1
-0x654F = 0x7E05
-0x6550 = 0x7E0A
-0x6551 = 0x7E23
-0x6552 = 0x7E21
-0x6553 = 0x7E12
-0x6554 = 0x7E31
-0x6555 = 0x7E1F
-0x6556 = 0x7E09
-0x6557 = 0x7E0B
-0x6558 = 0x7E22
-0x6559 = 0x7E46
-0x655A = 0x7E66
-0x655B = 0x7E3B
-0x655C = 0x7E35
-0x655D = 0x7E39
-0x655E = 0x7E43
-0x655F = 0x7E37
-0x6560 = 0x7E32
-0x6561 = 0x7E3A
-0x6562 = 0x7E67
-0x6563 = 0x7E5D
-0x6564 = 0x7E56
-0x6565 = 0x7E5E
-0x6566 = 0x7E59
-0x6567 = 0x7E5A
-0x6568 = 0x7E79
-0x6569 = 0x7E6A
-0x656A = 0x7E69
-0x656B = 0x7E7C
-0x656C = 0x7E7B
-0x656D = 0x7E83
-0x656E = 0x7DD5
-0x656F = 0x7E7D
-0x6570 = 0x8FAE
-0x6571 = 0x7E7F
-0x6572 = 0x7E88
-0x6573 = 0x7E89
-0x6574 = 0x7E8C
-0x6575 = 0x7E92
-0x6576 = 0x7E90
-0x6577 = 0x7E93
-0x6578 = 0x7E94
-0x6579 = 0x7E96
-0x657A = 0x7E8E
-0x657B = 0x7E9B
-0x657C = 0x7E9C
-0x657D = 0x7F38
-0x657E = 0x7F3A
-0x6621 = 0x7F45
-0x6622 = 0x7F4C
-0x6623 = 0x7F4D
-0x6624 = 0x7F4E
-0x6625 = 0x7F50
-0x6626 = 0x7F51
-0x6627 = 0x7F55
-0x6628 = 0x7F54
-0x6629 = 0x7F58
-0x662A = 0x7F5F
-0x662B = 0x7F60
-0x662C = 0x7F68
-0x662D = 0x7F69
-0x662E = 0x7F67
-0x662F = 0x7F78
-0x6630 = 0x7F82
-0x6631 = 0x7F86
-0x6632 = 0x7F83
-0x6633 = 0x7F88
-0x6634 = 0x7F87
-0x6635 = 0x7F8C
-0x6636 = 0x7F94
-0x6637 = 0x7F9E
-0x6638 = 0x7F9D
-0x6639 = 0x7F9A
-0x663A = 0x7FA3
-0x663B = 0x7FAF
-0x663C = 0x7FB2
-0x663D = 0x7FB9
-0x663E = 0x7FAE
-0x663F = 0x7FB6
-0x6640 = 0x7FB8
-0x6641 = 0x8B71
-0x6642 = 0x7FC5
-0x6643 = 0x7FC6
-0x6644 = 0x7FCA
-0x6645 = 0x7FD5
-0x6646 = 0x7FD4
-0x6647 = 0x7FE1
-0x6648 = 0x7FE6
-0x6649 = 0x7FE9
-0x664A = 0x7FF3
-0x664B = 0x7FF9
-0x664C = 0x98DC
-0x664D = 0x8006
-0x664E = 0x8004
-0x664F = 0x800B
-0x6650 = 0x8012
-0x6651 = 0x8018
-0x6652 = 0x8019
-0x6653 = 0x801C
-0x6654 = 0x8021
-0x6655 = 0x8028
-0x6656 = 0x803F
-0x6657 = 0x803B
-0x6658 = 0x804A
-0x6659 = 0x8046
-0x665A = 0x8052
-0x665B = 0x8058
-0x665C = 0x805A
-0x665D = 0x805F
-0x665E = 0x8062
-0x665F = 0x8068
-0x6660 = 0x8073
-0x6661 = 0x8072
-0x6662 = 0x8070
-0x6663 = 0x8076
-0x6664 = 0x8079
-0x6665 = 0x807D
-0x6666 = 0x807F
-0x6667 = 0x8084
-0x6668 = 0x8086
-0x6669 = 0x8085
-0x666A = 0x809B
-0x666B = 0x8093
-0x666C = 0x809A
-0x666D = 0x80AD
-0x666E = 0x5190
-0x666F = 0x80AC
-0x6670 = 0x80DB
-0x6671 = 0x80E5
-0x6672 = 0x80D9
-0x6673 = 0x80DD
-0x6674 = 0x80C4
-0x6675 = 0x80DA
-0x6676 = 0x80D6
-0x6677 = 0x8109
-0x6678 = 0x80EF
-0x6679 = 0x80F1
-0x667A = 0x811B
-0x667B = 0x8129
-0x667C = 0x8123
-0x667D = 0x812F
-0x667E = 0x814B
-0x6721 = 0x968B
-0x6722 = 0x8146
-0x6723 = 0x813E
-0x6724 = 0x8153
-0x6725 = 0x8151
-0x6726 = 0x80FC
-0x6727 = 0x8171
-0x6728 = 0x816E
-0x6729 = 0x8165
-0x672A = 0x8166
-0x672B = 0x8174
-0x672C = 0x8183
-0x672D = 0x8188
-0x672E = 0x818A
-0x672F = 0x8180
-0x6730 = 0x8182
-0x6731 = 0x81A0
-0x6732 = 0x8195
-0x6733 = 0x81A4
-0x6734 = 0x81A3
-0x6735 = 0x815F
-0x6736 = 0x8193
-0x6737 = 0x81A9
-0x6738 = 0x81B0
-0x6739 = 0x81B5
-0x673A = 0x81BE
-0x673B = 0x81B8
-0x673C = 0x81BD
-0x673D = 0x81C0
-0x673E = 0x81C2
-0x673F = 0x81BA
-0x6740 = 0x81C9
-0x6741 = 0x81CD
-0x6742 = 0x81D1
-0x6743 = 0x81D9
-0x6744 = 0x81D8
-0x6745 = 0x81C8
-0x6746 = 0x81DA
-0x6747 = 0x81DF
-0x6748 = 0x81E0
-0x6749 = 0x81E7
-0x674A = 0x81FA
-0x674B = 0x81FB
-0x674C = 0x81FE
-0x674D = 0x8201
-0x674E = 0x8202
-0x674F = 0x8205
-0x6750 = 0x8207
-0x6751 = 0x820A
-0x6752 = 0x820D
-0x6753 = 0x8210
-0x6754 = 0x8216
-0x6755 = 0x8229
-0x6756 = 0x822B
-0x6757 = 0x8238
-0x6758 = 0x8233
-0x6759 = 0x8240
-0x675A = 0x8259
-0x675B = 0x8258
-0x675C = 0x825D
-0x675D = 0x825A
-0x675E = 0x825F
-0x675F = 0x8264
-0x6760 = 0x8262
-0x6761 = 0x8268
-0x6762 = 0x826A
-0x6763 = 0x826B
-0x6764 = 0x822E
-0x6765 = 0x8271
-0x6766 = 0x8277
-0x6767 = 0x8278
-0x6768 = 0x827E
-0x6769 = 0x828D
-0x676A = 0x8292
-0x676B = 0x82AB
-0x676C = 0x829F
-0x676D = 0x82BB
-0x676E = 0x82AC
-0x676F = 0x82E1
-0x6770 = 0x82E3
-0x6771 = 0x82DF
-0x6772 = 0x82D2
-0x6773 = 0x82F4
-0x6774 = 0x82F3
-0x6775 = 0x82FA
-0x6776 = 0x8393
-0x6777 = 0x8303
-0x6778 = 0x82FB
-0x6779 = 0x82F9
-0x677A = 0x82DE
-0x677B = 0x8306
-0x677C = 0x82DC
-0x677D = 0x8309
-0x677E = 0x82D9
-0x6821 = 0x8335
-0x6822 = 0x8334
-0x6823 = 0x8316
-0x6824 = 0x8332
-0x6825 = 0x8331
-0x6826 = 0x8340
-0x6827 = 0x8339
-0x6828 = 0x8350
-0x6829 = 0x8345
-0x682A = 0x832F
-0x682B = 0x832B
-0x682C = 0x8317
-0x682D = 0x8318
-0x682E = 0x8385
-0x682F = 0x839A
-0x6830 = 0x83AA
-0x6831 = 0x839F
-0x6832 = 0x83A2
-0x6833 = 0x8396
-0x6834 = 0x8323
-0x6835 = 0x838E
-0x6836 = 0x8387
-0x6837 = 0x838A
-0x6838 = 0x837C
-0x6839 = 0x83B5
-0x683A = 0x8373
-0x683B = 0x8375
-0x683C = 0x83A0
-0x683D = 0x8389
-0x683E = 0x83A8
-0x683F = 0x83F4
-0x6840 = 0x8413
-0x6841 = 0x83EB
-0x6842 = 0x83CE
-0x6843 = 0x83FD
-0x6844 = 0x8403
-0x6845 = 0x83D8
-0x6846 = 0x840B
-0x6847 = 0x83C1
-0x6848 = 0x83F7
-0x6849 = 0x8407
-0x684A = 0x83E0
-0x684B = 0x83F2
-0x684C = 0x840D
-0x684D = 0x8422
-0x684E = 0x8420
-0x684F = 0x83BD
-0x6850 = 0x8438
-0x6851 = 0x8506
-0x6852 = 0x83FB
-0x6853 = 0x846D
-0x6854 = 0x842A
-0x6855 = 0x843C
-0x6856 = 0x855A
-0x6857 = 0x8484
-0x6858 = 0x8477
-0x6859 = 0x846B
-0x685A = 0x84AD
-0x685B = 0x846E
-0x685C = 0x8482
-0x685D = 0x8469
-0x685E = 0x8446
-0x685F = 0x842C
-0x6860 = 0x846F
-0x6861 = 0x8479
-0x6862 = 0x8435
-0x6863 = 0x84CA
-0x6864 = 0x8462
-0x6865 = 0x84B9
-0x6866 = 0x84BF
-0x6867 = 0x849F
-0x6868 = 0x84D9
-0x6869 = 0x84CD
-0x686A = 0x84BB
-0x686B = 0x84DA
-0x686C = 0x84D0
-0x686D = 0x84C1
-0x686E = 0x84C6
-0x686F = 0x84D6
-0x6870 = 0x84A1
-0x6871 = 0x8521
-0x6872 = 0x84FF
-0x6873 = 0x84F4
-0x6874 = 0x8517
-0x6875 = 0x8518
-0x6876 = 0x852C
-0x6877 = 0x851F
-0x6878 = 0x8515
-0x6879 = 0x8514
-0x687A = 0x84FC
-0x687B = 0x8540
-0x687C = 0x8563
-0x687D = 0x8558
-0x687E = 0x8548
-0x6921 = 0x8541
-0x6922 = 0x8602
-0x6923 = 0x854B
-0x6924 = 0x8555
-0x6925 = 0x8580
-0x6926 = 0x85A4
-0x6927 = 0x8588
-0x6928 = 0x8591
-0x6929 = 0x858A
-0x692A = 0x85A8
-0x692B = 0x856D
-0x692C = 0x8594
-0x692D = 0x859B
-0x692E = 0x85EA
-0x692F = 0x8587
-0x6930 = 0x859C
-0x6931 = 0x8577
-0x6932 = 0x857E
-0x6933 = 0x8590
-0x6934 = 0x85C9
-0x6935 = 0x85BA
-0x6936 = 0x85CF
-0x6937 = 0x85B9
-0x6938 = 0x85D0
-0x6939 = 0x85D5
-0x693A = 0x85DD
-0x693B = 0x85E5
-0x693C = 0x85DC
-0x693D = 0x85F9
-0x693E = 0x860A
-0x693F = 0x8613
-0x6940 = 0x860B
-0x6941 = 0x85FE
-0x6942 = 0x85FA
-0x6943 = 0x8606
-0x6944 = 0x8622
-0x6945 = 0x861A
-0x6946 = 0x8630
-0x6947 = 0x863F
-0x6948 = 0x864D
-0x6949 = 0x4E55
-0x694A = 0x8654
-0x694B = 0x865F
-0x694C = 0x8667
-0x694D = 0x8671
-0x694E = 0x8693
-0x694F = 0x86A3
-0x6950 = 0x86A9
-0x6951 = 0x86AA
-0x6952 = 0x868B
-0x6953 = 0x868C
-0x6954 = 0x86B6
-0x6955 = 0x86AF
-0x6956 = 0x86C4
-0x6957 = 0x86C6
-0x6958 = 0x86B0
-0x6959 = 0x86C9
-0x695A = 0x8823
-0x695B = 0x86AB
-0x695C = 0x86D4
-0x695D = 0x86DE
-0x695E = 0x86E9
-0x695F = 0x86EC
-0x6960 = 0x86DF
-0x6961 = 0x86DB
-0x6962 = 0x86EF
-0x6963 = 0x8712
-0x6964 = 0x8706
-0x6965 = 0x8708
-0x6966 = 0x8700
-0x6967 = 0x8703
-0x6968 = 0x86FB
-0x6969 = 0x8711
-0x696A = 0x8709
-0x696B = 0x870D
-0x696C = 0x86F9
-0x696D = 0x870A
-0x696E = 0x8734
-0x696F = 0x873F
-0x6970 = 0x8737
-0x6971 = 0x873B
-0x6972 = 0x8725
-0x6973 = 0x8729
-0x6974 = 0x871A
-0x6975 = 0x8760
-0x6976 = 0x875F
-0x6977 = 0x8778
-0x6978 = 0x874C
-0x6979 = 0x874E
-0x697A = 0x8774
-0x697B = 0x8757
-0x697C = 0x8768
-0x697D = 0x876E
-0x697E = 0x8759
-0x6A21 = 0x8753
-0x6A22 = 0x8763
-0x6A23 = 0x876A
-0x6A24 = 0x8805
-0x6A25 = 0x87A2
-0x6A26 = 0x879F
-0x6A27 = 0x8782
-0x6A28 = 0x87AF
-0x6A29 = 0x87CB
-0x6A2A = 0x87BD
-0x6A2B = 0x87C0
-0x6A2C = 0x87D0
-0x6A2D = 0x96D6
-0x6A2E = 0x87AB
-0x6A2F = 0x87C4
-0x6A30 = 0x87B3
-0x6A31 = 0x87C7
-0x6A32 = 0x87C6
-0x6A33 = 0x87BB
-0x6A34 = 0x87EF
-0x6A35 = 0x87F2
-0x6A36 = 0x87E0
-0x6A37 = 0x880F
-0x6A38 = 0x880D
-0x6A39 = 0x87FE
-0x6A3A = 0x87F6
-0x6A3B = 0x87F7
-0x6A3C = 0x880E
-0x6A3D = 0x87D2
-0x6A3E = 0x8811
-0x6A3F = 0x8816
-0x6A40 = 0x8815
-0x6A41 = 0x8822
-0x6A42 = 0x8821
-0x6A43 = 0x8831
-0x6A44 = 0x8836
-0x6A45 = 0x8839
-0x6A46 = 0x8827
-0x6A47 = 0x883B
-0x6A48 = 0x8844
-0x6A49 = 0x8842
-0x6A4A = 0x8852
-0x6A4B = 0x8859
-0x6A4C = 0x885E
-0x6A4D = 0x8862
-0x6A4E = 0x886B
-0x6A4F = 0x8881
-0x6A50 = 0x887E
-0x6A51 = 0x889E
-0x6A52 = 0x8875
-0x6A53 = 0x887D
-0x6A54 = 0x88B5
-0x6A55 = 0x8872
-0x6A56 = 0x8882
-0x6A57 = 0x8897
-0x6A58 = 0x8892
-0x6A59 = 0x88AE
-0x6A5A = 0x8899
-0x6A5B = 0x88A2
-0x6A5C = 0x888D
-0x6A5D = 0x88A4
-0x6A5E = 0x88B0
-0x6A5F = 0x88BF
-0x6A60 = 0x88B1
-0x6A61 = 0x88C3
-0x6A62 = 0x88C4
-0x6A63 = 0x88D4
-0x6A64 = 0x88D8
-0x6A65 = 0x88D9
-0x6A66 = 0x88DD
-0x6A67 = 0x88F9
-0x6A68 = 0x8902
-0x6A69 = 0x88FC
-0x6A6A = 0x88F4
-0x6A6B = 0x88E8
-0x6A6C = 0x88F2
-0x6A6D = 0x8904
-0x6A6E = 0x890C
-0x6A6F = 0x890A
-0x6A70 = 0x8913
-0x6A71 = 0x8943
-0x6A72 = 0x891E
-0x6A73 = 0x8925
-0x6A74 = 0x892A
-0x6A75 = 0x892B
-0x6A76 = 0x8941
-0x6A77 = 0x8944
-0x6A78 = 0x893B
-0x6A79 = 0x8936
-0x6A7A = 0x8938
-0x6A7B = 0x894C
-0x6A7C = 0x891D
-0x6A7D = 0x8960
-0x6A7E = 0x895E
-0x6B21 = 0x8966
-0x6B22 = 0x8964
-0x6B23 = 0x896D
-0x6B24 = 0x896A
-0x6B25 = 0x896F
-0x6B26 = 0x8974
-0x6B27 = 0x8977
-0x6B28 = 0x897E
-0x6B29 = 0x8983
-0x6B2A = 0x8988
-0x6B2B = 0x898A
-0x6B2C = 0x8993
-0x6B2D = 0x8998
-0x6B2E = 0x89A1
-0x6B2F = 0x89A9
-0x6B30 = 0x89A6
-0x6B31 = 0x89AC
-0x6B32 = 0x89AF
-0x6B33 = 0x89B2
-0x6B34 = 0x89BA
-0x6B35 = 0x89BD
-0x6B36 = 0x89BF
-0x6B37 = 0x89C0
-0x6B38 = 0x89DA
-0x6B39 = 0x89DC
-0x6B3A = 0x89DD
-0x6B3B = 0x89E7
-0x6B3C = 0x89F4
-0x6B3D = 0x89F8
-0x6B3E = 0x8A03
-0x6B3F = 0x8A16
-0x6B40 = 0x8A10
-0x6B41 = 0x8A0C
-0x6B42 = 0x8A1B
-0x6B43 = 0x8A1D
-0x6B44 = 0x8A25
-0x6B45 = 0x8A36
-0x6B46 = 0x8A41
-0x6B47 = 0x8A5B
-0x6B48 = 0x8A52
-0x6B49 = 0x8A46
-0x6B4A = 0x8A48
-0x6B4B = 0x8A7C
-0x6B4C = 0x8A6D
-0x6B4D = 0x8A6C
-0x6B4E = 0x8A62
-0x6B4F = 0x8A85
-0x6B50 = 0x8A82
-0x6B51 = 0x8A84
-0x6B52 = 0x8AA8
-0x6B53 = 0x8AA1
-0x6B54 = 0x8A91
-0x6B55 = 0x8AA5
-0x6B56 = 0x8AA6
-0x6B57 = 0x8A9A
-0x6B58 = 0x8AA3
-0x6B59 = 0x8AC4
-0x6B5A = 0x8ACD
-0x6B5B = 0x8AC2
-0x6B5C = 0x8ADA
-0x6B5D = 0x8AEB
-0x6B5E = 0x8AF3
-0x6B5F = 0x8AE7
-0x6B60 = 0x8AE4
-0x6B61 = 0x8AF1
-0x6B62 = 0x8B14
-0x6B63 = 0x8AE0
-0x6B64 = 0x8AE2
-0x6B65 = 0x8AF7
-0x6B66 = 0x8ADE
-0x6B67 = 0x8ADB
-0x6B68 = 0x8B0C
-0x6B69 = 0x8B07
-0x6B6A = 0x8B1A
-0x6B6B = 0x8AE1
-0x6B6C = 0x8B16
-0x6B6D = 0x8B10
-0x6B6E = 0x8B17
-0x6B6F = 0x8B20
-0x6B70 = 0x8B33
-0x6B71 = 0x97AB
-0x6B72 = 0x8B26
-0x6B73 = 0x8B2B
-0x6B74 = 0x8B3E
-0x6B75 = 0x8B28
-0x6B76 = 0x8B41
-0x6B77 = 0x8B4C
-0x6B78 = 0x8B4F
-0x6B79 = 0x8B4E
-0x6B7A = 0x8B49
-0x6B7B = 0x8B56
-0x6B7C = 0x8B5B
-0x6B7D = 0x8B5A
-0x6B7E = 0x8B6B
-0x6C21 = 0x8B5F
-0x6C22 = 0x8B6C
-0x6C23 = 0x8B6F
-0x6C24 = 0x8B74
-0x6C25 = 0x8B7D
-0x6C26 = 0x8B80
-0x6C27 = 0x8B8C
-0x6C28 = 0x8B8E
-0x6C29 = 0x8B92
-0x6C2A = 0x8B93
-0x6C2B = 0x8B96
-0x6C2C = 0x8B99
-0x6C2D = 0x8B9A
-0x6C2E = 0x8C3A
-0x6C2F = 0x8C41
-0x6C30 = 0x8C3F
-0x6C31 = 0x8C48
-0x6C32 = 0x8C4C
-0x6C33 = 0x8C4E
-0x6C34 = 0x8C50
-0x6C35 = 0x8C55
-0x6C36 = 0x8C62
-0x6C37 = 0x8C6C
-0x6C38 = 0x8C78
-0x6C39 = 0x8C7A
-0x6C3A = 0x8C82
-0x6C3B = 0x8C89
-0x6C3C = 0x8C85
-0x6C3D = 0x8C8A
-0x6C3E = 0x8C8D
-0x6C3F = 0x8C8E
-0x6C40 = 0x8C94
-0x6C41 = 0x8C7C
-0x6C42 = 0x8C98
-0x6C43 = 0x621D
-0x6C44 = 0x8CAD
-0x6C45 = 0x8CAA
-0x6C46 = 0x8CBD
-0x6C47 = 0x8CB2
-0x6C48 = 0x8CB3
-0x6C49 = 0x8CAE
-0x6C4A = 0x8CB6
-0x6C4B = 0x8CC8
-0x6C4C = 0x8CC1
-0x6C4D = 0x8CE4
-0x6C4E = 0x8CE3
-0x6C4F = 0x8CDA
-0x6C50 = 0x8CFD
-0x6C51 = 0x8CFA
-0x6C52 = 0x8CFB
-0x6C53 = 0x8D04
-0x6C54 = 0x8D05
-0x6C55 = 0x8D0A
-0x6C56 = 0x8D07
-0x6C57 = 0x8D0F
-0x6C58 = 0x8D0D
-0x6C59 = 0x8D10
-0x6C5A = 0x9F4E
-0x6C5B = 0x8D13
-0x6C5C = 0x8CCD
-0x6C5D = 0x8D14
-0x6C5E = 0x8D16
-0x6C5F = 0x8D67
-0x6C60 = 0x8D6D
-0x6C61 = 0x8D71
-0x6C62 = 0x8D73
-0x6C63 = 0x8D81
-0x6C64 = 0x8D99
-0x6C65 = 0x8DC2
-0x6C66 = 0x8DBE
-0x6C67 = 0x8DBA
-0x6C68 = 0x8DCF
-0x6C69 = 0x8DDA
-0x6C6A = 0x8DD6
-0x6C6B = 0x8DCC
-0x6C6C = 0x8DDB
-0x6C6D = 0x8DCB
-0x6C6E = 0x8DEA
-0x6C6F = 0x8DEB
-0x6C70 = 0x8DDF
-0x6C71 = 0x8DE3
-0x6C72 = 0x8DFC
-0x6C73 = 0x8E08
-0x6C74 = 0x8E09
-0x6C75 = 0x8DFF
-0x6C76 = 0x8E1D
-0x6C77 = 0x8E1E
-0x6C78 = 0x8E10
-0x6C79 = 0x8E1F
-0x6C7A = 0x8E42
-0x6C7B = 0x8E35
-0x6C7C = 0x8E30
-0x6C7D = 0x8E34
-0x6C7E = 0x8E4A
-0x6D21 = 0x8E47
-0x6D22 = 0x8E49
-0x6D23 = 0x8E4C
-0x6D24 = 0x8E50
-0x6D25 = 0x8E48
-0x6D26 = 0x8E59
-0x6D27 = 0x8E64
-0x6D28 = 0x8E60
-0x6D29 = 0x8E2A
-0x6D2A = 0x8E63
-0x6D2B = 0x8E55
-0x6D2C = 0x8E76
-0x6D2D = 0x8E72
-0x6D2E = 0x8E7C
-0x6D2F = 0x8E81
-0x6D30 = 0x8E87
-0x6D31 = 0x8E85
-0x6D32 = 0x8E84
-0x6D33 = 0x8E8B
-0x6D34 = 0x8E8A
-0x6D35 = 0x8E93
-0x6D36 = 0x8E91
-0x6D37 = 0x8E94
-0x6D38 = 0x8E99
-0x6D39 = 0x8EAA
-0x6D3A = 0x8EA1
-0x6D3B = 0x8EAC
-0x6D3C = 0x8EB0
-0x6D3D = 0x8EC6
-0x6D3E = 0x8EB1
-0x6D3F = 0x8EBE
-0x6D40 = 0x8EC5
-0x6D41 = 0x8EC8
-0x6D42 = 0x8ECB
-0x6D43 = 0x8EDB
-0x6D44 = 0x8EE3
-0x6D45 = 0x8EFC
-0x6D46 = 0x8EFB
-0x6D47 = 0x8EEB
-0x6D48 = 0x8EFE
-0x6D49 = 0x8F0A
-0x6D4A = 0x8F05
-0x6D4B = 0x8F15
-0x6D4C = 0x8F12
-0x6D4D = 0x8F19
-0x6D4E = 0x8F13
-0x6D4F = 0x8F1C
-0x6D50 = 0x8F1F
-0x6D51 = 0x8F1B
-0x6D52 = 0x8F0C
-0x6D53 = 0x8F26
-0x6D54 = 0x8F33
-0x6D55 = 0x8F3B
-0x6D56 = 0x8F39
-0x6D57 = 0x8F45
-0x6D58 = 0x8F42
-0x6D59 = 0x8F3E
-0x6D5A = 0x8F4C
-0x6D5B = 0x8F49
-0x6D5C = 0x8F46
-0x6D5D = 0x8F4E
-0x6D5E = 0x8F57
-0x6D5F = 0x8F5C
-0x6D60 = 0x8F62
-0x6D61 = 0x8F63
-0x6D62 = 0x8F64
-0x6D63 = 0x8F9C
-0x6D64 = 0x8F9F
-0x6D65 = 0x8FA3
-0x6D66 = 0x8FAD
-0x6D67 = 0x8FAF
-0x6D68 = 0x8FB7
-0x6D69 = 0x8FDA
-0x6D6A = 0x8FE5
-0x6D6B = 0x8FE2
-0x6D6C = 0x8FEA
-0x6D6D = 0x8FEF
-0x6D6E = 0x9087
-0x6D6F = 0x8FF4
-0x6D70 = 0x9005
-0x6D71 = 0x8FF9
-0x6D72 = 0x8FFA
-0x6D73 = 0x9011
-0x6D74 = 0x9015
-0x6D75 = 0x9021
-0x6D76 = 0x900D
-0x6D77 = 0x901E
-0x6D78 = 0x9016
-0x6D79 = 0x900B
-0x6D7A = 0x9027
-0x6D7B = 0x9036
-0x6D7C = 0x9035
-0x6D7D = 0x9039
-0x6D7E = 0x8FF8
-0x6E21 = 0x904F
-0x6E22 = 0x9050
-0x6E23 = 0x9051
-0x6E24 = 0x9052
-0x6E25 = 0x900E
-0x6E26 = 0x9049
-0x6E27 = 0x903E
-0x6E28 = 0x9056
-0x6E29 = 0x9058
-0x6E2A = 0x905E
-0x6E2B = 0x9068
-0x6E2C = 0x906F
-0x6E2D = 0x9076
-0x6E2E = 0x96A8
-0x6E2F = 0x9072
-0x6E30 = 0x9082
-0x6E31 = 0x907D
-0x6E32 = 0x9081
-0x6E33 = 0x9080
-0x6E34 = 0x908A
-0x6E35 = 0x9089
-0x6E36 = 0x908F
-0x6E37 = 0x90A8
-0x6E38 = 0x90AF
-0x6E39 = 0x90B1
-0x6E3A = 0x90B5
-0x6E3B = 0x90E2
-0x6E3C = 0x90E4
-0x6E3D = 0x6248
-0x6E3E = 0x90DB
-0x6E3F = 0x9102
-0x6E40 = 0x9112
-0x6E41 = 0x9119
-0x6E42 = 0x9132
-0x6E43 = 0x9130
-0x6E44 = 0x914A
-0x6E45 = 0x9156
-0x6E46 = 0x9158
-0x6E47 = 0x9163
-0x6E48 = 0x9165
-0x6E49 = 0x9169
-0x6E4A = 0x9173
-0x6E4B = 0x9172
-0x6E4C = 0x918B
-0x6E4D = 0x9189
-0x6E4E = 0x9182
-0x6E4F = 0x91A2
-0x6E50 = 0x91AB
-0x6E51 = 0x91AF
-0x6E52 = 0x91AA
-0x6E53 = 0x91B5
-0x6E54 = 0x91B4
-0x6E55 = 0x91BA
-0x6E56 = 0x91C0
-0x6E57 = 0x91C1
-0x6E58 = 0x91C9
-0x6E59 = 0x91CB
-0x6E5A = 0x91D0
-0x6E5B = 0x91D6
-0x6E5C = 0x91DF
-0x6E5D = 0x91E1
-0x6E5E = 0x91DB
-0x6E5F = 0x91FC
-0x6E60 = 0x91F5
-0x6E61 = 0x91F6
-0x6E62 = 0x921E
-0x6E63 = 0x91FF
-0x6E64 = 0x9214
-0x6E65 = 0x922C
-0x6E66 = 0x9215
-0x6E67 = 0x9211
-0x6E68 = 0x925E
-0x6E69 = 0x9257
-0x6E6A = 0x9245
-0x6E6B = 0x9249
-0x6E6C = 0x9264
-0x6E6D = 0x9248
-0x6E6E = 0x9295
-0x6E6F = 0x923F
-0x6E70 = 0x924B
-0x6E71 = 0x9250
-0x6E72 = 0x929C
-0x6E73 = 0x9296
-0x6E74 = 0x9293
-0x6E75 = 0x929B
-0x6E76 = 0x925A
-0x6E77 = 0x92CF
-0x6E78 = 0x92B9
-0x6E79 = 0x92B7
-0x6E7A = 0x92E9
-0x6E7B = 0x930F
-0x6E7C = 0x92FA
-0x6E7D = 0x9344
-0x6E7E = 0x932E
-0x6F21 = 0x9319
-0x6F22 = 0x9322
-0x6F23 = 0x931A
-0x6F24 = 0x9323
-0x6F25 = 0x933A
-0x6F26 = 0x9335
-0x6F27 = 0x933B
-0x6F28 = 0x935C
-0x6F29 = 0x9360
-0x6F2A = 0x937C
-0x6F2B = 0x936E
-0x6F2C = 0x9356
-0x6F2D = 0x93B0
-0x6F2E = 0x93AC
-0x6F2F = 0x93AD
-0x6F30 = 0x9394
-0x6F31 = 0x93B9
-0x6F32 = 0x93D6
-0x6F33 = 0x93D7
-0x6F34 = 0x93E8
-0x6F35 = 0x93E5
-0x6F36 = 0x93D8
-0x6F37 = 0x93C3
-0x6F38 = 0x93DD
-0x6F39 = 0x93D0
-0x6F3A = 0x93C8
-0x6F3B = 0x93E4
-0x6F3C = 0x941A
-0x6F3D = 0x9414
-0x6F3E = 0x9413
-0x6F3F = 0x9403
-0x6F40 = 0x9407
-0x6F41 = 0x9410
-0x6F42 = 0x9436
-0x6F43 = 0x942B
-0x6F44 = 0x9435
-0x6F45 = 0x9421
-0x6F46 = 0x943A
-0x6F47 = 0x9441
-0x6F48 = 0x9452
-0x6F49 = 0x9444
-0x6F4A = 0x945B
-0x6F4B = 0x9460
-0x6F4C = 0x9462
-0x6F4D = 0x945E
-0x6F4E = 0x946A
-0x6F4F = 0x9229
-0x6F50 = 0x9470
-0x6F51 = 0x9475
-0x6F52 = 0x9477
-0x6F53 = 0x947D
-0x6F54 = 0x945A
-0x6F55 = 0x947C
-0x6F56 = 0x947E
-0x6F57 = 0x9481
-0x6F58 = 0x947F
-0x6F59 = 0x9582
-0x6F5A = 0x9587
-0x6F5B = 0x958A
-0x6F5C = 0x9594
-0x6F5D = 0x9596
-0x6F5E = 0x9598
-0x6F5F = 0x9599
-0x6F60 = 0x95A0
-0x6F61 = 0x95A8
-0x6F62 = 0x95A7
-0x6F63 = 0x95AD
-0x6F64 = 0x95BC
-0x6F65 = 0x95BB
-0x6F66 = 0x95B9
-0x6F67 = 0x95BE
-0x6F68 = 0x95CA
-0x6F69 = 0x6FF6
-0x6F6A = 0x95C3
-0x6F6B = 0x95CD
-0x6F6C = 0x95CC
-0x6F6D = 0x95D5
-0x6F6E = 0x95D4
-0x6F6F = 0x95D6
-0x6F70 = 0x95DC
-0x6F71 = 0x95E1
-0x6F72 = 0x95E5
-0x6F73 = 0x95E2
-0x6F74 = 0x9621
-0x6F75 = 0x9628
-0x6F76 = 0x962E
-0x6F77 = 0x962F
-0x6F78 = 0x9642
-0x6F79 = 0x964C
-0x6F7A = 0x964F
-0x6F7B = 0x964B
-0x6F7C = 0x9677
-0x6F7D = 0x965C
-0x6F7E = 0x965E
-0x7021 = 0x965D
-0x7022 = 0x965F
-0x7023 = 0x9666
-0x7024 = 0x9672
-0x7025 = 0x966C
-0x7026 = 0x968D
-0x7027 = 0x9698
-0x7028 = 0x9695
-0x7029 = 0x9697
-0x702A = 0x96AA
-0x702B = 0x96A7
-0x702C = 0x96B1
-0x702D = 0x96B2
-0x702E = 0x96B0
-0x702F = 0x96B4
-0x7030 = 0x96B6
-0x7031 = 0x96B8
-0x7032 = 0x96B9
-0x7033 = 0x96CE
-0x7034 = 0x96CB
-0x7035 = 0x96C9
-0x7036 = 0x96CD
-0x7037 = 0x894D
-0x7038 = 0x96DC
-0x7039 = 0x970D
-0x703A = 0x96D5
-0x703B = 0x96F9
-0x703C = 0x9704
-0x703D = 0x9706
-0x703E = 0x9708
-0x703F = 0x9713
-0x7040 = 0x970E
-0x7041 = 0x9711
-0x7042 = 0x970F
-0x7043 = 0x9716
-0x7044 = 0x9719
-0x7045 = 0x9724
-0x7046 = 0x972A
-0x7047 = 0x9730
-0x7048 = 0x9739
-0x7049 = 0x973D
-0x704A = 0x973E
-0x704B = 0x9744
-0x704C = 0x9746
-0x704D = 0x9748
-0x704E = 0x9742
-0x704F = 0x9749
-0x7050 = 0x975C
-0x7051 = 0x9760
-0x7052 = 0x9764
-0x7053 = 0x9766
-0x7054 = 0x9768
-0x7055 = 0x52D2
-0x7056 = 0x976B
-0x7057 = 0x9771
-0x7058 = 0x9779
-0x7059 = 0x9785
-0x705A = 0x977C
-0x705B = 0x9781
-0x705C = 0x977A
-0x705D = 0x9786
-0x705E = 0x978B
-0x705F = 0x978F
-0x7060 = 0x9790
-0x7061 = 0x979C
-0x7062 = 0x97A8
-0x7063 = 0x97A6
-0x7064 = 0x97A3
-0x7065 = 0x97B3
-0x7066 = 0x97B4
-0x7067 = 0x97C3
-0x7068 = 0x97C6
-0x7069 = 0x97C8
-0x706A = 0x97CB
-0x706B = 0x97DC
-0x706C = 0x97ED
-0x706D = 0x9F4F
-0x706E = 0x97F2
-0x706F = 0x7ADF
-0x7070 = 0x97F6
-0x7071 = 0x97F5
-0x7072 = 0x980F
-0x7073 = 0x980C
-0x7074 = 0x9838
-0x7075 = 0x9824
-0x7076 = 0x9821
-0x7077 = 0x9837
-0x7078 = 0x983D
-0x7079 = 0x9846
-0x707A = 0x984F
-0x707B = 0x984B
-0x707C = 0x986B
-0x707D = 0x986F
-0x707E = 0x9870
-0x7121 = 0x9871
-0x7122 = 0x9874
-0x7123 = 0x9873
-0x7124 = 0x98AA
-0x7125 = 0x98AF
-0x7126 = 0x98B1
-0x7127 = 0x98B6
-0x7128 = 0x98C4
-0x7129 = 0x98C3
-0x712A = 0x98C6
-0x712B = 0x98E9
-0x712C = 0x98EB
-0x712D = 0x9903
-0x712E = 0x9909
-0x712F = 0x9912
-0x7130 = 0x9914
-0x7131 = 0x9918
-0x7132 = 0x9921
-0x7133 = 0x991D
-0x7134 = 0x991E
-0x7135 = 0x9924
-0x7136 = 0x9920
-0x7137 = 0x992C
-0x7138 = 0x992E
-0x7139 = 0x993D
-0x713A = 0x993E
-0x713B = 0x9942
-0x713C = 0x9949
-0x713D = 0x9945
-0x713E = 0x9950
-0x713F = 0x994B
-0x7140 = 0x9951
-0x7141 = 0x9952
-0x7142 = 0x994C
-0x7143 = 0x9955
-0x7144 = 0x9997
-0x7145 = 0x9998
-0x7146 = 0x99A5
-0x7147 = 0x99AD
-0x7148 = 0x99AE
-0x7149 = 0x99BC
-0x714A = 0x99DF
-0x714B = 0x99DB
-0x714C = 0x99DD
-0x714D = 0x99D8
-0x714E = 0x99D1
-0x714F = 0x99ED
-0x7150 = 0x99EE
-0x7151 = 0x99F1
-0x7152 = 0x99F2
-0x7153 = 0x99FB
-0x7154 = 0x99F8
-0x7155 = 0x9A01
-0x7156 = 0x9A0F
-0x7157 = 0x9A05
-0x7158 = 0x99E2
-0x7159 = 0x9A19
-0x715A = 0x9A2B
-0x715B = 0x9A37
-0x715C = 0x9A45
-0x715D = 0x9A42
-0x715E = 0x9A40
-0x715F = 0x9A43
-0x7160 = 0x9A3E
-0x7161 = 0x9A55
-0x7162 = 0x9A4D
-0x7163 = 0x9A5B
-0x7164 = 0x9A57
-0x7165 = 0x9A5F
-0x7166 = 0x9A62
-0x7167 = 0x9A65
-0x7168 = 0x9A64
-0x7169 = 0x9A69
-0x716A = 0x9A6B
-0x716B = 0x9A6A
-0x716C = 0x9AAD
-0x716D = 0x9AB0
-0x716E = 0x9ABC
-0x716F = 0x9AC0
-0x7170 = 0x9ACF
-0x7171 = 0x9AD1
-0x7172 = 0x9AD3
-0x7173 = 0x9AD4
-0x7174 = 0x9ADE
-0x7175 = 0x9ADF
-0x7176 = 0x9AE2
-0x7177 = 0x9AE3
-0x7178 = 0x9AE6
-0x7179 = 0x9AEF
-0x717A = 0x9AEB
-0x717B = 0x9AEE
-0x717C = 0x9AF4
-0x717D = 0x9AF1
-0x717E = 0x9AF7
-0x7221 = 0x9AFB
-0x7222 = 0x9B06
-0x7223 = 0x9B18
-0x7224 = 0x9B1A
-0x7225 = 0x9B1F
-0x7226 = 0x9B22
-0x7227 = 0x9B23
-0x7228 = 0x9B25
-0x7229 = 0x9B27
-0x722A = 0x9B28
-0x722B = 0x9B29
-0x722C = 0x9B2A
-0x722D = 0x9B2E
-0x722E = 0x9B2F
-0x722F = 0x9B32
-0x7230 = 0x9B44
-0x7231 = 0x9B43
-0x7232 = 0x9B4F
-0x7233 = 0x9B4D
-0x7234 = 0x9B4E
-0x7235 = 0x9B51
-0x7236 = 0x9B58
-0x7237 = 0x9B74
-0x7238 = 0x9B93
-0x7239 = 0x9B83
-0x723A = 0x9B91
-0x723B = 0x9B96
-0x723C = 0x9B97
-0x723D = 0x9B9F
-0x723E = 0x9BA0
-0x723F = 0x9BA8
-0x7240 = 0x9BB4
-0x7241 = 0x9BC0
-0x7242 = 0x9BCA
-0x7243 = 0x9BB9
-0x7244 = 0x9BC6
-0x7245 = 0x9BCF
-0x7246 = 0x9BD1
-0x7247 = 0x9BD2
-0x7248 = 0x9BE3
-0x7249 = 0x9BE2
-0x724A = 0x9BE4
-0x724B = 0x9BD4
-0x724C = 0x9BE1
-0x724D = 0x9C3A
-0x724E = 0x9BF2
-0x724F = 0x9BF1
-0x7250 = 0x9BF0
-0x7251 = 0x9C15
-0x7252 = 0x9C14
-0x7253 = 0x9C09
-0x7254 = 0x9C13
-0x7255 = 0x9C0C
-0x7256 = 0x9C06
-0x7257 = 0x9C08
-0x7258 = 0x9C12
-0x7259 = 0x9C0A
-0x725A = 0x9C04
-0x725B = 0x9C2E
-0x725C = 0x9C1B
-0x725D = 0x9C25
-0x725E = 0x9C24
-0x725F = 0x9C21
-0x7260 = 0x9C30
-0x7261 = 0x9C47
-0x7262 = 0x9C32
-0x7263 = 0x9C46
-0x7264 = 0x9C3E
-0x7265 = 0x9C5A
-0x7266 = 0x9C60
-0x7267 = 0x9C67
-0x7268 = 0x9C76
-0x7269 = 0x9C78
-0x726A = 0x9CE7
-0x726B = 0x9CEC
-0x726C = 0x9CF0
-0x726D = 0x9D09
-0x726E = 0x9D08
-0x726F = 0x9CEB
-0x7270 = 0x9D03
-0x7271 = 0x9D06
-0x7272 = 0x9D2A
-0x7273 = 0x9D26
-0x7274 = 0x9DAF
-0x7275 = 0x9D23
-0x7276 = 0x9D1F
-0x7277 = 0x9D44
-0x7278 = 0x9D15
-0x7279 = 0x9D12
-0x727A = 0x9D41
-0x727B = 0x9D3F
-0x727C = 0x9D3E
-0x727D = 0x9D46
-0x727E = 0x9D48
-0x7321 = 0x9D5D
-0x7322 = 0x9D5E
-0x7323 = 0x9D64
-0x7324 = 0x9D51
-0x7325 = 0x9D50
-0x7326 = 0x9D59
-0x7327 = 0x9D72
-0x7328 = 0x9D89
-0x7329 = 0x9D87
-0x732A = 0x9DAB
-0x732B = 0x9D6F
-0x732C = 0x9D7A
-0x732D = 0x9D9A
-0x732E = 0x9DA4
-0x732F = 0x9DA9
-0x7330 = 0x9DB2
-0x7331 = 0x9DC4
-0x7332 = 0x9DC1
-0x7333 = 0x9DBB
-0x7334 = 0x9DB8
-0x7335 = 0x9DBA
-0x7336 = 0x9DC6
-0x7337 = 0x9DCF
-0x7338 = 0x9DC2
-0x7339 = 0x9DD9
-0x733A = 0x9DD3
-0x733B = 0x9DF8
-0x733C = 0x9DE6
-0x733D = 0x9DED
-0x733E = 0x9DEF
-0x733F = 0x9DFD
-0x7340 = 0x9E1A
-0x7341 = 0x9E1B
-0x7342 = 0x9E1E
-0x7343 = 0x9E75
-0x7344 = 0x9E79
-0x7345 = 0x9E7D
-0x7346 = 0x9E81
-0x7347 = 0x9E88
-0x7348 = 0x9E8B
-0x7349 = 0x9E8C
-0x734A = 0x9E92
-0x734B = 0x9E95
-0x734C = 0x9E91
-0x734D = 0x9E9D
-0x734E = 0x9EA5
-0x734F = 0x9EA9
-0x7350 = 0x9EB8
-0x7351 = 0x9EAA
-0x7352 = 0x9EAD
-0x7353 = 0x9761
-0x7354 = 0x9ECC
-0x7355 = 0x9ECE
-0x7356 = 0x9ECF
-0x7357 = 0x9ED0
-0x7358 = 0x9ED4
-0x7359 = 0x9EDC
-0x735A = 0x9EDE
-0x735B = 0x9EDD
-0x735C = 0x9EE0
-0x735D = 0x9EE5
-0x735E = 0x9EE8
-0x735F = 0x9EEF
-0x7360 = 0x9EF4
-0x7361 = 0x9EF6
-0x7362 = 0x9EF7
-0x7363 = 0x9EF9
-0x7364 = 0x9EFB
-0x7365 = 0x9EFC
-0x7366 = 0x9EFD
-0x7367 = 0x9F07
-0x7368 = 0x9F08
-0x7369 = 0x76B7
-0x736A = 0x9F15
-0x736B = 0x9F21
-0x736C = 0x9F2C
-0x736D = 0x9F3E
-0x736E = 0x9F4A
-0x736F = 0x9F52
-0x7370 = 0x9F54
-0x7371 = 0x9F63
-0x7372 = 0x9F5F
-0x7373 = 0x9F60
-0x7374 = 0x9F61
-0x7375 = 0x9F66
-0x7376 = 0x9F67
-0x7377 = 0x9F6C
-0x7378 = 0x9F6A
-0x7379 = 0x9F77
-0x737A = 0x9F72
-0x737B = 0x9F76
-0x737C = 0x9F95
-0x737D = 0x9F9C
-0x737E = 0x9FA0
-0x7421 = 0x582F
-0x7422 = 0x69C7
-0x7423 = 0x9059
-0x7424 = 0x7464
-0x7425 = 0x51DC
-0x7426 = 0x7199
-END_MAP
diff --git a/enc/trans/JIS/JISX0208UDC%UCS.src b/enc/trans/JIS/JISX0208UDC%UCS.src
deleted file mode 100644
index 9f5dd94090..0000000000
--- a/enc/trans/JIS/JISX0208UDC%UCS.src
+++ /dev/null
@@ -1,954 +0,0 @@
-# $NetBSD: JISX0208UDC%UCS.src,v 1.1 2003/07/19 20:20:40 tshiozak Exp $
-
-TYPE ROWCOL
-NAME "JISX0208UDC/UCS"
-SRC_ZONE 0x75-0x7E / 0x21-0x7E / 8
-OOB_MODE INVALID
-DST_INVALID 0xFFFE
-DST_UNIT_BITS 16
-
-BEGIN_MAP
-#
-# This data is derived from http://www.opengroup.or.jp/jvc/cde/
-#
-0x7521 = 0xE000
-0x7522 = 0xE001
-0x7523 = 0xE002
-0x7524 = 0xE003
-0x7525 = 0xE004
-0x7526 = 0xE005
-0x7527 = 0xE006
-0x7528 = 0xE007
-0x7529 = 0xE008
-0x752A = 0xE009
-0x752B = 0xE00A
-0x752C = 0xE00B
-0x752D = 0xE00C
-0x752E = 0xE00D
-0x752F = 0xE00E
-0x7530 = 0xE00F
-0x7531 = 0xE010
-0x7532 = 0xE011
-0x7533 = 0xE012
-0x7534 = 0xE013
-0x7535 = 0xE014
-0x7536 = 0xE015
-0x7537 = 0xE016
-0x7538 = 0xE017
-0x7539 = 0xE018
-0x753A = 0xE019
-0x753B = 0xE01A
-0x753C = 0xE01B
-0x753D = 0xE01C
-0x753E = 0xE01D
-0x753F = 0xE01E
-0x7540 = 0xE01F
-0x7541 = 0xE020
-0x7542 = 0xE021
-0x7543 = 0xE022
-0x7544 = 0xE023
-0x7545 = 0xE024
-0x7546 = 0xE025
-0x7547 = 0xE026
-0x7548 = 0xE027
-0x7549 = 0xE028
-0x754A = 0xE029
-0x754B = 0xE02A
-0x754C = 0xE02B
-0x754D = 0xE02C
-0x754E = 0xE02D
-0x754F = 0xE02E
-0x7550 = 0xE02F
-0x7551 = 0xE030
-0x7552 = 0xE031
-0x7553 = 0xE032
-0x7554 = 0xE033
-0x7555 = 0xE034
-0x7556 = 0xE035
-0x7557 = 0xE036
-0x7558 = 0xE037
-0x7559 = 0xE038
-0x755A = 0xE039
-0x755B = 0xE03A
-0x755C = 0xE03B
-0x755D = 0xE03C
-0x755E = 0xE03D
-0x755F = 0xE03E
-0x7560 = 0xE03F
-0x7561 = 0xE040
-0x7562 = 0xE041
-0x7563 = 0xE042
-0x7564 = 0xE043
-0x7565 = 0xE044
-0x7566 = 0xE045
-0x7567 = 0xE046
-0x7568 = 0xE047
-0x7569 = 0xE048
-0x756A = 0xE049
-0x756B = 0xE04A
-0x756C = 0xE04B
-0x756D = 0xE04C
-0x756E = 0xE04D
-0x756F = 0xE04E
-0x7570 = 0xE04F
-0x7571 = 0xE050
-0x7572 = 0xE051
-0x7573 = 0xE052
-0x7574 = 0xE053
-0x7575 = 0xE054
-0x7576 = 0xE055
-0x7577 = 0xE056
-0x7578 = 0xE057
-0x7579 = 0xE058
-0x757A = 0xE059
-0x757B = 0xE05A
-0x757C = 0xE05B
-0x757D = 0xE05C
-0x757E = 0xE05D
-0x7621 = 0xE05E
-0x7622 = 0xE05F
-0x7623 = 0xE060
-0x7624 = 0xE061
-0x7625 = 0xE062
-0x7626 = 0xE063
-0x7627 = 0xE064
-0x7628 = 0xE065
-0x7629 = 0xE066
-0x762A = 0xE067
-0x762B = 0xE068
-0x762C = 0xE069
-0x762D = 0xE06A
-0x762E = 0xE06B
-0x762F = 0xE06C
-0x7630 = 0xE06D
-0x7631 = 0xE06E
-0x7632 = 0xE06F
-0x7633 = 0xE070
-0x7634 = 0xE071
-0x7635 = 0xE072
-0x7636 = 0xE073
-0x7637 = 0xE074
-0x7638 = 0xE075
-0x7639 = 0xE076
-0x763A = 0xE077
-0x763B = 0xE078
-0x763C = 0xE079
-0x763D = 0xE07A
-0x763E = 0xE07B
-0x763F = 0xE07C
-0x7640 = 0xE07D
-0x7641 = 0xE07E
-0x7642 = 0xE07F
-0x7643 = 0xE080
-0x7644 = 0xE081
-0x7645 = 0xE082
-0x7646 = 0xE083
-0x7647 = 0xE084
-0x7648 = 0xE085
-0x7649 = 0xE086
-0x764A = 0xE087
-0x764B = 0xE088
-0x764C = 0xE089
-0x764D = 0xE08A
-0x764E = 0xE08B
-0x764F = 0xE08C
-0x7650 = 0xE08D
-0x7651 = 0xE08E
-0x7652 = 0xE08F
-0x7653 = 0xE090
-0x7654 = 0xE091
-0x7655 = 0xE092
-0x7656 = 0xE093
-0x7657 = 0xE094
-0x7658 = 0xE095
-0x7659 = 0xE096
-0x765A = 0xE097
-0x765B = 0xE098
-0x765C = 0xE099
-0x765D = 0xE09A
-0x765E = 0xE09B
-0x765F = 0xE09C
-0x7660 = 0xE09D
-0x7661 = 0xE09E
-0x7662 = 0xE09F
-0x7663 = 0xE0A0
-0x7664 = 0xE0A1
-0x7665 = 0xE0A2
-0x7666 = 0xE0A3
-0x7667 = 0xE0A4
-0x7668 = 0xE0A5
-0x7669 = 0xE0A6
-0x766A = 0xE0A7
-0x766B = 0xE0A8
-0x766C = 0xE0A9
-0x766D = 0xE0AA
-0x766E = 0xE0AB
-0x766F = 0xE0AC
-0x7670 = 0xE0AD
-0x7671 = 0xE0AE
-0x7672 = 0xE0AF
-0x7673 = 0xE0B0
-0x7674 = 0xE0B1
-0x7675 = 0xE0B2
-0x7676 = 0xE0B3
-0x7677 = 0xE0B4
-0x7678 = 0xE0B5
-0x7679 = 0xE0B6
-0x767A = 0xE0B7
-0x767B = 0xE0B8
-0x767C = 0xE0B9
-0x767D = 0xE0BA
-0x767E = 0xE0BB
-0x7721 = 0xE0BC
-0x7722 = 0xE0BD
-0x7723 = 0xE0BE
-0x7724 = 0xE0BF
-0x7725 = 0xE0C0
-0x7726 = 0xE0C1
-0x7727 = 0xE0C2
-0x7728 = 0xE0C3
-0x7729 = 0xE0C4
-0x772A = 0xE0C5
-0x772B = 0xE0C6
-0x772C = 0xE0C7
-0x772D = 0xE0C8
-0x772E = 0xE0C9
-0x772F = 0xE0CA
-0x7730 = 0xE0CB
-0x7731 = 0xE0CC
-0x7732 = 0xE0CD
-0x7733 = 0xE0CE
-0x7734 = 0xE0CF
-0x7735 = 0xE0D0
-0x7736 = 0xE0D1
-0x7737 = 0xE0D2
-0x7738 = 0xE0D3
-0x7739 = 0xE0D4
-0x773A = 0xE0D5
-0x773B = 0xE0D6
-0x773C = 0xE0D7
-0x773D = 0xE0D8
-0x773E = 0xE0D9
-0x773F = 0xE0DA
-0x7740 = 0xE0DB
-0x7741 = 0xE0DC
-0x7742 = 0xE0DD
-0x7743 = 0xE0DE
-0x7744 = 0xE0DF
-0x7745 = 0xE0E0
-0x7746 = 0xE0E1
-0x7747 = 0xE0E2
-0x7748 = 0xE0E3
-0x7749 = 0xE0E4
-0x774A = 0xE0E5
-0x774B = 0xE0E6
-0x774C = 0xE0E7
-0x774D = 0xE0E8
-0x774E = 0xE0E9
-0x774F = 0xE0EA
-0x7750 = 0xE0EB
-0x7751 = 0xE0EC
-0x7752 = 0xE0ED
-0x7753 = 0xE0EE
-0x7754 = 0xE0EF
-0x7755 = 0xE0F0
-0x7756 = 0xE0F1
-0x7757 = 0xE0F2
-0x7758 = 0xE0F3
-0x7759 = 0xE0F4
-0x775A = 0xE0F5
-0x775B = 0xE0F6
-0x775C = 0xE0F7
-0x775D = 0xE0F8
-0x775E = 0xE0F9
-0x775F = 0xE0FA
-0x7760 = 0xE0FB
-0x7761 = 0xE0FC
-0x7762 = 0xE0FD
-0x7763 = 0xE0FE
-0x7764 = 0xE0FF
-0x7765 = 0xE100
-0x7766 = 0xE101
-0x7767 = 0xE102
-0x7768 = 0xE103
-0x7769 = 0xE104
-0x776A = 0xE105
-0x776B = 0xE106
-0x776C = 0xE107
-0x776D = 0xE108
-0x776E = 0xE109
-0x776F = 0xE10A
-0x7770 = 0xE10B
-0x7771 = 0xE10C
-0x7772 = 0xE10D
-0x7773 = 0xE10E
-0x7774 = 0xE10F
-0x7775 = 0xE110
-0x7776 = 0xE111
-0x7777 = 0xE112
-0x7778 = 0xE113
-0x7779 = 0xE114
-0x777A = 0xE115
-0x777B = 0xE116
-0x777C = 0xE117
-0x777D = 0xE118
-0x777E = 0xE119
-0x7821 = 0xE11A
-0x7822 = 0xE11B
-0x7823 = 0xE11C
-0x7824 = 0xE11D
-0x7825 = 0xE11E
-0x7826 = 0xE11F
-0x7827 = 0xE120
-0x7828 = 0xE121
-0x7829 = 0xE122
-0x782A = 0xE123
-0x782B = 0xE124
-0x782C = 0xE125
-0x782D = 0xE126
-0x782E = 0xE127
-0x782F = 0xE128
-0x7830 = 0xE129
-0x7831 = 0xE12A
-0x7832 = 0xE12B
-0x7833 = 0xE12C
-0x7834 = 0xE12D
-0x7835 = 0xE12E
-0x7836 = 0xE12F
-0x7837 = 0xE130
-0x7838 = 0xE131
-0x7839 = 0xE132
-0x783A = 0xE133
-0x783B = 0xE134
-0x783C = 0xE135
-0x783D = 0xE136
-0x783E = 0xE137
-0x783F = 0xE138
-0x7840 = 0xE139
-0x7841 = 0xE13A
-0x7842 = 0xE13B
-0x7843 = 0xE13C
-0x7844 = 0xE13D
-0x7845 = 0xE13E
-0x7846 = 0xE13F
-0x7847 = 0xE140
-0x7848 = 0xE141
-0x7849 = 0xE142
-0x784A = 0xE143
-0x784B = 0xE144
-0x784C = 0xE145
-0x784D = 0xE146
-0x784E = 0xE147
-0x784F = 0xE148
-0x7850 = 0xE149
-0x7851 = 0xE14A
-0x7852 = 0xE14B
-0x7853 = 0xE14C
-0x7854 = 0xE14D
-0x7855 = 0xE14E
-0x7856 = 0xE14F
-0x7857 = 0xE150
-0x7858 = 0xE151
-0x7859 = 0xE152
-0x785A = 0xE153
-0x785B = 0xE154
-0x785C = 0xE155
-0x785D = 0xE156
-0x785E = 0xE157
-0x785F = 0xE158
-0x7860 = 0xE159
-0x7861 = 0xE15A
-0x7862 = 0xE15B
-0x7863 = 0xE15C
-0x7864 = 0xE15D
-0x7865 = 0xE15E
-0x7866 = 0xE15F
-0x7867 = 0xE160
-0x7868 = 0xE161
-0x7869 = 0xE162
-0x786A = 0xE163
-0x786B = 0xE164
-0x786C = 0xE165
-0x786D = 0xE166
-0x786E = 0xE167
-0x786F = 0xE168
-0x7870 = 0xE169
-0x7871 = 0xE16A
-0x7872 = 0xE16B
-0x7873 = 0xE16C
-0x7874 = 0xE16D
-0x7875 = 0xE16E
-0x7876 = 0xE16F
-0x7877 = 0xE170
-0x7878 = 0xE171
-0x7879 = 0xE172
-0x787A = 0xE173
-0x787B = 0xE174
-0x787C = 0xE175
-0x787D = 0xE176
-0x787E = 0xE177
-0x7921 = 0xE178
-0x7922 = 0xE179
-0x7923 = 0xE17A
-0x7924 = 0xE17B
-0x7925 = 0xE17C
-0x7926 = 0xE17D
-0x7927 = 0xE17E
-0x7928 = 0xE17F
-0x7929 = 0xE180
-0x792A = 0xE181
-0x792B = 0xE182
-0x792C = 0xE183
-0x792D = 0xE184
-0x792E = 0xE185
-0x792F = 0xE186
-0x7930 = 0xE187
-0x7931 = 0xE188
-0x7932 = 0xE189
-0x7933 = 0xE18A
-0x7934 = 0xE18B
-0x7935 = 0xE18C
-0x7936 = 0xE18D
-0x7937 = 0xE18E
-0x7938 = 0xE18F
-0x7939 = 0xE190
-0x793A = 0xE191
-0x793B = 0xE192
-0x793C = 0xE193
-0x793D = 0xE194
-0x793E = 0xE195
-0x793F = 0xE196
-0x7940 = 0xE197
-0x7941 = 0xE198
-0x7942 = 0xE199
-0x7943 = 0xE19A
-0x7944 = 0xE19B
-0x7945 = 0xE19C
-0x7946 = 0xE19D
-0x7947 = 0xE19E
-0x7948 = 0xE19F
-0x7949 = 0xE1A0
-0x794A = 0xE1A1
-0x794B = 0xE1A2
-0x794C = 0xE1A3
-0x794D = 0xE1A4
-0x794E = 0xE1A5
-0x794F = 0xE1A6
-0x7950 = 0xE1A7
-0x7951 = 0xE1A8
-0x7952 = 0xE1A9
-0x7953 = 0xE1AA
-0x7954 = 0xE1AB
-0x7955 = 0xE1AC
-0x7956 = 0xE1AD
-0x7957 = 0xE1AE
-0x7958 = 0xE1AF
-0x7959 = 0xE1B0
-0x795A = 0xE1B1
-0x795B = 0xE1B2
-0x795C = 0xE1B3
-0x795D = 0xE1B4
-0x795E = 0xE1B5
-0x795F = 0xE1B6
-0x7960 = 0xE1B7
-0x7961 = 0xE1B8
-0x7962 = 0xE1B9
-0x7963 = 0xE1BA
-0x7964 = 0xE1BB
-0x7965 = 0xE1BC
-0x7966 = 0xE1BD
-0x7967 = 0xE1BE
-0x7968 = 0xE1BF
-0x7969 = 0xE1C0
-0x796A = 0xE1C1
-0x796B = 0xE1C2
-0x796C = 0xE1C3
-0x796D = 0xE1C4
-0x796E = 0xE1C5
-0x796F = 0xE1C6
-0x7970 = 0xE1C7
-0x7971 = 0xE1C8
-0x7972 = 0xE1C9
-0x7973 = 0xE1CA
-0x7974 = 0xE1CB
-0x7975 = 0xE1CC
-0x7976 = 0xE1CD
-0x7977 = 0xE1CE
-0x7978 = 0xE1CF
-0x7979 = 0xE1D0
-0x797A = 0xE1D1
-0x797B = 0xE1D2
-0x797C = 0xE1D3
-0x797D = 0xE1D4
-0x797E = 0xE1D5
-0x7A21 = 0xE1D6
-0x7A22 = 0xE1D7
-0x7A23 = 0xE1D8
-0x7A24 = 0xE1D9
-0x7A25 = 0xE1DA
-0x7A26 = 0xE1DB
-0x7A27 = 0xE1DC
-0x7A28 = 0xE1DD
-0x7A29 = 0xE1DE
-0x7A2A = 0xE1DF
-0x7A2B = 0xE1E0
-0x7A2C = 0xE1E1
-0x7A2D = 0xE1E2
-0x7A2E = 0xE1E3
-0x7A2F = 0xE1E4
-0x7A30 = 0xE1E5
-0x7A31 = 0xE1E6
-0x7A32 = 0xE1E7
-0x7A33 = 0xE1E8
-0x7A34 = 0xE1E9
-0x7A35 = 0xE1EA
-0x7A36 = 0xE1EB
-0x7A37 = 0xE1EC
-0x7A38 = 0xE1ED
-0x7A39 = 0xE1EE
-0x7A3A = 0xE1EF
-0x7A3B = 0xE1F0
-0x7A3C = 0xE1F1
-0x7A3D = 0xE1F2
-0x7A3E = 0xE1F3
-0x7A3F = 0xE1F4
-0x7A40 = 0xE1F5
-0x7A41 = 0xE1F6
-0x7A42 = 0xE1F7
-0x7A43 = 0xE1F8
-0x7A44 = 0xE1F9
-0x7A45 = 0xE1FA
-0x7A46 = 0xE1FB
-0x7A47 = 0xE1FC
-0x7A48 = 0xE1FD
-0x7A49 = 0xE1FE
-0x7A4A = 0xE1FF
-0x7A4B = 0xE200
-0x7A4C = 0xE201
-0x7A4D = 0xE202
-0x7A4E = 0xE203
-0x7A4F = 0xE204
-0x7A50 = 0xE205
-0x7A51 = 0xE206
-0x7A52 = 0xE207
-0x7A53 = 0xE208
-0x7A54 = 0xE209
-0x7A55 = 0xE20A
-0x7A56 = 0xE20B
-0x7A57 = 0xE20C
-0x7A58 = 0xE20D
-0x7A59 = 0xE20E
-0x7A5A = 0xE20F
-0x7A5B = 0xE210
-0x7A5C = 0xE211
-0x7A5D = 0xE212
-0x7A5E = 0xE213
-0x7A5F = 0xE214
-0x7A60 = 0xE215
-0x7A61 = 0xE216
-0x7A62 = 0xE217
-0x7A63 = 0xE218
-0x7A64 = 0xE219
-0x7A65 = 0xE21A
-0x7A66 = 0xE21B
-0x7A67 = 0xE21C
-0x7A68 = 0xE21D
-0x7A69 = 0xE21E
-0x7A6A = 0xE21F
-0x7A6B = 0xE220
-0x7A6C = 0xE221
-0x7A6D = 0xE222
-0x7A6E = 0xE223
-0x7A6F = 0xE224
-0x7A70 = 0xE225
-0x7A71 = 0xE226
-0x7A72 = 0xE227
-0x7A73 = 0xE228
-0x7A74 = 0xE229
-0x7A75 = 0xE22A
-0x7A76 = 0xE22B
-0x7A77 = 0xE22C
-0x7A78 = 0xE22D
-0x7A79 = 0xE22E
-0x7A7A = 0xE22F
-0x7A7B = 0xE230
-0x7A7C = 0xE231
-0x7A7D = 0xE232
-0x7A7E = 0xE233
-0x7B21 = 0xE234
-0x7B22 = 0xE235
-0x7B23 = 0xE236
-0x7B24 = 0xE237
-0x7B25 = 0xE238
-0x7B26 = 0xE239
-0x7B27 = 0xE23A
-0x7B28 = 0xE23B
-0x7B29 = 0xE23C
-0x7B2A = 0xE23D
-0x7B2B = 0xE23E
-0x7B2C = 0xE23F
-0x7B2D = 0xE240
-0x7B2E = 0xE241
-0x7B2F = 0xE242
-0x7B30 = 0xE243
-0x7B31 = 0xE244
-0x7B32 = 0xE245
-0x7B33 = 0xE246
-0x7B34 = 0xE247
-0x7B35 = 0xE248
-0x7B36 = 0xE249
-0x7B37 = 0xE24A
-0x7B38 = 0xE24B
-0x7B39 = 0xE24C
-0x7B3A = 0xE24D
-0x7B3B = 0xE24E
-0x7B3C = 0xE24F
-0x7B3D = 0xE250
-0x7B3E = 0xE251
-0x7B3F = 0xE252
-0x7B40 = 0xE253
-0x7B41 = 0xE254
-0x7B42 = 0xE255
-0x7B43 = 0xE256
-0x7B44 = 0xE257
-0x7B45 = 0xE258
-0x7B46 = 0xE259
-0x7B47 = 0xE25A
-0x7B48 = 0xE25B
-0x7B49 = 0xE25C
-0x7B4A = 0xE25D
-0x7B4B = 0xE25E
-0x7B4C = 0xE25F
-0x7B4D = 0xE260
-0x7B4E = 0xE261
-0x7B4F = 0xE262
-0x7B50 = 0xE263
-0x7B51 = 0xE264
-0x7B52 = 0xE265
-0x7B53 = 0xE266
-0x7B54 = 0xE267
-0x7B55 = 0xE268
-0x7B56 = 0xE269
-0x7B57 = 0xE26A
-0x7B58 = 0xE26B
-0x7B59 = 0xE26C
-0x7B5A = 0xE26D
-0x7B5B = 0xE26E
-0x7B5C = 0xE26F
-0x7B5D = 0xE270
-0x7B5E = 0xE271
-0x7B5F = 0xE272
-0x7B60 = 0xE273
-0x7B61 = 0xE274
-0x7B62 = 0xE275
-0x7B63 = 0xE276
-0x7B64 = 0xE277
-0x7B65 = 0xE278
-0x7B66 = 0xE279
-0x7B67 = 0xE27A
-0x7B68 = 0xE27B
-0x7B69 = 0xE27C
-0x7B6A = 0xE27D
-0x7B6B = 0xE27E
-0x7B6C = 0xE27F
-0x7B6D = 0xE280
-0x7B6E = 0xE281
-0x7B6F = 0xE282
-0x7B70 = 0xE283
-0x7B71 = 0xE284
-0x7B72 = 0xE285
-0x7B73 = 0xE286
-0x7B74 = 0xE287
-0x7B75 = 0xE288
-0x7B76 = 0xE289
-0x7B77 = 0xE28A
-0x7B78 = 0xE28B
-0x7B79 = 0xE28C
-0x7B7A = 0xE28D
-0x7B7B = 0xE28E
-0x7B7C = 0xE28F
-0x7B7D = 0xE290
-0x7B7E = 0xE291
-0x7C21 = 0xE292
-0x7C22 = 0xE293
-0x7C23 = 0xE294
-0x7C24 = 0xE295
-0x7C25 = 0xE296
-0x7C26 = 0xE297
-0x7C27 = 0xE298
-0x7C28 = 0xE299
-0x7C29 = 0xE29A
-0x7C2A = 0xE29B
-0x7C2B = 0xE29C
-0x7C2C = 0xE29D
-0x7C2D = 0xE29E
-0x7C2E = 0xE29F
-0x7C2F = 0xE2A0
-0x7C30 = 0xE2A1
-0x7C31 = 0xE2A2
-0x7C32 = 0xE2A3
-0x7C33 = 0xE2A4
-0x7C34 = 0xE2A5
-0x7C35 = 0xE2A6
-0x7C36 = 0xE2A7
-0x7C37 = 0xE2A8
-0x7C38 = 0xE2A9
-0x7C39 = 0xE2AA
-0x7C3A = 0xE2AB
-0x7C3B = 0xE2AC
-0x7C3C = 0xE2AD
-0x7C3D = 0xE2AE
-0x7C3E = 0xE2AF
-0x7C3F = 0xE2B0
-0x7C40 = 0xE2B1
-0x7C41 = 0xE2B2
-0x7C42 = 0xE2B3
-0x7C43 = 0xE2B4
-0x7C44 = 0xE2B5
-0x7C45 = 0xE2B6
-0x7C46 = 0xE2B7
-0x7C47 = 0xE2B8
-0x7C48 = 0xE2B9
-0x7C49 = 0xE2BA
-0x7C4A = 0xE2BB
-0x7C4B = 0xE2BC
-0x7C4C = 0xE2BD
-0x7C4D = 0xE2BE
-0x7C4E = 0xE2BF
-0x7C4F = 0xE2C0
-0x7C50 = 0xE2C1
-0x7C51 = 0xE2C2
-0x7C52 = 0xE2C3
-0x7C53 = 0xE2C4
-0x7C54 = 0xE2C5
-0x7C55 = 0xE2C6
-0x7C56 = 0xE2C7
-0x7C57 = 0xE2C8
-0x7C58 = 0xE2C9
-0x7C59 = 0xE2CA
-0x7C5A = 0xE2CB
-0x7C5B = 0xE2CC
-0x7C5C = 0xE2CD
-0x7C5D = 0xE2CE
-0x7C5E = 0xE2CF
-0x7C5F = 0xE2D0
-0x7C60 = 0xE2D1
-0x7C61 = 0xE2D2
-0x7C62 = 0xE2D3
-0x7C63 = 0xE2D4
-0x7C64 = 0xE2D5
-0x7C65 = 0xE2D6
-0x7C66 = 0xE2D7
-0x7C67 = 0xE2D8
-0x7C68 = 0xE2D9
-0x7C69 = 0xE2DA
-0x7C6A = 0xE2DB
-0x7C6B = 0xE2DC
-0x7C6C = 0xE2DD
-0x7C6D = 0xE2DE
-0x7C6E = 0xE2DF
-0x7C6F = 0xE2E0
-0x7C70 = 0xE2E1
-0x7C71 = 0xE2E2
-0x7C72 = 0xE2E3
-0x7C73 = 0xE2E4
-0x7C74 = 0xE2E5
-0x7C75 = 0xE2E6
-0x7C76 = 0xE2E7
-0x7C77 = 0xE2E8
-0x7C78 = 0xE2E9
-0x7C79 = 0xE2EA
-0x7C7A = 0xE2EB
-0x7C7B = 0xE2EC
-0x7C7C = 0xE2ED
-0x7C7D = 0xE2EE
-0x7C7E = 0xE2EF
-0x7D21 = 0xE2F0
-0x7D22 = 0xE2F1
-0x7D23 = 0xE2F2
-0x7D24 = 0xE2F3
-0x7D25 = 0xE2F4
-0x7D26 = 0xE2F5
-0x7D27 = 0xE2F6
-0x7D28 = 0xE2F7
-0x7D29 = 0xE2F8
-0x7D2A = 0xE2F9
-0x7D2B = 0xE2FA
-0x7D2C = 0xE2FB
-0x7D2D = 0xE2FC
-0x7D2E = 0xE2FD
-0x7D2F = 0xE2FE
-0x7D30 = 0xE2FF
-0x7D31 = 0xE300
-0x7D32 = 0xE301
-0x7D33 = 0xE302
-0x7D34 = 0xE303
-0x7D35 = 0xE304
-0x7D36 = 0xE305
-0x7D37 = 0xE306
-0x7D38 = 0xE307
-0x7D39 = 0xE308
-0x7D3A = 0xE309
-0x7D3B = 0xE30A
-0x7D3C = 0xE30B
-0x7D3D = 0xE30C
-0x7D3E = 0xE30D
-0x7D3F = 0xE30E
-0x7D40 = 0xE30F
-0x7D41 = 0xE310
-0x7D42 = 0xE311
-0x7D43 = 0xE312
-0x7D44 = 0xE313
-0x7D45 = 0xE314
-0x7D46 = 0xE315
-0x7D47 = 0xE316
-0x7D48 = 0xE317
-0x7D49 = 0xE318
-0x7D4A = 0xE319
-0x7D4B = 0xE31A
-0x7D4C = 0xE31B
-0x7D4D = 0xE31C
-0x7D4E = 0xE31D
-0x7D4F = 0xE31E
-0x7D50 = 0xE31F
-0x7D51 = 0xE320
-0x7D52 = 0xE321
-0x7D53 = 0xE322
-0x7D54 = 0xE323
-0x7D55 = 0xE324
-0x7D56 = 0xE325
-0x7D57 = 0xE326
-0x7D58 = 0xE327
-0x7D59 = 0xE328
-0x7D5A = 0xE329
-0x7D5B = 0xE32A
-0x7D5C = 0xE32B
-0x7D5D = 0xE32C
-0x7D5E = 0xE32D
-0x7D5F = 0xE32E
-0x7D60 = 0xE32F
-0x7D61 = 0xE330
-0x7D62 = 0xE331
-0x7D63 = 0xE332
-0x7D64 = 0xE333
-0x7D65 = 0xE334
-0x7D66 = 0xE335
-0x7D67 = 0xE336
-0x7D68 = 0xE337
-0x7D69 = 0xE338
-0x7D6A = 0xE339
-0x7D6B = 0xE33A
-0x7D6C = 0xE33B
-0x7D6D = 0xE33C
-0x7D6E = 0xE33D
-0x7D6F = 0xE33E
-0x7D70 = 0xE33F
-0x7D71 = 0xE340
-0x7D72 = 0xE341
-0x7D73 = 0xE342
-0x7D74 = 0xE343
-0x7D75 = 0xE344
-0x7D76 = 0xE345
-0x7D77 = 0xE346
-0x7D78 = 0xE347
-0x7D79 = 0xE348
-0x7D7A = 0xE349
-0x7D7B = 0xE34A
-0x7D7C = 0xE34B
-0x7D7D = 0xE34C
-0x7D7E = 0xE34D
-0x7E21 = 0xE34E
-0x7E22 = 0xE34F
-0x7E23 = 0xE350
-0x7E24 = 0xE351
-0x7E25 = 0xE352
-0x7E26 = 0xE353
-0x7E27 = 0xE354
-0x7E28 = 0xE355
-0x7E29 = 0xE356
-0x7E2A = 0xE357
-0x7E2B = 0xE358
-0x7E2C = 0xE359
-0x7E2D = 0xE35A
-0x7E2E = 0xE35B
-0x7E2F = 0xE35C
-0x7E30 = 0xE35D
-0x7E31 = 0xE35E
-0x7E32 = 0xE35F
-0x7E33 = 0xE360
-0x7E34 = 0xE361
-0x7E35 = 0xE362
-0x7E36 = 0xE363
-0x7E37 = 0xE364
-0x7E38 = 0xE365
-0x7E39 = 0xE366
-0x7E3A = 0xE367
-0x7E3B = 0xE368
-0x7E3C = 0xE369
-0x7E3D = 0xE36A
-0x7E3E = 0xE36B
-0x7E3F = 0xE36C
-0x7E40 = 0xE36D
-0x7E41 = 0xE36E
-0x7E42 = 0xE36F
-0x7E43 = 0xE370
-0x7E44 = 0xE371
-0x7E45 = 0xE372
-0x7E46 = 0xE373
-0x7E47 = 0xE374
-0x7E48 = 0xE375
-0x7E49 = 0xE376
-0x7E4A = 0xE377
-0x7E4B = 0xE378
-0x7E4C = 0xE379
-0x7E4D = 0xE37A
-0x7E4E = 0xE37B
-0x7E4F = 0xE37C
-0x7E50 = 0xE37D
-0x7E51 = 0xE37E
-0x7E52 = 0xE37F
-0x7E53 = 0xE380
-0x7E54 = 0xE381
-0x7E55 = 0xE382
-0x7E56 = 0xE383
-0x7E57 = 0xE384
-0x7E58 = 0xE385
-0x7E59 = 0xE386
-0x7E5A = 0xE387
-0x7E5B = 0xE388
-0x7E5C = 0xE389
-0x7E5D = 0xE38A
-0x7E5E = 0xE38B
-0x7E5F = 0xE38C
-0x7E60 = 0xE38D
-0x7E61 = 0xE38E
-0x7E62 = 0xE38F
-0x7E63 = 0xE390
-0x7E64 = 0xE391
-0x7E65 = 0xE392
-0x7E66 = 0xE393
-0x7E67 = 0xE394
-0x7E68 = 0xE395
-0x7E69 = 0xE396
-0x7E6A = 0xE397
-0x7E6B = 0xE398
-0x7E6C = 0xE399
-0x7E6D = 0xE39A
-0x7E6E = 0xE39B
-0x7E6F = 0xE39C
-0x7E70 = 0xE39D
-0x7E71 = 0xE39E
-0x7E72 = 0xE39F
-0x7E73 = 0xE3A0
-0x7E74 = 0xE3A1
-0x7E75 = 0xE3A2
-0x7E76 = 0xE3A3
-0x7E77 = 0xE3A4
-0x7E78 = 0xE3A5
-0x7E79 = 0xE3A6
-0x7E7A = 0xE3A7
-0x7E7B = 0xE3A8
-0x7E7C = 0xE3A9
-0x7E7D = 0xE3AA
-0x7E7E = 0xE3AB
-END_MAP
diff --git a/enc/trans/JIS/JISX0208VDC@NEC%UCS.src b/enc/trans/JIS/JISX0208VDC@NEC%UCS.src
deleted file mode 100644
index bf7ea7b67a..0000000000
--- a/enc/trans/JIS/JISX0208VDC@NEC%UCS.src
+++ /dev/null
@@ -1,97 +0,0 @@
-# $NetBSD: JISX0208VDC@NEC%UCS.src,v 1.1 2003/07/19 20:20:41 tshiozak Exp $
-
-TYPE ROWCOL
-NAME "JISX0208VDC:NEC/UCS"
-SRC_ZONE 0x2D21 - 0x2D7C
-OOB_MODE INVALID
-DST_INVALID 0xFFFE
-DST_UNIT_BITS 16
-
-BEGIN_MAP
-#
-# This data is derived from http://www.opengroup.or.jp/jvc/cde/
-#
-0x2D21 = 0x2460
-0x2D22 = 0x2461
-0x2D23 = 0x2462
-0x2D24 = 0x2463
-0x2D25 = 0x2464
-0x2D26 = 0x2465
-0x2D27 = 0x2466
-0x2D28 = 0x2467
-0x2D29 = 0x2468
-0x2D2A = 0x2469
-0x2D2B = 0x246A
-0x2D2C = 0x246B
-0x2D2D = 0x246C
-0x2D2E = 0x246D
-0x2D2F = 0x246E
-0x2D30 = 0x246F
-0x2D31 = 0x2470
-0x2D32 = 0x2471
-0x2D33 = 0x2472
-0x2D34 = 0x2473
-0x2D35 = 0x2160
-0x2D36 = 0x2161
-0x2D37 = 0x2162
-0x2D38 = 0x2163
-0x2D39 = 0x2164
-0x2D3A = 0x2165
-0x2D3B = 0x2166
-0x2D3C = 0x2167
-0x2D3D = 0x2168
-0x2D3E = 0x2169
-0x2D40 = 0x3349
-0x2D41 = 0x3314
-0x2D42 = 0x3322
-0x2D43 = 0x334D
-0x2D44 = 0x3318
-0x2D45 = 0x3327
-0x2D46 = 0x3303
-0x2D47 = 0x3336
-0x2D48 = 0x3351
-0x2D49 = 0x3357
-0x2D4A = 0x330D
-0x2D4B = 0x3326
-0x2D4C = 0x3323
-0x2D4D = 0x332B
-0x2D4E = 0x334A
-0x2D4F = 0x333B
-0x2D50 = 0x339C
-0x2D51 = 0x339D
-0x2D52 = 0x339E
-0x2D53 = 0x338E
-0x2D54 = 0x338F
-0x2D55 = 0x33C4
-0x2D56 = 0x33A1
-0x2D5F = 0x337B
-0x2D60 = 0x301D
-0x2D61 = 0x301F
-0x2D62 = 0x2116
-0x2D63 = 0x33CD
-0x2D64 = 0x2121
-0x2D65 = 0x32A4
-0x2D66 = 0x32A5
-0x2D67 = 0x32A6
-0x2D68 = 0x32A7
-0x2D69 = 0x32A8
-0x2D6A = 0x3231
-0x2D6B = 0x3232
-0x2D6C = 0x3239
-0x2D6D = 0x337E
-0x2D6E = 0x337D
-0x2D6F = 0x337C
-0x2D70 = 0x2252
-0x2D71 = 0x2261
-0x2D72 = 0x222B
-0x2D73 = 0x222E
-0x2D74 = 0x2211
-0x2D75 = 0x221A
-0x2D76 = 0x22A5
-0x2D77 = 0x2220
-0x2D78 = 0x221F
-0x2D79 = 0x22BF
-0x2D7A = 0x2235
-0x2D7B = 0x2229
-0x2D7C = 0x222A
-END_MAP
diff --git a/enc/trans/JIS/JISX0212%UCS.src b/enc/trans/JIS/JISX0212%UCS.src
deleted file mode 100644
index cf4e7ecf62..0000000000
--- a/enc/trans/JIS/JISX0212%UCS.src
+++ /dev/null
@@ -1,6167 +0,0 @@
-# $NetBSD: JISX0212%UCS.src,v 1.2 2003/07/12 16:11:10 tshiozak Exp $
-
-TYPE ROWCOL
-NAME JISX0212/UCS
-SRC_ZONE 0x21-0x7E / 0x21-0x7E / 8
-OOB_MODE ILSEQ
-DST_ILSEQ 0xFFFE
-DST_UNIT_BITS 16
-
-BEGIN_MAP
-#
-# This mapping data is made from the mapping data provided by Unicode, Inc.
-# Original notice:
-#
-# Name: JIS X 0212 (1990) to Unicode
-# Unicode version: 1.1
-# Table version: 0.9
-# Table format: Format A
-# Date: 8 March 1994
-#
-# Copyright (c) 1991-1994 Unicode, Inc. All Rights reserved.
-#
-# This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
-# No claims are made as to fitness for any particular purpose. No
-# warranties of any kind are expressed or implied. The recipient
-# agrees to determine applicability of information provided. If this
-# file has been provided on magnetic media by Unicode, Inc., the sole
-# remedy for any claim will be exchange of defective media within 90
-# days of receipt.
-#
-# Recipient is granted the right to make copies in any form for
-# internal distribution and to freely use the information supplied
-# in the creation of products supporting Unicode. Unicode, Inc.
-# specifically excludes the right to re-distribute this file directly
-# to third parties or other organizations whether for profit or not.
-#
-# General notes:
-#
-#
-# This table contains one set of mappings from JIS X 0212 into Unicode.
-# Note that these data are *possible* mappings only and may not be the
-# same as those used by actual products, nor may they be the best suited
-# for all uses. For more information on the mappings between various code
-# pages incorporating the repertoire of JIS X 0212 and Unicode, consult the
-# VENDORS mapping data. Normative information on the mapping between
-# JIS X 0212 and Unicode may be found in the Unihan.txt file in the
-# latest Unicode Character Database.
-#
-# If you have carefully considered the fact that the mappings in
-# this table are only one possible set of mappings between JIS X 0212 and
-# Unicode and have no normative status, but still feel that you
-# have located an error in the table that requires fixing, you may
-# report any such error to errata@unicode.org.
-#
-#
-# Format: Three tab-separated columns
-# Column #1 is the JIS X 0212 code (in hex as 0xXXXX)
-# Column #2 is the Unicode (in hex as 0xXXXX)
-# Column #3 the Unicode name (follows a comment sign, '#')
-# The official names for Unicode characters U+4E00
-# to U+9FA5, inclusive, is "CJK UNIFIED IDEOGRAPH-XXXX",
-# where XXXX is the code point. Including all these
-# names in this file increases its size substantially
-# and needlessly. The token "<CJK>" is used for the
-# name of these characters. If necessary, it can be
-# expanded algorithmically by a parser or editor.
-#
-# The entries are in JIS X 0212 order
-#
-# The following algorithms can be used to change the hex form
-# of JIS 0212 to other standard forms:
-#
-# To change hex to EUC form, add 0x8080
-# To change hex to kuten form, first subtract 0x2020. Then
-# the high and low bytes correspond to the ku and ten of
-# the kuten form. For example, 0x2121 -> 0x0101 -> 0101;
-# 0x6D63 -> 0x4D43 -> 7767
-#
-# The kanji mappings are a normative part of ISO/IEC 10646. The
-# non-kanji mappings are provisional, pending definition of
-# official mappings by Japanese standards bodies
-#
-# Any comments or problems, contact <John_Jenkins@taligent.com>
-#
-# Notes:
-#
-# 1. JIS X 0212 apparently unified the following two symbols
-# into a single character at 0x2922:
-#
-# LATIN CAPITAL LETTER D WITH STROKE
-# LATIN CAPITAL LETTER ETH
-#
-# However, JIS X 0212 maintains the distinction between
-# the lowercase forms of these two elements at 0x2942 and 0x2943.
-# Given the structre of these JIS encodings, it is clear that
-# 0x2922 and 0x2942 are intended to be a capital/small pair.
-# Consequently, in the Unicode mapping, 0x2922 is treated as
-# LATIN CAPITAL LETTER D WITH STROKE.
-#
-0x222F = 0x02D8
-0x2230 = 0x02C7
-0x2231 = 0x00B8
-0x2232 = 0x02D9
-0x2233 = 0x02DD
-0x2234 = 0x00AF
-0x2235 = 0x02DB
-0x2236 = 0x02DA
-0x2237 = 0x007E
-0x2238 = 0x0384
-0x2239 = 0x0385
-0x2242 = 0x00A1
-0x2243 = 0x00A6
-0x2244 = 0x00BF
-0x226B = 0x00BA
-0x226C = 0x00AA
-0x226D = 0x00A9
-0x226E = 0x00AE
-0x226F = 0x2122
-0x2270 = 0x00A4
-0x2271 = 0x2116
-0x2661 = 0x0386
-0x2662 = 0x0388
-0x2663 = 0x0389
-0x2664 = 0x038A
-0x2665 = 0x03AA
-0x2667 = 0x038C
-0x2669 = 0x038E
-0x266A = 0x03AB
-0x266C = 0x038F
-0x2671 = 0x03AC
-0x2672 = 0x03AD
-0x2673 = 0x03AE
-0x2674 = 0x03AF
-0x2675 = 0x03CA
-0x2676 = 0x0390
-0x2677 = 0x03CC
-0x2678 = 0x03C2
-0x2679 = 0x03CD
-0x267A = 0x03CB
-0x267B = 0x03B0
-0x267C = 0x03CE
-0x2742 = 0x0402
-0x2743 = 0x0403
-0x2744 = 0x0404
-0x2745 = 0x0405
-0x2746 = 0x0406
-0x2747 = 0x0407
-0x2748 = 0x0408
-0x2749 = 0x0409
-0x274A = 0x040A
-0x274B = 0x040B
-0x274C = 0x040C
-0x274D = 0x040E
-0x274E = 0x040F
-0x2772 = 0x0452
-0x2773 = 0x0453
-0x2774 = 0x0454
-0x2775 = 0x0455
-0x2776 = 0x0456
-0x2777 = 0x0457
-0x2778 = 0x0458
-0x2779 = 0x0459
-0x277A = 0x045A
-0x277B = 0x045B
-0x277C = 0x045C
-0x277D = 0x045E
-0x277E = 0x045F
-0x2921 = 0x00C6
-0x2922 = 0x0110
-0x2924 = 0x0126
-0x2926 = 0x0132
-0x2928 = 0x0141
-0x2929 = 0x013F
-0x292B = 0x014A
-0x292C = 0x00D8
-0x292D = 0x0152
-0x292F = 0x0166
-0x2930 = 0x00DE
-0x2941 = 0x00E6
-0x2942 = 0x0111
-0x2943 = 0x00F0
-0x2944 = 0x0127
-0x2945 = 0x0131
-0x2946 = 0x0133
-0x2947 = 0x0138
-0x2948 = 0x0142
-0x2949 = 0x0140
-0x294A = 0x0149
-0x294B = 0x014B
-0x294C = 0x00F8
-0x294D = 0x0153
-0x294E = 0x00DF
-0x294F = 0x0167
-0x2950 = 0x00FE
-0x2A21 = 0x00C1
-0x2A22 = 0x00C0
-0x2A23 = 0x00C4
-0x2A24 = 0x00C2
-0x2A25 = 0x0102
-0x2A26 = 0x01CD
-0x2A27 = 0x0100
-0x2A28 = 0x0104
-0x2A29 = 0x00C5
-0x2A2A = 0x00C3
-0x2A2B = 0x0106
-0x2A2C = 0x0108
-0x2A2D = 0x010C
-0x2A2E = 0x00C7
-0x2A2F = 0x010A
-0x2A30 = 0x010E
-0x2A31 = 0x00C9
-0x2A32 = 0x00C8
-0x2A33 = 0x00CB
-0x2A34 = 0x00CA
-0x2A35 = 0x011A
-0x2A36 = 0x0116
-0x2A37 = 0x0112
-0x2A38 = 0x0118
-0x2A3A = 0x011C
-0x2A3B = 0x011E
-0x2A3C = 0x0122
-0x2A3D = 0x0120
-0x2A3E = 0x0124
-0x2A3F = 0x00CD
-0x2A40 = 0x00CC
-0x2A41 = 0x00CF
-0x2A42 = 0x00CE
-0x2A43 = 0x01CF
-0x2A44 = 0x0130
-0x2A45 = 0x012A
-0x2A46 = 0x012E
-0x2A47 = 0x0128
-0x2A48 = 0x0134
-0x2A49 = 0x0136
-0x2A4A = 0x0139
-0x2A4B = 0x013D
-0x2A4C = 0x013B
-0x2A4D = 0x0143
-0x2A4E = 0x0147
-0x2A4F = 0x0145
-0x2A50 = 0x00D1
-0x2A51 = 0x00D3
-0x2A52 = 0x00D2
-0x2A53 = 0x00D6
-0x2A54 = 0x00D4
-0x2A55 = 0x01D1
-0x2A56 = 0x0150
-0x2A57 = 0x014C
-0x2A58 = 0x00D5
-0x2A59 = 0x0154
-0x2A5A = 0x0158
-0x2A5B = 0x0156
-0x2A5C = 0x015A
-0x2A5D = 0x015C
-0x2A5E = 0x0160
-0x2A5F = 0x015E
-0x2A60 = 0x0164
-0x2A61 = 0x0162
-0x2A62 = 0x00DA
-0x2A63 = 0x00D9
-0x2A64 = 0x00DC
-0x2A65 = 0x00DB
-0x2A66 = 0x016C
-0x2A67 = 0x01D3
-0x2A68 = 0x0170
-0x2A69 = 0x016A
-0x2A6A = 0x0172
-0x2A6B = 0x016E
-0x2A6C = 0x0168
-0x2A6D = 0x01D7
-0x2A6E = 0x01DB
-0x2A6F = 0x01D9
-0x2A70 = 0x01D5
-0x2A71 = 0x0174
-0x2A72 = 0x00DD
-0x2A73 = 0x0178
-0x2A74 = 0x0176
-0x2A75 = 0x0179
-0x2A76 = 0x017D
-0x2A77 = 0x017B
-0x2B21 = 0x00E1
-0x2B22 = 0x00E0
-0x2B23 = 0x00E4
-0x2B24 = 0x00E2
-0x2B25 = 0x0103
-0x2B26 = 0x01CE
-0x2B27 = 0x0101
-0x2B28 = 0x0105
-0x2B29 = 0x00E5
-0x2B2A = 0x00E3
-0x2B2B = 0x0107
-0x2B2C = 0x0109
-0x2B2D = 0x010D
-0x2B2E = 0x00E7
-0x2B2F = 0x010B
-0x2B30 = 0x010F
-0x2B31 = 0x00E9
-0x2B32 = 0x00E8
-0x2B33 = 0x00EB
-0x2B34 = 0x00EA
-0x2B35 = 0x011B
-0x2B36 = 0x0117
-0x2B37 = 0x0113
-0x2B38 = 0x0119
-0x2B39 = 0x01F5
-0x2B3A = 0x011D
-0x2B3B = 0x011F
-0x2B3D = 0x0121
-0x2B3E = 0x0125
-0x2B3F = 0x00ED
-0x2B40 = 0x00EC
-0x2B41 = 0x00EF
-0x2B42 = 0x00EE
-0x2B43 = 0x01D0
-0x2B45 = 0x012B
-0x2B46 = 0x012F
-0x2B47 = 0x0129
-0x2B48 = 0x0135
-0x2B49 = 0x0137
-0x2B4A = 0x013A
-0x2B4B = 0x013E
-0x2B4C = 0x013C
-0x2B4D = 0x0144
-0x2B4E = 0x0148
-0x2B4F = 0x0146
-0x2B50 = 0x00F1
-0x2B51 = 0x00F3
-0x2B52 = 0x00F2
-0x2B53 = 0x00F6
-0x2B54 = 0x00F4
-0x2B55 = 0x01D2
-0x2B56 = 0x0151
-0x2B57 = 0x014D
-0x2B58 = 0x00F5
-0x2B59 = 0x0155
-0x2B5A = 0x0159
-0x2B5B = 0x0157
-0x2B5C = 0x015B
-0x2B5D = 0x015D
-0x2B5E = 0x0161
-0x2B5F = 0x015F
-0x2B60 = 0x0165
-0x2B61 = 0x0163
-0x2B62 = 0x00FA
-0x2B63 = 0x00F9
-0x2B64 = 0x00FC
-0x2B65 = 0x00FB
-0x2B66 = 0x016D
-0x2B67 = 0x01D4
-0x2B68 = 0x0171
-0x2B69 = 0x016B
-0x2B6A = 0x0173
-0x2B6B = 0x016F
-0x2B6C = 0x0169
-0x2B6D = 0x01D8
-0x2B6E = 0x01DC
-0x2B6F = 0x01DA
-0x2B70 = 0x01D6
-0x2B71 = 0x0175
-0x2B72 = 0x00FD
-0x2B73 = 0x00FF
-0x2B74 = 0x0177
-0x2B75 = 0x017A
-0x2B76 = 0x017E
-0x2B77 = 0x017C
-0x3021 = 0x4E02
-0x3022 = 0x4E04
-0x3023 = 0x4E05
-0x3024 = 0x4E0C
-0x3025 = 0x4E12
-0x3026 = 0x4E1F
-0x3027 = 0x4E23
-0x3028 = 0x4E24
-0x3029 = 0x4E28
-0x302A = 0x4E2B
-0x302B = 0x4E2E
-0x302C = 0x4E2F
-0x302D = 0x4E30
-0x302E = 0x4E35
-0x302F = 0x4E40
-0x3030 = 0x4E41
-0x3031 = 0x4E44
-0x3032 = 0x4E47
-0x3033 = 0x4E51
-0x3034 = 0x4E5A
-0x3035 = 0x4E5C
-0x3036 = 0x4E63
-0x3037 = 0x4E68
-0x3038 = 0x4E69
-0x3039 = 0x4E74
-0x303A = 0x4E75
-0x303B = 0x4E79
-0x303C = 0x4E7F
-0x303D = 0x4E8D
-0x303E = 0x4E96
-0x303F = 0x4E97
-0x3040 = 0x4E9D
-0x3041 = 0x4EAF
-0x3042 = 0x4EB9
-0x3043 = 0x4EC3
-0x3044 = 0x4ED0
-0x3045 = 0x4EDA
-0x3046 = 0x4EDB
-0x3047 = 0x4EE0
-0x3048 = 0x4EE1
-0x3049 = 0x4EE2
-0x304A = 0x4EE8
-0x304B = 0x4EEF
-0x304C = 0x4EF1
-0x304D = 0x4EF3
-0x304E = 0x4EF5
-0x304F = 0x4EFD
-0x3050 = 0x4EFE
-0x3051 = 0x4EFF
-0x3052 = 0x4F00
-0x3053 = 0x4F02
-0x3054 = 0x4F03
-0x3055 = 0x4F08
-0x3056 = 0x4F0B
-0x3057 = 0x4F0C
-0x3058 = 0x4F12
-0x3059 = 0x4F15
-0x305A = 0x4F16
-0x305B = 0x4F17
-0x305C = 0x4F19
-0x305D = 0x4F2E
-0x305E = 0x4F31
-0x305F = 0x4F60
-0x3060 = 0x4F33
-0x3061 = 0x4F35
-0x3062 = 0x4F37
-0x3063 = 0x4F39
-0x3064 = 0x4F3B
-0x3065 = 0x4F3E
-0x3066 = 0x4F40
-0x3067 = 0x4F42
-0x3068 = 0x4F48
-0x3069 = 0x4F49
-0x306A = 0x4F4B
-0x306B = 0x4F4C
-0x306C = 0x4F52
-0x306D = 0x4F54
-0x306E = 0x4F56
-0x306F = 0x4F58
-0x3070 = 0x4F5F
-0x3071 = 0x4F63
-0x3072 = 0x4F6A
-0x3073 = 0x4F6C
-0x3074 = 0x4F6E
-0x3075 = 0x4F71
-0x3076 = 0x4F77
-0x3077 = 0x4F78
-0x3078 = 0x4F79
-0x3079 = 0x4F7A
-0x307A = 0x4F7D
-0x307B = 0x4F7E
-0x307C = 0x4F81
-0x307D = 0x4F82
-0x307E = 0x4F84
-0x3121 = 0x4F85
-0x3122 = 0x4F89
-0x3123 = 0x4F8A
-0x3124 = 0x4F8C
-0x3125 = 0x4F8E
-0x3126 = 0x4F90
-0x3127 = 0x4F92
-0x3128 = 0x4F93
-0x3129 = 0x4F94
-0x312A = 0x4F97
-0x312B = 0x4F99
-0x312C = 0x4F9A
-0x312D = 0x4F9E
-0x312E = 0x4F9F
-0x312F = 0x4FB2
-0x3130 = 0x4FB7
-0x3131 = 0x4FB9
-0x3132 = 0x4FBB
-0x3133 = 0x4FBC
-0x3134 = 0x4FBD
-0x3135 = 0x4FBE
-0x3136 = 0x4FC0
-0x3137 = 0x4FC1
-0x3138 = 0x4FC5
-0x3139 = 0x4FC6
-0x313A = 0x4FC8
-0x313B = 0x4FC9
-0x313C = 0x4FCB
-0x313D = 0x4FCC
-0x313E = 0x4FCD
-0x313F = 0x4FCF
-0x3140 = 0x4FD2
-0x3141 = 0x4FDC
-0x3142 = 0x4FE0
-0x3143 = 0x4FE2
-0x3144 = 0x4FF0
-0x3145 = 0x4FF2
-0x3146 = 0x4FFC
-0x3147 = 0x4FFD
-0x3148 = 0x4FFF
-0x3149 = 0x5000
-0x314A = 0x5001
-0x314B = 0x5004
-0x314C = 0x5007
-0x314D = 0x500A
-0x314E = 0x500C
-0x314F = 0x500E
-0x3150 = 0x5010
-0x3151 = 0x5013
-0x3152 = 0x5017
-0x3153 = 0x5018
-0x3154 = 0x501B
-0x3155 = 0x501C
-0x3156 = 0x501D
-0x3157 = 0x501E
-0x3158 = 0x5022
-0x3159 = 0x5027
-0x315A = 0x502E
-0x315B = 0x5030
-0x315C = 0x5032
-0x315D = 0x5033
-0x315E = 0x5035
-0x315F = 0x5040
-0x3160 = 0x5041
-0x3161 = 0x5042
-0x3162 = 0x5045
-0x3163 = 0x5046
-0x3164 = 0x504A
-0x3165 = 0x504C
-0x3166 = 0x504E
-0x3167 = 0x5051
-0x3168 = 0x5052
-0x3169 = 0x5053
-0x316A = 0x5057
-0x316B = 0x5059
-0x316C = 0x505F
-0x316D = 0x5060
-0x316E = 0x5062
-0x316F = 0x5063
-0x3170 = 0x5066
-0x3171 = 0x5067
-0x3172 = 0x506A
-0x3173 = 0x506D
-0x3174 = 0x5070
-0x3175 = 0x5071
-0x3176 = 0x503B
-0x3177 = 0x5081
-0x3178 = 0x5083
-0x3179 = 0x5084
-0x317A = 0x5086
-0x317B = 0x508A
-0x317C = 0x508E
-0x317D = 0x508F
-0x317E = 0x5090
-0x3221 = 0x5092
-0x3222 = 0x5093
-0x3223 = 0x5094
-0x3224 = 0x5096
-0x3225 = 0x509B
-0x3226 = 0x509C
-0x3227 = 0x509E
-0x3228 = 0x509F
-0x3229 = 0x50A0
-0x322A = 0x50A1
-0x322B = 0x50A2
-0x322C = 0x50AA
-0x322D = 0x50AF
-0x322E = 0x50B0
-0x322F = 0x50B9
-0x3230 = 0x50BA
-0x3231 = 0x50BD
-0x3232 = 0x50C0
-0x3233 = 0x50C3
-0x3234 = 0x50C4
-0x3235 = 0x50C7
-0x3236 = 0x50CC
-0x3237 = 0x50CE
-0x3238 = 0x50D0
-0x3239 = 0x50D3
-0x323A = 0x50D4
-0x323B = 0x50D8
-0x323C = 0x50DC
-0x323D = 0x50DD
-0x323E = 0x50DF
-0x323F = 0x50E2
-0x3240 = 0x50E4
-0x3241 = 0x50E6
-0x3242 = 0x50E8
-0x3243 = 0x50E9
-0x3244 = 0x50EF
-0x3245 = 0x50F1
-0x3246 = 0x50F6
-0x3247 = 0x50FA
-0x3248 = 0x50FE
-0x3249 = 0x5103
-0x324A = 0x5106
-0x324B = 0x5107
-0x324C = 0x5108
-0x324D = 0x510B
-0x324E = 0x510C
-0x324F = 0x510D
-0x3250 = 0x510E
-0x3251 = 0x50F2
-0x3252 = 0x5110
-0x3253 = 0x5117
-0x3254 = 0x5119
-0x3255 = 0x511B
-0x3256 = 0x511C
-0x3257 = 0x511D
-0x3258 = 0x511E
-0x3259 = 0x5123
-0x325A = 0x5127
-0x325B = 0x5128
-0x325C = 0x512C
-0x325D = 0x512D
-0x325E = 0x512F
-0x325F = 0x5131
-0x3260 = 0x5133
-0x3261 = 0x5134
-0x3262 = 0x5135
-0x3263 = 0x5138
-0x3264 = 0x5139
-0x3265 = 0x5142
-0x3266 = 0x514A
-0x3267 = 0x514F
-0x3268 = 0x5153
-0x3269 = 0x5155
-0x326A = 0x5157
-0x326B = 0x5158
-0x326C = 0x515F
-0x326D = 0x5164
-0x326E = 0x5166
-0x326F = 0x517E
-0x3270 = 0x5183
-0x3271 = 0x5184
-0x3272 = 0x518B
-0x3273 = 0x518E
-0x3274 = 0x5198
-0x3275 = 0x519D
-0x3276 = 0x51A1
-0x3277 = 0x51A3
-0x3278 = 0x51AD
-0x3279 = 0x51B8
-0x327A = 0x51BA
-0x327B = 0x51BC
-0x327C = 0x51BE
-0x327D = 0x51BF
-0x327E = 0x51C2
-0x3321 = 0x51C8
-0x3322 = 0x51CF
-0x3323 = 0x51D1
-0x3324 = 0x51D2
-0x3325 = 0x51D3
-0x3326 = 0x51D5
-0x3327 = 0x51D8
-0x3328 = 0x51DE
-0x3329 = 0x51E2
-0x332A = 0x51E5
-0x332B = 0x51EE
-0x332C = 0x51F2
-0x332D = 0x51F3
-0x332E = 0x51F4
-0x332F = 0x51F7
-0x3330 = 0x5201
-0x3331 = 0x5202
-0x3332 = 0x5205
-0x3333 = 0x5212
-0x3334 = 0x5213
-0x3335 = 0x5215
-0x3336 = 0x5216
-0x3337 = 0x5218
-0x3338 = 0x5222
-0x3339 = 0x5228
-0x333A = 0x5231
-0x333B = 0x5232
-0x333C = 0x5235
-0x333D = 0x523C
-0x333E = 0x5245
-0x333F = 0x5249
-0x3340 = 0x5255
-0x3341 = 0x5257
-0x3342 = 0x5258
-0x3343 = 0x525A
-0x3344 = 0x525C
-0x3345 = 0x525F
-0x3346 = 0x5260
-0x3347 = 0x5261
-0x3348 = 0x5266
-0x3349 = 0x526E
-0x334A = 0x5277
-0x334B = 0x5278
-0x334C = 0x5279
-0x334D = 0x5280
-0x334E = 0x5282
-0x334F = 0x5285
-0x3350 = 0x528A
-0x3351 = 0x528C
-0x3352 = 0x5293
-0x3353 = 0x5295
-0x3354 = 0x5296
-0x3355 = 0x5297
-0x3356 = 0x5298
-0x3357 = 0x529A
-0x3358 = 0x529C
-0x3359 = 0x52A4
-0x335A = 0x52A5
-0x335B = 0x52A6
-0x335C = 0x52A7
-0x335D = 0x52AF
-0x335E = 0x52B0
-0x335F = 0x52B6
-0x3360 = 0x52B7
-0x3361 = 0x52B8
-0x3362 = 0x52BA
-0x3363 = 0x52BB
-0x3364 = 0x52BD
-0x3365 = 0x52C0
-0x3366 = 0x52C4
-0x3367 = 0x52C6
-0x3368 = 0x52C8
-0x3369 = 0x52CC
-0x336A = 0x52CF
-0x336B = 0x52D1
-0x336C = 0x52D4
-0x336D = 0x52D6
-0x336E = 0x52DB
-0x336F = 0x52DC
-0x3370 = 0x52E1
-0x3371 = 0x52E5
-0x3372 = 0x52E8
-0x3373 = 0x52E9
-0x3374 = 0x52EA
-0x3375 = 0x52EC
-0x3376 = 0x52F0
-0x3377 = 0x52F1
-0x3378 = 0x52F4
-0x3379 = 0x52F6
-0x337A = 0x52F7
-0x337B = 0x5300
-0x337C = 0x5303
-0x337D = 0x530A
-0x337E = 0x530B
-0x3421 = 0x530C
-0x3422 = 0x5311
-0x3423 = 0x5313
-0x3424 = 0x5318
-0x3425 = 0x531B
-0x3426 = 0x531C
-0x3427 = 0x531E
-0x3428 = 0x531F
-0x3429 = 0x5325
-0x342A = 0x5327
-0x342B = 0x5328
-0x342C = 0x5329
-0x342D = 0x532B
-0x342E = 0x532C
-0x342F = 0x532D
-0x3430 = 0x5330
-0x3431 = 0x5332
-0x3432 = 0x5335
-0x3433 = 0x533C
-0x3434 = 0x533D
-0x3435 = 0x533E
-0x3436 = 0x5342
-0x3437 = 0x534C
-0x3438 = 0x534B
-0x3439 = 0x5359
-0x343A = 0x535B
-0x343B = 0x5361
-0x343C = 0x5363
-0x343D = 0x5365
-0x343E = 0x536C
-0x343F = 0x536D
-0x3440 = 0x5372
-0x3441 = 0x5379
-0x3442 = 0x537E
-0x3443 = 0x5383
-0x3444 = 0x5387
-0x3445 = 0x5388
-0x3446 = 0x538E
-0x3447 = 0x5393
-0x3448 = 0x5394
-0x3449 = 0x5399
-0x344A = 0x539D
-0x344B = 0x53A1
-0x344C = 0x53A4
-0x344D = 0x53AA
-0x344E = 0x53AB
-0x344F = 0x53AF
-0x3450 = 0x53B2
-0x3451 = 0x53B4
-0x3452 = 0x53B5
-0x3453 = 0x53B7
-0x3454 = 0x53B8
-0x3455 = 0x53BA
-0x3456 = 0x53BD
-0x3457 = 0x53C0
-0x3458 = 0x53C5
-0x3459 = 0x53CF
-0x345A = 0x53D2
-0x345B = 0x53D3
-0x345C = 0x53D5
-0x345D = 0x53DA
-0x345E = 0x53DD
-0x345F = 0x53DE
-0x3460 = 0x53E0
-0x3461 = 0x53E6
-0x3462 = 0x53E7
-0x3463 = 0x53F5
-0x3464 = 0x5402
-0x3465 = 0x5413
-0x3466 = 0x541A
-0x3467 = 0x5421
-0x3468 = 0x5427
-0x3469 = 0x5428
-0x346A = 0x542A
-0x346B = 0x542F
-0x346C = 0x5431
-0x346D = 0x5434
-0x346E = 0x5435
-0x346F = 0x5443
-0x3470 = 0x5444
-0x3471 = 0x5447
-0x3472 = 0x544D
-0x3473 = 0x544F
-0x3474 = 0x545E
-0x3475 = 0x5462
-0x3476 = 0x5464
-0x3477 = 0x5466
-0x3478 = 0x5467
-0x3479 = 0x5469
-0x347A = 0x546B
-0x347B = 0x546D
-0x347C = 0x546E
-0x347D = 0x5474
-0x347E = 0x547F
-0x3521 = 0x5481
-0x3522 = 0x5483
-0x3523 = 0x5485
-0x3524 = 0x5488
-0x3525 = 0x5489
-0x3526 = 0x548D
-0x3527 = 0x5491
-0x3528 = 0x5495
-0x3529 = 0x5496
-0x352A = 0x549C
-0x352B = 0x549F
-0x352C = 0x54A1
-0x352D = 0x54A6
-0x352E = 0x54A7
-0x352F = 0x54A9
-0x3530 = 0x54AA
-0x3531 = 0x54AD
-0x3532 = 0x54AE
-0x3533 = 0x54B1
-0x3534 = 0x54B7
-0x3535 = 0x54B9
-0x3536 = 0x54BA
-0x3537 = 0x54BB
-0x3538 = 0x54BF
-0x3539 = 0x54C6
-0x353A = 0x54CA
-0x353B = 0x54CD
-0x353C = 0x54CE
-0x353D = 0x54E0
-0x353E = 0x54EA
-0x353F = 0x54EC
-0x3540 = 0x54EF
-0x3541 = 0x54F6
-0x3542 = 0x54FC
-0x3543 = 0x54FE
-0x3544 = 0x54FF
-0x3545 = 0x5500
-0x3546 = 0x5501
-0x3547 = 0x5505
-0x3548 = 0x5508
-0x3549 = 0x5509
-0x354A = 0x550C
-0x354B = 0x550D
-0x354C = 0x550E
-0x354D = 0x5515
-0x354E = 0x552A
-0x354F = 0x552B
-0x3550 = 0x5532
-0x3551 = 0x5535
-0x3552 = 0x5536
-0x3553 = 0x553B
-0x3554 = 0x553C
-0x3555 = 0x553D
-0x3556 = 0x5541
-0x3557 = 0x5547
-0x3558 = 0x5549
-0x3559 = 0x554A
-0x355A = 0x554D
-0x355B = 0x5550
-0x355C = 0x5551
-0x355D = 0x5558
-0x355E = 0x555A
-0x355F = 0x555B
-0x3560 = 0x555E
-0x3561 = 0x5560
-0x3562 = 0x5561
-0x3563 = 0x5564
-0x3564 = 0x5566
-0x3565 = 0x557F
-0x3566 = 0x5581
-0x3567 = 0x5582
-0x3568 = 0x5586
-0x3569 = 0x5588
-0x356A = 0x558E
-0x356B = 0x558F
-0x356C = 0x5591
-0x356D = 0x5592
-0x356E = 0x5593
-0x356F = 0x5594
-0x3570 = 0x5597
-0x3571 = 0x55A3
-0x3572 = 0x55A4
-0x3573 = 0x55AD
-0x3574 = 0x55B2
-0x3575 = 0x55BF
-0x3576 = 0x55C1
-0x3577 = 0x55C3
-0x3578 = 0x55C6
-0x3579 = 0x55C9
-0x357A = 0x55CB
-0x357B = 0x55CC
-0x357C = 0x55CE
-0x357D = 0x55D1
-0x357E = 0x55D2
-0x3621 = 0x55D3
-0x3622 = 0x55D7
-0x3623 = 0x55D8
-0x3624 = 0x55DB
-0x3625 = 0x55DE
-0x3626 = 0x55E2
-0x3627 = 0x55E9
-0x3628 = 0x55F6
-0x3629 = 0x55FF
-0x362A = 0x5605
-0x362B = 0x5608
-0x362C = 0x560A
-0x362D = 0x560D
-0x362E = 0x560E
-0x362F = 0x560F
-0x3630 = 0x5610
-0x3631 = 0x5611
-0x3632 = 0x5612
-0x3633 = 0x5619
-0x3634 = 0x562C
-0x3635 = 0x5630
-0x3636 = 0x5633
-0x3637 = 0x5635
-0x3638 = 0x5637
-0x3639 = 0x5639
-0x363A = 0x563B
-0x363B = 0x563C
-0x363C = 0x563D
-0x363D = 0x563F
-0x363E = 0x5640
-0x363F = 0x5641
-0x3640 = 0x5643
-0x3641 = 0x5644
-0x3642 = 0x5646
-0x3643 = 0x5649
-0x3644 = 0x564B
-0x3645 = 0x564D
-0x3646 = 0x564F
-0x3647 = 0x5654
-0x3648 = 0x565E
-0x3649 = 0x5660
-0x364A = 0x5661
-0x364B = 0x5662
-0x364C = 0x5663
-0x364D = 0x5666
-0x364E = 0x5669
-0x364F = 0x566D
-0x3650 = 0x566F
-0x3651 = 0x5671
-0x3652 = 0x5672
-0x3653 = 0x5675
-0x3654 = 0x5684
-0x3655 = 0x5685
-0x3656 = 0x5688
-0x3657 = 0x568B
-0x3658 = 0x568C
-0x3659 = 0x5695
-0x365A = 0x5699
-0x365B = 0x569A
-0x365C = 0x569D
-0x365D = 0x569E
-0x365E = 0x569F
-0x365F = 0x56A6
-0x3660 = 0x56A7
-0x3661 = 0x56A8
-0x3662 = 0x56A9
-0x3663 = 0x56AB
-0x3664 = 0x56AC
-0x3665 = 0x56AD
-0x3666 = 0x56B1
-0x3667 = 0x56B3
-0x3668 = 0x56B7
-0x3669 = 0x56BE
-0x366A = 0x56C5
-0x366B = 0x56C9
-0x366C = 0x56CA
-0x366D = 0x56CB
-0x366E = 0x56CF
-0x366F = 0x56D0
-0x3670 = 0x56CC
-0x3671 = 0x56CD
-0x3672 = 0x56D9
-0x3673 = 0x56DC
-0x3674 = 0x56DD
-0x3675 = 0x56DF
-0x3676 = 0x56E1
-0x3677 = 0x56E4
-0x3678 = 0x56E5
-0x3679 = 0x56E6
-0x367A = 0x56E7
-0x367B = 0x56E8
-0x367C = 0x56F1
-0x367D = 0x56EB
-0x367E = 0x56ED
-0x3721 = 0x56F6
-0x3722 = 0x56F7
-0x3723 = 0x5701
-0x3724 = 0x5702
-0x3725 = 0x5707
-0x3726 = 0x570A
-0x3727 = 0x570C
-0x3728 = 0x5711
-0x3729 = 0x5715
-0x372A = 0x571A
-0x372B = 0x571B
-0x372C = 0x571D
-0x372D = 0x5720
-0x372E = 0x5722
-0x372F = 0x5723
-0x3730 = 0x5724
-0x3731 = 0x5725
-0x3732 = 0x5729
-0x3733 = 0x572A
-0x3734 = 0x572C
-0x3735 = 0x572E
-0x3736 = 0x572F
-0x3737 = 0x5733
-0x3738 = 0x5734
-0x3739 = 0x573D
-0x373A = 0x573E
-0x373B = 0x573F
-0x373C = 0x5745
-0x373D = 0x5746
-0x373E = 0x574C
-0x373F = 0x574D
-0x3740 = 0x5752
-0x3741 = 0x5762
-0x3742 = 0x5765
-0x3743 = 0x5767
-0x3744 = 0x5768
-0x3745 = 0x576B
-0x3746 = 0x576D
-0x3747 = 0x576E
-0x3748 = 0x576F
-0x3749 = 0x5770
-0x374A = 0x5771
-0x374B = 0x5773
-0x374C = 0x5774
-0x374D = 0x5775
-0x374E = 0x5777
-0x374F = 0x5779
-0x3750 = 0x577A
-0x3751 = 0x577B
-0x3752 = 0x577C
-0x3753 = 0x577E
-0x3754 = 0x5781
-0x3755 = 0x5783
-0x3756 = 0x578C
-0x3757 = 0x5794
-0x3758 = 0x5797
-0x3759 = 0x5799
-0x375A = 0x579A
-0x375B = 0x579C
-0x375C = 0x579D
-0x375D = 0x579E
-0x375E = 0x579F
-0x375F = 0x57A1
-0x3760 = 0x5795
-0x3761 = 0x57A7
-0x3762 = 0x57A8
-0x3763 = 0x57A9
-0x3764 = 0x57AC
-0x3765 = 0x57B8
-0x3766 = 0x57BD
-0x3767 = 0x57C7
-0x3768 = 0x57C8
-0x3769 = 0x57CC
-0x376A = 0x57CF
-0x376B = 0x57D5
-0x376C = 0x57DD
-0x376D = 0x57DE
-0x376E = 0x57E4
-0x376F = 0x57E6
-0x3770 = 0x57E7
-0x3771 = 0x57E9
-0x3772 = 0x57ED
-0x3773 = 0x57F0
-0x3774 = 0x57F5
-0x3775 = 0x57F6
-0x3776 = 0x57F8
-0x3777 = 0x57FD
-0x3778 = 0x57FE
-0x3779 = 0x57FF
-0x377A = 0x5803
-0x377B = 0x5804
-0x377C = 0x5808
-0x377D = 0x5809
-0x377E = 0x57E1
-0x3821 = 0x580C
-0x3822 = 0x580D
-0x3823 = 0x581B
-0x3824 = 0x581E
-0x3825 = 0x581F
-0x3826 = 0x5820
-0x3827 = 0x5826
-0x3828 = 0x5827
-0x3829 = 0x582D
-0x382A = 0x5832
-0x382B = 0x5839
-0x382C = 0x583F
-0x382D = 0x5849
-0x382E = 0x584C
-0x382F = 0x584D
-0x3830 = 0x584F
-0x3831 = 0x5850
-0x3832 = 0x5855
-0x3833 = 0x585F
-0x3834 = 0x5861
-0x3835 = 0x5864
-0x3836 = 0x5867
-0x3837 = 0x5868
-0x3838 = 0x5878
-0x3839 = 0x587C
-0x383A = 0x587F
-0x383B = 0x5880
-0x383C = 0x5881
-0x383D = 0x5887
-0x383E = 0x5888
-0x383F = 0x5889
-0x3840 = 0x588A
-0x3841 = 0x588C
-0x3842 = 0x588D
-0x3843 = 0x588F
-0x3844 = 0x5890
-0x3845 = 0x5894
-0x3846 = 0x5896
-0x3847 = 0x589D
-0x3848 = 0x58A0
-0x3849 = 0x58A1
-0x384A = 0x58A2
-0x384B = 0x58A6
-0x384C = 0x58A9
-0x384D = 0x58B1
-0x384E = 0x58B2
-0x384F = 0x58C4
-0x3850 = 0x58BC
-0x3851 = 0x58C2
-0x3852 = 0x58C8
-0x3853 = 0x58CD
-0x3854 = 0x58CE
-0x3855 = 0x58D0
-0x3856 = 0x58D2
-0x3857 = 0x58D4
-0x3858 = 0x58D6
-0x3859 = 0x58DA
-0x385A = 0x58DD
-0x385B = 0x58E1
-0x385C = 0x58E2
-0x385D = 0x58E9
-0x385E = 0x58F3
-0x385F = 0x5905
-0x3860 = 0x5906
-0x3861 = 0x590B
-0x3862 = 0x590C
-0x3863 = 0x5912
-0x3864 = 0x5913
-0x3865 = 0x5914
-0x3866 = 0x8641
-0x3867 = 0x591D
-0x3868 = 0x5921
-0x3869 = 0x5923
-0x386A = 0x5924
-0x386B = 0x5928
-0x386C = 0x592F
-0x386D = 0x5930
-0x386E = 0x5933
-0x386F = 0x5935
-0x3870 = 0x5936
-0x3871 = 0x593F
-0x3872 = 0x5943
-0x3873 = 0x5946
-0x3874 = 0x5952
-0x3875 = 0x5953
-0x3876 = 0x5959
-0x3877 = 0x595B
-0x3878 = 0x595D
-0x3879 = 0x595E
-0x387A = 0x595F
-0x387B = 0x5961
-0x387C = 0x5963
-0x387D = 0x596B
-0x387E = 0x596D
-0x3921 = 0x596F
-0x3922 = 0x5972
-0x3923 = 0x5975
-0x3924 = 0x5976
-0x3925 = 0x5979
-0x3926 = 0x597B
-0x3927 = 0x597C
-0x3928 = 0x598B
-0x3929 = 0x598C
-0x392A = 0x598E
-0x392B = 0x5992
-0x392C = 0x5995
-0x392D = 0x5997
-0x392E = 0x599F
-0x392F = 0x59A4
-0x3930 = 0x59A7
-0x3931 = 0x59AD
-0x3932 = 0x59AE
-0x3933 = 0x59AF
-0x3934 = 0x59B0
-0x3935 = 0x59B3
-0x3936 = 0x59B7
-0x3937 = 0x59BA
-0x3938 = 0x59BC
-0x3939 = 0x59C1
-0x393A = 0x59C3
-0x393B = 0x59C4
-0x393C = 0x59C8
-0x393D = 0x59CA
-0x393E = 0x59CD
-0x393F = 0x59D2
-0x3940 = 0x59DD
-0x3941 = 0x59DE
-0x3942 = 0x59DF
-0x3943 = 0x59E3
-0x3944 = 0x59E4
-0x3945 = 0x59E7
-0x3946 = 0x59EE
-0x3947 = 0x59EF
-0x3948 = 0x59F1
-0x3949 = 0x59F2
-0x394A = 0x59F4
-0x394B = 0x59F7
-0x394C = 0x5A00
-0x394D = 0x5A04
-0x394E = 0x5A0C
-0x394F = 0x5A0D
-0x3950 = 0x5A0E
-0x3951 = 0x5A12
-0x3952 = 0x5A13
-0x3953 = 0x5A1E
-0x3954 = 0x5A23
-0x3955 = 0x5A24
-0x3956 = 0x5A27
-0x3957 = 0x5A28
-0x3958 = 0x5A2A
-0x3959 = 0x5A2D
-0x395A = 0x5A30
-0x395B = 0x5A44
-0x395C = 0x5A45
-0x395D = 0x5A47
-0x395E = 0x5A48
-0x395F = 0x5A4C
-0x3960 = 0x5A50
-0x3961 = 0x5A55
-0x3962 = 0x5A5E
-0x3963 = 0x5A63
-0x3964 = 0x5A65
-0x3965 = 0x5A67
-0x3966 = 0x5A6D
-0x3967 = 0x5A77
-0x3968 = 0x5A7A
-0x3969 = 0x5A7B
-0x396A = 0x5A7E
-0x396B = 0x5A8B
-0x396C = 0x5A90
-0x396D = 0x5A93
-0x396E = 0x5A96
-0x396F = 0x5A99
-0x3970 = 0x5A9C
-0x3971 = 0x5A9E
-0x3972 = 0x5A9F
-0x3973 = 0x5AA0
-0x3974 = 0x5AA2
-0x3975 = 0x5AA7
-0x3976 = 0x5AAC
-0x3977 = 0x5AB1
-0x3978 = 0x5AB2
-0x3979 = 0x5AB3
-0x397A = 0x5AB5
-0x397B = 0x5AB8
-0x397C = 0x5ABA
-0x397D = 0x5ABB
-0x397E = 0x5ABF
-0x3A21 = 0x5AC4
-0x3A22 = 0x5AC6
-0x3A23 = 0x5AC8
-0x3A24 = 0x5ACF
-0x3A25 = 0x5ADA
-0x3A26 = 0x5ADC
-0x3A27 = 0x5AE0
-0x3A28 = 0x5AE5
-0x3A29 = 0x5AEA
-0x3A2A = 0x5AEE
-0x3A2B = 0x5AF5
-0x3A2C = 0x5AF6
-0x3A2D = 0x5AFD
-0x3A2E = 0x5B00
-0x3A2F = 0x5B01
-0x3A30 = 0x5B08
-0x3A31 = 0x5B17
-0x3A32 = 0x5B34
-0x3A33 = 0x5B19
-0x3A34 = 0x5B1B
-0x3A35 = 0x5B1D
-0x3A36 = 0x5B21
-0x3A37 = 0x5B25
-0x3A38 = 0x5B2D
-0x3A39 = 0x5B38
-0x3A3A = 0x5B41
-0x3A3B = 0x5B4B
-0x3A3C = 0x5B4C
-0x3A3D = 0x5B52
-0x3A3E = 0x5B56
-0x3A3F = 0x5B5E
-0x3A40 = 0x5B68
-0x3A41 = 0x5B6E
-0x3A42 = 0x5B6F
-0x3A43 = 0x5B7C
-0x3A44 = 0x5B7D
-0x3A45 = 0x5B7E
-0x3A46 = 0x5B7F
-0x3A47 = 0x5B81
-0x3A48 = 0x5B84
-0x3A49 = 0x5B86
-0x3A4A = 0x5B8A
-0x3A4B = 0x5B8E
-0x3A4C = 0x5B90
-0x3A4D = 0x5B91
-0x3A4E = 0x5B93
-0x3A4F = 0x5B94
-0x3A50 = 0x5B96
-0x3A51 = 0x5BA8
-0x3A52 = 0x5BA9
-0x3A53 = 0x5BAC
-0x3A54 = 0x5BAD
-0x3A55 = 0x5BAF
-0x3A56 = 0x5BB1
-0x3A57 = 0x5BB2
-0x3A58 = 0x5BB7
-0x3A59 = 0x5BBA
-0x3A5A = 0x5BBC
-0x3A5B = 0x5BC0
-0x3A5C = 0x5BC1
-0x3A5D = 0x5BCD
-0x3A5E = 0x5BCF
-0x3A5F = 0x5BD6
-0x3A60 = 0x5BD7
-0x3A61 = 0x5BD8
-0x3A62 = 0x5BD9
-0x3A63 = 0x5BDA
-0x3A64 = 0x5BE0
-0x3A65 = 0x5BEF
-0x3A66 = 0x5BF1
-0x3A67 = 0x5BF4
-0x3A68 = 0x5BFD
-0x3A69 = 0x5C0C
-0x3A6A = 0x5C17
-0x3A6B = 0x5C1E
-0x3A6C = 0x5C1F
-0x3A6D = 0x5C23
-0x3A6E = 0x5C26
-0x3A6F = 0x5C29
-0x3A70 = 0x5C2B
-0x3A71 = 0x5C2C
-0x3A72 = 0x5C2E
-0x3A73 = 0x5C30
-0x3A74 = 0x5C32
-0x3A75 = 0x5C35
-0x3A76 = 0x5C36
-0x3A77 = 0x5C59
-0x3A78 = 0x5C5A
-0x3A79 = 0x5C5C
-0x3A7A = 0x5C62
-0x3A7B = 0x5C63
-0x3A7C = 0x5C67
-0x3A7D = 0x5C68
-0x3A7E = 0x5C69
-0x3B21 = 0x5C6D
-0x3B22 = 0x5C70
-0x3B23 = 0x5C74
-0x3B24 = 0x5C75
-0x3B25 = 0x5C7A
-0x3B26 = 0x5C7B
-0x3B27 = 0x5C7C
-0x3B28 = 0x5C7D
-0x3B29 = 0x5C87
-0x3B2A = 0x5C88
-0x3B2B = 0x5C8A
-0x3B2C = 0x5C8F
-0x3B2D = 0x5C92
-0x3B2E = 0x5C9D
-0x3B2F = 0x5C9F
-0x3B30 = 0x5CA0
-0x3B31 = 0x5CA2
-0x3B32 = 0x5CA3
-0x3B33 = 0x5CA6
-0x3B34 = 0x5CAA
-0x3B35 = 0x5CB2
-0x3B36 = 0x5CB4
-0x3B37 = 0x5CB5
-0x3B38 = 0x5CBA
-0x3B39 = 0x5CC9
-0x3B3A = 0x5CCB
-0x3B3B = 0x5CD2
-0x3B3C = 0x5CDD
-0x3B3D = 0x5CD7
-0x3B3E = 0x5CEE
-0x3B3F = 0x5CF1
-0x3B40 = 0x5CF2
-0x3B41 = 0x5CF4
-0x3B42 = 0x5D01
-0x3B43 = 0x5D06
-0x3B44 = 0x5D0D
-0x3B45 = 0x5D12
-0x3B46 = 0x5D2B
-0x3B47 = 0x5D23
-0x3B48 = 0x5D24
-0x3B49 = 0x5D26
-0x3B4A = 0x5D27
-0x3B4B = 0x5D31
-0x3B4C = 0x5D34
-0x3B4D = 0x5D39
-0x3B4E = 0x5D3D
-0x3B4F = 0x5D3F
-0x3B50 = 0x5D42
-0x3B51 = 0x5D43
-0x3B52 = 0x5D46
-0x3B53 = 0x5D48
-0x3B54 = 0x5D55
-0x3B55 = 0x5D51
-0x3B56 = 0x5D59
-0x3B57 = 0x5D4A
-0x3B58 = 0x5D5F
-0x3B59 = 0x5D60
-0x3B5A = 0x5D61
-0x3B5B = 0x5D62
-0x3B5C = 0x5D64
-0x3B5D = 0x5D6A
-0x3B5E = 0x5D6D
-0x3B5F = 0x5D70
-0x3B60 = 0x5D79
-0x3B61 = 0x5D7A
-0x3B62 = 0x5D7E
-0x3B63 = 0x5D7F
-0x3B64 = 0x5D81
-0x3B65 = 0x5D83
-0x3B66 = 0x5D88
-0x3B67 = 0x5D8A
-0x3B68 = 0x5D92
-0x3B69 = 0x5D93
-0x3B6A = 0x5D94
-0x3B6B = 0x5D95
-0x3B6C = 0x5D99
-0x3B6D = 0x5D9B
-0x3B6E = 0x5D9F
-0x3B6F = 0x5DA0
-0x3B70 = 0x5DA7
-0x3B71 = 0x5DAB
-0x3B72 = 0x5DB0
-0x3B73 = 0x5DB4
-0x3B74 = 0x5DB8
-0x3B75 = 0x5DB9
-0x3B76 = 0x5DC3
-0x3B77 = 0x5DC7
-0x3B78 = 0x5DCB
-0x3B79 = 0x5DD0
-0x3B7A = 0x5DCE
-0x3B7B = 0x5DD8
-0x3B7C = 0x5DD9
-0x3B7D = 0x5DE0
-0x3B7E = 0x5DE4
-0x3C21 = 0x5DE9
-0x3C22 = 0x5DF8
-0x3C23 = 0x5DF9
-0x3C24 = 0x5E00
-0x3C25 = 0x5E07
-0x3C26 = 0x5E0D
-0x3C27 = 0x5E12
-0x3C28 = 0x5E14
-0x3C29 = 0x5E15
-0x3C2A = 0x5E18
-0x3C2B = 0x5E1F
-0x3C2C = 0x5E20
-0x3C2D = 0x5E2E
-0x3C2E = 0x5E28
-0x3C2F = 0x5E32
-0x3C30 = 0x5E35
-0x3C31 = 0x5E3E
-0x3C32 = 0x5E4B
-0x3C33 = 0x5E50
-0x3C34 = 0x5E49
-0x3C35 = 0x5E51
-0x3C36 = 0x5E56
-0x3C37 = 0x5E58
-0x3C38 = 0x5E5B
-0x3C39 = 0x5E5C
-0x3C3A = 0x5E5E
-0x3C3B = 0x5E68
-0x3C3C = 0x5E6A
-0x3C3D = 0x5E6B
-0x3C3E = 0x5E6C
-0x3C3F = 0x5E6D
-0x3C40 = 0x5E6E
-0x3C41 = 0x5E70
-0x3C42 = 0x5E80
-0x3C43 = 0x5E8B
-0x3C44 = 0x5E8E
-0x3C45 = 0x5EA2
-0x3C46 = 0x5EA4
-0x3C47 = 0x5EA5
-0x3C48 = 0x5EA8
-0x3C49 = 0x5EAA
-0x3C4A = 0x5EAC
-0x3C4B = 0x5EB1
-0x3C4C = 0x5EB3
-0x3C4D = 0x5EBD
-0x3C4E = 0x5EBE
-0x3C4F = 0x5EBF
-0x3C50 = 0x5EC6
-0x3C51 = 0x5ECC
-0x3C52 = 0x5ECB
-0x3C53 = 0x5ECE
-0x3C54 = 0x5ED1
-0x3C55 = 0x5ED2
-0x3C56 = 0x5ED4
-0x3C57 = 0x5ED5
-0x3C58 = 0x5EDC
-0x3C59 = 0x5EDE
-0x3C5A = 0x5EE5
-0x3C5B = 0x5EEB
-0x3C5C = 0x5F02
-0x3C5D = 0x5F06
-0x3C5E = 0x5F07
-0x3C5F = 0x5F08
-0x3C60 = 0x5F0E
-0x3C61 = 0x5F19
-0x3C62 = 0x5F1C
-0x3C63 = 0x5F1D
-0x3C64 = 0x5F21
-0x3C65 = 0x5F22
-0x3C66 = 0x5F23
-0x3C67 = 0x5F24
-0x3C68 = 0x5F28
-0x3C69 = 0x5F2B
-0x3C6A = 0x5F2C
-0x3C6B = 0x5F2E
-0x3C6C = 0x5F30
-0x3C6D = 0x5F34
-0x3C6E = 0x5F36
-0x3C6F = 0x5F3B
-0x3C70 = 0x5F3D
-0x3C71 = 0x5F3F
-0x3C72 = 0x5F40
-0x3C73 = 0x5F44
-0x3C74 = 0x5F45
-0x3C75 = 0x5F47
-0x3C76 = 0x5F4D
-0x3C77 = 0x5F50
-0x3C78 = 0x5F54
-0x3C79 = 0x5F58
-0x3C7A = 0x5F5B
-0x3C7B = 0x5F60
-0x3C7C = 0x5F63
-0x3C7D = 0x5F64
-0x3C7E = 0x5F67
-0x3D21 = 0x5F6F
-0x3D22 = 0x5F72
-0x3D23 = 0x5F74
-0x3D24 = 0x5F75
-0x3D25 = 0x5F78
-0x3D26 = 0x5F7A
-0x3D27 = 0x5F7D
-0x3D28 = 0x5F7E
-0x3D29 = 0x5F89
-0x3D2A = 0x5F8D
-0x3D2B = 0x5F8F
-0x3D2C = 0x5F96
-0x3D2D = 0x5F9C
-0x3D2E = 0x5F9D
-0x3D2F = 0x5FA2
-0x3D30 = 0x5FA7
-0x3D31 = 0x5FAB
-0x3D32 = 0x5FA4
-0x3D33 = 0x5FAC
-0x3D34 = 0x5FAF
-0x3D35 = 0x5FB0
-0x3D36 = 0x5FB1
-0x3D37 = 0x5FB8
-0x3D38 = 0x5FC4
-0x3D39 = 0x5FC7
-0x3D3A = 0x5FC8
-0x3D3B = 0x5FC9
-0x3D3C = 0x5FCB
-0x3D3D = 0x5FD0
-0x3D3E = 0x5FD1
-0x3D3F = 0x5FD2
-0x3D40 = 0x5FD3
-0x3D41 = 0x5FD4
-0x3D42 = 0x5FDE
-0x3D43 = 0x5FE1
-0x3D44 = 0x5FE2
-0x3D45 = 0x5FE8
-0x3D46 = 0x5FE9
-0x3D47 = 0x5FEA
-0x3D48 = 0x5FEC
-0x3D49 = 0x5FED
-0x3D4A = 0x5FEE
-0x3D4B = 0x5FEF
-0x3D4C = 0x5FF2
-0x3D4D = 0x5FF3
-0x3D4E = 0x5FF6
-0x3D4F = 0x5FFA
-0x3D50 = 0x5FFC
-0x3D51 = 0x6007
-0x3D52 = 0x600A
-0x3D53 = 0x600D
-0x3D54 = 0x6013
-0x3D55 = 0x6014
-0x3D56 = 0x6017
-0x3D57 = 0x6018
-0x3D58 = 0x601A
-0x3D59 = 0x601F
-0x3D5A = 0x6024
-0x3D5B = 0x602D
-0x3D5C = 0x6033
-0x3D5D = 0x6035
-0x3D5E = 0x6040
-0x3D5F = 0x6047
-0x3D60 = 0x6048
-0x3D61 = 0x6049
-0x3D62 = 0x604C
-0x3D63 = 0x6051
-0x3D64 = 0x6054
-0x3D65 = 0x6056
-0x3D66 = 0x6057
-0x3D67 = 0x605D
-0x3D68 = 0x6061
-0x3D69 = 0x6067
-0x3D6A = 0x6071
-0x3D6B = 0x607E
-0x3D6C = 0x607F
-0x3D6D = 0x6082
-0x3D6E = 0x6086
-0x3D6F = 0x6088
-0x3D70 = 0x608A
-0x3D71 = 0x608E
-0x3D72 = 0x6091
-0x3D73 = 0x6093
-0x3D74 = 0x6095
-0x3D75 = 0x6098
-0x3D76 = 0x609D
-0x3D77 = 0x609E
-0x3D78 = 0x60A2
-0x3D79 = 0x60A4
-0x3D7A = 0x60A5
-0x3D7B = 0x60A8
-0x3D7C = 0x60B0
-0x3D7D = 0x60B1
-0x3D7E = 0x60B7
-0x3E21 = 0x60BB
-0x3E22 = 0x60BE
-0x3E23 = 0x60C2
-0x3E24 = 0x60C4
-0x3E25 = 0x60C8
-0x3E26 = 0x60C9
-0x3E27 = 0x60CA
-0x3E28 = 0x60CB
-0x3E29 = 0x60CE
-0x3E2A = 0x60CF
-0x3E2B = 0x60D4
-0x3E2C = 0x60D5
-0x3E2D = 0x60D9
-0x3E2E = 0x60DB
-0x3E2F = 0x60DD
-0x3E30 = 0x60DE
-0x3E31 = 0x60E2
-0x3E32 = 0x60E5
-0x3E33 = 0x60F2
-0x3E34 = 0x60F5
-0x3E35 = 0x60F8
-0x3E36 = 0x60FC
-0x3E37 = 0x60FD
-0x3E38 = 0x6102
-0x3E39 = 0x6107
-0x3E3A = 0x610A
-0x3E3B = 0x610C
-0x3E3C = 0x6110
-0x3E3D = 0x6111
-0x3E3E = 0x6112
-0x3E3F = 0x6113
-0x3E40 = 0x6114
-0x3E41 = 0x6116
-0x3E42 = 0x6117
-0x3E43 = 0x6119
-0x3E44 = 0x611C
-0x3E45 = 0x611E
-0x3E46 = 0x6122
-0x3E47 = 0x612A
-0x3E48 = 0x612B
-0x3E49 = 0x6130
-0x3E4A = 0x6131
-0x3E4B = 0x6135
-0x3E4C = 0x6136
-0x3E4D = 0x6137
-0x3E4E = 0x6139
-0x3E4F = 0x6141
-0x3E50 = 0x6145
-0x3E51 = 0x6146
-0x3E52 = 0x6149
-0x3E53 = 0x615E
-0x3E54 = 0x6160
-0x3E55 = 0x616C
-0x3E56 = 0x6172
-0x3E57 = 0x6178
-0x3E58 = 0x617B
-0x3E59 = 0x617C
-0x3E5A = 0x617F
-0x3E5B = 0x6180
-0x3E5C = 0x6181
-0x3E5D = 0x6183
-0x3E5E = 0x6184
-0x3E5F = 0x618B
-0x3E60 = 0x618D
-0x3E61 = 0x6192
-0x3E62 = 0x6193
-0x3E63 = 0x6197
-0x3E64 = 0x6198
-0x3E65 = 0x619C
-0x3E66 = 0x619D
-0x3E67 = 0x619F
-0x3E68 = 0x61A0
-0x3E69 = 0x61A5
-0x3E6A = 0x61A8
-0x3E6B = 0x61AA
-0x3E6C = 0x61AD
-0x3E6D = 0x61B8
-0x3E6E = 0x61B9
-0x3E6F = 0x61BC
-0x3E70 = 0x61C0
-0x3E71 = 0x61C1
-0x3E72 = 0x61C2
-0x3E73 = 0x61CE
-0x3E74 = 0x61CF
-0x3E75 = 0x61D5
-0x3E76 = 0x61DC
-0x3E77 = 0x61DD
-0x3E78 = 0x61DE
-0x3E79 = 0x61DF
-0x3E7A = 0x61E1
-0x3E7B = 0x61E2
-0x3E7C = 0x61E7
-0x3E7D = 0x61E9
-0x3E7E = 0x61E5
-0x3F21 = 0x61EC
-0x3F22 = 0x61ED
-0x3F23 = 0x61EF
-0x3F24 = 0x6201
-0x3F25 = 0x6203
-0x3F26 = 0x6204
-0x3F27 = 0x6207
-0x3F28 = 0x6213
-0x3F29 = 0x6215
-0x3F2A = 0x621C
-0x3F2B = 0x6220
-0x3F2C = 0x6222
-0x3F2D = 0x6223
-0x3F2E = 0x6227
-0x3F2F = 0x6229
-0x3F30 = 0x622B
-0x3F31 = 0x6239
-0x3F32 = 0x623D
-0x3F33 = 0x6242
-0x3F34 = 0x6243
-0x3F35 = 0x6244
-0x3F36 = 0x6246
-0x3F37 = 0x624C
-0x3F38 = 0x6250
-0x3F39 = 0x6251
-0x3F3A = 0x6252
-0x3F3B = 0x6254
-0x3F3C = 0x6256
-0x3F3D = 0x625A
-0x3F3E = 0x625C
-0x3F3F = 0x6264
-0x3F40 = 0x626D
-0x3F41 = 0x626F
-0x3F42 = 0x6273
-0x3F43 = 0x627A
-0x3F44 = 0x627D
-0x3F45 = 0x628D
-0x3F46 = 0x628E
-0x3F47 = 0x628F
-0x3F48 = 0x6290
-0x3F49 = 0x62A6
-0x3F4A = 0x62A8
-0x3F4B = 0x62B3
-0x3F4C = 0x62B6
-0x3F4D = 0x62B7
-0x3F4E = 0x62BA
-0x3F4F = 0x62BE
-0x3F50 = 0x62BF
-0x3F51 = 0x62C4
-0x3F52 = 0x62CE
-0x3F53 = 0x62D5
-0x3F54 = 0x62D6
-0x3F55 = 0x62DA
-0x3F56 = 0x62EA
-0x3F57 = 0x62F2
-0x3F58 = 0x62F4
-0x3F59 = 0x62FC
-0x3F5A = 0x62FD
-0x3F5B = 0x6303
-0x3F5C = 0x6304
-0x3F5D = 0x630A
-0x3F5E = 0x630B
-0x3F5F = 0x630D
-0x3F60 = 0x6310
-0x3F61 = 0x6313
-0x3F62 = 0x6316
-0x3F63 = 0x6318
-0x3F64 = 0x6329
-0x3F65 = 0x632A
-0x3F66 = 0x632D
-0x3F67 = 0x6335
-0x3F68 = 0x6336
-0x3F69 = 0x6339
-0x3F6A = 0x633C
-0x3F6B = 0x6341
-0x3F6C = 0x6342
-0x3F6D = 0x6343
-0x3F6E = 0x6344
-0x3F6F = 0x6346
-0x3F70 = 0x634A
-0x3F71 = 0x634B
-0x3F72 = 0x634E
-0x3F73 = 0x6352
-0x3F74 = 0x6353
-0x3F75 = 0x6354
-0x3F76 = 0x6358
-0x3F77 = 0x635B
-0x3F78 = 0x6365
-0x3F79 = 0x6366
-0x3F7A = 0x636C
-0x3F7B = 0x636D
-0x3F7C = 0x6371
-0x3F7D = 0x6374
-0x3F7E = 0x6375
-0x4021 = 0x6378
-0x4022 = 0x637C
-0x4023 = 0x637D
-0x4024 = 0x637F
-0x4025 = 0x6382
-0x4026 = 0x6384
-0x4027 = 0x6387
-0x4028 = 0x638A
-0x4029 = 0x6390
-0x402A = 0x6394
-0x402B = 0x6395
-0x402C = 0x6399
-0x402D = 0x639A
-0x402E = 0x639E
-0x402F = 0x63A4
-0x4030 = 0x63A6
-0x4031 = 0x63AD
-0x4032 = 0x63AE
-0x4033 = 0x63AF
-0x4034 = 0x63BD
-0x4035 = 0x63C1
-0x4036 = 0x63C5
-0x4037 = 0x63C8
-0x4038 = 0x63CE
-0x4039 = 0x63D1
-0x403A = 0x63D3
-0x403B = 0x63D4
-0x403C = 0x63D5
-0x403D = 0x63DC
-0x403E = 0x63E0
-0x403F = 0x63E5
-0x4040 = 0x63EA
-0x4041 = 0x63EC
-0x4042 = 0x63F2
-0x4043 = 0x63F3
-0x4044 = 0x63F5
-0x4045 = 0x63F8
-0x4046 = 0x63F9
-0x4047 = 0x6409
-0x4048 = 0x640A
-0x4049 = 0x6410
-0x404A = 0x6412
-0x404B = 0x6414
-0x404C = 0x6418
-0x404D = 0x641E
-0x404E = 0x6420
-0x404F = 0x6422
-0x4050 = 0x6424
-0x4051 = 0x6425
-0x4052 = 0x6429
-0x4053 = 0x642A
-0x4054 = 0x642F
-0x4055 = 0x6430
-0x4056 = 0x6435
-0x4057 = 0x643D
-0x4058 = 0x643F
-0x4059 = 0x644B
-0x405A = 0x644F
-0x405B = 0x6451
-0x405C = 0x6452
-0x405D = 0x6453
-0x405E = 0x6454
-0x405F = 0x645A
-0x4060 = 0x645B
-0x4061 = 0x645C
-0x4062 = 0x645D
-0x4063 = 0x645F
-0x4064 = 0x6460
-0x4065 = 0x6461
-0x4066 = 0x6463
-0x4067 = 0x646D
-0x4068 = 0x6473
-0x4069 = 0x6474
-0x406A = 0x647B
-0x406B = 0x647D
-0x406C = 0x6485
-0x406D = 0x6487
-0x406E = 0x648F
-0x406F = 0x6490
-0x4070 = 0x6491
-0x4071 = 0x6498
-0x4072 = 0x6499
-0x4073 = 0x649B
-0x4074 = 0x649D
-0x4075 = 0x649F
-0x4076 = 0x64A1
-0x4077 = 0x64A3
-0x4078 = 0x64A6
-0x4079 = 0x64A8
-0x407A = 0x64AC
-0x407B = 0x64B3
-0x407C = 0x64BD
-0x407D = 0x64BE
-0x407E = 0x64BF
-0x4121 = 0x64C4
-0x4122 = 0x64C9
-0x4123 = 0x64CA
-0x4124 = 0x64CB
-0x4125 = 0x64CC
-0x4126 = 0x64CE
-0x4127 = 0x64D0
-0x4128 = 0x64D1
-0x4129 = 0x64D5
-0x412A = 0x64D7
-0x412B = 0x64E4
-0x412C = 0x64E5
-0x412D = 0x64E9
-0x412E = 0x64EA
-0x412F = 0x64ED
-0x4130 = 0x64F0
-0x4131 = 0x64F5
-0x4132 = 0x64F7
-0x4133 = 0x64FB
-0x4134 = 0x64FF
-0x4135 = 0x6501
-0x4136 = 0x6504
-0x4137 = 0x6508
-0x4138 = 0x6509
-0x4139 = 0x650A
-0x413A = 0x650F
-0x413B = 0x6513
-0x413C = 0x6514
-0x413D = 0x6516
-0x413E = 0x6519
-0x413F = 0x651B
-0x4140 = 0x651E
-0x4141 = 0x651F
-0x4142 = 0x6522
-0x4143 = 0x6526
-0x4144 = 0x6529
-0x4145 = 0x652E
-0x4146 = 0x6531
-0x4147 = 0x653A
-0x4148 = 0x653C
-0x4149 = 0x653D
-0x414A = 0x6543
-0x414B = 0x6547
-0x414C = 0x6549
-0x414D = 0x6550
-0x414E = 0x6552
-0x414F = 0x6554
-0x4150 = 0x655F
-0x4151 = 0x6560
-0x4152 = 0x6567
-0x4153 = 0x656B
-0x4154 = 0x657A
-0x4155 = 0x657D
-0x4156 = 0x6581
-0x4157 = 0x6585
-0x4158 = 0x658A
-0x4159 = 0x6592
-0x415A = 0x6595
-0x415B = 0x6598
-0x415C = 0x659D
-0x415D = 0x65A0
-0x415E = 0x65A3
-0x415F = 0x65A6
-0x4160 = 0x65AE
-0x4161 = 0x65B2
-0x4162 = 0x65B3
-0x4163 = 0x65B4
-0x4164 = 0x65BF
-0x4165 = 0x65C2
-0x4166 = 0x65C8
-0x4167 = 0x65C9
-0x4168 = 0x65CE
-0x4169 = 0x65D0
-0x416A = 0x65D4
-0x416B = 0x65D6
-0x416C = 0x65D8
-0x416D = 0x65DF
-0x416E = 0x65F0
-0x416F = 0x65F2
-0x4170 = 0x65F4
-0x4171 = 0x65F5
-0x4172 = 0x65F9
-0x4173 = 0x65FE
-0x4174 = 0x65FF
-0x4175 = 0x6600
-0x4176 = 0x6604
-0x4177 = 0x6608
-0x4178 = 0x6609
-0x4179 = 0x660D
-0x417A = 0x6611
-0x417B = 0x6612
-0x417C = 0x6615
-0x417D = 0x6616
-0x417E = 0x661D
-0x4221 = 0x661E
-0x4222 = 0x6621
-0x4223 = 0x6622
-0x4224 = 0x6623
-0x4225 = 0x6624
-0x4226 = 0x6626
-0x4227 = 0x6629
-0x4228 = 0x662A
-0x4229 = 0x662B
-0x422A = 0x662C
-0x422B = 0x662E
-0x422C = 0x6630
-0x422D = 0x6631
-0x422E = 0x6633
-0x422F = 0x6639
-0x4230 = 0x6637
-0x4231 = 0x6640
-0x4232 = 0x6645
-0x4233 = 0x6646
-0x4234 = 0x664A
-0x4235 = 0x664C
-0x4236 = 0x6651
-0x4237 = 0x664E
-0x4238 = 0x6657
-0x4239 = 0x6658
-0x423A = 0x6659
-0x423B = 0x665B
-0x423C = 0x665C
-0x423D = 0x6660
-0x423E = 0x6661
-0x423F = 0x66FB
-0x4240 = 0x666A
-0x4241 = 0x666B
-0x4242 = 0x666C
-0x4243 = 0x667E
-0x4244 = 0x6673
-0x4245 = 0x6675
-0x4246 = 0x667F
-0x4247 = 0x6677
-0x4248 = 0x6678
-0x4249 = 0x6679
-0x424A = 0x667B
-0x424B = 0x6680
-0x424C = 0x667C
-0x424D = 0x668B
-0x424E = 0x668C
-0x424F = 0x668D
-0x4250 = 0x6690
-0x4251 = 0x6692
-0x4252 = 0x6699
-0x4253 = 0x669A
-0x4254 = 0x669B
-0x4255 = 0x669C
-0x4256 = 0x669F
-0x4257 = 0x66A0
-0x4258 = 0x66A4
-0x4259 = 0x66AD
-0x425A = 0x66B1
-0x425B = 0x66B2
-0x425C = 0x66B5
-0x425D = 0x66BB
-0x425E = 0x66BF
-0x425F = 0x66C0
-0x4260 = 0x66C2
-0x4261 = 0x66C3
-0x4262 = 0x66C8
-0x4263 = 0x66CC
-0x4264 = 0x66CE
-0x4265 = 0x66CF
-0x4266 = 0x66D4
-0x4267 = 0x66DB
-0x4268 = 0x66DF
-0x4269 = 0x66E8
-0x426A = 0x66EB
-0x426B = 0x66EC
-0x426C = 0x66EE
-0x426D = 0x66FA
-0x426E = 0x6705
-0x426F = 0x6707
-0x4270 = 0x670E
-0x4271 = 0x6713
-0x4272 = 0x6719
-0x4273 = 0x671C
-0x4274 = 0x6720
-0x4275 = 0x6722
-0x4276 = 0x6733
-0x4277 = 0x673E
-0x4278 = 0x6745
-0x4279 = 0x6747
-0x427A = 0x6748
-0x427B = 0x674C
-0x427C = 0x6754
-0x427D = 0x6755
-0x427E = 0x675D
-0x4321 = 0x6766
-0x4322 = 0x676C
-0x4323 = 0x676E
-0x4324 = 0x6774
-0x4325 = 0x6776
-0x4326 = 0x677B
-0x4327 = 0x6781
-0x4328 = 0x6784
-0x4329 = 0x678E
-0x432A = 0x678F
-0x432B = 0x6791
-0x432C = 0x6793
-0x432D = 0x6796
-0x432E = 0x6798
-0x432F = 0x6799
-0x4330 = 0x679B
-0x4331 = 0x67B0
-0x4332 = 0x67B1
-0x4333 = 0x67B2
-0x4334 = 0x67B5
-0x4335 = 0x67BB
-0x4336 = 0x67BC
-0x4337 = 0x67BD
-0x4338 = 0x67F9
-0x4339 = 0x67C0
-0x433A = 0x67C2
-0x433B = 0x67C3
-0x433C = 0x67C5
-0x433D = 0x67C8
-0x433E = 0x67C9
-0x433F = 0x67D2
-0x4340 = 0x67D7
-0x4341 = 0x67D9
-0x4342 = 0x67DC
-0x4343 = 0x67E1
-0x4344 = 0x67E6
-0x4345 = 0x67F0
-0x4346 = 0x67F2
-0x4347 = 0x67F6
-0x4348 = 0x67F7
-0x4349 = 0x6852
-0x434A = 0x6814
-0x434B = 0x6819
-0x434C = 0x681D
-0x434D = 0x681F
-0x434E = 0x6828
-0x434F = 0x6827
-0x4350 = 0x682C
-0x4351 = 0x682D
-0x4352 = 0x682F
-0x4353 = 0x6830
-0x4354 = 0x6831
-0x4355 = 0x6833
-0x4356 = 0x683B
-0x4357 = 0x683F
-0x4358 = 0x6844
-0x4359 = 0x6845
-0x435A = 0x684A
-0x435B = 0x684C
-0x435C = 0x6855
-0x435D = 0x6857
-0x435E = 0x6858
-0x435F = 0x685B
-0x4360 = 0x686B
-0x4361 = 0x686E
-0x4362 = 0x686F
-0x4363 = 0x6870
-0x4364 = 0x6871
-0x4365 = 0x6872
-0x4366 = 0x6875
-0x4367 = 0x6879
-0x4368 = 0x687A
-0x4369 = 0x687B
-0x436A = 0x687C
-0x436B = 0x6882
-0x436C = 0x6884
-0x436D = 0x6886
-0x436E = 0x6888
-0x436F = 0x6896
-0x4370 = 0x6898
-0x4371 = 0x689A
-0x4372 = 0x689C
-0x4373 = 0x68A1
-0x4374 = 0x68A3
-0x4375 = 0x68A5
-0x4376 = 0x68A9
-0x4377 = 0x68AA
-0x4378 = 0x68AE
-0x4379 = 0x68B2
-0x437A = 0x68BB
-0x437B = 0x68C5
-0x437C = 0x68C8
-0x437D = 0x68CC
-0x437E = 0x68CF
-0x4421 = 0x68D0
-0x4422 = 0x68D1
-0x4423 = 0x68D3
-0x4424 = 0x68D6
-0x4425 = 0x68D9
-0x4426 = 0x68DC
-0x4427 = 0x68DD
-0x4428 = 0x68E5
-0x4429 = 0x68E8
-0x442A = 0x68EA
-0x442B = 0x68EB
-0x442C = 0x68EC
-0x442D = 0x68ED
-0x442E = 0x68F0
-0x442F = 0x68F1
-0x4430 = 0x68F5
-0x4431 = 0x68F6
-0x4432 = 0x68FB
-0x4433 = 0x68FC
-0x4434 = 0x68FD
-0x4435 = 0x6906
-0x4436 = 0x6909
-0x4437 = 0x690A
-0x4438 = 0x6910
-0x4439 = 0x6911
-0x443A = 0x6913
-0x443B = 0x6916
-0x443C = 0x6917
-0x443D = 0x6931
-0x443E = 0x6933
-0x443F = 0x6935
-0x4440 = 0x6938
-0x4441 = 0x693B
-0x4442 = 0x6942
-0x4443 = 0x6945
-0x4444 = 0x6949
-0x4445 = 0x694E
-0x4446 = 0x6957
-0x4447 = 0x695B
-0x4448 = 0x6963
-0x4449 = 0x6964
-0x444A = 0x6965
-0x444B = 0x6966
-0x444C = 0x6968
-0x444D = 0x6969
-0x444E = 0x696C
-0x444F = 0x6970
-0x4450 = 0x6971
-0x4451 = 0x6972
-0x4452 = 0x697A
-0x4453 = 0x697B
-0x4454 = 0x697F
-0x4455 = 0x6980
-0x4456 = 0x698D
-0x4457 = 0x6992
-0x4458 = 0x6996
-0x4459 = 0x6998
-0x445A = 0x69A1
-0x445B = 0x69A5
-0x445C = 0x69A6
-0x445D = 0x69A8
-0x445E = 0x69AB
-0x445F = 0x69AD
-0x4460 = 0x69AF
-0x4461 = 0x69B7
-0x4462 = 0x69B8
-0x4463 = 0x69BA
-0x4464 = 0x69BC
-0x4465 = 0x69C5
-0x4466 = 0x69C8
-0x4467 = 0x69D1
-0x4468 = 0x69D6
-0x4469 = 0x69D7
-0x446A = 0x69E2
-0x446B = 0x69E5
-0x446C = 0x69EE
-0x446D = 0x69EF
-0x446E = 0x69F1
-0x446F = 0x69F3
-0x4470 = 0x69F5
-0x4471 = 0x69FE
-0x4472 = 0x6A00
-0x4473 = 0x6A01
-0x4474 = 0x6A03
-0x4475 = 0x6A0F
-0x4476 = 0x6A11
-0x4477 = 0x6A15
-0x4478 = 0x6A1A
-0x4479 = 0x6A1D
-0x447A = 0x6A20
-0x447B = 0x6A24
-0x447C = 0x6A28
-0x447D = 0x6A30
-0x447E = 0x6A32
-0x4521 = 0x6A34
-0x4522 = 0x6A37
-0x4523 = 0x6A3B
-0x4524 = 0x6A3E
-0x4525 = 0x6A3F
-0x4526 = 0x6A45
-0x4527 = 0x6A46
-0x4528 = 0x6A49
-0x4529 = 0x6A4A
-0x452A = 0x6A4E
-0x452B = 0x6A50
-0x452C = 0x6A51
-0x452D = 0x6A52
-0x452E = 0x6A55
-0x452F = 0x6A56
-0x4530 = 0x6A5B
-0x4531 = 0x6A64
-0x4532 = 0x6A67
-0x4533 = 0x6A6A
-0x4534 = 0x6A71
-0x4535 = 0x6A73
-0x4536 = 0x6A7E
-0x4537 = 0x6A81
-0x4538 = 0x6A83
-0x4539 = 0x6A86
-0x453A = 0x6A87
-0x453B = 0x6A89
-0x453C = 0x6A8B
-0x453D = 0x6A91
-0x453E = 0x6A9B
-0x453F = 0x6A9D
-0x4540 = 0x6A9E
-0x4541 = 0x6A9F
-0x4542 = 0x6AA5
-0x4543 = 0x6AAB
-0x4544 = 0x6AAF
-0x4545 = 0x6AB0
-0x4546 = 0x6AB1
-0x4547 = 0x6AB4
-0x4548 = 0x6ABD
-0x4549 = 0x6ABE
-0x454A = 0x6ABF
-0x454B = 0x6AC6
-0x454C = 0x6AC9
-0x454D = 0x6AC8
-0x454E = 0x6ACC
-0x454F = 0x6AD0
-0x4550 = 0x6AD4
-0x4551 = 0x6AD5
-0x4552 = 0x6AD6
-0x4553 = 0x6ADC
-0x4554 = 0x6ADD
-0x4555 = 0x6AE4
-0x4556 = 0x6AE7
-0x4557 = 0x6AEC
-0x4558 = 0x6AF0
-0x4559 = 0x6AF1
-0x455A = 0x6AF2
-0x455B = 0x6AFC
-0x455C = 0x6AFD
-0x455D = 0x6B02
-0x455E = 0x6B03
-0x455F = 0x6B06
-0x4560 = 0x6B07
-0x4561 = 0x6B09
-0x4562 = 0x6B0F
-0x4563 = 0x6B10
-0x4564 = 0x6B11
-0x4565 = 0x6B17
-0x4566 = 0x6B1B
-0x4567 = 0x6B1E
-0x4568 = 0x6B24
-0x4569 = 0x6B28
-0x456A = 0x6B2B
-0x456B = 0x6B2C
-0x456C = 0x6B2F
-0x456D = 0x6B35
-0x456E = 0x6B36
-0x456F = 0x6B3B
-0x4570 = 0x6B3F
-0x4571 = 0x6B46
-0x4572 = 0x6B4A
-0x4573 = 0x6B4D
-0x4574 = 0x6B52
-0x4575 = 0x6B56
-0x4576 = 0x6B58
-0x4577 = 0x6B5D
-0x4578 = 0x6B60
-0x4579 = 0x6B67
-0x457A = 0x6B6B
-0x457B = 0x6B6E
-0x457C = 0x6B70
-0x457D = 0x6B75
-0x457E = 0x6B7D
-0x4621 = 0x6B7E
-0x4622 = 0x6B82
-0x4623 = 0x6B85
-0x4624 = 0x6B97
-0x4625 = 0x6B9B
-0x4626 = 0x6B9F
-0x4627 = 0x6BA0
-0x4628 = 0x6BA2
-0x4629 = 0x6BA3
-0x462A = 0x6BA8
-0x462B = 0x6BA9
-0x462C = 0x6BAC
-0x462D = 0x6BAD
-0x462E = 0x6BAE
-0x462F = 0x6BB0
-0x4630 = 0x6BB8
-0x4631 = 0x6BB9
-0x4632 = 0x6BBD
-0x4633 = 0x6BBE
-0x4634 = 0x6BC3
-0x4635 = 0x6BC4
-0x4636 = 0x6BC9
-0x4637 = 0x6BCC
-0x4638 = 0x6BD6
-0x4639 = 0x6BDA
-0x463A = 0x6BE1
-0x463B = 0x6BE3
-0x463C = 0x6BE6
-0x463D = 0x6BE7
-0x463E = 0x6BEE
-0x463F = 0x6BF1
-0x4640 = 0x6BF7
-0x4641 = 0x6BF9
-0x4642 = 0x6BFF
-0x4643 = 0x6C02
-0x4644 = 0x6C04
-0x4645 = 0x6C05
-0x4646 = 0x6C09
-0x4647 = 0x6C0D
-0x4648 = 0x6C0E
-0x4649 = 0x6C10
-0x464A = 0x6C12
-0x464B = 0x6C19
-0x464C = 0x6C1F
-0x464D = 0x6C26
-0x464E = 0x6C27
-0x464F = 0x6C28
-0x4650 = 0x6C2C
-0x4651 = 0x6C2E
-0x4652 = 0x6C33
-0x4653 = 0x6C35
-0x4654 = 0x6C36
-0x4655 = 0x6C3A
-0x4656 = 0x6C3B
-0x4657 = 0x6C3F
-0x4658 = 0x6C4A
-0x4659 = 0x6C4B
-0x465A = 0x6C4D
-0x465B = 0x6C4F
-0x465C = 0x6C52
-0x465D = 0x6C54
-0x465E = 0x6C59
-0x465F = 0x6C5B
-0x4660 = 0x6C5C
-0x4661 = 0x6C6B
-0x4662 = 0x6C6D
-0x4663 = 0x6C6F
-0x4664 = 0x6C74
-0x4665 = 0x6C76
-0x4666 = 0x6C78
-0x4667 = 0x6C79
-0x4668 = 0x6C7B
-0x4669 = 0x6C85
-0x466A = 0x6C86
-0x466B = 0x6C87
-0x466C = 0x6C89
-0x466D = 0x6C94
-0x466E = 0x6C95
-0x466F = 0x6C97
-0x4670 = 0x6C98
-0x4671 = 0x6C9C
-0x4672 = 0x6C9F
-0x4673 = 0x6CB0
-0x4674 = 0x6CB2
-0x4675 = 0x6CB4
-0x4676 = 0x6CC2
-0x4677 = 0x6CC6
-0x4678 = 0x6CCD
-0x4679 = 0x6CCF
-0x467A = 0x6CD0
-0x467B = 0x6CD1
-0x467C = 0x6CD2
-0x467D = 0x6CD4
-0x467E = 0x6CD6
-0x4721 = 0x6CDA
-0x4722 = 0x6CDC
-0x4723 = 0x6CE0
-0x4724 = 0x6CE7
-0x4725 = 0x6CE9
-0x4726 = 0x6CEB
-0x4727 = 0x6CEC
-0x4728 = 0x6CEE
-0x4729 = 0x6CF2
-0x472A = 0x6CF4
-0x472B = 0x6D04
-0x472C = 0x6D07
-0x472D = 0x6D0A
-0x472E = 0x6D0E
-0x472F = 0x6D0F
-0x4730 = 0x6D11
-0x4731 = 0x6D13
-0x4732 = 0x6D1A
-0x4733 = 0x6D26
-0x4734 = 0x6D27
-0x4735 = 0x6D28
-0x4736 = 0x6C67
-0x4737 = 0x6D2E
-0x4738 = 0x6D2F
-0x4739 = 0x6D31
-0x473A = 0x6D39
-0x473B = 0x6D3C
-0x473C = 0x6D3F
-0x473D = 0x6D57
-0x473E = 0x6D5E
-0x473F = 0x6D5F
-0x4740 = 0x6D61
-0x4741 = 0x6D65
-0x4742 = 0x6D67
-0x4743 = 0x6D6F
-0x4744 = 0x6D70
-0x4745 = 0x6D7C
-0x4746 = 0x6D82
-0x4747 = 0x6D87
-0x4748 = 0x6D91
-0x4749 = 0x6D92
-0x474A = 0x6D94
-0x474B = 0x6D96
-0x474C = 0x6D97
-0x474D = 0x6D98
-0x474E = 0x6DAA
-0x474F = 0x6DAC
-0x4750 = 0x6DB4
-0x4751 = 0x6DB7
-0x4752 = 0x6DB9
-0x4753 = 0x6DBD
-0x4754 = 0x6DBF
-0x4755 = 0x6DC4
-0x4756 = 0x6DC8
-0x4757 = 0x6DCA
-0x4758 = 0x6DCE
-0x4759 = 0x6DCF
-0x475A = 0x6DD6
-0x475B = 0x6DDB
-0x475C = 0x6DDD
-0x475D = 0x6DDF
-0x475E = 0x6DE0
-0x475F = 0x6DE2
-0x4760 = 0x6DE5
-0x4761 = 0x6DE9
-0x4762 = 0x6DEF
-0x4763 = 0x6DF0
-0x4764 = 0x6DF4
-0x4765 = 0x6DF6
-0x4766 = 0x6DFC
-0x4767 = 0x6E00
-0x4768 = 0x6E04
-0x4769 = 0x6E1E
-0x476A = 0x6E22
-0x476B = 0x6E27
-0x476C = 0x6E32
-0x476D = 0x6E36
-0x476E = 0x6E39
-0x476F = 0x6E3B
-0x4770 = 0x6E3C
-0x4771 = 0x6E44
-0x4772 = 0x6E45
-0x4773 = 0x6E48
-0x4774 = 0x6E49
-0x4775 = 0x6E4B
-0x4776 = 0x6E4F
-0x4777 = 0x6E51
-0x4778 = 0x6E52
-0x4779 = 0x6E53
-0x477A = 0x6E54
-0x477B = 0x6E57
-0x477C = 0x6E5C
-0x477D = 0x6E5D
-0x477E = 0x6E5E
-0x4821 = 0x6E62
-0x4822 = 0x6E63
-0x4823 = 0x6E68
-0x4824 = 0x6E73
-0x4825 = 0x6E7B
-0x4826 = 0x6E7D
-0x4827 = 0x6E8D
-0x4828 = 0x6E93
-0x4829 = 0x6E99
-0x482A = 0x6EA0
-0x482B = 0x6EA7
-0x482C = 0x6EAD
-0x482D = 0x6EAE
-0x482E = 0x6EB1
-0x482F = 0x6EB3
-0x4830 = 0x6EBB
-0x4831 = 0x6EBF
-0x4832 = 0x6EC0
-0x4833 = 0x6EC1
-0x4834 = 0x6EC3
-0x4835 = 0x6EC7
-0x4836 = 0x6EC8
-0x4837 = 0x6ECA
-0x4838 = 0x6ECD
-0x4839 = 0x6ECE
-0x483A = 0x6ECF
-0x483B = 0x6EEB
-0x483C = 0x6EED
-0x483D = 0x6EEE
-0x483E = 0x6EF9
-0x483F = 0x6EFB
-0x4840 = 0x6EFD
-0x4841 = 0x6F04
-0x4842 = 0x6F08
-0x4843 = 0x6F0A
-0x4844 = 0x6F0C
-0x4845 = 0x6F0D
-0x4846 = 0x6F16
-0x4847 = 0x6F18
-0x4848 = 0x6F1A
-0x4849 = 0x6F1B
-0x484A = 0x6F26
-0x484B = 0x6F29
-0x484C = 0x6F2A
-0x484D = 0x6F2F
-0x484E = 0x6F30
-0x484F = 0x6F33
-0x4850 = 0x6F36
-0x4851 = 0x6F3B
-0x4852 = 0x6F3C
-0x4853 = 0x6F2D
-0x4854 = 0x6F4F
-0x4855 = 0x6F51
-0x4856 = 0x6F52
-0x4857 = 0x6F53
-0x4858 = 0x6F57
-0x4859 = 0x6F59
-0x485A = 0x6F5A
-0x485B = 0x6F5D
-0x485C = 0x6F5E
-0x485D = 0x6F61
-0x485E = 0x6F62
-0x485F = 0x6F68
-0x4860 = 0x6F6C
-0x4861 = 0x6F7D
-0x4862 = 0x6F7E
-0x4863 = 0x6F83
-0x4864 = 0x6F87
-0x4865 = 0x6F88
-0x4866 = 0x6F8B
-0x4867 = 0x6F8C
-0x4868 = 0x6F8D
-0x4869 = 0x6F90
-0x486A = 0x6F92
-0x486B = 0x6F93
-0x486C = 0x6F94
-0x486D = 0x6F96
-0x486E = 0x6F9A
-0x486F = 0x6F9F
-0x4870 = 0x6FA0
-0x4871 = 0x6FA5
-0x4872 = 0x6FA6
-0x4873 = 0x6FA7
-0x4874 = 0x6FA8
-0x4875 = 0x6FAE
-0x4876 = 0x6FAF
-0x4877 = 0x6FB0
-0x4878 = 0x6FB5
-0x4879 = 0x6FB6
-0x487A = 0x6FBC
-0x487B = 0x6FC5
-0x487C = 0x6FC7
-0x487D = 0x6FC8
-0x487E = 0x6FCA
-0x4921 = 0x6FDA
-0x4922 = 0x6FDE
-0x4923 = 0x6FE8
-0x4924 = 0x6FE9
-0x4925 = 0x6FF0
-0x4926 = 0x6FF5
-0x4927 = 0x6FF9
-0x4928 = 0x6FFC
-0x4929 = 0x6FFD
-0x492A = 0x7000
-0x492B = 0x7005
-0x492C = 0x7006
-0x492D = 0x7007
-0x492E = 0x700D
-0x492F = 0x7017
-0x4930 = 0x7020
-0x4931 = 0x7023
-0x4932 = 0x702F
-0x4933 = 0x7034
-0x4934 = 0x7037
-0x4935 = 0x7039
-0x4936 = 0x703C
-0x4937 = 0x7043
-0x4938 = 0x7044
-0x4939 = 0x7048
-0x493A = 0x7049
-0x493B = 0x704A
-0x493C = 0x704B
-0x493D = 0x7054
-0x493E = 0x7055
-0x493F = 0x705D
-0x4940 = 0x705E
-0x4941 = 0x704E
-0x4942 = 0x7064
-0x4943 = 0x7065
-0x4944 = 0x706C
-0x4945 = 0x706E
-0x4946 = 0x7075
-0x4947 = 0x7076
-0x4948 = 0x707E
-0x4949 = 0x7081
-0x494A = 0x7085
-0x494B = 0x7086
-0x494C = 0x7094
-0x494D = 0x7095
-0x494E = 0x7096
-0x494F = 0x7097
-0x4950 = 0x7098
-0x4951 = 0x709B
-0x4952 = 0x70A4
-0x4953 = 0x70AB
-0x4954 = 0x70B0
-0x4955 = 0x70B1
-0x4956 = 0x70B4
-0x4957 = 0x70B7
-0x4958 = 0x70CA
-0x4959 = 0x70D1
-0x495A = 0x70D3
-0x495B = 0x70D4
-0x495C = 0x70D5
-0x495D = 0x70D6
-0x495E = 0x70D8
-0x495F = 0x70DC
-0x4960 = 0x70E4
-0x4961 = 0x70FA
-0x4962 = 0x7103
-0x4963 = 0x7104
-0x4964 = 0x7105
-0x4965 = 0x7106
-0x4966 = 0x7107
-0x4967 = 0x710B
-0x4968 = 0x710C
-0x4969 = 0x710F
-0x496A = 0x711E
-0x496B = 0x7120
-0x496C = 0x712B
-0x496D = 0x712D
-0x496E = 0x712F
-0x496F = 0x7130
-0x4970 = 0x7131
-0x4971 = 0x7138
-0x4972 = 0x7141
-0x4973 = 0x7145
-0x4974 = 0x7146
-0x4975 = 0x7147
-0x4976 = 0x714A
-0x4977 = 0x714B
-0x4978 = 0x7150
-0x4979 = 0x7152
-0x497A = 0x7157
-0x497B = 0x715A
-0x497C = 0x715C
-0x497D = 0x715E
-0x497E = 0x7160
-0x4A21 = 0x7168
-0x4A22 = 0x7179
-0x4A23 = 0x7180
-0x4A24 = 0x7185
-0x4A25 = 0x7187
-0x4A26 = 0x718C
-0x4A27 = 0x7192
-0x4A28 = 0x719A
-0x4A29 = 0x719B
-0x4A2A = 0x71A0
-0x4A2B = 0x71A2
-0x4A2C = 0x71AF
-0x4A2D = 0x71B0
-0x4A2E = 0x71B2
-0x4A2F = 0x71B3
-0x4A30 = 0x71BA
-0x4A31 = 0x71BF
-0x4A32 = 0x71C0
-0x4A33 = 0x71C1
-0x4A34 = 0x71C4
-0x4A35 = 0x71CB
-0x4A36 = 0x71CC
-0x4A37 = 0x71D3
-0x4A38 = 0x71D6
-0x4A39 = 0x71D9
-0x4A3A = 0x71DA
-0x4A3B = 0x71DC
-0x4A3C = 0x71F8
-0x4A3D = 0x71FE
-0x4A3E = 0x7200
-0x4A3F = 0x7207
-0x4A40 = 0x7208
-0x4A41 = 0x7209
-0x4A42 = 0x7213
-0x4A43 = 0x7217
-0x4A44 = 0x721A
-0x4A45 = 0x721D
-0x4A46 = 0x721F
-0x4A47 = 0x7224
-0x4A48 = 0x722B
-0x4A49 = 0x722F
-0x4A4A = 0x7234
-0x4A4B = 0x7238
-0x4A4C = 0x7239
-0x4A4D = 0x7241
-0x4A4E = 0x7242
-0x4A4F = 0x7243
-0x4A50 = 0x7245
-0x4A51 = 0x724E
-0x4A52 = 0x724F
-0x4A53 = 0x7250
-0x4A54 = 0x7253
-0x4A55 = 0x7255
-0x4A56 = 0x7256
-0x4A57 = 0x725A
-0x4A58 = 0x725C
-0x4A59 = 0x725E
-0x4A5A = 0x7260
-0x4A5B = 0x7263
-0x4A5C = 0x7268
-0x4A5D = 0x726B
-0x4A5E = 0x726E
-0x4A5F = 0x726F
-0x4A60 = 0x7271
-0x4A61 = 0x7277
-0x4A62 = 0x7278
-0x4A63 = 0x727B
-0x4A64 = 0x727C
-0x4A65 = 0x727F
-0x4A66 = 0x7284
-0x4A67 = 0x7289
-0x4A68 = 0x728D
-0x4A69 = 0x728E
-0x4A6A = 0x7293
-0x4A6B = 0x729B
-0x4A6C = 0x72A8
-0x4A6D = 0x72AD
-0x4A6E = 0x72AE
-0x4A6F = 0x72B1
-0x4A70 = 0x72B4
-0x4A71 = 0x72BE
-0x4A72 = 0x72C1
-0x4A73 = 0x72C7
-0x4A74 = 0x72C9
-0x4A75 = 0x72CC
-0x4A76 = 0x72D5
-0x4A77 = 0x72D6
-0x4A78 = 0x72D8
-0x4A79 = 0x72DF
-0x4A7A = 0x72E5
-0x4A7B = 0x72F3
-0x4A7C = 0x72F4
-0x4A7D = 0x72FA
-0x4A7E = 0x72FB
-0x4B21 = 0x72FE
-0x4B22 = 0x7302
-0x4B23 = 0x7304
-0x4B24 = 0x7305
-0x4B25 = 0x7307
-0x4B26 = 0x730B
-0x4B27 = 0x730D
-0x4B28 = 0x7312
-0x4B29 = 0x7313
-0x4B2A = 0x7318
-0x4B2B = 0x7319
-0x4B2C = 0x731E
-0x4B2D = 0x7322
-0x4B2E = 0x7324
-0x4B2F = 0x7327
-0x4B30 = 0x7328
-0x4B31 = 0x732C
-0x4B32 = 0x7331
-0x4B33 = 0x7332
-0x4B34 = 0x7335
-0x4B35 = 0x733A
-0x4B36 = 0x733B
-0x4B37 = 0x733D
-0x4B38 = 0x7343
-0x4B39 = 0x734D
-0x4B3A = 0x7350
-0x4B3B = 0x7352
-0x4B3C = 0x7356
-0x4B3D = 0x7358
-0x4B3E = 0x735D
-0x4B3F = 0x735E
-0x4B40 = 0x735F
-0x4B41 = 0x7360
-0x4B42 = 0x7366
-0x4B43 = 0x7367
-0x4B44 = 0x7369
-0x4B45 = 0x736B
-0x4B46 = 0x736C
-0x4B47 = 0x736E
-0x4B48 = 0x736F
-0x4B49 = 0x7371
-0x4B4A = 0x7377
-0x4B4B = 0x7379
-0x4B4C = 0x737C
-0x4B4D = 0x7380
-0x4B4E = 0x7381
-0x4B4F = 0x7383
-0x4B50 = 0x7385
-0x4B51 = 0x7386
-0x4B52 = 0x738E
-0x4B53 = 0x7390
-0x4B54 = 0x7393
-0x4B55 = 0x7395
-0x4B56 = 0x7397
-0x4B57 = 0x7398
-0x4B58 = 0x739C
-0x4B59 = 0x739E
-0x4B5A = 0x739F
-0x4B5B = 0x73A0
-0x4B5C = 0x73A2
-0x4B5D = 0x73A5
-0x4B5E = 0x73A6
-0x4B5F = 0x73AA
-0x4B60 = 0x73AB
-0x4B61 = 0x73AD
-0x4B62 = 0x73B5
-0x4B63 = 0x73B7
-0x4B64 = 0x73B9
-0x4B65 = 0x73BC
-0x4B66 = 0x73BD
-0x4B67 = 0x73BF
-0x4B68 = 0x73C5
-0x4B69 = 0x73C6
-0x4B6A = 0x73C9
-0x4B6B = 0x73CB
-0x4B6C = 0x73CC
-0x4B6D = 0x73CF
-0x4B6E = 0x73D2
-0x4B6F = 0x73D3
-0x4B70 = 0x73D6
-0x4B71 = 0x73D9
-0x4B72 = 0x73DD
-0x4B73 = 0x73E1
-0x4B74 = 0x73E3
-0x4B75 = 0x73E6
-0x4B76 = 0x73E7
-0x4B77 = 0x73E9
-0x4B78 = 0x73F4
-0x4B79 = 0x73F5
-0x4B7A = 0x73F7
-0x4B7B = 0x73F9
-0x4B7C = 0x73FA
-0x4B7D = 0x73FB
-0x4B7E = 0x73FD
-0x4C21 = 0x73FF
-0x4C22 = 0x7400
-0x4C23 = 0x7401
-0x4C24 = 0x7404
-0x4C25 = 0x7407
-0x4C26 = 0x740A
-0x4C27 = 0x7411
-0x4C28 = 0x741A
-0x4C29 = 0x741B
-0x4C2A = 0x7424
-0x4C2B = 0x7426
-0x4C2C = 0x7428
-0x4C2D = 0x7429
-0x4C2E = 0x742A
-0x4C2F = 0x742B
-0x4C30 = 0x742C
-0x4C31 = 0x742D
-0x4C32 = 0x742E
-0x4C33 = 0x742F
-0x4C34 = 0x7430
-0x4C35 = 0x7431
-0x4C36 = 0x7439
-0x4C37 = 0x7440
-0x4C38 = 0x7443
-0x4C39 = 0x7444
-0x4C3A = 0x7446
-0x4C3B = 0x7447
-0x4C3C = 0x744B
-0x4C3D = 0x744D
-0x4C3E = 0x7451
-0x4C3F = 0x7452
-0x4C40 = 0x7457
-0x4C41 = 0x745D
-0x4C42 = 0x7462
-0x4C43 = 0x7466
-0x4C44 = 0x7467
-0x4C45 = 0x7468
-0x4C46 = 0x746B
-0x4C47 = 0x746D
-0x4C48 = 0x746E
-0x4C49 = 0x7471
-0x4C4A = 0x7472
-0x4C4B = 0x7480
-0x4C4C = 0x7481
-0x4C4D = 0x7485
-0x4C4E = 0x7486
-0x4C4F = 0x7487
-0x4C50 = 0x7489
-0x4C51 = 0x748F
-0x4C52 = 0x7490
-0x4C53 = 0x7491
-0x4C54 = 0x7492
-0x4C55 = 0x7498
-0x4C56 = 0x7499
-0x4C57 = 0x749A
-0x4C58 = 0x749C
-0x4C59 = 0x749F
-0x4C5A = 0x74A0
-0x4C5B = 0x74A1
-0x4C5C = 0x74A3
-0x4C5D = 0x74A6
-0x4C5E = 0x74A8
-0x4C5F = 0x74A9
-0x4C60 = 0x74AA
-0x4C61 = 0x74AB
-0x4C62 = 0x74AE
-0x4C63 = 0x74AF
-0x4C64 = 0x74B1
-0x4C65 = 0x74B2
-0x4C66 = 0x74B5
-0x4C67 = 0x74B9
-0x4C68 = 0x74BB
-0x4C69 = 0x74BF
-0x4C6A = 0x74C8
-0x4C6B = 0x74C9
-0x4C6C = 0x74CC
-0x4C6D = 0x74D0
-0x4C6E = 0x74D3
-0x4C6F = 0x74D8
-0x4C70 = 0x74DA
-0x4C71 = 0x74DB
-0x4C72 = 0x74DE
-0x4C73 = 0x74DF
-0x4C74 = 0x74E4
-0x4C75 = 0x74E8
-0x4C76 = 0x74EA
-0x4C77 = 0x74EB
-0x4C78 = 0x74EF
-0x4C79 = 0x74F4
-0x4C7A = 0x74FA
-0x4C7B = 0x74FB
-0x4C7C = 0x74FC
-0x4C7D = 0x74FF
-0x4C7E = 0x7506
-0x4D21 = 0x7512
-0x4D22 = 0x7516
-0x4D23 = 0x7517
-0x4D24 = 0x7520
-0x4D25 = 0x7521
-0x4D26 = 0x7524
-0x4D27 = 0x7527
-0x4D28 = 0x7529
-0x4D29 = 0x752A
-0x4D2A = 0x752F
-0x4D2B = 0x7536
-0x4D2C = 0x7539
-0x4D2D = 0x753D
-0x4D2E = 0x753E
-0x4D2F = 0x753F
-0x4D30 = 0x7540
-0x4D31 = 0x7543
-0x4D32 = 0x7547
-0x4D33 = 0x7548
-0x4D34 = 0x754E
-0x4D35 = 0x7550
-0x4D36 = 0x7552
-0x4D37 = 0x7557
-0x4D38 = 0x755E
-0x4D39 = 0x755F
-0x4D3A = 0x7561
-0x4D3B = 0x756F
-0x4D3C = 0x7571
-0x4D3D = 0x7579
-0x4D3E = 0x757A
-0x4D3F = 0x757B
-0x4D40 = 0x757C
-0x4D41 = 0x757D
-0x4D42 = 0x757E
-0x4D43 = 0x7581
-0x4D44 = 0x7585
-0x4D45 = 0x7590
-0x4D46 = 0x7592
-0x4D47 = 0x7593
-0x4D48 = 0x7595
-0x4D49 = 0x7599
-0x4D4A = 0x759C
-0x4D4B = 0x75A2
-0x4D4C = 0x75A4
-0x4D4D = 0x75B4
-0x4D4E = 0x75BA
-0x4D4F = 0x75BF
-0x4D50 = 0x75C0
-0x4D51 = 0x75C1
-0x4D52 = 0x75C4
-0x4D53 = 0x75C6
-0x4D54 = 0x75CC
-0x4D55 = 0x75CE
-0x4D56 = 0x75CF
-0x4D57 = 0x75D7
-0x4D58 = 0x75DC
-0x4D59 = 0x75DF
-0x4D5A = 0x75E0
-0x4D5B = 0x75E1
-0x4D5C = 0x75E4
-0x4D5D = 0x75E7
-0x4D5E = 0x75EC
-0x4D5F = 0x75EE
-0x4D60 = 0x75EF
-0x4D61 = 0x75F1
-0x4D62 = 0x75F9
-0x4D63 = 0x7600
-0x4D64 = 0x7602
-0x4D65 = 0x7603
-0x4D66 = 0x7604
-0x4D67 = 0x7607
-0x4D68 = 0x7608
-0x4D69 = 0x760A
-0x4D6A = 0x760C
-0x4D6B = 0x760F
-0x4D6C = 0x7612
-0x4D6D = 0x7613
-0x4D6E = 0x7615
-0x4D6F = 0x7616
-0x4D70 = 0x7619
-0x4D71 = 0x761B
-0x4D72 = 0x761C
-0x4D73 = 0x761D
-0x4D74 = 0x761E
-0x4D75 = 0x7623
-0x4D76 = 0x7625
-0x4D77 = 0x7626
-0x4D78 = 0x7629
-0x4D79 = 0x762D
-0x4D7A = 0x7632
-0x4D7B = 0x7633
-0x4D7C = 0x7635
-0x4D7D = 0x7638
-0x4D7E = 0x7639
-0x4E21 = 0x763A
-0x4E22 = 0x763C
-0x4E23 = 0x764A
-0x4E24 = 0x7640
-0x4E25 = 0x7641
-0x4E26 = 0x7643
-0x4E27 = 0x7644
-0x4E28 = 0x7645
-0x4E29 = 0x7649
-0x4E2A = 0x764B
-0x4E2B = 0x7655
-0x4E2C = 0x7659
-0x4E2D = 0x765F
-0x4E2E = 0x7664
-0x4E2F = 0x7665
-0x4E30 = 0x766D
-0x4E31 = 0x766E
-0x4E32 = 0x766F
-0x4E33 = 0x7671
-0x4E34 = 0x7674
-0x4E35 = 0x7681
-0x4E36 = 0x7685
-0x4E37 = 0x768C
-0x4E38 = 0x768D
-0x4E39 = 0x7695
-0x4E3A = 0x769B
-0x4E3B = 0x769C
-0x4E3C = 0x769D
-0x4E3D = 0x769F
-0x4E3E = 0x76A0
-0x4E3F = 0x76A2
-0x4E40 = 0x76A3
-0x4E41 = 0x76A4
-0x4E42 = 0x76A5
-0x4E43 = 0x76A6
-0x4E44 = 0x76A7
-0x4E45 = 0x76A8
-0x4E46 = 0x76AA
-0x4E47 = 0x76AD
-0x4E48 = 0x76BD
-0x4E49 = 0x76C1
-0x4E4A = 0x76C5
-0x4E4B = 0x76C9
-0x4E4C = 0x76CB
-0x4E4D = 0x76CC
-0x4E4E = 0x76CE
-0x4E4F = 0x76D4
-0x4E50 = 0x76D9
-0x4E51 = 0x76E0
-0x4E52 = 0x76E6
-0x4E53 = 0x76E8
-0x4E54 = 0x76EC
-0x4E55 = 0x76F0
-0x4E56 = 0x76F1
-0x4E57 = 0x76F6
-0x4E58 = 0x76F9
-0x4E59 = 0x76FC
-0x4E5A = 0x7700
-0x4E5B = 0x7706
-0x4E5C = 0x770A
-0x4E5D = 0x770E
-0x4E5E = 0x7712
-0x4E5F = 0x7714
-0x4E60 = 0x7715
-0x4E61 = 0x7717
-0x4E62 = 0x7719
-0x4E63 = 0x771A
-0x4E64 = 0x771C
-0x4E65 = 0x7722
-0x4E66 = 0x7728
-0x4E67 = 0x772D
-0x4E68 = 0x772E
-0x4E69 = 0x772F
-0x4E6A = 0x7734
-0x4E6B = 0x7735
-0x4E6C = 0x7736
-0x4E6D = 0x7739
-0x4E6E = 0x773D
-0x4E6F = 0x773E
-0x4E70 = 0x7742
-0x4E71 = 0x7745
-0x4E72 = 0x7746
-0x4E73 = 0x774A
-0x4E74 = 0x774D
-0x4E75 = 0x774E
-0x4E76 = 0x774F
-0x4E77 = 0x7752
-0x4E78 = 0x7756
-0x4E79 = 0x7757
-0x4E7A = 0x775C
-0x4E7B = 0x775E
-0x4E7C = 0x775F
-0x4E7D = 0x7760
-0x4E7E = 0x7762
-0x4F21 = 0x7764
-0x4F22 = 0x7767
-0x4F23 = 0x776A
-0x4F24 = 0x776C
-0x4F25 = 0x7770
-0x4F26 = 0x7772
-0x4F27 = 0x7773
-0x4F28 = 0x7774
-0x4F29 = 0x777A
-0x4F2A = 0x777D
-0x4F2B = 0x7780
-0x4F2C = 0x7784
-0x4F2D = 0x778C
-0x4F2E = 0x778D
-0x4F2F = 0x7794
-0x4F30 = 0x7795
-0x4F31 = 0x7796
-0x4F32 = 0x779A
-0x4F33 = 0x779F
-0x4F34 = 0x77A2
-0x4F35 = 0x77A7
-0x4F36 = 0x77AA
-0x4F37 = 0x77AE
-0x4F38 = 0x77AF
-0x4F39 = 0x77B1
-0x4F3A = 0x77B5
-0x4F3B = 0x77BE
-0x4F3C = 0x77C3
-0x4F3D = 0x77C9
-0x4F3E = 0x77D1
-0x4F3F = 0x77D2
-0x4F40 = 0x77D5
-0x4F41 = 0x77D9
-0x4F42 = 0x77DE
-0x4F43 = 0x77DF
-0x4F44 = 0x77E0
-0x4F45 = 0x77E4
-0x4F46 = 0x77E6
-0x4F47 = 0x77EA
-0x4F48 = 0x77EC
-0x4F49 = 0x77F0
-0x4F4A = 0x77F1
-0x4F4B = 0x77F4
-0x4F4C = 0x77F8
-0x4F4D = 0x77FB
-0x4F4E = 0x7805
-0x4F4F = 0x7806
-0x4F50 = 0x7809
-0x4F51 = 0x780D
-0x4F52 = 0x780E
-0x4F53 = 0x7811
-0x4F54 = 0x781D
-0x4F55 = 0x7821
-0x4F56 = 0x7822
-0x4F57 = 0x7823
-0x4F58 = 0x782D
-0x4F59 = 0x782E
-0x4F5A = 0x7830
-0x4F5B = 0x7835
-0x4F5C = 0x7837
-0x4F5D = 0x7843
-0x4F5E = 0x7844
-0x4F5F = 0x7847
-0x4F60 = 0x7848
-0x4F61 = 0x784C
-0x4F62 = 0x784E
-0x4F63 = 0x7852
-0x4F64 = 0x785C
-0x4F65 = 0x785E
-0x4F66 = 0x7860
-0x4F67 = 0x7861
-0x4F68 = 0x7863
-0x4F69 = 0x7864
-0x4F6A = 0x7868
-0x4F6B = 0x786A
-0x4F6C = 0x786E
-0x4F6D = 0x787A
-0x4F6E = 0x787E
-0x4F6F = 0x788A
-0x4F70 = 0x788F
-0x4F71 = 0x7894
-0x4F72 = 0x7898
-0x4F73 = 0x78A1
-0x4F74 = 0x789D
-0x4F75 = 0x789E
-0x4F76 = 0x789F
-0x4F77 = 0x78A4
-0x4F78 = 0x78A8
-0x4F79 = 0x78AC
-0x4F7A = 0x78AD
-0x4F7B = 0x78B0
-0x4F7C = 0x78B1
-0x4F7D = 0x78B2
-0x4F7E = 0x78B3
-0x5021 = 0x78BB
-0x5022 = 0x78BD
-0x5023 = 0x78BF
-0x5024 = 0x78C7
-0x5025 = 0x78C8
-0x5026 = 0x78C9
-0x5027 = 0x78CC
-0x5028 = 0x78CE
-0x5029 = 0x78D2
-0x502A = 0x78D3
-0x502B = 0x78D5
-0x502C = 0x78D6
-0x502D = 0x78E4
-0x502E = 0x78DB
-0x502F = 0x78DF
-0x5030 = 0x78E0
-0x5031 = 0x78E1
-0x5032 = 0x78E6
-0x5033 = 0x78EA
-0x5034 = 0x78F2
-0x5035 = 0x78F3
-0x5036 = 0x7900
-0x5037 = 0x78F6
-0x5038 = 0x78F7
-0x5039 = 0x78FA
-0x503A = 0x78FB
-0x503B = 0x78FF
-0x503C = 0x7906
-0x503D = 0x790C
-0x503E = 0x7910
-0x503F = 0x791A
-0x5040 = 0x791C
-0x5041 = 0x791E
-0x5042 = 0x791F
-0x5043 = 0x7920
-0x5044 = 0x7925
-0x5045 = 0x7927
-0x5046 = 0x7929
-0x5047 = 0x792D
-0x5048 = 0x7931
-0x5049 = 0x7934
-0x504A = 0x7935
-0x504B = 0x793B
-0x504C = 0x793D
-0x504D = 0x793F
-0x504E = 0x7944
-0x504F = 0x7945
-0x5050 = 0x7946
-0x5051 = 0x794A
-0x5052 = 0x794B
-0x5053 = 0x794F
-0x5054 = 0x7951
-0x5055 = 0x7954
-0x5056 = 0x7958
-0x5057 = 0x795B
-0x5058 = 0x795C
-0x5059 = 0x7967
-0x505A = 0x7969
-0x505B = 0x796B
-0x505C = 0x7972
-0x505D = 0x7979
-0x505E = 0x797B
-0x505F = 0x797C
-0x5060 = 0x797E
-0x5061 = 0x798B
-0x5062 = 0x798C
-0x5063 = 0x7991
-0x5064 = 0x7993
-0x5065 = 0x7994
-0x5066 = 0x7995
-0x5067 = 0x7996
-0x5068 = 0x7998
-0x5069 = 0x799B
-0x506A = 0x799C
-0x506B = 0x79A1
-0x506C = 0x79A8
-0x506D = 0x79A9
-0x506E = 0x79AB
-0x506F = 0x79AF
-0x5070 = 0x79B1
-0x5071 = 0x79B4
-0x5072 = 0x79B8
-0x5073 = 0x79BB
-0x5074 = 0x79C2
-0x5075 = 0x79C4
-0x5076 = 0x79C7
-0x5077 = 0x79C8
-0x5078 = 0x79CA
-0x5079 = 0x79CF
-0x507A = 0x79D4
-0x507B = 0x79D6
-0x507C = 0x79DA
-0x507D = 0x79DD
-0x507E = 0x79DE
-0x5121 = 0x79E0
-0x5122 = 0x79E2
-0x5123 = 0x79E5
-0x5124 = 0x79EA
-0x5125 = 0x79EB
-0x5126 = 0x79ED
-0x5127 = 0x79F1
-0x5128 = 0x79F8
-0x5129 = 0x79FC
-0x512A = 0x7A02
-0x512B = 0x7A03
-0x512C = 0x7A07
-0x512D = 0x7A09
-0x512E = 0x7A0A
-0x512F = 0x7A0C
-0x5130 = 0x7A11
-0x5131 = 0x7A15
-0x5132 = 0x7A1B
-0x5133 = 0x7A1E
-0x5134 = 0x7A21
-0x5135 = 0x7A27
-0x5136 = 0x7A2B
-0x5137 = 0x7A2D
-0x5138 = 0x7A2F
-0x5139 = 0x7A30
-0x513A = 0x7A34
-0x513B = 0x7A35
-0x513C = 0x7A38
-0x513D = 0x7A39
-0x513E = 0x7A3A
-0x513F = 0x7A44
-0x5140 = 0x7A45
-0x5141 = 0x7A47
-0x5142 = 0x7A48
-0x5143 = 0x7A4C
-0x5144 = 0x7A55
-0x5145 = 0x7A56
-0x5146 = 0x7A59
-0x5147 = 0x7A5C
-0x5148 = 0x7A5D
-0x5149 = 0x7A5F
-0x514A = 0x7A60
-0x514B = 0x7A65
-0x514C = 0x7A67
-0x514D = 0x7A6A
-0x514E = 0x7A6D
-0x514F = 0x7A75
-0x5150 = 0x7A78
-0x5151 = 0x7A7E
-0x5152 = 0x7A80
-0x5153 = 0x7A82
-0x5154 = 0x7A85
-0x5155 = 0x7A86
-0x5156 = 0x7A8A
-0x5157 = 0x7A8B
-0x5158 = 0x7A90
-0x5159 = 0x7A91
-0x515A = 0x7A94
-0x515B = 0x7A9E
-0x515C = 0x7AA0
-0x515D = 0x7AA3
-0x515E = 0x7AAC
-0x515F = 0x7AB3
-0x5160 = 0x7AB5
-0x5161 = 0x7AB9
-0x5162 = 0x7ABB
-0x5163 = 0x7ABC
-0x5164 = 0x7AC6
-0x5165 = 0x7AC9
-0x5166 = 0x7ACC
-0x5167 = 0x7ACE
-0x5168 = 0x7AD1
-0x5169 = 0x7ADB
-0x516A = 0x7AE8
-0x516B = 0x7AE9
-0x516C = 0x7AEB
-0x516D = 0x7AEC
-0x516E = 0x7AF1
-0x516F = 0x7AF4
-0x5170 = 0x7AFB
-0x5171 = 0x7AFD
-0x5172 = 0x7AFE
-0x5173 = 0x7B07
-0x5174 = 0x7B14
-0x5175 = 0x7B1F
-0x5176 = 0x7B23
-0x5177 = 0x7B27
-0x5178 = 0x7B29
-0x5179 = 0x7B2A
-0x517A = 0x7B2B
-0x517B = 0x7B2D
-0x517C = 0x7B2E
-0x517D = 0x7B2F
-0x517E = 0x7B30
-0x5221 = 0x7B31
-0x5222 = 0x7B34
-0x5223 = 0x7B3D
-0x5224 = 0x7B3F
-0x5225 = 0x7B40
-0x5226 = 0x7B41
-0x5227 = 0x7B47
-0x5228 = 0x7B4E
-0x5229 = 0x7B55
-0x522A = 0x7B60
-0x522B = 0x7B64
-0x522C = 0x7B66
-0x522D = 0x7B69
-0x522E = 0x7B6A
-0x522F = 0x7B6D
-0x5230 = 0x7B6F
-0x5231 = 0x7B72
-0x5232 = 0x7B73
-0x5233 = 0x7B77
-0x5234 = 0x7B84
-0x5235 = 0x7B89
-0x5236 = 0x7B8E
-0x5237 = 0x7B90
-0x5238 = 0x7B91
-0x5239 = 0x7B96
-0x523A = 0x7B9B
-0x523B = 0x7B9E
-0x523C = 0x7BA0
-0x523D = 0x7BA5
-0x523E = 0x7BAC
-0x523F = 0x7BAF
-0x5240 = 0x7BB0
-0x5241 = 0x7BB2
-0x5242 = 0x7BB5
-0x5243 = 0x7BB6
-0x5244 = 0x7BBA
-0x5245 = 0x7BBB
-0x5246 = 0x7BBC
-0x5247 = 0x7BBD
-0x5248 = 0x7BC2
-0x5249 = 0x7BC5
-0x524A = 0x7BC8
-0x524B = 0x7BCA
-0x524C = 0x7BD4
-0x524D = 0x7BD6
-0x524E = 0x7BD7
-0x524F = 0x7BD9
-0x5250 = 0x7BDA
-0x5251 = 0x7BDB
-0x5252 = 0x7BE8
-0x5253 = 0x7BEA
-0x5254 = 0x7BF2
-0x5255 = 0x7BF4
-0x5256 = 0x7BF5
-0x5257 = 0x7BF8
-0x5258 = 0x7BF9
-0x5259 = 0x7BFA
-0x525A = 0x7BFC
-0x525B = 0x7BFE
-0x525C = 0x7C01
-0x525D = 0x7C02
-0x525E = 0x7C03
-0x525F = 0x7C04
-0x5260 = 0x7C06
-0x5261 = 0x7C09
-0x5262 = 0x7C0B
-0x5263 = 0x7C0C
-0x5264 = 0x7C0E
-0x5265 = 0x7C0F
-0x5266 = 0x7C19
-0x5267 = 0x7C1B
-0x5268 = 0x7C20
-0x5269 = 0x7C25
-0x526A = 0x7C26
-0x526B = 0x7C28
-0x526C = 0x7C2C
-0x526D = 0x7C31
-0x526E = 0x7C33
-0x526F = 0x7C34
-0x5270 = 0x7C36
-0x5271 = 0x7C39
-0x5272 = 0x7C3A
-0x5273 = 0x7C46
-0x5274 = 0x7C4A
-0x5275 = 0x7C55
-0x5276 = 0x7C51
-0x5277 = 0x7C52
-0x5278 = 0x7C53
-0x5279 = 0x7C59
-0x527A = 0x7C5A
-0x527B = 0x7C5B
-0x527C = 0x7C5C
-0x527D = 0x7C5D
-0x527E = 0x7C5E
-0x5321 = 0x7C61
-0x5322 = 0x7C63
-0x5323 = 0x7C67
-0x5324 = 0x7C69
-0x5325 = 0x7C6D
-0x5326 = 0x7C6E
-0x5327 = 0x7C70
-0x5328 = 0x7C72
-0x5329 = 0x7C79
-0x532A = 0x7C7C
-0x532B = 0x7C7D
-0x532C = 0x7C86
-0x532D = 0x7C87
-0x532E = 0x7C8F
-0x532F = 0x7C94
-0x5330 = 0x7C9E
-0x5331 = 0x7CA0
-0x5332 = 0x7CA6
-0x5333 = 0x7CB0
-0x5334 = 0x7CB6
-0x5335 = 0x7CB7
-0x5336 = 0x7CBA
-0x5337 = 0x7CBB
-0x5338 = 0x7CBC
-0x5339 = 0x7CBF
-0x533A = 0x7CC4
-0x533B = 0x7CC7
-0x533C = 0x7CC8
-0x533D = 0x7CC9
-0x533E = 0x7CCD
-0x533F = 0x7CCF
-0x5340 = 0x7CD3
-0x5341 = 0x7CD4
-0x5342 = 0x7CD5
-0x5343 = 0x7CD7
-0x5344 = 0x7CD9
-0x5345 = 0x7CDA
-0x5346 = 0x7CDD
-0x5347 = 0x7CE6
-0x5348 = 0x7CE9
-0x5349 = 0x7CEB
-0x534A = 0x7CF5
-0x534B = 0x7D03
-0x534C = 0x7D07
-0x534D = 0x7D08
-0x534E = 0x7D09
-0x534F = 0x7D0F
-0x5350 = 0x7D11
-0x5351 = 0x7D12
-0x5352 = 0x7D13
-0x5353 = 0x7D16
-0x5354 = 0x7D1D
-0x5355 = 0x7D1E
-0x5356 = 0x7D23
-0x5357 = 0x7D26
-0x5358 = 0x7D2A
-0x5359 = 0x7D2D
-0x535A = 0x7D31
-0x535B = 0x7D3C
-0x535C = 0x7D3D
-0x535D = 0x7D3E
-0x535E = 0x7D40
-0x535F = 0x7D41
-0x5360 = 0x7D47
-0x5361 = 0x7D48
-0x5362 = 0x7D4D
-0x5363 = 0x7D51
-0x5364 = 0x7D53
-0x5365 = 0x7D57
-0x5366 = 0x7D59
-0x5367 = 0x7D5A
-0x5368 = 0x7D5C
-0x5369 = 0x7D5D
-0x536A = 0x7D65
-0x536B = 0x7D67
-0x536C = 0x7D6A
-0x536D = 0x7D70
-0x536E = 0x7D78
-0x536F = 0x7D7A
-0x5370 = 0x7D7B
-0x5371 = 0x7D7F
-0x5372 = 0x7D81
-0x5373 = 0x7D82
-0x5374 = 0x7D83
-0x5375 = 0x7D85
-0x5376 = 0x7D86
-0x5377 = 0x7D88
-0x5378 = 0x7D8B
-0x5379 = 0x7D8C
-0x537A = 0x7D8D
-0x537B = 0x7D91
-0x537C = 0x7D96
-0x537D = 0x7D97
-0x537E = 0x7D9D
-0x5421 = 0x7D9E
-0x5422 = 0x7DA6
-0x5423 = 0x7DA7
-0x5424 = 0x7DAA
-0x5425 = 0x7DB3
-0x5426 = 0x7DB6
-0x5427 = 0x7DB7
-0x5428 = 0x7DB9
-0x5429 = 0x7DC2
-0x542A = 0x7DC3
-0x542B = 0x7DC4
-0x542C = 0x7DC5
-0x542D = 0x7DC6
-0x542E = 0x7DCC
-0x542F = 0x7DCD
-0x5430 = 0x7DCE
-0x5431 = 0x7DD7
-0x5432 = 0x7DD9
-0x5433 = 0x7E00
-0x5434 = 0x7DE2
-0x5435 = 0x7DE5
-0x5436 = 0x7DE6
-0x5437 = 0x7DEA
-0x5438 = 0x7DEB
-0x5439 = 0x7DED
-0x543A = 0x7DF1
-0x543B = 0x7DF5
-0x543C = 0x7DF6
-0x543D = 0x7DF9
-0x543E = 0x7DFA
-0x543F = 0x7E08
-0x5440 = 0x7E10
-0x5441 = 0x7E11
-0x5442 = 0x7E15
-0x5443 = 0x7E17
-0x5444 = 0x7E1C
-0x5445 = 0x7E1D
-0x5446 = 0x7E20
-0x5447 = 0x7E27
-0x5448 = 0x7E28
-0x5449 = 0x7E2C
-0x544A = 0x7E2D
-0x544B = 0x7E2F
-0x544C = 0x7E33
-0x544D = 0x7E36
-0x544E = 0x7E3F
-0x544F = 0x7E44
-0x5450 = 0x7E45
-0x5451 = 0x7E47
-0x5452 = 0x7E4E
-0x5453 = 0x7E50
-0x5454 = 0x7E52
-0x5455 = 0x7E58
-0x5456 = 0x7E5F
-0x5457 = 0x7E61
-0x5458 = 0x7E62
-0x5459 = 0x7E65
-0x545A = 0x7E6B
-0x545B = 0x7E6E
-0x545C = 0x7E6F
-0x545D = 0x7E73
-0x545E = 0x7E78
-0x545F = 0x7E7E
-0x5460 = 0x7E81
-0x5461 = 0x7E86
-0x5462 = 0x7E87
-0x5463 = 0x7E8A
-0x5464 = 0x7E8D
-0x5465 = 0x7E91
-0x5466 = 0x7E95
-0x5467 = 0x7E98
-0x5468 = 0x7E9A
-0x5469 = 0x7E9D
-0x546A = 0x7E9E
-0x546B = 0x7F3C
-0x546C = 0x7F3B
-0x546D = 0x7F3D
-0x546E = 0x7F3E
-0x546F = 0x7F3F
-0x5470 = 0x7F43
-0x5471 = 0x7F44
-0x5472 = 0x7F47
-0x5473 = 0x7F4F
-0x5474 = 0x7F52
-0x5475 = 0x7F53
-0x5476 = 0x7F5B
-0x5477 = 0x7F5C
-0x5478 = 0x7F5D
-0x5479 = 0x7F61
-0x547A = 0x7F63
-0x547B = 0x7F64
-0x547C = 0x7F65
-0x547D = 0x7F66
-0x547E = 0x7F6D
-0x5521 = 0x7F71
-0x5522 = 0x7F7D
-0x5523 = 0x7F7E
-0x5524 = 0x7F7F
-0x5525 = 0x7F80
-0x5526 = 0x7F8B
-0x5527 = 0x7F8D
-0x5528 = 0x7F8F
-0x5529 = 0x7F90
-0x552A = 0x7F91
-0x552B = 0x7F96
-0x552C = 0x7F97
-0x552D = 0x7F9C
-0x552E = 0x7FA1
-0x552F = 0x7FA2
-0x5530 = 0x7FA6
-0x5531 = 0x7FAA
-0x5532 = 0x7FAD
-0x5533 = 0x7FB4
-0x5534 = 0x7FBC
-0x5535 = 0x7FBF
-0x5536 = 0x7FC0
-0x5537 = 0x7FC3
-0x5538 = 0x7FC8
-0x5539 = 0x7FCE
-0x553A = 0x7FCF
-0x553B = 0x7FDB
-0x553C = 0x7FDF
-0x553D = 0x7FE3
-0x553E = 0x7FE5
-0x553F = 0x7FE8
-0x5540 = 0x7FEC
-0x5541 = 0x7FEE
-0x5542 = 0x7FEF
-0x5543 = 0x7FF2
-0x5544 = 0x7FFA
-0x5545 = 0x7FFD
-0x5546 = 0x7FFE
-0x5547 = 0x7FFF
-0x5548 = 0x8007
-0x5549 = 0x8008
-0x554A = 0x800A
-0x554B = 0x800D
-0x554C = 0x800E
-0x554D = 0x800F
-0x554E = 0x8011
-0x554F = 0x8013
-0x5550 = 0x8014
-0x5551 = 0x8016
-0x5552 = 0x801D
-0x5553 = 0x801E
-0x5554 = 0x801F
-0x5555 = 0x8020
-0x5556 = 0x8024
-0x5557 = 0x8026
-0x5558 = 0x802C
-0x5559 = 0x802E
-0x555A = 0x8030
-0x555B = 0x8034
-0x555C = 0x8035
-0x555D = 0x8037
-0x555E = 0x8039
-0x555F = 0x803A
-0x5560 = 0x803C
-0x5561 = 0x803E
-0x5562 = 0x8040
-0x5563 = 0x8044
-0x5564 = 0x8060
-0x5565 = 0x8064
-0x5566 = 0x8066
-0x5567 = 0x806D
-0x5568 = 0x8071
-0x5569 = 0x8075
-0x556A = 0x8081
-0x556B = 0x8088
-0x556C = 0x808E
-0x556D = 0x809C
-0x556E = 0x809E
-0x556F = 0x80A6
-0x5570 = 0x80A7
-0x5571 = 0x80AB
-0x5572 = 0x80B8
-0x5573 = 0x80B9
-0x5574 = 0x80C8
-0x5575 = 0x80CD
-0x5576 = 0x80CF
-0x5577 = 0x80D2
-0x5578 = 0x80D4
-0x5579 = 0x80D5
-0x557A = 0x80D7
-0x557B = 0x80D8
-0x557C = 0x80E0
-0x557D = 0x80ED
-0x557E = 0x80EE
-0x5621 = 0x80F0
-0x5622 = 0x80F2
-0x5623 = 0x80F3
-0x5624 = 0x80F6
-0x5625 = 0x80F9
-0x5626 = 0x80FA
-0x5627 = 0x80FE
-0x5628 = 0x8103
-0x5629 = 0x810B
-0x562A = 0x8116
-0x562B = 0x8117
-0x562C = 0x8118
-0x562D = 0x811C
-0x562E = 0x811E
-0x562F = 0x8120
-0x5630 = 0x8124
-0x5631 = 0x8127
-0x5632 = 0x812C
-0x5633 = 0x8130
-0x5634 = 0x8135
-0x5635 = 0x813A
-0x5636 = 0x813C
-0x5637 = 0x8145
-0x5638 = 0x8147
-0x5639 = 0x814A
-0x563A = 0x814C
-0x563B = 0x8152
-0x563C = 0x8157
-0x563D = 0x8160
-0x563E = 0x8161
-0x563F = 0x8167
-0x5640 = 0x8168
-0x5641 = 0x8169
-0x5642 = 0x816D
-0x5643 = 0x816F
-0x5644 = 0x8177
-0x5645 = 0x8181
-0x5646 = 0x8190
-0x5647 = 0x8184
-0x5648 = 0x8185
-0x5649 = 0x8186
-0x564A = 0x818B
-0x564B = 0x818E
-0x564C = 0x8196
-0x564D = 0x8198
-0x564E = 0x819B
-0x564F = 0x819E
-0x5650 = 0x81A2
-0x5651 = 0x81AE
-0x5652 = 0x81B2
-0x5653 = 0x81B4
-0x5654 = 0x81BB
-0x5655 = 0x81CB
-0x5656 = 0x81C3
-0x5657 = 0x81C5
-0x5658 = 0x81CA
-0x5659 = 0x81CE
-0x565A = 0x81CF
-0x565B = 0x81D5
-0x565C = 0x81D7
-0x565D = 0x81DB
-0x565E = 0x81DD
-0x565F = 0x81DE
-0x5660 = 0x81E1
-0x5661 = 0x81E4
-0x5662 = 0x81EB
-0x5663 = 0x81EC
-0x5664 = 0x81F0
-0x5665 = 0x81F1
-0x5666 = 0x81F2
-0x5667 = 0x81F5
-0x5668 = 0x81F6
-0x5669 = 0x81F8
-0x566A = 0x81F9
-0x566B = 0x81FD
-0x566C = 0x81FF
-0x566D = 0x8200
-0x566E = 0x8203
-0x566F = 0x820F
-0x5670 = 0x8213
-0x5671 = 0x8214
-0x5672 = 0x8219
-0x5673 = 0x821A
-0x5674 = 0x821D
-0x5675 = 0x8221
-0x5676 = 0x8222
-0x5677 = 0x8228
-0x5678 = 0x8232
-0x5679 = 0x8234
-0x567A = 0x823A
-0x567B = 0x8243
-0x567C = 0x8244
-0x567D = 0x8245
-0x567E = 0x8246
-0x5721 = 0x824B
-0x5722 = 0x824E
-0x5723 = 0x824F
-0x5724 = 0x8251
-0x5725 = 0x8256
-0x5726 = 0x825C
-0x5727 = 0x8260
-0x5728 = 0x8263
-0x5729 = 0x8267
-0x572A = 0x826D
-0x572B = 0x8274
-0x572C = 0x827B
-0x572D = 0x827D
-0x572E = 0x827F
-0x572F = 0x8280
-0x5730 = 0x8281
-0x5731 = 0x8283
-0x5732 = 0x8284
-0x5733 = 0x8287
-0x5734 = 0x8289
-0x5735 = 0x828A
-0x5736 = 0x828E
-0x5737 = 0x8291
-0x5738 = 0x8294
-0x5739 = 0x8296
-0x573A = 0x8298
-0x573B = 0x829A
-0x573C = 0x829B
-0x573D = 0x82A0
-0x573E = 0x82A1
-0x573F = 0x82A3
-0x5740 = 0x82A4
-0x5741 = 0x82A7
-0x5742 = 0x82A8
-0x5743 = 0x82A9
-0x5744 = 0x82AA
-0x5745 = 0x82AE
-0x5746 = 0x82B0
-0x5747 = 0x82B2
-0x5748 = 0x82B4
-0x5749 = 0x82B7
-0x574A = 0x82BA
-0x574B = 0x82BC
-0x574C = 0x82BE
-0x574D = 0x82BF
-0x574E = 0x82C6
-0x574F = 0x82D0
-0x5750 = 0x82D5
-0x5751 = 0x82DA
-0x5752 = 0x82E0
-0x5753 = 0x82E2
-0x5754 = 0x82E4
-0x5755 = 0x82E8
-0x5756 = 0x82EA
-0x5757 = 0x82ED
-0x5758 = 0x82EF
-0x5759 = 0x82F6
-0x575A = 0x82F7
-0x575B = 0x82FD
-0x575C = 0x82FE
-0x575D = 0x8300
-0x575E = 0x8301
-0x575F = 0x8307
-0x5760 = 0x8308
-0x5761 = 0x830A
-0x5762 = 0x830B
-0x5763 = 0x8354
-0x5764 = 0x831B
-0x5765 = 0x831D
-0x5766 = 0x831E
-0x5767 = 0x831F
-0x5768 = 0x8321
-0x5769 = 0x8322
-0x576A = 0x832C
-0x576B = 0x832D
-0x576C = 0x832E
-0x576D = 0x8330
-0x576E = 0x8333
-0x576F = 0x8337
-0x5770 = 0x833A
-0x5771 = 0x833C
-0x5772 = 0x833D
-0x5773 = 0x8342
-0x5774 = 0x8343
-0x5775 = 0x8344
-0x5776 = 0x8347
-0x5777 = 0x834D
-0x5778 = 0x834E
-0x5779 = 0x8351
-0x577A = 0x8355
-0x577B = 0x8356
-0x577C = 0x8357
-0x577D = 0x8370
-0x577E = 0x8378
-0x5821 = 0x837D
-0x5822 = 0x837F
-0x5823 = 0x8380
-0x5824 = 0x8382
-0x5825 = 0x8384
-0x5826 = 0x8386
-0x5827 = 0x838D
-0x5828 = 0x8392
-0x5829 = 0x8394
-0x582A = 0x8395
-0x582B = 0x8398
-0x582C = 0x8399
-0x582D = 0x839B
-0x582E = 0x839C
-0x582F = 0x839D
-0x5830 = 0x83A6
-0x5831 = 0x83A7
-0x5832 = 0x83A9
-0x5833 = 0x83AC
-0x5834 = 0x83BE
-0x5835 = 0x83BF
-0x5836 = 0x83C0
-0x5837 = 0x83C7
-0x5838 = 0x83C9
-0x5839 = 0x83CF
-0x583A = 0x83D0
-0x583B = 0x83D1
-0x583C = 0x83D4
-0x583D = 0x83DD
-0x583E = 0x8353
-0x583F = 0x83E8
-0x5840 = 0x83EA
-0x5841 = 0x83F6
-0x5842 = 0x83F8
-0x5843 = 0x83F9
-0x5844 = 0x83FC
-0x5845 = 0x8401
-0x5846 = 0x8406
-0x5847 = 0x840A
-0x5848 = 0x840F
-0x5849 = 0x8411
-0x584A = 0x8415
-0x584B = 0x8419
-0x584C = 0x83AD
-0x584D = 0x842F
-0x584E = 0x8439
-0x584F = 0x8445
-0x5850 = 0x8447
-0x5851 = 0x8448
-0x5852 = 0x844A
-0x5853 = 0x844D
-0x5854 = 0x844F
-0x5855 = 0x8451
-0x5856 = 0x8452
-0x5857 = 0x8456
-0x5858 = 0x8458
-0x5859 = 0x8459
-0x585A = 0x845A
-0x585B = 0x845C
-0x585C = 0x8460
-0x585D = 0x8464
-0x585E = 0x8465
-0x585F = 0x8467
-0x5860 = 0x846A
-0x5861 = 0x8470
-0x5862 = 0x8473
-0x5863 = 0x8474
-0x5864 = 0x8476
-0x5865 = 0x8478
-0x5866 = 0x847C
-0x5867 = 0x847D
-0x5868 = 0x8481
-0x5869 = 0x8485
-0x586A = 0x8492
-0x586B = 0x8493
-0x586C = 0x8495
-0x586D = 0x849E
-0x586E = 0x84A6
-0x586F = 0x84A8
-0x5870 = 0x84A9
-0x5871 = 0x84AA
-0x5872 = 0x84AF
-0x5873 = 0x84B1
-0x5874 = 0x84B4
-0x5875 = 0x84BA
-0x5876 = 0x84BD
-0x5877 = 0x84BE
-0x5878 = 0x84C0
-0x5879 = 0x84C2
-0x587A = 0x84C7
-0x587B = 0x84C8
-0x587C = 0x84CC
-0x587D = 0x84CF
-0x587E = 0x84D3
-0x5921 = 0x84DC
-0x5922 = 0x84E7
-0x5923 = 0x84EA
-0x5924 = 0x84EF
-0x5925 = 0x84F0
-0x5926 = 0x84F1
-0x5927 = 0x84F2
-0x5928 = 0x84F7
-0x5929 = 0x8532
-0x592A = 0x84FA
-0x592B = 0x84FB
-0x592C = 0x84FD
-0x592D = 0x8502
-0x592E = 0x8503
-0x592F = 0x8507
-0x5930 = 0x850C
-0x5931 = 0x850E
-0x5932 = 0x8510
-0x5933 = 0x851C
-0x5934 = 0x851E
-0x5935 = 0x8522
-0x5936 = 0x8523
-0x5937 = 0x8524
-0x5938 = 0x8525
-0x5939 = 0x8527
-0x593A = 0x852A
-0x593B = 0x852B
-0x593C = 0x852F
-0x593D = 0x8533
-0x593E = 0x8534
-0x593F = 0x8536
-0x5940 = 0x853F
-0x5941 = 0x8546
-0x5942 = 0x854F
-0x5943 = 0x8550
-0x5944 = 0x8551
-0x5945 = 0x8552
-0x5946 = 0x8553
-0x5947 = 0x8556
-0x5948 = 0x8559
-0x5949 = 0x855C
-0x594A = 0x855D
-0x594B = 0x855E
-0x594C = 0x855F
-0x594D = 0x8560
-0x594E = 0x8561
-0x594F = 0x8562
-0x5950 = 0x8564
-0x5951 = 0x856B
-0x5952 = 0x856F
-0x5953 = 0x8579
-0x5954 = 0x857A
-0x5955 = 0x857B
-0x5956 = 0x857D
-0x5957 = 0x857F
-0x5958 = 0x8581
-0x5959 = 0x8585
-0x595A = 0x8586
-0x595B = 0x8589
-0x595C = 0x858B
-0x595D = 0x858C
-0x595E = 0x858F
-0x595F = 0x8593
-0x5960 = 0x8598
-0x5961 = 0x859D
-0x5962 = 0x859F
-0x5963 = 0x85A0
-0x5964 = 0x85A2
-0x5965 = 0x85A5
-0x5966 = 0x85A7
-0x5967 = 0x85B4
-0x5968 = 0x85B6
-0x5969 = 0x85B7
-0x596A = 0x85B8
-0x596B = 0x85BC
-0x596C = 0x85BD
-0x596D = 0x85BE
-0x596E = 0x85BF
-0x596F = 0x85C2
-0x5970 = 0x85C7
-0x5971 = 0x85CA
-0x5972 = 0x85CB
-0x5973 = 0x85CE
-0x5974 = 0x85AD
-0x5975 = 0x85D8
-0x5976 = 0x85DA
-0x5977 = 0x85DF
-0x5978 = 0x85E0
-0x5979 = 0x85E6
-0x597A = 0x85E8
-0x597B = 0x85ED
-0x597C = 0x85F3
-0x597D = 0x85F6
-0x597E = 0x85FC
-0x5A21 = 0x85FF
-0x5A22 = 0x8600
-0x5A23 = 0x8604
-0x5A24 = 0x8605
-0x5A25 = 0x860D
-0x5A26 = 0x860E
-0x5A27 = 0x8610
-0x5A28 = 0x8611
-0x5A29 = 0x8612
-0x5A2A = 0x8618
-0x5A2B = 0x8619
-0x5A2C = 0x861B
-0x5A2D = 0x861E
-0x5A2E = 0x8621
-0x5A2F = 0x8627
-0x5A30 = 0x8629
-0x5A31 = 0x8636
-0x5A32 = 0x8638
-0x5A33 = 0x863A
-0x5A34 = 0x863C
-0x5A35 = 0x863D
-0x5A36 = 0x8640
-0x5A37 = 0x8642
-0x5A38 = 0x8646
-0x5A39 = 0x8652
-0x5A3A = 0x8653
-0x5A3B = 0x8656
-0x5A3C = 0x8657
-0x5A3D = 0x8658
-0x5A3E = 0x8659
-0x5A3F = 0x865D
-0x5A40 = 0x8660
-0x5A41 = 0x8661
-0x5A42 = 0x8662
-0x5A43 = 0x8663
-0x5A44 = 0x8664
-0x5A45 = 0x8669
-0x5A46 = 0x866C
-0x5A47 = 0x866F
-0x5A48 = 0x8675
-0x5A49 = 0x8676
-0x5A4A = 0x8677
-0x5A4B = 0x867A
-0x5A4C = 0x868D
-0x5A4D = 0x8691
-0x5A4E = 0x8696
-0x5A4F = 0x8698
-0x5A50 = 0x869A
-0x5A51 = 0x869C
-0x5A52 = 0x86A1
-0x5A53 = 0x86A6
-0x5A54 = 0x86A7
-0x5A55 = 0x86A8
-0x5A56 = 0x86AD
-0x5A57 = 0x86B1
-0x5A58 = 0x86B3
-0x5A59 = 0x86B4
-0x5A5A = 0x86B5
-0x5A5B = 0x86B7
-0x5A5C = 0x86B8
-0x5A5D = 0x86B9
-0x5A5E = 0x86BF
-0x5A5F = 0x86C0
-0x5A60 = 0x86C1
-0x5A61 = 0x86C3
-0x5A62 = 0x86C5
-0x5A63 = 0x86D1
-0x5A64 = 0x86D2
-0x5A65 = 0x86D5
-0x5A66 = 0x86D7
-0x5A67 = 0x86DA
-0x5A68 = 0x86DC
-0x5A69 = 0x86E0
-0x5A6A = 0x86E3
-0x5A6B = 0x86E5
-0x5A6C = 0x86E7
-0x5A6D = 0x8688
-0x5A6E = 0x86FA
-0x5A6F = 0x86FC
-0x5A70 = 0x86FD
-0x5A71 = 0x8704
-0x5A72 = 0x8705
-0x5A73 = 0x8707
-0x5A74 = 0x870B
-0x5A75 = 0x870E
-0x5A76 = 0x870F
-0x5A77 = 0x8710
-0x5A78 = 0x8713
-0x5A79 = 0x8714
-0x5A7A = 0x8719
-0x5A7B = 0x871E
-0x5A7C = 0x871F
-0x5A7D = 0x8721
-0x5A7E = 0x8723
-0x5B21 = 0x8728
-0x5B22 = 0x872E
-0x5B23 = 0x872F
-0x5B24 = 0x8731
-0x5B25 = 0x8732
-0x5B26 = 0x8739
-0x5B27 = 0x873A
-0x5B28 = 0x873C
-0x5B29 = 0x873D
-0x5B2A = 0x873E
-0x5B2B = 0x8740
-0x5B2C = 0x8743
-0x5B2D = 0x8745
-0x5B2E = 0x874D
-0x5B2F = 0x8758
-0x5B30 = 0x875D
-0x5B31 = 0x8761
-0x5B32 = 0x8764
-0x5B33 = 0x8765
-0x5B34 = 0x876F
-0x5B35 = 0x8771
-0x5B36 = 0x8772
-0x5B37 = 0x877B
-0x5B38 = 0x8783
-0x5B39 = 0x8784
-0x5B3A = 0x8785
-0x5B3B = 0x8786
-0x5B3C = 0x8787
-0x5B3D = 0x8788
-0x5B3E = 0x8789
-0x5B3F = 0x878B
-0x5B40 = 0x878C
-0x5B41 = 0x8790
-0x5B42 = 0x8793
-0x5B43 = 0x8795
-0x5B44 = 0x8797
-0x5B45 = 0x8798
-0x5B46 = 0x8799
-0x5B47 = 0x879E
-0x5B48 = 0x87A0
-0x5B49 = 0x87A3
-0x5B4A = 0x87A7
-0x5B4B = 0x87AC
-0x5B4C = 0x87AD
-0x5B4D = 0x87AE
-0x5B4E = 0x87B1
-0x5B4F = 0x87B5
-0x5B50 = 0x87BE
-0x5B51 = 0x87BF
-0x5B52 = 0x87C1
-0x5B53 = 0x87C8
-0x5B54 = 0x87C9
-0x5B55 = 0x87CA
-0x5B56 = 0x87CE
-0x5B57 = 0x87D5
-0x5B58 = 0x87D6
-0x5B59 = 0x87D9
-0x5B5A = 0x87DA
-0x5B5B = 0x87DC
-0x5B5C = 0x87DF
-0x5B5D = 0x87E2
-0x5B5E = 0x87E3
-0x5B5F = 0x87E4
-0x5B60 = 0x87EA
-0x5B61 = 0x87EB
-0x5B62 = 0x87ED
-0x5B63 = 0x87F1
-0x5B64 = 0x87F3
-0x5B65 = 0x87F8
-0x5B66 = 0x87FA
-0x5B67 = 0x87FF
-0x5B68 = 0x8801
-0x5B69 = 0x8803
-0x5B6A = 0x8806
-0x5B6B = 0x8809
-0x5B6C = 0x880A
-0x5B6D = 0x880B
-0x5B6E = 0x8810
-0x5B6F = 0x8819
-0x5B70 = 0x8812
-0x5B71 = 0x8813
-0x5B72 = 0x8814
-0x5B73 = 0x8818
-0x5B74 = 0x881A
-0x5B75 = 0x881B
-0x5B76 = 0x881C
-0x5B77 = 0x881E
-0x5B78 = 0x881F
-0x5B79 = 0x8828
-0x5B7A = 0x882D
-0x5B7B = 0x882E
-0x5B7C = 0x8830
-0x5B7D = 0x8832
-0x5B7E = 0x8835
-0x5C21 = 0x883A
-0x5C22 = 0x883C
-0x5C23 = 0x8841
-0x5C24 = 0x8843
-0x5C25 = 0x8845
-0x5C26 = 0x8848
-0x5C27 = 0x8849
-0x5C28 = 0x884A
-0x5C29 = 0x884B
-0x5C2A = 0x884E
-0x5C2B = 0x8851
-0x5C2C = 0x8855
-0x5C2D = 0x8856
-0x5C2E = 0x8858
-0x5C2F = 0x885A
-0x5C30 = 0x885C
-0x5C31 = 0x885F
-0x5C32 = 0x8860
-0x5C33 = 0x8864
-0x5C34 = 0x8869
-0x5C35 = 0x8871
-0x5C36 = 0x8879
-0x5C37 = 0x887B
-0x5C38 = 0x8880
-0x5C39 = 0x8898
-0x5C3A = 0x889A
-0x5C3B = 0x889B
-0x5C3C = 0x889C
-0x5C3D = 0x889F
-0x5C3E = 0x88A0
-0x5C3F = 0x88A8
-0x5C40 = 0x88AA
-0x5C41 = 0x88BA
-0x5C42 = 0x88BD
-0x5C43 = 0x88BE
-0x5C44 = 0x88C0
-0x5C45 = 0x88CA
-0x5C46 = 0x88CB
-0x5C47 = 0x88CC
-0x5C48 = 0x88CD
-0x5C49 = 0x88CE
-0x5C4A = 0x88D1
-0x5C4B = 0x88D2
-0x5C4C = 0x88D3
-0x5C4D = 0x88DB
-0x5C4E = 0x88DE
-0x5C4F = 0x88E7
-0x5C50 = 0x88EF
-0x5C51 = 0x88F0
-0x5C52 = 0x88F1
-0x5C53 = 0x88F5
-0x5C54 = 0x88F7
-0x5C55 = 0x8901
-0x5C56 = 0x8906
-0x5C57 = 0x890D
-0x5C58 = 0x890E
-0x5C59 = 0x890F
-0x5C5A = 0x8915
-0x5C5B = 0x8916
-0x5C5C = 0x8918
-0x5C5D = 0x8919
-0x5C5E = 0x891A
-0x5C5F = 0x891C
-0x5C60 = 0x8920
-0x5C61 = 0x8926
-0x5C62 = 0x8927
-0x5C63 = 0x8928
-0x5C64 = 0x8930
-0x5C65 = 0x8931
-0x5C66 = 0x8932
-0x5C67 = 0x8935
-0x5C68 = 0x8939
-0x5C69 = 0x893A
-0x5C6A = 0x893E
-0x5C6B = 0x8940
-0x5C6C = 0x8942
-0x5C6D = 0x8945
-0x5C6E = 0x8946
-0x5C6F = 0x8949
-0x5C70 = 0x894F
-0x5C71 = 0x8952
-0x5C72 = 0x8957
-0x5C73 = 0x895A
-0x5C74 = 0x895B
-0x5C75 = 0x895C
-0x5C76 = 0x8961
-0x5C77 = 0x8962
-0x5C78 = 0x8963
-0x5C79 = 0x896B
-0x5C7A = 0x896E
-0x5C7B = 0x8970
-0x5C7C = 0x8973
-0x5C7D = 0x8975
-0x5C7E = 0x897A
-0x5D21 = 0x897B
-0x5D22 = 0x897C
-0x5D23 = 0x897D
-0x5D24 = 0x8989
-0x5D25 = 0x898D
-0x5D26 = 0x8990
-0x5D27 = 0x8994
-0x5D28 = 0x8995
-0x5D29 = 0x899B
-0x5D2A = 0x899C
-0x5D2B = 0x899F
-0x5D2C = 0x89A0
-0x5D2D = 0x89A5
-0x5D2E = 0x89B0
-0x5D2F = 0x89B4
-0x5D30 = 0x89B5
-0x5D31 = 0x89B6
-0x5D32 = 0x89B7
-0x5D33 = 0x89BC
-0x5D34 = 0x89D4
-0x5D35 = 0x89D5
-0x5D36 = 0x89D6
-0x5D37 = 0x89D7
-0x5D38 = 0x89D8
-0x5D39 = 0x89E5
-0x5D3A = 0x89E9
-0x5D3B = 0x89EB
-0x5D3C = 0x89ED
-0x5D3D = 0x89F1
-0x5D3E = 0x89F3
-0x5D3F = 0x89F6
-0x5D40 = 0x89F9
-0x5D41 = 0x89FD
-0x5D42 = 0x89FF
-0x5D43 = 0x8A04
-0x5D44 = 0x8A05
-0x5D45 = 0x8A07
-0x5D46 = 0x8A0F
-0x5D47 = 0x8A11
-0x5D48 = 0x8A12
-0x5D49 = 0x8A14
-0x5D4A = 0x8A15
-0x5D4B = 0x8A1E
-0x5D4C = 0x8A20
-0x5D4D = 0x8A22
-0x5D4E = 0x8A24
-0x5D4F = 0x8A26
-0x5D50 = 0x8A2B
-0x5D51 = 0x8A2C
-0x5D52 = 0x8A2F
-0x5D53 = 0x8A35
-0x5D54 = 0x8A37
-0x5D55 = 0x8A3D
-0x5D56 = 0x8A3E
-0x5D57 = 0x8A40
-0x5D58 = 0x8A43
-0x5D59 = 0x8A45
-0x5D5A = 0x8A47
-0x5D5B = 0x8A49
-0x5D5C = 0x8A4D
-0x5D5D = 0x8A4E
-0x5D5E = 0x8A53
-0x5D5F = 0x8A56
-0x5D60 = 0x8A57
-0x5D61 = 0x8A58
-0x5D62 = 0x8A5C
-0x5D63 = 0x8A5D
-0x5D64 = 0x8A61
-0x5D65 = 0x8A65
-0x5D66 = 0x8A67
-0x5D67 = 0x8A75
-0x5D68 = 0x8A76
-0x5D69 = 0x8A77
-0x5D6A = 0x8A79
-0x5D6B = 0x8A7A
-0x5D6C = 0x8A7B
-0x5D6D = 0x8A7E
-0x5D6E = 0x8A7F
-0x5D6F = 0x8A80
-0x5D70 = 0x8A83
-0x5D71 = 0x8A86
-0x5D72 = 0x8A8B
-0x5D73 = 0x8A8F
-0x5D74 = 0x8A90
-0x5D75 = 0x8A92
-0x5D76 = 0x8A96
-0x5D77 = 0x8A97
-0x5D78 = 0x8A99
-0x5D79 = 0x8A9F
-0x5D7A = 0x8AA7
-0x5D7B = 0x8AA9
-0x5D7C = 0x8AAE
-0x5D7D = 0x8AAF
-0x5D7E = 0x8AB3
-0x5E21 = 0x8AB6
-0x5E22 = 0x8AB7
-0x5E23 = 0x8ABB
-0x5E24 = 0x8ABE
-0x5E25 = 0x8AC3
-0x5E26 = 0x8AC6
-0x5E27 = 0x8AC8
-0x5E28 = 0x8AC9
-0x5E29 = 0x8ACA
-0x5E2A = 0x8AD1
-0x5E2B = 0x8AD3
-0x5E2C = 0x8AD4
-0x5E2D = 0x8AD5
-0x5E2E = 0x8AD7
-0x5E2F = 0x8ADD
-0x5E30 = 0x8ADF
-0x5E31 = 0x8AEC
-0x5E32 = 0x8AF0
-0x5E33 = 0x8AF4
-0x5E34 = 0x8AF5
-0x5E35 = 0x8AF6
-0x5E36 = 0x8AFC
-0x5E37 = 0x8AFF
-0x5E38 = 0x8B05
-0x5E39 = 0x8B06
-0x5E3A = 0x8B0B
-0x5E3B = 0x8B11
-0x5E3C = 0x8B1C
-0x5E3D = 0x8B1E
-0x5E3E = 0x8B1F
-0x5E3F = 0x8B0A
-0x5E40 = 0x8B2D
-0x5E41 = 0x8B30
-0x5E42 = 0x8B37
-0x5E43 = 0x8B3C
-0x5E44 = 0x8B42
-0x5E45 = 0x8B43
-0x5E46 = 0x8B44
-0x5E47 = 0x8B45
-0x5E48 = 0x8B46
-0x5E49 = 0x8B48
-0x5E4A = 0x8B52
-0x5E4B = 0x8B53
-0x5E4C = 0x8B54
-0x5E4D = 0x8B59
-0x5E4E = 0x8B4D
-0x5E4F = 0x8B5E
-0x5E50 = 0x8B63
-0x5E51 = 0x8B6D
-0x5E52 = 0x8B76
-0x5E53 = 0x8B78
-0x5E54 = 0x8B79
-0x5E55 = 0x8B7C
-0x5E56 = 0x8B7E
-0x5E57 = 0x8B81
-0x5E58 = 0x8B84
-0x5E59 = 0x8B85
-0x5E5A = 0x8B8B
-0x5E5B = 0x8B8D
-0x5E5C = 0x8B8F
-0x5E5D = 0x8B94
-0x5E5E = 0x8B95
-0x5E5F = 0x8B9C
-0x5E60 = 0x8B9E
-0x5E61 = 0x8B9F
-0x5E62 = 0x8C38
-0x5E63 = 0x8C39
-0x5E64 = 0x8C3D
-0x5E65 = 0x8C3E
-0x5E66 = 0x8C45
-0x5E67 = 0x8C47
-0x5E68 = 0x8C49
-0x5E69 = 0x8C4B
-0x5E6A = 0x8C4F
-0x5E6B = 0x8C51
-0x5E6C = 0x8C53
-0x5E6D = 0x8C54
-0x5E6E = 0x8C57
-0x5E6F = 0x8C58
-0x5E70 = 0x8C5B
-0x5E71 = 0x8C5D
-0x5E72 = 0x8C59
-0x5E73 = 0x8C63
-0x5E74 = 0x8C64
-0x5E75 = 0x8C66
-0x5E76 = 0x8C68
-0x5E77 = 0x8C69
-0x5E78 = 0x8C6D
-0x5E79 = 0x8C73
-0x5E7A = 0x8C75
-0x5E7B = 0x8C76
-0x5E7C = 0x8C7B
-0x5E7D = 0x8C7E
-0x5E7E = 0x8C86
-0x5F21 = 0x8C87
-0x5F22 = 0x8C8B
-0x5F23 = 0x8C90
-0x5F24 = 0x8C92
-0x5F25 = 0x8C93
-0x5F26 = 0x8C99
-0x5F27 = 0x8C9B
-0x5F28 = 0x8C9C
-0x5F29 = 0x8CA4
-0x5F2A = 0x8CB9
-0x5F2B = 0x8CBA
-0x5F2C = 0x8CC5
-0x5F2D = 0x8CC6
-0x5F2E = 0x8CC9
-0x5F2F = 0x8CCB
-0x5F30 = 0x8CCF
-0x5F31 = 0x8CD6
-0x5F32 = 0x8CD5
-0x5F33 = 0x8CD9
-0x5F34 = 0x8CDD
-0x5F35 = 0x8CE1
-0x5F36 = 0x8CE8
-0x5F37 = 0x8CEC
-0x5F38 = 0x8CEF
-0x5F39 = 0x8CF0
-0x5F3A = 0x8CF2
-0x5F3B = 0x8CF5
-0x5F3C = 0x8CF7
-0x5F3D = 0x8CF8
-0x5F3E = 0x8CFE
-0x5F3F = 0x8CFF
-0x5F40 = 0x8D01
-0x5F41 = 0x8D03
-0x5F42 = 0x8D09
-0x5F43 = 0x8D12
-0x5F44 = 0x8D17
-0x5F45 = 0x8D1B
-0x5F46 = 0x8D65
-0x5F47 = 0x8D69
-0x5F48 = 0x8D6C
-0x5F49 = 0x8D6E
-0x5F4A = 0x8D7F
-0x5F4B = 0x8D82
-0x5F4C = 0x8D84
-0x5F4D = 0x8D88
-0x5F4E = 0x8D8D
-0x5F4F = 0x8D90
-0x5F50 = 0x8D91
-0x5F51 = 0x8D95
-0x5F52 = 0x8D9E
-0x5F53 = 0x8D9F
-0x5F54 = 0x8DA0
-0x5F55 = 0x8DA6
-0x5F56 = 0x8DAB
-0x5F57 = 0x8DAC
-0x5F58 = 0x8DAF
-0x5F59 = 0x8DB2
-0x5F5A = 0x8DB5
-0x5F5B = 0x8DB7
-0x5F5C = 0x8DB9
-0x5F5D = 0x8DBB
-0x5F5E = 0x8DC0
-0x5F5F = 0x8DC5
-0x5F60 = 0x8DC6
-0x5F61 = 0x8DC7
-0x5F62 = 0x8DC8
-0x5F63 = 0x8DCA
-0x5F64 = 0x8DCE
-0x5F65 = 0x8DD1
-0x5F66 = 0x8DD4
-0x5F67 = 0x8DD5
-0x5F68 = 0x8DD7
-0x5F69 = 0x8DD9
-0x5F6A = 0x8DE4
-0x5F6B = 0x8DE5
-0x5F6C = 0x8DE7
-0x5F6D = 0x8DEC
-0x5F6E = 0x8DF0
-0x5F6F = 0x8DBC
-0x5F70 = 0x8DF1
-0x5F71 = 0x8DF2
-0x5F72 = 0x8DF4
-0x5F73 = 0x8DFD
-0x5F74 = 0x8E01
-0x5F75 = 0x8E04
-0x5F76 = 0x8E05
-0x5F77 = 0x8E06
-0x5F78 = 0x8E0B
-0x5F79 = 0x8E11
-0x5F7A = 0x8E14
-0x5F7B = 0x8E16
-0x5F7C = 0x8E20
-0x5F7D = 0x8E21
-0x5F7E = 0x8E22
-0x6021 = 0x8E23
-0x6022 = 0x8E26
-0x6023 = 0x8E27
-0x6024 = 0x8E31
-0x6025 = 0x8E33
-0x6026 = 0x8E36
-0x6027 = 0x8E37
-0x6028 = 0x8E38
-0x6029 = 0x8E39
-0x602A = 0x8E3D
-0x602B = 0x8E40
-0x602C = 0x8E41
-0x602D = 0x8E4B
-0x602E = 0x8E4D
-0x602F = 0x8E4E
-0x6030 = 0x8E4F
-0x6031 = 0x8E54
-0x6032 = 0x8E5B
-0x6033 = 0x8E5C
-0x6034 = 0x8E5D
-0x6035 = 0x8E5E
-0x6036 = 0x8E61
-0x6037 = 0x8E62
-0x6038 = 0x8E69
-0x6039 = 0x8E6C
-0x603A = 0x8E6D
-0x603B = 0x8E6F
-0x603C = 0x8E70
-0x603D = 0x8E71
-0x603E = 0x8E79
-0x603F = 0x8E7A
-0x6040 = 0x8E7B
-0x6041 = 0x8E82
-0x6042 = 0x8E83
-0x6043 = 0x8E89
-0x6044 = 0x8E90
-0x6045 = 0x8E92
-0x6046 = 0x8E95
-0x6047 = 0x8E9A
-0x6048 = 0x8E9B
-0x6049 = 0x8E9D
-0x604A = 0x8E9E
-0x604B = 0x8EA2
-0x604C = 0x8EA7
-0x604D = 0x8EA9
-0x604E = 0x8EAD
-0x604F = 0x8EAE
-0x6050 = 0x8EB3
-0x6051 = 0x8EB5
-0x6052 = 0x8EBA
-0x6053 = 0x8EBB
-0x6054 = 0x8EC0
-0x6055 = 0x8EC1
-0x6056 = 0x8EC3
-0x6057 = 0x8EC4
-0x6058 = 0x8EC7
-0x6059 = 0x8ECF
-0x605A = 0x8ED1
-0x605B = 0x8ED4
-0x605C = 0x8EDC
-0x605D = 0x8EE8
-0x605E = 0x8EEE
-0x605F = 0x8EF0
-0x6060 = 0x8EF1
-0x6061 = 0x8EF7
-0x6062 = 0x8EF9
-0x6063 = 0x8EFA
-0x6064 = 0x8EED
-0x6065 = 0x8F00
-0x6066 = 0x8F02
-0x6067 = 0x8F07
-0x6068 = 0x8F08
-0x6069 = 0x8F0F
-0x606A = 0x8F10
-0x606B = 0x8F16
-0x606C = 0x8F17
-0x606D = 0x8F18
-0x606E = 0x8F1E
-0x606F = 0x8F20
-0x6070 = 0x8F21
-0x6071 = 0x8F23
-0x6072 = 0x8F25
-0x6073 = 0x8F27
-0x6074 = 0x8F28
-0x6075 = 0x8F2C
-0x6076 = 0x8F2D
-0x6077 = 0x8F2E
-0x6078 = 0x8F34
-0x6079 = 0x8F35
-0x607A = 0x8F36
-0x607B = 0x8F37
-0x607C = 0x8F3A
-0x607D = 0x8F40
-0x607E = 0x8F41
-0x6121 = 0x8F43
-0x6122 = 0x8F47
-0x6123 = 0x8F4F
-0x6124 = 0x8F51
-0x6125 = 0x8F52
-0x6126 = 0x8F53
-0x6127 = 0x8F54
-0x6128 = 0x8F55
-0x6129 = 0x8F58
-0x612A = 0x8F5D
-0x612B = 0x8F5E
-0x612C = 0x8F65
-0x612D = 0x8F9D
-0x612E = 0x8FA0
-0x612F = 0x8FA1
-0x6130 = 0x8FA4
-0x6131 = 0x8FA5
-0x6132 = 0x8FA6
-0x6133 = 0x8FB5
-0x6134 = 0x8FB6
-0x6135 = 0x8FB8
-0x6136 = 0x8FBE
-0x6137 = 0x8FC0
-0x6138 = 0x8FC1
-0x6139 = 0x8FC6
-0x613A = 0x8FCA
-0x613B = 0x8FCB
-0x613C = 0x8FCD
-0x613D = 0x8FD0
-0x613E = 0x8FD2
-0x613F = 0x8FD3
-0x6140 = 0x8FD5
-0x6141 = 0x8FE0
-0x6142 = 0x8FE3
-0x6143 = 0x8FE4
-0x6144 = 0x8FE8
-0x6145 = 0x8FEE
-0x6146 = 0x8FF1
-0x6147 = 0x8FF5
-0x6148 = 0x8FF6
-0x6149 = 0x8FFB
-0x614A = 0x8FFE
-0x614B = 0x9002
-0x614C = 0x9004
-0x614D = 0x9008
-0x614E = 0x900C
-0x614F = 0x9018
-0x6150 = 0x901B
-0x6151 = 0x9028
-0x6152 = 0x9029
-0x6153 = 0x902F
-0x6154 = 0x902A
-0x6155 = 0x902C
-0x6156 = 0x902D
-0x6157 = 0x9033
-0x6158 = 0x9034
-0x6159 = 0x9037
-0x615A = 0x903F
-0x615B = 0x9043
-0x615C = 0x9044
-0x615D = 0x904C
-0x615E = 0x905B
-0x615F = 0x905D
-0x6160 = 0x9062
-0x6161 = 0x9066
-0x6162 = 0x9067
-0x6163 = 0x906C
-0x6164 = 0x9070
-0x6165 = 0x9074
-0x6166 = 0x9079
-0x6167 = 0x9085
-0x6168 = 0x9088
-0x6169 = 0x908B
-0x616A = 0x908C
-0x616B = 0x908E
-0x616C = 0x9090
-0x616D = 0x9095
-0x616E = 0x9097
-0x616F = 0x9098
-0x6170 = 0x9099
-0x6171 = 0x909B
-0x6172 = 0x90A0
-0x6173 = 0x90A1
-0x6174 = 0x90A2
-0x6175 = 0x90A5
-0x6176 = 0x90B0
-0x6177 = 0x90B2
-0x6178 = 0x90B3
-0x6179 = 0x90B4
-0x617A = 0x90B6
-0x617B = 0x90BD
-0x617C = 0x90CC
-0x617D = 0x90BE
-0x617E = 0x90C3
-0x6221 = 0x90C4
-0x6222 = 0x90C5
-0x6223 = 0x90C7
-0x6224 = 0x90C8
-0x6225 = 0x90D5
-0x6226 = 0x90D7
-0x6227 = 0x90D8
-0x6228 = 0x90D9
-0x6229 = 0x90DC
-0x622A = 0x90DD
-0x622B = 0x90DF
-0x622C = 0x90E5
-0x622D = 0x90D2
-0x622E = 0x90F6
-0x622F = 0x90EB
-0x6230 = 0x90EF
-0x6231 = 0x90F0
-0x6232 = 0x90F4
-0x6233 = 0x90FE
-0x6234 = 0x90FF
-0x6235 = 0x9100
-0x6236 = 0x9104
-0x6237 = 0x9105
-0x6238 = 0x9106
-0x6239 = 0x9108
-0x623A = 0x910D
-0x623B = 0x9110
-0x623C = 0x9114
-0x623D = 0x9116
-0x623E = 0x9117
-0x623F = 0x9118
-0x6240 = 0x911A
-0x6241 = 0x911C
-0x6242 = 0x911E
-0x6243 = 0x9120
-0x6244 = 0x9125
-0x6245 = 0x9122
-0x6246 = 0x9123
-0x6247 = 0x9127
-0x6248 = 0x9129
-0x6249 = 0x912E
-0x624A = 0x912F
-0x624B = 0x9131
-0x624C = 0x9134
-0x624D = 0x9136
-0x624E = 0x9137
-0x624F = 0x9139
-0x6250 = 0x913A
-0x6251 = 0x913C
-0x6252 = 0x913D
-0x6253 = 0x9143
-0x6254 = 0x9147
-0x6255 = 0x9148
-0x6256 = 0x914F
-0x6257 = 0x9153
-0x6258 = 0x9157
-0x6259 = 0x9159
-0x625A = 0x915A
-0x625B = 0x915B
-0x625C = 0x9161
-0x625D = 0x9164
-0x625E = 0x9167
-0x625F = 0x916D
-0x6260 = 0x9174
-0x6261 = 0x9179
-0x6262 = 0x917A
-0x6263 = 0x917B
-0x6264 = 0x9181
-0x6265 = 0x9183
-0x6266 = 0x9185
-0x6267 = 0x9186
-0x6268 = 0x918A
-0x6269 = 0x918E
-0x626A = 0x9191
-0x626B = 0x9193
-0x626C = 0x9194
-0x626D = 0x9195
-0x626E = 0x9198
-0x626F = 0x919E
-0x6270 = 0x91A1
-0x6271 = 0x91A6
-0x6272 = 0x91A8
-0x6273 = 0x91AC
-0x6274 = 0x91AD
-0x6275 = 0x91AE
-0x6276 = 0x91B0
-0x6277 = 0x91B1
-0x6278 = 0x91B2
-0x6279 = 0x91B3
-0x627A = 0x91B6
-0x627B = 0x91BB
-0x627C = 0x91BC
-0x627D = 0x91BD
-0x627E = 0x91BF
-0x6321 = 0x91C2
-0x6322 = 0x91C3
-0x6323 = 0x91C5
-0x6324 = 0x91D3
-0x6325 = 0x91D4
-0x6326 = 0x91D7
-0x6327 = 0x91D9
-0x6328 = 0x91DA
-0x6329 = 0x91DE
-0x632A = 0x91E4
-0x632B = 0x91E5
-0x632C = 0x91E9
-0x632D = 0x91EA
-0x632E = 0x91EC
-0x632F = 0x91ED
-0x6330 = 0x91EE
-0x6331 = 0x91EF
-0x6332 = 0x91F0
-0x6333 = 0x91F1
-0x6334 = 0x91F7
-0x6335 = 0x91F9
-0x6336 = 0x91FB
-0x6337 = 0x91FD
-0x6338 = 0x9200
-0x6339 = 0x9201
-0x633A = 0x9204
-0x633B = 0x9205
-0x633C = 0x9206
-0x633D = 0x9207
-0x633E = 0x9209
-0x633F = 0x920A
-0x6340 = 0x920C
-0x6341 = 0x9210
-0x6342 = 0x9212
-0x6343 = 0x9213
-0x6344 = 0x9216
-0x6345 = 0x9218
-0x6346 = 0x921C
-0x6347 = 0x921D
-0x6348 = 0x9223
-0x6349 = 0x9224
-0x634A = 0x9225
-0x634B = 0x9226
-0x634C = 0x9228
-0x634D = 0x922E
-0x634E = 0x922F
-0x634F = 0x9230
-0x6350 = 0x9233
-0x6351 = 0x9235
-0x6352 = 0x9236
-0x6353 = 0x9238
-0x6354 = 0x9239
-0x6355 = 0x923A
-0x6356 = 0x923C
-0x6357 = 0x923E
-0x6358 = 0x9240
-0x6359 = 0x9242
-0x635A = 0x9243
-0x635B = 0x9246
-0x635C = 0x9247
-0x635D = 0x924A
-0x635E = 0x924D
-0x635F = 0x924E
-0x6360 = 0x924F
-0x6361 = 0x9251
-0x6362 = 0x9258
-0x6363 = 0x9259
-0x6364 = 0x925C
-0x6365 = 0x925D
-0x6366 = 0x9260
-0x6367 = 0x9261
-0x6368 = 0x9265
-0x6369 = 0x9267
-0x636A = 0x9268
-0x636B = 0x9269
-0x636C = 0x926E
-0x636D = 0x926F
-0x636E = 0x9270
-0x636F = 0x9275
-0x6370 = 0x9276
-0x6371 = 0x9277
-0x6372 = 0x9278
-0x6373 = 0x9279
-0x6374 = 0x927B
-0x6375 = 0x927C
-0x6376 = 0x927D
-0x6377 = 0x927F
-0x6378 = 0x9288
-0x6379 = 0x9289
-0x637A = 0x928A
-0x637B = 0x928D
-0x637C = 0x928E
-0x637D = 0x9292
-0x637E = 0x9297
-0x6421 = 0x9299
-0x6422 = 0x929F
-0x6423 = 0x92A0
-0x6424 = 0x92A4
-0x6425 = 0x92A5
-0x6426 = 0x92A7
-0x6427 = 0x92A8
-0x6428 = 0x92AB
-0x6429 = 0x92AF
-0x642A = 0x92B2
-0x642B = 0x92B6
-0x642C = 0x92B8
-0x642D = 0x92BA
-0x642E = 0x92BB
-0x642F = 0x92BC
-0x6430 = 0x92BD
-0x6431 = 0x92BF
-0x6432 = 0x92C0
-0x6433 = 0x92C1
-0x6434 = 0x92C2
-0x6435 = 0x92C3
-0x6436 = 0x92C5
-0x6437 = 0x92C6
-0x6438 = 0x92C7
-0x6439 = 0x92C8
-0x643A = 0x92CB
-0x643B = 0x92CC
-0x643C = 0x92CD
-0x643D = 0x92CE
-0x643E = 0x92D0
-0x643F = 0x92D3
-0x6440 = 0x92D5
-0x6441 = 0x92D7
-0x6442 = 0x92D8
-0x6443 = 0x92D9
-0x6444 = 0x92DC
-0x6445 = 0x92DD
-0x6446 = 0x92DF
-0x6447 = 0x92E0
-0x6448 = 0x92E1
-0x6449 = 0x92E3
-0x644A = 0x92E5
-0x644B = 0x92E7
-0x644C = 0x92E8
-0x644D = 0x92EC
-0x644E = 0x92EE
-0x644F = 0x92F0
-0x6450 = 0x92F9
-0x6451 = 0x92FB
-0x6452 = 0x92FF
-0x6453 = 0x9300
-0x6454 = 0x9302
-0x6455 = 0x9308
-0x6456 = 0x930D
-0x6457 = 0x9311
-0x6458 = 0x9314
-0x6459 = 0x9315
-0x645A = 0x931C
-0x645B = 0x931D
-0x645C = 0x931E
-0x645D = 0x931F
-0x645E = 0x9321
-0x645F = 0x9324
-0x6460 = 0x9325
-0x6461 = 0x9327
-0x6462 = 0x9329
-0x6463 = 0x932A
-0x6464 = 0x9333
-0x6465 = 0x9334
-0x6466 = 0x9336
-0x6467 = 0x9337
-0x6468 = 0x9347
-0x6469 = 0x9348
-0x646A = 0x9349
-0x646B = 0x9350
-0x646C = 0x9351
-0x646D = 0x9352
-0x646E = 0x9355
-0x646F = 0x9357
-0x6470 = 0x9358
-0x6471 = 0x935A
-0x6472 = 0x935E
-0x6473 = 0x9364
-0x6474 = 0x9365
-0x6475 = 0x9367
-0x6476 = 0x9369
-0x6477 = 0x936A
-0x6478 = 0x936D
-0x6479 = 0x936F
-0x647A = 0x9370
-0x647B = 0x9371
-0x647C = 0x9373
-0x647D = 0x9374
-0x647E = 0x9376
-0x6521 = 0x937A
-0x6522 = 0x937D
-0x6523 = 0x937F
-0x6524 = 0x9380
-0x6525 = 0x9381
-0x6526 = 0x9382
-0x6527 = 0x9388
-0x6528 = 0x938A
-0x6529 = 0x938B
-0x652A = 0x938D
-0x652B = 0x938F
-0x652C = 0x9392
-0x652D = 0x9395
-0x652E = 0x9398
-0x652F = 0x939B
-0x6530 = 0x939E
-0x6531 = 0x93A1
-0x6532 = 0x93A3
-0x6533 = 0x93A4
-0x6534 = 0x93A6
-0x6535 = 0x93A8
-0x6536 = 0x93AB
-0x6537 = 0x93B4
-0x6538 = 0x93B5
-0x6539 = 0x93B6
-0x653A = 0x93BA
-0x653B = 0x93A9
-0x653C = 0x93C1
-0x653D = 0x93C4
-0x653E = 0x93C5
-0x653F = 0x93C6
-0x6540 = 0x93C7
-0x6541 = 0x93C9
-0x6542 = 0x93CA
-0x6543 = 0x93CB
-0x6544 = 0x93CC
-0x6545 = 0x93CD
-0x6546 = 0x93D3
-0x6547 = 0x93D9
-0x6548 = 0x93DC
-0x6549 = 0x93DE
-0x654A = 0x93DF
-0x654B = 0x93E2
-0x654C = 0x93E6
-0x654D = 0x93E7
-0x654E = 0x93F9
-0x654F = 0x93F7
-0x6550 = 0x93F8
-0x6551 = 0x93FA
-0x6552 = 0x93FB
-0x6553 = 0x93FD
-0x6554 = 0x9401
-0x6555 = 0x9402
-0x6556 = 0x9404
-0x6557 = 0x9408
-0x6558 = 0x9409
-0x6559 = 0x940D
-0x655A = 0x940E
-0x655B = 0x940F
-0x655C = 0x9415
-0x655D = 0x9416
-0x655E = 0x9417
-0x655F = 0x941F
-0x6560 = 0x942E
-0x6561 = 0x942F
-0x6562 = 0x9431
-0x6563 = 0x9432
-0x6564 = 0x9433
-0x6565 = 0x9434
-0x6566 = 0x943B
-0x6567 = 0x943F
-0x6568 = 0x943D
-0x6569 = 0x9443
-0x656A = 0x9445
-0x656B = 0x9448
-0x656C = 0x944A
-0x656D = 0x944C
-0x656E = 0x9455
-0x656F = 0x9459
-0x6570 = 0x945C
-0x6571 = 0x945F
-0x6572 = 0x9461
-0x6573 = 0x9463
-0x6574 = 0x9468
-0x6575 = 0x946B
-0x6576 = 0x946D
-0x6577 = 0x946E
-0x6578 = 0x946F
-0x6579 = 0x9471
-0x657A = 0x9472
-0x657B = 0x9484
-0x657C = 0x9483
-0x657D = 0x9578
-0x657E = 0x9579
-0x6621 = 0x957E
-0x6622 = 0x9584
-0x6623 = 0x9588
-0x6624 = 0x958C
-0x6625 = 0x958D
-0x6626 = 0x958E
-0x6627 = 0x959D
-0x6628 = 0x959E
-0x6629 = 0x959F
-0x662A = 0x95A1
-0x662B = 0x95A6
-0x662C = 0x95A9
-0x662D = 0x95AB
-0x662E = 0x95AC
-0x662F = 0x95B4
-0x6630 = 0x95B6
-0x6631 = 0x95BA
-0x6632 = 0x95BD
-0x6633 = 0x95BF
-0x6634 = 0x95C6
-0x6635 = 0x95C8
-0x6636 = 0x95C9
-0x6637 = 0x95CB
-0x6638 = 0x95D0
-0x6639 = 0x95D1
-0x663A = 0x95D2
-0x663B = 0x95D3
-0x663C = 0x95D9
-0x663D = 0x95DA
-0x663E = 0x95DD
-0x663F = 0x95DE
-0x6640 = 0x95DF
-0x6641 = 0x95E0
-0x6642 = 0x95E4
-0x6643 = 0x95E6
-0x6644 = 0x961D
-0x6645 = 0x961E
-0x6646 = 0x9622
-0x6647 = 0x9624
-0x6648 = 0x9625
-0x6649 = 0x9626
-0x664A = 0x962C
-0x664B = 0x9631
-0x664C = 0x9633
-0x664D = 0x9637
-0x664E = 0x9638
-0x664F = 0x9639
-0x6650 = 0x963A
-0x6651 = 0x963C
-0x6652 = 0x963D
-0x6653 = 0x9641
-0x6654 = 0x9652
-0x6655 = 0x9654
-0x6656 = 0x9656
-0x6657 = 0x9657
-0x6658 = 0x9658
-0x6659 = 0x9661
-0x665A = 0x966E
-0x665B = 0x9674
-0x665C = 0x967B
-0x665D = 0x967C
-0x665E = 0x967E
-0x665F = 0x967F
-0x6660 = 0x9681
-0x6661 = 0x9682
-0x6662 = 0x9683
-0x6663 = 0x9684
-0x6664 = 0x9689
-0x6665 = 0x9691
-0x6666 = 0x9696
-0x6667 = 0x969A
-0x6668 = 0x969D
-0x6669 = 0x969F
-0x666A = 0x96A4
-0x666B = 0x96A5
-0x666C = 0x96A6
-0x666D = 0x96A9
-0x666E = 0x96AE
-0x666F = 0x96AF
-0x6670 = 0x96B3
-0x6671 = 0x96BA
-0x6672 = 0x96CA
-0x6673 = 0x96D2
-0x6674 = 0x5DB2
-0x6675 = 0x96D8
-0x6676 = 0x96DA
-0x6677 = 0x96DD
-0x6678 = 0x96DE
-0x6679 = 0x96DF
-0x667A = 0x96E9
-0x667B = 0x96EF
-0x667C = 0x96F1
-0x667D = 0x96FA
-0x667E = 0x9702
-0x6721 = 0x9703
-0x6722 = 0x9705
-0x6723 = 0x9709
-0x6724 = 0x971A
-0x6725 = 0x971B
-0x6726 = 0x971D
-0x6727 = 0x9721
-0x6728 = 0x9722
-0x6729 = 0x9723
-0x672A = 0x9728
-0x672B = 0x9731
-0x672C = 0x9733
-0x672D = 0x9741
-0x672E = 0x9743
-0x672F = 0x974A
-0x6730 = 0x974E
-0x6731 = 0x974F
-0x6732 = 0x9755
-0x6733 = 0x9757
-0x6734 = 0x9758
-0x6735 = 0x975A
-0x6736 = 0x975B
-0x6737 = 0x9763
-0x6738 = 0x9767
-0x6739 = 0x976A
-0x673A = 0x976E
-0x673B = 0x9773
-0x673C = 0x9776
-0x673D = 0x9777
-0x673E = 0x9778
-0x673F = 0x977B
-0x6740 = 0x977D
-0x6741 = 0x977F
-0x6742 = 0x9780
-0x6743 = 0x9789
-0x6744 = 0x9795
-0x6745 = 0x9796
-0x6746 = 0x9797
-0x6747 = 0x9799
-0x6748 = 0x979A
-0x6749 = 0x979E
-0x674A = 0x979F
-0x674B = 0x97A2
-0x674C = 0x97AC
-0x674D = 0x97AE
-0x674E = 0x97B1
-0x674F = 0x97B2
-0x6750 = 0x97B5
-0x6751 = 0x97B6
-0x6752 = 0x97B8
-0x6753 = 0x97B9
-0x6754 = 0x97BA
-0x6755 = 0x97BC
-0x6756 = 0x97BE
-0x6757 = 0x97BF
-0x6758 = 0x97C1
-0x6759 = 0x97C4
-0x675A = 0x97C5
-0x675B = 0x97C7
-0x675C = 0x97C9
-0x675D = 0x97CA
-0x675E = 0x97CC
-0x675F = 0x97CD
-0x6760 = 0x97CE
-0x6761 = 0x97D0
-0x6762 = 0x97D1
-0x6763 = 0x97D4
-0x6764 = 0x97D7
-0x6765 = 0x97D8
-0x6766 = 0x97D9
-0x6767 = 0x97DD
-0x6768 = 0x97DE
-0x6769 = 0x97E0
-0x676A = 0x97DB
-0x676B = 0x97E1
-0x676C = 0x97E4
-0x676D = 0x97EF
-0x676E = 0x97F1
-0x676F = 0x97F4
-0x6770 = 0x97F7
-0x6771 = 0x97F8
-0x6772 = 0x97FA
-0x6773 = 0x9807
-0x6774 = 0x980A
-0x6775 = 0x9819
-0x6776 = 0x980D
-0x6777 = 0x980E
-0x6778 = 0x9814
-0x6779 = 0x9816
-0x677A = 0x981C
-0x677B = 0x981E
-0x677C = 0x9820
-0x677D = 0x9823
-0x677E = 0x9826
-0x6821 = 0x982B
-0x6822 = 0x982E
-0x6823 = 0x982F
-0x6824 = 0x9830
-0x6825 = 0x9832
-0x6826 = 0x9833
-0x6827 = 0x9835
-0x6828 = 0x9825
-0x6829 = 0x983E
-0x682A = 0x9844
-0x682B = 0x9847
-0x682C = 0x984A
-0x682D = 0x9851
-0x682E = 0x9852
-0x682F = 0x9853
-0x6830 = 0x9856
-0x6831 = 0x9857
-0x6832 = 0x9859
-0x6833 = 0x985A
-0x6834 = 0x9862
-0x6835 = 0x9863
-0x6836 = 0x9865
-0x6837 = 0x9866
-0x6838 = 0x986A
-0x6839 = 0x986C
-0x683A = 0x98AB
-0x683B = 0x98AD
-0x683C = 0x98AE
-0x683D = 0x98B0
-0x683E = 0x98B4
-0x683F = 0x98B7
-0x6840 = 0x98B8
-0x6841 = 0x98BA
-0x6842 = 0x98BB
-0x6843 = 0x98BF
-0x6844 = 0x98C2
-0x6845 = 0x98C5
-0x6846 = 0x98C8
-0x6847 = 0x98CC
-0x6848 = 0x98E1
-0x6849 = 0x98E3
-0x684A = 0x98E5
-0x684B = 0x98E6
-0x684C = 0x98E7
-0x684D = 0x98EA
-0x684E = 0x98F3
-0x684F = 0x98F6
-0x6850 = 0x9902
-0x6851 = 0x9907
-0x6852 = 0x9908
-0x6853 = 0x9911
-0x6854 = 0x9915
-0x6855 = 0x9916
-0x6856 = 0x9917
-0x6857 = 0x991A
-0x6858 = 0x991B
-0x6859 = 0x991C
-0x685A = 0x991F
-0x685B = 0x9922
-0x685C = 0x9926
-0x685D = 0x9927
-0x685E = 0x992B
-0x685F = 0x9931
-0x6860 = 0x9932
-0x6861 = 0x9933
-0x6862 = 0x9934
-0x6863 = 0x9935
-0x6864 = 0x9939
-0x6865 = 0x993A
-0x6866 = 0x993B
-0x6867 = 0x993C
-0x6868 = 0x9940
-0x6869 = 0x9941
-0x686A = 0x9946
-0x686B = 0x9947
-0x686C = 0x9948
-0x686D = 0x994D
-0x686E = 0x994E
-0x686F = 0x9954
-0x6870 = 0x9958
-0x6871 = 0x9959
-0x6872 = 0x995B
-0x6873 = 0x995C
-0x6874 = 0x995E
-0x6875 = 0x995F
-0x6876 = 0x9960
-0x6877 = 0x999B
-0x6878 = 0x999D
-0x6879 = 0x999F
-0x687A = 0x99A6
-0x687B = 0x99B0
-0x687C = 0x99B1
-0x687D = 0x99B2
-0x687E = 0x99B5
-0x6921 = 0x99B9
-0x6922 = 0x99BA
-0x6923 = 0x99BD
-0x6924 = 0x99BF
-0x6925 = 0x99C3
-0x6926 = 0x99C9
-0x6927 = 0x99D3
-0x6928 = 0x99D4
-0x6929 = 0x99D9
-0x692A = 0x99DA
-0x692B = 0x99DC
-0x692C = 0x99DE
-0x692D = 0x99E7
-0x692E = 0x99EA
-0x692F = 0x99EB
-0x6930 = 0x99EC
-0x6931 = 0x99F0
-0x6932 = 0x99F4
-0x6933 = 0x99F5
-0x6934 = 0x99F9
-0x6935 = 0x99FD
-0x6936 = 0x99FE
-0x6937 = 0x9A02
-0x6938 = 0x9A03
-0x6939 = 0x9A04
-0x693A = 0x9A0B
-0x693B = 0x9A0C
-0x693C = 0x9A10
-0x693D = 0x9A11
-0x693E = 0x9A16
-0x693F = 0x9A1E
-0x6940 = 0x9A20
-0x6941 = 0x9A22
-0x6942 = 0x9A23
-0x6943 = 0x9A24
-0x6944 = 0x9A27
-0x6945 = 0x9A2D
-0x6946 = 0x9A2E
-0x6947 = 0x9A33
-0x6948 = 0x9A35
-0x6949 = 0x9A36
-0x694A = 0x9A38
-0x694B = 0x9A47
-0x694C = 0x9A41
-0x694D = 0x9A44
-0x694E = 0x9A4A
-0x694F = 0x9A4B
-0x6950 = 0x9A4C
-0x6951 = 0x9A4E
-0x6952 = 0x9A51
-0x6953 = 0x9A54
-0x6954 = 0x9A56
-0x6955 = 0x9A5D
-0x6956 = 0x9AAA
-0x6957 = 0x9AAC
-0x6958 = 0x9AAE
-0x6959 = 0x9AAF
-0x695A = 0x9AB2
-0x695B = 0x9AB4
-0x695C = 0x9AB5
-0x695D = 0x9AB6
-0x695E = 0x9AB9
-0x695F = 0x9ABB
-0x6960 = 0x9ABE
-0x6961 = 0x9ABF
-0x6962 = 0x9AC1
-0x6963 = 0x9AC3
-0x6964 = 0x9AC6
-0x6965 = 0x9AC8
-0x6966 = 0x9ACE
-0x6967 = 0x9AD0
-0x6968 = 0x9AD2
-0x6969 = 0x9AD5
-0x696A = 0x9AD6
-0x696B = 0x9AD7
-0x696C = 0x9ADB
-0x696D = 0x9ADC
-0x696E = 0x9AE0
-0x696F = 0x9AE4
-0x6970 = 0x9AE5
-0x6971 = 0x9AE7
-0x6972 = 0x9AE9
-0x6973 = 0x9AEC
-0x6974 = 0x9AF2
-0x6975 = 0x9AF3
-0x6976 = 0x9AF5
-0x6977 = 0x9AF9
-0x6978 = 0x9AFA
-0x6979 = 0x9AFD
-0x697A = 0x9AFF
-0x697B = 0x9B00
-0x697C = 0x9B01
-0x697D = 0x9B02
-0x697E = 0x9B03
-0x6A21 = 0x9B04
-0x6A22 = 0x9B05
-0x6A23 = 0x9B08
-0x6A24 = 0x9B09
-0x6A25 = 0x9B0B
-0x6A26 = 0x9B0C
-0x6A27 = 0x9B0D
-0x6A28 = 0x9B0E
-0x6A29 = 0x9B10
-0x6A2A = 0x9B12
-0x6A2B = 0x9B16
-0x6A2C = 0x9B19
-0x6A2D = 0x9B1B
-0x6A2E = 0x9B1C
-0x6A2F = 0x9B20
-0x6A30 = 0x9B26
-0x6A31 = 0x9B2B
-0x6A32 = 0x9B2D
-0x6A33 = 0x9B33
-0x6A34 = 0x9B34
-0x6A35 = 0x9B35
-0x6A36 = 0x9B37
-0x6A37 = 0x9B39
-0x6A38 = 0x9B3A
-0x6A39 = 0x9B3D
-0x6A3A = 0x9B48
-0x6A3B = 0x9B4B
-0x6A3C = 0x9B4C
-0x6A3D = 0x9B55
-0x6A3E = 0x9B56
-0x6A3F = 0x9B57
-0x6A40 = 0x9B5B
-0x6A41 = 0x9B5E
-0x6A42 = 0x9B61
-0x6A43 = 0x9B63
-0x6A44 = 0x9B65
-0x6A45 = 0x9B66
-0x6A46 = 0x9B68
-0x6A47 = 0x9B6A
-0x6A48 = 0x9B6B
-0x6A49 = 0x9B6C
-0x6A4A = 0x9B6D
-0x6A4B = 0x9B6E
-0x6A4C = 0x9B73
-0x6A4D = 0x9B75
-0x6A4E = 0x9B77
-0x6A4F = 0x9B78
-0x6A50 = 0x9B79
-0x6A51 = 0x9B7F
-0x6A52 = 0x9B80
-0x6A53 = 0x9B84
-0x6A54 = 0x9B85
-0x6A55 = 0x9B86
-0x6A56 = 0x9B87
-0x6A57 = 0x9B89
-0x6A58 = 0x9B8A
-0x6A59 = 0x9B8B
-0x6A5A = 0x9B8D
-0x6A5B = 0x9B8F
-0x6A5C = 0x9B90
-0x6A5D = 0x9B94
-0x6A5E = 0x9B9A
-0x6A5F = 0x9B9D
-0x6A60 = 0x9B9E
-0x6A61 = 0x9BA6
-0x6A62 = 0x9BA7
-0x6A63 = 0x9BA9
-0x6A64 = 0x9BAC
-0x6A65 = 0x9BB0
-0x6A66 = 0x9BB1
-0x6A67 = 0x9BB2
-0x6A68 = 0x9BB7
-0x6A69 = 0x9BB8
-0x6A6A = 0x9BBB
-0x6A6B = 0x9BBC
-0x6A6C = 0x9BBE
-0x6A6D = 0x9BBF
-0x6A6E = 0x9BC1
-0x6A6F = 0x9BC7
-0x6A70 = 0x9BC8
-0x6A71 = 0x9BCE
-0x6A72 = 0x9BD0
-0x6A73 = 0x9BD7
-0x6A74 = 0x9BD8
-0x6A75 = 0x9BDD
-0x6A76 = 0x9BDF
-0x6A77 = 0x9BE5
-0x6A78 = 0x9BE7
-0x6A79 = 0x9BEA
-0x6A7A = 0x9BEB
-0x6A7B = 0x9BEF
-0x6A7C = 0x9BF3
-0x6A7D = 0x9BF7
-0x6A7E = 0x9BF8
-0x6B21 = 0x9BF9
-0x6B22 = 0x9BFA
-0x6B23 = 0x9BFD
-0x6B24 = 0x9BFF
-0x6B25 = 0x9C00
-0x6B26 = 0x9C02
-0x6B27 = 0x9C0B
-0x6B28 = 0x9C0F
-0x6B29 = 0x9C11
-0x6B2A = 0x9C16
-0x6B2B = 0x9C18
-0x6B2C = 0x9C19
-0x6B2D = 0x9C1A
-0x6B2E = 0x9C1C
-0x6B2F = 0x9C1E
-0x6B30 = 0x9C22
-0x6B31 = 0x9C23
-0x6B32 = 0x9C26
-0x6B33 = 0x9C27
-0x6B34 = 0x9C28
-0x6B35 = 0x9C29
-0x6B36 = 0x9C2A
-0x6B37 = 0x9C31
-0x6B38 = 0x9C35
-0x6B39 = 0x9C36
-0x6B3A = 0x9C37
-0x6B3B = 0x9C3D
-0x6B3C = 0x9C41
-0x6B3D = 0x9C43
-0x6B3E = 0x9C44
-0x6B3F = 0x9C45
-0x6B40 = 0x9C49
-0x6B41 = 0x9C4A
-0x6B42 = 0x9C4E
-0x6B43 = 0x9C4F
-0x6B44 = 0x9C50
-0x6B45 = 0x9C53
-0x6B46 = 0x9C54
-0x6B47 = 0x9C56
-0x6B48 = 0x9C58
-0x6B49 = 0x9C5B
-0x6B4A = 0x9C5D
-0x6B4B = 0x9C5E
-0x6B4C = 0x9C5F
-0x6B4D = 0x9C63
-0x6B4E = 0x9C69
-0x6B4F = 0x9C6A
-0x6B50 = 0x9C5C
-0x6B51 = 0x9C6B
-0x6B52 = 0x9C68
-0x6B53 = 0x9C6E
-0x6B54 = 0x9C70
-0x6B55 = 0x9C72
-0x6B56 = 0x9C75
-0x6B57 = 0x9C77
-0x6B58 = 0x9C7B
-0x6B59 = 0x9CE6
-0x6B5A = 0x9CF2
-0x6B5B = 0x9CF7
-0x6B5C = 0x9CF9
-0x6B5D = 0x9D0B
-0x6B5E = 0x9D02
-0x6B5F = 0x9D11
-0x6B60 = 0x9D17
-0x6B61 = 0x9D18
-0x6B62 = 0x9D1C
-0x6B63 = 0x9D1D
-0x6B64 = 0x9D1E
-0x6B65 = 0x9D2F
-0x6B66 = 0x9D30
-0x6B67 = 0x9D32
-0x6B68 = 0x9D33
-0x6B69 = 0x9D34
-0x6B6A = 0x9D3A
-0x6B6B = 0x9D3C
-0x6B6C = 0x9D45
-0x6B6D = 0x9D3D
-0x6B6E = 0x9D42
-0x6B6F = 0x9D43
-0x6B70 = 0x9D47
-0x6B71 = 0x9D4A
-0x6B72 = 0x9D53
-0x6B73 = 0x9D54
-0x6B74 = 0x9D5F
-0x6B75 = 0x9D63
-0x6B76 = 0x9D62
-0x6B77 = 0x9D65
-0x6B78 = 0x9D69
-0x6B79 = 0x9D6A
-0x6B7A = 0x9D6B
-0x6B7B = 0x9D70
-0x6B7C = 0x9D76
-0x6B7D = 0x9D77
-0x6B7E = 0x9D7B
-0x6C21 = 0x9D7C
-0x6C22 = 0x9D7E
-0x6C23 = 0x9D83
-0x6C24 = 0x9D84
-0x6C25 = 0x9D86
-0x6C26 = 0x9D8A
-0x6C27 = 0x9D8D
-0x6C28 = 0x9D8E
-0x6C29 = 0x9D92
-0x6C2A = 0x9D93
-0x6C2B = 0x9D95
-0x6C2C = 0x9D96
-0x6C2D = 0x9D97
-0x6C2E = 0x9D98
-0x6C2F = 0x9DA1
-0x6C30 = 0x9DAA
-0x6C31 = 0x9DAC
-0x6C32 = 0x9DAE
-0x6C33 = 0x9DB1
-0x6C34 = 0x9DB5
-0x6C35 = 0x9DB9
-0x6C36 = 0x9DBC
-0x6C37 = 0x9DBF
-0x6C38 = 0x9DC3
-0x6C39 = 0x9DC7
-0x6C3A = 0x9DC9
-0x6C3B = 0x9DCA
-0x6C3C = 0x9DD4
-0x6C3D = 0x9DD5
-0x6C3E = 0x9DD6
-0x6C3F = 0x9DD7
-0x6C40 = 0x9DDA
-0x6C41 = 0x9DDE
-0x6C42 = 0x9DDF
-0x6C43 = 0x9DE0
-0x6C44 = 0x9DE5
-0x6C45 = 0x9DE7
-0x6C46 = 0x9DE9
-0x6C47 = 0x9DEB
-0x6C48 = 0x9DEE
-0x6C49 = 0x9DF0
-0x6C4A = 0x9DF3
-0x6C4B = 0x9DF4
-0x6C4C = 0x9DFE
-0x6C4D = 0x9E0A
-0x6C4E = 0x9E02
-0x6C4F = 0x9E07
-0x6C50 = 0x9E0E
-0x6C51 = 0x9E10
-0x6C52 = 0x9E11
-0x6C53 = 0x9E12
-0x6C54 = 0x9E15
-0x6C55 = 0x9E16
-0x6C56 = 0x9E19
-0x6C57 = 0x9E1C
-0x6C58 = 0x9E1D
-0x6C59 = 0x9E7A
-0x6C5A = 0x9E7B
-0x6C5B = 0x9E7C
-0x6C5C = 0x9E80
-0x6C5D = 0x9E82
-0x6C5E = 0x9E83
-0x6C5F = 0x9E84
-0x6C60 = 0x9E85
-0x6C61 = 0x9E87
-0x6C62 = 0x9E8E
-0x6C63 = 0x9E8F
-0x6C64 = 0x9E96
-0x6C65 = 0x9E98
-0x6C66 = 0x9E9B
-0x6C67 = 0x9E9E
-0x6C68 = 0x9EA4
-0x6C69 = 0x9EA8
-0x6C6A = 0x9EAC
-0x6C6B = 0x9EAE
-0x6C6C = 0x9EAF
-0x6C6D = 0x9EB0
-0x6C6E = 0x9EB3
-0x6C6F = 0x9EB4
-0x6C70 = 0x9EB5
-0x6C71 = 0x9EC6
-0x6C72 = 0x9EC8
-0x6C73 = 0x9ECB
-0x6C74 = 0x9ED5
-0x6C75 = 0x9EDF
-0x6C76 = 0x9EE4
-0x6C77 = 0x9EE7
-0x6C78 = 0x9EEC
-0x6C79 = 0x9EED
-0x6C7A = 0x9EEE
-0x6C7B = 0x9EF0
-0x6C7C = 0x9EF1
-0x6C7D = 0x9EF2
-0x6C7E = 0x9EF5
-0x6D21 = 0x9EF8
-0x6D22 = 0x9EFF
-0x6D23 = 0x9F02
-0x6D24 = 0x9F03
-0x6D25 = 0x9F09
-0x6D26 = 0x9F0F
-0x6D27 = 0x9F10
-0x6D28 = 0x9F11
-0x6D29 = 0x9F12
-0x6D2A = 0x9F14
-0x6D2B = 0x9F16
-0x6D2C = 0x9F17
-0x6D2D = 0x9F19
-0x6D2E = 0x9F1A
-0x6D2F = 0x9F1B
-0x6D30 = 0x9F1F
-0x6D31 = 0x9F22
-0x6D32 = 0x9F26
-0x6D33 = 0x9F2A
-0x6D34 = 0x9F2B
-0x6D35 = 0x9F2F
-0x6D36 = 0x9F31
-0x6D37 = 0x9F32
-0x6D38 = 0x9F34
-0x6D39 = 0x9F37
-0x6D3A = 0x9F39
-0x6D3B = 0x9F3A
-0x6D3C = 0x9F3C
-0x6D3D = 0x9F3D
-0x6D3E = 0x9F3F
-0x6D3F = 0x9F41
-0x6D40 = 0x9F43
-0x6D41 = 0x9F44
-0x6D42 = 0x9F45
-0x6D43 = 0x9F46
-0x6D44 = 0x9F47
-0x6D45 = 0x9F53
-0x6D46 = 0x9F55
-0x6D47 = 0x9F56
-0x6D48 = 0x9F57
-0x6D49 = 0x9F58
-0x6D4A = 0x9F5A
-0x6D4B = 0x9F5D
-0x6D4C = 0x9F5E
-0x6D4D = 0x9F68
-0x6D4E = 0x9F69
-0x6D4F = 0x9F6D
-0x6D50 = 0x9F6E
-0x6D51 = 0x9F6F
-0x6D52 = 0x9F70
-0x6D53 = 0x9F71
-0x6D54 = 0x9F73
-0x6D55 = 0x9F75
-0x6D56 = 0x9F7A
-0x6D57 = 0x9F7D
-0x6D58 = 0x9F8F
-0x6D59 = 0x9F90
-0x6D5A = 0x9F91
-0x6D5B = 0x9F92
-0x6D5C = 0x9F94
-0x6D5D = 0x9F96
-0x6D5E = 0x9F97
-0x6D5F = 0x9F9E
-0x6D60 = 0x9FA1
-0x6D61 = 0x9FA2
-0x6D62 = 0x9FA3
-0x6D63 = 0x9FA5
-END_MAP
diff --git a/enc/trans/JIS/JISX0212@MS%UCS.src b/enc/trans/JIS/JISX0212@MS%UCS.src
deleted file mode 100644
index cd05e26d3a..0000000000
--- a/enc/trans/JIS/JISX0212@MS%UCS.src
+++ /dev/null
@@ -1,6081 +0,0 @@
-# $NetBSD: JISX0212@MS%UCS.src,v 1.1 2003/07/19 20:20:41 tshiozak Exp $
-
-TYPE ROWCOL
-NAME "JISX0212:MS/UCS"
-SRC_ZONE 0x21-0x7E / 0x21-0x7E / 8
-OOB_MODE ILSEQ
-DST_ILSEQ 0xFFFE
-DST_UNIT_BITS 16
-
-BEGIN_MAP
-#
-# This data is derived from http://www.opengroup.or.jp/jvc/cde/
-#
-0x222F = 0x02D8
-0x2230 = 0x02C7
-0x2231 = 0x00B8
-0x2232 = 0x02D9
-0x2233 = 0x02DD
-0x2234 = 0x00AF
-0x2235 = 0x02DB
-0x2236 = 0x02DA
-0x2237 = 0xFF5E
-0x2238 = 0x0384
-0x2239 = 0x0385
-0x2242 = 0x00A1
-0x2243 = 0xFFE4
-0x2244 = 0x00BF
-0x226B = 0x00BA
-0x226C = 0x00AA
-0x226D = 0x00A9
-0x226E = 0x00AE
-0x226F = 0x2122
-0x2270 = 0x00A4
-0x2271 = 0x2116
-0x2661 = 0x0386
-0x2662 = 0x0388
-0x2663 = 0x0389
-0x2664 = 0x038A
-0x2665 = 0x03AA
-0x2667 = 0x038C
-0x2669 = 0x038E
-0x266A = 0x03AB
-0x266C = 0x038F
-0x2671 = 0x03AC
-0x2672 = 0x03AD
-0x2673 = 0x03AE
-0x2674 = 0x03AF
-0x2675 = 0x03CA
-0x2676 = 0x0390
-0x2677 = 0x03CC
-0x2678 = 0x03C2
-0x2679 = 0x03CD
-0x267A = 0x03CB
-0x267B = 0x03B0
-0x267C = 0x03CE
-0x2742 = 0x0402
-0x2743 = 0x0403
-0x2744 = 0x0404
-0x2745 = 0x0405
-0x2746 = 0x0406
-0x2747 = 0x0407
-0x2748 = 0x0408
-0x2749 = 0x0409
-0x274A = 0x040A
-0x274B = 0x040B
-0x274C = 0x040C
-0x274D = 0x040E
-0x274E = 0x040F
-0x2772 = 0x0452
-0x2773 = 0x0453
-0x2774 = 0x0454
-0x2775 = 0x0455
-0x2776 = 0x0456
-0x2777 = 0x0457
-0x2778 = 0x0458
-0x2779 = 0x0459
-0x277A = 0x045A
-0x277B = 0x045B
-0x277C = 0x045C
-0x277D = 0x045E
-0x277E = 0x045F
-0x2921 = 0x00C6
-0x2922 = 0x0110
-0x2924 = 0x0126
-0x2926 = 0x0132
-0x2928 = 0x0141
-0x2929 = 0x013F
-0x292B = 0x014A
-0x292C = 0x00D8
-0x292D = 0x0152
-0x292F = 0x0166
-0x2930 = 0x00DE
-0x2941 = 0x00E6
-0x2942 = 0x0111
-0x2943 = 0x00F0
-0x2944 = 0x0127
-0x2945 = 0x0131
-0x2946 = 0x0133
-0x2947 = 0x0138
-0x2948 = 0x0142
-0x2949 = 0x0140
-0x294A = 0x0149
-0x294B = 0x014B
-0x294C = 0x00F8
-0x294D = 0x0153
-0x294E = 0x00DF
-0x294F = 0x0167
-0x2950 = 0x00FE
-0x2A21 = 0x00C1
-0x2A22 = 0x00C0
-0x2A23 = 0x00C4
-0x2A24 = 0x00C2
-0x2A25 = 0x0102
-0x2A26 = 0x01CD
-0x2A27 = 0x0100
-0x2A28 = 0x0104
-0x2A29 = 0x00C5
-0x2A2A = 0x00C3
-0x2A2B = 0x0106
-0x2A2C = 0x0108
-0x2A2D = 0x010C
-0x2A2E = 0x00C7
-0x2A2F = 0x010A
-0x2A30 = 0x010E
-0x2A31 = 0x00C9
-0x2A32 = 0x00C8
-0x2A33 = 0x00CB
-0x2A34 = 0x00CA
-0x2A35 = 0x011A
-0x2A36 = 0x0116
-0x2A37 = 0x0112
-0x2A38 = 0x0118
-0x2A3A = 0x011C
-0x2A3B = 0x011E
-0x2A3C = 0x0122
-0x2A3D = 0x0120
-0x2A3E = 0x0124
-0x2A3F = 0x00CD
-0x2A40 = 0x00CC
-0x2A41 = 0x00CF
-0x2A42 = 0x00CE
-0x2A43 = 0x01CF
-0x2A44 = 0x0130
-0x2A45 = 0x012A
-0x2A46 = 0x012E
-0x2A47 = 0x0128
-0x2A48 = 0x0134
-0x2A49 = 0x0136
-0x2A4A = 0x0139
-0x2A4B = 0x013D
-0x2A4C = 0x013B
-0x2A4D = 0x0143
-0x2A4E = 0x0147
-0x2A4F = 0x0145
-0x2A50 = 0x00D1
-0x2A51 = 0x00D3
-0x2A52 = 0x00D2
-0x2A53 = 0x00D6
-0x2A54 = 0x00D4
-0x2A55 = 0x01D1
-0x2A56 = 0x0150
-0x2A57 = 0x014C
-0x2A58 = 0x00D5
-0x2A59 = 0x0154
-0x2A5A = 0x0158
-0x2A5B = 0x0156
-0x2A5C = 0x015A
-0x2A5D = 0x015C
-0x2A5E = 0x0160
-0x2A5F = 0x015E
-0x2A60 = 0x0164
-0x2A61 = 0x0162
-0x2A62 = 0x00DA
-0x2A63 = 0x00D9
-0x2A64 = 0x00DC
-0x2A65 = 0x00DB
-0x2A66 = 0x016C
-0x2A67 = 0x01D3
-0x2A68 = 0x0170
-0x2A69 = 0x016A
-0x2A6A = 0x0172
-0x2A6B = 0x016E
-0x2A6C = 0x0168
-0x2A6D = 0x01D7
-0x2A6E = 0x01DB
-0x2A6F = 0x01D9
-0x2A70 = 0x01D5
-0x2A71 = 0x0174
-0x2A72 = 0x00DD
-0x2A73 = 0x0178
-0x2A74 = 0x0176
-0x2A75 = 0x0179
-0x2A76 = 0x017D
-0x2A77 = 0x017B
-0x2B21 = 0x00E1
-0x2B22 = 0x00E0
-0x2B23 = 0x00E4
-0x2B24 = 0x00E2
-0x2B25 = 0x0103
-0x2B26 = 0x01CE
-0x2B27 = 0x0101
-0x2B28 = 0x0105
-0x2B29 = 0x00E5
-0x2B2A = 0x00E3
-0x2B2B = 0x0107
-0x2B2C = 0x0109
-0x2B2D = 0x010D
-0x2B2E = 0x00E7
-0x2B2F = 0x010B
-0x2B30 = 0x010F
-0x2B31 = 0x00E9
-0x2B32 = 0x00E8
-0x2B33 = 0x00EB
-0x2B34 = 0x00EA
-0x2B35 = 0x011B
-0x2B36 = 0x0117
-0x2B37 = 0x0113
-0x2B38 = 0x0119
-0x2B39 = 0x01F5
-0x2B3A = 0x011D
-0x2B3B = 0x011F
-0x2B3D = 0x0121
-0x2B3E = 0x0125
-0x2B3F = 0x00ED
-0x2B40 = 0x00EC
-0x2B41 = 0x00EF
-0x2B42 = 0x00EE
-0x2B43 = 0x01D0
-0x2B45 = 0x012B
-0x2B46 = 0x012F
-0x2B47 = 0x0129
-0x2B48 = 0x0135
-0x2B49 = 0x0137
-0x2B4A = 0x013A
-0x2B4B = 0x013E
-0x2B4C = 0x013C
-0x2B4D = 0x0144
-0x2B4E = 0x0148
-0x2B4F = 0x0146
-0x2B50 = 0x00F1
-0x2B51 = 0x00F3
-0x2B52 = 0x00F2
-0x2B53 = 0x00F6
-0x2B54 = 0x00F4
-0x2B55 = 0x01D2
-0x2B56 = 0x0151
-0x2B57 = 0x014D
-0x2B58 = 0x00F5
-0x2B59 = 0x0155
-0x2B5A = 0x0159
-0x2B5B = 0x0157
-0x2B5C = 0x015B
-0x2B5D = 0x015D
-0x2B5E = 0x0161
-0x2B5F = 0x015F
-0x2B60 = 0x0165
-0x2B61 = 0x0163
-0x2B62 = 0x00FA
-0x2B63 = 0x00F9
-0x2B64 = 0x00FC
-0x2B65 = 0x00FB
-0x2B66 = 0x016D
-0x2B67 = 0x01D4
-0x2B68 = 0x0171
-0x2B69 = 0x016B
-0x2B6A = 0x0173
-0x2B6B = 0x016F
-0x2B6C = 0x0169
-0x2B6D = 0x01D8
-0x2B6E = 0x01DC
-0x2B6F = 0x01DA
-0x2B70 = 0x01D6
-0x2B71 = 0x0175
-0x2B72 = 0x00FD
-0x2B73 = 0x00FF
-0x2B74 = 0x0177
-0x2B75 = 0x017A
-0x2B76 = 0x017E
-0x2B77 = 0x017C
-0x3021 = 0x4E02
-0x3022 = 0x4E04
-0x3023 = 0x4E05
-0x3024 = 0x4E0C
-0x3025 = 0x4E12
-0x3026 = 0x4E1F
-0x3027 = 0x4E23
-0x3028 = 0x4E24
-0x3029 = 0x4E28
-0x302A = 0x4E2B
-0x302B = 0x4E2E
-0x302C = 0x4E2F
-0x302D = 0x4E30
-0x302E = 0x4E35
-0x302F = 0x4E40
-0x3030 = 0x4E41
-0x3031 = 0x4E44
-0x3032 = 0x4E47
-0x3033 = 0x4E51
-0x3034 = 0x4E5A
-0x3035 = 0x4E5C
-0x3036 = 0x4E63
-0x3037 = 0x4E68
-0x3038 = 0x4E69
-0x3039 = 0x4E74
-0x303A = 0x4E75
-0x303B = 0x4E79
-0x303C = 0x4E7F
-0x303D = 0x4E8D
-0x303E = 0x4E96
-0x303F = 0x4E97
-0x3040 = 0x4E9D
-0x3041 = 0x4EAF
-0x3042 = 0x4EB9
-0x3043 = 0x4EC3
-0x3044 = 0x4ED0
-0x3045 = 0x4EDA
-0x3046 = 0x4EDB
-0x3047 = 0x4EE0
-0x3048 = 0x4EE1
-0x3049 = 0x4EE2
-0x304A = 0x4EE8
-0x304B = 0x4EEF
-0x304C = 0x4EF1
-0x304D = 0x4EF3
-0x304E = 0x4EF5
-0x304F = 0x4EFD
-0x3050 = 0x4EFE
-0x3051 = 0x4EFF
-0x3052 = 0x4F00
-0x3053 = 0x4F02
-0x3054 = 0x4F03
-0x3055 = 0x4F08
-0x3056 = 0x4F0B
-0x3057 = 0x4F0C
-0x3058 = 0x4F12
-0x3059 = 0x4F15
-0x305A = 0x4F16
-0x305B = 0x4F17
-0x305C = 0x4F19
-0x305D = 0x4F2E
-0x305E = 0x4F31
-0x305F = 0x4F60
-0x3060 = 0x4F33
-0x3061 = 0x4F35
-0x3062 = 0x4F37
-0x3063 = 0x4F39
-0x3064 = 0x4F3B
-0x3065 = 0x4F3E
-0x3066 = 0x4F40
-0x3067 = 0x4F42
-0x3068 = 0x4F48
-0x3069 = 0x4F49
-0x306A = 0x4F4B
-0x306B = 0x4F4C
-0x306C = 0x4F52
-0x306D = 0x4F54
-0x306E = 0x4F56
-0x306F = 0x4F58
-0x3070 = 0x4F5F
-0x3071 = 0x4F63
-0x3072 = 0x4F6A
-0x3073 = 0x4F6C
-0x3074 = 0x4F6E
-0x3075 = 0x4F71
-0x3076 = 0x4F77
-0x3077 = 0x4F78
-0x3078 = 0x4F79
-0x3079 = 0x4F7A
-0x307A = 0x4F7D
-0x307B = 0x4F7E
-0x307C = 0x4F81
-0x307D = 0x4F82
-0x307E = 0x4F84
-0x3121 = 0x4F85
-0x3122 = 0x4F89
-0x3123 = 0x4F8A
-0x3124 = 0x4F8C
-0x3125 = 0x4F8E
-0x3126 = 0x4F90
-0x3127 = 0x4F92
-0x3128 = 0x4F93
-0x3129 = 0x4F94
-0x312A = 0x4F97
-0x312B = 0x4F99
-0x312C = 0x4F9A
-0x312D = 0x4F9E
-0x312E = 0x4F9F
-0x312F = 0x4FB2
-0x3130 = 0x4FB7
-0x3131 = 0x4FB9
-0x3132 = 0x4FBB
-0x3133 = 0x4FBC
-0x3134 = 0x4FBD
-0x3135 = 0x4FBE
-0x3136 = 0x4FC0
-0x3137 = 0x4FC1
-0x3138 = 0x4FC5
-0x3139 = 0x4FC6
-0x313A = 0x4FC8
-0x313B = 0x4FC9
-0x313C = 0x4FCB
-0x313D = 0x4FCC
-0x313E = 0x4FCD
-0x313F = 0x4FCF
-0x3140 = 0x4FD2
-0x3141 = 0x4FDC
-0x3142 = 0x4FE0
-0x3143 = 0x4FE2
-0x3144 = 0x4FF0
-0x3145 = 0x4FF2
-0x3146 = 0x4FFC
-0x3147 = 0x4FFD
-0x3148 = 0x4FFF
-0x3149 = 0x5000
-0x314A = 0x5001
-0x314B = 0x5004
-0x314C = 0x5007
-0x314D = 0x500A
-0x314E = 0x500C
-0x314F = 0x500E
-0x3150 = 0x5010
-0x3151 = 0x5013
-0x3152 = 0x5017
-0x3153 = 0x5018
-0x3154 = 0x501B
-0x3155 = 0x501C
-0x3156 = 0x501D
-0x3157 = 0x501E
-0x3158 = 0x5022
-0x3159 = 0x5027
-0x315A = 0x502E
-0x315B = 0x5030
-0x315C = 0x5032
-0x315D = 0x5033
-0x315E = 0x5035
-0x315F = 0x5040
-0x3160 = 0x5041
-0x3161 = 0x5042
-0x3162 = 0x5045
-0x3163 = 0x5046
-0x3164 = 0x504A
-0x3165 = 0x504C
-0x3166 = 0x504E
-0x3167 = 0x5051
-0x3168 = 0x5052
-0x3169 = 0x5053
-0x316A = 0x5057
-0x316B = 0x5059
-0x316C = 0x505F
-0x316D = 0x5060
-0x316E = 0x5062
-0x316F = 0x5063
-0x3170 = 0x5066
-0x3171 = 0x5067
-0x3172 = 0x506A
-0x3173 = 0x506D
-0x3174 = 0x5070
-0x3175 = 0x5071
-0x3176 = 0x503B
-0x3177 = 0x5081
-0x3178 = 0x5083
-0x3179 = 0x5084
-0x317A = 0x5086
-0x317B = 0x508A
-0x317C = 0x508E
-0x317D = 0x508F
-0x317E = 0x5090
-0x3221 = 0x5092
-0x3222 = 0x5093
-0x3223 = 0x5094
-0x3224 = 0x5096
-0x3225 = 0x509B
-0x3226 = 0x509C
-0x3227 = 0x509E
-0x3228 = 0x509F
-0x3229 = 0x50A0
-0x322A = 0x50A1
-0x322B = 0x50A2
-0x322C = 0x50AA
-0x322D = 0x50AF
-0x322E = 0x50B0
-0x322F = 0x50B9
-0x3230 = 0x50BA
-0x3231 = 0x50BD
-0x3232 = 0x50C0
-0x3233 = 0x50C3
-0x3234 = 0x50C4
-0x3235 = 0x50C7
-0x3236 = 0x50CC
-0x3237 = 0x50CE
-0x3238 = 0x50D0
-0x3239 = 0x50D3
-0x323A = 0x50D4
-0x323B = 0x50D8
-0x323C = 0x50DC
-0x323D = 0x50DD
-0x323E = 0x50DF
-0x323F = 0x50E2
-0x3240 = 0x50E4
-0x3241 = 0x50E6
-0x3242 = 0x50E8
-0x3243 = 0x50E9
-0x3244 = 0x50EF
-0x3245 = 0x50F1
-0x3246 = 0x50F6
-0x3247 = 0x50FA
-0x3248 = 0x50FE
-0x3249 = 0x5103
-0x324A = 0x5106
-0x324B = 0x5107
-0x324C = 0x5108
-0x324D = 0x510B
-0x324E = 0x510C
-0x324F = 0x510D
-0x3250 = 0x510E
-0x3251 = 0x50F2
-0x3252 = 0x5110
-0x3253 = 0x5117
-0x3254 = 0x5119
-0x3255 = 0x511B
-0x3256 = 0x511C
-0x3257 = 0x511D
-0x3258 = 0x511E
-0x3259 = 0x5123
-0x325A = 0x5127
-0x325B = 0x5128
-0x325C = 0x512C
-0x325D = 0x512D
-0x325E = 0x512F
-0x325F = 0x5131
-0x3260 = 0x5133
-0x3261 = 0x5134
-0x3262 = 0x5135
-0x3263 = 0x5138
-0x3264 = 0x5139
-0x3265 = 0x5142
-0x3266 = 0x514A
-0x3267 = 0x514F
-0x3268 = 0x5153
-0x3269 = 0x5155
-0x326A = 0x5157
-0x326B = 0x5158
-0x326C = 0x515F
-0x326D = 0x5164
-0x326E = 0x5166
-0x326F = 0x517E
-0x3270 = 0x5183
-0x3271 = 0x5184
-0x3272 = 0x518B
-0x3273 = 0x518E
-0x3274 = 0x5198
-0x3275 = 0x519D
-0x3276 = 0x51A1
-0x3277 = 0x51A3
-0x3278 = 0x51AD
-0x3279 = 0x51B8
-0x327A = 0x51BA
-0x327B = 0x51BC
-0x327C = 0x51BE
-0x327D = 0x51BF
-0x327E = 0x51C2
-0x3321 = 0x51C8
-0x3322 = 0x51CF
-0x3323 = 0x51D1
-0x3324 = 0x51D2
-0x3325 = 0x51D3
-0x3326 = 0x51D5
-0x3327 = 0x51D8
-0x3328 = 0x51DE
-0x3329 = 0x51E2
-0x332A = 0x51E5
-0x332B = 0x51EE
-0x332C = 0x51F2
-0x332D = 0x51F3
-0x332E = 0x51F4
-0x332F = 0x51F7
-0x3330 = 0x5201
-0x3331 = 0x5202
-0x3332 = 0x5205
-0x3333 = 0x5212
-0x3334 = 0x5213
-0x3335 = 0x5215
-0x3336 = 0x5216
-0x3337 = 0x5218
-0x3338 = 0x5222
-0x3339 = 0x5228
-0x333A = 0x5231
-0x333B = 0x5232
-0x333C = 0x5235
-0x333D = 0x523C
-0x333E = 0x5245
-0x333F = 0x5249
-0x3340 = 0x5255
-0x3341 = 0x5257
-0x3342 = 0x5258
-0x3343 = 0x525A
-0x3344 = 0x525C
-0x3345 = 0x525F
-0x3346 = 0x5260
-0x3347 = 0x5261
-0x3348 = 0x5266
-0x3349 = 0x526E
-0x334A = 0x5277
-0x334B = 0x5278
-0x334C = 0x5279
-0x334D = 0x5280
-0x334E = 0x5282
-0x334F = 0x5285
-0x3350 = 0x528A
-0x3351 = 0x528C
-0x3352 = 0x5293
-0x3353 = 0x5295
-0x3354 = 0x5296
-0x3355 = 0x5297
-0x3356 = 0x5298
-0x3357 = 0x529A
-0x3358 = 0x529C
-0x3359 = 0x52A4
-0x335A = 0x52A5
-0x335B = 0x52A6
-0x335C = 0x52A7
-0x335D = 0x52AF
-0x335E = 0x52B0
-0x335F = 0x52B6
-0x3360 = 0x52B7
-0x3361 = 0x52B8
-0x3362 = 0x52BA
-0x3363 = 0x52BB
-0x3364 = 0x52BD
-0x3365 = 0x52C0
-0x3366 = 0x52C4
-0x3367 = 0x52C6
-0x3368 = 0x52C8
-0x3369 = 0x52CC
-0x336A = 0x52CF
-0x336B = 0x52D1
-0x336C = 0x52D4
-0x336D = 0x52D6
-0x336E = 0x52DB
-0x336F = 0x52DC
-0x3370 = 0x52E1
-0x3371 = 0x52E5
-0x3372 = 0x52E8
-0x3373 = 0x52E9
-0x3374 = 0x52EA
-0x3375 = 0x52EC
-0x3376 = 0x52F0
-0x3377 = 0x52F1
-0x3378 = 0x52F4
-0x3379 = 0x52F6
-0x337A = 0x52F7
-0x337B = 0x5300
-0x337C = 0x5303
-0x337D = 0x530A
-0x337E = 0x530B
-0x3421 = 0x530C
-0x3422 = 0x5311
-0x3423 = 0x5313
-0x3424 = 0x5318
-0x3425 = 0x531B
-0x3426 = 0x531C
-0x3427 = 0x531E
-0x3428 = 0x531F
-0x3429 = 0x5325
-0x342A = 0x5327
-0x342B = 0x5328
-0x342C = 0x5329
-0x342D = 0x532B
-0x342E = 0x532C
-0x342F = 0x532D
-0x3430 = 0x5330
-0x3431 = 0x5332
-0x3432 = 0x5335
-0x3433 = 0x533C
-0x3434 = 0x533D
-0x3435 = 0x533E
-0x3436 = 0x5342
-0x3437 = 0x534C
-0x3438 = 0x534B
-0x3439 = 0x5359
-0x343A = 0x535B
-0x343B = 0x5361
-0x343C = 0x5363
-0x343D = 0x5365
-0x343E = 0x536C
-0x343F = 0x536D
-0x3440 = 0x5372
-0x3441 = 0x5379
-0x3442 = 0x537E
-0x3443 = 0x5383
-0x3444 = 0x5387
-0x3445 = 0x5388
-0x3446 = 0x538E
-0x3447 = 0x5393
-0x3448 = 0x5394
-0x3449 = 0x5399
-0x344A = 0x539D
-0x344B = 0x53A1
-0x344C = 0x53A4
-0x344D = 0x53AA
-0x344E = 0x53AB
-0x344F = 0x53AF
-0x3450 = 0x53B2
-0x3451 = 0x53B4
-0x3452 = 0x53B5
-0x3453 = 0x53B7
-0x3454 = 0x53B8
-0x3455 = 0x53BA
-0x3456 = 0x53BD
-0x3457 = 0x53C0
-0x3458 = 0x53C5
-0x3459 = 0x53CF
-0x345A = 0x53D2
-0x345B = 0x53D3
-0x345C = 0x53D5
-0x345D = 0x53DA
-0x345E = 0x53DD
-0x345F = 0x53DE
-0x3460 = 0x53E0
-0x3461 = 0x53E6
-0x3462 = 0x53E7
-0x3463 = 0x53F5
-0x3464 = 0x5402
-0x3465 = 0x5413
-0x3466 = 0x541A
-0x3467 = 0x5421
-0x3468 = 0x5427
-0x3469 = 0x5428
-0x346A = 0x542A
-0x346B = 0x542F
-0x346C = 0x5431
-0x346D = 0x5434
-0x346E = 0x5435
-0x346F = 0x5443
-0x3470 = 0x5444
-0x3471 = 0x5447
-0x3472 = 0x544D
-0x3473 = 0x544F
-0x3474 = 0x545E
-0x3475 = 0x5462
-0x3476 = 0x5464
-0x3477 = 0x5466
-0x3478 = 0x5467
-0x3479 = 0x5469
-0x347A = 0x546B
-0x347B = 0x546D
-0x347C = 0x546E
-0x347D = 0x5474
-0x347E = 0x547F
-0x3521 = 0x5481
-0x3522 = 0x5483
-0x3523 = 0x5485
-0x3524 = 0x5488
-0x3525 = 0x5489
-0x3526 = 0x548D
-0x3527 = 0x5491
-0x3528 = 0x5495
-0x3529 = 0x5496
-0x352A = 0x549C
-0x352B = 0x549F
-0x352C = 0x54A1
-0x352D = 0x54A6
-0x352E = 0x54A7
-0x352F = 0x54A9
-0x3530 = 0x54AA
-0x3531 = 0x54AD
-0x3532 = 0x54AE
-0x3533 = 0x54B1
-0x3534 = 0x54B7
-0x3535 = 0x54B9
-0x3536 = 0x54BA
-0x3537 = 0x54BB
-0x3538 = 0x54BF
-0x3539 = 0x54C6
-0x353A = 0x54CA
-0x353B = 0x54CD
-0x353C = 0x54CE
-0x353D = 0x54E0
-0x353E = 0x54EA
-0x353F = 0x54EC
-0x3540 = 0x54EF
-0x3541 = 0x54F6
-0x3542 = 0x54FC
-0x3543 = 0x54FE
-0x3544 = 0x54FF
-0x3545 = 0x5500
-0x3546 = 0x5501
-0x3547 = 0x5505
-0x3548 = 0x5508
-0x3549 = 0x5509
-0x354A = 0x550C
-0x354B = 0x550D
-0x354C = 0x550E
-0x354D = 0x5515
-0x354E = 0x552A
-0x354F = 0x552B
-0x3550 = 0x5532
-0x3551 = 0x5535
-0x3552 = 0x5536
-0x3553 = 0x553B
-0x3554 = 0x553C
-0x3555 = 0x553D
-0x3556 = 0x5541
-0x3557 = 0x5547
-0x3558 = 0x5549
-0x3559 = 0x554A
-0x355A = 0x554D
-0x355B = 0x5550
-0x355C = 0x5551
-0x355D = 0x5558
-0x355E = 0x555A
-0x355F = 0x555B
-0x3560 = 0x555E
-0x3561 = 0x5560
-0x3562 = 0x5561
-0x3563 = 0x5564
-0x3564 = 0x5566
-0x3565 = 0x557F
-0x3566 = 0x5581
-0x3567 = 0x5582
-0x3568 = 0x5586
-0x3569 = 0x5588
-0x356A = 0x558E
-0x356B = 0x558F
-0x356C = 0x5591
-0x356D = 0x5592
-0x356E = 0x5593
-0x356F = 0x5594
-0x3570 = 0x5597
-0x3571 = 0x55A3
-0x3572 = 0x55A4
-0x3573 = 0x55AD
-0x3574 = 0x55B2
-0x3575 = 0x55BF
-0x3576 = 0x55C1
-0x3577 = 0x55C3
-0x3578 = 0x55C6
-0x3579 = 0x55C9
-0x357A = 0x55CB
-0x357B = 0x55CC
-0x357C = 0x55CE
-0x357D = 0x55D1
-0x357E = 0x55D2
-0x3621 = 0x55D3
-0x3622 = 0x55D7
-0x3623 = 0x55D8
-0x3624 = 0x55DB
-0x3625 = 0x55DE
-0x3626 = 0x55E2
-0x3627 = 0x55E9
-0x3628 = 0x55F6
-0x3629 = 0x55FF
-0x362A = 0x5605
-0x362B = 0x5608
-0x362C = 0x560A
-0x362D = 0x560D
-0x362E = 0x560E
-0x362F = 0x560F
-0x3630 = 0x5610
-0x3631 = 0x5611
-0x3632 = 0x5612
-0x3633 = 0x5619
-0x3634 = 0x562C
-0x3635 = 0x5630
-0x3636 = 0x5633
-0x3637 = 0x5635
-0x3638 = 0x5637
-0x3639 = 0x5639
-0x363A = 0x563B
-0x363B = 0x563C
-0x363C = 0x563D
-0x363D = 0x563F
-0x363E = 0x5640
-0x363F = 0x5641
-0x3640 = 0x5643
-0x3641 = 0x5644
-0x3642 = 0x5646
-0x3643 = 0x5649
-0x3644 = 0x564B
-0x3645 = 0x564D
-0x3646 = 0x564F
-0x3647 = 0x5654
-0x3648 = 0x565E
-0x3649 = 0x5660
-0x364A = 0x5661
-0x364B = 0x5662
-0x364C = 0x5663
-0x364D = 0x5666
-0x364E = 0x5669
-0x364F = 0x566D
-0x3650 = 0x566F
-0x3651 = 0x5671
-0x3652 = 0x5672
-0x3653 = 0x5675
-0x3654 = 0x5684
-0x3655 = 0x5685
-0x3656 = 0x5688
-0x3657 = 0x568B
-0x3658 = 0x568C
-0x3659 = 0x5695
-0x365A = 0x5699
-0x365B = 0x569A
-0x365C = 0x569D
-0x365D = 0x569E
-0x365E = 0x569F
-0x365F = 0x56A6
-0x3660 = 0x56A7
-0x3661 = 0x56A8
-0x3662 = 0x56A9
-0x3663 = 0x56AB
-0x3664 = 0x56AC
-0x3665 = 0x56AD
-0x3666 = 0x56B1
-0x3667 = 0x56B3
-0x3668 = 0x56B7
-0x3669 = 0x56BE
-0x366A = 0x56C5
-0x366B = 0x56C9
-0x366C = 0x56CA
-0x366D = 0x56CB
-0x366E = 0x56CF
-0x366F = 0x56D0
-0x3670 = 0x56CC
-0x3671 = 0x56CD
-0x3672 = 0x56D9
-0x3673 = 0x56DC
-0x3674 = 0x56DD
-0x3675 = 0x56DF
-0x3676 = 0x56E1
-0x3677 = 0x56E4
-0x3678 = 0x56E5
-0x3679 = 0x56E6
-0x367A = 0x56E7
-0x367B = 0x56E8
-0x367C = 0x56F1
-0x367D = 0x56EB
-0x367E = 0x56ED
-0x3721 = 0x56F6
-0x3722 = 0x56F7
-0x3723 = 0x5701
-0x3724 = 0x5702
-0x3725 = 0x5707
-0x3726 = 0x570A
-0x3727 = 0x570C
-0x3728 = 0x5711
-0x3729 = 0x5715
-0x372A = 0x571A
-0x372B = 0x571B
-0x372C = 0x571D
-0x372D = 0x5720
-0x372E = 0x5722
-0x372F = 0x5723
-0x3730 = 0x5724
-0x3731 = 0x5725
-0x3732 = 0x5729
-0x3733 = 0x572A
-0x3734 = 0x572C
-0x3735 = 0x572E
-0x3736 = 0x572F
-0x3737 = 0x5733
-0x3738 = 0x5734
-0x3739 = 0x573D
-0x373A = 0x573E
-0x373B = 0x573F
-0x373C = 0x5745
-0x373D = 0x5746
-0x373E = 0x574C
-0x373F = 0x574D
-0x3740 = 0x5752
-0x3741 = 0x5762
-0x3742 = 0x5765
-0x3743 = 0x5767
-0x3744 = 0x5768
-0x3745 = 0x576B
-0x3746 = 0x576D
-0x3747 = 0x576E
-0x3748 = 0x576F
-0x3749 = 0x5770
-0x374A = 0x5771
-0x374B = 0x5773
-0x374C = 0x5774
-0x374D = 0x5775
-0x374E = 0x5777
-0x374F = 0x5779
-0x3750 = 0x577A
-0x3751 = 0x577B
-0x3752 = 0x577C
-0x3753 = 0x577E
-0x3754 = 0x5781
-0x3755 = 0x5783
-0x3756 = 0x578C
-0x3757 = 0x5794
-0x3758 = 0x5797
-0x3759 = 0x5799
-0x375A = 0x579A
-0x375B = 0x579C
-0x375C = 0x579D
-0x375D = 0x579E
-0x375E = 0x579F
-0x375F = 0x57A1
-0x3760 = 0x5795
-0x3761 = 0x57A7
-0x3762 = 0x57A8
-0x3763 = 0x57A9
-0x3764 = 0x57AC
-0x3765 = 0x57B8
-0x3766 = 0x57BD
-0x3767 = 0x57C7
-0x3768 = 0x57C8
-0x3769 = 0x57CC
-0x376A = 0x57CF
-0x376B = 0x57D5
-0x376C = 0x57DD
-0x376D = 0x57DE
-0x376E = 0x57E4
-0x376F = 0x57E6
-0x3770 = 0x57E7
-0x3771 = 0x57E9
-0x3772 = 0x57ED
-0x3773 = 0x57F0
-0x3774 = 0x57F5
-0x3775 = 0x57F6
-0x3776 = 0x57F8
-0x3777 = 0x57FD
-0x3778 = 0x57FE
-0x3779 = 0x57FF
-0x377A = 0x5803
-0x377B = 0x5804
-0x377C = 0x5808
-0x377D = 0x5809
-0x377E = 0x57E1
-0x3821 = 0x580C
-0x3822 = 0x580D
-0x3823 = 0x581B
-0x3824 = 0x581E
-0x3825 = 0x581F
-0x3826 = 0x5820
-0x3827 = 0x5826
-0x3828 = 0x5827
-0x3829 = 0x582D
-0x382A = 0x5832
-0x382B = 0x5839
-0x382C = 0x583F
-0x382D = 0x5849
-0x382E = 0x584C
-0x382F = 0x584D
-0x3830 = 0x584F
-0x3831 = 0x5850
-0x3832 = 0x5855
-0x3833 = 0x585F
-0x3834 = 0x5861
-0x3835 = 0x5864
-0x3836 = 0x5867
-0x3837 = 0x5868
-0x3838 = 0x5878
-0x3839 = 0x587C
-0x383A = 0x587F
-0x383B = 0x5880
-0x383C = 0x5881
-0x383D = 0x5887
-0x383E = 0x5888
-0x383F = 0x5889
-0x3840 = 0x588A
-0x3841 = 0x588C
-0x3842 = 0x588D
-0x3843 = 0x588F
-0x3844 = 0x5890
-0x3845 = 0x5894
-0x3846 = 0x5896
-0x3847 = 0x589D
-0x3848 = 0x58A0
-0x3849 = 0x58A1
-0x384A = 0x58A2
-0x384B = 0x58A6
-0x384C = 0x58A9
-0x384D = 0x58B1
-0x384E = 0x58B2
-0x384F = 0x58C4
-0x3850 = 0x58BC
-0x3851 = 0x58C2
-0x3852 = 0x58C8
-0x3853 = 0x58CD
-0x3854 = 0x58CE
-0x3855 = 0x58D0
-0x3856 = 0x58D2
-0x3857 = 0x58D4
-0x3858 = 0x58D6
-0x3859 = 0x58DA
-0x385A = 0x58DD
-0x385B = 0x58E1
-0x385C = 0x58E2
-0x385D = 0x58E9
-0x385E = 0x58F3
-0x385F = 0x5905
-0x3860 = 0x5906
-0x3861 = 0x590B
-0x3862 = 0x590C
-0x3863 = 0x5912
-0x3864 = 0x5913
-0x3865 = 0x5914
-0x3866 = 0x8641
-0x3867 = 0x591D
-0x3868 = 0x5921
-0x3869 = 0x5923
-0x386A = 0x5924
-0x386B = 0x5928
-0x386C = 0x592F
-0x386D = 0x5930
-0x386E = 0x5933
-0x386F = 0x5935
-0x3870 = 0x5936
-0x3871 = 0x593F
-0x3872 = 0x5943
-0x3873 = 0x5946
-0x3874 = 0x5952
-0x3875 = 0x5953
-0x3876 = 0x5959
-0x3877 = 0x595B
-0x3878 = 0x595D
-0x3879 = 0x595E
-0x387A = 0x595F
-0x387B = 0x5961
-0x387C = 0x5963
-0x387D = 0x596B
-0x387E = 0x596D
-0x3921 = 0x596F
-0x3922 = 0x5972
-0x3923 = 0x5975
-0x3924 = 0x5976
-0x3925 = 0x5979
-0x3926 = 0x597B
-0x3927 = 0x597C
-0x3928 = 0x598B
-0x3929 = 0x598C
-0x392A = 0x598E
-0x392B = 0x5992
-0x392C = 0x5995
-0x392D = 0x5997
-0x392E = 0x599F
-0x392F = 0x59A4
-0x3930 = 0x59A7
-0x3931 = 0x59AD
-0x3932 = 0x59AE
-0x3933 = 0x59AF
-0x3934 = 0x59B0
-0x3935 = 0x59B3
-0x3936 = 0x59B7
-0x3937 = 0x59BA
-0x3938 = 0x59BC
-0x3939 = 0x59C1
-0x393A = 0x59C3
-0x393B = 0x59C4
-0x393C = 0x59C8
-0x393D = 0x59CA
-0x393E = 0x59CD
-0x393F = 0x59D2
-0x3940 = 0x59DD
-0x3941 = 0x59DE
-0x3942 = 0x59DF
-0x3943 = 0x59E3
-0x3944 = 0x59E4
-0x3945 = 0x59E7
-0x3946 = 0x59EE
-0x3947 = 0x59EF
-0x3948 = 0x59F1
-0x3949 = 0x59F2
-0x394A = 0x59F4
-0x394B = 0x59F7
-0x394C = 0x5A00
-0x394D = 0x5A04
-0x394E = 0x5A0C
-0x394F = 0x5A0D
-0x3950 = 0x5A0E
-0x3951 = 0x5A12
-0x3952 = 0x5A13
-0x3953 = 0x5A1E
-0x3954 = 0x5A23
-0x3955 = 0x5A24
-0x3956 = 0x5A27
-0x3957 = 0x5A28
-0x3958 = 0x5A2A
-0x3959 = 0x5A2D
-0x395A = 0x5A30
-0x395B = 0x5A44
-0x395C = 0x5A45
-0x395D = 0x5A47
-0x395E = 0x5A48
-0x395F = 0x5A4C
-0x3960 = 0x5A50
-0x3961 = 0x5A55
-0x3962 = 0x5A5E
-0x3963 = 0x5A63
-0x3964 = 0x5A65
-0x3965 = 0x5A67
-0x3966 = 0x5A6D
-0x3967 = 0x5A77
-0x3968 = 0x5A7A
-0x3969 = 0x5A7B
-0x396A = 0x5A7E
-0x396B = 0x5A8B
-0x396C = 0x5A90
-0x396D = 0x5A93
-0x396E = 0x5A96
-0x396F = 0x5A99
-0x3970 = 0x5A9C
-0x3971 = 0x5A9E
-0x3972 = 0x5A9F
-0x3973 = 0x5AA0
-0x3974 = 0x5AA2
-0x3975 = 0x5AA7
-0x3976 = 0x5AAC
-0x3977 = 0x5AB1
-0x3978 = 0x5AB2
-0x3979 = 0x5AB3
-0x397A = 0x5AB5
-0x397B = 0x5AB8
-0x397C = 0x5ABA
-0x397D = 0x5ABB
-0x397E = 0x5ABF
-0x3A21 = 0x5AC4
-0x3A22 = 0x5AC6
-0x3A23 = 0x5AC8
-0x3A24 = 0x5ACF
-0x3A25 = 0x5ADA
-0x3A26 = 0x5ADC
-0x3A27 = 0x5AE0
-0x3A28 = 0x5AE5
-0x3A29 = 0x5AEA
-0x3A2A = 0x5AEE
-0x3A2B = 0x5AF5
-0x3A2C = 0x5AF6
-0x3A2D = 0x5AFD
-0x3A2E = 0x5B00
-0x3A2F = 0x5B01
-0x3A30 = 0x5B08
-0x3A31 = 0x5B17
-0x3A32 = 0x5B34
-0x3A33 = 0x5B19
-0x3A34 = 0x5B1B
-0x3A35 = 0x5B1D
-0x3A36 = 0x5B21
-0x3A37 = 0x5B25
-0x3A38 = 0x5B2D
-0x3A39 = 0x5B38
-0x3A3A = 0x5B41
-0x3A3B = 0x5B4B
-0x3A3C = 0x5B4C
-0x3A3D = 0x5B52
-0x3A3E = 0x5B56
-0x3A3F = 0x5B5E
-0x3A40 = 0x5B68
-0x3A41 = 0x5B6E
-0x3A42 = 0x5B6F
-0x3A43 = 0x5B7C
-0x3A44 = 0x5B7D
-0x3A45 = 0x5B7E
-0x3A46 = 0x5B7F
-0x3A47 = 0x5B81
-0x3A48 = 0x5B84
-0x3A49 = 0x5B86
-0x3A4A = 0x5B8A
-0x3A4B = 0x5B8E
-0x3A4C = 0x5B90
-0x3A4D = 0x5B91
-0x3A4E = 0x5B93
-0x3A4F = 0x5B94
-0x3A50 = 0x5B96
-0x3A51 = 0x5BA8
-0x3A52 = 0x5BA9
-0x3A53 = 0x5BAC
-0x3A54 = 0x5BAD
-0x3A55 = 0x5BAF
-0x3A56 = 0x5BB1
-0x3A57 = 0x5BB2
-0x3A58 = 0x5BB7
-0x3A59 = 0x5BBA
-0x3A5A = 0x5BBC
-0x3A5B = 0x5BC0
-0x3A5C = 0x5BC1
-0x3A5D = 0x5BCD
-0x3A5E = 0x5BCF
-0x3A5F = 0x5BD6
-0x3A60 = 0x5BD7
-0x3A61 = 0x5BD8
-0x3A62 = 0x5BD9
-0x3A63 = 0x5BDA
-0x3A64 = 0x5BE0
-0x3A65 = 0x5BEF
-0x3A66 = 0x5BF1
-0x3A67 = 0x5BF4
-0x3A68 = 0x5BFD
-0x3A69 = 0x5C0C
-0x3A6A = 0x5C17
-0x3A6B = 0x5C1E
-0x3A6C = 0x5C1F
-0x3A6D = 0x5C23
-0x3A6E = 0x5C26
-0x3A6F = 0x5C29
-0x3A70 = 0x5C2B
-0x3A71 = 0x5C2C
-0x3A72 = 0x5C2E
-0x3A73 = 0x5C30
-0x3A74 = 0x5C32
-0x3A75 = 0x5C35
-0x3A76 = 0x5C36
-0x3A77 = 0x5C59
-0x3A78 = 0x5C5A
-0x3A79 = 0x5C5C
-0x3A7A = 0x5C62
-0x3A7B = 0x5C63
-0x3A7C = 0x5C67
-0x3A7D = 0x5C68
-0x3A7E = 0x5C69
-0x3B21 = 0x5C6D
-0x3B22 = 0x5C70
-0x3B23 = 0x5C74
-0x3B24 = 0x5C75
-0x3B25 = 0x5C7A
-0x3B26 = 0x5C7B
-0x3B27 = 0x5C7C
-0x3B28 = 0x5C7D
-0x3B29 = 0x5C87
-0x3B2A = 0x5C88
-0x3B2B = 0x5C8A
-0x3B2C = 0x5C8F
-0x3B2D = 0x5C92
-0x3B2E = 0x5C9D
-0x3B2F = 0x5C9F
-0x3B30 = 0x5CA0
-0x3B31 = 0x5CA2
-0x3B32 = 0x5CA3
-0x3B33 = 0x5CA6
-0x3B34 = 0x5CAA
-0x3B35 = 0x5CB2
-0x3B36 = 0x5CB4
-0x3B37 = 0x5CB5
-0x3B38 = 0x5CBA
-0x3B39 = 0x5CC9
-0x3B3A = 0x5CCB
-0x3B3B = 0x5CD2
-0x3B3C = 0x5CDD
-0x3B3D = 0x5CD7
-0x3B3E = 0x5CEE
-0x3B3F = 0x5CF1
-0x3B40 = 0x5CF2
-0x3B41 = 0x5CF4
-0x3B42 = 0x5D01
-0x3B43 = 0x5D06
-0x3B44 = 0x5D0D
-0x3B45 = 0x5D12
-0x3B46 = 0x5D2B
-0x3B47 = 0x5D23
-0x3B48 = 0x5D24
-0x3B49 = 0x5D26
-0x3B4A = 0x5D27
-0x3B4B = 0x5D31
-0x3B4C = 0x5D34
-0x3B4D = 0x5D39
-0x3B4E = 0x5D3D
-0x3B4F = 0x5D3F
-0x3B50 = 0x5D42
-0x3B51 = 0x5D43
-0x3B52 = 0x5D46
-0x3B53 = 0x5D48
-0x3B54 = 0x5D55
-0x3B55 = 0x5D51
-0x3B56 = 0x5D59
-0x3B57 = 0x5D4A
-0x3B58 = 0x5D5F
-0x3B59 = 0x5D60
-0x3B5A = 0x5D61
-0x3B5B = 0x5D62
-0x3B5C = 0x5D64
-0x3B5D = 0x5D6A
-0x3B5E = 0x5D6D
-0x3B5F = 0x5D70
-0x3B60 = 0x5D79
-0x3B61 = 0x5D7A
-0x3B62 = 0x5D7E
-0x3B63 = 0x5D7F
-0x3B64 = 0x5D81
-0x3B65 = 0x5D83
-0x3B66 = 0x5D88
-0x3B67 = 0x5D8A
-0x3B68 = 0x5D92
-0x3B69 = 0x5D93
-0x3B6A = 0x5D94
-0x3B6B = 0x5D95
-0x3B6C = 0x5D99
-0x3B6D = 0x5D9B
-0x3B6E = 0x5D9F
-0x3B6F = 0x5DA0
-0x3B70 = 0x5DA7
-0x3B71 = 0x5DAB
-0x3B72 = 0x5DB0
-0x3B73 = 0x5DB4
-0x3B74 = 0x5DB8
-0x3B75 = 0x5DB9
-0x3B76 = 0x5DC3
-0x3B77 = 0x5DC7
-0x3B78 = 0x5DCB
-0x3B79 = 0x5DD0
-0x3B7A = 0x5DCE
-0x3B7B = 0x5DD8
-0x3B7C = 0x5DD9
-0x3B7D = 0x5DE0
-0x3B7E = 0x5DE4
-0x3C21 = 0x5DE9
-0x3C22 = 0x5DF8
-0x3C23 = 0x5DF9
-0x3C24 = 0x5E00
-0x3C25 = 0x5E07
-0x3C26 = 0x5E0D
-0x3C27 = 0x5E12
-0x3C28 = 0x5E14
-0x3C29 = 0x5E15
-0x3C2A = 0x5E18
-0x3C2B = 0x5E1F
-0x3C2C = 0x5E20
-0x3C2D = 0x5E2E
-0x3C2E = 0x5E28
-0x3C2F = 0x5E32
-0x3C30 = 0x5E35
-0x3C31 = 0x5E3E
-0x3C32 = 0x5E4B
-0x3C33 = 0x5E50
-0x3C34 = 0x5E49
-0x3C35 = 0x5E51
-0x3C36 = 0x5E56
-0x3C37 = 0x5E58
-0x3C38 = 0x5E5B
-0x3C39 = 0x5E5C
-0x3C3A = 0x5E5E
-0x3C3B = 0x5E68
-0x3C3C = 0x5E6A
-0x3C3D = 0x5E6B
-0x3C3E = 0x5E6C
-0x3C3F = 0x5E6D
-0x3C40 = 0x5E6E
-0x3C41 = 0x5E70
-0x3C42 = 0x5E80
-0x3C43 = 0x5E8B
-0x3C44 = 0x5E8E
-0x3C45 = 0x5EA2
-0x3C46 = 0x5EA4
-0x3C47 = 0x5EA5
-0x3C48 = 0x5EA8
-0x3C49 = 0x5EAA
-0x3C4A = 0x5EAC
-0x3C4B = 0x5EB1
-0x3C4C = 0x5EB3
-0x3C4D = 0x5EBD
-0x3C4E = 0x5EBE
-0x3C4F = 0x5EBF
-0x3C50 = 0x5EC6
-0x3C51 = 0x5ECC
-0x3C52 = 0x5ECB
-0x3C53 = 0x5ECE
-0x3C54 = 0x5ED1
-0x3C55 = 0x5ED2
-0x3C56 = 0x5ED4
-0x3C57 = 0x5ED5
-0x3C58 = 0x5EDC
-0x3C59 = 0x5EDE
-0x3C5A = 0x5EE5
-0x3C5B = 0x5EEB
-0x3C5C = 0x5F02
-0x3C5D = 0x5F06
-0x3C5E = 0x5F07
-0x3C5F = 0x5F08
-0x3C60 = 0x5F0E
-0x3C61 = 0x5F19
-0x3C62 = 0x5F1C
-0x3C63 = 0x5F1D
-0x3C64 = 0x5F21
-0x3C65 = 0x5F22
-0x3C66 = 0x5F23
-0x3C67 = 0x5F24
-0x3C68 = 0x5F28
-0x3C69 = 0x5F2B
-0x3C6A = 0x5F2C
-0x3C6B = 0x5F2E
-0x3C6C = 0x5F30
-0x3C6D = 0x5F34
-0x3C6E = 0x5F36
-0x3C6F = 0x5F3B
-0x3C70 = 0x5F3D
-0x3C71 = 0x5F3F
-0x3C72 = 0x5F40
-0x3C73 = 0x5F44
-0x3C74 = 0x5F45
-0x3C75 = 0x5F47
-0x3C76 = 0x5F4D
-0x3C77 = 0x5F50
-0x3C78 = 0x5F54
-0x3C79 = 0x5F58
-0x3C7A = 0x5F5B
-0x3C7B = 0x5F60
-0x3C7C = 0x5F63
-0x3C7D = 0x5F64
-0x3C7E = 0x5F67
-0x3D21 = 0x5F6F
-0x3D22 = 0x5F72
-0x3D23 = 0x5F74
-0x3D24 = 0x5F75
-0x3D25 = 0x5F78
-0x3D26 = 0x5F7A
-0x3D27 = 0x5F7D
-0x3D28 = 0x5F7E
-0x3D29 = 0x5F89
-0x3D2A = 0x5F8D
-0x3D2B = 0x5F8F
-0x3D2C = 0x5F96
-0x3D2D = 0x5F9C
-0x3D2E = 0x5F9D
-0x3D2F = 0x5FA2
-0x3D30 = 0x5FA7
-0x3D31 = 0x5FAB
-0x3D32 = 0x5FA4
-0x3D33 = 0x5FAC
-0x3D34 = 0x5FAF
-0x3D35 = 0x5FB0
-0x3D36 = 0x5FB1
-0x3D37 = 0x5FB8
-0x3D38 = 0x5FC4
-0x3D39 = 0x5FC7
-0x3D3A = 0x5FC8
-0x3D3B = 0x5FC9
-0x3D3C = 0x5FCB
-0x3D3D = 0x5FD0
-0x3D3E = 0x5FD1
-0x3D3F = 0x5FD2
-0x3D40 = 0x5FD3
-0x3D41 = 0x5FD4
-0x3D42 = 0x5FDE
-0x3D43 = 0x5FE1
-0x3D44 = 0x5FE2
-0x3D45 = 0x5FE8
-0x3D46 = 0x5FE9
-0x3D47 = 0x5FEA
-0x3D48 = 0x5FEC
-0x3D49 = 0x5FED
-0x3D4A = 0x5FEE
-0x3D4B = 0x5FEF
-0x3D4C = 0x5FF2
-0x3D4D = 0x5FF3
-0x3D4E = 0x5FF6
-0x3D4F = 0x5FFA
-0x3D50 = 0x5FFC
-0x3D51 = 0x6007
-0x3D52 = 0x600A
-0x3D53 = 0x600D
-0x3D54 = 0x6013
-0x3D55 = 0x6014
-0x3D56 = 0x6017
-0x3D57 = 0x6018
-0x3D58 = 0x601A
-0x3D59 = 0x601F
-0x3D5A = 0x6024
-0x3D5B = 0x602D
-0x3D5C = 0x6033
-0x3D5D = 0x6035
-0x3D5E = 0x6040
-0x3D5F = 0x6047
-0x3D60 = 0x6048
-0x3D61 = 0x6049
-0x3D62 = 0x604C
-0x3D63 = 0x6051
-0x3D64 = 0x6054
-0x3D65 = 0x6056
-0x3D66 = 0x6057
-0x3D67 = 0x605D
-0x3D68 = 0x6061
-0x3D69 = 0x6067
-0x3D6A = 0x6071
-0x3D6B = 0x607E
-0x3D6C = 0x607F
-0x3D6D = 0x6082
-0x3D6E = 0x6086
-0x3D6F = 0x6088
-0x3D70 = 0x608A
-0x3D71 = 0x608E
-0x3D72 = 0x6091
-0x3D73 = 0x6093
-0x3D74 = 0x6095
-0x3D75 = 0x6098
-0x3D76 = 0x609D
-0x3D77 = 0x609E
-0x3D78 = 0x60A2
-0x3D79 = 0x60A4
-0x3D7A = 0x60A5
-0x3D7B = 0x60A8
-0x3D7C = 0x60B0
-0x3D7D = 0x60B1
-0x3D7E = 0x60B7
-0x3E21 = 0x60BB
-0x3E22 = 0x60BE
-0x3E23 = 0x60C2
-0x3E24 = 0x60C4
-0x3E25 = 0x60C8
-0x3E26 = 0x60C9
-0x3E27 = 0x60CA
-0x3E28 = 0x60CB
-0x3E29 = 0x60CE
-0x3E2A = 0x60CF
-0x3E2B = 0x60D4
-0x3E2C = 0x60D5
-0x3E2D = 0x60D9
-0x3E2E = 0x60DB
-0x3E2F = 0x60DD
-0x3E30 = 0x60DE
-0x3E31 = 0x60E2
-0x3E32 = 0x60E5
-0x3E33 = 0x60F2
-0x3E34 = 0x60F5
-0x3E35 = 0x60F8
-0x3E36 = 0x60FC
-0x3E37 = 0x60FD
-0x3E38 = 0x6102
-0x3E39 = 0x6107
-0x3E3A = 0x610A
-0x3E3B = 0x610C
-0x3E3C = 0x6110
-0x3E3D = 0x6111
-0x3E3E = 0x6112
-0x3E3F = 0x6113
-0x3E40 = 0x6114
-0x3E41 = 0x6116
-0x3E42 = 0x6117
-0x3E43 = 0x6119
-0x3E44 = 0x611C
-0x3E45 = 0x611E
-0x3E46 = 0x6122
-0x3E47 = 0x612A
-0x3E48 = 0x612B
-0x3E49 = 0x6130
-0x3E4A = 0x6131
-0x3E4B = 0x6135
-0x3E4C = 0x6136
-0x3E4D = 0x6137
-0x3E4E = 0x6139
-0x3E4F = 0x6141
-0x3E50 = 0x6145
-0x3E51 = 0x6146
-0x3E52 = 0x6149
-0x3E53 = 0x615E
-0x3E54 = 0x6160
-0x3E55 = 0x616C
-0x3E56 = 0x6172
-0x3E57 = 0x6178
-0x3E58 = 0x617B
-0x3E59 = 0x617C
-0x3E5A = 0x617F
-0x3E5B = 0x6180
-0x3E5C = 0x6181
-0x3E5D = 0x6183
-0x3E5E = 0x6184
-0x3E5F = 0x618B
-0x3E60 = 0x618D
-0x3E61 = 0x6192
-0x3E62 = 0x6193
-0x3E63 = 0x6197
-0x3E64 = 0x6198
-0x3E65 = 0x619C
-0x3E66 = 0x619D
-0x3E67 = 0x619F
-0x3E68 = 0x61A0
-0x3E69 = 0x61A5
-0x3E6A = 0x61A8
-0x3E6B = 0x61AA
-0x3E6C = 0x61AD
-0x3E6D = 0x61B8
-0x3E6E = 0x61B9
-0x3E6F = 0x61BC
-0x3E70 = 0x61C0
-0x3E71 = 0x61C1
-0x3E72 = 0x61C2
-0x3E73 = 0x61CE
-0x3E74 = 0x61CF
-0x3E75 = 0x61D5
-0x3E76 = 0x61DC
-0x3E77 = 0x61DD
-0x3E78 = 0x61DE
-0x3E79 = 0x61DF
-0x3E7A = 0x61E1
-0x3E7B = 0x61E2
-0x3E7C = 0x61E7
-0x3E7D = 0x61E9
-0x3E7E = 0x61E5
-0x3F21 = 0x61EC
-0x3F22 = 0x61ED
-0x3F23 = 0x61EF
-0x3F24 = 0x6201
-0x3F25 = 0x6203
-0x3F26 = 0x6204
-0x3F27 = 0x6207
-0x3F28 = 0x6213
-0x3F29 = 0x6215
-0x3F2A = 0x621C
-0x3F2B = 0x6220
-0x3F2C = 0x6222
-0x3F2D = 0x6223
-0x3F2E = 0x6227
-0x3F2F = 0x6229
-0x3F30 = 0x622B
-0x3F31 = 0x6239
-0x3F32 = 0x623D
-0x3F33 = 0x6242
-0x3F34 = 0x6243
-0x3F35 = 0x6244
-0x3F36 = 0x6246
-0x3F37 = 0x624C
-0x3F38 = 0x6250
-0x3F39 = 0x6251
-0x3F3A = 0x6252
-0x3F3B = 0x6254
-0x3F3C = 0x6256
-0x3F3D = 0x625A
-0x3F3E = 0x625C
-0x3F3F = 0x6264
-0x3F40 = 0x626D
-0x3F41 = 0x626F
-0x3F42 = 0x6273
-0x3F43 = 0x627A
-0x3F44 = 0x627D
-0x3F45 = 0x628D
-0x3F46 = 0x628E
-0x3F47 = 0x628F
-0x3F48 = 0x6290
-0x3F49 = 0x62A6
-0x3F4A = 0x62A8
-0x3F4B = 0x62B3
-0x3F4C = 0x62B6
-0x3F4D = 0x62B7
-0x3F4E = 0x62BA
-0x3F4F = 0x62BE
-0x3F50 = 0x62BF
-0x3F51 = 0x62C4
-0x3F52 = 0x62CE
-0x3F53 = 0x62D5
-0x3F54 = 0x62D6
-0x3F55 = 0x62DA
-0x3F56 = 0x62EA
-0x3F57 = 0x62F2
-0x3F58 = 0x62F4
-0x3F59 = 0x62FC
-0x3F5A = 0x62FD
-0x3F5B = 0x6303
-0x3F5C = 0x6304
-0x3F5D = 0x630A
-0x3F5E = 0x630B
-0x3F5F = 0x630D
-0x3F60 = 0x6310
-0x3F61 = 0x6313
-0x3F62 = 0x6316
-0x3F63 = 0x6318
-0x3F64 = 0x6329
-0x3F65 = 0x632A
-0x3F66 = 0x632D
-0x3F67 = 0x6335
-0x3F68 = 0x6336
-0x3F69 = 0x6339
-0x3F6A = 0x633C
-0x3F6B = 0x6341
-0x3F6C = 0x6342
-0x3F6D = 0x6343
-0x3F6E = 0x6344
-0x3F6F = 0x6346
-0x3F70 = 0x634A
-0x3F71 = 0x634B
-0x3F72 = 0x634E
-0x3F73 = 0x6352
-0x3F74 = 0x6353
-0x3F75 = 0x6354
-0x3F76 = 0x6358
-0x3F77 = 0x635B
-0x3F78 = 0x6365
-0x3F79 = 0x6366
-0x3F7A = 0x636C
-0x3F7B = 0x636D
-0x3F7C = 0x6371
-0x3F7D = 0x6374
-0x3F7E = 0x6375
-0x4021 = 0x6378
-0x4022 = 0x637C
-0x4023 = 0x637D
-0x4024 = 0x637F
-0x4025 = 0x6382
-0x4026 = 0x6384
-0x4027 = 0x6387
-0x4028 = 0x638A
-0x4029 = 0x6390
-0x402A = 0x6394
-0x402B = 0x6395
-0x402C = 0x6399
-0x402D = 0x639A
-0x402E = 0x639E
-0x402F = 0x63A4
-0x4030 = 0x63A6
-0x4031 = 0x63AD
-0x4032 = 0x63AE
-0x4033 = 0x63AF
-0x4034 = 0x63BD
-0x4035 = 0x63C1
-0x4036 = 0x63C5
-0x4037 = 0x63C8
-0x4038 = 0x63CE
-0x4039 = 0x63D1
-0x403A = 0x63D3
-0x403B = 0x63D4
-0x403C = 0x63D5
-0x403D = 0x63DC
-0x403E = 0x63E0
-0x403F = 0x63E5
-0x4040 = 0x63EA
-0x4041 = 0x63EC
-0x4042 = 0x63F2
-0x4043 = 0x63F3
-0x4044 = 0x63F5
-0x4045 = 0x63F8
-0x4046 = 0x63F9
-0x4047 = 0x6409
-0x4048 = 0x640A
-0x4049 = 0x6410
-0x404A = 0x6412
-0x404B = 0x6414
-0x404C = 0x6418
-0x404D = 0x641E
-0x404E = 0x6420
-0x404F = 0x6422
-0x4050 = 0x6424
-0x4051 = 0x6425
-0x4052 = 0x6429
-0x4053 = 0x642A
-0x4054 = 0x642F
-0x4055 = 0x6430
-0x4056 = 0x6435
-0x4057 = 0x643D
-0x4058 = 0x643F
-0x4059 = 0x644B
-0x405A = 0x644F
-0x405B = 0x6451
-0x405C = 0x6452
-0x405D = 0x6453
-0x405E = 0x6454
-0x405F = 0x645A
-0x4060 = 0x645B
-0x4061 = 0x645C
-0x4062 = 0x645D
-0x4063 = 0x645F
-0x4064 = 0x6460
-0x4065 = 0x6461
-0x4066 = 0x6463
-0x4067 = 0x646D
-0x4068 = 0x6473
-0x4069 = 0x6474
-0x406A = 0x647B
-0x406B = 0x647D
-0x406C = 0x6485
-0x406D = 0x6487
-0x406E = 0x648F
-0x406F = 0x6490
-0x4070 = 0x6491
-0x4071 = 0x6498
-0x4072 = 0x6499
-0x4073 = 0x649B
-0x4074 = 0x649D
-0x4075 = 0x649F
-0x4076 = 0x64A1
-0x4077 = 0x64A3
-0x4078 = 0x64A6
-0x4079 = 0x64A8
-0x407A = 0x64AC
-0x407B = 0x64B3
-0x407C = 0x64BD
-0x407D = 0x64BE
-0x407E = 0x64BF
-0x4121 = 0x64C4
-0x4122 = 0x64C9
-0x4123 = 0x64CA
-0x4124 = 0x64CB
-0x4125 = 0x64CC
-0x4126 = 0x64CE
-0x4127 = 0x64D0
-0x4128 = 0x64D1
-0x4129 = 0x64D5
-0x412A = 0x64D7
-0x412B = 0x64E4
-0x412C = 0x64E5
-0x412D = 0x64E9
-0x412E = 0x64EA
-0x412F = 0x64ED
-0x4130 = 0x64F0
-0x4131 = 0x64F5
-0x4132 = 0x64F7
-0x4133 = 0x64FB
-0x4134 = 0x64FF
-0x4135 = 0x6501
-0x4136 = 0x6504
-0x4137 = 0x6508
-0x4138 = 0x6509
-0x4139 = 0x650A
-0x413A = 0x650F
-0x413B = 0x6513
-0x413C = 0x6514
-0x413D = 0x6516
-0x413E = 0x6519
-0x413F = 0x651B
-0x4140 = 0x651E
-0x4141 = 0x651F
-0x4142 = 0x6522
-0x4143 = 0x6526
-0x4144 = 0x6529
-0x4145 = 0x652E
-0x4146 = 0x6531
-0x4147 = 0x653A
-0x4148 = 0x653C
-0x4149 = 0x653D
-0x414A = 0x6543
-0x414B = 0x6547
-0x414C = 0x6549
-0x414D = 0x6550
-0x414E = 0x6552
-0x414F = 0x6554
-0x4150 = 0x655F
-0x4151 = 0x6560
-0x4152 = 0x6567
-0x4153 = 0x656B
-0x4154 = 0x657A
-0x4155 = 0x657D
-0x4156 = 0x6581
-0x4157 = 0x6585
-0x4158 = 0x658A
-0x4159 = 0x6592
-0x415A = 0x6595
-0x415B = 0x6598
-0x415C = 0x659D
-0x415D = 0x65A0
-0x415E = 0x65A3
-0x415F = 0x65A6
-0x4160 = 0x65AE
-0x4161 = 0x65B2
-0x4162 = 0x65B3
-0x4163 = 0x65B4
-0x4164 = 0x65BF
-0x4165 = 0x65C2
-0x4166 = 0x65C8
-0x4167 = 0x65C9
-0x4168 = 0x65CE
-0x4169 = 0x65D0
-0x416A = 0x65D4
-0x416B = 0x65D6
-0x416C = 0x65D8
-0x416D = 0x65DF
-0x416E = 0x65F0
-0x416F = 0x65F2
-0x4170 = 0x65F4
-0x4171 = 0x65F5
-0x4172 = 0x65F9
-0x4173 = 0x65FE
-0x4174 = 0x65FF
-0x4175 = 0x6600
-0x4176 = 0x6604
-0x4177 = 0x6608
-0x4178 = 0x6609
-0x4179 = 0x660D
-0x417A = 0x6611
-0x417B = 0x6612
-0x417C = 0x6615
-0x417D = 0x6616
-0x417E = 0x661D
-0x4221 = 0x661E
-0x4222 = 0x6621
-0x4223 = 0x6622
-0x4224 = 0x6623
-0x4225 = 0x6624
-0x4226 = 0x6626
-0x4227 = 0x6629
-0x4228 = 0x662A
-0x4229 = 0x662B
-0x422A = 0x662C
-0x422B = 0x662E
-0x422C = 0x6630
-0x422D = 0x6631
-0x422E = 0x6633
-0x422F = 0x6639
-0x4230 = 0x6637
-0x4231 = 0x6640
-0x4232 = 0x6645
-0x4233 = 0x6646
-0x4234 = 0x664A
-0x4235 = 0x664C
-0x4236 = 0x6651
-0x4237 = 0x664E
-0x4238 = 0x6657
-0x4239 = 0x6658
-0x423A = 0x6659
-0x423B = 0x665B
-0x423C = 0x665C
-0x423D = 0x6660
-0x423E = 0x6661
-0x423F = 0x66FB
-0x4240 = 0x666A
-0x4241 = 0x666B
-0x4242 = 0x666C
-0x4243 = 0x667E
-0x4244 = 0x6673
-0x4245 = 0x6675
-0x4246 = 0x667F
-0x4247 = 0x6677
-0x4248 = 0x6678
-0x4249 = 0x6679
-0x424A = 0x667B
-0x424B = 0x6680
-0x424C = 0x667C
-0x424D = 0x668B
-0x424E = 0x668C
-0x424F = 0x668D
-0x4250 = 0x6690
-0x4251 = 0x6692
-0x4252 = 0x6699
-0x4253 = 0x669A
-0x4254 = 0x669B
-0x4255 = 0x669C
-0x4256 = 0x669F
-0x4257 = 0x66A0
-0x4258 = 0x66A4
-0x4259 = 0x66AD
-0x425A = 0x66B1
-0x425B = 0x66B2
-0x425C = 0x66B5
-0x425D = 0x66BB
-0x425E = 0x66BF
-0x425F = 0x66C0
-0x4260 = 0x66C2
-0x4261 = 0x66C3
-0x4262 = 0x66C8
-0x4263 = 0x66CC
-0x4264 = 0x66CE
-0x4265 = 0x66CF
-0x4266 = 0x66D4
-0x4267 = 0x66DB
-0x4268 = 0x66DF
-0x4269 = 0x66E8
-0x426A = 0x66EB
-0x426B = 0x66EC
-0x426C = 0x66EE
-0x426D = 0x66FA
-0x426E = 0x6705
-0x426F = 0x6707
-0x4270 = 0x670E
-0x4271 = 0x6713
-0x4272 = 0x6719
-0x4273 = 0x671C
-0x4274 = 0x6720
-0x4275 = 0x6722
-0x4276 = 0x6733
-0x4277 = 0x673E
-0x4278 = 0x6745
-0x4279 = 0x6747
-0x427A = 0x6748
-0x427B = 0x674C
-0x427C = 0x6754
-0x427D = 0x6755
-0x427E = 0x675D
-0x4321 = 0x6766
-0x4322 = 0x676C
-0x4323 = 0x676E
-0x4324 = 0x6774
-0x4325 = 0x6776
-0x4326 = 0x677B
-0x4327 = 0x6781
-0x4328 = 0x6784
-0x4329 = 0x678E
-0x432A = 0x678F
-0x432B = 0x6791
-0x432C = 0x6793
-0x432D = 0x6796
-0x432E = 0x6798
-0x432F = 0x6799
-0x4330 = 0x679B
-0x4331 = 0x67B0
-0x4332 = 0x67B1
-0x4333 = 0x67B2
-0x4334 = 0x67B5
-0x4335 = 0x67BB
-0x4336 = 0x67BC
-0x4337 = 0x67BD
-0x4338 = 0x67F9
-0x4339 = 0x67C0
-0x433A = 0x67C2
-0x433B = 0x67C3
-0x433C = 0x67C5
-0x433D = 0x67C8
-0x433E = 0x67C9
-0x433F = 0x67D2
-0x4340 = 0x67D7
-0x4341 = 0x67D9
-0x4342 = 0x67DC
-0x4343 = 0x67E1
-0x4344 = 0x67E6
-0x4345 = 0x67F0
-0x4346 = 0x67F2
-0x4347 = 0x67F6
-0x4348 = 0x67F7
-0x4349 = 0x6852
-0x434A = 0x6814
-0x434B = 0x6819
-0x434C = 0x681D
-0x434D = 0x681F
-0x434E = 0x6828
-0x434F = 0x6827
-0x4350 = 0x682C
-0x4351 = 0x682D
-0x4352 = 0x682F
-0x4353 = 0x6830
-0x4354 = 0x6831
-0x4355 = 0x6833
-0x4356 = 0x683B
-0x4357 = 0x683F
-0x4358 = 0x6844
-0x4359 = 0x6845
-0x435A = 0x684A
-0x435B = 0x684C
-0x435C = 0x6855
-0x435D = 0x6857
-0x435E = 0x6858
-0x435F = 0x685B
-0x4360 = 0x686B
-0x4361 = 0x686E
-0x4362 = 0x686F
-0x4363 = 0x6870
-0x4364 = 0x6871
-0x4365 = 0x6872
-0x4366 = 0x6875
-0x4367 = 0x6879
-0x4368 = 0x687A
-0x4369 = 0x687B
-0x436A = 0x687C
-0x436B = 0x6882
-0x436C = 0x6884
-0x436D = 0x6886
-0x436E = 0x6888
-0x436F = 0x6896
-0x4370 = 0x6898
-0x4371 = 0x689A
-0x4372 = 0x689C
-0x4373 = 0x68A1
-0x4374 = 0x68A3
-0x4375 = 0x68A5
-0x4376 = 0x68A9
-0x4377 = 0x68AA
-0x4378 = 0x68AE
-0x4379 = 0x68B2
-0x437A = 0x68BB
-0x437B = 0x68C5
-0x437C = 0x68C8
-0x437D = 0x68CC
-0x437E = 0x68CF
-0x4421 = 0x68D0
-0x4422 = 0x68D1
-0x4423 = 0x68D3
-0x4424 = 0x68D6
-0x4425 = 0x68D9
-0x4426 = 0x68DC
-0x4427 = 0x68DD
-0x4428 = 0x68E5
-0x4429 = 0x68E8
-0x442A = 0x68EA
-0x442B = 0x68EB
-0x442C = 0x68EC
-0x442D = 0x68ED
-0x442E = 0x68F0
-0x442F = 0x68F1
-0x4430 = 0x68F5
-0x4431 = 0x68F6
-0x4432 = 0x68FB
-0x4433 = 0x68FC
-0x4434 = 0x68FD
-0x4435 = 0x6906
-0x4436 = 0x6909
-0x4437 = 0x690A
-0x4438 = 0x6910
-0x4439 = 0x6911
-0x443A = 0x6913
-0x443B = 0x6916
-0x443C = 0x6917
-0x443D = 0x6931
-0x443E = 0x6933
-0x443F = 0x6935
-0x4440 = 0x6938
-0x4441 = 0x693B
-0x4442 = 0x6942
-0x4443 = 0x6945
-0x4444 = 0x6949
-0x4445 = 0x694E
-0x4446 = 0x6957
-0x4447 = 0x695B
-0x4448 = 0x6963
-0x4449 = 0x6964
-0x444A = 0x6965
-0x444B = 0x6966
-0x444C = 0x6968
-0x444D = 0x6969
-0x444E = 0x696C
-0x444F = 0x6970
-0x4450 = 0x6971
-0x4451 = 0x6972
-0x4452 = 0x697A
-0x4453 = 0x697B
-0x4454 = 0x697F
-0x4455 = 0x6980
-0x4456 = 0x698D
-0x4457 = 0x6992
-0x4458 = 0x6996
-0x4459 = 0x6998
-0x445A = 0x69A1
-0x445B = 0x69A5
-0x445C = 0x69A6
-0x445D = 0x69A8
-0x445E = 0x69AB
-0x445F = 0x69AD
-0x4460 = 0x69AF
-0x4461 = 0x69B7
-0x4462 = 0x69B8
-0x4463 = 0x69BA
-0x4464 = 0x69BC
-0x4465 = 0x69C5
-0x4466 = 0x69C8
-0x4467 = 0x69D1
-0x4468 = 0x69D6
-0x4469 = 0x69D7
-0x446A = 0x69E2
-0x446B = 0x69E5
-0x446C = 0x69EE
-0x446D = 0x69EF
-0x446E = 0x69F1
-0x446F = 0x69F3
-0x4470 = 0x69F5
-0x4471 = 0x69FE
-0x4472 = 0x6A00
-0x4473 = 0x6A01
-0x4474 = 0x6A03
-0x4475 = 0x6A0F
-0x4476 = 0x6A11
-0x4477 = 0x6A15
-0x4478 = 0x6A1A
-0x4479 = 0x6A1D
-0x447A = 0x6A20
-0x447B = 0x6A24
-0x447C = 0x6A28
-0x447D = 0x6A30
-0x447E = 0x6A32
-0x4521 = 0x6A34
-0x4522 = 0x6A37
-0x4523 = 0x6A3B
-0x4524 = 0x6A3E
-0x4525 = 0x6A3F
-0x4526 = 0x6A45
-0x4527 = 0x6A46
-0x4528 = 0x6A49
-0x4529 = 0x6A4A
-0x452A = 0x6A4E
-0x452B = 0x6A50
-0x452C = 0x6A51
-0x452D = 0x6A52
-0x452E = 0x6A55
-0x452F = 0x6A56
-0x4530 = 0x6A5B
-0x4531 = 0x6A64
-0x4532 = 0x6A67
-0x4533 = 0x6A6A
-0x4534 = 0x6A71
-0x4535 = 0x6A73
-0x4536 = 0x6A7E
-0x4537 = 0x6A81
-0x4538 = 0x6A83
-0x4539 = 0x6A86
-0x453A = 0x6A87
-0x453B = 0x6A89
-0x453C = 0x6A8B
-0x453D = 0x6A91
-0x453E = 0x6A9B
-0x453F = 0x6A9D
-0x4540 = 0x6A9E
-0x4541 = 0x6A9F
-0x4542 = 0x6AA5
-0x4543 = 0x6AAB
-0x4544 = 0x6AAF
-0x4545 = 0x6AB0
-0x4546 = 0x6AB1
-0x4547 = 0x6AB4
-0x4548 = 0x6ABD
-0x4549 = 0x6ABE
-0x454A = 0x6ABF
-0x454B = 0x6AC6
-0x454C = 0x6AC9
-0x454D = 0x6AC8
-0x454E = 0x6ACC
-0x454F = 0x6AD0
-0x4550 = 0x6AD4
-0x4551 = 0x6AD5
-0x4552 = 0x6AD6
-0x4553 = 0x6ADC
-0x4554 = 0x6ADD
-0x4555 = 0x6AE4
-0x4556 = 0x6AE7
-0x4557 = 0x6AEC
-0x4558 = 0x6AF0
-0x4559 = 0x6AF1
-0x455A = 0x6AF2
-0x455B = 0x6AFC
-0x455C = 0x6AFD
-0x455D = 0x6B02
-0x455E = 0x6B03
-0x455F = 0x6B06
-0x4560 = 0x6B07
-0x4561 = 0x6B09
-0x4562 = 0x6B0F
-0x4563 = 0x6B10
-0x4564 = 0x6B11
-0x4565 = 0x6B17
-0x4566 = 0x6B1B
-0x4567 = 0x6B1E
-0x4568 = 0x6B24
-0x4569 = 0x6B28
-0x456A = 0x6B2B
-0x456B = 0x6B2C
-0x456C = 0x6B2F
-0x456D = 0x6B35
-0x456E = 0x6B36
-0x456F = 0x6B3B
-0x4570 = 0x6B3F
-0x4571 = 0x6B46
-0x4572 = 0x6B4A
-0x4573 = 0x6B4D
-0x4574 = 0x6B52
-0x4575 = 0x6B56
-0x4576 = 0x6B58
-0x4577 = 0x6B5D
-0x4578 = 0x6B60
-0x4579 = 0x6B67
-0x457A = 0x6B6B
-0x457B = 0x6B6E
-0x457C = 0x6B70
-0x457D = 0x6B75
-0x457E = 0x6B7D
-0x4621 = 0x6B7E
-0x4622 = 0x6B82
-0x4623 = 0x6B85
-0x4624 = 0x6B97
-0x4625 = 0x6B9B
-0x4626 = 0x6B9F
-0x4627 = 0x6BA0
-0x4628 = 0x6BA2
-0x4629 = 0x6BA3
-0x462A = 0x6BA8
-0x462B = 0x6BA9
-0x462C = 0x6BAC
-0x462D = 0x6BAD
-0x462E = 0x6BAE
-0x462F = 0x6BB0
-0x4630 = 0x6BB8
-0x4631 = 0x6BB9
-0x4632 = 0x6BBD
-0x4633 = 0x6BBE
-0x4634 = 0x6BC3
-0x4635 = 0x6BC4
-0x4636 = 0x6BC9
-0x4637 = 0x6BCC
-0x4638 = 0x6BD6
-0x4639 = 0x6BDA
-0x463A = 0x6BE1
-0x463B = 0x6BE3
-0x463C = 0x6BE6
-0x463D = 0x6BE7
-0x463E = 0x6BEE
-0x463F = 0x6BF1
-0x4640 = 0x6BF7
-0x4641 = 0x6BF9
-0x4642 = 0x6BFF
-0x4643 = 0x6C02
-0x4644 = 0x6C04
-0x4645 = 0x6C05
-0x4646 = 0x6C09
-0x4647 = 0x6C0D
-0x4648 = 0x6C0E
-0x4649 = 0x6C10
-0x464A = 0x6C12
-0x464B = 0x6C19
-0x464C = 0x6C1F
-0x464D = 0x6C26
-0x464E = 0x6C27
-0x464F = 0x6C28
-0x4650 = 0x6C2C
-0x4651 = 0x6C2E
-0x4652 = 0x6C33
-0x4653 = 0x6C35
-0x4654 = 0x6C36
-0x4655 = 0x6C3A
-0x4656 = 0x6C3B
-0x4657 = 0x6C3F
-0x4658 = 0x6C4A
-0x4659 = 0x6C4B
-0x465A = 0x6C4D
-0x465B = 0x6C4F
-0x465C = 0x6C52
-0x465D = 0x6C54
-0x465E = 0x6C59
-0x465F = 0x6C5B
-0x4660 = 0x6C5C
-0x4661 = 0x6C6B
-0x4662 = 0x6C6D
-0x4663 = 0x6C6F
-0x4664 = 0x6C74
-0x4665 = 0x6C76
-0x4666 = 0x6C78
-0x4667 = 0x6C79
-0x4668 = 0x6C7B
-0x4669 = 0x6C85
-0x466A = 0x6C86
-0x466B = 0x6C87
-0x466C = 0x6C89
-0x466D = 0x6C94
-0x466E = 0x6C95
-0x466F = 0x6C97
-0x4670 = 0x6C98
-0x4671 = 0x6C9C
-0x4672 = 0x6C9F
-0x4673 = 0x6CB0
-0x4674 = 0x6CB2
-0x4675 = 0x6CB4
-0x4676 = 0x6CC2
-0x4677 = 0x6CC6
-0x4678 = 0x6CCD
-0x4679 = 0x6CCF
-0x467A = 0x6CD0
-0x467B = 0x6CD1
-0x467C = 0x6CD2
-0x467D = 0x6CD4
-0x467E = 0x6CD6
-0x4721 = 0x6CDA
-0x4722 = 0x6CDC
-0x4723 = 0x6CE0
-0x4724 = 0x6CE7
-0x4725 = 0x6CE9
-0x4726 = 0x6CEB
-0x4727 = 0x6CEC
-0x4728 = 0x6CEE
-0x4729 = 0x6CF2
-0x472A = 0x6CF4
-0x472B = 0x6D04
-0x472C = 0x6D07
-0x472D = 0x6D0A
-0x472E = 0x6D0E
-0x472F = 0x6D0F
-0x4730 = 0x6D11
-0x4731 = 0x6D13
-0x4732 = 0x6D1A
-0x4733 = 0x6D26
-0x4734 = 0x6D27
-0x4735 = 0x6D28
-0x4736 = 0x6C67
-0x4737 = 0x6D2E
-0x4738 = 0x6D2F
-0x4739 = 0x6D31
-0x473A = 0x6D39
-0x473B = 0x6D3C
-0x473C = 0x6D3F
-0x473D = 0x6D57
-0x473E = 0x6D5E
-0x473F = 0x6D5F
-0x4740 = 0x6D61
-0x4741 = 0x6D65
-0x4742 = 0x6D67
-0x4743 = 0x6D6F
-0x4744 = 0x6D70
-0x4745 = 0x6D7C
-0x4746 = 0x6D82
-0x4747 = 0x6D87
-0x4748 = 0x6D91
-0x4749 = 0x6D92
-0x474A = 0x6D94
-0x474B = 0x6D96
-0x474C = 0x6D97
-0x474D = 0x6D98
-0x474E = 0x6DAA
-0x474F = 0x6DAC
-0x4750 = 0x6DB4
-0x4751 = 0x6DB7
-0x4752 = 0x6DB9
-0x4753 = 0x6DBD
-0x4754 = 0x6DBF
-0x4755 = 0x6DC4
-0x4756 = 0x6DC8
-0x4757 = 0x6DCA
-0x4758 = 0x6DCE
-0x4759 = 0x6DCF
-0x475A = 0x6DD6
-0x475B = 0x6DDB
-0x475C = 0x6DDD
-0x475D = 0x6DDF
-0x475E = 0x6DE0
-0x475F = 0x6DE2
-0x4760 = 0x6DE5
-0x4761 = 0x6DE9
-0x4762 = 0x6DEF
-0x4763 = 0x6DF0
-0x4764 = 0x6DF4
-0x4765 = 0x6DF6
-0x4766 = 0x6DFC
-0x4767 = 0x6E00
-0x4768 = 0x6E04
-0x4769 = 0x6E1E
-0x476A = 0x6E22
-0x476B = 0x6E27
-0x476C = 0x6E32
-0x476D = 0x6E36
-0x476E = 0x6E39
-0x476F = 0x6E3B
-0x4770 = 0x6E3C
-0x4771 = 0x6E44
-0x4772 = 0x6E45
-0x4773 = 0x6E48
-0x4774 = 0x6E49
-0x4775 = 0x6E4B
-0x4776 = 0x6E4F
-0x4777 = 0x6E51
-0x4778 = 0x6E52
-0x4779 = 0x6E53
-0x477A = 0x6E54
-0x477B = 0x6E57
-0x477C = 0x6E5C
-0x477D = 0x6E5D
-0x477E = 0x6E5E
-0x4821 = 0x6E62
-0x4822 = 0x6E63
-0x4823 = 0x6E68
-0x4824 = 0x6E73
-0x4825 = 0x6E7B
-0x4826 = 0x6E7D
-0x4827 = 0x6E8D
-0x4828 = 0x6E93
-0x4829 = 0x6E99
-0x482A = 0x6EA0
-0x482B = 0x6EA7
-0x482C = 0x6EAD
-0x482D = 0x6EAE
-0x482E = 0x6EB1
-0x482F = 0x6EB3
-0x4830 = 0x6EBB
-0x4831 = 0x6EBF
-0x4832 = 0x6EC0
-0x4833 = 0x6EC1
-0x4834 = 0x6EC3
-0x4835 = 0x6EC7
-0x4836 = 0x6EC8
-0x4837 = 0x6ECA
-0x4838 = 0x6ECD
-0x4839 = 0x6ECE
-0x483A = 0x6ECF
-0x483B = 0x6EEB
-0x483C = 0x6EED
-0x483D = 0x6EEE
-0x483E = 0x6EF9
-0x483F = 0x6EFB
-0x4840 = 0x6EFD
-0x4841 = 0x6F04
-0x4842 = 0x6F08
-0x4843 = 0x6F0A
-0x4844 = 0x6F0C
-0x4845 = 0x6F0D
-0x4846 = 0x6F16
-0x4847 = 0x6F18
-0x4848 = 0x6F1A
-0x4849 = 0x6F1B
-0x484A = 0x6F26
-0x484B = 0x6F29
-0x484C = 0x6F2A
-0x484D = 0x6F2F
-0x484E = 0x6F30
-0x484F = 0x6F33
-0x4850 = 0x6F36
-0x4851 = 0x6F3B
-0x4852 = 0x6F3C
-0x4853 = 0x6F2D
-0x4854 = 0x6F4F
-0x4855 = 0x6F51
-0x4856 = 0x6F52
-0x4857 = 0x6F53
-0x4858 = 0x6F57
-0x4859 = 0x6F59
-0x485A = 0x6F5A
-0x485B = 0x6F5D
-0x485C = 0x6F5E
-0x485D = 0x6F61
-0x485E = 0x6F62
-0x485F = 0x6F68
-0x4860 = 0x6F6C
-0x4861 = 0x6F7D
-0x4862 = 0x6F7E
-0x4863 = 0x6F83
-0x4864 = 0x6F87
-0x4865 = 0x6F88
-0x4866 = 0x6F8B
-0x4867 = 0x6F8C
-0x4868 = 0x6F8D
-0x4869 = 0x6F90
-0x486A = 0x6F92
-0x486B = 0x6F93
-0x486C = 0x6F94
-0x486D = 0x6F96
-0x486E = 0x6F9A
-0x486F = 0x6F9F
-0x4870 = 0x6FA0
-0x4871 = 0x6FA5
-0x4872 = 0x6FA6
-0x4873 = 0x6FA7
-0x4874 = 0x6FA8
-0x4875 = 0x6FAE
-0x4876 = 0x6FAF
-0x4877 = 0x6FB0
-0x4878 = 0x6FB5
-0x4879 = 0x6FB6
-0x487A = 0x6FBC
-0x487B = 0x6FC5
-0x487C = 0x6FC7
-0x487D = 0x6FC8
-0x487E = 0x6FCA
-0x4921 = 0x6FDA
-0x4922 = 0x6FDE
-0x4923 = 0x6FE8
-0x4924 = 0x6FE9
-0x4925 = 0x6FF0
-0x4926 = 0x6FF5
-0x4927 = 0x6FF9
-0x4928 = 0x6FFC
-0x4929 = 0x6FFD
-0x492A = 0x7000
-0x492B = 0x7005
-0x492C = 0x7006
-0x492D = 0x7007
-0x492E = 0x700D
-0x492F = 0x7017
-0x4930 = 0x7020
-0x4931 = 0x7023
-0x4932 = 0x702F
-0x4933 = 0x7034
-0x4934 = 0x7037
-0x4935 = 0x7039
-0x4936 = 0x703C
-0x4937 = 0x7043
-0x4938 = 0x7044
-0x4939 = 0x7048
-0x493A = 0x7049
-0x493B = 0x704A
-0x493C = 0x704B
-0x493D = 0x7054
-0x493E = 0x7055
-0x493F = 0x705D
-0x4940 = 0x705E
-0x4941 = 0x704E
-0x4942 = 0x7064
-0x4943 = 0x7065
-0x4944 = 0x706C
-0x4945 = 0x706E
-0x4946 = 0x7075
-0x4947 = 0x7076
-0x4948 = 0x707E
-0x4949 = 0x7081
-0x494A = 0x7085
-0x494B = 0x7086
-0x494C = 0x7094
-0x494D = 0x7095
-0x494E = 0x7096
-0x494F = 0x7097
-0x4950 = 0x7098
-0x4951 = 0x709B
-0x4952 = 0x70A4
-0x4953 = 0x70AB
-0x4954 = 0x70B0
-0x4955 = 0x70B1
-0x4956 = 0x70B4
-0x4957 = 0x70B7
-0x4958 = 0x70CA
-0x4959 = 0x70D1
-0x495A = 0x70D3
-0x495B = 0x70D4
-0x495C = 0x70D5
-0x495D = 0x70D6
-0x495E = 0x70D8
-0x495F = 0x70DC
-0x4960 = 0x70E4
-0x4961 = 0x70FA
-0x4962 = 0x7103
-0x4963 = 0x7104
-0x4964 = 0x7105
-0x4965 = 0x7106
-0x4966 = 0x7107
-0x4967 = 0x710B
-0x4968 = 0x710C
-0x4969 = 0x710F
-0x496A = 0x711E
-0x496B = 0x7120
-0x496C = 0x712B
-0x496D = 0x712D
-0x496E = 0x712F
-0x496F = 0x7130
-0x4970 = 0x7131
-0x4971 = 0x7138
-0x4972 = 0x7141
-0x4973 = 0x7145
-0x4974 = 0x7146
-0x4975 = 0x7147
-0x4976 = 0x714A
-0x4977 = 0x714B
-0x4978 = 0x7150
-0x4979 = 0x7152
-0x497A = 0x7157
-0x497B = 0x715A
-0x497C = 0x715C
-0x497D = 0x715E
-0x497E = 0x7160
-0x4A21 = 0x7168
-0x4A22 = 0x7179
-0x4A23 = 0x7180
-0x4A24 = 0x7185
-0x4A25 = 0x7187
-0x4A26 = 0x718C
-0x4A27 = 0x7192
-0x4A28 = 0x719A
-0x4A29 = 0x719B
-0x4A2A = 0x71A0
-0x4A2B = 0x71A2
-0x4A2C = 0x71AF
-0x4A2D = 0x71B0
-0x4A2E = 0x71B2
-0x4A2F = 0x71B3
-0x4A30 = 0x71BA
-0x4A31 = 0x71BF
-0x4A32 = 0x71C0
-0x4A33 = 0x71C1
-0x4A34 = 0x71C4
-0x4A35 = 0x71CB
-0x4A36 = 0x71CC
-0x4A37 = 0x71D3
-0x4A38 = 0x71D6
-0x4A39 = 0x71D9
-0x4A3A = 0x71DA
-0x4A3B = 0x71DC
-0x4A3C = 0x71F8
-0x4A3D = 0x71FE
-0x4A3E = 0x7200
-0x4A3F = 0x7207
-0x4A40 = 0x7208
-0x4A41 = 0x7209
-0x4A42 = 0x7213
-0x4A43 = 0x7217
-0x4A44 = 0x721A
-0x4A45 = 0x721D
-0x4A46 = 0x721F
-0x4A47 = 0x7224
-0x4A48 = 0x722B
-0x4A49 = 0x722F
-0x4A4A = 0x7234
-0x4A4B = 0x7238
-0x4A4C = 0x7239
-0x4A4D = 0x7241
-0x4A4E = 0x7242
-0x4A4F = 0x7243
-0x4A50 = 0x7245
-0x4A51 = 0x724E
-0x4A52 = 0x724F
-0x4A53 = 0x7250
-0x4A54 = 0x7253
-0x4A55 = 0x7255
-0x4A56 = 0x7256
-0x4A57 = 0x725A
-0x4A58 = 0x725C
-0x4A59 = 0x725E
-0x4A5A = 0x7260
-0x4A5B = 0x7263
-0x4A5C = 0x7268
-0x4A5D = 0x726B
-0x4A5E = 0x726E
-0x4A5F = 0x726F
-0x4A60 = 0x7271
-0x4A61 = 0x7277
-0x4A62 = 0x7278
-0x4A63 = 0x727B
-0x4A64 = 0x727C
-0x4A65 = 0x727F
-0x4A66 = 0x7284
-0x4A67 = 0x7289
-0x4A68 = 0x728D
-0x4A69 = 0x728E
-0x4A6A = 0x7293
-0x4A6B = 0x729B
-0x4A6C = 0x72A8
-0x4A6D = 0x72AD
-0x4A6E = 0x72AE
-0x4A6F = 0x72B1
-0x4A70 = 0x72B4
-0x4A71 = 0x72BE
-0x4A72 = 0x72C1
-0x4A73 = 0x72C7
-0x4A74 = 0x72C9
-0x4A75 = 0x72CC
-0x4A76 = 0x72D5
-0x4A77 = 0x72D6
-0x4A78 = 0x72D8
-0x4A79 = 0x72DF
-0x4A7A = 0x72E5
-0x4A7B = 0x72F3
-0x4A7C = 0x72F4
-0x4A7D = 0x72FA
-0x4A7E = 0x72FB
-0x4B21 = 0x72FE
-0x4B22 = 0x7302
-0x4B23 = 0x7304
-0x4B24 = 0x7305
-0x4B25 = 0x7307
-0x4B26 = 0x730B
-0x4B27 = 0x730D
-0x4B28 = 0x7312
-0x4B29 = 0x7313
-0x4B2A = 0x7318
-0x4B2B = 0x7319
-0x4B2C = 0x731E
-0x4B2D = 0x7322
-0x4B2E = 0x7324
-0x4B2F = 0x7327
-0x4B30 = 0x7328
-0x4B31 = 0x732C
-0x4B32 = 0x7331
-0x4B33 = 0x7332
-0x4B34 = 0x7335
-0x4B35 = 0x733A
-0x4B36 = 0x733B
-0x4B37 = 0x733D
-0x4B38 = 0x7343
-0x4B39 = 0x734D
-0x4B3A = 0x7350
-0x4B3B = 0x7352
-0x4B3C = 0x7356
-0x4B3D = 0x7358
-0x4B3E = 0x735D
-0x4B3F = 0x735E
-0x4B40 = 0x735F
-0x4B41 = 0x7360
-0x4B42 = 0x7366
-0x4B43 = 0x7367
-0x4B44 = 0x7369
-0x4B45 = 0x736B
-0x4B46 = 0x736C
-0x4B47 = 0x736E
-0x4B48 = 0x736F
-0x4B49 = 0x7371
-0x4B4A = 0x7377
-0x4B4B = 0x7379
-0x4B4C = 0x737C
-0x4B4D = 0x7380
-0x4B4E = 0x7381
-0x4B4F = 0x7383
-0x4B50 = 0x7385
-0x4B51 = 0x7386
-0x4B52 = 0x738E
-0x4B53 = 0x7390
-0x4B54 = 0x7393
-0x4B55 = 0x7395
-0x4B56 = 0x7397
-0x4B57 = 0x7398
-0x4B58 = 0x739C
-0x4B59 = 0x739E
-0x4B5A = 0x739F
-0x4B5B = 0x73A0
-0x4B5C = 0x73A2
-0x4B5D = 0x73A5
-0x4B5E = 0x73A6
-0x4B5F = 0x73AA
-0x4B60 = 0x73AB
-0x4B61 = 0x73AD
-0x4B62 = 0x73B5
-0x4B63 = 0x73B7
-0x4B64 = 0x73B9
-0x4B65 = 0x73BC
-0x4B66 = 0x73BD
-0x4B67 = 0x73BF
-0x4B68 = 0x73C5
-0x4B69 = 0x73C6
-0x4B6A = 0x73C9
-0x4B6B = 0x73CB
-0x4B6C = 0x73CC
-0x4B6D = 0x73CF
-0x4B6E = 0x73D2
-0x4B6F = 0x73D3
-0x4B70 = 0x73D6
-0x4B71 = 0x73D9
-0x4B72 = 0x73DD
-0x4B73 = 0x73E1
-0x4B74 = 0x73E3
-0x4B75 = 0x73E6
-0x4B76 = 0x73E7
-0x4B77 = 0x73E9
-0x4B78 = 0x73F4
-0x4B79 = 0x73F5
-0x4B7A = 0x73F7
-0x4B7B = 0x73F9
-0x4B7C = 0x73FA
-0x4B7D = 0x73FB
-0x4B7E = 0x73FD
-0x4C21 = 0x73FF
-0x4C22 = 0x7400
-0x4C23 = 0x7401
-0x4C24 = 0x7404
-0x4C25 = 0x7407
-0x4C26 = 0x740A
-0x4C27 = 0x7411
-0x4C28 = 0x741A
-0x4C29 = 0x741B
-0x4C2A = 0x7424
-0x4C2B = 0x7426
-0x4C2C = 0x7428
-0x4C2D = 0x7429
-0x4C2E = 0x742A
-0x4C2F = 0x742B
-0x4C30 = 0x742C
-0x4C31 = 0x742D
-0x4C32 = 0x742E
-0x4C33 = 0x742F
-0x4C34 = 0x7430
-0x4C35 = 0x7431
-0x4C36 = 0x7439
-0x4C37 = 0x7440
-0x4C38 = 0x7443
-0x4C39 = 0x7444
-0x4C3A = 0x7446
-0x4C3B = 0x7447
-0x4C3C = 0x744B
-0x4C3D = 0x744D
-0x4C3E = 0x7451
-0x4C3F = 0x7452
-0x4C40 = 0x7457
-0x4C41 = 0x745D
-0x4C42 = 0x7462
-0x4C43 = 0x7466
-0x4C44 = 0x7467
-0x4C45 = 0x7468
-0x4C46 = 0x746B
-0x4C47 = 0x746D
-0x4C48 = 0x746E
-0x4C49 = 0x7471
-0x4C4A = 0x7472
-0x4C4B = 0x7480
-0x4C4C = 0x7481
-0x4C4D = 0x7485
-0x4C4E = 0x7486
-0x4C4F = 0x7487
-0x4C50 = 0x7489
-0x4C51 = 0x748F
-0x4C52 = 0x7490
-0x4C53 = 0x7491
-0x4C54 = 0x7492
-0x4C55 = 0x7498
-0x4C56 = 0x7499
-0x4C57 = 0x749A
-0x4C58 = 0x749C
-0x4C59 = 0x749F
-0x4C5A = 0x74A0
-0x4C5B = 0x74A1
-0x4C5C = 0x74A3
-0x4C5D = 0x74A6
-0x4C5E = 0x74A8
-0x4C5F = 0x74A9
-0x4C60 = 0x74AA
-0x4C61 = 0x74AB
-0x4C62 = 0x74AE
-0x4C63 = 0x74AF
-0x4C64 = 0x74B1
-0x4C65 = 0x74B2
-0x4C66 = 0x74B5
-0x4C67 = 0x74B9
-0x4C68 = 0x74BB
-0x4C69 = 0x74BF
-0x4C6A = 0x74C8
-0x4C6B = 0x74C9
-0x4C6C = 0x74CC
-0x4C6D = 0x74D0
-0x4C6E = 0x74D3
-0x4C6F = 0x74D8
-0x4C70 = 0x74DA
-0x4C71 = 0x74DB
-0x4C72 = 0x74DE
-0x4C73 = 0x74DF
-0x4C74 = 0x74E4
-0x4C75 = 0x74E8
-0x4C76 = 0x74EA
-0x4C77 = 0x74EB
-0x4C78 = 0x74EF
-0x4C79 = 0x74F4
-0x4C7A = 0x74FA
-0x4C7B = 0x74FB
-0x4C7C = 0x74FC
-0x4C7D = 0x74FF
-0x4C7E = 0x7506
-0x4D21 = 0x7512
-0x4D22 = 0x7516
-0x4D23 = 0x7517
-0x4D24 = 0x7520
-0x4D25 = 0x7521
-0x4D26 = 0x7524
-0x4D27 = 0x7527
-0x4D28 = 0x7529
-0x4D29 = 0x752A
-0x4D2A = 0x752F
-0x4D2B = 0x7536
-0x4D2C = 0x7539
-0x4D2D = 0x753D
-0x4D2E = 0x753E
-0x4D2F = 0x753F
-0x4D30 = 0x7540
-0x4D31 = 0x7543
-0x4D32 = 0x7547
-0x4D33 = 0x7548
-0x4D34 = 0x754E
-0x4D35 = 0x7550
-0x4D36 = 0x7552
-0x4D37 = 0x7557
-0x4D38 = 0x755E
-0x4D39 = 0x755F
-0x4D3A = 0x7561
-0x4D3B = 0x756F
-0x4D3C = 0x7571
-0x4D3D = 0x7579
-0x4D3E = 0x757A
-0x4D3F = 0x757B
-0x4D40 = 0x757C
-0x4D41 = 0x757D
-0x4D42 = 0x757E
-0x4D43 = 0x7581
-0x4D44 = 0x7585
-0x4D45 = 0x7590
-0x4D46 = 0x7592
-0x4D47 = 0x7593
-0x4D48 = 0x7595
-0x4D49 = 0x7599
-0x4D4A = 0x759C
-0x4D4B = 0x75A2
-0x4D4C = 0x75A4
-0x4D4D = 0x75B4
-0x4D4E = 0x75BA
-0x4D4F = 0x75BF
-0x4D50 = 0x75C0
-0x4D51 = 0x75C1
-0x4D52 = 0x75C4
-0x4D53 = 0x75C6
-0x4D54 = 0x75CC
-0x4D55 = 0x75CE
-0x4D56 = 0x75CF
-0x4D57 = 0x75D7
-0x4D58 = 0x75DC
-0x4D59 = 0x75DF
-0x4D5A = 0x75E0
-0x4D5B = 0x75E1
-0x4D5C = 0x75E4
-0x4D5D = 0x75E7
-0x4D5E = 0x75EC
-0x4D5F = 0x75EE
-0x4D60 = 0x75EF
-0x4D61 = 0x75F1
-0x4D62 = 0x75F9
-0x4D63 = 0x7600
-0x4D64 = 0x7602
-0x4D65 = 0x7603
-0x4D66 = 0x7604
-0x4D67 = 0x7607
-0x4D68 = 0x7608
-0x4D69 = 0x760A
-0x4D6A = 0x760C
-0x4D6B = 0x760F
-0x4D6C = 0x7612
-0x4D6D = 0x7613
-0x4D6E = 0x7615
-0x4D6F = 0x7616
-0x4D70 = 0x7619
-0x4D71 = 0x761B
-0x4D72 = 0x761C
-0x4D73 = 0x761D
-0x4D74 = 0x761E
-0x4D75 = 0x7623
-0x4D76 = 0x7625
-0x4D77 = 0x7626
-0x4D78 = 0x7629
-0x4D79 = 0x762D
-0x4D7A = 0x7632
-0x4D7B = 0x7633
-0x4D7C = 0x7635
-0x4D7D = 0x7638
-0x4D7E = 0x7639
-0x4E21 = 0x763A
-0x4E22 = 0x763C
-0x4E23 = 0x764A
-0x4E24 = 0x7640
-0x4E25 = 0x7641
-0x4E26 = 0x7643
-0x4E27 = 0x7644
-0x4E28 = 0x7645
-0x4E29 = 0x7649
-0x4E2A = 0x764B
-0x4E2B = 0x7655
-0x4E2C = 0x7659
-0x4E2D = 0x765F
-0x4E2E = 0x7664
-0x4E2F = 0x7665
-0x4E30 = 0x766D
-0x4E31 = 0x766E
-0x4E32 = 0x766F
-0x4E33 = 0x7671
-0x4E34 = 0x7674
-0x4E35 = 0x7681
-0x4E36 = 0x7685
-0x4E37 = 0x768C
-0x4E38 = 0x768D
-0x4E39 = 0x7695
-0x4E3A = 0x769B
-0x4E3B = 0x769C
-0x4E3C = 0x769D
-0x4E3D = 0x769F
-0x4E3E = 0x76A0
-0x4E3F = 0x76A2
-0x4E40 = 0x76A3
-0x4E41 = 0x76A4
-0x4E42 = 0x76A5
-0x4E43 = 0x76A6
-0x4E44 = 0x76A7
-0x4E45 = 0x76A8
-0x4E46 = 0x76AA
-0x4E47 = 0x76AD
-0x4E48 = 0x76BD
-0x4E49 = 0x76C1
-0x4E4A = 0x76C5
-0x4E4B = 0x76C9
-0x4E4C = 0x76CB
-0x4E4D = 0x76CC
-0x4E4E = 0x76CE
-0x4E4F = 0x76D4
-0x4E50 = 0x76D9
-0x4E51 = 0x76E0
-0x4E52 = 0x76E6
-0x4E53 = 0x76E8
-0x4E54 = 0x76EC
-0x4E55 = 0x76F0
-0x4E56 = 0x76F1
-0x4E57 = 0x76F6
-0x4E58 = 0x76F9
-0x4E59 = 0x76FC
-0x4E5A = 0x7700
-0x4E5B = 0x7706
-0x4E5C = 0x770A
-0x4E5D = 0x770E
-0x4E5E = 0x7712
-0x4E5F = 0x7714
-0x4E60 = 0x7715
-0x4E61 = 0x7717
-0x4E62 = 0x7719
-0x4E63 = 0x771A
-0x4E64 = 0x771C
-0x4E65 = 0x7722
-0x4E66 = 0x7728
-0x4E67 = 0x772D
-0x4E68 = 0x772E
-0x4E69 = 0x772F
-0x4E6A = 0x7734
-0x4E6B = 0x7735
-0x4E6C = 0x7736
-0x4E6D = 0x7739
-0x4E6E = 0x773D
-0x4E6F = 0x773E
-0x4E70 = 0x7742
-0x4E71 = 0x7745
-0x4E72 = 0x7746
-0x4E73 = 0x774A
-0x4E74 = 0x774D
-0x4E75 = 0x774E
-0x4E76 = 0x774F
-0x4E77 = 0x7752
-0x4E78 = 0x7756
-0x4E79 = 0x7757
-0x4E7A = 0x775C
-0x4E7B = 0x775E
-0x4E7C = 0x775F
-0x4E7D = 0x7760
-0x4E7E = 0x7762
-0x4F21 = 0x7764
-0x4F22 = 0x7767
-0x4F23 = 0x776A
-0x4F24 = 0x776C
-0x4F25 = 0x7770
-0x4F26 = 0x7772
-0x4F27 = 0x7773
-0x4F28 = 0x7774
-0x4F29 = 0x777A
-0x4F2A = 0x777D
-0x4F2B = 0x7780
-0x4F2C = 0x7784
-0x4F2D = 0x778C
-0x4F2E = 0x778D
-0x4F2F = 0x7794
-0x4F30 = 0x7795
-0x4F31 = 0x7796
-0x4F32 = 0x779A
-0x4F33 = 0x779F
-0x4F34 = 0x77A2
-0x4F35 = 0x77A7
-0x4F36 = 0x77AA
-0x4F37 = 0x77AE
-0x4F38 = 0x77AF
-0x4F39 = 0x77B1
-0x4F3A = 0x77B5
-0x4F3B = 0x77BE
-0x4F3C = 0x77C3
-0x4F3D = 0x77C9
-0x4F3E = 0x77D1
-0x4F3F = 0x77D2
-0x4F40 = 0x77D5
-0x4F41 = 0x77D9
-0x4F42 = 0x77DE
-0x4F43 = 0x77DF
-0x4F44 = 0x77E0
-0x4F45 = 0x77E4
-0x4F46 = 0x77E6
-0x4F47 = 0x77EA
-0x4F48 = 0x77EC
-0x4F49 = 0x77F0
-0x4F4A = 0x77F1
-0x4F4B = 0x77F4
-0x4F4C = 0x77F8
-0x4F4D = 0x77FB
-0x4F4E = 0x7805
-0x4F4F = 0x7806
-0x4F50 = 0x7809
-0x4F51 = 0x780D
-0x4F52 = 0x780E
-0x4F53 = 0x7811
-0x4F54 = 0x781D
-0x4F55 = 0x7821
-0x4F56 = 0x7822
-0x4F57 = 0x7823
-0x4F58 = 0x782D
-0x4F59 = 0x782E
-0x4F5A = 0x7830
-0x4F5B = 0x7835
-0x4F5C = 0x7837
-0x4F5D = 0x7843
-0x4F5E = 0x7844
-0x4F5F = 0x7847
-0x4F60 = 0x7848
-0x4F61 = 0x784C
-0x4F62 = 0x784E
-0x4F63 = 0x7852
-0x4F64 = 0x785C
-0x4F65 = 0x785E
-0x4F66 = 0x7860
-0x4F67 = 0x7861
-0x4F68 = 0x7863
-0x4F69 = 0x7864
-0x4F6A = 0x7868
-0x4F6B = 0x786A
-0x4F6C = 0x786E
-0x4F6D = 0x787A
-0x4F6E = 0x787E
-0x4F6F = 0x788A
-0x4F70 = 0x788F
-0x4F71 = 0x7894
-0x4F72 = 0x7898
-0x4F73 = 0x78A1
-0x4F74 = 0x789D
-0x4F75 = 0x789E
-0x4F76 = 0x789F
-0x4F77 = 0x78A4
-0x4F78 = 0x78A8
-0x4F79 = 0x78AC
-0x4F7A = 0x78AD
-0x4F7B = 0x78B0
-0x4F7C = 0x78B1
-0x4F7D = 0x78B2
-0x4F7E = 0x78B3
-0x5021 = 0x78BB
-0x5022 = 0x78BD
-0x5023 = 0x78BF
-0x5024 = 0x78C7
-0x5025 = 0x78C8
-0x5026 = 0x78C9
-0x5027 = 0x78CC
-0x5028 = 0x78CE
-0x5029 = 0x78D2
-0x502A = 0x78D3
-0x502B = 0x78D5
-0x502C = 0x78D6
-0x502D = 0x78E4
-0x502E = 0x78DB
-0x502F = 0x78DF
-0x5030 = 0x78E0
-0x5031 = 0x78E1
-0x5032 = 0x78E6
-0x5033 = 0x78EA
-0x5034 = 0x78F2
-0x5035 = 0x78F3
-0x5036 = 0x7900
-0x5037 = 0x78F6
-0x5038 = 0x78F7
-0x5039 = 0x78FA
-0x503A = 0x78FB
-0x503B = 0x78FF
-0x503C = 0x7906
-0x503D = 0x790C
-0x503E = 0x7910
-0x503F = 0x791A
-0x5040 = 0x791C
-0x5041 = 0x791E
-0x5042 = 0x791F
-0x5043 = 0x7920
-0x5044 = 0x7925
-0x5045 = 0x7927
-0x5046 = 0x7929
-0x5047 = 0x792D
-0x5048 = 0x7931
-0x5049 = 0x7934
-0x504A = 0x7935
-0x504B = 0x793B
-0x504C = 0x793D
-0x504D = 0x793F
-0x504E = 0x7944
-0x504F = 0x7945
-0x5050 = 0x7946
-0x5051 = 0x794A
-0x5052 = 0x794B
-0x5053 = 0x794F
-0x5054 = 0x7951
-0x5055 = 0x7954
-0x5056 = 0x7958
-0x5057 = 0x795B
-0x5058 = 0x795C
-0x5059 = 0x7967
-0x505A = 0x7969
-0x505B = 0x796B
-0x505C = 0x7972
-0x505D = 0x7979
-0x505E = 0x797B
-0x505F = 0x797C
-0x5060 = 0x797E
-0x5061 = 0x798B
-0x5062 = 0x798C
-0x5063 = 0x7991
-0x5064 = 0x7993
-0x5065 = 0x7994
-0x5066 = 0x7995
-0x5067 = 0x7996
-0x5068 = 0x7998
-0x5069 = 0x799B
-0x506A = 0x799C
-0x506B = 0x79A1
-0x506C = 0x79A8
-0x506D = 0x79A9
-0x506E = 0x79AB
-0x506F = 0x79AF
-0x5070 = 0x79B1
-0x5071 = 0x79B4
-0x5072 = 0x79B8
-0x5073 = 0x79BB
-0x5074 = 0x79C2
-0x5075 = 0x79C4
-0x5076 = 0x79C7
-0x5077 = 0x79C8
-0x5078 = 0x79CA
-0x5079 = 0x79CF
-0x507A = 0x79D4
-0x507B = 0x79D6
-0x507C = 0x79DA
-0x507D = 0x79DD
-0x507E = 0x79DE
-0x5121 = 0x79E0
-0x5122 = 0x79E2
-0x5123 = 0x79E5
-0x5124 = 0x79EA
-0x5125 = 0x79EB
-0x5126 = 0x79ED
-0x5127 = 0x79F1
-0x5128 = 0x79F8
-0x5129 = 0x79FC
-0x512A = 0x7A02
-0x512B = 0x7A03
-0x512C = 0x7A07
-0x512D = 0x7A09
-0x512E = 0x7A0A
-0x512F = 0x7A0C
-0x5130 = 0x7A11
-0x5131 = 0x7A15
-0x5132 = 0x7A1B
-0x5133 = 0x7A1E
-0x5134 = 0x7A21
-0x5135 = 0x7A27
-0x5136 = 0x7A2B
-0x5137 = 0x7A2D
-0x5138 = 0x7A2F
-0x5139 = 0x7A30
-0x513A = 0x7A34
-0x513B = 0x7A35
-0x513C = 0x7A38
-0x513D = 0x7A39
-0x513E = 0x7A3A
-0x513F = 0x7A44
-0x5140 = 0x7A45
-0x5141 = 0x7A47
-0x5142 = 0x7A48
-0x5143 = 0x7A4C
-0x5144 = 0x7A55
-0x5145 = 0x7A56
-0x5146 = 0x7A59
-0x5147 = 0x7A5C
-0x5148 = 0x7A5D
-0x5149 = 0x7A5F
-0x514A = 0x7A60
-0x514B = 0x7A65
-0x514C = 0x7A67
-0x514D = 0x7A6A
-0x514E = 0x7A6D
-0x514F = 0x7A75
-0x5150 = 0x7A78
-0x5151 = 0x7A7E
-0x5152 = 0x7A80
-0x5153 = 0x7A82
-0x5154 = 0x7A85
-0x5155 = 0x7A86
-0x5156 = 0x7A8A
-0x5157 = 0x7A8B
-0x5158 = 0x7A90
-0x5159 = 0x7A91
-0x515A = 0x7A94
-0x515B = 0x7A9E
-0x515C = 0x7AA0
-0x515D = 0x7AA3
-0x515E = 0x7AAC
-0x515F = 0x7AB3
-0x5160 = 0x7AB5
-0x5161 = 0x7AB9
-0x5162 = 0x7ABB
-0x5163 = 0x7ABC
-0x5164 = 0x7AC6
-0x5165 = 0x7AC9
-0x5166 = 0x7ACC
-0x5167 = 0x7ACE
-0x5168 = 0x7AD1
-0x5169 = 0x7ADB
-0x516A = 0x7AE8
-0x516B = 0x7AE9
-0x516C = 0x7AEB
-0x516D = 0x7AEC
-0x516E = 0x7AF1
-0x516F = 0x7AF4
-0x5170 = 0x7AFB
-0x5171 = 0x7AFD
-0x5172 = 0x7AFE
-0x5173 = 0x7B07
-0x5174 = 0x7B14
-0x5175 = 0x7B1F
-0x5176 = 0x7B23
-0x5177 = 0x7B27
-0x5178 = 0x7B29
-0x5179 = 0x7B2A
-0x517A = 0x7B2B
-0x517B = 0x7B2D
-0x517C = 0x7B2E
-0x517D = 0x7B2F
-0x517E = 0x7B30
-0x5221 = 0x7B31
-0x5222 = 0x7B34
-0x5223 = 0x7B3D
-0x5224 = 0x7B3F
-0x5225 = 0x7B40
-0x5226 = 0x7B41
-0x5227 = 0x7B47
-0x5228 = 0x7B4E
-0x5229 = 0x7B55
-0x522A = 0x7B60
-0x522B = 0x7B64
-0x522C = 0x7B66
-0x522D = 0x7B69
-0x522E = 0x7B6A
-0x522F = 0x7B6D
-0x5230 = 0x7B6F
-0x5231 = 0x7B72
-0x5232 = 0x7B73
-0x5233 = 0x7B77
-0x5234 = 0x7B84
-0x5235 = 0x7B89
-0x5236 = 0x7B8E
-0x5237 = 0x7B90
-0x5238 = 0x7B91
-0x5239 = 0x7B96
-0x523A = 0x7B9B
-0x523B = 0x7B9E
-0x523C = 0x7BA0
-0x523D = 0x7BA5
-0x523E = 0x7BAC
-0x523F = 0x7BAF
-0x5240 = 0x7BB0
-0x5241 = 0x7BB2
-0x5242 = 0x7BB5
-0x5243 = 0x7BB6
-0x5244 = 0x7BBA
-0x5245 = 0x7BBB
-0x5246 = 0x7BBC
-0x5247 = 0x7BBD
-0x5248 = 0x7BC2
-0x5249 = 0x7BC5
-0x524A = 0x7BC8
-0x524B = 0x7BCA
-0x524C = 0x7BD4
-0x524D = 0x7BD6
-0x524E = 0x7BD7
-0x524F = 0x7BD9
-0x5250 = 0x7BDA
-0x5251 = 0x7BDB
-0x5252 = 0x7BE8
-0x5253 = 0x7BEA
-0x5254 = 0x7BF2
-0x5255 = 0x7BF4
-0x5256 = 0x7BF5
-0x5257 = 0x7BF8
-0x5258 = 0x7BF9
-0x5259 = 0x7BFA
-0x525A = 0x7BFC
-0x525B = 0x7BFE
-0x525C = 0x7C01
-0x525D = 0x7C02
-0x525E = 0x7C03
-0x525F = 0x7C04
-0x5260 = 0x7C06
-0x5261 = 0x7C09
-0x5262 = 0x7C0B
-0x5263 = 0x7C0C
-0x5264 = 0x7C0E
-0x5265 = 0x7C0F
-0x5266 = 0x7C19
-0x5267 = 0x7C1B
-0x5268 = 0x7C20
-0x5269 = 0x7C25
-0x526A = 0x7C26
-0x526B = 0x7C28
-0x526C = 0x7C2C
-0x526D = 0x7C31
-0x526E = 0x7C33
-0x526F = 0x7C34
-0x5270 = 0x7C36
-0x5271 = 0x7C39
-0x5272 = 0x7C3A
-0x5273 = 0x7C46
-0x5274 = 0x7C4A
-0x5275 = 0x7C55
-0x5276 = 0x7C51
-0x5277 = 0x7C52
-0x5278 = 0x7C53
-0x5279 = 0x7C59
-0x527A = 0x7C5A
-0x527B = 0x7C5B
-0x527C = 0x7C5C
-0x527D = 0x7C5D
-0x527E = 0x7C5E
-0x5321 = 0x7C61
-0x5322 = 0x7C63
-0x5323 = 0x7C67
-0x5324 = 0x7C69
-0x5325 = 0x7C6D
-0x5326 = 0x7C6E
-0x5327 = 0x7C70
-0x5328 = 0x7C72
-0x5329 = 0x7C79
-0x532A = 0x7C7C
-0x532B = 0x7C7D
-0x532C = 0x7C86
-0x532D = 0x7C87
-0x532E = 0x7C8F
-0x532F = 0x7C94
-0x5330 = 0x7C9E
-0x5331 = 0x7CA0
-0x5332 = 0x7CA6
-0x5333 = 0x7CB0
-0x5334 = 0x7CB6
-0x5335 = 0x7CB7
-0x5336 = 0x7CBA
-0x5337 = 0x7CBB
-0x5338 = 0x7CBC
-0x5339 = 0x7CBF
-0x533A = 0x7CC4
-0x533B = 0x7CC7
-0x533C = 0x7CC8
-0x533D = 0x7CC9
-0x533E = 0x7CCD
-0x533F = 0x7CCF
-0x5340 = 0x7CD3
-0x5341 = 0x7CD4
-0x5342 = 0x7CD5
-0x5343 = 0x7CD7
-0x5344 = 0x7CD9
-0x5345 = 0x7CDA
-0x5346 = 0x7CDD
-0x5347 = 0x7CE6
-0x5348 = 0x7CE9
-0x5349 = 0x7CEB
-0x534A = 0x7CF5
-0x534B = 0x7D03
-0x534C = 0x7D07
-0x534D = 0x7D08
-0x534E = 0x7D09
-0x534F = 0x7D0F
-0x5350 = 0x7D11
-0x5351 = 0x7D12
-0x5352 = 0x7D13
-0x5353 = 0x7D16
-0x5354 = 0x7D1D
-0x5355 = 0x7D1E
-0x5356 = 0x7D23
-0x5357 = 0x7D26
-0x5358 = 0x7D2A
-0x5359 = 0x7D2D
-0x535A = 0x7D31
-0x535B = 0x7D3C
-0x535C = 0x7D3D
-0x535D = 0x7D3E
-0x535E = 0x7D40
-0x535F = 0x7D41
-0x5360 = 0x7D47
-0x5361 = 0x7D48
-0x5362 = 0x7D4D
-0x5363 = 0x7D51
-0x5364 = 0x7D53
-0x5365 = 0x7D57
-0x5366 = 0x7D59
-0x5367 = 0x7D5A
-0x5368 = 0x7D5C
-0x5369 = 0x7D5D
-0x536A = 0x7D65
-0x536B = 0x7D67
-0x536C = 0x7D6A
-0x536D = 0x7D70
-0x536E = 0x7D78
-0x536F = 0x7D7A
-0x5370 = 0x7D7B
-0x5371 = 0x7D7F
-0x5372 = 0x7D81
-0x5373 = 0x7D82
-0x5374 = 0x7D83
-0x5375 = 0x7D85
-0x5376 = 0x7D86
-0x5377 = 0x7D88
-0x5378 = 0x7D8B
-0x5379 = 0x7D8C
-0x537A = 0x7D8D
-0x537B = 0x7D91
-0x537C = 0x7D96
-0x537D = 0x7D97
-0x537E = 0x7D9D
-0x5421 = 0x7D9E
-0x5422 = 0x7DA6
-0x5423 = 0x7DA7
-0x5424 = 0x7DAA
-0x5425 = 0x7DB3
-0x5426 = 0x7DB6
-0x5427 = 0x7DB7
-0x5428 = 0x7DB9
-0x5429 = 0x7DC2
-0x542A = 0x7DC3
-0x542B = 0x7DC4
-0x542C = 0x7DC5
-0x542D = 0x7DC6
-0x542E = 0x7DCC
-0x542F = 0x7DCD
-0x5430 = 0x7DCE
-0x5431 = 0x7DD7
-0x5432 = 0x7DD9
-0x5433 = 0x7E00
-0x5434 = 0x7DE2
-0x5435 = 0x7DE5
-0x5436 = 0x7DE6
-0x5437 = 0x7DEA
-0x5438 = 0x7DEB
-0x5439 = 0x7DED
-0x543A = 0x7DF1
-0x543B = 0x7DF5
-0x543C = 0x7DF6
-0x543D = 0x7DF9
-0x543E = 0x7DFA
-0x543F = 0x7E08
-0x5440 = 0x7E10
-0x5441 = 0x7E11
-0x5442 = 0x7E15
-0x5443 = 0x7E17
-0x5444 = 0x7E1C
-0x5445 = 0x7E1D
-0x5446 = 0x7E20
-0x5447 = 0x7E27
-0x5448 = 0x7E28
-0x5449 = 0x7E2C
-0x544A = 0x7E2D
-0x544B = 0x7E2F
-0x544C = 0x7E33
-0x544D = 0x7E36
-0x544E = 0x7E3F
-0x544F = 0x7E44
-0x5450 = 0x7E45
-0x5451 = 0x7E47
-0x5452 = 0x7E4E
-0x5453 = 0x7E50
-0x5454 = 0x7E52
-0x5455 = 0x7E58
-0x5456 = 0x7E5F
-0x5457 = 0x7E61
-0x5458 = 0x7E62
-0x5459 = 0x7E65
-0x545A = 0x7E6B
-0x545B = 0x7E6E
-0x545C = 0x7E6F
-0x545D = 0x7E73
-0x545E = 0x7E78
-0x545F = 0x7E7E
-0x5460 = 0x7E81
-0x5461 = 0x7E86
-0x5462 = 0x7E87
-0x5463 = 0x7E8A
-0x5464 = 0x7E8D
-0x5465 = 0x7E91
-0x5466 = 0x7E95
-0x5467 = 0x7E98
-0x5468 = 0x7E9A
-0x5469 = 0x7E9D
-0x546A = 0x7E9E
-0x546B = 0x7F3C
-0x546C = 0x7F3B
-0x546D = 0x7F3D
-0x546E = 0x7F3E
-0x546F = 0x7F3F
-0x5470 = 0x7F43
-0x5471 = 0x7F44
-0x5472 = 0x7F47
-0x5473 = 0x7F4F
-0x5474 = 0x7F52
-0x5475 = 0x7F53
-0x5476 = 0x7F5B
-0x5477 = 0x7F5C
-0x5478 = 0x7F5D
-0x5479 = 0x7F61
-0x547A = 0x7F63
-0x547B = 0x7F64
-0x547C = 0x7F65
-0x547D = 0x7F66
-0x547E = 0x7F6D
-0x5521 = 0x7F71
-0x5522 = 0x7F7D
-0x5523 = 0x7F7E
-0x5524 = 0x7F7F
-0x5525 = 0x7F80
-0x5526 = 0x7F8B
-0x5527 = 0x7F8D
-0x5528 = 0x7F8F
-0x5529 = 0x7F90
-0x552A = 0x7F91
-0x552B = 0x7F96
-0x552C = 0x7F97
-0x552D = 0x7F9C
-0x552E = 0x7FA1
-0x552F = 0x7FA2
-0x5530 = 0x7FA6
-0x5531 = 0x7FAA
-0x5532 = 0x7FAD
-0x5533 = 0x7FB4
-0x5534 = 0x7FBC
-0x5535 = 0x7FBF
-0x5536 = 0x7FC0
-0x5537 = 0x7FC3
-0x5538 = 0x7FC8
-0x5539 = 0x7FCE
-0x553A = 0x7FCF
-0x553B = 0x7FDB
-0x553C = 0x7FDF
-0x553D = 0x7FE3
-0x553E = 0x7FE5
-0x553F = 0x7FE8
-0x5540 = 0x7FEC
-0x5541 = 0x7FEE
-0x5542 = 0x7FEF
-0x5543 = 0x7FF2
-0x5544 = 0x7FFA
-0x5545 = 0x7FFD
-0x5546 = 0x7FFE
-0x5547 = 0x7FFF
-0x5548 = 0x8007
-0x5549 = 0x8008
-0x554A = 0x800A
-0x554B = 0x800D
-0x554C = 0x800E
-0x554D = 0x800F
-0x554E = 0x8011
-0x554F = 0x8013
-0x5550 = 0x8014
-0x5551 = 0x8016
-0x5552 = 0x801D
-0x5553 = 0x801E
-0x5554 = 0x801F
-0x5555 = 0x8020
-0x5556 = 0x8024
-0x5557 = 0x8026
-0x5558 = 0x802C
-0x5559 = 0x802E
-0x555A = 0x8030
-0x555B = 0x8034
-0x555C = 0x8035
-0x555D = 0x8037
-0x555E = 0x8039
-0x555F = 0x803A
-0x5560 = 0x803C
-0x5561 = 0x803E
-0x5562 = 0x8040
-0x5563 = 0x8044
-0x5564 = 0x8060
-0x5565 = 0x8064
-0x5566 = 0x8066
-0x5567 = 0x806D
-0x5568 = 0x8071
-0x5569 = 0x8075
-0x556A = 0x8081
-0x556B = 0x8088
-0x556C = 0x808E
-0x556D = 0x809C
-0x556E = 0x809E
-0x556F = 0x80A6
-0x5570 = 0x80A7
-0x5571 = 0x80AB
-0x5572 = 0x80B8
-0x5573 = 0x80B9
-0x5574 = 0x80C8
-0x5575 = 0x80CD
-0x5576 = 0x80CF
-0x5577 = 0x80D2
-0x5578 = 0x80D4
-0x5579 = 0x80D5
-0x557A = 0x80D7
-0x557B = 0x80D8
-0x557C = 0x80E0
-0x557D = 0x80ED
-0x557E = 0x80EE
-0x5621 = 0x80F0
-0x5622 = 0x80F2
-0x5623 = 0x80F3
-0x5624 = 0x80F6
-0x5625 = 0x80F9
-0x5626 = 0x80FA
-0x5627 = 0x80FE
-0x5628 = 0x8103
-0x5629 = 0x810B
-0x562A = 0x8116
-0x562B = 0x8117
-0x562C = 0x8118
-0x562D = 0x811C
-0x562E = 0x811E
-0x562F = 0x8120
-0x5630 = 0x8124
-0x5631 = 0x8127
-0x5632 = 0x812C
-0x5633 = 0x8130
-0x5634 = 0x8135
-0x5635 = 0x813A
-0x5636 = 0x813C
-0x5637 = 0x8145
-0x5638 = 0x8147
-0x5639 = 0x814A
-0x563A = 0x814C
-0x563B = 0x8152
-0x563C = 0x8157
-0x563D = 0x8160
-0x563E = 0x8161
-0x563F = 0x8167
-0x5640 = 0x8168
-0x5641 = 0x8169
-0x5642 = 0x816D
-0x5643 = 0x816F
-0x5644 = 0x8177
-0x5645 = 0x8181
-0x5646 = 0x8190
-0x5647 = 0x8184
-0x5648 = 0x8185
-0x5649 = 0x8186
-0x564A = 0x818B
-0x564B = 0x818E
-0x564C = 0x8196
-0x564D = 0x8198
-0x564E = 0x819B
-0x564F = 0x819E
-0x5650 = 0x81A2
-0x5651 = 0x81AE
-0x5652 = 0x81B2
-0x5653 = 0x81B4
-0x5654 = 0x81BB
-0x5655 = 0x81CB
-0x5656 = 0x81C3
-0x5657 = 0x81C5
-0x5658 = 0x81CA
-0x5659 = 0x81CE
-0x565A = 0x81CF
-0x565B = 0x81D5
-0x565C = 0x81D7
-0x565D = 0x81DB
-0x565E = 0x81DD
-0x565F = 0x81DE
-0x5660 = 0x81E1
-0x5661 = 0x81E4
-0x5662 = 0x81EB
-0x5663 = 0x81EC
-0x5664 = 0x81F0
-0x5665 = 0x81F1
-0x5666 = 0x81F2
-0x5667 = 0x81F5
-0x5668 = 0x81F6
-0x5669 = 0x81F8
-0x566A = 0x81F9
-0x566B = 0x81FD
-0x566C = 0x81FF
-0x566D = 0x8200
-0x566E = 0x8203
-0x566F = 0x820F
-0x5670 = 0x8213
-0x5671 = 0x8214
-0x5672 = 0x8219
-0x5673 = 0x821A
-0x5674 = 0x821D
-0x5675 = 0x8221
-0x5676 = 0x8222
-0x5677 = 0x8228
-0x5678 = 0x8232
-0x5679 = 0x8234
-0x567A = 0x823A
-0x567B = 0x8243
-0x567C = 0x8244
-0x567D = 0x8245
-0x567E = 0x8246
-0x5721 = 0x824B
-0x5722 = 0x824E
-0x5723 = 0x824F
-0x5724 = 0x8251
-0x5725 = 0x8256
-0x5726 = 0x825C
-0x5727 = 0x8260
-0x5728 = 0x8263
-0x5729 = 0x8267
-0x572A = 0x826D
-0x572B = 0x8274
-0x572C = 0x827B
-0x572D = 0x827D
-0x572E = 0x827F
-0x572F = 0x8280
-0x5730 = 0x8281
-0x5731 = 0x8283
-0x5732 = 0x8284
-0x5733 = 0x8287
-0x5734 = 0x8289
-0x5735 = 0x828A
-0x5736 = 0x828E
-0x5737 = 0x8291
-0x5738 = 0x8294
-0x5739 = 0x8296
-0x573A = 0x8298
-0x573B = 0x829A
-0x573C = 0x829B
-0x573D = 0x82A0
-0x573E = 0x82A1
-0x573F = 0x82A3
-0x5740 = 0x82A4
-0x5741 = 0x82A7
-0x5742 = 0x82A8
-0x5743 = 0x82A9
-0x5744 = 0x82AA
-0x5745 = 0x82AE
-0x5746 = 0x82B0
-0x5747 = 0x82B2
-0x5748 = 0x82B4
-0x5749 = 0x82B7
-0x574A = 0x82BA
-0x574B = 0x82BC
-0x574C = 0x82BE
-0x574D = 0x82BF
-0x574E = 0x82C6
-0x574F = 0x82D0
-0x5750 = 0x82D5
-0x5751 = 0x82DA
-0x5752 = 0x82E0
-0x5753 = 0x82E2
-0x5754 = 0x82E4
-0x5755 = 0x82E8
-0x5756 = 0x82EA
-0x5757 = 0x82ED
-0x5758 = 0x82EF
-0x5759 = 0x82F6
-0x575A = 0x82F7
-0x575B = 0x82FD
-0x575C = 0x82FE
-0x575D = 0x8300
-0x575E = 0x8301
-0x575F = 0x8307
-0x5760 = 0x8308
-0x5761 = 0x830A
-0x5762 = 0x830B
-0x5763 = 0x8354
-0x5764 = 0x831B
-0x5765 = 0x831D
-0x5766 = 0x831E
-0x5767 = 0x831F
-0x5768 = 0x8321
-0x5769 = 0x8322
-0x576A = 0x832C
-0x576B = 0x832D
-0x576C = 0x832E
-0x576D = 0x8330
-0x576E = 0x8333
-0x576F = 0x8337
-0x5770 = 0x833A
-0x5771 = 0x833C
-0x5772 = 0x833D
-0x5773 = 0x8342
-0x5774 = 0x8343
-0x5775 = 0x8344
-0x5776 = 0x8347
-0x5777 = 0x834D
-0x5778 = 0x834E
-0x5779 = 0x8351
-0x577A = 0x8355
-0x577B = 0x8356
-0x577C = 0x8357
-0x577D = 0x8370
-0x577E = 0x8378
-0x5821 = 0x837D
-0x5822 = 0x837F
-0x5823 = 0x8380
-0x5824 = 0x8382
-0x5825 = 0x8384
-0x5826 = 0x8386
-0x5827 = 0x838D
-0x5828 = 0x8392
-0x5829 = 0x8394
-0x582A = 0x8395
-0x582B = 0x8398
-0x582C = 0x8399
-0x582D = 0x839B
-0x582E = 0x839C
-0x582F = 0x839D
-0x5830 = 0x83A6
-0x5831 = 0x83A7
-0x5832 = 0x83A9
-0x5833 = 0x83AC
-0x5834 = 0x83BE
-0x5835 = 0x83BF
-0x5836 = 0x83C0
-0x5837 = 0x83C7
-0x5838 = 0x83C9
-0x5839 = 0x83CF
-0x583A = 0x83D0
-0x583B = 0x83D1
-0x583C = 0x83D4
-0x583D = 0x83DD
-0x583E = 0x8353
-0x583F = 0x83E8
-0x5840 = 0x83EA
-0x5841 = 0x83F6
-0x5842 = 0x83F8
-0x5843 = 0x83F9
-0x5844 = 0x83FC
-0x5845 = 0x8401
-0x5846 = 0x8406
-0x5847 = 0x840A
-0x5848 = 0x840F
-0x5849 = 0x8411
-0x584A = 0x8415
-0x584B = 0x8419
-0x584C = 0x83AD
-0x584D = 0x842F
-0x584E = 0x8439
-0x584F = 0x8445
-0x5850 = 0x8447
-0x5851 = 0x8448
-0x5852 = 0x844A
-0x5853 = 0x844D
-0x5854 = 0x844F
-0x5855 = 0x8451
-0x5856 = 0x8452
-0x5857 = 0x8456
-0x5858 = 0x8458
-0x5859 = 0x8459
-0x585A = 0x845A
-0x585B = 0x845C
-0x585C = 0x8460
-0x585D = 0x8464
-0x585E = 0x8465
-0x585F = 0x8467
-0x5860 = 0x846A
-0x5861 = 0x8470
-0x5862 = 0x8473
-0x5863 = 0x8474
-0x5864 = 0x8476
-0x5865 = 0x8478
-0x5866 = 0x847C
-0x5867 = 0x847D
-0x5868 = 0x8481
-0x5869 = 0x8485
-0x586A = 0x8492
-0x586B = 0x8493
-0x586C = 0x8495
-0x586D = 0x849E
-0x586E = 0x84A6
-0x586F = 0x84A8
-0x5870 = 0x84A9
-0x5871 = 0x84AA
-0x5872 = 0x84AF
-0x5873 = 0x84B1
-0x5874 = 0x84B4
-0x5875 = 0x84BA
-0x5876 = 0x84BD
-0x5877 = 0x84BE
-0x5878 = 0x84C0
-0x5879 = 0x84C2
-0x587A = 0x84C7
-0x587B = 0x84C8
-0x587C = 0x84CC
-0x587D = 0x84CF
-0x587E = 0x84D3
-0x5921 = 0x84DC
-0x5922 = 0x84E7
-0x5923 = 0x84EA
-0x5924 = 0x84EF
-0x5925 = 0x84F0
-0x5926 = 0x84F1
-0x5927 = 0x84F2
-0x5928 = 0x84F7
-0x5929 = 0x8532
-0x592A = 0x84FA
-0x592B = 0x84FB
-0x592C = 0x84FD
-0x592D = 0x8502
-0x592E = 0x8503
-0x592F = 0x8507
-0x5930 = 0x850C
-0x5931 = 0x850E
-0x5932 = 0x8510
-0x5933 = 0x851C
-0x5934 = 0x851E
-0x5935 = 0x8522
-0x5936 = 0x8523
-0x5937 = 0x8524
-0x5938 = 0x8525
-0x5939 = 0x8527
-0x593A = 0x852A
-0x593B = 0x852B
-0x593C = 0x852F
-0x593D = 0x8533
-0x593E = 0x8534
-0x593F = 0x8536
-0x5940 = 0x853F
-0x5941 = 0x8546
-0x5942 = 0x854F
-0x5943 = 0x8550
-0x5944 = 0x8551
-0x5945 = 0x8552
-0x5946 = 0x8553
-0x5947 = 0x8556
-0x5948 = 0x8559
-0x5949 = 0x855C
-0x594A = 0x855D
-0x594B = 0x855E
-0x594C = 0x855F
-0x594D = 0x8560
-0x594E = 0x8561
-0x594F = 0x8562
-0x5950 = 0x8564
-0x5951 = 0x856B
-0x5952 = 0x856F
-0x5953 = 0x8579
-0x5954 = 0x857A
-0x5955 = 0x857B
-0x5956 = 0x857D
-0x5957 = 0x857F
-0x5958 = 0x8581
-0x5959 = 0x8585
-0x595A = 0x8586
-0x595B = 0x8589
-0x595C = 0x858B
-0x595D = 0x858C
-0x595E = 0x858F
-0x595F = 0x8593
-0x5960 = 0x8598
-0x5961 = 0x859D
-0x5962 = 0x859F
-0x5963 = 0x85A0
-0x5964 = 0x85A2
-0x5965 = 0x85A5
-0x5966 = 0x85A7
-0x5967 = 0x85B4
-0x5968 = 0x85B6
-0x5969 = 0x85B7
-0x596A = 0x85B8
-0x596B = 0x85BC
-0x596C = 0x85BD
-0x596D = 0x85BE
-0x596E = 0x85BF
-0x596F = 0x85C2
-0x5970 = 0x85C7
-0x5971 = 0x85CA
-0x5972 = 0x85CB
-0x5973 = 0x85CE
-0x5974 = 0x85AD
-0x5975 = 0x85D8
-0x5976 = 0x85DA
-0x5977 = 0x85DF
-0x5978 = 0x85E0
-0x5979 = 0x85E6
-0x597A = 0x85E8
-0x597B = 0x85ED
-0x597C = 0x85F3
-0x597D = 0x85F6
-0x597E = 0x85FC
-0x5A21 = 0x85FF
-0x5A22 = 0x8600
-0x5A23 = 0x8604
-0x5A24 = 0x8605
-0x5A25 = 0x860D
-0x5A26 = 0x860E
-0x5A27 = 0x8610
-0x5A28 = 0x8611
-0x5A29 = 0x8612
-0x5A2A = 0x8618
-0x5A2B = 0x8619
-0x5A2C = 0x861B
-0x5A2D = 0x861E
-0x5A2E = 0x8621
-0x5A2F = 0x8627
-0x5A30 = 0x8629
-0x5A31 = 0x8636
-0x5A32 = 0x8638
-0x5A33 = 0x863A
-0x5A34 = 0x863C
-0x5A35 = 0x863D
-0x5A36 = 0x8640
-0x5A37 = 0x8642
-0x5A38 = 0x8646
-0x5A39 = 0x8652
-0x5A3A = 0x8653
-0x5A3B = 0x8656
-0x5A3C = 0x8657
-0x5A3D = 0x8658
-0x5A3E = 0x8659
-0x5A3F = 0x865D
-0x5A40 = 0x8660
-0x5A41 = 0x8661
-0x5A42 = 0x8662
-0x5A43 = 0x8663
-0x5A44 = 0x8664
-0x5A45 = 0x8669
-0x5A46 = 0x866C
-0x5A47 = 0x866F
-0x5A48 = 0x8675
-0x5A49 = 0x8676
-0x5A4A = 0x8677
-0x5A4B = 0x867A
-0x5A4C = 0x868D
-0x5A4D = 0x8691
-0x5A4E = 0x8696
-0x5A4F = 0x8698
-0x5A50 = 0x869A
-0x5A51 = 0x869C
-0x5A52 = 0x86A1
-0x5A53 = 0x86A6
-0x5A54 = 0x86A7
-0x5A55 = 0x86A8
-0x5A56 = 0x86AD
-0x5A57 = 0x86B1
-0x5A58 = 0x86B3
-0x5A59 = 0x86B4
-0x5A5A = 0x86B5
-0x5A5B = 0x86B7
-0x5A5C = 0x86B8
-0x5A5D = 0x86B9
-0x5A5E = 0x86BF
-0x5A5F = 0x86C0
-0x5A60 = 0x86C1
-0x5A61 = 0x86C3
-0x5A62 = 0x86C5
-0x5A63 = 0x86D1
-0x5A64 = 0x86D2
-0x5A65 = 0x86D5
-0x5A66 = 0x86D7
-0x5A67 = 0x86DA
-0x5A68 = 0x86DC
-0x5A69 = 0x86E0
-0x5A6A = 0x86E3
-0x5A6B = 0x86E5
-0x5A6C = 0x86E7
-0x5A6D = 0x8688
-0x5A6E = 0x86FA
-0x5A6F = 0x86FC
-0x5A70 = 0x86FD
-0x5A71 = 0x8704
-0x5A72 = 0x8705
-0x5A73 = 0x8707
-0x5A74 = 0x870B
-0x5A75 = 0x870E
-0x5A76 = 0x870F
-0x5A77 = 0x8710
-0x5A78 = 0x8713
-0x5A79 = 0x8714
-0x5A7A = 0x8719
-0x5A7B = 0x871E
-0x5A7C = 0x871F
-0x5A7D = 0x8721
-0x5A7E = 0x8723
-0x5B21 = 0x8728
-0x5B22 = 0x872E
-0x5B23 = 0x872F
-0x5B24 = 0x8731
-0x5B25 = 0x8732
-0x5B26 = 0x8739
-0x5B27 = 0x873A
-0x5B28 = 0x873C
-0x5B29 = 0x873D
-0x5B2A = 0x873E
-0x5B2B = 0x8740
-0x5B2C = 0x8743
-0x5B2D = 0x8745
-0x5B2E = 0x874D
-0x5B2F = 0x8758
-0x5B30 = 0x875D
-0x5B31 = 0x8761
-0x5B32 = 0x8764
-0x5B33 = 0x8765
-0x5B34 = 0x876F
-0x5B35 = 0x8771
-0x5B36 = 0x8772
-0x5B37 = 0x877B
-0x5B38 = 0x8783
-0x5B39 = 0x8784
-0x5B3A = 0x8785
-0x5B3B = 0x8786
-0x5B3C = 0x8787
-0x5B3D = 0x8788
-0x5B3E = 0x8789
-0x5B3F = 0x878B
-0x5B40 = 0x878C
-0x5B41 = 0x8790
-0x5B42 = 0x8793
-0x5B43 = 0x8795
-0x5B44 = 0x8797
-0x5B45 = 0x8798
-0x5B46 = 0x8799
-0x5B47 = 0x879E
-0x5B48 = 0x87A0
-0x5B49 = 0x87A3
-0x5B4A = 0x87A7
-0x5B4B = 0x87AC
-0x5B4C = 0x87AD
-0x5B4D = 0x87AE
-0x5B4E = 0x87B1
-0x5B4F = 0x87B5
-0x5B50 = 0x87BE
-0x5B51 = 0x87BF
-0x5B52 = 0x87C1
-0x5B53 = 0x87C8
-0x5B54 = 0x87C9
-0x5B55 = 0x87CA
-0x5B56 = 0x87CE
-0x5B57 = 0x87D5
-0x5B58 = 0x87D6
-0x5B59 = 0x87D9
-0x5B5A = 0x87DA
-0x5B5B = 0x87DC
-0x5B5C = 0x87DF
-0x5B5D = 0x87E2
-0x5B5E = 0x87E3
-0x5B5F = 0x87E4
-0x5B60 = 0x87EA
-0x5B61 = 0x87EB
-0x5B62 = 0x87ED
-0x5B63 = 0x87F1
-0x5B64 = 0x87F3
-0x5B65 = 0x87F8
-0x5B66 = 0x87FA
-0x5B67 = 0x87FF
-0x5B68 = 0x8801
-0x5B69 = 0x8803
-0x5B6A = 0x8806
-0x5B6B = 0x8809
-0x5B6C = 0x880A
-0x5B6D = 0x880B
-0x5B6E = 0x8810
-0x5B6F = 0x8819
-0x5B70 = 0x8812
-0x5B71 = 0x8813
-0x5B72 = 0x8814
-0x5B73 = 0x8818
-0x5B74 = 0x881A
-0x5B75 = 0x881B
-0x5B76 = 0x881C
-0x5B77 = 0x881E
-0x5B78 = 0x881F
-0x5B79 = 0x8828
-0x5B7A = 0x882D
-0x5B7B = 0x882E
-0x5B7C = 0x8830
-0x5B7D = 0x8832
-0x5B7E = 0x8835
-0x5C21 = 0x883A
-0x5C22 = 0x883C
-0x5C23 = 0x8841
-0x5C24 = 0x8843
-0x5C25 = 0x8845
-0x5C26 = 0x8848
-0x5C27 = 0x8849
-0x5C28 = 0x884A
-0x5C29 = 0x884B
-0x5C2A = 0x884E
-0x5C2B = 0x8851
-0x5C2C = 0x8855
-0x5C2D = 0x8856
-0x5C2E = 0x8858
-0x5C2F = 0x885A
-0x5C30 = 0x885C
-0x5C31 = 0x885F
-0x5C32 = 0x8860
-0x5C33 = 0x8864
-0x5C34 = 0x8869
-0x5C35 = 0x8871
-0x5C36 = 0x8879
-0x5C37 = 0x887B
-0x5C38 = 0x8880
-0x5C39 = 0x8898
-0x5C3A = 0x889A
-0x5C3B = 0x889B
-0x5C3C = 0x889C
-0x5C3D = 0x889F
-0x5C3E = 0x88A0
-0x5C3F = 0x88A8
-0x5C40 = 0x88AA
-0x5C41 = 0x88BA
-0x5C42 = 0x88BD
-0x5C43 = 0x88BE
-0x5C44 = 0x88C0
-0x5C45 = 0x88CA
-0x5C46 = 0x88CB
-0x5C47 = 0x88CC
-0x5C48 = 0x88CD
-0x5C49 = 0x88CE
-0x5C4A = 0x88D1
-0x5C4B = 0x88D2
-0x5C4C = 0x88D3
-0x5C4D = 0x88DB
-0x5C4E = 0x88DE
-0x5C4F = 0x88E7
-0x5C50 = 0x88EF
-0x5C51 = 0x88F0
-0x5C52 = 0x88F1
-0x5C53 = 0x88F5
-0x5C54 = 0x88F7
-0x5C55 = 0x8901
-0x5C56 = 0x8906
-0x5C57 = 0x890D
-0x5C58 = 0x890E
-0x5C59 = 0x890F
-0x5C5A = 0x8915
-0x5C5B = 0x8916
-0x5C5C = 0x8918
-0x5C5D = 0x8919
-0x5C5E = 0x891A
-0x5C5F = 0x891C
-0x5C60 = 0x8920
-0x5C61 = 0x8926
-0x5C62 = 0x8927
-0x5C63 = 0x8928
-0x5C64 = 0x8930
-0x5C65 = 0x8931
-0x5C66 = 0x8932
-0x5C67 = 0x8935
-0x5C68 = 0x8939
-0x5C69 = 0x893A
-0x5C6A = 0x893E
-0x5C6B = 0x8940
-0x5C6C = 0x8942
-0x5C6D = 0x8945
-0x5C6E = 0x8946
-0x5C6F = 0x8949
-0x5C70 = 0x894F
-0x5C71 = 0x8952
-0x5C72 = 0x8957
-0x5C73 = 0x895A
-0x5C74 = 0x895B
-0x5C75 = 0x895C
-0x5C76 = 0x8961
-0x5C77 = 0x8962
-0x5C78 = 0x8963
-0x5C79 = 0x896B
-0x5C7A = 0x896E
-0x5C7B = 0x8970
-0x5C7C = 0x8973
-0x5C7D = 0x8975
-0x5C7E = 0x897A
-0x5D21 = 0x897B
-0x5D22 = 0x897C
-0x5D23 = 0x897D
-0x5D24 = 0x8989
-0x5D25 = 0x898D
-0x5D26 = 0x8990
-0x5D27 = 0x8994
-0x5D28 = 0x8995
-0x5D29 = 0x899B
-0x5D2A = 0x899C
-0x5D2B = 0x899F
-0x5D2C = 0x89A0
-0x5D2D = 0x89A5
-0x5D2E = 0x89B0
-0x5D2F = 0x89B4
-0x5D30 = 0x89B5
-0x5D31 = 0x89B6
-0x5D32 = 0x89B7
-0x5D33 = 0x89BC
-0x5D34 = 0x89D4
-0x5D35 = 0x89D5
-0x5D36 = 0x89D6
-0x5D37 = 0x89D7
-0x5D38 = 0x89D8
-0x5D39 = 0x89E5
-0x5D3A = 0x89E9
-0x5D3B = 0x89EB
-0x5D3C = 0x89ED
-0x5D3D = 0x89F1
-0x5D3E = 0x89F3
-0x5D3F = 0x89F6
-0x5D40 = 0x89F9
-0x5D41 = 0x89FD
-0x5D42 = 0x89FF
-0x5D43 = 0x8A04
-0x5D44 = 0x8A05
-0x5D45 = 0x8A07
-0x5D46 = 0x8A0F
-0x5D47 = 0x8A11
-0x5D48 = 0x8A12
-0x5D49 = 0x8A14
-0x5D4A = 0x8A15
-0x5D4B = 0x8A1E
-0x5D4C = 0x8A20
-0x5D4D = 0x8A22
-0x5D4E = 0x8A24
-0x5D4F = 0x8A26
-0x5D50 = 0x8A2B
-0x5D51 = 0x8A2C
-0x5D52 = 0x8A2F
-0x5D53 = 0x8A35
-0x5D54 = 0x8A37
-0x5D55 = 0x8A3D
-0x5D56 = 0x8A3E
-0x5D57 = 0x8A40
-0x5D58 = 0x8A43
-0x5D59 = 0x8A45
-0x5D5A = 0x8A47
-0x5D5B = 0x8A49
-0x5D5C = 0x8A4D
-0x5D5D = 0x8A4E
-0x5D5E = 0x8A53
-0x5D5F = 0x8A56
-0x5D60 = 0x8A57
-0x5D61 = 0x8A58
-0x5D62 = 0x8A5C
-0x5D63 = 0x8A5D
-0x5D64 = 0x8A61
-0x5D65 = 0x8A65
-0x5D66 = 0x8A67
-0x5D67 = 0x8A75
-0x5D68 = 0x8A76
-0x5D69 = 0x8A77
-0x5D6A = 0x8A79
-0x5D6B = 0x8A7A
-0x5D6C = 0x8A7B
-0x5D6D = 0x8A7E
-0x5D6E = 0x8A7F
-0x5D6F = 0x8A80
-0x5D70 = 0x8A83
-0x5D71 = 0x8A86
-0x5D72 = 0x8A8B
-0x5D73 = 0x8A8F
-0x5D74 = 0x8A90
-0x5D75 = 0x8A92
-0x5D76 = 0x8A96
-0x5D77 = 0x8A97
-0x5D78 = 0x8A99
-0x5D79 = 0x8A9F
-0x5D7A = 0x8AA7
-0x5D7B = 0x8AA9
-0x5D7C = 0x8AAE
-0x5D7D = 0x8AAF
-0x5D7E = 0x8AB3
-0x5E21 = 0x8AB6
-0x5E22 = 0x8AB7
-0x5E23 = 0x8ABB
-0x5E24 = 0x8ABE
-0x5E25 = 0x8AC3
-0x5E26 = 0x8AC6
-0x5E27 = 0x8AC8
-0x5E28 = 0x8AC9
-0x5E29 = 0x8ACA
-0x5E2A = 0x8AD1
-0x5E2B = 0x8AD3
-0x5E2C = 0x8AD4
-0x5E2D = 0x8AD5
-0x5E2E = 0x8AD7
-0x5E2F = 0x8ADD
-0x5E30 = 0x8ADF
-0x5E31 = 0x8AEC
-0x5E32 = 0x8AF0
-0x5E33 = 0x8AF4
-0x5E34 = 0x8AF5
-0x5E35 = 0x8AF6
-0x5E36 = 0x8AFC
-0x5E37 = 0x8AFF
-0x5E38 = 0x8B05
-0x5E39 = 0x8B06
-0x5E3A = 0x8B0B
-0x5E3B = 0x8B11
-0x5E3C = 0x8B1C
-0x5E3D = 0x8B1E
-0x5E3E = 0x8B1F
-0x5E3F = 0x8B0A
-0x5E40 = 0x8B2D
-0x5E41 = 0x8B30
-0x5E42 = 0x8B37
-0x5E43 = 0x8B3C
-0x5E44 = 0x8B42
-0x5E45 = 0x8B43
-0x5E46 = 0x8B44
-0x5E47 = 0x8B45
-0x5E48 = 0x8B46
-0x5E49 = 0x8B48
-0x5E4A = 0x8B52
-0x5E4B = 0x8B53
-0x5E4C = 0x8B54
-0x5E4D = 0x8B59
-0x5E4E = 0x8B4D
-0x5E4F = 0x8B5E
-0x5E50 = 0x8B63
-0x5E51 = 0x8B6D
-0x5E52 = 0x8B76
-0x5E53 = 0x8B78
-0x5E54 = 0x8B79
-0x5E55 = 0x8B7C
-0x5E56 = 0x8B7E
-0x5E57 = 0x8B81
-0x5E58 = 0x8B84
-0x5E59 = 0x8B85
-0x5E5A = 0x8B8B
-0x5E5B = 0x8B8D
-0x5E5C = 0x8B8F
-0x5E5D = 0x8B94
-0x5E5E = 0x8B95
-0x5E5F = 0x8B9C
-0x5E60 = 0x8B9E
-0x5E61 = 0x8B9F
-0x5E62 = 0x8C38
-0x5E63 = 0x8C39
-0x5E64 = 0x8C3D
-0x5E65 = 0x8C3E
-0x5E66 = 0x8C45
-0x5E67 = 0x8C47
-0x5E68 = 0x8C49
-0x5E69 = 0x8C4B
-0x5E6A = 0x8C4F
-0x5E6B = 0x8C51
-0x5E6C = 0x8C53
-0x5E6D = 0x8C54
-0x5E6E = 0x8C57
-0x5E6F = 0x8C58
-0x5E70 = 0x8C5B
-0x5E71 = 0x8C5D
-0x5E72 = 0x8C59
-0x5E73 = 0x8C63
-0x5E74 = 0x8C64
-0x5E75 = 0x8C66
-0x5E76 = 0x8C68
-0x5E77 = 0x8C69
-0x5E78 = 0x8C6D
-0x5E79 = 0x8C73
-0x5E7A = 0x8C75
-0x5E7B = 0x8C76
-0x5E7C = 0x8C7B
-0x5E7D = 0x8C7E
-0x5E7E = 0x8C86
-0x5F21 = 0x8C87
-0x5F22 = 0x8C8B
-0x5F23 = 0x8C90
-0x5F24 = 0x8C92
-0x5F25 = 0x8C93
-0x5F26 = 0x8C99
-0x5F27 = 0x8C9B
-0x5F28 = 0x8C9C
-0x5F29 = 0x8CA4
-0x5F2A = 0x8CB9
-0x5F2B = 0x8CBA
-0x5F2C = 0x8CC5
-0x5F2D = 0x8CC6
-0x5F2E = 0x8CC9
-0x5F2F = 0x8CCB
-0x5F30 = 0x8CCF
-0x5F31 = 0x8CD6
-0x5F32 = 0x8CD5
-0x5F33 = 0x8CD9
-0x5F34 = 0x8CDD
-0x5F35 = 0x8CE1
-0x5F36 = 0x8CE8
-0x5F37 = 0x8CEC
-0x5F38 = 0x8CEF
-0x5F39 = 0x8CF0
-0x5F3A = 0x8CF2
-0x5F3B = 0x8CF5
-0x5F3C = 0x8CF7
-0x5F3D = 0x8CF8
-0x5F3E = 0x8CFE
-0x5F3F = 0x8CFF
-0x5F40 = 0x8D01
-0x5F41 = 0x8D03
-0x5F42 = 0x8D09
-0x5F43 = 0x8D12
-0x5F44 = 0x8D17
-0x5F45 = 0x8D1B
-0x5F46 = 0x8D65
-0x5F47 = 0x8D69
-0x5F48 = 0x8D6C
-0x5F49 = 0x8D6E
-0x5F4A = 0x8D7F
-0x5F4B = 0x8D82
-0x5F4C = 0x8D84
-0x5F4D = 0x8D88
-0x5F4E = 0x8D8D
-0x5F4F = 0x8D90
-0x5F50 = 0x8D91
-0x5F51 = 0x8D95
-0x5F52 = 0x8D9E
-0x5F53 = 0x8D9F
-0x5F54 = 0x8DA0
-0x5F55 = 0x8DA6
-0x5F56 = 0x8DAB
-0x5F57 = 0x8DAC
-0x5F58 = 0x8DAF
-0x5F59 = 0x8DB2
-0x5F5A = 0x8DB5
-0x5F5B = 0x8DB7
-0x5F5C = 0x8DB9
-0x5F5D = 0x8DBB
-0x5F5E = 0x8DC0
-0x5F5F = 0x8DC5
-0x5F60 = 0x8DC6
-0x5F61 = 0x8DC7
-0x5F62 = 0x8DC8
-0x5F63 = 0x8DCA
-0x5F64 = 0x8DCE
-0x5F65 = 0x8DD1
-0x5F66 = 0x8DD4
-0x5F67 = 0x8DD5
-0x5F68 = 0x8DD7
-0x5F69 = 0x8DD9
-0x5F6A = 0x8DE4
-0x5F6B = 0x8DE5
-0x5F6C = 0x8DE7
-0x5F6D = 0x8DEC
-0x5F6E = 0x8DF0
-0x5F6F = 0x8DBC
-0x5F70 = 0x8DF1
-0x5F71 = 0x8DF2
-0x5F72 = 0x8DF4
-0x5F73 = 0x8DFD
-0x5F74 = 0x8E01
-0x5F75 = 0x8E04
-0x5F76 = 0x8E05
-0x5F77 = 0x8E06
-0x5F78 = 0x8E0B
-0x5F79 = 0x8E11
-0x5F7A = 0x8E14
-0x5F7B = 0x8E16
-0x5F7C = 0x8E20
-0x5F7D = 0x8E21
-0x5F7E = 0x8E22
-0x6021 = 0x8E23
-0x6022 = 0x8E26
-0x6023 = 0x8E27
-0x6024 = 0x8E31
-0x6025 = 0x8E33
-0x6026 = 0x8E36
-0x6027 = 0x8E37
-0x6028 = 0x8E38
-0x6029 = 0x8E39
-0x602A = 0x8E3D
-0x602B = 0x8E40
-0x602C = 0x8E41
-0x602D = 0x8E4B
-0x602E = 0x8E4D
-0x602F = 0x8E4E
-0x6030 = 0x8E4F
-0x6031 = 0x8E54
-0x6032 = 0x8E5B
-0x6033 = 0x8E5C
-0x6034 = 0x8E5D
-0x6035 = 0x8E5E
-0x6036 = 0x8E61
-0x6037 = 0x8E62
-0x6038 = 0x8E69
-0x6039 = 0x8E6C
-0x603A = 0x8E6D
-0x603B = 0x8E6F
-0x603C = 0x8E70
-0x603D = 0x8E71
-0x603E = 0x8E79
-0x603F = 0x8E7A
-0x6040 = 0x8E7B
-0x6041 = 0x8E82
-0x6042 = 0x8E83
-0x6043 = 0x8E89
-0x6044 = 0x8E90
-0x6045 = 0x8E92
-0x6046 = 0x8E95
-0x6047 = 0x8E9A
-0x6048 = 0x8E9B
-0x6049 = 0x8E9D
-0x604A = 0x8E9E
-0x604B = 0x8EA2
-0x604C = 0x8EA7
-0x604D = 0x8EA9
-0x604E = 0x8EAD
-0x604F = 0x8EAE
-0x6050 = 0x8EB3
-0x6051 = 0x8EB5
-0x6052 = 0x8EBA
-0x6053 = 0x8EBB
-0x6054 = 0x8EC0
-0x6055 = 0x8EC1
-0x6056 = 0x8EC3
-0x6057 = 0x8EC4
-0x6058 = 0x8EC7
-0x6059 = 0x8ECF
-0x605A = 0x8ED1
-0x605B = 0x8ED4
-0x605C = 0x8EDC
-0x605D = 0x8EE8
-0x605E = 0x8EEE
-0x605F = 0x8EF0
-0x6060 = 0x8EF1
-0x6061 = 0x8EF7
-0x6062 = 0x8EF9
-0x6063 = 0x8EFA
-0x6064 = 0x8EED
-0x6065 = 0x8F00
-0x6066 = 0x8F02
-0x6067 = 0x8F07
-0x6068 = 0x8F08
-0x6069 = 0x8F0F
-0x606A = 0x8F10
-0x606B = 0x8F16
-0x606C = 0x8F17
-0x606D = 0x8F18
-0x606E = 0x8F1E
-0x606F = 0x8F20
-0x6070 = 0x8F21
-0x6071 = 0x8F23
-0x6072 = 0x8F25
-0x6073 = 0x8F27
-0x6074 = 0x8F28
-0x6075 = 0x8F2C
-0x6076 = 0x8F2D
-0x6077 = 0x8F2E
-0x6078 = 0x8F34
-0x6079 = 0x8F35
-0x607A = 0x8F36
-0x607B = 0x8F37
-0x607C = 0x8F3A
-0x607D = 0x8F40
-0x607E = 0x8F41
-0x6121 = 0x8F43
-0x6122 = 0x8F47
-0x6123 = 0x8F4F
-0x6124 = 0x8F51
-0x6125 = 0x8F52
-0x6126 = 0x8F53
-0x6127 = 0x8F54
-0x6128 = 0x8F55
-0x6129 = 0x8F58
-0x612A = 0x8F5D
-0x612B = 0x8F5E
-0x612C = 0x8F65
-0x612D = 0x8F9D
-0x612E = 0x8FA0
-0x612F = 0x8FA1
-0x6130 = 0x8FA4
-0x6131 = 0x8FA5
-0x6132 = 0x8FA6
-0x6133 = 0x8FB5
-0x6134 = 0x8FB6
-0x6135 = 0x8FB8
-0x6136 = 0x8FBE
-0x6137 = 0x8FC0
-0x6138 = 0x8FC1
-0x6139 = 0x8FC6
-0x613A = 0x8FCA
-0x613B = 0x8FCB
-0x613C = 0x8FCD
-0x613D = 0x8FD0
-0x613E = 0x8FD2
-0x613F = 0x8FD3
-0x6140 = 0x8FD5
-0x6141 = 0x8FE0
-0x6142 = 0x8FE3
-0x6143 = 0x8FE4
-0x6144 = 0x8FE8
-0x6145 = 0x8FEE
-0x6146 = 0x8FF1
-0x6147 = 0x8FF5
-0x6148 = 0x8FF6
-0x6149 = 0x8FFB
-0x614A = 0x8FFE
-0x614B = 0x9002
-0x614C = 0x9004
-0x614D = 0x9008
-0x614E = 0x900C
-0x614F = 0x9018
-0x6150 = 0x901B
-0x6151 = 0x9028
-0x6152 = 0x9029
-0x6153 = 0x902F
-0x6154 = 0x902A
-0x6155 = 0x902C
-0x6156 = 0x902D
-0x6157 = 0x9033
-0x6158 = 0x9034
-0x6159 = 0x9037
-0x615A = 0x903F
-0x615B = 0x9043
-0x615C = 0x9044
-0x615D = 0x904C
-0x615E = 0x905B
-0x615F = 0x905D
-0x6160 = 0x9062
-0x6161 = 0x9066
-0x6162 = 0x9067
-0x6163 = 0x906C
-0x6164 = 0x9070
-0x6165 = 0x9074
-0x6166 = 0x9079
-0x6167 = 0x9085
-0x6168 = 0x9088
-0x6169 = 0x908B
-0x616A = 0x908C
-0x616B = 0x908E
-0x616C = 0x9090
-0x616D = 0x9095
-0x616E = 0x9097
-0x616F = 0x9098
-0x6170 = 0x9099
-0x6171 = 0x909B
-0x6172 = 0x90A0
-0x6173 = 0x90A1
-0x6174 = 0x90A2
-0x6175 = 0x90A5
-0x6176 = 0x90B0
-0x6177 = 0x90B2
-0x6178 = 0x90B3
-0x6179 = 0x90B4
-0x617A = 0x90B6
-0x617B = 0x90BD
-0x617C = 0x90CC
-0x617D = 0x90BE
-0x617E = 0x90C3
-0x6221 = 0x90C4
-0x6222 = 0x90C5
-0x6223 = 0x90C7
-0x6224 = 0x90C8
-0x6225 = 0x90D5
-0x6226 = 0x90D7
-0x6227 = 0x90D8
-0x6228 = 0x90D9
-0x6229 = 0x90DC
-0x622A = 0x90DD
-0x622B = 0x90DF
-0x622C = 0x90E5
-0x622D = 0x90D2
-0x622E = 0x90F6
-0x622F = 0x90EB
-0x6230 = 0x90EF
-0x6231 = 0x90F0
-0x6232 = 0x90F4
-0x6233 = 0x90FE
-0x6234 = 0x90FF
-0x6235 = 0x9100
-0x6236 = 0x9104
-0x6237 = 0x9105
-0x6238 = 0x9106
-0x6239 = 0x9108
-0x623A = 0x910D
-0x623B = 0x9110
-0x623C = 0x9114
-0x623D = 0x9116
-0x623E = 0x9117
-0x623F = 0x9118
-0x6240 = 0x911A
-0x6241 = 0x911C
-0x6242 = 0x911E
-0x6243 = 0x9120
-0x6244 = 0x9125
-0x6245 = 0x9122
-0x6246 = 0x9123
-0x6247 = 0x9127
-0x6248 = 0x9129
-0x6249 = 0x912E
-0x624A = 0x912F
-0x624B = 0x9131
-0x624C = 0x9134
-0x624D = 0x9136
-0x624E = 0x9137
-0x624F = 0x9139
-0x6250 = 0x913A
-0x6251 = 0x913C
-0x6252 = 0x913D
-0x6253 = 0x9143
-0x6254 = 0x9147
-0x6255 = 0x9148
-0x6256 = 0x914F
-0x6257 = 0x9153
-0x6258 = 0x9157
-0x6259 = 0x9159
-0x625A = 0x915A
-0x625B = 0x915B
-0x625C = 0x9161
-0x625D = 0x9164
-0x625E = 0x9167
-0x625F = 0x916D
-0x6260 = 0x9174
-0x6261 = 0x9179
-0x6262 = 0x917A
-0x6263 = 0x917B
-0x6264 = 0x9181
-0x6265 = 0x9183
-0x6266 = 0x9185
-0x6267 = 0x9186
-0x6268 = 0x918A
-0x6269 = 0x918E
-0x626A = 0x9191
-0x626B = 0x9193
-0x626C = 0x9194
-0x626D = 0x9195
-0x626E = 0x9198
-0x626F = 0x919E
-0x6270 = 0x91A1
-0x6271 = 0x91A6
-0x6272 = 0x91A8
-0x6273 = 0x91AC
-0x6274 = 0x91AD
-0x6275 = 0x91AE
-0x6276 = 0x91B0
-0x6277 = 0x91B1
-0x6278 = 0x91B2
-0x6279 = 0x91B3
-0x627A = 0x91B6
-0x627B = 0x91BB
-0x627C = 0x91BC
-0x627D = 0x91BD
-0x627E = 0x91BF
-0x6321 = 0x91C2
-0x6322 = 0x91C3
-0x6323 = 0x91C5
-0x6324 = 0x91D3
-0x6325 = 0x91D4
-0x6326 = 0x91D7
-0x6327 = 0x91D9
-0x6328 = 0x91DA
-0x6329 = 0x91DE
-0x632A = 0x91E4
-0x632B = 0x91E5
-0x632C = 0x91E9
-0x632D = 0x91EA
-0x632E = 0x91EC
-0x632F = 0x91ED
-0x6330 = 0x91EE
-0x6331 = 0x91EF
-0x6332 = 0x91F0
-0x6333 = 0x91F1
-0x6334 = 0x91F7
-0x6335 = 0x91F9
-0x6336 = 0x91FB
-0x6337 = 0x91FD
-0x6338 = 0x9200
-0x6339 = 0x9201
-0x633A = 0x9204
-0x633B = 0x9205
-0x633C = 0x9206
-0x633D = 0x9207
-0x633E = 0x9209
-0x633F = 0x920A
-0x6340 = 0x920C
-0x6341 = 0x9210
-0x6342 = 0x9212
-0x6343 = 0x9213
-0x6344 = 0x9216
-0x6345 = 0x9218
-0x6346 = 0x921C
-0x6347 = 0x921D
-0x6348 = 0x9223
-0x6349 = 0x9224
-0x634A = 0x9225
-0x634B = 0x9226
-0x634C = 0x9228
-0x634D = 0x922E
-0x634E = 0x922F
-0x634F = 0x9230
-0x6350 = 0x9233
-0x6351 = 0x9235
-0x6352 = 0x9236
-0x6353 = 0x9238
-0x6354 = 0x9239
-0x6355 = 0x923A
-0x6356 = 0x923C
-0x6357 = 0x923E
-0x6358 = 0x9240
-0x6359 = 0x9242
-0x635A = 0x9243
-0x635B = 0x9246
-0x635C = 0x9247
-0x635D = 0x924A
-0x635E = 0x924D
-0x635F = 0x924E
-0x6360 = 0x924F
-0x6361 = 0x9251
-0x6362 = 0x9258
-0x6363 = 0x9259
-0x6364 = 0x925C
-0x6365 = 0x925D
-0x6366 = 0x9260
-0x6367 = 0x9261
-0x6368 = 0x9265
-0x6369 = 0x9267
-0x636A = 0x9268
-0x636B = 0x9269
-0x636C = 0x926E
-0x636D = 0x926F
-0x636E = 0x9270
-0x636F = 0x9275
-0x6370 = 0x9276
-0x6371 = 0x9277
-0x6372 = 0x9278
-0x6373 = 0x9279
-0x6374 = 0x927B
-0x6375 = 0x927C
-0x6376 = 0x927D
-0x6377 = 0x927F
-0x6378 = 0x9288
-0x6379 = 0x9289
-0x637A = 0x928A
-0x637B = 0x928D
-0x637C = 0x928E
-0x637D = 0x9292
-0x637E = 0x9297
-0x6421 = 0x9299
-0x6422 = 0x929F
-0x6423 = 0x92A0
-0x6424 = 0x92A4
-0x6425 = 0x92A5
-0x6426 = 0x92A7
-0x6427 = 0x92A8
-0x6428 = 0x92AB
-0x6429 = 0x92AF
-0x642A = 0x92B2
-0x642B = 0x92B6
-0x642C = 0x92B8
-0x642D = 0x92BA
-0x642E = 0x92BB
-0x642F = 0x92BC
-0x6430 = 0x92BD
-0x6431 = 0x92BF
-0x6432 = 0x92C0
-0x6433 = 0x92C1
-0x6434 = 0x92C2
-0x6435 = 0x92C3
-0x6436 = 0x92C5
-0x6437 = 0x92C6
-0x6438 = 0x92C7
-0x6439 = 0x92C8
-0x643A = 0x92CB
-0x643B = 0x92CC
-0x643C = 0x92CD
-0x643D = 0x92CE
-0x643E = 0x92D0
-0x643F = 0x92D3
-0x6440 = 0x92D5
-0x6441 = 0x92D7
-0x6442 = 0x92D8
-0x6443 = 0x92D9
-0x6444 = 0x92DC
-0x6445 = 0x92DD
-0x6446 = 0x92DF
-0x6447 = 0x92E0
-0x6448 = 0x92E1
-0x6449 = 0x92E3
-0x644A = 0x92E5
-0x644B = 0x92E7
-0x644C = 0x92E8
-0x644D = 0x92EC
-0x644E = 0x92EE
-0x644F = 0x92F0
-0x6450 = 0x92F9
-0x6451 = 0x92FB
-0x6452 = 0x92FF
-0x6453 = 0x9300
-0x6454 = 0x9302
-0x6455 = 0x9308
-0x6456 = 0x930D
-0x6457 = 0x9311
-0x6458 = 0x9314
-0x6459 = 0x9315
-0x645A = 0x931C
-0x645B = 0x931D
-0x645C = 0x931E
-0x645D = 0x931F
-0x645E = 0x9321
-0x645F = 0x9324
-0x6460 = 0x9325
-0x6461 = 0x9327
-0x6462 = 0x9329
-0x6463 = 0x932A
-0x6464 = 0x9333
-0x6465 = 0x9334
-0x6466 = 0x9336
-0x6467 = 0x9337
-0x6468 = 0x9347
-0x6469 = 0x9348
-0x646A = 0x9349
-0x646B = 0x9350
-0x646C = 0x9351
-0x646D = 0x9352
-0x646E = 0x9355
-0x646F = 0x9357
-0x6470 = 0x9358
-0x6471 = 0x935A
-0x6472 = 0x935E
-0x6473 = 0x9364
-0x6474 = 0x9365
-0x6475 = 0x9367
-0x6476 = 0x9369
-0x6477 = 0x936A
-0x6478 = 0x936D
-0x6479 = 0x936F
-0x647A = 0x9370
-0x647B = 0x9371
-0x647C = 0x9373
-0x647D = 0x9374
-0x647E = 0x9376
-0x6521 = 0x937A
-0x6522 = 0x937D
-0x6523 = 0x937F
-0x6524 = 0x9380
-0x6525 = 0x9381
-0x6526 = 0x9382
-0x6527 = 0x9388
-0x6528 = 0x938A
-0x6529 = 0x938B
-0x652A = 0x938D
-0x652B = 0x938F
-0x652C = 0x9392
-0x652D = 0x9395
-0x652E = 0x9398
-0x652F = 0x939B
-0x6530 = 0x939E
-0x6531 = 0x93A1
-0x6532 = 0x93A3
-0x6533 = 0x93A4
-0x6534 = 0x93A6
-0x6535 = 0x93A8
-0x6536 = 0x93AB
-0x6537 = 0x93B4
-0x6538 = 0x93B5
-0x6539 = 0x93B6
-0x653A = 0x93BA
-0x653B = 0x93A9
-0x653C = 0x93C1
-0x653D = 0x93C4
-0x653E = 0x93C5
-0x653F = 0x93C6
-0x6540 = 0x93C7
-0x6541 = 0x93C9
-0x6542 = 0x93CA
-0x6543 = 0x93CB
-0x6544 = 0x93CC
-0x6545 = 0x93CD
-0x6546 = 0x93D3
-0x6547 = 0x93D9
-0x6548 = 0x93DC
-0x6549 = 0x93DE
-0x654A = 0x93DF
-0x654B = 0x93E2
-0x654C = 0x93E6
-0x654D = 0x93E7
-0x654E = 0x93F9
-0x654F = 0x93F7
-0x6550 = 0x93F8
-0x6551 = 0x93FA
-0x6552 = 0x93FB
-0x6553 = 0x93FD
-0x6554 = 0x9401
-0x6555 = 0x9402
-0x6556 = 0x9404
-0x6557 = 0x9408
-0x6558 = 0x9409
-0x6559 = 0x940D
-0x655A = 0x940E
-0x655B = 0x940F
-0x655C = 0x9415
-0x655D = 0x9416
-0x655E = 0x9417
-0x655F = 0x941F
-0x6560 = 0x942E
-0x6561 = 0x942F
-0x6562 = 0x9431
-0x6563 = 0x9432
-0x6564 = 0x9433
-0x6565 = 0x9434
-0x6566 = 0x943B
-0x6567 = 0x943F
-0x6568 = 0x943D
-0x6569 = 0x9443
-0x656A = 0x9445
-0x656B = 0x9448
-0x656C = 0x944A
-0x656D = 0x944C
-0x656E = 0x9455
-0x656F = 0x9459
-0x6570 = 0x945C
-0x6571 = 0x945F
-0x6572 = 0x9461
-0x6573 = 0x9463
-0x6574 = 0x9468
-0x6575 = 0x946B
-0x6576 = 0x946D
-0x6577 = 0x946E
-0x6578 = 0x946F
-0x6579 = 0x9471
-0x657A = 0x9472
-0x657B = 0x9484
-0x657C = 0x9483
-0x657D = 0x9578
-0x657E = 0x9579
-0x6621 = 0x957E
-0x6622 = 0x9584
-0x6623 = 0x9588
-0x6624 = 0x958C
-0x6625 = 0x958D
-0x6626 = 0x958E
-0x6627 = 0x959D
-0x6628 = 0x959E
-0x6629 = 0x959F
-0x662A = 0x95A1
-0x662B = 0x95A6
-0x662C = 0x95A9
-0x662D = 0x95AB
-0x662E = 0x95AC
-0x662F = 0x95B4
-0x6630 = 0x95B6
-0x6631 = 0x95BA
-0x6632 = 0x95BD
-0x6633 = 0x95BF
-0x6634 = 0x95C6
-0x6635 = 0x95C8
-0x6636 = 0x95C9
-0x6637 = 0x95CB
-0x6638 = 0x95D0
-0x6639 = 0x95D1
-0x663A = 0x95D2
-0x663B = 0x95D3
-0x663C = 0x95D9
-0x663D = 0x95DA
-0x663E = 0x95DD
-0x663F = 0x95DE
-0x6640 = 0x95DF
-0x6641 = 0x95E0
-0x6642 = 0x95E4
-0x6643 = 0x95E6
-0x6644 = 0x961D
-0x6645 = 0x961E
-0x6646 = 0x9622
-0x6647 = 0x9624
-0x6648 = 0x9625
-0x6649 = 0x9626
-0x664A = 0x962C
-0x664B = 0x9631
-0x664C = 0x9633
-0x664D = 0x9637
-0x664E = 0x9638
-0x664F = 0x9639
-0x6650 = 0x963A
-0x6651 = 0x963C
-0x6652 = 0x963D
-0x6653 = 0x9641
-0x6654 = 0x9652
-0x6655 = 0x9654
-0x6656 = 0x9656
-0x6657 = 0x9657
-0x6658 = 0x9658
-0x6659 = 0x9661
-0x665A = 0x966E
-0x665B = 0x9674
-0x665C = 0x967B
-0x665D = 0x967C
-0x665E = 0x967E
-0x665F = 0x967F
-0x6660 = 0x9681
-0x6661 = 0x9682
-0x6662 = 0x9683
-0x6663 = 0x9684
-0x6664 = 0x9689
-0x6665 = 0x9691
-0x6666 = 0x9696
-0x6667 = 0x969A
-0x6668 = 0x969D
-0x6669 = 0x969F
-0x666A = 0x96A4
-0x666B = 0x96A5
-0x666C = 0x96A6
-0x666D = 0x96A9
-0x666E = 0x96AE
-0x666F = 0x96AF
-0x6670 = 0x96B3
-0x6671 = 0x96BA
-0x6672 = 0x96CA
-0x6673 = 0x96D2
-0x6674 = 0x5DB2
-0x6675 = 0x96D8
-0x6676 = 0x96DA
-0x6677 = 0x96DD
-0x6678 = 0x96DE
-0x6679 = 0x96DF
-0x667A = 0x96E9
-0x667B = 0x96EF
-0x667C = 0x96F1
-0x667D = 0x96FA
-0x667E = 0x9702
-0x6721 = 0x9703
-0x6722 = 0x9705
-0x6723 = 0x9709
-0x6724 = 0x971A
-0x6725 = 0x971B
-0x6726 = 0x971D
-0x6727 = 0x9721
-0x6728 = 0x9722
-0x6729 = 0x9723
-0x672A = 0x9728
-0x672B = 0x9731
-0x672C = 0x9733
-0x672D = 0x9741
-0x672E = 0x9743
-0x672F = 0x974A
-0x6730 = 0x974E
-0x6731 = 0x974F
-0x6732 = 0x9755
-0x6733 = 0x9757
-0x6734 = 0x9758
-0x6735 = 0x975A
-0x6736 = 0x975B
-0x6737 = 0x9763
-0x6738 = 0x9767
-0x6739 = 0x976A
-0x673A = 0x976E
-0x673B = 0x9773
-0x673C = 0x9776
-0x673D = 0x9777
-0x673E = 0x9778
-0x673F = 0x977B
-0x6740 = 0x977D
-0x6741 = 0x977F
-0x6742 = 0x9780
-0x6743 = 0x9789
-0x6744 = 0x9795
-0x6745 = 0x9796
-0x6746 = 0x9797
-0x6747 = 0x9799
-0x6748 = 0x979A
-0x6749 = 0x979E
-0x674A = 0x979F
-0x674B = 0x97A2
-0x674C = 0x97AC
-0x674D = 0x97AE
-0x674E = 0x97B1
-0x674F = 0x97B2
-0x6750 = 0x97B5
-0x6751 = 0x97B6
-0x6752 = 0x97B8
-0x6753 = 0x97B9
-0x6754 = 0x97BA
-0x6755 = 0x97BC
-0x6756 = 0x97BE
-0x6757 = 0x97BF
-0x6758 = 0x97C1
-0x6759 = 0x97C4
-0x675A = 0x97C5
-0x675B = 0x97C7
-0x675C = 0x97C9
-0x675D = 0x97CA
-0x675E = 0x97CC
-0x675F = 0x97CD
-0x6760 = 0x97CE
-0x6761 = 0x97D0
-0x6762 = 0x97D1
-0x6763 = 0x97D4
-0x6764 = 0x97D7
-0x6765 = 0x97D8
-0x6766 = 0x97D9
-0x6767 = 0x97DD
-0x6768 = 0x97DE
-0x6769 = 0x97E0
-0x676A = 0x97DB
-0x676B = 0x97E1
-0x676C = 0x97E4
-0x676D = 0x97EF
-0x676E = 0x97F1
-0x676F = 0x97F4
-0x6770 = 0x97F7
-0x6771 = 0x97F8
-0x6772 = 0x97FA
-0x6773 = 0x9807
-0x6774 = 0x980A
-0x6775 = 0x9819
-0x6776 = 0x980D
-0x6777 = 0x980E
-0x6778 = 0x9814
-0x6779 = 0x9816
-0x677A = 0x981C
-0x677B = 0x981E
-0x677C = 0x9820
-0x677D = 0x9823
-0x677E = 0x9826
-0x6821 = 0x982B
-0x6822 = 0x982E
-0x6823 = 0x982F
-0x6824 = 0x9830
-0x6825 = 0x9832
-0x6826 = 0x9833
-0x6827 = 0x9835
-0x6828 = 0x9825
-0x6829 = 0x983E
-0x682A = 0x9844
-0x682B = 0x9847
-0x682C = 0x984A
-0x682D = 0x9851
-0x682E = 0x9852
-0x682F = 0x9853
-0x6830 = 0x9856
-0x6831 = 0x9857
-0x6832 = 0x9859
-0x6833 = 0x985A
-0x6834 = 0x9862
-0x6835 = 0x9863
-0x6836 = 0x9865
-0x6837 = 0x9866
-0x6838 = 0x986A
-0x6839 = 0x986C
-0x683A = 0x98AB
-0x683B = 0x98AD
-0x683C = 0x98AE
-0x683D = 0x98B0
-0x683E = 0x98B4
-0x683F = 0x98B7
-0x6840 = 0x98B8
-0x6841 = 0x98BA
-0x6842 = 0x98BB
-0x6843 = 0x98BF
-0x6844 = 0x98C2
-0x6845 = 0x98C5
-0x6846 = 0x98C8
-0x6847 = 0x98CC
-0x6848 = 0x98E1
-0x6849 = 0x98E3
-0x684A = 0x98E5
-0x684B = 0x98E6
-0x684C = 0x98E7
-0x684D = 0x98EA
-0x684E = 0x98F3
-0x684F = 0x98F6
-0x6850 = 0x9902
-0x6851 = 0x9907
-0x6852 = 0x9908
-0x6853 = 0x9911
-0x6854 = 0x9915
-0x6855 = 0x9916
-0x6856 = 0x9917
-0x6857 = 0x991A
-0x6858 = 0x991B
-0x6859 = 0x991C
-0x685A = 0x991F
-0x685B = 0x9922
-0x685C = 0x9926
-0x685D = 0x9927
-0x685E = 0x992B
-0x685F = 0x9931
-0x6860 = 0x9932
-0x6861 = 0x9933
-0x6862 = 0x9934
-0x6863 = 0x9935
-0x6864 = 0x9939
-0x6865 = 0x993A
-0x6866 = 0x993B
-0x6867 = 0x993C
-0x6868 = 0x9940
-0x6869 = 0x9941
-0x686A = 0x9946
-0x686B = 0x9947
-0x686C = 0x9948
-0x686D = 0x994D
-0x686E = 0x994E
-0x686F = 0x9954
-0x6870 = 0x9958
-0x6871 = 0x9959
-0x6872 = 0x995B
-0x6873 = 0x995C
-0x6874 = 0x995E
-0x6875 = 0x995F
-0x6876 = 0x9960
-0x6877 = 0x999B
-0x6878 = 0x999D
-0x6879 = 0x999F
-0x687A = 0x99A6
-0x687B = 0x99B0
-0x687C = 0x99B1
-0x687D = 0x99B2
-0x687E = 0x99B5
-0x6921 = 0x99B9
-0x6922 = 0x99BA
-0x6923 = 0x99BD
-0x6924 = 0x99BF
-0x6925 = 0x99C3
-0x6926 = 0x99C9
-0x6927 = 0x99D3
-0x6928 = 0x99D4
-0x6929 = 0x99D9
-0x692A = 0x99DA
-0x692B = 0x99DC
-0x692C = 0x99DE
-0x692D = 0x99E7
-0x692E = 0x99EA
-0x692F = 0x99EB
-0x6930 = 0x99EC
-0x6931 = 0x99F0
-0x6932 = 0x99F4
-0x6933 = 0x99F5
-0x6934 = 0x99F9
-0x6935 = 0x99FD
-0x6936 = 0x99FE
-0x6937 = 0x9A02
-0x6938 = 0x9A03
-0x6939 = 0x9A04
-0x693A = 0x9A0B
-0x693B = 0x9A0C
-0x693C = 0x9A10
-0x693D = 0x9A11
-0x693E = 0x9A16
-0x693F = 0x9A1E
-0x6940 = 0x9A20
-0x6941 = 0x9A22
-0x6942 = 0x9A23
-0x6943 = 0x9A24
-0x6944 = 0x9A27
-0x6945 = 0x9A2D
-0x6946 = 0x9A2E
-0x6947 = 0x9A33
-0x6948 = 0x9A35
-0x6949 = 0x9A36
-0x694A = 0x9A38
-0x694B = 0x9A47
-0x694C = 0x9A41
-0x694D = 0x9A44
-0x694E = 0x9A4A
-0x694F = 0x9A4B
-0x6950 = 0x9A4C
-0x6951 = 0x9A4E
-0x6952 = 0x9A51
-0x6953 = 0x9A54
-0x6954 = 0x9A56
-0x6955 = 0x9A5D
-0x6956 = 0x9AAA
-0x6957 = 0x9AAC
-0x6958 = 0x9AAE
-0x6959 = 0x9AAF
-0x695A = 0x9AB2
-0x695B = 0x9AB4
-0x695C = 0x9AB5
-0x695D = 0x9AB6
-0x695E = 0x9AB9
-0x695F = 0x9ABB
-0x6960 = 0x9ABE
-0x6961 = 0x9ABF
-0x6962 = 0x9AC1
-0x6963 = 0x9AC3
-0x6964 = 0x9AC6
-0x6965 = 0x9AC8
-0x6966 = 0x9ACE
-0x6967 = 0x9AD0
-0x6968 = 0x9AD2
-0x6969 = 0x9AD5
-0x696A = 0x9AD6
-0x696B = 0x9AD7
-0x696C = 0x9ADB
-0x696D = 0x9ADC
-0x696E = 0x9AE0
-0x696F = 0x9AE4
-0x6970 = 0x9AE5
-0x6971 = 0x9AE7
-0x6972 = 0x9AE9
-0x6973 = 0x9AEC
-0x6974 = 0x9AF2
-0x6975 = 0x9AF3
-0x6976 = 0x9AF5
-0x6977 = 0x9AF9
-0x6978 = 0x9AFA
-0x6979 = 0x9AFD
-0x697A = 0x9AFF
-0x697B = 0x9B00
-0x697C = 0x9B01
-0x697D = 0x9B02
-0x697E = 0x9B03
-0x6A21 = 0x9B04
-0x6A22 = 0x9B05
-0x6A23 = 0x9B08
-0x6A24 = 0x9B09
-0x6A25 = 0x9B0B
-0x6A26 = 0x9B0C
-0x6A27 = 0x9B0D
-0x6A28 = 0x9B0E
-0x6A29 = 0x9B10
-0x6A2A = 0x9B12
-0x6A2B = 0x9B16
-0x6A2C = 0x9B19
-0x6A2D = 0x9B1B
-0x6A2E = 0x9B1C
-0x6A2F = 0x9B20
-0x6A30 = 0x9B26
-0x6A31 = 0x9B2B
-0x6A32 = 0x9B2D
-0x6A33 = 0x9B33
-0x6A34 = 0x9B34
-0x6A35 = 0x9B35
-0x6A36 = 0x9B37
-0x6A37 = 0x9B39
-0x6A38 = 0x9B3A
-0x6A39 = 0x9B3D
-0x6A3A = 0x9B48
-0x6A3B = 0x9B4B
-0x6A3C = 0x9B4C
-0x6A3D = 0x9B55
-0x6A3E = 0x9B56
-0x6A3F = 0x9B57
-0x6A40 = 0x9B5B
-0x6A41 = 0x9B5E
-0x6A42 = 0x9B61
-0x6A43 = 0x9B63
-0x6A44 = 0x9B65
-0x6A45 = 0x9B66
-0x6A46 = 0x9B68
-0x6A47 = 0x9B6A
-0x6A48 = 0x9B6B
-0x6A49 = 0x9B6C
-0x6A4A = 0x9B6D
-0x6A4B = 0x9B6E
-0x6A4C = 0x9B73
-0x6A4D = 0x9B75
-0x6A4E = 0x9B77
-0x6A4F = 0x9B78
-0x6A50 = 0x9B79
-0x6A51 = 0x9B7F
-0x6A52 = 0x9B80
-0x6A53 = 0x9B84
-0x6A54 = 0x9B85
-0x6A55 = 0x9B86
-0x6A56 = 0x9B87
-0x6A57 = 0x9B89
-0x6A58 = 0x9B8A
-0x6A59 = 0x9B8B
-0x6A5A = 0x9B8D
-0x6A5B = 0x9B8F
-0x6A5C = 0x9B90
-0x6A5D = 0x9B94
-0x6A5E = 0x9B9A
-0x6A5F = 0x9B9D
-0x6A60 = 0x9B9E
-0x6A61 = 0x9BA6
-0x6A62 = 0x9BA7
-0x6A63 = 0x9BA9
-0x6A64 = 0x9BAC
-0x6A65 = 0x9BB0
-0x6A66 = 0x9BB1
-0x6A67 = 0x9BB2
-0x6A68 = 0x9BB7
-0x6A69 = 0x9BB8
-0x6A6A = 0x9BBB
-0x6A6B = 0x9BBC
-0x6A6C = 0x9BBE
-0x6A6D = 0x9BBF
-0x6A6E = 0x9BC1
-0x6A6F = 0x9BC7
-0x6A70 = 0x9BC8
-0x6A71 = 0x9BCE
-0x6A72 = 0x9BD0
-0x6A73 = 0x9BD7
-0x6A74 = 0x9BD8
-0x6A75 = 0x9BDD
-0x6A76 = 0x9BDF
-0x6A77 = 0x9BE5
-0x6A78 = 0x9BE7
-0x6A79 = 0x9BEA
-0x6A7A = 0x9BEB
-0x6A7B = 0x9BEF
-0x6A7C = 0x9BF3
-0x6A7D = 0x9BF7
-0x6A7E = 0x9BF8
-0x6B21 = 0x9BF9
-0x6B22 = 0x9BFA
-0x6B23 = 0x9BFD
-0x6B24 = 0x9BFF
-0x6B25 = 0x9C00
-0x6B26 = 0x9C02
-0x6B27 = 0x9C0B
-0x6B28 = 0x9C0F
-0x6B29 = 0x9C11
-0x6B2A = 0x9C16
-0x6B2B = 0x9C18
-0x6B2C = 0x9C19
-0x6B2D = 0x9C1A
-0x6B2E = 0x9C1C
-0x6B2F = 0x9C1E
-0x6B30 = 0x9C22
-0x6B31 = 0x9C23
-0x6B32 = 0x9C26
-0x6B33 = 0x9C27
-0x6B34 = 0x9C28
-0x6B35 = 0x9C29
-0x6B36 = 0x9C2A
-0x6B37 = 0x9C31
-0x6B38 = 0x9C35
-0x6B39 = 0x9C36
-0x6B3A = 0x9C37
-0x6B3B = 0x9C3D
-0x6B3C = 0x9C41
-0x6B3D = 0x9C43
-0x6B3E = 0x9C44
-0x6B3F = 0x9C45
-0x6B40 = 0x9C49
-0x6B41 = 0x9C4A
-0x6B42 = 0x9C4E
-0x6B43 = 0x9C4F
-0x6B44 = 0x9C50
-0x6B45 = 0x9C53
-0x6B46 = 0x9C54
-0x6B47 = 0x9C56
-0x6B48 = 0x9C58
-0x6B49 = 0x9C5B
-0x6B4A = 0x9C5D
-0x6B4B = 0x9C5E
-0x6B4C = 0x9C5F
-0x6B4D = 0x9C63
-0x6B4E = 0x9C69
-0x6B4F = 0x9C6A
-0x6B50 = 0x9C5C
-0x6B51 = 0x9C6B
-0x6B52 = 0x9C68
-0x6B53 = 0x9C6E
-0x6B54 = 0x9C70
-0x6B55 = 0x9C72
-0x6B56 = 0x9C75
-0x6B57 = 0x9C77
-0x6B58 = 0x9C7B
-0x6B59 = 0x9CE6
-0x6B5A = 0x9CF2
-0x6B5B = 0x9CF7
-0x6B5C = 0x9CF9
-0x6B5D = 0x9D0B
-0x6B5E = 0x9D02
-0x6B5F = 0x9D11
-0x6B60 = 0x9D17
-0x6B61 = 0x9D18
-0x6B62 = 0x9D1C
-0x6B63 = 0x9D1D
-0x6B64 = 0x9D1E
-0x6B65 = 0x9D2F
-0x6B66 = 0x9D30
-0x6B67 = 0x9D32
-0x6B68 = 0x9D33
-0x6B69 = 0x9D34
-0x6B6A = 0x9D3A
-0x6B6B = 0x9D3C
-0x6B6C = 0x9D45
-0x6B6D = 0x9D3D
-0x6B6E = 0x9D42
-0x6B6F = 0x9D43
-0x6B70 = 0x9D47
-0x6B71 = 0x9D4A
-0x6B72 = 0x9D53
-0x6B73 = 0x9D54
-0x6B74 = 0x9D5F
-0x6B75 = 0x9D63
-0x6B76 = 0x9D62
-0x6B77 = 0x9D65
-0x6B78 = 0x9D69
-0x6B79 = 0x9D6A
-0x6B7A = 0x9D6B
-0x6B7B = 0x9D70
-0x6B7C = 0x9D76
-0x6B7D = 0x9D77
-0x6B7E = 0x9D7B
-0x6C21 = 0x9D7C
-0x6C22 = 0x9D7E
-0x6C23 = 0x9D83
-0x6C24 = 0x9D84
-0x6C25 = 0x9D86
-0x6C26 = 0x9D8A
-0x6C27 = 0x9D8D
-0x6C28 = 0x9D8E
-0x6C29 = 0x9D92
-0x6C2A = 0x9D93
-0x6C2B = 0x9D95
-0x6C2C = 0x9D96
-0x6C2D = 0x9D97
-0x6C2E = 0x9D98
-0x6C2F = 0x9DA1
-0x6C30 = 0x9DAA
-0x6C31 = 0x9DAC
-0x6C32 = 0x9DAE
-0x6C33 = 0x9DB1
-0x6C34 = 0x9DB5
-0x6C35 = 0x9DB9
-0x6C36 = 0x9DBC
-0x6C37 = 0x9DBF
-0x6C38 = 0x9DC3
-0x6C39 = 0x9DC7
-0x6C3A = 0x9DC9
-0x6C3B = 0x9DCA
-0x6C3C = 0x9DD4
-0x6C3D = 0x9DD5
-0x6C3E = 0x9DD6
-0x6C3F = 0x9DD7
-0x6C40 = 0x9DDA
-0x6C41 = 0x9DDE
-0x6C42 = 0x9DDF
-0x6C43 = 0x9DE0
-0x6C44 = 0x9DE5
-0x6C45 = 0x9DE7
-0x6C46 = 0x9DE9
-0x6C47 = 0x9DEB
-0x6C48 = 0x9DEE
-0x6C49 = 0x9DF0
-0x6C4A = 0x9DF3
-0x6C4B = 0x9DF4
-0x6C4C = 0x9DFE
-0x6C4D = 0x9E0A
-0x6C4E = 0x9E02
-0x6C4F = 0x9E07
-0x6C50 = 0x9E0E
-0x6C51 = 0x9E10
-0x6C52 = 0x9E11
-0x6C53 = 0x9E12
-0x6C54 = 0x9E15
-0x6C55 = 0x9E16
-0x6C56 = 0x9E19
-0x6C57 = 0x9E1C
-0x6C58 = 0x9E1D
-0x6C59 = 0x9E7A
-0x6C5A = 0x9E7B
-0x6C5B = 0x9E7C
-0x6C5C = 0x9E80
-0x6C5D = 0x9E82
-0x6C5E = 0x9E83
-0x6C5F = 0x9E84
-0x6C60 = 0x9E85
-0x6C61 = 0x9E87
-0x6C62 = 0x9E8E
-0x6C63 = 0x9E8F
-0x6C64 = 0x9E96
-0x6C65 = 0x9E98
-0x6C66 = 0x9E9B
-0x6C67 = 0x9E9E
-0x6C68 = 0x9EA4
-0x6C69 = 0x9EA8
-0x6C6A = 0x9EAC
-0x6C6B = 0x9EAE
-0x6C6C = 0x9EAF
-0x6C6D = 0x9EB0
-0x6C6E = 0x9EB3
-0x6C6F = 0x9EB4
-0x6C70 = 0x9EB5
-0x6C71 = 0x9EC6
-0x6C72 = 0x9EC8
-0x6C73 = 0x9ECB
-0x6C74 = 0x9ED5
-0x6C75 = 0x9EDF
-0x6C76 = 0x9EE4
-0x6C77 = 0x9EE7
-0x6C78 = 0x9EEC
-0x6C79 = 0x9EED
-0x6C7A = 0x9EEE
-0x6C7B = 0x9EF0
-0x6C7C = 0x9EF1
-0x6C7D = 0x9EF2
-0x6C7E = 0x9EF5
-0x6D21 = 0x9EF8
-0x6D22 = 0x9EFF
-0x6D23 = 0x9F02
-0x6D24 = 0x9F03
-0x6D25 = 0x9F09
-0x6D26 = 0x9F0F
-0x6D27 = 0x9F10
-0x6D28 = 0x9F11
-0x6D29 = 0x9F12
-0x6D2A = 0x9F14
-0x6D2B = 0x9F16
-0x6D2C = 0x9F17
-0x6D2D = 0x9F19
-0x6D2E = 0x9F1A
-0x6D2F = 0x9F1B
-0x6D30 = 0x9F1F
-0x6D31 = 0x9F22
-0x6D32 = 0x9F26
-0x6D33 = 0x9F2A
-0x6D34 = 0x9F2B
-0x6D35 = 0x9F2F
-0x6D36 = 0x9F31
-0x6D37 = 0x9F32
-0x6D38 = 0x9F34
-0x6D39 = 0x9F37
-0x6D3A = 0x9F39
-0x6D3B = 0x9F3A
-0x6D3C = 0x9F3C
-0x6D3D = 0x9F3D
-0x6D3E = 0x9F3F
-0x6D3F = 0x9F41
-0x6D40 = 0x9F43
-0x6D41 = 0x9F44
-0x6D42 = 0x9F45
-0x6D43 = 0x9F46
-0x6D44 = 0x9F47
-0x6D45 = 0x9F53
-0x6D46 = 0x9F55
-0x6D47 = 0x9F56
-0x6D48 = 0x9F57
-0x6D49 = 0x9F58
-0x6D4A = 0x9F5A
-0x6D4B = 0x9F5D
-0x6D4C = 0x9F5E
-0x6D4D = 0x9F68
-0x6D4E = 0x9F69
-0x6D4F = 0x9F6D
-0x6D50 = 0x9F6E
-0x6D51 = 0x9F6F
-0x6D52 = 0x9F70
-0x6D53 = 0x9F71
-0x6D54 = 0x9F73
-0x6D55 = 0x9F75
-0x6D56 = 0x9F7A
-0x6D57 = 0x9F7D
-0x6D58 = 0x9F8F
-0x6D59 = 0x9F90
-0x6D5A = 0x9F91
-0x6D5B = 0x9F92
-0x6D5C = 0x9F94
-0x6D5D = 0x9F96
-0x6D5E = 0x9F97
-0x6D5F = 0x9F9E
-0x6D60 = 0x9FA1
-0x6D61 = 0x9FA2
-0x6D62 = 0x9FA3
-0x6D63 = 0x9FA5
-END_MAP
diff --git a/enc/trans/JIS/JISX0212UDC%UCS.src b/enc/trans/JIS/JISX0212UDC%UCS.src
deleted file mode 100644
index d9e8cd7cd3..0000000000
--- a/enc/trans/JIS/JISX0212UDC%UCS.src
+++ /dev/null
@@ -1,954 +0,0 @@
-# $NetBSD: JISX0212UDC%UCS.src,v 1.1 2003/07/19 20:20:41 tshiozak Exp $
-
-TYPE ROWCOL
-NAME "JISX0212UDC/UCS"
-SRC_ZONE 0x75 - 0xFE / 0x21 - 0x7E / 8
-OOB_MODE INVALID
-DST_INVALID 0xFFFE
-DST_UNIT_BITS 16
-
-BEGIN_MAP
-#
-# This data is derived from http://www.opengroup.or.jp/jvc/cde/
-#
-0x7521 = 0xE3AC
-0x7522 = 0xE3AD
-0x7523 = 0xE3AE
-0x7524 = 0xE3AF
-0x7525 = 0xE3B0
-0x7526 = 0xE3B1
-0x7527 = 0xE3B2
-0x7528 = 0xE3B3
-0x7529 = 0xE3B4
-0x752A = 0xE3B5
-0x752B = 0xE3B6
-0x752C = 0xE3B7
-0x752D = 0xE3B8
-0x752E = 0xE3B9
-0x752F = 0xE3BA
-0x7530 = 0xE3BB
-0x7531 = 0xE3BC
-0x7532 = 0xE3BD
-0x7533 = 0xE3BE
-0x7534 = 0xE3BF
-0x7535 = 0xE3C0
-0x7536 = 0xE3C1
-0x7537 = 0xE3C2
-0x7538 = 0xE3C3
-0x7539 = 0xE3C4
-0x753A = 0xE3C5
-0x753B = 0xE3C6
-0x753C = 0xE3C7
-0x753D = 0xE3C8
-0x753E = 0xE3C9
-0x753F = 0xE3CA
-0x7540 = 0xE3CB
-0x7541 = 0xE3CC
-0x7542 = 0xE3CD
-0x7543 = 0xE3CE
-0x7544 = 0xE3CF
-0x7545 = 0xE3D0
-0x7546 = 0xE3D1
-0x7547 = 0xE3D2
-0x7548 = 0xE3D3
-0x7549 = 0xE3D4
-0x754A = 0xE3D5
-0x754B = 0xE3D6
-0x754C = 0xE3D7
-0x754D = 0xE3D8
-0x754E = 0xE3D9
-0x754F = 0xE3DA
-0x7550 = 0xE3DB
-0x7551 = 0xE3DC
-0x7552 = 0xE3DD
-0x7553 = 0xE3DE
-0x7554 = 0xE3DF
-0x7555 = 0xE3E0
-0x7556 = 0xE3E1
-0x7557 = 0xE3E2
-0x7558 = 0xE3E3
-0x7559 = 0xE3E4
-0x755A = 0xE3E5
-0x755B = 0xE3E6
-0x755C = 0xE3E7
-0x755D = 0xE3E8
-0x755E = 0xE3E9
-0x755F = 0xE3EA
-0x7560 = 0xE3EB
-0x7561 = 0xE3EC
-0x7562 = 0xE3ED
-0x7563 = 0xE3EE
-0x7564 = 0xE3EF
-0x7565 = 0xE3F0
-0x7566 = 0xE3F1
-0x7567 = 0xE3F2
-0x7568 = 0xE3F3
-0x7569 = 0xE3F4
-0x756A = 0xE3F5
-0x756B = 0xE3F6
-0x756C = 0xE3F7
-0x756D = 0xE3F8
-0x756E = 0xE3F9
-0x756F = 0xE3FA
-0x7570 = 0xE3FB
-0x7571 = 0xE3FC
-0x7572 = 0xE3FD
-0x7573 = 0xE3FE
-0x7574 = 0xE3FF
-0x7575 = 0xE400
-0x7576 = 0xE401
-0x7577 = 0xE402
-0x7578 = 0xE403
-0x7579 = 0xE404
-0x757A = 0xE405
-0x757B = 0xE406
-0x757C = 0xE407
-0x757D = 0xE408
-0x757E = 0xE409
-0x7621 = 0xE40A
-0x7622 = 0xE40B
-0x7623 = 0xE40C
-0x7624 = 0xE40D
-0x7625 = 0xE40E
-0x7626 = 0xE40F
-0x7627 = 0xE410
-0x7628 = 0xE411
-0x7629 = 0xE412
-0x762A = 0xE413
-0x762B = 0xE414
-0x762C = 0xE415
-0x762D = 0xE416
-0x762E = 0xE417
-0x762F = 0xE418
-0x7630 = 0xE419
-0x7631 = 0xE41A
-0x7632 = 0xE41B
-0x7633 = 0xE41C
-0x7634 = 0xE41D
-0x7635 = 0xE41E
-0x7636 = 0xE41F
-0x7637 = 0xE420
-0x7638 = 0xE421
-0x7639 = 0xE422
-0x763A = 0xE423
-0x763B = 0xE424
-0x763C = 0xE425
-0x763D = 0xE426
-0x763E = 0xE427
-0x763F = 0xE428
-0x7640 = 0xE429
-0x7641 = 0xE42A
-0x7642 = 0xE42B
-0x7643 = 0xE42C
-0x7644 = 0xE42D
-0x7645 = 0xE42E
-0x7646 = 0xE42F
-0x7647 = 0xE430
-0x7648 = 0xE431
-0x7649 = 0xE432
-0x764A = 0xE433
-0x764B = 0xE434
-0x764C = 0xE435
-0x764D = 0xE436
-0x764E = 0xE437
-0x764F = 0xE438
-0x7650 = 0xE439
-0x7651 = 0xE43A
-0x7652 = 0xE43B
-0x7653 = 0xE43C
-0x7654 = 0xE43D
-0x7655 = 0xE43E
-0x7656 = 0xE43F
-0x7657 = 0xE440
-0x7658 = 0xE441
-0x7659 = 0xE442
-0x765A = 0xE443
-0x765B = 0xE444
-0x765C = 0xE445
-0x765D = 0xE446
-0x765E = 0xE447
-0x765F = 0xE448
-0x7660 = 0xE449
-0x7661 = 0xE44A
-0x7662 = 0xE44B
-0x7663 = 0xE44C
-0x7664 = 0xE44D
-0x7665 = 0xE44E
-0x7666 = 0xE44F
-0x7667 = 0xE450
-0x7668 = 0xE451
-0x7669 = 0xE452
-0x766A = 0xE453
-0x766B = 0xE454
-0x766C = 0xE455
-0x766D = 0xE456
-0x766E = 0xE457
-0x766F = 0xE458
-0x7670 = 0xE459
-0x7671 = 0xE45A
-0x7672 = 0xE45B
-0x7673 = 0xE45C
-0x7674 = 0xE45D
-0x7675 = 0xE45E
-0x7676 = 0xE45F
-0x7677 = 0xE460
-0x7678 = 0xE461
-0x7679 = 0xE462
-0x767A = 0xE463
-0x767B = 0xE464
-0x767C = 0xE465
-0x767D = 0xE466
-0x767E = 0xE467
-0x7721 = 0xE468
-0x7722 = 0xE469
-0x7723 = 0xE46A
-0x7724 = 0xE46B
-0x7725 = 0xE46C
-0x7726 = 0xE46D
-0x7727 = 0xE46E
-0x7728 = 0xE46F
-0x7729 = 0xE470
-0x772A = 0xE471
-0x772B = 0xE472
-0x772C = 0xE473
-0x772D = 0xE474
-0x772E = 0xE475
-0x772F = 0xE476
-0x7730 = 0xE477
-0x7731 = 0xE478
-0x7732 = 0xE479
-0x7733 = 0xE47A
-0x7734 = 0xE47B
-0x7735 = 0xE47C
-0x7736 = 0xE47D
-0x7737 = 0xE47E
-0x7738 = 0xE47F
-0x7739 = 0xE480
-0x773A = 0xE481
-0x773B = 0xE482
-0x773C = 0xE483
-0x773D = 0xE484
-0x773E = 0xE485
-0x773F = 0xE486
-0x7740 = 0xE487
-0x7741 = 0xE488
-0x7742 = 0xE489
-0x7743 = 0xE48A
-0x7744 = 0xE48B
-0x7745 = 0xE48C
-0x7746 = 0xE48D
-0x7747 = 0xE48E
-0x7748 = 0xE48F
-0x7749 = 0xE490
-0x774A = 0xE491
-0x774B = 0xE492
-0x774C = 0xE493
-0x774D = 0xE494
-0x774E = 0xE495
-0x774F = 0xE496
-0x7750 = 0xE497
-0x7751 = 0xE498
-0x7752 = 0xE499
-0x7753 = 0xE49A
-0x7754 = 0xE49B
-0x7755 = 0xE49C
-0x7756 = 0xE49D
-0x7757 = 0xE49E
-0x7758 = 0xE49F
-0x7759 = 0xE4A0
-0x775A = 0xE4A1
-0x775B = 0xE4A2
-0x775C = 0xE4A3
-0x775D = 0xE4A4
-0x775E = 0xE4A5
-0x775F = 0xE4A6
-0x7760 = 0xE4A7
-0x7761 = 0xE4A8
-0x7762 = 0xE4A9
-0x7763 = 0xE4AA
-0x7764 = 0xE4AB
-0x7765 = 0xE4AC
-0x7766 = 0xE4AD
-0x7767 = 0xE4AE
-0x7768 = 0xE4AF
-0x7769 = 0xE4B0
-0x776A = 0xE4B1
-0x776B = 0xE4B2
-0x776C = 0xE4B3
-0x776D = 0xE4B4
-0x776E = 0xE4B5
-0x776F = 0xE4B6
-0x7770 = 0xE4B7
-0x7771 = 0xE4B8
-0x7772 = 0xE4B9
-0x7773 = 0xE4BA
-0x7774 = 0xE4BB
-0x7775 = 0xE4BC
-0x7776 = 0xE4BD
-0x7777 = 0xE4BE
-0x7778 = 0xE4BF
-0x7779 = 0xE4C0
-0x777A = 0xE4C1
-0x777B = 0xE4C2
-0x777C = 0xE4C3
-0x777D = 0xE4C4
-0x777E = 0xE4C5
-0x7821 = 0xE4C6
-0x7822 = 0xE4C7
-0x7823 = 0xE4C8
-0x7824 = 0xE4C9
-0x7825 = 0xE4CA
-0x7826 = 0xE4CB
-0x7827 = 0xE4CC
-0x7828 = 0xE4CD
-0x7829 = 0xE4CE
-0x782A = 0xE4CF
-0x782B = 0xE4D0
-0x782C = 0xE4D1
-0x782D = 0xE4D2
-0x782E = 0xE4D3
-0x782F = 0xE4D4
-0x7830 = 0xE4D5
-0x7831 = 0xE4D6
-0x7832 = 0xE4D7
-0x7833 = 0xE4D8
-0x7834 = 0xE4D9
-0x7835 = 0xE4DA
-0x7836 = 0xE4DB
-0x7837 = 0xE4DC
-0x7838 = 0xE4DD
-0x7839 = 0xE4DE
-0x783A = 0xE4DF
-0x783B = 0xE4E0
-0x783C = 0xE4E1
-0x783D = 0xE4E2
-0x783E = 0xE4E3
-0x783F = 0xE4E4
-0x7840 = 0xE4E5
-0x7841 = 0xE4E6
-0x7842 = 0xE4E7
-0x7843 = 0xE4E8
-0x7844 = 0xE4E9
-0x7845 = 0xE4EA
-0x7846 = 0xE4EB
-0x7847 = 0xE4EC
-0x7848 = 0xE4ED
-0x7849 = 0xE4EE
-0x784A = 0xE4EF
-0x784B = 0xE4F0
-0x784C = 0xE4F1
-0x784D = 0xE4F2
-0x784E = 0xE4F3
-0x784F = 0xE4F4
-0x7850 = 0xE4F5
-0x7851 = 0xE4F6
-0x7852 = 0xE4F7
-0x7853 = 0xE4F8
-0x7854 = 0xE4F9
-0x7855 = 0xE4FA
-0x7856 = 0xE4FB
-0x7857 = 0xE4FC
-0x7858 = 0xE4FD
-0x7859 = 0xE4FE
-0x785A = 0xE4FF
-0x785B = 0xE500
-0x785C = 0xE501
-0x785D = 0xE502
-0x785E = 0xE503
-0x785F = 0xE504
-0x7860 = 0xE505
-0x7861 = 0xE506
-0x7862 = 0xE507
-0x7863 = 0xE508
-0x7864 = 0xE509
-0x7865 = 0xE50A
-0x7866 = 0xE50B
-0x7867 = 0xE50C
-0x7868 = 0xE50D
-0x7869 = 0xE50E
-0x786A = 0xE50F
-0x786B = 0xE510
-0x786C = 0xE511
-0x786D = 0xE512
-0x786E = 0xE513
-0x786F = 0xE514
-0x7870 = 0xE515
-0x7871 = 0xE516
-0x7872 = 0xE517
-0x7873 = 0xE518
-0x7874 = 0xE519
-0x7875 = 0xE51A
-0x7876 = 0xE51B
-0x7877 = 0xE51C
-0x7878 = 0xE51D
-0x7879 = 0xE51E
-0x787A = 0xE51F
-0x787B = 0xE520
-0x787C = 0xE521
-0x787D = 0xE522
-0x787E = 0xE523
-0x7921 = 0xE524
-0x7922 = 0xE525
-0x7923 = 0xE526
-0x7924 = 0xE527
-0x7925 = 0xE528
-0x7926 = 0xE529
-0x7927 = 0xE52A
-0x7928 = 0xE52B
-0x7929 = 0xE52C
-0x792A = 0xE52D
-0x792B = 0xE52E
-0x792C = 0xE52F
-0x792D = 0xE530
-0x792E = 0xE531
-0x792F = 0xE532
-0x7930 = 0xE533
-0x7931 = 0xE534
-0x7932 = 0xE535
-0x7933 = 0xE536
-0x7934 = 0xE537
-0x7935 = 0xE538
-0x7936 = 0xE539
-0x7937 = 0xE53A
-0x7938 = 0xE53B
-0x7939 = 0xE53C
-0x793A = 0xE53D
-0x793B = 0xE53E
-0x793C = 0xE53F
-0x793D = 0xE540
-0x793E = 0xE541
-0x793F = 0xE542
-0x7940 = 0xE543
-0x7941 = 0xE544
-0x7942 = 0xE545
-0x7943 = 0xE546
-0x7944 = 0xE547
-0x7945 = 0xE548
-0x7946 = 0xE549
-0x7947 = 0xE54A
-0x7948 = 0xE54B
-0x7949 = 0xE54C
-0x794A = 0xE54D
-0x794B = 0xE54E
-0x794C = 0xE54F
-0x794D = 0xE550
-0x794E = 0xE551
-0x794F = 0xE552
-0x7950 = 0xE553
-0x7951 = 0xE554
-0x7952 = 0xE555
-0x7953 = 0xE556
-0x7954 = 0xE557
-0x7955 = 0xE558
-0x7956 = 0xE559
-0x7957 = 0xE55A
-0x7958 = 0xE55B
-0x7959 = 0xE55C
-0x795A = 0xE55D
-0x795B = 0xE55E
-0x795C = 0xE55F
-0x795D = 0xE560
-0x795E = 0xE561
-0x795F = 0xE562
-0x7960 = 0xE563
-0x7961 = 0xE564
-0x7962 = 0xE565
-0x7963 = 0xE566
-0x7964 = 0xE567
-0x7965 = 0xE568
-0x7966 = 0xE569
-0x7967 = 0xE56A
-0x7968 = 0xE56B
-0x7969 = 0xE56C
-0x796A = 0xE56D
-0x796B = 0xE56E
-0x796C = 0xE56F
-0x796D = 0xE570
-0x796E = 0xE571
-0x796F = 0xE572
-0x7970 = 0xE573
-0x7971 = 0xE574
-0x7972 = 0xE575
-0x7973 = 0xE576
-0x7974 = 0xE577
-0x7975 = 0xE578
-0x7976 = 0xE579
-0x7977 = 0xE57A
-0x7978 = 0xE57B
-0x7979 = 0xE57C
-0x797A = 0xE57D
-0x797B = 0xE57E
-0x797C = 0xE57F
-0x797D = 0xE580
-0x797E = 0xE581
-0x7A21 = 0xE582
-0x7A22 = 0xE583
-0x7A23 = 0xE584
-0x7A24 = 0xE585
-0x7A25 = 0xE586
-0x7A26 = 0xE587
-0x7A27 = 0xE588
-0x7A28 = 0xE589
-0x7A29 = 0xE58A
-0x7A2A = 0xE58B
-0x7A2B = 0xE58C
-0x7A2C = 0xE58D
-0x7A2D = 0xE58E
-0x7A2E = 0xE58F
-0x7A2F = 0xE590
-0x7A30 = 0xE591
-0x7A31 = 0xE592
-0x7A32 = 0xE593
-0x7A33 = 0xE594
-0x7A34 = 0xE595
-0x7A35 = 0xE596
-0x7A36 = 0xE597
-0x7A37 = 0xE598
-0x7A38 = 0xE599
-0x7A39 = 0xE59A
-0x7A3A = 0xE59B
-0x7A3B = 0xE59C
-0x7A3C = 0xE59D
-0x7A3D = 0xE59E
-0x7A3E = 0xE59F
-0x7A3F = 0xE5A0
-0x7A40 = 0xE5A1
-0x7A41 = 0xE5A2
-0x7A42 = 0xE5A3
-0x7A43 = 0xE5A4
-0x7A44 = 0xE5A5
-0x7A45 = 0xE5A6
-0x7A46 = 0xE5A7
-0x7A47 = 0xE5A8
-0x7A48 = 0xE5A9
-0x7A49 = 0xE5AA
-0x7A4A = 0xE5AB
-0x7A4B = 0xE5AC
-0x7A4C = 0xE5AD
-0x7A4D = 0xE5AE
-0x7A4E = 0xE5AF
-0x7A4F = 0xE5B0
-0x7A50 = 0xE5B1
-0x7A51 = 0xE5B2
-0x7A52 = 0xE5B3
-0x7A53 = 0xE5B4
-0x7A54 = 0xE5B5
-0x7A55 = 0xE5B6
-0x7A56 = 0xE5B7
-0x7A57 = 0xE5B8
-0x7A58 = 0xE5B9
-0x7A59 = 0xE5BA
-0x7A5A = 0xE5BB
-0x7A5B = 0xE5BC
-0x7A5C = 0xE5BD
-0x7A5D = 0xE5BE
-0x7A5E = 0xE5BF
-0x7A5F = 0xE5C0
-0x7A60 = 0xE5C1
-0x7A61 = 0xE5C2
-0x7A62 = 0xE5C3
-0x7A63 = 0xE5C4
-0x7A64 = 0xE5C5
-0x7A65 = 0xE5C6
-0x7A66 = 0xE5C7
-0x7A67 = 0xE5C8
-0x7A68 = 0xE5C9
-0x7A69 = 0xE5CA
-0x7A6A = 0xE5CB
-0x7A6B = 0xE5CC
-0x7A6C = 0xE5CD
-0x7A6D = 0xE5CE
-0x7A6E = 0xE5CF
-0x7A6F = 0xE5D0
-0x7A70 = 0xE5D1
-0x7A71 = 0xE5D2
-0x7A72 = 0xE5D3
-0x7A73 = 0xE5D4
-0x7A74 = 0xE5D5
-0x7A75 = 0xE5D6
-0x7A76 = 0xE5D7
-0x7A77 = 0xE5D8
-0x7A78 = 0xE5D9
-0x7A79 = 0xE5DA
-0x7A7A = 0xE5DB
-0x7A7B = 0xE5DC
-0x7A7C = 0xE5DD
-0x7A7D = 0xE5DE
-0x7A7E = 0xE5DF
-0x7B21 = 0xE5E0
-0x7B22 = 0xE5E1
-0x7B23 = 0xE5E2
-0x7B24 = 0xE5E3
-0x7B25 = 0xE5E4
-0x7B26 = 0xE5E5
-0x7B27 = 0xE5E6
-0x7B28 = 0xE5E7
-0x7B29 = 0xE5E8
-0x7B2A = 0xE5E9
-0x7B2B = 0xE5EA
-0x7B2C = 0xE5EB
-0x7B2D = 0xE5EC
-0x7B2E = 0xE5ED
-0x7B2F = 0xE5EE
-0x7B30 = 0xE5EF
-0x7B31 = 0xE5F0
-0x7B32 = 0xE5F1
-0x7B33 = 0xE5F2
-0x7B34 = 0xE5F3
-0x7B35 = 0xE5F4
-0x7B36 = 0xE5F5
-0x7B37 = 0xE5F6
-0x7B38 = 0xE5F7
-0x7B39 = 0xE5F8
-0x7B3A = 0xE5F9
-0x7B3B = 0xE5FA
-0x7B3C = 0xE5FB
-0x7B3D = 0xE5FC
-0x7B3E = 0xE5FD
-0x7B3F = 0xE5FE
-0x7B40 = 0xE5FF
-0x7B41 = 0xE600
-0x7B42 = 0xE601
-0x7B43 = 0xE602
-0x7B44 = 0xE603
-0x7B45 = 0xE604
-0x7B46 = 0xE605
-0x7B47 = 0xE606
-0x7B48 = 0xE607
-0x7B49 = 0xE608
-0x7B4A = 0xE609
-0x7B4B = 0xE60A
-0x7B4C = 0xE60B
-0x7B4D = 0xE60C
-0x7B4E = 0xE60D
-0x7B4F = 0xE60E
-0x7B50 = 0xE60F
-0x7B51 = 0xE610
-0x7B52 = 0xE611
-0x7B53 = 0xE612
-0x7B54 = 0xE613
-0x7B55 = 0xE614
-0x7B56 = 0xE615
-0x7B57 = 0xE616
-0x7B58 = 0xE617
-0x7B59 = 0xE618
-0x7B5A = 0xE619
-0x7B5B = 0xE61A
-0x7B5C = 0xE61B
-0x7B5D = 0xE61C
-0x7B5E = 0xE61D
-0x7B5F = 0xE61E
-0x7B60 = 0xE61F
-0x7B61 = 0xE620
-0x7B62 = 0xE621
-0x7B63 = 0xE622
-0x7B64 = 0xE623
-0x7B65 = 0xE624
-0x7B66 = 0xE625
-0x7B67 = 0xE626
-0x7B68 = 0xE627
-0x7B69 = 0xE628
-0x7B6A = 0xE629
-0x7B6B = 0xE62A
-0x7B6C = 0xE62B
-0x7B6D = 0xE62C
-0x7B6E = 0xE62D
-0x7B6F = 0xE62E
-0x7B70 = 0xE62F
-0x7B71 = 0xE630
-0x7B72 = 0xE631
-0x7B73 = 0xE632
-0x7B74 = 0xE633
-0x7B75 = 0xE634
-0x7B76 = 0xE635
-0x7B77 = 0xE636
-0x7B78 = 0xE637
-0x7B79 = 0xE638
-0x7B7A = 0xE639
-0x7B7B = 0xE63A
-0x7B7C = 0xE63B
-0x7B7D = 0xE63C
-0x7B7E = 0xE63D
-0x7C21 = 0xE63E
-0x7C22 = 0xE63F
-0x7C23 = 0xE640
-0x7C24 = 0xE641
-0x7C25 = 0xE642
-0x7C26 = 0xE643
-0x7C27 = 0xE644
-0x7C28 = 0xE645
-0x7C29 = 0xE646
-0x7C2A = 0xE647
-0x7C2B = 0xE648
-0x7C2C = 0xE649
-0x7C2D = 0xE64A
-0x7C2E = 0xE64B
-0x7C2F = 0xE64C
-0x7C30 = 0xE64D
-0x7C31 = 0xE64E
-0x7C32 = 0xE64F
-0x7C33 = 0xE650
-0x7C34 = 0xE651
-0x7C35 = 0xE652
-0x7C36 = 0xE653
-0x7C37 = 0xE654
-0x7C38 = 0xE655
-0x7C39 = 0xE656
-0x7C3A = 0xE657
-0x7C3B = 0xE658
-0x7C3C = 0xE659
-0x7C3D = 0xE65A
-0x7C3E = 0xE65B
-0x7C3F = 0xE65C
-0x7C40 = 0xE65D
-0x7C41 = 0xE65E
-0x7C42 = 0xE65F
-0x7C43 = 0xE660
-0x7C44 = 0xE661
-0x7C45 = 0xE662
-0x7C46 = 0xE663
-0x7C47 = 0xE664
-0x7C48 = 0xE665
-0x7C49 = 0xE666
-0x7C4A = 0xE667
-0x7C4B = 0xE668
-0x7C4C = 0xE669
-0x7C4D = 0xE66A
-0x7C4E = 0xE66B
-0x7C4F = 0xE66C
-0x7C50 = 0xE66D
-0x7C51 = 0xE66E
-0x7C52 = 0xE66F
-0x7C53 = 0xE670
-0x7C54 = 0xE671
-0x7C55 = 0xE672
-0x7C56 = 0xE673
-0x7C57 = 0xE674
-0x7C58 = 0xE675
-0x7C59 = 0xE676
-0x7C5A = 0xE677
-0x7C5B = 0xE678
-0x7C5C = 0xE679
-0x7C5D = 0xE67A
-0x7C5E = 0xE67B
-0x7C5F = 0xE67C
-0x7C60 = 0xE67D
-0x7C61 = 0xE67E
-0x7C62 = 0xE67F
-0x7C63 = 0xE680
-0x7C64 = 0xE681
-0x7C65 = 0xE682
-0x7C66 = 0xE683
-0x7C67 = 0xE684
-0x7C68 = 0xE685
-0x7C69 = 0xE686
-0x7C6A = 0xE687
-0x7C6B = 0xE688
-0x7C6C = 0xE689
-0x7C6D = 0xE68A
-0x7C6E = 0xE68B
-0x7C6F = 0xE68C
-0x7C70 = 0xE68D
-0x7C71 = 0xE68E
-0x7C72 = 0xE68F
-0x7C73 = 0xE690
-0x7C74 = 0xE691
-0x7C75 = 0xE692
-0x7C76 = 0xE693
-0x7C77 = 0xE694
-0x7C78 = 0xE695
-0x7C79 = 0xE696
-0x7C7A = 0xE697
-0x7C7B = 0xE698
-0x7C7C = 0xE699
-0x7C7D = 0xE69A
-0x7C7E = 0xE69B
-0x7D21 = 0xE69C
-0x7D22 = 0xE69D
-0x7D23 = 0xE69E
-0x7D24 = 0xE69F
-0x7D25 = 0xE6A0
-0x7D26 = 0xE6A1
-0x7D27 = 0xE6A2
-0x7D28 = 0xE6A3
-0x7D29 = 0xE6A4
-0x7D2A = 0xE6A5
-0x7D2B = 0xE6A6
-0x7D2C = 0xE6A7
-0x7D2D = 0xE6A8
-0x7D2E = 0xE6A9
-0x7D2F = 0xE6AA
-0x7D30 = 0xE6AB
-0x7D31 = 0xE6AC
-0x7D32 = 0xE6AD
-0x7D33 = 0xE6AE
-0x7D34 = 0xE6AF
-0x7D35 = 0xE6B0
-0x7D36 = 0xE6B1
-0x7D37 = 0xE6B2
-0x7D38 = 0xE6B3
-0x7D39 = 0xE6B4
-0x7D3A = 0xE6B5
-0x7D3B = 0xE6B6
-0x7D3C = 0xE6B7
-0x7D3D = 0xE6B8
-0x7D3E = 0xE6B9
-0x7D3F = 0xE6BA
-0x7D40 = 0xE6BB
-0x7D41 = 0xE6BC
-0x7D42 = 0xE6BD
-0x7D43 = 0xE6BE
-0x7D44 = 0xE6BF
-0x7D45 = 0xE6C0
-0x7D46 = 0xE6C1
-0x7D47 = 0xE6C2
-0x7D48 = 0xE6C3
-0x7D49 = 0xE6C4
-0x7D4A = 0xE6C5
-0x7D4B = 0xE6C6
-0x7D4C = 0xE6C7
-0x7D4D = 0xE6C8
-0x7D4E = 0xE6C9
-0x7D4F = 0xE6CA
-0x7D50 = 0xE6CB
-0x7D51 = 0xE6CC
-0x7D52 = 0xE6CD
-0x7D53 = 0xE6CE
-0x7D54 = 0xE6CF
-0x7D55 = 0xE6D0
-0x7D56 = 0xE6D1
-0x7D57 = 0xE6D2
-0x7D58 = 0xE6D3
-0x7D59 = 0xE6D4
-0x7D5A = 0xE6D5
-0x7D5B = 0xE6D6
-0x7D5C = 0xE6D7
-0x7D5D = 0xE6D8
-0x7D5E = 0xE6D9
-0x7D5F = 0xE6DA
-0x7D60 = 0xE6DB
-0x7D61 = 0xE6DC
-0x7D62 = 0xE6DD
-0x7D63 = 0xE6DE
-0x7D64 = 0xE6DF
-0x7D65 = 0xE6E0
-0x7D66 = 0xE6E1
-0x7D67 = 0xE6E2
-0x7D68 = 0xE6E3
-0x7D69 = 0xE6E4
-0x7D6A = 0xE6E5
-0x7D6B = 0xE6E6
-0x7D6C = 0xE6E7
-0x7D6D = 0xE6E8
-0x7D6E = 0xE6E9
-0x7D6F = 0xE6EA
-0x7D70 = 0xE6EB
-0x7D71 = 0xE6EC
-0x7D72 = 0xE6ED
-0x7D73 = 0xE6EE
-0x7D74 = 0xE6EF
-0x7D75 = 0xE6F0
-0x7D76 = 0xE6F1
-0x7D77 = 0xE6F2
-0x7D78 = 0xE6F3
-0x7D79 = 0xE6F4
-0x7D7A = 0xE6F5
-0x7D7B = 0xE6F6
-0x7D7C = 0xE6F7
-0x7D7D = 0xE6F8
-0x7D7E = 0xE6F9
-0x7E21 = 0xE6FA
-0x7E22 = 0xE6FB
-0x7E23 = 0xE6FC
-0x7E24 = 0xE6FD
-0x7E25 = 0xE6FE
-0x7E26 = 0xE6FF
-0x7E27 = 0xE700
-0x7E28 = 0xE701
-0x7E29 = 0xE702
-0x7E2A = 0xE703
-0x7E2B = 0xE704
-0x7E2C = 0xE705
-0x7E2D = 0xE706
-0x7E2E = 0xE707
-0x7E2F = 0xE708
-0x7E30 = 0xE709
-0x7E31 = 0xE70A
-0x7E32 = 0xE70B
-0x7E33 = 0xE70C
-0x7E34 = 0xE70D
-0x7E35 = 0xE70E
-0x7E36 = 0xE70F
-0x7E37 = 0xE710
-0x7E38 = 0xE711
-0x7E39 = 0xE712
-0x7E3A = 0xE713
-0x7E3B = 0xE714
-0x7E3C = 0xE715
-0x7E3D = 0xE716
-0x7E3E = 0xE717
-0x7E3F = 0xE718
-0x7E40 = 0xE719
-0x7E41 = 0xE71A
-0x7E42 = 0xE71B
-0x7E43 = 0xE71C
-0x7E44 = 0xE71D
-0x7E45 = 0xE71E
-0x7E46 = 0xE71F
-0x7E47 = 0xE720
-0x7E48 = 0xE721
-0x7E49 = 0xE722
-0x7E4A = 0xE723
-0x7E4B = 0xE724
-0x7E4C = 0xE725
-0x7E4D = 0xE726
-0x7E4E = 0xE727
-0x7E4F = 0xE728
-0x7E50 = 0xE729
-0x7E51 = 0xE72A
-0x7E52 = 0xE72B
-0x7E53 = 0xE72C
-0x7E54 = 0xE72D
-0x7E55 = 0xE72E
-0x7E56 = 0xE72F
-0x7E57 = 0xE730
-0x7E58 = 0xE731
-0x7E59 = 0xE732
-0x7E5A = 0xE733
-0x7E5B = 0xE734
-0x7E5C = 0xE735
-0x7E5D = 0xE736
-0x7E5E = 0xE737
-0x7E5F = 0xE738
-0x7E60 = 0xE739
-0x7E61 = 0xE73A
-0x7E62 = 0xE73B
-0x7E63 = 0xE73C
-0x7E64 = 0xE73D
-0x7E65 = 0xE73E
-0x7E66 = 0xE73F
-0x7E67 = 0xE740
-0x7E68 = 0xE741
-0x7E69 = 0xE742
-0x7E6A = 0xE743
-0x7E6B = 0xE744
-0x7E6C = 0xE745
-0x7E6D = 0xE746
-0x7E6E = 0xE747
-0x7E6F = 0xE748
-0x7E70 = 0xE749
-0x7E71 = 0xE74A
-0x7E72 = 0xE74B
-0x7E73 = 0xE74C
-0x7E74 = 0xE74D
-0x7E75 = 0xE74E
-0x7E76 = 0xE74F
-0x7E77 = 0xE750
-0x7E78 = 0xE751
-0x7E79 = 0xE752
-0x7E7A = 0xE753
-0x7E7B = 0xE754
-0x7E7C = 0xE755
-0x7E7D = 0xE756
-0x7E7E = 0xE757
-END_MAP
diff --git a/enc/trans/JIS/JISX0212VDC@IBM%UCS.src b/enc/trans/JIS/JISX0212VDC@IBM%UCS.src
deleted file mode 100644
index 6f73ed3617..0000000000
--- a/enc/trans/JIS/JISX0212VDC@IBM%UCS.src
+++ /dev/null
@@ -1,120 +0,0 @@
-# $NetBSD: JISX0212VDC@IBM%UCS.src,v 1.1 2003/07/19 20:20:41 tshiozak Exp $
-
-TYPE ROWCOL
-NAME "JISX0212VDC:IBM/UCS"
-SRC_ZONE 0x7321 - 0x747E
-OOB_MODE INVALID
-DST_INVALID 0xFFFE
-DST_UNIT_BITS 16
-
-BEGIN_MAP
-#
-# This data is derived from http://www.opengroup.or.jp/jvc/cde/
-#
-0x7373 = 0x2170
-0x7374 = 0x2171
-0x7375 = 0x2172
-0x7376 = 0x2173
-0x7377 = 0x2174
-0x7378 = 0x2175
-0x7379 = 0x2176
-0x737A = 0x2177
-0x737B = 0x2178
-0x737C = 0x2179
-0x737D = 0x2160
-0x737E = 0x2161
-0x7421 = 0x2162
-0x7422 = 0x2163
-0x7423 = 0x2164
-0x7424 = 0x2165
-0x7425 = 0x2166
-0x7426 = 0x2167
-0x7427 = 0x2168
-0x7428 = 0x2169
-0x7429 = 0xFF07
-0x742A = 0xFF02
-0x742B = 0x3231
-0x742C = 0x2116
-0x742D = 0x2121
-0x742E = 0x70BB
-0x742F = 0x4EFC
-0x7430 = 0x50F4
-0x7431 = 0x51EC
-0x7432 = 0x5307
-0x7433 = 0x5324
-0x7434 = 0xFA0E
-0x7435 = 0x548A
-0x7436 = 0x5759
-0x7437 = 0xFA0F
-0x7438 = 0xFA10
-0x7439 = 0x589E
-0x743A = 0x5BEC
-0x743B = 0x5CF5
-0x743C = 0x5D53
-0x743D = 0xFA11
-0x743E = 0x5FB7
-0x743F = 0x6085
-0x7440 = 0x6120
-0x7441 = 0x654E
-0x7442 = 0x663B
-0x7443 = 0x6665
-0x7444 = 0xFA12
-0x7445 = 0xF929
-0x7446 = 0x6801
-0x7447 = 0xFA13
-0x7448 = 0xFA14
-0x7449 = 0x6A6B
-0x744A = 0x6AE2
-0x744B = 0x6DF8
-0x744C = 0x6DF2
-0x744D = 0x7028
-0x744E = 0xFA15
-0x744F = 0xFA16
-0x7450 = 0x7501
-0x7451 = 0x7682
-0x7452 = 0x769E
-0x7453 = 0xFA17
-0x7454 = 0x7930
-0x7455 = 0xFA18
-0x7456 = 0xFA19
-0x7457 = 0xFA1A
-0x7458 = 0xFA1B
-0x7459 = 0x7AE7
-0x745A = 0xFA1C
-0x745B = 0xFA1D
-0x745C = 0x7DA0
-0x745D = 0x7DD6
-0x745E = 0xFA1E
-0x745F = 0x8362
-0x7460 = 0xFA1F
-0x7461 = 0x85B0
-0x7462 = 0xFA20
-0x7463 = 0xFA21
-0x7464 = 0x8807
-0x7465 = 0xFA22
-0x7466 = 0x8B7F
-0x7467 = 0x8CF4
-0x7468 = 0x8D76
-0x7469 = 0xFA23
-0x746A = 0xFA24
-0x746B = 0xFA25
-0x746C = 0x90DE
-0x746D = 0xFA26
-0x746E = 0x9115
-0x746F = 0xFA27
-0x7470 = 0xFA28
-0x7471 = 0x9592
-0x7472 = 0xF9DC
-0x7473 = 0xFA29
-0x7474 = 0x973B
-0x7475 = 0x974D
-0x7476 = 0x9751
-0x7477 = 0xFA2A
-0x7478 = 0xFA2B
-0x7479 = 0xFA2C
-0x747A = 0x999E
-0x747B = 0x9AD9
-0x747C = 0x9B72
-0x747D = 0xFA2D
-0x747E = 0x9ED1
-END_MAP
diff --git a/enc/trans/JIS/UCS%JISX0201-KANA.src b/enc/trans/JIS/UCS%JISX0201-KANA.src
deleted file mode 100644
index 57ae00f23b..0000000000
--- a/enc/trans/JIS/UCS%JISX0201-KANA.src
+++ /dev/null
@@ -1,127 +0,0 @@
-# $NetBSD: UCS%JISX0201-KANA.src,v 1.5 2006/10/26 16:04:21 tnozaki Exp $
-
-TYPE ROWCOL
-NAME "UCS/JISX0201-KANA"
-SRC_ZONE 0xFF60 - 0xFF9F
-OOB_MODE INVALID
-DST_INVALID 0xFF
-DST_UNIT_BITS 8
-
-BEGIN_MAP
-#
-# This mapping data is made from the mapping data provided by Unicode, Inc.
-# Original notice:
-#
-# Name: JIS X 0201 (1976) to Unicode 1.1 Table
-# Unicode version: 1.1
-# Table version: 0.9
-# Table format: Format A
-# Date: 8 March 1994
-#
-# Copyright (c) 1991-1994 Unicode, Inc. All Rights reserved.
-#
-# This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
-# No claims are made as to fitness for any particular purpose. No
-# warranties of any kind are expressed or implied. The recipient
-# agrees to determine applicability of information provided. If this
-# file has been provided on magnetic media by Unicode, Inc., the sole
-# remedy for any claim will be exchange of defective media within 90
-# days of receipt.
-#
-# Recipient is granted the right to make copies in any form for
-# internal distribution and to freely use the information supplied
-# in the creation of products supporting Unicode. Unicode, Inc.
-# specifically excludes the right to re-distribute this file directly
-# to third parties or other organizations whether for profit or not.
-#
-# General notes:
-#
-#
-# This table contains one set of mappings from JIS X 0201 into Unicode.
-# Note that these data are *possible* mappings only and may not be the
-# same as those used by actual products, nor may they be the best suited
-# for all uses. For more information on the mappings between various code
-# pages incorporating the repertoire of JIS X 0201 and Unicode, consult the
-# VENDORS mapping data. Normative information on the mapping between
-# JIS X 0201 and Unicode may be found in the Unihan.txt file in the
-# latest Unicode Character Database.
-#
-# If you have carefully considered the fact that the mappings in
-# this table are only one possible set of mappings between JIS X 0201 and
-# Unicode and have no normative status, but still feel that you
-# have located an error in the table that requires fixing, you may
-# report any such error to errata@unicode.org.
-#
-#
-# Format: Three tab-separated columns
-# Column #1 is the shift JIS code (in hex as 0xXX)
-# Column #2 is the Unicode (in hex as 0xXXXX)
-# Column #3 the Unicode (ISO 10646) name (follows a comment sign)
-#
-# The entries are in JIS order
-#
-#
-0xFF61 = 0x21
-0xFF62 = 0x22
-0xFF63 = 0x23
-0xFF64 = 0x24
-0xFF65 = 0x25
-0xFF66 = 0x26
-0xFF67 = 0x27
-0xFF68 = 0x28
-0xFF69 = 0x29
-0xFF6A = 0x2A
-0xFF6B = 0x2B
-0xFF6C = 0x2C
-0xFF6D = 0x2D
-0xFF6E = 0x2E
-0xFF6F = 0x2F
-0xFF70 = 0x30
-0xFF71 = 0x31
-0xFF72 = 0x32
-0xFF73 = 0x33
-0xFF74 = 0x34
-0xFF75 = 0x35
-0xFF76 = 0x36
-0xFF77 = 0x37
-0xFF78 = 0x38
-0xFF79 = 0x39
-0xFF7A = 0x3A
-0xFF7B = 0x3B
-0xFF7C = 0x3C
-0xFF7D = 0x3D
-0xFF7E = 0x3E
-0xFF7F = 0x3F
-0xFF80 = 0x40
-0xFF81 = 0x41
-0xFF82 = 0x42
-0xFF83 = 0x43
-0xFF84 = 0x44
-0xFF85 = 0x45
-0xFF86 = 0x46
-0xFF87 = 0x47
-0xFF88 = 0x48
-0xFF89 = 0x49
-0xFF8A = 0x4A
-0xFF8B = 0x4B
-0xFF8C = 0x4C
-0xFF8D = 0x4D
-0xFF8E = 0x4E
-0xFF8F = 0x4F
-0xFF90 = 0x50
-0xFF91 = 0x51
-0xFF92 = 0x52
-0xFF93 = 0x53
-0xFF94 = 0x54
-0xFF95 = 0x55
-0xFF96 = 0x56
-0xFF97 = 0x57
-0xFF98 = 0x58
-0xFF99 = 0x59
-0xFF9A = 0x5A
-0xFF9B = 0x5B
-0xFF9C = 0x5C
-0xFF9D = 0x5D
-0xFF9E = 0x5E
-0xFF9F = 0x5F
-END_MAP
diff --git a/enc/trans/JIS/UCS%JISX0208@1990.src b/enc/trans/JIS/UCS%JISX0208@1990.src
deleted file mode 100644
index 977171ccda..0000000000
--- a/enc/trans/JIS/UCS%JISX0208@1990.src
+++ /dev/null
@@ -1,6974 +0,0 @@
-# $NetBSD: UCS%JISX0208@1990.src,v 1.7 2006/11/29 15:45:26 tnozaki Exp $
-
-TYPE ROWCOL
-NAME "UCS/JISX0208:1990"
-SRC_ZONE 0x005C - 0xFFE5
-OOB_MODE INVALID
-DST_INVALID 0xFFFF
-DST_UNIT_BITS 16
-
-BEGIN_MAP
-#
-# This mapping data is made from the mapping data provided by Unicode, Inc.
-# Original notice:
-#
-# Name: JIS X 0208 (1990) to Unicode
-# Unicode version: 1.1
-# Table version: 0.9
-# Table format: Format A
-# Date: 8 March 1994
-#
-# Copyright (c) 1991-1994 Unicode, Inc. All Rights reserved.
-#
-# This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
-# No claims are made as to fitness for any particular purpose. No
-# warranties of any kind are expressed or implied. The recipient
-# agrees to determine applicability of information provided. If this
-# file has been provided on magnetic media by Unicode, Inc., the sole
-# remedy for any claim will be exchange of defective media within 90
-# days of receipt.
-#
-# Recipient is granted the right to make copies in any form for
-# internal distribution and to freely use the information supplied
-# in the creation of products supporting Unicode. Unicode, Inc.
-# specifically excludes the right to re-distribute this file directly
-# to third parties or other organizations whether for profit or not.
-#
-# General notes:
-#
-#
-# This table contains one set of mappings from JIS X 0208 (1990) into Unicode.
-# Note that these data are *possible* mappings only and may not be the
-# same as those used by actual products, nor may they be the best suited
-# for all uses. For more information on the mappings between various code
-# pages incorporating the repertoire of JIS X 0208 (1990) and Unicode, consult the
-# VENDORS mapping data. Normative information on the mapping between
-# JIS X 0208 (1990) and Unicode may be found in the Unihan.txt file in the
-# latest Unicode Character Database.
-#
-# If you have carefully considered the fact that the mappings in
-# this table are only one possible set of mappings between JIS X 0208 (1990)
-# and Unicode and have no normative status, but still feel that you
-# have located an error in the table that requires fixing, you may
-# report any such error to errata@unicode.org.
-#
-#
-# Format: Four tab-separated columns
-# Column #1 is the shift-JIS code (in hex)
-# Column #2 is the JIS X 0208 code (in hex as 0xXXXX)
-# Column #3 is the Unicode (in hex as 0xXXXX)
-# Column #4 the Unicode name (follows a comment sign, '#')
-# The official names for Unicode characters U+4E00
-# to U+9FA5, inclusive, is "CJK UNIFIED IDEOGRAPH-XXXX",
-# where XXXX is the code point. Including all these
-# names in this file increases its size substantially
-# and needlessly. The token "<CJK>" is used for the
-# name of these characters. If necessary, it can be
-# expanded algorithmically by a parser or editor.
-#
-# The entries are in JIS X 0208 order
-#
-# The following algorithms can be used to change the hex form
-# of JIS 0208 to other standard forms:
-#
-# To change hex to EUC form, add 0x8080
-# To change hex to kuten form, first subtract 0x2020. Then
-# the high and low bytes correspond to the ku and ten of
-# the kuten form. For example, 0x2121 -> 0x0101 -> 0101;
-# 0x7426 -> 0x5406 -> 8406
-#
-# The kanji mappings are a normative part of ISO/IEC 10646. The
-# non-kanji mappings are provisional, pending definition of
-# official mappings by Japanese standards bodies
-#
-# Any comments or problems, contact <John_Jenkins@taligent.com>
-#
-#
-# NetBSD specific modification:
-# 2003-08-18 : add U+FF3C -> 0x2140 conversion.
-# see UCS%JISX0208@1990.src.
-#
-# Ruby specific modification:
-# 2008-08-31 : remove U+005C -> 0x2140 conversion.
-#
-0x00A2 = 0x2171
-0x00A3 = 0x2172
-0x00A7 = 0x2178
-0x00A8 = 0x212F
-0x00AC = 0x224C
-0x00B0 = 0x216B
-0x00B1 = 0x215E
-0x00B4 = 0x212D
-0x00B6 = 0x2279
-0x00D7 = 0x215F
-0x00F7 = 0x2160
-0x0391 = 0x2621
-0x0392 = 0x2622
-0x0393 = 0x2623
-0x0394 = 0x2624
-0x0395 = 0x2625
-0x0396 = 0x2626
-0x0397 = 0x2627
-0x0398 = 0x2628
-0x0399 = 0x2629
-0x039A = 0x262A
-0x039B = 0x262B
-0x039C = 0x262C
-0x039D = 0x262D
-0x039E = 0x262E
-0x039F = 0x262F
-0x03A0 = 0x2630
-0x03A1 = 0x2631
-0x03A3 = 0x2632
-0x03A4 = 0x2633
-0x03A5 = 0x2634
-0x03A6 = 0x2635
-0x03A7 = 0x2636
-0x03A8 = 0x2637
-0x03A9 = 0x2638
-0x03B1 = 0x2641
-0x03B2 = 0x2642
-0x03B3 = 0x2643
-0x03B4 = 0x2644
-0x03B5 = 0x2645
-0x03B6 = 0x2646
-0x03B7 = 0x2647
-0x03B8 = 0x2648
-0x03B9 = 0x2649
-0x03BA = 0x264A
-0x03BB = 0x264B
-0x03BC = 0x264C
-0x03BD = 0x264D
-0x03BE = 0x264E
-0x03BF = 0x264F
-0x03C0 = 0x2650
-0x03C1 = 0x2651
-0x03C3 = 0x2652
-0x03C4 = 0x2653
-0x03C5 = 0x2654
-0x03C6 = 0x2655
-0x03C7 = 0x2656
-0x03C8 = 0x2657
-0x03C9 = 0x2658
-0x0401 = 0x2727
-0x0410 = 0x2721
-0x0411 = 0x2722
-0x0412 = 0x2723
-0x0413 = 0x2724
-0x0414 = 0x2725
-0x0415 = 0x2726
-0x0416 = 0x2728
-0x0417 = 0x2729
-0x0418 = 0x272A
-0x0419 = 0x272B
-0x041A = 0x272C
-0x041B = 0x272D
-0x041C = 0x272E
-0x041D = 0x272F
-0x041E = 0x2730
-0x041F = 0x2731
-0x0420 = 0x2732
-0x0421 = 0x2733
-0x0422 = 0x2734
-0x0423 = 0x2735
-0x0424 = 0x2736
-0x0425 = 0x2737
-0x0426 = 0x2738
-0x0427 = 0x2739
-0x0428 = 0x273A
-0x0429 = 0x273B
-0x042A = 0x273C
-0x042B = 0x273D
-0x042C = 0x273E
-0x042D = 0x273F
-0x042E = 0x2740
-0x042F = 0x2741
-0x0430 = 0x2751
-0x0431 = 0x2752
-0x0432 = 0x2753
-0x0433 = 0x2754
-0x0434 = 0x2755
-0x0435 = 0x2756
-0x0436 = 0x2758
-0x0437 = 0x2759
-0x0438 = 0x275A
-0x0439 = 0x275B
-0x043A = 0x275C
-0x043B = 0x275D
-0x043C = 0x275E
-0x043D = 0x275F
-0x043E = 0x2760
-0x043F = 0x2761
-0x0440 = 0x2762
-0x0441 = 0x2763
-0x0442 = 0x2764
-0x0443 = 0x2765
-0x0444 = 0x2766
-0x0445 = 0x2767
-0x0446 = 0x2768
-0x0447 = 0x2769
-0x0448 = 0x276A
-0x0449 = 0x276B
-0x044A = 0x276C
-0x044B = 0x276D
-0x044C = 0x276E
-0x044D = 0x276F
-0x044E = 0x2770
-0x044F = 0x2771
-0x0451 = 0x2757
-0x2010 = 0x213E
-0x2014 = 0x213D
-0x2015 = 0x213D
-0x2016 = 0x2142
-0x2018 = 0x2146
-0x2019 = 0x2147
-0x201C = 0x2148
-0x201D = 0x2149
-0x2020 = 0x2277
-0x2021 = 0x2278
-0x2025 = 0x2145
-0x2026 = 0x2144
-0x2030 = 0x2273
-0x2032 = 0x216C
-0x2033 = 0x216D
-0x203B = 0x2228
-0x2103 = 0x216E
-0x212B = 0x2272
-0x2190 = 0x222B
-0x2191 = 0x222C
-0x2192 = 0x222A
-0x2193 = 0x222D
-0x21D2 = 0x224D
-0x21D4 = 0x224E
-0x2200 = 0x224F
-0x2202 = 0x225F
-0x2203 = 0x2250
-0x2207 = 0x2260
-0x2208 = 0x223A
-0x220B = 0x223B
-0x2212 = 0x215D
-0x221A = 0x2265
-0x221D = 0x2267
-0x221E = 0x2167
-0x2220 = 0x225C
-0x2227 = 0x224A
-0x2228 = 0x224B
-0x2229 = 0x2241
-0x222A = 0x2240
-0x222B = 0x2269
-0x222C = 0x226A
-0x2234 = 0x2168
-0x2235 = 0x2268
-0x223D = 0x2266
-0x2252 = 0x2262
-0x2260 = 0x2162
-0x2261 = 0x2261
-0x2266 = 0x2165
-0x2267 = 0x2166
-0x226A = 0x2263
-0x226B = 0x2264
-0x2282 = 0x223E
-0x2283 = 0x223F
-0x2286 = 0x223C
-0x2287 = 0x223D
-0x22A5 = 0x225D
-0x2312 = 0x225E
-0x2500 = 0x2821
-0x2501 = 0x282C
-0x2502 = 0x2822
-0x2503 = 0x282D
-0x250C = 0x2823
-0x250F = 0x282E
-0x2510 = 0x2824
-0x2513 = 0x282F
-0x2514 = 0x2826
-0x2517 = 0x2831
-0x2518 = 0x2825
-0x251B = 0x2830
-0x251C = 0x2827
-0x251D = 0x283C
-0x2520 = 0x2837
-0x2523 = 0x2832
-0x2524 = 0x2829
-0x2525 = 0x283E
-0x2528 = 0x2839
-0x252B = 0x2834
-0x252C = 0x2828
-0x252F = 0x2838
-0x2530 = 0x283D
-0x2533 = 0x2833
-0x2534 = 0x282A
-0x2537 = 0x283A
-0x2538 = 0x283F
-0x253B = 0x2835
-0x253C = 0x282B
-0x253F = 0x283B
-0x2542 = 0x2840
-0x254B = 0x2836
-0x25A0 = 0x2223
-0x25A1 = 0x2222
-0x25B2 = 0x2225
-0x25B3 = 0x2224
-0x25BC = 0x2227
-0x25BD = 0x2226
-0x25C6 = 0x2221
-0x25C7 = 0x217E
-0x25CB = 0x217B
-0x25CE = 0x217D
-0x25CF = 0x217C
-0x25EF = 0x227E
-0x2605 = 0x217A
-0x2606 = 0x2179
-0x2640 = 0x216A
-0x2642 = 0x2169
-0x266A = 0x2276
-0x266D = 0x2275
-0x266F = 0x2274
-0x3000 = 0x2121
-0x3001 = 0x2122
-0x3002 = 0x2123
-0x3003 = 0x2137
-0x3005 = 0x2139
-0x3006 = 0x213A
-0x3007 = 0x213B
-0x3008 = 0x2152
-0x3009 = 0x2153
-0x300A = 0x2154
-0x300B = 0x2155
-0x300C = 0x2156
-0x300D = 0x2157
-0x300E = 0x2158
-0x300F = 0x2159
-0x3010 = 0x215A
-0x3011 = 0x215B
-0x3012 = 0x2229
-0x3013 = 0x222E
-0x3014 = 0x214C
-0x3015 = 0x214D
-0x301C = 0x2141
-0x3041 = 0x2421
-0x3042 = 0x2422
-0x3043 = 0x2423
-0x3044 = 0x2424
-0x3045 = 0x2425
-0x3046 = 0x2426
-0x3047 = 0x2427
-0x3048 = 0x2428
-0x3049 = 0x2429
-0x304A = 0x242A
-0x304B = 0x242B
-0x304C = 0x242C
-0x304D = 0x242D
-0x304E = 0x242E
-0x304F = 0x242F
-0x3050 = 0x2430
-0x3051 = 0x2431
-0x3052 = 0x2432
-0x3053 = 0x2433
-0x3054 = 0x2434
-0x3055 = 0x2435
-0x3056 = 0x2436
-0x3057 = 0x2437
-0x3058 = 0x2438
-0x3059 = 0x2439
-0x305A = 0x243A
-0x305B = 0x243B
-0x305C = 0x243C
-0x305D = 0x243D
-0x305E = 0x243E
-0x305F = 0x243F
-0x3060 = 0x2440
-0x3061 = 0x2441
-0x3062 = 0x2442
-0x3063 = 0x2443
-0x3064 = 0x2444
-0x3065 = 0x2445
-0x3066 = 0x2446
-0x3067 = 0x2447
-0x3068 = 0x2448
-0x3069 = 0x2449
-0x306A = 0x244A
-0x306B = 0x244B
-0x306C = 0x244C
-0x306D = 0x244D
-0x306E = 0x244E
-0x306F = 0x244F
-0x3070 = 0x2450
-0x3071 = 0x2451
-0x3072 = 0x2452
-0x3073 = 0x2453
-0x3074 = 0x2454
-0x3075 = 0x2455
-0x3076 = 0x2456
-0x3077 = 0x2457
-0x3078 = 0x2458
-0x3079 = 0x2459
-0x307A = 0x245A
-0x307B = 0x245B
-0x307C = 0x245C
-0x307D = 0x245D
-0x307E = 0x245E
-0x307F = 0x245F
-0x3080 = 0x2460
-0x3081 = 0x2461
-0x3082 = 0x2462
-0x3083 = 0x2463
-0x3084 = 0x2464
-0x3085 = 0x2465
-0x3086 = 0x2466
-0x3087 = 0x2467
-0x3088 = 0x2468
-0x3089 = 0x2469
-0x308A = 0x246A
-0x308B = 0x246B
-0x308C = 0x246C
-0x308D = 0x246D
-0x308E = 0x246E
-0x308F = 0x246F
-0x3090 = 0x2470
-0x3091 = 0x2471
-0x3092 = 0x2472
-0x3093 = 0x2473
-0x309B = 0x212B
-0x309C = 0x212C
-0x309D = 0x2135
-0x309E = 0x2136
-0x30A1 = 0x2521
-0x30A2 = 0x2522
-0x30A3 = 0x2523
-0x30A4 = 0x2524
-0x30A5 = 0x2525
-0x30A6 = 0x2526
-0x30A7 = 0x2527
-0x30A8 = 0x2528
-0x30A9 = 0x2529
-0x30AA = 0x252A
-0x30AB = 0x252B
-0x30AC = 0x252C
-0x30AD = 0x252D
-0x30AE = 0x252E
-0x30AF = 0x252F
-0x30B0 = 0x2530
-0x30B1 = 0x2531
-0x30B2 = 0x2532
-0x30B3 = 0x2533
-0x30B4 = 0x2534
-0x30B5 = 0x2535
-0x30B6 = 0x2536
-0x30B7 = 0x2537
-0x30B8 = 0x2538
-0x30B9 = 0x2539
-0x30BA = 0x253A
-0x30BB = 0x253B
-0x30BC = 0x253C
-0x30BD = 0x253D
-0x30BE = 0x253E
-0x30BF = 0x253F
-0x30C0 = 0x2540
-0x30C1 = 0x2541
-0x30C2 = 0x2542
-0x30C3 = 0x2543
-0x30C4 = 0x2544
-0x30C5 = 0x2545
-0x30C6 = 0x2546
-0x30C7 = 0x2547
-0x30C8 = 0x2548
-0x30C9 = 0x2549
-0x30CA = 0x254A
-0x30CB = 0x254B
-0x30CC = 0x254C
-0x30CD = 0x254D
-0x30CE = 0x254E
-0x30CF = 0x254F
-0x30D0 = 0x2550
-0x30D1 = 0x2551
-0x30D2 = 0x2552
-0x30D3 = 0x2553
-0x30D4 = 0x2554
-0x30D5 = 0x2555
-0x30D6 = 0x2556
-0x30D7 = 0x2557
-0x30D8 = 0x2558
-0x30D9 = 0x2559
-0x30DA = 0x255A
-0x30DB = 0x255B
-0x30DC = 0x255C
-0x30DD = 0x255D
-0x30DE = 0x255E
-0x30DF = 0x255F
-0x30E0 = 0x2560
-0x30E1 = 0x2561
-0x30E2 = 0x2562
-0x30E3 = 0x2563
-0x30E4 = 0x2564
-0x30E5 = 0x2565
-0x30E6 = 0x2566
-0x30E7 = 0x2567
-0x30E8 = 0x2568
-0x30E9 = 0x2569
-0x30EA = 0x256A
-0x30EB = 0x256B
-0x30EC = 0x256C
-0x30ED = 0x256D
-0x30EE = 0x256E
-0x30EF = 0x256F
-0x30F0 = 0x2570
-0x30F1 = 0x2571
-0x30F2 = 0x2572
-0x30F3 = 0x2573
-0x30F4 = 0x2574
-0x30F5 = 0x2575
-0x30F6 = 0x2576
-0x30FB = 0x2126
-0x30FC = 0x213C
-0x30FD = 0x2133
-0x30FE = 0x2134
-0x4E00 = 0x306C
-0x4E01 = 0x437A
-0x4E03 = 0x3C37
-0x4E07 = 0x4B7C
-0x4E08 = 0x3E66
-0x4E09 = 0x3B30
-0x4E0A = 0x3E65
-0x4E0B = 0x323C
-0x4E0D = 0x4954
-0x4E0E = 0x4D3F
-0x4E10 = 0x5022
-0x4E11 = 0x312F
-0x4E14 = 0x336E
-0x4E15 = 0x5023
-0x4E16 = 0x4024
-0x4E17 = 0x5242
-0x4E18 = 0x3556
-0x4E19 = 0x4A3A
-0x4E1E = 0x3E67
-0x4E21 = 0x4E3E
-0x4E26 = 0x4A42
-0x4E2A = 0x5024
-0x4E2D = 0x4366
-0x4E31 = 0x5025
-0x4E32 = 0x367A
-0x4E36 = 0x5026
-0x4E38 = 0x345D
-0x4E39 = 0x4330
-0x4E3B = 0x3C67
-0x4E3C = 0x5027
-0x4E3F = 0x5028
-0x4E42 = 0x5029
-0x4E43 = 0x4735
-0x4E45 = 0x3557
-0x4E4B = 0x4737
-0x4E4D = 0x4663
-0x4E4E = 0x3843
-0x4E4F = 0x4B33
-0x4E55 = 0x6949
-0x4E56 = 0x502A
-0x4E57 = 0x3E68
-0x4E58 = 0x502B
-0x4E59 = 0x3235
-0x4E5D = 0x3665
-0x4E5E = 0x3870
-0x4E5F = 0x4C69
-0x4E62 = 0x5626
-0x4E71 = 0x4D70
-0x4E73 = 0x467D
-0x4E7E = 0x3425
-0x4E80 = 0x3535
-0x4E82 = 0x502C
-0x4E85 = 0x502D
-0x4E86 = 0x4E3B
-0x4E88 = 0x4D3D
-0x4E89 = 0x4168
-0x4E8A = 0x502F
-0x4E8B = 0x3B76
-0x4E8C = 0x4673
-0x4E8E = 0x5032
-0x4E91 = 0x313E
-0x4E92 = 0x385F
-0x4E94 = 0x385E
-0x4E95 = 0x3066
-0x4E98 = 0x4F4B
-0x4E99 = 0x4F4A
-0x4E9B = 0x3A33
-0x4E9C = 0x3021
-0x4E9E = 0x5033
-0x4E9F = 0x5034
-0x4EA0 = 0x5035
-0x4EA1 = 0x4B34
-0x4EA2 = 0x5036
-0x4EA4 = 0x3872
-0x4EA5 = 0x3067
-0x4EA6 = 0x4B72
-0x4EA8 = 0x357C
-0x4EAB = 0x357D
-0x4EAC = 0x357E
-0x4EAD = 0x4462
-0x4EAE = 0x4E3C
-0x4EB0 = 0x5037
-0x4EB3 = 0x5038
-0x4EB6 = 0x5039
-0x4EBA = 0x3F4D
-0x4EC0 = 0x3D3A
-0x4EC1 = 0x3F4E
-0x4EC2 = 0x503E
-0x4EC4 = 0x503C
-0x4EC6 = 0x503D
-0x4EC7 = 0x3558
-0x4ECA = 0x3A23
-0x4ECB = 0x3270
-0x4ECD = 0x503B
-0x4ECE = 0x503A
-0x4ECF = 0x4A29
-0x4ED4 = 0x3B46
-0x4ED5 = 0x3B45
-0x4ED6 = 0x423E
-0x4ED7 = 0x503F
-0x4ED8 = 0x4955
-0x4ED9 = 0x4067
-0x4EDD = 0x2138
-0x4EDE = 0x5040
-0x4EDF = 0x5042
-0x4EE3 = 0x4265
-0x4EE4 = 0x4E61
-0x4EE5 = 0x304A
-0x4EED = 0x5041
-0x4EEE = 0x323E
-0x4EF0 = 0x3644
-0x4EF2 = 0x4367
-0x4EF6 = 0x376F
-0x4EF7 = 0x5043
-0x4EFB = 0x4724
-0x4F01 = 0x346B
-0x4F09 = 0x5044
-0x4F0A = 0x304B
-0x4F0D = 0x3860
-0x4F0E = 0x346C
-0x4F0F = 0x497A
-0x4F10 = 0x4832
-0x4F11 = 0x3559
-0x4F1A = 0x3271
-0x4F1C = 0x5067
-0x4F1D = 0x4541
-0x4F2F = 0x476C
-0x4F30 = 0x5046
-0x4F34 = 0x483C
-0x4F36 = 0x4E62
-0x4F38 = 0x3F2D
-0x4F3A = 0x3B47
-0x4F3C = 0x3B77
-0x4F3D = 0x3240
-0x4F43 = 0x4451
-0x4F46 = 0x4322
-0x4F47 = 0x504A
-0x4F4D = 0x304C
-0x4F4E = 0x4463
-0x4F4F = 0x3D3B
-0x4F50 = 0x3A34
-0x4F51 = 0x4D24
-0x4F53 = 0x424E
-0x4F55 = 0x323F
-0x4F57 = 0x5049
-0x4F59 = 0x4D3E
-0x4F5A = 0x5045
-0x4F5B = 0x5047
-0x4F5C = 0x3A6E
-0x4F5D = 0x5048
-0x4F5E = 0x5524
-0x4F69 = 0x5050
-0x4F6F = 0x5053
-0x4F70 = 0x5051
-0x4F73 = 0x3242
-0x4F75 = 0x4A3B
-0x4F76 = 0x504B
-0x4F7B = 0x504F
-0x4F7C = 0x3873
-0x4F7F = 0x3B48
-0x4F83 = 0x3426
-0x4F86 = 0x5054
-0x4F88 = 0x504C
-0x4F8B = 0x4E63
-0x4F8D = 0x3B78
-0x4F8F = 0x504D
-0x4F91 = 0x5052
-0x4F96 = 0x5055
-0x4F98 = 0x504E
-0x4F9B = 0x3621
-0x4F9D = 0x304D
-0x4FA0 = 0x3622
-0x4FA1 = 0x3241
-0x4FAB = 0x5525
-0x4FAD = 0x4B79
-0x4FAE = 0x496E
-0x4FAF = 0x3874
-0x4FB5 = 0x3F2F
-0x4FB6 = 0x4E37
-0x4FBF = 0x4A58
-0x4FC2 = 0x3738
-0x4FC3 = 0x4225
-0x4FC4 = 0x3264
-0x4FCA = 0x3D53
-0x4FCE = 0x5059
-0x4FD0 = 0x505E
-0x4FD1 = 0x505C
-0x4FD4 = 0x5057
-0x4FD7 = 0x422F
-0x4FD8 = 0x505A
-0x4FDA = 0x505D
-0x4FDB = 0x505B
-0x4FDD = 0x4A5D
-0x4FDF = 0x5058
-0x4FE1 = 0x3F2E
-0x4FE3 = 0x4B73
-0x4FE4 = 0x505F
-0x4FE5 = 0x5060
-0x4FEE = 0x3D24
-0x4FEF = 0x506D
-0x4FF3 = 0x4750
-0x4FF5 = 0x4936
-0x4FF6 = 0x5068
-0x4FF8 = 0x4A70
-0x4FFA = 0x3236
-0x4FFE = 0x506C
-0x5005 = 0x5066
-0x5006 = 0x506F
-0x5009 = 0x4152
-0x500B = 0x3844
-0x500D = 0x475C
-0x500F = 0x6047
-0x5011 = 0x506E
-0x5012 = 0x455D
-0x5014 = 0x5063
-0x5016 = 0x3876
-0x5019 = 0x3875
-0x501A = 0x5061
-0x501F = 0x3C5A
-0x5021 = 0x5069
-0x5023 = 0x4A6F
-0x5024 = 0x434D
-0x5025 = 0x5065
-0x5026 = 0x3771
-0x5028 = 0x5062
-0x5029 = 0x506A
-0x502A = 0x5064
-0x502B = 0x4E51
-0x502C = 0x506B
-0x502D = 0x4F41
-0x5036 = 0x3666
-0x5039 = 0x3770
-0x5043 = 0x5070
-0x5047 = 0x5071
-0x5048 = 0x5075
-0x5049 = 0x304E
-0x504F = 0x4A50
-0x5050 = 0x5074
-0x5055 = 0x5073
-0x5056 = 0x5077
-0x505A = 0x5076
-0x505C = 0x4464
-0x5065 = 0x3772
-0x506C = 0x5078
-0x5072 = 0x3C45
-0x5074 = 0x4226
-0x5075 = 0x4465
-0x5076 = 0x3676
-0x5078 = 0x5079
-0x507D = 0x3536
-0x5080 = 0x507A
-0x5085 = 0x507C
-0x508D = 0x4B35
-0x5091 = 0x3766
-0x5098 = 0x3B31
-0x5099 = 0x4877
-0x509A = 0x507B
-0x50AC = 0x3A45
-0x50AD = 0x4D43
-0x50B2 = 0x507E
-0x50B3 = 0x5123
-0x50B4 = 0x507D
-0x50B5 = 0x3A44
-0x50B7 = 0x3D7D
-0x50BE = 0x3739
-0x50C2 = 0x5124
-0x50C5 = 0x364F
-0x50C9 = 0x5121
-0x50CA = 0x5122
-0x50CD = 0x462F
-0x50CF = 0x417C
-0x50D1 = 0x3623
-0x50D5 = 0x4B4D
-0x50D6 = 0x5125
-0x50DA = 0x4E3D
-0x50DE = 0x5126
-0x50E3 = 0x5129
-0x50E5 = 0x5127
-0x50E7 = 0x414E
-0x50ED = 0x5128
-0x50EE = 0x512A
-0x50F5 = 0x512C
-0x50F9 = 0x512B
-0x50FB = 0x4A48
-0x5100 = 0x3537
-0x5101 = 0x512E
-0x5102 = 0x512F
-0x5104 = 0x322F
-0x5109 = 0x512D
-0x5112 = 0x3C74
-0x5114 = 0x5132
-0x5115 = 0x5131
-0x5116 = 0x5130
-0x5118 = 0x5056
-0x511A = 0x5133
-0x511F = 0x3D7E
-0x5121 = 0x5134
-0x512A = 0x4D25
-0x5132 = 0x4C59
-0x5137 = 0x5136
-0x513A = 0x5135
-0x513B = 0x5138
-0x513C = 0x5137
-0x513F = 0x5139
-0x5140 = 0x513A
-0x5141 = 0x3074
-0x5143 = 0x3835
-0x5144 = 0x373B
-0x5145 = 0x3D3C
-0x5146 = 0x437B
-0x5147 = 0x3624
-0x5148 = 0x4068
-0x5149 = 0x3877
-0x514B = 0x396E
-0x514C = 0x513C
-0x514D = 0x4C48
-0x514E = 0x4546
-0x5150 = 0x3B79
-0x5152 = 0x513B
-0x5154 = 0x513D
-0x515A = 0x455E
-0x515C = 0x3375
-0x5162 = 0x513E
-0x5165 = 0x467E
-0x5168 = 0x4134
-0x5169 = 0x5140
-0x516A = 0x5141
-0x516B = 0x482C
-0x516C = 0x3878
-0x516D = 0x4F3B
-0x516E = 0x5142
-0x5171 = 0x3626
-0x5175 = 0x4A3C
-0x5176 = 0x4236
-0x5177 = 0x3671
-0x5178 = 0x4535
-0x517C = 0x3773
-0x5180 = 0x5143
-0x5182 = 0x5144
-0x5185 = 0x4662
-0x5186 = 0x315F
-0x5189 = 0x5147
-0x518A = 0x3A7D
-0x518C = 0x5146
-0x518D = 0x3A46
-0x518F = 0x5148
-0x5190 = 0x666E
-0x5191 = 0x5149
-0x5192 = 0x4B41
-0x5193 = 0x514A
-0x5195 = 0x514B
-0x5196 = 0x514C
-0x5197 = 0x3E69
-0x5199 = 0x3C4C
-0x51A0 = 0x3427
-0x51A2 = 0x514F
-0x51A4 = 0x514D
-0x51A5 = 0x4C3D
-0x51A6 = 0x514E
-0x51A8 = 0x495A
-0x51A9 = 0x5150
-0x51AA = 0x5151
-0x51AB = 0x5152
-0x51AC = 0x455F
-0x51B0 = 0x5156
-0x51B1 = 0x5154
-0x51B2 = 0x5155
-0x51B3 = 0x5153
-0x51B4 = 0x3A63
-0x51B5 = 0x5157
-0x51B6 = 0x4C6A
-0x51B7 = 0x4E64
-0x51BD = 0x5158
-0x51C4 = 0x4028
-0x51C5 = 0x5159
-0x51C6 = 0x3D5A
-0x51C9 = 0x515A
-0x51CB = 0x437C
-0x51CC = 0x4E3F
-0x51CD = 0x4560
-0x51D6 = 0x5245
-0x51DB = 0x515B
-0x51DC = 0x7425
-0x51DD = 0x3645
-0x51E0 = 0x515C
-0x51E1 = 0x4B5E
-0x51E6 = 0x3D68
-0x51E7 = 0x427C
-0x51E9 = 0x515E
-0x51EA = 0x4664
-0x51ED = 0x515F
-0x51F0 = 0x5160
-0x51F1 = 0x332E
-0x51F5 = 0x5161
-0x51F6 = 0x3627
-0x51F8 = 0x464C
-0x51F9 = 0x317A
-0x51FA = 0x3D50
-0x51FD = 0x4821
-0x51FE = 0x5162
-0x5200 = 0x4561
-0x5203 = 0x3F4F
-0x5204 = 0x5163
-0x5206 = 0x4A2C
-0x5207 = 0x405A
-0x5208 = 0x3422
-0x520A = 0x3429
-0x520B = 0x5164
-0x520E = 0x5166
-0x5211 = 0x373A
-0x5214 = 0x5165
-0x5217 = 0x4E73
-0x521D = 0x3D69
-0x5224 = 0x483D
-0x5225 = 0x4A4C
-0x5227 = 0x5167
-0x5229 = 0x4D78
-0x522A = 0x5168
-0x522E = 0x5169
-0x5230 = 0x457E
-0x5233 = 0x516A
-0x5236 = 0x4029
-0x5237 = 0x3A7E
-0x5238 = 0x3774
-0x5239 = 0x516B
-0x523A = 0x3B49
-0x523B = 0x396F
-0x5243 = 0x4466
-0x5244 = 0x516D
-0x5247 = 0x4227
-0x524A = 0x3A6F
-0x524B = 0x516E
-0x524C = 0x516F
-0x524D = 0x4130
-0x524F = 0x516C
-0x5254 = 0x5171
-0x5256 = 0x4B36
-0x525B = 0x3964
-0x525E = 0x5170
-0x5263 = 0x3775
-0x5264 = 0x3A5E
-0x5265 = 0x476D
-0x5269 = 0x5174
-0x526A = 0x5172
-0x526F = 0x497B
-0x5270 = 0x3E6A
-0x5271 = 0x517B
-0x5272 = 0x3364
-0x5273 = 0x5175
-0x5274 = 0x5173
-0x5275 = 0x414F
-0x527D = 0x5177
-0x527F = 0x5176
-0x5283 = 0x3344
-0x5287 = 0x3760
-0x5288 = 0x517C
-0x5289 = 0x4E2D
-0x528D = 0x5178
-0x5291 = 0x517D
-0x5292 = 0x517A
-0x5294 = 0x5179
-0x529B = 0x4E4F
-0x529F = 0x3879
-0x52A0 = 0x3243
-0x52A3 = 0x4E74
-0x52A9 = 0x3D75
-0x52AA = 0x4558
-0x52AB = 0x3965
-0x52AC = 0x5222
-0x52AD = 0x5223
-0x52B1 = 0x4E65
-0x52B4 = 0x4F2B
-0x52B5 = 0x5225
-0x52B9 = 0x387A
-0x52BC = 0x5224
-0x52BE = 0x332F
-0x52C1 = 0x5226
-0x52C3 = 0x4B56
-0x52C5 = 0x443C
-0x52C7 = 0x4D26
-0x52C9 = 0x4A59
-0x52CD = 0x5227
-0x52D2 = 0x7055
-0x52D5 = 0x4630
-0x52D7 = 0x5228
-0x52D8 = 0x342A
-0x52D9 = 0x4C33
-0x52DD = 0x3E21
-0x52DE = 0x5229
-0x52DF = 0x4A67
-0x52E0 = 0x522D
-0x52E2 = 0x402A
-0x52E3 = 0x522A
-0x52E4 = 0x3650
-0x52E6 = 0x522B
-0x52E7 = 0x342B
-0x52F2 = 0x372E
-0x52F3 = 0x522E
-0x52F5 = 0x522F
-0x52F8 = 0x5230
-0x52F9 = 0x5231
-0x52FA = 0x3C5B
-0x52FE = 0x387B
-0x52FF = 0x4C5E
-0x5301 = 0x4C68
-0x5302 = 0x4677
-0x5305 = 0x4A71
-0x5306 = 0x5232
-0x5308 = 0x5233
-0x530D = 0x5235
-0x530F = 0x5237
-0x5310 = 0x5236
-0x5315 = 0x5238
-0x5316 = 0x323D
-0x5317 = 0x4B4C
-0x5319 = 0x3A7C
-0x531A = 0x5239
-0x531D = 0x4159
-0x5320 = 0x3E22
-0x5321 = 0x3629
-0x5323 = 0x523A
-0x532A = 0x485B
-0x532F = 0x523B
-0x5331 = 0x523C
-0x5333 = 0x523D
-0x5338 = 0x523E
-0x5339 = 0x4924
-0x533A = 0x3668
-0x533B = 0x3065
-0x533F = 0x463F
-0x5340 = 0x523F
-0x5341 = 0x3D3D
-0x5343 = 0x4069
-0x5345 = 0x5241
-0x5346 = 0x5240
-0x5347 = 0x3E23
-0x5348 = 0x3861
-0x5349 = 0x5243
-0x534A = 0x483E
-0x534D = 0x5244
-0x5351 = 0x485C
-0x5352 = 0x4234
-0x5353 = 0x426E
-0x5354 = 0x3628
-0x5357 = 0x466E
-0x5358 = 0x4331
-0x535A = 0x476E
-0x535C = 0x4B4E
-0x535E = 0x5246
-0x5360 = 0x406A
-0x5366 = 0x3735
-0x5369 = 0x5247
-0x536E = 0x5248
-0x536F = 0x312C
-0x5370 = 0x3075
-0x5371 = 0x346D
-0x5373 = 0x4228
-0x5374 = 0x3551
-0x5375 = 0x4D71
-0x5377 = 0x524B
-0x5378 = 0x3237
-0x537B = 0x524A
-0x537F = 0x362A
-0x5382 = 0x524C
-0x5384 = 0x4C71
-0x5396 = 0x524D
-0x5398 = 0x4E52
-0x539A = 0x387C
-0x539F = 0x3836
-0x53A0 = 0x524E
-0x53A5 = 0x5250
-0x53A6 = 0x524F
-0x53A8 = 0x3F5F
-0x53A9 = 0x3139
-0x53AD = 0x315E
-0x53AE = 0x5251
-0x53B0 = 0x5252
-0x53B3 = 0x3837
-0x53B6 = 0x5253
-0x53BB = 0x356E
-0x53C2 = 0x3B32
-0x53C3 = 0x5254
-0x53C8 = 0x4B74
-0x53C9 = 0x3A35
-0x53CA = 0x355A
-0x53CB = 0x4D27
-0x53CC = 0x4150
-0x53CD = 0x483F
-0x53CE = 0x3C7D
-0x53D4 = 0x3D47
-0x53D6 = 0x3C68
-0x53D7 = 0x3C75
-0x53D9 = 0x3D76
-0x53DB = 0x4840
-0x53DF = 0x5257
-0x53E1 = 0x3143
-0x53E2 = 0x4151
-0x53E3 = 0x387D
-0x53E4 = 0x3845
-0x53E5 = 0x3667
-0x53E8 = 0x525B
-0x53E9 = 0x4321
-0x53EA = 0x427E
-0x53EB = 0x362B
-0x53EC = 0x3E24
-0x53ED = 0x525C
-0x53EE = 0x525A
-0x53EF = 0x3244
-0x53F0 = 0x4266
-0x53F1 = 0x3C38
-0x53F2 = 0x3B4B
-0x53F3 = 0x3126
-0x53F6 = 0x3370
-0x53F7 = 0x3966
-0x53F8 = 0x3B4A
-0x53FA = 0x525D
-0x5401 = 0x525E
-0x5403 = 0x3549
-0x5404 = 0x3346
-0x5408 = 0x3967
-0x5409 = 0x3548
-0x540A = 0x445F
-0x540B = 0x3125
-0x540C = 0x4631
-0x540D = 0x4C3E
-0x540E = 0x3921
-0x540F = 0x4D79
-0x5410 = 0x4547
-0x5411 = 0x387E
-0x541B = 0x372F
-0x541D = 0x5267
-0x541F = 0x3663
-0x5420 = 0x4B4A
-0x5426 = 0x485D
-0x5429 = 0x5266
-0x542B = 0x345E
-0x542C = 0x5261
-0x542D = 0x5262
-0x542E = 0x5264
-0x5436 = 0x5265
-0x5438 = 0x355B
-0x5439 = 0x3F61
-0x543B = 0x4A2D
-0x543C = 0x5263
-0x543D = 0x525F
-0x543E = 0x3863
-0x5440 = 0x5260
-0x5442 = 0x4F24
-0x5446 = 0x4A72
-0x5448 = 0x4468
-0x5449 = 0x3862
-0x544A = 0x3970
-0x544E = 0x5268
-0x5451 = 0x465D
-0x545F = 0x526C
-0x5468 = 0x3C7E
-0x546A = 0x3C76
-0x5470 = 0x526F
-0x5471 = 0x526D
-0x5473 = 0x4C23
-0x5475 = 0x526A
-0x5476 = 0x5273
-0x5477 = 0x526E
-0x547B = 0x5271
-0x547C = 0x3846
-0x547D = 0x4C3F
-0x5480 = 0x5272
-0x5484 = 0x5274
-0x5486 = 0x5276
-0x548B = 0x3A70
-0x548C = 0x4F42
-0x548E = 0x526B
-0x548F = 0x5269
-0x5490 = 0x5275
-0x5492 = 0x5270
-0x54A2 = 0x5278
-0x54A4 = 0x5323
-0x54A5 = 0x527A
-0x54A8 = 0x527E
-0x54AB = 0x5321
-0x54AC = 0x527B
-0x54AF = 0x533E
-0x54B2 = 0x3A69
-0x54B3 = 0x3331
-0x54B8 = 0x5279
-0x54BC = 0x5325
-0x54BD = 0x3076
-0x54BE = 0x5324
-0x54C0 = 0x3025
-0x54C1 = 0x494A
-0x54C2 = 0x5322
-0x54C4 = 0x527C
-0x54C7 = 0x5277
-0x54C8 = 0x527D
-0x54C9 = 0x3A48
-0x54D8 = 0x5326
-0x54E1 = 0x3077
-0x54E2 = 0x532F
-0x54E5 = 0x5327
-0x54E6 = 0x5328
-0x54E8 = 0x3E25
-0x54E9 = 0x4B69
-0x54ED = 0x532D
-0x54EE = 0x532C
-0x54F2 = 0x452F
-0x54FA = 0x532E
-0x54FD = 0x532B
-0x5504 = 0x3134
-0x5506 = 0x3A36
-0x5507 = 0x3F30
-0x550F = 0x5329
-0x5510 = 0x4562
-0x5514 = 0x532A
-0x5516 = 0x3022
-0x552E = 0x5334
-0x552F = 0x4D23
-0x5531 = 0x3E27
-0x5533 = 0x533A
-0x5538 = 0x5339
-0x5539 = 0x5330
-0x553E = 0x4243
-0x5540 = 0x5331
-0x5544 = 0x426F
-0x5545 = 0x5336
-0x5546 = 0x3E26
-0x554C = 0x5333
-0x554F = 0x4C64
-0x5553 = 0x373C
-0x5556 = 0x5337
-0x5557 = 0x5338
-0x555C = 0x5335
-0x555D = 0x533B
-0x5563 = 0x5332
-0x557B = 0x5341
-0x557C = 0x5346
-0x557E = 0x5342
-0x5580 = 0x533D
-0x5583 = 0x5347
-0x5584 = 0x4131
-0x5587 = 0x5349
-0x5589 = 0x3922
-0x558A = 0x533F
-0x558B = 0x437D
-0x5598 = 0x5343
-0x5599 = 0x533C
-0x559A = 0x342D
-0x559C = 0x346E
-0x559D = 0x3365
-0x559E = 0x5344
-0x559F = 0x5340
-0x55A7 = 0x3776
-0x55A8 = 0x534A
-0x55A9 = 0x5348
-0x55AA = 0x4153
-0x55AB = 0x354A
-0x55AC = 0x362C
-0x55AE = 0x5345
-0x55B0 = 0x3674
-0x55B6 = 0x3144
-0x55C4 = 0x534E
-0x55C5 = 0x534C
-0x55C7 = 0x5427
-0x55D4 = 0x5351
-0x55DA = 0x534B
-0x55DC = 0x534F
-0x55DF = 0x534D
-0x55E3 = 0x3B4C
-0x55E4 = 0x5350
-0x55F7 = 0x5353
-0x55F9 = 0x5358
-0x55FD = 0x5356
-0x55FE = 0x5355
-0x5606 = 0x4332
-0x5609 = 0x3245
-0x5614 = 0x5352
-0x5616 = 0x5354
-0x5617 = 0x3E28
-0x5618 = 0x3133
-0x561B = 0x5357
-0x5629 = 0x325E
-0x562F = 0x5362
-0x5631 = 0x3E7C
-0x5632 = 0x535E
-0x5634 = 0x535C
-0x5636 = 0x535D
-0x5638 = 0x535F
-0x5642 = 0x313D
-0x564C = 0x4139
-0x564E = 0x5359
-0x5650 = 0x535A
-0x565B = 0x337A
-0x5664 = 0x5361
-0x5668 = 0x346F
-0x566A = 0x5364
-0x566B = 0x5360
-0x566C = 0x5363
-0x5674 = 0x4A2E
-0x5678 = 0x4655
-0x567A = 0x4838
-0x5680 = 0x5366
-0x5686 = 0x5365
-0x5687 = 0x3345
-0x568A = 0x5367
-0x568F = 0x536A
-0x5694 = 0x5369
-0x56A0 = 0x5368
-0x56A2 = 0x4739
-0x56A5 = 0x536B
-0x56AE = 0x536C
-0x56B4 = 0x536E
-0x56B6 = 0x536D
-0x56BC = 0x5370
-0x56C0 = 0x5373
-0x56C1 = 0x5371
-0x56C2 = 0x536F
-0x56C3 = 0x5372
-0x56C8 = 0x5374
-0x56CE = 0x5375
-0x56D1 = 0x5376
-0x56D3 = 0x5377
-0x56D7 = 0x5378
-0x56D8 = 0x5145
-0x56DA = 0x3C7C
-0x56DB = 0x3B4D
-0x56DE = 0x3273
-0x56E0 = 0x3078
-0x56E3 = 0x4344
-0x56EE = 0x5379
-0x56F0 = 0x3A24
-0x56F2 = 0x304F
-0x56F3 = 0x3F5E
-0x56F9 = 0x537A
-0x56FA = 0x3847
-0x56FD = 0x3971
-0x56FF = 0x537C
-0x5700 = 0x537B
-0x5703 = 0x4A60
-0x5704 = 0x537D
-0x5708 = 0x5421
-0x5709 = 0x537E
-0x570B = 0x5422
-0x570D = 0x5423
-0x570F = 0x3777
-0x5712 = 0x3160
-0x5713 = 0x5424
-0x5716 = 0x5426
-0x5718 = 0x5425
-0x571C = 0x5428
-0x571F = 0x455A
-0x5726 = 0x5429
-0x5727 = 0x3035
-0x5728 = 0x3A5F
-0x572D = 0x373D
-0x5730 = 0x434F
-0x5737 = 0x542A
-0x5738 = 0x542B
-0x573B = 0x542D
-0x5740 = 0x542E
-0x5742 = 0x3A64
-0x5747 = 0x3651
-0x574A = 0x4B37
-0x574E = 0x542C
-0x574F = 0x542F
-0x5750 = 0x3A41
-0x5751 = 0x3923
-0x5761 = 0x5433
-0x5764 = 0x3A25
-0x5766 = 0x4333
-0x5769 = 0x5430
-0x576A = 0x445A
-0x577F = 0x5434
-0x5782 = 0x3F62
-0x5788 = 0x5432
-0x5789 = 0x5435
-0x578B = 0x373F
-0x5793 = 0x5436
-0x57A0 = 0x5437
-0x57A2 = 0x3924
-0x57A3 = 0x3340
-0x57A4 = 0x5439
-0x57AA = 0x543A
-0x57B0 = 0x543B
-0x57B3 = 0x5438
-0x57C0 = 0x5431
-0x57C3 = 0x543C
-0x57C6 = 0x543D
-0x57CB = 0x4B64
-0x57CE = 0x3E6B
-0x57D2 = 0x543F
-0x57D3 = 0x5440
-0x57D4 = 0x543E
-0x57D6 = 0x5442
-0x57DC = 0x4738
-0x57DF = 0x3068
-0x57E0 = 0x4956
-0x57E3 = 0x5443
-0x57F4 = 0x3E7D
-0x57F7 = 0x3C39
-0x57F9 = 0x475D
-0x57FA = 0x3470
-0x57FC = 0x3A6B
-0x5800 = 0x4B59
-0x5802 = 0x4632
-0x5805 = 0x3778
-0x5806 = 0x424F
-0x580A = 0x5441
-0x580B = 0x5444
-0x5815 = 0x4244
-0x5819 = 0x5445
-0x581D = 0x5446
-0x5821 = 0x5448
-0x5824 = 0x4469
-0x582A = 0x342E
-0x582F = 0x7421
-0x5830 = 0x3161
-0x5831 = 0x4A73
-0x5834 = 0x3E6C
-0x5835 = 0x4548
-0x583A = 0x3A66
-0x583D = 0x544E
-0x5840 = 0x4A3D
-0x5841 = 0x4E5D
-0x584A = 0x3274
-0x584B = 0x544A
-0x5851 = 0x413A
-0x5852 = 0x544D
-0x5854 = 0x4563
-0x5857 = 0x4549
-0x5858 = 0x4564
-0x5859 = 0x4839
-0x585A = 0x444D
-0x585E = 0x3A49
-0x5862 = 0x5449
-0x5869 = 0x3176
-0x586B = 0x4536
-0x5870 = 0x544B
-0x5872 = 0x5447
-0x5875 = 0x3F50
-0x5879 = 0x544F
-0x587E = 0x3D4E
-0x5883 = 0x362D
-0x5885 = 0x5450
-0x5893 = 0x4A68
-0x5897 = 0x417D
-0x589C = 0x4446
-0x589F = 0x5452
-0x58A8 = 0x4B4F
-0x58AB = 0x5453
-0x58AE = 0x5458
-0x58B3 = 0x4A2F
-0x58B8 = 0x5457
-0x58B9 = 0x5451
-0x58BA = 0x5454
-0x58BB = 0x5456
-0x58BE = 0x3A26
-0x58C1 = 0x4A49
-0x58C5 = 0x5459
-0x58C7 = 0x4345
-0x58CA = 0x3275
-0x58CC = 0x3E6D
-0x58D1 = 0x545B
-0x58D3 = 0x545A
-0x58D5 = 0x3968
-0x58D7 = 0x545C
-0x58D8 = 0x545E
-0x58D9 = 0x545D
-0x58DC = 0x5460
-0x58DE = 0x5455
-0x58DF = 0x5462
-0x58E4 = 0x5461
-0x58E5 = 0x545F
-0x58EB = 0x3B4E
-0x58EC = 0x3F51
-0x58EE = 0x4154
-0x58EF = 0x5463
-0x58F0 = 0x403C
-0x58F1 = 0x306D
-0x58F2 = 0x4764
-0x58F7 = 0x445B
-0x58F9 = 0x5465
-0x58FA = 0x5464
-0x58FB = 0x5466
-0x58FC = 0x5467
-0x58FD = 0x5468
-0x5902 = 0x5469
-0x5909 = 0x4A51
-0x590A = 0x546A
-0x590F = 0x3246
-0x5910 = 0x546B
-0x5915 = 0x4D3C
-0x5916 = 0x3330
-0x5918 = 0x5249
-0x5919 = 0x3D48
-0x591A = 0x423F
-0x591B = 0x546C
-0x591C = 0x4C6B
-0x5922 = 0x4C34
-0x5925 = 0x546E
-0x5927 = 0x4267
-0x5929 = 0x4537
-0x592A = 0x4240
-0x592B = 0x4957
-0x592C = 0x546F
-0x592D = 0x5470
-0x592E = 0x317B
-0x5931 = 0x3C3A
-0x5932 = 0x5471
-0x5937 = 0x3050
-0x5938 = 0x5472
-0x593E = 0x5473
-0x5944 = 0x3162
-0x5947 = 0x3471
-0x5948 = 0x4660
-0x5949 = 0x4A74
-0x594E = 0x5477
-0x594F = 0x4155
-0x5950 = 0x5476
-0x5951 = 0x3740
-0x5954 = 0x4B5B
-0x5955 = 0x5475
-0x5957 = 0x4565
-0x5958 = 0x5479
-0x595A = 0x5478
-0x5960 = 0x547B
-0x5962 = 0x547A
-0x5965 = 0x317C
-0x5967 = 0x547C
-0x5968 = 0x3E29
-0x5969 = 0x547E
-0x596A = 0x4325
-0x596C = 0x547D
-0x596E = 0x4A33
-0x5973 = 0x3D77
-0x5974 = 0x455B
-0x5978 = 0x5521
-0x597D = 0x3925
-0x5981 = 0x5522
-0x5982 = 0x4721
-0x5983 = 0x485E
-0x5984 = 0x4C51
-0x598A = 0x4725
-0x598D = 0x552B
-0x5993 = 0x3538
-0x5996 = 0x4D45
-0x5999 = 0x4C2F
-0x599B = 0x562C
-0x599D = 0x5523
-0x59A3 = 0x5526
-0x59A5 = 0x4245
-0x59A8 = 0x4B38
-0x59AC = 0x454A
-0x59B2 = 0x5527
-0x59B9 = 0x4B65
-0x59BB = 0x3A4A
-0x59BE = 0x3E2A
-0x59C6 = 0x5528
-0x59C9 = 0x3B50
-0x59CB = 0x3B4F
-0x59D0 = 0x3039
-0x59D1 = 0x3848
-0x59D3 = 0x402B
-0x59D4 = 0x3051
-0x59D9 = 0x552C
-0x59DA = 0x552D
-0x59DC = 0x552A
-0x59E5 = 0x3138
-0x59E6 = 0x342F
-0x59E8 = 0x5529
-0x59EA = 0x4C45
-0x59EB = 0x4931
-0x59F6 = 0x3028
-0x59FB = 0x3079
-0x59FF = 0x3B51
-0x5A01 = 0x3052
-0x5A03 = 0x3023
-0x5A09 = 0x5532
-0x5A11 = 0x5530
-0x5A18 = 0x4C3C
-0x5A1A = 0x5533
-0x5A1C = 0x5531
-0x5A1F = 0x552F
-0x5A20 = 0x3F31
-0x5A25 = 0x552E
-0x5A29 = 0x4A5A
-0x5A2F = 0x3864
-0x5A35 = 0x5537
-0x5A36 = 0x5538
-0x5A3C = 0x3E2B
-0x5A40 = 0x5534
-0x5A41 = 0x4F2C
-0x5A46 = 0x474C
-0x5A49 = 0x5536
-0x5A5A = 0x3A27
-0x5A62 = 0x5539
-0x5A66 = 0x4958
-0x5A6A = 0x553A
-0x5A6C = 0x5535
-0x5A7F = 0x4C3B
-0x5A92 = 0x475E
-0x5A9A = 0x553B
-0x5A9B = 0x4932
-0x5ABC = 0x553C
-0x5ABD = 0x5540
-0x5ABE = 0x553D
-0x5AC1 = 0x3247
-0x5AC2 = 0x553F
-0x5AC9 = 0x3C3B
-0x5ACB = 0x553E
-0x5ACC = 0x3779
-0x5AD0 = 0x554C
-0x5AD6 = 0x5545
-0x5AD7 = 0x5542
-0x5AE1 = 0x4364
-0x5AE3 = 0x5541
-0x5AE6 = 0x5543
-0x5AE9 = 0x5544
-0x5AFA = 0x5546
-0x5AFB = 0x5547
-0x5B09 = 0x3472
-0x5B0B = 0x5549
-0x5B0C = 0x5548
-0x5B16 = 0x554A
-0x5B22 = 0x3E6E
-0x5B2A = 0x554D
-0x5B2C = 0x445C
-0x5B30 = 0x3145
-0x5B32 = 0x554B
-0x5B36 = 0x554E
-0x5B3E = 0x554F
-0x5B40 = 0x5552
-0x5B43 = 0x5550
-0x5B45 = 0x5551
-0x5B50 = 0x3B52
-0x5B51 = 0x5553
-0x5B54 = 0x3926
-0x5B55 = 0x5554
-0x5B57 = 0x3B7A
-0x5B58 = 0x4238
-0x5B5A = 0x5555
-0x5B5B = 0x5556
-0x5B5C = 0x3B5A
-0x5B5D = 0x3927
-0x5B5F = 0x4C52
-0x5B63 = 0x3528
-0x5B64 = 0x3849
-0x5B65 = 0x5557
-0x5B66 = 0x3358
-0x5B69 = 0x5558
-0x5B6B = 0x4239
-0x5B70 = 0x5559
-0x5B71 = 0x5623
-0x5B73 = 0x555A
-0x5B75 = 0x555B
-0x5B78 = 0x555C
-0x5B7A = 0x555E
-0x5B80 = 0x555F
-0x5B83 = 0x5560
-0x5B85 = 0x4270
-0x5B87 = 0x3127
-0x5B88 = 0x3C69
-0x5B89 = 0x3042
-0x5B8B = 0x4157
-0x5B8C = 0x3430
-0x5B8D = 0x3C35
-0x5B8F = 0x3928
-0x5B95 = 0x4566
-0x5B97 = 0x3D21
-0x5B98 = 0x3431
-0x5B99 = 0x4368
-0x5B9A = 0x446A
-0x5B9B = 0x3038
-0x5B9C = 0x3539
-0x5B9D = 0x4A75
-0x5B9F = 0x3C42
-0x5BA2 = 0x3552
-0x5BA3 = 0x406B
-0x5BA4 = 0x3C3C
-0x5BA5 = 0x4D28
-0x5BA6 = 0x5561
-0x5BAE = 0x355C
-0x5BB0 = 0x3A4B
-0x5BB3 = 0x3332
-0x5BB4 = 0x3163
-0x5BB5 = 0x3E2C
-0x5BB6 = 0x3248
-0x5BB8 = 0x5562
-0x5BB9 = 0x4D46
-0x5BBF = 0x3D49
-0x5BC2 = 0x3C64
-0x5BC3 = 0x5563
-0x5BC4 = 0x3473
-0x5BC5 = 0x4652
-0x5BC6 = 0x4C29
-0x5BC7 = 0x5564
-0x5BC9 = 0x5565
-0x5BCC = 0x4959
-0x5BD0 = 0x5567
-0x5BD2 = 0x3428
-0x5BD3 = 0x3677
-0x5BD4 = 0x5566
-0x5BDB = 0x3432
-0x5BDD = 0x3F32
-0x5BDE = 0x556B
-0x5BDF = 0x3B21
-0x5BE1 = 0x3249
-0x5BE2 = 0x556A
-0x5BE4 = 0x5568
-0x5BE5 = 0x556C
-0x5BE6 = 0x5569
-0x5BE7 = 0x472B
-0x5BE8 = 0x5C4D
-0x5BE9 = 0x3F33
-0x5BEB = 0x556D
-0x5BEE = 0x4E40
-0x5BF0 = 0x556E
-0x5BF3 = 0x5570
-0x5BF5 = 0x437E
-0x5BF6 = 0x556F
-0x5BF8 = 0x4023
-0x5BFA = 0x3B7B
-0x5BFE = 0x4250
-0x5BFF = 0x3C77
-0x5C01 = 0x4975
-0x5C02 = 0x406C
-0x5C04 = 0x3C4D
-0x5C05 = 0x5571
-0x5C06 = 0x3E2D
-0x5C07 = 0x5572
-0x5C08 = 0x5573
-0x5C09 = 0x3053
-0x5C0A = 0x423A
-0x5C0B = 0x3F52
-0x5C0D = 0x5574
-0x5C0E = 0x4633
-0x5C0F = 0x3E2E
-0x5C11 = 0x3E2F
-0x5C13 = 0x5575
-0x5C16 = 0x406D
-0x5C1A = 0x3E30
-0x5C20 = 0x5576
-0x5C22 = 0x5577
-0x5C24 = 0x4C60
-0x5C28 = 0x5578
-0x5C2D = 0x3646
-0x5C31 = 0x3D22
-0x5C38 = 0x5579
-0x5C39 = 0x557A
-0x5C3A = 0x3C5C
-0x5C3B = 0x3F2C
-0x5C3C = 0x4674
-0x5C3D = 0x3F54
-0x5C3E = 0x4878
-0x5C3F = 0x4722
-0x5C40 = 0x3649
-0x5C41 = 0x557B
-0x5C45 = 0x356F
-0x5C46 = 0x557C
-0x5C48 = 0x367E
-0x5C4A = 0x464F
-0x5C4B = 0x3230
-0x5C4D = 0x3B53
-0x5C4E = 0x557D
-0x5C4F = 0x5622
-0x5C50 = 0x5621
-0x5C51 = 0x367D
-0x5C53 = 0x557E
-0x5C55 = 0x4538
-0x5C5E = 0x4230
-0x5C60 = 0x454B
-0x5C61 = 0x3C48
-0x5C64 = 0x4158
-0x5C65 = 0x4D7A
-0x5C6C = 0x5624
-0x5C6E = 0x5625
-0x5C6F = 0x4656
-0x5C71 = 0x3B33
-0x5C76 = 0x5627
-0x5C79 = 0x5628
-0x5C8C = 0x5629
-0x5C90 = 0x3474
-0x5C91 = 0x562A
-0x5C94 = 0x562B
-0x5CA1 = 0x322C
-0x5CA8 = 0x413B
-0x5CA9 = 0x3464
-0x5CAB = 0x562D
-0x5CAC = 0x4C28
-0x5CB1 = 0x4252
-0x5CB3 = 0x3359
-0x5CB6 = 0x562F
-0x5CB7 = 0x5631
-0x5CB8 = 0x345F
-0x5CBB = 0x562E
-0x5CBC = 0x5630
-0x5CBE = 0x5633
-0x5CC5 = 0x5632
-0x5CC7 = 0x5634
-0x5CD9 = 0x5635
-0x5CE0 = 0x463D
-0x5CE1 = 0x362E
-0x5CE8 = 0x3265
-0x5CE9 = 0x5636
-0x5CEA = 0x563B
-0x5CED = 0x5639
-0x5CEF = 0x4A77
-0x5CF0 = 0x4A76
-0x5CF6 = 0x4567
-0x5CFA = 0x5638
-0x5CFB = 0x3D54
-0x5CFD = 0x5637
-0x5D07 = 0x3F72
-0x5D0B = 0x563C
-0x5D0E = 0x3A6A
-0x5D11 = 0x5642
-0x5D14 = 0x5643
-0x5D15 = 0x563D
-0x5D16 = 0x3333
-0x5D17 = 0x563E
-0x5D18 = 0x5647
-0x5D19 = 0x5646
-0x5D1A = 0x5645
-0x5D1B = 0x5641
-0x5D1F = 0x5640
-0x5D22 = 0x5644
-0x5D29 = 0x4A78
-0x5D4B = 0x564B
-0x5D4C = 0x5648
-0x5D4E = 0x564A
-0x5D50 = 0x4D72
-0x5D52 = 0x5649
-0x5D5C = 0x563F
-0x5D69 = 0x3F73
-0x5D6C = 0x564C
-0x5D6F = 0x3A37
-0x5D73 = 0x564D
-0x5D76 = 0x564E
-0x5D82 = 0x5651
-0x5D84 = 0x5650
-0x5D87 = 0x564F
-0x5D8B = 0x4568
-0x5D8C = 0x563A
-0x5D90 = 0x5657
-0x5D9D = 0x5653
-0x5DA2 = 0x5652
-0x5DAC = 0x5654
-0x5DAE = 0x5655
-0x5DB7 = 0x5658
-0x5DBA = 0x4E66
-0x5DBC = 0x5659
-0x5DBD = 0x5656
-0x5DC9 = 0x565A
-0x5DCC = 0x3460
-0x5DCD = 0x565B
-0x5DD2 = 0x565D
-0x5DD3 = 0x565C
-0x5DD6 = 0x565E
-0x5DDB = 0x565F
-0x5DDD = 0x406E
-0x5DDE = 0x3D23
-0x5DE1 = 0x3D64
-0x5DE3 = 0x4163
-0x5DE5 = 0x3929
-0x5DE6 = 0x3A38
-0x5DE7 = 0x392A
-0x5DE8 = 0x3570
-0x5DEB = 0x5660
-0x5DEE = 0x3A39
-0x5DF1 = 0x384A
-0x5DF2 = 0x5661
-0x5DF3 = 0x4C26
-0x5DF4 = 0x4743
-0x5DF5 = 0x5662
-0x5DF7 = 0x392B
-0x5DFB = 0x342C
-0x5DFD = 0x4327
-0x5DFE = 0x3652
-0x5E02 = 0x3B54
-0x5E03 = 0x495B
-0x5E06 = 0x4841
-0x5E0B = 0x5663
-0x5E0C = 0x3475
-0x5E11 = 0x5666
-0x5E16 = 0x4421
-0x5E19 = 0x5665
-0x5E1A = 0x5664
-0x5E1B = 0x5667
-0x5E1D = 0x446B
-0x5E25 = 0x3F63
-0x5E2B = 0x3B55
-0x5E2D = 0x404A
-0x5E2F = 0x4253
-0x5E30 = 0x3522
-0x5E33 = 0x4422
-0x5E36 = 0x5668
-0x5E37 = 0x5669
-0x5E38 = 0x3E6F
-0x5E3D = 0x4B39
-0x5E40 = 0x566C
-0x5E43 = 0x566B
-0x5E44 = 0x566A
-0x5E45 = 0x497D
-0x5E47 = 0x5673
-0x5E4C = 0x4B5A
-0x5E4E = 0x566D
-0x5E54 = 0x566F
-0x5E55 = 0x4B6B
-0x5E57 = 0x566E
-0x5E5F = 0x5670
-0x5E61 = 0x4828
-0x5E62 = 0x5671
-0x5E63 = 0x4A3E
-0x5E64 = 0x5672
-0x5E72 = 0x3433
-0x5E73 = 0x4A3F
-0x5E74 = 0x472F
-0x5E75 = 0x5674
-0x5E76 = 0x5675
-0x5E78 = 0x392C
-0x5E79 = 0x3434
-0x5E7A = 0x5676
-0x5E7B = 0x3838
-0x5E7C = 0x4D44
-0x5E7D = 0x4D29
-0x5E7E = 0x3476
-0x5E7F = 0x5678
-0x5E81 = 0x4423
-0x5E83 = 0x392D
-0x5E84 = 0x3E31
-0x5E87 = 0x485F
-0x5E8A = 0x3E32
-0x5E8F = 0x3D78
-0x5E95 = 0x446C
-0x5E96 = 0x4A79
-0x5E97 = 0x4539
-0x5E9A = 0x392E
-0x5E9C = 0x495C
-0x5EA0 = 0x5679
-0x5EA6 = 0x4559
-0x5EA7 = 0x3A42
-0x5EAB = 0x384B
-0x5EAD = 0x446D
-0x5EB5 = 0x3043
-0x5EB6 = 0x3D6E
-0x5EB7 = 0x392F
-0x5EB8 = 0x4D47
-0x5EC1 = 0x567A
-0x5EC2 = 0x567B
-0x5EC3 = 0x4751
-0x5EC8 = 0x567C
-0x5EC9 = 0x4E77
-0x5ECA = 0x4F2D
-0x5ECF = 0x567E
-0x5ED0 = 0x567D
-0x5ED3 = 0x3347
-0x5ED6 = 0x5721
-0x5EDA = 0x5724
-0x5EDB = 0x5725
-0x5EDD = 0x5723
-0x5EDF = 0x4940
-0x5EE0 = 0x3E33
-0x5EE1 = 0x5727
-0x5EE2 = 0x5726
-0x5EE3 = 0x5722
-0x5EE8 = 0x5728
-0x5EE9 = 0x5729
-0x5EEC = 0x572A
-0x5EF0 = 0x572D
-0x5EF1 = 0x572B
-0x5EF3 = 0x572C
-0x5EF4 = 0x572E
-0x5EF6 = 0x3164
-0x5EF7 = 0x446E
-0x5EF8 = 0x572F
-0x5EFA = 0x377A
-0x5EFB = 0x3276
-0x5EFC = 0x4736
-0x5EFE = 0x5730
-0x5EFF = 0x467B
-0x5F01 = 0x4A5B
-0x5F03 = 0x5731
-0x5F04 = 0x4F2E
-0x5F09 = 0x5732
-0x5F0A = 0x4A40
-0x5F0B = 0x5735
-0x5F0C = 0x5021
-0x5F0D = 0x5031
-0x5F0F = 0x3C30
-0x5F10 = 0x4675
-0x5F11 = 0x5736
-0x5F13 = 0x355D
-0x5F14 = 0x4424
-0x5F15 = 0x307A
-0x5F16 = 0x5737
-0x5F17 = 0x4A26
-0x5F18 = 0x3930
-0x5F1B = 0x4350
-0x5F1F = 0x446F
-0x5F25 = 0x4C6F
-0x5F26 = 0x3839
-0x5F27 = 0x384C
-0x5F29 = 0x5738
-0x5F2D = 0x5739
-0x5F2F = 0x573F
-0x5F31 = 0x3C65
-0x5F35 = 0x4425
-0x5F37 = 0x362F
-0x5F38 = 0x573A
-0x5F3C = 0x492B
-0x5F3E = 0x4346
-0x5F41 = 0x573B
-0x5F48 = 0x573C
-0x5F4A = 0x3630
-0x5F4C = 0x573D
-0x5F4E = 0x573E
-0x5F51 = 0x5740
-0x5F53 = 0x4576
-0x5F56 = 0x5741
-0x5F57 = 0x5742
-0x5F59 = 0x5743
-0x5F5C = 0x5734
-0x5F5D = 0x5733
-0x5F61 = 0x5744
-0x5F62 = 0x3741
-0x5F66 = 0x4927
-0x5F69 = 0x3A4C
-0x5F6A = 0x4937
-0x5F6B = 0x4426
-0x5F6C = 0x494B
-0x5F6D = 0x5745
-0x5F70 = 0x3E34
-0x5F71 = 0x3146
-0x5F73 = 0x5746
-0x5F77 = 0x5747
-0x5F79 = 0x4C72
-0x5F7C = 0x4860
-0x5F7F = 0x574A
-0x5F80 = 0x317D
-0x5F81 = 0x402C
-0x5F82 = 0x5749
-0x5F83 = 0x5748
-0x5F84 = 0x3742
-0x5F85 = 0x4254
-0x5F87 = 0x574E
-0x5F88 = 0x574C
-0x5F8A = 0x574B
-0x5F8B = 0x4E27
-0x5F8C = 0x3865
-0x5F90 = 0x3D79
-0x5F91 = 0x574D
-0x5F92 = 0x454C
-0x5F93 = 0x3D3E
-0x5F97 = 0x4640
-0x5F98 = 0x5751
-0x5F99 = 0x5750
-0x5F9E = 0x574F
-0x5FA0 = 0x5752
-0x5FA1 = 0x3866
-0x5FA8 = 0x5753
-0x5FA9 = 0x497C
-0x5FAA = 0x3D5B
-0x5FAD = 0x5754
-0x5FAE = 0x4879
-0x5FB3 = 0x4641
-0x5FB4 = 0x4427
-0x5FB9 = 0x4530
-0x5FBC = 0x5755
-0x5FBD = 0x352B
-0x5FC3 = 0x3F34
-0x5FC5 = 0x492C
-0x5FCC = 0x3477
-0x5FCD = 0x4726
-0x5FD6 = 0x5756
-0x5FD7 = 0x3B56
-0x5FD8 = 0x4B3A
-0x5FD9 = 0x4B3B
-0x5FDC = 0x317E
-0x5FDD = 0x575B
-0x5FE0 = 0x4369
-0x5FE4 = 0x5758
-0x5FEB = 0x3277
-0x5FF0 = 0x582D
-0x5FF1 = 0x575A
-0x5FF5 = 0x4730
-0x5FF8 = 0x5759
-0x5FFB = 0x5757
-0x5FFD = 0x397A
-0x5FFF = 0x575D
-0x600E = 0x5763
-0x600F = 0x5769
-0x6010 = 0x5761
-0x6012 = 0x455C
-0x6015 = 0x5766
-0x6016 = 0x495D
-0x6019 = 0x5760
-0x601B = 0x5765
-0x601C = 0x4E67
-0x601D = 0x3B57
-0x6020 = 0x4255
-0x6021 = 0x575E
-0x6025 = 0x355E
-0x6026 = 0x5768
-0x6027 = 0x402D
-0x6028 = 0x3165
-0x6029 = 0x5762
-0x602A = 0x3278
-0x602B = 0x5767
-0x602F = 0x3631
-0x6031 = 0x5764
-0x603A = 0x576A
-0x6041 = 0x576C
-0x6042 = 0x5776
-0x6043 = 0x5774
-0x6046 = 0x5771
-0x604A = 0x5770
-0x604B = 0x4E78
-0x604D = 0x5772
-0x6050 = 0x3632
-0x6052 = 0x3931
-0x6055 = 0x3D7A
-0x6059 = 0x5779
-0x605A = 0x576B
-0x605F = 0x576F
-0x6060 = 0x575F
-0x6062 = 0x327A
-0x6063 = 0x5773
-0x6064 = 0x5775
-0x6065 = 0x4351
-0x6068 = 0x3A28
-0x6069 = 0x3238
-0x606A = 0x576D
-0x606B = 0x5778
-0x606C = 0x5777
-0x606D = 0x3633
-0x606F = 0x4229
-0x6070 = 0x3366
-0x6075 = 0x3743
-0x6077 = 0x576E
-0x6081 = 0x577A
-0x6083 = 0x577D
-0x6084 = 0x5821
-0x6089 = 0x3C3D
-0x608B = 0x5827
-0x608C = 0x4470
-0x608D = 0x577B
-0x6092 = 0x5825
-0x6094 = 0x3279
-0x6096 = 0x5823
-0x6097 = 0x5824
-0x609A = 0x577E
-0x609B = 0x5822
-0x609F = 0x3867
-0x60A0 = 0x4D2A
-0x60A3 = 0x3435
-0x60A6 = 0x3159
-0x60A7 = 0x5826
-0x60A9 = 0x473A
-0x60AA = 0x302D
-0x60B2 = 0x4861
-0x60B3 = 0x575C
-0x60B4 = 0x582C
-0x60B5 = 0x5830
-0x60B6 = 0x4C65
-0x60B8 = 0x5829
-0x60BC = 0x4569
-0x60BD = 0x582E
-0x60C5 = 0x3E70
-0x60C6 = 0x582F
-0x60C7 = 0x4657
-0x60D1 = 0x4F47
-0x60D3 = 0x582B
-0x60D8 = 0x5831
-0x60DA = 0x397B
-0x60DC = 0x404B
-0x60DF = 0x3054
-0x60E0 = 0x582A
-0x60E1 = 0x5828
-0x60E3 = 0x415A
-0x60E7 = 0x577C
-0x60E8 = 0x3B34
-0x60F0 = 0x4246
-0x60F1 = 0x583D
-0x60F3 = 0x415B
-0x60F4 = 0x5838
-0x60F6 = 0x5835
-0x60F7 = 0x5836
-0x60F9 = 0x3C66
-0x60FA = 0x5839
-0x60FB = 0x583C
-0x6100 = 0x5837
-0x6101 = 0x3D25
-0x6103 = 0x583A
-0x6106 = 0x5834
-0x6108 = 0x4C7C
-0x6109 = 0x4C7B
-0x610D = 0x583E
-0x610E = 0x583F
-0x610F = 0x3055
-0x6115 = 0x5833
-0x611A = 0x3672
-0x611B = 0x3026
-0x611F = 0x3436
-0x6121 = 0x583B
-0x6127 = 0x5843
-0x6128 = 0x5842
-0x612C = 0x5847
-0x6134 = 0x5848
-0x613C = 0x5846
-0x613D = 0x5849
-0x613E = 0x5841
-0x613F = 0x5845
-0x6142 = 0x584A
-0x6144 = 0x584B
-0x6147 = 0x5840
-0x6148 = 0x3B7C
-0x614A = 0x5844
-0x614B = 0x4256
-0x614C = 0x3932
-0x614D = 0x5832
-0x614E = 0x3F35
-0x6153 = 0x5858
-0x6155 = 0x4A69
-0x6158 = 0x584E
-0x6159 = 0x584F
-0x615A = 0x5850
-0x615D = 0x5857
-0x615F = 0x5856
-0x6162 = 0x4B7D
-0x6163 = 0x3437
-0x6165 = 0x5854
-0x6167 = 0x3745
-0x6168 = 0x3334
-0x616B = 0x5851
-0x616E = 0x4E38
-0x616F = 0x5853
-0x6170 = 0x3056
-0x6171 = 0x5855
-0x6173 = 0x584C
-0x6174 = 0x5852
-0x6175 = 0x5859
-0x6176 = 0x3744
-0x6177 = 0x584D
-0x617E = 0x4D5D
-0x6182 = 0x4D2B
-0x6187 = 0x585C
-0x618A = 0x5860
-0x618E = 0x417E
-0x6190 = 0x4E79
-0x6191 = 0x5861
-0x6194 = 0x585E
-0x6196 = 0x585B
-0x6199 = 0x585A
-0x619A = 0x585F
-0x61A4 = 0x4A30
-0x61A7 = 0x4634
-0x61A9 = 0x3746
-0x61AB = 0x5862
-0x61AC = 0x585D
-0x61AE = 0x5863
-0x61B2 = 0x377B
-0x61B6 = 0x3231
-0x61BA = 0x586B
-0x61BE = 0x3438
-0x61C3 = 0x5869
-0x61C6 = 0x586A
-0x61C7 = 0x3A29
-0x61C8 = 0x5868
-0x61C9 = 0x5866
-0x61CA = 0x5865
-0x61CB = 0x586C
-0x61CC = 0x5864
-0x61CD = 0x586E
-0x61D0 = 0x327B
-0x61E3 = 0x5870
-0x61E6 = 0x586F
-0x61F2 = 0x4428
-0x61F4 = 0x5873
-0x61F6 = 0x5871
-0x61F7 = 0x5867
-0x61F8 = 0x377C
-0x61FA = 0x5872
-0x61FC = 0x5876
-0x61FD = 0x5875
-0x61FE = 0x5877
-0x61FF = 0x5874
-0x6200 = 0x5878
-0x6208 = 0x5879
-0x6209 = 0x587A
-0x620A = 0x4A6A
-0x620C = 0x587C
-0x620D = 0x587B
-0x620E = 0x3D3F
-0x6210 = 0x402E
-0x6211 = 0x3266
-0x6212 = 0x327C
-0x6214 = 0x587D
-0x6216 = 0x303F
-0x621A = 0x404C
-0x621B = 0x587E
-0x621D = 0x6C43
-0x621E = 0x5921
-0x621F = 0x3761
-0x6221 = 0x5922
-0x6226 = 0x406F
-0x622A = 0x5923
-0x622E = 0x5924
-0x622F = 0x353A
-0x6230 = 0x5925
-0x6232 = 0x5926
-0x6233 = 0x5927
-0x6234 = 0x4257
-0x6238 = 0x384D
-0x623B = 0x4C61
-0x623F = 0x4B3C
-0x6240 = 0x3D6A
-0x6241 = 0x5928
-0x6247 = 0x4070
-0x6248 = 0x6E3D
-0x6249 = 0x4862
-0x624B = 0x3C6A
-0x624D = 0x3A4D
-0x624E = 0x5929
-0x6253 = 0x4247
-0x6255 = 0x4A27
-0x6258 = 0x4271
-0x625B = 0x592C
-0x625E = 0x592A
-0x6260 = 0x592D
-0x6263 = 0x592B
-0x6268 = 0x592E
-0x626E = 0x4A31
-0x6271 = 0x3037
-0x6276 = 0x495E
-0x6279 = 0x4863
-0x627C = 0x592F
-0x627E = 0x5932
-0x627F = 0x3E35
-0x6280 = 0x353B
-0x6282 = 0x5930
-0x6283 = 0x5937
-0x6284 = 0x3E36
-0x6289 = 0x5931
-0x628A = 0x4744
-0x6291 = 0x4D5E
-0x6292 = 0x5933
-0x6293 = 0x5934
-0x6294 = 0x5938
-0x6295 = 0x456A
-0x6296 = 0x5935
-0x6297 = 0x3933
-0x6298 = 0x405E
-0x629B = 0x5946
-0x629C = 0x4834
-0x629E = 0x4272
-0x62AB = 0x4864
-0x62AC = 0x5A2D
-0x62B1 = 0x4A7A
-0x62B5 = 0x4471
-0x62B9 = 0x4B75
-0x62BB = 0x593B
-0x62BC = 0x3221
-0x62BD = 0x436A
-0x62C2 = 0x5944
-0x62C5 = 0x4334
-0x62C6 = 0x593E
-0x62C7 = 0x5945
-0x62C8 = 0x5940
-0x62C9 = 0x5947
-0x62CA = 0x5943
-0x62CC = 0x5942
-0x62CD = 0x476F
-0x62CF = 0x593C
-0x62D0 = 0x327D
-0x62D1 = 0x593A
-0x62D2 = 0x3571
-0x62D3 = 0x4273
-0x62D4 = 0x5936
-0x62D7 = 0x5939
-0x62D8 = 0x3934
-0x62D9 = 0x405B
-0x62DB = 0x3E37
-0x62DC = 0x5941
-0x62DD = 0x4752
-0x62E0 = 0x3572
-0x62E1 = 0x3348
-0x62EC = 0x3367
-0x62ED = 0x3F21
-0x62EE = 0x5949
-0x62EF = 0x594E
-0x62F1 = 0x594A
-0x62F3 = 0x377D
-0x62F5 = 0x594F
-0x62F6 = 0x3B22
-0x62F7 = 0x3969
-0x62FE = 0x3D26
-0x62FF = 0x593D
-0x6301 = 0x3B7D
-0x6302 = 0x594C
-0x6307 = 0x3B58
-0x6308 = 0x594D
-0x6309 = 0x3044
-0x630C = 0x5948
-0x6311 = 0x4429
-0x6319 = 0x3573
-0x631F = 0x3634
-0x6327 = 0x594B
-0x6328 = 0x3027
-0x632B = 0x3A43
-0x632F = 0x3F36
-0x633A = 0x4472
-0x633D = 0x4854
-0x633E = 0x5951
-0x633F = 0x415E
-0x6349 = 0x422A
-0x634C = 0x3B2B
-0x634D = 0x5952
-0x634F = 0x5954
-0x6350 = 0x5950
-0x6355 = 0x4A61
-0x6357 = 0x443D
-0x635C = 0x415C
-0x6367 = 0x4A7B
-0x6368 = 0x3C4E
-0x6369 = 0x5960
-0x636B = 0x595F
-0x636E = 0x3F78
-0x6372 = 0x377E
-0x6376 = 0x5959
-0x6377 = 0x3E39
-0x637A = 0x4668
-0x637B = 0x4731
-0x6380 = 0x5957
-0x6383 = 0x415D
-0x6388 = 0x3C78
-0x6389 = 0x595C
-0x638C = 0x3E38
-0x638E = 0x5956
-0x638F = 0x595B
-0x6392 = 0x4753
-0x6396 = 0x5955
-0x6398 = 0x3721
-0x639B = 0x335D
-0x639F = 0x595D
-0x63A0 = 0x4E2B
-0x63A1 = 0x3A4E
-0x63A2 = 0x4335
-0x63A3 = 0x595A
-0x63A5 = 0x405C
-0x63A7 = 0x3935
-0x63A8 = 0x3F64
-0x63A9 = 0x3166
-0x63AA = 0x413C
-0x63AB = 0x5958
-0x63AC = 0x3545
-0x63B2 = 0x3747
-0x63B4 = 0x444F
-0x63B5 = 0x595E
-0x63BB = 0x415F
-0x63BE = 0x5961
-0x63C0 = 0x5963
-0x63C3 = 0x4237
-0x63C4 = 0x5969
-0x63C6 = 0x5964
-0x63C9 = 0x5966
-0x63CF = 0x4941
-0x63D0 = 0x4473
-0x63D2 = 0x5967
-0x63D6 = 0x4D2C
-0x63DA = 0x4D48
-0x63DB = 0x3439
-0x63E1 = 0x302E
-0x63E3 = 0x5965
-0x63E9 = 0x5962
-0x63EE = 0x3478
-0x63F4 = 0x3167
-0x63F6 = 0x5968
-0x63FA = 0x4D49
-0x6406 = 0x596C
-0x640D = 0x423B
-0x640F = 0x5973
-0x6413 = 0x596D
-0x6416 = 0x596A
-0x6417 = 0x5971
-0x641C = 0x5953
-0x6426 = 0x596E
-0x6428 = 0x5972
-0x642C = 0x4842
-0x642D = 0x456B
-0x6434 = 0x596B
-0x6436 = 0x596F
-0x643A = 0x3748
-0x643E = 0x3A71
-0x6442 = 0x405D
-0x644E = 0x5977
-0x6458 = 0x4526
-0x6467 = 0x5974
-0x6469 = 0x4B60
-0x646F = 0x5975
-0x6476 = 0x5976
-0x6478 = 0x4C4E
-0x647A = 0x4022
-0x6483 = 0x3762
-0x6488 = 0x597D
-0x6492 = 0x3B35
-0x6493 = 0x597A
-0x6495 = 0x5979
-0x649A = 0x4732
-0x649E = 0x4635
-0x64A4 = 0x4531
-0x64A5 = 0x597B
-0x64A9 = 0x597C
-0x64AB = 0x496F
-0x64AD = 0x4745
-0x64AE = 0x3B23
-0x64B0 = 0x4071
-0x64B2 = 0x4B50
-0x64B9 = 0x3349
-0x64BB = 0x5A25
-0x64BC = 0x597E
-0x64C1 = 0x4D4A
-0x64C2 = 0x5A27
-0x64C5 = 0x5A23
-0x64C7 = 0x5A24
-0x64CD = 0x4160
-0x64D2 = 0x5A22
-0x64D4 = 0x593F
-0x64D8 = 0x5A26
-0x64DA = 0x5A21
-0x64E0 = 0x5A2B
-0x64E1 = 0x5A2C
-0x64E2 = 0x4527
-0x64E3 = 0x5A2E
-0x64E6 = 0x3B24
-0x64E7 = 0x5A29
-0x64EC = 0x353C
-0x64EF = 0x5A2F
-0x64F1 = 0x5A28
-0x64F2 = 0x5A33
-0x64F4 = 0x5A32
-0x64F6 = 0x5A31
-0x64FA = 0x5A34
-0x64FD = 0x5A36
-0x64FE = 0x3E71
-0x6500 = 0x5A35
-0x6505 = 0x5A39
-0x6518 = 0x5A37
-0x651C = 0x5A38
-0x651D = 0x5970
-0x6523 = 0x5A3B
-0x6524 = 0x5A3A
-0x652A = 0x5978
-0x652B = 0x5A3C
-0x652C = 0x5A30
-0x652F = 0x3B59
-0x6534 = 0x5A3D
-0x6535 = 0x5A3E
-0x6536 = 0x5A40
-0x6537 = 0x5A3F
-0x6538 = 0x5A41
-0x6539 = 0x327E
-0x653B = 0x3936
-0x653E = 0x4A7C
-0x653F = 0x402F
-0x6545 = 0x384E
-0x6548 = 0x5A43
-0x654D = 0x5A46
-0x654F = 0x4952
-0x6551 = 0x355F
-0x6555 = 0x5A45
-0x6556 = 0x5A44
-0x6557 = 0x4754
-0x6558 = 0x5A47
-0x6559 = 0x3635
-0x655D = 0x5A49
-0x655E = 0x5A48
-0x6562 = 0x343A
-0x6563 = 0x3B36
-0x6566 = 0x4658
-0x656C = 0x3749
-0x6570 = 0x3F74
-0x6572 = 0x5A4A
-0x6574 = 0x4030
-0x6575 = 0x4528
-0x6577 = 0x495F
-0x6578 = 0x5A4B
-0x6582 = 0x5A4C
-0x6583 = 0x5A4D
-0x6587 = 0x4A38
-0x6588 = 0x555D
-0x6589 = 0x4046
-0x658C = 0x494C
-0x658E = 0x3A58
-0x6590 = 0x4865
-0x6591 = 0x4843
-0x6597 = 0x454D
-0x6599 = 0x4E41
-0x659B = 0x5A4F
-0x659C = 0x3C50
-0x659F = 0x5A50
-0x65A1 = 0x3036
-0x65A4 = 0x3654
-0x65A5 = 0x404D
-0x65A7 = 0x4960
-0x65AB = 0x5A51
-0x65AC = 0x3B42
-0x65AD = 0x4347
-0x65AF = 0x3B5B
-0x65B0 = 0x3F37
-0x65B7 = 0x5A52
-0x65B9 = 0x4A7D
-0x65BC = 0x3177
-0x65BD = 0x3B5C
-0x65C1 = 0x5A55
-0x65C3 = 0x5A53
-0x65C4 = 0x5A56
-0x65C5 = 0x4E39
-0x65C6 = 0x5A54
-0x65CB = 0x407B
-0x65CC = 0x5A57
-0x65CF = 0x4232
-0x65D2 = 0x5A58
-0x65D7 = 0x347A
-0x65D9 = 0x5A5A
-0x65DB = 0x5A59
-0x65E0 = 0x5A5B
-0x65E1 = 0x5A5C
-0x65E2 = 0x347B
-0x65E5 = 0x467C
-0x65E6 = 0x4336
-0x65E7 = 0x356C
-0x65E8 = 0x3B5D
-0x65E9 = 0x4161
-0x65EC = 0x3D5C
-0x65ED = 0x3030
-0x65F1 = 0x5A5D
-0x65FA = 0x3222
-0x65FB = 0x5A61
-0x6602 = 0x3937
-0x6603 = 0x5A60
-0x6606 = 0x3A2B
-0x6607 = 0x3E3A
-0x660A = 0x5A5F
-0x660C = 0x3E3B
-0x660E = 0x4C40
-0x660F = 0x3A2A
-0x6613 = 0x3057
-0x6614 = 0x404E
-0x661C = 0x5A66
-0x661F = 0x4031
-0x6620 = 0x3147
-0x6625 = 0x3D55
-0x6627 = 0x4B66
-0x6628 = 0x3A72
-0x662D = 0x3E3C
-0x662F = 0x4027
-0x6634 = 0x5A65
-0x6635 = 0x5A63
-0x6636 = 0x5A64
-0x663C = 0x436B
-0x663F = 0x5B26
-0x6641 = 0x5A6A
-0x6642 = 0x3B7E
-0x6643 = 0x3938
-0x6644 = 0x5A68
-0x6649 = 0x5A69
-0x664B = 0x3F38
-0x664F = 0x5A67
-0x6652 = 0x3B2F
-0x665D = 0x5A6C
-0x665E = 0x5A6B
-0x665F = 0x5A70
-0x6662 = 0x5A71
-0x6664 = 0x5A6D
-0x6666 = 0x3322
-0x6667 = 0x5A6E
-0x6668 = 0x5A6F
-0x6669 = 0x4855
-0x666E = 0x4961
-0x666F = 0x374A
-0x6670 = 0x5A72
-0x6674 = 0x4032
-0x6676 = 0x3E3D
-0x667A = 0x4352
-0x6681 = 0x3647
-0x6683 = 0x5A73
-0x6684 = 0x5A77
-0x6687 = 0x324B
-0x6688 = 0x5A74
-0x6689 = 0x5A76
-0x668E = 0x5A75
-0x6691 = 0x3D6B
-0x6696 = 0x4348
-0x6697 = 0x3045
-0x6698 = 0x5A78
-0x669D = 0x5A79
-0x66A2 = 0x442A
-0x66A6 = 0x4E71
-0x66AB = 0x3B43
-0x66AE = 0x4A6B
-0x66B4 = 0x4B3D
-0x66B8 = 0x5B22
-0x66B9 = 0x5A7B
-0x66BC = 0x5A7E
-0x66BE = 0x5A7D
-0x66C1 = 0x5A7A
-0x66C4 = 0x5B21
-0x66C7 = 0x465E
-0x66C9 = 0x5A7C
-0x66D6 = 0x5B23
-0x66D9 = 0x3D6C
-0x66DA = 0x5B24
-0x66DC = 0x4D4B
-0x66DD = 0x4778
-0x66E0 = 0x5B25
-0x66E6 = 0x5B27
-0x66E9 = 0x5B28
-0x66F0 = 0x5B29
-0x66F2 = 0x364A
-0x66F3 = 0x3148
-0x66F4 = 0x3939
-0x66F5 = 0x5B2A
-0x66F7 = 0x5B2B
-0x66F8 = 0x3D71
-0x66F9 = 0x4162
-0x66FC = 0x5258
-0x66FD = 0x413E
-0x66FE = 0x413D
-0x66FF = 0x4258
-0x6700 = 0x3A47
-0x6703 = 0x5072
-0x6708 = 0x376E
-0x6709 = 0x4D2D
-0x670B = 0x4A7E
-0x670D = 0x497E
-0x670F = 0x5B2C
-0x6714 = 0x3A73
-0x6715 = 0x443F
-0x6716 = 0x5B2D
-0x6717 = 0x4F2F
-0x671B = 0x4B3E
-0x671D = 0x442B
-0x671E = 0x5B2E
-0x671F = 0x347C
-0x6726 = 0x5B2F
-0x6727 = 0x5B30
-0x6728 = 0x4C5A
-0x672A = 0x4C24
-0x672B = 0x4B76
-0x672C = 0x4B5C
-0x672D = 0x3B25
-0x672E = 0x5B32
-0x6731 = 0x3C6B
-0x6734 = 0x4B51
-0x6736 = 0x5B34
-0x6737 = 0x5B37
-0x6738 = 0x5B36
-0x673A = 0x3479
-0x673D = 0x3560
-0x673F = 0x5B33
-0x6741 = 0x5B35
-0x6746 = 0x5B38
-0x6749 = 0x3F79
-0x674E = 0x4D7B
-0x674F = 0x3049
-0x6750 = 0x3A60
-0x6751 = 0x423C
-0x6753 = 0x3C5D
-0x6756 = 0x3E73
-0x6759 = 0x5B3B
-0x675C = 0x454E
-0x675E = 0x5B39
-0x675F = 0x422B
-0x6760 = 0x5B3A
-0x6761 = 0x3E72
-0x6762 = 0x4C5D
-0x6763 = 0x5B3C
-0x6764 = 0x5B3D
-0x6765 = 0x4D68
-0x676A = 0x5B42
-0x676D = 0x393A
-0x676F = 0x4755
-0x6770 = 0x5B3F
-0x6771 = 0x456C
-0x6772 = 0x5A5E
-0x6773 = 0x5A62
-0x6775 = 0x354F
-0x6777 = 0x4747
-0x677C = 0x5B41
-0x677E = 0x3E3E
-0x677F = 0x4844
-0x6785 = 0x5B47
-0x6787 = 0x487A
-0x6789 = 0x5B3E
-0x678B = 0x5B44
-0x678C = 0x5B43
-0x6790 = 0x404F
-0x6795 = 0x4B6D
-0x6797 = 0x4E53
-0x679A = 0x4B67
-0x679C = 0x324C
-0x679D = 0x3B5E
-0x67A0 = 0x4F48
-0x67A1 = 0x5B46
-0x67A2 = 0x3F75
-0x67A6 = 0x5B45
-0x67A9 = 0x5B40
-0x67AF = 0x384F
-0x67B3 = 0x5B4C
-0x67B4 = 0x5B4A
-0x67B6 = 0x324D
-0x67B7 = 0x5B48
-0x67B8 = 0x5B4E
-0x67B9 = 0x5B54
-0x67C1 = 0x4248
-0x67C4 = 0x4A41
-0x67C6 = 0x5B56
-0x67CA = 0x4922
-0x67CE = 0x5B55
-0x67CF = 0x4770
-0x67D0 = 0x4B3F
-0x67D1 = 0x343B
-0x67D3 = 0x4077
-0x67D4 = 0x3D40
-0x67D8 = 0x4453
-0x67DA = 0x4D2E
-0x67DD = 0x5B51
-0x67DE = 0x5B50
-0x67E2 = 0x5B52
-0x67E4 = 0x5B4F
-0x67E7 = 0x5B57
-0x67E9 = 0x5B4D
-0x67EC = 0x5B4B
-0x67EE = 0x5B53
-0x67EF = 0x5B49
-0x67F1 = 0x436C
-0x67F3 = 0x4C78
-0x67F4 = 0x3C46
-0x67F5 = 0x3A74
-0x67FB = 0x3A3A
-0x67FE = 0x4B6F
-0x67FF = 0x3341
-0x6802 = 0x444E
-0x6803 = 0x464A
-0x6804 = 0x3149
-0x6813 = 0x4072
-0x6816 = 0x4034
-0x6817 = 0x372A
-0x681E = 0x5B59
-0x6821 = 0x393B
-0x6822 = 0x337C
-0x6829 = 0x5B5B
-0x682A = 0x3374
-0x682B = 0x5B61
-0x6832 = 0x5B5E
-0x6834 = 0x4073
-0x6838 = 0x334B
-0x6839 = 0x3A2C
-0x683C = 0x334A
-0x683D = 0x3A4F
-0x6840 = 0x5B5C
-0x6841 = 0x3765
-0x6842 = 0x374B
-0x6843 = 0x456D
-0x6846 = 0x5B5A
-0x6848 = 0x3046
-0x684D = 0x5B5D
-0x684E = 0x5B5F
-0x6850 = 0x364D
-0x6851 = 0x372C
-0x6853 = 0x343C
-0x6854 = 0x354B
-0x6859 = 0x5B62
-0x685C = 0x3A79
-0x685D = 0x4B71
-0x685F = 0x3B37
-0x6863 = 0x5B63
-0x6867 = 0x4930
-0x6874 = 0x5B6F
-0x6876 = 0x3233
-0x6877 = 0x5B64
-0x687E = 0x5B75
-0x687F = 0x5B65
-0x6881 = 0x4E42
-0x6883 = 0x5B6C
-0x6885 = 0x475F
-0x688D = 0x5B74
-0x688F = 0x5B67
-0x6893 = 0x3034
-0x6894 = 0x5B69
-0x6897 = 0x393C
-0x689B = 0x5B6B
-0x689D = 0x5B6A
-0x689F = 0x5B66
-0x68A0 = 0x5B71
-0x68A2 = 0x3E3F
-0x68A6 = 0x546D
-0x68A7 = 0x3868
-0x68A8 = 0x4D7C
-0x68AD = 0x5B68
-0x68AF = 0x4474
-0x68B0 = 0x3323
-0x68B1 = 0x3A2D
-0x68B3 = 0x5B60
-0x68B5 = 0x5B70
-0x68B6 = 0x3361
-0x68B9 = 0x5B6E
-0x68BA = 0x5B72
-0x68BC = 0x456E
-0x68C4 = 0x347E
-0x68C6 = 0x5C32
-0x68C9 = 0x4C49
-0x68CA = 0x5B77
-0x68CB = 0x347D
-0x68CD = 0x5B7E
-0x68D2 = 0x4B40
-0x68D4 = 0x5C21
-0x68D5 = 0x5C23
-0x68D7 = 0x5C27
-0x68D8 = 0x5B79
-0x68DA = 0x432A
-0x68DF = 0x456F
-0x68E0 = 0x5C2B
-0x68E1 = 0x5B7C
-0x68E3 = 0x5C28
-0x68E7 = 0x5C22
-0x68EE = 0x3F39
-0x68EF = 0x5C2C
-0x68F2 = 0x4033
-0x68F9 = 0x5C2A
-0x68FA = 0x343D
-0x6900 = 0x4F50
-0x6901 = 0x5B76
-0x6904 = 0x5C26
-0x6905 = 0x3058
-0x6908 = 0x5B78
-0x690B = 0x4C3A
-0x690C = 0x5B7D
-0x690D = 0x3F22
-0x690E = 0x4447
-0x690F = 0x5B73
-0x6912 = 0x5C25
-0x6919 = 0x3F7A
-0x691A = 0x5C2F
-0x691B = 0x3371
-0x691C = 0x3821
-0x6921 = 0x5C31
-0x6922 = 0x5B7A
-0x6923 = 0x5C30
-0x6925 = 0x5C29
-0x6926 = 0x5B7B
-0x6928 = 0x5C2D
-0x692A = 0x5C2E
-0x6930 = 0x5C3F
-0x6934 = 0x464E
-0x6936 = 0x5C24
-0x6939 = 0x5C3B
-0x693D = 0x5C3D
-0x693F = 0x4458
-0x694A = 0x4D4C
-0x6953 = 0x4976
-0x6954 = 0x5C38
-0x6955 = 0x424A
-0x6959 = 0x5C3E
-0x695A = 0x413F
-0x695C = 0x5C35
-0x695D = 0x5C42
-0x695E = 0x5C41
-0x6960 = 0x466F
-0x6961 = 0x5C40
-0x6962 = 0x466A
-0x696A = 0x5C44
-0x696B = 0x5C37
-0x696D = 0x3648
-0x696E = 0x5C3A
-0x696F = 0x3D5D
-0x6973 = 0x4760
-0x6974 = 0x5C3C
-0x6975 = 0x364B
-0x6977 = 0x5C34
-0x6978 = 0x5C36
-0x6979 = 0x5C33
-0x697C = 0x4F30
-0x697D = 0x335A
-0x697E = 0x5C39
-0x6981 = 0x5C43
-0x6982 = 0x3335
-0x698A = 0x3A67
-0x698E = 0x315D
-0x6991 = 0x5C54
-0x6994 = 0x4F31
-0x6995 = 0x5C57
-0x699B = 0x3F3A
-0x699C = 0x5C56
-0x69A0 = 0x5C55
-0x69A7 = 0x5C52
-0x69AE = 0x5C46
-0x69B1 = 0x5C63
-0x69B2 = 0x5C45
-0x69B4 = 0x5C58
-0x69BB = 0x5C50
-0x69BE = 0x5C4B
-0x69BF = 0x5C48
-0x69C1 = 0x5C49
-0x69C3 = 0x5C51
-0x69C7 = 0x7422
-0x69CA = 0x5C4E
-0x69CB = 0x393D
-0x69CC = 0x4448
-0x69CD = 0x4164
-0x69CE = 0x5C4C
-0x69D0 = 0x5C47
-0x69D3 = 0x5C4A
-0x69D8 = 0x4D4D
-0x69D9 = 0x4B6A
-0x69DD = 0x5C4F
-0x69DE = 0x5C59
-0x69E7 = 0x5C61
-0x69E8 = 0x5C5A
-0x69EB = 0x5C67
-0x69ED = 0x5C65
-0x69F2 = 0x5C60
-0x69F9 = 0x5C5F
-0x69FB = 0x4450
-0x69FD = 0x4165
-0x69FF = 0x5C5D
-0x6A02 = 0x5C5B
-0x6A05 = 0x5C62
-0x6A0A = 0x5C68
-0x6A0B = 0x4875
-0x6A0C = 0x5C6E
-0x6A12 = 0x5C69
-0x6A13 = 0x5C6C
-0x6A14 = 0x5C66
-0x6A17 = 0x4374
-0x6A19 = 0x4938
-0x6A1B = 0x5C5C
-0x6A1E = 0x5C64
-0x6A1F = 0x3E40
-0x6A21 = 0x4C4F
-0x6A22 = 0x5C78
-0x6A23 = 0x5C6B
-0x6A29 = 0x3822
-0x6A2A = 0x3223
-0x6A2B = 0x335F
-0x6A2E = 0x5C53
-0x6A35 = 0x3E41
-0x6A36 = 0x5C70
-0x6A38 = 0x5C77
-0x6A39 = 0x3C79
-0x6A3A = 0x3372
-0x6A3D = 0x432E
-0x6A44 = 0x5C6D
-0x6A47 = 0x5C72
-0x6A48 = 0x5C76
-0x6A4B = 0x3636
-0x6A58 = 0x354C
-0x6A59 = 0x5C74
-0x6A5F = 0x3521
-0x6A61 = 0x464B
-0x6A62 = 0x5C73
-0x6A66 = 0x5C75
-0x6A72 = 0x5C6F
-0x6A78 = 0x5C71
-0x6A7F = 0x3360
-0x6A80 = 0x4349
-0x6A84 = 0x5C7C
-0x6A8D = 0x5C7A
-0x6A8E = 0x3869
-0x6A90 = 0x5C79
-0x6A97 = 0x5D21
-0x6A9C = 0x5B58
-0x6AA0 = 0x5C7B
-0x6AA2 = 0x5C7D
-0x6AA3 = 0x5C7E
-0x6AAA = 0x5D2C
-0x6AAC = 0x5D28
-0x6AAE = 0x5B6D
-0x6AB3 = 0x5D27
-0x6AB8 = 0x5D26
-0x6ABB = 0x5D23
-0x6AC1 = 0x5C6A
-0x6AC2 = 0x5D25
-0x6AC3 = 0x5D24
-0x6AD1 = 0x5D2A
-0x6AD3 = 0x4F26
-0x6ADA = 0x5D2D
-0x6ADB = 0x367B
-0x6ADE = 0x5D29
-0x6ADF = 0x5D2B
-0x6AE8 = 0x4827
-0x6AEA = 0x5D2E
-0x6AFA = 0x5D32
-0x6AFB = 0x5D2F
-0x6B04 = 0x4D73
-0x6B05 = 0x5D30
-0x6B0A = 0x5C5E
-0x6B12 = 0x5D33
-0x6B16 = 0x5D34
-0x6B1D = 0x3135
-0x6B1F = 0x5D36
-0x6B20 = 0x3767
-0x6B21 = 0x3C21
-0x6B23 = 0x3655
-0x6B27 = 0x3224
-0x6B32 = 0x4D5F
-0x6B37 = 0x5D38
-0x6B38 = 0x5D37
-0x6B39 = 0x5D3A
-0x6B3A = 0x353D
-0x6B3D = 0x3656
-0x6B3E = 0x343E
-0x6B43 = 0x5D3D
-0x6B47 = 0x5D3C
-0x6B49 = 0x5D3E
-0x6B4C = 0x324E
-0x6B4E = 0x4337
-0x6B50 = 0x5D3F
-0x6B53 = 0x343F
-0x6B54 = 0x5D41
-0x6B59 = 0x5D40
-0x6B5B = 0x5D42
-0x6B5F = 0x5D43
-0x6B61 = 0x5D44
-0x6B62 = 0x3B5F
-0x6B63 = 0x4035
-0x6B64 = 0x3A21
-0x6B66 = 0x4970
-0x6B69 = 0x4A62
-0x6B6A = 0x4F44
-0x6B6F = 0x3B75
-0x6B73 = 0x3A50
-0x6B74 = 0x4E72
-0x6B78 = 0x5D45
-0x6B79 = 0x5D46
-0x6B7B = 0x3B60
-0x6B7F = 0x5D47
-0x6B80 = 0x5D48
-0x6B83 = 0x5D4A
-0x6B84 = 0x5D49
-0x6B86 = 0x4B58
-0x6B89 = 0x3D5E
-0x6B8A = 0x3C6C
-0x6B8B = 0x3B44
-0x6B8D = 0x5D4B
-0x6B95 = 0x5D4D
-0x6B96 = 0x3F23
-0x6B98 = 0x5D4C
-0x6B9E = 0x5D4E
-0x6BA4 = 0x5D4F
-0x6BAA = 0x5D50
-0x6BAB = 0x5D51
-0x6BAF = 0x5D52
-0x6BB1 = 0x5D54
-0x6BB2 = 0x5D53
-0x6BB3 = 0x5D55
-0x6BB4 = 0x3225
-0x6BB5 = 0x434A
-0x6BB7 = 0x5D56
-0x6BBA = 0x3B26
-0x6BBB = 0x334C
-0x6BBC = 0x5D57
-0x6BBF = 0x4542
-0x6BC0 = 0x544C
-0x6BC5 = 0x3523
-0x6BC6 = 0x5D58
-0x6BCB = 0x5D59
-0x6BCD = 0x4A6C
-0x6BCE = 0x4B68
-0x6BD2 = 0x4647
-0x6BD3 = 0x5D5A
-0x6BD4 = 0x4866
-0x6BD8 = 0x487B
-0x6BDB = 0x4C53
-0x6BDF = 0x5D5B
-0x6BEB = 0x5D5D
-0x6BEC = 0x5D5C
-0x6BEF = 0x5D5F
-0x6BF3 = 0x5D5E
-0x6C08 = 0x5D61
-0x6C0F = 0x3B61
-0x6C11 = 0x4C31
-0x6C13 = 0x5D62
-0x6C14 = 0x5D63
-0x6C17 = 0x3524
-0x6C1B = 0x5D64
-0x6C23 = 0x5D66
-0x6C24 = 0x5D65
-0x6C34 = 0x3F65
-0x6C37 = 0x4939
-0x6C38 = 0x314A
-0x6C3E = 0x4845
-0x6C40 = 0x4475
-0x6C41 = 0x3D41
-0x6C42 = 0x3561
-0x6C4E = 0x4846
-0x6C50 = 0x3C2E
-0x6C55 = 0x5D68
-0x6C57 = 0x3440
-0x6C5A = 0x3178
-0x6C5D = 0x4672
-0x6C5E = 0x5D67
-0x6C5F = 0x393E
-0x6C60 = 0x4353
-0x6C62 = 0x5D69
-0x6C68 = 0x5D71
-0x6C6A = 0x5D6A
-0x6C70 = 0x4241
-0x6C72 = 0x3562
-0x6C73 = 0x5D72
-0x6C7A = 0x3768
-0x6C7D = 0x3525
-0x6C7E = 0x5D70
-0x6C81 = 0x5D6E
-0x6C82 = 0x5D6B
-0x6C83 = 0x4D60
-0x6C88 = 0x4440
-0x6C8C = 0x4659
-0x6C8D = 0x5D6C
-0x6C90 = 0x5D74
-0x6C92 = 0x5D73
-0x6C93 = 0x3723
-0x6C96 = 0x322D
-0x6C99 = 0x3A3B
-0x6C9A = 0x5D6D
-0x6C9B = 0x5D6F
-0x6CA1 = 0x4B57
-0x6CA2 = 0x4274
-0x6CAB = 0x4B77
-0x6CAE = 0x5D7C
-0x6CB1 = 0x5D7D
-0x6CB3 = 0x324F
-0x6CB8 = 0x4A28
-0x6CB9 = 0x4C7D
-0x6CBA = 0x5E21
-0x6CBB = 0x3C23
-0x6CBC = 0x3E42
-0x6CBD = 0x5D78
-0x6CBE = 0x5D7E
-0x6CBF = 0x3168
-0x6CC1 = 0x3637
-0x6CC4 = 0x5D75
-0x6CC5 = 0x5D7A
-0x6CC9 = 0x4074
-0x6CCA = 0x4771
-0x6CCC = 0x4867
-0x6CD3 = 0x5D77
-0x6CD5 = 0x4B21
-0x6CD7 = 0x5D79
-0x6CD9 = 0x5E24
-0x6CDB = 0x5E22
-0x6CDD = 0x5D7B
-0x6CE1 = 0x4B22
-0x6CE2 = 0x4748
-0x6CE3 = 0x3563
-0x6CE5 = 0x4525
-0x6CE8 = 0x436D
-0x6CEA = 0x5E25
-0x6CEF = 0x5E23
-0x6CF0 = 0x4259
-0x6CF1 = 0x5D76
-0x6CF3 = 0x314B
-0x6D0B = 0x4D4E
-0x6D0C = 0x5E30
-0x6D12 = 0x5E2F
-0x6D17 = 0x4076
-0x6D19 = 0x5E2C
-0x6D1B = 0x4D6C
-0x6D1E = 0x4636
-0x6D1F = 0x5E26
-0x6D25 = 0x4445
-0x6D29 = 0x314C
-0x6D2A = 0x393F
-0x6D2B = 0x5E29
-0x6D32 = 0x3D27
-0x6D33 = 0x5E2E
-0x6D35 = 0x5E2D
-0x6D36 = 0x5E28
-0x6D38 = 0x5E2B
-0x6D3B = 0x3368
-0x6D3D = 0x5E2A
-0x6D3E = 0x4749
-0x6D41 = 0x4E2E
-0x6D44 = 0x3E74
-0x6D45 = 0x4075
-0x6D59 = 0x5E36
-0x6D5A = 0x5E34
-0x6D5C = 0x494D
-0x6D63 = 0x5E31
-0x6D64 = 0x5E33
-0x6D66 = 0x313A
-0x6D69 = 0x3940
-0x6D6A = 0x4F32
-0x6D6C = 0x333D
-0x6D6E = 0x4962
-0x6D74 = 0x4D61
-0x6D77 = 0x3324
-0x6D78 = 0x3F3B
-0x6D79 = 0x5E35
-0x6D85 = 0x5E3A
-0x6D88 = 0x3E43
-0x6D8C = 0x4D30
-0x6D8E = 0x5E37
-0x6D93 = 0x5E32
-0x6D95 = 0x5E38
-0x6D99 = 0x4E5E
-0x6D9B = 0x4573
-0x6D9C = 0x4642
-0x6DAF = 0x3336
-0x6DB2 = 0x3155
-0x6DB5 = 0x5E3E
-0x6DB8 = 0x5E41
-0x6DBC = 0x4E43
-0x6DC0 = 0x4D64
-0x6DC5 = 0x5E48
-0x6DC6 = 0x5E42
-0x6DC7 = 0x5E3F
-0x6DCB = 0x4E54
-0x6DCC = 0x5E45
-0x6DD1 = 0x3D4A
-0x6DD2 = 0x5E47
-0x6DD5 = 0x5E4C
-0x6DD8 = 0x4571
-0x6DD9 = 0x5E4A
-0x6DDE = 0x5E44
-0x6DE1 = 0x4338
-0x6DE4 = 0x5E4B
-0x6DE6 = 0x5E40
-0x6DE8 = 0x5E46
-0x6DEA = 0x5E4D
-0x6DEB = 0x307C
-0x6DEC = 0x5E43
-0x6DEE = 0x5E4E
-0x6DF1 = 0x3F3C
-0x6DF3 = 0x3D5F
-0x6DF5 = 0x4A25
-0x6DF7 = 0x3A2E
-0x6DF9 = 0x5E3B
-0x6DFA = 0x5E49
-0x6DFB = 0x453A
-0x6E05 = 0x4036
-0x6E07 = 0x3369
-0x6E08 = 0x3A51
-0x6E09 = 0x3E44
-0x6E0A = 0x5E3D
-0x6E0B = 0x3D42
-0x6E13 = 0x374C
-0x6E15 = 0x5E3C
-0x6E19 = 0x5E52
-0x6E1A = 0x3D6D
-0x6E1B = 0x383A
-0x6E1D = 0x5E61
-0x6E1F = 0x5E5B
-0x6E20 = 0x3574
-0x6E21 = 0x454F
-0x6E23 = 0x5E56
-0x6E24 = 0x5E5F
-0x6E25 = 0x302F
-0x6E26 = 0x3132
-0x6E29 = 0x3239
-0x6E2B = 0x5E58
-0x6E2C = 0x422C
-0x6E2D = 0x5E4F
-0x6E2E = 0x5E51
-0x6E2F = 0x3941
-0x6E38 = 0x5E62
-0x6E3A = 0x5E5D
-0x6E3E = 0x5E55
-0x6E43 = 0x5E5C
-0x6E4A = 0x4C2B
-0x6E4D = 0x5E5A
-0x6E4E = 0x5E5E
-0x6E56 = 0x3850
-0x6E58 = 0x3E45
-0x6E5B = 0x4339
-0x6E5F = 0x5E54
-0x6E67 = 0x4D2F
-0x6E6B = 0x5E57
-0x6E6E = 0x5E50
-0x6E6F = 0x4572
-0x6E72 = 0x5E53
-0x6E76 = 0x5E59
-0x6E7E = 0x4F51
-0x6E7F = 0x3C3E
-0x6E80 = 0x4B7E
-0x6E82 = 0x5E63
-0x6E8C = 0x482E
-0x6E8F = 0x5E6F
-0x6E90 = 0x383B
-0x6E96 = 0x3D60
-0x6E98 = 0x5E65
-0x6E9C = 0x4E2F
-0x6E9D = 0x3942
-0x6E9F = 0x5E72
-0x6EA2 = 0x306E
-0x6EA5 = 0x5E70
-0x6EAA = 0x5E64
-0x6EAF = 0x5E6A
-0x6EB2 = 0x5E6C
-0x6EB6 = 0x4D4F
-0x6EB7 = 0x5E67
-0x6EBA = 0x452E
-0x6EBD = 0x5E69
-0x6EC2 = 0x5E71
-0x6EC4 = 0x5E6B
-0x6EC5 = 0x4C47
-0x6EC9 = 0x5E66
-0x6ECB = 0x3C22
-0x6ECC = 0x5E7E
-0x6ED1 = 0x336A
-0x6ED3 = 0x5E68
-0x6ED4 = 0x5E6D
-0x6ED5 = 0x5E6E
-0x6EDD = 0x426C
-0x6EDE = 0x425A
-0x6EEC = 0x5E76
-0x6EEF = 0x5E7C
-0x6EF2 = 0x5E7A
-0x6EF4 = 0x4529
-0x6EF7 = 0x5F23
-0x6EF8 = 0x5E77
-0x6EFE = 0x5E78
-0x6EFF = 0x5E60
-0x6F01 = 0x3579
-0x6F02 = 0x493A
-0x6F06 = 0x3C3F
-0x6F09 = 0x3977
-0x6F0F = 0x4F33
-0x6F11 = 0x5E74
-0x6F13 = 0x5F22
-0x6F14 = 0x3169
-0x6F15 = 0x4166
-0x6F20 = 0x4779
-0x6F22 = 0x3441
-0x6F23 = 0x4E7A
-0x6F2B = 0x4C21
-0x6F2C = 0x4452
-0x6F31 = 0x5E7B
-0x6F32 = 0x5E7D
-0x6F38 = 0x4132
-0x6F3E = 0x5F21
-0x6F3F = 0x5E79
-0x6F41 = 0x5E73
-0x6F45 = 0x3443
-0x6F54 = 0x3769
-0x6F58 = 0x5F2F
-0x6F5B = 0x5F2A
-0x6F5C = 0x4078
-0x6F5F = 0x3363
-0x6F64 = 0x3D61
-0x6F66 = 0x5F33
-0x6F6D = 0x5F2C
-0x6F6E = 0x442C
-0x6F6F = 0x5F29
-0x6F70 = 0x4459
-0x6F74 = 0x5F4C
-0x6F78 = 0x5F26
-0x6F7A = 0x5F25
-0x6F7C = 0x5F2E
-0x6F80 = 0x5F28
-0x6F81 = 0x5F27
-0x6F82 = 0x5F2D
-0x6F84 = 0x4021
-0x6F86 = 0x5F24
-0x6F8E = 0x5F30
-0x6F91 = 0x5F31
-0x6F97 = 0x3442
-0x6FA1 = 0x5F36
-0x6FA3 = 0x5F35
-0x6FA4 = 0x5F37
-0x6FAA = 0x5F3A
-0x6FB1 = 0x4543
-0x6FB3 = 0x5F34
-0x6FB9 = 0x5F38
-0x6FC0 = 0x3763
-0x6FC1 = 0x4279
-0x6FC2 = 0x5F32
-0x6FC3 = 0x473B
-0x6FC6 = 0x5F39
-0x6FD4 = 0x5F3E
-0x6FD5 = 0x5F3C
-0x6FD8 = 0x5F3F
-0x6FDB = 0x5F42
-0x6FDF = 0x5F3B
-0x6FE0 = 0x396A
-0x6FE1 = 0x4728
-0x6FE4 = 0x5E39
-0x6FEB = 0x4D74
-0x6FEC = 0x5F3D
-0x6FEE = 0x5F41
-0x6FEF = 0x4275
-0x6FF1 = 0x5F40
-0x6FF3 = 0x5F2B
-0x6FF6 = 0x6F69
-0x6FFA = 0x5F45
-0x6FFE = 0x5F49
-0x7001 = 0x5F47
-0x7009 = 0x5F43
-0x700B = 0x5F44
-0x700F = 0x5F48
-0x7011 = 0x5F46
-0x7015 = 0x494E
-0x7018 = 0x5F4E
-0x701A = 0x5F4B
-0x701B = 0x5F4A
-0x701D = 0x5F4D
-0x701E = 0x4654
-0x701F = 0x5F4F
-0x7026 = 0x4375
-0x7027 = 0x426D
-0x702C = 0x4025
-0x7030 = 0x5F50
-0x7032 = 0x5F52
-0x703E = 0x5F51
-0x704C = 0x5E75
-0x7051 = 0x5F53
-0x7058 = 0x4667
-0x7063 = 0x5F54
-0x706B = 0x3250
-0x706F = 0x4574
-0x7070 = 0x3325
-0x7078 = 0x3564
-0x707C = 0x3C5E
-0x707D = 0x3A52
-0x7089 = 0x4F27
-0x708A = 0x3F66
-0x708E = 0x316A
-0x7092 = 0x5F56
-0x7099 = 0x5F55
-0x70AC = 0x5F59
-0x70AD = 0x433A
-0x70AE = 0x5F5C
-0x70AF = 0x5F57
-0x70B3 = 0x5F5B
-0x70B8 = 0x5F5A
-0x70B9 = 0x4540
-0x70BA = 0x3059
-0x70C8 = 0x4E75
-0x70CB = 0x5F5E
-0x70CF = 0x3128
-0x70D9 = 0x5F60
-0x70DD = 0x5F5F
-0x70DF = 0x5F5D
-0x70F1 = 0x5F58
-0x70F9 = 0x4B23
-0x70FD = 0x5F62
-0x7109 = 0x5F61
-0x7114 = 0x316B
-0x7119 = 0x5F64
-0x711A = 0x4A32
-0x711C = 0x5F63
-0x7121 = 0x4C35
-0x7126 = 0x3E47
-0x7136 = 0x4133
-0x713C = 0x3E46
-0x7149 = 0x4E7B
-0x714C = 0x5F6A
-0x714E = 0x4079
-0x7155 = 0x5F66
-0x7156 = 0x5F6B
-0x7159 = 0x316C
-0x7162 = 0x5F69
-0x7164 = 0x4761
-0x7165 = 0x5F65
-0x7166 = 0x5F68
-0x7167 = 0x3E48
-0x7169 = 0x4851
-0x716C = 0x5F6C
-0x716E = 0x3C51
-0x717D = 0x407A
-0x7184 = 0x5F6F
-0x7188 = 0x5F67
-0x718A = 0x3727
-0x718F = 0x5F6D
-0x7194 = 0x4D50
-0x7195 = 0x5F70
-0x7199 = 0x7426
-0x719F = 0x3D4F
-0x71A8 = 0x5F71
-0x71AC = 0x5F72
-0x71B1 = 0x472E
-0x71B9 = 0x5F74
-0x71BE = 0x5F75
-0x71C3 = 0x4733
-0x71C8 = 0x4575
-0x71C9 = 0x5F77
-0x71CE = 0x5F79
-0x71D0 = 0x4E55
-0x71D2 = 0x5F76
-0x71D4 = 0x5F78
-0x71D5 = 0x316D
-0x71D7 = 0x5F73
-0x71DF = 0x535B
-0x71E0 = 0x5F7A
-0x71E5 = 0x4167
-0x71E6 = 0x3B38
-0x71E7 = 0x5F7C
-0x71EC = 0x5F7B
-0x71ED = 0x3F24
-0x71EE = 0x5259
-0x71F5 = 0x5F7D
-0x71F9 = 0x6021
-0x71FB = 0x5F6E
-0x71FC = 0x5F7E
-0x71FF = 0x6022
-0x7206 = 0x477A
-0x720D = 0x6023
-0x7210 = 0x6024
-0x721B = 0x6025
-0x7228 = 0x6026
-0x722A = 0x445E
-0x722C = 0x6028
-0x722D = 0x6027
-0x7230 = 0x6029
-0x7232 = 0x602A
-0x7235 = 0x3C5F
-0x7236 = 0x4963
-0x723A = 0x4C6C
-0x723B = 0x602B
-0x723C = 0x602C
-0x723D = 0x4156
-0x723E = 0x3C24
-0x723F = 0x602D
-0x7240 = 0x602E
-0x7246 = 0x602F
-0x7247 = 0x4A52
-0x7248 = 0x4847
-0x724B = 0x6030
-0x724C = 0x4757
-0x7252 = 0x442D
-0x7258 = 0x6031
-0x7259 = 0x3267
-0x725B = 0x356D
-0x725D = 0x4C46
-0x725F = 0x4C36
-0x7261 = 0x3234
-0x7262 = 0x4F34
-0x7267 = 0x4B52
-0x7269 = 0x4A2A
-0x7272 = 0x4037
-0x7274 = 0x6032
-0x7279 = 0x4643
-0x727D = 0x3823
-0x727E = 0x6033
-0x7280 = 0x3A54
-0x7281 = 0x6035
-0x7282 = 0x6034
-0x7287 = 0x6036
-0x7292 = 0x6037
-0x7296 = 0x6038
-0x72A0 = 0x353E
-0x72A2 = 0x6039
-0x72A7 = 0x603A
-0x72AC = 0x3824
-0x72AF = 0x4848
-0x72B2 = 0x603C
-0x72B6 = 0x3E75
-0x72B9 = 0x603B
-0x72C2 = 0x3638
-0x72C3 = 0x603D
-0x72C4 = 0x603F
-0x72C6 = 0x603E
-0x72CE = 0x6040
-0x72D0 = 0x3851
-0x72D2 = 0x6041
-0x72D7 = 0x3669
-0x72D9 = 0x4140
-0x72DB = 0x397D
-0x72E0 = 0x6043
-0x72E1 = 0x6044
-0x72E2 = 0x6042
-0x72E9 = 0x3C6D
-0x72EC = 0x4648
-0x72ED = 0x3639
-0x72F7 = 0x6046
-0x72F8 = 0x432C
-0x72F9 = 0x6045
-0x72FC = 0x4F35
-0x72FD = 0x4762
-0x730A = 0x6049
-0x7316 = 0x604B
-0x7317 = 0x6048
-0x731B = 0x4C54
-0x731C = 0x604A
-0x731D = 0x604C
-0x731F = 0x4E44
-0x7325 = 0x6050
-0x7329 = 0x604F
-0x732A = 0x4376
-0x732B = 0x472D
-0x732E = 0x3825
-0x732F = 0x604E
-0x7334 = 0x604D
-0x7336 = 0x4D31
-0x7337 = 0x4D32
-0x733E = 0x6051
-0x733F = 0x316E
-0x7344 = 0x3976
-0x7345 = 0x3B62
-0x734E = 0x6052
-0x734F = 0x6053
-0x7357 = 0x6055
-0x7363 = 0x3D43
-0x7368 = 0x6057
-0x736A = 0x6056
-0x7370 = 0x6058
-0x7372 = 0x334D
-0x7375 = 0x605A
-0x7378 = 0x6059
-0x737A = 0x605C
-0x737B = 0x605B
-0x7384 = 0x383C
-0x7387 = 0x4E28
-0x7389 = 0x364C
-0x738B = 0x3226
-0x7396 = 0x366A
-0x73A9 = 0x3461
-0x73B2 = 0x4E68
-0x73B3 = 0x605E
-0x73BB = 0x6060
-0x73C0 = 0x6061
-0x73C2 = 0x3251
-0x73C8 = 0x605D
-0x73CA = 0x3B39
-0x73CD = 0x4441
-0x73CE = 0x605F
-0x73DE = 0x6064
-0x73E0 = 0x3C6E
-0x73E5 = 0x6062
-0x73EA = 0x373E
-0x73ED = 0x4849
-0x73EE = 0x6063
-0x73F1 = 0x607E
-0x73F8 = 0x6069
-0x73FE = 0x383D
-0x7403 = 0x3565
-0x7405 = 0x6066
-0x7406 = 0x4D7D
-0x7409 = 0x4E30
-0x7422 = 0x4276
-0x7425 = 0x6068
-0x7432 = 0x606A
-0x7433 = 0x4E56
-0x7434 = 0x3657
-0x7435 = 0x487C
-0x7436 = 0x474A
-0x743A = 0x606B
-0x743F = 0x606D
-0x7441 = 0x6070
-0x7455 = 0x606C
-0x7459 = 0x606F
-0x745A = 0x386A
-0x745B = 0x314D
-0x745C = 0x6071
-0x745E = 0x3F70
-0x745F = 0x606E
-0x7460 = 0x4E5C
-0x7463 = 0x6074
-0x7464 = 0x7424
-0x7469 = 0x6072
-0x746A = 0x6075
-0x746F = 0x6067
-0x7470 = 0x6073
-0x7473 = 0x3A3C
-0x7476 = 0x6076
-0x747E = 0x6077
-0x7483 = 0x4D7E
-0x748B = 0x6078
-0x749E = 0x6079
-0x74A2 = 0x6065
-0x74A7 = 0x607A
-0x74B0 = 0x3444
-0x74BD = 0x3C25
-0x74CA = 0x607B
-0x74CF = 0x607C
-0x74D4 = 0x607D
-0x74DC = 0x313B
-0x74E0 = 0x6121
-0x74E2 = 0x493B
-0x74E3 = 0x6122
-0x74E6 = 0x3424
-0x74E7 = 0x6123
-0x74E9 = 0x6124
-0x74EE = 0x6125
-0x74F0 = 0x6127
-0x74F1 = 0x6128
-0x74F2 = 0x6126
-0x74F6 = 0x4953
-0x74F7 = 0x612A
-0x74F8 = 0x6129
-0x7503 = 0x612C
-0x7504 = 0x612B
-0x7505 = 0x612D
-0x750C = 0x612E
-0x750D = 0x6130
-0x750E = 0x612F
-0x7511 = 0x3979
-0x7513 = 0x6132
-0x7515 = 0x6131
-0x7518 = 0x3445
-0x751A = 0x3F53
-0x751C = 0x453C
-0x751E = 0x6133
-0x751F = 0x4038
-0x7523 = 0x3B3A
-0x7525 = 0x3179
-0x7526 = 0x6134
-0x7528 = 0x4D51
-0x752B = 0x4A63
-0x752C = 0x6135
-0x7530 = 0x4544
-0x7531 = 0x4D33
-0x7532 = 0x3943
-0x7533 = 0x3F3D
-0x7537 = 0x434B
-0x7538 = 0x5234
-0x753A = 0x442E
-0x753B = 0x3268
-0x753C = 0x6136
-0x7544 = 0x6137
-0x7546 = 0x613C
-0x7549 = 0x613A
-0x754A = 0x6139
-0x754B = 0x5A42
-0x754C = 0x3326
-0x754D = 0x6138
-0x754F = 0x305A
-0x7551 = 0x482A
-0x7554 = 0x484A
-0x7559 = 0x4E31
-0x755A = 0x613D
-0x755B = 0x613B
-0x755C = 0x435C
-0x755D = 0x4026
-0x7560 = 0x482B
-0x7562 = 0x492D
-0x7564 = 0x613F
-0x7565 = 0x4E2C
-0x7566 = 0x374D
-0x7567 = 0x6140
-0x7569 = 0x613E
-0x756A = 0x4856
-0x756B = 0x6141
-0x756D = 0x6142
-0x7570 = 0x305B
-0x7573 = 0x3E76
-0x7574 = 0x6147
-0x7576 = 0x6144
-0x7577 = 0x466D
-0x7578 = 0x6143
-0x757F = 0x3526
-0x7582 = 0x614A
-0x7586 = 0x6145
-0x7587 = 0x6146
-0x7589 = 0x6149
-0x758A = 0x6148
-0x758B = 0x4925
-0x758E = 0x4142
-0x758F = 0x4141
-0x7591 = 0x353F
-0x7594 = 0x614B
-0x759A = 0x614C
-0x759D = 0x614D
-0x75A3 = 0x614F
-0x75A5 = 0x614E
-0x75AB = 0x3156
-0x75B1 = 0x6157
-0x75B2 = 0x4868
-0x75B3 = 0x6151
-0x75B5 = 0x6153
-0x75B8 = 0x6155
-0x75B9 = 0x3F3E
-0x75BC = 0x6156
-0x75BD = 0x6154
-0x75BE = 0x3C40
-0x75C2 = 0x6150
-0x75C3 = 0x6152
-0x75C5 = 0x4942
-0x75C7 = 0x3E49
-0x75CA = 0x6159
-0x75CD = 0x6158
-0x75D2 = 0x615A
-0x75D4 = 0x3C26
-0x75D5 = 0x3A2F
-0x75D8 = 0x4577
-0x75D9 = 0x615B
-0x75DB = 0x444B
-0x75DE = 0x615D
-0x75E2 = 0x4E21
-0x75E3 = 0x615C
-0x75E9 = 0x4169
-0x75F0 = 0x6162
-0x75F2 = 0x6164
-0x75F3 = 0x6165
-0x75F4 = 0x4354
-0x75FA = 0x6163
-0x75FC = 0x6160
-0x75FE = 0x615E
-0x75FF = 0x615F
-0x7601 = 0x6161
-0x7609 = 0x6168
-0x760B = 0x6166
-0x760D = 0x6167
-0x761F = 0x6169
-0x7620 = 0x616B
-0x7621 = 0x616C
-0x7622 = 0x616D
-0x7624 = 0x616E
-0x7627 = 0x616A
-0x7630 = 0x6170
-0x7634 = 0x616F
-0x763B = 0x6171
-0x7642 = 0x4E45
-0x7646 = 0x6174
-0x7647 = 0x6172
-0x7648 = 0x6173
-0x764C = 0x3462
-0x7652 = 0x4C7E
-0x7656 = 0x4A4A
-0x7658 = 0x6176
-0x765C = 0x6175
-0x7661 = 0x6177
-0x7662 = 0x6178
-0x7667 = 0x617C
-0x7668 = 0x6179
-0x7669 = 0x617A
-0x766A = 0x617B
-0x766C = 0x617D
-0x7670 = 0x617E
-0x7672 = 0x6221
-0x7676 = 0x6222
-0x7678 = 0x6223
-0x767A = 0x482F
-0x767B = 0x4550
-0x767C = 0x6224
-0x767D = 0x4772
-0x767E = 0x4934
-0x7680 = 0x6225
-0x7683 = 0x6226
-0x7684 = 0x452A
-0x7686 = 0x3327
-0x7687 = 0x3944
-0x7688 = 0x6227
-0x768B = 0x6228
-0x768E = 0x6229
-0x7690 = 0x3B29
-0x7693 = 0x622B
-0x7696 = 0x622A
-0x7699 = 0x622C
-0x769A = 0x622D
-0x76AE = 0x4869
-0x76B0 = 0x622E
-0x76B4 = 0x622F
-0x76B7 = 0x7369
-0x76B8 = 0x6230
-0x76B9 = 0x6231
-0x76BA = 0x6232
-0x76BF = 0x3B2E
-0x76C2 = 0x6233
-0x76C3 = 0x4756
-0x76C6 = 0x4B5F
-0x76C8 = 0x314E
-0x76CA = 0x3157
-0x76CD = 0x6234
-0x76D2 = 0x6236
-0x76D6 = 0x6235
-0x76D7 = 0x4570
-0x76DB = 0x4039
-0x76DC = 0x5D39
-0x76DE = 0x6237
-0x76DF = 0x4C41
-0x76E1 = 0x6238
-0x76E3 = 0x3446
-0x76E4 = 0x4857
-0x76E5 = 0x6239
-0x76E7 = 0x623A
-0x76EA = 0x623B
-0x76EE = 0x4C5C
-0x76F2 = 0x4C55
-0x76F4 = 0x443E
-0x76F8 = 0x416A
-0x76FB = 0x623D
-0x76FE = 0x3D62
-0x7701 = 0x3E4A
-0x7704 = 0x6240
-0x7707 = 0x623F
-0x7708 = 0x623E
-0x7709 = 0x487D
-0x770B = 0x3447
-0x770C = 0x3829
-0x771B = 0x6246
-0x771E = 0x6243
-0x771F = 0x3F3F
-0x7720 = 0x4C32
-0x7724 = 0x6242
-0x7725 = 0x6244
-0x7726 = 0x6245
-0x7729 = 0x6241
-0x7737 = 0x6247
-0x7738 = 0x6248
-0x773A = 0x442F
-0x773C = 0x3463
-0x7740 = 0x4365
-0x7747 = 0x6249
-0x775A = 0x624A
-0x775B = 0x624D
-0x7761 = 0x3F67
-0x7763 = 0x4644
-0x7765 = 0x624E
-0x7766 = 0x4B53
-0x7768 = 0x624B
-0x776B = 0x624C
-0x7779 = 0x6251
-0x777E = 0x6250
-0x777F = 0x624F
-0x778B = 0x6253
-0x778E = 0x6252
-0x7791 = 0x6254
-0x779E = 0x6256
-0x77A0 = 0x6255
-0x77A5 = 0x4A4D
-0x77AC = 0x3D56
-0x77AD = 0x4E46
-0x77B0 = 0x6257
-0x77B3 = 0x4637
-0x77B6 = 0x6258
-0x77B9 = 0x6259
-0x77BB = 0x625D
-0x77BC = 0x625B
-0x77BD = 0x625C
-0x77BF = 0x625A
-0x77C7 = 0x625E
-0x77CD = 0x625F
-0x77D7 = 0x6260
-0x77DA = 0x6261
-0x77DB = 0x4C37
-0x77DC = 0x6262
-0x77E2 = 0x4C70
-0x77E3 = 0x6263
-0x77E5 = 0x434E
-0x77E7 = 0x476A
-0x77E9 = 0x366B
-0x77ED = 0x433B
-0x77EE = 0x6264
-0x77EF = 0x363A
-0x77F3 = 0x4050
-0x77FC = 0x6265
-0x7802 = 0x3A3D
-0x780C = 0x6266
-0x7812 = 0x6267
-0x7814 = 0x3826
-0x7815 = 0x3A55
-0x7820 = 0x6269
-0x7825 = 0x4556
-0x7826 = 0x3A56
-0x7827 = 0x354E
-0x7832 = 0x4B24
-0x7834 = 0x474B
-0x783A = 0x4557
-0x783F = 0x395C
-0x7845 = 0x626B
-0x785D = 0x3E4B
-0x786B = 0x4E32
-0x786C = 0x3945
-0x786F = 0x3827
-0x7872 = 0x4823
-0x7874 = 0x626D
-0x787C = 0x626F
-0x7881 = 0x386B
-0x7886 = 0x626E
-0x7887 = 0x4476
-0x788C = 0x6271
-0x788D = 0x3337
-0x788E = 0x626C
-0x7891 = 0x486A
-0x7893 = 0x3130
-0x7895 = 0x3A6C
-0x7897 = 0x4F52
-0x789A = 0x6270
-0x78A3 = 0x6272
-0x78A7 = 0x4A4B
-0x78A9 = 0x4059
-0x78AA = 0x6274
-0x78AF = 0x6275
-0x78B5 = 0x6273
-0x78BA = 0x334E
-0x78BC = 0x627B
-0x78BE = 0x627A
-0x78C1 = 0x3C27
-0x78C5 = 0x627C
-0x78C6 = 0x6277
-0x78CA = 0x627D
-0x78CB = 0x6278
-0x78D0 = 0x4858
-0x78D1 = 0x6276
-0x78D4 = 0x6279
-0x78DA = 0x6322
-0x78E7 = 0x6321
-0x78E8 = 0x4B61
-0x78EC = 0x627E
-0x78EF = 0x306B
-0x78F4 = 0x6324
-0x78FD = 0x6323
-0x7901 = 0x3E4C
-0x7907 = 0x6325
-0x790E = 0x4143
-0x7911 = 0x6327
-0x7912 = 0x6326
-0x7919 = 0x6328
-0x7926 = 0x6268
-0x792A = 0x626A
-0x792B = 0x632A
-0x792C = 0x6329
-0x793A = 0x3C28
-0x793C = 0x4E69
-0x793E = 0x3C52
-0x7940 = 0x632B
-0x7941 = 0x3737
-0x7947 = 0x3540
-0x7948 = 0x3527
-0x7949 = 0x3B63
-0x7950 = 0x4D34
-0x7953 = 0x6331
-0x7955 = 0x6330
-0x7956 = 0x4144
-0x7957 = 0x632D
-0x795A = 0x632F
-0x795D = 0x3D4B
-0x795E = 0x3F40
-0x795F = 0x632E
-0x7960 = 0x632C
-0x7962 = 0x472A
-0x7965 = 0x3E4D
-0x7968 = 0x493C
-0x796D = 0x3A57
-0x7977 = 0x4578
-0x797A = 0x6332
-0x797F = 0x6333
-0x7980 = 0x6349
-0x7981 = 0x3658
-0x7984 = 0x4F3D
-0x7985 = 0x4135
-0x798A = 0x6334
-0x798D = 0x3252
-0x798E = 0x4477
-0x798F = 0x4A21
-0x799D = 0x6335
-0x79A6 = 0x357A
-0x79A7 = 0x6336
-0x79AA = 0x6338
-0x79AE = 0x6339
-0x79B0 = 0x4729
-0x79B3 = 0x633A
-0x79B9 = 0x633B
-0x79BA = 0x633C
-0x79BD = 0x3659
-0x79BE = 0x3253
-0x79BF = 0x4645
-0x79C0 = 0x3D28
-0x79C1 = 0x3B64
-0x79C9 = 0x633D
-0x79CB = 0x3D29
-0x79D1 = 0x324A
-0x79D2 = 0x4943
-0x79D5 = 0x633E
-0x79D8 = 0x486B
-0x79DF = 0x4145
-0x79E1 = 0x6341
-0x79E3 = 0x6342
-0x79E4 = 0x4769
-0x79E6 = 0x3F41
-0x79E7 = 0x633F
-0x79E9 = 0x4361
-0x79EC = 0x6340
-0x79F0 = 0x3E4E
-0x79FB = 0x305C
-0x7A00 = 0x3529
-0x7A08 = 0x6343
-0x7A0B = 0x4478
-0x7A0D = 0x6344
-0x7A0E = 0x4047
-0x7A14 = 0x4C2D
-0x7A17 = 0x4923
-0x7A18 = 0x6345
-0x7A19 = 0x6346
-0x7A1A = 0x4355
-0x7A1C = 0x4E47
-0x7A1F = 0x6348
-0x7A20 = 0x6347
-0x7A2E = 0x3C6F
-0x7A31 = 0x634A
-0x7A32 = 0x3070
-0x7A37 = 0x634D
-0x7A3B = 0x634B
-0x7A3C = 0x3254
-0x7A3D = 0x374E
-0x7A3E = 0x634C
-0x7A3F = 0x3946
-0x7A40 = 0x3972
-0x7A42 = 0x4A66
-0x7A43 = 0x634E
-0x7A46 = 0x4B54
-0x7A49 = 0x6350
-0x7A4D = 0x4051
-0x7A4E = 0x314F
-0x7A4F = 0x323A
-0x7A50 = 0x302C
-0x7A57 = 0x634F
-0x7A61 = 0x6351
-0x7A62 = 0x6352
-0x7A63 = 0x3E77
-0x7A69 = 0x6353
-0x7A6B = 0x334F
-0x7A70 = 0x6355
-0x7A74 = 0x376A
-0x7A76 = 0x3566
-0x7A79 = 0x6356
-0x7A7A = 0x3675
-0x7A7D = 0x6357
-0x7A7F = 0x407C
-0x7A81 = 0x464D
-0x7A83 = 0x4060
-0x7A84 = 0x3A75
-0x7A88 = 0x6358
-0x7A92 = 0x4362
-0x7A93 = 0x416B
-0x7A95 = 0x635A
-0x7A96 = 0x635C
-0x7A97 = 0x6359
-0x7A98 = 0x635B
-0x7A9F = 0x3722
-0x7AA9 = 0x635D
-0x7AAA = 0x3726
-0x7AAE = 0x3567
-0x7AAF = 0x4D52
-0x7AB0 = 0x635F
-0x7AB6 = 0x6360
-0x7ABA = 0x312E
-0x7ABF = 0x6363
-0x7AC3 = 0x3376
-0x7AC4 = 0x6362
-0x7AC5 = 0x6361
-0x7AC7 = 0x6365
-0x7AC8 = 0x635E
-0x7ACA = 0x6366
-0x7ACB = 0x4E29
-0x7ACD = 0x6367
-0x7ACF = 0x6368
-0x7AD2 = 0x5474
-0x7AD3 = 0x636A
-0x7AD5 = 0x6369
-0x7AD9 = 0x636B
-0x7ADA = 0x636C
-0x7ADC = 0x4E35
-0x7ADD = 0x636D
-0x7ADF = 0x706F
-0x7AE0 = 0x3E4F
-0x7AE1 = 0x636E
-0x7AE2 = 0x636F
-0x7AE3 = 0x3D57
-0x7AE5 = 0x4638
-0x7AE6 = 0x6370
-0x7AEA = 0x4328
-0x7AED = 0x6371
-0x7AEF = 0x433C
-0x7AF0 = 0x6372
-0x7AF6 = 0x3625
-0x7AF8 = 0x513F
-0x7AF9 = 0x435D
-0x7AFA = 0x3C33
-0x7AFF = 0x3448
-0x7B02 = 0x6373
-0x7B04 = 0x6422
-0x7B06 = 0x6376
-0x7B08 = 0x3568
-0x7B0A = 0x6375
-0x7B0B = 0x6424
-0x7B0F = 0x6374
-0x7B11 = 0x3E50
-0x7B18 = 0x6378
-0x7B19 = 0x6379
-0x7B1B = 0x452B
-0x7B1E = 0x637A
-0x7B20 = 0x335E
-0x7B25 = 0x3F5A
-0x7B26 = 0x4964
-0x7B28 = 0x637C
-0x7B2C = 0x4268
-0x7B33 = 0x6377
-0x7B35 = 0x637B
-0x7B36 = 0x637D
-0x7B39 = 0x3A7B
-0x7B45 = 0x6426
-0x7B46 = 0x492E
-0x7B48 = 0x4826
-0x7B49 = 0x4579
-0x7B4B = 0x365A
-0x7B4C = 0x6425
-0x7B4D = 0x6423
-0x7B4F = 0x4835
-0x7B50 = 0x637E
-0x7B51 = 0x435E
-0x7B52 = 0x457B
-0x7B54 = 0x457A
-0x7B56 = 0x3A76
-0x7B5D = 0x6438
-0x7B65 = 0x6428
-0x7B67 = 0x642A
-0x7B6C = 0x642D
-0x7B6E = 0x642E
-0x7B70 = 0x642B
-0x7B71 = 0x642C
-0x7B74 = 0x6429
-0x7B75 = 0x6427
-0x7B7A = 0x6421
-0x7B86 = 0x4A4F
-0x7B87 = 0x3255
-0x7B8B = 0x6435
-0x7B8D = 0x6432
-0x7B8F = 0x6437
-0x7B92 = 0x6436
-0x7B94 = 0x4773
-0x7B95 = 0x4C27
-0x7B97 = 0x3B3B
-0x7B98 = 0x6430
-0x7B99 = 0x6439
-0x7B9A = 0x6434
-0x7B9C = 0x6433
-0x7B9D = 0x642F
-0x7B9F = 0x6431
-0x7BA1 = 0x3449
-0x7BAA = 0x433D
-0x7BAD = 0x407D
-0x7BB1 = 0x4822
-0x7BB4 = 0x643E
-0x7BB8 = 0x4824
-0x7BC0 = 0x4061
-0x7BC1 = 0x643B
-0x7BC4 = 0x484F
-0x7BC6 = 0x643F
-0x7BC7 = 0x4A53
-0x7BC9 = 0x435B
-0x7BCB = 0x643A
-0x7BCC = 0x643C
-0x7BCF = 0x643D
-0x7BDD = 0x6440
-0x7BE0 = 0x3C44
-0x7BE4 = 0x4646
-0x7BE5 = 0x6445
-0x7BE6 = 0x6444
-0x7BE9 = 0x6441
-0x7BED = 0x4F36
-0x7BF3 = 0x644A
-0x7BF6 = 0x644E
-0x7BF7 = 0x644B
-0x7C00 = 0x6447
-0x7C07 = 0x6448
-0x7C0D = 0x644D
-0x7C11 = 0x6442
-0x7C12 = 0x5255
-0x7C13 = 0x6449
-0x7C14 = 0x6443
-0x7C17 = 0x644C
-0x7C1F = 0x6452
-0x7C21 = 0x344A
-0x7C23 = 0x644F
-0x7C27 = 0x6450
-0x7C2A = 0x6451
-0x7C2B = 0x6454
-0x7C37 = 0x6453
-0x7C38 = 0x4876
-0x7C3D = 0x6455
-0x7C3E = 0x4E7C
-0x7C3F = 0x4A6D
-0x7C40 = 0x645A
-0x7C43 = 0x6457
-0x7C4C = 0x6456
-0x7C4D = 0x4052
-0x7C4F = 0x6459
-0x7C50 = 0x645B
-0x7C54 = 0x6458
-0x7C56 = 0x645F
-0x7C58 = 0x645C
-0x7C5F = 0x645D
-0x7C60 = 0x6446
-0x7C64 = 0x645E
-0x7C65 = 0x6460
-0x7C6C = 0x6461
-0x7C73 = 0x4A46
-0x7C75 = 0x6462
-0x7C7E = 0x4C62
-0x7C81 = 0x364E
-0x7C82 = 0x3729
-0x7C83 = 0x6463
-0x7C89 = 0x4A34
-0x7C8B = 0x3F68
-0x7C8D = 0x4C30
-0x7C90 = 0x6464
-0x7C92 = 0x4E33
-0x7C95 = 0x4774
-0x7C97 = 0x4146
-0x7C98 = 0x4734
-0x7C9B = 0x3D4D
-0x7C9F = 0x3040
-0x7CA1 = 0x6469
-0x7CA2 = 0x6467
-0x7CA4 = 0x6465
-0x7CA5 = 0x3421
-0x7CA7 = 0x3E51
-0x7CA8 = 0x646A
-0x7CAB = 0x6468
-0x7CAD = 0x6466
-0x7CAE = 0x646E
-0x7CB1 = 0x646D
-0x7CB2 = 0x646C
-0x7CB3 = 0x646B
-0x7CB9 = 0x646F
-0x7CBD = 0x6470
-0x7CBE = 0x403A
-0x7CC0 = 0x6471
-0x7CC2 = 0x6473
-0x7CC5 = 0x6472
-0x7CCA = 0x3852
-0x7CCE = 0x4138
-0x7CD2 = 0x6475
-0x7CD6 = 0x457C
-0x7CD8 = 0x6474
-0x7CDC = 0x6476
-0x7CDE = 0x4A35
-0x7CDF = 0x416C
-0x7CE0 = 0x3947
-0x7CE2 = 0x6477
-0x7CE7 = 0x4E48
-0x7CEF = 0x6479
-0x7CF2 = 0x647A
-0x7CF4 = 0x647B
-0x7CF6 = 0x647C
-0x7CF8 = 0x3B65
-0x7CFA = 0x647D
-0x7CFB = 0x374F
-0x7CFE = 0x356A
-0x7D00 = 0x352A
-0x7D02 = 0x6521
-0x7D04 = 0x4C73
-0x7D05 = 0x3948
-0x7D06 = 0x647E
-0x7D0A = 0x6524
-0x7D0B = 0x4C66
-0x7D0D = 0x473C
-0x7D10 = 0x4933
-0x7D14 = 0x3D63
-0x7D15 = 0x6523
-0x7D17 = 0x3C53
-0x7D18 = 0x3949
-0x7D19 = 0x3B66
-0x7D1A = 0x3569
-0x7D1B = 0x4A36
-0x7D1C = 0x6522
-0x7D20 = 0x4147
-0x7D21 = 0x4B42
-0x7D22 = 0x3A77
-0x7D2B = 0x3B67
-0x7D2C = 0x445D
-0x7D2E = 0x6527
-0x7D2F = 0x4E5F
-0x7D30 = 0x3A59
-0x7D32 = 0x6528
-0x7D33 = 0x3F42
-0x7D35 = 0x652A
-0x7D39 = 0x3E52
-0x7D3A = 0x3A30
-0x7D3F = 0x6529
-0x7D42 = 0x3D2A
-0x7D43 = 0x383E
-0x7D44 = 0x4148
-0x7D45 = 0x6525
-0x7D46 = 0x652B
-0x7D4B = 0x6526
-0x7D4C = 0x3750
-0x7D4E = 0x652E
-0x7D4F = 0x6532
-0x7D50 = 0x376B
-0x7D56 = 0x652D
-0x7D5B = 0x6536
-0x7D5E = 0x394A
-0x7D61 = 0x4D6D
-0x7D62 = 0x303C
-0x7D63 = 0x6533
-0x7D66 = 0x356B
-0x7D68 = 0x6530
-0x7D6E = 0x6531
-0x7D71 = 0x457D
-0x7D72 = 0x652F
-0x7D73 = 0x652C
-0x7D75 = 0x3328
-0x7D76 = 0x4064
-0x7D79 = 0x3828
-0x7D7D = 0x6538
-0x7D89 = 0x6535
-0x7D8F = 0x6537
-0x7D93 = 0x6534
-0x7D99 = 0x3751
-0x7D9A = 0x4233
-0x7D9B = 0x6539
-0x7D9C = 0x416E
-0x7D9F = 0x6546
-0x7DA2 = 0x6542
-0x7DA3 = 0x653C
-0x7DAB = 0x6540
-0x7DAC = 0x3C7A
-0x7DAD = 0x305D
-0x7DAE = 0x653B
-0x7DAF = 0x6543
-0x7DB0 = 0x6547
-0x7DB1 = 0x394B
-0x7DB2 = 0x4C56
-0x7DB4 = 0x4456
-0x7DB5 = 0x653D
-0x7DB8 = 0x6545
-0x7DBA = 0x653A
-0x7DBB = 0x433E
-0x7DBD = 0x653F
-0x7DBE = 0x303D
-0x7DBF = 0x4C4A
-0x7DC7 = 0x653E
-0x7DCA = 0x365B
-0x7DCB = 0x486C
-0x7DCF = 0x416D
-0x7DD1 = 0x4E50
-0x7DD2 = 0x3D6F
-0x7DD5 = 0x656E
-0x7DD8 = 0x6548
-0x7DDA = 0x407E
-0x7DDC = 0x6544
-0x7DDD = 0x6549
-0x7DDE = 0x654B
-0x7DE0 = 0x4479
-0x7DE1 = 0x654E
-0x7DE4 = 0x654A
-0x7DE8 = 0x4A54
-0x7DE9 = 0x344B
-0x7DEC = 0x4C4B
-0x7DEF = 0x305E
-0x7DF2 = 0x654D
-0x7DF4 = 0x4E7D
-0x7DFB = 0x654C
-0x7E01 = 0x316F
-0x7E04 = 0x466C
-0x7E05 = 0x654F
-0x7E09 = 0x6556
-0x7E0A = 0x6550
-0x7E0B = 0x6557
-0x7E12 = 0x6553
-0x7E1B = 0x477B
-0x7E1E = 0x3C4A
-0x7E1F = 0x6555
-0x7E21 = 0x6552
-0x7E22 = 0x6558
-0x7E23 = 0x6551
-0x7E26 = 0x3D44
-0x7E2B = 0x4B25
-0x7E2E = 0x3D4C
-0x7E31 = 0x6554
-0x7E32 = 0x6560
-0x7E35 = 0x655C
-0x7E37 = 0x655F
-0x7E39 = 0x655D
-0x7E3A = 0x6561
-0x7E3B = 0x655B
-0x7E3D = 0x6541
-0x7E3E = 0x4053
-0x7E41 = 0x484B
-0x7E43 = 0x655E
-0x7E46 = 0x6559
-0x7E4A = 0x4121
-0x7E4B = 0x3752
-0x7E4D = 0x3D2B
-0x7E54 = 0x3F25
-0x7E55 = 0x4136
-0x7E56 = 0x6564
-0x7E59 = 0x6566
-0x7E5A = 0x6567
-0x7E5D = 0x6563
-0x7E5E = 0x6565
-0x7E66 = 0x655A
-0x7E67 = 0x6562
-0x7E69 = 0x656A
-0x7E6A = 0x6569
-0x7E6D = 0x4B7A
-0x7E70 = 0x372B
-0x7E79 = 0x6568
-0x7E7B = 0x656C
-0x7E7C = 0x656B
-0x7E7D = 0x656F
-0x7E7F = 0x6571
-0x7E82 = 0x3B3C
-0x7E83 = 0x656D
-0x7E88 = 0x6572
-0x7E89 = 0x6573
-0x7E8C = 0x6574
-0x7E8E = 0x657A
-0x7E8F = 0x453B
-0x7E90 = 0x6576
-0x7E92 = 0x6575
-0x7E93 = 0x6577
-0x7E94 = 0x6578
-0x7E96 = 0x6579
-0x7E9B = 0x657B
-0x7E9C = 0x657C
-0x7F36 = 0x344C
-0x7F38 = 0x657D
-0x7F3A = 0x657E
-0x7F45 = 0x6621
-0x7F4C = 0x6622
-0x7F4D = 0x6623
-0x7F4E = 0x6624
-0x7F50 = 0x6625
-0x7F51 = 0x6626
-0x7F54 = 0x6628
-0x7F55 = 0x6627
-0x7F58 = 0x6629
-0x7F5F = 0x662A
-0x7F60 = 0x662B
-0x7F67 = 0x662E
-0x7F68 = 0x662C
-0x7F69 = 0x662D
-0x7F6A = 0x3A61
-0x7F6B = 0x3753
-0x7F6E = 0x4356
-0x7F70 = 0x4833
-0x7F72 = 0x3D70
-0x7F75 = 0x474D
-0x7F77 = 0x486D
-0x7F78 = 0x662F
-0x7F79 = 0x586D
-0x7F82 = 0x6630
-0x7F83 = 0x6632
-0x7F85 = 0x4D65
-0x7F86 = 0x6631
-0x7F87 = 0x6634
-0x7F88 = 0x6633
-0x7F8A = 0x4D53
-0x7F8C = 0x6635
-0x7F8E = 0x487E
-0x7F94 = 0x6636
-0x7F9A = 0x6639
-0x7F9D = 0x6638
-0x7F9E = 0x6637
-0x7FA3 = 0x663A
-0x7FA4 = 0x3732
-0x7FA8 = 0x4122
-0x7FA9 = 0x3541
-0x7FAE = 0x663E
-0x7FAF = 0x663B
-0x7FB2 = 0x663C
-0x7FB6 = 0x663F
-0x7FB8 = 0x6640
-0x7FB9 = 0x663D
-0x7FBD = 0x3129
-0x7FC1 = 0x3227
-0x7FC5 = 0x6642
-0x7FC6 = 0x6643
-0x7FCA = 0x6644
-0x7FCC = 0x4D62
-0x7FD2 = 0x3D2C
-0x7FD4 = 0x6646
-0x7FD5 = 0x6645
-0x7FE0 = 0x3F69
-0x7FE1 = 0x6647
-0x7FE6 = 0x6648
-0x7FE9 = 0x6649
-0x7FEB = 0x3465
-0x7FF0 = 0x344D
-0x7FF3 = 0x664A
-0x7FF9 = 0x664B
-0x7FFB = 0x4B5D
-0x7FFC = 0x4D63
-0x8000 = 0x4D54
-0x8001 = 0x4F37
-0x8003 = 0x394D
-0x8004 = 0x664E
-0x8005 = 0x3C54
-0x8006 = 0x664D
-0x800B = 0x664F
-0x800C = 0x3C29
-0x8010 = 0x4251
-0x8012 = 0x6650
-0x8015 = 0x394C
-0x8017 = 0x4C57
-0x8018 = 0x6651
-0x8019 = 0x6652
-0x801C = 0x6653
-0x8021 = 0x6654
-0x8028 = 0x6655
-0x8033 = 0x3C2A
-0x8036 = 0x4C6D
-0x803B = 0x6657
-0x803D = 0x433F
-0x803F = 0x6656
-0x8046 = 0x6659
-0x804A = 0x6658
-0x8052 = 0x665A
-0x8056 = 0x403B
-0x8058 = 0x665B
-0x805A = 0x665C
-0x805E = 0x4A39
-0x805F = 0x665D
-0x8061 = 0x416F
-0x8062 = 0x665E
-0x8068 = 0x665F
-0x806F = 0x4E7E
-0x8070 = 0x6662
-0x8072 = 0x6661
-0x8073 = 0x6660
-0x8074 = 0x4430
-0x8076 = 0x6663
-0x8077 = 0x3F26
-0x8079 = 0x6664
-0x807D = 0x6665
-0x807E = 0x4F38
-0x807F = 0x6666
-0x8084 = 0x6667
-0x8085 = 0x6669
-0x8086 = 0x6668
-0x8087 = 0x4825
-0x8089 = 0x4679
-0x808B = 0x4F3E
-0x808C = 0x4829
-0x8093 = 0x666B
-0x8096 = 0x3E53
-0x8098 = 0x492A
-0x809A = 0x666C
-0x809B = 0x666A
-0x809D = 0x344E
-0x80A1 = 0x3854
-0x80A2 = 0x3B68
-0x80A5 = 0x486E
-0x80A9 = 0x382A
-0x80AA = 0x4B43
-0x80AC = 0x666F
-0x80AD = 0x666D
-0x80AF = 0x394E
-0x80B1 = 0x394F
-0x80B2 = 0x3069
-0x80B4 = 0x3A68
-0x80BA = 0x4759
-0x80C3 = 0x305F
-0x80C4 = 0x6674
-0x80C6 = 0x4340
-0x80CC = 0x4758
-0x80CE = 0x425B
-0x80D6 = 0x6676
-0x80D9 = 0x6672
-0x80DA = 0x6675
-0x80DB = 0x6670
-0x80DD = 0x6673
-0x80DE = 0x4B26
-0x80E1 = 0x3855
-0x80E4 = 0x307D
-0x80E5 = 0x6671
-0x80EF = 0x6678
-0x80F1 = 0x6679
-0x80F4 = 0x4639
-0x80F8 = 0x363B
-0x80FC = 0x6726
-0x80FD = 0x473D
-0x8102 = 0x3B69
-0x8105 = 0x363C
-0x8106 = 0x4048
-0x8107 = 0x4F46
-0x8108 = 0x4C2E
-0x8109 = 0x6677
-0x810A = 0x4054
-0x811A = 0x3553
-0x811B = 0x667A
-0x8123 = 0x667C
-0x8129 = 0x667B
-0x812F = 0x667D
-0x8131 = 0x4326
-0x8133 = 0x473E
-0x8139 = 0x4431
-0x813E = 0x6723
-0x8146 = 0x6722
-0x814B = 0x667E
-0x814E = 0x3F55
-0x8150 = 0x4965
-0x8151 = 0x6725
-0x8153 = 0x6724
-0x8154 = 0x3950
-0x8155 = 0x4F53
-0x815F = 0x6735
-0x8165 = 0x6729
-0x8166 = 0x672A
-0x816B = 0x3C70
-0x816E = 0x6728
-0x8170 = 0x3978
-0x8171 = 0x6727
-0x8174 = 0x672B
-0x8178 = 0x4432
-0x8179 = 0x4A22
-0x817A = 0x4123
-0x817F = 0x425C
-0x8180 = 0x672F
-0x8182 = 0x6730
-0x8183 = 0x672C
-0x8188 = 0x672D
-0x818A = 0x672E
-0x818F = 0x3951
-0x8193 = 0x6736
-0x8195 = 0x6732
-0x819A = 0x4966
-0x819C = 0x4B6C
-0x819D = 0x4928
-0x81A0 = 0x6731
-0x81A3 = 0x6734
-0x81A4 = 0x6733
-0x81A8 = 0x4B44
-0x81A9 = 0x6737
-0x81B0 = 0x6738
-0x81B3 = 0x4137
-0x81B5 = 0x6739
-0x81B8 = 0x673B
-0x81BA = 0x673F
-0x81BD = 0x673C
-0x81BE = 0x673A
-0x81BF = 0x473F
-0x81C0 = 0x673D
-0x81C2 = 0x673E
-0x81C6 = 0x3232
-0x81C8 = 0x6745
-0x81C9 = 0x6740
-0x81CD = 0x6741
-0x81D1 = 0x6742
-0x81D3 = 0x4221
-0x81D8 = 0x6744
-0x81D9 = 0x6743
-0x81DA = 0x6746
-0x81DF = 0x6747
-0x81E0 = 0x6748
-0x81E3 = 0x3F43
-0x81E5 = 0x3269
-0x81E7 = 0x6749
-0x81E8 = 0x4E57
-0x81EA = 0x3C2B
-0x81ED = 0x3D2D
-0x81F3 = 0x3B6A
-0x81F4 = 0x4357
-0x81FA = 0x674A
-0x81FB = 0x674B
-0x81FC = 0x3131
-0x81FE = 0x674C
-0x8201 = 0x674D
-0x8202 = 0x674E
-0x8205 = 0x674F
-0x8207 = 0x6750
-0x8208 = 0x363D
-0x8209 = 0x5A2A
-0x820A = 0x6751
-0x820C = 0x4065
-0x820D = 0x6752
-0x820E = 0x3C4B
-0x8210 = 0x6753
-0x8212 = 0x5030
-0x8216 = 0x6754
-0x8217 = 0x4A5E
-0x8218 = 0x345C
-0x821B = 0x4124
-0x821C = 0x3D58
-0x821E = 0x4971
-0x821F = 0x3D2E
-0x8229 = 0x6755
-0x822A = 0x3952
-0x822B = 0x6756
-0x822C = 0x484C
-0x822E = 0x6764
-0x8233 = 0x6758
-0x8235 = 0x4249
-0x8236 = 0x4775
-0x8237 = 0x383F
-0x8238 = 0x6757
-0x8239 = 0x4125
-0x8240 = 0x6759
-0x8247 = 0x447A
-0x8258 = 0x675B
-0x8259 = 0x675A
-0x825A = 0x675D
-0x825D = 0x675C
-0x825F = 0x675E
-0x8262 = 0x6760
-0x8264 = 0x675F
-0x8266 = 0x344F
-0x8268 = 0x6761
-0x826A = 0x6762
-0x826B = 0x6763
-0x826E = 0x3A31
-0x826F = 0x4E49
-0x8271 = 0x6765
-0x8272 = 0x3F27
-0x8276 = 0x3170
-0x8277 = 0x6766
-0x8278 = 0x6767
-0x827E = 0x6768
-0x828B = 0x3072
-0x828D = 0x6769
-0x8292 = 0x676A
-0x8299 = 0x4967
-0x829D = 0x3C47
-0x829F = 0x676C
-0x82A5 = 0x3329
-0x82A6 = 0x3032
-0x82AB = 0x676B
-0x82AC = 0x676E
-0x82AD = 0x474E
-0x82AF = 0x3F44
-0x82B1 = 0x3256
-0x82B3 = 0x4B27
-0x82B8 = 0x375D
-0x82B9 = 0x365C
-0x82BB = 0x676D
-0x82BD = 0x326A
-0x82C5 = 0x3423
-0x82D1 = 0x3171
-0x82D2 = 0x6772
-0x82D3 = 0x4E6A
-0x82D4 = 0x425D
-0x82D7 = 0x4944
-0x82D9 = 0x677E
-0x82DB = 0x3257
-0x82DC = 0x677C
-0x82DE = 0x677A
-0x82DF = 0x6771
-0x82E1 = 0x676F
-0x82E3 = 0x6770
-0x82E5 = 0x3C63
-0x82E6 = 0x366C
-0x82E7 = 0x4377
-0x82EB = 0x4651
-0x82F1 = 0x3151
-0x82F3 = 0x6774
-0x82F4 = 0x6773
-0x82F9 = 0x6779
-0x82FA = 0x6775
-0x82FB = 0x6778
-0x8302 = 0x4C50
-0x8303 = 0x6777
-0x8304 = 0x3258
-0x8305 = 0x337D
-0x8306 = 0x677B
-0x8309 = 0x677D
-0x830E = 0x3754
-0x8316 = 0x6823
-0x8317 = 0x682C
-0x8318 = 0x682D
-0x831C = 0x302B
-0x8323 = 0x6834
-0x8328 = 0x3071
-0x832B = 0x682B
-0x832F = 0x682A
-0x8331 = 0x6825
-0x8332 = 0x6824
-0x8334 = 0x6822
-0x8335 = 0x6821
-0x8336 = 0x4363
-0x8338 = 0x427B
-0x8339 = 0x6827
-0x8340 = 0x6826
-0x8345 = 0x6829
-0x8349 = 0x4170
-0x834A = 0x3755
-0x834F = 0x3141
-0x8350 = 0x6828
-0x8352 = 0x3953
-0x8358 = 0x4171
-0x8373 = 0x683A
-0x8375 = 0x683B
-0x8377 = 0x3259
-0x837B = 0x322E
-0x837C = 0x6838
-0x8385 = 0x682E
-0x8387 = 0x6836
-0x8389 = 0x683D
-0x838A = 0x6837
-0x838E = 0x6835
-0x8393 = 0x6776
-0x8396 = 0x6833
-0x839A = 0x682F
-0x839E = 0x3450
-0x839F = 0x6831
-0x83A0 = 0x683C
-0x83A2 = 0x6832
-0x83A8 = 0x683E
-0x83AA = 0x6830
-0x83AB = 0x477C
-0x83B1 = 0x4D69
-0x83B5 = 0x6839
-0x83BD = 0x684F
-0x83C1 = 0x6847
-0x83C5 = 0x3F7B
-0x83CA = 0x3546
-0x83CC = 0x365D
-0x83CE = 0x6842
-0x83D3 = 0x325B
-0x83D6 = 0x3E54
-0x83D8 = 0x6845
-0x83DC = 0x3A5A
-0x83DF = 0x4551
-0x83E0 = 0x684A
-0x83E9 = 0x4A6E
-0x83EB = 0x6841
-0x83EF = 0x325A
-0x83F0 = 0x3856
-0x83F1 = 0x4929
-0x83F2 = 0x684B
-0x83F4 = 0x683F
-0x83F7 = 0x6848
-0x83FB = 0x6852
-0x83FD = 0x6843
-0x8403 = 0x6844
-0x8404 = 0x463A
-0x8407 = 0x6849
-0x840B = 0x6846
-0x840C = 0x4B28
-0x840D = 0x684C
-0x840E = 0x3060
-0x8413 = 0x6840
-0x8420 = 0x684E
-0x8422 = 0x684D
-0x8429 = 0x476B
-0x842A = 0x6854
-0x842C = 0x685F
-0x8431 = 0x337E
-0x8435 = 0x6862
-0x8438 = 0x6850
-0x843C = 0x6855
-0x843D = 0x4D6E
-0x8446 = 0x685E
-0x8449 = 0x4D55
-0x844E = 0x4E2A
-0x8457 = 0x4378
-0x845B = 0x336B
-0x8461 = 0x4972
-0x8462 = 0x6864
-0x8463 = 0x4621
-0x8466 = 0x3031
-0x8469 = 0x685D
-0x846B = 0x6859
-0x846C = 0x4172
-0x846D = 0x6853
-0x846E = 0x685B
-0x846F = 0x6860
-0x8471 = 0x472C
-0x8475 = 0x302A
-0x8477 = 0x6858
-0x8479 = 0x6861
-0x847A = 0x4978
-0x8482 = 0x685C
-0x8484 = 0x6857
-0x848B = 0x3E55
-0x8490 = 0x3D2F
-0x8494 = 0x3C2C
-0x8499 = 0x4C58
-0x849C = 0x4947
-0x849F = 0x6867
-0x84A1 = 0x6870
-0x84AD = 0x685A
-0x84B2 = 0x3377
-0x84B8 = 0x3E78
-0x84B9 = 0x6865
-0x84BB = 0x686A
-0x84BC = 0x4173
-0x84BF = 0x6866
-0x84C1 = 0x686D
-0x84C4 = 0x435F
-0x84C6 = 0x686E
-0x84C9 = 0x4D56
-0x84CA = 0x6863
-0x84CB = 0x3338
-0x84CD = 0x6869
-0x84D0 = 0x686C
-0x84D1 = 0x4C2C
-0x84D6 = 0x686F
-0x84D9 = 0x6868
-0x84DA = 0x686B
-0x84EC = 0x4B29
-0x84EE = 0x4F21
-0x84F4 = 0x6873
-0x84FC = 0x687A
-0x84FF = 0x6872
-0x8500 = 0x3C43
-0x8506 = 0x6851
-0x8511 = 0x4A4E
-0x8513 = 0x4C22
-0x8514 = 0x6879
-0x8515 = 0x6878
-0x8517 = 0x6874
-0x8518 = 0x6875
-0x851A = 0x3136
-0x851F = 0x6877
-0x8521 = 0x6871
-0x8526 = 0x4455
-0x852C = 0x6876
-0x852D = 0x307E
-0x8535 = 0x4222
-0x853D = 0x4A43
-0x8540 = 0x687B
-0x8541 = 0x6921
-0x8543 = 0x4859
-0x8548 = 0x687E
-0x8549 = 0x3E56
-0x854A = 0x3C49
-0x854B = 0x6923
-0x854E = 0x363E
-0x8555 = 0x6924
-0x8557 = 0x4979
-0x8558 = 0x687D
-0x855A = 0x6856
-0x8563 = 0x687C
-0x8568 = 0x4F4F
-0x8569 = 0x4622
-0x856A = 0x4973
-0x856D = 0x692B
-0x8577 = 0x6931
-0x857E = 0x6932
-0x8580 = 0x6925
-0x8584 = 0x4776
-0x8587 = 0x692F
-0x8588 = 0x6927
-0x858A = 0x6929
-0x8590 = 0x6933
-0x8591 = 0x6928
-0x8594 = 0x692C
-0x8597 = 0x3172
-0x8599 = 0x4665
-0x859B = 0x692D
-0x859C = 0x6930
-0x85A4 = 0x6926
-0x85A6 = 0x4126
-0x85A8 = 0x692A
-0x85A9 = 0x3B27
-0x85AA = 0x3F45
-0x85AB = 0x3730
-0x85AC = 0x4C74
-0x85AE = 0x4C79
-0x85AF = 0x3D72
-0x85B9 = 0x6937
-0x85BA = 0x6935
-0x85C1 = 0x4F4E
-0x85C9 = 0x6934
-0x85CD = 0x4D75
-0x85CF = 0x6936
-0x85D0 = 0x6938
-0x85D5 = 0x6939
-0x85DC = 0x693C
-0x85DD = 0x693A
-0x85E4 = 0x4623
-0x85E5 = 0x693B
-0x85E9 = 0x484D
-0x85EA = 0x692E
-0x85F7 = 0x3D73
-0x85F9 = 0x693D
-0x85FA = 0x6942
-0x85FB = 0x4174
-0x85FE = 0x6941
-0x8602 = 0x6922
-0x8606 = 0x6943
-0x8607 = 0x4149
-0x860A = 0x693E
-0x860B = 0x6940
-0x8613 = 0x693F
-0x8616 = 0x5D31
-0x8617 = 0x5D22
-0x861A = 0x6945
-0x8622 = 0x6944
-0x862D = 0x4D76
-0x862F = 0x623C
-0x8630 = 0x6946
-0x863F = 0x6947
-0x864D = 0x6948
-0x864E = 0x3857
-0x8650 = 0x3554
-0x8654 = 0x694A
-0x8655 = 0x515D
-0x865A = 0x3575
-0x865C = 0x4E3A
-0x865E = 0x3673
-0x865F = 0x694B
-0x8667 = 0x694C
-0x866B = 0x436E
-0x8671 = 0x694D
-0x8679 = 0x467A
-0x867B = 0x303A
-0x868A = 0x3263
-0x868B = 0x6952
-0x868C = 0x6953
-0x8693 = 0x694E
-0x8695 = 0x3B3D
-0x86A3 = 0x694F
-0x86A4 = 0x4742
-0x86A9 = 0x6950
-0x86AA = 0x6951
-0x86AB = 0x695B
-0x86AF = 0x6955
-0x86B0 = 0x6958
-0x86B6 = 0x6954
-0x86C4 = 0x6956
-0x86C6 = 0x6957
-0x86C7 = 0x3C58
-0x86C9 = 0x6959
-0x86CB = 0x4341
-0x86CD = 0x3756
-0x86CE = 0x3342
-0x86D4 = 0x695C
-0x86D9 = 0x333F
-0x86DB = 0x6961
-0x86DE = 0x695D
-0x86DF = 0x6960
-0x86E4 = 0x483A
-0x86E9 = 0x695E
-0x86EC = 0x695F
-0x86ED = 0x4948
-0x86EE = 0x485A
-0x86EF = 0x6962
-0x86F8 = 0x427D
-0x86F9 = 0x696C
-0x86FB = 0x6968
-0x86FE = 0x326B
-0x8700 = 0x6966
-0x8702 = 0x4B2A
-0x8703 = 0x6967
-0x8706 = 0x6964
-0x8708 = 0x6965
-0x8709 = 0x696A
-0x870A = 0x696D
-0x870D = 0x696B
-0x8711 = 0x6969
-0x8712 = 0x6963
-0x8718 = 0x4358
-0x871A = 0x6974
-0x871C = 0x4C2A
-0x8725 = 0x6972
-0x8729 = 0x6973
-0x8734 = 0x696E
-0x8737 = 0x6970
-0x873B = 0x6971
-0x873F = 0x696F
-0x8749 = 0x4066
-0x874B = 0x4F39
-0x874C = 0x6978
-0x874E = 0x6979
-0x8753 = 0x6A21
-0x8755 = 0x3F2A
-0x8757 = 0x697B
-0x8759 = 0x697E
-0x875F = 0x6976
-0x8760 = 0x6975
-0x8763 = 0x6A22
-0x8766 = 0x325C
-0x8768 = 0x697C
-0x876A = 0x6A23
-0x876E = 0x697D
-0x8774 = 0x697A
-0x8776 = 0x4433
-0x8778 = 0x6977
-0x877F = 0x4768
-0x8782 = 0x6A27
-0x878D = 0x4D3B
-0x879F = 0x6A26
-0x87A2 = 0x6A25
-0x87AB = 0x6A2E
-0x87AF = 0x6A28
-0x87B3 = 0x6A30
-0x87BA = 0x4D66
-0x87BB = 0x6A33
-0x87BD = 0x6A2A
-0x87C0 = 0x6A2B
-0x87C4 = 0x6A2F
-0x87C6 = 0x6A32
-0x87C7 = 0x6A31
-0x87CB = 0x6A29
-0x87D0 = 0x6A2C
-0x87D2 = 0x6A3D
-0x87E0 = 0x6A36
-0x87EF = 0x6A34
-0x87F2 = 0x6A35
-0x87F6 = 0x6A3A
-0x87F7 = 0x6A3B
-0x87F9 = 0x332A
-0x87FB = 0x3542
-0x87FE = 0x6A39
-0x8805 = 0x6A24
-0x880D = 0x6A38
-0x880E = 0x6A3C
-0x880F = 0x6A37
-0x8811 = 0x6A3E
-0x8815 = 0x6A40
-0x8816 = 0x6A3F
-0x8821 = 0x6A42
-0x8822 = 0x6A41
-0x8823 = 0x695A
-0x8827 = 0x6A46
-0x8831 = 0x6A43
-0x8836 = 0x6A44
-0x8839 = 0x6A45
-0x883B = 0x6A47
-0x8840 = 0x376C
-0x8842 = 0x6A49
-0x8844 = 0x6A48
-0x8846 = 0x3D30
-0x884C = 0x3954
-0x884D = 0x5E27
-0x8852 = 0x6A4A
-0x8853 = 0x3D51
-0x8857 = 0x3339
-0x8859 = 0x6A4B
-0x885B = 0x3152
-0x885D = 0x3E57
-0x885E = 0x6A4C
-0x8861 = 0x3955
-0x8862 = 0x6A4D
-0x8863 = 0x3061
-0x8868 = 0x493D
-0x886B = 0x6A4E
-0x8870 = 0x3F6A
-0x8872 = 0x6A55
-0x8875 = 0x6A52
-0x8877 = 0x436F
-0x887D = 0x6A53
-0x887E = 0x6A50
-0x887F = 0x365E
-0x8881 = 0x6A4F
-0x8882 = 0x6A56
-0x8888 = 0x3736
-0x888B = 0x425E
-0x888D = 0x6A5C
-0x8892 = 0x6A58
-0x8896 = 0x4235
-0x8897 = 0x6A57
-0x8899 = 0x6A5A
-0x889E = 0x6A51
-0x88A2 = 0x6A5B
-0x88A4 = 0x6A5D
-0x88AB = 0x486F
-0x88AE = 0x6A59
-0x88B0 = 0x6A5E
-0x88B1 = 0x6A60
-0x88B4 = 0x3853
-0x88B5 = 0x6A54
-0x88B7 = 0x3041
-0x88BF = 0x6A5F
-0x88C1 = 0x3A5B
-0x88C2 = 0x4E76
-0x88C3 = 0x6A61
-0x88C4 = 0x6A62
-0x88C5 = 0x4175
-0x88CF = 0x4E22
-0x88D4 = 0x6A63
-0x88D5 = 0x4D35
-0x88D8 = 0x6A64
-0x88D9 = 0x6A65
-0x88DC = 0x4A64
-0x88DD = 0x6A66
-0x88DF = 0x3A40
-0x88E1 = 0x4E23
-0x88E8 = 0x6A6B
-0x88F2 = 0x6A6C
-0x88F3 = 0x3E58
-0x88F4 = 0x6A6A
-0x88F8 = 0x4D67
-0x88F9 = 0x6A67
-0x88FC = 0x6A69
-0x88FD = 0x403D
-0x88FE = 0x3F7E
-0x8902 = 0x6A68
-0x8904 = 0x6A6D
-0x8907 = 0x4A23
-0x890A = 0x6A6F
-0x890C = 0x6A6E
-0x8910 = 0x336C
-0x8912 = 0x4B2B
-0x8913 = 0x6A70
-0x891D = 0x6A7C
-0x891E = 0x6A72
-0x8925 = 0x6A73
-0x892A = 0x6A74
-0x892B = 0x6A75
-0x8936 = 0x6A79
-0x8938 = 0x6A7A
-0x893B = 0x6A78
-0x8941 = 0x6A76
-0x8943 = 0x6A71
-0x8944 = 0x6A77
-0x894C = 0x6A7B
-0x894D = 0x7037
-0x8956 = 0x3228
-0x895E = 0x6A7E
-0x895F = 0x365F
-0x8960 = 0x6A7D
-0x8964 = 0x6B22
-0x8966 = 0x6B21
-0x896A = 0x6B24
-0x896D = 0x6B23
-0x896F = 0x6B25
-0x8972 = 0x3D31
-0x8974 = 0x6B26
-0x8977 = 0x6B27
-0x897E = 0x6B28
-0x897F = 0x403E
-0x8981 = 0x4D57
-0x8983 = 0x6B29
-0x8986 = 0x4A24
-0x8987 = 0x4746
-0x8988 = 0x6B2A
-0x898A = 0x6B2B
-0x898B = 0x382B
-0x898F = 0x352C
-0x8993 = 0x6B2C
-0x8996 = 0x3B6B
-0x8997 = 0x4741
-0x8998 = 0x6B2D
-0x899A = 0x3350
-0x89A1 = 0x6B2E
-0x89A6 = 0x6B30
-0x89A7 = 0x4D77
-0x89A9 = 0x6B2F
-0x89AA = 0x3F46
-0x89AC = 0x6B31
-0x89AF = 0x6B32
-0x89B2 = 0x6B33
-0x89B3 = 0x3451
-0x89BA = 0x6B34
-0x89BD = 0x6B35
-0x89BF = 0x6B36
-0x89C0 = 0x6B37
-0x89D2 = 0x3351
-0x89DA = 0x6B38
-0x89DC = 0x6B39
-0x89DD = 0x6B3A
-0x89E3 = 0x3272
-0x89E6 = 0x3F28
-0x89E7 = 0x6B3B
-0x89F4 = 0x6B3C
-0x89F8 = 0x6B3D
-0x8A00 = 0x3840
-0x8A02 = 0x447B
-0x8A03 = 0x6B3E
-0x8A08 = 0x3757
-0x8A0A = 0x3F56
-0x8A0C = 0x6B41
-0x8A0E = 0x4624
-0x8A10 = 0x6B40
-0x8A13 = 0x3731
-0x8A16 = 0x6B3F
-0x8A17 = 0x4277
-0x8A18 = 0x352D
-0x8A1B = 0x6B42
-0x8A1D = 0x6B43
-0x8A1F = 0x3E59
-0x8A23 = 0x376D
-0x8A25 = 0x6B44
-0x8A2A = 0x4B2C
-0x8A2D = 0x405F
-0x8A31 = 0x3576
-0x8A33 = 0x4C75
-0x8A34 = 0x414A
-0x8A36 = 0x6B45
-0x8A3A = 0x3F47
-0x8A3B = 0x4370
-0x8A3C = 0x3E5A
-0x8A41 = 0x6B46
-0x8A46 = 0x6B49
-0x8A48 = 0x6B4A
-0x8A50 = 0x3A3E
-0x8A51 = 0x4242
-0x8A52 = 0x6B48
-0x8A54 = 0x3E5B
-0x8A55 = 0x493E
-0x8A5B = 0x6B47
-0x8A5E = 0x3B6C
-0x8A60 = 0x3153
-0x8A62 = 0x6B4E
-0x8A63 = 0x3758
-0x8A66 = 0x3B6E
-0x8A69 = 0x3B6D
-0x8A6B = 0x4F4D
-0x8A6C = 0x6B4D
-0x8A6D = 0x6B4C
-0x8A6E = 0x4127
-0x8A70 = 0x354D
-0x8A71 = 0x4F43
-0x8A72 = 0x333A
-0x8A73 = 0x3E5C
-0x8A7C = 0x6B4B
-0x8A82 = 0x6B50
-0x8A84 = 0x6B51
-0x8A85 = 0x6B4F
-0x8A87 = 0x3858
-0x8A89 = 0x4D40
-0x8A8C = 0x3B6F
-0x8A8D = 0x4727
-0x8A91 = 0x6B54
-0x8A93 = 0x4040
-0x8A95 = 0x4342
-0x8A98 = 0x4D36
-0x8A9A = 0x6B57
-0x8A9E = 0x386C
-0x8AA0 = 0x403F
-0x8AA1 = 0x6B53
-0x8AA3 = 0x6B58
-0x8AA4 = 0x386D
-0x8AA5 = 0x6B55
-0x8AA6 = 0x6B56
-0x8AA8 = 0x6B52
-0x8AAC = 0x4062
-0x8AAD = 0x4649
-0x8AB0 = 0x432F
-0x8AB2 = 0x325D
-0x8AB9 = 0x4870
-0x8ABC = 0x3543
-0x8ABF = 0x4434
-0x8AC2 = 0x6B5B
-0x8AC4 = 0x6B59
-0x8AC7 = 0x434C
-0x8ACB = 0x4041
-0x8ACC = 0x3452
-0x8ACD = 0x6B5A
-0x8ACF = 0x3F5B
-0x8AD2 = 0x4E4A
-0x8AD6 = 0x4F40
-0x8ADA = 0x6B5C
-0x8ADB = 0x6B67
-0x8ADC = 0x4435
-0x8ADE = 0x6B66
-0x8AE0 = 0x6B63
-0x8AE1 = 0x6B6B
-0x8AE2 = 0x6B64
-0x8AE4 = 0x6B60
-0x8AE6 = 0x447C
-0x8AE7 = 0x6B5F
-0x8AEB = 0x6B5D
-0x8AED = 0x4D21
-0x8AEE = 0x3B70
-0x8AF1 = 0x6B61
-0x8AF3 = 0x6B5E
-0x8AF7 = 0x6B65
-0x8AF8 = 0x3D74
-0x8AFA = 0x3841
-0x8AFE = 0x427A
-0x8B00 = 0x4B45
-0x8B01 = 0x315A
-0x8B02 = 0x3062
-0x8B04 = 0x4625
-0x8B07 = 0x6B69
-0x8B0C = 0x6B68
-0x8B0E = 0x4666
-0x8B10 = 0x6B6D
-0x8B14 = 0x6B62
-0x8B16 = 0x6B6C
-0x8B17 = 0x6B6E
-0x8B19 = 0x382C
-0x8B1A = 0x6B6A
-0x8B1B = 0x3956
-0x8B1D = 0x3C55
-0x8B20 = 0x6B6F
-0x8B21 = 0x4D58
-0x8B26 = 0x6B72
-0x8B28 = 0x6B75
-0x8B2B = 0x6B73
-0x8B2C = 0x4935
-0x8B33 = 0x6B70
-0x8B39 = 0x3660
-0x8B3E = 0x6B74
-0x8B41 = 0x6B76
-0x8B49 = 0x6B7A
-0x8B4C = 0x6B77
-0x8B4E = 0x6B79
-0x8B4F = 0x6B78
-0x8B56 = 0x6B7B
-0x8B58 = 0x3C31
-0x8B5A = 0x6B7D
-0x8B5B = 0x6B7C
-0x8B5C = 0x4968
-0x8B5F = 0x6C21
-0x8B66 = 0x3759
-0x8B6B = 0x6B7E
-0x8B6C = 0x6C22
-0x8B6F = 0x6C23
-0x8B70 = 0x3544
-0x8B71 = 0x6641
-0x8B72 = 0x3E79
-0x8B74 = 0x6C24
-0x8B77 = 0x386E
-0x8B7D = 0x6C25
-0x8B80 = 0x6C26
-0x8B83 = 0x3B3E
-0x8B8A = 0x5A4E
-0x8B8C = 0x6C27
-0x8B8E = 0x6C28
-0x8B90 = 0x3D32
-0x8B92 = 0x6C29
-0x8B93 = 0x6C2A
-0x8B96 = 0x6C2B
-0x8B99 = 0x6C2C
-0x8B9A = 0x6C2D
-0x8C37 = 0x432B
-0x8C3A = 0x6C2E
-0x8C3F = 0x6C30
-0x8C41 = 0x6C2F
-0x8C46 = 0x4626
-0x8C48 = 0x6C31
-0x8C4A = 0x4B2D
-0x8C4C = 0x6C32
-0x8C4E = 0x6C33
-0x8C50 = 0x6C34
-0x8C55 = 0x6C35
-0x8C5A = 0x465A
-0x8C61 = 0x3E5D
-0x8C62 = 0x6C36
-0x8C6A = 0x396B
-0x8C6B = 0x502E
-0x8C6C = 0x6C37
-0x8C78 = 0x6C38
-0x8C79 = 0x493F
-0x8C7A = 0x6C39
-0x8C7C = 0x6C41
-0x8C82 = 0x6C3A
-0x8C85 = 0x6C3C
-0x8C89 = 0x6C3B
-0x8C8A = 0x6C3D
-0x8C8C = 0x4B46
-0x8C8D = 0x6C3E
-0x8C8E = 0x6C3F
-0x8C94 = 0x6C40
-0x8C98 = 0x6C42
-0x8C9D = 0x332D
-0x8C9E = 0x4467
-0x8CA0 = 0x4969
-0x8CA1 = 0x3A62
-0x8CA2 = 0x3957
-0x8CA7 = 0x494F
-0x8CA8 = 0x325F
-0x8CA9 = 0x484E
-0x8CAA = 0x6C45
-0x8CAB = 0x3453
-0x8CAC = 0x4055
-0x8CAD = 0x6C44
-0x8CAE = 0x6C49
-0x8CAF = 0x4379
-0x8CB0 = 0x4C63
-0x8CB2 = 0x6C47
-0x8CB3 = 0x6C48
-0x8CB4 = 0x352E
-0x8CB6 = 0x6C4A
-0x8CB7 = 0x4763
-0x8CB8 = 0x425F
-0x8CBB = 0x4871
-0x8CBC = 0x453D
-0x8CBD = 0x6C46
-0x8CBF = 0x4B47
-0x8CC0 = 0x326C
-0x8CC1 = 0x6C4C
-0x8CC2 = 0x4F28
-0x8CC3 = 0x4442
-0x8CC4 = 0x4F45
-0x8CC7 = 0x3B71
-0x8CC8 = 0x6C4B
-0x8CCA = 0x4231
-0x8CCD = 0x6C5C
-0x8CCE = 0x4128
-0x8CD1 = 0x4678
-0x8CD3 = 0x4950
-0x8CDA = 0x6C4F
-0x8CDB = 0x3B3F
-0x8CDC = 0x3B72
-0x8CDE = 0x3E5E
-0x8CE0 = 0x4765
-0x8CE2 = 0x382D
-0x8CE3 = 0x6C4E
-0x8CE4 = 0x6C4D
-0x8CE6 = 0x496A
-0x8CEA = 0x3C41
-0x8CED = 0x4552
-0x8CFA = 0x6C51
-0x8CFB = 0x6C52
-0x8CFC = 0x3958
-0x8CFD = 0x6C50
-0x8D04 = 0x6C53
-0x8D05 = 0x6C54
-0x8D07 = 0x6C56
-0x8D08 = 0x4223
-0x8D0A = 0x6C55
-0x8D0B = 0x3466
-0x8D0D = 0x6C58
-0x8D0F = 0x6C57
-0x8D10 = 0x6C59
-0x8D13 = 0x6C5B
-0x8D14 = 0x6C5D
-0x8D16 = 0x6C5E
-0x8D64 = 0x4056
-0x8D66 = 0x3C4F
-0x8D67 = 0x6C5F
-0x8D6B = 0x3352
-0x8D6D = 0x6C60
-0x8D70 = 0x4176
-0x8D71 = 0x6C61
-0x8D73 = 0x6C62
-0x8D74 = 0x496B
-0x8D77 = 0x352F
-0x8D81 = 0x6C63
-0x8D85 = 0x4436
-0x8D8A = 0x315B
-0x8D99 = 0x6C64
-0x8DA3 = 0x3C71
-0x8DA8 = 0x3F76
-0x8DB3 = 0x422D
-0x8DBA = 0x6C67
-0x8DBE = 0x6C66
-0x8DC2 = 0x6C65
-0x8DCB = 0x6C6D
-0x8DCC = 0x6C6B
-0x8DCF = 0x6C68
-0x8DD6 = 0x6C6A
-0x8DDA = 0x6C69
-0x8DDB = 0x6C6C
-0x8DDD = 0x3577
-0x8DDF = 0x6C70
-0x8DE1 = 0x4057
-0x8DE3 = 0x6C71
-0x8DE8 = 0x3859
-0x8DEA = 0x6C6E
-0x8DEB = 0x6C6F
-0x8DEF = 0x4F29
-0x8DF3 = 0x4437
-0x8DF5 = 0x4129
-0x8DFC = 0x6C72
-0x8DFF = 0x6C75
-0x8E08 = 0x6C73
-0x8E09 = 0x6C74
-0x8E0A = 0x4D59
-0x8E0F = 0x4627
-0x8E10 = 0x6C78
-0x8E1D = 0x6C76
-0x8E1E = 0x6C77
-0x8E1F = 0x6C79
-0x8E2A = 0x6D29
-0x8E30 = 0x6C7C
-0x8E34 = 0x6C7D
-0x8E35 = 0x6C7B
-0x8E42 = 0x6C7A
-0x8E44 = 0x447D
-0x8E47 = 0x6D21
-0x8E48 = 0x6D25
-0x8E49 = 0x6D22
-0x8E4A = 0x6C7E
-0x8E4C = 0x6D23
-0x8E50 = 0x6D24
-0x8E55 = 0x6D2B
-0x8E59 = 0x6D26
-0x8E5F = 0x4058
-0x8E60 = 0x6D28
-0x8E63 = 0x6D2A
-0x8E64 = 0x6D27
-0x8E72 = 0x6D2D
-0x8E74 = 0x3D33
-0x8E76 = 0x6D2C
-0x8E7C = 0x6D2E
-0x8E81 = 0x6D2F
-0x8E84 = 0x6D32
-0x8E85 = 0x6D31
-0x8E87 = 0x6D30
-0x8E8A = 0x6D34
-0x8E8B = 0x6D33
-0x8E8D = 0x4C76
-0x8E91 = 0x6D36
-0x8E93 = 0x6D35
-0x8E94 = 0x6D37
-0x8E99 = 0x6D38
-0x8EA1 = 0x6D3A
-0x8EAA = 0x6D39
-0x8EAB = 0x3F48
-0x8EAC = 0x6D3B
-0x8EAF = 0x366D
-0x8EB0 = 0x6D3C
-0x8EB1 = 0x6D3E
-0x8EBE = 0x6D3F
-0x8EC5 = 0x6D40
-0x8EC6 = 0x6D3D
-0x8EC8 = 0x6D41
-0x8ECA = 0x3C56
-0x8ECB = 0x6D42
-0x8ECC = 0x3530
-0x8ECD = 0x3733
-0x8ED2 = 0x382E
-0x8EDB = 0x6D43
-0x8EDF = 0x4670
-0x8EE2 = 0x453E
-0x8EE3 = 0x6D44
-0x8EEB = 0x6D47
-0x8EF8 = 0x3C34
-0x8EFB = 0x6D46
-0x8EFC = 0x6D45
-0x8EFD = 0x375A
-0x8EFE = 0x6D48
-0x8F03 = 0x3353
-0x8F05 = 0x6D4A
-0x8F09 = 0x3A5C
-0x8F0A = 0x6D49
-0x8F0C = 0x6D52
-0x8F12 = 0x6D4C
-0x8F13 = 0x6D4E
-0x8F14 = 0x4A65
-0x8F15 = 0x6D4B
-0x8F19 = 0x6D4D
-0x8F1B = 0x6D51
-0x8F1C = 0x6D4F
-0x8F1D = 0x3531
-0x8F1F = 0x6D50
-0x8F26 = 0x6D53
-0x8F29 = 0x475A
-0x8F2A = 0x4E58
-0x8F2F = 0x3D34
-0x8F33 = 0x6D54
-0x8F38 = 0x4D22
-0x8F39 = 0x6D56
-0x8F3B = 0x6D55
-0x8F3E = 0x6D59
-0x8F3F = 0x4D41
-0x8F42 = 0x6D58
-0x8F44 = 0x336D
-0x8F45 = 0x6D57
-0x8F46 = 0x6D5C
-0x8F49 = 0x6D5B
-0x8F4C = 0x6D5A
-0x8F4D = 0x4532
-0x8F4E = 0x6D5D
-0x8F57 = 0x6D5E
-0x8F5C = 0x6D5F
-0x8F5F = 0x396C
-0x8F61 = 0x3725
-0x8F62 = 0x6D60
-0x8F63 = 0x6D61
-0x8F64 = 0x6D62
-0x8F9B = 0x3F49
-0x8F9C = 0x6D63
-0x8F9E = 0x3C2D
-0x8F9F = 0x6D64
-0x8FA3 = 0x6D65
-0x8FA7 = 0x5221
-0x8FA8 = 0x517E
-0x8FAD = 0x6D66
-0x8FAE = 0x6570
-0x8FAF = 0x6D67
-0x8FB0 = 0x4324
-0x8FB1 = 0x3F2B
-0x8FB2 = 0x4740
-0x8FB7 = 0x6D68
-0x8FBA = 0x4A55
-0x8FBB = 0x4454
-0x8FBC = 0x397E
-0x8FBF = 0x4329
-0x8FC2 = 0x312A
-0x8FC4 = 0x4B78
-0x8FC5 = 0x3F57
-0x8FCE = 0x375E
-0x8FD1 = 0x3661
-0x8FD4 = 0x4A56
-0x8FDA = 0x6D69
-0x8FE2 = 0x6D6B
-0x8FE5 = 0x6D6A
-0x8FE6 = 0x3260
-0x8FE9 = 0x4676
-0x8FEA = 0x6D6C
-0x8FEB = 0x4777
-0x8FED = 0x4533
-0x8FEF = 0x6D6D
-0x8FF0 = 0x3D52
-0x8FF4 = 0x6D6F
-0x8FF7 = 0x4C42
-0x8FF8 = 0x6D7E
-0x8FF9 = 0x6D71
-0x8FFA = 0x6D72
-0x8FFD = 0x4449
-0x9000 = 0x4260
-0x9001 = 0x4177
-0x9003 = 0x4628
-0x9005 = 0x6D70
-0x9006 = 0x3555
-0x900B = 0x6D79
-0x900D = 0x6D76
-0x900E = 0x6E25
-0x900F = 0x4629
-0x9010 = 0x4360
-0x9011 = 0x6D73
-0x9013 = 0x447E
-0x9014 = 0x4553
-0x9015 = 0x6D74
-0x9016 = 0x6D78
-0x9017 = 0x3F60
-0x9019 = 0x4767
-0x901A = 0x444C
-0x901D = 0x4042
-0x901E = 0x6D77
-0x901F = 0x422E
-0x9020 = 0x4224
-0x9021 = 0x6D75
-0x9022 = 0x3029
-0x9023 = 0x4F22
-0x9027 = 0x6D7A
-0x902E = 0x4261
-0x9031 = 0x3D35
-0x9032 = 0x3F4A
-0x9035 = 0x6D7C
-0x9036 = 0x6D7B
-0x9038 = 0x306F
-0x9039 = 0x6D7D
-0x903C = 0x492F
-0x903E = 0x6E27
-0x9041 = 0x465B
-0x9042 = 0x3F6B
-0x9045 = 0x4359
-0x9047 = 0x3678
-0x9049 = 0x6E26
-0x904A = 0x4D37
-0x904B = 0x313F
-0x904D = 0x4A57
-0x904E = 0x3261
-0x904F = 0x6E21
-0x9050 = 0x6E22
-0x9051 = 0x6E23
-0x9052 = 0x6E24
-0x9053 = 0x463B
-0x9054 = 0x4323
-0x9055 = 0x3063
-0x9056 = 0x6E28
-0x9058 = 0x6E29
-0x9059 = 0x7423
-0x905C = 0x423D
-0x905E = 0x6E2A
-0x9060 = 0x3173
-0x9061 = 0x414C
-0x9063 = 0x382F
-0x9065 = 0x4D5A
-0x9068 = 0x6E2B
-0x9069 = 0x452C
-0x906D = 0x4178
-0x906E = 0x3C57
-0x906F = 0x6E2C
-0x9072 = 0x6E2F
-0x9075 = 0x3D65
-0x9076 = 0x6E2D
-0x9077 = 0x412B
-0x9078 = 0x412A
-0x907A = 0x3064
-0x907C = 0x4E4B
-0x907D = 0x6E31
-0x907F = 0x4872
-0x9080 = 0x6E33
-0x9081 = 0x6E32
-0x9082 = 0x6E30
-0x9083 = 0x6364
-0x9084 = 0x3454
-0x9087 = 0x6D6E
-0x9089 = 0x6E35
-0x908A = 0x6E34
-0x908F = 0x6E36
-0x9091 = 0x4D38
-0x90A3 = 0x4661
-0x90A6 = 0x4B2E
-0x90A8 = 0x6E37
-0x90AA = 0x3C59
-0x90AF = 0x6E38
-0x90B1 = 0x6E39
-0x90B5 = 0x6E3A
-0x90B8 = 0x4521
-0x90C1 = 0x306A
-0x90CA = 0x3959
-0x90CE = 0x4F3A
-0x90DB = 0x6E3E
-0x90E1 = 0x3734
-0x90E2 = 0x6E3B
-0x90E4 = 0x6E3C
-0x90E8 = 0x4974
-0x90ED = 0x3354
-0x90F5 = 0x4D39
-0x90F7 = 0x363F
-0x90FD = 0x4554
-0x9102 = 0x6E3F
-0x9112 = 0x6E40
-0x9119 = 0x6E41
-0x912D = 0x4522
-0x9130 = 0x6E43
-0x9132 = 0x6E42
-0x9149 = 0x4653
-0x914A = 0x6E44
-0x914B = 0x3D36
-0x914C = 0x3C60
-0x914D = 0x475B
-0x914E = 0x4371
-0x9152 = 0x3C72
-0x9154 = 0x3F6C
-0x9156 = 0x6E45
-0x9158 = 0x6E46
-0x9162 = 0x3F5D
-0x9163 = 0x6E47
-0x9165 = 0x6E48
-0x9169 = 0x6E49
-0x916A = 0x4D6F
-0x916C = 0x3D37
-0x9172 = 0x6E4B
-0x9173 = 0x6E4A
-0x9175 = 0x395A
-0x9177 = 0x3973
-0x9178 = 0x3B40
-0x9182 = 0x6E4E
-0x9187 = 0x3D66
-0x9189 = 0x6E4D
-0x918B = 0x6E4C
-0x918D = 0x4269
-0x9190 = 0x386F
-0x9192 = 0x4043
-0x9197 = 0x4830
-0x919C = 0x3D39
-0x91A2 = 0x6E4F
-0x91A4 = 0x3E5F
-0x91AA = 0x6E52
-0x91AB = 0x6E50
-0x91AF = 0x6E51
-0x91B4 = 0x6E54
-0x91B5 = 0x6E53
-0x91B8 = 0x3E7A
-0x91BA = 0x6E55
-0x91C0 = 0x6E56
-0x91C1 = 0x6E57
-0x91C6 = 0x4850
-0x91C7 = 0x3A53
-0x91C8 = 0x3C61
-0x91C9 = 0x6E58
-0x91CB = 0x6E59
-0x91CC = 0x4E24
-0x91CD = 0x3D45
-0x91CE = 0x4C6E
-0x91CF = 0x4E4C
-0x91D0 = 0x6E5A
-0x91D1 = 0x3662
-0x91D6 = 0x6E5B
-0x91D8 = 0x4523
-0x91DB = 0x6E5E
-0x91DC = 0x3378
-0x91DD = 0x3F4B
-0x91DF = 0x6E5C
-0x91E1 = 0x6E5D
-0x91E3 = 0x4460
-0x91E6 = 0x4B55
-0x91E7 = 0x367C
-0x91F5 = 0x6E60
-0x91F6 = 0x6E61
-0x91FC = 0x6E5F
-0x91FF = 0x6E63
-0x920D = 0x465F
-0x920E = 0x3343
-0x9211 = 0x6E67
-0x9214 = 0x6E64
-0x9215 = 0x6E66
-0x921E = 0x6E62
-0x9229 = 0x6F4F
-0x922C = 0x6E65
-0x9234 = 0x4E6B
-0x9237 = 0x385A
-0x923F = 0x6E6F
-0x9244 = 0x4534
-0x9245 = 0x6E6A
-0x9248 = 0x6E6D
-0x9249 = 0x6E6B
-0x924B = 0x6E70
-0x9250 = 0x6E71
-0x9257 = 0x6E69
-0x925A = 0x6E76
-0x925B = 0x3174
-0x925E = 0x6E68
-0x9262 = 0x482D
-0x9264 = 0x6E6C
-0x9266 = 0x3E60
-0x9271 = 0x395B
-0x927E = 0x4B48
-0x9280 = 0x3664
-0x9283 = 0x3D46
-0x9285 = 0x463C
-0x9291 = 0x412D
-0x9293 = 0x6E74
-0x9295 = 0x6E6E
-0x9296 = 0x6E73
-0x9298 = 0x4C43
-0x929A = 0x4438
-0x929B = 0x6E75
-0x929C = 0x6E72
-0x92AD = 0x412C
-0x92B7 = 0x6E79
-0x92B9 = 0x6E78
-0x92CF = 0x6E77
-0x92D2 = 0x4B2F
-0x92E4 = 0x3D7B
-0x92E9 = 0x6E7A
-0x92EA = 0x4A5F
-0x92ED = 0x3154
-0x92F2 = 0x4946
-0x92F3 = 0x4372
-0x92F8 = 0x3578
-0x92FA = 0x6E7C
-0x92FC = 0x395D
-0x9306 = 0x3B2C
-0x930F = 0x6E7B
-0x9310 = 0x3F6D
-0x9318 = 0x3F6E
-0x9319 = 0x6F21
-0x931A = 0x6F23
-0x9320 = 0x3E7B
-0x9322 = 0x6F22
-0x9323 = 0x6F24
-0x9326 = 0x3653
-0x9328 = 0x4945
-0x932B = 0x3C62
-0x932C = 0x4F23
-0x932E = 0x6E7E
-0x932F = 0x3A78
-0x9332 = 0x4F3F
-0x9335 = 0x6F26
-0x933A = 0x6F25
-0x933B = 0x6F27
-0x9344 = 0x6E7D
-0x934B = 0x4669
-0x934D = 0x4555
-0x9354 = 0x4457
-0x9356 = 0x6F2C
-0x935B = 0x4343
-0x935C = 0x6F28
-0x9360 = 0x6F29
-0x936C = 0x372D
-0x936E = 0x6F2B
-0x9375 = 0x3830
-0x937C = 0x6F2A
-0x937E = 0x3E61
-0x938C = 0x3379
-0x9394 = 0x6F30
-0x9396 = 0x3A3F
-0x9397 = 0x4179
-0x939A = 0x444A
-0x93A7 = 0x333B
-0x93AC = 0x6F2E
-0x93AD = 0x6F2F
-0x93AE = 0x4443
-0x93B0 = 0x6F2D
-0x93B9 = 0x6F31
-0x93C3 = 0x6F37
-0x93C8 = 0x6F3A
-0x93D0 = 0x6F39
-0x93D1 = 0x452D
-0x93D6 = 0x6F32
-0x93D7 = 0x6F33
-0x93D8 = 0x6F36
-0x93DD = 0x6F38
-0x93E1 = 0x3640
-0x93E4 = 0x6F3B
-0x93E5 = 0x6F35
-0x93E8 = 0x6F34
-0x9403 = 0x6F3F
-0x9407 = 0x6F40
-0x9410 = 0x6F41
-0x9413 = 0x6F3E
-0x9414 = 0x6F3D
-0x9418 = 0x3E62
-0x9419 = 0x462A
-0x941A = 0x6F3C
-0x9421 = 0x6F45
-0x942B = 0x6F43
-0x9435 = 0x6F44
-0x9436 = 0x6F42
-0x9438 = 0x4278
-0x943A = 0x6F46
-0x9441 = 0x6F47
-0x9444 = 0x6F49
-0x9451 = 0x3455
-0x9452 = 0x6F48
-0x9453 = 0x4C7A
-0x945A = 0x6F54
-0x945B = 0x6F4A
-0x945E = 0x6F4D
-0x9460 = 0x6F4B
-0x9462 = 0x6F4C
-0x946A = 0x6F4E
-0x9470 = 0x6F50
-0x9475 = 0x6F51
-0x9477 = 0x6F52
-0x947C = 0x6F55
-0x947D = 0x6F53
-0x947E = 0x6F56
-0x947F = 0x6F58
-0x9481 = 0x6F57
-0x9577 = 0x4439
-0x9580 = 0x4C67
-0x9582 = 0x6F59
-0x9583 = 0x412E
-0x9587 = 0x6F5A
-0x9589 = 0x4A44
-0x958A = 0x6F5B
-0x958B = 0x332B
-0x958F = 0x313C
-0x9591 = 0x3457
-0x9593 = 0x3456
-0x9594 = 0x6F5C
-0x9596 = 0x6F5D
-0x9598 = 0x6F5E
-0x9599 = 0x6F5F
-0x95A0 = 0x6F60
-0x95A2 = 0x3458
-0x95A3 = 0x3355
-0x95A4 = 0x395E
-0x95A5 = 0x4836
-0x95A7 = 0x6F62
-0x95A8 = 0x6F61
-0x95AD = 0x6F63
-0x95B2 = 0x315C
-0x95B9 = 0x6F66
-0x95BB = 0x6F65
-0x95BC = 0x6F64
-0x95BE = 0x6F67
-0x95C3 = 0x6F6A
-0x95C7 = 0x3047
-0x95CA = 0x6F68
-0x95CC = 0x6F6C
-0x95CD = 0x6F6B
-0x95D4 = 0x6F6E
-0x95D5 = 0x6F6D
-0x95D6 = 0x6F6F
-0x95D8 = 0x462E
-0x95DC = 0x6F70
-0x95E1 = 0x6F71
-0x95E2 = 0x6F73
-0x95E5 = 0x6F72
-0x961C = 0x496C
-0x9621 = 0x6F74
-0x9628 = 0x6F75
-0x962A = 0x3A65
-0x962E = 0x6F76
-0x962F = 0x6F77
-0x9632 = 0x4B49
-0x963B = 0x414B
-0x963F = 0x3024
-0x9640 = 0x424B
-0x9642 = 0x6F78
-0x9644 = 0x496D
-0x964B = 0x6F7B
-0x964C = 0x6F79
-0x964D = 0x395F
-0x964F = 0x6F7A
-0x9650 = 0x3842
-0x965B = 0x4A45
-0x965C = 0x6F7D
-0x965D = 0x7021
-0x965E = 0x6F7E
-0x965F = 0x7022
-0x9662 = 0x3121
-0x9663 = 0x3F58
-0x9664 = 0x3D7C
-0x9665 = 0x3459
-0x9666 = 0x7023
-0x966A = 0x4766
-0x966C = 0x7025
-0x9670 = 0x3122
-0x9672 = 0x7024
-0x9673 = 0x4444
-0x9675 = 0x4E4D
-0x9676 = 0x462B
-0x9677 = 0x6F7C
-0x9678 = 0x4E26
-0x967A = 0x3831
-0x967D = 0x4D5B
-0x9685 = 0x3679
-0x9686 = 0x4E34
-0x9688 = 0x3728
-0x968A = 0x4262
-0x968B = 0x6721
-0x968D = 0x7026
-0x968E = 0x332C
-0x968F = 0x3F6F
-0x9694 = 0x3356
-0x9695 = 0x7028
-0x9697 = 0x7029
-0x9698 = 0x7027
-0x9699 = 0x3764
-0x969B = 0x3A5D
-0x969C = 0x3E63
-0x96A0 = 0x3123
-0x96A3 = 0x4E59
-0x96A7 = 0x702B
-0x96A8 = 0x6E2E
-0x96AA = 0x702A
-0x96B0 = 0x702E
-0x96B1 = 0x702C
-0x96B2 = 0x702D
-0x96B4 = 0x702F
-0x96B6 = 0x7030
-0x96B7 = 0x4E6C
-0x96B8 = 0x7031
-0x96B9 = 0x7032
-0x96BB = 0x4049
-0x96BC = 0x483B
-0x96C0 = 0x3F7D
-0x96C1 = 0x3467
-0x96C4 = 0x4D3A
-0x96C5 = 0x326D
-0x96C6 = 0x3D38
-0x96C7 = 0x385B
-0x96C9 = 0x7035
-0x96CB = 0x7034
-0x96CC = 0x3B73
-0x96CD = 0x7036
-0x96CE = 0x7033
-0x96D1 = 0x3B28
-0x96D5 = 0x703A
-0x96D6 = 0x6A2D
-0x96D9 = 0x5256
-0x96DB = 0x3F77
-0x96DC = 0x7038
-0x96E2 = 0x4E25
-0x96E3 = 0x4671
-0x96E8 = 0x312B
-0x96EA = 0x4063
-0x96EB = 0x3C36
-0x96F0 = 0x4A37
-0x96F2 = 0x3140
-0x96F6 = 0x4E6D
-0x96F7 = 0x4D6B
-0x96F9 = 0x703B
-0x96FB = 0x4545
-0x9700 = 0x3C7B
-0x9704 = 0x703C
-0x9706 = 0x703D
-0x9707 = 0x3F4C
-0x9708 = 0x703E
-0x970A = 0x4E6E
-0x970D = 0x7039
-0x970E = 0x7040
-0x970F = 0x7042
-0x9711 = 0x7041
-0x9713 = 0x703F
-0x9716 = 0x7043
-0x9719 = 0x7044
-0x971C = 0x417A
-0x971E = 0x3262
-0x9724 = 0x7045
-0x9727 = 0x4C38
-0x972A = 0x7046
-0x9730 = 0x7047
-0x9732 = 0x4F2A
-0x9738 = 0x5B31
-0x9739 = 0x7048
-0x973D = 0x7049
-0x973E = 0x704A
-0x9742 = 0x704E
-0x9744 = 0x704B
-0x9746 = 0x704C
-0x9748 = 0x704D
-0x9749 = 0x704F
-0x9752 = 0x4044
-0x9756 = 0x4C77
-0x9759 = 0x4045
-0x975C = 0x7050
-0x975E = 0x4873
-0x9760 = 0x7051
-0x9761 = 0x7353
-0x9762 = 0x4C4C
-0x9764 = 0x7052
-0x9766 = 0x7053
-0x9768 = 0x7054
-0x9769 = 0x3357
-0x976B = 0x7056
-0x976D = 0x3F59
-0x9771 = 0x7057
-0x9774 = 0x3724
-0x9779 = 0x7058
-0x977A = 0x705C
-0x977C = 0x705A
-0x9781 = 0x705B
-0x9784 = 0x3373
-0x9785 = 0x7059
-0x9786 = 0x705D
-0x978B = 0x705E
-0x978D = 0x3048
-0x978F = 0x705F
-0x9790 = 0x7060
-0x9798 = 0x3E64
-0x979C = 0x7061
-0x97A0 = 0x3547
-0x97A3 = 0x7064
-0x97A6 = 0x7063
-0x97A8 = 0x7062
-0x97AB = 0x6B71
-0x97AD = 0x4A5C
-0x97B3 = 0x7065
-0x97B4 = 0x7066
-0x97C3 = 0x7067
-0x97C6 = 0x7068
-0x97C8 = 0x7069
-0x97CB = 0x706A
-0x97D3 = 0x345A
-0x97DC = 0x706B
-0x97ED = 0x706C
-0x97EE = 0x4723
-0x97F2 = 0x706E
-0x97F3 = 0x323B
-0x97F5 = 0x7071
-0x97F6 = 0x7070
-0x97FB = 0x3124
-0x97FF = 0x3641
-0x9801 = 0x4A47
-0x9802 = 0x443A
-0x9803 = 0x3A22
-0x9805 = 0x3960
-0x9806 = 0x3D67
-0x9808 = 0x3F5C
-0x980C = 0x7073
-0x980F = 0x7072
-0x9810 = 0x4D42
-0x9811 = 0x3468
-0x9812 = 0x4852
-0x9813 = 0x465C
-0x9817 = 0x3F7C
-0x9818 = 0x4E4E
-0x981A = 0x375B
-0x9821 = 0x7076
-0x9824 = 0x7075
-0x982C = 0x4B4B
-0x982D = 0x462C
-0x9834 = 0x3150
-0x9837 = 0x7077
-0x9838 = 0x7074
-0x983B = 0x4951
-0x983C = 0x4D6A
-0x983D = 0x7078
-0x9846 = 0x7079
-0x984B = 0x707B
-0x984C = 0x426A
-0x984D = 0x335B
-0x984E = 0x335C
-0x984F = 0x707A
-0x9854 = 0x3469
-0x9855 = 0x3832
-0x9858 = 0x346A
-0x985B = 0x453F
-0x985E = 0x4E60
-0x9867 = 0x385C
-0x986B = 0x707C
-0x986F = 0x707D
-0x9870 = 0x707E
-0x9871 = 0x7121
-0x9873 = 0x7123
-0x9874 = 0x7122
-0x98A8 = 0x4977
-0x98AA = 0x7124
-0x98AF = 0x7125
-0x98B1 = 0x7126
-0x98B6 = 0x7127
-0x98C3 = 0x7129
-0x98C4 = 0x7128
-0x98C6 = 0x712A
-0x98DB = 0x4874
-0x98DC = 0x664C
-0x98DF = 0x3F29
-0x98E2 = 0x3532
-0x98E9 = 0x712B
-0x98EB = 0x712C
-0x98ED = 0x522C
-0x98EE = 0x5D3B
-0x98EF = 0x4853
-0x98F2 = 0x307B
-0x98F4 = 0x303B
-0x98FC = 0x3B74
-0x98FD = 0x4B30
-0x98FE = 0x3E7E
-0x9903 = 0x712D
-0x9905 = 0x4C5F
-0x9909 = 0x712E
-0x990A = 0x4D5C
-0x990C = 0x3142
-0x9910 = 0x3B41
-0x9912 = 0x712F
-0x9913 = 0x326E
-0x9914 = 0x7130
-0x9918 = 0x7131
-0x991D = 0x7133
-0x991E = 0x7134
-0x9920 = 0x7136
-0x9921 = 0x7132
-0x9924 = 0x7135
-0x9928 = 0x345B
-0x992C = 0x7137
-0x992E = 0x7138
-0x993D = 0x7139
-0x993E = 0x713A
-0x9942 = 0x713B
-0x9945 = 0x713D
-0x9949 = 0x713C
-0x994B = 0x713F
-0x994C = 0x7142
-0x9950 = 0x713E
-0x9951 = 0x7140
-0x9952 = 0x7141
-0x9955 = 0x7143
-0x9957 = 0x3642
-0x9996 = 0x3C73
-0x9997 = 0x7144
-0x9998 = 0x7145
-0x9999 = 0x3961
-0x99A5 = 0x7146
-0x99A8 = 0x333E
-0x99AC = 0x474F
-0x99AD = 0x7147
-0x99AE = 0x7148
-0x99B3 = 0x435A
-0x99B4 = 0x466B
-0x99BC = 0x7149
-0x99C1 = 0x477D
-0x99C4 = 0x424C
-0x99C5 = 0x3158
-0x99C6 = 0x366E
-0x99C8 = 0x366F
-0x99D0 = 0x4373
-0x99D1 = 0x714E
-0x99D2 = 0x3670
-0x99D5 = 0x326F
-0x99D8 = 0x714D
-0x99DB = 0x714B
-0x99DD = 0x714C
-0x99DF = 0x714A
-0x99E2 = 0x7158
-0x99ED = 0x714F
-0x99EE = 0x7150
-0x99F1 = 0x7151
-0x99F2 = 0x7152
-0x99F8 = 0x7154
-0x99FB = 0x7153
-0x99FF = 0x3D59
-0x9A01 = 0x7155
-0x9A05 = 0x7157
-0x9A0E = 0x3533
-0x9A0F = 0x7156
-0x9A12 = 0x417B
-0x9A13 = 0x3833
-0x9A19 = 0x7159
-0x9A28 = 0x424D
-0x9A2B = 0x715A
-0x9A30 = 0x462D
-0x9A37 = 0x715B
-0x9A3E = 0x7160
-0x9A40 = 0x715E
-0x9A42 = 0x715D
-0x9A43 = 0x715F
-0x9A45 = 0x715C
-0x9A4D = 0x7162
-0x9A55 = 0x7161
-0x9A57 = 0x7164
-0x9A5A = 0x3643
-0x9A5B = 0x7163
-0x9A5F = 0x7165
-0x9A62 = 0x7166
-0x9A64 = 0x7168
-0x9A65 = 0x7167
-0x9A69 = 0x7169
-0x9A6A = 0x716B
-0x9A6B = 0x716A
-0x9AA8 = 0x397C
-0x9AAD = 0x716C
-0x9AB0 = 0x716D
-0x9AB8 = 0x333C
-0x9ABC = 0x716E
-0x9AC0 = 0x716F
-0x9AC4 = 0x3F71
-0x9ACF = 0x7170
-0x9AD1 = 0x7171
-0x9AD3 = 0x7172
-0x9AD4 = 0x7173
-0x9AD8 = 0x3962
-0x9ADE = 0x7174
-0x9ADF = 0x7175
-0x9AE2 = 0x7176
-0x9AE3 = 0x7177
-0x9AE6 = 0x7178
-0x9AEA = 0x4831
-0x9AEB = 0x717A
-0x9AED = 0x4926
-0x9AEE = 0x717B
-0x9AEF = 0x7179
-0x9AF1 = 0x717D
-0x9AF4 = 0x717C
-0x9AF7 = 0x717E
-0x9AFB = 0x7221
-0x9B06 = 0x7222
-0x9B18 = 0x7223
-0x9B1A = 0x7224
-0x9B1F = 0x7225
-0x9B22 = 0x7226
-0x9B23 = 0x7227
-0x9B25 = 0x7228
-0x9B27 = 0x7229
-0x9B28 = 0x722A
-0x9B29 = 0x722B
-0x9B2A = 0x722C
-0x9B2E = 0x722D
-0x9B2F = 0x722E
-0x9B31 = 0x5D35
-0x9B32 = 0x722F
-0x9B3B = 0x6478
-0x9B3C = 0x3534
-0x9B41 = 0x3321
-0x9B42 = 0x3A32
-0x9B43 = 0x7231
-0x9B44 = 0x7230
-0x9B45 = 0x4C25
-0x9B4D = 0x7233
-0x9B4E = 0x7234
-0x9B4F = 0x7232
-0x9B51 = 0x7235
-0x9B54 = 0x4B62
-0x9B58 = 0x7236
-0x9B5A = 0x357B
-0x9B6F = 0x4F25
-0x9B74 = 0x7237
-0x9B83 = 0x7239
-0x9B8E = 0x303E
-0x9B91 = 0x723A
-0x9B92 = 0x4A2B
-0x9B93 = 0x7238
-0x9B96 = 0x723B
-0x9B97 = 0x723C
-0x9B9F = 0x723D
-0x9BA0 = 0x723E
-0x9BA8 = 0x723F
-0x9BAA = 0x4B6E
-0x9BAB = 0x3B2D
-0x9BAD = 0x3A7A
-0x9BAE = 0x412F
-0x9BB4 = 0x7240
-0x9BB9 = 0x7243
-0x9BC0 = 0x7241
-0x9BC6 = 0x7244
-0x9BC9 = 0x3871
-0x9BCA = 0x7242
-0x9BCF = 0x7245
-0x9BD1 = 0x7246
-0x9BD2 = 0x7247
-0x9BD4 = 0x724B
-0x9BD6 = 0x3B2A
-0x9BDB = 0x4264
-0x9BE1 = 0x724C
-0x9BE2 = 0x7249
-0x9BE3 = 0x7248
-0x9BE4 = 0x724A
-0x9BE8 = 0x375F
-0x9BF0 = 0x7250
-0x9BF1 = 0x724F
-0x9BF2 = 0x724E
-0x9BF5 = 0x3033
-0x9C04 = 0x725A
-0x9C06 = 0x7256
-0x9C08 = 0x7257
-0x9C09 = 0x7253
-0x9C0A = 0x7259
-0x9C0C = 0x7255
-0x9C0D = 0x3362
-0x9C10 = 0x4F4C
-0x9C12 = 0x7258
-0x9C13 = 0x7254
-0x9C14 = 0x7252
-0x9C15 = 0x7251
-0x9C1B = 0x725C
-0x9C21 = 0x725F
-0x9C24 = 0x725E
-0x9C25 = 0x725D
-0x9C2D = 0x4949
-0x9C2E = 0x725B
-0x9C2F = 0x3073
-0x9C30 = 0x7260
-0x9C32 = 0x7262
-0x9C39 = 0x336F
-0x9C3A = 0x724D
-0x9C3B = 0x3137
-0x9C3E = 0x7264
-0x9C46 = 0x7263
-0x9C47 = 0x7261
-0x9C48 = 0x432D
-0x9C52 = 0x4B70
-0x9C57 = 0x4E5A
-0x9C5A = 0x7265
-0x9C60 = 0x7266
-0x9C67 = 0x7267
-0x9C76 = 0x7268
-0x9C78 = 0x7269
-0x9CE5 = 0x443B
-0x9CE7 = 0x726A
-0x9CE9 = 0x4837
-0x9CEB = 0x726F
-0x9CEC = 0x726B
-0x9CF0 = 0x726C
-0x9CF3 = 0x4B31
-0x9CF4 = 0x4C44
-0x9CF6 = 0x4650
-0x9D03 = 0x7270
-0x9D06 = 0x7271
-0x9D07 = 0x463E
-0x9D08 = 0x726E
-0x9D09 = 0x726D
-0x9D0E = 0x322A
-0x9D12 = 0x7279
-0x9D15 = 0x7278
-0x9D1B = 0x3175
-0x9D1F = 0x7276
-0x9D23 = 0x7275
-0x9D26 = 0x7273
-0x9D28 = 0x337B
-0x9D2A = 0x7272
-0x9D2B = 0x3C32
-0x9D2C = 0x3229
-0x9D3B = 0x3963
-0x9D3E = 0x727C
-0x9D3F = 0x727B
-0x9D41 = 0x727A
-0x9D44 = 0x7277
-0x9D46 = 0x727D
-0x9D48 = 0x727E
-0x9D50 = 0x7325
-0x9D51 = 0x7324
-0x9D59 = 0x7326
-0x9D5C = 0x312D
-0x9D5D = 0x7321
-0x9D5E = 0x7322
-0x9D60 = 0x3974
-0x9D61 = 0x4C39
-0x9D64 = 0x7323
-0x9D6C = 0x4B32
-0x9D6F = 0x732B
-0x9D72 = 0x7327
-0x9D7A = 0x732C
-0x9D87 = 0x7329
-0x9D89 = 0x7328
-0x9D8F = 0x375C
-0x9D9A = 0x732D
-0x9DA4 = 0x732E
-0x9DA9 = 0x732F
-0x9DAB = 0x732A
-0x9DAF = 0x7274
-0x9DB2 = 0x7330
-0x9DB4 = 0x4461
-0x9DB8 = 0x7334
-0x9DBA = 0x7335
-0x9DBB = 0x7333
-0x9DC1 = 0x7332
-0x9DC2 = 0x7338
-0x9DC4 = 0x7331
-0x9DC6 = 0x7336
-0x9DCF = 0x7337
-0x9DD3 = 0x733A
-0x9DD9 = 0x7339
-0x9DE6 = 0x733C
-0x9DED = 0x733D
-0x9DEF = 0x733E
-0x9DF2 = 0x4F49
-0x9DF8 = 0x733B
-0x9DF9 = 0x426B
-0x9DFA = 0x3A6D
-0x9DFD = 0x733F
-0x9E1A = 0x7340
-0x9E1B = 0x7341
-0x9E1E = 0x7342
-0x9E75 = 0x7343
-0x9E78 = 0x3834
-0x9E79 = 0x7344
-0x9E7D = 0x7345
-0x9E7F = 0x3C2F
-0x9E81 = 0x7346
-0x9E88 = 0x7347
-0x9E8B = 0x7348
-0x9E8C = 0x7349
-0x9E91 = 0x734C
-0x9E92 = 0x734A
-0x9E93 = 0x4F3C
-0x9E95 = 0x734B
-0x9E97 = 0x4E6F
-0x9E9D = 0x734D
-0x9E9F = 0x4E5B
-0x9EA5 = 0x734E
-0x9EA6 = 0x477E
-0x9EA9 = 0x734F
-0x9EAA = 0x7351
-0x9EAD = 0x7352
-0x9EB8 = 0x7350
-0x9EB9 = 0x396D
-0x9EBA = 0x4C4D
-0x9EBB = 0x4B63
-0x9EBC = 0x5677
-0x9EBE = 0x5D60
-0x9EBF = 0x4B7B
-0x9EC4 = 0x322B
-0x9ECC = 0x7354
-0x9ECD = 0x3550
-0x9ECE = 0x7355
-0x9ECF = 0x7356
-0x9ED0 = 0x7357
-0x9ED2 = 0x3975
-0x9ED4 = 0x7358
-0x9ED8 = 0x6054
-0x9ED9 = 0x4C5B
-0x9EDB = 0x4263
-0x9EDC = 0x7359
-0x9EDD = 0x735B
-0x9EDE = 0x735A
-0x9EE0 = 0x735C
-0x9EE5 = 0x735D
-0x9EE8 = 0x735E
-0x9EEF = 0x735F
-0x9EF4 = 0x7360
-0x9EF6 = 0x7361
-0x9EF7 = 0x7362
-0x9EF9 = 0x7363
-0x9EFB = 0x7364
-0x9EFC = 0x7365
-0x9EFD = 0x7366
-0x9F07 = 0x7367
-0x9F08 = 0x7368
-0x9F0E = 0x4524
-0x9F13 = 0x385D
-0x9F15 = 0x736A
-0x9F20 = 0x414D
-0x9F21 = 0x736B
-0x9F2C = 0x736C
-0x9F3B = 0x4921
-0x9F3E = 0x736D
-0x9F4A = 0x736E
-0x9F4B = 0x6337
-0x9F4E = 0x6C5A
-0x9F4F = 0x706D
-0x9F52 = 0x736F
-0x9F54 = 0x7370
-0x9F5F = 0x7372
-0x9F60 = 0x7373
-0x9F61 = 0x7374
-0x9F62 = 0x4E70
-0x9F63 = 0x7371
-0x9F66 = 0x7375
-0x9F67 = 0x7376
-0x9F6A = 0x7378
-0x9F6C = 0x7377
-0x9F72 = 0x737A
-0x9F76 = 0x737B
-0x9F77 = 0x7379
-0x9F8D = 0x4E36
-0x9F95 = 0x737C
-0x9F9C = 0x737D
-0x9F9D = 0x6354
-0x9FA0 = 0x737E
-0xFF01 = 0x212A
-0xFF03 = 0x2174
-0xFF04 = 0x2170
-0xFF05 = 0x2173
-0xFF06 = 0x2175
-0xFF08 = 0x214A
-0xFF09 = 0x214B
-0xFF0A = 0x2176
-0xFF0B = 0x215C
-0xFF0C = 0x2124
-0xFF0E = 0x2125
-0xFF0F = 0x213F
-0xFF10 = 0x2330
-0xFF11 = 0x2331
-0xFF12 = 0x2332
-0xFF13 = 0x2333
-0xFF14 = 0x2334
-0xFF15 = 0x2335
-0xFF16 = 0x2336
-0xFF17 = 0x2337
-0xFF18 = 0x2338
-0xFF19 = 0x2339
-0xFF1A = 0x2127
-0xFF1B = 0x2128
-0xFF1C = 0x2163
-0xFF1D = 0x2161
-0xFF1E = 0x2164
-0xFF1F = 0x2129
-0xFF20 = 0x2177
-0xFF21 = 0x2341
-0xFF22 = 0x2342
-0xFF23 = 0x2343
-0xFF24 = 0x2344
-0xFF25 = 0x2345
-0xFF26 = 0x2346
-0xFF27 = 0x2347
-0xFF28 = 0x2348
-0xFF29 = 0x2349
-0xFF2A = 0x234A
-0xFF2B = 0x234B
-0xFF2C = 0x234C
-0xFF2D = 0x234D
-0xFF2E = 0x234E
-0xFF2F = 0x234F
-0xFF30 = 0x2350
-0xFF31 = 0x2351
-0xFF32 = 0x2352
-0xFF33 = 0x2353
-0xFF34 = 0x2354
-0xFF35 = 0x2355
-0xFF36 = 0x2356
-0xFF37 = 0x2357
-0xFF38 = 0x2358
-0xFF39 = 0x2359
-0xFF3A = 0x235A
-0xFF3B = 0x214E
-0xFF3C = 0x2140
-0xFF3D = 0x214F
-0xFF3E = 0x2130
-0xFF3F = 0x2132
-0xFF40 = 0x212E
-0xFF41 = 0x2361
-0xFF42 = 0x2362
-0xFF43 = 0x2363
-0xFF44 = 0x2364
-0xFF45 = 0x2365
-0xFF46 = 0x2366
-0xFF47 = 0x2367
-0xFF48 = 0x2368
-0xFF49 = 0x2369
-0xFF4A = 0x236A
-0xFF4B = 0x236B
-0xFF4C = 0x236C
-0xFF4D = 0x236D
-0xFF4E = 0x236E
-0xFF4F = 0x236F
-0xFF50 = 0x2370
-0xFF51 = 0x2371
-0xFF52 = 0x2372
-0xFF53 = 0x2373
-0xFF54 = 0x2374
-0xFF55 = 0x2375
-0xFF56 = 0x2376
-0xFF57 = 0x2377
-0xFF58 = 0x2378
-0xFF59 = 0x2379
-0xFF5A = 0x237A
-0xFF5B = 0x2150
-0xFF5C = 0x2143
-0xFF5D = 0x2151
-0xFFE3 = 0x2131
-0xFFE5 = 0x216F
-END_MAP
diff --git a/enc/trans/JIS/UCS%JISX0208@MS.src b/enc/trans/JIS/UCS%JISX0208@MS.src
deleted file mode 100644
index 7fa662ee96..0000000000
--- a/enc/trans/JIS/UCS%JISX0208@MS.src
+++ /dev/null
@@ -1,6894 +0,0 @@
-# $NetBSD: UCS%JISX0208@MS.src,v 1.1 2003/07/19 20:20:42 tshiozak Exp $
-
-TYPE ROWCOL
-NAME "UCS/JISX0208:MS"
-SRC_ZONE 0x0000 - 0xFFFF
-OOB_MODE INVALID
-DST_INVALID 0xFFFF
-DST_UNIT_BITS 16
-
-BEGIN_MAP
-0x0000 - 0xFFFF = INVALID
-#
-# This data is derived from http://www.opengroup.or.jp/jvc/cde/
-#
-0x00A7 = 0x2178
-0x00A8 = 0x212F
-0x00B0 = 0x216B
-0x00B1 = 0x215E
-0x00B4 = 0x212D
-0x00B6 = 0x2279
-0x00D7 = 0x215F
-0x00F7 = 0x2160
-0x0391 = 0x2621
-0x0392 = 0x2622
-0x0393 = 0x2623
-0x0394 = 0x2624
-0x0395 = 0x2625
-0x0396 = 0x2626
-0x0397 = 0x2627
-0x0398 = 0x2628
-0x0399 = 0x2629
-0x039A = 0x262A
-0x039B = 0x262B
-0x039C = 0x262C
-0x039D = 0x262D
-0x039E = 0x262E
-0x039F = 0x262F
-0x03A0 = 0x2630
-0x03A1 = 0x2631
-0x03A3 = 0x2632
-0x03A4 = 0x2633
-0x03A5 = 0x2634
-0x03A6 = 0x2635
-0x03A7 = 0x2636
-0x03A8 = 0x2637
-0x03A9 = 0x2638
-0x03B1 = 0x2641
-0x03B2 = 0x2642
-0x03B3 = 0x2643
-0x03B4 = 0x2644
-0x03B5 = 0x2645
-0x03B6 = 0x2646
-0x03B7 = 0x2647
-0x03B8 = 0x2648
-0x03B9 = 0x2649
-0x03BA = 0x264A
-0x03BB = 0x264B
-0x03BC = 0x264C
-0x03BD = 0x264D
-0x03BE = 0x264E
-0x03BF = 0x264F
-0x03C0 = 0x2650
-0x03C1 = 0x2651
-0x03C3 = 0x2652
-0x03C4 = 0x2653
-0x03C5 = 0x2654
-0x03C6 = 0x2655
-0x03C7 = 0x2656
-0x03C8 = 0x2657
-0x03C9 = 0x2658
-0x0401 = 0x2727
-0x0410 = 0x2721
-0x0411 = 0x2722
-0x0412 = 0x2723
-0x0413 = 0x2724
-0x0414 = 0x2725
-0x0415 = 0x2726
-0x0416 = 0x2728
-0x0417 = 0x2729
-0x0418 = 0x272A
-0x0419 = 0x272B
-0x041A = 0x272C
-0x041B = 0x272D
-0x041C = 0x272E
-0x041D = 0x272F
-0x041E = 0x2730
-0x041F = 0x2731
-0x0420 = 0x2732
-0x0421 = 0x2733
-0x0422 = 0x2734
-0x0423 = 0x2735
-0x0424 = 0x2736
-0x0425 = 0x2737
-0x0426 = 0x2738
-0x0427 = 0x2739
-0x0428 = 0x273A
-0x0429 = 0x273B
-0x042A = 0x273C
-0x042B = 0x273D
-0x042C = 0x273E
-0x042D = 0x273F
-0x042E = 0x2740
-0x042F = 0x2741
-0x0430 = 0x2751
-0x0431 = 0x2752
-0x0432 = 0x2753
-0x0433 = 0x2754
-0x0434 = 0x2755
-0x0435 = 0x2756
-0x0436 = 0x2758
-0x0437 = 0x2759
-0x0438 = 0x275A
-0x0439 = 0x275B
-0x043A = 0x275C
-0x043B = 0x275D
-0x043C = 0x275E
-0x043D = 0x275F
-0x043E = 0x2760
-0x043F = 0x2761
-0x0440 = 0x2762
-0x0441 = 0x2763
-0x0442 = 0x2764
-0x0443 = 0x2765
-0x0444 = 0x2766
-0x0445 = 0x2767
-0x0446 = 0x2768
-0x0447 = 0x2769
-0x0448 = 0x276A
-0x0449 = 0x276B
-0x044A = 0x276C
-0x044B = 0x276D
-0x044C = 0x276E
-0x044D = 0x276F
-0x044E = 0x2770
-0x044F = 0x2771
-0x0451 = 0x2757
-0x2010 = 0x213E
-0x2015 = 0x213D
-0x2018 = 0x2146
-0x2019 = 0x2147
-0x201C = 0x2148
-0x201D = 0x2149
-0x2020 = 0x2277
-0x2021 = 0x2278
-0x2025 = 0x2145
-0x2026 = 0x2144
-0x2030 = 0x2273
-0x2032 = 0x216C
-0x2033 = 0x216D
-0x203B = 0x2228
-0x2103 = 0x216E
-0x212B = 0x2272
-0x2190 = 0x222B
-0x2191 = 0x222C
-0x2192 = 0x222A
-0x2193 = 0x222D
-0x21D2 = 0x224D
-0x21D4 = 0x224E
-0x2200 = 0x224F
-0x2202 = 0x225F
-0x2203 = 0x2250
-0x2207 = 0x2260
-0x2208 = 0x223A
-0x220B = 0x223B
-0x221A = 0x2265
-0x221D = 0x2267
-0x221E = 0x2167
-0x2220 = 0x225C
-0x2225 = 0x2142
-0x2227 = 0x224A
-0x2228 = 0x224B
-0x2229 = 0x2241
-0x222A = 0x2240
-0x222B = 0x2269
-0x222C = 0x226A
-0x2234 = 0x2168
-0x2235 = 0x2268
-0x223D = 0x2266
-0x2252 = 0x2262
-0x2260 = 0x2162
-0x2261 = 0x2261
-0x2266 = 0x2165
-0x2267 = 0x2166
-0x226A = 0x2263
-0x226B = 0x2264
-0x2282 = 0x223E
-0x2283 = 0x223F
-0x2286 = 0x223C
-0x2287 = 0x223D
-0x22A5 = 0x225D
-0x2312 = 0x225E
-0x2500 = 0x2821
-0x2501 = 0x282C
-0x2502 = 0x2822
-0x2503 = 0x282D
-0x250C = 0x2823
-0x250F = 0x282E
-0x2510 = 0x2824
-0x2513 = 0x282F
-0x2514 = 0x2826
-0x2517 = 0x2831
-0x2518 = 0x2825
-0x251B = 0x2830
-0x251C = 0x2827
-0x251D = 0x283C
-0x2520 = 0x2837
-0x2523 = 0x2832
-0x2524 = 0x2829
-0x2525 = 0x283E
-0x2528 = 0x2839
-0x252B = 0x2834
-0x252C = 0x2828
-0x252F = 0x2838
-0x2530 = 0x283D
-0x2533 = 0x2833
-0x2534 = 0x282A
-0x2537 = 0x283A
-0x2538 = 0x283F
-0x253B = 0x2835
-0x253C = 0x282B
-0x253F = 0x283B
-0x2542 = 0x2840
-0x254B = 0x2836
-0x25A0 = 0x2223
-0x25A1 = 0x2222
-0x25B2 = 0x2225
-0x25B3 = 0x2224
-0x25BC = 0x2227
-0x25BD = 0x2226
-0x25C6 = 0x2221
-0x25C7 = 0x217E
-0x25CB = 0x217B
-0x25CE = 0x217D
-0x25CF = 0x217C
-0x25EF = 0x227E
-0x2605 = 0x217A
-0x2606 = 0x2179
-0x2640 = 0x216A
-0x2642 = 0x2169
-0x266A = 0x2276
-0x266D = 0x2275
-0x266F = 0x2274
-0x3000 = 0x2121
-0x3001 = 0x2122
-0x3002 = 0x2123
-0x3003 = 0x2137
-0x3005 = 0x2139
-0x3006 = 0x213A
-0x3007 = 0x213B
-0x3008 = 0x2152
-0x3009 = 0x2153
-0x300A = 0x2154
-0x300B = 0x2155
-0x300C = 0x2156
-0x300D = 0x2157
-0x300E = 0x2158
-0x300F = 0x2159
-0x3010 = 0x215A
-0x3011 = 0x215B
-0x3012 = 0x2229
-0x3013 = 0x222E
-0x3014 = 0x214C
-0x3015 = 0x214D
-0x3041 = 0x2421
-0x3042 = 0x2422
-0x3043 = 0x2423
-0x3044 = 0x2424
-0x3045 = 0x2425
-0x3046 = 0x2426
-0x3047 = 0x2427
-0x3048 = 0x2428
-0x3049 = 0x2429
-0x304A = 0x242A
-0x304B = 0x242B
-0x304C = 0x242C
-0x304D = 0x242D
-0x304E = 0x242E
-0x304F = 0x242F
-0x3050 = 0x2430
-0x3051 = 0x2431
-0x3052 = 0x2432
-0x3053 = 0x2433
-0x3054 = 0x2434
-0x3055 = 0x2435
-0x3056 = 0x2436
-0x3057 = 0x2437
-0x3058 = 0x2438
-0x3059 = 0x2439
-0x305A = 0x243A
-0x305B = 0x243B
-0x305C = 0x243C
-0x305D = 0x243D
-0x305E = 0x243E
-0x305F = 0x243F
-0x3060 = 0x2440
-0x3061 = 0x2441
-0x3062 = 0x2442
-0x3063 = 0x2443
-0x3064 = 0x2444
-0x3065 = 0x2445
-0x3066 = 0x2446
-0x3067 = 0x2447
-0x3068 = 0x2448
-0x3069 = 0x2449
-0x306A = 0x244A
-0x306B = 0x244B
-0x306C = 0x244C
-0x306D = 0x244D
-0x306E = 0x244E
-0x306F = 0x244F
-0x3070 = 0x2450
-0x3071 = 0x2451
-0x3072 = 0x2452
-0x3073 = 0x2453
-0x3074 = 0x2454
-0x3075 = 0x2455
-0x3076 = 0x2456
-0x3077 = 0x2457
-0x3078 = 0x2458
-0x3079 = 0x2459
-0x307A = 0x245A
-0x307B = 0x245B
-0x307C = 0x245C
-0x307D = 0x245D
-0x307E = 0x245E
-0x307F = 0x245F
-0x3080 = 0x2460
-0x3081 = 0x2461
-0x3082 = 0x2462
-0x3083 = 0x2463
-0x3084 = 0x2464
-0x3085 = 0x2465
-0x3086 = 0x2466
-0x3087 = 0x2467
-0x3088 = 0x2468
-0x3089 = 0x2469
-0x308A = 0x246A
-0x308B = 0x246B
-0x308C = 0x246C
-0x308D = 0x246D
-0x308E = 0x246E
-0x308F = 0x246F
-0x3090 = 0x2470
-0x3091 = 0x2471
-0x3092 = 0x2472
-0x3093 = 0x2473
-0x309B = 0x212B
-0x309C = 0x212C
-0x309D = 0x2135
-0x309E = 0x2136
-0x30A1 = 0x2521
-0x30A2 = 0x2522
-0x30A3 = 0x2523
-0x30A4 = 0x2524
-0x30A5 = 0x2525
-0x30A6 = 0x2526
-0x30A7 = 0x2527
-0x30A8 = 0x2528
-0x30A9 = 0x2529
-0x30AA = 0x252A
-0x30AB = 0x252B
-0x30AC = 0x252C
-0x30AD = 0x252D
-0x30AE = 0x252E
-0x30AF = 0x252F
-0x30B0 = 0x2530
-0x30B1 = 0x2531
-0x30B2 = 0x2532
-0x30B3 = 0x2533
-0x30B4 = 0x2534
-0x30B5 = 0x2535
-0x30B6 = 0x2536
-0x30B7 = 0x2537
-0x30B8 = 0x2538
-0x30B9 = 0x2539
-0x30BA = 0x253A
-0x30BB = 0x253B
-0x30BC = 0x253C
-0x30BD = 0x253D
-0x30BE = 0x253E
-0x30BF = 0x253F
-0x30C0 = 0x2540
-0x30C1 = 0x2541
-0x30C2 = 0x2542
-0x30C3 = 0x2543
-0x30C4 = 0x2544
-0x30C5 = 0x2545
-0x30C6 = 0x2546
-0x30C7 = 0x2547
-0x30C8 = 0x2548
-0x30C9 = 0x2549
-0x30CA = 0x254A
-0x30CB = 0x254B
-0x30CC = 0x254C
-0x30CD = 0x254D
-0x30CE = 0x254E
-0x30CF = 0x254F
-0x30D0 = 0x2550
-0x30D1 = 0x2551
-0x30D2 = 0x2552
-0x30D3 = 0x2553
-0x30D4 = 0x2554
-0x30D5 = 0x2555
-0x30D6 = 0x2556
-0x30D7 = 0x2557
-0x30D8 = 0x2558
-0x30D9 = 0x2559
-0x30DA = 0x255A
-0x30DB = 0x255B
-0x30DC = 0x255C
-0x30DD = 0x255D
-0x30DE = 0x255E
-0x30DF = 0x255F
-0x30E0 = 0x2560
-0x30E1 = 0x2561
-0x30E2 = 0x2562
-0x30E3 = 0x2563
-0x30E4 = 0x2564
-0x30E5 = 0x2565
-0x30E6 = 0x2566
-0x30E7 = 0x2567
-0x30E8 = 0x2568
-0x30E9 = 0x2569
-0x30EA = 0x256A
-0x30EB = 0x256B
-0x30EC = 0x256C
-0x30ED = 0x256D
-0x30EE = 0x256E
-0x30EF = 0x256F
-0x30F0 = 0x2570
-0x30F1 = 0x2571
-0x30F2 = 0x2572
-0x30F3 = 0x2573
-0x30F4 = 0x2574
-0x30F5 = 0x2575
-0x30F6 = 0x2576
-0x30FB = 0x2126
-0x30FC = 0x213C
-0x30FD = 0x2133
-0x30FE = 0x2134
-0x4E00 = 0x306C
-0x4E01 = 0x437A
-0x4E03 = 0x3C37
-0x4E07 = 0x4B7C
-0x4E08 = 0x3E66
-0x4E09 = 0x3B30
-0x4E0A = 0x3E65
-0x4E0B = 0x323C
-0x4E0D = 0x4954
-0x4E0E = 0x4D3F
-0x4E10 = 0x5022
-0x4E11 = 0x312F
-0x4E14 = 0x336E
-0x4E15 = 0x5023
-0x4E16 = 0x4024
-0x4E17 = 0x5242
-0x4E18 = 0x3556
-0x4E19 = 0x4A3A
-0x4E1E = 0x3E67
-0x4E21 = 0x4E3E
-0x4E26 = 0x4A42
-0x4E2A = 0x5024
-0x4E2D = 0x4366
-0x4E31 = 0x5025
-0x4E32 = 0x367A
-0x4E36 = 0x5026
-0x4E38 = 0x345D
-0x4E39 = 0x4330
-0x4E3B = 0x3C67
-0x4E3C = 0x5027
-0x4E3F = 0x5028
-0x4E42 = 0x5029
-0x4E43 = 0x4735
-0x4E45 = 0x3557
-0x4E4B = 0x4737
-0x4E4D = 0x4663
-0x4E4E = 0x3843
-0x4E4F = 0x4B33
-0x4E55 = 0x6949
-0x4E56 = 0x502A
-0x4E57 = 0x3E68
-0x4E58 = 0x502B
-0x4E59 = 0x3235
-0x4E5D = 0x3665
-0x4E5E = 0x3870
-0x4E5F = 0x4C69
-0x4E62 = 0x5626
-0x4E71 = 0x4D70
-0x4E73 = 0x467D
-0x4E7E = 0x3425
-0x4E80 = 0x3535
-0x4E82 = 0x502C
-0x4E85 = 0x502D
-0x4E86 = 0x4E3B
-0x4E88 = 0x4D3D
-0x4E89 = 0x4168
-0x4E8A = 0x502F
-0x4E8B = 0x3B76
-0x4E8C = 0x4673
-0x4E8E = 0x5032
-0x4E91 = 0x313E
-0x4E92 = 0x385F
-0x4E94 = 0x385E
-0x4E95 = 0x3066
-0x4E98 = 0x4F4B
-0x4E99 = 0x4F4A
-0x4E9B = 0x3A33
-0x4E9C = 0x3021
-0x4E9E = 0x5033
-0x4E9F = 0x5034
-0x4EA0 = 0x5035
-0x4EA1 = 0x4B34
-0x4EA2 = 0x5036
-0x4EA4 = 0x3872
-0x4EA5 = 0x3067
-0x4EA6 = 0x4B72
-0x4EA8 = 0x357C
-0x4EAB = 0x357D
-0x4EAC = 0x357E
-0x4EAD = 0x4462
-0x4EAE = 0x4E3C
-0x4EB0 = 0x5037
-0x4EB3 = 0x5038
-0x4EB6 = 0x5039
-0x4EBA = 0x3F4D
-0x4EC0 = 0x3D3A
-0x4EC1 = 0x3F4E
-0x4EC2 = 0x503E
-0x4EC4 = 0x503C
-0x4EC6 = 0x503D
-0x4EC7 = 0x3558
-0x4ECA = 0x3A23
-0x4ECB = 0x3270
-0x4ECD = 0x503B
-0x4ECE = 0x503A
-0x4ECF = 0x4A29
-0x4ED4 = 0x3B46
-0x4ED5 = 0x3B45
-0x4ED6 = 0x423E
-0x4ED7 = 0x503F
-0x4ED8 = 0x4955
-0x4ED9 = 0x4067
-0x4EDD = 0x2138
-0x4EDE = 0x5040
-0x4EDF = 0x5042
-0x4EE3 = 0x4265
-0x4EE4 = 0x4E61
-0x4EE5 = 0x304A
-0x4EED = 0x5041
-0x4EEE = 0x323E
-0x4EF0 = 0x3644
-0x4EF2 = 0x4367
-0x4EF6 = 0x376F
-0x4EF7 = 0x5043
-0x4EFB = 0x4724
-0x4F01 = 0x346B
-0x4F09 = 0x5044
-0x4F0A = 0x304B
-0x4F0D = 0x3860
-0x4F0E = 0x346C
-0x4F0F = 0x497A
-0x4F10 = 0x4832
-0x4F11 = 0x3559
-0x4F1A = 0x3271
-0x4F1C = 0x5067
-0x4F1D = 0x4541
-0x4F2F = 0x476C
-0x4F30 = 0x5046
-0x4F34 = 0x483C
-0x4F36 = 0x4E62
-0x4F38 = 0x3F2D
-0x4F3A = 0x3B47
-0x4F3C = 0x3B77
-0x4F3D = 0x3240
-0x4F43 = 0x4451
-0x4F46 = 0x4322
-0x4F47 = 0x504A
-0x4F4D = 0x304C
-0x4F4E = 0x4463
-0x4F4F = 0x3D3B
-0x4F50 = 0x3A34
-0x4F51 = 0x4D24
-0x4F53 = 0x424E
-0x4F55 = 0x323F
-0x4F57 = 0x5049
-0x4F59 = 0x4D3E
-0x4F5A = 0x5045
-0x4F5B = 0x5047
-0x4F5C = 0x3A6E
-0x4F5D = 0x5048
-0x4F5E = 0x5524
-0x4F69 = 0x5050
-0x4F6F = 0x5053
-0x4F70 = 0x5051
-0x4F73 = 0x3242
-0x4F75 = 0x4A3B
-0x4F76 = 0x504B
-0x4F7B = 0x504F
-0x4F7C = 0x3873
-0x4F7F = 0x3B48
-0x4F83 = 0x3426
-0x4F86 = 0x5054
-0x4F88 = 0x504C
-0x4F8B = 0x4E63
-0x4F8D = 0x3B78
-0x4F8F = 0x504D
-0x4F91 = 0x5052
-0x4F96 = 0x5055
-0x4F98 = 0x504E
-0x4F9B = 0x3621
-0x4F9D = 0x304D
-0x4FA0 = 0x3622
-0x4FA1 = 0x3241
-0x4FAB = 0x5525
-0x4FAD = 0x4B79
-0x4FAE = 0x496E
-0x4FAF = 0x3874
-0x4FB5 = 0x3F2F
-0x4FB6 = 0x4E37
-0x4FBF = 0x4A58
-0x4FC2 = 0x3738
-0x4FC3 = 0x4225
-0x4FC4 = 0x3264
-0x4FCA = 0x3D53
-0x4FCE = 0x5059
-0x4FD0 = 0x505E
-0x4FD1 = 0x505C
-0x4FD4 = 0x5057
-0x4FD7 = 0x422F
-0x4FD8 = 0x505A
-0x4FDA = 0x505D
-0x4FDB = 0x505B
-0x4FDD = 0x4A5D
-0x4FDF = 0x5058
-0x4FE1 = 0x3F2E
-0x4FE3 = 0x4B73
-0x4FE4 = 0x505F
-0x4FE5 = 0x5060
-0x4FEE = 0x3D24
-0x4FEF = 0x506D
-0x4FF3 = 0x4750
-0x4FF5 = 0x4936
-0x4FF6 = 0x5068
-0x4FF8 = 0x4A70
-0x4FFA = 0x3236
-0x4FFE = 0x506C
-0x5005 = 0x5066
-0x5006 = 0x506F
-0x5009 = 0x4152
-0x500B = 0x3844
-0x500D = 0x475C
-0x500F = 0x6047
-0x5011 = 0x506E
-0x5012 = 0x455D
-0x5014 = 0x5063
-0x5016 = 0x3876
-0x5019 = 0x3875
-0x501A = 0x5061
-0x501F = 0x3C5A
-0x5021 = 0x5069
-0x5023 = 0x4A6F
-0x5024 = 0x434D
-0x5025 = 0x5065
-0x5026 = 0x3771
-0x5028 = 0x5062
-0x5029 = 0x506A
-0x502A = 0x5064
-0x502B = 0x4E51
-0x502C = 0x506B
-0x502D = 0x4F41
-0x5036 = 0x3666
-0x5039 = 0x3770
-0x5043 = 0x5070
-0x5047 = 0x5071
-0x5048 = 0x5075
-0x5049 = 0x304E
-0x504F = 0x4A50
-0x5050 = 0x5074
-0x5055 = 0x5073
-0x5056 = 0x5077
-0x505A = 0x5076
-0x505C = 0x4464
-0x5065 = 0x3772
-0x506C = 0x5078
-0x5072 = 0x3C45
-0x5074 = 0x4226
-0x5075 = 0x4465
-0x5076 = 0x3676
-0x5078 = 0x5079
-0x507D = 0x3536
-0x5080 = 0x507A
-0x5085 = 0x507C
-0x508D = 0x4B35
-0x5091 = 0x3766
-0x5098 = 0x3B31
-0x5099 = 0x4877
-0x509A = 0x507B
-0x50AC = 0x3A45
-0x50AD = 0x4D43
-0x50B2 = 0x507E
-0x50B3 = 0x5123
-0x50B4 = 0x507D
-0x50B5 = 0x3A44
-0x50B7 = 0x3D7D
-0x50BE = 0x3739
-0x50C2 = 0x5124
-0x50C5 = 0x364F
-0x50C9 = 0x5121
-0x50CA = 0x5122
-0x50CD = 0x462F
-0x50CF = 0x417C
-0x50D1 = 0x3623
-0x50D5 = 0x4B4D
-0x50D6 = 0x5125
-0x50DA = 0x4E3D
-0x50DE = 0x5126
-0x50E3 = 0x5129
-0x50E5 = 0x5127
-0x50E7 = 0x414E
-0x50ED = 0x5128
-0x50EE = 0x512A
-0x50F5 = 0x512C
-0x50F9 = 0x512B
-0x50FB = 0x4A48
-0x5100 = 0x3537
-0x5101 = 0x512E
-0x5102 = 0x512F
-0x5104 = 0x322F
-0x5109 = 0x512D
-0x5112 = 0x3C74
-0x5114 = 0x5132
-0x5115 = 0x5131
-0x5116 = 0x5130
-0x5118 = 0x5056
-0x511A = 0x5133
-0x511F = 0x3D7E
-0x5121 = 0x5134
-0x512A = 0x4D25
-0x5132 = 0x4C59
-0x5137 = 0x5136
-0x513A = 0x5135
-0x513B = 0x5138
-0x513C = 0x5137
-0x513F = 0x5139
-0x5140 = 0x513A
-0x5141 = 0x3074
-0x5143 = 0x3835
-0x5144 = 0x373B
-0x5145 = 0x3D3C
-0x5146 = 0x437B
-0x5147 = 0x3624
-0x5148 = 0x4068
-0x5149 = 0x3877
-0x514B = 0x396E
-0x514C = 0x513C
-0x514D = 0x4C48
-0x514E = 0x4546
-0x5150 = 0x3B79
-0x5152 = 0x513B
-0x5154 = 0x513D
-0x515A = 0x455E
-0x515C = 0x3375
-0x5162 = 0x513E
-0x5165 = 0x467E
-0x5168 = 0x4134
-0x5169 = 0x5140
-0x516A = 0x5141
-0x516B = 0x482C
-0x516C = 0x3878
-0x516D = 0x4F3B
-0x516E = 0x5142
-0x5171 = 0x3626
-0x5175 = 0x4A3C
-0x5176 = 0x4236
-0x5177 = 0x3671
-0x5178 = 0x4535
-0x517C = 0x3773
-0x5180 = 0x5143
-0x5182 = 0x5144
-0x5185 = 0x4662
-0x5186 = 0x315F
-0x5189 = 0x5147
-0x518A = 0x3A7D
-0x518C = 0x5146
-0x518D = 0x3A46
-0x518F = 0x5148
-0x5190 = 0x666E
-0x5191 = 0x5149
-0x5192 = 0x4B41
-0x5193 = 0x514A
-0x5195 = 0x514B
-0x5196 = 0x514C
-0x5197 = 0x3E69
-0x5199 = 0x3C4C
-0x51A0 = 0x3427
-0x51A2 = 0x514F
-0x51A4 = 0x514D
-0x51A5 = 0x4C3D
-0x51A6 = 0x514E
-0x51A8 = 0x495A
-0x51A9 = 0x5150
-0x51AA = 0x5151
-0x51AB = 0x5152
-0x51AC = 0x455F
-0x51B0 = 0x5156
-0x51B1 = 0x5154
-0x51B2 = 0x5155
-0x51B3 = 0x5153
-0x51B4 = 0x3A63
-0x51B5 = 0x5157
-0x51B6 = 0x4C6A
-0x51B7 = 0x4E64
-0x51BD = 0x5158
-0x51C4 = 0x4028
-0x51C5 = 0x5159
-0x51C6 = 0x3D5A
-0x51C9 = 0x515A
-0x51CB = 0x437C
-0x51CC = 0x4E3F
-0x51CD = 0x4560
-0x51D6 = 0x5245
-0x51DB = 0x515B
-0x51DC = 0x7425
-0x51DD = 0x3645
-0x51E0 = 0x515C
-0x51E1 = 0x4B5E
-0x51E6 = 0x3D68
-0x51E7 = 0x427C
-0x51E9 = 0x515E
-0x51EA = 0x4664
-0x51ED = 0x515F
-0x51F0 = 0x5160
-0x51F1 = 0x332E
-0x51F5 = 0x5161
-0x51F6 = 0x3627
-0x51F8 = 0x464C
-0x51F9 = 0x317A
-0x51FA = 0x3D50
-0x51FD = 0x4821
-0x51FE = 0x5162
-0x5200 = 0x4561
-0x5203 = 0x3F4F
-0x5204 = 0x5163
-0x5206 = 0x4A2C
-0x5207 = 0x405A
-0x5208 = 0x3422
-0x520A = 0x3429
-0x520B = 0x5164
-0x520E = 0x5166
-0x5211 = 0x373A
-0x5214 = 0x5165
-0x5217 = 0x4E73
-0x521D = 0x3D69
-0x5224 = 0x483D
-0x5225 = 0x4A4C
-0x5227 = 0x5167
-0x5229 = 0x4D78
-0x522A = 0x5168
-0x522E = 0x5169
-0x5230 = 0x457E
-0x5233 = 0x516A
-0x5236 = 0x4029
-0x5237 = 0x3A7E
-0x5238 = 0x3774
-0x5239 = 0x516B
-0x523A = 0x3B49
-0x523B = 0x396F
-0x5243 = 0x4466
-0x5244 = 0x516D
-0x5247 = 0x4227
-0x524A = 0x3A6F
-0x524B = 0x516E
-0x524C = 0x516F
-0x524D = 0x4130
-0x524F = 0x516C
-0x5254 = 0x5171
-0x5256 = 0x4B36
-0x525B = 0x3964
-0x525E = 0x5170
-0x5263 = 0x3775
-0x5264 = 0x3A5E
-0x5265 = 0x476D
-0x5269 = 0x5174
-0x526A = 0x5172
-0x526F = 0x497B
-0x5270 = 0x3E6A
-0x5271 = 0x517B
-0x5272 = 0x3364
-0x5273 = 0x5175
-0x5274 = 0x5173
-0x5275 = 0x414F
-0x527D = 0x5177
-0x527F = 0x5176
-0x5283 = 0x3344
-0x5287 = 0x3760
-0x5288 = 0x517C
-0x5289 = 0x4E2D
-0x528D = 0x5178
-0x5291 = 0x517D
-0x5292 = 0x517A
-0x5294 = 0x5179
-0x529B = 0x4E4F
-0x529F = 0x3879
-0x52A0 = 0x3243
-0x52A3 = 0x4E74
-0x52A9 = 0x3D75
-0x52AA = 0x4558
-0x52AB = 0x3965
-0x52AC = 0x5222
-0x52AD = 0x5223
-0x52B1 = 0x4E65
-0x52B4 = 0x4F2B
-0x52B5 = 0x5225
-0x52B9 = 0x387A
-0x52BC = 0x5224
-0x52BE = 0x332F
-0x52C1 = 0x5226
-0x52C3 = 0x4B56
-0x52C5 = 0x443C
-0x52C7 = 0x4D26
-0x52C9 = 0x4A59
-0x52CD = 0x5227
-0x52D2 = 0x7055
-0x52D5 = 0x4630
-0x52D7 = 0x5228
-0x52D8 = 0x342A
-0x52D9 = 0x4C33
-0x52DD = 0x3E21
-0x52DE = 0x5229
-0x52DF = 0x4A67
-0x52E0 = 0x522D
-0x52E2 = 0x402A
-0x52E3 = 0x522A
-0x52E4 = 0x3650
-0x52E6 = 0x522B
-0x52E7 = 0x342B
-0x52F2 = 0x372E
-0x52F3 = 0x522E
-0x52F5 = 0x522F
-0x52F8 = 0x5230
-0x52F9 = 0x5231
-0x52FA = 0x3C5B
-0x52FE = 0x387B
-0x52FF = 0x4C5E
-0x5301 = 0x4C68
-0x5302 = 0x4677
-0x5305 = 0x4A71
-0x5306 = 0x5232
-0x5308 = 0x5233
-0x530D = 0x5235
-0x530F = 0x5237
-0x5310 = 0x5236
-0x5315 = 0x5238
-0x5316 = 0x323D
-0x5317 = 0x4B4C
-0x5319 = 0x3A7C
-0x531A = 0x5239
-0x531D = 0x4159
-0x5320 = 0x3E22
-0x5321 = 0x3629
-0x5323 = 0x523A
-0x532A = 0x485B
-0x532F = 0x523B
-0x5331 = 0x523C
-0x5333 = 0x523D
-0x5338 = 0x523E
-0x5339 = 0x4924
-0x533A = 0x3668
-0x533B = 0x3065
-0x533F = 0x463F
-0x5340 = 0x523F
-0x5341 = 0x3D3D
-0x5343 = 0x4069
-0x5345 = 0x5241
-0x5346 = 0x5240
-0x5347 = 0x3E23
-0x5348 = 0x3861
-0x5349 = 0x5243
-0x534A = 0x483E
-0x534D = 0x5244
-0x5351 = 0x485C
-0x5352 = 0x4234
-0x5353 = 0x426E
-0x5354 = 0x3628
-0x5357 = 0x466E
-0x5358 = 0x4331
-0x535A = 0x476E
-0x535C = 0x4B4E
-0x535E = 0x5246
-0x5360 = 0x406A
-0x5366 = 0x3735
-0x5369 = 0x5247
-0x536E = 0x5248
-0x536F = 0x312C
-0x5370 = 0x3075
-0x5371 = 0x346D
-0x5373 = 0x4228
-0x5374 = 0x3551
-0x5375 = 0x4D71
-0x5377 = 0x524B
-0x5378 = 0x3237
-0x537B = 0x524A
-0x537F = 0x362A
-0x5382 = 0x524C
-0x5384 = 0x4C71
-0x5396 = 0x524D
-0x5398 = 0x4E52
-0x539A = 0x387C
-0x539F = 0x3836
-0x53A0 = 0x524E
-0x53A5 = 0x5250
-0x53A6 = 0x524F
-0x53A8 = 0x3F5F
-0x53A9 = 0x3139
-0x53AD = 0x315E
-0x53AE = 0x5251
-0x53B0 = 0x5252
-0x53B3 = 0x3837
-0x53B6 = 0x5253
-0x53BB = 0x356E
-0x53C2 = 0x3B32
-0x53C3 = 0x5254
-0x53C8 = 0x4B74
-0x53C9 = 0x3A35
-0x53CA = 0x355A
-0x53CB = 0x4D27
-0x53CC = 0x4150
-0x53CD = 0x483F
-0x53CE = 0x3C7D
-0x53D4 = 0x3D47
-0x53D6 = 0x3C68
-0x53D7 = 0x3C75
-0x53D9 = 0x3D76
-0x53DB = 0x4840
-0x53DF = 0x5257
-0x53E1 = 0x3143
-0x53E2 = 0x4151
-0x53E3 = 0x387D
-0x53E4 = 0x3845
-0x53E5 = 0x3667
-0x53E8 = 0x525B
-0x53E9 = 0x4321
-0x53EA = 0x427E
-0x53EB = 0x362B
-0x53EC = 0x3E24
-0x53ED = 0x525C
-0x53EE = 0x525A
-0x53EF = 0x3244
-0x53F0 = 0x4266
-0x53F1 = 0x3C38
-0x53F2 = 0x3B4B
-0x53F3 = 0x3126
-0x53F6 = 0x3370
-0x53F7 = 0x3966
-0x53F8 = 0x3B4A
-0x53FA = 0x525D
-0x5401 = 0x525E
-0x5403 = 0x3549
-0x5404 = 0x3346
-0x5408 = 0x3967
-0x5409 = 0x3548
-0x540A = 0x445F
-0x540B = 0x3125
-0x540C = 0x4631
-0x540D = 0x4C3E
-0x540E = 0x3921
-0x540F = 0x4D79
-0x5410 = 0x4547
-0x5411 = 0x387E
-0x541B = 0x372F
-0x541D = 0x5267
-0x541F = 0x3663
-0x5420 = 0x4B4A
-0x5426 = 0x485D
-0x5429 = 0x5266
-0x542B = 0x345E
-0x542C = 0x5261
-0x542D = 0x5262
-0x542E = 0x5264
-0x5436 = 0x5265
-0x5438 = 0x355B
-0x5439 = 0x3F61
-0x543B = 0x4A2D
-0x543C = 0x5263
-0x543D = 0x525F
-0x543E = 0x3863
-0x5440 = 0x5260
-0x5442 = 0x4F24
-0x5446 = 0x4A72
-0x5448 = 0x4468
-0x5449 = 0x3862
-0x544A = 0x3970
-0x544E = 0x5268
-0x5451 = 0x465D
-0x545F = 0x526C
-0x5468 = 0x3C7E
-0x546A = 0x3C76
-0x5470 = 0x526F
-0x5471 = 0x526D
-0x5473 = 0x4C23
-0x5475 = 0x526A
-0x5476 = 0x5273
-0x5477 = 0x526E
-0x547B = 0x5271
-0x547C = 0x3846
-0x547D = 0x4C3F
-0x5480 = 0x5272
-0x5484 = 0x5274
-0x5486 = 0x5276
-0x548B = 0x3A70
-0x548C = 0x4F42
-0x548E = 0x526B
-0x548F = 0x5269
-0x5490 = 0x5275
-0x5492 = 0x5270
-0x54A2 = 0x5278
-0x54A4 = 0x5323
-0x54A5 = 0x527A
-0x54A8 = 0x527E
-0x54AB = 0x5321
-0x54AC = 0x527B
-0x54AF = 0x533E
-0x54B2 = 0x3A69
-0x54B3 = 0x3331
-0x54B8 = 0x5279
-0x54BC = 0x5325
-0x54BD = 0x3076
-0x54BE = 0x5324
-0x54C0 = 0x3025
-0x54C1 = 0x494A
-0x54C2 = 0x5322
-0x54C4 = 0x527C
-0x54C7 = 0x5277
-0x54C8 = 0x527D
-0x54C9 = 0x3A48
-0x54D8 = 0x5326
-0x54E1 = 0x3077
-0x54E2 = 0x532F
-0x54E5 = 0x5327
-0x54E6 = 0x5328
-0x54E8 = 0x3E25
-0x54E9 = 0x4B69
-0x54ED = 0x532D
-0x54EE = 0x532C
-0x54F2 = 0x452F
-0x54FA = 0x532E
-0x54FD = 0x532B
-0x5504 = 0x3134
-0x5506 = 0x3A36
-0x5507 = 0x3F30
-0x550F = 0x5329
-0x5510 = 0x4562
-0x5514 = 0x532A
-0x5516 = 0x3022
-0x552E = 0x5334
-0x552F = 0x4D23
-0x5531 = 0x3E27
-0x5533 = 0x533A
-0x5538 = 0x5339
-0x5539 = 0x5330
-0x553E = 0x4243
-0x5540 = 0x5331
-0x5544 = 0x426F
-0x5545 = 0x5336
-0x5546 = 0x3E26
-0x554C = 0x5333
-0x554F = 0x4C64
-0x5553 = 0x373C
-0x5556 = 0x5337
-0x5557 = 0x5338
-0x555C = 0x5335
-0x555D = 0x533B
-0x5563 = 0x5332
-0x557B = 0x5341
-0x557C = 0x5346
-0x557E = 0x5342
-0x5580 = 0x533D
-0x5583 = 0x5347
-0x5584 = 0x4131
-0x5587 = 0x5349
-0x5589 = 0x3922
-0x558A = 0x533F
-0x558B = 0x437D
-0x5598 = 0x5343
-0x5599 = 0x533C
-0x559A = 0x342D
-0x559C = 0x346E
-0x559D = 0x3365
-0x559E = 0x5344
-0x559F = 0x5340
-0x55A7 = 0x3776
-0x55A8 = 0x534A
-0x55A9 = 0x5348
-0x55AA = 0x4153
-0x55AB = 0x354A
-0x55AC = 0x362C
-0x55AE = 0x5345
-0x55B0 = 0x3674
-0x55B6 = 0x3144
-0x55C4 = 0x534E
-0x55C5 = 0x534C
-0x55C7 = 0x5427
-0x55D4 = 0x5351
-0x55DA = 0x534B
-0x55DC = 0x534F
-0x55DF = 0x534D
-0x55E3 = 0x3B4C
-0x55E4 = 0x5350
-0x55F7 = 0x5353
-0x55F9 = 0x5358
-0x55FD = 0x5356
-0x55FE = 0x5355
-0x5606 = 0x4332
-0x5609 = 0x3245
-0x5614 = 0x5352
-0x5616 = 0x5354
-0x5617 = 0x3E28
-0x5618 = 0x3133
-0x561B = 0x5357
-0x5629 = 0x325E
-0x562F = 0x5362
-0x5631 = 0x3E7C
-0x5632 = 0x535E
-0x5634 = 0x535C
-0x5636 = 0x535D
-0x5638 = 0x535F
-0x5642 = 0x313D
-0x564C = 0x4139
-0x564E = 0x5359
-0x5650 = 0x535A
-0x565B = 0x337A
-0x5664 = 0x5361
-0x5668 = 0x346F
-0x566A = 0x5364
-0x566B = 0x5360
-0x566C = 0x5363
-0x5674 = 0x4A2E
-0x5678 = 0x4655
-0x567A = 0x4838
-0x5680 = 0x5366
-0x5686 = 0x5365
-0x5687 = 0x3345
-0x568A = 0x5367
-0x568F = 0x536A
-0x5694 = 0x5369
-0x56A0 = 0x5368
-0x56A2 = 0x4739
-0x56A5 = 0x536B
-0x56AE = 0x536C
-0x56B4 = 0x536E
-0x56B6 = 0x536D
-0x56BC = 0x5370
-0x56C0 = 0x5373
-0x56C1 = 0x5371
-0x56C2 = 0x536F
-0x56C3 = 0x5372
-0x56C8 = 0x5374
-0x56CE = 0x5375
-0x56D1 = 0x5376
-0x56D3 = 0x5377
-0x56D7 = 0x5378
-0x56D8 = 0x5145
-0x56DA = 0x3C7C
-0x56DB = 0x3B4D
-0x56DE = 0x3273
-0x56E0 = 0x3078
-0x56E3 = 0x4344
-0x56EE = 0x5379
-0x56F0 = 0x3A24
-0x56F2 = 0x304F
-0x56F3 = 0x3F5E
-0x56F9 = 0x537A
-0x56FA = 0x3847
-0x56FD = 0x3971
-0x56FF = 0x537C
-0x5700 = 0x537B
-0x5703 = 0x4A60
-0x5704 = 0x537D
-0x5708 = 0x5421
-0x5709 = 0x537E
-0x570B = 0x5422
-0x570D = 0x5423
-0x570F = 0x3777
-0x5712 = 0x3160
-0x5713 = 0x5424
-0x5716 = 0x5426
-0x5718 = 0x5425
-0x571C = 0x5428
-0x571F = 0x455A
-0x5726 = 0x5429
-0x5727 = 0x3035
-0x5728 = 0x3A5F
-0x572D = 0x373D
-0x5730 = 0x434F
-0x5737 = 0x542A
-0x5738 = 0x542B
-0x573B = 0x542D
-0x5740 = 0x542E
-0x5742 = 0x3A64
-0x5747 = 0x3651
-0x574A = 0x4B37
-0x574E = 0x542C
-0x574F = 0x542F
-0x5750 = 0x3A41
-0x5751 = 0x3923
-0x5761 = 0x5433
-0x5764 = 0x3A25
-0x5766 = 0x4333
-0x5769 = 0x5430
-0x576A = 0x445A
-0x577F = 0x5434
-0x5782 = 0x3F62
-0x5788 = 0x5432
-0x5789 = 0x5435
-0x578B = 0x373F
-0x5793 = 0x5436
-0x57A0 = 0x5437
-0x57A2 = 0x3924
-0x57A3 = 0x3340
-0x57A4 = 0x5439
-0x57AA = 0x543A
-0x57B0 = 0x543B
-0x57B3 = 0x5438
-0x57C0 = 0x5431
-0x57C3 = 0x543C
-0x57C6 = 0x543D
-0x57CB = 0x4B64
-0x57CE = 0x3E6B
-0x57D2 = 0x543F
-0x57D3 = 0x5440
-0x57D4 = 0x543E
-0x57D6 = 0x5442
-0x57DC = 0x4738
-0x57DF = 0x3068
-0x57E0 = 0x4956
-0x57E3 = 0x5443
-0x57F4 = 0x3E7D
-0x57F7 = 0x3C39
-0x57F9 = 0x475D
-0x57FA = 0x3470
-0x57FC = 0x3A6B
-0x5800 = 0x4B59
-0x5802 = 0x4632
-0x5805 = 0x3778
-0x5806 = 0x424F
-0x580A = 0x5441
-0x580B = 0x5444
-0x5815 = 0x4244
-0x5819 = 0x5445
-0x581D = 0x5446
-0x5821 = 0x5448
-0x5824 = 0x4469
-0x582A = 0x342E
-0x582F = 0x7421
-0x5830 = 0x3161
-0x5831 = 0x4A73
-0x5834 = 0x3E6C
-0x5835 = 0x4548
-0x583A = 0x3A66
-0x583D = 0x544E
-0x5840 = 0x4A3D
-0x5841 = 0x4E5D
-0x584A = 0x3274
-0x584B = 0x544A
-0x5851 = 0x413A
-0x5852 = 0x544D
-0x5854 = 0x4563
-0x5857 = 0x4549
-0x5858 = 0x4564
-0x5859 = 0x4839
-0x585A = 0x444D
-0x585E = 0x3A49
-0x5862 = 0x5449
-0x5869 = 0x3176
-0x586B = 0x4536
-0x5870 = 0x544B
-0x5872 = 0x5447
-0x5875 = 0x3F50
-0x5879 = 0x544F
-0x587E = 0x3D4E
-0x5883 = 0x362D
-0x5885 = 0x5450
-0x5893 = 0x4A68
-0x5897 = 0x417D
-0x589C = 0x4446
-0x589F = 0x5452
-0x58A8 = 0x4B4F
-0x58AB = 0x5453
-0x58AE = 0x5458
-0x58B3 = 0x4A2F
-0x58B8 = 0x5457
-0x58B9 = 0x5451
-0x58BA = 0x5454
-0x58BB = 0x5456
-0x58BE = 0x3A26
-0x58C1 = 0x4A49
-0x58C5 = 0x5459
-0x58C7 = 0x4345
-0x58CA = 0x3275
-0x58CC = 0x3E6D
-0x58D1 = 0x545B
-0x58D3 = 0x545A
-0x58D5 = 0x3968
-0x58D7 = 0x545C
-0x58D8 = 0x545E
-0x58D9 = 0x545D
-0x58DC = 0x5460
-0x58DE = 0x5455
-0x58DF = 0x5462
-0x58E4 = 0x5461
-0x58E5 = 0x545F
-0x58EB = 0x3B4E
-0x58EC = 0x3F51
-0x58EE = 0x4154
-0x58EF = 0x5463
-0x58F0 = 0x403C
-0x58F1 = 0x306D
-0x58F2 = 0x4764
-0x58F7 = 0x445B
-0x58F9 = 0x5465
-0x58FA = 0x5464
-0x58FB = 0x5466
-0x58FC = 0x5467
-0x58FD = 0x5468
-0x5902 = 0x5469
-0x5909 = 0x4A51
-0x590A = 0x546A
-0x590F = 0x3246
-0x5910 = 0x546B
-0x5915 = 0x4D3C
-0x5916 = 0x3330
-0x5918 = 0x5249
-0x5919 = 0x3D48
-0x591A = 0x423F
-0x591B = 0x546C
-0x591C = 0x4C6B
-0x5922 = 0x4C34
-0x5925 = 0x546E
-0x5927 = 0x4267
-0x5929 = 0x4537
-0x592A = 0x4240
-0x592B = 0x4957
-0x592C = 0x546F
-0x592D = 0x5470
-0x592E = 0x317B
-0x5931 = 0x3C3A
-0x5932 = 0x5471
-0x5937 = 0x3050
-0x5938 = 0x5472
-0x593E = 0x5473
-0x5944 = 0x3162
-0x5947 = 0x3471
-0x5948 = 0x4660
-0x5949 = 0x4A74
-0x594E = 0x5477
-0x594F = 0x4155
-0x5950 = 0x5476
-0x5951 = 0x3740
-0x5954 = 0x4B5B
-0x5955 = 0x5475
-0x5957 = 0x4565
-0x5958 = 0x5479
-0x595A = 0x5478
-0x5960 = 0x547B
-0x5962 = 0x547A
-0x5965 = 0x317C
-0x5967 = 0x547C
-0x5968 = 0x3E29
-0x5969 = 0x547E
-0x596A = 0x4325
-0x596C = 0x547D
-0x596E = 0x4A33
-0x5973 = 0x3D77
-0x5974 = 0x455B
-0x5978 = 0x5521
-0x597D = 0x3925
-0x5981 = 0x5522
-0x5982 = 0x4721
-0x5983 = 0x485E
-0x5984 = 0x4C51
-0x598A = 0x4725
-0x598D = 0x552B
-0x5993 = 0x3538
-0x5996 = 0x4D45
-0x5999 = 0x4C2F
-0x599B = 0x562C
-0x599D = 0x5523
-0x59A3 = 0x5526
-0x59A5 = 0x4245
-0x59A8 = 0x4B38
-0x59AC = 0x454A
-0x59B2 = 0x5527
-0x59B9 = 0x4B65
-0x59BB = 0x3A4A
-0x59BE = 0x3E2A
-0x59C6 = 0x5528
-0x59C9 = 0x3B50
-0x59CB = 0x3B4F
-0x59D0 = 0x3039
-0x59D1 = 0x3848
-0x59D3 = 0x402B
-0x59D4 = 0x3051
-0x59D9 = 0x552C
-0x59DA = 0x552D
-0x59DC = 0x552A
-0x59E5 = 0x3138
-0x59E6 = 0x342F
-0x59E8 = 0x5529
-0x59EA = 0x4C45
-0x59EB = 0x4931
-0x59F6 = 0x3028
-0x59FB = 0x3079
-0x59FF = 0x3B51
-0x5A01 = 0x3052
-0x5A03 = 0x3023
-0x5A09 = 0x5532
-0x5A11 = 0x5530
-0x5A18 = 0x4C3C
-0x5A1A = 0x5533
-0x5A1C = 0x5531
-0x5A1F = 0x552F
-0x5A20 = 0x3F31
-0x5A25 = 0x552E
-0x5A29 = 0x4A5A
-0x5A2F = 0x3864
-0x5A35 = 0x5537
-0x5A36 = 0x5538
-0x5A3C = 0x3E2B
-0x5A40 = 0x5534
-0x5A41 = 0x4F2C
-0x5A46 = 0x474C
-0x5A49 = 0x5536
-0x5A5A = 0x3A27
-0x5A62 = 0x5539
-0x5A66 = 0x4958
-0x5A6A = 0x553A
-0x5A6C = 0x5535
-0x5A7F = 0x4C3B
-0x5A92 = 0x475E
-0x5A9A = 0x553B
-0x5A9B = 0x4932
-0x5ABC = 0x553C
-0x5ABD = 0x5540
-0x5ABE = 0x553D
-0x5AC1 = 0x3247
-0x5AC2 = 0x553F
-0x5AC9 = 0x3C3B
-0x5ACB = 0x553E
-0x5ACC = 0x3779
-0x5AD0 = 0x554C
-0x5AD6 = 0x5545
-0x5AD7 = 0x5542
-0x5AE1 = 0x4364
-0x5AE3 = 0x5541
-0x5AE6 = 0x5543
-0x5AE9 = 0x5544
-0x5AFA = 0x5546
-0x5AFB = 0x5547
-0x5B09 = 0x3472
-0x5B0B = 0x5549
-0x5B0C = 0x5548
-0x5B16 = 0x554A
-0x5B22 = 0x3E6E
-0x5B2A = 0x554D
-0x5B2C = 0x445C
-0x5B30 = 0x3145
-0x5B32 = 0x554B
-0x5B36 = 0x554E
-0x5B3E = 0x554F
-0x5B40 = 0x5552
-0x5B43 = 0x5550
-0x5B45 = 0x5551
-0x5B50 = 0x3B52
-0x5B51 = 0x5553
-0x5B54 = 0x3926
-0x5B55 = 0x5554
-0x5B57 = 0x3B7A
-0x5B58 = 0x4238
-0x5B5A = 0x5555
-0x5B5B = 0x5556
-0x5B5C = 0x3B5A
-0x5B5D = 0x3927
-0x5B5F = 0x4C52
-0x5B63 = 0x3528
-0x5B64 = 0x3849
-0x5B65 = 0x5557
-0x5B66 = 0x3358
-0x5B69 = 0x5558
-0x5B6B = 0x4239
-0x5B70 = 0x5559
-0x5B71 = 0x5623
-0x5B73 = 0x555A
-0x5B75 = 0x555B
-0x5B78 = 0x555C
-0x5B7A = 0x555E
-0x5B80 = 0x555F
-0x5B83 = 0x5560
-0x5B85 = 0x4270
-0x5B87 = 0x3127
-0x5B88 = 0x3C69
-0x5B89 = 0x3042
-0x5B8B = 0x4157
-0x5B8C = 0x3430
-0x5B8D = 0x3C35
-0x5B8F = 0x3928
-0x5B95 = 0x4566
-0x5B97 = 0x3D21
-0x5B98 = 0x3431
-0x5B99 = 0x4368
-0x5B9A = 0x446A
-0x5B9B = 0x3038
-0x5B9C = 0x3539
-0x5B9D = 0x4A75
-0x5B9F = 0x3C42
-0x5BA2 = 0x3552
-0x5BA3 = 0x406B
-0x5BA4 = 0x3C3C
-0x5BA5 = 0x4D28
-0x5BA6 = 0x5561
-0x5BAE = 0x355C
-0x5BB0 = 0x3A4B
-0x5BB3 = 0x3332
-0x5BB4 = 0x3163
-0x5BB5 = 0x3E2C
-0x5BB6 = 0x3248
-0x5BB8 = 0x5562
-0x5BB9 = 0x4D46
-0x5BBF = 0x3D49
-0x5BC2 = 0x3C64
-0x5BC3 = 0x5563
-0x5BC4 = 0x3473
-0x5BC5 = 0x4652
-0x5BC6 = 0x4C29
-0x5BC7 = 0x5564
-0x5BC9 = 0x5565
-0x5BCC = 0x4959
-0x5BD0 = 0x5567
-0x5BD2 = 0x3428
-0x5BD3 = 0x3677
-0x5BD4 = 0x5566
-0x5BDB = 0x3432
-0x5BDD = 0x3F32
-0x5BDE = 0x556B
-0x5BDF = 0x3B21
-0x5BE1 = 0x3249
-0x5BE2 = 0x556A
-0x5BE4 = 0x5568
-0x5BE5 = 0x556C
-0x5BE6 = 0x5569
-0x5BE7 = 0x472B
-0x5BE8 = 0x5C4D
-0x5BE9 = 0x3F33
-0x5BEB = 0x556D
-0x5BEE = 0x4E40
-0x5BF0 = 0x556E
-0x5BF3 = 0x5570
-0x5BF5 = 0x437E
-0x5BF6 = 0x556F
-0x5BF8 = 0x4023
-0x5BFA = 0x3B7B
-0x5BFE = 0x4250
-0x5BFF = 0x3C77
-0x5C01 = 0x4975
-0x5C02 = 0x406C
-0x5C04 = 0x3C4D
-0x5C05 = 0x5571
-0x5C06 = 0x3E2D
-0x5C07 = 0x5572
-0x5C08 = 0x5573
-0x5C09 = 0x3053
-0x5C0A = 0x423A
-0x5C0B = 0x3F52
-0x5C0D = 0x5574
-0x5C0E = 0x4633
-0x5C0F = 0x3E2E
-0x5C11 = 0x3E2F
-0x5C13 = 0x5575
-0x5C16 = 0x406D
-0x5C1A = 0x3E30
-0x5C20 = 0x5576
-0x5C22 = 0x5577
-0x5C24 = 0x4C60
-0x5C28 = 0x5578
-0x5C2D = 0x3646
-0x5C31 = 0x3D22
-0x5C38 = 0x5579
-0x5C39 = 0x557A
-0x5C3A = 0x3C5C
-0x5C3B = 0x3F2C
-0x5C3C = 0x4674
-0x5C3D = 0x3F54
-0x5C3E = 0x4878
-0x5C3F = 0x4722
-0x5C40 = 0x3649
-0x5C41 = 0x557B
-0x5C45 = 0x356F
-0x5C46 = 0x557C
-0x5C48 = 0x367E
-0x5C4A = 0x464F
-0x5C4B = 0x3230
-0x5C4D = 0x3B53
-0x5C4E = 0x557D
-0x5C4F = 0x5622
-0x5C50 = 0x5621
-0x5C51 = 0x367D
-0x5C53 = 0x557E
-0x5C55 = 0x4538
-0x5C5E = 0x4230
-0x5C60 = 0x454B
-0x5C61 = 0x3C48
-0x5C64 = 0x4158
-0x5C65 = 0x4D7A
-0x5C6C = 0x5624
-0x5C6E = 0x5625
-0x5C6F = 0x4656
-0x5C71 = 0x3B33
-0x5C76 = 0x5627
-0x5C79 = 0x5628
-0x5C8C = 0x5629
-0x5C90 = 0x3474
-0x5C91 = 0x562A
-0x5C94 = 0x562B
-0x5CA1 = 0x322C
-0x5CA8 = 0x413B
-0x5CA9 = 0x3464
-0x5CAB = 0x562D
-0x5CAC = 0x4C28
-0x5CB1 = 0x4252
-0x5CB3 = 0x3359
-0x5CB6 = 0x562F
-0x5CB7 = 0x5631
-0x5CB8 = 0x345F
-0x5CBB = 0x562E
-0x5CBC = 0x5630
-0x5CBE = 0x5633
-0x5CC5 = 0x5632
-0x5CC7 = 0x5634
-0x5CD9 = 0x5635
-0x5CE0 = 0x463D
-0x5CE1 = 0x362E
-0x5CE8 = 0x3265
-0x5CE9 = 0x5636
-0x5CEA = 0x563B
-0x5CED = 0x5639
-0x5CEF = 0x4A77
-0x5CF0 = 0x4A76
-0x5CF6 = 0x4567
-0x5CFA = 0x5638
-0x5CFB = 0x3D54
-0x5CFD = 0x5637
-0x5D07 = 0x3F72
-0x5D0B = 0x563C
-0x5D0E = 0x3A6A
-0x5D11 = 0x5642
-0x5D14 = 0x5643
-0x5D15 = 0x563D
-0x5D16 = 0x3333
-0x5D17 = 0x563E
-0x5D18 = 0x5647
-0x5D19 = 0x5646
-0x5D1A = 0x5645
-0x5D1B = 0x5641
-0x5D1F = 0x5640
-0x5D22 = 0x5644
-0x5D29 = 0x4A78
-0x5D4B = 0x564B
-0x5D4C = 0x5648
-0x5D4E = 0x564A
-0x5D50 = 0x4D72
-0x5D52 = 0x5649
-0x5D5C = 0x563F
-0x5D69 = 0x3F73
-0x5D6C = 0x564C
-0x5D6F = 0x3A37
-0x5D73 = 0x564D
-0x5D76 = 0x564E
-0x5D82 = 0x5651
-0x5D84 = 0x5650
-0x5D87 = 0x564F
-0x5D8B = 0x4568
-0x5D8C = 0x563A
-0x5D90 = 0x5657
-0x5D9D = 0x5653
-0x5DA2 = 0x5652
-0x5DAC = 0x5654
-0x5DAE = 0x5655
-0x5DB7 = 0x5658
-0x5DBA = 0x4E66
-0x5DBC = 0x5659
-0x5DBD = 0x5656
-0x5DC9 = 0x565A
-0x5DCC = 0x3460
-0x5DCD = 0x565B
-0x5DD2 = 0x565D
-0x5DD3 = 0x565C
-0x5DD6 = 0x565E
-0x5DDB = 0x565F
-0x5DDD = 0x406E
-0x5DDE = 0x3D23
-0x5DE1 = 0x3D64
-0x5DE3 = 0x4163
-0x5DE5 = 0x3929
-0x5DE6 = 0x3A38
-0x5DE7 = 0x392A
-0x5DE8 = 0x3570
-0x5DEB = 0x5660
-0x5DEE = 0x3A39
-0x5DF1 = 0x384A
-0x5DF2 = 0x5661
-0x5DF3 = 0x4C26
-0x5DF4 = 0x4743
-0x5DF5 = 0x5662
-0x5DF7 = 0x392B
-0x5DFB = 0x342C
-0x5DFD = 0x4327
-0x5DFE = 0x3652
-0x5E02 = 0x3B54
-0x5E03 = 0x495B
-0x5E06 = 0x4841
-0x5E0B = 0x5663
-0x5E0C = 0x3475
-0x5E11 = 0x5666
-0x5E16 = 0x4421
-0x5E19 = 0x5665
-0x5E1A = 0x5664
-0x5E1B = 0x5667
-0x5E1D = 0x446B
-0x5E25 = 0x3F63
-0x5E2B = 0x3B55
-0x5E2D = 0x404A
-0x5E2F = 0x4253
-0x5E30 = 0x3522
-0x5E33 = 0x4422
-0x5E36 = 0x5668
-0x5E37 = 0x5669
-0x5E38 = 0x3E6F
-0x5E3D = 0x4B39
-0x5E40 = 0x566C
-0x5E43 = 0x566B
-0x5E44 = 0x566A
-0x5E45 = 0x497D
-0x5E47 = 0x5673
-0x5E4C = 0x4B5A
-0x5E4E = 0x566D
-0x5E54 = 0x566F
-0x5E55 = 0x4B6B
-0x5E57 = 0x566E
-0x5E5F = 0x5670
-0x5E61 = 0x4828
-0x5E62 = 0x5671
-0x5E63 = 0x4A3E
-0x5E64 = 0x5672
-0x5E72 = 0x3433
-0x5E73 = 0x4A3F
-0x5E74 = 0x472F
-0x5E75 = 0x5674
-0x5E76 = 0x5675
-0x5E78 = 0x392C
-0x5E79 = 0x3434
-0x5E7A = 0x5676
-0x5E7B = 0x3838
-0x5E7C = 0x4D44
-0x5E7D = 0x4D29
-0x5E7E = 0x3476
-0x5E7F = 0x5678
-0x5E81 = 0x4423
-0x5E83 = 0x392D
-0x5E84 = 0x3E31
-0x5E87 = 0x485F
-0x5E8A = 0x3E32
-0x5E8F = 0x3D78
-0x5E95 = 0x446C
-0x5E96 = 0x4A79
-0x5E97 = 0x4539
-0x5E9A = 0x392E
-0x5E9C = 0x495C
-0x5EA0 = 0x5679
-0x5EA6 = 0x4559
-0x5EA7 = 0x3A42
-0x5EAB = 0x384B
-0x5EAD = 0x446D
-0x5EB5 = 0x3043
-0x5EB6 = 0x3D6E
-0x5EB7 = 0x392F
-0x5EB8 = 0x4D47
-0x5EC1 = 0x567A
-0x5EC2 = 0x567B
-0x5EC3 = 0x4751
-0x5EC8 = 0x567C
-0x5EC9 = 0x4E77
-0x5ECA = 0x4F2D
-0x5ECF = 0x567E
-0x5ED0 = 0x567D
-0x5ED3 = 0x3347
-0x5ED6 = 0x5721
-0x5EDA = 0x5724
-0x5EDB = 0x5725
-0x5EDD = 0x5723
-0x5EDF = 0x4940
-0x5EE0 = 0x3E33
-0x5EE1 = 0x5727
-0x5EE2 = 0x5726
-0x5EE3 = 0x5722
-0x5EE8 = 0x5728
-0x5EE9 = 0x5729
-0x5EEC = 0x572A
-0x5EF0 = 0x572D
-0x5EF1 = 0x572B
-0x5EF3 = 0x572C
-0x5EF4 = 0x572E
-0x5EF6 = 0x3164
-0x5EF7 = 0x446E
-0x5EF8 = 0x572F
-0x5EFA = 0x377A
-0x5EFB = 0x3276
-0x5EFC = 0x4736
-0x5EFE = 0x5730
-0x5EFF = 0x467B
-0x5F01 = 0x4A5B
-0x5F03 = 0x5731
-0x5F04 = 0x4F2E
-0x5F09 = 0x5732
-0x5F0A = 0x4A40
-0x5F0B = 0x5735
-0x5F0C = 0x5021
-0x5F0D = 0x5031
-0x5F0F = 0x3C30
-0x5F10 = 0x4675
-0x5F11 = 0x5736
-0x5F13 = 0x355D
-0x5F14 = 0x4424
-0x5F15 = 0x307A
-0x5F16 = 0x5737
-0x5F17 = 0x4A26
-0x5F18 = 0x3930
-0x5F1B = 0x4350
-0x5F1F = 0x446F
-0x5F25 = 0x4C6F
-0x5F26 = 0x3839
-0x5F27 = 0x384C
-0x5F29 = 0x5738
-0x5F2D = 0x5739
-0x5F2F = 0x573F
-0x5F31 = 0x3C65
-0x5F35 = 0x4425
-0x5F37 = 0x362F
-0x5F38 = 0x573A
-0x5F3C = 0x492B
-0x5F3E = 0x4346
-0x5F41 = 0x573B
-0x5F48 = 0x573C
-0x5F4A = 0x3630
-0x5F4C = 0x573D
-0x5F4E = 0x573E
-0x5F51 = 0x5740
-0x5F53 = 0x4576
-0x5F56 = 0x5741
-0x5F57 = 0x5742
-0x5F59 = 0x5743
-0x5F5C = 0x5734
-0x5F5D = 0x5733
-0x5F61 = 0x5744
-0x5F62 = 0x3741
-0x5F66 = 0x4927
-0x5F69 = 0x3A4C
-0x5F6A = 0x4937
-0x5F6B = 0x4426
-0x5F6C = 0x494B
-0x5F6D = 0x5745
-0x5F70 = 0x3E34
-0x5F71 = 0x3146
-0x5F73 = 0x5746
-0x5F77 = 0x5747
-0x5F79 = 0x4C72
-0x5F7C = 0x4860
-0x5F7F = 0x574A
-0x5F80 = 0x317D
-0x5F81 = 0x402C
-0x5F82 = 0x5749
-0x5F83 = 0x5748
-0x5F84 = 0x3742
-0x5F85 = 0x4254
-0x5F87 = 0x574E
-0x5F88 = 0x574C
-0x5F8A = 0x574B
-0x5F8B = 0x4E27
-0x5F8C = 0x3865
-0x5F90 = 0x3D79
-0x5F91 = 0x574D
-0x5F92 = 0x454C
-0x5F93 = 0x3D3E
-0x5F97 = 0x4640
-0x5F98 = 0x5751
-0x5F99 = 0x5750
-0x5F9E = 0x574F
-0x5FA0 = 0x5752
-0x5FA1 = 0x3866
-0x5FA8 = 0x5753
-0x5FA9 = 0x497C
-0x5FAA = 0x3D5B
-0x5FAD = 0x5754
-0x5FAE = 0x4879
-0x5FB3 = 0x4641
-0x5FB4 = 0x4427
-0x5FB9 = 0x4530
-0x5FBC = 0x5755
-0x5FBD = 0x352B
-0x5FC3 = 0x3F34
-0x5FC5 = 0x492C
-0x5FCC = 0x3477
-0x5FCD = 0x4726
-0x5FD6 = 0x5756
-0x5FD7 = 0x3B56
-0x5FD8 = 0x4B3A
-0x5FD9 = 0x4B3B
-0x5FDC = 0x317E
-0x5FDD = 0x575B
-0x5FE0 = 0x4369
-0x5FE4 = 0x5758
-0x5FEB = 0x3277
-0x5FF0 = 0x582D
-0x5FF1 = 0x575A
-0x5FF5 = 0x4730
-0x5FF8 = 0x5759
-0x5FFB = 0x5757
-0x5FFD = 0x397A
-0x5FFF = 0x575D
-0x600E = 0x5763
-0x600F = 0x5769
-0x6010 = 0x5761
-0x6012 = 0x455C
-0x6015 = 0x5766
-0x6016 = 0x495D
-0x6019 = 0x5760
-0x601B = 0x5765
-0x601C = 0x4E67
-0x601D = 0x3B57
-0x6020 = 0x4255
-0x6021 = 0x575E
-0x6025 = 0x355E
-0x6026 = 0x5768
-0x6027 = 0x402D
-0x6028 = 0x3165
-0x6029 = 0x5762
-0x602A = 0x3278
-0x602B = 0x5767
-0x602F = 0x3631
-0x6031 = 0x5764
-0x603A = 0x576A
-0x6041 = 0x576C
-0x6042 = 0x5776
-0x6043 = 0x5774
-0x6046 = 0x5771
-0x604A = 0x5770
-0x604B = 0x4E78
-0x604D = 0x5772
-0x6050 = 0x3632
-0x6052 = 0x3931
-0x6055 = 0x3D7A
-0x6059 = 0x5779
-0x605A = 0x576B
-0x605F = 0x576F
-0x6060 = 0x575F
-0x6062 = 0x327A
-0x6063 = 0x5773
-0x6064 = 0x5775
-0x6065 = 0x4351
-0x6068 = 0x3A28
-0x6069 = 0x3238
-0x606A = 0x576D
-0x606B = 0x5778
-0x606C = 0x5777
-0x606D = 0x3633
-0x606F = 0x4229
-0x6070 = 0x3366
-0x6075 = 0x3743
-0x6077 = 0x576E
-0x6081 = 0x577A
-0x6083 = 0x577D
-0x6084 = 0x5821
-0x6089 = 0x3C3D
-0x608B = 0x5827
-0x608C = 0x4470
-0x608D = 0x577B
-0x6092 = 0x5825
-0x6094 = 0x3279
-0x6096 = 0x5823
-0x6097 = 0x5824
-0x609A = 0x577E
-0x609B = 0x5822
-0x609F = 0x3867
-0x60A0 = 0x4D2A
-0x60A3 = 0x3435
-0x60A6 = 0x3159
-0x60A7 = 0x5826
-0x60A9 = 0x473A
-0x60AA = 0x302D
-0x60B2 = 0x4861
-0x60B3 = 0x575C
-0x60B4 = 0x582C
-0x60B5 = 0x5830
-0x60B6 = 0x4C65
-0x60B8 = 0x5829
-0x60BC = 0x4569
-0x60BD = 0x582E
-0x60C5 = 0x3E70
-0x60C6 = 0x582F
-0x60C7 = 0x4657
-0x60D1 = 0x4F47
-0x60D3 = 0x582B
-0x60D8 = 0x5831
-0x60DA = 0x397B
-0x60DC = 0x404B
-0x60DF = 0x3054
-0x60E0 = 0x582A
-0x60E1 = 0x5828
-0x60E3 = 0x415A
-0x60E7 = 0x577C
-0x60E8 = 0x3B34
-0x60F0 = 0x4246
-0x60F1 = 0x583D
-0x60F3 = 0x415B
-0x60F4 = 0x5838
-0x60F6 = 0x5835
-0x60F7 = 0x5836
-0x60F9 = 0x3C66
-0x60FA = 0x5839
-0x60FB = 0x583C
-0x6100 = 0x5837
-0x6101 = 0x3D25
-0x6103 = 0x583A
-0x6106 = 0x5834
-0x6108 = 0x4C7C
-0x6109 = 0x4C7B
-0x610D = 0x583E
-0x610E = 0x583F
-0x610F = 0x3055
-0x6115 = 0x5833
-0x611A = 0x3672
-0x611B = 0x3026
-0x611F = 0x3436
-0x6121 = 0x583B
-0x6127 = 0x5843
-0x6128 = 0x5842
-0x612C = 0x5847
-0x6134 = 0x5848
-0x613C = 0x5846
-0x613D = 0x5849
-0x613E = 0x5841
-0x613F = 0x5845
-0x6142 = 0x584A
-0x6144 = 0x584B
-0x6147 = 0x5840
-0x6148 = 0x3B7C
-0x614A = 0x5844
-0x614B = 0x4256
-0x614C = 0x3932
-0x614D = 0x5832
-0x614E = 0x3F35
-0x6153 = 0x5858
-0x6155 = 0x4A69
-0x6158 = 0x584E
-0x6159 = 0x584F
-0x615A = 0x5850
-0x615D = 0x5857
-0x615F = 0x5856
-0x6162 = 0x4B7D
-0x6163 = 0x3437
-0x6165 = 0x5854
-0x6167 = 0x3745
-0x6168 = 0x3334
-0x616B = 0x5851
-0x616E = 0x4E38
-0x616F = 0x5853
-0x6170 = 0x3056
-0x6171 = 0x5855
-0x6173 = 0x584C
-0x6174 = 0x5852
-0x6175 = 0x5859
-0x6176 = 0x3744
-0x6177 = 0x584D
-0x617E = 0x4D5D
-0x6182 = 0x4D2B
-0x6187 = 0x585C
-0x618A = 0x5860
-0x618E = 0x417E
-0x6190 = 0x4E79
-0x6191 = 0x5861
-0x6194 = 0x585E
-0x6196 = 0x585B
-0x6199 = 0x585A
-0x619A = 0x585F
-0x61A4 = 0x4A30
-0x61A7 = 0x4634
-0x61A9 = 0x3746
-0x61AB = 0x5862
-0x61AC = 0x585D
-0x61AE = 0x5863
-0x61B2 = 0x377B
-0x61B6 = 0x3231
-0x61BA = 0x586B
-0x61BE = 0x3438
-0x61C3 = 0x5869
-0x61C6 = 0x586A
-0x61C7 = 0x3A29
-0x61C8 = 0x5868
-0x61C9 = 0x5866
-0x61CA = 0x5865
-0x61CB = 0x586C
-0x61CC = 0x5864
-0x61CD = 0x586E
-0x61D0 = 0x327B
-0x61E3 = 0x5870
-0x61E6 = 0x586F
-0x61F2 = 0x4428
-0x61F4 = 0x5873
-0x61F6 = 0x5871
-0x61F7 = 0x5867
-0x61F8 = 0x377C
-0x61FA = 0x5872
-0x61FC = 0x5876
-0x61FD = 0x5875
-0x61FE = 0x5877
-0x61FF = 0x5874
-0x6200 = 0x5878
-0x6208 = 0x5879
-0x6209 = 0x587A
-0x620A = 0x4A6A
-0x620C = 0x587C
-0x620D = 0x587B
-0x620E = 0x3D3F
-0x6210 = 0x402E
-0x6211 = 0x3266
-0x6212 = 0x327C
-0x6214 = 0x587D
-0x6216 = 0x303F
-0x621A = 0x404C
-0x621B = 0x587E
-0x621D = 0x6C43
-0x621E = 0x5921
-0x621F = 0x3761
-0x6221 = 0x5922
-0x6226 = 0x406F
-0x622A = 0x5923
-0x622E = 0x5924
-0x622F = 0x353A
-0x6230 = 0x5925
-0x6232 = 0x5926
-0x6233 = 0x5927
-0x6234 = 0x4257
-0x6238 = 0x384D
-0x623B = 0x4C61
-0x623F = 0x4B3C
-0x6240 = 0x3D6A
-0x6241 = 0x5928
-0x6247 = 0x4070
-0x6248 = 0x6E3D
-0x6249 = 0x4862
-0x624B = 0x3C6A
-0x624D = 0x3A4D
-0x624E = 0x5929
-0x6253 = 0x4247
-0x6255 = 0x4A27
-0x6258 = 0x4271
-0x625B = 0x592C
-0x625E = 0x592A
-0x6260 = 0x592D
-0x6263 = 0x592B
-0x6268 = 0x592E
-0x626E = 0x4A31
-0x6271 = 0x3037
-0x6276 = 0x495E
-0x6279 = 0x4863
-0x627C = 0x592F
-0x627E = 0x5932
-0x627F = 0x3E35
-0x6280 = 0x353B
-0x6282 = 0x5930
-0x6283 = 0x5937
-0x6284 = 0x3E36
-0x6289 = 0x5931
-0x628A = 0x4744
-0x6291 = 0x4D5E
-0x6292 = 0x5933
-0x6293 = 0x5934
-0x6294 = 0x5938
-0x6295 = 0x456A
-0x6296 = 0x5935
-0x6297 = 0x3933
-0x6298 = 0x405E
-0x629B = 0x5946
-0x629C = 0x4834
-0x629E = 0x4272
-0x62AB = 0x4864
-0x62AC = 0x5A2D
-0x62B1 = 0x4A7A
-0x62B5 = 0x4471
-0x62B9 = 0x4B75
-0x62BB = 0x593B
-0x62BC = 0x3221
-0x62BD = 0x436A
-0x62C2 = 0x5944
-0x62C5 = 0x4334
-0x62C6 = 0x593E
-0x62C7 = 0x5945
-0x62C8 = 0x5940
-0x62C9 = 0x5947
-0x62CA = 0x5943
-0x62CC = 0x5942
-0x62CD = 0x476F
-0x62CF = 0x593C
-0x62D0 = 0x327D
-0x62D1 = 0x593A
-0x62D2 = 0x3571
-0x62D3 = 0x4273
-0x62D4 = 0x5936
-0x62D7 = 0x5939
-0x62D8 = 0x3934
-0x62D9 = 0x405B
-0x62DB = 0x3E37
-0x62DC = 0x5941
-0x62DD = 0x4752
-0x62E0 = 0x3572
-0x62E1 = 0x3348
-0x62EC = 0x3367
-0x62ED = 0x3F21
-0x62EE = 0x5949
-0x62EF = 0x594E
-0x62F1 = 0x594A
-0x62F3 = 0x377D
-0x62F5 = 0x594F
-0x62F6 = 0x3B22
-0x62F7 = 0x3969
-0x62FE = 0x3D26
-0x62FF = 0x593D
-0x6301 = 0x3B7D
-0x6302 = 0x594C
-0x6307 = 0x3B58
-0x6308 = 0x594D
-0x6309 = 0x3044
-0x630C = 0x5948
-0x6311 = 0x4429
-0x6319 = 0x3573
-0x631F = 0x3634
-0x6327 = 0x594B
-0x6328 = 0x3027
-0x632B = 0x3A43
-0x632F = 0x3F36
-0x633A = 0x4472
-0x633D = 0x4854
-0x633E = 0x5951
-0x633F = 0x415E
-0x6349 = 0x422A
-0x634C = 0x3B2B
-0x634D = 0x5952
-0x634F = 0x5954
-0x6350 = 0x5950
-0x6355 = 0x4A61
-0x6357 = 0x443D
-0x635C = 0x415C
-0x6367 = 0x4A7B
-0x6368 = 0x3C4E
-0x6369 = 0x5960
-0x636B = 0x595F
-0x636E = 0x3F78
-0x6372 = 0x377E
-0x6376 = 0x5959
-0x6377 = 0x3E39
-0x637A = 0x4668
-0x637B = 0x4731
-0x6380 = 0x5957
-0x6383 = 0x415D
-0x6388 = 0x3C78
-0x6389 = 0x595C
-0x638C = 0x3E38
-0x638E = 0x5956
-0x638F = 0x595B
-0x6392 = 0x4753
-0x6396 = 0x5955
-0x6398 = 0x3721
-0x639B = 0x335D
-0x639F = 0x595D
-0x63A0 = 0x4E2B
-0x63A1 = 0x3A4E
-0x63A2 = 0x4335
-0x63A3 = 0x595A
-0x63A5 = 0x405C
-0x63A7 = 0x3935
-0x63A8 = 0x3F64
-0x63A9 = 0x3166
-0x63AA = 0x413C
-0x63AB = 0x5958
-0x63AC = 0x3545
-0x63B2 = 0x3747
-0x63B4 = 0x444F
-0x63B5 = 0x595E
-0x63BB = 0x415F
-0x63BE = 0x5961
-0x63C0 = 0x5963
-0x63C3 = 0x4237
-0x63C4 = 0x5969
-0x63C6 = 0x5964
-0x63C9 = 0x5966
-0x63CF = 0x4941
-0x63D0 = 0x4473
-0x63D2 = 0x5967
-0x63D6 = 0x4D2C
-0x63DA = 0x4D48
-0x63DB = 0x3439
-0x63E1 = 0x302E
-0x63E3 = 0x5965
-0x63E9 = 0x5962
-0x63EE = 0x3478
-0x63F4 = 0x3167
-0x63F6 = 0x5968
-0x63FA = 0x4D49
-0x6406 = 0x596C
-0x640D = 0x423B
-0x640F = 0x5973
-0x6413 = 0x596D
-0x6416 = 0x596A
-0x6417 = 0x5971
-0x641C = 0x5953
-0x6426 = 0x596E
-0x6428 = 0x5972
-0x642C = 0x4842
-0x642D = 0x456B
-0x6434 = 0x596B
-0x6436 = 0x596F
-0x643A = 0x3748
-0x643E = 0x3A71
-0x6442 = 0x405D
-0x644E = 0x5977
-0x6458 = 0x4526
-0x6467 = 0x5974
-0x6469 = 0x4B60
-0x646F = 0x5975
-0x6476 = 0x5976
-0x6478 = 0x4C4E
-0x647A = 0x4022
-0x6483 = 0x3762
-0x6488 = 0x597D
-0x6492 = 0x3B35
-0x6493 = 0x597A
-0x6495 = 0x5979
-0x649A = 0x4732
-0x649E = 0x4635
-0x64A4 = 0x4531
-0x64A5 = 0x597B
-0x64A9 = 0x597C
-0x64AB = 0x496F
-0x64AD = 0x4745
-0x64AE = 0x3B23
-0x64B0 = 0x4071
-0x64B2 = 0x4B50
-0x64B9 = 0x3349
-0x64BB = 0x5A25
-0x64BC = 0x597E
-0x64C1 = 0x4D4A
-0x64C2 = 0x5A27
-0x64C5 = 0x5A23
-0x64C7 = 0x5A24
-0x64CD = 0x4160
-0x64D2 = 0x5A22
-0x64D4 = 0x593F
-0x64D8 = 0x5A26
-0x64DA = 0x5A21
-0x64E0 = 0x5A2B
-0x64E1 = 0x5A2C
-0x64E2 = 0x4527
-0x64E3 = 0x5A2E
-0x64E6 = 0x3B24
-0x64E7 = 0x5A29
-0x64EC = 0x353C
-0x64EF = 0x5A2F
-0x64F1 = 0x5A28
-0x64F2 = 0x5A33
-0x64F4 = 0x5A32
-0x64F6 = 0x5A31
-0x64FA = 0x5A34
-0x64FD = 0x5A36
-0x64FE = 0x3E71
-0x6500 = 0x5A35
-0x6505 = 0x5A39
-0x6518 = 0x5A37
-0x651C = 0x5A38
-0x651D = 0x5970
-0x6523 = 0x5A3B
-0x6524 = 0x5A3A
-0x652A = 0x5978
-0x652B = 0x5A3C
-0x652C = 0x5A30
-0x652F = 0x3B59
-0x6534 = 0x5A3D
-0x6535 = 0x5A3E
-0x6536 = 0x5A40
-0x6537 = 0x5A3F
-0x6538 = 0x5A41
-0x6539 = 0x327E
-0x653B = 0x3936
-0x653E = 0x4A7C
-0x653F = 0x402F
-0x6545 = 0x384E
-0x6548 = 0x5A43
-0x654D = 0x5A46
-0x654F = 0x4952
-0x6551 = 0x355F
-0x6555 = 0x5A45
-0x6556 = 0x5A44
-0x6557 = 0x4754
-0x6558 = 0x5A47
-0x6559 = 0x3635
-0x655D = 0x5A49
-0x655E = 0x5A48
-0x6562 = 0x343A
-0x6563 = 0x3B36
-0x6566 = 0x4658
-0x656C = 0x3749
-0x6570 = 0x3F74
-0x6572 = 0x5A4A
-0x6574 = 0x4030
-0x6575 = 0x4528
-0x6577 = 0x495F
-0x6578 = 0x5A4B
-0x6582 = 0x5A4C
-0x6583 = 0x5A4D
-0x6587 = 0x4A38
-0x6588 = 0x555D
-0x6589 = 0x4046
-0x658C = 0x494C
-0x658E = 0x3A58
-0x6590 = 0x4865
-0x6591 = 0x4843
-0x6597 = 0x454D
-0x6599 = 0x4E41
-0x659B = 0x5A4F
-0x659C = 0x3C50
-0x659F = 0x5A50
-0x65A1 = 0x3036
-0x65A4 = 0x3654
-0x65A5 = 0x404D
-0x65A7 = 0x4960
-0x65AB = 0x5A51
-0x65AC = 0x3B42
-0x65AD = 0x4347
-0x65AF = 0x3B5B
-0x65B0 = 0x3F37
-0x65B7 = 0x5A52
-0x65B9 = 0x4A7D
-0x65BC = 0x3177
-0x65BD = 0x3B5C
-0x65C1 = 0x5A55
-0x65C3 = 0x5A53
-0x65C4 = 0x5A56
-0x65C5 = 0x4E39
-0x65C6 = 0x5A54
-0x65CB = 0x407B
-0x65CC = 0x5A57
-0x65CF = 0x4232
-0x65D2 = 0x5A58
-0x65D7 = 0x347A
-0x65D9 = 0x5A5A
-0x65DB = 0x5A59
-0x65E0 = 0x5A5B
-0x65E1 = 0x5A5C
-0x65E2 = 0x347B
-0x65E5 = 0x467C
-0x65E6 = 0x4336
-0x65E7 = 0x356C
-0x65E8 = 0x3B5D
-0x65E9 = 0x4161
-0x65EC = 0x3D5C
-0x65ED = 0x3030
-0x65F1 = 0x5A5D
-0x65FA = 0x3222
-0x65FB = 0x5A61
-0x6602 = 0x3937
-0x6603 = 0x5A60
-0x6606 = 0x3A2B
-0x6607 = 0x3E3A
-0x660A = 0x5A5F
-0x660C = 0x3E3B
-0x660E = 0x4C40
-0x660F = 0x3A2A
-0x6613 = 0x3057
-0x6614 = 0x404E
-0x661C = 0x5A66
-0x661F = 0x4031
-0x6620 = 0x3147
-0x6625 = 0x3D55
-0x6627 = 0x4B66
-0x6628 = 0x3A72
-0x662D = 0x3E3C
-0x662F = 0x4027
-0x6634 = 0x5A65
-0x6635 = 0x5A63
-0x6636 = 0x5A64
-0x663C = 0x436B
-0x663F = 0x5B26
-0x6641 = 0x5A6A
-0x6642 = 0x3B7E
-0x6643 = 0x3938
-0x6644 = 0x5A68
-0x6649 = 0x5A69
-0x664B = 0x3F38
-0x664F = 0x5A67
-0x6652 = 0x3B2F
-0x665D = 0x5A6C
-0x665E = 0x5A6B
-0x665F = 0x5A70
-0x6662 = 0x5A71
-0x6664 = 0x5A6D
-0x6666 = 0x3322
-0x6667 = 0x5A6E
-0x6668 = 0x5A6F
-0x6669 = 0x4855
-0x666E = 0x4961
-0x666F = 0x374A
-0x6670 = 0x5A72
-0x6674 = 0x4032
-0x6676 = 0x3E3D
-0x667A = 0x4352
-0x6681 = 0x3647
-0x6683 = 0x5A73
-0x6684 = 0x5A77
-0x6687 = 0x324B
-0x6688 = 0x5A74
-0x6689 = 0x5A76
-0x668E = 0x5A75
-0x6691 = 0x3D6B
-0x6696 = 0x4348
-0x6697 = 0x3045
-0x6698 = 0x5A78
-0x669D = 0x5A79
-0x66A2 = 0x442A
-0x66A6 = 0x4E71
-0x66AB = 0x3B43
-0x66AE = 0x4A6B
-0x66B4 = 0x4B3D
-0x66B8 = 0x5B22
-0x66B9 = 0x5A7B
-0x66BC = 0x5A7E
-0x66BE = 0x5A7D
-0x66C1 = 0x5A7A
-0x66C4 = 0x5B21
-0x66C7 = 0x465E
-0x66C9 = 0x5A7C
-0x66D6 = 0x5B23
-0x66D9 = 0x3D6C
-0x66DA = 0x5B24
-0x66DC = 0x4D4B
-0x66DD = 0x4778
-0x66E0 = 0x5B25
-0x66E6 = 0x5B27
-0x66E9 = 0x5B28
-0x66F0 = 0x5B29
-0x66F2 = 0x364A
-0x66F3 = 0x3148
-0x66F4 = 0x3939
-0x66F5 = 0x5B2A
-0x66F7 = 0x5B2B
-0x66F8 = 0x3D71
-0x66F9 = 0x4162
-0x66FC = 0x5258
-0x66FD = 0x413E
-0x66FE = 0x413D
-0x66FF = 0x4258
-0x6700 = 0x3A47
-0x6703 = 0x5072
-0x6708 = 0x376E
-0x6709 = 0x4D2D
-0x670B = 0x4A7E
-0x670D = 0x497E
-0x670F = 0x5B2C
-0x6714 = 0x3A73
-0x6715 = 0x443F
-0x6716 = 0x5B2D
-0x6717 = 0x4F2F
-0x671B = 0x4B3E
-0x671D = 0x442B
-0x671E = 0x5B2E
-0x671F = 0x347C
-0x6726 = 0x5B2F
-0x6727 = 0x5B30
-0x6728 = 0x4C5A
-0x672A = 0x4C24
-0x672B = 0x4B76
-0x672C = 0x4B5C
-0x672D = 0x3B25
-0x672E = 0x5B32
-0x6731 = 0x3C6B
-0x6734 = 0x4B51
-0x6736 = 0x5B34
-0x6737 = 0x5B37
-0x6738 = 0x5B36
-0x673A = 0x3479
-0x673D = 0x3560
-0x673F = 0x5B33
-0x6741 = 0x5B35
-0x6746 = 0x5B38
-0x6749 = 0x3F79
-0x674E = 0x4D7B
-0x674F = 0x3049
-0x6750 = 0x3A60
-0x6751 = 0x423C
-0x6753 = 0x3C5D
-0x6756 = 0x3E73
-0x6759 = 0x5B3B
-0x675C = 0x454E
-0x675E = 0x5B39
-0x675F = 0x422B
-0x6760 = 0x5B3A
-0x6761 = 0x3E72
-0x6762 = 0x4C5D
-0x6763 = 0x5B3C
-0x6764 = 0x5B3D
-0x6765 = 0x4D68
-0x676A = 0x5B42
-0x676D = 0x393A
-0x676F = 0x4755
-0x6770 = 0x5B3F
-0x6771 = 0x456C
-0x6772 = 0x5A5E
-0x6773 = 0x5A62
-0x6775 = 0x354F
-0x6777 = 0x4747
-0x677C = 0x5B41
-0x677E = 0x3E3E
-0x677F = 0x4844
-0x6785 = 0x5B47
-0x6787 = 0x487A
-0x6789 = 0x5B3E
-0x678B = 0x5B44
-0x678C = 0x5B43
-0x6790 = 0x404F
-0x6795 = 0x4B6D
-0x6797 = 0x4E53
-0x679A = 0x4B67
-0x679C = 0x324C
-0x679D = 0x3B5E
-0x67A0 = 0x4F48
-0x67A1 = 0x5B46
-0x67A2 = 0x3F75
-0x67A6 = 0x5B45
-0x67A9 = 0x5B40
-0x67AF = 0x384F
-0x67B3 = 0x5B4C
-0x67B4 = 0x5B4A
-0x67B6 = 0x324D
-0x67B7 = 0x5B48
-0x67B8 = 0x5B4E
-0x67B9 = 0x5B54
-0x67C1 = 0x4248
-0x67C4 = 0x4A41
-0x67C6 = 0x5B56
-0x67CA = 0x4922
-0x67CE = 0x5B55
-0x67CF = 0x4770
-0x67D0 = 0x4B3F
-0x67D1 = 0x343B
-0x67D3 = 0x4077
-0x67D4 = 0x3D40
-0x67D8 = 0x4453
-0x67DA = 0x4D2E
-0x67DD = 0x5B51
-0x67DE = 0x5B50
-0x67E2 = 0x5B52
-0x67E4 = 0x5B4F
-0x67E7 = 0x5B57
-0x67E9 = 0x5B4D
-0x67EC = 0x5B4B
-0x67EE = 0x5B53
-0x67EF = 0x5B49
-0x67F1 = 0x436C
-0x67F3 = 0x4C78
-0x67F4 = 0x3C46
-0x67F5 = 0x3A74
-0x67FB = 0x3A3A
-0x67FE = 0x4B6F
-0x67FF = 0x3341
-0x6802 = 0x444E
-0x6803 = 0x464A
-0x6804 = 0x3149
-0x6813 = 0x4072
-0x6816 = 0x4034
-0x6817 = 0x372A
-0x681E = 0x5B59
-0x6821 = 0x393B
-0x6822 = 0x337C
-0x6829 = 0x5B5B
-0x682A = 0x3374
-0x682B = 0x5B61
-0x6832 = 0x5B5E
-0x6834 = 0x4073
-0x6838 = 0x334B
-0x6839 = 0x3A2C
-0x683C = 0x334A
-0x683D = 0x3A4F
-0x6840 = 0x5B5C
-0x6841 = 0x3765
-0x6842 = 0x374B
-0x6843 = 0x456D
-0x6846 = 0x5B5A
-0x6848 = 0x3046
-0x684D = 0x5B5D
-0x684E = 0x5B5F
-0x6850 = 0x364D
-0x6851 = 0x372C
-0x6853 = 0x343C
-0x6854 = 0x354B
-0x6859 = 0x5B62
-0x685C = 0x3A79
-0x685D = 0x4B71
-0x685F = 0x3B37
-0x6863 = 0x5B63
-0x6867 = 0x4930
-0x6874 = 0x5B6F
-0x6876 = 0x3233
-0x6877 = 0x5B64
-0x687E = 0x5B75
-0x687F = 0x5B65
-0x6881 = 0x4E42
-0x6883 = 0x5B6C
-0x6885 = 0x475F
-0x688D = 0x5B74
-0x688F = 0x5B67
-0x6893 = 0x3034
-0x6894 = 0x5B69
-0x6897 = 0x393C
-0x689B = 0x5B6B
-0x689D = 0x5B6A
-0x689F = 0x5B66
-0x68A0 = 0x5B71
-0x68A2 = 0x3E3F
-0x68A6 = 0x546D
-0x68A7 = 0x3868
-0x68A8 = 0x4D7C
-0x68AD = 0x5B68
-0x68AF = 0x4474
-0x68B0 = 0x3323
-0x68B1 = 0x3A2D
-0x68B3 = 0x5B60
-0x68B5 = 0x5B70
-0x68B6 = 0x3361
-0x68B9 = 0x5B6E
-0x68BA = 0x5B72
-0x68BC = 0x456E
-0x68C4 = 0x347E
-0x68C6 = 0x5C32
-0x68C9 = 0x4C49
-0x68CA = 0x5B77
-0x68CB = 0x347D
-0x68CD = 0x5B7E
-0x68D2 = 0x4B40
-0x68D4 = 0x5C21
-0x68D5 = 0x5C23
-0x68D7 = 0x5C27
-0x68D8 = 0x5B79
-0x68DA = 0x432A
-0x68DF = 0x456F
-0x68E0 = 0x5C2B
-0x68E1 = 0x5B7C
-0x68E3 = 0x5C28
-0x68E7 = 0x5C22
-0x68EE = 0x3F39
-0x68EF = 0x5C2C
-0x68F2 = 0x4033
-0x68F9 = 0x5C2A
-0x68FA = 0x343D
-0x6900 = 0x4F50
-0x6901 = 0x5B76
-0x6904 = 0x5C26
-0x6905 = 0x3058
-0x6908 = 0x5B78
-0x690B = 0x4C3A
-0x690C = 0x5B7D
-0x690D = 0x3F22
-0x690E = 0x4447
-0x690F = 0x5B73
-0x6912 = 0x5C25
-0x6919 = 0x3F7A
-0x691A = 0x5C2F
-0x691B = 0x3371
-0x691C = 0x3821
-0x6921 = 0x5C31
-0x6922 = 0x5B7A
-0x6923 = 0x5C30
-0x6925 = 0x5C29
-0x6926 = 0x5B7B
-0x6928 = 0x5C2D
-0x692A = 0x5C2E
-0x6930 = 0x5C3F
-0x6934 = 0x464E
-0x6936 = 0x5C24
-0x6939 = 0x5C3B
-0x693D = 0x5C3D
-0x693F = 0x4458
-0x694A = 0x4D4C
-0x6953 = 0x4976
-0x6954 = 0x5C38
-0x6955 = 0x424A
-0x6959 = 0x5C3E
-0x695A = 0x413F
-0x695C = 0x5C35
-0x695D = 0x5C42
-0x695E = 0x5C41
-0x6960 = 0x466F
-0x6961 = 0x5C40
-0x6962 = 0x466A
-0x696A = 0x5C44
-0x696B = 0x5C37
-0x696D = 0x3648
-0x696E = 0x5C3A
-0x696F = 0x3D5D
-0x6973 = 0x4760
-0x6974 = 0x5C3C
-0x6975 = 0x364B
-0x6977 = 0x5C34
-0x6978 = 0x5C36
-0x6979 = 0x5C33
-0x697C = 0x4F30
-0x697D = 0x335A
-0x697E = 0x5C39
-0x6981 = 0x5C43
-0x6982 = 0x3335
-0x698A = 0x3A67
-0x698E = 0x315D
-0x6991 = 0x5C54
-0x6994 = 0x4F31
-0x6995 = 0x5C57
-0x699B = 0x3F3A
-0x699C = 0x5C56
-0x69A0 = 0x5C55
-0x69A7 = 0x5C52
-0x69AE = 0x5C46
-0x69B1 = 0x5C63
-0x69B2 = 0x5C45
-0x69B4 = 0x5C58
-0x69BB = 0x5C50
-0x69BE = 0x5C4B
-0x69BF = 0x5C48
-0x69C1 = 0x5C49
-0x69C3 = 0x5C51
-0x69C7 = 0x7422
-0x69CA = 0x5C4E
-0x69CB = 0x393D
-0x69CC = 0x4448
-0x69CD = 0x4164
-0x69CE = 0x5C4C
-0x69D0 = 0x5C47
-0x69D3 = 0x5C4A
-0x69D8 = 0x4D4D
-0x69D9 = 0x4B6A
-0x69DD = 0x5C4F
-0x69DE = 0x5C59
-0x69E7 = 0x5C61
-0x69E8 = 0x5C5A
-0x69EB = 0x5C67
-0x69ED = 0x5C65
-0x69F2 = 0x5C60
-0x69F9 = 0x5C5F
-0x69FB = 0x4450
-0x69FD = 0x4165
-0x69FF = 0x5C5D
-0x6A02 = 0x5C5B
-0x6A05 = 0x5C62
-0x6A0A = 0x5C68
-0x6A0B = 0x4875
-0x6A0C = 0x5C6E
-0x6A12 = 0x5C69
-0x6A13 = 0x5C6C
-0x6A14 = 0x5C66
-0x6A17 = 0x4374
-0x6A19 = 0x4938
-0x6A1B = 0x5C5C
-0x6A1E = 0x5C64
-0x6A1F = 0x3E40
-0x6A21 = 0x4C4F
-0x6A22 = 0x5C78
-0x6A23 = 0x5C6B
-0x6A29 = 0x3822
-0x6A2A = 0x3223
-0x6A2B = 0x335F
-0x6A2E = 0x5C53
-0x6A35 = 0x3E41
-0x6A36 = 0x5C70
-0x6A38 = 0x5C77
-0x6A39 = 0x3C79
-0x6A3A = 0x3372
-0x6A3D = 0x432E
-0x6A44 = 0x5C6D
-0x6A47 = 0x5C72
-0x6A48 = 0x5C76
-0x6A4B = 0x3636
-0x6A58 = 0x354C
-0x6A59 = 0x5C74
-0x6A5F = 0x3521
-0x6A61 = 0x464B
-0x6A62 = 0x5C73
-0x6A66 = 0x5C75
-0x6A72 = 0x5C6F
-0x6A78 = 0x5C71
-0x6A7F = 0x3360
-0x6A80 = 0x4349
-0x6A84 = 0x5C7C
-0x6A8D = 0x5C7A
-0x6A8E = 0x3869
-0x6A90 = 0x5C79
-0x6A97 = 0x5D21
-0x6A9C = 0x5B58
-0x6AA0 = 0x5C7B
-0x6AA2 = 0x5C7D
-0x6AA3 = 0x5C7E
-0x6AAA = 0x5D2C
-0x6AAC = 0x5D28
-0x6AAE = 0x5B6D
-0x6AB3 = 0x5D27
-0x6AB8 = 0x5D26
-0x6ABB = 0x5D23
-0x6AC1 = 0x5C6A
-0x6AC2 = 0x5D25
-0x6AC3 = 0x5D24
-0x6AD1 = 0x5D2A
-0x6AD3 = 0x4F26
-0x6ADA = 0x5D2D
-0x6ADB = 0x367B
-0x6ADE = 0x5D29
-0x6ADF = 0x5D2B
-0x6AE8 = 0x4827
-0x6AEA = 0x5D2E
-0x6AFA = 0x5D32
-0x6AFB = 0x5D2F
-0x6B04 = 0x4D73
-0x6B05 = 0x5D30
-0x6B0A = 0x5C5E
-0x6B12 = 0x5D33
-0x6B16 = 0x5D34
-0x6B1D = 0x3135
-0x6B1F = 0x5D36
-0x6B20 = 0x3767
-0x6B21 = 0x3C21
-0x6B23 = 0x3655
-0x6B27 = 0x3224
-0x6B32 = 0x4D5F
-0x6B37 = 0x5D38
-0x6B38 = 0x5D37
-0x6B39 = 0x5D3A
-0x6B3A = 0x353D
-0x6B3D = 0x3656
-0x6B3E = 0x343E
-0x6B43 = 0x5D3D
-0x6B47 = 0x5D3C
-0x6B49 = 0x5D3E
-0x6B4C = 0x324E
-0x6B4E = 0x4337
-0x6B50 = 0x5D3F
-0x6B53 = 0x343F
-0x6B54 = 0x5D41
-0x6B59 = 0x5D40
-0x6B5B = 0x5D42
-0x6B5F = 0x5D43
-0x6B61 = 0x5D44
-0x6B62 = 0x3B5F
-0x6B63 = 0x4035
-0x6B64 = 0x3A21
-0x6B66 = 0x4970
-0x6B69 = 0x4A62
-0x6B6A = 0x4F44
-0x6B6F = 0x3B75
-0x6B73 = 0x3A50
-0x6B74 = 0x4E72
-0x6B78 = 0x5D45
-0x6B79 = 0x5D46
-0x6B7B = 0x3B60
-0x6B7F = 0x5D47
-0x6B80 = 0x5D48
-0x6B83 = 0x5D4A
-0x6B84 = 0x5D49
-0x6B86 = 0x4B58
-0x6B89 = 0x3D5E
-0x6B8A = 0x3C6C
-0x6B8B = 0x3B44
-0x6B8D = 0x5D4B
-0x6B95 = 0x5D4D
-0x6B96 = 0x3F23
-0x6B98 = 0x5D4C
-0x6B9E = 0x5D4E
-0x6BA4 = 0x5D4F
-0x6BAA = 0x5D50
-0x6BAB = 0x5D51
-0x6BAF = 0x5D52
-0x6BB1 = 0x5D54
-0x6BB2 = 0x5D53
-0x6BB3 = 0x5D55
-0x6BB4 = 0x3225
-0x6BB5 = 0x434A
-0x6BB7 = 0x5D56
-0x6BBA = 0x3B26
-0x6BBB = 0x334C
-0x6BBC = 0x5D57
-0x6BBF = 0x4542
-0x6BC0 = 0x544C
-0x6BC5 = 0x3523
-0x6BC6 = 0x5D58
-0x6BCB = 0x5D59
-0x6BCD = 0x4A6C
-0x6BCE = 0x4B68
-0x6BD2 = 0x4647
-0x6BD3 = 0x5D5A
-0x6BD4 = 0x4866
-0x6BD8 = 0x487B
-0x6BDB = 0x4C53
-0x6BDF = 0x5D5B
-0x6BEB = 0x5D5D
-0x6BEC = 0x5D5C
-0x6BEF = 0x5D5F
-0x6BF3 = 0x5D5E
-0x6C08 = 0x5D61
-0x6C0F = 0x3B61
-0x6C11 = 0x4C31
-0x6C13 = 0x5D62
-0x6C14 = 0x5D63
-0x6C17 = 0x3524
-0x6C1B = 0x5D64
-0x6C23 = 0x5D66
-0x6C24 = 0x5D65
-0x6C34 = 0x3F65
-0x6C37 = 0x4939
-0x6C38 = 0x314A
-0x6C3E = 0x4845
-0x6C40 = 0x4475
-0x6C41 = 0x3D41
-0x6C42 = 0x3561
-0x6C4E = 0x4846
-0x6C50 = 0x3C2E
-0x6C55 = 0x5D68
-0x6C57 = 0x3440
-0x6C5A = 0x3178
-0x6C5D = 0x4672
-0x6C5E = 0x5D67
-0x6C5F = 0x393E
-0x6C60 = 0x4353
-0x6C62 = 0x5D69
-0x6C68 = 0x5D71
-0x6C6A = 0x5D6A
-0x6C70 = 0x4241
-0x6C72 = 0x3562
-0x6C73 = 0x5D72
-0x6C7A = 0x3768
-0x6C7D = 0x3525
-0x6C7E = 0x5D70
-0x6C81 = 0x5D6E
-0x6C82 = 0x5D6B
-0x6C83 = 0x4D60
-0x6C88 = 0x4440
-0x6C8C = 0x4659
-0x6C8D = 0x5D6C
-0x6C90 = 0x5D74
-0x6C92 = 0x5D73
-0x6C93 = 0x3723
-0x6C96 = 0x322D
-0x6C99 = 0x3A3B
-0x6C9A = 0x5D6D
-0x6C9B = 0x5D6F
-0x6CA1 = 0x4B57
-0x6CA2 = 0x4274
-0x6CAB = 0x4B77
-0x6CAE = 0x5D7C
-0x6CB1 = 0x5D7D
-0x6CB3 = 0x324F
-0x6CB8 = 0x4A28
-0x6CB9 = 0x4C7D
-0x6CBA = 0x5E21
-0x6CBB = 0x3C23
-0x6CBC = 0x3E42
-0x6CBD = 0x5D78
-0x6CBE = 0x5D7E
-0x6CBF = 0x3168
-0x6CC1 = 0x3637
-0x6CC4 = 0x5D75
-0x6CC5 = 0x5D7A
-0x6CC9 = 0x4074
-0x6CCA = 0x4771
-0x6CCC = 0x4867
-0x6CD3 = 0x5D77
-0x6CD5 = 0x4B21
-0x6CD7 = 0x5D79
-0x6CD9 = 0x5E24
-0x6CDB = 0x5E22
-0x6CDD = 0x5D7B
-0x6CE1 = 0x4B22
-0x6CE2 = 0x4748
-0x6CE3 = 0x3563
-0x6CE5 = 0x4525
-0x6CE8 = 0x436D
-0x6CEA = 0x5E25
-0x6CEF = 0x5E23
-0x6CF0 = 0x4259
-0x6CF1 = 0x5D76
-0x6CF3 = 0x314B
-0x6D0B = 0x4D4E
-0x6D0C = 0x5E30
-0x6D12 = 0x5E2F
-0x6D17 = 0x4076
-0x6D19 = 0x5E2C
-0x6D1B = 0x4D6C
-0x6D1E = 0x4636
-0x6D1F = 0x5E26
-0x6D25 = 0x4445
-0x6D29 = 0x314C
-0x6D2A = 0x393F
-0x6D2B = 0x5E29
-0x6D32 = 0x3D27
-0x6D33 = 0x5E2E
-0x6D35 = 0x5E2D
-0x6D36 = 0x5E28
-0x6D38 = 0x5E2B
-0x6D3B = 0x3368
-0x6D3D = 0x5E2A
-0x6D3E = 0x4749
-0x6D41 = 0x4E2E
-0x6D44 = 0x3E74
-0x6D45 = 0x4075
-0x6D59 = 0x5E36
-0x6D5A = 0x5E34
-0x6D5C = 0x494D
-0x6D63 = 0x5E31
-0x6D64 = 0x5E33
-0x6D66 = 0x313A
-0x6D69 = 0x3940
-0x6D6A = 0x4F32
-0x6D6C = 0x333D
-0x6D6E = 0x4962
-0x6D74 = 0x4D61
-0x6D77 = 0x3324
-0x6D78 = 0x3F3B
-0x6D79 = 0x5E35
-0x6D85 = 0x5E3A
-0x6D88 = 0x3E43
-0x6D8C = 0x4D30
-0x6D8E = 0x5E37
-0x6D93 = 0x5E32
-0x6D95 = 0x5E38
-0x6D99 = 0x4E5E
-0x6D9B = 0x4573
-0x6D9C = 0x4642
-0x6DAF = 0x3336
-0x6DB2 = 0x3155
-0x6DB5 = 0x5E3E
-0x6DB8 = 0x5E41
-0x6DBC = 0x4E43
-0x6DC0 = 0x4D64
-0x6DC5 = 0x5E48
-0x6DC6 = 0x5E42
-0x6DC7 = 0x5E3F
-0x6DCB = 0x4E54
-0x6DCC = 0x5E45
-0x6DD1 = 0x3D4A
-0x6DD2 = 0x5E47
-0x6DD5 = 0x5E4C
-0x6DD8 = 0x4571
-0x6DD9 = 0x5E4A
-0x6DDE = 0x5E44
-0x6DE1 = 0x4338
-0x6DE4 = 0x5E4B
-0x6DE6 = 0x5E40
-0x6DE8 = 0x5E46
-0x6DEA = 0x5E4D
-0x6DEB = 0x307C
-0x6DEC = 0x5E43
-0x6DEE = 0x5E4E
-0x6DF1 = 0x3F3C
-0x6DF3 = 0x3D5F
-0x6DF5 = 0x4A25
-0x6DF7 = 0x3A2E
-0x6DF9 = 0x5E3B
-0x6DFA = 0x5E49
-0x6DFB = 0x453A
-0x6E05 = 0x4036
-0x6E07 = 0x3369
-0x6E08 = 0x3A51
-0x6E09 = 0x3E44
-0x6E0A = 0x5E3D
-0x6E0B = 0x3D42
-0x6E13 = 0x374C
-0x6E15 = 0x5E3C
-0x6E19 = 0x5E52
-0x6E1A = 0x3D6D
-0x6E1B = 0x383A
-0x6E1D = 0x5E61
-0x6E1F = 0x5E5B
-0x6E20 = 0x3574
-0x6E21 = 0x454F
-0x6E23 = 0x5E56
-0x6E24 = 0x5E5F
-0x6E25 = 0x302F
-0x6E26 = 0x3132
-0x6E29 = 0x3239
-0x6E2B = 0x5E58
-0x6E2C = 0x422C
-0x6E2D = 0x5E4F
-0x6E2E = 0x5E51
-0x6E2F = 0x3941
-0x6E38 = 0x5E62
-0x6E3A = 0x5E5D
-0x6E3E = 0x5E55
-0x6E43 = 0x5E5C
-0x6E4A = 0x4C2B
-0x6E4D = 0x5E5A
-0x6E4E = 0x5E5E
-0x6E56 = 0x3850
-0x6E58 = 0x3E45
-0x6E5B = 0x4339
-0x6E5F = 0x5E54
-0x6E67 = 0x4D2F
-0x6E6B = 0x5E57
-0x6E6E = 0x5E50
-0x6E6F = 0x4572
-0x6E72 = 0x5E53
-0x6E76 = 0x5E59
-0x6E7E = 0x4F51
-0x6E7F = 0x3C3E
-0x6E80 = 0x4B7E
-0x6E82 = 0x5E63
-0x6E8C = 0x482E
-0x6E8F = 0x5E6F
-0x6E90 = 0x383B
-0x6E96 = 0x3D60
-0x6E98 = 0x5E65
-0x6E9C = 0x4E2F
-0x6E9D = 0x3942
-0x6E9F = 0x5E72
-0x6EA2 = 0x306E
-0x6EA5 = 0x5E70
-0x6EAA = 0x5E64
-0x6EAF = 0x5E6A
-0x6EB2 = 0x5E6C
-0x6EB6 = 0x4D4F
-0x6EB7 = 0x5E67
-0x6EBA = 0x452E
-0x6EBD = 0x5E69
-0x6EC2 = 0x5E71
-0x6EC4 = 0x5E6B
-0x6EC5 = 0x4C47
-0x6EC9 = 0x5E66
-0x6ECB = 0x3C22
-0x6ECC = 0x5E7E
-0x6ED1 = 0x336A
-0x6ED3 = 0x5E68
-0x6ED4 = 0x5E6D
-0x6ED5 = 0x5E6E
-0x6EDD = 0x426C
-0x6EDE = 0x425A
-0x6EEC = 0x5E76
-0x6EEF = 0x5E7C
-0x6EF2 = 0x5E7A
-0x6EF4 = 0x4529
-0x6EF7 = 0x5F23
-0x6EF8 = 0x5E77
-0x6EFE = 0x5E78
-0x6EFF = 0x5E60
-0x6F01 = 0x3579
-0x6F02 = 0x493A
-0x6F06 = 0x3C3F
-0x6F09 = 0x3977
-0x6F0F = 0x4F33
-0x6F11 = 0x5E74
-0x6F13 = 0x5F22
-0x6F14 = 0x3169
-0x6F15 = 0x4166
-0x6F20 = 0x4779
-0x6F22 = 0x3441
-0x6F23 = 0x4E7A
-0x6F2B = 0x4C21
-0x6F2C = 0x4452
-0x6F31 = 0x5E7B
-0x6F32 = 0x5E7D
-0x6F38 = 0x4132
-0x6F3E = 0x5F21
-0x6F3F = 0x5E79
-0x6F41 = 0x5E73
-0x6F45 = 0x3443
-0x6F54 = 0x3769
-0x6F58 = 0x5F2F
-0x6F5B = 0x5F2A
-0x6F5C = 0x4078
-0x6F5F = 0x3363
-0x6F64 = 0x3D61
-0x6F66 = 0x5F33
-0x6F6D = 0x5F2C
-0x6F6E = 0x442C
-0x6F6F = 0x5F29
-0x6F70 = 0x4459
-0x6F74 = 0x5F4C
-0x6F78 = 0x5F26
-0x6F7A = 0x5F25
-0x6F7C = 0x5F2E
-0x6F80 = 0x5F28
-0x6F81 = 0x5F27
-0x6F82 = 0x5F2D
-0x6F84 = 0x4021
-0x6F86 = 0x5F24
-0x6F8E = 0x5F30
-0x6F91 = 0x5F31
-0x6F97 = 0x3442
-0x6FA1 = 0x5F36
-0x6FA3 = 0x5F35
-0x6FA4 = 0x5F37
-0x6FAA = 0x5F3A
-0x6FB1 = 0x4543
-0x6FB3 = 0x5F34
-0x6FB9 = 0x5F38
-0x6FC0 = 0x3763
-0x6FC1 = 0x4279
-0x6FC2 = 0x5F32
-0x6FC3 = 0x473B
-0x6FC6 = 0x5F39
-0x6FD4 = 0x5F3E
-0x6FD5 = 0x5F3C
-0x6FD8 = 0x5F3F
-0x6FDB = 0x5F42
-0x6FDF = 0x5F3B
-0x6FE0 = 0x396A
-0x6FE1 = 0x4728
-0x6FE4 = 0x5E39
-0x6FEB = 0x4D74
-0x6FEC = 0x5F3D
-0x6FEE = 0x5F41
-0x6FEF = 0x4275
-0x6FF1 = 0x5F40
-0x6FF3 = 0x5F2B
-0x6FF6 = 0x6F69
-0x6FFA = 0x5F45
-0x6FFE = 0x5F49
-0x7001 = 0x5F47
-0x7009 = 0x5F43
-0x700B = 0x5F44
-0x700F = 0x5F48
-0x7011 = 0x5F46
-0x7015 = 0x494E
-0x7018 = 0x5F4E
-0x701A = 0x5F4B
-0x701B = 0x5F4A
-0x701D = 0x5F4D
-0x701E = 0x4654
-0x701F = 0x5F4F
-0x7026 = 0x4375
-0x7027 = 0x426D
-0x702C = 0x4025
-0x7030 = 0x5F50
-0x7032 = 0x5F52
-0x703E = 0x5F51
-0x704C = 0x5E75
-0x7051 = 0x5F53
-0x7058 = 0x4667
-0x7063 = 0x5F54
-0x706B = 0x3250
-0x706F = 0x4574
-0x7070 = 0x3325
-0x7078 = 0x3564
-0x707C = 0x3C5E
-0x707D = 0x3A52
-0x7089 = 0x4F27
-0x708A = 0x3F66
-0x708E = 0x316A
-0x7092 = 0x5F56
-0x7099 = 0x5F55
-0x70AC = 0x5F59
-0x70AD = 0x433A
-0x70AE = 0x5F5C
-0x70AF = 0x5F57
-0x70B3 = 0x5F5B
-0x70B8 = 0x5F5A
-0x70B9 = 0x4540
-0x70BA = 0x3059
-0x70C8 = 0x4E75
-0x70CB = 0x5F5E
-0x70CF = 0x3128
-0x70D9 = 0x5F60
-0x70DD = 0x5F5F
-0x70DF = 0x5F5D
-0x70F1 = 0x5F58
-0x70F9 = 0x4B23
-0x70FD = 0x5F62
-0x7109 = 0x5F61
-0x7114 = 0x316B
-0x7119 = 0x5F64
-0x711A = 0x4A32
-0x711C = 0x5F63
-0x7121 = 0x4C35
-0x7126 = 0x3E47
-0x7136 = 0x4133
-0x713C = 0x3E46
-0x7149 = 0x4E7B
-0x714C = 0x5F6A
-0x714E = 0x4079
-0x7155 = 0x5F66
-0x7156 = 0x5F6B
-0x7159 = 0x316C
-0x7162 = 0x5F69
-0x7164 = 0x4761
-0x7165 = 0x5F65
-0x7166 = 0x5F68
-0x7167 = 0x3E48
-0x7169 = 0x4851
-0x716C = 0x5F6C
-0x716E = 0x3C51
-0x717D = 0x407A
-0x7184 = 0x5F6F
-0x7188 = 0x5F67
-0x718A = 0x3727
-0x718F = 0x5F6D
-0x7194 = 0x4D50
-0x7195 = 0x5F70
-0x7199 = 0x7426
-0x719F = 0x3D4F
-0x71A8 = 0x5F71
-0x71AC = 0x5F72
-0x71B1 = 0x472E
-0x71B9 = 0x5F74
-0x71BE = 0x5F75
-0x71C3 = 0x4733
-0x71C8 = 0x4575
-0x71C9 = 0x5F77
-0x71CE = 0x5F79
-0x71D0 = 0x4E55
-0x71D2 = 0x5F76
-0x71D4 = 0x5F78
-0x71D5 = 0x316D
-0x71D7 = 0x5F73
-0x71DF = 0x535B
-0x71E0 = 0x5F7A
-0x71E5 = 0x4167
-0x71E6 = 0x3B38
-0x71E7 = 0x5F7C
-0x71EC = 0x5F7B
-0x71ED = 0x3F24
-0x71EE = 0x5259
-0x71F5 = 0x5F7D
-0x71F9 = 0x6021
-0x71FB = 0x5F6E
-0x71FC = 0x5F7E
-0x71FF = 0x6022
-0x7206 = 0x477A
-0x720D = 0x6023
-0x7210 = 0x6024
-0x721B = 0x6025
-0x7228 = 0x6026
-0x722A = 0x445E
-0x722C = 0x6028
-0x722D = 0x6027
-0x7230 = 0x6029
-0x7232 = 0x602A
-0x7235 = 0x3C5F
-0x7236 = 0x4963
-0x723A = 0x4C6C
-0x723B = 0x602B
-0x723C = 0x602C
-0x723D = 0x4156
-0x723E = 0x3C24
-0x723F = 0x602D
-0x7240 = 0x602E
-0x7246 = 0x602F
-0x7247 = 0x4A52
-0x7248 = 0x4847
-0x724B = 0x6030
-0x724C = 0x4757
-0x7252 = 0x442D
-0x7258 = 0x6031
-0x7259 = 0x3267
-0x725B = 0x356D
-0x725D = 0x4C46
-0x725F = 0x4C36
-0x7261 = 0x3234
-0x7262 = 0x4F34
-0x7267 = 0x4B52
-0x7269 = 0x4A2A
-0x7272 = 0x4037
-0x7274 = 0x6032
-0x7279 = 0x4643
-0x727D = 0x3823
-0x727E = 0x6033
-0x7280 = 0x3A54
-0x7281 = 0x6035
-0x7282 = 0x6034
-0x7287 = 0x6036
-0x7292 = 0x6037
-0x7296 = 0x6038
-0x72A0 = 0x353E
-0x72A2 = 0x6039
-0x72A7 = 0x603A
-0x72AC = 0x3824
-0x72AF = 0x4848
-0x72B2 = 0x603C
-0x72B6 = 0x3E75
-0x72B9 = 0x603B
-0x72C2 = 0x3638
-0x72C3 = 0x603D
-0x72C4 = 0x603F
-0x72C6 = 0x603E
-0x72CE = 0x6040
-0x72D0 = 0x3851
-0x72D2 = 0x6041
-0x72D7 = 0x3669
-0x72D9 = 0x4140
-0x72DB = 0x397D
-0x72E0 = 0x6043
-0x72E1 = 0x6044
-0x72E2 = 0x6042
-0x72E9 = 0x3C6D
-0x72EC = 0x4648
-0x72ED = 0x3639
-0x72F7 = 0x6046
-0x72F8 = 0x432C
-0x72F9 = 0x6045
-0x72FC = 0x4F35
-0x72FD = 0x4762
-0x730A = 0x6049
-0x7316 = 0x604B
-0x7317 = 0x6048
-0x731B = 0x4C54
-0x731C = 0x604A
-0x731D = 0x604C
-0x731F = 0x4E44
-0x7325 = 0x6050
-0x7329 = 0x604F
-0x732A = 0x4376
-0x732B = 0x472D
-0x732E = 0x3825
-0x732F = 0x604E
-0x7334 = 0x604D
-0x7336 = 0x4D31
-0x7337 = 0x4D32
-0x733E = 0x6051
-0x733F = 0x316E
-0x7344 = 0x3976
-0x7345 = 0x3B62
-0x734E = 0x6052
-0x734F = 0x6053
-0x7357 = 0x6055
-0x7363 = 0x3D43
-0x7368 = 0x6057
-0x736A = 0x6056
-0x7370 = 0x6058
-0x7372 = 0x334D
-0x7375 = 0x605A
-0x7378 = 0x6059
-0x737A = 0x605C
-0x737B = 0x605B
-0x7384 = 0x383C
-0x7387 = 0x4E28
-0x7389 = 0x364C
-0x738B = 0x3226
-0x7396 = 0x366A
-0x73A9 = 0x3461
-0x73B2 = 0x4E68
-0x73B3 = 0x605E
-0x73BB = 0x6060
-0x73C0 = 0x6061
-0x73C2 = 0x3251
-0x73C8 = 0x605D
-0x73CA = 0x3B39
-0x73CD = 0x4441
-0x73CE = 0x605F
-0x73DE = 0x6064
-0x73E0 = 0x3C6E
-0x73E5 = 0x6062
-0x73EA = 0x373E
-0x73ED = 0x4849
-0x73EE = 0x6063
-0x73F1 = 0x607E
-0x73F8 = 0x6069
-0x73FE = 0x383D
-0x7403 = 0x3565
-0x7405 = 0x6066
-0x7406 = 0x4D7D
-0x7409 = 0x4E30
-0x7422 = 0x4276
-0x7425 = 0x6068
-0x7432 = 0x606A
-0x7433 = 0x4E56
-0x7434 = 0x3657
-0x7435 = 0x487C
-0x7436 = 0x474A
-0x743A = 0x606B
-0x743F = 0x606D
-0x7441 = 0x6070
-0x7455 = 0x606C
-0x7459 = 0x606F
-0x745A = 0x386A
-0x745B = 0x314D
-0x745C = 0x6071
-0x745E = 0x3F70
-0x745F = 0x606E
-0x7460 = 0x4E5C
-0x7463 = 0x6074
-0x7464 = 0x7424
-0x7469 = 0x6072
-0x746A = 0x6075
-0x746F = 0x6067
-0x7470 = 0x6073
-0x7473 = 0x3A3C
-0x7476 = 0x6076
-0x747E = 0x6077
-0x7483 = 0x4D7E
-0x748B = 0x6078
-0x749E = 0x6079
-0x74A2 = 0x6065
-0x74A7 = 0x607A
-0x74B0 = 0x3444
-0x74BD = 0x3C25
-0x74CA = 0x607B
-0x74CF = 0x607C
-0x74D4 = 0x607D
-0x74DC = 0x313B
-0x74E0 = 0x6121
-0x74E2 = 0x493B
-0x74E3 = 0x6122
-0x74E6 = 0x3424
-0x74E7 = 0x6123
-0x74E9 = 0x6124
-0x74EE = 0x6125
-0x74F0 = 0x6127
-0x74F1 = 0x6128
-0x74F2 = 0x6126
-0x74F6 = 0x4953
-0x74F7 = 0x612A
-0x74F8 = 0x6129
-0x7503 = 0x612C
-0x7504 = 0x612B
-0x7505 = 0x612D
-0x750C = 0x612E
-0x750D = 0x6130
-0x750E = 0x612F
-0x7511 = 0x3979
-0x7513 = 0x6132
-0x7515 = 0x6131
-0x7518 = 0x3445
-0x751A = 0x3F53
-0x751C = 0x453C
-0x751E = 0x6133
-0x751F = 0x4038
-0x7523 = 0x3B3A
-0x7525 = 0x3179
-0x7526 = 0x6134
-0x7528 = 0x4D51
-0x752B = 0x4A63
-0x752C = 0x6135
-0x7530 = 0x4544
-0x7531 = 0x4D33
-0x7532 = 0x3943
-0x7533 = 0x3F3D
-0x7537 = 0x434B
-0x7538 = 0x5234
-0x753A = 0x442E
-0x753B = 0x3268
-0x753C = 0x6136
-0x7544 = 0x6137
-0x7546 = 0x613C
-0x7549 = 0x613A
-0x754A = 0x6139
-0x754B = 0x5A42
-0x754C = 0x3326
-0x754D = 0x6138
-0x754F = 0x305A
-0x7551 = 0x482A
-0x7554 = 0x484A
-0x7559 = 0x4E31
-0x755A = 0x613D
-0x755B = 0x613B
-0x755C = 0x435C
-0x755D = 0x4026
-0x7560 = 0x482B
-0x7562 = 0x492D
-0x7564 = 0x613F
-0x7565 = 0x4E2C
-0x7566 = 0x374D
-0x7567 = 0x6140
-0x7569 = 0x613E
-0x756A = 0x4856
-0x756B = 0x6141
-0x756D = 0x6142
-0x7570 = 0x305B
-0x7573 = 0x3E76
-0x7574 = 0x6147
-0x7576 = 0x6144
-0x7577 = 0x466D
-0x7578 = 0x6143
-0x757F = 0x3526
-0x7582 = 0x614A
-0x7586 = 0x6145
-0x7587 = 0x6146
-0x7589 = 0x6149
-0x758A = 0x6148
-0x758B = 0x4925
-0x758E = 0x4142
-0x758F = 0x4141
-0x7591 = 0x353F
-0x7594 = 0x614B
-0x759A = 0x614C
-0x759D = 0x614D
-0x75A3 = 0x614F
-0x75A5 = 0x614E
-0x75AB = 0x3156
-0x75B1 = 0x6157
-0x75B2 = 0x4868
-0x75B3 = 0x6151
-0x75B5 = 0x6153
-0x75B8 = 0x6155
-0x75B9 = 0x3F3E
-0x75BC = 0x6156
-0x75BD = 0x6154
-0x75BE = 0x3C40
-0x75C2 = 0x6150
-0x75C3 = 0x6152
-0x75C5 = 0x4942
-0x75C7 = 0x3E49
-0x75CA = 0x6159
-0x75CD = 0x6158
-0x75D2 = 0x615A
-0x75D4 = 0x3C26
-0x75D5 = 0x3A2F
-0x75D8 = 0x4577
-0x75D9 = 0x615B
-0x75DB = 0x444B
-0x75DE = 0x615D
-0x75E2 = 0x4E21
-0x75E3 = 0x615C
-0x75E9 = 0x4169
-0x75F0 = 0x6162
-0x75F2 = 0x6164
-0x75F3 = 0x6165
-0x75F4 = 0x4354
-0x75FA = 0x6163
-0x75FC = 0x6160
-0x75FE = 0x615E
-0x75FF = 0x615F
-0x7601 = 0x6161
-0x7609 = 0x6168
-0x760B = 0x6166
-0x760D = 0x6167
-0x761F = 0x6169
-0x7620 = 0x616B
-0x7621 = 0x616C
-0x7622 = 0x616D
-0x7624 = 0x616E
-0x7627 = 0x616A
-0x7630 = 0x6170
-0x7634 = 0x616F
-0x763B = 0x6171
-0x7642 = 0x4E45
-0x7646 = 0x6174
-0x7647 = 0x6172
-0x7648 = 0x6173
-0x764C = 0x3462
-0x7652 = 0x4C7E
-0x7656 = 0x4A4A
-0x7658 = 0x6176
-0x765C = 0x6175
-0x7661 = 0x6177
-0x7662 = 0x6178
-0x7667 = 0x617C
-0x7668 = 0x6179
-0x7669 = 0x617A
-0x766A = 0x617B
-0x766C = 0x617D
-0x7670 = 0x617E
-0x7672 = 0x6221
-0x7676 = 0x6222
-0x7678 = 0x6223
-0x767A = 0x482F
-0x767B = 0x4550
-0x767C = 0x6224
-0x767D = 0x4772
-0x767E = 0x4934
-0x7680 = 0x6225
-0x7683 = 0x6226
-0x7684 = 0x452A
-0x7686 = 0x3327
-0x7687 = 0x3944
-0x7688 = 0x6227
-0x768B = 0x6228
-0x768E = 0x6229
-0x7690 = 0x3B29
-0x7693 = 0x622B
-0x7696 = 0x622A
-0x7699 = 0x622C
-0x769A = 0x622D
-0x76AE = 0x4869
-0x76B0 = 0x622E
-0x76B4 = 0x622F
-0x76B7 = 0x7369
-0x76B8 = 0x6230
-0x76B9 = 0x6231
-0x76BA = 0x6232
-0x76BF = 0x3B2E
-0x76C2 = 0x6233
-0x76C3 = 0x4756
-0x76C6 = 0x4B5F
-0x76C8 = 0x314E
-0x76CA = 0x3157
-0x76CD = 0x6234
-0x76D2 = 0x6236
-0x76D6 = 0x6235
-0x76D7 = 0x4570
-0x76DB = 0x4039
-0x76DC = 0x5D39
-0x76DE = 0x6237
-0x76DF = 0x4C41
-0x76E1 = 0x6238
-0x76E3 = 0x3446
-0x76E4 = 0x4857
-0x76E5 = 0x6239
-0x76E7 = 0x623A
-0x76EA = 0x623B
-0x76EE = 0x4C5C
-0x76F2 = 0x4C55
-0x76F4 = 0x443E
-0x76F8 = 0x416A
-0x76FB = 0x623D
-0x76FE = 0x3D62
-0x7701 = 0x3E4A
-0x7704 = 0x6240
-0x7707 = 0x623F
-0x7708 = 0x623E
-0x7709 = 0x487D
-0x770B = 0x3447
-0x770C = 0x3829
-0x771B = 0x6246
-0x771E = 0x6243
-0x771F = 0x3F3F
-0x7720 = 0x4C32
-0x7724 = 0x6242
-0x7725 = 0x6244
-0x7726 = 0x6245
-0x7729 = 0x6241
-0x7737 = 0x6247
-0x7738 = 0x6248
-0x773A = 0x442F
-0x773C = 0x3463
-0x7740 = 0x4365
-0x7747 = 0x6249
-0x775A = 0x624A
-0x775B = 0x624D
-0x7761 = 0x3F67
-0x7763 = 0x4644
-0x7765 = 0x624E
-0x7766 = 0x4B53
-0x7768 = 0x624B
-0x776B = 0x624C
-0x7779 = 0x6251
-0x777E = 0x6250
-0x777F = 0x624F
-0x778B = 0x6253
-0x778E = 0x6252
-0x7791 = 0x6254
-0x779E = 0x6256
-0x77A0 = 0x6255
-0x77A5 = 0x4A4D
-0x77AC = 0x3D56
-0x77AD = 0x4E46
-0x77B0 = 0x6257
-0x77B3 = 0x4637
-0x77B6 = 0x6258
-0x77B9 = 0x6259
-0x77BB = 0x625D
-0x77BC = 0x625B
-0x77BD = 0x625C
-0x77BF = 0x625A
-0x77C7 = 0x625E
-0x77CD = 0x625F
-0x77D7 = 0x6260
-0x77DA = 0x6261
-0x77DB = 0x4C37
-0x77DC = 0x6262
-0x77E2 = 0x4C70
-0x77E3 = 0x6263
-0x77E5 = 0x434E
-0x77E7 = 0x476A
-0x77E9 = 0x366B
-0x77ED = 0x433B
-0x77EE = 0x6264
-0x77EF = 0x363A
-0x77F3 = 0x4050
-0x77FC = 0x6265
-0x7802 = 0x3A3D
-0x780C = 0x6266
-0x7812 = 0x6267
-0x7814 = 0x3826
-0x7815 = 0x3A55
-0x7820 = 0x6269
-0x7825 = 0x4556
-0x7826 = 0x3A56
-0x7827 = 0x354E
-0x7832 = 0x4B24
-0x7834 = 0x474B
-0x783A = 0x4557
-0x783F = 0x395C
-0x7845 = 0x626B
-0x785D = 0x3E4B
-0x786B = 0x4E32
-0x786C = 0x3945
-0x786F = 0x3827
-0x7872 = 0x4823
-0x7874 = 0x626D
-0x787C = 0x626F
-0x7881 = 0x386B
-0x7886 = 0x626E
-0x7887 = 0x4476
-0x788C = 0x6271
-0x788D = 0x3337
-0x788E = 0x626C
-0x7891 = 0x486A
-0x7893 = 0x3130
-0x7895 = 0x3A6C
-0x7897 = 0x4F52
-0x789A = 0x6270
-0x78A3 = 0x6272
-0x78A7 = 0x4A4B
-0x78A9 = 0x4059
-0x78AA = 0x6274
-0x78AF = 0x6275
-0x78B5 = 0x6273
-0x78BA = 0x334E
-0x78BC = 0x627B
-0x78BE = 0x627A
-0x78C1 = 0x3C27
-0x78C5 = 0x627C
-0x78C6 = 0x6277
-0x78CA = 0x627D
-0x78CB = 0x6278
-0x78D0 = 0x4858
-0x78D1 = 0x6276
-0x78D4 = 0x6279
-0x78DA = 0x6322
-0x78E7 = 0x6321
-0x78E8 = 0x4B61
-0x78EC = 0x627E
-0x78EF = 0x306B
-0x78F4 = 0x6324
-0x78FD = 0x6323
-0x7901 = 0x3E4C
-0x7907 = 0x6325
-0x790E = 0x4143
-0x7911 = 0x6327
-0x7912 = 0x6326
-0x7919 = 0x6328
-0x7926 = 0x6268
-0x792A = 0x626A
-0x792B = 0x632A
-0x792C = 0x6329
-0x793A = 0x3C28
-0x793C = 0x4E69
-0x793E = 0x3C52
-0x7940 = 0x632B
-0x7941 = 0x3737
-0x7947 = 0x3540
-0x7948 = 0x3527
-0x7949 = 0x3B63
-0x7950 = 0x4D34
-0x7953 = 0x6331
-0x7955 = 0x6330
-0x7956 = 0x4144
-0x7957 = 0x632D
-0x795A = 0x632F
-0x795D = 0x3D4B
-0x795E = 0x3F40
-0x795F = 0x632E
-0x7960 = 0x632C
-0x7962 = 0x472A
-0x7965 = 0x3E4D
-0x7968 = 0x493C
-0x796D = 0x3A57
-0x7977 = 0x4578
-0x797A = 0x6332
-0x797F = 0x6333
-0x7980 = 0x6349
-0x7981 = 0x3658
-0x7984 = 0x4F3D
-0x7985 = 0x4135
-0x798A = 0x6334
-0x798D = 0x3252
-0x798E = 0x4477
-0x798F = 0x4A21
-0x799D = 0x6335
-0x79A6 = 0x357A
-0x79A7 = 0x6336
-0x79AA = 0x6338
-0x79AE = 0x6339
-0x79B0 = 0x4729
-0x79B3 = 0x633A
-0x79B9 = 0x633B
-0x79BA = 0x633C
-0x79BD = 0x3659
-0x79BE = 0x3253
-0x79BF = 0x4645
-0x79C0 = 0x3D28
-0x79C1 = 0x3B64
-0x79C9 = 0x633D
-0x79CB = 0x3D29
-0x79D1 = 0x324A
-0x79D2 = 0x4943
-0x79D5 = 0x633E
-0x79D8 = 0x486B
-0x79DF = 0x4145
-0x79E1 = 0x6341
-0x79E3 = 0x6342
-0x79E4 = 0x4769
-0x79E6 = 0x3F41
-0x79E7 = 0x633F
-0x79E9 = 0x4361
-0x79EC = 0x6340
-0x79F0 = 0x3E4E
-0x79FB = 0x305C
-0x7A00 = 0x3529
-0x7A08 = 0x6343
-0x7A0B = 0x4478
-0x7A0D = 0x6344
-0x7A0E = 0x4047
-0x7A14 = 0x4C2D
-0x7A17 = 0x4923
-0x7A18 = 0x6345
-0x7A19 = 0x6346
-0x7A1A = 0x4355
-0x7A1C = 0x4E47
-0x7A1F = 0x6348
-0x7A20 = 0x6347
-0x7A2E = 0x3C6F
-0x7A31 = 0x634A
-0x7A32 = 0x3070
-0x7A37 = 0x634D
-0x7A3B = 0x634B
-0x7A3C = 0x3254
-0x7A3D = 0x374E
-0x7A3E = 0x634C
-0x7A3F = 0x3946
-0x7A40 = 0x3972
-0x7A42 = 0x4A66
-0x7A43 = 0x634E
-0x7A46 = 0x4B54
-0x7A49 = 0x6350
-0x7A4D = 0x4051
-0x7A4E = 0x314F
-0x7A4F = 0x323A
-0x7A50 = 0x302C
-0x7A57 = 0x634F
-0x7A61 = 0x6351
-0x7A62 = 0x6352
-0x7A63 = 0x3E77
-0x7A69 = 0x6353
-0x7A6B = 0x334F
-0x7A70 = 0x6355
-0x7A74 = 0x376A
-0x7A76 = 0x3566
-0x7A79 = 0x6356
-0x7A7A = 0x3675
-0x7A7D = 0x6357
-0x7A7F = 0x407C
-0x7A81 = 0x464D
-0x7A83 = 0x4060
-0x7A84 = 0x3A75
-0x7A88 = 0x6358
-0x7A92 = 0x4362
-0x7A93 = 0x416B
-0x7A95 = 0x635A
-0x7A96 = 0x635C
-0x7A97 = 0x6359
-0x7A98 = 0x635B
-0x7A9F = 0x3722
-0x7AA9 = 0x635D
-0x7AAA = 0x3726
-0x7AAE = 0x3567
-0x7AAF = 0x4D52
-0x7AB0 = 0x635F
-0x7AB6 = 0x6360
-0x7ABA = 0x312E
-0x7ABF = 0x6363
-0x7AC3 = 0x3376
-0x7AC4 = 0x6362
-0x7AC5 = 0x6361
-0x7AC7 = 0x6365
-0x7AC8 = 0x635E
-0x7ACA = 0x6366
-0x7ACB = 0x4E29
-0x7ACD = 0x6367
-0x7ACF = 0x6368
-0x7AD2 = 0x5474
-0x7AD3 = 0x636A
-0x7AD5 = 0x6369
-0x7AD9 = 0x636B
-0x7ADA = 0x636C
-0x7ADC = 0x4E35
-0x7ADD = 0x636D
-0x7ADF = 0x706F
-0x7AE0 = 0x3E4F
-0x7AE1 = 0x636E
-0x7AE2 = 0x636F
-0x7AE3 = 0x3D57
-0x7AE5 = 0x4638
-0x7AE6 = 0x6370
-0x7AEA = 0x4328
-0x7AED = 0x6371
-0x7AEF = 0x433C
-0x7AF0 = 0x6372
-0x7AF6 = 0x3625
-0x7AF8 = 0x513F
-0x7AF9 = 0x435D
-0x7AFA = 0x3C33
-0x7AFF = 0x3448
-0x7B02 = 0x6373
-0x7B04 = 0x6422
-0x7B06 = 0x6376
-0x7B08 = 0x3568
-0x7B0A = 0x6375
-0x7B0B = 0x6424
-0x7B0F = 0x6374
-0x7B11 = 0x3E50
-0x7B18 = 0x6378
-0x7B19 = 0x6379
-0x7B1B = 0x452B
-0x7B1E = 0x637A
-0x7B20 = 0x335E
-0x7B25 = 0x3F5A
-0x7B26 = 0x4964
-0x7B28 = 0x637C
-0x7B2C = 0x4268
-0x7B33 = 0x6377
-0x7B35 = 0x637B
-0x7B36 = 0x637D
-0x7B39 = 0x3A7B
-0x7B45 = 0x6426
-0x7B46 = 0x492E
-0x7B48 = 0x4826
-0x7B49 = 0x4579
-0x7B4B = 0x365A
-0x7B4C = 0x6425
-0x7B4D = 0x6423
-0x7B4F = 0x4835
-0x7B50 = 0x637E
-0x7B51 = 0x435E
-0x7B52 = 0x457B
-0x7B54 = 0x457A
-0x7B56 = 0x3A76
-0x7B5D = 0x6438
-0x7B65 = 0x6428
-0x7B67 = 0x642A
-0x7B6C = 0x642D
-0x7B6E = 0x642E
-0x7B70 = 0x642B
-0x7B71 = 0x642C
-0x7B74 = 0x6429
-0x7B75 = 0x6427
-0x7B7A = 0x6421
-0x7B86 = 0x4A4F
-0x7B87 = 0x3255
-0x7B8B = 0x6435
-0x7B8D = 0x6432
-0x7B8F = 0x6437
-0x7B92 = 0x6436
-0x7B94 = 0x4773
-0x7B95 = 0x4C27
-0x7B97 = 0x3B3B
-0x7B98 = 0x6430
-0x7B99 = 0x6439
-0x7B9A = 0x6434
-0x7B9C = 0x6433
-0x7B9D = 0x642F
-0x7B9F = 0x6431
-0x7BA1 = 0x3449
-0x7BAA = 0x433D
-0x7BAD = 0x407D
-0x7BB1 = 0x4822
-0x7BB4 = 0x643E
-0x7BB8 = 0x4824
-0x7BC0 = 0x4061
-0x7BC1 = 0x643B
-0x7BC4 = 0x484F
-0x7BC6 = 0x643F
-0x7BC7 = 0x4A53
-0x7BC9 = 0x435B
-0x7BCB = 0x643A
-0x7BCC = 0x643C
-0x7BCF = 0x643D
-0x7BDD = 0x6440
-0x7BE0 = 0x3C44
-0x7BE4 = 0x4646
-0x7BE5 = 0x6445
-0x7BE6 = 0x6444
-0x7BE9 = 0x6441
-0x7BED = 0x4F36
-0x7BF3 = 0x644A
-0x7BF6 = 0x644E
-0x7BF7 = 0x644B
-0x7C00 = 0x6447
-0x7C07 = 0x6448
-0x7C0D = 0x644D
-0x7C11 = 0x6442
-0x7C12 = 0x5255
-0x7C13 = 0x6449
-0x7C14 = 0x6443
-0x7C17 = 0x644C
-0x7C1F = 0x6452
-0x7C21 = 0x344A
-0x7C23 = 0x644F
-0x7C27 = 0x6450
-0x7C2A = 0x6451
-0x7C2B = 0x6454
-0x7C37 = 0x6453
-0x7C38 = 0x4876
-0x7C3D = 0x6455
-0x7C3E = 0x4E7C
-0x7C3F = 0x4A6D
-0x7C40 = 0x645A
-0x7C43 = 0x6457
-0x7C4C = 0x6456
-0x7C4D = 0x4052
-0x7C4F = 0x6459
-0x7C50 = 0x645B
-0x7C54 = 0x6458
-0x7C56 = 0x645F
-0x7C58 = 0x645C
-0x7C5F = 0x645D
-0x7C60 = 0x6446
-0x7C64 = 0x645E
-0x7C65 = 0x6460
-0x7C6C = 0x6461
-0x7C73 = 0x4A46
-0x7C75 = 0x6462
-0x7C7E = 0x4C62
-0x7C81 = 0x364E
-0x7C82 = 0x3729
-0x7C83 = 0x6463
-0x7C89 = 0x4A34
-0x7C8B = 0x3F68
-0x7C8D = 0x4C30
-0x7C90 = 0x6464
-0x7C92 = 0x4E33
-0x7C95 = 0x4774
-0x7C97 = 0x4146
-0x7C98 = 0x4734
-0x7C9B = 0x3D4D
-0x7C9F = 0x3040
-0x7CA1 = 0x6469
-0x7CA2 = 0x6467
-0x7CA4 = 0x6465
-0x7CA5 = 0x3421
-0x7CA7 = 0x3E51
-0x7CA8 = 0x646A
-0x7CAB = 0x6468
-0x7CAD = 0x6466
-0x7CAE = 0x646E
-0x7CB1 = 0x646D
-0x7CB2 = 0x646C
-0x7CB3 = 0x646B
-0x7CB9 = 0x646F
-0x7CBD = 0x6470
-0x7CBE = 0x403A
-0x7CC0 = 0x6471
-0x7CC2 = 0x6473
-0x7CC5 = 0x6472
-0x7CCA = 0x3852
-0x7CCE = 0x4138
-0x7CD2 = 0x6475
-0x7CD6 = 0x457C
-0x7CD8 = 0x6474
-0x7CDC = 0x6476
-0x7CDE = 0x4A35
-0x7CDF = 0x416C
-0x7CE0 = 0x3947
-0x7CE2 = 0x6477
-0x7CE7 = 0x4E48
-0x7CEF = 0x6479
-0x7CF2 = 0x647A
-0x7CF4 = 0x647B
-0x7CF6 = 0x647C
-0x7CF8 = 0x3B65
-0x7CFA = 0x647D
-0x7CFB = 0x374F
-0x7CFE = 0x356A
-0x7D00 = 0x352A
-0x7D02 = 0x6521
-0x7D04 = 0x4C73
-0x7D05 = 0x3948
-0x7D06 = 0x647E
-0x7D0A = 0x6524
-0x7D0B = 0x4C66
-0x7D0D = 0x473C
-0x7D10 = 0x4933
-0x7D14 = 0x3D63
-0x7D15 = 0x6523
-0x7D17 = 0x3C53
-0x7D18 = 0x3949
-0x7D19 = 0x3B66
-0x7D1A = 0x3569
-0x7D1B = 0x4A36
-0x7D1C = 0x6522
-0x7D20 = 0x4147
-0x7D21 = 0x4B42
-0x7D22 = 0x3A77
-0x7D2B = 0x3B67
-0x7D2C = 0x445D
-0x7D2E = 0x6527
-0x7D2F = 0x4E5F
-0x7D30 = 0x3A59
-0x7D32 = 0x6528
-0x7D33 = 0x3F42
-0x7D35 = 0x652A
-0x7D39 = 0x3E52
-0x7D3A = 0x3A30
-0x7D3F = 0x6529
-0x7D42 = 0x3D2A
-0x7D43 = 0x383E
-0x7D44 = 0x4148
-0x7D45 = 0x6525
-0x7D46 = 0x652B
-0x7D4B = 0x6526
-0x7D4C = 0x3750
-0x7D4E = 0x652E
-0x7D4F = 0x6532
-0x7D50 = 0x376B
-0x7D56 = 0x652D
-0x7D5B = 0x6536
-0x7D5E = 0x394A
-0x7D61 = 0x4D6D
-0x7D62 = 0x303C
-0x7D63 = 0x6533
-0x7D66 = 0x356B
-0x7D68 = 0x6530
-0x7D6E = 0x6531
-0x7D71 = 0x457D
-0x7D72 = 0x652F
-0x7D73 = 0x652C
-0x7D75 = 0x3328
-0x7D76 = 0x4064
-0x7D79 = 0x3828
-0x7D7D = 0x6538
-0x7D89 = 0x6535
-0x7D8F = 0x6537
-0x7D93 = 0x6534
-0x7D99 = 0x3751
-0x7D9A = 0x4233
-0x7D9B = 0x6539
-0x7D9C = 0x416E
-0x7D9F = 0x6546
-0x7DA2 = 0x6542
-0x7DA3 = 0x653C
-0x7DAB = 0x6540
-0x7DAC = 0x3C7A
-0x7DAD = 0x305D
-0x7DAE = 0x653B
-0x7DAF = 0x6543
-0x7DB0 = 0x6547
-0x7DB1 = 0x394B
-0x7DB2 = 0x4C56
-0x7DB4 = 0x4456
-0x7DB5 = 0x653D
-0x7DB8 = 0x6545
-0x7DBA = 0x653A
-0x7DBB = 0x433E
-0x7DBD = 0x653F
-0x7DBE = 0x303D
-0x7DBF = 0x4C4A
-0x7DC7 = 0x653E
-0x7DCA = 0x365B
-0x7DCB = 0x486C
-0x7DCF = 0x416D
-0x7DD1 = 0x4E50
-0x7DD2 = 0x3D6F
-0x7DD5 = 0x656E
-0x7DD8 = 0x6548
-0x7DDA = 0x407E
-0x7DDC = 0x6544
-0x7DDD = 0x6549
-0x7DDE = 0x654B
-0x7DE0 = 0x4479
-0x7DE1 = 0x654E
-0x7DE4 = 0x654A
-0x7DE8 = 0x4A54
-0x7DE9 = 0x344B
-0x7DEC = 0x4C4B
-0x7DEF = 0x305E
-0x7DF2 = 0x654D
-0x7DF4 = 0x4E7D
-0x7DFB = 0x654C
-0x7E01 = 0x316F
-0x7E04 = 0x466C
-0x7E05 = 0x654F
-0x7E09 = 0x6556
-0x7E0A = 0x6550
-0x7E0B = 0x6557
-0x7E12 = 0x6553
-0x7E1B = 0x477B
-0x7E1E = 0x3C4A
-0x7E1F = 0x6555
-0x7E21 = 0x6552
-0x7E22 = 0x6558
-0x7E23 = 0x6551
-0x7E26 = 0x3D44
-0x7E2B = 0x4B25
-0x7E2E = 0x3D4C
-0x7E31 = 0x6554
-0x7E32 = 0x6560
-0x7E35 = 0x655C
-0x7E37 = 0x655F
-0x7E39 = 0x655D
-0x7E3A = 0x6561
-0x7E3B = 0x655B
-0x7E3D = 0x6541
-0x7E3E = 0x4053
-0x7E41 = 0x484B
-0x7E43 = 0x655E
-0x7E46 = 0x6559
-0x7E4A = 0x4121
-0x7E4B = 0x3752
-0x7E4D = 0x3D2B
-0x7E54 = 0x3F25
-0x7E55 = 0x4136
-0x7E56 = 0x6564
-0x7E59 = 0x6566
-0x7E5A = 0x6567
-0x7E5D = 0x6563
-0x7E5E = 0x6565
-0x7E66 = 0x655A
-0x7E67 = 0x6562
-0x7E69 = 0x656A
-0x7E6A = 0x6569
-0x7E6D = 0x4B7A
-0x7E70 = 0x372B
-0x7E79 = 0x6568
-0x7E7B = 0x656C
-0x7E7C = 0x656B
-0x7E7D = 0x656F
-0x7E7F = 0x6571
-0x7E82 = 0x3B3C
-0x7E83 = 0x656D
-0x7E88 = 0x6572
-0x7E89 = 0x6573
-0x7E8C = 0x6574
-0x7E8E = 0x657A
-0x7E8F = 0x453B
-0x7E90 = 0x6576
-0x7E92 = 0x6575
-0x7E93 = 0x6577
-0x7E94 = 0x6578
-0x7E96 = 0x6579
-0x7E9B = 0x657B
-0x7E9C = 0x657C
-0x7F36 = 0x344C
-0x7F38 = 0x657D
-0x7F3A = 0x657E
-0x7F45 = 0x6621
-0x7F4C = 0x6622
-0x7F4D = 0x6623
-0x7F4E = 0x6624
-0x7F50 = 0x6625
-0x7F51 = 0x6626
-0x7F54 = 0x6628
-0x7F55 = 0x6627
-0x7F58 = 0x6629
-0x7F5F = 0x662A
-0x7F60 = 0x662B
-0x7F67 = 0x662E
-0x7F68 = 0x662C
-0x7F69 = 0x662D
-0x7F6A = 0x3A61
-0x7F6B = 0x3753
-0x7F6E = 0x4356
-0x7F70 = 0x4833
-0x7F72 = 0x3D70
-0x7F75 = 0x474D
-0x7F77 = 0x486D
-0x7F78 = 0x662F
-0x7F79 = 0x586D
-0x7F82 = 0x6630
-0x7F83 = 0x6632
-0x7F85 = 0x4D65
-0x7F86 = 0x6631
-0x7F87 = 0x6634
-0x7F88 = 0x6633
-0x7F8A = 0x4D53
-0x7F8C = 0x6635
-0x7F8E = 0x487E
-0x7F94 = 0x6636
-0x7F9A = 0x6639
-0x7F9D = 0x6638
-0x7F9E = 0x6637
-0x7FA3 = 0x663A
-0x7FA4 = 0x3732
-0x7FA8 = 0x4122
-0x7FA9 = 0x3541
-0x7FAE = 0x663E
-0x7FAF = 0x663B
-0x7FB2 = 0x663C
-0x7FB6 = 0x663F
-0x7FB8 = 0x6640
-0x7FB9 = 0x663D
-0x7FBD = 0x3129
-0x7FC1 = 0x3227
-0x7FC5 = 0x6642
-0x7FC6 = 0x6643
-0x7FCA = 0x6644
-0x7FCC = 0x4D62
-0x7FD2 = 0x3D2C
-0x7FD4 = 0x6646
-0x7FD5 = 0x6645
-0x7FE0 = 0x3F69
-0x7FE1 = 0x6647
-0x7FE6 = 0x6648
-0x7FE9 = 0x6649
-0x7FEB = 0x3465
-0x7FF0 = 0x344D
-0x7FF3 = 0x664A
-0x7FF9 = 0x664B
-0x7FFB = 0x4B5D
-0x7FFC = 0x4D63
-0x8000 = 0x4D54
-0x8001 = 0x4F37
-0x8003 = 0x394D
-0x8004 = 0x664E
-0x8005 = 0x3C54
-0x8006 = 0x664D
-0x800B = 0x664F
-0x800C = 0x3C29
-0x8010 = 0x4251
-0x8012 = 0x6650
-0x8015 = 0x394C
-0x8017 = 0x4C57
-0x8018 = 0x6651
-0x8019 = 0x6652
-0x801C = 0x6653
-0x8021 = 0x6654
-0x8028 = 0x6655
-0x8033 = 0x3C2A
-0x8036 = 0x4C6D
-0x803B = 0x6657
-0x803D = 0x433F
-0x803F = 0x6656
-0x8046 = 0x6659
-0x804A = 0x6658
-0x8052 = 0x665A
-0x8056 = 0x403B
-0x8058 = 0x665B
-0x805A = 0x665C
-0x805E = 0x4A39
-0x805F = 0x665D
-0x8061 = 0x416F
-0x8062 = 0x665E
-0x8068 = 0x665F
-0x806F = 0x4E7E
-0x8070 = 0x6662
-0x8072 = 0x6661
-0x8073 = 0x6660
-0x8074 = 0x4430
-0x8076 = 0x6663
-0x8077 = 0x3F26
-0x8079 = 0x6664
-0x807D = 0x6665
-0x807E = 0x4F38
-0x807F = 0x6666
-0x8084 = 0x6667
-0x8085 = 0x6669
-0x8086 = 0x6668
-0x8087 = 0x4825
-0x8089 = 0x4679
-0x808B = 0x4F3E
-0x808C = 0x4829
-0x8093 = 0x666B
-0x8096 = 0x3E53
-0x8098 = 0x492A
-0x809A = 0x666C
-0x809B = 0x666A
-0x809D = 0x344E
-0x80A1 = 0x3854
-0x80A2 = 0x3B68
-0x80A5 = 0x486E
-0x80A9 = 0x382A
-0x80AA = 0x4B43
-0x80AC = 0x666F
-0x80AD = 0x666D
-0x80AF = 0x394E
-0x80B1 = 0x394F
-0x80B2 = 0x3069
-0x80B4 = 0x3A68
-0x80BA = 0x4759
-0x80C3 = 0x305F
-0x80C4 = 0x6674
-0x80C6 = 0x4340
-0x80CC = 0x4758
-0x80CE = 0x425B
-0x80D6 = 0x6676
-0x80D9 = 0x6672
-0x80DA = 0x6675
-0x80DB = 0x6670
-0x80DD = 0x6673
-0x80DE = 0x4B26
-0x80E1 = 0x3855
-0x80E4 = 0x307D
-0x80E5 = 0x6671
-0x80EF = 0x6678
-0x80F1 = 0x6679
-0x80F4 = 0x4639
-0x80F8 = 0x363B
-0x80FC = 0x6726
-0x80FD = 0x473D
-0x8102 = 0x3B69
-0x8105 = 0x363C
-0x8106 = 0x4048
-0x8107 = 0x4F46
-0x8108 = 0x4C2E
-0x8109 = 0x6677
-0x810A = 0x4054
-0x811A = 0x3553
-0x811B = 0x667A
-0x8123 = 0x667C
-0x8129 = 0x667B
-0x812F = 0x667D
-0x8131 = 0x4326
-0x8133 = 0x473E
-0x8139 = 0x4431
-0x813E = 0x6723
-0x8146 = 0x6722
-0x814B = 0x667E
-0x814E = 0x3F55
-0x8150 = 0x4965
-0x8151 = 0x6725
-0x8153 = 0x6724
-0x8154 = 0x3950
-0x8155 = 0x4F53
-0x815F = 0x6735
-0x8165 = 0x6729
-0x8166 = 0x672A
-0x816B = 0x3C70
-0x816E = 0x6728
-0x8170 = 0x3978
-0x8171 = 0x6727
-0x8174 = 0x672B
-0x8178 = 0x4432
-0x8179 = 0x4A22
-0x817A = 0x4123
-0x817F = 0x425C
-0x8180 = 0x672F
-0x8182 = 0x6730
-0x8183 = 0x672C
-0x8188 = 0x672D
-0x818A = 0x672E
-0x818F = 0x3951
-0x8193 = 0x6736
-0x8195 = 0x6732
-0x819A = 0x4966
-0x819C = 0x4B6C
-0x819D = 0x4928
-0x81A0 = 0x6731
-0x81A3 = 0x6734
-0x81A4 = 0x6733
-0x81A8 = 0x4B44
-0x81A9 = 0x6737
-0x81B0 = 0x6738
-0x81B3 = 0x4137
-0x81B5 = 0x6739
-0x81B8 = 0x673B
-0x81BA = 0x673F
-0x81BD = 0x673C
-0x81BE = 0x673A
-0x81BF = 0x473F
-0x81C0 = 0x673D
-0x81C2 = 0x673E
-0x81C6 = 0x3232
-0x81C8 = 0x6745
-0x81C9 = 0x6740
-0x81CD = 0x6741
-0x81D1 = 0x6742
-0x81D3 = 0x4221
-0x81D8 = 0x6744
-0x81D9 = 0x6743
-0x81DA = 0x6746
-0x81DF = 0x6747
-0x81E0 = 0x6748
-0x81E3 = 0x3F43
-0x81E5 = 0x3269
-0x81E7 = 0x6749
-0x81E8 = 0x4E57
-0x81EA = 0x3C2B
-0x81ED = 0x3D2D
-0x81F3 = 0x3B6A
-0x81F4 = 0x4357
-0x81FA = 0x674A
-0x81FB = 0x674B
-0x81FC = 0x3131
-0x81FE = 0x674C
-0x8201 = 0x674D
-0x8202 = 0x674E
-0x8205 = 0x674F
-0x8207 = 0x6750
-0x8208 = 0x363D
-0x8209 = 0x5A2A
-0x820A = 0x6751
-0x820C = 0x4065
-0x820D = 0x6752
-0x820E = 0x3C4B
-0x8210 = 0x6753
-0x8212 = 0x5030
-0x8216 = 0x6754
-0x8217 = 0x4A5E
-0x8218 = 0x345C
-0x821B = 0x4124
-0x821C = 0x3D58
-0x821E = 0x4971
-0x821F = 0x3D2E
-0x8229 = 0x6755
-0x822A = 0x3952
-0x822B = 0x6756
-0x822C = 0x484C
-0x822E = 0x6764
-0x8233 = 0x6758
-0x8235 = 0x4249
-0x8236 = 0x4775
-0x8237 = 0x383F
-0x8238 = 0x6757
-0x8239 = 0x4125
-0x8240 = 0x6759
-0x8247 = 0x447A
-0x8258 = 0x675B
-0x8259 = 0x675A
-0x825A = 0x675D
-0x825D = 0x675C
-0x825F = 0x675E
-0x8262 = 0x6760
-0x8264 = 0x675F
-0x8266 = 0x344F
-0x8268 = 0x6761
-0x826A = 0x6762
-0x826B = 0x6763
-0x826E = 0x3A31
-0x826F = 0x4E49
-0x8271 = 0x6765
-0x8272 = 0x3F27
-0x8276 = 0x3170
-0x8277 = 0x6766
-0x8278 = 0x6767
-0x827E = 0x6768
-0x828B = 0x3072
-0x828D = 0x6769
-0x8292 = 0x676A
-0x8299 = 0x4967
-0x829D = 0x3C47
-0x829F = 0x676C
-0x82A5 = 0x3329
-0x82A6 = 0x3032
-0x82AB = 0x676B
-0x82AC = 0x676E
-0x82AD = 0x474E
-0x82AF = 0x3F44
-0x82B1 = 0x3256
-0x82B3 = 0x4B27
-0x82B8 = 0x375D
-0x82B9 = 0x365C
-0x82BB = 0x676D
-0x82BD = 0x326A
-0x82C5 = 0x3423
-0x82D1 = 0x3171
-0x82D2 = 0x6772
-0x82D3 = 0x4E6A
-0x82D4 = 0x425D
-0x82D7 = 0x4944
-0x82D9 = 0x677E
-0x82DB = 0x3257
-0x82DC = 0x677C
-0x82DE = 0x677A
-0x82DF = 0x6771
-0x82E1 = 0x676F
-0x82E3 = 0x6770
-0x82E5 = 0x3C63
-0x82E6 = 0x366C
-0x82E7 = 0x4377
-0x82EB = 0x4651
-0x82F1 = 0x3151
-0x82F3 = 0x6774
-0x82F4 = 0x6773
-0x82F9 = 0x6779
-0x82FA = 0x6775
-0x82FB = 0x6778
-0x8302 = 0x4C50
-0x8303 = 0x6777
-0x8304 = 0x3258
-0x8305 = 0x337D
-0x8306 = 0x677B
-0x8309 = 0x677D
-0x830E = 0x3754
-0x8316 = 0x6823
-0x8317 = 0x682C
-0x8318 = 0x682D
-0x831C = 0x302B
-0x8323 = 0x6834
-0x8328 = 0x3071
-0x832B = 0x682B
-0x832F = 0x682A
-0x8331 = 0x6825
-0x8332 = 0x6824
-0x8334 = 0x6822
-0x8335 = 0x6821
-0x8336 = 0x4363
-0x8338 = 0x427B
-0x8339 = 0x6827
-0x8340 = 0x6826
-0x8345 = 0x6829
-0x8349 = 0x4170
-0x834A = 0x3755
-0x834F = 0x3141
-0x8350 = 0x6828
-0x8352 = 0x3953
-0x8358 = 0x4171
-0x8373 = 0x683A
-0x8375 = 0x683B
-0x8377 = 0x3259
-0x837B = 0x322E
-0x837C = 0x6838
-0x8385 = 0x682E
-0x8387 = 0x6836
-0x8389 = 0x683D
-0x838A = 0x6837
-0x838E = 0x6835
-0x8393 = 0x6776
-0x8396 = 0x6833
-0x839A = 0x682F
-0x839E = 0x3450
-0x839F = 0x6831
-0x83A0 = 0x683C
-0x83A2 = 0x6832
-0x83A8 = 0x683E
-0x83AA = 0x6830
-0x83AB = 0x477C
-0x83B1 = 0x4D69
-0x83B5 = 0x6839
-0x83BD = 0x684F
-0x83C1 = 0x6847
-0x83C5 = 0x3F7B
-0x83CA = 0x3546
-0x83CC = 0x365D
-0x83CE = 0x6842
-0x83D3 = 0x325B
-0x83D6 = 0x3E54
-0x83D8 = 0x6845
-0x83DC = 0x3A5A
-0x83DF = 0x4551
-0x83E0 = 0x684A
-0x83E9 = 0x4A6E
-0x83EB = 0x6841
-0x83EF = 0x325A
-0x83F0 = 0x3856
-0x83F1 = 0x4929
-0x83F2 = 0x684B
-0x83F4 = 0x683F
-0x83F7 = 0x6848
-0x83FB = 0x6852
-0x83FD = 0x6843
-0x8403 = 0x6844
-0x8404 = 0x463A
-0x8407 = 0x6849
-0x840B = 0x6846
-0x840C = 0x4B28
-0x840D = 0x684C
-0x840E = 0x3060
-0x8413 = 0x6840
-0x8420 = 0x684E
-0x8422 = 0x684D
-0x8429 = 0x476B
-0x842A = 0x6854
-0x842C = 0x685F
-0x8431 = 0x337E
-0x8435 = 0x6862
-0x8438 = 0x6850
-0x843C = 0x6855
-0x843D = 0x4D6E
-0x8446 = 0x685E
-0x8449 = 0x4D55
-0x844E = 0x4E2A
-0x8457 = 0x4378
-0x845B = 0x336B
-0x8461 = 0x4972
-0x8462 = 0x6864
-0x8463 = 0x4621
-0x8466 = 0x3031
-0x8469 = 0x685D
-0x846B = 0x6859
-0x846C = 0x4172
-0x846D = 0x6853
-0x846E = 0x685B
-0x846F = 0x6860
-0x8471 = 0x472C
-0x8475 = 0x302A
-0x8477 = 0x6858
-0x8479 = 0x6861
-0x847A = 0x4978
-0x8482 = 0x685C
-0x8484 = 0x6857
-0x848B = 0x3E55
-0x8490 = 0x3D2F
-0x8494 = 0x3C2C
-0x8499 = 0x4C58
-0x849C = 0x4947
-0x849F = 0x6867
-0x84A1 = 0x6870
-0x84AD = 0x685A
-0x84B2 = 0x3377
-0x84B8 = 0x3E78
-0x84B9 = 0x6865
-0x84BB = 0x686A
-0x84BC = 0x4173
-0x84BF = 0x6866
-0x84C1 = 0x686D
-0x84C4 = 0x435F
-0x84C6 = 0x686E
-0x84C9 = 0x4D56
-0x84CA = 0x6863
-0x84CB = 0x3338
-0x84CD = 0x6869
-0x84D0 = 0x686C
-0x84D1 = 0x4C2C
-0x84D6 = 0x686F
-0x84D9 = 0x6868
-0x84DA = 0x686B
-0x84EC = 0x4B29
-0x84EE = 0x4F21
-0x84F4 = 0x6873
-0x84FC = 0x687A
-0x84FF = 0x6872
-0x8500 = 0x3C43
-0x8506 = 0x6851
-0x8511 = 0x4A4E
-0x8513 = 0x4C22
-0x8514 = 0x6879
-0x8515 = 0x6878
-0x8517 = 0x6874
-0x8518 = 0x6875
-0x851A = 0x3136
-0x851F = 0x6877
-0x8521 = 0x6871
-0x8526 = 0x4455
-0x852C = 0x6876
-0x852D = 0x307E
-0x8535 = 0x4222
-0x853D = 0x4A43
-0x8540 = 0x687B
-0x8541 = 0x6921
-0x8543 = 0x4859
-0x8548 = 0x687E
-0x8549 = 0x3E56
-0x854A = 0x3C49
-0x854B = 0x6923
-0x854E = 0x363E
-0x8555 = 0x6924
-0x8557 = 0x4979
-0x8558 = 0x687D
-0x855A = 0x6856
-0x8563 = 0x687C
-0x8568 = 0x4F4F
-0x8569 = 0x4622
-0x856A = 0x4973
-0x856D = 0x692B
-0x8577 = 0x6931
-0x857E = 0x6932
-0x8580 = 0x6925
-0x8584 = 0x4776
-0x8587 = 0x692F
-0x8588 = 0x6927
-0x858A = 0x6929
-0x8590 = 0x6933
-0x8591 = 0x6928
-0x8594 = 0x692C
-0x8597 = 0x3172
-0x8599 = 0x4665
-0x859B = 0x692D
-0x859C = 0x6930
-0x85A4 = 0x6926
-0x85A6 = 0x4126
-0x85A8 = 0x692A
-0x85A9 = 0x3B27
-0x85AA = 0x3F45
-0x85AB = 0x3730
-0x85AC = 0x4C74
-0x85AE = 0x4C79
-0x85AF = 0x3D72
-0x85B9 = 0x6937
-0x85BA = 0x6935
-0x85C1 = 0x4F4E
-0x85C9 = 0x6934
-0x85CD = 0x4D75
-0x85CF = 0x6936
-0x85D0 = 0x6938
-0x85D5 = 0x6939
-0x85DC = 0x693C
-0x85DD = 0x693A
-0x85E4 = 0x4623
-0x85E5 = 0x693B
-0x85E9 = 0x484D
-0x85EA = 0x692E
-0x85F7 = 0x3D73
-0x85F9 = 0x693D
-0x85FA = 0x6942
-0x85FB = 0x4174
-0x85FE = 0x6941
-0x8602 = 0x6922
-0x8606 = 0x6943
-0x8607 = 0x4149
-0x860A = 0x693E
-0x860B = 0x6940
-0x8613 = 0x693F
-0x8616 = 0x5D31
-0x8617 = 0x5D22
-0x861A = 0x6945
-0x8622 = 0x6944
-0x862D = 0x4D76
-0x862F = 0x623C
-0x8630 = 0x6946
-0x863F = 0x6947
-0x864D = 0x6948
-0x864E = 0x3857
-0x8650 = 0x3554
-0x8654 = 0x694A
-0x8655 = 0x515D
-0x865A = 0x3575
-0x865C = 0x4E3A
-0x865E = 0x3673
-0x865F = 0x694B
-0x8667 = 0x694C
-0x866B = 0x436E
-0x8671 = 0x694D
-0x8679 = 0x467A
-0x867B = 0x303A
-0x868A = 0x3263
-0x868B = 0x6952
-0x868C = 0x6953
-0x8693 = 0x694E
-0x8695 = 0x3B3D
-0x86A3 = 0x694F
-0x86A4 = 0x4742
-0x86A9 = 0x6950
-0x86AA = 0x6951
-0x86AB = 0x695B
-0x86AF = 0x6955
-0x86B0 = 0x6958
-0x86B6 = 0x6954
-0x86C4 = 0x6956
-0x86C6 = 0x6957
-0x86C7 = 0x3C58
-0x86C9 = 0x6959
-0x86CB = 0x4341
-0x86CD = 0x3756
-0x86CE = 0x3342
-0x86D4 = 0x695C
-0x86D9 = 0x333F
-0x86DB = 0x6961
-0x86DE = 0x695D
-0x86DF = 0x6960
-0x86E4 = 0x483A
-0x86E9 = 0x695E
-0x86EC = 0x695F
-0x86ED = 0x4948
-0x86EE = 0x485A
-0x86EF = 0x6962
-0x86F8 = 0x427D
-0x86F9 = 0x696C
-0x86FB = 0x6968
-0x86FE = 0x326B
-0x8700 = 0x6966
-0x8702 = 0x4B2A
-0x8703 = 0x6967
-0x8706 = 0x6964
-0x8708 = 0x6965
-0x8709 = 0x696A
-0x870A = 0x696D
-0x870D = 0x696B
-0x8711 = 0x6969
-0x8712 = 0x6963
-0x8718 = 0x4358
-0x871A = 0x6974
-0x871C = 0x4C2A
-0x8725 = 0x6972
-0x8729 = 0x6973
-0x8734 = 0x696E
-0x8737 = 0x6970
-0x873B = 0x6971
-0x873F = 0x696F
-0x8749 = 0x4066
-0x874B = 0x4F39
-0x874C = 0x6978
-0x874E = 0x6979
-0x8753 = 0x6A21
-0x8755 = 0x3F2A
-0x8757 = 0x697B
-0x8759 = 0x697E
-0x875F = 0x6976
-0x8760 = 0x6975
-0x8763 = 0x6A22
-0x8766 = 0x325C
-0x8768 = 0x697C
-0x876A = 0x6A23
-0x876E = 0x697D
-0x8774 = 0x697A
-0x8776 = 0x4433
-0x8778 = 0x6977
-0x877F = 0x4768
-0x8782 = 0x6A27
-0x878D = 0x4D3B
-0x879F = 0x6A26
-0x87A2 = 0x6A25
-0x87AB = 0x6A2E
-0x87AF = 0x6A28
-0x87B3 = 0x6A30
-0x87BA = 0x4D66
-0x87BB = 0x6A33
-0x87BD = 0x6A2A
-0x87C0 = 0x6A2B
-0x87C4 = 0x6A2F
-0x87C6 = 0x6A32
-0x87C7 = 0x6A31
-0x87CB = 0x6A29
-0x87D0 = 0x6A2C
-0x87D2 = 0x6A3D
-0x87E0 = 0x6A36
-0x87EF = 0x6A34
-0x87F2 = 0x6A35
-0x87F6 = 0x6A3A
-0x87F7 = 0x6A3B
-0x87F9 = 0x332A
-0x87FB = 0x3542
-0x87FE = 0x6A39
-0x8805 = 0x6A24
-0x880D = 0x6A38
-0x880E = 0x6A3C
-0x880F = 0x6A37
-0x8811 = 0x6A3E
-0x8815 = 0x6A40
-0x8816 = 0x6A3F
-0x8821 = 0x6A42
-0x8822 = 0x6A41
-0x8823 = 0x695A
-0x8827 = 0x6A46
-0x8831 = 0x6A43
-0x8836 = 0x6A44
-0x8839 = 0x6A45
-0x883B = 0x6A47
-0x8840 = 0x376C
-0x8842 = 0x6A49
-0x8844 = 0x6A48
-0x8846 = 0x3D30
-0x884C = 0x3954
-0x884D = 0x5E27
-0x8852 = 0x6A4A
-0x8853 = 0x3D51
-0x8857 = 0x3339
-0x8859 = 0x6A4B
-0x885B = 0x3152
-0x885D = 0x3E57
-0x885E = 0x6A4C
-0x8861 = 0x3955
-0x8862 = 0x6A4D
-0x8863 = 0x3061
-0x8868 = 0x493D
-0x886B = 0x6A4E
-0x8870 = 0x3F6A
-0x8872 = 0x6A55
-0x8875 = 0x6A52
-0x8877 = 0x436F
-0x887D = 0x6A53
-0x887E = 0x6A50
-0x887F = 0x365E
-0x8881 = 0x6A4F
-0x8882 = 0x6A56
-0x8888 = 0x3736
-0x888B = 0x425E
-0x888D = 0x6A5C
-0x8892 = 0x6A58
-0x8896 = 0x4235
-0x8897 = 0x6A57
-0x8899 = 0x6A5A
-0x889E = 0x6A51
-0x88A2 = 0x6A5B
-0x88A4 = 0x6A5D
-0x88AB = 0x486F
-0x88AE = 0x6A59
-0x88B0 = 0x6A5E
-0x88B1 = 0x6A60
-0x88B4 = 0x3853
-0x88B5 = 0x6A54
-0x88B7 = 0x3041
-0x88BF = 0x6A5F
-0x88C1 = 0x3A5B
-0x88C2 = 0x4E76
-0x88C3 = 0x6A61
-0x88C4 = 0x6A62
-0x88C5 = 0x4175
-0x88CF = 0x4E22
-0x88D4 = 0x6A63
-0x88D5 = 0x4D35
-0x88D8 = 0x6A64
-0x88D9 = 0x6A65
-0x88DC = 0x4A64
-0x88DD = 0x6A66
-0x88DF = 0x3A40
-0x88E1 = 0x4E23
-0x88E8 = 0x6A6B
-0x88F2 = 0x6A6C
-0x88F3 = 0x3E58
-0x88F4 = 0x6A6A
-0x88F8 = 0x4D67
-0x88F9 = 0x6A67
-0x88FC = 0x6A69
-0x88FD = 0x403D
-0x88FE = 0x3F7E
-0x8902 = 0x6A68
-0x8904 = 0x6A6D
-0x8907 = 0x4A23
-0x890A = 0x6A6F
-0x890C = 0x6A6E
-0x8910 = 0x336C
-0x8912 = 0x4B2B
-0x8913 = 0x6A70
-0x891D = 0x6A7C
-0x891E = 0x6A72
-0x8925 = 0x6A73
-0x892A = 0x6A74
-0x892B = 0x6A75
-0x8936 = 0x6A79
-0x8938 = 0x6A7A
-0x893B = 0x6A78
-0x8941 = 0x6A76
-0x8943 = 0x6A71
-0x8944 = 0x6A77
-0x894C = 0x6A7B
-0x894D = 0x7037
-0x8956 = 0x3228
-0x895E = 0x6A7E
-0x895F = 0x365F
-0x8960 = 0x6A7D
-0x8964 = 0x6B22
-0x8966 = 0x6B21
-0x896A = 0x6B24
-0x896D = 0x6B23
-0x896F = 0x6B25
-0x8972 = 0x3D31
-0x8974 = 0x6B26
-0x8977 = 0x6B27
-0x897E = 0x6B28
-0x897F = 0x403E
-0x8981 = 0x4D57
-0x8983 = 0x6B29
-0x8986 = 0x4A24
-0x8987 = 0x4746
-0x8988 = 0x6B2A
-0x898A = 0x6B2B
-0x898B = 0x382B
-0x898F = 0x352C
-0x8993 = 0x6B2C
-0x8996 = 0x3B6B
-0x8997 = 0x4741
-0x8998 = 0x6B2D
-0x899A = 0x3350
-0x89A1 = 0x6B2E
-0x89A6 = 0x6B30
-0x89A7 = 0x4D77
-0x89A9 = 0x6B2F
-0x89AA = 0x3F46
-0x89AC = 0x6B31
-0x89AF = 0x6B32
-0x89B2 = 0x6B33
-0x89B3 = 0x3451
-0x89BA = 0x6B34
-0x89BD = 0x6B35
-0x89BF = 0x6B36
-0x89C0 = 0x6B37
-0x89D2 = 0x3351
-0x89DA = 0x6B38
-0x89DC = 0x6B39
-0x89DD = 0x6B3A
-0x89E3 = 0x3272
-0x89E6 = 0x3F28
-0x89E7 = 0x6B3B
-0x89F4 = 0x6B3C
-0x89F8 = 0x6B3D
-0x8A00 = 0x3840
-0x8A02 = 0x447B
-0x8A03 = 0x6B3E
-0x8A08 = 0x3757
-0x8A0A = 0x3F56
-0x8A0C = 0x6B41
-0x8A0E = 0x4624
-0x8A10 = 0x6B40
-0x8A13 = 0x3731
-0x8A16 = 0x6B3F
-0x8A17 = 0x4277
-0x8A18 = 0x352D
-0x8A1B = 0x6B42
-0x8A1D = 0x6B43
-0x8A1F = 0x3E59
-0x8A23 = 0x376D
-0x8A25 = 0x6B44
-0x8A2A = 0x4B2C
-0x8A2D = 0x405F
-0x8A31 = 0x3576
-0x8A33 = 0x4C75
-0x8A34 = 0x414A
-0x8A36 = 0x6B45
-0x8A3A = 0x3F47
-0x8A3B = 0x4370
-0x8A3C = 0x3E5A
-0x8A41 = 0x6B46
-0x8A46 = 0x6B49
-0x8A48 = 0x6B4A
-0x8A50 = 0x3A3E
-0x8A51 = 0x4242
-0x8A52 = 0x6B48
-0x8A54 = 0x3E5B
-0x8A55 = 0x493E
-0x8A5B = 0x6B47
-0x8A5E = 0x3B6C
-0x8A60 = 0x3153
-0x8A62 = 0x6B4E
-0x8A63 = 0x3758
-0x8A66 = 0x3B6E
-0x8A69 = 0x3B6D
-0x8A6B = 0x4F4D
-0x8A6C = 0x6B4D
-0x8A6D = 0x6B4C
-0x8A6E = 0x4127
-0x8A70 = 0x354D
-0x8A71 = 0x4F43
-0x8A72 = 0x333A
-0x8A73 = 0x3E5C
-0x8A7C = 0x6B4B
-0x8A82 = 0x6B50
-0x8A84 = 0x6B51
-0x8A85 = 0x6B4F
-0x8A87 = 0x3858
-0x8A89 = 0x4D40
-0x8A8C = 0x3B6F
-0x8A8D = 0x4727
-0x8A91 = 0x6B54
-0x8A93 = 0x4040
-0x8A95 = 0x4342
-0x8A98 = 0x4D36
-0x8A9A = 0x6B57
-0x8A9E = 0x386C
-0x8AA0 = 0x403F
-0x8AA1 = 0x6B53
-0x8AA3 = 0x6B58
-0x8AA4 = 0x386D
-0x8AA5 = 0x6B55
-0x8AA6 = 0x6B56
-0x8AA8 = 0x6B52
-0x8AAC = 0x4062
-0x8AAD = 0x4649
-0x8AB0 = 0x432F
-0x8AB2 = 0x325D
-0x8AB9 = 0x4870
-0x8ABC = 0x3543
-0x8ABF = 0x4434
-0x8AC2 = 0x6B5B
-0x8AC4 = 0x6B59
-0x8AC7 = 0x434C
-0x8ACB = 0x4041
-0x8ACC = 0x3452
-0x8ACD = 0x6B5A
-0x8ACF = 0x3F5B
-0x8AD2 = 0x4E4A
-0x8AD6 = 0x4F40
-0x8ADA = 0x6B5C
-0x8ADB = 0x6B67
-0x8ADC = 0x4435
-0x8ADE = 0x6B66
-0x8AE0 = 0x6B63
-0x8AE1 = 0x6B6B
-0x8AE2 = 0x6B64
-0x8AE4 = 0x6B60
-0x8AE6 = 0x447C
-0x8AE7 = 0x6B5F
-0x8AEB = 0x6B5D
-0x8AED = 0x4D21
-0x8AEE = 0x3B70
-0x8AF1 = 0x6B61
-0x8AF3 = 0x6B5E
-0x8AF7 = 0x6B65
-0x8AF8 = 0x3D74
-0x8AFA = 0x3841
-0x8AFE = 0x427A
-0x8B00 = 0x4B45
-0x8B01 = 0x315A
-0x8B02 = 0x3062
-0x8B04 = 0x4625
-0x8B07 = 0x6B69
-0x8B0C = 0x6B68
-0x8B0E = 0x4666
-0x8B10 = 0x6B6D
-0x8B14 = 0x6B62
-0x8B16 = 0x6B6C
-0x8B17 = 0x6B6E
-0x8B19 = 0x382C
-0x8B1A = 0x6B6A
-0x8B1B = 0x3956
-0x8B1D = 0x3C55
-0x8B20 = 0x6B6F
-0x8B21 = 0x4D58
-0x8B26 = 0x6B72
-0x8B28 = 0x6B75
-0x8B2B = 0x6B73
-0x8B2C = 0x4935
-0x8B33 = 0x6B70
-0x8B39 = 0x3660
-0x8B3E = 0x6B74
-0x8B41 = 0x6B76
-0x8B49 = 0x6B7A
-0x8B4C = 0x6B77
-0x8B4E = 0x6B79
-0x8B4F = 0x6B78
-0x8B56 = 0x6B7B
-0x8B58 = 0x3C31
-0x8B5A = 0x6B7D
-0x8B5B = 0x6B7C
-0x8B5C = 0x4968
-0x8B5F = 0x6C21
-0x8B66 = 0x3759
-0x8B6B = 0x6B7E
-0x8B6C = 0x6C22
-0x8B6F = 0x6C23
-0x8B70 = 0x3544
-0x8B71 = 0x6641
-0x8B72 = 0x3E79
-0x8B74 = 0x6C24
-0x8B77 = 0x386E
-0x8B7D = 0x6C25
-0x8B80 = 0x6C26
-0x8B83 = 0x3B3E
-0x8B8A = 0x5A4E
-0x8B8C = 0x6C27
-0x8B8E = 0x6C28
-0x8B90 = 0x3D32
-0x8B92 = 0x6C29
-0x8B93 = 0x6C2A
-0x8B96 = 0x6C2B
-0x8B99 = 0x6C2C
-0x8B9A = 0x6C2D
-0x8C37 = 0x432B
-0x8C3A = 0x6C2E
-0x8C3F = 0x6C30
-0x8C41 = 0x6C2F
-0x8C46 = 0x4626
-0x8C48 = 0x6C31
-0x8C4A = 0x4B2D
-0x8C4C = 0x6C32
-0x8C4E = 0x6C33
-0x8C50 = 0x6C34
-0x8C55 = 0x6C35
-0x8C5A = 0x465A
-0x8C61 = 0x3E5D
-0x8C62 = 0x6C36
-0x8C6A = 0x396B
-0x8C6B = 0x502E
-0x8C6C = 0x6C37
-0x8C78 = 0x6C38
-0x8C79 = 0x493F
-0x8C7A = 0x6C39
-0x8C7C = 0x6C41
-0x8C82 = 0x6C3A
-0x8C85 = 0x6C3C
-0x8C89 = 0x6C3B
-0x8C8A = 0x6C3D
-0x8C8C = 0x4B46
-0x8C8D = 0x6C3E
-0x8C8E = 0x6C3F
-0x8C94 = 0x6C40
-0x8C98 = 0x6C42
-0x8C9D = 0x332D
-0x8C9E = 0x4467
-0x8CA0 = 0x4969
-0x8CA1 = 0x3A62
-0x8CA2 = 0x3957
-0x8CA7 = 0x494F
-0x8CA8 = 0x325F
-0x8CA9 = 0x484E
-0x8CAA = 0x6C45
-0x8CAB = 0x3453
-0x8CAC = 0x4055
-0x8CAD = 0x6C44
-0x8CAE = 0x6C49
-0x8CAF = 0x4379
-0x8CB0 = 0x4C63
-0x8CB2 = 0x6C47
-0x8CB3 = 0x6C48
-0x8CB4 = 0x352E
-0x8CB6 = 0x6C4A
-0x8CB7 = 0x4763
-0x8CB8 = 0x425F
-0x8CBB = 0x4871
-0x8CBC = 0x453D
-0x8CBD = 0x6C46
-0x8CBF = 0x4B47
-0x8CC0 = 0x326C
-0x8CC1 = 0x6C4C
-0x8CC2 = 0x4F28
-0x8CC3 = 0x4442
-0x8CC4 = 0x4F45
-0x8CC7 = 0x3B71
-0x8CC8 = 0x6C4B
-0x8CCA = 0x4231
-0x8CCD = 0x6C5C
-0x8CCE = 0x4128
-0x8CD1 = 0x4678
-0x8CD3 = 0x4950
-0x8CDA = 0x6C4F
-0x8CDB = 0x3B3F
-0x8CDC = 0x3B72
-0x8CDE = 0x3E5E
-0x8CE0 = 0x4765
-0x8CE2 = 0x382D
-0x8CE3 = 0x6C4E
-0x8CE4 = 0x6C4D
-0x8CE6 = 0x496A
-0x8CEA = 0x3C41
-0x8CED = 0x4552
-0x8CFA = 0x6C51
-0x8CFB = 0x6C52
-0x8CFC = 0x3958
-0x8CFD = 0x6C50
-0x8D04 = 0x6C53
-0x8D05 = 0x6C54
-0x8D07 = 0x6C56
-0x8D08 = 0x4223
-0x8D0A = 0x6C55
-0x8D0B = 0x3466
-0x8D0D = 0x6C58
-0x8D0F = 0x6C57
-0x8D10 = 0x6C59
-0x8D13 = 0x6C5B
-0x8D14 = 0x6C5D
-0x8D16 = 0x6C5E
-0x8D64 = 0x4056
-0x8D66 = 0x3C4F
-0x8D67 = 0x6C5F
-0x8D6B = 0x3352
-0x8D6D = 0x6C60
-0x8D70 = 0x4176
-0x8D71 = 0x6C61
-0x8D73 = 0x6C62
-0x8D74 = 0x496B
-0x8D77 = 0x352F
-0x8D81 = 0x6C63
-0x8D85 = 0x4436
-0x8D8A = 0x315B
-0x8D99 = 0x6C64
-0x8DA3 = 0x3C71
-0x8DA8 = 0x3F76
-0x8DB3 = 0x422D
-0x8DBA = 0x6C67
-0x8DBE = 0x6C66
-0x8DC2 = 0x6C65
-0x8DCB = 0x6C6D
-0x8DCC = 0x6C6B
-0x8DCF = 0x6C68
-0x8DD6 = 0x6C6A
-0x8DDA = 0x6C69
-0x8DDB = 0x6C6C
-0x8DDD = 0x3577
-0x8DDF = 0x6C70
-0x8DE1 = 0x4057
-0x8DE3 = 0x6C71
-0x8DE8 = 0x3859
-0x8DEA = 0x6C6E
-0x8DEB = 0x6C6F
-0x8DEF = 0x4F29
-0x8DF3 = 0x4437
-0x8DF5 = 0x4129
-0x8DFC = 0x6C72
-0x8DFF = 0x6C75
-0x8E08 = 0x6C73
-0x8E09 = 0x6C74
-0x8E0A = 0x4D59
-0x8E0F = 0x4627
-0x8E10 = 0x6C78
-0x8E1D = 0x6C76
-0x8E1E = 0x6C77
-0x8E1F = 0x6C79
-0x8E2A = 0x6D29
-0x8E30 = 0x6C7C
-0x8E34 = 0x6C7D
-0x8E35 = 0x6C7B
-0x8E42 = 0x6C7A
-0x8E44 = 0x447D
-0x8E47 = 0x6D21
-0x8E48 = 0x6D25
-0x8E49 = 0x6D22
-0x8E4A = 0x6C7E
-0x8E4C = 0x6D23
-0x8E50 = 0x6D24
-0x8E55 = 0x6D2B
-0x8E59 = 0x6D26
-0x8E5F = 0x4058
-0x8E60 = 0x6D28
-0x8E63 = 0x6D2A
-0x8E64 = 0x6D27
-0x8E72 = 0x6D2D
-0x8E74 = 0x3D33
-0x8E76 = 0x6D2C
-0x8E7C = 0x6D2E
-0x8E81 = 0x6D2F
-0x8E84 = 0x6D32
-0x8E85 = 0x6D31
-0x8E87 = 0x6D30
-0x8E8A = 0x6D34
-0x8E8B = 0x6D33
-0x8E8D = 0x4C76
-0x8E91 = 0x6D36
-0x8E93 = 0x6D35
-0x8E94 = 0x6D37
-0x8E99 = 0x6D38
-0x8EA1 = 0x6D3A
-0x8EAA = 0x6D39
-0x8EAB = 0x3F48
-0x8EAC = 0x6D3B
-0x8EAF = 0x366D
-0x8EB0 = 0x6D3C
-0x8EB1 = 0x6D3E
-0x8EBE = 0x6D3F
-0x8EC5 = 0x6D40
-0x8EC6 = 0x6D3D
-0x8EC8 = 0x6D41
-0x8ECA = 0x3C56
-0x8ECB = 0x6D42
-0x8ECC = 0x3530
-0x8ECD = 0x3733
-0x8ED2 = 0x382E
-0x8EDB = 0x6D43
-0x8EDF = 0x4670
-0x8EE2 = 0x453E
-0x8EE3 = 0x6D44
-0x8EEB = 0x6D47
-0x8EF8 = 0x3C34
-0x8EFB = 0x6D46
-0x8EFC = 0x6D45
-0x8EFD = 0x375A
-0x8EFE = 0x6D48
-0x8F03 = 0x3353
-0x8F05 = 0x6D4A
-0x8F09 = 0x3A5C
-0x8F0A = 0x6D49
-0x8F0C = 0x6D52
-0x8F12 = 0x6D4C
-0x8F13 = 0x6D4E
-0x8F14 = 0x4A65
-0x8F15 = 0x6D4B
-0x8F19 = 0x6D4D
-0x8F1B = 0x6D51
-0x8F1C = 0x6D4F
-0x8F1D = 0x3531
-0x8F1F = 0x6D50
-0x8F26 = 0x6D53
-0x8F29 = 0x475A
-0x8F2A = 0x4E58
-0x8F2F = 0x3D34
-0x8F33 = 0x6D54
-0x8F38 = 0x4D22
-0x8F39 = 0x6D56
-0x8F3B = 0x6D55
-0x8F3E = 0x6D59
-0x8F3F = 0x4D41
-0x8F42 = 0x6D58
-0x8F44 = 0x336D
-0x8F45 = 0x6D57
-0x8F46 = 0x6D5C
-0x8F49 = 0x6D5B
-0x8F4C = 0x6D5A
-0x8F4D = 0x4532
-0x8F4E = 0x6D5D
-0x8F57 = 0x6D5E
-0x8F5C = 0x6D5F
-0x8F5F = 0x396C
-0x8F61 = 0x3725
-0x8F62 = 0x6D60
-0x8F63 = 0x6D61
-0x8F64 = 0x6D62
-0x8F9B = 0x3F49
-0x8F9C = 0x6D63
-0x8F9E = 0x3C2D
-0x8F9F = 0x6D64
-0x8FA3 = 0x6D65
-0x8FA7 = 0x5221
-0x8FA8 = 0x517E
-0x8FAD = 0x6D66
-0x8FAE = 0x6570
-0x8FAF = 0x6D67
-0x8FB0 = 0x4324
-0x8FB1 = 0x3F2B
-0x8FB2 = 0x4740
-0x8FB7 = 0x6D68
-0x8FBA = 0x4A55
-0x8FBB = 0x4454
-0x8FBC = 0x397E
-0x8FBF = 0x4329
-0x8FC2 = 0x312A
-0x8FC4 = 0x4B78
-0x8FC5 = 0x3F57
-0x8FCE = 0x375E
-0x8FD1 = 0x3661
-0x8FD4 = 0x4A56
-0x8FDA = 0x6D69
-0x8FE2 = 0x6D6B
-0x8FE5 = 0x6D6A
-0x8FE6 = 0x3260
-0x8FE9 = 0x4676
-0x8FEA = 0x6D6C
-0x8FEB = 0x4777
-0x8FED = 0x4533
-0x8FEF = 0x6D6D
-0x8FF0 = 0x3D52
-0x8FF4 = 0x6D6F
-0x8FF7 = 0x4C42
-0x8FF8 = 0x6D7E
-0x8FF9 = 0x6D71
-0x8FFA = 0x6D72
-0x8FFD = 0x4449
-0x9000 = 0x4260
-0x9001 = 0x4177
-0x9003 = 0x4628
-0x9005 = 0x6D70
-0x9006 = 0x3555
-0x900B = 0x6D79
-0x900D = 0x6D76
-0x900E = 0x6E25
-0x900F = 0x4629
-0x9010 = 0x4360
-0x9011 = 0x6D73
-0x9013 = 0x447E
-0x9014 = 0x4553
-0x9015 = 0x6D74
-0x9016 = 0x6D78
-0x9017 = 0x3F60
-0x9019 = 0x4767
-0x901A = 0x444C
-0x901D = 0x4042
-0x901E = 0x6D77
-0x901F = 0x422E
-0x9020 = 0x4224
-0x9021 = 0x6D75
-0x9022 = 0x3029
-0x9023 = 0x4F22
-0x9027 = 0x6D7A
-0x902E = 0x4261
-0x9031 = 0x3D35
-0x9032 = 0x3F4A
-0x9035 = 0x6D7C
-0x9036 = 0x6D7B
-0x9038 = 0x306F
-0x9039 = 0x6D7D
-0x903C = 0x492F
-0x903E = 0x6E27
-0x9041 = 0x465B
-0x9042 = 0x3F6B
-0x9045 = 0x4359
-0x9047 = 0x3678
-0x9049 = 0x6E26
-0x904A = 0x4D37
-0x904B = 0x313F
-0x904D = 0x4A57
-0x904E = 0x3261
-0x904F = 0x6E21
-0x9050 = 0x6E22
-0x9051 = 0x6E23
-0x9052 = 0x6E24
-0x9053 = 0x463B
-0x9054 = 0x4323
-0x9055 = 0x3063
-0x9056 = 0x6E28
-0x9058 = 0x6E29
-0x9059 = 0x7423
-0x905C = 0x423D
-0x905E = 0x6E2A
-0x9060 = 0x3173
-0x9061 = 0x414C
-0x9063 = 0x382F
-0x9065 = 0x4D5A
-0x9068 = 0x6E2B
-0x9069 = 0x452C
-0x906D = 0x4178
-0x906E = 0x3C57
-0x906F = 0x6E2C
-0x9072 = 0x6E2F
-0x9075 = 0x3D65
-0x9076 = 0x6E2D
-0x9077 = 0x412B
-0x9078 = 0x412A
-0x907A = 0x3064
-0x907C = 0x4E4B
-0x907D = 0x6E31
-0x907F = 0x4872
-0x9080 = 0x6E33
-0x9081 = 0x6E32
-0x9082 = 0x6E30
-0x9083 = 0x6364
-0x9084 = 0x3454
-0x9087 = 0x6D6E
-0x9089 = 0x6E35
-0x908A = 0x6E34
-0x908F = 0x6E36
-0x9091 = 0x4D38
-0x90A3 = 0x4661
-0x90A6 = 0x4B2E
-0x90A8 = 0x6E37
-0x90AA = 0x3C59
-0x90AF = 0x6E38
-0x90B1 = 0x6E39
-0x90B5 = 0x6E3A
-0x90B8 = 0x4521
-0x90C1 = 0x306A
-0x90CA = 0x3959
-0x90CE = 0x4F3A
-0x90DB = 0x6E3E
-0x90E1 = 0x3734
-0x90E2 = 0x6E3B
-0x90E4 = 0x6E3C
-0x90E8 = 0x4974
-0x90ED = 0x3354
-0x90F5 = 0x4D39
-0x90F7 = 0x363F
-0x90FD = 0x4554
-0x9102 = 0x6E3F
-0x9112 = 0x6E40
-0x9119 = 0x6E41
-0x912D = 0x4522
-0x9130 = 0x6E43
-0x9132 = 0x6E42
-0x9149 = 0x4653
-0x914A = 0x6E44
-0x914B = 0x3D36
-0x914C = 0x3C60
-0x914D = 0x475B
-0x914E = 0x4371
-0x9152 = 0x3C72
-0x9154 = 0x3F6C
-0x9156 = 0x6E45
-0x9158 = 0x6E46
-0x9162 = 0x3F5D
-0x9163 = 0x6E47
-0x9165 = 0x6E48
-0x9169 = 0x6E49
-0x916A = 0x4D6F
-0x916C = 0x3D37
-0x9172 = 0x6E4B
-0x9173 = 0x6E4A
-0x9175 = 0x395A
-0x9177 = 0x3973
-0x9178 = 0x3B40
-0x9182 = 0x6E4E
-0x9187 = 0x3D66
-0x9189 = 0x6E4D
-0x918B = 0x6E4C
-0x918D = 0x4269
-0x9190 = 0x386F
-0x9192 = 0x4043
-0x9197 = 0x4830
-0x919C = 0x3D39
-0x91A2 = 0x6E4F
-0x91A4 = 0x3E5F
-0x91AA = 0x6E52
-0x91AB = 0x6E50
-0x91AF = 0x6E51
-0x91B4 = 0x6E54
-0x91B5 = 0x6E53
-0x91B8 = 0x3E7A
-0x91BA = 0x6E55
-0x91C0 = 0x6E56
-0x91C1 = 0x6E57
-0x91C6 = 0x4850
-0x91C7 = 0x3A53
-0x91C8 = 0x3C61
-0x91C9 = 0x6E58
-0x91CB = 0x6E59
-0x91CC = 0x4E24
-0x91CD = 0x3D45
-0x91CE = 0x4C6E
-0x91CF = 0x4E4C
-0x91D0 = 0x6E5A
-0x91D1 = 0x3662
-0x91D6 = 0x6E5B
-0x91D8 = 0x4523
-0x91DB = 0x6E5E
-0x91DC = 0x3378
-0x91DD = 0x3F4B
-0x91DF = 0x6E5C
-0x91E1 = 0x6E5D
-0x91E3 = 0x4460
-0x91E6 = 0x4B55
-0x91E7 = 0x367C
-0x91F5 = 0x6E60
-0x91F6 = 0x6E61
-0x91FC = 0x6E5F
-0x91FF = 0x6E63
-0x920D = 0x465F
-0x920E = 0x3343
-0x9211 = 0x6E67
-0x9214 = 0x6E64
-0x9215 = 0x6E66
-0x921E = 0x6E62
-0x9229 = 0x6F4F
-0x922C = 0x6E65
-0x9234 = 0x4E6B
-0x9237 = 0x385A
-0x923F = 0x6E6F
-0x9244 = 0x4534
-0x9245 = 0x6E6A
-0x9248 = 0x6E6D
-0x9249 = 0x6E6B
-0x924B = 0x6E70
-0x9250 = 0x6E71
-0x9257 = 0x6E69
-0x925A = 0x6E76
-0x925B = 0x3174
-0x925E = 0x6E68
-0x9262 = 0x482D
-0x9264 = 0x6E6C
-0x9266 = 0x3E60
-0x9271 = 0x395B
-0x927E = 0x4B48
-0x9280 = 0x3664
-0x9283 = 0x3D46
-0x9285 = 0x463C
-0x9291 = 0x412D
-0x9293 = 0x6E74
-0x9295 = 0x6E6E
-0x9296 = 0x6E73
-0x9298 = 0x4C43
-0x929A = 0x4438
-0x929B = 0x6E75
-0x929C = 0x6E72
-0x92AD = 0x412C
-0x92B7 = 0x6E79
-0x92B9 = 0x6E78
-0x92CF = 0x6E77
-0x92D2 = 0x4B2F
-0x92E4 = 0x3D7B
-0x92E9 = 0x6E7A
-0x92EA = 0x4A5F
-0x92ED = 0x3154
-0x92F2 = 0x4946
-0x92F3 = 0x4372
-0x92F8 = 0x3578
-0x92FA = 0x6E7C
-0x92FC = 0x395D
-0x9306 = 0x3B2C
-0x930F = 0x6E7B
-0x9310 = 0x3F6D
-0x9318 = 0x3F6E
-0x9319 = 0x6F21
-0x931A = 0x6F23
-0x9320 = 0x3E7B
-0x9322 = 0x6F22
-0x9323 = 0x6F24
-0x9326 = 0x3653
-0x9328 = 0x4945
-0x932B = 0x3C62
-0x932C = 0x4F23
-0x932E = 0x6E7E
-0x932F = 0x3A78
-0x9332 = 0x4F3F
-0x9335 = 0x6F26
-0x933A = 0x6F25
-0x933B = 0x6F27
-0x9344 = 0x6E7D
-0x934B = 0x4669
-0x934D = 0x4555
-0x9354 = 0x4457
-0x9356 = 0x6F2C
-0x935B = 0x4343
-0x935C = 0x6F28
-0x9360 = 0x6F29
-0x936C = 0x372D
-0x936E = 0x6F2B
-0x9375 = 0x3830
-0x937C = 0x6F2A
-0x937E = 0x3E61
-0x938C = 0x3379
-0x9394 = 0x6F30
-0x9396 = 0x3A3F
-0x9397 = 0x4179
-0x939A = 0x444A
-0x93A7 = 0x333B
-0x93AC = 0x6F2E
-0x93AD = 0x6F2F
-0x93AE = 0x4443
-0x93B0 = 0x6F2D
-0x93B9 = 0x6F31
-0x93C3 = 0x6F37
-0x93C8 = 0x6F3A
-0x93D0 = 0x6F39
-0x93D1 = 0x452D
-0x93D6 = 0x6F32
-0x93D7 = 0x6F33
-0x93D8 = 0x6F36
-0x93DD = 0x6F38
-0x93E1 = 0x3640
-0x93E4 = 0x6F3B
-0x93E5 = 0x6F35
-0x93E8 = 0x6F34
-0x9403 = 0x6F3F
-0x9407 = 0x6F40
-0x9410 = 0x6F41
-0x9413 = 0x6F3E
-0x9414 = 0x6F3D
-0x9418 = 0x3E62
-0x9419 = 0x462A
-0x941A = 0x6F3C
-0x9421 = 0x6F45
-0x942B = 0x6F43
-0x9435 = 0x6F44
-0x9436 = 0x6F42
-0x9438 = 0x4278
-0x943A = 0x6F46
-0x9441 = 0x6F47
-0x9444 = 0x6F49
-0x9451 = 0x3455
-0x9452 = 0x6F48
-0x9453 = 0x4C7A
-0x945A = 0x6F54
-0x945B = 0x6F4A
-0x945E = 0x6F4D
-0x9460 = 0x6F4B
-0x9462 = 0x6F4C
-0x946A = 0x6F4E
-0x9470 = 0x6F50
-0x9475 = 0x6F51
-0x9477 = 0x6F52
-0x947C = 0x6F55
-0x947D = 0x6F53
-0x947E = 0x6F56
-0x947F = 0x6F58
-0x9481 = 0x6F57
-0x9577 = 0x4439
-0x9580 = 0x4C67
-0x9582 = 0x6F59
-0x9583 = 0x412E
-0x9587 = 0x6F5A
-0x9589 = 0x4A44
-0x958A = 0x6F5B
-0x958B = 0x332B
-0x958F = 0x313C
-0x9591 = 0x3457
-0x9593 = 0x3456
-0x9594 = 0x6F5C
-0x9596 = 0x6F5D
-0x9598 = 0x6F5E
-0x9599 = 0x6F5F
-0x95A0 = 0x6F60
-0x95A2 = 0x3458
-0x95A3 = 0x3355
-0x95A4 = 0x395E
-0x95A5 = 0x4836
-0x95A7 = 0x6F62
-0x95A8 = 0x6F61
-0x95AD = 0x6F63
-0x95B2 = 0x315C
-0x95B9 = 0x6F66
-0x95BB = 0x6F65
-0x95BC = 0x6F64
-0x95BE = 0x6F67
-0x95C3 = 0x6F6A
-0x95C7 = 0x3047
-0x95CA = 0x6F68
-0x95CC = 0x6F6C
-0x95CD = 0x6F6B
-0x95D4 = 0x6F6E
-0x95D5 = 0x6F6D
-0x95D6 = 0x6F6F
-0x95D8 = 0x462E
-0x95DC = 0x6F70
-0x95E1 = 0x6F71
-0x95E2 = 0x6F73
-0x95E5 = 0x6F72
-0x961C = 0x496C
-0x9621 = 0x6F74
-0x9628 = 0x6F75
-0x962A = 0x3A65
-0x962E = 0x6F76
-0x962F = 0x6F77
-0x9632 = 0x4B49
-0x963B = 0x414B
-0x963F = 0x3024
-0x9640 = 0x424B
-0x9642 = 0x6F78
-0x9644 = 0x496D
-0x964B = 0x6F7B
-0x964C = 0x6F79
-0x964D = 0x395F
-0x964F = 0x6F7A
-0x9650 = 0x3842
-0x965B = 0x4A45
-0x965C = 0x6F7D
-0x965D = 0x7021
-0x965E = 0x6F7E
-0x965F = 0x7022
-0x9662 = 0x3121
-0x9663 = 0x3F58
-0x9664 = 0x3D7C
-0x9665 = 0x3459
-0x9666 = 0x7023
-0x966A = 0x4766
-0x966C = 0x7025
-0x9670 = 0x3122
-0x9672 = 0x7024
-0x9673 = 0x4444
-0x9675 = 0x4E4D
-0x9676 = 0x462B
-0x9677 = 0x6F7C
-0x9678 = 0x4E26
-0x967A = 0x3831
-0x967D = 0x4D5B
-0x9685 = 0x3679
-0x9686 = 0x4E34
-0x9688 = 0x3728
-0x968A = 0x4262
-0x968B = 0x6721
-0x968D = 0x7026
-0x968E = 0x332C
-0x968F = 0x3F6F
-0x9694 = 0x3356
-0x9695 = 0x7028
-0x9697 = 0x7029
-0x9698 = 0x7027
-0x9699 = 0x3764
-0x969B = 0x3A5D
-0x969C = 0x3E63
-0x96A0 = 0x3123
-0x96A3 = 0x4E59
-0x96A7 = 0x702B
-0x96A8 = 0x6E2E
-0x96AA = 0x702A
-0x96B0 = 0x702E
-0x96B1 = 0x702C
-0x96B2 = 0x702D
-0x96B4 = 0x702F
-0x96B6 = 0x7030
-0x96B7 = 0x4E6C
-0x96B8 = 0x7031
-0x96B9 = 0x7032
-0x96BB = 0x4049
-0x96BC = 0x483B
-0x96C0 = 0x3F7D
-0x96C1 = 0x3467
-0x96C4 = 0x4D3A
-0x96C5 = 0x326D
-0x96C6 = 0x3D38
-0x96C7 = 0x385B
-0x96C9 = 0x7035
-0x96CB = 0x7034
-0x96CC = 0x3B73
-0x96CD = 0x7036
-0x96CE = 0x7033
-0x96D1 = 0x3B28
-0x96D5 = 0x703A
-0x96D6 = 0x6A2D
-0x96D9 = 0x5256
-0x96DB = 0x3F77
-0x96DC = 0x7038
-0x96E2 = 0x4E25
-0x96E3 = 0x4671
-0x96E8 = 0x312B
-0x96EA = 0x4063
-0x96EB = 0x3C36
-0x96F0 = 0x4A37
-0x96F2 = 0x3140
-0x96F6 = 0x4E6D
-0x96F7 = 0x4D6B
-0x96F9 = 0x703B
-0x96FB = 0x4545
-0x9700 = 0x3C7B
-0x9704 = 0x703C
-0x9706 = 0x703D
-0x9707 = 0x3F4C
-0x9708 = 0x703E
-0x970A = 0x4E6E
-0x970D = 0x7039
-0x970E = 0x7040
-0x970F = 0x7042
-0x9711 = 0x7041
-0x9713 = 0x703F
-0x9716 = 0x7043
-0x9719 = 0x7044
-0x971C = 0x417A
-0x971E = 0x3262
-0x9724 = 0x7045
-0x9727 = 0x4C38
-0x972A = 0x7046
-0x9730 = 0x7047
-0x9732 = 0x4F2A
-0x9738 = 0x5B31
-0x9739 = 0x7048
-0x973D = 0x7049
-0x973E = 0x704A
-0x9742 = 0x704E
-0x9744 = 0x704B
-0x9746 = 0x704C
-0x9748 = 0x704D
-0x9749 = 0x704F
-0x9752 = 0x4044
-0x9756 = 0x4C77
-0x9759 = 0x4045
-0x975C = 0x7050
-0x975E = 0x4873
-0x9760 = 0x7051
-0x9761 = 0x7353
-0x9762 = 0x4C4C
-0x9764 = 0x7052
-0x9766 = 0x7053
-0x9768 = 0x7054
-0x9769 = 0x3357
-0x976B = 0x7056
-0x976D = 0x3F59
-0x9771 = 0x7057
-0x9774 = 0x3724
-0x9779 = 0x7058
-0x977A = 0x705C
-0x977C = 0x705A
-0x9781 = 0x705B
-0x9784 = 0x3373
-0x9785 = 0x7059
-0x9786 = 0x705D
-0x978B = 0x705E
-0x978D = 0x3048
-0x978F = 0x705F
-0x9790 = 0x7060
-0x9798 = 0x3E64
-0x979C = 0x7061
-0x97A0 = 0x3547
-0x97A3 = 0x7064
-0x97A6 = 0x7063
-0x97A8 = 0x7062
-0x97AB = 0x6B71
-0x97AD = 0x4A5C
-0x97B3 = 0x7065
-0x97B4 = 0x7066
-0x97C3 = 0x7067
-0x97C6 = 0x7068
-0x97C8 = 0x7069
-0x97CB = 0x706A
-0x97D3 = 0x345A
-0x97DC = 0x706B
-0x97ED = 0x706C
-0x97EE = 0x4723
-0x97F2 = 0x706E
-0x97F3 = 0x323B
-0x97F5 = 0x7071
-0x97F6 = 0x7070
-0x97FB = 0x3124
-0x97FF = 0x3641
-0x9801 = 0x4A47
-0x9802 = 0x443A
-0x9803 = 0x3A22
-0x9805 = 0x3960
-0x9806 = 0x3D67
-0x9808 = 0x3F5C
-0x980C = 0x7073
-0x980F = 0x7072
-0x9810 = 0x4D42
-0x9811 = 0x3468
-0x9812 = 0x4852
-0x9813 = 0x465C
-0x9817 = 0x3F7C
-0x9818 = 0x4E4E
-0x981A = 0x375B
-0x9821 = 0x7076
-0x9824 = 0x7075
-0x982C = 0x4B4B
-0x982D = 0x462C
-0x9834 = 0x3150
-0x9837 = 0x7077
-0x9838 = 0x7074
-0x983B = 0x4951
-0x983C = 0x4D6A
-0x983D = 0x7078
-0x9846 = 0x7079
-0x984B = 0x707B
-0x984C = 0x426A
-0x984D = 0x335B
-0x984E = 0x335C
-0x984F = 0x707A
-0x9854 = 0x3469
-0x9855 = 0x3832
-0x9858 = 0x346A
-0x985B = 0x453F
-0x985E = 0x4E60
-0x9867 = 0x385C
-0x986B = 0x707C
-0x986F = 0x707D
-0x9870 = 0x707E
-0x9871 = 0x7121
-0x9873 = 0x7123
-0x9874 = 0x7122
-0x98A8 = 0x4977
-0x98AA = 0x7124
-0x98AF = 0x7125
-0x98B1 = 0x7126
-0x98B6 = 0x7127
-0x98C3 = 0x7129
-0x98C4 = 0x7128
-0x98C6 = 0x712A
-0x98DB = 0x4874
-0x98DC = 0x664C
-0x98DF = 0x3F29
-0x98E2 = 0x3532
-0x98E9 = 0x712B
-0x98EB = 0x712C
-0x98ED = 0x522C
-0x98EE = 0x5D3B
-0x98EF = 0x4853
-0x98F2 = 0x307B
-0x98F4 = 0x303B
-0x98FC = 0x3B74
-0x98FD = 0x4B30
-0x98FE = 0x3E7E
-0x9903 = 0x712D
-0x9905 = 0x4C5F
-0x9909 = 0x712E
-0x990A = 0x4D5C
-0x990C = 0x3142
-0x9910 = 0x3B41
-0x9912 = 0x712F
-0x9913 = 0x326E
-0x9914 = 0x7130
-0x9918 = 0x7131
-0x991D = 0x7133
-0x991E = 0x7134
-0x9920 = 0x7136
-0x9921 = 0x7132
-0x9924 = 0x7135
-0x9928 = 0x345B
-0x992C = 0x7137
-0x992E = 0x7138
-0x993D = 0x7139
-0x993E = 0x713A
-0x9942 = 0x713B
-0x9945 = 0x713D
-0x9949 = 0x713C
-0x994B = 0x713F
-0x994C = 0x7142
-0x9950 = 0x713E
-0x9951 = 0x7140
-0x9952 = 0x7141
-0x9955 = 0x7143
-0x9957 = 0x3642
-0x9996 = 0x3C73
-0x9997 = 0x7144
-0x9998 = 0x7145
-0x9999 = 0x3961
-0x99A5 = 0x7146
-0x99A8 = 0x333E
-0x99AC = 0x474F
-0x99AD = 0x7147
-0x99AE = 0x7148
-0x99B3 = 0x435A
-0x99B4 = 0x466B
-0x99BC = 0x7149
-0x99C1 = 0x477D
-0x99C4 = 0x424C
-0x99C5 = 0x3158
-0x99C6 = 0x366E
-0x99C8 = 0x366F
-0x99D0 = 0x4373
-0x99D1 = 0x714E
-0x99D2 = 0x3670
-0x99D5 = 0x326F
-0x99D8 = 0x714D
-0x99DB = 0x714B
-0x99DD = 0x714C
-0x99DF = 0x714A
-0x99E2 = 0x7158
-0x99ED = 0x714F
-0x99EE = 0x7150
-0x99F1 = 0x7151
-0x99F2 = 0x7152
-0x99F8 = 0x7154
-0x99FB = 0x7153
-0x99FF = 0x3D59
-0x9A01 = 0x7155
-0x9A05 = 0x7157
-0x9A0E = 0x3533
-0x9A0F = 0x7156
-0x9A12 = 0x417B
-0x9A13 = 0x3833
-0x9A19 = 0x7159
-0x9A28 = 0x424D
-0x9A2B = 0x715A
-0x9A30 = 0x462D
-0x9A37 = 0x715B
-0x9A3E = 0x7160
-0x9A40 = 0x715E
-0x9A42 = 0x715D
-0x9A43 = 0x715F
-0x9A45 = 0x715C
-0x9A4D = 0x7162
-0x9A55 = 0x7161
-0x9A57 = 0x7164
-0x9A5A = 0x3643
-0x9A5B = 0x7163
-0x9A5F = 0x7165
-0x9A62 = 0x7166
-0x9A64 = 0x7168
-0x9A65 = 0x7167
-0x9A69 = 0x7169
-0x9A6A = 0x716B
-0x9A6B = 0x716A
-0x9AA8 = 0x397C
-0x9AAD = 0x716C
-0x9AB0 = 0x716D
-0x9AB8 = 0x333C
-0x9ABC = 0x716E
-0x9AC0 = 0x716F
-0x9AC4 = 0x3F71
-0x9ACF = 0x7170
-0x9AD1 = 0x7171
-0x9AD3 = 0x7172
-0x9AD4 = 0x7173
-0x9AD8 = 0x3962
-0x9ADE = 0x7174
-0x9ADF = 0x7175
-0x9AE2 = 0x7176
-0x9AE3 = 0x7177
-0x9AE6 = 0x7178
-0x9AEA = 0x4831
-0x9AEB = 0x717A
-0x9AED = 0x4926
-0x9AEE = 0x717B
-0x9AEF = 0x7179
-0x9AF1 = 0x717D
-0x9AF4 = 0x717C
-0x9AF7 = 0x717E
-0x9AFB = 0x7221
-0x9B06 = 0x7222
-0x9B18 = 0x7223
-0x9B1A = 0x7224
-0x9B1F = 0x7225
-0x9B22 = 0x7226
-0x9B23 = 0x7227
-0x9B25 = 0x7228
-0x9B27 = 0x7229
-0x9B28 = 0x722A
-0x9B29 = 0x722B
-0x9B2A = 0x722C
-0x9B2E = 0x722D
-0x9B2F = 0x722E
-0x9B31 = 0x5D35
-0x9B32 = 0x722F
-0x9B3B = 0x6478
-0x9B3C = 0x3534
-0x9B41 = 0x3321
-0x9B42 = 0x3A32
-0x9B43 = 0x7231
-0x9B44 = 0x7230
-0x9B45 = 0x4C25
-0x9B4D = 0x7233
-0x9B4E = 0x7234
-0x9B4F = 0x7232
-0x9B51 = 0x7235
-0x9B54 = 0x4B62
-0x9B58 = 0x7236
-0x9B5A = 0x357B
-0x9B6F = 0x4F25
-0x9B74 = 0x7237
-0x9B83 = 0x7239
-0x9B8E = 0x303E
-0x9B91 = 0x723A
-0x9B92 = 0x4A2B
-0x9B93 = 0x7238
-0x9B96 = 0x723B
-0x9B97 = 0x723C
-0x9B9F = 0x723D
-0x9BA0 = 0x723E
-0x9BA8 = 0x723F
-0x9BAA = 0x4B6E
-0x9BAB = 0x3B2D
-0x9BAD = 0x3A7A
-0x9BAE = 0x412F
-0x9BB4 = 0x7240
-0x9BB9 = 0x7243
-0x9BC0 = 0x7241
-0x9BC6 = 0x7244
-0x9BC9 = 0x3871
-0x9BCA = 0x7242
-0x9BCF = 0x7245
-0x9BD1 = 0x7246
-0x9BD2 = 0x7247
-0x9BD4 = 0x724B
-0x9BD6 = 0x3B2A
-0x9BDB = 0x4264
-0x9BE1 = 0x724C
-0x9BE2 = 0x7249
-0x9BE3 = 0x7248
-0x9BE4 = 0x724A
-0x9BE8 = 0x375F
-0x9BF0 = 0x7250
-0x9BF1 = 0x724F
-0x9BF2 = 0x724E
-0x9BF5 = 0x3033
-0x9C04 = 0x725A
-0x9C06 = 0x7256
-0x9C08 = 0x7257
-0x9C09 = 0x7253
-0x9C0A = 0x7259
-0x9C0C = 0x7255
-0x9C0D = 0x3362
-0x9C10 = 0x4F4C
-0x9C12 = 0x7258
-0x9C13 = 0x7254
-0x9C14 = 0x7252
-0x9C15 = 0x7251
-0x9C1B = 0x725C
-0x9C21 = 0x725F
-0x9C24 = 0x725E
-0x9C25 = 0x725D
-0x9C2D = 0x4949
-0x9C2E = 0x725B
-0x9C2F = 0x3073
-0x9C30 = 0x7260
-0x9C32 = 0x7262
-0x9C39 = 0x336F
-0x9C3A = 0x724D
-0x9C3B = 0x3137
-0x9C3E = 0x7264
-0x9C46 = 0x7263
-0x9C47 = 0x7261
-0x9C48 = 0x432D
-0x9C52 = 0x4B70
-0x9C57 = 0x4E5A
-0x9C5A = 0x7265
-0x9C60 = 0x7266
-0x9C67 = 0x7267
-0x9C76 = 0x7268
-0x9C78 = 0x7269
-0x9CE5 = 0x443B
-0x9CE7 = 0x726A
-0x9CE9 = 0x4837
-0x9CEB = 0x726F
-0x9CEC = 0x726B
-0x9CF0 = 0x726C
-0x9CF3 = 0x4B31
-0x9CF4 = 0x4C44
-0x9CF6 = 0x4650
-0x9D03 = 0x7270
-0x9D06 = 0x7271
-0x9D07 = 0x463E
-0x9D08 = 0x726E
-0x9D09 = 0x726D
-0x9D0E = 0x322A
-0x9D12 = 0x7279
-0x9D15 = 0x7278
-0x9D1B = 0x3175
-0x9D1F = 0x7276
-0x9D23 = 0x7275
-0x9D26 = 0x7273
-0x9D28 = 0x337B
-0x9D2A = 0x7272
-0x9D2B = 0x3C32
-0x9D2C = 0x3229
-0x9D3B = 0x3963
-0x9D3E = 0x727C
-0x9D3F = 0x727B
-0x9D41 = 0x727A
-0x9D44 = 0x7277
-0x9D46 = 0x727D
-0x9D48 = 0x727E
-0x9D50 = 0x7325
-0x9D51 = 0x7324
-0x9D59 = 0x7326
-0x9D5C = 0x312D
-0x9D5D = 0x7321
-0x9D5E = 0x7322
-0x9D60 = 0x3974
-0x9D61 = 0x4C39
-0x9D64 = 0x7323
-0x9D6C = 0x4B32
-0x9D6F = 0x732B
-0x9D72 = 0x7327
-0x9D7A = 0x732C
-0x9D87 = 0x7329
-0x9D89 = 0x7328
-0x9D8F = 0x375C
-0x9D9A = 0x732D
-0x9DA4 = 0x732E
-0x9DA9 = 0x732F
-0x9DAB = 0x732A
-0x9DAF = 0x7274
-0x9DB2 = 0x7330
-0x9DB4 = 0x4461
-0x9DB8 = 0x7334
-0x9DBA = 0x7335
-0x9DBB = 0x7333
-0x9DC1 = 0x7332
-0x9DC2 = 0x7338
-0x9DC4 = 0x7331
-0x9DC6 = 0x7336
-0x9DCF = 0x7337
-0x9DD3 = 0x733A
-0x9DD9 = 0x7339
-0x9DE6 = 0x733C
-0x9DED = 0x733D
-0x9DEF = 0x733E
-0x9DF2 = 0x4F49
-0x9DF8 = 0x733B
-0x9DF9 = 0x426B
-0x9DFA = 0x3A6D
-0x9DFD = 0x733F
-0x9E1A = 0x7340
-0x9E1B = 0x7341
-0x9E1E = 0x7342
-0x9E75 = 0x7343
-0x9E78 = 0x3834
-0x9E79 = 0x7344
-0x9E7D = 0x7345
-0x9E7F = 0x3C2F
-0x9E81 = 0x7346
-0x9E88 = 0x7347
-0x9E8B = 0x7348
-0x9E8C = 0x7349
-0x9E91 = 0x734C
-0x9E92 = 0x734A
-0x9E93 = 0x4F3C
-0x9E95 = 0x734B
-0x9E97 = 0x4E6F
-0x9E9D = 0x734D
-0x9E9F = 0x4E5B
-0x9EA5 = 0x734E
-0x9EA6 = 0x477E
-0x9EA9 = 0x734F
-0x9EAA = 0x7351
-0x9EAD = 0x7352
-0x9EB8 = 0x7350
-0x9EB9 = 0x396D
-0x9EBA = 0x4C4D
-0x9EBB = 0x4B63
-0x9EBC = 0x5677
-0x9EBE = 0x5D60
-0x9EBF = 0x4B7B
-0x9EC4 = 0x322B
-0x9ECC = 0x7354
-0x9ECD = 0x3550
-0x9ECE = 0x7355
-0x9ECF = 0x7356
-0x9ED0 = 0x7357
-0x9ED2 = 0x3975
-0x9ED4 = 0x7358
-0x9ED8 = 0x6054
-0x9ED9 = 0x4C5B
-0x9EDB = 0x4263
-0x9EDC = 0x7359
-0x9EDD = 0x735B
-0x9EDE = 0x735A
-0x9EE0 = 0x735C
-0x9EE5 = 0x735D
-0x9EE8 = 0x735E
-0x9EEF = 0x735F
-0x9EF4 = 0x7360
-0x9EF6 = 0x7361
-0x9EF7 = 0x7362
-0x9EF9 = 0x7363
-0x9EFB = 0x7364
-0x9EFC = 0x7365
-0x9EFD = 0x7366
-0x9F07 = 0x7367
-0x9F08 = 0x7368
-0x9F0E = 0x4524
-0x9F13 = 0x385D
-0x9F15 = 0x736A
-0x9F20 = 0x414D
-0x9F21 = 0x736B
-0x9F2C = 0x736C
-0x9F3B = 0x4921
-0x9F3E = 0x736D
-0x9F4A = 0x736E
-0x9F4B = 0x6337
-0x9F4E = 0x6C5A
-0x9F4F = 0x706D
-0x9F52 = 0x736F
-0x9F54 = 0x7370
-0x9F5F = 0x7372
-0x9F60 = 0x7373
-0x9F61 = 0x7374
-0x9F62 = 0x4E70
-0x9F63 = 0x7371
-0x9F66 = 0x7375
-0x9F67 = 0x7376
-0x9F6A = 0x7378
-0x9F6C = 0x7377
-0x9F72 = 0x737A
-0x9F76 = 0x737B
-0x9F77 = 0x7379
-0x9F8D = 0x4E36
-0x9F95 = 0x737C
-0x9F9C = 0x737D
-0x9F9D = 0x6354
-0x9FA0 = 0x737E
-0xFF01 = 0x212A
-0xFF03 = 0x2174
-0xFF04 = 0x2170
-0xFF05 = 0x2173
-0xFF06 = 0x2175
-0xFF08 = 0x214A
-0xFF09 = 0x214B
-0xFF0A = 0x2176
-0xFF0B = 0x215C
-0xFF0C = 0x2124
-0xFF0D = 0x215D
-0xFF0E = 0x2125
-0xFF0F = 0x213F
-0xFF10 = 0x2330
-0xFF11 = 0x2331
-0xFF12 = 0x2332
-0xFF13 = 0x2333
-0xFF14 = 0x2334
-0xFF15 = 0x2335
-0xFF16 = 0x2336
-0xFF17 = 0x2337
-0xFF18 = 0x2338
-0xFF19 = 0x2339
-0xFF1A = 0x2127
-0xFF1B = 0x2128
-0xFF1C = 0x2163
-0xFF1D = 0x2161
-0xFF1E = 0x2164
-0xFF1F = 0x2129
-0xFF20 = 0x2177
-0xFF21 = 0x2341
-0xFF22 = 0x2342
-0xFF23 = 0x2343
-0xFF24 = 0x2344
-0xFF25 = 0x2345
-0xFF26 = 0x2346
-0xFF27 = 0x2347
-0xFF28 = 0x2348
-0xFF29 = 0x2349
-0xFF2A = 0x234A
-0xFF2B = 0x234B
-0xFF2C = 0x234C
-0xFF2D = 0x234D
-0xFF2E = 0x234E
-0xFF2F = 0x234F
-0xFF30 = 0x2350
-0xFF31 = 0x2351
-0xFF32 = 0x2352
-0xFF33 = 0x2353
-0xFF34 = 0x2354
-0xFF35 = 0x2355
-0xFF36 = 0x2356
-0xFF37 = 0x2357
-0xFF38 = 0x2358
-0xFF39 = 0x2359
-0xFF3A = 0x235A
-0xFF3B = 0x214E
-0xFF3C = 0x2140
-0xFF3D = 0x214F
-0xFF3E = 0x2130
-0xFF3F = 0x2132
-0xFF40 = 0x212E
-0xFF41 = 0x2361
-0xFF42 = 0x2362
-0xFF43 = 0x2363
-0xFF44 = 0x2364
-0xFF45 = 0x2365
-0xFF46 = 0x2366
-0xFF47 = 0x2367
-0xFF48 = 0x2368
-0xFF49 = 0x2369
-0xFF4A = 0x236A
-0xFF4B = 0x236B
-0xFF4C = 0x236C
-0xFF4D = 0x236D
-0xFF4E = 0x236E
-0xFF4F = 0x236F
-0xFF50 = 0x2370
-0xFF51 = 0x2371
-0xFF52 = 0x2372
-0xFF53 = 0x2373
-0xFF54 = 0x2374
-0xFF55 = 0x2375
-0xFF56 = 0x2376
-0xFF57 = 0x2377
-0xFF58 = 0x2378
-0xFF59 = 0x2379
-0xFF5A = 0x237A
-0xFF5B = 0x2150
-0xFF5C = 0x2143
-0xFF5D = 0x2151
-0xFF5E = 0x2141
-0xFFE0 = 0x2171
-0xFFE1 = 0x2172
-0xFFE2 = 0x224C
-0xFFE3 = 0x2131
-0xFFE5 = 0x216F
-END_MAP
diff --git a/enc/trans/JIS/UCS%JISX0208UDC.src b/enc/trans/JIS/UCS%JISX0208UDC.src
deleted file mode 100644
index 0604f6e4eb..0000000000
--- a/enc/trans/JIS/UCS%JISX0208UDC.src
+++ /dev/null
@@ -1,955 +0,0 @@
-# $NetBSD: UCS%JISX0208UDC.src,v 1.1 2003/07/19 20:20:42 tshiozak Exp $
-
-TYPE ROWCOL
-NAME "UCS/JISX0208UDC"
-SRC_ZONE 0xE000 - 0xE3AB
-OOB_MODE INVALID
-DST_INVALID 0xFFFF
-DST_UNIT_BITS 16
-
-BEGIN_MAP
-0xE000 - 0xE3AB = INVALID
-#
-# This data is derived from http://www.opengroup.or.jp/jvc/cde/
-#
-0xE000 = 0x7521
-0xE001 = 0x7522
-0xE002 = 0x7523
-0xE003 = 0x7524
-0xE004 = 0x7525
-0xE005 = 0x7526
-0xE006 = 0x7527
-0xE007 = 0x7528
-0xE008 = 0x7529
-0xE009 = 0x752A
-0xE00A = 0x752B
-0xE00B = 0x752C
-0xE00C = 0x752D
-0xE00D = 0x752E
-0xE00E = 0x752F
-0xE00F = 0x7530
-0xE010 = 0x7531
-0xE011 = 0x7532
-0xE012 = 0x7533
-0xE013 = 0x7534
-0xE014 = 0x7535
-0xE015 = 0x7536
-0xE016 = 0x7537
-0xE017 = 0x7538
-0xE018 = 0x7539
-0xE019 = 0x753A
-0xE01A = 0x753B
-0xE01B = 0x753C
-0xE01C = 0x753D
-0xE01D = 0x753E
-0xE01E = 0x753F
-0xE01F = 0x7540
-0xE020 = 0x7541
-0xE021 = 0x7542
-0xE022 = 0x7543
-0xE023 = 0x7544
-0xE024 = 0x7545
-0xE025 = 0x7546
-0xE026 = 0x7547
-0xE027 = 0x7548
-0xE028 = 0x7549
-0xE029 = 0x754A
-0xE02A = 0x754B
-0xE02B = 0x754C
-0xE02C = 0x754D
-0xE02D = 0x754E
-0xE02E = 0x754F
-0xE02F = 0x7550
-0xE030 = 0x7551
-0xE031 = 0x7552
-0xE032 = 0x7553
-0xE033 = 0x7554
-0xE034 = 0x7555
-0xE035 = 0x7556
-0xE036 = 0x7557
-0xE037 = 0x7558
-0xE038 = 0x7559
-0xE039 = 0x755A
-0xE03A = 0x755B
-0xE03B = 0x755C
-0xE03C = 0x755D
-0xE03D = 0x755E
-0xE03E = 0x755F
-0xE03F = 0x7560
-0xE040 = 0x7561
-0xE041 = 0x7562
-0xE042 = 0x7563
-0xE043 = 0x7564
-0xE044 = 0x7565
-0xE045 = 0x7566
-0xE046 = 0x7567
-0xE047 = 0x7568
-0xE048 = 0x7569
-0xE049 = 0x756A
-0xE04A = 0x756B
-0xE04B = 0x756C
-0xE04C = 0x756D
-0xE04D = 0x756E
-0xE04E = 0x756F
-0xE04F = 0x7570
-0xE050 = 0x7571
-0xE051 = 0x7572
-0xE052 = 0x7573
-0xE053 = 0x7574
-0xE054 = 0x7575
-0xE055 = 0x7576
-0xE056 = 0x7577
-0xE057 = 0x7578
-0xE058 = 0x7579
-0xE059 = 0x757A
-0xE05A = 0x757B
-0xE05B = 0x757C
-0xE05C = 0x757D
-0xE05D = 0x757E
-0xE05E = 0x7621
-0xE05F = 0x7622
-0xE060 = 0x7623
-0xE061 = 0x7624
-0xE062 = 0x7625
-0xE063 = 0x7626
-0xE064 = 0x7627
-0xE065 = 0x7628
-0xE066 = 0x7629
-0xE067 = 0x762A
-0xE068 = 0x762B
-0xE069 = 0x762C
-0xE06A = 0x762D
-0xE06B = 0x762E
-0xE06C = 0x762F
-0xE06D = 0x7630
-0xE06E = 0x7631
-0xE06F = 0x7632
-0xE070 = 0x7633
-0xE071 = 0x7634
-0xE072 = 0x7635
-0xE073 = 0x7636
-0xE074 = 0x7637
-0xE075 = 0x7638
-0xE076 = 0x7639
-0xE077 = 0x763A
-0xE078 = 0x763B
-0xE079 = 0x763C
-0xE07A = 0x763D
-0xE07B = 0x763E
-0xE07C = 0x763F
-0xE07D = 0x7640
-0xE07E = 0x7641
-0xE07F = 0x7642
-0xE080 = 0x7643
-0xE081 = 0x7644
-0xE082 = 0x7645
-0xE083 = 0x7646
-0xE084 = 0x7647
-0xE085 = 0x7648
-0xE086 = 0x7649
-0xE087 = 0x764A
-0xE088 = 0x764B
-0xE089 = 0x764C
-0xE08A = 0x764D
-0xE08B = 0x764E
-0xE08C = 0x764F
-0xE08D = 0x7650
-0xE08E = 0x7651
-0xE08F = 0x7652
-0xE090 = 0x7653
-0xE091 = 0x7654
-0xE092 = 0x7655
-0xE093 = 0x7656
-0xE094 = 0x7657
-0xE095 = 0x7658
-0xE096 = 0x7659
-0xE097 = 0x765A
-0xE098 = 0x765B
-0xE099 = 0x765C
-0xE09A = 0x765D
-0xE09B = 0x765E
-0xE09C = 0x765F
-0xE09D = 0x7660
-0xE09E = 0x7661
-0xE09F = 0x7662
-0xE0A0 = 0x7663
-0xE0A1 = 0x7664
-0xE0A2 = 0x7665
-0xE0A3 = 0x7666
-0xE0A4 = 0x7667
-0xE0A5 = 0x7668
-0xE0A6 = 0x7669
-0xE0A7 = 0x766A
-0xE0A8 = 0x766B
-0xE0A9 = 0x766C
-0xE0AA = 0x766D
-0xE0AB = 0x766E
-0xE0AC = 0x766F
-0xE0AD = 0x7670
-0xE0AE = 0x7671
-0xE0AF = 0x7672
-0xE0B0 = 0x7673
-0xE0B1 = 0x7674
-0xE0B2 = 0x7675
-0xE0B3 = 0x7676
-0xE0B4 = 0x7677
-0xE0B5 = 0x7678
-0xE0B6 = 0x7679
-0xE0B7 = 0x767A
-0xE0B8 = 0x767B
-0xE0B9 = 0x767C
-0xE0BA = 0x767D
-0xE0BB = 0x767E
-0xE0BC = 0x7721
-0xE0BD = 0x7722
-0xE0BE = 0x7723
-0xE0BF = 0x7724
-0xE0C0 = 0x7725
-0xE0C1 = 0x7726
-0xE0C2 = 0x7727
-0xE0C3 = 0x7728
-0xE0C4 = 0x7729
-0xE0C5 = 0x772A
-0xE0C6 = 0x772B
-0xE0C7 = 0x772C
-0xE0C8 = 0x772D
-0xE0C9 = 0x772E
-0xE0CA = 0x772F
-0xE0CB = 0x7730
-0xE0CC = 0x7731
-0xE0CD = 0x7732
-0xE0CE = 0x7733
-0xE0CF = 0x7734
-0xE0D0 = 0x7735
-0xE0D1 = 0x7736
-0xE0D2 = 0x7737
-0xE0D3 = 0x7738
-0xE0D4 = 0x7739
-0xE0D5 = 0x773A
-0xE0D6 = 0x773B
-0xE0D7 = 0x773C
-0xE0D8 = 0x773D
-0xE0D9 = 0x773E
-0xE0DA = 0x773F
-0xE0DB = 0x7740
-0xE0DC = 0x7741
-0xE0DD = 0x7742
-0xE0DE = 0x7743
-0xE0DF = 0x7744
-0xE0E0 = 0x7745
-0xE0E1 = 0x7746
-0xE0E2 = 0x7747
-0xE0E3 = 0x7748
-0xE0E4 = 0x7749
-0xE0E5 = 0x774A
-0xE0E6 = 0x774B
-0xE0E7 = 0x774C
-0xE0E8 = 0x774D
-0xE0E9 = 0x774E
-0xE0EA = 0x774F
-0xE0EB = 0x7750
-0xE0EC = 0x7751
-0xE0ED = 0x7752
-0xE0EE = 0x7753
-0xE0EF = 0x7754
-0xE0F0 = 0x7755
-0xE0F1 = 0x7756
-0xE0F2 = 0x7757
-0xE0F3 = 0x7758
-0xE0F4 = 0x7759
-0xE0F5 = 0x775A
-0xE0F6 = 0x775B
-0xE0F7 = 0x775C
-0xE0F8 = 0x775D
-0xE0F9 = 0x775E
-0xE0FA = 0x775F
-0xE0FB = 0x7760
-0xE0FC = 0x7761
-0xE0FD = 0x7762
-0xE0FE = 0x7763
-0xE0FF = 0x7764
-0xE100 = 0x7765
-0xE101 = 0x7766
-0xE102 = 0x7767
-0xE103 = 0x7768
-0xE104 = 0x7769
-0xE105 = 0x776A
-0xE106 = 0x776B
-0xE107 = 0x776C
-0xE108 = 0x776D
-0xE109 = 0x776E
-0xE10A = 0x776F
-0xE10B = 0x7770
-0xE10C = 0x7771
-0xE10D = 0x7772
-0xE10E = 0x7773
-0xE10F = 0x7774
-0xE110 = 0x7775
-0xE111 = 0x7776
-0xE112 = 0x7777
-0xE113 = 0x7778
-0xE114 = 0x7779
-0xE115 = 0x777A
-0xE116 = 0x777B
-0xE117 = 0x777C
-0xE118 = 0x777D
-0xE119 = 0x777E
-0xE11A = 0x7821
-0xE11B = 0x7822
-0xE11C = 0x7823
-0xE11D = 0x7824
-0xE11E = 0x7825
-0xE11F = 0x7826
-0xE120 = 0x7827
-0xE121 = 0x7828
-0xE122 = 0x7829
-0xE123 = 0x782A
-0xE124 = 0x782B
-0xE125 = 0x782C
-0xE126 = 0x782D
-0xE127 = 0x782E
-0xE128 = 0x782F
-0xE129 = 0x7830
-0xE12A = 0x7831
-0xE12B = 0x7832
-0xE12C = 0x7833
-0xE12D = 0x7834
-0xE12E = 0x7835
-0xE12F = 0x7836
-0xE130 = 0x7837
-0xE131 = 0x7838
-0xE132 = 0x7839
-0xE133 = 0x783A
-0xE134 = 0x783B
-0xE135 = 0x783C
-0xE136 = 0x783D
-0xE137 = 0x783E
-0xE138 = 0x783F
-0xE139 = 0x7840
-0xE13A = 0x7841
-0xE13B = 0x7842
-0xE13C = 0x7843
-0xE13D = 0x7844
-0xE13E = 0x7845
-0xE13F = 0x7846
-0xE140 = 0x7847
-0xE141 = 0x7848
-0xE142 = 0x7849
-0xE143 = 0x784A
-0xE144 = 0x784B
-0xE145 = 0x784C
-0xE146 = 0x784D
-0xE147 = 0x784E
-0xE148 = 0x784F
-0xE149 = 0x7850
-0xE14A = 0x7851
-0xE14B = 0x7852
-0xE14C = 0x7853
-0xE14D = 0x7854
-0xE14E = 0x7855
-0xE14F = 0x7856
-0xE150 = 0x7857
-0xE151 = 0x7858
-0xE152 = 0x7859
-0xE153 = 0x785A
-0xE154 = 0x785B
-0xE155 = 0x785C
-0xE156 = 0x785D
-0xE157 = 0x785E
-0xE158 = 0x785F
-0xE159 = 0x7860
-0xE15A = 0x7861
-0xE15B = 0x7862
-0xE15C = 0x7863
-0xE15D = 0x7864
-0xE15E = 0x7865
-0xE15F = 0x7866
-0xE160 = 0x7867
-0xE161 = 0x7868
-0xE162 = 0x7869
-0xE163 = 0x786A
-0xE164 = 0x786B
-0xE165 = 0x786C
-0xE166 = 0x786D
-0xE167 = 0x786E
-0xE168 = 0x786F
-0xE169 = 0x7870
-0xE16A = 0x7871
-0xE16B = 0x7872
-0xE16C = 0x7873
-0xE16D = 0x7874
-0xE16E = 0x7875
-0xE16F = 0x7876
-0xE170 = 0x7877
-0xE171 = 0x7878
-0xE172 = 0x7879
-0xE173 = 0x787A
-0xE174 = 0x787B
-0xE175 = 0x787C
-0xE176 = 0x787D
-0xE177 = 0x787E
-0xE178 = 0x7921
-0xE179 = 0x7922
-0xE17A = 0x7923
-0xE17B = 0x7924
-0xE17C = 0x7925
-0xE17D = 0x7926
-0xE17E = 0x7927
-0xE17F = 0x7928
-0xE180 = 0x7929
-0xE181 = 0x792A
-0xE182 = 0x792B
-0xE183 = 0x792C
-0xE184 = 0x792D
-0xE185 = 0x792E
-0xE186 = 0x792F
-0xE187 = 0x7930
-0xE188 = 0x7931
-0xE189 = 0x7932
-0xE18A = 0x7933
-0xE18B = 0x7934
-0xE18C = 0x7935
-0xE18D = 0x7936
-0xE18E = 0x7937
-0xE18F = 0x7938
-0xE190 = 0x7939
-0xE191 = 0x793A
-0xE192 = 0x793B
-0xE193 = 0x793C
-0xE194 = 0x793D
-0xE195 = 0x793E
-0xE196 = 0x793F
-0xE197 = 0x7940
-0xE198 = 0x7941
-0xE199 = 0x7942
-0xE19A = 0x7943
-0xE19B = 0x7944
-0xE19C = 0x7945
-0xE19D = 0x7946
-0xE19E = 0x7947
-0xE19F = 0x7948
-0xE1A0 = 0x7949
-0xE1A1 = 0x794A
-0xE1A2 = 0x794B
-0xE1A3 = 0x794C
-0xE1A4 = 0x794D
-0xE1A5 = 0x794E
-0xE1A6 = 0x794F
-0xE1A7 = 0x7950
-0xE1A8 = 0x7951
-0xE1A9 = 0x7952
-0xE1AA = 0x7953
-0xE1AB = 0x7954
-0xE1AC = 0x7955
-0xE1AD = 0x7956
-0xE1AE = 0x7957
-0xE1AF = 0x7958
-0xE1B0 = 0x7959
-0xE1B1 = 0x795A
-0xE1B2 = 0x795B
-0xE1B3 = 0x795C
-0xE1B4 = 0x795D
-0xE1B5 = 0x795E
-0xE1B6 = 0x795F
-0xE1B7 = 0x7960
-0xE1B8 = 0x7961
-0xE1B9 = 0x7962
-0xE1BA = 0x7963
-0xE1BB = 0x7964
-0xE1BC = 0x7965
-0xE1BD = 0x7966
-0xE1BE = 0x7967
-0xE1BF = 0x7968
-0xE1C0 = 0x7969
-0xE1C1 = 0x796A
-0xE1C2 = 0x796B
-0xE1C3 = 0x796C
-0xE1C4 = 0x796D
-0xE1C5 = 0x796E
-0xE1C6 = 0x796F
-0xE1C7 = 0x7970
-0xE1C8 = 0x7971
-0xE1C9 = 0x7972
-0xE1CA = 0x7973
-0xE1CB = 0x7974
-0xE1CC = 0x7975
-0xE1CD = 0x7976
-0xE1CE = 0x7977
-0xE1CF = 0x7978
-0xE1D0 = 0x7979
-0xE1D1 = 0x797A
-0xE1D2 = 0x797B
-0xE1D3 = 0x797C
-0xE1D4 = 0x797D
-0xE1D5 = 0x797E
-0xE1D6 = 0x7A21
-0xE1D7 = 0x7A22
-0xE1D8 = 0x7A23
-0xE1D9 = 0x7A24
-0xE1DA = 0x7A25
-0xE1DB = 0x7A26
-0xE1DC = 0x7A27
-0xE1DD = 0x7A28
-0xE1DE = 0x7A29
-0xE1DF = 0x7A2A
-0xE1E0 = 0x7A2B
-0xE1E1 = 0x7A2C
-0xE1E2 = 0x7A2D
-0xE1E3 = 0x7A2E
-0xE1E4 = 0x7A2F
-0xE1E5 = 0x7A30
-0xE1E6 = 0x7A31
-0xE1E7 = 0x7A32
-0xE1E8 = 0x7A33
-0xE1E9 = 0x7A34
-0xE1EA = 0x7A35
-0xE1EB = 0x7A36
-0xE1EC = 0x7A37
-0xE1ED = 0x7A38
-0xE1EE = 0x7A39
-0xE1EF = 0x7A3A
-0xE1F0 = 0x7A3B
-0xE1F1 = 0x7A3C
-0xE1F2 = 0x7A3D
-0xE1F3 = 0x7A3E
-0xE1F4 = 0x7A3F
-0xE1F5 = 0x7A40
-0xE1F6 = 0x7A41
-0xE1F7 = 0x7A42
-0xE1F8 = 0x7A43
-0xE1F9 = 0x7A44
-0xE1FA = 0x7A45
-0xE1FB = 0x7A46
-0xE1FC = 0x7A47
-0xE1FD = 0x7A48
-0xE1FE = 0x7A49
-0xE1FF = 0x7A4A
-0xE200 = 0x7A4B
-0xE201 = 0x7A4C
-0xE202 = 0x7A4D
-0xE203 = 0x7A4E
-0xE204 = 0x7A4F
-0xE205 = 0x7A50
-0xE206 = 0x7A51
-0xE207 = 0x7A52
-0xE208 = 0x7A53
-0xE209 = 0x7A54
-0xE20A = 0x7A55
-0xE20B = 0x7A56
-0xE20C = 0x7A57
-0xE20D = 0x7A58
-0xE20E = 0x7A59
-0xE20F = 0x7A5A
-0xE210 = 0x7A5B
-0xE211 = 0x7A5C
-0xE212 = 0x7A5D
-0xE213 = 0x7A5E
-0xE214 = 0x7A5F
-0xE215 = 0x7A60
-0xE216 = 0x7A61
-0xE217 = 0x7A62
-0xE218 = 0x7A63
-0xE219 = 0x7A64
-0xE21A = 0x7A65
-0xE21B = 0x7A66
-0xE21C = 0x7A67
-0xE21D = 0x7A68
-0xE21E = 0x7A69
-0xE21F = 0x7A6A
-0xE220 = 0x7A6B
-0xE221 = 0x7A6C
-0xE222 = 0x7A6D
-0xE223 = 0x7A6E
-0xE224 = 0x7A6F
-0xE225 = 0x7A70
-0xE226 = 0x7A71
-0xE227 = 0x7A72
-0xE228 = 0x7A73
-0xE229 = 0x7A74
-0xE22A = 0x7A75
-0xE22B = 0x7A76
-0xE22C = 0x7A77
-0xE22D = 0x7A78
-0xE22E = 0x7A79
-0xE22F = 0x7A7A
-0xE230 = 0x7A7B
-0xE231 = 0x7A7C
-0xE232 = 0x7A7D
-0xE233 = 0x7A7E
-0xE234 = 0x7B21
-0xE235 = 0x7B22
-0xE236 = 0x7B23
-0xE237 = 0x7B24
-0xE238 = 0x7B25
-0xE239 = 0x7B26
-0xE23A = 0x7B27
-0xE23B = 0x7B28
-0xE23C = 0x7B29
-0xE23D = 0x7B2A
-0xE23E = 0x7B2B
-0xE23F = 0x7B2C
-0xE240 = 0x7B2D
-0xE241 = 0x7B2E
-0xE242 = 0x7B2F
-0xE243 = 0x7B30
-0xE244 = 0x7B31
-0xE245 = 0x7B32
-0xE246 = 0x7B33
-0xE247 = 0x7B34
-0xE248 = 0x7B35
-0xE249 = 0x7B36
-0xE24A = 0x7B37
-0xE24B = 0x7B38
-0xE24C = 0x7B39
-0xE24D = 0x7B3A
-0xE24E = 0x7B3B
-0xE24F = 0x7B3C
-0xE250 = 0x7B3D
-0xE251 = 0x7B3E
-0xE252 = 0x7B3F
-0xE253 = 0x7B40
-0xE254 = 0x7B41
-0xE255 = 0x7B42
-0xE256 = 0x7B43
-0xE257 = 0x7B44
-0xE258 = 0x7B45
-0xE259 = 0x7B46
-0xE25A = 0x7B47
-0xE25B = 0x7B48
-0xE25C = 0x7B49
-0xE25D = 0x7B4A
-0xE25E = 0x7B4B
-0xE25F = 0x7B4C
-0xE260 = 0x7B4D
-0xE261 = 0x7B4E
-0xE262 = 0x7B4F
-0xE263 = 0x7B50
-0xE264 = 0x7B51
-0xE265 = 0x7B52
-0xE266 = 0x7B53
-0xE267 = 0x7B54
-0xE268 = 0x7B55
-0xE269 = 0x7B56
-0xE26A = 0x7B57
-0xE26B = 0x7B58
-0xE26C = 0x7B59
-0xE26D = 0x7B5A
-0xE26E = 0x7B5B
-0xE26F = 0x7B5C
-0xE270 = 0x7B5D
-0xE271 = 0x7B5E
-0xE272 = 0x7B5F
-0xE273 = 0x7B60
-0xE274 = 0x7B61
-0xE275 = 0x7B62
-0xE276 = 0x7B63
-0xE277 = 0x7B64
-0xE278 = 0x7B65
-0xE279 = 0x7B66
-0xE27A = 0x7B67
-0xE27B = 0x7B68
-0xE27C = 0x7B69
-0xE27D = 0x7B6A
-0xE27E = 0x7B6B
-0xE27F = 0x7B6C
-0xE280 = 0x7B6D
-0xE281 = 0x7B6E
-0xE282 = 0x7B6F
-0xE283 = 0x7B70
-0xE284 = 0x7B71
-0xE285 = 0x7B72
-0xE286 = 0x7B73
-0xE287 = 0x7B74
-0xE288 = 0x7B75
-0xE289 = 0x7B76
-0xE28A = 0x7B77
-0xE28B = 0x7B78
-0xE28C = 0x7B79
-0xE28D = 0x7B7A
-0xE28E = 0x7B7B
-0xE28F = 0x7B7C
-0xE290 = 0x7B7D
-0xE291 = 0x7B7E
-0xE292 = 0x7C21
-0xE293 = 0x7C22
-0xE294 = 0x7C23
-0xE295 = 0x7C24
-0xE296 = 0x7C25
-0xE297 = 0x7C26
-0xE298 = 0x7C27
-0xE299 = 0x7C28
-0xE29A = 0x7C29
-0xE29B = 0x7C2A
-0xE29C = 0x7C2B
-0xE29D = 0x7C2C
-0xE29E = 0x7C2D
-0xE29F = 0x7C2E
-0xE2A0 = 0x7C2F
-0xE2A1 = 0x7C30
-0xE2A2 = 0x7C31
-0xE2A3 = 0x7C32
-0xE2A4 = 0x7C33
-0xE2A5 = 0x7C34
-0xE2A6 = 0x7C35
-0xE2A7 = 0x7C36
-0xE2A8 = 0x7C37
-0xE2A9 = 0x7C38
-0xE2AA = 0x7C39
-0xE2AB = 0x7C3A
-0xE2AC = 0x7C3B
-0xE2AD = 0x7C3C
-0xE2AE = 0x7C3D
-0xE2AF = 0x7C3E
-0xE2B0 = 0x7C3F
-0xE2B1 = 0x7C40
-0xE2B2 = 0x7C41
-0xE2B3 = 0x7C42
-0xE2B4 = 0x7C43
-0xE2B5 = 0x7C44
-0xE2B6 = 0x7C45
-0xE2B7 = 0x7C46
-0xE2B8 = 0x7C47
-0xE2B9 = 0x7C48
-0xE2BA = 0x7C49
-0xE2BB = 0x7C4A
-0xE2BC = 0x7C4B
-0xE2BD = 0x7C4C
-0xE2BE = 0x7C4D
-0xE2BF = 0x7C4E
-0xE2C0 = 0x7C4F
-0xE2C1 = 0x7C50
-0xE2C2 = 0x7C51
-0xE2C3 = 0x7C52
-0xE2C4 = 0x7C53
-0xE2C5 = 0x7C54
-0xE2C6 = 0x7C55
-0xE2C7 = 0x7C56
-0xE2C8 = 0x7C57
-0xE2C9 = 0x7C58
-0xE2CA = 0x7C59
-0xE2CB = 0x7C5A
-0xE2CC = 0x7C5B
-0xE2CD = 0x7C5C
-0xE2CE = 0x7C5D
-0xE2CF = 0x7C5E
-0xE2D0 = 0x7C5F
-0xE2D1 = 0x7C60
-0xE2D2 = 0x7C61
-0xE2D3 = 0x7C62
-0xE2D4 = 0x7C63
-0xE2D5 = 0x7C64
-0xE2D6 = 0x7C65
-0xE2D7 = 0x7C66
-0xE2D8 = 0x7C67
-0xE2D9 = 0x7C68
-0xE2DA = 0x7C69
-0xE2DB = 0x7C6A
-0xE2DC = 0x7C6B
-0xE2DD = 0x7C6C
-0xE2DE = 0x7C6D
-0xE2DF = 0x7C6E
-0xE2E0 = 0x7C6F
-0xE2E1 = 0x7C70
-0xE2E2 = 0x7C71
-0xE2E3 = 0x7C72
-0xE2E4 = 0x7C73
-0xE2E5 = 0x7C74
-0xE2E6 = 0x7C75
-0xE2E7 = 0x7C76
-0xE2E8 = 0x7C77
-0xE2E9 = 0x7C78
-0xE2EA = 0x7C79
-0xE2EB = 0x7C7A
-0xE2EC = 0x7C7B
-0xE2ED = 0x7C7C
-0xE2EE = 0x7C7D
-0xE2EF = 0x7C7E
-0xE2F0 = 0x7D21
-0xE2F1 = 0x7D22
-0xE2F2 = 0x7D23
-0xE2F3 = 0x7D24
-0xE2F4 = 0x7D25
-0xE2F5 = 0x7D26
-0xE2F6 = 0x7D27
-0xE2F7 = 0x7D28
-0xE2F8 = 0x7D29
-0xE2F9 = 0x7D2A
-0xE2FA = 0x7D2B
-0xE2FB = 0x7D2C
-0xE2FC = 0x7D2D
-0xE2FD = 0x7D2E
-0xE2FE = 0x7D2F
-0xE2FF = 0x7D30
-0xE300 = 0x7D31
-0xE301 = 0x7D32
-0xE302 = 0x7D33
-0xE303 = 0x7D34
-0xE304 = 0x7D35
-0xE305 = 0x7D36
-0xE306 = 0x7D37
-0xE307 = 0x7D38
-0xE308 = 0x7D39
-0xE309 = 0x7D3A
-0xE30A = 0x7D3B
-0xE30B = 0x7D3C
-0xE30C = 0x7D3D
-0xE30D = 0x7D3E
-0xE30E = 0x7D3F
-0xE30F = 0x7D40
-0xE310 = 0x7D41
-0xE311 = 0x7D42
-0xE312 = 0x7D43
-0xE313 = 0x7D44
-0xE314 = 0x7D45
-0xE315 = 0x7D46
-0xE316 = 0x7D47
-0xE317 = 0x7D48
-0xE318 = 0x7D49
-0xE319 = 0x7D4A
-0xE31A = 0x7D4B
-0xE31B = 0x7D4C
-0xE31C = 0x7D4D
-0xE31D = 0x7D4E
-0xE31E = 0x7D4F
-0xE31F = 0x7D50
-0xE320 = 0x7D51
-0xE321 = 0x7D52
-0xE322 = 0x7D53
-0xE323 = 0x7D54
-0xE324 = 0x7D55
-0xE325 = 0x7D56
-0xE326 = 0x7D57
-0xE327 = 0x7D58
-0xE328 = 0x7D59
-0xE329 = 0x7D5A
-0xE32A = 0x7D5B
-0xE32B = 0x7D5C
-0xE32C = 0x7D5D
-0xE32D = 0x7D5E
-0xE32E = 0x7D5F
-0xE32F = 0x7D60
-0xE330 = 0x7D61
-0xE331 = 0x7D62
-0xE332 = 0x7D63
-0xE333 = 0x7D64
-0xE334 = 0x7D65
-0xE335 = 0x7D66
-0xE336 = 0x7D67
-0xE337 = 0x7D68
-0xE338 = 0x7D69
-0xE339 = 0x7D6A
-0xE33A = 0x7D6B
-0xE33B = 0x7D6C
-0xE33C = 0x7D6D
-0xE33D = 0x7D6E
-0xE33E = 0x7D6F
-0xE33F = 0x7D70
-0xE340 = 0x7D71
-0xE341 = 0x7D72
-0xE342 = 0x7D73
-0xE343 = 0x7D74
-0xE344 = 0x7D75
-0xE345 = 0x7D76
-0xE346 = 0x7D77
-0xE347 = 0x7D78
-0xE348 = 0x7D79
-0xE349 = 0x7D7A
-0xE34A = 0x7D7B
-0xE34B = 0x7D7C
-0xE34C = 0x7D7D
-0xE34D = 0x7D7E
-0xE34E = 0x7E21
-0xE34F = 0x7E22
-0xE350 = 0x7E23
-0xE351 = 0x7E24
-0xE352 = 0x7E25
-0xE353 = 0x7E26
-0xE354 = 0x7E27
-0xE355 = 0x7E28
-0xE356 = 0x7E29
-0xE357 = 0x7E2A
-0xE358 = 0x7E2B
-0xE359 = 0x7E2C
-0xE35A = 0x7E2D
-0xE35B = 0x7E2E
-0xE35C = 0x7E2F
-0xE35D = 0x7E30
-0xE35E = 0x7E31
-0xE35F = 0x7E32
-0xE360 = 0x7E33
-0xE361 = 0x7E34
-0xE362 = 0x7E35
-0xE363 = 0x7E36
-0xE364 = 0x7E37
-0xE365 = 0x7E38
-0xE366 = 0x7E39
-0xE367 = 0x7E3A
-0xE368 = 0x7E3B
-0xE369 = 0x7E3C
-0xE36A = 0x7E3D
-0xE36B = 0x7E3E
-0xE36C = 0x7E3F
-0xE36D = 0x7E40
-0xE36E = 0x7E41
-0xE36F = 0x7E42
-0xE370 = 0x7E43
-0xE371 = 0x7E44
-0xE372 = 0x7E45
-0xE373 = 0x7E46
-0xE374 = 0x7E47
-0xE375 = 0x7E48
-0xE376 = 0x7E49
-0xE377 = 0x7E4A
-0xE378 = 0x7E4B
-0xE379 = 0x7E4C
-0xE37A = 0x7E4D
-0xE37B = 0x7E4E
-0xE37C = 0x7E4F
-0xE37D = 0x7E50
-0xE37E = 0x7E51
-0xE37F = 0x7E52
-0xE380 = 0x7E53
-0xE381 = 0x7E54
-0xE382 = 0x7E55
-0xE383 = 0x7E56
-0xE384 = 0x7E57
-0xE385 = 0x7E58
-0xE386 = 0x7E59
-0xE387 = 0x7E5A
-0xE388 = 0x7E5B
-0xE389 = 0x7E5C
-0xE38A = 0x7E5D
-0xE38B = 0x7E5E
-0xE38C = 0x7E5F
-0xE38D = 0x7E60
-0xE38E = 0x7E61
-0xE38F = 0x7E62
-0xE390 = 0x7E63
-0xE391 = 0x7E64
-0xE392 = 0x7E65
-0xE393 = 0x7E66
-0xE394 = 0x7E67
-0xE395 = 0x7E68
-0xE396 = 0x7E69
-0xE397 = 0x7E6A
-0xE398 = 0x7E6B
-0xE399 = 0x7E6C
-0xE39A = 0x7E6D
-0xE39B = 0x7E6E
-0xE39C = 0x7E6F
-0xE39D = 0x7E70
-0xE39E = 0x7E71
-0xE39F = 0x7E72
-0xE3A0 = 0x7E73
-0xE3A1 = 0x7E74
-0xE3A2 = 0x7E75
-0xE3A3 = 0x7E76
-0xE3A4 = 0x7E77
-0xE3A5 = 0x7E78
-0xE3A6 = 0x7E79
-0xE3A7 = 0x7E7A
-0xE3A8 = 0x7E7B
-0xE3A9 = 0x7E7C
-0xE3AA = 0x7E7D
-0xE3AB = 0x7E7E
-END_MAP
diff --git a/enc/trans/JIS/UCS%JISX0208VDC@NEC.src b/enc/trans/JIS/UCS%JISX0208VDC@NEC.src
deleted file mode 100644
index d91f0bd2d8..0000000000
--- a/enc/trans/JIS/UCS%JISX0208VDC@NEC.src
+++ /dev/null
@@ -1,98 +0,0 @@
-# $NetBSD: UCS%JISX0208VDC@NEC.src,v 1.1 2003/07/19 20:20:42 tshiozak Exp $
-
-TYPE ROWCOL
-NAME "UCS/JISX0208VDC:NEC"
-SRC_ZONE 0x2116 - 0x33CD
-OOB_MODE INVALID
-DST_INVALID 0xFFFF
-DST_UNIT_BITS 16
-
-BEGIN_MAP
-0x2116 - 0x33CD = INVALID
-#
-# This data is derived from http://www.opengroup.or.jp/jvc/cde/
-#
-0x2116 = 0x2D62
-0x2121 = 0x2D64
-0x2160 = 0x2D35
-0x2161 = 0x2D36
-0x2162 = 0x2D37
-0x2163 = 0x2D38
-0x2164 = 0x2D39
-0x2165 = 0x2D3A
-0x2166 = 0x2D3B
-0x2167 = 0x2D3C
-0x2168 = 0x2D3D
-0x2169 = 0x2D3E
-0x2211 = 0x2D74
-0x221A = 0x2D75
-0x221F = 0x2D78
-0x2220 = 0x2D77
-0x2229 = 0x2D7B
-0x222A = 0x2D7C
-0x222B = 0x2D72
-0x222E = 0x2D73
-0x2235 = 0x2D7A
-0x2252 = 0x2D70
-0x2261 = 0x2D71
-0x22A5 = 0x2D76
-0x22BF = 0x2D79
-0x2460 = 0x2D21
-0x2461 = 0x2D22
-0x2462 = 0x2D23
-0x2463 = 0x2D24
-0x2464 = 0x2D25
-0x2465 = 0x2D26
-0x2466 = 0x2D27
-0x2467 = 0x2D28
-0x2468 = 0x2D29
-0x2469 = 0x2D2A
-0x246A = 0x2D2B
-0x246B = 0x2D2C
-0x246C = 0x2D2D
-0x246D = 0x2D2E
-0x246E = 0x2D2F
-0x246F = 0x2D30
-0x2470 = 0x2D31
-0x2471 = 0x2D32
-0x2472 = 0x2D33
-0x2473 = 0x2D34
-0x301D = 0x2D60
-0x301F = 0x2D61
-0x3231 = 0x2D6A
-0x3232 = 0x2D6B
-0x3239 = 0x2D6C
-0x32A4 = 0x2D65
-0x32A5 = 0x2D66
-0x32A6 = 0x2D67
-0x32A7 = 0x2D68
-0x32A8 = 0x2D69
-0x3303 = 0x2D46
-0x330D = 0x2D4A
-0x3314 = 0x2D41
-0x3318 = 0x2D44
-0x3322 = 0x2D42
-0x3323 = 0x2D4C
-0x3326 = 0x2D4B
-0x3327 = 0x2D45
-0x332B = 0x2D4D
-0x3336 = 0x2D47
-0x333B = 0x2D4F
-0x3349 = 0x2D40
-0x334A = 0x2D4E
-0x334D = 0x2D43
-0x3351 = 0x2D48
-0x3357 = 0x2D49
-0x337B = 0x2D5F
-0x337C = 0x2D6F
-0x337D = 0x2D6E
-0x337E = 0x2D6D
-0x338E = 0x2D53
-0x338F = 0x2D54
-0x339C = 0x2D50
-0x339D = 0x2D51
-0x339E = 0x2D52
-0x33A1 = 0x2D56
-0x33C4 = 0x2D55
-0x33CD = 0x2D63
-END_MAP
diff --git a/enc/trans/JIS/UCS%JISX0212.src b/enc/trans/JIS/UCS%JISX0212.src
deleted file mode 100644
index f3b2e7089b..0000000000
--- a/enc/trans/JIS/UCS%JISX0212.src
+++ /dev/null
@@ -1,6170 +0,0 @@
-# $NetBSD: UCS%JISX0212.src,v 1.3 2003/07/14 06:03:43 tshiozak Exp $
-
-TYPE ROWCOL
-NAME "UCS/JISX0212"
-SRC_ZONE 0x0000 - 0x9FFF
-OOB_MODE INVALID
-DST_INVALID 0xFFFF
-DST_UNIT_BITS 16
-
-BEGIN_MAP
-#
-# This mapping data is made from the mapping data provided by Unicode, Inc.
-# Original notice:
-#
-# Name: JIS X 0212 (1990) to Unicode
-# Unicode version: 1.1
-# Table version: 0.9
-# Table format: Format A
-# Date: 8 March 1994
-#
-# Copyright (c) 1991-1994 Unicode, Inc. All Rights reserved.
-#
-# This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
-# No claims are made as to fitness for any particular purpose. No
-# warranties of any kind are expressed or implied. The recipient
-# agrees to determine applicability of information provided. If this
-# file has been provided on magnetic media by Unicode, Inc., the sole
-# remedy for any claim will be exchange of defective media within 90
-# days of receipt.
-#
-# Recipient is granted the right to make copies in any form for
-# internal distribution and to freely use the information supplied
-# in the creation of products supporting Unicode. Unicode, Inc.
-# specifically excludes the right to re-distribute this file directly
-# to third parties or other organizations whether for profit or not.
-#
-# General notes:
-#
-#
-# This table contains one set of mappings from JIS X 0212 into Unicode.
-# Note that these data are *possible* mappings only and may not be the
-# same as those used by actual products, nor may they be the best suited
-# for all uses. For more information on the mappings between various code
-# pages incorporating the repertoire of JIS X 0212 and Unicode, consult the
-# VENDORS mapping data. Normative information on the mapping between
-# JIS X 0212 and Unicode may be found in the Unihan.txt file in the
-# latest Unicode Character Database.
-#
-# If you have carefully considered the fact that the mappings in
-# this table are only one possible set of mappings between JIS X 0212 and
-# Unicode and have no normative status, but still feel that you
-# have located an error in the table that requires fixing, you may
-# report any such error to errata@unicode.org.
-#
-#
-# Format: Three tab-separated columns
-# Column #1 is the JIS X 0212 code (in hex as 0xXXXX)
-# Column #2 is the Unicode (in hex as 0xXXXX)
-# Column #3 the Unicode name (follows a comment sign, '#')
-# The official names for Unicode characters U+4E00
-# to U+9FA5, inclusive, is "CJK UNIFIED IDEOGRAPH-XXXX",
-# where XXXX is the code point. Including all these
-# names in this file increases its size substantially
-# and needlessly. The token "<CJK>" is used for the
-# name of these characters. If necessary, it can be
-# expanded algorithmically by a parser or editor.
-#
-# The entries are in JIS X 0212 order
-#
-# The following algorithms can be used to change the hex form
-# of JIS 0212 to other standard forms:
-#
-# To change hex to EUC form, add 0x8080
-# To change hex to kuten form, first subtract 0x2020. Then
-# the high and low bytes correspond to the ku and ten of
-# the kuten form. For example, 0x2121 -> 0x0101 -> 0101;
-# 0x6D63 -> 0x4D43 -> 7767
-#
-# The kanji mappings are a normative part of ISO/IEC 10646. The
-# non-kanji mappings are provisional, pending definition of
-# official mappings by Japanese standards bodies
-#
-# Any comments or problems, contact <John_Jenkins@taligent.com>
-#
-# Notes:
-#
-# 1. JIS X 0212 apparently unified the following two symbols
-# into a single character at 0x2922:
-#
-# LATIN CAPITAL LETTER D WITH STROKE
-# LATIN CAPITAL LETTER ETH
-#
-# However, JIS X 0212 maintains the distinction between
-# the lowercase forms of these two elements at 0x2942 and 0x2943.
-# Given the structre of these JIS encodings, it is clear that
-# 0x2922 and 0x2942 are intended to be a capital/small pair.
-# Consequently, in the Unicode mapping, 0x2922 is treated as
-# LATIN CAPITAL LETTER D WITH STROKE.
-#
-# Ruby specific modification:
-# remove 0x007E to 0x2237 conversion.
-#
-# 0x007E = 0x2237
-0x00A1 = 0x2242
-0x00A4 = 0x2270
-0x00A6 = 0x2243
-0x00A9 = 0x226D
-0x00AA = 0x226C
-0x00AE = 0x226E
-0x00AF = 0x2234
-0x00B8 = 0x2231
-0x00BA = 0x226B
-0x00BF = 0x2244
-0x00C0 = 0x2A22
-0x00C1 = 0x2A21
-0x00C2 = 0x2A24
-0x00C3 = 0x2A2A
-0x00C4 = 0x2A23
-0x00C5 = 0x2A29
-0x00C6 = 0x2921
-0x00C7 = 0x2A2E
-0x00C8 = 0x2A32
-0x00C9 = 0x2A31
-0x00CA = 0x2A34
-0x00CB = 0x2A33
-0x00CC = 0x2A40
-0x00CD = 0x2A3F
-0x00CE = 0x2A42
-0x00CF = 0x2A41
-0x00D1 = 0x2A50
-0x00D2 = 0x2A52
-0x00D3 = 0x2A51
-0x00D4 = 0x2A54
-0x00D5 = 0x2A58
-0x00D6 = 0x2A53
-0x00D8 = 0x292C
-0x00D9 = 0x2A63
-0x00DA = 0x2A62
-0x00DB = 0x2A65
-0x00DC = 0x2A64
-0x00DD = 0x2A72
-0x00DE = 0x2930
-0x00DF = 0x294E
-0x00E0 = 0x2B22
-0x00E1 = 0x2B21
-0x00E2 = 0x2B24
-0x00E3 = 0x2B2A
-0x00E4 = 0x2B23
-0x00E5 = 0x2B29
-0x00E6 = 0x2941
-0x00E7 = 0x2B2E
-0x00E8 = 0x2B32
-0x00E9 = 0x2B31
-0x00EA = 0x2B34
-0x00EB = 0x2B33
-0x00EC = 0x2B40
-0x00ED = 0x2B3F
-0x00EE = 0x2B42
-0x00EF = 0x2B41
-0x00F0 = 0x2943
-0x00F1 = 0x2B50
-0x00F2 = 0x2B52
-0x00F3 = 0x2B51
-0x00F4 = 0x2B54
-0x00F5 = 0x2B58
-0x00F6 = 0x2B53
-0x00F8 = 0x294C
-0x00F9 = 0x2B63
-0x00FA = 0x2B62
-0x00FB = 0x2B65
-0x00FC = 0x2B64
-0x00FD = 0x2B72
-0x00FE = 0x2950
-0x00FF = 0x2B73
-0x0100 = 0x2A27
-0x0101 = 0x2B27
-0x0102 = 0x2A25
-0x0103 = 0x2B25
-0x0104 = 0x2A28
-0x0105 = 0x2B28
-0x0106 = 0x2A2B
-0x0107 = 0x2B2B
-0x0108 = 0x2A2C
-0x0109 = 0x2B2C
-0x010A = 0x2A2F
-0x010B = 0x2B2F
-0x010C = 0x2A2D
-0x010D = 0x2B2D
-0x010E = 0x2A30
-0x010F = 0x2B30
-0x0110 = 0x2922
-0x0111 = 0x2942
-0x0112 = 0x2A37
-0x0113 = 0x2B37
-0x0116 = 0x2A36
-0x0117 = 0x2B36
-0x0118 = 0x2A38
-0x0119 = 0x2B38
-0x011A = 0x2A35
-0x011B = 0x2B35
-0x011C = 0x2A3A
-0x011D = 0x2B3A
-0x011E = 0x2A3B
-0x011F = 0x2B3B
-0x0120 = 0x2A3D
-0x0121 = 0x2B3D
-0x0122 = 0x2A3C
-0x0124 = 0x2A3E
-0x0125 = 0x2B3E
-0x0126 = 0x2924
-0x0127 = 0x2944
-0x0128 = 0x2A47
-0x0129 = 0x2B47
-0x012A = 0x2A45
-0x012B = 0x2B45
-0x012E = 0x2A46
-0x012F = 0x2B46
-0x0130 = 0x2A44
-0x0131 = 0x2945
-0x0132 = 0x2926
-0x0133 = 0x2946
-0x0134 = 0x2A48
-0x0135 = 0x2B48
-0x0136 = 0x2A49
-0x0137 = 0x2B49
-0x0138 = 0x2947
-0x0139 = 0x2A4A
-0x013A = 0x2B4A
-0x013B = 0x2A4C
-0x013C = 0x2B4C
-0x013D = 0x2A4B
-0x013E = 0x2B4B
-0x013F = 0x2929
-0x0140 = 0x2949
-0x0141 = 0x2928
-0x0142 = 0x2948
-0x0143 = 0x2A4D
-0x0144 = 0x2B4D
-0x0145 = 0x2A4F
-0x0146 = 0x2B4F
-0x0147 = 0x2A4E
-0x0148 = 0x2B4E
-0x0149 = 0x294A
-0x014A = 0x292B
-0x014B = 0x294B
-0x014C = 0x2A57
-0x014D = 0x2B57
-0x0150 = 0x2A56
-0x0151 = 0x2B56
-0x0152 = 0x292D
-0x0153 = 0x294D
-0x0154 = 0x2A59
-0x0155 = 0x2B59
-0x0156 = 0x2A5B
-0x0157 = 0x2B5B
-0x0158 = 0x2A5A
-0x0159 = 0x2B5A
-0x015A = 0x2A5C
-0x015B = 0x2B5C
-0x015C = 0x2A5D
-0x015D = 0x2B5D
-0x015E = 0x2A5F
-0x015F = 0x2B5F
-0x0160 = 0x2A5E
-0x0161 = 0x2B5E
-0x0162 = 0x2A61
-0x0163 = 0x2B61
-0x0164 = 0x2A60
-0x0165 = 0x2B60
-0x0166 = 0x292F
-0x0167 = 0x294F
-0x0168 = 0x2A6C
-0x0169 = 0x2B6C
-0x016A = 0x2A69
-0x016B = 0x2B69
-0x016C = 0x2A66
-0x016D = 0x2B66
-0x016E = 0x2A6B
-0x016F = 0x2B6B
-0x0170 = 0x2A68
-0x0171 = 0x2B68
-0x0172 = 0x2A6A
-0x0173 = 0x2B6A
-0x0174 = 0x2A71
-0x0175 = 0x2B71
-0x0176 = 0x2A74
-0x0177 = 0x2B74
-0x0178 = 0x2A73
-0x0179 = 0x2A75
-0x017A = 0x2B75
-0x017B = 0x2A77
-0x017C = 0x2B77
-0x017D = 0x2A76
-0x017E = 0x2B76
-0x01CD = 0x2A26
-0x01CE = 0x2B26
-0x01CF = 0x2A43
-0x01D0 = 0x2B43
-0x01D1 = 0x2A55
-0x01D2 = 0x2B55
-0x01D3 = 0x2A67
-0x01D4 = 0x2B67
-0x01D5 = 0x2A70
-0x01D6 = 0x2B70
-0x01D7 = 0x2A6D
-0x01D8 = 0x2B6D
-0x01D9 = 0x2A6F
-0x01DA = 0x2B6F
-0x01DB = 0x2A6E
-0x01DC = 0x2B6E
-0x01F5 = 0x2B39
-0x02C7 = 0x2230
-0x02D8 = 0x222F
-0x02D9 = 0x2232
-0x02DA = 0x2236
-0x02DB = 0x2235
-0x02DD = 0x2233
-0x0384 = 0x2238
-0x0385 = 0x2239
-0x0386 = 0x2661
-0x0388 = 0x2662
-0x0389 = 0x2663
-0x038A = 0x2664
-0x038C = 0x2667
-0x038E = 0x2669
-0x038F = 0x266C
-0x0390 = 0x2676
-0x03AA = 0x2665
-0x03AB = 0x266A
-0x03AC = 0x2671
-0x03AD = 0x2672
-0x03AE = 0x2673
-0x03AF = 0x2674
-0x03B0 = 0x267B
-0x03C2 = 0x2678
-0x03CA = 0x2675
-0x03CB = 0x267A
-0x03CC = 0x2677
-0x03CD = 0x2679
-0x03CE = 0x267C
-0x0402 = 0x2742
-0x0403 = 0x2743
-0x0404 = 0x2744
-0x0405 = 0x2745
-0x0406 = 0x2746
-0x0407 = 0x2747
-0x0408 = 0x2748
-0x0409 = 0x2749
-0x040A = 0x274A
-0x040B = 0x274B
-0x040C = 0x274C
-0x040E = 0x274D
-0x040F = 0x274E
-0x0452 = 0x2772
-0x0453 = 0x2773
-0x0454 = 0x2774
-0x0455 = 0x2775
-0x0456 = 0x2776
-0x0457 = 0x2777
-0x0458 = 0x2778
-0x0459 = 0x2779
-0x045A = 0x277A
-0x045B = 0x277B
-0x045C = 0x277C
-0x045E = 0x277D
-0x045F = 0x277E
-0x2116 = 0x2271
-0x2122 = 0x226F
-0x4E02 = 0x3021
-0x4E04 = 0x3022
-0x4E05 = 0x3023
-0x4E0C = 0x3024
-0x4E12 = 0x3025
-0x4E1F = 0x3026
-0x4E23 = 0x3027
-0x4E24 = 0x3028
-0x4E28 = 0x3029
-0x4E2B = 0x302A
-0x4E2E = 0x302B
-0x4E2F = 0x302C
-0x4E30 = 0x302D
-0x4E35 = 0x302E
-0x4E40 = 0x302F
-0x4E41 = 0x3030
-0x4E44 = 0x3031
-0x4E47 = 0x3032
-0x4E51 = 0x3033
-0x4E5A = 0x3034
-0x4E5C = 0x3035
-0x4E63 = 0x3036
-0x4E68 = 0x3037
-0x4E69 = 0x3038
-0x4E74 = 0x3039
-0x4E75 = 0x303A
-0x4E79 = 0x303B
-0x4E7F = 0x303C
-0x4E8D = 0x303D
-0x4E96 = 0x303E
-0x4E97 = 0x303F
-0x4E9D = 0x3040
-0x4EAF = 0x3041
-0x4EB9 = 0x3042
-0x4EC3 = 0x3043
-0x4ED0 = 0x3044
-0x4EDA = 0x3045
-0x4EDB = 0x3046
-0x4EE0 = 0x3047
-0x4EE1 = 0x3048
-0x4EE2 = 0x3049
-0x4EE8 = 0x304A
-0x4EEF = 0x304B
-0x4EF1 = 0x304C
-0x4EF3 = 0x304D
-0x4EF5 = 0x304E
-0x4EFD = 0x304F
-0x4EFE = 0x3050
-0x4EFF = 0x3051
-0x4F00 = 0x3052
-0x4F02 = 0x3053
-0x4F03 = 0x3054
-0x4F08 = 0x3055
-0x4F0B = 0x3056
-0x4F0C = 0x3057
-0x4F12 = 0x3058
-0x4F15 = 0x3059
-0x4F16 = 0x305A
-0x4F17 = 0x305B
-0x4F19 = 0x305C
-0x4F2E = 0x305D
-0x4F31 = 0x305E
-0x4F33 = 0x3060
-0x4F35 = 0x3061
-0x4F37 = 0x3062
-0x4F39 = 0x3063
-0x4F3B = 0x3064
-0x4F3E = 0x3065
-0x4F40 = 0x3066
-0x4F42 = 0x3067
-0x4F48 = 0x3068
-0x4F49 = 0x3069
-0x4F4B = 0x306A
-0x4F4C = 0x306B
-0x4F52 = 0x306C
-0x4F54 = 0x306D
-0x4F56 = 0x306E
-0x4F58 = 0x306F
-0x4F5F = 0x3070
-0x4F60 = 0x305F
-0x4F63 = 0x3071
-0x4F6A = 0x3072
-0x4F6C = 0x3073
-0x4F6E = 0x3074
-0x4F71 = 0x3075
-0x4F77 = 0x3076
-0x4F78 = 0x3077
-0x4F79 = 0x3078
-0x4F7A = 0x3079
-0x4F7D = 0x307A
-0x4F7E = 0x307B
-0x4F81 = 0x307C
-0x4F82 = 0x307D
-0x4F84 = 0x307E
-0x4F85 = 0x3121
-0x4F89 = 0x3122
-0x4F8A = 0x3123
-0x4F8C = 0x3124
-0x4F8E = 0x3125
-0x4F90 = 0x3126
-0x4F92 = 0x3127
-0x4F93 = 0x3128
-0x4F94 = 0x3129
-0x4F97 = 0x312A
-0x4F99 = 0x312B
-0x4F9A = 0x312C
-0x4F9E = 0x312D
-0x4F9F = 0x312E
-0x4FB2 = 0x312F
-0x4FB7 = 0x3130
-0x4FB9 = 0x3131
-0x4FBB = 0x3132
-0x4FBC = 0x3133
-0x4FBD = 0x3134
-0x4FBE = 0x3135
-0x4FC0 = 0x3136
-0x4FC1 = 0x3137
-0x4FC5 = 0x3138
-0x4FC6 = 0x3139
-0x4FC8 = 0x313A
-0x4FC9 = 0x313B
-0x4FCB = 0x313C
-0x4FCC = 0x313D
-0x4FCD = 0x313E
-0x4FCF = 0x313F
-0x4FD2 = 0x3140
-0x4FDC = 0x3141
-0x4FE0 = 0x3142
-0x4FE2 = 0x3143
-0x4FF0 = 0x3144
-0x4FF2 = 0x3145
-0x4FFC = 0x3146
-0x4FFD = 0x3147
-0x4FFF = 0x3148
-0x5000 = 0x3149
-0x5001 = 0x314A
-0x5004 = 0x314B
-0x5007 = 0x314C
-0x500A = 0x314D
-0x500C = 0x314E
-0x500E = 0x314F
-0x5010 = 0x3150
-0x5013 = 0x3151
-0x5017 = 0x3152
-0x5018 = 0x3153
-0x501B = 0x3154
-0x501C = 0x3155
-0x501D = 0x3156
-0x501E = 0x3157
-0x5022 = 0x3158
-0x5027 = 0x3159
-0x502E = 0x315A
-0x5030 = 0x315B
-0x5032 = 0x315C
-0x5033 = 0x315D
-0x5035 = 0x315E
-0x503B = 0x3176
-0x5040 = 0x315F
-0x5041 = 0x3160
-0x5042 = 0x3161
-0x5045 = 0x3162
-0x5046 = 0x3163
-0x504A = 0x3164
-0x504C = 0x3165
-0x504E = 0x3166
-0x5051 = 0x3167
-0x5052 = 0x3168
-0x5053 = 0x3169
-0x5057 = 0x316A
-0x5059 = 0x316B
-0x505F = 0x316C
-0x5060 = 0x316D
-0x5062 = 0x316E
-0x5063 = 0x316F
-0x5066 = 0x3170
-0x5067 = 0x3171
-0x506A = 0x3172
-0x506D = 0x3173
-0x5070 = 0x3174
-0x5071 = 0x3175
-0x5081 = 0x3177
-0x5083 = 0x3178
-0x5084 = 0x3179
-0x5086 = 0x317A
-0x508A = 0x317B
-0x508E = 0x317C
-0x508F = 0x317D
-0x5090 = 0x317E
-0x5092 = 0x3221
-0x5093 = 0x3222
-0x5094 = 0x3223
-0x5096 = 0x3224
-0x509B = 0x3225
-0x509C = 0x3226
-0x509E = 0x3227
-0x509F = 0x3228
-0x50A0 = 0x3229
-0x50A1 = 0x322A
-0x50A2 = 0x322B
-0x50AA = 0x322C
-0x50AF = 0x322D
-0x50B0 = 0x322E
-0x50B9 = 0x322F
-0x50BA = 0x3230
-0x50BD = 0x3231
-0x50C0 = 0x3232
-0x50C3 = 0x3233
-0x50C4 = 0x3234
-0x50C7 = 0x3235
-0x50CC = 0x3236
-0x50CE = 0x3237
-0x50D0 = 0x3238
-0x50D3 = 0x3239
-0x50D4 = 0x323A
-0x50D8 = 0x323B
-0x50DC = 0x323C
-0x50DD = 0x323D
-0x50DF = 0x323E
-0x50E2 = 0x323F
-0x50E4 = 0x3240
-0x50E6 = 0x3241
-0x50E8 = 0x3242
-0x50E9 = 0x3243
-0x50EF = 0x3244
-0x50F1 = 0x3245
-0x50F2 = 0x3251
-0x50F6 = 0x3246
-0x50FA = 0x3247
-0x50FE = 0x3248
-0x5103 = 0x3249
-0x5106 = 0x324A
-0x5107 = 0x324B
-0x5108 = 0x324C
-0x510B = 0x324D
-0x510C = 0x324E
-0x510D = 0x324F
-0x510E = 0x3250
-0x5110 = 0x3252
-0x5117 = 0x3253
-0x5119 = 0x3254
-0x511B = 0x3255
-0x511C = 0x3256
-0x511D = 0x3257
-0x511E = 0x3258
-0x5123 = 0x3259
-0x5127 = 0x325A
-0x5128 = 0x325B
-0x512C = 0x325C
-0x512D = 0x325D
-0x512F = 0x325E
-0x5131 = 0x325F
-0x5133 = 0x3260
-0x5134 = 0x3261
-0x5135 = 0x3262
-0x5138 = 0x3263
-0x5139 = 0x3264
-0x5142 = 0x3265
-0x514A = 0x3266
-0x514F = 0x3267
-0x5153 = 0x3268
-0x5155 = 0x3269
-0x5157 = 0x326A
-0x5158 = 0x326B
-0x515F = 0x326C
-0x5164 = 0x326D
-0x5166 = 0x326E
-0x517E = 0x326F
-0x5183 = 0x3270
-0x5184 = 0x3271
-0x518B = 0x3272
-0x518E = 0x3273
-0x5198 = 0x3274
-0x519D = 0x3275
-0x51A1 = 0x3276
-0x51A3 = 0x3277
-0x51AD = 0x3278
-0x51B8 = 0x3279
-0x51BA = 0x327A
-0x51BC = 0x327B
-0x51BE = 0x327C
-0x51BF = 0x327D
-0x51C2 = 0x327E
-0x51C8 = 0x3321
-0x51CF = 0x3322
-0x51D1 = 0x3323
-0x51D2 = 0x3324
-0x51D3 = 0x3325
-0x51D5 = 0x3326
-0x51D8 = 0x3327
-0x51DE = 0x3328
-0x51E2 = 0x3329
-0x51E5 = 0x332A
-0x51EE = 0x332B
-0x51F2 = 0x332C
-0x51F3 = 0x332D
-0x51F4 = 0x332E
-0x51F7 = 0x332F
-0x5201 = 0x3330
-0x5202 = 0x3331
-0x5205 = 0x3332
-0x5212 = 0x3333
-0x5213 = 0x3334
-0x5215 = 0x3335
-0x5216 = 0x3336
-0x5218 = 0x3337
-0x5222 = 0x3338
-0x5228 = 0x3339
-0x5231 = 0x333A
-0x5232 = 0x333B
-0x5235 = 0x333C
-0x523C = 0x333D
-0x5245 = 0x333E
-0x5249 = 0x333F
-0x5255 = 0x3340
-0x5257 = 0x3341
-0x5258 = 0x3342
-0x525A = 0x3343
-0x525C = 0x3344
-0x525F = 0x3345
-0x5260 = 0x3346
-0x5261 = 0x3347
-0x5266 = 0x3348
-0x526E = 0x3349
-0x5277 = 0x334A
-0x5278 = 0x334B
-0x5279 = 0x334C
-0x5280 = 0x334D
-0x5282 = 0x334E
-0x5285 = 0x334F
-0x528A = 0x3350
-0x528C = 0x3351
-0x5293 = 0x3352
-0x5295 = 0x3353
-0x5296 = 0x3354
-0x5297 = 0x3355
-0x5298 = 0x3356
-0x529A = 0x3357
-0x529C = 0x3358
-0x52A4 = 0x3359
-0x52A5 = 0x335A
-0x52A6 = 0x335B
-0x52A7 = 0x335C
-0x52AF = 0x335D
-0x52B0 = 0x335E
-0x52B6 = 0x335F
-0x52B7 = 0x3360
-0x52B8 = 0x3361
-0x52BA = 0x3362
-0x52BB = 0x3363
-0x52BD = 0x3364
-0x52C0 = 0x3365
-0x52C4 = 0x3366
-0x52C6 = 0x3367
-0x52C8 = 0x3368
-0x52CC = 0x3369
-0x52CF = 0x336A
-0x52D1 = 0x336B
-0x52D4 = 0x336C
-0x52D6 = 0x336D
-0x52DB = 0x336E
-0x52DC = 0x336F
-0x52E1 = 0x3370
-0x52E5 = 0x3371
-0x52E8 = 0x3372
-0x52E9 = 0x3373
-0x52EA = 0x3374
-0x52EC = 0x3375
-0x52F0 = 0x3376
-0x52F1 = 0x3377
-0x52F4 = 0x3378
-0x52F6 = 0x3379
-0x52F7 = 0x337A
-0x5300 = 0x337B
-0x5303 = 0x337C
-0x530A = 0x337D
-0x530B = 0x337E
-0x530C = 0x3421
-0x5311 = 0x3422
-0x5313 = 0x3423
-0x5318 = 0x3424
-0x531B = 0x3425
-0x531C = 0x3426
-0x531E = 0x3427
-0x531F = 0x3428
-0x5325 = 0x3429
-0x5327 = 0x342A
-0x5328 = 0x342B
-0x5329 = 0x342C
-0x532B = 0x342D
-0x532C = 0x342E
-0x532D = 0x342F
-0x5330 = 0x3430
-0x5332 = 0x3431
-0x5335 = 0x3432
-0x533C = 0x3433
-0x533D = 0x3434
-0x533E = 0x3435
-0x5342 = 0x3436
-0x534B = 0x3438
-0x534C = 0x3437
-0x5359 = 0x3439
-0x535B = 0x343A
-0x5361 = 0x343B
-0x5363 = 0x343C
-0x5365 = 0x343D
-0x536C = 0x343E
-0x536D = 0x343F
-0x5372 = 0x3440
-0x5379 = 0x3441
-0x537E = 0x3442
-0x5383 = 0x3443
-0x5387 = 0x3444
-0x5388 = 0x3445
-0x538E = 0x3446
-0x5393 = 0x3447
-0x5394 = 0x3448
-0x5399 = 0x3449
-0x539D = 0x344A
-0x53A1 = 0x344B
-0x53A4 = 0x344C
-0x53AA = 0x344D
-0x53AB = 0x344E
-0x53AF = 0x344F
-0x53B2 = 0x3450
-0x53B4 = 0x3451
-0x53B5 = 0x3452
-0x53B7 = 0x3453
-0x53B8 = 0x3454
-0x53BA = 0x3455
-0x53BD = 0x3456
-0x53C0 = 0x3457
-0x53C5 = 0x3458
-0x53CF = 0x3459
-0x53D2 = 0x345A
-0x53D3 = 0x345B
-0x53D5 = 0x345C
-0x53DA = 0x345D
-0x53DD = 0x345E
-0x53DE = 0x345F
-0x53E0 = 0x3460
-0x53E6 = 0x3461
-0x53E7 = 0x3462
-0x53F5 = 0x3463
-0x5402 = 0x3464
-0x5413 = 0x3465
-0x541A = 0x3466
-0x5421 = 0x3467
-0x5427 = 0x3468
-0x5428 = 0x3469
-0x542A = 0x346A
-0x542F = 0x346B
-0x5431 = 0x346C
-0x5434 = 0x346D
-0x5435 = 0x346E
-0x5443 = 0x346F
-0x5444 = 0x3470
-0x5447 = 0x3471
-0x544D = 0x3472
-0x544F = 0x3473
-0x545E = 0x3474
-0x5462 = 0x3475
-0x5464 = 0x3476
-0x5466 = 0x3477
-0x5467 = 0x3478
-0x5469 = 0x3479
-0x546B = 0x347A
-0x546D = 0x347B
-0x546E = 0x347C
-0x5474 = 0x347D
-0x547F = 0x347E
-0x5481 = 0x3521
-0x5483 = 0x3522
-0x5485 = 0x3523
-0x5488 = 0x3524
-0x5489 = 0x3525
-0x548D = 0x3526
-0x5491 = 0x3527
-0x5495 = 0x3528
-0x5496 = 0x3529
-0x549C = 0x352A
-0x549F = 0x352B
-0x54A1 = 0x352C
-0x54A6 = 0x352D
-0x54A7 = 0x352E
-0x54A9 = 0x352F
-0x54AA = 0x3530
-0x54AD = 0x3531
-0x54AE = 0x3532
-0x54B1 = 0x3533
-0x54B7 = 0x3534
-0x54B9 = 0x3535
-0x54BA = 0x3536
-0x54BB = 0x3537
-0x54BF = 0x3538
-0x54C6 = 0x3539
-0x54CA = 0x353A
-0x54CD = 0x353B
-0x54CE = 0x353C
-0x54E0 = 0x353D
-0x54EA = 0x353E
-0x54EC = 0x353F
-0x54EF = 0x3540
-0x54F6 = 0x3541
-0x54FC = 0x3542
-0x54FE = 0x3543
-0x54FF = 0x3544
-0x5500 = 0x3545
-0x5501 = 0x3546
-0x5505 = 0x3547
-0x5508 = 0x3548
-0x5509 = 0x3549
-0x550C = 0x354A
-0x550D = 0x354B
-0x550E = 0x354C
-0x5515 = 0x354D
-0x552A = 0x354E
-0x552B = 0x354F
-0x5532 = 0x3550
-0x5535 = 0x3551
-0x5536 = 0x3552
-0x553B = 0x3553
-0x553C = 0x3554
-0x553D = 0x3555
-0x5541 = 0x3556
-0x5547 = 0x3557
-0x5549 = 0x3558
-0x554A = 0x3559
-0x554D = 0x355A
-0x5550 = 0x355B
-0x5551 = 0x355C
-0x5558 = 0x355D
-0x555A = 0x355E
-0x555B = 0x355F
-0x555E = 0x3560
-0x5560 = 0x3561
-0x5561 = 0x3562
-0x5564 = 0x3563
-0x5566 = 0x3564
-0x557F = 0x3565
-0x5581 = 0x3566
-0x5582 = 0x3567
-0x5586 = 0x3568
-0x5588 = 0x3569
-0x558E = 0x356A
-0x558F = 0x356B
-0x5591 = 0x356C
-0x5592 = 0x356D
-0x5593 = 0x356E
-0x5594 = 0x356F
-0x5597 = 0x3570
-0x55A3 = 0x3571
-0x55A4 = 0x3572
-0x55AD = 0x3573
-0x55B2 = 0x3574
-0x55BF = 0x3575
-0x55C1 = 0x3576
-0x55C3 = 0x3577
-0x55C6 = 0x3578
-0x55C9 = 0x3579
-0x55CB = 0x357A
-0x55CC = 0x357B
-0x55CE = 0x357C
-0x55D1 = 0x357D
-0x55D2 = 0x357E
-0x55D3 = 0x3621
-0x55D7 = 0x3622
-0x55D8 = 0x3623
-0x55DB = 0x3624
-0x55DE = 0x3625
-0x55E2 = 0x3626
-0x55E9 = 0x3627
-0x55F6 = 0x3628
-0x55FF = 0x3629
-0x5605 = 0x362A
-0x5608 = 0x362B
-0x560A = 0x362C
-0x560D = 0x362D
-0x560E = 0x362E
-0x560F = 0x362F
-0x5610 = 0x3630
-0x5611 = 0x3631
-0x5612 = 0x3632
-0x5619 = 0x3633
-0x562C = 0x3634
-0x5630 = 0x3635
-0x5633 = 0x3636
-0x5635 = 0x3637
-0x5637 = 0x3638
-0x5639 = 0x3639
-0x563B = 0x363A
-0x563C = 0x363B
-0x563D = 0x363C
-0x563F = 0x363D
-0x5640 = 0x363E
-0x5641 = 0x363F
-0x5643 = 0x3640
-0x5644 = 0x3641
-0x5646 = 0x3642
-0x5649 = 0x3643
-0x564B = 0x3644
-0x564D = 0x3645
-0x564F = 0x3646
-0x5654 = 0x3647
-0x565E = 0x3648
-0x5660 = 0x3649
-0x5661 = 0x364A
-0x5662 = 0x364B
-0x5663 = 0x364C
-0x5666 = 0x364D
-0x5669 = 0x364E
-0x566D = 0x364F
-0x566F = 0x3650
-0x5671 = 0x3651
-0x5672 = 0x3652
-0x5675 = 0x3653
-0x5684 = 0x3654
-0x5685 = 0x3655
-0x5688 = 0x3656
-0x568B = 0x3657
-0x568C = 0x3658
-0x5695 = 0x3659
-0x5699 = 0x365A
-0x569A = 0x365B
-0x569D = 0x365C
-0x569E = 0x365D
-0x569F = 0x365E
-0x56A6 = 0x365F
-0x56A7 = 0x3660
-0x56A8 = 0x3661
-0x56A9 = 0x3662
-0x56AB = 0x3663
-0x56AC = 0x3664
-0x56AD = 0x3665
-0x56B1 = 0x3666
-0x56B3 = 0x3667
-0x56B7 = 0x3668
-0x56BE = 0x3669
-0x56C5 = 0x366A
-0x56C9 = 0x366B
-0x56CA = 0x366C
-0x56CB = 0x366D
-0x56CC = 0x3670
-0x56CD = 0x3671
-0x56CF = 0x366E
-0x56D0 = 0x366F
-0x56D9 = 0x3672
-0x56DC = 0x3673
-0x56DD = 0x3674
-0x56DF = 0x3675
-0x56E1 = 0x3676
-0x56E4 = 0x3677
-0x56E5 = 0x3678
-0x56E6 = 0x3679
-0x56E7 = 0x367A
-0x56E8 = 0x367B
-0x56EB = 0x367D
-0x56ED = 0x367E
-0x56F1 = 0x367C
-0x56F6 = 0x3721
-0x56F7 = 0x3722
-0x5701 = 0x3723
-0x5702 = 0x3724
-0x5707 = 0x3725
-0x570A = 0x3726
-0x570C = 0x3727
-0x5711 = 0x3728
-0x5715 = 0x3729
-0x571A = 0x372A
-0x571B = 0x372B
-0x571D = 0x372C
-0x5720 = 0x372D
-0x5722 = 0x372E
-0x5723 = 0x372F
-0x5724 = 0x3730
-0x5725 = 0x3731
-0x5729 = 0x3732
-0x572A = 0x3733
-0x572C = 0x3734
-0x572E = 0x3735
-0x572F = 0x3736
-0x5733 = 0x3737
-0x5734 = 0x3738
-0x573D = 0x3739
-0x573E = 0x373A
-0x573F = 0x373B
-0x5745 = 0x373C
-0x5746 = 0x373D
-0x574C = 0x373E
-0x574D = 0x373F
-0x5752 = 0x3740
-0x5762 = 0x3741
-0x5765 = 0x3742
-0x5767 = 0x3743
-0x5768 = 0x3744
-0x576B = 0x3745
-0x576D = 0x3746
-0x576E = 0x3747
-0x576F = 0x3748
-0x5770 = 0x3749
-0x5771 = 0x374A
-0x5773 = 0x374B
-0x5774 = 0x374C
-0x5775 = 0x374D
-0x5777 = 0x374E
-0x5779 = 0x374F
-0x577A = 0x3750
-0x577B = 0x3751
-0x577C = 0x3752
-0x577E = 0x3753
-0x5781 = 0x3754
-0x5783 = 0x3755
-0x578C = 0x3756
-0x5794 = 0x3757
-0x5795 = 0x3760
-0x5797 = 0x3758
-0x5799 = 0x3759
-0x579A = 0x375A
-0x579C = 0x375B
-0x579D = 0x375C
-0x579E = 0x375D
-0x579F = 0x375E
-0x57A1 = 0x375F
-0x57A7 = 0x3761
-0x57A8 = 0x3762
-0x57A9 = 0x3763
-0x57AC = 0x3764
-0x57B8 = 0x3765
-0x57BD = 0x3766
-0x57C7 = 0x3767
-0x57C8 = 0x3768
-0x57CC = 0x3769
-0x57CF = 0x376A
-0x57D5 = 0x376B
-0x57DD = 0x376C
-0x57DE = 0x376D
-0x57E1 = 0x377E
-0x57E4 = 0x376E
-0x57E6 = 0x376F
-0x57E7 = 0x3770
-0x57E9 = 0x3771
-0x57ED = 0x3772
-0x57F0 = 0x3773
-0x57F5 = 0x3774
-0x57F6 = 0x3775
-0x57F8 = 0x3776
-0x57FD = 0x3777
-0x57FE = 0x3778
-0x57FF = 0x3779
-0x5803 = 0x377A
-0x5804 = 0x377B
-0x5808 = 0x377C
-0x5809 = 0x377D
-0x580C = 0x3821
-0x580D = 0x3822
-0x581B = 0x3823
-0x581E = 0x3824
-0x581F = 0x3825
-0x5820 = 0x3826
-0x5826 = 0x3827
-0x5827 = 0x3828
-0x582D = 0x3829
-0x5832 = 0x382A
-0x5839 = 0x382B
-0x583F = 0x382C
-0x5849 = 0x382D
-0x584C = 0x382E
-0x584D = 0x382F
-0x584F = 0x3830
-0x5850 = 0x3831
-0x5855 = 0x3832
-0x585F = 0x3833
-0x5861 = 0x3834
-0x5864 = 0x3835
-0x5867 = 0x3836
-0x5868 = 0x3837
-0x5878 = 0x3838
-0x587C = 0x3839
-0x587F = 0x383A
-0x5880 = 0x383B
-0x5881 = 0x383C
-0x5887 = 0x383D
-0x5888 = 0x383E
-0x5889 = 0x383F
-0x588A = 0x3840
-0x588C = 0x3841
-0x588D = 0x3842
-0x588F = 0x3843
-0x5890 = 0x3844
-0x5894 = 0x3845
-0x5896 = 0x3846
-0x589D = 0x3847
-0x58A0 = 0x3848
-0x58A1 = 0x3849
-0x58A2 = 0x384A
-0x58A6 = 0x384B
-0x58A9 = 0x384C
-0x58B1 = 0x384D
-0x58B2 = 0x384E
-0x58BC = 0x3850
-0x58C2 = 0x3851
-0x58C4 = 0x384F
-0x58C8 = 0x3852
-0x58CD = 0x3853
-0x58CE = 0x3854
-0x58D0 = 0x3855
-0x58D2 = 0x3856
-0x58D4 = 0x3857
-0x58D6 = 0x3858
-0x58DA = 0x3859
-0x58DD = 0x385A
-0x58E1 = 0x385B
-0x58E2 = 0x385C
-0x58E9 = 0x385D
-0x58F3 = 0x385E
-0x5905 = 0x385F
-0x5906 = 0x3860
-0x590B = 0x3861
-0x590C = 0x3862
-0x5912 = 0x3863
-0x5913 = 0x3864
-0x5914 = 0x3865
-0x591D = 0x3867
-0x5921 = 0x3868
-0x5923 = 0x3869
-0x5924 = 0x386A
-0x5928 = 0x386B
-0x592F = 0x386C
-0x5930 = 0x386D
-0x5933 = 0x386E
-0x5935 = 0x386F
-0x5936 = 0x3870
-0x593F = 0x3871
-0x5943 = 0x3872
-0x5946 = 0x3873
-0x5952 = 0x3874
-0x5953 = 0x3875
-0x5959 = 0x3876
-0x595B = 0x3877
-0x595D = 0x3878
-0x595E = 0x3879
-0x595F = 0x387A
-0x5961 = 0x387B
-0x5963 = 0x387C
-0x596B = 0x387D
-0x596D = 0x387E
-0x596F = 0x3921
-0x5972 = 0x3922
-0x5975 = 0x3923
-0x5976 = 0x3924
-0x5979 = 0x3925
-0x597B = 0x3926
-0x597C = 0x3927
-0x598B = 0x3928
-0x598C = 0x3929
-0x598E = 0x392A
-0x5992 = 0x392B
-0x5995 = 0x392C
-0x5997 = 0x392D
-0x599F = 0x392E
-0x59A4 = 0x392F
-0x59A7 = 0x3930
-0x59AD = 0x3931
-0x59AE = 0x3932
-0x59AF = 0x3933
-0x59B0 = 0x3934
-0x59B3 = 0x3935
-0x59B7 = 0x3936
-0x59BA = 0x3937
-0x59BC = 0x3938
-0x59C1 = 0x3939
-0x59C3 = 0x393A
-0x59C4 = 0x393B
-0x59C8 = 0x393C
-0x59CA = 0x393D
-0x59CD = 0x393E
-0x59D2 = 0x393F
-0x59DD = 0x3940
-0x59DE = 0x3941
-0x59DF = 0x3942
-0x59E3 = 0x3943
-0x59E4 = 0x3944
-0x59E7 = 0x3945
-0x59EE = 0x3946
-0x59EF = 0x3947
-0x59F1 = 0x3948
-0x59F2 = 0x3949
-0x59F4 = 0x394A
-0x59F7 = 0x394B
-0x5A00 = 0x394C
-0x5A04 = 0x394D
-0x5A0C = 0x394E
-0x5A0D = 0x394F
-0x5A0E = 0x3950
-0x5A12 = 0x3951
-0x5A13 = 0x3952
-0x5A1E = 0x3953
-0x5A23 = 0x3954
-0x5A24 = 0x3955
-0x5A27 = 0x3956
-0x5A28 = 0x3957
-0x5A2A = 0x3958
-0x5A2D = 0x3959
-0x5A30 = 0x395A
-0x5A44 = 0x395B
-0x5A45 = 0x395C
-0x5A47 = 0x395D
-0x5A48 = 0x395E
-0x5A4C = 0x395F
-0x5A50 = 0x3960
-0x5A55 = 0x3961
-0x5A5E = 0x3962
-0x5A63 = 0x3963
-0x5A65 = 0x3964
-0x5A67 = 0x3965
-0x5A6D = 0x3966
-0x5A77 = 0x3967
-0x5A7A = 0x3968
-0x5A7B = 0x3969
-0x5A7E = 0x396A
-0x5A8B = 0x396B
-0x5A90 = 0x396C
-0x5A93 = 0x396D
-0x5A96 = 0x396E
-0x5A99 = 0x396F
-0x5A9C = 0x3970
-0x5A9E = 0x3971
-0x5A9F = 0x3972
-0x5AA0 = 0x3973
-0x5AA2 = 0x3974
-0x5AA7 = 0x3975
-0x5AAC = 0x3976
-0x5AB1 = 0x3977
-0x5AB2 = 0x3978
-0x5AB3 = 0x3979
-0x5AB5 = 0x397A
-0x5AB8 = 0x397B
-0x5ABA = 0x397C
-0x5ABB = 0x397D
-0x5ABF = 0x397E
-0x5AC4 = 0x3A21
-0x5AC6 = 0x3A22
-0x5AC8 = 0x3A23
-0x5ACF = 0x3A24
-0x5ADA = 0x3A25
-0x5ADC = 0x3A26
-0x5AE0 = 0x3A27
-0x5AE5 = 0x3A28
-0x5AEA = 0x3A29
-0x5AEE = 0x3A2A
-0x5AF5 = 0x3A2B
-0x5AF6 = 0x3A2C
-0x5AFD = 0x3A2D
-0x5B00 = 0x3A2E
-0x5B01 = 0x3A2F
-0x5B08 = 0x3A30
-0x5B17 = 0x3A31
-0x5B19 = 0x3A33
-0x5B1B = 0x3A34
-0x5B1D = 0x3A35
-0x5B21 = 0x3A36
-0x5B25 = 0x3A37
-0x5B2D = 0x3A38
-0x5B34 = 0x3A32
-0x5B38 = 0x3A39
-0x5B41 = 0x3A3A
-0x5B4B = 0x3A3B
-0x5B4C = 0x3A3C
-0x5B52 = 0x3A3D
-0x5B56 = 0x3A3E
-0x5B5E = 0x3A3F
-0x5B68 = 0x3A40
-0x5B6E = 0x3A41
-0x5B6F = 0x3A42
-0x5B7C = 0x3A43
-0x5B7D = 0x3A44
-0x5B7E = 0x3A45
-0x5B7F = 0x3A46
-0x5B81 = 0x3A47
-0x5B84 = 0x3A48
-0x5B86 = 0x3A49
-0x5B8A = 0x3A4A
-0x5B8E = 0x3A4B
-0x5B90 = 0x3A4C
-0x5B91 = 0x3A4D
-0x5B93 = 0x3A4E
-0x5B94 = 0x3A4F
-0x5B96 = 0x3A50
-0x5BA8 = 0x3A51
-0x5BA9 = 0x3A52
-0x5BAC = 0x3A53
-0x5BAD = 0x3A54
-0x5BAF = 0x3A55
-0x5BB1 = 0x3A56
-0x5BB2 = 0x3A57
-0x5BB7 = 0x3A58
-0x5BBA = 0x3A59
-0x5BBC = 0x3A5A
-0x5BC0 = 0x3A5B
-0x5BC1 = 0x3A5C
-0x5BCD = 0x3A5D
-0x5BCF = 0x3A5E
-0x5BD6 = 0x3A5F
-0x5BD7 = 0x3A60
-0x5BD8 = 0x3A61
-0x5BD9 = 0x3A62
-0x5BDA = 0x3A63
-0x5BE0 = 0x3A64
-0x5BEF = 0x3A65
-0x5BF1 = 0x3A66
-0x5BF4 = 0x3A67
-0x5BFD = 0x3A68
-0x5C0C = 0x3A69
-0x5C17 = 0x3A6A
-0x5C1E = 0x3A6B
-0x5C1F = 0x3A6C
-0x5C23 = 0x3A6D
-0x5C26 = 0x3A6E
-0x5C29 = 0x3A6F
-0x5C2B = 0x3A70
-0x5C2C = 0x3A71
-0x5C2E = 0x3A72
-0x5C30 = 0x3A73
-0x5C32 = 0x3A74
-0x5C35 = 0x3A75
-0x5C36 = 0x3A76
-0x5C59 = 0x3A77
-0x5C5A = 0x3A78
-0x5C5C = 0x3A79
-0x5C62 = 0x3A7A
-0x5C63 = 0x3A7B
-0x5C67 = 0x3A7C
-0x5C68 = 0x3A7D
-0x5C69 = 0x3A7E
-0x5C6D = 0x3B21
-0x5C70 = 0x3B22
-0x5C74 = 0x3B23
-0x5C75 = 0x3B24
-0x5C7A = 0x3B25
-0x5C7B = 0x3B26
-0x5C7C = 0x3B27
-0x5C7D = 0x3B28
-0x5C87 = 0x3B29
-0x5C88 = 0x3B2A
-0x5C8A = 0x3B2B
-0x5C8F = 0x3B2C
-0x5C92 = 0x3B2D
-0x5C9D = 0x3B2E
-0x5C9F = 0x3B2F
-0x5CA0 = 0x3B30
-0x5CA2 = 0x3B31
-0x5CA3 = 0x3B32
-0x5CA6 = 0x3B33
-0x5CAA = 0x3B34
-0x5CB2 = 0x3B35
-0x5CB4 = 0x3B36
-0x5CB5 = 0x3B37
-0x5CBA = 0x3B38
-0x5CC9 = 0x3B39
-0x5CCB = 0x3B3A
-0x5CD2 = 0x3B3B
-0x5CD7 = 0x3B3D
-0x5CDD = 0x3B3C
-0x5CEE = 0x3B3E
-0x5CF1 = 0x3B3F
-0x5CF2 = 0x3B40
-0x5CF4 = 0x3B41
-0x5D01 = 0x3B42
-0x5D06 = 0x3B43
-0x5D0D = 0x3B44
-0x5D12 = 0x3B45
-0x5D23 = 0x3B47
-0x5D24 = 0x3B48
-0x5D26 = 0x3B49
-0x5D27 = 0x3B4A
-0x5D2B = 0x3B46
-0x5D31 = 0x3B4B
-0x5D34 = 0x3B4C
-0x5D39 = 0x3B4D
-0x5D3D = 0x3B4E
-0x5D3F = 0x3B4F
-0x5D42 = 0x3B50
-0x5D43 = 0x3B51
-0x5D46 = 0x3B52
-0x5D48 = 0x3B53
-0x5D4A = 0x3B57
-0x5D51 = 0x3B55
-0x5D55 = 0x3B54
-0x5D59 = 0x3B56
-0x5D5F = 0x3B58
-0x5D60 = 0x3B59
-0x5D61 = 0x3B5A
-0x5D62 = 0x3B5B
-0x5D64 = 0x3B5C
-0x5D6A = 0x3B5D
-0x5D6D = 0x3B5E
-0x5D70 = 0x3B5F
-0x5D79 = 0x3B60
-0x5D7A = 0x3B61
-0x5D7E = 0x3B62
-0x5D7F = 0x3B63
-0x5D81 = 0x3B64
-0x5D83 = 0x3B65
-0x5D88 = 0x3B66
-0x5D8A = 0x3B67
-0x5D92 = 0x3B68
-0x5D93 = 0x3B69
-0x5D94 = 0x3B6A
-0x5D95 = 0x3B6B
-0x5D99 = 0x3B6C
-0x5D9B = 0x3B6D
-0x5D9F = 0x3B6E
-0x5DA0 = 0x3B6F
-0x5DA7 = 0x3B70
-0x5DAB = 0x3B71
-0x5DB0 = 0x3B72
-0x5DB2 = 0x6674
-0x5DB4 = 0x3B73
-0x5DB8 = 0x3B74
-0x5DB9 = 0x3B75
-0x5DC3 = 0x3B76
-0x5DC7 = 0x3B77
-0x5DCB = 0x3B78
-0x5DCE = 0x3B7A
-0x5DD0 = 0x3B79
-0x5DD8 = 0x3B7B
-0x5DD9 = 0x3B7C
-0x5DE0 = 0x3B7D
-0x5DE4 = 0x3B7E
-0x5DE9 = 0x3C21
-0x5DF8 = 0x3C22
-0x5DF9 = 0x3C23
-0x5E00 = 0x3C24
-0x5E07 = 0x3C25
-0x5E0D = 0x3C26
-0x5E12 = 0x3C27
-0x5E14 = 0x3C28
-0x5E15 = 0x3C29
-0x5E18 = 0x3C2A
-0x5E1F = 0x3C2B
-0x5E20 = 0x3C2C
-0x5E28 = 0x3C2E
-0x5E2E = 0x3C2D
-0x5E32 = 0x3C2F
-0x5E35 = 0x3C30
-0x5E3E = 0x3C31
-0x5E49 = 0x3C34
-0x5E4B = 0x3C32
-0x5E50 = 0x3C33
-0x5E51 = 0x3C35
-0x5E56 = 0x3C36
-0x5E58 = 0x3C37
-0x5E5B = 0x3C38
-0x5E5C = 0x3C39
-0x5E5E = 0x3C3A
-0x5E68 = 0x3C3B
-0x5E6A = 0x3C3C
-0x5E6B = 0x3C3D
-0x5E6C = 0x3C3E
-0x5E6D = 0x3C3F
-0x5E6E = 0x3C40
-0x5E70 = 0x3C41
-0x5E80 = 0x3C42
-0x5E8B = 0x3C43
-0x5E8E = 0x3C44
-0x5EA2 = 0x3C45
-0x5EA4 = 0x3C46
-0x5EA5 = 0x3C47
-0x5EA8 = 0x3C48
-0x5EAA = 0x3C49
-0x5EAC = 0x3C4A
-0x5EB1 = 0x3C4B
-0x5EB3 = 0x3C4C
-0x5EBD = 0x3C4D
-0x5EBE = 0x3C4E
-0x5EBF = 0x3C4F
-0x5EC6 = 0x3C50
-0x5ECB = 0x3C52
-0x5ECC = 0x3C51
-0x5ECE = 0x3C53
-0x5ED1 = 0x3C54
-0x5ED2 = 0x3C55
-0x5ED4 = 0x3C56
-0x5ED5 = 0x3C57
-0x5EDC = 0x3C58
-0x5EDE = 0x3C59
-0x5EE5 = 0x3C5A
-0x5EEB = 0x3C5B
-0x5F02 = 0x3C5C
-0x5F06 = 0x3C5D
-0x5F07 = 0x3C5E
-0x5F08 = 0x3C5F
-0x5F0E = 0x3C60
-0x5F19 = 0x3C61
-0x5F1C = 0x3C62
-0x5F1D = 0x3C63
-0x5F21 = 0x3C64
-0x5F22 = 0x3C65
-0x5F23 = 0x3C66
-0x5F24 = 0x3C67
-0x5F28 = 0x3C68
-0x5F2B = 0x3C69
-0x5F2C = 0x3C6A
-0x5F2E = 0x3C6B
-0x5F30 = 0x3C6C
-0x5F34 = 0x3C6D
-0x5F36 = 0x3C6E
-0x5F3B = 0x3C6F
-0x5F3D = 0x3C70
-0x5F3F = 0x3C71
-0x5F40 = 0x3C72
-0x5F44 = 0x3C73
-0x5F45 = 0x3C74
-0x5F47 = 0x3C75
-0x5F4D = 0x3C76
-0x5F50 = 0x3C77
-0x5F54 = 0x3C78
-0x5F58 = 0x3C79
-0x5F5B = 0x3C7A
-0x5F60 = 0x3C7B
-0x5F63 = 0x3C7C
-0x5F64 = 0x3C7D
-0x5F67 = 0x3C7E
-0x5F6F = 0x3D21
-0x5F72 = 0x3D22
-0x5F74 = 0x3D23
-0x5F75 = 0x3D24
-0x5F78 = 0x3D25
-0x5F7A = 0x3D26
-0x5F7D = 0x3D27
-0x5F7E = 0x3D28
-0x5F89 = 0x3D29
-0x5F8D = 0x3D2A
-0x5F8F = 0x3D2B
-0x5F96 = 0x3D2C
-0x5F9C = 0x3D2D
-0x5F9D = 0x3D2E
-0x5FA2 = 0x3D2F
-0x5FA4 = 0x3D32
-0x5FA7 = 0x3D30
-0x5FAB = 0x3D31
-0x5FAC = 0x3D33
-0x5FAF = 0x3D34
-0x5FB0 = 0x3D35
-0x5FB1 = 0x3D36
-0x5FB8 = 0x3D37
-0x5FC4 = 0x3D38
-0x5FC7 = 0x3D39
-0x5FC8 = 0x3D3A
-0x5FC9 = 0x3D3B
-0x5FCB = 0x3D3C
-0x5FD0 = 0x3D3D
-0x5FD1 = 0x3D3E
-0x5FD2 = 0x3D3F
-0x5FD3 = 0x3D40
-0x5FD4 = 0x3D41
-0x5FDE = 0x3D42
-0x5FE1 = 0x3D43
-0x5FE2 = 0x3D44
-0x5FE8 = 0x3D45
-0x5FE9 = 0x3D46
-0x5FEA = 0x3D47
-0x5FEC = 0x3D48
-0x5FED = 0x3D49
-0x5FEE = 0x3D4A
-0x5FEF = 0x3D4B
-0x5FF2 = 0x3D4C
-0x5FF3 = 0x3D4D
-0x5FF6 = 0x3D4E
-0x5FFA = 0x3D4F
-0x5FFC = 0x3D50
-0x6007 = 0x3D51
-0x600A = 0x3D52
-0x600D = 0x3D53
-0x6013 = 0x3D54
-0x6014 = 0x3D55
-0x6017 = 0x3D56
-0x6018 = 0x3D57
-0x601A = 0x3D58
-0x601F = 0x3D59
-0x6024 = 0x3D5A
-0x602D = 0x3D5B
-0x6033 = 0x3D5C
-0x6035 = 0x3D5D
-0x6040 = 0x3D5E
-0x6047 = 0x3D5F
-0x6048 = 0x3D60
-0x6049 = 0x3D61
-0x604C = 0x3D62
-0x6051 = 0x3D63
-0x6054 = 0x3D64
-0x6056 = 0x3D65
-0x6057 = 0x3D66
-0x605D = 0x3D67
-0x6061 = 0x3D68
-0x6067 = 0x3D69
-0x6071 = 0x3D6A
-0x607E = 0x3D6B
-0x607F = 0x3D6C
-0x6082 = 0x3D6D
-0x6086 = 0x3D6E
-0x6088 = 0x3D6F
-0x608A = 0x3D70
-0x608E = 0x3D71
-0x6091 = 0x3D72
-0x6093 = 0x3D73
-0x6095 = 0x3D74
-0x6098 = 0x3D75
-0x609D = 0x3D76
-0x609E = 0x3D77
-0x60A2 = 0x3D78
-0x60A4 = 0x3D79
-0x60A5 = 0x3D7A
-0x60A8 = 0x3D7B
-0x60B0 = 0x3D7C
-0x60B1 = 0x3D7D
-0x60B7 = 0x3D7E
-0x60BB = 0x3E21
-0x60BE = 0x3E22
-0x60C2 = 0x3E23
-0x60C4 = 0x3E24
-0x60C8 = 0x3E25
-0x60C9 = 0x3E26
-0x60CA = 0x3E27
-0x60CB = 0x3E28
-0x60CE = 0x3E29
-0x60CF = 0x3E2A
-0x60D4 = 0x3E2B
-0x60D5 = 0x3E2C
-0x60D9 = 0x3E2D
-0x60DB = 0x3E2E
-0x60DD = 0x3E2F
-0x60DE = 0x3E30
-0x60E2 = 0x3E31
-0x60E5 = 0x3E32
-0x60F2 = 0x3E33
-0x60F5 = 0x3E34
-0x60F8 = 0x3E35
-0x60FC = 0x3E36
-0x60FD = 0x3E37
-0x6102 = 0x3E38
-0x6107 = 0x3E39
-0x610A = 0x3E3A
-0x610C = 0x3E3B
-0x6110 = 0x3E3C
-0x6111 = 0x3E3D
-0x6112 = 0x3E3E
-0x6113 = 0x3E3F
-0x6114 = 0x3E40
-0x6116 = 0x3E41
-0x6117 = 0x3E42
-0x6119 = 0x3E43
-0x611C = 0x3E44
-0x611E = 0x3E45
-0x6122 = 0x3E46
-0x612A = 0x3E47
-0x612B = 0x3E48
-0x6130 = 0x3E49
-0x6131 = 0x3E4A
-0x6135 = 0x3E4B
-0x6136 = 0x3E4C
-0x6137 = 0x3E4D
-0x6139 = 0x3E4E
-0x6141 = 0x3E4F
-0x6145 = 0x3E50
-0x6146 = 0x3E51
-0x6149 = 0x3E52
-0x615E = 0x3E53
-0x6160 = 0x3E54
-0x616C = 0x3E55
-0x6172 = 0x3E56
-0x6178 = 0x3E57
-0x617B = 0x3E58
-0x617C = 0x3E59
-0x617F = 0x3E5A
-0x6180 = 0x3E5B
-0x6181 = 0x3E5C
-0x6183 = 0x3E5D
-0x6184 = 0x3E5E
-0x618B = 0x3E5F
-0x618D = 0x3E60
-0x6192 = 0x3E61
-0x6193 = 0x3E62
-0x6197 = 0x3E63
-0x6198 = 0x3E64
-0x619C = 0x3E65
-0x619D = 0x3E66
-0x619F = 0x3E67
-0x61A0 = 0x3E68
-0x61A5 = 0x3E69
-0x61A8 = 0x3E6A
-0x61AA = 0x3E6B
-0x61AD = 0x3E6C
-0x61B8 = 0x3E6D
-0x61B9 = 0x3E6E
-0x61BC = 0x3E6F
-0x61C0 = 0x3E70
-0x61C1 = 0x3E71
-0x61C2 = 0x3E72
-0x61CE = 0x3E73
-0x61CF = 0x3E74
-0x61D5 = 0x3E75
-0x61DC = 0x3E76
-0x61DD = 0x3E77
-0x61DE = 0x3E78
-0x61DF = 0x3E79
-0x61E1 = 0x3E7A
-0x61E2 = 0x3E7B
-0x61E5 = 0x3E7E
-0x61E7 = 0x3E7C
-0x61E9 = 0x3E7D
-0x61EC = 0x3F21
-0x61ED = 0x3F22
-0x61EF = 0x3F23
-0x6201 = 0x3F24
-0x6203 = 0x3F25
-0x6204 = 0x3F26
-0x6207 = 0x3F27
-0x6213 = 0x3F28
-0x6215 = 0x3F29
-0x621C = 0x3F2A
-0x6220 = 0x3F2B
-0x6222 = 0x3F2C
-0x6223 = 0x3F2D
-0x6227 = 0x3F2E
-0x6229 = 0x3F2F
-0x622B = 0x3F30
-0x6239 = 0x3F31
-0x623D = 0x3F32
-0x6242 = 0x3F33
-0x6243 = 0x3F34
-0x6244 = 0x3F35
-0x6246 = 0x3F36
-0x624C = 0x3F37
-0x6250 = 0x3F38
-0x6251 = 0x3F39
-0x6252 = 0x3F3A
-0x6254 = 0x3F3B
-0x6256 = 0x3F3C
-0x625A = 0x3F3D
-0x625C = 0x3F3E
-0x6264 = 0x3F3F
-0x626D = 0x3F40
-0x626F = 0x3F41
-0x6273 = 0x3F42
-0x627A = 0x3F43
-0x627D = 0x3F44
-0x628D = 0x3F45
-0x628E = 0x3F46
-0x628F = 0x3F47
-0x6290 = 0x3F48
-0x62A6 = 0x3F49
-0x62A8 = 0x3F4A
-0x62B3 = 0x3F4B
-0x62B6 = 0x3F4C
-0x62B7 = 0x3F4D
-0x62BA = 0x3F4E
-0x62BE = 0x3F4F
-0x62BF = 0x3F50
-0x62C4 = 0x3F51
-0x62CE = 0x3F52
-0x62D5 = 0x3F53
-0x62D6 = 0x3F54
-0x62DA = 0x3F55
-0x62EA = 0x3F56
-0x62F2 = 0x3F57
-0x62F4 = 0x3F58
-0x62FC = 0x3F59
-0x62FD = 0x3F5A
-0x6303 = 0x3F5B
-0x6304 = 0x3F5C
-0x630A = 0x3F5D
-0x630B = 0x3F5E
-0x630D = 0x3F5F
-0x6310 = 0x3F60
-0x6313 = 0x3F61
-0x6316 = 0x3F62
-0x6318 = 0x3F63
-0x6329 = 0x3F64
-0x632A = 0x3F65
-0x632D = 0x3F66
-0x6335 = 0x3F67
-0x6336 = 0x3F68
-0x6339 = 0x3F69
-0x633C = 0x3F6A
-0x6341 = 0x3F6B
-0x6342 = 0x3F6C
-0x6343 = 0x3F6D
-0x6344 = 0x3F6E
-0x6346 = 0x3F6F
-0x634A = 0x3F70
-0x634B = 0x3F71
-0x634E = 0x3F72
-0x6352 = 0x3F73
-0x6353 = 0x3F74
-0x6354 = 0x3F75
-0x6358 = 0x3F76
-0x635B = 0x3F77
-0x6365 = 0x3F78
-0x6366 = 0x3F79
-0x636C = 0x3F7A
-0x636D = 0x3F7B
-0x6371 = 0x3F7C
-0x6374 = 0x3F7D
-0x6375 = 0x3F7E
-0x6378 = 0x4021
-0x637C = 0x4022
-0x637D = 0x4023
-0x637F = 0x4024
-0x6382 = 0x4025
-0x6384 = 0x4026
-0x6387 = 0x4027
-0x638A = 0x4028
-0x6390 = 0x4029
-0x6394 = 0x402A
-0x6395 = 0x402B
-0x6399 = 0x402C
-0x639A = 0x402D
-0x639E = 0x402E
-0x63A4 = 0x402F
-0x63A6 = 0x4030
-0x63AD = 0x4031
-0x63AE = 0x4032
-0x63AF = 0x4033
-0x63BD = 0x4034
-0x63C1 = 0x4035
-0x63C5 = 0x4036
-0x63C8 = 0x4037
-0x63CE = 0x4038
-0x63D1 = 0x4039
-0x63D3 = 0x403A
-0x63D4 = 0x403B
-0x63D5 = 0x403C
-0x63DC = 0x403D
-0x63E0 = 0x403E
-0x63E5 = 0x403F
-0x63EA = 0x4040
-0x63EC = 0x4041
-0x63F2 = 0x4042
-0x63F3 = 0x4043
-0x63F5 = 0x4044
-0x63F8 = 0x4045
-0x63F9 = 0x4046
-0x6409 = 0x4047
-0x640A = 0x4048
-0x6410 = 0x4049
-0x6412 = 0x404A
-0x6414 = 0x404B
-0x6418 = 0x404C
-0x641E = 0x404D
-0x6420 = 0x404E
-0x6422 = 0x404F
-0x6424 = 0x4050
-0x6425 = 0x4051
-0x6429 = 0x4052
-0x642A = 0x4053
-0x642F = 0x4054
-0x6430 = 0x4055
-0x6435 = 0x4056
-0x643D = 0x4057
-0x643F = 0x4058
-0x644B = 0x4059
-0x644F = 0x405A
-0x6451 = 0x405B
-0x6452 = 0x405C
-0x6453 = 0x405D
-0x6454 = 0x405E
-0x645A = 0x405F
-0x645B = 0x4060
-0x645C = 0x4061
-0x645D = 0x4062
-0x645F = 0x4063
-0x6460 = 0x4064
-0x6461 = 0x4065
-0x6463 = 0x4066
-0x646D = 0x4067
-0x6473 = 0x4068
-0x6474 = 0x4069
-0x647B = 0x406A
-0x647D = 0x406B
-0x6485 = 0x406C
-0x6487 = 0x406D
-0x648F = 0x406E
-0x6490 = 0x406F
-0x6491 = 0x4070
-0x6498 = 0x4071
-0x6499 = 0x4072
-0x649B = 0x4073
-0x649D = 0x4074
-0x649F = 0x4075
-0x64A1 = 0x4076
-0x64A3 = 0x4077
-0x64A6 = 0x4078
-0x64A8 = 0x4079
-0x64AC = 0x407A
-0x64B3 = 0x407B
-0x64BD = 0x407C
-0x64BE = 0x407D
-0x64BF = 0x407E
-0x64C4 = 0x4121
-0x64C9 = 0x4122
-0x64CA = 0x4123
-0x64CB = 0x4124
-0x64CC = 0x4125
-0x64CE = 0x4126
-0x64D0 = 0x4127
-0x64D1 = 0x4128
-0x64D5 = 0x4129
-0x64D7 = 0x412A
-0x64E4 = 0x412B
-0x64E5 = 0x412C
-0x64E9 = 0x412D
-0x64EA = 0x412E
-0x64ED = 0x412F
-0x64F0 = 0x4130
-0x64F5 = 0x4131
-0x64F7 = 0x4132
-0x64FB = 0x4133
-0x64FF = 0x4134
-0x6501 = 0x4135
-0x6504 = 0x4136
-0x6508 = 0x4137
-0x6509 = 0x4138
-0x650A = 0x4139
-0x650F = 0x413A
-0x6513 = 0x413B
-0x6514 = 0x413C
-0x6516 = 0x413D
-0x6519 = 0x413E
-0x651B = 0x413F
-0x651E = 0x4140
-0x651F = 0x4141
-0x6522 = 0x4142
-0x6526 = 0x4143
-0x6529 = 0x4144
-0x652E = 0x4145
-0x6531 = 0x4146
-0x653A = 0x4147
-0x653C = 0x4148
-0x653D = 0x4149
-0x6543 = 0x414A
-0x6547 = 0x414B
-0x6549 = 0x414C
-0x6550 = 0x414D
-0x6552 = 0x414E
-0x6554 = 0x414F
-0x655F = 0x4150
-0x6560 = 0x4151
-0x6567 = 0x4152
-0x656B = 0x4153
-0x657A = 0x4154
-0x657D = 0x4155
-0x6581 = 0x4156
-0x6585 = 0x4157
-0x658A = 0x4158
-0x6592 = 0x4159
-0x6595 = 0x415A
-0x6598 = 0x415B
-0x659D = 0x415C
-0x65A0 = 0x415D
-0x65A3 = 0x415E
-0x65A6 = 0x415F
-0x65AE = 0x4160
-0x65B2 = 0x4161
-0x65B3 = 0x4162
-0x65B4 = 0x4163
-0x65BF = 0x4164
-0x65C2 = 0x4165
-0x65C8 = 0x4166
-0x65C9 = 0x4167
-0x65CE = 0x4168
-0x65D0 = 0x4169
-0x65D4 = 0x416A
-0x65D6 = 0x416B
-0x65D8 = 0x416C
-0x65DF = 0x416D
-0x65F0 = 0x416E
-0x65F2 = 0x416F
-0x65F4 = 0x4170
-0x65F5 = 0x4171
-0x65F9 = 0x4172
-0x65FE = 0x4173
-0x65FF = 0x4174
-0x6600 = 0x4175
-0x6604 = 0x4176
-0x6608 = 0x4177
-0x6609 = 0x4178
-0x660D = 0x4179
-0x6611 = 0x417A
-0x6612 = 0x417B
-0x6615 = 0x417C
-0x6616 = 0x417D
-0x661D = 0x417E
-0x661E = 0x4221
-0x6621 = 0x4222
-0x6622 = 0x4223
-0x6623 = 0x4224
-0x6624 = 0x4225
-0x6626 = 0x4226
-0x6629 = 0x4227
-0x662A = 0x4228
-0x662B = 0x4229
-0x662C = 0x422A
-0x662E = 0x422B
-0x6630 = 0x422C
-0x6631 = 0x422D
-0x6633 = 0x422E
-0x6637 = 0x4230
-0x6639 = 0x422F
-0x6640 = 0x4231
-0x6645 = 0x4232
-0x6646 = 0x4233
-0x664A = 0x4234
-0x664C = 0x4235
-0x664E = 0x4237
-0x6651 = 0x4236
-0x6657 = 0x4238
-0x6658 = 0x4239
-0x6659 = 0x423A
-0x665B = 0x423B
-0x665C = 0x423C
-0x6660 = 0x423D
-0x6661 = 0x423E
-0x666A = 0x4240
-0x666B = 0x4241
-0x666C = 0x4242
-0x6673 = 0x4244
-0x6675 = 0x4245
-0x6677 = 0x4247
-0x6678 = 0x4248
-0x6679 = 0x4249
-0x667B = 0x424A
-0x667C = 0x424C
-0x667E = 0x4243
-0x667F = 0x4246
-0x6680 = 0x424B
-0x668B = 0x424D
-0x668C = 0x424E
-0x668D = 0x424F
-0x6690 = 0x4250
-0x6692 = 0x4251
-0x6699 = 0x4252
-0x669A = 0x4253
-0x669B = 0x4254
-0x669C = 0x4255
-0x669F = 0x4256
-0x66A0 = 0x4257
-0x66A4 = 0x4258
-0x66AD = 0x4259
-0x66B1 = 0x425A
-0x66B2 = 0x425B
-0x66B5 = 0x425C
-0x66BB = 0x425D
-0x66BF = 0x425E
-0x66C0 = 0x425F
-0x66C2 = 0x4260
-0x66C3 = 0x4261
-0x66C8 = 0x4262
-0x66CC = 0x4263
-0x66CE = 0x4264
-0x66CF = 0x4265
-0x66D4 = 0x4266
-0x66DB = 0x4267
-0x66DF = 0x4268
-0x66E8 = 0x4269
-0x66EB = 0x426A
-0x66EC = 0x426B
-0x66EE = 0x426C
-0x66FA = 0x426D
-0x66FB = 0x423F
-0x6705 = 0x426E
-0x6707 = 0x426F
-0x670E = 0x4270
-0x6713 = 0x4271
-0x6719 = 0x4272
-0x671C = 0x4273
-0x6720 = 0x4274
-0x6722 = 0x4275
-0x6733 = 0x4276
-0x673E = 0x4277
-0x6745 = 0x4278
-0x6747 = 0x4279
-0x6748 = 0x427A
-0x674C = 0x427B
-0x6754 = 0x427C
-0x6755 = 0x427D
-0x675D = 0x427E
-0x6766 = 0x4321
-0x676C = 0x4322
-0x676E = 0x4323
-0x6774 = 0x4324
-0x6776 = 0x4325
-0x677B = 0x4326
-0x6781 = 0x4327
-0x6784 = 0x4328
-0x678E = 0x4329
-0x678F = 0x432A
-0x6791 = 0x432B
-0x6793 = 0x432C
-0x6796 = 0x432D
-0x6798 = 0x432E
-0x6799 = 0x432F
-0x679B = 0x4330
-0x67B0 = 0x4331
-0x67B1 = 0x4332
-0x67B2 = 0x4333
-0x67B5 = 0x4334
-0x67BB = 0x4335
-0x67BC = 0x4336
-0x67BD = 0x4337
-0x67C0 = 0x4339
-0x67C2 = 0x433A
-0x67C3 = 0x433B
-0x67C5 = 0x433C
-0x67C8 = 0x433D
-0x67C9 = 0x433E
-0x67D2 = 0x433F
-0x67D7 = 0x4340
-0x67D9 = 0x4341
-0x67DC = 0x4342
-0x67E1 = 0x4343
-0x67E6 = 0x4344
-0x67F0 = 0x4345
-0x67F2 = 0x4346
-0x67F6 = 0x4347
-0x67F7 = 0x4348
-0x67F9 = 0x4338
-0x6814 = 0x434A
-0x6819 = 0x434B
-0x681D = 0x434C
-0x681F = 0x434D
-0x6827 = 0x434F
-0x6828 = 0x434E
-0x682C = 0x4350
-0x682D = 0x4351
-0x682F = 0x4352
-0x6830 = 0x4353
-0x6831 = 0x4354
-0x6833 = 0x4355
-0x683B = 0x4356
-0x683F = 0x4357
-0x6844 = 0x4358
-0x6845 = 0x4359
-0x684A = 0x435A
-0x684C = 0x435B
-0x6852 = 0x4349
-0x6855 = 0x435C
-0x6857 = 0x435D
-0x6858 = 0x435E
-0x685B = 0x435F
-0x686B = 0x4360
-0x686E = 0x4361
-0x686F = 0x4362
-0x6870 = 0x4363
-0x6871 = 0x4364
-0x6872 = 0x4365
-0x6875 = 0x4366
-0x6879 = 0x4367
-0x687A = 0x4368
-0x687B = 0x4369
-0x687C = 0x436A
-0x6882 = 0x436B
-0x6884 = 0x436C
-0x6886 = 0x436D
-0x6888 = 0x436E
-0x6896 = 0x436F
-0x6898 = 0x4370
-0x689A = 0x4371
-0x689C = 0x4372
-0x68A1 = 0x4373
-0x68A3 = 0x4374
-0x68A5 = 0x4375
-0x68A9 = 0x4376
-0x68AA = 0x4377
-0x68AE = 0x4378
-0x68B2 = 0x4379
-0x68BB = 0x437A
-0x68C5 = 0x437B
-0x68C8 = 0x437C
-0x68CC = 0x437D
-0x68CF = 0x437E
-0x68D0 = 0x4421
-0x68D1 = 0x4422
-0x68D3 = 0x4423
-0x68D6 = 0x4424
-0x68D9 = 0x4425
-0x68DC = 0x4426
-0x68DD = 0x4427
-0x68E5 = 0x4428
-0x68E8 = 0x4429
-0x68EA = 0x442A
-0x68EB = 0x442B
-0x68EC = 0x442C
-0x68ED = 0x442D
-0x68F0 = 0x442E
-0x68F1 = 0x442F
-0x68F5 = 0x4430
-0x68F6 = 0x4431
-0x68FB = 0x4432
-0x68FC = 0x4433
-0x68FD = 0x4434
-0x6906 = 0x4435
-0x6909 = 0x4436
-0x690A = 0x4437
-0x6910 = 0x4438
-0x6911 = 0x4439
-0x6913 = 0x443A
-0x6916 = 0x443B
-0x6917 = 0x443C
-0x6931 = 0x443D
-0x6933 = 0x443E
-0x6935 = 0x443F
-0x6938 = 0x4440
-0x693B = 0x4441
-0x6942 = 0x4442
-0x6945 = 0x4443
-0x6949 = 0x4444
-0x694E = 0x4445
-0x6957 = 0x4446
-0x695B = 0x4447
-0x6963 = 0x4448
-0x6964 = 0x4449
-0x6965 = 0x444A
-0x6966 = 0x444B
-0x6968 = 0x444C
-0x6969 = 0x444D
-0x696C = 0x444E
-0x6970 = 0x444F
-0x6971 = 0x4450
-0x6972 = 0x4451
-0x697A = 0x4452
-0x697B = 0x4453
-0x697F = 0x4454
-0x6980 = 0x4455
-0x698D = 0x4456
-0x6992 = 0x4457
-0x6996 = 0x4458
-0x6998 = 0x4459
-0x69A1 = 0x445A
-0x69A5 = 0x445B
-0x69A6 = 0x445C
-0x69A8 = 0x445D
-0x69AB = 0x445E
-0x69AD = 0x445F
-0x69AF = 0x4460
-0x69B7 = 0x4461
-0x69B8 = 0x4462
-0x69BA = 0x4463
-0x69BC = 0x4464
-0x69C5 = 0x4465
-0x69C8 = 0x4466
-0x69D1 = 0x4467
-0x69D6 = 0x4468
-0x69D7 = 0x4469
-0x69E2 = 0x446A
-0x69E5 = 0x446B
-0x69EE = 0x446C
-0x69EF = 0x446D
-0x69F1 = 0x446E
-0x69F3 = 0x446F
-0x69F5 = 0x4470
-0x69FE = 0x4471
-0x6A00 = 0x4472
-0x6A01 = 0x4473
-0x6A03 = 0x4474
-0x6A0F = 0x4475
-0x6A11 = 0x4476
-0x6A15 = 0x4477
-0x6A1A = 0x4478
-0x6A1D = 0x4479
-0x6A20 = 0x447A
-0x6A24 = 0x447B
-0x6A28 = 0x447C
-0x6A30 = 0x447D
-0x6A32 = 0x447E
-0x6A34 = 0x4521
-0x6A37 = 0x4522
-0x6A3B = 0x4523
-0x6A3E = 0x4524
-0x6A3F = 0x4525
-0x6A45 = 0x4526
-0x6A46 = 0x4527
-0x6A49 = 0x4528
-0x6A4A = 0x4529
-0x6A4E = 0x452A
-0x6A50 = 0x452B
-0x6A51 = 0x452C
-0x6A52 = 0x452D
-0x6A55 = 0x452E
-0x6A56 = 0x452F
-0x6A5B = 0x4530
-0x6A64 = 0x4531
-0x6A67 = 0x4532
-0x6A6A = 0x4533
-0x6A71 = 0x4534
-0x6A73 = 0x4535
-0x6A7E = 0x4536
-0x6A81 = 0x4537
-0x6A83 = 0x4538
-0x6A86 = 0x4539
-0x6A87 = 0x453A
-0x6A89 = 0x453B
-0x6A8B = 0x453C
-0x6A91 = 0x453D
-0x6A9B = 0x453E
-0x6A9D = 0x453F
-0x6A9E = 0x4540
-0x6A9F = 0x4541
-0x6AA5 = 0x4542
-0x6AAB = 0x4543
-0x6AAF = 0x4544
-0x6AB0 = 0x4545
-0x6AB1 = 0x4546
-0x6AB4 = 0x4547
-0x6ABD = 0x4548
-0x6ABE = 0x4549
-0x6ABF = 0x454A
-0x6AC6 = 0x454B
-0x6AC8 = 0x454D
-0x6AC9 = 0x454C
-0x6ACC = 0x454E
-0x6AD0 = 0x454F
-0x6AD4 = 0x4550
-0x6AD5 = 0x4551
-0x6AD6 = 0x4552
-0x6ADC = 0x4553
-0x6ADD = 0x4554
-0x6AE4 = 0x4555
-0x6AE7 = 0x4556
-0x6AEC = 0x4557
-0x6AF0 = 0x4558
-0x6AF1 = 0x4559
-0x6AF2 = 0x455A
-0x6AFC = 0x455B
-0x6AFD = 0x455C
-0x6B02 = 0x455D
-0x6B03 = 0x455E
-0x6B06 = 0x455F
-0x6B07 = 0x4560
-0x6B09 = 0x4561
-0x6B0F = 0x4562
-0x6B10 = 0x4563
-0x6B11 = 0x4564
-0x6B17 = 0x4565
-0x6B1B = 0x4566
-0x6B1E = 0x4567
-0x6B24 = 0x4568
-0x6B28 = 0x4569
-0x6B2B = 0x456A
-0x6B2C = 0x456B
-0x6B2F = 0x456C
-0x6B35 = 0x456D
-0x6B36 = 0x456E
-0x6B3B = 0x456F
-0x6B3F = 0x4570
-0x6B46 = 0x4571
-0x6B4A = 0x4572
-0x6B4D = 0x4573
-0x6B52 = 0x4574
-0x6B56 = 0x4575
-0x6B58 = 0x4576
-0x6B5D = 0x4577
-0x6B60 = 0x4578
-0x6B67 = 0x4579
-0x6B6B = 0x457A
-0x6B6E = 0x457B
-0x6B70 = 0x457C
-0x6B75 = 0x457D
-0x6B7D = 0x457E
-0x6B7E = 0x4621
-0x6B82 = 0x4622
-0x6B85 = 0x4623
-0x6B97 = 0x4624
-0x6B9B = 0x4625
-0x6B9F = 0x4626
-0x6BA0 = 0x4627
-0x6BA2 = 0x4628
-0x6BA3 = 0x4629
-0x6BA8 = 0x462A
-0x6BA9 = 0x462B
-0x6BAC = 0x462C
-0x6BAD = 0x462D
-0x6BAE = 0x462E
-0x6BB0 = 0x462F
-0x6BB8 = 0x4630
-0x6BB9 = 0x4631
-0x6BBD = 0x4632
-0x6BBE = 0x4633
-0x6BC3 = 0x4634
-0x6BC4 = 0x4635
-0x6BC9 = 0x4636
-0x6BCC = 0x4637
-0x6BD6 = 0x4638
-0x6BDA = 0x4639
-0x6BE1 = 0x463A
-0x6BE3 = 0x463B
-0x6BE6 = 0x463C
-0x6BE7 = 0x463D
-0x6BEE = 0x463E
-0x6BF1 = 0x463F
-0x6BF7 = 0x4640
-0x6BF9 = 0x4641
-0x6BFF = 0x4642
-0x6C02 = 0x4643
-0x6C04 = 0x4644
-0x6C05 = 0x4645
-0x6C09 = 0x4646
-0x6C0D = 0x4647
-0x6C0E = 0x4648
-0x6C10 = 0x4649
-0x6C12 = 0x464A
-0x6C19 = 0x464B
-0x6C1F = 0x464C
-0x6C26 = 0x464D
-0x6C27 = 0x464E
-0x6C28 = 0x464F
-0x6C2C = 0x4650
-0x6C2E = 0x4651
-0x6C33 = 0x4652
-0x6C35 = 0x4653
-0x6C36 = 0x4654
-0x6C3A = 0x4655
-0x6C3B = 0x4656
-0x6C3F = 0x4657
-0x6C4A = 0x4658
-0x6C4B = 0x4659
-0x6C4D = 0x465A
-0x6C4F = 0x465B
-0x6C52 = 0x465C
-0x6C54 = 0x465D
-0x6C59 = 0x465E
-0x6C5B = 0x465F
-0x6C5C = 0x4660
-0x6C67 = 0x4736
-0x6C6B = 0x4661
-0x6C6D = 0x4662
-0x6C6F = 0x4663
-0x6C74 = 0x4664
-0x6C76 = 0x4665
-0x6C78 = 0x4666
-0x6C79 = 0x4667
-0x6C7B = 0x4668
-0x6C85 = 0x4669
-0x6C86 = 0x466A
-0x6C87 = 0x466B
-0x6C89 = 0x466C
-0x6C94 = 0x466D
-0x6C95 = 0x466E
-0x6C97 = 0x466F
-0x6C98 = 0x4670
-0x6C9C = 0x4671
-0x6C9F = 0x4672
-0x6CB0 = 0x4673
-0x6CB2 = 0x4674
-0x6CB4 = 0x4675
-0x6CC2 = 0x4676
-0x6CC6 = 0x4677
-0x6CCD = 0x4678
-0x6CCF = 0x4679
-0x6CD0 = 0x467A
-0x6CD1 = 0x467B
-0x6CD2 = 0x467C
-0x6CD4 = 0x467D
-0x6CD6 = 0x467E
-0x6CDA = 0x4721
-0x6CDC = 0x4722
-0x6CE0 = 0x4723
-0x6CE7 = 0x4724
-0x6CE9 = 0x4725
-0x6CEB = 0x4726
-0x6CEC = 0x4727
-0x6CEE = 0x4728
-0x6CF2 = 0x4729
-0x6CF4 = 0x472A
-0x6D04 = 0x472B
-0x6D07 = 0x472C
-0x6D0A = 0x472D
-0x6D0E = 0x472E
-0x6D0F = 0x472F
-0x6D11 = 0x4730
-0x6D13 = 0x4731
-0x6D1A = 0x4732
-0x6D26 = 0x4733
-0x6D27 = 0x4734
-0x6D28 = 0x4735
-0x6D2E = 0x4737
-0x6D2F = 0x4738
-0x6D31 = 0x4739
-0x6D39 = 0x473A
-0x6D3C = 0x473B
-0x6D3F = 0x473C
-0x6D57 = 0x473D
-0x6D5E = 0x473E
-0x6D5F = 0x473F
-0x6D61 = 0x4740
-0x6D65 = 0x4741
-0x6D67 = 0x4742
-0x6D6F = 0x4743
-0x6D70 = 0x4744
-0x6D7C = 0x4745
-0x6D82 = 0x4746
-0x6D87 = 0x4747
-0x6D91 = 0x4748
-0x6D92 = 0x4749
-0x6D94 = 0x474A
-0x6D96 = 0x474B
-0x6D97 = 0x474C
-0x6D98 = 0x474D
-0x6DAA = 0x474E
-0x6DAC = 0x474F
-0x6DB4 = 0x4750
-0x6DB7 = 0x4751
-0x6DB9 = 0x4752
-0x6DBD = 0x4753
-0x6DBF = 0x4754
-0x6DC4 = 0x4755
-0x6DC8 = 0x4756
-0x6DCA = 0x4757
-0x6DCE = 0x4758
-0x6DCF = 0x4759
-0x6DD6 = 0x475A
-0x6DDB = 0x475B
-0x6DDD = 0x475C
-0x6DDF = 0x475D
-0x6DE0 = 0x475E
-0x6DE2 = 0x475F
-0x6DE5 = 0x4760
-0x6DE9 = 0x4761
-0x6DEF = 0x4762
-0x6DF0 = 0x4763
-0x6DF4 = 0x4764
-0x6DF6 = 0x4765
-0x6DFC = 0x4766
-0x6E00 = 0x4767
-0x6E04 = 0x4768
-0x6E1E = 0x4769
-0x6E22 = 0x476A
-0x6E27 = 0x476B
-0x6E32 = 0x476C
-0x6E36 = 0x476D
-0x6E39 = 0x476E
-0x6E3B = 0x476F
-0x6E3C = 0x4770
-0x6E44 = 0x4771
-0x6E45 = 0x4772
-0x6E48 = 0x4773
-0x6E49 = 0x4774
-0x6E4B = 0x4775
-0x6E4F = 0x4776
-0x6E51 = 0x4777
-0x6E52 = 0x4778
-0x6E53 = 0x4779
-0x6E54 = 0x477A
-0x6E57 = 0x477B
-0x6E5C = 0x477C
-0x6E5D = 0x477D
-0x6E5E = 0x477E
-0x6E62 = 0x4821
-0x6E63 = 0x4822
-0x6E68 = 0x4823
-0x6E73 = 0x4824
-0x6E7B = 0x4825
-0x6E7D = 0x4826
-0x6E8D = 0x4827
-0x6E93 = 0x4828
-0x6E99 = 0x4829
-0x6EA0 = 0x482A
-0x6EA7 = 0x482B
-0x6EAD = 0x482C
-0x6EAE = 0x482D
-0x6EB1 = 0x482E
-0x6EB3 = 0x482F
-0x6EBB = 0x4830
-0x6EBF = 0x4831
-0x6EC0 = 0x4832
-0x6EC1 = 0x4833
-0x6EC3 = 0x4834
-0x6EC7 = 0x4835
-0x6EC8 = 0x4836
-0x6ECA = 0x4837
-0x6ECD = 0x4838
-0x6ECE = 0x4839
-0x6ECF = 0x483A
-0x6EEB = 0x483B
-0x6EED = 0x483C
-0x6EEE = 0x483D
-0x6EF9 = 0x483E
-0x6EFB = 0x483F
-0x6EFD = 0x4840
-0x6F04 = 0x4841
-0x6F08 = 0x4842
-0x6F0A = 0x4843
-0x6F0C = 0x4844
-0x6F0D = 0x4845
-0x6F16 = 0x4846
-0x6F18 = 0x4847
-0x6F1A = 0x4848
-0x6F1B = 0x4849
-0x6F26 = 0x484A
-0x6F29 = 0x484B
-0x6F2A = 0x484C
-0x6F2D = 0x4853
-0x6F2F = 0x484D
-0x6F30 = 0x484E
-0x6F33 = 0x484F
-0x6F36 = 0x4850
-0x6F3B = 0x4851
-0x6F3C = 0x4852
-0x6F4F = 0x4854
-0x6F51 = 0x4855
-0x6F52 = 0x4856
-0x6F53 = 0x4857
-0x6F57 = 0x4858
-0x6F59 = 0x4859
-0x6F5A = 0x485A
-0x6F5D = 0x485B
-0x6F5E = 0x485C
-0x6F61 = 0x485D
-0x6F62 = 0x485E
-0x6F68 = 0x485F
-0x6F6C = 0x4860
-0x6F7D = 0x4861
-0x6F7E = 0x4862
-0x6F83 = 0x4863
-0x6F87 = 0x4864
-0x6F88 = 0x4865
-0x6F8B = 0x4866
-0x6F8C = 0x4867
-0x6F8D = 0x4868
-0x6F90 = 0x4869
-0x6F92 = 0x486A
-0x6F93 = 0x486B
-0x6F94 = 0x486C
-0x6F96 = 0x486D
-0x6F9A = 0x486E
-0x6F9F = 0x486F
-0x6FA0 = 0x4870
-0x6FA5 = 0x4871
-0x6FA6 = 0x4872
-0x6FA7 = 0x4873
-0x6FA8 = 0x4874
-0x6FAE = 0x4875
-0x6FAF = 0x4876
-0x6FB0 = 0x4877
-0x6FB5 = 0x4878
-0x6FB6 = 0x4879
-0x6FBC = 0x487A
-0x6FC5 = 0x487B
-0x6FC7 = 0x487C
-0x6FC8 = 0x487D
-0x6FCA = 0x487E
-0x6FDA = 0x4921
-0x6FDE = 0x4922
-0x6FE8 = 0x4923
-0x6FE9 = 0x4924
-0x6FF0 = 0x4925
-0x6FF5 = 0x4926
-0x6FF9 = 0x4927
-0x6FFC = 0x4928
-0x6FFD = 0x4929
-0x7000 = 0x492A
-0x7005 = 0x492B
-0x7006 = 0x492C
-0x7007 = 0x492D
-0x700D = 0x492E
-0x7017 = 0x492F
-0x7020 = 0x4930
-0x7023 = 0x4931
-0x702F = 0x4932
-0x7034 = 0x4933
-0x7037 = 0x4934
-0x7039 = 0x4935
-0x703C = 0x4936
-0x7043 = 0x4937
-0x7044 = 0x4938
-0x7048 = 0x4939
-0x7049 = 0x493A
-0x704A = 0x493B
-0x704B = 0x493C
-0x704E = 0x4941
-0x7054 = 0x493D
-0x7055 = 0x493E
-0x705D = 0x493F
-0x705E = 0x4940
-0x7064 = 0x4942
-0x7065 = 0x4943
-0x706C = 0x4944
-0x706E = 0x4945
-0x7075 = 0x4946
-0x7076 = 0x4947
-0x707E = 0x4948
-0x7081 = 0x4949
-0x7085 = 0x494A
-0x7086 = 0x494B
-0x7094 = 0x494C
-0x7095 = 0x494D
-0x7096 = 0x494E
-0x7097 = 0x494F
-0x7098 = 0x4950
-0x709B = 0x4951
-0x70A4 = 0x4952
-0x70AB = 0x4953
-0x70B0 = 0x4954
-0x70B1 = 0x4955
-0x70B4 = 0x4956
-0x70B7 = 0x4957
-0x70CA = 0x4958
-0x70D1 = 0x4959
-0x70D3 = 0x495A
-0x70D4 = 0x495B
-0x70D5 = 0x495C
-0x70D6 = 0x495D
-0x70D8 = 0x495E
-0x70DC = 0x495F
-0x70E4 = 0x4960
-0x70FA = 0x4961
-0x7103 = 0x4962
-0x7104 = 0x4963
-0x7105 = 0x4964
-0x7106 = 0x4965
-0x7107 = 0x4966
-0x710B = 0x4967
-0x710C = 0x4968
-0x710F = 0x4969
-0x711E = 0x496A
-0x7120 = 0x496B
-0x712B = 0x496C
-0x712D = 0x496D
-0x712F = 0x496E
-0x7130 = 0x496F
-0x7131 = 0x4970
-0x7138 = 0x4971
-0x7141 = 0x4972
-0x7145 = 0x4973
-0x7146 = 0x4974
-0x7147 = 0x4975
-0x714A = 0x4976
-0x714B = 0x4977
-0x7150 = 0x4978
-0x7152 = 0x4979
-0x7157 = 0x497A
-0x715A = 0x497B
-0x715C = 0x497C
-0x715E = 0x497D
-0x7160 = 0x497E
-0x7168 = 0x4A21
-0x7179 = 0x4A22
-0x7180 = 0x4A23
-0x7185 = 0x4A24
-0x7187 = 0x4A25
-0x718C = 0x4A26
-0x7192 = 0x4A27
-0x719A = 0x4A28
-0x719B = 0x4A29
-0x71A0 = 0x4A2A
-0x71A2 = 0x4A2B
-0x71AF = 0x4A2C
-0x71B0 = 0x4A2D
-0x71B2 = 0x4A2E
-0x71B3 = 0x4A2F
-0x71BA = 0x4A30
-0x71BF = 0x4A31
-0x71C0 = 0x4A32
-0x71C1 = 0x4A33
-0x71C4 = 0x4A34
-0x71CB = 0x4A35
-0x71CC = 0x4A36
-0x71D3 = 0x4A37
-0x71D6 = 0x4A38
-0x71D9 = 0x4A39
-0x71DA = 0x4A3A
-0x71DC = 0x4A3B
-0x71F8 = 0x4A3C
-0x71FE = 0x4A3D
-0x7200 = 0x4A3E
-0x7207 = 0x4A3F
-0x7208 = 0x4A40
-0x7209 = 0x4A41
-0x7213 = 0x4A42
-0x7217 = 0x4A43
-0x721A = 0x4A44
-0x721D = 0x4A45
-0x721F = 0x4A46
-0x7224 = 0x4A47
-0x722B = 0x4A48
-0x722F = 0x4A49
-0x7234 = 0x4A4A
-0x7238 = 0x4A4B
-0x7239 = 0x4A4C
-0x7241 = 0x4A4D
-0x7242 = 0x4A4E
-0x7243 = 0x4A4F
-0x7245 = 0x4A50
-0x724E = 0x4A51
-0x724F = 0x4A52
-0x7250 = 0x4A53
-0x7253 = 0x4A54
-0x7255 = 0x4A55
-0x7256 = 0x4A56
-0x725A = 0x4A57
-0x725C = 0x4A58
-0x725E = 0x4A59
-0x7260 = 0x4A5A
-0x7263 = 0x4A5B
-0x7268 = 0x4A5C
-0x726B = 0x4A5D
-0x726E = 0x4A5E
-0x726F = 0x4A5F
-0x7271 = 0x4A60
-0x7277 = 0x4A61
-0x7278 = 0x4A62
-0x727B = 0x4A63
-0x727C = 0x4A64
-0x727F = 0x4A65
-0x7284 = 0x4A66
-0x7289 = 0x4A67
-0x728D = 0x4A68
-0x728E = 0x4A69
-0x7293 = 0x4A6A
-0x729B = 0x4A6B
-0x72A8 = 0x4A6C
-0x72AD = 0x4A6D
-0x72AE = 0x4A6E
-0x72B1 = 0x4A6F
-0x72B4 = 0x4A70
-0x72BE = 0x4A71
-0x72C1 = 0x4A72
-0x72C7 = 0x4A73
-0x72C9 = 0x4A74
-0x72CC = 0x4A75
-0x72D5 = 0x4A76
-0x72D6 = 0x4A77
-0x72D8 = 0x4A78
-0x72DF = 0x4A79
-0x72E5 = 0x4A7A
-0x72F3 = 0x4A7B
-0x72F4 = 0x4A7C
-0x72FA = 0x4A7D
-0x72FB = 0x4A7E
-0x72FE = 0x4B21
-0x7302 = 0x4B22
-0x7304 = 0x4B23
-0x7305 = 0x4B24
-0x7307 = 0x4B25
-0x730B = 0x4B26
-0x730D = 0x4B27
-0x7312 = 0x4B28
-0x7313 = 0x4B29
-0x7318 = 0x4B2A
-0x7319 = 0x4B2B
-0x731E = 0x4B2C
-0x7322 = 0x4B2D
-0x7324 = 0x4B2E
-0x7327 = 0x4B2F
-0x7328 = 0x4B30
-0x732C = 0x4B31
-0x7331 = 0x4B32
-0x7332 = 0x4B33
-0x7335 = 0x4B34
-0x733A = 0x4B35
-0x733B = 0x4B36
-0x733D = 0x4B37
-0x7343 = 0x4B38
-0x734D = 0x4B39
-0x7350 = 0x4B3A
-0x7352 = 0x4B3B
-0x7356 = 0x4B3C
-0x7358 = 0x4B3D
-0x735D = 0x4B3E
-0x735E = 0x4B3F
-0x735F = 0x4B40
-0x7360 = 0x4B41
-0x7366 = 0x4B42
-0x7367 = 0x4B43
-0x7369 = 0x4B44
-0x736B = 0x4B45
-0x736C = 0x4B46
-0x736E = 0x4B47
-0x736F = 0x4B48
-0x7371 = 0x4B49
-0x7377 = 0x4B4A
-0x7379 = 0x4B4B
-0x737C = 0x4B4C
-0x7380 = 0x4B4D
-0x7381 = 0x4B4E
-0x7383 = 0x4B4F
-0x7385 = 0x4B50
-0x7386 = 0x4B51
-0x738E = 0x4B52
-0x7390 = 0x4B53
-0x7393 = 0x4B54
-0x7395 = 0x4B55
-0x7397 = 0x4B56
-0x7398 = 0x4B57
-0x739C = 0x4B58
-0x739E = 0x4B59
-0x739F = 0x4B5A
-0x73A0 = 0x4B5B
-0x73A2 = 0x4B5C
-0x73A5 = 0x4B5D
-0x73A6 = 0x4B5E
-0x73AA = 0x4B5F
-0x73AB = 0x4B60
-0x73AD = 0x4B61
-0x73B5 = 0x4B62
-0x73B7 = 0x4B63
-0x73B9 = 0x4B64
-0x73BC = 0x4B65
-0x73BD = 0x4B66
-0x73BF = 0x4B67
-0x73C5 = 0x4B68
-0x73C6 = 0x4B69
-0x73C9 = 0x4B6A
-0x73CB = 0x4B6B
-0x73CC = 0x4B6C
-0x73CF = 0x4B6D
-0x73D2 = 0x4B6E
-0x73D3 = 0x4B6F
-0x73D6 = 0x4B70
-0x73D9 = 0x4B71
-0x73DD = 0x4B72
-0x73E1 = 0x4B73
-0x73E3 = 0x4B74
-0x73E6 = 0x4B75
-0x73E7 = 0x4B76
-0x73E9 = 0x4B77
-0x73F4 = 0x4B78
-0x73F5 = 0x4B79
-0x73F7 = 0x4B7A
-0x73F9 = 0x4B7B
-0x73FA = 0x4B7C
-0x73FB = 0x4B7D
-0x73FD = 0x4B7E
-0x73FF = 0x4C21
-0x7400 = 0x4C22
-0x7401 = 0x4C23
-0x7404 = 0x4C24
-0x7407 = 0x4C25
-0x740A = 0x4C26
-0x7411 = 0x4C27
-0x741A = 0x4C28
-0x741B = 0x4C29
-0x7424 = 0x4C2A
-0x7426 = 0x4C2B
-0x7428 = 0x4C2C
-0x7429 = 0x4C2D
-0x742A = 0x4C2E
-0x742B = 0x4C2F
-0x742C = 0x4C30
-0x742D = 0x4C31
-0x742E = 0x4C32
-0x742F = 0x4C33
-0x7430 = 0x4C34
-0x7431 = 0x4C35
-0x7439 = 0x4C36
-0x7440 = 0x4C37
-0x7443 = 0x4C38
-0x7444 = 0x4C39
-0x7446 = 0x4C3A
-0x7447 = 0x4C3B
-0x744B = 0x4C3C
-0x744D = 0x4C3D
-0x7451 = 0x4C3E
-0x7452 = 0x4C3F
-0x7457 = 0x4C40
-0x745D = 0x4C41
-0x7462 = 0x4C42
-0x7466 = 0x4C43
-0x7467 = 0x4C44
-0x7468 = 0x4C45
-0x746B = 0x4C46
-0x746D = 0x4C47
-0x746E = 0x4C48
-0x7471 = 0x4C49
-0x7472 = 0x4C4A
-0x7480 = 0x4C4B
-0x7481 = 0x4C4C
-0x7485 = 0x4C4D
-0x7486 = 0x4C4E
-0x7487 = 0x4C4F
-0x7489 = 0x4C50
-0x748F = 0x4C51
-0x7490 = 0x4C52
-0x7491 = 0x4C53
-0x7492 = 0x4C54
-0x7498 = 0x4C55
-0x7499 = 0x4C56
-0x749A = 0x4C57
-0x749C = 0x4C58
-0x749F = 0x4C59
-0x74A0 = 0x4C5A
-0x74A1 = 0x4C5B
-0x74A3 = 0x4C5C
-0x74A6 = 0x4C5D
-0x74A8 = 0x4C5E
-0x74A9 = 0x4C5F
-0x74AA = 0x4C60
-0x74AB = 0x4C61
-0x74AE = 0x4C62
-0x74AF = 0x4C63
-0x74B1 = 0x4C64
-0x74B2 = 0x4C65
-0x74B5 = 0x4C66
-0x74B9 = 0x4C67
-0x74BB = 0x4C68
-0x74BF = 0x4C69
-0x74C8 = 0x4C6A
-0x74C9 = 0x4C6B
-0x74CC = 0x4C6C
-0x74D0 = 0x4C6D
-0x74D3 = 0x4C6E
-0x74D8 = 0x4C6F
-0x74DA = 0x4C70
-0x74DB = 0x4C71
-0x74DE = 0x4C72
-0x74DF = 0x4C73
-0x74E4 = 0x4C74
-0x74E8 = 0x4C75
-0x74EA = 0x4C76
-0x74EB = 0x4C77
-0x74EF = 0x4C78
-0x74F4 = 0x4C79
-0x74FA = 0x4C7A
-0x74FB = 0x4C7B
-0x74FC = 0x4C7C
-0x74FF = 0x4C7D
-0x7506 = 0x4C7E
-0x7512 = 0x4D21
-0x7516 = 0x4D22
-0x7517 = 0x4D23
-0x7520 = 0x4D24
-0x7521 = 0x4D25
-0x7524 = 0x4D26
-0x7527 = 0x4D27
-0x7529 = 0x4D28
-0x752A = 0x4D29
-0x752F = 0x4D2A
-0x7536 = 0x4D2B
-0x7539 = 0x4D2C
-0x753D = 0x4D2D
-0x753E = 0x4D2E
-0x753F = 0x4D2F
-0x7540 = 0x4D30
-0x7543 = 0x4D31
-0x7547 = 0x4D32
-0x7548 = 0x4D33
-0x754E = 0x4D34
-0x7550 = 0x4D35
-0x7552 = 0x4D36
-0x7557 = 0x4D37
-0x755E = 0x4D38
-0x755F = 0x4D39
-0x7561 = 0x4D3A
-0x756F = 0x4D3B
-0x7571 = 0x4D3C
-0x7579 = 0x4D3D
-0x757A = 0x4D3E
-0x757B = 0x4D3F
-0x757C = 0x4D40
-0x757D = 0x4D41
-0x757E = 0x4D42
-0x7581 = 0x4D43
-0x7585 = 0x4D44
-0x7590 = 0x4D45
-0x7592 = 0x4D46
-0x7593 = 0x4D47
-0x7595 = 0x4D48
-0x7599 = 0x4D49
-0x759C = 0x4D4A
-0x75A2 = 0x4D4B
-0x75A4 = 0x4D4C
-0x75B4 = 0x4D4D
-0x75BA = 0x4D4E
-0x75BF = 0x4D4F
-0x75C0 = 0x4D50
-0x75C1 = 0x4D51
-0x75C4 = 0x4D52
-0x75C6 = 0x4D53
-0x75CC = 0x4D54
-0x75CE = 0x4D55
-0x75CF = 0x4D56
-0x75D7 = 0x4D57
-0x75DC = 0x4D58
-0x75DF = 0x4D59
-0x75E0 = 0x4D5A
-0x75E1 = 0x4D5B
-0x75E4 = 0x4D5C
-0x75E7 = 0x4D5D
-0x75EC = 0x4D5E
-0x75EE = 0x4D5F
-0x75EF = 0x4D60
-0x75F1 = 0x4D61
-0x75F9 = 0x4D62
-0x7600 = 0x4D63
-0x7602 = 0x4D64
-0x7603 = 0x4D65
-0x7604 = 0x4D66
-0x7607 = 0x4D67
-0x7608 = 0x4D68
-0x760A = 0x4D69
-0x760C = 0x4D6A
-0x760F = 0x4D6B
-0x7612 = 0x4D6C
-0x7613 = 0x4D6D
-0x7615 = 0x4D6E
-0x7616 = 0x4D6F
-0x7619 = 0x4D70
-0x761B = 0x4D71
-0x761C = 0x4D72
-0x761D = 0x4D73
-0x761E = 0x4D74
-0x7623 = 0x4D75
-0x7625 = 0x4D76
-0x7626 = 0x4D77
-0x7629 = 0x4D78
-0x762D = 0x4D79
-0x7632 = 0x4D7A
-0x7633 = 0x4D7B
-0x7635 = 0x4D7C
-0x7638 = 0x4D7D
-0x7639 = 0x4D7E
-0x763A = 0x4E21
-0x763C = 0x4E22
-0x7640 = 0x4E24
-0x7641 = 0x4E25
-0x7643 = 0x4E26
-0x7644 = 0x4E27
-0x7645 = 0x4E28
-0x7649 = 0x4E29
-0x764A = 0x4E23
-0x764B = 0x4E2A
-0x7655 = 0x4E2B
-0x7659 = 0x4E2C
-0x765F = 0x4E2D
-0x7664 = 0x4E2E
-0x7665 = 0x4E2F
-0x766D = 0x4E30
-0x766E = 0x4E31
-0x766F = 0x4E32
-0x7671 = 0x4E33
-0x7674 = 0x4E34
-0x7681 = 0x4E35
-0x7685 = 0x4E36
-0x768C = 0x4E37
-0x768D = 0x4E38
-0x7695 = 0x4E39
-0x769B = 0x4E3A
-0x769C = 0x4E3B
-0x769D = 0x4E3C
-0x769F = 0x4E3D
-0x76A0 = 0x4E3E
-0x76A2 = 0x4E3F
-0x76A3 = 0x4E40
-0x76A4 = 0x4E41
-0x76A5 = 0x4E42
-0x76A6 = 0x4E43
-0x76A7 = 0x4E44
-0x76A8 = 0x4E45
-0x76AA = 0x4E46
-0x76AD = 0x4E47
-0x76BD = 0x4E48
-0x76C1 = 0x4E49
-0x76C5 = 0x4E4A
-0x76C9 = 0x4E4B
-0x76CB = 0x4E4C
-0x76CC = 0x4E4D
-0x76CE = 0x4E4E
-0x76D4 = 0x4E4F
-0x76D9 = 0x4E50
-0x76E0 = 0x4E51
-0x76E6 = 0x4E52
-0x76E8 = 0x4E53
-0x76EC = 0x4E54
-0x76F0 = 0x4E55
-0x76F1 = 0x4E56
-0x76F6 = 0x4E57
-0x76F9 = 0x4E58
-0x76FC = 0x4E59
-0x7700 = 0x4E5A
-0x7706 = 0x4E5B
-0x770A = 0x4E5C
-0x770E = 0x4E5D
-0x7712 = 0x4E5E
-0x7714 = 0x4E5F
-0x7715 = 0x4E60
-0x7717 = 0x4E61
-0x7719 = 0x4E62
-0x771A = 0x4E63
-0x771C = 0x4E64
-0x7722 = 0x4E65
-0x7728 = 0x4E66
-0x772D = 0x4E67
-0x772E = 0x4E68
-0x772F = 0x4E69
-0x7734 = 0x4E6A
-0x7735 = 0x4E6B
-0x7736 = 0x4E6C
-0x7739 = 0x4E6D
-0x773D = 0x4E6E
-0x773E = 0x4E6F
-0x7742 = 0x4E70
-0x7745 = 0x4E71
-0x7746 = 0x4E72
-0x774A = 0x4E73
-0x774D = 0x4E74
-0x774E = 0x4E75
-0x774F = 0x4E76
-0x7752 = 0x4E77
-0x7756 = 0x4E78
-0x7757 = 0x4E79
-0x775C = 0x4E7A
-0x775E = 0x4E7B
-0x775F = 0x4E7C
-0x7760 = 0x4E7D
-0x7762 = 0x4E7E
-0x7764 = 0x4F21
-0x7767 = 0x4F22
-0x776A = 0x4F23
-0x776C = 0x4F24
-0x7770 = 0x4F25
-0x7772 = 0x4F26
-0x7773 = 0x4F27
-0x7774 = 0x4F28
-0x777A = 0x4F29
-0x777D = 0x4F2A
-0x7780 = 0x4F2B
-0x7784 = 0x4F2C
-0x778C = 0x4F2D
-0x778D = 0x4F2E
-0x7794 = 0x4F2F
-0x7795 = 0x4F30
-0x7796 = 0x4F31
-0x779A = 0x4F32
-0x779F = 0x4F33
-0x77A2 = 0x4F34
-0x77A7 = 0x4F35
-0x77AA = 0x4F36
-0x77AE = 0x4F37
-0x77AF = 0x4F38
-0x77B1 = 0x4F39
-0x77B5 = 0x4F3A
-0x77BE = 0x4F3B
-0x77C3 = 0x4F3C
-0x77C9 = 0x4F3D
-0x77D1 = 0x4F3E
-0x77D2 = 0x4F3F
-0x77D5 = 0x4F40
-0x77D9 = 0x4F41
-0x77DE = 0x4F42
-0x77DF = 0x4F43
-0x77E0 = 0x4F44
-0x77E4 = 0x4F45
-0x77E6 = 0x4F46
-0x77EA = 0x4F47
-0x77EC = 0x4F48
-0x77F0 = 0x4F49
-0x77F1 = 0x4F4A
-0x77F4 = 0x4F4B
-0x77F8 = 0x4F4C
-0x77FB = 0x4F4D
-0x7805 = 0x4F4E
-0x7806 = 0x4F4F
-0x7809 = 0x4F50
-0x780D = 0x4F51
-0x780E = 0x4F52
-0x7811 = 0x4F53
-0x781D = 0x4F54
-0x7821 = 0x4F55
-0x7822 = 0x4F56
-0x7823 = 0x4F57
-0x782D = 0x4F58
-0x782E = 0x4F59
-0x7830 = 0x4F5A
-0x7835 = 0x4F5B
-0x7837 = 0x4F5C
-0x7843 = 0x4F5D
-0x7844 = 0x4F5E
-0x7847 = 0x4F5F
-0x7848 = 0x4F60
-0x784C = 0x4F61
-0x784E = 0x4F62
-0x7852 = 0x4F63
-0x785C = 0x4F64
-0x785E = 0x4F65
-0x7860 = 0x4F66
-0x7861 = 0x4F67
-0x7863 = 0x4F68
-0x7864 = 0x4F69
-0x7868 = 0x4F6A
-0x786A = 0x4F6B
-0x786E = 0x4F6C
-0x787A = 0x4F6D
-0x787E = 0x4F6E
-0x788A = 0x4F6F
-0x788F = 0x4F70
-0x7894 = 0x4F71
-0x7898 = 0x4F72
-0x789D = 0x4F74
-0x789E = 0x4F75
-0x789F = 0x4F76
-0x78A1 = 0x4F73
-0x78A4 = 0x4F77
-0x78A8 = 0x4F78
-0x78AC = 0x4F79
-0x78AD = 0x4F7A
-0x78B0 = 0x4F7B
-0x78B1 = 0x4F7C
-0x78B2 = 0x4F7D
-0x78B3 = 0x4F7E
-0x78BB = 0x5021
-0x78BD = 0x5022
-0x78BF = 0x5023
-0x78C7 = 0x5024
-0x78C8 = 0x5025
-0x78C9 = 0x5026
-0x78CC = 0x5027
-0x78CE = 0x5028
-0x78D2 = 0x5029
-0x78D3 = 0x502A
-0x78D5 = 0x502B
-0x78D6 = 0x502C
-0x78DB = 0x502E
-0x78DF = 0x502F
-0x78E0 = 0x5030
-0x78E1 = 0x5031
-0x78E4 = 0x502D
-0x78E6 = 0x5032
-0x78EA = 0x5033
-0x78F2 = 0x5034
-0x78F3 = 0x5035
-0x78F6 = 0x5037
-0x78F7 = 0x5038
-0x78FA = 0x5039
-0x78FB = 0x503A
-0x78FF = 0x503B
-0x7900 = 0x5036
-0x7906 = 0x503C
-0x790C = 0x503D
-0x7910 = 0x503E
-0x791A = 0x503F
-0x791C = 0x5040
-0x791E = 0x5041
-0x791F = 0x5042
-0x7920 = 0x5043
-0x7925 = 0x5044
-0x7927 = 0x5045
-0x7929 = 0x5046
-0x792D = 0x5047
-0x7931 = 0x5048
-0x7934 = 0x5049
-0x7935 = 0x504A
-0x793B = 0x504B
-0x793D = 0x504C
-0x793F = 0x504D
-0x7944 = 0x504E
-0x7945 = 0x504F
-0x7946 = 0x5050
-0x794A = 0x5051
-0x794B = 0x5052
-0x794F = 0x5053
-0x7951 = 0x5054
-0x7954 = 0x5055
-0x7958 = 0x5056
-0x795B = 0x5057
-0x795C = 0x5058
-0x7967 = 0x5059
-0x7969 = 0x505A
-0x796B = 0x505B
-0x7972 = 0x505C
-0x7979 = 0x505D
-0x797B = 0x505E
-0x797C = 0x505F
-0x797E = 0x5060
-0x798B = 0x5061
-0x798C = 0x5062
-0x7991 = 0x5063
-0x7993 = 0x5064
-0x7994 = 0x5065
-0x7995 = 0x5066
-0x7996 = 0x5067
-0x7998 = 0x5068
-0x799B = 0x5069
-0x799C = 0x506A
-0x79A1 = 0x506B
-0x79A8 = 0x506C
-0x79A9 = 0x506D
-0x79AB = 0x506E
-0x79AF = 0x506F
-0x79B1 = 0x5070
-0x79B4 = 0x5071
-0x79B8 = 0x5072
-0x79BB = 0x5073
-0x79C2 = 0x5074
-0x79C4 = 0x5075
-0x79C7 = 0x5076
-0x79C8 = 0x5077
-0x79CA = 0x5078
-0x79CF = 0x5079
-0x79D4 = 0x507A
-0x79D6 = 0x507B
-0x79DA = 0x507C
-0x79DD = 0x507D
-0x79DE = 0x507E
-0x79E0 = 0x5121
-0x79E2 = 0x5122
-0x79E5 = 0x5123
-0x79EA = 0x5124
-0x79EB = 0x5125
-0x79ED = 0x5126
-0x79F1 = 0x5127
-0x79F8 = 0x5128
-0x79FC = 0x5129
-0x7A02 = 0x512A
-0x7A03 = 0x512B
-0x7A07 = 0x512C
-0x7A09 = 0x512D
-0x7A0A = 0x512E
-0x7A0C = 0x512F
-0x7A11 = 0x5130
-0x7A15 = 0x5131
-0x7A1B = 0x5132
-0x7A1E = 0x5133
-0x7A21 = 0x5134
-0x7A27 = 0x5135
-0x7A2B = 0x5136
-0x7A2D = 0x5137
-0x7A2F = 0x5138
-0x7A30 = 0x5139
-0x7A34 = 0x513A
-0x7A35 = 0x513B
-0x7A38 = 0x513C
-0x7A39 = 0x513D
-0x7A3A = 0x513E
-0x7A44 = 0x513F
-0x7A45 = 0x5140
-0x7A47 = 0x5141
-0x7A48 = 0x5142
-0x7A4C = 0x5143
-0x7A55 = 0x5144
-0x7A56 = 0x5145
-0x7A59 = 0x5146
-0x7A5C = 0x5147
-0x7A5D = 0x5148
-0x7A5F = 0x5149
-0x7A60 = 0x514A
-0x7A65 = 0x514B
-0x7A67 = 0x514C
-0x7A6A = 0x514D
-0x7A6D = 0x514E
-0x7A75 = 0x514F
-0x7A78 = 0x5150
-0x7A7E = 0x5151
-0x7A80 = 0x5152
-0x7A82 = 0x5153
-0x7A85 = 0x5154
-0x7A86 = 0x5155
-0x7A8A = 0x5156
-0x7A8B = 0x5157
-0x7A90 = 0x5158
-0x7A91 = 0x5159
-0x7A94 = 0x515A
-0x7A9E = 0x515B
-0x7AA0 = 0x515C
-0x7AA3 = 0x515D
-0x7AAC = 0x515E
-0x7AB3 = 0x515F
-0x7AB5 = 0x5160
-0x7AB9 = 0x5161
-0x7ABB = 0x5162
-0x7ABC = 0x5163
-0x7AC6 = 0x5164
-0x7AC9 = 0x5165
-0x7ACC = 0x5166
-0x7ACE = 0x5167
-0x7AD1 = 0x5168
-0x7ADB = 0x5169
-0x7AE8 = 0x516A
-0x7AE9 = 0x516B
-0x7AEB = 0x516C
-0x7AEC = 0x516D
-0x7AF1 = 0x516E
-0x7AF4 = 0x516F
-0x7AFB = 0x5170
-0x7AFD = 0x5171
-0x7AFE = 0x5172
-0x7B07 = 0x5173
-0x7B14 = 0x5174
-0x7B1F = 0x5175
-0x7B23 = 0x5176
-0x7B27 = 0x5177
-0x7B29 = 0x5178
-0x7B2A = 0x5179
-0x7B2B = 0x517A
-0x7B2D = 0x517B
-0x7B2E = 0x517C
-0x7B2F = 0x517D
-0x7B30 = 0x517E
-0x7B31 = 0x5221
-0x7B34 = 0x5222
-0x7B3D = 0x5223
-0x7B3F = 0x5224
-0x7B40 = 0x5225
-0x7B41 = 0x5226
-0x7B47 = 0x5227
-0x7B4E = 0x5228
-0x7B55 = 0x5229
-0x7B60 = 0x522A
-0x7B64 = 0x522B
-0x7B66 = 0x522C
-0x7B69 = 0x522D
-0x7B6A = 0x522E
-0x7B6D = 0x522F
-0x7B6F = 0x5230
-0x7B72 = 0x5231
-0x7B73 = 0x5232
-0x7B77 = 0x5233
-0x7B84 = 0x5234
-0x7B89 = 0x5235
-0x7B8E = 0x5236
-0x7B90 = 0x5237
-0x7B91 = 0x5238
-0x7B96 = 0x5239
-0x7B9B = 0x523A
-0x7B9E = 0x523B
-0x7BA0 = 0x523C
-0x7BA5 = 0x523D
-0x7BAC = 0x523E
-0x7BAF = 0x523F
-0x7BB0 = 0x5240
-0x7BB2 = 0x5241
-0x7BB5 = 0x5242
-0x7BB6 = 0x5243
-0x7BBA = 0x5244
-0x7BBB = 0x5245
-0x7BBC = 0x5246
-0x7BBD = 0x5247
-0x7BC2 = 0x5248
-0x7BC5 = 0x5249
-0x7BC8 = 0x524A
-0x7BCA = 0x524B
-0x7BD4 = 0x524C
-0x7BD6 = 0x524D
-0x7BD7 = 0x524E
-0x7BD9 = 0x524F
-0x7BDA = 0x5250
-0x7BDB = 0x5251
-0x7BE8 = 0x5252
-0x7BEA = 0x5253
-0x7BF2 = 0x5254
-0x7BF4 = 0x5255
-0x7BF5 = 0x5256
-0x7BF8 = 0x5257
-0x7BF9 = 0x5258
-0x7BFA = 0x5259
-0x7BFC = 0x525A
-0x7BFE = 0x525B
-0x7C01 = 0x525C
-0x7C02 = 0x525D
-0x7C03 = 0x525E
-0x7C04 = 0x525F
-0x7C06 = 0x5260
-0x7C09 = 0x5261
-0x7C0B = 0x5262
-0x7C0C = 0x5263
-0x7C0E = 0x5264
-0x7C0F = 0x5265
-0x7C19 = 0x5266
-0x7C1B = 0x5267
-0x7C20 = 0x5268
-0x7C25 = 0x5269
-0x7C26 = 0x526A
-0x7C28 = 0x526B
-0x7C2C = 0x526C
-0x7C31 = 0x526D
-0x7C33 = 0x526E
-0x7C34 = 0x526F
-0x7C36 = 0x5270
-0x7C39 = 0x5271
-0x7C3A = 0x5272
-0x7C46 = 0x5273
-0x7C4A = 0x5274
-0x7C51 = 0x5276
-0x7C52 = 0x5277
-0x7C53 = 0x5278
-0x7C55 = 0x5275
-0x7C59 = 0x5279
-0x7C5A = 0x527A
-0x7C5B = 0x527B
-0x7C5C = 0x527C
-0x7C5D = 0x527D
-0x7C5E = 0x527E
-0x7C61 = 0x5321
-0x7C63 = 0x5322
-0x7C67 = 0x5323
-0x7C69 = 0x5324
-0x7C6D = 0x5325
-0x7C6E = 0x5326
-0x7C70 = 0x5327
-0x7C72 = 0x5328
-0x7C79 = 0x5329
-0x7C7C = 0x532A
-0x7C7D = 0x532B
-0x7C86 = 0x532C
-0x7C87 = 0x532D
-0x7C8F = 0x532E
-0x7C94 = 0x532F
-0x7C9E = 0x5330
-0x7CA0 = 0x5331
-0x7CA6 = 0x5332
-0x7CB0 = 0x5333
-0x7CB6 = 0x5334
-0x7CB7 = 0x5335
-0x7CBA = 0x5336
-0x7CBB = 0x5337
-0x7CBC = 0x5338
-0x7CBF = 0x5339
-0x7CC4 = 0x533A
-0x7CC7 = 0x533B
-0x7CC8 = 0x533C
-0x7CC9 = 0x533D
-0x7CCD = 0x533E
-0x7CCF = 0x533F
-0x7CD3 = 0x5340
-0x7CD4 = 0x5341
-0x7CD5 = 0x5342
-0x7CD7 = 0x5343
-0x7CD9 = 0x5344
-0x7CDA = 0x5345
-0x7CDD = 0x5346
-0x7CE6 = 0x5347
-0x7CE9 = 0x5348
-0x7CEB = 0x5349
-0x7CF5 = 0x534A
-0x7D03 = 0x534B
-0x7D07 = 0x534C
-0x7D08 = 0x534D
-0x7D09 = 0x534E
-0x7D0F = 0x534F
-0x7D11 = 0x5350
-0x7D12 = 0x5351
-0x7D13 = 0x5352
-0x7D16 = 0x5353
-0x7D1D = 0x5354
-0x7D1E = 0x5355
-0x7D23 = 0x5356
-0x7D26 = 0x5357
-0x7D2A = 0x5358
-0x7D2D = 0x5359
-0x7D31 = 0x535A
-0x7D3C = 0x535B
-0x7D3D = 0x535C
-0x7D3E = 0x535D
-0x7D40 = 0x535E
-0x7D41 = 0x535F
-0x7D47 = 0x5360
-0x7D48 = 0x5361
-0x7D4D = 0x5362
-0x7D51 = 0x5363
-0x7D53 = 0x5364
-0x7D57 = 0x5365
-0x7D59 = 0x5366
-0x7D5A = 0x5367
-0x7D5C = 0x5368
-0x7D5D = 0x5369
-0x7D65 = 0x536A
-0x7D67 = 0x536B
-0x7D6A = 0x536C
-0x7D70 = 0x536D
-0x7D78 = 0x536E
-0x7D7A = 0x536F
-0x7D7B = 0x5370
-0x7D7F = 0x5371
-0x7D81 = 0x5372
-0x7D82 = 0x5373
-0x7D83 = 0x5374
-0x7D85 = 0x5375
-0x7D86 = 0x5376
-0x7D88 = 0x5377
-0x7D8B = 0x5378
-0x7D8C = 0x5379
-0x7D8D = 0x537A
-0x7D91 = 0x537B
-0x7D96 = 0x537C
-0x7D97 = 0x537D
-0x7D9D = 0x537E
-0x7D9E = 0x5421
-0x7DA6 = 0x5422
-0x7DA7 = 0x5423
-0x7DAA = 0x5424
-0x7DB3 = 0x5425
-0x7DB6 = 0x5426
-0x7DB7 = 0x5427
-0x7DB9 = 0x5428
-0x7DC2 = 0x5429
-0x7DC3 = 0x542A
-0x7DC4 = 0x542B
-0x7DC5 = 0x542C
-0x7DC6 = 0x542D
-0x7DCC = 0x542E
-0x7DCD = 0x542F
-0x7DCE = 0x5430
-0x7DD7 = 0x5431
-0x7DD9 = 0x5432
-0x7DE2 = 0x5434
-0x7DE5 = 0x5435
-0x7DE6 = 0x5436
-0x7DEA = 0x5437
-0x7DEB = 0x5438
-0x7DED = 0x5439
-0x7DF1 = 0x543A
-0x7DF5 = 0x543B
-0x7DF6 = 0x543C
-0x7DF9 = 0x543D
-0x7DFA = 0x543E
-0x7E00 = 0x5433
-0x7E08 = 0x543F
-0x7E10 = 0x5440
-0x7E11 = 0x5441
-0x7E15 = 0x5442
-0x7E17 = 0x5443
-0x7E1C = 0x5444
-0x7E1D = 0x5445
-0x7E20 = 0x5446
-0x7E27 = 0x5447
-0x7E28 = 0x5448
-0x7E2C = 0x5449
-0x7E2D = 0x544A
-0x7E2F = 0x544B
-0x7E33 = 0x544C
-0x7E36 = 0x544D
-0x7E3F = 0x544E
-0x7E44 = 0x544F
-0x7E45 = 0x5450
-0x7E47 = 0x5451
-0x7E4E = 0x5452
-0x7E50 = 0x5453
-0x7E52 = 0x5454
-0x7E58 = 0x5455
-0x7E5F = 0x5456
-0x7E61 = 0x5457
-0x7E62 = 0x5458
-0x7E65 = 0x5459
-0x7E6B = 0x545A
-0x7E6E = 0x545B
-0x7E6F = 0x545C
-0x7E73 = 0x545D
-0x7E78 = 0x545E
-0x7E7E = 0x545F
-0x7E81 = 0x5460
-0x7E86 = 0x5461
-0x7E87 = 0x5462
-0x7E8A = 0x5463
-0x7E8D = 0x5464
-0x7E91 = 0x5465
-0x7E95 = 0x5466
-0x7E98 = 0x5467
-0x7E9A = 0x5468
-0x7E9D = 0x5469
-0x7E9E = 0x546A
-0x7F3B = 0x546C
-0x7F3C = 0x546B
-0x7F3D = 0x546D
-0x7F3E = 0x546E
-0x7F3F = 0x546F
-0x7F43 = 0x5470
-0x7F44 = 0x5471
-0x7F47 = 0x5472
-0x7F4F = 0x5473
-0x7F52 = 0x5474
-0x7F53 = 0x5475
-0x7F5B = 0x5476
-0x7F5C = 0x5477
-0x7F5D = 0x5478
-0x7F61 = 0x5479
-0x7F63 = 0x547A
-0x7F64 = 0x547B
-0x7F65 = 0x547C
-0x7F66 = 0x547D
-0x7F6D = 0x547E
-0x7F71 = 0x5521
-0x7F7D = 0x5522
-0x7F7E = 0x5523
-0x7F7F = 0x5524
-0x7F80 = 0x5525
-0x7F8B = 0x5526
-0x7F8D = 0x5527
-0x7F8F = 0x5528
-0x7F90 = 0x5529
-0x7F91 = 0x552A
-0x7F96 = 0x552B
-0x7F97 = 0x552C
-0x7F9C = 0x552D
-0x7FA1 = 0x552E
-0x7FA2 = 0x552F
-0x7FA6 = 0x5530
-0x7FAA = 0x5531
-0x7FAD = 0x5532
-0x7FB4 = 0x5533
-0x7FBC = 0x5534
-0x7FBF = 0x5535
-0x7FC0 = 0x5536
-0x7FC3 = 0x5537
-0x7FC8 = 0x5538
-0x7FCE = 0x5539
-0x7FCF = 0x553A
-0x7FDB = 0x553B
-0x7FDF = 0x553C
-0x7FE3 = 0x553D
-0x7FE5 = 0x553E
-0x7FE8 = 0x553F
-0x7FEC = 0x5540
-0x7FEE = 0x5541
-0x7FEF = 0x5542
-0x7FF2 = 0x5543
-0x7FFA = 0x5544
-0x7FFD = 0x5545
-0x7FFE = 0x5546
-0x7FFF = 0x5547
-0x8007 = 0x5548
-0x8008 = 0x5549
-0x800A = 0x554A
-0x800D = 0x554B
-0x800E = 0x554C
-0x800F = 0x554D
-0x8011 = 0x554E
-0x8013 = 0x554F
-0x8014 = 0x5550
-0x8016 = 0x5551
-0x801D = 0x5552
-0x801E = 0x5553
-0x801F = 0x5554
-0x8020 = 0x5555
-0x8024 = 0x5556
-0x8026 = 0x5557
-0x802C = 0x5558
-0x802E = 0x5559
-0x8030 = 0x555A
-0x8034 = 0x555B
-0x8035 = 0x555C
-0x8037 = 0x555D
-0x8039 = 0x555E
-0x803A = 0x555F
-0x803C = 0x5560
-0x803E = 0x5561
-0x8040 = 0x5562
-0x8044 = 0x5563
-0x8060 = 0x5564
-0x8064 = 0x5565
-0x8066 = 0x5566
-0x806D = 0x5567
-0x8071 = 0x5568
-0x8075 = 0x5569
-0x8081 = 0x556A
-0x8088 = 0x556B
-0x808E = 0x556C
-0x809C = 0x556D
-0x809E = 0x556E
-0x80A6 = 0x556F
-0x80A7 = 0x5570
-0x80AB = 0x5571
-0x80B8 = 0x5572
-0x80B9 = 0x5573
-0x80C8 = 0x5574
-0x80CD = 0x5575
-0x80CF = 0x5576
-0x80D2 = 0x5577
-0x80D4 = 0x5578
-0x80D5 = 0x5579
-0x80D7 = 0x557A
-0x80D8 = 0x557B
-0x80E0 = 0x557C
-0x80ED = 0x557D
-0x80EE = 0x557E
-0x80F0 = 0x5621
-0x80F2 = 0x5622
-0x80F3 = 0x5623
-0x80F6 = 0x5624
-0x80F9 = 0x5625
-0x80FA = 0x5626
-0x80FE = 0x5627
-0x8103 = 0x5628
-0x810B = 0x5629
-0x8116 = 0x562A
-0x8117 = 0x562B
-0x8118 = 0x562C
-0x811C = 0x562D
-0x811E = 0x562E
-0x8120 = 0x562F
-0x8124 = 0x5630
-0x8127 = 0x5631
-0x812C = 0x5632
-0x8130 = 0x5633
-0x8135 = 0x5634
-0x813A = 0x5635
-0x813C = 0x5636
-0x8145 = 0x5637
-0x8147 = 0x5638
-0x814A = 0x5639
-0x814C = 0x563A
-0x8152 = 0x563B
-0x8157 = 0x563C
-0x8160 = 0x563D
-0x8161 = 0x563E
-0x8167 = 0x563F
-0x8168 = 0x5640
-0x8169 = 0x5641
-0x816D = 0x5642
-0x816F = 0x5643
-0x8177 = 0x5644
-0x8181 = 0x5645
-0x8184 = 0x5647
-0x8185 = 0x5648
-0x8186 = 0x5649
-0x818B = 0x564A
-0x818E = 0x564B
-0x8190 = 0x5646
-0x8196 = 0x564C
-0x8198 = 0x564D
-0x819B = 0x564E
-0x819E = 0x564F
-0x81A2 = 0x5650
-0x81AE = 0x5651
-0x81B2 = 0x5652
-0x81B4 = 0x5653
-0x81BB = 0x5654
-0x81C3 = 0x5656
-0x81C5 = 0x5657
-0x81CA = 0x5658
-0x81CB = 0x5655
-0x81CE = 0x5659
-0x81CF = 0x565A
-0x81D5 = 0x565B
-0x81D7 = 0x565C
-0x81DB = 0x565D
-0x81DD = 0x565E
-0x81DE = 0x565F
-0x81E1 = 0x5660
-0x81E4 = 0x5661
-0x81EB = 0x5662
-0x81EC = 0x5663
-0x81F0 = 0x5664
-0x81F1 = 0x5665
-0x81F2 = 0x5666
-0x81F5 = 0x5667
-0x81F6 = 0x5668
-0x81F8 = 0x5669
-0x81F9 = 0x566A
-0x81FD = 0x566B
-0x81FF = 0x566C
-0x8200 = 0x566D
-0x8203 = 0x566E
-0x820F = 0x566F
-0x8213 = 0x5670
-0x8214 = 0x5671
-0x8219 = 0x5672
-0x821A = 0x5673
-0x821D = 0x5674
-0x8221 = 0x5675
-0x8222 = 0x5676
-0x8228 = 0x5677
-0x8232 = 0x5678
-0x8234 = 0x5679
-0x823A = 0x567A
-0x8243 = 0x567B
-0x8244 = 0x567C
-0x8245 = 0x567D
-0x8246 = 0x567E
-0x824B = 0x5721
-0x824E = 0x5722
-0x824F = 0x5723
-0x8251 = 0x5724
-0x8256 = 0x5725
-0x825C = 0x5726
-0x8260 = 0x5727
-0x8263 = 0x5728
-0x8267 = 0x5729
-0x826D = 0x572A
-0x8274 = 0x572B
-0x827B = 0x572C
-0x827D = 0x572D
-0x827F = 0x572E
-0x8280 = 0x572F
-0x8281 = 0x5730
-0x8283 = 0x5731
-0x8284 = 0x5732
-0x8287 = 0x5733
-0x8289 = 0x5734
-0x828A = 0x5735
-0x828E = 0x5736
-0x8291 = 0x5737
-0x8294 = 0x5738
-0x8296 = 0x5739
-0x8298 = 0x573A
-0x829A = 0x573B
-0x829B = 0x573C
-0x82A0 = 0x573D
-0x82A1 = 0x573E
-0x82A3 = 0x573F
-0x82A4 = 0x5740
-0x82A7 = 0x5741
-0x82A8 = 0x5742
-0x82A9 = 0x5743
-0x82AA = 0x5744
-0x82AE = 0x5745
-0x82B0 = 0x5746
-0x82B2 = 0x5747
-0x82B4 = 0x5748
-0x82B7 = 0x5749
-0x82BA = 0x574A
-0x82BC = 0x574B
-0x82BE = 0x574C
-0x82BF = 0x574D
-0x82C6 = 0x574E
-0x82D0 = 0x574F
-0x82D5 = 0x5750
-0x82DA = 0x5751
-0x82E0 = 0x5752
-0x82E2 = 0x5753
-0x82E4 = 0x5754
-0x82E8 = 0x5755
-0x82EA = 0x5756
-0x82ED = 0x5757
-0x82EF = 0x5758
-0x82F6 = 0x5759
-0x82F7 = 0x575A
-0x82FD = 0x575B
-0x82FE = 0x575C
-0x8300 = 0x575D
-0x8301 = 0x575E
-0x8307 = 0x575F
-0x8308 = 0x5760
-0x830A = 0x5761
-0x830B = 0x5762
-0x831B = 0x5764
-0x831D = 0x5765
-0x831E = 0x5766
-0x831F = 0x5767
-0x8321 = 0x5768
-0x8322 = 0x5769
-0x832C = 0x576A
-0x832D = 0x576B
-0x832E = 0x576C
-0x8330 = 0x576D
-0x8333 = 0x576E
-0x8337 = 0x576F
-0x833A = 0x5770
-0x833C = 0x5771
-0x833D = 0x5772
-0x8342 = 0x5773
-0x8343 = 0x5774
-0x8344 = 0x5775
-0x8347 = 0x5776
-0x834D = 0x5777
-0x834E = 0x5778
-0x8351 = 0x5779
-0x8353 = 0x583E
-0x8354 = 0x5763
-0x8355 = 0x577A
-0x8356 = 0x577B
-0x8357 = 0x577C
-0x8370 = 0x577D
-0x8378 = 0x577E
-0x837D = 0x5821
-0x837F = 0x5822
-0x8380 = 0x5823
-0x8382 = 0x5824
-0x8384 = 0x5825
-0x8386 = 0x5826
-0x838D = 0x5827
-0x8392 = 0x5828
-0x8394 = 0x5829
-0x8395 = 0x582A
-0x8398 = 0x582B
-0x8399 = 0x582C
-0x839B = 0x582D
-0x839C = 0x582E
-0x839D = 0x582F
-0x83A6 = 0x5830
-0x83A7 = 0x5831
-0x83A9 = 0x5832
-0x83AC = 0x5833
-0x83AD = 0x584C
-0x83BE = 0x5834
-0x83BF = 0x5835
-0x83C0 = 0x5836
-0x83C7 = 0x5837
-0x83C9 = 0x5838
-0x83CF = 0x5839
-0x83D0 = 0x583A
-0x83D1 = 0x583B
-0x83D4 = 0x583C
-0x83DD = 0x583D
-0x83E8 = 0x583F
-0x83EA = 0x5840
-0x83F6 = 0x5841
-0x83F8 = 0x5842
-0x83F9 = 0x5843
-0x83FC = 0x5844
-0x8401 = 0x5845
-0x8406 = 0x5846
-0x840A = 0x5847
-0x840F = 0x5848
-0x8411 = 0x5849
-0x8415 = 0x584A
-0x8419 = 0x584B
-0x842F = 0x584D
-0x8439 = 0x584E
-0x8445 = 0x584F
-0x8447 = 0x5850
-0x8448 = 0x5851
-0x844A = 0x5852
-0x844D = 0x5853
-0x844F = 0x5854
-0x8451 = 0x5855
-0x8452 = 0x5856
-0x8456 = 0x5857
-0x8458 = 0x5858
-0x8459 = 0x5859
-0x845A = 0x585A
-0x845C = 0x585B
-0x8460 = 0x585C
-0x8464 = 0x585D
-0x8465 = 0x585E
-0x8467 = 0x585F
-0x846A = 0x5860
-0x8470 = 0x5861
-0x8473 = 0x5862
-0x8474 = 0x5863
-0x8476 = 0x5864
-0x8478 = 0x5865
-0x847C = 0x5866
-0x847D = 0x5867
-0x8481 = 0x5868
-0x8485 = 0x5869
-0x8492 = 0x586A
-0x8493 = 0x586B
-0x8495 = 0x586C
-0x849E = 0x586D
-0x84A6 = 0x586E
-0x84A8 = 0x586F
-0x84A9 = 0x5870
-0x84AA = 0x5871
-0x84AF = 0x5872
-0x84B1 = 0x5873
-0x84B4 = 0x5874
-0x84BA = 0x5875
-0x84BD = 0x5876
-0x84BE = 0x5877
-0x84C0 = 0x5878
-0x84C2 = 0x5879
-0x84C7 = 0x587A
-0x84C8 = 0x587B
-0x84CC = 0x587C
-0x84CF = 0x587D
-0x84D3 = 0x587E
-0x84DC = 0x5921
-0x84E7 = 0x5922
-0x84EA = 0x5923
-0x84EF = 0x5924
-0x84F0 = 0x5925
-0x84F1 = 0x5926
-0x84F2 = 0x5927
-0x84F7 = 0x5928
-0x84FA = 0x592A
-0x84FB = 0x592B
-0x84FD = 0x592C
-0x8502 = 0x592D
-0x8503 = 0x592E
-0x8507 = 0x592F
-0x850C = 0x5930
-0x850E = 0x5931
-0x8510 = 0x5932
-0x851C = 0x5933
-0x851E = 0x5934
-0x8522 = 0x5935
-0x8523 = 0x5936
-0x8524 = 0x5937
-0x8525 = 0x5938
-0x8527 = 0x5939
-0x852A = 0x593A
-0x852B = 0x593B
-0x852F = 0x593C
-0x8532 = 0x5929
-0x8533 = 0x593D
-0x8534 = 0x593E
-0x8536 = 0x593F
-0x853F = 0x5940
-0x8546 = 0x5941
-0x854F = 0x5942
-0x8550 = 0x5943
-0x8551 = 0x5944
-0x8552 = 0x5945
-0x8553 = 0x5946
-0x8556 = 0x5947
-0x8559 = 0x5948
-0x855C = 0x5949
-0x855D = 0x594A
-0x855E = 0x594B
-0x855F = 0x594C
-0x8560 = 0x594D
-0x8561 = 0x594E
-0x8562 = 0x594F
-0x8564 = 0x5950
-0x856B = 0x5951
-0x856F = 0x5952
-0x8579 = 0x5953
-0x857A = 0x5954
-0x857B = 0x5955
-0x857D = 0x5956
-0x857F = 0x5957
-0x8581 = 0x5958
-0x8585 = 0x5959
-0x8586 = 0x595A
-0x8589 = 0x595B
-0x858B = 0x595C
-0x858C = 0x595D
-0x858F = 0x595E
-0x8593 = 0x595F
-0x8598 = 0x5960
-0x859D = 0x5961
-0x859F = 0x5962
-0x85A0 = 0x5963
-0x85A2 = 0x5964
-0x85A5 = 0x5965
-0x85A7 = 0x5966
-0x85AD = 0x5974
-0x85B4 = 0x5967
-0x85B6 = 0x5968
-0x85B7 = 0x5969
-0x85B8 = 0x596A
-0x85BC = 0x596B
-0x85BD = 0x596C
-0x85BE = 0x596D
-0x85BF = 0x596E
-0x85C2 = 0x596F
-0x85C7 = 0x5970
-0x85CA = 0x5971
-0x85CB = 0x5972
-0x85CE = 0x5973
-0x85D8 = 0x5975
-0x85DA = 0x5976
-0x85DF = 0x5977
-0x85E0 = 0x5978
-0x85E6 = 0x5979
-0x85E8 = 0x597A
-0x85ED = 0x597B
-0x85F3 = 0x597C
-0x85F6 = 0x597D
-0x85FC = 0x597E
-0x85FF = 0x5A21
-0x8600 = 0x5A22
-0x8604 = 0x5A23
-0x8605 = 0x5A24
-0x860D = 0x5A25
-0x860E = 0x5A26
-0x8610 = 0x5A27
-0x8611 = 0x5A28
-0x8612 = 0x5A29
-0x8618 = 0x5A2A
-0x8619 = 0x5A2B
-0x861B = 0x5A2C
-0x861E = 0x5A2D
-0x8621 = 0x5A2E
-0x8627 = 0x5A2F
-0x8629 = 0x5A30
-0x8636 = 0x5A31
-0x8638 = 0x5A32
-0x863A = 0x5A33
-0x863C = 0x5A34
-0x863D = 0x5A35
-0x8640 = 0x5A36
-0x8641 = 0x3866
-0x8642 = 0x5A37
-0x8646 = 0x5A38
-0x8652 = 0x5A39
-0x8653 = 0x5A3A
-0x8656 = 0x5A3B
-0x8657 = 0x5A3C
-0x8658 = 0x5A3D
-0x8659 = 0x5A3E
-0x865D = 0x5A3F
-0x8660 = 0x5A40
-0x8661 = 0x5A41
-0x8662 = 0x5A42
-0x8663 = 0x5A43
-0x8664 = 0x5A44
-0x8669 = 0x5A45
-0x866C = 0x5A46
-0x866F = 0x5A47
-0x8675 = 0x5A48
-0x8676 = 0x5A49
-0x8677 = 0x5A4A
-0x867A = 0x5A4B
-0x8688 = 0x5A6D
-0x868D = 0x5A4C
-0x8691 = 0x5A4D
-0x8696 = 0x5A4E
-0x8698 = 0x5A4F
-0x869A = 0x5A50
-0x869C = 0x5A51
-0x86A1 = 0x5A52
-0x86A6 = 0x5A53
-0x86A7 = 0x5A54
-0x86A8 = 0x5A55
-0x86AD = 0x5A56
-0x86B1 = 0x5A57
-0x86B3 = 0x5A58
-0x86B4 = 0x5A59
-0x86B5 = 0x5A5A
-0x86B7 = 0x5A5B
-0x86B8 = 0x5A5C
-0x86B9 = 0x5A5D
-0x86BF = 0x5A5E
-0x86C0 = 0x5A5F
-0x86C1 = 0x5A60
-0x86C3 = 0x5A61
-0x86C5 = 0x5A62
-0x86D1 = 0x5A63
-0x86D2 = 0x5A64
-0x86D5 = 0x5A65
-0x86D7 = 0x5A66
-0x86DA = 0x5A67
-0x86DC = 0x5A68
-0x86E0 = 0x5A69
-0x86E3 = 0x5A6A
-0x86E5 = 0x5A6B
-0x86E7 = 0x5A6C
-0x86FA = 0x5A6E
-0x86FC = 0x5A6F
-0x86FD = 0x5A70
-0x8704 = 0x5A71
-0x8705 = 0x5A72
-0x8707 = 0x5A73
-0x870B = 0x5A74
-0x870E = 0x5A75
-0x870F = 0x5A76
-0x8710 = 0x5A77
-0x8713 = 0x5A78
-0x8714 = 0x5A79
-0x8719 = 0x5A7A
-0x871E = 0x5A7B
-0x871F = 0x5A7C
-0x8721 = 0x5A7D
-0x8723 = 0x5A7E
-0x8728 = 0x5B21
-0x872E = 0x5B22
-0x872F = 0x5B23
-0x8731 = 0x5B24
-0x8732 = 0x5B25
-0x8739 = 0x5B26
-0x873A = 0x5B27
-0x873C = 0x5B28
-0x873D = 0x5B29
-0x873E = 0x5B2A
-0x8740 = 0x5B2B
-0x8743 = 0x5B2C
-0x8745 = 0x5B2D
-0x874D = 0x5B2E
-0x8758 = 0x5B2F
-0x875D = 0x5B30
-0x8761 = 0x5B31
-0x8764 = 0x5B32
-0x8765 = 0x5B33
-0x876F = 0x5B34
-0x8771 = 0x5B35
-0x8772 = 0x5B36
-0x877B = 0x5B37
-0x8783 = 0x5B38
-0x8784 = 0x5B39
-0x8785 = 0x5B3A
-0x8786 = 0x5B3B
-0x8787 = 0x5B3C
-0x8788 = 0x5B3D
-0x8789 = 0x5B3E
-0x878B = 0x5B3F
-0x878C = 0x5B40
-0x8790 = 0x5B41
-0x8793 = 0x5B42
-0x8795 = 0x5B43
-0x8797 = 0x5B44
-0x8798 = 0x5B45
-0x8799 = 0x5B46
-0x879E = 0x5B47
-0x87A0 = 0x5B48
-0x87A3 = 0x5B49
-0x87A7 = 0x5B4A
-0x87AC = 0x5B4B
-0x87AD = 0x5B4C
-0x87AE = 0x5B4D
-0x87B1 = 0x5B4E
-0x87B5 = 0x5B4F
-0x87BE = 0x5B50
-0x87BF = 0x5B51
-0x87C1 = 0x5B52
-0x87C8 = 0x5B53
-0x87C9 = 0x5B54
-0x87CA = 0x5B55
-0x87CE = 0x5B56
-0x87D5 = 0x5B57
-0x87D6 = 0x5B58
-0x87D9 = 0x5B59
-0x87DA = 0x5B5A
-0x87DC = 0x5B5B
-0x87DF = 0x5B5C
-0x87E2 = 0x5B5D
-0x87E3 = 0x5B5E
-0x87E4 = 0x5B5F
-0x87EA = 0x5B60
-0x87EB = 0x5B61
-0x87ED = 0x5B62
-0x87F1 = 0x5B63
-0x87F3 = 0x5B64
-0x87F8 = 0x5B65
-0x87FA = 0x5B66
-0x87FF = 0x5B67
-0x8801 = 0x5B68
-0x8803 = 0x5B69
-0x8806 = 0x5B6A
-0x8809 = 0x5B6B
-0x880A = 0x5B6C
-0x880B = 0x5B6D
-0x8810 = 0x5B6E
-0x8812 = 0x5B70
-0x8813 = 0x5B71
-0x8814 = 0x5B72
-0x8818 = 0x5B73
-0x8819 = 0x5B6F
-0x881A = 0x5B74
-0x881B = 0x5B75
-0x881C = 0x5B76
-0x881E = 0x5B77
-0x881F = 0x5B78
-0x8828 = 0x5B79
-0x882D = 0x5B7A
-0x882E = 0x5B7B
-0x8830 = 0x5B7C
-0x8832 = 0x5B7D
-0x8835 = 0x5B7E
-0x883A = 0x5C21
-0x883C = 0x5C22
-0x8841 = 0x5C23
-0x8843 = 0x5C24
-0x8845 = 0x5C25
-0x8848 = 0x5C26
-0x8849 = 0x5C27
-0x884A = 0x5C28
-0x884B = 0x5C29
-0x884E = 0x5C2A
-0x8851 = 0x5C2B
-0x8855 = 0x5C2C
-0x8856 = 0x5C2D
-0x8858 = 0x5C2E
-0x885A = 0x5C2F
-0x885C = 0x5C30
-0x885F = 0x5C31
-0x8860 = 0x5C32
-0x8864 = 0x5C33
-0x8869 = 0x5C34
-0x8871 = 0x5C35
-0x8879 = 0x5C36
-0x887B = 0x5C37
-0x8880 = 0x5C38
-0x8898 = 0x5C39
-0x889A = 0x5C3A
-0x889B = 0x5C3B
-0x889C = 0x5C3C
-0x889F = 0x5C3D
-0x88A0 = 0x5C3E
-0x88A8 = 0x5C3F
-0x88AA = 0x5C40
-0x88BA = 0x5C41
-0x88BD = 0x5C42
-0x88BE = 0x5C43
-0x88C0 = 0x5C44
-0x88CA = 0x5C45
-0x88CB = 0x5C46
-0x88CC = 0x5C47
-0x88CD = 0x5C48
-0x88CE = 0x5C49
-0x88D1 = 0x5C4A
-0x88D2 = 0x5C4B
-0x88D3 = 0x5C4C
-0x88DB = 0x5C4D
-0x88DE = 0x5C4E
-0x88E7 = 0x5C4F
-0x88EF = 0x5C50
-0x88F0 = 0x5C51
-0x88F1 = 0x5C52
-0x88F5 = 0x5C53
-0x88F7 = 0x5C54
-0x8901 = 0x5C55
-0x8906 = 0x5C56
-0x890D = 0x5C57
-0x890E = 0x5C58
-0x890F = 0x5C59
-0x8915 = 0x5C5A
-0x8916 = 0x5C5B
-0x8918 = 0x5C5C
-0x8919 = 0x5C5D
-0x891A = 0x5C5E
-0x891C = 0x5C5F
-0x8920 = 0x5C60
-0x8926 = 0x5C61
-0x8927 = 0x5C62
-0x8928 = 0x5C63
-0x8930 = 0x5C64
-0x8931 = 0x5C65
-0x8932 = 0x5C66
-0x8935 = 0x5C67
-0x8939 = 0x5C68
-0x893A = 0x5C69
-0x893E = 0x5C6A
-0x8940 = 0x5C6B
-0x8942 = 0x5C6C
-0x8945 = 0x5C6D
-0x8946 = 0x5C6E
-0x8949 = 0x5C6F
-0x894F = 0x5C70
-0x8952 = 0x5C71
-0x8957 = 0x5C72
-0x895A = 0x5C73
-0x895B = 0x5C74
-0x895C = 0x5C75
-0x8961 = 0x5C76
-0x8962 = 0x5C77
-0x8963 = 0x5C78
-0x896B = 0x5C79
-0x896E = 0x5C7A
-0x8970 = 0x5C7B
-0x8973 = 0x5C7C
-0x8975 = 0x5C7D
-0x897A = 0x5C7E
-0x897B = 0x5D21
-0x897C = 0x5D22
-0x897D = 0x5D23
-0x8989 = 0x5D24
-0x898D = 0x5D25
-0x8990 = 0x5D26
-0x8994 = 0x5D27
-0x8995 = 0x5D28
-0x899B = 0x5D29
-0x899C = 0x5D2A
-0x899F = 0x5D2B
-0x89A0 = 0x5D2C
-0x89A5 = 0x5D2D
-0x89B0 = 0x5D2E
-0x89B4 = 0x5D2F
-0x89B5 = 0x5D30
-0x89B6 = 0x5D31
-0x89B7 = 0x5D32
-0x89BC = 0x5D33
-0x89D4 = 0x5D34
-0x89D5 = 0x5D35
-0x89D6 = 0x5D36
-0x89D7 = 0x5D37
-0x89D8 = 0x5D38
-0x89E5 = 0x5D39
-0x89E9 = 0x5D3A
-0x89EB = 0x5D3B
-0x89ED = 0x5D3C
-0x89F1 = 0x5D3D
-0x89F3 = 0x5D3E
-0x89F6 = 0x5D3F
-0x89F9 = 0x5D40
-0x89FD = 0x5D41
-0x89FF = 0x5D42
-0x8A04 = 0x5D43
-0x8A05 = 0x5D44
-0x8A07 = 0x5D45
-0x8A0F = 0x5D46
-0x8A11 = 0x5D47
-0x8A12 = 0x5D48
-0x8A14 = 0x5D49
-0x8A15 = 0x5D4A
-0x8A1E = 0x5D4B
-0x8A20 = 0x5D4C
-0x8A22 = 0x5D4D
-0x8A24 = 0x5D4E
-0x8A26 = 0x5D4F
-0x8A2B = 0x5D50
-0x8A2C = 0x5D51
-0x8A2F = 0x5D52
-0x8A35 = 0x5D53
-0x8A37 = 0x5D54
-0x8A3D = 0x5D55
-0x8A3E = 0x5D56
-0x8A40 = 0x5D57
-0x8A43 = 0x5D58
-0x8A45 = 0x5D59
-0x8A47 = 0x5D5A
-0x8A49 = 0x5D5B
-0x8A4D = 0x5D5C
-0x8A4E = 0x5D5D
-0x8A53 = 0x5D5E
-0x8A56 = 0x5D5F
-0x8A57 = 0x5D60
-0x8A58 = 0x5D61
-0x8A5C = 0x5D62
-0x8A5D = 0x5D63
-0x8A61 = 0x5D64
-0x8A65 = 0x5D65
-0x8A67 = 0x5D66
-0x8A75 = 0x5D67
-0x8A76 = 0x5D68
-0x8A77 = 0x5D69
-0x8A79 = 0x5D6A
-0x8A7A = 0x5D6B
-0x8A7B = 0x5D6C
-0x8A7E = 0x5D6D
-0x8A7F = 0x5D6E
-0x8A80 = 0x5D6F
-0x8A83 = 0x5D70
-0x8A86 = 0x5D71
-0x8A8B = 0x5D72
-0x8A8F = 0x5D73
-0x8A90 = 0x5D74
-0x8A92 = 0x5D75
-0x8A96 = 0x5D76
-0x8A97 = 0x5D77
-0x8A99 = 0x5D78
-0x8A9F = 0x5D79
-0x8AA7 = 0x5D7A
-0x8AA9 = 0x5D7B
-0x8AAE = 0x5D7C
-0x8AAF = 0x5D7D
-0x8AB3 = 0x5D7E
-0x8AB6 = 0x5E21
-0x8AB7 = 0x5E22
-0x8ABB = 0x5E23
-0x8ABE = 0x5E24
-0x8AC3 = 0x5E25
-0x8AC6 = 0x5E26
-0x8AC8 = 0x5E27
-0x8AC9 = 0x5E28
-0x8ACA = 0x5E29
-0x8AD1 = 0x5E2A
-0x8AD3 = 0x5E2B
-0x8AD4 = 0x5E2C
-0x8AD5 = 0x5E2D
-0x8AD7 = 0x5E2E
-0x8ADD = 0x5E2F
-0x8ADF = 0x5E30
-0x8AEC = 0x5E31
-0x8AF0 = 0x5E32
-0x8AF4 = 0x5E33
-0x8AF5 = 0x5E34
-0x8AF6 = 0x5E35
-0x8AFC = 0x5E36
-0x8AFF = 0x5E37
-0x8B05 = 0x5E38
-0x8B06 = 0x5E39
-0x8B0A = 0x5E3F
-0x8B0B = 0x5E3A
-0x8B11 = 0x5E3B
-0x8B1C = 0x5E3C
-0x8B1E = 0x5E3D
-0x8B1F = 0x5E3E
-0x8B2D = 0x5E40
-0x8B30 = 0x5E41
-0x8B37 = 0x5E42
-0x8B3C = 0x5E43
-0x8B42 = 0x5E44
-0x8B43 = 0x5E45
-0x8B44 = 0x5E46
-0x8B45 = 0x5E47
-0x8B46 = 0x5E48
-0x8B48 = 0x5E49
-0x8B4D = 0x5E4E
-0x8B52 = 0x5E4A
-0x8B53 = 0x5E4B
-0x8B54 = 0x5E4C
-0x8B59 = 0x5E4D
-0x8B5E = 0x5E4F
-0x8B63 = 0x5E50
-0x8B6D = 0x5E51
-0x8B76 = 0x5E52
-0x8B78 = 0x5E53
-0x8B79 = 0x5E54
-0x8B7C = 0x5E55
-0x8B7E = 0x5E56
-0x8B81 = 0x5E57
-0x8B84 = 0x5E58
-0x8B85 = 0x5E59
-0x8B8B = 0x5E5A
-0x8B8D = 0x5E5B
-0x8B8F = 0x5E5C
-0x8B94 = 0x5E5D
-0x8B95 = 0x5E5E
-0x8B9C = 0x5E5F
-0x8B9E = 0x5E60
-0x8B9F = 0x5E61
-0x8C38 = 0x5E62
-0x8C39 = 0x5E63
-0x8C3D = 0x5E64
-0x8C3E = 0x5E65
-0x8C45 = 0x5E66
-0x8C47 = 0x5E67
-0x8C49 = 0x5E68
-0x8C4B = 0x5E69
-0x8C4F = 0x5E6A
-0x8C51 = 0x5E6B
-0x8C53 = 0x5E6C
-0x8C54 = 0x5E6D
-0x8C57 = 0x5E6E
-0x8C58 = 0x5E6F
-0x8C59 = 0x5E72
-0x8C5B = 0x5E70
-0x8C5D = 0x5E71
-0x8C63 = 0x5E73
-0x8C64 = 0x5E74
-0x8C66 = 0x5E75
-0x8C68 = 0x5E76
-0x8C69 = 0x5E77
-0x8C6D = 0x5E78
-0x8C73 = 0x5E79
-0x8C75 = 0x5E7A
-0x8C76 = 0x5E7B
-0x8C7B = 0x5E7C
-0x8C7E = 0x5E7D
-0x8C86 = 0x5E7E
-0x8C87 = 0x5F21
-0x8C8B = 0x5F22
-0x8C90 = 0x5F23
-0x8C92 = 0x5F24
-0x8C93 = 0x5F25
-0x8C99 = 0x5F26
-0x8C9B = 0x5F27
-0x8C9C = 0x5F28
-0x8CA4 = 0x5F29
-0x8CB9 = 0x5F2A
-0x8CBA = 0x5F2B
-0x8CC5 = 0x5F2C
-0x8CC6 = 0x5F2D
-0x8CC9 = 0x5F2E
-0x8CCB = 0x5F2F
-0x8CCF = 0x5F30
-0x8CD5 = 0x5F32
-0x8CD6 = 0x5F31
-0x8CD9 = 0x5F33
-0x8CDD = 0x5F34
-0x8CE1 = 0x5F35
-0x8CE8 = 0x5F36
-0x8CEC = 0x5F37
-0x8CEF = 0x5F38
-0x8CF0 = 0x5F39
-0x8CF2 = 0x5F3A
-0x8CF5 = 0x5F3B
-0x8CF7 = 0x5F3C
-0x8CF8 = 0x5F3D
-0x8CFE = 0x5F3E
-0x8CFF = 0x5F3F
-0x8D01 = 0x5F40
-0x8D03 = 0x5F41
-0x8D09 = 0x5F42
-0x8D12 = 0x5F43
-0x8D17 = 0x5F44
-0x8D1B = 0x5F45
-0x8D65 = 0x5F46
-0x8D69 = 0x5F47
-0x8D6C = 0x5F48
-0x8D6E = 0x5F49
-0x8D7F = 0x5F4A
-0x8D82 = 0x5F4B
-0x8D84 = 0x5F4C
-0x8D88 = 0x5F4D
-0x8D8D = 0x5F4E
-0x8D90 = 0x5F4F
-0x8D91 = 0x5F50
-0x8D95 = 0x5F51
-0x8D9E = 0x5F52
-0x8D9F = 0x5F53
-0x8DA0 = 0x5F54
-0x8DA6 = 0x5F55
-0x8DAB = 0x5F56
-0x8DAC = 0x5F57
-0x8DAF = 0x5F58
-0x8DB2 = 0x5F59
-0x8DB5 = 0x5F5A
-0x8DB7 = 0x5F5B
-0x8DB9 = 0x5F5C
-0x8DBB = 0x5F5D
-0x8DBC = 0x5F6F
-0x8DC0 = 0x5F5E
-0x8DC5 = 0x5F5F
-0x8DC6 = 0x5F60
-0x8DC7 = 0x5F61
-0x8DC8 = 0x5F62
-0x8DCA = 0x5F63
-0x8DCE = 0x5F64
-0x8DD1 = 0x5F65
-0x8DD4 = 0x5F66
-0x8DD5 = 0x5F67
-0x8DD7 = 0x5F68
-0x8DD9 = 0x5F69
-0x8DE4 = 0x5F6A
-0x8DE5 = 0x5F6B
-0x8DE7 = 0x5F6C
-0x8DEC = 0x5F6D
-0x8DF0 = 0x5F6E
-0x8DF1 = 0x5F70
-0x8DF2 = 0x5F71
-0x8DF4 = 0x5F72
-0x8DFD = 0x5F73
-0x8E01 = 0x5F74
-0x8E04 = 0x5F75
-0x8E05 = 0x5F76
-0x8E06 = 0x5F77
-0x8E0B = 0x5F78
-0x8E11 = 0x5F79
-0x8E14 = 0x5F7A
-0x8E16 = 0x5F7B
-0x8E20 = 0x5F7C
-0x8E21 = 0x5F7D
-0x8E22 = 0x5F7E
-0x8E23 = 0x6021
-0x8E26 = 0x6022
-0x8E27 = 0x6023
-0x8E31 = 0x6024
-0x8E33 = 0x6025
-0x8E36 = 0x6026
-0x8E37 = 0x6027
-0x8E38 = 0x6028
-0x8E39 = 0x6029
-0x8E3D = 0x602A
-0x8E40 = 0x602B
-0x8E41 = 0x602C
-0x8E4B = 0x602D
-0x8E4D = 0x602E
-0x8E4E = 0x602F
-0x8E4F = 0x6030
-0x8E54 = 0x6031
-0x8E5B = 0x6032
-0x8E5C = 0x6033
-0x8E5D = 0x6034
-0x8E5E = 0x6035
-0x8E61 = 0x6036
-0x8E62 = 0x6037
-0x8E69 = 0x6038
-0x8E6C = 0x6039
-0x8E6D = 0x603A
-0x8E6F = 0x603B
-0x8E70 = 0x603C
-0x8E71 = 0x603D
-0x8E79 = 0x603E
-0x8E7A = 0x603F
-0x8E7B = 0x6040
-0x8E82 = 0x6041
-0x8E83 = 0x6042
-0x8E89 = 0x6043
-0x8E90 = 0x6044
-0x8E92 = 0x6045
-0x8E95 = 0x6046
-0x8E9A = 0x6047
-0x8E9B = 0x6048
-0x8E9D = 0x6049
-0x8E9E = 0x604A
-0x8EA2 = 0x604B
-0x8EA7 = 0x604C
-0x8EA9 = 0x604D
-0x8EAD = 0x604E
-0x8EAE = 0x604F
-0x8EB3 = 0x6050
-0x8EB5 = 0x6051
-0x8EBA = 0x6052
-0x8EBB = 0x6053
-0x8EC0 = 0x6054
-0x8EC1 = 0x6055
-0x8EC3 = 0x6056
-0x8EC4 = 0x6057
-0x8EC7 = 0x6058
-0x8ECF = 0x6059
-0x8ED1 = 0x605A
-0x8ED4 = 0x605B
-0x8EDC = 0x605C
-0x8EE8 = 0x605D
-0x8EED = 0x6064
-0x8EEE = 0x605E
-0x8EF0 = 0x605F
-0x8EF1 = 0x6060
-0x8EF7 = 0x6061
-0x8EF9 = 0x6062
-0x8EFA = 0x6063
-0x8F00 = 0x6065
-0x8F02 = 0x6066
-0x8F07 = 0x6067
-0x8F08 = 0x6068
-0x8F0F = 0x6069
-0x8F10 = 0x606A
-0x8F16 = 0x606B
-0x8F17 = 0x606C
-0x8F18 = 0x606D
-0x8F1E = 0x606E
-0x8F20 = 0x606F
-0x8F21 = 0x6070
-0x8F23 = 0x6071
-0x8F25 = 0x6072
-0x8F27 = 0x6073
-0x8F28 = 0x6074
-0x8F2C = 0x6075
-0x8F2D = 0x6076
-0x8F2E = 0x6077
-0x8F34 = 0x6078
-0x8F35 = 0x6079
-0x8F36 = 0x607A
-0x8F37 = 0x607B
-0x8F3A = 0x607C
-0x8F40 = 0x607D
-0x8F41 = 0x607E
-0x8F43 = 0x6121
-0x8F47 = 0x6122
-0x8F4F = 0x6123
-0x8F51 = 0x6124
-0x8F52 = 0x6125
-0x8F53 = 0x6126
-0x8F54 = 0x6127
-0x8F55 = 0x6128
-0x8F58 = 0x6129
-0x8F5D = 0x612A
-0x8F5E = 0x612B
-0x8F65 = 0x612C
-0x8F9D = 0x612D
-0x8FA0 = 0x612E
-0x8FA1 = 0x612F
-0x8FA4 = 0x6130
-0x8FA5 = 0x6131
-0x8FA6 = 0x6132
-0x8FB5 = 0x6133
-0x8FB6 = 0x6134
-0x8FB8 = 0x6135
-0x8FBE = 0x6136
-0x8FC0 = 0x6137
-0x8FC1 = 0x6138
-0x8FC6 = 0x6139
-0x8FCA = 0x613A
-0x8FCB = 0x613B
-0x8FCD = 0x613C
-0x8FD0 = 0x613D
-0x8FD2 = 0x613E
-0x8FD3 = 0x613F
-0x8FD5 = 0x6140
-0x8FE0 = 0x6141
-0x8FE3 = 0x6142
-0x8FE4 = 0x6143
-0x8FE8 = 0x6144
-0x8FEE = 0x6145
-0x8FF1 = 0x6146
-0x8FF5 = 0x6147
-0x8FF6 = 0x6148
-0x8FFB = 0x6149
-0x8FFE = 0x614A
-0x9002 = 0x614B
-0x9004 = 0x614C
-0x9008 = 0x614D
-0x900C = 0x614E
-0x9018 = 0x614F
-0x901B = 0x6150
-0x9028 = 0x6151
-0x9029 = 0x6152
-0x902A = 0x6154
-0x902C = 0x6155
-0x902D = 0x6156
-0x902F = 0x6153
-0x9033 = 0x6157
-0x9034 = 0x6158
-0x9037 = 0x6159
-0x903F = 0x615A
-0x9043 = 0x615B
-0x9044 = 0x615C
-0x904C = 0x615D
-0x905B = 0x615E
-0x905D = 0x615F
-0x9062 = 0x6160
-0x9066 = 0x6161
-0x9067 = 0x6162
-0x906C = 0x6163
-0x9070 = 0x6164
-0x9074 = 0x6165
-0x9079 = 0x6166
-0x9085 = 0x6167
-0x9088 = 0x6168
-0x908B = 0x6169
-0x908C = 0x616A
-0x908E = 0x616B
-0x9090 = 0x616C
-0x9095 = 0x616D
-0x9097 = 0x616E
-0x9098 = 0x616F
-0x9099 = 0x6170
-0x909B = 0x6171
-0x90A0 = 0x6172
-0x90A1 = 0x6173
-0x90A2 = 0x6174
-0x90A5 = 0x6175
-0x90B0 = 0x6176
-0x90B2 = 0x6177
-0x90B3 = 0x6178
-0x90B4 = 0x6179
-0x90B6 = 0x617A
-0x90BD = 0x617B
-0x90BE = 0x617D
-0x90C3 = 0x617E
-0x90C4 = 0x6221
-0x90C5 = 0x6222
-0x90C7 = 0x6223
-0x90C8 = 0x6224
-0x90CC = 0x617C
-0x90D2 = 0x622D
-0x90D5 = 0x6225
-0x90D7 = 0x6226
-0x90D8 = 0x6227
-0x90D9 = 0x6228
-0x90DC = 0x6229
-0x90DD = 0x622A
-0x90DF = 0x622B
-0x90E5 = 0x622C
-0x90EB = 0x622F
-0x90EF = 0x6230
-0x90F0 = 0x6231
-0x90F4 = 0x6232
-0x90F6 = 0x622E
-0x90FE = 0x6233
-0x90FF = 0x6234
-0x9100 = 0x6235
-0x9104 = 0x6236
-0x9105 = 0x6237
-0x9106 = 0x6238
-0x9108 = 0x6239
-0x910D = 0x623A
-0x9110 = 0x623B
-0x9114 = 0x623C
-0x9116 = 0x623D
-0x9117 = 0x623E
-0x9118 = 0x623F
-0x911A = 0x6240
-0x911C = 0x6241
-0x911E = 0x6242
-0x9120 = 0x6243
-0x9122 = 0x6245
-0x9123 = 0x6246
-0x9125 = 0x6244
-0x9127 = 0x6247
-0x9129 = 0x6248
-0x912E = 0x6249
-0x912F = 0x624A
-0x9131 = 0x624B
-0x9134 = 0x624C
-0x9136 = 0x624D
-0x9137 = 0x624E
-0x9139 = 0x624F
-0x913A = 0x6250
-0x913C = 0x6251
-0x913D = 0x6252
-0x9143 = 0x6253
-0x9147 = 0x6254
-0x9148 = 0x6255
-0x914F = 0x6256
-0x9153 = 0x6257
-0x9157 = 0x6258
-0x9159 = 0x6259
-0x915A = 0x625A
-0x915B = 0x625B
-0x9161 = 0x625C
-0x9164 = 0x625D
-0x9167 = 0x625E
-0x916D = 0x625F
-0x9174 = 0x6260
-0x9179 = 0x6261
-0x917A = 0x6262
-0x917B = 0x6263
-0x9181 = 0x6264
-0x9183 = 0x6265
-0x9185 = 0x6266
-0x9186 = 0x6267
-0x918A = 0x6268
-0x918E = 0x6269
-0x9191 = 0x626A
-0x9193 = 0x626B
-0x9194 = 0x626C
-0x9195 = 0x626D
-0x9198 = 0x626E
-0x919E = 0x626F
-0x91A1 = 0x6270
-0x91A6 = 0x6271
-0x91A8 = 0x6272
-0x91AC = 0x6273
-0x91AD = 0x6274
-0x91AE = 0x6275
-0x91B0 = 0x6276
-0x91B1 = 0x6277
-0x91B2 = 0x6278
-0x91B3 = 0x6279
-0x91B6 = 0x627A
-0x91BB = 0x627B
-0x91BC = 0x627C
-0x91BD = 0x627D
-0x91BF = 0x627E
-0x91C2 = 0x6321
-0x91C3 = 0x6322
-0x91C5 = 0x6323
-0x91D3 = 0x6324
-0x91D4 = 0x6325
-0x91D7 = 0x6326
-0x91D9 = 0x6327
-0x91DA = 0x6328
-0x91DE = 0x6329
-0x91E4 = 0x632A
-0x91E5 = 0x632B
-0x91E9 = 0x632C
-0x91EA = 0x632D
-0x91EC = 0x632E
-0x91ED = 0x632F
-0x91EE = 0x6330
-0x91EF = 0x6331
-0x91F0 = 0x6332
-0x91F1 = 0x6333
-0x91F7 = 0x6334
-0x91F9 = 0x6335
-0x91FB = 0x6336
-0x91FD = 0x6337
-0x9200 = 0x6338
-0x9201 = 0x6339
-0x9204 = 0x633A
-0x9205 = 0x633B
-0x9206 = 0x633C
-0x9207 = 0x633D
-0x9209 = 0x633E
-0x920A = 0x633F
-0x920C = 0x6340
-0x9210 = 0x6341
-0x9212 = 0x6342
-0x9213 = 0x6343
-0x9216 = 0x6344
-0x9218 = 0x6345
-0x921C = 0x6346
-0x921D = 0x6347
-0x9223 = 0x6348
-0x9224 = 0x6349
-0x9225 = 0x634A
-0x9226 = 0x634B
-0x9228 = 0x634C
-0x922E = 0x634D
-0x922F = 0x634E
-0x9230 = 0x634F
-0x9233 = 0x6350
-0x9235 = 0x6351
-0x9236 = 0x6352
-0x9238 = 0x6353
-0x9239 = 0x6354
-0x923A = 0x6355
-0x923C = 0x6356
-0x923E = 0x6357
-0x9240 = 0x6358
-0x9242 = 0x6359
-0x9243 = 0x635A
-0x9246 = 0x635B
-0x9247 = 0x635C
-0x924A = 0x635D
-0x924D = 0x635E
-0x924E = 0x635F
-0x924F = 0x6360
-0x9251 = 0x6361
-0x9258 = 0x6362
-0x9259 = 0x6363
-0x925C = 0x6364
-0x925D = 0x6365
-0x9260 = 0x6366
-0x9261 = 0x6367
-0x9265 = 0x6368
-0x9267 = 0x6369
-0x9268 = 0x636A
-0x9269 = 0x636B
-0x926E = 0x636C
-0x926F = 0x636D
-0x9270 = 0x636E
-0x9275 = 0x636F
-0x9276 = 0x6370
-0x9277 = 0x6371
-0x9278 = 0x6372
-0x9279 = 0x6373
-0x927B = 0x6374
-0x927C = 0x6375
-0x927D = 0x6376
-0x927F = 0x6377
-0x9288 = 0x6378
-0x9289 = 0x6379
-0x928A = 0x637A
-0x928D = 0x637B
-0x928E = 0x637C
-0x9292 = 0x637D
-0x9297 = 0x637E
-0x9299 = 0x6421
-0x929F = 0x6422
-0x92A0 = 0x6423
-0x92A4 = 0x6424
-0x92A5 = 0x6425
-0x92A7 = 0x6426
-0x92A8 = 0x6427
-0x92AB = 0x6428
-0x92AF = 0x6429
-0x92B2 = 0x642A
-0x92B6 = 0x642B
-0x92B8 = 0x642C
-0x92BA = 0x642D
-0x92BB = 0x642E
-0x92BC = 0x642F
-0x92BD = 0x6430
-0x92BF = 0x6431
-0x92C0 = 0x6432
-0x92C1 = 0x6433
-0x92C2 = 0x6434
-0x92C3 = 0x6435
-0x92C5 = 0x6436
-0x92C6 = 0x6437
-0x92C7 = 0x6438
-0x92C8 = 0x6439
-0x92CB = 0x643A
-0x92CC = 0x643B
-0x92CD = 0x643C
-0x92CE = 0x643D
-0x92D0 = 0x643E
-0x92D3 = 0x643F
-0x92D5 = 0x6440
-0x92D7 = 0x6441
-0x92D8 = 0x6442
-0x92D9 = 0x6443
-0x92DC = 0x6444
-0x92DD = 0x6445
-0x92DF = 0x6446
-0x92E0 = 0x6447
-0x92E1 = 0x6448
-0x92E3 = 0x6449
-0x92E5 = 0x644A
-0x92E7 = 0x644B
-0x92E8 = 0x644C
-0x92EC = 0x644D
-0x92EE = 0x644E
-0x92F0 = 0x644F
-0x92F9 = 0x6450
-0x92FB = 0x6451
-0x92FF = 0x6452
-0x9300 = 0x6453
-0x9302 = 0x6454
-0x9308 = 0x6455
-0x930D = 0x6456
-0x9311 = 0x6457
-0x9314 = 0x6458
-0x9315 = 0x6459
-0x931C = 0x645A
-0x931D = 0x645B
-0x931E = 0x645C
-0x931F = 0x645D
-0x9321 = 0x645E
-0x9324 = 0x645F
-0x9325 = 0x6460
-0x9327 = 0x6461
-0x9329 = 0x6462
-0x932A = 0x6463
-0x9333 = 0x6464
-0x9334 = 0x6465
-0x9336 = 0x6466
-0x9337 = 0x6467
-0x9347 = 0x6468
-0x9348 = 0x6469
-0x9349 = 0x646A
-0x9350 = 0x646B
-0x9351 = 0x646C
-0x9352 = 0x646D
-0x9355 = 0x646E
-0x9357 = 0x646F
-0x9358 = 0x6470
-0x935A = 0x6471
-0x935E = 0x6472
-0x9364 = 0x6473
-0x9365 = 0x6474
-0x9367 = 0x6475
-0x9369 = 0x6476
-0x936A = 0x6477
-0x936D = 0x6478
-0x936F = 0x6479
-0x9370 = 0x647A
-0x9371 = 0x647B
-0x9373 = 0x647C
-0x9374 = 0x647D
-0x9376 = 0x647E
-0x937A = 0x6521
-0x937D = 0x6522
-0x937F = 0x6523
-0x9380 = 0x6524
-0x9381 = 0x6525
-0x9382 = 0x6526
-0x9388 = 0x6527
-0x938A = 0x6528
-0x938B = 0x6529
-0x938D = 0x652A
-0x938F = 0x652B
-0x9392 = 0x652C
-0x9395 = 0x652D
-0x9398 = 0x652E
-0x939B = 0x652F
-0x939E = 0x6530
-0x93A1 = 0x6531
-0x93A3 = 0x6532
-0x93A4 = 0x6533
-0x93A6 = 0x6534
-0x93A8 = 0x6535
-0x93A9 = 0x653B
-0x93AB = 0x6536
-0x93B4 = 0x6537
-0x93B5 = 0x6538
-0x93B6 = 0x6539
-0x93BA = 0x653A
-0x93C1 = 0x653C
-0x93C4 = 0x653D
-0x93C5 = 0x653E
-0x93C6 = 0x653F
-0x93C7 = 0x6540
-0x93C9 = 0x6541
-0x93CA = 0x6542
-0x93CB = 0x6543
-0x93CC = 0x6544
-0x93CD = 0x6545
-0x93D3 = 0x6546
-0x93D9 = 0x6547
-0x93DC = 0x6548
-0x93DE = 0x6549
-0x93DF = 0x654A
-0x93E2 = 0x654B
-0x93E6 = 0x654C
-0x93E7 = 0x654D
-0x93F7 = 0x654F
-0x93F8 = 0x6550
-0x93F9 = 0x654E
-0x93FA = 0x6551
-0x93FB = 0x6552
-0x93FD = 0x6553
-0x9401 = 0x6554
-0x9402 = 0x6555
-0x9404 = 0x6556
-0x9408 = 0x6557
-0x9409 = 0x6558
-0x940D = 0x6559
-0x940E = 0x655A
-0x940F = 0x655B
-0x9415 = 0x655C
-0x9416 = 0x655D
-0x9417 = 0x655E
-0x941F = 0x655F
-0x942E = 0x6560
-0x942F = 0x6561
-0x9431 = 0x6562
-0x9432 = 0x6563
-0x9433 = 0x6564
-0x9434 = 0x6565
-0x943B = 0x6566
-0x943D = 0x6568
-0x943F = 0x6567
-0x9443 = 0x6569
-0x9445 = 0x656A
-0x9448 = 0x656B
-0x944A = 0x656C
-0x944C = 0x656D
-0x9455 = 0x656E
-0x9459 = 0x656F
-0x945C = 0x6570
-0x945F = 0x6571
-0x9461 = 0x6572
-0x9463 = 0x6573
-0x9468 = 0x6574
-0x946B = 0x6575
-0x946D = 0x6576
-0x946E = 0x6577
-0x946F = 0x6578
-0x9471 = 0x6579
-0x9472 = 0x657A
-0x9483 = 0x657C
-0x9484 = 0x657B
-0x9578 = 0x657D
-0x9579 = 0x657E
-0x957E = 0x6621
-0x9584 = 0x6622
-0x9588 = 0x6623
-0x958C = 0x6624
-0x958D = 0x6625
-0x958E = 0x6626
-0x959D = 0x6627
-0x959E = 0x6628
-0x959F = 0x6629
-0x95A1 = 0x662A
-0x95A6 = 0x662B
-0x95A9 = 0x662C
-0x95AB = 0x662D
-0x95AC = 0x662E
-0x95B4 = 0x662F
-0x95B6 = 0x6630
-0x95BA = 0x6631
-0x95BD = 0x6632
-0x95BF = 0x6633
-0x95C6 = 0x6634
-0x95C8 = 0x6635
-0x95C9 = 0x6636
-0x95CB = 0x6637
-0x95D0 = 0x6638
-0x95D1 = 0x6639
-0x95D2 = 0x663A
-0x95D3 = 0x663B
-0x95D9 = 0x663C
-0x95DA = 0x663D
-0x95DD = 0x663E
-0x95DE = 0x663F
-0x95DF = 0x6640
-0x95E0 = 0x6641
-0x95E4 = 0x6642
-0x95E6 = 0x6643
-0x961D = 0x6644
-0x961E = 0x6645
-0x9622 = 0x6646
-0x9624 = 0x6647
-0x9625 = 0x6648
-0x9626 = 0x6649
-0x962C = 0x664A
-0x9631 = 0x664B
-0x9633 = 0x664C
-0x9637 = 0x664D
-0x9638 = 0x664E
-0x9639 = 0x664F
-0x963A = 0x6650
-0x963C = 0x6651
-0x963D = 0x6652
-0x9641 = 0x6653
-0x9652 = 0x6654
-0x9654 = 0x6655
-0x9656 = 0x6656
-0x9657 = 0x6657
-0x9658 = 0x6658
-0x9661 = 0x6659
-0x966E = 0x665A
-0x9674 = 0x665B
-0x967B = 0x665C
-0x967C = 0x665D
-0x967E = 0x665E
-0x967F = 0x665F
-0x9681 = 0x6660
-0x9682 = 0x6661
-0x9683 = 0x6662
-0x9684 = 0x6663
-0x9689 = 0x6664
-0x9691 = 0x6665
-0x9696 = 0x6666
-0x969A = 0x6667
-0x969D = 0x6668
-0x969F = 0x6669
-0x96A4 = 0x666A
-0x96A5 = 0x666B
-0x96A6 = 0x666C
-0x96A9 = 0x666D
-0x96AE = 0x666E
-0x96AF = 0x666F
-0x96B3 = 0x6670
-0x96BA = 0x6671
-0x96CA = 0x6672
-0x96D2 = 0x6673
-0x96D8 = 0x6675
-0x96DA = 0x6676
-0x96DD = 0x6677
-0x96DE = 0x6678
-0x96DF = 0x6679
-0x96E9 = 0x667A
-0x96EF = 0x667B
-0x96F1 = 0x667C
-0x96FA = 0x667D
-0x9702 = 0x667E
-0x9703 = 0x6721
-0x9705 = 0x6722
-0x9709 = 0x6723
-0x971A = 0x6724
-0x971B = 0x6725
-0x971D = 0x6726
-0x9721 = 0x6727
-0x9722 = 0x6728
-0x9723 = 0x6729
-0x9728 = 0x672A
-0x9731 = 0x672B
-0x9733 = 0x672C
-0x9741 = 0x672D
-0x9743 = 0x672E
-0x974A = 0x672F
-0x974E = 0x6730
-0x974F = 0x6731
-0x9755 = 0x6732
-0x9757 = 0x6733
-0x9758 = 0x6734
-0x975A = 0x6735
-0x975B = 0x6736
-0x9763 = 0x6737
-0x9767 = 0x6738
-0x976A = 0x6739
-0x976E = 0x673A
-0x9773 = 0x673B
-0x9776 = 0x673C
-0x9777 = 0x673D
-0x9778 = 0x673E
-0x977B = 0x673F
-0x977D = 0x6740
-0x977F = 0x6741
-0x9780 = 0x6742
-0x9789 = 0x6743
-0x9795 = 0x6744
-0x9796 = 0x6745
-0x9797 = 0x6746
-0x9799 = 0x6747
-0x979A = 0x6748
-0x979E = 0x6749
-0x979F = 0x674A
-0x97A2 = 0x674B
-0x97AC = 0x674C
-0x97AE = 0x674D
-0x97B1 = 0x674E
-0x97B2 = 0x674F
-0x97B5 = 0x6750
-0x97B6 = 0x6751
-0x97B8 = 0x6752
-0x97B9 = 0x6753
-0x97BA = 0x6754
-0x97BC = 0x6755
-0x97BE = 0x6756
-0x97BF = 0x6757
-0x97C1 = 0x6758
-0x97C4 = 0x6759
-0x97C5 = 0x675A
-0x97C7 = 0x675B
-0x97C9 = 0x675C
-0x97CA = 0x675D
-0x97CC = 0x675E
-0x97CD = 0x675F
-0x97CE = 0x6760
-0x97D0 = 0x6761
-0x97D1 = 0x6762
-0x97D4 = 0x6763
-0x97D7 = 0x6764
-0x97D8 = 0x6765
-0x97D9 = 0x6766
-0x97DB = 0x676A
-0x97DD = 0x6767
-0x97DE = 0x6768
-0x97E0 = 0x6769
-0x97E1 = 0x676B
-0x97E4 = 0x676C
-0x97EF = 0x676D
-0x97F1 = 0x676E
-0x97F4 = 0x676F
-0x97F7 = 0x6770
-0x97F8 = 0x6771
-0x97FA = 0x6772
-0x9807 = 0x6773
-0x980A = 0x6774
-0x980D = 0x6776
-0x980E = 0x6777
-0x9814 = 0x6778
-0x9816 = 0x6779
-0x9819 = 0x6775
-0x981C = 0x677A
-0x981E = 0x677B
-0x9820 = 0x677C
-0x9823 = 0x677D
-0x9825 = 0x6828
-0x9826 = 0x677E
-0x982B = 0x6821
-0x982E = 0x6822
-0x982F = 0x6823
-0x9830 = 0x6824
-0x9832 = 0x6825
-0x9833 = 0x6826
-0x9835 = 0x6827
-0x983E = 0x6829
-0x9844 = 0x682A
-0x9847 = 0x682B
-0x984A = 0x682C
-0x9851 = 0x682D
-0x9852 = 0x682E
-0x9853 = 0x682F
-0x9856 = 0x6830
-0x9857 = 0x6831
-0x9859 = 0x6832
-0x985A = 0x6833
-0x9862 = 0x6834
-0x9863 = 0x6835
-0x9865 = 0x6836
-0x9866 = 0x6837
-0x986A = 0x6838
-0x986C = 0x6839
-0x98AB = 0x683A
-0x98AD = 0x683B
-0x98AE = 0x683C
-0x98B0 = 0x683D
-0x98B4 = 0x683E
-0x98B7 = 0x683F
-0x98B8 = 0x6840
-0x98BA = 0x6841
-0x98BB = 0x6842
-0x98BF = 0x6843
-0x98C2 = 0x6844
-0x98C5 = 0x6845
-0x98C8 = 0x6846
-0x98CC = 0x6847
-0x98E1 = 0x6848
-0x98E3 = 0x6849
-0x98E5 = 0x684A
-0x98E6 = 0x684B
-0x98E7 = 0x684C
-0x98EA = 0x684D
-0x98F3 = 0x684E
-0x98F6 = 0x684F
-0x9902 = 0x6850
-0x9907 = 0x6851
-0x9908 = 0x6852
-0x9911 = 0x6853
-0x9915 = 0x6854
-0x9916 = 0x6855
-0x9917 = 0x6856
-0x991A = 0x6857
-0x991B = 0x6858
-0x991C = 0x6859
-0x991F = 0x685A
-0x9922 = 0x685B
-0x9926 = 0x685C
-0x9927 = 0x685D
-0x992B = 0x685E
-0x9931 = 0x685F
-0x9932 = 0x6860
-0x9933 = 0x6861
-0x9934 = 0x6862
-0x9935 = 0x6863
-0x9939 = 0x6864
-0x993A = 0x6865
-0x993B = 0x6866
-0x993C = 0x6867
-0x9940 = 0x6868
-0x9941 = 0x6869
-0x9946 = 0x686A
-0x9947 = 0x686B
-0x9948 = 0x686C
-0x994D = 0x686D
-0x994E = 0x686E
-0x9954 = 0x686F
-0x9958 = 0x6870
-0x9959 = 0x6871
-0x995B = 0x6872
-0x995C = 0x6873
-0x995E = 0x6874
-0x995F = 0x6875
-0x9960 = 0x6876
-0x999B = 0x6877
-0x999D = 0x6878
-0x999F = 0x6879
-0x99A6 = 0x687A
-0x99B0 = 0x687B
-0x99B1 = 0x687C
-0x99B2 = 0x687D
-0x99B5 = 0x687E
-0x99B9 = 0x6921
-0x99BA = 0x6922
-0x99BD = 0x6923
-0x99BF = 0x6924
-0x99C3 = 0x6925
-0x99C9 = 0x6926
-0x99D3 = 0x6927
-0x99D4 = 0x6928
-0x99D9 = 0x6929
-0x99DA = 0x692A
-0x99DC = 0x692B
-0x99DE = 0x692C
-0x99E7 = 0x692D
-0x99EA = 0x692E
-0x99EB = 0x692F
-0x99EC = 0x6930
-0x99F0 = 0x6931
-0x99F4 = 0x6932
-0x99F5 = 0x6933
-0x99F9 = 0x6934
-0x99FD = 0x6935
-0x99FE = 0x6936
-0x9A02 = 0x6937
-0x9A03 = 0x6938
-0x9A04 = 0x6939
-0x9A0B = 0x693A
-0x9A0C = 0x693B
-0x9A10 = 0x693C
-0x9A11 = 0x693D
-0x9A16 = 0x693E
-0x9A1E = 0x693F
-0x9A20 = 0x6940
-0x9A22 = 0x6941
-0x9A23 = 0x6942
-0x9A24 = 0x6943
-0x9A27 = 0x6944
-0x9A2D = 0x6945
-0x9A2E = 0x6946
-0x9A33 = 0x6947
-0x9A35 = 0x6948
-0x9A36 = 0x6949
-0x9A38 = 0x694A
-0x9A41 = 0x694C
-0x9A44 = 0x694D
-0x9A47 = 0x694B
-0x9A4A = 0x694E
-0x9A4B = 0x694F
-0x9A4C = 0x6950
-0x9A4E = 0x6951
-0x9A51 = 0x6952
-0x9A54 = 0x6953
-0x9A56 = 0x6954
-0x9A5D = 0x6955
-0x9AAA = 0x6956
-0x9AAC = 0x6957
-0x9AAE = 0x6958
-0x9AAF = 0x6959
-0x9AB2 = 0x695A
-0x9AB4 = 0x695B
-0x9AB5 = 0x695C
-0x9AB6 = 0x695D
-0x9AB9 = 0x695E
-0x9ABB = 0x695F
-0x9ABE = 0x6960
-0x9ABF = 0x6961
-0x9AC1 = 0x6962
-0x9AC3 = 0x6963
-0x9AC6 = 0x6964
-0x9AC8 = 0x6965
-0x9ACE = 0x6966
-0x9AD0 = 0x6967
-0x9AD2 = 0x6968
-0x9AD5 = 0x6969
-0x9AD6 = 0x696A
-0x9AD7 = 0x696B
-0x9ADB = 0x696C
-0x9ADC = 0x696D
-0x9AE0 = 0x696E
-0x9AE4 = 0x696F
-0x9AE5 = 0x6970
-0x9AE7 = 0x6971
-0x9AE9 = 0x6972
-0x9AEC = 0x6973
-0x9AF2 = 0x6974
-0x9AF3 = 0x6975
-0x9AF5 = 0x6976
-0x9AF9 = 0x6977
-0x9AFA = 0x6978
-0x9AFD = 0x6979
-0x9AFF = 0x697A
-0x9B00 = 0x697B
-0x9B01 = 0x697C
-0x9B02 = 0x697D
-0x9B03 = 0x697E
-0x9B04 = 0x6A21
-0x9B05 = 0x6A22
-0x9B08 = 0x6A23
-0x9B09 = 0x6A24
-0x9B0B = 0x6A25
-0x9B0C = 0x6A26
-0x9B0D = 0x6A27
-0x9B0E = 0x6A28
-0x9B10 = 0x6A29
-0x9B12 = 0x6A2A
-0x9B16 = 0x6A2B
-0x9B19 = 0x6A2C
-0x9B1B = 0x6A2D
-0x9B1C = 0x6A2E
-0x9B20 = 0x6A2F
-0x9B26 = 0x6A30
-0x9B2B = 0x6A31
-0x9B2D = 0x6A32
-0x9B33 = 0x6A33
-0x9B34 = 0x6A34
-0x9B35 = 0x6A35
-0x9B37 = 0x6A36
-0x9B39 = 0x6A37
-0x9B3A = 0x6A38
-0x9B3D = 0x6A39
-0x9B48 = 0x6A3A
-0x9B4B = 0x6A3B
-0x9B4C = 0x6A3C
-0x9B55 = 0x6A3D
-0x9B56 = 0x6A3E
-0x9B57 = 0x6A3F
-0x9B5B = 0x6A40
-0x9B5E = 0x6A41
-0x9B61 = 0x6A42
-0x9B63 = 0x6A43
-0x9B65 = 0x6A44
-0x9B66 = 0x6A45
-0x9B68 = 0x6A46
-0x9B6A = 0x6A47
-0x9B6B = 0x6A48
-0x9B6C = 0x6A49
-0x9B6D = 0x6A4A
-0x9B6E = 0x6A4B
-0x9B73 = 0x6A4C
-0x9B75 = 0x6A4D
-0x9B77 = 0x6A4E
-0x9B78 = 0x6A4F
-0x9B79 = 0x6A50
-0x9B7F = 0x6A51
-0x9B80 = 0x6A52
-0x9B84 = 0x6A53
-0x9B85 = 0x6A54
-0x9B86 = 0x6A55
-0x9B87 = 0x6A56
-0x9B89 = 0x6A57
-0x9B8A = 0x6A58
-0x9B8B = 0x6A59
-0x9B8D = 0x6A5A
-0x9B8F = 0x6A5B
-0x9B90 = 0x6A5C
-0x9B94 = 0x6A5D
-0x9B9A = 0x6A5E
-0x9B9D = 0x6A5F
-0x9B9E = 0x6A60
-0x9BA6 = 0x6A61
-0x9BA7 = 0x6A62
-0x9BA9 = 0x6A63
-0x9BAC = 0x6A64
-0x9BB0 = 0x6A65
-0x9BB1 = 0x6A66
-0x9BB2 = 0x6A67
-0x9BB7 = 0x6A68
-0x9BB8 = 0x6A69
-0x9BBB = 0x6A6A
-0x9BBC = 0x6A6B
-0x9BBE = 0x6A6C
-0x9BBF = 0x6A6D
-0x9BC1 = 0x6A6E
-0x9BC7 = 0x6A6F
-0x9BC8 = 0x6A70
-0x9BCE = 0x6A71
-0x9BD0 = 0x6A72
-0x9BD7 = 0x6A73
-0x9BD8 = 0x6A74
-0x9BDD = 0x6A75
-0x9BDF = 0x6A76
-0x9BE5 = 0x6A77
-0x9BE7 = 0x6A78
-0x9BEA = 0x6A79
-0x9BEB = 0x6A7A
-0x9BEF = 0x6A7B
-0x9BF3 = 0x6A7C
-0x9BF7 = 0x6A7D
-0x9BF8 = 0x6A7E
-0x9BF9 = 0x6B21
-0x9BFA = 0x6B22
-0x9BFD = 0x6B23
-0x9BFF = 0x6B24
-0x9C00 = 0x6B25
-0x9C02 = 0x6B26
-0x9C0B = 0x6B27
-0x9C0F = 0x6B28
-0x9C11 = 0x6B29
-0x9C16 = 0x6B2A
-0x9C18 = 0x6B2B
-0x9C19 = 0x6B2C
-0x9C1A = 0x6B2D
-0x9C1C = 0x6B2E
-0x9C1E = 0x6B2F
-0x9C22 = 0x6B30
-0x9C23 = 0x6B31
-0x9C26 = 0x6B32
-0x9C27 = 0x6B33
-0x9C28 = 0x6B34
-0x9C29 = 0x6B35
-0x9C2A = 0x6B36
-0x9C31 = 0x6B37
-0x9C35 = 0x6B38
-0x9C36 = 0x6B39
-0x9C37 = 0x6B3A
-0x9C3D = 0x6B3B
-0x9C41 = 0x6B3C
-0x9C43 = 0x6B3D
-0x9C44 = 0x6B3E
-0x9C45 = 0x6B3F
-0x9C49 = 0x6B40
-0x9C4A = 0x6B41
-0x9C4E = 0x6B42
-0x9C4F = 0x6B43
-0x9C50 = 0x6B44
-0x9C53 = 0x6B45
-0x9C54 = 0x6B46
-0x9C56 = 0x6B47
-0x9C58 = 0x6B48
-0x9C5B = 0x6B49
-0x9C5C = 0x6B50
-0x9C5D = 0x6B4A
-0x9C5E = 0x6B4B
-0x9C5F = 0x6B4C
-0x9C63 = 0x6B4D
-0x9C68 = 0x6B52
-0x9C69 = 0x6B4E
-0x9C6A = 0x6B4F
-0x9C6B = 0x6B51
-0x9C6E = 0x6B53
-0x9C70 = 0x6B54
-0x9C72 = 0x6B55
-0x9C75 = 0x6B56
-0x9C77 = 0x6B57
-0x9C7B = 0x6B58
-0x9CE6 = 0x6B59
-0x9CF2 = 0x6B5A
-0x9CF7 = 0x6B5B
-0x9CF9 = 0x6B5C
-0x9D02 = 0x6B5E
-0x9D0B = 0x6B5D
-0x9D11 = 0x6B5F
-0x9D17 = 0x6B60
-0x9D18 = 0x6B61
-0x9D1C = 0x6B62
-0x9D1D = 0x6B63
-0x9D1E = 0x6B64
-0x9D2F = 0x6B65
-0x9D30 = 0x6B66
-0x9D32 = 0x6B67
-0x9D33 = 0x6B68
-0x9D34 = 0x6B69
-0x9D3A = 0x6B6A
-0x9D3C = 0x6B6B
-0x9D3D = 0x6B6D
-0x9D42 = 0x6B6E
-0x9D43 = 0x6B6F
-0x9D45 = 0x6B6C
-0x9D47 = 0x6B70
-0x9D4A = 0x6B71
-0x9D53 = 0x6B72
-0x9D54 = 0x6B73
-0x9D5F = 0x6B74
-0x9D62 = 0x6B76
-0x9D63 = 0x6B75
-0x9D65 = 0x6B77
-0x9D69 = 0x6B78
-0x9D6A = 0x6B79
-0x9D6B = 0x6B7A
-0x9D70 = 0x6B7B
-0x9D76 = 0x6B7C
-0x9D77 = 0x6B7D
-0x9D7B = 0x6B7E
-0x9D7C = 0x6C21
-0x9D7E = 0x6C22
-0x9D83 = 0x6C23
-0x9D84 = 0x6C24
-0x9D86 = 0x6C25
-0x9D8A = 0x6C26
-0x9D8D = 0x6C27
-0x9D8E = 0x6C28
-0x9D92 = 0x6C29
-0x9D93 = 0x6C2A
-0x9D95 = 0x6C2B
-0x9D96 = 0x6C2C
-0x9D97 = 0x6C2D
-0x9D98 = 0x6C2E
-0x9DA1 = 0x6C2F
-0x9DAA = 0x6C30
-0x9DAC = 0x6C31
-0x9DAE = 0x6C32
-0x9DB1 = 0x6C33
-0x9DB5 = 0x6C34
-0x9DB9 = 0x6C35
-0x9DBC = 0x6C36
-0x9DBF = 0x6C37
-0x9DC3 = 0x6C38
-0x9DC7 = 0x6C39
-0x9DC9 = 0x6C3A
-0x9DCA = 0x6C3B
-0x9DD4 = 0x6C3C
-0x9DD5 = 0x6C3D
-0x9DD6 = 0x6C3E
-0x9DD7 = 0x6C3F
-0x9DDA = 0x6C40
-0x9DDE = 0x6C41
-0x9DDF = 0x6C42
-0x9DE0 = 0x6C43
-0x9DE5 = 0x6C44
-0x9DE7 = 0x6C45
-0x9DE9 = 0x6C46
-0x9DEB = 0x6C47
-0x9DEE = 0x6C48
-0x9DF0 = 0x6C49
-0x9DF3 = 0x6C4A
-0x9DF4 = 0x6C4B
-0x9DFE = 0x6C4C
-0x9E02 = 0x6C4E
-0x9E07 = 0x6C4F
-0x9E0A = 0x6C4D
-0x9E0E = 0x6C50
-0x9E10 = 0x6C51
-0x9E11 = 0x6C52
-0x9E12 = 0x6C53
-0x9E15 = 0x6C54
-0x9E16 = 0x6C55
-0x9E19 = 0x6C56
-0x9E1C = 0x6C57
-0x9E1D = 0x6C58
-0x9E7A = 0x6C59
-0x9E7B = 0x6C5A
-0x9E7C = 0x6C5B
-0x9E80 = 0x6C5C
-0x9E82 = 0x6C5D
-0x9E83 = 0x6C5E
-0x9E84 = 0x6C5F
-0x9E85 = 0x6C60
-0x9E87 = 0x6C61
-0x9E8E = 0x6C62
-0x9E8F = 0x6C63
-0x9E96 = 0x6C64
-0x9E98 = 0x6C65
-0x9E9B = 0x6C66
-0x9E9E = 0x6C67
-0x9EA4 = 0x6C68
-0x9EA8 = 0x6C69
-0x9EAC = 0x6C6A
-0x9EAE = 0x6C6B
-0x9EAF = 0x6C6C
-0x9EB0 = 0x6C6D
-0x9EB3 = 0x6C6E
-0x9EB4 = 0x6C6F
-0x9EB5 = 0x6C70
-0x9EC6 = 0x6C71
-0x9EC8 = 0x6C72
-0x9ECB = 0x6C73
-0x9ED5 = 0x6C74
-0x9EDF = 0x6C75
-0x9EE4 = 0x6C76
-0x9EE7 = 0x6C77
-0x9EEC = 0x6C78
-0x9EED = 0x6C79
-0x9EEE = 0x6C7A
-0x9EF0 = 0x6C7B
-0x9EF1 = 0x6C7C
-0x9EF2 = 0x6C7D
-0x9EF5 = 0x6C7E
-0x9EF8 = 0x6D21
-0x9EFF = 0x6D22
-0x9F02 = 0x6D23
-0x9F03 = 0x6D24
-0x9F09 = 0x6D25
-0x9F0F = 0x6D26
-0x9F10 = 0x6D27
-0x9F11 = 0x6D28
-0x9F12 = 0x6D29
-0x9F14 = 0x6D2A
-0x9F16 = 0x6D2B
-0x9F17 = 0x6D2C
-0x9F19 = 0x6D2D
-0x9F1A = 0x6D2E
-0x9F1B = 0x6D2F
-0x9F1F = 0x6D30
-0x9F22 = 0x6D31
-0x9F26 = 0x6D32
-0x9F2A = 0x6D33
-0x9F2B = 0x6D34
-0x9F2F = 0x6D35
-0x9F31 = 0x6D36
-0x9F32 = 0x6D37
-0x9F34 = 0x6D38
-0x9F37 = 0x6D39
-0x9F39 = 0x6D3A
-0x9F3A = 0x6D3B
-0x9F3C = 0x6D3C
-0x9F3D = 0x6D3D
-0x9F3F = 0x6D3E
-0x9F41 = 0x6D3F
-0x9F43 = 0x6D40
-0x9F44 = 0x6D41
-0x9F45 = 0x6D42
-0x9F46 = 0x6D43
-0x9F47 = 0x6D44
-0x9F53 = 0x6D45
-0x9F55 = 0x6D46
-0x9F56 = 0x6D47
-0x9F57 = 0x6D48
-0x9F58 = 0x6D49
-0x9F5A = 0x6D4A
-0x9F5D = 0x6D4B
-0x9F5E = 0x6D4C
-0x9F68 = 0x6D4D
-0x9F69 = 0x6D4E
-0x9F6D = 0x6D4F
-0x9F6E = 0x6D50
-0x9F6F = 0x6D51
-0x9F70 = 0x6D52
-0x9F71 = 0x6D53
-0x9F73 = 0x6D54
-0x9F75 = 0x6D55
-0x9F7A = 0x6D56
-0x9F7D = 0x6D57
-0x9F8F = 0x6D58
-0x9F90 = 0x6D59
-0x9F91 = 0x6D5A
-0x9F92 = 0x6D5B
-0x9F94 = 0x6D5C
-0x9F96 = 0x6D5D
-0x9F97 = 0x6D5E
-0x9F9E = 0x6D5F
-0x9FA1 = 0x6D60
-0x9FA2 = 0x6D61
-0x9FA3 = 0x6D62
-0x9FA5 = 0x6D63
-END_MAP
diff --git a/enc/trans/JIS/UCS%JISX0212@MS.src b/enc/trans/JIS/UCS%JISX0212@MS.src
deleted file mode 100644
index 1f0c3c3c16..0000000000
--- a/enc/trans/JIS/UCS%JISX0212@MS.src
+++ /dev/null
@@ -1,6082 +0,0 @@
-# $NetBSD: UCS%JISX0212@MS.src,v 1.1 2003/07/19 20:20:42 tshiozak Exp $
-
-TYPE ROWCOL
-NAME "UCS/JISX0212:MS"
-SRC_ZONE 0x0000 - 0xFFFF
-OOB_MODE INVALID
-DST_INVALID 0xFFFF
-DST_UNIT_BITS 16
-
-BEGIN_MAP
-0x0000 - 0xFFFF = INVALID
-#
-# This data is derived from http://www.opengroup.or.jp/jvc/cde/
-#
-0x00A1 = 0x2242
-0x00A4 = 0x2270
-0x00A9 = 0x226D
-0x00AA = 0x226C
-0x00AE = 0x226E
-0x00AF = 0x2234
-0x00B8 = 0x2231
-0x00BA = 0x226B
-0x00BF = 0x2244
-0x00C0 = 0x2A22
-0x00C1 = 0x2A21
-0x00C2 = 0x2A24
-0x00C3 = 0x2A2A
-0x00C4 = 0x2A23
-0x00C5 = 0x2A29
-0x00C6 = 0x2921
-0x00C7 = 0x2A2E
-0x00C8 = 0x2A32
-0x00C9 = 0x2A31
-0x00CA = 0x2A34
-0x00CB = 0x2A33
-0x00CC = 0x2A40
-0x00CD = 0x2A3F
-0x00CE = 0x2A42
-0x00CF = 0x2A41
-0x00D1 = 0x2A50
-0x00D2 = 0x2A52
-0x00D3 = 0x2A51
-0x00D4 = 0x2A54
-0x00D5 = 0x2A58
-0x00D6 = 0x2A53
-0x00D8 = 0x292C
-0x00D9 = 0x2A63
-0x00DA = 0x2A62
-0x00DB = 0x2A65
-0x00DC = 0x2A64
-0x00DD = 0x2A72
-0x00DE = 0x2930
-0x00DF = 0x294E
-0x00E0 = 0x2B22
-0x00E1 = 0x2B21
-0x00E2 = 0x2B24
-0x00E3 = 0x2B2A
-0x00E4 = 0x2B23
-0x00E5 = 0x2B29
-0x00E6 = 0x2941
-0x00E7 = 0x2B2E
-0x00E8 = 0x2B32
-0x00E9 = 0x2B31
-0x00EA = 0x2B34
-0x00EB = 0x2B33
-0x00EC = 0x2B40
-0x00ED = 0x2B3F
-0x00EE = 0x2B42
-0x00EF = 0x2B41
-0x00F0 = 0x2943
-0x00F1 = 0x2B50
-0x00F2 = 0x2B52
-0x00F3 = 0x2B51
-0x00F4 = 0x2B54
-0x00F5 = 0x2B58
-0x00F6 = 0x2B53
-0x00F8 = 0x294C
-0x00F9 = 0x2B63
-0x00FA = 0x2B62
-0x00FB = 0x2B65
-0x00FC = 0x2B64
-0x00FD = 0x2B72
-0x00FE = 0x2950
-0x00FF = 0x2B73
-0x0100 = 0x2A27
-0x0101 = 0x2B27
-0x0102 = 0x2A25
-0x0103 = 0x2B25
-0x0104 = 0x2A28
-0x0105 = 0x2B28
-0x0106 = 0x2A2B
-0x0107 = 0x2B2B
-0x0108 = 0x2A2C
-0x0109 = 0x2B2C
-0x010A = 0x2A2F
-0x010B = 0x2B2F
-0x010C = 0x2A2D
-0x010D = 0x2B2D
-0x010E = 0x2A30
-0x010F = 0x2B30
-0x0110 = 0x2922
-0x0111 = 0x2942
-0x0112 = 0x2A37
-0x0113 = 0x2B37
-0x0116 = 0x2A36
-0x0117 = 0x2B36
-0x0118 = 0x2A38
-0x0119 = 0x2B38
-0x011A = 0x2A35
-0x011B = 0x2B35
-0x011C = 0x2A3A
-0x011D = 0x2B3A
-0x011E = 0x2A3B
-0x011F = 0x2B3B
-0x0120 = 0x2A3D
-0x0121 = 0x2B3D
-0x0122 = 0x2A3C
-0x0124 = 0x2A3E
-0x0125 = 0x2B3E
-0x0126 = 0x2924
-0x0127 = 0x2944
-0x0128 = 0x2A47
-0x0129 = 0x2B47
-0x012A = 0x2A45
-0x012B = 0x2B45
-0x012E = 0x2A46
-0x012F = 0x2B46
-0x0130 = 0x2A44
-0x0131 = 0x2945
-0x0132 = 0x2926
-0x0133 = 0x2946
-0x0134 = 0x2A48
-0x0135 = 0x2B48
-0x0136 = 0x2A49
-0x0137 = 0x2B49
-0x0138 = 0x2947
-0x0139 = 0x2A4A
-0x013A = 0x2B4A
-0x013B = 0x2A4C
-0x013C = 0x2B4C
-0x013D = 0x2A4B
-0x013E = 0x2B4B
-0x013F = 0x2929
-0x0140 = 0x2949
-0x0141 = 0x2928
-0x0142 = 0x2948
-0x0143 = 0x2A4D
-0x0144 = 0x2B4D
-0x0145 = 0x2A4F
-0x0146 = 0x2B4F
-0x0147 = 0x2A4E
-0x0148 = 0x2B4E
-0x0149 = 0x294A
-0x014A = 0x292B
-0x014B = 0x294B
-0x014C = 0x2A57
-0x014D = 0x2B57
-0x0150 = 0x2A56
-0x0151 = 0x2B56
-0x0152 = 0x292D
-0x0153 = 0x294D
-0x0154 = 0x2A59
-0x0155 = 0x2B59
-0x0156 = 0x2A5B
-0x0157 = 0x2B5B
-0x0158 = 0x2A5A
-0x0159 = 0x2B5A
-0x015A = 0x2A5C
-0x015B = 0x2B5C
-0x015C = 0x2A5D
-0x015D = 0x2B5D
-0x015E = 0x2A5F
-0x015F = 0x2B5F
-0x0160 = 0x2A5E
-0x0161 = 0x2B5E
-0x0162 = 0x2A61
-0x0163 = 0x2B61
-0x0164 = 0x2A60
-0x0165 = 0x2B60
-0x0166 = 0x292F
-0x0167 = 0x294F
-0x0168 = 0x2A6C
-0x0169 = 0x2B6C
-0x016A = 0x2A69
-0x016B = 0x2B69
-0x016C = 0x2A66
-0x016D = 0x2B66
-0x016E = 0x2A6B
-0x016F = 0x2B6B
-0x0170 = 0x2A68
-0x0171 = 0x2B68
-0x0172 = 0x2A6A
-0x0173 = 0x2B6A
-0x0174 = 0x2A71
-0x0175 = 0x2B71
-0x0176 = 0x2A74
-0x0177 = 0x2B74
-0x0178 = 0x2A73
-0x0179 = 0x2A75
-0x017A = 0x2B75
-0x017B = 0x2A77
-0x017C = 0x2B77
-0x017D = 0x2A76
-0x017E = 0x2B76
-0x01CD = 0x2A26
-0x01CE = 0x2B26
-0x01CF = 0x2A43
-0x01D0 = 0x2B43
-0x01D1 = 0x2A55
-0x01D2 = 0x2B55
-0x01D3 = 0x2A67
-0x01D4 = 0x2B67
-0x01D5 = 0x2A70
-0x01D6 = 0x2B70
-0x01D7 = 0x2A6D
-0x01D8 = 0x2B6D
-0x01D9 = 0x2A6F
-0x01DA = 0x2B6F
-0x01DB = 0x2A6E
-0x01DC = 0x2B6E
-0x01F5 = 0x2B39
-0x02C7 = 0x2230
-0x02D8 = 0x222F
-0x02D9 = 0x2232
-0x02DA = 0x2236
-0x02DB = 0x2235
-0x02DD = 0x2233
-0x0384 = 0x2238
-0x0385 = 0x2239
-0x0386 = 0x2661
-0x0388 = 0x2662
-0x0389 = 0x2663
-0x038A = 0x2664
-0x038C = 0x2667
-0x038E = 0x2669
-0x038F = 0x266C
-0x0390 = 0x2676
-0x03AA = 0x2665
-0x03AB = 0x266A
-0x03AC = 0x2671
-0x03AD = 0x2672
-0x03AE = 0x2673
-0x03AF = 0x2674
-0x03B0 = 0x267B
-0x03C2 = 0x2678
-0x03CA = 0x2675
-0x03CB = 0x267A
-0x03CC = 0x2677
-0x03CD = 0x2679
-0x03CE = 0x267C
-0x0402 = 0x2742
-0x0403 = 0x2743
-0x0404 = 0x2744
-0x0405 = 0x2745
-0x0406 = 0x2746
-0x0407 = 0x2747
-0x0408 = 0x2748
-0x0409 = 0x2749
-0x040A = 0x274A
-0x040B = 0x274B
-0x040C = 0x274C
-0x040E = 0x274D
-0x040F = 0x274E
-0x0452 = 0x2772
-0x0453 = 0x2773
-0x0454 = 0x2774
-0x0455 = 0x2775
-0x0456 = 0x2776
-0x0457 = 0x2777
-0x0458 = 0x2778
-0x0459 = 0x2779
-0x045A = 0x277A
-0x045B = 0x277B
-0x045C = 0x277C
-0x045E = 0x277D
-0x045F = 0x277E
-0x2116 = 0x2271
-0x2122 = 0x226F
-0x4E02 = 0x3021
-0x4E04 = 0x3022
-0x4E05 = 0x3023
-0x4E0C = 0x3024
-0x4E12 = 0x3025
-0x4E1F = 0x3026
-0x4E23 = 0x3027
-0x4E24 = 0x3028
-0x4E28 = 0x3029
-0x4E2B = 0x302A
-0x4E2E = 0x302B
-0x4E2F = 0x302C
-0x4E30 = 0x302D
-0x4E35 = 0x302E
-0x4E40 = 0x302F
-0x4E41 = 0x3030
-0x4E44 = 0x3031
-0x4E47 = 0x3032
-0x4E51 = 0x3033
-0x4E5A = 0x3034
-0x4E5C = 0x3035
-0x4E63 = 0x3036
-0x4E68 = 0x3037
-0x4E69 = 0x3038
-0x4E74 = 0x3039
-0x4E75 = 0x303A
-0x4E79 = 0x303B
-0x4E7F = 0x303C
-0x4E8D = 0x303D
-0x4E96 = 0x303E
-0x4E97 = 0x303F
-0x4E9D = 0x3040
-0x4EAF = 0x3041
-0x4EB9 = 0x3042
-0x4EC3 = 0x3043
-0x4ED0 = 0x3044
-0x4EDA = 0x3045
-0x4EDB = 0x3046
-0x4EE0 = 0x3047
-0x4EE1 = 0x3048
-0x4EE2 = 0x3049
-0x4EE8 = 0x304A
-0x4EEF = 0x304B
-0x4EF1 = 0x304C
-0x4EF3 = 0x304D
-0x4EF5 = 0x304E
-0x4EFD = 0x304F
-0x4EFE = 0x3050
-0x4EFF = 0x3051
-0x4F00 = 0x3052
-0x4F02 = 0x3053
-0x4F03 = 0x3054
-0x4F08 = 0x3055
-0x4F0B = 0x3056
-0x4F0C = 0x3057
-0x4F12 = 0x3058
-0x4F15 = 0x3059
-0x4F16 = 0x305A
-0x4F17 = 0x305B
-0x4F19 = 0x305C
-0x4F2E = 0x305D
-0x4F31 = 0x305E
-0x4F33 = 0x3060
-0x4F35 = 0x3061
-0x4F37 = 0x3062
-0x4F39 = 0x3063
-0x4F3B = 0x3064
-0x4F3E = 0x3065
-0x4F40 = 0x3066
-0x4F42 = 0x3067
-0x4F48 = 0x3068
-0x4F49 = 0x3069
-0x4F4B = 0x306A
-0x4F4C = 0x306B
-0x4F52 = 0x306C
-0x4F54 = 0x306D
-0x4F56 = 0x306E
-0x4F58 = 0x306F
-0x4F5F = 0x3070
-0x4F60 = 0x305F
-0x4F63 = 0x3071
-0x4F6A = 0x3072
-0x4F6C = 0x3073
-0x4F6E = 0x3074
-0x4F71 = 0x3075
-0x4F77 = 0x3076
-0x4F78 = 0x3077
-0x4F79 = 0x3078
-0x4F7A = 0x3079
-0x4F7D = 0x307A
-0x4F7E = 0x307B
-0x4F81 = 0x307C
-0x4F82 = 0x307D
-0x4F84 = 0x307E
-0x4F85 = 0x3121
-0x4F89 = 0x3122
-0x4F8A = 0x3123
-0x4F8C = 0x3124
-0x4F8E = 0x3125
-0x4F90 = 0x3126
-0x4F92 = 0x3127
-0x4F93 = 0x3128
-0x4F94 = 0x3129
-0x4F97 = 0x312A
-0x4F99 = 0x312B
-0x4F9A = 0x312C
-0x4F9E = 0x312D
-0x4F9F = 0x312E
-0x4FB2 = 0x312F
-0x4FB7 = 0x3130
-0x4FB9 = 0x3131
-0x4FBB = 0x3132
-0x4FBC = 0x3133
-0x4FBD = 0x3134
-0x4FBE = 0x3135
-0x4FC0 = 0x3136
-0x4FC1 = 0x3137
-0x4FC5 = 0x3138
-0x4FC6 = 0x3139
-0x4FC8 = 0x313A
-0x4FC9 = 0x313B
-0x4FCB = 0x313C
-0x4FCC = 0x313D
-0x4FCD = 0x313E
-0x4FCF = 0x313F
-0x4FD2 = 0x3140
-0x4FDC = 0x3141
-0x4FE0 = 0x3142
-0x4FE2 = 0x3143
-0x4FF0 = 0x3144
-0x4FF2 = 0x3145
-0x4FFC = 0x3146
-0x4FFD = 0x3147
-0x4FFF = 0x3148
-0x5000 = 0x3149
-0x5001 = 0x314A
-0x5004 = 0x314B
-0x5007 = 0x314C
-0x500A = 0x314D
-0x500C = 0x314E
-0x500E = 0x314F
-0x5010 = 0x3150
-0x5013 = 0x3151
-0x5017 = 0x3152
-0x5018 = 0x3153
-0x501B = 0x3154
-0x501C = 0x3155
-0x501D = 0x3156
-0x501E = 0x3157
-0x5022 = 0x3158
-0x5027 = 0x3159
-0x502E = 0x315A
-0x5030 = 0x315B
-0x5032 = 0x315C
-0x5033 = 0x315D
-0x5035 = 0x315E
-0x503B = 0x3176
-0x5040 = 0x315F
-0x5041 = 0x3160
-0x5042 = 0x3161
-0x5045 = 0x3162
-0x5046 = 0x3163
-0x504A = 0x3164
-0x504C = 0x3165
-0x504E = 0x3166
-0x5051 = 0x3167
-0x5052 = 0x3168
-0x5053 = 0x3169
-0x5057 = 0x316A
-0x5059 = 0x316B
-0x505F = 0x316C
-0x5060 = 0x316D
-0x5062 = 0x316E
-0x5063 = 0x316F
-0x5066 = 0x3170
-0x5067 = 0x3171
-0x506A = 0x3172
-0x506D = 0x3173
-0x5070 = 0x3174
-0x5071 = 0x3175
-0x5081 = 0x3177
-0x5083 = 0x3178
-0x5084 = 0x3179
-0x5086 = 0x317A
-0x508A = 0x317B
-0x508E = 0x317C
-0x508F = 0x317D
-0x5090 = 0x317E
-0x5092 = 0x3221
-0x5093 = 0x3222
-0x5094 = 0x3223
-0x5096 = 0x3224
-0x509B = 0x3225
-0x509C = 0x3226
-0x509E = 0x3227
-0x509F = 0x3228
-0x50A0 = 0x3229
-0x50A1 = 0x322A
-0x50A2 = 0x322B
-0x50AA = 0x322C
-0x50AF = 0x322D
-0x50B0 = 0x322E
-0x50B9 = 0x322F
-0x50BA = 0x3230
-0x50BD = 0x3231
-0x50C0 = 0x3232
-0x50C3 = 0x3233
-0x50C4 = 0x3234
-0x50C7 = 0x3235
-0x50CC = 0x3236
-0x50CE = 0x3237
-0x50D0 = 0x3238
-0x50D3 = 0x3239
-0x50D4 = 0x323A
-0x50D8 = 0x323B
-0x50DC = 0x323C
-0x50DD = 0x323D
-0x50DF = 0x323E
-0x50E2 = 0x323F
-0x50E4 = 0x3240
-0x50E6 = 0x3241
-0x50E8 = 0x3242
-0x50E9 = 0x3243
-0x50EF = 0x3244
-0x50F1 = 0x3245
-0x50F2 = 0x3251
-0x50F6 = 0x3246
-0x50FA = 0x3247
-0x50FE = 0x3248
-0x5103 = 0x3249
-0x5106 = 0x324A
-0x5107 = 0x324B
-0x5108 = 0x324C
-0x510B = 0x324D
-0x510C = 0x324E
-0x510D = 0x324F
-0x510E = 0x3250
-0x5110 = 0x3252
-0x5117 = 0x3253
-0x5119 = 0x3254
-0x511B = 0x3255
-0x511C = 0x3256
-0x511D = 0x3257
-0x511E = 0x3258
-0x5123 = 0x3259
-0x5127 = 0x325A
-0x5128 = 0x325B
-0x512C = 0x325C
-0x512D = 0x325D
-0x512F = 0x325E
-0x5131 = 0x325F
-0x5133 = 0x3260
-0x5134 = 0x3261
-0x5135 = 0x3262
-0x5138 = 0x3263
-0x5139 = 0x3264
-0x5142 = 0x3265
-0x514A = 0x3266
-0x514F = 0x3267
-0x5153 = 0x3268
-0x5155 = 0x3269
-0x5157 = 0x326A
-0x5158 = 0x326B
-0x515F = 0x326C
-0x5164 = 0x326D
-0x5166 = 0x326E
-0x517E = 0x326F
-0x5183 = 0x3270
-0x5184 = 0x3271
-0x518B = 0x3272
-0x518E = 0x3273
-0x5198 = 0x3274
-0x519D = 0x3275
-0x51A1 = 0x3276
-0x51A3 = 0x3277
-0x51AD = 0x3278
-0x51B8 = 0x3279
-0x51BA = 0x327A
-0x51BC = 0x327B
-0x51BE = 0x327C
-0x51BF = 0x327D
-0x51C2 = 0x327E
-0x51C8 = 0x3321
-0x51CF = 0x3322
-0x51D1 = 0x3323
-0x51D2 = 0x3324
-0x51D3 = 0x3325
-0x51D5 = 0x3326
-0x51D8 = 0x3327
-0x51DE = 0x3328
-0x51E2 = 0x3329
-0x51E5 = 0x332A
-0x51EE = 0x332B
-0x51F2 = 0x332C
-0x51F3 = 0x332D
-0x51F4 = 0x332E
-0x51F7 = 0x332F
-0x5201 = 0x3330
-0x5202 = 0x3331
-0x5205 = 0x3332
-0x5212 = 0x3333
-0x5213 = 0x3334
-0x5215 = 0x3335
-0x5216 = 0x3336
-0x5218 = 0x3337
-0x5222 = 0x3338
-0x5228 = 0x3339
-0x5231 = 0x333A
-0x5232 = 0x333B
-0x5235 = 0x333C
-0x523C = 0x333D
-0x5245 = 0x333E
-0x5249 = 0x333F
-0x5255 = 0x3340
-0x5257 = 0x3341
-0x5258 = 0x3342
-0x525A = 0x3343
-0x525C = 0x3344
-0x525F = 0x3345
-0x5260 = 0x3346
-0x5261 = 0x3347
-0x5266 = 0x3348
-0x526E = 0x3349
-0x5277 = 0x334A
-0x5278 = 0x334B
-0x5279 = 0x334C
-0x5280 = 0x334D
-0x5282 = 0x334E
-0x5285 = 0x334F
-0x528A = 0x3350
-0x528C = 0x3351
-0x5293 = 0x3352
-0x5295 = 0x3353
-0x5296 = 0x3354
-0x5297 = 0x3355
-0x5298 = 0x3356
-0x529A = 0x3357
-0x529C = 0x3358
-0x52A4 = 0x3359
-0x52A5 = 0x335A
-0x52A6 = 0x335B
-0x52A7 = 0x335C
-0x52AF = 0x335D
-0x52B0 = 0x335E
-0x52B6 = 0x335F
-0x52B7 = 0x3360
-0x52B8 = 0x3361
-0x52BA = 0x3362
-0x52BB = 0x3363
-0x52BD = 0x3364
-0x52C0 = 0x3365
-0x52C4 = 0x3366
-0x52C6 = 0x3367
-0x52C8 = 0x3368
-0x52CC = 0x3369
-0x52CF = 0x336A
-0x52D1 = 0x336B
-0x52D4 = 0x336C
-0x52D6 = 0x336D
-0x52DB = 0x336E
-0x52DC = 0x336F
-0x52E1 = 0x3370
-0x52E5 = 0x3371
-0x52E8 = 0x3372
-0x52E9 = 0x3373
-0x52EA = 0x3374
-0x52EC = 0x3375
-0x52F0 = 0x3376
-0x52F1 = 0x3377
-0x52F4 = 0x3378
-0x52F6 = 0x3379
-0x52F7 = 0x337A
-0x5300 = 0x337B
-0x5303 = 0x337C
-0x530A = 0x337D
-0x530B = 0x337E
-0x530C = 0x3421
-0x5311 = 0x3422
-0x5313 = 0x3423
-0x5318 = 0x3424
-0x531B = 0x3425
-0x531C = 0x3426
-0x531E = 0x3427
-0x531F = 0x3428
-0x5325 = 0x3429
-0x5327 = 0x342A
-0x5328 = 0x342B
-0x5329 = 0x342C
-0x532B = 0x342D
-0x532C = 0x342E
-0x532D = 0x342F
-0x5330 = 0x3430
-0x5332 = 0x3431
-0x5335 = 0x3432
-0x533C = 0x3433
-0x533D = 0x3434
-0x533E = 0x3435
-0x5342 = 0x3436
-0x534B = 0x3438
-0x534C = 0x3437
-0x5359 = 0x3439
-0x535B = 0x343A
-0x5361 = 0x343B
-0x5363 = 0x343C
-0x5365 = 0x343D
-0x536C = 0x343E
-0x536D = 0x343F
-0x5372 = 0x3440
-0x5379 = 0x3441
-0x537E = 0x3442
-0x5383 = 0x3443
-0x5387 = 0x3444
-0x5388 = 0x3445
-0x538E = 0x3446
-0x5393 = 0x3447
-0x5394 = 0x3448
-0x5399 = 0x3449
-0x539D = 0x344A
-0x53A1 = 0x344B
-0x53A4 = 0x344C
-0x53AA = 0x344D
-0x53AB = 0x344E
-0x53AF = 0x344F
-0x53B2 = 0x3450
-0x53B4 = 0x3451
-0x53B5 = 0x3452
-0x53B7 = 0x3453
-0x53B8 = 0x3454
-0x53BA = 0x3455
-0x53BD = 0x3456
-0x53C0 = 0x3457
-0x53C5 = 0x3458
-0x53CF = 0x3459
-0x53D2 = 0x345A
-0x53D3 = 0x345B
-0x53D5 = 0x345C
-0x53DA = 0x345D
-0x53DD = 0x345E
-0x53DE = 0x345F
-0x53E0 = 0x3460
-0x53E6 = 0x3461
-0x53E7 = 0x3462
-0x53F5 = 0x3463
-0x5402 = 0x3464
-0x5413 = 0x3465
-0x541A = 0x3466
-0x5421 = 0x3467
-0x5427 = 0x3468
-0x5428 = 0x3469
-0x542A = 0x346A
-0x542F = 0x346B
-0x5431 = 0x346C
-0x5434 = 0x346D
-0x5435 = 0x346E
-0x5443 = 0x346F
-0x5444 = 0x3470
-0x5447 = 0x3471
-0x544D = 0x3472
-0x544F = 0x3473
-0x545E = 0x3474
-0x5462 = 0x3475
-0x5464 = 0x3476
-0x5466 = 0x3477
-0x5467 = 0x3478
-0x5469 = 0x3479
-0x546B = 0x347A
-0x546D = 0x347B
-0x546E = 0x347C
-0x5474 = 0x347D
-0x547F = 0x347E
-0x5481 = 0x3521
-0x5483 = 0x3522
-0x5485 = 0x3523
-0x5488 = 0x3524
-0x5489 = 0x3525
-0x548D = 0x3526
-0x5491 = 0x3527
-0x5495 = 0x3528
-0x5496 = 0x3529
-0x549C = 0x352A
-0x549F = 0x352B
-0x54A1 = 0x352C
-0x54A6 = 0x352D
-0x54A7 = 0x352E
-0x54A9 = 0x352F
-0x54AA = 0x3530
-0x54AD = 0x3531
-0x54AE = 0x3532
-0x54B1 = 0x3533
-0x54B7 = 0x3534
-0x54B9 = 0x3535
-0x54BA = 0x3536
-0x54BB = 0x3537
-0x54BF = 0x3538
-0x54C6 = 0x3539
-0x54CA = 0x353A
-0x54CD = 0x353B
-0x54CE = 0x353C
-0x54E0 = 0x353D
-0x54EA = 0x353E
-0x54EC = 0x353F
-0x54EF = 0x3540
-0x54F6 = 0x3541
-0x54FC = 0x3542
-0x54FE = 0x3543
-0x54FF = 0x3544
-0x5500 = 0x3545
-0x5501 = 0x3546
-0x5505 = 0x3547
-0x5508 = 0x3548
-0x5509 = 0x3549
-0x550C = 0x354A
-0x550D = 0x354B
-0x550E = 0x354C
-0x5515 = 0x354D
-0x552A = 0x354E
-0x552B = 0x354F
-0x5532 = 0x3550
-0x5535 = 0x3551
-0x5536 = 0x3552
-0x553B = 0x3553
-0x553C = 0x3554
-0x553D = 0x3555
-0x5541 = 0x3556
-0x5547 = 0x3557
-0x5549 = 0x3558
-0x554A = 0x3559
-0x554D = 0x355A
-0x5550 = 0x355B
-0x5551 = 0x355C
-0x5558 = 0x355D
-0x555A = 0x355E
-0x555B = 0x355F
-0x555E = 0x3560
-0x5560 = 0x3561
-0x5561 = 0x3562
-0x5564 = 0x3563
-0x5566 = 0x3564
-0x557F = 0x3565
-0x5581 = 0x3566
-0x5582 = 0x3567
-0x5586 = 0x3568
-0x5588 = 0x3569
-0x558E = 0x356A
-0x558F = 0x356B
-0x5591 = 0x356C
-0x5592 = 0x356D
-0x5593 = 0x356E
-0x5594 = 0x356F
-0x5597 = 0x3570
-0x55A3 = 0x3571
-0x55A4 = 0x3572
-0x55AD = 0x3573
-0x55B2 = 0x3574
-0x55BF = 0x3575
-0x55C1 = 0x3576
-0x55C3 = 0x3577
-0x55C6 = 0x3578
-0x55C9 = 0x3579
-0x55CB = 0x357A
-0x55CC = 0x357B
-0x55CE = 0x357C
-0x55D1 = 0x357D
-0x55D2 = 0x357E
-0x55D3 = 0x3621
-0x55D7 = 0x3622
-0x55D8 = 0x3623
-0x55DB = 0x3624
-0x55DE = 0x3625
-0x55E2 = 0x3626
-0x55E9 = 0x3627
-0x55F6 = 0x3628
-0x55FF = 0x3629
-0x5605 = 0x362A
-0x5608 = 0x362B
-0x560A = 0x362C
-0x560D = 0x362D
-0x560E = 0x362E
-0x560F = 0x362F
-0x5610 = 0x3630
-0x5611 = 0x3631
-0x5612 = 0x3632
-0x5619 = 0x3633
-0x562C = 0x3634
-0x5630 = 0x3635
-0x5633 = 0x3636
-0x5635 = 0x3637
-0x5637 = 0x3638
-0x5639 = 0x3639
-0x563B = 0x363A
-0x563C = 0x363B
-0x563D = 0x363C
-0x563F = 0x363D
-0x5640 = 0x363E
-0x5641 = 0x363F
-0x5643 = 0x3640
-0x5644 = 0x3641
-0x5646 = 0x3642
-0x5649 = 0x3643
-0x564B = 0x3644
-0x564D = 0x3645
-0x564F = 0x3646
-0x5654 = 0x3647
-0x565E = 0x3648
-0x5660 = 0x3649
-0x5661 = 0x364A
-0x5662 = 0x364B
-0x5663 = 0x364C
-0x5666 = 0x364D
-0x5669 = 0x364E
-0x566D = 0x364F
-0x566F = 0x3650
-0x5671 = 0x3651
-0x5672 = 0x3652
-0x5675 = 0x3653
-0x5684 = 0x3654
-0x5685 = 0x3655
-0x5688 = 0x3656
-0x568B = 0x3657
-0x568C = 0x3658
-0x5695 = 0x3659
-0x5699 = 0x365A
-0x569A = 0x365B
-0x569D = 0x365C
-0x569E = 0x365D
-0x569F = 0x365E
-0x56A6 = 0x365F
-0x56A7 = 0x3660
-0x56A8 = 0x3661
-0x56A9 = 0x3662
-0x56AB = 0x3663
-0x56AC = 0x3664
-0x56AD = 0x3665
-0x56B1 = 0x3666
-0x56B3 = 0x3667
-0x56B7 = 0x3668
-0x56BE = 0x3669
-0x56C5 = 0x366A
-0x56C9 = 0x366B
-0x56CA = 0x366C
-0x56CB = 0x366D
-0x56CC = 0x3670
-0x56CD = 0x3671
-0x56CF = 0x366E
-0x56D0 = 0x366F
-0x56D9 = 0x3672
-0x56DC = 0x3673
-0x56DD = 0x3674
-0x56DF = 0x3675
-0x56E1 = 0x3676
-0x56E4 = 0x3677
-0x56E5 = 0x3678
-0x56E6 = 0x3679
-0x56E7 = 0x367A
-0x56E8 = 0x367B
-0x56EB = 0x367D
-0x56ED = 0x367E
-0x56F1 = 0x367C
-0x56F6 = 0x3721
-0x56F7 = 0x3722
-0x5701 = 0x3723
-0x5702 = 0x3724
-0x5707 = 0x3725
-0x570A = 0x3726
-0x570C = 0x3727
-0x5711 = 0x3728
-0x5715 = 0x3729
-0x571A = 0x372A
-0x571B = 0x372B
-0x571D = 0x372C
-0x5720 = 0x372D
-0x5722 = 0x372E
-0x5723 = 0x372F
-0x5724 = 0x3730
-0x5725 = 0x3731
-0x5729 = 0x3732
-0x572A = 0x3733
-0x572C = 0x3734
-0x572E = 0x3735
-0x572F = 0x3736
-0x5733 = 0x3737
-0x5734 = 0x3738
-0x573D = 0x3739
-0x573E = 0x373A
-0x573F = 0x373B
-0x5745 = 0x373C
-0x5746 = 0x373D
-0x574C = 0x373E
-0x574D = 0x373F
-0x5752 = 0x3740
-0x5762 = 0x3741
-0x5765 = 0x3742
-0x5767 = 0x3743
-0x5768 = 0x3744
-0x576B = 0x3745
-0x576D = 0x3746
-0x576E = 0x3747
-0x576F = 0x3748
-0x5770 = 0x3749
-0x5771 = 0x374A
-0x5773 = 0x374B
-0x5774 = 0x374C
-0x5775 = 0x374D
-0x5777 = 0x374E
-0x5779 = 0x374F
-0x577A = 0x3750
-0x577B = 0x3751
-0x577C = 0x3752
-0x577E = 0x3753
-0x5781 = 0x3754
-0x5783 = 0x3755
-0x578C = 0x3756
-0x5794 = 0x3757
-0x5795 = 0x3760
-0x5797 = 0x3758
-0x5799 = 0x3759
-0x579A = 0x375A
-0x579C = 0x375B
-0x579D = 0x375C
-0x579E = 0x375D
-0x579F = 0x375E
-0x57A1 = 0x375F
-0x57A7 = 0x3761
-0x57A8 = 0x3762
-0x57A9 = 0x3763
-0x57AC = 0x3764
-0x57B8 = 0x3765
-0x57BD = 0x3766
-0x57C7 = 0x3767
-0x57C8 = 0x3768
-0x57CC = 0x3769
-0x57CF = 0x376A
-0x57D5 = 0x376B
-0x57DD = 0x376C
-0x57DE = 0x376D
-0x57E1 = 0x377E
-0x57E4 = 0x376E
-0x57E6 = 0x376F
-0x57E7 = 0x3770
-0x57E9 = 0x3771
-0x57ED = 0x3772
-0x57F0 = 0x3773
-0x57F5 = 0x3774
-0x57F6 = 0x3775
-0x57F8 = 0x3776
-0x57FD = 0x3777
-0x57FE = 0x3778
-0x57FF = 0x3779
-0x5803 = 0x377A
-0x5804 = 0x377B
-0x5808 = 0x377C
-0x5809 = 0x377D
-0x580C = 0x3821
-0x580D = 0x3822
-0x581B = 0x3823
-0x581E = 0x3824
-0x581F = 0x3825
-0x5820 = 0x3826
-0x5826 = 0x3827
-0x5827 = 0x3828
-0x582D = 0x3829
-0x5832 = 0x382A
-0x5839 = 0x382B
-0x583F = 0x382C
-0x5849 = 0x382D
-0x584C = 0x382E
-0x584D = 0x382F
-0x584F = 0x3830
-0x5850 = 0x3831
-0x5855 = 0x3832
-0x585F = 0x3833
-0x5861 = 0x3834
-0x5864 = 0x3835
-0x5867 = 0x3836
-0x5868 = 0x3837
-0x5878 = 0x3838
-0x587C = 0x3839
-0x587F = 0x383A
-0x5880 = 0x383B
-0x5881 = 0x383C
-0x5887 = 0x383D
-0x5888 = 0x383E
-0x5889 = 0x383F
-0x588A = 0x3840
-0x588C = 0x3841
-0x588D = 0x3842
-0x588F = 0x3843
-0x5890 = 0x3844
-0x5894 = 0x3845
-0x5896 = 0x3846
-0x589D = 0x3847
-0x58A0 = 0x3848
-0x58A1 = 0x3849
-0x58A2 = 0x384A
-0x58A6 = 0x384B
-0x58A9 = 0x384C
-0x58B1 = 0x384D
-0x58B2 = 0x384E
-0x58BC = 0x3850
-0x58C2 = 0x3851
-0x58C4 = 0x384F
-0x58C8 = 0x3852
-0x58CD = 0x3853
-0x58CE = 0x3854
-0x58D0 = 0x3855
-0x58D2 = 0x3856
-0x58D4 = 0x3857
-0x58D6 = 0x3858
-0x58DA = 0x3859
-0x58DD = 0x385A
-0x58E1 = 0x385B
-0x58E2 = 0x385C
-0x58E9 = 0x385D
-0x58F3 = 0x385E
-0x5905 = 0x385F
-0x5906 = 0x3860
-0x590B = 0x3861
-0x590C = 0x3862
-0x5912 = 0x3863
-0x5913 = 0x3864
-0x5914 = 0x3865
-0x591D = 0x3867
-0x5921 = 0x3868
-0x5923 = 0x3869
-0x5924 = 0x386A
-0x5928 = 0x386B
-0x592F = 0x386C
-0x5930 = 0x386D
-0x5933 = 0x386E
-0x5935 = 0x386F
-0x5936 = 0x3870
-0x593F = 0x3871
-0x5943 = 0x3872
-0x5946 = 0x3873
-0x5952 = 0x3874
-0x5953 = 0x3875
-0x5959 = 0x3876
-0x595B = 0x3877
-0x595D = 0x3878
-0x595E = 0x3879
-0x595F = 0x387A
-0x5961 = 0x387B
-0x5963 = 0x387C
-0x596B = 0x387D
-0x596D = 0x387E
-0x596F = 0x3921
-0x5972 = 0x3922
-0x5975 = 0x3923
-0x5976 = 0x3924
-0x5979 = 0x3925
-0x597B = 0x3926
-0x597C = 0x3927
-0x598B = 0x3928
-0x598C = 0x3929
-0x598E = 0x392A
-0x5992 = 0x392B
-0x5995 = 0x392C
-0x5997 = 0x392D
-0x599F = 0x392E
-0x59A4 = 0x392F
-0x59A7 = 0x3930
-0x59AD = 0x3931
-0x59AE = 0x3932
-0x59AF = 0x3933
-0x59B0 = 0x3934
-0x59B3 = 0x3935
-0x59B7 = 0x3936
-0x59BA = 0x3937
-0x59BC = 0x3938
-0x59C1 = 0x3939
-0x59C3 = 0x393A
-0x59C4 = 0x393B
-0x59C8 = 0x393C
-0x59CA = 0x393D
-0x59CD = 0x393E
-0x59D2 = 0x393F
-0x59DD = 0x3940
-0x59DE = 0x3941
-0x59DF = 0x3942
-0x59E3 = 0x3943
-0x59E4 = 0x3944
-0x59E7 = 0x3945
-0x59EE = 0x3946
-0x59EF = 0x3947
-0x59F1 = 0x3948
-0x59F2 = 0x3949
-0x59F4 = 0x394A
-0x59F7 = 0x394B
-0x5A00 = 0x394C
-0x5A04 = 0x394D
-0x5A0C = 0x394E
-0x5A0D = 0x394F
-0x5A0E = 0x3950
-0x5A12 = 0x3951
-0x5A13 = 0x3952
-0x5A1E = 0x3953
-0x5A23 = 0x3954
-0x5A24 = 0x3955
-0x5A27 = 0x3956
-0x5A28 = 0x3957
-0x5A2A = 0x3958
-0x5A2D = 0x3959
-0x5A30 = 0x395A
-0x5A44 = 0x395B
-0x5A45 = 0x395C
-0x5A47 = 0x395D
-0x5A48 = 0x395E
-0x5A4C = 0x395F
-0x5A50 = 0x3960
-0x5A55 = 0x3961
-0x5A5E = 0x3962
-0x5A63 = 0x3963
-0x5A65 = 0x3964
-0x5A67 = 0x3965
-0x5A6D = 0x3966
-0x5A77 = 0x3967
-0x5A7A = 0x3968
-0x5A7B = 0x3969
-0x5A7E = 0x396A
-0x5A8B = 0x396B
-0x5A90 = 0x396C
-0x5A93 = 0x396D
-0x5A96 = 0x396E
-0x5A99 = 0x396F
-0x5A9C = 0x3970
-0x5A9E = 0x3971
-0x5A9F = 0x3972
-0x5AA0 = 0x3973
-0x5AA2 = 0x3974
-0x5AA7 = 0x3975
-0x5AAC = 0x3976
-0x5AB1 = 0x3977
-0x5AB2 = 0x3978
-0x5AB3 = 0x3979
-0x5AB5 = 0x397A
-0x5AB8 = 0x397B
-0x5ABA = 0x397C
-0x5ABB = 0x397D
-0x5ABF = 0x397E
-0x5AC4 = 0x3A21
-0x5AC6 = 0x3A22
-0x5AC8 = 0x3A23
-0x5ACF = 0x3A24
-0x5ADA = 0x3A25
-0x5ADC = 0x3A26
-0x5AE0 = 0x3A27
-0x5AE5 = 0x3A28
-0x5AEA = 0x3A29
-0x5AEE = 0x3A2A
-0x5AF5 = 0x3A2B
-0x5AF6 = 0x3A2C
-0x5AFD = 0x3A2D
-0x5B00 = 0x3A2E
-0x5B01 = 0x3A2F
-0x5B08 = 0x3A30
-0x5B17 = 0x3A31
-0x5B19 = 0x3A33
-0x5B1B = 0x3A34
-0x5B1D = 0x3A35
-0x5B21 = 0x3A36
-0x5B25 = 0x3A37
-0x5B2D = 0x3A38
-0x5B34 = 0x3A32
-0x5B38 = 0x3A39
-0x5B41 = 0x3A3A
-0x5B4B = 0x3A3B
-0x5B4C = 0x3A3C
-0x5B52 = 0x3A3D
-0x5B56 = 0x3A3E
-0x5B5E = 0x3A3F
-0x5B68 = 0x3A40
-0x5B6E = 0x3A41
-0x5B6F = 0x3A42
-0x5B7C = 0x3A43
-0x5B7D = 0x3A44
-0x5B7E = 0x3A45
-0x5B7F = 0x3A46
-0x5B81 = 0x3A47
-0x5B84 = 0x3A48
-0x5B86 = 0x3A49
-0x5B8A = 0x3A4A
-0x5B8E = 0x3A4B
-0x5B90 = 0x3A4C
-0x5B91 = 0x3A4D
-0x5B93 = 0x3A4E
-0x5B94 = 0x3A4F
-0x5B96 = 0x3A50
-0x5BA8 = 0x3A51
-0x5BA9 = 0x3A52
-0x5BAC = 0x3A53
-0x5BAD = 0x3A54
-0x5BAF = 0x3A55
-0x5BB1 = 0x3A56
-0x5BB2 = 0x3A57
-0x5BB7 = 0x3A58
-0x5BBA = 0x3A59
-0x5BBC = 0x3A5A
-0x5BC0 = 0x3A5B
-0x5BC1 = 0x3A5C
-0x5BCD = 0x3A5D
-0x5BCF = 0x3A5E
-0x5BD6 = 0x3A5F
-0x5BD7 = 0x3A60
-0x5BD8 = 0x3A61
-0x5BD9 = 0x3A62
-0x5BDA = 0x3A63
-0x5BE0 = 0x3A64
-0x5BEF = 0x3A65
-0x5BF1 = 0x3A66
-0x5BF4 = 0x3A67
-0x5BFD = 0x3A68
-0x5C0C = 0x3A69
-0x5C17 = 0x3A6A
-0x5C1E = 0x3A6B
-0x5C1F = 0x3A6C
-0x5C23 = 0x3A6D
-0x5C26 = 0x3A6E
-0x5C29 = 0x3A6F
-0x5C2B = 0x3A70
-0x5C2C = 0x3A71
-0x5C2E = 0x3A72
-0x5C30 = 0x3A73
-0x5C32 = 0x3A74
-0x5C35 = 0x3A75
-0x5C36 = 0x3A76
-0x5C59 = 0x3A77
-0x5C5A = 0x3A78
-0x5C5C = 0x3A79
-0x5C62 = 0x3A7A
-0x5C63 = 0x3A7B
-0x5C67 = 0x3A7C
-0x5C68 = 0x3A7D
-0x5C69 = 0x3A7E
-0x5C6D = 0x3B21
-0x5C70 = 0x3B22
-0x5C74 = 0x3B23
-0x5C75 = 0x3B24
-0x5C7A = 0x3B25
-0x5C7B = 0x3B26
-0x5C7C = 0x3B27
-0x5C7D = 0x3B28
-0x5C87 = 0x3B29
-0x5C88 = 0x3B2A
-0x5C8A = 0x3B2B
-0x5C8F = 0x3B2C
-0x5C92 = 0x3B2D
-0x5C9D = 0x3B2E
-0x5C9F = 0x3B2F
-0x5CA0 = 0x3B30
-0x5CA2 = 0x3B31
-0x5CA3 = 0x3B32
-0x5CA6 = 0x3B33
-0x5CAA = 0x3B34
-0x5CB2 = 0x3B35
-0x5CB4 = 0x3B36
-0x5CB5 = 0x3B37
-0x5CBA = 0x3B38
-0x5CC9 = 0x3B39
-0x5CCB = 0x3B3A
-0x5CD2 = 0x3B3B
-0x5CD7 = 0x3B3D
-0x5CDD = 0x3B3C
-0x5CEE = 0x3B3E
-0x5CF1 = 0x3B3F
-0x5CF2 = 0x3B40
-0x5CF4 = 0x3B41
-0x5D01 = 0x3B42
-0x5D06 = 0x3B43
-0x5D0D = 0x3B44
-0x5D12 = 0x3B45
-0x5D23 = 0x3B47
-0x5D24 = 0x3B48
-0x5D26 = 0x3B49
-0x5D27 = 0x3B4A
-0x5D2B = 0x3B46
-0x5D31 = 0x3B4B
-0x5D34 = 0x3B4C
-0x5D39 = 0x3B4D
-0x5D3D = 0x3B4E
-0x5D3F = 0x3B4F
-0x5D42 = 0x3B50
-0x5D43 = 0x3B51
-0x5D46 = 0x3B52
-0x5D48 = 0x3B53
-0x5D4A = 0x3B57
-0x5D51 = 0x3B55
-0x5D55 = 0x3B54
-0x5D59 = 0x3B56
-0x5D5F = 0x3B58
-0x5D60 = 0x3B59
-0x5D61 = 0x3B5A
-0x5D62 = 0x3B5B
-0x5D64 = 0x3B5C
-0x5D6A = 0x3B5D
-0x5D6D = 0x3B5E
-0x5D70 = 0x3B5F
-0x5D79 = 0x3B60
-0x5D7A = 0x3B61
-0x5D7E = 0x3B62
-0x5D7F = 0x3B63
-0x5D81 = 0x3B64
-0x5D83 = 0x3B65
-0x5D88 = 0x3B66
-0x5D8A = 0x3B67
-0x5D92 = 0x3B68
-0x5D93 = 0x3B69
-0x5D94 = 0x3B6A
-0x5D95 = 0x3B6B
-0x5D99 = 0x3B6C
-0x5D9B = 0x3B6D
-0x5D9F = 0x3B6E
-0x5DA0 = 0x3B6F
-0x5DA7 = 0x3B70
-0x5DAB = 0x3B71
-0x5DB0 = 0x3B72
-0x5DB2 = 0x6674
-0x5DB4 = 0x3B73
-0x5DB8 = 0x3B74
-0x5DB9 = 0x3B75
-0x5DC3 = 0x3B76
-0x5DC7 = 0x3B77
-0x5DCB = 0x3B78
-0x5DCE = 0x3B7A
-0x5DD0 = 0x3B79
-0x5DD8 = 0x3B7B
-0x5DD9 = 0x3B7C
-0x5DE0 = 0x3B7D
-0x5DE4 = 0x3B7E
-0x5DE9 = 0x3C21
-0x5DF8 = 0x3C22
-0x5DF9 = 0x3C23
-0x5E00 = 0x3C24
-0x5E07 = 0x3C25
-0x5E0D = 0x3C26
-0x5E12 = 0x3C27
-0x5E14 = 0x3C28
-0x5E15 = 0x3C29
-0x5E18 = 0x3C2A
-0x5E1F = 0x3C2B
-0x5E20 = 0x3C2C
-0x5E28 = 0x3C2E
-0x5E2E = 0x3C2D
-0x5E32 = 0x3C2F
-0x5E35 = 0x3C30
-0x5E3E = 0x3C31
-0x5E49 = 0x3C34
-0x5E4B = 0x3C32
-0x5E50 = 0x3C33
-0x5E51 = 0x3C35
-0x5E56 = 0x3C36
-0x5E58 = 0x3C37
-0x5E5B = 0x3C38
-0x5E5C = 0x3C39
-0x5E5E = 0x3C3A
-0x5E68 = 0x3C3B
-0x5E6A = 0x3C3C
-0x5E6B = 0x3C3D
-0x5E6C = 0x3C3E
-0x5E6D = 0x3C3F
-0x5E6E = 0x3C40
-0x5E70 = 0x3C41
-0x5E80 = 0x3C42
-0x5E8B = 0x3C43
-0x5E8E = 0x3C44
-0x5EA2 = 0x3C45
-0x5EA4 = 0x3C46
-0x5EA5 = 0x3C47
-0x5EA8 = 0x3C48
-0x5EAA = 0x3C49
-0x5EAC = 0x3C4A
-0x5EB1 = 0x3C4B
-0x5EB3 = 0x3C4C
-0x5EBD = 0x3C4D
-0x5EBE = 0x3C4E
-0x5EBF = 0x3C4F
-0x5EC6 = 0x3C50
-0x5ECB = 0x3C52
-0x5ECC = 0x3C51
-0x5ECE = 0x3C53
-0x5ED1 = 0x3C54
-0x5ED2 = 0x3C55
-0x5ED4 = 0x3C56
-0x5ED5 = 0x3C57
-0x5EDC = 0x3C58
-0x5EDE = 0x3C59
-0x5EE5 = 0x3C5A
-0x5EEB = 0x3C5B
-0x5F02 = 0x3C5C
-0x5F06 = 0x3C5D
-0x5F07 = 0x3C5E
-0x5F08 = 0x3C5F
-0x5F0E = 0x3C60
-0x5F19 = 0x3C61
-0x5F1C = 0x3C62
-0x5F1D = 0x3C63
-0x5F21 = 0x3C64
-0x5F22 = 0x3C65
-0x5F23 = 0x3C66
-0x5F24 = 0x3C67
-0x5F28 = 0x3C68
-0x5F2B = 0x3C69
-0x5F2C = 0x3C6A
-0x5F2E = 0x3C6B
-0x5F30 = 0x3C6C
-0x5F34 = 0x3C6D
-0x5F36 = 0x3C6E
-0x5F3B = 0x3C6F
-0x5F3D = 0x3C70
-0x5F3F = 0x3C71
-0x5F40 = 0x3C72
-0x5F44 = 0x3C73
-0x5F45 = 0x3C74
-0x5F47 = 0x3C75
-0x5F4D = 0x3C76
-0x5F50 = 0x3C77
-0x5F54 = 0x3C78
-0x5F58 = 0x3C79
-0x5F5B = 0x3C7A
-0x5F60 = 0x3C7B
-0x5F63 = 0x3C7C
-0x5F64 = 0x3C7D
-0x5F67 = 0x3C7E
-0x5F6F = 0x3D21
-0x5F72 = 0x3D22
-0x5F74 = 0x3D23
-0x5F75 = 0x3D24
-0x5F78 = 0x3D25
-0x5F7A = 0x3D26
-0x5F7D = 0x3D27
-0x5F7E = 0x3D28
-0x5F89 = 0x3D29
-0x5F8D = 0x3D2A
-0x5F8F = 0x3D2B
-0x5F96 = 0x3D2C
-0x5F9C = 0x3D2D
-0x5F9D = 0x3D2E
-0x5FA2 = 0x3D2F
-0x5FA4 = 0x3D32
-0x5FA7 = 0x3D30
-0x5FAB = 0x3D31
-0x5FAC = 0x3D33
-0x5FAF = 0x3D34
-0x5FB0 = 0x3D35
-0x5FB1 = 0x3D36
-0x5FB8 = 0x3D37
-0x5FC4 = 0x3D38
-0x5FC7 = 0x3D39
-0x5FC8 = 0x3D3A
-0x5FC9 = 0x3D3B
-0x5FCB = 0x3D3C
-0x5FD0 = 0x3D3D
-0x5FD1 = 0x3D3E
-0x5FD2 = 0x3D3F
-0x5FD3 = 0x3D40
-0x5FD4 = 0x3D41
-0x5FDE = 0x3D42
-0x5FE1 = 0x3D43
-0x5FE2 = 0x3D44
-0x5FE8 = 0x3D45
-0x5FE9 = 0x3D46
-0x5FEA = 0x3D47
-0x5FEC = 0x3D48
-0x5FED = 0x3D49
-0x5FEE = 0x3D4A
-0x5FEF = 0x3D4B
-0x5FF2 = 0x3D4C
-0x5FF3 = 0x3D4D
-0x5FF6 = 0x3D4E
-0x5FFA = 0x3D4F
-0x5FFC = 0x3D50
-0x6007 = 0x3D51
-0x600A = 0x3D52
-0x600D = 0x3D53
-0x6013 = 0x3D54
-0x6014 = 0x3D55
-0x6017 = 0x3D56
-0x6018 = 0x3D57
-0x601A = 0x3D58
-0x601F = 0x3D59
-0x6024 = 0x3D5A
-0x602D = 0x3D5B
-0x6033 = 0x3D5C
-0x6035 = 0x3D5D
-0x6040 = 0x3D5E
-0x6047 = 0x3D5F
-0x6048 = 0x3D60
-0x6049 = 0x3D61
-0x604C = 0x3D62
-0x6051 = 0x3D63
-0x6054 = 0x3D64
-0x6056 = 0x3D65
-0x6057 = 0x3D66
-0x605D = 0x3D67
-0x6061 = 0x3D68
-0x6067 = 0x3D69
-0x6071 = 0x3D6A
-0x607E = 0x3D6B
-0x607F = 0x3D6C
-0x6082 = 0x3D6D
-0x6086 = 0x3D6E
-0x6088 = 0x3D6F
-0x608A = 0x3D70
-0x608E = 0x3D71
-0x6091 = 0x3D72
-0x6093 = 0x3D73
-0x6095 = 0x3D74
-0x6098 = 0x3D75
-0x609D = 0x3D76
-0x609E = 0x3D77
-0x60A2 = 0x3D78
-0x60A4 = 0x3D79
-0x60A5 = 0x3D7A
-0x60A8 = 0x3D7B
-0x60B0 = 0x3D7C
-0x60B1 = 0x3D7D
-0x60B7 = 0x3D7E
-0x60BB = 0x3E21
-0x60BE = 0x3E22
-0x60C2 = 0x3E23
-0x60C4 = 0x3E24
-0x60C8 = 0x3E25
-0x60C9 = 0x3E26
-0x60CA = 0x3E27
-0x60CB = 0x3E28
-0x60CE = 0x3E29
-0x60CF = 0x3E2A
-0x60D4 = 0x3E2B
-0x60D5 = 0x3E2C
-0x60D9 = 0x3E2D
-0x60DB = 0x3E2E
-0x60DD = 0x3E2F
-0x60DE = 0x3E30
-0x60E2 = 0x3E31
-0x60E5 = 0x3E32
-0x60F2 = 0x3E33
-0x60F5 = 0x3E34
-0x60F8 = 0x3E35
-0x60FC = 0x3E36
-0x60FD = 0x3E37
-0x6102 = 0x3E38
-0x6107 = 0x3E39
-0x610A = 0x3E3A
-0x610C = 0x3E3B
-0x6110 = 0x3E3C
-0x6111 = 0x3E3D
-0x6112 = 0x3E3E
-0x6113 = 0x3E3F
-0x6114 = 0x3E40
-0x6116 = 0x3E41
-0x6117 = 0x3E42
-0x6119 = 0x3E43
-0x611C = 0x3E44
-0x611E = 0x3E45
-0x6122 = 0x3E46
-0x612A = 0x3E47
-0x612B = 0x3E48
-0x6130 = 0x3E49
-0x6131 = 0x3E4A
-0x6135 = 0x3E4B
-0x6136 = 0x3E4C
-0x6137 = 0x3E4D
-0x6139 = 0x3E4E
-0x6141 = 0x3E4F
-0x6145 = 0x3E50
-0x6146 = 0x3E51
-0x6149 = 0x3E52
-0x615E = 0x3E53
-0x6160 = 0x3E54
-0x616C = 0x3E55
-0x6172 = 0x3E56
-0x6178 = 0x3E57
-0x617B = 0x3E58
-0x617C = 0x3E59
-0x617F = 0x3E5A
-0x6180 = 0x3E5B
-0x6181 = 0x3E5C
-0x6183 = 0x3E5D
-0x6184 = 0x3E5E
-0x618B = 0x3E5F
-0x618D = 0x3E60
-0x6192 = 0x3E61
-0x6193 = 0x3E62
-0x6197 = 0x3E63
-0x6198 = 0x3E64
-0x619C = 0x3E65
-0x619D = 0x3E66
-0x619F = 0x3E67
-0x61A0 = 0x3E68
-0x61A5 = 0x3E69
-0x61A8 = 0x3E6A
-0x61AA = 0x3E6B
-0x61AD = 0x3E6C
-0x61B8 = 0x3E6D
-0x61B9 = 0x3E6E
-0x61BC = 0x3E6F
-0x61C0 = 0x3E70
-0x61C1 = 0x3E71
-0x61C2 = 0x3E72
-0x61CE = 0x3E73
-0x61CF = 0x3E74
-0x61D5 = 0x3E75
-0x61DC = 0x3E76
-0x61DD = 0x3E77
-0x61DE = 0x3E78
-0x61DF = 0x3E79
-0x61E1 = 0x3E7A
-0x61E2 = 0x3E7B
-0x61E5 = 0x3E7E
-0x61E7 = 0x3E7C
-0x61E9 = 0x3E7D
-0x61EC = 0x3F21
-0x61ED = 0x3F22
-0x61EF = 0x3F23
-0x6201 = 0x3F24
-0x6203 = 0x3F25
-0x6204 = 0x3F26
-0x6207 = 0x3F27
-0x6213 = 0x3F28
-0x6215 = 0x3F29
-0x621C = 0x3F2A
-0x6220 = 0x3F2B
-0x6222 = 0x3F2C
-0x6223 = 0x3F2D
-0x6227 = 0x3F2E
-0x6229 = 0x3F2F
-0x622B = 0x3F30
-0x6239 = 0x3F31
-0x623D = 0x3F32
-0x6242 = 0x3F33
-0x6243 = 0x3F34
-0x6244 = 0x3F35
-0x6246 = 0x3F36
-0x624C = 0x3F37
-0x6250 = 0x3F38
-0x6251 = 0x3F39
-0x6252 = 0x3F3A
-0x6254 = 0x3F3B
-0x6256 = 0x3F3C
-0x625A = 0x3F3D
-0x625C = 0x3F3E
-0x6264 = 0x3F3F
-0x626D = 0x3F40
-0x626F = 0x3F41
-0x6273 = 0x3F42
-0x627A = 0x3F43
-0x627D = 0x3F44
-0x628D = 0x3F45
-0x628E = 0x3F46
-0x628F = 0x3F47
-0x6290 = 0x3F48
-0x62A6 = 0x3F49
-0x62A8 = 0x3F4A
-0x62B3 = 0x3F4B
-0x62B6 = 0x3F4C
-0x62B7 = 0x3F4D
-0x62BA = 0x3F4E
-0x62BE = 0x3F4F
-0x62BF = 0x3F50
-0x62C4 = 0x3F51
-0x62CE = 0x3F52
-0x62D5 = 0x3F53
-0x62D6 = 0x3F54
-0x62DA = 0x3F55
-0x62EA = 0x3F56
-0x62F2 = 0x3F57
-0x62F4 = 0x3F58
-0x62FC = 0x3F59
-0x62FD = 0x3F5A
-0x6303 = 0x3F5B
-0x6304 = 0x3F5C
-0x630A = 0x3F5D
-0x630B = 0x3F5E
-0x630D = 0x3F5F
-0x6310 = 0x3F60
-0x6313 = 0x3F61
-0x6316 = 0x3F62
-0x6318 = 0x3F63
-0x6329 = 0x3F64
-0x632A = 0x3F65
-0x632D = 0x3F66
-0x6335 = 0x3F67
-0x6336 = 0x3F68
-0x6339 = 0x3F69
-0x633C = 0x3F6A
-0x6341 = 0x3F6B
-0x6342 = 0x3F6C
-0x6343 = 0x3F6D
-0x6344 = 0x3F6E
-0x6346 = 0x3F6F
-0x634A = 0x3F70
-0x634B = 0x3F71
-0x634E = 0x3F72
-0x6352 = 0x3F73
-0x6353 = 0x3F74
-0x6354 = 0x3F75
-0x6358 = 0x3F76
-0x635B = 0x3F77
-0x6365 = 0x3F78
-0x6366 = 0x3F79
-0x636C = 0x3F7A
-0x636D = 0x3F7B
-0x6371 = 0x3F7C
-0x6374 = 0x3F7D
-0x6375 = 0x3F7E
-0x6378 = 0x4021
-0x637C = 0x4022
-0x637D = 0x4023
-0x637F = 0x4024
-0x6382 = 0x4025
-0x6384 = 0x4026
-0x6387 = 0x4027
-0x638A = 0x4028
-0x6390 = 0x4029
-0x6394 = 0x402A
-0x6395 = 0x402B
-0x6399 = 0x402C
-0x639A = 0x402D
-0x639E = 0x402E
-0x63A4 = 0x402F
-0x63A6 = 0x4030
-0x63AD = 0x4031
-0x63AE = 0x4032
-0x63AF = 0x4033
-0x63BD = 0x4034
-0x63C1 = 0x4035
-0x63C5 = 0x4036
-0x63C8 = 0x4037
-0x63CE = 0x4038
-0x63D1 = 0x4039
-0x63D3 = 0x403A
-0x63D4 = 0x403B
-0x63D5 = 0x403C
-0x63DC = 0x403D
-0x63E0 = 0x403E
-0x63E5 = 0x403F
-0x63EA = 0x4040
-0x63EC = 0x4041
-0x63F2 = 0x4042
-0x63F3 = 0x4043
-0x63F5 = 0x4044
-0x63F8 = 0x4045
-0x63F9 = 0x4046
-0x6409 = 0x4047
-0x640A = 0x4048
-0x6410 = 0x4049
-0x6412 = 0x404A
-0x6414 = 0x404B
-0x6418 = 0x404C
-0x641E = 0x404D
-0x6420 = 0x404E
-0x6422 = 0x404F
-0x6424 = 0x4050
-0x6425 = 0x4051
-0x6429 = 0x4052
-0x642A = 0x4053
-0x642F = 0x4054
-0x6430 = 0x4055
-0x6435 = 0x4056
-0x643D = 0x4057
-0x643F = 0x4058
-0x644B = 0x4059
-0x644F = 0x405A
-0x6451 = 0x405B
-0x6452 = 0x405C
-0x6453 = 0x405D
-0x6454 = 0x405E
-0x645A = 0x405F
-0x645B = 0x4060
-0x645C = 0x4061
-0x645D = 0x4062
-0x645F = 0x4063
-0x6460 = 0x4064
-0x6461 = 0x4065
-0x6463 = 0x4066
-0x646D = 0x4067
-0x6473 = 0x4068
-0x6474 = 0x4069
-0x647B = 0x406A
-0x647D = 0x406B
-0x6485 = 0x406C
-0x6487 = 0x406D
-0x648F = 0x406E
-0x6490 = 0x406F
-0x6491 = 0x4070
-0x6498 = 0x4071
-0x6499 = 0x4072
-0x649B = 0x4073
-0x649D = 0x4074
-0x649F = 0x4075
-0x64A1 = 0x4076
-0x64A3 = 0x4077
-0x64A6 = 0x4078
-0x64A8 = 0x4079
-0x64AC = 0x407A
-0x64B3 = 0x407B
-0x64BD = 0x407C
-0x64BE = 0x407D
-0x64BF = 0x407E
-0x64C4 = 0x4121
-0x64C9 = 0x4122
-0x64CA = 0x4123
-0x64CB = 0x4124
-0x64CC = 0x4125
-0x64CE = 0x4126
-0x64D0 = 0x4127
-0x64D1 = 0x4128
-0x64D5 = 0x4129
-0x64D7 = 0x412A
-0x64E4 = 0x412B
-0x64E5 = 0x412C
-0x64E9 = 0x412D
-0x64EA = 0x412E
-0x64ED = 0x412F
-0x64F0 = 0x4130
-0x64F5 = 0x4131
-0x64F7 = 0x4132
-0x64FB = 0x4133
-0x64FF = 0x4134
-0x6501 = 0x4135
-0x6504 = 0x4136
-0x6508 = 0x4137
-0x6509 = 0x4138
-0x650A = 0x4139
-0x650F = 0x413A
-0x6513 = 0x413B
-0x6514 = 0x413C
-0x6516 = 0x413D
-0x6519 = 0x413E
-0x651B = 0x413F
-0x651E = 0x4140
-0x651F = 0x4141
-0x6522 = 0x4142
-0x6526 = 0x4143
-0x6529 = 0x4144
-0x652E = 0x4145
-0x6531 = 0x4146
-0x653A = 0x4147
-0x653C = 0x4148
-0x653D = 0x4149
-0x6543 = 0x414A
-0x6547 = 0x414B
-0x6549 = 0x414C
-0x6550 = 0x414D
-0x6552 = 0x414E
-0x6554 = 0x414F
-0x655F = 0x4150
-0x6560 = 0x4151
-0x6567 = 0x4152
-0x656B = 0x4153
-0x657A = 0x4154
-0x657D = 0x4155
-0x6581 = 0x4156
-0x6585 = 0x4157
-0x658A = 0x4158
-0x6592 = 0x4159
-0x6595 = 0x415A
-0x6598 = 0x415B
-0x659D = 0x415C
-0x65A0 = 0x415D
-0x65A3 = 0x415E
-0x65A6 = 0x415F
-0x65AE = 0x4160
-0x65B2 = 0x4161
-0x65B3 = 0x4162
-0x65B4 = 0x4163
-0x65BF = 0x4164
-0x65C2 = 0x4165
-0x65C8 = 0x4166
-0x65C9 = 0x4167
-0x65CE = 0x4168
-0x65D0 = 0x4169
-0x65D4 = 0x416A
-0x65D6 = 0x416B
-0x65D8 = 0x416C
-0x65DF = 0x416D
-0x65F0 = 0x416E
-0x65F2 = 0x416F
-0x65F4 = 0x4170
-0x65F5 = 0x4171
-0x65F9 = 0x4172
-0x65FE = 0x4173
-0x65FF = 0x4174
-0x6600 = 0x4175
-0x6604 = 0x4176
-0x6608 = 0x4177
-0x6609 = 0x4178
-0x660D = 0x4179
-0x6611 = 0x417A
-0x6612 = 0x417B
-0x6615 = 0x417C
-0x6616 = 0x417D
-0x661D = 0x417E
-0x661E = 0x4221
-0x6621 = 0x4222
-0x6622 = 0x4223
-0x6623 = 0x4224
-0x6624 = 0x4225
-0x6626 = 0x4226
-0x6629 = 0x4227
-0x662A = 0x4228
-0x662B = 0x4229
-0x662C = 0x422A
-0x662E = 0x422B
-0x6630 = 0x422C
-0x6631 = 0x422D
-0x6633 = 0x422E
-0x6637 = 0x4230
-0x6639 = 0x422F
-0x6640 = 0x4231
-0x6645 = 0x4232
-0x6646 = 0x4233
-0x664A = 0x4234
-0x664C = 0x4235
-0x664E = 0x4237
-0x6651 = 0x4236
-0x6657 = 0x4238
-0x6658 = 0x4239
-0x6659 = 0x423A
-0x665B = 0x423B
-0x665C = 0x423C
-0x6660 = 0x423D
-0x6661 = 0x423E
-0x666A = 0x4240
-0x666B = 0x4241
-0x666C = 0x4242
-0x6673 = 0x4244
-0x6675 = 0x4245
-0x6677 = 0x4247
-0x6678 = 0x4248
-0x6679 = 0x4249
-0x667B = 0x424A
-0x667C = 0x424C
-0x667E = 0x4243
-0x667F = 0x4246
-0x6680 = 0x424B
-0x668B = 0x424D
-0x668C = 0x424E
-0x668D = 0x424F
-0x6690 = 0x4250
-0x6692 = 0x4251
-0x6699 = 0x4252
-0x669A = 0x4253
-0x669B = 0x4254
-0x669C = 0x4255
-0x669F = 0x4256
-0x66A0 = 0x4257
-0x66A4 = 0x4258
-0x66AD = 0x4259
-0x66B1 = 0x425A
-0x66B2 = 0x425B
-0x66B5 = 0x425C
-0x66BB = 0x425D
-0x66BF = 0x425E
-0x66C0 = 0x425F
-0x66C2 = 0x4260
-0x66C3 = 0x4261
-0x66C8 = 0x4262
-0x66CC = 0x4263
-0x66CE = 0x4264
-0x66CF = 0x4265
-0x66D4 = 0x4266
-0x66DB = 0x4267
-0x66DF = 0x4268
-0x66E8 = 0x4269
-0x66EB = 0x426A
-0x66EC = 0x426B
-0x66EE = 0x426C
-0x66FA = 0x426D
-0x66FB = 0x423F
-0x6705 = 0x426E
-0x6707 = 0x426F
-0x670E = 0x4270
-0x6713 = 0x4271
-0x6719 = 0x4272
-0x671C = 0x4273
-0x6720 = 0x4274
-0x6722 = 0x4275
-0x6733 = 0x4276
-0x673E = 0x4277
-0x6745 = 0x4278
-0x6747 = 0x4279
-0x6748 = 0x427A
-0x674C = 0x427B
-0x6754 = 0x427C
-0x6755 = 0x427D
-0x675D = 0x427E
-0x6766 = 0x4321
-0x676C = 0x4322
-0x676E = 0x4323
-0x6774 = 0x4324
-0x6776 = 0x4325
-0x677B = 0x4326
-0x6781 = 0x4327
-0x6784 = 0x4328
-0x678E = 0x4329
-0x678F = 0x432A
-0x6791 = 0x432B
-0x6793 = 0x432C
-0x6796 = 0x432D
-0x6798 = 0x432E
-0x6799 = 0x432F
-0x679B = 0x4330
-0x67B0 = 0x4331
-0x67B1 = 0x4332
-0x67B2 = 0x4333
-0x67B5 = 0x4334
-0x67BB = 0x4335
-0x67BC = 0x4336
-0x67BD = 0x4337
-0x67C0 = 0x4339
-0x67C2 = 0x433A
-0x67C3 = 0x433B
-0x67C5 = 0x433C
-0x67C8 = 0x433D
-0x67C9 = 0x433E
-0x67D2 = 0x433F
-0x67D7 = 0x4340
-0x67D9 = 0x4341
-0x67DC = 0x4342
-0x67E1 = 0x4343
-0x67E6 = 0x4344
-0x67F0 = 0x4345
-0x67F2 = 0x4346
-0x67F6 = 0x4347
-0x67F7 = 0x4348
-0x67F9 = 0x4338
-0x6814 = 0x434A
-0x6819 = 0x434B
-0x681D = 0x434C
-0x681F = 0x434D
-0x6827 = 0x434F
-0x6828 = 0x434E
-0x682C = 0x4350
-0x682D = 0x4351
-0x682F = 0x4352
-0x6830 = 0x4353
-0x6831 = 0x4354
-0x6833 = 0x4355
-0x683B = 0x4356
-0x683F = 0x4357
-0x6844 = 0x4358
-0x6845 = 0x4359
-0x684A = 0x435A
-0x684C = 0x435B
-0x6852 = 0x4349
-0x6855 = 0x435C
-0x6857 = 0x435D
-0x6858 = 0x435E
-0x685B = 0x435F
-0x686B = 0x4360
-0x686E = 0x4361
-0x686F = 0x4362
-0x6870 = 0x4363
-0x6871 = 0x4364
-0x6872 = 0x4365
-0x6875 = 0x4366
-0x6879 = 0x4367
-0x687A = 0x4368
-0x687B = 0x4369
-0x687C = 0x436A
-0x6882 = 0x436B
-0x6884 = 0x436C
-0x6886 = 0x436D
-0x6888 = 0x436E
-0x6896 = 0x436F
-0x6898 = 0x4370
-0x689A = 0x4371
-0x689C = 0x4372
-0x68A1 = 0x4373
-0x68A3 = 0x4374
-0x68A5 = 0x4375
-0x68A9 = 0x4376
-0x68AA = 0x4377
-0x68AE = 0x4378
-0x68B2 = 0x4379
-0x68BB = 0x437A
-0x68C5 = 0x437B
-0x68C8 = 0x437C
-0x68CC = 0x437D
-0x68CF = 0x437E
-0x68D0 = 0x4421
-0x68D1 = 0x4422
-0x68D3 = 0x4423
-0x68D6 = 0x4424
-0x68D9 = 0x4425
-0x68DC = 0x4426
-0x68DD = 0x4427
-0x68E5 = 0x4428
-0x68E8 = 0x4429
-0x68EA = 0x442A
-0x68EB = 0x442B
-0x68EC = 0x442C
-0x68ED = 0x442D
-0x68F0 = 0x442E
-0x68F1 = 0x442F
-0x68F5 = 0x4430
-0x68F6 = 0x4431
-0x68FB = 0x4432
-0x68FC = 0x4433
-0x68FD = 0x4434
-0x6906 = 0x4435
-0x6909 = 0x4436
-0x690A = 0x4437
-0x6910 = 0x4438
-0x6911 = 0x4439
-0x6913 = 0x443A
-0x6916 = 0x443B
-0x6917 = 0x443C
-0x6931 = 0x443D
-0x6933 = 0x443E
-0x6935 = 0x443F
-0x6938 = 0x4440
-0x693B = 0x4441
-0x6942 = 0x4442
-0x6945 = 0x4443
-0x6949 = 0x4444
-0x694E = 0x4445
-0x6957 = 0x4446
-0x695B = 0x4447
-0x6963 = 0x4448
-0x6964 = 0x4449
-0x6965 = 0x444A
-0x6966 = 0x444B
-0x6968 = 0x444C
-0x6969 = 0x444D
-0x696C = 0x444E
-0x6970 = 0x444F
-0x6971 = 0x4450
-0x6972 = 0x4451
-0x697A = 0x4452
-0x697B = 0x4453
-0x697F = 0x4454
-0x6980 = 0x4455
-0x698D = 0x4456
-0x6992 = 0x4457
-0x6996 = 0x4458
-0x6998 = 0x4459
-0x69A1 = 0x445A
-0x69A5 = 0x445B
-0x69A6 = 0x445C
-0x69A8 = 0x445D
-0x69AB = 0x445E
-0x69AD = 0x445F
-0x69AF = 0x4460
-0x69B7 = 0x4461
-0x69B8 = 0x4462
-0x69BA = 0x4463
-0x69BC = 0x4464
-0x69C5 = 0x4465
-0x69C8 = 0x4466
-0x69D1 = 0x4467
-0x69D6 = 0x4468
-0x69D7 = 0x4469
-0x69E2 = 0x446A
-0x69E5 = 0x446B
-0x69EE = 0x446C
-0x69EF = 0x446D
-0x69F1 = 0x446E
-0x69F3 = 0x446F
-0x69F5 = 0x4470
-0x69FE = 0x4471
-0x6A00 = 0x4472
-0x6A01 = 0x4473
-0x6A03 = 0x4474
-0x6A0F = 0x4475
-0x6A11 = 0x4476
-0x6A15 = 0x4477
-0x6A1A = 0x4478
-0x6A1D = 0x4479
-0x6A20 = 0x447A
-0x6A24 = 0x447B
-0x6A28 = 0x447C
-0x6A30 = 0x447D
-0x6A32 = 0x447E
-0x6A34 = 0x4521
-0x6A37 = 0x4522
-0x6A3B = 0x4523
-0x6A3E = 0x4524
-0x6A3F = 0x4525
-0x6A45 = 0x4526
-0x6A46 = 0x4527
-0x6A49 = 0x4528
-0x6A4A = 0x4529
-0x6A4E = 0x452A
-0x6A50 = 0x452B
-0x6A51 = 0x452C
-0x6A52 = 0x452D
-0x6A55 = 0x452E
-0x6A56 = 0x452F
-0x6A5B = 0x4530
-0x6A64 = 0x4531
-0x6A67 = 0x4532
-0x6A6A = 0x4533
-0x6A71 = 0x4534
-0x6A73 = 0x4535
-0x6A7E = 0x4536
-0x6A81 = 0x4537
-0x6A83 = 0x4538
-0x6A86 = 0x4539
-0x6A87 = 0x453A
-0x6A89 = 0x453B
-0x6A8B = 0x453C
-0x6A91 = 0x453D
-0x6A9B = 0x453E
-0x6A9D = 0x453F
-0x6A9E = 0x4540
-0x6A9F = 0x4541
-0x6AA5 = 0x4542
-0x6AAB = 0x4543
-0x6AAF = 0x4544
-0x6AB0 = 0x4545
-0x6AB1 = 0x4546
-0x6AB4 = 0x4547
-0x6ABD = 0x4548
-0x6ABE = 0x4549
-0x6ABF = 0x454A
-0x6AC6 = 0x454B
-0x6AC8 = 0x454D
-0x6AC9 = 0x454C
-0x6ACC = 0x454E
-0x6AD0 = 0x454F
-0x6AD4 = 0x4550
-0x6AD5 = 0x4551
-0x6AD6 = 0x4552
-0x6ADC = 0x4553
-0x6ADD = 0x4554
-0x6AE4 = 0x4555
-0x6AE7 = 0x4556
-0x6AEC = 0x4557
-0x6AF0 = 0x4558
-0x6AF1 = 0x4559
-0x6AF2 = 0x455A
-0x6AFC = 0x455B
-0x6AFD = 0x455C
-0x6B02 = 0x455D
-0x6B03 = 0x455E
-0x6B06 = 0x455F
-0x6B07 = 0x4560
-0x6B09 = 0x4561
-0x6B0F = 0x4562
-0x6B10 = 0x4563
-0x6B11 = 0x4564
-0x6B17 = 0x4565
-0x6B1B = 0x4566
-0x6B1E = 0x4567
-0x6B24 = 0x4568
-0x6B28 = 0x4569
-0x6B2B = 0x456A
-0x6B2C = 0x456B
-0x6B2F = 0x456C
-0x6B35 = 0x456D
-0x6B36 = 0x456E
-0x6B3B = 0x456F
-0x6B3F = 0x4570
-0x6B46 = 0x4571
-0x6B4A = 0x4572
-0x6B4D = 0x4573
-0x6B52 = 0x4574
-0x6B56 = 0x4575
-0x6B58 = 0x4576
-0x6B5D = 0x4577
-0x6B60 = 0x4578
-0x6B67 = 0x4579
-0x6B6B = 0x457A
-0x6B6E = 0x457B
-0x6B70 = 0x457C
-0x6B75 = 0x457D
-0x6B7D = 0x457E
-0x6B7E = 0x4621
-0x6B82 = 0x4622
-0x6B85 = 0x4623
-0x6B97 = 0x4624
-0x6B9B = 0x4625
-0x6B9F = 0x4626
-0x6BA0 = 0x4627
-0x6BA2 = 0x4628
-0x6BA3 = 0x4629
-0x6BA8 = 0x462A
-0x6BA9 = 0x462B
-0x6BAC = 0x462C
-0x6BAD = 0x462D
-0x6BAE = 0x462E
-0x6BB0 = 0x462F
-0x6BB8 = 0x4630
-0x6BB9 = 0x4631
-0x6BBD = 0x4632
-0x6BBE = 0x4633
-0x6BC3 = 0x4634
-0x6BC4 = 0x4635
-0x6BC9 = 0x4636
-0x6BCC = 0x4637
-0x6BD6 = 0x4638
-0x6BDA = 0x4639
-0x6BE1 = 0x463A
-0x6BE3 = 0x463B
-0x6BE6 = 0x463C
-0x6BE7 = 0x463D
-0x6BEE = 0x463E
-0x6BF1 = 0x463F
-0x6BF7 = 0x4640
-0x6BF9 = 0x4641
-0x6BFF = 0x4642
-0x6C02 = 0x4643
-0x6C04 = 0x4644
-0x6C05 = 0x4645
-0x6C09 = 0x4646
-0x6C0D = 0x4647
-0x6C0E = 0x4648
-0x6C10 = 0x4649
-0x6C12 = 0x464A
-0x6C19 = 0x464B
-0x6C1F = 0x464C
-0x6C26 = 0x464D
-0x6C27 = 0x464E
-0x6C28 = 0x464F
-0x6C2C = 0x4650
-0x6C2E = 0x4651
-0x6C33 = 0x4652
-0x6C35 = 0x4653
-0x6C36 = 0x4654
-0x6C3A = 0x4655
-0x6C3B = 0x4656
-0x6C3F = 0x4657
-0x6C4A = 0x4658
-0x6C4B = 0x4659
-0x6C4D = 0x465A
-0x6C4F = 0x465B
-0x6C52 = 0x465C
-0x6C54 = 0x465D
-0x6C59 = 0x465E
-0x6C5B = 0x465F
-0x6C5C = 0x4660
-0x6C67 = 0x4736
-0x6C6B = 0x4661
-0x6C6D = 0x4662
-0x6C6F = 0x4663
-0x6C74 = 0x4664
-0x6C76 = 0x4665
-0x6C78 = 0x4666
-0x6C79 = 0x4667
-0x6C7B = 0x4668
-0x6C85 = 0x4669
-0x6C86 = 0x466A
-0x6C87 = 0x466B
-0x6C89 = 0x466C
-0x6C94 = 0x466D
-0x6C95 = 0x466E
-0x6C97 = 0x466F
-0x6C98 = 0x4670
-0x6C9C = 0x4671
-0x6C9F = 0x4672
-0x6CB0 = 0x4673
-0x6CB2 = 0x4674
-0x6CB4 = 0x4675
-0x6CC2 = 0x4676
-0x6CC6 = 0x4677
-0x6CCD = 0x4678
-0x6CCF = 0x4679
-0x6CD0 = 0x467A
-0x6CD1 = 0x467B
-0x6CD2 = 0x467C
-0x6CD4 = 0x467D
-0x6CD6 = 0x467E
-0x6CDA = 0x4721
-0x6CDC = 0x4722
-0x6CE0 = 0x4723
-0x6CE7 = 0x4724
-0x6CE9 = 0x4725
-0x6CEB = 0x4726
-0x6CEC = 0x4727
-0x6CEE = 0x4728
-0x6CF2 = 0x4729
-0x6CF4 = 0x472A
-0x6D04 = 0x472B
-0x6D07 = 0x472C
-0x6D0A = 0x472D
-0x6D0E = 0x472E
-0x6D0F = 0x472F
-0x6D11 = 0x4730
-0x6D13 = 0x4731
-0x6D1A = 0x4732
-0x6D26 = 0x4733
-0x6D27 = 0x4734
-0x6D28 = 0x4735
-0x6D2E = 0x4737
-0x6D2F = 0x4738
-0x6D31 = 0x4739
-0x6D39 = 0x473A
-0x6D3C = 0x473B
-0x6D3F = 0x473C
-0x6D57 = 0x473D
-0x6D5E = 0x473E
-0x6D5F = 0x473F
-0x6D61 = 0x4740
-0x6D65 = 0x4741
-0x6D67 = 0x4742
-0x6D6F = 0x4743
-0x6D70 = 0x4744
-0x6D7C = 0x4745
-0x6D82 = 0x4746
-0x6D87 = 0x4747
-0x6D91 = 0x4748
-0x6D92 = 0x4749
-0x6D94 = 0x474A
-0x6D96 = 0x474B
-0x6D97 = 0x474C
-0x6D98 = 0x474D
-0x6DAA = 0x474E
-0x6DAC = 0x474F
-0x6DB4 = 0x4750
-0x6DB7 = 0x4751
-0x6DB9 = 0x4752
-0x6DBD = 0x4753
-0x6DBF = 0x4754
-0x6DC4 = 0x4755
-0x6DC8 = 0x4756
-0x6DCA = 0x4757
-0x6DCE = 0x4758
-0x6DCF = 0x4759
-0x6DD6 = 0x475A
-0x6DDB = 0x475B
-0x6DDD = 0x475C
-0x6DDF = 0x475D
-0x6DE0 = 0x475E
-0x6DE2 = 0x475F
-0x6DE5 = 0x4760
-0x6DE9 = 0x4761
-0x6DEF = 0x4762
-0x6DF0 = 0x4763
-0x6DF4 = 0x4764
-0x6DF6 = 0x4765
-0x6DFC = 0x4766
-0x6E00 = 0x4767
-0x6E04 = 0x4768
-0x6E1E = 0x4769
-0x6E22 = 0x476A
-0x6E27 = 0x476B
-0x6E32 = 0x476C
-0x6E36 = 0x476D
-0x6E39 = 0x476E
-0x6E3B = 0x476F
-0x6E3C = 0x4770
-0x6E44 = 0x4771
-0x6E45 = 0x4772
-0x6E48 = 0x4773
-0x6E49 = 0x4774
-0x6E4B = 0x4775
-0x6E4F = 0x4776
-0x6E51 = 0x4777
-0x6E52 = 0x4778
-0x6E53 = 0x4779
-0x6E54 = 0x477A
-0x6E57 = 0x477B
-0x6E5C = 0x477C
-0x6E5D = 0x477D
-0x6E5E = 0x477E
-0x6E62 = 0x4821
-0x6E63 = 0x4822
-0x6E68 = 0x4823
-0x6E73 = 0x4824
-0x6E7B = 0x4825
-0x6E7D = 0x4826
-0x6E8D = 0x4827
-0x6E93 = 0x4828
-0x6E99 = 0x4829
-0x6EA0 = 0x482A
-0x6EA7 = 0x482B
-0x6EAD = 0x482C
-0x6EAE = 0x482D
-0x6EB1 = 0x482E
-0x6EB3 = 0x482F
-0x6EBB = 0x4830
-0x6EBF = 0x4831
-0x6EC0 = 0x4832
-0x6EC1 = 0x4833
-0x6EC3 = 0x4834
-0x6EC7 = 0x4835
-0x6EC8 = 0x4836
-0x6ECA = 0x4837
-0x6ECD = 0x4838
-0x6ECE = 0x4839
-0x6ECF = 0x483A
-0x6EEB = 0x483B
-0x6EED = 0x483C
-0x6EEE = 0x483D
-0x6EF9 = 0x483E
-0x6EFB = 0x483F
-0x6EFD = 0x4840
-0x6F04 = 0x4841
-0x6F08 = 0x4842
-0x6F0A = 0x4843
-0x6F0C = 0x4844
-0x6F0D = 0x4845
-0x6F16 = 0x4846
-0x6F18 = 0x4847
-0x6F1A = 0x4848
-0x6F1B = 0x4849
-0x6F26 = 0x484A
-0x6F29 = 0x484B
-0x6F2A = 0x484C
-0x6F2D = 0x4853
-0x6F2F = 0x484D
-0x6F30 = 0x484E
-0x6F33 = 0x484F
-0x6F36 = 0x4850
-0x6F3B = 0x4851
-0x6F3C = 0x4852
-0x6F4F = 0x4854
-0x6F51 = 0x4855
-0x6F52 = 0x4856
-0x6F53 = 0x4857
-0x6F57 = 0x4858
-0x6F59 = 0x4859
-0x6F5A = 0x485A
-0x6F5D = 0x485B
-0x6F5E = 0x485C
-0x6F61 = 0x485D
-0x6F62 = 0x485E
-0x6F68 = 0x485F
-0x6F6C = 0x4860
-0x6F7D = 0x4861
-0x6F7E = 0x4862
-0x6F83 = 0x4863
-0x6F87 = 0x4864
-0x6F88 = 0x4865
-0x6F8B = 0x4866
-0x6F8C = 0x4867
-0x6F8D = 0x4868
-0x6F90 = 0x4869
-0x6F92 = 0x486A
-0x6F93 = 0x486B
-0x6F94 = 0x486C
-0x6F96 = 0x486D
-0x6F9A = 0x486E
-0x6F9F = 0x486F
-0x6FA0 = 0x4870
-0x6FA5 = 0x4871
-0x6FA6 = 0x4872
-0x6FA7 = 0x4873
-0x6FA8 = 0x4874
-0x6FAE = 0x4875
-0x6FAF = 0x4876
-0x6FB0 = 0x4877
-0x6FB5 = 0x4878
-0x6FB6 = 0x4879
-0x6FBC = 0x487A
-0x6FC5 = 0x487B
-0x6FC7 = 0x487C
-0x6FC8 = 0x487D
-0x6FCA = 0x487E
-0x6FDA = 0x4921
-0x6FDE = 0x4922
-0x6FE8 = 0x4923
-0x6FE9 = 0x4924
-0x6FF0 = 0x4925
-0x6FF5 = 0x4926
-0x6FF9 = 0x4927
-0x6FFC = 0x4928
-0x6FFD = 0x4929
-0x7000 = 0x492A
-0x7005 = 0x492B
-0x7006 = 0x492C
-0x7007 = 0x492D
-0x700D = 0x492E
-0x7017 = 0x492F
-0x7020 = 0x4930
-0x7023 = 0x4931
-0x702F = 0x4932
-0x7034 = 0x4933
-0x7037 = 0x4934
-0x7039 = 0x4935
-0x703C = 0x4936
-0x7043 = 0x4937
-0x7044 = 0x4938
-0x7048 = 0x4939
-0x7049 = 0x493A
-0x704A = 0x493B
-0x704B = 0x493C
-0x704E = 0x4941
-0x7054 = 0x493D
-0x7055 = 0x493E
-0x705D = 0x493F
-0x705E = 0x4940
-0x7064 = 0x4942
-0x7065 = 0x4943
-0x706C = 0x4944
-0x706E = 0x4945
-0x7075 = 0x4946
-0x7076 = 0x4947
-0x707E = 0x4948
-0x7081 = 0x4949
-0x7085 = 0x494A
-0x7086 = 0x494B
-0x7094 = 0x494C
-0x7095 = 0x494D
-0x7096 = 0x494E
-0x7097 = 0x494F
-0x7098 = 0x4950
-0x709B = 0x4951
-0x70A4 = 0x4952
-0x70AB = 0x4953
-0x70B0 = 0x4954
-0x70B1 = 0x4955
-0x70B4 = 0x4956
-0x70B7 = 0x4957
-0x70CA = 0x4958
-0x70D1 = 0x4959
-0x70D3 = 0x495A
-0x70D4 = 0x495B
-0x70D5 = 0x495C
-0x70D6 = 0x495D
-0x70D8 = 0x495E
-0x70DC = 0x495F
-0x70E4 = 0x4960
-0x70FA = 0x4961
-0x7103 = 0x4962
-0x7104 = 0x4963
-0x7105 = 0x4964
-0x7106 = 0x4965
-0x7107 = 0x4966
-0x710B = 0x4967
-0x710C = 0x4968
-0x710F = 0x4969
-0x711E = 0x496A
-0x7120 = 0x496B
-0x712B = 0x496C
-0x712D = 0x496D
-0x712F = 0x496E
-0x7130 = 0x496F
-0x7131 = 0x4970
-0x7138 = 0x4971
-0x7141 = 0x4972
-0x7145 = 0x4973
-0x7146 = 0x4974
-0x7147 = 0x4975
-0x714A = 0x4976
-0x714B = 0x4977
-0x7150 = 0x4978
-0x7152 = 0x4979
-0x7157 = 0x497A
-0x715A = 0x497B
-0x715C = 0x497C
-0x715E = 0x497D
-0x7160 = 0x497E
-0x7168 = 0x4A21
-0x7179 = 0x4A22
-0x7180 = 0x4A23
-0x7185 = 0x4A24
-0x7187 = 0x4A25
-0x718C = 0x4A26
-0x7192 = 0x4A27
-0x719A = 0x4A28
-0x719B = 0x4A29
-0x71A0 = 0x4A2A
-0x71A2 = 0x4A2B
-0x71AF = 0x4A2C
-0x71B0 = 0x4A2D
-0x71B2 = 0x4A2E
-0x71B3 = 0x4A2F
-0x71BA = 0x4A30
-0x71BF = 0x4A31
-0x71C0 = 0x4A32
-0x71C1 = 0x4A33
-0x71C4 = 0x4A34
-0x71CB = 0x4A35
-0x71CC = 0x4A36
-0x71D3 = 0x4A37
-0x71D6 = 0x4A38
-0x71D9 = 0x4A39
-0x71DA = 0x4A3A
-0x71DC = 0x4A3B
-0x71F8 = 0x4A3C
-0x71FE = 0x4A3D
-0x7200 = 0x4A3E
-0x7207 = 0x4A3F
-0x7208 = 0x4A40
-0x7209 = 0x4A41
-0x7213 = 0x4A42
-0x7217 = 0x4A43
-0x721A = 0x4A44
-0x721D = 0x4A45
-0x721F = 0x4A46
-0x7224 = 0x4A47
-0x722B = 0x4A48
-0x722F = 0x4A49
-0x7234 = 0x4A4A
-0x7238 = 0x4A4B
-0x7239 = 0x4A4C
-0x7241 = 0x4A4D
-0x7242 = 0x4A4E
-0x7243 = 0x4A4F
-0x7245 = 0x4A50
-0x724E = 0x4A51
-0x724F = 0x4A52
-0x7250 = 0x4A53
-0x7253 = 0x4A54
-0x7255 = 0x4A55
-0x7256 = 0x4A56
-0x725A = 0x4A57
-0x725C = 0x4A58
-0x725E = 0x4A59
-0x7260 = 0x4A5A
-0x7263 = 0x4A5B
-0x7268 = 0x4A5C
-0x726B = 0x4A5D
-0x726E = 0x4A5E
-0x726F = 0x4A5F
-0x7271 = 0x4A60
-0x7277 = 0x4A61
-0x7278 = 0x4A62
-0x727B = 0x4A63
-0x727C = 0x4A64
-0x727F = 0x4A65
-0x7284 = 0x4A66
-0x7289 = 0x4A67
-0x728D = 0x4A68
-0x728E = 0x4A69
-0x7293 = 0x4A6A
-0x729B = 0x4A6B
-0x72A8 = 0x4A6C
-0x72AD = 0x4A6D
-0x72AE = 0x4A6E
-0x72B1 = 0x4A6F
-0x72B4 = 0x4A70
-0x72BE = 0x4A71
-0x72C1 = 0x4A72
-0x72C7 = 0x4A73
-0x72C9 = 0x4A74
-0x72CC = 0x4A75
-0x72D5 = 0x4A76
-0x72D6 = 0x4A77
-0x72D8 = 0x4A78
-0x72DF = 0x4A79
-0x72E5 = 0x4A7A
-0x72F3 = 0x4A7B
-0x72F4 = 0x4A7C
-0x72FA = 0x4A7D
-0x72FB = 0x4A7E
-0x72FE = 0x4B21
-0x7302 = 0x4B22
-0x7304 = 0x4B23
-0x7305 = 0x4B24
-0x7307 = 0x4B25
-0x730B = 0x4B26
-0x730D = 0x4B27
-0x7312 = 0x4B28
-0x7313 = 0x4B29
-0x7318 = 0x4B2A
-0x7319 = 0x4B2B
-0x731E = 0x4B2C
-0x7322 = 0x4B2D
-0x7324 = 0x4B2E
-0x7327 = 0x4B2F
-0x7328 = 0x4B30
-0x732C = 0x4B31
-0x7331 = 0x4B32
-0x7332 = 0x4B33
-0x7335 = 0x4B34
-0x733A = 0x4B35
-0x733B = 0x4B36
-0x733D = 0x4B37
-0x7343 = 0x4B38
-0x734D = 0x4B39
-0x7350 = 0x4B3A
-0x7352 = 0x4B3B
-0x7356 = 0x4B3C
-0x7358 = 0x4B3D
-0x735D = 0x4B3E
-0x735E = 0x4B3F
-0x735F = 0x4B40
-0x7360 = 0x4B41
-0x7366 = 0x4B42
-0x7367 = 0x4B43
-0x7369 = 0x4B44
-0x736B = 0x4B45
-0x736C = 0x4B46
-0x736E = 0x4B47
-0x736F = 0x4B48
-0x7371 = 0x4B49
-0x7377 = 0x4B4A
-0x7379 = 0x4B4B
-0x737C = 0x4B4C
-0x7380 = 0x4B4D
-0x7381 = 0x4B4E
-0x7383 = 0x4B4F
-0x7385 = 0x4B50
-0x7386 = 0x4B51
-0x738E = 0x4B52
-0x7390 = 0x4B53
-0x7393 = 0x4B54
-0x7395 = 0x4B55
-0x7397 = 0x4B56
-0x7398 = 0x4B57
-0x739C = 0x4B58
-0x739E = 0x4B59
-0x739F = 0x4B5A
-0x73A0 = 0x4B5B
-0x73A2 = 0x4B5C
-0x73A5 = 0x4B5D
-0x73A6 = 0x4B5E
-0x73AA = 0x4B5F
-0x73AB = 0x4B60
-0x73AD = 0x4B61
-0x73B5 = 0x4B62
-0x73B7 = 0x4B63
-0x73B9 = 0x4B64
-0x73BC = 0x4B65
-0x73BD = 0x4B66
-0x73BF = 0x4B67
-0x73C5 = 0x4B68
-0x73C6 = 0x4B69
-0x73C9 = 0x4B6A
-0x73CB = 0x4B6B
-0x73CC = 0x4B6C
-0x73CF = 0x4B6D
-0x73D2 = 0x4B6E
-0x73D3 = 0x4B6F
-0x73D6 = 0x4B70
-0x73D9 = 0x4B71
-0x73DD = 0x4B72
-0x73E1 = 0x4B73
-0x73E3 = 0x4B74
-0x73E6 = 0x4B75
-0x73E7 = 0x4B76
-0x73E9 = 0x4B77
-0x73F4 = 0x4B78
-0x73F5 = 0x4B79
-0x73F7 = 0x4B7A
-0x73F9 = 0x4B7B
-0x73FA = 0x4B7C
-0x73FB = 0x4B7D
-0x73FD = 0x4B7E
-0x73FF = 0x4C21
-0x7400 = 0x4C22
-0x7401 = 0x4C23
-0x7404 = 0x4C24
-0x7407 = 0x4C25
-0x740A = 0x4C26
-0x7411 = 0x4C27
-0x741A = 0x4C28
-0x741B = 0x4C29
-0x7424 = 0x4C2A
-0x7426 = 0x4C2B
-0x7428 = 0x4C2C
-0x7429 = 0x4C2D
-0x742A = 0x4C2E
-0x742B = 0x4C2F
-0x742C = 0x4C30
-0x742D = 0x4C31
-0x742E = 0x4C32
-0x742F = 0x4C33
-0x7430 = 0x4C34
-0x7431 = 0x4C35
-0x7439 = 0x4C36
-0x7440 = 0x4C37
-0x7443 = 0x4C38
-0x7444 = 0x4C39
-0x7446 = 0x4C3A
-0x7447 = 0x4C3B
-0x744B = 0x4C3C
-0x744D = 0x4C3D
-0x7451 = 0x4C3E
-0x7452 = 0x4C3F
-0x7457 = 0x4C40
-0x745D = 0x4C41
-0x7462 = 0x4C42
-0x7466 = 0x4C43
-0x7467 = 0x4C44
-0x7468 = 0x4C45
-0x746B = 0x4C46
-0x746D = 0x4C47
-0x746E = 0x4C48
-0x7471 = 0x4C49
-0x7472 = 0x4C4A
-0x7480 = 0x4C4B
-0x7481 = 0x4C4C
-0x7485 = 0x4C4D
-0x7486 = 0x4C4E
-0x7487 = 0x4C4F
-0x7489 = 0x4C50
-0x748F = 0x4C51
-0x7490 = 0x4C52
-0x7491 = 0x4C53
-0x7492 = 0x4C54
-0x7498 = 0x4C55
-0x7499 = 0x4C56
-0x749A = 0x4C57
-0x749C = 0x4C58
-0x749F = 0x4C59
-0x74A0 = 0x4C5A
-0x74A1 = 0x4C5B
-0x74A3 = 0x4C5C
-0x74A6 = 0x4C5D
-0x74A8 = 0x4C5E
-0x74A9 = 0x4C5F
-0x74AA = 0x4C60
-0x74AB = 0x4C61
-0x74AE = 0x4C62
-0x74AF = 0x4C63
-0x74B1 = 0x4C64
-0x74B2 = 0x4C65
-0x74B5 = 0x4C66
-0x74B9 = 0x4C67
-0x74BB = 0x4C68
-0x74BF = 0x4C69
-0x74C8 = 0x4C6A
-0x74C9 = 0x4C6B
-0x74CC = 0x4C6C
-0x74D0 = 0x4C6D
-0x74D3 = 0x4C6E
-0x74D8 = 0x4C6F
-0x74DA = 0x4C70
-0x74DB = 0x4C71
-0x74DE = 0x4C72
-0x74DF = 0x4C73
-0x74E4 = 0x4C74
-0x74E8 = 0x4C75
-0x74EA = 0x4C76
-0x74EB = 0x4C77
-0x74EF = 0x4C78
-0x74F4 = 0x4C79
-0x74FA = 0x4C7A
-0x74FB = 0x4C7B
-0x74FC = 0x4C7C
-0x74FF = 0x4C7D
-0x7506 = 0x4C7E
-0x7512 = 0x4D21
-0x7516 = 0x4D22
-0x7517 = 0x4D23
-0x7520 = 0x4D24
-0x7521 = 0x4D25
-0x7524 = 0x4D26
-0x7527 = 0x4D27
-0x7529 = 0x4D28
-0x752A = 0x4D29
-0x752F = 0x4D2A
-0x7536 = 0x4D2B
-0x7539 = 0x4D2C
-0x753D = 0x4D2D
-0x753E = 0x4D2E
-0x753F = 0x4D2F
-0x7540 = 0x4D30
-0x7543 = 0x4D31
-0x7547 = 0x4D32
-0x7548 = 0x4D33
-0x754E = 0x4D34
-0x7550 = 0x4D35
-0x7552 = 0x4D36
-0x7557 = 0x4D37
-0x755E = 0x4D38
-0x755F = 0x4D39
-0x7561 = 0x4D3A
-0x756F = 0x4D3B
-0x7571 = 0x4D3C
-0x7579 = 0x4D3D
-0x757A = 0x4D3E
-0x757B = 0x4D3F
-0x757C = 0x4D40
-0x757D = 0x4D41
-0x757E = 0x4D42
-0x7581 = 0x4D43
-0x7585 = 0x4D44
-0x7590 = 0x4D45
-0x7592 = 0x4D46
-0x7593 = 0x4D47
-0x7595 = 0x4D48
-0x7599 = 0x4D49
-0x759C = 0x4D4A
-0x75A2 = 0x4D4B
-0x75A4 = 0x4D4C
-0x75B4 = 0x4D4D
-0x75BA = 0x4D4E
-0x75BF = 0x4D4F
-0x75C0 = 0x4D50
-0x75C1 = 0x4D51
-0x75C4 = 0x4D52
-0x75C6 = 0x4D53
-0x75CC = 0x4D54
-0x75CE = 0x4D55
-0x75CF = 0x4D56
-0x75D7 = 0x4D57
-0x75DC = 0x4D58
-0x75DF = 0x4D59
-0x75E0 = 0x4D5A
-0x75E1 = 0x4D5B
-0x75E4 = 0x4D5C
-0x75E7 = 0x4D5D
-0x75EC = 0x4D5E
-0x75EE = 0x4D5F
-0x75EF = 0x4D60
-0x75F1 = 0x4D61
-0x75F9 = 0x4D62
-0x7600 = 0x4D63
-0x7602 = 0x4D64
-0x7603 = 0x4D65
-0x7604 = 0x4D66
-0x7607 = 0x4D67
-0x7608 = 0x4D68
-0x760A = 0x4D69
-0x760C = 0x4D6A
-0x760F = 0x4D6B
-0x7612 = 0x4D6C
-0x7613 = 0x4D6D
-0x7615 = 0x4D6E
-0x7616 = 0x4D6F
-0x7619 = 0x4D70
-0x761B = 0x4D71
-0x761C = 0x4D72
-0x761D = 0x4D73
-0x761E = 0x4D74
-0x7623 = 0x4D75
-0x7625 = 0x4D76
-0x7626 = 0x4D77
-0x7629 = 0x4D78
-0x762D = 0x4D79
-0x7632 = 0x4D7A
-0x7633 = 0x4D7B
-0x7635 = 0x4D7C
-0x7638 = 0x4D7D
-0x7639 = 0x4D7E
-0x763A = 0x4E21
-0x763C = 0x4E22
-0x7640 = 0x4E24
-0x7641 = 0x4E25
-0x7643 = 0x4E26
-0x7644 = 0x4E27
-0x7645 = 0x4E28
-0x7649 = 0x4E29
-0x764A = 0x4E23
-0x764B = 0x4E2A
-0x7655 = 0x4E2B
-0x7659 = 0x4E2C
-0x765F = 0x4E2D
-0x7664 = 0x4E2E
-0x7665 = 0x4E2F
-0x766D = 0x4E30
-0x766E = 0x4E31
-0x766F = 0x4E32
-0x7671 = 0x4E33
-0x7674 = 0x4E34
-0x7681 = 0x4E35
-0x7685 = 0x4E36
-0x768C = 0x4E37
-0x768D = 0x4E38
-0x7695 = 0x4E39
-0x769B = 0x4E3A
-0x769C = 0x4E3B
-0x769D = 0x4E3C
-0x769F = 0x4E3D
-0x76A0 = 0x4E3E
-0x76A2 = 0x4E3F
-0x76A3 = 0x4E40
-0x76A4 = 0x4E41
-0x76A5 = 0x4E42
-0x76A6 = 0x4E43
-0x76A7 = 0x4E44
-0x76A8 = 0x4E45
-0x76AA = 0x4E46
-0x76AD = 0x4E47
-0x76BD = 0x4E48
-0x76C1 = 0x4E49
-0x76C5 = 0x4E4A
-0x76C9 = 0x4E4B
-0x76CB = 0x4E4C
-0x76CC = 0x4E4D
-0x76CE = 0x4E4E
-0x76D4 = 0x4E4F
-0x76D9 = 0x4E50
-0x76E0 = 0x4E51
-0x76E6 = 0x4E52
-0x76E8 = 0x4E53
-0x76EC = 0x4E54
-0x76F0 = 0x4E55
-0x76F1 = 0x4E56
-0x76F6 = 0x4E57
-0x76F9 = 0x4E58
-0x76FC = 0x4E59
-0x7700 = 0x4E5A
-0x7706 = 0x4E5B
-0x770A = 0x4E5C
-0x770E = 0x4E5D
-0x7712 = 0x4E5E
-0x7714 = 0x4E5F
-0x7715 = 0x4E60
-0x7717 = 0x4E61
-0x7719 = 0x4E62
-0x771A = 0x4E63
-0x771C = 0x4E64
-0x7722 = 0x4E65
-0x7728 = 0x4E66
-0x772D = 0x4E67
-0x772E = 0x4E68
-0x772F = 0x4E69
-0x7734 = 0x4E6A
-0x7735 = 0x4E6B
-0x7736 = 0x4E6C
-0x7739 = 0x4E6D
-0x773D = 0x4E6E
-0x773E = 0x4E6F
-0x7742 = 0x4E70
-0x7745 = 0x4E71
-0x7746 = 0x4E72
-0x774A = 0x4E73
-0x774D = 0x4E74
-0x774E = 0x4E75
-0x774F = 0x4E76
-0x7752 = 0x4E77
-0x7756 = 0x4E78
-0x7757 = 0x4E79
-0x775C = 0x4E7A
-0x775E = 0x4E7B
-0x775F = 0x4E7C
-0x7760 = 0x4E7D
-0x7762 = 0x4E7E
-0x7764 = 0x4F21
-0x7767 = 0x4F22
-0x776A = 0x4F23
-0x776C = 0x4F24
-0x7770 = 0x4F25
-0x7772 = 0x4F26
-0x7773 = 0x4F27
-0x7774 = 0x4F28
-0x777A = 0x4F29
-0x777D = 0x4F2A
-0x7780 = 0x4F2B
-0x7784 = 0x4F2C
-0x778C = 0x4F2D
-0x778D = 0x4F2E
-0x7794 = 0x4F2F
-0x7795 = 0x4F30
-0x7796 = 0x4F31
-0x779A = 0x4F32
-0x779F = 0x4F33
-0x77A2 = 0x4F34
-0x77A7 = 0x4F35
-0x77AA = 0x4F36
-0x77AE = 0x4F37
-0x77AF = 0x4F38
-0x77B1 = 0x4F39
-0x77B5 = 0x4F3A
-0x77BE = 0x4F3B
-0x77C3 = 0x4F3C
-0x77C9 = 0x4F3D
-0x77D1 = 0x4F3E
-0x77D2 = 0x4F3F
-0x77D5 = 0x4F40
-0x77D9 = 0x4F41
-0x77DE = 0x4F42
-0x77DF = 0x4F43
-0x77E0 = 0x4F44
-0x77E4 = 0x4F45
-0x77E6 = 0x4F46
-0x77EA = 0x4F47
-0x77EC = 0x4F48
-0x77F0 = 0x4F49
-0x77F1 = 0x4F4A
-0x77F4 = 0x4F4B
-0x77F8 = 0x4F4C
-0x77FB = 0x4F4D
-0x7805 = 0x4F4E
-0x7806 = 0x4F4F
-0x7809 = 0x4F50
-0x780D = 0x4F51
-0x780E = 0x4F52
-0x7811 = 0x4F53
-0x781D = 0x4F54
-0x7821 = 0x4F55
-0x7822 = 0x4F56
-0x7823 = 0x4F57
-0x782D = 0x4F58
-0x782E = 0x4F59
-0x7830 = 0x4F5A
-0x7835 = 0x4F5B
-0x7837 = 0x4F5C
-0x7843 = 0x4F5D
-0x7844 = 0x4F5E
-0x7847 = 0x4F5F
-0x7848 = 0x4F60
-0x784C = 0x4F61
-0x784E = 0x4F62
-0x7852 = 0x4F63
-0x785C = 0x4F64
-0x785E = 0x4F65
-0x7860 = 0x4F66
-0x7861 = 0x4F67
-0x7863 = 0x4F68
-0x7864 = 0x4F69
-0x7868 = 0x4F6A
-0x786A = 0x4F6B
-0x786E = 0x4F6C
-0x787A = 0x4F6D
-0x787E = 0x4F6E
-0x788A = 0x4F6F
-0x788F = 0x4F70
-0x7894 = 0x4F71
-0x7898 = 0x4F72
-0x789D = 0x4F74
-0x789E = 0x4F75
-0x789F = 0x4F76
-0x78A1 = 0x4F73
-0x78A4 = 0x4F77
-0x78A8 = 0x4F78
-0x78AC = 0x4F79
-0x78AD = 0x4F7A
-0x78B0 = 0x4F7B
-0x78B1 = 0x4F7C
-0x78B2 = 0x4F7D
-0x78B3 = 0x4F7E
-0x78BB = 0x5021
-0x78BD = 0x5022
-0x78BF = 0x5023
-0x78C7 = 0x5024
-0x78C8 = 0x5025
-0x78C9 = 0x5026
-0x78CC = 0x5027
-0x78CE = 0x5028
-0x78D2 = 0x5029
-0x78D3 = 0x502A
-0x78D5 = 0x502B
-0x78D6 = 0x502C
-0x78DB = 0x502E
-0x78DF = 0x502F
-0x78E0 = 0x5030
-0x78E1 = 0x5031
-0x78E4 = 0x502D
-0x78E6 = 0x5032
-0x78EA = 0x5033
-0x78F2 = 0x5034
-0x78F3 = 0x5035
-0x78F6 = 0x5037
-0x78F7 = 0x5038
-0x78FA = 0x5039
-0x78FB = 0x503A
-0x78FF = 0x503B
-0x7900 = 0x5036
-0x7906 = 0x503C
-0x790C = 0x503D
-0x7910 = 0x503E
-0x791A = 0x503F
-0x791C = 0x5040
-0x791E = 0x5041
-0x791F = 0x5042
-0x7920 = 0x5043
-0x7925 = 0x5044
-0x7927 = 0x5045
-0x7929 = 0x5046
-0x792D = 0x5047
-0x7931 = 0x5048
-0x7934 = 0x5049
-0x7935 = 0x504A
-0x793B = 0x504B
-0x793D = 0x504C
-0x793F = 0x504D
-0x7944 = 0x504E
-0x7945 = 0x504F
-0x7946 = 0x5050
-0x794A = 0x5051
-0x794B = 0x5052
-0x794F = 0x5053
-0x7951 = 0x5054
-0x7954 = 0x5055
-0x7958 = 0x5056
-0x795B = 0x5057
-0x795C = 0x5058
-0x7967 = 0x5059
-0x7969 = 0x505A
-0x796B = 0x505B
-0x7972 = 0x505C
-0x7979 = 0x505D
-0x797B = 0x505E
-0x797C = 0x505F
-0x797E = 0x5060
-0x798B = 0x5061
-0x798C = 0x5062
-0x7991 = 0x5063
-0x7993 = 0x5064
-0x7994 = 0x5065
-0x7995 = 0x5066
-0x7996 = 0x5067
-0x7998 = 0x5068
-0x799B = 0x5069
-0x799C = 0x506A
-0x79A1 = 0x506B
-0x79A8 = 0x506C
-0x79A9 = 0x506D
-0x79AB = 0x506E
-0x79AF = 0x506F
-0x79B1 = 0x5070
-0x79B4 = 0x5071
-0x79B8 = 0x5072
-0x79BB = 0x5073
-0x79C2 = 0x5074
-0x79C4 = 0x5075
-0x79C7 = 0x5076
-0x79C8 = 0x5077
-0x79CA = 0x5078
-0x79CF = 0x5079
-0x79D4 = 0x507A
-0x79D6 = 0x507B
-0x79DA = 0x507C
-0x79DD = 0x507D
-0x79DE = 0x507E
-0x79E0 = 0x5121
-0x79E2 = 0x5122
-0x79E5 = 0x5123
-0x79EA = 0x5124
-0x79EB = 0x5125
-0x79ED = 0x5126
-0x79F1 = 0x5127
-0x79F8 = 0x5128
-0x79FC = 0x5129
-0x7A02 = 0x512A
-0x7A03 = 0x512B
-0x7A07 = 0x512C
-0x7A09 = 0x512D
-0x7A0A = 0x512E
-0x7A0C = 0x512F
-0x7A11 = 0x5130
-0x7A15 = 0x5131
-0x7A1B = 0x5132
-0x7A1E = 0x5133
-0x7A21 = 0x5134
-0x7A27 = 0x5135
-0x7A2B = 0x5136
-0x7A2D = 0x5137
-0x7A2F = 0x5138
-0x7A30 = 0x5139
-0x7A34 = 0x513A
-0x7A35 = 0x513B
-0x7A38 = 0x513C
-0x7A39 = 0x513D
-0x7A3A = 0x513E
-0x7A44 = 0x513F
-0x7A45 = 0x5140
-0x7A47 = 0x5141
-0x7A48 = 0x5142
-0x7A4C = 0x5143
-0x7A55 = 0x5144
-0x7A56 = 0x5145
-0x7A59 = 0x5146
-0x7A5C = 0x5147
-0x7A5D = 0x5148
-0x7A5F = 0x5149
-0x7A60 = 0x514A
-0x7A65 = 0x514B
-0x7A67 = 0x514C
-0x7A6A = 0x514D
-0x7A6D = 0x514E
-0x7A75 = 0x514F
-0x7A78 = 0x5150
-0x7A7E = 0x5151
-0x7A80 = 0x5152
-0x7A82 = 0x5153
-0x7A85 = 0x5154
-0x7A86 = 0x5155
-0x7A8A = 0x5156
-0x7A8B = 0x5157
-0x7A90 = 0x5158
-0x7A91 = 0x5159
-0x7A94 = 0x515A
-0x7A9E = 0x515B
-0x7AA0 = 0x515C
-0x7AA3 = 0x515D
-0x7AAC = 0x515E
-0x7AB3 = 0x515F
-0x7AB5 = 0x5160
-0x7AB9 = 0x5161
-0x7ABB = 0x5162
-0x7ABC = 0x5163
-0x7AC6 = 0x5164
-0x7AC9 = 0x5165
-0x7ACC = 0x5166
-0x7ACE = 0x5167
-0x7AD1 = 0x5168
-0x7ADB = 0x5169
-0x7AE8 = 0x516A
-0x7AE9 = 0x516B
-0x7AEB = 0x516C
-0x7AEC = 0x516D
-0x7AF1 = 0x516E
-0x7AF4 = 0x516F
-0x7AFB = 0x5170
-0x7AFD = 0x5171
-0x7AFE = 0x5172
-0x7B07 = 0x5173
-0x7B14 = 0x5174
-0x7B1F = 0x5175
-0x7B23 = 0x5176
-0x7B27 = 0x5177
-0x7B29 = 0x5178
-0x7B2A = 0x5179
-0x7B2B = 0x517A
-0x7B2D = 0x517B
-0x7B2E = 0x517C
-0x7B2F = 0x517D
-0x7B30 = 0x517E
-0x7B31 = 0x5221
-0x7B34 = 0x5222
-0x7B3D = 0x5223
-0x7B3F = 0x5224
-0x7B40 = 0x5225
-0x7B41 = 0x5226
-0x7B47 = 0x5227
-0x7B4E = 0x5228
-0x7B55 = 0x5229
-0x7B60 = 0x522A
-0x7B64 = 0x522B
-0x7B66 = 0x522C
-0x7B69 = 0x522D
-0x7B6A = 0x522E
-0x7B6D = 0x522F
-0x7B6F = 0x5230
-0x7B72 = 0x5231
-0x7B73 = 0x5232
-0x7B77 = 0x5233
-0x7B84 = 0x5234
-0x7B89 = 0x5235
-0x7B8E = 0x5236
-0x7B90 = 0x5237
-0x7B91 = 0x5238
-0x7B96 = 0x5239
-0x7B9B = 0x523A
-0x7B9E = 0x523B
-0x7BA0 = 0x523C
-0x7BA5 = 0x523D
-0x7BAC = 0x523E
-0x7BAF = 0x523F
-0x7BB0 = 0x5240
-0x7BB2 = 0x5241
-0x7BB5 = 0x5242
-0x7BB6 = 0x5243
-0x7BBA = 0x5244
-0x7BBB = 0x5245
-0x7BBC = 0x5246
-0x7BBD = 0x5247
-0x7BC2 = 0x5248
-0x7BC5 = 0x5249
-0x7BC8 = 0x524A
-0x7BCA = 0x524B
-0x7BD4 = 0x524C
-0x7BD6 = 0x524D
-0x7BD7 = 0x524E
-0x7BD9 = 0x524F
-0x7BDA = 0x5250
-0x7BDB = 0x5251
-0x7BE8 = 0x5252
-0x7BEA = 0x5253
-0x7BF2 = 0x5254
-0x7BF4 = 0x5255
-0x7BF5 = 0x5256
-0x7BF8 = 0x5257
-0x7BF9 = 0x5258
-0x7BFA = 0x5259
-0x7BFC = 0x525A
-0x7BFE = 0x525B
-0x7C01 = 0x525C
-0x7C02 = 0x525D
-0x7C03 = 0x525E
-0x7C04 = 0x525F
-0x7C06 = 0x5260
-0x7C09 = 0x5261
-0x7C0B = 0x5262
-0x7C0C = 0x5263
-0x7C0E = 0x5264
-0x7C0F = 0x5265
-0x7C19 = 0x5266
-0x7C1B = 0x5267
-0x7C20 = 0x5268
-0x7C25 = 0x5269
-0x7C26 = 0x526A
-0x7C28 = 0x526B
-0x7C2C = 0x526C
-0x7C31 = 0x526D
-0x7C33 = 0x526E
-0x7C34 = 0x526F
-0x7C36 = 0x5270
-0x7C39 = 0x5271
-0x7C3A = 0x5272
-0x7C46 = 0x5273
-0x7C4A = 0x5274
-0x7C51 = 0x5276
-0x7C52 = 0x5277
-0x7C53 = 0x5278
-0x7C55 = 0x5275
-0x7C59 = 0x5279
-0x7C5A = 0x527A
-0x7C5B = 0x527B
-0x7C5C = 0x527C
-0x7C5D = 0x527D
-0x7C5E = 0x527E
-0x7C61 = 0x5321
-0x7C63 = 0x5322
-0x7C67 = 0x5323
-0x7C69 = 0x5324
-0x7C6D = 0x5325
-0x7C6E = 0x5326
-0x7C70 = 0x5327
-0x7C72 = 0x5328
-0x7C79 = 0x5329
-0x7C7C = 0x532A
-0x7C7D = 0x532B
-0x7C86 = 0x532C
-0x7C87 = 0x532D
-0x7C8F = 0x532E
-0x7C94 = 0x532F
-0x7C9E = 0x5330
-0x7CA0 = 0x5331
-0x7CA6 = 0x5332
-0x7CB0 = 0x5333
-0x7CB6 = 0x5334
-0x7CB7 = 0x5335
-0x7CBA = 0x5336
-0x7CBB = 0x5337
-0x7CBC = 0x5338
-0x7CBF = 0x5339
-0x7CC4 = 0x533A
-0x7CC7 = 0x533B
-0x7CC8 = 0x533C
-0x7CC9 = 0x533D
-0x7CCD = 0x533E
-0x7CCF = 0x533F
-0x7CD3 = 0x5340
-0x7CD4 = 0x5341
-0x7CD5 = 0x5342
-0x7CD7 = 0x5343
-0x7CD9 = 0x5344
-0x7CDA = 0x5345
-0x7CDD = 0x5346
-0x7CE6 = 0x5347
-0x7CE9 = 0x5348
-0x7CEB = 0x5349
-0x7CF5 = 0x534A
-0x7D03 = 0x534B
-0x7D07 = 0x534C
-0x7D08 = 0x534D
-0x7D09 = 0x534E
-0x7D0F = 0x534F
-0x7D11 = 0x5350
-0x7D12 = 0x5351
-0x7D13 = 0x5352
-0x7D16 = 0x5353
-0x7D1D = 0x5354
-0x7D1E = 0x5355
-0x7D23 = 0x5356
-0x7D26 = 0x5357
-0x7D2A = 0x5358
-0x7D2D = 0x5359
-0x7D31 = 0x535A
-0x7D3C = 0x535B
-0x7D3D = 0x535C
-0x7D3E = 0x535D
-0x7D40 = 0x535E
-0x7D41 = 0x535F
-0x7D47 = 0x5360
-0x7D48 = 0x5361
-0x7D4D = 0x5362
-0x7D51 = 0x5363
-0x7D53 = 0x5364
-0x7D57 = 0x5365
-0x7D59 = 0x5366
-0x7D5A = 0x5367
-0x7D5C = 0x5368
-0x7D5D = 0x5369
-0x7D65 = 0x536A
-0x7D67 = 0x536B
-0x7D6A = 0x536C
-0x7D70 = 0x536D
-0x7D78 = 0x536E
-0x7D7A = 0x536F
-0x7D7B = 0x5370
-0x7D7F = 0x5371
-0x7D81 = 0x5372
-0x7D82 = 0x5373
-0x7D83 = 0x5374
-0x7D85 = 0x5375
-0x7D86 = 0x5376
-0x7D88 = 0x5377
-0x7D8B = 0x5378
-0x7D8C = 0x5379
-0x7D8D = 0x537A
-0x7D91 = 0x537B
-0x7D96 = 0x537C
-0x7D97 = 0x537D
-0x7D9D = 0x537E
-0x7D9E = 0x5421
-0x7DA6 = 0x5422
-0x7DA7 = 0x5423
-0x7DAA = 0x5424
-0x7DB3 = 0x5425
-0x7DB6 = 0x5426
-0x7DB7 = 0x5427
-0x7DB9 = 0x5428
-0x7DC2 = 0x5429
-0x7DC3 = 0x542A
-0x7DC4 = 0x542B
-0x7DC5 = 0x542C
-0x7DC6 = 0x542D
-0x7DCC = 0x542E
-0x7DCD = 0x542F
-0x7DCE = 0x5430
-0x7DD7 = 0x5431
-0x7DD9 = 0x5432
-0x7DE2 = 0x5434
-0x7DE5 = 0x5435
-0x7DE6 = 0x5436
-0x7DEA = 0x5437
-0x7DEB = 0x5438
-0x7DED = 0x5439
-0x7DF1 = 0x543A
-0x7DF5 = 0x543B
-0x7DF6 = 0x543C
-0x7DF9 = 0x543D
-0x7DFA = 0x543E
-0x7E00 = 0x5433
-0x7E08 = 0x543F
-0x7E10 = 0x5440
-0x7E11 = 0x5441
-0x7E15 = 0x5442
-0x7E17 = 0x5443
-0x7E1C = 0x5444
-0x7E1D = 0x5445
-0x7E20 = 0x5446
-0x7E27 = 0x5447
-0x7E28 = 0x5448
-0x7E2C = 0x5449
-0x7E2D = 0x544A
-0x7E2F = 0x544B
-0x7E33 = 0x544C
-0x7E36 = 0x544D
-0x7E3F = 0x544E
-0x7E44 = 0x544F
-0x7E45 = 0x5450
-0x7E47 = 0x5451
-0x7E4E = 0x5452
-0x7E50 = 0x5453
-0x7E52 = 0x5454
-0x7E58 = 0x5455
-0x7E5F = 0x5456
-0x7E61 = 0x5457
-0x7E62 = 0x5458
-0x7E65 = 0x5459
-0x7E6B = 0x545A
-0x7E6E = 0x545B
-0x7E6F = 0x545C
-0x7E73 = 0x545D
-0x7E78 = 0x545E
-0x7E7E = 0x545F
-0x7E81 = 0x5460
-0x7E86 = 0x5461
-0x7E87 = 0x5462
-0x7E8A = 0x5463
-0x7E8D = 0x5464
-0x7E91 = 0x5465
-0x7E95 = 0x5466
-0x7E98 = 0x5467
-0x7E9A = 0x5468
-0x7E9D = 0x5469
-0x7E9E = 0x546A
-0x7F3B = 0x546C
-0x7F3C = 0x546B
-0x7F3D = 0x546D
-0x7F3E = 0x546E
-0x7F3F = 0x546F
-0x7F43 = 0x5470
-0x7F44 = 0x5471
-0x7F47 = 0x5472
-0x7F4F = 0x5473
-0x7F52 = 0x5474
-0x7F53 = 0x5475
-0x7F5B = 0x5476
-0x7F5C = 0x5477
-0x7F5D = 0x5478
-0x7F61 = 0x5479
-0x7F63 = 0x547A
-0x7F64 = 0x547B
-0x7F65 = 0x547C
-0x7F66 = 0x547D
-0x7F6D = 0x547E
-0x7F71 = 0x5521
-0x7F7D = 0x5522
-0x7F7E = 0x5523
-0x7F7F = 0x5524
-0x7F80 = 0x5525
-0x7F8B = 0x5526
-0x7F8D = 0x5527
-0x7F8F = 0x5528
-0x7F90 = 0x5529
-0x7F91 = 0x552A
-0x7F96 = 0x552B
-0x7F97 = 0x552C
-0x7F9C = 0x552D
-0x7FA1 = 0x552E
-0x7FA2 = 0x552F
-0x7FA6 = 0x5530
-0x7FAA = 0x5531
-0x7FAD = 0x5532
-0x7FB4 = 0x5533
-0x7FBC = 0x5534
-0x7FBF = 0x5535
-0x7FC0 = 0x5536
-0x7FC3 = 0x5537
-0x7FC8 = 0x5538
-0x7FCE = 0x5539
-0x7FCF = 0x553A
-0x7FDB = 0x553B
-0x7FDF = 0x553C
-0x7FE3 = 0x553D
-0x7FE5 = 0x553E
-0x7FE8 = 0x553F
-0x7FEC = 0x5540
-0x7FEE = 0x5541
-0x7FEF = 0x5542
-0x7FF2 = 0x5543
-0x7FFA = 0x5544
-0x7FFD = 0x5545
-0x7FFE = 0x5546
-0x7FFF = 0x5547
-0x8007 = 0x5548
-0x8008 = 0x5549
-0x800A = 0x554A
-0x800D = 0x554B
-0x800E = 0x554C
-0x800F = 0x554D
-0x8011 = 0x554E
-0x8013 = 0x554F
-0x8014 = 0x5550
-0x8016 = 0x5551
-0x801D = 0x5552
-0x801E = 0x5553
-0x801F = 0x5554
-0x8020 = 0x5555
-0x8024 = 0x5556
-0x8026 = 0x5557
-0x802C = 0x5558
-0x802E = 0x5559
-0x8030 = 0x555A
-0x8034 = 0x555B
-0x8035 = 0x555C
-0x8037 = 0x555D
-0x8039 = 0x555E
-0x803A = 0x555F
-0x803C = 0x5560
-0x803E = 0x5561
-0x8040 = 0x5562
-0x8044 = 0x5563
-0x8060 = 0x5564
-0x8064 = 0x5565
-0x8066 = 0x5566
-0x806D = 0x5567
-0x8071 = 0x5568
-0x8075 = 0x5569
-0x8081 = 0x556A
-0x8088 = 0x556B
-0x808E = 0x556C
-0x809C = 0x556D
-0x809E = 0x556E
-0x80A6 = 0x556F
-0x80A7 = 0x5570
-0x80AB = 0x5571
-0x80B8 = 0x5572
-0x80B9 = 0x5573
-0x80C8 = 0x5574
-0x80CD = 0x5575
-0x80CF = 0x5576
-0x80D2 = 0x5577
-0x80D4 = 0x5578
-0x80D5 = 0x5579
-0x80D7 = 0x557A
-0x80D8 = 0x557B
-0x80E0 = 0x557C
-0x80ED = 0x557D
-0x80EE = 0x557E
-0x80F0 = 0x5621
-0x80F2 = 0x5622
-0x80F3 = 0x5623
-0x80F6 = 0x5624
-0x80F9 = 0x5625
-0x80FA = 0x5626
-0x80FE = 0x5627
-0x8103 = 0x5628
-0x810B = 0x5629
-0x8116 = 0x562A
-0x8117 = 0x562B
-0x8118 = 0x562C
-0x811C = 0x562D
-0x811E = 0x562E
-0x8120 = 0x562F
-0x8124 = 0x5630
-0x8127 = 0x5631
-0x812C = 0x5632
-0x8130 = 0x5633
-0x8135 = 0x5634
-0x813A = 0x5635
-0x813C = 0x5636
-0x8145 = 0x5637
-0x8147 = 0x5638
-0x814A = 0x5639
-0x814C = 0x563A
-0x8152 = 0x563B
-0x8157 = 0x563C
-0x8160 = 0x563D
-0x8161 = 0x563E
-0x8167 = 0x563F
-0x8168 = 0x5640
-0x8169 = 0x5641
-0x816D = 0x5642
-0x816F = 0x5643
-0x8177 = 0x5644
-0x8181 = 0x5645
-0x8184 = 0x5647
-0x8185 = 0x5648
-0x8186 = 0x5649
-0x818B = 0x564A
-0x818E = 0x564B
-0x8190 = 0x5646
-0x8196 = 0x564C
-0x8198 = 0x564D
-0x819B = 0x564E
-0x819E = 0x564F
-0x81A2 = 0x5650
-0x81AE = 0x5651
-0x81B2 = 0x5652
-0x81B4 = 0x5653
-0x81BB = 0x5654
-0x81C3 = 0x5656
-0x81C5 = 0x5657
-0x81CA = 0x5658
-0x81CB = 0x5655
-0x81CE = 0x5659
-0x81CF = 0x565A
-0x81D5 = 0x565B
-0x81D7 = 0x565C
-0x81DB = 0x565D
-0x81DD = 0x565E
-0x81DE = 0x565F
-0x81E1 = 0x5660
-0x81E4 = 0x5661
-0x81EB = 0x5662
-0x81EC = 0x5663
-0x81F0 = 0x5664
-0x81F1 = 0x5665
-0x81F2 = 0x5666
-0x81F5 = 0x5667
-0x81F6 = 0x5668
-0x81F8 = 0x5669
-0x81F9 = 0x566A
-0x81FD = 0x566B
-0x81FF = 0x566C
-0x8200 = 0x566D
-0x8203 = 0x566E
-0x820F = 0x566F
-0x8213 = 0x5670
-0x8214 = 0x5671
-0x8219 = 0x5672
-0x821A = 0x5673
-0x821D = 0x5674
-0x8221 = 0x5675
-0x8222 = 0x5676
-0x8228 = 0x5677
-0x8232 = 0x5678
-0x8234 = 0x5679
-0x823A = 0x567A
-0x8243 = 0x567B
-0x8244 = 0x567C
-0x8245 = 0x567D
-0x8246 = 0x567E
-0x824B = 0x5721
-0x824E = 0x5722
-0x824F = 0x5723
-0x8251 = 0x5724
-0x8256 = 0x5725
-0x825C = 0x5726
-0x8260 = 0x5727
-0x8263 = 0x5728
-0x8267 = 0x5729
-0x826D = 0x572A
-0x8274 = 0x572B
-0x827B = 0x572C
-0x827D = 0x572D
-0x827F = 0x572E
-0x8280 = 0x572F
-0x8281 = 0x5730
-0x8283 = 0x5731
-0x8284 = 0x5732
-0x8287 = 0x5733
-0x8289 = 0x5734
-0x828A = 0x5735
-0x828E = 0x5736
-0x8291 = 0x5737
-0x8294 = 0x5738
-0x8296 = 0x5739
-0x8298 = 0x573A
-0x829A = 0x573B
-0x829B = 0x573C
-0x82A0 = 0x573D
-0x82A1 = 0x573E
-0x82A3 = 0x573F
-0x82A4 = 0x5740
-0x82A7 = 0x5741
-0x82A8 = 0x5742
-0x82A9 = 0x5743
-0x82AA = 0x5744
-0x82AE = 0x5745
-0x82B0 = 0x5746
-0x82B2 = 0x5747
-0x82B4 = 0x5748
-0x82B7 = 0x5749
-0x82BA = 0x574A
-0x82BC = 0x574B
-0x82BE = 0x574C
-0x82BF = 0x574D
-0x82C6 = 0x574E
-0x82D0 = 0x574F
-0x82D5 = 0x5750
-0x82DA = 0x5751
-0x82E0 = 0x5752
-0x82E2 = 0x5753
-0x82E4 = 0x5754
-0x82E8 = 0x5755
-0x82EA = 0x5756
-0x82ED = 0x5757
-0x82EF = 0x5758
-0x82F6 = 0x5759
-0x82F7 = 0x575A
-0x82FD = 0x575B
-0x82FE = 0x575C
-0x8300 = 0x575D
-0x8301 = 0x575E
-0x8307 = 0x575F
-0x8308 = 0x5760
-0x830A = 0x5761
-0x830B = 0x5762
-0x831B = 0x5764
-0x831D = 0x5765
-0x831E = 0x5766
-0x831F = 0x5767
-0x8321 = 0x5768
-0x8322 = 0x5769
-0x832C = 0x576A
-0x832D = 0x576B
-0x832E = 0x576C
-0x8330 = 0x576D
-0x8333 = 0x576E
-0x8337 = 0x576F
-0x833A = 0x5770
-0x833C = 0x5771
-0x833D = 0x5772
-0x8342 = 0x5773
-0x8343 = 0x5774
-0x8344 = 0x5775
-0x8347 = 0x5776
-0x834D = 0x5777
-0x834E = 0x5778
-0x8351 = 0x5779
-0x8353 = 0x583E
-0x8354 = 0x5763
-0x8355 = 0x577A
-0x8356 = 0x577B
-0x8357 = 0x577C
-0x8370 = 0x577D
-0x8378 = 0x577E
-0x837D = 0x5821
-0x837F = 0x5822
-0x8380 = 0x5823
-0x8382 = 0x5824
-0x8384 = 0x5825
-0x8386 = 0x5826
-0x838D = 0x5827
-0x8392 = 0x5828
-0x8394 = 0x5829
-0x8395 = 0x582A
-0x8398 = 0x582B
-0x8399 = 0x582C
-0x839B = 0x582D
-0x839C = 0x582E
-0x839D = 0x582F
-0x83A6 = 0x5830
-0x83A7 = 0x5831
-0x83A9 = 0x5832
-0x83AC = 0x5833
-0x83AD = 0x584C
-0x83BE = 0x5834
-0x83BF = 0x5835
-0x83C0 = 0x5836
-0x83C7 = 0x5837
-0x83C9 = 0x5838
-0x83CF = 0x5839
-0x83D0 = 0x583A
-0x83D1 = 0x583B
-0x83D4 = 0x583C
-0x83DD = 0x583D
-0x83E8 = 0x583F
-0x83EA = 0x5840
-0x83F6 = 0x5841
-0x83F8 = 0x5842
-0x83F9 = 0x5843
-0x83FC = 0x5844
-0x8401 = 0x5845
-0x8406 = 0x5846
-0x840A = 0x5847
-0x840F = 0x5848
-0x8411 = 0x5849
-0x8415 = 0x584A
-0x8419 = 0x584B
-0x842F = 0x584D
-0x8439 = 0x584E
-0x8445 = 0x584F
-0x8447 = 0x5850
-0x8448 = 0x5851
-0x844A = 0x5852
-0x844D = 0x5853
-0x844F = 0x5854
-0x8451 = 0x5855
-0x8452 = 0x5856
-0x8456 = 0x5857
-0x8458 = 0x5858
-0x8459 = 0x5859
-0x845A = 0x585A
-0x845C = 0x585B
-0x8460 = 0x585C
-0x8464 = 0x585D
-0x8465 = 0x585E
-0x8467 = 0x585F
-0x846A = 0x5860
-0x8470 = 0x5861
-0x8473 = 0x5862
-0x8474 = 0x5863
-0x8476 = 0x5864
-0x8478 = 0x5865
-0x847C = 0x5866
-0x847D = 0x5867
-0x8481 = 0x5868
-0x8485 = 0x5869
-0x8492 = 0x586A
-0x8493 = 0x586B
-0x8495 = 0x586C
-0x849E = 0x586D
-0x84A6 = 0x586E
-0x84A8 = 0x586F
-0x84A9 = 0x5870
-0x84AA = 0x5871
-0x84AF = 0x5872
-0x84B1 = 0x5873
-0x84B4 = 0x5874
-0x84BA = 0x5875
-0x84BD = 0x5876
-0x84BE = 0x5877
-0x84C0 = 0x5878
-0x84C2 = 0x5879
-0x84C7 = 0x587A
-0x84C8 = 0x587B
-0x84CC = 0x587C
-0x84CF = 0x587D
-0x84D3 = 0x587E
-0x84DC = 0x5921
-0x84E7 = 0x5922
-0x84EA = 0x5923
-0x84EF = 0x5924
-0x84F0 = 0x5925
-0x84F1 = 0x5926
-0x84F2 = 0x5927
-0x84F7 = 0x5928
-0x84FA = 0x592A
-0x84FB = 0x592B
-0x84FD = 0x592C
-0x8502 = 0x592D
-0x8503 = 0x592E
-0x8507 = 0x592F
-0x850C = 0x5930
-0x850E = 0x5931
-0x8510 = 0x5932
-0x851C = 0x5933
-0x851E = 0x5934
-0x8522 = 0x5935
-0x8523 = 0x5936
-0x8524 = 0x5937
-0x8525 = 0x5938
-0x8527 = 0x5939
-0x852A = 0x593A
-0x852B = 0x593B
-0x852F = 0x593C
-0x8532 = 0x5929
-0x8533 = 0x593D
-0x8534 = 0x593E
-0x8536 = 0x593F
-0x853F = 0x5940
-0x8546 = 0x5941
-0x854F = 0x5942
-0x8550 = 0x5943
-0x8551 = 0x5944
-0x8552 = 0x5945
-0x8553 = 0x5946
-0x8556 = 0x5947
-0x8559 = 0x5948
-0x855C = 0x5949
-0x855D = 0x594A
-0x855E = 0x594B
-0x855F = 0x594C
-0x8560 = 0x594D
-0x8561 = 0x594E
-0x8562 = 0x594F
-0x8564 = 0x5950
-0x856B = 0x5951
-0x856F = 0x5952
-0x8579 = 0x5953
-0x857A = 0x5954
-0x857B = 0x5955
-0x857D = 0x5956
-0x857F = 0x5957
-0x8581 = 0x5958
-0x8585 = 0x5959
-0x8586 = 0x595A
-0x8589 = 0x595B
-0x858B = 0x595C
-0x858C = 0x595D
-0x858F = 0x595E
-0x8593 = 0x595F
-0x8598 = 0x5960
-0x859D = 0x5961
-0x859F = 0x5962
-0x85A0 = 0x5963
-0x85A2 = 0x5964
-0x85A5 = 0x5965
-0x85A7 = 0x5966
-0x85AD = 0x5974
-0x85B4 = 0x5967
-0x85B6 = 0x5968
-0x85B7 = 0x5969
-0x85B8 = 0x596A
-0x85BC = 0x596B
-0x85BD = 0x596C
-0x85BE = 0x596D
-0x85BF = 0x596E
-0x85C2 = 0x596F
-0x85C7 = 0x5970
-0x85CA = 0x5971
-0x85CB = 0x5972
-0x85CE = 0x5973
-0x85D8 = 0x5975
-0x85DA = 0x5976
-0x85DF = 0x5977
-0x85E0 = 0x5978
-0x85E6 = 0x5979
-0x85E8 = 0x597A
-0x85ED = 0x597B
-0x85F3 = 0x597C
-0x85F6 = 0x597D
-0x85FC = 0x597E
-0x85FF = 0x5A21
-0x8600 = 0x5A22
-0x8604 = 0x5A23
-0x8605 = 0x5A24
-0x860D = 0x5A25
-0x860E = 0x5A26
-0x8610 = 0x5A27
-0x8611 = 0x5A28
-0x8612 = 0x5A29
-0x8618 = 0x5A2A
-0x8619 = 0x5A2B
-0x861B = 0x5A2C
-0x861E = 0x5A2D
-0x8621 = 0x5A2E
-0x8627 = 0x5A2F
-0x8629 = 0x5A30
-0x8636 = 0x5A31
-0x8638 = 0x5A32
-0x863A = 0x5A33
-0x863C = 0x5A34
-0x863D = 0x5A35
-0x8640 = 0x5A36
-0x8641 = 0x3866
-0x8642 = 0x5A37
-0x8646 = 0x5A38
-0x8652 = 0x5A39
-0x8653 = 0x5A3A
-0x8656 = 0x5A3B
-0x8657 = 0x5A3C
-0x8658 = 0x5A3D
-0x8659 = 0x5A3E
-0x865D = 0x5A3F
-0x8660 = 0x5A40
-0x8661 = 0x5A41
-0x8662 = 0x5A42
-0x8663 = 0x5A43
-0x8664 = 0x5A44
-0x8669 = 0x5A45
-0x866C = 0x5A46
-0x866F = 0x5A47
-0x8675 = 0x5A48
-0x8676 = 0x5A49
-0x8677 = 0x5A4A
-0x867A = 0x5A4B
-0x8688 = 0x5A6D
-0x868D = 0x5A4C
-0x8691 = 0x5A4D
-0x8696 = 0x5A4E
-0x8698 = 0x5A4F
-0x869A = 0x5A50
-0x869C = 0x5A51
-0x86A1 = 0x5A52
-0x86A6 = 0x5A53
-0x86A7 = 0x5A54
-0x86A8 = 0x5A55
-0x86AD = 0x5A56
-0x86B1 = 0x5A57
-0x86B3 = 0x5A58
-0x86B4 = 0x5A59
-0x86B5 = 0x5A5A
-0x86B7 = 0x5A5B
-0x86B8 = 0x5A5C
-0x86B9 = 0x5A5D
-0x86BF = 0x5A5E
-0x86C0 = 0x5A5F
-0x86C1 = 0x5A60
-0x86C3 = 0x5A61
-0x86C5 = 0x5A62
-0x86D1 = 0x5A63
-0x86D2 = 0x5A64
-0x86D5 = 0x5A65
-0x86D7 = 0x5A66
-0x86DA = 0x5A67
-0x86DC = 0x5A68
-0x86E0 = 0x5A69
-0x86E3 = 0x5A6A
-0x86E5 = 0x5A6B
-0x86E7 = 0x5A6C
-0x86FA = 0x5A6E
-0x86FC = 0x5A6F
-0x86FD = 0x5A70
-0x8704 = 0x5A71
-0x8705 = 0x5A72
-0x8707 = 0x5A73
-0x870B = 0x5A74
-0x870E = 0x5A75
-0x870F = 0x5A76
-0x8710 = 0x5A77
-0x8713 = 0x5A78
-0x8714 = 0x5A79
-0x8719 = 0x5A7A
-0x871E = 0x5A7B
-0x871F = 0x5A7C
-0x8721 = 0x5A7D
-0x8723 = 0x5A7E
-0x8728 = 0x5B21
-0x872E = 0x5B22
-0x872F = 0x5B23
-0x8731 = 0x5B24
-0x8732 = 0x5B25
-0x8739 = 0x5B26
-0x873A = 0x5B27
-0x873C = 0x5B28
-0x873D = 0x5B29
-0x873E = 0x5B2A
-0x8740 = 0x5B2B
-0x8743 = 0x5B2C
-0x8745 = 0x5B2D
-0x874D = 0x5B2E
-0x8758 = 0x5B2F
-0x875D = 0x5B30
-0x8761 = 0x5B31
-0x8764 = 0x5B32
-0x8765 = 0x5B33
-0x876F = 0x5B34
-0x8771 = 0x5B35
-0x8772 = 0x5B36
-0x877B = 0x5B37
-0x8783 = 0x5B38
-0x8784 = 0x5B39
-0x8785 = 0x5B3A
-0x8786 = 0x5B3B
-0x8787 = 0x5B3C
-0x8788 = 0x5B3D
-0x8789 = 0x5B3E
-0x878B = 0x5B3F
-0x878C = 0x5B40
-0x8790 = 0x5B41
-0x8793 = 0x5B42
-0x8795 = 0x5B43
-0x8797 = 0x5B44
-0x8798 = 0x5B45
-0x8799 = 0x5B46
-0x879E = 0x5B47
-0x87A0 = 0x5B48
-0x87A3 = 0x5B49
-0x87A7 = 0x5B4A
-0x87AC = 0x5B4B
-0x87AD = 0x5B4C
-0x87AE = 0x5B4D
-0x87B1 = 0x5B4E
-0x87B5 = 0x5B4F
-0x87BE = 0x5B50
-0x87BF = 0x5B51
-0x87C1 = 0x5B52
-0x87C8 = 0x5B53
-0x87C9 = 0x5B54
-0x87CA = 0x5B55
-0x87CE = 0x5B56
-0x87D5 = 0x5B57
-0x87D6 = 0x5B58
-0x87D9 = 0x5B59
-0x87DA = 0x5B5A
-0x87DC = 0x5B5B
-0x87DF = 0x5B5C
-0x87E2 = 0x5B5D
-0x87E3 = 0x5B5E
-0x87E4 = 0x5B5F
-0x87EA = 0x5B60
-0x87EB = 0x5B61
-0x87ED = 0x5B62
-0x87F1 = 0x5B63
-0x87F3 = 0x5B64
-0x87F8 = 0x5B65
-0x87FA = 0x5B66
-0x87FF = 0x5B67
-0x8801 = 0x5B68
-0x8803 = 0x5B69
-0x8806 = 0x5B6A
-0x8809 = 0x5B6B
-0x880A = 0x5B6C
-0x880B = 0x5B6D
-0x8810 = 0x5B6E
-0x8812 = 0x5B70
-0x8813 = 0x5B71
-0x8814 = 0x5B72
-0x8818 = 0x5B73
-0x8819 = 0x5B6F
-0x881A = 0x5B74
-0x881B = 0x5B75
-0x881C = 0x5B76
-0x881E = 0x5B77
-0x881F = 0x5B78
-0x8828 = 0x5B79
-0x882D = 0x5B7A
-0x882E = 0x5B7B
-0x8830 = 0x5B7C
-0x8832 = 0x5B7D
-0x8835 = 0x5B7E
-0x883A = 0x5C21
-0x883C = 0x5C22
-0x8841 = 0x5C23
-0x8843 = 0x5C24
-0x8845 = 0x5C25
-0x8848 = 0x5C26
-0x8849 = 0x5C27
-0x884A = 0x5C28
-0x884B = 0x5C29
-0x884E = 0x5C2A
-0x8851 = 0x5C2B
-0x8855 = 0x5C2C
-0x8856 = 0x5C2D
-0x8858 = 0x5C2E
-0x885A = 0x5C2F
-0x885C = 0x5C30
-0x885F = 0x5C31
-0x8860 = 0x5C32
-0x8864 = 0x5C33
-0x8869 = 0x5C34
-0x8871 = 0x5C35
-0x8879 = 0x5C36
-0x887B = 0x5C37
-0x8880 = 0x5C38
-0x8898 = 0x5C39
-0x889A = 0x5C3A
-0x889B = 0x5C3B
-0x889C = 0x5C3C
-0x889F = 0x5C3D
-0x88A0 = 0x5C3E
-0x88A8 = 0x5C3F
-0x88AA = 0x5C40
-0x88BA = 0x5C41
-0x88BD = 0x5C42
-0x88BE = 0x5C43
-0x88C0 = 0x5C44
-0x88CA = 0x5C45
-0x88CB = 0x5C46
-0x88CC = 0x5C47
-0x88CD = 0x5C48
-0x88CE = 0x5C49
-0x88D1 = 0x5C4A
-0x88D2 = 0x5C4B
-0x88D3 = 0x5C4C
-0x88DB = 0x5C4D
-0x88DE = 0x5C4E
-0x88E7 = 0x5C4F
-0x88EF = 0x5C50
-0x88F0 = 0x5C51
-0x88F1 = 0x5C52
-0x88F5 = 0x5C53
-0x88F7 = 0x5C54
-0x8901 = 0x5C55
-0x8906 = 0x5C56
-0x890D = 0x5C57
-0x890E = 0x5C58
-0x890F = 0x5C59
-0x8915 = 0x5C5A
-0x8916 = 0x5C5B
-0x8918 = 0x5C5C
-0x8919 = 0x5C5D
-0x891A = 0x5C5E
-0x891C = 0x5C5F
-0x8920 = 0x5C60
-0x8926 = 0x5C61
-0x8927 = 0x5C62
-0x8928 = 0x5C63
-0x8930 = 0x5C64
-0x8931 = 0x5C65
-0x8932 = 0x5C66
-0x8935 = 0x5C67
-0x8939 = 0x5C68
-0x893A = 0x5C69
-0x893E = 0x5C6A
-0x8940 = 0x5C6B
-0x8942 = 0x5C6C
-0x8945 = 0x5C6D
-0x8946 = 0x5C6E
-0x8949 = 0x5C6F
-0x894F = 0x5C70
-0x8952 = 0x5C71
-0x8957 = 0x5C72
-0x895A = 0x5C73
-0x895B = 0x5C74
-0x895C = 0x5C75
-0x8961 = 0x5C76
-0x8962 = 0x5C77
-0x8963 = 0x5C78
-0x896B = 0x5C79
-0x896E = 0x5C7A
-0x8970 = 0x5C7B
-0x8973 = 0x5C7C
-0x8975 = 0x5C7D
-0x897A = 0x5C7E
-0x897B = 0x5D21
-0x897C = 0x5D22
-0x897D = 0x5D23
-0x8989 = 0x5D24
-0x898D = 0x5D25
-0x8990 = 0x5D26
-0x8994 = 0x5D27
-0x8995 = 0x5D28
-0x899B = 0x5D29
-0x899C = 0x5D2A
-0x899F = 0x5D2B
-0x89A0 = 0x5D2C
-0x89A5 = 0x5D2D
-0x89B0 = 0x5D2E
-0x89B4 = 0x5D2F
-0x89B5 = 0x5D30
-0x89B6 = 0x5D31
-0x89B7 = 0x5D32
-0x89BC = 0x5D33
-0x89D4 = 0x5D34
-0x89D5 = 0x5D35
-0x89D6 = 0x5D36
-0x89D7 = 0x5D37
-0x89D8 = 0x5D38
-0x89E5 = 0x5D39
-0x89E9 = 0x5D3A
-0x89EB = 0x5D3B
-0x89ED = 0x5D3C
-0x89F1 = 0x5D3D
-0x89F3 = 0x5D3E
-0x89F6 = 0x5D3F
-0x89F9 = 0x5D40
-0x89FD = 0x5D41
-0x89FF = 0x5D42
-0x8A04 = 0x5D43
-0x8A05 = 0x5D44
-0x8A07 = 0x5D45
-0x8A0F = 0x5D46
-0x8A11 = 0x5D47
-0x8A12 = 0x5D48
-0x8A14 = 0x5D49
-0x8A15 = 0x5D4A
-0x8A1E = 0x5D4B
-0x8A20 = 0x5D4C
-0x8A22 = 0x5D4D
-0x8A24 = 0x5D4E
-0x8A26 = 0x5D4F
-0x8A2B = 0x5D50
-0x8A2C = 0x5D51
-0x8A2F = 0x5D52
-0x8A35 = 0x5D53
-0x8A37 = 0x5D54
-0x8A3D = 0x5D55
-0x8A3E = 0x5D56
-0x8A40 = 0x5D57
-0x8A43 = 0x5D58
-0x8A45 = 0x5D59
-0x8A47 = 0x5D5A
-0x8A49 = 0x5D5B
-0x8A4D = 0x5D5C
-0x8A4E = 0x5D5D
-0x8A53 = 0x5D5E
-0x8A56 = 0x5D5F
-0x8A57 = 0x5D60
-0x8A58 = 0x5D61
-0x8A5C = 0x5D62
-0x8A5D = 0x5D63
-0x8A61 = 0x5D64
-0x8A65 = 0x5D65
-0x8A67 = 0x5D66
-0x8A75 = 0x5D67
-0x8A76 = 0x5D68
-0x8A77 = 0x5D69
-0x8A79 = 0x5D6A
-0x8A7A = 0x5D6B
-0x8A7B = 0x5D6C
-0x8A7E = 0x5D6D
-0x8A7F = 0x5D6E
-0x8A80 = 0x5D6F
-0x8A83 = 0x5D70
-0x8A86 = 0x5D71
-0x8A8B = 0x5D72
-0x8A8F = 0x5D73
-0x8A90 = 0x5D74
-0x8A92 = 0x5D75
-0x8A96 = 0x5D76
-0x8A97 = 0x5D77
-0x8A99 = 0x5D78
-0x8A9F = 0x5D79
-0x8AA7 = 0x5D7A
-0x8AA9 = 0x5D7B
-0x8AAE = 0x5D7C
-0x8AAF = 0x5D7D
-0x8AB3 = 0x5D7E
-0x8AB6 = 0x5E21
-0x8AB7 = 0x5E22
-0x8ABB = 0x5E23
-0x8ABE = 0x5E24
-0x8AC3 = 0x5E25
-0x8AC6 = 0x5E26
-0x8AC8 = 0x5E27
-0x8AC9 = 0x5E28
-0x8ACA = 0x5E29
-0x8AD1 = 0x5E2A
-0x8AD3 = 0x5E2B
-0x8AD4 = 0x5E2C
-0x8AD5 = 0x5E2D
-0x8AD7 = 0x5E2E
-0x8ADD = 0x5E2F
-0x8ADF = 0x5E30
-0x8AEC = 0x5E31
-0x8AF0 = 0x5E32
-0x8AF4 = 0x5E33
-0x8AF5 = 0x5E34
-0x8AF6 = 0x5E35
-0x8AFC = 0x5E36
-0x8AFF = 0x5E37
-0x8B05 = 0x5E38
-0x8B06 = 0x5E39
-0x8B0A = 0x5E3F
-0x8B0B = 0x5E3A
-0x8B11 = 0x5E3B
-0x8B1C = 0x5E3C
-0x8B1E = 0x5E3D
-0x8B1F = 0x5E3E
-0x8B2D = 0x5E40
-0x8B30 = 0x5E41
-0x8B37 = 0x5E42
-0x8B3C = 0x5E43
-0x8B42 = 0x5E44
-0x8B43 = 0x5E45
-0x8B44 = 0x5E46
-0x8B45 = 0x5E47
-0x8B46 = 0x5E48
-0x8B48 = 0x5E49
-0x8B4D = 0x5E4E
-0x8B52 = 0x5E4A
-0x8B53 = 0x5E4B
-0x8B54 = 0x5E4C
-0x8B59 = 0x5E4D
-0x8B5E = 0x5E4F
-0x8B63 = 0x5E50
-0x8B6D = 0x5E51
-0x8B76 = 0x5E52
-0x8B78 = 0x5E53
-0x8B79 = 0x5E54
-0x8B7C = 0x5E55
-0x8B7E = 0x5E56
-0x8B81 = 0x5E57
-0x8B84 = 0x5E58
-0x8B85 = 0x5E59
-0x8B8B = 0x5E5A
-0x8B8D = 0x5E5B
-0x8B8F = 0x5E5C
-0x8B94 = 0x5E5D
-0x8B95 = 0x5E5E
-0x8B9C = 0x5E5F
-0x8B9E = 0x5E60
-0x8B9F = 0x5E61
-0x8C38 = 0x5E62
-0x8C39 = 0x5E63
-0x8C3D = 0x5E64
-0x8C3E = 0x5E65
-0x8C45 = 0x5E66
-0x8C47 = 0x5E67
-0x8C49 = 0x5E68
-0x8C4B = 0x5E69
-0x8C4F = 0x5E6A
-0x8C51 = 0x5E6B
-0x8C53 = 0x5E6C
-0x8C54 = 0x5E6D
-0x8C57 = 0x5E6E
-0x8C58 = 0x5E6F
-0x8C59 = 0x5E72
-0x8C5B = 0x5E70
-0x8C5D = 0x5E71
-0x8C63 = 0x5E73
-0x8C64 = 0x5E74
-0x8C66 = 0x5E75
-0x8C68 = 0x5E76
-0x8C69 = 0x5E77
-0x8C6D = 0x5E78
-0x8C73 = 0x5E79
-0x8C75 = 0x5E7A
-0x8C76 = 0x5E7B
-0x8C7B = 0x5E7C
-0x8C7E = 0x5E7D
-0x8C86 = 0x5E7E
-0x8C87 = 0x5F21
-0x8C8B = 0x5F22
-0x8C90 = 0x5F23
-0x8C92 = 0x5F24
-0x8C93 = 0x5F25
-0x8C99 = 0x5F26
-0x8C9B = 0x5F27
-0x8C9C = 0x5F28
-0x8CA4 = 0x5F29
-0x8CB9 = 0x5F2A
-0x8CBA = 0x5F2B
-0x8CC5 = 0x5F2C
-0x8CC6 = 0x5F2D
-0x8CC9 = 0x5F2E
-0x8CCB = 0x5F2F
-0x8CCF = 0x5F30
-0x8CD5 = 0x5F32
-0x8CD6 = 0x5F31
-0x8CD9 = 0x5F33
-0x8CDD = 0x5F34
-0x8CE1 = 0x5F35
-0x8CE8 = 0x5F36
-0x8CEC = 0x5F37
-0x8CEF = 0x5F38
-0x8CF0 = 0x5F39
-0x8CF2 = 0x5F3A
-0x8CF5 = 0x5F3B
-0x8CF7 = 0x5F3C
-0x8CF8 = 0x5F3D
-0x8CFE = 0x5F3E
-0x8CFF = 0x5F3F
-0x8D01 = 0x5F40
-0x8D03 = 0x5F41
-0x8D09 = 0x5F42
-0x8D12 = 0x5F43
-0x8D17 = 0x5F44
-0x8D1B = 0x5F45
-0x8D65 = 0x5F46
-0x8D69 = 0x5F47
-0x8D6C = 0x5F48
-0x8D6E = 0x5F49
-0x8D7F = 0x5F4A
-0x8D82 = 0x5F4B
-0x8D84 = 0x5F4C
-0x8D88 = 0x5F4D
-0x8D8D = 0x5F4E
-0x8D90 = 0x5F4F
-0x8D91 = 0x5F50
-0x8D95 = 0x5F51
-0x8D9E = 0x5F52
-0x8D9F = 0x5F53
-0x8DA0 = 0x5F54
-0x8DA6 = 0x5F55
-0x8DAB = 0x5F56
-0x8DAC = 0x5F57
-0x8DAF = 0x5F58
-0x8DB2 = 0x5F59
-0x8DB5 = 0x5F5A
-0x8DB7 = 0x5F5B
-0x8DB9 = 0x5F5C
-0x8DBB = 0x5F5D
-0x8DBC = 0x5F6F
-0x8DC0 = 0x5F5E
-0x8DC5 = 0x5F5F
-0x8DC6 = 0x5F60
-0x8DC7 = 0x5F61
-0x8DC8 = 0x5F62
-0x8DCA = 0x5F63
-0x8DCE = 0x5F64
-0x8DD1 = 0x5F65
-0x8DD4 = 0x5F66
-0x8DD5 = 0x5F67
-0x8DD7 = 0x5F68
-0x8DD9 = 0x5F69
-0x8DE4 = 0x5F6A
-0x8DE5 = 0x5F6B
-0x8DE7 = 0x5F6C
-0x8DEC = 0x5F6D
-0x8DF0 = 0x5F6E
-0x8DF1 = 0x5F70
-0x8DF2 = 0x5F71
-0x8DF4 = 0x5F72
-0x8DFD = 0x5F73
-0x8E01 = 0x5F74
-0x8E04 = 0x5F75
-0x8E05 = 0x5F76
-0x8E06 = 0x5F77
-0x8E0B = 0x5F78
-0x8E11 = 0x5F79
-0x8E14 = 0x5F7A
-0x8E16 = 0x5F7B
-0x8E20 = 0x5F7C
-0x8E21 = 0x5F7D
-0x8E22 = 0x5F7E
-0x8E23 = 0x6021
-0x8E26 = 0x6022
-0x8E27 = 0x6023
-0x8E31 = 0x6024
-0x8E33 = 0x6025
-0x8E36 = 0x6026
-0x8E37 = 0x6027
-0x8E38 = 0x6028
-0x8E39 = 0x6029
-0x8E3D = 0x602A
-0x8E40 = 0x602B
-0x8E41 = 0x602C
-0x8E4B = 0x602D
-0x8E4D = 0x602E
-0x8E4E = 0x602F
-0x8E4F = 0x6030
-0x8E54 = 0x6031
-0x8E5B = 0x6032
-0x8E5C = 0x6033
-0x8E5D = 0x6034
-0x8E5E = 0x6035
-0x8E61 = 0x6036
-0x8E62 = 0x6037
-0x8E69 = 0x6038
-0x8E6C = 0x6039
-0x8E6D = 0x603A
-0x8E6F = 0x603B
-0x8E70 = 0x603C
-0x8E71 = 0x603D
-0x8E79 = 0x603E
-0x8E7A = 0x603F
-0x8E7B = 0x6040
-0x8E82 = 0x6041
-0x8E83 = 0x6042
-0x8E89 = 0x6043
-0x8E90 = 0x6044
-0x8E92 = 0x6045
-0x8E95 = 0x6046
-0x8E9A = 0x6047
-0x8E9B = 0x6048
-0x8E9D = 0x6049
-0x8E9E = 0x604A
-0x8EA2 = 0x604B
-0x8EA7 = 0x604C
-0x8EA9 = 0x604D
-0x8EAD = 0x604E
-0x8EAE = 0x604F
-0x8EB3 = 0x6050
-0x8EB5 = 0x6051
-0x8EBA = 0x6052
-0x8EBB = 0x6053
-0x8EC0 = 0x6054
-0x8EC1 = 0x6055
-0x8EC3 = 0x6056
-0x8EC4 = 0x6057
-0x8EC7 = 0x6058
-0x8ECF = 0x6059
-0x8ED1 = 0x605A
-0x8ED4 = 0x605B
-0x8EDC = 0x605C
-0x8EE8 = 0x605D
-0x8EED = 0x6064
-0x8EEE = 0x605E
-0x8EF0 = 0x605F
-0x8EF1 = 0x6060
-0x8EF7 = 0x6061
-0x8EF9 = 0x6062
-0x8EFA = 0x6063
-0x8F00 = 0x6065
-0x8F02 = 0x6066
-0x8F07 = 0x6067
-0x8F08 = 0x6068
-0x8F0F = 0x6069
-0x8F10 = 0x606A
-0x8F16 = 0x606B
-0x8F17 = 0x606C
-0x8F18 = 0x606D
-0x8F1E = 0x606E
-0x8F20 = 0x606F
-0x8F21 = 0x6070
-0x8F23 = 0x6071
-0x8F25 = 0x6072
-0x8F27 = 0x6073
-0x8F28 = 0x6074
-0x8F2C = 0x6075
-0x8F2D = 0x6076
-0x8F2E = 0x6077
-0x8F34 = 0x6078
-0x8F35 = 0x6079
-0x8F36 = 0x607A
-0x8F37 = 0x607B
-0x8F3A = 0x607C
-0x8F40 = 0x607D
-0x8F41 = 0x607E
-0x8F43 = 0x6121
-0x8F47 = 0x6122
-0x8F4F = 0x6123
-0x8F51 = 0x6124
-0x8F52 = 0x6125
-0x8F53 = 0x6126
-0x8F54 = 0x6127
-0x8F55 = 0x6128
-0x8F58 = 0x6129
-0x8F5D = 0x612A
-0x8F5E = 0x612B
-0x8F65 = 0x612C
-0x8F9D = 0x612D
-0x8FA0 = 0x612E
-0x8FA1 = 0x612F
-0x8FA4 = 0x6130
-0x8FA5 = 0x6131
-0x8FA6 = 0x6132
-0x8FB5 = 0x6133
-0x8FB6 = 0x6134
-0x8FB8 = 0x6135
-0x8FBE = 0x6136
-0x8FC0 = 0x6137
-0x8FC1 = 0x6138
-0x8FC6 = 0x6139
-0x8FCA = 0x613A
-0x8FCB = 0x613B
-0x8FCD = 0x613C
-0x8FD0 = 0x613D
-0x8FD2 = 0x613E
-0x8FD3 = 0x613F
-0x8FD5 = 0x6140
-0x8FE0 = 0x6141
-0x8FE3 = 0x6142
-0x8FE4 = 0x6143
-0x8FE8 = 0x6144
-0x8FEE = 0x6145
-0x8FF1 = 0x6146
-0x8FF5 = 0x6147
-0x8FF6 = 0x6148
-0x8FFB = 0x6149
-0x8FFE = 0x614A
-0x9002 = 0x614B
-0x9004 = 0x614C
-0x9008 = 0x614D
-0x900C = 0x614E
-0x9018 = 0x614F
-0x901B = 0x6150
-0x9028 = 0x6151
-0x9029 = 0x6152
-0x902A = 0x6154
-0x902C = 0x6155
-0x902D = 0x6156
-0x902F = 0x6153
-0x9033 = 0x6157
-0x9034 = 0x6158
-0x9037 = 0x6159
-0x903F = 0x615A
-0x9043 = 0x615B
-0x9044 = 0x615C
-0x904C = 0x615D
-0x905B = 0x615E
-0x905D = 0x615F
-0x9062 = 0x6160
-0x9066 = 0x6161
-0x9067 = 0x6162
-0x906C = 0x6163
-0x9070 = 0x6164
-0x9074 = 0x6165
-0x9079 = 0x6166
-0x9085 = 0x6167
-0x9088 = 0x6168
-0x908B = 0x6169
-0x908C = 0x616A
-0x908E = 0x616B
-0x9090 = 0x616C
-0x9095 = 0x616D
-0x9097 = 0x616E
-0x9098 = 0x616F
-0x9099 = 0x6170
-0x909B = 0x6171
-0x90A0 = 0x6172
-0x90A1 = 0x6173
-0x90A2 = 0x6174
-0x90A5 = 0x6175
-0x90B0 = 0x6176
-0x90B2 = 0x6177
-0x90B3 = 0x6178
-0x90B4 = 0x6179
-0x90B6 = 0x617A
-0x90BD = 0x617B
-0x90BE = 0x617D
-0x90C3 = 0x617E
-0x90C4 = 0x6221
-0x90C5 = 0x6222
-0x90C7 = 0x6223
-0x90C8 = 0x6224
-0x90CC = 0x617C
-0x90D2 = 0x622D
-0x90D5 = 0x6225
-0x90D7 = 0x6226
-0x90D8 = 0x6227
-0x90D9 = 0x6228
-0x90DC = 0x6229
-0x90DD = 0x622A
-0x90DF = 0x622B
-0x90E5 = 0x622C
-0x90EB = 0x622F
-0x90EF = 0x6230
-0x90F0 = 0x6231
-0x90F4 = 0x6232
-0x90F6 = 0x622E
-0x90FE = 0x6233
-0x90FF = 0x6234
-0x9100 = 0x6235
-0x9104 = 0x6236
-0x9105 = 0x6237
-0x9106 = 0x6238
-0x9108 = 0x6239
-0x910D = 0x623A
-0x9110 = 0x623B
-0x9114 = 0x623C
-0x9116 = 0x623D
-0x9117 = 0x623E
-0x9118 = 0x623F
-0x911A = 0x6240
-0x911C = 0x6241
-0x911E = 0x6242
-0x9120 = 0x6243
-0x9122 = 0x6245
-0x9123 = 0x6246
-0x9125 = 0x6244
-0x9127 = 0x6247
-0x9129 = 0x6248
-0x912E = 0x6249
-0x912F = 0x624A
-0x9131 = 0x624B
-0x9134 = 0x624C
-0x9136 = 0x624D
-0x9137 = 0x624E
-0x9139 = 0x624F
-0x913A = 0x6250
-0x913C = 0x6251
-0x913D = 0x6252
-0x9143 = 0x6253
-0x9147 = 0x6254
-0x9148 = 0x6255
-0x914F = 0x6256
-0x9153 = 0x6257
-0x9157 = 0x6258
-0x9159 = 0x6259
-0x915A = 0x625A
-0x915B = 0x625B
-0x9161 = 0x625C
-0x9164 = 0x625D
-0x9167 = 0x625E
-0x916D = 0x625F
-0x9174 = 0x6260
-0x9179 = 0x6261
-0x917A = 0x6262
-0x917B = 0x6263
-0x9181 = 0x6264
-0x9183 = 0x6265
-0x9185 = 0x6266
-0x9186 = 0x6267
-0x918A = 0x6268
-0x918E = 0x6269
-0x9191 = 0x626A
-0x9193 = 0x626B
-0x9194 = 0x626C
-0x9195 = 0x626D
-0x9198 = 0x626E
-0x919E = 0x626F
-0x91A1 = 0x6270
-0x91A6 = 0x6271
-0x91A8 = 0x6272
-0x91AC = 0x6273
-0x91AD = 0x6274
-0x91AE = 0x6275
-0x91B0 = 0x6276
-0x91B1 = 0x6277
-0x91B2 = 0x6278
-0x91B3 = 0x6279
-0x91B6 = 0x627A
-0x91BB = 0x627B
-0x91BC = 0x627C
-0x91BD = 0x627D
-0x91BF = 0x627E
-0x91C2 = 0x6321
-0x91C3 = 0x6322
-0x91C5 = 0x6323
-0x91D3 = 0x6324
-0x91D4 = 0x6325
-0x91D7 = 0x6326
-0x91D9 = 0x6327
-0x91DA = 0x6328
-0x91DE = 0x6329
-0x91E4 = 0x632A
-0x91E5 = 0x632B
-0x91E9 = 0x632C
-0x91EA = 0x632D
-0x91EC = 0x632E
-0x91ED = 0x632F
-0x91EE = 0x6330
-0x91EF = 0x6331
-0x91F0 = 0x6332
-0x91F1 = 0x6333
-0x91F7 = 0x6334
-0x91F9 = 0x6335
-0x91FB = 0x6336
-0x91FD = 0x6337
-0x9200 = 0x6338
-0x9201 = 0x6339
-0x9204 = 0x633A
-0x9205 = 0x633B
-0x9206 = 0x633C
-0x9207 = 0x633D
-0x9209 = 0x633E
-0x920A = 0x633F
-0x920C = 0x6340
-0x9210 = 0x6341
-0x9212 = 0x6342
-0x9213 = 0x6343
-0x9216 = 0x6344
-0x9218 = 0x6345
-0x921C = 0x6346
-0x921D = 0x6347
-0x9223 = 0x6348
-0x9224 = 0x6349
-0x9225 = 0x634A
-0x9226 = 0x634B
-0x9228 = 0x634C
-0x922E = 0x634D
-0x922F = 0x634E
-0x9230 = 0x634F
-0x9233 = 0x6350
-0x9235 = 0x6351
-0x9236 = 0x6352
-0x9238 = 0x6353
-0x9239 = 0x6354
-0x923A = 0x6355
-0x923C = 0x6356
-0x923E = 0x6357
-0x9240 = 0x6358
-0x9242 = 0x6359
-0x9243 = 0x635A
-0x9246 = 0x635B
-0x9247 = 0x635C
-0x924A = 0x635D
-0x924D = 0x635E
-0x924E = 0x635F
-0x924F = 0x6360
-0x9251 = 0x6361
-0x9258 = 0x6362
-0x9259 = 0x6363
-0x925C = 0x6364
-0x925D = 0x6365
-0x9260 = 0x6366
-0x9261 = 0x6367
-0x9265 = 0x6368
-0x9267 = 0x6369
-0x9268 = 0x636A
-0x9269 = 0x636B
-0x926E = 0x636C
-0x926F = 0x636D
-0x9270 = 0x636E
-0x9275 = 0x636F
-0x9276 = 0x6370
-0x9277 = 0x6371
-0x9278 = 0x6372
-0x9279 = 0x6373
-0x927B = 0x6374
-0x927C = 0x6375
-0x927D = 0x6376
-0x927F = 0x6377
-0x9288 = 0x6378
-0x9289 = 0x6379
-0x928A = 0x637A
-0x928D = 0x637B
-0x928E = 0x637C
-0x9292 = 0x637D
-0x9297 = 0x637E
-0x9299 = 0x6421
-0x929F = 0x6422
-0x92A0 = 0x6423
-0x92A4 = 0x6424
-0x92A5 = 0x6425
-0x92A7 = 0x6426
-0x92A8 = 0x6427
-0x92AB = 0x6428
-0x92AF = 0x6429
-0x92B2 = 0x642A
-0x92B6 = 0x642B
-0x92B8 = 0x642C
-0x92BA = 0x642D
-0x92BB = 0x642E
-0x92BC = 0x642F
-0x92BD = 0x6430
-0x92BF = 0x6431
-0x92C0 = 0x6432
-0x92C1 = 0x6433
-0x92C2 = 0x6434
-0x92C3 = 0x6435
-0x92C5 = 0x6436
-0x92C6 = 0x6437
-0x92C7 = 0x6438
-0x92C8 = 0x6439
-0x92CB = 0x643A
-0x92CC = 0x643B
-0x92CD = 0x643C
-0x92CE = 0x643D
-0x92D0 = 0x643E
-0x92D3 = 0x643F
-0x92D5 = 0x6440
-0x92D7 = 0x6441
-0x92D8 = 0x6442
-0x92D9 = 0x6443
-0x92DC = 0x6444
-0x92DD = 0x6445
-0x92DF = 0x6446
-0x92E0 = 0x6447
-0x92E1 = 0x6448
-0x92E3 = 0x6449
-0x92E5 = 0x644A
-0x92E7 = 0x644B
-0x92E8 = 0x644C
-0x92EC = 0x644D
-0x92EE = 0x644E
-0x92F0 = 0x644F
-0x92F9 = 0x6450
-0x92FB = 0x6451
-0x92FF = 0x6452
-0x9300 = 0x6453
-0x9302 = 0x6454
-0x9308 = 0x6455
-0x930D = 0x6456
-0x9311 = 0x6457
-0x9314 = 0x6458
-0x9315 = 0x6459
-0x931C = 0x645A
-0x931D = 0x645B
-0x931E = 0x645C
-0x931F = 0x645D
-0x9321 = 0x645E
-0x9324 = 0x645F
-0x9325 = 0x6460
-0x9327 = 0x6461
-0x9329 = 0x6462
-0x932A = 0x6463
-0x9333 = 0x6464
-0x9334 = 0x6465
-0x9336 = 0x6466
-0x9337 = 0x6467
-0x9347 = 0x6468
-0x9348 = 0x6469
-0x9349 = 0x646A
-0x9350 = 0x646B
-0x9351 = 0x646C
-0x9352 = 0x646D
-0x9355 = 0x646E
-0x9357 = 0x646F
-0x9358 = 0x6470
-0x935A = 0x6471
-0x935E = 0x6472
-0x9364 = 0x6473
-0x9365 = 0x6474
-0x9367 = 0x6475
-0x9369 = 0x6476
-0x936A = 0x6477
-0x936D = 0x6478
-0x936F = 0x6479
-0x9370 = 0x647A
-0x9371 = 0x647B
-0x9373 = 0x647C
-0x9374 = 0x647D
-0x9376 = 0x647E
-0x937A = 0x6521
-0x937D = 0x6522
-0x937F = 0x6523
-0x9380 = 0x6524
-0x9381 = 0x6525
-0x9382 = 0x6526
-0x9388 = 0x6527
-0x938A = 0x6528
-0x938B = 0x6529
-0x938D = 0x652A
-0x938F = 0x652B
-0x9392 = 0x652C
-0x9395 = 0x652D
-0x9398 = 0x652E
-0x939B = 0x652F
-0x939E = 0x6530
-0x93A1 = 0x6531
-0x93A3 = 0x6532
-0x93A4 = 0x6533
-0x93A6 = 0x6534
-0x93A8 = 0x6535
-0x93A9 = 0x653B
-0x93AB = 0x6536
-0x93B4 = 0x6537
-0x93B5 = 0x6538
-0x93B6 = 0x6539
-0x93BA = 0x653A
-0x93C1 = 0x653C
-0x93C4 = 0x653D
-0x93C5 = 0x653E
-0x93C6 = 0x653F
-0x93C7 = 0x6540
-0x93C9 = 0x6541
-0x93CA = 0x6542
-0x93CB = 0x6543
-0x93CC = 0x6544
-0x93CD = 0x6545
-0x93D3 = 0x6546
-0x93D9 = 0x6547
-0x93DC = 0x6548
-0x93DE = 0x6549
-0x93DF = 0x654A
-0x93E2 = 0x654B
-0x93E6 = 0x654C
-0x93E7 = 0x654D
-0x93F7 = 0x654F
-0x93F8 = 0x6550
-0x93F9 = 0x654E
-0x93FA = 0x6551
-0x93FB = 0x6552
-0x93FD = 0x6553
-0x9401 = 0x6554
-0x9402 = 0x6555
-0x9404 = 0x6556
-0x9408 = 0x6557
-0x9409 = 0x6558
-0x940D = 0x6559
-0x940E = 0x655A
-0x940F = 0x655B
-0x9415 = 0x655C
-0x9416 = 0x655D
-0x9417 = 0x655E
-0x941F = 0x655F
-0x942E = 0x6560
-0x942F = 0x6561
-0x9431 = 0x6562
-0x9432 = 0x6563
-0x9433 = 0x6564
-0x9434 = 0x6565
-0x943B = 0x6566
-0x943D = 0x6568
-0x943F = 0x6567
-0x9443 = 0x6569
-0x9445 = 0x656A
-0x9448 = 0x656B
-0x944A = 0x656C
-0x944C = 0x656D
-0x9455 = 0x656E
-0x9459 = 0x656F
-0x945C = 0x6570
-0x945F = 0x6571
-0x9461 = 0x6572
-0x9463 = 0x6573
-0x9468 = 0x6574
-0x946B = 0x6575
-0x946D = 0x6576
-0x946E = 0x6577
-0x946F = 0x6578
-0x9471 = 0x6579
-0x9472 = 0x657A
-0x9483 = 0x657C
-0x9484 = 0x657B
-0x9578 = 0x657D
-0x9579 = 0x657E
-0x957E = 0x6621
-0x9584 = 0x6622
-0x9588 = 0x6623
-0x958C = 0x6624
-0x958D = 0x6625
-0x958E = 0x6626
-0x959D = 0x6627
-0x959E = 0x6628
-0x959F = 0x6629
-0x95A1 = 0x662A
-0x95A6 = 0x662B
-0x95A9 = 0x662C
-0x95AB = 0x662D
-0x95AC = 0x662E
-0x95B4 = 0x662F
-0x95B6 = 0x6630
-0x95BA = 0x6631
-0x95BD = 0x6632
-0x95BF = 0x6633
-0x95C6 = 0x6634
-0x95C8 = 0x6635
-0x95C9 = 0x6636
-0x95CB = 0x6637
-0x95D0 = 0x6638
-0x95D1 = 0x6639
-0x95D2 = 0x663A
-0x95D3 = 0x663B
-0x95D9 = 0x663C
-0x95DA = 0x663D
-0x95DD = 0x663E
-0x95DE = 0x663F
-0x95DF = 0x6640
-0x95E0 = 0x6641
-0x95E4 = 0x6642
-0x95E6 = 0x6643
-0x961D = 0x6644
-0x961E = 0x6645
-0x9622 = 0x6646
-0x9624 = 0x6647
-0x9625 = 0x6648
-0x9626 = 0x6649
-0x962C = 0x664A
-0x9631 = 0x664B
-0x9633 = 0x664C
-0x9637 = 0x664D
-0x9638 = 0x664E
-0x9639 = 0x664F
-0x963A = 0x6650
-0x963C = 0x6651
-0x963D = 0x6652
-0x9641 = 0x6653
-0x9652 = 0x6654
-0x9654 = 0x6655
-0x9656 = 0x6656
-0x9657 = 0x6657
-0x9658 = 0x6658
-0x9661 = 0x6659
-0x966E = 0x665A
-0x9674 = 0x665B
-0x967B = 0x665C
-0x967C = 0x665D
-0x967E = 0x665E
-0x967F = 0x665F
-0x9681 = 0x6660
-0x9682 = 0x6661
-0x9683 = 0x6662
-0x9684 = 0x6663
-0x9689 = 0x6664
-0x9691 = 0x6665
-0x9696 = 0x6666
-0x969A = 0x6667
-0x969D = 0x6668
-0x969F = 0x6669
-0x96A4 = 0x666A
-0x96A5 = 0x666B
-0x96A6 = 0x666C
-0x96A9 = 0x666D
-0x96AE = 0x666E
-0x96AF = 0x666F
-0x96B3 = 0x6670
-0x96BA = 0x6671
-0x96CA = 0x6672
-0x96D2 = 0x6673
-0x96D8 = 0x6675
-0x96DA = 0x6676
-0x96DD = 0x6677
-0x96DE = 0x6678
-0x96DF = 0x6679
-0x96E9 = 0x667A
-0x96EF = 0x667B
-0x96F1 = 0x667C
-0x96FA = 0x667D
-0x9702 = 0x667E
-0x9703 = 0x6721
-0x9705 = 0x6722
-0x9709 = 0x6723
-0x971A = 0x6724
-0x971B = 0x6725
-0x971D = 0x6726
-0x9721 = 0x6727
-0x9722 = 0x6728
-0x9723 = 0x6729
-0x9728 = 0x672A
-0x9731 = 0x672B
-0x9733 = 0x672C
-0x9741 = 0x672D
-0x9743 = 0x672E
-0x974A = 0x672F
-0x974E = 0x6730
-0x974F = 0x6731
-0x9755 = 0x6732
-0x9757 = 0x6733
-0x9758 = 0x6734
-0x975A = 0x6735
-0x975B = 0x6736
-0x9763 = 0x6737
-0x9767 = 0x6738
-0x976A = 0x6739
-0x976E = 0x673A
-0x9773 = 0x673B
-0x9776 = 0x673C
-0x9777 = 0x673D
-0x9778 = 0x673E
-0x977B = 0x673F
-0x977D = 0x6740
-0x977F = 0x6741
-0x9780 = 0x6742
-0x9789 = 0x6743
-0x9795 = 0x6744
-0x9796 = 0x6745
-0x9797 = 0x6746
-0x9799 = 0x6747
-0x979A = 0x6748
-0x979E = 0x6749
-0x979F = 0x674A
-0x97A2 = 0x674B
-0x97AC = 0x674C
-0x97AE = 0x674D
-0x97B1 = 0x674E
-0x97B2 = 0x674F
-0x97B5 = 0x6750
-0x97B6 = 0x6751
-0x97B8 = 0x6752
-0x97B9 = 0x6753
-0x97BA = 0x6754
-0x97BC = 0x6755
-0x97BE = 0x6756
-0x97BF = 0x6757
-0x97C1 = 0x6758
-0x97C4 = 0x6759
-0x97C5 = 0x675A
-0x97C7 = 0x675B
-0x97C9 = 0x675C
-0x97CA = 0x675D
-0x97CC = 0x675E
-0x97CD = 0x675F
-0x97CE = 0x6760
-0x97D0 = 0x6761
-0x97D1 = 0x6762
-0x97D4 = 0x6763
-0x97D7 = 0x6764
-0x97D8 = 0x6765
-0x97D9 = 0x6766
-0x97DB = 0x676A
-0x97DD = 0x6767
-0x97DE = 0x6768
-0x97E0 = 0x6769
-0x97E1 = 0x676B
-0x97E4 = 0x676C
-0x97EF = 0x676D
-0x97F1 = 0x676E
-0x97F4 = 0x676F
-0x97F7 = 0x6770
-0x97F8 = 0x6771
-0x97FA = 0x6772
-0x9807 = 0x6773
-0x980A = 0x6774
-0x980D = 0x6776
-0x980E = 0x6777
-0x9814 = 0x6778
-0x9816 = 0x6779
-0x9819 = 0x6775
-0x981C = 0x677A
-0x981E = 0x677B
-0x9820 = 0x677C
-0x9823 = 0x677D
-0x9825 = 0x6828
-0x9826 = 0x677E
-0x982B = 0x6821
-0x982E = 0x6822
-0x982F = 0x6823
-0x9830 = 0x6824
-0x9832 = 0x6825
-0x9833 = 0x6826
-0x9835 = 0x6827
-0x983E = 0x6829
-0x9844 = 0x682A
-0x9847 = 0x682B
-0x984A = 0x682C
-0x9851 = 0x682D
-0x9852 = 0x682E
-0x9853 = 0x682F
-0x9856 = 0x6830
-0x9857 = 0x6831
-0x9859 = 0x6832
-0x985A = 0x6833
-0x9862 = 0x6834
-0x9863 = 0x6835
-0x9865 = 0x6836
-0x9866 = 0x6837
-0x986A = 0x6838
-0x986C = 0x6839
-0x98AB = 0x683A
-0x98AD = 0x683B
-0x98AE = 0x683C
-0x98B0 = 0x683D
-0x98B4 = 0x683E
-0x98B7 = 0x683F
-0x98B8 = 0x6840
-0x98BA = 0x6841
-0x98BB = 0x6842
-0x98BF = 0x6843
-0x98C2 = 0x6844
-0x98C5 = 0x6845
-0x98C8 = 0x6846
-0x98CC = 0x6847
-0x98E1 = 0x6848
-0x98E3 = 0x6849
-0x98E5 = 0x684A
-0x98E6 = 0x684B
-0x98E7 = 0x684C
-0x98EA = 0x684D
-0x98F3 = 0x684E
-0x98F6 = 0x684F
-0x9902 = 0x6850
-0x9907 = 0x6851
-0x9908 = 0x6852
-0x9911 = 0x6853
-0x9915 = 0x6854
-0x9916 = 0x6855
-0x9917 = 0x6856
-0x991A = 0x6857
-0x991B = 0x6858
-0x991C = 0x6859
-0x991F = 0x685A
-0x9922 = 0x685B
-0x9926 = 0x685C
-0x9927 = 0x685D
-0x992B = 0x685E
-0x9931 = 0x685F
-0x9932 = 0x6860
-0x9933 = 0x6861
-0x9934 = 0x6862
-0x9935 = 0x6863
-0x9939 = 0x6864
-0x993A = 0x6865
-0x993B = 0x6866
-0x993C = 0x6867
-0x9940 = 0x6868
-0x9941 = 0x6869
-0x9946 = 0x686A
-0x9947 = 0x686B
-0x9948 = 0x686C
-0x994D = 0x686D
-0x994E = 0x686E
-0x9954 = 0x686F
-0x9958 = 0x6870
-0x9959 = 0x6871
-0x995B = 0x6872
-0x995C = 0x6873
-0x995E = 0x6874
-0x995F = 0x6875
-0x9960 = 0x6876
-0x999B = 0x6877
-0x999D = 0x6878
-0x999F = 0x6879
-0x99A6 = 0x687A
-0x99B0 = 0x687B
-0x99B1 = 0x687C
-0x99B2 = 0x687D
-0x99B5 = 0x687E
-0x99B9 = 0x6921
-0x99BA = 0x6922
-0x99BD = 0x6923
-0x99BF = 0x6924
-0x99C3 = 0x6925
-0x99C9 = 0x6926
-0x99D3 = 0x6927
-0x99D4 = 0x6928
-0x99D9 = 0x6929
-0x99DA = 0x692A
-0x99DC = 0x692B
-0x99DE = 0x692C
-0x99E7 = 0x692D
-0x99EA = 0x692E
-0x99EB = 0x692F
-0x99EC = 0x6930
-0x99F0 = 0x6931
-0x99F4 = 0x6932
-0x99F5 = 0x6933
-0x99F9 = 0x6934
-0x99FD = 0x6935
-0x99FE = 0x6936
-0x9A02 = 0x6937
-0x9A03 = 0x6938
-0x9A04 = 0x6939
-0x9A0B = 0x693A
-0x9A0C = 0x693B
-0x9A10 = 0x693C
-0x9A11 = 0x693D
-0x9A16 = 0x693E
-0x9A1E = 0x693F
-0x9A20 = 0x6940
-0x9A22 = 0x6941
-0x9A23 = 0x6942
-0x9A24 = 0x6943
-0x9A27 = 0x6944
-0x9A2D = 0x6945
-0x9A2E = 0x6946
-0x9A33 = 0x6947
-0x9A35 = 0x6948
-0x9A36 = 0x6949
-0x9A38 = 0x694A
-0x9A41 = 0x694C
-0x9A44 = 0x694D
-0x9A47 = 0x694B
-0x9A4A = 0x694E
-0x9A4B = 0x694F
-0x9A4C = 0x6950
-0x9A4E = 0x6951
-0x9A51 = 0x6952
-0x9A54 = 0x6953
-0x9A56 = 0x6954
-0x9A5D = 0x6955
-0x9AAA = 0x6956
-0x9AAC = 0x6957
-0x9AAE = 0x6958
-0x9AAF = 0x6959
-0x9AB2 = 0x695A
-0x9AB4 = 0x695B
-0x9AB5 = 0x695C
-0x9AB6 = 0x695D
-0x9AB9 = 0x695E
-0x9ABB = 0x695F
-0x9ABE = 0x6960
-0x9ABF = 0x6961
-0x9AC1 = 0x6962
-0x9AC3 = 0x6963
-0x9AC6 = 0x6964
-0x9AC8 = 0x6965
-0x9ACE = 0x6966
-0x9AD0 = 0x6967
-0x9AD2 = 0x6968
-0x9AD5 = 0x6969
-0x9AD6 = 0x696A
-0x9AD7 = 0x696B
-0x9ADB = 0x696C
-0x9ADC = 0x696D
-0x9AE0 = 0x696E
-0x9AE4 = 0x696F
-0x9AE5 = 0x6970
-0x9AE7 = 0x6971
-0x9AE9 = 0x6972
-0x9AEC = 0x6973
-0x9AF2 = 0x6974
-0x9AF3 = 0x6975
-0x9AF5 = 0x6976
-0x9AF9 = 0x6977
-0x9AFA = 0x6978
-0x9AFD = 0x6979
-0x9AFF = 0x697A
-0x9B00 = 0x697B
-0x9B01 = 0x697C
-0x9B02 = 0x697D
-0x9B03 = 0x697E
-0x9B04 = 0x6A21
-0x9B05 = 0x6A22
-0x9B08 = 0x6A23
-0x9B09 = 0x6A24
-0x9B0B = 0x6A25
-0x9B0C = 0x6A26
-0x9B0D = 0x6A27
-0x9B0E = 0x6A28
-0x9B10 = 0x6A29
-0x9B12 = 0x6A2A
-0x9B16 = 0x6A2B
-0x9B19 = 0x6A2C
-0x9B1B = 0x6A2D
-0x9B1C = 0x6A2E
-0x9B20 = 0x6A2F
-0x9B26 = 0x6A30
-0x9B2B = 0x6A31
-0x9B2D = 0x6A32
-0x9B33 = 0x6A33
-0x9B34 = 0x6A34
-0x9B35 = 0x6A35
-0x9B37 = 0x6A36
-0x9B39 = 0x6A37
-0x9B3A = 0x6A38
-0x9B3D = 0x6A39
-0x9B48 = 0x6A3A
-0x9B4B = 0x6A3B
-0x9B4C = 0x6A3C
-0x9B55 = 0x6A3D
-0x9B56 = 0x6A3E
-0x9B57 = 0x6A3F
-0x9B5B = 0x6A40
-0x9B5E = 0x6A41
-0x9B61 = 0x6A42
-0x9B63 = 0x6A43
-0x9B65 = 0x6A44
-0x9B66 = 0x6A45
-0x9B68 = 0x6A46
-0x9B6A = 0x6A47
-0x9B6B = 0x6A48
-0x9B6C = 0x6A49
-0x9B6D = 0x6A4A
-0x9B6E = 0x6A4B
-0x9B73 = 0x6A4C
-0x9B75 = 0x6A4D
-0x9B77 = 0x6A4E
-0x9B78 = 0x6A4F
-0x9B79 = 0x6A50
-0x9B7F = 0x6A51
-0x9B80 = 0x6A52
-0x9B84 = 0x6A53
-0x9B85 = 0x6A54
-0x9B86 = 0x6A55
-0x9B87 = 0x6A56
-0x9B89 = 0x6A57
-0x9B8A = 0x6A58
-0x9B8B = 0x6A59
-0x9B8D = 0x6A5A
-0x9B8F = 0x6A5B
-0x9B90 = 0x6A5C
-0x9B94 = 0x6A5D
-0x9B9A = 0x6A5E
-0x9B9D = 0x6A5F
-0x9B9E = 0x6A60
-0x9BA6 = 0x6A61
-0x9BA7 = 0x6A62
-0x9BA9 = 0x6A63
-0x9BAC = 0x6A64
-0x9BB0 = 0x6A65
-0x9BB1 = 0x6A66
-0x9BB2 = 0x6A67
-0x9BB7 = 0x6A68
-0x9BB8 = 0x6A69
-0x9BBB = 0x6A6A
-0x9BBC = 0x6A6B
-0x9BBE = 0x6A6C
-0x9BBF = 0x6A6D
-0x9BC1 = 0x6A6E
-0x9BC7 = 0x6A6F
-0x9BC8 = 0x6A70
-0x9BCE = 0x6A71
-0x9BD0 = 0x6A72
-0x9BD7 = 0x6A73
-0x9BD8 = 0x6A74
-0x9BDD = 0x6A75
-0x9BDF = 0x6A76
-0x9BE5 = 0x6A77
-0x9BE7 = 0x6A78
-0x9BEA = 0x6A79
-0x9BEB = 0x6A7A
-0x9BEF = 0x6A7B
-0x9BF3 = 0x6A7C
-0x9BF7 = 0x6A7D
-0x9BF8 = 0x6A7E
-0x9BF9 = 0x6B21
-0x9BFA = 0x6B22
-0x9BFD = 0x6B23
-0x9BFF = 0x6B24
-0x9C00 = 0x6B25
-0x9C02 = 0x6B26
-0x9C0B = 0x6B27
-0x9C0F = 0x6B28
-0x9C11 = 0x6B29
-0x9C16 = 0x6B2A
-0x9C18 = 0x6B2B
-0x9C19 = 0x6B2C
-0x9C1A = 0x6B2D
-0x9C1C = 0x6B2E
-0x9C1E = 0x6B2F
-0x9C22 = 0x6B30
-0x9C23 = 0x6B31
-0x9C26 = 0x6B32
-0x9C27 = 0x6B33
-0x9C28 = 0x6B34
-0x9C29 = 0x6B35
-0x9C2A = 0x6B36
-0x9C31 = 0x6B37
-0x9C35 = 0x6B38
-0x9C36 = 0x6B39
-0x9C37 = 0x6B3A
-0x9C3D = 0x6B3B
-0x9C41 = 0x6B3C
-0x9C43 = 0x6B3D
-0x9C44 = 0x6B3E
-0x9C45 = 0x6B3F
-0x9C49 = 0x6B40
-0x9C4A = 0x6B41
-0x9C4E = 0x6B42
-0x9C4F = 0x6B43
-0x9C50 = 0x6B44
-0x9C53 = 0x6B45
-0x9C54 = 0x6B46
-0x9C56 = 0x6B47
-0x9C58 = 0x6B48
-0x9C5B = 0x6B49
-0x9C5C = 0x6B50
-0x9C5D = 0x6B4A
-0x9C5E = 0x6B4B
-0x9C5F = 0x6B4C
-0x9C63 = 0x6B4D
-0x9C68 = 0x6B52
-0x9C69 = 0x6B4E
-0x9C6A = 0x6B4F
-0x9C6B = 0x6B51
-0x9C6E = 0x6B53
-0x9C70 = 0x6B54
-0x9C72 = 0x6B55
-0x9C75 = 0x6B56
-0x9C77 = 0x6B57
-0x9C7B = 0x6B58
-0x9CE6 = 0x6B59
-0x9CF2 = 0x6B5A
-0x9CF7 = 0x6B5B
-0x9CF9 = 0x6B5C
-0x9D02 = 0x6B5E
-0x9D0B = 0x6B5D
-0x9D11 = 0x6B5F
-0x9D17 = 0x6B60
-0x9D18 = 0x6B61
-0x9D1C = 0x6B62
-0x9D1D = 0x6B63
-0x9D1E = 0x6B64
-0x9D2F = 0x6B65
-0x9D30 = 0x6B66
-0x9D32 = 0x6B67
-0x9D33 = 0x6B68
-0x9D34 = 0x6B69
-0x9D3A = 0x6B6A
-0x9D3C = 0x6B6B
-0x9D3D = 0x6B6D
-0x9D42 = 0x6B6E
-0x9D43 = 0x6B6F
-0x9D45 = 0x6B6C
-0x9D47 = 0x6B70
-0x9D4A = 0x6B71
-0x9D53 = 0x6B72
-0x9D54 = 0x6B73
-0x9D5F = 0x6B74
-0x9D62 = 0x6B76
-0x9D63 = 0x6B75
-0x9D65 = 0x6B77
-0x9D69 = 0x6B78
-0x9D6A = 0x6B79
-0x9D6B = 0x6B7A
-0x9D70 = 0x6B7B
-0x9D76 = 0x6B7C
-0x9D77 = 0x6B7D
-0x9D7B = 0x6B7E
-0x9D7C = 0x6C21
-0x9D7E = 0x6C22
-0x9D83 = 0x6C23
-0x9D84 = 0x6C24
-0x9D86 = 0x6C25
-0x9D8A = 0x6C26
-0x9D8D = 0x6C27
-0x9D8E = 0x6C28
-0x9D92 = 0x6C29
-0x9D93 = 0x6C2A
-0x9D95 = 0x6C2B
-0x9D96 = 0x6C2C
-0x9D97 = 0x6C2D
-0x9D98 = 0x6C2E
-0x9DA1 = 0x6C2F
-0x9DAA = 0x6C30
-0x9DAC = 0x6C31
-0x9DAE = 0x6C32
-0x9DB1 = 0x6C33
-0x9DB5 = 0x6C34
-0x9DB9 = 0x6C35
-0x9DBC = 0x6C36
-0x9DBF = 0x6C37
-0x9DC3 = 0x6C38
-0x9DC7 = 0x6C39
-0x9DC9 = 0x6C3A
-0x9DCA = 0x6C3B
-0x9DD4 = 0x6C3C
-0x9DD5 = 0x6C3D
-0x9DD6 = 0x6C3E
-0x9DD7 = 0x6C3F
-0x9DDA = 0x6C40
-0x9DDE = 0x6C41
-0x9DDF = 0x6C42
-0x9DE0 = 0x6C43
-0x9DE5 = 0x6C44
-0x9DE7 = 0x6C45
-0x9DE9 = 0x6C46
-0x9DEB = 0x6C47
-0x9DEE = 0x6C48
-0x9DF0 = 0x6C49
-0x9DF3 = 0x6C4A
-0x9DF4 = 0x6C4B
-0x9DFE = 0x6C4C
-0x9E02 = 0x6C4E
-0x9E07 = 0x6C4F
-0x9E0A = 0x6C4D
-0x9E0E = 0x6C50
-0x9E10 = 0x6C51
-0x9E11 = 0x6C52
-0x9E12 = 0x6C53
-0x9E15 = 0x6C54
-0x9E16 = 0x6C55
-0x9E19 = 0x6C56
-0x9E1C = 0x6C57
-0x9E1D = 0x6C58
-0x9E7A = 0x6C59
-0x9E7B = 0x6C5A
-0x9E7C = 0x6C5B
-0x9E80 = 0x6C5C
-0x9E82 = 0x6C5D
-0x9E83 = 0x6C5E
-0x9E84 = 0x6C5F
-0x9E85 = 0x6C60
-0x9E87 = 0x6C61
-0x9E8E = 0x6C62
-0x9E8F = 0x6C63
-0x9E96 = 0x6C64
-0x9E98 = 0x6C65
-0x9E9B = 0x6C66
-0x9E9E = 0x6C67
-0x9EA4 = 0x6C68
-0x9EA8 = 0x6C69
-0x9EAC = 0x6C6A
-0x9EAE = 0x6C6B
-0x9EAF = 0x6C6C
-0x9EB0 = 0x6C6D
-0x9EB3 = 0x6C6E
-0x9EB4 = 0x6C6F
-0x9EB5 = 0x6C70
-0x9EC6 = 0x6C71
-0x9EC8 = 0x6C72
-0x9ECB = 0x6C73
-0x9ED5 = 0x6C74
-0x9EDF = 0x6C75
-0x9EE4 = 0x6C76
-0x9EE7 = 0x6C77
-0x9EEC = 0x6C78
-0x9EED = 0x6C79
-0x9EEE = 0x6C7A
-0x9EF0 = 0x6C7B
-0x9EF1 = 0x6C7C
-0x9EF2 = 0x6C7D
-0x9EF5 = 0x6C7E
-0x9EF8 = 0x6D21
-0x9EFF = 0x6D22
-0x9F02 = 0x6D23
-0x9F03 = 0x6D24
-0x9F09 = 0x6D25
-0x9F0F = 0x6D26
-0x9F10 = 0x6D27
-0x9F11 = 0x6D28
-0x9F12 = 0x6D29
-0x9F14 = 0x6D2A
-0x9F16 = 0x6D2B
-0x9F17 = 0x6D2C
-0x9F19 = 0x6D2D
-0x9F1A = 0x6D2E
-0x9F1B = 0x6D2F
-0x9F1F = 0x6D30
-0x9F22 = 0x6D31
-0x9F26 = 0x6D32
-0x9F2A = 0x6D33
-0x9F2B = 0x6D34
-0x9F2F = 0x6D35
-0x9F31 = 0x6D36
-0x9F32 = 0x6D37
-0x9F34 = 0x6D38
-0x9F37 = 0x6D39
-0x9F39 = 0x6D3A
-0x9F3A = 0x6D3B
-0x9F3C = 0x6D3C
-0x9F3D = 0x6D3D
-0x9F3F = 0x6D3E
-0x9F41 = 0x6D3F
-0x9F43 = 0x6D40
-0x9F44 = 0x6D41
-0x9F45 = 0x6D42
-0x9F46 = 0x6D43
-0x9F47 = 0x6D44
-0x9F53 = 0x6D45
-0x9F55 = 0x6D46
-0x9F56 = 0x6D47
-0x9F57 = 0x6D48
-0x9F58 = 0x6D49
-0x9F5A = 0x6D4A
-0x9F5D = 0x6D4B
-0x9F5E = 0x6D4C
-0x9F68 = 0x6D4D
-0x9F69 = 0x6D4E
-0x9F6D = 0x6D4F
-0x9F6E = 0x6D50
-0x9F6F = 0x6D51
-0x9F70 = 0x6D52
-0x9F71 = 0x6D53
-0x9F73 = 0x6D54
-0x9F75 = 0x6D55
-0x9F7A = 0x6D56
-0x9F7D = 0x6D57
-0x9F8F = 0x6D58
-0x9F90 = 0x6D59
-0x9F91 = 0x6D5A
-0x9F92 = 0x6D5B
-0x9F94 = 0x6D5C
-0x9F96 = 0x6D5D
-0x9F97 = 0x6D5E
-0x9F9E = 0x6D5F
-0x9FA1 = 0x6D60
-0x9FA2 = 0x6D61
-0x9FA3 = 0x6D62
-0x9FA5 = 0x6D63
-0xFF5E = 0x2237
-0xFFE4 = 0x2243
-END_MAP
diff --git a/enc/trans/JIS/UCS%JISX0212UDC.src b/enc/trans/JIS/UCS%JISX0212UDC.src
deleted file mode 100644
index 3f7d39772b..0000000000
--- a/enc/trans/JIS/UCS%JISX0212UDC.src
+++ /dev/null
@@ -1,955 +0,0 @@
-# $NetBSD: UCS%JISX0212UDC.src,v 1.1 2003/07/19 20:20:43 tshiozak Exp $
-
-TYPE ROWCOL
-NAME "UCS/JISX0212UDC"
-SRC_ZONE 0xE3AC - 0xE757
-OOB_MODE INVALID
-DST_INVALID 0xFFFF
-DST_UNIT_BITS 16
-
-BEGIN_MAP
-0xE3AC - 0xE757 = INVALID
-#
-# This data is derived from http://www.opengroup.or.jp/jvc/cde/
-#
-0xE3AC = 0x7521
-0xE3AD = 0x7522
-0xE3AE = 0x7523
-0xE3AF = 0x7524
-0xE3B0 = 0x7525
-0xE3B1 = 0x7526
-0xE3B2 = 0x7527
-0xE3B3 = 0x7528
-0xE3B4 = 0x7529
-0xE3B5 = 0x752A
-0xE3B6 = 0x752B
-0xE3B7 = 0x752C
-0xE3B8 = 0x752D
-0xE3B9 = 0x752E
-0xE3BA = 0x752F
-0xE3BB = 0x7530
-0xE3BC = 0x7531
-0xE3BD = 0x7532
-0xE3BE = 0x7533
-0xE3BF = 0x7534
-0xE3C0 = 0x7535
-0xE3C1 = 0x7536
-0xE3C2 = 0x7537
-0xE3C3 = 0x7538
-0xE3C4 = 0x7539
-0xE3C5 = 0x753A
-0xE3C6 = 0x753B
-0xE3C7 = 0x753C
-0xE3C8 = 0x753D
-0xE3C9 = 0x753E
-0xE3CA = 0x753F
-0xE3CB = 0x7540
-0xE3CC = 0x7541
-0xE3CD = 0x7542
-0xE3CE = 0x7543
-0xE3CF = 0x7544
-0xE3D0 = 0x7545
-0xE3D1 = 0x7546
-0xE3D2 = 0x7547
-0xE3D3 = 0x7548
-0xE3D4 = 0x7549
-0xE3D5 = 0x754A
-0xE3D6 = 0x754B
-0xE3D7 = 0x754C
-0xE3D8 = 0x754D
-0xE3D9 = 0x754E
-0xE3DA = 0x754F
-0xE3DB = 0x7550
-0xE3DC = 0x7551
-0xE3DD = 0x7552
-0xE3DE = 0x7553
-0xE3DF = 0x7554
-0xE3E0 = 0x7555
-0xE3E1 = 0x7556
-0xE3E2 = 0x7557
-0xE3E3 = 0x7558
-0xE3E4 = 0x7559
-0xE3E5 = 0x755A
-0xE3E6 = 0x755B
-0xE3E7 = 0x755C
-0xE3E8 = 0x755D
-0xE3E9 = 0x755E
-0xE3EA = 0x755F
-0xE3EB = 0x7560
-0xE3EC = 0x7561
-0xE3ED = 0x7562
-0xE3EE = 0x7563
-0xE3EF = 0x7564
-0xE3F0 = 0x7565
-0xE3F1 = 0x7566
-0xE3F2 = 0x7567
-0xE3F3 = 0x7568
-0xE3F4 = 0x7569
-0xE3F5 = 0x756A
-0xE3F6 = 0x756B
-0xE3F7 = 0x756C
-0xE3F8 = 0x756D
-0xE3F9 = 0x756E
-0xE3FA = 0x756F
-0xE3FB = 0x7570
-0xE3FC = 0x7571
-0xE3FD = 0x7572
-0xE3FE = 0x7573
-0xE3FF = 0x7574
-0xE400 = 0x7575
-0xE401 = 0x7576
-0xE402 = 0x7577
-0xE403 = 0x7578
-0xE404 = 0x7579
-0xE405 = 0x757A
-0xE406 = 0x757B
-0xE407 = 0x757C
-0xE408 = 0x757D
-0xE409 = 0x757E
-0xE40A = 0x7621
-0xE40B = 0x7622
-0xE40C = 0x7623
-0xE40D = 0x7624
-0xE40E = 0x7625
-0xE40F = 0x7626
-0xE410 = 0x7627
-0xE411 = 0x7628
-0xE412 = 0x7629
-0xE413 = 0x762A
-0xE414 = 0x762B
-0xE415 = 0x762C
-0xE416 = 0x762D
-0xE417 = 0x762E
-0xE418 = 0x762F
-0xE419 = 0x7630
-0xE41A = 0x7631
-0xE41B = 0x7632
-0xE41C = 0x7633
-0xE41D = 0x7634
-0xE41E = 0x7635
-0xE41F = 0x7636
-0xE420 = 0x7637
-0xE421 = 0x7638
-0xE422 = 0x7639
-0xE423 = 0x763A
-0xE424 = 0x763B
-0xE425 = 0x763C
-0xE426 = 0x763D
-0xE427 = 0x763E
-0xE428 = 0x763F
-0xE429 = 0x7640
-0xE42A = 0x7641
-0xE42B = 0x7642
-0xE42C = 0x7643
-0xE42D = 0x7644
-0xE42E = 0x7645
-0xE42F = 0x7646
-0xE430 = 0x7647
-0xE431 = 0x7648
-0xE432 = 0x7649
-0xE433 = 0x764A
-0xE434 = 0x764B
-0xE435 = 0x764C
-0xE436 = 0x764D
-0xE437 = 0x764E
-0xE438 = 0x764F
-0xE439 = 0x7650
-0xE43A = 0x7651
-0xE43B = 0x7652
-0xE43C = 0x7653
-0xE43D = 0x7654
-0xE43E = 0x7655
-0xE43F = 0x7656
-0xE440 = 0x7657
-0xE441 = 0x7658
-0xE442 = 0x7659
-0xE443 = 0x765A
-0xE444 = 0x765B
-0xE445 = 0x765C
-0xE446 = 0x765D
-0xE447 = 0x765E
-0xE448 = 0x765F
-0xE449 = 0x7660
-0xE44A = 0x7661
-0xE44B = 0x7662
-0xE44C = 0x7663
-0xE44D = 0x7664
-0xE44E = 0x7665
-0xE44F = 0x7666
-0xE450 = 0x7667
-0xE451 = 0x7668
-0xE452 = 0x7669
-0xE453 = 0x766A
-0xE454 = 0x766B
-0xE455 = 0x766C
-0xE456 = 0x766D
-0xE457 = 0x766E
-0xE458 = 0x766F
-0xE459 = 0x7670
-0xE45A = 0x7671
-0xE45B = 0x7672
-0xE45C = 0x7673
-0xE45D = 0x7674
-0xE45E = 0x7675
-0xE45F = 0x7676
-0xE460 = 0x7677
-0xE461 = 0x7678
-0xE462 = 0x7679
-0xE463 = 0x767A
-0xE464 = 0x767B
-0xE465 = 0x767C
-0xE466 = 0x767D
-0xE467 = 0x767E
-0xE468 = 0x7721
-0xE469 = 0x7722
-0xE46A = 0x7723
-0xE46B = 0x7724
-0xE46C = 0x7725
-0xE46D = 0x7726
-0xE46E = 0x7727
-0xE46F = 0x7728
-0xE470 = 0x7729
-0xE471 = 0x772A
-0xE472 = 0x772B
-0xE473 = 0x772C
-0xE474 = 0x772D
-0xE475 = 0x772E
-0xE476 = 0x772F
-0xE477 = 0x7730
-0xE478 = 0x7731
-0xE479 = 0x7732
-0xE47A = 0x7733
-0xE47B = 0x7734
-0xE47C = 0x7735
-0xE47D = 0x7736
-0xE47E = 0x7737
-0xE47F = 0x7738
-0xE480 = 0x7739
-0xE481 = 0x773A
-0xE482 = 0x773B
-0xE483 = 0x773C
-0xE484 = 0x773D
-0xE485 = 0x773E
-0xE486 = 0x773F
-0xE487 = 0x7740
-0xE488 = 0x7741
-0xE489 = 0x7742
-0xE48A = 0x7743
-0xE48B = 0x7744
-0xE48C = 0x7745
-0xE48D = 0x7746
-0xE48E = 0x7747
-0xE48F = 0x7748
-0xE490 = 0x7749
-0xE491 = 0x774A
-0xE492 = 0x774B
-0xE493 = 0x774C
-0xE494 = 0x774D
-0xE495 = 0x774E
-0xE496 = 0x774F
-0xE497 = 0x7750
-0xE498 = 0x7751
-0xE499 = 0x7752
-0xE49A = 0x7753
-0xE49B = 0x7754
-0xE49C = 0x7755
-0xE49D = 0x7756
-0xE49E = 0x7757
-0xE49F = 0x7758
-0xE4A0 = 0x7759
-0xE4A1 = 0x775A
-0xE4A2 = 0x775B
-0xE4A3 = 0x775C
-0xE4A4 = 0x775D
-0xE4A5 = 0x775E
-0xE4A6 = 0x775F
-0xE4A7 = 0x7760
-0xE4A8 = 0x7761
-0xE4A9 = 0x7762
-0xE4AA = 0x7763
-0xE4AB = 0x7764
-0xE4AC = 0x7765
-0xE4AD = 0x7766
-0xE4AE = 0x7767
-0xE4AF = 0x7768
-0xE4B0 = 0x7769
-0xE4B1 = 0x776A
-0xE4B2 = 0x776B
-0xE4B3 = 0x776C
-0xE4B4 = 0x776D
-0xE4B5 = 0x776E
-0xE4B6 = 0x776F
-0xE4B7 = 0x7770
-0xE4B8 = 0x7771
-0xE4B9 = 0x7772
-0xE4BA = 0x7773
-0xE4BB = 0x7774
-0xE4BC = 0x7775
-0xE4BD = 0x7776
-0xE4BE = 0x7777
-0xE4BF = 0x7778
-0xE4C0 = 0x7779
-0xE4C1 = 0x777A
-0xE4C2 = 0x777B
-0xE4C3 = 0x777C
-0xE4C4 = 0x777D
-0xE4C5 = 0x777E
-0xE4C6 = 0x7821
-0xE4C7 = 0x7822
-0xE4C8 = 0x7823
-0xE4C9 = 0x7824
-0xE4CA = 0x7825
-0xE4CB = 0x7826
-0xE4CC = 0x7827
-0xE4CD = 0x7828
-0xE4CE = 0x7829
-0xE4CF = 0x782A
-0xE4D0 = 0x782B
-0xE4D1 = 0x782C
-0xE4D2 = 0x782D
-0xE4D3 = 0x782E
-0xE4D4 = 0x782F
-0xE4D5 = 0x7830
-0xE4D6 = 0x7831
-0xE4D7 = 0x7832
-0xE4D8 = 0x7833
-0xE4D9 = 0x7834
-0xE4DA = 0x7835
-0xE4DB = 0x7836
-0xE4DC = 0x7837
-0xE4DD = 0x7838
-0xE4DE = 0x7839
-0xE4DF = 0x783A
-0xE4E0 = 0x783B
-0xE4E1 = 0x783C
-0xE4E2 = 0x783D
-0xE4E3 = 0x783E
-0xE4E4 = 0x783F
-0xE4E5 = 0x7840
-0xE4E6 = 0x7841
-0xE4E7 = 0x7842
-0xE4E8 = 0x7843
-0xE4E9 = 0x7844
-0xE4EA = 0x7845
-0xE4EB = 0x7846
-0xE4EC = 0x7847
-0xE4ED = 0x7848
-0xE4EE = 0x7849
-0xE4EF = 0x784A
-0xE4F0 = 0x784B
-0xE4F1 = 0x784C
-0xE4F2 = 0x784D
-0xE4F3 = 0x784E
-0xE4F4 = 0x784F
-0xE4F5 = 0x7850
-0xE4F6 = 0x7851
-0xE4F7 = 0x7852
-0xE4F8 = 0x7853
-0xE4F9 = 0x7854
-0xE4FA = 0x7855
-0xE4FB = 0x7856
-0xE4FC = 0x7857
-0xE4FD = 0x7858
-0xE4FE = 0x7859
-0xE4FF = 0x785A
-0xE500 = 0x785B
-0xE501 = 0x785C
-0xE502 = 0x785D
-0xE503 = 0x785E
-0xE504 = 0x785F
-0xE505 = 0x7860
-0xE506 = 0x7861
-0xE507 = 0x7862
-0xE508 = 0x7863
-0xE509 = 0x7864
-0xE50A = 0x7865
-0xE50B = 0x7866
-0xE50C = 0x7867
-0xE50D = 0x7868
-0xE50E = 0x7869
-0xE50F = 0x786A
-0xE510 = 0x786B
-0xE511 = 0x786C
-0xE512 = 0x786D
-0xE513 = 0x786E
-0xE514 = 0x786F
-0xE515 = 0x7870
-0xE516 = 0x7871
-0xE517 = 0x7872
-0xE518 = 0x7873
-0xE519 = 0x7874
-0xE51A = 0x7875
-0xE51B = 0x7876
-0xE51C = 0x7877
-0xE51D = 0x7878
-0xE51E = 0x7879
-0xE51F = 0x787A
-0xE520 = 0x787B
-0xE521 = 0x787C
-0xE522 = 0x787D
-0xE523 = 0x787E
-0xE524 = 0x7921
-0xE525 = 0x7922
-0xE526 = 0x7923
-0xE527 = 0x7924
-0xE528 = 0x7925
-0xE529 = 0x7926
-0xE52A = 0x7927
-0xE52B = 0x7928
-0xE52C = 0x7929
-0xE52D = 0x792A
-0xE52E = 0x792B
-0xE52F = 0x792C
-0xE530 = 0x792D
-0xE531 = 0x792E
-0xE532 = 0x792F
-0xE533 = 0x7930
-0xE534 = 0x7931
-0xE535 = 0x7932
-0xE536 = 0x7933
-0xE537 = 0x7934
-0xE538 = 0x7935
-0xE539 = 0x7936
-0xE53A = 0x7937
-0xE53B = 0x7938
-0xE53C = 0x7939
-0xE53D = 0x793A
-0xE53E = 0x793B
-0xE53F = 0x793C
-0xE540 = 0x793D
-0xE541 = 0x793E
-0xE542 = 0x793F
-0xE543 = 0x7940
-0xE544 = 0x7941
-0xE545 = 0x7942
-0xE546 = 0x7943
-0xE547 = 0x7944
-0xE548 = 0x7945
-0xE549 = 0x7946
-0xE54A = 0x7947
-0xE54B = 0x7948
-0xE54C = 0x7949
-0xE54D = 0x794A
-0xE54E = 0x794B
-0xE54F = 0x794C
-0xE550 = 0x794D
-0xE551 = 0x794E
-0xE552 = 0x794F
-0xE553 = 0x7950
-0xE554 = 0x7951
-0xE555 = 0x7952
-0xE556 = 0x7953
-0xE557 = 0x7954
-0xE558 = 0x7955
-0xE559 = 0x7956
-0xE55A = 0x7957
-0xE55B = 0x7958
-0xE55C = 0x7959
-0xE55D = 0x795A
-0xE55E = 0x795B
-0xE55F = 0x795C
-0xE560 = 0x795D
-0xE561 = 0x795E
-0xE562 = 0x795F
-0xE563 = 0x7960
-0xE564 = 0x7961
-0xE565 = 0x7962
-0xE566 = 0x7963
-0xE567 = 0x7964
-0xE568 = 0x7965
-0xE569 = 0x7966
-0xE56A = 0x7967
-0xE56B = 0x7968
-0xE56C = 0x7969
-0xE56D = 0x796A
-0xE56E = 0x796B
-0xE56F = 0x796C
-0xE570 = 0x796D
-0xE571 = 0x796E
-0xE572 = 0x796F
-0xE573 = 0x7970
-0xE574 = 0x7971
-0xE575 = 0x7972
-0xE576 = 0x7973
-0xE577 = 0x7974
-0xE578 = 0x7975
-0xE579 = 0x7976
-0xE57A = 0x7977
-0xE57B = 0x7978
-0xE57C = 0x7979
-0xE57D = 0x797A
-0xE57E = 0x797B
-0xE57F = 0x797C
-0xE580 = 0x797D
-0xE581 = 0x797E
-0xE582 = 0x7A21
-0xE583 = 0x7A22
-0xE584 = 0x7A23
-0xE585 = 0x7A24
-0xE586 = 0x7A25
-0xE587 = 0x7A26
-0xE588 = 0x7A27
-0xE589 = 0x7A28
-0xE58A = 0x7A29
-0xE58B = 0x7A2A
-0xE58C = 0x7A2B
-0xE58D = 0x7A2C
-0xE58E = 0x7A2D
-0xE58F = 0x7A2E
-0xE590 = 0x7A2F
-0xE591 = 0x7A30
-0xE592 = 0x7A31
-0xE593 = 0x7A32
-0xE594 = 0x7A33
-0xE595 = 0x7A34
-0xE596 = 0x7A35
-0xE597 = 0x7A36
-0xE598 = 0x7A37
-0xE599 = 0x7A38
-0xE59A = 0x7A39
-0xE59B = 0x7A3A
-0xE59C = 0x7A3B
-0xE59D = 0x7A3C
-0xE59E = 0x7A3D
-0xE59F = 0x7A3E
-0xE5A0 = 0x7A3F
-0xE5A1 = 0x7A40
-0xE5A2 = 0x7A41
-0xE5A3 = 0x7A42
-0xE5A4 = 0x7A43
-0xE5A5 = 0x7A44
-0xE5A6 = 0x7A45
-0xE5A7 = 0x7A46
-0xE5A8 = 0x7A47
-0xE5A9 = 0x7A48
-0xE5AA = 0x7A49
-0xE5AB = 0x7A4A
-0xE5AC = 0x7A4B
-0xE5AD = 0x7A4C
-0xE5AE = 0x7A4D
-0xE5AF = 0x7A4E
-0xE5B0 = 0x7A4F
-0xE5B1 = 0x7A50
-0xE5B2 = 0x7A51
-0xE5B3 = 0x7A52
-0xE5B4 = 0x7A53
-0xE5B5 = 0x7A54
-0xE5B6 = 0x7A55
-0xE5B7 = 0x7A56
-0xE5B8 = 0x7A57
-0xE5B9 = 0x7A58
-0xE5BA = 0x7A59
-0xE5BB = 0x7A5A
-0xE5BC = 0x7A5B
-0xE5BD = 0x7A5C
-0xE5BE = 0x7A5D
-0xE5BF = 0x7A5E
-0xE5C0 = 0x7A5F
-0xE5C1 = 0x7A60
-0xE5C2 = 0x7A61
-0xE5C3 = 0x7A62
-0xE5C4 = 0x7A63
-0xE5C5 = 0x7A64
-0xE5C6 = 0x7A65
-0xE5C7 = 0x7A66
-0xE5C8 = 0x7A67
-0xE5C9 = 0x7A68
-0xE5CA = 0x7A69
-0xE5CB = 0x7A6A
-0xE5CC = 0x7A6B
-0xE5CD = 0x7A6C
-0xE5CE = 0x7A6D
-0xE5CF = 0x7A6E
-0xE5D0 = 0x7A6F
-0xE5D1 = 0x7A70
-0xE5D2 = 0x7A71
-0xE5D3 = 0x7A72
-0xE5D4 = 0x7A73
-0xE5D5 = 0x7A74
-0xE5D6 = 0x7A75
-0xE5D7 = 0x7A76
-0xE5D8 = 0x7A77
-0xE5D9 = 0x7A78
-0xE5DA = 0x7A79
-0xE5DB = 0x7A7A
-0xE5DC = 0x7A7B
-0xE5DD = 0x7A7C
-0xE5DE = 0x7A7D
-0xE5DF = 0x7A7E
-0xE5E0 = 0x7B21
-0xE5E1 = 0x7B22
-0xE5E2 = 0x7B23
-0xE5E3 = 0x7B24
-0xE5E4 = 0x7B25
-0xE5E5 = 0x7B26
-0xE5E6 = 0x7B27
-0xE5E7 = 0x7B28
-0xE5E8 = 0x7B29
-0xE5E9 = 0x7B2A
-0xE5EA = 0x7B2B
-0xE5EB = 0x7B2C
-0xE5EC = 0x7B2D
-0xE5ED = 0x7B2E
-0xE5EE = 0x7B2F
-0xE5EF = 0x7B30
-0xE5F0 = 0x7B31
-0xE5F1 = 0x7B32
-0xE5F2 = 0x7B33
-0xE5F3 = 0x7B34
-0xE5F4 = 0x7B35
-0xE5F5 = 0x7B36
-0xE5F6 = 0x7B37
-0xE5F7 = 0x7B38
-0xE5F8 = 0x7B39
-0xE5F9 = 0x7B3A
-0xE5FA = 0x7B3B
-0xE5FB = 0x7B3C
-0xE5FC = 0x7B3D
-0xE5FD = 0x7B3E
-0xE5FE = 0x7B3F
-0xE5FF = 0x7B40
-0xE600 = 0x7B41
-0xE601 = 0x7B42
-0xE602 = 0x7B43
-0xE603 = 0x7B44
-0xE604 = 0x7B45
-0xE605 = 0x7B46
-0xE606 = 0x7B47
-0xE607 = 0x7B48
-0xE608 = 0x7B49
-0xE609 = 0x7B4A
-0xE60A = 0x7B4B
-0xE60B = 0x7B4C
-0xE60C = 0x7B4D
-0xE60D = 0x7B4E
-0xE60E = 0x7B4F
-0xE60F = 0x7B50
-0xE610 = 0x7B51
-0xE611 = 0x7B52
-0xE612 = 0x7B53
-0xE613 = 0x7B54
-0xE614 = 0x7B55
-0xE615 = 0x7B56
-0xE616 = 0x7B57
-0xE617 = 0x7B58
-0xE618 = 0x7B59
-0xE619 = 0x7B5A
-0xE61A = 0x7B5B
-0xE61B = 0x7B5C
-0xE61C = 0x7B5D
-0xE61D = 0x7B5E
-0xE61E = 0x7B5F
-0xE61F = 0x7B60
-0xE620 = 0x7B61
-0xE621 = 0x7B62
-0xE622 = 0x7B63
-0xE623 = 0x7B64
-0xE624 = 0x7B65
-0xE625 = 0x7B66
-0xE626 = 0x7B67
-0xE627 = 0x7B68
-0xE628 = 0x7B69
-0xE629 = 0x7B6A
-0xE62A = 0x7B6B
-0xE62B = 0x7B6C
-0xE62C = 0x7B6D
-0xE62D = 0x7B6E
-0xE62E = 0x7B6F
-0xE62F = 0x7B70
-0xE630 = 0x7B71
-0xE631 = 0x7B72
-0xE632 = 0x7B73
-0xE633 = 0x7B74
-0xE634 = 0x7B75
-0xE635 = 0x7B76
-0xE636 = 0x7B77
-0xE637 = 0x7B78
-0xE638 = 0x7B79
-0xE639 = 0x7B7A
-0xE63A = 0x7B7B
-0xE63B = 0x7B7C
-0xE63C = 0x7B7D
-0xE63D = 0x7B7E
-0xE63E = 0x7C21
-0xE63F = 0x7C22
-0xE640 = 0x7C23
-0xE641 = 0x7C24
-0xE642 = 0x7C25
-0xE643 = 0x7C26
-0xE644 = 0x7C27
-0xE645 = 0x7C28
-0xE646 = 0x7C29
-0xE647 = 0x7C2A
-0xE648 = 0x7C2B
-0xE649 = 0x7C2C
-0xE64A = 0x7C2D
-0xE64B = 0x7C2E
-0xE64C = 0x7C2F
-0xE64D = 0x7C30
-0xE64E = 0x7C31
-0xE64F = 0x7C32
-0xE650 = 0x7C33
-0xE651 = 0x7C34
-0xE652 = 0x7C35
-0xE653 = 0x7C36
-0xE654 = 0x7C37
-0xE655 = 0x7C38
-0xE656 = 0x7C39
-0xE657 = 0x7C3A
-0xE658 = 0x7C3B
-0xE659 = 0x7C3C
-0xE65A = 0x7C3D
-0xE65B = 0x7C3E
-0xE65C = 0x7C3F
-0xE65D = 0x7C40
-0xE65E = 0x7C41
-0xE65F = 0x7C42
-0xE660 = 0x7C43
-0xE661 = 0x7C44
-0xE662 = 0x7C45
-0xE663 = 0x7C46
-0xE664 = 0x7C47
-0xE665 = 0x7C48
-0xE666 = 0x7C49
-0xE667 = 0x7C4A
-0xE668 = 0x7C4B
-0xE669 = 0x7C4C
-0xE66A = 0x7C4D
-0xE66B = 0x7C4E
-0xE66C = 0x7C4F
-0xE66D = 0x7C50
-0xE66E = 0x7C51
-0xE66F = 0x7C52
-0xE670 = 0x7C53
-0xE671 = 0x7C54
-0xE672 = 0x7C55
-0xE673 = 0x7C56
-0xE674 = 0x7C57
-0xE675 = 0x7C58
-0xE676 = 0x7C59
-0xE677 = 0x7C5A
-0xE678 = 0x7C5B
-0xE679 = 0x7C5C
-0xE67A = 0x7C5D
-0xE67B = 0x7C5E
-0xE67C = 0x7C5F
-0xE67D = 0x7C60
-0xE67E = 0x7C61
-0xE67F = 0x7C62
-0xE680 = 0x7C63
-0xE681 = 0x7C64
-0xE682 = 0x7C65
-0xE683 = 0x7C66
-0xE684 = 0x7C67
-0xE685 = 0x7C68
-0xE686 = 0x7C69
-0xE687 = 0x7C6A
-0xE688 = 0x7C6B
-0xE689 = 0x7C6C
-0xE68A = 0x7C6D
-0xE68B = 0x7C6E
-0xE68C = 0x7C6F
-0xE68D = 0x7C70
-0xE68E = 0x7C71
-0xE68F = 0x7C72
-0xE690 = 0x7C73
-0xE691 = 0x7C74
-0xE692 = 0x7C75
-0xE693 = 0x7C76
-0xE694 = 0x7C77
-0xE695 = 0x7C78
-0xE696 = 0x7C79
-0xE697 = 0x7C7A
-0xE698 = 0x7C7B
-0xE699 = 0x7C7C
-0xE69A = 0x7C7D
-0xE69B = 0x7C7E
-0xE69C = 0x7D21
-0xE69D = 0x7D22
-0xE69E = 0x7D23
-0xE69F = 0x7D24
-0xE6A0 = 0x7D25
-0xE6A1 = 0x7D26
-0xE6A2 = 0x7D27
-0xE6A3 = 0x7D28
-0xE6A4 = 0x7D29
-0xE6A5 = 0x7D2A
-0xE6A6 = 0x7D2B
-0xE6A7 = 0x7D2C
-0xE6A8 = 0x7D2D
-0xE6A9 = 0x7D2E
-0xE6AA = 0x7D2F
-0xE6AB = 0x7D30
-0xE6AC = 0x7D31
-0xE6AD = 0x7D32
-0xE6AE = 0x7D33
-0xE6AF = 0x7D34
-0xE6B0 = 0x7D35
-0xE6B1 = 0x7D36
-0xE6B2 = 0x7D37
-0xE6B3 = 0x7D38
-0xE6B4 = 0x7D39
-0xE6B5 = 0x7D3A
-0xE6B6 = 0x7D3B
-0xE6B7 = 0x7D3C
-0xE6B8 = 0x7D3D
-0xE6B9 = 0x7D3E
-0xE6BA = 0x7D3F
-0xE6BB = 0x7D40
-0xE6BC = 0x7D41
-0xE6BD = 0x7D42
-0xE6BE = 0x7D43
-0xE6BF = 0x7D44
-0xE6C0 = 0x7D45
-0xE6C1 = 0x7D46
-0xE6C2 = 0x7D47
-0xE6C3 = 0x7D48
-0xE6C4 = 0x7D49
-0xE6C5 = 0x7D4A
-0xE6C6 = 0x7D4B
-0xE6C7 = 0x7D4C
-0xE6C8 = 0x7D4D
-0xE6C9 = 0x7D4E
-0xE6CA = 0x7D4F
-0xE6CB = 0x7D50
-0xE6CC = 0x7D51
-0xE6CD = 0x7D52
-0xE6CE = 0x7D53
-0xE6CF = 0x7D54
-0xE6D0 = 0x7D55
-0xE6D1 = 0x7D56
-0xE6D2 = 0x7D57
-0xE6D3 = 0x7D58
-0xE6D4 = 0x7D59
-0xE6D5 = 0x7D5A
-0xE6D6 = 0x7D5B
-0xE6D7 = 0x7D5C
-0xE6D8 = 0x7D5D
-0xE6D9 = 0x7D5E
-0xE6DA = 0x7D5F
-0xE6DB = 0x7D60
-0xE6DC = 0x7D61
-0xE6DD = 0x7D62
-0xE6DE = 0x7D63
-0xE6DF = 0x7D64
-0xE6E0 = 0x7D65
-0xE6E1 = 0x7D66
-0xE6E2 = 0x7D67
-0xE6E3 = 0x7D68
-0xE6E4 = 0x7D69
-0xE6E5 = 0x7D6A
-0xE6E6 = 0x7D6B
-0xE6E7 = 0x7D6C
-0xE6E8 = 0x7D6D
-0xE6E9 = 0x7D6E
-0xE6EA = 0x7D6F
-0xE6EB = 0x7D70
-0xE6EC = 0x7D71
-0xE6ED = 0x7D72
-0xE6EE = 0x7D73
-0xE6EF = 0x7D74
-0xE6F0 = 0x7D75
-0xE6F1 = 0x7D76
-0xE6F2 = 0x7D77
-0xE6F3 = 0x7D78
-0xE6F4 = 0x7D79
-0xE6F5 = 0x7D7A
-0xE6F6 = 0x7D7B
-0xE6F7 = 0x7D7C
-0xE6F8 = 0x7D7D
-0xE6F9 = 0x7D7E
-0xE6FA = 0x7E21
-0xE6FB = 0x7E22
-0xE6FC = 0x7E23
-0xE6FD = 0x7E24
-0xE6FE = 0x7E25
-0xE6FF = 0x7E26
-0xE700 = 0x7E27
-0xE701 = 0x7E28
-0xE702 = 0x7E29
-0xE703 = 0x7E2A
-0xE704 = 0x7E2B
-0xE705 = 0x7E2C
-0xE706 = 0x7E2D
-0xE707 = 0x7E2E
-0xE708 = 0x7E2F
-0xE709 = 0x7E30
-0xE70A = 0x7E31
-0xE70B = 0x7E32
-0xE70C = 0x7E33
-0xE70D = 0x7E34
-0xE70E = 0x7E35
-0xE70F = 0x7E36
-0xE710 = 0x7E37
-0xE711 = 0x7E38
-0xE712 = 0x7E39
-0xE713 = 0x7E3A
-0xE714 = 0x7E3B
-0xE715 = 0x7E3C
-0xE716 = 0x7E3D
-0xE717 = 0x7E3E
-0xE718 = 0x7E3F
-0xE719 = 0x7E40
-0xE71A = 0x7E41
-0xE71B = 0x7E42
-0xE71C = 0x7E43
-0xE71D = 0x7E44
-0xE71E = 0x7E45
-0xE71F = 0x7E46
-0xE720 = 0x7E47
-0xE721 = 0x7E48
-0xE722 = 0x7E49
-0xE723 = 0x7E4A
-0xE724 = 0x7E4B
-0xE725 = 0x7E4C
-0xE726 = 0x7E4D
-0xE727 = 0x7E4E
-0xE728 = 0x7E4F
-0xE729 = 0x7E50
-0xE72A = 0x7E51
-0xE72B = 0x7E52
-0xE72C = 0x7E53
-0xE72D = 0x7E54
-0xE72E = 0x7E55
-0xE72F = 0x7E56
-0xE730 = 0x7E57
-0xE731 = 0x7E58
-0xE732 = 0x7E59
-0xE733 = 0x7E5A
-0xE734 = 0x7E5B
-0xE735 = 0x7E5C
-0xE736 = 0x7E5D
-0xE737 = 0x7E5E
-0xE738 = 0x7E5F
-0xE739 = 0x7E60
-0xE73A = 0x7E61
-0xE73B = 0x7E62
-0xE73C = 0x7E63
-0xE73D = 0x7E64
-0xE73E = 0x7E65
-0xE73F = 0x7E66
-0xE740 = 0x7E67
-0xE741 = 0x7E68
-0xE742 = 0x7E69
-0xE743 = 0x7E6A
-0xE744 = 0x7E6B
-0xE745 = 0x7E6C
-0xE746 = 0x7E6D
-0xE747 = 0x7E6E
-0xE748 = 0x7E6F
-0xE749 = 0x7E70
-0xE74A = 0x7E71
-0xE74B = 0x7E72
-0xE74C = 0x7E73
-0xE74D = 0x7E74
-0xE74E = 0x7E75
-0xE74F = 0x7E76
-0xE750 = 0x7E77
-0xE751 = 0x7E78
-0xE752 = 0x7E79
-0xE753 = 0x7E7A
-0xE754 = 0x7E7B
-0xE755 = 0x7E7C
-0xE756 = 0x7E7D
-0xE757 = 0x7E7E
-END_MAP
diff --git a/enc/trans/JIS/UCS%JISX0212VDC@IBM.src b/enc/trans/JIS/UCS%JISX0212VDC@IBM.src
deleted file mode 100644
index 0863140750..0000000000
--- a/enc/trans/JIS/UCS%JISX0212VDC@IBM.src
+++ /dev/null
@@ -1,121 +0,0 @@
-# $NetBSD: UCS%JISX0212VDC@IBM.src,v 1.1 2003/07/19 20:20:43 tshiozak Exp $
-
-TYPE ROWCOL
-NAME "UCS/JISX0212VDC:IBM"
-SRC_ZONE 0x2116 - 0xFF07
-OOB_MODE INVALID
-DST_INVALID 0xFFFF
-DST_UNIT_BITS 16
-
-BEGIN_MAP
-0x2116 - 0xFF07 = INVALID
-#
-# This data is derived from http://www.opengroup.or.jp/jvc/cde/
-#
-0x2116 = 0x742C
-0x2121 = 0x742D
-0x2160 = 0x737D
-0x2161 = 0x737E
-0x2162 = 0x7421
-0x2163 = 0x7422
-0x2164 = 0x7423
-0x2165 = 0x7424
-0x2166 = 0x7425
-0x2167 = 0x7426
-0x2168 = 0x7427
-0x2169 = 0x7428
-0x2170 = 0x7373
-0x2171 = 0x7374
-0x2172 = 0x7375
-0x2173 = 0x7376
-0x2174 = 0x7377
-0x2175 = 0x7378
-0x2176 = 0x7379
-0x2177 = 0x737A
-0x2178 = 0x737B
-0x2179 = 0x737C
-0x3231 = 0x742B
-0x4EFC = 0x742F
-0x50F4 = 0x7430
-0x51EC = 0x7431
-0x5307 = 0x7432
-0x5324 = 0x7433
-0x548A = 0x7435
-0x5759 = 0x7436
-0x589E = 0x7439
-0x5BEC = 0x743A
-0x5CF5 = 0x743B
-0x5D53 = 0x743C
-0x5FB7 = 0x743E
-0x6085 = 0x743F
-0x6120 = 0x7440
-0x654E = 0x7441
-0x663B = 0x7442
-0x6665 = 0x7443
-0x6801 = 0x7446
-0x6A6B = 0x7449
-0x6AE2 = 0x744A
-0x6DF2 = 0x744C
-0x6DF8 = 0x744B
-0x7028 = 0x744D
-0x70BB = 0x742E
-0x7501 = 0x7450
-0x7682 = 0x7451
-0x769E = 0x7452
-0x7930 = 0x7454
-0x7AE7 = 0x7459
-0x7DA0 = 0x745C
-0x7DD6 = 0x745D
-0x8362 = 0x745F
-0x85B0 = 0x7461
-0x8807 = 0x7464
-0x8B7F = 0x7466
-0x8CF4 = 0x7467
-0x8D76 = 0x7468
-0x90DE = 0x746C
-0x9115 = 0x746E
-0x9592 = 0x7471
-0x973B = 0x7474
-0x974D = 0x7475
-0x9751 = 0x7476
-0x999E = 0x747A
-0x9AD9 = 0x747B
-0x9B72 = 0x747C
-0x9ED1 = 0x747E
-0xF929 = 0x7445
-0xF9DC = 0x7472
-0xFA0E = 0x7434
-0xFA0F = 0x7437
-0xFA10 = 0x7438
-0xFA11 = 0x743D
-0xFA12 = 0x7444
-0xFA13 = 0x7447
-0xFA14 = 0x7448
-0xFA15 = 0x744E
-0xFA16 = 0x744F
-0xFA17 = 0x7453
-0xFA18 = 0x7455
-0xFA19 = 0x7456
-0xFA1A = 0x7457
-0xFA1B = 0x7458
-0xFA1C = 0x745A
-0xFA1D = 0x745B
-0xFA1E = 0x745E
-0xFA1F = 0x7460
-0xFA20 = 0x7462
-0xFA21 = 0x7463
-0xFA22 = 0x7465
-0xFA23 = 0x7469
-0xFA24 = 0x746A
-0xFA25 = 0x746B
-0xFA26 = 0x746D
-0xFA27 = 0x746F
-0xFA28 = 0x7470
-0xFA29 = 0x7473
-0xFA2A = 0x7477
-0xFA2B = 0x7478
-0xFA2C = 0x7479
-0xFA2D = 0x747D
-0xFF02 = 0x742A
-0xFF07 = 0x7429
-END_MAP
diff --git a/enc/trans/big5-hkscs-tbl.rb b/enc/trans/big5-hkscs-tbl.rb
deleted file mode 100644
index 5a82d3b3d2..0000000000
--- a/enc/trans/big5-hkscs-tbl.rb
+++ /dev/null
@@ -1,18385 +0,0 @@
-BIG5_HKSCS_TO_UCS_TBL= [
- ["A246",0xA2],
- ["A247",0xA3],
- ["A244",0xA5],
- ["A1B1",0xA7],
- ["C6D8",0xA8],
- ["A258",0xB0],
- ["A1D3",0xB1],
- ["A150",0xB7],
- ["8859",0xC0],
- ["8857",0xC1],
- ["885D",0xC8],
- ["885B",0xC9],
- ["8866",0xCA],
- ["8861",0xD2],
- ["885F",0xD3],
- ["A1D1",0xD7],
- ["886A",0xE0],
- ["8868",0xE1],
- ["886F",0xE8],
- ["886D",0xE9],
- ["88A7",0xEA],
- ["8873",0xEC],
- ["8871",0xED],
- ["8877",0xF2],
- ["8875",0xF3],
- ["A1D2",0xF7],
- ["C8FB",0xF8],
- ["887B",0xF9],
- ["8879",0xFA],
- ["88A2",0xFC],
- ["8856",0x100],
- ["8867",0x101],
- ["885A",0x112],
- ["886C",0x113],
- ["885C",0x11A],
- ["886E",0x11B],
- ["8870",0x12B],
- ["C8FC",0x14B],
- ["885E",0x14C],
- ["8874",0x14D],
- ["C8FA",0x153],
- ["8878",0x16B],
- ["8858",0x1CD],
- ["8869",0x1CE],
- ["8872",0x1D0],
- ["8860",0x1D1],
- ["8876",0x1D2],
- ["887A",0x1D4],
- ["887C",0x1D6],
- ["887D",0x1D8],
- ["887E",0x1DA],
- ["88A1",0x1DC],
- ["C8F6",0x250],
- ["886B",0x251],
- ["C8F8",0x254],
- ["C8F7",0x25B],
- ["88A8",0x261],
- ["C8FE",0x26A],
- ["C8F9",0x275],
- ["C8F5",0x283],
- ["C8FD",0x28A],
- ["C6D9",0x2C6],
- ["A3BE",0x2C7],
- ["A3BC",0x2C9],
- ["A3BD",0x2CA],
- ["A3BF",0x2CB],
- ["A3BB",0x2D9],
- ["A344",0x391],
- ["A345",0x392],
- ["A346",0x393],
- ["A347",0x394],
- ["A348",0x395],
- ["A349",0x396],
- ["A34A",0x397],
- ["A34B",0x398],
- ["A34C",0x399],
- ["A34D",0x39A],
- ["A34E",0x39B],
- ["A34F",0x39C],
- ["A350",0x39D],
- ["A351",0x39E],
- ["A352",0x39F],
- ["A353",0x3A0],
- ["A354",0x3A1],
- ["A355",0x3A3],
- ["A356",0x3A4],
- ["A357",0x3A5],
- ["A358",0x3A6],
- ["A359",0x3A7],
- ["A35A",0x3A8],
- ["A35B",0x3A9],
- ["A35C",0x3B1],
- ["A35D",0x3B2],
- ["A35E",0x3B3],
- ["A35F",0x3B4],
- ["A360",0x3B5],
- ["A361",0x3B6],
- ["A362",0x3B7],
- ["A363",0x3B8],
- ["A364",0x3B9],
- ["A365",0x3BA],
- ["A366",0x3BB],
- ["A367",0x3BC],
- ["A368",0x3BD],
- ["A369",0x3BE],
- ["A36A",0x3BF],
- ["A36B",0x3C0],
- ["A36C",0x3C1],
- ["A36D",0x3C3],
- ["A36E",0x3C4],
- ["A36F",0x3C5],
- ["A370",0x3C6],
- ["A371",0x3C7],
- ["A372",0x3C8],
- ["A373",0x3C9],
- ["C7F9",0x401],
- ["C7F3",0x410],
- ["C7F4",0x411],
- ["C7F5",0x412],
- ["C7F6",0x413],
- ["C7F7",0x414],
- ["C7F8",0x415],
- ["C7FA",0x416],
- ["C7FB",0x417],
- ["C7FC",0x418],
- ["C7FD",0x419],
- ["C7FE",0x41A],
- ["C840",0x41B],
- ["C841",0x41C],
- ["C842",0x41D],
- ["C843",0x41E],
- ["C844",0x41F],
- ["C845",0x420],
- ["C846",0x421],
- ["C847",0x422],
- ["C848",0x423],
- ["C849",0x424],
- ["C84A",0x425],
- ["C84B",0x426],
- ["C84C",0x427],
- ["C84D",0x428],
- ["C84E",0x429],
- ["C84F",0x42A],
- ["C850",0x42B],
- ["C851",0x42C],
- ["C852",0x42D],
- ["C853",0x42E],
- ["C854",0x42F],
- ["C855",0x430],
- ["C856",0x431],
- ["C857",0x432],
- ["C858",0x433],
- ["C859",0x434],
- ["C85A",0x435],
- ["C85C",0x436],
- ["C85D",0x437],
- ["C85E",0x438],
- ["C85F",0x439],
- ["C860",0x43A],
- ["C861",0x43B],
- ["C862",0x43C],
- ["C863",0x43D],
- ["C864",0x43E],
- ["C865",0x43F],
- ["C866",0x440],
- ["C867",0x441],
- ["C868",0x442],
- ["C869",0x443],
- ["C86A",0x444],
- ["C86B",0x445],
- ["C86C",0x446],
- ["C86D",0x447],
- ["C86E",0x448],
- ["C86F",0x449],
- ["C870",0x44A],
- ["C871",0x44B],
- ["C872",0x44C],
- ["C873",0x44D],
- ["C874",0x44E],
- ["C875",0x44F],
- ["C85B",0x451],
- ["8863",0x1EBE],
- ["88A4",0x1EBF],
- ["8865",0x1EC0],
- ["88A6",0x1EC1],
- ["A156",0x2013],
- ["A158",0x2014],
- ["A1A5",0x2018],
- ["A1A6",0x2019],
- ["A1A7",0x201C],
- ["A1A8",0x201D],
- ["A145",0x2022],
- ["A14C",0x2025],
- ["A14B",0x2026],
- ["A1AC",0x2032],
- ["A1AB",0x2035],
- ["A1B0",0x203B],
- ["A1C2",0x203E],
- ["A24A",0x2103],
- ["A1C1",0x2105],
- ["A24B",0x2109],
- ["C8D2",0x2116],
- ["C8D3",0x2121],
- ["A2B9",0x2160],
- ["A2BA",0x2161],
- ["A2BB",0x2162],
- ["A2BC",0x2163],
- ["A2BD",0x2164],
- ["A2BE",0x2165],
- ["A2BF",0x2166],
- ["A2C0",0x2167],
- ["A2C1",0x2168],
- ["A2C2",0x2169],
- ["C6B5",0x2170],
- ["C6B6",0x2171],
- ["C6B7",0x2172],
- ["C6B8",0x2173],
- ["C6B9",0x2174],
- ["C6BA",0x2175],
- ["C6BB",0x2176],
- ["C6BC",0x2177],
- ["C6BD",0x2178],
- ["C6BE",0x2179],
- ["A1F6",0x2190],
- ["A1F4",0x2191],
- ["A1F7",0x2192],
- ["A1F5",0x2193],
- ["A1F8",0x2196],
- ["A1F9",0x2197],
- ["A1FB",0x2198],
- ["A1FA",0x2199],
- ["C877",0x21B8],
- ["C878",0x21B9],
- ["C876",0x21E7],
- ["A1D4",0x221A],
- ["A1DB",0x221E],
- ["A1E8",0x221F],
- ["A1E7",0x2220],
- ["A1FD",0x2223],
- ["A1FC",0x2225],
- ["A1E4",0x2229],
- ["A1E5",0x222A],
- ["A1EC",0x222B],
- ["A1ED",0x222E],
- ["A1EF",0x2234],
- ["A1EE",0x2235],
- ["A1E3",0x223C],
- ["A1DC",0x2252],
- ["A1DA",0x2260],
- ["A1DD",0x2261],
- ["A1D8",0x2266],
- ["A1D9",0x2267],
- ["A1E6",0x22A5],
- ["A1E9",0x22BF],
- ["88A9",0x23DA],
- ["88AA",0x23DB],
- ["C6A1",0x2460],
- ["C6A2",0x2461],
- ["C6A3",0x2462],
- ["C6A4",0x2463],
- ["C6A5",0x2464],
- ["C6A6",0x2465],
- ["C6A7",0x2466],
- ["C6A8",0x2467],
- ["C6A9",0x2468],
- ["C6AA",0x2469],
- ["C6AB",0x2474],
- ["C6AC",0x2475],
- ["C6AD",0x2476],
- ["C6AE",0x2477],
- ["C6AF",0x2478],
- ["C6B0",0x2479],
- ["C6B1",0x247A],
- ["C6B2",0x247B],
- ["C6B3",0x247C],
- ["C6B4",0x247D],
- ["A277",0x2500],
- ["A278",0x2502],
- ["A27A",0x250C],
- ["A27B",0x2510],
- ["A27C",0x2514],
- ["A27D",0x2518],
- ["A275",0x251C],
- ["A274",0x2524],
- ["A273",0x252C],
- ["A272",0x2534],
- ["A271",0x253C],
- ["A2A4",0x2550],
- ["F9F8",0x2551],
- ["F9E6",0x2552],
- ["F9EF",0x2553],
- ["F9DD",0x2554],
- ["F9E8",0x2555],
- ["F9F1",0x2556],
- ["F9DF",0x2557],
- ["F9EC",0x2558],
- ["F9F5",0x2559],
- ["F9E3",0x255A],
- ["F9EE",0x255B],
- ["F9F7",0x255C],
- ["F9E5",0x255D],
- ["A2A5",0x255E],
- ["F9F2",0x255F],
- ["F9E0",0x2560],
- ["A2A7",0x2561],
- ["F9F4",0x2562],
- ["F9E2",0x2563],
- ["F9E7",0x2564],
- ["F9F0",0x2565],
- ["F9DE",0x2566],
- ["F9ED",0x2567],
- ["F9F6",0x2568],
- ["F9E4",0x2569],
- ["A2A6",0x256A],
- ["F9F3",0x256B],
- ["F9E1",0x256C],
- ["A27E",0x256D],
- ["A2A1",0x256E],
- ["A2A3",0x256F],
- ["A2A2",0x2570],
- ["A2AC",0x2571],
- ["A2AD",0x2572],
- ["A2AE",0x2573],
- ["A262",0x2581],
- ["A263",0x2582],
- ["A264",0x2583],
- ["A265",0x2584],
- ["A266",0x2585],
- ["A267",0x2586],
- ["A268",0x2587],
- ["A269",0x2588],
- ["A270",0x2589],
- ["A26F",0x258A],
- ["A26E",0x258B],
- ["A26D",0x258C],
- ["A26C",0x258D],
- ["A26B",0x258E],
- ["A26A",0x258F],
- ["A276",0x2594],
- ["A279",0x2595],
- ["A1BD",0x25A0],
- ["A1BC",0x25A1],
- ["A1B6",0x25B2],
- ["A1B5",0x25B3],
- ["A1BF",0x25BC],
- ["A1BE",0x25BD],
- ["A1BB",0x25C6],
- ["A1BA",0x25C7],
- ["A1B3",0x25CB],
- ["A1B7",0x25CE],
- ["A1B4",0x25CF],
- ["A2A8",0x25E2],
- ["A2A9",0x25E3],
- ["A2AB",0x25E4],
- ["A2AA",0x25E5],
- ["A1B9",0x2605],
- ["A1B8",0x2606],
- ["A1F3",0x2609],
- ["A1F0",0x2640],
- ["A1F2",0x2641],
- ["A1F1",0x2642],
- ["C6E6",0x273D],
- ["C8D6",0x2E80],
- ["C8D7",0x2E84],
- ["C8D8",0x2E86],
- ["C8D9",0x2E87],
- ["C8DA",0x2E88],
- ["C8DB",0x2E8A],
- ["C8DC",0x2E8C],
- ["C8DD",0x2E8D],
- ["C8DE",0x2E95],
- ["C8DF",0x2E9C],
- ["C8E0",0x2E9D],
- ["C8E1",0x2EA5],
- ["C8E2",0x2EA7],
- ["C8E3",0x2EAA],
- ["C8E4",0x2EAC],
- ["C8E5",0x2EAE],
- ["C8E6",0x2EB6],
- ["C8E7",0x2EBC],
- ["C8E8",0x2EBE],
- ["C8E9",0x2EC6],
- ["C8EA",0x2ECA],
- ["C8EB",0x2ECC],
- ["C8EC",0x2ECD],
- ["C8ED",0x2ECF],
- ["C8EE",0x2ED6],
- ["C8EF",0x2ED7],
- ["C8F0",0x2EDE],
- ["C8F1",0x2EE3],
- ["C6CD",0x2F33],
- ["A140",0x3000],
- ["A142",0x3001],
- ["A143",0x3002],
- ["A1B2",0x3003],
- ["C6E0",0x3005],
- ["C6E1",0x3006],
- ["C6E2",0x3007],
- ["A171",0x3008],
- ["A172",0x3009],
- ["A16D",0x300A],
- ["A16E",0x300B],
- ["A175",0x300C],
- ["A176",0x300D],
- ["A179",0x300E],
- ["A17A",0x300F],
- ["A169",0x3010],
- ["A16A",0x3011],
- ["A245",0x3012],
- ["A165",0x3014],
- ["A166",0x3015],
- ["A1A9",0x301D],
- ["A1AA",0x301E],
- ["A2C3",0x3021],
- ["A2C4",0x3022],
- ["A2C5",0x3023],
- ["A2C6",0x3024],
- ["A2C7",0x3025],
- ["A2C8",0x3026],
- ["A2C9",0x3027],
- ["A2CA",0x3028],
- ["A2CB",0x3029],
- ["C6E7",0x3041],
- ["C6E8",0x3042],
- ["C6E9",0x3043],
- ["C6EA",0x3044],
- ["C6EB",0x3045],
- ["C6EC",0x3046],
- ["C6ED",0x3047],
- ["C6EE",0x3048],
- ["C6EF",0x3049],
- ["C6F0",0x304A],
- ["C6F1",0x304B],
- ["C6F2",0x304C],
- ["C6F3",0x304D],
- ["C6F4",0x304E],
- ["C6F5",0x304F],
- ["C6F6",0x3050],
- ["C6F7",0x3051],
- ["C6F8",0x3052],
- ["C6F9",0x3053],
- ["C6FA",0x3054],
- ["C6FB",0x3055],
- ["C6FC",0x3056],
- ["C6FD",0x3057],
- ["C6FE",0x3058],
- ["C740",0x3059],
- ["C741",0x305A],
- ["C742",0x305B],
- ["C743",0x305C],
- ["C744",0x305D],
- ["C745",0x305E],
- ["C746",0x305F],
- ["C747",0x3060],
- ["C748",0x3061],
- ["C749",0x3062],
- ["C74A",0x3063],
- ["C74B",0x3064],
- ["C74C",0x3065],
- ["C74D",0x3066],
- ["C74E",0x3067],
- ["C74F",0x3068],
- ["C750",0x3069],
- ["C751",0x306A],
- ["C752",0x306B],
- ["C753",0x306C],
- ["C754",0x306D],
- ["C755",0x306E],
- ["C756",0x306F],
- ["C757",0x3070],
- ["C758",0x3071],
- ["C759",0x3072],
- ["C75A",0x3073],
- ["C75B",0x3074],
- ["C75C",0x3075],
- ["C75D",0x3076],
- ["C75E",0x3077],
- ["C75F",0x3078],
- ["C760",0x3079],
- ["C761",0x307A],
- ["C762",0x307B],
- ["C763",0x307C],
- ["C764",0x307D],
- ["C765",0x307E],
- ["C766",0x307F],
- ["C767",0x3080],
- ["C768",0x3081],
- ["C769",0x3082],
- ["C76A",0x3083],
- ["C76B",0x3084],
- ["C76C",0x3085],
- ["C76D",0x3086],
- ["C76E",0x3087],
- ["C76F",0x3088],
- ["C770",0x3089],
- ["C771",0x308A],
- ["C772",0x308B],
- ["C773",0x308C],
- ["C774",0x308D],
- ["C775",0x308E],
- ["C776",0x308F],
- ["C777",0x3090],
- ["C778",0x3091],
- ["C779",0x3092],
- ["C77A",0x3093],
- ["C8D4",0x309B],
- ["C8D5",0x309C],
- ["C6DC",0x309D],
- ["C6DD",0x309E],
- ["C77B",0x30A1],
- ["C77C",0x30A2],
- ["C77D",0x30A3],
- ["C77E",0x30A4],
- ["C7A1",0x30A5],
- ["C7A2",0x30A6],
- ["C7A3",0x30A7],
- ["C7A4",0x30A8],
- ["C7A5",0x30A9],
- ["C7A6",0x30AA],
- ["C7A7",0x30AB],
- ["C7A8",0x30AC],
- ["C7A9",0x30AD],
- ["C7AA",0x30AE],
- ["C7AB",0x30AF],
- ["C7AC",0x30B0],
- ["C7AD",0x30B1],
- ["C7AE",0x30B2],
- ["C7AF",0x30B3],
- ["C7B0",0x30B4],
- ["C7B1",0x30B5],
- ["C7B2",0x30B6],
- ["C7B3",0x30B7],
- ["C7B4",0x30B8],
- ["C7B5",0x30B9],
- ["C7B6",0x30BA],
- ["C7B7",0x30BB],
- ["C7B8",0x30BC],
- ["C7B9",0x30BD],
- ["C7BA",0x30BE],
- ["C7BB",0x30BF],
- ["C7BC",0x30C0],
- ["C7BD",0x30C1],
- ["C7BE",0x30C2],
- ["C7BF",0x30C3],
- ["C7C0",0x30C4],
- ["C7C1",0x30C5],
- ["C7C2",0x30C6],
- ["C7C3",0x30C7],
- ["C7C4",0x30C8],
- ["C7C5",0x30C9],
- ["C7C6",0x30CA],
- ["C7C7",0x30CB],
- ["C7C8",0x30CC],
- ["C7C9",0x30CD],
- ["C7CA",0x30CE],
- ["C7CB",0x30CF],
- ["C7CC",0x30D0],
- ["C7CD",0x30D1],
- ["C7CE",0x30D2],
- ["C7CF",0x30D3],
- ["C7D0",0x30D4],
- ["C7D1",0x30D5],
- ["C7D2",0x30D6],
- ["C7D3",0x30D7],
- ["C7D4",0x30D8],
- ["C7D5",0x30D9],
- ["C7D6",0x30DA],
- ["C7D7",0x30DB],
- ["C7D8",0x30DC],
- ["C7D9",0x30DD],
- ["C7DA",0x30DE],
- ["C7DB",0x30DF],
- ["C7DC",0x30E0],
- ["C7DD",0x30E1],
- ["C7DE",0x30E2],
- ["C7DF",0x30E3],
- ["C7E0",0x30E4],
- ["C7E1",0x30E5],
- ["C7E2",0x30E6],
- ["C7E3",0x30E7],
- ["C7E4",0x30E8],
- ["C7E5",0x30E9],
- ["C7E6",0x30EA],
- ["C7E7",0x30EB],
- ["C7E8",0x30EC],
- ["C7E9",0x30ED],
- ["C7EA",0x30EE],
- ["C7EB",0x30EF],
- ["C7EC",0x30F0],
- ["C7ED",0x30F1],
- ["C7EE",0x30F2],
- ["C7EF",0x30F3],
- ["C7F0",0x30F4],
- ["C7F1",0x30F5],
- ["C7F2",0x30F6],
- ["C6E3",0x30FC],
- ["C6DA",0x30FD],
- ["C6DB",0x30FE],
- ["A374",0x3105],
- ["A375",0x3106],
- ["A376",0x3107],
- ["A377",0x3108],
- ["A378",0x3109],
- ["A379",0x310A],
- ["A37A",0x310B],
- ["A37B",0x310C],
- ["A37C",0x310D],
- ["A37D",0x310E],
- ["A37E",0x310F],
- ["A3A1",0x3110],
- ["A3A2",0x3111],
- ["A3A3",0x3112],
- ["A3A4",0x3113],
- ["A3A5",0x3114],
- ["A3A6",0x3115],
- ["A3A7",0x3116],
- ["A3A8",0x3117],
- ["A3A9",0x3118],
- ["A3AA",0x3119],
- ["A3AB",0x311A],
- ["A3AC",0x311B],
- ["A3AD",0x311C],
- ["A3AE",0x311D],
- ["A3AF",0x311E],
- ["A3B0",0x311F],
- ["A3B1",0x3120],
- ["A3B2",0x3121],
- ["A3B3",0x3122],
- ["A3B4",0x3123],
- ["A3B5",0x3124],
- ["A3B6",0x3125],
- ["A3B7",0x3126],
- ["A3B8",0x3127],
- ["A3B9",0x3128],
- ["A3BA",0x3129],
- ["8840",0x31C0],
- ["8841",0x31C1],
- ["8842",0x31C2],
- ["8843",0x31C3],
- ["8844",0x31C4],
- ["8846",0x31C5],
- ["8849",0x31C6],
- ["884A",0x31C7],
- ["884D",0x31C8],
- ["884F",0x31C9],
- ["8850",0x31CA],
- ["8851",0x31CB],
- ["8852",0x31CC],
- ["8854",0x31CD],
- ["8855",0x31CE],
- ["C879",0x31CF],
- ["C8D1",0x3231],
- ["A1C0",0x32A3],
- ["A255",0x338E],
- ["A256",0x338F],
- ["A250",0x339C],
- ["A251",0x339D],
- ["A252",0x339E],
- ["A254",0x33A1],
- ["A257",0x33C4],
- ["A253",0x33CE],
- ["A1EB",0x33D1],
- ["A1EA",0x33D2],
- ["A24F",0x33D5],
- ["9277",0x3435],
- ["96DF",0x3440],
- ["8CF4",0x344A],
- ["89D5",0x344C],
- ["93CD",0x3464],
- ["9BDF",0x3473],
- ["FA68",0x347A],
- ["89DA",0x347D],
- ["8F59",0x347E],
- ["89DB",0x3493],
- ["8F5D",0x3496],
- ["89DC",0x34A5],
- ["96F7",0x34AF],
- ["8ADA",0x34BC],
- ["8BDC",0x34C1],
- ["97DB",0x34C8],
- ["9E53",0x34DF],
- ["9DAA",0x34E4],
- ["9BEA",0x34FB],
- ["8A6E",0x3506],
- ["8BC8",0x353E],
- ["89E8",0x3551],
- ["89EA",0x3553],
- ["8C4B",0x3559],
- ["FB70",0x3561],
- ["89ED",0x356D],
- ["94DD",0x3570],
- ["89EE",0x3572],
- ["9EB4",0x3577],
- ["8AD3",0x3578],
- ["92DB",0x3584],
- ["94DB",0x3597],
- ["89F9",0x3598],
- ["FB7A",0x35A1],
- ["89FB",0x35A5],
- ["9EFC",0x35AD],
- ["89FC",0x35BF],
- ["89BF",0x35C1],
- ["89FE",0x35C5],
- ["89E6",0x35C7],
- ["9D46",0x35CA],
- ["9DEE",0x35CE],
- ["A07E",0x35D2],
- ["A068",0x35D6],
- ["98E9",0x35DB],
- ["8B68",0x35DD],
- ["8DFD",0x35F1],
- ["8BBE",0x35F2],
- ["9FD9",0x35F3],
- ["8AEB",0x35FB],
- ["9FD7",0x35FE],
- ["8B6A",0x3609],
- ["9C5C",0x3618],
- ["8BB1",0x361A],
- ["FB5E",0x3623],
- ["8770",0x3625],
- ["9DF3",0x362D],
- ["A0D0",0x3635],
- ["FC66",0x3639],
- ["92E9",0x363E],
- ["9AEC",0x3647],
- ["8FAB",0x3648],
- ["FA48",0x3649],
- ["8E45",0x364E],
- ["9C6F",0x365F],
- ["8D5C",0x3661],
- ["9EDE",0x367A],
- ["89EF",0x3681],
- ["96E9",0x369A],
- ["9EBB",0x36A5],
- ["94DE",0x36AA],
- ["9EB8",0x36AC],
- ["97BA",0x36B0],
- ["FB65",0x36B1],
- ["95D6",0x36B5],
- ["9CBB",0x36B9],
- ["97DA",0x36BC],
- ["8F45",0x36C1],
- ["FB7D",0x36C3],
- ["9158",0x36C4],
- ["FE64",0x36C5],
- ["9856",0x36C7],
- ["9B4D",0x36C8],
- ["935B",0x36D3],
- ["95C7",0x36D4],
- ["97E7",0x36D6],
- ["9359",0x36DD],
- ["91F5",0x36E1],
- ["97B8",0x36E2],
- ["FDA2",0x36E5],
- ["FBB6",0x36E6],
- ["92FA",0x36F5],
- ["9357",0x3701],
- ["8BA6",0x3703],
- ["FBB9",0x3708],
- ["97B0",0x370A],
- ["FDC4",0x370D],
- ["9CA1",0x371C],
- ["91F2",0x3722],
- ["91F9",0x3723],
- ["8FF1",0x3725],
- ["9745",0x372C],
- ["9853",0x372D],
- ["FE78",0x3730],
- ["FBC1",0x3732],
- ["9251",0x3733],
- ["9DAD",0x373A],
- ["FD6C",0x3740],
- ["FA6B",0x3743],
- ["9BC2",0x3762],
- ["9A7B",0x376F],
- ["8B60",0x3797],
- ["934B",0x37A0],
- ["9ABD",0x37B9],
- ["91B7",0x37BE],
- ["8D4B",0x37D6],
- ["95B4",0x37F2],
- ["FEC5",0x37F8],
- ["9EF0",0x37FB],
- ["8D64",0x380F],
- ["9269",0x3819],
- ["8D67",0x3820],
- ["FBEA",0x382D],
- ["FBEF",0x3836],
- ["8D68",0x3838],
- ["93EB",0x3863],
- ["FC42",0x38A0],
- ["9166",0x38C3],
- ["FACD",0x38CC],
- ["93DD",0x38D1],
- ["8D52",0x38D4],
- ["8BCC",0x38FA],
- ["8D6D",0x3908],
- ["8D6E",0x3914],
- ["96A8",0x3927],
- ["FCA6",0x3932],
- ["8D6F",0x393F],
- ["8D70",0x394D],
- ["FC64",0x3963],
- ["8CF3",0x3978],
- ["9060",0x3980],
- ["8D74",0x3989],
- ["97C3",0x398A],
- ["8AD0",0x3992],
- ["9274",0x3999],
- ["9BBE",0x399B],
- ["9CC8",0x39A1],
- ["9CBA",0x39A4],
- ["8D78",0x39B8],
- ["9EB9",0x39DC],
- ["955A",0x39E2],
- ["91B4",0x39E5],
- ["8A48",0x39EC],
- ["8D7D",0x39F8],
- ["8A7D",0x39FB],
- ["8AC2",0x39FE],
- ["FD4A",0x3A01],
- ["8DA1",0x3A03],
- ["8AD1",0x3A06],
- ["FCB4",0x3A17],
- ["8B47",0x3A18],
- ["93A4",0x3A29],
- ["9EDA",0x3A2A],
- ["8A51",0x3A34],
- ["8DA6",0x3A4B],
- ["9EC5",0x3A52],
- ["FCC4",0x3A57],
- ["A078",0x3A5C],
- ["94B5",0x3A5E],
- ["FCC2",0x3A66],
- ["8A6B",0x3A67],
- ["8DAB",0x3A97],
- ["FAE8",0x3AAB],
- ["8DAD",0x3ABD],
- ["FC49",0x3ADE],
- ["93C1",0x3AE0],
- ["906F",0x3AF0],
- ["8DB0",0x3AF2],
- ["947E",0x3AFB],
- ["90FA",0x3B0E],
- ["9479",0x3B19],
- ["8DB2",0x3B22],
- ["FCEE",0x3B2B],
- ["997B",0x3B39],
- ["8DB4",0x3B42],
- ["8DB7",0x3B58],
- ["91B3",0x3B60],
- ["8DBB",0x3B71],
- ["8DBA",0x3B72],
- ["8DBC",0x3B7B],
- ["9044",0x3B7C],
- ["FD4C",0x3B80],
- ["874B",0x3B95],
- ["93E4",0x3B96],
- ["93E0",0x3B99],
- ["FD53",0x3BA1],
- ["8DC3",0x3BBC],
- ["9BB8",0x3BBE],
- ["FBF0",0x3BC2],
- ["93E9",0x3BC4],
- ["93F6",0x3BD7],
- ["8DC5",0x3BDD],
- ["8DCA",0x3BEC],
- ["8DCC",0x3BF2],
- ["FD5D",0x3BF3],
- ["93B5",0x3BF4],
- ["FD61",0x3C0D],
- ["9CF8",0x3C11],
- ["9252",0x3C15],
- ["A0E8",0x3C18],
- ["9CA5",0x3C54],
- ["8C56",0x3C8B],
- ["8DD6",0x3CCB],
- ["97C0",0x3CCD],
- ["A0DE",0x3CD1],
- ["97D2",0x3CD6],
- ["FAA5",0x3CDC],
- ["FDA3",0x3CEB],
- ["8DDB",0x3CEF],
- ["8CEA",0x3D12],
- ["8EAF",0x3D13],
- ["91B5",0x3D1D],
- ["FD49",0x3D32],
- ["FDD1",0x3D3B],
- ["8DEB",0x3D46],
- ["97C6",0x3D4C],
- ["FDCE",0x3D4E],
- ["90FC",0x3D51],
- ["FC59",0x3D5F],
- ["96D6",0x3D62],
- ["97C5",0x3D69],
- ["8DEF",0x3D6A],
- ["97D7",0x3D6F],
- ["8DF0",0x3D75],
- ["96A6",0x3D7D],
- ["FBBF",0x3D85],
- ["8CDF",0x3D88],
- ["8DF3",0x3D8A],
- ["9449",0x3D8F],
- ["8DF5",0x3D91],
- ["9872",0x3DA5],
- ["8E6B",0x3DAD],
- ["FAFD",0x3DB4],
- ["8F50",0x3DBF],
- ["9DCC",0x3DC6],
- ["FC65",0x3DC7],
- ["8C44",0x3DC9],
- ["996E",0x3DCC],
- ["94A1",0x3DCD],
- ["8F63",0x3DD3],
- ["A0DA",0x3DDB],
- ["9253",0x3DE7],
- ["FDE9",0x3DE8],
- ["9DB5",0x3DEB],
- ["9879",0x3DF3],
- ["876A",0x3DF4],
- ["9D5D",0x3DF7],
- ["8D63",0x3DFC],
- ["9669",0x3DFD],
- ["9F70",0x3E06],
- ["FC6A",0x3E40],
- ["8AC7",0x3E43],
- ["89D7",0x3E48],
- ["FE4D",0x3E55],
- ["9EDD",0x3E74],
- ["FEFB",0x3EA8],
- ["98BC",0x3EA9],
- ["FACC",0x3EAA],
- ["95B0",0x3EAD],
- ["9464",0x3EB1],
- ["936F",0x3EB8],
- ["94B9",0x3EBF],
- ["95EC",0x3EC2],
- ["91EE",0x3EC7],
- ["98C3",0x3ECA],
- ["95F6",0x3ECC],
- ["8FFD",0x3ED0],
- ["98C5",0x3ED1],
- ["9766",0x3ED6],
- ["FE6E",0x3ED7],
- ["97DD",0x3EDA],
- ["8CAA",0x3EDB],
- ["92D2",0x3EDE],
- ["9761",0x3EE1],
- ["98CB",0x3EE2],
- ["95F0",0x3EE7],
- ["975D",0x3EE9],
- ["91E3",0x3EEB],
- ["98CC",0x3EF0],
- ["9469",0x3EF3],
- ["98CD",0x3EF4],
- ["98CE",0x3EFA],
- ["95FC",0x3EFC],
- ["94A3",0x3EFF],
- ["9662",0x3F00],
- ["FEB6",0x3F04],
- ["9463",0x3F06],
- ["8D47",0x3F07],
- ["98D0",0x3F0E],
- ["98D1",0x3F53],
- ["9475",0x3F58],
- ["FAE0",0x3F59],
- ["9472",0x3F63],
- ["98D6",0x3F7C],
- ["8AF0",0x3F93],
- ["98D9",0x3FC0],
- ["8D5A",0x3FC8],
- ["98DB",0x3FD7],
- ["98DD",0x3FDC],
- ["98A8",0x3FE5],
- ["8A6D",0x3FED],
- ["8AFB",0x3FF9],
- ["8AAE",0x3FFA],
- ["FBC9",0x4004],
- ["8C5D",0x4009],
- ["98E4",0x401D],
- ["98E6",0x4039],
- ["98E8",0x4045],
- ["8A4D",0x4053],
- ["9257",0x4057],
- ["95DF",0x4062],
- ["A0AC",0x4065],
- ["98EB",0x406A],
- ["98EC",0x406F],
- ["8CC3",0x4071],
- ["98F4",0x40A8],
- ["8AB8",0x40BB],
- ["9EE7",0x40BF],
- ["94BC",0x40C8],
- ["FCD1",0x40D8],
- ["9CC6",0x40DF],
- ["8D4A",0x40F8],
- ["9E7E",0x40FA],
- ["8D44",0x4102],
- ["98FE",0x4103],
- ["FDE8",0x4104],
- ["9940",0x4109],
- ["94C9",0x410E],
- ["94D3",0x4132],
- ["9946",0x4167],
- ["90C0",0x416C],
- ["94D1",0x416E],
- ["8D4E",0x417C],
- ["9573",0x417F],
- ["93C2",0x4190],
- ["9948",0x41B2],
- ["994B",0x41C4],
- ["8E55",0x41CA],
- ["994E",0x41CF],
- ["8EFE",0x41DB],
- ["8D5F",0x41ED],
- ["8E59",0x41EF],
- ["94EC",0x41F9],
- ["94EF",0x4211],
- ["8C60",0x4223],
- ["8F74",0x4240],
- ["9955",0x4260],
- ["9544",0x426A],
- ["8CCB",0x4276],
- ["9956",0x427A],
- ["9959",0x428C],
- ["995B",0x4294],
- ["8CC4",0x42A2],
- ["FA45",0x42B5],
- ["90B7",0x42B9],
- ["9743",0x42BC],
- ["95CD",0x42F4],
- ["97C9",0x42FB],
- ["FD50",0x42FC],
- ["8EB9",0x432B],
- ["95C6",0x436E],
- ["9967",0x4397],
- ["8CE3",0x439A],
- ["8AB9",0x43BA],
- ["8DFC",0x43C1],
- ["8A76",0x43D9],
- ["9D51",0x43DF],
- ["9973",0x43ED],
- ["8740",0x43F0],
- ["9D4F",0x43F2],
- ["997A",0x4401],
- ["9564",0x4402],
- ["99A1",0x4413],
- ["99A5",0x4425],
- ["99A7",0x442D],
- ["8EED",0x447A],
- ["99AD",0x448F],
- ["C87E",0x4491],
- ["946E",0x449F],
- ["8F70",0x44A0],
- ["FAD0",0x44A2],
- ["99B3",0x44B0],
- ["A053",0x44B7],
- ["8D5E",0x44BD],
- ["965C",0x44C0],
- ["8CE0",0x44C3],
- ["FD7A",0x44C5],
- ["97FE",0x44CE],
- ["92BD",0x44DD],
- ["8D5D",0x44DE],
- ["97FD",0x44DF],
- ["8F64",0x44E4],
- ["FCF7",0x44E9],
- ["9562",0x44EA],
- ["97CD",0x44EB],
- ["9E64",0x44EC],
- ["924C",0x44F4],
- ["8EC9",0x4503],
- ["99BC",0x4504],
- ["9DA5",0x4509],
- ["8F54",0x450B],
- ["8F7C",0x4516],
- ["8D55",0x451B],
- ["8EA2",0x451D],
- ["8F7A",0x4527],
- ["97AE",0x452E],
- ["96C8",0x4533],
- ["8CE4",0x4536],
- ["99C3",0x453B],
- ["90D6",0x453D],
- ["9CBE",0x453F],
- ["8F76",0x4543],
- ["9470",0x4551],
- ["FB4B",0x4552],
- ["FDCA",0x4555],
- ["8CEF",0x4558],
- ["8EC7",0x455C],
- ["8D54",0x4561],
- ["A0F9",0x4562],
- ["8FA9",0x456A],
- ["8D51",0x456D],
- ["99C7",0x4577],
- ["8744",0x4578],
- ["90D7",0x4585],
- ["8743",0x45A6],
- ["8747",0x45B3],
- ["8758",0x45DA],
- ["9EDF",0x45E9],
- ["8D59",0x45EA],
- ["8742",0x4603],
- ["99CE",0x4606],
- ["8FBA",0x460F],
- ["8FEB",0x4615],
- ["99CF",0x4617],
- ["8FC2",0x465B],
- ["92C9",0x467A],
- ["97DC",0x4680],
- ["875D",0x46A1],
- ["8D45",0x46BB],
- ["95B3",0x46CF],
- ["9C79",0x46D0],
- ["95B2",0x46F5],
- ["8D4C",0x46F7],
- ["8FDB",0x4713],
- ["9BE3",0x4718],
- ["874C",0x4736],
- ["874D",0x4744],
- ["9E7A",0x474E],
- ["8757",0x474F],
- ["9BEE",0x477C],
- ["99DE",0x4798],
- ["FAFA",0x47A6],
- ["8A52",0x47D5],
- ["99E1",0x47ED],
- ["8A67",0x47F4],
- ["8BB5",0x4800],
- ["8AAC",0x480B],
- ["99E9",0x4837],
- ["FBCA",0x485D],
- ["97DE",0x4871],
- ["95D1",0x489B],
- ["99F5",0x48AD],
- ["FC4A",0x48AE],
- ["9BA9",0x48D0],
- ["FBDC",0x48DD],
- ["FE56",0x48ED],
- ["9EA4",0x48F3],
- ["9D49",0x48FA],
- ["95DB",0x4906],
- ["89C5",0x4911],
- ["99F8",0x491E],
- ["9664",0x4925],
- ["9055",0x492A],
- ["96D4",0x492D],
- ["977C",0x4935],
- ["964D",0x493C],
- ["97E1",0x493E],
- ["9A48",0x4945],
- ["9A49",0x4951],
- ["FE7D",0x4953],
- ["90AA",0x4965],
- ["9A50",0x496A],
- ["9347",0x4972],
- ["8ED8",0x4989],
- ["90C9",0x49A1],
- ["9A55",0x49A7],
- ["90BC",0x49DF],
- ["9A58",0x49E5],
- ["8BB8",0x49E7],
- ["90D5",0x4A0F],
- ["9641",0x4A1D],
- ["9A5A",0x4A24],
- ["9A5C",0x4A35],
- ["97C2",0x4A96],
- ["875C",0x4AA4],
- ["8ABB",0x4AB4],
- ["9BAA",0x4AB8],
- ["90F5",0x4AD1],
- ["9A60",0x4AE4],
- ["9145",0x4AFF],
- ["8C58",0x4B10],
- ["9A63",0x4B19],
- ["8C49",0x4B20],
- ["8BB6",0x4B2C],
- ["FCCF",0x4B37],
- ["966B",0x4B6F],
- ["9A6E",0x4B70],
- ["914F",0x4B72],
- ["9746",0x4B7B],
- ["A0E6",0x4B7E],
- ["92D7",0x4B8E],
- ["9675",0x4B90],
- ["93D4",0x4B93],
- ["91BB",0x4B96],
- ["9679",0x4B97],
- ["9A70",0x4B9D],
- ["9678",0x4BBD],
- ["91CD",0x4BBE],
- ["9C4A",0x4BC0],
- ["A06F",0x4C04],
- ["A06A",0x4C07],
- ["915F",0x4C0E],
- ["8741",0x4C32],
- ["9FA5",0x4C3B],
- ["89BA",0x4C3E],
- ["874F",0x4C40],
- ["874E",0x4C47],
- ["8755",0x4C57],
- ["9ECD",0x4C5B],
- ["9A79",0x4C6D],
- ["8CF2",0x4C77],
- ["8D57",0x4C7B],
- ["9DCE",0x4C7D],
- ["8CD2",0x4C81],
- ["8759",0x4C85],
- ["9D73",0x4CA4],
- ["96B9",0x4CAE],
- ["96BC",0x4CB0],
- ["9CD1",0x4CB7],
- ["89B7",0x4CCD],
- ["9EEE",0x4CE1],
- ["8749",0x4CE2],
- ["FB43",0x4CED],
- ["875B",0x4D07],
- ["9EC9",0x4D09],
- ["FBD3",0x4D10],
- ["91AE",0x4D34],
- ["8D58",0x4D76],
- ["8746",0x4D77],
- ["8D56",0x4D89],
- ["9D78",0x4D91],
- ["9D7B",0x4D9C],
- ["A440",0x4E00],
- ["A442",0x4E01],
- ["A443",0x4E03],
- ["9EB3",0x4E04],
- ["C945",0x4E07],
- ["A456",0x4E08],
- ["A454",0x4E09],
- ["A457",0x4E0A],
- ["A455",0x4E0B],
- ["C946",0x4E0C],
- ["A4A3",0x4E0D],
- ["C94F",0x4E0E],
- ["C94D",0x4E0F],
- ["A4A2",0x4E10],
- ["A4A1",0x4E11],
- ["A542",0x4E14],
- ["A541",0x4E15],
- ["A540",0x4E16],
- ["A543",0x4E18],
- ["A4FE",0x4E19],
- ["9EB2",0x4E1A],
- ["9DD6",0x4E1C],
- ["A5E0",0x4E1E],
- ["A5E1",0x4E1F],
- ["994F",0x4E21],
- ["89CE",0x4E24],
- ["A8C3",0x4E26],
- ["8BC0",0x4E28],
- ["9FC4",0x4E2A],
- ["A458",0x4E2B],
- ["8BD4",0x4E2C],
- ["A4A4",0x4E2D],
- ["C950",0x4E2E],
- ["8C72",0x4E2F],
- ["A4A5",0x4E30],
- ["C963",0x4E31],
- ["A6EA",0x4E32],
- ["CBB1",0x4E33],
- ["C6BF",0x4E36],
- ["8BF9",0x4E37],
- ["A459",0x4E38],
- ["A4A6",0x4E39],
- ["A544",0x4E3B],
- ["C964",0x4E3C],
- ["8946",0x4E3D],
- ["C6C0",0x4E3F],
- ["C940",0x4E42],
- ["A444",0x4E43],
- ["A45B",0x4E45],
- ["C947",0x4E47],
- ["A45C",0x4E48],
- ["FAE5",0x4E49],
- ["A4A7",0x4E4B],
- ["A545",0x4E4D],
- ["A547",0x4E4E],
- ["A546",0x4E4F],
- ["A5E2",0x4E52],
- ["A5E3",0x4E53],
- ["A8C4",0x4E56],
- ["ADBC",0x4E58],
- ["A441",0x4E59],
- ["C87B",0x4E5A],
- ["8BC6",0x4E5B],
- ["C941",0x4E5C],
- ["A445",0x4E5D],
- ["A45E",0x4E5E],
- ["A45D",0x4E5F],
- ["A5E4",0x4E69],
- ["9C57",0x4E6A],
- ["A8C5",0x4E73],
- ["9AFB",0x4E78],
- ["B0AE",0x4E7E],
- ["D44B",0x4E7F],
- ["89D0",0x4E80],
- ["89CF",0x4E81],
- ["B6C3",0x4E82],
- ["DCB1",0x4E83],
- ["DCB2",0x4E84],
- ["C6C1",0x4E85],
- ["A446",0x4E86],
- ["89D1",0x4E87],
- ["A4A9",0x4E88],
- ["89E2",0x4E89],
- ["A8C6",0x4E8B],
- ["A447",0x4E8C],
- ["C948",0x4E8D],
- ["A45F",0x4E8E],
- ["A4AA",0x4E91],
- ["A4AC",0x4E92],
- ["C951",0x4E93],
- ["A4AD",0x4E94],
- ["A4AB",0x4E95],
- ["927E",0x4E98],
- ["A5E5",0x4E99],
- ["9DBA",0x4E9A],
- ["A8C7",0x4E9B],
- ["A8C8",0x4E9E],
- ["AB45",0x4E9F],
- ["C6C2",0x4EA0],
- ["A460",0x4EA1],
- ["A4AE",0x4EA2],
- ["8C6F",0x4EA3],
- ["A5E6",0x4EA4],
- ["A5E8",0x4EA5],
- ["A5E7",0x4EA6],
- ["A6EB",0x4EA8],
- ["A8C9",0x4EAB],
- ["A8CA",0x4EAC],
- ["AB46",0x4EAD],
- ["AB47",0x4EAE],
- ["ADBD",0x4EB3],
- ["DCB3",0x4EB6],
- ["FBF8",0x4EB7],
- ["F6D6",0x4EB9],
- ["A448",0x4EBA],
- ["8BC7",0x4EBB],
- ["926B",0x4EBC],
- ["89D2",0x4EBF],
- ["A4B0",0x4EC0],
- ["A4AF",0x4EC1],
- ["C952",0x4EC2],
- ["A4B1",0x4EC3],
- ["A4B7",0x4EC4],
- ["A4B2",0x4EC6],
- ["A4B3",0x4EC7],
- ["C954",0x4EC8],
- ["C953",0x4EC9],
- ["A4B5",0x4ECA],
- ["A4B6",0x4ECB],
- ["A4B4",0x4ECD],
- ["9FCF",0x4ECE],
- ["A54A",0x4ED4],
- ["A54B",0x4ED5],
- ["A54C",0x4ED6],
- ["A54D",0x4ED7],
- ["A549",0x4ED8],
- ["A550",0x4ED9],
- ["C96A",0x4EDA],
- ["C966",0x4EDC],
- ["C969",0x4EDD],
- ["A551",0x4EDE],
- ["A561",0x4EDF],
- ["C968",0x4EE1],
- ["A54E",0x4EE3],
- ["A54F",0x4EE4],
- ["A548",0x4EE5],
- ["C965",0x4EE8],
- ["C967",0x4EE9],
- ["9DA9",0x4EEA],
- ["89D3",0x4EEB],
- ["99E2",0x4EEE],
- ["A5F5",0x4EF0],
- ["C9B0",0x4EF1],
- ["A5F2",0x4EF2],
- ["A5F6",0x4EF3],
- ["C9BA",0x4EF4],
- ["C9AE",0x4EF5],
- ["A5F3",0x4EF6],
- ["C9B2",0x4EF7],
- ["9267",0x4EF8],
- ["A5F4",0x4EFB],
- ["A5F7",0x4EFD],
- ["A5E9",0x4EFF],
- ["C9B1",0x4F00],
- ["A5F8",0x4F01],
- ["C9B5",0x4F02],
- ["92A4",0x4F03],
- ["C9B9",0x4F04],
- ["C9B6",0x4F05],
- ["C9B3",0x4F08],
- ["A5EA",0x4F09],
- ["A5EC",0x4F0A],
- ["A5F9",0x4F0B],
- ["A5EE",0x4F0D],
- ["C9AB",0x4F0E],
- ["A5F1",0x4F0F],
- ["A5EF",0x4F10],
- ["A5F0",0x4F11],
- ["C9BB",0x4F12],
- ["C9B8",0x4F13],
- ["C9AF",0x4F14],
- ["A5ED",0x4F15],
- ["8C73",0x4F17],
- ["C9AC",0x4F18],
- ["A5EB",0x4F19],
- ["894E",0x4F1A],
- ["C9B4",0x4F1D],
- ["C9B7",0x4F22],
- ["894F",0x4F28],
- ["9278",0x4F29],
- ["C9AD",0x4F2C],
- ["CA66",0x4F2D],
- ["A742",0x4F2F],
- ["A6F4",0x4F30],
- ["91B6",0x4F32],
- ["CA67",0x4F33],
- ["A6F1",0x4F34],
- ["A744",0x4F36],
- ["89D4",0x4F37],
- ["A6F9",0x4F38],
- ["9FD2",0x4F39],
- ["A6F8",0x4F3A],
- ["CA5B",0x4F3B],
- ["A6FC",0x4F3C],
- ["A6F7",0x4F3D],
- ["CA60",0x4F3E],
- ["CA68",0x4F3F],
- ["CA64",0x4F41],
- ["92A7",0x4F42],
- ["A6FA",0x4F43],
- ["95A2",0x4F45],
- ["A6FD",0x4F46],
- ["A6EE",0x4F47],
- ["A747",0x4F48],
- ["CA5D",0x4F49],
- ["926E",0x4F4B],
- ["CBBD",0x4F4C],
- ["A6EC",0x4F4D],
- ["A743",0x4F4E],
- ["A6ED",0x4F4F],
- ["A6F5",0x4F50],
- ["A6F6",0x4F51],
- ["CA62",0x4F52],
- ["CA5E",0x4F53],
- ["A6FB",0x4F54],
- ["A6F3",0x4F55],
- ["CA5A",0x4F56],
- ["A6EF",0x4F57],
- ["CA65",0x4F58],
- ["A745",0x4F59],
- ["A748",0x4F5A],
- ["A6F2",0x4F5B],
- ["A740",0x4F5C],
- ["A746",0x4F5D],
- ["A6F0",0x4F5E],
- ["CA63",0x4F5F],
- ["A741",0x4F60],
- ["CA69",0x4F61],
- ["CA5C",0x4F62],
- ["A6FE",0x4F63],
- ["CA5F",0x4F64],
- ["CA61",0x4F67],
- ["A8D8",0x4F69],
- ["CBBF",0x4F6A],
- ["CBCB",0x4F6B],
- ["A8D0",0x4F6C],
- ["CBCC",0x4F6E],
- ["A8CB",0x4F6F],
- ["A8D5",0x4F70],
- ["96EA",0x4F72],
- ["A8CE",0x4F73],
- ["CBB9",0x4F74],
- ["A8D6",0x4F75],
- ["CBB8",0x4F76],
- ["CBBC",0x4F77],
- ["CBC3",0x4F78],
- ["CBC1",0x4F79],
- ["A8DE",0x4F7A],
- ["A8D9",0x4F7B],
- ["CBB3",0x4F7C],
- ["CBB5",0x4F7D],
- ["A8DB",0x4F7E],
- ["A8CF",0x4F7F],
- ["CBB6",0x4F80],
- ["CBC2",0x4F81],
- ["CBC9",0x4F82],
- ["A8D4",0x4F83],
- ["CBBB",0x4F84],
- ["CBB4",0x4F85],
- ["A8D3",0x4F86],
- ["CBB7",0x4F87],
- ["A8D7",0x4F88],
- ["CBBA",0x4F89],
- ["926F",0x4F8A],
- ["A8D2",0x4F8B],
- ["A8CD",0x4F8D],
- ["A8DC",0x4F8F],
- ["CBC4",0x4F90],
- ["A8DD",0x4F91],
- ["CBC8",0x4F92],
- ["CBC6",0x4F94],
- ["CBCA",0x4F95],
- ["A8DA",0x4F96],
- ["CBBE",0x4F97],
- ["CBB2",0x4F98],
- ["CBC0",0x4F9A],
- ["A8D1",0x4F9B],
- ["CBC5",0x4F9C],
- ["A8CC",0x4F9D],
- ["CBC7",0x4F9E],
- ["92A3",0x4FA2],
- ["8950",0x4FA8],
- ["FA57",0x4FAB],
- ["AB56",0x4FAE],
- ["AB4A",0x4FAF],
- ["9866",0x4FB0],
- ["CDE0",0x4FB2],
- ["CDE8",0x4FB3],
- ["8CF8",0x4FB4],
- ["AB49",0x4FB5],
- ["AB51",0x4FB6],
- ["AB5D",0x4FB7],
- ["CDEE",0x4FB9],
- ["CDEC",0x4FBA],
- ["CDE7",0x4FBB],
- ["89D6",0x4FBD],
- ["AB4B",0x4FBF],
- ["CDED",0x4FC0],
- ["CDE3",0x4FC1],
- ["AB59",0x4FC2],
- ["AB50",0x4FC3],
- ["AB58",0x4FC4],
- ["CDDE",0x4FC5],
- ["CDEA",0x4FC7],
- ["98B2",0x4FC8],
- ["CDE1",0x4FC9],
- ["AB54",0x4FCA],
- ["CDE2",0x4FCB],
- ["92AB",0x4FCC],
- ["CDDD",0x4FCD],
- ["AB5B",0x4FCE],
- ["AB4E",0x4FCF],
- ["AB57",0x4FD0],
- ["AB4D",0x4FD1],
- ["CDDF",0x4FD3],
- ["CDE4",0x4FD4],
- ["CDEB",0x4FD6],
- ["AB55",0x4FD7],
- ["AB52",0x4FD8],
- ["CDE6",0x4FD9],
- ["AB5A",0x4FDA],
- ["CDE9",0x4FDB],
- ["CDE5",0x4FDC],
- ["AB4F",0x4FDD],
- ["AB5C",0x4FDE],
- ["AB53",0x4FDF],
- ["AB4C",0x4FE0],
- ["AB48",0x4FE1],
- ["96DE",0x4FE4],
- ["92AC",0x4FE5],
- ["CDEF",0x4FEC],
- ["ADD7",0x4FEE],
- ["ADC1",0x4FEF],
- ["8C70",0x4FF0],
- ["ADD1",0x4FF1],
- ["9F6E",0x4FF2],
- ["ADD6",0x4FF3],
- ["D0D0",0x4FF4],
- ["D0CF",0x4FF5],
- ["D0D4",0x4FF6],
- ["D0D5",0x4FF7],
- ["ADC4",0x4FF8],
- ["8EF2",0x4FF9],
- ["ADCD",0x4FFA],
- ["9F6C",0x4FFD],
- ["ADDA",0x4FFE],
- ["ADCE",0x5000],
- ["89D8",0x5003],
- ["D0C9",0x5005],
- ["ADC7",0x5006],
- ["D0CA",0x5007],
- ["FA59",0x5008],
- ["ADDC",0x5009],
- ["ADD3",0x500B],
- ["ADBE",0x500C],
- ["ADBF",0x500D],
- ["D0DD",0x500E],
- ["B0BF",0x500F],
- ["ADCC",0x5011],
- ["ADCB",0x5012],
- ["D0CB",0x5013],
- ["ADCF",0x5014],
- ["D45B",0x5015],
- ["ADC6",0x5016],
- ["D0D6",0x5017],
- ["ADD5",0x5018],
- ["ADD4",0x5019],
- ["ADCA",0x501A],
- ["D0CE",0x501B],
- ["D0D7",0x501C],
- ["D0C8",0x501E],
- ["ADC9",0x501F],
- ["D0D8",0x5020],
- ["ADD2",0x5021],
- ["D0CC",0x5022],
- ["ADC0",0x5023],
- ["ADC3",0x5025],
- ["ADC2",0x5026],
- ["D0D9",0x5027],
- ["ADD0",0x5028],
- ["ADC5",0x5029],
- ["ADD9",0x502A],
- ["ADDB",0x502B],
- ["D0D3",0x502C],
- ["ADD8",0x502D],
- ["92A8",0x502E],
- ["D0DB",0x502F],
- ["D0CD",0x5030],
- ["D0DC",0x5031],
- ["D0D1",0x5033],
- ["9163",0x5034],
- ["D0DA",0x5035],
- ["D0D2",0x5037],
- ["8C40",0x503B],
- ["ADC8",0x503C],
- ["D463",0x5040],
- ["D457",0x5041],
- ["B0B3",0x5043],
- ["D45C",0x5045],
- ["D462",0x5046],
- ["B0B2",0x5047],
- ["D455",0x5048],
- ["B0B6",0x5049],
- ["D459",0x504A],
- ["D452",0x504B],
- ["B0B4",0x504C],
- ["D456",0x504D],
- ["B0B9",0x504E],
- ["B0BE",0x504F],
- ["D467",0x5051],
- ["D451",0x5053],
- ["B0BA",0x5055],
- ["9F73",0x5056],
- ["D466",0x5057],
- ["92AD",0x5058],
- ["B0B5",0x505A],
- ["D458",0x505B],
- ["B0B1",0x505C],
- ["D453",0x505D],
- ["D44F",0x505E],
- ["D45D",0x505F],
- ["D450",0x5060],
- ["D44E",0x5061],
- ["D45A",0x5062],
- ["D460",0x5063],
- ["D461",0x5064],
- ["B0B7",0x5065],
- ["9BE9",0x5066],
- ["D85B",0x5068],
- ["D45E",0x5069],
- ["D44D",0x506A],
- ["D45F",0x506B],
- ["92A9",0x506C],
- ["B0C1",0x506D],
- ["D464",0x506E],
- ["B0C0",0x506F],
- ["D44C",0x5070],
- ["D454",0x5072],
- ["D465",0x5073],
- ["B0BC",0x5074],
- ["B0BB",0x5075],
- ["B0B8",0x5076],
- ["B0BD",0x5077],
- ["B0AF",0x507A],
- ["B0B0",0x507D],
- ["B3C8",0x5080],
- ["92AA",0x5081],
- ["D85E",0x5082],
- ["D857",0x5083],
- ["B3C5",0x5085],
- ["D85F",0x5087],
- ["89D9",0x5088],
- ["D855",0x508B],
- ["D858",0x508C],
- ["B3C4",0x508D],
- ["D859",0x508E],
- ["FD56",0x5090],
- ["B3C7",0x5091],
- ["D85D",0x5092],
- ["D853",0x5094],
- ["D852",0x5095],
- ["B3C9",0x5096],
- ["B3CA",0x5098],
- ["B3C6",0x5099],
- ["B3CB",0x509A],
- ["D851",0x509B],
- ["D85C",0x509C],
- ["D85A",0x509D],
- ["D854",0x509E],
- ["B3C3",0x50A2],
- ["D856",0x50A3],
- ["9FA8",0x50A6],
- ["B6CA",0x50AC],
- ["B6C4",0x50AD],
- ["DCB7",0x50AE],
- ["B6CD",0x50AF],
- ["DCBD",0x50B0],
- ["DCC0",0x50B1],
- ["B6C6",0x50B2],
- ["B6C7",0x50B3],
- ["DCBA",0x50B4],
- ["B6C5",0x50B5],
- ["DCC3",0x50B6],
- ["B6CB",0x50B7],
- ["DCC4",0x50B8],
- ["DCBF",0x50BA],
- ["B6CC",0x50BB],
- ["8C71",0x50BC],
- ["DCB4",0x50BD],
- ["B6C9",0x50BE],
- ["DCB5",0x50BF],
- ["DCBE",0x50C1],
- ["DCBC",0x50C2],
- ["DCB8",0x50C4],
- ["B6C8",0x50C5],
- ["DCB6",0x50C6],
- ["B6CE",0x50C7],
- ["DCBB",0x50C8],
- ["DCC2",0x50C9],
- ["DCB9",0x50CA],
- ["DCC1",0x50CB],
- ["92A1",0x50CD],
- ["B9B6",0x50CE],
- ["B9B3",0x50CF],
- ["90E3",0x50D0],
- ["B9B4",0x50D1],
- ["E0F9",0x50D3],
- ["E0F1",0x50D4],
- ["B9B2",0x50D5],
- ["B9AF",0x50D6],
- ["E0F2",0x50D7],
- ["A0A6",0x50D9],
- ["B9B1",0x50DA],
- ["E0F5",0x50DB],
- ["E0F7",0x50DD],
- ["94AB",0x50DF],
- ["E0FE",0x50E0],
- ["FC72",0x50E1],
- ["E0FD",0x50E3],
- ["E0F8",0x50E4],
- ["B9AE",0x50E5],
- ["E0F0",0x50E6],
- ["B9AC",0x50E7],
- ["E0F3",0x50E8],
- ["B9B7",0x50E9],
- ["E0F6",0x50EA],
- ["E0FA",0x50EC],
- ["B9B0",0x50ED],
- ["B9AD",0x50EE],
- ["E0FC",0x50EF],
- ["E0FB",0x50F0],
- ["B9B5",0x50F1],
- ["E0F4",0x50F3],
- ["97C4",0x50F4],
- ["BBF8",0x50F5],
- ["E4EC",0x50F6],
- ["E4E9",0x50F8],
- ["BBF9",0x50F9],
- ["BBF7",0x50FB],
- ["92AE",0x50FC],
- ["E4F0",0x50FD],
- ["E4ED",0x50FE],
- ["E4E6",0x50FF],
- ["BBF6",0x5100],
- ["FA67",0x5101],
- ["BBFA",0x5102],
- ["E4E7",0x5103],
- ["BBF5",0x5104],
- ["BBFD",0x5105],
- ["E4EA",0x5106],
- ["E4EB",0x5107],
- ["BBFB",0x5108],
- ["BBFC",0x5109],
- ["E4F1",0x510A],
- ["E4EE",0x510B],
- ["E4EF",0x510C],
- ["92A2",0x510D],
- ["FA69",0x510E],
- ["BEAA",0x5110],
- ["E8F8",0x5111],
- ["BEA7",0x5112],
- ["E8F5",0x5113],
- ["BEA9",0x5114],
- ["BEAB",0x5115],
- ["E8F6",0x5117],
- ["BEA8",0x5118],
- ["E8F7",0x511A],
- ["E8F4",0x511C],
- ["C076",0x511F],
- ["ECBD",0x5120],
- ["C077",0x5121],
- ["ECBB",0x5122],
- ["ECBC",0x5124],
- ["ECBA",0x5125],
- ["ECB9",0x5126],
- ["ECBE",0x5129],
- ["C075",0x512A],
- ["9268",0x512B],
- ["EFB8",0x512D],
- ["EFB9",0x512E],
- ["E4E8",0x5130],
- ["EFB7",0x5131],
- ["C078",0x5132],
- ["C35F",0x5133],
- ["F1EB",0x5134],
- ["F1EC",0x5135],
- ["C4D7",0x5137],
- ["C4D8",0x5138],
- ["F5C1",0x5139],
- ["F5C0",0x513A],
- ["C56C",0x513B],
- ["C56B",0x513C],
- ["F7D0",0x513D],
- ["A449",0x513F],
- ["A461",0x5140],
- ["A4B9",0x5141],
- ["A4B8",0x5143],
- ["A553",0x5144],
- ["A552",0x5145],
- ["A5FC",0x5146],
- ["A5FB",0x5147],
- ["A5FD",0x5148],
- ["A5FA",0x5149],
- ["A74A",0x514B],
- ["A749",0x514C],
- ["A74B",0x514D],
- ["A8E0",0x5152],
- ["A8DF",0x5154],
- ["A8E1",0x5155],
- ["8951",0x5156],
- ["AB5E",0x5157],
- ["A259",0x5159],
- ["D0DE",0x515A],
- ["A25A",0x515B],
- ["B0C2",0x515C],
- ["A25C",0x515D],
- ["A25B",0x515E],
- ["D860",0x515F],
- ["FA6F",0x5160],
- ["A25D",0x5161],
- ["B9B8",0x5162],
- ["A25E",0x5163],
- ["A44A",0x5165],
- ["A4BA",0x5167],
- ["A5FE",0x5168],
- ["A8E2",0x5169],
- ["FA71",0x516A],
- ["A44B",0x516B],
- ["A4BD",0x516C],
- ["A4BB",0x516D],
- ["A4BC",0x516E],
- ["A640",0x5171],
- ["8952",0x5174],
- ["A74C",0x5175],
- ["A8E4",0x5176],
- ["A8E3",0x5177],
- ["A8E5",0x5178],
- ["945A",0x5179],
- ["ADDD",0x517C],
- ["BEAC",0x5180],
- ["C6C3",0x5182],
- ["89DD",0x5186],
- ["C94E",0x5187],
- ["C8A2",0x5188],
- ["A554",0x5189],
- ["A555",0x518A],
- ["A641",0x518D],
- ["CA6A",0x518F],
- ["AB60",0x5191],
- ["AB5F",0x5192],
- ["D0E0",0x5193],
- ["D0DF",0x5194],
- ["B0C3",0x5195],
- ["C6C4",0x5196],
- ["A4BE",0x5197],
- ["C955",0x5198],
- ["9E52",0x519A],
- ["8953",0x519C],
- ["CBCD",0x519E],
- ["AB61",0x51A0],
- ["ADE0",0x51A2],
- ["ADDE",0x51A4],
- ["ADDF",0x51A5],
- ["9E55",0x51A7],
- ["92BA",0x51A8],
- ["BEAD",0x51AA],
- ["C6C5",0x51AB],
- ["A556",0x51AC],
- ["8C5B",0x51AE],
- ["A642",0x51B0],
- ["C9BC",0x51B1],
- ["FA7D",0x51B2],
- ["FAA8",0x51B3],
- ["9A68",0x51B4],
- ["FA47",0x51B5],
- ["A74D",0x51B6],
- ["A74E",0x51B7],
- ["FA7E",0x51B8],
- ["CA6B",0x51B9],
- ["CBCE",0x51BC],
- ["A8E6",0x51BD],
- ["CBCF",0x51BE],
- ["92BB",0x51C3],
- ["D0E2",0x51C4],
- ["D0E3",0x51C5],
- ["ADE3",0x51C6],
- ["FDB6",0x51C7],
- ["D0E4",0x51C8],
- ["FAA2",0x51C9],
- ["D0E1",0x51CA],
- ["ADE4",0x51CB],
- ["ADE2",0x51CC],
- ["ADE1",0x51CD],
- ["D0E5",0x51CE],
- ["FAA3",0x51CF],
- ["D468",0x51D0],
- ["FAA4",0x51D1],
- ["9BB4",0x51D2],
- ["FAA6",0x51D3],
- ["D861",0x51D4],
- ["DCC5",0x51D7],
- ["E140",0x51D8],
- ["89DF",0x51DB],
- ["BBFE",0x51DC],
- ["BEAE",0x51DD],
- ["E8F9",0x51DE],
- ["FDDB",0x51DF],
- ["A44C",0x51E0],
- ["A45A",0x51E1],
- ["FAA9",0x51E2],
- ["8954",0x51E4],
- ["FAAB",0x51ED],
- ["B0C4",0x51F0],
- ["B3CD",0x51F1],
- ["B9B9",0x51F3],
- ["FC7A",0x51F4],
- ["C942",0x51F5],
- ["A4BF",0x51F6],
- ["A559",0x51F8],
- ["A557",0x51F9],
- ["A558",0x51FA],
- ["89E0",0x51FC],
- ["A8E7",0x51FD],
- ["9F4F",0x51FE],
- ["A44D",0x5200],
- ["A44E",0x5201],
- ["C87D",0x5202],
- ["A462",0x5203],
- ["89E1",0x5205],
- ["A4C0",0x5206],
- ["A4C1",0x5207],
- ["A4C2",0x5208],
- ["C9BE",0x5209],
- ["A55A",0x520A],
- ["FAB0",0x520B],
- ["C96B",0x520C],
- ["A646",0x520E],
- ["C9BF",0x5210],
- ["A644",0x5211],
- ["A645",0x5212],
- ["C9BD",0x5213],
- ["A647",0x5216],
- ["A643",0x5217],
- ["CA6C",0x521C],
- ["AAEC",0x521D],
- ["CA6D",0x521E],
- ["9FCD",0x521F],
- ["A0E7",0x5220],
- ["CA6E",0x5221],
- ["A750",0x5224],
- ["A74F",0x5225],
- ["FAB1",0x5226],
- ["89A6",0x5227],
- ["A753",0x5228],
- ["A751",0x5229],
- ["A752",0x522A],
- ["A8ED",0x522E],
- ["A8EC",0x5230],
- ["CBD4",0x5231],
- ["CBD1",0x5232],
- ["CBD2",0x5233],
- ["9EFA",0x5234],
- ["CBD0",0x5235],
- ["A8EE",0x5236],
- ["A8EA",0x5237],
- ["A8E9",0x5238],
- ["A8EB",0x523A],
- ["A8E8",0x523B],
- ["FAB2",0x523C],
- ["A8EF",0x5241],
- ["AB63",0x5243],
- ["CDF0",0x5244],
- ["CBD3",0x5246],
- ["AB68",0x5247],
- ["CDF1",0x5249],
- ["AB64",0x524A],
- ["AB67",0x524B],
- ["AB66",0x524C],
- ["AB65",0x524D],
- ["AB62",0x524E],
- ["D0E8",0x5252],
- ["ADE7",0x5254],
- ["D0EB",0x5255],
- ["ADE5",0x5256],
- ["FAB4",0x5257],
- ["92C4",0x5259],
- ["D0E7",0x525A],
- ["ADE8",0x525B],
- ["ADE6",0x525C],
- ["ADE9",0x525D],
- ["D0E9",0x525E],
- ["D0EA",0x525F],
- ["9F6F",0x5260],
- ["D0E6",0x5261],
- ["D0EC",0x5262],
- ["8BB0",0x5268],
- ["B3D1",0x5269],
- ["B0C5",0x526A],
- ["D469",0x526B],
- ["D46B",0x526C],
- ["D46A",0x526D],
- ["D46C",0x526E],
- ["B0C6",0x526F],
- ["B3CE",0x5272],
- ["9FAC",0x5273],
- ["B3CF",0x5274],
- ["B3D0",0x5275],
- ["B6D0",0x5277],
- ["DCC7",0x5278],
- ["89E3",0x5279],
- ["DCC6",0x527A],
- ["DCC8",0x527B],
- ["DCC9",0x527C],
- ["B6D1",0x527D],
- ["B6CF",0x527F],
- ["E141",0x5280],
- ["E142",0x5281],
- ["B9BB",0x5282],
- ["B9BA",0x5283],
- ["E35A",0x5284],
- ["BC40",0x5287],
- ["BC41",0x5288],
- ["BC42",0x5289],
- ["BC44",0x528A],
- ["E4F2",0x528B],
- ["E4F3",0x528C],
- ["BC43",0x528D],
- ["9BD3",0x528F],
- ["89E4",0x5290],
- ["BEAF",0x5291],
- ["BEB0",0x5293],
- ["FAB5",0x5294],
- ["F1ED",0x5296],
- ["F5C3",0x5297],
- ["F5C2",0x5298],
- ["F7D1",0x5299],
- ["9FD5",0x529A],
- ["A44F",0x529B],
- ["A55C",0x529F],
- ["A55B",0x52A0],
- ["8955",0x52A1],
- ["A648",0x52A3],
- ["92C5",0x52A4],
- ["C9C0",0x52A6],
- ["8956",0x52A8],
- ["A755",0x52A9],
- ["A756",0x52AA],
- ["A754",0x52AB],
- ["A757",0x52AC],
- ["CA6F",0x52AD],
- ["CA70",0x52AE],
- ["FAB3",0x52B5],
- ["FAB6",0x52B9],
- ["A8F1",0x52BB],
- ["CBD5",0x52BC],
- ["A8F0",0x52BE],
- ["CDF2",0x52C0],
- ["AB6C",0x52C1],
- ["CDF3",0x52C2],
- ["AB6B",0x52C3],
- ["FAB7",0x52C5],
- ["AB69",0x52C7],
- ["AB6A",0x52C9],
- ["9EDC",0x52CC],
- ["D0ED",0x52CD],
- ["FBC4",0x52D0],
- ["9F71",0x52D1],
- ["B0C7",0x52D2],
- ["D46E",0x52D3],
- ["B0CA",0x52D5],
- ["D46D",0x52D6],
- ["B1E5",0x52D7],
- ["B0C9",0x52D8],
- ["B0C8",0x52D9],
- ["B3D4",0x52DB],
- ["B3D3",0x52DD],
- ["B3D2",0x52DE],
- ["B6D2",0x52DF],
- ["FABA",0x52E0],
- ["92C7",0x52E1],
- ["B6D5",0x52E2],
- ["B6D6",0x52E3],
- ["B6D4",0x52E4],
- ["B6D3",0x52E6],
- ["E143",0x52E9],
- ["E144",0x52EB],
- ["E4F5",0x52EF],
- ["BC45",0x52F0],
- ["E4F4",0x52F1],
- ["BEB1",0x52F3],
- ["ECBF",0x52F4],
- ["C079",0x52F5],
- ["F1EE",0x52F7],
- ["C455",0x52F8],
- ["C6C6",0x52F9],
- ["A463",0x52FA],
- ["A4C3",0x52FB],
- ["C956",0x52FC],
- ["A4C4",0x52FE],
- ["A4C5",0x52FF],
- ["9A4C",0x5301],
- ["A55D",0x5305],
- ["A55E",0x5306],
- ["A649",0x5308],
- ["CA71",0x5309],
- ["CBD6",0x530A],
- ["CBD7",0x530B],
- ["AB6D",0x530D],
- ["D0EE",0x530E],
- ["B0CC",0x530F],
- ["B0CB",0x5310],
- ["D863",0x5311],
- ["D862",0x5312],
- ["A450",0x5315],
- ["A4C6",0x5316],
- ["A55F",0x5317],
- ["B0CD",0x5319],
- ["C943",0x531A],
- ["C96C",0x531C],
- ["A560",0x531D],
- ["C9C2",0x531F],
- ["A64B",0x5320],
- ["A64A",0x5321],
- ["C9C1",0x5322],
- ["A758",0x5323],
- ["8C68",0x5324],
- ["89E5",0x5327],
- ["ADEA",0x532A],
- ["9F7D",0x532C],
- ["D46F",0x532D],
- ["B6D7",0x532F],
- ["E145",0x5330],
- ["B9BC",0x5331],
- ["A0A9",0x5332],
- ["FAC4",0x5333],
- ["E8FA",0x5334],
- ["F3FD",0x5337],
- ["C6C7",0x5338],
- ["A4C7",0x5339],
- ["8957",0x533B],
- ["CBD8",0x533C],
- ["CDF4",0x533D],
- ["B0D0",0x533E],
- ["B0CE",0x533F],
- ["B0CF",0x5340],
- ["A451",0x5341],
- ["FAAA",0x5342],
- ["A464",0x5343],
- ["A2CD",0x5344],
- ["A4CA",0x5345],
- ["A4C9",0x5347],
- ["A4C8",0x5348],
- ["A563",0x5349],
- ["A562",0x534A],
- ["C96D",0x534C],
- ["C9C3",0x534D],
- ["8958",0x534E],
- ["A8F5",0x5351],
- ["A8F2",0x5352],
- ["A8F4",0x5353],
- ["A8F3",0x5354],
- ["AB6E",0x5357],
- ["B3D5",0x535A],
- ["A452",0x535C],
- ["8BE3",0x535D],
- ["A4CB",0x535E],
- ["8B61",0x535F],
- ["A565",0x5360],
- ["A564",0x5361],
- ["CA72",0x5363],
- ["9AF1",0x5364],
- ["A8F6",0x5366],
- ["9EB7",0x5367],
- ["C6C8",0x5369],
- ["C957",0x536C],
- ["FAD1",0x536D],
- ["A567",0x536E],
- ["A566",0x536F],
- ["A64C",0x5370],
- ["A64D",0x5371],
- ["CA73",0x5372],
- ["A759",0x5373],
- ["FAD2",0x5374],
- ["A75A",0x5375],
- ["A8F7",0x5377],
- ["A8F8",0x5378],
- ["A8F9",0x5379],
- ["AB6F",0x537B],
- ["CDF5",0x537C],
- ["9EBA",0x537D],
- ["FAD4",0x537E],
- ["ADEB",0x537F],
- ["C944",0x5382],
- ["A4CC",0x5384],
- ["C9C4",0x538A],
- ["CA74",0x538E],
- ["CA75",0x538F],
- ["CBD9",0x5392],
- ["FAD9",0x5393],
- ["CBDA",0x5394],
- ["CDF7",0x5396],
- ["CDF6",0x5397],
- ["CDF9",0x5398],
- ["CDF8",0x5399],
- ["AB70",0x539A],
- ["D470",0x539C],
- ["ADED",0x539D],
- ["D0EF",0x539E],
- ["ADEC",0x539F],
- ["FADB",0x53A0],
- ["9CE0",0x53A2],
- ["D864",0x53A4],
- ["B3D6",0x53A5],
- ["FBF7",0x53A6],
- ["D865",0x53A7],
- ["FBFA",0x53A8],
- ["89E7",0x53A9],
- ["A07A",0x53AA],
- ["FADC",0x53AB],
- ["E146",0x53AC],
- ["B9BD",0x53AD],
- ["FADD",0x53AE],
- ["89E9",0x53B0],
- ["BC46",0x53B2],
- ["F1EF",0x53B4],
- ["C6C9",0x53B6],
- ["C958",0x53B9],
- ["A568",0x53BB],
- ["FAE2",0x53C1],
- ["89EB",0x53C2],
- ["B0D1",0x53C3],
- ["FAE3",0x53C5],
- ["A453",0x53C8],
- ["A465",0x53C9],
- ["A4CE",0x53CA],
- ["A4CD",0x53CB],
- ["90C8",0x53CC],
- ["A4CF",0x53CD],
- ["92DA",0x53D0],
- ["8959",0x53D1],
- ["9CF5",0x53D2],
- ["A8FB",0x53D4],
- ["A8FA",0x53D6],
- ["A8FC",0x53D7],
- ["895A",0x53D8],
- ["FAE7",0x53D9],
- ["9FA2",0x53DA],
- ["AB71",0x53DB],
- ["ADEE",0x53DF],
- ["FAEA",0x53E0],
- ["E8FB",0x53E1],
- ["C24F",0x53E2],
- ["A466",0x53E3],
- ["A56A",0x53E4],
- ["A579",0x53E5],
- ["A574",0x53E6],
- ["A56F",0x53E8],
- ["A56E",0x53E9],
- ["A575",0x53EA],
- ["A573",0x53EB],
- ["A56C",0x53EC],
- ["A57A",0x53ED],
- ["A56D",0x53EE],
- ["A569",0x53EF],
- ["A578",0x53F0],
- ["A577",0x53F1],
- ["A576",0x53F2],
- ["A56B",0x53F3],
- ["A572",0x53F5],
- ["FAED",0x53F6],
- ["8FAD",0x53F7],
- ["A571",0x53F8],
- ["A57B",0x53FB],
- ["A570",0x53FC],
- ["FB59",0x53FE],
- ["A653",0x5401],
- ["A659",0x5403],
- ["A655",0x5404],
- ["A65B",0x5406],
- ["C9C5",0x5407],
- ["A658",0x5408],
- ["A64E",0x5409],
- ["A651",0x540A],
- ["A654",0x540B],
- ["A650",0x540C],
- ["A657",0x540D],
- ["A65A",0x540E],
- ["A64F",0x540F],
- ["A652",0x5410],
- ["A656",0x5411],
- ["A65C",0x5412],
- ["FAEF",0x5413],
- ["96EF",0x5414],
- ["9DEC",0x5416],
- ["CA7E",0x5418],
- ["CA7B",0x5419],
- ["9DCA",0x541A],
- ["A767",0x541B],
- ["CA7C",0x541C],
- ["A75B",0x541D],
- ["A75D",0x541E],
- ["A775",0x541F],
- ["A770",0x5420],
- ["FD6D",0x5421],
- ["89EC",0x5423],
- ["CAA5",0x5424],
- ["CA7D",0x5425],
- ["A75F",0x5426],
- ["A761",0x5427],
- ["CAA4",0x5428],
- ["A768",0x5429],
- ["CA78",0x542A],
- ["A774",0x542B],
- ["A776",0x542C],
- ["A75C",0x542D],
- ["A76D",0x542E],
- ["FB44",0x542F],
- ["CA76",0x5430],
- ["A773",0x5431],
- ["9DE2",0x5432],
- ["A764",0x5433],
- ["8C75",0x5434],
- ["A76E",0x5435],
- ["A76F",0x5436],
- ["CA77",0x5437],
- ["A76C",0x5438],
- ["A76A",0x5439],
- ["A76B",0x543B],
- ["A771",0x543C],
- ["CAA1",0x543D],
- ["A75E",0x543E],
- ["A772",0x5440],
- ["CAA3",0x5441],
- ["A766",0x5442],
- ["A763",0x5443],
- ["CA7A",0x5445],
- ["A762",0x5446],
- ["CAA6",0x5447],
- ["A765",0x5448],
- ["A769",0x544A],
- ["9EC0",0x544B],
- ["9E56",0x544D],
- ["A760",0x544E],
- ["CAA2",0x544F],
- ["CA79",0x5454],
- ["CBEB",0x5460],
- ["CBEA",0x5461],
- ["A94F",0x5462],
- ["CBED",0x5463],
- ["CBEF",0x5464],
- ["CBE4",0x5465],
- ["CBE7",0x5466],
- ["CBEE",0x5467],
- ["A950",0x5468],
- ["9F79",0x5469],
- ["9AC7",0x546A],
- ["CBE1",0x546B],
- ["CBE5",0x546C],
- ["FAF4",0x546D],
- ["CBE9",0x546F],
- ["CE49",0x5470],
- ["A94B",0x5471],
- ["CE4D",0x5472],
- ["A8FD",0x5473],
- ["CBE6",0x5474],
- ["A8FE",0x5475],
- ["A94C",0x5476],
- ["A945",0x5477],
- ["A941",0x5478],
- ["CBE2",0x547A],
- ["A944",0x547B],
- ["A949",0x547C],
- ["A952",0x547D],
- ["CBE3",0x547E],
- ["CBDC",0x547F],
- ["A943",0x5480],
- ["CBDD",0x5481],
- ["CBDF",0x5482],
- ["A946",0x5484],
- ["98A1",0x5485],
- ["A948",0x5486],
- ["CBDB",0x5487],
- ["CBE0",0x5488],
- ["A951",0x548B],
- ["A94D",0x548C],
- ["CBE8",0x548D],
- ["A953",0x548E],
- ["FAF8",0x548F],
- ["A94A",0x5490],
- ["CBDE",0x5491],
- ["A947",0x5492],
- ["89F0",0x5493],
- ["9E47",0x5494],
- ["A942",0x5495],
- ["A940",0x5496],
- ["9DF7",0x5497],
- ["CBEC",0x5498],
- ["A94E",0x549A],
- ["9FD3",0x549C],
- ["9ACA",0x549E],
- ["CE48",0x54A0],
- ["CDFB",0x54A1],
- ["CE4B",0x54A2],
- ["89F1",0x54A3],
- ["FAF9",0x54A4],
- ["CDFD",0x54A5],
- ["AB78",0x54A6],
- ["ABA8",0x54A7],
- ["AB74",0x54A8],
- ["ABA7",0x54A9],
- ["AB7D",0x54AA],
- ["ABA4",0x54AB],
- ["AB72",0x54AC],
- ["CDFC",0x54AD],
- ["CE43",0x54AE],
- ["ABA3",0x54AF],
- ["CE4F",0x54B0],
- ["ABA5",0x54B1],
- ["8E5A",0x54B2],
- ["AB79",0x54B3],
- ["89F2",0x54B4],
- ["CE45",0x54B6],
- ["CE42",0x54B7],
- ["AB77",0x54B8],
- ["89F3",0x54B9],
- ["CDFA",0x54BA],
- ["ABA6",0x54BB],
- ["CE4A",0x54BC],
- ["AB7C",0x54BD],
- ["CE4C",0x54BE],
- ["ABA9",0x54BF],
- ["AB73",0x54C0],
- ["AB7E",0x54C1],
- ["AB7B",0x54C2],
- ["CE40",0x54C3],
- ["ABA1",0x54C4],
- ["CE46",0x54C5],
- ["CE47",0x54C6],
- ["AB7A",0x54C7],
- ["ABA2",0x54C8],
- ["AB76",0x54C9],
- ["925D",0x54CB],
- ["8B51",0x54CC],
- ["92E0",0x54CD],
- ["AB75",0x54CE],
- ["CDFE",0x54CF],
- ["89F4",0x54D0],
- ["CE44",0x54D6],
- ["9FD4",0x54DA],
- ["CE4E",0x54DE],
- ["D144",0x54E0],
- ["ADFB",0x54E1],
- ["D0F1",0x54E2],
- ["8A79",0x54E3],
- ["D0F6",0x54E4],
- ["ADF4",0x54E5],
- ["AE40",0x54E6],
- ["D0F4",0x54E7],
- ["ADEF",0x54E8],
- ["ADF9",0x54E9],
- ["ADFE",0x54EA],
- ["D0FB",0x54EB],
- ["ADFA",0x54ED],
- ["ADFD",0x54EE],
- ["89F5",0x54EF],
- ["D0FE",0x54F1],
- ["ADF5",0x54F2],
- ["D0F5",0x54F3],
- ["D142",0x54F7],
- ["D143",0x54F8],
- ["ADF7",0x54FA],
- ["D141",0x54FB],
- ["ADF3",0x54FC],
- ["AE43",0x54FD],
- ["D0F8",0x54FF],
- ["ADF1",0x5501],
- ["97A7",0x5502],
- ["D146",0x5503],
- ["D0F9",0x5504],
- ["D0FD",0x5505],
- ["ADF6",0x5506],
- ["AE42",0x5507],
- ["D0FA",0x5508],
- ["ADFC",0x5509],
- ["D140",0x550A],
- ["D147",0x550B],
- ["D4A1",0x550C],
- ["93BA",0x550D],
- ["D145",0x550E],
- ["AE44",0x550F],
- ["ADF0",0x5510],
- ["D0FC",0x5511],
- ["D0F3",0x5512],
- ["9E58",0x5513],
- ["ADF8",0x5514],
- ["D0F2",0x5517],
- ["89F6",0x5518],
- ["D0F7",0x551A],
- ["9E57",0x551E],
- ["89F7",0x5523],
- ["8A41",0x5525],
- ["D0F0",0x5526],
- ["AE41",0x5527],
- ["89F8",0x5528],
- ["D477",0x552A],
- ["FAF1",0x552B],
- ["B0E4",0x552C],
- ["D4A7",0x552D],
- ["B0E2",0x552E],
- ["B0DF",0x552F],
- ["D47C",0x5530],
- ["B0DB",0x5531],
- ["D4A2",0x5532],
- ["B0E6",0x5533],
- ["D476",0x5534],
- ["D47B",0x5535],
- ["D47A",0x5536],
- ["ADF2",0x5537],
- ["B0E1",0x5538],
- ["D4A5",0x5539],
- ["D4A8",0x553B],
- ["D473",0x553C],
- ["B3E8",0x553E],
- ["89FA",0x553F],
- ["D4A9",0x5540],
- ["B0E7",0x5541],
- ["B0D9",0x5543],
- ["B0D6",0x5544],
- ["D47E",0x5545],
- ["B0D3",0x5546],
- ["FB42",0x5547],
- ["D4A6",0x5548],
- ["FABF",0x5549],
- ["B0DA",0x554A],
- ["D4AA",0x554B],
- ["D474",0x554D],
- ["D4A4",0x554E],
- ["B0DD",0x554F],
- ["D475",0x5550],
- ["D478",0x5551],
- ["D47D",0x5552],
- ["FBA3",0x5553],
- ["B0DE",0x5555],
- ["B0DC",0x5556],
- ["B0E8",0x5557],
- ["B0E3",0x555C],
- ["FAF7",0x555D],
- ["B0D7",0x555E],
- ["B1D2",0x555F],
- ["B0D8",0x5561],
- ["D479",0x5562],
- ["B0E5",0x5563],
- ["B0E0",0x5564],
- ["D4A3",0x5565],
- ["B0D5",0x5566],
- ["9E4E",0x5569],
- ["B0D4",0x556A],
- ["94DC",0x556B],
- ["95DA",0x5571],
- ["9DF8",0x5572],
- ["9F6A",0x5573],
- ["D471",0x5575],
- ["D472",0x5576],
- ["D86A",0x5577],
- ["8AB7",0x5579],
- ["B3D7",0x557B],
- ["B3DA",0x557C],
- ["D875",0x557D],
- ["B3EE",0x557E],
- ["D878",0x557F],
- ["B3D8",0x5580],
- ["D871",0x5581],
- ["B3DE",0x5582],
- ["B3E4",0x5583],
- ["B5BD",0x5584],
- ["FB46",0x5586],
- ["B3E2",0x5587],
- ["D86E",0x5588],
- ["B3EF",0x5589],
- ["B3DB",0x558A],
- ["B3E3",0x558B],
- ["D876",0x558C],
- ["DCD7",0x558D],
- ["D87B",0x558E],
- ["D86F",0x558F],
- ["8A46",0x5590],
- ["D866",0x5591],
- ["D873",0x5592],
- ["D86D",0x5593],
- ["B3E1",0x5594],
- ["D879",0x5595],
- ["B3DD",0x5598],
- ["B3F1",0x5599],
- ["B3EA",0x559A],
- ["B3DF",0x559C],
- ["B3DC",0x559D],
- ["B3E7",0x559F],
- ["D87A",0x55A1],
- ["D86C",0x55A2],
- ["D872",0x55A3],
- ["D874",0x55A4],
- ["D868",0x55A5],
- ["D877",0x55A6],
- ["B3D9",0x55A7],
- ["D867",0x55A8],
- ["FB47",0x55A9],
- ["B3E0",0x55AA],
- ["B3F0",0x55AB],
- ["B3EC",0x55AC],
- ["D869",0x55AD],
- ["B3E6",0x55AE],
- ["9148",0x55B0],
- ["B3ED",0x55B1],
- ["B3E9",0x55B2],
- ["B3E5",0x55B3],
- ["92DE",0x55B4],
- ["D870",0x55B5],
- ["8B53",0x55B9],
- ["9DF6",0x55BA],
- ["B3EB",0x55BB],
- ["9BDA",0x55BC],
- ["DCD5",0x55BF],
- ["DCD1",0x55C0],
- ["9D7E",0x55C1],
- ["DCE0",0x55C2],
- ["DCCA",0x55C3],
- ["DCD3",0x55C4],
- ["B6E5",0x55C5],
- ["B6E6",0x55C6],
- ["B6DE",0x55C7],
- ["DCDC",0x55C8],
- ["B6E8",0x55C9],
- ["DCCF",0x55CA],
- ["DCCE",0x55CB],
- ["DCCC",0x55CC],
- ["DCDE",0x55CD],
- ["B6DC",0x55CE],
- ["DCD8",0x55CF],
- ["DCCD",0x55D0],
- ["B6DF",0x55D1],
- ["DCD6",0x55D2],
- ["B6DA",0x55D3],
- ["DCD2",0x55D4],
- ["DCD9",0x55D5],
- ["DCDB",0x55D6],
- ["89FD",0x55D7],
- ["99E4",0x55D8],
- ["DCDF",0x55D9],
- ["B6E3",0x55DA],
- ["DCCB",0x55DB],
- ["B6DD",0x55DC],
- ["DCD0",0x55DD],
- ["9E43",0x55DE],
- ["B6D8",0x55DF],
- ["B6E4",0x55E1],
- ["DCDA",0x55E2],
- ["B6E0",0x55E3],
- ["B6E1",0x55E4],
- ["B6E7",0x55E5],
- ["B6DB",0x55E6],
- ["A25F",0x55E7],
- ["B6D9",0x55E8],
- ["DCD4",0x55E9],
- ["9DE9",0x55EA],
- ["8F52",0x55EC],
- ["B6E2",0x55EF],
- ["9DF5",0x55F0],
- ["9DF0",0x55F1],
- ["DCDD",0x55F2],
- ["99E7",0x55F5],
- ["B9CD",0x55F6],
- ["B9C8",0x55F7],
- ["E155",0x55F9],
- ["E151",0x55FA],
- ["8BBD",0x55FB],
- ["E14B",0x55FC],
- ["B9C2",0x55FD],
- ["B9BE",0x55FE],
- ["E154",0x55FF],
- ["B9BF",0x5600],
- ["E14E",0x5601],
- ["E150",0x5602],
- ["E153",0x5604],
- ["9DEF",0x5605],
- ["B9C4",0x5606],
- ["B9CB",0x5608],
- ["B9C5",0x5609],
- ["E149",0x560C],
- ["B9C6",0x560D],
- ["B9C7",0x560E],
- ["E14C",0x560F],
- ["B9CC",0x5610],
- ["9FB7",0x5611],
- ["E14A",0x5612],
- ["E14F",0x5613],
- ["B9C3",0x5614],
- ["E148",0x5615],
- ["B9C9",0x5616],
- ["B9C1",0x5617],
- ["B9C0",0x561B],
- ["E14D",0x561C],
- ["E152",0x561D],
- ["9DD0",0x561E],
- ["B9CA",0x561F],
- ["9FEB",0x5620],
- ["8DA9",0x5621],
- ["9DCF",0x5622],
- ["98E1",0x5623],
- ["9DE5",0x5625],
- ["E147",0x5627],
- ["BC4D",0x5629],
- ["E547",0x562A],
- ["E544",0x562C],
- ["9DC8",0x562D],
- ["BC47",0x562E],
- ["BC53",0x562F],
- ["BC54",0x5630],
- ["BC4A",0x5632],
- ["E542",0x5633],
- ["BC4C",0x5634],
- ["E4F9",0x5635],
- ["BC52",0x5636],
- ["FB4F",0x5637],
- ["E546",0x5638],
- ["BC49",0x5639],
- ["E548",0x563A],
- ["BC48",0x563B],
- ["E543",0x563D],
- ["E545",0x563E],
- ["BC4B",0x563F],
- ["E541",0x5640],
- ["E4FA",0x5641],
- ["E4F7",0x5642],
- ["9DEB",0x5643],
- ["D86B",0x5645],
- ["E4FD",0x5646],
- ["E4F6",0x5648],
- ["E4FC",0x5649],
- ["E4FB",0x564A],
- ["E4F8",0x564C],
- ["FB54",0x564D],
- ["BC4F",0x564E],
- ["FB55",0x564F],
- ["9AA2",0x5650],
- ["8AD6",0x5652],
- ["BC4E",0x5653],
- ["9A5F",0x5654],
- ["BC50",0x5657],
- ["E4FE",0x5658],
- ["BEB2",0x5659],
- ["E540",0x565A],
- ["9EF5",0x565D],
- ["E945",0x565E],
- ["E8FD",0x5660],
- ["8FB7",0x5661],
- ["BEBE",0x5662],
- ["E942",0x5663],
- ["BEB6",0x5664],
- ["BEBA",0x5665],
- ["E941",0x5666],
- ["BEB9",0x5668],
- ["BEB5",0x5669],
- ["BEB8",0x566A],
- ["BEB3",0x566B],
- ["BEBD",0x566C],
- ["E943",0x566D],
- ["E8FE",0x566E],
- ["BEBC",0x566F],
- ["E8FC",0x5670],
- ["BEBB",0x5671],
- ["E944",0x5672],
- ["E940",0x5673],
- ["BC51",0x5674],
- ["BEBF",0x5676],
- ["E946",0x5677],
- ["BEB7",0x5678],
- ["BEB4",0x5679],
- ["9AD2",0x567A],
- ["9E6A",0x567B],
- ["9EE8",0x567C],
- ["ECC6",0x567E],
- ["ECC8",0x567F],
- ["C07B",0x5680],
- ["ECC9",0x5681],
- ["ECC7",0x5682],
- ["ECC5",0x5683],
- ["ECC4",0x5684],
- ["C07D",0x5685],
- ["ECC3",0x5686],
- ["C07E",0x5687],
- ["8BBF",0x5689],
- ["91C2",0x568A],
- ["9D62",0x568B],
- ["ECC1",0x568C],
- ["ECC2",0x568D],
- ["C07A",0x568E],
- ["C0A1",0x568F],
- ["C07C",0x5690],
- ["9260",0x5692],
- ["ECC0",0x5693],
- ["C250",0x5695],
- ["EFBC",0x5697],
- ["EFBA",0x5698],
- ["EFBF",0x5699],
- ["EFBD",0x569A],
- ["EFBB",0x569C],
- ["EFBE",0x569D],
- ["925E",0x569E],
- ["91C1",0x569F],
- ["8AC5",0x56A1],
- ["97A3",0x56A4],
- ["C360",0x56A5],
- ["F1F2",0x56A6],
- ["F1F3",0x56A7],
- ["C456",0x56A8],
- ["F1F4",0x56AA],
- ["F1F0",0x56AB],
- ["F1F5",0x56AC],
- ["F1F1",0x56AD],
- ["C251",0x56AE],
- ["8B6C",0x56AF],
- ["8D7E",0x56B1],
- ["F3FE",0x56B2],
- ["F441",0x56B3],
- ["C459",0x56B4],
- ["F440",0x56B5],
- ["C458",0x56B6],
- ["C457",0x56B7],
- ["9C54",0x56B9],
- ["C45A",0x56BC],
- ["F5C5",0x56BD],
- ["F5C6",0x56BE],
- ["9DBD",0x56BF],
- ["C4DA",0x56C0],
- ["C4D9",0x56C1],
- ["C4DB",0x56C2],
- ["F5C4",0x56C3],
- ["F6D8",0x56C5],
- ["F6D7",0x56C6],
- ["C56D",0x56C8],
- ["C56F",0x56C9],
- ["C56E",0x56CA],
- ["F6D9",0x56CB],
- ["C5C8",0x56CC],
- ["F8A6",0x56CD],
- ["C5F1",0x56D1],
- ["F8A5",0x56D3],
- ["F8EE",0x56D4],
- ["9CC5",0x56D6],
- ["C949",0x56D7],
- ["A57D",0x56DA],
- ["A57C",0x56DB],
- ["A65F",0x56DD],
- ["A65E",0x56DE],
- ["C9C7",0x56DF],
- ["A65D",0x56E0],
- ["C9C6",0x56E1],
- ["895B",0x56E2],
- ["A779",0x56E4],
- ["CAA9",0x56E5],
- ["CAA8",0x56E7],
- ["A777",0x56EA],
- ["A77A",0x56EB],
- ["FB5C",0x56ED],
- ["CAA7",0x56EE],
- ["FB5B",0x56EF],
- ["A778",0x56F0],
- ["FB57",0x56F1],
- ["CBF0",0x56F7],
- ["CBF1",0x56F9],
- ["A954",0x56FA],
- ["8765",0x56FB],
- ["98C7",0x56FD],
- ["ABAA",0x56FF],
- ["FB5A",0x5700],
- ["D148",0x5701],
- ["D149",0x5702],
- ["AE45",0x5703],
- ["AE46",0x5704],
- ["D4AC",0x5707],
- ["B0E9",0x5708],
- ["B0EB",0x5709],
- ["D4AB",0x570A],
- ["B0EA",0x570B],
- ["D87C",0x570C],
- ["B3F2",0x570D],
- ["B6E9",0x5712],
- ["B6EA",0x5713],
- ["DCE1",0x5714],
- ["9CEE",0x5715],
- ["B9CF",0x5716],
- ["B9CE",0x5718],
- ["E549",0x571A],
- ["E948",0x571B],
- ["E947",0x571C],
- ["92E2",0x571D],
- ["F96B",0x571E],
- ["A467",0x571F],
- ["C959",0x5720],
- ["C96E",0x5722],
- ["C96F",0x5723],
- ["A662",0x5728],
- ["A666",0x5729],
- ["C9C9",0x572A],
- ["A664",0x572C],
- ["A663",0x572D],
- ["C9C8",0x572E],
- ["A665",0x572F],
- ["A661",0x5730],
- ["94A7",0x5732],
- ["A660",0x5733],
- ["C9CA",0x5734],
- ["A7A6",0x573B],
- ["8CCC",0x573D],
- ["A7A3",0x573E],
- ["9BD4",0x573F],
- ["A77D",0x5740],
- ["CAAA",0x5741],
- ["FB64",0x5742],
- ["FB76",0x5743],
- ["CAAB",0x5745],
- ["FB60",0x5746],
- ["A7A1",0x5747],
- ["CAAD",0x5749],
- ["A77B",0x574A],
- ["CAAE",0x574B],
- ["CAAC",0x574C],
- ["A77E",0x574D],
- ["A7A2",0x574E],
- ["A7A5",0x574F],
- ["A7A4",0x5750],
- ["A77C",0x5751],
- ["CAAF",0x5752],
- ["99E5",0x5754],
- ["9AC2",0x5757],
- ["91FB",0x575B],
- ["A073",0x575F],
- ["A959",0x5761],
- ["CBFE",0x5762],
- ["A95B",0x5764],
- ["A95A",0x5766],
- ["9F72",0x5767],
- ["CC40",0x5768],
- ["A958",0x5769],
- ["A957",0x576A],
- ["CBF5",0x576B],
- ["CBF4",0x576D],
- ["CBF2",0x576F],
- ["CBF7",0x5770],
- ["CBF6",0x5771],
- ["CBF3",0x5772],
- ["CBFC",0x5773],
- ["CBFD",0x5774],
- ["CBFA",0x5775],
- ["CBF8",0x5776],
- ["A956",0x5777],
- ["9FCC",0x577A],
- ["CBFB",0x577B],
- ["A95C",0x577C],
- ["CC41",0x577D],
- ["98A5",0x577E],
- ["92E8",0x577F],
- ["CBF9",0x5780],
- ["ABAB",0x5782],
- ["A955",0x5783],
- ["9BBC",0x5788],
- ["96F3",0x578A],
- ["ABAC",0x578B],
- ["CE54",0x578C],
- ["92E7",0x578D],
- ["CE5A",0x578F],
- ["FC67",0x5790],
- ["ABB2",0x5793],
- ["CE58",0x5794],
- ["CE5E",0x5795],
- ["CE55",0x5797],
- ["CE59",0x5798],
- ["CE5B",0x5799],
- ["CE5D",0x579A],
- ["CE57",0x579B],
- ["8B7D",0x579C],
- ["CE56",0x579D],
- ["CE51",0x579E],
- ["CE52",0x579F],
- ["ABAD",0x57A0],
- ["9BF4",0x57A1],
- ["ABAF",0x57A2],
- ["ABAE",0x57A3],
- ["CE53",0x57A4],
- ["CE5C",0x57A5],
- ["9EF7",0x57A7],
- ["9EC1",0x57AA],
- ["ABB1",0x57AE],
- ["996F",0x57B4],
- ["CE50",0x57B5],
- ["D153",0x57B6],
- ["D152",0x57B8],
- ["D157",0x57B9],
- ["D14E",0x57BA],
- ["96F1",0x57BB],
- ["D151",0x57BC],
- ["D150",0x57BD],
- ["8E41",0x57BE],
- ["D154",0x57BF],
- ["D158",0x57C1],
- ["AE47",0x57C2],
- ["AE4A",0x57C3],
- ["954A",0x57C4],
- ["D14F",0x57C6],
- ["D155",0x57C7],
- ["97E6",0x57C8],
- ["AE49",0x57CB],
- ["D14A",0x57CC],
- ["ABB0",0x57CE],
- ["D4BA",0x57CF],
- ["D156",0x57D0],
- ["D14D",0x57D2],
- ["AE48",0x57D4],
- ["D14C",0x57D5],
- ["96F5",0x57D7],
- ["D4B1",0x57DC],
- ["92E6",0x57DD],
- ["9F42",0x57DE],
- ["B0EC",0x57DF],
- ["B0F0",0x57E0],
- ["D4C1",0x57E1],
- ["D4AF",0x57E2],
- ["D4BD",0x57E3],
- ["B0F1",0x57E4],
- ["D4BF",0x57E5],
- ["FB67",0x57E6],
- ["D4C5",0x57E7],
- ["D4C9",0x57E9],
- ["D4C0",0x57EC],
- ["D4B4",0x57ED],
- ["D4BC",0x57EE],
- ["99A9",0x57EF],
- ["D4CA",0x57F0],
- ["D4C8",0x57F1],
- ["D4BE",0x57F2],
- ["D4B9",0x57F3],
- ["D4B2",0x57F4],
- ["D8A6",0x57F5],
- ["D4B0",0x57F6],
- ["B0F5",0x57F7],
- ["D4B7",0x57F8],
- ["B0F6",0x57F9],
- ["B0F2",0x57FA],
- ["D4AD",0x57FB],
- ["D4C3",0x57FC],
- ["D4B5",0x57FD],
- ["FAE6",0x57FE],
- ["D4B3",0x5800],
- ["D4C6",0x5801],
- ["B0F3",0x5802],
- ["FB69",0x5803],
- ["D4CC",0x5804],
- ["B0ED",0x5805],
- ["B0EF",0x5806],
- ["D4BB",0x5807],
- ["D4B6",0x5808],
- ["AE4B",0x5809],
- ["B0EE",0x580A],
- ["D4B8",0x580B],
- ["D4C7",0x580C],
- ["D4CB",0x580D],
- ["D4C2",0x580E],
- ["D4C4",0x5810],
- ["97E5",0x5812],
- ["D4AE",0x5814],
- ["D8A1",0x5819],
- ["D8AA",0x581B],
- ["D8A9",0x581C],
- ["B3FA",0x581D],
- ["D8A2",0x581E],
- ["B3FB",0x5820],
- ["B3F9",0x5821],
- ["967D",0x5822],
- ["D8A4",0x5823],
- ["B3F6",0x5824],
- ["D8A8",0x5825],
- ["FB6C",0x5826],
- ["D8A3",0x5827],
- ["D8A5",0x5828],
- ["D87D",0x5829],
- ["B3F4",0x582A],
- ["D8B2",0x582C],
- ["D8B1",0x582D],
- ["D8AE",0x582E],
- ["B3F3",0x582F],
- ["B3F7",0x5830],
- ["B3F8",0x5831],
- ["D14B",0x5832],
- ["D8AB",0x5833],
- ["B3F5",0x5834],
- ["B0F4",0x5835],
- ["D8AD",0x5836],
- ["D87E",0x5837],
- ["D8B0",0x5838],
- ["D8AF",0x5839],
- ["99A2",0x583A],
- ["D8B3",0x583B],
- ["DCEF",0x583D],
- ["D8AC",0x583F],
- ["9ABB",0x5840],
- ["9A65",0x5844],
- ["944E",0x5847],
- ["D8A7",0x5848],
- ["DCE7",0x5849],
- ["B6F4",0x584A],
- ["B6F7",0x584B],
- ["B6F2",0x584C],
- ["DCE6",0x584D],
- ["DCEA",0x584E],
- ["DCE5",0x584F],
- ["B6EC",0x5851],
- ["B6F6",0x5852],
- ["DCE2",0x5853],
- ["B6F0",0x5854],
- ["DCE9",0x5855],
- ["B6EE",0x5857],
- ["B6ED",0x5858],
- ["DCEC",0x5859],
- ["B6EF",0x585A],
- ["DCEE",0x585B],
- ["FB6E",0x585C],
- ["DCEB",0x585D],
- ["B6EB",0x585E],
- ["99DF",0x585F],
- ["B6F5",0x5862],
- ["DCF0",0x5863],
- ["DCE4",0x5864],
- ["DCED",0x5865],
- ["DCE3",0x5868],
- ["98E3",0x5869],
- ["B6F1",0x586B],
- ["9254",0x586C],
- ["B6F3",0x586D],
- ["DCE8",0x586F],
- ["DCF1",0x5871],
- ["967B",0x5872],
- ["8AAF",0x5873],
- ["E15D",0x5874],
- ["B9D0",0x5875],
- ["E163",0x5876],
- ["B9D5",0x5879],
- ["E15F",0x587A],
- ["E166",0x587B],
- ["E157",0x587C],
- ["B9D7",0x587D],
- ["B9D1",0x587E],
- ["E15C",0x587F],
- ["BC55",0x5880],
- ["E15B",0x5881],
- ["E164",0x5882],
- ["B9D2",0x5883],
- ["B9D6",0x5885],
- ["E15A",0x5886],
- ["E160",0x5887],
- ["E165",0x5888],
- ["E156",0x5889],
- ["B9D4",0x588A],
- ["E15E",0x588B],
- ["E162",0x588E],
- ["E168",0x588F],
- ["E158",0x5890],
- ["E161",0x5891],
- ["8C77",0x5892],
- ["B9D3",0x5893],
- ["E167",0x5894],
- ["E159",0x5898],
- ["8BAF",0x5899],
- ["9EBD",0x589A],
- ["BC59",0x589C],
- ["E54B",0x589D],
- ["BC57",0x589E],
- ["BC56",0x589F],
- ["E54D",0x58A0],
- ["E552",0x58A1],
- ["E54E",0x58A3],
- ["E551",0x58A5],
- ["BC5C",0x58A6],
- ["9EE6",0x58A7],
- ["BEA5",0x58A8],
- ["BC5B",0x58A9],
- ["FB6F",0x58AA],
- ["E54A",0x58AB],
- ["E550",0x58AC],
- ["BC5A",0x58AE],
- ["E54F",0x58AF],
- ["8EE1",0x58B0],
- ["E54C",0x58B1],
- ["BC58",0x58B3],
- ["9B7D",0x58B5],
- ["9C7E",0x58B6],
- ["E94D",0x58BA],
- ["F9D9",0x58BB],
- ["E94F",0x58BC],
- ["E94A",0x58BD],
- ["BEC1",0x58BE],
- ["E94C",0x58BF],
- ["BEC0",0x58C1],
- ["E94E",0x58C2],
- ["BEC3",0x58C5],
- ["E950",0x58C6],
- ["BEC2",0x58C7],
- ["E949",0x58C8],
- ["E94B",0x58C9],
- ["92EA",0x58CB],
- ["C0A5",0x58CE],
- ["ECCC",0x58CF],
- ["8C78",0x58D0],
- ["C0A4",0x58D1],
- ["ECCD",0x58D2],
- ["C0A3",0x58D3],
- ["ECCB",0x58D4],
- ["C0A2",0x58D5],
- ["ECCA",0x58D6],
- ["C253",0x58D8],
- ["C252",0x58D9],
- ["F1F6",0x58DA],
- ["F1F8",0x58DB],
- ["FB72",0x58DC],
- ["F1F7",0x58DD],
- ["C361",0x58DE],
- ["C362",0x58DF],
- ["FB71",0x58E0],
- ["C363",0x58E2],
- ["F442",0x58E3],
- ["C45B",0x58E4],
- ["F7D3",0x58E7],
- ["F7D2",0x58E8],
- ["C5F2",0x58E9],
- ["A468",0x58EB],
- ["A4D0",0x58EC],
- ["A7A7",0x58EF],
- ["895C",0x58F0],
- ["98F0",0x58F2],
- ["96F2",0x58F3],
- ["CE5F",0x58F4],
- ["B3FC",0x58F9],
- ["B3FD",0x58FA],
- ["FB74",0x58FB],
- ["DCF2",0x58FC],
- ["B9D8",0x58FD],
- ["E169",0x58FE],
- ["E553",0x58FF],
- ["8BC1",0x5902],
- ["C95A",0x5903],
- ["895D",0x5904],
- ["89DE",0x5905],
- ["CAB0",0x5906],
- ["895E",0x5907],
- ["C6CA",0x590A],
- ["CC42",0x590C],
- ["CE60",0x590D],
- ["D159",0x590E],
- ["AE4C",0x590F],
- ["FE42",0x5911],
- ["F1F9",0x5912],
- ["C4DC",0x5914],
- ["A469",0x5915],
- ["A57E",0x5916],
- ["C970",0x5917],
- ["A667",0x5919],
- ["A668",0x591A],
- ["A95D",0x591C],
- ["8768",0x591D],
- ["FB7B",0x591F],
- ["B0F7",0x5920],
- ["B9DA",0x5922],
- ["B9DB",0x5924],
- ["B9D9",0x5925],
- ["A46A",0x5927],
- ["A4D1",0x5929],
- ["A4D3",0x592A],
- ["A4D2",0x592B],
- ["C95B",0x592C],
- ["A4D4",0x592D],
- ["A5A1",0x592E],
- ["C971",0x592F],
- ["A5A2",0x5931],
- ["895F",0x5932],
- ["8960",0x5934],
- ["A669",0x5937],
- ["A66A",0x5938],
- ["C9CB",0x593C],
- ["A7A8",0x593E],
- ["CAB1",0x5940],
- ["A961",0x5944],
- ["CC43",0x5945],
- ["A95F",0x5947],
- ["A960",0x5948],
- ["A95E",0x5949],
- ["D15A",0x594A],
- ["ABB6",0x594E],
- ["ABB5",0x594F],
- ["ABB7",0x5950],
- ["ABB4",0x5951],
- ["CE61",0x5953],
- ["A962",0x5954],
- ["ABB3",0x5955],
- ["AE4D",0x5957],
- ["AE4E",0x5958],
- ["AE4F",0x595A],
- ["D4CD",0x595C],
- ["B3FE",0x5960],
- ["D8B4",0x5961],
- ["B0F8",0x5962],
- ["9BCD",0x5965],
- ["B6F8",0x5967],
- ["B9DD",0x5969],
- ["B9DC",0x596A],
- ["E16A",0x596B],
- ["BC5D",0x596D],
- ["BEC4",0x596E],
- ["EFC0",0x5970],
- ["F6DA",0x5971],
- ["F7D4",0x5972],
- ["A46B",0x5973],
- ["A5A3",0x5974],
- ["9DD3",0x5975],
- ["A5A4",0x5976],
- ["C9D1",0x5977],
- ["A66C",0x5978],
- ["A66F",0x5979],
- ["C9CF",0x597B],
- ["C9CD",0x597C],
- ["A66E",0x597D],
- ["C9D0",0x597E],
- ["C9D2",0x597F],
- ["C9CC",0x5980],
- ["A671",0x5981],
- ["A670",0x5982],
- ["A66D",0x5983],
- ["A66B",0x5984],
- ["C9CE",0x5985],
- ["984C",0x5989],
- ["A7B3",0x598A],
- ["A7B0",0x598D],
- ["CAB6",0x598E],
- ["CAB9",0x598F],
- ["CAB8",0x5990],
- ["A7AA",0x5992],
- ["A7B2",0x5993],
- ["9752",0x5994],
- ["A7AF",0x5996],
- ["CAB5",0x5997],
- ["CAB3",0x5998],
- ["A7AE",0x5999],
- ["95C3",0x599A],
- ["A7A9",0x599D],
- ["A7AC",0x599E],
- ["9BB6",0x599F],
- ["CAB4",0x59A0],
- ["CABB",0x59A1],
- ["CAB7",0x59A2],
- ["A7AD",0x59A3],
- ["A7B1",0x59A4],
- ["A7B4",0x59A5],
- ["CAB2",0x59A6],
- ["CABA",0x59A7],
- ["A7AB",0x59A8],
- ["9AB9",0x59AC],
- ["A967",0x59AE],
- ["A96F",0x59AF],
- ["97B3",0x59B0],
- ["CC4F",0x59B1],
- ["CC48",0x59B2],
- ["A970",0x59B3],
- ["CC53",0x59B4],
- ["CC44",0x59B5],
- ["CC4B",0x59B6],
- ["9F74",0x59B7],
- ["92F1",0x59B8],
- ["A966",0x59B9],
- ["CC45",0x59BA],
- ["A964",0x59BB],
- ["CC4C",0x59BC],
- ["CC50",0x59BD],
- ["A963",0x59BE],
- ["8CFA",0x59BF],
- ["CC51",0x59C0],
- ["CC4A",0x59C1],
- ["CC4D",0x59C3],
- ["97DF",0x59C4],
- ["A972",0x59C5],
- ["A969",0x59C6],
- ["CC54",0x59C7],
- ["CC52",0x59C8],
- ["FBA6",0x59C9],
- ["A96E",0x59CA],
- ["A96C",0x59CB],
- ["CC49",0x59CC],
- ["A96B",0x59CD],
- ["CC47",0x59CE],
- ["CC46",0x59CF],
- ["A96A",0x59D0],
- ["A968",0x59D1],
- ["A971",0x59D2],
- ["A96D",0x59D3],
- ["A965",0x59D4],
- ["CC4E",0x59D6],
- ["ABB9",0x59D8],
- ["FBAB",0x59D9],
- ["ABC0",0x59DA],
- ["CE6F",0x59DB],
- ["ABB8",0x59DC],
- ["CE67",0x59DD],
- ["CE63",0x59DE],
- ["CE73",0x59E0],
- ["CE62",0x59E1],
- ["ABBB",0x59E3],
- ["CE6C",0x59E4],
- ["ABBE",0x59E5],
- ["ABC1",0x59E6],
- ["ABBC",0x59E8],
- ["CE70",0x59E9],
- ["ABBF",0x59EA],
- ["9877",0x59EB],
- ["AE56",0x59EC],
- ["CE76",0x59ED],
- ["CE64",0x59EE],
- ["9854",0x59EF],
- ["95C5",0x59F0],
- ["CE66",0x59F1],
- ["CE6D",0x59F2],
- ["CE71",0x59F3],
- ["CE75",0x59F4],
- ["CE72",0x59F5],
- ["CE6B",0x59F6],
- ["CE6E",0x59F7],
- ["9D55",0x59F8],
- ["FBB2",0x59F9],
- ["CE68",0x59FA],
- ["ABC3",0x59FB],
- ["CE6A",0x59FC],
- ["CE69",0x59FD],
- ["CE74",0x59FE],
- ["ABBA",0x59FF],
- ["CE65",0x5A00],
- ["ABC2",0x5A01],
- ["957E",0x5A02],
- ["ABBD",0x5A03],
- ["AE5C",0x5A09],
- ["D162",0x5A0A],
- ["9742",0x5A0B],
- ["AE5B",0x5A0C],
- ["94E6",0x5A0D],
- ["D160",0x5A0F],
- ["AE50",0x5A11],
- ["92F5",0x5A12],
- ["AE55",0x5A13],
- ["D15F",0x5A15],
- ["D15C",0x5A16],
- ["D161",0x5A17],
- ["AE51",0x5A18],
- ["D15B",0x5A19],
- ["8CC5",0x5A1A],
- ["AE54",0x5A1B],
- ["AE52",0x5A1C],
- ["D163",0x5A1E],
- ["AE53",0x5A1F],
- ["AE57",0x5A20],
- ["92FD",0x5A21],
- ["AE58",0x5A23],
- ["FBA2",0x5A24],
- ["AE5A",0x5A25],
- ["9C51",0x5A27],
- ["AE59",0x5A29],
- ["94E9",0x5A2A],
- ["985C",0x5A2B],
- ["92F0",0x5A2C],
- ["D15D",0x5A2D],
- ["D15E",0x5A2E],
- ["D164",0x5A33],
- ["D4D4",0x5A35],
- ["B0F9",0x5A36],
- ["D8C2",0x5A37],
- ["D4D3",0x5A38],
- ["D4E6",0x5A39],
- ["B140",0x5A3C],
- ["944C",0x5A3D],
- ["D4E4",0x5A3E],
- ["B0FE",0x5A40],
- ["B0FA",0x5A41],
- ["D4ED",0x5A42],
- ["D4DD",0x5A43],
- ["D4E0",0x5A44],
- ["916B",0x5A45],
- ["B143",0x5A46],
- ["D4EA",0x5A47],
- ["D4E2",0x5A48],
- ["B0FB",0x5A49],
- ["B144",0x5A4A],
- ["D4E7",0x5A4C],
- ["D4E5",0x5A4D],
- ["D4D6",0x5A50],
- ["D4EB",0x5A51],
- ["D4DF",0x5A52],
- ["D4DA",0x5A53],
- ["8B78",0x5A54],
- ["D4D0",0x5A55],
- ["D4EC",0x5A56],
- ["D4DC",0x5A57],
- ["D4CF",0x5A58],
- ["94E2",0x5A59],
- ["B142",0x5A5A],
- ["D4E1",0x5A5B],
- ["D4EE",0x5A5C],
- ["D4DE",0x5A5D],
- ["D4D2",0x5A5E],
- ["D4D7",0x5A5F],
- ["D4CE",0x5A60],
- ["984F",0x5A61],
- ["B141",0x5A62],
- ["FBB5",0x5A63],
- ["D4DB",0x5A64],
- ["D4D8",0x5A65],
- ["B0FC",0x5A66],
- ["D4D1",0x5A67],
- ["9271",0x5A68],
- ["D4E9",0x5A69],
- ["B0FD",0x5A6A],
- ["9365",0x5A6B],
- ["D4D9",0x5A6C],
- ["D4D5",0x5A6D],
- ["985B",0x5A6E],
- ["D4E8",0x5A70],
- ["9850",0x5A71],
- ["B440",0x5A77],
- ["D8BB",0x5A78],
- ["97BC",0x5A79],
- ["D8B8",0x5A7A],
- ["D8C9",0x5A7B],
- ["D8BD",0x5A7C],
- ["D8CA",0x5A7D],
- ["92F3",0x5A7E],
- ["B442",0x5A7F],
- ["9340",0x5A81],
- ["984D",0x5A82],
- ["D8C6",0x5A83],
- ["D8C3",0x5A84],
- ["9572",0x5A86],
- ["FDEF",0x5A88],
- ["D8C4",0x5A8A],
- ["D8C7",0x5A8B],
- ["D8CB",0x5A8C],
- ["D4E3",0x5A8E],
- ["D8CD",0x5A8F],
- ["DD47",0x5A90],
- ["FDC1",0x5A91],
- ["B443",0x5A92],
- ["D8CE",0x5A93],
- ["D8B6",0x5A94],
- ["D8C0",0x5A95],
- ["FBBA",0x5A96],
- ["D8C5",0x5A97],
- ["92EB",0x5A99],
- ["B441",0x5A9A],
- ["B444",0x5A9B],
- ["D8CC",0x5A9C],
- ["D8CF",0x5A9D],
- ["D8BA",0x5A9E],
- ["D8B7",0x5A9F],
- ["FC73",0x5AA0],
- ["97B7",0x5AA1],
- ["D8B9",0x5AA2],
- ["876F",0x5AA4],
- ["D8BE",0x5AA5],
- ["D8BC",0x5AA6],
- ["B445",0x5AA7],
- ["D8C8",0x5AA9],
- ["FBB4",0x5AAB],
- ["D8BF",0x5AAC],
- ["D8C1",0x5AAE],
- ["D8B5",0x5AAF],
- ["DCFA",0x5AB0],
- ["DCF8",0x5AB1],
- ["B742",0x5AB2],
- ["B740",0x5AB3],
- ["DD43",0x5AB4],
- ["DCF9",0x5AB5],
- ["DD44",0x5AB6],
- ["DD40",0x5AB7],
- ["DCF7",0x5AB8],
- ["DD46",0x5AB9],
- ["DCF6",0x5ABA],
- ["DCFD",0x5ABB],
- ["B6FE",0x5ABC],
- ["B6FD",0x5ABD],
- ["B6FC",0x5ABE],
- ["DCFB",0x5ABF],
- ["DD41",0x5AC0],
- ["B6F9",0x5AC1],
- ["B741",0x5AC2],
- ["90A7",0x5AC3],
- ["DCF4",0x5AC4],
- ["DCFE",0x5AC6],
- ["DCF3",0x5AC7],
- ["DCFC",0x5AC8],
- ["B6FA",0x5AC9],
- ["DD42",0x5ACA],
- ["DCF5",0x5ACB],
- ["B6FB",0x5ACC],
- ["DD45",0x5ACD],
- ["9741",0x5ACE],
- ["92F4",0x5ACF],
- ["8772",0x5AD1],
- ["FBBC",0x5AD3],
- ["E16E",0x5AD5],
- ["B9E2",0x5AD6],
- ["B9E1",0x5AD7],
- ["B9E3",0x5AD8],
- ["E17A",0x5AD9],
- ["E170",0x5ADA],
- ["E176",0x5ADB],
- ["E16B",0x5ADC],
- ["E179",0x5ADD],
- ["E178",0x5ADE],
- ["E17C",0x5ADF],
- ["E175",0x5AE0],
- ["B9DE",0x5AE1],
- ["E174",0x5AE2],
- ["B9E4",0x5AE3],
- ["9577",0x5AE4],
- ["E16D",0x5AE5],
- ["B9DF",0x5AE6],
- ["E17B",0x5AE8],
- ["B9E0",0x5AE9],
- ["E16F",0x5AEA],
- ["E172",0x5AEB],
- ["E177",0x5AEC],
- ["E171",0x5AED],
- ["E16C",0x5AEE],
- ["9EE2",0x5AF0],
- ["8F78",0x5AF2],
- ["E173",0x5AF3],
- ["E555",0x5AF4],
- ["BC61",0x5AF5],
- ["E558",0x5AF6],
- ["E557",0x5AF7],
- ["E55A",0x5AF8],
- ["E55C",0x5AF9],
- ["F9DC",0x5AFA],
- ["BC5F",0x5AFB],
- ["E556",0x5AFD],
- ["9672",0x5AFE],
- ["E554",0x5AFF],
- ["E55D",0x5B01],
- ["E55B",0x5B02],
- ["E559",0x5B03],
- ["E55F",0x5B05],
- ["E55E",0x5B07],
- ["BC63",0x5B08],
- ["BC5E",0x5B09],
- ["BC60",0x5B0B],
- ["BC62",0x5B0C],
- ["9EB5",0x5B0D],
- ["E560",0x5B0F],
- ["E957",0x5B10],
- ["964B",0x5B11],
- ["E956",0x5B13],
- ["E955",0x5B14],
- ["8CAC",0x5B15],
- ["E958",0x5B16],
- ["E951",0x5B17],
- ["E952",0x5B19],
- ["E95A",0x5B1A],
- ["E953",0x5B1B],
- ["BEC5",0x5B1D],
- ["E95C",0x5B1E],
- ["A0FA",0x5B1F],
- ["E95B",0x5B20],
- ["E954",0x5B21],
- ["ECD1",0x5B23],
- ["C0A8",0x5B24],
- ["ECCF",0x5B25],
- ["ECD4",0x5B26],
- ["ECD3",0x5B27],
- ["E959",0x5B28],
- ["C0A7",0x5B2A],
- ["9575",0x5B2B],
- ["ECD2",0x5B2C],
- ["ECCE",0x5B2D],
- ["ECD6",0x5B2E],
- ["ECD5",0x5B2F],
- ["C0A6",0x5B30],
- ["ECD0",0x5B32],
- ["BEC6",0x5B34],
- ["C254",0x5B38],
- ["EFC1",0x5B3C],
- ["F1FA",0x5B3D],
- ["F1FB",0x5B3E],
- ["F1FC",0x5B3F],
- ["C45C",0x5B40],
- ["90DA",0x5B41],
- ["C45D",0x5B43],
- ["9367",0x5B44],
- ["F443",0x5B45],
- ["FEA4",0x5B46],
- ["F5C8",0x5B47],
- ["F5C7",0x5B48],
- ["90DF",0x5B4A],
- ["F6DB",0x5B4B],
- ["F6DC",0x5B4C],
- ["F7D5",0x5B4D],
- ["F8A7",0x5B4E],
- ["9354",0x5B4F],
- ["A46C",0x5B50],
- ["A46D",0x5B51],
- ["A46E",0x5B53],
- ["A4D5",0x5B54],
- ["A5A5",0x5B55],
- ["C9D3",0x5B56],
- ["A672",0x5B57],
- ["A673",0x5B58],
- ["A7B7",0x5B5A],
- ["A7B8",0x5B5B],
- ["A7B6",0x5B5C],
- ["A7B5",0x5B5D],
- ["A973",0x5B5F],
- ["CC55",0x5B62],
- ["A975",0x5B63],
- ["A974",0x5B64],
- ["CC56",0x5B65],
- ["8961",0x5B66],
- ["8BB4",0x5B68],
- ["ABC4",0x5B69],
- ["AE5D",0x5B6B],
- ["D165",0x5B6C],
- ["9DC0",0x5B6D],
- ["D4F0",0x5B6E],
- ["B145",0x5B70],
- ["B447",0x5B71],
- ["D4EF",0x5B72],
- ["B446",0x5B73],
- ["8E48",0x5B74],
- ["B9E5",0x5B75],
- ["FBC5",0x5B76],
- ["E17D",0x5B77],
- ["BEC7",0x5B78],
- ["C0A9",0x5B7A],
- ["ECD7",0x5B7B],
- ["FBC7",0x5B7C],
- ["C45E",0x5B7D],
- ["C570",0x5B7F],
- ["C6CB",0x5B80],
- ["C972",0x5B81],
- ["FA79",0x5B82],
- ["A5A6",0x5B83],
- ["C973",0x5B84],
- ["A676",0x5B85],
- ["A674",0x5B87],
- ["A675",0x5B88],
- ["A677",0x5B89],
- ["A7BA",0x5B8B],
- ["A7B9",0x5B8C],
- ["CABC",0x5B8E],
- ["A7BB",0x5B8F],
- ["9E67",0x5B90],
- ["CABD",0x5B92],
- ["CC57",0x5B93],
- ["CC58",0x5B95],
- ["8CD9",0x5B96],
- ["A976",0x5B97],
- ["A978",0x5B98],
- ["A97A",0x5B99],
- ["A977",0x5B9A],
- ["A97B",0x5B9B],
- ["A979",0x5B9C],
- ["FBD2",0x5B9D],
- ["8962",0x5B9E],
- ["8963",0x5B9F],
- ["ABC8",0x5BA2],
- ["ABC5",0x5BA3],
- ["ABC7",0x5BA4],
- ["ABC9",0x5BA5],
- ["ABC6",0x5BA6],
- ["D166",0x5BA7],
- ["CE77",0x5BA8],
- ["FC7D",0x5BAA],
- ["D168",0x5BAC],
- ["D167",0x5BAD],
- ["AE63",0x5BAE],
- ["AE5F",0x5BB0],
- ["AE60",0x5BB3],
- ["AE62",0x5BB4],
- ["AE64",0x5BB5],
- ["AE61",0x5BB6],
- ["8773",0x5BB7],
- ["AE66",0x5BB8],
- ["AE65",0x5BB9],
- ["B14A",0x5BBF],
- ["D4F2",0x5BC0],
- ["D4F1",0x5BC1],
- ["B149",0x5BC2],
- ["9F6B",0x5BC3],
- ["B148",0x5BC4],
- ["B147",0x5BC5],
- ["B14B",0x5BC6],
- ["B146",0x5BC7],
- ["D8D5",0x5BCA],
- ["D8D2",0x5BCB],
- ["B449",0x5BCC],
- ["D8D1",0x5BCD],
- ["D8D6",0x5BCE],
- ["B44B",0x5BD0],
- ["D8D4",0x5BD1],
- ["B448",0x5BD2],
- ["B44A",0x5BD3],
- ["D8D3",0x5BD4],
- ["FBCC",0x5BD5],
- ["DD48",0x5BD6],
- ["FEAE",0x5BD7],
- ["DD49",0x5BD8],
- ["DD4A",0x5BD9],
- ["876D",0x5BDB],
- ["B9E6",0x5BDE],
- ["B9EE",0x5BDF],
- ["E17E",0x5BE0],
- ["B9E8",0x5BE1],
- ["B9EC",0x5BE2],
- ["E1A1",0x5BE3],
- ["B9ED",0x5BE4],
- ["B9E9",0x5BE5],
- ["B9EA",0x5BE6],
- ["B9E7",0x5BE7],
- ["B9EB",0x5BE8],
- ["BC66",0x5BE9],
- ["D8D0",0x5BEA],
- ["BC67",0x5BEB],
- ["BC65",0x5BEC],
- ["BC64",0x5BEE],
- ["E95D",0x5BEF],
- ["BEC8",0x5BF0],
- ["ECD8",0x5BF1],
- ["ECD9",0x5BF2],
- ["FBD1",0x5BF3],
- ["C364",0x5BF5],
- ["C45F",0x5BF6],
- ["A46F",0x5BF8],
- ["A678",0x5BFA],
- ["FB75",0x5BFF],
- ["ABCA",0x5C01],
- ["D169",0x5C03],
- ["AE67",0x5C04],
- ["FBD4",0x5C05],
- ["B14E",0x5C07],
- ["B14D",0x5C08],
- ["B14C",0x5C09],
- ["B44C",0x5C0A],
- ["B44D",0x5C0B],
- ["D8D7",0x5C0C],
- ["B9EF",0x5C0D],
- ["BEC9",0x5C0E],
- ["A470",0x5C0F],
- ["C95C",0x5C10],
- ["A4D6",0x5C11],
- ["C974",0x5C12],
- ["FBD6",0x5C13],
- ["FBD8",0x5C14],
- ["C9D4",0x5C15],
- ["A679",0x5C16],
- ["A97C",0x5C1A],
- ["8B5D",0x5C1C],
- ["934C",0x5C1E],
- ["DD4B",0x5C1F],
- ["9AE2",0x5C20],
- ["A471",0x5C22],
- ["8BC9",0x5C23],
- ["A4D7",0x5C24],
- ["C9D5",0x5C25],
- ["CABE",0x5C28],
- ["CABF",0x5C2A],
- ["A7BC",0x5C2C],
- ["D8D8",0x5C30],
- ["B44E",0x5C31],
- ["DD4C",0x5C33],
- ["C0AA",0x5C37],
- ["A472",0x5C38],
- ["A4A8",0x5C39],
- ["A4D8",0x5C3A],
- ["C975",0x5C3B],
- ["A5A7",0x5C3C],
- ["A7C0",0x5C3E],
- ["A7BF",0x5C3F],
- ["A7BD",0x5C40],
- ["A7BE",0x5C41],
- ["CC59",0x5C44],
- ["A97E",0x5C45],
- ["A9A1",0x5C46],
- ["CC5A",0x5C47],
- ["A97D",0x5C48],
- ["FBDB",0x5C49],
- ["9FC9",0x5C4A],
- ["ABCE",0x5C4B],
- ["CE78",0x5C4C],
- ["ABCD",0x5C4D],
- ["ABCB",0x5C4E],
- ["ABCC",0x5C4F],
- ["AE6A",0x5C50],
- ["AE68",0x5C51],
- ["9F44",0x5C53],
- ["D16B",0x5C54],
- ["AE69",0x5C55],
- ["D16A",0x5C56],
- ["AE5E",0x5C58],
- ["D4F3",0x5C59],
- ["B150",0x5C5C],
- ["B151",0x5C5D],
- ["98ED",0x5C5E],
- ["B14F",0x5C60],
- ["B9F0",0x5C62],
- ["E1A2",0x5C63],
- ["BC68",0x5C64],
- ["BC69",0x5C65],
- ["E561",0x5C67],
- ["C0AB",0x5C68],
- ["EFC2",0x5C69],
- ["EFC3",0x5C6A],
- ["C4DD",0x5C6C],
- ["F8A8",0x5C6D],
- ["C94B",0x5C6E],
- ["A4D9",0x5C6F],
- ["A473",0x5C71],
- ["C977",0x5C73],
- ["C976",0x5C74],
- ["8CE9",0x5C78],
- ["A67A",0x5C79],
- ["C9D7",0x5C7A],
- ["C9D8",0x5C7B],
- ["C9D6",0x5C7C],
- ["C9D9",0x5C7E],
- ["FBDD",0x5C85],
- ["CAC7",0x5C86],
- ["CAC2",0x5C88],
- ["CAC4",0x5C89],
- ["CAC6",0x5C8A],
- ["CAC3",0x5C8B],
- ["A7C4",0x5C8C],
- ["CAC0",0x5C8D],
- ["CAC1",0x5C8F],
- ["A7C1",0x5C90],
- ["A7C2",0x5C91],
- ["CAC5",0x5C92],
- ["CAC8",0x5C93],
- ["A7C3",0x5C94],
- ["CAC9",0x5C95],
- ["8DF2",0x5C99],
- ["8964",0x5C9A],
- ["FDF2",0x5C9C],
- ["CC68",0x5C9D],
- ["934D",0x5C9E],
- ["CC62",0x5C9F],
- ["CC5D",0x5CA0],
- ["A9A3",0x5CA1],
- ["CC65",0x5CA2],
- ["CC63",0x5CA3],
- ["CC5C",0x5CA4],
- ["CC69",0x5CA5],
- ["CC6C",0x5CA6],
- ["CC67",0x5CA7],
- ["CC60",0x5CA8],
- ["A9A5",0x5CA9],
- ["CC66",0x5CAA],
- ["A9A6",0x5CAB],
- ["CC61",0x5CAC],
- ["CC64",0x5CAD],
- ["CC5B",0x5CAE],
- ["CC5F",0x5CAF],
- ["CC6B",0x5CB0],
- ["A9A7",0x5CB1],
- ["A9A8",0x5CB3],
- ["CC5E",0x5CB5],
- ["CC6A",0x5CB6],
- ["A9A2",0x5CB7],
- ["A9A4",0x5CB8],
- ["FBE7",0x5CBA],
- ["A0F2",0x5CC1],
- ["9868",0x5CC2],
- ["CEAB",0x5CC6],
- ["CEA4",0x5CC7],
- ["CEAA",0x5CC8],
- ["CEA3",0x5CC9],
- ["CEA5",0x5CCA],
- ["CE7D",0x5CCB],
- ["CE7B",0x5CCC],
- ["CEAC",0x5CCE],
- ["CEA9",0x5CCF],
- ["CE79",0x5CD0],
- ["9F58",0x5CD1],
- ["ABD0",0x5CD2],
- ["CEA7",0x5CD3],
- ["CEA8",0x5CD4],
- ["8CE6",0x5CD5],
- ["CEA6",0x5CD6],
- ["CE7C",0x5CD7],
- ["CE7A",0x5CD8],
- ["ABCF",0x5CD9],
- ["CEA2",0x5CDA],
- ["CE7E",0x5CDB],
- ["CEA1",0x5CDE],
- ["CEAD",0x5CDF],
- ["8D73",0x5CE5],
- ["AE6F",0x5CE8],
- ["FBDE",0x5CE9],
- ["AE6E",0x5CEA],
- ["D16C",0x5CEC],
- ["AE6B",0x5CED],
- ["D16E",0x5CEE],
- ["FBDF",0x5CEF],
- ["AE70",0x5CF0],
- ["D16F",0x5CF1],
- ["AE73",0x5CF4],
- ["8C48",0x5CF5],
- ["AE71",0x5CF6],
- ["D170",0x5CF7],
- ["CEAE",0x5CF8],
- ["D172",0x5CF9],
- ["AE6D",0x5CFB],
- ["8774",0x5CFC],
- ["AE6C",0x5CFD],
- ["D16D",0x5CFF],
- ["D171",0x5D00],
- ["AE72",0x5D01],
- ["B153",0x5D06],
- ["B152",0x5D07],
- ["D4F5",0x5D0B],
- ["D4F9",0x5D0C],
- ["D4FB",0x5D0D],
- ["B154",0x5D0E],
- ["D4FE",0x5D0F],
- ["FBE3",0x5D10],
- ["B158",0x5D11],
- ["D541",0x5D12],
- ["B15A",0x5D14],
- ["8DA8",0x5D15],
- ["B156",0x5D16],
- ["B15E",0x5D17],
- ["FBE4",0x5D18],
- ["B15B",0x5D19],
- ["D4F7",0x5D1A],
- ["B155",0x5D1B],
- ["D4F6",0x5D1D],
- ["D4F4",0x5D1E],
- ["D543",0x5D1F],
- ["D4F8",0x5D20],
- ["B157",0x5D22],
- ["D542",0x5D23],
- ["B15C",0x5D24],
- ["D4FD",0x5D25],
- ["D4FC",0x5D26],
- ["B15D",0x5D27],
- ["D4FA",0x5D28],
- ["B159",0x5D29],
- ["9C75",0x5D2C],
- ["D544",0x5D2E],
- ["9878",0x5D2F],
- ["D540",0x5D30],
- ["D8E7",0x5D31],
- ["D8EE",0x5D32],
- ["D8E3",0x5D33],
- ["B451",0x5D34],
- ["D8DF",0x5D35],
- ["D8EF",0x5D36],
- ["D8D9",0x5D37],
- ["D8EC",0x5D38],
- ["D8EA",0x5D39],
- ["D8E4",0x5D3A],
- ["D8ED",0x5D3C],
- ["D8E6",0x5D3D],
- ["8D60",0x5D3E],
- ["D8DE",0x5D3F],
- ["D8F0",0x5D40],
- ["D8DC",0x5D41],
- ["D8E9",0x5D42],
- ["D8DA",0x5D43],
- ["D8F1",0x5D45],
- ["FBE5",0x5D46],
- ["B452",0x5D47],
- ["8D61",0x5D48],
- ["D8EB",0x5D49],
- ["DD4F",0x5D4A],
- ["D8DD",0x5D4B],
- ["B44F",0x5D4C],
- ["D8E1",0x5D4E],
- ["B450",0x5D50],
- ["D8E0",0x5D51],
- ["D8E5",0x5D52],
- ["D8E2",0x5D55],
- ["8D62",0x5D56],
- ["A0A1",0x5D57],
- ["D8E8",0x5D59],
- ["9C40",0x5D5B],
- ["DD53",0x5D5E],
- ["DD56",0x5D62],
- ["DD4E",0x5D63],
- ["DD50",0x5D65],
- ["DD55",0x5D67],
- ["DD54",0x5D68],
- ["B743",0x5D69],
- ["D8DB",0x5D6B],
- ["DD52",0x5D6C],
- ["B744",0x5D6F],
- ["98AD",0x5D70],
- ["DD4D",0x5D71],
- ["DD51",0x5D72],
- ["9EEA",0x5D74],
- ["E1A9",0x5D77],
- ["8CEC",0x5D78],
- ["E1B0",0x5D79],
- ["E1A7",0x5D7A],
- ["8CD4",0x5D7B],
- ["E1AE",0x5D7C],
- ["E1A5",0x5D7D],
- ["E1AD",0x5D7E],
- ["E1B1",0x5D7F],
- ["E1A4",0x5D80],
- ["E1A8",0x5D81],
- ["E1A3",0x5D82],
- ["B9F1",0x5D84],
- ["9CEB",0x5D85],
- ["E1A6",0x5D86],
- ["B9F2",0x5D87],
- ["E1AC",0x5D88],
- ["E1AB",0x5D89],
- ["E1AA",0x5D8A],
- ["FBE0",0x5D8B],
- ["E1AF",0x5D8D],
- ["9F51",0x5D8E],
- ["E565",0x5D92],
- ["E567",0x5D93],
- ["BC6B",0x5D94],
- ["E568",0x5D95],
- ["E563",0x5D97],
- ["E562",0x5D99],
- ["E56C",0x5D9A],
- ["E56A",0x5D9C],
- ["BC6A",0x5D9D],
- ["E56D",0x5D9E],
- ["E564",0x5D9F],
- ["E569",0x5DA0],
- ["E56B",0x5DA1],
- ["E566",0x5DA2],
- ["8D65",0x5DA4],
- ["E961",0x5DA7],
- ["E966",0x5DA8],
- ["E960",0x5DA9],
- ["E965",0x5DAA],
- ["9CF1",0x5DAB],
- ["E95E",0x5DAC],
- ["E968",0x5DAD],
- ["E964",0x5DAE],
- ["E969",0x5DAF],
- ["E963",0x5DB0],
- ["E95F",0x5DB1],
- ["E967",0x5DB2],
- ["E96A",0x5DB4],
- ["E962",0x5DB5],
- ["FC58",0x5DB6],
- ["ECDA",0x5DB7],
- ["C0AF",0x5DB8],
- ["8D66",0x5DB9],
- ["C0AD",0x5DBA],
- ["C0AC",0x5DBC],
- ["C0AE",0x5DBD],
- ["EFC4",0x5DC0],
- ["9654",0x5DC1],
- ["F172",0x5DC2],
- ["F1FD",0x5DC3],
- ["F444",0x5DC6],
- ["F445",0x5DC7],
- ["C460",0x5DC9],
- ["F5C9",0x5DCB],
- ["C4DE",0x5DCD],
- ["F5CA",0x5DCF],
- ["F6DE",0x5DD1],
- ["C572",0x5DD2],
- ["C571",0x5DD4],
- ["F6DD",0x5DD5],
- ["C5C9",0x5DD6],
- ["FBE8",0x5DD7],
- ["F7D6",0x5DD8],
- ["C6CC",0x5DDB],
- ["A474",0x5DDD],
- ["A67B",0x5DDE],
- ["C9DA",0x5DDF],
- ["CACA",0x5DE0],
- ["A8B5",0x5DE1],
- ["B15F",0x5DE2],
- ["A475",0x5DE5],
- ["A5AA",0x5DE6],
- ["A5A9",0x5DE7],
- ["A5A8",0x5DE8],
- ["A7C5",0x5DEB],
- ["AE74",0x5DEE],
- ["DD57",0x5DF0],
- ["A476",0x5DF1],
- ["A477",0x5DF2],
- ["A478",0x5DF3],
- ["A4DA",0x5DF4],
- ["9FCE",0x5DF5],
- ["ABD1",0x5DF7],
- ["CEAF",0x5DF9],
- ["B453",0x5DFD],
- ["A479",0x5DFE],
- ["C95D",0x5DFF],
- ["A5AB",0x5E02],
- ["A5AC",0x5E03],
- ["C978",0x5E04],
- ["A67C",0x5E06],
- ["FBFC",0x5E09],
- ["CACB",0x5E0A],
- ["9AE4",0x5E0B],
- ["A7C6",0x5E0C],
- ["CACC",0x5E0E],
- ["A9AE",0x5E11],
- ["9F75",0x5E12],
- ["CC6E",0x5E14],
- ["A9AC",0x5E15],
- ["A9AB",0x5E16],
- ["CC6D",0x5E17],
- ["A9A9",0x5E18],
- ["CC6F",0x5E19],
- ["A9AA",0x5E1A],
- ["A9AD",0x5E1B],
- ["ABD2",0x5E1D],
- ["ABD4",0x5E1F],
- ["CEB3",0x5E20],
- ["CEB0",0x5E21],
- ["CEB1",0x5E22],
- ["CEB2",0x5E23],
- ["CEB4",0x5E24],
- ["ABD3",0x5E25],
- ["D174",0x5E28],
- ["D173",0x5E29],
- ["AE76",0x5E2B],
- ["AE75",0x5E2D],
- ["FBF1",0x5E2E],
- ["B162",0x5E33],
- ["D546",0x5E34],
- ["B161",0x5E36],
- ["B163",0x5E37],
- ["B160",0x5E38],
- ["B455",0x5E3D],
- ["D545",0x5E3E],
- ["B456",0x5E40],
- ["D8F3",0x5E41],
- ["8D69",0x5E42],
- ["B457",0x5E43],
- ["D8F2",0x5E44],
- ["B454",0x5E45],
- ["934F",0x5E48],
- ["DD5A",0x5E4A],
- ["DD5C",0x5E4B],
- ["B745",0x5E4C],
- ["DD5B",0x5E4D],
- ["DD59",0x5E4E],
- ["DD58",0x5E4F],
- ["E1B4",0x5E53],
- ["B9F7",0x5E54],
- ["B9F5",0x5E55],
- ["B9F6",0x5E57],
- ["E1B2",0x5E58],
- ["E1B3",0x5E59],
- ["B9F3",0x5E5B],
- ["E571",0x5E5C],
- ["E56F",0x5E5D],
- ["934E",0x5E5E],
- ["BC6D",0x5E5F],
- ["E570",0x5E60],
- ["BC6E",0x5E61],
- ["BC6C",0x5E62],
- ["B9F4",0x5E63],
- ["E96D",0x5E66],
- ["E96B",0x5E67],
- ["E96C",0x5E68],
- ["E56E",0x5E69],
- ["ECDC",0x5E6A],
- ["C0B0",0x5E6B],
- ["ECDB",0x5E6C],
- ["EFC5",0x5E6D],
- ["EFC6",0x5E6E],
- ["E96E",0x5E6F],
- ["F1FE",0x5E70],
- ["A47A",0x5E72],
- ["A5AD",0x5E73],
- ["A67E",0x5E74],
- ["C9DB",0x5E75],
- ["A67D",0x5E76],
- ["A9AF",0x5E78],
- ["B746",0x5E79],
- ["FBF4",0x5E7A],
- ["A4DB",0x5E7B],
- ["A5AE",0x5E7C],
- ["ABD5",0x5E7D],
- ["B458",0x5E7E],
- ["C6CE",0x5E7F],
- ["C979",0x5E80],
- ["C97A",0x5E82],
- ["FBC3",0x5E83],
- ["C9DC",0x5E84],
- ["8965",0x5E86],
- ["A7C8",0x5E87],
- ["CAD0",0x5E88],
- ["CACE",0x5E89],
- ["A7C9",0x5E8A],
- ["CACD",0x5E8B],
- ["CACF",0x5E8C],
- ["CAD1",0x5E8D],
- ["A7C7",0x5E8F],
- ["8C7A",0x5E92],
- ["A9B3",0x5E95],
- ["A9B4",0x5E96],
- ["A9B1",0x5E97],
- ["8C7B",0x5E99],
- ["A9B0",0x5E9A],
- ["CEB8",0x5E9B],
- ["A9B2",0x5E9C],
- ["ABD6",0x5EA0],
- ["CEB7",0x5EA2],
- ["CEB9",0x5EA3],
- ["CEB6",0x5EA4],
- ["CEBA",0x5EA5],
- ["ABD7",0x5EA6],
- ["AE79",0x5EA7],
- ["D175",0x5EA8],
- ["D177",0x5EAA],
- ["AE77",0x5EAB],
- ["D178",0x5EAC],
- ["AE78",0x5EAD],
- ["D176",0x5EAE],
- ["CEB5",0x5EB0],
- ["D547",0x5EB1],
- ["D54A",0x5EB2],
- ["D54B",0x5EB3],
- ["D548",0x5EB4],
- ["B167",0x5EB5],
- ["B166",0x5EB6],
- ["B164",0x5EB7],
- ["B165",0x5EB8],
- ["D549",0x5EB9],
- ["8D6A",0x5EBD],
- ["B168",0x5EBE],
- ["B45A",0x5EC1],
- ["B45B",0x5EC2],
- ["B45C",0x5EC4],
- ["DD5D",0x5EC5],
- ["DD5F",0x5EC6],
- ["DD61",0x5EC7],
- ["B748",0x5EC8],
- ["B747",0x5EC9],
- ["B459",0x5ECA],
- ["DD60",0x5ECB],
- ["DD5E",0x5ECC],
- ["9353",0x5ECD],
- ["E1B8",0x5ECE],
- ["9DFB",0x5ED0],
- ["E1B6",0x5ED1],
- ["E1BC",0x5ED2],
- ["B9F8",0x5ED3],
- ["E1BD",0x5ED4],
- ["E1BA",0x5ED5],
- ["B9F9",0x5ED6],
- ["E1B7",0x5ED7],
- ["E1B5",0x5ED8],
- ["E1BB",0x5ED9],
- ["BC70",0x5EDA],
- ["E573",0x5EDB],
- ["E1B9",0x5EDC],
- ["BC72",0x5EDD],
- ["E574",0x5EDE],
- ["BC71",0x5EDF],
- ["BC74",0x5EE0],
- ["E575",0x5EE1],
- ["BC6F",0x5EE2],
- ["BC73",0x5EE3],
- ["E973",0x5EE5],
- ["E971",0x5EE6],
- ["E970",0x5EE7],
- ["E972",0x5EE8],
- ["E96F",0x5EE9],
- ["C366",0x5EEC],
- ["F446",0x5EEE],
- ["F447",0x5EEF],
- ["F5CB",0x5EF1],
- ["F6DF",0x5EF2],
- ["C655",0x5EF3],
- ["FBFD",0x5EF4],
- ["A9B5",0x5EF6],
- ["A7CA",0x5EF7],
- ["9059",0x5EF8],
- ["FC40",0x5EF9],
- ["ABD8",0x5EFA],
- ["FC41",0x5EFB],
- ["FC43",0x5EFC],
- ["A47B",0x5EFE],
- ["A4DC",0x5EFF],
- ["A5AF",0x5F01],
- ["C9DD",0x5F02],
- ["A7CB",0x5F04],
- ["CAD2",0x5F05],
- ["CEBB",0x5F07],
- ["ABD9",0x5F08],
- ["B9FA",0x5F0A],
- ["A47C",0x5F0B],
- ["9361",0x5F0C],
- ["FC46",0x5F0D],
- ["9362",0x5F0E],
- ["A6A1",0x5F0F],
- ["B749",0x5F12],
- ["A47D",0x5F13],
- ["A4DD",0x5F14],
- ["A4DE",0x5F15],
- ["A5B1",0x5F17],
- ["A5B0",0x5F18],
- ["C9DE",0x5F1A],
- ["A6A2",0x5F1B],
- ["CAD3",0x5F1D],
- ["A7CC",0x5F1F],
- ["CC71",0x5F22],
- ["CC72",0x5F23],
- ["CC73",0x5F24],
- ["8D6B",0x5F25],
- ["A9B6",0x5F26],
- ["A9B7",0x5F27],
- ["CC70",0x5F28],
- ["A9B8",0x5F29],
- ["ABDA",0x5F2D],
- ["CEBC",0x5F2E],
- ["D17A",0x5F30],
- ["AE7A",0x5F31],
- ["D179",0x5F33],
- ["B169",0x5F35],
- ["D54C",0x5F36],
- ["B16A",0x5F37],
- ["D54D",0x5F38],
- ["FC4C",0x5F3A],
- ["8CFE",0x5F3B],
- ["B45D",0x5F3C],
- ["DD62",0x5F40],
- ["E1BF",0x5F43],
- ["E1BE",0x5F44],
- ["B9FB",0x5F46],
- ["BC75",0x5F48],
- ["E576",0x5F49],
- ["BECA",0x5F4A],
- ["E974",0x5F4B],
- ["C0B1",0x5F4C],
- ["95B8",0x5F4D],
- ["C573",0x5F4E],
- ["F7D8",0x5F4F],
- ["C6D0",0x5F50],
- ["8BCA",0x5F51],
- ["CC74",0x5F54],
- ["CEBD",0x5F56],
- ["B16B",0x5F57],
- ["D8F4",0x5F58],
- ["B74A",0x5F59],
- ["987A",0x5F5C],
- ["C255",0x5F5D],
- ["C6D1",0x5F61],
- ["A7CE",0x5F62],
- ["FC51",0x5F63],
- ["A7CD",0x5F64],
- ["ABDB",0x5F65],
- ["D17B",0x5F67],
- ["B16D",0x5F69],
- ["B343",0x5F6A],
- ["B16E",0x5F6B],
- ["B16C",0x5F6C],
- ["B45E",0x5F6D],
- ["E1C0",0x5F6F],
- ["B9FC",0x5F70],
- ["BC76",0x5F71],
- ["FC54",0x5F72],
- ["C94C",0x5F73],
- ["C9DF",0x5F74],
- ["CAD5",0x5F76],
- ["A7CF",0x5F77],
- ["CAD4",0x5F78],
- ["A7D0",0x5F79],
- ["FAAF",0x5F7B],
- ["A9BC",0x5F7C],
- ["CC77",0x5F7D],
- ["CC76",0x5F7E],
- ["A9BB",0x5F7F],
- ["A9B9",0x5F80],
- ["A9BA",0x5F81],
- ["CC75",0x5F82],
- ["8D6C",0x5F83],
- ["ABDD",0x5F85],
- ["CEBE",0x5F86],
- ["ABE0",0x5F87],
- ["ABDC",0x5F88],
- ["ABE2",0x5F89],
- ["ABDE",0x5F8A],
- ["ABDF",0x5F8B],
- ["ABE1",0x5F8C],
- ["AE7D",0x5F90],
- ["AE7C",0x5F91],
- ["AE7B",0x5F92],
- ["D54F",0x5F96],
- ["B16F",0x5F97],
- ["B172",0x5F98],
- ["B170",0x5F99],
- ["D54E",0x5F9B],
- ["B175",0x5F9C],
- ["B171",0x5F9E],
- ["D550",0x5F9F],
- ["B174",0x5FA0],
- ["B173",0x5FA1],
- ["FA61",0x5FA4],
- ["D8F6",0x5FA5],
- ["D8F5",0x5FA6],
- ["FC57",0x5FA7],
- ["B461",0x5FA8],
- ["B45F",0x5FA9],
- ["B460",0x5FAA],
- ["D8F7",0x5FAB],
- ["B74B",0x5FAC],
- ["DD64",0x5FAD],
- ["B74C",0x5FAE],
- ["DD63",0x5FAF],
- ["9B70",0x5FB1],
- ["E577",0x5FB2],
- ["BC78",0x5FB5],
- ["E1C1",0x5FB6],
- ["BC77",0x5FB7],
- ["B9FD",0x5FB9],
- ["A051",0x5FBA],
- ["ECDE",0x5FBB],
- ["E975",0x5FBC],
- ["C0B2",0x5FBD],
- ["ECDD",0x5FBE],
- ["F240",0x5FBF],
- ["F448",0x5FC0],
- ["F449",0x5FC1],
- ["8C7C",0x5FC2],
- ["A4DF",0x5FC3],
- ["8BCB",0x5FC4],
- ["A5B2",0x5FC5],
- ["C97B",0x5FC9],
- ["A7D2",0x5FCC],
- ["A7D4",0x5FCD],
- ["C9E2",0x5FCF],
- ["CAD8",0x5FD0],
- ["CAD7",0x5FD1],
- ["CAD6",0x5FD2],
- ["C9E1",0x5FD4],
- ["C9E0",0x5FD5],
- ["A6A4",0x5FD6],
- ["A7D3",0x5FD7],
- ["A7D1",0x5FD8],
- ["A6A3",0x5FD9],
- ["936E",0x5FDB],
- ["A9BD",0x5FDD],
- ["CC78",0x5FDE],
- ["FCD5",0x5FDF],
- ["A9BE",0x5FE0],
- ["CADD",0x5FE1],
- ["CADF",0x5FE3],
- ["CADE",0x5FE4],
- ["CC79",0x5FE5],
- ["CADA",0x5FE8],
- ["A7D8",0x5FEA],
- ["A7D6",0x5FEB],
- ["CAD9",0x5FED],
- ["CADB",0x5FEE],
- ["CAE1",0x5FEF],
- ["A7D5",0x5FF1],
- ["CADC",0x5FF3],
- ["CAE5",0x5FF4],
- ["A9C0",0x5FF5],
- ["CAE2",0x5FF7],
- ["A7D7",0x5FF8],
- ["CAE0",0x5FFA],
- ["CAE3",0x5FFB],
- ["A9BF",0x5FFD],
- ["A9C1",0x5FFF],
- ["CAE4",0x6000],
- ["CCAF",0x6009],
- ["CCA2",0x600A],
- ["CC7E",0x600B],
- ["CCAE",0x600C],
- ["CCA9",0x600D],
- ["ABE7",0x600E],
- ["A9C2",0x600F],
- ["CCAA",0x6010],
- ["CCAD",0x6011],
- ["ABE3",0x6012],
- ["CCAC",0x6013],
- ["A9C3",0x6014],
- ["A9C8",0x6015],
- ["A9C6",0x6016],
- ["CCA3",0x6017],
- ["CC7C",0x6019],
- ["CCA5",0x601A],
- ["A9CD",0x601B],
- ["CCB0",0x601C],
- ["ABE4",0x601D],
- ["CCA6",0x601E],
- ["ABE5",0x6020],
- ["A9C9",0x6021],
- ["CCA8",0x6022],
- ["FCA9",0x6023],
- ["CECD",0x6024],
- ["ABE6",0x6025],
- ["CC7B",0x6026],
- ["A9CA",0x6027],
- ["ABE8",0x6028],
- ["A9CB",0x6029],
- ["A9C7",0x602A],
- ["A9CC",0x602B],
- ["CCA7",0x602C],
- ["CC7A",0x602D],
- ["CCAB",0x602E],
- ["A9C4",0x602F],
- ["FC61",0x6031],
- ["CC7D",0x6032],
- ["CCA4",0x6033],
- ["CCA1",0x6034],
- ["A9C5",0x6035],
- ["CEBF",0x6037],
- ["CEC0",0x6039],
- ["8966",0x603B],
- ["CECA",0x6040],
- ["D1A1",0x6041],
- ["CECB",0x6042],
- ["ABEE",0x6043],
- ["CECE",0x6044],
- ["CEC4",0x6045],
- ["ABED",0x6046],
- ["CEC6",0x6047],
- ["CEC7",0x6049],
- ["FACB",0x604A],
- ["CEC9",0x604C],
- ["ABE9",0x604D],
- ["AEA3",0x6050],
- ["F9DA",0x6052],
- ["CEC5",0x6053],
- ["CEC1",0x6054],
- ["AEA4",0x6055],
- ["CECF",0x6058],
- ["AE7E",0x6059],
- ["D17D",0x605A],
- ["CEC8",0x605B],
- ["D17C",0x605D],
- ["CEC3",0x605E],
- ["CECC",0x605F],
- ["ABEC",0x6062],
- ["AEA1",0x6063],
- ["ABF2",0x6064],
- ["AEA2",0x6065],
- ["CED0",0x6066],
- ["D17E",0x6067],
- ["ABEB",0x6068],
- ["AEA6",0x6069],
- ["ABF1",0x606A],
- ["ABF0",0x606B],
- ["ABEF",0x606C],
- ["AEA5",0x606D],
- ["CED1",0x606E],
- ["AEA7",0x606F],
- ["ABEA",0x6070],
- ["CEC2",0x6072],
- ["937A",0x6075],
- ["A0E0",0x6077],
- ["936B",0x607E],
- ["B176",0x607F],
- ["D1A4",0x6080],
- ["D1A6",0x6081],
- ["D1A8",0x6083],
- ["AEA8",0x6084],
- ["AEAE",0x6085],
- ["D553",0x6086],
- ["D1AC",0x6087],
- ["D1A3",0x6088],
- ["B178",0x6089],
- ["D551",0x608A],
- ["AEAD",0x608C],
- ["AEAB",0x608D],
- ["D1AE",0x608E],
- ["D552",0x6090],
- ["D1A5",0x6092],
- ["AEAC",0x6094],
- ["D1A9",0x6095],
- ["AEAF",0x6096],
- ["D1AB",0x6097],
- ["AEAA",0x609A],
- ["D1AA",0x609B],
- ["D1AD",0x609C],
- ["D1A7",0x609D],
- ["FC6B",0x609E],
- ["AEA9",0x609F],
- ["B179",0x60A0],
- ["D1A2",0x60A2],
- ["B177",0x60A3],
- ["A0DC",0x60A4],
- ["9468",0x60A7],
- ["B17A",0x60A8],
- ["D555",0x60B0],
- ["D55E",0x60B1],
- ["B464",0x60B2],
- ["FC6D",0x60B3],
- ["B17C",0x60B4],
- ["B1A3",0x60B5],
- ["B465",0x60B6],
- ["D560",0x60B7],
- ["B1AA",0x60B8],
- ["D8F9",0x60B9],
- ["D556",0x60BA],
- ["B1A2",0x60BB],
- ["B1A5",0x60BC],
- ["B17E",0x60BD],
- ["D554",0x60BE],
- ["D562",0x60BF],
- ["D565",0x60C0],
- ["D949",0x60C1],
- ["D563",0x60C3],
- ["D8FD",0x60C4],
- ["B1A1",0x60C5],
- ["B1A8",0x60C6],
- ["B1AC",0x60C7],
- ["D55D",0x60C8],
- ["D8F8",0x60C9],
- ["D561",0x60CA],
- ["B17B",0x60CB],
- ["D8FA",0x60CC],
- ["D564",0x60CD],
- ["D8FC",0x60CE],
- ["D559",0x60CF],
- ["B462",0x60D1],
- ["D557",0x60D3],
- ["D558",0x60D4],
- ["B1A7",0x60D5],
- ["8D71",0x60D7],
- ["B1A6",0x60D8],
- ["D55B",0x60D9],
- ["B1AB",0x60DA],
- ["D55F",0x60DB],
- ["B1A4",0x60DC],
- ["D55C",0x60DD],
- ["FD64",0x60DE],
- ["B1A9",0x60DF],
- ["B466",0x60E0],
- ["B463",0x60E1],
- ["D8FB",0x60E2],
- ["99BA",0x60E3],
- ["D55A",0x60E4],
- ["B17D",0x60E6],
- ["9AD0",0x60E7],
- ["9A61",0x60E8],
- ["A0E5",0x60E9],
- ["B46B",0x60F0],
- ["B46F",0x60F1],
- ["D940",0x60F2],
- ["B751",0x60F3],
- ["B46D",0x60F4],
- ["D944",0x60F5],
- ["B471",0x60F6],
- ["DD65",0x60F7],
- ["D946",0x60F8],
- ["B753",0x60F9],
- ["B469",0x60FA],
- ["B46C",0x60FB],
- ["D947",0x60FC],
- ["A05B",0x60FD],
- ["D948",0x60FE],
- ["D94E",0x60FF],
- ["B473",0x6100],
- ["B754",0x6101],
- ["D94A",0x6103],
- ["D94F",0x6104],
- ["D943",0x6105],
- ["B75E",0x6106],
- ["96AC",0x6107],
- ["B755",0x6108],
- ["B472",0x6109],
- ["D941",0x610A],
- ["D950",0x610B],
- ["9740",0x610C],
- ["B75D",0x610D],
- ["B470",0x610E],
- ["B74E",0x610F],
- ["D94D",0x6110],
- ["B474",0x6112],
- ["D945",0x6113],
- ["D8FE",0x6114],
- ["B46A",0x6115],
- ["D942",0x6116],
- ["D94B",0x6118],
- ["9EF1",0x6119],
- ["B74D",0x611A],
- ["B752",0x611B],
- ["B467",0x611C],
- ["D94C",0x611D],
- ["B750",0x611F],
- ["8C4D",0x6122],
- ["B468",0x6123],
- ["B75C",0x6127],
- ["E1C3",0x6128],
- ["DD70",0x6129],
- ["DD68",0x612B],
- ["E1C2",0x612C],
- ["DD6C",0x612E],
- ["DD6E",0x612F],
- ["9F7E",0x6130],
- ["DD6B",0x6132],
- ["B75B",0x6134],
- ["DD6A",0x6136],
- ["B75F",0x6137],
- ["E1D2",0x613B],
- ["8D72",0x613D],
- ["B75A",0x613E],
- ["BA40",0x613F],
- ["DD71",0x6140],
- ["E1C4",0x6141],
- ["FC76",0x6142],
- ["B758",0x6144],
- ["DD69",0x6145],
- ["DD6D",0x6146],
- ["B9FE",0x6147],
- ["B74F",0x6148],
- ["DD66",0x6149],
- ["DD67",0x614A],
- ["BA41",0x614B],
- ["B757",0x614C],
- ["B759",0x614D],
- ["B756",0x614E],
- ["DD6F",0x614F],
- ["96A9",0x6150],
- ["E1C8",0x6152],
- ["E1C9",0x6153],
- ["E1CE",0x6154],
- ["BC7D",0x6155],
- ["E1D5",0x6156],
- ["BA47",0x6158],
- ["A06E",0x6159],
- ["BA46",0x615A],
- ["E1D0",0x615B],
- ["FCAA",0x615C],
- ["BC7C",0x615D],
- ["E1C5",0x615E],
- ["BA45",0x615F],
- ["FBCD",0x6160],
- ["E1D4",0x6161],
- ["BA43",0x6162],
- ["BA44",0x6163],
- ["FC74",0x6164],
- ["E1D1",0x6165],
- ["E5AA",0x6166],
- ["BC7A",0x6167],
- ["B46E",0x6168],
- ["E1D3",0x616A],
- ["BCA3",0x616B],
- ["E1CB",0x616C],
- ["BC7B",0x616E],
- ["A074",0x616F],
- ["BCA2",0x6170],
- ["E1C6",0x6171],
- ["E1CA",0x6172],
- ["E1C7",0x6173],
- ["E1CD",0x6174],
- ["BA48",0x6175],
- ["BC79",0x6176],
- ["BA42",0x6177],
- ["E57A",0x6179],
- ["E1CF",0x617A],
- ["BCA1",0x617C],
- ["A071",0x617D],
- ["BCA4",0x617E],
- ["E1CC",0x6180],
- ["FC79",0x6181],
- ["BC7E",0x6182],
- ["E579",0x6183],
- ["FC7C",0x6187],
- ["E57E",0x6189],
- ["BECE",0x618A],
- ["E578",0x618B],
- ["E9A3",0x618C],
- ["E5A9",0x618D],
- ["BCA8",0x618E],
- ["BCA6",0x6190],
- ["BECC",0x6191],
- ["E5A6",0x6192],
- ["E5A2",0x6193],
- ["BCAC",0x6194],
- ["9C50",0x6195],
- ["E978",0x6196],
- ["9379",0x6198],
- ["9378",0x6199],
- ["BCAA",0x619A],
- ["E5A1",0x619B],
- ["A0DD",0x619C],
- ["E976",0x619D],
- ["E5A5",0x619F],
- ["E5A8",0x61A1],
- ["E57D",0x61A2],
- ["BCAB",0x61A4],
- ["BCA5",0x61A7],
- ["E977",0x61A8],
- ["BECD",0x61A9],
- ["E5A7",0x61AA],
- ["BCA7",0x61AB],
- ["BCA9",0x61AC],
- ["E5A4",0x61AD],
- ["BCAD",0x61AE],
- ["E5A3",0x61AF],
- ["E57C",0x61B0],
- ["E57B",0x61B1],
- ["BECB",0x61B2],
- ["E5AB",0x61B3],
- ["E97A",0x61B4],
- ["ECE0",0x61B5],
- ["BED0",0x61B6],
- ["8D75",0x61B7],
- ["E9A2",0x61B8],
- ["8D76",0x61B9],
- ["E97E",0x61BA],
- ["ECE1",0x61BC],
- ["BED1",0x61BE],
- ["E9A1",0x61BF],
- ["9374",0x61C0],
- ["E97C",0x61C1],
- ["C0B4",0x61C2],
- ["ECDF",0x61C3],
- ["E979",0x61C5],
- ["E97B",0x61C6],
- ["C0B5",0x61C7],
- ["BED3",0x61C8],
- ["C0B3",0x61C9],
- ["BED2",0x61CA],
- ["C0B7",0x61CB],
- ["E97D",0x61CC],
- ["BECF",0x61CD],
- ["8D77",0x61CF],
- ["FCA5",0x61D0],
- ["FCA2",0x61D3],
- ["EFCF",0x61D6],
- ["EFC7",0x61D8],
- ["90C3",0x61DA],
- ["ECE7",0x61DE],
- ["EFC8",0x61DF],
- ["ECE3",0x61E0],
- ["A079",0x61E2],
- ["C256",0x61E3],
- ["ECE5",0x61E4],
- ["ECE4",0x61E5],
- ["C0B6",0x61E6],
- ["ECE2",0x61E7],
- ["ECE6",0x61E8],
- ["EFD0",0x61E9],
- ["EFCC",0x61EA],
- ["EFCE",0x61EB],
- ["EFC9",0x61ED],
- ["EFCA",0x61EE],
- ["EFCD",0x61F0],
- ["EFCB",0x61F1],
- ["C367",0x61F2],
- ["C36A",0x61F5],
- ["C369",0x61F6],
- ["C368",0x61F7],
- ["C461",0x61F8],
- ["F44A",0x61F9],
- ["C462",0x61FA],
- ["F241",0x61FB],
- ["C4DF",0x61FC],
- ["F5CC",0x61FD],
- ["C4E0",0x61FE],
- ["C574",0x61FF],
- ["C5CA",0x6200],
- ["F7D9",0x6201],
- ["F7DA",0x6203],
- ["F7DB",0x6204],
- ["F9BA",0x6207],
- ["A4E0",0x6208],
- ["C97C",0x6209],
- ["A5B3",0x620A],
- ["A6A6",0x620C],
- ["A6A7",0x620D],
- ["A6A5",0x620E],
- ["A6A8",0x6210],
- ["A7DA",0x6211],
- ["A7D9",0x6212],
- ["CCB1",0x6214],
- ["A9CF",0x6215],
- ["A9CE",0x6216],
- ["D1AF",0x6219],
- ["B1AD",0x621A],
- ["B1AE",0x621B],
- ["B475",0x621F],
- ["DD72",0x6220],
- ["B760",0x6221],
- ["B761",0x6222],
- ["DD74",0x6223],
- ["DD76",0x6224],
- ["DD75",0x6225],
- ["E1D7",0x6227],
- ["E1D6",0x6229],
- ["BA49",0x622A],
- ["E1D8",0x622B],
- ["8D79",0x622C],
- ["E5AC",0x622D],
- ["BCAE",0x622E],
- ["BED4",0x6230],
- ["C0B8",0x6232],
- ["C257",0x6233],
- ["C0B9",0x6234],
- ["A4E1",0x6236],
- ["8BFC",0x6237],
- ["A076",0x6239],
- ["CAE6",0x623A],
- ["CCB2",0x623D],
- ["A9D1",0x623E],
- ["A9D0",0x623F],
- ["A9D2",0x6240],
- ["ABF3",0x6241],
- ["CED2",0x6242],
- ["CED3",0x6243],
- ["D1B0",0x6246],
- ["AEB0",0x6247],
- ["B1AF",0x6248],
- ["B476",0x6249],
- ["D951",0x624A],
- ["A4E2",0x624B],
- ["8BCD",0x624C],
- ["A47E",0x624D],
- ["A4E3",0x624E],
- ["C97D",0x6250],
- ["A5B7",0x6251],
- ["A5B6",0x6252],
- ["A5B4",0x6253],
- ["A5B5",0x6254],
- ["A6AB",0x6258],
- ["C9E9",0x6259],
- ["C9EB",0x625A],
- ["A6AA",0x625B],
- ["C9E3",0x625C],
- ["C9E4",0x625E],
- ["C9EA",0x6260],
- ["C9E6",0x6261],
- ["C9E8",0x6262],
- ["A6A9",0x6263],
- ["C9E5",0x6264],
- ["C9EC",0x6265],
- ["C9E7",0x6266],
- ["9F5A",0x6268],
- ["A7E1",0x626D],
- ["A7EA",0x626E],
- ["A7E8",0x626F],
- ["CAF0",0x6270],
- ["CAED",0x6271],
- ["CAF5",0x6272],
- ["A7E6",0x6273],
- ["CAF6",0x6274],
- ["A7DF",0x6276],
- ["CAF3",0x6277],
- ["A7E5",0x6279],
- ["CAEF",0x627A],
- ["CAEE",0x627B],
- ["A7E3",0x627C],
- ["CAF4",0x627D],
- ["A7E4",0x627E],
- ["A9D3",0x627F],
- ["A7DE",0x6280],
- ["CAF1",0x6281],
- ["9FF4",0x6282],
- ["CAE7",0x6283],
- ["A7DB",0x6284],
- ["9FBA",0x6285],
- ["A7EE",0x6286],
- ["CAEC",0x6287],
- ["CAF2",0x6288],
- ["A7E0",0x6289],
- ["A7E2",0x628A],
- ["CAE8",0x628C],
- ["CAE9",0x628E],
- ["CAEA",0x628F],
- ["8D7A",0x6290],
- ["A7ED",0x6291],
- ["A7E7",0x6292],
- ["A7EC",0x6293],
- ["CAEB",0x6294],
- ["A7EB",0x6295],
- ["A7DD",0x6296],
- ["A7DC",0x6297],
- ["A7E9",0x6298],
- ["9E45",0x629D],
- ["93B0",0x62A4],
- ["A075",0x62A6],
- ["A9E1",0x62A8],
- ["CCBE",0x62A9],
- ["CCB7",0x62AA],
- ["A9DC",0x62AB],
- ["A9EF",0x62AC],
- ["CCB3",0x62AD],
- ["CCBA",0x62AE],
- ["CCBC",0x62AF],
- ["CCBF",0x62B0],
- ["A9EA",0x62B1],
- ["CCBB",0x62B3],
- ["CCB4",0x62B4],
- ["A9E8",0x62B5],
- ["CCB8",0x62B6],
- ["CCC0",0x62B8],
- ["A9D9",0x62B9],
- ["CCBD",0x62BB],
- ["A9E3",0x62BC],
- ["A9E2",0x62BD],
- ["CCB6",0x62BE],
- ["A9D7",0x62BF],
- ["A9D8",0x62C2],
- ["9B46",0x62C3],
- ["A9D6",0x62C4],
- ["FCAE",0x62C5],
- ["A9EE",0x62C6],
- ["A9E6",0x62C7],
- ["A9E0",0x62C8],
- ["A9D4",0x62C9],
- ["CCB9",0x62CA],
- ["A9DF",0x62CB],
- ["A9D5",0x62CC],
- ["A9E7",0x62CD],
- ["A9F0",0x62CE],
- ["CED4",0x62CF],
- ["A9E4",0x62D0],
- ["CCB5",0x62D1],
- ["A9DA",0x62D2],
- ["A9DD",0x62D3],
- ["A9DE",0x62D4],
- ["FCB0",0x62D5],
- ["A9EC",0x62D6],
- ["A9ED",0x62D7],
- ["A9EB",0x62D8],
- ["A9E5",0x62D9],
- ["A9E9",0x62DA],
- ["A9DB",0x62DB],
- ["ABF4",0x62DC],
- ["FA51",0x62DF],
- ["8D7B",0x62E5],
- ["CEDA",0x62EB],
- ["AC41",0x62EC],
- ["ABF8",0x62ED],
- ["ABFA",0x62EE],
- ["AC40",0x62EF],
- ["CEE6",0x62F0],
- ["ABFD",0x62F1],
- ["D1B1",0x62F2],
- ["AEB1",0x62F3],
- ["AC43",0x62F4],
- ["CED7",0x62F5],
- ["CEDF",0x62F6],
- ["ABFE",0x62F7],
- ["CEDE",0x62F8],
- ["CEDB",0x62F9],
- ["CEE3",0x62FA],
- ["CEE5",0x62FB],
- ["ABF7",0x62FC],
- ["ABFB",0x62FD],
- ["AC42",0x62FE],
- ["AEB3",0x62FF],
- ["CEE0",0x6300],
- ["ABF9",0x6301],
- ["AC45",0x6302],
- ["CED9",0x6303],
- ["ABFC",0x6307],
- ["AEB2",0x6308],
- ["ABF6",0x6309],
- ["CED6",0x630B],
- ["CEDD",0x630C],
- ["CED5",0x630D],
- ["CED8",0x630E],
- ["CEDC",0x630F],
- ["D1B2",0x6310],
- ["AC44",0x6311],
- ["CEE1",0x6313],
- ["CEE2",0x6314],
- ["CEE4",0x6315],
- ["ABF5",0x6316],
- ["8D7C",0x6318],
- ["AEC1",0x6328],
- ["D1BE",0x6329],
- ["AEBF",0x632A],
- ["AEC0",0x632B],
- ["D1B4",0x632C],
- ["D1C4",0x632D],
- ["9ED6",0x632E],
- ["AEB6",0x632F],
- ["93AC",0x6331],
- ["D566",0x6332],
- ["D1C6",0x6333],
- ["D1C0",0x6334],
- ["9F5B",0x6335],
- ["D1B7",0x6336],
- ["93A9",0x6337],
- ["D1C9",0x6338],
- ["D1BA",0x6339],
- ["AEBC",0x633A],
- ["D57D",0x633B],
- ["D1BD",0x633C],
- ["AEBE",0x633D],
- ["AEB5",0x633E],
- ["D1CB",0x6340],
- ["D1BF",0x6341],
- ["AEB8",0x6342],
- ["D1B8",0x6343],
- ["D1B5",0x6344],
- ["D1B6",0x6345],
- ["AEB9",0x6346],
- ["D1C5",0x6347],
- ["D1CC",0x6348],
- ["AEBB",0x6349],
- ["D1BC",0x634A],
- ["D1BB",0x634B],
- ["AEC3",0x634C],
- ["AEC2",0x634D],
- ["AEB4",0x634E],
- ["AEBA",0x634F],
- ["AEBD",0x6350],
- ["D1C8",0x6351],
- ["D1C2",0x6354],
- ["AEB7",0x6355],
- ["D1B3",0x6356],
- ["D1CA",0x6357],
- ["D1C1",0x6358],
- ["D1C3",0x6359],
- ["D1C7",0x635A],
- ["A07C",0x6364],
- ["D567",0x6365],
- ["B1B7",0x6367],
- ["B1CB",0x6368],
- ["B1CA",0x6369],
- ["B1BF",0x636B],
- ["FCB2",0x636C],
- ["D579",0x636D],
- ["D575",0x636E],
- ["D572",0x636F],
- ["D5A6",0x6370],
- ["B1BA",0x6371],
- ["B1B2",0x6372],
- ["D577",0x6375],
- ["B4A8",0x6376],
- ["B1B6",0x6377],
- ["D5A1",0x6378],
- ["8AC1",0x6379],
- ["B1CC",0x637A],
- ["B1C9",0x637B],
- ["D57B",0x637C],
- ["D56A",0x637D],
- ["9FB4",0x637F],
- ["B1C8",0x6380],
- ["D5A3",0x6381],
- ["D569",0x6382],
- ["B1BD",0x6383],
- ["B1C1",0x6384],
- ["D5A2",0x6385],
- ["D573",0x6387],
- ["B1C2",0x6388],
- ["B1BC",0x6389],
- ["D568",0x638A],
- ["FCAC",0x638B],
- ["B478",0x638C],
- ["D5A5",0x638D],
- ["D571",0x638E],
- ["B1C7",0x638F],
- ["D574",0x6390],
- ["D5A4",0x6391],
- ["B1C6",0x6392],
- ["D952",0x6394],
- ["B1B3",0x6396],
- ["D56F",0x6397],
- ["B1B8",0x6398],
- ["B1C3",0x6399],
- ["B1BE",0x639B],
- ["D578",0x639C],
- ["D56E",0x639D],
- ["D56C",0x639E],
- ["D57E",0x639F],
- ["B1B0",0x63A0],
- ["B1C4",0x63A1],
- ["B1B4",0x63A2],
- ["B477",0x63A3],
- ["D57C",0x63A4],
- ["B1B5",0x63A5],
- ["B1B1",0x63A7],
- ["B1C0",0x63A8],
- ["B1BB",0x63A9],
- ["B1B9",0x63AA],
- ["D570",0x63AB],
- ["B1C5",0x63AC],
- ["D56D",0x63AD],
- ["D57A",0x63AE],
- ["D576",0x63AF],
- ["D954",0x63B0],
- ["D953",0x63B1],
- ["9E4C",0x63B9],
- ["D56B",0x63BD],
- ["D964",0x63BE],
- ["B47A",0x63C0],
- ["8FC5",0x63C1],
- ["D96A",0x63C2],
- ["D959",0x63C3],
- ["D967",0x63C4],
- ["DD77",0x63C5],
- ["B47D",0x63C6],
- ["D96B",0x63C7],
- ["D96E",0x63C8],
- ["B47C",0x63C9],
- ["D95C",0x63CA],
- ["D96D",0x63CB],
- ["D96C",0x63CC],
- ["B47E",0x63CD],
- ["D955",0x63CE],
- ["B479",0x63CF],
- ["B4A3",0x63D0],
- ["93AD",0x63D1],
- ["B4A1",0x63D2],
- ["D969",0x63D3],
- ["D95F",0x63D5],
- ["B4A5",0x63D6],
- ["D970",0x63D7],
- ["D968",0x63D8],
- ["D971",0x63D9],
- ["B4AD",0x63DA],
- ["B4AB",0x63DB],
- ["D966",0x63DC],
- ["D965",0x63DD],
- ["9DC3",0x63DE],
- ["D963",0x63DF],
- ["D95D",0x63E0],
- ["B4A4",0x63E1],
- ["8DA2",0x63E2],
- ["B4A2",0x63E3],
- ["D1B9",0x63E4],
- ["D956",0x63E5],
- ["9D4A",0x63E6],
- ["DDB7",0x63E7],
- ["D957",0x63E8],
- ["B47B",0x63E9],
- ["B4AA",0x63EA],
- ["DD79",0x63EB],
- ["B4A6",0x63ED],
- ["B4A7",0x63EE],
- ["D958",0x63EF],
- ["D96F",0x63F0],
- ["DD78",0x63F1],
- ["D960",0x63F2],
- ["D95B",0x63F3],
- ["B4A9",0x63F4],
- ["D961",0x63F5],
- ["D95E",0x63F6],
- ["FCB6",0x63F8],
- ["B4AE",0x63F9],
- ["8DA3",0x63FB],
- ["9E4B",0x63FC],
- ["9E4D",0x63FE],
- ["B770",0x6406],
- ["8DA4",0x6407],
- ["DD7C",0x6409],
- ["DDB1",0x640A],
- ["DDB6",0x640B],
- ["DDAA",0x640C],
- ["B76C",0x640D],
- ["DDBB",0x640E],
- ["B769",0x640F],
- ["DD7A",0x6410],
- ["DD7B",0x6412],
- ["B762",0x6413],
- ["B76B",0x6414],
- ["DDA4",0x6415],
- ["B76E",0x6416],
- ["B76F",0x6417],
- ["DDA5",0x6418],
- ["DDB2",0x641A],
- ["DDB8",0x641B],
- ["B76A",0x641C],
- ["B764",0x641E],
- ["DDA3",0x641F],
- ["DD7D",0x6420],
- ["DDBA",0x6421],
- ["DDA8",0x6422],
- ["DDA9",0x6423],
- ["DD7E",0x6424],
- ["DDB4",0x6425],
- ["DDAB",0x6426],
- ["DDB5",0x6427],
- ["DDAD",0x6428],
- ["B765",0x642A],
- ["E1D9",0x642B],
- ["B768",0x642C],
- ["B766",0x642D],
- ["DDB9",0x642E],
- ["DDB0",0x642F],
- ["DDAC",0x6430],
- ["8AFD",0x6432],
- ["DDA1",0x6433],
- ["BA53",0x6434],
- ["DDAF",0x6435],
- ["B76D",0x6436],
- ["DDA7",0x6437],
- ["FCB5",0x6438],
- ["DDA6",0x6439],
- ["FCC3",0x643A],
- ["93B2",0x643B],
- ["B767",0x643D],
- ["B763",0x643E],
- ["E1EE",0x643F],
- ["DDB3",0x6440],
- ["DDAE",0x6441],
- ["DDA2",0x6443],
- ["E1E9",0x644B],
- ["E1DA",0x644D],
- ["E1E5",0x644E],
- ["E1EC",0x6450],
- ["BA51",0x6451],
- ["B4AC",0x6452],
- ["E1EA",0x6453],
- ["BA4C",0x6454],
- ["BA4B",0x6458],
- ["E1F1",0x6459],
- ["8DA5",0x645A],
- ["E1DB",0x645B],
- ["E1E8",0x645C],
- ["E1DC",0x645D],
- ["E1E7",0x645E],
- ["BA4F",0x645F],
- ["E1EB",0x6460],
- ["D962",0x6461],
- ["E1F2",0x6465],
- ["E1E3",0x6466],
- ["BA52",0x6467],
- ["E5BA",0x6468],
- ["BCAF",0x6469],
- ["E1F0",0x646B],
- ["E1EF",0x646C],
- ["BA54",0x646D],
- ["E5AD",0x646E],
- ["BCB0",0x646F],
- ["E5AE",0x6470],
- ["93A1",0x6471],
- ["E1DF",0x6472],
- ["E1E0",0x6473],
- ["E1DD",0x6474],
- ["E1E2",0x6475],
- ["E1DE",0x6476],
- ["E1F3",0x6477],
- ["BA4E",0x6478],
- ["BCB1",0x6479],
- ["BA50",0x647A],
- ["BA55",0x647B],
- ["8AC6",0x647C],
- ["E1E1",0x647D],
- ["E1ED",0x647F],
- ["E1E6",0x6482],
- ["E5B1",0x6485],
- ["BA4A",0x6487],
- ["BCB4",0x6488],
- ["E9AA",0x6489],
- ["E5B6",0x648A],
- ["E5B5",0x648B],
- ["E5B7",0x648C],
- ["8A5B",0x648D],
- ["E5B4",0x648F],
- ["BCB5",0x6490],
- ["894D",0x6491],
- ["BCBB",0x6492],
- ["BCB8",0x6493],
- ["BCB9",0x6495],
- ["E5AF",0x6496],
- ["E5B2",0x6497],
- ["E5BC",0x6498],
- ["BCC1",0x6499],
- ["BCBF",0x649A],
- ["E5B3",0x649C],
- ["D95A",0x649D],
- ["BCB2",0x649E],
- ["E5B9",0x649F],
- ["E5B0",0x64A0],
- ["BCC2",0x64A2],
- ["E5B8",0x64A3],
- ["BA4D",0x64A4],
- ["BCB7",0x64A5],
- ["E1E4",0x64A6],
- ["BCBA",0x64A9],
- ["BCBE",0x64AB],
- ["BCC0",0x64AC],
- ["BCBD",0x64AD],
- ["BCBC",0x64AE],
- ["FED4",0x64AF],
- ["BCB6",0x64B0],
- ["E5BB",0x64B1],
- ["BCB3",0x64B2],
- ["BCC3",0x64B3],
- ["8A78",0x64B4],
- ["93AB",0x64B6],
- ["BED8",0x64BB],
- ["BED9",0x64BC],
- ["E9A9",0x64BD],
- ["BEE2",0x64BE],
- ["BEDF",0x64BF],
- ["8DA7",0x64C0],
- ["BED6",0x64C1],
- ["BEDD",0x64C2],
- ["E9AB",0x64C3],
- ["BEDB",0x64C4],
- ["BED5",0x64C5],
- ["BEDC",0x64C7],
- ["E9A8",0x64C9],
- ["C0BB",0x64CA],
- ["BED7",0x64CB],
- ["BEDE",0x64CD],
- ["C0BA",0x64CE],
- ["E9A7",0x64CF],
- ["E9A6",0x64D0],
- ["BEE0",0x64D2],
- ["9F45",0x64D3],
- ["BEE1",0x64D4],
- ["E9A5",0x64D6],
- ["E9A4",0x64D7],
- ["C0BC",0x64D8],
- ["E9AE",0x64D9],
- ["BEDA",0x64DA],
- ["E9AC",0x64DB],
- ["8A56",0x64DD],
- ["C0BD",0x64E0],
- ["FCBF",0x64E1],
- ["C0C2",0x64E2],
- ["ECEA",0x64E3],
- ["ECEC",0x64E4],
- ["FCC0",0x64E5],
- ["C0BF",0x64E6],
- ["8EE6",0x64E7],
- ["ECED",0x64E8],
- ["ECE9",0x64E9],
- ["8AA4",0x64EA],
- ["ECEB",0x64EB],
- ["C0C0",0x64EC],
- ["C0C3",0x64ED],
- ["ECE8",0x64EF],
- ["C0BE",0x64F0],
- ["C0C1",0x64F1],
- ["C259",0x64F2],
- ["E9AD",0x64F3],
- ["C258",0x64F4],
- ["C25E",0x64F7],
- ["EFD4",0x64F8],
- ["C25C",0x64FA],
- ["C25D",0x64FB],
- ["EFD7",0x64FC],
- ["EFD3",0x64FD],
- ["C25A",0x64FE],
- ["EFD1",0x64FF],
- ["C36B",0x6500],
- ["EFD5",0x6501],
- ["EFD6",0x6503],
- ["EFD2",0x6504],
- ["C25B",0x6506],
- ["F242",0x6507],
- ["F245",0x6509],
- ["8943",0x650A],
- ["F246",0x650C],
- ["F244",0x650D],
- ["F247",0x650E],
- ["C36C",0x650F],
- ["F243",0x6510],
- ["93F3",0x6511],
- ["F44E",0x6513],
- ["C464",0x6514],
- ["F44D",0x6515],
- ["F44C",0x6516],
- ["F44B",0x6517],
- ["C463",0x6518],
- ["C465",0x6519],
- ["F5CD",0x651B],
- ["C4E2",0x651C],
- ["C4E1",0x651D],
- ["FCAB",0x651E],
- ["9EA2",0x651F],
- ["F6E1",0x6520],
- ["F6E0",0x6521],
- ["F6E3",0x6522],
- ["C5CB",0x6523],
- ["C575",0x6524],
- ["F7DD",0x6525],
- ["F6E2",0x6526],
- ["F7DC",0x6529],
- ["C5CD",0x652A],
- ["C5CC",0x652B],
- ["C5F3",0x652C],
- ["F8A9",0x652D],
- ["F8EF",0x652E],
- ["A4E4",0x652F],
- ["9DC7",0x6530],
- ["D972",0x6532],
- ["E9AF",0x6533],
- ["C6D2",0x6534],
- ["8BCE",0x6535],
- ["A6AC",0x6536],
- ["CAF7",0x6537],
- ["A7F1",0x6538],
- ["A7EF",0x6539],
- ["A7F0",0x653B],
- ["CCC1",0x653D],
- ["A9F1",0x653E],
- ["AC46",0x653F],
- ["CEE7",0x6541],
- ["CEE8",0x6543],
- ["AC47",0x6545],
- ["D1CE",0x6546],
- ["AEC4",0x6548],
- ["AEC5",0x6549],
- ["D1CD",0x654A],
- ["FCC5",0x654D],
- ["B1D3",0x654F],
- ["B1CF",0x6551],
- ["D5A7",0x6553],
- ["B1D6",0x6554],
- ["B1D5",0x6555],
- ["B1CE",0x6556],
- ["B1D1",0x6557],
- ["B1D4",0x6558],
- ["B1D0",0x6559],
- ["D976",0x655C],
- ["B1CD",0x655D],
- ["B4AF",0x655E],
- ["FCCB",0x655F],
- ["B4B1",0x6562],
- ["B4B2",0x6563],
- ["D975",0x6564],
- ["D978",0x6565],
- ["B4B0",0x6566],
- ["D973",0x6567],
- ["D977",0x6568],
- ["D974",0x656A],
- ["93B3",0x656B],
- ["B771",0x656C],
- ["FCCA",0x656D],
- ["DDBC",0x656F],
- ["BA56",0x6572],
- ["E1F4",0x6573],
- ["BEE3",0x6574],
- ["BCC4",0x6575],
- ["E5BD",0x6576],
- ["BCC5",0x6577],
- ["BCC6",0x6578],
- ["E5BF",0x6579],
- ["E5BE",0x657A],
- ["E5C0",0x657B],
- ["E9B1",0x657C],
- ["E9B0",0x657F],
- ["ECEF",0x6580],
- ["ECEE",0x6581],
- ["C0C4",0x6582],
- ["C0C5",0x6583],
- ["F248",0x6584],
- ["FCC9",0x6585],
- ["8DAC",0x6586],
- ["A4E5",0x6587],
- ["FBC6",0x6588],
- ["8967",0x6589],
- ["8C7E",0x658B],
- ["D979",0x658C],
- ["B4B4",0x6590],
- ["B4B3",0x6591],
- ["DDBD",0x6592],
- ["EFD8",0x6594],
- ["C4E3",0x6595],
- ["F7DE",0x6596],
- ["A4E6",0x6597],
- ["AEC6",0x6599],
- ["B1D8",0x659B],
- ["B1D7",0x659C],
- ["D97A",0x659D],
- ["D97B",0x659E],
- ["B772",0x659F],
- ["E1F5",0x65A0],
- ["BA57",0x65A1],
- ["E9B2",0x65A2],
- ["A4E7",0x65A4],
- ["A5B8",0x65A5],
- ["A9F2",0x65A7],
- ["CCC2",0x65A8],
- ["CEE9",0x65AA],
- ["AC48",0x65AB],
- ["B1D9",0x65AC],
- ["D97C",0x65AE],
- ["B4B5",0x65AF],
- ["B773",0x65B0],
- ["E5C1",0x65B2],
- ["E5C2",0x65B3],
- ["FCCD",0x65B5],
- ["ECF0",0x65B6],
- ["C25F",0x65B7],
- ["F8F0",0x65B8],
- ["A4E8",0x65B9],
- ["CCC3",0x65BB],
- ["A9F3",0x65BC],
- ["AC49",0x65BD],
- ["9CF3",0x65BE],
- ["CEEA",0x65BF],
- ["AEC7",0x65C1],
- ["D1D2",0x65C2],
- ["D1D0",0x65C3],
- ["D1D1",0x65C4],
- ["AEC8",0x65C5],
- ["D1CF",0x65C6],
- ["B1DB",0x65CB],
- ["B1DC",0x65CC],
- ["D5A8",0x65CD],
- ["B1DD",0x65CE],
- ["B1DA",0x65CF],
- ["D97D",0x65D0],
- ["FCD0",0x65D1],
- ["D97E",0x65D2],
- ["DDBE",0x65D3],
- ["95BB",0x65D4],
- ["BA59",0x65D6],
- ["BA58",0x65D7],
- ["ECF1",0x65DA],
- ["EFD9",0x65DB],
- ["F24A",0x65DD],
- ["F249",0x65DE],
- ["F44F",0x65DF],
- ["FCD3",0x65E0],
- ["C95E",0x65E1],
- ["AC4A",0x65E2],
- ["FCD4",0x65E3],
- ["A4E9",0x65E5],
- ["A5B9",0x65E6],
- ["A6AE",0x65E8],
- ["A6AD",0x65E9],
- ["A6AF",0x65EC],
- ["A6B0",0x65ED],
- ["C9EE",0x65EE],
- ["C9ED",0x65EF],
- ["CAF8",0x65F0],
- ["A7F2",0x65F1],
- ["CAFB",0x65F2],
- ["CAFA",0x65F3],
- ["CAF9",0x65F4],
- ["CAFC",0x65F5],
- ["A9F4",0x65FA],
- ["CCC9",0x65FB],
- ["CCC5",0x65FC],
- ["CCCE",0x65FD],
- ["8DAE",0x65FF],
- ["A9FB",0x6600],
- ["A9F9",0x6602],
- ["CCCA",0x6603],
- ["CCC6",0x6604],
- ["CCCD",0x6605],
- ["A9F8",0x6606],
- ["AA40",0x6607],
- ["CCC8",0x6608],
- ["CCC4",0x6609],
- ["A9FE",0x660A],
- ["CCCB",0x660B],
- ["A9F7",0x660C],
- ["CCCC",0x660D],
- ["A9FA",0x660E],
- ["A9FC",0x660F],
- ["CCD0",0x6610],
- ["CCCF",0x6611],
- ["CCC7",0x6612],
- ["A9F6",0x6613],
- ["A9F5",0x6614],
- ["A9FD",0x6615],
- ["FCD7",0x6618],
- ["CEEF",0x661C],
- ["CEF5",0x661D],
- ["93DB",0x661E],
- ["AC50",0x661F],
- ["AC4D",0x6620],
- ["CEEC",0x6621],
- ["CEF1",0x6622],
- ["FE63",0x6623],
- ["AC53",0x6624],
- ["AC4B",0x6625],
- ["CEF0",0x6626],
- ["AC4E",0x6627],
- ["AC51",0x6628],
- ["CEF3",0x662B],
- ["AC4C",0x662D],
- ["CEF8",0x662E],
- ["AC4F",0x662F],
- ["93D5",0x6630],
- ["AC52",0x6631],
- ["CEED",0x6632],
- ["CEF2",0x6633],
- ["CEF6",0x6634],
- ["CEEE",0x6635],
- ["CEEB",0x6636],
- ["CEF7",0x6639],
- ["CEF4",0x663A],
- ["AED0",0x6641],
- ["AEC9",0x6642],
- ["AECC",0x6643],
- ["FCDA",0x6644],
- ["AECF",0x6645],
- ["D1D5",0x6647],
- ["9B71",0x6648],
- ["AECA",0x6649],
- ["D1D3",0x664A],
- ["FCDD",0x664B],
- ["AECE",0x664C],
- ["8764",0x664D],
- ["AECB",0x664F],
- ["D1D6",0x6651],
- ["AECD",0x6652],
- ["8DAF",0x6653],
- ["FAF2",0x6657],
- ["D5AC",0x6659],
- ["B1DF",0x665A],
- ["D5AB",0x665B],
- ["D5AD",0x665C],
- ["B1DE",0x665D],
- ["B1E3",0x665E],
- ["D1D4",0x665F],
- ["D5AA",0x6661],
- ["D5AE",0x6662],
- ["93D8",0x6663],
- ["B1E0",0x6664],
- ["D5A9",0x6665],
- ["B1E2",0x6666],
- ["FCDF",0x6667],
- ["B1E1",0x6668],
- ["D9A7",0x666A],
- ["93D3",0x666B],
- ["D9A2",0x666C],
- ["B4B6",0x666E],
- ["B4BA",0x666F],
- ["B4B7",0x6670],
- ["D9A5",0x6671],
- ["D9A8",0x6672],
- ["FCE1",0x6673],
- ["B4B8",0x6674],
- ["B4B9",0x6676],
- ["B4BE",0x6677],
- ["DDC7",0x6678],
- ["D9A6",0x6679],
- ["B4BC",0x667A],
- ["D9A3",0x667B],
- ["D9A1",0x667C],
- ["8E76",0x667D],
- ["B4BD",0x667E],
- ["D9A4",0x6680],
- ["B779",0x6684],
- ["FC62",0x6685],
- ["DDBF",0x6686],
- ["B776",0x6687],
- ["B777",0x6688],
- ["B775",0x6689],
- ["DDC4",0x668A],
- ["DDC3",0x668B],
- ["DDC0",0x668C],
- ["B77B",0x668D],
- ["93D1",0x668E],
- ["DDC2",0x6690],
- ["B4BB",0x6691],
- ["8DB1",0x6692],
- ["DDC6",0x6694],
- ["DDC1",0x6695],
- ["B778",0x6696],
- ["B774",0x6697],
- ["B77A",0x6698],
- ["DDC5",0x6699],
- ["9859",0x669A],
- ["BA5C",0x669D],
- ["E1F8",0x669F],
- ["E1F7",0x66A0],
- ["E1F6",0x66A1],
- ["BA5A",0x66A2],
- ["FB52",0x66A4],
- ["BA5B",0x66A8],
- ["E5C5",0x66A9],
- ["E5C8",0x66AA],
- ["BCC8",0x66AB],
- ["FB53",0x66AD],
- ["BCC7",0x66AE],
- ["E5C9",0x66AF],
- ["E5C4",0x66B0],
- ["BCCA",0x66B1],
- ["E5C6",0x66B2],
- ["FB4D",0x66B3],
- ["BCC9",0x66B4],
- ["E5C3",0x66B5],
- ["9CBF",0x66B6],
- ["E5C7",0x66B7],
- ["BEE9",0x66B8],
- ["BEE6",0x66B9],
- ["E9BB",0x66BA],
- ["E9BA",0x66BB],
- ["E9B9",0x66BD],
- ["E9B4",0x66BE],
- ["9B72",0x66BF],
- ["E9B5",0x66C0],
- ["BEE7",0x66C4],
- ["BEE4",0x66C6],
- ["BEE8",0x66C7],
- ["E9B3",0x66C8],
- ["BEE5",0x66C9],
- ["E9B6",0x66CA],
- ["E9B7",0x66CB],
- ["E9BC",0x66CC],
- ["FB50",0x66CD],
- ["93BE",0x66CE],
- ["E9B8",0x66CF],
- ["ECF2",0x66D2],
- ["C0C7",0x66D6],
- ["EFDC",0x66D8],
- ["C0C6",0x66D9],
- ["EFDA",0x66DA],
- ["EFDB",0x66DB],
- ["C260",0x66DC],
- ["C36E",0x66DD],
- ["F24B",0x66DE],
- ["C36D",0x66E0],
- ["F451",0x66E3],
- ["F452",0x66E4],
- ["C466",0x66E6],
- ["8CDB",0x66E7],
- ["F450",0x66E8],
- ["C4E4",0x66E9],
- ["F7DF",0x66EB],
- ["C5CE",0x66EC],
- ["F8AA",0x66ED],
- ["F8AB",0x66EE],
- ["A4EA",0x66F0],
- ["9DF1",0x66F1],
- ["A6B1",0x66F2],
- ["A6B2",0x66F3],
- ["A7F3",0x66F4],
- ["CCD1",0x66F6],
- ["AC54",0x66F7],
- ["AED1",0x66F8],
- ["B1E4",0x66F9],
- ["B0D2",0x66FC],
- ["B4BF",0x66FE],
- ["B4C0",0x66FF],
- ["B3CC",0x6700],
- ["D9A9",0x6701],
- ["FCEB",0x6702],
- ["B77C",0x6703],
- ["E1FA",0x6704],
- ["E1F9",0x6705],
- ["A4EB",0x6708],
- ["A6B3",0x6709],
- ["CCD2",0x670A],
- ["AA42",0x670B],
- ["A0BB",0x670C],
- ["AA41",0x670D],
- ["9B7E",0x670E],
- ["CEF9",0x670F],
- ["CEFA",0x6710],
- ["D1D7",0x6712],
- ["D1D8",0x6713],
- ["AED2",0x6714],
- ["AED3",0x6715],
- ["8DB3",0x6716],
- ["AED4",0x6717],
- ["D5AF",0x6718],
- ["8C52",0x6719],
- ["B1E6",0x671B],
- ["B4C2",0x671D],
- ["9AE8",0x671E],
- ["B4C1",0x671F],
- ["DDC8",0x6720],
- ["DF7A",0x6721],
- ["E1FB",0x6722],
- ["E9BD",0x6723],
- ["8EDC",0x6725],
- ["C261",0x6726],
- ["C467",0x6727],
- ["A4EC",0x6728],
- ["A5BC",0x672A],
- ["A5BD",0x672B],
- ["A5BB",0x672C],
- ["A5BE",0x672D],
- ["A5BA",0x672E],
- ["A6B6",0x6731],
- ["C9F6",0x6733],
- ["A6B5",0x6734],
- ["A6B7",0x6735],
- ["9CF9",0x6736],
- ["C9F1",0x6738],
- ["C9F0",0x6739],
- ["C9F3",0x673A],
- ["C9F2",0x673B],
- ["C9F5",0x673C],
- ["A6B4",0x673D],
- ["C9EF",0x673E],
- ["C9F4",0x673F],
- ["FA50",0x6744],
- ["CAFD",0x6745],
- ["A7FD",0x6746],
- ["CAFE",0x6747],
- ["CB43",0x6748],
- ["A7FC",0x6749],
- ["CB47",0x674B],
- ["CB42",0x674C],
- ["CB45",0x674D],
- ["A7F5",0x674E],
- ["A7F6",0x674F],
- ["A7F7",0x6750],
- ["A7F8",0x6751],
- ["A840",0x6753],
- ["CB41",0x6755],
- ["A7FA",0x6756],
- ["A841",0x6757],
- ["CB40",0x6759],
- ["CB46",0x675A],
- ["A7F9",0x675C],
- ["CB44",0x675D],
- ["A7FB",0x675E],
- ["A7F4",0x675F],
- ["A7FE",0x6760],
- ["98E7",0x6761],
- ["FCF3",0x6762],
- ["FCF2",0x6767],
- ["AA57",0x676A],
- ["8CCA",0x676B],
- ["CCD4",0x676C],
- ["AA43",0x676D],
- ["8775",0x676E],
- ["AA4D",0x676F],
- ["AA4E",0x6770],
- ["AA46",0x6771],
- ["AA58",0x6772],
- ["AA48",0x6773],
- ["CCDC",0x6774],
- ["AA53",0x6775],
- ["CCD7",0x6776],
- ["AA49",0x6777],
- ["CCE6",0x6778],
- ["CCE7",0x6779],
- ["CCDF",0x677A],
- ["CCD8",0x677B],
- ["AA56",0x677C],
- ["CCE4",0x677D],
- ["AA51",0x677E],
- ["AA4F",0x677F],
- ["CCE5",0x6781],
- ["CCE3",0x6783],
- ["CCDB",0x6784],
- ["CCD3",0x6785],
- ["CCDA",0x6786],
- ["AA4A",0x6787],
- ["AA50",0x6789],
- ["AA44",0x678B],
- ["CCDE",0x678C],
- ["CCDD",0x678D],
- ["CCD5",0x678E],
- ["93E5",0x678F],
- ["AA52",0x6790],
- ["CCE1",0x6791],
- ["CCD6",0x6792],
- ["AA55",0x6793],
- ["CCE8",0x6794],
- ["AA45",0x6795],
- ["AA4C",0x6797],
- ["CCD9",0x6798],
- ["CCE2",0x6799],
- ["AA54",0x679A],
- ["AA47",0x679C],
- ["AA4B",0x679D],
- ["CCE0",0x679F],
- ["9A59",0x67A0],
- ["8DB5",0x67A4],
- ["FD4D",0x67AC],
- ["CF5B",0x67AE],
- ["AC5C",0x67AF],
- ["AC69",0x67B0],
- ["FD5E",0x67B1],
- ["CF56",0x67B2],
- ["CF4C",0x67B3],
- ["AC62",0x67B4],
- ["CF4A",0x67B5],
- ["AC5B",0x67B6],
- ["CF45",0x67B7],
- ["AC65",0x67B8],
- ["CF52",0x67B9],
- ["CEFE",0x67BA],
- ["CF41",0x67BB],
- ["8F7D",0x67BF],
- ["CF44",0x67C0],
- ["CEFB",0x67C1],
- ["CF51",0x67C2],
- ["CF61",0x67C3],
- ["AC60",0x67C4],
- ["CF46",0x67C5],
- ["CF58",0x67C6],
- ["CEFD",0x67C8],
- ["CF5F",0x67C9],
- ["CF60",0x67CA],
- ["CF63",0x67CB],
- ["CF5A",0x67CC],
- ["CF4B",0x67CD],
- ["CF53",0x67CE],
- ["AC66",0x67CF],
- ["AC59",0x67D0],
- ["AC61",0x67D1],
- ["AC6D",0x67D2],
- ["AC56",0x67D3],
- ["AC58",0x67D4],
- ["9547",0x67D6],
- ["FCF6",0x67D7],
- ["CF43",0x67D8],
- ["AC6A",0x67D9],
- ["AC63",0x67DA],
- ["CF5D",0x67DB],
- ["CF40",0x67DC],
- ["AC6C",0x67DD],
- ["AC67",0x67DE],
- ["CF49",0x67DF],
- ["AC6B",0x67E2],
- ["CF50",0x67E3],
- ["CF48",0x67E4],
- ["AC64",0x67E5],
- ["CF5C",0x67E6],
- ["CF54",0x67E7],
- ["AC5E",0x67E9],
- ["CF62",0x67EA],
- ["CF47",0x67EB],
- ["AC5A",0x67EC],
- ["CF59",0x67ED],
- ["CF4F",0x67EE],
- ["AC5F",0x67EF],
- ["CF55",0x67F0],
- ["AC57",0x67F1],
- ["CEFC",0x67F2],
- ["AC68",0x67F3],
- ["AEE3",0x67F4],
- ["AC5D",0x67F5],
- ["CF4E",0x67F6],
- ["CF4D",0x67F7],
- ["CF42",0x67F8],
- ["9250",0x67F9],
- ["CF5E",0x67FA],
- ["CF57",0x67FC],
- ["8968",0x67FE],
- ["AC55",0x67FF],
- ["8DB6",0x6800],
- ["FCFB",0x6801],
- ["A07D",0x6802],
- ["98FC",0x6803],
- ["8969",0x6804],
- ["FE4F",0x680D],
- ["9256",0x6810],
- ["D1EC",0x6812],
- ["AEEA",0x6813],
- ["D1ED",0x6814],
- ["D1E1",0x6816],
- ["AEDF",0x6817],
- ["AEEB",0x6818],
- ["D1DA",0x681A],
- ["FAC9",0x681B],
- ["D1E3",0x681C],
- ["D1EB",0x681D],
- ["93E8",0x681E],
- ["D1D9",0x681F],
- ["D1F4",0x6820],
- ["AED5",0x6821],
- ["FCF8",0x6822],
- ["D1F3",0x6825],
- ["D1EE",0x6826],
- ["D1EF",0x6828],
- ["AEDD",0x6829],
- ["AEE8",0x682A],
- ["D1E5",0x682B],
- ["D1E6",0x682D],
- ["D1F0",0x682E],
- ["D1E7",0x682F],
- ["D1E2",0x6831],
- ["D1DC",0x6832],
- ["D1DD",0x6833],
- ["D1EA",0x6834],
- ["D1E4",0x6835],
- ["9CE3",0x6836],
- ["FDA9",0x6837],
- ["AED6",0x6838],
- ["AEDA",0x6839],
- ["D1F2",0x683A],
- ["D1DE",0x683B],
- ["AEE6",0x683C],
- ["AEE2",0x683D],
- ["FC44",0x683E],
- ["AEE5",0x6840],
- ["AEEC",0x6841],
- ["AEDB",0x6842],
- ["AEE7",0x6843],
- ["D1E9",0x6844],
- ["AEE9",0x6845],
- ["AED8",0x6846],
- ["9640",0x6847],
- ["AED7",0x6848],
- ["D1DB",0x6849],
- ["8DB8",0x684A],
- ["D1DF",0x684B],
- ["AEE0",0x684C],
- ["D1F1",0x684D],
- ["D1E8",0x684E],
- ["D1E0",0x684F],
- ["AEE4",0x6850],
- ["AEE1",0x6851],
- ["AED9",0x6853],
- ["AEDC",0x6854],
- ["9B4A",0x6855],
- ["8FB9",0x6856],
- ["FCFE",0x685D],
- ["896A",0x6865],
- ["D5C4",0x686B],
- ["D5B4",0x686D],
- ["D5B5",0x686E],
- ["D5B9",0x686F],
- ["D5C8",0x6871],
- ["D5C5",0x6872],
- ["D5BE",0x6874],
- ["D5BD",0x6875],
- ["B1ED",0x6876],
- ["D5C1",0x6877],
- ["D5D0",0x6878],
- ["D5B0",0x6879],
- ["D5D1",0x687B],
- ["D5C3",0x687C],
- ["D5D5",0x687D],
- ["D5C9",0x687E],
- ["B1EC",0x687F],
- ["D5C7",0x6880],
- ["B1E7",0x6881],
- ["B1FC",0x6882],
- ["B1F2",0x6883],
- ["8DB9",0x6884],
- ["B1F6",0x6885],
- ["B1F5",0x6886],
- ["D5B1",0x6887],
- ["917E",0x6888],
- ["D5CE",0x6889],
- ["D5D4",0x688A],
- ["D5CC",0x688B],
- ["D5D3",0x688C],
- ["D5C0",0x688F],
- ["D5B2",0x6890],
- ["D5D2",0x6891],
- ["D5C2",0x6892],
- ["B1EA",0x6893],
- ["B1F7",0x6894],
- ["D5CB",0x6896],
- ["B1F0",0x6897],
- ["93F4",0x6898],
- ["D5CA",0x689B],
- ["D5B3",0x689C],
- ["B1F8",0x689D],
- ["B1FA",0x689F],
- ["D5CD",0x68A0],
- ["B1FB",0x68A1],
- ["B1E9",0x68A2],
- ["D5BA",0x68A3],
- ["D5CF",0x68A4],
- ["FB7C",0x68A6],
- ["B1EF",0x68A7],
- ["B1F9",0x68A8],
- ["D5BC",0x68A9],
- ["D5C6",0x68AA],
- ["D5B7",0x68AB],
- ["D5BB",0x68AC],
- ["B1F4",0x68AD],
- ["D5B6",0x68AE],
- ["B1E8",0x68AF],
- ["B1F1",0x68B0],
- ["B1EE",0x68B1],
- ["D5BF",0x68B2],
- ["AEDE",0x68B3],
- ["D9C0",0x68B4],
- ["B1EB",0x68B5],
- ["93E7",0x68B6],
- ["97EF",0x68B9],
- ["FE4A",0x68BD],
- ["FD45",0x68C3],
- ["B1F3",0x68C4],
- ["96A5",0x68C5],
- ["D9C3",0x68C6],
- ["D9D9",0x68C7],
- ["D9CE",0x68C8],
- ["B4D6",0x68C9],
- ["FEE0",0x68CA],
- ["B4D1",0x68CB],
- ["D9BD",0x68CC],
- ["B4D2",0x68CD],
- ["D9CD",0x68CE],
- ["D9C6",0x68D0],
- ["D9D3",0x68D1],
- ["B4CE",0x68D2],
- ["D9AB",0x68D3],
- ["D9D5",0x68D4],
- ["B4C4",0x68D5],
- ["D9B3",0x68D6],
- ["B4C7",0x68D7],
- ["B4C6",0x68D8],
- ["B4D7",0x68DA],
- ["D9AD",0x68DC],
- ["D9CF",0x68DD],
- ["D9D0",0x68DE],
- ["B4C9",0x68DF],
- ["B4C5",0x68E0],
- ["D9BB",0x68E1],
- ["B4D0",0x68E3],
- ["D9B6",0x68E4],
- ["D9D1",0x68E6],
- ["B4CC",0x68E7],
- ["D9C9",0x68E8],
- ["D9D6",0x68E9],
- ["D9B0",0x68EA],
- ["D9B5",0x68EB],
- ["D9AF",0x68EC],
- ["B4CB",0x68EE],
- ["D9C2",0x68EF],
- ["DDDE",0x68F0],
- ["D9B1",0x68F1],
- ["B4CF",0x68F2],
- ["D9BA",0x68F3],
- ["D9D2",0x68F4],
- ["B4CA",0x68F5],
- ["D9B7",0x68F6],
- ["D9B4",0x68F7],
- ["D9C5",0x68F8],
- ["B4CD",0x68F9],
- ["B4C3",0x68FA],
- ["B4D9",0x68FB],
- ["D9C8",0x68FC],
- ["D9C7",0x68FD],
- ["FD48",0x6900],
- ["FD47",0x6901],
- ["FEF2",0x6902],
- ["FE6A",0x6903],
- ["D9AC",0x6904],
- ["B4C8",0x6905],
- ["D9D4",0x6906],
- ["D9BC",0x6907],
- ["D9BE",0x6908],
- ["8DBD",0x6909],
- ["D9CB",0x690A],
- ["D9CA",0x690B],
- ["D9AA",0x690C],
- ["B4D3",0x690D],
- ["B4D5",0x690E],
- ["D9B2",0x690F],
- ["D9B9",0x6910],
- ["D9C1",0x6911],
- ["B4D4",0x6912],
- ["D9B8",0x6913],
- ["D9C4",0x6914],
- ["D9D7",0x6915],
- ["D9CC",0x6917],
- ["9BA1",0x6918],
- ["8CA2",0x6919],
- ["9AB7",0x691A],
- ["8EFC",0x691B],
- ["D9D8",0x6925],
- ["D9AE",0x692A],
- ["9FA1",0x692C],
- ["DDF2",0x692F],
- ["B7A6",0x6930],
- ["DDF0",0x6932],
- ["DDDB",0x6933],
- ["DDE0",0x6934],
- ["DDD9",0x6935],
- ["FD51",0x6936],
- ["DDEC",0x6937],
- ["DDCB",0x6938],
- ["DDD2",0x6939],
- ["DDEA",0x693B],
- ["DDF4",0x693C],
- ["DDDC",0x693D],
- ["FAAD",0x693E],
- ["DDCF",0x693F],
- ["DDE2",0x6940],
- ["DDE7",0x6941],
- ["DDD3",0x6942],
- ["8DBE",0x6943],
- ["DDE4",0x6944],
- ["DDD0",0x6945],
- ["89A4",0x6946],
- ["DDD7",0x6948],
- ["DDD8",0x6949],
- ["B7A8",0x694A],
- ["DDEB",0x694B],
- ["DDE9",0x694C],
- ["DDCC",0x694E],
- ["DDEE",0x694F],
- ["DDEF",0x6951],
- ["DDF1",0x6952],
- ["B7AC",0x6953],
- ["B7A4",0x6954],
- ["9AD9",0x6955],
- ["D5B8",0x6956],
- ["DDD4",0x6957],
- ["DDE6",0x6958],
- ["DDD5",0x6959],
- ["B7A1",0x695A],
- ["B7B1",0x695B],
- ["DDED",0x695C],
- ["B7AF",0x695D],
- ["B7AB",0x695E],
- ["DDCA",0x695F],
- ["B7A3",0x6960],
- ["FD4E",0x6961],
- ["DDCD",0x6962],
- ["B7B0",0x6963],
- ["8DC0",0x6964],
- ["DDDD",0x6965],
- ["DDC9",0x6966],
- ["97F0",0x6967],
- ["B7A9",0x6968],
- ["DDE1",0x6969],
- ["DDD1",0x696A],
- ["B7AA",0x696B],
- ["DDDA",0x696C],
- ["B77E",0x696D],
- ["B4D8",0x696E],
- ["DDE3",0x696F],
- ["D9BF",0x6970],
- ["DDCE",0x6971],
- ["93B4",0x6972],
- ["FD44",0x6973],
- ["DDE8",0x6974],
- ["B7A5",0x6975],
- ["DDE5",0x6976],
- ["B7A2",0x6977],
- ["DDDF",0x6978],
- ["B7AD",0x6979],
- ["DDD6",0x697A],
- ["DDF3",0x697B],
- ["9FA7",0x6980],
- ["B7A7",0x6982],
- ["DEC6",0x6983],
- ["8DC2",0x6985],
- ["B7AE",0x6986],
- ["99B6",0x698A],
- ["E24A",0x698D],
- ["E248",0x698E],
- ["E25E",0x6990],
- ["E246",0x6991],
- ["E258",0x6993],
- ["B77D",0x6994],
- ["BA5F",0x6995],
- ["E242",0x6996],
- ["E25D",0x6997],
- ["FD52",0x6998],
- ["E247",0x6999],
- ["E255",0x699A],
- ["BA64",0x699B],
- ["BA5D",0x699C],
- ["E25B",0x699E],
- ["8DC1",0x699F],
- ["E240",0x69A0],
- ["E25A",0x69A1],
- ["8E46",0x69A2],
- ["BA6F",0x69A3],
- ["E251",0x69A4],
- ["E261",0x69A5],
- ["BA6D",0x69A6],
- ["E249",0x69A7],
- ["BA5E",0x69A8],
- ["E24B",0x69A9],
- ["E259",0x69AA],
- ["BA67",0x69AB],
- ["E244",0x69AC],
- ["BA6B",0x69AD],
- ["BA61",0x69AE],
- ["E24D",0x69AF],
- ["E243",0x69B0],
- ["E1FC",0x69B1],
- ["A0D1",0x69B2],
- ["E257",0x69B3],
- ["BA68",0x69B4],
- ["E260",0x69B5],
- ["E1FD",0x69B6],
- ["BA65",0x69B7],
- ["E253",0x69B9],
- ["BA66",0x69BB],
- ["E245",0x69BC],
- ["E250",0x69BD],
- ["E24C",0x69BE],
- ["E24E",0x69BF],
- ["9FCA",0x69C0],
- ["BA60",0x69C1],
- ["E25F",0x69C2],
- ["BA6E",0x69C3],
- ["E24F",0x69C4],
- ["E262",0x69C6],
- ["E1FE",0x69C9],
- ["E254",0x69CA],
- ["BA63",0x69CB],
- ["BA6C",0x69CC],
- ["BA6A",0x69CD],
- ["E241",0x69CE],
- ["E256",0x69CF],
- ["BA69",0x69D0],
- ["92CF",0x69D1],
- ["BA62",0x69D3],
- ["E252",0x69D4],
- ["9CF4",0x69D5],
- ["8DC4",0x69D6],
- ["E25C",0x69D9],
- ["FD41",0x69E1],
- ["E5D5",0x69E2],
- ["E5D1",0x69E4],
- ["E5CD",0x69E5],
- ["E5E1",0x69E6],
- ["E5DE",0x69E7],
- ["BCCD",0x69E8],
- ["9B4C",0x69E9],
- ["E5E5",0x69EB],
- ["E5D4",0x69EC],
- ["BCD8",0x69ED],
- ["E5DB",0x69EE],
- ["E5D0",0x69F1],
- ["E5DA",0x69F2],
- ["BCD5",0x69F3],
- ["E5EE",0x69F4],
- ["E5EB",0x69F6],
- ["E5DD",0x69F7],
- ["E5CE",0x69F8],
- ["FD57",0x69F9],
- ["FCEF",0x69FA],
- ["E5E2",0x69FB],
- ["E5E4",0x69FC],
- ["BCD1",0x69FD],
- ["E5D8",0x69FE],
- ["E5D3",0x69FF],
- ["E5CA",0x6A00],
- ["BCCE",0x6A01],
- ["BCD6",0x6A02],
- ["9CDE",0x6A03],
- ["E5E7",0x6A04],
- ["BCD7",0x6A05],
- ["E5CB",0x6A06],
- ["E5ED",0x6A07],
- ["E5E0",0x6A08],
- ["E5E6",0x6A09],
- ["BCD4",0x6A0A],
- ["FD42",0x6A0B],
- ["986C",0x6A0C],
- ["E5E3",0x6A0D],
- ["E5EA",0x6A0F],
- ["BCD9",0x6A11],
- ["BCD3",0x6A13],
- ["E5DC",0x6A14],
- ["E5CF",0x6A15],
- ["E5EF",0x6A16],
- ["E5CC",0x6A17],
- ["E5E8",0x6A18],
- ["BCD0",0x6A19],
- ["97F9",0x6A1A],
- ["E5D6",0x6A1B],
- ["9558",0x6A1C],
- ["E5D7",0x6A1D],
- ["BCCF",0x6A1E],
- ["BCCC",0x6A1F],
- ["E5D2",0x6A20],
- ["BCD2",0x6A21],
- ["BCCB",0x6A23],
- ["E5E9",0x6A25],
- ["E5EC",0x6A26],
- ["E5D9",0x6A27],
- ["E9CA",0x6A28],
- ["985E",0x6A2B],
- ["FE7B",0x6A2C],
- ["94CD",0x6A2D],
- ["E9C2",0x6A32],
- ["93EE",0x6A33],
- ["E9BE",0x6A34],
- ["BEF6",0x6A35],
- ["BEEB",0x6A38],
- ["BEF0",0x6A39],
- ["BEEC",0x6A3A],
- ["E9CC",0x6A3B],
- ["E9D7",0x6A3C],
- ["BEEA",0x6A3D],
- ["E9C4",0x6A3E],
- ["E9CD",0x6A3F],
- ["E5DF",0x6A40],
- ["E9CE",0x6A41],
- ["8CA3",0x6A43],
- ["BEF1",0x6A44],
- ["FD5A",0x6A45],
- ["E9DD",0x6A46],
- ["BEF5",0x6A47],
- ["BEF8",0x6A48],
- ["E9C0",0x6A49],
- ["BEF4",0x6A4B],
- ["93F5",0x6A4C],
- ["E9DB",0x6A4D],
- ["E9DC",0x6A4E],
- ["E9D2",0x6A4F],
- ["E9D1",0x6A50],
- ["E9C9",0x6A51],
- ["93EF",0x6A52],
- ["8EEA",0x6A53],
- ["E9D3",0x6A54],
- ["E9DA",0x6A55],
- ["E9D9",0x6A56],
- ["8F5B",0x6A57],
- ["BEEF",0x6A58],
- ["BEED",0x6A59],
- ["E9CB",0x6A5A],
- ["E9C8",0x6A5B],
- ["E9C5",0x6A5D],
- ["E9D8",0x6A5E],
- ["BEF7",0x6A5F],
- ["E9D6",0x6A60],
- ["BEF3",0x6A61],
- ["BEF2",0x6A62],
- ["8C5E",0x6A63],
- ["E9D0",0x6A64],
- ["8DC6",0x6A65],
- ["E9BF",0x6A66],
- ["E9C1",0x6A67],
- ["E9C3",0x6A68],
- ["E9D5",0x6A69],
- ["E9CF",0x6A6A],
- ["BEEE",0x6A6B],
- ["E9C6",0x6A6D],
- ["E9D4",0x6A6F],
- ["8DC8",0x6A71],
- ["8DC7",0x6A74],
- ["E9C7",0x6A76],
- ["93F7",0x6A7A],
- ["C0CF",0x6A7E],
- ["ED45",0x6A7F],
- ["C0C8",0x6A80],
- ["ECF5",0x6A81],
- ["8DC9",0x6A82],
- ["ED41",0x6A83],
- ["C0CA",0x6A84],
- ["ED48",0x6A85],
- ["ECFC",0x6A87],
- ["ECF7",0x6A89],
- ["FBF2",0x6A8A],
- ["ED49",0x6A8C],
- ["ECF3",0x6A8D],
- ["ECFE",0x6A8E],
- ["9670",0x6A8F],
- ["C0D1",0x6A90],
- ["ED44",0x6A91],
- ["ED4A",0x6A92],
- ["ECFD",0x6A93],
- ["C0C9",0x6A94],
- ["ED40",0x6A95],
- ["ECF4",0x6A96],
- ["C0D0",0x6A97],
- ["8DCB",0x6A99],
- ["ED47",0x6A9A],
- ["ECF9",0x6A9B],
- ["C0CC",0x6A9C],
- ["FD5C",0x6A9D],
- ["ECFB",0x6A9E],
- ["ECF8",0x6A9F],
- ["C0D2",0x6AA0],
- ["ECFA",0x6AA1],
- ["C0CB",0x6AA2],
- ["C0CE",0x6AA3],
- ["ED43",0x6AA4],
- ["ECF6",0x6AA5],
- ["ED46",0x6AA6],
- ["8F65",0x6AA7],
- ["ED42",0x6AA8],
- ["8DCD",0x6AAB],
- ["C263",0x6AAC],
- ["EFE7",0x6AAD],
- ["C268",0x6AAE],
- ["C269",0x6AAF],
- ["9DA8",0x6AB1],
- ["94F9",0x6AB2],
- ["C262",0x6AB3],
- ["EFE6",0x6AB4],
- ["8DCE",0x6AB5],
- ["EFE3",0x6AB6],
- ["EFE4",0x6AB7],
- ["C266",0x6AB8],
- ["EFDE",0x6AB9],
- ["EFE2",0x6ABA],
- ["C265",0x6ABB],
- ["EFDF",0x6ABD],
- ["93EA",0x6ABE],
- ["C267",0x6AC2],
- ["C264",0x6AC3],
- ["EFDD",0x6AC5],
- ["EFE1",0x6AC6],
- ["EFE5",0x6AC7],
- ["FD5F",0x6AC8],
- ["93F0",0x6AC9],
- ["9FB6",0x6ACA],
- ["F251",0x6ACB],
- ["F24E",0x6ACC],
- ["F257",0x6ACD],
- ["F256",0x6ACF],
- ["F254",0x6AD0],
- ["F24F",0x6AD1],
- ["C372",0x6AD3],
- ["8DCF",0x6AD4],
- ["9763",0x6AD8],
- ["F250",0x6AD9],
- ["C371",0x6ADA],
- ["C0CD",0x6ADB],
- ["F253",0x6ADC],
- ["C370",0x6ADD],
- ["F258",0x6ADE],
- ["F252",0x6ADF],
- ["F24D",0x6AE0],
- ["EFE0",0x6AE1],
- ["C36F",0x6AE5],
- ["F24C",0x6AE7],
- ["F456",0x6AE8],
- ["F455",0x6AEA],
- ["F255",0x6AEB],
- ["C468",0x6AEC],
- ["F459",0x6AEE],
- ["F45A",0x6AEF],
- ["F454",0x6AF0],
- ["F458",0x6AF1],
- ["F453",0x6AF3],
- ["8DD0",0x6AF6],
- ["F5D1",0x6AF8],
- ["F457",0x6AF9],
- ["C4E7",0x6AFA],
- ["C4E5",0x6AFB],
- ["F5CF",0x6AFC],
- ["F5D2",0x6B00],
- ["F5CE",0x6B02],
- ["F5D0",0x6B03],
- ["C4E6",0x6B04],
- ["93F1",0x6B05],
- ["F6E5",0x6B08],
- ["F6E6",0x6B09],
- ["C576",0x6B0A],
- ["F6E4",0x6B0B],
- ["F7E2",0x6B0F],
- ["C5CF",0x6B10],
- ["F7E0",0x6B11],
- ["F7E1",0x6B12],
- ["F8AC",0x6B13],
- ["C656",0x6B16],
- ["F8F3",0x6B17],
- ["F8F1",0x6B18],
- ["F8F2",0x6B19],
- ["F8F4",0x6B1A],
- ["FD62",0x6B1D],
- ["F9BB",0x6B1E],
- ["A4ED",0x6B20],
- ["A6B8",0x6B21],
- ["AA59",0x6B23],
- ["CCE9",0x6B25],
- ["CF64",0x6B28],
- ["D1F5",0x6B2C],
- ["D1F7",0x6B2D],
- ["D1F6",0x6B2F],
- ["D1F8",0x6B31],
- ["B1FD",0x6B32],
- ["D5D7",0x6B33],
- ["D1F9",0x6B34],
- ["FD65",0x6B35],
- ["D5D6",0x6B36],
- ["D5D8",0x6B37],
- ["D5D9",0x6B38],
- ["D9DA",0x6B39],
- ["B4DB",0x6B3A],
- ["D9DB",0x6B3B],
- ["D9DD",0x6B3C],
- ["B4DC",0x6B3D],
- ["B4DA",0x6B3E],
- ["D9DC",0x6B3F],
- ["DDFA",0x6B41],
- ["DDF8",0x6B42],
- ["DDF7",0x6B43],
- ["DDF6",0x6B45],
- ["DDF5",0x6B46],
- ["B7B2",0x6B47],
- ["DDF9",0x6B48],
- ["BA70",0x6B49],
- ["E263",0x6B4A],
- ["E265",0x6B4B],
- ["BA71",0x6B4C],
- ["E264",0x6B4D],
- ["BCDB",0x6B4E],
- ["BCDA",0x6B50],
- ["E5F0",0x6B51],
- ["9FDB",0x6B52],
- ["E9DF",0x6B54],
- ["E9DE",0x6B55],
- ["E9E0",0x6B56],
- ["93F8",0x6B57],
- ["BEF9",0x6B59],
- ["ED4B",0x6B5B],
- ["C0D3",0x6B5C],
- ["EFE8",0x6B5E],
- ["C26A",0x6B5F],
- ["F259",0x6B60],
- ["C577",0x6B61],
- ["A4EE",0x6B62],
- ["A5BF",0x6B63],
- ["A6B9",0x6B64],
- ["A842",0x6B65],
- ["AA5A",0x6B66],
- ["AA5B",0x6B67],
- ["AC6E",0x6B6A],
- ["D1FA",0x6B6D],
- ["8BF7",0x6B6F],
- ["B7B3",0x6B72],
- ["FD66",0x6B74],
- ["E6D1",0x6B76],
- ["BEFA",0x6B77],
- ["C26B",0x6B78],
- ["A4EF",0x6B79],
- ["8BCF",0x6B7A],
- ["A6BA",0x6B7B],
- ["CCEB",0x6B7E],
- ["AA5C",0x6B7F],
- ["CCEA",0x6B80],
- ["8DD1",0x6B81],
- ["CF65",0x6B82],
- ["AC6F",0x6B83],
- ["CF66",0x6B84],
- ["AC70",0x6B86],
- ["D1FC",0x6B88],
- ["AEEE",0x6B89],
- ["AEED",0x6B8A],
- ["D5DE",0x6B8C],
- ["D5DC",0x6B8D],
- ["D5DD",0x6B8E],
- ["D5DB",0x6B8F],
- ["D5DA",0x6B91],
- ["D9DE",0x6B94],
- ["D9E1",0x6B95],
- ["B4DE",0x6B96],
- ["D9DF",0x6B97],
- ["B4DD",0x6B98],
- ["D9E0",0x6B99],
- ["DDFB",0x6B9B],
- ["E266",0x6B9E],
- ["E267",0x6B9F],
- ["E268",0x6BA0],
- ["E5F3",0x6BA2],
- ["E5F2",0x6BA3],
- ["BCDC",0x6BA4],
- ["E5F1",0x6BA5],
- ["E5F4",0x6BA6],
- ["E9E1",0x6BA7],
- ["E9E2",0x6BAA],
- ["E9E3",0x6BAB],
- ["ED4C",0x6BAD],
- ["C0D4",0x6BAE],
- ["C26C",0x6BAF],
- ["F25A",0x6BB0],
- ["C4E8",0x6BB2],
- ["C95F",0x6BB3],
- ["AC71",0x6BB5],
- ["CF67",0x6BB6],
- ["AEEF",0x6BB7],
- ["B1FE",0x6BBA],
- ["B4DF",0x6BBC],
- ["D9E2",0x6BBD],
- ["B7B5",0x6BBF],
- ["B7B4",0x6BC0],
- ["8DD2",0x6BC1],
- ["E269",0x6BC3],
- ["E26A",0x6BC4],
- ["BCDD",0x6BC5],
- ["BCDE",0x6BC6],
- ["E9E5",0x6BC7],
- ["E9E4",0x6BC8],
- ["EFE9",0x6BC9],
- ["F7E3",0x6BCA],
- ["A4F0",0x6BCB],
- ["C960",0x6BCC],
- ["A5C0",0x6BCD],
- ["A843",0x6BCF],
- ["CB48",0x6BD0],
- ["AC72",0x6BD2],
- ["B7B6",0x6BD3],
- ["A4F1",0x6BD4],
- ["CF68",0x6BD6],
- ["AC73",0x6BD7],
- ["CF69",0x6BD8],
- ["C0D5",0x6BDA],
- ["A4F2",0x6BDB],
- ["FD71",0x6BDC],
- ["CCEC",0x6BDE],
- ["CF6A",0x6BE0],
- ["FD6F",0x6BE1],
- ["D242",0x6BE2],
- ["D241",0x6BE3],
- ["D1FE",0x6BE4],
- ["D1FD",0x6BE6],
- ["D243",0x6BE7],
- ["D240",0x6BE8],
- ["8DD3",0x6BEA],
- ["B240",0x6BEB],
- ["B241",0x6BEC],
- ["B4E0",0x6BEF],
- ["D9E3",0x6BF0],
- ["D9E4",0x6BF2],
- ["D9E5",0x6BF3],
- ["DE41",0x6BF7],
- ["DE42",0x6BF8],
- ["DE40",0x6BF9],
- ["9FE7",0x6BFA],
- ["DDFD",0x6BFB],
- ["DDFE",0x6BFC],
- ["B7B7",0x6BFD],
- ["E26B",0x6BFE],
- ["E5F7",0x6BFF],
- ["E5F6",0x6C00],
- ["E5F5",0x6C01],
- ["E5F8",0x6C02],
- ["E9E7",0x6C03],
- ["E9E6",0x6C04],
- ["BEFB",0x6C05],
- ["E9E8",0x6C06],
- ["C0D6",0x6C08],
- ["ED4D",0x6C09],
- ["EFEA",0x6C0B],
- ["F25B",0x6C0C],
- ["F6E7",0x6C0D],
- ["A4F3",0x6C0F],
- ["A5C2",0x6C10],
- ["A5C1",0x6C11],
- ["AA5D",0x6C13],
- ["C961",0x6C14],
- ["C97E",0x6C15],
- ["A6BB",0x6C16],
- ["C9F7",0x6C18],
- ["CB49",0x6C19],
- ["CB4A",0x6C1A],
- ["AA5E",0x6C1B],
- ["90BD",0x6C1C],
- ["CCED",0x6C1D],
- ["AC74",0x6C1F],
- ["CF6B",0x6C20],
- ["CF6C",0x6C21],
- ["AEF0",0x6C23],
- ["AEF4",0x6C24],
- ["D244",0x6C25],
- ["AEF3",0x6C26],
- ["AEF1",0x6C27],
- ["AEF2",0x6C28],
- ["D5DF",0x6C2A],
- ["B242",0x6C2B],
- ["B4E3",0x6C2C],
- ["B4E1",0x6C2E],
- ["B4E2",0x6C2F],
- ["D9E6",0x6C30],
- ["9FD0",0x6C31],
- ["BA72",0x6C33],
- ["A4F4",0x6C34],
- ["8BD0",0x6C35],
- ["C9A1",0x6C36],
- ["FD72",0x6C37],
- ["A5C3",0x6C38],
- ["9CAE",0x6C39],
- ["8BD1",0x6C3A],
- ["C9A4",0x6C3B],
- ["8ADB",0x6C3D],
- ["A5C6",0x6C3E],
- ["C9A3",0x6C3F],
- ["A5C5",0x6C40],
- ["A5C4",0x6C41],
- ["A844",0x6C42],
- ["C9A2",0x6C43],
- ["C9F8",0x6C46],
- ["FAE4",0x6C49],
- ["C9FC",0x6C4A],
- ["C9FE",0x6C4B],
- ["CA40",0x6C4C],
- ["A6C5",0x6C4D],
- ["A6C6",0x6C4E],
- ["C9FB",0x6C4F],
- ["A6C1",0x6C50],
- ["C9F9",0x6C52],
- ["C9FD",0x6C54],
- ["A6C2",0x6C55],
- ["A6BD",0x6C57],
- ["95CE",0x6C58],
- ["A6BE",0x6C59],
- ["FD76",0x6C5A],
- ["A6C4",0x6C5B],
- ["C9FA",0x6C5C],
- ["A6BC",0x6C5D],
- ["A845",0x6C5E],
- ["A6BF",0x6C5F],
- ["A6C0",0x6C60],
- ["A6C3",0x6C61],
- ["CB5B",0x6C65],
- ["CB59",0x6C66],
- ["CB4C",0x6C67],
- ["A851",0x6C68],
- ["CB53",0x6C69],
- ["A84C",0x6C6A],
- ["CB4D",0x6C6B],
- ["CB55",0x6C6D],
- ["FB62",0x6C6E],
- ["CB52",0x6C6F],
- ["A84F",0x6C70],
- ["CB51",0x6C71],
- ["A856",0x6C72],
- ["CB5A",0x6C73],
- ["A858",0x6C74],
- ["8DD4",0x6C75],
- ["A85A",0x6C76],
- ["CB4B",0x6C78],
- ["FD78",0x6C79],
- ["A84D",0x6C7A],
- ["CB5C",0x6C7B],
- ["A854",0x6C7D],
- ["A857",0x6C7E],
- ["8EE3",0x6C7F],
- ["CD45",0x6C80],
- ["A847",0x6C81],
- ["A85E",0x6C82],
- ["A855",0x6C83],
- ["CB4E",0x6C84],
- ["A84A",0x6C85],
- ["A859",0x6C86],
- ["CB56",0x6C87],
- ["A848",0x6C88],
- ["A849",0x6C89],
- ["CD43",0x6C8A],
- ["CB4F",0x6C8B],
- ["A850",0x6C8C],
- ["A85B",0x6C8D],
- ["CB5D",0x6C8E],
- ["CB50",0x6C8F],
- ["A84E",0x6C90],
- ["A853",0x6C92],
- ["CCEE",0x6C93],
- ["A85C",0x6C94],
- ["CB57",0x6C95],
- ["A852",0x6C96],
- ["A85D",0x6C98],
- ["A846",0x6C99],
- ["CB54",0x6C9A],
- ["A84B",0x6C9B],
- ["CB58",0x6C9C],
- ["CD44",0x6C9D],
- ["9076",0x6C9F],
- ["98C6",0x6CA2],
- ["8DD5",0x6CAA],
- ["AA6A",0x6CAB],
- ["AA7A",0x6CAC],
- ["CCF5",0x6CAD],
- ["AA71",0x6CAE],
- ["97D1",0x6CAF],
- ["CD4B",0x6CB0],
- ["AA62",0x6CB1],
- ["9EB6",0x6CB2],
- ["AA65",0x6CB3],
- ["CD42",0x6CB4],
- ["CCF3",0x6CB6],
- ["CCF7",0x6CB7],
- ["AA6D",0x6CB8],
- ["AA6F",0x6CB9],
- ["CCFA",0x6CBA],
- ["AA76",0x6CBB],
- ["AA68",0x6CBC],
- ["AA66",0x6CBD],
- ["AA67",0x6CBE],
- ["AA75",0x6CBF],
- ["CD47",0x6CC0],
- ["AA70",0x6CC1],
- ["CCF9",0x6CC2],
- ["CCFB",0x6CC3],
- ["AA6E",0x6CC4],
- ["AA73",0x6CC5],
- ["CCFC",0x6CC6],
- ["CD4A",0x6CC7],
- ["AC75",0x6CC9],
- ["AA79",0x6CCA],
- ["FAC7",0x6CCB],
- ["AA63",0x6CCC],
- ["CD49",0x6CCD],
- ["A042",0x6CCE],
- ["CD4D",0x6CCF],
- ["CCF8",0x6CD0],
- ["CD4F",0x6CD1],
- ["CD40",0x6CD2],
- ["AA6C",0x6CD3],
- ["CCF4",0x6CD4],
- ["AA6B",0x6CD5],
- ["AA7D",0x6CD6],
- ["AA72",0x6CD7],
- ["CCF2",0x6CD9],
- ["CF75",0x6CDA],
- ["AA78",0x6CDB],
- ["AA7C",0x6CDC],
- ["CD41",0x6CDD],
- ["CD46",0x6CDE],
- ["9873",0x6CDF],
- ["AA7E",0x6CE0],
- ["AA77",0x6CE1],
- ["AA69",0x6CE2],
- ["AA5F",0x6CE3],
- ["AA64",0x6CE5],
- ["CCF6",0x6CE7],
- ["AA60",0x6CE8],
- ["CD4E",0x6CE9],
- ["9FFC",0x6CEA],
- ["CCF0",0x6CEB],
- ["CCEF",0x6CEC],
- ["CCFD",0x6CED],
- ["CCF1",0x6CEE],
- ["AA7B",0x6CEF],
- ["AEF5",0x6CF0],
- ["AA74",0x6CF1],
- ["CCFE",0x6CF2],
- ["AA61",0x6CF3],
- ["ACA6",0x6CF5],
- ["CD4C",0x6CF9],
- ["8CA5",0x6CFF],
- ["CF7C",0x6D00],
- ["CFA1",0x6D01],
- ["8DD7",0x6D02],
- ["CFA4",0x6D03],
- ["CF77",0x6D04],
- ["92FB",0x6D05],
- ["8DD8",0x6D06],
- ["CFA7",0x6D07],
- ["CFAA",0x6D08],
- ["CFAC",0x6D09],
- ["CF74",0x6D0A],
- ["AC76",0x6D0B],
- ["AC7B",0x6D0C],
- ["D249",0x6D0D],
- ["ACAD",0x6D0E],
- ["CFA5",0x6D0F],
- ["CFAD",0x6D10],
- ["CF7B",0x6D11],
- ["CF73",0x6D12],
- ["D264",0x6D16],
- ["AC7E",0x6D17],
- ["CFA2",0x6D18],
- ["CF78",0x6D19],
- ["CF7A",0x6D1A],
- ["ACA5",0x6D1B],
- ["CF7D",0x6D1D],
- ["AC7D",0x6D1E],
- ["CF70",0x6D1F],
- ["CFA8",0x6D20],
- ["CFAB",0x6D22],
- ["944F",0x6D24],
- ["AC7A",0x6D25],
- ["8DD9",0x6D26],
- ["ACA8",0x6D27],
- ["CF6D",0x6D28],
- ["ACAA",0x6D29],
- ["AC78",0x6D2A],
- ["ACAE",0x6D2B],
- ["CFA9",0x6D2C],
- ["CF6F",0x6D2D],
- ["ACAB",0x6D2E],
- ["D25E",0x6D2F],
- ["CD48",0x6D30],
- ["AC7C",0x6D31],
- ["AC77",0x6D32],
- ["CF76",0x6D33],
- ["CF6E",0x6D34],
- ["ACAC",0x6D35],
- ["ACA4",0x6D36],
- ["CFA3",0x6D37],
- ["ACA9",0x6D38],
- ["ACA7",0x6D39],
- ["CF79",0x6D3A],
- ["ACA1",0x6D3B],
- ["CF71",0x6D3C],
- ["ACA2",0x6D3D],
- ["ACA3",0x6D3E],
- ["CF72",0x6D3F],
- ["CFA6",0x6D40],
- ["AC79",0x6D41],
- ["CF7E",0x6D42],
- ["896B",0x6D4E],
- ["97CE",0x6D57],
- ["D24C",0x6D58],
- ["AEFD",0x6D59],
- ["AF43",0x6D5A],
- ["FAF3",0x6D5B],
- ["FDAE",0x6D5C],
- ["D255",0x6D5E],
- ["D25B",0x6D5F],
- ["D257",0x6D60],
- ["D24A",0x6D61],
- ["D24D",0x6D62],
- ["D246",0x6D63],
- ["D247",0x6D64],
- ["AF4A",0x6D65],
- ["AEFA",0x6D66],
- ["D256",0x6D67],
- ["D25F",0x6D68],
- ["AF45",0x6D69],
- ["AEF6",0x6D6A],
- ["AF40",0x6D6C],
- ["D24E",0x6D6D],
- ["AF42",0x6D6E],
- ["D24F",0x6D6F],
- ["D259",0x6D70],
- ["FBAF",0x6D71],
- ["92B7",0x6D72],
- ["AF44",0x6D74],
- ["D268",0x6D75],
- ["D248",0x6D76],
- ["AEFC",0x6D77],
- ["AEFB",0x6D78],
- ["AF48",0x6D79],
- ["D245",0x6D7A],
- ["D266",0x6D7B],
- ["D25A",0x6D7C],
- ["D267",0x6D7D],
- ["D261",0x6D7E],
- ["D253",0x6D7F],
- ["D262",0x6D80],
- ["8DDA",0x6D81],
- ["D25C",0x6D82],
- ["D265",0x6D83],
- ["D263",0x6D84],
- ["AF49",0x6D85],
- ["D254",0x6D86],
- ["AEF9",0x6D87],
- ["AEF8",0x6D88],
- ["AF41",0x6D89],
- ["AF47",0x6D8A],
- ["D260",0x6D8B],
- ["AF46",0x6D8C],
- ["D251",0x6D8D],
- ["B243",0x6D8E],
- ["9C5A",0x6D8F],
- ["D269",0x6D90],
- ["D250",0x6D91],
- ["D24B",0x6D92],
- ["AEFE",0x6D93],
- ["AF4B",0x6D94],
- ["AEF7",0x6D95],
- ["FDAD",0x6D96],
- ["D258",0x6D97],
- ["D25D",0x6D98],
- ["8DDC",0x6DA4],
- ["9444",0x6DA5],
- ["B265",0x6DAA],
- ["D5E1",0x6DAB],
- ["D5E5",0x6DAC],
- ["B252",0x6DAE],
- ["B250",0x6DAF],
- ["8DDD",0x6DB1],
- ["B247",0x6DB2],
- ["D5E3",0x6DB3],
- ["D5E2",0x6DB4],
- ["B25B",0x6DB5],
- ["D5E8",0x6DB7],
- ["B255",0x6DB8],
- ["A0D6",0x6DB9],
- ["D5FA",0x6DBA],
- ["D647",0x6DBB],
- ["B244",0x6DBC],
- ["D5F7",0x6DBD],
- ["D5F0",0x6DBE],
- ["B267",0x6DBF],
- ["D5E0",0x6DC0],
- ["D5FC",0x6DC2],
- ["B264",0x6DC4],
- ["B258",0x6DC5],
- ["B263",0x6DC6],
- ["B24E",0x6DC7],
- ["D5EC",0x6DC8],
- ["D5FE",0x6DC9],
- ["D5F6",0x6DCA],
- ["B24F",0x6DCB],
- ["B249",0x6DCC],
- ["D645",0x6DCD],
- ["D5FD",0x6DCF],
- ["D640",0x6DD0],
- ["B251",0x6DD1],
- ["B259",0x6DD2],
- ["D642",0x6DD3],
- ["D5EA",0x6DD4],
- ["D5FB",0x6DD5],
- ["D5EF",0x6DD6],
- ["D644",0x6DD7],
- ["B25E",0x6DD8],
- ["B246",0x6DD9],
- ["B25C",0x6DDA],
- ["D5F4",0x6DDB],
- ["D5F2",0x6DDC],
- ["D5F3",0x6DDD],
- ["B253",0x6DDE],
- ["D5EE",0x6DDF],
- ["D5ED",0x6DE0],
- ["B248",0x6DE1],
- ["D5E7",0x6DE2],
- ["D646",0x6DE3],
- ["B24A",0x6DE4],
- ["D5F1",0x6DE5],
- ["B268",0x6DE6],
- ["B262",0x6DE8],
- ["D5E6",0x6DE9],
- ["B25F",0x6DEA],
- ["B25D",0x6DEB],
- ["B266",0x6DEC],
- ["D5F8",0x6DED],
- ["B261",0x6DEE],
- ["D252",0x6DEF],
- ["D5F9",0x6DF0],
- ["B260",0x6DF1],
- ["D641",0x6DF2],
- ["B245",0x6DF3],
- ["D5F5",0x6DF4],
- ["B257",0x6DF5],
- ["D5E9",0x6DF6],
- ["B256",0x6DF7],
- ["B254",0x6DF9],
- ["B24C",0x6DFA],
- ["B24B",0x6DFB],
- ["D9E7",0x6DFC],
- ["D643",0x6DFD],
- ["8C41",0x6DFE],
- ["D5EB",0x6E00],
- ["97D5",0x6E02],
- ["D9FC",0x6E03],
- ["944A",0x6E04],
- ["B24D",0x6E05],
- ["944D",0x6E0A],
- ["97CB",0x6E0F],
- ["8DDE",0x6E15],
- ["8DDF",0x6E18],
- ["B541",0x6E19],
- ["B25A",0x6E1A],
- ["B4EE",0x6E1B],
- ["D9F6",0x6E1C],
- ["B4FC",0x6E1D],
- ["D9EA",0x6E1F],
- ["B4EB",0x6E20],
- ["B4E7",0x6E21],
- ["DA49",0x6E22],
- ["B4ED",0x6E23],
- ["B4F1",0x6E24],
- ["B4EC",0x6E25],
- ["B4F5",0x6E26],
- ["DA4D",0x6E27],
- ["DA44",0x6E28],
- ["8DE0",0x6E29],
- ["FEF9",0x6E2A],
- ["D9F1",0x6E2B],
- ["B4FA",0x6E2C],
- ["B4F4",0x6E2D],
- ["D9FD",0x6E2E],
- ["B4E4",0x6E2F],
- ["DA4A",0x6E30],
- ["DA43",0x6E31],
- ["B4E8",0x6E32],
- ["D9F7",0x6E33],
- ["B4F7",0x6E34],
- ["DA55",0x6E35],
- ["DA56",0x6E36],
- ["B4E5",0x6E38],
- ["DA48",0x6E39],
- ["B4F9",0x6E3A],
- ["D9FB",0x6E3B],
- ["D9ED",0x6E3C],
- ["D9EE",0x6E3D],
- ["B4FD",0x6E3E],
- ["D9F2",0x6E3F],
- ["D9F9",0x6E40],
- ["D9F3",0x6E41],
- ["B4FB",0x6E43],
- ["B544",0x6E44],
- ["D9EF",0x6E45],
- ["D9E8",0x6E46],
- ["D9E9",0x6E47],
- ["D9EB",0x6E49],
- ["B4EA",0x6E4A],
- ["D9F8",0x6E4B],
- ["B4F8",0x6E4D],
- ["B542",0x6E4E],
- ["FDC0",0x6E4F],
- ["FCF9",0x6E50],
- ["D9FA",0x6E51],
- ["DA53",0x6E52],
- ["DA4B",0x6E53],
- ["B4E6",0x6E54],
- ["DA51",0x6E55],
- ["B4F2",0x6E56],
- ["8CDD",0x6E57],
- ["B4F0",0x6E58],
- ["FB7E",0x6E59],
- ["DA57",0x6E5A],
- ["B4EF",0x6E5B],
- ["DA41",0x6E5C],
- ["D9F4",0x6E5D],
- ["D9FE",0x6E5E],
- ["B547",0x6E5F],
- ["DA45",0x6E60],
- ["DA42",0x6E61],
- ["D9F0",0x6E62],
- ["B543",0x6E63],
- ["DA4F",0x6E64],
- ["DA4C",0x6E65],
- ["DA54",0x6E66],
- ["B4E9",0x6E67],
- ["DA40",0x6E68],
- ["B546",0x6E69],
- ["DA47",0x6E6B],
- ["B4F3",0x6E6E],
- ["B4F6",0x6E6F],
- ["DA46",0x6E71],
- ["B545",0x6E72],
- ["D9F5",0x6E73],
- ["D5E4",0x6E74],
- ["92B3",0x6E76],
- ["DA50",0x6E77],
- ["DA4E",0x6E78],
- ["DA52",0x6E79],
- ["FDAF",0x6E7C],
- ["8DE1",0x6E86],
- ["D9EC",0x6E88],
- ["B540",0x6E89],
- ["95D3",0x6E8B],
- ["DE61",0x6E8D],
- ["DE60",0x6E8E],
- ["DE46",0x6E8F],
- ["B7BD",0x6E90],
- ["DE5F",0x6E92],
- ["DE49",0x6E93],
- ["DE4A",0x6E94],
- ["B7C7",0x6E96],
- ["DE68",0x6E97],
- ["B7C2",0x6E98],
- ["DE5E",0x6E99],
- ["89C1",0x6E9A],
- ["DE43",0x6E9B],
- ["B7C8",0x6E9C],
- ["B7BE",0x6E9D],
- ["DE52",0x6E9E],
- ["DE48",0x6E9F],
- ["DE4B",0x6EA0],
- ["DE63",0x6EA1],
- ["B7B8",0x6EA2],
- ["DE6A",0x6EA3],
- ["DE62",0x6EA4],
- ["B7C1",0x6EA5],
- ["DE57",0x6EA6],
- ["B7CC",0x6EA7],
- ["B7CB",0x6EAA],
- ["B7C5",0x6EAB],
- ["DE69",0x6EAE],
- ["B7B9",0x6EAF],
- ["DE55",0x6EB0],
- ["DE4C",0x6EB1],
- ["DE59",0x6EB2],
- ["DE65",0x6EB3],
- ["B7CD",0x6EB4],
- ["FD68",0x6EB5],
- ["B7BB",0x6EB6],
- ["DE54",0x6EB7],
- ["9CB7",0x6EB8],
- ["DE4D",0x6EB9],
- ["B7C4",0x6EBA],
- ["8DE3",0x6EBB],
- ["B7C3",0x6EBC],
- ["DE50",0x6EBD],
- ["DE5A",0x6EBE],
- ["DE64",0x6EBF],
- ["DE47",0x6EC0],
- ["DE51",0x6EC1],
- ["B7BC",0x6EC2],
- ["DE5B",0x6EC3],
- ["B7C9",0x6EC4],
- ["B7C0",0x6EC5],
- ["DE4E",0x6EC6],
- ["B7BF",0x6EC7],
- ["DE45",0x6EC8],
- ["DE53",0x6EC9],
- ["DE67",0x6ECA],
- ["B4FE",0x6ECB],
- ["BAB0",0x6ECC],
- ["DE56",0x6ECD],
- ["E26C",0x6ECE],
- ["DE58",0x6ECF],
- ["DE66",0x6ED0],
- ["B7C6",0x6ED1],
- ["DE4F",0x6ED2],
- ["B7BA",0x6ED3],
- ["B7CA",0x6ED4],
- ["BCF0",0x6ED5],
- ["DE44",0x6ED6],
- ["DE5D",0x6ED8],
- ["FAC0",0x6ED9],
- ["8DE5",0x6EDA],
- ["FA64",0x6EDB],
- ["DE5C",0x6EDC],
- ["8947",0x6EDD],
- ["8DE4",0x6EE2],
- ["8DE7",0x6EE8],
- ["8DE8",0x6EE9],
- ["E2AA",0x6EEB],
- ["BAAD",0x6EEC],
- ["E27D",0x6EED],
- ["E2A4",0x6EEE],
- ["BAA2",0x6EEF],
- ["E26E",0x6EF1],
- ["BAAF",0x6EF2],
- ["BA77",0x6EF4],
- ["E26D",0x6EF5],
- ["E2B0",0x6EF6],
- ["BAB1",0x6EF7],
- ["E271",0x6EF8],
- ["E2A3",0x6EF9],
- ["FDC7",0x6EFA],
- ["E273",0x6EFB],
- ["E2B3",0x6EFC],
- ["E2AF",0x6EFD],
- ["BA75",0x6EFE],
- ["BAA1",0x6EFF],
- ["E653",0x6F00],
- ["BAAE",0x6F01],
- ["BA7D",0x6F02],
- ["E26F",0x6F03],
- ["FDB0",0x6F04],
- ["E2AE",0x6F05],
- ["BAA3",0x6F06],
- ["E2AB",0x6F07],
- ["E2B8",0x6F08],
- ["E275",0x6F09],
- ["E27E",0x6F0A],
- ["9445",0x6F0B],
- ["97D6",0x6F0C],
- ["E2B6",0x6F0D],
- ["E2AC",0x6F0E],
- ["BA7C",0x6F0F],
- ["E27C",0x6F12],
- ["BA76",0x6F13],
- ["BA74",0x6F14],
- ["BAA8",0x6F15],
- ["FCC6",0x6F16],
- ["9844",0x6F17],
- ["E27A",0x6F18],
- ["E277",0x6F19],
- ["E278",0x6F1A],
- ["E2B2",0x6F1C],
- ["E2B7",0x6F1E],
- ["E2B5",0x6F1F],
- ["BA7A",0x6F20],
- ["E2B9",0x6F21],
- ["BA7E",0x6F22],
- ["BAA7",0x6F23],
- ["8DE9",0x6F24],
- ["E270",0x6F25],
- ["E5FA",0x6F26],
- ["E279",0x6F27],
- ["BA78",0x6F29],
- ["BAAC",0x6F2A],
- ["BAA9",0x6F2B],
- ["BA7B",0x6F2C],
- ["E2A5",0x6F2D],
- ["E274",0x6F2E],
- ["BAAA",0x6F2F],
- ["E2A7",0x6F30],
- ["BAA4",0x6F31],
- ["BAA6",0x6F32],
- ["BA73",0x6F33],
- ["8DEA",0x6F34],
- ["E2A9",0x6F35],
- ["E2A1",0x6F36],
- ["E272",0x6F37],
- ["BAA5",0x6F38],
- ["E2B1",0x6F39],
- ["E2B4",0x6F3A],
- ["E27B",0x6F3B],
- ["E2A8",0x6F3C],
- ["FE50",0x6F3D],
- ["BA79",0x6F3E],
- ["BCDF",0x6F3F],
- ["E2A6",0x6F40],
- ["E5F9",0x6F41],
- ["E2AD",0x6F43],
- ["FDCC",0x6F44],
- ["E276",0x6F4E],
- ["E644",0x6F4F],
- ["E64E",0x6F50],
- ["BCE2",0x6F51],
- ["E64D",0x6F52],
- ["E659",0x6F53],
- ["BCE4",0x6F54],
- ["E64B",0x6F55],
- ["9DA7",0x6F56],
- ["E64F",0x6F57],
- ["BCEF",0x6F58],
- ["E646",0x6F5A],
- ["BCE7",0x6F5B],
- ["FDCD",0x6F5C],
- ["E652",0x6F5D],
- ["E9F0",0x6F5E],
- ["BCF3",0x6F5F],
- ["BCF2",0x6F60],
- ["E654",0x6F61],
- ["E643",0x6F62],
- ["E65E",0x6F63],
- ["BCED",0x6F64],
- ["BCE3",0x6F66],
- ["E657",0x6F67],
- ["E65B",0x6F69],
- ["E660",0x6F6A],
- ["E655",0x6F6B],
- ["E649",0x6F6C],
- ["BCE6",0x6F6D],
- ["BCE9",0x6F6E],
- ["BCF1",0x6F6F],
- ["BCEC",0x6F70],
- ["E64C",0x6F72],
- ["E2A2",0x6F73],
- ["FDCF",0x6F74],
- ["E648",0x6F76],
- ["E65F",0x6F77],
- ["BCE8",0x6F78],
- ["95D2",0x6F79],
- ["BCEB",0x6F7A],
- ["E661",0x6F7B],
- ["BCE0",0x6F7C],
- ["E656",0x6F7D],
- ["E5FB",0x6F7E],
- ["E65C",0x6F7F],
- ["C0DF",0x6F80],
- ["8DED",0x6F81],
- ["E64A",0x6F82],
- ["BCE1",0x6F84],
- ["E645",0x6F85],
- ["BCE5",0x6F86],
- ["E5FC",0x6F87],
- ["BAAB",0x6F88],
- ["E641",0x6F89],
- ["FCBA",0x6F8A],
- ["E65A",0x6F8B],
- ["E642",0x6F8C],
- ["E640",0x6F8D],
- ["BCEA",0x6F8E],
- ["E658",0x6F90],
- ["E5FE",0x6F92],
- ["E651",0x6F93],
- ["E650",0x6F94],
- ["E65D",0x6F95],
- ["E647",0x6F96],
- ["BCEE",0x6F97],
- ["FDC5",0x6F9D],
- ["E9F3",0x6F9E],
- ["FDD2",0x6F9F],
- ["BF49",0x6FA0],
- ["BEFE",0x6FA1],
- ["EA40",0x6FA2],
- ["E9EB",0x6FA3],
- ["BF41",0x6FA4],
- ["E9F7",0x6FA5],
- ["BF48",0x6FA6],
- ["BF43",0x6FA7],
- ["E9F5",0x6FA8],
- ["ED4F",0x6FA9],
- ["E9FB",0x6FAA],
- ["EA42",0x6FAB],
- ["E9FA",0x6FAC],
- ["E9E9",0x6FAD],
- ["E9F8",0x6FAE],
- ["EA44",0x6FAF],
- ["EA46",0x6FB0],
- ["BEFD",0x6FB1],
- ["EA45",0x6FB2],
- ["BF44",0x6FB3],
- ["BF4A",0x6FB4],
- ["9CDC",0x6FB5],
- ["BF47",0x6FB6],
- ["E9FE",0x6FB8],
- ["BF46",0x6FB9],
- ["E9F9",0x6FBA],
- ["95CF",0x6FBB],
- ["E9ED",0x6FBC],
- ["E9F2",0x6FBD],
- ["8DEE",0x6FBE],
- ["E9FD",0x6FBF],
- ["BF45",0x6FC0],
- ["BF42",0x6FC1],
- ["BEFC",0x6FC2],
- ["BF40",0x6FC3],
- ["E9F1",0x6FC4],
- ["E5FD",0x6FC6],
- ["E9EC",0x6FC7],
- ["E9EF",0x6FC8],
- ["EA41",0x6FC9],
- ["E9F4",0x6FCA],
- ["E9EA",0x6FCB],
- ["ED4E",0x6FCC],
- ["EA43",0x6FCD],
- ["E9EE",0x6FCE],
- ["E9FC",0x6FCF],
- ["FDD4",0x6FD3],
- ["ED51",0x6FD4],
- ["C0E3",0x6FD5],
- ["C0D7",0x6FD8],
- ["96EC",0x6FD9],
- ["96EB",0x6FDA],
- ["C0DB",0x6FDB],
- ["ED53",0x6FDC],
- ["ED59",0x6FDD],
- ["ED57",0x6FDE],
- ["C0D9",0x6FDF],
- ["C0DA",0x6FE0],
- ["C0E1",0x6FE1],
- ["ED5A",0x6FE2],
- ["ED52",0x6FE3],
- ["C0DC",0x6FE4],
- ["ED56",0x6FE6],
- ["ED55",0x6FE7],
- ["ED5B",0x6FE8],
- ["C0E2",0x6FE9],
- ["C0DD",0x6FEB],
- ["C0E0",0x6FEC],
- ["ED54",0x6FED],
- ["C0E4",0x6FEE],
- ["C0DE",0x6FEF],
- ["C0E5",0x6FF0],
- ["C0D8",0x6FF1],
- ["ED58",0x6FF2],
- ["ED50",0x6FF4],
- ["90B6",0x6FF6],
- ["EFF7",0x6FF7],
- ["FDC3",0x6FF8],
- ["C271",0x6FFA],
- ["EFF4",0x6FFB],
- ["EFF6",0x6FFC],
- ["C26F",0x6FFE],
- ["EFF2",0x6FFF],
- ["EFF3",0x7000],
- ["EFEE",0x7001],
- ["98AB",0x7003],
- ["E9F6",0x7004],
- ["EFEF",0x7005],
- ["C270",0x7006],
- ["EFEB",0x7007],
- ["C26D",0x7009],
- ["EFF8",0x700A],
- ["C26E",0x700B],
- ["EFEC",0x700C],
- ["EFED",0x700D],
- ["EFF1",0x700E],
- ["C273",0x700F],
- ["C272",0x7011],
- ["EFF0",0x7014],
- ["C378",0x7015],
- ["F25F",0x7016],
- ["F265",0x7017],
- ["C379",0x7018],
- ["F25C",0x7019],
- ["C376",0x701A],
- ["C373",0x701B],
- ["F267",0x701C],
- ["C377",0x701D],
- ["96EE",0x701E],
- ["C374",0x701F],
- ["F25E",0x7020],
- ["F261",0x7021],
- ["F262",0x7022],
- ["F263",0x7023],
- ["F266",0x7024],
- ["EFF5",0x7026],
- ["F25D",0x7027],
- ["C375",0x7028],
- ["F264",0x7029],
- ["F268",0x702A],
- ["F260",0x702B],
- ["8DF4",0x702C],
- ["F45D",0x702F],
- ["C46A",0x7030],
- ["F460",0x7031],
- ["C46B",0x7032],
- ["F468",0x7033],
- ["F45F",0x7034],
- ["F45C",0x7035],
- ["F45E",0x7037],
- ["F462",0x7038],
- ["F465",0x7039],
- ["F464",0x703A],
- ["F467",0x703B],
- ["F45B",0x703C],
- ["C469",0x703E],
- ["F463",0x703F],
- ["F466",0x7040],
- ["F469",0x7041],
- ["F461",0x7042],
- ["F5D3",0x7043],
- ["F5D4",0x7044],
- ["F5D8",0x7045],
- ["F5D9",0x7046],
- ["F5D6",0x7048],
- ["F5D7",0x7049],
- ["F5D5",0x704A],
- ["FDE0",0x704B],
- ["C4E9",0x704C],
- ["8C67",0x704D],
- ["8DF6",0x7050],
- ["C578",0x7051],
- ["F6EB",0x7052],
- ["8DF7",0x7054],
- ["F6E8",0x7055],
- ["F6E9",0x7056],
- ["F6EA",0x7057],
- ["C579",0x7058],
- ["F7E5",0x705A],
- ["F7E4",0x705B],
- ["8FFA",0x705C],
- ["F8AF",0x705D],
- ["C5F4",0x705E],
- ["F8AD",0x705F],
- ["F8B0",0x7060],
- ["F8AE",0x7061],
- ["F8F5",0x7062],
- ["C657",0x7063],
- ["C665",0x7064],
- ["F9A3",0x7065],
- ["F96C",0x7066],
- ["97D0",0x7067],
- ["F9A2",0x7068],
- ["F9D0",0x7069],
- ["F9D1",0x706A],
- ["A4F5",0x706B],
- ["8BD2",0x706C],
- ["8DF8",0x706F],
- ["A6C7",0x7070],
- ["CA41",0x7071],
- ["CB5E",0x7074],
- ["90D9",0x7075],
- ["A85F",0x7076],
- ["8C47",0x7077],
- ["A862",0x7078],
- ["FAF0",0x7079],
- ["CB5F",0x707A],
- ["A860",0x707C],
- ["A861",0x707D],
- ["FDE1",0x707E],
- ["8DF9",0x707F],
- ["FDE3",0x7081],
- ["CD58",0x7082],
- ["CD5A",0x7083],
- ["CD55",0x7084],
- ["CD52",0x7085],
- ["CD54",0x7086],
- ["8DFA",0x7089],
- ["AAA4",0x708A],
- ["FB63",0x708B],
- ["AAA2",0x708E],
- ["90A6",0x708F],
- ["CD56",0x7091],
- ["AAA3",0x7092],
- ["CD53",0x7093],
- ["CD50",0x7094],
- ["AAA1",0x7095],
- ["CD57",0x7096],
- ["CD51",0x7098],
- ["AAA5",0x7099],
- ["CD59",0x709A],
- ["CFAF",0x709F],
- ["9970",0x70A0],
- ["CFB3",0x70A1],
- ["91EB",0x70A3],
- ["ACB7",0x70A4],
- ["9770",0x70A5],
- ["986F",0x70A6],
- ["FDE2",0x70A7],
- ["CFB6",0x70A9],
- ["ACAF",0x70AB],
- ["ACB2",0x70AC],
- ["ACB4",0x70AD],
- ["ACB6",0x70AE],
- ["ACB3",0x70AF],
- ["CFB2",0x70B0],
- ["CFB1",0x70B1],
- ["ACB1",0x70B3],
- ["CFB4",0x70B4],
- ["CFB5",0x70B5],
- ["CFAE",0x70B7],
- ["ACB5",0x70B8],
- ["98F2",0x70B9],
- ["ACB0",0x70BA],
- ["9AFC",0x70BB],
- ["896C",0x70BC],
- ["FDFD",0x70BD],
- ["CFB0",0x70BE],
- ["995E",0x70C0],
- ["95BD",0x70C4],
- ["D277",0x70C5],
- ["D278",0x70C6],
- ["D279",0x70C7],
- ["AF50",0x70C8],
- ["AF4C",0x70CA],
- ["D26E",0x70CB],
- ["FDE4",0x70CC],
- ["D276",0x70CD],
- ["D27B",0x70CE],
- ["AF51",0x70CF],
- ["91E6",0x70D0],
- ["D26C",0x70D1],
- ["D272",0x70D2],
- ["D26B",0x70D3],
- ["D275",0x70D4],
- ["FDE5",0x70D5],
- ["FDE6",0x70D6],
- ["D271",0x70D7],
- ["AF4D",0x70D8],
- ["AF4F",0x70D9],
- ["D27A",0x70DA],
- ["D26A",0x70DC],
- ["D26D",0x70DD],
- ["D273",0x70DE],
- ["FDE7",0x70DF],
- ["D274",0x70E0],
- ["D27C",0x70E1],
- ["D270",0x70E2],
- ["AF4E",0x70E4],
- ["B26D",0x70EF],
- ["D64E",0x70F0],
- ["9454",0x70F1],
- ["D650",0x70F3],
- ["D64C",0x70F4],
- ["99B8",0x70F5],
- ["D658",0x70F6],
- ["D64A",0x70F7],
- ["D657",0x70F8],
- ["B269",0x70F9],
- ["D648",0x70FA],
- ["DA5B",0x70FB],
- ["D652",0x70FC],
- ["B26C",0x70FD],
- ["97E9",0x70FE],
- ["D653",0x70FF],
- ["D656",0x7100],
- ["D65A",0x7102],
- ["D64F",0x7104],
- ["9346",0x7105],
- ["D654",0x7106],
- ["B26A",0x7109],
- ["B26B",0x710A],
- ["D659",0x710B],
- ["D64D",0x710C],
- ["D649",0x710D],
- ["D65B",0x710E],
- ["D651",0x7110],
- ["D655",0x7113],
- ["D64B",0x7117],
- ["B548",0x7119],
- ["B549",0x711A],
- ["DA65",0x711B],
- ["B54F",0x711C],
- ["9863",0x711D],
- ["DA59",0x711E],
- ["DA62",0x711F],
- ["DA58",0x7120],
- ["B54C",0x7121],
- ["DA60",0x7122],
- ["DA5E",0x7123],
- ["DA5F",0x7125],
- ["B54A",0x7126],
- ["DA63",0x7128],
- ["95BC",0x7129],
- ["FDED",0x712B],
- ["FDF7",0x712C],
- ["DA5C",0x712E],
- ["DA5A",0x712F],
- ["B54B",0x7130],
- ["DA5D",0x7131],
- ["DA61",0x7132],
- ["9870",0x7133],
- ["96F6",0x7134],
- ["8EA9",0x7135],
- ["B54D",0x7136],
- ["DA64",0x713A],
- ["9451",0x713B],
- ["8E43",0x713E],
- ["8B5A",0x7140],
- ["DE70",0x7141],
- ["DE77",0x7142],
- ["DE79",0x7143],
- ["DEA1",0x7144],
- ["FDEE",0x7145],
- ["B7DA",0x7146],
- ["DE6B",0x7147],
- ["B7D2",0x7149],
- ["FDF0",0x714A],
- ["DE7A",0x714B],
- ["B7D7",0x714C],
- ["DEA2",0x714D],
- ["B7CE",0x714E],
- ["FDF4",0x714F],
- ["DE7D",0x7150],
- ["9BF5",0x7151],
- ["DE6D",0x7152],
- ["DE7E",0x7153],
- ["DE6C",0x7154],
- ["B7DC",0x7156],
- ["8CEE",0x7157],
- ["DE78",0x7158],
- ["B7CF",0x7159],
- ["DEA3",0x715A],
- ["B7D4",0x715C],
- ["DE71",0x715D],
- ["B7D9",0x715E],
- ["DE7C",0x715F],
- ["DE6F",0x7160],
- ["DE76",0x7161],
- ["DE72",0x7162],
- ["DE6E",0x7163],
- ["B7D1",0x7164],
- ["B7D8",0x7165],
- ["B7D6",0x7166],
- ["B7D3",0x7167],
- ["B7DB",0x7168],
- ["B7D0",0x7169],
- ["DE75",0x716A],
- ["977E",0x716B],
- ["B7D5",0x716C],
- ["B54E",0x716E],
- ["DE7B",0x7170],
- ["9BD5",0x7171],
- ["DE73",0x7172],
- ["9AC3",0x7173],
- ["97C8",0x7175],
- ["A0DB",0x7176],
- ["91D0",0x7177],
- ["DE74",0x7178],
- ["9FE4",0x717A],
- ["E2C1",0x717B],
- ["8FDD",0x717C],
- ["BAB4",0x717D],
- ["91E9",0x717E],
- ["E2BD",0x7180],
- ["E2C3",0x7181],
- ["E2BF",0x7182],
- ["BAB6",0x7184],
- ["E2BE",0x7185],
- ["E2C2",0x7186],
- ["E2BA",0x7187],
- ["98E0",0x7188],
- ["E2BC",0x7189],
- ["BAB5",0x718A],
- ["92CA",0x718C],
- ["9857",0x718E],
- ["E2C0",0x718F],
- ["E2BB",0x7190],
- ["8C51",0x7191],
- ["BAB7",0x7192],
- ["BAB2",0x7194],
- ["FDEB",0x7196],
- ["E2C4",0x7197],
- ["9B49",0x7198],
- ["BAB3",0x7199],
- ["E667",0x719A],
- ["E664",0x719B],
- ["E670",0x719C],
- ["E66A",0x719D],
- ["E66C",0x719E],
- ["BCF4",0x719F],
- ["E666",0x71A0],
- ["E66E",0x71A1],
- ["9D76",0x71A2],
- ["9EAF",0x71A3],
- ["E66D",0x71A4],
- ["E66B",0x71A5],
- ["E671",0x71A7],
- ["BCF7",0x71A8],
- ["E668",0x71A9],
- ["E66F",0x71AA],
- ["BCF5",0x71AC],
- ["9CCC",0x71AD],
- ["E663",0x71AF],
- ["E665",0x71B0],
- ["BCF6",0x71B1],
- ["E662",0x71B2],
- ["E672",0x71B3],
- ["FDEA",0x71B4],
- ["E669",0x71B5],
- ["8DF1",0x71B7],
- ["EA4A",0x71B8],
- ["BF51",0x71B9],
- ["FDFB",0x71BA],
- ["EA55",0x71BC],
- ["EA53",0x71BD],
- ["BF4B",0x71BE],
- ["EA49",0x71BF],
- ["EA4C",0x71C0],
- ["EA4D",0x71C1],
- ["EA48",0x71C2],
- ["BF55",0x71C3],
- ["BF56",0x71C4],
- ["EA47",0x71C5],
- ["EA56",0x71C6],
- ["EA51",0x71C7],
- ["BF4F",0x71C8],
- ["BF4C",0x71C9],
- ["EA50",0x71CA],
- ["EA4E",0x71CB],
- ["BF52",0x71CE],
- ["EA52",0x71CF],
- ["BF4D",0x71D0],
- ["8E53",0x71D1],
- ["BF4E",0x71D2],
- ["EA4F",0x71D4],
- ["BF50",0x71D5],
- ["EA4B",0x71D6],
- ["EA54",0x71D8],
- ["BF53",0x71D9],
- ["EA57",0x71DA],
- ["EA58",0x71DB],
- ["BF54",0x71DC],
- ["FACF",0x71DD],
- ["C0E7",0x71DF],
- ["C0EE",0x71E0],
- ["ED5C",0x71E1],
- ["ED62",0x71E2],
- ["ED60",0x71E4],
- ["C0EA",0x71E5],
- ["C0E9",0x71E6],
- ["C0E6",0x71E7],
- ["ED5E",0x71E8],
- ["96F9",0x71EB],
- ["C0EC",0x71EC],
- ["C0EB",0x71ED],
- ["C0E8",0x71EE],
- ["ED61",0x71F0],
- ["ED5D",0x71F1],
- ["ED5F",0x71F2],
- ["C0ED",0x71F4],
- ["98BF",0x71F5],
- ["9E49",0x71F6],
- ["C277",0x71F8],
- ["EFFB",0x71F9],
- ["C274",0x71FB],
- ["C275",0x71FC],
- ["EFFD",0x71FD],
- ["C276",0x71FE],
- ["EFFA",0x71FF],
- ["8CA7",0x7200],
- ["EFF9",0x7201],
- ["F26C",0x7202],
- ["EFFC",0x7203],
- ["F26D",0x7205],
- ["C37A",0x7206],
- ["F26B",0x7207],
- ["9BCA",0x7209],
- ["F26A",0x720A],
- ["F269",0x720C],
- ["C37B",0x720D],
- ["FDFE",0x720E],
- ["92DC",0x720F],
- ["C46C",0x7210],
- ["F46A",0x7213],
- ["F46B",0x7214],
- ["FE41",0x7215],
- ["91CC",0x7216],
- ["91E2",0x7217],
- ["F5DC",0x7219],
- ["F5DB",0x721A],
- ["C4EA",0x721B],
- ["F5DA",0x721D],
- ["F6EC",0x721E],
- ["F6ED",0x721F],
- ["F7E6",0x7222],
- ["F8B1",0x7223],
- ["FE44",0x7224],
- ["875F",0x7225],
- ["F8F6",0x7226],
- ["F9BC",0x7227],
- ["C679",0x7228],
- ["F9C6",0x7229],
- ["A4F6",0x722A],
- ["8BD3",0x722B],
- ["AAA6",0x722C],
- ["AAA7",0x722D],
- ["FE47",0x722E],
- ["ACB8",0x7230],
- ["C0EF",0x7235],
- ["A4F7",0x7236],
- ["AAA8",0x7238],
- ["AF52",0x7239],
- ["B7DD",0x723A],
- ["A4F8",0x723B],
- ["B26E",0x723D],
- ["BAB8",0x723E],
- ["C962",0x723F],
- ["FE48",0x7240],
- ["CFB7",0x7241],
- ["D27D",0x7242],
- ["E2C5",0x7244],
- ["C0F0",0x7246],
- ["A4F9",0x7247],
- ["AAA9",0x7248],
- ["CFB8",0x7249],
- ["CFB9",0x724A],
- ["DA66",0x724B],
- ["B550",0x724C],
- ["DEA4",0x724F],
- ["9455",0x7250],
- ["B7DE",0x7252],
- ["E2C6",0x7253],
- ["FE4B",0x7255],
- ["BCF8",0x7256],
- ["FE4C",0x7257],
- ["C37C",0x7258],
- ["A4FA",0x7259],
- ["DA67",0x725A],
- ["A4FB",0x725B],
- ["8DBF",0x725C],
- ["A6C9",0x725D],
- ["CA42",0x725E],
- ["A6C8",0x725F],
- ["A865",0x7260],
- ["A864",0x7261],
- ["A863",0x7262],
- ["CB60",0x7263],
- ["9E78",0x7266],
- ["AAAA",0x7267],
- ["AAAB",0x7269],
- ["CD5B",0x726A],
- ["CFBA",0x726C],
- ["CFBD",0x726E],
- ["ACBA",0x726F],
- ["CFBB",0x7270],
- ["ACB9",0x7272],
- ["CFBC",0x7273],
- ["ACBB",0x7274],
- ["D2A2",0x7276],
- ["D2A1",0x7277],
- ["D27E",0x7278],
- ["AF53",0x7279],
- ["D65D",0x727B],
- ["D65E",0x727C],
- ["B26F",0x727D],
- ["D65C",0x727E],
- ["D65F",0x727F],
- ["B552",0x7280],
- ["B270",0x7281],
- ["FE51",0x7282],
- ["B551",0x7284],
- ["DA6B",0x7285],
- ["DA6A",0x7286],
- ["9456",0x7287],
- ["DA68",0x7288],
- ["DA69",0x7289],
- ["DA6C",0x728B],
- ["DEA6",0x728C],
- ["DEA5",0x728D],
- ["DEA9",0x728E],
- ["9D61",0x728F],
- ["DEA8",0x7290],
- ["DEA7",0x7291],
- ["BAB9",0x7292],
- ["E2C9",0x7293],
- ["9457",0x7294],
- ["E2C8",0x7295],
- ["BABA",0x7296],
- ["E2C7",0x7297],
- ["E673",0x7298],
- ["E674",0x729A],
- ["BCF9",0x729B],
- ["EA59",0x729D],
- ["EA5A",0x729E],
- ["9966",0x729F],
- ["F272",0x72A1],
- ["C37D",0x72A2],
- ["F271",0x72A3],
- ["F270",0x72A4],
- ["F26E",0x72A5],
- ["F26F",0x72A6],
- ["C4EB",0x72A7],
- ["F46C",0x72A8],
- ["F6EE",0x72A9],
- ["F8F7",0x72AA],
- ["A4FC",0x72AC],
- ["8BD5",0x72AD],
- ["C9A5",0x72AE],
- ["A5C7",0x72AF],
- ["C9A6",0x72B0],
- ["A069",0x72B2],
- ["CA43",0x72B4],
- ["CA44",0x72B5],
- ["CB66",0x72BA],
- ["CB62",0x72BD],
- ["CB61",0x72BF],
- ["AAAC",0x72C0],
- ["CB65",0x72C1],
- ["A867",0x72C2],
- ["CB63",0x72C3],
- ["A866",0x72C4],
- ["CB67",0x72C5],
- ["CB64",0x72C6],
- ["CD5F",0x72C9],
- ["CFBE",0x72CA],
- ["CD5D",0x72CB],
- ["CD64",0x72CC],
- ["98B4",0x72CD],
- ["AAAD",0x72CE],
- ["AAB0",0x72D0],
- ["CD65",0x72D1],
- ["CD61",0x72D2],
- ["CD62",0x72D4],
- ["CD5C",0x72D6],
- ["AAAF",0x72D7],
- ["CD5E",0x72D8],
- ["AAAE",0x72D9],
- ["CD63",0x72DA],
- ["CD60",0x72DC],
- ["CFC2",0x72DF],
- ["ACBD",0x72E0],
- ["ACBE",0x72E1],
- ["A049",0x72E2],
- ["CFC5",0x72E3],
- ["CFBF",0x72E4],
- ["CFC4",0x72E6],
- ["CFC0",0x72E8],
- ["ACBC",0x72E9],
- ["CFC3",0x72EA],
- ["CFC1",0x72EB],
- ["D2A8",0x72F3],
- ["D2A5",0x72F4],
- ["D2A7",0x72F6],
- ["AF58",0x72F7],
- ["AF57",0x72F8],
- ["AF55",0x72F9],
- ["D2A4",0x72FA],
- ["D2A9",0x72FB],
- ["AF54",0x72FC],
- ["AF56",0x72FD],
- ["D2A6",0x72FE],
- ["D667",0x72FF],
- ["D2A3",0x7300],
- ["D2AA",0x7301],
- ["A04C",0x7302],
- ["9E65",0x7304],
- ["D662",0x7307],
- ["D666",0x7308],
- ["D665",0x730A],
- ["DA6E",0x730B],
- ["DA79",0x730C],
- ["D668",0x730F],
- ["98B5",0x7310],
- ["D663",0x7311],
- ["DA6D",0x7312],
- ["B274",0x7313],
- ["B273",0x7316],
- ["D661",0x7317],
- ["D664",0x7318],
- ["B275",0x7319],
- ["B272",0x731B],
- ["B271",0x731C],
- ["D660",0x731D],
- ["D669",0x731E],
- ["DA70",0x7322],
- ["DA77",0x7323],
- ["B554",0x7325],
- ["DA76",0x7326],
- ["DA73",0x7327],
- ["FE58",0x7328],
- ["B556",0x7329],
- ["9975",0x732A],
- ["FE53",0x732B],
- ["A065",0x732C],
- ["DA75",0x732D],
- ["FE59",0x732E],
- ["DA6F",0x7330],
- ["DA71",0x7331],
- ["DA74",0x7332],
- ["DA72",0x7333],
- ["B555",0x7334],
- ["DA78",0x7335],
- ["B553",0x7336],
- ["B7DF",0x7337],
- ["98B7",0x7338],
- ["98B8",0x7339],
- ["DEAD",0x733A],
- ["DEAC",0x733B],
- ["DEAA",0x733C],
- ["B7E2",0x733E],
- ["B7E1",0x733F],
- ["DEAE",0x7340],
- ["98BA",0x7341],
- ["DEAB",0x7342],
- ["E2CA",0x7343],
- ["BABB",0x7344],
- ["B7E0",0x7345],
- ["98BB",0x7348],
- ["DEB0",0x7349],
- ["DEAF",0x734A],
- ["E2CD",0x734C],
- ["E2CB",0x734D],
- ["BCFA",0x734E],
- ["9FBC",0x734F],
- ["BABC",0x7350],
- ["E2CC",0x7351],
- ["E676",0x7352],
- ["BCFB",0x7357],
- ["E675",0x7358],
- ["E67E",0x7359],
- ["E67D",0x735A],
- ["E67B",0x735B],
- ["E67A",0x735D],
- ["E677",0x735E],
- ["E678",0x735F],
- ["E679",0x7360],
- ["E67C",0x7361],
- ["E6A1",0x7362],
- ["EA5F",0x7365],
- ["EA5C",0x7366],
- ["EA5D",0x7367],
- ["BF57",0x7368],
- ["EA5B",0x7369],
- ["EA61",0x736A],
- ["EA60",0x736B],
- ["EA5E",0x736C],
- ["ED64",0x736E],
- ["ED65",0x736F],
- ["C0F1",0x7370],
- ["A04A",0x7371],
- ["C0F2",0x7372],
- ["ED63",0x7373],
- ["9EC7",0x7374],
- ["C279",0x7375],
- ["EFFE",0x7376],
- ["C278",0x7377],
- ["C37E",0x7378],
- ["C3A1",0x737A],
- ["C46D",0x737B],
- ["F46E",0x737C],
- ["F46D",0x737D],
- ["F5DD",0x737E],
- ["F6EF",0x737F],
- ["C57A",0x7380],
- ["F7E8",0x7381],
- ["F7E7",0x7382],
- ["F7E9",0x7383],
- ["A5C8",0x7384],
- ["CFC6",0x7385],
- ["AF59",0x7386],
- ["B276",0x7387],
- ["D66A",0x7388],
- ["A5C9",0x7389],
- ["C9A7",0x738A],
- ["A4FD",0x738B],
- ["8CA9",0x738C],
- ["CA45",0x738E],
- ["98AE",0x738F],
- ["CB6C",0x7392],
- ["CB6A",0x7393],
- ["CB6B",0x7394],
- ["CB68",0x7395],
- ["A868",0x7396],
- ["CB69",0x7397],
- ["92D6",0x7398],
- ["FAE1",0x739C],
- ["CD6D",0x739D],
- ["91D4",0x739E],
- ["AAB3",0x739F],
- ["CD6B",0x73A0],
- ["CD67",0x73A1],
- ["CD6A",0x73A2],
- ["CD66",0x73A4],
- ["AAB5",0x73A5],
- ["CD69",0x73A6],
- ["FADE",0x73A7],
- ["AAB2",0x73A8],
- ["AAB1",0x73A9],
- ["FE5B",0x73AA],
- ["AAB4",0x73AB],
- ["CD6C",0x73AC],
- ["CD68",0x73AD],
- ["ACC2",0x73B2],
- ["ACC5",0x73B3],
- ["CFCE",0x73B4],
- ["CFCD",0x73B5],
- ["CFCC",0x73B6],
- ["ACBF",0x73B7],
- ["CFD5",0x73B8],
- ["CFCB",0x73B9],
- ["8C53",0x73BA],
- ["ACC1",0x73BB],
- ["D2AF",0x73BC],
- ["CFD2",0x73BE],
- ["CFD0",0x73BF],
- ["ACC4",0x73C0],
- ["CFC8",0x73C2],
- ["CFD3",0x73C3],
- ["CFCA",0x73C5],
- ["CFD4",0x73C6],
- ["CFD1",0x73C7],
- ["CFC9",0x73C8],
- ["FE5E",0x73C9],
- ["ACC0",0x73CA],
- ["CFD6",0x73CB],
- ["CFC7",0x73CC],
- ["ACC3",0x73CD],
- ["FBD7",0x73CE],
- ["FE5A",0x73CF],
- ["94C5",0x73D0],
- ["D2B4",0x73D2],
- ["D2AB",0x73D3],
- ["D2B6",0x73D4],
- ["FACA",0x73D5],
- ["D2AE",0x73D6],
- ["D2B9",0x73D7],
- ["D2BA",0x73D8],
- ["D2AC",0x73D9],
- ["D2B8",0x73DA],
- ["D2B5",0x73DB],
- ["D2B3",0x73DC],
- ["D2B7",0x73DD],
- ["AF5F",0x73DE],
- ["AF5D",0x73E0],
- ["98C1",0x73E1],
- ["975C",0x73E2],
- ["D2B1",0x73E3],
- ["FE74",0x73E4],
- ["D2AD",0x73E5],
- ["9773",0x73E6],
- ["D2B0",0x73E7],
- ["D2BB",0x73E8],
- ["D2B2",0x73E9],
- ["AF5E",0x73EA],
- ["CFCF",0x73EB],
- ["AF5A",0x73ED],
- ["AF5C",0x73EE],
- ["FA46",0x73EF],
- ["9764",0x73F3],
- ["D678",0x73F4],
- ["D66D",0x73F5],
- ["D66B",0x73F6],
- ["FE68",0x73F7],
- ["D66C",0x73F8],
- ["964E",0x73F9],
- ["D673",0x73FA],
- ["9765",0x73FB],
- ["D674",0x73FC],
- ["D670",0x73FD],
- ["B27B",0x73FE],
- ["D675",0x73FF],
- ["D672",0x7400],
- ["D66F",0x7401],
- ["8C5A",0x7402],
- ["B279",0x7403],
- ["D66E",0x7404],
- ["B277",0x7405],
- ["B27A",0x7406],
- ["D671",0x7407],
- ["D679",0x7408],
- ["AF5B",0x7409],
- ["B278",0x740A],
- ["D677",0x740B],
- ["D676",0x740C],
- ["B27C",0x740D],
- ["89A1",0x7411],
- ["95FA",0x7412],
- ["92D4",0x7414],
- ["FE69",0x7415],
- ["DA7E",0x7416],
- ["FB45",0x7417],
- ["98C8",0x7419],
- ["DAA1",0x741A],
- ["B560",0x741B],
- ["90EF",0x741C],
- ["DAA7",0x741D],
- ["98C9",0x741E],
- ["98CA",0x741F],
- ["DAA9",0x7420],
- ["DAA2",0x7421],
- ["B55A",0x7422],
- ["DAA6",0x7423],
- ["DAA5",0x7424],
- ["B55B",0x7425],
- ["B561",0x7426],
- ["B562",0x7428],
- ["DAA8",0x7429],
- ["B558",0x742A],
- ["DA7D",0x742B],
- ["DA7B",0x742C],
- ["DAA3",0x742D],
- ["DA7A",0x742E],
- ["B55F",0x742F],
- ["DA7C",0x7430],
- ["DAA4",0x7431],
- ["DAAA",0x7432],
- ["B559",0x7433],
- ["B55E",0x7434],
- ["B55C",0x7435],
- ["B55D",0x7436],
- ["946D",0x7437],
- ["94B7",0x7438],
- ["FE6C",0x7439],
- ["B557",0x743A],
- ["946B",0x743C],
- ["B7E9",0x743F],
- ["DEB7",0x7440],
- ["B7E8",0x7441],
- ["DEBB",0x7442],
- ["92FC",0x7443],
- ["DEB1",0x7444],
- ["95EB",0x7445],
- ["DEBC",0x7446],
- ["FE73",0x7447],
- ["976E",0x7448],
- ["FE5F",0x7449],
- ["DEB2",0x744A],
- ["DEB3",0x744B],
- ["DEBD",0x744D],
- ["DEBA",0x744E],
- ["DEB8",0x744F],
- ["DEB9",0x7450],
- ["DEB5",0x7451],
- ["DEB4",0x7452],
- ["FDBD",0x7453],
- ["DEBE",0x7454],
- ["B7E5",0x7455],
- ["92D5",0x7456],
- ["DEB6",0x7457],
- ["B7EA",0x7459],
- ["B7E4",0x745A],
- ["B7EB",0x745B],
- ["B7EC",0x745C],
- ["FEB9",0x745D],
- ["B7E7",0x745E],
- ["B7E6",0x745F],
- ["FE71",0x7460],
- ["8778",0x7461],
- ["E2CE",0x7462],
- ["BABE",0x7463],
- ["BABD",0x7464],
- ["FBBB",0x7465],
- ["E2D3",0x7467],
- ["947A",0x7468],
- ["BCFC",0x7469],
- ["BABF",0x746A],
- ["95FB",0x746B],
- ["FE77",0x746C],
- ["BAC1",0x746D],
- ["E2D4",0x746E],
- ["B7E3",0x746F],
- ["BAC0",0x7470],
- ["E2D0",0x7471],
- ["E2D2",0x7472],
- ["E2CF",0x7473],
- ["FE79",0x7474],
- ["E2D1",0x7475],
- ["FE75",0x7476],
- ["E6AB",0x7479],
- ["945D",0x747A],
- ["E6AA",0x747C],
- ["E6A7",0x747D],
- ["BD40",0x747E],
- ["EA62",0x747F],
- ["BD41",0x7480],
- ["E6A6",0x7481],
- ["FE7C",0x7482],
- ["BCFE",0x7483],
- ["E6A8",0x7485],
- ["E6A5",0x7486],
- ["E6A2",0x7487],
- ["E6A9",0x7488],
- ["E6A3",0x7489],
- ["E6A4",0x748A],
- ["BCFD",0x748B],
- ["9344",0x748C],
- ["8EA6",0x748D],
- ["ED69",0x7490],
- ["EA66",0x7492],
- ["EA65",0x7494],
- ["EA67",0x7495],
- ["ED66",0x7497],
- ["BF5A",0x7498],
- ["92D3",0x7499],
- ["EA63",0x749A],
- ["94B8",0x749B],
- ["BF58",0x749C],
- ["8779",0x749D],
- ["BF5C",0x749E],
- ["BF5B",0x749F],
- ["EA64",0x74A0],
- ["EA68",0x74A1],
- ["BF59",0x74A3],
- ["FC71",0x74A4],
- ["ED6D",0x74A5],
- ["C0F5",0x74A6],
- ["C27A",0x74A7],
- ["C0F6",0x74A8],
- ["C0F3",0x74A9],
- ["ED6A",0x74AA],
- ["ED68",0x74AB],
- ["ED6B",0x74AD],
- ["ED6E",0x74AF],
- ["C0F4",0x74B0],
- ["ED6C",0x74B1],
- ["ED67",0x74B2],
- ["975E",0x74B4],
- ["F042",0x74B5],
- ["F045",0x74B6],
- ["F275",0x74B7],
- ["F040",0x74B8],
- ["8CAD",0x74B9],
- ["F46F",0x74BA],
- ["F046",0x74BB],
- ["C3A2",0x74BD],
- ["F044",0x74BE],
- ["C27B",0x74BF],
- ["F041",0x74C0],
- ["F043",0x74C1],
- ["F047",0x74C2],
- ["F276",0x74C3],
- ["F274",0x74C5],
- ["FEA7",0x74C8],
- ["C3A3",0x74CA],
- ["F273",0x74CB],
- ["946A",0x74CC],
- ["C46E",0x74CF],
- ["93E3",0x74D0],
- ["98CF",0x74D3],
- ["C4ED",0x74D4],
- ["F6F1",0x74D5],
- ["C4EC",0x74D6],
- ["F6F3",0x74D7],
- ["F6F0",0x74D8],
- ["F6F2",0x74D9],
- ["C5D0",0x74DA],
- ["F8B2",0x74DB],
- ["A5CA",0x74DC],
- ["CD6E",0x74DD],
- ["D2BC",0x74DE],
- ["D2BD",0x74DF],
- ["B27D",0x74E0],
- ["DEBF",0x74E1],
- ["BF5D",0x74E2],
- ["C3A4",0x74E3],
- ["C57B",0x74E4],
- ["F8B3",0x74E5],
- ["A5CB",0x74E6],
- ["A0D9",0x74E7],
- ["CD6F",0x74E8],
- ["A260",0x74E9],
- ["CFD7",0x74EC],
- ["CFD8",0x74EE],
- ["A0BF",0x74F0],
- ["A04D",0x74F1],
- ["A0B8",0x74F2],
- ["D2BE",0x74F4],
- ["D2BF",0x74F5],
- ["B27E",0x74F6],
- ["B2A1",0x74F7],
- ["A0CE",0x74F8],
- ["DAAB",0x74FB],
- ["DEC2",0x74FD],
- ["DEC1",0x74FE],
- ["DEC0",0x74FF],
- ["E2D5",0x7500],
- ["E2D6",0x7502],
- ["E2D7",0x7503],
- ["BAC2",0x7504],
- ["A0B7",0x7505],
- ["E6AD",0x7507],
- ["E6AC",0x7508],
- ["EA69",0x750B],
- ["BF5E",0x750C],
- ["BF5F",0x750D],
- ["FEA9",0x750E],
- ["ED72",0x750F],
- ["ED6F",0x7510],
- ["ED70",0x7511],
- ["ED71",0x7512],
- ["F049",0x7513],
- ["F048",0x7514],
- ["C27C",0x7515],
- ["F277",0x7516],
- ["F5DE",0x7517],
- ["A5CC",0x7518],
- ["89C3",0x7519],
- ["ACC6",0x751A],
- ["B2A2",0x751C],
- ["DEC3",0x751D],
- ["FEAB",0x751E],
- ["A5CD",0x751F],
- ["D2C0",0x7521],
- ["B2A3",0x7522],
- ["B563",0x7525],
- ["B564",0x7526],
- ["A5CE",0x7528],
- ["A5CF",0x7529],
- ["CA46",0x752A],
- ["A86A",0x752B],
- ["A869",0x752C],
- ["ACC7",0x752D],
- ["CFD9",0x752E],
- ["DAAC",0x752F],
- ["A5D0",0x7530],
- ["A5D1",0x7531],
- ["A5D2",0x7532],
- ["A5D3",0x7533],
- ["9DF4",0x7534],
- ["896D",0x7535],
- ["A86B",0x7537],
- ["A86C",0x7538],
- ["CB6E",0x7539],
- ["CB6D",0x753A],
- ["9C7B",0x753B],
- ["AAB6",0x753D],
- ["CD72",0x753E],
- ["CD70",0x753F],
- ["CD71",0x7540],
- ["98D2",0x7542],
- ["9FA9",0x7546],
- ["CFDA",0x7547],
- ["CFDB",0x7548],
- ["FEB2",0x754A],
- ["ACCB",0x754B],
- ["ACC9",0x754C],
- ["FEB1",0x754D],
- ["ACCA",0x754E],
- ["ACC8",0x754F],
- ["97D9",0x7551],
- ["A0C4",0x7553],
- ["AF60",0x7554],
- ["9476",0x7555],
- ["AF64",0x7559],
- ["AF63",0x755A],
- ["D2C1",0x755B],
- ["AF62",0x755C],
- ["AF61",0x755D],
- ["D2C2",0x755F],
- ["9978",0x7560],
- ["B2A6",0x7562],
- ["D67B",0x7563],
- ["D67A",0x7564],
- ["B2A4",0x7565],
- ["B2A5",0x7566],
- ["FEB3",0x7567],
- ["B566",0x756A],
- ["B565",0x756B],
- ["DAAE",0x756C],
- ["98D3",0x756D],
- ["FEB4",0x756E],
- ["DAAD",0x756F],
- ["B2A7",0x7570],
- ["98D4",0x7572],
- ["B7ED",0x7576],
- ["DEC5",0x7577],
- ["B7EE",0x7578],
- ["DEC4",0x7579],
- ["9FB9",0x757A],
- ["E2D8",0x757D],
- ["E6AE",0x757E],
- ["BD42",0x757F],
- ["EA6A",0x7580],
- ["9471",0x7583],
- ["ED73",0x7584],
- ["C3A6",0x7586],
- ["C3A5",0x7587],
- ["C57C",0x758A],
- ["A5D4",0x758B],
- ["CD73",0x758C],
- ["98D5",0x758D],
- ["FEB8",0x758E],
- ["B2A8",0x758F],
- ["E2D9",0x7590],
- ["BAC3",0x7591],
- ["C6D4",0x7592],
- ["CB6F",0x7594],
- ["CB70",0x7595],
- ["CD74",0x7598],
- ["AAB8",0x7599],
- ["AAB9",0x759A],
- ["AAB7",0x759D],
- ["FEBA",0x759E],
- ["ACCF",0x75A2],
- ["ACD0",0x75A3],
- ["ACCD",0x75A4],
- ["ACCE",0x75A5],
- ["CFDC",0x75A7],
- ["CFDD",0x75AA],
- ["ACCC",0x75AB],
- ["D2C3",0x75B0],
- ["9E5C",0x75B1],
- ["AF68",0x75B2],
- ["AF69",0x75B3],
- ["FEBB",0x75B4],
- ["B2AB",0x75B5],
- ["D2C9",0x75B6],
- ["AF6E",0x75B8],
- ["AF6C",0x75B9],
- ["D2CA",0x75BA],
- ["D2C5",0x75BB],
- ["AF6B",0x75BC],
- ["AF6A",0x75BD],
- ["AF65",0x75BE],
- ["D2C8",0x75BF],
- ["D2C7",0x75C0],
- ["D2C4",0x75C1],
- ["AF6D",0x75C2],
- ["A044",0x75C3],
- ["D2C6",0x75C4],
- ["AF66",0x75C5],
- ["AF67",0x75C7],
- ["98D7",0x75C8],
- ["B2AC",0x75CA],
- ["D6A1",0x75CB],
- ["D6A2",0x75CC],
- ["B2AD",0x75CD],
- ["D67C",0x75CE],
- ["D67E",0x75CF],
- ["D6A4",0x75D0],
- ["D6A3",0x75D1],
- ["D67D",0x75D2],
- ["B2A9",0x75D4],
- ["B2AA",0x75D5],
- ["DAB6",0x75D7],
- ["B56B",0x75D8],
- ["B56A",0x75D9],
- ["DAB0",0x75DA],
- ["B568",0x75DB],
- ["98D8",0x75DC],
- ["DAB3",0x75DD],
- ["B56C",0x75DE],
- ["DAB4",0x75DF],
- ["B56D",0x75E0],
- ["DAB1",0x75E1],
- ["B567",0x75E2],
- ["B569",0x75E3],
- ["DAB5",0x75E4],
- ["DAB2",0x75E6],
- ["DAAF",0x75E7],
- ["DED2",0x75ED],
- ["DEC7",0x75EF],
- ["B7F0",0x75F0],
- ["B7F3",0x75F1],
- ["B7F2",0x75F2],
- ["B7F7",0x75F3],
- ["B7F6",0x75F4],
- ["DED3",0x75F5],
- ["DED1",0x75F6],
- ["DECA",0x75F7],
- ["DECE",0x75F8],
- ["DECD",0x75F9],
- ["B7F4",0x75FA],
- ["DED0",0x75FB],
- ["DECC",0x75FC],
- ["DED4",0x75FD],
- ["DECB",0x75FE],
- ["B7F5",0x75FF],
- ["B7EF",0x7600],
- ["B7F1",0x7601],
- ["FEBC",0x7602],
- ["DEC9",0x7603],
- ["9FFE",0x7607],
- ["E2DB",0x7608],
- ["BAC7",0x7609],
- ["E2DF",0x760A],
- ["BAC6",0x760B],
- ["E2DC",0x760C],
- ["BAC5",0x760D],
- ["DEC8",0x760F],
- ["DECF",0x7610],
- ["E2DE",0x7611],
- ["BAC8",0x7613],
- ["E2E0",0x7614],
- ["E2DD",0x7615],
- ["E2DA",0x7616],
- ["E6B1",0x7619],
- ["E6B5",0x761A],
- ["E6B7",0x761B],
- ["E6B3",0x761C],
- ["E6B2",0x761D],
- ["E6B0",0x761E],
- ["BD45",0x761F],
- ["BD43",0x7620],
- ["BD48",0x7621],
- ["BD49",0x7622],
- ["E6B4",0x7623],
- ["BD46",0x7624],
- ["E6AF",0x7625],
- ["BD47",0x7626],
- ["BAC4",0x7627],
- ["E6B6",0x7628],
- ["BD44",0x7629],
- ["FEBD",0x762C],
- ["EA6C",0x762D],
- ["EA6B",0x762F],
- ["EA73",0x7630],
- ["EA6D",0x7631],
- ["EA72",0x7632],
- ["EA6F",0x7633],
- ["BF60",0x7634],
- ["EA71",0x7635],
- ["BF61",0x7638],
- ["BF62",0x763A],
- ["9DDD",0x763B],
- ["EA70",0x763C],
- ["EA6E",0x763D],
- ["9EE1",0x7640],
- ["C0F8",0x7642],
- ["ED74",0x7643],
- ["C0F7",0x7646],
- ["ED77",0x7647],
- ["ED75",0x7648],
- ["ED76",0x7649],
- ["C0F9",0x764C],
- ["98DA",0x764D],
- ["9DDF",0x764E],
- ["FEBF",0x764F],
- ["F04D",0x7650],
- ["FEBE",0x7651],
- ["C2A1",0x7652],
- ["F04E",0x7653],
- ["9EEB",0x7654],
- ["C27D",0x7656],
- ["F04F",0x7657],
- ["C27E",0x7658],
- ["F04C",0x7659],
- ["F050",0x765A],
- ["F04A",0x765C],
- ["C3A7",0x765F],
- ["F278",0x7660],
- ["C3A8",0x7661],
- ["C46F",0x7662],
- ["F04B",0x7664],
- ["C470",0x7665],
- ["9E59",0x7666],
- ["A05C",0x7667],
- ["C4EE",0x7669],
- ["F5DF",0x766A],
- ["C57E",0x766C],
- ["F6F4",0x766D],
- ["C57D",0x766E],
- ["FEC0",0x766F],
- ["F7EA",0x7670],
- ["C5F5",0x7671],
- ["C5F6",0x7672],
- ["9477",0x7673],
- ["98DC",0x7674],
- ["F9CC",0x7675],
- ["FEC1",0x7676],
- ["ACD1",0x7678],
- ["CFDE",0x7679],
- ["98DE",0x767A],
- ["B56E",0x767B],
- ["B56F",0x767C],
- ["A5D5",0x767D],
- ["A6CA",0x767E],
- ["CA47",0x767F],
- ["CB71",0x7681],
- ["A86D",0x7682],
- ["AABA",0x7684],
- ["ACD2",0x7686],
- ["ACD3",0x7687],
- ["ACD4",0x7688],
- ["D6A6",0x7689],
- ["D2CB",0x768A],
- ["AF6F",0x768B],
- ["B2AE",0x768E],
- ["D6A5",0x768F],
- ["FEC3",0x7690],
- ["DAB8",0x7692],
- ["B571",0x7693],
- ["DAB7",0x7695],
- ["B570",0x7696],
- ["DED5",0x7699],
- ["BD4A",0x769A],
- ["E6BB",0x769B],
- ["E6B8",0x769C],
- ["E6B9",0x769D],
- ["E6BA",0x769E],
- ["FEC8",0x76A1],
- ["ED78",0x76A4],
- ["FEC9",0x76A5],
- ["F051",0x76A6],
- ["F471",0x76AA],
- ["F470",0x76AB],
- ["F6F5",0x76AD],
- ["A5D6",0x76AE],
- ["CD75",0x76AF],
- ["AF70",0x76B0],
- ["B572",0x76B4],
- ["DED6",0x76B5],
- ["FECA",0x76B7],
- ["E2E1",0x76B8],
- ["BD4B",0x76BA],
- ["EA74",0x76BB],
- ["F052",0x76BD],
- ["F472",0x76BE],
- ["A5D7",0x76BF],
- ["AABB",0x76C2],
- ["ACD7",0x76C3],
- ["CFDF",0x76C4],
- ["ACD8",0x76C5],
- ["ACD6",0x76C6],
- ["ACD5",0x76C8],
- ["D2CC",0x76C9],
- ["AF71",0x76CA],
- ["FECB",0x76CC],
- ["AF72",0x76CD],
- ["AF73",0x76CE],
- ["B2B0",0x76D2],
- ["D6A7",0x76D3],
- ["B2AF",0x76D4],
- ["9FC2",0x76D6],
- ["8C6B",0x76D9],
- ["DAB9",0x76DA],
- ["B2B1",0x76DB],
- ["B573",0x76DC],
- ["DED7",0x76DD],
- ["B7F8",0x76DE],
- ["B7F9",0x76DF],
- ["BAC9",0x76E1],
- ["BACA",0x76E3],
- ["BD4C",0x76E4],
- ["BF64",0x76E5],
- ["EA75",0x76E6],
- ["BF63",0x76E7],
- ["ED79",0x76E9],
- ["C0FA",0x76EA],
- ["F053",0x76EC],
- ["F473",0x76ED],
- ["A5D8",0x76EE],
- ["A86E",0x76EF],
- ["CD78",0x76F0],
- ["CD77",0x76F1],
- ["AABC",0x76F2],
- ["CD76",0x76F3],
- ["AABD",0x76F4],
- ["CD79",0x76F5],
- ["CFE5",0x76F7],
- ["ACDB",0x76F8],
- ["ACDA",0x76F9],
- ["CFE7",0x76FA],
- ["CFE6",0x76FB],
- ["ACDF",0x76FC],
- ["ACDE",0x76FE],
- ["ACD9",0x7701],
- ["CFE1",0x7703],
- ["CFE2",0x7704],
- ["CFE3",0x7705],
- ["ACE0",0x7707],
- ["CFE0",0x7708],
- ["ACDC",0x7709],
- ["CFE4",0x770A],
- ["ACDD",0x770B],
- ["98C4",0x770C],
- ["94B0",0x770E],
- ["94B1",0x770F],
- ["D2CF",0x7710],
- ["D2D3",0x7711],
- ["D2D1",0x7712],
- ["D2D0",0x7713],
- ["D2D4",0x7715],
- ["D2D5",0x7719],
- ["D2D6",0x771A],
- ["D2CE",0x771B],
- ["D2CD",0x771D],
- ["FED1",0x771E],
- ["AF75",0x771F],
- ["AF76",0x7720],
- ["D2D7",0x7722],
- ["D2D2",0x7723],
- ["A0C1",0x7724],
- ["D6B0",0x7725],
- ["FED2",0x7726],
- ["D2D8",0x7727],
- ["AF77",0x7728],
- ["AF74",0x7729],
- ["A0CD",0x772B],
- ["D6AA",0x772D],
- ["D6A9",0x772F],
- ["D6AB",0x7731],
- ["D6AC",0x7732],
- ["D6AE",0x7733],
- ["D6AD",0x7734],
- ["D6B2",0x7735],
- ["B2B5",0x7736],
- ["B2B2",0x7737],
- ["B2B6",0x7738],
- ["D6A8",0x7739],
- ["B2B7",0x773A],
- ["D6B1",0x773B],
- ["B2B4",0x773C],
- ["D6AF",0x773D],
- ["B2B3",0x773E],
- ["FED3",0x7740],
- ["98E5",0x7743],
- ["DABC",0x7744],
- ["DABE",0x7745],
- ["DABA",0x7746],
- ["DABB",0x7747],
- ["DABF",0x774A],
- ["DAC1",0x774B],
- ["DAC2",0x774C],
- ["DABD",0x774D],
- ["DAC0",0x774E],
- ["B574",0x774F],
- ["DEDB",0x7752],
- ["DEE0",0x7754],
- ["DED8",0x7755],
- ["DEDC",0x7756],
- ["FED6",0x7758],
- ["DEE1",0x7759],
- ["DEDD",0x775A],
- ["B7FA",0x775B],
- ["B843",0x775C],
- ["B7FD",0x775E],
- ["DED9",0x775F],
- ["DEDA",0x7760],
- ["BACE",0x7761],
- ["B846",0x7762],
- ["B7FE",0x7763],
- ["B844",0x7765],
- ["B7FC",0x7766],
- ["DEDF",0x7767],
- ["B845",0x7768],
- ["DEDE",0x7769],
- ["B841",0x776A],
- ["B7FB",0x776B],
- ["B842",0x776C],
- ["DEE2",0x776D],
- ["E2E6",0x776E],
- ["E2E8",0x776F],
- ["91E4",0x7772],
- ["8FC7",0x7777],
- ["94AE",0x7778],
- ["B840",0x7779],
- ["8A4F",0x777A],
- ["94B2",0x777B],
- ["E2E3",0x777C],
- ["BACC",0x777D],
- ["E2E9",0x777E],
- ["BACD",0x777F],
- ["E2E7",0x7780],
- ["E2E2",0x7781],
- ["E2E5",0x7782],
- ["E2EA",0x7783],
- ["BACB",0x7784],
- ["E2E4",0x7785],
- ["BD4E",0x7787],
- ["E6BF",0x7788],
- ["E6BE",0x7789],
- ["BD51",0x778B],
- ["BD4F",0x778C],
- ["E6BC",0x778D],
- ["BD4D",0x778E],
- ["E6BD",0x778F],
- ["BD50",0x7791],
- ["8FD4",0x7793],
- ["EA7D",0x7795],
- ["EAA1",0x7797],
- ["98EA",0x7798],
- ["EA7E",0x7799],
- ["EA76",0x779A],
- ["EA7A",0x779B],
- ["EA79",0x779C],
- ["EA77",0x779D],
- ["BF66",0x779E],
- ["BF67",0x779F],
- ["BF65",0x77A0],
- ["EA78",0x77A1],
- ["EA7B",0x77A2],
- ["EA7C",0x77A3],
- ["BF68",0x77A5],
- ["C140",0x77A7],
- ["EDA3",0x77A8],
- ["C0FC",0x77AA],
- ["ED7B",0x77AB],
- ["C0FE",0x77AC],
- ["C141",0x77AD],
- ["FED8",0x77AF],
- ["C0FD",0x77B0],
- ["EDA2",0x77B1],
- ["ED7C",0x77B2],
- ["C0FB",0x77B3],
- ["EDA1",0x77B4],
- ["ED7A",0x77B5],
- ["ED7E",0x77B6],
- ["ED7D",0x77B7],
- ["9DE0",0x77B9],
- ["F055",0x77BA],
- ["C2A4",0x77BB],
- ["C2A5",0x77BC],
- ["C2A2",0x77BD],
- ["98EE",0x77BE],
- ["C2A3",0x77BF],
- ["F054",0x77C2],
- ["95C4",0x77C3],
- ["F27B",0x77C4],
- ["FCE8",0x77C5],
- ["C3A9",0x77C7],
- ["F279",0x77C9],
- ["F27A",0x77CA],
- ["98EF",0x77CB],
- ["F474",0x77CC],
- ["F477",0x77CD],
- ["F475",0x77CE],
- ["F476",0x77CF],
- ["F5E0",0x77D0],
- ["C4EF",0x77D3],
- ["F7EB",0x77D4],
- ["F8B4",0x77D5],
- ["C5F7",0x77D7],
- ["F8F8",0x77D8],
- ["F8F9",0x77D9],
- ["C666",0x77DA],
- ["A5D9",0x77DB],
- ["ACE1",0x77DC],
- ["8C6E",0x77DD],
- ["DAC3",0x77DE],
- ["DEE3",0x77E0],
- ["A5DA",0x77E2],
- ["A86F",0x77E3],
- ["AABE",0x77E5],
- ["FAD8",0x77E6],
- ["CFE8",0x77E7],
- ["CFE9",0x77E8],
- ["AF78",0x77E9],
- ["DAC4",0x77EC],
- ["B575",0x77ED],
- ["B847",0x77EE],
- ["C142",0x77EF],
- ["EDA4",0x77F0],
- ["F27C",0x77F1],
- ["F478",0x77F2],
- ["A5DB",0x77F3],
- ["FEDC",0x77F4],
- ["CDA1",0x77F7],
- ["CD7A",0x77F8],
- ["CD7C",0x77F9],
- ["CD7E",0x77FA],
- ["CD7D",0x77FB],
- ["CD7B",0x77FC],
- ["AABF",0x77FD],
- ["A0AE",0x77FE],
- ["ACE2",0x7802],
- ["CFF2",0x7803],
- ["CFED",0x7805],
- ["CFEA",0x7806],
- ["9D4C",0x7808],
- ["CFF1",0x7809],
- ["ACE4",0x780C],
- ["ACE5",0x780D],
- ["CFF0",0x780E],
- ["CFEF",0x780F],
- ["CFEE",0x7810],
- ["CFEB",0x7811],
- ["CFEC",0x7812],
- ["CFF3",0x7813],
- ["ACE3",0x7814],
- ["98F1",0x7818],
- ["98F3",0x781C],
- ["AF7C",0x781D],
- ["94C1",0x781E],
- ["AFA4",0x781F],
- ["AFA3",0x7820],
- ["D2E1",0x7821],
- ["D2DB",0x7822],
- ["D2D9",0x7823],
- ["AFA1",0x7825],
- ["D6B9",0x7826],
- ["AF7A",0x7827],
- ["D2DE",0x7828],
- ["D2E2",0x7829],
- ["D2E4",0x782A],
- ["D2E0",0x782B],
- ["D2DA",0x782C],
- ["AFA2",0x782D],
- ["D2DF",0x782E],
- ["D2DD",0x782F],
- ["AF79",0x7830],
- ["D2E5",0x7831],
- ["AFA5",0x7832],
- ["D2E3",0x7833],
- ["AF7D",0x7834],
- ["D2DC",0x7835],
- ["AF7E",0x7837],
- ["AF7B",0x7838],
- ["98F5",0x7839],
- ["FA4F",0x783C],
- ["96E2",0x783D],
- ["9450",0x7842],
- ["B2B9",0x7843],
- ["96A2",0x7844],
- ["D6BA",0x7845],
- ["98F6",0x7847],
- ["D6B3",0x7848],
- ["D6B5",0x7849],
- ["D6B7",0x784A],
- ["96E5",0x784B],
- ["D6B8",0x784C],
- ["D6B6",0x784D],
- ["B2BA",0x784E],
- ["D6BB",0x7850],
- ["98F7",0x7851],
- ["D6B4",0x7852],
- ["A046",0x7853],
- ["96E3",0x7854],
- ["DAC8",0x785C],
- ["B576",0x785D],
- ["DAD0",0x785E],
- ["DAC5",0x7860],
- ["DAD1",0x7862],
- ["DAC6",0x7864],
- ["DAC7",0x7865],
- ["98F8",0x7866],
- ["DACF",0x7868],
- ["DACE",0x7869],
- ["DACB",0x786A],
- ["B2B8",0x786B],
- ["B577",0x786C],
- ["DAC9",0x786D],
- ["DACC",0x786E],
- ["B578",0x786F],
- ["DACD",0x7870],
- ["DACA",0x7871],
- ["DEEE",0x7879],
- ["9EE4",0x787A],
- ["DEF2",0x787B],
- ["B84E",0x787C],
- ["E2F0",0x787E],
- ["B851",0x787F],
- ["DEF0",0x7880],
- ["F9D6",0x7881],
- ["DEED",0x7883],
- ["DEE8",0x7884],
- ["DEEA",0x7885],
- ["DEEB",0x7886],
- ["DEE4",0x7887],
- ["94C3",0x7888],
- ["B84D",0x7889],
- ["B84C",0x788C],
- ["94C2",0x788D],
- ["B848",0x788E],
- ["DEE7",0x788F],
- ["B84F",0x7891],
- ["B850",0x7893],
- ["DEE6",0x7894],
- ["DEE9",0x7895],
- ["DEF1",0x7896],
- ["B84A",0x7897],
- ["B84B",0x7898],
- ["DEEF",0x7899],
- ["DEE5",0x789A],
- ["E2F2",0x789E],
- ["BAD0",0x789F],
- ["E2F4",0x78A0],
- ["DEEC",0x78A1],
- ["E2F6",0x78A2],
- ["BAD4",0x78A3],
- ["E2F7",0x78A4],
- ["E2F3",0x78A5],
- ["BAD1",0x78A7],
- ["E2EF",0x78A8],
- ["BAD3",0x78A9],
- ["E2EC",0x78AA],
- ["E2F1",0x78AB],
- ["E2F5",0x78AC],
- ["E2EE",0x78AD],
- ["FEE1",0x78AF],
- ["B849",0x78B0],
- ["FEE9",0x78B1],
- ["E2EB",0x78B2],
- ["BAD2",0x78B3],
- ["E2ED",0x78B4],
- ["96E4",0x78B6],
- ["89AC",0x78B8],
- ["96DB",0x78B9],
- ["BD54",0x78BA],
- ["E6C1",0x78BB],
- ["BD58",0x78BC],
- ["BD56",0x78BE],
- ["BACF",0x78C1],
- ["E6C8",0x78C3],
- ["E6C9",0x78C4],
- ["BD53",0x78C5],
- ["FEE2",0x78C7],
- ["E6C7",0x78C8],
- ["E6CA",0x78C9],
- ["BD55",0x78CA],
- ["BD52",0x78CB],
- ["E6C3",0x78CC],
- ["E6C0",0x78CD],
- ["E6C5",0x78CE],
- ["E6C2",0x78CF],
- ["BD59",0x78D0],
- ["E6C4",0x78D1],
- ["94C4",0x78D2],
- ["FEE3",0x78D3],
- ["E6C6",0x78D4],
- ["BD57",0x78D5],
- ["FEE7",0x78D7],
- ["9FFB",0x78D8],
- ["BF6A",0x78DA],
- ["EAA8",0x78DB],
- ["EAA2",0x78DD],
- ["EAA6",0x78DE],
- ["EAAC",0x78DF],
- ["EAAD",0x78E0],
- ["EAA9",0x78E1],
- ["EAAA",0x78E2],
- ["EAA7",0x78E3],
- ["8C59",0x78E4],
- ["EAA4",0x78E5],
- ["BF6C",0x78E7],
- ["BF69",0x78E8],
- ["EAA3",0x78E9],
- ["EAA5",0x78EA],
- ["BF6B",0x78EC],
- ["EAAB",0x78ED],
- ["93C9",0x78EE],
- ["C146",0x78EF],
- ["94E8",0x78F0],
- ["FB56",0x78F1],
- ["EDAA",0x78F2],
- ["EDA5",0x78F3],
- ["C145",0x78F4],
- ["90C5",0x78F5],
- ["C143",0x78F7],
- ["EDAC",0x78F9],
- ["C144",0x78FA],
- ["EDA8",0x78FB],
- ["EDA9",0x78FC],
- ["EDA6",0x78FD],
- ["EDAD",0x78FE],
- ["F056",0x78FF],
- ["C147",0x7901],
- ["EDA7",0x7902],
- ["EDAE",0x7904],
- ["EDAB",0x7905],
- ["A0A8",0x7906],
- ["F05A",0x7909],
- ["F057",0x790C],
- ["C2A6",0x790E],
- ["F05B",0x7910],
- ["F05D",0x7911],
- ["F05C",0x7912],
- ["F058",0x7913],
- ["F059",0x7914],
- ["F2A3",0x7917],
- ["C3AA",0x7919],
- ["F27E",0x791B],
- ["F2A2",0x791C],
- ["F27D",0x791D],
- ["F2A4",0x791E],
- ["F2A1",0x7921],
- ["F47A",0x7923],
- ["F47D",0x7924],
- ["F479",0x7925],
- ["C471",0x7926],
- ["F47B",0x7927],
- ["F47C",0x7928],
- ["F47E",0x7929],
- ["C472",0x792A],
- ["C474",0x792B],
- ["C473",0x792C],
- ["F5E1",0x792D],
- ["FEE5",0x792E],
- ["F5E3",0x792F],
- ["F5E2",0x7931],
- ["98FD",0x7932],
- ["98FB",0x7933],
- ["FEE8",0x7934],
- ["F6F6",0x7935],
- ["8EBF",0x7936],
- ["F8B5",0x7938],
- ["F8FA",0x7939],
- ["A5DC",0x793A],
- ["8BD8",0x793B],
- ["FEF7",0x793C],
- ["CB72",0x793D],
- ["AAC0",0x793E],
- ["CDA3",0x793F],
- ["AAC1",0x7940],
- ["AAC2",0x7941],
- ["CDA2",0x7942],
- ["CFF8",0x7944],
- ["CFF7",0x7945],
- ["ACE6",0x7946],
- ["ACE9",0x7947],
- ["ACE8",0x7948],
- ["ACE7",0x7949],
- ["CFF4",0x794A],
- ["CFF6",0x794B],
- ["CFF5",0x794C],
- ["D2E8",0x794F],
- ["AFA7",0x7950],
- ["D2EC",0x7951],
- ["D2EB",0x7952],
- ["D2EA",0x7953],
- ["D2E6",0x7954],
- ["AFA6",0x7955],
- ["AFAA",0x7956],
- ["AFAD",0x7957],
- ["8F68",0x7958],
- ["94C6",0x7959],
- ["AFAE",0x795A],
- ["D2E7",0x795B],
- ["D2E9",0x795C],
- ["AFAC",0x795D],
- ["AFAB",0x795E],
- ["AFA9",0x795F],
- ["AFA8",0x7960],
- ["D6C2",0x7961],
- ["9DEA",0x7962],
- ["D6C0",0x7963],
- ["D6BC",0x7964],
- ["B2BB",0x7965],
- ["D6BD",0x7967],
- ["B2BC",0x7968],
- ["D6BE",0x7969],
- ["D6BF",0x796A],
- ["D6C1",0x796B],
- ["B2BD",0x796D],
- ["DAD5",0x7970],
- ["FC69",0x7971],
- ["DAD4",0x7972],
- ["DAD3",0x7973],
- ["DAD2",0x7974],
- ["DEF6",0x7979],
- ["B852",0x797A],
- ["DEF3",0x797C],
- ["DEF5",0x797D],
- ["9CDA",0x797E],
- ["B853",0x797F],
- ["FEF3",0x7980],
- ["B854",0x7981],
- ["DEF4",0x7982],
- ["9C72",0x7983],
- ["FEF0",0x7986],
- ["89C9",0x7987],
- ["E341",0x7988],
- ["E2F9",0x798A],
- ["E2FA",0x798B],
- ["BAD7",0x798D],
- ["BAD5",0x798E],
- ["BAD6",0x798F],
- ["E343",0x7990],
- ["9941",0x7991],
- ["E342",0x7992],
- ["E2FE",0x7993],
- ["E2FD",0x7994],
- ["E2FC",0x7995],
- ["E2FB",0x7996],
- ["E340",0x7997],
- ["E2F8",0x7998],
- ["9942",0x7999],
- ["E6CB",0x799A],
- ["E6D0",0x799B],
- ["E6CE",0x799C],
- ["FEF5",0x799D],
- ["91D7",0x799F],
- ["E6CD",0x79A0],
- ["E6CC",0x79A1],
- ["E6CF",0x79A2],
- ["EAAE",0x79A4],
- ["94CC",0x79A5],
- ["BF6D",0x79A6],
- ["C148",0x79A7],
- ["EDB0",0x79A8],
- ["FEF8",0x79A9],
- ["C149",0x79AA],
- ["EDAF",0x79AB],
- ["F05F",0x79AC],
- ["F05E",0x79AD],
- ["C2A7",0x79AE],
- ["F2A5",0x79B0],
- ["C3AB",0x79B1],
- ["F4A1",0x79B2],
- ["C5A1",0x79B3],
- ["F6F7",0x79B4],
- ["F8B7",0x79B6],
- ["F8B6",0x79B7],
- ["C9A8",0x79B8],
- ["ACEA",0x79B9],
- ["ACEB",0x79BA],
- ["D6C3",0x79BB],
- ["B856",0x79BD],
- ["A5DD",0x79BE],
- ["A872",0x79BF],
- ["A871",0x79C0],
- ["A870",0x79C1],
- ["97A8",0x79C4],
- ["CDA4",0x79C5],
- ["FEFC",0x79C6],
- ["AAC4",0x79C8],
- ["AAC3",0x79C9],
- ["8CDE",0x79CA],
- ["ACEE",0x79CB],
- ["FDBF",0x79CC],
- ["CFFA",0x79CD],
- ["CFFD",0x79CE],
- ["CFFB",0x79CF],
- ["ACEC",0x79D1],
- ["ACED",0x79D2],
- ["FEFE",0x79D4],
- ["CFF9",0x79D5],
- ["CFFC",0x79D6],
- ["AFB5",0x79D8],
- ["D2F3",0x79DC],
- ["D2F5",0x79DD],
- ["D2F4",0x79DE],
- ["AFB2",0x79DF],
- ["D2EF",0x79E0],
- ["96D1",0x79E2],
- ["AFB0",0x79E3],
- ["AFAF",0x79E4],
- ["AFB3",0x79E6],
- ["AFB1",0x79E7],
- ["AFB4",0x79E9],
- ["D2F2",0x79EA],
- ["D2ED",0x79EB],
- ["D2EE",0x79EC],
- ["D2F1",0x79ED],
- ["D2F0",0x79EE],
- ["94D5",0x79F1],
- ["94D0",0x79F4],
- ["D6C6",0x79F6],
- ["D6C7",0x79F7],
- ["D6C5",0x79F8],
- ["D6C4",0x79FA],
- ["B2BE",0x79FB],
- ["B57D",0x7A00],
- ["DAD6",0x7A02],
- ["DAD8",0x7A03],
- ["DADA",0x7A04],
- ["B57C",0x7A05],
- ["9944",0x7A06],
- ["B57A",0x7A08],
- ["DAD7",0x7A0A],
- ["B57B",0x7A0B],
- ["DAD9",0x7A0C],
- ["B579",0x7A0D],
- ["DF41",0x7A10],
- ["DEF7",0x7A11],
- ["DEFA",0x7A12],
- ["DEFE",0x7A13],
- ["B85A",0x7A14],
- ["DEFC",0x7A15],
- ["DEFB",0x7A17],
- ["DEF8",0x7A18],
- ["DEF9",0x7A19],
- ["B858",0x7A1A],
- ["DF40",0x7A1B],
- ["B857",0x7A1C],
- ["B85C",0x7A1E],
- ["B85B",0x7A1F],
- ["B859",0x7A20],
- ["DEFD",0x7A22],
- ["E349",0x7A26],
- ["E348",0x7A28],
- ["8C63",0x7A2A],
- ["E344",0x7A2B],
- ["A0B3",0x7A2D],
- ["BAD8",0x7A2E],
- ["E347",0x7A2F],
- ["E346",0x7A30],
- ["BAD9",0x7A31],
- ["BD5E",0x7A37],
- ["E6D2",0x7A39],
- ["94CF",0x7A3A],
- ["BD5F",0x7A3B],
- ["BD5B",0x7A3C],
- ["BD5D",0x7A3D],
- ["9FFA",0x7A3E],
- ["BD5A",0x7A3F],
- ["BD5C",0x7A40],
- ["91E5",0x7A43],
- ["EAAF",0x7A44],
- ["9C6A",0x7A45],
- ["BF70",0x7A46],
- ["EAB1",0x7A47],
- ["EAB0",0x7A48],
- ["8E49",0x7A49],
- ["E345",0x7A4A],
- ["BF72",0x7A4B],
- ["BF71",0x7A4C],
- ["BF6E",0x7A4D],
- ["BF6F",0x7A4E],
- ["EDB5",0x7A54],
- ["EDB3",0x7A56],
- ["C14A",0x7A57],
- ["EDB4",0x7A58],
- ["EDB6",0x7A5A],
- ["EDB2",0x7A5B],
- ["EDB1",0x7A5C],
- ["F060",0x7A5F],
- ["C2AA",0x7A60],
- ["C2A8",0x7A61],
- ["C2A9",0x7A62],
- ["8E4C",0x7A65],
- ["F2A6",0x7A67],
- ["F2A7",0x7A68],
- ["C3AD",0x7A69],
- ["C3AC",0x7A6B],
- ["F4A3",0x7A6C],
- ["F4A4",0x7A6D],
- ["F4A2",0x7A6E],
- ["F6F8",0x7A70],
- ["F6F9",0x7A71],
- ["A5DE",0x7A74],
- ["CA48",0x7A75],
- ["A873",0x7A76],
- ["CDA5",0x7A78],
- ["AAC6",0x7A79],
- ["AAC5",0x7A7A],
- ["CDA6",0x7A7B],
- ["8E4D",0x7A7D],
- ["D040",0x7A7E],
- ["ACEF",0x7A7F],
- ["CFFE",0x7A80],
- ["ACF0",0x7A81],
- ["9A73",0x7A83],
- ["AFB6",0x7A84],
- ["D2F8",0x7A85],
- ["D2F6",0x7A86],
- ["D2FC",0x7A87],
- ["AFB7",0x7A88],
- ["D2F7",0x7A89],
- ["D2FB",0x7A8A],
- ["D2F9",0x7A8B],
- ["D2FA",0x7A8C],
- ["D6C8",0x7A8F],
- ["D6CA",0x7A90],
- ["9947",0x7A91],
- ["B2BF",0x7A92],
- ["8CB1",0x7A93],
- ["D6C9",0x7A94],
- ["B2C0",0x7A95],
- ["B5A2",0x7A96],
- ["B5A1",0x7A97],
- ["B57E",0x7A98],
- ["DADB",0x7A99],
- ["DF44",0x7A9E],
- ["B85D",0x7A9F],
- ["B85E",0x7AA0],
- ["DF43",0x7AA2],
- ["DF42",0x7AA3],
- ["E34A",0x7AA8],
- ["BADB",0x7AA9],
- ["BADA",0x7AAA],
- ["E34B",0x7AAB],
- ["E34C",0x7AAC],
- ["BD61",0x7AAE],
- ["BD60",0x7AAF],
- ["8E50",0x7AB0],
- ["EAB5",0x7AB1],
- ["E6D3",0x7AB2],
- ["E6D5",0x7AB3],
- ["E6D4",0x7AB4],
- ["EAB4",0x7AB5],
- ["EAB2",0x7AB6],
- ["EAB6",0x7AB7],
- ["EAB3",0x7AB8],
- ["BF73",0x7ABA],
- ["8E4F",0x7ABB],
- ["9949",0x7ABC],
- ["EDB7",0x7ABE],
- ["C14B",0x7ABF],
- ["EDB8",0x7AC0],
- ["EDB9",0x7AC1],
- ["8E51",0x7AC2],
- ["8E52",0x7AC3],
- ["C2AB",0x7AC4],
- ["C2AC",0x7AC5],
- ["C475",0x7AC7],
- ["9AB2",0x7AC8],
- ["89A5",0x7AC9],
- ["C5D1",0x7ACA],
- ["A5DF",0x7ACB],
- ["994C",0x7ACF],
- ["D041",0x7AD1],
- ["9FF8",0x7AD3],
- ["D2FD",0x7AD8],
- ["AFB8",0x7AD9],
- ["8E56",0x7ADA],
- ["994D",0x7ADB],
- ["91CA",0x7ADC],
- ["8E57",0x7ADD],
- ["B3BA",0x7ADF],
- ["B3B9",0x7AE0],
- ["94E1",0x7AE2],
- ["B5A4",0x7AE3],
- ["DADD",0x7AE4],
- ["B5A3",0x7AE5],
- ["DADC",0x7AE6],
- ["9047",0x7AE7],
- ["8FD8",0x7AE9],
- ["8E58",0x7AEA],
- ["DF45",0x7AEB],
- ["BADC",0x7AED],
- ["E34D",0x7AEE],
- ["BADD",0x7AEF],
- ["C476",0x7AF6],
- ["F4A5",0x7AF7],
- ["A6CB",0x7AF9],
- ["AAC7",0x7AFA],
- ["CDA7",0x7AFB],
- ["ACF2",0x7AFD],
- ["94EB",0x7AFE],
- ["ACF1",0x7AFF],
- ["D042",0x7B00],
- ["D043",0x7B01],
- ["D340",0x7B04],
- ["D342",0x7B05],
- ["AFB9",0x7B06],
- ["D344",0x7B08],
- ["D347",0x7B09],
- ["D345",0x7B0A],
- ["8E5C",0x7B0B],
- ["9553",0x7B0C],
- ["D346",0x7B0E],
- ["D343",0x7B0F],
- ["D2FE",0x7B10],
- ["AFBA",0x7B11],
- ["D348",0x7B12],
- ["D341",0x7B13],
- ["9FE5",0x7B14],
- ["D6D3",0x7B18],
- ["B2C6",0x7B19],
- ["D6DC",0x7B1A],
- ["B2C3",0x7B1B],
- ["D6D5",0x7B1D],
- ["B2C7",0x7B1E],
- ["9F56",0x7B1F],
- ["B2C1",0x7B20],
- ["D6D0",0x7B22],
- ["D6DD",0x7B23],
- ["D6D1",0x7B24],
- ["D6CE",0x7B25],
- ["B2C5",0x7B26],
- ["954F",0x7B27],
- ["B2C2",0x7B28],
- ["8E5E",0x7B29],
- ["D6D4",0x7B2A],
- ["D6D7",0x7B2B],
- ["B2C4",0x7B2C],
- ["D6D8",0x7B2D],
- ["B2C8",0x7B2E],
- ["D6D9",0x7B2F],
- ["D6CF",0x7B30],
- ["D6D6",0x7B31],
- ["D6DA",0x7B32],
- ["D6D2",0x7B33],
- ["D6CD",0x7B34],
- ["D6CB",0x7B35],
- ["D6DB",0x7B38],
- ["996A",0x7B39],
- ["DADF",0x7B3B],
- ["DAE4",0x7B40],
- ["9C64",0x7B42],
- ["9CD9",0x7B43],
- ["DAE0",0x7B44],
- ["DAE6",0x7B45],
- ["B5A7",0x7B46],
- ["D6CC",0x7B47],
- ["DAE1",0x7B48],
- ["B5A5",0x7B49],
- ["DADE",0x7B4A],
- ["B5AC",0x7B4B],
- ["DAE2",0x7B4C],
- ["B5AB",0x7B4D],
- ["DAE3",0x7B4E],
- ["B5AD",0x7B4F],
- ["B5A8",0x7B50],
- ["B5AE",0x7B51],
- ["B5A9",0x7B52],
- ["B5AA",0x7B54],
- ["8E5D",0x7B55],
- ["B5A6",0x7B56],
- ["DAE5",0x7B58],
- ["B861",0x7B60],
- ["DF50",0x7B61],
- ["9950",0x7B62],
- ["DF53",0x7B63],
- ["DF47",0x7B64],
- ["DF4C",0x7B65],
- ["DF46",0x7B66],
- ["B863",0x7B67],
- ["DF4A",0x7B69],
- ["9951",0x7B6C],
- ["DF48",0x7B6D],
- ["B862",0x7B6E],
- ["8E62",0x7B6F],
- ["DF4F",0x7B70],
- ["DF4E",0x7B71],
- ["DF4B",0x7B72],
- ["DF4D",0x7B73],
- ["DF49",0x7B74],
- ["BAE1",0x7B75],
- ["DF52",0x7B76],
- ["B85F",0x7B77],
- ["DF51",0x7B78],
- ["9952",0x7B7B],
- ["E35D",0x7B82],
- ["BAE8",0x7B84],
- ["E358",0x7B85],
- ["BAE7",0x7B87],
- ["E34E",0x7B88],
- ["E350",0x7B8A],
- ["BAE0",0x7B8B],
- ["E355",0x7B8C],
- ["E354",0x7B8D],
- ["E357",0x7B8E],
- ["BAE5",0x7B8F],
- ["E352",0x7B90],
- ["E351",0x7B91],
- ["8E68",0x7B92],
- ["BAE4",0x7B94],
- ["BADF",0x7B95],
- ["E353",0x7B96],
- ["BAE2",0x7B97],
- ["E359",0x7B98],
- ["E35B",0x7B99],
- ["E356",0x7B9B],
- ["E34F",0x7B9C],
- ["BAE3",0x7B9D],
- ["BD69",0x7BA0],
- ["BADE",0x7BA1],
- ["8E61",0x7BA2],
- ["9F59",0x7BA3],
- ["E35C",0x7BA4],
- ["E6D9",0x7BAC],
- ["BD62",0x7BAD],
- ["E6DB",0x7BAF],
- ["BD63",0x7BB1],
- ["8BB3",0x7BB2],
- ["BD65",0x7BB4],
- ["E6DE",0x7BB5],
- ["E6D6",0x7BB7],
- ["BAE6",0x7BB8],
- ["E6DC",0x7BB9],
- ["E6D8",0x7BBE],
- ["B860",0x7BC0],
- ["BD68",0x7BC1],
- ["BD64",0x7BC4],
- ["BD66",0x7BC6],
- ["BD67",0x7BC7],
- ["BF76",0x7BC9],
- ["E6DD",0x7BCA],
- ["E6D7",0x7BCB],
- ["BD6A",0x7BCC],
- ["E6DA",0x7BCE],
- ["9F5D",0x7BCF],
- ["8E66",0x7BD0],
- ["EAC0",0x7BD4],
- ["EABB",0x7BD5],
- ["EAC5",0x7BD8],
- ["BF74",0x7BD9],
- ["EABD",0x7BDA],
- ["BF78",0x7BDB],
- ["EAC3",0x7BDC],
- ["EABA",0x7BDD],
- ["EAB7",0x7BDE],
- ["EAC6",0x7BDF],
- ["C151",0x7BE0],
- ["BF79",0x7BE1],
- ["EAC2",0x7BE2],
- ["EAB8",0x7BE3],
- ["BF77",0x7BE4],
- ["EABC",0x7BE5],
- ["BF7B",0x7BE6],
- ["EAB9",0x7BE7],
- ["EABE",0x7BE8],
- ["BF7A",0x7BE9],
- ["EAC1",0x7BEA],
- ["EAC4",0x7BEB],
- ["8CB2",0x7BEC],
- ["EDCB",0x7BF0],
- ["EDCC",0x7BF1],
- ["EDBC",0x7BF2],
- ["EDC3",0x7BF3],
- ["EDC1",0x7BF4],
- ["C14F",0x7BF7],
- ["EDC8",0x7BF8],
- ["EABF",0x7BF9],
- ["8E6E",0x7BFA],
- ["EDBF",0x7BFB],
- ["9F64",0x7BFC],
- ["EDC9",0x7BFD],
- ["C14E",0x7BFE],
- ["EDBE",0x7BFF],
- ["EDBD",0x7C00],
- ["EDC7",0x7C01],
- ["EDC4",0x7C02],
- ["EDC6",0x7C03],
- ["EDBA",0x7C05],
- ["EDCA",0x7C06],
- ["C14C",0x7C07],
- ["EDC5",0x7C09],
- ["EDCE",0x7C0A],
- ["EDC2",0x7C0B],
- ["C150",0x7C0C],
- ["C14D",0x7C0D],
- ["EDC0",0x7C0E],
- ["EDBB",0x7C0F],
- ["EDCD",0x7C10],
- ["BF75",0x7C11],
- ["9953",0x7C12],
- ["FAB8",0x7C15],
- ["F063",0x7C19],
- ["9954",0x7C1B],
- ["F061",0x7C1C],
- ["F067",0x7C1D],
- ["C2B0",0x7C1E],
- ["F065",0x7C1F],
- ["F064",0x7C20],
- ["C2B2",0x7C21],
- ["F06A",0x7C22],
- ["C2B1",0x7C23],
- ["F06B",0x7C25],
- ["F068",0x7C26],
- ["C2AE",0x7C27],
- ["F069",0x7C28],
- ["F062",0x7C29],
- ["C2AF",0x7C2A],
- ["C2AD",0x7C2B],
- ["F2AB",0x7C2C],
- ["F066",0x7C2D],
- ["F06C",0x7C30],
- ["F2A8",0x7C33],
- ["8E70",0x7C35],
- ["C3B2",0x7C37],
- ["C3B0",0x7C38],
- ["F2AA",0x7C39],
- ["F2AC",0x7C3B],
- ["F2A9",0x7C3C],
- ["C3B1",0x7C3D],
- ["C3AE",0x7C3E],
- ["C3AF",0x7C3F],
- ["C3B3",0x7C40],
- ["9F61",0x7C42],
- ["C478",0x7C43],
- ["8E72",0x7C44],
- ["F4AA",0x7C45],
- ["F4A9",0x7C47],
- ["F4A7",0x7C48],
- ["F4A6",0x7C49],
- ["F4A8",0x7C4A],
- ["C477",0x7C4C],
- ["C479",0x7C4D],
- ["C4F0",0x7C50],
- ["A06B",0x7C51],
- ["F5E5",0x7C53],
- ["F5E4",0x7C54],
- ["9F40",0x7C56],
- ["F6FA",0x7C57],
- ["F6FC",0x7C59],
- ["F6FE",0x7C5A],
- ["F6FD",0x7C5B],
- ["F6FB",0x7C5C],
- ["94ED",0x7C5D],
- ["C5A3",0x7C5F],
- ["C5A2",0x7C60],
- ["C5D3",0x7C63],
- ["C5D2",0x7C64],
- ["C5D4",0x7C65],
- ["F7ED",0x7C66],
- ["F7EC",0x7C67],
- ["F8FB",0x7C69],
- ["F8B8",0x7C6A],
- ["F8FC",0x7C6B],
- ["C658",0x7C6C],
- ["94EE",0x7C6D],
- ["C659",0x7C6E],
- ["F96D",0x7C6F],
- ["9FBD",0x7C70],
- ["C67E",0x7C72],
- ["A6CC",0x7C73],
- ["8E7B",0x7C74],
- ["CDA8",0x7C75],
- ["D045",0x7C78],
- ["D046",0x7C79],
- ["D044",0x7C7A],
- ["9957",0x7C7B],
- ["94F7",0x7C7C],
- ["ACF3",0x7C7D],
- ["9F5F",0x7C7E],
- ["D047",0x7C7F],
- ["D048",0x7C80],
- ["D049",0x7C81],
- ["8E73",0x7C83],
- ["D349",0x7C84],
- ["D34F",0x7C85],
- ["9F62",0x7C86],
- ["D34D",0x7C88],
- ["AFBB",0x7C89],
- ["D34B",0x7C8A],
- ["D34C",0x7C8C],
- ["D34E",0x7C8D],
- ["94F6",0x7C8E],
- ["D34A",0x7C91],
- ["B2C9",0x7C92],
- ["D6DE",0x7C94],
- ["B2CB",0x7C95],
- ["D6E0",0x7C96],
- ["B2CA",0x7C97],
- ["D6DF",0x7C98],
- ["9958",0x7C9C],
- ["DAE8",0x7C9E],
- ["B5AF",0x7C9F],
- ["DAEA",0x7CA1],
- ["DAE7",0x7CA2],
- ["D6E1",0x7CA3],
- ["B5B0",0x7CA5],
- ["8E75",0x7CA6],
- ["F9DB",0x7CA7],
- ["DAE9",0x7CA8],
- ["9072",0x7CAC],
- ["94F8",0x7CAE],
- ["DF56",0x7CAF],
- ["B864",0x7CB1],
- ["DF54",0x7CB2],
- ["B865",0x7CB3],
- ["DF55",0x7CB4],
- ["B866",0x7CB5],
- ["995A",0x7CB8],
- ["BAE9",0x7CB9],
- ["E361",0x7CBA],
- ["E35E",0x7CBB],
- ["E360",0x7CBC],
- ["BAEA",0x7CBD],
- ["BAEB",0x7CBE],
- ["E35F",0x7CBF],
- ["A0B0",0x7CC2],
- ["8CB3",0x7CC3],
- ["E6DF",0x7CC5],
- ["8E79",0x7CC7],
- ["E6E0",0x7CC8],
- ["8E78",0x7CC9],
- ["BD6B",0x7CCA],
- ["E6E2",0x7CCB],
- ["E6E1",0x7CCC],
- ["94F3",0x7CCD],
- ["A261",0x7CCE],
- ["EACA",0x7CD0],
- ["EACB",0x7CD1],
- ["EAC7",0x7CD2],
- ["98AF",0x7CD3],
- ["EAC8",0x7CD4],
- ["BF7C",0x7CD5],
- ["BF7D",0x7CD6],
- ["EAC9",0x7CD7],
- ["C157",0x7CD9],
- ["A0B2",0x7CDA],
- ["C153",0x7CDC],
- ["C158",0x7CDD],
- ["C154",0x7CDE],
- ["C156",0x7CDF],
- ["C152",0x7CE0],
- ["C155",0x7CE2],
- ["8E7A",0x7CE6],
- ["C2B3",0x7CE7],
- ["EDCF",0x7CE8],
- ["F2AE",0x7CEA],
- ["F2AD",0x7CEC],
- ["995C",0x7CED],
- ["F4AB",0x7CEE],
- ["C47A",0x7CEF],
- ["C47B",0x7CF0],
- ["F741",0x7CF1],
- ["F5E6",0x7CF2],
- ["8E7C",0x7CF3],
- ["F740",0x7CF4],
- ["8E7D",0x7CF5],
- ["F8FD",0x7CF6],
- ["F9A4",0x7CF7],
- ["A6CD",0x7CF8],
- ["8BD9",0x7CF9],
- ["A874",0x7CFB],
- ["89A2",0x7CFC],
- ["CDA9",0x7CFD],
- ["AAC8",0x7CFE],
- ["ACF6",0x7D00],
- ["D04C",0x7D01],
- ["ACF4",0x7D02],
- ["D04A",0x7D03],
- ["ACF9",0x7D04],
- ["ACF5",0x7D05],
- ["ACFA",0x7D06],
- ["ACF8",0x7D07],
- ["D04B",0x7D08],
- ["ACF7",0x7D09],
- ["AFBF",0x7D0A],
- ["AFBE",0x7D0B],
- ["D35A",0x7D0C],
- ["AFC7",0x7D0D],
- ["D353",0x7D0E],
- ["D359",0x7D0F],
- ["AFC3",0x7D10],
- ["D352",0x7D11],
- ["D358",0x7D12],
- ["D356",0x7D13],
- ["AFC2",0x7D14],
- ["AFC4",0x7D15],
- ["D355",0x7D16],
- ["AFBD",0x7D17],
- ["D354",0x7D18],
- ["AFC8",0x7D19],
- ["AFC5",0x7D1A],
- ["AFC9",0x7D1B],
- ["AFC6",0x7D1C],
- ["D351",0x7D1D],
- ["D350",0x7D1E],
- ["D357",0x7D1F],
- ["AFC0",0x7D20],
- ["AFBC",0x7D21],
- ["AFC1",0x7D22],
- ["9ED7",0x7D25],
- ["D6F0",0x7D28],
- ["D6E9",0x7D29],
- ["B5B5",0x7D2B],
- ["D6E8",0x7D2C],
- ["B2CF",0x7D2E],
- ["B2D6",0x7D2F],
- ["B2D3",0x7D30],
- ["B2D9",0x7D31],
- ["B2D8",0x7D32],
- ["B2D4",0x7D33],
- ["D6E2",0x7D35],
- ["D6E5",0x7D36],
- ["D6E4",0x7D38],
- ["B2D0",0x7D39],
- ["D6E6",0x7D3A],
- ["D6EF",0x7D3B],
- ["B2D1",0x7D3C],
- ["D6E3",0x7D3D],
- ["D6EC",0x7D3E],
- ["D6ED",0x7D3F],
- ["B2D2",0x7D40],
- ["D6EA",0x7D41],
- ["B2D7",0x7D42],
- ["B2CD",0x7D43],
- ["B2D5",0x7D44],
- ["D6E7",0x7D45],
- ["B2CC",0x7D46],
- ["D6EB",0x7D47],
- ["D6EE",0x7D4A],
- ["A0B6",0x7D4D],
- ["DAFB",0x7D4E],
- ["DAF2",0x7D4F],
- ["B5B2",0x7D50],
- ["DAF9",0x7D51],
- ["DAF6",0x7D52],
- ["DAEE",0x7D53],
- ["DAF7",0x7D54],
- ["B5B4",0x7D55],
- ["DAEF",0x7D56],
- ["DAEB",0x7D58],
- ["9E42",0x7D5A],
- ["B86C",0x7D5B],
- ["DAF4",0x7D5C],
- ["8EA4",0x7D5D],
- ["B5B1",0x7D5E],
- ["DAFA",0x7D5F],
- ["B5B8",0x7D61],
- ["B5BA",0x7D62],
- ["DAED",0x7D63],
- ["B5B9",0x7D66],
- ["DAF0",0x7D67],
- ["B5B3",0x7D68],
- ["DAF8",0x7D69],
- ["DAF1",0x7D6A],
- ["DAF5",0x7D6B],
- ["DAF3",0x7D6D],
- ["B5B6",0x7D6E],
- ["DAEC",0x7D6F],
- ["B5BB",0x7D70],
- ["B2CE",0x7D71],
- ["B5B7",0x7D72],
- ["B5BC",0x7D73],
- ["B868",0x7D79],
- ["DF5D",0x7D7A],
- ["DF5F",0x7D7B],
- ["DF61",0x7D7C],
- ["DF65",0x7D7D],
- ["DF5B",0x7D7F],
- ["DF59",0x7D80],
- ["B86A",0x7D81],
- ["DF60",0x7D83],
- ["DF64",0x7D84],
- ["DF5C",0x7D85],
- ["DF58",0x7D86],
- ["DF57",0x7D88],
- ["8EA7",0x7D89],
- ["8C76",0x7D8B],
- ["DF62",0x7D8C],
- ["DF5A",0x7D8D],
- ["DF5E",0x7D8E],
- ["B86B",0x7D8F],
- ["B869",0x7D91],
- ["DF66",0x7D92],
- ["B867",0x7D93],
- ["DF63",0x7D94],
- ["8767",0x7D95],
- ["E372",0x7D96],
- ["9542",0x7D97],
- ["BAEE",0x7D9C],
- ["E36A",0x7D9D],
- ["BD78",0x7D9E],
- ["E374",0x7D9F],
- ["BAF1",0x7DA0],
- ["E378",0x7DA1],
- ["BAF7",0x7DA2],
- ["E365",0x7DA3],
- ["987D",0x7DA4],
- ["E375",0x7DA6],
- ["E362",0x7DA7],
- ["9755",0x7DA8],
- ["E377",0x7DA9],
- ["E366",0x7DAA],
- ["8EA8",0x7DAB],
- ["BAFE",0x7DAC],
- ["BAFB",0x7DAD],
- ["E376",0x7DAE],
- ["E370",0x7DAF],
- ["BAED",0x7DB0],
- ["BAF5",0x7DB1],
- ["BAF4",0x7DB2],
- ["8EAA",0x7DB3],
- ["BAF3",0x7DB4],
- ["BAF9",0x7DB5],
- ["E363",0x7DB7],
- ["BAFA",0x7DB8],
- ["E371",0x7DB9],
- ["BAF6",0x7DBA],
- ["BAEC",0x7DBB],
- ["E373",0x7DBC],
- ["BAEF",0x7DBD],
- ["BAF0",0x7DBE],
- ["BAF8",0x7DBF],
- ["E368",0x7DC0],
- ["E367",0x7DC1],
- ["E364",0x7DC2],
- ["E36C",0x7DC4],
- ["E369",0x7DC5],
- ["E36D",0x7DC6],
- ["BAFD",0x7DC7],
- ["E379",0x7DC9],
- ["BAF2",0x7DCA],
- ["E36E",0x7DCB],
- ["E36F",0x7DCC],
- ["89A3",0x7DCD],
- ["E36B",0x7DCE],
- ["9960",0x7DCF],
- ["9962",0x7DD0],
- ["BAFC",0x7DD2],
- ["94FC",0x7DD3],
- ["9961",0x7DD4],
- ["E6E7",0x7DD7],
- ["BD70",0x7DD8],
- ["BD79",0x7DD9],
- ["BD75",0x7DDA],
- ["E6E4",0x7DDB],
- ["94FA",0x7DDC],
- ["BD72",0x7DDD],
- ["BD76",0x7DDE],
- ["E6F0",0x7DDF],
- ["BD6C",0x7DE0],
- ["E6E8",0x7DE1],
- ["BD74",0x7DE3],
- ["8EAE",0x7DE4],
- ["8EB2",0x7DE5],
- ["E6EB",0x7DE6],
- ["E6E6",0x7DE7],
- ["BD73",0x7DE8],
- ["BD77",0x7DE9],
- ["E6E5",0x7DEA],
- ["BD71",0x7DEC],
- ["E6EF",0x7DEE],
- ["BD6E",0x7DEF],
- ["E6EE",0x7DF0],
- ["E6ED",0x7DF1],
- ["BD7A",0x7DF2],
- ["E572",0x7DF3],
- ["BD6D",0x7DF4],
- ["8EB0",0x7DF5],
- ["E6EC",0x7DF6],
- ["E6E3",0x7DF7],
- ["BD7B",0x7DF9],
- ["E6EA",0x7DFA],
- ["BD6F",0x7DFB],
- ["9963",0x7DFD],
- ["97AA",0x7DFE],
- ["E6E9",0x7E03],
- ["94FB",0x7E07],
- ["BFA2",0x7E08],
- ["BFA7",0x7E09],
- ["BF7E",0x7E0A],
- ["EAD8",0x7E0B],
- ["EACF",0x7E0C],
- ["EADB",0x7E0D],
- ["EAD3",0x7E0E],
- ["EAD9",0x7E0F],
- ["BFA8",0x7E10],
- ["BFA1",0x7E11],
- ["EACC",0x7E12],
- ["EAD2",0x7E13],
- ["EADC",0x7E14],
- ["EAD5",0x7E15],
- ["EADA",0x7E16],
- ["EACE",0x7E17],
- ["EAD6",0x7E1A],
- ["BFA3",0x7E1B],
- ["EAD4",0x7E1C],
- ["BFA6",0x7E1D],
- ["BFA5",0x7E1E],
- ["EAD0",0x7E1F],
- ["EAD1",0x7E20],
- ["EACD",0x7E21],
- ["EAD7",0x7E22],
- ["BFA4",0x7E23],
- ["EADE",0x7E24],
- ["EADD",0x7E25],
- ["8EBB",0x7E27],
- ["EDDA",0x7E29],
- ["EDD6",0x7E2A],
- ["C15F",0x7E2B],
- ["EDD0",0x7E2D],
- ["C159",0x7E2E],
- ["C169",0x7E2F],
- ["EDDC",0x7E30],
- ["C161",0x7E31],
- ["C15D",0x7E32],
- ["EDD3",0x7E33],
- ["C164",0x7E34],
- ["C167",0x7E35],
- ["EDDE",0x7E36],
- ["C15C",0x7E37],
- ["EDD5",0x7E38],
- ["C165",0x7E39],
- ["EDE0",0x7E3A],
- ["EDDD",0x7E3B],
- ["EDD1",0x7E3C],
- ["C160",0x7E3D],
- ["C15A",0x7E3E],
- ["C168",0x7E3F],
- ["EDD8",0x7E40],
- ["C163",0x7E41],
- ["EDD2",0x7E42],
- ["C15E",0x7E43],
- ["EDDF",0x7E44],
- ["C162",0x7E45],
- ["C15B",0x7E46],
- ["EDD9",0x7E47],
- ["C166",0x7E48],
- ["EDD7",0x7E49],
- ["EDDB",0x7E4C],
- ["F06E",0x7E50],
- ["F074",0x7E51],
- ["C2B9",0x7E52],
- ["F077",0x7E53],
- ["C2B4",0x7E54],
- ["C2B5",0x7E55],
- ["F06F",0x7E56],
- ["F076",0x7E57],
- ["F071",0x7E58],
- ["C2BA",0x7E59],
- ["C2B7",0x7E5A],
- ["8CDC",0x7E5B],
- ["F06D",0x7E5C],
- ["C2B6",0x7E5E],
- ["F073",0x7E5F],
- ["F075",0x7E60],
- ["C2B8",0x7E61],
- ["F072",0x7E62],
- ["F070",0x7E63],
- ["9876",0x7E65],
- ["8EA1",0x7E67],
- ["F2B8",0x7E68],
- ["C3B7",0x7E69],
- ["C3B8",0x7E6A],
- ["C3B4",0x7E6B],
- ["8CB4",0x7E6C],
- ["C3B5",0x7E6D],
- ["8EB7",0x7E6E],
- ["F2B4",0x7E6F],
- ["F2B2",0x7E70],
- ["F2B6",0x7E72],
- ["C3BA",0x7E73],
- ["F2B7",0x7E74],
- ["F2B0",0x7E75],
- ["F2AF",0x7E76],
- ["F2B3",0x7E77],
- ["F2B1",0x7E78],
- ["C3B6",0x7E79],
- ["F2B5",0x7E7A],
- ["F4AC",0x7E7B],
- ["C47E",0x7E7C],
- ["C47D",0x7E7D],
- ["F4AD",0x7E7E],
- ["9DA6",0x7E7F],
- ["F4AF",0x7E80],
- ["F4AE",0x7E81],
- ["C4A1",0x7E82],
- ["F5EB",0x7E86],
- ["F5E8",0x7E87],
- ["F5E9",0x7E88],
- ["F5E7",0x7E8A],
- ["F5EA",0x7E8B],
- ["C4F2",0x7E8C],
- ["F5EC",0x7E8D],
- ["9EB0",0x7E8E],
- ["C4F1",0x7E8F],
- ["F742",0x7E91],
- ["8EB8",0x7E92],
- ["C5D5",0x7E93],
- ["C5D7",0x7E94],
- ["F7EE",0x7E95],
- ["C5D6",0x7E96],
- ["F8B9",0x7E97],
- ["F940",0x7E98],
- ["F942",0x7E99],
- ["F8FE",0x7E9A],
- ["F941",0x7E9B],
- ["C66C",0x7E9C],
- ["9D70",0x7E9F],
- ["896E",0x7EA4],
- ["896F",0x7EAC],
- ["8970",0x7EBA],
- ["8971",0x7EC7],
- ["8972",0x7ECF],
- ["8973",0x7EDF],
- ["8974",0x7F06],
- ["A6CE",0x7F36],
- ["8975",0x7F37],
- ["ACFB",0x7F38],
- ["D26F",0x7F39],
- ["AFCA",0x7F3A],
- ["B2DA",0x7F3D],
- ["DAFC",0x7F3E],
- ["DAFD",0x7F3F],
- ["8EBC",0x7F40],
- ["8EBD",0x7F41],
- ["EADF",0x7F43],
- ["C16A",0x7F44],
- ["EDE1",0x7F45],
- ["8EBE",0x7F47],
- ["C2BB",0x7F48],
- ["9DD1",0x7F49],
- ["F2BA",0x7F4A],
- ["F2B9",0x7F4B],
- ["C4A2",0x7F4C],
- ["F5ED",0x7F4D],
- ["94FD",0x7F4E],
- ["F743",0x7F4F],
- ["C5F8",0x7F50],
- ["CA49",0x7F51],
- ["8BD7",0x7F52],
- ["8BDA",0x7F53],
- ["AAC9",0x7F54],
- ["A875",0x7F55],
- ["D04D",0x7F58],
- ["D360",0x7F5B],
- ["D35B",0x7F5C],
- ["D35F",0x7F5D],
- ["D35D",0x7F5E],
- ["AFCB",0x7F5F],
- ["D35E",0x7F60],
- ["D35C",0x7F61],
- ["D6F1",0x7F63],
- ["DAFE",0x7F65],
- ["DB40",0x7F66],
- ["DF69",0x7F67],
- ["DF6A",0x7F68],
- ["B86E",0x7F69],
- ["B86F",0x7F6A],
- ["DF68",0x7F6B],
- ["DF6B",0x7F6C],
- ["DF67",0x7F6D],
- ["B86D",0x7F6E],
- ["BB40",0x7F70],
- ["A0E2",0x7F71],
- ["B870",0x7F72],
- ["E37A",0x7F73],
- ["BD7C",0x7F75],
- ["E6F1",0x7F76],
- ["BD7D",0x7F77],
- ["9FE9",0x7F78],
- ["BFA9",0x7F79],
- ["EAE2",0x7F7A],
- ["EAE0",0x7F7B],
- ["EAE1",0x7F7C],
- ["EDE4",0x7F7D],
- ["EDE3",0x7F7E],
- ["EDE2",0x7F7F],
- ["F2BB",0x7F83],
- ["C3B9",0x7F85],
- ["F2BC",0x7F86],
- ["F744",0x7F87],
- ["C5F9",0x7F88],
- ["F8BA",0x7F89],
- ["A6CF",0x7F8A],
- ["AACB",0x7F8B],
- ["AACA",0x7F8C],
- ["D04F",0x7F8D],
- ["ACFC",0x7F8E],
- ["FDA8",0x7F8F],
- ["D04E",0x7F91],
- ["D362",0x7F92],
- ["8AE7",0x7F93],
- ["AFCC",0x7F94],
- ["D6F2",0x7F95],
- ["D361",0x7F96],
- ["8EC2",0x7F97],
- ["B2DC",0x7F9A],
- ["D6F5",0x7F9B],
- ["D6F3",0x7F9C],
- ["D6F4",0x7F9D],
- ["B2DB",0x7F9E],
- ["DB42",0x7FA0],
- ["DB43",0x7FA1],
- ["DB41",0x7FA2],
- ["8EC4",0x7FA3],
- ["B873",0x7FA4],
- ["DF6D",0x7FA5],
- ["DF6C",0x7FA6],
- ["DF6E",0x7FA7],
- ["B872",0x7FA8],
- ["B871",0x7FA9],
- ["E6F2",0x7FAC],
- ["E6F4",0x7FAD],
- ["9964",0x7FAE],
- ["BD7E",0x7FAF],
- ["E6F3",0x7FB0],
- ["EAE3",0x7FB1],
- ["BFAA",0x7FB2],
- ["F079",0x7FB3],
- ["9965",0x7FB4],
- ["F078",0x7FB5],
- ["C3BB",0x7FB6],
- ["F2BD",0x7FB7],
- ["C3BD",0x7FB8],
- ["C3BC",0x7FB9],
- ["F4B0",0x7FBA],
- ["F5EE",0x7FBB],
- ["C4F3",0x7FBC],
- ["A6D0",0x7FBD],
- ["D050",0x7FBE],
- ["ACFD",0x7FBF],
- ["D365",0x7FC0],
- ["AFCE",0x7FC1],
- ["D364",0x7FC2],
- ["D363",0x7FC3],
- ["AFCD",0x7FC5],
- ["D6FB",0x7FC7],
- ["D6FD",0x7FC9],
- ["D6F6",0x7FCA],
- ["D6F7",0x7FCB],
- ["B2DD",0x7FCC],
- ["D6F8",0x7FCD],
- ["B2DE",0x7FCE],
- ["D6FC",0x7FCF],
- ["D6F9",0x7FD0],
- ["D6FA",0x7FD1],
- ["B2DF",0x7FD2],
- ["B5BE",0x7FD4],
- ["B5BF",0x7FD5],
- ["DB44",0x7FD7],
- ["DF6F",0x7FDB],
- ["DF70",0x7FDC],
- ["954E",0x7FDD],
- ["E37E",0x7FDE],
- ["BB43",0x7FDF],
- ["BB41",0x7FE0],
- ["BB42",0x7FE1],
- ["E37B",0x7FE2],
- ["E37C",0x7FE3],
- ["E37D",0x7FE5],
- ["E6F9",0x7FE6],
- ["98B3",0x7FE7],
- ["E6FA",0x7FE8],
- ["BDA1",0x7FE9],
- ["E6F7",0x7FEA],
- ["E6F6",0x7FEB],
- ["E6F8",0x7FEC],
- ["E6F5",0x7FED],
- ["BFAD",0x7FEE],
- ["EAE4",0x7FEF],
- ["BFAB",0x7FF0],
- ["BFAC",0x7FF1],
- ["EDE6",0x7FF2],
- ["C16B",0x7FF3],
- ["EDE5",0x7FF4],
- ["EFA8",0x7FF5],
- ["F07A",0x7FF7],
- ["F07B",0x7FF8],
- ["C2BC",0x7FF9],
- ["8ECB",0x7FFA],
- ["C2BD",0x7FFB],
- ["C16C",0x7FFC],
- ["F2BE",0x7FFD],
- ["F2BF",0x7FFE],
- ["F4B1",0x7FFF],
- ["C4A3",0x8000],
- ["A6D1",0x8001],
- ["8BDF",0x8002],
- ["A6D2",0x8003],
- ["ACFE",0x8004],
- ["AACC",0x8005],
- ["AFCF",0x8006],
- ["D051",0x8007],
- ["8ECE",0x8008],
- ["B5C0",0x800B],
- ["A6D3",0x800C],
- ["AD41",0x800D],
- ["D052",0x800E],
- ["D053",0x800F],
- ["AD40",0x8010],
- ["AD42",0x8011],
- ["A6D4",0x8012],
- ["D054",0x8014],
- ["AFD1",0x8015],
- ["D366",0x8016],
- ["AFD3",0x8017],
- ["AFD0",0x8018],
- ["AFD2",0x8019],
- ["D741",0x801B],
- ["B2E0",0x801C],
- ["8ECF",0x801D],
- ["D740",0x801E],
- ["D6FE",0x801F],
- ["9968",0x8020],
- ["DF71",0x8021],
- ["E3A1",0x8024],
- ["9969",0x8025],
- ["BDA2",0x8026],
- ["BFAE",0x8028],
- ["EAE6",0x8029],
- ["EAE5",0x802A],
- ["EDE7",0x802C],
- ["996B",0x802E],
- ["8ED1",0x802F],
- ["F5EF",0x8030],
- ["996C",0x8031],
- ["A6D5",0x8033],
- ["CB73",0x8034],
- ["CDAA",0x8035],
- ["AD43",0x8036],
- ["D055",0x8037],
- ["D368",0x8039],
- ["8ED4",0x803B],
- ["8ED5",0x803C],
- ["AFD4",0x803D],
- ["D367",0x803E],
- ["AFD5",0x803F],
- ["D743",0x8043],
- ["B2E2",0x8046],
- ["D742",0x8047],
- ["D744",0x8048],
- ["B2E1",0x804A],
- ["DB46",0x804F],
- ["DB47",0x8050],
- ["DB45",0x8051],
- ["B5C1",0x8052],
- ["996D",0x8054],
- ["B874",0x8056],
- ["B875",0x8058],
- ["BB45",0x805A],
- ["A0BE",0x805B],
- ["E3A3",0x805C],
- ["E3A2",0x805D],
- ["BB44",0x805E],
- ["8ED6",0x8061],
- ["A0BC",0x8062],
- ["A0B5",0x8063],
- ["E6FB",0x8064],
- ["A0B4",0x8066],
- ["E6FC",0x8067],
- ["EAE7",0x806C],
- ["C170",0x806F],
- ["C16F",0x8070],
- ["C16D",0x8071],
- ["C16E",0x8072],
- ["C171",0x8073],
- ["F07C",0x8075],
- ["C2BF",0x8076],
- ["C2BE",0x8077],
- ["F2C0",0x8078],
- ["F4B2",0x8079],
- ["C5A5",0x807D],
- ["C5A4",0x807E],
- ["A6D6",0x807F],
- ["8BE0",0x8080],
- ["D1FB",0x8082],
- ["B877",0x8084],
- ["B5C2",0x8085],
- ["B876",0x8086],
- ["BB46",0x8087],
- ["A6D7",0x8089],
- ["C9A9",0x808A],
- ["A6D8",0x808B],
- ["A6D9",0x808C],
- ["CDAB",0x808F],
- ["CB76",0x8090],
- ["CB77",0x8092],
- ["A877",0x8093],
- ["CB74",0x8095],
- ["A876",0x8096],
- ["A879",0x8098],
- ["CB75",0x8099],
- ["A87B",0x809A],
- ["A87A",0x809B],
- ["CB78",0x809C],
- ["A878",0x809D],
- ["89B5",0x809F],
- ["AAD1",0x80A1],
- ["AACF",0x80A2],
- ["CDAD",0x80A3],
- ["AACE",0x80A5],
- ["8EDD",0x80A7],
- ["AAD3",0x80A9],
- ["AAD5",0x80AA],
- ["AAD2",0x80AB],
- ["CDB0",0x80AD],
- ["CDAC",0x80AE],
- ["AAD6",0x80AF],
- ["AAD0",0x80B1],
- ["A87C",0x80B2],
- ["AAD4",0x80B4],
- ["CDAF",0x80B5],
- ["9E5D",0x80B6],
- ["9971",0x80B7],
- ["CDAE",0x80B8],
- ["AACD",0x80BA],
- ["89AE",0x80BC],
- ["9DE8",0x80BD],
- ["D05B",0x80C2],
- ["AD47",0x80C3],
- ["AD48",0x80C4],
- ["D05D",0x80C5],
- ["9565",0x80C6],
- ["D057",0x80C7],
- ["D05A",0x80C8],
- ["D063",0x80C9],
- ["D061",0x80CA],
- ["AD49",0x80CC],
- ["D067",0x80CD],
- ["AD4C",0x80CE],
- ["D064",0x80CF],
- ["D05C",0x80D0],
- ["D059",0x80D1],
- ["DB49",0x80D4],
- ["D062",0x80D5],
- ["AD44",0x80D6],
- ["D065",0x80D7],
- ["D056",0x80D8],
- ["D05F",0x80D9],
- ["AD46",0x80DA],
- ["AD4B",0x80DB],
- ["D060",0x80DC],
- ["AD4F",0x80DD],
- ["AD4D",0x80DE],
- ["D058",0x80E0],
- ["AD4A",0x80E1],
- ["D05E",0x80E3],
- ["AD4E",0x80E4],
- ["AD45",0x80E5],
- ["D066",0x80E6],
- ["9972",0x80E9],
- ["8B5C",0x80EC],
- ["AFDA",0x80ED],
- ["AFE3",0x80EF],
- ["AFD8",0x80F0],
- ["AFD6",0x80F1],
- ["D36A",0x80F2],
- ["AFDE",0x80F3],
- ["AFDB",0x80F4],
- ["D36C",0x80F5],
- ["89B1",0x80F6],
- ["AFDD",0x80F8],
- ["D36B",0x80F9],
- ["D369",0x80FA],
- ["D36E",0x80FB],
- ["AFE2",0x80FC],
- ["AFE0",0x80FD],
- ["DB48",0x80FE],
- ["D36F",0x8100],
- ["D36D",0x8101],
- ["AFD7",0x8102],
- ["A0C0",0x8103],
- ["AFD9",0x8105],
- ["AFDC",0x8106],
- ["8EDF",0x8107],
- ["AFDF",0x8108],
- ["9566",0x8109],
- ["AFE1",0x810A],
- ["9974",0x810C],
- ["9976",0x810E],
- ["9977",0x8112],
- ["9979",0x8114],
- ["D74E",0x8115],
- ["B2E4",0x8116],
- ["9DDA",0x8117],
- ["D745",0x8118],
- ["D747",0x8119],
- ["8EE0",0x811A],
- ["D748",0x811B],
- ["D750",0x811D],
- ["D74C",0x811E],
- ["D74A",0x811F],
- ["D74D",0x8121],
- ["D751",0x8122],
- ["B2E5",0x8123],
- ["B2E9",0x8124],
- ["D746",0x8125],
- ["D74F",0x8127],
- ["B2E7",0x8129],
- ["935C",0x812A],
- ["B2E6",0x812B],
- ["D74B",0x812C],
- ["D749",0x812D],
- ["B2E3",0x812F],
- ["B2E8",0x8130],
- ["9DE6",0x8132],
- ["8B5F",0x8134],
- ["9563",0x8137],
- ["B5C8",0x8139],
- ["DB51",0x813A],
- ["DB4F",0x813D],
- ["B5CA",0x813E],
- ["9567",0x8142],
- ["DB4A",0x8143],
- ["DFA1",0x8144],
- ["B5C9",0x8146],
- ["DB4E",0x8147],
- ["9DE3",0x8148],
- ["DB4B",0x814A],
- ["B5C5",0x814B],
- ["B5CB",0x814C],
- ["DB50",0x814D],
- ["B5C7",0x814E],
- ["DB4D",0x814F],
- ["BB47",0x8150],
- ["B5C6",0x8151],
- ["DB4C",0x8152],
- ["B5CC",0x8153],
- ["B5C4",0x8154],
- ["B5C3",0x8155],
- ["997C",0x8156],
- ["997D",0x8159],
- ["997E",0x815A],
- ["DF77",0x815B],
- ["DF75",0x815C],
- ["DF7B",0x815E],
- ["DF73",0x8160],
- ["DFA2",0x8161],
- ["DF78",0x8162],
- ["DF72",0x8164],
- ["B87B",0x8165],
- ["B8A3",0x8166],
- ["DF7D",0x8167],
- ["DF76",0x8169],
- ["B87E",0x816B],
- ["8CFB",0x816C],
- ["8B5B",0x816D],
- ["B87C",0x816E],
- ["DF7E",0x816F],
- ["B879",0x8170],
- ["B878",0x8171],
- ["DF79",0x8172],
- ["B87D",0x8173],
- ["B5CD",0x8174],
- ["DF7C",0x8176],
- ["DF74",0x8177],
- ["B87A",0x8178],
- ["B8A1",0x8179],
- ["B8A2",0x817A],
- ["99A3",0x817C],
- ["BB4C",0x817F],
- ["BB48",0x8180],
- ["BB4D",0x8182],
- ["E3A6",0x8183],
- ["99A4",0x8184],
- ["E3A5",0x8186],
- ["E3A7",0x8187],
- ["BB4A",0x8188],
- ["E3A4",0x8189],
- ["BB4B",0x818A],
- ["E3AA",0x818B],
- ["E3A9",0x818C],
- ["E3A8",0x818D],
- ["BB49",0x818F],
- ["99A6",0x8193],
- ["E741",0x8195],
- ["E744",0x8197],
- ["BDA8",0x8198],
- ["E743",0x8199],
- ["BDA7",0x819A],
- ["BDA3",0x819B],
- ["BDA4",0x819C],
- ["BDA5",0x819D],
- ["E740",0x819E],
- ["E6FE",0x819F],
- ["BDA6",0x81A0],
- ["E742",0x81A2],
- ["E6FD",0x81A3],
- ["99A8",0x81A5],
- ["EAE9",0x81A6],
- ["EAF3",0x81A7],
- ["BFB1",0x81A8],
- ["BFB0",0x81A9],
- ["8ABE",0x81AA],
- ["EAED",0x81AB],
- ["EAEF",0x81AC],
- ["EAEA",0x81AE],
- ["EAEE",0x81B0],
- ["EAE8",0x81B1],
- ["EAF1",0x81B2],
- ["BFAF",0x81B3],
- ["EAF0",0x81B4],
- ["EAEC",0x81B5],
- ["9E61",0x81B6],
- ["EAF2",0x81B7],
- ["EAEB",0x81B9],
- ["C174",0x81BA],
- ["EDE8",0x81BB],
- ["EDEE",0x81BC],
- ["C178",0x81BD],
- ["C17A",0x81BE],
- ["C177",0x81BF],
- ["C176",0x81C0],
- ["99AA",0x81C1],
- ["C175",0x81C2],
- ["C173",0x81C3],
- ["EDE9",0x81C4],
- ["EDEC",0x81C5],
- ["C172",0x81C6],
- ["EDED",0x81C7],
- ["A0C8",0x81C8],
- ["C179",0x81C9],
- ["EDEB",0x81CA],
- ["EDEA",0x81CC],
- ["C2C0",0x81CD],
- ["C2C1",0x81CF],
- ["F0A1",0x81D0],
- ["F07D",0x81D1],
- ["F07E",0x81D2],
- ["F2C2",0x81D5],
- ["F2C1",0x81D7],
- ["C3BE",0x81D8],
- ["F4B4",0x81D9],
- ["C4A4",0x81DA],
- ["F4B3",0x81DB],
- ["F5F0",0x81DD],
- ["F745",0x81DE],
- ["C5A6",0x81DF],
- ["F943",0x81E0],
- ["F944",0x81E1],
- ["C5D8",0x81E2],
- ["A6DA",0x81E3],
- ["99AB",0x81E4],
- ["AAD7",0x81E5],
- ["DB52",0x81E6],
- ["BB4E",0x81E7],
- ["C17B",0x81E8],
- ["EDEF",0x81E9],
- ["A6DB",0x81EA],
- ["AFE5",0x81EC],
- ["AFE4",0x81ED],
- ["DB53",0x81EE],
- ["FEC4",0x81EF],
- ["EAF4",0x81F2],
- ["A6DC",0x81F3],
- ["AD50",0x81F4],
- ["98C2",0x81F6],
- ["DB54",0x81F7],
- ["DB55",0x81F8],
- ["DB56",0x81F9],
- ["BB4F",0x81FA],
- ["BFB2",0x81FB],
- ["A6DD",0x81FC],
- ["AAD8",0x81FE],
- ["D068",0x81FF],
- ["AFE6",0x8200],
- ["D370",0x8201],
- ["B2EA",0x8202],
- ["DB57",0x8204],
- ["B8A4",0x8205],
- ["BB50",0x8207],
- ["BFB3",0x8208],
- ["C17C",0x8209],
- ["C2C2",0x820A],
- ["F4B5",0x820B],
- ["A6DE",0x820C],
- ["AAD9",0x820D],
- ["AFE7",0x8210],
- ["D752",0x8211],
- ["B5CE",0x8212],
- ["BB51",0x8214],
- ["E3AB",0x8215],
- ["E745",0x8216],
- ["8EE8",0x8218],
- ["A0BA",0x821A],
- ["A6DF",0x821B],
- ["B5CF",0x821C],
- ["DFA3",0x821D],
- ["BB52",0x821E],
- ["A6E0",0x821F],
- ["CDB1",0x8220],
- ["D069",0x8221],
- ["AD51",0x8222],
- ["D372",0x8225],
- ["FD77",0x8226],
- ["AFEA",0x8228],
- ["8EEE",0x8229],
- ["AFE8",0x822A],
- ["AFE9",0x822B],
- ["AFEB",0x822C],
- ["9EBF",0x822D],
- ["D371",0x822F],
- ["D757",0x8232],
- ["D754",0x8233],
- ["D756",0x8234],
- ["B2EB",0x8235],
- ["B2ED",0x8236],
- ["B2EC",0x8237],
- ["D753",0x8238],
- ["B2EE",0x8239],
- ["D755",0x823A],
- ["DB58",0x823C],
- ["DB59",0x823D],
- ["89C2",0x823E],
- ["DB5A",0x823F],
- ["DFA6",0x8240],
- ["DFA7",0x8242],
- ["DFA5",0x8244],
- ["DFA8",0x8245],
- ["B8A5",0x8247],
- ["DFA4",0x8249],
- ["BB53",0x824B],
- ["E74A",0x824E],
- ["E746",0x824F],
- ["E749",0x8250],
- ["E74B",0x8251],
- ["E748",0x8252],
- ["E747",0x8253],
- ["99AC",0x8254],
- ["EAF5",0x8255],
- ["EAF6",0x8256],
- ["EAF7",0x8257],
- ["BFB4",0x8258],
- ["BFB5",0x8259],
- ["EDF1",0x825A],
- ["EDF0",0x825B],
- ["EDF2",0x825C],
- ["F0A3",0x825E],
- ["F0A2",0x825F],
- ["F2C4",0x8261],
- ["956B",0x8262],
- ["F2C5",0x8263],
- ["F2C3",0x8264],
- ["956C",0x8265],
- ["C4A5",0x8266],
- ["F4B6",0x8268],
- ["F4B7",0x8269],
- ["F746",0x826B],
- ["F7EF",0x826C],
- ["F8BB",0x826D],
- ["A6E1",0x826E],
- ["A87D",0x826F],
- ["C17D",0x8271],
- ["A6E2",0x8272],
- ["D758",0x8274],
- ["DB5B",0x8275],
- ["99AF",0x8276],
- ["C641",0x8277],
- ["CA4A",0x8278],
- ["994A",0x8279],
- ["8976",0x827A],
- ["8F48",0x827B],
- ["CA4B",0x827C],
- ["CA4D",0x827D],
- ["A6E3",0x827E],
- ["CA4E",0x827F],
- ["CA4C",0x8280],
- ["CBA2",0x8283],
- ["CBA3",0x8284],
- ["CB7B",0x8285],
- ["FBEE",0x8287],
- ["CBA1",0x828A],
- ["A8A1",0x828B],
- ["A8A2",0x828D],
- ["CB7C",0x828E],
- ["CB7A",0x828F],
- ["CB79",0x8290],
- ["CB7D",0x8291],
- ["A87E",0x8292],
- ["CB7E",0x8293],
- ["D06A",0x8294],
- ["CDB6",0x8298],
- ["AADC",0x8299],
- ["CDB5",0x829A],
- ["CDB7",0x829B],
- ["AADB",0x829D],
- ["CDBC",0x829E],
- ["AADF",0x829F],
- ["CDB2",0x82A0],
- ["CDC0",0x82A1],
- ["CDC6",0x82A2],
- ["AAE6",0x82A3],
- ["CDC3",0x82A4],
- ["AAE3",0x82A5],
- ["99AE",0x82A6],
- ["CDB9",0x82A7],
- ["CDBF",0x82A8],
- ["CDC1",0x82A9],
- ["8EFB",0x82AA],
- ["CDB4",0x82AB],
- ["AAE2",0x82AC],
- ["AADD",0x82AD],
- ["CDBA",0x82AE],
- ["AAE4",0x82AF],
- ["AAE7",0x82B0],
- ["AAE1",0x82B1],
- ["AADA",0x82B3],
- ["CDBE",0x82B4],
- ["CDB8",0x82B5],
- ["CDC5",0x82B6],
- ["AAE9",0x82B7],
- ["AAE5",0x82B8],
- ["AAE0",0x82B9],
- ["CDBD",0x82BA],
- ["AFEC",0x82BB],
- ["CDBB",0x82BC],
- ["AADE",0x82BD],
- ["AAE8",0x82BE],
- ["8CD0",0x82BF],
- ["CDB3",0x82C0],
- ["CDC2",0x82C2],
- ["CDC4",0x82C3],
- ["8B52",0x82C4],
- ["99B0",0x82CA],
- ["8977",0x82CF],
- ["8F41",0x82D0],
- ["AD62",0x82D1],
- ["AD5C",0x82D2],
- ["AD64",0x82D3],
- ["AD61",0x82D4],
- ["D071",0x82D5],
- ["D074",0x82D6],
- ["AD5D",0x82D7],
- ["99B1",0x82D8],
- ["D06B",0x82D9],
- ["AD56",0x82DB],
- ["AD60",0x82DC],
- ["AD63",0x82DE],
- ["AD65",0x82DF],
- ["D0A2",0x82E0],
- ["D077",0x82E1],
- ["8F49",0x82E2],
- ["AD55",0x82E3],
- ["D0A1",0x82E4],
- ["AD59",0x82E5],
- ["AD57",0x82E6],
- ["AD52",0x82E7],
- ["D06F",0x82E8],
- ["D07E",0x82EA],
- ["D073",0x82EB],
- ["D076",0x82EC],
- ["D0A5",0x82ED],
- ["FA4D",0x82EE],
- ["AD66",0x82EF],
- ["D07D",0x82F0],
- ["AD5E",0x82F1],
- ["D078",0x82F2],
- ["D0A4",0x82F3],
- ["D075",0x82F4],
- ["D079",0x82F5],
- ["D07C",0x82F6],
- ["9DE4",0x82F7],
- ["8CB5",0x82F8],
- ["D06D",0x82F9],
- ["D0A3",0x82FA],
- ["D07B",0x82FB],
- ["FBE9",0x82FC],
- ["9B54",0x82FD],
- ["D06C",0x82FE],
- ["99B2",0x82FF],
- ["D070",0x8300],
- ["AD5F",0x8301],
- ["AD5A",0x8302],
- ["AD53",0x8303],
- ["AD58",0x8304],
- ["AD54",0x8305],
- ["AD67",0x8306],
- ["D06E",0x8307],
- ["D3A5",0x8308],
- ["AD5B",0x8309],
- ["9E68",0x830B],
- ["D07A",0x830C],
- ["CE41",0x830D],
- ["D3A8",0x8316],
- ["AFFA",0x8317],
- ["8F4A",0x8318],
- ["D376",0x8319],
- ["8F42",0x831A],
- ["D3A3",0x831B],
- ["D37D",0x831C],
- ["8F51",0x831D],
- ["D3B2",0x831E],
- ["D3AA",0x8320],
- ["D37E",0x8322],
- ["D3A9",0x8324],
- ["D378",0x8325],
- ["D37C",0x8326],
- ["D3B5",0x8327],
- ["AFFD",0x8328],
- ["D3AD",0x8329],
- ["D3A4",0x832A],
- ["AFED",0x832B],
- ["D3B3",0x832C],
- ["D374",0x832D],
- ["D3AC",0x832F],
- ["AFFC",0x8331],
- ["AFF7",0x8332],
- ["D373",0x8333],
- ["AFF5",0x8334],
- ["AFF4",0x8335],
- ["AFF9",0x8336],
- ["D3AB",0x8337],
- ["AFF1",0x8338],
- ["AFF8",0x8339],
- ["D072",0x833A],
- ["DB5C",0x833B],
- ["D3A6",0x833C],
- ["9846",0x833D],
- ["D37A",0x833F],
- ["AFFB",0x8340],
- ["D37B",0x8341],
- ["D3A1",0x8342],
- ["AFFE",0x8343],
- ["D375",0x8344],
- ["D3AF",0x8345],
- ["D3AE",0x8347],
- ["D3B6",0x8348],
- ["AFF3",0x8349],
- ["AFF0",0x834A],
- ["D3B4",0x834B],
- ["D3B0",0x834C],
- ["D3A7",0x834D],
- ["D3A2",0x834E],
- ["AFF6",0x834F],
- ["AFF2",0x8350],
- ["D377",0x8351],
- ["AFEE",0x8352],
- ["D3B1",0x8353],
- ["AFEF",0x8354],
- ["D379",0x8356],
- ["99B4",0x8357],
- ["8EF5",0x8362],
- ["FD55",0x8363],
- ["9CCD",0x8366],
- ["8978",0x836F],
- ["D75E",0x8373],
- ["D760",0x8374],
- ["D765",0x8375],
- ["D779",0x8376],
- ["B2FC",0x8377],
- ["B2F2",0x8378],
- ["D75D",0x837A],
- ["B2FD",0x837B],
- ["B2FE",0x837C],
- ["D768",0x837D],
- ["D76F",0x837E],
- ["D775",0x837F],
- ["D762",0x8381],
- ["D769",0x8383],
- ["8F53",0x8385],
- ["B340",0x8386],
- ["D777",0x8387],
- ["D772",0x8388],
- ["B2FA",0x8389],
- ["B2F8",0x838A],
- ["D76E",0x838B],
- ["D76A",0x838C],
- ["D75C",0x838D],
- ["B2EF",0x838E],
- ["D761",0x838F],
- ["D759",0x8390],
- ["8F6F",0x8391],
- ["B2F7",0x8392],
- ["B2F9",0x8393],
- ["D766",0x8394],
- ["D763",0x8395],
- ["B2F4",0x8396],
- ["D773",0x8397],
- ["B2F1",0x8398],
- ["D764",0x8399],
- ["D77A",0x839A],
- ["D76C",0x839B],
- ["8E63",0x839C],
- ["D76B",0x839D],
- ["B2F0",0x839E],
- ["B2FB",0x83A0],
- ["B2F3",0x83A2],
- ["D75A",0x83A3],
- ["D75F",0x83A4],
- ["D770",0x83A5],
- ["D776",0x83A6],
- ["B341",0x83A7],
- ["D75B",0x83A8],
- ["D767",0x83A9],
- ["D76D",0x83AA],
- ["B2F6",0x83AB],
- ["8F56",0x83AC],
- ["D778",0x83AE],
- ["D771",0x83AF],
- ["D774",0x83B0],
- ["FE76",0x83B9],
- ["B2F5",0x83BD],
- ["9FC6",0x83BE],
- ["DB6C",0x83BF],
- ["DB60",0x83C0],
- ["B5D7",0x83C1],
- ["DB7D",0x83C2],
- ["DBA7",0x83C3],
- ["DBAA",0x83C4],
- ["B5D5",0x83C5],
- ["DB68",0x83C6],
- ["DBA3",0x83C7],
- ["DB69",0x83C8],
- ["DB77",0x83C9],
- ["B5E2",0x83CA],
- ["DB73",0x83CB],
- ["B5DF",0x83CC],
- ["FAAC",0x83CD],
- ["DB74",0x83CE],
- ["DB5D",0x83CF],
- ["DBA4",0x83D1],
- ["8F58",0x83D3],
- ["B5E8",0x83D4],
- ["DBA1",0x83D5],
- ["DB75",0x83D6],
- ["DBAC",0x83D7],
- ["DB70",0x83D8],
- ["DFC8",0x83D9],
- ["DBAF",0x83DB],
- ["B5E6",0x83DC],
- ["DB6E",0x83DD],
- ["DB7A",0x83DE],
- ["B5E9",0x83DF],
- ["B5D4",0x83E0],
- ["DB72",0x83E1],
- ["DBAD",0x83E2],
- ["DB6B",0x83E3],
- ["DB64",0x83E4],
- ["DB6F",0x83E5],
- ["DB63",0x83E7],
- ["DB61",0x83E8],
- ["B5D0",0x83E9],
- ["DBA5",0x83EA],
- ["DB6A",0x83EB],
- ["DBA8",0x83EC],
- ["9848",0x83ED],
- ["DBA9",0x83EE],
- ["B5D8",0x83EF],
- ["B5DD",0x83F0],
- ["B5D9",0x83F1],
- ["B5E1",0x83F2],
- ["DB7E",0x83F3],
- ["B5DA",0x83F4],
- ["DB76",0x83F5],
- ["DB66",0x83F6],
- ["B5D2",0x83F8],
- ["DB5E",0x83F9],
- ["DBA2",0x83FA],
- ["DBAB",0x83FB],
- ["DB65",0x83FC],
- ["B5E0",0x83FD],
- ["DBB0",0x83FE],
- ["DB71",0x83FF],
- ["DB6D",0x8401],
- ["B5D1",0x8403],
- ["B5E5",0x8404],
- ["99B7",0x8405],
- ["DB7C",0x8406],
- ["B5E7",0x8407],
- ["DB78",0x8409],
- ["B5DC",0x840A],
- ["B5D6",0x840B],
- ["B5DE",0x840C],
- ["B5D3",0x840D],
- ["B5E4",0x840E],
- ["DB79",0x840F],
- ["DB67",0x8410],
- ["DB7B",0x8411],
- ["DB62",0x8412],
- ["DBA6",0x8413],
- ["9665",0x8414],
- ["FA6C",0x8416],
- ["9DE7",0x8418],
- ["DBAE",0x841B],
- ["9E62",0x841C],
- ["96CC",0x8420],
- ["8E67",0x8421],
- ["DB5F",0x8423],
- ["FC75",0x8424],
- ["987E",0x8426],
- ["DFC7",0x8429],
- ["DFDD",0x842B],
- ["B855",0x842C],
- ["DFCC",0x842D],
- ["FDB9",0x842E],
- ["DFCA",0x842F],
- ["DFB5",0x8430],
- ["B8A9",0x8431],
- ["DFC5",0x8432],
- ["DFD9",0x8433],
- ["DFC1",0x8434],
- ["B8B1",0x8435],
- ["DFD8",0x8436],
- ["DFBF",0x8437],
- ["B5E3",0x8438],
- ["DFCF",0x8439],
- ["DFC0",0x843A],
- ["DFD6",0x843B],
- ["B8B0",0x843C],
- ["B8A8",0x843D],
- ["97FC",0x843E],
- ["DFAA",0x843F],
- ["DFB2",0x8440],
- ["DFCB",0x8442],
- ["DFC3",0x8443],
- ["DFDC",0x8444],
- ["DFC6",0x8445],
- ["B8B6",0x8446],
- ["DFD7",0x8447],
- ["98F9",0x8448],
- ["B8AD",0x8449],
- ["8F66",0x844A],
- ["DFC9",0x844B],
- ["DFD1",0x844C],
- ["DFB6",0x844D],
- ["DFD0",0x844E],
- ["DFE1",0x8450],
- ["DFB1",0x8451],
- ["DFD2",0x8452],
- ["956E",0x8453],
- ["DFDF",0x8454],
- ["9245",0x8455],
- ["DFAB",0x8456],
- ["B5DB",0x8457],
- ["8F60",0x8458],
- ["DFB9",0x8459],
- ["DFB8",0x845A],
- ["B8AF",0x845B],
- ["9ED1",0x845C],
- ["DFBC",0x845D],
- ["DFBE",0x845E],
- ["DFCD",0x845F],
- ["DFDE",0x8460],
- ["B8B2",0x8461],
- ["FECD",0x8462],
- ["B8B3",0x8463],
- ["99B9",0x8464],
- ["DFB0",0x8465],
- ["B8AB",0x8466],
- ["DFB4",0x8467],
- ["DFDA",0x8468],
- ["B8B4",0x8469],
- ["B8AC",0x846B],
- ["B8AE",0x846C],
- ["B8B5",0x846D],
- ["DFE0",0x846E],
- ["DFD3",0x846F],
- ["DFCE",0x8470],
- ["8F62",0x8471],
- ["974C",0x8472],
- ["DFBB",0x8473],
- ["DFBA",0x8474],
- ["B8AA",0x8475],
- ["DFAC",0x8476],
- ["B8A7",0x8477],
- ["DFC4",0x8478],
- ["DFAD",0x8479],
- ["DFC2",0x847A],
- ["DFB7",0x847D],
- ["DFDB",0x847E],
- ["91C7",0x847F],
- ["955F",0x8480],
- ["B8A6",0x8482],
- ["DFB3",0x8486],
- ["99BB",0x8488],
- ["DFAF",0x848D],
- ["DFD5",0x848E],
- ["DFAE",0x848F],
- ["BB60",0x8490],
- ["E3D3",0x8491],
- ["8E6D",0x8492],
- ["8F71",0x8493],
- ["E3C2",0x8494],
- ["94CB",0x8496],
- ["E3AC",0x8497],
- ["E3CA",0x8498],
- ["BB58",0x8499],
- ["E3BB",0x849A],
- ["E3C5",0x849B],
- ["BB5B",0x849C],
- ["E3BE",0x849D],
- ["BB59",0x849E],
- ["E3AF",0x849F],
- ["E3CD",0x84A0],
- ["E3AE",0x84A1],
- ["E3C1",0x84A2],
- ["95B1",0x84A3],
- ["E3AD",0x84A4],
- ["E3BF",0x84A7],
- ["E3C8",0x84A8],
- ["E3C6",0x84A9],
- ["E3BA",0x84AA],
- ["E3B5",0x84AB],
- ["E3B3",0x84AC],
- ["9AF2",0x84AD],
- ["E3B4",0x84AE],
- ["E3C7",0x84AF],
- ["E3D2",0x84B0],
- ["E3BC",0x84B1],
- ["BB5A",0x84B2],
- ["E3B7",0x84B4],
- ["E3CB",0x84B6],
- ["BB5D",0x84B8],
- ["E3B6",0x84B9],
- ["E3B0",0x84BA],
- ["E3C0",0x84BB],
- ["BB61",0x84BC],
- ["96C3",0x84BD],
- ["99BD",0x84BE],
- ["BB55",0x84BF],
- ["BB5E",0x84C0],
- ["E3B8",0x84C1],
- ["E3B2",0x84C2],
- ["BB57",0x84C4],
- ["DFD4",0x84C5],
- ["BB56",0x84C6],
- ["E3C3",0x84C7],
- ["BB54",0x84C9],
- ["BB63",0x84CA],
- ["BB5C",0x84CB],
- ["E3C4",0x84CC],
- ["E3B9",0x84CD],
- ["E3B1",0x84CE],
- ["E3CC",0x84CF],
- ["E3BD",0x84D0],
- ["BB62",0x84D1],
- ["E3D0",0x84D2],
- ["BB5F",0x84D3],
- ["E3CF",0x84D4],
- ["E3C9",0x84D6],
- ["E3CE",0x84D7],
- ["A0CF",0x84DA],
- ["E3D1",0x84DB],
- ["8F6D",0x84DE],
- ["99BE",0x84E1],
- ["8EF4",0x84E2],
- ["8F72",0x84E4],
- ["95E4",0x84E5],
- ["E773",0x84E7],
- ["E774",0x84E8],
- ["E767",0x84E9],
- ["E766",0x84EA],
- ["E762",0x84EB],
- ["BDB4",0x84EC],
- ["BDAC",0x84EE],
- ["E776",0x84EF],
- ["E775",0x84F0],
- ["DFA9",0x84F1],
- ["E75F",0x84F2],
- ["E763",0x84F3],
- ["E75D",0x84F4],
- ["E770",0x84F6],
- ["E761",0x84F7],
- ["99BF",0x84F8],
- ["E777",0x84F9],
- ["E75A",0x84FA],
- ["E758",0x84FB],
- ["E764",0x84FC],
- ["E76E",0x84FD],
- ["E769",0x84FE],
- ["BDB6",0x84FF],
- ["E74F",0x8500],
- ["E76D",0x8502],
- ["9242",0x8503],
- ["FBA5",0x8505],
- ["BDB7",0x8506],
- ["DFBD",0x8507],
- ["E75B",0x8508],
- ["E752",0x8509],
- ["E755",0x850A],
- ["E77B",0x850B],
- ["E75C",0x850C],
- ["E753",0x850D],
- ["E751",0x850E],
- ["E74E",0x850F],
- ["99C0",0x8510],
- ["BDB0",0x8511],
- ["E765",0x8512],
- ["BDAF",0x8513],
- ["BDB3",0x8514],
- ["E760",0x8515],
- ["E768",0x8516],
- ["BDA9",0x8517],
- ["E778",0x8518],
- ["E77C",0x8519],
- ["BDAB",0x851A],
- ["E757",0x851C],
- ["E76B",0x851D],
- ["E76F",0x851E],
- ["E754",0x851F],
- ["E779",0x8520],
- ["BDB2",0x8521],
- ["BDB1",0x8523],
- ["E74C",0x8524],
- ["BDB5",0x8525],
- ["E772",0x8526],
- ["E756",0x8527],
- ["E76A",0x8528],
- ["E750",0x8529],
- ["E75E",0x852A],
- ["E759",0x852B],
- ["BDAD",0x852C],
- ["BDAE",0x852D],
- ["E76C",0x852E],
- ["E77D",0x852F],
- ["E77A",0x8530],
- ["E771",0x8531],
- ["FDB4",0x8533],
- ["8F77",0x8534],
- ["99C1",0x8538],
- ["E74D",0x853B],
- ["BDAA",0x853D],
- ["EB49",0x853E],
- ["EB40",0x8540],
- ["EB43",0x8541],
- ["FAB9",0x8542],
- ["BFBB",0x8543],
- ["EB45",0x8544],
- ["EAF9",0x8545],
- ["EB41",0x8546],
- ["EB47",0x8547],
- ["BFB8",0x8548],
- ["BFBC",0x8549],
- ["BFB6",0x854A],
- ["8F40",0x854B],
- ["FA44",0x854C],
- ["EAFB",0x854D],
- ["EB4C",0x854E],
- ["EB46",0x8551],
- ["99C2",0x8552],
- ["EAFC",0x8553],
- ["EB55",0x8554],
- ["EB4F",0x8555],
- ["EAF8",0x8556],
- ["EE46",0x8557],
- ["EAFE",0x8558],
- ["BFB7",0x8559],
- ["8F5C",0x855A],
- ["EB4A",0x855B],
- ["EB54",0x855D],
- ["BFBF",0x855E],
- ["8CBD",0x855F],
- ["EB51",0x8560],
- ["EAFD",0x8561],
- ["EB44",0x8562],
- ["EB48",0x8563],
- ["EB42",0x8564],
- ["EB56",0x8565],
- ["EB53",0x8566],
- ["EB50",0x8567],
- ["BFB9",0x8568],
- ["BFBA",0x8569],
- ["BFBE",0x856A],
- ["EAFA",0x856B],
- ["EB57",0x856C],
- ["BFBD",0x856D],
- ["EB4D",0x856E],
- ["99C4",0x856F],
- ["99C5",0x8570],
- ["EB4B",0x8571],
- ["8F7B",0x8573],
- ["EB4E",0x8575],
- ["EE53",0x8576],
- ["EE40",0x8577],
- ["EE45",0x8578],
- ["EE52",0x8579],
- ["EE44",0x857A],
- ["EDFB",0x857B],
- ["EE41",0x857C],
- ["C1A2",0x857E],
- ["EDF4",0x8580],
- ["EE4D",0x8581],
- ["EE4F",0x8582],
- ["EDF3",0x8583],
- ["C1A1",0x8584],
- ["EE51",0x8585],
- ["EE49",0x8586],
- ["C1A8",0x8587],
- ["EE50",0x8588],
- ["EE42",0x8589],
- ["C1AA",0x858A],
- ["EDF9",0x858B],
- ["EB52",0x858C],
- ["EE4A",0x858D],
- ["EE47",0x858E],
- ["EDF5",0x858F],
- ["EE55",0x8590],
- ["C1A4",0x8591],
- ["8776",0x8593],
- ["C1A5",0x8594],
- ["EDF7",0x8595],
- ["EE48",0x8596],
- ["8CB6",0x8597],
- ["EE54",0x8598],
- ["EE4B",0x8599],
- ["EDFD",0x859A],
- ["C1A7",0x859B],
- ["C1A3",0x859C],
- ["EE4C",0x859D],
- ["EDFE",0x859E],
- ["EE56",0x859F],
- ["EDF8",0x85A0],
- ["EE43",0x85A1],
- ["EE4E",0x85A2],
- ["EDFA",0x85A3],
- ["EDFC",0x85A4],
- ["C2CB",0x85A6],
- ["EDF6",0x85A7],
- ["C1A9",0x85A8],
- ["C2C4",0x85A9],
- ["C17E",0x85AA],
- ["C1A6",0x85AF],
- ["C2C8",0x85B0],
- ["F0B3",0x85B1],
- ["F0A9",0x85B3],
- ["F0A4",0x85B4],
- ["F0AA",0x85B5],
- ["F0B4",0x85B6],
- ["F0B8",0x85B7],
- ["F0B7",0x85B8],
- ["C2CA",0x85B9],
- ["C2C9",0x85BA],
- ["F0AB",0x85BD],
- ["F0B9",0x85BE],
- ["F0AE",0x85BF],
- ["F0A6",0x85C0],
- ["8FA3",0x85C1],
- ["F0A8",0x85C2],
- ["F0A7",0x85C3],
- ["F0AD",0x85C4],
- ["F0B2",0x85C5],
- ["F0A5",0x85C6],
- ["F0AC",0x85C7],
- ["F0B1",0x85C8],
- ["C2C7",0x85C9],
- ["F0AF",0x85CB],
- ["C2C5",0x85CD],
- ["F0B0",0x85CE],
- ["C2C3",0x85CF],
- ["C2C6",0x85D0],
- ["F2D5",0x85D1],
- ["F0B5",0x85D2],
- ["C3C2",0x85D5],
- ["8CCE",0x85D6],
- ["F2CD",0x85D7],
- ["F2D1",0x85D8],
- ["F2C9",0x85D9],
- ["F2CC",0x85DA],
- ["F2D4",0x85DC],
- ["C3C0",0x85DD],
- ["F2D9",0x85DE],
- ["F2D2",0x85DF],
- ["99C6",0x85E0],
- ["F2CA",0x85E1],
- ["F2DA",0x85E2],
- ["F2D3",0x85E3],
- ["C3C3",0x85E4],
- ["C3C4",0x85E5],
- ["F2D7",0x85E6],
- ["F2CB",0x85E8],
- ["C3BF",0x85E9],
- ["C3C1",0x85EA],
- ["F2C6",0x85EB],
- ["F2CE",0x85EC],
- ["F2C8",0x85ED],
- ["96CD",0x85EE],
- ["F2D8",0x85EF],
- ["F2D6",0x85F0],
- ["F2C7",0x85F1],
- ["F2CF",0x85F2],
- ["F4BE",0x85F6],
- ["C3C5",0x85F7],
- ["F2D0",0x85F8],
- ["C4A7",0x85F9],
- ["C4A9",0x85FA],
- ["C4A6",0x85FB],
- ["96C7",0x85FC],
- ["F4C3",0x85FD],
- ["F4BB",0x85FE],
- ["F4B9",0x85FF],
- ["F4BD",0x8600],
- ["F4BA",0x8601],
- ["8FA5",0x8602],
- ["F4BF",0x8604],
- ["F4C1",0x8605],
- ["C4AA",0x8606],
- ["C4AC",0x8607],
- ["F4C0",0x8609],
- ["C4AD",0x860A],
- ["C4AB",0x860B],
- ["F4C2",0x860C],
- ["FABB",0x860D],
- ["8C61",0x860F],
- ["9570",0x8610],
- ["C4A8",0x8611],
- ["9368",0x8614],
- ["8F7E",0x8616],
- ["C4F4",0x8617],
- ["F5F1",0x8618],
- ["F5F7",0x8619],
- ["C4F6",0x861A],
- ["F4BC",0x861B],
- ["F5F6",0x861C],
- ["F5FD",0x861E],
- ["F5F4",0x861F],
- ["F5FB",0x8620],
- ["F5FA",0x8621],
- ["F4B8",0x8622],
- ["F5F5",0x8623],
- ["F0B6",0x8624],
- ["F5FE",0x8625],
- ["F5F3",0x8626],
- ["F5F8",0x8627],
- ["8FAA",0x8628],
- ["F5FC",0x8629],
- ["F5F2",0x862A],
- ["F74A",0x862C],
- ["C4F5",0x862D],
- ["F5F9",0x862E],
- ["A050",0x862F],
- ["F7F4",0x8631],
- ["F74B",0x8632],
- ["F749",0x8633],
- ["F747",0x8634],
- ["F748",0x8635],
- ["F74C",0x8636],
- ["C5D9",0x8638],
- ["F7F2",0x8639],
- ["F7F0",0x863A],
- ["F7F5",0x863B],
- ["F7F3",0x863C],
- ["F7F6",0x863E],
- ["C5DA",0x863F],
- ["F7F1",0x8640],
- ["90D3",0x8642],
- ["F8BC",0x8643],
- ["9556",0x8645],
- ["F945",0x8646],
- ["F946",0x8647],
- ["F947",0x8648],
- ["F9C7",0x864B],
- ["F9BD",0x864C],
- ["CA4F",0x864D],
- ["AAEA",0x864E],
- ["AD68",0x8650],
- ["D3B8",0x8652],
- ["D3B7",0x8653],
- ["B040",0x8654],
- ["B342",0x8655],
- ["D77C",0x8656],
- ["D77B",0x8659],
- ["B5EA",0x865B],
- ["B8B8",0x865C],
- ["B8B7",0x865E],
- ["B8B9",0x865F],
- ["E3D4",0x8661],
- ["E77E",0x8662],
- ["EB58",0x8663],
- ["EB5A",0x8664],
- ["EB59",0x8665],
- ["C1AB",0x8667],
- ["EE57",0x8668],
- ["F0BA",0x8669],
- ["F9A5",0x866A],
- ["A6E4",0x866B],
- ["8FB8",0x866C],
- ["CDC9",0x866D],
- ["CDCA",0x866E],
- ["CDC8",0x866F],
- ["CDC7",0x8670],
- ["AAEB",0x8671],
- ["99C8",0x8672],
- ["D0A9",0x8673],
- ["D0A7",0x8674],
- ["D0A6",0x8677],
- ["AD69",0x8679],
- ["AD6B",0x867A],
- ["AD6A",0x867B],
- ["D0A8",0x867C],
- ["8FAF",0x867E],
- ["D3C4",0x8685],
- ["D3C1",0x8686],
- ["D3BF",0x8687],
- ["B041",0x868A],
- ["D3C2",0x868B],
- ["B046",0x868C],
- ["D3BC",0x868D],
- ["D3CB",0x868E],
- ["D3CD",0x8690],
- ["D3BD",0x8691],
- ["99C9",0x8692],
- ["B043",0x8693],
- ["D3CE",0x8694],
- ["D3C9",0x8695],
- ["D3BB",0x8696],
- ["D3C0",0x8697],
- ["D3CA",0x8698],
- ["D3C6",0x8699],
- ["D3C3",0x869A],
- ["B048",0x869C],
- ["D3CC",0x869D],
- ["D3BE",0x869E],
- ["9579",0x86A0],
- ["D3C7",0x86A1],
- ["D3B9",0x86A2],
- ["B047",0x86A3],
- ["B044",0x86A4],
- ["D3C5",0x86A5],
- ["D3C8",0x86A7],
- ["D3BA",0x86A8],
- ["B045",0x86A9],
- ["B042",0x86AA],
- ["9F49",0x86AD],
- ["B34C",0x86AF],
- ["D7A5",0x86B0],
- ["B34B",0x86B1],
- ["99CA",0x86B2],
- ["D7A8",0x86B3],
- ["D7AB",0x86B4],
- ["B348",0x86B5],
- ["B346",0x86B6],
- ["D77E",0x86B7],
- ["D7A9",0x86B8],
- ["D7A7",0x86B9],
- ["D7A4",0x86BA],
- ["D7AC",0x86BB],
- ["D7AD",0x86BC],
- ["D7AF",0x86BD],
- ["D7B0",0x86BE],
- ["D77D",0x86BF],
- ["B345",0x86C0],
- ["D7A2",0x86C1],
- ["D7A1",0x86C2],
- ["D7AE",0x86C3],
- ["B347",0x86C4],
- ["D7A3",0x86C5],
- ["B349",0x86C6],
- ["B344",0x86C7],
- ["D7A6",0x86C8],
- ["B34D",0x86C9],
- ["B34A",0x86CB],
- ["D7AA",0x86CC],
- ["B5F1",0x86D0],
- ["DBBF",0x86D1],
- ["DBB4",0x86D3],
- ["B5EE",0x86D4],
- ["DFE7",0x86D6],
- ["DBBD",0x86D7],
- ["DBB1",0x86D8],
- ["B5EC",0x86D9],
- ["DBB6",0x86DA],
- ["B5EF",0x86DB],
- ["DBBA",0x86DC],
- ["DBB8",0x86DD],
- ["B5F2",0x86DE],
- ["B5EB",0x86DF],
- ["DBB2",0x86E2],
- ["DBB5",0x86E3],
- ["B5F0",0x86E4],
- ["DBB3",0x86E6],
- ["DBBE",0x86E8],
- ["DBBC",0x86E9],
- ["DBB7",0x86EA],
- ["DBB9",0x86EB],
- ["DBBB",0x86EC],
- ["B5ED",0x86ED],
- ["99CB",0x86EF],
- ["DFE8",0x86F5],
- ["DFEE",0x86F6],
- ["DFE4",0x86F7],
- ["DFEA",0x86F8],
- ["B8BA",0x86F9],
- ["DFE6",0x86FA],
- ["B8C0",0x86FB],
- ["B8BF",0x86FE],
- ["B8BE",0x8700],
- ["DFED",0x8701],
- ["B8C1",0x8702],
- ["B8C2",0x8703],
- ["DFE3",0x8704],
- ["DFF0",0x8705],
- ["B8C3",0x8706],
- ["B8BD",0x8707],
- ["B8BC",0x8708],
- ["DFEC",0x8709],
- ["B8C4",0x870A],
- ["DFE2",0x870B],
- ["DFE5",0x870C],
- ["DFEF",0x870D],
- ["DFEB",0x870E],
- ["E3F4",0x8711],
- ["E3E9",0x8712],
- ["B8BB",0x8713],
- ["BB6A",0x8718],
- ["E3DD",0x8719],
- ["E3F2",0x871A],
- ["E3DE",0x871B],
- ["BB65",0x871C],
- ["E3DB",0x871E],
- ["E3E4",0x8720],
- ["E3DC",0x8721],
- ["BB67",0x8722],
- ["E3D6",0x8723],
- ["E3F1",0x8724],
- ["BB68",0x8725],
- ["E3EE",0x8726],
- ["E3EF",0x8727],
- ["E3D7",0x8728],
- ["BB6D",0x8729],
- ["E3E6",0x872A],
- ["E3E0",0x872C],
- ["E3E7",0x872D],
- ["E3DA",0x872E],
- ["E3F3",0x8730],
- ["E3EB",0x8731],
- ["E3E5",0x8732],
- ["E3D5",0x8733],
- ["BB69",0x8734],
- ["E3EC",0x8735],
- ["BB6C",0x8737],
- ["E3F0",0x8738],
- ["E3EA",0x873A],
- ["BB66",0x873B],
- ["E3E8",0x873C],
- ["E3E2",0x873E],
- ["BB64",0x873F],
- ["E3D9",0x8740],
- ["E3E1",0x8741],
- ["E3ED",0x8742],
- ["E3DF",0x8743],
- ["E3E3",0x8746],
- ["BDC1",0x874C],
- ["DFE9",0x874D],
- ["E7B2",0x874E],
- ["E7BB",0x874F],
- ["E7B1",0x8750],
- ["E7AD",0x8751],
- ["E7AA",0x8752],
- ["BDC2",0x8753],
- ["E7A8",0x8754],
- ["BB6B",0x8755],
- ["E7A1",0x8756],
- ["BDC0",0x8757],
- ["E7A7",0x8758],
- ["BDBF",0x8759],
- ["E7AC",0x875A],
- ["E7A9",0x875B],
- ["E7B9",0x875C],
- ["E7B4",0x875D],
- ["E7AE",0x875E],
- ["E7B3",0x875F],
- ["BDBB",0x8760],
- ["E7AB",0x8761],
- ["E7BE",0x8762],
- ["E7A2",0x8763],
- ["E7A3",0x8764],
- ["E7BA",0x8765],
- ["BDBC",0x8766],
- ["E7BF",0x8767],
- ["BDBE",0x8768],
- ["E7C0",0x8769],
- ["E7B0",0x876A],
- ["E3D8",0x876B],
- ["E7B6",0x876C],
- ["E7AF",0x876D],
- ["E7B8",0x876E],
- ["E7B5",0x876F],
- ["9DD5",0x8770],
- ["8FB0",0x8771],
- ["E7A6",0x8773],
- ["BDB9",0x8774],
- ["E7BD",0x8775],
- ["BDBA",0x8776],
- ["E7A4",0x8777],
- ["BDBD",0x8778],
- ["EB64",0x8779],
- ["E7B7",0x877A],
- ["E7BC",0x877B],
- ["FA7A",0x877D],
- ["EB61",0x8781],
- ["BDB8",0x8782],
- ["BFC0",0x8783],
- ["EB6B",0x8784],
- ["EB67",0x8785],
- ["9E5F",0x8786],
- ["EB65",0x8787],
- ["EB60",0x8788],
- ["EB6F",0x8789],
- ["99CD",0x878B],
- ["A0C9",0x878C],
- ["BFC4",0x878D],
- ["EB5C",0x878F],
- ["EB68",0x8790],
- ["EB69",0x8791],
- ["EB5F",0x8792],
- ["EB5E",0x8793],
- ["EB6C",0x8794],
- ["EB62",0x8796],
- ["EB5D",0x8797],
- ["EB63",0x8798],
- ["EB6E",0x879A],
- ["EB5B",0x879B],
- ["EB6D",0x879C],
- ["EB6A",0x879D],
- ["BFC2",0x879E],
- ["BFC1",0x879F],
- ["BFC3",0x87A2],
- ["EB66",0x87A3],
- ["F0CB",0x87A4],
- ["9ADB",0x87A5],
- ["A0C6",0x87A9],
- ["EE59",0x87AA],
- ["C1B1",0x87AB],
- ["EE5D",0x87AC],
- ["EE5A",0x87AD],
- ["EE61",0x87AE],
- ["EE67",0x87AF],
- ["EE5C",0x87B0],
- ["8FB4",0x87B1],
- ["EE70",0x87B2],
- ["C1AE",0x87B3],
- ["EE6A",0x87B4],
- ["EE5F",0x87B5],
- ["EE6B",0x87B6],
- ["EE66",0x87B7],
- ["EE6D",0x87B8],
- ["EE5E",0x87B9],
- ["C1B3",0x87BA],
- ["C1B2",0x87BB],
- ["EE60",0x87BC],
- ["EE6E",0x87BD],
- ["EE58",0x87BE],
- ["EE6C",0x87BF],
- ["C1AC",0x87C0],
- ["A0D7",0x87C1],
- ["EE64",0x87C2],
- ["EE63",0x87C3],
- ["EE68",0x87C4],
- ["EE5B",0x87C5],
- ["C1B0",0x87C6],
- ["C1B4",0x87C8],
- ["EE62",0x87C9],
- ["EE69",0x87CA],
- ["C1B5",0x87CB],
- ["EE65",0x87CC],
- ["A0C7",0x87CE],
- ["C1AD",0x87D1],
- ["C1AF",0x87D2],
- ["F0C7",0x87D3],
- ["F0C5",0x87D4],
- ["A043",0x87D6],
- ["F0CC",0x87D7],
- ["F0C9",0x87D8],
- ["F0CD",0x87D9],
- ["8FB5",0x87DA],
- ["F0BE",0x87DB],
- ["F0C6",0x87DC],
- ["F0D1",0x87DD],
- ["EE6F",0x87DE],
- ["F0C2",0x87DF],
- ["C2CF",0x87E0],
- ["E7A5",0x87E1],
- ["F0BD",0x87E2],
- ["F0CA",0x87E3],
- ["F0C4",0x87E4],
- ["F0C1",0x87E5],
- ["F0BC",0x87E6],
- ["F0BB",0x87E7],
- ["F0D0",0x87E8],
- ["F0C0",0x87EA],
- ["F0BF",0x87EB],
- ["C2CD",0x87EC],
- ["F0C8",0x87ED],
- ["8FB2",0x87EE],
- ["C2CC",0x87EF],
- ["C2CE",0x87F2],
- ["F0C3",0x87F3],
- ["F0CF",0x87F4],
- ["A061",0x87F5],
- ["F2DE",0x87F6],
- ["F2DF",0x87F7],
- ["C3C9",0x87F9],
- ["F2DC",0x87FA],
- ["C3C6",0x87FB],
- ["F2E4",0x87FC],
- ["C3CA",0x87FE],
- ["F2E6",0x87FF],
- ["F2DB",0x8800],
- ["F0CE",0x8801],
- ["F2E8",0x8802],
- ["F2DD",0x8803],
- ["9E5E",0x8804],
- ["C3C7",0x8805],
- ["F2E3",0x8806],
- ["F2E5",0x8808],
- ["F2E0",0x8809],
- ["F2E7",0x880A],
- ["F2E2",0x880B],
- ["F2E1",0x880C],
- ["C3C8",0x880D],
- ["8FB6",0x880F],
- ["F4C5",0x8810],
- ["F4C6",0x8811],
- ["F4C8",0x8813],
- ["C4AE",0x8814],
- ["C4AF",0x8815],
- ["F4C9",0x8816],
- ["F4C7",0x8817],
- ["9FE8",0x8818],
- ["F4C4",0x8819],
- ["F642",0x881B],
- ["F645",0x881C],
- ["F641",0x881D],
- ["C4FA",0x881F],
- ["F643",0x8820],
- ["C4F9",0x8821],
- ["C4F8",0x8822],
- ["C4F7",0x8823],
- ["F644",0x8824],
- ["F751",0x8825],
- ["F74F",0x8826],
- ["9CB2",0x8827],
- ["F74E",0x8828],
- ["F640",0x8829],
- ["F750",0x882A],
- ["F646",0x882B],
- ["F74D",0x882C],
- ["957C",0x882D],
- ["F7F9",0x882E],
- ["F7D7",0x882F],
- ["F7F7",0x8830],
- ["C5DB",0x8831],
- ["F7F8",0x8832],
- ["F7FA",0x8833],
- ["F8BF",0x8835],
- ["C5FA",0x8836],
- ["F8BE",0x8837],
- ["F8BD",0x8838],
- ["C5FB",0x8839],
- ["C65A",0x883B],
- ["F96E",0x883C],
- ["F9A7",0x883D],
- ["F9A6",0x883E],
- ["F9A8",0x883F],
- ["A6E5",0x8840],
- ["D0AA",0x8841],
- ["9FC7",0x8842],
- ["D3CF",0x8843],
- ["D3D0",0x8844],
- ["8FBB",0x8845],
- ["8FBC",0x8846],
- ["DBC0",0x8848],
- ["F647",0x884A],
- ["F8C0",0x884B],
- ["A6E6",0x884C],
- ["AD6C",0x884D],
- ["D0AB",0x884E],
- ["8FEC",0x884F],
- ["D7B1",0x8852],
- ["B34E",0x8853],
- ["DBC2",0x8855],
- ["DBC1",0x8856],
- ["B5F3",0x8857],
- ["B8C5",0x8859],
- ["E7C1",0x885A],
- ["BDC3",0x885B],
- ["BDC4",0x885D],
- ["8FC0",0x885E],
- ["936A",0x8860],
- ["BFC5",0x8861],
- ["C5FC",0x8862],
- ["A6E7",0x8863],
- ["8BE4",0x8864],
- ["9C7C",0x8865],
- ["D0AC",0x8867],
- ["AAED",0x8868],
- ["D0AE",0x8869],
- ["D0AD",0x886A],
- ["AD6D",0x886B],
- ["D3D1",0x886D],
- ["95A1",0x886E],
- ["D3D8",0x886F],
- ["B049",0x8870],
- ["D3D6",0x8871],
- ["D3D4",0x8872],
- ["D3DB",0x8874],
- ["D3D2",0x8875],
- ["D3D3",0x8876],
- ["B04A",0x8877],
- ["B04E",0x8879],
- ["D3DC",0x887C],
- ["B04D",0x887D],
- ["D3DA",0x887E],
- ["D3D7",0x887F],
- ["D3D5",0x8880],
- ["B04B",0x8881],
- ["B04C",0x8882],
- ["D3D9",0x8883],
- ["FEEC",0x8884],
- ["95A3",0x8887],
- ["B350",0x8888],
- ["D7B2",0x8889],
- ["B355",0x888B],
- ["D7C2",0x888C],
- ["B354",0x888D],
- ["D7C4",0x888E],
- ["8C45",0x888F],
- ["8CB8",0x8890],
- ["D7B8",0x8891],
- ["B352",0x8892],
- ["D7C3",0x8893],
- ["D7B3",0x8895],
- ["B353",0x8896],
- ["D7BF",0x8897],
- ["D7BB",0x8898],
- ["D7BD",0x8899],
- ["D7B7",0x889A],
- ["D7BE",0x889B],
- ["8FC1",0x889C],
- ["B34F",0x889E],
- ["D7BA",0x889F],
- ["A052",0x88A0],
- ["D7B9",0x88A1],
- ["D7B5",0x88A2],
- ["D7C0",0x88A4],
- ["D7BC",0x88A7],
- ["D7B4",0x88A8],
- ["D7B6",0x88AA],
- ["B351",0x88AB],
- ["D7C1",0x88AC],
- ["99D0",0x88AE],
- ["B5F6",0x88B1],
- ["DBCD",0x88B2],
- ["8FC3",0x88B4],
- ["8FC4",0x88B5],
- ["DBC9",0x88B6],
- ["DBCB",0x88B7],
- ["DBC6",0x88B8],
- ["DBC5",0x88B9],
- ["DBC3",0x88BA],
- ["DBCA",0x88BC],
- ["DBCC",0x88BD],
- ["DBC8",0x88BE],
- ["95A4",0x88BF],
- ["DBC7",0x88C0],
- ["B5F4",0x88C1],
- ["B5F5",0x88C2],
- ["8FC6",0x88C5],
- ["9E60",0x88C7],
- ["DBCF",0x88C9],
- ["B8CD",0x88CA],
- ["DFF2",0x88CB],
- ["DFF8",0x88CC],
- ["DFF3",0x88CD],
- ["DFF4",0x88CE],
- ["F9D8",0x88CF],
- ["DFF9",0x88D0],
- ["B8CF",0x88D2],
- ["B8C7",0x88D4],
- ["B8CE",0x88D5],
- ["DFF1",0x88D6],
- ["DBC4",0x88D7],
- ["B8CA",0x88D8],
- ["B8C8",0x88D9],
- ["DFF7",0x88DA],
- ["DFF6",0x88DB],
- ["B8C9",0x88DC],
- ["B8CB",0x88DD],
- ["DFF5",0x88DE],
- ["B8C6",0x88DF],
- ["B8CC",0x88E1],
- ["95A5",0x88E6],
- ["E3F6",0x88E7],
- ["BB74",0x88E8],
- ["E442",0x88EB],
- ["E441",0x88EC],
- ["E3FB",0x88EE],
- ["BB76",0x88EF],
- ["E440",0x88F0],
- ["E3F7",0x88F1],
- ["E3F8",0x88F2],
- ["BB6E",0x88F3],
- ["BB70",0x88F4],
- ["9CB3",0x88F5],
- ["E3FD",0x88F6],
- ["E3F5",0x88F7],
- ["BB72",0x88F8],
- ["BB71",0x88F9],
- ["E3F9",0x88FA],
- ["E3FE",0x88FB],
- ["E3FC",0x88FC],
- ["BB73",0x88FD],
- ["E3FA",0x88FE],
- ["99D1",0x88FF],
- ["FEF1",0x8900],
- ["DBCE",0x8901],
- ["BB6F",0x8902],
- ["E7C2",0x8905],
- ["E7C9",0x8906],
- ["BDC6",0x8907],
- ["E7CD",0x8909],
- ["BDCA",0x890A],
- ["E7C5",0x890B],
- ["E7C3",0x890C],
- ["E7CC",0x890E],
- ["BDC5",0x8910],
- ["E7CB",0x8911],
- ["BDC7",0x8912],
- ["BDC8",0x8913],
- ["E7C4",0x8914],
- ["BDC9",0x8915],
- ["E7CA",0x8916],
- ["E7C6",0x8917],
- ["E7C7",0x8918],
- ["E7C8",0x8919],
- ["BB75",0x891A],
- ["EB70",0x891E],
- ["EB7C",0x891F],
- ["BFCA",0x8921],
- ["EB77",0x8922],
- ["EB79",0x8923],
- ["99D2",0x8924],
- ["BFC8",0x8925],
- ["EB71",0x8926],
- ["EB75",0x8927],
- ["EB78",0x8929],
- ["BFC6",0x892A],
- ["BFC9",0x892B],
- ["EB7B",0x892C],
- ["EB73",0x892D],
- ["EB74",0x892E],
- ["EB7A",0x892F],
- ["EB72",0x8930],
- ["EB76",0x8931],
- ["BFC7",0x8932],
- ["EE72",0x8933],
- ["EE71",0x8935],
- ["C1B7",0x8936],
- ["EE77",0x8937],
- ["C1B9",0x8938],
- ["C1B6",0x893B],
- ["EE73",0x893C],
- ["C1BA",0x893D],
- ["EE74",0x893E],
- ["EE75",0x8941],
- ["EE78",0x8942],
- ["9CC2",0x8943],
- ["C1B8",0x8944],
- ["F0D6",0x8946],
- ["99D3",0x8947],
- ["F0D9",0x8949],
- ["F0D3",0x894B],
- ["F0D5",0x894C],
- ["95A7",0x894D],
- ["F0D4",0x894F],
- ["F0D7",0x8950],
- ["F0D8",0x8951],
- ["EE76",0x8952],
- ["F0D2",0x8953],
- ["95A9",0x8954],
- ["C3CD",0x8956],
- ["F2EC",0x8957],
- ["F2EF",0x8958],
- ["F2F1",0x8959],
- ["F2EA",0x895A],
- ["F2EB",0x895B],
- ["F2EE",0x895C],
- ["F2F0",0x895D],
- ["C3CE",0x895E],
- ["C3CC",0x895F],
- ["C3CB",0x8960],
- ["F2ED",0x8961],
- ["F2E9",0x8962],
- ["F4CA",0x8963],
- ["C4B0",0x8964],
- ["95A6",0x8965],
- ["F4CB",0x8966],
- ["F649",0x8969],
- ["C4FB",0x896A],
- ["F64B",0x896B],
- ["C4FC",0x896C],
- ["F648",0x896D],
- ["F64A",0x896E],
- ["C5A8",0x896F],
- ["F752",0x8971],
- ["C5A7",0x8972],
- ["F7FD",0x8973],
- ["F7FC",0x8974],
- ["F7FB",0x8976],
- ["9C5D",0x8977],
- ["F948",0x8979],
- ["F949",0x897A],
- ["F94B",0x897B],
- ["F94A",0x897C],
- ["CA50",0x897E],
- ["A6E8",0x897F],
- ["98E2",0x8980],
- ["AD6E",0x8981],
- ["D7C5",0x8982],
- ["B5F7",0x8983],
- ["DFFA",0x8985],
- ["C2D0",0x8986],
- ["8FC9",0x8987],
- ["F2F2",0x8988],
- ["A0C2",0x8989],
- ["8FCA",0x898A],
- ["A8A3",0x898B],
- ["B357",0x898F],
- ["99D4",0x8991],
- ["B356",0x8993],
- ["A0B9",0x8994],
- ["DBD0",0x8995],
- ["B5F8",0x8996],
- ["DBD2",0x8997],
- ["DBD1",0x8998],
- ["DFFB",0x899B],
- ["B8D0",0x899C],
- ["E443",0x899D],
- ["E446",0x899E],
- ["E445",0x899F],
- ["E444",0x89A1],
- ["E7CE",0x89A2],
- ["E7D0",0x89A3],
- ["E7CF",0x89A4],
- ["9B58",0x89A5],
- ["BFCC",0x89A6],
- ["8FCD",0x89A7],
- ["A0D4",0x89A9],
- ["BFCB",0x89AA],
- ["C1BB",0x89AC],
- ["EE79",0x89AD],
- ["EE7B",0x89AE],
- ["EE7A",0x89AF],
- ["C2D1",0x89B2],
- ["F2F4",0x89B6],
- ["F2F3",0x89B7],
- ["F4CC",0x89B9],
- ["C4B1",0x89BA],
- ["8FCE",0x89BC],
- ["C4FD",0x89BD],
- ["F754",0x89BE],
- ["F753",0x89BF],
- ["C65B",0x89C0],
- ["8BE5",0x89C1],
- ["8979",0x89C6],
- ["A8A4",0x89D2],
- ["D0AF",0x89D3],
- ["AD6F",0x89D4],
- ["D7C8",0x89D5],
- ["D7C6",0x89D6],
- ["D7C7",0x89D9],
- ["DBD4",0x89DA],
- ["DBD5",0x89DB],
- ["E043",0x89DC],
- ["DBD3",0x89DD],
- ["DFFC",0x89DF],
- ["E041",0x89E0],
- ["E040",0x89E1],
- ["E042",0x89E2],
- ["B8D1",0x89E3],
- ["DFFE",0x89E4],
- ["DFFD",0x89E5],
- ["E044",0x89E6],
- ["8FD0",0x89E7],
- ["E449",0x89E8],
- ["E447",0x89E9],
- ["E448",0x89EB],
- ["E7D3",0x89EC],
- ["E7D1",0x89ED],
- ["E7D2",0x89F0],
- ["EB7D",0x89F1],
- ["EE7C",0x89F2],
- ["EE7D",0x89F3],
- ["C2D2",0x89F4],
- ["F2F5",0x89F6],
- ["F4CD",0x89F7],
- ["C4B2",0x89F8],
- ["F64C",0x89FA],
- ["F755",0x89FB],
- ["C5A9",0x89FC],
- ["F7FE",0x89FE],
- ["F94C",0x89FF],
- ["A8A5",0x8A00],
- ["AD71",0x8A02],
- ["AD72",0x8A03],
- ["D0B0",0x8A04],
- ["D0B1",0x8A07],
- ["AD70",0x8A08],
- ["B054",0x8A0A],
- ["B052",0x8A0C],
- ["B051",0x8A0E],
- ["B058",0x8A0F],
- ["B050",0x8A10],
- ["B059",0x8A11],
- ["D3DD",0x8A12],
- ["B056",0x8A13],
- ["B053",0x8A15],
- ["B057",0x8A16],
- ["B055",0x8A17],
- ["B04F",0x8A18],
- ["B35F",0x8A1B],
- ["95B6",0x8A1C],
- ["B359",0x8A1D],
- ["D7CC",0x8A1E],
- ["B35E",0x8A1F],
- ["B360",0x8A22],
- ["B35A",0x8A23],
- ["B35B",0x8A25],
- ["D7CA",0x8A27],
- ["99D6",0x8A29],
- ["B358",0x8A2A],
- ["95E5",0x8A2B],
- ["D7CB",0x8A2C],
- ["B35D",0x8A2D],
- ["D7C9",0x8A30],
- ["B35C",0x8A31],
- ["B644",0x8A34],
- ["B646",0x8A36],
- ["99D7",0x8A38],
- ["DBD8",0x8A39],
- ["B645",0x8A3A],
- ["B5F9",0x8A3B],
- ["B5FD",0x8A3C],
- ["95B5",0x8A3D],
- ["B8E4",0x8A3E],
- ["E049",0x8A3F],
- ["DBDA",0x8A40],
- ["B5FE",0x8A41],
- ["DBDD",0x8A44],
- ["DBDE",0x8A45],
- ["B643",0x8A46],
- ["DBE0",0x8A48],
- ["A0CA",0x8A49],
- ["DBE2",0x8A4A],
- ["DBE3",0x8A4C],
- ["DBD7",0x8A4D],
- ["DBD6",0x8A4E],
- ["DBE4",0x8A4F],
- ["B642",0x8A50],
- ["DBE1",0x8A51],
- ["DBDF",0x8A52],
- ["B640",0x8A54],
- ["B5FB",0x8A55],
- ["B647",0x8A56],
- ["DBDB",0x8A57],
- ["DBDC",0x8A58],
- ["DBD9",0x8A59],
- ["B641",0x8A5B],
- ["B5FC",0x8A5E],
- ["B5FA",0x8A60],
- ["E048",0x8A61],
- ["B8DF",0x8A62],
- ["B8DA",0x8A63],
- ["B8D5",0x8A66],
- ["9FFD",0x8A67],
- ["B8E5",0x8A68],
- ["B8D6",0x8A69],
- ["B8D2",0x8A6B],
- ["B8E1",0x8A6C],
- ["B8DE",0x8A6D],
- ["B8E0",0x8A6E],
- ["B8D7",0x8A70],
- ["B8DC",0x8A71],
- ["B8D3",0x8A72],
- ["B8D4",0x8A73],
- ["E050",0x8A74],
- ["E04D",0x8A75],
- ["E045",0x8A76],
- ["E04A",0x8A77],
- ["B8E2",0x8A79],
- ["E051",0x8A7A],
- ["B8E3",0x8A7B],
- ["B8D9",0x8A7C],
- ["A058",0x8A7E],
- ["E047",0x8A7F],
- ["E04F",0x8A81],
- ["E04B",0x8A82],
- ["E04E",0x8A83],
- ["E04C",0x8A84],
- ["B8DD",0x8A85],
- ["E046",0x8A86],
- ["B8D8",0x8A87],
- ["E44C",0x8A8B],
- ["BB78",0x8A8C],
- ["BB7B",0x8A8D],
- ["E44E",0x8A8F],
- ["8FD6",0x8A90],
- ["BBA5",0x8A91],
- ["E44D",0x8A92],
- ["BB7D",0x8A93],
- ["99D8",0x8A94],
- ["BDCF",0x8A95],
- ["E44F",0x8A96],
- ["BBA4",0x8A98],
- ["E44B",0x8A99],
- ["BBA6",0x8A9A],
- ["8FD3",0x8A9C],
- ["BB79",0x8A9E],
- ["B8DB",0x8AA0],
- ["BB7C",0x8AA1],
- ["BB7A",0x8AA3],
- ["BB7E",0x8AA4],
- ["BBA2",0x8AA5],
- ["BB77",0x8AA6],
- ["BBA7",0x8AA7],
- ["BBA3",0x8AA8],
- ["8FE5",0x8AA9],
- ["BBA1",0x8AAA],
- ["E44A",0x8AAB],
- ["8FE9",0x8AAF],
- ["BDD6",0x8AB0],
- ["BDD2",0x8AB2],
- ["99D9",0x8AB4],
- ["BDD9",0x8AB6],
- ["E7D6",0x8AB8],
- ["BDDA",0x8AB9],
- ["E7E2",0x8ABA],
- ["E7DB",0x8ABB],
- ["BDCB",0x8ABC],
- ["E7E3",0x8ABD],
- ["E7DD",0x8ABE],
- ["BDD5",0x8ABF],
- ["E7DE",0x8AC0],
- ["BDD4",0x8AC2],
- ["E7E1",0x8AC3],
- ["BDCE",0x8AC4],
- ["E7DF",0x8AC5],
- ["E7D5",0x8AC6],
- ["BDCD",0x8AC7],
- ["EBAA",0x8AC8],
- ["BDD3",0x8AC9],
- ["BDD0",0x8ACB],
- ["8CF7",0x8ACC],
- ["BDD8",0x8ACD],
- ["E7D4",0x8ACF],
- ["E7D8",0x8AD1],
- ["BDCC",0x8AD2],
- ["E7D7",0x8AD3],
- ["E7D9",0x8AD4],
- ["E7DA",0x8AD5],
- ["BDD7",0x8AD6],
- ["E7DC",0x8AD7],
- ["E7E0",0x8AD8],
- ["E7E4",0x8AD9],
- ["927C",0x8ADA],
- ["BDDB",0x8ADB],
- ["BFD2",0x8ADC],
- ["EBA5",0x8ADD],
- ["EBAB",0x8ADE],
- ["EBA8",0x8ADF],
- ["EB7E",0x8AE0],
- ["EBAC",0x8AE1],
- ["EBA1",0x8AE2],
- ["EBA7",0x8AE4],
- ["BFCD",0x8AE6],
- ["BFD3",0x8AE7],
- ["EBAD",0x8AE8],
- ["9C45",0x8AEA],
- ["BFCF",0x8AEB],
- ["BFD9",0x8AED],
- ["BFD4",0x8AEE],
- ["EBAF",0x8AEF],
- ["EBA9",0x8AF0],
- ["BFD0",0x8AF1],
- ["EBA2",0x8AF2],
- ["BFDA",0x8AF3],
- ["EBA3",0x8AF4],
- ["EBA4",0x8AF5],
- ["BFDB",0x8AF6],
- ["BFD8",0x8AF7],
- ["BDD1",0x8AF8],
- ["8CE8",0x8AF9],
- ["BFCE",0x8AFA],
- ["EBB0",0x8AFB],
- ["BFDC",0x8AFC],
- ["BFD5",0x8AFE],
- ["EBAE",0x8AFF],
- ["BFD1",0x8B00],
- ["BFD6",0x8B01],
- ["BFD7",0x8B02],
- ["C1C3",0x8B04],
- ["EEA4",0x8B05],
- ["EEAD",0x8B06],
- ["EEAA",0x8B07],
- ["EEAC",0x8B08],
- ["C1C0",0x8B0A],
- ["EEA5",0x8B0B],
- ["8FDE",0x8B0C],
- ["EEAB",0x8B0D],
- ["C1BC",0x8B0E],
- ["EEA7",0x8B0F],
- ["C1C4",0x8B10],
- ["EEA3",0x8B11],
- ["EEA8",0x8B12],
- ["EEAF",0x8B13],
- ["EBA6",0x8B14],
- ["EEA9",0x8B15],
- ["EEA2",0x8B16],
- ["C1BD",0x8B17],
- ["EEA1",0x8B18],
- ["C1BE",0x8B19],
- ["EEB0",0x8B1A],
- ["C1BF",0x8B1B],
- ["EEAE",0x8B1C],
- ["C1C2",0x8B1D],
- ["EE7E",0x8B1E],
- ["8FDF",0x8B1F],
- ["C1C1",0x8B20],
- ["EEA6",0x8B22],
- ["F0DC",0x8B23],
- ["F0EA",0x8B24],
- ["F0E5",0x8B25],
- ["F0E7",0x8B26],
- ["F0DB",0x8B27],
- ["C2D3",0x8B28],
- ["F0DA",0x8B2A],
- ["C2D6",0x8B2B],
- ["C2D5",0x8B2C],
- ["A04B",0x8B2D],
- ["F0E9",0x8B2E],
- ["F0E1",0x8B2F],
- ["F0DE",0x8B30],
- ["F0E4",0x8B31],
- ["F0DD",0x8B33],
- ["F0DF",0x8B35],
- ["F0E8",0x8B36],
- ["F0E6",0x8B37],
- ["C2D4",0x8B39],
- ["F0ED",0x8B3A],
- ["F0EB",0x8B3B],
- ["F0E2",0x8B3C],
- ["F0EC",0x8B3D],
- ["F0E3",0x8B3E],
- ["8FE2",0x8B3F],
- ["F2F9",0x8B40],
- ["C3CF",0x8B41],
- ["F341",0x8B42],
- ["A0CC",0x8B43],
- ["F64F",0x8B45],
- ["C3D6",0x8B46],
- ["F0E0",0x8B47],
- ["F2F7",0x8B48],
- ["C3D2",0x8B49],
- ["F2F8",0x8B4A],
- ["F2FD",0x8B4B],
- ["8FE3",0x8B4C],
- ["8FE4",0x8B4D],
- ["C3D4",0x8B4E],
- ["C3D5",0x8B4F],
- ["F2F6",0x8B50],
- ["F340",0x8B51],
- ["F342",0x8B52],
- ["F2FA",0x8B53],
- ["F2FC",0x8B54],
- ["F2FE",0x8B55],
- ["F2FB",0x8B56],
- ["F343",0x8B57],
- ["C3D1",0x8B58],
- ["C3D7",0x8B59],
- ["C3D3",0x8B5A],
- ["C3D0",0x8B5C],
- ["F4D0",0x8B5D],
- ["9BC4",0x8B5E],
- ["C4B7",0x8B5F],
- ["F4CE",0x8B60],
- ["9BFC",0x8B62],
- ["F4D2",0x8B63],
- ["F4D3",0x8B65],
- ["C4B5",0x8B66],
- ["F4D4",0x8B67],
- ["F4D1",0x8B68],
- ["964C",0x8B69],
- ["F4CF",0x8B6A],
- ["C4B8",0x8B6B],
- ["C4B4",0x8B6C],
- ["F4D5",0x8B6D],
- ["C4B6",0x8B6F],
- ["C4B3",0x8B70],
- ["C4FE",0x8B74],
- ["C540",0x8B77],
- ["F64E",0x8B78],
- ["F64D",0x8B79],
- ["F650",0x8B7A],
- ["F651",0x8B7B],
- ["C541",0x8B7D],
- ["F756",0x8B7E],
- ["F75B",0x8B7F],
- ["C5AA",0x8B80],
- ["9AF6",0x8B81],
- ["F758",0x8B82],
- ["8CAE",0x8B83],
- ["F757",0x8B84],
- ["F75A",0x8B85],
- ["F759",0x8B86],
- ["F843",0x8B88],
- ["C5DC",0x8B8A],
- ["F842",0x8B8B],
- ["F840",0x8B8C],
- ["F841",0x8B8E],
- ["8FE7",0x8B90],
- ["C5FE",0x8B92],
- ["C5FD",0x8B93],
- ["F8C1",0x8B94],
- ["F8C2",0x8B95],
- ["C640",0x8B96],
- ["F94D",0x8B98],
- ["F94E",0x8B99],
- ["C667",0x8B9A],
- ["8FE8",0x8B9B],
- ["C66D",0x8B9C],
- ["F9A9",0x8B9E],
- ["F9C8",0x8B9F],
- ["8BE7",0x8BA0],
- ["897A",0x8BBE],
- ["897B",0x8BE2],
- ["A8A6",0x8C37],
- ["D7CD",0x8C39],
- ["D7CE",0x8C3B],
- ["E052",0x8C3C],
- ["E450",0x8C3D],
- ["E7E5",0x8C3E],
- ["C1C6",0x8C3F],
- ["C1C5",0x8C41],
- ["F0EE",0x8C42],
- ["F344",0x8C43],
- ["F844",0x8C45],
- ["A8A7",0x8C46],
- ["D3DE",0x8C47],
- ["B05A",0x8C48],
- ["B361",0x8C49],
- ["E054",0x8C4A],
- ["E053",0x8C4B],
- ["BDDC",0x8C4C],
- ["E7E6",0x8C4D],
- ["BDDD",0x8C4E],
- ["EEB1",0x8C4F],
- ["C2D7",0x8C50],
- ["99DA",0x8C51],
- ["C676",0x8C54],
- ["A8A8",0x8C55],
- ["CDCB",0x8C56],
- ["D3DF",0x8C57],
- ["B362",0x8C5A],
- ["D7CF",0x8C5C],
- ["D7D0",0x8C5D],
- ["DBE5",0x8C5F],
- ["B648",0x8C61],
- ["B8E6",0x8C62],
- ["E056",0x8C64],
- ["E055",0x8C65],
- ["E057",0x8C66],
- ["E451",0x8C68],
- ["E452",0x8C69],
- ["BBA8",0x8C6A],
- ["BFDD",0x8C6B],
- ["BDDE",0x8C6C],
- ["BFDE",0x8C6D],
- ["EEB5",0x8C6F],
- ["EEB2",0x8C70],
- ["EEB4",0x8C71],
- ["EEB3",0x8C72],
- ["C1C7",0x8C73],
- ["F0EF",0x8C75],
- ["F346",0x8C76],
- ["F345",0x8C77],
- ["CBA4",0x8C78],
- ["B05C",0x8C79],
- ["B05B",0x8C7A],
- ["D3E0",0x8C7B],
- ["D7D1",0x8C7D],
- ["DBE7",0x8C80],
- ["DBE6",0x8C81],
- ["B649",0x8C82],
- ["E059",0x8C84],
- ["E05A",0x8C85],
- ["E058",0x8C86],
- ["B8E8",0x8C89],
- ["B8E7",0x8C8A],
- ["BBAA",0x8C8C],
- ["BBA9",0x8C8D],
- ["E7E7",0x8C8F],
- ["EBB3",0x8C90],
- ["EBB1",0x8C91],
- ["EBB2",0x8C92],
- ["BFDF",0x8C93],
- ["EEB7",0x8C94],
- ["EEB6",0x8C95],
- ["F0F2",0x8C97],
- ["F0F1",0x8C98],
- ["F0F0",0x8C99],
- ["F347",0x8C9A],
- ["8FED",0x8C9B],
- ["F9AA",0x8C9C],
- ["A8A9",0x8C9D],
- ["AD73",0x8C9E],
- ["95C0",0x8C9F],
- ["AD74",0x8CA0],
- ["B05D",0x8CA1],
- ["B05E",0x8CA2],
- ["D3E2",0x8CA3],
- ["D3E1",0x8CA4],
- ["D7D2",0x8CA5],
- ["B368",0x8CA7],
- ["B366",0x8CA8],
- ["B363",0x8CA9],
- ["B367",0x8CAA],
- ["B365",0x8CAB],
- ["B364",0x8CAC],
- ["A0CB",0x8CAD],
- ["B64A",0x8CAF],
- ["DBEA",0x8CB0],
- ["B8ED",0x8CB2],
- ["B64C",0x8CB3],
- ["B651",0x8CB4],
- ["DBEC",0x8CB5],
- ["B653",0x8CB6],
- ["B652",0x8CB7],
- ["B655",0x8CB8],
- ["DBEB",0x8CB9],
- ["DBE8",0x8CBA],
- ["B64F",0x8CBB],
- ["B64B",0x8CBC],
- ["B64D",0x8CBD],
- ["DBE9",0x8CBE],
- ["B654",0x8CBF],
- ["B650",0x8CC0],
- ["B64E",0x8CC1],
- ["B8EF",0x8CC2],
- ["B8EE",0x8CC3],
- ["B8EC",0x8CC4],
- ["B8F0",0x8CC5],
- ["B8EA",0x8CC7],
- ["B8EB",0x8CC8],
- ["B8E9",0x8CCA],
- ["E05B",0x8CCC],
- ["9E48",0x8CCD],
- ["E454",0x8CCF],
- ["BBAC",0x8CD1],
- ["BBAD",0x8CD2],
- ["BBAB",0x8CD3],
- ["99DB",0x8CD4],
- ["E453",0x8CD5],
- ["8FF3",0x8CD6],
- ["E455",0x8CD7],
- ["E7EA",0x8CD9],
- ["E7EC",0x8CDA],
- ["8FF9",0x8CDB],
- ["BDE7",0x8CDC],
- ["E7ED",0x8CDD],
- ["BDE0",0x8CDE],
- ["E7E9",0x8CDF],
- ["BDDF",0x8CE0],
- ["BDE9",0x8CE1],
- ["BDE5",0x8CE2],
- ["BDE6",0x8CE3],
- ["BDE2",0x8CE4],
- ["E7E8",0x8CE5],
- ["BDE1",0x8CE6],
- ["E7EE",0x8CE7],
- ["E7EB",0x8CE8],
- ["95C1",0x8CE9],
- ["BDE8",0x8CEA],
- ["A04E",0x8CEB],
- ["BDE3",0x8CEC],
- ["BDE4",0x8CED],
- ["EBB5",0x8CEE],
- ["EBB7",0x8CF0],
- ["EBB6",0x8CF1],
- ["99DC",0x8CF2],
- ["EBB8",0x8CF3],
- ["BFE0",0x8CF4],
- ["EBB4",0x8CF5],
- ["A064",0x8CF7],
- ["C1CB",0x8CF8],
- ["EEB8",0x8CF9],
- ["C1C8",0x8CFA],
- ["C1CC",0x8CFB],
- ["C1CA",0x8CFC],
- ["C1C9",0x8CFD],
- ["F0F3",0x8CFE],
- ["F0F6",0x8D00],
- ["F0F5",0x8D02],
- ["8FF7",0x8D03],
- ["F0F4",0x8D04],
- ["C2D8",0x8D05],
- ["F348",0x8D06],
- ["F349",0x8D07],
- ["C3D8",0x8D08],
- ["F34A",0x8D09],
- ["C3D9",0x8D0A],
- ["89B0",0x8D0B],
- ["A048",0x8D0C],
- ["C4BA",0x8D0D],
- ["C4B9",0x8D0F],
- ["F652",0x8D10],
- ["8FFB",0x8D11],
- ["8FF6",0x8D12],
- ["C542",0x8D13],
- ["F653",0x8D14],
- ["F75C",0x8D15],
- ["C5AB",0x8D16],
- ["C5AC",0x8D17],
- ["9DDC",0x8D18],
- ["F845",0x8D19],
- ["C642",0x8D1B],
- ["99DD",0x8D1C],
- ["8BE8",0x8D1D],
- ["A8AA",0x8D64],
- ["B36A",0x8D66],
- ["B369",0x8D67],
- ["E05C",0x8D68],
- ["E05D",0x8D69],
- ["BBAE",0x8D6B],
- ["EBB9",0x8D6C],
- ["BDEA",0x8D6D],
- ["EBBA",0x8D6E],
- ["EEB9",0x8D6F],
- ["A8AB",0x8D70],
- ["D0B2",0x8D72],
- ["AD76",0x8D73],
- ["AD75",0x8D74],
- ["D3E3",0x8D76],
- ["B05F",0x8D77],
- ["D3E4",0x8D78],
- ["D7D5",0x8D79],
- ["92C1",0x8D7A],
- ["D7D4",0x8D7B],
- ["D7D3",0x8D7D],
- ["DBEE",0x8D80],
- ["B658",0x8D81],
- ["9FD6",0x8D82],
- ["DBED",0x8D84],
- ["B657",0x8D85],
- ["DBEF",0x8D89],
- ["B656",0x8D8A],
- ["E05F",0x8D8C],
- ["E062",0x8D8D],
- ["E060",0x8D8E],
- ["E061",0x8D8F],
- ["E065",0x8D90],
- ["E05E",0x8D91],
- ["E066",0x8D92],
- ["E063",0x8D93],
- ["E064",0x8D94],
- ["BBB0",0x8D95],
- ["E456",0x8D96],
- ["BBAF",0x8D99],
- ["E7F2",0x8D9B],
- ["E7F0",0x8D9C],
- ["BDEB",0x8D9F],
- ["E7EF",0x8DA0],
- ["E7F1",0x8DA1],
- ["BDEC",0x8DA3],
- ["EBBB",0x8DA5],
- ["A0D2",0x8DA6],
- ["EBBC",0x8DA7],
- ["C1CD",0x8DA8],
- ["9040",0x8DA9],
- ["F34C",0x8DAA],
- ["F34E",0x8DAB],
- ["F34B",0x8DAC],
- ["F34D",0x8DAD],
- ["F4D6",0x8DAE],
- ["F654",0x8DAF],
- ["F96F",0x8DB2],
- ["A8AC",0x8DB3],
- ["AD77",0x8DB4],
- ["D3E5",0x8DB5],
- ["D3E7",0x8DB6],
- ["D3E6",0x8DB7],
- ["D7D8",0x8DB9],
- ["B36C",0x8DBA],
- ["D7D6",0x8DBC],
- ["B36B",0x8DBE],
- ["D7D9",0x8DBF],
- ["8AC4",0x8DC0],
- ["D7DA",0x8DC1],
- ["D7D7",0x8DC2],
- ["99E0",0x8DC3],
- ["DBFB",0x8DC5],
- ["B660",0x8DC6],
- ["DBF3",0x8DC7],
- ["DBF9",0x8DC8],
- ["B65B",0x8DCB],
- ["B65E",0x8DCC],
- ["DBF2",0x8DCD],
- ["B659",0x8DCE],
- ["DBF6",0x8DCF],
- ["E06C",0x8DD0],
- ["B65D",0x8DD1],
- ["DBF1",0x8DD3],
- ["9FF0",0x8DD4],
- ["DBF7",0x8DD5],
- ["DBF4",0x8DD6],
- ["DBFA",0x8DD7],
- ["DBF0",0x8DD8],
- ["DBF8",0x8DD9],
- ["B65C",0x8DDA],
- ["B65F",0x8DDB],
- ["DBF5",0x8DDC],
- ["B65A",0x8DDD],
- ["B8F2",0x8DDF],
- ["E068",0x8DE0],
- ["B8F1",0x8DE1],
- ["E06F",0x8DE2],
- ["E06E",0x8DE3],
- ["B8F8",0x8DE4],
- ["B8F9",0x8DE6],
- ["E070",0x8DE7],
- ["B8F3",0x8DE8],
- ["E06D",0x8DE9],
- ["B8F7",0x8DEA],
- ["E072",0x8DEB],
- ["E069",0x8DEC],
- ["E06B",0x8DEE],
- ["B8F4",0x8DEF],
- ["E067",0x8DF0],
- ["E06A",0x8DF1],
- ["E071",0x8DF2],
- ["B8F5",0x8DF3],
- ["E073",0x8DF4],
- ["B8F6",0x8DFA],
- ["BBB1",0x8DFC],
- ["E45B",0x8DFD],
- ["E461",0x8DFE],
- ["E459",0x8DFF],
- ["E462",0x8E00],
- ["9FF3",0x8E01],
- ["E458",0x8E02],
- ["E45D",0x8E03],
- ["E463",0x8E04],
- ["E460",0x8E05],
- ["E45F",0x8E06],
- ["E45E",0x8E07],
- ["E457",0x8E09],
- ["E45C",0x8E0A],
- ["E45A",0x8E0D],
- ["9DBF",0x8E0E],
- ["BDF1",0x8E0F],
- ["BDEE",0x8E10],
- ["E7FB",0x8E11],
- ["E841",0x8E12],
- ["E843",0x8E13],
- ["E840",0x8E14],
- ["E7F8",0x8E15],
- ["E7FA",0x8E16],
- ["E845",0x8E17],
- ["E842",0x8E18],
- ["E7FC",0x8E19],
- ["E846",0x8E1A],
- ["E7F9",0x8E1B],
- ["E844",0x8E1C],
- ["BDEF",0x8E1D],
- ["BDF5",0x8E1E],
- ["BDF3",0x8E1F],
- ["E7F3",0x8E20],
- ["BDF4",0x8E21],
- ["BDF0",0x8E22],
- ["E7F4",0x8E23],
- ["E7F6",0x8E24],
- ["E7F5",0x8E25],
- ["E7FD",0x8E26],
- ["E7FE",0x8E27],
- ["9FF6",0x8E28],
- ["BDF2",0x8E29],
- ["95C8",0x8E2A],
- ["BDED",0x8E2B],
- ["9E5A",0x8E2D],
- ["E7F7",0x8E2E],
- ["EBC6",0x8E30],
- ["BFE2",0x8E31],
- ["EBBD",0x8E33],
- ["BFE3",0x8E34],
- ["BFE6",0x8E35],
- ["EBC2",0x8E36],
- ["EBBF",0x8E38],
- ["BFE5",0x8E39],
- ["99E3",0x8E3A],
- ["EBC3",0x8E3C],
- ["EBC4",0x8E3D],
- ["EBBE",0x8E3E],
- ["EBC7",0x8E3F],
- ["EBC0",0x8E40],
- ["EBC5",0x8E41],
- ["BFE4",0x8E42],
- ["BFE1",0x8E44],
- ["EBC1",0x8E45],
- ["8A4A",0x8E46],
- ["EEBF",0x8E47],
- ["C1D0",0x8E48],
- ["C1CE",0x8E49],
- ["C1D1",0x8E4A],
- ["C1CF",0x8E4B],
- ["EEBE",0x8E4C],
- ["EEBB",0x8E4D],
- ["EEBA",0x8E4E],
- ["9FF1",0x8E4F],
- ["EEBD",0x8E50],
- ["EEBC",0x8E53],
- ["F145",0x8E54],
- ["C2DE",0x8E55],
- ["F0FB",0x8E56],
- ["F0FA",0x8E57],
- ["C2D9",0x8E59],
- ["F141",0x8E5A],
- ["F140",0x8E5B],
- ["F0F7",0x8E5C],
- ["F143",0x8E5D],
- ["F0FC",0x8E5E],
- ["C2DD",0x8E5F],
- ["F0F9",0x8E60],
- ["F142",0x8E61],
- ["F0F8",0x8E62],
- ["C2DA",0x8E63],
- ["C2DC",0x8E64],
- ["F0FD",0x8E65],
- ["C2DB",0x8E66],
- ["F0FE",0x8E67],
- ["8AA7",0x8E68],
- ["F144",0x8E69],
- ["F352",0x8E6A],
- ["C3DE",0x8E6C],
- ["F34F",0x8E6D],
- ["F353",0x8E6F],
- ["99E6",0x8E71],
- ["C3DB",0x8E72],
- ["F351",0x8E73],
- ["C3E0",0x8E74],
- ["9FF7",0x8E75],
- ["C3DD",0x8E76],
- ["9FED",0x8E77],
- ["F350",0x8E78],
- ["C3DF",0x8E7A],
- ["F354",0x8E7B],
- ["C3DA",0x8E7C],
- ["8A5C",0x8E7E],
- ["9DAE",0x8E80],
- ["C4BC",0x8E81],
- ["C4BE",0x8E82],
- ["F4D9",0x8E84],
- ["C4BD",0x8E85],
- ["F4D7",0x8E86],
- ["C3DC",0x8E87],
- ["F4D8",0x8E88],
- ["C4BB",0x8E89],
- ["C543",0x8E8A],
- ["C545",0x8E8B],
- ["F656",0x8E8C],
- ["C544",0x8E8D],
- ["F655",0x8E8E],
- ["F761",0x8E90],
- ["C5AD",0x8E91],
- ["F760",0x8E92],
- ["C5AE",0x8E93],
- ["F75E",0x8E94],
- ["F75D",0x8E95],
- ["F762",0x8E96],
- ["F763",0x8E97],
- ["F846",0x8E98],
- ["F75F",0x8E9A],
- ["F8C6",0x8E9D],
- ["F8C3",0x8E9E],
- ["F8C4",0x8E9F],
- ["F8C5",0x8EA0],
- ["C65C",0x8EA1],
- ["F951",0x8EA3],
- ["F950",0x8EA4],
- ["F94F",0x8EA5],
- ["F970",0x8EA6],
- ["95C9",0x8EA7],
- ["F9BE",0x8EA8],
- ["F9AB",0x8EA9],
- ["C66E",0x8EAA],
- ["A8AD",0x8EAB],
- ["B060",0x8EAC],
- ["9048",0x8EAD],
- ["99E8",0x8EB0],
- ["B8FA",0x8EB2],
- ["9049",0x8EB6],
- ["8CBA",0x8EB9],
- ["BDF6",0x8EBA],
- ["90B1",0x8EBC],
- ["EBC8",0x8EBD],
- ["C2DF",0x8EC0],
- ["F355",0x8EC2],
- ["904A",0x8EC3],
- ["F9AC",0x8EC9],
- ["A8AE",0x8ECA],
- ["AAEE",0x8ECB],
- ["AD79",0x8ECC],
- ["AD78",0x8ECD],
- ["99EA",0x8ECE],
- ["B063",0x8ECF],
- ["D3E8",0x8ED1],
- ["B061",0x8ED2],
- ["D3E9",0x8ED3],
- ["B062",0x8ED4],
- ["D7DF",0x8ED7],
- ["D7DB",0x8ED8],
- ["9BD1",0x8EDA],
- ["B36D",0x8EDB],
- ["D7DE",0x8EDC],
- ["D7DD",0x8EDD],
- ["D7DC",0x8EDE],
- ["B36E",0x8EDF],
- ["D7E0",0x8EE0],
- ["D7E1",0x8EE1],
- ["99EB",0x8EE2],
- ["99EC",0x8EE4],
- ["DC43",0x8EE5],
- ["DC41",0x8EE6],
- ["DC45",0x8EE7],
- ["DC46",0x8EE8],
- ["DC4C",0x8EE9],
- ["DC48",0x8EEB],
- ["DC4A",0x8EEC],
- ["99ED",0x8EED],
- ["DC42",0x8EEE],
- ["DBFC",0x8EEF],
- ["DC49",0x8EF1],
- ["99EE",0x8EF2],
- ["DC4B",0x8EF4],
- ["DC44",0x8EF5],
- ["DC47",0x8EF6],
- ["DBFD",0x8EF7],
- ["B662",0x8EF8],
- ["DC40",0x8EF9],
- ["DBFE",0x8EFA],
- ["B661",0x8EFB],
- ["B663",0x8EFC],
- ["B8FD",0x8EFE],
- ["E075",0x8EFF],
- ["E077",0x8F00],
- ["E076",0x8F01],
- ["E07B",0x8F02],
- ["B8FB",0x8F03],
- ["E078",0x8F05],
- ["E074",0x8F06],
- ["E079",0x8F07],
- ["E07A",0x8F08],
- ["B8FC",0x8F09],
- ["B8FE",0x8F0A],
- ["E07C",0x8F0B],
- ["E467",0x8F0D],
- ["E466",0x8F0E],
- ["E464",0x8F10],
- ["E465",0x8F11],
- ["BBB3",0x8F12],
- ["BBB5",0x8F13],
- ["BBB2",0x8F14],
- ["BBB4",0x8F15],
- ["E84D",0x8F16],
- ["E84E",0x8F17],
- ["E849",0x8F18],
- ["904C",0x8F19],
- ["E84A",0x8F1A],
- ["BDF8",0x8F1B],
- ["BDFD",0x8F1C],
- ["BDF7",0x8F1D],
- ["BDFE",0x8F1E],
- ["BDF9",0x8F1F],
- ["E84B",0x8F20],
- ["E84C",0x8F23],
- ["E848",0x8F24],
- ["BE40",0x8F25],
- ["BDFB",0x8F26],
- ["BDFA",0x8F29],
- ["BDFC",0x8F2A],
- ["E847",0x8F2C],
- ["904D",0x8F2D],
- ["EBCA",0x8F2E],
- ["BFE8",0x8F2F],
- ["95CB",0x8F30],
- ["EBCC",0x8F32],
- ["BFEA",0x8F33],
- ["EBCF",0x8F34],
- ["EBCB",0x8F35],
- ["EBC9",0x8F36],
- ["EBCE",0x8F37],
- ["BFE9",0x8F38],
- ["EBCD",0x8F39],
- ["BFE7",0x8F3B],
- ["C1D3",0x8F3E],
- ["C1D6",0x8F3F],
- ["EEC1",0x8F40],
- ["97E2",0x8F41],
- ["C1D4",0x8F42],
- ["EEC0",0x8F43],
- ["C1D2",0x8F44],
- ["C1D5",0x8F45],
- ["F146",0x8F46],
- ["F147",0x8F47],
- ["F148",0x8F48],
- ["C2E0",0x8F49],
- ["95CC",0x8F4A],
- ["F149",0x8F4B],
- ["C2E1",0x8F4D],
- ["C3E2",0x8F4E],
- ["F358",0x8F4F],
- ["F359",0x8F50],
- ["F357",0x8F51],
- ["F356",0x8F52],
- ["F35A",0x8F53],
- ["C3E1",0x8F54],
- ["F4DD",0x8F55],
- ["F4DB",0x8F56],
- ["F4DC",0x8F57],
- ["F4DE",0x8F58],
- ["F4DA",0x8F59],
- ["F4DF",0x8F5A],
- ["F658",0x8F5B],
- ["9F78",0x8F5C],
- ["F659",0x8F5D],
- ["F657",0x8F5E],
- ["C546",0x8F5F],
- ["F764",0x8F60],
- ["C5AF",0x8F61],
- ["F765",0x8F62],
- ["F848",0x8F63],
- ["F847",0x8F64],
- ["897C",0x8F66],
- ["897D",0x8F67],
- ["897E",0x8F6E],
- ["995D",0x8F93],
- ["A8AF",0x8F9B],
- ["B664",0x8F9C],
- ["B940",0x8F9F],
- ["9B5A",0x8FA0],
- ["BBB6",0x8FA3],
- ["9050",0x8FA5],
- ["BFEC",0x8FA6],
- ["8C4F",0x8FA7],
- ["BFEB",0x8FA8],
- ["C3E3",0x8FAD],
- ["C47C",0x8FAE],
- ["C547",0x8FAF],
- ["A8B0",0x8FB0],
- ["B064",0x8FB1],
- ["B941",0x8FB2],
- ["9054",0x8FB3],
- ["F35B",0x8FB4],
- ["C6D6",0x8FB5],
- ["9AA8",0x8FB6],
- ["99EF",0x8FB7],
- ["FEEB",0x8FB8],
- ["9DA3",0x8FB9],
- ["9DA1",0x8FBA],
- ["9943",0x8FBB],
- ["9945",0x8FBC],
- ["9D7D",0x8FBE],
- ["CBA6",0x8FBF],
- ["99F0",0x8FC1],
- ["A8B1",0x8FC2],
- ["A8B4",0x8FC4],
- ["A8B3",0x8FC5],
- ["A8B2",0x8FC6],
- ["CBA5",0x8FC9],
- ["99F1",0x8FCA],
- ["CDCD",0x8FCB],
- ["99F2",0x8FCC],
- ["CDCF",0x8FCD],
- ["AAEF",0x8FCE],
- ["8CBC",0x8FCF],
- ["9D60",0x8FD0],
- ["AAF1",0x8FD1],
- ["CDCC",0x8FD2],
- ["CDCE",0x8FD3],
- ["AAF0",0x8FD4],
- ["CDD1",0x8FD5],
- ["CDD0",0x8FD6],
- ["CDD2",0x8FD7],
- ["A0A3",0x8FDA],
- ["D0B6",0x8FE0],
- ["D0B4",0x8FE1],
- ["AD7C",0x8FE2],
- ["D0B3",0x8FE3],
- ["ADA3",0x8FE4],
- ["AD7E",0x8FE5],
- ["AD7B",0x8FE6],
- ["ADA4",0x8FE8],
- ["AD7D",0x8FEA],
- ["ADA2",0x8FEB],
- ["ADA1",0x8FED],
- ["D0B5",0x8FEE],
- ["AD7A",0x8FF0],
- ["B06A",0x8FF4],
- ["D3EB",0x8FF5],
- ["D3F1",0x8FF6],
- ["B067",0x8FF7],
- ["B06E",0x8FF8],
- ["905B",0x8FF9],
- ["B069",0x8FFA],
- ["D3EE",0x8FFB],
- ["D3F0",0x8FFC],
- ["B06C",0x8FFD],
- ["D3EA",0x8FFE],
- ["D3ED",0x8FFF],
- ["B068",0x9000],
- ["B065",0x9001],
- ["D3EC",0x9002],
- ["B06B",0x9003],
- ["D3EF",0x9004],
- ["B06D",0x9005],
- ["B066",0x9006],
- ["9EDB",0x9008],
- ["D7E3",0x900B],
- ["D7E6",0x900C],
- ["B370",0x900D],
- ["B37A",0x900F],
- ["B376",0x9010],
- ["D7E4",0x9011],
- ["9D79",0x9012],
- ["B37E",0x9014],
- ["B377",0x9015],
- ["B37C",0x9016],
- ["B372",0x9017],
- ["B36F",0x9019],
- ["B371",0x901A],
- ["B37D",0x901B],
- ["D7E5",0x901C],
- ["B375",0x901D],
- ["B378",0x901E],
- ["B374",0x901F],
- ["B379",0x9020],
- ["D7E7",0x9021],
- ["B37B",0x9022],
- ["B373",0x9023],
- ["D7E2",0x9024],
- ["DC4D",0x902D],
- ["B665",0x902E],
- ["DC4F",0x902F],
- ["B667",0x9031],
- ["B669",0x9032],
- ["99F3",0x9033],
- ["DC4E",0x9034],
- ["B666",0x9035],
- ["B66A",0x9036],
- ["9062",0x9037],
- ["B668",0x9038],
- ["B947",0x903C],
- ["E0A3",0x903D],
- ["B94F",0x903E],
- ["E07E",0x903F],
- ["B950",0x9041],
- ["B945",0x9042],
- ["E0A1",0x9044],
- ["B94A",0x9047],
- ["E0A2",0x9049],
- ["B943",0x904A],
- ["B942",0x904B],
- ["9F55",0x904C],
- ["B94D",0x904D],
- ["B94C",0x904E],
- ["B94B",0x904F],
- ["B949",0x9050],
- ["B94E",0x9051],
- ["E07D",0x9052],
- ["B944",0x9053],
- ["B946",0x9054],
- ["B948",0x9055],
- ["9BF9",0x9056],
- ["BBB8",0x9058],
- ["BBBB",0x9059],
- ["BBBF",0x905B],
- ["BBB9",0x905C],
- ["BBBE",0x905D],
- ["BBBC",0x905E],
- ["BBB7",0x9060],
- ["9065",0x9061],
- ["BBBD",0x9062],
- ["BBBA",0x9063],
- ["96E0",0x9064],
- ["E852",0x9067],
- ["BE43",0x9068],
- ["BE41",0x9069],
- ["E853",0x906B],
- ["98BE",0x906C],
- ["BE44",0x906D],
- ["BE42",0x906E],
- ["E851",0x906F],
- ["E850",0x9070],
- ["BFF0",0x9072],
- ["E84F",0x9073],
- ["BFEE",0x9074],
- ["BFED",0x9075],
- ["EBD0",0x9076],
- ["BE45",0x9077],
- ["BFEF",0x9078],
- ["EBD1",0x9079],
- ["BFF2",0x907A],
- ["EBD2",0x907B],
- ["BFF1",0x907C],
- ["C1D8",0x907D],
- ["EEC3",0x907E],
- ["C1D7",0x907F],
- ["C1DC",0x9080],
- ["C1DA",0x9081],
- ["C1DB",0x9082],
- ["C2E3",0x9083],
- ["C1D9",0x9084],
- ["EEC2",0x9085],
- ["EBD3",0x9086],
- ["C2E2",0x9087],
- ["C2E4",0x9088],
- ["C3E4",0x908A],
- ["C3E5",0x908B],
- ["F4E0",0x908D],
- ["C5DE",0x908F],
- ["C5DD",0x9090],
- ["A8B6",0x9091],
- ["CA55",0x9094],
- ["B06F",0x9095],
- ["CA52",0x9097],
- ["CA53",0x9098],
- ["CA51",0x9099],
- ["CA54",0x909B],
- ["CBAA",0x909E],
- ["CBA7",0x909F],
- ["CBAC",0x90A0],
- ["CBA8",0x90A1],
- ["A8B7",0x90A2],
- ["A8BA",0x90A3],
- ["CBA9",0x90A5],
- ["A8B9",0x90A6],
- ["CBAB",0x90A7],
- ["9068",0x90A8],
- ["A8B8",0x90AA],
- ["906C",0x90AE],
- ["CDD5",0x90AF],
- ["CDD7",0x90B0],
- ["AAF4",0x90B1],
- ["CDD3",0x90B2],
- ["CDD6",0x90B3],
- ["CDD4",0x90B4],
- ["AAF2",0x90B5],
- ["AAF5",0x90B6],
- ["AAF3",0x90B8],
- ["95D8",0x90BB],
- ["D0B8",0x90BD],
- ["D0BC",0x90BE],
- ["D0B9",0x90BF],
- ["ADA7",0x90C1],
- ["ADA8",0x90C3],
- ["906A",0x90C4],
- ["D0BB",0x90C5],
- ["D0BD",0x90C7],
- ["D0BF",0x90C8],
- ["ADA5",0x90CA],
- ["D0BE",0x90CB],
- ["ADA6",0x90CE],
- ["D7EE",0x90D4],
- ["D0BA",0x90D5],
- ["D3F2",0x90D6],
- ["D3FB",0x90D7],
- ["D3F9",0x90D8],
- ["D3F4",0x90D9],
- ["D3F5",0x90DA],
- ["D3FA",0x90DB],
- ["D3FC",0x90DC],
- ["B071",0x90DD],
- ["D3F7",0x90DF],
- ["D3F3",0x90E0],
- ["B070",0x90E1],
- ["B072",0x90E2],
- ["D3F6",0x90E3],
- ["D3FD",0x90E4],
- ["D3F8",0x90E5],
- ["B3A1",0x90E8],
- ["D7F1",0x90E9],
- ["D7E9",0x90EA],
- ["D7EF",0x90EB],
- ["D7F0",0x90EC],
- ["B3A2",0x90ED],
- ["D7E8",0x90EF],
- ["D7EA",0x90F0],
- ["D0B7",0x90F1],
- ["D7EC",0x90F2],
- ["D7ED",0x90F3],
- ["D7EB",0x90F4],
- ["B66C",0x90F5],
- ["DC56",0x90F9],
- ["EBD4",0x90FA],
- ["DC57",0x90FB],
- ["DC54",0x90FC],
- ["B3A3",0x90FD],
- ["B66E",0x90FE],
- ["DC53",0x90FF],
- ["DC59",0x9100],
- ["DC58",0x9101],
- ["B66B",0x9102],
- ["DC5C",0x9103],
- ["DC52",0x9104],
- ["DC5B",0x9105],
- ["DC50",0x9106],
- ["DC5A",0x9107],
- ["DC55",0x9108],
- ["B66D",0x9109],
- ["E0AA",0x910B],
- ["E0A5",0x910D],
- ["E0AB",0x910E],
- ["E0A6",0x910F],
- ["E0A4",0x9110],
- ["E0A7",0x9111],
- ["B951",0x9112],
- ["E0A9",0x9114],
- ["E0A8",0x9116],
- ["B952",0x9117],
- ["BBC1",0x9118],
- ["BBC0",0x9119],
- ["E46E",0x911A],
- ["E471",0x911B],
- ["E469",0x911C],
- ["E46D",0x911D],
- ["BBC2",0x911E],
- ["E46C",0x911F],
- ["E46A",0x9120],
- ["E470",0x9121],
- ["E46B",0x9122],
- ["E468",0x9123],
- ["E46F",0x9124],
- ["E859",0x9126],
- ["BE48",0x9127],
- ["F14A",0x9128],
- ["E856",0x9129],
- ["E857",0x912A],
- ["E855",0x912B],
- ["DC51",0x912C],
- ["BE47",0x912D],
- ["E85A",0x912E],
- ["E854",0x912F],
- ["BE46",0x9130],
- ["BE49",0x9131],
- ["E858",0x9132],
- ["EBD5",0x9133],
- ["BFF3",0x9134],
- ["EBD6",0x9135],
- ["EBD7",0x9136],
- ["EEC4",0x9138],
- ["C1DD",0x9139],
- ["F14B",0x913A],
- ["F14C",0x913B],
- ["F14D",0x913E],
- ["F35D",0x913F],
- ["F35C",0x9140],
- ["F4E2",0x9141],
- ["F4E1",0x9143],
- ["F65B",0x9144],
- ["F65C",0x9145],
- ["F65A",0x9146],
- ["F766",0x9147],
- ["C5B0",0x9148],
- ["A8BB",0x9149],
- ["ADAA",0x914A],
- ["ADA9",0x914B],
- ["B075",0x914C],
- ["B074",0x914D],
- ["D440",0x914E],
- ["D441",0x914F],
- ["D3FE",0x9150],
- ["9FB2",0x9151],
- ["B073",0x9152],
- ["D7F5",0x9153],
- ["D7F6",0x9155],
- ["D7F2",0x9156],
- ["B3A4",0x9157],
- ["D7F3",0x9158],
- ["9FAE",0x9159],
- ["D7F4",0x915A],
- ["9FB0",0x915C],
- ["89AD",0x915E],
- ["DC5F",0x915F],
- ["DC61",0x9160],
- ["DC5D",0x9161],
- ["DC60",0x9162],
- ["B66F",0x9163],
- ["DC5E",0x9164],
- ["B670",0x9165],
- ["906E",0x9167],
- ["DD73",0x9168],
- ["B955",0x9169],
- ["B954",0x916A],
- ["B953",0x916C],
- ["E0AC",0x916E],
- ["E0AD",0x916F],
- ["9E71",0x9170],
- ["E473",0x9172],
- ["E475",0x9173],
- ["BBC6",0x9174],
- ["BBC3",0x9175],
- ["9E4A",0x9176],
- ["BBC5",0x9177],
- ["BBC4",0x9178],
- ["E474",0x9179],
- ["E472",0x917A],
- ["9FDC",0x917C],
- ["E861",0x9180],
- ["E85E",0x9181],
- ["E85F",0x9182],
- ["BE4D",0x9183],
- ["E860",0x9184],
- ["E85B",0x9185],
- ["E85C",0x9186],
- ["BE4A",0x9187],
- ["BE4B",0x9189],
- ["E85D",0x918A],
- ["BE4C",0x918B],
- ["89AB",0x918C],
- ["EBDB",0x918D],
- ["9FB8",0x918E],
- ["EBDC",0x918F],
- ["EBD9",0x9190],
- ["EBDA",0x9191],
- ["BFF4",0x9192],
- ["EBD8",0x9193],
- ["EEC8",0x9199],
- ["EEC5",0x919A],
- ["EEC7",0x919B],
- ["C1E0",0x919C],
- ["EECB",0x919D],
- ["C1DF",0x919E],
- ["EEC9",0x919F],
- ["EECC",0x91A0],
- ["EECA",0x91A1],
- ["EEC6",0x91A2],
- ["C1DE",0x91A3],
- ["F14F",0x91A5],
- ["F150",0x91A7],
- ["F14E",0x91A8],
- ["9070",0x91A9],
- ["F152",0x91AA],
- ["C2E5",0x91AB],
- ["C2E6",0x91AC],
- ["F35F",0x91AD],
- ["C3E7",0x91AE],
- ["F151",0x91AF],
- ["F35E",0x91B0],
- ["C3E6",0x91B1],
- ["F4E5",0x91B2],
- ["F4E6",0x91B3],
- ["C4BF",0x91B4],
- ["F4E4",0x91B5],
- ["8B63",0x91B6],
- ["F4E3",0x91B7],
- ["F65D",0x91B9],
- ["C548",0x91BA],
- ["95DC",0x91BB],
- ["F849",0x91BC],
- ["F8C8",0x91BD],
- ["F8C7",0x91BE],
- ["C643",0x91C0],
- ["C65D",0x91C1],
- ["F8C9",0x91C2],
- ["F971",0x91C3],
- ["9071",0x91C4],
- ["C66F",0x91C5],
- ["A8BC",0x91C6],
- ["AAF6",0x91C7],
- ["B956",0x91C9],
- ["C4C0",0x91CB],
- ["A8BD",0x91CC],
- ["ADAB",0x91CD],
- ["B3A5",0x91CE],
- ["B671",0x91CF],
- ["C2E7",0x91D0],
- ["AAF7",0x91D1],
- ["D0C1",0x91D3],
- ["D0C0",0x91D4],
- ["D442",0x91D5],
- ["FC5E",0x91D6],
- ["B078",0x91D7],
- ["B076",0x91D8],
- ["B07A",0x91D9],
- ["D444",0x91DA],
- ["B079",0x91DC],
- ["B077",0x91DD],
- ["8949",0x91DF],
- ["D443",0x91E2],
- ["B3A8",0x91E3],
- ["D7FC",0x91E4],
- ["965B",0x91E5],
- ["B3A7",0x91E6],
- ["B3A9",0x91E7],
- ["D842",0x91E8],
- ["B3AB",0x91E9],
- ["D7FE",0x91EA],
- ["D840",0x91EB],
- ["D7F7",0x91EC],
- ["B3AA",0x91ED],
- ["D843",0x91EE],
- ["D7F9",0x91F1],
- ["D7FA",0x91F3],
- ["D7F8",0x91F4],
- ["B3A6",0x91F5],
- ["8C50",0x91F6],
- ["D841",0x91F7],
- ["D7FB",0x91F8],
- ["D7FD",0x91F9],
- ["94A6",0x91FA],
- ["DC6D",0x91FD],
- ["8FD5",0x91FE],
- ["DC6C",0x91FF],
- ["DC6A",0x9200],
- ["DC62",0x9201],
- ["DC71",0x9202],
- ["DC65",0x9203],
- ["DC6F",0x9204],
- ["DC76",0x9205],
- ["DC6E",0x9206],
- ["B679",0x9207],
- ["9E73",0x9208],
- ["B675",0x9209],
- ["DC63",0x920A],
- ["DC69",0x920C],
- ["B677",0x920D],
- ["9075",0x920E],
- ["DC68",0x920F],
- ["B678",0x9210],
- ["B67A",0x9211],
- ["DC6B",0x9212],
- ["99F7",0x9213],
- ["B672",0x9214],
- ["B673",0x9215],
- ["DC77",0x9216],
- ["DC75",0x9217],
- ["DC74",0x9219],
- ["DC66",0x921A],
- ["DC72",0x921C],
- ["B676",0x921E],
- ["8CBF",0x9221],
- ["B674",0x9223],
- ["DC73",0x9224],
- ["DC64",0x9225],
- ["DC67",0x9226],
- ["DC70",0x9227],
- ["99F9",0x9228],
- ["9663",0x922A],
- ["95B9",0x922B],
- ["E4BA",0x922D],
- ["E0B7",0x922E],
- ["E0B0",0x9230],
- ["E0C3",0x9231],
- ["E0CC",0x9232],
- ["E0B3",0x9233],
- ["B961",0x9234],
- ["94D4",0x9235],
- ["E0C0",0x9236],
- ["B957",0x9237],
- ["B959",0x9238],
- ["B965",0x9239],
- ["E0B1",0x923A],
- ["FCFA",0x923C],
- ["B95A",0x923D],
- ["B95C",0x923E],
- ["B966",0x923F],
- ["B95B",0x9240],
- ["9077",0x9241],
- ["90AB",0x9244],
- ["B964",0x9245],
- ["E0B9",0x9246],
- ["E0AE",0x9248],
- ["B962",0x9249],
- ["E0B8",0x924A],
- ["B95E",0x924B],
- ["E0CA",0x924C],
- ["B963",0x924D],
- ["E0C8",0x924E],
- ["E0BC",0x924F],
- ["E0C6",0x9250],
- ["B960",0x9251],
- ["E0AF",0x9252],
- ["E0C9",0x9253],
- ["E0C4",0x9254],
- ["9D4D",0x9255],
- ["E0CB",0x9256],
- ["B958",0x9257],
- ["99FA",0x9258],
- ["B967",0x925A],
- ["B95D",0x925B],
- ["92E3",0x925D],
- ["E0B5",0x925E],
- ["97BB",0x925F],
- ["E0BD",0x9260],
- ["E0C1",0x9261],
- ["9078",0x9262],
- ["E0C5",0x9263],
- ["B95F",0x9264],
- ["E0B4",0x9265],
- ["E0B2",0x9266],
- ["E0BE",0x9267],
- ["99FB",0x926B],
- ["E0BB",0x926C],
- ["E0BA",0x926D],
- ["97E0",0x926E],
- ["E0BF",0x926F],
- ["E0C2",0x9270],
- ["E0C7",0x9272],
- ["E478",0x9276],
- ["96DC",0x9277],
- ["BBC7",0x9278],
- ["E4A4",0x9279],
- ["E47A",0x927A],
- ["BBCC",0x927B],
- ["BBD0",0x927C],
- ["E4AD",0x927D],
- ["E4B5",0x927E],
- ["E4A6",0x927F],
- ["BBC8",0x9280],
- ["9CA8",0x9281],
- ["E4AA",0x9282],
- ["E0B6",0x9283],
- ["9772",0x9284],
- ["BBC9",0x9285],
- ["E4B1",0x9286],
- ["E4B6",0x9287],
- ["E4AE",0x9288],
- ["9440",0x9289],
- ["E4B0",0x928A],
- ["E4B9",0x928B],
- ["E4B2",0x928C],
- ["E47E",0x928D],
- ["E4A9",0x928E],
- ["92F2",0x928F],
- ["BBD1",0x9291],
- ["BBCD",0x9293],
- ["E47C",0x9294],
- ["E4AB",0x9295],
- ["BBCB",0x9296],
- ["E4A5",0x9297],
- ["BBCA",0x9298],
- ["E4B3",0x9299],
- ["E4A2",0x929A],
- ["E479",0x929B],
- ["BBCE",0x929C],
- ["E4B8",0x929D],
- ["E47B",0x92A0],
- ["E4AF",0x92A1],
- ["E4AC",0x92A2],
- ["E4A7",0x92A3],
- ["E477",0x92A4],
- ["E476",0x92A5],
- ["E4A1",0x92A6],
- ["E4B4",0x92A7],
- ["BBCF",0x92A8],
- ["E4B7",0x92A9],
- ["E47D",0x92AA],
- ["E4A3",0x92AB],
- ["BE52",0x92AC],
- ["99FD",0x92AE],
- ["99FC",0x92B1],
- ["BE5A",0x92B2],
- ["BE55",0x92B3],
- ["E8A4",0x92B4],
- ["E8A1",0x92B5],
- ["E867",0x92B6],
- ["BE50",0x92B7],
- ["F9D7",0x92B9],
- ["964A",0x92BA],
- ["BE4F",0x92BB],
- ["BE56",0x92BC],
- ["96D8",0x92BE],
- ["99FE",0x92BF],
- ["E865",0x92C0],
- ["BE54",0x92C1],
- ["E871",0x92C2],
- ["E863",0x92C3],
- ["E864",0x92C4],
- ["BE4E",0x92C5],
- ["E8A3",0x92C6],
- ["BE58",0x92C7],
- ["E874",0x92C8],
- ["E879",0x92C9],
- ["E873",0x92CA],
- ["EBEE",0x92CB],
- ["E86F",0x92CC],
- ["E877",0x92CD],
- ["E875",0x92CE],
- ["E868",0x92CF],
- ["E862",0x92D0],
- ["E87D",0x92D1],
- ["BE57",0x92D2],
- ["E87E",0x92D3],
- ["904B",0x92D4],
- ["E878",0x92D5],
- ["E86D",0x92D7],
- ["E86B",0x92D8],
- ["E866",0x92D9],
- ["FA41",0x92DB],
- ["E86E",0x92DD],
- ["E87B",0x92DE],
- ["E86A",0x92DF],
- ["E87A",0x92E0],
- ["E8A2",0x92E1],
- ["9A40",0x92E3],
- ["BE53",0x92E4],
- ["975B",0x92E5],
- ["E876",0x92E6],
- ["E87C",0x92E7],
- ["E872",0x92E8],
- ["E86C",0x92E9],
- ["BE51",0x92EA],
- ["9A41",0x92EB],
- ["91DD",0x92EC],
- ["E4A8",0x92EE],
- ["E870",0x92EF],
- ["BE59",0x92F0],
- ["E869",0x92F1],
- ["93FC",0x92F2],
- ["9A42",0x92F3],
- ["9A43",0x92F4],
- ["9659",0x92F6],
- ["EBF4",0x92F7],
- ["BFF7",0x92F8],
- ["EBF3",0x92F9],
- ["EBF0",0x92FA],
- ["EC44",0x92FB],
- ["BFFB",0x92FC],
- ["9A44",0x92FD],
- ["EC41",0x92FE],
- ["EBF8",0x92FF],
- ["EC43",0x9300],
- ["EBE9",0x9301],
- ["EBF6",0x9302],
- ["9051",0x9303],
- ["BFFD",0x9304],
- ["EBE1",0x9306],
- ["94BF",0x9307],
- ["EBDF",0x9308],
- ["EC42",0x9309],
- ["EC40",0x930B],
- ["EBFE",0x930C],
- ["EBED",0x930D],
- ["EBEC",0x930E],
- ["EBE2",0x930F],
- ["C040",0x9310],
- ["EBE8",0x9312],
- ["EBF2",0x9313],
- ["EBFD",0x9314],
- ["C043",0x9315],
- ["EC45",0x9316],
- ["C1E8",0x9318],
- ["C045",0x9319],
- ["BFFE",0x931A],
- ["EBE6",0x931B],
- ["EBEF",0x931D],
- ["EBDE",0x931E],
- ["EBE0",0x931F],
- ["BFF5",0x9320],
- ["C042",0x9321],
- ["BFFA",0x9322],
- ["EBE7",0x9323],
- ["EBF7",0x9324],
- ["EBF1",0x9325],
- ["C041",0x9326],
- ["EBDD",0x9327],
- ["C1E3",0x9328],
- ["EBF9",0x9329],
- ["EBFC",0x932A],
- ["BFFC",0x932B],
- ["90A2",0x932C],
- ["EBEB",0x932D],
- ["C044",0x932E],
- ["BFF9",0x932F],
- ["9CAB",0x9330],
- ["9776",0x9331],
- ["BFF8",0x9333],
- ["EBF5",0x9334],
- ["EBFB",0x9335],
- ["BFF6",0x9336],
- ["EBE4",0x9338],
- ["EBFA",0x9339],
- ["EBE5",0x933C],
- ["FC55",0x9340],
- ["FE45",0x9341],
- ["94A8",0x9342],
- ["9A45",0x9343],
- ["FA4B",0x9344],
- ["9DE1",0x9345],
- ["EBEA",0x9346],
- ["EED2",0x9347],
- ["96D9",0x9348],
- ["EED7",0x9349],
- ["C1E5",0x934A],
- ["C1E7",0x934B],
- ["EEDD",0x934C],
- ["C1E1",0x934D],
- ["EEEC",0x934E],
- ["EEE3",0x934F],
- ["EED8",0x9350],
- ["EED9",0x9351],
- ["EEE2",0x9352],
- ["C1EE",0x9354],
- ["EEE1",0x9355],
- ["EED1",0x9356],
- ["EEE0",0x9357],
- ["EED4",0x9358],
- ["EEED",0x9359],
- ["C1ED",0x935A],
- ["C1EB",0x935B],
- ["EED5",0x935C],
- ["EEE8",0x935E],
- ["9774",0x935F],
- ["EEDA",0x9360],
- ["EEE7",0x9361],
- ["FDF5",0x9362],
- ["EEE9",0x9363],
- ["EED0",0x9364],
- ["C1E6",0x9365],
- ["92E5",0x9366],
- ["EEEA",0x9367],
- ["9645",0x9368],
- ["91DA",0x9369],
- ["EEDE",0x936A],
- ["90A3",0x936B],
- ["C1EA",0x936C],
- ["EEDB",0x936D],
- ["A05F",0x936E],
- ["C1EC",0x9370],
- ["EEE4",0x9371],
- ["90AF",0x9373],
- ["97BF",0x9374],
- ["C1E4",0x9375],
- ["EED6",0x9376],
- ["EEE5",0x9377],
- ["914C",0x9378],
- ["EEDF",0x9379],
- ["EBE3",0x937A],
- ["EEE6",0x937B],
- ["EED3",0x937C],
- ["967A",0x937D],
- ["C1E9",0x937E],
- ["EEEB",0x9380],
- ["91DE",0x9381],
- ["C1E2",0x9382],
- ["EECE",0x9383],
- ["9A46",0x9384],
- ["FEB0",0x9385],
- ["9779",0x9386],
- ["946C",0x9387],
- ["F160",0x9388],
- ["F159",0x9389],
- ["C2E9",0x938A],
- ["F154",0x938C],
- ["F163",0x938D],
- ["F15B",0x938E],
- ["EEDC",0x938F],
- ["9858",0x9390],
- ["F165",0x9391],
- ["F155",0x9392],
- ["C2E8",0x9394],
- ["F15F",0x9395],
- ["C2EA",0x9396],
- ["C2F2",0x9397],
- ["C2F0",0x9398],
- ["F161",0x9399],
- ["C2F1",0x939A],
- ["F157",0x939B],
- ["9266",0x939C],
- ["F158",0x939D],
- ["F15D",0x939E],
- ["F162",0x939F],
- ["93FB",0x93A0],
- ["EECD",0x93A1],
- ["C2EB",0x93A2],
- ["F16A",0x93A3],
- ["F167",0x93A4],
- ["F16B",0x93A5],
- ["F15E",0x93A6],
- ["F15A",0x93A7],
- ["F168",0x93A8],
- ["F36A",0x93A9],
- ["F15C",0x93AA],
- ["C2EE",0x93AC],
- ["9A47",0x93AD],
- ["C2ED",0x93AE],
- ["EECF",0x93AF],
- ["C2EF",0x93B0],
- ["F164",0x93B1],
- ["F166",0x93B2],
- ["C2EC",0x93B3],
- ["F169",0x93B4],
- ["F153",0x93B5],
- ["F156",0x93B7],
- ["9749",0x93B8],
- ["9748",0x93BB],
- ["934A",0x93BD],
- ["9CE2",0x93BF],
- ["F373",0x93C0],
- ["F363",0x93C2],
- ["C3EB",0x93C3],
- ["F371",0x93C4],
- ["9264",0x93C6],
- ["F361",0x93C7],
- ["C3EC",0x93C8],
- ["F36C",0x93CA],
- ["91DF",0x93CB],
- ["F368",0x93CC],
- ["C3F1",0x93CD],
- ["F372",0x93CE],
- ["F362",0x93CF],
- ["F365",0x93D0],
- ["C3E9",0x93D1],
- ["F374",0x93D2],
- ["FB79",0x93D3],
- ["F36D",0x93D4],
- ["F370",0x93D5],
- ["C3EF",0x93D6],
- ["C3F4",0x93D7],
- ["C3F2",0x93D8],
- ["F369",0x93D9],
- ["F364",0x93DA],
- ["96D7",0x93DB],
- ["C3ED",0x93DC],
- ["C3EE",0x93DD],
- ["F360",0x93DE],
- ["C3EA",0x93DF],
- ["9343",0x93E0],
- ["C3E8",0x93E1],
- ["C3F0",0x93E2],
- ["F36F",0x93E3],
- ["C3F3",0x93E4],
- ["F36B",0x93E6],
- ["F375",0x93E7],
- ["C3F5",0x93E8],
- ["F367",0x93EC],
- ["F36E",0x93EE],
- ["FDCB",0x93F0],
- ["FE7A",0x93F1],
- ["91DB",0x93F3],
- ["8C6A",0x93F4],
- ["F4F3",0x93F5],
- ["F542",0x93F6],
- ["F4F5",0x93F7],
- ["F4FC",0x93F8],
- ["F366",0x93F9],
- ["F4FA",0x93FA],
- ["F4E9",0x93FB],
- ["F540",0x93FC],
- ["C4C3",0x93FD],
- ["F4ED",0x93FE],
- ["F4FE",0x93FF],
- ["F4F4",0x9400],
- ["97AF",0x9401],
- ["C4C2",0x9403],
- ["95DD",0x9404],
- ["F544",0x9406],
- ["F4F6",0x9407],
- ["9348",0x9408],
- ["F4FB",0x9409],
- ["F4FD",0x940A],
- ["F4E7",0x940B],
- ["F541",0x940C],
- ["F4F2",0x940D],
- ["F4F7",0x940E],
- ["F4EB",0x940F],
- ["F4EF",0x9410],
- ["F543",0x9411],
- ["F4F9",0x9412],
- ["F4E8",0x9413],
- ["F4EC",0x9414],
- ["F4EE",0x9415],
- ["F4F8",0x9416],
- ["9A4B",0x9417],
- ["C4C1",0x9418],
- ["F4F1",0x9419],
- ["FC45",0x941B],
- ["9A4D",0x941D],
- ["F4EA",0x9420],
- ["91BC",0x9424],
- ["90E2",0x9425],
- ["90B4",0x9426],
- ["95E1",0x9427],
- ["F4F0",0x9428],
- ["F661",0x9429],
- ["F666",0x942A],
- ["C54F",0x942B],
- ["F668",0x942C],
- ["9A4E",0x942D],
- ["C549",0x942E],
- ["F664",0x9430],
- ["F66A",0x9431],
- ["C54E",0x9432],
- ["C54A",0x9433],
- ["C54B",0x9435],
- ["F660",0x9436],
- ["F667",0x9437],
- ["C54D",0x9438],
- ["F665",0x9439],
- ["C54C",0x943A],
- ["F65F",0x943B],
- ["F663",0x943C],
- ["F662",0x943D],
- ["9A4F",0x943E],
- ["F65E",0x943F],
- ["F669",0x9440],
- ["FE40",0x9442],
- ["FE43",0x9443],
- ["C5B1",0x9444],
- ["F76D",0x9445],
- ["F770",0x9446],
- ["F76C",0x9447],
- ["F76E",0x9448],
- ["F76F",0x9449],
- ["F769",0x944A],
- ["F76A",0x944B],
- ["F767",0x944C],
- ["96DD",0x944D],
- ["F76B",0x944F],
- ["F768",0x9450],
- ["C5B2",0x9451],
- ["C5B3",0x9452],
- ["9A51",0x9454],
- ["F84B",0x9455],
- ["F84D",0x9457],
- ["96A7",0x9458],
- ["90B0",0x945B],
- ["F84C",0x945D],
- ["F84E",0x945E],
- ["C5E0",0x9460],
- ["F84A",0x9462],
- ["C5DF",0x9463],
- ["C5E1",0x9464],
- ["9C4E",0x9465],
- ["9443",0x9467],
- ["F8CB",0x9468],
- ["F8CC",0x9469],
- ["C644",0x946A],
- ["F8CA",0x946B],
- ["8EBA",0x946C],
- ["F953",0x946D],
- ["F952",0x946E],
- ["F954",0x946F],
- ["C65F",0x9470],
- ["F955",0x9471],
- ["C65E",0x9472],
- ["F956",0x9473],
- ["F972",0x9474],
- ["F975",0x9475],
- ["F974",0x9476],
- ["C668",0x9477],
- ["F973",0x9478],
- ["9A52",0x9479],
- ["FCC1",0x947B],
- ["C672",0x947C],
- ["C670",0x947D],
- ["C671",0x947E],
- ["C677",0x947F],
- ["F9C0",0x9480],
- ["F9C1",0x9481],
- ["F9BF",0x9482],
- ["F9C9",0x9483],
- ["8BE9",0x9485],
- ["9CAF",0x949F],
- ["8BFD",0x94A2],
- ["9ABC",0x94C1],
- ["9AB8",0x94C3],
- ["9AAE",0x94DC],
- ["9AA7",0x94F6],
- ["9A53",0x952D],
- ["9D74",0x9547],
- ["AAF8",0x9577],
- ["8BEA",0x9578],
- ["D844",0x957A],
- ["DC78",0x957B],
- ["E8A5",0x957C],
- ["F376",0x957D],
- ["8BEB",0x957F],
- ["AAF9",0x9580],
- ["ADAC",0x9582],
- ["B07B",0x9583],
- ["90B2",0x9585],
- ["D845",0x9586],
- ["D846",0x9588],
- ["B3AC",0x9589],
- ["B67D",0x958B],
- ["DC7A",0x958C],
- ["DC79",0x958D],
- ["B6A3",0x958E],
- ["B67C",0x958F],
- ["DC7B",0x9590],
- ["B67E",0x9591],
- ["B6A2",0x9592],
- ["B6A1",0x9593],
- ["B67B",0x9594],
- ["95E9",0x9596],
- ["95E8",0x9597],
- ["B968",0x9598],
- ["95E6",0x9599],
- ["E0D0",0x959B],
- ["E0CE",0x959C],
- ["E0CF",0x959E],
- ["E0CD",0x959F],
- ["90B5",0x95A0],
- ["BBD2",0x95A1],
- ["9A54",0x95A2],
- ["BBD5",0x95A3],
- ["BBD7",0x95A4],
- ["BBD6",0x95A5],
- ["90B3",0x95A6],
- ["95E7",0x95A7],
- ["BBD3",0x95A8],
- ["BBD4",0x95A9],
- ["8B50",0x95AA],
- ["E8A7",0x95AB],
- ["E8A6",0x95AC],
- ["BE5B",0x95AD],
- ["E8A8",0x95AE],
- ["E8A9",0x95B0],
- ["BE5C",0x95B1],
- ["EC4D",0x95B5],
- ["EC4B",0x95B6],
- ["EEF3",0x95B7],
- ["EC49",0x95B9],
- ["EC4A",0x95BA],
- ["C046",0x95BB],
- ["EC46",0x95BC],
- ["EC4E",0x95BD],
- ["EC48",0x95BE],
- ["EC4C",0x95BF],
- ["EEEF",0x95C0],
- ["EEF1",0x95C3],
- ["EEF2",0x95C5],
- ["C1F3",0x95C6],
- ["EEEE",0x95C7],
- ["C1F2",0x95C8],
- ["EEF0",0x95C9],
- ["C1EF",0x95CA],
- ["C1F0",0x95CB],
- ["C1F1",0x95CC],
- ["EC47",0x95CD],
- ["C2F5",0x95D0],
- ["F16E",0x95D1],
- ["F16C",0x95D2],
- ["F16D",0x95D3],
- ["C2F3",0x95D4],
- ["C2F6",0x95D5],
- ["C2F4",0x95D6],
- ["F377",0x95DA],
- ["F378",0x95DB],
- ["C3F6",0x95DC],
- ["F545",0x95DE],
- ["F547",0x95DF],
- ["F546",0x95E0],
- ["C4C4",0x95E1],
- ["C550",0x95E2],
- ["F66D",0x95E3],
- ["F66C",0x95E4],
- ["F66B",0x95E5],
- ["8BEC",0x95E8],
- ["9A56",0x95F4],
- ["AAFA",0x961C],
- ["8BFB",0x961D],
- ["C9AA",0x961E],
- ["CA58",0x9620],
- ["A6E9",0x9621],
- ["CA56",0x9622],
- ["CA59",0x9623],
- ["CA57",0x9624],
- ["CBAE",0x9628],
- ["A8C1",0x962A],
- ["A8C2",0x962C],
- ["CBB0",0x962D],
- ["A8BF",0x962E],
- ["CBAF",0x962F],
- ["CBAD",0x9630],
- ["A8C0",0x9631],
- ["A8BE",0x9632],
- ["9A57",0x9633],
- ["A0AA",0x9638],
- ["CDD8",0x9639],
- ["CDDB",0x963A],
- ["AAFD",0x963B],
- ["CDDA",0x963C],
- ["CDD9",0x963D],
- ["AAFC",0x963F],
- ["AAFB",0x9640],
- ["9FA6",0x9641],
- ["AB40",0x9642],
- ["CDDC",0x9643],
- ["AAFE",0x9644],
- ["99CC",0x9645],
- ["D0C6",0x964A],
- ["ADAE",0x964B],
- ["ADAF",0x964C],
- ["ADB0",0x964D],
- ["D0C7",0x964E],
- ["D0C3",0x964F],
- ["ADAD",0x9650],
- ["D0C4",0x9651],
- ["D0C5",0x9653],
- ["D0C2",0x9654],
- ["9C59",0x9656],
- ["B0A4",0x9658],
- ["B0A1",0x965B],
- ["D445",0x965C],
- ["B0A2",0x965D],
- ["B0A5",0x965E],
- ["D446",0x965F],
- ["B07E",0x9661],
- ["B07C",0x9662],
- ["B07D",0x9663],
- ["B0A3",0x9664],
- ["99B5",0x9669],
- ["B3AD",0x966A],
- ["D849",0x966B],
- ["B3B5",0x966C],
- ["D848",0x966D],
- ["D84B",0x966F],
- ["B3B1",0x9670],
- ["D84A",0x9671],
- ["B6AB",0x9672],
- ["B3AF",0x9673],
- ["B3B2",0x9674],
- ["B3AE",0x9675],
- ["B3B3",0x9676],
- ["B3B4",0x9677],
- ["B3B0",0x9678],
- ["90BE",0x967B],
- ["D847",0x967C],
- ["B6A7",0x967D],
- ["DC7D",0x967E],
- ["DCA3",0x9680],
- ["9FAF",0x9681],
- ["DCA2",0x9683],
- ["B6AC",0x9684],
- ["B6A8",0x9685],
- ["B6A9",0x9686],
- ["DC7C",0x9687],
- ["DC7E",0x9688],
- ["DCA1",0x9689],
- ["B6A4",0x968A],
- ["B6A6",0x968B],
- ["B6AA",0x968D],
- ["B6A5",0x968E],
- ["95F2",0x968F],
- ["E0D3",0x9691],
- ["E0D1",0x9692],
- ["E0D2",0x9693],
- ["B96A",0x9694],
- ["B96B",0x9695],
- ["90BF",0x9696],
- ["E0D4",0x9697],
- ["B969",0x9698],
- ["BBD8",0x9699],
- ["BBDA",0x969B],
- ["BBD9",0x969C],
- ["E4BB",0x969E],
- ["E4BC",0x96A1],
- ["E8AB",0x96A2],
- ["90C1",0x96A3],
- ["E8AA",0x96A4],
- ["FEE4",0x96A5],
- ["C047",0x96A7],
- ["C048",0x96A8],
- ["EC4F",0x96A9],
- ["C049",0x96AA],
- ["EEF6",0x96AC],
- ["EEF4",0x96AE],
- ["EEF5",0x96B0],
- ["C1F4",0x96B1],
- ["F16F",0x96B3],
- ["C3F7",0x96B4],
- ["90C4",0x96B6],
- ["C1F5",0x96B8],
- ["AB41",0x96B9],
- ["B0A6",0x96BB],
- ["D447",0x96BC],
- ["90C7",0x96BD],
- ["D84C",0x96BF],
- ["B3B6",0x96C0],
- ["B6AD",0x96C1],
- ["DCA4",0x96C2],
- ["DCA6",0x96C3],
- ["B6AF",0x96C4],
- ["B6AE",0x96C5],
- ["B6B0",0x96C6],
- ["B6B1",0x96C7],
- ["DCA5",0x96C8],
- ["B96E",0x96C9],
- ["B96F",0x96CA],
- ["B96D",0x96CB],
- ["BBDB",0x96CC],
- ["B96C",0x96CD],
- ["E0D5",0x96CE],
- ["BBDC",0x96D2],
- ["E8AC",0x96D3],
- ["EC50",0x96D4],
- ["C04A",0x96D5],
- ["C1F6",0x96D6],
- ["F170",0x96D7],
- ["F174",0x96D8],
- ["C2F9",0x96D9],
- ["F171",0x96DA],
- ["C2FA",0x96DB],
- ["C2F8",0x96DC],
- ["F175",0x96DD],
- ["C2FB",0x96DE],
- ["F173",0x96DF],
- ["F379",0x96E1],
- ["C2F7",0x96E2],
- ["C3F8",0x96E3],
- ["F8CD",0x96E5],
- ["AB42",0x96E8],
- ["B3B8",0x96E9],
- ["B3B7",0x96EA],
- ["B6B2",0x96EF],
- ["DCA8",0x96F0],
- ["DCA7",0x96F1],
- ["B6B3",0x96F2],
- ["92E4",0x96F4],
- ["E0D9",0x96F5],
- ["B973",0x96F6],
- ["B970",0x96F7],
- ["E0D8",0x96F8],
- ["B972",0x96F9],
- ["E0D6",0x96FA],
- ["B971",0x96FB],
- ["E0D7",0x96FD],
- ["E4BD",0x96FF],
- ["BBDD",0x9700],
- ["E8AF",0x9702],
- ["9F52",0x9703],
- ["BE5D",0x9704],
- ["E8AD",0x9705],
- ["BE5E",0x9706],
- ["BE5F",0x9707],
- ["E8AE",0x9708],
- ["BE60",0x9709],
- ["EC51",0x970B],
- ["C04E",0x970D],
- ["C04B",0x970E],
- ["C050",0x970F],
- ["EC53",0x9710],
- ["C04C",0x9711],
- ["EC52",0x9712],
- ["C04F",0x9713],
- ["C04D",0x9716],
- ["EEF9",0x9718],
- ["EEFB",0x9719],
- ["90DB",0x971B],
- ["C1F7",0x971C],
- ["EEFA",0x971D],
- ["C1F8",0x971E],
- ["EEF8",0x971F],
- ["EEF7",0x9720],
- ["A066",0x9721],
- ["F177",0x9722],
- ["F176",0x9723],
- ["C2FC",0x9724],
- ["F178",0x9725],
- ["F37E",0x9726],
- ["C3FA",0x9727],
- ["F37D",0x9728],
- ["F37A",0x9729],
- ["C3F9",0x972A],
- ["F37B",0x972B],
- ["F37C",0x972C],
- ["F548",0x972E],
- ["F549",0x972F],
- ["C4C5",0x9730],
- ["90D2",0x9731],
- ["C553",0x9732],
- ["876B",0x9734],
- ["F66E",0x9735],
- ["90D4",0x9736],
- ["C551",0x9738],
- ["C552",0x9739],
- ["F66F",0x973A],
- ["C5B4",0x973D],
- ["C5B5",0x973E],
- ["F771",0x973F],
- ["9A5B",0x9740],
- ["95FD",0x9741],
- ["C645",0x9742],
- ["F8CF",0x9743],
- ["C647",0x9744],
- ["F8CE",0x9746],
- ["F8D0",0x9747],
- ["C646",0x9748],
- ["F957",0x9749],
- ["F9AD",0x974B],
- ["8BC4",0x9751],
- ["AB43",0x9752],
- ["8C66",0x9755],
- ["B974",0x9756],
- ["90DE",0x9757],
- ["E4BE",0x9758],
- ["E8B0",0x975A],
- ["C051",0x975B],
- ["C052",0x975C],
- ["9CE4",0x975D],
- ["AB44",0x975E],
- ["90E1",0x975F],
- ["BE61",0x9760],
- ["C3FB",0x9761],
- ["ADB1",0x9762],
- ["C053",0x9766],
- ["C5E2",0x9768],
- ["ADB2",0x9769],
- ["D84D",0x976A],
- ["DCA9",0x976C],
- ["9E46",0x976D],
- ["DCAB",0x976E],
- ["DCAA",0x9770],
- ["9651",0x9771],
- ["E0DD",0x9772],
- ["E0DA",0x9773],
- ["B975",0x9774],
- ["B976",0x9776],
- ["E0DB",0x9777],
- ["E0DC",0x9778],
- ["E4C0",0x977A],
- ["E4C5",0x977B],
- ["BBDE",0x977C],
- ["E4BF",0x977D],
- ["E4C1",0x977E],
- ["E4C8",0x977F],
- ["E4C3",0x9780],
- ["E4C7",0x9781],
- ["E4C4",0x9782],
- ["E4C2",0x9783],
- ["E4C6",0x9784],
- ["BBDF",0x9785],
- ["FB58",0x9787],
- ["E8B3",0x9788],
- ["90E6",0x9789],
- ["E8B1",0x978A],
- ["BE63",0x978B],
- ["BE62",0x978D],
- ["E8B2",0x978E],
- ["BE64",0x978F],
- ["EC56",0x9794],
- ["EC55",0x9797],
- ["C054",0x9798],
- ["EC54",0x9799],
- ["EEFC",0x979A],
- ["9650",0x979B],
- ["EEFE",0x979C],
- ["EF41",0x979D],
- ["EF40",0x979E],
- ["90E7",0x979F],
- ["C1F9",0x97A0],
- ["EEFD",0x97A1],
- ["F1A1",0x97A2],
- ["C2FD",0x97A3],
- ["F17D",0x97A4],
- ["F1A2",0x97A5],
- ["C2FE",0x97A6],
- ["F17B",0x97A8],
- ["F17E",0x97AA],
- ["F17C",0x97AB],
- ["F179",0x97AC],
- ["C340",0x97AD],
- ["F17A",0x97AE],
- ["90E8",0x97B1],
- ["9A5D",0x97B2],
- ["F3A1",0x97B3],
- ["9F7A",0x97B4],
- ["F3A3",0x97B6],
- ["F3A2",0x97B7],
- ["9B5C",0x97B8],
- ["F54A",0x97B9],
- ["9F7C",0x97BA],
- ["F54B",0x97BB],
- ["FC52",0x97BD],
- ["90E9",0x97BE],
- ["F670",0x97BF],
- ["90EA",0x97C0],
- ["C5B7",0x97C1],
- ["9A5E",0x97C2],
- ["C5B6",0x97C3],
- ["F84F",0x97C4],
- ["F850",0x97C5],
- ["C648",0x97C6],
- ["F8D1",0x97C7],
- ["9F76",0x97C8],
- ["C669",0x97C9],
- ["ADB3",0x97CB],
- ["B6B4",0x97CC],
- ["E4CA",0x97CD],
- ["E4C9",0x97CE],
- ["E8B5",0x97CF],
- ["E8B4",0x97D0],
- ["90EB",0x97D2],
- ["C1FA",0x97D3],
- ["EF43",0x97D4],
- ["EF42",0x97D5],
- ["F1A5",0x97D6],
- ["F1A3",0x97D7],
- ["F1A6",0x97D8],
- ["F1A4",0x97D9],
- ["C3FC",0x97DC],
- ["F3A4",0x97DD],
- ["F3A5",0x97DE],
- ["F3A6",0x97DF],
- ["90EC",0x97E0],
- ["F671",0x97E1],
- ["F772",0x97E3],
- ["F8D2",0x97E5],
- ["8BEE",0x97E6],
- ["ADB4",0x97ED],
- ["90EE",0x97EE],
- ["EC57",0x97F0],
- ["EF44",0x97F1],
- ["91C6",0x97F2],
- ["ADB5",0x97F3],
- ["90F2",0x97F5],
- ["BBE0",0x97F6],
- ["EC58",0x97F8],
- ["C341",0x97F9],
- ["F1A7",0x97FA],
- ["C3FD",0x97FB],
- ["F54C",0x97FD],
- ["F54D",0x97FE],
- ["C554",0x97FF],
- ["F851",0x9800],
- ["ADB6",0x9801],
- ["B3BB",0x9802],
- ["B3BC",0x9803],
- ["D84E",0x9804],
- ["B6B5",0x9805],
- ["B6B6",0x9806],
- ["DCAC",0x9807],
- ["B6B7",0x9808],
- ["B97A",0x980A],
- ["B97C",0x980C],
- ["E0DF",0x980D],
- ["E0E0",0x980E],
- ["E0DE",0x980F],
- ["B977",0x9810],
- ["B978",0x9811],
- ["B97B",0x9812],
- ["B979",0x9813],
- ["FCBC",0x9814],
- ["8A74",0x9815],
- ["E4CB",0x9816],
- ["BBE1",0x9817],
- ["BBE2",0x9818],
- ["E8BC",0x981B],
- ["BE67",0x981C],
- ["E8B7",0x981D],
- ["E8B6",0x981E],
- ["9657",0x981F],
- ["E8BB",0x9820],
- ["BE65",0x9821],
- ["9CEF",0x9823],
- ["C05B",0x9824],
- ["E8B8",0x9826],
- ["E8BD",0x9827],
- ["E8BA",0x9828],
- ["E8B9",0x9829],
- ["BE66",0x982B],
- ["C059",0x982D],
- ["9FDF",0x982E],
- ["EC5A",0x982F],
- ["C055",0x9830],
- ["EC5B",0x9832],
- ["90F7",0x9833],
- ["90F6",0x9834],
- ["EC59",0x9835],
- ["C058",0x9837],
- ["C056",0x9838],
- ["C05A",0x9839],
- ["C057",0x983B],
- ["EF45",0x9841],
- ["EF4A",0x9843],
- ["EF46",0x9844],
- ["EF49",0x9845],
- ["C1FB",0x9846],
- ["9B5E",0x9847],
- ["EDD4",0x9848],
- ["EF48",0x9849],
- ["EF47",0x984A],
- ["90F8",0x984B],
- ["C344",0x984C],
- ["C342",0x984D],
- ["C345",0x984E],
- ["C343",0x984F],
- ["F1A8",0x9850],
- ["F1A9",0x9851],
- ["F1AA",0x9852],
- ["C346",0x9853],
- ["8CFC",0x9856],
- ["F3AA",0x9857],
- ["C440",0x9858],
- ["F3A8",0x9859],
- ["C441",0x985B],
- ["F3A7",0x985C],
- ["F3A9",0x985D],
- ["C3FE",0x985E],
- ["F551",0x985F],
- ["F54E",0x9860],
- ["F54F",0x9862],
- ["F550",0x9863],
- ["F672",0x9864],
- ["C556",0x9865],
- ["90F9",0x9866],
- ["C555",0x9867],
- ["8CC9",0x9868],
- ["F774",0x9869],
- ["F773",0x986A],
- ["C5B8",0x986B],
- ["FA6A",0x986C],
- ["C5E3",0x986F],
- ["C649",0x9870],
- ["C660",0x9871],
- ["F958",0x9872],
- ["F9AE",0x9873],
- ["F9AF",0x9874],
- ["8BEF",0x9875],
- ["ADB7",0x98A8],
- ["DCAD",0x98A9],
- ["E0E1",0x98AC],
- ["E4CC",0x98AD],
- ["E4CD",0x98AE],
- ["BBE3",0x98AF],
- ["BBE4",0x98B1],
- ["E8BE",0x98B2],
- ["BE68",0x98B3],
- ["9FE0",0x98B4],
- ["C1FC",0x98B6],
- ["9142",0x98B7],
- ["F1AB",0x98B8],
- ["9A62",0x98B9],
- ["C347",0x98BA],
- ["F3AD",0x98BB],
- ["C442",0x98BC],
- ["F3AC",0x98BD],
- ["F3AE",0x98BE],
- ["F3AB",0x98BF],
- ["F675",0x98C0],
- ["F552",0x98C1],
- ["F553",0x98C2],
- ["9569",0x98C3],
- ["C4C6",0x98C4],
- ["F674",0x98C6],
- ["9144",0x98C7],
- ["9143",0x98C8],
- ["F673",0x98C9],
- ["9141",0x98CA],
- ["F775",0x98CB],
- ["F9B0",0x98CC],
- ["8BF0",0x98CE],
- ["ADB8",0x98DB],
- ["9660",0x98DC],
- ["8BF1",0x98DE],
- ["ADB9",0x98DF],
- ["99F6",0x98E0],
- ["9149",0x98E1],
- ["B0A7",0x98E2],
- ["D448",0x98E3],
- ["D84F",0x98E5],
- ["914A",0x98E6],
- ["B6B8",0x98E7],
- ["B6BB",0x98E9],
- ["B6B9",0x98EA],
- ["DCAE",0x98EB],
- ["914B",0x98EC],
- ["B6BD",0x98ED],
- ["B6BA",0x98EF],
- ["9A64",0x98F1],
- ["B6BC",0x98F2],
- ["B97E",0x98F4],
- ["8ABF",0x98F5],
- ["E0E2",0x98F6],
- ["E0E3",0x98F9],
- ["E8C0",0x98FA],
- ["B97D",0x98FC],
- ["B9A1",0x98FD],
- ["B9A2",0x98FE],
- ["E4CF",0x9900],
- ["E4CE",0x9902],
- ["BBE5",0x9903],
- ["BBE6",0x9905],
- ["E4D0",0x9907],
- ["E8BF",0x9908],
- ["BBE8",0x9909],
- ["BE69",0x990A],
- ["BBE7",0x990C],
- ["9A66",0x990E],
- ["C05C",0x9910],
- ["E8C1",0x9911],
- ["BE6B",0x9912],
- ["BE6A",0x9913],
- ["E8C2",0x9914],
- ["E8C5",0x9915],
- ["E8C3",0x9916],
- ["E8C4",0x9917],
- ["BE6C",0x9918],
- ["9A67",0x9919],
- ["C061",0x991A],
- ["C05F",0x991B],
- ["9A69",0x991C],
- ["C05E",0x991E],
- ["EC5D",0x991F],
- ["C060",0x9921],
- ["EC5C",0x9924],
- ["EF4B",0x9925],
- ["EC5E",0x9927],
- ["C05D",0x9928],
- ["EC5F",0x9929],
- ["EF4E",0x992A],
- ["EF4C",0x992B],
- ["EF4D",0x992C],
- ["EF52",0x992D],
- ["C34B",0x992E],
- ["EF51",0x992F],
- ["EF54",0x9930],
- ["EF53",0x9931],
- ["EF50",0x9932],
- ["EF4F",0x9933],
- ["C1FD",0x9935],
- ["9A6A",0x9937],
- ["9652",0x9938],
- ["914D",0x9939],
- ["F1AE",0x993A],
- ["9666",0x993B],
- ["F1AD",0x993C],
- ["C34A",0x993D],
- ["C348",0x993E],
- ["C349",0x993F],
- ["9F7B",0x9940],
- ["F1AC",0x9941],
- ["9A6B",0x9942],
- ["F3B1",0x9943],
- ["C443",0x9945],
- ["F3B0",0x9947],
- ["F3AF",0x9948],
- ["C444",0x9949],
- ["A06C",0x994A],
- ["F558",0x994B],
- ["F557",0x994C],
- ["9667",0x994D],
- ["F555",0x994E],
- ["F554",0x9950],
- ["C4C8",0x9951],
- ["C4C7",0x9952],
- ["F559",0x9953],
- ["F776",0x9954],
- ["C5B9",0x9955],
- ["F677",0x9956],
- ["C557",0x9957],
- ["F676",0x9958],
- ["F556",0x9959],
- ["F777",0x995B],
- ["C5E4",0x995C],
- ["9A6C",0x995D],
- ["C661",0x995E],
- ["F959",0x995F],
- ["F9B1",0x9961],
- ["9A6D",0x9962],
- ["8BF2",0x9963],
- ["ADBA",0x9996],
- ["D850",0x9997],
- ["EF55",0x9998],
- ["ADBB",0x9999],
- ["966A",0x999B],
- ["E4D2",0x999C],
- ["E4D1",0x999D],
- ["EC60",0x999E],
- ["EF57",0x99A1],
- ["EF56",0x99A3],
- ["FCEA",0x99A4],
- ["C34C",0x99A5],
- ["F3B2",0x99A6],
- ["F3B3",0x99A7],
- ["C4C9",0x99A8],
- ["966C",0x99AA],
- ["F9B2",0x99AB],
- ["B0A8",0x99AC],
- ["B6BF",0x99AD],
- ["B6BE",0x99AE],
- ["E0E4",0x99AF],
- ["E0E6",0x99B0],
- ["B9A4",0x99B1],
- ["E0E5",0x99B2],
- ["B9A3",0x99B3],
- ["B9A5",0x99B4],
- ["E0E7",0x99B5],
- ["91C4",0x99B8],
- ["E4D4",0x99B9],
- ["E4D6",0x99BA],
- ["E4D5",0x99BB],
- ["9677",0x99BC],
- ["E4D8",0x99BD],
- ["BBE9",0x99C1],
- ["E4D7",0x99C2],
- ["E4D3",0x99C3],
- ["99F4",0x99C4],
- ["9A6F",0x99C5],
- ["E4D9",0x99C7],
- ["E8CC",0x99C9],
- ["E8CF",0x99CB],
- ["E8D1",0x99CC],
- ["E8C7",0x99CD],
- ["E8CB",0x99CE],
- ["E8C8",0x99CF],
- ["BE6E",0x99D0],
- ["BE71",0x99D1],
- ["BE73",0x99D2],
- ["E8C9",0x99D3],
- ["E8CA",0x99D4],
- ["BE72",0x99D5],
- ["E8CD",0x99D6],
- ["E8D0",0x99D7],
- ["E8CE",0x99D8],
- ["BE74",0x99D9],
- ["9FAB",0x99DA],
- ["BE70",0x99DB],
- ["E8C6",0x99DC],
- ["BE6D",0x99DD],
- ["BE6F",0x99DF],
- ["8CBE",0x99E0],
- ["8EC1",0x99E1],
- ["C063",0x99E2],
- ["EC66",0x99E3],
- ["EC64",0x99E4],
- ["EC63",0x99E5],
- ["9555",0x99E6],
- ["EC69",0x99E7],
- ["EC68",0x99E9],
- ["EC67",0x99EA],
- ["EC62",0x99EC],
- ["C062",0x99ED],
- ["EC61",0x99EE],
- ["EC65",0x99F0],
- ["C064",0x99F1],
- ["EF5A",0x99F4],
- ["9152",0x99F5],
- ["EF5E",0x99F6],
- ["EF5B",0x99F7],
- ["EF5D",0x99F8],
- ["EF5C",0x99F9],
- ["EF59",0x99FA],
- ["EF5F",0x99FB],
- ["EF62",0x99FC],
- ["EF60",0x99FD],
- ["EF61",0x99FE],
- ["C240",0x99FF],
- ["C1FE",0x9A01],
- ["EF58",0x9A02],
- ["EF63",0x9A03],
- ["F1B3",0x9A04],
- ["F1B6",0x9A05],
- ["F1B8",0x9A06],
- ["F1B7",0x9A07],
- ["F1B1",0x9A09],
- ["F1B5",0x9A0A],
- ["F1B0",0x9A0B],
- ["9153",0x9A0C],
- ["F1B2",0x9A0D],
- ["C34D",0x9A0E],
- ["F1AF",0x9A0F],
- ["9155",0x9A10],
- ["F1B4",0x9A11],
- ["F3C0",0x9A14],
- ["F3B5",0x9A15],
- ["C445",0x9A16],
- ["C446",0x9A19],
- ["F3B4",0x9A1A],
- ["F3B9",0x9A1B],
- ["F3BF",0x9A1C],
- ["F3B7",0x9A1D],
- ["F3BE",0x9A1E],
- ["955D",0x9A1F],
- ["F3BB",0x9A20],
- ["9671",0x9A21],
- ["F3BA",0x9A22],
- ["F3BD",0x9A23],
- ["F3B8",0x9A24],
- ["F3B6",0x9A25],
- ["9C6D",0x9A26],
- ["F3BC",0x9A27],
- ["F560",0x9A29],
- ["F55E",0x9A2A],
- ["C4CA",0x9A2B],
- ["F55D",0x9A2C],
- ["F563",0x9A2D],
- ["F561",0x9A2E],
- ["9673",0x9A2F],
- ["C4CB",0x9A30],
- ["F55C",0x9A31],
- ["F55A",0x9A32],
- ["F55B",0x9A34],
- ["C4CD",0x9A35],
- ["F55F",0x9A36],
- ["C4CC",0x9A37],
- ["F562",0x9A38],
- ["F678",0x9A39],
- ["F67E",0x9A3A],
- ["9154",0x9A3B],
- ["9A71",0x9A3C],
- ["F679",0x9A3D],
- ["C55B",0x9A3E],
- ["F6A1",0x9A3F],
- ["C55A",0x9A40],
- ["F67D",0x9A41],
- ["F67C",0x9A42],
- ["C559",0x9A43],
- ["F67B",0x9A44],
- ["C558",0x9A45],
- ["F67A",0x9A46],
- ["F77D",0x9A48],
- ["F7A1",0x9A49],
- ["F77E",0x9A4A],
- ["F77B",0x9A4C],
- ["C5BB",0x9A4D],
- ["F778",0x9A4E],
- ["F77C",0x9A4F],
- ["F7A3",0x9A50],
- ["F7A2",0x9A52],
- ["F779",0x9A53],
- ["F77A",0x9A54],
- ["C5BA",0x9A55],
- ["F852",0x9A56],
- ["C5E7",0x9A57],
- ["9156",0x9A58],
- ["F853",0x9A59],
- ["C5E5",0x9A5A],
- ["C5E6",0x9A5B],
- ["966D",0x9A5C],
- ["F8D3",0x9A5E],
- ["C64A",0x9A5F],
- ["F976",0x9A60],
- ["C66A",0x9A62],
- ["9557",0x9A63],
- ["F9B3",0x9A64],
- ["C66B",0x9A65],
- ["F9B4",0x9A66],
- ["F9B5",0x9A67],
- ["F9C3",0x9A68],
- ["F9C2",0x9A69],
- ["C67A",0x9A6A],
- ["F9CD",0x9A6B],
- ["89C6",0x9A6C],
- ["89C7",0x9A8F],
- ["B0A9",0x9AA8],
- ["E0E9",0x9AAB],
- ["E0E8",0x9AAD],
- ["BBEA",0x9AAF],
- ["BBEB",0x9AB0],
- ["E4DA",0x9AB1],
- ["8A6A",0x9AB2],
- ["E8D2",0x9AB3],
- ["EC6C",0x9AB4],
- ["8B57",0x9AB6],
- ["BE75",0x9AB7],
- ["C065",0x9AB8],
- ["EC6A",0x9AB9],
- ["9FE1",0x9ABA],
- ["EC6D",0x9ABB],
- ["C066",0x9ABC],
- ["9B5F",0x9ABD],
- ["EF64",0x9ABE],
- ["EC6B",0x9ABF],
- ["F1B9",0x9AC0],
- ["C34E",0x9AC1],
- ["F3C1",0x9AC2],
- ["F566",0x9AC6],
- ["F564",0x9AC7],
- ["F565",0x9ACA],
- ["F6A2",0x9ACD],
- ["C55C",0x9ACF],
- ["F7A4",0x9AD0],
- ["C5EA",0x9AD1],
- ["C5BC",0x9AD2],
- ["C5E8",0x9AD3],
- ["C5E9",0x9AD4],
- ["F8D4",0x9AD5],
- ["C662",0x9AD6],
- ["A05D",0x9AD7],
- ["B0AA",0x9AD8],
- ["F1BA",0x9ADC],
- ["D449",0x9ADF],
- ["915B",0x9AE0],
- ["B9A6",0x9AE1],
- ["915C",0x9AE2],
- ["E4DB",0x9AE3],
- ["BBEC",0x9AE6],
- ["E4DC",0x9AE7],
- ["E8D4",0x9AEB],
- ["E8D3",0x9AEC],
- ["C068",0x9AED],
- ["BE76",0x9AEE],
- ["BE77",0x9AEF],
- ["E8D7",0x9AF1],
- ["E8D6",0x9AF2],
- ["E8D5",0x9AF3],
- ["915E",0x9AF4],
- ["EC6E",0x9AF6],
- ["EC71",0x9AF7],
- ["EC70",0x9AF9],
- ["EC6F",0x9AFA],
- ["C067",0x9AFB],
- ["EF68",0x9AFC],
- ["EF66",0x9AFD],
- ["EF65",0x9AFE],
- ["9F5C",0x9AFF],
- ["EF67",0x9B01],
- ["9F57",0x9B02],
- ["C34F",0x9B03],
- ["F1BC",0x9B04],
- ["F1BD",0x9B05],
- ["C350",0x9B06],
- ["F1BB",0x9B08],
- ["9F65",0x9B09],
- ["F3C3",0x9B0A],
- ["F3C2",0x9B0B],
- ["F3C5",0x9B0C],
- ["C447",0x9B0D],
- ["F3C4",0x9B0E],
- ["9A72",0x9B0F],
- ["F567",0x9B10],
- ["F569",0x9B11],
- ["F568",0x9B12],
- ["9160",0x9B14],
- ["F6A3",0x9B15],
- ["F6A6",0x9B16],
- ["F6A4",0x9B17],
- ["F6A5",0x9B18],
- ["F7A5",0x9B19],
- ["C5BD",0x9B1A],
- ["F854",0x9B1E],
- ["F855",0x9B1F],
- ["F856",0x9B20],
- ["C64B",0x9B22],
- ["C663",0x9B23],
- ["F9B6",0x9B24],
- ["B0AB",0x9B25],
- ["BE78",0x9B27],
- ["C069",0x9B28],
- ["F1BE",0x9B29],
- ["9F5E",0x9B2A],
- ["F7A6",0x9B2B],
- ["9161",0x9B2D],
- ["F9C4",0x9B2E],
- ["D44A",0x9B2F],
- ["C67B",0x9B31],
- ["B0AC",0x9B32],
- ["EC72",0x9B33],
- ["9164",0x9B34],
- ["F1BF",0x9B35],
- ["F3C6",0x9B37],
- ["9F41",0x9B39],
- ["F6A7",0x9B3A],
- ["F7A7",0x9B3B],
- ["B0AD",0x9B3C],
- ["E4DD",0x9B3E],
- ["E4DE",0x9B3F],
- ["9169",0x9B40],
- ["BBED",0x9B41],
- ["BBEE",0x9B42],
- ["E8D9",0x9B43],
- ["BE7A",0x9B44],
- ["BE79",0x9B45],
- ["E8D8",0x9B46],
- ["EF69",0x9B48],
- ["F1C0",0x9B4A],
- ["F1C2",0x9B4B],
- ["F1C1",0x9B4C],
- ["C353",0x9B4D],
- ["C352",0x9B4E],
- ["C351",0x9B4F],
- ["9168",0x9B50],
- ["C55E",0x9B51],
- ["F6A8",0x9B52],
- ["C55D",0x9B54],
- ["F7A9",0x9B55],
- ["F7A8",0x9B56],
- ["C64C",0x9B58],
- ["F8D5",0x9B59],
- ["B3BD",0x9B5A],
- ["E0EA",0x9B5B],
- ["E4E1",0x9B5F],
- ["E4DF",0x9B60],
- ["E4E0",0x9B61],
- ["E8E2",0x9B64],
- ["E8DD",0x9B66],
- ["E8DA",0x9B67],
- ["E8E1",0x9B68],
- ["9A74",0x9B69],
- ["E8E3",0x9B6C],
- ["BE7C",0x9B6F],
- ["E8E0",0x9B70],
- ["E8DC",0x9B71],
- ["E8DB",0x9B74],
- ["E8DF",0x9B75],
- ["E8DE",0x9B76],
- ["BE7B",0x9B77],
- ["EC7D",0x9B7A],
- ["EC78",0x9B7B],
- ["EC76",0x9B7C],
- ["ECA1",0x9B7D],
- ["EC77",0x9B7E],
- ["96B2",0x9B7F],
- ["EC73",0x9B80],
- ["9A75",0x9B81],
- ["EC79",0x9B82],
- ["FDA5",0x9B83],
- ["EC74",0x9B85],
- ["EF72",0x9B86],
- ["EC75",0x9B87],
- ["ECA2",0x9B88],
- ["9EE9",0x9B8B],
- ["8BBA",0x9B8D],
- ["916D",0x9B8E],
- ["A060",0x9B8F],
- ["EC7C",0x9B90],
- ["C06A",0x9B91],
- ["EC7B",0x9B92],
- ["EC7A",0x9B93],
- ["EC7E",0x9B95],
- ["9FDE",0x9B97],
- ["EF6A",0x9B9A],
- ["EF6D",0x9B9B],
- ["9FC3",0x9B9D],
- ["EF6C",0x9B9E],
- ["96B5",0x9B9F],
- ["EF74",0x9BA0],
- ["EF6F",0x9BA1],
- ["EF73",0x9BA2],
- ["EF71",0x9BA4],
- ["EF70",0x9BA5],
- ["EF6E",0x9BA6],
- ["EF6B",0x9BA8],
- ["C243",0x9BAA],
- ["C242",0x9BAB],
- ["C244",0x9BAD],
- ["C241",0x9BAE],
- ["EF75",0x9BAF],
- ["A067",0x9BB0],
- ["F1C8",0x9BB5],
- ["F1CB",0x9BB6],
- ["F1C9",0x9BB8],
- ["F1CD",0x9BB9],
- ["F1CE",0x9BBD],
- ["F1C6",0x9BBF],
- ["C358",0x9BC0],
- ["F1C7",0x9BC1],
- ["F1C5",0x9BC3],
- ["F1CC",0x9BC4],
- ["F1C4",0x9BC6],
- ["F1C3",0x9BC7],
- ["C357",0x9BC8],
- ["C355",0x9BC9],
- ["C354",0x9BCA],
- ["96B3",0x9BCF],
- ["F1CA",0x9BD3],
- ["F3CF",0x9BD4],
- ["F3D5",0x9BD5],
- ["C44A",0x9BD6],
- ["F3D0",0x9BD7],
- ["F3D3",0x9BD9],
- ["F3D7",0x9BDA],
- ["C44B",0x9BDB],
- ["F3D2",0x9BDC],
- ["9A76",0x9BDD],
- ["F3CA",0x9BDE],
- ["F3C9",0x9BE0],
- ["F3D6",0x9BE1],
- ["F3CD",0x9BE2],
- ["F3CB",0x9BE4],
- ["F3D4",0x9BE5],
- ["F3CC",0x9BE6],
- ["C449",0x9BE7],
- ["C448",0x9BE8],
- ["95D5",0x9BE9],
- ["F3C7",0x9BEA],
- ["F3C8",0x9BEB],
- ["F3D1",0x9BEC],
- ["9ECA",0x9BED],
- ["F3CE",0x9BF0],
- ["9A77",0x9BF1],
- ["9A78",0x9BF4],
- ["F56C",0x9BF7],
- ["F56F",0x9BF8],
- ["C356",0x9BFD],
- ["9170",0x9BFF],
- ["916F",0x9C02],
- ["F56D",0x9C05],
- ["F573",0x9C06],
- ["F571",0x9C07],
- ["F56B",0x9C08],
- ["F576",0x9C09],
- ["9FA3",0x9C0A],
- ["F56A",0x9C0B],
- ["9171",0x9C0C],
- ["C4CF",0x9C0D],
- ["F572",0x9C0E],
- ["96B1",0x9C10],
- ["F56E",0x9C12],
- ["C4CE",0x9C13],
- ["F575",0x9C14],
- ["9F63",0x9C15],
- ["F574",0x9C17],
- ["9F67",0x9C1B],
- ["F6AB",0x9C1C],
- ["F6AA",0x9C1D],
- ["8BB9",0x9C1F],
- ["9A7A",0x9C20],
- ["F6B1",0x9C21],
- ["F6AD",0x9C23],
- ["F6B0",0x9C24],
- ["C560",0x9C25],
- ["8B56",0x9C26],
- ["F6AE",0x9C28],
- ["F6AF",0x9C29],
- ["F6A9",0x9C2B],
- ["F6AC",0x9C2C],
- ["C55F",0x9C2D],
- ["9ADA",0x9C2F],
- ["C5BF",0x9C31],
- ["F7B4",0x9C32],
- ["F7AF",0x9C33],
- ["F7B3",0x9C34],
- ["96B0",0x9C35],
- ["F7B6",0x9C36],
- ["F7B2",0x9C37],
- ["F7AE",0x9C39],
- ["9A7E",0x9C3A],
- ["C5C1",0x9C3B],
- ["F7B1",0x9C3C],
- ["F7B5",0x9C3D],
- ["C5C0",0x9C3E],
- ["F7AC",0x9C3F],
- ["F570",0x9C40],
- ["F7B0",0x9C41],
- ["F7AD",0x9C44],
- ["9DDE",0x9C45],
- ["F7AA",0x9C46],
- ["F7AB",0x9C48],
- ["C5BE",0x9C49],
- ["F85A",0x9C4A],
- ["F85C",0x9C4B],
- ["F85F",0x9C4C],
- ["F85B",0x9C4D],
- ["F860",0x9C4E],
- ["96AD",0x9C4F],
- ["F859",0x9C50],
- ["F857",0x9C52],
- ["96AE",0x9C53],
- ["C5EB",0x9C54],
- ["F85D",0x9C55],
- ["C5ED",0x9C56],
- ["C5EC",0x9C57],
- ["F858",0x9C58],
- ["F85E",0x9C59],
- ["9EA1",0x9C5D],
- ["F8DA",0x9C5E],
- ["C64D",0x9C5F],
- ["F8DB",0x9C60],
- ["F8D9",0x9C62],
- ["F8D6",0x9C63],
- ["F8D8",0x9C66],
- ["F8D7",0x9C67],
- ["F95A",0x9C68],
- ["F95C",0x9C6D],
- ["F95B",0x9C6E],
- ["F979",0x9C71],
- ["9E50",0x9C72],
- ["F978",0x9C73],
- ["F977",0x9C74],
- ["F97A",0x9C75],
- ["C673",0x9C77],
- ["C674",0x9C78],
- ["F9CA",0x9C79],
- ["F9CE",0x9C7A],
- ["96AF",0x9C7B],
- ["8BF4",0x9C7C],
- ["B3BE",0x9CE5],
- ["DCAF",0x9CE6],
- ["E0ED",0x9CE7],
- ["B9A7",0x9CE9],
- ["E0EB",0x9CEA],
- ["E0EC",0x9CED],
- ["E4E2",0x9CF1],
- ["E4E3",0x9CF2],
- ["BBF1",0x9CF3],
- ["BBEF",0x9CF4],
- ["E4E4",0x9CF5],
- ["BBF0",0x9CF6],
- ["E8E8",0x9CF7],
- ["E8EB",0x9CF9],
- ["E8E5",0x9CFA],
- ["E8EC",0x9CFB],
- ["E8E4",0x9CFC],
- ["E8E6",0x9CFD],
- ["E8E7",0x9CFF],
- ["E8EA",0x9D00],
- ["9FA4",0x9D02],
- ["BEA1",0x9D03],
- ["E8EF",0x9D04],
- ["E8EE",0x9D05],
- ["BE7D",0x9D06],
- ["E8E9",0x9D07],
- ["E8ED",0x9D08],
- ["BE7E",0x9D09],
- ["96BD",0x9D0C],
- ["ECAC",0x9D10],
- ["C06F",0x9D12],
- ["ECA7",0x9D14],
- ["C06B",0x9D15],
- ["96F4",0x9D16],
- ["ECA4",0x9D17],
- ["ECAA",0x9D18],
- ["ECAD",0x9D19],
- ["C070",0x9D1B],
- ["ECA9",0x9D1D],
- ["ECA6",0x9D1E],
- ["ECAE",0x9D1F],
- ["ECA5",0x9D20],
- ["96B8",0x9D21],
- ["ECAB",0x9D22],
- ["C06C",0x9D23],
- ["ECA3",0x9D25],
- ["C06D",0x9D26],
- ["C06E",0x9D28],
- ["ECA8",0x9D29],
- ["EFA9",0x9D2D],
- ["EF7A",0x9D2E],
- ["EF7B",0x9D2F],
- ["EF7E",0x9D30],
- ["EF7C",0x9D31],
- ["EF76",0x9D33],
- ["FAA1",0x9D34],
- ["EF79",0x9D36],
- ["EFA5",0x9D37],
- ["EF7D",0x9D38],
- ["91A7",0x9D39],
- ["C245",0x9D3B],
- ["EFA7",0x9D3D],
- ["EFA4",0x9D3E],
- ["C246",0x9D3F],
- ["EFA6",0x9D40],
- ["EF77",0x9D41],
- ["EFA2",0x9D42],
- ["EFA3",0x9D43],
- ["A05E",0x9D44],
- ["EFA1",0x9D45],
- ["9A7D",0x9D49],
- ["F1D2",0x9D4A],
- ["F1D4",0x9D4B],
- ["F1D7",0x9D4C],
- ["8948",0x9D4E],
- ["F1D1",0x9D4F],
- ["9EB1",0x9D50],
- ["C359",0x9D51],
- ["F1D9",0x9D52],
- ["F1D0",0x9D53],
- ["F1DA",0x9D54],
- ["F1D6",0x9D56],
- ["F1D8",0x9D57],
- ["F1DC",0x9D58],
- ["F1D5",0x9D59],
- ["F1DD",0x9D5A],
- ["F1D3",0x9D5B],
- ["F1CF",0x9D5C],
- ["C35A",0x9D5D],
- ["9DDB",0x9D5E],
- ["F1DB",0x9D5F],
- ["C35B",0x9D60],
- ["C44D",0x9D61],
- ["EF78",0x9D67],
- ["F3F1",0x9D68],
- ["F3E8",0x9D69],
- ["C44F",0x9D6A],
- ["F3E4",0x9D6B],
- ["C450",0x9D6C],
- ["95BF",0x9D6D],
- ["8A73",0x9D6E],
- ["F3ED",0x9D6F],
- ["F3E7",0x9D70],
- ["F3DD",0x9D71],
- ["C44E",0x9D72],
- ["F3EA",0x9D73],
- ["F3E5",0x9D74],
- ["F3E6",0x9D75],
- ["F3D8",0x9D77],
- ["F3DF",0x9D78],
- ["F3EE",0x9D79],
- ["F3EB",0x9D7B],
- ["9EFE",0x9D7C],
- ["F3E3",0x9D7D],
- ["917A",0x9D7E],
- ["F3EF",0x9D7F],
- ["F3DE",0x9D80],
- ["F3D9",0x9D81],
- ["F3EC",0x9D82],
- ["917B",0x9D83],
- ["F3DB",0x9D84],
- ["F3E9",0x9D85],
- ["F3E0",0x9D86],
- ["F3F0",0x9D87],
- ["F3DC",0x9D88],
- ["C44C",0x9D89],
- ["F3DA",0x9D8A],
- ["F3E1",0x9D8B],
- ["F3E2",0x9D8C],
- ["F57D",0x9D90],
- ["F57B",0x9D92],
- ["9AA3",0x9D93],
- ["F5A2",0x9D94],
- ["F5AE",0x9D96],
- ["F5A5",0x9D97],
- ["F57C",0x9D98],
- ["F578",0x9D99],
- ["F5A7",0x9D9A],
- ["F57E",0x9D9B],
- ["F5A3",0x9D9C],
- ["F57A",0x9D9D],
- ["F5AA",0x9D9E],
- ["F577",0x9D9F],
- ["F5A1",0x9DA0],
- ["F5A6",0x9DA1],
- ["F5A8",0x9DA2],
- ["F5AB",0x9DA3],
- ["F579",0x9DA4],
- ["96C2",0x9DA5],
- ["F5AF",0x9DA6],
- ["F5B0",0x9DA7],
- ["F5A9",0x9DA8],
- ["F5AD",0x9DA9],
- ["F5A4",0x9DAA],
- ["9F77",0x9DAB],
- ["F6C1",0x9DAC],
- ["F6C4",0x9DAD],
- ["C561",0x9DAF],
- ["F6C3",0x9DB1],
- ["F6C8",0x9DB2],
- ["F6C6",0x9DB3],
- ["C562",0x9DB4],
- ["F6BD",0x9DB5],
- ["F6B3",0x9DB6],
- ["F6B2",0x9DB7],
- ["C564",0x9DB8],
- ["F6BF",0x9DB9],
- ["F6C0",0x9DBA],
- ["F6BC",0x9DBB],
- ["F6B4",0x9DBC],
- ["9AA4",0x9DBD],
- ["F6B9",0x9DBE],
- ["F5AC",0x9DBF],
- ["9AA5",0x9DC0],
- ["F6B5",0x9DC1],
- ["C563",0x9DC2],
- ["F6BB",0x9DC3],
- ["91A1",0x9DC4],
- ["F6BA",0x9DC5],
- ["F6B6",0x9DC7],
- ["F6C2",0x9DC8],
- ["89B8",0x9DC9],
- ["F6B7",0x9DCA],
- ["F7BB",0x9DCB],
- ["F6C5",0x9DCC],
- ["F6C7",0x9DCD],
- ["F6BE",0x9DCE],
- ["F6B8",0x9DCF],
- ["F7BC",0x9DD0],
- ["F7BE",0x9DD1],
- ["F7B8",0x9DD2],
- ["C5C2",0x9DD3],
- ["9173",0x9DD4],
- ["F7C5",0x9DD5],
- ["F7C3",0x9DD6],
- ["C5C3",0x9DD7],
- ["F7C2",0x9DD8],
- ["F7C1",0x9DD9],
- ["F7BA",0x9DDA],
- ["F7B7",0x9DDB],
- ["F7BD",0x9DDC],
- ["F7C6",0x9DDD],
- ["F7B9",0x9DDE],
- ["F7BF",0x9DDF],
- ["F869",0x9DE1],
- ["F86E",0x9DE2],
- ["F864",0x9DE3],
- ["F867",0x9DE4],
- ["C5EE",0x9DE5],
- ["F86B",0x9DE6],
- ["F872",0x9DE8],
- ["F7C0",0x9DE9],
- ["F865",0x9DEB],
- ["F86F",0x9DEC],
- ["F873",0x9DED],
- ["F86A",0x9DEE],
- ["F863",0x9DEF],
- ["F86D",0x9DF0],
- ["F86C",0x9DF2],
- ["F871",0x9DF3],
- ["F870",0x9DF4],
- ["F7C4",0x9DF5],
- ["F868",0x9DF6],
- ["F862",0x9DF7],
- ["F866",0x9DF8],
- ["C64E",0x9DF9],
- ["C64F",0x9DFA],
- ["F861",0x9DFB],
- ["9AA6",0x9DFC],
- ["F8E6",0x9DFD],
- ["F8DD",0x9DFE],
- ["F8E5",0x9DFF],
- ["F8E2",0x9E00],
- ["F8E3",0x9E01],
- ["F8DC",0x9E02],
- ["F8DF",0x9E03],
- ["F8E7",0x9E04],
- ["F8E1",0x9E05],
- ["F8E0",0x9E06],
- ["F8DE",0x9E07],
- ["F8E4",0x9E09],
- ["89BD",0x9E0A],
- ["F95D",0x9E0B],
- ["89B9",0x9E0C],
- ["F95E",0x9E0D],
- ["917D",0x9E0E],
- ["F960",0x9E0F],
- ["F95F",0x9E10],
- ["F962",0x9E11],
- ["F961",0x9E12],
- ["F97C",0x9E13],
- ["F97B",0x9E14],
- ["F9B7",0x9E15],
- ["F9B8",0x9E17],
- ["96BB",0x9E18],
- ["F9C5",0x9E19],
- ["C678",0x9E1A],
- ["C67C",0x9E1B],
- ["9FF2",0x9E1C],
- ["F9CF",0x9E1D],
- ["C67D",0x9E1E],
- ["8BF5",0x9E1F],
- ["B3BF",0x9E75],
- ["C4D0",0x9E79],
- ["F6C9",0x9E7A],
- ["9AA9",0x9E7B],
- ["C650",0x9E7C],
- ["C651",0x9E7D],
- ["B3C0",0x9E7F],
- ["E0EE",0x9E80],
- ["9F54",0x9E81],
- ["B9A8",0x9E82],
- ["E8F0",0x9E83],
- ["9FE3",0x9E84],
- ["9EED",0x9E85],
- ["ECB0",0x9E86],
- ["ECB1",0x9E87],
- ["ECAF",0x9E88],
- ["EFAB",0x9E89],
- ["EFAA",0x9E8A],
- ["C247",0x9E8B],
- ["F1DF",0x9E8C],
- ["EFAC",0x9E8D],
- ["F1DE",0x9E8E],
- ["91AA",0x9E90],
- ["F3F3",0x9E91],
- ["C451",0x9E92],
- ["C453",0x9E93],
- ["F3F2",0x9E94],
- ["91AB",0x9E95],
- ["A070",0x9E96],
- ["C452",0x9E97],
- ["9F6D",0x9E98],
- ["F5B1",0x9E99],
- ["F5B3",0x9E9A],
- ["F5B2",0x9E9B],
- ["F6CA",0x9E9C],
- ["C565",0x9E9D],
- ["91AC",0x9E9E],
- ["C5EF",0x9E9F],
- ["F8E8",0x9EA0],
- ["F963",0x9EA1],
- ["91AD",0x9EA2],
- ["F9D2",0x9EA4],
- ["B3C1",0x9EA5],
- ["A0FD",0x9EA6],
- ["E4E5",0x9EA7],
- ["9FE2",0x9EA8],
- ["BEA2",0x9EA9],
- ["91AF",0x9EAA],
- ["9E41",0x9EAB],
- ["9AAA",0x9EAC],
- ["ECB3",0x9EAD],
- ["ECB2",0x9EAE],
- ["91B0",0x9EAF],
- ["EFAD",0x9EB0],
- ["9AAB",0x9EB1],
- ["C454",0x9EB4],
- ["C4D1",0x9EB5],
- ["F7C7",0x9EB6],
- ["F9CB",0x9EB7],
- ["B3C2",0x9EBB],
- ["BBF2",0x9EBC],
- ["9AAC",0x9EBD],
- ["BEA3",0x9EBE],
- ["9A4A",0x9EBF],
- ["F3F4",0x9EC0],
- ["91B2",0x9EC1],
- ["F874",0x9EC2],
- ["B6C0",0x9EC3],
- ["8BF6",0x9EC4],
- ["9AAD",0x9EC6],
- ["89B6",0x9EC7],
- ["EFAE",0x9EC8],
- ["C664",0x9ECC],
- ["B6C1",0x9ECD],
- ["BEA4",0x9ECE],
- ["C248",0x9ECF],
- ["F875",0x9ED0],
- ["B6C2",0x9ED1],
- ["E8F1",0x9ED3],
- ["C072",0x9ED4],
- ["ECB4",0x9ED5],
- ["ECB5",0x9ED6],
- ["C071",0x9ED8],
- ["EFAF",0x9EDA],
- ["C24C",0x9EDB],
- ["C24A",0x9EDC],
- ["C24B",0x9EDD],
- ["C249",0x9EDE],
- ["F1E0",0x9EDF],
- ["C35C",0x9EE0],
- ["9AAF",0x9EE2],
- ["F5B5",0x9EE4],
- ["F5B4",0x9EE5],
- ["F5B7",0x9EE6],
- ["F5B6",0x9EE7],
- ["C4D2",0x9EE8],
- ["F6CB",0x9EEB],
- ["F6CD",0x9EED],
- ["F6CC",0x9EEE],
- ["C566",0x9EEF],
- ["F7C8",0x9EF0],
- ["9AB0",0x9EF1],
- ["F876",0x9EF2],
- ["F877",0x9EF3],
- ["C5F0",0x9EF4],
- ["F964",0x9EF5],
- ["F97D",0x9EF6],
- ["C675",0x9EF7],
- ["9AB1",0x9EF8],
- ["DCB0",0x9EF9],
- ["ECB6",0x9EFA],
- ["EFB0",0x9EFB],
- ["F3F5",0x9EFC],
- ["E0EF",0x9EFD],
- ["9AA1",0x9EFE],
- ["EFB1",0x9EFF],
- ["F1E2",0x9F00],
- ["F1E1",0x9F01],
- ["91B9",0x9F02],
- ["F878",0x9F06],
- ["C652",0x9F07],
- ["91BA",0x9F08],
- ["F965",0x9F09],
- ["F97E",0x9F0A],
- ["B9A9",0x9F0E],
- ["E8F2",0x9F0F],
- ["E8F3",0x9F10],
- ["ECB7",0x9F12],
- ["B9AA",0x9F13],
- ["C35D",0x9F15],
- ["F1E3",0x9F16],
- ["91BE",0x9F17],
- ["F6CF",0x9F18],
- ["C567",0x9F19],
- ["F6D0",0x9F1A],
- ["F6CE",0x9F1B],
- ["F879",0x9F1C],
- ["F8E9",0x9F1E],
- ["B9AB",0x9F20],
- ["EFB4",0x9F22],
- ["EFB3",0x9F23],
- ["EFB2",0x9F24],
- ["F1E4",0x9F25],
- ["A041",0x9F26],
- ["8BB7",0x9F27],
- ["F1E8",0x9F28],
- ["F1E7",0x9F29],
- ["F1E6",0x9F2A],
- ["F1E5",0x9F2B],
- ["C35E",0x9F2C],
- ["F3F6",0x9F2D],
- ["F5B9",0x9F2E],
- ["C4D3",0x9F2F],
- ["F5B8",0x9F30],
- ["F6D1",0x9F31],
- ["F7CB",0x9F32],
- ["F7CA",0x9F33],
- ["C5C4",0x9F34],
- ["F7C9",0x9F35],
- ["F87C",0x9F36],
- ["F87B",0x9F37],
- ["F87A",0x9F38],
- ["91C0",0x9F39],
- ["BBF3",0x9F3B],
- ["ECB8",0x9F3D],
- ["C24D",0x9F3E],
- ["F3F7",0x9F40],
- ["F3F8",0x9F41],
- ["F7CC",0x9F42],
- ["F87D",0x9F43],
- ["9AB3",0x9F44],
- ["91C3",0x9F45],
- ["F8EA",0x9F46],
- ["F966",0x9F47],
- ["F9B9",0x9F48],
- ["F9D4",0x9F49],
- ["BBF4",0x9F4A],
- ["C24E",0x9F4B],
- ["F1E9",0x9F4C],
- ["F3F9",0x9F4D],
- ["F6D2",0x9F4E],
- ["F87E",0x9F4F],
- ["A0FC",0x9F50],
- ["BEA6",0x9F52],
- ["9FEE",0x9F53],
- ["EFB5",0x9F54],
- ["F1EA",0x9F55],
- ["F3FA",0x9F56],
- ["F3FB",0x9F57],
- ["F3FC",0x9F58],
- ["F5BE",0x9F59],
- ["9F69",0x9F5A],
- ["F5BA",0x9F5B],
- ["C568",0x9F5C],
- ["F5BD",0x9F5D],
- ["F5BC",0x9F5E],
- ["C4D4",0x9F5F],
- ["F5BB",0x9F60],
- ["C4D6",0x9F61],
- ["91C8",0x9F62],
- ["C4D5",0x9F63],
- ["F6D4",0x9F64],
- ["F6D3",0x9F65],
- ["C569",0x9F66],
- ["C56A",0x9F67],
- ["91C9",0x9F69],
- ["C5C6",0x9F6A],
- ["F7CD",0x9F6B],
- ["C5C5",0x9F6C],
- ["F8A3",0x9F6E],
- ["F8A4",0x9F6F],
- ["F8A2",0x9F70],
- ["F8A1",0x9F71],
- ["C654",0x9F72],
- ["F8EB",0x9F74],
- ["F8EC",0x9F75],
- ["F8ED",0x9F76],
- ["C653",0x9F77],
- ["F967",0x9F78],
- ["F96A",0x9F79],
- ["F969",0x9F7A],
- ["F968",0x9F7B],
- ["F9D3",0x9F7E],
- ["8DE6",0x9F7F],
- ["C073",0x9F8D],
- ["91CB",0x9F8E],
- ["C365",0x9F90],
- ["F5BF",0x9F91],
- ["F6D5",0x9F92],
- ["C5C7",0x9F94],
- ["F7CE",0x9F95],
- ["F9D5",0x9F98],
- ["89C8",0x9F99],
- ["C074",0x9F9C],
- ["8DAA",0x9F9F],
- ["EFB6",0x9FA0],
- ["F7CF",0x9FA2],
- ["F9A1",0x9FA4],
- ["9FDD",0x9FA5],
- ["8C43",0x9FA6],
- ["8C6D",0x9FA7],
- ["8C74",0x9FA8],
- ["8CB7",0x9FA9],
- ["8CB9",0x9FAA],
- ["8CBB",0x9FAB],
- ["8CC0",0x9FAC],
- ["8CD7",0x9FAD],
- ["8CD8",0x9FAE],
- ["8CDA",0x9FAF],
- ["C8A1",0x9FB0],
- ["C8A3",0x9FB1],
- ["8CED",0x9FB2],
- ["8D48",0x9FB3],
- ["8BF8",0xF907],
- ["C94A",0xFA0C],
- ["DDFC",0xFA0D],
- ["A14A",0xFE30],
- ["A157",0xFE31],
- ["A159",0xFE33],
- ["A15B",0xFE34],
- ["A15F",0xFE35],
- ["A160",0xFE36],
- ["A163",0xFE37],
- ["A164",0xFE38],
- ["A167",0xFE39],
- ["A168",0xFE3A],
- ["A16B",0xFE3B],
- ["A16C",0xFE3C],
- ["A16F",0xFE3D],
- ["A170",0xFE3E],
- ["A173",0xFE3F],
- ["A174",0xFE40],
- ["A177",0xFE41],
- ["A178",0xFE42],
- ["A17B",0xFE43],
- ["A17C",0xFE44],
- ["A1C6",0xFE49],
- ["A1C7",0xFE4A],
- ["A1CA",0xFE4B],
- ["A1CB",0xFE4C],
- ["A1C8",0xFE4D],
- ["A1C9",0xFE4E],
- ["A15C",0xFE4F],
- ["A14D",0xFE50],
- ["A14F",0xFE52],
- ["A151",0xFE54],
- ["A152",0xFE55],
- ["A153",0xFE56],
- ["A154",0xFE57],
- ["A17D",0xFE59],
- ["A17E",0xFE5A],
- ["A1A1",0xFE5B],
- ["A1A2",0xFE5C],
- ["A1A3",0xFE5D],
- ["A1A4",0xFE5E],
- ["A1CC",0xFE5F],
- ["A1CD",0xFE60],
- ["A1CE",0xFE61],
- ["A1DE",0xFE62],
- ["A1DF",0xFE63],
- ["A1E0",0xFE64],
- ["A1E1",0xFE65],
- ["A1E2",0xFE66],
- ["A24C",0xFE69],
- ["A24D",0xFE6A],
- ["A24E",0xFE6B],
- ["A149",0xFF01],
- ["C8D0",0xFF02],
- ["A1AD",0xFF03],
- ["A243",0xFF04],
- ["A248",0xFF05],
- ["A1AE",0xFF06],
- ["C8CF",0xFF07],
- ["A15D",0xFF08],
- ["A15E",0xFF09],
- ["A1AF",0xFF0A],
- ["A1CF",0xFF0B],
- ["A141",0xFF0C],
- ["A1D0",0xFF0D],
- ["A144",0xFF0E],
- ["A241",0xFF0F],
- ["A2AF",0xFF10],
- ["A2B0",0xFF11],
- ["A2B1",0xFF12],
- ["A2B2",0xFF13],
- ["A2B3",0xFF14],
- ["A2B4",0xFF15],
- ["A2B5",0xFF16],
- ["A2B6",0xFF17],
- ["A2B7",0xFF18],
- ["A2B8",0xFF19],
- ["A147",0xFF1A],
- ["A146",0xFF1B],
- ["A1D5",0xFF1C],
- ["A1D7",0xFF1D],
- ["A1D6",0xFF1E],
- ["A148",0xFF1F],
- ["A249",0xFF20],
- ["A2CF",0xFF21],
- ["A2D0",0xFF22],
- ["A2D1",0xFF23],
- ["A2D2",0xFF24],
- ["A2D3",0xFF25],
- ["A2D4",0xFF26],
- ["A2D5",0xFF27],
- ["A2D6",0xFF28],
- ["A2D7",0xFF29],
- ["A2D8",0xFF2A],
- ["A2D9",0xFF2B],
- ["A2DA",0xFF2C],
- ["A2DB",0xFF2D],
- ["A2DC",0xFF2E],
- ["A2DD",0xFF2F],
- ["A2DE",0xFF30],
- ["A2DF",0xFF31],
- ["A2E0",0xFF32],
- ["A2E1",0xFF33],
- ["A2E2",0xFF34],
- ["A2E3",0xFF35],
- ["A2E4",0xFF36],
- ["A2E5",0xFF37],
- ["A2E6",0xFF38],
- ["A2E7",0xFF39],
- ["A2E8",0xFF3A],
- ["C6E4",0xFF3B],
- ["A242",0xFF3C],
- ["C6E5",0xFF3D],
- ["A1C4",0xFF3F],
- ["A2E9",0xFF41],
- ["A2EA",0xFF42],
- ["A2EB",0xFF43],
- ["A2EC",0xFF44],
- ["A2ED",0xFF45],
- ["A2EE",0xFF46],
- ["A2EF",0xFF47],
- ["A2F0",0xFF48],
- ["A2F1",0xFF49],
- ["A2F2",0xFF4A],
- ["A2F3",0xFF4B],
- ["A2F4",0xFF4C],
- ["A2F5",0xFF4D],
- ["A2F6",0xFF4E],
- ["A2F7",0xFF4F],
- ["A2F8",0xFF50],
- ["A2F9",0xFF51],
- ["A2FA",0xFF52],
- ["A2FB",0xFF53],
- ["A2FC",0xFF54],
- ["A2FD",0xFF55],
- ["A2FE",0xFF56],
- ["A340",0xFF57],
- ["A341",0xFF58],
- ["A342",0xFF59],
- ["A343",0xFF5A],
- ["A161",0xFF5B],
- ["A155",0xFF5C],
- ["A162",0xFF5D],
- ["A14E",0xFF64],
- ["C8CD",0xFFE2],
- ["C8CE",0xFFE4],
- ["F9FE",0xFFED],
- ["9C71",0x20021],
- ["9375",0x2003E],
- ["9376",0x20046],
- ["9548",0x2004E],
- ["8EC6",0x20068],
- ["8BC5",0x20086],
- ["8BFA",0x20087],
- ["C87C",0x2008A],
- ["9AB4",0x20094],
- ["884E",0x200CA],
- ["884B",0x200CB],
- ["C87A",0x200CC],
- ["8848",0x200CD],
- ["8847",0x200D1],
- ["A0F6",0x200EE],
- ["8845",0x2010C],
- ["8853",0x2010E],
- ["FCAD",0x20118],
- ["8CF5",0x201A4],
- ["8AAD",0x201A9],
- ["9272",0x201AB],
- ["FC47",0x201C1],
- ["94DF",0x201D4],
- ["9FD1",0x201F2],
- ["FBCB",0x20204],
- ["927D",0x2020C],
- ["98A4",0x20214],
- ["8CF9",0x20239],
- ["94E7",0x2025B],
- ["90CB",0x20274],
- ["927B",0x20275],
- ["94D8",0x20299],
- ["FC5F",0x2029E],
- ["FA54",0x202A0],
- ["9AB5",0x202B7],
- ["96DA",0x202BF],
- ["9279",0x202C0],
- ["FA74",0x202E5],
- ["9275",0x2030A],
- ["8DFB",0x20325],
- ["8A49",0x20341],
- ["92DF",0x20345],
- ["9B7C",0x20346],
- ["FA63",0x20347],
- ["FA60",0x2037E],
- ["926D",0x2037F],
- ["FA62",0x20380],
- ["9AB6",0x203A0],
- ["976B",0x203A7],
- ["FD6A",0x203B5],
- ["FD54",0x203C9],
- ["9273",0x203CB],
- ["97D8",0x203F5],
- ["9FBB",0x203FC],
- ["9342",0x20413],
- ["9276",0x20414],
- ["FA65",0x2041F],
- ["926C",0x20465],
- ["FA6E",0x20487],
- ["9EE0",0x2048E],
- ["92C0",0x20491],
- ["92BF",0x20492],
- ["92BE",0x204A3],
- ["9ABA",0x204D7],
- ["8AB3",0x204FC],
- ["9775",0x204FE],
- ["FA40",0x20547],
- ["FA76",0x2058E],
- ["FBD0",0x205A5],
- ["FA7B",0x205B3],
- ["FE6D",0x205C3],
- ["9BB3",0x205CA],
- ["89CC",0x205D0],
- ["9ABE",0x205D5],
- ["FA42",0x205DF],
- ["92BC",0x205E0],
- ["945C",0x205EB],
- ["9BB5",0x20611],
- ["9ABF",0x20615],
- ["98A7",0x20619],
- ["97A4",0x2061A],
- ["90FD",0x20630],
- ["FC7B",0x20656],
- ["9AC0",0x20676],
- ["92C3",0x2070E],
- ["8AAA",0x20731],
- ["9BD0",0x20779],
- ["9550",0x2082C],
- ["92C6",0x20873],
- ["98A6",0x208D5],
- ["9546",0x20916],
- ["FD63",0x20923],
- ["FAC2",0x20954],
- ["9EC3",0x20979],
- ["89B2",0x209E7],
- ["9C66",0x20A11],
- ["9053",0x20A50],
- ["8C62",0x20A6F],
- ["97C1",0x20AB4],
- ["9AC4",0x20AC2],
- ["9AC5",0x20ACD],
- ["8EEF",0x20B0D],
- ["FAE9",0x20B8F],
- ["8D40",0x20B9F],
- ["9262",0x20BA8],
- ["8AF7",0x20BA9],
- ["9AC6",0x20BBF],
- ["92E1",0x20BC6],
- ["9AC9",0x20BCB],
- ["FAC6",0x20BE2],
- ["97A5",0x20BEB],
- ["9ACB",0x20BFB],
- ["FA72",0x20BFF],
- ["8A5E",0x20C0B],
- ["94E0",0x20C0D],
- ["92CC",0x20C20],
- ["8AE5",0x20C34],
- ["FE5C",0x20C3A],
- ["9ACC",0x20C3B],
- ["9DF9",0x20C41],
- ["8A43",0x20C42],
- ["8AA6",0x20C43],
- ["9ACD",0x20C53],
- ["9ACE",0x20C65],
- ["FAEE",0x20C77],
- ["9BCC",0x20C78],
- ["9ACF",0x20C7C],
- ["9AD1",0x20C8D],
- ["9DFA",0x20C96],
- ["9D7C",0x20C9C],
- ["9AD3",0x20CB5],
- ["97A6",0x20CB8],
- ["995F",0x20CCF],
- ["FBF6",0x20CD3],
- ["9FC5",0x20CD4],
- ["8A59",0x20CD5],
- ["8B6B",0x20CD6],
- ["9AD4",0x20CDD],
- ["9AD5",0x20CED],
- ["97A2",0x20CFF],
- ["8A44",0x20D15],
- ["9F4A",0x20D28],
- ["90A1",0x20D31],
- ["FDA4",0x20D32],
- ["8A64",0x20D46],
- ["8AF2",0x20D47],
- ["8AF8",0x20D48],
- ["9DD8",0x20D49],
- ["94D6",0x20D4C],
- ["FAFE",0x20D4D],
- ["FBA7",0x20D4E],
- ["9AD6",0x20D6F],
- ["9F4D",0x20D71],
- ["FAF6",0x20D74],
- ["8A57",0x20D7C],
- ["8B43",0x20D7E],
- ["8B44",0x20D7F],
- ["8AB6",0x20D96],
- ["8AC0",0x20D9C],
- ["9E54",0x20DA7],
- ["9AD7",0x20DB2],
- ["9AD8",0x20DC8],
- ["9ADC",0x20E04],
- ["8ACA",0x20E09],
- ["9EA8",0x20E0A],
- ["9263",0x20E0D],
- ["9ADD",0x20E0E],
- ["8B65",0x20E0F],
- ["8B6F",0x20E10],
- ["8B7E",0x20E11],
- ["8F43",0x20E16],
- ["92D0",0x20E1D],
- ["8AF4",0x20E4C],
- ["9DBE",0x20E6D],
- ["9AE1",0x20E73],
- ["FCDE",0x20E75],
- ["9DFD",0x20E76],
- ["8B66",0x20E77],
- ["8B70",0x20E78],
- ["8B75",0x20E79],
- ["8AE4",0x20E7A],
- ["8BA4",0x20E7B],
- ["8AED",0x20E8C],
- ["8A5D",0x20E96],
- ["8B48",0x20E98],
- ["9DED",0x20E9D],
- ["9E40",0x20EA2],
- ["8AEF",0x20EAA],
- ["8AF6",0x20EAB],
- ["9E76",0x20EAC],
- ["9EE3",0x20EB6],
- ["9ADE",0x20ED7],
- ["8DFE",0x20ED8],
- ["FAFC",0x20EDD],
- ["9CB1",0x20EF8],
- ["9E77",0x20EF9],
- ["8B64",0x20EFA],
- ["8B67",0x20EFB],
- ["974B",0x20F1D],
- ["9653",0x20F26],
- ["9AE0",0x20F2D],
- ["8B4A",0x20F2E],
- ["8AF1",0x20F30],
- ["8AD7",0x20F31],
- ["A0AB",0x20F3B],
- ["8AB5",0x20F4C],
- ["8A5F",0x20F64],
- ["8AEE",0x20F8D],
- ["9ADF",0x20F90],
- ["8AFE",0x20FAD],
- ["8A58",0x20FB4],
- ["8BA3",0x20FB5],
- ["8BA7",0x20FB6],
- ["9AE3",0x20FBC],
- ["9261",0x20FDF],
- ["9DD7",0x20FEA],
- ["9E7D",0x20FEB],
- ["9EA7",0x20FEC],
- ["9EAB",0x20FED],
- ["9042",0x21014],
- ["8B79",0x2101D],
- ["8B7A",0x2101E],
- ["9AE6",0x2104F],
- ["9AE5",0x2105C],
- ["8A7E",0x2106F],
- ["9E44",0x21075],
- ["9AE7",0x21076],
- ["8A7C",0x21077],
- ["8B71",0x21078],
- ["9AE9",0x2107B],
- ["9AEA",0x21088],
- ["9AEB",0x21096],
- ["8ABD",0x2109D],
- ["FB4E",0x210B4],
- ["9AED",0x210BF],
- ["8AF9",0x210C0],
- ["9E63",0x210C1],
- ["8B49",0x210C7],
- ["8ACE",0x210C8],
- ["8B6E",0x210C9],
- ["8AE8",0x210CF],
- ["9AEE",0x210D3],
- ["92CE",0x210E4],
- ["8A5A",0x210F4],
- ["8B7B",0x210F5],
- ["8B7C",0x210F6],
- ["9AEF",0x2112F],
- ["9AF0",0x2113B],
- ["8AFA",0x2113D],
- ["8941",0x21145],
- ["8B72",0x21148],
- ["8AF3",0x2114F],
- ["8BA8",0x21180],
- ["9EAE",0x21187],
- ["9E72",0x211D9],
- ["FB73",0x2123C],
- ["FB5F",0x2124F],
- ["90BA",0x2127C],
- ["91FE",0x212A8],
- ["9EF6",0x212A9],
- ["97ED",0x212B0],
- ["9AF3",0x212E3],
- ["A0EE",0x212FE],
- ["967C",0x21302],
- ["9345",0x21303],
- ["986E",0x21304],
- ["FA56",0x21305],
- ["9AF5",0x21336],
- ["FC4B",0x2133A],
- ["9AF4",0x21375],
- ["FEDE",0x21376],
- ["FCB7",0x2138E],
- ["97F1",0x21398],
- ["97C7",0x2139C],
- ["9CCB",0x213C5],
- ["9240",0x213C6],
- ["9CE8",0x213ED],
- ["91FD",0x213FE],
- ["974E",0x21413],
- ["FB68",0x21416],
- ["976C",0x21424],
- ["8CC2",0x2143F],
- ["97E8",0x21452],
- ["FB6A",0x21454],
- ["8B74",0x21455],
- ["8EE7",0x2148A],
- ["FDC8",0x21497],
- ["9241",0x214B6],
- ["96A1",0x214E8],
- ["8EF3",0x214FD],
- ["9AF7",0x21577],
- ["8FA6",0x21582],
- ["FAD6",0x21596],
- ["9CC7",0x2160A],
- ["FAD7",0x21613],
- ["9AF8",0x21619],
- ["FBA1",0x2163E],
- ["8EC5",0x21661],
- ["FBA4",0x21692],
- ["FBC2",0x216B8],
- ["9AC1",0x216BA],
- ["91FA",0x216C0],
- ["FEDB",0x216C1],
- ["97AB",0x216C2],
- ["9147",0x216D3],
- ["FBB1",0x216D5],
- ["8FEA",0x216DF],
- ["94D2",0x216E6],
- ["FE61",0x216E7],
- ["FACE",0x216E8],
- ["92ED",0x216FA],
- ["91F3",0x216FB],
- ["93C6",0x216FC],
- ["935A",0x216FE],
- ["FAFB",0x2170D],
- ["92EF",0x21710],
- ["FAC8",0x21726],
- ["9847",0x2173A],
- ["9366",0x2173B],
- ["9855",0x2173C],
- ["96E6",0x21757],
- ["9F43",0x2176C],
- ["9FAA",0x2176D],
- ["94DA",0x2176E],
- ["92EE",0x2176F],
- ["FCAF",0x21770],
- ["FBFB",0x21771],
- ["8EF9",0x21773],
- ["91F6",0x21774],
- ["9364",0x217AB],
- ["94F5",0x217B0],
- ["9CB6",0x217B1],
- ["FBAD",0x217B2],
- ["984E",0x217B3],
- ["8F44",0x217B4],
- ["96FD",0x217B5],
- ["9AF9",0x217C3],
- ["9AFA",0x217C7],
- ["9769",0x217D9],
- ["95D4",0x217DA],
- ["984B",0x217DB],
- ["FBAA",0x217DC],
- ["987C",0x217DF],
- ["91EA",0x217EF],
- ["9DAF",0x217F5],
- ["9DC5",0x217F6],
- ["91F1",0x217F8],
- ["8EB1",0x217F9],
- ["97A9",0x217FA],
- ["FBAC",0x217FB],
- ["FCB8",0x217FC],
- ["9CB9",0x21820],
- ["FBB0",0x21828],
- ["FCD2",0x21829],
- ["93CB",0x2182A],
- ["9AFD",0x2182D],
- ["91F4",0x21839],
- ["8BAC",0x2183A],
- ["A055",0x2183B],
- ["9574",0x21840],
- ["95BE",0x21845],
- ["97AD",0x21852],
- ["8EE9",0x2185E],
- ["92F8",0x21861],
- ["97BE",0x21862],
- ["916C",0x21863],
- ["94AA",0x21864],
- ["FC63",0x21877],
- ["9DC6",0x2187B],
- ["97B5",0x21883],
- ["92B8",0x21884],
- ["91EF",0x21885],
- ["FEA6",0x2189E],
- ["9760",0x2189F],
- ["9358",0x218A0],
- ["9576",0x218A1],
- ["8FAC",0x218A2],
- ["91EC",0x218BE],
- ["97B4",0x218BF],
- ["91F7",0x218D1],
- ["974A",0x218D6],
- ["FB49",0x218D7],
- ["9578",0x218D8],
- ["93BC",0x218D9],
- ["91D6",0x218FA],
- ["9355",0x21903],
- ["9356",0x21904],
- ["9851",0x21905],
- ["8FF8",0x21910],
- ["FBC0",0x21911],
- ["93F2",0x21912],
- ["90D0",0x21915],
- ["9C44",0x2191C],
- ["9255",0x21922],
- ["9363",0x21927],
- ["91A5",0x2193B],
- ["A0ED",0x21944],
- ["FD6B",0x21958],
- ["9AFE",0x2196A],
- ["9351",0x2197C],
- ["8C57",0x21980],
- ["FA78",0x21983],
- ["FEA8",0x21988],
- ["9350",0x21996],
- ["FA4C",0x219DB],
- ["92F7",0x219F3],
- ["9B40",0x21A2D],
- ["FBCE",0x21A34],
- ["9B41",0x21A45],
- ["FEAD",0x21A4B],
- ["8761",0x21A63],
- ["FBD5",0x21B44],
- ["8BC2",0x21BC1],
- ["9A7C",0x21BC2],
- ["9B42",0x21C2A],
- ["9B43",0x21C70],
- ["9E79",0x21CA2],
- ["FBD9",0x21CA5],
- ["9B44",0x21CAC],
- ["A0A7",0x21D46],
- ["876E",0x21D5E],
- ["9BF3",0x21D90],
- ["8C79",0x21DB6],
- ["935E",0x21DBA],
- ["89CB",0x21DCA],
- ["9F53",0x21DD1],
- ["93D7",0x21DEB],
- ["FBE1",0x21DF9],
- ["FED0",0x21E1C],
- ["8CF1",0x21E23],
- ["FBE2",0x21E37],
- ["FCE3",0x21E3D],
- ["9074",0x21E89],
- ["FBE6",0x21EA4],
- ["9BB7",0x21EA8],
- ["9B45",0x21EC8],
- ["9B47",0x21ED5],
- ["9F50",0x21F0F],
- ["9B48",0x21F15],
- ["FC5B",0x21F6A],
- ["98A9",0x21F9E],
- ["9CFD",0x21FA1],
- ["884C",0x21FE8],
- ["9B4B",0x22045],
- ["FBEC",0x22049],
- ["8C69",0x2207E],
- ["9BA8",0x2209A],
- ["8AD5",0x220C7],
- ["FA73",0x220FC],
- ["FD59",0x2212A],
- ["91A2",0x2215B],
- ["FBED",0x22173],
- ["9CA9",0x2217A],
- ["8AA8",0x221A1],
- ["8D42",0x221C1],
- ["9BC3",0x221C3],
- ["8AE1",0x22208],
- ["9B4E",0x2227C],
- ["95D0",0x22321],
- ["905F",0x22325],
- ["97EE",0x223BD],
- ["FC4E",0x223D0],
- ["9B4F",0x223D7],
- ["9B50",0x223FA],
- ["9EC6",0x22465],
- ["FC50",0x22471],
- ["FD73",0x2248B],
- ["FDA7",0x22491],
- ["9DA2",0x224B0],
- ["FA58",0x224ED],
- ["FA5E",0x22513],
- ["A059",0x2251B],
- ["FA75",0x22530],
- ["FBBE",0x22554],
- ["9CA2",0x2258D],
- ["9370",0x225AF],
- ["9371",0x225BE],
- ["9377",0x2261B],
- ["FEEF",0x2261C],
- ["936D",0x2262B],
- ["FC5D",0x22668],
- ["90B8",0x2267A],
- ["8AFC",0x22696],
- ["FB41",0x22698],
- ["9E6B",0x226F4],
- ["94E3",0x226F5],
- ["8EE2",0x226F6],
- ["8C7D",0x22712],
- ["8ED7",0x22714],
- ["9C4D",0x2271B],
- ["96A3",0x2271F],
- ["9B51",0x2272A],
- ["8AC3",0x22775],
- ["96AA",0x22781],
- ["8CE2",0x22796],
- ["FC68",0x227B4],
- ["8B6D",0x227B5],
- ["FD67",0x227CD],
- ["8AE9",0x22803],
- ["FCA1",0x2285F],
- ["936C",0x22860],
- ["9B52",0x22871],
- ["FE70",0x228AD],
- ["FCA8",0x228C1],
- ["FCE9",0x228F7],
- ["9CB4",0x22926],
- ["8AEA",0x22939],
- ["9B53",0x2294F],
- ["9B55",0x22967],
- ["96AB",0x2296B],
- ["FCA7",0x22980],
- ["9B56",0x22993],
- ["8ABC",0x22A66],
- ["8ACB",0x22ACF],
- ["9B57",0x22AD5],
- ["89CD",0x22AE6],
- ["9B59",0x22AE8],
- ["9B5B",0x22B0E],
- ["93A5",0x22B22],
- ["9B5D",0x22B3F],
- ["9E4F",0x22B43],
- ["93A3",0x22B6A],
- ["8A7B",0x22BCA],
- ["8B42",0x22BCE],
- ["9750",0x22C26],
- ["8FB3",0x22C27],
- ["8A50",0x22C38],
- ["9B60",0x22C4C],
- ["8B45",0x22C51],
- ["8B46",0x22C55],
- ["9DFE",0x22C62],
- ["9B62",0x22C88],
- ["937B",0x22C9B],
- ["93B1",0x22CA1],
- ["8A60",0x22CA9],
- ["8AD8",0x22CB2],
- ["9B63",0x22CB7],
- ["8A69",0x22CC2],
- ["8A47",0x22CC6],
- ["8ACC",0x22CC9],
- ["937C",0x22D07],
- ["9B65",0x22D08],
- ["9B66",0x22D12],
- ["8A72",0x22D44],
- ["8A7A",0x22D4C],
- ["93AF",0x22D67],
- ["8AB0",0x22D8D],
- ["9B68",0x22D95],
- ["9EA3",0x22DA0],
- ["FAEC",0x22DA3],
- ["8B77",0x22DA4],
- ["9B67",0x22DB7],
- ["8B59",0x22DEE],
- ["FCB1",0x22E0D],
- ["FCBB",0x22E36],
- ["9B69",0x22E42],
- ["93A8",0x22E78],
- ["8AE0",0x22E8B],
- ["9E51",0x22EB3],
- ["8F5F",0x22EEF],
- ["9B6A",0x22F74],
- ["9B6B",0x22FCC],
- ["97EC",0x22FE3],
- ["9B6C",0x23033],
- ["FE4E",0x23044],
- ["FDC2",0x2304B],
- ["9B6D",0x23066],
- ["9167",0x2307D],
- ["FCCC",0x2307E],
- ["93B6",0x2308E],
- ["90E4",0x230B7],
- ["90E5",0x230BC],
- ["9EF2",0x230DA],
- ["93CA",0x23103],
- ["8BBC",0x2313D],
- ["8F46",0x2317D],
- ["93CF",0x23182],
- ["FCDB",0x231A4],
- ["FCDC",0x231A5],
- ["93C0",0x231B3],
- ["FCE6",0x231C8],
- ["96E7",0x231C9],
- ["FCD8",0x231F7],
- ["FCD9",0x231F8],
- ["FDA6",0x231F9],
- ["93CE",0x2320F],
- ["95F1",0x23225],
- ["9CE9",0x2322F],
- ["FCE4",0x23231],
- ["94AF",0x23232],
- ["FA77",0x23233],
- ["93CC",0x23234],
- ["8CE1",0x23256],
- ["905A",0x23262],
- ["8C54",0x23281],
- ["93BF",0x23289],
- ["FB51",0x2328A],
- ["93B9",0x232AB],
- ["FED7",0x232AC],
- ["93B7",0x232AD],
- ["93D9",0x232D2],
- ["93BB",0x232E0],
- ["93DA",0x232E1],
- ["98A3",0x23300],
- ["90D1",0x2330A],
- ["9B6E",0x2331F],
- ["FA70",0x233B4],
- ["9BEB",0x233CC],
- ["9B6F",0x233DE],
- ["FCFC",0x233E6],
- ["8B40",0x233F4],
- ["A07B",0x233F5],
- ["8CA1",0x233F9],
- ["97F7",0x233FA],
- ["93E2",0x233FE],
- ["FCD6",0x23400],
- ["9559",0x2343F],
- ["93A6",0x23450],
- ["FD40",0x2346F],
- ["935F",0x23472],
- ["97F2",0x234E5],
- ["9C76",0x23519],
- ["8EF8",0x23530],
- ["8CEB",0x23551],
- ["8F47",0x2355A],
- ["9B74",0x23567],
- ["92B4",0x23595],
- ["91ED",0x23599],
- ["96D2",0x2359C],
- ["FD46",0x235CD],
- ["8F4F",0x235CE],
- ["9549",0x235CF],
- ["9B75",0x235F3],
- ["FA5C",0x23600],
- ["8751",0x23617],
- ["9B79",0x2361A],
- ["FD4B",0x2363C],
- ["96D3",0x23640],
- ["FD58",0x23659],
- ["945F",0x2365F],
- ["A0F5",0x23677],
- ["9243",0x236A6],
- ["97FA",0x236AD],
- ["9DD9",0x236BA],
- ["97F4",0x236DF],
- ["924D",0x236EE],
- ["FD5B",0x23703],
- ["9B7A",0x23716],
- ["9ED5",0x23720],
- ["FAAE",0x2372D],
- ["9CC9",0x2372F],
- ["9258",0x2373F],
- ["8EC8",0x23766],
- ["94B4",0x23781],
- ["93E1",0x237A2],
- ["93DF",0x237BC],
- ["FCF0",0x237C2],
- ["93EC",0x237D5],
- ["97F6",0x237D6],
- ["96CF",0x237D7],
- ["93DE",0x2383A],
- ["8ACF",0x239C2],
- ["9BA2",0x23AA7],
- ["FD69",0x23ADB],
- ["9352",0x23AEE],
- ["98A2",0x23AFA],
- ["8CE7",0x23B1A],
- ["FD6E",0x23B5A],
- ["8CA4",0x23C63],
- ["FA7C",0x23C99],
- ["93FA",0x23C9A],
- ["907C",0x23C9B],
- ["8F67",0x23CB5],
- ["9DB7",0x23CB7],
- ["A0E9",0x23CC7],
- ["FA4E",0x23CC8],
- ["FDA1",0x23CC9],
- ["9E74",0x23CFC],
- ["9FBF",0x23CFD],
- ["9ECB",0x23CFE],
- ["9BB9",0x23CFF],
- ["9DD4",0x23D40],
- ["97B9",0x23D5B],
- ["8EF1",0x23D7E],
- ["957B",0x23D8F],
- ["9ED2",0x23DB6],
- ["9753",0x23DB7],
- ["96A4",0x23DB8],
- ["8FBE",0x23DB9],
- ["94D9",0x23DBA],
- ["9058",0x23DBB],
- ["FD79",0x23DBC],
- ["FD7B",0x23DBD],
- ["8EDA",0x23DE3],
- ["8EFA",0x23DF8],
- ["8762",0x23E06],
- ["9BA5",0x23E11],
- ["9ED9",0x23E2C],
- ["97D4",0x23E2D],
- ["90BB",0x23E2E],
- ["FDBC",0x23E2F],
- ["FDC6",0x23E30],
- ["9248",0x23E31],
- ["92B5",0x23E39],
- ["9DC1",0x23E88],
- ["92B9",0x23E89],
- ["92A6",0x23E8A],
- ["8F4B",0x23E8B],
- ["9BA6",0x23EB9],
- ["92B6",0x23EBF],
- ["8E40",0x23ED7],
- ["9ED8",0x23EF7],
- ["945E",0x23EF8],
- ["985F",0x23EF9],
- ["94CE",0x23EFA],
- ["924A",0x23EFB],
- ["FD70",0x23EFC],
- ["9467",0x23F35],
- ["8DEC",0x23F41],
- ["9BD8",0x23F4A],
- ["8763",0x23F61],
- ["9448",0x23F7F],
- ["FAC1",0x23F80],
- ["9CF7",0x23F81],
- ["FDBE",0x23F82],
- ["8FDA",0x23F8F],
- ["FDD9",0x23FB4],
- ["FC7E",0x23FB7],
- ["93F9",0x23FC0],
- ["FA43",0x23FC5],
- ["FAEB",0x23FEB],
- ["FAC3",0x23FEC],
- ["97D3",0x23FED],
- ["95F9",0x23FEE],
- ["9C48",0x23FEF],
- ["FDD8",0x23FF0],
- ["A0D8",0x24011],
- ["FDD7",0x24039],
- ["FB4A",0x2403A],
- ["9BAF",0x2403B],
- ["944B",0x2403C],
- ["FDC9",0x2403D],
- ["8EAC",0x24057],
- ["FDB2",0x24085],
- ["925A",0x2408B],
- ["FCBD",0x2408C],
- ["92D9",0x2408D],
- ["FDD5",0x24091],
- ["92DD",0x240C9],
- ["9259",0x240E1],
- ["8CF0",0x240EC],
- ["96BA",0x24104],
- ["925B",0x2410F],
- ["9BAB",0x24119],
- ["FDDA",0x2413F],
- ["FDDE",0x24140],
- ["FDD3",0x24144],
- ["8C46",0x2414E],
- ["FDD6",0x24155],
- ["FDDC",0x24156],
- ["FDDD",0x24157],
- ["90FE",0x2415C],
- ["FEA1",0x2415F],
- ["8BAD",0x24177],
- ["9CD8",0x2417A],
- ["9E6D",0x241A3],
- ["FD7C",0x241A4],
- ["FB61",0x241A5],
- ["96F8",0x241AC],
- ["96F0",0x241B5],
- ["FCF4",0x241CD],
- ["FE60",0x241E2],
- ["9852",0x241FC],
- ["964F",0x2421B],
- ["916E",0x2424B],
- ["986D",0x24256],
- ["9864",0x24259],
- ["9453",0x24276],
- ["FDEC",0x24277],
- ["FB78",0x24278],
- ["95BA",0x24284],
- ["985D",0x24293],
- ["92F9",0x24295],
- ["985A",0x242A5],
- ["8750",0x242BF],
- ["FDF6",0x242C1],
- ["93D0",0x242C9],
- ["9862",0x242CA],
- ["9BAD",0x242EE],
- ["974F",0x242FA],
- ["9BAE",0x2430D],
- ["9452",0x2431A],
- ["9BB0",0x24334],
- ["91D2",0x24348],
- ["97EA",0x24362],
- ["FB6B",0x24363],
- ["91B1",0x24364],
- ["FDF3",0x24365],
- ["92CB",0x2438C],
- ["9BB1",0x24396],
- ["FCEC",0x2439C],
- ["986B",0x243BD],
- ["9751",0x243C1],
- ["9871",0x243E9],
- ["95EF",0x243EA],
- ["9EF3",0x243F2],
- ["91E8",0x243F8],
- ["9BBA",0x24404],
- ["FB4C",0x24435],
- ["926A",0x24436],
- ["FDF8",0x2445A],
- ["9861",0x2445B],
- ["91E7",0x24473],
- ["93ED",0x24487],
- ["9744",0x24488],
- ["91E1",0x244B9],
- ["FBF5",0x244BC],
- ["9869",0x244CE],
- ["8A62",0x244D3],
- ["9BBB",0x244D6],
- ["8CA8",0x24505],
- ["9C55",0x24521],
- ["8E77",0x24578],
- ["8AB2",0x245C8],
- ["9EBC",0x24618],
- ["93E6",0x2462A],
- ["93A2",0x24665],
- ["9BBD",0x24674],
- ["94B3",0x24697],
- ["937D",0x246D4],
- ["9E66",0x24706],
- ["9459",0x24725],
- ["9BBF",0x2472F],
- ["9458",0x2478F],
- ["9EA5",0x247E0],
- ["9BC7",0x24812],
- ["FE54",0x24823],
- ["8E74",0x24882],
- ["8BD6",0x248E9],
- ["94B6",0x248F0],
- ["FD74",0x248F1],
- ["98C0",0x248F2],
- ["94A5",0x248F3],
- ["9BC8",0x248FB],
- ["95ED",0x248FF],
- ["FD7E",0x24900],
- ["FBEB",0x24901],
- ["FD7D",0x2490C],
- ["976F",0x24916],
- ["9461",0x24917],
- ["9FC1",0x24919],
- ["95D7",0x2492F],
- ["FA52",0x24933],
- ["9C58",0x24934],
- ["9F68",0x2493E],
- ["9BE7",0x2493F],
- ["FCCE",0x24940],
- ["96E8",0x24941],
- ["FA49",0x24942],
- ["97A1",0x24943],
- ["954D",0x24962],
- ["9EF8",0x24963],
- ["FE49",0x24974],
- ["91CE",0x24975],
- ["9771",0x24976],
- ["8CCF",0x2497B],
- ["FDB1",0x2497F],
- ["FC6E",0x24982],
- ["9CF2",0x24988],
- ["93B8",0x24989],
- ["9043",0x2498A],
- ["9759",0x2498B],
- ["94D7",0x2498C],
- ["FE66",0x2498D],
- ["947D",0x2498E],
- ["FC6F",0x2498F],
- ["9246",0x24994],
- ["FA6D",0x249A4],
- ["8EF7",0x249A7],
- ["FBB7",0x249A9],
- ["947C",0x249AB],
- ["92CD",0x249AC],
- ["97B2",0x249AD],
- ["FE65",0x249B7],
- ["967E",0x249B8],
- ["9758",0x249B9],
- ["9B77",0x249BA],
- ["91CF",0x249BB],
- ["94A4",0x249C5],
- ["9CAD",0x249D0],
- ["8BAB",0x249DA],
- ["96D5",0x249DE],
- ["FCB3",0x249DF],
- ["93AE",0x249E3],
- ["976D",0x249E5],
- ["9446",0x249EC],
- ["95F7",0x249ED],
- ["9C46",0x249F6],
- ["955B",0x249F7],
- ["91D1",0x249F8],
- ["94F4",0x249F9],
- ["FE67",0x249FB],
- ["92A5",0x24A0E],
- ["FEDF",0x24A12],
- ["8CAB",0x24A13],
- ["9BC9",0x24A15],
- ["FCED",0x24A21],
- ["FDFA",0x24A22],
- ["FCC8",0x24A23],
- ["FE62",0x24A24],
- ["91FC",0x24A25],
- ["FE6B",0x24A26],
- ["FDF9",0x24A27],
- ["FCC7",0x24A28],
- ["914E",0x24A29],
- ["9CB8",0x24A2A],
- ["9767",0x24A3E],
- ["95EE",0x24A42],
- ["9BB2",0x24A45],
- ["9460",0x24A4A],
- ["94A2",0x24A4E],
- ["9875",0x24A4F],
- ["97AC",0x24A50],
- ["91D3",0x24A51],
- ["987B",0x24A5D],
- ["8EEB",0x24A65],
- ["976A",0x24A66],
- ["965E",0x24A67],
- ["97EB",0x24A71],
- ["9FF9",0x24A77],
- ["95F8",0x24A78],
- ["FEA2",0x24A79],
- ["8FE6",0x24A7A],
- ["FE7E",0x24A8C],
- ["9DA4",0x24A93],
- ["9768",0x24A94],
- ["8EEC",0x24A95],
- ["94BD",0x24A96],
- ["945B",0x24AA4],
- ["9CF6",0x24AA5],
- ["FAA7",0x24AA6],
- ["9BD9",0x24AA7],
- ["FA5D",0x24AB1],
- ["9656",0x24AB2],
- ["9762",0x24AB3],
- ["94BA",0x24ABA],
- ["A04F",0x24ABB],
- ["92D8",0x24ABC],
- ["9BCB",0x24AC0],
- ["94BB",0x24AC7],
- ["9D5F",0x24ACA],
- ["90CF",0x24AD1],
- ["9465",0x24ADF],
- ["9F4C",0x24AE2],
- ["90D8",0x24AE9],
- ["8D5B",0x24B0F],
- ["9EBE",0x24B6E],
- ["FB6D",0x24BF5],
- ["95CA",0x24C09],
- ["9DC2",0x24C9E],
- ["97F8",0x24C9F],
- ["8FFC",0x24CC9],
- ["9473",0x24CD9],
- ["9474",0x24D06],
- ["FEB7",0x24D13],
- ["8A4B",0x24DB8],
- ["8A55",0x24DEA],
- ["8B69",0x24DEB],
- ["8ADC",0x24E3B],
- ["8B76",0x24E50],
- ["9BCE",0x24EA5],
- ["8A68",0x24EA7],
- ["A0F8",0x24F0E],
- ["98DF",0x24F5C],
- ["FEB5",0x24F82],
- ["9BCF",0x24F86],
- ["96FB",0x24F97],
- ["9BFB",0x24F9A],
- ["9ECE",0x24FA9],
- ["8EE5",0x24FB8],
- ["9E7B",0x24FC2],
- ["9BD2",0x2502C],
- ["8AA5",0x25052],
- ["FECE",0x2509D],
- ["8A45",0x2512B],
- ["9DFC",0x25148],
- ["FECF",0x2517D],
- ["8BA5",0x2517E],
- ["8C4A",0x251CD],
- ["8AEC",0x251E3],
- ["FCE0",0x251E6],
- ["94AD",0x251E7],
- ["FED5",0x25220],
- ["94AC",0x25221],
- ["FC5A",0x25250],
- ["9BD6",0x25299],
- ["8A6F",0x252C7],
- ["8BA9",0x252D8],
- ["8E5F",0x2530E],
- ["9DCB",0x25311],
- ["FCE7",0x25313],
- ["9BD7",0x25419],
- ["93C8",0x25425],
- ["91F0",0x2542F],
- ["8FE0",0x25430],
- ["9BDB",0x25446],
- ["90ED",0x2546C],
- ["9BDC",0x2546E],
- ["8D53",0x2549A],
- ["A0EC",0x25531],
- ["98FA",0x25535],
- ["9BE0",0x2553F],
- ["93C7",0x2555B],
- ["9249",0x2555C],
- ["96E1",0x2555D],
- ["9BE2",0x2555E],
- ["9BE4",0x25562],
- ["8FE1",0x25565],
- ["9BE5",0x25566],
- ["94C0",0x25581],
- ["93C3",0x25584],
- ["93C5",0x2558F],
- ["9079",0x255B9],
- ["977B",0x255D5],
- ["907E",0x255DB],
- ["FEE6",0x255E0],
- ["FE46",0x25605],
- ["9DB8",0x25635],
- ["9270",0x25651],
- ["95A8",0x25683],
- ["8CB0",0x25695],
- ["94C8",0x256E3],
- ["98B9",0x256F6],
- ["9140",0x25706],
- ["FCBE",0x2571D],
- ["9157",0x25725],
- ["8BB2",0x2573D],
- ["FADF",0x25772],
- ["9BE6",0x257C7],
- ["9643",0x257DF],
- ["8E44",0x257E0],
- ["9C4F",0x257E1],
- ["FEF4",0x25857],
- ["9BE8",0x2585D],
- ["93DC",0x25872],
- ["966F",0x258C8],
- ["8E4A",0x258E1],
- ["9BED",0x25903],
- ["92F6",0x25946],
- ["9DB9",0x25956],
- ["8E4E",0x259AC],
- ["FBCF",0x259CC],
- ["8760",0x25A54],
- ["9EC2",0x25A95],
- ["94E5",0x25A9C],
- ["9BF0",0x25AAE],
- ["94E4",0x25AAF],
- ["9551",0x25AE9],
- ["8BBB",0x25B74],
- ["9BF1",0x25B89],
- ["94F0",0x25BB3],
- ["8E64",0x25BB4],
- ["94EA",0x25BC6],
- ["8F61",0x25BE4],
- ["9B64",0x25BE8],
- ["8E5B",0x25C01],
- ["9BF2",0x25C06],
- ["9FBE",0x25C21],
- ["9DC9",0x25C4A],
- ["8E6C",0x25C65],
- ["8F73",0x25C91],
- ["8CAF",0x25CA4],
- ["8F75",0x25CC0],
- ["8E71",0x25CC1],
- ["8E60",0x25CFE],
- ["8E6A",0x25D20],
- ["8C4C",0x25D30],
- ["9552",0x25D43],
- ["9554",0x25E0E],
- ["8AD4",0x25E49],
- ["9DBB",0x25E81],
- ["9543",0x25E82],
- ["92FE",0x25E83],
- ["94F2",0x25EA6],
- ["94F1",0x25EBC],
- ["A0EA",0x25ED7],
- ["9DD2",0x25ED8],
- ["A0B1",0x25F1A],
- ["91F8",0x25F4B],
- ["9462",0x25FE1],
- ["9BA4",0x25FE2],
- ["8EAD",0x26029],
- ["9EAD",0x26048],
- ["96D0",0x26064],
- ["FEEE",0x26083],
- ["8AB4",0x26097],
- ["9757",0x260A4],
- ["8A77",0x260A5],
- ["9BF7",0x26102],
- ["8EB5",0x26121],
- ["A06D",0x26159],
- ["8EB6",0x2615A],
- ["9756",0x2615B],
- ["9540",0x2615C],
- ["A0F3",0x261AD],
- ["94BE",0x261AE],
- ["9BFA",0x261B2],
- ["FDDF",0x261DD],
- ["9DBC",0x26258],
- ["94FE",0x26261],
- ["8BDB",0x2626A],
- ["A0FE",0x2626B],
- ["8EC0",0x262D0],
- ["9F47",0x26335],
- ["8BDE",0x2634B],
- ["A0FB",0x2634C],
- ["8EC3",0x26351],
- ["9649",0x263BE],
- ["FEC2",0x263F5],
- ["954C",0x263F8],
- ["9BFD",0x26402],
- ["90CC",0x26410],
- ["9C60",0x26411],
- ["954B",0x26412],
- ["9BFE",0x2644A],
- ["9C70",0x26469],
- ["9C43",0x26484],
- ["9C47",0x26488],
- ["8ECC",0x26489],
- ["8E54",0x2648D],
- ["8EE4",0x26498],
- ["9C49",0x26512],
- ["8B5E",0x26572],
- ["955E",0x265A0],
- ["955C",0x265AD],
- ["9C4B",0x265BF],
- ["8BE1",0x26612],
- ["8ED9",0x26626],
- ["9DB4",0x266AF],
- ["925F",0x266B1],
- ["9C4C",0x266B5],
- ["8AA1",0x266DA],
- ["8EDB",0x266E8],
- ["9C56",0x266FC],
- ["8AA2",0x26716],
- ["9754",0x26741],
- ["9C5E",0x26799],
- ["9ED4",0x267B3],
- ["9568",0x267B4],
- ["A0C3",0x267CC],
- ["8AE6",0x2681C],
- ["A0F7",0x26846],
- ["9C61",0x2685E],
- ["9C5F",0x2686E],
- ["FC4D",0x26888],
- ["9E5B",0x2688A],
- ["9E69",0x26893],
- ["9C63",0x268C7],
- ["FEC7",0x2690E],
- ["FEC6",0x26911],
- ["9C67",0x26926],
- ["9C69",0x26939],
- ["8BE2",0x26951],
- ["9165",0x269A8],
- ["9CE7",0x269B5],
- ["8A54",0x269F2],
- ["9C6C",0x269FA],
- ["9C6E",0x26A2D],
- ["FE5D",0x26A2E],
- ["9C73",0x26A34],
- ["956A",0x26A42],
- ["956D",0x26A51],
- ["8EF0",0x26A52],
- ["8F4D",0x26B05],
- ["8EF6",0x26B0A],
- ["FABC",0x26B13],
- ["8CD5",0x26B15],
- ["875E",0x26B23],
- ["FBDA",0x26B28],
- ["8B4C",0x26B50],
- ["FD75",0x26B51],
- ["9BDD",0x26B52],
- ["FAF5",0x26B53],
- ["9C74",0x26B5B],
- ["9545",0x26B75],
- ["96C6",0x26B82],
- ["8F6A",0x26B96],
- ["8F4E",0x26B97],
- ["9C78",0x26B9D],
- ["FA55",0x26BB3],
- ["97E4",0x26BC0],
- ["9C41",0x26BF7],
- ["925C",0x26C21],
- ["96FA",0x26C40],
- ["8CF6",0x26C41],
- ["8D4D",0x26C46],
- ["FB66",0x26C7E],
- ["8E65",0x26C7F],
- ["9849",0x26C80],
- ["FBA8",0x26C81],
- ["9842",0x26C82],
- ["9C7A",0x26CA4],
- ["97FB",0x26CB7],
- ["90CA",0x26CB8],
- ["9C5B",0x26CBD],
- ["974D",0x26CC0],
- ["8ED3",0x26CC3],
- ["9561",0x26CD1],
- ["9F4B",0x26D22],
- ["9FB5",0x26D23],
- ["93D2",0x26D24],
- ["FDAA",0x26D25],
- ["9840",0x26D26],
- ["9146",0x26D27],
- ["9867",0x26D28],
- ["FA5A",0x26D29],
- ["FBA9",0x26D2A],
- ["9841",0x26D51],
- ["8CD3",0x26D74],
- ["FCFD",0x26DA0],
- ["FDAB",0x26DA1],
- ["91BD",0x26DA2],
- ["8F4C",0x26DA3],
- ["96C9",0x26DA4],
- ["8F55",0x26DA5],
- ["FBAE",0x26DA6],
- ["956F",0x26DA7],
- ["9C7D",0x26DAE],
- ["A0F0",0x26DDC],
- ["946F",0x26DEA],
- ["FDAC",0x26DEB],
- ["96CB",0x26DF0],
- ["96CE",0x26E00],
- ["A056",0x26E05],
- ["9CE1",0x26E07],
- ["96C4",0x26E12],
- ["8F5E",0x26E42],
- ["8F6C",0x26E43],
- ["8EA3",0x26E44],
- ["FBB3",0x26E45],
- ["FC53",0x26E6E],
- ["FDB3",0x26E72],
- ["8F6B",0x26E77],
- ["96CA",0x26E84],
- ["8753",0x26E8B],
- ["8F79",0x26E99],
- ["9E6F",0x26ED0],
- ["A0C5",0x26ED1],
- ["FC78",0x26ED2],
- ["8E42",0x26ED3],
- ["8F5A",0x26ED4],
- ["90C2",0x26ED5],
- ["8EA5",0x26ED6],
- ["9061",0x26ED7],
- ["924F",0x26F26],
- ["9373",0x26F73],
- ["FDB5",0x26F74],
- ["FECC",0x26F9F],
- ["FBBD",0x26FA1],
- ["8CD6",0x26FBE],
- ["9843",0x26FDE],
- ["96C5",0x26FDF],
- ["89BC",0x2700E],
- ["9CA3",0x2704B],
- ["924B",0x27052],
- ["984A",0x27053],
- ["8FA4",0x27088],
- ["A0F1",0x270AD],
- ["9EFB",0x270AE],
- ["9CD2",0x270AF],
- ["8FA7",0x270CD],
- ["8754",0x270D2],
- ["FC5C",0x270F8],
- ["9845",0x27109],
- ["9046",0x2710C],
- ["8CD1",0x2710D],
- ["FEFA",0x27126],
- ["9560",0x27127],
- ["9F48",0x27164],
- ["9247",0x27165],
- ["90FB",0x27175],
- ["9CA4",0x271CD],
- ["9571",0x2721B],
- ["8745",0x27267],
- ["9CA6",0x27280],
- ["9CA7",0x27285],
- ["9CAA",0x2728B],
- ["9ED3",0x272B2],
- ["9E70",0x272B6],
- ["9CAC",0x272E6],
- ["8752",0x27352],
- ["8FAE",0x2739A],
- ["8D50",0x273FF],
- ["957D",0x27422],
- ["9CB0",0x27450],
- ["97B6",0x27484],
- ["A0BD",0x27486],
- ["8ADF",0x27574],
- ["9EAA",0x275A3],
- ["8FBD",0x275E0],
- ["8FBF",0x275E4],
- ["9369",0x275FD],
- ["9BA7",0x275FE],
- ["C8A4",0x27607],
- ["FEEA",0x2760C],
- ["9BE1",0x27632],
- ["8B41",0x27639],
- ["9DB6",0x27655],
- ["A0EB",0x27656],
- ["9BA3",0x27657],
- ["8BA1",0x27694],
- ["8FC8",0x2770F],
- ["894C",0x27735],
- ["9860",0x27736],
- ["94C7",0x27741],
- ["8B58",0x2775E],
- ["95AB",0x27784],
- ["95AA",0x27785],
- ["9CC3",0x277CC],
- ["9CC4",0x27858],
- ["93D6",0x27870],
- ["9DAC",0x2789D],
- ["8BE6",0x278B2],
- ["8A71",0x278C8],
- ["8FD1",0x27924],
- ["99D5",0x27967],
- ["90F4",0x2797A],
- ["8AA3",0x279A0],
- ["9CCE",0x279DD],
- ["9CD4",0x279FD],
- ["9CD5",0x27A0A],
- ["FBC8",0x27A0E],
- ["9DB3",0x27A3E],
- ["FC70",0x27A53],
- ["8FD7",0x27A59],
- ["9B73",0x27A79],
- ["FA5B",0x27A84],
- ["8FD2",0x27ABD],
- ["9064",0x27ABE],
- ["98B6",0x27AF4],
- ["9668",0x27B06],
- ["9CD6",0x27B0B],
- ["98BD",0x27B18],
- ["8FDC",0x27B38],
- ["FEF6",0x27B39],
- ["8FD9",0x27B3A],
- ["9541",0x27B48],
- ["876C",0x27BEF],
- ["97F3",0x27BF4],
- ["9BF8",0x27C12],
- ["875A",0x27C6C],
- ["8748",0x27CB1],
- ["874A",0x27CC5],
- ["9E6C",0x27D2F],
- ["8FF2",0x27D53],
- ["8FEE",0x27D54],
- ["9CD7",0x27D66],
- ["9E6E",0x27D73],
- ["8A40",0x27D84],
- ["8FEF",0x27D8F],
- ["8FF4",0x27D98],
- ["8FF5",0x27DBD],
- ["95C2",0x27DDC],
- ["986A",0x27E4D],
- ["97CF",0x27E4F],
- ["9EE5",0x27F2E],
- ["9E7C",0x27FF9],
- ["9041",0x28002],
- ["9CDB",0x28009],
- ["9441",0x2801E],
- ["9CE6",0x28023],
- ["9DB0",0x28024],
- ["9CEA",0x28048],
- ["9CED",0x28083],
- ["9CFA",0x28090],
- ["8B62",0x280BD],
- ["8A4E",0x280BE],
- ["9CCA",0x280E8],
- ["8A66",0x280E9],
- ["9CFB",0x280F4],
- ["9CFC",0x2812E],
- ["9CFE",0x2814F],
- ["8A53",0x2815D],
- ["9CE5",0x2816F],
- ["9D40",0x28189],
- ["9D41",0x281AF],
- ["9045",0x281BC],
- ["8B73",0x28207],
- ["97CA",0x28218],
- ["9D42",0x2821A],
- ["8A61",0x28256],
- ["8BAE",0x2827C],
- ["8AD2",0x2829B],
- ["8BA2",0x282CD],
- ["9DF2",0x282E2],
- ["9D43",0x28306],
- ["9CDF",0x28318],
- ["9D44",0x2832F],
- ["8ECA",0x2833A],
- ["904E",0x28365],
- ["8EB3",0x2836D],
- ["9FF5",0x2837D],
- ["9D45",0x2838A],
- ["904F",0x28412],
- ["9D47",0x28468],
- ["89CA",0x2846C],
- ["9CB5",0x28473],
- ["FBFE",0x28482],
- ["905E",0x28501],
- ["9063",0x2853C],
- ["9057",0x2853D],
- ["9066",0x2856C],
- ["9BC0",0x285E8],
- ["FCE5",0x285F4],
- ["9162",0x28600],
- ["9067",0x2860B],
- ["8FA1",0x28625],
- ["8FA2",0x2863B],
- ["9D48",0x286AA],
- ["FAD3",0x286AB],
- ["8D4F",0x286B2],
- ["905D",0x286BC],
- ["90B9",0x286D8],
- ["906B",0x286E6],
- ["8C5C",0x2870F],
- ["9069",0x28713],
- ["FE57",0x28804],
- ["FE55",0x2882B],
- ["9073",0x28933],
- ["9BEF",0x28948],
- ["9CF0",0x28949],
- ["9D4B",0x28956],
- ["FED9",0x28964],
- ["FEDA",0x28968],
- ["91E0",0x2896C],
- ["8D43",0x2896D],
- ["91D8",0x2897E],
- ["9646",0x28989],
- ["9360",0x289A8],
- ["FA53",0x289AA],
- ["9CD3",0x289AB],
- ["9D4E",0x289B8],
- ["FB40",0x289BC],
- ["8DE2",0x289C0],
- ["9442",0x289DC],
- ["9056",0x289DE],
- ["9865",0x289E1],
- ["8C6C",0x289E3],
- ["FA4A",0x289E4],
- ["9D50",0x289E7],
- ["9D52",0x289E8],
- ["95AF",0x289F9],
- ["975A",0x289FA],
- ["9349",0x289FB],
- ["9747",0x289FC],
- ["A0F4",0x28A0F],
- ["9778",0x28A16],
- ["8FCF",0x28A25],
- ["FC60",0x28A29],
- ["8C4E",0x28A32],
- ["FC56",0x28A36],
- ["91DC",0x28A44],
- ["9661",0x28A45],
- ["92EC",0x28A46],
- ["935D",0x28A47],
- ["8EDE",0x28A48],
- ["96FE",0x28A49],
- ["FD4F",0x28A4A],
- ["95DE",0x28A4B],
- ["98B0",0x28A59],
- ["A040",0x28A5A],
- ["97BD",0x28A81],
- ["977D",0x28A82],
- ["97F5",0x28A83],
- ["9BAC",0x28A9A],
- ["FADA",0x28A9B],
- ["92C2",0x28A9C],
- ["97B1",0x28AC0],
- ["907B",0x28AC6],
- ["93FE",0x28ACB],
- ["947B",0x28ACC],
- ["9777",0x28ACE],
- ["FABE",0x28ADE],
- ["FD43",0x28ADF],
- ["90C6",0x28AE0],
- ["90A4",0x28AE1],
- ["90A8",0x28AE2],
- ["94A9",0x28AE3],
- ["90A9",0x28AE5],
- ["8C65",0x28AEA],
- ["95E0",0x28AFC],
- ["907D",0x28B0C],
- ["9265",0x28B13],
- ["FDBA",0x28B21],
- ["93C4",0x28B22],
- ["FEED",0x28B2B],
- ["9DAB",0x28B2C],
- ["A0E3",0x28B2D],
- ["9648",0x28B2F],
- ["9D53",0x28B46],
- ["8AA9",0x28B4C],
- ["9BC5",0x28B4E],
- ["965D",0x28B50],
- ["975F",0x28B63],
- ["965F",0x28B64],
- ["966E",0x28B65],
- ["FB5D",0x28B66],
- ["9DB1",0x28B6C],
- ["FEA3",0x28B8F],
- ["9DB2",0x28B99],
- ["95AE",0x28B9C],
- ["FCA3",0x28B9D],
- ["8769",0x28BB9],
- ["A0A2",0x28BC2],
- ["9655",0x28BC5],
- ["9D54",0x28BD4],
- ["9341",0x28BD7],
- ["95AD",0x28BD9],
- ["91D5",0x28BDA],
- ["977A",0x28BE7],
- ["FDFC",0x28BE8],
- ["8E47",0x28BE9],
- ["93FD",0x28BEA],
- ["90A5",0x28BEB],
- ["90AC",0x28BEC],
- ["95AC",0x28BF5],
- ["90AE",0x28BFF],
- ["FEA5",0x28C03],
- ["9D56",0x28C09],
- ["97E3",0x28C1C],
- ["95E2",0x28C1D],
- ["9466",0x28C23],
- ["9647",0x28C26],
- ["91B8",0x28C2B],
- ["9CEC",0x28C30],
- ["90AD",0x28C39],
- ["95E3",0x28C3B],
- ["8B4F",0x28CCA],
- ["8AE3",0x28CCD],
- ["8B4D",0x28CD2],
- ["95EA",0x28D34],
- ["8B4E",0x28D99],
- ["8CC1",0x28DB9],
- ["8BED",0x28E0F],
- ["91D9",0x28E36],
- ["A0A4",0x28E39],
- ["95F5",0x28E65],
- ["95F4",0x28E66],
- ["9FB3",0x28E97],
- ["FEAF",0x28EAC],
- ["FE72",0x28EB2],
- ["927A",0x28EB3],
- ["FEAC",0x28ED9],
- ["95F3",0x28EE7],
- ["9D58",0x28FC5],
- ["8D46",0x29079],
- ["9372",0x29088],
- ["91C5",0x2908B],
- ["9642",0x29093],
- ["90CD",0x290AF],
- ["95FE",0x290B0],
- ["9159",0x290B1],
- ["9C65",0x290C0],
- ["97CC",0x290E4],
- ["90CE",0x290E5],
- ["9D59",0x290EC],
- ["FCF5",0x290ED],
- ["FEFD",0x2910D],
- ["9D5B",0x29110],
- ["9D5C",0x2913C],
- ["937E",0x2914D],
- ["98AC",0x2915B],
- ["9D5E",0x2915E],
- ["FDD0",0x29170],
- ["FD60",0x2919C],
- ["9CCF",0x291A8],
- ["90DD",0x291D5],
- ["90E0",0x291EB],
- ["90F3",0x2941D],
- ["98B1",0x29420],
- ["90F0",0x29433],
- ["93BD",0x2943F],
- ["95B7",0x29448],
- ["9F46",0x294D0],
- ["8E4B",0x294D9],
- ["9658",0x294DA],
- ["8A4C",0x294E5],
- ["9D63",0x294E7],
- ["9ECF",0x2959E],
- ["9D65",0x295B0],
- ["9D66",0x295B8],
- ["965A",0x295D7],
- ["9D64",0x295E9],
- ["8A6C",0x295F4],
- ["8AD9",0x29720],
- ["9D67",0x29732],
- ["8A70",0x297D4],
- ["8BF3",0x29810],
- ["9150",0x29857],
- ["9CC1",0x298A4],
- ["9D68",0x298D1],
- ["93A7",0x298EA],
- ["9674",0x298F1],
- ["8CFD",0x298FA],
- ["A0EF",0x29903],
- ["9151",0x29905],
- ["96C1",0x2992F],
- ["8777",0x29945],
- ["8C64",0x29947],
- ["9676",0x29948],
- ["9D69",0x29949],
- ["FCA4",0x2995D],
- ["9D6A",0x2996A],
- ["924E",0x2999D],
- ["9D6B",0x299C3],
- ["9BC1",0x299C9],
- ["9D6C",0x29A28],
- ["8A65",0x29A4D],
- ["915D",0x29B05],
- ["9D6D",0x29B0E],
- ["915A",0x29BD5],
- ["8C42",0x29C73],
- ["9CC0",0x29CAD],
- ["916A",0x29D3E],
- ["9D6E",0x29D5A],
- ["9EA6",0x29D7C],
- ["9DCD",0x29D98],
- ["9D6F",0x29D9B],
- ["89BB",0x29DF6],
- ["9EF9",0x29E06],
- ["96B4",0x29E2D],
- ["9172",0x29E68],
- ["9EC8",0x29EAC],
- ["8771",0x29EB0],
- ["8B55",0x29EC3],
- ["9D71",0x29EF8],
- ["9D72",0x29F23],
- ["9ECC",0x29F30],
- ["9174",0x29FB7],
- ["9ED0",0x29FDE],
- ["905C",0x2A014],
- ["8ED2",0x2A087],
- ["91A8",0x2A0B9],
- ["9177",0x2A0E1],
- ["96BF",0x2A0ED],
- ["96C0",0x2A0F3],
- ["8FB1",0x2A0F8],
- ["96B7",0x2A0FE],
- ["8C55",0x2A107],
- ["9178",0x2A123],
- ["89BE",0x2A133],
- ["917C",0x2A134],
- ["FB77",0x2A150],
- ["9175",0x2A192],
- ["91A3",0x2A193],
- ["9176",0x2A1AB],
- ["96BE",0x2A1B4],
- ["8D49",0x2A1B5],
- ["9179",0x2A1DF],
- ["96B6",0x2A1F5],
- ["91A4",0x2A220],
- ["91A6",0x2A233],
- ["9D75",0x2A293],
- ["9052",0x2A29F],
- ["A045",0x2A2B2],
- ["91A9",0x2A2B4],
- ["98AA",0x2A2B6],
- ["8C5F",0x2A2BA],
- ["8BAA",0x2A2BD],
- ["9CDD",0x2A2DF],
- ["9D77",0x2A2FF],
- ["8756",0x2A351],
- ["8940",0x2A3A9],
- ["9EEC",0x2A434],
- ["93AA",0x2A45B],
- ["9478",0x2A5C6],
- ["9D7A",0x2A5CB],
- ["8AC9",0x2A601],
- ["8B4B",0x2A632],
- ["9FEC",0x2A64A],
- ["8AE2",0x2A65B],
- ["9E75",0x2A6A9],
- ["9874",0x2F825],
- ["9AC8",0x2F83B],
- ["A047",0x2F840],
- ["8BC3",0x2F878],
- ["FC48",0x2F894],
- ["FC77",0x2F8A6],
- ["9C52",0x2F8CD],
- ["8EFD",0x2F994],
- ["8FA8",0x2F9B2],
- ["957A",0x2F9BC],
- ["8FF0",0x2F9D4],
-] \ No newline at end of file
diff --git a/enc/trans/big5-tbl.rb b/enc/trans/big5-tbl.rb
deleted file mode 100644
index b093cb0d77..0000000000
--- a/enc/trans/big5-tbl.rb
+++ /dev/null
@@ -1,13705 +0,0 @@
-BIG5_TO_UCS_TBL= [
- ["A246",0xA2],
- ["A247",0xA3],
- ["A244",0xA5],
- ["A1B1",0xA7],
- ["A258",0xB0],
- ["A1D3",0xB1],
- ["A150",0xB7],
- ["A1D1",0xD7],
- ["A1D2",0xF7],
- ["A3BE",0x2C7],
- ["A3BC",0x2C9],
- ["A3BD",0x2CA],
- ["A3BF",0x2CB],
- ["A3BB",0x2D9],
- ["A344",0x391],
- ["A345",0x392],
- ["A346",0x393],
- ["A347",0x394],
- ["A348",0x395],
- ["A349",0x396],
- ["A34A",0x397],
- ["A34B",0x398],
- ["A34C",0x399],
- ["A34D",0x39A],
- ["A34E",0x39B],
- ["A34F",0x39C],
- ["A350",0x39D],
- ["A351",0x39E],
- ["A352",0x39F],
- ["A353",0x3A0],
- ["A354",0x3A1],
- ["A355",0x3A3],
- ["A356",0x3A4],
- ["A357",0x3A5],
- ["A358",0x3A6],
- ["A359",0x3A7],
- ["A35A",0x3A8],
- ["A35B",0x3A9],
- ["A35C",0x3B1],
- ["A35D",0x3B2],
- ["A35E",0x3B3],
- ["A35F",0x3B4],
- ["A360",0x3B5],
- ["A361",0x3B6],
- ["A362",0x3B7],
- ["A363",0x3B8],
- ["A364",0x3B9],
- ["A365",0x3BA],
- ["A366",0x3BB],
- ["A367",0x3BC],
- ["A368",0x3BD],
- ["A369",0x3BE],
- ["A36A",0x3BF],
- ["A36B",0x3C0],
- ["A36C",0x3C1],
- ["A36D",0x3C3],
- ["A36E",0x3C4],
- ["A36F",0x3C5],
- ["A370",0x3C6],
- ["A371",0x3C7],
- ["A372",0x3C8],
- ["A373",0x3C9],
- ["C7B3",0x401],
- ["C7B1",0x414],
- ["C7B2",0x415],
- ["C7B4",0x416],
- ["C7B5",0x417],
- ["C7B6",0x418],
- ["C7B7",0x419],
- ["C7B8",0x41A],
- ["C7B9",0x41B],
- ["C7BA",0x41C],
- ["C7BB",0x423],
- ["C7BC",0x424],
- ["C7BD",0x425],
- ["C7BE",0x426],
- ["C7BF",0x427],
- ["C7C0",0x428],
- ["C7C1",0x429],
- ["C7C2",0x42A],
- ["C7C3",0x42B],
- ["C7C4",0x42C],
- ["C7C5",0x42D],
- ["C7C6",0x42E],
- ["C7C7",0x42F],
- ["C7C8",0x430],
- ["C7C9",0x431],
- ["C7CA",0x432],
- ["C7CB",0x433],
- ["C7CC",0x434],
- ["C7CD",0x435],
- ["C7CF",0x436],
- ["C7D0",0x437],
- ["C7D1",0x438],
- ["C7D2",0x439],
- ["C7D3",0x43A],
- ["C7D4",0x43B],
- ["C7D5",0x43C],
- ["C7D6",0x43D],
- ["C7D7",0x43E],
- ["C7D8",0x43F],
- ["C7D9",0x440],
- ["C7DA",0x441],
- ["C7DB",0x442],
- ["C7DC",0x443],
- ["C7DD",0x444],
- ["C7DE",0x445],
- ["C7DF",0x446],
- ["C7E0",0x447],
- ["C7E1",0x448],
- ["C7E2",0x449],
- ["C7E3",0x44A],
- ["C7E4",0x44B],
- ["C7E5",0x44C],
- ["C7E6",0x44D],
- ["C7E7",0x44E],
- ["C7E8",0x44F],
- ["C7CE",0x451],
- ["A156",0x2013],
- ["A158",0x2014],
- ["A1A5",0x2018],
- ["A1A6",0x2019],
- ["A1A7",0x201C],
- ["A1A8",0x201D],
- ["A145",0x2022],
- ["A14C",0x2025],
- ["A14B",0x2026],
- ["A1AC",0x2032],
- ["A1AB",0x2035],
- ["A1B0",0x203B],
- ["A1C2",0x203E],
- ["A24A",0x2103],
- ["A1C1",0x2105],
- ["A24B",0x2109],
- ["A2B9",0x2160],
- ["A2BA",0x2161],
- ["A2BB",0x2162],
- ["A2BC",0x2163],
- ["A2BD",0x2164],
- ["A2BE",0x2165],
- ["A2BF",0x2166],
- ["A2C0",0x2167],
- ["A2C1",0x2168],
- ["A2C2",0x2169],
- ["A1F6",0x2190],
- ["A1F4",0x2191],
- ["A1F7",0x2192],
- ["A1F5",0x2193],
- ["A1F8",0x2196],
- ["A1F9",0x2197],
- ["A1FB",0x2198],
- ["A1FA",0x2199],
- ["A1D4",0x221A],
- ["A1DB",0x221E],
- ["A1E8",0x221F],
- ["A1E7",0x2220],
- ["A1FD",0x2223],
- ["A1FC",0x2225],
- ["A1E4",0x2229],
- ["A1E5",0x222A],
- ["A1EC",0x222B],
- ["A1ED",0x222E],
- ["A1EF",0x2234],
- ["A1EE",0x2235],
- ["A1E3",0x223C],
- ["A1DC",0x2252],
- ["A1DA",0x2260],
- ["A1DD",0x2261],
- ["A1D8",0x2266],
- ["A1D9",0x2267],
- ["A1E6",0x22A5],
- ["A1E9",0x22BF],
- ["C7E9",0x2460],
- ["C7EA",0x2461],
- ["C7EB",0x2462],
- ["C7EC",0x2463],
- ["C7ED",0x2464],
- ["C7EE",0x2465],
- ["C7EF",0x2466],
- ["C7F0",0x2467],
- ["C7F1",0x2468],
- ["C7F2",0x2469],
- ["C7F3",0x2474],
- ["C7F4",0x2475],
- ["C7F5",0x2476],
- ["C7F6",0x2477],
- ["C7F7",0x2478],
- ["C7F8",0x2479],
- ["C7F9",0x247A],
- ["C7FA",0x247B],
- ["C7FB",0x247C],
- ["C7FC",0x247D],
- ["A277",0x2500],
- ["A278",0x2502],
- ["A27A",0x250C],
- ["A27B",0x2510],
- ["A27C",0x2514],
- ["A27D",0x2518],
- ["A275",0x251C],
- ["A274",0x2524],
- ["A273",0x252C],
- ["A272",0x2534],
- ["A271",0x253C],
- ["A2A4",0x2550],
- ["A2A5",0x255E],
- ["A2A7",0x2561],
- ["A2A6",0x256A],
- ["A27E",0x256D],
- ["A2A1",0x256E],
- ["A2A3",0x256F],
- ["A2A2",0x2570],
- ["A2AC",0x2571],
- ["A2AD",0x2572],
- ["A2AE",0x2573],
- ["A262",0x2581],
- ["A263",0x2582],
- ["A264",0x2583],
- ["A265",0x2584],
- ["A266",0x2585],
- ["A267",0x2586],
- ["A268",0x2587],
- ["A269",0x2588],
- ["A270",0x2589],
- ["A26F",0x258A],
- ["A26E",0x258B],
- ["A26D",0x258C],
- ["A26C",0x258D],
- ["A26B",0x258E],
- ["A26A",0x258F],
- ["A276",0x2594],
- ["A279",0x2595],
- ["A1BD",0x25A0],
- ["A1BC",0x25A1],
- ["A1B6",0x25B2],
- ["A1B5",0x25B3],
- ["A1BF",0x25BC],
- ["A1BE",0x25BD],
- ["A1BB",0x25C6],
- ["A1BA",0x25C7],
- ["A1B3",0x25CB],
- ["A1B7",0x25CE],
- ["A1B4",0x25CF],
- ["A2A8",0x25E2],
- ["A2A9",0x25E3],
- ["A2AB",0x25E4],
- ["A2AA",0x25E5],
- ["A1B9",0x2605],
- ["A1B8",0x2606],
- ["A1F3",0x2609],
- ["A1F0",0x2640],
- ["A1F2",0x2641],
- ["A1F1",0x2642],
- ["A140",0x3000],
- ["A142",0x3001],
- ["A143",0x3002],
- ["A1B2",0x3003],
- ["C6A4",0x3005],
- ["A171",0x3008],
- ["A172",0x3009],
- ["A16D",0x300A],
- ["A16E",0x300B],
- ["A175",0x300C],
- ["A176",0x300D],
- ["A179",0x300E],
- ["A17A",0x300F],
- ["A169",0x3010],
- ["A16A",0x3011],
- ["A245",0x3012],
- ["A165",0x3014],
- ["A166",0x3015],
- ["A1A9",0x301D],
- ["A1AA",0x301E],
- ["A2C3",0x3021],
- ["A2C4",0x3022],
- ["A2C5",0x3023],
- ["A2C6",0x3024],
- ["A2C7",0x3025],
- ["A2C8",0x3026],
- ["A2C9",0x3027],
- ["A2CA",0x3028],
- ["A2CB",0x3029],
- ["C6A5",0x3041],
- ["C6A6",0x3042],
- ["C6A7",0x3043],
- ["C6A8",0x3044],
- ["C6A9",0x3045],
- ["C6AA",0x3046],
- ["C6AB",0x3047],
- ["C6AC",0x3048],
- ["C6AD",0x3049],
- ["C6AE",0x304A],
- ["C6AF",0x304B],
- ["C6B0",0x304C],
- ["C6B1",0x304D],
- ["C6B2",0x304E],
- ["C6B3",0x304F],
- ["C6B4",0x3050],
- ["C6B5",0x3051],
- ["C6B6",0x3052],
- ["C6B7",0x3053],
- ["C6B8",0x3054],
- ["C6B9",0x3055],
- ["C6BA",0x3056],
- ["C6BB",0x3057],
- ["C6BC",0x3058],
- ["C6BD",0x3059],
- ["C6BE",0x305A],
- ["C6BF",0x305B],
- ["C6C0",0x305C],
- ["C6C1",0x305D],
- ["C6C2",0x305E],
- ["C6C3",0x305F],
- ["C6C4",0x3060],
- ["C6C5",0x3061],
- ["C6C6",0x3062],
- ["C6C7",0x3063],
- ["C6C8",0x3064],
- ["C6C9",0x3065],
- ["C6CA",0x3066],
- ["C6CB",0x3067],
- ["C6CC",0x3068],
- ["C6CD",0x3069],
- ["C6CE",0x306A],
- ["C6CF",0x306B],
- ["C6D0",0x306C],
- ["C6D1",0x306D],
- ["C6D2",0x306E],
- ["C6D3",0x306F],
- ["C6D4",0x3070],
- ["C6D5",0x3071],
- ["C6D6",0x3072],
- ["C6D7",0x3073],
- ["C6D8",0x3074],
- ["C6D9",0x3075],
- ["C6DA",0x3076],
- ["C6DB",0x3077],
- ["C6DC",0x3078],
- ["C6DD",0x3079],
- ["C6DE",0x307A],
- ["C6DF",0x307B],
- ["C6E0",0x307C],
- ["C6E1",0x307D],
- ["C6E2",0x307E],
- ["C6E3",0x307F],
- ["C6E4",0x3080],
- ["C6E5",0x3081],
- ["C6E6",0x3082],
- ["C6E7",0x3083],
- ["C6E8",0x3084],
- ["C6E9",0x3085],
- ["C6EA",0x3086],
- ["C6EB",0x3087],
- ["C6EC",0x3088],
- ["C6ED",0x3089],
- ["C6EE",0x308A],
- ["C6EF",0x308B],
- ["C6F0",0x308C],
- ["C6F1",0x308D],
- ["C6F2",0x308E],
- ["C6F3",0x308F],
- ["C6F4",0x3090],
- ["C6F5",0x3091],
- ["C6F6",0x3092],
- ["C6F7",0x3093],
- ["C6A2",0x309D],
- ["C6A3",0x309E],
- ["C6F8",0x30A1],
- ["C6F9",0x30A2],
- ["C6FA",0x30A3],
- ["C6FB",0x30A4],
- ["C6FC",0x30A5],
- ["C6FD",0x30A6],
- ["C6FE",0x30A7],
- ["C740",0x30A8],
- ["C741",0x30A9],
- ["C742",0x30AA],
- ["C743",0x30AB],
- ["C744",0x30AC],
- ["C745",0x30AD],
- ["C746",0x30AE],
- ["C747",0x30AF],
- ["C748",0x30B0],
- ["C749",0x30B1],
- ["C74A",0x30B2],
- ["C74B",0x30B3],
- ["C74C",0x30B4],
- ["C74D",0x30B5],
- ["C74E",0x30B6],
- ["C74F",0x30B7],
- ["C750",0x30B8],
- ["C751",0x30B9],
- ["C752",0x30BA],
- ["C753",0x30BB],
- ["C754",0x30BC],
- ["C755",0x30BD],
- ["C756",0x30BE],
- ["C757",0x30BF],
- ["C758",0x30C0],
- ["C759",0x30C1],
- ["C75A",0x30C2],
- ["C75B",0x30C3],
- ["C75C",0x30C4],
- ["C75D",0x30C5],
- ["C75E",0x30C6],
- ["C75F",0x30C7],
- ["C760",0x30C8],
- ["C761",0x30C9],
- ["C762",0x30CA],
- ["C763",0x30CB],
- ["C764",0x30CC],
- ["C765",0x30CD],
- ["C766",0x30CE],
- ["C767",0x30CF],
- ["C768",0x30D0],
- ["C769",0x30D1],
- ["C76A",0x30D2],
- ["C76B",0x30D3],
- ["C76C",0x30D4],
- ["C76D",0x30D5],
- ["C76E",0x30D6],
- ["C76F",0x30D7],
- ["C770",0x30D8],
- ["C771",0x30D9],
- ["C772",0x30DA],
- ["C773",0x30DB],
- ["C774",0x30DC],
- ["C775",0x30DD],
- ["C776",0x30DE],
- ["C777",0x30DF],
- ["C778",0x30E0],
- ["C779",0x30E1],
- ["C77A",0x30E2],
- ["C77B",0x30E3],
- ["C77C",0x30E4],
- ["C77D",0x30E5],
- ["C77E",0x30E6],
- ["C7A1",0x30E7],
- ["C7A2",0x30E8],
- ["C7A3",0x30E9],
- ["C7A4",0x30EA],
- ["C7A5",0x30EB],
- ["C7A6",0x30EC],
- ["C7A7",0x30ED],
- ["C7A8",0x30EE],
- ["C7A9",0x30EF],
- ["C7AA",0x30F0],
- ["C7AB",0x30F1],
- ["C7AC",0x30F2],
- ["C7AD",0x30F3],
- ["C7AE",0x30F4],
- ["C7AF",0x30F5],
- ["C7B0",0x30F6],
- ["C6A1",0x30FE],
- ["A374",0x3105],
- ["A375",0x3106],
- ["A376",0x3107],
- ["A377",0x3108],
- ["A378",0x3109],
- ["A379",0x310A],
- ["A37A",0x310B],
- ["A37B",0x310C],
- ["A37C",0x310D],
- ["A37D",0x310E],
- ["A37E",0x310F],
- ["A3A1",0x3110],
- ["A3A2",0x3111],
- ["A3A3",0x3112],
- ["A3A4",0x3113],
- ["A3A5",0x3114],
- ["A3A6",0x3115],
- ["A3A7",0x3116],
- ["A3A8",0x3117],
- ["A3A9",0x3118],
- ["A3AA",0x3119],
- ["A3AB",0x311A],
- ["A3AC",0x311B],
- ["A3AD",0x311C],
- ["A3AE",0x311D],
- ["A3AF",0x311E],
- ["A3B0",0x311F],
- ["A3B1",0x3120],
- ["A3B2",0x3121],
- ["A3B3",0x3122],
- ["A3B4",0x3123],
- ["A3B5",0x3124],
- ["A3B6",0x3125],
- ["A3B7",0x3126],
- ["A3B8",0x3127],
- ["A3B9",0x3128],
- ["A3BA",0x3129],
- ["A1C0",0x32A3],
- ["A255",0x338E],
- ["A256",0x338F],
- ["A250",0x339C],
- ["A251",0x339D],
- ["A252",0x339E],
- ["A254",0x33A1],
- ["A257",0x33C4],
- ["A253",0x33CE],
- ["A1EB",0x33D1],
- ["A1EA",0x33D2],
- ["A24F",0x33D5],
- ["A440",0x4E00],
- ["A442",0x4E01],
- ["A443",0x4E03],
- ["C945",0x4E07],
- ["A456",0x4E08],
- ["A454",0x4E09],
- ["A457",0x4E0A],
- ["A455",0x4E0B],
- ["C946",0x4E0C],
- ["A4A3",0x4E0D],
- ["C94F",0x4E0E],
- ["C94D",0x4E0F],
- ["A4A2",0x4E10],
- ["A4A1",0x4E11],
- ["A542",0x4E14],
- ["A541",0x4E15],
- ["A540",0x4E16],
- ["A543",0x4E18],
- ["A4FE",0x4E19],
- ["A5E0",0x4E1E],
- ["A5E1",0x4E1F],
- ["A8C3",0x4E26],
- ["A458",0x4E2B],
- ["A4A4",0x4E2D],
- ["C950",0x4E2E],
- ["A4A5",0x4E30],
- ["C963",0x4E31],
- ["A6EA",0x4E32],
- ["CBB1",0x4E33],
- ["A459",0x4E38],
- ["A4A6",0x4E39],
- ["A544",0x4E3B],
- ["C964",0x4E3C],
- ["C940",0x4E42],
- ["A444",0x4E43],
- ["A45B",0x4E45],
- ["C947",0x4E47],
- ["A45C",0x4E48],
- ["A4A7",0x4E4B],
- ["A545",0x4E4D],
- ["A547",0x4E4E],
- ["A546",0x4E4F],
- ["A5E2",0x4E52],
- ["A5E3",0x4E53],
- ["A8C4",0x4E56],
- ["ADBC",0x4E58],
- ["A441",0x4E59],
- ["C941",0x4E5C],
- ["A445",0x4E5D],
- ["A45E",0x4E5E],
- ["A45D",0x4E5F],
- ["A5E4",0x4E69],
- ["A8C5",0x4E73],
- ["B0AE",0x4E7E],
- ["D44B",0x4E7F],
- ["B6C3",0x4E82],
- ["DCB1",0x4E83],
- ["DCB2",0x4E84],
- ["A446",0x4E86],
- ["A4A9",0x4E88],
- ["A8C6",0x4E8B],
- ["A447",0x4E8C],
- ["C948",0x4E8D],
- ["A45F",0x4E8E],
- ["A4AA",0x4E91],
- ["A4AC",0x4E92],
- ["C951",0x4E93],
- ["A4AD",0x4E94],
- ["A4AB",0x4E95],
- ["A5E5",0x4E99],
- ["A8C7",0x4E9B],
- ["A8C8",0x4E9E],
- ["AB45",0x4E9F],
- ["A460",0x4EA1],
- ["A4AE",0x4EA2],
- ["A5E6",0x4EA4],
- ["A5E8",0x4EA5],
- ["A5E7",0x4EA6],
- ["A6EB",0x4EA8],
- ["A8C9",0x4EAB],
- ["A8CA",0x4EAC],
- ["AB46",0x4EAD],
- ["AB47",0x4EAE],
- ["ADBD",0x4EB3],
- ["DCB3",0x4EB6],
- ["F6D6",0x4EB9],
- ["A448",0x4EBA],
- ["A4B0",0x4EC0],
- ["A4AF",0x4EC1],
- ["C952",0x4EC2],
- ["A4B1",0x4EC3],
- ["A4B7",0x4EC4],
- ["A4B2",0x4EC6],
- ["A4B3",0x4EC7],
- ["C954",0x4EC8],
- ["C953",0x4EC9],
- ["A4B5",0x4ECA],
- ["A4B6",0x4ECB],
- ["A4B4",0x4ECD],
- ["A54A",0x4ED4],
- ["A54B",0x4ED5],
- ["A54C",0x4ED6],
- ["A54D",0x4ED7],
- ["A549",0x4ED8],
- ["A550",0x4ED9],
- ["C96A",0x4EDA],
- ["C966",0x4EDC],
- ["C969",0x4EDD],
- ["A551",0x4EDE],
- ["A561",0x4EDF],
- ["C968",0x4EE1],
- ["A54E",0x4EE3],
- ["A54F",0x4EE4],
- ["A548",0x4EE5],
- ["C965",0x4EE8],
- ["C967",0x4EE9],
- ["A5F5",0x4EF0],
- ["C9B0",0x4EF1],
- ["A5F2",0x4EF2],
- ["A5F6",0x4EF3],
- ["C9BA",0x4EF4],
- ["C9AE",0x4EF5],
- ["A5F3",0x4EF6],
- ["C9B2",0x4EF7],
- ["A5F4",0x4EFB],
- ["A5F7",0x4EFD],
- ["A5E9",0x4EFF],
- ["C9B1",0x4F00],
- ["A5F8",0x4F01],
- ["C9B5",0x4F02],
- ["C9B9",0x4F04],
- ["C9B6",0x4F05],
- ["C9B3",0x4F08],
- ["A5EA",0x4F09],
- ["A5EC",0x4F0A],
- ["A5F9",0x4F0B],
- ["A5EE",0x4F0D],
- ["C9AB",0x4F0E],
- ["A5F1",0x4F0F],
- ["A5EF",0x4F10],
- ["A5F0",0x4F11],
- ["C9BB",0x4F12],
- ["C9B8",0x4F13],
- ["C9AF",0x4F14],
- ["A5ED",0x4F15],
- ["C9AC",0x4F18],
- ["A5EB",0x4F19],
- ["C9B4",0x4F1D],
- ["C9B7",0x4F22],
- ["C9AD",0x4F2C],
- ["CA66",0x4F2D],
- ["A742",0x4F2F],
- ["A6F4",0x4F30],
- ["CA67",0x4F33],
- ["A6F1",0x4F34],
- ["A744",0x4F36],
- ["A6F9",0x4F38],
- ["A6F8",0x4F3A],
- ["CA5B",0x4F3B],
- ["A6FC",0x4F3C],
- ["A6F7",0x4F3D],
- ["CA60",0x4F3E],
- ["CA68",0x4F3F],
- ["CA64",0x4F41],
- ["A6FA",0x4F43],
- ["A6FD",0x4F46],
- ["A6EE",0x4F47],
- ["A747",0x4F48],
- ["CA5D",0x4F49],
- ["CBBD",0x4F4C],
- ["A6EC",0x4F4D],
- ["A743",0x4F4E],
- ["A6ED",0x4F4F],
- ["A6F5",0x4F50],
- ["A6F6",0x4F51],
- ["CA62",0x4F52],
- ["CA5E",0x4F53],
- ["A6FB",0x4F54],
- ["A6F3",0x4F55],
- ["CA5A",0x4F56],
- ["A6EF",0x4F57],
- ["CA65",0x4F58],
- ["A745",0x4F59],
- ["A748",0x4F5A],
- ["A6F2",0x4F5B],
- ["A740",0x4F5C],
- ["A746",0x4F5D],
- ["A6F0",0x4F5E],
- ["CA63",0x4F5F],
- ["A741",0x4F60],
- ["CA69",0x4F61],
- ["CA5C",0x4F62],
- ["A6FE",0x4F63],
- ["CA5F",0x4F64],
- ["CA61",0x4F67],
- ["A8D8",0x4F69],
- ["CBBF",0x4F6A],
- ["CBCB",0x4F6B],
- ["A8D0",0x4F6C],
- ["CBCC",0x4F6E],
- ["A8CB",0x4F6F],
- ["A8D5",0x4F70],
- ["A8CE",0x4F73],
- ["CBB9",0x4F74],
- ["A8D6",0x4F75],
- ["CBB8",0x4F76],
- ["CBBC",0x4F77],
- ["CBC3",0x4F78],
- ["CBC1",0x4F79],
- ["A8DE",0x4F7A],
- ["A8D9",0x4F7B],
- ["CBB3",0x4F7C],
- ["CBB5",0x4F7D],
- ["A8DB",0x4F7E],
- ["A8CF",0x4F7F],
- ["CBB6",0x4F80],
- ["CBC2",0x4F81],
- ["CBC9",0x4F82],
- ["A8D4",0x4F83],
- ["CBBB",0x4F84],
- ["CBB4",0x4F85],
- ["A8D3",0x4F86],
- ["CBB7",0x4F87],
- ["A8D7",0x4F88],
- ["CBBA",0x4F89],
- ["A8D2",0x4F8B],
- ["A8CD",0x4F8D],
- ["A8DC",0x4F8F],
- ["CBC4",0x4F90],
- ["A8DD",0x4F91],
- ["CBC8",0x4F92],
- ["CBC6",0x4F94],
- ["CBCA",0x4F95],
- ["A8DA",0x4F96],
- ["CBBE",0x4F97],
- ["CBB2",0x4F98],
- ["CBC0",0x4F9A],
- ["A8D1",0x4F9B],
- ["CBC5",0x4F9C],
- ["A8CC",0x4F9D],
- ["CBC7",0x4F9E],
- ["AB56",0x4FAE],
- ["AB4A",0x4FAF],
- ["CDE0",0x4FB2],
- ["CDE8",0x4FB3],
- ["AB49",0x4FB5],
- ["AB51",0x4FB6],
- ["AB5D",0x4FB7],
- ["CDEE",0x4FB9],
- ["CDEC",0x4FBA],
- ["CDE7",0x4FBB],
- ["AB4B",0x4FBF],
- ["CDED",0x4FC0],
- ["CDE3",0x4FC1],
- ["AB59",0x4FC2],
- ["AB50",0x4FC3],
- ["AB58",0x4FC4],
- ["CDDE",0x4FC5],
- ["CDEA",0x4FC7],
- ["CDE1",0x4FC9],
- ["AB54",0x4FCA],
- ["CDE2",0x4FCB],
- ["CDDD",0x4FCD],
- ["AB5B",0x4FCE],
- ["AB4E",0x4FCF],
- ["AB57",0x4FD0],
- ["AB4D",0x4FD1],
- ["CDDF",0x4FD3],
- ["CDE4",0x4FD4],
- ["CDEB",0x4FD6],
- ["AB55",0x4FD7],
- ["AB52",0x4FD8],
- ["CDE6",0x4FD9],
- ["AB5A",0x4FDA],
- ["CDE9",0x4FDB],
- ["CDE5",0x4FDC],
- ["AB4F",0x4FDD],
- ["AB5C",0x4FDE],
- ["AB53",0x4FDF],
- ["AB4C",0x4FE0],
- ["AB48",0x4FE1],
- ["CDEF",0x4FEC],
- ["ADD7",0x4FEE],
- ["ADC1",0x4FEF],
- ["ADD1",0x4FF1],
- ["ADD6",0x4FF3],
- ["D0D0",0x4FF4],
- ["D0CF",0x4FF5],
- ["D0D4",0x4FF6],
- ["D0D5",0x4FF7],
- ["ADC4",0x4FF8],
- ["ADCD",0x4FFA],
- ["ADDA",0x4FFE],
- ["ADCE",0x5000],
- ["D0C9",0x5005],
- ["ADC7",0x5006],
- ["D0CA",0x5007],
- ["ADDC",0x5009],
- ["ADD3",0x500B],
- ["ADBE",0x500C],
- ["ADBF",0x500D],
- ["D0DD",0x500E],
- ["B0BF",0x500F],
- ["ADCC",0x5011],
- ["ADCB",0x5012],
- ["D0CB",0x5013],
- ["ADCF",0x5014],
- ["D45B",0x5015],
- ["ADC6",0x5016],
- ["D0D6",0x5017],
- ["ADD5",0x5018],
- ["ADD4",0x5019],
- ["ADCA",0x501A],
- ["D0CE",0x501B],
- ["D0D7",0x501C],
- ["D0C8",0x501E],
- ["ADC9",0x501F],
- ["D0D8",0x5020],
- ["ADD2",0x5021],
- ["D0CC",0x5022],
- ["ADC0",0x5023],
- ["ADC3",0x5025],
- ["ADC2",0x5026],
- ["D0D9",0x5027],
- ["ADD0",0x5028],
- ["ADC5",0x5029],
- ["ADD9",0x502A],
- ["ADDB",0x502B],
- ["D0D3",0x502C],
- ["ADD8",0x502D],
- ["D0DB",0x502F],
- ["D0CD",0x5030],
- ["D0DC",0x5031],
- ["D0D1",0x5033],
- ["D0DA",0x5035],
- ["D0D2",0x5037],
- ["ADC8",0x503C],
- ["D463",0x5040],
- ["D457",0x5041],
- ["B0B3",0x5043],
- ["D45C",0x5045],
- ["D462",0x5046],
- ["B0B2",0x5047],
- ["D455",0x5048],
- ["B0B6",0x5049],
- ["D459",0x504A],
- ["D452",0x504B],
- ["B0B4",0x504C],
- ["D456",0x504D],
- ["B0B9",0x504E],
- ["B0BE",0x504F],
- ["D467",0x5051],
- ["D451",0x5053],
- ["B0BA",0x5055],
- ["D466",0x5057],
- ["B0B5",0x505A],
- ["D458",0x505B],
- ["B0B1",0x505C],
- ["D453",0x505D],
- ["D44F",0x505E],
- ["D45D",0x505F],
- ["D450",0x5060],
- ["D44E",0x5061],
- ["D45A",0x5062],
- ["D460",0x5063],
- ["D461",0x5064],
- ["B0B7",0x5065],
- ["D85B",0x5068],
- ["D45E",0x5069],
- ["D44D",0x506A],
- ["D45F",0x506B],
- ["B0C1",0x506D],
- ["D464",0x506E],
- ["B0C0",0x506F],
- ["D44C",0x5070],
- ["D454",0x5072],
- ["D465",0x5073],
- ["B0BC",0x5074],
- ["B0BB",0x5075],
- ["B0B8",0x5076],
- ["B0BD",0x5077],
- ["B0AF",0x507A],
- ["B0B0",0x507D],
- ["B3C8",0x5080],
- ["D85E",0x5082],
- ["D857",0x5083],
- ["B3C5",0x5085],
- ["D85F",0x5087],
- ["D855",0x508B],
- ["D858",0x508C],
- ["B3C4",0x508D],
- ["D859",0x508E],
- ["B3C7",0x5091],
- ["D85D",0x5092],
- ["D853",0x5094],
- ["D852",0x5095],
- ["B3C9",0x5096],
- ["B3CA",0x5098],
- ["B3C6",0x5099],
- ["B3CB",0x509A],
- ["D851",0x509B],
- ["D85C",0x509C],
- ["D85A",0x509D],
- ["D854",0x509E],
- ["B3C3",0x50A2],
- ["D856",0x50A3],
- ["B6CA",0x50AC],
- ["B6C4",0x50AD],
- ["DCB7",0x50AE],
- ["B6CD",0x50AF],
- ["DCBD",0x50B0],
- ["DCC0",0x50B1],
- ["B6C6",0x50B2],
- ["B6C7",0x50B3],
- ["DCBA",0x50B4],
- ["B6C5",0x50B5],
- ["DCC3",0x50B6],
- ["B6CB",0x50B7],
- ["DCC4",0x50B8],
- ["DCBF",0x50BA],
- ["B6CC",0x50BB],
- ["DCB4",0x50BD],
- ["B6C9",0x50BE],
- ["DCB5",0x50BF],
- ["DCBE",0x50C1],
- ["DCBC",0x50C2],
- ["DCB8",0x50C4],
- ["B6C8",0x50C5],
- ["DCB6",0x50C6],
- ["B6CE",0x50C7],
- ["DCBB",0x50C8],
- ["DCC2",0x50C9],
- ["DCB9",0x50CA],
- ["DCC1",0x50CB],
- ["B9B6",0x50CE],
- ["B9B3",0x50CF],
- ["B9B4",0x50D1],
- ["E0F9",0x50D3],
- ["E0F1",0x50D4],
- ["B9B2",0x50D5],
- ["B9AF",0x50D6],
- ["E0F2",0x50D7],
- ["B9B1",0x50DA],
- ["E0F5",0x50DB],
- ["E0F7",0x50DD],
- ["E0FE",0x50E0],
- ["E0FD",0x50E3],
- ["E0F8",0x50E4],
- ["B9AE",0x50E5],
- ["E0F0",0x50E6],
- ["B9AC",0x50E7],
- ["E0F3",0x50E8],
- ["B9B7",0x50E9],
- ["E0F6",0x50EA],
- ["E0FA",0x50EC],
- ["B9B0",0x50ED],
- ["B9AD",0x50EE],
- ["E0FC",0x50EF],
- ["E0FB",0x50F0],
- ["B9B5",0x50F1],
- ["E0F4",0x50F3],
- ["BBF8",0x50F5],
- ["E4EC",0x50F6],
- ["E4E9",0x50F8],
- ["BBF9",0x50F9],
- ["BBF7",0x50FB],
- ["E4F0",0x50FD],
- ["E4ED",0x50FE],
- ["E4E6",0x50FF],
- ["BBF6",0x5100],
- ["BBFA",0x5102],
- ["E4E7",0x5103],
- ["BBF5",0x5104],
- ["BBFD",0x5105],
- ["E4EA",0x5106],
- ["E4EB",0x5107],
- ["BBFB",0x5108],
- ["BBFC",0x5109],
- ["E4F1",0x510A],
- ["E4EE",0x510B],
- ["E4EF",0x510C],
- ["BEAA",0x5110],
- ["E8F8",0x5111],
- ["BEA7",0x5112],
- ["E8F5",0x5113],
- ["BEA9",0x5114],
- ["BEAB",0x5115],
- ["E8F6",0x5117],
- ["BEA8",0x5118],
- ["E8F7",0x511A],
- ["E8F4",0x511C],
- ["C076",0x511F],
- ["ECBD",0x5120],
- ["C077",0x5121],
- ["ECBB",0x5122],
- ["ECBC",0x5124],
- ["ECBA",0x5125],
- ["ECB9",0x5126],
- ["ECBE",0x5129],
- ["C075",0x512A],
- ["EFB8",0x512D],
- ["EFB9",0x512E],
- ["E4E8",0x5130],
- ["EFB7",0x5131],
- ["C078",0x5132],
- ["C35F",0x5133],
- ["F1EB",0x5134],
- ["F1EC",0x5135],
- ["C4D7",0x5137],
- ["C4D8",0x5138],
- ["F5C1",0x5139],
- ["F5C0",0x513A],
- ["C56C",0x513B],
- ["C56B",0x513C],
- ["F7D0",0x513D],
- ["A449",0x513F],
- ["A461",0x5140],
- ["A4B9",0x5141],
- ["A4B8",0x5143],
- ["A553",0x5144],
- ["A552",0x5145],
- ["A5FC",0x5146],
- ["A5FB",0x5147],
- ["A5FD",0x5148],
- ["A5FA",0x5149],
- ["A74A",0x514B],
- ["A749",0x514C],
- ["A74B",0x514D],
- ["A8E0",0x5152],
- ["A8DF",0x5154],
- ["A8E1",0x5155],
- ["AB5E",0x5157],
- ["A259",0x5159],
- ["D0DE",0x515A],
- ["A25A",0x515B],
- ["B0C2",0x515C],
- ["A25C",0x515D],
- ["A25B",0x515E],
- ["D860",0x515F],
- ["A25D",0x5161],
- ["B9B8",0x5162],
- ["A25E",0x5163],
- ["A44A",0x5165],
- ["A4BA",0x5167],
- ["A5FE",0x5168],
- ["A8E2",0x5169],
- ["A44B",0x516B],
- ["A4BD",0x516C],
- ["A4BB",0x516D],
- ["A4BC",0x516E],
- ["A640",0x5171],
- ["A74C",0x5175],
- ["A8E4",0x5176],
- ["A8E3",0x5177],
- ["A8E5",0x5178],
- ["ADDD",0x517C],
- ["BEAC",0x5180],
- ["C94E",0x5187],
- ["A554",0x5189],
- ["A555",0x518A],
- ["A641",0x518D],
- ["CA6A",0x518F],
- ["AB60",0x5191],
- ["AB5F",0x5192],
- ["D0E0",0x5193],
- ["D0DF",0x5194],
- ["B0C3",0x5195],
- ["A4BE",0x5197],
- ["C955",0x5198],
- ["CBCD",0x519E],
- ["AB61",0x51A0],
- ["ADE0",0x51A2],
- ["ADDE",0x51A4],
- ["ADDF",0x51A5],
- ["BEAD",0x51AA],
- ["A556",0x51AC],
- ["A642",0x51B0],
- ["C9BC",0x51B1],
- ["A74D",0x51B6],
- ["A74E",0x51B7],
- ["CA6B",0x51B9],
- ["CBCE",0x51BC],
- ["A8E6",0x51BD],
- ["CBCF",0x51BE],
- ["D0E2",0x51C4],
- ["D0E3",0x51C5],
- ["ADE3",0x51C6],
- ["D0E4",0x51C8],
- ["D0E1",0x51CA],
- ["ADE4",0x51CB],
- ["ADE2",0x51CC],
- ["ADE1",0x51CD],
- ["D0E5",0x51CE],
- ["D468",0x51D0],
- ["D861",0x51D4],
- ["DCC5",0x51D7],
- ["E140",0x51D8],
- ["BBFE",0x51DC],
- ["BEAE",0x51DD],
- ["E8F9",0x51DE],
- ["A44C",0x51E0],
- ["A45A",0x51E1],
- ["B0C4",0x51F0],
- ["B3CD",0x51F1],
- ["B9B9",0x51F3],
- ["C942",0x51F5],
- ["A4BF",0x51F6],
- ["A559",0x51F8],
- ["A557",0x51F9],
- ["A558",0x51FA],
- ["A8E7",0x51FD],
- ["A44D",0x5200],
- ["A44E",0x5201],
- ["A462",0x5203],
- ["A4C0",0x5206],
- ["A4C1",0x5207],
- ["A4C2",0x5208],
- ["C9BE",0x5209],
- ["A55A",0x520A],
- ["C96B",0x520C],
- ["A646",0x520E],
- ["C9BF",0x5210],
- ["A644",0x5211],
- ["A645",0x5212],
- ["C9BD",0x5213],
- ["A647",0x5216],
- ["A643",0x5217],
- ["CA6C",0x521C],
- ["AAEC",0x521D],
- ["CA6D",0x521E],
- ["CA6E",0x5221],
- ["A750",0x5224],
- ["A74F",0x5225],
- ["A753",0x5228],
- ["A751",0x5229],
- ["A752",0x522A],
- ["A8ED",0x522E],
- ["A8EC",0x5230],
- ["CBD4",0x5231],
- ["CBD1",0x5232],
- ["CBD2",0x5233],
- ["CBD0",0x5235],
- ["A8EE",0x5236],
- ["A8EA",0x5237],
- ["A8E9",0x5238],
- ["A8EB",0x523A],
- ["A8E8",0x523B],
- ["A8EF",0x5241],
- ["AB63",0x5243],
- ["CDF0",0x5244],
- ["CBD3",0x5246],
- ["AB68",0x5247],
- ["CDF1",0x5249],
- ["AB64",0x524A],
- ["AB67",0x524B],
- ["AB66",0x524C],
- ["AB65",0x524D],
- ["AB62",0x524E],
- ["D0E8",0x5252],
- ["ADE7",0x5254],
- ["D0EB",0x5255],
- ["ADE5",0x5256],
- ["D0E7",0x525A],
- ["ADE8",0x525B],
- ["ADE6",0x525C],
- ["ADE9",0x525D],
- ["D0E9",0x525E],
- ["D0EA",0x525F],
- ["D0E6",0x5261],
- ["D0EC",0x5262],
- ["B3D1",0x5269],
- ["B0C5",0x526A],
- ["D469",0x526B],
- ["D46B",0x526C],
- ["D46A",0x526D],
- ["D46C",0x526E],
- ["B0C6",0x526F],
- ["B3CE",0x5272],
- ["B3CF",0x5274],
- ["B3D0",0x5275],
- ["B6D0",0x5277],
- ["DCC7",0x5278],
- ["DCC6",0x527A],
- ["DCC8",0x527B],
- ["DCC9",0x527C],
- ["B6D1",0x527D],
- ["B6CF",0x527F],
- ["E141",0x5280],
- ["E142",0x5281],
- ["B9BB",0x5282],
- ["B9BA",0x5283],
- ["E35A",0x5284],
- ["BC40",0x5287],
- ["BC41",0x5288],
- ["BC42",0x5289],
- ["BC44",0x528A],
- ["E4F2",0x528B],
- ["E4F3",0x528C],
- ["BC43",0x528D],
- ["BEAF",0x5291],
- ["BEB0",0x5293],
- ["F1ED",0x5296],
- ["F5C3",0x5297],
- ["F5C2",0x5298],
- ["F7D1",0x5299],
- ["A44F",0x529B],
- ["A55C",0x529F],
- ["A55B",0x52A0],
- ["A648",0x52A3],
- ["C9C0",0x52A6],
- ["A755",0x52A9],
- ["A756",0x52AA],
- ["A754",0x52AB],
- ["A757",0x52AC],
- ["CA6F",0x52AD],
- ["CA70",0x52AE],
- ["A8F1",0x52BB],
- ["CBD5",0x52BC],
- ["A8F0",0x52BE],
- ["CDF2",0x52C0],
- ["AB6C",0x52C1],
- ["CDF3",0x52C2],
- ["AB6B",0x52C3],
- ["AB69",0x52C7],
- ["AB6A",0x52C9],
- ["D0ED",0x52CD],
- ["B0C7",0x52D2],
- ["D46E",0x52D3],
- ["B0CA",0x52D5],
- ["D46D",0x52D6],
- ["B1E5",0x52D7],
- ["B0C9",0x52D8],
- ["B0C8",0x52D9],
- ["B3D4",0x52DB],
- ["B3D3",0x52DD],
- ["B3D2",0x52DE],
- ["B6D2",0x52DF],
- ["B6D5",0x52E2],
- ["B6D6",0x52E3],
- ["B6D4",0x52E4],
- ["B6D3",0x52E6],
- ["E143",0x52E9],
- ["E144",0x52EB],
- ["E4F5",0x52EF],
- ["BC45",0x52F0],
- ["E4F4",0x52F1],
- ["BEB1",0x52F3],
- ["ECBF",0x52F4],
- ["C079",0x52F5],
- ["F1EE",0x52F7],
- ["C455",0x52F8],
- ["A463",0x52FA],
- ["A4C3",0x52FB],
- ["C956",0x52FC],
- ["A4C4",0x52FE],
- ["A4C5",0x52FF],
- ["A55D",0x5305],
- ["A55E",0x5306],
- ["A649",0x5308],
- ["CA71",0x5309],
- ["CBD6",0x530A],
- ["CBD7",0x530B],
- ["AB6D",0x530D],
- ["D0EE",0x530E],
- ["B0CC",0x530F],
- ["B0CB",0x5310],
- ["D863",0x5311],
- ["D862",0x5312],
- ["A450",0x5315],
- ["A4C6",0x5316],
- ["A55F",0x5317],
- ["B0CD",0x5319],
- ["C943",0x531A],
- ["C96C",0x531C],
- ["A560",0x531D],
- ["C9C2",0x531F],
- ["A64B",0x5320],
- ["A64A",0x5321],
- ["C9C1",0x5322],
- ["A758",0x5323],
- ["ADEA",0x532A],
- ["D46F",0x532D],
- ["B6D7",0x532F],
- ["E145",0x5330],
- ["B9BC",0x5331],
- ["E8FA",0x5334],
- ["F3FD",0x5337],
- ["A4C7",0x5339],
- ["CBD8",0x533C],
- ["CDF4",0x533D],
- ["B0D0",0x533E],
- ["B0CE",0x533F],
- ["B0CF",0x5340],
- ["A451",0x5341],
- ["A464",0x5343],
- ["A2CD",0x5344],
- ["A4CA",0x5345],
- ["A4C9",0x5347],
- ["A4C8",0x5348],
- ["A563",0x5349],
- ["A562",0x534A],
- ["C96D",0x534C],
- ["C9C3",0x534D],
- ["A8F5",0x5351],
- ["A8F2",0x5352],
- ["A8F4",0x5353],
- ["A8F3",0x5354],
- ["AB6E",0x5357],
- ["B3D5",0x535A],
- ["A452",0x535C],
- ["A4CB",0x535E],
- ["A565",0x5360],
- ["A564",0x5361],
- ["CA72",0x5363],
- ["A8F6",0x5366],
- ["C957",0x536C],
- ["A567",0x536E],
- ["A566",0x536F],
- ["A64C",0x5370],
- ["A64D",0x5371],
- ["CA73",0x5372],
- ["A759",0x5373],
- ["A75A",0x5375],
- ["A8F7",0x5377],
- ["A8F8",0x5378],
- ["A8F9",0x5379],
- ["AB6F",0x537B],
- ["CDF5",0x537C],
- ["ADEB",0x537F],
- ["C944",0x5382],
- ["A4CC",0x5384],
- ["C9C4",0x538A],
- ["CA74",0x538E],
- ["CA75",0x538F],
- ["CBD9",0x5392],
- ["CBDA",0x5394],
- ["CDF7",0x5396],
- ["CDF6",0x5397],
- ["CDF9",0x5398],
- ["CDF8",0x5399],
- ["AB70",0x539A],
- ["D470",0x539C],
- ["ADED",0x539D],
- ["D0EF",0x539E],
- ["ADEC",0x539F],
- ["D864",0x53A4],
- ["B3D6",0x53A5],
- ["D865",0x53A7],
- ["E146",0x53AC],
- ["B9BD",0x53AD],
- ["BC46",0x53B2],
- ["F1EF",0x53B4],
- ["C958",0x53B9],
- ["A568",0x53BB],
- ["B0D1",0x53C3],
- ["A453",0x53C8],
- ["A465",0x53C9],
- ["A4CE",0x53CA],
- ["A4CD",0x53CB],
- ["A4CF",0x53CD],
- ["A8FB",0x53D4],
- ["A8FA",0x53D6],
- ["A8FC",0x53D7],
- ["AB71",0x53DB],
- ["ADEE",0x53DF],
- ["E8FB",0x53E1],
- ["C24F",0x53E2],
- ["A466",0x53E3],
- ["A56A",0x53E4],
- ["A579",0x53E5],
- ["A574",0x53E6],
- ["A56F",0x53E8],
- ["A56E",0x53E9],
- ["A575",0x53EA],
- ["A573",0x53EB],
- ["A56C",0x53EC],
- ["A57A",0x53ED],
- ["A56D",0x53EE],
- ["A569",0x53EF],
- ["A578",0x53F0],
- ["A577",0x53F1],
- ["A576",0x53F2],
- ["A56B",0x53F3],
- ["A572",0x53F5],
- ["A571",0x53F8],
- ["A57B",0x53FB],
- ["A570",0x53FC],
- ["A653",0x5401],
- ["A659",0x5403],
- ["A655",0x5404],
- ["A65B",0x5406],
- ["C9C5",0x5407],
- ["A658",0x5408],
- ["A64E",0x5409],
- ["A651",0x540A],
- ["A654",0x540B],
- ["A650",0x540C],
- ["A657",0x540D],
- ["A65A",0x540E],
- ["A64F",0x540F],
- ["A652",0x5410],
- ["A656",0x5411],
- ["A65C",0x5412],
- ["CA7E",0x5418],
- ["CA7B",0x5419],
- ["A767",0x541B],
- ["CA7C",0x541C],
- ["A75B",0x541D],
- ["A75D",0x541E],
- ["A775",0x541F],
- ["A770",0x5420],
- ["CAA5",0x5424],
- ["CA7D",0x5425],
- ["A75F",0x5426],
- ["A761",0x5427],
- ["CAA4",0x5428],
- ["A768",0x5429],
- ["CA78",0x542A],
- ["A774",0x542B],
- ["A776",0x542C],
- ["A75C",0x542D],
- ["A76D",0x542E],
- ["CA76",0x5430],
- ["A773",0x5431],
- ["A764",0x5433],
- ["A76E",0x5435],
- ["A76F",0x5436],
- ["CA77",0x5437],
- ["A76C",0x5438],
- ["A76A",0x5439],
- ["A76B",0x543B],
- ["A771",0x543C],
- ["CAA1",0x543D],
- ["A75E",0x543E],
- ["A772",0x5440],
- ["CAA3",0x5441],
- ["A766",0x5442],
- ["A763",0x5443],
- ["CA7A",0x5445],
- ["A762",0x5446],
- ["CAA6",0x5447],
- ["A765",0x5448],
- ["A769",0x544A],
- ["A760",0x544E],
- ["CAA2",0x544F],
- ["CA79",0x5454],
- ["CBEB",0x5460],
- ["CBEA",0x5461],
- ["A94F",0x5462],
- ["CBED",0x5463],
- ["CBEF",0x5464],
- ["CBE4",0x5465],
- ["CBE7",0x5466],
- ["CBEE",0x5467],
- ["A950",0x5468],
- ["CBE1",0x546B],
- ["CBE5",0x546C],
- ["CBE9",0x546F],
- ["CE49",0x5470],
- ["A94B",0x5471],
- ["CE4D",0x5472],
- ["A8FD",0x5473],
- ["CBE6",0x5474],
- ["A8FE",0x5475],
- ["A94C",0x5476],
- ["A945",0x5477],
- ["A941",0x5478],
- ["CBE2",0x547A],
- ["A944",0x547B],
- ["A949",0x547C],
- ["A952",0x547D],
- ["CBE3",0x547E],
- ["CBDC",0x547F],
- ["A943",0x5480],
- ["CBDD",0x5481],
- ["CBDF",0x5482],
- ["A946",0x5484],
- ["A948",0x5486],
- ["CBDB",0x5487],
- ["CBE0",0x5488],
- ["A951",0x548B],
- ["A94D",0x548C],
- ["CBE8",0x548D],
- ["A953",0x548E],
- ["A94A",0x5490],
- ["CBDE",0x5491],
- ["A947",0x5492],
- ["A942",0x5495],
- ["A940",0x5496],
- ["CBEC",0x5498],
- ["A94E",0x549A],
- ["CE48",0x54A0],
- ["CDFB",0x54A1],
- ["CE4B",0x54A2],
- ["CDFD",0x54A5],
- ["AB78",0x54A6],
- ["ABA8",0x54A7],
- ["AB74",0x54A8],
- ["ABA7",0x54A9],
- ["AB7D",0x54AA],
- ["ABA4",0x54AB],
- ["AB72",0x54AC],
- ["CDFC",0x54AD],
- ["CE43",0x54AE],
- ["ABA3",0x54AF],
- ["CE4F",0x54B0],
- ["ABA5",0x54B1],
- ["AB79",0x54B3],
- ["CE45",0x54B6],
- ["CE42",0x54B7],
- ["AB77",0x54B8],
- ["CDFA",0x54BA],
- ["ABA6",0x54BB],
- ["CE4A",0x54BC],
- ["AB7C",0x54BD],
- ["CE4C",0x54BE],
- ["ABA9",0x54BF],
- ["AB73",0x54C0],
- ["AB7E",0x54C1],
- ["AB7B",0x54C2],
- ["CE40",0x54C3],
- ["ABA1",0x54C4],
- ["CE46",0x54C5],
- ["CE47",0x54C6],
- ["AB7A",0x54C7],
- ["ABA2",0x54C8],
- ["AB76",0x54C9],
- ["AB75",0x54CE],
- ["CDFE",0x54CF],
- ["CE44",0x54D6],
- ["CE4E",0x54DE],
- ["D144",0x54E0],
- ["ADFB",0x54E1],
- ["D0F1",0x54E2],
- ["D0F6",0x54E4],
- ["ADF4",0x54E5],
- ["AE40",0x54E6],
- ["D0F4",0x54E7],
- ["ADEF",0x54E8],
- ["ADF9",0x54E9],
- ["ADFE",0x54EA],
- ["D0FB",0x54EB],
- ["ADFA",0x54ED],
- ["ADFD",0x54EE],
- ["D0FE",0x54F1],
- ["ADF5",0x54F2],
- ["D0F5",0x54F3],
- ["D142",0x54F7],
- ["D143",0x54F8],
- ["ADF7",0x54FA],
- ["D141",0x54FB],
- ["ADF3",0x54FC],
- ["AE43",0x54FD],
- ["D0F8",0x54FF],
- ["ADF1",0x5501],
- ["D146",0x5503],
- ["D0F9",0x5504],
- ["D0FD",0x5505],
- ["ADF6",0x5506],
- ["AE42",0x5507],
- ["D0FA",0x5508],
- ["ADFC",0x5509],
- ["D140",0x550A],
- ["D147",0x550B],
- ["D4A1",0x550C],
- ["D145",0x550E],
- ["AE44",0x550F],
- ["ADF0",0x5510],
- ["D0FC",0x5511],
- ["D0F3",0x5512],
- ["ADF8",0x5514],
- ["D0F2",0x5517],
- ["D0F7",0x551A],
- ["D0F0",0x5526],
- ["AE41",0x5527],
- ["D477",0x552A],
- ["B0E4",0x552C],
- ["D4A7",0x552D],
- ["B0E2",0x552E],
- ["B0DF",0x552F],
- ["D47C",0x5530],
- ["B0DB",0x5531],
- ["D4A2",0x5532],
- ["B0E6",0x5533],
- ["D476",0x5534],
- ["D47B",0x5535],
- ["D47A",0x5536],
- ["ADF2",0x5537],
- ["B0E1",0x5538],
- ["D4A5",0x5539],
- ["D4A8",0x553B],
- ["D473",0x553C],
- ["B3E8",0x553E],
- ["D4A9",0x5540],
- ["B0E7",0x5541],
- ["B0D9",0x5543],
- ["B0D6",0x5544],
- ["D47E",0x5545],
- ["B0D3",0x5546],
- ["D4A6",0x5548],
- ["B0DA",0x554A],
- ["D4AA",0x554B],
- ["D474",0x554D],
- ["D4A4",0x554E],
- ["B0DD",0x554F],
- ["D475",0x5550],
- ["D478",0x5551],
- ["D47D",0x5552],
- ["B0DE",0x5555],
- ["B0DC",0x5556],
- ["B0E8",0x5557],
- ["B0E3",0x555C],
- ["B0D7",0x555E],
- ["B1D2",0x555F],
- ["B0D8",0x5561],
- ["D479",0x5562],
- ["B0E5",0x5563],
- ["B0E0",0x5564],
- ["D4A3",0x5565],
- ["B0D5",0x5566],
- ["B0D4",0x556A],
- ["D471",0x5575],
- ["D472",0x5576],
- ["D86A",0x5577],
- ["B3D7",0x557B],
- ["B3DA",0x557C],
- ["D875",0x557D],
- ["B3EE",0x557E],
- ["D878",0x557F],
- ["B3D8",0x5580],
- ["D871",0x5581],
- ["B3DE",0x5582],
- ["B3E4",0x5583],
- ["B5BD",0x5584],
- ["B3E2",0x5587],
- ["D86E",0x5588],
- ["B3EF",0x5589],
- ["B3DB",0x558A],
- ["B3E3",0x558B],
- ["D876",0x558C],
- ["DCD7",0x558D],
- ["D87B",0x558E],
- ["D86F",0x558F],
- ["D866",0x5591],
- ["D873",0x5592],
- ["D86D",0x5593],
- ["B3E1",0x5594],
- ["D879",0x5595],
- ["B3DD",0x5598],
- ["B3F1",0x5599],
- ["B3EA",0x559A],
- ["B3DF",0x559C],
- ["B3DC",0x559D],
- ["B3E7",0x559F],
- ["D87A",0x55A1],
- ["D86C",0x55A2],
- ["D872",0x55A3],
- ["D874",0x55A4],
- ["D868",0x55A5],
- ["D877",0x55A6],
- ["B3D9",0x55A7],
- ["D867",0x55A8],
- ["B3E0",0x55AA],
- ["B3F0",0x55AB],
- ["B3EC",0x55AC],
- ["D869",0x55AD],
- ["B3E6",0x55AE],
- ["B3ED",0x55B1],
- ["B3E9",0x55B2],
- ["B3E5",0x55B3],
- ["D870",0x55B5],
- ["B3EB",0x55BB],
- ["DCD5",0x55BF],
- ["DCD1",0x55C0],
- ["DCE0",0x55C2],
- ["DCCA",0x55C3],
- ["DCD3",0x55C4],
- ["B6E5",0x55C5],
- ["B6E6",0x55C6],
- ["B6DE",0x55C7],
- ["DCDC",0x55C8],
- ["B6E8",0x55C9],
- ["DCCF",0x55CA],
- ["DCCE",0x55CB],
- ["DCCC",0x55CC],
- ["DCDE",0x55CD],
- ["B6DC",0x55CE],
- ["DCD8",0x55CF],
- ["DCCD",0x55D0],
- ["B6DF",0x55D1],
- ["DCD6",0x55D2],
- ["B6DA",0x55D3],
- ["DCD2",0x55D4],
- ["DCD9",0x55D5],
- ["DCDB",0x55D6],
- ["DCDF",0x55D9],
- ["B6E3",0x55DA],
- ["DCCB",0x55DB],
- ["B6DD",0x55DC],
- ["DCD0",0x55DD],
- ["B6D8",0x55DF],
- ["B6E4",0x55E1],
- ["DCDA",0x55E2],
- ["B6E0",0x55E3],
- ["B6E1",0x55E4],
- ["B6E7",0x55E5],
- ["B6DB",0x55E6],
- ["A25F",0x55E7],
- ["B6D9",0x55E8],
- ["DCD4",0x55E9],
- ["B6E2",0x55EF],
- ["DCDD",0x55F2],
- ["B9CD",0x55F6],
- ["B9C8",0x55F7],
- ["E155",0x55F9],
- ["E151",0x55FA],
- ["E14B",0x55FC],
- ["B9C2",0x55FD],
- ["B9BE",0x55FE],
- ["E154",0x55FF],
- ["B9BF",0x5600],
- ["E14E",0x5601],
- ["E150",0x5602],
- ["E153",0x5604],
- ["B9C4",0x5606],
- ["B9CB",0x5608],
- ["B9C5",0x5609],
- ["E149",0x560C],
- ["B9C6",0x560D],
- ["B9C7",0x560E],
- ["E14C",0x560F],
- ["B9CC",0x5610],
- ["E14A",0x5612],
- ["E14F",0x5613],
- ["B9C3",0x5614],
- ["E148",0x5615],
- ["B9C9",0x5616],
- ["B9C1",0x5617],
- ["B9C0",0x561B],
- ["E14D",0x561C],
- ["E152",0x561D],
- ["B9CA",0x561F],
- ["E147",0x5627],
- ["BC4D",0x5629],
- ["E547",0x562A],
- ["E544",0x562C],
- ["BC47",0x562E],
- ["BC53",0x562F],
- ["BC54",0x5630],
- ["BC4A",0x5632],
- ["E542",0x5633],
- ["BC4C",0x5634],
- ["E4F9",0x5635],
- ["BC52",0x5636],
- ["E546",0x5638],
- ["BC49",0x5639],
- ["E548",0x563A],
- ["BC48",0x563B],
- ["E543",0x563D],
- ["E545",0x563E],
- ["BC4B",0x563F],
- ["E541",0x5640],
- ["E4FA",0x5641],
- ["E4F7",0x5642],
- ["D86B",0x5645],
- ["E4FD",0x5646],
- ["E4F6",0x5648],
- ["E4FC",0x5649],
- ["E4FB",0x564A],
- ["E4F8",0x564C],
- ["BC4F",0x564E],
- ["BC4E",0x5653],
- ["BC50",0x5657],
- ["E4FE",0x5658],
- ["BEB2",0x5659],
- ["E540",0x565A],
- ["E945",0x565E],
- ["E8FD",0x5660],
- ["BEBE",0x5662],
- ["E942",0x5663],
- ["BEB6",0x5664],
- ["BEBA",0x5665],
- ["E941",0x5666],
- ["BEB9",0x5668],
- ["BEB5",0x5669],
- ["BEB8",0x566A],
- ["BEB3",0x566B],
- ["BEBD",0x566C],
- ["E943",0x566D],
- ["E8FE",0x566E],
- ["BEBC",0x566F],
- ["E8FC",0x5670],
- ["BEBB",0x5671],
- ["E944",0x5672],
- ["E940",0x5673],
- ["BC51",0x5674],
- ["BEBF",0x5676],
- ["E946",0x5677],
- ["BEB7",0x5678],
- ["BEB4",0x5679],
- ["ECC6",0x567E],
- ["ECC8",0x567F],
- ["C07B",0x5680],
- ["ECC9",0x5681],
- ["ECC7",0x5682],
- ["ECC5",0x5683],
- ["ECC4",0x5684],
- ["C07D",0x5685],
- ["ECC3",0x5686],
- ["C07E",0x5687],
- ["ECC1",0x568C],
- ["ECC2",0x568D],
- ["C07A",0x568E],
- ["C0A1",0x568F],
- ["C07C",0x5690],
- ["ECC0",0x5693],
- ["C250",0x5695],
- ["EFBC",0x5697],
- ["EFBA",0x5698],
- ["EFBF",0x5699],
- ["EFBD",0x569A],
- ["EFBB",0x569C],
- ["EFBE",0x569D],
- ["C360",0x56A5],
- ["F1F2",0x56A6],
- ["F1F3",0x56A7],
- ["C456",0x56A8],
- ["F1F4",0x56AA],
- ["F1F0",0x56AB],
- ["F1F5",0x56AC],
- ["F1F1",0x56AD],
- ["C251",0x56AE],
- ["F3FE",0x56B2],
- ["F441",0x56B3],
- ["C459",0x56B4],
- ["F440",0x56B5],
- ["C458",0x56B6],
- ["C457",0x56B7],
- ["C45A",0x56BC],
- ["F5C5",0x56BD],
- ["F5C6",0x56BE],
- ["C4DA",0x56C0],
- ["C4D9",0x56C1],
- ["C4DB",0x56C2],
- ["F5C4",0x56C3],
- ["F6D8",0x56C5],
- ["F6D7",0x56C6],
- ["C56D",0x56C8],
- ["C56F",0x56C9],
- ["C56E",0x56CA],
- ["F6D9",0x56CB],
- ["C5C8",0x56CC],
- ["F8A6",0x56CD],
- ["C5F1",0x56D1],
- ["F8A5",0x56D3],
- ["F8EE",0x56D4],
- ["C949",0x56D7],
- ["A57D",0x56DA],
- ["A57C",0x56DB],
- ["A65F",0x56DD],
- ["A65E",0x56DE],
- ["C9C7",0x56DF],
- ["A65D",0x56E0],
- ["C9C6",0x56E1],
- ["A779",0x56E4],
- ["CAA9",0x56E5],
- ["CAA8",0x56E7],
- ["A777",0x56EA],
- ["A77A",0x56EB],
- ["CAA7",0x56EE],
- ["A778",0x56F0],
- ["CBF0",0x56F7],
- ["CBF1",0x56F9],
- ["A954",0x56FA],
- ["ABAA",0x56FF],
- ["D148",0x5701],
- ["D149",0x5702],
- ["AE45",0x5703],
- ["AE46",0x5704],
- ["D4AC",0x5707],
- ["B0E9",0x5708],
- ["B0EB",0x5709],
- ["D4AB",0x570A],
- ["B0EA",0x570B],
- ["D87C",0x570C],
- ["B3F2",0x570D],
- ["B6E9",0x5712],
- ["B6EA",0x5713],
- ["DCE1",0x5714],
- ["B9CF",0x5716],
- ["B9CE",0x5718],
- ["E549",0x571A],
- ["E948",0x571B],
- ["E947",0x571C],
- ["F96B",0x571E],
- ["A467",0x571F],
- ["C959",0x5720],
- ["C96E",0x5722],
- ["C96F",0x5723],
- ["A662",0x5728],
- ["A666",0x5729],
- ["C9C9",0x572A],
- ["A664",0x572C],
- ["A663",0x572D],
- ["C9C8",0x572E],
- ["A665",0x572F],
- ["A661",0x5730],
- ["A660",0x5733],
- ["C9CA",0x5734],
- ["A7A6",0x573B],
- ["A7A3",0x573E],
- ["A77D",0x5740],
- ["CAAA",0x5741],
- ["CAAB",0x5745],
- ["A7A1",0x5747],
- ["CAAD",0x5749],
- ["A77B",0x574A],
- ["CAAE",0x574B],
- ["CAAC",0x574C],
- ["A77E",0x574D],
- ["A7A2",0x574E],
- ["A7A5",0x574F],
- ["A7A4",0x5750],
- ["A77C",0x5751],
- ["CAAF",0x5752],
- ["A959",0x5761],
- ["CBFE",0x5762],
- ["A95B",0x5764],
- ["A95A",0x5766],
- ["CC40",0x5768],
- ["A958",0x5769],
- ["A957",0x576A],
- ["CBF5",0x576B],
- ["CBF4",0x576D],
- ["CBF2",0x576F],
- ["CBF7",0x5770],
- ["CBF6",0x5771],
- ["CBF3",0x5772],
- ["CBFC",0x5773],
- ["CBFD",0x5774],
- ["CBFA",0x5775],
- ["CBF8",0x5776],
- ["A956",0x5777],
- ["CBFB",0x577B],
- ["A95C",0x577C],
- ["CC41",0x577D],
- ["CBF9",0x5780],
- ["ABAB",0x5782],
- ["A955",0x5783],
- ["ABAC",0x578B],
- ["CE54",0x578C],
- ["CE5A",0x578F],
- ["ABB2",0x5793],
- ["CE58",0x5794],
- ["CE5E",0x5795],
- ["CE55",0x5797],
- ["CE59",0x5798],
- ["CE5B",0x5799],
- ["CE5D",0x579A],
- ["CE57",0x579B],
- ["CE56",0x579D],
- ["CE51",0x579E],
- ["CE52",0x579F],
- ["ABAD",0x57A0],
- ["ABAF",0x57A2],
- ["ABAE",0x57A3],
- ["CE53",0x57A4],
- ["CE5C",0x57A5],
- ["ABB1",0x57AE],
- ["CE50",0x57B5],
- ["D153",0x57B6],
- ["D152",0x57B8],
- ["D157",0x57B9],
- ["D14E",0x57BA],
- ["D151",0x57BC],
- ["D150",0x57BD],
- ["D154",0x57BF],
- ["D158",0x57C1],
- ["AE47",0x57C2],
- ["AE4A",0x57C3],
- ["D14F",0x57C6],
- ["D155",0x57C7],
- ["AE49",0x57CB],
- ["D14A",0x57CC],
- ["ABB0",0x57CE],
- ["D4BA",0x57CF],
- ["D156",0x57D0],
- ["D14D",0x57D2],
- ["AE48",0x57D4],
- ["D14C",0x57D5],
- ["D4B1",0x57DC],
- ["B0EC",0x57DF],
- ["B0F0",0x57E0],
- ["D4C1",0x57E1],
- ["D4AF",0x57E2],
- ["D4BD",0x57E3],
- ["B0F1",0x57E4],
- ["D4BF",0x57E5],
- ["D4C5",0x57E7],
- ["D4C9",0x57E9],
- ["D4C0",0x57EC],
- ["D4B4",0x57ED],
- ["D4BC",0x57EE],
- ["D4CA",0x57F0],
- ["D4C8",0x57F1],
- ["D4BE",0x57F2],
- ["D4B9",0x57F3],
- ["D4B2",0x57F4],
- ["D8A6",0x57F5],
- ["D4B0",0x57F6],
- ["B0F5",0x57F7],
- ["D4B7",0x57F8],
- ["B0F6",0x57F9],
- ["B0F2",0x57FA],
- ["D4AD",0x57FB],
- ["D4C3",0x57FC],
- ["D4B5",0x57FD],
- ["D4B3",0x5800],
- ["D4C6",0x5801],
- ["B0F3",0x5802],
- ["D4CC",0x5804],
- ["B0ED",0x5805],
- ["B0EF",0x5806],
- ["D4BB",0x5807],
- ["D4B6",0x5808],
- ["AE4B",0x5809],
- ["B0EE",0x580A],
- ["D4B8",0x580B],
- ["D4C7",0x580C],
- ["D4CB",0x580D],
- ["D4C2",0x580E],
- ["D4C4",0x5810],
- ["D4AE",0x5814],
- ["D8A1",0x5819],
- ["D8AA",0x581B],
- ["D8A9",0x581C],
- ["B3FA",0x581D],
- ["D8A2",0x581E],
- ["B3FB",0x5820],
- ["B3F9",0x5821],
- ["D8A4",0x5823],
- ["B3F6",0x5824],
- ["D8A8",0x5825],
- ["D8A3",0x5827],
- ["D8A5",0x5828],
- ["D87D",0x5829],
- ["B3F4",0x582A],
- ["D8B2",0x582C],
- ["D8B1",0x582D],
- ["D8AE",0x582E],
- ["B3F3",0x582F],
- ["B3F7",0x5830],
- ["B3F8",0x5831],
- ["D14B",0x5832],
- ["D8AB",0x5833],
- ["B3F5",0x5834],
- ["B0F4",0x5835],
- ["D8AD",0x5836],
- ["D87E",0x5837],
- ["D8B0",0x5838],
- ["D8AF",0x5839],
- ["D8B3",0x583B],
- ["DCEF",0x583D],
- ["D8AC",0x583F],
- ["D8A7",0x5848],
- ["DCE7",0x5849],
- ["B6F4",0x584A],
- ["B6F7",0x584B],
- ["B6F2",0x584C],
- ["DCE6",0x584D],
- ["DCEA",0x584E],
- ["DCE5",0x584F],
- ["B6EC",0x5851],
- ["B6F6",0x5852],
- ["DCE2",0x5853],
- ["B6F0",0x5854],
- ["DCE9",0x5855],
- ["B6EE",0x5857],
- ["B6ED",0x5858],
- ["DCEC",0x5859],
- ["B6EF",0x585A],
- ["DCEE",0x585B],
- ["DCEB",0x585D],
- ["B6EB",0x585E],
- ["B6F5",0x5862],
- ["DCF0",0x5863],
- ["DCE4",0x5864],
- ["DCED",0x5865],
- ["DCE3",0x5868],
- ["B6F1",0x586B],
- ["B6F3",0x586D],
- ["DCE8",0x586F],
- ["DCF1",0x5871],
- ["E15D",0x5874],
- ["B9D0",0x5875],
- ["E163",0x5876],
- ["B9D5",0x5879],
- ["E15F",0x587A],
- ["E166",0x587B],
- ["E157",0x587C],
- ["B9D7",0x587D],
- ["B9D1",0x587E],
- ["E15C",0x587F],
- ["BC55",0x5880],
- ["E15B",0x5881],
- ["E164",0x5882],
- ["B9D2",0x5883],
- ["B9D6",0x5885],
- ["E15A",0x5886],
- ["E160",0x5887],
- ["E165",0x5888],
- ["E156",0x5889],
- ["B9D4",0x588A],
- ["E15E",0x588B],
- ["E162",0x588E],
- ["E168",0x588F],
- ["E158",0x5890],
- ["E161",0x5891],
- ["B9D3",0x5893],
- ["E167",0x5894],
- ["E159",0x5898],
- ["BC59",0x589C],
- ["E54B",0x589D],
- ["BC57",0x589E],
- ["BC56",0x589F],
- ["E54D",0x58A0],
- ["E552",0x58A1],
- ["E54E",0x58A3],
- ["E551",0x58A5],
- ["BC5C",0x58A6],
- ["BEA5",0x58A8],
- ["BC5B",0x58A9],
- ["E54A",0x58AB],
- ["E550",0x58AC],
- ["BC5A",0x58AE],
- ["E54F",0x58AF],
- ["E54C",0x58B1],
- ["BC58",0x58B3],
- ["E94D",0x58BA],
- ["E94F",0x58BC],
- ["E94A",0x58BD],
- ["BEC1",0x58BE],
- ["E94C",0x58BF],
- ["BEC0",0x58C1],
- ["E94E",0x58C2],
- ["BEC3",0x58C5],
- ["E950",0x58C6],
- ["BEC2",0x58C7],
- ["E949",0x58C8],
- ["E94B",0x58C9],
- ["C0A5",0x58CE],
- ["ECCC",0x58CF],
- ["C0A4",0x58D1],
- ["ECCD",0x58D2],
- ["C0A3",0x58D3],
- ["ECCB",0x58D4],
- ["C0A2",0x58D5],
- ["ECCA",0x58D6],
- ["C253",0x58D8],
- ["C252",0x58D9],
- ["F1F6",0x58DA],
- ["F1F8",0x58DB],
- ["F1F7",0x58DD],
- ["C361",0x58DE],
- ["C362",0x58DF],
- ["C363",0x58E2],
- ["F442",0x58E3],
- ["C45B",0x58E4],
- ["F7D3",0x58E7],
- ["F7D2",0x58E8],
- ["C5F2",0x58E9],
- ["A468",0x58EB],
- ["A4D0",0x58EC],
- ["A7A7",0x58EF],
- ["CE5F",0x58F4],
- ["B3FC",0x58F9],
- ["B3FD",0x58FA],
- ["DCF2",0x58FC],
- ["B9D8",0x58FD],
- ["E169",0x58FE],
- ["E553",0x58FF],
- ["C95A",0x5903],
- ["CAB0",0x5906],
- ["CC42",0x590C],
- ["CE60",0x590D],
- ["D159",0x590E],
- ["AE4C",0x590F],
- ["F1F9",0x5912],
- ["C4DC",0x5914],
- ["A469",0x5915],
- ["A57E",0x5916],
- ["C970",0x5917],
- ["A667",0x5919],
- ["A668",0x591A],
- ["A95D",0x591C],
- ["B0F7",0x5920],
- ["B9DA",0x5922],
- ["B9DB",0x5924],
- ["B9D9",0x5925],
- ["A46A",0x5927],
- ["A4D1",0x5929],
- ["A4D3",0x592A],
- ["A4D2",0x592B],
- ["C95B",0x592C],
- ["A4D4",0x592D],
- ["A5A1",0x592E],
- ["C971",0x592F],
- ["A5A2",0x5931],
- ["A669",0x5937],
- ["A66A",0x5938],
- ["C9CB",0x593C],
- ["A7A8",0x593E],
- ["CAB1",0x5940],
- ["A961",0x5944],
- ["CC43",0x5945],
- ["A95F",0x5947],
- ["A960",0x5948],
- ["A95E",0x5949],
- ["D15A",0x594A],
- ["ABB6",0x594E],
- ["ABB5",0x594F],
- ["ABB7",0x5950],
- ["ABB4",0x5951],
- ["CE61",0x5953],
- ["A962",0x5954],
- ["ABB3",0x5955],
- ["AE4D",0x5957],
- ["AE4E",0x5958],
- ["AE4F",0x595A],
- ["D4CD",0x595C],
- ["B3FE",0x5960],
- ["D8B4",0x5961],
- ["B0F8",0x5962],
- ["B6F8",0x5967],
- ["B9DD",0x5969],
- ["B9DC",0x596A],
- ["E16A",0x596B],
- ["BC5D",0x596D],
- ["BEC4",0x596E],
- ["EFC0",0x5970],
- ["F6DA",0x5971],
- ["F7D4",0x5972],
- ["A46B",0x5973],
- ["A5A3",0x5974],
- ["A5A4",0x5976],
- ["C9D1",0x5977],
- ["A66C",0x5978],
- ["A66F",0x5979],
- ["C9CF",0x597B],
- ["C9CD",0x597C],
- ["A66E",0x597D],
- ["C9D0",0x597E],
- ["C9D2",0x597F],
- ["C9CC",0x5980],
- ["A671",0x5981],
- ["A670",0x5982],
- ["A66D",0x5983],
- ["A66B",0x5984],
- ["C9CE",0x5985],
- ["A7B3",0x598A],
- ["A7B0",0x598D],
- ["CAB6",0x598E],
- ["CAB9",0x598F],
- ["CAB8",0x5990],
- ["A7AA",0x5992],
- ["A7B2",0x5993],
- ["A7AF",0x5996],
- ["CAB5",0x5997],
- ["CAB3",0x5998],
- ["A7AE",0x5999],
- ["A7A9",0x599D],
- ["A7AC",0x599E],
- ["CAB4",0x59A0],
- ["CABB",0x59A1],
- ["CAB7",0x59A2],
- ["A7AD",0x59A3],
- ["A7B1",0x59A4],
- ["A7B4",0x59A5],
- ["CAB2",0x59A6],
- ["CABA",0x59A7],
- ["A7AB",0x59A8],
- ["A967",0x59AE],
- ["A96F",0x59AF],
- ["CC4F",0x59B1],
- ["CC48",0x59B2],
- ["A970",0x59B3],
- ["CC53",0x59B4],
- ["CC44",0x59B5],
- ["CC4B",0x59B6],
- ["A966",0x59B9],
- ["CC45",0x59BA],
- ["A964",0x59BB],
- ["CC4C",0x59BC],
- ["CC50",0x59BD],
- ["A963",0x59BE],
- ["CC51",0x59C0],
- ["CC4A",0x59C1],
- ["CC4D",0x59C3],
- ["A972",0x59C5],
- ["A969",0x59C6],
- ["CC54",0x59C7],
- ["CC52",0x59C8],
- ["A96E",0x59CA],
- ["A96C",0x59CB],
- ["CC49",0x59CC],
- ["A96B",0x59CD],
- ["CC47",0x59CE],
- ["CC46",0x59CF],
- ["A96A",0x59D0],
- ["A968",0x59D1],
- ["A971",0x59D2],
- ["A96D",0x59D3],
- ["A965",0x59D4],
- ["CC4E",0x59D6],
- ["ABB9",0x59D8],
- ["ABC0",0x59DA],
- ["CE6F",0x59DB],
- ["ABB8",0x59DC],
- ["CE67",0x59DD],
- ["CE63",0x59DE],
- ["CE73",0x59E0],
- ["CE62",0x59E1],
- ["ABBB",0x59E3],
- ["CE6C",0x59E4],
- ["ABBE",0x59E5],
- ["ABC1",0x59E6],
- ["ABBC",0x59E8],
- ["CE70",0x59E9],
- ["ABBF",0x59EA],
- ["AE56",0x59EC],
- ["CE76",0x59ED],
- ["CE64",0x59EE],
- ["CE66",0x59F1],
- ["CE6D",0x59F2],
- ["CE71",0x59F3],
- ["CE75",0x59F4],
- ["CE72",0x59F5],
- ["CE6B",0x59F6],
- ["CE6E",0x59F7],
- ["CE68",0x59FA],
- ["ABC3",0x59FB],
- ["CE6A",0x59FC],
- ["CE69",0x59FD],
- ["CE74",0x59FE],
- ["ABBA",0x59FF],
- ["CE65",0x5A00],
- ["ABC2",0x5A01],
- ["ABBD",0x5A03],
- ["AE5C",0x5A09],
- ["D162",0x5A0A],
- ["AE5B",0x5A0C],
- ["D160",0x5A0F],
- ["AE50",0x5A11],
- ["AE55",0x5A13],
- ["D15F",0x5A15],
- ["D15C",0x5A16],
- ["D161",0x5A17],
- ["AE51",0x5A18],
- ["D15B",0x5A19],
- ["AE54",0x5A1B],
- ["AE52",0x5A1C],
- ["D163",0x5A1E],
- ["AE53",0x5A1F],
- ["AE57",0x5A20],
- ["AE58",0x5A23],
- ["AE5A",0x5A25],
- ["AE59",0x5A29],
- ["D15D",0x5A2D],
- ["D15E",0x5A2E],
- ["D164",0x5A33],
- ["D4D4",0x5A35],
- ["B0F9",0x5A36],
- ["D8C2",0x5A37],
- ["D4D3",0x5A38],
- ["D4E6",0x5A39],
- ["B140",0x5A3C],
- ["D4E4",0x5A3E],
- ["B0FE",0x5A40],
- ["B0FA",0x5A41],
- ["D4ED",0x5A42],
- ["D4DD",0x5A43],
- ["D4E0",0x5A44],
- ["B143",0x5A46],
- ["D4EA",0x5A47],
- ["D4E2",0x5A48],
- ["B0FB",0x5A49],
- ["B144",0x5A4A],
- ["D4E7",0x5A4C],
- ["D4E5",0x5A4D],
- ["D4D6",0x5A50],
- ["D4EB",0x5A51],
- ["D4DF",0x5A52],
- ["D4DA",0x5A53],
- ["D4D0",0x5A55],
- ["D4EC",0x5A56],
- ["D4DC",0x5A57],
- ["D4CF",0x5A58],
- ["B142",0x5A5A],
- ["D4E1",0x5A5B],
- ["D4EE",0x5A5C],
- ["D4DE",0x5A5D],
- ["D4D2",0x5A5E],
- ["D4D7",0x5A5F],
- ["D4CE",0x5A60],
- ["B141",0x5A62],
- ["D4DB",0x5A64],
- ["D4D8",0x5A65],
- ["B0FC",0x5A66],
- ["D4D1",0x5A67],
- ["D4E9",0x5A69],
- ["B0FD",0x5A6A],
- ["D4D9",0x5A6C],
- ["D4D5",0x5A6D],
- ["D4E8",0x5A70],
- ["B440",0x5A77],
- ["D8BB",0x5A78],
- ["D8B8",0x5A7A],
- ["D8C9",0x5A7B],
- ["D8BD",0x5A7C],
- ["D8CA",0x5A7D],
- ["B442",0x5A7F],
- ["D8C6",0x5A83],
- ["D8C3",0x5A84],
- ["D8C4",0x5A8A],
- ["D8C7",0x5A8B],
- ["D8CB",0x5A8C],
- ["D4E3",0x5A8E],
- ["D8CD",0x5A8F],
- ["DD47",0x5A90],
- ["B443",0x5A92],
- ["D8CE",0x5A93],
- ["D8B6",0x5A94],
- ["D8C0",0x5A95],
- ["D8C5",0x5A97],
- ["B441",0x5A9A],
- ["B444",0x5A9B],
- ["D8CC",0x5A9C],
- ["D8CF",0x5A9D],
- ["D8BA",0x5A9E],
- ["D8B7",0x5A9F],
- ["D8B9",0x5AA2],
- ["D8BE",0x5AA5],
- ["D8BC",0x5AA6],
- ["B445",0x5AA7],
- ["D8C8",0x5AA9],
- ["D8BF",0x5AAC],
- ["D8C1",0x5AAE],
- ["D8B5",0x5AAF],
- ["DCFA",0x5AB0],
- ["DCF8",0x5AB1],
- ["B742",0x5AB2],
- ["B740",0x5AB3],
- ["DD43",0x5AB4],
- ["DCF9",0x5AB5],
- ["DD44",0x5AB6],
- ["DD40",0x5AB7],
- ["DCF7",0x5AB8],
- ["DD46",0x5AB9],
- ["DCF6",0x5ABA],
- ["DCFD",0x5ABB],
- ["B6FE",0x5ABC],
- ["B6FD",0x5ABD],
- ["B6FC",0x5ABE],
- ["DCFB",0x5ABF],
- ["DD41",0x5AC0],
- ["B6F9",0x5AC1],
- ["B741",0x5AC2],
- ["DCF4",0x5AC4],
- ["DCFE",0x5AC6],
- ["DCF3",0x5AC7],
- ["DCFC",0x5AC8],
- ["B6FA",0x5AC9],
- ["DD42",0x5ACA],
- ["DCF5",0x5ACB],
- ["B6FB",0x5ACC],
- ["DD45",0x5ACD],
- ["E16E",0x5AD5],
- ["B9E2",0x5AD6],
- ["B9E1",0x5AD7],
- ["B9E3",0x5AD8],
- ["E17A",0x5AD9],
- ["E170",0x5ADA],
- ["E176",0x5ADB],
- ["E16B",0x5ADC],
- ["E179",0x5ADD],
- ["E178",0x5ADE],
- ["E17C",0x5ADF],
- ["E175",0x5AE0],
- ["B9DE",0x5AE1],
- ["E174",0x5AE2],
- ["B9E4",0x5AE3],
- ["E16D",0x5AE5],
- ["B9DF",0x5AE6],
- ["E17B",0x5AE8],
- ["B9E0",0x5AE9],
- ["E16F",0x5AEA],
- ["E172",0x5AEB],
- ["E177",0x5AEC],
- ["E171",0x5AED],
- ["E16C",0x5AEE],
- ["E173",0x5AF3],
- ["E555",0x5AF4],
- ["BC61",0x5AF5],
- ["E558",0x5AF6],
- ["E557",0x5AF7],
- ["E55A",0x5AF8],
- ["E55C",0x5AF9],
- ["BC5F",0x5AFB],
- ["E556",0x5AFD],
- ["E554",0x5AFF],
- ["E55D",0x5B01],
- ["E55B",0x5B02],
- ["E559",0x5B03],
- ["E55F",0x5B05],
- ["E55E",0x5B07],
- ["BC63",0x5B08],
- ["BC5E",0x5B09],
- ["BC60",0x5B0B],
- ["BC62",0x5B0C],
- ["E560",0x5B0F],
- ["E957",0x5B10],
- ["E956",0x5B13],
- ["E955",0x5B14],
- ["E958",0x5B16],
- ["E951",0x5B17],
- ["E952",0x5B19],
- ["E95A",0x5B1A],
- ["E953",0x5B1B],
- ["BEC5",0x5B1D],
- ["E95C",0x5B1E],
- ["E95B",0x5B20],
- ["E954",0x5B21],
- ["ECD1",0x5B23],
- ["C0A8",0x5B24],
- ["ECCF",0x5B25],
- ["ECD4",0x5B26],
- ["ECD3",0x5B27],
- ["E959",0x5B28],
- ["C0A7",0x5B2A],
- ["ECD2",0x5B2C],
- ["ECCE",0x5B2D],
- ["ECD6",0x5B2E],
- ["ECD5",0x5B2F],
- ["C0A6",0x5B30],
- ["ECD0",0x5B32],
- ["BEC6",0x5B34],
- ["C254",0x5B38],
- ["EFC1",0x5B3C],
- ["F1FA",0x5B3D],
- ["F1FB",0x5B3E],
- ["F1FC",0x5B3F],
- ["C45C",0x5B40],
- ["C45D",0x5B43],
- ["F443",0x5B45],
- ["F5C8",0x5B47],
- ["F5C7",0x5B48],
- ["F6DB",0x5B4B],
- ["F6DC",0x5B4C],
- ["F7D5",0x5B4D],
- ["F8A7",0x5B4E],
- ["A46C",0x5B50],
- ["A46D",0x5B51],
- ["A46E",0x5B53],
- ["A4D5",0x5B54],
- ["A5A5",0x5B55],
- ["C9D3",0x5B56],
- ["A672",0x5B57],
- ["A673",0x5B58],
- ["A7B7",0x5B5A],
- ["A7B8",0x5B5B],
- ["A7B6",0x5B5C],
- ["A7B5",0x5B5D],
- ["A973",0x5B5F],
- ["CC55",0x5B62],
- ["A975",0x5B63],
- ["A974",0x5B64],
- ["CC56",0x5B65],
- ["ABC4",0x5B69],
- ["AE5D",0x5B6B],
- ["D165",0x5B6C],
- ["D4F0",0x5B6E],
- ["B145",0x5B70],
- ["B447",0x5B71],
- ["D4EF",0x5B72],
- ["B446",0x5B73],
- ["B9E5",0x5B75],
- ["E17D",0x5B77],
- ["BEC7",0x5B78],
- ["C0A9",0x5B7A],
- ["ECD7",0x5B7B],
- ["C45E",0x5B7D],
- ["C570",0x5B7F],
- ["C972",0x5B81],
- ["A5A6",0x5B83],
- ["C973",0x5B84],
- ["A676",0x5B85],
- ["A674",0x5B87],
- ["A675",0x5B88],
- ["A677",0x5B89],
- ["A7BA",0x5B8B],
- ["A7B9",0x5B8C],
- ["CABC",0x5B8E],
- ["A7BB",0x5B8F],
- ["CABD",0x5B92],
- ["CC57",0x5B93],
- ["CC58",0x5B95],
- ["A976",0x5B97],
- ["A978",0x5B98],
- ["A97A",0x5B99],
- ["A977",0x5B9A],
- ["A97B",0x5B9B],
- ["A979",0x5B9C],
- ["ABC8",0x5BA2],
- ["ABC5",0x5BA3],
- ["ABC7",0x5BA4],
- ["ABC9",0x5BA5],
- ["ABC6",0x5BA6],
- ["D166",0x5BA7],
- ["CE77",0x5BA8],
- ["D168",0x5BAC],
- ["D167",0x5BAD],
- ["AE63",0x5BAE],
- ["AE5F",0x5BB0],
- ["AE60",0x5BB3],
- ["AE62",0x5BB4],
- ["AE64",0x5BB5],
- ["AE61",0x5BB6],
- ["AE66",0x5BB8],
- ["AE65",0x5BB9],
- ["B14A",0x5BBF],
- ["D4F2",0x5BC0],
- ["D4F1",0x5BC1],
- ["B149",0x5BC2],
- ["B148",0x5BC4],
- ["B147",0x5BC5],
- ["B14B",0x5BC6],
- ["B146",0x5BC7],
- ["D8D5",0x5BCA],
- ["D8D2",0x5BCB],
- ["B449",0x5BCC],
- ["D8D1",0x5BCD],
- ["D8D6",0x5BCE],
- ["B44B",0x5BD0],
- ["D8D4",0x5BD1],
- ["B448",0x5BD2],
- ["B44A",0x5BD3],
- ["D8D3",0x5BD4],
- ["DD48",0x5BD6],
- ["DD49",0x5BD8],
- ["DD4A",0x5BD9],
- ["B9E6",0x5BDE],
- ["B9EE",0x5BDF],
- ["E17E",0x5BE0],
- ["B9E8",0x5BE1],
- ["B9EC",0x5BE2],
- ["E1A1",0x5BE3],
- ["B9ED",0x5BE4],
- ["B9E9",0x5BE5],
- ["B9EA",0x5BE6],
- ["B9E7",0x5BE7],
- ["B9EB",0x5BE8],
- ["BC66",0x5BE9],
- ["D8D0",0x5BEA],
- ["BC67",0x5BEB],
- ["BC65",0x5BEC],
- ["BC64",0x5BEE],
- ["E95D",0x5BEF],
- ["BEC8",0x5BF0],
- ["ECD8",0x5BF1],
- ["ECD9",0x5BF2],
- ["C364",0x5BF5],
- ["C45F",0x5BF6],
- ["A46F",0x5BF8],
- ["A678",0x5BFA],
- ["ABCA",0x5C01],
- ["D169",0x5C03],
- ["AE67",0x5C04],
- ["B14E",0x5C07],
- ["B14D",0x5C08],
- ["B14C",0x5C09],
- ["B44C",0x5C0A],
- ["B44D",0x5C0B],
- ["D8D7",0x5C0C],
- ["B9EF",0x5C0D],
- ["BEC9",0x5C0E],
- ["A470",0x5C0F],
- ["C95C",0x5C10],
- ["A4D6",0x5C11],
- ["C974",0x5C12],
- ["C9D4",0x5C15],
- ["A679",0x5C16],
- ["A97C",0x5C1A],
- ["DD4B",0x5C1F],
- ["A471",0x5C22],
- ["A4D7",0x5C24],
- ["C9D5",0x5C25],
- ["CABE",0x5C28],
- ["CABF",0x5C2A],
- ["A7BC",0x5C2C],
- ["D8D8",0x5C30],
- ["B44E",0x5C31],
- ["DD4C",0x5C33],
- ["C0AA",0x5C37],
- ["A472",0x5C38],
- ["A4A8",0x5C39],
- ["A4D8",0x5C3A],
- ["C975",0x5C3B],
- ["A5A7",0x5C3C],
- ["A7C0",0x5C3E],
- ["A7BF",0x5C3F],
- ["A7BD",0x5C40],
- ["A7BE",0x5C41],
- ["CC59",0x5C44],
- ["A97E",0x5C45],
- ["A9A1",0x5C46],
- ["CC5A",0x5C47],
- ["A97D",0x5C48],
- ["ABCE",0x5C4B],
- ["CE78",0x5C4C],
- ["ABCD",0x5C4D],
- ["ABCB",0x5C4E],
- ["ABCC",0x5C4F],
- ["AE6A",0x5C50],
- ["AE68",0x5C51],
- ["D16B",0x5C54],
- ["AE69",0x5C55],
- ["D16A",0x5C56],
- ["AE5E",0x5C58],
- ["D4F3",0x5C59],
- ["B150",0x5C5C],
- ["B151",0x5C5D],
- ["B14F",0x5C60],
- ["B9F0",0x5C62],
- ["E1A2",0x5C63],
- ["BC68",0x5C64],
- ["BC69",0x5C65],
- ["E561",0x5C67],
- ["C0AB",0x5C68],
- ["EFC2",0x5C69],
- ["EFC3",0x5C6A],
- ["C4DD",0x5C6C],
- ["F8A8",0x5C6D],
- ["C94B",0x5C6E],
- ["A4D9",0x5C6F],
- ["A473",0x5C71],
- ["C977",0x5C73],
- ["C976",0x5C74],
- ["A67A",0x5C79],
- ["C9D7",0x5C7A],
- ["C9D8",0x5C7B],
- ["C9D6",0x5C7C],
- ["C9D9",0x5C7E],
- ["CAC7",0x5C86],
- ["CAC2",0x5C88],
- ["CAC4",0x5C89],
- ["CAC6",0x5C8A],
- ["CAC3",0x5C8B],
- ["A7C4",0x5C8C],
- ["CAC0",0x5C8D],
- ["CAC1",0x5C8F],
- ["A7C1",0x5C90],
- ["A7C2",0x5C91],
- ["CAC5",0x5C92],
- ["CAC8",0x5C93],
- ["A7C3",0x5C94],
- ["CAC9",0x5C95],
- ["CC68",0x5C9D],
- ["CC62",0x5C9F],
- ["CC5D",0x5CA0],
- ["A9A3",0x5CA1],
- ["CC65",0x5CA2],
- ["CC63",0x5CA3],
- ["CC5C",0x5CA4],
- ["CC69",0x5CA5],
- ["CC6C",0x5CA6],
- ["CC67",0x5CA7],
- ["CC60",0x5CA8],
- ["A9A5",0x5CA9],
- ["CC66",0x5CAA],
- ["A9A6",0x5CAB],
- ["CC61",0x5CAC],
- ["CC64",0x5CAD],
- ["CC5B",0x5CAE],
- ["CC5F",0x5CAF],
- ["CC6B",0x5CB0],
- ["A9A7",0x5CB1],
- ["A9A8",0x5CB3],
- ["CC5E",0x5CB5],
- ["CC6A",0x5CB6],
- ["A9A2",0x5CB7],
- ["A9A4",0x5CB8],
- ["CEAB",0x5CC6],
- ["CEA4",0x5CC7],
- ["CEAA",0x5CC8],
- ["CEA3",0x5CC9],
- ["CEA5",0x5CCA],
- ["CE7D",0x5CCB],
- ["CE7B",0x5CCC],
- ["CEAC",0x5CCE],
- ["CEA9",0x5CCF],
- ["CE79",0x5CD0],
- ["ABD0",0x5CD2],
- ["CEA7",0x5CD3],
- ["CEA8",0x5CD4],
- ["CEA6",0x5CD6],
- ["CE7C",0x5CD7],
- ["CE7A",0x5CD8],
- ["ABCF",0x5CD9],
- ["CEA2",0x5CDA],
- ["CE7E",0x5CDB],
- ["CEA1",0x5CDE],
- ["CEAD",0x5CDF],
- ["AE6F",0x5CE8],
- ["AE6E",0x5CEA],
- ["D16C",0x5CEC],
- ["AE6B",0x5CED],
- ["D16E",0x5CEE],
- ["AE70",0x5CF0],
- ["D16F",0x5CF1],
- ["AE73",0x5CF4],
- ["AE71",0x5CF6],
- ["D170",0x5CF7],
- ["CEAE",0x5CF8],
- ["D172",0x5CF9],
- ["AE6D",0x5CFB],
- ["AE6C",0x5CFD],
- ["D16D",0x5CFF],
- ["D171",0x5D00],
- ["AE72",0x5D01],
- ["B153",0x5D06],
- ["B152",0x5D07],
- ["D4F5",0x5D0B],
- ["D4F9",0x5D0C],
- ["D4FB",0x5D0D],
- ["B154",0x5D0E],
- ["D4FE",0x5D0F],
- ["B158",0x5D11],
- ["D541",0x5D12],
- ["B15A",0x5D14],
- ["B156",0x5D16],
- ["B15E",0x5D17],
- ["B15B",0x5D19],
- ["D4F7",0x5D1A],
- ["B155",0x5D1B],
- ["D4F6",0x5D1D],
- ["D4F4",0x5D1E],
- ["D543",0x5D1F],
- ["D4F8",0x5D20],
- ["B157",0x5D22],
- ["D542",0x5D23],
- ["B15C",0x5D24],
- ["D4FD",0x5D25],
- ["D4FC",0x5D26],
- ["B15D",0x5D27],
- ["D4FA",0x5D28],
- ["B159",0x5D29],
- ["D544",0x5D2E],
- ["D540",0x5D30],
- ["D8E7",0x5D31],
- ["D8EE",0x5D32],
- ["D8E3",0x5D33],
- ["B451",0x5D34],
- ["D8DF",0x5D35],
- ["D8EF",0x5D36],
- ["D8D9",0x5D37],
- ["D8EC",0x5D38],
- ["D8EA",0x5D39],
- ["D8E4",0x5D3A],
- ["D8ED",0x5D3C],
- ["D8E6",0x5D3D],
- ["D8DE",0x5D3F],
- ["D8F0",0x5D40],
- ["D8DC",0x5D41],
- ["D8E9",0x5D42],
- ["D8DA",0x5D43],
- ["D8F1",0x5D45],
- ["B452",0x5D47],
- ["D8EB",0x5D49],
- ["DD4F",0x5D4A],
- ["D8DD",0x5D4B],
- ["B44F",0x5D4C],
- ["D8E1",0x5D4E],
- ["B450",0x5D50],
- ["D8E0",0x5D51],
- ["D8E5",0x5D52],
- ["D8E2",0x5D55],
- ["D8E8",0x5D59],
- ["DD53",0x5D5E],
- ["DD56",0x5D62],
- ["DD4E",0x5D63],
- ["DD50",0x5D65],
- ["DD55",0x5D67],
- ["DD54",0x5D68],
- ["B743",0x5D69],
- ["D8DB",0x5D6B],
- ["DD52",0x5D6C],
- ["B744",0x5D6F],
- ["DD4D",0x5D71],
- ["DD51",0x5D72],
- ["E1A9",0x5D77],
- ["E1B0",0x5D79],
- ["E1A7",0x5D7A],
- ["E1AE",0x5D7C],
- ["E1A5",0x5D7D],
- ["E1AD",0x5D7E],
- ["E1B1",0x5D7F],
- ["E1A4",0x5D80],
- ["E1A8",0x5D81],
- ["E1A3",0x5D82],
- ["B9F1",0x5D84],
- ["E1A6",0x5D86],
- ["B9F2",0x5D87],
- ["E1AC",0x5D88],
- ["E1AB",0x5D89],
- ["E1AA",0x5D8A],
- ["E1AF",0x5D8D],
- ["E565",0x5D92],
- ["E567",0x5D93],
- ["BC6B",0x5D94],
- ["E568",0x5D95],
- ["E563",0x5D97],
- ["E562",0x5D99],
- ["E56C",0x5D9A],
- ["E56A",0x5D9C],
- ["BC6A",0x5D9D],
- ["E56D",0x5D9E],
- ["E564",0x5D9F],
- ["E569",0x5DA0],
- ["E56B",0x5DA1],
- ["E566",0x5DA2],
- ["E961",0x5DA7],
- ["E966",0x5DA8],
- ["E960",0x5DA9],
- ["E965",0x5DAA],
- ["E95E",0x5DAC],
- ["E968",0x5DAD],
- ["E964",0x5DAE],
- ["E969",0x5DAF],
- ["E963",0x5DB0],
- ["E95F",0x5DB1],
- ["E967",0x5DB2],
- ["E96A",0x5DB4],
- ["E962",0x5DB5],
- ["ECDA",0x5DB7],
- ["C0AF",0x5DB8],
- ["C0AD",0x5DBA],
- ["C0AC",0x5DBC],
- ["C0AE",0x5DBD],
- ["EFC4",0x5DC0],
- ["F172",0x5DC2],
- ["F1FD",0x5DC3],
- ["F444",0x5DC6],
- ["F445",0x5DC7],
- ["C460",0x5DC9],
- ["F5C9",0x5DCB],
- ["C4DE",0x5DCD],
- ["F5CA",0x5DCF],
- ["F6DE",0x5DD1],
- ["C572",0x5DD2],
- ["C571",0x5DD4],
- ["F6DD",0x5DD5],
- ["C5C9",0x5DD6],
- ["F7D6",0x5DD8],
- ["A474",0x5DDD],
- ["A67B",0x5DDE],
- ["C9DA",0x5DDF],
- ["CACA",0x5DE0],
- ["A8B5",0x5DE1],
- ["B15F",0x5DE2],
- ["A475",0x5DE5],
- ["A5AA",0x5DE6],
- ["A5A9",0x5DE7],
- ["A5A8",0x5DE8],
- ["A7C5",0x5DEB],
- ["AE74",0x5DEE],
- ["DD57",0x5DF0],
- ["A476",0x5DF1],
- ["A477",0x5DF2],
- ["A478",0x5DF3],
- ["A4DA",0x5DF4],
- ["ABD1",0x5DF7],
- ["CEAF",0x5DF9],
- ["B453",0x5DFD],
- ["A479",0x5DFE],
- ["C95D",0x5DFF],
- ["A5AB",0x5E02],
- ["A5AC",0x5E03],
- ["C978",0x5E04],
- ["A67C",0x5E06],
- ["CACB",0x5E0A],
- ["A7C6",0x5E0C],
- ["CACC",0x5E0E],
- ["A9AE",0x5E11],
- ["CC6E",0x5E14],
- ["A9AC",0x5E15],
- ["A9AB",0x5E16],
- ["CC6D",0x5E17],
- ["A9A9",0x5E18],
- ["CC6F",0x5E19],
- ["A9AA",0x5E1A],
- ["A9AD",0x5E1B],
- ["ABD2",0x5E1D],
- ["ABD4",0x5E1F],
- ["CEB3",0x5E20],
- ["CEB0",0x5E21],
- ["CEB1",0x5E22],
- ["CEB2",0x5E23],
- ["CEB4",0x5E24],
- ["ABD3",0x5E25],
- ["D174",0x5E28],
- ["D173",0x5E29],
- ["AE76",0x5E2B],
- ["AE75",0x5E2D],
- ["B162",0x5E33],
- ["D546",0x5E34],
- ["B161",0x5E36],
- ["B163",0x5E37],
- ["B160",0x5E38],
- ["B455",0x5E3D],
- ["D545",0x5E3E],
- ["B456",0x5E40],
- ["D8F3",0x5E41],
- ["B457",0x5E43],
- ["D8F2",0x5E44],
- ["B454",0x5E45],
- ["DD5A",0x5E4A],
- ["DD5C",0x5E4B],
- ["B745",0x5E4C],
- ["DD5B",0x5E4D],
- ["DD59",0x5E4E],
- ["DD58",0x5E4F],
- ["E1B4",0x5E53],
- ["B9F7",0x5E54],
- ["B9F5",0x5E55],
- ["B9F6",0x5E57],
- ["E1B2",0x5E58],
- ["E1B3",0x5E59],
- ["B9F3",0x5E5B],
- ["E571",0x5E5C],
- ["E56F",0x5E5D],
- ["BC6D",0x5E5F],
- ["E570",0x5E60],
- ["BC6E",0x5E61],
- ["BC6C",0x5E62],
- ["B9F4",0x5E63],
- ["E96D",0x5E66],
- ["E96B",0x5E67],
- ["E96C",0x5E68],
- ["E56E",0x5E69],
- ["ECDC",0x5E6A],
- ["C0B0",0x5E6B],
- ["ECDB",0x5E6C],
- ["EFC5",0x5E6D],
- ["EFC6",0x5E6E],
- ["E96E",0x5E6F],
- ["F1FE",0x5E70],
- ["A47A",0x5E72],
- ["A5AD",0x5E73],
- ["A67E",0x5E74],
- ["C9DB",0x5E75],
- ["A67D",0x5E76],
- ["A9AF",0x5E78],
- ["B746",0x5E79],
- ["A4DB",0x5E7B],
- ["A5AE",0x5E7C],
- ["ABD5",0x5E7D],
- ["B458",0x5E7E],
- ["C979",0x5E80],
- ["C97A",0x5E82],
- ["C9DC",0x5E84],
- ["A7C8",0x5E87],
- ["CAD0",0x5E88],
- ["CACE",0x5E89],
- ["A7C9",0x5E8A],
- ["CACD",0x5E8B],
- ["CACF",0x5E8C],
- ["CAD1",0x5E8D],
- ["A7C7",0x5E8F],
- ["A9B3",0x5E95],
- ["A9B4",0x5E96],
- ["A9B1",0x5E97],
- ["A9B0",0x5E9A],
- ["CEB8",0x5E9B],
- ["A9B2",0x5E9C],
- ["ABD6",0x5EA0],
- ["CEB7",0x5EA2],
- ["CEB9",0x5EA3],
- ["CEB6",0x5EA4],
- ["CEBA",0x5EA5],
- ["ABD7",0x5EA6],
- ["AE79",0x5EA7],
- ["D175",0x5EA8],
- ["D177",0x5EAA],
- ["AE77",0x5EAB],
- ["D178",0x5EAC],
- ["AE78",0x5EAD],
- ["D176",0x5EAE],
- ["CEB5",0x5EB0],
- ["D547",0x5EB1],
- ["D54A",0x5EB2],
- ["D54B",0x5EB3],
- ["D548",0x5EB4],
- ["B167",0x5EB5],
- ["B166",0x5EB6],
- ["B164",0x5EB7],
- ["B165",0x5EB8],
- ["D549",0x5EB9],
- ["B168",0x5EBE],
- ["B45A",0x5EC1],
- ["B45B",0x5EC2],
- ["B45C",0x5EC4],
- ["DD5D",0x5EC5],
- ["DD5F",0x5EC6],
- ["DD61",0x5EC7],
- ["B748",0x5EC8],
- ["B747",0x5EC9],
- ["B459",0x5ECA],
- ["DD60",0x5ECB],
- ["DD5E",0x5ECC],
- ["E1B8",0x5ECE],
- ["E1B6",0x5ED1],
- ["E1BC",0x5ED2],
- ["B9F8",0x5ED3],
- ["E1BD",0x5ED4],
- ["E1BA",0x5ED5],
- ["B9F9",0x5ED6],
- ["E1B7",0x5ED7],
- ["E1B5",0x5ED8],
- ["E1BB",0x5ED9],
- ["BC70",0x5EDA],
- ["E573",0x5EDB],
- ["E1B9",0x5EDC],
- ["BC72",0x5EDD],
- ["E574",0x5EDE],
- ["BC71",0x5EDF],
- ["BC74",0x5EE0],
- ["E575",0x5EE1],
- ["BC6F",0x5EE2],
- ["BC73",0x5EE3],
- ["E973",0x5EE5],
- ["E971",0x5EE6],
- ["E970",0x5EE7],
- ["E972",0x5EE8],
- ["E96F",0x5EE9],
- ["C366",0x5EEC],
- ["F446",0x5EEE],
- ["F447",0x5EEF],
- ["F5CB",0x5EF1],
- ["F6DF",0x5EF2],
- ["C655",0x5EF3],
- ["A9B5",0x5EF6],
- ["A7CA",0x5EF7],
- ["ABD8",0x5EFA],
- ["A47B",0x5EFE],
- ["A4DC",0x5EFF],
- ["A5AF",0x5F01],
- ["C9DD",0x5F02],
- ["A7CB",0x5F04],
- ["CAD2",0x5F05],
- ["CEBB",0x5F07],
- ["ABD9",0x5F08],
- ["B9FA",0x5F0A],
- ["A47C",0x5F0B],
- ["A6A1",0x5F0F],
- ["B749",0x5F12],
- ["A47D",0x5F13],
- ["A4DD",0x5F14],
- ["A4DE",0x5F15],
- ["A5B1",0x5F17],
- ["A5B0",0x5F18],
- ["C9DE",0x5F1A],
- ["A6A2",0x5F1B],
- ["CAD3",0x5F1D],
- ["A7CC",0x5F1F],
- ["CC71",0x5F22],
- ["CC72",0x5F23],
- ["CC73",0x5F24],
- ["A9B6",0x5F26],
- ["A9B7",0x5F27],
- ["CC70",0x5F28],
- ["A9B8",0x5F29],
- ["ABDA",0x5F2D],
- ["CEBC",0x5F2E],
- ["D17A",0x5F30],
- ["AE7A",0x5F31],
- ["D179",0x5F33],
- ["B169",0x5F35],
- ["D54C",0x5F36],
- ["B16A",0x5F37],
- ["D54D",0x5F38],
- ["B45D",0x5F3C],
- ["DD62",0x5F40],
- ["E1BF",0x5F43],
- ["E1BE",0x5F44],
- ["B9FB",0x5F46],
- ["BC75",0x5F48],
- ["E576",0x5F49],
- ["BECA",0x5F4A],
- ["E974",0x5F4B],
- ["C0B1",0x5F4C],
- ["C573",0x5F4E],
- ["F7D8",0x5F4F],
- ["CC74",0x5F54],
- ["CEBD",0x5F56],
- ["B16B",0x5F57],
- ["D8F4",0x5F58],
- ["B74A",0x5F59],
- ["C255",0x5F5D],
- ["A7CE",0x5F62],
- ["A7CD",0x5F64],
- ["ABDB",0x5F65],
- ["D17B",0x5F67],
- ["B16D",0x5F69],
- ["B343",0x5F6A],
- ["B16E",0x5F6B],
- ["B16C",0x5F6C],
- ["B45E",0x5F6D],
- ["E1C0",0x5F6F],
- ["B9FC",0x5F70],
- ["BC76",0x5F71],
- ["C94C",0x5F73],
- ["C9DF",0x5F74],
- ["CAD5",0x5F76],
- ["A7CF",0x5F77],
- ["CAD4",0x5F78],
- ["A7D0",0x5F79],
- ["A9BC",0x5F7C],
- ["CC77",0x5F7D],
- ["CC76",0x5F7E],
- ["A9BB",0x5F7F],
- ["A9B9",0x5F80],
- ["A9BA",0x5F81],
- ["CC75",0x5F82],
- ["ABDD",0x5F85],
- ["CEBE",0x5F86],
- ["ABE0",0x5F87],
- ["ABDC",0x5F88],
- ["ABE2",0x5F89],
- ["ABDE",0x5F8A],
- ["ABDF",0x5F8B],
- ["ABE1",0x5F8C],
- ["AE7D",0x5F90],
- ["AE7C",0x5F91],
- ["AE7B",0x5F92],
- ["D54F",0x5F96],
- ["B16F",0x5F97],
- ["B172",0x5F98],
- ["B170",0x5F99],
- ["D54E",0x5F9B],
- ["B175",0x5F9C],
- ["B171",0x5F9E],
- ["D550",0x5F9F],
- ["B174",0x5FA0],
- ["B173",0x5FA1],
- ["D8F6",0x5FA5],
- ["D8F5",0x5FA6],
- ["B461",0x5FA8],
- ["B45F",0x5FA9],
- ["B460",0x5FAA],
- ["D8F7",0x5FAB],
- ["B74B",0x5FAC],
- ["DD64",0x5FAD],
- ["B74C",0x5FAE],
- ["DD63",0x5FAF],
- ["E577",0x5FB2],
- ["BC78",0x5FB5],
- ["E1C1",0x5FB6],
- ["BC77",0x5FB7],
- ["B9FD",0x5FB9],
- ["ECDE",0x5FBB],
- ["E975",0x5FBC],
- ["C0B2",0x5FBD],
- ["ECDD",0x5FBE],
- ["F240",0x5FBF],
- ["F448",0x5FC0],
- ["F449",0x5FC1],
- ["A4DF",0x5FC3],
- ["A5B2",0x5FC5],
- ["C97B",0x5FC9],
- ["A7D2",0x5FCC],
- ["A7D4",0x5FCD],
- ["C9E2",0x5FCF],
- ["CAD8",0x5FD0],
- ["CAD7",0x5FD1],
- ["CAD6",0x5FD2],
- ["C9E1",0x5FD4],
- ["C9E0",0x5FD5],
- ["A6A4",0x5FD6],
- ["A7D3",0x5FD7],
- ["A7D1",0x5FD8],
- ["A6A3",0x5FD9],
- ["A9BD",0x5FDD],
- ["CC78",0x5FDE],
- ["A9BE",0x5FE0],
- ["CADD",0x5FE1],
- ["CADF",0x5FE3],
- ["CADE",0x5FE4],
- ["CC79",0x5FE5],
- ["CADA",0x5FE8],
- ["A7D8",0x5FEA],
- ["A7D6",0x5FEB],
- ["CAD9",0x5FED],
- ["CADB",0x5FEE],
- ["CAE1",0x5FEF],
- ["A7D5",0x5FF1],
- ["CADC",0x5FF3],
- ["CAE5",0x5FF4],
- ["A9C0",0x5FF5],
- ["CAE2",0x5FF7],
- ["A7D7",0x5FF8],
- ["CAE0",0x5FFA],
- ["CAE3",0x5FFB],
- ["A9BF",0x5FFD],
- ["A9C1",0x5FFF],
- ["CAE4",0x6000],
- ["CCAF",0x6009],
- ["CCA2",0x600A],
- ["CC7E",0x600B],
- ["CCAE",0x600C],
- ["CCA9",0x600D],
- ["ABE7",0x600E],
- ["A9C2",0x600F],
- ["CCAA",0x6010],
- ["CCAD",0x6011],
- ["ABE3",0x6012],
- ["CCAC",0x6013],
- ["A9C3",0x6014],
- ["A9C8",0x6015],
- ["A9C6",0x6016],
- ["CCA3",0x6017],
- ["CC7C",0x6019],
- ["CCA5",0x601A],
- ["A9CD",0x601B],
- ["CCB0",0x601C],
- ["ABE4",0x601D],
- ["CCA6",0x601E],
- ["ABE5",0x6020],
- ["A9C9",0x6021],
- ["CCA8",0x6022],
- ["CECD",0x6024],
- ["ABE6",0x6025],
- ["CC7B",0x6026],
- ["A9CA",0x6027],
- ["ABE8",0x6028],
- ["A9CB",0x6029],
- ["A9C7",0x602A],
- ["A9CC",0x602B],
- ["CCA7",0x602C],
- ["CC7A",0x602D],
- ["CCAB",0x602E],
- ["A9C4",0x602F],
- ["CC7D",0x6032],
- ["CCA4",0x6033],
- ["CCA1",0x6034],
- ["A9C5",0x6035],
- ["CEBF",0x6037],
- ["CEC0",0x6039],
- ["CECA",0x6040],
- ["D1A1",0x6041],
- ["CECB",0x6042],
- ["ABEE",0x6043],
- ["CECE",0x6044],
- ["CEC4",0x6045],
- ["ABED",0x6046],
- ["CEC6",0x6047],
- ["CEC7",0x6049],
- ["CEC9",0x604C],
- ["ABE9",0x604D],
- ["AEA3",0x6050],
- ["CEC5",0x6053],
- ["CEC1",0x6054],
- ["AEA4",0x6055],
- ["CECF",0x6058],
- ["AE7E",0x6059],
- ["D17D",0x605A],
- ["CEC8",0x605B],
- ["D17C",0x605D],
- ["CEC3",0x605E],
- ["CECC",0x605F],
- ["ABEC",0x6062],
- ["AEA1",0x6063],
- ["ABF2",0x6064],
- ["AEA2",0x6065],
- ["CED0",0x6066],
- ["D17E",0x6067],
- ["ABEB",0x6068],
- ["AEA6",0x6069],
- ["ABF1",0x606A],
- ["ABF0",0x606B],
- ["ABEF",0x606C],
- ["AEA5",0x606D],
- ["CED1",0x606E],
- ["AEA7",0x606F],
- ["ABEA",0x6070],
- ["CEC2",0x6072],
- ["B176",0x607F],
- ["D1A4",0x6080],
- ["D1A6",0x6081],
- ["D1A8",0x6083],
- ["AEA8",0x6084],
- ["AEAE",0x6085],
- ["D553",0x6086],
- ["D1AC",0x6087],
- ["D1A3",0x6088],
- ["B178",0x6089],
- ["D551",0x608A],
- ["AEAD",0x608C],
- ["AEAB",0x608D],
- ["D1AE",0x608E],
- ["D552",0x6090],
- ["D1A5",0x6092],
- ["AEAC",0x6094],
- ["D1A9",0x6095],
- ["AEAF",0x6096],
- ["D1AB",0x6097],
- ["AEAA",0x609A],
- ["D1AA",0x609B],
- ["D1AD",0x609C],
- ["D1A7",0x609D],
- ["AEA9",0x609F],
- ["B179",0x60A0],
- ["D1A2",0x60A2],
- ["B177",0x60A3],
- ["B17A",0x60A8],
- ["D555",0x60B0],
- ["D55E",0x60B1],
- ["B464",0x60B2],
- ["B17C",0x60B4],
- ["B1A3",0x60B5],
- ["B465",0x60B6],
- ["D560",0x60B7],
- ["B1AA",0x60B8],
- ["D8F9",0x60B9],
- ["D556",0x60BA],
- ["B1A2",0x60BB],
- ["B1A5",0x60BC],
- ["B17E",0x60BD],
- ["D554",0x60BE],
- ["D562",0x60BF],
- ["D565",0x60C0],
- ["D949",0x60C1],
- ["D563",0x60C3],
- ["D8FD",0x60C4],
- ["B1A1",0x60C5],
- ["B1A8",0x60C6],
- ["B1AC",0x60C7],
- ["D55D",0x60C8],
- ["D8F8",0x60C9],
- ["D561",0x60CA],
- ["B17B",0x60CB],
- ["D8FA",0x60CC],
- ["D564",0x60CD],
- ["D8FC",0x60CE],
- ["D559",0x60CF],
- ["B462",0x60D1],
- ["D557",0x60D3],
- ["D558",0x60D4],
- ["B1A7",0x60D5],
- ["B1A6",0x60D8],
- ["D55B",0x60D9],
- ["B1AB",0x60DA],
- ["D55F",0x60DB],
- ["B1A4",0x60DC],
- ["D55C",0x60DD],
- ["B1A9",0x60DF],
- ["B466",0x60E0],
- ["B463",0x60E1],
- ["D8FB",0x60E2],
- ["D55A",0x60E4],
- ["B17D",0x60E6],
- ["B46B",0x60F0],
- ["B46F",0x60F1],
- ["D940",0x60F2],
- ["B751",0x60F3],
- ["B46D",0x60F4],
- ["D944",0x60F5],
- ["B471",0x60F6],
- ["DD65",0x60F7],
- ["D946",0x60F8],
- ["B753",0x60F9],
- ["B469",0x60FA],
- ["B46C",0x60FB],
- ["D947",0x60FC],
- ["D948",0x60FE],
- ["D94E",0x60FF],
- ["B473",0x6100],
- ["B754",0x6101],
- ["D94A",0x6103],
- ["D94F",0x6104],
- ["D943",0x6105],
- ["B75E",0x6106],
- ["B755",0x6108],
- ["B472",0x6109],
- ["D941",0x610A],
- ["D950",0x610B],
- ["B75D",0x610D],
- ["B470",0x610E],
- ["B74E",0x610F],
- ["D94D",0x6110],
- ["B474",0x6112],
- ["D945",0x6113],
- ["D8FE",0x6114],
- ["B46A",0x6115],
- ["D942",0x6116],
- ["D94B",0x6118],
- ["B74D",0x611A],
- ["B752",0x611B],
- ["B467",0x611C],
- ["D94C",0x611D],
- ["B750",0x611F],
- ["B468",0x6123],
- ["B75C",0x6127],
- ["E1C3",0x6128],
- ["DD70",0x6129],
- ["DD68",0x612B],
- ["E1C2",0x612C],
- ["DD6C",0x612E],
- ["DD6E",0x612F],
- ["DD6B",0x6132],
- ["B75B",0x6134],
- ["DD6A",0x6136],
- ["B75F",0x6137],
- ["E1D2",0x613B],
- ["B75A",0x613E],
- ["BA40",0x613F],
- ["DD71",0x6140],
- ["E1C4",0x6141],
- ["B758",0x6144],
- ["DD69",0x6145],
- ["DD6D",0x6146],
- ["B9FE",0x6147],
- ["B74F",0x6148],
- ["DD66",0x6149],
- ["DD67",0x614A],
- ["BA41",0x614B],
- ["B757",0x614C],
- ["B759",0x614D],
- ["B756",0x614E],
- ["DD6F",0x614F],
- ["E1C8",0x6152],
- ["E1C9",0x6153],
- ["E1CE",0x6154],
- ["BC7D",0x6155],
- ["E1D5",0x6156],
- ["BA47",0x6158],
- ["BA46",0x615A],
- ["E1D0",0x615B],
- ["BC7C",0x615D],
- ["E1C5",0x615E],
- ["BA45",0x615F],
- ["E1D4",0x6161],
- ["BA43",0x6162],
- ["BA44",0x6163],
- ["E1D1",0x6165],
- ["E5AA",0x6166],
- ["BC7A",0x6167],
- ["B46E",0x6168],
- ["E1D3",0x616A],
- ["BCA3",0x616B],
- ["E1CB",0x616C],
- ["BC7B",0x616E],
- ["BCA2",0x6170],
- ["E1C6",0x6171],
- ["E1CA",0x6172],
- ["E1C7",0x6173],
- ["E1CD",0x6174],
- ["BA48",0x6175],
- ["BC79",0x6176],
- ["BA42",0x6177],
- ["E57A",0x6179],
- ["E1CF",0x617A],
- ["BCA1",0x617C],
- ["BCA4",0x617E],
- ["E1CC",0x6180],
- ["BC7E",0x6182],
- ["E579",0x6183],
- ["E57E",0x6189],
- ["BECE",0x618A],
- ["E578",0x618B],
- ["E9A3",0x618C],
- ["E5A9",0x618D],
- ["BCA8",0x618E],
- ["BCA6",0x6190],
- ["BECC",0x6191],
- ["E5A6",0x6192],
- ["E5A2",0x6193],
- ["BCAC",0x6194],
- ["E978",0x6196],
- ["BCAA",0x619A],
- ["E5A1",0x619B],
- ["E976",0x619D],
- ["E5A5",0x619F],
- ["E5A8",0x61A1],
- ["E57D",0x61A2],
- ["BCAB",0x61A4],
- ["BCA5",0x61A7],
- ["E977",0x61A8],
- ["BECD",0x61A9],
- ["E5A7",0x61AA],
- ["BCA7",0x61AB],
- ["BCA9",0x61AC],
- ["E5A4",0x61AD],
- ["BCAD",0x61AE],
- ["E5A3",0x61AF],
- ["E57C",0x61B0],
- ["E57B",0x61B1],
- ["BECB",0x61B2],
- ["E5AB",0x61B3],
- ["E97A",0x61B4],
- ["ECE0",0x61B5],
- ["BED0",0x61B6],
- ["E9A2",0x61B8],
- ["E97E",0x61BA],
- ["ECE1",0x61BC],
- ["BED1",0x61BE],
- ["E9A1",0x61BF],
- ["E97C",0x61C1],
- ["C0B4",0x61C2],
- ["ECDF",0x61C3],
- ["E979",0x61C5],
- ["E97B",0x61C6],
- ["C0B5",0x61C7],
- ["BED3",0x61C8],
- ["C0B3",0x61C9],
- ["BED2",0x61CA],
- ["C0B7",0x61CB],
- ["E97D",0x61CC],
- ["BECF",0x61CD],
- ["EFCF",0x61D6],
- ["EFC7",0x61D8],
- ["ECE7",0x61DE],
- ["EFC8",0x61DF],
- ["ECE3",0x61E0],
- ["C256",0x61E3],
- ["ECE5",0x61E4],
- ["ECE4",0x61E5],
- ["C0B6",0x61E6],
- ["ECE2",0x61E7],
- ["ECE6",0x61E8],
- ["EFD0",0x61E9],
- ["EFCC",0x61EA],
- ["EFCE",0x61EB],
- ["EFC9",0x61ED],
- ["EFCA",0x61EE],
- ["EFCD",0x61F0],
- ["EFCB",0x61F1],
- ["C367",0x61F2],
- ["C36A",0x61F5],
- ["C369",0x61F6],
- ["C368",0x61F7],
- ["C461",0x61F8],
- ["F44A",0x61F9],
- ["C462",0x61FA],
- ["F241",0x61FB],
- ["C4DF",0x61FC],
- ["F5CC",0x61FD],
- ["C4E0",0x61FE],
- ["C574",0x61FF],
- ["C5CA",0x6200],
- ["F7D9",0x6201],
- ["F7DA",0x6203],
- ["F7DB",0x6204],
- ["F9BA",0x6207],
- ["A4E0",0x6208],
- ["C97C",0x6209],
- ["A5B3",0x620A],
- ["A6A6",0x620C],
- ["A6A7",0x620D],
- ["A6A5",0x620E],
- ["A6A8",0x6210],
- ["A7DA",0x6211],
- ["A7D9",0x6212],
- ["CCB1",0x6214],
- ["A9CF",0x6215],
- ["A9CE",0x6216],
- ["D1AF",0x6219],
- ["B1AD",0x621A],
- ["B1AE",0x621B],
- ["B475",0x621F],
- ["DD72",0x6220],
- ["B760",0x6221],
- ["B761",0x6222],
- ["DD74",0x6223],
- ["DD76",0x6224],
- ["DD75",0x6225],
- ["E1D7",0x6227],
- ["E1D6",0x6229],
- ["BA49",0x622A],
- ["E1D8",0x622B],
- ["E5AC",0x622D],
- ["BCAE",0x622E],
- ["BED4",0x6230],
- ["C0B8",0x6232],
- ["C257",0x6233],
- ["C0B9",0x6234],
- ["A4E1",0x6236],
- ["CAE6",0x623A],
- ["CCB2",0x623D],
- ["A9D1",0x623E],
- ["A9D0",0x623F],
- ["A9D2",0x6240],
- ["ABF3",0x6241],
- ["CED2",0x6242],
- ["CED3",0x6243],
- ["D1B0",0x6246],
- ["AEB0",0x6247],
- ["B1AF",0x6248],
- ["B476",0x6249],
- ["D951",0x624A],
- ["A4E2",0x624B],
- ["A47E",0x624D],
- ["A4E3",0x624E],
- ["C97D",0x6250],
- ["A5B7",0x6251],
- ["A5B6",0x6252],
- ["A5B4",0x6253],
- ["A5B5",0x6254],
- ["A6AB",0x6258],
- ["C9E9",0x6259],
- ["C9EB",0x625A],
- ["A6AA",0x625B],
- ["C9E3",0x625C],
- ["C9E4",0x625E],
- ["C9EA",0x6260],
- ["C9E6",0x6261],
- ["C9E8",0x6262],
- ["A6A9",0x6263],
- ["C9E5",0x6264],
- ["C9EC",0x6265],
- ["C9E7",0x6266],
- ["A7E1",0x626D],
- ["A7EA",0x626E],
- ["A7E8",0x626F],
- ["CAF0",0x6270],
- ["CAED",0x6271],
- ["CAF5",0x6272],
- ["A7E6",0x6273],
- ["CAF6",0x6274],
- ["A7DF",0x6276],
- ["CAF3",0x6277],
- ["A7E5",0x6279],
- ["CAEF",0x627A],
- ["CAEE",0x627B],
- ["A7E3",0x627C],
- ["CAF4",0x627D],
- ["A7E4",0x627E],
- ["A9D3",0x627F],
- ["A7DE",0x6280],
- ["CAF1",0x6281],
- ["CAE7",0x6283],
- ["A7DB",0x6284],
- ["A7EE",0x6286],
- ["CAEC",0x6287],
- ["CAF2",0x6288],
- ["A7E0",0x6289],
- ["A7E2",0x628A],
- ["CAE8",0x628C],
- ["CAE9",0x628E],
- ["CAEA",0x628F],
- ["A7ED",0x6291],
- ["A7E7",0x6292],
- ["A7EC",0x6293],
- ["CAEB",0x6294],
- ["A7EB",0x6295],
- ["A7DD",0x6296],
- ["A7DC",0x6297],
- ["A7E9",0x6298],
- ["A9E1",0x62A8],
- ["CCBE",0x62A9],
- ["CCB7",0x62AA],
- ["A9DC",0x62AB],
- ["A9EF",0x62AC],
- ["CCB3",0x62AD],
- ["CCBA",0x62AE],
- ["CCBC",0x62AF],
- ["CCBF",0x62B0],
- ["A9EA",0x62B1],
- ["CCBB",0x62B3],
- ["CCB4",0x62B4],
- ["A9E8",0x62B5],
- ["CCB8",0x62B6],
- ["CCC0",0x62B8],
- ["A9D9",0x62B9],
- ["CCBD",0x62BB],
- ["A9E3",0x62BC],
- ["A9E2",0x62BD],
- ["CCB6",0x62BE],
- ["A9D7",0x62BF],
- ["A9D8",0x62C2],
- ["A9D6",0x62C4],
- ["A9EE",0x62C6],
- ["A9E6",0x62C7],
- ["A9E0",0x62C8],
- ["A9D4",0x62C9],
- ["CCB9",0x62CA],
- ["A9DF",0x62CB],
- ["A9D5",0x62CC],
- ["A9E7",0x62CD],
- ["A9F0",0x62CE],
- ["CED4",0x62CF],
- ["A9E4",0x62D0],
- ["CCB5",0x62D1],
- ["A9DA",0x62D2],
- ["A9DD",0x62D3],
- ["A9DE",0x62D4],
- ["A9EC",0x62D6],
- ["A9ED",0x62D7],
- ["A9EB",0x62D8],
- ["A9E5",0x62D9],
- ["A9E9",0x62DA],
- ["A9DB",0x62DB],
- ["ABF4",0x62DC],
- ["CEDA",0x62EB],
- ["AC41",0x62EC],
- ["ABF8",0x62ED],
- ["ABFA",0x62EE],
- ["AC40",0x62EF],
- ["CEE6",0x62F0],
- ["ABFD",0x62F1],
- ["D1B1",0x62F2],
- ["AEB1",0x62F3],
- ["AC43",0x62F4],
- ["CED7",0x62F5],
- ["CEDF",0x62F6],
- ["ABFE",0x62F7],
- ["CEDE",0x62F8],
- ["CEDB",0x62F9],
- ["CEE3",0x62FA],
- ["CEE5",0x62FB],
- ["ABF7",0x62FC],
- ["ABFB",0x62FD],
- ["AC42",0x62FE],
- ["AEB3",0x62FF],
- ["CEE0",0x6300],
- ["ABF9",0x6301],
- ["AC45",0x6302],
- ["CED9",0x6303],
- ["ABFC",0x6307],
- ["AEB2",0x6308],
- ["ABF6",0x6309],
- ["CED6",0x630B],
- ["CEDD",0x630C],
- ["CED5",0x630D],
- ["CED8",0x630E],
- ["CEDC",0x630F],
- ["D1B2",0x6310],
- ["AC44",0x6311],
- ["CEE1",0x6313],
- ["CEE2",0x6314],
- ["CEE4",0x6315],
- ["ABF5",0x6316],
- ["AEC1",0x6328],
- ["D1BE",0x6329],
- ["AEBF",0x632A],
- ["AEC0",0x632B],
- ["D1B4",0x632C],
- ["D1C4",0x632D],
- ["AEB6",0x632F],
- ["D566",0x6332],
- ["D1C6",0x6333],
- ["D1C0",0x6334],
- ["D1B7",0x6336],
- ["D1C9",0x6338],
- ["D1BA",0x6339],
- ["AEBC",0x633A],
- ["D57D",0x633B],
- ["D1BD",0x633C],
- ["AEBE",0x633D],
- ["AEB5",0x633E],
- ["D1CB",0x6340],
- ["D1BF",0x6341],
- ["AEB8",0x6342],
- ["D1B8",0x6343],
- ["D1B5",0x6344],
- ["D1B6",0x6345],
- ["AEB9",0x6346],
- ["D1C5",0x6347],
- ["D1CC",0x6348],
- ["AEBB",0x6349],
- ["D1BC",0x634A],
- ["D1BB",0x634B],
- ["AEC3",0x634C],
- ["AEC2",0x634D],
- ["AEB4",0x634E],
- ["AEBA",0x634F],
- ["AEBD",0x6350],
- ["D1C8",0x6351],
- ["D1C2",0x6354],
- ["AEB7",0x6355],
- ["D1B3",0x6356],
- ["D1CA",0x6357],
- ["D1C1",0x6358],
- ["D1C3",0x6359],
- ["D1C7",0x635A],
- ["D567",0x6365],
- ["B1B7",0x6367],
- ["B1CB",0x6368],
- ["B1CA",0x6369],
- ["B1BF",0x636B],
- ["D579",0x636D],
- ["D575",0x636E],
- ["D572",0x636F],
- ["D5A6",0x6370],
- ["B1BA",0x6371],
- ["B1B2",0x6372],
- ["D577",0x6375],
- ["B4A8",0x6376],
- ["B1B6",0x6377],
- ["D5A1",0x6378],
- ["B1CC",0x637A],
- ["B1C9",0x637B],
- ["D57B",0x637C],
- ["D56A",0x637D],
- ["B1C8",0x6380],
- ["D5A3",0x6381],
- ["D569",0x6382],
- ["B1BD",0x6383],
- ["B1C1",0x6384],
- ["D5A2",0x6385],
- ["D573",0x6387],
- ["B1C2",0x6388],
- ["B1BC",0x6389],
- ["D568",0x638A],
- ["B478",0x638C],
- ["D5A5",0x638D],
- ["D571",0x638E],
- ["B1C7",0x638F],
- ["D574",0x6390],
- ["D5A4",0x6391],
- ["B1C6",0x6392],
- ["D952",0x6394],
- ["B1B3",0x6396],
- ["D56F",0x6397],
- ["B1B8",0x6398],
- ["B1C3",0x6399],
- ["B1BE",0x639B],
- ["D578",0x639C],
- ["D56E",0x639D],
- ["D56C",0x639E],
- ["D57E",0x639F],
- ["B1B0",0x63A0],
- ["B1C4",0x63A1],
- ["B1B4",0x63A2],
- ["B477",0x63A3],
- ["D57C",0x63A4],
- ["B1B5",0x63A5],
- ["B1B1",0x63A7],
- ["B1C0",0x63A8],
- ["B1BB",0x63A9],
- ["B1B9",0x63AA],
- ["D570",0x63AB],
- ["B1C5",0x63AC],
- ["D56D",0x63AD],
- ["D57A",0x63AE],
- ["D576",0x63AF],
- ["D954",0x63B0],
- ["D953",0x63B1],
- ["D56B",0x63BD],
- ["D964",0x63BE],
- ["B47A",0x63C0],
- ["D96A",0x63C2],
- ["D959",0x63C3],
- ["D967",0x63C4],
- ["DD77",0x63C5],
- ["B47D",0x63C6],
- ["D96B",0x63C7],
- ["D96E",0x63C8],
- ["B47C",0x63C9],
- ["D95C",0x63CA],
- ["D96D",0x63CB],
- ["D96C",0x63CC],
- ["B47E",0x63CD],
- ["D955",0x63CE],
- ["B479",0x63CF],
- ["B4A3",0x63D0],
- ["B4A1",0x63D2],
- ["D969",0x63D3],
- ["D95F",0x63D5],
- ["B4A5",0x63D6],
- ["D970",0x63D7],
- ["D968",0x63D8],
- ["D971",0x63D9],
- ["B4AD",0x63DA],
- ["B4AB",0x63DB],
- ["D966",0x63DC],
- ["D965",0x63DD],
- ["D963",0x63DF],
- ["D95D",0x63E0],
- ["B4A4",0x63E1],
- ["B4A2",0x63E3],
- ["D1B9",0x63E4],
- ["D956",0x63E5],
- ["DDB7",0x63E7],
- ["D957",0x63E8],
- ["B47B",0x63E9],
- ["B4AA",0x63EA],
- ["DD79",0x63EB],
- ["B4A6",0x63ED],
- ["B4A7",0x63EE],
- ["D958",0x63EF],
- ["D96F",0x63F0],
- ["DD78",0x63F1],
- ["D960",0x63F2],
- ["D95B",0x63F3],
- ["B4A9",0x63F4],
- ["D961",0x63F5],
- ["D95E",0x63F6],
- ["B4AE",0x63F9],
- ["B770",0x6406],
- ["DD7C",0x6409],
- ["DDB1",0x640A],
- ["DDB6",0x640B],
- ["DDAA",0x640C],
- ["B76C",0x640D],
- ["DDBB",0x640E],
- ["B769",0x640F],
- ["DD7A",0x6410],
- ["DD7B",0x6412],
- ["B762",0x6413],
- ["B76B",0x6414],
- ["DDA4",0x6415],
- ["B76E",0x6416],
- ["B76F",0x6417],
- ["DDA5",0x6418],
- ["DDB2",0x641A],
- ["DDB8",0x641B],
- ["B76A",0x641C],
- ["B764",0x641E],
- ["DDA3",0x641F],
- ["DD7D",0x6420],
- ["DDBA",0x6421],
- ["DDA8",0x6422],
- ["DDA9",0x6423],
- ["DD7E",0x6424],
- ["DDB4",0x6425],
- ["DDAB",0x6426],
- ["DDB5",0x6427],
- ["DDAD",0x6428],
- ["B765",0x642A],
- ["E1D9",0x642B],
- ["B768",0x642C],
- ["B766",0x642D],
- ["DDB9",0x642E],
- ["DDB0",0x642F],
- ["DDAC",0x6430],
- ["DDA1",0x6433],
- ["BA53",0x6434],
- ["DDAF",0x6435],
- ["B76D",0x6436],
- ["DDA7",0x6437],
- ["DDA6",0x6439],
- ["B767",0x643D],
- ["B763",0x643E],
- ["E1EE",0x643F],
- ["DDB3",0x6440],
- ["DDAE",0x6441],
- ["DDA2",0x6443],
- ["E1E9",0x644B],
- ["E1DA",0x644D],
- ["E1E5",0x644E],
- ["E1EC",0x6450],
- ["BA51",0x6451],
- ["B4AC",0x6452],
- ["E1EA",0x6453],
- ["BA4C",0x6454],
- ["BA4B",0x6458],
- ["E1F1",0x6459],
- ["E1DB",0x645B],
- ["E1E8",0x645C],
- ["E1DC",0x645D],
- ["E1E7",0x645E],
- ["BA4F",0x645F],
- ["E1EB",0x6460],
- ["D962",0x6461],
- ["E1F2",0x6465],
- ["E1E3",0x6466],
- ["BA52",0x6467],
- ["E5BA",0x6468],
- ["BCAF",0x6469],
- ["E1F0",0x646B],
- ["E1EF",0x646C],
- ["BA54",0x646D],
- ["E5AD",0x646E],
- ["BCB0",0x646F],
- ["E5AE",0x6470],
- ["E1DF",0x6472],
- ["E1E0",0x6473],
- ["E1DD",0x6474],
- ["E1E2",0x6475],
- ["E1DE",0x6476],
- ["E1F3",0x6477],
- ["BA4E",0x6478],
- ["BCB1",0x6479],
- ["BA50",0x647A],
- ["BA55",0x647B],
- ["E1E1",0x647D],
- ["E1ED",0x647F],
- ["E1E6",0x6482],
- ["E5B1",0x6485],
- ["BA4A",0x6487],
- ["BCB4",0x6488],
- ["E9AA",0x6489],
- ["E5B6",0x648A],
- ["E5B5",0x648B],
- ["E5B7",0x648C],
- ["E5B4",0x648F],
- ["BCB5",0x6490],
- ["BCBB",0x6492],
- ["BCB8",0x6493],
- ["BCB9",0x6495],
- ["E5AF",0x6496],
- ["E5B2",0x6497],
- ["E5BC",0x6498],
- ["BCC1",0x6499],
- ["BCBF",0x649A],
- ["E5B3",0x649C],
- ["D95A",0x649D],
- ["BCB2",0x649E],
- ["E5B9",0x649F],
- ["E5B0",0x64A0],
- ["BCC2",0x64A2],
- ["E5B8",0x64A3],
- ["BA4D",0x64A4],
- ["BCB7",0x64A5],
- ["E1E4",0x64A6],
- ["BCBA",0x64A9],
- ["BCBE",0x64AB],
- ["BCC0",0x64AC],
- ["BCBD",0x64AD],
- ["BCBC",0x64AE],
- ["BCB6",0x64B0],
- ["E5BB",0x64B1],
- ["BCB3",0x64B2],
- ["BCC3",0x64B3],
- ["BED8",0x64BB],
- ["BED9",0x64BC],
- ["E9A9",0x64BD],
- ["BEE2",0x64BE],
- ["BEDF",0x64BF],
- ["BED6",0x64C1],
- ["BEDD",0x64C2],
- ["E9AB",0x64C3],
- ["BEDB",0x64C4],
- ["BED5",0x64C5],
- ["BEDC",0x64C7],
- ["E9A8",0x64C9],
- ["C0BB",0x64CA],
- ["BED7",0x64CB],
- ["BEDE",0x64CD],
- ["C0BA",0x64CE],
- ["E9A7",0x64CF],
- ["E9A6",0x64D0],
- ["BEE0",0x64D2],
- ["BEE1",0x64D4],
- ["E9A5",0x64D6],
- ["E9A4",0x64D7],
- ["C0BC",0x64D8],
- ["E9AE",0x64D9],
- ["BEDA",0x64DA],
- ["E9AC",0x64DB],
- ["C0BD",0x64E0],
- ["C0C2",0x64E2],
- ["ECEA",0x64E3],
- ["ECEC",0x64E4],
- ["C0BF",0x64E6],
- ["ECED",0x64E8],
- ["ECE9",0x64E9],
- ["ECEB",0x64EB],
- ["C0C0",0x64EC],
- ["C0C3",0x64ED],
- ["ECE8",0x64EF],
- ["C0BE",0x64F0],
- ["C0C1",0x64F1],
- ["C259",0x64F2],
- ["E9AD",0x64F3],
- ["C258",0x64F4],
- ["C25E",0x64F7],
- ["EFD4",0x64F8],
- ["C25C",0x64FA],
- ["C25D",0x64FB],
- ["EFD7",0x64FC],
- ["EFD3",0x64FD],
- ["C25A",0x64FE],
- ["EFD1",0x64FF],
- ["C36B",0x6500],
- ["EFD5",0x6501],
- ["EFD6",0x6503],
- ["EFD2",0x6504],
- ["C25B",0x6506],
- ["F242",0x6507],
- ["F245",0x6509],
- ["F246",0x650C],
- ["F244",0x650D],
- ["F247",0x650E],
- ["C36C",0x650F],
- ["F243",0x6510],
- ["F44E",0x6513],
- ["C464",0x6514],
- ["F44D",0x6515],
- ["F44C",0x6516],
- ["F44B",0x6517],
- ["C463",0x6518],
- ["C465",0x6519],
- ["F5CD",0x651B],
- ["C4E2",0x651C],
- ["C4E1",0x651D],
- ["F6E1",0x6520],
- ["F6E0",0x6521],
- ["F6E3",0x6522],
- ["C5CB",0x6523],
- ["C575",0x6524],
- ["F7DD",0x6525],
- ["F6E2",0x6526],
- ["F7DC",0x6529],
- ["C5CD",0x652A],
- ["C5CC",0x652B],
- ["C5F3",0x652C],
- ["F8A9",0x652D],
- ["F8EF",0x652E],
- ["A4E4",0x652F],
- ["D972",0x6532],
- ["E9AF",0x6533],
- ["A6AC",0x6536],
- ["CAF7",0x6537],
- ["A7F1",0x6538],
- ["A7EF",0x6539],
- ["A7F0",0x653B],
- ["CCC1",0x653D],
- ["A9F1",0x653E],
- ["AC46",0x653F],
- ["CEE7",0x6541],
- ["CEE8",0x6543],
- ["AC47",0x6545],
- ["D1CE",0x6546],
- ["AEC4",0x6548],
- ["AEC5",0x6549],
- ["D1CD",0x654A],
- ["B1D3",0x654F],
- ["B1CF",0x6551],
- ["D5A7",0x6553],
- ["B1D6",0x6554],
- ["B1D5",0x6555],
- ["B1CE",0x6556],
- ["B1D1",0x6557],
- ["B1D4",0x6558],
- ["B1D0",0x6559],
- ["D976",0x655C],
- ["B1CD",0x655D],
- ["B4AF",0x655E],
- ["B4B1",0x6562],
- ["B4B2",0x6563],
- ["D975",0x6564],
- ["D978",0x6565],
- ["B4B0",0x6566],
- ["D973",0x6567],
- ["D977",0x6568],
- ["D974",0x656A],
- ["B771",0x656C],
- ["DDBC",0x656F],
- ["BA56",0x6572],
- ["E1F4",0x6573],
- ["BEE3",0x6574],
- ["BCC4",0x6575],
- ["E5BD",0x6576],
- ["BCC5",0x6577],
- ["BCC6",0x6578],
- ["E5BF",0x6579],
- ["E5BE",0x657A],
- ["E5C0",0x657B],
- ["E9B1",0x657C],
- ["E9B0",0x657F],
- ["ECEF",0x6580],
- ["ECEE",0x6581],
- ["C0C4",0x6582],
- ["C0C5",0x6583],
- ["F248",0x6584],
- ["A4E5",0x6587],
- ["D979",0x658C],
- ["B4B4",0x6590],
- ["B4B3",0x6591],
- ["DDBD",0x6592],
- ["EFD8",0x6594],
- ["C4E3",0x6595],
- ["F7DE",0x6596],
- ["A4E6",0x6597],
- ["AEC6",0x6599],
- ["B1D8",0x659B],
- ["B1D7",0x659C],
- ["D97A",0x659D],
- ["D97B",0x659E],
- ["B772",0x659F],
- ["E1F5",0x65A0],
- ["BA57",0x65A1],
- ["E9B2",0x65A2],
- ["A4E7",0x65A4],
- ["A5B8",0x65A5],
- ["A9F2",0x65A7],
- ["CCC2",0x65A8],
- ["CEE9",0x65AA],
- ["AC48",0x65AB],
- ["B1D9",0x65AC],
- ["D97C",0x65AE],
- ["B4B5",0x65AF],
- ["B773",0x65B0],
- ["E5C1",0x65B2],
- ["E5C2",0x65B3],
- ["ECF0",0x65B6],
- ["C25F",0x65B7],
- ["F8F0",0x65B8],
- ["A4E8",0x65B9],
- ["CCC3",0x65BB],
- ["A9F3",0x65BC],
- ["AC49",0x65BD],
- ["CEEA",0x65BF],
- ["AEC7",0x65C1],
- ["D1D2",0x65C2],
- ["D1D0",0x65C3],
- ["D1D1",0x65C4],
- ["AEC8",0x65C5],
- ["D1CF",0x65C6],
- ["B1DB",0x65CB],
- ["B1DC",0x65CC],
- ["D5A8",0x65CD],
- ["B1DD",0x65CE],
- ["B1DA",0x65CF],
- ["D97D",0x65D0],
- ["D97E",0x65D2],
- ["DDBE",0x65D3],
- ["BA59",0x65D6],
- ["BA58",0x65D7],
- ["ECF1",0x65DA],
- ["EFD9",0x65DB],
- ["F24A",0x65DD],
- ["F249",0x65DE],
- ["F44F",0x65DF],
- ["C95E",0x65E1],
- ["AC4A",0x65E2],
- ["A4E9",0x65E5],
- ["A5B9",0x65E6],
- ["A6AE",0x65E8],
- ["A6AD",0x65E9],
- ["A6AF",0x65EC],
- ["A6B0",0x65ED],
- ["C9EE",0x65EE],
- ["C9ED",0x65EF],
- ["CAF8",0x65F0],
- ["A7F2",0x65F1],
- ["CAFB",0x65F2],
- ["CAFA",0x65F3],
- ["CAF9",0x65F4],
- ["CAFC",0x65F5],
- ["A9F4",0x65FA],
- ["CCC9",0x65FB],
- ["CCC5",0x65FC],
- ["CCCE",0x65FD],
- ["A9FB",0x6600],
- ["A9F9",0x6602],
- ["CCCA",0x6603],
- ["CCC6",0x6604],
- ["CCCD",0x6605],
- ["A9F8",0x6606],
- ["AA40",0x6607],
- ["CCC8",0x6608],
- ["CCC4",0x6609],
- ["A9FE",0x660A],
- ["CCCB",0x660B],
- ["A9F7",0x660C],
- ["CCCC",0x660D],
- ["A9FA",0x660E],
- ["A9FC",0x660F],
- ["CCD0",0x6610],
- ["CCCF",0x6611],
- ["CCC7",0x6612],
- ["A9F6",0x6613],
- ["A9F5",0x6614],
- ["A9FD",0x6615],
- ["CEEF",0x661C],
- ["CEF5",0x661D],
- ["AC50",0x661F],
- ["AC4D",0x6620],
- ["CEEC",0x6621],
- ["CEF1",0x6622],
- ["AC53",0x6624],
- ["AC4B",0x6625],
- ["CEF0",0x6626],
- ["AC4E",0x6627],
- ["AC51",0x6628],
- ["CEF3",0x662B],
- ["AC4C",0x662D],
- ["CEF8",0x662E],
- ["AC4F",0x662F],
- ["AC52",0x6631],
- ["CEED",0x6632],
- ["CEF2",0x6633],
- ["CEF6",0x6634],
- ["CEEE",0x6635],
- ["CEEB",0x6636],
- ["CEF7",0x6639],
- ["CEF4",0x663A],
- ["AED0",0x6641],
- ["AEC9",0x6642],
- ["AECC",0x6643],
- ["AECF",0x6645],
- ["D1D5",0x6647],
- ["AECA",0x6649],
- ["D1D3",0x664A],
- ["AECE",0x664C],
- ["AECB",0x664F],
- ["D1D6",0x6651],
- ["AECD",0x6652],
- ["D5AC",0x6659],
- ["B1DF",0x665A],
- ["D5AB",0x665B],
- ["D5AD",0x665C],
- ["B1DE",0x665D],
- ["B1E3",0x665E],
- ["D1D4",0x665F],
- ["D5AA",0x6661],
- ["D5AE",0x6662],
- ["B1E0",0x6664],
- ["D5A9",0x6665],
- ["B1E2",0x6666],
- ["B1E1",0x6668],
- ["D9A7",0x666A],
- ["D9A2",0x666C],
- ["B4B6",0x666E],
- ["B4BA",0x666F],
- ["B4B7",0x6670],
- ["D9A5",0x6671],
- ["D9A8",0x6672],
- ["B4B8",0x6674],
- ["B4B9",0x6676],
- ["B4BE",0x6677],
- ["DDC7",0x6678],
- ["D9A6",0x6679],
- ["B4BC",0x667A],
- ["D9A3",0x667B],
- ["D9A1",0x667C],
- ["B4BD",0x667E],
- ["D9A4",0x6680],
- ["B779",0x6684],
- ["DDBF",0x6686],
- ["B776",0x6687],
- ["B777",0x6688],
- ["B775",0x6689],
- ["DDC4",0x668A],
- ["DDC3",0x668B],
- ["DDC0",0x668C],
- ["B77B",0x668D],
- ["DDC2",0x6690],
- ["B4BB",0x6691],
- ["DDC6",0x6694],
- ["DDC1",0x6695],
- ["B778",0x6696],
- ["B774",0x6697],
- ["B77A",0x6698],
- ["DDC5",0x6699],
- ["BA5C",0x669D],
- ["E1F8",0x669F],
- ["E1F7",0x66A0],
- ["E1F6",0x66A1],
- ["BA5A",0x66A2],
- ["BA5B",0x66A8],
- ["E5C5",0x66A9],
- ["E5C8",0x66AA],
- ["BCC8",0x66AB],
- ["BCC7",0x66AE],
- ["E5C9",0x66AF],
- ["E5C4",0x66B0],
- ["BCCA",0x66B1],
- ["E5C6",0x66B2],
- ["BCC9",0x66B4],
- ["E5C3",0x66B5],
- ["E5C7",0x66B7],
- ["BEE9",0x66B8],
- ["BEE6",0x66B9],
- ["E9BB",0x66BA],
- ["E9BA",0x66BB],
- ["E9B9",0x66BD],
- ["E9B4",0x66BE],
- ["E9B5",0x66C0],
- ["BEE7",0x66C4],
- ["BEE4",0x66C6],
- ["BEE8",0x66C7],
- ["E9B3",0x66C8],
- ["BEE5",0x66C9],
- ["E9B6",0x66CA],
- ["E9B7",0x66CB],
- ["E9BC",0x66CC],
- ["E9B8",0x66CF],
- ["ECF2",0x66D2],
- ["C0C7",0x66D6],
- ["EFDC",0x66D8],
- ["C0C6",0x66D9],
- ["EFDA",0x66DA],
- ["EFDB",0x66DB],
- ["C260",0x66DC],
- ["C36E",0x66DD],
- ["F24B",0x66DE],
- ["C36D",0x66E0],
- ["F451",0x66E3],
- ["F452",0x66E4],
- ["C466",0x66E6],
- ["F450",0x66E8],
- ["C4E4",0x66E9],
- ["F7DF",0x66EB],
- ["C5CE",0x66EC],
- ["F8AA",0x66ED],
- ["F8AB",0x66EE],
- ["A4EA",0x66F0],
- ["A6B1",0x66F2],
- ["A6B2",0x66F3],
- ["A7F3",0x66F4],
- ["CCD1",0x66F6],
- ["AC54",0x66F7],
- ["AED1",0x66F8],
- ["B1E4",0x66F9],
- ["B0D2",0x66FC],
- ["B4BF",0x66FE],
- ["B4C0",0x66FF],
- ["B3CC",0x6700],
- ["D9A9",0x6701],
- ["B77C",0x6703],
- ["E1FA",0x6704],
- ["E1F9",0x6705],
- ["A4EB",0x6708],
- ["A6B3",0x6709],
- ["CCD2",0x670A],
- ["AA42",0x670B],
- ["AA41",0x670D],
- ["CEF9",0x670F],
- ["CEFA",0x6710],
- ["D1D7",0x6712],
- ["D1D8",0x6713],
- ["AED2",0x6714],
- ["AED3",0x6715],
- ["AED4",0x6717],
- ["D5AF",0x6718],
- ["B1E6",0x671B],
- ["B4C2",0x671D],
- ["B4C1",0x671F],
- ["DDC8",0x6720],
- ["DF7A",0x6721],
- ["E1FB",0x6722],
- ["E9BD",0x6723],
- ["C261",0x6726],
- ["C467",0x6727],
- ["A4EC",0x6728],
- ["A5BC",0x672A],
- ["A5BD",0x672B],
- ["A5BB",0x672C],
- ["A5BE",0x672D],
- ["A5BA",0x672E],
- ["A6B6",0x6731],
- ["C9F6",0x6733],
- ["A6B5",0x6734],
- ["A6B7",0x6735],
- ["C9F1",0x6738],
- ["C9F0",0x6739],
- ["C9F3",0x673A],
- ["C9F2",0x673B],
- ["C9F5",0x673C],
- ["A6B4",0x673D],
- ["C9EF",0x673E],
- ["C9F4",0x673F],
- ["CAFD",0x6745],
- ["A7FD",0x6746],
- ["CAFE",0x6747],
- ["CB43",0x6748],
- ["A7FC",0x6749],
- ["CB47",0x674B],
- ["CB42",0x674C],
- ["CB45",0x674D],
- ["A7F5",0x674E],
- ["A7F6",0x674F],
- ["A7F7",0x6750],
- ["A7F8",0x6751],
- ["A840",0x6753],
- ["CB41",0x6755],
- ["A7FA",0x6756],
- ["A841",0x6757],
- ["CB40",0x6759],
- ["CB46",0x675A],
- ["A7F9",0x675C],
- ["CB44",0x675D],
- ["A7FB",0x675E],
- ["A7F4",0x675F],
- ["A7FE",0x6760],
- ["AA57",0x676A],
- ["CCD4",0x676C],
- ["AA43",0x676D],
- ["AA4D",0x676F],
- ["AA4E",0x6770],
- ["AA46",0x6771],
- ["AA58",0x6772],
- ["AA48",0x6773],
- ["CCDC",0x6774],
- ["AA53",0x6775],
- ["CCD7",0x6776],
- ["AA49",0x6777],
- ["CCE6",0x6778],
- ["CCE7",0x6779],
- ["CCDF",0x677A],
- ["CCD8",0x677B],
- ["AA56",0x677C],
- ["CCE4",0x677D],
- ["AA51",0x677E],
- ["AA4F",0x677F],
- ["CCE5",0x6781],
- ["CCE3",0x6783],
- ["CCDB",0x6784],
- ["CCD3",0x6785],
- ["CCDA",0x6786],
- ["AA4A",0x6787],
- ["AA50",0x6789],
- ["AA44",0x678B],
- ["CCDE",0x678C],
- ["CCDD",0x678D],
- ["CCD5",0x678E],
- ["AA52",0x6790],
- ["CCE1",0x6791],
- ["CCD6",0x6792],
- ["AA55",0x6793],
- ["CCE8",0x6794],
- ["AA45",0x6795],
- ["AA4C",0x6797],
- ["CCD9",0x6798],
- ["CCE2",0x6799],
- ["AA54",0x679A],
- ["AA47",0x679C],
- ["AA4B",0x679D],
- ["CCE0",0x679F],
- ["CF5B",0x67AE],
- ["AC5C",0x67AF],
- ["AC69",0x67B0],
- ["CF56",0x67B2],
- ["CF4C",0x67B3],
- ["AC62",0x67B4],
- ["CF4A",0x67B5],
- ["AC5B",0x67B6],
- ["CF45",0x67B7],
- ["AC65",0x67B8],
- ["CF52",0x67B9],
- ["CEFE",0x67BA],
- ["CF41",0x67BB],
- ["CF44",0x67C0],
- ["CEFB",0x67C1],
- ["CF51",0x67C2],
- ["CF61",0x67C3],
- ["AC60",0x67C4],
- ["CF46",0x67C5],
- ["CF58",0x67C6],
- ["CEFD",0x67C8],
- ["CF5F",0x67C9],
- ["CF60",0x67CA],
- ["CF63",0x67CB],
- ["CF5A",0x67CC],
- ["CF4B",0x67CD],
- ["CF53",0x67CE],
- ["AC66",0x67CF],
- ["AC59",0x67D0],
- ["AC61",0x67D1],
- ["AC6D",0x67D2],
- ["AC56",0x67D3],
- ["AC58",0x67D4],
- ["CF43",0x67D8],
- ["AC6A",0x67D9],
- ["AC63",0x67DA],
- ["CF5D",0x67DB],
- ["CF40",0x67DC],
- ["AC6C",0x67DD],
- ["AC67",0x67DE],
- ["CF49",0x67DF],
- ["AC6B",0x67E2],
- ["CF50",0x67E3],
- ["CF48",0x67E4],
- ["AC64",0x67E5],
- ["CF5C",0x67E6],
- ["CF54",0x67E7],
- ["AC5E",0x67E9],
- ["CF62",0x67EA],
- ["CF47",0x67EB],
- ["AC5A",0x67EC],
- ["CF59",0x67ED],
- ["CF4F",0x67EE],
- ["AC5F",0x67EF],
- ["CF55",0x67F0],
- ["AC57",0x67F1],
- ["CEFC",0x67F2],
- ["AC68",0x67F3],
- ["AEE3",0x67F4],
- ["AC5D",0x67F5],
- ["CF4E",0x67F6],
- ["CF4D",0x67F7],
- ["CF42",0x67F8],
- ["CF5E",0x67FA],
- ["CF57",0x67FC],
- ["AC55",0x67FF],
- ["D1EC",0x6812],
- ["AEEA",0x6813],
- ["D1ED",0x6814],
- ["D1E1",0x6816],
- ["AEDF",0x6817],
- ["AEEB",0x6818],
- ["D1DA",0x681A],
- ["D1E3",0x681C],
- ["D1EB",0x681D],
- ["D1D9",0x681F],
- ["D1F4",0x6820],
- ["AED5",0x6821],
- ["D1F3",0x6825],
- ["D1EE",0x6826],
- ["D1EF",0x6828],
- ["AEDD",0x6829],
- ["AEE8",0x682A],
- ["D1E5",0x682B],
- ["D1E6",0x682D],
- ["D1F0",0x682E],
- ["D1E7",0x682F],
- ["D1E2",0x6831],
- ["D1DC",0x6832],
- ["D1DD",0x6833],
- ["D1EA",0x6834],
- ["D1E4",0x6835],
- ["AED6",0x6838],
- ["AEDA",0x6839],
- ["D1F2",0x683A],
- ["D1DE",0x683B],
- ["AEE6",0x683C],
- ["AEE2",0x683D],
- ["AEE5",0x6840],
- ["AEEC",0x6841],
- ["AEDB",0x6842],
- ["AEE7",0x6843],
- ["D1E9",0x6844],
- ["AEE9",0x6845],
- ["AED8",0x6846],
- ["AED7",0x6848],
- ["D1DB",0x6849],
- ["D1DF",0x684B],
- ["AEE0",0x684C],
- ["D1F1",0x684D],
- ["D1E8",0x684E],
- ["D1E0",0x684F],
- ["AEE4",0x6850],
- ["AEE1",0x6851],
- ["AED9",0x6853],
- ["AEDC",0x6854],
- ["D5C4",0x686B],
- ["D5B4",0x686D],
- ["D5B5",0x686E],
- ["D5B9",0x686F],
- ["D5C8",0x6871],
- ["D5C5",0x6872],
- ["D5BE",0x6874],
- ["D5BD",0x6875],
- ["B1ED",0x6876],
- ["D5C1",0x6877],
- ["D5D0",0x6878],
- ["D5B0",0x6879],
- ["D5D1",0x687B],
- ["D5C3",0x687C],
- ["D5D5",0x687D],
- ["D5C9",0x687E],
- ["B1EC",0x687F],
- ["D5C7",0x6880],
- ["B1E7",0x6881],
- ["B1FC",0x6882],
- ["B1F2",0x6883],
- ["B1F6",0x6885],
- ["B1F5",0x6886],
- ["D5B1",0x6887],
- ["D5CE",0x6889],
- ["D5D4",0x688A],
- ["D5CC",0x688B],
- ["D5D3",0x688C],
- ["D5C0",0x688F],
- ["D5B2",0x6890],
- ["D5D2",0x6891],
- ["D5C2",0x6892],
- ["B1EA",0x6893],
- ["B1F7",0x6894],
- ["D5CB",0x6896],
- ["B1F0",0x6897],
- ["D5CA",0x689B],
- ["D5B3",0x689C],
- ["B1F8",0x689D],
- ["B1FA",0x689F],
- ["D5CD",0x68A0],
- ["B1FB",0x68A1],
- ["B1E9",0x68A2],
- ["D5BA",0x68A3],
- ["D5CF",0x68A4],
- ["B1EF",0x68A7],
- ["B1F9",0x68A8],
- ["D5BC",0x68A9],
- ["D5C6",0x68AA],
- ["D5B7",0x68AB],
- ["D5BB",0x68AC],
- ["B1F4",0x68AD],
- ["D5B6",0x68AE],
- ["B1E8",0x68AF],
- ["B1F1",0x68B0],
- ["B1EE",0x68B1],
- ["D5BF",0x68B2],
- ["AEDE",0x68B3],
- ["D9C0",0x68B4],
- ["B1EB",0x68B5],
- ["B1F3",0x68C4],
- ["D9C3",0x68C6],
- ["D9D9",0x68C7],
- ["D9CE",0x68C8],
- ["B4D6",0x68C9],
- ["B4D1",0x68CB],
- ["D9BD",0x68CC],
- ["B4D2",0x68CD],
- ["D9CD",0x68CE],
- ["D9C6",0x68D0],
- ["D9D3",0x68D1],
- ["B4CE",0x68D2],
- ["D9AB",0x68D3],
- ["D9D5",0x68D4],
- ["B4C4",0x68D5],
- ["D9B3",0x68D6],
- ["B4C7",0x68D7],
- ["B4C6",0x68D8],
- ["B4D7",0x68DA],
- ["D9AD",0x68DC],
- ["D9CF",0x68DD],
- ["D9D0",0x68DE],
- ["B4C9",0x68DF],
- ["B4C5",0x68E0],
- ["D9BB",0x68E1],
- ["B4D0",0x68E3],
- ["D9B6",0x68E4],
- ["D9D1",0x68E6],
- ["B4CC",0x68E7],
- ["D9C9",0x68E8],
- ["D9D6",0x68E9],
- ["D9B0",0x68EA],
- ["D9B5",0x68EB],
- ["D9AF",0x68EC],
- ["B4CB",0x68EE],
- ["D9C2",0x68EF],
- ["DDDE",0x68F0],
- ["D9B1",0x68F1],
- ["B4CF",0x68F2],
- ["D9BA",0x68F3],
- ["D9D2",0x68F4],
- ["B4CA",0x68F5],
- ["D9B7",0x68F6],
- ["D9B4",0x68F7],
- ["D9C5",0x68F8],
- ["B4CD",0x68F9],
- ["B4C3",0x68FA],
- ["B4D9",0x68FB],
- ["D9C8",0x68FC],
- ["D9C7",0x68FD],
- ["D9AC",0x6904],
- ["B4C8",0x6905],
- ["D9D4",0x6906],
- ["D9BC",0x6907],
- ["D9BE",0x6908],
- ["D9CB",0x690A],
- ["D9CA",0x690B],
- ["D9AA",0x690C],
- ["B4D3",0x690D],
- ["B4D5",0x690E],
- ["D9B2",0x690F],
- ["D9B9",0x6910],
- ["D9C1",0x6911],
- ["B4D4",0x6912],
- ["D9B8",0x6913],
- ["D9C4",0x6914],
- ["D9D7",0x6915],
- ["D9CC",0x6917],
- ["D9D8",0x6925],
- ["D9AE",0x692A],
- ["DDF2",0x692F],
- ["B7A6",0x6930],
- ["DDF0",0x6932],
- ["DDDB",0x6933],
- ["DDE0",0x6934],
- ["DDD9",0x6935],
- ["DDEC",0x6937],
- ["DDCB",0x6938],
- ["DDD2",0x6939],
- ["DDEA",0x693B],
- ["DDF4",0x693C],
- ["DDDC",0x693D],
- ["DDCF",0x693F],
- ["DDE2",0x6940],
- ["DDE7",0x6941],
- ["DDD3",0x6942],
- ["DDE4",0x6944],
- ["DDD0",0x6945],
- ["DDD7",0x6948],
- ["DDD8",0x6949],
- ["B7A8",0x694A],
- ["DDEB",0x694B],
- ["DDE9",0x694C],
- ["DDCC",0x694E],
- ["DDEE",0x694F],
- ["DDEF",0x6951],
- ["DDF1",0x6952],
- ["B7AC",0x6953],
- ["B7A4",0x6954],
- ["D5B8",0x6956],
- ["DDD4",0x6957],
- ["DDE6",0x6958],
- ["DDD5",0x6959],
- ["B7A1",0x695A],
- ["B7B1",0x695B],
- ["DDED",0x695C],
- ["B7AF",0x695D],
- ["B7AB",0x695E],
- ["DDCA",0x695F],
- ["B7A3",0x6960],
- ["DDCD",0x6962],
- ["B7B0",0x6963],
- ["DDDD",0x6965],
- ["DDC9",0x6966],
- ["B7A9",0x6968],
- ["DDE1",0x6969],
- ["DDD1",0x696A],
- ["B7AA",0x696B],
- ["DDDA",0x696C],
- ["B77E",0x696D],
- ["B4D8",0x696E],
- ["DDE3",0x696F],
- ["D9BF",0x6970],
- ["DDCE",0x6971],
- ["DDE8",0x6974],
- ["B7A5",0x6975],
- ["DDE5",0x6976],
- ["B7A2",0x6977],
- ["DDDF",0x6978],
- ["B7AD",0x6979],
- ["DDD6",0x697A],
- ["DDF3",0x697B],
- ["B7A7",0x6982],
- ["DEC6",0x6983],
- ["B7AE",0x6986],
- ["E24A",0x698D],
- ["E248",0x698E],
- ["E25E",0x6990],
- ["E246",0x6991],
- ["E258",0x6993],
- ["B77D",0x6994],
- ["BA5F",0x6995],
- ["E242",0x6996],
- ["E25D",0x6997],
- ["E247",0x6999],
- ["E255",0x699A],
- ["BA64",0x699B],
- ["BA5D",0x699C],
- ["E25B",0x699E],
- ["E240",0x69A0],
- ["E25A",0x69A1],
- ["BA6F",0x69A3],
- ["E251",0x69A4],
- ["E261",0x69A5],
- ["BA6D",0x69A6],
- ["E249",0x69A7],
- ["BA5E",0x69A8],
- ["E24B",0x69A9],
- ["E259",0x69AA],
- ["BA67",0x69AB],
- ["E244",0x69AC],
- ["BA6B",0x69AD],
- ["BA61",0x69AE],
- ["E24D",0x69AF],
- ["E243",0x69B0],
- ["E1FC",0x69B1],
- ["E257",0x69B3],
- ["BA68",0x69B4],
- ["E260",0x69B5],
- ["E1FD",0x69B6],
- ["BA65",0x69B7],
- ["E253",0x69B9],
- ["BA66",0x69BB],
- ["E245",0x69BC],
- ["E250",0x69BD],
- ["E24C",0x69BE],
- ["E24E",0x69BF],
- ["BA60",0x69C1],
- ["E25F",0x69C2],
- ["BA6E",0x69C3],
- ["E24F",0x69C4],
- ["E262",0x69C6],
- ["E1FE",0x69C9],
- ["E254",0x69CA],
- ["BA63",0x69CB],
- ["BA6C",0x69CC],
- ["BA6A",0x69CD],
- ["E241",0x69CE],
- ["E256",0x69CF],
- ["BA69",0x69D0],
- ["BA62",0x69D3],
- ["E252",0x69D4],
- ["E25C",0x69D9],
- ["E5D5",0x69E2],
- ["E5D1",0x69E4],
- ["E5CD",0x69E5],
- ["E5E1",0x69E6],
- ["E5DE",0x69E7],
- ["BCCD",0x69E8],
- ["E5E5",0x69EB],
- ["E5D4",0x69EC],
- ["BCD8",0x69ED],
- ["E5DB",0x69EE],
- ["E5D0",0x69F1],
- ["E5DA",0x69F2],
- ["BCD5",0x69F3],
- ["E5EE",0x69F4],
- ["E5EB",0x69F6],
- ["E5DD",0x69F7],
- ["E5CE",0x69F8],
- ["E5E2",0x69FB],
- ["E5E4",0x69FC],
- ["BCD1",0x69FD],
- ["E5D8",0x69FE],
- ["E5D3",0x69FF],
- ["E5CA",0x6A00],
- ["BCCE",0x6A01],
- ["BCD6",0x6A02],
- ["E5E7",0x6A04],
- ["BCD7",0x6A05],
- ["E5CB",0x6A06],
- ["E5ED",0x6A07],
- ["E5E0",0x6A08],
- ["E5E6",0x6A09],
- ["BCD4",0x6A0A],
- ["E5E3",0x6A0D],
- ["E5EA",0x6A0F],
- ["BCD9",0x6A11],
- ["BCD3",0x6A13],
- ["E5DC",0x6A14],
- ["E5CF",0x6A15],
- ["E5EF",0x6A16],
- ["E5CC",0x6A17],
- ["E5E8",0x6A18],
- ["BCD0",0x6A19],
- ["E5D6",0x6A1B],
- ["E5D7",0x6A1D],
- ["BCCF",0x6A1E],
- ["BCCC",0x6A1F],
- ["E5D2",0x6A20],
- ["BCD2",0x6A21],
- ["BCCB",0x6A23],
- ["E5E9",0x6A25],
- ["E5EC",0x6A26],
- ["E5D9",0x6A27],
- ["E9CA",0x6A28],
- ["E9C2",0x6A32],
- ["E9BE",0x6A34],
- ["BEF6",0x6A35],
- ["BEEB",0x6A38],
- ["BEF0",0x6A39],
- ["BEEC",0x6A3A],
- ["E9CC",0x6A3B],
- ["E9D7",0x6A3C],
- ["BEEA",0x6A3D],
- ["E9C4",0x6A3E],
- ["E9CD",0x6A3F],
- ["E5DF",0x6A40],
- ["E9CE",0x6A41],
- ["BEF1",0x6A44],
- ["E9DD",0x6A46],
- ["BEF5",0x6A47],
- ["BEF8",0x6A48],
- ["E9C0",0x6A49],
- ["BEF4",0x6A4B],
- ["E9DB",0x6A4D],
- ["E9DC",0x6A4E],
- ["E9D2",0x6A4F],
- ["E9D1",0x6A50],
- ["E9C9",0x6A51],
- ["E9D3",0x6A54],
- ["E9DA",0x6A55],
- ["E9D9",0x6A56],
- ["BEEF",0x6A58],
- ["BEED",0x6A59],
- ["E9CB",0x6A5A],
- ["E9C8",0x6A5B],
- ["E9C5",0x6A5D],
- ["E9D8",0x6A5E],
- ["BEF7",0x6A5F],
- ["E9D6",0x6A60],
- ["BEF3",0x6A61],
- ["BEF2",0x6A62],
- ["E9D0",0x6A64],
- ["E9BF",0x6A66],
- ["E9C1",0x6A67],
- ["E9C3",0x6A68],
- ["E9D5",0x6A69],
- ["E9CF",0x6A6A],
- ["BEEE",0x6A6B],
- ["E9C6",0x6A6D],
- ["E9D4",0x6A6F],
- ["E9C7",0x6A76],
- ["C0CF",0x6A7E],
- ["ED45",0x6A7F],
- ["C0C8",0x6A80],
- ["ECF5",0x6A81],
- ["ED41",0x6A83],
- ["C0CA",0x6A84],
- ["ED48",0x6A85],
- ["ECFC",0x6A87],
- ["ECF7",0x6A89],
- ["ED49",0x6A8C],
- ["ECF3",0x6A8D],
- ["ECFE",0x6A8E],
- ["C0D1",0x6A90],
- ["ED44",0x6A91],
- ["ED4A",0x6A92],
- ["ECFD",0x6A93],
- ["C0C9",0x6A94],
- ["ED40",0x6A95],
- ["ECF4",0x6A96],
- ["C0D0",0x6A97],
- ["ED47",0x6A9A],
- ["ECF9",0x6A9B],
- ["C0CC",0x6A9C],
- ["ECFB",0x6A9E],
- ["ECF8",0x6A9F],
- ["C0D2",0x6AA0],
- ["ECFA",0x6AA1],
- ["C0CB",0x6AA2],
- ["C0CE",0x6AA3],
- ["ED43",0x6AA4],
- ["ECF6",0x6AA5],
- ["ED46",0x6AA6],
- ["ED42",0x6AA8],
- ["C263",0x6AAC],
- ["EFE7",0x6AAD],
- ["C268",0x6AAE],
- ["C269",0x6AAF],
- ["C262",0x6AB3],
- ["EFE6",0x6AB4],
- ["EFE3",0x6AB6],
- ["EFE4",0x6AB7],
- ["C266",0x6AB8],
- ["EFDE",0x6AB9],
- ["EFE2",0x6ABA],
- ["C265",0x6ABB],
- ["EFDF",0x6ABD],
- ["C267",0x6AC2],
- ["C264",0x6AC3],
- ["EFDD",0x6AC5],
- ["EFE1",0x6AC6],
- ["EFE5",0x6AC7],
- ["F251",0x6ACB],
- ["F24E",0x6ACC],
- ["F257",0x6ACD],
- ["F256",0x6ACF],
- ["F254",0x6AD0],
- ["F24F",0x6AD1],
- ["C372",0x6AD3],
- ["F250",0x6AD9],
- ["C371",0x6ADA],
- ["C0CD",0x6ADB],
- ["F253",0x6ADC],
- ["C370",0x6ADD],
- ["F258",0x6ADE],
- ["F252",0x6ADF],
- ["F24D",0x6AE0],
- ["EFE0",0x6AE1],
- ["C36F",0x6AE5],
- ["F24C",0x6AE7],
- ["F456",0x6AE8],
- ["F455",0x6AEA],
- ["F255",0x6AEB],
- ["C468",0x6AEC],
- ["F459",0x6AEE],
- ["F45A",0x6AEF],
- ["F454",0x6AF0],
- ["F458",0x6AF1],
- ["F453",0x6AF3],
- ["F5D1",0x6AF8],
- ["F457",0x6AF9],
- ["C4E7",0x6AFA],
- ["C4E5",0x6AFB],
- ["F5CF",0x6AFC],
- ["F5D2",0x6B00],
- ["F5CE",0x6B02],
- ["F5D0",0x6B03],
- ["C4E6",0x6B04],
- ["F6E5",0x6B08],
- ["F6E6",0x6B09],
- ["C576",0x6B0A],
- ["F6E4",0x6B0B],
- ["F7E2",0x6B0F],
- ["C5CF",0x6B10],
- ["F7E0",0x6B11],
- ["F7E1",0x6B12],
- ["F8AC",0x6B13],
- ["C656",0x6B16],
- ["F8F3",0x6B17],
- ["F8F1",0x6B18],
- ["F8F2",0x6B19],
- ["F8F4",0x6B1A],
- ["F9BB",0x6B1E],
- ["A4ED",0x6B20],
- ["A6B8",0x6B21],
- ["AA59",0x6B23],
- ["CCE9",0x6B25],
- ["CF64",0x6B28],
- ["D1F5",0x6B2C],
- ["D1F7",0x6B2D],
- ["D1F6",0x6B2F],
- ["D1F8",0x6B31],
- ["B1FD",0x6B32],
- ["D5D7",0x6B33],
- ["D1F9",0x6B34],
- ["D5D6",0x6B36],
- ["D5D8",0x6B37],
- ["D5D9",0x6B38],
- ["D9DA",0x6B39],
- ["B4DB",0x6B3A],
- ["D9DB",0x6B3B],
- ["D9DD",0x6B3C],
- ["B4DC",0x6B3D],
- ["B4DA",0x6B3E],
- ["D9DC",0x6B3F],
- ["DDFA",0x6B41],
- ["DDF8",0x6B42],
- ["DDF7",0x6B43],
- ["DDF6",0x6B45],
- ["DDF5",0x6B46],
- ["B7B2",0x6B47],
- ["DDF9",0x6B48],
- ["BA70",0x6B49],
- ["E263",0x6B4A],
- ["E265",0x6B4B],
- ["BA71",0x6B4C],
- ["E264",0x6B4D],
- ["BCDB",0x6B4E],
- ["BCDA",0x6B50],
- ["E5F0",0x6B51],
- ["E9DF",0x6B54],
- ["E9DE",0x6B55],
- ["E9E0",0x6B56],
- ["BEF9",0x6B59],
- ["ED4B",0x6B5B],
- ["C0D3",0x6B5C],
- ["EFE8",0x6B5E],
- ["C26A",0x6B5F],
- ["F259",0x6B60],
- ["C577",0x6B61],
- ["A4EE",0x6B62],
- ["A5BF",0x6B63],
- ["A6B9",0x6B64],
- ["A842",0x6B65],
- ["AA5A",0x6B66],
- ["AA5B",0x6B67],
- ["AC6E",0x6B6A],
- ["D1FA",0x6B6D],
- ["B7B3",0x6B72],
- ["E6D1",0x6B76],
- ["BEFA",0x6B77],
- ["C26B",0x6B78],
- ["A4EF",0x6B79],
- ["A6BA",0x6B7B],
- ["CCEB",0x6B7E],
- ["AA5C",0x6B7F],
- ["CCEA",0x6B80],
- ["CF65",0x6B82],
- ["AC6F",0x6B83],
- ["CF66",0x6B84],
- ["AC70",0x6B86],
- ["D1FC",0x6B88],
- ["AEEE",0x6B89],
- ["AEED",0x6B8A],
- ["D5DE",0x6B8C],
- ["D5DC",0x6B8D],
- ["D5DD",0x6B8E],
- ["D5DB",0x6B8F],
- ["D5DA",0x6B91],
- ["D9DE",0x6B94],
- ["D9E1",0x6B95],
- ["B4DE",0x6B96],
- ["D9DF",0x6B97],
- ["B4DD",0x6B98],
- ["D9E0",0x6B99],
- ["DDFB",0x6B9B],
- ["E266",0x6B9E],
- ["E267",0x6B9F],
- ["E268",0x6BA0],
- ["E5F3",0x6BA2],
- ["E5F2",0x6BA3],
- ["BCDC",0x6BA4],
- ["E5F1",0x6BA5],
- ["E5F4",0x6BA6],
- ["E9E1",0x6BA7],
- ["E9E2",0x6BAA],
- ["E9E3",0x6BAB],
- ["ED4C",0x6BAD],
- ["C0D4",0x6BAE],
- ["C26C",0x6BAF],
- ["F25A",0x6BB0],
- ["C4E8",0x6BB2],
- ["C95F",0x6BB3],
- ["AC71",0x6BB5],
- ["CF67",0x6BB6],
- ["AEEF",0x6BB7],
- ["B1FE",0x6BBA],
- ["B4DF",0x6BBC],
- ["D9E2",0x6BBD],
- ["B7B5",0x6BBF],
- ["B7B4",0x6BC0],
- ["E269",0x6BC3],
- ["E26A",0x6BC4],
- ["BCDD",0x6BC5],
- ["BCDE",0x6BC6],
- ["E9E5",0x6BC7],
- ["E9E4",0x6BC8],
- ["EFE9",0x6BC9],
- ["F7E3",0x6BCA],
- ["A4F0",0x6BCB],
- ["C960",0x6BCC],
- ["A5C0",0x6BCD],
- ["A843",0x6BCF],
- ["CB48",0x6BD0],
- ["AC72",0x6BD2],
- ["B7B6",0x6BD3],
- ["A4F1",0x6BD4],
- ["CF68",0x6BD6],
- ["AC73",0x6BD7],
- ["CF69",0x6BD8],
- ["C0D5",0x6BDA],
- ["A4F2",0x6BDB],
- ["CCEC",0x6BDE],
- ["CF6A",0x6BE0],
- ["D242",0x6BE2],
- ["D241",0x6BE3],
- ["D1FE",0x6BE4],
- ["D1FD",0x6BE6],
- ["D243",0x6BE7],
- ["D240",0x6BE8],
- ["B240",0x6BEB],
- ["B241",0x6BEC],
- ["B4E0",0x6BEF],
- ["D9E3",0x6BF0],
- ["D9E4",0x6BF2],
- ["D9E5",0x6BF3],
- ["DE41",0x6BF7],
- ["DE42",0x6BF8],
- ["DE40",0x6BF9],
- ["DDFD",0x6BFB],
- ["DDFE",0x6BFC],
- ["B7B7",0x6BFD],
- ["E26B",0x6BFE],
- ["E5F7",0x6BFF],
- ["E5F6",0x6C00],
- ["E5F5",0x6C01],
- ["E5F8",0x6C02],
- ["E9E7",0x6C03],
- ["E9E6",0x6C04],
- ["BEFB",0x6C05],
- ["E9E8",0x6C06],
- ["C0D6",0x6C08],
- ["ED4D",0x6C09],
- ["EFEA",0x6C0B],
- ["F25B",0x6C0C],
- ["F6E7",0x6C0D],
- ["A4F3",0x6C0F],
- ["A5C2",0x6C10],
- ["A5C1",0x6C11],
- ["AA5D",0x6C13],
- ["C961",0x6C14],
- ["C97E",0x6C15],
- ["A6BB",0x6C16],
- ["C9F7",0x6C18],
- ["CB49",0x6C19],
- ["CB4A",0x6C1A],
- ["AA5E",0x6C1B],
- ["CCED",0x6C1D],
- ["AC74",0x6C1F],
- ["CF6B",0x6C20],
- ["CF6C",0x6C21],
- ["AEF0",0x6C23],
- ["AEF4",0x6C24],
- ["D244",0x6C25],
- ["AEF3",0x6C26],
- ["AEF1",0x6C27],
- ["AEF2",0x6C28],
- ["D5DF",0x6C2A],
- ["B242",0x6C2B],
- ["B4E3",0x6C2C],
- ["B4E1",0x6C2E],
- ["B4E2",0x6C2F],
- ["D9E6",0x6C30],
- ["BA72",0x6C33],
- ["A4F4",0x6C34],
- ["C9A1",0x6C36],
- ["A5C3",0x6C38],
- ["C9A4",0x6C3B],
- ["A5C6",0x6C3E],
- ["C9A3",0x6C3F],
- ["A5C5",0x6C40],
- ["A5C4",0x6C41],
- ["A844",0x6C42],
- ["C9A2",0x6C43],
- ["C9F8",0x6C46],
- ["C9FC",0x6C4A],
- ["C9FE",0x6C4B],
- ["CA40",0x6C4C],
- ["A6C5",0x6C4D],
- ["A6C6",0x6C4E],
- ["C9FB",0x6C4F],
- ["A6C1",0x6C50],
- ["C9F9",0x6C52],
- ["C9FD",0x6C54],
- ["A6C2",0x6C55],
- ["A6BD",0x6C57],
- ["A6BE",0x6C59],
- ["A6C4",0x6C5B],
- ["C9FA",0x6C5C],
- ["A6BC",0x6C5D],
- ["A845",0x6C5E],
- ["A6BF",0x6C5F],
- ["A6C0",0x6C60],
- ["A6C3",0x6C61],
- ["CB5B",0x6C65],
- ["CB59",0x6C66],
- ["CB4C",0x6C67],
- ["A851",0x6C68],
- ["CB53",0x6C69],
- ["A84C",0x6C6A],
- ["CB4D",0x6C6B],
- ["CB55",0x6C6D],
- ["CB52",0x6C6F],
- ["A84F",0x6C70],
- ["CB51",0x6C71],
- ["A856",0x6C72],
- ["CB5A",0x6C73],
- ["A858",0x6C74],
- ["A85A",0x6C76],
- ["CB4B",0x6C78],
- ["A84D",0x6C7A],
- ["CB5C",0x6C7B],
- ["A854",0x6C7D],
- ["A857",0x6C7E],
- ["CD45",0x6C80],
- ["A847",0x6C81],
- ["A85E",0x6C82],
- ["A855",0x6C83],
- ["CB4E",0x6C84],
- ["A84A",0x6C85],
- ["A859",0x6C86],
- ["CB56",0x6C87],
- ["A848",0x6C88],
- ["A849",0x6C89],
- ["CD43",0x6C8A],
- ["CB4F",0x6C8B],
- ["A850",0x6C8C],
- ["A85B",0x6C8D],
- ["CB5D",0x6C8E],
- ["CB50",0x6C8F],
- ["A84E",0x6C90],
- ["A853",0x6C92],
- ["CCEE",0x6C93],
- ["A85C",0x6C94],
- ["CB57",0x6C95],
- ["A852",0x6C96],
- ["A85D",0x6C98],
- ["A846",0x6C99],
- ["CB54",0x6C9A],
- ["A84B",0x6C9B],
- ["CB58",0x6C9C],
- ["CD44",0x6C9D],
- ["AA6A",0x6CAB],
- ["AA7A",0x6CAC],
- ["CCF5",0x6CAD],
- ["AA71",0x6CAE],
- ["CD4B",0x6CB0],
- ["AA62",0x6CB1],
- ["AA65",0x6CB3],
- ["CD42",0x6CB4],
- ["CCF3",0x6CB6],
- ["CCF7",0x6CB7],
- ["AA6D",0x6CB8],
- ["AA6F",0x6CB9],
- ["CCFA",0x6CBA],
- ["AA76",0x6CBB],
- ["AA68",0x6CBC],
- ["AA66",0x6CBD],
- ["AA67",0x6CBE],
- ["AA75",0x6CBF],
- ["CD47",0x6CC0],
- ["AA70",0x6CC1],
- ["CCF9",0x6CC2],
- ["CCFB",0x6CC3],
- ["AA6E",0x6CC4],
- ["AA73",0x6CC5],
- ["CCFC",0x6CC6],
- ["CD4A",0x6CC7],
- ["AC75",0x6CC9],
- ["AA79",0x6CCA],
- ["AA63",0x6CCC],
- ["CD49",0x6CCD],
- ["CD4D",0x6CCF],
- ["CCF8",0x6CD0],
- ["CD4F",0x6CD1],
- ["CD40",0x6CD2],
- ["AA6C",0x6CD3],
- ["CCF4",0x6CD4],
- ["AA6B",0x6CD5],
- ["AA7D",0x6CD6],
- ["AA72",0x6CD7],
- ["CCF2",0x6CD9],
- ["CF75",0x6CDA],
- ["AA78",0x6CDB],
- ["AA7C",0x6CDC],
- ["CD41",0x6CDD],
- ["CD46",0x6CDE],
- ["AA7E",0x6CE0],
- ["AA77",0x6CE1],
- ["AA69",0x6CE2],
- ["AA5F",0x6CE3],
- ["AA64",0x6CE5],
- ["CCF6",0x6CE7],
- ["AA60",0x6CE8],
- ["CD4E",0x6CE9],
- ["CCF0",0x6CEB],
- ["CCEF",0x6CEC],
- ["CCFD",0x6CED],
- ["CCF1",0x6CEE],
- ["AA7B",0x6CEF],
- ["AEF5",0x6CF0],
- ["AA74",0x6CF1],
- ["CCFE",0x6CF2],
- ["AA61",0x6CF3],
- ["ACA6",0x6CF5],
- ["CD4C",0x6CF9],
- ["CF7C",0x6D00],
- ["CFA1",0x6D01],
- ["CFA4",0x6D03],
- ["CF77",0x6D04],
- ["CFA7",0x6D07],
- ["CFAA",0x6D08],
- ["CFAC",0x6D09],
- ["CF74",0x6D0A],
- ["AC76",0x6D0B],
- ["AC7B",0x6D0C],
- ["D249",0x6D0D],
- ["ACAD",0x6D0E],
- ["CFA5",0x6D0F],
- ["CFAD",0x6D10],
- ["CF7B",0x6D11],
- ["CF73",0x6D12],
- ["D264",0x6D16],
- ["AC7E",0x6D17],
- ["CFA2",0x6D18],
- ["CF78",0x6D19],
- ["CF7A",0x6D1A],
- ["ACA5",0x6D1B],
- ["CF7D",0x6D1D],
- ["AC7D",0x6D1E],
- ["CF70",0x6D1F],
- ["CFA8",0x6D20],
- ["CFAB",0x6D22],
- ["AC7A",0x6D25],
- ["ACA8",0x6D27],
- ["CF6D",0x6D28],
- ["ACAA",0x6D29],
- ["AC78",0x6D2A],
- ["ACAE",0x6D2B],
- ["CFA9",0x6D2C],
- ["CF6F",0x6D2D],
- ["ACAB",0x6D2E],
- ["D25E",0x6D2F],
- ["CD48",0x6D30],
- ["AC7C",0x6D31],
- ["AC77",0x6D32],
- ["CF76",0x6D33],
- ["CF6E",0x6D34],
- ["ACAC",0x6D35],
- ["ACA4",0x6D36],
- ["CFA3",0x6D37],
- ["ACA9",0x6D38],
- ["ACA7",0x6D39],
- ["CF79",0x6D3A],
- ["ACA1",0x6D3B],
- ["CF71",0x6D3C],
- ["ACA2",0x6D3D],
- ["ACA3",0x6D3E],
- ["CF72",0x6D3F],
- ["CFA6",0x6D40],
- ["AC79",0x6D41],
- ["CF7E",0x6D42],
- ["D24C",0x6D58],
- ["AEFD",0x6D59],
- ["AF43",0x6D5A],
- ["D255",0x6D5E],
- ["D25B",0x6D5F],
- ["D257",0x6D60],
- ["D24A",0x6D61],
- ["D24D",0x6D62],
- ["D246",0x6D63],
- ["D247",0x6D64],
- ["AF4A",0x6D65],
- ["AEFA",0x6D66],
- ["D256",0x6D67],
- ["D25F",0x6D68],
- ["AF45",0x6D69],
- ["AEF6",0x6D6A],
- ["AF40",0x6D6C],
- ["D24E",0x6D6D],
- ["AF42",0x6D6E],
- ["D24F",0x6D6F],
- ["D259",0x6D70],
- ["AF44",0x6D74],
- ["D268",0x6D75],
- ["D248",0x6D76],
- ["AEFC",0x6D77],
- ["AEFB",0x6D78],
- ["AF48",0x6D79],
- ["D245",0x6D7A],
- ["D266",0x6D7B],
- ["D25A",0x6D7C],
- ["D267",0x6D7D],
- ["D261",0x6D7E],
- ["D253",0x6D7F],
- ["D262",0x6D80],
- ["D25C",0x6D82],
- ["D265",0x6D83],
- ["D263",0x6D84],
- ["AF49",0x6D85],
- ["D254",0x6D86],
- ["AEF9",0x6D87],
- ["AEF8",0x6D88],
- ["AF41",0x6D89],
- ["AF47",0x6D8A],
- ["D260",0x6D8B],
- ["AF46",0x6D8C],
- ["D251",0x6D8D],
- ["B243",0x6D8E],
- ["D269",0x6D90],
- ["D250",0x6D91],
- ["D24B",0x6D92],
- ["AEFE",0x6D93],
- ["AF4B",0x6D94],
- ["AEF7",0x6D95],
- ["D258",0x6D97],
- ["D25D",0x6D98],
- ["B265",0x6DAA],
- ["D5E1",0x6DAB],
- ["D5E5",0x6DAC],
- ["B252",0x6DAE],
- ["B250",0x6DAF],
- ["B247",0x6DB2],
- ["D5E3",0x6DB3],
- ["D5E2",0x6DB4],
- ["B25B",0x6DB5],
- ["D5E8",0x6DB7],
- ["B255",0x6DB8],
- ["D5FA",0x6DBA],
- ["D647",0x6DBB],
- ["B244",0x6DBC],
- ["D5F7",0x6DBD],
- ["D5F0",0x6DBE],
- ["B267",0x6DBF],
- ["D5E0",0x6DC0],
- ["D5FC",0x6DC2],
- ["B264",0x6DC4],
- ["B258",0x6DC5],
- ["B263",0x6DC6],
- ["B24E",0x6DC7],
- ["D5EC",0x6DC8],
- ["D5FE",0x6DC9],
- ["D5F6",0x6DCA],
- ["B24F",0x6DCB],
- ["B249",0x6DCC],
- ["D645",0x6DCD],
- ["D5FD",0x6DCF],
- ["D640",0x6DD0],
- ["B251",0x6DD1],
- ["B259",0x6DD2],
- ["D642",0x6DD3],
- ["D5EA",0x6DD4],
- ["D5FB",0x6DD5],
- ["D5EF",0x6DD6],
- ["D644",0x6DD7],
- ["B25E",0x6DD8],
- ["B246",0x6DD9],
- ["B25C",0x6DDA],
- ["D5F4",0x6DDB],
- ["D5F2",0x6DDC],
- ["D5F3",0x6DDD],
- ["B253",0x6DDE],
- ["D5EE",0x6DDF],
- ["D5ED",0x6DE0],
- ["B248",0x6DE1],
- ["D5E7",0x6DE2],
- ["D646",0x6DE3],
- ["B24A",0x6DE4],
- ["D5F1",0x6DE5],
- ["B268",0x6DE6],
- ["B262",0x6DE8],
- ["D5E6",0x6DE9],
- ["B25F",0x6DEA],
- ["B25D",0x6DEB],
- ["B266",0x6DEC],
- ["D5F8",0x6DED],
- ["B261",0x6DEE],
- ["D252",0x6DEF],
- ["D5F9",0x6DF0],
- ["B260",0x6DF1],
- ["D641",0x6DF2],
- ["B245",0x6DF3],
- ["D5F5",0x6DF4],
- ["B257",0x6DF5],
- ["D5E9",0x6DF6],
- ["B256",0x6DF7],
- ["B254",0x6DF9],
- ["B24C",0x6DFA],
- ["B24B",0x6DFB],
- ["D9E7",0x6DFC],
- ["D643",0x6DFD],
- ["D5EB",0x6E00],
- ["D9FC",0x6E03],
- ["B24D",0x6E05],
- ["B541",0x6E19],
- ["B25A",0x6E1A],
- ["B4EE",0x6E1B],
- ["D9F6",0x6E1C],
- ["B4FC",0x6E1D],
- ["D9EA",0x6E1F],
- ["B4EB",0x6E20],
- ["B4E7",0x6E21],
- ["DA49",0x6E22],
- ["B4ED",0x6E23],
- ["B4F1",0x6E24],
- ["B4EC",0x6E25],
- ["B4F5",0x6E26],
- ["DA4D",0x6E27],
- ["DA44",0x6E28],
- ["D9F1",0x6E2B],
- ["B4FA",0x6E2C],
- ["B4F4",0x6E2D],
- ["D9FD",0x6E2E],
- ["B4E4",0x6E2F],
- ["DA4A",0x6E30],
- ["DA43",0x6E31],
- ["B4E8",0x6E32],
- ["D9F7",0x6E33],
- ["B4F7",0x6E34],
- ["DA55",0x6E35],
- ["DA56",0x6E36],
- ["B4E5",0x6E38],
- ["DA48",0x6E39],
- ["B4F9",0x6E3A],
- ["D9FB",0x6E3B],
- ["D9ED",0x6E3C],
- ["D9EE",0x6E3D],
- ["B4FD",0x6E3E],
- ["D9F2",0x6E3F],
- ["D9F9",0x6E40],
- ["D9F3",0x6E41],
- ["B4FB",0x6E43],
- ["B544",0x6E44],
- ["D9EF",0x6E45],
- ["D9E8",0x6E46],
- ["D9E9",0x6E47],
- ["D9EB",0x6E49],
- ["B4EA",0x6E4A],
- ["D9F8",0x6E4B],
- ["B4F8",0x6E4D],
- ["B542",0x6E4E],
- ["D9FA",0x6E51],
- ["DA53",0x6E52],
- ["DA4B",0x6E53],
- ["B4E6",0x6E54],
- ["DA51",0x6E55],
- ["B4F2",0x6E56],
- ["B4F0",0x6E58],
- ["DA57",0x6E5A],
- ["B4EF",0x6E5B],
- ["DA41",0x6E5C],
- ["D9F4",0x6E5D],
- ["D9FE",0x6E5E],
- ["B547",0x6E5F],
- ["DA45",0x6E60],
- ["DA42",0x6E61],
- ["D9F0",0x6E62],
- ["B543",0x6E63],
- ["DA4F",0x6E64],
- ["DA4C",0x6E65],
- ["DA54",0x6E66],
- ["B4E9",0x6E67],
- ["DA40",0x6E68],
- ["B546",0x6E69],
- ["DA47",0x6E6B],
- ["B4F3",0x6E6E],
- ["B4F6",0x6E6F],
- ["DA46",0x6E71],
- ["B545",0x6E72],
- ["D9F5",0x6E73],
- ["D5E4",0x6E74],
- ["DA50",0x6E77],
- ["DA4E",0x6E78],
- ["DA52",0x6E79],
- ["D9EC",0x6E88],
- ["B540",0x6E89],
- ["DE61",0x6E8D],
- ["DE60",0x6E8E],
- ["DE46",0x6E8F],
- ["B7BD",0x6E90],
- ["DE5F",0x6E92],
- ["DE49",0x6E93],
- ["DE4A",0x6E94],
- ["B7C7",0x6E96],
- ["DE68",0x6E97],
- ["B7C2",0x6E98],
- ["DE5E",0x6E99],
- ["DE43",0x6E9B],
- ["B7C8",0x6E9C],
- ["B7BE",0x6E9D],
- ["DE52",0x6E9E],
- ["DE48",0x6E9F],
- ["DE4B",0x6EA0],
- ["DE63",0x6EA1],
- ["B7B8",0x6EA2],
- ["DE6A",0x6EA3],
- ["DE62",0x6EA4],
- ["B7C1",0x6EA5],
- ["DE57",0x6EA6],
- ["B7CC",0x6EA7],
- ["B7CB",0x6EAA],
- ["B7C5",0x6EAB],
- ["DE69",0x6EAE],
- ["B7B9",0x6EAF],
- ["DE55",0x6EB0],
- ["DE4C",0x6EB1],
- ["DE59",0x6EB2],
- ["DE65",0x6EB3],
- ["B7CD",0x6EB4],
- ["B7BB",0x6EB6],
- ["DE54",0x6EB7],
- ["DE4D",0x6EB9],
- ["B7C4",0x6EBA],
- ["B7C3",0x6EBC],
- ["DE50",0x6EBD],
- ["DE5A",0x6EBE],
- ["DE64",0x6EBF],
- ["DE47",0x6EC0],
- ["DE51",0x6EC1],
- ["B7BC",0x6EC2],
- ["DE5B",0x6EC3],
- ["B7C9",0x6EC4],
- ["B7C0",0x6EC5],
- ["DE4E",0x6EC6],
- ["B7BF",0x6EC7],
- ["DE45",0x6EC8],
- ["DE53",0x6EC9],
- ["DE67",0x6ECA],
- ["B4FE",0x6ECB],
- ["BAB0",0x6ECC],
- ["DE56",0x6ECD],
- ["E26C",0x6ECE],
- ["DE58",0x6ECF],
- ["DE66",0x6ED0],
- ["B7C6",0x6ED1],
- ["DE4F",0x6ED2],
- ["B7BA",0x6ED3],
- ["B7CA",0x6ED4],
- ["BCF0",0x6ED5],
- ["DE44",0x6ED6],
- ["DE5D",0x6ED8],
- ["DE5C",0x6EDC],
- ["E2AA",0x6EEB],
- ["BAAD",0x6EEC],
- ["E27D",0x6EED],
- ["E2A4",0x6EEE],
- ["BAA2",0x6EEF],
- ["E26E",0x6EF1],
- ["BAAF",0x6EF2],
- ["BA77",0x6EF4],
- ["E26D",0x6EF5],
- ["E2B0",0x6EF6],
- ["BAB1",0x6EF7],
- ["E271",0x6EF8],
- ["E2A3",0x6EF9],
- ["E273",0x6EFB],
- ["E2B3",0x6EFC],
- ["E2AF",0x6EFD],
- ["BA75",0x6EFE],
- ["BAA1",0x6EFF],
- ["E653",0x6F00],
- ["BAAE",0x6F01],
- ["BA7D",0x6F02],
- ["E26F",0x6F03],
- ["E2AE",0x6F05],
- ["BAA3",0x6F06],
- ["E2AB",0x6F07],
- ["E2B8",0x6F08],
- ["E275",0x6F09],
- ["E27E",0x6F0A],
- ["E2B6",0x6F0D],
- ["E2AC",0x6F0E],
- ["BA7C",0x6F0F],
- ["E27C",0x6F12],
- ["BA76",0x6F13],
- ["BA74",0x6F14],
- ["BAA8",0x6F15],
- ["E27A",0x6F18],
- ["E277",0x6F19],
- ["E278",0x6F1A],
- ["E2B2",0x6F1C],
- ["E2B7",0x6F1E],
- ["E2B5",0x6F1F],
- ["BA7A",0x6F20],
- ["E2B9",0x6F21],
- ["BA7E",0x6F22],
- ["BAA7",0x6F23],
- ["E270",0x6F25],
- ["E5FA",0x6F26],
- ["E279",0x6F27],
- ["BA78",0x6F29],
- ["BAAC",0x6F2A],
- ["BAA9",0x6F2B],
- ["BA7B",0x6F2C],
- ["E2A5",0x6F2D],
- ["E274",0x6F2E],
- ["BAAA",0x6F2F],
- ["E2A7",0x6F30],
- ["BAA4",0x6F31],
- ["BAA6",0x6F32],
- ["BA73",0x6F33],
- ["E2A9",0x6F35],
- ["E2A1",0x6F36],
- ["E272",0x6F37],
- ["BAA5",0x6F38],
- ["E2B1",0x6F39],
- ["E2B4",0x6F3A],
- ["E27B",0x6F3B],
- ["E2A8",0x6F3C],
- ["BA79",0x6F3E],
- ["BCDF",0x6F3F],
- ["E2A6",0x6F40],
- ["E5F9",0x6F41],
- ["E2AD",0x6F43],
- ["E276",0x6F4E],
- ["E644",0x6F4F],
- ["E64E",0x6F50],
- ["BCE2",0x6F51],
- ["E64D",0x6F52],
- ["E659",0x6F53],
- ["BCE4",0x6F54],
- ["E64B",0x6F55],
- ["E64F",0x6F57],
- ["BCEF",0x6F58],
- ["E646",0x6F5A],
- ["BCE7",0x6F5B],
- ["E652",0x6F5D],
- ["E9F0",0x6F5E],
- ["BCF3",0x6F5F],
- ["BCF2",0x6F60],
- ["E654",0x6F61],
- ["E643",0x6F62],
- ["E65E",0x6F63],
- ["BCED",0x6F64],
- ["BCE3",0x6F66],
- ["E657",0x6F67],
- ["E65B",0x6F69],
- ["E660",0x6F6A],
- ["E655",0x6F6B],
- ["E649",0x6F6C],
- ["BCE6",0x6F6D],
- ["BCE9",0x6F6E],
- ["BCF1",0x6F6F],
- ["BCEC",0x6F70],
- ["E64C",0x6F72],
- ["E2A2",0x6F73],
- ["E648",0x6F76],
- ["E65F",0x6F77],
- ["BCE8",0x6F78],
- ["BCEB",0x6F7A],
- ["E661",0x6F7B],
- ["BCE0",0x6F7C],
- ["E656",0x6F7D],
- ["E5FB",0x6F7E],
- ["E65C",0x6F7F],
- ["C0DF",0x6F80],
- ["E64A",0x6F82],
- ["BCE1",0x6F84],
- ["E645",0x6F85],
- ["BCE5",0x6F86],
- ["E5FC",0x6F87],
- ["BAAB",0x6F88],
- ["E641",0x6F89],
- ["E65A",0x6F8B],
- ["E642",0x6F8C],
- ["E640",0x6F8D],
- ["BCEA",0x6F8E],
- ["E658",0x6F90],
- ["E5FE",0x6F92],
- ["E651",0x6F93],
- ["E650",0x6F94],
- ["E65D",0x6F95],
- ["E647",0x6F96],
- ["BCEE",0x6F97],
- ["E9F3",0x6F9E],
- ["BF49",0x6FA0],
- ["BEFE",0x6FA1],
- ["EA40",0x6FA2],
- ["E9EB",0x6FA3],
- ["BF41",0x6FA4],
- ["E9F7",0x6FA5],
- ["BF48",0x6FA6],
- ["BF43",0x6FA7],
- ["E9F5",0x6FA8],
- ["ED4F",0x6FA9],
- ["E9FB",0x6FAA],
- ["EA42",0x6FAB],
- ["E9FA",0x6FAC],
- ["E9E9",0x6FAD],
- ["E9F8",0x6FAE],
- ["EA44",0x6FAF],
- ["EA46",0x6FB0],
- ["BEFD",0x6FB1],
- ["EA45",0x6FB2],
- ["BF44",0x6FB3],
- ["BF4A",0x6FB4],
- ["BF47",0x6FB6],
- ["E9FE",0x6FB8],
- ["BF46",0x6FB9],
- ["E9F9",0x6FBA],
- ["E9ED",0x6FBC],
- ["E9F2",0x6FBD],
- ["E9FD",0x6FBF],
- ["BF45",0x6FC0],
- ["BF42",0x6FC1],
- ["BEFC",0x6FC2],
- ["BF40",0x6FC3],
- ["E9F1",0x6FC4],
- ["E5FD",0x6FC6],
- ["E9EC",0x6FC7],
- ["E9EF",0x6FC8],
- ["EA41",0x6FC9],
- ["E9F4",0x6FCA],
- ["E9EA",0x6FCB],
- ["ED4E",0x6FCC],
- ["EA43",0x6FCD],
- ["E9EE",0x6FCE],
- ["E9FC",0x6FCF],
- ["ED51",0x6FD4],
- ["C0E3",0x6FD5],
- ["C0D7",0x6FD8],
- ["C0DB",0x6FDB],
- ["ED53",0x6FDC],
- ["ED59",0x6FDD],
- ["ED57",0x6FDE],
- ["C0D9",0x6FDF],
- ["C0DA",0x6FE0],
- ["C0E1",0x6FE1],
- ["ED5A",0x6FE2],
- ["ED52",0x6FE3],
- ["C0DC",0x6FE4],
- ["ED56",0x6FE6],
- ["ED55",0x6FE7],
- ["ED5B",0x6FE8],
- ["C0E2",0x6FE9],
- ["C0DD",0x6FEB],
- ["C0E0",0x6FEC],
- ["ED54",0x6FED],
- ["C0E4",0x6FEE],
- ["C0DE",0x6FEF],
- ["C0E5",0x6FF0],
- ["C0D8",0x6FF1],
- ["ED58",0x6FF2],
- ["ED50",0x6FF4],
- ["EFF7",0x6FF7],
- ["C271",0x6FFA],
- ["EFF4",0x6FFB],
- ["EFF6",0x6FFC],
- ["C26F",0x6FFE],
- ["EFF2",0x6FFF],
- ["EFF3",0x7000],
- ["EFEE",0x7001],
- ["E9F6",0x7004],
- ["EFEF",0x7005],
- ["C270",0x7006],
- ["EFEB",0x7007],
- ["C26D",0x7009],
- ["EFF8",0x700A],
- ["C26E",0x700B],
- ["EFEC",0x700C],
- ["EFED",0x700D],
- ["EFF1",0x700E],
- ["C273",0x700F],
- ["C272",0x7011],
- ["EFF0",0x7014],
- ["C378",0x7015],
- ["F25F",0x7016],
- ["F265",0x7017],
- ["C379",0x7018],
- ["F25C",0x7019],
- ["C376",0x701A],
- ["C373",0x701B],
- ["F267",0x701C],
- ["C377",0x701D],
- ["C374",0x701F],
- ["F25E",0x7020],
- ["F261",0x7021],
- ["F262",0x7022],
- ["F263",0x7023],
- ["F266",0x7024],
- ["EFF5",0x7026],
- ["F25D",0x7027],
- ["C375",0x7028],
- ["F264",0x7029],
- ["F268",0x702A],
- ["F260",0x702B],
- ["F45D",0x702F],
- ["C46A",0x7030],
- ["F460",0x7031],
- ["C46B",0x7032],
- ["F468",0x7033],
- ["F45F",0x7034],
- ["F45C",0x7035],
- ["F45E",0x7037],
- ["F462",0x7038],
- ["F465",0x7039],
- ["F464",0x703A],
- ["F467",0x703B],
- ["F45B",0x703C],
- ["C469",0x703E],
- ["F463",0x703F],
- ["F466",0x7040],
- ["F469",0x7041],
- ["F461",0x7042],
- ["F5D3",0x7043],
- ["F5D4",0x7044],
- ["F5D8",0x7045],
- ["F5D9",0x7046],
- ["F5D6",0x7048],
- ["F5D7",0x7049],
- ["F5D5",0x704A],
- ["C4E9",0x704C],
- ["C578",0x7051],
- ["F6EB",0x7052],
- ["F6E8",0x7055],
- ["F6E9",0x7056],
- ["F6EA",0x7057],
- ["C579",0x7058],
- ["F7E5",0x705A],
- ["F7E4",0x705B],
- ["F8AF",0x705D],
- ["C5F4",0x705E],
- ["F8AD",0x705F],
- ["F8B0",0x7060],
- ["F8AE",0x7061],
- ["F8F5",0x7062],
- ["C657",0x7063],
- ["C665",0x7064],
- ["F9A3",0x7065],
- ["F96C",0x7066],
- ["F9A2",0x7068],
- ["F9D0",0x7069],
- ["F9D1",0x706A],
- ["A4F5",0x706B],
- ["A6C7",0x7070],
- ["CA41",0x7071],
- ["CB5E",0x7074],
- ["A85F",0x7076],
- ["A862",0x7078],
- ["CB5F",0x707A],
- ["A860",0x707C],
- ["A861",0x707D],
- ["CD58",0x7082],
- ["CD5A",0x7083],
- ["CD55",0x7084],
- ["CD52",0x7085],
- ["CD54",0x7086],
- ["AAA4",0x708A],
- ["AAA2",0x708E],
- ["CD56",0x7091],
- ["AAA3",0x7092],
- ["CD53",0x7093],
- ["CD50",0x7094],
- ["AAA1",0x7095],
- ["CD57",0x7096],
- ["CD51",0x7098],
- ["AAA5",0x7099],
- ["CD59",0x709A],
- ["CFAF",0x709F],
- ["CFB3",0x70A1],
- ["ACB7",0x70A4],
- ["CFB6",0x70A9],
- ["ACAF",0x70AB],
- ["ACB2",0x70AC],
- ["ACB4",0x70AD],
- ["ACB6",0x70AE],
- ["ACB3",0x70AF],
- ["CFB2",0x70B0],
- ["CFB1",0x70B1],
- ["ACB1",0x70B3],
- ["CFB4",0x70B4],
- ["CFB5",0x70B5],
- ["CFAE",0x70B7],
- ["ACB5",0x70B8],
- ["ACB0",0x70BA],
- ["CFB0",0x70BE],
- ["D277",0x70C5],
- ["D278",0x70C6],
- ["D279",0x70C7],
- ["AF50",0x70C8],
- ["AF4C",0x70CA],
- ["D26E",0x70CB],
- ["D276",0x70CD],
- ["D27B",0x70CE],
- ["AF51",0x70CF],
- ["D26C",0x70D1],
- ["D272",0x70D2],
- ["D26B",0x70D3],
- ["D275",0x70D4],
- ["D271",0x70D7],
- ["AF4D",0x70D8],
- ["AF4F",0x70D9],
- ["D27A",0x70DA],
- ["D26A",0x70DC],
- ["D26D",0x70DD],
- ["D273",0x70DE],
- ["D274",0x70E0],
- ["D27C",0x70E1],
- ["D270",0x70E2],
- ["AF4E",0x70E4],
- ["B26D",0x70EF],
- ["D64E",0x70F0],
- ["D650",0x70F3],
- ["D64C",0x70F4],
- ["D658",0x70F6],
- ["D64A",0x70F7],
- ["D657",0x70F8],
- ["B269",0x70F9],
- ["D648",0x70FA],
- ["DA5B",0x70FB],
- ["D652",0x70FC],
- ["B26C",0x70FD],
- ["D653",0x70FF],
- ["D656",0x7100],
- ["D65A",0x7102],
- ["D64F",0x7104],
- ["D654",0x7106],
- ["B26A",0x7109],
- ["B26B",0x710A],
- ["D659",0x710B],
- ["D64D",0x710C],
- ["D649",0x710D],
- ["D65B",0x710E],
- ["D651",0x7110],
- ["D655",0x7113],
- ["D64B",0x7117],
- ["B548",0x7119],
- ["B549",0x711A],
- ["DA65",0x711B],
- ["B54F",0x711C],
- ["DA59",0x711E],
- ["DA62",0x711F],
- ["DA58",0x7120],
- ["B54C",0x7121],
- ["DA60",0x7122],
- ["DA5E",0x7123],
- ["DA5F",0x7125],
- ["B54A",0x7126],
- ["DA63",0x7128],
- ["DA5C",0x712E],
- ["DA5A",0x712F],
- ["B54B",0x7130],
- ["DA5D",0x7131],
- ["DA61",0x7132],
- ["B54D",0x7136],
- ["DA64",0x713A],
- ["DE70",0x7141],
- ["DE77",0x7142],
- ["DE79",0x7143],
- ["DEA1",0x7144],
- ["B7DA",0x7146],
- ["DE6B",0x7147],
- ["B7D2",0x7149],
- ["DE7A",0x714B],
- ["B7D7",0x714C],
- ["DEA2",0x714D],
- ["B7CE",0x714E],
- ["DE7D",0x7150],
- ["DE6D",0x7152],
- ["DE7E",0x7153],
- ["DE6C",0x7154],
- ["B7DC",0x7156],
- ["DE78",0x7158],
- ["B7CF",0x7159],
- ["DEA3",0x715A],
- ["B7D4",0x715C],
- ["DE71",0x715D],
- ["B7D9",0x715E],
- ["DE7C",0x715F],
- ["DE6F",0x7160],
- ["DE76",0x7161],
- ["DE72",0x7162],
- ["DE6E",0x7163],
- ["B7D1",0x7164],
- ["B7D8",0x7165],
- ["B7D6",0x7166],
- ["B7D3",0x7167],
- ["B7DB",0x7168],
- ["B7D0",0x7169],
- ["DE75",0x716A],
- ["B7D5",0x716C],
- ["B54E",0x716E],
- ["DE7B",0x7170],
- ["DE73",0x7172],
- ["DE74",0x7178],
- ["E2C1",0x717B],
- ["BAB4",0x717D],
- ["E2BD",0x7180],
- ["E2C3",0x7181],
- ["E2BF",0x7182],
- ["BAB6",0x7184],
- ["E2BE",0x7185],
- ["E2C2",0x7186],
- ["E2BA",0x7187],
- ["E2BC",0x7189],
- ["BAB5",0x718A],
- ["E2C0",0x718F],
- ["E2BB",0x7190],
- ["BAB7",0x7192],
- ["BAB2",0x7194],
- ["E2C4",0x7197],
- ["BAB3",0x7199],
- ["E667",0x719A],
- ["E664",0x719B],
- ["E670",0x719C],
- ["E66A",0x719D],
- ["E66C",0x719E],
- ["BCF4",0x719F],
- ["E666",0x71A0],
- ["E66E",0x71A1],
- ["E66D",0x71A4],
- ["E66B",0x71A5],
- ["E671",0x71A7],
- ["BCF7",0x71A8],
- ["E668",0x71A9],
- ["E66F",0x71AA],
- ["BCF5",0x71AC],
- ["E663",0x71AF],
- ["E665",0x71B0],
- ["BCF6",0x71B1],
- ["E662",0x71B2],
- ["E672",0x71B3],
- ["E669",0x71B5],
- ["EA4A",0x71B8],
- ["BF51",0x71B9],
- ["EA55",0x71BC],
- ["EA53",0x71BD],
- ["BF4B",0x71BE],
- ["EA49",0x71BF],
- ["EA4C",0x71C0],
- ["EA4D",0x71C1],
- ["EA48",0x71C2],
- ["BF55",0x71C3],
- ["BF56",0x71C4],
- ["EA47",0x71C5],
- ["EA56",0x71C6],
- ["EA51",0x71C7],
- ["BF4F",0x71C8],
- ["BF4C",0x71C9],
- ["EA50",0x71CA],
- ["EA4E",0x71CB],
- ["BF52",0x71CE],
- ["EA52",0x71CF],
- ["BF4D",0x71D0],
- ["BF4E",0x71D2],
- ["EA4F",0x71D4],
- ["BF50",0x71D5],
- ["EA4B",0x71D6],
- ["EA54",0x71D8],
- ["BF53",0x71D9],
- ["EA57",0x71DA],
- ["EA58",0x71DB],
- ["BF54",0x71DC],
- ["C0E7",0x71DF],
- ["C0EE",0x71E0],
- ["ED5C",0x71E1],
- ["ED62",0x71E2],
- ["ED60",0x71E4],
- ["C0EA",0x71E5],
- ["C0E9",0x71E6],
- ["C0E6",0x71E7],
- ["ED5E",0x71E8],
- ["C0EC",0x71EC],
- ["C0EB",0x71ED],
- ["C0E8",0x71EE],
- ["ED61",0x71F0],
- ["ED5D",0x71F1],
- ["ED5F",0x71F2],
- ["C0ED",0x71F4],
- ["C277",0x71F8],
- ["EFFB",0x71F9],
- ["C274",0x71FB],
- ["C275",0x71FC],
- ["EFFD",0x71FD],
- ["C276",0x71FE],
- ["EFFA",0x71FF],
- ["EFF9",0x7201],
- ["F26C",0x7202],
- ["EFFC",0x7203],
- ["F26D",0x7205],
- ["C37A",0x7206],
- ["F26B",0x7207],
- ["F26A",0x720A],
- ["F269",0x720C],
- ["C37B",0x720D],
- ["C46C",0x7210],
- ["F46A",0x7213],
- ["F46B",0x7214],
- ["F5DC",0x7219],
- ["F5DB",0x721A],
- ["C4EA",0x721B],
- ["F5DA",0x721D],
- ["F6EC",0x721E],
- ["F6ED",0x721F],
- ["F7E6",0x7222],
- ["F8B1",0x7223],
- ["F8F6",0x7226],
- ["F9BC",0x7227],
- ["C679",0x7228],
- ["F9C6",0x7229],
- ["A4F6",0x722A],
- ["AAA6",0x722C],
- ["AAA7",0x722D],
- ["ACB8",0x7230],
- ["C0EF",0x7235],
- ["A4F7",0x7236],
- ["AAA8",0x7238],
- ["AF52",0x7239],
- ["B7DD",0x723A],
- ["A4F8",0x723B],
- ["B26E",0x723D],
- ["BAB8",0x723E],
- ["C962",0x723F],
- ["CFB7",0x7241],
- ["D27D",0x7242],
- ["E2C5",0x7244],
- ["C0F0",0x7246],
- ["A4F9",0x7247],
- ["AAA9",0x7248],
- ["CFB8",0x7249],
- ["CFB9",0x724A],
- ["DA66",0x724B],
- ["B550",0x724C],
- ["DEA4",0x724F],
- ["B7DE",0x7252],
- ["E2C6",0x7253],
- ["BCF8",0x7256],
- ["C37C",0x7258],
- ["A4FA",0x7259],
- ["DA67",0x725A],
- ["A4FB",0x725B],
- ["A6C9",0x725D],
- ["CA42",0x725E],
- ["A6C8",0x725F],
- ["A865",0x7260],
- ["A864",0x7261],
- ["A863",0x7262],
- ["CB60",0x7263],
- ["AAAA",0x7267],
- ["AAAB",0x7269],
- ["CD5B",0x726A],
- ["CFBA",0x726C],
- ["CFBD",0x726E],
- ["ACBA",0x726F],
- ["CFBB",0x7270],
- ["ACB9",0x7272],
- ["CFBC",0x7273],
- ["ACBB",0x7274],
- ["D2A2",0x7276],
- ["D2A1",0x7277],
- ["D27E",0x7278],
- ["AF53",0x7279],
- ["D65D",0x727B],
- ["D65E",0x727C],
- ["B26F",0x727D],
- ["D65C",0x727E],
- ["D65F",0x727F],
- ["B552",0x7280],
- ["B270",0x7281],
- ["B551",0x7284],
- ["DA6B",0x7285],
- ["DA6A",0x7286],
- ["DA68",0x7288],
- ["DA69",0x7289],
- ["DA6C",0x728B],
- ["DEA6",0x728C],
- ["DEA5",0x728D],
- ["DEA9",0x728E],
- ["DEA8",0x7290],
- ["DEA7",0x7291],
- ["BAB9",0x7292],
- ["E2C9",0x7293],
- ["E2C8",0x7295],
- ["BABA",0x7296],
- ["E2C7",0x7297],
- ["E673",0x7298],
- ["E674",0x729A],
- ["BCF9",0x729B],
- ["EA59",0x729D],
- ["EA5A",0x729E],
- ["F272",0x72A1],
- ["C37D",0x72A2],
- ["F271",0x72A3],
- ["F270",0x72A4],
- ["F26E",0x72A5],
- ["F26F",0x72A6],
- ["C4EB",0x72A7],
- ["F46C",0x72A8],
- ["F6EE",0x72A9],
- ["F8F7",0x72AA],
- ["A4FC",0x72AC],
- ["C9A5",0x72AE],
- ["A5C7",0x72AF],
- ["C9A6",0x72B0],
- ["CA43",0x72B4],
- ["CA44",0x72B5],
- ["CB66",0x72BA],
- ["CB62",0x72BD],
- ["CB61",0x72BF],
- ["AAAC",0x72C0],
- ["CB65",0x72C1],
- ["A867",0x72C2],
- ["CB63",0x72C3],
- ["A866",0x72C4],
- ["CB67",0x72C5],
- ["CB64",0x72C6],
- ["CD5F",0x72C9],
- ["CFBE",0x72CA],
- ["CD5D",0x72CB],
- ["CD64",0x72CC],
- ["AAAD",0x72CE],
- ["AAB0",0x72D0],
- ["CD65",0x72D1],
- ["CD61",0x72D2],
- ["CD62",0x72D4],
- ["CD5C",0x72D6],
- ["AAAF",0x72D7],
- ["CD5E",0x72D8],
- ["AAAE",0x72D9],
- ["CD63",0x72DA],
- ["CD60",0x72DC],
- ["CFC2",0x72DF],
- ["ACBD",0x72E0],
- ["ACBE",0x72E1],
- ["CFC5",0x72E3],
- ["CFBF",0x72E4],
- ["CFC4",0x72E6],
- ["CFC0",0x72E8],
- ["ACBC",0x72E9],
- ["CFC3",0x72EA],
- ["CFC1",0x72EB],
- ["D2A8",0x72F3],
- ["D2A5",0x72F4],
- ["D2A7",0x72F6],
- ["AF58",0x72F7],
- ["AF57",0x72F8],
- ["AF55",0x72F9],
- ["D2A4",0x72FA],
- ["D2A9",0x72FB],
- ["AF54",0x72FC],
- ["AF56",0x72FD],
- ["D2A6",0x72FE],
- ["D667",0x72FF],
- ["D2A3",0x7300],
- ["D2AA",0x7301],
- ["D662",0x7307],
- ["D666",0x7308],
- ["D665",0x730A],
- ["DA6E",0x730B],
- ["DA79",0x730C],
- ["D668",0x730F],
- ["D663",0x7311],
- ["DA6D",0x7312],
- ["B274",0x7313],
- ["B273",0x7316],
- ["D661",0x7317],
- ["D664",0x7318],
- ["B275",0x7319],
- ["B272",0x731B],
- ["B271",0x731C],
- ["D660",0x731D],
- ["D669",0x731E],
- ["DA70",0x7322],
- ["DA77",0x7323],
- ["B554",0x7325],
- ["DA76",0x7326],
- ["DA73",0x7327],
- ["B556",0x7329],
- ["DA75",0x732D],
- ["DA6F",0x7330],
- ["DA71",0x7331],
- ["DA74",0x7332],
- ["DA72",0x7333],
- ["B555",0x7334],
- ["DA78",0x7335],
- ["B553",0x7336],
- ["B7DF",0x7337],
- ["DEAD",0x733A],
- ["DEAC",0x733B],
- ["DEAA",0x733C],
- ["B7E2",0x733E],
- ["B7E1",0x733F],
- ["DEAE",0x7340],
- ["DEAB",0x7342],
- ["E2CA",0x7343],
- ["BABB",0x7344],
- ["B7E0",0x7345],
- ["DEB0",0x7349],
- ["DEAF",0x734A],
- ["E2CD",0x734C],
- ["E2CB",0x734D],
- ["BCFA",0x734E],
- ["BABC",0x7350],
- ["E2CC",0x7351],
- ["E676",0x7352],
- ["BCFB",0x7357],
- ["E675",0x7358],
- ["E67E",0x7359],
- ["E67D",0x735A],
- ["E67B",0x735B],
- ["E67A",0x735D],
- ["E677",0x735E],
- ["E678",0x735F],
- ["E679",0x7360],
- ["E67C",0x7361],
- ["E6A1",0x7362],
- ["EA5F",0x7365],
- ["EA5C",0x7366],
- ["EA5D",0x7367],
- ["BF57",0x7368],
- ["EA5B",0x7369],
- ["EA61",0x736A],
- ["EA60",0x736B],
- ["EA5E",0x736C],
- ["ED64",0x736E],
- ["ED65",0x736F],
- ["C0F1",0x7370],
- ["C0F2",0x7372],
- ["ED63",0x7373],
- ["C279",0x7375],
- ["EFFE",0x7376],
- ["C278",0x7377],
- ["C37E",0x7378],
- ["C3A1",0x737A],
- ["C46D",0x737B],
- ["F46E",0x737C],
- ["F46D",0x737D],
- ["F5DD",0x737E],
- ["F6EF",0x737F],
- ["C57A",0x7380],
- ["F7E8",0x7381],
- ["F7E7",0x7382],
- ["F7E9",0x7383],
- ["A5C8",0x7384],
- ["CFC6",0x7385],
- ["AF59",0x7386],
- ["B276",0x7387],
- ["D66A",0x7388],
- ["A5C9",0x7389],
- ["C9A7",0x738A],
- ["A4FD",0x738B],
- ["CA45",0x738E],
- ["CB6C",0x7392],
- ["CB6A",0x7393],
- ["CB6B",0x7394],
- ["CB68",0x7395],
- ["A868",0x7396],
- ["CB69",0x7397],
- ["CD6D",0x739D],
- ["AAB3",0x739F],
- ["CD6B",0x73A0],
- ["CD67",0x73A1],
- ["CD6A",0x73A2],
- ["CD66",0x73A4],
- ["AAB5",0x73A5],
- ["CD69",0x73A6],
- ["AAB2",0x73A8],
- ["AAB1",0x73A9],
- ["AAB4",0x73AB],
- ["CD6C",0x73AC],
- ["CD68",0x73AD],
- ["ACC2",0x73B2],
- ["ACC5",0x73B3],
- ["CFCE",0x73B4],
- ["CFCD",0x73B5],
- ["CFCC",0x73B6],
- ["ACBF",0x73B7],
- ["CFD5",0x73B8],
- ["CFCB",0x73B9],
- ["ACC1",0x73BB],
- ["D2AF",0x73BC],
- ["CFD2",0x73BE],
- ["CFD0",0x73BF],
- ["ACC4",0x73C0],
- ["CFC8",0x73C2],
- ["CFD3",0x73C3],
- ["CFCA",0x73C5],
- ["CFD4",0x73C6],
- ["CFD1",0x73C7],
- ["CFC9",0x73C8],
- ["ACC0",0x73CA],
- ["CFD6",0x73CB],
- ["CFC7",0x73CC],
- ["ACC3",0x73CD],
- ["D2B4",0x73D2],
- ["D2AB",0x73D3],
- ["D2B6",0x73D4],
- ["D2AE",0x73D6],
- ["D2B9",0x73D7],
- ["D2BA",0x73D8],
- ["D2AC",0x73D9],
- ["D2B8",0x73DA],
- ["D2B5",0x73DB],
- ["D2B3",0x73DC],
- ["D2B7",0x73DD],
- ["AF5F",0x73DE],
- ["AF5D",0x73E0],
- ["D2B1",0x73E3],
- ["D2AD",0x73E5],
- ["D2B0",0x73E7],
- ["D2BB",0x73E8],
- ["D2B2",0x73E9],
- ["AF5E",0x73EA],
- ["CFCF",0x73EB],
- ["AF5A",0x73ED],
- ["AF5C",0x73EE],
- ["D678",0x73F4],
- ["D66D",0x73F5],
- ["D66B",0x73F6],
- ["D66C",0x73F8],
- ["D673",0x73FA],
- ["D674",0x73FC],
- ["D670",0x73FD],
- ["B27B",0x73FE],
- ["D675",0x73FF],
- ["D672",0x7400],
- ["D66F",0x7401],
- ["B279",0x7403],
- ["D66E",0x7404],
- ["B277",0x7405],
- ["B27A",0x7406],
- ["D671",0x7407],
- ["D679",0x7408],
- ["AF5B",0x7409],
- ["B278",0x740A],
- ["D677",0x740B],
- ["D676",0x740C],
- ["B27C",0x740D],
- ["DA7E",0x7416],
- ["DAA1",0x741A],
- ["B560",0x741B],
- ["DAA7",0x741D],
- ["DAA9",0x7420],
- ["DAA2",0x7421],
- ["B55A",0x7422],
- ["DAA6",0x7423],
- ["DAA5",0x7424],
- ["B55B",0x7425],
- ["B561",0x7426],
- ["B562",0x7428],
- ["DAA8",0x7429],
- ["B558",0x742A],
- ["DA7D",0x742B],
- ["DA7B",0x742C],
- ["DAA3",0x742D],
- ["DA7A",0x742E],
- ["B55F",0x742F],
- ["DA7C",0x7430],
- ["DAA4",0x7431],
- ["DAAA",0x7432],
- ["B559",0x7433],
- ["B55E",0x7434],
- ["B55C",0x7435],
- ["B55D",0x7436],
- ["B557",0x743A],
- ["B7E9",0x743F],
- ["DEB7",0x7440],
- ["B7E8",0x7441],
- ["DEBB",0x7442],
- ["DEB1",0x7444],
- ["DEBC",0x7446],
- ["DEB2",0x744A],
- ["DEB3",0x744B],
- ["DEBD",0x744D],
- ["DEBA",0x744E],
- ["DEB8",0x744F],
- ["DEB9",0x7450],
- ["DEB5",0x7451],
- ["DEB4",0x7452],
- ["DEBE",0x7454],
- ["B7E5",0x7455],
- ["DEB6",0x7457],
- ["B7EA",0x7459],
- ["B7E4",0x745A],
- ["B7EB",0x745B],
- ["B7EC",0x745C],
- ["B7E7",0x745E],
- ["B7E6",0x745F],
- ["E2CE",0x7462],
- ["BABE",0x7463],
- ["BABD",0x7464],
- ["E2D3",0x7467],
- ["BCFC",0x7469],
- ["BABF",0x746A],
- ["BAC1",0x746D],
- ["E2D4",0x746E],
- ["B7E3",0x746F],
- ["BAC0",0x7470],
- ["E2D0",0x7471],
- ["E2D2",0x7472],
- ["E2CF",0x7473],
- ["E2D1",0x7475],
- ["E6AB",0x7479],
- ["E6AA",0x747C],
- ["E6A7",0x747D],
- ["BD40",0x747E],
- ["EA62",0x747F],
- ["BD41",0x7480],
- ["E6A6",0x7481],
- ["BCFE",0x7483],
- ["E6A8",0x7485],
- ["E6A5",0x7486],
- ["E6A2",0x7487],
- ["E6A9",0x7488],
- ["E6A3",0x7489],
- ["E6A4",0x748A],
- ["BCFD",0x748B],
- ["ED69",0x7490],
- ["EA66",0x7492],
- ["EA65",0x7494],
- ["EA67",0x7495],
- ["ED66",0x7497],
- ["BF5A",0x7498],
- ["EA63",0x749A],
- ["BF58",0x749C],
- ["BF5C",0x749E],
- ["BF5B",0x749F],
- ["EA64",0x74A0],
- ["EA68",0x74A1],
- ["BF59",0x74A3],
- ["ED6D",0x74A5],
- ["C0F5",0x74A6],
- ["C27A",0x74A7],
- ["C0F6",0x74A8],
- ["C0F3",0x74A9],
- ["ED6A",0x74AA],
- ["ED68",0x74AB],
- ["ED6B",0x74AD],
- ["ED6E",0x74AF],
- ["C0F4",0x74B0],
- ["ED6C",0x74B1],
- ["ED67",0x74B2],
- ["F042",0x74B5],
- ["F045",0x74B6],
- ["F275",0x74B7],
- ["F040",0x74B8],
- ["F46F",0x74BA],
- ["F046",0x74BB],
- ["C3A2",0x74BD],
- ["F044",0x74BE],
- ["C27B",0x74BF],
- ["F041",0x74C0],
- ["F043",0x74C1],
- ["F047",0x74C2],
- ["F276",0x74C3],
- ["F274",0x74C5],
- ["C3A3",0x74CA],
- ["F273",0x74CB],
- ["C46E",0x74CF],
- ["C4ED",0x74D4],
- ["F6F1",0x74D5],
- ["C4EC",0x74D6],
- ["F6F3",0x74D7],
- ["F6F0",0x74D8],
- ["F6F2",0x74D9],
- ["C5D0",0x74DA],
- ["F8B2",0x74DB],
- ["A5CA",0x74DC],
- ["CD6E",0x74DD],
- ["D2BC",0x74DE],
- ["D2BD",0x74DF],
- ["B27D",0x74E0],
- ["DEBF",0x74E1],
- ["BF5D",0x74E2],
- ["C3A4",0x74E3],
- ["C57B",0x74E4],
- ["F8B3",0x74E5],
- ["A5CB",0x74E6],
- ["CD6F",0x74E8],
- ["A260",0x74E9],
- ["CFD7",0x74EC],
- ["CFD8",0x74EE],
- ["D2BE",0x74F4],
- ["D2BF",0x74F5],
- ["B27E",0x74F6],
- ["B2A1",0x74F7],
- ["DAAB",0x74FB],
- ["DEC2",0x74FD],
- ["DEC1",0x74FE],
- ["DEC0",0x74FF],
- ["E2D5",0x7500],
- ["E2D6",0x7502],
- ["E2D7",0x7503],
- ["BAC2",0x7504],
- ["E6AD",0x7507],
- ["E6AC",0x7508],
- ["EA69",0x750B],
- ["BF5E",0x750C],
- ["BF5F",0x750D],
- ["ED72",0x750F],
- ["ED6F",0x7510],
- ["ED70",0x7511],
- ["ED71",0x7512],
- ["F049",0x7513],
- ["F048",0x7514],
- ["C27C",0x7515],
- ["F277",0x7516],
- ["F5DE",0x7517],
- ["A5CC",0x7518],
- ["ACC6",0x751A],
- ["B2A2",0x751C],
- ["DEC3",0x751D],
- ["A5CD",0x751F],
- ["D2C0",0x7521],
- ["B2A3",0x7522],
- ["B563",0x7525],
- ["B564",0x7526],
- ["A5CE",0x7528],
- ["A5CF",0x7529],
- ["CA46",0x752A],
- ["A86A",0x752B],
- ["A869",0x752C],
- ["ACC7",0x752D],
- ["CFD9",0x752E],
- ["DAAC",0x752F],
- ["A5D0",0x7530],
- ["A5D1",0x7531],
- ["A5D2",0x7532],
- ["A5D3",0x7533],
- ["A86B",0x7537],
- ["A86C",0x7538],
- ["CB6E",0x7539],
- ["CB6D",0x753A],
- ["AAB6",0x753D],
- ["CD72",0x753E],
- ["CD70",0x753F],
- ["CD71",0x7540],
- ["CFDA",0x7547],
- ["CFDB",0x7548],
- ["ACCB",0x754B],
- ["ACC9",0x754C],
- ["ACCA",0x754E],
- ["ACC8",0x754F],
- ["AF60",0x7554],
- ["AF64",0x7559],
- ["AF63",0x755A],
- ["D2C1",0x755B],
- ["AF62",0x755C],
- ["AF61",0x755D],
- ["D2C2",0x755F],
- ["B2A6",0x7562],
- ["D67B",0x7563],
- ["D67A",0x7564],
- ["B2A4",0x7565],
- ["B2A5",0x7566],
- ["B566",0x756A],
- ["B565",0x756B],
- ["DAAE",0x756C],
- ["DAAD",0x756F],
- ["B2A7",0x7570],
- ["B7ED",0x7576],
- ["DEC5",0x7577],
- ["B7EE",0x7578],
- ["DEC4",0x7579],
- ["E2D8",0x757D],
- ["E6AE",0x757E],
- ["BD42",0x757F],
- ["EA6A",0x7580],
- ["ED73",0x7584],
- ["C3A6",0x7586],
- ["C3A5",0x7587],
- ["C57C",0x758A],
- ["A5D4",0x758B],
- ["CD73",0x758C],
- ["B2A8",0x758F],
- ["E2D9",0x7590],
- ["BAC3",0x7591],
- ["CB6F",0x7594],
- ["CB70",0x7595],
- ["CD74",0x7598],
- ["AAB8",0x7599],
- ["AAB9",0x759A],
- ["AAB7",0x759D],
- ["ACCF",0x75A2],
- ["ACD0",0x75A3],
- ["ACCD",0x75A4],
- ["ACCE",0x75A5],
- ["CFDC",0x75A7],
- ["CFDD",0x75AA],
- ["ACCC",0x75AB],
- ["D2C3",0x75B0],
- ["AF68",0x75B2],
- ["AF69",0x75B3],
- ["B2AB",0x75B5],
- ["D2C9",0x75B6],
- ["AF6E",0x75B8],
- ["AF6C",0x75B9],
- ["D2CA",0x75BA],
- ["D2C5",0x75BB],
- ["AF6B",0x75BC],
- ["AF6A",0x75BD],
- ["AF65",0x75BE],
- ["D2C8",0x75BF],
- ["D2C7",0x75C0],
- ["D2C4",0x75C1],
- ["AF6D",0x75C2],
- ["D2C6",0x75C4],
- ["AF66",0x75C5],
- ["AF67",0x75C7],
- ["B2AC",0x75CA],
- ["D6A1",0x75CB],
- ["D6A2",0x75CC],
- ["B2AD",0x75CD],
- ["D67C",0x75CE],
- ["D67E",0x75CF],
- ["D6A4",0x75D0],
- ["D6A3",0x75D1],
- ["D67D",0x75D2],
- ["B2A9",0x75D4],
- ["B2AA",0x75D5],
- ["DAB6",0x75D7],
- ["B56B",0x75D8],
- ["B56A",0x75D9],
- ["DAB0",0x75DA],
- ["B568",0x75DB],
- ["DAB3",0x75DD],
- ["B56C",0x75DE],
- ["DAB4",0x75DF],
- ["B56D",0x75E0],
- ["DAB1",0x75E1],
- ["B567",0x75E2],
- ["B569",0x75E3],
- ["DAB5",0x75E4],
- ["DAB2",0x75E6],
- ["DAAF",0x75E7],
- ["DED2",0x75ED],
- ["DEC7",0x75EF],
- ["B7F0",0x75F0],
- ["B7F3",0x75F1],
- ["B7F2",0x75F2],
- ["B7F7",0x75F3],
- ["B7F6",0x75F4],
- ["DED3",0x75F5],
- ["DED1",0x75F6],
- ["DECA",0x75F7],
- ["DECE",0x75F8],
- ["DECD",0x75F9],
- ["B7F4",0x75FA],
- ["DED0",0x75FB],
- ["DECC",0x75FC],
- ["DED4",0x75FD],
- ["DECB",0x75FE],
- ["B7F5",0x75FF],
- ["B7EF",0x7600],
- ["B7F1",0x7601],
- ["DEC9",0x7603],
- ["E2DB",0x7608],
- ["BAC7",0x7609],
- ["E2DF",0x760A],
- ["BAC6",0x760B],
- ["E2DC",0x760C],
- ["BAC5",0x760D],
- ["DEC8",0x760F],
- ["DECF",0x7610],
- ["E2DE",0x7611],
- ["BAC8",0x7613],
- ["E2E0",0x7614],
- ["E2DD",0x7615],
- ["E2DA",0x7616],
- ["E6B1",0x7619],
- ["E6B5",0x761A],
- ["E6B7",0x761B],
- ["E6B3",0x761C],
- ["E6B2",0x761D],
- ["E6B0",0x761E],
- ["BD45",0x761F],
- ["BD43",0x7620],
- ["BD48",0x7621],
- ["BD49",0x7622],
- ["E6B4",0x7623],
- ["BD46",0x7624],
- ["E6AF",0x7625],
- ["BD47",0x7626],
- ["BAC4",0x7627],
- ["E6B6",0x7628],
- ["BD44",0x7629],
- ["EA6C",0x762D],
- ["EA6B",0x762F],
- ["EA73",0x7630],
- ["EA6D",0x7631],
- ["EA72",0x7632],
- ["EA6F",0x7633],
- ["BF60",0x7634],
- ["EA71",0x7635],
- ["BF61",0x7638],
- ["BF62",0x763A],
- ["EA70",0x763C],
- ["EA6E",0x763D],
- ["C0F8",0x7642],
- ["ED74",0x7643],
- ["C0F7",0x7646],
- ["ED77",0x7647],
- ["ED75",0x7648],
- ["ED76",0x7649],
- ["C0F9",0x764C],
- ["F04D",0x7650],
- ["C2A1",0x7652],
- ["F04E",0x7653],
- ["C27D",0x7656],
- ["F04F",0x7657],
- ["C27E",0x7658],
- ["F04C",0x7659],
- ["F050",0x765A],
- ["F04A",0x765C],
- ["C3A7",0x765F],
- ["F278",0x7660],
- ["C3A8",0x7661],
- ["C46F",0x7662],
- ["F04B",0x7664],
- ["C470",0x7665],
- ["C4EE",0x7669],
- ["F5DF",0x766A],
- ["C57E",0x766C],
- ["F6F4",0x766D],
- ["C57D",0x766E],
- ["F7EA",0x7670],
- ["C5F5",0x7671],
- ["C5F6",0x7672],
- ["F9CC",0x7675],
- ["ACD1",0x7678],
- ["CFDE",0x7679],
- ["B56E",0x767B],
- ["B56F",0x767C],
- ["A5D5",0x767D],
- ["A6CA",0x767E],
- ["CA47",0x767F],
- ["CB71",0x7681],
- ["A86D",0x7682],
- ["AABA",0x7684],
- ["ACD2",0x7686],
- ["ACD3",0x7687],
- ["ACD4",0x7688],
- ["D6A6",0x7689],
- ["D2CB",0x768A],
- ["AF6F",0x768B],
- ["B2AE",0x768E],
- ["D6A5",0x768F],
- ["DAB8",0x7692],
- ["B571",0x7693],
- ["DAB7",0x7695],
- ["B570",0x7696],
- ["DED5",0x7699],
- ["BD4A",0x769A],
- ["E6BB",0x769B],
- ["E6B8",0x769C],
- ["E6B9",0x769D],
- ["E6BA",0x769E],
- ["ED78",0x76A4],
- ["F051",0x76A6],
- ["F471",0x76AA],
- ["F470",0x76AB],
- ["F6F5",0x76AD],
- ["A5D6",0x76AE],
- ["CD75",0x76AF],
- ["AF70",0x76B0],
- ["B572",0x76B4],
- ["DED6",0x76B5],
- ["E2E1",0x76B8],
- ["BD4B",0x76BA],
- ["EA74",0x76BB],
- ["F052",0x76BD],
- ["F472",0x76BE],
- ["A5D7",0x76BF],
- ["AABB",0x76C2],
- ["ACD7",0x76C3],
- ["CFDF",0x76C4],
- ["ACD8",0x76C5],
- ["ACD6",0x76C6],
- ["ACD5",0x76C8],
- ["D2CC",0x76C9],
- ["AF71",0x76CA],
- ["AF72",0x76CD],
- ["AF73",0x76CE],
- ["B2B0",0x76D2],
- ["D6A7",0x76D3],
- ["B2AF",0x76D4],
- ["DAB9",0x76DA],
- ["B2B1",0x76DB],
- ["B573",0x76DC],
- ["DED7",0x76DD],
- ["B7F8",0x76DE],
- ["B7F9",0x76DF],
- ["BAC9",0x76E1],
- ["BACA",0x76E3],
- ["BD4C",0x76E4],
- ["BF64",0x76E5],
- ["EA75",0x76E6],
- ["BF63",0x76E7],
- ["ED79",0x76E9],
- ["C0FA",0x76EA],
- ["F053",0x76EC],
- ["F473",0x76ED],
- ["A5D8",0x76EE],
- ["A86E",0x76EF],
- ["CD78",0x76F0],
- ["CD77",0x76F1],
- ["AABC",0x76F2],
- ["CD76",0x76F3],
- ["AABD",0x76F4],
- ["CD79",0x76F5],
- ["CFE5",0x76F7],
- ["ACDB",0x76F8],
- ["ACDA",0x76F9],
- ["CFE7",0x76FA],
- ["CFE6",0x76FB],
- ["ACDF",0x76FC],
- ["ACDE",0x76FE],
- ["ACD9",0x7701],
- ["CFE1",0x7703],
- ["CFE2",0x7704],
- ["CFE3",0x7705],
- ["ACE0",0x7707],
- ["CFE0",0x7708],
- ["ACDC",0x7709],
- ["CFE4",0x770A],
- ["ACDD",0x770B],
- ["D2CF",0x7710],
- ["D2D3",0x7711],
- ["D2D1",0x7712],
- ["D2D0",0x7713],
- ["D2D4",0x7715],
- ["D2D5",0x7719],
- ["D2D6",0x771A],
- ["D2CE",0x771B],
- ["D2CD",0x771D],
- ["AF75",0x771F],
- ["AF76",0x7720],
- ["D2D7",0x7722],
- ["D2D2",0x7723],
- ["D6B0",0x7725],
- ["D2D8",0x7727],
- ["AF77",0x7728],
- ["AF74",0x7729],
- ["D6AA",0x772D],
- ["D6A9",0x772F],
- ["D6AB",0x7731],
- ["D6AC",0x7732],
- ["D6AE",0x7733],
- ["D6AD",0x7734],
- ["D6B2",0x7735],
- ["B2B5",0x7736],
- ["B2B2",0x7737],
- ["B2B6",0x7738],
- ["D6A8",0x7739],
- ["B2B7",0x773A],
- ["D6B1",0x773B],
- ["B2B4",0x773C],
- ["D6AF",0x773D],
- ["B2B3",0x773E],
- ["DABC",0x7744],
- ["DABE",0x7745],
- ["DABA",0x7746],
- ["DABB",0x7747],
- ["DABF",0x774A],
- ["DAC1",0x774B],
- ["DAC2",0x774C],
- ["DABD",0x774D],
- ["DAC0",0x774E],
- ["B574",0x774F],
- ["DEDB",0x7752],
- ["DEE0",0x7754],
- ["DED8",0x7755],
- ["DEDC",0x7756],
- ["DEE1",0x7759],
- ["DEDD",0x775A],
- ["B7FA",0x775B],
- ["B843",0x775C],
- ["B7FD",0x775E],
- ["DED9",0x775F],
- ["DEDA",0x7760],
- ["BACE",0x7761],
- ["B846",0x7762],
- ["B7FE",0x7763],
- ["B844",0x7765],
- ["B7FC",0x7766],
- ["DEDF",0x7767],
- ["B845",0x7768],
- ["DEDE",0x7769],
- ["B841",0x776A],
- ["B7FB",0x776B],
- ["B842",0x776C],
- ["DEE2",0x776D],
- ["E2E6",0x776E],
- ["E2E8",0x776F],
- ["B840",0x7779],
- ["E2E3",0x777C],
- ["BACC",0x777D],
- ["E2E9",0x777E],
- ["BACD",0x777F],
- ["E2E7",0x7780],
- ["E2E2",0x7781],
- ["E2E5",0x7782],
- ["E2EA",0x7783],
- ["BACB",0x7784],
- ["E2E4",0x7785],
- ["BD4E",0x7787],
- ["E6BF",0x7788],
- ["E6BE",0x7789],
- ["BD51",0x778B],
- ["BD4F",0x778C],
- ["E6BC",0x778D],
- ["BD4D",0x778E],
- ["E6BD",0x778F],
- ["BD50",0x7791],
- ["EA7D",0x7795],
- ["EAA1",0x7797],
- ["EA7E",0x7799],
- ["EA76",0x779A],
- ["EA7A",0x779B],
- ["EA79",0x779C],
- ["EA77",0x779D],
- ["BF66",0x779E],
- ["BF67",0x779F],
- ["BF65",0x77A0],
- ["EA78",0x77A1],
- ["EA7B",0x77A2],
- ["EA7C",0x77A3],
- ["BF68",0x77A5],
- ["C140",0x77A7],
- ["EDA3",0x77A8],
- ["C0FC",0x77AA],
- ["ED7B",0x77AB],
- ["C0FE",0x77AC],
- ["C141",0x77AD],
- ["C0FD",0x77B0],
- ["EDA2",0x77B1],
- ["ED7C",0x77B2],
- ["C0FB",0x77B3],
- ["EDA1",0x77B4],
- ["ED7A",0x77B5],
- ["ED7E",0x77B6],
- ["ED7D",0x77B7],
- ["F055",0x77BA],
- ["C2A4",0x77BB],
- ["C2A5",0x77BC],
- ["C2A2",0x77BD],
- ["C2A3",0x77BF],
- ["F054",0x77C2],
- ["F27B",0x77C4],
- ["C3A9",0x77C7],
- ["F279",0x77C9],
- ["F27A",0x77CA],
- ["F474",0x77CC],
- ["F477",0x77CD],
- ["F475",0x77CE],
- ["F476",0x77CF],
- ["F5E0",0x77D0],
- ["C4EF",0x77D3],
- ["F7EB",0x77D4],
- ["F8B4",0x77D5],
- ["C5F7",0x77D7],
- ["F8F8",0x77D8],
- ["F8F9",0x77D9],
- ["C666",0x77DA],
- ["A5D9",0x77DB],
- ["ACE1",0x77DC],
- ["DAC3",0x77DE],
- ["DEE3",0x77E0],
- ["A5DA",0x77E2],
- ["A86F",0x77E3],
- ["AABE",0x77E5],
- ["CFE8",0x77E7],
- ["CFE9",0x77E8],
- ["AF78",0x77E9],
- ["DAC4",0x77EC],
- ["B575",0x77ED],
- ["B847",0x77EE],
- ["C142",0x77EF],
- ["EDA4",0x77F0],
- ["F27C",0x77F1],
- ["F478",0x77F2],
- ["A5DB",0x77F3],
- ["CDA1",0x77F7],
- ["CD7A",0x77F8],
- ["CD7C",0x77F9],
- ["CD7E",0x77FA],
- ["CD7D",0x77FB],
- ["CD7B",0x77FC],
- ["AABF",0x77FD],
- ["ACE2",0x7802],
- ["CFF2",0x7803],
- ["CFED",0x7805],
- ["CFEA",0x7806],
- ["CFF1",0x7809],
- ["ACE4",0x780C],
- ["ACE5",0x780D],
- ["CFF0",0x780E],
- ["CFEF",0x780F],
- ["CFEE",0x7810],
- ["CFEB",0x7811],
- ["CFEC",0x7812],
- ["CFF3",0x7813],
- ["ACE3",0x7814],
- ["AF7C",0x781D],
- ["AFA4",0x781F],
- ["AFA3",0x7820],
- ["D2E1",0x7821],
- ["D2DB",0x7822],
- ["D2D9",0x7823],
- ["AFA1",0x7825],
- ["D6B9",0x7826],
- ["AF7A",0x7827],
- ["D2DE",0x7828],
- ["D2E2",0x7829],
- ["D2E4",0x782A],
- ["D2E0",0x782B],
- ["D2DA",0x782C],
- ["AFA2",0x782D],
- ["D2DF",0x782E],
- ["D2DD",0x782F],
- ["AF79",0x7830],
- ["D2E5",0x7831],
- ["AFA5",0x7832],
- ["D2E3",0x7833],
- ["AF7D",0x7834],
- ["D2DC",0x7835],
- ["AF7E",0x7837],
- ["AF7B",0x7838],
- ["B2B9",0x7843],
- ["D6BA",0x7845],
- ["D6B3",0x7848],
- ["D6B5",0x7849],
- ["D6B7",0x784A],
- ["D6B8",0x784C],
- ["D6B6",0x784D],
- ["B2BA",0x784E],
- ["D6BB",0x7850],
- ["D6B4",0x7852],
- ["DAC8",0x785C],
- ["B576",0x785D],
- ["DAD0",0x785E],
- ["DAC5",0x7860],
- ["DAD1",0x7862],
- ["DAC6",0x7864],
- ["DAC7",0x7865],
- ["DACF",0x7868],
- ["DACE",0x7869],
- ["DACB",0x786A],
- ["B2B8",0x786B],
- ["B577",0x786C],
- ["DAC9",0x786D],
- ["DACC",0x786E],
- ["B578",0x786F],
- ["DACD",0x7870],
- ["DACA",0x7871],
- ["DEEE",0x7879],
- ["DEF2",0x787B],
- ["B84E",0x787C],
- ["E2F0",0x787E],
- ["B851",0x787F],
- ["DEF0",0x7880],
- ["DEED",0x7883],
- ["DEE8",0x7884],
- ["DEEA",0x7885],
- ["DEEB",0x7886],
- ["DEE4",0x7887],
- ["B84D",0x7889],
- ["B84C",0x788C],
- ["B848",0x788E],
- ["DEE7",0x788F],
- ["B84F",0x7891],
- ["B850",0x7893],
- ["DEE6",0x7894],
- ["DEE9",0x7895],
- ["DEF1",0x7896],
- ["B84A",0x7897],
- ["B84B",0x7898],
- ["DEEF",0x7899],
- ["DEE5",0x789A],
- ["E2F2",0x789E],
- ["BAD0",0x789F],
- ["E2F4",0x78A0],
- ["DEEC",0x78A1],
- ["E2F6",0x78A2],
- ["BAD4",0x78A3],
- ["E2F7",0x78A4],
- ["E2F3",0x78A5],
- ["BAD1",0x78A7],
- ["E2EF",0x78A8],
- ["BAD3",0x78A9],
- ["E2EC",0x78AA],
- ["E2F1",0x78AB],
- ["E2F5",0x78AC],
- ["E2EE",0x78AD],
- ["B849",0x78B0],
- ["E2EB",0x78B2],
- ["BAD2",0x78B3],
- ["E2ED",0x78B4],
- ["BD54",0x78BA],
- ["E6C1",0x78BB],
- ["BD58",0x78BC],
- ["BD56",0x78BE],
- ["BACF",0x78C1],
- ["E6C8",0x78C3],
- ["E6C9",0x78C4],
- ["BD53",0x78C5],
- ["E6C7",0x78C8],
- ["E6CA",0x78C9],
- ["BD55",0x78CA],
- ["BD52",0x78CB],
- ["E6C3",0x78CC],
- ["E6C0",0x78CD],
- ["E6C5",0x78CE],
- ["E6C2",0x78CF],
- ["BD59",0x78D0],
- ["E6C4",0x78D1],
- ["E6C6",0x78D4],
- ["BD57",0x78D5],
- ["BF6A",0x78DA],
- ["EAA8",0x78DB],
- ["EAA2",0x78DD],
- ["EAA6",0x78DE],
- ["EAAC",0x78DF],
- ["EAAD",0x78E0],
- ["EAA9",0x78E1],
- ["EAAA",0x78E2],
- ["EAA7",0x78E3],
- ["EAA4",0x78E5],
- ["BF6C",0x78E7],
- ["BF69",0x78E8],
- ["EAA3",0x78E9],
- ["EAA5",0x78EA],
- ["BF6B",0x78EC],
- ["EAAB",0x78ED],
- ["C146",0x78EF],
- ["EDAA",0x78F2],
- ["EDA5",0x78F3],
- ["C145",0x78F4],
- ["C143",0x78F7],
- ["EDAC",0x78F9],
- ["C144",0x78FA],
- ["EDA8",0x78FB],
- ["EDA9",0x78FC],
- ["EDA6",0x78FD],
- ["EDAD",0x78FE],
- ["F056",0x78FF],
- ["C147",0x7901],
- ["EDA7",0x7902],
- ["EDAE",0x7904],
- ["EDAB",0x7905],
- ["F05A",0x7909],
- ["F057",0x790C],
- ["C2A6",0x790E],
- ["F05B",0x7910],
- ["F05D",0x7911],
- ["F05C",0x7912],
- ["F058",0x7913],
- ["F059",0x7914],
- ["F2A3",0x7917],
- ["C3AA",0x7919],
- ["F27E",0x791B],
- ["F2A2",0x791C],
- ["F27D",0x791D],
- ["F2A4",0x791E],
- ["F2A1",0x7921],
- ["F47A",0x7923],
- ["F47D",0x7924],
- ["F479",0x7925],
- ["C471",0x7926],
- ["F47B",0x7927],
- ["F47C",0x7928],
- ["F47E",0x7929],
- ["C472",0x792A],
- ["C474",0x792B],
- ["C473",0x792C],
- ["F5E1",0x792D],
- ["F5E3",0x792F],
- ["F5E2",0x7931],
- ["F6F6",0x7935],
- ["F8B5",0x7938],
- ["F8FA",0x7939],
- ["A5DC",0x793A],
- ["CB72",0x793D],
- ["AAC0",0x793E],
- ["CDA3",0x793F],
- ["AAC1",0x7940],
- ["AAC2",0x7941],
- ["CDA2",0x7942],
- ["CFF8",0x7944],
- ["CFF7",0x7945],
- ["ACE6",0x7946],
- ["ACE9",0x7947],
- ["ACE8",0x7948],
- ["ACE7",0x7949],
- ["CFF4",0x794A],
- ["CFF6",0x794B],
- ["CFF5",0x794C],
- ["D2E8",0x794F],
- ["AFA7",0x7950],
- ["D2EC",0x7951],
- ["D2EB",0x7952],
- ["D2EA",0x7953],
- ["D2E6",0x7954],
- ["AFA6",0x7955],
- ["AFAA",0x7956],
- ["AFAD",0x7957],
- ["AFAE",0x795A],
- ["D2E7",0x795B],
- ["D2E9",0x795C],
- ["AFAC",0x795D],
- ["AFAB",0x795E],
- ["AFA9",0x795F],
- ["AFA8",0x7960],
- ["D6C2",0x7961],
- ["D6C0",0x7963],
- ["D6BC",0x7964],
- ["B2BB",0x7965],
- ["D6BD",0x7967],
- ["B2BC",0x7968],
- ["D6BE",0x7969],
- ["D6BF",0x796A],
- ["D6C1",0x796B],
- ["B2BD",0x796D],
- ["DAD5",0x7970],
- ["DAD4",0x7972],
- ["DAD3",0x7973],
- ["DAD2",0x7974],
- ["DEF6",0x7979],
- ["B852",0x797A],
- ["DEF3",0x797C],
- ["DEF5",0x797D],
- ["B853",0x797F],
- ["B854",0x7981],
- ["DEF4",0x7982],
- ["E341",0x7988],
- ["E2F9",0x798A],
- ["E2FA",0x798B],
- ["BAD7",0x798D],
- ["BAD5",0x798E],
- ["BAD6",0x798F],
- ["E343",0x7990],
- ["E342",0x7992],
- ["E2FE",0x7993],
- ["E2FD",0x7994],
- ["E2FC",0x7995],
- ["E2FB",0x7996],
- ["E340",0x7997],
- ["E2F8",0x7998],
- ["E6CB",0x799A],
- ["E6D0",0x799B],
- ["E6CE",0x799C],
- ["E6CD",0x79A0],
- ["E6CC",0x79A1],
- ["E6CF",0x79A2],
- ["EAAE",0x79A4],
- ["BF6D",0x79A6],
- ["C148",0x79A7],
- ["EDB0",0x79A8],
- ["C149",0x79AA],
- ["EDAF",0x79AB],
- ["F05F",0x79AC],
- ["F05E",0x79AD],
- ["C2A7",0x79AE],
- ["F2A5",0x79B0],
- ["C3AB",0x79B1],
- ["F4A1",0x79B2],
- ["C5A1",0x79B3],
- ["F6F7",0x79B4],
- ["F8B7",0x79B6],
- ["F8B6",0x79B7],
- ["C9A8",0x79B8],
- ["ACEA",0x79B9],
- ["ACEB",0x79BA],
- ["D6C3",0x79BB],
- ["B856",0x79BD],
- ["A5DD",0x79BE],
- ["A872",0x79BF],
- ["A871",0x79C0],
- ["A870",0x79C1],
- ["CDA4",0x79C5],
- ["AAC4",0x79C8],
- ["AAC3",0x79C9],
- ["ACEE",0x79CB],
- ["CFFA",0x79CD],
- ["CFFD",0x79CE],
- ["CFFB",0x79CF],
- ["ACEC",0x79D1],
- ["ACED",0x79D2],
- ["CFF9",0x79D5],
- ["CFFC",0x79D6],
- ["AFB5",0x79D8],
- ["D2F3",0x79DC],
- ["D2F5",0x79DD],
- ["D2F4",0x79DE],
- ["AFB2",0x79DF],
- ["D2EF",0x79E0],
- ["AFB0",0x79E3],
- ["AFAF",0x79E4],
- ["AFB3",0x79E6],
- ["AFB1",0x79E7],
- ["AFB4",0x79E9],
- ["D2F2",0x79EA],
- ["D2ED",0x79EB],
- ["D2EE",0x79EC],
- ["D2F1",0x79ED],
- ["D2F0",0x79EE],
- ["D6C6",0x79F6],
- ["D6C7",0x79F7],
- ["D6C5",0x79F8],
- ["D6C4",0x79FA],
- ["B2BE",0x79FB],
- ["B57D",0x7A00],
- ["DAD6",0x7A02],
- ["DAD8",0x7A03],
- ["DADA",0x7A04],
- ["B57C",0x7A05],
- ["B57A",0x7A08],
- ["DAD7",0x7A0A],
- ["B57B",0x7A0B],
- ["DAD9",0x7A0C],
- ["B579",0x7A0D],
- ["DF41",0x7A10],
- ["DEF7",0x7A11],
- ["DEFA",0x7A12],
- ["DEFE",0x7A13],
- ["B85A",0x7A14],
- ["DEFC",0x7A15],
- ["DEFB",0x7A17],
- ["DEF8",0x7A18],
- ["DEF9",0x7A19],
- ["B858",0x7A1A],
- ["DF40",0x7A1B],
- ["B857",0x7A1C],
- ["B85C",0x7A1E],
- ["B85B",0x7A1F],
- ["B859",0x7A20],
- ["DEFD",0x7A22],
- ["E349",0x7A26],
- ["E348",0x7A28],
- ["E344",0x7A2B],
- ["BAD8",0x7A2E],
- ["E347",0x7A2F],
- ["E346",0x7A30],
- ["BAD9",0x7A31],
- ["BD5E",0x7A37],
- ["E6D2",0x7A39],
- ["BD5F",0x7A3B],
- ["BD5B",0x7A3C],
- ["BD5D",0x7A3D],
- ["BD5A",0x7A3F],
- ["BD5C",0x7A40],
- ["EAAF",0x7A44],
- ["BF70",0x7A46],
- ["EAB1",0x7A47],
- ["EAB0",0x7A48],
- ["E345",0x7A4A],
- ["BF72",0x7A4B],
- ["BF71",0x7A4C],
- ["BF6E",0x7A4D],
- ["BF6F",0x7A4E],
- ["EDB5",0x7A54],
- ["EDB3",0x7A56],
- ["C14A",0x7A57],
- ["EDB4",0x7A58],
- ["EDB6",0x7A5A],
- ["EDB2",0x7A5B],
- ["EDB1",0x7A5C],
- ["F060",0x7A5F],
- ["C2AA",0x7A60],
- ["C2A8",0x7A61],
- ["C2A9",0x7A62],
- ["F2A6",0x7A67],
- ["F2A7",0x7A68],
- ["C3AD",0x7A69],
- ["C3AC",0x7A6B],
- ["F4A3",0x7A6C],
- ["F4A4",0x7A6D],
- ["F4A2",0x7A6E],
- ["F6F8",0x7A70],
- ["F6F9",0x7A71],
- ["A5DE",0x7A74],
- ["CA48",0x7A75],
- ["A873",0x7A76],
- ["CDA5",0x7A78],
- ["AAC6",0x7A79],
- ["AAC5",0x7A7A],
- ["CDA6",0x7A7B],
- ["D040",0x7A7E],
- ["ACEF",0x7A7F],
- ["CFFE",0x7A80],
- ["ACF0",0x7A81],
- ["AFB6",0x7A84],
- ["D2F8",0x7A85],
- ["D2F6",0x7A86],
- ["D2FC",0x7A87],
- ["AFB7",0x7A88],
- ["D2F7",0x7A89],
- ["D2FB",0x7A8A],
- ["D2F9",0x7A8B],
- ["D2FA",0x7A8C],
- ["D6C8",0x7A8F],
- ["D6CA",0x7A90],
- ["B2BF",0x7A92],
- ["D6C9",0x7A94],
- ["B2C0",0x7A95],
- ["B5A2",0x7A96],
- ["B5A1",0x7A97],
- ["B57E",0x7A98],
- ["DADB",0x7A99],
- ["DF44",0x7A9E],
- ["B85D",0x7A9F],
- ["B85E",0x7AA0],
- ["DF43",0x7AA2],
- ["DF42",0x7AA3],
- ["E34A",0x7AA8],
- ["BADB",0x7AA9],
- ["BADA",0x7AAA],
- ["E34B",0x7AAB],
- ["E34C",0x7AAC],
- ["BD61",0x7AAE],
- ["BD60",0x7AAF],
- ["EAB5",0x7AB1],
- ["E6D3",0x7AB2],
- ["E6D5",0x7AB3],
- ["E6D4",0x7AB4],
- ["EAB4",0x7AB5],
- ["EAB2",0x7AB6],
- ["EAB6",0x7AB7],
- ["EAB3",0x7AB8],
- ["BF73",0x7ABA],
- ["EDB7",0x7ABE],
- ["C14B",0x7ABF],
- ["EDB8",0x7AC0],
- ["EDB9",0x7AC1],
- ["C2AB",0x7AC4],
- ["C2AC",0x7AC5],
- ["C475",0x7AC7],
- ["C5D1",0x7ACA],
- ["A5DF",0x7ACB],
- ["D041",0x7AD1],
- ["D2FD",0x7AD8],
- ["AFB8",0x7AD9],
- ["B3BA",0x7ADF],
- ["B3B9",0x7AE0],
- ["B5A4",0x7AE3],
- ["DADD",0x7AE4],
- ["B5A3",0x7AE5],
- ["DADC",0x7AE6],
- ["DF45",0x7AEB],
- ["BADC",0x7AED],
- ["E34D",0x7AEE],
- ["BADD",0x7AEF],
- ["C476",0x7AF6],
- ["F4A5",0x7AF7],
- ["A6CB",0x7AF9],
- ["AAC7",0x7AFA],
- ["CDA7",0x7AFB],
- ["ACF2",0x7AFD],
- ["ACF1",0x7AFF],
- ["D042",0x7B00],
- ["D043",0x7B01],
- ["D340",0x7B04],
- ["D342",0x7B05],
- ["AFB9",0x7B06],
- ["D344",0x7B08],
- ["D347",0x7B09],
- ["D345",0x7B0A],
- ["D346",0x7B0E],
- ["D343",0x7B0F],
- ["D2FE",0x7B10],
- ["AFBA",0x7B11],
- ["D348",0x7B12],
- ["D341",0x7B13],
- ["D6D3",0x7B18],
- ["B2C6",0x7B19],
- ["D6DC",0x7B1A],
- ["B2C3",0x7B1B],
- ["D6D5",0x7B1D],
- ["B2C7",0x7B1E],
- ["B2C1",0x7B20],
- ["D6D0",0x7B22],
- ["D6DD",0x7B23],
- ["D6D1",0x7B24],
- ["D6CE",0x7B25],
- ["B2C5",0x7B26],
- ["B2C2",0x7B28],
- ["D6D4",0x7B2A],
- ["D6D7",0x7B2B],
- ["B2C4",0x7B2C],
- ["D6D8",0x7B2D],
- ["B2C8",0x7B2E],
- ["D6D9",0x7B2F],
- ["D6CF",0x7B30],
- ["D6D6",0x7B31],
- ["D6DA",0x7B32],
- ["D6D2",0x7B33],
- ["D6CD",0x7B34],
- ["D6CB",0x7B35],
- ["D6DB",0x7B38],
- ["DADF",0x7B3B],
- ["DAE4",0x7B40],
- ["DAE0",0x7B44],
- ["DAE6",0x7B45],
- ["B5A7",0x7B46],
- ["D6CC",0x7B47],
- ["DAE1",0x7B48],
- ["B5A5",0x7B49],
- ["DADE",0x7B4A],
- ["B5AC",0x7B4B],
- ["DAE2",0x7B4C],
- ["B5AB",0x7B4D],
- ["DAE3",0x7B4E],
- ["B5AD",0x7B4F],
- ["B5A8",0x7B50],
- ["B5AE",0x7B51],
- ["B5A9",0x7B52],
- ["B5AA",0x7B54],
- ["B5A6",0x7B56],
- ["DAE5",0x7B58],
- ["B861",0x7B60],
- ["DF50",0x7B61],
- ["DF53",0x7B63],
- ["DF47",0x7B64],
- ["DF4C",0x7B65],
- ["DF46",0x7B66],
- ["B863",0x7B67],
- ["DF4A",0x7B69],
- ["DF48",0x7B6D],
- ["B862",0x7B6E],
- ["DF4F",0x7B70],
- ["DF4E",0x7B71],
- ["DF4B",0x7B72],
- ["DF4D",0x7B73],
- ["DF49",0x7B74],
- ["BAE1",0x7B75],
- ["DF52",0x7B76],
- ["B85F",0x7B77],
- ["DF51",0x7B78],
- ["E35D",0x7B82],
- ["BAE8",0x7B84],
- ["E358",0x7B85],
- ["BAE7",0x7B87],
- ["E34E",0x7B88],
- ["E350",0x7B8A],
- ["BAE0",0x7B8B],
- ["E355",0x7B8C],
- ["E354",0x7B8D],
- ["E357",0x7B8E],
- ["BAE5",0x7B8F],
- ["E352",0x7B90],
- ["E351",0x7B91],
- ["BAE4",0x7B94],
- ["BADF",0x7B95],
- ["E353",0x7B96],
- ["BAE2",0x7B97],
- ["E359",0x7B98],
- ["E35B",0x7B99],
- ["E356",0x7B9B],
- ["E34F",0x7B9C],
- ["BAE3",0x7B9D],
- ["BD69",0x7BA0],
- ["BADE",0x7BA1],
- ["E35C",0x7BA4],
- ["E6D9",0x7BAC],
- ["BD62",0x7BAD],
- ["E6DB",0x7BAF],
- ["BD63",0x7BB1],
- ["BD65",0x7BB4],
- ["E6DE",0x7BB5],
- ["E6D6",0x7BB7],
- ["BAE6",0x7BB8],
- ["E6DC",0x7BB9],
- ["E6D8",0x7BBE],
- ["B860",0x7BC0],
- ["BD68",0x7BC1],
- ["BD64",0x7BC4],
- ["BD66",0x7BC6],
- ["BD67",0x7BC7],
- ["BF76",0x7BC9],
- ["E6DD",0x7BCA],
- ["E6D7",0x7BCB],
- ["BD6A",0x7BCC],
- ["E6DA",0x7BCE],
- ["EAC0",0x7BD4],
- ["EABB",0x7BD5],
- ["EAC5",0x7BD8],
- ["BF74",0x7BD9],
- ["EABD",0x7BDA],
- ["BF78",0x7BDB],
- ["EAC3",0x7BDC],
- ["EABA",0x7BDD],
- ["EAB7",0x7BDE],
- ["EAC6",0x7BDF],
- ["C151",0x7BE0],
- ["BF79",0x7BE1],
- ["EAC2",0x7BE2],
- ["EAB8",0x7BE3],
- ["BF77",0x7BE4],
- ["EABC",0x7BE5],
- ["BF7B",0x7BE6],
- ["EAB9",0x7BE7],
- ["EABE",0x7BE8],
- ["BF7A",0x7BE9],
- ["EAC1",0x7BEA],
- ["EAC4",0x7BEB],
- ["EDCB",0x7BF0],
- ["EDCC",0x7BF1],
- ["EDBC",0x7BF2],
- ["EDC3",0x7BF3],
- ["EDC1",0x7BF4],
- ["C14F",0x7BF7],
- ["EDC8",0x7BF8],
- ["EABF",0x7BF9],
- ["EDBF",0x7BFB],
- ["EDC9",0x7BFD],
- ["C14E",0x7BFE],
- ["EDBE",0x7BFF],
- ["EDBD",0x7C00],
- ["EDC7",0x7C01],
- ["EDC4",0x7C02],
- ["EDC6",0x7C03],
- ["EDBA",0x7C05],
- ["EDCA",0x7C06],
- ["C14C",0x7C07],
- ["EDC5",0x7C09],
- ["EDCE",0x7C0A],
- ["EDC2",0x7C0B],
- ["C150",0x7C0C],
- ["C14D",0x7C0D],
- ["EDC0",0x7C0E],
- ["EDBB",0x7C0F],
- ["EDCD",0x7C10],
- ["BF75",0x7C11],
- ["F063",0x7C19],
- ["F061",0x7C1C],
- ["F067",0x7C1D],
- ["C2B0",0x7C1E],
- ["F065",0x7C1F],
- ["F064",0x7C20],
- ["C2B2",0x7C21],
- ["F06A",0x7C22],
- ["C2B1",0x7C23],
- ["F06B",0x7C25],
- ["F068",0x7C26],
- ["C2AE",0x7C27],
- ["F069",0x7C28],
- ["F062",0x7C29],
- ["C2AF",0x7C2A],
- ["C2AD",0x7C2B],
- ["F2AB",0x7C2C],
- ["F066",0x7C2D],
- ["F06C",0x7C30],
- ["F2A8",0x7C33],
- ["C3B2",0x7C37],
- ["C3B0",0x7C38],
- ["F2AA",0x7C39],
- ["F2AC",0x7C3B],
- ["F2A9",0x7C3C],
- ["C3B1",0x7C3D],
- ["C3AE",0x7C3E],
- ["C3AF",0x7C3F],
- ["C3B3",0x7C40],
- ["C478",0x7C43],
- ["F4AA",0x7C45],
- ["F4A9",0x7C47],
- ["F4A7",0x7C48],
- ["F4A6",0x7C49],
- ["F4A8",0x7C4A],
- ["C477",0x7C4C],
- ["C479",0x7C4D],
- ["C4F0",0x7C50],
- ["F5E5",0x7C53],
- ["F5E4",0x7C54],
- ["F6FA",0x7C57],
- ["F6FC",0x7C59],
- ["F6FE",0x7C5A],
- ["F6FD",0x7C5B],
- ["F6FB",0x7C5C],
- ["C5A3",0x7C5F],
- ["C5A2",0x7C60],
- ["C5D3",0x7C63],
- ["C5D2",0x7C64],
- ["C5D4",0x7C65],
- ["F7ED",0x7C66],
- ["F7EC",0x7C67],
- ["F8FB",0x7C69],
- ["F8B8",0x7C6A],
- ["F8FC",0x7C6B],
- ["C658",0x7C6C],
- ["C659",0x7C6E],
- ["F96D",0x7C6F],
- ["C67E",0x7C72],
- ["A6CC",0x7C73],
- ["CDA8",0x7C75],
- ["D045",0x7C78],
- ["D046",0x7C79],
- ["D044",0x7C7A],
- ["ACF3",0x7C7D],
- ["D047",0x7C7F],
- ["D048",0x7C80],
- ["D049",0x7C81],
- ["D349",0x7C84],
- ["D34F",0x7C85],
- ["D34D",0x7C88],
- ["AFBB",0x7C89],
- ["D34B",0x7C8A],
- ["D34C",0x7C8C],
- ["D34E",0x7C8D],
- ["D34A",0x7C91],
- ["B2C9",0x7C92],
- ["D6DE",0x7C94],
- ["B2CB",0x7C95],
- ["D6E0",0x7C96],
- ["B2CA",0x7C97],
- ["D6DF",0x7C98],
- ["DAE8",0x7C9E],
- ["B5AF",0x7C9F],
- ["DAEA",0x7CA1],
- ["DAE7",0x7CA2],
- ["D6E1",0x7CA3],
- ["B5B0",0x7CA5],
- ["DAE9",0x7CA8],
- ["DF56",0x7CAF],
- ["B864",0x7CB1],
- ["DF54",0x7CB2],
- ["B865",0x7CB3],
- ["DF55",0x7CB4],
- ["B866",0x7CB5],
- ["BAE9",0x7CB9],
- ["E361",0x7CBA],
- ["E35E",0x7CBB],
- ["E360",0x7CBC],
- ["BAEA",0x7CBD],
- ["BAEB",0x7CBE],
- ["E35F",0x7CBF],
- ["E6DF",0x7CC5],
- ["E6E0",0x7CC8],
- ["BD6B",0x7CCA],
- ["E6E2",0x7CCB],
- ["E6E1",0x7CCC],
- ["A261",0x7CCE],
- ["EACA",0x7CD0],
- ["EACB",0x7CD1],
- ["EAC7",0x7CD2],
- ["EAC8",0x7CD4],
- ["BF7C",0x7CD5],
- ["BF7D",0x7CD6],
- ["EAC9",0x7CD7],
- ["C157",0x7CD9],
- ["C153",0x7CDC],
- ["C158",0x7CDD],
- ["C154",0x7CDE],
- ["C156",0x7CDF],
- ["C152",0x7CE0],
- ["C155",0x7CE2],
- ["C2B3",0x7CE7],
- ["EDCF",0x7CE8],
- ["F2AE",0x7CEA],
- ["F2AD",0x7CEC],
- ["F4AB",0x7CEE],
- ["C47A",0x7CEF],
- ["C47B",0x7CF0],
- ["F741",0x7CF1],
- ["F5E6",0x7CF2],
- ["F740",0x7CF4],
- ["F8FD",0x7CF6],
- ["F9A4",0x7CF7],
- ["A6CD",0x7CF8],
- ["A874",0x7CFB],
- ["CDA9",0x7CFD],
- ["AAC8",0x7CFE],
- ["ACF6",0x7D00],
- ["D04C",0x7D01],
- ["ACF4",0x7D02],
- ["D04A",0x7D03],
- ["ACF9",0x7D04],
- ["ACF5",0x7D05],
- ["ACFA",0x7D06],
- ["ACF8",0x7D07],
- ["D04B",0x7D08],
- ["ACF7",0x7D09],
- ["AFBF",0x7D0A],
- ["AFBE",0x7D0B],
- ["D35A",0x7D0C],
- ["AFC7",0x7D0D],
- ["D353",0x7D0E],
- ["D359",0x7D0F],
- ["AFC3",0x7D10],
- ["D352",0x7D11],
- ["D358",0x7D12],
- ["D356",0x7D13],
- ["AFC2",0x7D14],
- ["AFC4",0x7D15],
- ["D355",0x7D16],
- ["AFBD",0x7D17],
- ["D354",0x7D18],
- ["AFC8",0x7D19],
- ["AFC5",0x7D1A],
- ["AFC9",0x7D1B],
- ["AFC6",0x7D1C],
- ["D351",0x7D1D],
- ["D350",0x7D1E],
- ["D357",0x7D1F],
- ["AFC0",0x7D20],
- ["AFBC",0x7D21],
- ["AFC1",0x7D22],
- ["D6F0",0x7D28],
- ["D6E9",0x7D29],
- ["B5B5",0x7D2B],
- ["D6E8",0x7D2C],
- ["B2CF",0x7D2E],
- ["B2D6",0x7D2F],
- ["B2D3",0x7D30],
- ["B2D9",0x7D31],
- ["B2D8",0x7D32],
- ["B2D4",0x7D33],
- ["D6E2",0x7D35],
- ["D6E5",0x7D36],
- ["D6E4",0x7D38],
- ["B2D0",0x7D39],
- ["D6E6",0x7D3A],
- ["D6EF",0x7D3B],
- ["B2D1",0x7D3C],
- ["D6E3",0x7D3D],
- ["D6EC",0x7D3E],
- ["D6ED",0x7D3F],
- ["B2D2",0x7D40],
- ["D6EA",0x7D41],
- ["B2D7",0x7D42],
- ["B2CD",0x7D43],
- ["B2D5",0x7D44],
- ["D6E7",0x7D45],
- ["B2CC",0x7D46],
- ["D6EB",0x7D47],
- ["D6EE",0x7D4A],
- ["DAFB",0x7D4E],
- ["DAF2",0x7D4F],
- ["B5B2",0x7D50],
- ["DAF9",0x7D51],
- ["DAF6",0x7D52],
- ["DAEE",0x7D53],
- ["DAF7",0x7D54],
- ["B5B4",0x7D55],
- ["DAEF",0x7D56],
- ["DAEB",0x7D58],
- ["B86C",0x7D5B],
- ["DAF4",0x7D5C],
- ["B5B1",0x7D5E],
- ["DAFA",0x7D5F],
- ["B5B8",0x7D61],
- ["B5BA",0x7D62],
- ["DAED",0x7D63],
- ["B5B9",0x7D66],
- ["DAF0",0x7D67],
- ["B5B3",0x7D68],
- ["DAF8",0x7D69],
- ["DAF1",0x7D6A],
- ["DAF5",0x7D6B],
- ["DAF3",0x7D6D],
- ["B5B6",0x7D6E],
- ["DAEC",0x7D6F],
- ["B5BB",0x7D70],
- ["B2CE",0x7D71],
- ["B5B7",0x7D72],
- ["B5BC",0x7D73],
- ["B868",0x7D79],
- ["DF5D",0x7D7A],
- ["DF5F",0x7D7B],
- ["DF61",0x7D7C],
- ["DF65",0x7D7D],
- ["DF5B",0x7D7F],
- ["DF59",0x7D80],
- ["B86A",0x7D81],
- ["DF60",0x7D83],
- ["DF64",0x7D84],
- ["DF5C",0x7D85],
- ["DF58",0x7D86],
- ["DF57",0x7D88],
- ["DF62",0x7D8C],
- ["DF5A",0x7D8D],
- ["DF5E",0x7D8E],
- ["B86B",0x7D8F],
- ["B869",0x7D91],
- ["DF66",0x7D92],
- ["B867",0x7D93],
- ["DF63",0x7D94],
- ["E372",0x7D96],
- ["BAEE",0x7D9C],
- ["E36A",0x7D9D],
- ["BD78",0x7D9E],
- ["E374",0x7D9F],
- ["BAF1",0x7DA0],
- ["E378",0x7DA1],
- ["BAF7",0x7DA2],
- ["E365",0x7DA3],
- ["E375",0x7DA6],
- ["E362",0x7DA7],
- ["E377",0x7DA9],
- ["E366",0x7DAA],
- ["BAFE",0x7DAC],
- ["BAFB",0x7DAD],
- ["E376",0x7DAE],
- ["E370",0x7DAF],
- ["BAED",0x7DB0],
- ["BAF5",0x7DB1],
- ["BAF4",0x7DB2],
- ["BAF3",0x7DB4],
- ["BAF9",0x7DB5],
- ["E363",0x7DB7],
- ["BAFA",0x7DB8],
- ["E371",0x7DB9],
- ["BAF6",0x7DBA],
- ["BAEC",0x7DBB],
- ["E373",0x7DBC],
- ["BAEF",0x7DBD],
- ["BAF0",0x7DBE],
- ["BAF8",0x7DBF],
- ["E368",0x7DC0],
- ["E367",0x7DC1],
- ["E364",0x7DC2],
- ["E36C",0x7DC4],
- ["E369",0x7DC5],
- ["E36D",0x7DC6],
- ["BAFD",0x7DC7],
- ["E379",0x7DC9],
- ["BAF2",0x7DCA],
- ["E36E",0x7DCB],
- ["E36F",0x7DCC],
- ["E36B",0x7DCE],
- ["BAFC",0x7DD2],
- ["E6E7",0x7DD7],
- ["BD70",0x7DD8],
- ["BD79",0x7DD9],
- ["BD75",0x7DDA],
- ["E6E4",0x7DDB],
- ["BD72",0x7DDD],
- ["BD76",0x7DDE],
- ["E6F0",0x7DDF],
- ["BD6C",0x7DE0],
- ["E6E8",0x7DE1],
- ["BD74",0x7DE3],
- ["E6EB",0x7DE6],
- ["E6E6",0x7DE7],
- ["BD73",0x7DE8],
- ["BD77",0x7DE9],
- ["E6E5",0x7DEA],
- ["BD71",0x7DEC],
- ["E6EF",0x7DEE],
- ["BD6E",0x7DEF],
- ["E6EE",0x7DF0],
- ["E6ED",0x7DF1],
- ["BD7A",0x7DF2],
- ["E572",0x7DF3],
- ["BD6D",0x7DF4],
- ["E6EC",0x7DF6],
- ["E6E3",0x7DF7],
- ["BD7B",0x7DF9],
- ["E6EA",0x7DFA],
- ["BD6F",0x7DFB],
- ["E6E9",0x7E03],
- ["BFA2",0x7E08],
- ["BFA7",0x7E09],
- ["BF7E",0x7E0A],
- ["EAD8",0x7E0B],
- ["EACF",0x7E0C],
- ["EADB",0x7E0D],
- ["EAD3",0x7E0E],
- ["EAD9",0x7E0F],
- ["BFA8",0x7E10],
- ["BFA1",0x7E11],
- ["EACC",0x7E12],
- ["EAD2",0x7E13],
- ["EADC",0x7E14],
- ["EAD5",0x7E15],
- ["EADA",0x7E16],
- ["EACE",0x7E17],
- ["EAD6",0x7E1A],
- ["BFA3",0x7E1B],
- ["EAD4",0x7E1C],
- ["BFA6",0x7E1D],
- ["BFA5",0x7E1E],
- ["EAD0",0x7E1F],
- ["EAD1",0x7E20],
- ["EACD",0x7E21],
- ["EAD7",0x7E22],
- ["BFA4",0x7E23],
- ["EADE",0x7E24],
- ["EADD",0x7E25],
- ["EDDA",0x7E29],
- ["EDD6",0x7E2A],
- ["C15F",0x7E2B],
- ["EDD0",0x7E2D],
- ["C159",0x7E2E],
- ["C169",0x7E2F],
- ["EDDC",0x7E30],
- ["C161",0x7E31],
- ["C15D",0x7E32],
- ["EDD3",0x7E33],
- ["C164",0x7E34],
- ["C167",0x7E35],
- ["EDDE",0x7E36],
- ["C15C",0x7E37],
- ["EDD5",0x7E38],
- ["C165",0x7E39],
- ["EDE0",0x7E3A],
- ["EDDD",0x7E3B],
- ["EDD1",0x7E3C],
- ["C160",0x7E3D],
- ["C15A",0x7E3E],
- ["C168",0x7E3F],
- ["EDD8",0x7E40],
- ["C163",0x7E41],
- ["EDD2",0x7E42],
- ["C15E",0x7E43],
- ["EDDF",0x7E44],
- ["C162",0x7E45],
- ["C15B",0x7E46],
- ["EDD9",0x7E47],
- ["C166",0x7E48],
- ["EDD7",0x7E49],
- ["EDDB",0x7E4C],
- ["F06E",0x7E50],
- ["F074",0x7E51],
- ["C2B9",0x7E52],
- ["F077",0x7E53],
- ["C2B4",0x7E54],
- ["C2B5",0x7E55],
- ["F06F",0x7E56],
- ["F076",0x7E57],
- ["F071",0x7E58],
- ["C2BA",0x7E59],
- ["C2B7",0x7E5A],
- ["F06D",0x7E5C],
- ["C2B6",0x7E5E],
- ["F073",0x7E5F],
- ["F075",0x7E60],
- ["C2B8",0x7E61],
- ["F072",0x7E62],
- ["F070",0x7E63],
- ["F2B8",0x7E68],
- ["C3B7",0x7E69],
- ["C3B8",0x7E6A],
- ["C3B4",0x7E6B],
- ["C3B5",0x7E6D],
- ["F2B4",0x7E6F],
- ["F2B2",0x7E70],
- ["F2B6",0x7E72],
- ["C3BA",0x7E73],
- ["F2B7",0x7E74],
- ["F2B0",0x7E75],
- ["F2AF",0x7E76],
- ["F2B3",0x7E77],
- ["F2B1",0x7E78],
- ["C3B6",0x7E79],
- ["F2B5",0x7E7A],
- ["F4AC",0x7E7B],
- ["C47E",0x7E7C],
- ["C47D",0x7E7D],
- ["F4AD",0x7E7E],
- ["F4AF",0x7E80],
- ["F4AE",0x7E81],
- ["C4A1",0x7E82],
- ["F5EB",0x7E86],
- ["F5E8",0x7E87],
- ["F5E9",0x7E88],
- ["F5E7",0x7E8A],
- ["F5EA",0x7E8B],
- ["C4F2",0x7E8C],
- ["F5EC",0x7E8D],
- ["C4F1",0x7E8F],
- ["F742",0x7E91],
- ["C5D5",0x7E93],
- ["C5D7",0x7E94],
- ["F7EE",0x7E95],
- ["C5D6",0x7E96],
- ["F8B9",0x7E97],
- ["F940",0x7E98],
- ["F942",0x7E99],
- ["F8FE",0x7E9A],
- ["F941",0x7E9B],
- ["C66C",0x7E9C],
- ["A6CE",0x7F36],
- ["ACFB",0x7F38],
- ["D26F",0x7F39],
- ["AFCA",0x7F3A],
- ["B2DA",0x7F3D],
- ["DAFC",0x7F3E],
- ["DAFD",0x7F3F],
- ["EADF",0x7F43],
- ["C16A",0x7F44],
- ["EDE1",0x7F45],
- ["C2BB",0x7F48],
- ["F2BA",0x7F4A],
- ["F2B9",0x7F4B],
- ["C4A2",0x7F4C],
- ["F5ED",0x7F4D],
- ["F743",0x7F4F],
- ["C5F8",0x7F50],
- ["CA49",0x7F51],
- ["AAC9",0x7F54],
- ["A875",0x7F55],
- ["D04D",0x7F58],
- ["D360",0x7F5B],
- ["D35B",0x7F5C],
- ["D35F",0x7F5D],
- ["D35D",0x7F5E],
- ["AFCB",0x7F5F],
- ["D35E",0x7F60],
- ["D35C",0x7F61],
- ["D6F1",0x7F63],
- ["DAFE",0x7F65],
- ["DB40",0x7F66],
- ["DF69",0x7F67],
- ["DF6A",0x7F68],
- ["B86E",0x7F69],
- ["B86F",0x7F6A],
- ["DF68",0x7F6B],
- ["DF6B",0x7F6C],
- ["DF67",0x7F6D],
- ["B86D",0x7F6E],
- ["BB40",0x7F70],
- ["B870",0x7F72],
- ["E37A",0x7F73],
- ["BD7C",0x7F75],
- ["E6F1",0x7F76],
- ["BD7D",0x7F77],
- ["BFA9",0x7F79],
- ["EAE2",0x7F7A],
- ["EAE0",0x7F7B],
- ["EAE1",0x7F7C],
- ["EDE4",0x7F7D],
- ["EDE3",0x7F7E],
- ["EDE2",0x7F7F],
- ["F2BB",0x7F83],
- ["C3B9",0x7F85],
- ["F2BC",0x7F86],
- ["F744",0x7F87],
- ["C5F9",0x7F88],
- ["F8BA",0x7F89],
- ["A6CF",0x7F8A],
- ["AACB",0x7F8B],
- ["AACA",0x7F8C],
- ["D04F",0x7F8D],
- ["ACFC",0x7F8E],
- ["D04E",0x7F91],
- ["D362",0x7F92],
- ["AFCC",0x7F94],
- ["D6F2",0x7F95],
- ["D361",0x7F96],
- ["B2DC",0x7F9A],
- ["D6F5",0x7F9B],
- ["D6F3",0x7F9C],
- ["D6F4",0x7F9D],
- ["B2DB",0x7F9E],
- ["DB42",0x7FA0],
- ["DB43",0x7FA1],
- ["DB41",0x7FA2],
- ["B873",0x7FA4],
- ["DF6D",0x7FA5],
- ["DF6C",0x7FA6],
- ["DF6E",0x7FA7],
- ["B872",0x7FA8],
- ["B871",0x7FA9],
- ["E6F2",0x7FAC],
- ["E6F4",0x7FAD],
- ["BD7E",0x7FAF],
- ["E6F3",0x7FB0],
- ["EAE3",0x7FB1],
- ["BFAA",0x7FB2],
- ["F079",0x7FB3],
- ["F078",0x7FB5],
- ["C3BB",0x7FB6],
- ["F2BD",0x7FB7],
- ["C3BD",0x7FB8],
- ["C3BC",0x7FB9],
- ["F4B0",0x7FBA],
- ["F5EE",0x7FBB],
- ["C4F3",0x7FBC],
- ["A6D0",0x7FBD],
- ["D050",0x7FBE],
- ["ACFD",0x7FBF],
- ["D365",0x7FC0],
- ["AFCE",0x7FC1],
- ["D364",0x7FC2],
- ["D363",0x7FC3],
- ["AFCD",0x7FC5],
- ["D6FB",0x7FC7],
- ["D6FD",0x7FC9],
- ["D6F6",0x7FCA],
- ["D6F7",0x7FCB],
- ["B2DD",0x7FCC],
- ["D6F8",0x7FCD],
- ["B2DE",0x7FCE],
- ["D6FC",0x7FCF],
- ["D6F9",0x7FD0],
- ["D6FA",0x7FD1],
- ["B2DF",0x7FD2],
- ["B5BE",0x7FD4],
- ["B5BF",0x7FD5],
- ["DB44",0x7FD7],
- ["DF6F",0x7FDB],
- ["DF70",0x7FDC],
- ["E37E",0x7FDE],
- ["BB43",0x7FDF],
- ["BB41",0x7FE0],
- ["BB42",0x7FE1],
- ["E37B",0x7FE2],
- ["E37C",0x7FE3],
- ["E37D",0x7FE5],
- ["E6F9",0x7FE6],
- ["E6FA",0x7FE8],
- ["BDA1",0x7FE9],
- ["E6F7",0x7FEA],
- ["E6F6",0x7FEB],
- ["E6F8",0x7FEC],
- ["E6F5",0x7FED],
- ["BFAD",0x7FEE],
- ["EAE4",0x7FEF],
- ["BFAB",0x7FF0],
- ["BFAC",0x7FF1],
- ["EDE6",0x7FF2],
- ["C16B",0x7FF3],
- ["EDE5",0x7FF4],
- ["EFA8",0x7FF5],
- ["F07A",0x7FF7],
- ["F07B",0x7FF8],
- ["C2BC",0x7FF9],
- ["C2BD",0x7FFB],
- ["C16C",0x7FFC],
- ["F2BE",0x7FFD],
- ["F2BF",0x7FFE],
- ["F4B1",0x7FFF],
- ["C4A3",0x8000],
- ["A6D1",0x8001],
- ["A6D2",0x8003],
- ["ACFE",0x8004],
- ["AACC",0x8005],
- ["AFCF",0x8006],
- ["D051",0x8007],
- ["B5C0",0x800B],
- ["A6D3",0x800C],
- ["AD41",0x800D],
- ["D052",0x800E],
- ["D053",0x800F],
- ["AD40",0x8010],
- ["AD42",0x8011],
- ["A6D4",0x8012],
- ["D054",0x8014],
- ["AFD1",0x8015],
- ["D366",0x8016],
- ["AFD3",0x8017],
- ["AFD0",0x8018],
- ["AFD2",0x8019],
- ["D741",0x801B],
- ["B2E0",0x801C],
- ["D740",0x801E],
- ["D6FE",0x801F],
- ["DF71",0x8021],
- ["E3A1",0x8024],
- ["BDA2",0x8026],
- ["BFAE",0x8028],
- ["EAE6",0x8029],
- ["EAE5",0x802A],
- ["EDE7",0x802C],
- ["F5EF",0x8030],
- ["A6D5",0x8033],
- ["CB73",0x8034],
- ["CDAA",0x8035],
- ["AD43",0x8036],
- ["D055",0x8037],
- ["D368",0x8039],
- ["AFD4",0x803D],
- ["D367",0x803E],
- ["AFD5",0x803F],
- ["D743",0x8043],
- ["B2E2",0x8046],
- ["D742",0x8047],
- ["D744",0x8048],
- ["B2E1",0x804A],
- ["DB46",0x804F],
- ["DB47",0x8050],
- ["DB45",0x8051],
- ["B5C1",0x8052],
- ["B874",0x8056],
- ["B875",0x8058],
- ["BB45",0x805A],
- ["E3A3",0x805C],
- ["E3A2",0x805D],
- ["BB44",0x805E],
- ["E6FB",0x8064],
- ["E6FC",0x8067],
- ["EAE7",0x806C],
- ["C170",0x806F],
- ["C16F",0x8070],
- ["C16D",0x8071],
- ["C16E",0x8072],
- ["C171",0x8073],
- ["F07C",0x8075],
- ["C2BF",0x8076],
- ["C2BE",0x8077],
- ["F2C0",0x8078],
- ["F4B2",0x8079],
- ["C5A5",0x807D],
- ["C5A4",0x807E],
- ["A6D6",0x807F],
- ["D1FB",0x8082],
- ["B877",0x8084],
- ["B5C2",0x8085],
- ["B876",0x8086],
- ["BB46",0x8087],
- ["A6D7",0x8089],
- ["C9A9",0x808A],
- ["A6D8",0x808B],
- ["A6D9",0x808C],
- ["CDAB",0x808F],
- ["CB76",0x8090],
- ["CB77",0x8092],
- ["A877",0x8093],
- ["CB74",0x8095],
- ["A876",0x8096],
- ["A879",0x8098],
- ["CB75",0x8099],
- ["A87B",0x809A],
- ["A87A",0x809B],
- ["CB78",0x809C],
- ["A878",0x809D],
- ["AAD1",0x80A1],
- ["AACF",0x80A2],
- ["CDAD",0x80A3],
- ["AACE",0x80A5],
- ["AAD3",0x80A9],
- ["AAD5",0x80AA],
- ["AAD2",0x80AB],
- ["CDB0",0x80AD],
- ["CDAC",0x80AE],
- ["AAD6",0x80AF],
- ["AAD0",0x80B1],
- ["A87C",0x80B2],
- ["AAD4",0x80B4],
- ["CDAF",0x80B5],
- ["CDAE",0x80B8],
- ["AACD",0x80BA],
- ["D05B",0x80C2],
- ["AD47",0x80C3],
- ["AD48",0x80C4],
- ["D05D",0x80C5],
- ["D057",0x80C7],
- ["D05A",0x80C8],
- ["D063",0x80C9],
- ["D061",0x80CA],
- ["AD49",0x80CC],
- ["D067",0x80CD],
- ["AD4C",0x80CE],
- ["D064",0x80CF],
- ["D05C",0x80D0],
- ["D059",0x80D1],
- ["DB49",0x80D4],
- ["D062",0x80D5],
- ["AD44",0x80D6],
- ["D065",0x80D7],
- ["D056",0x80D8],
- ["D05F",0x80D9],
- ["AD46",0x80DA],
- ["AD4B",0x80DB],
- ["D060",0x80DC],
- ["AD4F",0x80DD],
- ["AD4D",0x80DE],
- ["D058",0x80E0],
- ["AD4A",0x80E1],
- ["D05E",0x80E3],
- ["AD4E",0x80E4],
- ["AD45",0x80E5],
- ["D066",0x80E6],
- ["AFDA",0x80ED],
- ["AFE3",0x80EF],
- ["AFD8",0x80F0],
- ["AFD6",0x80F1],
- ["D36A",0x80F2],
- ["AFDE",0x80F3],
- ["AFDB",0x80F4],
- ["D36C",0x80F5],
- ["AFDD",0x80F8],
- ["D36B",0x80F9],
- ["D369",0x80FA],
- ["D36E",0x80FB],
- ["AFE2",0x80FC],
- ["AFE0",0x80FD],
- ["DB48",0x80FE],
- ["D36F",0x8100],
- ["D36D",0x8101],
- ["AFD7",0x8102],
- ["AFD9",0x8105],
- ["AFDC",0x8106],
- ["AFDF",0x8108],
- ["AFE1",0x810A],
- ["D74E",0x8115],
- ["B2E4",0x8116],
- ["D745",0x8118],
- ["D747",0x8119],
- ["D748",0x811B],
- ["D750",0x811D],
- ["D74C",0x811E],
- ["D74A",0x811F],
- ["D74D",0x8121],
- ["D751",0x8122],
- ["B2E5",0x8123],
- ["B2E9",0x8124],
- ["D746",0x8125],
- ["D74F",0x8127],
- ["B2E7",0x8129],
- ["B2E6",0x812B],
- ["D74B",0x812C],
- ["D749",0x812D],
- ["B2E3",0x812F],
- ["B2E8",0x8130],
- ["B5C8",0x8139],
- ["DB51",0x813A],
- ["DB4F",0x813D],
- ["B5CA",0x813E],
- ["DB4A",0x8143],
- ["DFA1",0x8144],
- ["B5C9",0x8146],
- ["DB4E",0x8147],
- ["DB4B",0x814A],
- ["B5C5",0x814B],
- ["B5CB",0x814C],
- ["DB50",0x814D],
- ["B5C7",0x814E],
- ["DB4D",0x814F],
- ["BB47",0x8150],
- ["B5C6",0x8151],
- ["DB4C",0x8152],
- ["B5CC",0x8153],
- ["B5C4",0x8154],
- ["B5C3",0x8155],
- ["DF77",0x815B],
- ["DF75",0x815C],
- ["DF7B",0x815E],
- ["DF73",0x8160],
- ["DFA2",0x8161],
- ["DF78",0x8162],
- ["DF72",0x8164],
- ["B87B",0x8165],
- ["B8A3",0x8166],
- ["DF7D",0x8167],
- ["DF76",0x8169],
- ["B87E",0x816B],
- ["B87C",0x816E],
- ["DF7E",0x816F],
- ["B879",0x8170],
- ["B878",0x8171],
- ["DF79",0x8172],
- ["B87D",0x8173],
- ["B5CD",0x8174],
- ["DF7C",0x8176],
- ["DF74",0x8177],
- ["B87A",0x8178],
- ["B8A1",0x8179],
- ["B8A2",0x817A],
- ["BB4C",0x817F],
- ["BB48",0x8180],
- ["BB4D",0x8182],
- ["E3A6",0x8183],
- ["E3A5",0x8186],
- ["E3A7",0x8187],
- ["BB4A",0x8188],
- ["E3A4",0x8189],
- ["BB4B",0x818A],
- ["E3AA",0x818B],
- ["E3A9",0x818C],
- ["E3A8",0x818D],
- ["BB49",0x818F],
- ["E741",0x8195],
- ["E744",0x8197],
- ["BDA8",0x8198],
- ["E743",0x8199],
- ["BDA7",0x819A],
- ["BDA3",0x819B],
- ["BDA4",0x819C],
- ["BDA5",0x819D],
- ["E740",0x819E],
- ["E6FE",0x819F],
- ["BDA6",0x81A0],
- ["E742",0x81A2],
- ["E6FD",0x81A3],
- ["EAE9",0x81A6],
- ["EAF3",0x81A7],
- ["BFB1",0x81A8],
- ["BFB0",0x81A9],
- ["EAED",0x81AB],
- ["EAEF",0x81AC],
- ["EAEA",0x81AE],
- ["EAEE",0x81B0],
- ["EAE8",0x81B1],
- ["EAF1",0x81B2],
- ["BFAF",0x81B3],
- ["EAF0",0x81B4],
- ["EAEC",0x81B5],
- ["EAF2",0x81B7],
- ["EAEB",0x81B9],
- ["C174",0x81BA],
- ["EDE8",0x81BB],
- ["EDEE",0x81BC],
- ["C178",0x81BD],
- ["C17A",0x81BE],
- ["C177",0x81BF],
- ["C176",0x81C0],
- ["C175",0x81C2],
- ["C173",0x81C3],
- ["EDE9",0x81C4],
- ["EDEC",0x81C5],
- ["C172",0x81C6],
- ["EDED",0x81C7],
- ["C179",0x81C9],
- ["EDEB",0x81CA],
- ["EDEA",0x81CC],
- ["C2C0",0x81CD],
- ["C2C1",0x81CF],
- ["F0A1",0x81D0],
- ["F07D",0x81D1],
- ["F07E",0x81D2],
- ["F2C2",0x81D5],
- ["F2C1",0x81D7],
- ["C3BE",0x81D8],
- ["F4B4",0x81D9],
- ["C4A4",0x81DA],
- ["F4B3",0x81DB],
- ["F5F0",0x81DD],
- ["F745",0x81DE],
- ["C5A6",0x81DF],
- ["F943",0x81E0],
- ["F944",0x81E1],
- ["C5D8",0x81E2],
- ["A6DA",0x81E3],
- ["AAD7",0x81E5],
- ["DB52",0x81E6],
- ["BB4E",0x81E7],
- ["C17B",0x81E8],
- ["EDEF",0x81E9],
- ["A6DB",0x81EA],
- ["AFE5",0x81EC],
- ["AFE4",0x81ED],
- ["DB53",0x81EE],
- ["EAF4",0x81F2],
- ["A6DC",0x81F3],
- ["AD50",0x81F4],
- ["DB54",0x81F7],
- ["DB55",0x81F8],
- ["DB56",0x81F9],
- ["BB4F",0x81FA],
- ["BFB2",0x81FB],
- ["A6DD",0x81FC],
- ["AAD8",0x81FE],
- ["D068",0x81FF],
- ["AFE6",0x8200],
- ["D370",0x8201],
- ["B2EA",0x8202],
- ["DB57",0x8204],
- ["B8A4",0x8205],
- ["BB50",0x8207],
- ["BFB3",0x8208],
- ["C17C",0x8209],
- ["C2C2",0x820A],
- ["F4B5",0x820B],
- ["A6DE",0x820C],
- ["AAD9",0x820D],
- ["AFE7",0x8210],
- ["D752",0x8211],
- ["B5CE",0x8212],
- ["BB51",0x8214],
- ["E3AB",0x8215],
- ["E745",0x8216],
- ["A6DF",0x821B],
- ["B5CF",0x821C],
- ["DFA3",0x821D],
- ["BB52",0x821E],
- ["A6E0",0x821F],
- ["CDB1",0x8220],
- ["D069",0x8221],
- ["AD51",0x8222],
- ["D372",0x8225],
- ["AFEA",0x8228],
- ["AFE8",0x822A],
- ["AFE9",0x822B],
- ["AFEB",0x822C],
- ["D371",0x822F],
- ["D757",0x8232],
- ["D754",0x8233],
- ["D756",0x8234],
- ["B2EB",0x8235],
- ["B2ED",0x8236],
- ["B2EC",0x8237],
- ["D753",0x8238],
- ["B2EE",0x8239],
- ["D755",0x823A],
- ["DB58",0x823C],
- ["DB59",0x823D],
- ["DB5A",0x823F],
- ["DFA6",0x8240],
- ["DFA7",0x8242],
- ["DFA5",0x8244],
- ["DFA8",0x8245],
- ["B8A5",0x8247],
- ["DFA4",0x8249],
- ["BB53",0x824B],
- ["E74A",0x824E],
- ["E746",0x824F],
- ["E749",0x8250],
- ["E74B",0x8251],
- ["E748",0x8252],
- ["E747",0x8253],
- ["EAF5",0x8255],
- ["EAF6",0x8256],
- ["EAF7",0x8257],
- ["BFB4",0x8258],
- ["BFB5",0x8259],
- ["EDF1",0x825A],
- ["EDF0",0x825B],
- ["EDF2",0x825C],
- ["F0A3",0x825E],
- ["F0A2",0x825F],
- ["F2C4",0x8261],
- ["F2C5",0x8263],
- ["F2C3",0x8264],
- ["C4A5",0x8266],
- ["F4B6",0x8268],
- ["F4B7",0x8269],
- ["F746",0x826B],
- ["F7EF",0x826C],
- ["F8BB",0x826D],
- ["A6E1",0x826E],
- ["A87D",0x826F],
- ["C17D",0x8271],
- ["A6E2",0x8272],
- ["D758",0x8274],
- ["DB5B",0x8275],
- ["C641",0x8277],
- ["CA4A",0x8278],
- ["CA4B",0x827C],
- ["CA4D",0x827D],
- ["A6E3",0x827E],
- ["CA4E",0x827F],
- ["CA4C",0x8280],
- ["CBA2",0x8283],
- ["CBA3",0x8284],
- ["CB7B",0x8285],
- ["CBA1",0x828A],
- ["A8A1",0x828B],
- ["A8A2",0x828D],
- ["CB7C",0x828E],
- ["CB7A",0x828F],
- ["CB79",0x8290],
- ["CB7D",0x8291],
- ["A87E",0x8292],
- ["CB7E",0x8293],
- ["D06A",0x8294],
- ["CDB6",0x8298],
- ["AADC",0x8299],
- ["CDB5",0x829A],
- ["CDB7",0x829B],
- ["AADB",0x829D],
- ["CDBC",0x829E],
- ["AADF",0x829F],
- ["CDB2",0x82A0],
- ["CDC0",0x82A1],
- ["CDC6",0x82A2],
- ["AAE6",0x82A3],
- ["CDC3",0x82A4],
- ["AAE3",0x82A5],
- ["CDB9",0x82A7],
- ["CDBF",0x82A8],
- ["CDC1",0x82A9],
- ["CDB4",0x82AB],
- ["AAE2",0x82AC],
- ["AADD",0x82AD],
- ["CDBA",0x82AE],
- ["AAE4",0x82AF],
- ["AAE7",0x82B0],
- ["AAE1",0x82B1],
- ["AADA",0x82B3],
- ["CDBE",0x82B4],
- ["CDB8",0x82B5],
- ["CDC5",0x82B6],
- ["AAE9",0x82B7],
- ["AAE5",0x82B8],
- ["AAE0",0x82B9],
- ["CDBD",0x82BA],
- ["AFEC",0x82BB],
- ["CDBB",0x82BC],
- ["AADE",0x82BD],
- ["AAE8",0x82BE],
- ["CDB3",0x82C0],
- ["CDC2",0x82C2],
- ["CDC4",0x82C3],
- ["AD62",0x82D1],
- ["AD5C",0x82D2],
- ["AD64",0x82D3],
- ["AD61",0x82D4],
- ["D071",0x82D5],
- ["D074",0x82D6],
- ["AD5D",0x82D7],
- ["D06B",0x82D9],
- ["AD56",0x82DB],
- ["AD60",0x82DC],
- ["AD63",0x82DE],
- ["AD65",0x82DF],
- ["D0A2",0x82E0],
- ["D077",0x82E1],
- ["AD55",0x82E3],
- ["D0A1",0x82E4],
- ["AD59",0x82E5],
- ["AD57",0x82E6],
- ["AD52",0x82E7],
- ["D06F",0x82E8],
- ["D07E",0x82EA],
- ["D073",0x82EB],
- ["D076",0x82EC],
- ["D0A5",0x82ED],
- ["AD66",0x82EF],
- ["D07D",0x82F0],
- ["AD5E",0x82F1],
- ["D078",0x82F2],
- ["D0A4",0x82F3],
- ["D075",0x82F4],
- ["D079",0x82F5],
- ["D07C",0x82F6],
- ["D06D",0x82F9],
- ["D0A3",0x82FA],
- ["D07B",0x82FB],
- ["D06C",0x82FE],
- ["D070",0x8300],
- ["AD5F",0x8301],
- ["AD5A",0x8302],
- ["AD53",0x8303],
- ["AD58",0x8304],
- ["AD54",0x8305],
- ["AD67",0x8306],
- ["D06E",0x8307],
- ["D3A5",0x8308],
- ["AD5B",0x8309],
- ["D07A",0x830C],
- ["CE41",0x830D],
- ["D3A8",0x8316],
- ["AFFA",0x8317],
- ["D376",0x8319],
- ["D3A3",0x831B],
- ["D37D",0x831C],
- ["D3B2",0x831E],
- ["D3AA",0x8320],
- ["D37E",0x8322],
- ["D3A9",0x8324],
- ["D378",0x8325],
- ["D37C",0x8326],
- ["D3B5",0x8327],
- ["AFFD",0x8328],
- ["D3AD",0x8329],
- ["D3A4",0x832A],
- ["AFED",0x832B],
- ["D3B3",0x832C],
- ["D374",0x832D],
- ["D3AC",0x832F],
- ["AFFC",0x8331],
- ["AFF7",0x8332],
- ["D373",0x8333],
- ["AFF5",0x8334],
- ["AFF4",0x8335],
- ["AFF9",0x8336],
- ["D3AB",0x8337],
- ["AFF1",0x8338],
- ["AFF8",0x8339],
- ["D072",0x833A],
- ["DB5C",0x833B],
- ["D3A6",0x833C],
- ["D37A",0x833F],
- ["AFFB",0x8340],
- ["D37B",0x8341],
- ["D3A1",0x8342],
- ["AFFE",0x8343],
- ["D375",0x8344],
- ["D3AF",0x8345],
- ["D3AE",0x8347],
- ["D3B6",0x8348],
- ["AFF3",0x8349],
- ["AFF0",0x834A],
- ["D3B4",0x834B],
- ["D3B0",0x834C],
- ["D3A7",0x834D],
- ["D3A2",0x834E],
- ["AFF6",0x834F],
- ["AFF2",0x8350],
- ["D377",0x8351],
- ["AFEE",0x8352],
- ["D3B1",0x8353],
- ["AFEF",0x8354],
- ["D379",0x8356],
- ["D75E",0x8373],
- ["D760",0x8374],
- ["D765",0x8375],
- ["D779",0x8376],
- ["B2FC",0x8377],
- ["B2F2",0x8378],
- ["D75D",0x837A],
- ["B2FD",0x837B],
- ["B2FE",0x837C],
- ["D768",0x837D],
- ["D76F",0x837E],
- ["D775",0x837F],
- ["D762",0x8381],
- ["D769",0x8383],
- ["B340",0x8386],
- ["D777",0x8387],
- ["D772",0x8388],
- ["B2FA",0x8389],
- ["B2F8",0x838A],
- ["D76E",0x838B],
- ["D76A",0x838C],
- ["D75C",0x838D],
- ["B2EF",0x838E],
- ["D761",0x838F],
- ["D759",0x8390],
- ["B2F7",0x8392],
- ["B2F9",0x8393],
- ["D766",0x8394],
- ["D763",0x8395],
- ["B2F4",0x8396],
- ["D773",0x8397],
- ["B2F1",0x8398],
- ["D764",0x8399],
- ["D77A",0x839A],
- ["D76C",0x839B],
- ["D76B",0x839D],
- ["B2F0",0x839E],
- ["B2FB",0x83A0],
- ["B2F3",0x83A2],
- ["D75A",0x83A3],
- ["D75F",0x83A4],
- ["D770",0x83A5],
- ["D776",0x83A6],
- ["B341",0x83A7],
- ["D75B",0x83A8],
- ["D767",0x83A9],
- ["D76D",0x83AA],
- ["B2F6",0x83AB],
- ["D778",0x83AE],
- ["D771",0x83AF],
- ["D774",0x83B0],
- ["B2F5",0x83BD],
- ["DB6C",0x83BF],
- ["DB60",0x83C0],
- ["B5D7",0x83C1],
- ["DB7D",0x83C2],
- ["DBA7",0x83C3],
- ["DBAA",0x83C4],
- ["B5D5",0x83C5],
- ["DB68",0x83C6],
- ["DBA3",0x83C7],
- ["DB69",0x83C8],
- ["DB77",0x83C9],
- ["B5E2",0x83CA],
- ["DB73",0x83CB],
- ["B5DF",0x83CC],
- ["DB74",0x83CE],
- ["DB5D",0x83CF],
- ["DBA4",0x83D1],
- ["B5E8",0x83D4],
- ["DBA1",0x83D5],
- ["DB75",0x83D6],
- ["DBAC",0x83D7],
- ["DB70",0x83D8],
- ["DFC8",0x83D9],
- ["DBAF",0x83DB],
- ["B5E6",0x83DC],
- ["DB6E",0x83DD],
- ["DB7A",0x83DE],
- ["B5E9",0x83DF],
- ["B5D4",0x83E0],
- ["DB72",0x83E1],
- ["DBAD",0x83E2],
- ["DB6B",0x83E3],
- ["DB64",0x83E4],
- ["DB6F",0x83E5],
- ["DB63",0x83E7],
- ["DB61",0x83E8],
- ["B5D0",0x83E9],
- ["DBA5",0x83EA],
- ["DB6A",0x83EB],
- ["DBA8",0x83EC],
- ["DBA9",0x83EE],
- ["B5D8",0x83EF],
- ["B5DD",0x83F0],
- ["B5D9",0x83F1],
- ["B5E1",0x83F2],
- ["DB7E",0x83F3],
- ["B5DA",0x83F4],
- ["DB76",0x83F5],
- ["DB66",0x83F6],
- ["B5D2",0x83F8],
- ["DB5E",0x83F9],
- ["DBA2",0x83FA],
- ["DBAB",0x83FB],
- ["DB65",0x83FC],
- ["B5E0",0x83FD],
- ["DBB0",0x83FE],
- ["DB71",0x83FF],
- ["DB6D",0x8401],
- ["B5D1",0x8403],
- ["B5E5",0x8404],
- ["DB7C",0x8406],
- ["B5E7",0x8407],
- ["DB78",0x8409],
- ["B5DC",0x840A],
- ["B5D6",0x840B],
- ["B5DE",0x840C],
- ["B5D3",0x840D],
- ["B5E4",0x840E],
- ["DB79",0x840F],
- ["DB67",0x8410],
- ["DB7B",0x8411],
- ["DB62",0x8412],
- ["DBA6",0x8413],
- ["DBAE",0x841B],
- ["DB5F",0x8423],
- ["DFC7",0x8429],
- ["DFDD",0x842B],
- ["B855",0x842C],
- ["DFCC",0x842D],
- ["DFCA",0x842F],
- ["DFB5",0x8430],
- ["B8A9",0x8431],
- ["DFC5",0x8432],
- ["DFD9",0x8433],
- ["DFC1",0x8434],
- ["B8B1",0x8435],
- ["DFD8",0x8436],
- ["DFBF",0x8437],
- ["B5E3",0x8438],
- ["DFCF",0x8439],
- ["DFC0",0x843A],
- ["DFD6",0x843B],
- ["B8B0",0x843C],
- ["B8A8",0x843D],
- ["DFAA",0x843F],
- ["DFB2",0x8440],
- ["DFCB",0x8442],
- ["DFC3",0x8443],
- ["DFDC",0x8444],
- ["DFC6",0x8445],
- ["B8B6",0x8446],
- ["DFD7",0x8447],
- ["B8AD",0x8449],
- ["DFC9",0x844B],
- ["DFD1",0x844C],
- ["DFB6",0x844D],
- ["DFD0",0x844E],
- ["DFE1",0x8450],
- ["DFB1",0x8451],
- ["DFD2",0x8452],
- ["DFDF",0x8454],
- ["DFAB",0x8456],
- ["B5DB",0x8457],
- ["DFB9",0x8459],
- ["DFB8",0x845A],
- ["B8AF",0x845B],
- ["DFBC",0x845D],
- ["DFBE",0x845E],
- ["DFCD",0x845F],
- ["DFDE",0x8460],
- ["B8B2",0x8461],
- ["B8B3",0x8463],
- ["DFB0",0x8465],
- ["B8AB",0x8466],
- ["DFB4",0x8467],
- ["DFDA",0x8468],
- ["B8B4",0x8469],
- ["B8AC",0x846B],
- ["B8AE",0x846C],
- ["B8B5",0x846D],
- ["DFE0",0x846E],
- ["DFD3",0x846F],
- ["DFCE",0x8470],
- ["DFBB",0x8473],
- ["DFBA",0x8474],
- ["B8AA",0x8475],
- ["DFAC",0x8476],
- ["B8A7",0x8477],
- ["DFC4",0x8478],
- ["DFAD",0x8479],
- ["DFC2",0x847A],
- ["DFB7",0x847D],
- ["DFDB",0x847E],
- ["B8A6",0x8482],
- ["DFB3",0x8486],
- ["DFAF",0x848D],
- ["DFD5",0x848E],
- ["DFAE",0x848F],
- ["BB60",0x8490],
- ["E3D3",0x8491],
- ["E3C2",0x8494],
- ["E3AC",0x8497],
- ["E3CA",0x8498],
- ["BB58",0x8499],
- ["E3BB",0x849A],
- ["E3C5",0x849B],
- ["BB5B",0x849C],
- ["E3BE",0x849D],
- ["BB59",0x849E],
- ["E3AF",0x849F],
- ["E3CD",0x84A0],
- ["E3AE",0x84A1],
- ["E3C1",0x84A2],
- ["E3AD",0x84A4],
- ["E3BF",0x84A7],
- ["E3C8",0x84A8],
- ["E3C6",0x84A9],
- ["E3BA",0x84AA],
- ["E3B5",0x84AB],
- ["E3B3",0x84AC],
- ["E3B4",0x84AE],
- ["E3C7",0x84AF],
- ["E3D2",0x84B0],
- ["E3BC",0x84B1],
- ["BB5A",0x84B2],
- ["E3B7",0x84B4],
- ["E3CB",0x84B6],
- ["BB5D",0x84B8],
- ["E3B6",0x84B9],
- ["E3B0",0x84BA],
- ["E3C0",0x84BB],
- ["BB61",0x84BC],
- ["BB55",0x84BF],
- ["BB5E",0x84C0],
- ["E3B8",0x84C1],
- ["E3B2",0x84C2],
- ["BB57",0x84C4],
- ["DFD4",0x84C5],
- ["BB56",0x84C6],
- ["E3C3",0x84C7],
- ["BB54",0x84C9],
- ["BB63",0x84CA],
- ["BB5C",0x84CB],
- ["E3C4",0x84CC],
- ["E3B9",0x84CD],
- ["E3B1",0x84CE],
- ["E3CC",0x84CF],
- ["E3BD",0x84D0],
- ["BB62",0x84D1],
- ["E3D0",0x84D2],
- ["BB5F",0x84D3],
- ["E3CF",0x84D4],
- ["E3C9",0x84D6],
- ["E3CE",0x84D7],
- ["E3D1",0x84DB],
- ["E773",0x84E7],
- ["E774",0x84E8],
- ["E767",0x84E9],
- ["E766",0x84EA],
- ["E762",0x84EB],
- ["BDB4",0x84EC],
- ["BDAC",0x84EE],
- ["E776",0x84EF],
- ["E775",0x84F0],
- ["DFA9",0x84F1],
- ["E75F",0x84F2],
- ["E763",0x84F3],
- ["E75D",0x84F4],
- ["E770",0x84F6],
- ["E761",0x84F7],
- ["E777",0x84F9],
- ["E75A",0x84FA],
- ["E758",0x84FB],
- ["E764",0x84FC],
- ["E76E",0x84FD],
- ["E769",0x84FE],
- ["BDB6",0x84FF],
- ["E74F",0x8500],
- ["E76D",0x8502],
- ["BDB7",0x8506],
- ["DFBD",0x8507],
- ["E75B",0x8508],
- ["E752",0x8509],
- ["E755",0x850A],
- ["E77B",0x850B],
- ["E75C",0x850C],
- ["E753",0x850D],
- ["E751",0x850E],
- ["E74E",0x850F],
- ["BDB0",0x8511],
- ["E765",0x8512],
- ["BDAF",0x8513],
- ["BDB3",0x8514],
- ["E760",0x8515],
- ["E768",0x8516],
- ["BDA9",0x8517],
- ["E778",0x8518],
- ["E77C",0x8519],
- ["BDAB",0x851A],
- ["E757",0x851C],
- ["E76B",0x851D],
- ["E76F",0x851E],
- ["E754",0x851F],
- ["E779",0x8520],
- ["BDB2",0x8521],
- ["BDB1",0x8523],
- ["E74C",0x8524],
- ["BDB5",0x8525],
- ["E772",0x8526],
- ["E756",0x8527],
- ["E76A",0x8528],
- ["E750",0x8529],
- ["E75E",0x852A],
- ["E759",0x852B],
- ["BDAD",0x852C],
- ["BDAE",0x852D],
- ["E76C",0x852E],
- ["E77D",0x852F],
- ["E77A",0x8530],
- ["E771",0x8531],
- ["E74D",0x853B],
- ["BDAA",0x853D],
- ["EB49",0x853E],
- ["EB40",0x8540],
- ["EB43",0x8541],
- ["BFBB",0x8543],
- ["EB45",0x8544],
- ["EAF9",0x8545],
- ["EB41",0x8546],
- ["EB47",0x8547],
- ["BFB8",0x8548],
- ["BFBC",0x8549],
- ["BFB6",0x854A],
- ["EAFB",0x854D],
- ["EB4C",0x854E],
- ["EB46",0x8551],
- ["EAFC",0x8553],
- ["EB55",0x8554],
- ["EB4F",0x8555],
- ["EAF8",0x8556],
- ["EE46",0x8557],
- ["EAFE",0x8558],
- ["BFB7",0x8559],
- ["EB4A",0x855B],
- ["EB54",0x855D],
- ["BFBF",0x855E],
- ["EB51",0x8560],
- ["EAFD",0x8561],
- ["EB44",0x8562],
- ["EB48",0x8563],
- ["EB42",0x8564],
- ["EB56",0x8565],
- ["EB53",0x8566],
- ["EB50",0x8567],
- ["BFB9",0x8568],
- ["BFBA",0x8569],
- ["BFBE",0x856A],
- ["EAFA",0x856B],
- ["EB57",0x856C],
- ["BFBD",0x856D],
- ["EB4D",0x856E],
- ["EB4B",0x8571],
- ["EB4E",0x8575],
- ["EE53",0x8576],
- ["EE40",0x8577],
- ["EE45",0x8578],
- ["EE52",0x8579],
- ["EE44",0x857A],
- ["EDFB",0x857B],
- ["EE41",0x857C],
- ["C1A2",0x857E],
- ["EDF4",0x8580],
- ["EE4D",0x8581],
- ["EE4F",0x8582],
- ["EDF3",0x8583],
- ["C1A1",0x8584],
- ["EE51",0x8585],
- ["EE49",0x8586],
- ["C1A8",0x8587],
- ["EE50",0x8588],
- ["EE42",0x8589],
- ["C1AA",0x858A],
- ["EDF9",0x858B],
- ["EB52",0x858C],
- ["EE4A",0x858D],
- ["EE47",0x858E],
- ["EDF5",0x858F],
- ["EE55",0x8590],
- ["C1A4",0x8591],
- ["C1A5",0x8594],
- ["EDF7",0x8595],
- ["EE48",0x8596],
- ["EE54",0x8598],
- ["EE4B",0x8599],
- ["EDFD",0x859A],
- ["C1A7",0x859B],
- ["C1A3",0x859C],
- ["EE4C",0x859D],
- ["EDFE",0x859E],
- ["EE56",0x859F],
- ["EDF8",0x85A0],
- ["EE43",0x85A1],
- ["EE4E",0x85A2],
- ["EDFA",0x85A3],
- ["EDFC",0x85A4],
- ["C2CB",0x85A6],
- ["EDF6",0x85A7],
- ["C1A9",0x85A8],
- ["C2C4",0x85A9],
- ["C17E",0x85AA],
- ["C1A6",0x85AF],
- ["C2C8",0x85B0],
- ["F0B3",0x85B1],
- ["F0A9",0x85B3],
- ["F0A4",0x85B4],
- ["F0AA",0x85B5],
- ["F0B4",0x85B6],
- ["F0B8",0x85B7],
- ["F0B7",0x85B8],
- ["C2CA",0x85B9],
- ["C2C9",0x85BA],
- ["F0AB",0x85BD],
- ["F0B9",0x85BE],
- ["F0AE",0x85BF],
- ["F0A6",0x85C0],
- ["F0A8",0x85C2],
- ["F0A7",0x85C3],
- ["F0AD",0x85C4],
- ["F0B2",0x85C5],
- ["F0A5",0x85C6],
- ["F0AC",0x85C7],
- ["F0B1",0x85C8],
- ["C2C7",0x85C9],
- ["F0AF",0x85CB],
- ["C2C5",0x85CD],
- ["F0B0",0x85CE],
- ["C2C3",0x85CF],
- ["C2C6",0x85D0],
- ["F2D5",0x85D1],
- ["F0B5",0x85D2],
- ["C3C2",0x85D5],
- ["F2CD",0x85D7],
- ["F2D1",0x85D8],
- ["F2C9",0x85D9],
- ["F2CC",0x85DA],
- ["F2D4",0x85DC],
- ["C3C0",0x85DD],
- ["F2D9",0x85DE],
- ["F2D2",0x85DF],
- ["F2CA",0x85E1],
- ["F2DA",0x85E2],
- ["F2D3",0x85E3],
- ["C3C3",0x85E4],
- ["C3C4",0x85E5],
- ["F2D7",0x85E6],
- ["F2CB",0x85E8],
- ["C3BF",0x85E9],
- ["C3C1",0x85EA],
- ["F2C6",0x85EB],
- ["F2CE",0x85EC],
- ["F2C8",0x85ED],
- ["F2D8",0x85EF],
- ["F2D6",0x85F0],
- ["F2C7",0x85F1],
- ["F2CF",0x85F2],
- ["F4BE",0x85F6],
- ["C3C5",0x85F7],
- ["F2D0",0x85F8],
- ["C4A7",0x85F9],
- ["C4A9",0x85FA],
- ["C4A6",0x85FB],
- ["F4C3",0x85FD],
- ["F4BB",0x85FE],
- ["F4B9",0x85FF],
- ["F4BD",0x8600],
- ["F4BA",0x8601],
- ["F4BF",0x8604],
- ["F4C1",0x8605],
- ["C4AA",0x8606],
- ["C4AC",0x8607],
- ["F4C0",0x8609],
- ["C4AD",0x860A],
- ["C4AB",0x860B],
- ["F4C2",0x860C],
- ["C4A8",0x8611],
- ["C4F4",0x8617],
- ["F5F1",0x8618],
- ["F5F7",0x8619],
- ["C4F6",0x861A],
- ["F4BC",0x861B],
- ["F5F6",0x861C],
- ["F5FD",0x861E],
- ["F5F4",0x861F],
- ["F5FB",0x8620],
- ["F5FA",0x8621],
- ["F4B8",0x8622],
- ["F5F5",0x8623],
- ["F0B6",0x8624],
- ["F5FE",0x8625],
- ["F5F3",0x8626],
- ["F5F8",0x8627],
- ["F5FC",0x8629],
- ["F5F2",0x862A],
- ["F74A",0x862C],
- ["C4F5",0x862D],
- ["F5F9",0x862E],
- ["F7F4",0x8631],
- ["F74B",0x8632],
- ["F749",0x8633],
- ["F747",0x8634],
- ["F748",0x8635],
- ["F74C",0x8636],
- ["C5D9",0x8638],
- ["F7F2",0x8639],
- ["F7F0",0x863A],
- ["F7F5",0x863B],
- ["F7F3",0x863C],
- ["F7F6",0x863E],
- ["C5DA",0x863F],
- ["F7F1",0x8640],
- ["F8BC",0x8643],
- ["F945",0x8646],
- ["F946",0x8647],
- ["F947",0x8648],
- ["F9C7",0x864B],
- ["F9BD",0x864C],
- ["CA4F",0x864D],
- ["AAEA",0x864E],
- ["AD68",0x8650],
- ["D3B8",0x8652],
- ["D3B7",0x8653],
- ["B040",0x8654],
- ["B342",0x8655],
- ["D77C",0x8656],
- ["D77B",0x8659],
- ["B5EA",0x865B],
- ["B8B8",0x865C],
- ["B8B7",0x865E],
- ["B8B9",0x865F],
- ["E3D4",0x8661],
- ["E77E",0x8662],
- ["EB58",0x8663],
- ["EB5A",0x8664],
- ["EB59",0x8665],
- ["C1AB",0x8667],
- ["EE57",0x8668],
- ["F0BA",0x8669],
- ["F9A5",0x866A],
- ["A6E4",0x866B],
- ["CDC9",0x866D],
- ["CDCA",0x866E],
- ["CDC8",0x866F],
- ["CDC7",0x8670],
- ["AAEB",0x8671],
- ["D0A9",0x8673],
- ["D0A7",0x8674],
- ["D0A6",0x8677],
- ["AD69",0x8679],
- ["AD6B",0x867A],
- ["AD6A",0x867B],
- ["D0A8",0x867C],
- ["D3C4",0x8685],
- ["D3C1",0x8686],
- ["D3BF",0x8687],
- ["B041",0x868A],
- ["D3C2",0x868B],
- ["B046",0x868C],
- ["D3BC",0x868D],
- ["D3CB",0x868E],
- ["D3CD",0x8690],
- ["D3BD",0x8691],
- ["B043",0x8693],
- ["D3CE",0x8694],
- ["D3C9",0x8695],
- ["D3BB",0x8696],
- ["D3C0",0x8697],
- ["D3CA",0x8698],
- ["D3C6",0x8699],
- ["D3C3",0x869A],
- ["B048",0x869C],
- ["D3CC",0x869D],
- ["D3BE",0x869E],
- ["D3C7",0x86A1],
- ["D3B9",0x86A2],
- ["B047",0x86A3],
- ["B044",0x86A4],
- ["D3C5",0x86A5],
- ["D3C8",0x86A7],
- ["D3BA",0x86A8],
- ["B045",0x86A9],
- ["B042",0x86AA],
- ["B34C",0x86AF],
- ["D7A5",0x86B0],
- ["B34B",0x86B1],
- ["D7A8",0x86B3],
- ["D7AB",0x86B4],
- ["B348",0x86B5],
- ["B346",0x86B6],
- ["D77E",0x86B7],
- ["D7A9",0x86B8],
- ["D7A7",0x86B9],
- ["D7A4",0x86BA],
- ["D7AC",0x86BB],
- ["D7AD",0x86BC],
- ["D7AF",0x86BD],
- ["D7B0",0x86BE],
- ["D77D",0x86BF],
- ["B345",0x86C0],
- ["D7A2",0x86C1],
- ["D7A1",0x86C2],
- ["D7AE",0x86C3],
- ["B347",0x86C4],
- ["D7A3",0x86C5],
- ["B349",0x86C6],
- ["B344",0x86C7],
- ["D7A6",0x86C8],
- ["B34D",0x86C9],
- ["B34A",0x86CB],
- ["D7AA",0x86CC],
- ["B5F1",0x86D0],
- ["DBBF",0x86D1],
- ["DBB4",0x86D3],
- ["B5EE",0x86D4],
- ["DFE7",0x86D6],
- ["DBBD",0x86D7],
- ["DBB1",0x86D8],
- ["B5EC",0x86D9],
- ["DBB6",0x86DA],
- ["B5EF",0x86DB],
- ["DBBA",0x86DC],
- ["DBB8",0x86DD],
- ["B5F2",0x86DE],
- ["B5EB",0x86DF],
- ["DBB2",0x86E2],
- ["DBB5",0x86E3],
- ["B5F0",0x86E4],
- ["DBB3",0x86E6],
- ["DBBE",0x86E8],
- ["DBBC",0x86E9],
- ["DBB7",0x86EA],
- ["DBB9",0x86EB],
- ["DBBB",0x86EC],
- ["B5ED",0x86ED],
- ["DFE8",0x86F5],
- ["DFEE",0x86F6],
- ["DFE4",0x86F7],
- ["DFEA",0x86F8],
- ["B8BA",0x86F9],
- ["DFE6",0x86FA],
- ["B8C0",0x86FB],
- ["B8BF",0x86FE],
- ["B8BE",0x8700],
- ["DFED",0x8701],
- ["B8C1",0x8702],
- ["B8C2",0x8703],
- ["DFE3",0x8704],
- ["DFF0",0x8705],
- ["B8C3",0x8706],
- ["B8BD",0x8707],
- ["B8BC",0x8708],
- ["DFEC",0x8709],
- ["B8C4",0x870A],
- ["DFE2",0x870B],
- ["DFE5",0x870C],
- ["DFEF",0x870D],
- ["DFEB",0x870E],
- ["E3F4",0x8711],
- ["E3E9",0x8712],
- ["B8BB",0x8713],
- ["BB6A",0x8718],
- ["E3DD",0x8719],
- ["E3F2",0x871A],
- ["E3DE",0x871B],
- ["BB65",0x871C],
- ["E3DB",0x871E],
- ["E3E4",0x8720],
- ["E3DC",0x8721],
- ["BB67",0x8722],
- ["E3D6",0x8723],
- ["E3F1",0x8724],
- ["BB68",0x8725],
- ["E3EE",0x8726],
- ["E3EF",0x8727],
- ["E3D7",0x8728],
- ["BB6D",0x8729],
- ["E3E6",0x872A],
- ["E3E0",0x872C],
- ["E3E7",0x872D],
- ["E3DA",0x872E],
- ["E3F3",0x8730],
- ["E3EB",0x8731],
- ["E3E5",0x8732],
- ["E3D5",0x8733],
- ["BB69",0x8734],
- ["E3EC",0x8735],
- ["BB6C",0x8737],
- ["E3F0",0x8738],
- ["E3EA",0x873A],
- ["BB66",0x873B],
- ["E3E8",0x873C],
- ["E3E2",0x873E],
- ["BB64",0x873F],
- ["E3D9",0x8740],
- ["E3E1",0x8741],
- ["E3ED",0x8742],
- ["E3DF",0x8743],
- ["E3E3",0x8746],
- ["BDC1",0x874C],
- ["DFE9",0x874D],
- ["E7B2",0x874E],
- ["E7BB",0x874F],
- ["E7B1",0x8750],
- ["E7AD",0x8751],
- ["E7AA",0x8752],
- ["BDC2",0x8753],
- ["E7A8",0x8754],
- ["BB6B",0x8755],
- ["E7A1",0x8756],
- ["BDC0",0x8757],
- ["E7A7",0x8758],
- ["BDBF",0x8759],
- ["E7AC",0x875A],
- ["E7A9",0x875B],
- ["E7B9",0x875C],
- ["E7B4",0x875D],
- ["E7AE",0x875E],
- ["E7B3",0x875F],
- ["BDBB",0x8760],
- ["E7AB",0x8761],
- ["E7BE",0x8762],
- ["E7A2",0x8763],
- ["E7A3",0x8764],
- ["E7BA",0x8765],
- ["BDBC",0x8766],
- ["E7BF",0x8767],
- ["BDBE",0x8768],
- ["E7C0",0x8769],
- ["E7B0",0x876A],
- ["E3D8",0x876B],
- ["E7B6",0x876C],
- ["E7AF",0x876D],
- ["E7B8",0x876E],
- ["E7B5",0x876F],
- ["E7A6",0x8773],
- ["BDB9",0x8774],
- ["E7BD",0x8775],
- ["BDBA",0x8776],
- ["E7A4",0x8777],
- ["BDBD",0x8778],
- ["EB64",0x8779],
- ["E7B7",0x877A],
- ["E7BC",0x877B],
- ["EB61",0x8781],
- ["BDB8",0x8782],
- ["BFC0",0x8783],
- ["EB6B",0x8784],
- ["EB67",0x8785],
- ["EB65",0x8787],
- ["EB60",0x8788],
- ["EB6F",0x8789],
- ["BFC4",0x878D],
- ["EB5C",0x878F],
- ["EB68",0x8790],
- ["EB69",0x8791],
- ["EB5F",0x8792],
- ["EB5E",0x8793],
- ["EB6C",0x8794],
- ["EB62",0x8796],
- ["EB5D",0x8797],
- ["EB63",0x8798],
- ["EB6E",0x879A],
- ["EB5B",0x879B],
- ["EB6D",0x879C],
- ["EB6A",0x879D],
- ["BFC2",0x879E],
- ["BFC1",0x879F],
- ["BFC3",0x87A2],
- ["EB66",0x87A3],
- ["F0CB",0x87A4],
- ["EE59",0x87AA],
- ["C1B1",0x87AB],
- ["EE5D",0x87AC],
- ["EE5A",0x87AD],
- ["EE61",0x87AE],
- ["EE67",0x87AF],
- ["EE5C",0x87B0],
- ["EE70",0x87B2],
- ["C1AE",0x87B3],
- ["EE6A",0x87B4],
- ["EE5F",0x87B5],
- ["EE6B",0x87B6],
- ["EE66",0x87B7],
- ["EE6D",0x87B8],
- ["EE5E",0x87B9],
- ["C1B3",0x87BA],
- ["C1B2",0x87BB],
- ["EE60",0x87BC],
- ["EE6E",0x87BD],
- ["EE58",0x87BE],
- ["EE6C",0x87BF],
- ["C1AC",0x87C0],
- ["EE64",0x87C2],
- ["EE63",0x87C3],
- ["EE68",0x87C4],
- ["EE5B",0x87C5],
- ["C1B0",0x87C6],
- ["C1B4",0x87C8],
- ["EE62",0x87C9],
- ["EE69",0x87CA],
- ["C1B5",0x87CB],
- ["EE65",0x87CC],
- ["C1AD",0x87D1],
- ["C1AF",0x87D2],
- ["F0C7",0x87D3],
- ["F0C5",0x87D4],
- ["F0CC",0x87D7],
- ["F0C9",0x87D8],
- ["F0CD",0x87D9],
- ["F0BE",0x87DB],
- ["F0C6",0x87DC],
- ["F0D1",0x87DD],
- ["EE6F",0x87DE],
- ["F0C2",0x87DF],
- ["C2CF",0x87E0],
- ["E7A5",0x87E1],
- ["F0BD",0x87E2],
- ["F0CA",0x87E3],
- ["F0C4",0x87E4],
- ["F0C1",0x87E5],
- ["F0BC",0x87E6],
- ["F0BB",0x87E7],
- ["F0D0",0x87E8],
- ["F0C0",0x87EA],
- ["F0BF",0x87EB],
- ["C2CD",0x87EC],
- ["F0C8",0x87ED],
- ["C2CC",0x87EF],
- ["C2CE",0x87F2],
- ["F0C3",0x87F3],
- ["F0CF",0x87F4],
- ["F2DE",0x87F6],
- ["F2DF",0x87F7],
- ["C3C9",0x87F9],
- ["F2DC",0x87FA],
- ["C3C6",0x87FB],
- ["F2E4",0x87FC],
- ["C3CA",0x87FE],
- ["F2E6",0x87FF],
- ["F2DB",0x8800],
- ["F0CE",0x8801],
- ["F2E8",0x8802],
- ["F2DD",0x8803],
- ["C3C7",0x8805],
- ["F2E3",0x8806],
- ["F2E5",0x8808],
- ["F2E0",0x8809],
- ["F2E7",0x880A],
- ["F2E2",0x880B],
- ["F2E1",0x880C],
- ["C3C8",0x880D],
- ["F4C5",0x8810],
- ["F4C6",0x8811],
- ["F4C8",0x8813],
- ["C4AE",0x8814],
- ["C4AF",0x8815],
- ["F4C9",0x8816],
- ["F4C7",0x8817],
- ["F4C4",0x8819],
- ["F642",0x881B],
- ["F645",0x881C],
- ["F641",0x881D],
- ["C4FA",0x881F],
- ["F643",0x8820],
- ["C4F9",0x8821],
- ["C4F8",0x8822],
- ["C4F7",0x8823],
- ["F644",0x8824],
- ["F751",0x8825],
- ["F74F",0x8826],
- ["F74E",0x8828],
- ["F640",0x8829],
- ["F750",0x882A],
- ["F646",0x882B],
- ["F74D",0x882C],
- ["F7F9",0x882E],
- ["F7D7",0x882F],
- ["F7F7",0x8830],
- ["C5DB",0x8831],
- ["F7F8",0x8832],
- ["F7FA",0x8833],
- ["F8BF",0x8835],
- ["C5FA",0x8836],
- ["F8BE",0x8837],
- ["F8BD",0x8838],
- ["C5FB",0x8839],
- ["C65A",0x883B],
- ["F96E",0x883C],
- ["F9A7",0x883D],
- ["F9A6",0x883E],
- ["F9A8",0x883F],
- ["A6E5",0x8840],
- ["D0AA",0x8841],
- ["D3CF",0x8843],
- ["D3D0",0x8844],
- ["DBC0",0x8848],
- ["F647",0x884A],
- ["F8C0",0x884B],
- ["A6E6",0x884C],
- ["AD6C",0x884D],
- ["D0AB",0x884E],
- ["D7B1",0x8852],
- ["B34E",0x8853],
- ["DBC2",0x8855],
- ["DBC1",0x8856],
- ["B5F3",0x8857],
- ["B8C5",0x8859],
- ["E7C1",0x885A],
- ["BDC3",0x885B],
- ["BDC4",0x885D],
- ["BFC5",0x8861],
- ["C5FC",0x8862],
- ["A6E7",0x8863],
- ["D0AC",0x8867],
- ["AAED",0x8868],
- ["D0AE",0x8869],
- ["D0AD",0x886A],
- ["AD6D",0x886B],
- ["D3D1",0x886D],
- ["D3D8",0x886F],
- ["B049",0x8870],
- ["D3D6",0x8871],
- ["D3D4",0x8872],
- ["D3DB",0x8874],
- ["D3D2",0x8875],
- ["D3D3",0x8876],
- ["B04A",0x8877],
- ["B04E",0x8879],
- ["D3DC",0x887C],
- ["B04D",0x887D],
- ["D3DA",0x887E],
- ["D3D7",0x887F],
- ["D3D5",0x8880],
- ["B04B",0x8881],
- ["B04C",0x8882],
- ["D3D9",0x8883],
- ["B350",0x8888],
- ["D7B2",0x8889],
- ["B355",0x888B],
- ["D7C2",0x888C],
- ["B354",0x888D],
- ["D7C4",0x888E],
- ["D7B8",0x8891],
- ["B352",0x8892],
- ["D7C3",0x8893],
- ["D7B3",0x8895],
- ["B353",0x8896],
- ["D7BF",0x8897],
- ["D7BB",0x8898],
- ["D7BD",0x8899],
- ["D7B7",0x889A],
- ["D7BE",0x889B],
- ["B34F",0x889E],
- ["D7BA",0x889F],
- ["D7B9",0x88A1],
- ["D7B5",0x88A2],
- ["D7C0",0x88A4],
- ["D7BC",0x88A7],
- ["D7B4",0x88A8],
- ["D7B6",0x88AA],
- ["B351",0x88AB],
- ["D7C1",0x88AC],
- ["B5F6",0x88B1],
- ["DBCD",0x88B2],
- ["DBC9",0x88B6],
- ["DBCB",0x88B7],
- ["DBC6",0x88B8],
- ["DBC5",0x88B9],
- ["DBC3",0x88BA],
- ["DBCA",0x88BC],
- ["DBCC",0x88BD],
- ["DBC8",0x88BE],
- ["DBC7",0x88C0],
- ["B5F4",0x88C1],
- ["B5F5",0x88C2],
- ["DBCF",0x88C9],
- ["B8CD",0x88CA],
- ["DFF2",0x88CB],
- ["DFF8",0x88CC],
- ["DFF3",0x88CD],
- ["DFF4",0x88CE],
- ["DFF9",0x88D0],
- ["B8CF",0x88D2],
- ["B8C7",0x88D4],
- ["B8CE",0x88D5],
- ["DFF1",0x88D6],
- ["DBC4",0x88D7],
- ["B8CA",0x88D8],
- ["B8C8",0x88D9],
- ["DFF7",0x88DA],
- ["DFF6",0x88DB],
- ["B8C9",0x88DC],
- ["B8CB",0x88DD],
- ["DFF5",0x88DE],
- ["B8C6",0x88DF],
- ["B8CC",0x88E1],
- ["E3F6",0x88E7],
- ["BB74",0x88E8],
- ["E442",0x88EB],
- ["E441",0x88EC],
- ["E3FB",0x88EE],
- ["BB76",0x88EF],
- ["E440",0x88F0],
- ["E3F7",0x88F1],
- ["E3F8",0x88F2],
- ["BB6E",0x88F3],
- ["BB70",0x88F4],
- ["E3FD",0x88F6],
- ["E3F5",0x88F7],
- ["BB72",0x88F8],
- ["BB71",0x88F9],
- ["E3F9",0x88FA],
- ["E3FE",0x88FB],
- ["E3FC",0x88FC],
- ["BB73",0x88FD],
- ["E3FA",0x88FE],
- ["DBCE",0x8901],
- ["BB6F",0x8902],
- ["E7C2",0x8905],
- ["E7C9",0x8906],
- ["BDC6",0x8907],
- ["E7CD",0x8909],
- ["BDCA",0x890A],
- ["E7C5",0x890B],
- ["E7C3",0x890C],
- ["E7CC",0x890E],
- ["BDC5",0x8910],
- ["E7CB",0x8911],
- ["BDC7",0x8912],
- ["BDC8",0x8913],
- ["E7C4",0x8914],
- ["BDC9",0x8915],
- ["E7CA",0x8916],
- ["E7C6",0x8917],
- ["E7C7",0x8918],
- ["E7C8",0x8919],
- ["BB75",0x891A],
- ["EB70",0x891E],
- ["EB7C",0x891F],
- ["BFCA",0x8921],
- ["EB77",0x8922],
- ["EB79",0x8923],
- ["BFC8",0x8925],
- ["EB71",0x8926],
- ["EB75",0x8927],
- ["EB78",0x8929],
- ["BFC6",0x892A],
- ["BFC9",0x892B],
- ["EB7B",0x892C],
- ["EB73",0x892D],
- ["EB74",0x892E],
- ["EB7A",0x892F],
- ["EB72",0x8930],
- ["EB76",0x8931],
- ["BFC7",0x8932],
- ["EE72",0x8933],
- ["EE71",0x8935],
- ["C1B7",0x8936],
- ["EE77",0x8937],
- ["C1B9",0x8938],
- ["C1B6",0x893B],
- ["EE73",0x893C],
- ["C1BA",0x893D],
- ["EE74",0x893E],
- ["EE75",0x8941],
- ["EE78",0x8942],
- ["C1B8",0x8944],
- ["F0D6",0x8946],
- ["F0D9",0x8949],
- ["F0D3",0x894B],
- ["F0D5",0x894C],
- ["F0D4",0x894F],
- ["F0D7",0x8950],
- ["F0D8",0x8951],
- ["EE76",0x8952],
- ["F0D2",0x8953],
- ["C3CD",0x8956],
- ["F2EC",0x8957],
- ["F2EF",0x8958],
- ["F2F1",0x8959],
- ["F2EA",0x895A],
- ["F2EB",0x895B],
- ["F2EE",0x895C],
- ["F2F0",0x895D],
- ["C3CE",0x895E],
- ["C3CC",0x895F],
- ["C3CB",0x8960],
- ["F2ED",0x8961],
- ["F2E9",0x8962],
- ["F4CA",0x8963],
- ["C4B0",0x8964],
- ["F4CB",0x8966],
- ["F649",0x8969],
- ["C4FB",0x896A],
- ["F64B",0x896B],
- ["C4FC",0x896C],
- ["F648",0x896D],
- ["F64A",0x896E],
- ["C5A8",0x896F],
- ["F752",0x8971],
- ["C5A7",0x8972],
- ["F7FD",0x8973],
- ["F7FC",0x8974],
- ["F7FB",0x8976],
- ["F948",0x8979],
- ["F949",0x897A],
- ["F94B",0x897B],
- ["F94A",0x897C],
- ["CA50",0x897E],
- ["A6E8",0x897F],
- ["AD6E",0x8981],
- ["D7C5",0x8982],
- ["B5F7",0x8983],
- ["DFFA",0x8985],
- ["C2D0",0x8986],
- ["F2F2",0x8988],
- ["A8A3",0x898B],
- ["B357",0x898F],
- ["B356",0x8993],
- ["DBD0",0x8995],
- ["B5F8",0x8996],
- ["DBD2",0x8997],
- ["DBD1",0x8998],
- ["DFFB",0x899B],
- ["B8D0",0x899C],
- ["E443",0x899D],
- ["E446",0x899E],
- ["E445",0x899F],
- ["E444",0x89A1],
- ["E7CE",0x89A2],
- ["E7D0",0x89A3],
- ["E7CF",0x89A4],
- ["BFCC",0x89A6],
- ["BFCB",0x89AA],
- ["C1BB",0x89AC],
- ["EE79",0x89AD],
- ["EE7B",0x89AE],
- ["EE7A",0x89AF],
- ["C2D1",0x89B2],
- ["F2F4",0x89B6],
- ["F2F3",0x89B7],
- ["F4CC",0x89B9],
- ["C4B1",0x89BA],
- ["C4FD",0x89BD],
- ["F754",0x89BE],
- ["F753",0x89BF],
- ["C65B",0x89C0],
- ["A8A4",0x89D2],
- ["D0AF",0x89D3],
- ["AD6F",0x89D4],
- ["D7C8",0x89D5],
- ["D7C6",0x89D6],
- ["D7C7",0x89D9],
- ["DBD4",0x89DA],
- ["DBD5",0x89DB],
- ["E043",0x89DC],
- ["DBD3",0x89DD],
- ["DFFC",0x89DF],
- ["E041",0x89E0],
- ["E040",0x89E1],
- ["E042",0x89E2],
- ["B8D1",0x89E3],
- ["DFFE",0x89E4],
- ["DFFD",0x89E5],
- ["E044",0x89E6],
- ["E449",0x89E8],
- ["E447",0x89E9],
- ["E448",0x89EB],
- ["E7D3",0x89EC],
- ["E7D1",0x89ED],
- ["E7D2",0x89F0],
- ["EB7D",0x89F1],
- ["EE7C",0x89F2],
- ["EE7D",0x89F3],
- ["C2D2",0x89F4],
- ["F2F5",0x89F6],
- ["F4CD",0x89F7],
- ["C4B2",0x89F8],
- ["F64C",0x89FA],
- ["F755",0x89FB],
- ["C5A9",0x89FC],
- ["F7FE",0x89FE],
- ["F94C",0x89FF],
- ["A8A5",0x8A00],
- ["AD71",0x8A02],
- ["AD72",0x8A03],
- ["D0B0",0x8A04],
- ["D0B1",0x8A07],
- ["AD70",0x8A08],
- ["B054",0x8A0A],
- ["B052",0x8A0C],
- ["B051",0x8A0E],
- ["B058",0x8A0F],
- ["B050",0x8A10],
- ["B059",0x8A11],
- ["D3DD",0x8A12],
- ["B056",0x8A13],
- ["B053",0x8A15],
- ["B057",0x8A16],
- ["B055",0x8A17],
- ["B04F",0x8A18],
- ["B35F",0x8A1B],
- ["B359",0x8A1D],
- ["D7CC",0x8A1E],
- ["B35E",0x8A1F],
- ["B360",0x8A22],
- ["B35A",0x8A23],
- ["B35B",0x8A25],
- ["D7CA",0x8A27],
- ["B358",0x8A2A],
- ["D7CB",0x8A2C],
- ["B35D",0x8A2D],
- ["D7C9",0x8A30],
- ["B35C",0x8A31],
- ["B644",0x8A34],
- ["B646",0x8A36],
- ["DBD8",0x8A39],
- ["B645",0x8A3A],
- ["B5F9",0x8A3B],
- ["B5FD",0x8A3C],
- ["B8E4",0x8A3E],
- ["E049",0x8A3F],
- ["DBDA",0x8A40],
- ["B5FE",0x8A41],
- ["DBDD",0x8A44],
- ["DBDE",0x8A45],
- ["B643",0x8A46],
- ["DBE0",0x8A48],
- ["DBE2",0x8A4A],
- ["DBE3",0x8A4C],
- ["DBD7",0x8A4D],
- ["DBD6",0x8A4E],
- ["DBE4",0x8A4F],
- ["B642",0x8A50],
- ["DBE1",0x8A51],
- ["DBDF",0x8A52],
- ["B640",0x8A54],
- ["B5FB",0x8A55],
- ["B647",0x8A56],
- ["DBDB",0x8A57],
- ["DBDC",0x8A58],
- ["DBD9",0x8A59],
- ["B641",0x8A5B],
- ["B5FC",0x8A5E],
- ["B5FA",0x8A60],
- ["E048",0x8A61],
- ["B8DF",0x8A62],
- ["B8DA",0x8A63],
- ["B8D5",0x8A66],
- ["B8E5",0x8A68],
- ["B8D6",0x8A69],
- ["B8D2",0x8A6B],
- ["B8E1",0x8A6C],
- ["B8DE",0x8A6D],
- ["B8E0",0x8A6E],
- ["B8D7",0x8A70],
- ["B8DC",0x8A71],
- ["B8D3",0x8A72],
- ["B8D4",0x8A73],
- ["E050",0x8A74],
- ["E04D",0x8A75],
- ["E045",0x8A76],
- ["E04A",0x8A77],
- ["B8E2",0x8A79],
- ["E051",0x8A7A],
- ["B8E3",0x8A7B],
- ["B8D9",0x8A7C],
- ["E047",0x8A7F],
- ["E04F",0x8A81],
- ["E04B",0x8A82],
- ["E04E",0x8A83],
- ["E04C",0x8A84],
- ["B8DD",0x8A85],
- ["E046",0x8A86],
- ["B8D8",0x8A87],
- ["E44C",0x8A8B],
- ["BB78",0x8A8C],
- ["BB7B",0x8A8D],
- ["E44E",0x8A8F],
- ["BBA5",0x8A91],
- ["E44D",0x8A92],
- ["BB7D",0x8A93],
- ["BDCF",0x8A95],
- ["E44F",0x8A96],
- ["BBA4",0x8A98],
- ["E44B",0x8A99],
- ["BBA6",0x8A9A],
- ["BB79",0x8A9E],
- ["B8DB",0x8AA0],
- ["BB7C",0x8AA1],
- ["BB7A",0x8AA3],
- ["BB7E",0x8AA4],
- ["BBA2",0x8AA5],
- ["BB77",0x8AA6],
- ["BBA7",0x8AA7],
- ["BBA3",0x8AA8],
- ["BBA1",0x8AAA],
- ["E44A",0x8AAB],
- ["BDD6",0x8AB0],
- ["BDD2",0x8AB2],
- ["BDD9",0x8AB6],
- ["E7D6",0x8AB8],
- ["BDDA",0x8AB9],
- ["E7E2",0x8ABA],
- ["E7DB",0x8ABB],
- ["BDCB",0x8ABC],
- ["E7E3",0x8ABD],
- ["E7DD",0x8ABE],
- ["BDD5",0x8ABF],
- ["E7DE",0x8AC0],
- ["BDD4",0x8AC2],
- ["E7E1",0x8AC3],
- ["BDCE",0x8AC4],
- ["E7DF",0x8AC5],
- ["E7D5",0x8AC6],
- ["BDCD",0x8AC7],
- ["EBAA",0x8AC8],
- ["BDD3",0x8AC9],
- ["BDD0",0x8ACB],
- ["BDD8",0x8ACD],
- ["E7D4",0x8ACF],
- ["E7D8",0x8AD1],
- ["BDCC",0x8AD2],
- ["E7D7",0x8AD3],
- ["E7D9",0x8AD4],
- ["E7DA",0x8AD5],
- ["BDD7",0x8AD6],
- ["E7DC",0x8AD7],
- ["E7E0",0x8AD8],
- ["E7E4",0x8AD9],
- ["BDDB",0x8ADB],
- ["BFD2",0x8ADC],
- ["EBA5",0x8ADD],
- ["EBAB",0x8ADE],
- ["EBA8",0x8ADF],
- ["EB7E",0x8AE0],
- ["EBAC",0x8AE1],
- ["EBA1",0x8AE2],
- ["EBA7",0x8AE4],
- ["BFCD",0x8AE6],
- ["BFD3",0x8AE7],
- ["EBAD",0x8AE8],
- ["BFCF",0x8AEB],
- ["BFD9",0x8AED],
- ["BFD4",0x8AEE],
- ["EBAF",0x8AEF],
- ["EBA9",0x8AF0],
- ["BFD0",0x8AF1],
- ["EBA2",0x8AF2],
- ["BFDA",0x8AF3],
- ["EBA3",0x8AF4],
- ["EBA4",0x8AF5],
- ["BFDB",0x8AF6],
- ["BFD8",0x8AF7],
- ["BDD1",0x8AF8],
- ["BFCE",0x8AFA],
- ["EBB0",0x8AFB],
- ["BFDC",0x8AFC],
- ["BFD5",0x8AFE],
- ["EBAE",0x8AFF],
- ["BFD1",0x8B00],
- ["BFD6",0x8B01],
- ["BFD7",0x8B02],
- ["C1C3",0x8B04],
- ["EEA4",0x8B05],
- ["EEAD",0x8B06],
- ["EEAA",0x8B07],
- ["EEAC",0x8B08],
- ["C1C0",0x8B0A],
- ["EEA5",0x8B0B],
- ["EEAB",0x8B0D],
- ["C1BC",0x8B0E],
- ["EEA7",0x8B0F],
- ["C1C4",0x8B10],
- ["EEA3",0x8B11],
- ["EEA8",0x8B12],
- ["EEAF",0x8B13],
- ["EBA6",0x8B14],
- ["EEA9",0x8B15],
- ["EEA2",0x8B16],
- ["C1BD",0x8B17],
- ["EEA1",0x8B18],
- ["C1BE",0x8B19],
- ["EEB0",0x8B1A],
- ["C1BF",0x8B1B],
- ["EEAE",0x8B1C],
- ["C1C2",0x8B1D],
- ["EE7E",0x8B1E],
- ["C1C1",0x8B20],
- ["EEA6",0x8B22],
- ["F0DC",0x8B23],
- ["F0EA",0x8B24],
- ["F0E5",0x8B25],
- ["F0E7",0x8B26],
- ["F0DB",0x8B27],
- ["C2D3",0x8B28],
- ["F0DA",0x8B2A],
- ["C2D6",0x8B2B],
- ["C2D5",0x8B2C],
- ["F0E9",0x8B2E],
- ["F0E1",0x8B2F],
- ["F0DE",0x8B30],
- ["F0E4",0x8B31],
- ["F0DD",0x8B33],
- ["F0DF",0x8B35],
- ["F0E8",0x8B36],
- ["F0E6",0x8B37],
- ["C2D4",0x8B39],
- ["F0ED",0x8B3A],
- ["F0EB",0x8B3B],
- ["F0E2",0x8B3C],
- ["F0EC",0x8B3D],
- ["F0E3",0x8B3E],
- ["F2F9",0x8B40],
- ["C3CF",0x8B41],
- ["F341",0x8B42],
- ["F64F",0x8B45],
- ["C3D6",0x8B46],
- ["F0E0",0x8B47],
- ["F2F7",0x8B48],
- ["C3D2",0x8B49],
- ["F2F8",0x8B4A],
- ["F2FD",0x8B4B],
- ["C3D4",0x8B4E],
- ["C3D5",0x8B4F],
- ["F2F6",0x8B50],
- ["F340",0x8B51],
- ["F342",0x8B52],
- ["F2FA",0x8B53],
- ["F2FC",0x8B54],
- ["F2FE",0x8B55],
- ["F2FB",0x8B56],
- ["F343",0x8B57],
- ["C3D1",0x8B58],
- ["C3D7",0x8B59],
- ["C3D3",0x8B5A],
- ["C3D0",0x8B5C],
- ["F4D0",0x8B5D],
- ["C4B7",0x8B5F],
- ["F4CE",0x8B60],
- ["F4D2",0x8B63],
- ["F4D3",0x8B65],
- ["C4B5",0x8B66],
- ["F4D4",0x8B67],
- ["F4D1",0x8B68],
- ["F4CF",0x8B6A],
- ["C4B8",0x8B6B],
- ["C4B4",0x8B6C],
- ["F4D5",0x8B6D],
- ["C4B6",0x8B6F],
- ["C4B3",0x8B70],
- ["C4FE",0x8B74],
- ["C540",0x8B77],
- ["F64E",0x8B78],
- ["F64D",0x8B79],
- ["F650",0x8B7A],
- ["F651",0x8B7B],
- ["C541",0x8B7D],
- ["F756",0x8B7E],
- ["F75B",0x8B7F],
- ["C5AA",0x8B80],
- ["F758",0x8B82],
- ["F757",0x8B84],
- ["F75A",0x8B85],
- ["F759",0x8B86],
- ["F843",0x8B88],
- ["C5DC",0x8B8A],
- ["F842",0x8B8B],
- ["F840",0x8B8C],
- ["F841",0x8B8E],
- ["C5FE",0x8B92],
- ["C5FD",0x8B93],
- ["F8C1",0x8B94],
- ["F8C2",0x8B95],
- ["C640",0x8B96],
- ["F94D",0x8B98],
- ["F94E",0x8B99],
- ["C667",0x8B9A],
- ["C66D",0x8B9C],
- ["F9A9",0x8B9E],
- ["F9C8",0x8B9F],
- ["A8A6",0x8C37],
- ["D7CD",0x8C39],
- ["D7CE",0x8C3B],
- ["E052",0x8C3C],
- ["E450",0x8C3D],
- ["E7E5",0x8C3E],
- ["C1C6",0x8C3F],
- ["C1C5",0x8C41],
- ["F0EE",0x8C42],
- ["F344",0x8C43],
- ["F844",0x8C45],
- ["A8A7",0x8C46],
- ["D3DE",0x8C47],
- ["B05A",0x8C48],
- ["B361",0x8C49],
- ["E054",0x8C4A],
- ["E053",0x8C4B],
- ["BDDC",0x8C4C],
- ["E7E6",0x8C4D],
- ["BDDD",0x8C4E],
- ["EEB1",0x8C4F],
- ["C2D7",0x8C50],
- ["C676",0x8C54],
- ["A8A8",0x8C55],
- ["CDCB",0x8C56],
- ["D3DF",0x8C57],
- ["B362",0x8C5A],
- ["D7CF",0x8C5C],
- ["D7D0",0x8C5D],
- ["DBE5",0x8C5F],
- ["B648",0x8C61],
- ["B8E6",0x8C62],
- ["E056",0x8C64],
- ["E055",0x8C65],
- ["E057",0x8C66],
- ["E451",0x8C68],
- ["E452",0x8C69],
- ["BBA8",0x8C6A],
- ["BFDD",0x8C6B],
- ["BDDE",0x8C6C],
- ["BFDE",0x8C6D],
- ["EEB5",0x8C6F],
- ["EEB2",0x8C70],
- ["EEB4",0x8C71],
- ["EEB3",0x8C72],
- ["C1C7",0x8C73],
- ["F0EF",0x8C75],
- ["F346",0x8C76],
- ["F345",0x8C77],
- ["CBA4",0x8C78],
- ["B05C",0x8C79],
- ["B05B",0x8C7A],
- ["D3E0",0x8C7B],
- ["D7D1",0x8C7D],
- ["DBE7",0x8C80],
- ["DBE6",0x8C81],
- ["B649",0x8C82],
- ["E059",0x8C84],
- ["E05A",0x8C85],
- ["E058",0x8C86],
- ["B8E8",0x8C89],
- ["B8E7",0x8C8A],
- ["BBAA",0x8C8C],
- ["BBA9",0x8C8D],
- ["E7E7",0x8C8F],
- ["EBB3",0x8C90],
- ["EBB1",0x8C91],
- ["EBB2",0x8C92],
- ["BFDF",0x8C93],
- ["EEB7",0x8C94],
- ["EEB6",0x8C95],
- ["F0F2",0x8C97],
- ["F0F1",0x8C98],
- ["F0F0",0x8C99],
- ["F347",0x8C9A],
- ["F9AA",0x8C9C],
- ["A8A9",0x8C9D],
- ["AD73",0x8C9E],
- ["AD74",0x8CA0],
- ["B05D",0x8CA1],
- ["B05E",0x8CA2],
- ["D3E2",0x8CA3],
- ["D3E1",0x8CA4],
- ["D7D2",0x8CA5],
- ["B368",0x8CA7],
- ["B366",0x8CA8],
- ["B363",0x8CA9],
- ["B367",0x8CAA],
- ["B365",0x8CAB],
- ["B364",0x8CAC],
- ["B64A",0x8CAF],
- ["DBEA",0x8CB0],
- ["B8ED",0x8CB2],
- ["B64C",0x8CB3],
- ["B651",0x8CB4],
- ["DBEC",0x8CB5],
- ["B653",0x8CB6],
- ["B652",0x8CB7],
- ["B655",0x8CB8],
- ["DBEB",0x8CB9],
- ["DBE8",0x8CBA],
- ["B64F",0x8CBB],
- ["B64B",0x8CBC],
- ["B64D",0x8CBD],
- ["DBE9",0x8CBE],
- ["B654",0x8CBF],
- ["B650",0x8CC0],
- ["B64E",0x8CC1],
- ["B8EF",0x8CC2],
- ["B8EE",0x8CC3],
- ["B8EC",0x8CC4],
- ["B8F0",0x8CC5],
- ["B8EA",0x8CC7],
- ["B8EB",0x8CC8],
- ["B8E9",0x8CCA],
- ["E05B",0x8CCC],
- ["E454",0x8CCF],
- ["BBAC",0x8CD1],
- ["BBAD",0x8CD2],
- ["BBAB",0x8CD3],
- ["E453",0x8CD5],
- ["E455",0x8CD7],
- ["E7EA",0x8CD9],
- ["E7EC",0x8CDA],
- ["BDE7",0x8CDC],
- ["E7ED",0x8CDD],
- ["BDE0",0x8CDE],
- ["E7E9",0x8CDF],
- ["BDDF",0x8CE0],
- ["BDE9",0x8CE1],
- ["BDE5",0x8CE2],
- ["BDE6",0x8CE3],
- ["BDE2",0x8CE4],
- ["E7E8",0x8CE5],
- ["BDE1",0x8CE6],
- ["E7EE",0x8CE7],
- ["E7EB",0x8CE8],
- ["BDE8",0x8CEA],
- ["BDE3",0x8CEC],
- ["BDE4",0x8CED],
- ["EBB5",0x8CEE],
- ["EBB7",0x8CF0],
- ["EBB6",0x8CF1],
- ["EBB8",0x8CF3],
- ["BFE0",0x8CF4],
- ["EBB4",0x8CF5],
- ["C1CB",0x8CF8],
- ["EEB8",0x8CF9],
- ["C1C8",0x8CFA],
- ["C1CC",0x8CFB],
- ["C1CA",0x8CFC],
- ["C1C9",0x8CFD],
- ["F0F3",0x8CFE],
- ["F0F6",0x8D00],
- ["F0F5",0x8D02],
- ["F0F4",0x8D04],
- ["C2D8",0x8D05],
- ["F348",0x8D06],
- ["F349",0x8D07],
- ["C3D8",0x8D08],
- ["F34A",0x8D09],
- ["C3D9",0x8D0A],
- ["C4BA",0x8D0D],
- ["C4B9",0x8D0F],
- ["F652",0x8D10],
- ["C542",0x8D13],
- ["F653",0x8D14],
- ["F75C",0x8D15],
- ["C5AB",0x8D16],
- ["C5AC",0x8D17],
- ["F845",0x8D19],
- ["C642",0x8D1B],
- ["A8AA",0x8D64],
- ["B36A",0x8D66],
- ["B369",0x8D67],
- ["E05C",0x8D68],
- ["E05D",0x8D69],
- ["BBAE",0x8D6B],
- ["EBB9",0x8D6C],
- ["BDEA",0x8D6D],
- ["EBBA",0x8D6E],
- ["EEB9",0x8D6F],
- ["A8AB",0x8D70],
- ["D0B2",0x8D72],
- ["AD76",0x8D73],
- ["AD75",0x8D74],
- ["D3E3",0x8D76],
- ["B05F",0x8D77],
- ["D3E4",0x8D78],
- ["D7D5",0x8D79],
- ["D7D4",0x8D7B],
- ["D7D3",0x8D7D],
- ["DBEE",0x8D80],
- ["B658",0x8D81],
- ["DBED",0x8D84],
- ["B657",0x8D85],
- ["DBEF",0x8D89],
- ["B656",0x8D8A],
- ["E05F",0x8D8C],
- ["E062",0x8D8D],
- ["E060",0x8D8E],
- ["E061",0x8D8F],
- ["E065",0x8D90],
- ["E05E",0x8D91],
- ["E066",0x8D92],
- ["E063",0x8D93],
- ["E064",0x8D94],
- ["BBB0",0x8D95],
- ["E456",0x8D96],
- ["BBAF",0x8D99],
- ["E7F2",0x8D9B],
- ["E7F0",0x8D9C],
- ["BDEB",0x8D9F],
- ["E7EF",0x8DA0],
- ["E7F1",0x8DA1],
- ["BDEC",0x8DA3],
- ["EBBB",0x8DA5],
- ["EBBC",0x8DA7],
- ["C1CD",0x8DA8],
- ["F34C",0x8DAA],
- ["F34E",0x8DAB],
- ["F34B",0x8DAC],
- ["F34D",0x8DAD],
- ["F4D6",0x8DAE],
- ["F654",0x8DAF],
- ["F96F",0x8DB2],
- ["A8AC",0x8DB3],
- ["AD77",0x8DB4],
- ["D3E5",0x8DB5],
- ["D3E7",0x8DB6],
- ["D3E6",0x8DB7],
- ["D7D8",0x8DB9],
- ["B36C",0x8DBA],
- ["D7D6",0x8DBC],
- ["B36B",0x8DBE],
- ["D7D9",0x8DBF],
- ["D7DA",0x8DC1],
- ["D7D7",0x8DC2],
- ["DBFB",0x8DC5],
- ["B660",0x8DC6],
- ["DBF3",0x8DC7],
- ["DBF9",0x8DC8],
- ["B65B",0x8DCB],
- ["B65E",0x8DCC],
- ["DBF2",0x8DCD],
- ["B659",0x8DCE],
- ["DBF6",0x8DCF],
- ["E06C",0x8DD0],
- ["B65D",0x8DD1],
- ["DBF1",0x8DD3],
- ["DBF7",0x8DD5],
- ["DBF4",0x8DD6],
- ["DBFA",0x8DD7],
- ["DBF0",0x8DD8],
- ["DBF8",0x8DD9],
- ["B65C",0x8DDA],
- ["B65F",0x8DDB],
- ["DBF5",0x8DDC],
- ["B65A",0x8DDD],
- ["B8F2",0x8DDF],
- ["E068",0x8DE0],
- ["B8F1",0x8DE1],
- ["E06F",0x8DE2],
- ["E06E",0x8DE3],
- ["B8F8",0x8DE4],
- ["B8F9",0x8DE6],
- ["E070",0x8DE7],
- ["B8F3",0x8DE8],
- ["E06D",0x8DE9],
- ["B8F7",0x8DEA],
- ["E072",0x8DEB],
- ["E069",0x8DEC],
- ["E06B",0x8DEE],
- ["B8F4",0x8DEF],
- ["E067",0x8DF0],
- ["E06A",0x8DF1],
- ["E071",0x8DF2],
- ["B8F5",0x8DF3],
- ["E073",0x8DF4],
- ["B8F6",0x8DFA],
- ["BBB1",0x8DFC],
- ["E45B",0x8DFD],
- ["E461",0x8DFE],
- ["E459",0x8DFF],
- ["E462",0x8E00],
- ["E458",0x8E02],
- ["E45D",0x8E03],
- ["E463",0x8E04],
- ["E460",0x8E05],
- ["E45F",0x8E06],
- ["E45E",0x8E07],
- ["E457",0x8E09],
- ["E45C",0x8E0A],
- ["E45A",0x8E0D],
- ["BDF1",0x8E0F],
- ["BDEE",0x8E10],
- ["E7FB",0x8E11],
- ["E841",0x8E12],
- ["E843",0x8E13],
- ["E840",0x8E14],
- ["E7F8",0x8E15],
- ["E7FA",0x8E16],
- ["E845",0x8E17],
- ["E842",0x8E18],
- ["E7FC",0x8E19],
- ["E846",0x8E1A],
- ["E7F9",0x8E1B],
- ["E844",0x8E1C],
- ["BDEF",0x8E1D],
- ["BDF5",0x8E1E],
- ["BDF3",0x8E1F],
- ["E7F3",0x8E20],
- ["BDF4",0x8E21],
- ["BDF0",0x8E22],
- ["E7F4",0x8E23],
- ["E7F6",0x8E24],
- ["E7F5",0x8E25],
- ["E7FD",0x8E26],
- ["E7FE",0x8E27],
- ["BDF2",0x8E29],
- ["BDED",0x8E2B],
- ["E7F7",0x8E2E],
- ["EBC6",0x8E30],
- ["BFE2",0x8E31],
- ["EBBD",0x8E33],
- ["BFE3",0x8E34],
- ["BFE6",0x8E35],
- ["EBC2",0x8E36],
- ["EBBF",0x8E38],
- ["BFE5",0x8E39],
- ["EBC3",0x8E3C],
- ["EBC4",0x8E3D],
- ["EBBE",0x8E3E],
- ["EBC7",0x8E3F],
- ["EBC0",0x8E40],
- ["EBC5",0x8E41],
- ["BFE4",0x8E42],
- ["BFE1",0x8E44],
- ["EBC1",0x8E45],
- ["EEBF",0x8E47],
- ["C1D0",0x8E48],
- ["C1CE",0x8E49],
- ["C1D1",0x8E4A],
- ["C1CF",0x8E4B],
- ["EEBE",0x8E4C],
- ["EEBB",0x8E4D],
- ["EEBA",0x8E4E],
- ["EEBD",0x8E50],
- ["EEBC",0x8E53],
- ["F145",0x8E54],
- ["C2DE",0x8E55],
- ["F0FB",0x8E56],
- ["F0FA",0x8E57],
- ["C2D9",0x8E59],
- ["F141",0x8E5A],
- ["F140",0x8E5B],
- ["F0F7",0x8E5C],
- ["F143",0x8E5D],
- ["F0FC",0x8E5E],
- ["C2DD",0x8E5F],
- ["F0F9",0x8E60],
- ["F142",0x8E61],
- ["F0F8",0x8E62],
- ["C2DA",0x8E63],
- ["C2DC",0x8E64],
- ["F0FD",0x8E65],
- ["C2DB",0x8E66],
- ["F0FE",0x8E67],
- ["F144",0x8E69],
- ["F352",0x8E6A],
- ["C3DE",0x8E6C],
- ["F34F",0x8E6D],
- ["F353",0x8E6F],
- ["C3DB",0x8E72],
- ["F351",0x8E73],
- ["C3E0",0x8E74],
- ["C3DD",0x8E76],
- ["F350",0x8E78],
- ["C3DF",0x8E7A],
- ["F354",0x8E7B],
- ["C3DA",0x8E7C],
- ["C4BC",0x8E81],
- ["C4BE",0x8E82],
- ["F4D9",0x8E84],
- ["C4BD",0x8E85],
- ["F4D7",0x8E86],
- ["C3DC",0x8E87],
- ["F4D8",0x8E88],
- ["C4BB",0x8E89],
- ["C543",0x8E8A],
- ["C545",0x8E8B],
- ["F656",0x8E8C],
- ["C544",0x8E8D],
- ["F655",0x8E8E],
- ["F761",0x8E90],
- ["C5AD",0x8E91],
- ["F760",0x8E92],
- ["C5AE",0x8E93],
- ["F75E",0x8E94],
- ["F75D",0x8E95],
- ["F762",0x8E96],
- ["F763",0x8E97],
- ["F846",0x8E98],
- ["F75F",0x8E9A],
- ["F8C6",0x8E9D],
- ["F8C3",0x8E9E],
- ["F8C4",0x8E9F],
- ["F8C5",0x8EA0],
- ["C65C",0x8EA1],
- ["F951",0x8EA3],
- ["F950",0x8EA4],
- ["F94F",0x8EA5],
- ["F970",0x8EA6],
- ["F9BE",0x8EA8],
- ["F9AB",0x8EA9],
- ["C66E",0x8EAA],
- ["A8AD",0x8EAB],
- ["B060",0x8EAC],
- ["B8FA",0x8EB2],
- ["BDF6",0x8EBA],
- ["EBC8",0x8EBD],
- ["C2DF",0x8EC0],
- ["F355",0x8EC2],
- ["F9AC",0x8EC9],
- ["A8AE",0x8ECA],
- ["AAEE",0x8ECB],
- ["AD79",0x8ECC],
- ["AD78",0x8ECD],
- ["B063",0x8ECF],
- ["D3E8",0x8ED1],
- ["B061",0x8ED2],
- ["D3E9",0x8ED3],
- ["B062",0x8ED4],
- ["D7DF",0x8ED7],
- ["D7DB",0x8ED8],
- ["B36D",0x8EDB],
- ["D7DE",0x8EDC],
- ["D7DD",0x8EDD],
- ["D7DC",0x8EDE],
- ["B36E",0x8EDF],
- ["D7E0",0x8EE0],
- ["D7E1",0x8EE1],
- ["DC43",0x8EE5],
- ["DC41",0x8EE6],
- ["DC45",0x8EE7],
- ["DC46",0x8EE8],
- ["DC4C",0x8EE9],
- ["DC48",0x8EEB],
- ["DC4A",0x8EEC],
- ["DC42",0x8EEE],
- ["DBFC",0x8EEF],
- ["DC49",0x8EF1],
- ["DC4B",0x8EF4],
- ["DC44",0x8EF5],
- ["DC47",0x8EF6],
- ["DBFD",0x8EF7],
- ["B662",0x8EF8],
- ["DC40",0x8EF9],
- ["DBFE",0x8EFA],
- ["B661",0x8EFB],
- ["B663",0x8EFC],
- ["B8FD",0x8EFE],
- ["E075",0x8EFF],
- ["E077",0x8F00],
- ["E076",0x8F01],
- ["E07B",0x8F02],
- ["B8FB",0x8F03],
- ["E078",0x8F05],
- ["E074",0x8F06],
- ["E079",0x8F07],
- ["E07A",0x8F08],
- ["B8FC",0x8F09],
- ["B8FE",0x8F0A],
- ["E07C",0x8F0B],
- ["E467",0x8F0D],
- ["E466",0x8F0E],
- ["E464",0x8F10],
- ["E465",0x8F11],
- ["BBB3",0x8F12],
- ["BBB5",0x8F13],
- ["BBB2",0x8F14],
- ["BBB4",0x8F15],
- ["E84D",0x8F16],
- ["E84E",0x8F17],
- ["E849",0x8F18],
- ["E84A",0x8F1A],
- ["BDF8",0x8F1B],
- ["BDFD",0x8F1C],
- ["BDF7",0x8F1D],
- ["BDFE",0x8F1E],
- ["BDF9",0x8F1F],
- ["E84B",0x8F20],
- ["E84C",0x8F23],
- ["E848",0x8F24],
- ["BE40",0x8F25],
- ["BDFB",0x8F26],
- ["BDFA",0x8F29],
- ["BDFC",0x8F2A],
- ["E847",0x8F2C],
- ["EBCA",0x8F2E],
- ["BFE8",0x8F2F],
- ["EBCC",0x8F32],
- ["BFEA",0x8F33],
- ["EBCF",0x8F34],
- ["EBCB",0x8F35],
- ["EBC9",0x8F36],
- ["EBCE",0x8F37],
- ["BFE9",0x8F38],
- ["EBCD",0x8F39],
- ["BFE7",0x8F3B],
- ["C1D3",0x8F3E],
- ["C1D6",0x8F3F],
- ["EEC1",0x8F40],
- ["C1D4",0x8F42],
- ["EEC0",0x8F43],
- ["C1D2",0x8F44],
- ["C1D5",0x8F45],
- ["F146",0x8F46],
- ["F147",0x8F47],
- ["F148",0x8F48],
- ["C2E0",0x8F49],
- ["F149",0x8F4B],
- ["C2E1",0x8F4D],
- ["C3E2",0x8F4E],
- ["F358",0x8F4F],
- ["F359",0x8F50],
- ["F357",0x8F51],
- ["F356",0x8F52],
- ["F35A",0x8F53],
- ["C3E1",0x8F54],
- ["F4DD",0x8F55],
- ["F4DB",0x8F56],
- ["F4DC",0x8F57],
- ["F4DE",0x8F58],
- ["F4DA",0x8F59],
- ["F4DF",0x8F5A],
- ["F658",0x8F5B],
- ["F659",0x8F5D],
- ["F657",0x8F5E],
- ["C546",0x8F5F],
- ["F764",0x8F60],
- ["C5AF",0x8F61],
- ["F765",0x8F62],
- ["F848",0x8F63],
- ["F847",0x8F64],
- ["A8AF",0x8F9B],
- ["B664",0x8F9C],
- ["B940",0x8F9F],
- ["BBB6",0x8FA3],
- ["BFEC",0x8FA6],
- ["BFEB",0x8FA8],
- ["C3E3",0x8FAD],
- ["C47C",0x8FAE],
- ["C547",0x8FAF],
- ["A8B0",0x8FB0],
- ["B064",0x8FB1],
- ["B941",0x8FB2],
- ["F35B",0x8FB4],
- ["CBA6",0x8FBF],
- ["A8B1",0x8FC2],
- ["A8B4",0x8FC4],
- ["A8B3",0x8FC5],
- ["A8B2",0x8FC6],
- ["CBA5",0x8FC9],
- ["CDCD",0x8FCB],
- ["CDCF",0x8FCD],
- ["AAEF",0x8FCE],
- ["AAF1",0x8FD1],
- ["CDCC",0x8FD2],
- ["CDCE",0x8FD3],
- ["AAF0",0x8FD4],
- ["CDD1",0x8FD5],
- ["CDD0",0x8FD6],
- ["CDD2",0x8FD7],
- ["D0B6",0x8FE0],
- ["D0B4",0x8FE1],
- ["AD7C",0x8FE2],
- ["D0B3",0x8FE3],
- ["ADA3",0x8FE4],
- ["AD7E",0x8FE5],
- ["AD7B",0x8FE6],
- ["ADA4",0x8FE8],
- ["AD7D",0x8FEA],
- ["ADA2",0x8FEB],
- ["ADA1",0x8FED],
- ["D0B5",0x8FEE],
- ["AD7A",0x8FF0],
- ["B06A",0x8FF4],
- ["D3EB",0x8FF5],
- ["D3F1",0x8FF6],
- ["B067",0x8FF7],
- ["B06E",0x8FF8],
- ["B069",0x8FFA],
- ["D3EE",0x8FFB],
- ["D3F0",0x8FFC],
- ["B06C",0x8FFD],
- ["D3EA",0x8FFE],
- ["D3ED",0x8FFF],
- ["B068",0x9000],
- ["B065",0x9001],
- ["D3EC",0x9002],
- ["B06B",0x9003],
- ["D3EF",0x9004],
- ["B06D",0x9005],
- ["B066",0x9006],
- ["D7E3",0x900B],
- ["D7E6",0x900C],
- ["B370",0x900D],
- ["B37A",0x900F],
- ["B376",0x9010],
- ["D7E4",0x9011],
- ["B37E",0x9014],
- ["B377",0x9015],
- ["B37C",0x9016],
- ["B372",0x9017],
- ["B36F",0x9019],
- ["B371",0x901A],
- ["B37D",0x901B],
- ["D7E5",0x901C],
- ["B375",0x901D],
- ["B378",0x901E],
- ["B374",0x901F],
- ["B379",0x9020],
- ["D7E7",0x9021],
- ["B37B",0x9022],
- ["B373",0x9023],
- ["D7E2",0x9024],
- ["DC4D",0x902D],
- ["B665",0x902E],
- ["DC4F",0x902F],
- ["B667",0x9031],
- ["B669",0x9032],
- ["DC4E",0x9034],
- ["B666",0x9035],
- ["B66A",0x9036],
- ["B668",0x9038],
- ["B947",0x903C],
- ["E0A3",0x903D],
- ["B94F",0x903E],
- ["E07E",0x903F],
- ["B950",0x9041],
- ["B945",0x9042],
- ["E0A1",0x9044],
- ["B94A",0x9047],
- ["E0A2",0x9049],
- ["B943",0x904A],
- ["B942",0x904B],
- ["B94D",0x904D],
- ["B94C",0x904E],
- ["B94B",0x904F],
- ["B949",0x9050],
- ["B94E",0x9051],
- ["E07D",0x9052],
- ["B944",0x9053],
- ["B946",0x9054],
- ["B948",0x9055],
- ["BBB8",0x9058],
- ["BBBB",0x9059],
- ["BBBF",0x905B],
- ["BBB9",0x905C],
- ["BBBE",0x905D],
- ["BBBC",0x905E],
- ["BBB7",0x9060],
- ["BBBD",0x9062],
- ["BBBA",0x9063],
- ["E852",0x9067],
- ["BE43",0x9068],
- ["BE41",0x9069],
- ["E853",0x906B],
- ["BE44",0x906D],
- ["BE42",0x906E],
- ["E851",0x906F],
- ["E850",0x9070],
- ["BFF0",0x9072],
- ["E84F",0x9073],
- ["BFEE",0x9074],
- ["BFED",0x9075],
- ["EBD0",0x9076],
- ["BE45",0x9077],
- ["BFEF",0x9078],
- ["EBD1",0x9079],
- ["BFF2",0x907A],
- ["EBD2",0x907B],
- ["BFF1",0x907C],
- ["C1D8",0x907D],
- ["EEC3",0x907E],
- ["C1D7",0x907F],
- ["C1DC",0x9080],
- ["C1DA",0x9081],
- ["C1DB",0x9082],
- ["C2E3",0x9083],
- ["C1D9",0x9084],
- ["EEC2",0x9085],
- ["EBD3",0x9086],
- ["C2E2",0x9087],
- ["C2E4",0x9088],
- ["C3E4",0x908A],
- ["C3E5",0x908B],
- ["F4E0",0x908D],
- ["C5DE",0x908F],
- ["C5DD",0x9090],
- ["A8B6",0x9091],
- ["CA55",0x9094],
- ["B06F",0x9095],
- ["CA52",0x9097],
- ["CA53",0x9098],
- ["CA51",0x9099],
- ["CA54",0x909B],
- ["CBAA",0x909E],
- ["CBA7",0x909F],
- ["CBAC",0x90A0],
- ["CBA8",0x90A1],
- ["A8B7",0x90A2],
- ["A8BA",0x90A3],
- ["CBA9",0x90A5],
- ["A8B9",0x90A6],
- ["CBAB",0x90A7],
- ["A8B8",0x90AA],
- ["CDD5",0x90AF],
- ["CDD7",0x90B0],
- ["AAF4",0x90B1],
- ["CDD3",0x90B2],
- ["CDD6",0x90B3],
- ["CDD4",0x90B4],
- ["AAF2",0x90B5],
- ["AAF5",0x90B6],
- ["AAF3",0x90B8],
- ["D0B8",0x90BD],
- ["D0BC",0x90BE],
- ["D0B9",0x90BF],
- ["ADA7",0x90C1],
- ["ADA8",0x90C3],
- ["D0BB",0x90C5],
- ["D0BD",0x90C7],
- ["D0BF",0x90C8],
- ["ADA5",0x90CA],
- ["D0BE",0x90CB],
- ["ADA6",0x90CE],
- ["D7EE",0x90D4],
- ["D0BA",0x90D5],
- ["D3F2",0x90D6],
- ["D3FB",0x90D7],
- ["D3F9",0x90D8],
- ["D3F4",0x90D9],
- ["D3F5",0x90DA],
- ["D3FA",0x90DB],
- ["D3FC",0x90DC],
- ["B071",0x90DD],
- ["D3F7",0x90DF],
- ["D3F3",0x90E0],
- ["B070",0x90E1],
- ["B072",0x90E2],
- ["D3F6",0x90E3],
- ["D3FD",0x90E4],
- ["D3F8",0x90E5],
- ["B3A1",0x90E8],
- ["D7F1",0x90E9],
- ["D7E9",0x90EA],
- ["D7EF",0x90EB],
- ["D7F0",0x90EC],
- ["B3A2",0x90ED],
- ["D7E8",0x90EF],
- ["D7EA",0x90F0],
- ["D0B7",0x90F1],
- ["D7EC",0x90F2],
- ["D7ED",0x90F3],
- ["D7EB",0x90F4],
- ["B66C",0x90F5],
- ["DC56",0x90F9],
- ["EBD4",0x90FA],
- ["DC57",0x90FB],
- ["DC54",0x90FC],
- ["B3A3",0x90FD],
- ["B66E",0x90FE],
- ["DC53",0x90FF],
- ["DC59",0x9100],
- ["DC58",0x9101],
- ["B66B",0x9102],
- ["DC5C",0x9103],
- ["DC52",0x9104],
- ["DC5B",0x9105],
- ["DC50",0x9106],
- ["DC5A",0x9107],
- ["DC55",0x9108],
- ["B66D",0x9109],
- ["E0AA",0x910B],
- ["E0A5",0x910D],
- ["E0AB",0x910E],
- ["E0A6",0x910F],
- ["E0A4",0x9110],
- ["E0A7",0x9111],
- ["B951",0x9112],
- ["E0A9",0x9114],
- ["E0A8",0x9116],
- ["B952",0x9117],
- ["BBC1",0x9118],
- ["BBC0",0x9119],
- ["E46E",0x911A],
- ["E471",0x911B],
- ["E469",0x911C],
- ["E46D",0x911D],
- ["BBC2",0x911E],
- ["E46C",0x911F],
- ["E46A",0x9120],
- ["E470",0x9121],
- ["E46B",0x9122],
- ["E468",0x9123],
- ["E46F",0x9124],
- ["E859",0x9126],
- ["BE48",0x9127],
- ["F14A",0x9128],
- ["E856",0x9129],
- ["E857",0x912A],
- ["E855",0x912B],
- ["DC51",0x912C],
- ["BE47",0x912D],
- ["E85A",0x912E],
- ["E854",0x912F],
- ["BE46",0x9130],
- ["BE49",0x9131],
- ["E858",0x9132],
- ["EBD5",0x9133],
- ["BFF3",0x9134],
- ["EBD6",0x9135],
- ["EBD7",0x9136],
- ["EEC4",0x9138],
- ["C1DD",0x9139],
- ["F14B",0x913A],
- ["F14C",0x913B],
- ["F14D",0x913E],
- ["F35D",0x913F],
- ["F35C",0x9140],
- ["F4E2",0x9141],
- ["F4E1",0x9143],
- ["F65B",0x9144],
- ["F65C",0x9145],
- ["F65A",0x9146],
- ["F766",0x9147],
- ["C5B0",0x9148],
- ["A8BB",0x9149],
- ["ADAA",0x914A],
- ["ADA9",0x914B],
- ["B075",0x914C],
- ["B074",0x914D],
- ["D440",0x914E],
- ["D441",0x914F],
- ["D3FE",0x9150],
- ["B073",0x9152],
- ["D7F5",0x9153],
- ["D7F6",0x9155],
- ["D7F2",0x9156],
- ["B3A4",0x9157],
- ["D7F3",0x9158],
- ["D7F4",0x915A],
- ["DC5F",0x915F],
- ["DC61",0x9160],
- ["DC5D",0x9161],
- ["DC60",0x9162],
- ["B66F",0x9163],
- ["DC5E",0x9164],
- ["B670",0x9165],
- ["DD73",0x9168],
- ["B955",0x9169],
- ["B954",0x916A],
- ["B953",0x916C],
- ["E0AC",0x916E],
- ["E0AD",0x916F],
- ["E473",0x9172],
- ["E475",0x9173],
- ["BBC6",0x9174],
- ["BBC3",0x9175],
- ["BBC5",0x9177],
- ["BBC4",0x9178],
- ["E474",0x9179],
- ["E472",0x917A],
- ["E861",0x9180],
- ["E85E",0x9181],
- ["E85F",0x9182],
- ["BE4D",0x9183],
- ["E860",0x9184],
- ["E85B",0x9185],
- ["E85C",0x9186],
- ["BE4A",0x9187],
- ["BE4B",0x9189],
- ["E85D",0x918A],
- ["BE4C",0x918B],
- ["EBDB",0x918D],
- ["EBDC",0x918F],
- ["EBD9",0x9190],
- ["EBDA",0x9191],
- ["BFF4",0x9192],
- ["EBD8",0x9193],
- ["EEC8",0x9199],
- ["EEC5",0x919A],
- ["EEC7",0x919B],
- ["C1E0",0x919C],
- ["EECB",0x919D],
- ["C1DF",0x919E],
- ["EEC9",0x919F],
- ["EECC",0x91A0],
- ["EECA",0x91A1],
- ["EEC6",0x91A2],
- ["C1DE",0x91A3],
- ["F14F",0x91A5],
- ["F150",0x91A7],
- ["F14E",0x91A8],
- ["F152",0x91AA],
- ["C2E5",0x91AB],
- ["C2E6",0x91AC],
- ["F35F",0x91AD],
- ["C3E7",0x91AE],
- ["F151",0x91AF],
- ["F35E",0x91B0],
- ["C3E6",0x91B1],
- ["F4E5",0x91B2],
- ["F4E6",0x91B3],
- ["C4BF",0x91B4],
- ["F4E4",0x91B5],
- ["F4E3",0x91B7],
- ["F65D",0x91B9],
- ["C548",0x91BA],
- ["F849",0x91BC],
- ["F8C8",0x91BD],
- ["F8C7",0x91BE],
- ["C643",0x91C0],
- ["C65D",0x91C1],
- ["F8C9",0x91C2],
- ["F971",0x91C3],
- ["C66F",0x91C5],
- ["A8BC",0x91C6],
- ["AAF6",0x91C7],
- ["B956",0x91C9],
- ["C4C0",0x91CB],
- ["A8BD",0x91CC],
- ["ADAB",0x91CD],
- ["B3A5",0x91CE],
- ["B671",0x91CF],
- ["C2E7",0x91D0],
- ["AAF7",0x91D1],
- ["D0C1",0x91D3],
- ["D0C0",0x91D4],
- ["D442",0x91D5],
- ["B078",0x91D7],
- ["B076",0x91D8],
- ["B07A",0x91D9],
- ["D444",0x91DA],
- ["B079",0x91DC],
- ["B077",0x91DD],
- ["D443",0x91E2],
- ["B3A8",0x91E3],
- ["D7FC",0x91E4],
- ["B3A7",0x91E6],
- ["B3A9",0x91E7],
- ["D842",0x91E8],
- ["B3AB",0x91E9],
- ["D7FE",0x91EA],
- ["D840",0x91EB],
- ["D7F7",0x91EC],
- ["B3AA",0x91ED],
- ["D843",0x91EE],
- ["D7F9",0x91F1],
- ["D7FA",0x91F3],
- ["D7F8",0x91F4],
- ["B3A6",0x91F5],
- ["D841",0x91F7],
- ["D7FB",0x91F8],
- ["D7FD",0x91F9],
- ["DC6D",0x91FD],
- ["DC6C",0x91FF],
- ["DC6A",0x9200],
- ["DC62",0x9201],
- ["DC71",0x9202],
- ["DC65",0x9203],
- ["DC6F",0x9204],
- ["DC76",0x9205],
- ["DC6E",0x9206],
- ["B679",0x9207],
- ["B675",0x9209],
- ["DC63",0x920A],
- ["DC69",0x920C],
- ["B677",0x920D],
- ["DC68",0x920F],
- ["B678",0x9210],
- ["B67A",0x9211],
- ["DC6B",0x9212],
- ["B672",0x9214],
- ["B673",0x9215],
- ["DC77",0x9216],
- ["DC75",0x9217],
- ["DC74",0x9219],
- ["DC66",0x921A],
- ["DC72",0x921C],
- ["B676",0x921E],
- ["B674",0x9223],
- ["DC73",0x9224],
- ["DC64",0x9225],
- ["DC67",0x9226],
- ["DC70",0x9227],
- ["E4BA",0x922D],
- ["E0B7",0x922E],
- ["E0B0",0x9230],
- ["E0C3",0x9231],
- ["E0CC",0x9232],
- ["E0B3",0x9233],
- ["B961",0x9234],
- ["E0C0",0x9236],
- ["B957",0x9237],
- ["B959",0x9238],
- ["B965",0x9239],
- ["E0B1",0x923A],
- ["B95A",0x923D],
- ["B95C",0x923E],
- ["B966",0x923F],
- ["B95B",0x9240],
- ["B964",0x9245],
- ["E0B9",0x9246],
- ["E0AE",0x9248],
- ["B962",0x9249],
- ["E0B8",0x924A],
- ["B95E",0x924B],
- ["E0CA",0x924C],
- ["B963",0x924D],
- ["E0C8",0x924E],
- ["E0BC",0x924F],
- ["E0C6",0x9250],
- ["B960",0x9251],
- ["E0AF",0x9252],
- ["E0C9",0x9253],
- ["E0C4",0x9254],
- ["E0CB",0x9256],
- ["B958",0x9257],
- ["B967",0x925A],
- ["B95D",0x925B],
- ["E0B5",0x925E],
- ["E0BD",0x9260],
- ["E0C1",0x9261],
- ["E0C5",0x9263],
- ["B95F",0x9264],
- ["E0B4",0x9265],
- ["E0B2",0x9266],
- ["E0BE",0x9267],
- ["E0BB",0x926C],
- ["E0BA",0x926D],
- ["E0BF",0x926F],
- ["E0C2",0x9270],
- ["E0C7",0x9272],
- ["E478",0x9276],
- ["BBC7",0x9278],
- ["E4A4",0x9279],
- ["E47A",0x927A],
- ["BBCC",0x927B],
- ["BBD0",0x927C],
- ["E4AD",0x927D],
- ["E4B5",0x927E],
- ["E4A6",0x927F],
- ["BBC8",0x9280],
- ["E4AA",0x9282],
- ["E0B6",0x9283],
- ["BBC9",0x9285],
- ["E4B1",0x9286],
- ["E4B6",0x9287],
- ["E4AE",0x9288],
- ["E4B0",0x928A],
- ["E4B9",0x928B],
- ["E4B2",0x928C],
- ["E47E",0x928D],
- ["E4A9",0x928E],
- ["BBD1",0x9291],
- ["BBCD",0x9293],
- ["E47C",0x9294],
- ["E4AB",0x9295],
- ["BBCB",0x9296],
- ["E4A5",0x9297],
- ["BBCA",0x9298],
- ["E4B3",0x9299],
- ["E4A2",0x929A],
- ["E479",0x929B],
- ["BBCE",0x929C],
- ["E4B8",0x929D],
- ["E47B",0x92A0],
- ["E4AF",0x92A1],
- ["E4AC",0x92A2],
- ["E4A7",0x92A3],
- ["E477",0x92A4],
- ["E476",0x92A5],
- ["E4A1",0x92A6],
- ["E4B4",0x92A7],
- ["BBCF",0x92A8],
- ["E4B7",0x92A9],
- ["E47D",0x92AA],
- ["E4A3",0x92AB],
- ["BE52",0x92AC],
- ["BE5A",0x92B2],
- ["BE55",0x92B3],
- ["E8A4",0x92B4],
- ["E8A1",0x92B5],
- ["E867",0x92B6],
- ["BE50",0x92B7],
- ["BE4F",0x92BB],
- ["BE56",0x92BC],
- ["E865",0x92C0],
- ["BE54",0x92C1],
- ["E871",0x92C2],
- ["E863",0x92C3],
- ["E864",0x92C4],
- ["BE4E",0x92C5],
- ["E8A3",0x92C6],
- ["BE58",0x92C7],
- ["E874",0x92C8],
- ["E879",0x92C9],
- ["E873",0x92CA],
- ["EBEE",0x92CB],
- ["E86F",0x92CC],
- ["E877",0x92CD],
- ["E875",0x92CE],
- ["E868",0x92CF],
- ["E862",0x92D0],
- ["E87D",0x92D1],
- ["BE57",0x92D2],
- ["E87E",0x92D3],
- ["E878",0x92D5],
- ["E86D",0x92D7],
- ["E86B",0x92D8],
- ["E866",0x92D9],
- ["E86E",0x92DD],
- ["E87B",0x92DE],
- ["E86A",0x92DF],
- ["E87A",0x92E0],
- ["E8A2",0x92E1],
- ["BE53",0x92E4],
- ["E876",0x92E6],
- ["E87C",0x92E7],
- ["E872",0x92E8],
- ["E86C",0x92E9],
- ["BE51",0x92EA],
- ["E4A8",0x92EE],
- ["E870",0x92EF],
- ["BE59",0x92F0],
- ["E869",0x92F1],
- ["EBF4",0x92F7],
- ["BFF7",0x92F8],
- ["EBF3",0x92F9],
- ["EBF0",0x92FA],
- ["EC44",0x92FB],
- ["BFFB",0x92FC],
- ["EC41",0x92FE],
- ["EBF8",0x92FF],
- ["EC43",0x9300],
- ["EBE9",0x9301],
- ["EBF6",0x9302],
- ["BFFD",0x9304],
- ["EBE1",0x9306],
- ["EBDF",0x9308],
- ["EC42",0x9309],
- ["EC40",0x930B],
- ["EBFE",0x930C],
- ["EBED",0x930D],
- ["EBEC",0x930E],
- ["EBE2",0x930F],
- ["C040",0x9310],
- ["EBE8",0x9312],
- ["EBF2",0x9313],
- ["EBFD",0x9314],
- ["C043",0x9315],
- ["EC45",0x9316],
- ["C1E8",0x9318],
- ["C045",0x9319],
- ["BFFE",0x931A],
- ["EBE6",0x931B],
- ["EBEF",0x931D],
- ["EBDE",0x931E],
- ["EBE0",0x931F],
- ["BFF5",0x9320],
- ["C042",0x9321],
- ["BFFA",0x9322],
- ["EBE7",0x9323],
- ["EBF7",0x9324],
- ["EBF1",0x9325],
- ["C041",0x9326],
- ["EBDD",0x9327],
- ["C1E3",0x9328],
- ["EBF9",0x9329],
- ["EBFC",0x932A],
- ["BFFC",0x932B],
- ["EBEB",0x932D],
- ["C044",0x932E],
- ["BFF9",0x932F],
- ["BFF8",0x9333],
- ["EBF5",0x9334],
- ["EBFB",0x9335],
- ["BFF6",0x9336],
- ["EBE4",0x9338],
- ["EBFA",0x9339],
- ["EBE5",0x933C],
- ["EBEA",0x9346],
- ["EED2",0x9347],
- ["EED7",0x9349],
- ["C1E5",0x934A],
- ["C1E7",0x934B],
- ["EEDD",0x934C],
- ["C1E1",0x934D],
- ["EEEC",0x934E],
- ["EEE3",0x934F],
- ["EED8",0x9350],
- ["EED9",0x9351],
- ["EEE2",0x9352],
- ["C1EE",0x9354],
- ["EEE1",0x9355],
- ["EED1",0x9356],
- ["EEE0",0x9357],
- ["EED4",0x9358],
- ["EEED",0x9359],
- ["C1ED",0x935A],
- ["C1EB",0x935B],
- ["EED5",0x935C],
- ["EEE8",0x935E],
- ["EEDA",0x9360],
- ["EEE7",0x9361],
- ["EEE9",0x9363],
- ["EED0",0x9364],
- ["C1E6",0x9365],
- ["EEEA",0x9367],
- ["EEDE",0x936A],
- ["C1EA",0x936C],
- ["EEDB",0x936D],
- ["C1EC",0x9370],
- ["EEE4",0x9371],
- ["C1E4",0x9375],
- ["EED6",0x9376],
- ["EEE5",0x9377],
- ["EEDF",0x9379],
- ["EBE3",0x937A],
- ["EEE6",0x937B],
- ["EED3",0x937C],
- ["C1E9",0x937E],
- ["EEEB",0x9380],
- ["C1E2",0x9382],
- ["EECE",0x9383],
- ["F160",0x9388],
- ["F159",0x9389],
- ["C2E9",0x938A],
- ["F154",0x938C],
- ["F163",0x938D],
- ["F15B",0x938E],
- ["EEDC",0x938F],
- ["F165",0x9391],
- ["F155",0x9392],
- ["C2E8",0x9394],
- ["F15F",0x9395],
- ["C2EA",0x9396],
- ["C2F2",0x9397],
- ["C2F0",0x9398],
- ["F161",0x9399],
- ["C2F1",0x939A],
- ["F157",0x939B],
- ["F158",0x939D],
- ["F15D",0x939E],
- ["F162",0x939F],
- ["EECD",0x93A1],
- ["C2EB",0x93A2],
- ["F16A",0x93A3],
- ["F167",0x93A4],
- ["F16B",0x93A5],
- ["F15E",0x93A6],
- ["F15A",0x93A7],
- ["F168",0x93A8],
- ["F36A",0x93A9],
- ["F15C",0x93AA],
- ["C2EE",0x93AC],
- ["C2ED",0x93AE],
- ["EECF",0x93AF],
- ["C2EF",0x93B0],
- ["F164",0x93B1],
- ["F166",0x93B2],
- ["C2EC",0x93B3],
- ["F169",0x93B4],
- ["F153",0x93B5],
- ["F156",0x93B7],
- ["F373",0x93C0],
- ["F363",0x93C2],
- ["C3EB",0x93C3],
- ["F371",0x93C4],
- ["F361",0x93C7],
- ["C3EC",0x93C8],
- ["F36C",0x93CA],
- ["F368",0x93CC],
- ["C3F1",0x93CD],
- ["F372",0x93CE],
- ["F362",0x93CF],
- ["F365",0x93D0],
- ["C3E9",0x93D1],
- ["F374",0x93D2],
- ["F36D",0x93D4],
- ["F370",0x93D5],
- ["C3EF",0x93D6],
- ["C3F4",0x93D7],
- ["C3F2",0x93D8],
- ["F369",0x93D9],
- ["F364",0x93DA],
- ["C3ED",0x93DC],
- ["C3EE",0x93DD],
- ["F360",0x93DE],
- ["C3EA",0x93DF],
- ["C3E8",0x93E1],
- ["C3F0",0x93E2],
- ["F36F",0x93E3],
- ["C3F3",0x93E4],
- ["F36B",0x93E6],
- ["F375",0x93E7],
- ["C3F5",0x93E8],
- ["F367",0x93EC],
- ["F36E",0x93EE],
- ["F4F3",0x93F5],
- ["F542",0x93F6],
- ["F4F5",0x93F7],
- ["F4FC",0x93F8],
- ["F366",0x93F9],
- ["F4FA",0x93FA],
- ["F4E9",0x93FB],
- ["F540",0x93FC],
- ["C4C3",0x93FD],
- ["F4ED",0x93FE],
- ["F4FE",0x93FF],
- ["F4F4",0x9400],
- ["C4C2",0x9403],
- ["F544",0x9406],
- ["F4F6",0x9407],
- ["F4FB",0x9409],
- ["F4FD",0x940A],
- ["F4E7",0x940B],
- ["F541",0x940C],
- ["F4F2",0x940D],
- ["F4F7",0x940E],
- ["F4EB",0x940F],
- ["F4EF",0x9410],
- ["F543",0x9411],
- ["F4F9",0x9412],
- ["F4E8",0x9413],
- ["F4EC",0x9414],
- ["F4EE",0x9415],
- ["F4F8",0x9416],
- ["C4C1",0x9418],
- ["F4F1",0x9419],
- ["F4EA",0x9420],
- ["F4F0",0x9428],
- ["F661",0x9429],
- ["F666",0x942A],
- ["C54F",0x942B],
- ["F668",0x942C],
- ["C549",0x942E],
- ["F664",0x9430],
- ["F66A",0x9431],
- ["C54E",0x9432],
- ["C54A",0x9433],
- ["C54B",0x9435],
- ["F660",0x9436],
- ["F667",0x9437],
- ["C54D",0x9438],
- ["F665",0x9439],
- ["C54C",0x943A],
- ["F65F",0x943B],
- ["F663",0x943C],
- ["F662",0x943D],
- ["F65E",0x943F],
- ["F669",0x9440],
- ["C5B1",0x9444],
- ["F76D",0x9445],
- ["F770",0x9446],
- ["F76C",0x9447],
- ["F76E",0x9448],
- ["F76F",0x9449],
- ["F769",0x944A],
- ["F76A",0x944B],
- ["F767",0x944C],
- ["F76B",0x944F],
- ["F768",0x9450],
- ["C5B2",0x9451],
- ["C5B3",0x9452],
- ["F84B",0x9455],
- ["F84D",0x9457],
- ["F84C",0x945D],
- ["F84E",0x945E],
- ["C5E0",0x9460],
- ["F84A",0x9462],
- ["C5DF",0x9463],
- ["C5E1",0x9464],
- ["F8CB",0x9468],
- ["F8CC",0x9469],
- ["C644",0x946A],
- ["F8CA",0x946B],
- ["F953",0x946D],
- ["F952",0x946E],
- ["F954",0x946F],
- ["C65F",0x9470],
- ["F955",0x9471],
- ["C65E",0x9472],
- ["F956",0x9473],
- ["F972",0x9474],
- ["F975",0x9475],
- ["F974",0x9476],
- ["C668",0x9477],
- ["F973",0x9478],
- ["C672",0x947C],
- ["C670",0x947D],
- ["C671",0x947E],
- ["C677",0x947F],
- ["F9C0",0x9480],
- ["F9C1",0x9481],
- ["F9BF",0x9482],
- ["F9C9",0x9483],
- ["AAF8",0x9577],
- ["D844",0x957A],
- ["DC78",0x957B],
- ["E8A5",0x957C],
- ["F376",0x957D],
- ["AAF9",0x9580],
- ["ADAC",0x9582],
- ["B07B",0x9583],
- ["D845",0x9586],
- ["D846",0x9588],
- ["B3AC",0x9589],
- ["B67D",0x958B],
- ["DC7A",0x958C],
- ["DC79",0x958D],
- ["B6A3",0x958E],
- ["B67C",0x958F],
- ["DC7B",0x9590],
- ["B67E",0x9591],
- ["B6A2",0x9592],
- ["B6A1",0x9593],
- ["B67B",0x9594],
- ["B968",0x9598],
- ["E0D0",0x959B],
- ["E0CE",0x959C],
- ["E0CF",0x959E],
- ["E0CD",0x959F],
- ["BBD2",0x95A1],
- ["BBD5",0x95A3],
- ["BBD7",0x95A4],
- ["BBD6",0x95A5],
- ["BBD3",0x95A8],
- ["BBD4",0x95A9],
- ["E8A7",0x95AB],
- ["E8A6",0x95AC],
- ["BE5B",0x95AD],
- ["E8A8",0x95AE],
- ["E8A9",0x95B0],
- ["BE5C",0x95B1],
- ["EC4D",0x95B5],
- ["EC4B",0x95B6],
- ["EEF3",0x95B7],
- ["EC49",0x95B9],
- ["EC4A",0x95BA],
- ["C046",0x95BB],
- ["EC46",0x95BC],
- ["EC4E",0x95BD],
- ["EC48",0x95BE],
- ["EC4C",0x95BF],
- ["EEEF",0x95C0],
- ["EEF1",0x95C3],
- ["EEF2",0x95C5],
- ["C1F3",0x95C6],
- ["EEEE",0x95C7],
- ["C1F2",0x95C8],
- ["EEF0",0x95C9],
- ["C1EF",0x95CA],
- ["C1F0",0x95CB],
- ["C1F1",0x95CC],
- ["EC47",0x95CD],
- ["C2F5",0x95D0],
- ["F16E",0x95D1],
- ["F16C",0x95D2],
- ["F16D",0x95D3],
- ["C2F3",0x95D4],
- ["C2F6",0x95D5],
- ["C2F4",0x95D6],
- ["F377",0x95DA],
- ["F378",0x95DB],
- ["C3F6",0x95DC],
- ["F545",0x95DE],
- ["F547",0x95DF],
- ["F546",0x95E0],
- ["C4C4",0x95E1],
- ["C550",0x95E2],
- ["F66D",0x95E3],
- ["F66C",0x95E4],
- ["F66B",0x95E5],
- ["AAFA",0x961C],
- ["C9AA",0x961E],
- ["CA58",0x9620],
- ["A6E9",0x9621],
- ["CA56",0x9622],
- ["CA59",0x9623],
- ["CA57",0x9624],
- ["CBAE",0x9628],
- ["A8C1",0x962A],
- ["A8C2",0x962C],
- ["CBB0",0x962D],
- ["A8BF",0x962E],
- ["CBAF",0x962F],
- ["CBAD",0x9630],
- ["A8C0",0x9631],
- ["A8BE",0x9632],
- ["CDD8",0x9639],
- ["CDDB",0x963A],
- ["AAFD",0x963B],
- ["CDDA",0x963C],
- ["CDD9",0x963D],
- ["AAFC",0x963F],
- ["AAFB",0x9640],
- ["AB40",0x9642],
- ["CDDC",0x9643],
- ["AAFE",0x9644],
- ["D0C6",0x964A],
- ["ADAE",0x964B],
- ["ADAF",0x964C],
- ["ADB0",0x964D],
- ["D0C7",0x964E],
- ["D0C3",0x964F],
- ["ADAD",0x9650],
- ["D0C4",0x9651],
- ["D0C5",0x9653],
- ["D0C2",0x9654],
- ["B0A4",0x9658],
- ["B0A1",0x965B],
- ["D445",0x965C],
- ["B0A2",0x965D],
- ["B0A5",0x965E],
- ["D446",0x965F],
- ["B07E",0x9661],
- ["B07C",0x9662],
- ["B07D",0x9663],
- ["B0A3",0x9664],
- ["B3AD",0x966A],
- ["D849",0x966B],
- ["B3B5",0x966C],
- ["D848",0x966D],
- ["D84B",0x966F],
- ["B3B1",0x9670],
- ["D84A",0x9671],
- ["B6AB",0x9672],
- ["B3AF",0x9673],
- ["B3B2",0x9674],
- ["B3AE",0x9675],
- ["B3B3",0x9676],
- ["B3B4",0x9677],
- ["B3B0",0x9678],
- ["D847",0x967C],
- ["B6A7",0x967D],
- ["DC7D",0x967E],
- ["DCA3",0x9680],
- ["DCA2",0x9683],
- ["B6AC",0x9684],
- ["B6A8",0x9685],
- ["B6A9",0x9686],
- ["DC7C",0x9687],
- ["DC7E",0x9688],
- ["DCA1",0x9689],
- ["B6A4",0x968A],
- ["B6A6",0x968B],
- ["B6AA",0x968D],
- ["B6A5",0x968E],
- ["E0D3",0x9691],
- ["E0D1",0x9692],
- ["E0D2",0x9693],
- ["B96A",0x9694],
- ["B96B",0x9695],
- ["E0D4",0x9697],
- ["B969",0x9698],
- ["BBD8",0x9699],
- ["BBDA",0x969B],
- ["BBD9",0x969C],
- ["E4BB",0x969E],
- ["E4BC",0x96A1],
- ["E8AB",0x96A2],
- ["E8AA",0x96A4],
- ["C047",0x96A7],
- ["C048",0x96A8],
- ["EC4F",0x96A9],
- ["C049",0x96AA],
- ["EEF6",0x96AC],
- ["EEF4",0x96AE],
- ["EEF5",0x96B0],
- ["C1F4",0x96B1],
- ["F16F",0x96B3],
- ["C3F7",0x96B4],
- ["C1F5",0x96B8],
- ["AB41",0x96B9],
- ["B0A6",0x96BB],
- ["D447",0x96BC],
- ["D84C",0x96BF],
- ["B3B6",0x96C0],
- ["B6AD",0x96C1],
- ["DCA4",0x96C2],
- ["DCA6",0x96C3],
- ["B6AF",0x96C4],
- ["B6AE",0x96C5],
- ["B6B0",0x96C6],
- ["B6B1",0x96C7],
- ["DCA5",0x96C8],
- ["B96E",0x96C9],
- ["B96F",0x96CA],
- ["B96D",0x96CB],
- ["BBDB",0x96CC],
- ["B96C",0x96CD],
- ["E0D5",0x96CE],
- ["BBDC",0x96D2],
- ["E8AC",0x96D3],
- ["EC50",0x96D4],
- ["C04A",0x96D5],
- ["C1F6",0x96D6],
- ["F170",0x96D7],
- ["F174",0x96D8],
- ["C2F9",0x96D9],
- ["F171",0x96DA],
- ["C2FA",0x96DB],
- ["C2F8",0x96DC],
- ["F175",0x96DD],
- ["C2FB",0x96DE],
- ["F173",0x96DF],
- ["F379",0x96E1],
- ["C2F7",0x96E2],
- ["C3F8",0x96E3],
- ["F8CD",0x96E5],
- ["AB42",0x96E8],
- ["B3B8",0x96E9],
- ["B3B7",0x96EA],
- ["B6B2",0x96EF],
- ["DCA8",0x96F0],
- ["DCA7",0x96F1],
- ["B6B3",0x96F2],
- ["E0D9",0x96F5],
- ["B973",0x96F6],
- ["B970",0x96F7],
- ["E0D8",0x96F8],
- ["B972",0x96F9],
- ["E0D6",0x96FA],
- ["B971",0x96FB],
- ["E0D7",0x96FD],
- ["E4BD",0x96FF],
- ["BBDD",0x9700],
- ["E8AF",0x9702],
- ["BE5D",0x9704],
- ["E8AD",0x9705],
- ["BE5E",0x9706],
- ["BE5F",0x9707],
- ["E8AE",0x9708],
- ["BE60",0x9709],
- ["EC51",0x970B],
- ["C04E",0x970D],
- ["C04B",0x970E],
- ["C050",0x970F],
- ["EC53",0x9710],
- ["C04C",0x9711],
- ["EC52",0x9712],
- ["C04F",0x9713],
- ["C04D",0x9716],
- ["EEF9",0x9718],
- ["EEFB",0x9719],
- ["C1F7",0x971C],
- ["EEFA",0x971D],
- ["C1F8",0x971E],
- ["EEF8",0x971F],
- ["EEF7",0x9720],
- ["F177",0x9722],
- ["F176",0x9723],
- ["C2FC",0x9724],
- ["F178",0x9725],
- ["F37E",0x9726],
- ["C3FA",0x9727],
- ["F37D",0x9728],
- ["F37A",0x9729],
- ["C3F9",0x972A],
- ["F37B",0x972B],
- ["F37C",0x972C],
- ["F548",0x972E],
- ["F549",0x972F],
- ["C4C5",0x9730],
- ["C553",0x9732],
- ["F66E",0x9735],
- ["C551",0x9738],
- ["C552",0x9739],
- ["F66F",0x973A],
- ["C5B4",0x973D],
- ["C5B5",0x973E],
- ["F771",0x973F],
- ["C645",0x9742],
- ["F8CF",0x9743],
- ["C647",0x9744],
- ["F8CE",0x9746],
- ["F8D0",0x9747],
- ["C646",0x9748],
- ["F957",0x9749],
- ["F9AD",0x974B],
- ["AB43",0x9752],
- ["B974",0x9756],
- ["E4BE",0x9758],
- ["E8B0",0x975A],
- ["C051",0x975B],
- ["C052",0x975C],
- ["AB44",0x975E],
- ["BE61",0x9760],
- ["C3FB",0x9761],
- ["ADB1",0x9762],
- ["C053",0x9766],
- ["C5E2",0x9768],
- ["ADB2",0x9769],
- ["D84D",0x976A],
- ["DCA9",0x976C],
- ["DCAB",0x976E],
- ["DCAA",0x9770],
- ["E0DD",0x9772],
- ["E0DA",0x9773],
- ["B975",0x9774],
- ["B976",0x9776],
- ["E0DB",0x9777],
- ["E0DC",0x9778],
- ["E4C0",0x977A],
- ["E4C5",0x977B],
- ["BBDE",0x977C],
- ["E4BF",0x977D],
- ["E4C1",0x977E],
- ["E4C8",0x977F],
- ["E4C3",0x9780],
- ["E4C7",0x9781],
- ["E4C4",0x9782],
- ["E4C2",0x9783],
- ["E4C6",0x9784],
- ["BBDF",0x9785],
- ["E8B3",0x9788],
- ["E8B1",0x978A],
- ["BE63",0x978B],
- ["BE62",0x978D],
- ["E8B2",0x978E],
- ["BE64",0x978F],
- ["EC56",0x9794],
- ["EC55",0x9797],
- ["C054",0x9798],
- ["EC54",0x9799],
- ["EEFC",0x979A],
- ["EEFE",0x979C],
- ["EF41",0x979D],
- ["EF40",0x979E],
- ["C1F9",0x97A0],
- ["EEFD",0x97A1],
- ["F1A1",0x97A2],
- ["C2FD",0x97A3],
- ["F17D",0x97A4],
- ["F1A2",0x97A5],
- ["C2FE",0x97A6],
- ["F17B",0x97A8],
- ["F17E",0x97AA],
- ["F17C",0x97AB],
- ["F179",0x97AC],
- ["C340",0x97AD],
- ["F17A",0x97AE],
- ["F3A1",0x97B3],
- ["F3A3",0x97B6],
- ["F3A2",0x97B7],
- ["F54A",0x97B9],
- ["F54B",0x97BB],
- ["F670",0x97BF],
- ["C5B7",0x97C1],
- ["C5B6",0x97C3],
- ["F84F",0x97C4],
- ["F850",0x97C5],
- ["C648",0x97C6],
- ["F8D1",0x97C7],
- ["C669",0x97C9],
- ["ADB3",0x97CB],
- ["B6B4",0x97CC],
- ["E4CA",0x97CD],
- ["E4C9",0x97CE],
- ["E8B5",0x97CF],
- ["E8B4",0x97D0],
- ["C1FA",0x97D3],
- ["EF43",0x97D4],
- ["EF42",0x97D5],
- ["F1A5",0x97D6],
- ["F1A3",0x97D7],
- ["F1A6",0x97D8],
- ["F1A4",0x97D9],
- ["C3FC",0x97DC],
- ["F3A4",0x97DD],
- ["F3A5",0x97DE],
- ["F3A6",0x97DF],
- ["F671",0x97E1],
- ["F772",0x97E3],
- ["F8D2",0x97E5],
- ["ADB4",0x97ED],
- ["EC57",0x97F0],
- ["EF44",0x97F1],
- ["ADB5",0x97F3],
- ["BBE0",0x97F6],
- ["EC58",0x97F8],
- ["C341",0x97F9],
- ["F1A7",0x97FA],
- ["C3FD",0x97FB],
- ["F54C",0x97FD],
- ["F54D",0x97FE],
- ["C554",0x97FF],
- ["F851",0x9800],
- ["ADB6",0x9801],
- ["B3BB",0x9802],
- ["B3BC",0x9803],
- ["D84E",0x9804],
- ["B6B5",0x9805],
- ["B6B6",0x9806],
- ["DCAC",0x9807],
- ["B6B7",0x9808],
- ["B97A",0x980A],
- ["B97C",0x980C],
- ["E0DF",0x980D],
- ["E0E0",0x980E],
- ["E0DE",0x980F],
- ["B977",0x9810],
- ["B978",0x9811],
- ["B97B",0x9812],
- ["B979",0x9813],
- ["E4CB",0x9816],
- ["BBE1",0x9817],
- ["BBE2",0x9818],
- ["E8BC",0x981B],
- ["BE67",0x981C],
- ["E8B7",0x981D],
- ["E8B6",0x981E],
- ["E8BB",0x9820],
- ["BE65",0x9821],
- ["C05B",0x9824],
- ["E8B8",0x9826],
- ["E8BD",0x9827],
- ["E8BA",0x9828],
- ["E8B9",0x9829],
- ["BE66",0x982B],
- ["C059",0x982D],
- ["EC5A",0x982F],
- ["C055",0x9830],
- ["EC5B",0x9832],
- ["EC59",0x9835],
- ["C058",0x9837],
- ["C056",0x9838],
- ["C05A",0x9839],
- ["C057",0x983B],
- ["EF45",0x9841],
- ["EF4A",0x9843],
- ["EF46",0x9844],
- ["EF49",0x9845],
- ["C1FB",0x9846],
- ["EDD4",0x9848],
- ["EF48",0x9849],
- ["EF47",0x984A],
- ["C344",0x984C],
- ["C342",0x984D],
- ["C345",0x984E],
- ["C343",0x984F],
- ["F1A8",0x9850],
- ["F1A9",0x9851],
- ["F1AA",0x9852],
- ["C346",0x9853],
- ["F3AA",0x9857],
- ["C440",0x9858],
- ["F3A8",0x9859],
- ["C441",0x985B],
- ["F3A7",0x985C],
- ["F3A9",0x985D],
- ["C3FE",0x985E],
- ["F551",0x985F],
- ["F54E",0x9860],
- ["F54F",0x9862],
- ["F550",0x9863],
- ["F672",0x9864],
- ["C556",0x9865],
- ["C555",0x9867],
- ["F774",0x9869],
- ["F773",0x986A],
- ["C5B8",0x986B],
- ["C5E3",0x986F],
- ["C649",0x9870],
- ["C660",0x9871],
- ["F958",0x9872],
- ["F9AE",0x9873],
- ["F9AF",0x9874],
- ["ADB7",0x98A8],
- ["DCAD",0x98A9],
- ["E0E1",0x98AC],
- ["E4CC",0x98AD],
- ["E4CD",0x98AE],
- ["BBE3",0x98AF],
- ["BBE4",0x98B1],
- ["E8BE",0x98B2],
- ["BE68",0x98B3],
- ["C1FC",0x98B6],
- ["F1AB",0x98B8],
- ["C347",0x98BA],
- ["F3AD",0x98BB],
- ["C442",0x98BC],
- ["F3AC",0x98BD],
- ["F3AE",0x98BE],
- ["F3AB",0x98BF],
- ["F675",0x98C0],
- ["F552",0x98C1],
- ["F553",0x98C2],
- ["C4C6",0x98C4],
- ["F674",0x98C6],
- ["F673",0x98C9],
- ["F775",0x98CB],
- ["F9B0",0x98CC],
- ["ADB8",0x98DB],
- ["ADB9",0x98DF],
- ["B0A7",0x98E2],
- ["D448",0x98E3],
- ["D84F",0x98E5],
- ["B6B8",0x98E7],
- ["B6BB",0x98E9],
- ["B6B9",0x98EA],
- ["DCAE",0x98EB],
- ["B6BD",0x98ED],
- ["B6BA",0x98EF],
- ["B6BC",0x98F2],
- ["B97E",0x98F4],
- ["E0E2",0x98F6],
- ["E0E3",0x98F9],
- ["E8C0",0x98FA],
- ["B97D",0x98FC],
- ["B9A1",0x98FD],
- ["B9A2",0x98FE],
- ["E4CF",0x9900],
- ["E4CE",0x9902],
- ["BBE5",0x9903],
- ["BBE6",0x9905],
- ["E4D0",0x9907],
- ["E8BF",0x9908],
- ["BBE8",0x9909],
- ["BE69",0x990A],
- ["BBE7",0x990C],
- ["C05C",0x9910],
- ["E8C1",0x9911],
- ["BE6B",0x9912],
- ["BE6A",0x9913],
- ["E8C2",0x9914],
- ["E8C5",0x9915],
- ["E8C3",0x9916],
- ["E8C4",0x9917],
- ["BE6C",0x9918],
- ["C061",0x991A],
- ["C05F",0x991B],
- ["C05E",0x991E],
- ["EC5D",0x991F],
- ["C060",0x9921],
- ["EC5C",0x9924],
- ["EF4B",0x9925],
- ["EC5E",0x9927],
- ["C05D",0x9928],
- ["EC5F",0x9929],
- ["EF4E",0x992A],
- ["EF4C",0x992B],
- ["EF4D",0x992C],
- ["EF52",0x992D],
- ["C34B",0x992E],
- ["EF51",0x992F],
- ["EF54",0x9930],
- ["EF53",0x9931],
- ["EF50",0x9932],
- ["EF4F",0x9933],
- ["C1FD",0x9935],
- ["F1AE",0x993A],
- ["F1AD",0x993C],
- ["C34A",0x993D],
- ["C348",0x993E],
- ["C349",0x993F],
- ["F1AC",0x9941],
- ["F3B1",0x9943],
- ["C443",0x9945],
- ["F3B0",0x9947],
- ["F3AF",0x9948],
- ["C444",0x9949],
- ["F558",0x994B],
- ["F557",0x994C],
- ["F555",0x994E],
- ["F554",0x9950],
- ["C4C8",0x9951],
- ["C4C7",0x9952],
- ["F559",0x9953],
- ["F776",0x9954],
- ["C5B9",0x9955],
- ["F677",0x9956],
- ["C557",0x9957],
- ["F676",0x9958],
- ["F556",0x9959],
- ["F777",0x995B],
- ["C5E4",0x995C],
- ["C661",0x995E],
- ["F959",0x995F],
- ["F9B1",0x9961],
- ["ADBA",0x9996],
- ["D850",0x9997],
- ["EF55",0x9998],
- ["ADBB",0x9999],
- ["E4D2",0x999C],
- ["E4D1",0x999D],
- ["EC60",0x999E],
- ["EF57",0x99A1],
- ["EF56",0x99A3],
- ["C34C",0x99A5],
- ["F3B2",0x99A6],
- ["F3B3",0x99A7],
- ["C4C9",0x99A8],
- ["F9B2",0x99AB],
- ["B0A8",0x99AC],
- ["B6BF",0x99AD],
- ["B6BE",0x99AE],
- ["E0E4",0x99AF],
- ["E0E6",0x99B0],
- ["B9A4",0x99B1],
- ["E0E5",0x99B2],
- ["B9A3",0x99B3],
- ["B9A5",0x99B4],
- ["E0E7",0x99B5],
- ["E4D4",0x99B9],
- ["E4D6",0x99BA],
- ["E4D5",0x99BB],
- ["E4D8",0x99BD],
- ["BBE9",0x99C1],
- ["E4D7",0x99C2],
- ["E4D3",0x99C3],
- ["E4D9",0x99C7],
- ["E8CC",0x99C9],
- ["E8CF",0x99CB],
- ["E8D1",0x99CC],
- ["E8C7",0x99CD],
- ["E8CB",0x99CE],
- ["E8C8",0x99CF],
- ["BE6E",0x99D0],
- ["BE71",0x99D1],
- ["BE73",0x99D2],
- ["E8C9",0x99D3],
- ["E8CA",0x99D4],
- ["BE72",0x99D5],
- ["E8CD",0x99D6],
- ["E8D0",0x99D7],
- ["E8CE",0x99D8],
- ["BE74",0x99D9],
- ["BE70",0x99DB],
- ["E8C6",0x99DC],
- ["BE6D",0x99DD],
- ["BE6F",0x99DF],
- ["C063",0x99E2],
- ["EC66",0x99E3],
- ["EC64",0x99E4],
- ["EC63",0x99E5],
- ["EC69",0x99E7],
- ["EC68",0x99E9],
- ["EC67",0x99EA],
- ["EC62",0x99EC],
- ["C062",0x99ED],
- ["EC61",0x99EE],
- ["EC65",0x99F0],
- ["C064",0x99F1],
- ["EF5A",0x99F4],
- ["EF5E",0x99F6],
- ["EF5B",0x99F7],
- ["EF5D",0x99F8],
- ["EF5C",0x99F9],
- ["EF59",0x99FA],
- ["EF5F",0x99FB],
- ["EF62",0x99FC],
- ["EF60",0x99FD],
- ["EF61",0x99FE],
- ["C240",0x99FF],
- ["C1FE",0x9A01],
- ["EF58",0x9A02],
- ["EF63",0x9A03],
- ["F1B3",0x9A04],
- ["F1B6",0x9A05],
- ["F1B8",0x9A06],
- ["F1B7",0x9A07],
- ["F1B1",0x9A09],
- ["F1B5",0x9A0A],
- ["F1B0",0x9A0B],
- ["F1B2",0x9A0D],
- ["C34D",0x9A0E],
- ["F1AF",0x9A0F],
- ["F1B4",0x9A11],
- ["F3C0",0x9A14],
- ["F3B5",0x9A15],
- ["C445",0x9A16],
- ["C446",0x9A19],
- ["F3B4",0x9A1A],
- ["F3B9",0x9A1B],
- ["F3BF",0x9A1C],
- ["F3B7",0x9A1D],
- ["F3BE",0x9A1E],
- ["F3BB",0x9A20],
- ["F3BA",0x9A22],
- ["F3BD",0x9A23],
- ["F3B8",0x9A24],
- ["F3B6",0x9A25],
- ["F3BC",0x9A27],
- ["F560",0x9A29],
- ["F55E",0x9A2A],
- ["C4CA",0x9A2B],
- ["F55D",0x9A2C],
- ["F563",0x9A2D],
- ["F561",0x9A2E],
- ["C4CB",0x9A30],
- ["F55C",0x9A31],
- ["F55A",0x9A32],
- ["F55B",0x9A34],
- ["C4CD",0x9A35],
- ["F55F",0x9A36],
- ["C4CC",0x9A37],
- ["F562",0x9A38],
- ["F678",0x9A39],
- ["F67E",0x9A3A],
- ["F679",0x9A3D],
- ["C55B",0x9A3E],
- ["F6A1",0x9A3F],
- ["C55A",0x9A40],
- ["F67D",0x9A41],
- ["F67C",0x9A42],
- ["C559",0x9A43],
- ["F67B",0x9A44],
- ["C558",0x9A45],
- ["F67A",0x9A46],
- ["F77D",0x9A48],
- ["F7A1",0x9A49],
- ["F77E",0x9A4A],
- ["F77B",0x9A4C],
- ["C5BB",0x9A4D],
- ["F778",0x9A4E],
- ["F77C",0x9A4F],
- ["F7A3",0x9A50],
- ["F7A2",0x9A52],
- ["F779",0x9A53],
- ["F77A",0x9A54],
- ["C5BA",0x9A55],
- ["F852",0x9A56],
- ["C5E7",0x9A57],
- ["F853",0x9A59],
- ["C5E5",0x9A5A],
- ["C5E6",0x9A5B],
- ["F8D3",0x9A5E],
- ["C64A",0x9A5F],
- ["F976",0x9A60],
- ["C66A",0x9A62],
- ["F9B3",0x9A64],
- ["C66B",0x9A65],
- ["F9B4",0x9A66],
- ["F9B5",0x9A67],
- ["F9C3",0x9A68],
- ["F9C2",0x9A69],
- ["C67A",0x9A6A],
- ["F9CD",0x9A6B],
- ["B0A9",0x9AA8],
- ["E0E9",0x9AAB],
- ["E0E8",0x9AAD],
- ["BBEA",0x9AAF],
- ["BBEB",0x9AB0],
- ["E4DA",0x9AB1],
- ["E8D2",0x9AB3],
- ["EC6C",0x9AB4],
- ["BE75",0x9AB7],
- ["C065",0x9AB8],
- ["EC6A",0x9AB9],
- ["EC6D",0x9ABB],
- ["C066",0x9ABC],
- ["EF64",0x9ABE],
- ["EC6B",0x9ABF],
- ["F1B9",0x9AC0],
- ["C34E",0x9AC1],
- ["F3C1",0x9AC2],
- ["F566",0x9AC6],
- ["F564",0x9AC7],
- ["F565",0x9ACA],
- ["F6A2",0x9ACD],
- ["C55C",0x9ACF],
- ["F7A4",0x9AD0],
- ["C5EA",0x9AD1],
- ["C5BC",0x9AD2],
- ["C5E8",0x9AD3],
- ["C5E9",0x9AD4],
- ["F8D4",0x9AD5],
- ["C662",0x9AD6],
- ["B0AA",0x9AD8],
- ["F1BA",0x9ADC],
- ["D449",0x9ADF],
- ["B9A6",0x9AE1],
- ["E4DB",0x9AE3],
- ["BBEC",0x9AE6],
- ["E4DC",0x9AE7],
- ["E8D4",0x9AEB],
- ["E8D3",0x9AEC],
- ["C068",0x9AED],
- ["BE76",0x9AEE],
- ["BE77",0x9AEF],
- ["E8D7",0x9AF1],
- ["E8D6",0x9AF2],
- ["E8D5",0x9AF3],
- ["EC6E",0x9AF6],
- ["EC71",0x9AF7],
- ["EC70",0x9AF9],
- ["EC6F",0x9AFA],
- ["C067",0x9AFB],
- ["EF68",0x9AFC],
- ["EF66",0x9AFD],
- ["EF65",0x9AFE],
- ["EF67",0x9B01],
- ["C34F",0x9B03],
- ["F1BC",0x9B04],
- ["F1BD",0x9B05],
- ["C350",0x9B06],
- ["F1BB",0x9B08],
- ["F3C3",0x9B0A],
- ["F3C2",0x9B0B],
- ["F3C5",0x9B0C],
- ["C447",0x9B0D],
- ["F3C4",0x9B0E],
- ["F567",0x9B10],
- ["F569",0x9B11],
- ["F568",0x9B12],
- ["F6A3",0x9B15],
- ["F6A6",0x9B16],
- ["F6A4",0x9B17],
- ["F6A5",0x9B18],
- ["F7A5",0x9B19],
- ["C5BD",0x9B1A],
- ["F854",0x9B1E],
- ["F855",0x9B1F],
- ["F856",0x9B20],
- ["C64B",0x9B22],
- ["C663",0x9B23],
- ["F9B6",0x9B24],
- ["B0AB",0x9B25],
- ["BE78",0x9B27],
- ["C069",0x9B28],
- ["F1BE",0x9B29],
- ["F7A6",0x9B2B],
- ["F9C4",0x9B2E],
- ["D44A",0x9B2F],
- ["C67B",0x9B31],
- ["B0AC",0x9B32],
- ["EC72",0x9B33],
- ["F1BF",0x9B35],
- ["F3C6",0x9B37],
- ["F6A7",0x9B3A],
- ["F7A7",0x9B3B],
- ["B0AD",0x9B3C],
- ["E4DD",0x9B3E],
- ["E4DE",0x9B3F],
- ["BBED",0x9B41],
- ["BBEE",0x9B42],
- ["E8D9",0x9B43],
- ["BE7A",0x9B44],
- ["BE79",0x9B45],
- ["E8D8",0x9B46],
- ["EF69",0x9B48],
- ["F1C0",0x9B4A],
- ["F1C2",0x9B4B],
- ["F1C1",0x9B4C],
- ["C353",0x9B4D],
- ["C352",0x9B4E],
- ["C351",0x9B4F],
- ["C55E",0x9B51],
- ["F6A8",0x9B52],
- ["C55D",0x9B54],
- ["F7A9",0x9B55],
- ["F7A8",0x9B56],
- ["C64C",0x9B58],
- ["F8D5",0x9B59],
- ["B3BD",0x9B5A],
- ["E0EA",0x9B5B],
- ["E4E1",0x9B5F],
- ["E4DF",0x9B60],
- ["E4E0",0x9B61],
- ["E8E2",0x9B64],
- ["E8DD",0x9B66],
- ["E8DA",0x9B67],
- ["E8E1",0x9B68],
- ["E8E3",0x9B6C],
- ["BE7C",0x9B6F],
- ["E8E0",0x9B70],
- ["E8DC",0x9B71],
- ["E8DB",0x9B74],
- ["E8DF",0x9B75],
- ["E8DE",0x9B76],
- ["BE7B",0x9B77],
- ["EC7D",0x9B7A],
- ["EC78",0x9B7B],
- ["EC76",0x9B7C],
- ["ECA1",0x9B7D],
- ["EC77",0x9B7E],
- ["EC73",0x9B80],
- ["EC79",0x9B82],
- ["EC74",0x9B85],
- ["EF72",0x9B86],
- ["EC75",0x9B87],
- ["ECA2",0x9B88],
- ["EC7C",0x9B90],
- ["C06A",0x9B91],
- ["EC7B",0x9B92],
- ["EC7A",0x9B93],
- ["EC7E",0x9B95],
- ["EF6A",0x9B9A],
- ["EF6D",0x9B9B],
- ["EF6C",0x9B9E],
- ["EF74",0x9BA0],
- ["EF6F",0x9BA1],
- ["EF73",0x9BA2],
- ["EF71",0x9BA4],
- ["EF70",0x9BA5],
- ["EF6E",0x9BA6],
- ["EF6B",0x9BA8],
- ["C243",0x9BAA],
- ["C242",0x9BAB],
- ["C244",0x9BAD],
- ["C241",0x9BAE],
- ["EF75",0x9BAF],
- ["F1C8",0x9BB5],
- ["F1CB",0x9BB6],
- ["F1C9",0x9BB8],
- ["F1CD",0x9BB9],
- ["F1CE",0x9BBD],
- ["F1C6",0x9BBF],
- ["C358",0x9BC0],
- ["F1C7",0x9BC1],
- ["F1C5",0x9BC3],
- ["F1CC",0x9BC4],
- ["F1C4",0x9BC6],
- ["F1C3",0x9BC7],
- ["C357",0x9BC8],
- ["C355",0x9BC9],
- ["C354",0x9BCA],
- ["F1CA",0x9BD3],
- ["F3CF",0x9BD4],
- ["F3D5",0x9BD5],
- ["C44A",0x9BD6],
- ["F3D0",0x9BD7],
- ["F3D3",0x9BD9],
- ["F3D7",0x9BDA],
- ["C44B",0x9BDB],
- ["F3D2",0x9BDC],
- ["F3CA",0x9BDE],
- ["F3C9",0x9BE0],
- ["F3D6",0x9BE1],
- ["F3CD",0x9BE2],
- ["F3CB",0x9BE4],
- ["F3D4",0x9BE5],
- ["F3CC",0x9BE6],
- ["C449",0x9BE7],
- ["C448",0x9BE8],
- ["F3C7",0x9BEA],
- ["F3C8",0x9BEB],
- ["F3D1",0x9BEC],
- ["F3CE",0x9BF0],
- ["F56C",0x9BF7],
- ["F56F",0x9BF8],
- ["C356",0x9BFD],
- ["F56D",0x9C05],
- ["F573",0x9C06],
- ["F571",0x9C07],
- ["F56B",0x9C08],
- ["F576",0x9C09],
- ["F56A",0x9C0B],
- ["C4CF",0x9C0D],
- ["F572",0x9C0E],
- ["F56E",0x9C12],
- ["C4CE",0x9C13],
- ["F575",0x9C14],
- ["F574",0x9C17],
- ["F6AB",0x9C1C],
- ["F6AA",0x9C1D],
- ["F6B1",0x9C21],
- ["F6AD",0x9C23],
- ["F6B0",0x9C24],
- ["C560",0x9C25],
- ["F6AE",0x9C28],
- ["F6AF",0x9C29],
- ["F6A9",0x9C2B],
- ["F6AC",0x9C2C],
- ["C55F",0x9C2D],
- ["C5BF",0x9C31],
- ["F7B4",0x9C32],
- ["F7AF",0x9C33],
- ["F7B3",0x9C34],
- ["F7B6",0x9C36],
- ["F7B2",0x9C37],
- ["F7AE",0x9C39],
- ["C5C1",0x9C3B],
- ["F7B1",0x9C3C],
- ["F7B5",0x9C3D],
- ["C5C0",0x9C3E],
- ["F7AC",0x9C3F],
- ["F570",0x9C40],
- ["F7B0",0x9C41],
- ["F7AD",0x9C44],
- ["F7AA",0x9C46],
- ["F7AB",0x9C48],
- ["C5BE",0x9C49],
- ["F85A",0x9C4A],
- ["F85C",0x9C4B],
- ["F85F",0x9C4C],
- ["F85B",0x9C4D],
- ["F860",0x9C4E],
- ["F859",0x9C50],
- ["F857",0x9C52],
- ["C5EB",0x9C54],
- ["F85D",0x9C55],
- ["C5ED",0x9C56],
- ["C5EC",0x9C57],
- ["F858",0x9C58],
- ["F85E",0x9C59],
- ["F8DA",0x9C5E],
- ["C64D",0x9C5F],
- ["F8DB",0x9C60],
- ["F8D9",0x9C62],
- ["F8D6",0x9C63],
- ["F8D8",0x9C66],
- ["F8D7",0x9C67],
- ["F95A",0x9C68],
- ["F95C",0x9C6D],
- ["F95B",0x9C6E],
- ["F979",0x9C71],
- ["F978",0x9C73],
- ["F977",0x9C74],
- ["F97A",0x9C75],
- ["C673",0x9C77],
- ["C674",0x9C78],
- ["F9CA",0x9C79],
- ["F9CE",0x9C7A],
- ["B3BE",0x9CE5],
- ["DCAF",0x9CE6],
- ["E0ED",0x9CE7],
- ["B9A7",0x9CE9],
- ["E0EB",0x9CEA],
- ["E0EC",0x9CED],
- ["E4E2",0x9CF1],
- ["E4E3",0x9CF2],
- ["BBF1",0x9CF3],
- ["BBEF",0x9CF4],
- ["E4E4",0x9CF5],
- ["BBF0",0x9CF6],
- ["E8E8",0x9CF7],
- ["E8EB",0x9CF9],
- ["E8E5",0x9CFA],
- ["E8EC",0x9CFB],
- ["E8E4",0x9CFC],
- ["E8E6",0x9CFD],
- ["E8E7",0x9CFF],
- ["E8EA",0x9D00],
- ["BEA1",0x9D03],
- ["E8EF",0x9D04],
- ["E8EE",0x9D05],
- ["BE7D",0x9D06],
- ["E8E9",0x9D07],
- ["E8ED",0x9D08],
- ["BE7E",0x9D09],
- ["ECAC",0x9D10],
- ["C06F",0x9D12],
- ["ECA7",0x9D14],
- ["C06B",0x9D15],
- ["ECA4",0x9D17],
- ["ECAA",0x9D18],
- ["ECAD",0x9D19],
- ["C070",0x9D1B],
- ["ECA9",0x9D1D],
- ["ECA6",0x9D1E],
- ["ECAE",0x9D1F],
- ["ECA5",0x9D20],
- ["ECAB",0x9D22],
- ["C06C",0x9D23],
- ["ECA3",0x9D25],
- ["C06D",0x9D26],
- ["C06E",0x9D28],
- ["ECA8",0x9D29],
- ["EFA9",0x9D2D],
- ["EF7A",0x9D2E],
- ["EF7B",0x9D2F],
- ["EF7E",0x9D30],
- ["EF7C",0x9D31],
- ["EF76",0x9D33],
- ["EF79",0x9D36],
- ["EFA5",0x9D37],
- ["EF7D",0x9D38],
- ["C245",0x9D3B],
- ["EFA7",0x9D3D],
- ["EFA4",0x9D3E],
- ["C246",0x9D3F],
- ["EFA6",0x9D40],
- ["EF77",0x9D41],
- ["EFA2",0x9D42],
- ["EFA3",0x9D43],
- ["EFA1",0x9D45],
- ["F1D2",0x9D4A],
- ["F1D4",0x9D4B],
- ["F1D7",0x9D4C],
- ["F1D1",0x9D4F],
- ["C359",0x9D51],
- ["F1D9",0x9D52],
- ["F1D0",0x9D53],
- ["F1DA",0x9D54],
- ["F1D6",0x9D56],
- ["F1D8",0x9D57],
- ["F1DC",0x9D58],
- ["F1D5",0x9D59],
- ["F1DD",0x9D5A],
- ["F1D3",0x9D5B],
- ["F1CF",0x9D5C],
- ["C35A",0x9D5D],
- ["F1DB",0x9D5F],
- ["C35B",0x9D60],
- ["C44D",0x9D61],
- ["EF78",0x9D67],
- ["F3F1",0x9D68],
- ["F3E8",0x9D69],
- ["C44F",0x9D6A],
- ["F3E4",0x9D6B],
- ["C450",0x9D6C],
- ["F3ED",0x9D6F],
- ["F3E7",0x9D70],
- ["F3DD",0x9D71],
- ["C44E",0x9D72],
- ["F3EA",0x9D73],
- ["F3E5",0x9D74],
- ["F3E6",0x9D75],
- ["F3D8",0x9D77],
- ["F3DF",0x9D78],
- ["F3EE",0x9D79],
- ["F3EB",0x9D7B],
- ["F3E3",0x9D7D],
- ["F3EF",0x9D7F],
- ["F3DE",0x9D80],
- ["F3D9",0x9D81],
- ["F3EC",0x9D82],
- ["F3DB",0x9D84],
- ["F3E9",0x9D85],
- ["F3E0",0x9D86],
- ["F3F0",0x9D87],
- ["F3DC",0x9D88],
- ["C44C",0x9D89],
- ["F3DA",0x9D8A],
- ["F3E1",0x9D8B],
- ["F3E2",0x9D8C],
- ["F57D",0x9D90],
- ["F57B",0x9D92],
- ["F5A2",0x9D94],
- ["F5AE",0x9D96],
- ["F5A5",0x9D97],
- ["F57C",0x9D98],
- ["F578",0x9D99],
- ["F5A7",0x9D9A],
- ["F57E",0x9D9B],
- ["F5A3",0x9D9C],
- ["F57A",0x9D9D],
- ["F5AA",0x9D9E],
- ["F577",0x9D9F],
- ["F5A1",0x9DA0],
- ["F5A6",0x9DA1],
- ["F5A8",0x9DA2],
- ["F5AB",0x9DA3],
- ["F579",0x9DA4],
- ["F5AF",0x9DA6],
- ["F5B0",0x9DA7],
- ["F5A9",0x9DA8],
- ["F5AD",0x9DA9],
- ["F5A4",0x9DAA],
- ["F6C1",0x9DAC],
- ["F6C4",0x9DAD],
- ["C561",0x9DAF],
- ["F6C3",0x9DB1],
- ["F6C8",0x9DB2],
- ["F6C6",0x9DB3],
- ["C562",0x9DB4],
- ["F6BD",0x9DB5],
- ["F6B3",0x9DB6],
- ["F6B2",0x9DB7],
- ["C564",0x9DB8],
- ["F6BF",0x9DB9],
- ["F6C0",0x9DBA],
- ["F6BC",0x9DBB],
- ["F6B4",0x9DBC],
- ["F6B9",0x9DBE],
- ["F5AC",0x9DBF],
- ["F6B5",0x9DC1],
- ["C563",0x9DC2],
- ["F6BB",0x9DC3],
- ["F6BA",0x9DC5],
- ["F6B6",0x9DC7],
- ["F6C2",0x9DC8],
- ["F6B7",0x9DCA],
- ["F7BB",0x9DCB],
- ["F6C5",0x9DCC],
- ["F6C7",0x9DCD],
- ["F6BE",0x9DCE],
- ["F6B8",0x9DCF],
- ["F7BC",0x9DD0],
- ["F7BE",0x9DD1],
- ["F7B8",0x9DD2],
- ["C5C2",0x9DD3],
- ["F7C5",0x9DD5],
- ["F7C3",0x9DD6],
- ["C5C3",0x9DD7],
- ["F7C2",0x9DD8],
- ["F7C1",0x9DD9],
- ["F7BA",0x9DDA],
- ["F7B7",0x9DDB],
- ["F7BD",0x9DDC],
- ["F7C6",0x9DDD],
- ["F7B9",0x9DDE],
- ["F7BF",0x9DDF],
- ["F869",0x9DE1],
- ["F86E",0x9DE2],
- ["F864",0x9DE3],
- ["F867",0x9DE4],
- ["C5EE",0x9DE5],
- ["F86B",0x9DE6],
- ["F872",0x9DE8],
- ["F7C0",0x9DE9],
- ["F865",0x9DEB],
- ["F86F",0x9DEC],
- ["F873",0x9DED],
- ["F86A",0x9DEE],
- ["F863",0x9DEF],
- ["F86D",0x9DF0],
- ["F86C",0x9DF2],
- ["F871",0x9DF3],
- ["F870",0x9DF4],
- ["F7C4",0x9DF5],
- ["F868",0x9DF6],
- ["F862",0x9DF7],
- ["F866",0x9DF8],
- ["C64E",0x9DF9],
- ["C64F",0x9DFA],
- ["F861",0x9DFB],
- ["F8E6",0x9DFD],
- ["F8DD",0x9DFE],
- ["F8E5",0x9DFF],
- ["F8E2",0x9E00],
- ["F8E3",0x9E01],
- ["F8DC",0x9E02],
- ["F8DF",0x9E03],
- ["F8E7",0x9E04],
- ["F8E1",0x9E05],
- ["F8E0",0x9E06],
- ["F8DE",0x9E07],
- ["F8E4",0x9E09],
- ["F95D",0x9E0B],
- ["F95E",0x9E0D],
- ["F960",0x9E0F],
- ["F95F",0x9E10],
- ["F962",0x9E11],
- ["F961",0x9E12],
- ["F97C",0x9E13],
- ["F97B",0x9E14],
- ["F9B7",0x9E15],
- ["F9B8",0x9E17],
- ["F9C5",0x9E19],
- ["C678",0x9E1A],
- ["C67C",0x9E1B],
- ["F9CF",0x9E1D],
- ["C67D",0x9E1E],
- ["B3BF",0x9E75],
- ["C4D0",0x9E79],
- ["F6C9",0x9E7A],
- ["C650",0x9E7C],
- ["C651",0x9E7D],
- ["B3C0",0x9E7F],
- ["E0EE",0x9E80],
- ["B9A8",0x9E82],
- ["E8F0",0x9E83],
- ["ECB0",0x9E86],
- ["ECB1",0x9E87],
- ["ECAF",0x9E88],
- ["EFAB",0x9E89],
- ["EFAA",0x9E8A],
- ["C247",0x9E8B],
- ["F1DF",0x9E8C],
- ["EFAC",0x9E8D],
- ["F1DE",0x9E8E],
- ["F3F3",0x9E91],
- ["C451",0x9E92],
- ["C453",0x9E93],
- ["F3F2",0x9E94],
- ["C452",0x9E97],
- ["F5B1",0x9E99],
- ["F5B3",0x9E9A],
- ["F5B2",0x9E9B],
- ["F6CA",0x9E9C],
- ["C565",0x9E9D],
- ["C5EF",0x9E9F],
- ["F8E8",0x9EA0],
- ["F963",0x9EA1],
- ["F9D2",0x9EA4],
- ["B3C1",0x9EA5],
- ["E4E5",0x9EA7],
- ["BEA2",0x9EA9],
- ["ECB3",0x9EAD],
- ["ECB2",0x9EAE],
- ["EFAD",0x9EB0],
- ["C454",0x9EB4],
- ["C4D1",0x9EB5],
- ["F7C7",0x9EB6],
- ["F9CB",0x9EB7],
- ["B3C2",0x9EBB],
- ["BBF2",0x9EBC],
- ["BEA3",0x9EBE],
- ["F3F4",0x9EC0],
- ["F874",0x9EC2],
- ["B6C0",0x9EC3],
- ["EFAE",0x9EC8],
- ["C664",0x9ECC],
- ["B6C1",0x9ECD],
- ["BEA4",0x9ECE],
- ["C248",0x9ECF],
- ["F875",0x9ED0],
- ["B6C2",0x9ED1],
- ["E8F1",0x9ED3],
- ["C072",0x9ED4],
- ["ECB4",0x9ED5],
- ["ECB5",0x9ED6],
- ["C071",0x9ED8],
- ["EFAF",0x9EDA],
- ["C24C",0x9EDB],
- ["C24A",0x9EDC],
- ["C24B",0x9EDD],
- ["C249",0x9EDE],
- ["F1E0",0x9EDF],
- ["C35C",0x9EE0],
- ["F5B5",0x9EE4],
- ["F5B4",0x9EE5],
- ["F5B7",0x9EE6],
- ["F5B6",0x9EE7],
- ["C4D2",0x9EE8],
- ["F6CB",0x9EEB],
- ["F6CD",0x9EED],
- ["F6CC",0x9EEE],
- ["C566",0x9EEF],
- ["F7C8",0x9EF0],
- ["F876",0x9EF2],
- ["F877",0x9EF3],
- ["C5F0",0x9EF4],
- ["F964",0x9EF5],
- ["F97D",0x9EF6],
- ["C675",0x9EF7],
- ["DCB0",0x9EF9],
- ["ECB6",0x9EFA],
- ["EFB0",0x9EFB],
- ["F3F5",0x9EFC],
- ["E0EF",0x9EFD],
- ["EFB1",0x9EFF],
- ["F1E2",0x9F00],
- ["F1E1",0x9F01],
- ["F878",0x9F06],
- ["C652",0x9F07],
- ["F965",0x9F09],
- ["F97E",0x9F0A],
- ["B9A9",0x9F0E],
- ["E8F2",0x9F0F],
- ["E8F3",0x9F10],
- ["ECB7",0x9F12],
- ["B9AA",0x9F13],
- ["C35D",0x9F15],
- ["F1E3",0x9F16],
- ["F6CF",0x9F18],
- ["C567",0x9F19],
- ["F6D0",0x9F1A],
- ["F6CE",0x9F1B],
- ["F879",0x9F1C],
- ["F8E9",0x9F1E],
- ["B9AB",0x9F20],
- ["EFB4",0x9F22],
- ["EFB3",0x9F23],
- ["EFB2",0x9F24],
- ["F1E4",0x9F25],
- ["F1E8",0x9F28],
- ["F1E7",0x9F29],
- ["F1E6",0x9F2A],
- ["F1E5",0x9F2B],
- ["C35E",0x9F2C],
- ["F3F6",0x9F2D],
- ["F5B9",0x9F2E],
- ["C4D3",0x9F2F],
- ["F5B8",0x9F30],
- ["F6D1",0x9F31],
- ["F7CB",0x9F32],
- ["F7CA",0x9F33],
- ["C5C4",0x9F34],
- ["F7C9",0x9F35],
- ["F87C",0x9F36],
- ["F87B",0x9F37],
- ["F87A",0x9F38],
- ["BBF3",0x9F3B],
- ["ECB8",0x9F3D],
- ["C24D",0x9F3E],
- ["F3F7",0x9F40],
- ["F3F8",0x9F41],
- ["F7CC",0x9F42],
- ["F87D",0x9F43],
- ["F8EA",0x9F46],
- ["F966",0x9F47],
- ["F9B9",0x9F48],
- ["F9D4",0x9F49],
- ["BBF4",0x9F4A],
- ["C24E",0x9F4B],
- ["F1E9",0x9F4C],
- ["F3F9",0x9F4D],
- ["F6D2",0x9F4E],
- ["F87E",0x9F4F],
- ["BEA6",0x9F52],
- ["EFB5",0x9F54],
- ["F1EA",0x9F55],
- ["F3FA",0x9F56],
- ["F3FB",0x9F57],
- ["F3FC",0x9F58],
- ["F5BE",0x9F59],
- ["F5BA",0x9F5B],
- ["C568",0x9F5C],
- ["F5BD",0x9F5D],
- ["F5BC",0x9F5E],
- ["C4D4",0x9F5F],
- ["F5BB",0x9F60],
- ["C4D6",0x9F61],
- ["C4D5",0x9F63],
- ["F6D4",0x9F64],
- ["F6D3",0x9F65],
- ["C569",0x9F66],
- ["C56A",0x9F67],
- ["C5C6",0x9F6A],
- ["F7CD",0x9F6B],
- ["C5C5",0x9F6C],
- ["F8A3",0x9F6E],
- ["F8A4",0x9F6F],
- ["F8A2",0x9F70],
- ["F8A1",0x9F71],
- ["C654",0x9F72],
- ["F8EB",0x9F74],
- ["F8EC",0x9F75],
- ["F8ED",0x9F76],
- ["C653",0x9F77],
- ["F967",0x9F78],
- ["F96A",0x9F79],
- ["F969",0x9F7A],
- ["F968",0x9F7B],
- ["F9D3",0x9F7E],
- ["C073",0x9F8D],
- ["C365",0x9F90],
- ["F5BF",0x9F91],
- ["F6D5",0x9F92],
- ["C5C7",0x9F94],
- ["F7CE",0x9F95],
- ["F9D5",0x9F98],
- ["C074",0x9F9C],
- ["EFB6",0x9FA0],
- ["F7CF",0x9FA2],
- ["F9A1",0x9FA4],
- ["C94A",0xFA0C],
- ["DDFC",0xFA0D],
- ["A14A",0xFE30],
- ["A157",0xFE31],
- ["A159",0xFE33],
- ["A15B",0xFE34],
- ["A15F",0xFE35],
- ["A160",0xFE36],
- ["A163",0xFE37],
- ["A164",0xFE38],
- ["A167",0xFE39],
- ["A168",0xFE3A],
- ["A16B",0xFE3B],
- ["A16C",0xFE3C],
- ["A16F",0xFE3D],
- ["A170",0xFE3E],
- ["A173",0xFE3F],
- ["A174",0xFE40],
- ["A177",0xFE41],
- ["A178",0xFE42],
- ["A17B",0xFE43],
- ["A17C",0xFE44],
- ["A1C6",0xFE49],
- ["A1C7",0xFE4A],
- ["A1CA",0xFE4B],
- ["A1CB",0xFE4C],
- ["A1C8",0xFE4D],
- ["A1C9",0xFE4E],
- ["A15C",0xFE4F],
- ["A14D",0xFE50],
- ["A14F",0xFE52],
- ["A151",0xFE54],
- ["A152",0xFE55],
- ["A153",0xFE56],
- ["A154",0xFE57],
- ["A17D",0xFE59],
- ["A17E",0xFE5A],
- ["A1A1",0xFE5B],
- ["A1A2",0xFE5C],
- ["A1A3",0xFE5D],
- ["A1A4",0xFE5E],
- ["A1CC",0xFE5F],
- ["A1CD",0xFE60],
- ["A1CE",0xFE61],
- ["A1DE",0xFE62],
- ["A1DF",0xFE63],
- ["A1E0",0xFE64],
- ["A1E1",0xFE65],
- ["A1E2",0xFE66],
- ["A24C",0xFE69],
- ["A24D",0xFE6A],
- ["A24E",0xFE6B],
- ["A149",0xFF01],
- ["A1AD",0xFF03],
- ["A243",0xFF04],
- ["A248",0xFF05],
- ["A1AE",0xFF06],
- ["A15D",0xFF08],
- ["A15E",0xFF09],
- ["A1AF",0xFF0A],
- ["A1CF",0xFF0B],
- ["A141",0xFF0C],
- ["A1D0",0xFF0D],
- ["A144",0xFF0E],
- ["A241",0xFF0F],
- ["A2AF",0xFF10],
- ["A2B0",0xFF11],
- ["A2B1",0xFF12],
- ["A2B2",0xFF13],
- ["A2B3",0xFF14],
- ["A2B4",0xFF15],
- ["A2B5",0xFF16],
- ["A2B6",0xFF17],
- ["A2B7",0xFF18],
- ["A2B8",0xFF19],
- ["A147",0xFF1A],
- ["A146",0xFF1B],
- ["A1D5",0xFF1C],
- ["A1D7",0xFF1D],
- ["A1D6",0xFF1E],
- ["A148",0xFF1F],
- ["A249",0xFF20],
- ["A2CF",0xFF21],
- ["A2D0",0xFF22],
- ["A2D1",0xFF23],
- ["A2D2",0xFF24],
- ["A2D3",0xFF25],
- ["A2D4",0xFF26],
- ["A2D5",0xFF27],
- ["A2D6",0xFF28],
- ["A2D7",0xFF29],
- ["A2D8",0xFF2A],
- ["A2D9",0xFF2B],
- ["A2DA",0xFF2C],
- ["A2DB",0xFF2D],
- ["A2DC",0xFF2E],
- ["A2DD",0xFF2F],
- ["A2DE",0xFF30],
- ["A2DF",0xFF31],
- ["A2E0",0xFF32],
- ["A2E1",0xFF33],
- ["A2E2",0xFF34],
- ["A2E3",0xFF35],
- ["A2E4",0xFF36],
- ["A2E5",0xFF37],
- ["A2E6",0xFF38],
- ["A2E7",0xFF39],
- ["A2E8",0xFF3A],
- ["A242",0xFF3C],
- ["A1C4",0xFF3F],
- ["A2E9",0xFF41],
- ["A2EA",0xFF42],
- ["A2EB",0xFF43],
- ["A2EC",0xFF44],
- ["A2ED",0xFF45],
- ["A2EE",0xFF46],
- ["A2EF",0xFF47],
- ["A2F0",0xFF48],
- ["A2F1",0xFF49],
- ["A2F2",0xFF4A],
- ["A2F3",0xFF4B],
- ["A2F4",0xFF4C],
- ["A2F5",0xFF4D],
- ["A2F6",0xFF4E],
- ["A2F7",0xFF4F],
- ["A2F8",0xFF50],
- ["A2F9",0xFF51],
- ["A2FA",0xFF52],
- ["A2FB",0xFF53],
- ["A2FC",0xFF54],
- ["A2FD",0xFF55],
- ["A2FE",0xFF56],
- ["A340",0xFF57],
- ["A341",0xFF58],
- ["A342",0xFF59],
- ["A343",0xFF5A],
- ["A161",0xFF5B],
- ["A155",0xFF5C],
- ["A162",0xFF5D],
- ["A14E",0xFF64],
-] \ No newline at end of file
diff --git a/enc/trans/big5.trans b/enc/trans/big5.trans
deleted file mode 100644
index c91b821bba..0000000000
--- a/enc/trans/big5.trans
+++ /dev/null
@@ -1,20 +0,0 @@
-#include "transcode_data.h"
-
-<%
- require "big5-tbl"
- require "big5-hkscs-tbl"
-
- transcode_tblgen "Big5", "UTF-8", [["{00-7f}", :nomap], *BIG5_TO_UCS_TBL]
- transcode_tblgen "UTF-8", "Big5", [["{00-7f}", :nomap], *BIG5_TO_UCS_TBL.map {|a,b| [b,a] }]
-
- transcode_tblgen "Big5-HKSCS", "UTF-8", [["{00-7f}", :nomap], *BIG5_HKSCS_TO_UCS_TBL]
- transcode_tblgen "UTF-8", "Big5-HKSCS", [["{00-7f}", :nomap], *BIG5_HKSCS_TO_UCS_TBL.map {|a,b| [b,a] }]
-%>
-
-<%= transcode_generated_code %>
-
-void
-Init_big5(void)
-{
-<%= transcode_register_code %>
-} \ No newline at end of file
diff --git a/enc/trans/chinese.trans b/enc/trans/chinese.trans
deleted file mode 100644
index 1db6565254..0000000000
--- a/enc/trans/chinese.trans
+++ /dev/null
@@ -1,30 +0,0 @@
-#include "transcode_data.h"
-
-<%
- set_valid_byte_pattern 'GB2312', 'EUC-KR'
- set_valid_byte_pattern 'GB12345', 'EUC-KR'
-
- transcode_tblgen "GB2312", "UTF-8",
- [["{00-7f}", :nomap]] +
- citrus_decode_mapsrc("euc", 0x8080, "GB2312/UCS")
-
- transcode_tblgen "GB12345", "UTF-8",
- [["{00-7f}", :nomap]] +
- citrus_decode_mapsrc("euc", 0x8080, "GB12345/UCS")
-
- transcode_tblgen "UTF-8", "GB2312",
- [["{00-7f}", :nomap]] +
- citrus_decode_mapsrc("euc", 0x8080, "UCS/GB2312")
-
- transcode_tblgen "UTF-8", "GB12345",
- [["{00-7f}", :nomap]] +
- citrus_decode_mapsrc("euc", 0x8080, "UCS/GB12345")
-%>
-
-<%= transcode_generated_code %>
-
-void
-Init_chinese(void)
-{
-<%= transcode_register_code %>
-}
diff --git a/enc/trans/cp850-tbl.rb b/enc/trans/cp850-tbl.rb
deleted file mode 100644
index 615d3b2599..0000000000
--- a/enc/trans/cp850-tbl.rb
+++ /dev/null
@@ -1,130 +0,0 @@
-CP850_TO_UCS_TBL = [
- ["FF",0xA0],
- ["AD",0xA1],
- ["BD",0xA2],
- ["9C",0xA3],
- ["CF",0xA4],
- ["BE",0xA5],
- ["DD",0xA6],
- ["F5",0xA7],
- ["F9",0xA8],
- ["B8",0xA9],
- ["A6",0xAA],
- ["AE",0xAB],
- ["AA",0xAC],
- ["F0",0xAD],
- ["A9",0xAE],
- ["EE",0xAF],
- ["F8",0xB0],
- ["F1",0xB1],
- ["FD",0xB2],
- ["FC",0xB3],
- ["EF",0xB4],
- ["E6",0xB5],
- ["F4",0xB6],
- ["FA",0xB7],
- ["F7",0xB8],
- ["FB",0xB9],
- ["A7",0xBA],
- ["AF",0xBB],
- ["AC",0xBC],
- ["AB",0xBD],
- ["F3",0xBE],
- ["A8",0xBF],
- ["B7",0xC0],
- ["B5",0xC1],
- ["B6",0xC2],
- ["C7",0xC3],
- ["8E",0xC4],
- ["8F",0xC5],
- ["92",0xC6],
- ["80",0xC7],
- ["D4",0xC8],
- ["90",0xC9],
- ["D2",0xCA],
- ["D3",0xCB],
- ["DE",0xCC],
- ["D6",0xCD],
- ["D7",0xCE],
- ["D8",0xCF],
- ["D1",0xD0],
- ["A5",0xD1],
- ["E3",0xD2],
- ["E0",0xD3],
- ["E2",0xD4],
- ["E5",0xD5],
- ["99",0xD6],
- ["9E",0xD7],
- ["9D",0xD8],
- ["EB",0xD9],
- ["E9",0xDA],
- ["EA",0xDB],
- ["9A",0xDC],
- ["ED",0xDD],
- ["E8",0xDE],
- ["E1",0xDF],
- ["85",0xE0],
- ["A0",0xE1],
- ["83",0xE2],
- ["C6",0xE3],
- ["84",0xE4],
- ["86",0xE5],
- ["91",0xE6],
- ["87",0xE7],
- ["8A",0xE8],
- ["82",0xE9],
- ["88",0xEA],
- ["89",0xEB],
- ["8D",0xEC],
- ["A1",0xED],
- ["8C",0xEE],
- ["8B",0xEF],
- ["D0",0xF0],
- ["A4",0xF1],
- ["95",0xF2],
- ["A2",0xF3],
- ["93",0xF4],
- ["E4",0xF5],
- ["94",0xF6],
- ["F6",0xF7],
- ["9B",0xF8],
- ["97",0xF9],
- ["A3",0xFA],
- ["96",0xFB],
- ["81",0xFC],
- ["EC",0xFD],
- ["E7",0xFE],
- ["98",0xFF],
- ["D5",0x131],
- ["9F",0x192],
- ["F2",0x2017],
- ["C4",0x2500],
- ["B3",0x2502],
- ["DA",0x250C],
- ["BF",0x2510],
- ["C0",0x2514],
- ["D9",0x2518],
- ["C3",0x251C],
- ["B4",0x2524],
- ["C2",0x252C],
- ["C1",0x2534],
- ["C5",0x253C],
- ["CD",0x2550],
- ["BA",0x2551],
- ["C9",0x2554],
- ["BB",0x2557],
- ["C8",0x255A],
- ["BC",0x255D],
- ["CC",0x2560],
- ["B9",0x2563],
- ["CB",0x2566],
- ["CA",0x2569],
- ["CE",0x256C],
- ["DF",0x2580],
- ["DC",0x2584],
- ["DB",0x2588],
- ["B0",0x2591],
- ["B1",0x2592],
- ["B2",0x2593],
- ["FE",0x25A0],
-] \ No newline at end of file
diff --git a/enc/trans/cp852-tbl.rb b/enc/trans/cp852-tbl.rb
deleted file mode 100644
index 6763bfa6e9..0000000000
--- a/enc/trans/cp852-tbl.rb
+++ /dev/null
@@ -1,130 +0,0 @@
-CP852_TO_UCS_TBL = [
- ["FF",0xA0],
- ["CF",0xA4],
- ["F5",0xA7],
- ["F9",0xA8],
- ["AE",0xAB],
- ["AA",0xAC],
- ["F0",0xAD],
- ["F8",0xB0],
- ["EF",0xB4],
- ["F7",0xB8],
- ["AF",0xBB],
- ["B5",0xC1],
- ["B6",0xC2],
- ["8E",0xC4],
- ["80",0xC7],
- ["90",0xC9],
- ["D3",0xCB],
- ["D6",0xCD],
- ["D7",0xCE],
- ["E0",0xD3],
- ["E2",0xD4],
- ["99",0xD6],
- ["9E",0xD7],
- ["E9",0xDA],
- ["9A",0xDC],
- ["ED",0xDD],
- ["E1",0xDF],
- ["A0",0xE1],
- ["83",0xE2],
- ["84",0xE4],
- ["87",0xE7],
- ["82",0xE9],
- ["89",0xEB],
- ["A1",0xED],
- ["8C",0xEE],
- ["A2",0xF3],
- ["93",0xF4],
- ["94",0xF6],
- ["F6",0xF7],
- ["A3",0xFA],
- ["81",0xFC],
- ["EC",0xFD],
- ["C6",0x102],
- ["C7",0x103],
- ["A4",0x104],
- ["A5",0x105],
- ["8F",0x106],
- ["86",0x107],
- ["AC",0x10C],
- ["9F",0x10D],
- ["D2",0x10E],
- ["D4",0x10F],
- ["D1",0x110],
- ["D0",0x111],
- ["A8",0x118],
- ["A9",0x119],
- ["B7",0x11A],
- ["D8",0x11B],
- ["91",0x139],
- ["92",0x13A],
- ["95",0x13D],
- ["96",0x13E],
- ["9D",0x141],
- ["88",0x142],
- ["E3",0x143],
- ["E4",0x144],
- ["D5",0x147],
- ["E5",0x148],
- ["8A",0x150],
- ["8B",0x151],
- ["E8",0x154],
- ["EA",0x155],
- ["FC",0x158],
- ["FD",0x159],
- ["97",0x15A],
- ["98",0x15B],
- ["B8",0x15E],
- ["AD",0x15F],
- ["E6",0x160],
- ["E7",0x161],
- ["DD",0x162],
- ["EE",0x163],
- ["9B",0x164],
- ["9C",0x165],
- ["DE",0x16E],
- ["85",0x16F],
- ["EB",0x170],
- ["FB",0x171],
- ["8D",0x179],
- ["AB",0x17A],
- ["BD",0x17B],
- ["BE",0x17C],
- ["A6",0x17D],
- ["A7",0x17E],
- ["F3",0x2C7],
- ["F4",0x2D8],
- ["FA",0x2D9],
- ["F2",0x2DB],
- ["F1",0x2DD],
- ["C4",0x2500],
- ["B3",0x2502],
- ["DA",0x250C],
- ["BF",0x2510],
- ["C0",0x2514],
- ["D9",0x2518],
- ["C3",0x251C],
- ["B4",0x2524],
- ["C2",0x252C],
- ["C1",0x2534],
- ["C5",0x253C],
- ["CD",0x2550],
- ["BA",0x2551],
- ["C9",0x2554],
- ["BB",0x2557],
- ["C8",0x255A],
- ["BC",0x255D],
- ["CC",0x2560],
- ["B9",0x2563],
- ["CB",0x2566],
- ["CA",0x2569],
- ["CE",0x256C],
- ["DF",0x2580],
- ["DC",0x2584],
- ["DB",0x2588],
- ["B0",0x2591],
- ["B1",0x2592],
- ["B2",0x2593],
- ["FE",0x25A0],
-] \ No newline at end of file
diff --git a/enc/trans/cp855-tbl.rb b/enc/trans/cp855-tbl.rb
deleted file mode 100644
index 72e548b9cb..0000000000
--- a/enc/trans/cp855-tbl.rb
+++ /dev/null
@@ -1,130 +0,0 @@
-CP855_TO_UCS_TBL = [
- ["FF",0xA0],
- ["CF",0xA4],
- ["FD",0xA7],
- ["AE",0xAB],
- ["F0",0xAD],
- ["AF",0xBB],
- ["85",0x401],
- ["81",0x402],
- ["83",0x403],
- ["87",0x404],
- ["89",0x405],
- ["8B",0x406],
- ["8D",0x407],
- ["8F",0x408],
- ["91",0x409],
- ["93",0x40A],
- ["95",0x40B],
- ["97",0x40C],
- ["99",0x40E],
- ["9B",0x40F],
- ["A1",0x410],
- ["A3",0x411],
- ["EC",0x412],
- ["AD",0x413],
- ["A7",0x414],
- ["A9",0x415],
- ["EA",0x416],
- ["F4",0x417],
- ["B8",0x418],
- ["BE",0x419],
- ["C7",0x41A],
- ["D1",0x41B],
- ["D3",0x41C],
- ["D5",0x41D],
- ["D7",0x41E],
- ["DD",0x41F],
- ["E2",0x420],
- ["E4",0x421],
- ["E6",0x422],
- ["E8",0x423],
- ["AB",0x424],
- ["B6",0x425],
- ["A5",0x426],
- ["FC",0x427],
- ["F6",0x428],
- ["FA",0x429],
- ["9F",0x42A],
- ["F2",0x42B],
- ["EE",0x42C],
- ["F8",0x42D],
- ["9D",0x42E],
- ["E0",0x42F],
- ["A0",0x430],
- ["A2",0x431],
- ["EB",0x432],
- ["AC",0x433],
- ["A6",0x434],
- ["A8",0x435],
- ["E9",0x436],
- ["F3",0x437],
- ["B7",0x438],
- ["BD",0x439],
- ["C6",0x43A],
- ["D0",0x43B],
- ["D2",0x43C],
- ["D4",0x43D],
- ["D6",0x43E],
- ["D8",0x43F],
- ["E1",0x440],
- ["E3",0x441],
- ["E5",0x442],
- ["E7",0x443],
- ["AA",0x444],
- ["B5",0x445],
- ["A4",0x446],
- ["FB",0x447],
- ["F5",0x448],
- ["F9",0x449],
- ["9E",0x44A],
- ["F1",0x44B],
- ["ED",0x44C],
- ["F7",0x44D],
- ["9C",0x44E],
- ["DE",0x44F],
- ["84",0x451],
- ["80",0x452],
- ["82",0x453],
- ["86",0x454],
- ["88",0x455],
- ["8A",0x456],
- ["8C",0x457],
- ["8E",0x458],
- ["90",0x459],
- ["92",0x45A],
- ["94",0x45B],
- ["96",0x45C],
- ["98",0x45E],
- ["9A",0x45F],
- ["EF",0x2116],
- ["C4",0x2500],
- ["B3",0x2502],
- ["DA",0x250C],
- ["BF",0x2510],
- ["C0",0x2514],
- ["D9",0x2518],
- ["C3",0x251C],
- ["B4",0x2524],
- ["C2",0x252C],
- ["C1",0x2534],
- ["C5",0x253C],
- ["CD",0x2550],
- ["BA",0x2551],
- ["C9",0x2554],
- ["BB",0x2557],
- ["C8",0x255A],
- ["BC",0x255D],
- ["CC",0x2560],
- ["B9",0x2563],
- ["CB",0x2566],
- ["CA",0x2569],
- ["CE",0x256C],
- ["DF",0x2580],
- ["DC",0x2584],
- ["DB",0x2588],
- ["B0",0x2591],
- ["B1",0x2592],
- ["B2",0x2593],
- ["FE",0x25A0],
-] \ No newline at end of file
diff --git a/enc/trans/cp949-tbl.rb b/enc/trans/cp949-tbl.rb
deleted file mode 100644
index 0e47353850..0000000000
--- a/enc/trans/cp949-tbl.rb
+++ /dev/null
@@ -1,8831 +0,0 @@
-require 'euckr-tbl'
-
-CP949_TO_UCS_ADDITIONAL_TBL = [
- ["8141",0xAC02],
- ["8142",0xAC03],
- ["8143",0xAC05],
- ["8144",0xAC06],
- ["8145",0xAC0B],
- ["8146",0xAC0C],
- ["8147",0xAC0D],
- ["8148",0xAC0E],
- ["8149",0xAC0F],
- ["814A",0xAC18],
- ["814B",0xAC1E],
- ["814C",0xAC1F],
- ["814D",0xAC21],
- ["814E",0xAC22],
- ["814F",0xAC23],
- ["8150",0xAC25],
- ["8151",0xAC26],
- ["8152",0xAC27],
- ["8153",0xAC28],
- ["8154",0xAC29],
- ["8155",0xAC2A],
- ["8156",0xAC2B],
- ["8157",0xAC2E],
- ["8158",0xAC32],
- ["8159",0xAC33],
- ["815A",0xAC34],
- ["8161",0xAC35],
- ["8162",0xAC36],
- ["8163",0xAC37],
- ["8164",0xAC3A],
- ["8165",0xAC3B],
- ["8166",0xAC3D],
- ["8167",0xAC3E],
- ["8168",0xAC3F],
- ["8169",0xAC41],
- ["816A",0xAC42],
- ["816B",0xAC43],
- ["816C",0xAC44],
- ["816D",0xAC45],
- ["816E",0xAC46],
- ["816F",0xAC47],
- ["8170",0xAC48],
- ["8171",0xAC49],
- ["8172",0xAC4A],
- ["8173",0xAC4C],
- ["8174",0xAC4E],
- ["8175",0xAC4F],
- ["8176",0xAC50],
- ["8177",0xAC51],
- ["8178",0xAC52],
- ["8179",0xAC53],
- ["817A",0xAC55],
- ["8181",0xAC56],
- ["8182",0xAC57],
- ["8183",0xAC59],
- ["8184",0xAC5A],
- ["8185",0xAC5B],
- ["8186",0xAC5D],
- ["8187",0xAC5E],
- ["8188",0xAC5F],
- ["8189",0xAC60],
- ["818A",0xAC61],
- ["818B",0xAC62],
- ["818C",0xAC63],
- ["818D",0xAC64],
- ["818E",0xAC65],
- ["818F",0xAC66],
- ["8190",0xAC67],
- ["8191",0xAC68],
- ["8192",0xAC69],
- ["8193",0xAC6A],
- ["8194",0xAC6B],
- ["8195",0xAC6C],
- ["8196",0xAC6D],
- ["8197",0xAC6E],
- ["8198",0xAC6F],
- ["8199",0xAC72],
- ["819A",0xAC73],
- ["819B",0xAC75],
- ["819C",0xAC76],
- ["819D",0xAC79],
- ["819E",0xAC7B],
- ["819F",0xAC7C],
- ["81A0",0xAC7D],
- ["81A1",0xAC7E],
- ["81A2",0xAC7F],
- ["81A3",0xAC82],
- ["81A4",0xAC87],
- ["81A5",0xAC88],
- ["81A6",0xAC8D],
- ["81A7",0xAC8E],
- ["81A8",0xAC8F],
- ["81A9",0xAC91],
- ["81AA",0xAC92],
- ["81AB",0xAC93],
- ["81AC",0xAC95],
- ["81AD",0xAC96],
- ["81AE",0xAC97],
- ["81AF",0xAC98],
- ["81B0",0xAC99],
- ["81B1",0xAC9A],
- ["81B2",0xAC9B],
- ["81B3",0xAC9E],
- ["81B4",0xACA2],
- ["81B5",0xACA3],
- ["81B6",0xACA4],
- ["81B7",0xACA5],
- ["81B8",0xACA6],
- ["81B9",0xACA7],
- ["81BA",0xACAB],
- ["81BB",0xACAD],
- ["81BC",0xACAE],
- ["81BD",0xACB1],
- ["81BE",0xACB2],
- ["81BF",0xACB3],
- ["81C0",0xACB4],
- ["81C1",0xACB5],
- ["81C2",0xACB6],
- ["81C3",0xACB7],
- ["81C4",0xACBA],
- ["81C5",0xACBE],
- ["81C6",0xACBF],
- ["81C7",0xACC0],
- ["81C8",0xACC2],
- ["81C9",0xACC3],
- ["81CA",0xACC5],
- ["81CB",0xACC6],
- ["81CC",0xACC7],
- ["81CD",0xACC9],
- ["81CE",0xACCA],
- ["81CF",0xACCB],
- ["81D0",0xACCD],
- ["81D1",0xACCE],
- ["81D2",0xACCF],
- ["81D3",0xACD0],
- ["81D4",0xACD1],
- ["81D5",0xACD2],
- ["81D6",0xACD3],
- ["81D7",0xACD4],
- ["81D8",0xACD6],
- ["81D9",0xACD8],
- ["81DA",0xACD9],
- ["81DB",0xACDA],
- ["81DC",0xACDB],
- ["81DD",0xACDC],
- ["81DE",0xACDD],
- ["81DF",0xACDE],
- ["81E0",0xACDF],
- ["81E1",0xACE2],
- ["81E2",0xACE3],
- ["81E3",0xACE5],
- ["81E4",0xACE6],
- ["81E5",0xACE9],
- ["81E6",0xACEB],
- ["81E7",0xACED],
- ["81E8",0xACEE],
- ["81E9",0xACF2],
- ["81EA",0xACF4],
- ["81EB",0xACF7],
- ["81EC",0xACF8],
- ["81ED",0xACF9],
- ["81EE",0xACFA],
- ["81EF",0xACFB],
- ["81F0",0xACFE],
- ["81F1",0xACFF],
- ["81F2",0xAD01],
- ["81F3",0xAD02],
- ["81F4",0xAD03],
- ["81F5",0xAD05],
- ["81F6",0xAD07],
- ["81F7",0xAD08],
- ["81F8",0xAD09],
- ["81F9",0xAD0A],
- ["81FA",0xAD0B],
- ["81FB",0xAD0E],
- ["81FC",0xAD10],
- ["81FD",0xAD12],
- ["81FE",0xAD13],
- ["8241",0xAD14],
- ["8242",0xAD15],
- ["8243",0xAD16],
- ["8244",0xAD17],
- ["8245",0xAD19],
- ["8246",0xAD1A],
- ["8247",0xAD1B],
- ["8248",0xAD1D],
- ["8249",0xAD1E],
- ["824A",0xAD1F],
- ["824B",0xAD21],
- ["824C",0xAD22],
- ["824D",0xAD23],
- ["824E",0xAD24],
- ["824F",0xAD25],
- ["8250",0xAD26],
- ["8251",0xAD27],
- ["8252",0xAD28],
- ["8253",0xAD2A],
- ["8254",0xAD2B],
- ["8255",0xAD2E],
- ["8256",0xAD2F],
- ["8257",0xAD30],
- ["8258",0xAD31],
- ["8259",0xAD32],
- ["825A",0xAD33],
- ["8261",0xAD36],
- ["8262",0xAD37],
- ["8263",0xAD39],
- ["8264",0xAD3A],
- ["8265",0xAD3B],
- ["8266",0xAD3D],
- ["8267",0xAD3E],
- ["8268",0xAD3F],
- ["8269",0xAD40],
- ["826A",0xAD41],
- ["826B",0xAD42],
- ["826C",0xAD43],
- ["826D",0xAD46],
- ["826E",0xAD48],
- ["826F",0xAD4A],
- ["8270",0xAD4B],
- ["8271",0xAD4C],
- ["8272",0xAD4D],
- ["8273",0xAD4E],
- ["8274",0xAD4F],
- ["8275",0xAD51],
- ["8276",0xAD52],
- ["8277",0xAD53],
- ["8278",0xAD55],
- ["8279",0xAD56],
- ["827A",0xAD57],
- ["8281",0xAD59],
- ["8282",0xAD5A],
- ["8283",0xAD5B],
- ["8284",0xAD5C],
- ["8285",0xAD5D],
- ["8286",0xAD5E],
- ["8287",0xAD5F],
- ["8288",0xAD60],
- ["8289",0xAD62],
- ["828A",0xAD64],
- ["828B",0xAD65],
- ["828C",0xAD66],
- ["828D",0xAD67],
- ["828E",0xAD68],
- ["828F",0xAD69],
- ["8290",0xAD6A],
- ["8291",0xAD6B],
- ["8292",0xAD6E],
- ["8293",0xAD6F],
- ["8294",0xAD71],
- ["8295",0xAD72],
- ["8296",0xAD77],
- ["8297",0xAD78],
- ["8298",0xAD79],
- ["8299",0xAD7A],
- ["829A",0xAD7E],
- ["829B",0xAD80],
- ["829C",0xAD83],
- ["829D",0xAD84],
- ["829E",0xAD85],
- ["829F",0xAD86],
- ["82A0",0xAD87],
- ["82A1",0xAD8A],
- ["82A2",0xAD8B],
- ["82A3",0xAD8D],
- ["82A4",0xAD8E],
- ["82A5",0xAD8F],
- ["82A6",0xAD91],
- ["82A7",0xAD92],
- ["82A8",0xAD93],
- ["82A9",0xAD94],
- ["82AA",0xAD95],
- ["82AB",0xAD96],
- ["82AC",0xAD97],
- ["82AD",0xAD98],
- ["82AE",0xAD99],
- ["82AF",0xAD9A],
- ["82B0",0xAD9B],
- ["82B1",0xAD9E],
- ["82B2",0xAD9F],
- ["82B3",0xADA0],
- ["82B4",0xADA1],
- ["82B5",0xADA2],
- ["82B6",0xADA3],
- ["82B7",0xADA5],
- ["82B8",0xADA6],
- ["82B9",0xADA7],
- ["82BA",0xADA8],
- ["82BB",0xADA9],
- ["82BC",0xADAA],
- ["82BD",0xADAB],
- ["82BE",0xADAC],
- ["82BF",0xADAD],
- ["82C0",0xADAE],
- ["82C1",0xADAF],
- ["82C2",0xADB0],
- ["82C3",0xADB1],
- ["82C4",0xADB2],
- ["82C5",0xADB3],
- ["82C6",0xADB4],
- ["82C7",0xADB5],
- ["82C8",0xADB6],
- ["82C9",0xADB8],
- ["82CA",0xADB9],
- ["82CB",0xADBA],
- ["82CC",0xADBB],
- ["82CD",0xADBC],
- ["82CE",0xADBD],
- ["82CF",0xADBE],
- ["82D0",0xADBF],
- ["82D1",0xADC2],
- ["82D2",0xADC3],
- ["82D3",0xADC5],
- ["82D4",0xADC6],
- ["82D5",0xADC7],
- ["82D6",0xADC9],
- ["82D7",0xADCA],
- ["82D8",0xADCB],
- ["82D9",0xADCC],
- ["82DA",0xADCD],
- ["82DB",0xADCE],
- ["82DC",0xADCF],
- ["82DD",0xADD2],
- ["82DE",0xADD4],
- ["82DF",0xADD5],
- ["82E0",0xADD6],
- ["82E1",0xADD7],
- ["82E2",0xADD8],
- ["82E3",0xADD9],
- ["82E4",0xADDA],
- ["82E5",0xADDB],
- ["82E6",0xADDD],
- ["82E7",0xADDE],
- ["82E8",0xADDF],
- ["82E9",0xADE1],
- ["82EA",0xADE2],
- ["82EB",0xADE3],
- ["82EC",0xADE5],
- ["82ED",0xADE6],
- ["82EE",0xADE7],
- ["82EF",0xADE8],
- ["82F0",0xADE9],
- ["82F1",0xADEA],
- ["82F2",0xADEB],
- ["82F3",0xADEC],
- ["82F4",0xADED],
- ["82F5",0xADEE],
- ["82F6",0xADEF],
- ["82F7",0xADF0],
- ["82F8",0xADF1],
- ["82F9",0xADF2],
- ["82FA",0xADF3],
- ["82FB",0xADF4],
- ["82FC",0xADF5],
- ["82FD",0xADF6],
- ["82FE",0xADF7],
- ["8341",0xADFA],
- ["8342",0xADFB],
- ["8343",0xADFD],
- ["8344",0xADFE],
- ["8345",0xAE02],
- ["8346",0xAE03],
- ["8347",0xAE04],
- ["8348",0xAE05],
- ["8349",0xAE06],
- ["834A",0xAE07],
- ["834B",0xAE0A],
- ["834C",0xAE0C],
- ["834D",0xAE0E],
- ["834E",0xAE0F],
- ["834F",0xAE10],
- ["8350",0xAE11],
- ["8351",0xAE12],
- ["8352",0xAE13],
- ["8353",0xAE15],
- ["8354",0xAE16],
- ["8355",0xAE17],
- ["8356",0xAE18],
- ["8357",0xAE19],
- ["8358",0xAE1A],
- ["8359",0xAE1B],
- ["835A",0xAE1C],
- ["8361",0xAE1D],
- ["8362",0xAE1E],
- ["8363",0xAE1F],
- ["8364",0xAE20],
- ["8365",0xAE21],
- ["8366",0xAE22],
- ["8367",0xAE23],
- ["8368",0xAE24],
- ["8369",0xAE25],
- ["836A",0xAE26],
- ["836B",0xAE27],
- ["836C",0xAE28],
- ["836D",0xAE29],
- ["836E",0xAE2A],
- ["836F",0xAE2B],
- ["8370",0xAE2C],
- ["8371",0xAE2D],
- ["8372",0xAE2E],
- ["8373",0xAE2F],
- ["8374",0xAE32],
- ["8375",0xAE33],
- ["8376",0xAE35],
- ["8377",0xAE36],
- ["8378",0xAE39],
- ["8379",0xAE3B],
- ["837A",0xAE3C],
- ["8381",0xAE3D],
- ["8382",0xAE3E],
- ["8383",0xAE3F],
- ["8384",0xAE42],
- ["8385",0xAE44],
- ["8386",0xAE47],
- ["8387",0xAE48],
- ["8388",0xAE49],
- ["8389",0xAE4B],
- ["838A",0xAE4F],
- ["838B",0xAE51],
- ["838C",0xAE52],
- ["838D",0xAE53],
- ["838E",0xAE55],
- ["838F",0xAE57],
- ["8390",0xAE58],
- ["8391",0xAE59],
- ["8392",0xAE5A],
- ["8393",0xAE5B],
- ["8394",0xAE5E],
- ["8395",0xAE62],
- ["8396",0xAE63],
- ["8397",0xAE64],
- ["8398",0xAE66],
- ["8399",0xAE67],
- ["839A",0xAE6A],
- ["839B",0xAE6B],
- ["839C",0xAE6D],
- ["839D",0xAE6E],
- ["839E",0xAE6F],
- ["839F",0xAE71],
- ["83A0",0xAE72],
- ["83A1",0xAE73],
- ["83A2",0xAE74],
- ["83A3",0xAE75],
- ["83A4",0xAE76],
- ["83A5",0xAE77],
- ["83A6",0xAE7A],
- ["83A7",0xAE7E],
- ["83A8",0xAE7F],
- ["83A9",0xAE80],
- ["83AA",0xAE81],
- ["83AB",0xAE82],
- ["83AC",0xAE83],
- ["83AD",0xAE86],
- ["83AE",0xAE87],
- ["83AF",0xAE88],
- ["83B0",0xAE89],
- ["83B1",0xAE8A],
- ["83B2",0xAE8B],
- ["83B3",0xAE8D],
- ["83B4",0xAE8E],
- ["83B5",0xAE8F],
- ["83B6",0xAE90],
- ["83B7",0xAE91],
- ["83B8",0xAE92],
- ["83B9",0xAE93],
- ["83BA",0xAE94],
- ["83BB",0xAE95],
- ["83BC",0xAE96],
- ["83BD",0xAE97],
- ["83BE",0xAE98],
- ["83BF",0xAE99],
- ["83C0",0xAE9A],
- ["83C1",0xAE9B],
- ["83C2",0xAE9C],
- ["83C3",0xAE9D],
- ["83C4",0xAE9E],
- ["83C5",0xAE9F],
- ["83C6",0xAEA0],
- ["83C7",0xAEA1],
- ["83C8",0xAEA2],
- ["83C9",0xAEA3],
- ["83CA",0xAEA4],
- ["83CB",0xAEA5],
- ["83CC",0xAEA6],
- ["83CD",0xAEA7],
- ["83CE",0xAEA8],
- ["83CF",0xAEA9],
- ["83D0",0xAEAA],
- ["83D1",0xAEAB],
- ["83D2",0xAEAC],
- ["83D3",0xAEAD],
- ["83D4",0xAEAE],
- ["83D5",0xAEAF],
- ["83D6",0xAEB0],
- ["83D7",0xAEB1],
- ["83D8",0xAEB2],
- ["83D9",0xAEB3],
- ["83DA",0xAEB4],
- ["83DB",0xAEB5],
- ["83DC",0xAEB6],
- ["83DD",0xAEB7],
- ["83DE",0xAEB8],
- ["83DF",0xAEB9],
- ["83E0",0xAEBA],
- ["83E1",0xAEBB],
- ["83E2",0xAEBF],
- ["83E3",0xAEC1],
- ["83E4",0xAEC2],
- ["83E5",0xAEC3],
- ["83E6",0xAEC5],
- ["83E7",0xAEC6],
- ["83E8",0xAEC7],
- ["83E9",0xAEC8],
- ["83EA",0xAEC9],
- ["83EB",0xAECA],
- ["83EC",0xAECB],
- ["83ED",0xAECE],
- ["83EE",0xAED2],
- ["83EF",0xAED3],
- ["83F0",0xAED4],
- ["83F1",0xAED5],
- ["83F2",0xAED6],
- ["83F3",0xAED7],
- ["83F4",0xAEDA],
- ["83F5",0xAEDB],
- ["83F6",0xAEDD],
- ["83F7",0xAEDE],
- ["83F8",0xAEDF],
- ["83F9",0xAEE0],
- ["83FA",0xAEE1],
- ["83FB",0xAEE2],
- ["83FC",0xAEE3],
- ["83FD",0xAEE4],
- ["83FE",0xAEE5],
- ["8441",0xAEE6],
- ["8442",0xAEE7],
- ["8443",0xAEE9],
- ["8444",0xAEEA],
- ["8445",0xAEEC],
- ["8446",0xAEEE],
- ["8447",0xAEEF],
- ["8448",0xAEF0],
- ["8449",0xAEF1],
- ["844A",0xAEF2],
- ["844B",0xAEF3],
- ["844C",0xAEF5],
- ["844D",0xAEF6],
- ["844E",0xAEF7],
- ["844F",0xAEF9],
- ["8450",0xAEFA],
- ["8451",0xAEFB],
- ["8452",0xAEFD],
- ["8453",0xAEFE],
- ["8454",0xAEFF],
- ["8455",0xAF00],
- ["8456",0xAF01],
- ["8457",0xAF02],
- ["8458",0xAF03],
- ["8459",0xAF04],
- ["845A",0xAF05],
- ["8461",0xAF06],
- ["8462",0xAF09],
- ["8463",0xAF0A],
- ["8464",0xAF0B],
- ["8465",0xAF0C],
- ["8466",0xAF0E],
- ["8467",0xAF0F],
- ["8468",0xAF11],
- ["8469",0xAF12],
- ["846A",0xAF13],
- ["846B",0xAF14],
- ["846C",0xAF15],
- ["846D",0xAF16],
- ["846E",0xAF17],
- ["846F",0xAF18],
- ["8470",0xAF19],
- ["8471",0xAF1A],
- ["8472",0xAF1B],
- ["8473",0xAF1C],
- ["8474",0xAF1D],
- ["8475",0xAF1E],
- ["8476",0xAF1F],
- ["8477",0xAF20],
- ["8478",0xAF21],
- ["8479",0xAF22],
- ["847A",0xAF23],
- ["8481",0xAF24],
- ["8482",0xAF25],
- ["8483",0xAF26],
- ["8484",0xAF27],
- ["8485",0xAF28],
- ["8486",0xAF29],
- ["8487",0xAF2A],
- ["8488",0xAF2B],
- ["8489",0xAF2E],
- ["848A",0xAF2F],
- ["848B",0xAF31],
- ["848C",0xAF33],
- ["848D",0xAF35],
- ["848E",0xAF36],
- ["848F",0xAF37],
- ["8490",0xAF38],
- ["8491",0xAF39],
- ["8492",0xAF3A],
- ["8493",0xAF3B],
- ["8494",0xAF3E],
- ["8495",0xAF40],
- ["8496",0xAF44],
- ["8497",0xAF45],
- ["8498",0xAF46],
- ["8499",0xAF47],
- ["849A",0xAF4A],
- ["849B",0xAF4B],
- ["849C",0xAF4C],
- ["849D",0xAF4D],
- ["849E",0xAF4E],
- ["849F",0xAF4F],
- ["84A0",0xAF51],
- ["84A1",0xAF52],
- ["84A2",0xAF53],
- ["84A3",0xAF54],
- ["84A4",0xAF55],
- ["84A5",0xAF56],
- ["84A6",0xAF57],
- ["84A7",0xAF58],
- ["84A8",0xAF59],
- ["84A9",0xAF5A],
- ["84AA",0xAF5B],
- ["84AB",0xAF5E],
- ["84AC",0xAF5F],
- ["84AD",0xAF60],
- ["84AE",0xAF61],
- ["84AF",0xAF62],
- ["84B0",0xAF63],
- ["84B1",0xAF66],
- ["84B2",0xAF67],
- ["84B3",0xAF68],
- ["84B4",0xAF69],
- ["84B5",0xAF6A],
- ["84B6",0xAF6B],
- ["84B7",0xAF6C],
- ["84B8",0xAF6D],
- ["84B9",0xAF6E],
- ["84BA",0xAF6F],
- ["84BB",0xAF70],
- ["84BC",0xAF71],
- ["84BD",0xAF72],
- ["84BE",0xAF73],
- ["84BF",0xAF74],
- ["84C0",0xAF75],
- ["84C1",0xAF76],
- ["84C2",0xAF77],
- ["84C3",0xAF78],
- ["84C4",0xAF7A],
- ["84C5",0xAF7B],
- ["84C6",0xAF7C],
- ["84C7",0xAF7D],
- ["84C8",0xAF7E],
- ["84C9",0xAF7F],
- ["84CA",0xAF81],
- ["84CB",0xAF82],
- ["84CC",0xAF83],
- ["84CD",0xAF85],
- ["84CE",0xAF86],
- ["84CF",0xAF87],
- ["84D0",0xAF89],
- ["84D1",0xAF8A],
- ["84D2",0xAF8B],
- ["84D3",0xAF8C],
- ["84D4",0xAF8D],
- ["84D5",0xAF8E],
- ["84D6",0xAF8F],
- ["84D7",0xAF92],
- ["84D8",0xAF93],
- ["84D9",0xAF94],
- ["84DA",0xAF96],
- ["84DB",0xAF97],
- ["84DC",0xAF98],
- ["84DD",0xAF99],
- ["84DE",0xAF9A],
- ["84DF",0xAF9B],
- ["84E0",0xAF9D],
- ["84E1",0xAF9E],
- ["84E2",0xAF9F],
- ["84E3",0xAFA0],
- ["84E4",0xAFA1],
- ["84E5",0xAFA2],
- ["84E6",0xAFA3],
- ["84E7",0xAFA4],
- ["84E8",0xAFA5],
- ["84E9",0xAFA6],
- ["84EA",0xAFA7],
- ["84EB",0xAFA8],
- ["84EC",0xAFA9],
- ["84ED",0xAFAA],
- ["84EE",0xAFAB],
- ["84EF",0xAFAC],
- ["84F0",0xAFAD],
- ["84F1",0xAFAE],
- ["84F2",0xAFAF],
- ["84F3",0xAFB0],
- ["84F4",0xAFB1],
- ["84F5",0xAFB2],
- ["84F6",0xAFB3],
- ["84F7",0xAFB4],
- ["84F8",0xAFB5],
- ["84F9",0xAFB6],
- ["84FA",0xAFB7],
- ["84FB",0xAFBA],
- ["84FC",0xAFBB],
- ["84FD",0xAFBD],
- ["84FE",0xAFBE],
- ["8541",0xAFBF],
- ["8542",0xAFC1],
- ["8543",0xAFC2],
- ["8544",0xAFC3],
- ["8545",0xAFC4],
- ["8546",0xAFC5],
- ["8547",0xAFC6],
- ["8548",0xAFCA],
- ["8549",0xAFCC],
- ["854A",0xAFCF],
- ["854B",0xAFD0],
- ["854C",0xAFD1],
- ["854D",0xAFD2],
- ["854E",0xAFD3],
- ["854F",0xAFD5],
- ["8550",0xAFD6],
- ["8551",0xAFD7],
- ["8552",0xAFD8],
- ["8553",0xAFD9],
- ["8554",0xAFDA],
- ["8555",0xAFDB],
- ["8556",0xAFDD],
- ["8557",0xAFDE],
- ["8558",0xAFDF],
- ["8559",0xAFE0],
- ["855A",0xAFE1],
- ["8561",0xAFE2],
- ["8562",0xAFE3],
- ["8563",0xAFE4],
- ["8564",0xAFE5],
- ["8565",0xAFE6],
- ["8566",0xAFE7],
- ["8567",0xAFEA],
- ["8568",0xAFEB],
- ["8569",0xAFEC],
- ["856A",0xAFED],
- ["856B",0xAFEE],
- ["856C",0xAFEF],
- ["856D",0xAFF2],
- ["856E",0xAFF3],
- ["856F",0xAFF5],
- ["8570",0xAFF6],
- ["8571",0xAFF7],
- ["8572",0xAFF9],
- ["8573",0xAFFA],
- ["8574",0xAFFB],
- ["8575",0xAFFC],
- ["8576",0xAFFD],
- ["8577",0xAFFE],
- ["8578",0xAFFF],
- ["8579",0xB002],
- ["857A",0xB003],
- ["8581",0xB005],
- ["8582",0xB006],
- ["8583",0xB007],
- ["8584",0xB008],
- ["8585",0xB009],
- ["8586",0xB00A],
- ["8587",0xB00B],
- ["8588",0xB00D],
- ["8589",0xB00E],
- ["858A",0xB00F],
- ["858B",0xB011],
- ["858C",0xB012],
- ["858D",0xB013],
- ["858E",0xB015],
- ["858F",0xB016],
- ["8590",0xB017],
- ["8591",0xB018],
- ["8592",0xB019],
- ["8593",0xB01A],
- ["8594",0xB01B],
- ["8595",0xB01E],
- ["8596",0xB01F],
- ["8597",0xB020],
- ["8598",0xB021],
- ["8599",0xB022],
- ["859A",0xB023],
- ["859B",0xB024],
- ["859C",0xB025],
- ["859D",0xB026],
- ["859E",0xB027],
- ["859F",0xB029],
- ["85A0",0xB02A],
- ["85A1",0xB02B],
- ["85A2",0xB02C],
- ["85A3",0xB02D],
- ["85A4",0xB02E],
- ["85A5",0xB02F],
- ["85A6",0xB030],
- ["85A7",0xB031],
- ["85A8",0xB032],
- ["85A9",0xB033],
- ["85AA",0xB034],
- ["85AB",0xB035],
- ["85AC",0xB036],
- ["85AD",0xB037],
- ["85AE",0xB038],
- ["85AF",0xB039],
- ["85B0",0xB03A],
- ["85B1",0xB03B],
- ["85B2",0xB03C],
- ["85B3",0xB03D],
- ["85B4",0xB03E],
- ["85B5",0xB03F],
- ["85B6",0xB040],
- ["85B7",0xB041],
- ["85B8",0xB042],
- ["85B9",0xB043],
- ["85BA",0xB046],
- ["85BB",0xB047],
- ["85BC",0xB049],
- ["85BD",0xB04B],
- ["85BE",0xB04D],
- ["85BF",0xB04F],
- ["85C0",0xB050],
- ["85C1",0xB051],
- ["85C2",0xB052],
- ["85C3",0xB056],
- ["85C4",0xB058],
- ["85C5",0xB05A],
- ["85C6",0xB05B],
- ["85C7",0xB05C],
- ["85C8",0xB05E],
- ["85C9",0xB05F],
- ["85CA",0xB060],
- ["85CB",0xB061],
- ["85CC",0xB062],
- ["85CD",0xB063],
- ["85CE",0xB064],
- ["85CF",0xB065],
- ["85D0",0xB066],
- ["85D1",0xB067],
- ["85D2",0xB068],
- ["85D3",0xB069],
- ["85D4",0xB06A],
- ["85D5",0xB06B],
- ["85D6",0xB06C],
- ["85D7",0xB06D],
- ["85D8",0xB06E],
- ["85D9",0xB06F],
- ["85DA",0xB070],
- ["85DB",0xB071],
- ["85DC",0xB072],
- ["85DD",0xB073],
- ["85DE",0xB074],
- ["85DF",0xB075],
- ["85E0",0xB076],
- ["85E1",0xB077],
- ["85E2",0xB078],
- ["85E3",0xB079],
- ["85E4",0xB07A],
- ["85E5",0xB07B],
- ["85E6",0xB07E],
- ["85E7",0xB07F],
- ["85E8",0xB081],
- ["85E9",0xB082],
- ["85EA",0xB083],
- ["85EB",0xB085],
- ["85EC",0xB086],
- ["85ED",0xB087],
- ["85EE",0xB088],
- ["85EF",0xB089],
- ["85F0",0xB08A],
- ["85F1",0xB08B],
- ["85F2",0xB08E],
- ["85F3",0xB090],
- ["85F4",0xB092],
- ["85F5",0xB093],
- ["85F6",0xB094],
- ["85F7",0xB095],
- ["85F8",0xB096],
- ["85F9",0xB097],
- ["85FA",0xB09B],
- ["85FB",0xB09D],
- ["85FC",0xB09E],
- ["85FD",0xB0A3],
- ["85FE",0xB0A4],
- ["8641",0xB0A5],
- ["8642",0xB0A6],
- ["8643",0xB0A7],
- ["8644",0xB0AA],
- ["8645",0xB0B0],
- ["8646",0xB0B2],
- ["8647",0xB0B6],
- ["8648",0xB0B7],
- ["8649",0xB0B9],
- ["864A",0xB0BA],
- ["864B",0xB0BB],
- ["864C",0xB0BD],
- ["864D",0xB0BE],
- ["864E",0xB0BF],
- ["864F",0xB0C0],
- ["8650",0xB0C1],
- ["8651",0xB0C2],
- ["8652",0xB0C3],
- ["8653",0xB0C6],
- ["8654",0xB0CA],
- ["8655",0xB0CB],
- ["8656",0xB0CC],
- ["8657",0xB0CD],
- ["8658",0xB0CE],
- ["8659",0xB0CF],
- ["865A",0xB0D2],
- ["8661",0xB0D3],
- ["8662",0xB0D5],
- ["8663",0xB0D6],
- ["8664",0xB0D7],
- ["8665",0xB0D9],
- ["8666",0xB0DA],
- ["8667",0xB0DB],
- ["8668",0xB0DC],
- ["8669",0xB0DD],
- ["866A",0xB0DE],
- ["866B",0xB0DF],
- ["866C",0xB0E1],
- ["866D",0xB0E2],
- ["866E",0xB0E3],
- ["866F",0xB0E4],
- ["8670",0xB0E6],
- ["8671",0xB0E7],
- ["8672",0xB0E8],
- ["8673",0xB0E9],
- ["8674",0xB0EA],
- ["8675",0xB0EB],
- ["8676",0xB0EC],
- ["8677",0xB0ED],
- ["8678",0xB0EE],
- ["8679",0xB0EF],
- ["867A",0xB0F0],
- ["8681",0xB0F1],
- ["8682",0xB0F2],
- ["8683",0xB0F3],
- ["8684",0xB0F4],
- ["8685",0xB0F5],
- ["8686",0xB0F6],
- ["8687",0xB0F7],
- ["8688",0xB0F8],
- ["8689",0xB0F9],
- ["868A",0xB0FA],
- ["868B",0xB0FB],
- ["868C",0xB0FC],
- ["868D",0xB0FD],
- ["868E",0xB0FE],
- ["868F",0xB0FF],
- ["8690",0xB100],
- ["8691",0xB101],
- ["8692",0xB102],
- ["8693",0xB103],
- ["8694",0xB104],
- ["8695",0xB105],
- ["8696",0xB106],
- ["8697",0xB107],
- ["8698",0xB10A],
- ["8699",0xB10D],
- ["869A",0xB10E],
- ["869B",0xB10F],
- ["869C",0xB111],
- ["869D",0xB114],
- ["869E",0xB115],
- ["869F",0xB116],
- ["86A0",0xB117],
- ["86A1",0xB11A],
- ["86A2",0xB11E],
- ["86A3",0xB11F],
- ["86A4",0xB120],
- ["86A5",0xB121],
- ["86A6",0xB122],
- ["86A7",0xB126],
- ["86A8",0xB127],
- ["86A9",0xB129],
- ["86AA",0xB12A],
- ["86AB",0xB12B],
- ["86AC",0xB12D],
- ["86AD",0xB12E],
- ["86AE",0xB12F],
- ["86AF",0xB130],
- ["86B0",0xB131],
- ["86B1",0xB132],
- ["86B2",0xB133],
- ["86B3",0xB136],
- ["86B4",0xB13A],
- ["86B5",0xB13B],
- ["86B6",0xB13C],
- ["86B7",0xB13D],
- ["86B8",0xB13E],
- ["86B9",0xB13F],
- ["86BA",0xB142],
- ["86BB",0xB143],
- ["86BC",0xB145],
- ["86BD",0xB146],
- ["86BE",0xB147],
- ["86BF",0xB149],
- ["86C0",0xB14A],
- ["86C1",0xB14B],
- ["86C2",0xB14C],
- ["86C3",0xB14D],
- ["86C4",0xB14E],
- ["86C5",0xB14F],
- ["86C6",0xB152],
- ["86C7",0xB153],
- ["86C8",0xB156],
- ["86C9",0xB157],
- ["86CA",0xB159],
- ["86CB",0xB15A],
- ["86CC",0xB15B],
- ["86CD",0xB15D],
- ["86CE",0xB15E],
- ["86CF",0xB15F],
- ["86D0",0xB161],
- ["86D1",0xB162],
- ["86D2",0xB163],
- ["86D3",0xB164],
- ["86D4",0xB165],
- ["86D5",0xB166],
- ["86D6",0xB167],
- ["86D7",0xB168],
- ["86D8",0xB169],
- ["86D9",0xB16A],
- ["86DA",0xB16B],
- ["86DB",0xB16C],
- ["86DC",0xB16D],
- ["86DD",0xB16E],
- ["86DE",0xB16F],
- ["86DF",0xB170],
- ["86E0",0xB171],
- ["86E1",0xB172],
- ["86E2",0xB173],
- ["86E3",0xB174],
- ["86E4",0xB175],
- ["86E5",0xB176],
- ["86E6",0xB177],
- ["86E7",0xB17A],
- ["86E8",0xB17B],
- ["86E9",0xB17D],
- ["86EA",0xB17E],
- ["86EB",0xB17F],
- ["86EC",0xB181],
- ["86ED",0xB183],
- ["86EE",0xB184],
- ["86EF",0xB185],
- ["86F0",0xB186],
- ["86F1",0xB187],
- ["86F2",0xB18A],
- ["86F3",0xB18C],
- ["86F4",0xB18E],
- ["86F5",0xB18F],
- ["86F6",0xB190],
- ["86F7",0xB191],
- ["86F8",0xB195],
- ["86F9",0xB196],
- ["86FA",0xB197],
- ["86FB",0xB199],
- ["86FC",0xB19A],
- ["86FD",0xB19B],
- ["86FE",0xB19D],
- ["8741",0xB19E],
- ["8742",0xB19F],
- ["8743",0xB1A0],
- ["8744",0xB1A1],
- ["8745",0xB1A2],
- ["8746",0xB1A3],
- ["8747",0xB1A4],
- ["8748",0xB1A5],
- ["8749",0xB1A6],
- ["874A",0xB1A7],
- ["874B",0xB1A9],
- ["874C",0xB1AA],
- ["874D",0xB1AB],
- ["874E",0xB1AC],
- ["874F",0xB1AD],
- ["8750",0xB1AE],
- ["8751",0xB1AF],
- ["8752",0xB1B0],
- ["8753",0xB1B1],
- ["8754",0xB1B2],
- ["8755",0xB1B3],
- ["8756",0xB1B4],
- ["8757",0xB1B5],
- ["8758",0xB1B6],
- ["8759",0xB1B7],
- ["875A",0xB1B8],
- ["8761",0xB1B9],
- ["8762",0xB1BA],
- ["8763",0xB1BB],
- ["8764",0xB1BC],
- ["8765",0xB1BD],
- ["8766",0xB1BE],
- ["8767",0xB1BF],
- ["8768",0xB1C0],
- ["8769",0xB1C1],
- ["876A",0xB1C2],
- ["876B",0xB1C3],
- ["876C",0xB1C4],
- ["876D",0xB1C5],
- ["876E",0xB1C6],
- ["876F",0xB1C7],
- ["8770",0xB1C8],
- ["8771",0xB1C9],
- ["8772",0xB1CA],
- ["8773",0xB1CB],
- ["8774",0xB1CD],
- ["8775",0xB1CE],
- ["8776",0xB1CF],
- ["8777",0xB1D1],
- ["8778",0xB1D2],
- ["8779",0xB1D3],
- ["877A",0xB1D5],
- ["8781",0xB1D6],
- ["8782",0xB1D7],
- ["8783",0xB1D8],
- ["8784",0xB1D9],
- ["8785",0xB1DA],
- ["8786",0xB1DB],
- ["8787",0xB1DE],
- ["8788",0xB1E0],
- ["8789",0xB1E1],
- ["878A",0xB1E2],
- ["878B",0xB1E3],
- ["878C",0xB1E4],
- ["878D",0xB1E5],
- ["878E",0xB1E6],
- ["878F",0xB1E7],
- ["8790",0xB1EA],
- ["8791",0xB1EB],
- ["8792",0xB1ED],
- ["8793",0xB1EE],
- ["8794",0xB1EF],
- ["8795",0xB1F1],
- ["8796",0xB1F2],
- ["8797",0xB1F3],
- ["8798",0xB1F4],
- ["8799",0xB1F5],
- ["879A",0xB1F6],
- ["879B",0xB1F7],
- ["879C",0xB1F8],
- ["879D",0xB1FA],
- ["879E",0xB1FC],
- ["879F",0xB1FE],
- ["87A0",0xB1FF],
- ["87A1",0xB200],
- ["87A2",0xB201],
- ["87A3",0xB202],
- ["87A4",0xB203],
- ["87A5",0xB206],
- ["87A6",0xB207],
- ["87A7",0xB209],
- ["87A8",0xB20A],
- ["87A9",0xB20D],
- ["87AA",0xB20E],
- ["87AB",0xB20F],
- ["87AC",0xB210],
- ["87AD",0xB211],
- ["87AE",0xB212],
- ["87AF",0xB213],
- ["87B0",0xB216],
- ["87B1",0xB218],
- ["87B2",0xB21A],
- ["87B3",0xB21B],
- ["87B4",0xB21C],
- ["87B5",0xB21D],
- ["87B6",0xB21E],
- ["87B7",0xB21F],
- ["87B8",0xB221],
- ["87B9",0xB222],
- ["87BA",0xB223],
- ["87BB",0xB224],
- ["87BC",0xB225],
- ["87BD",0xB226],
- ["87BE",0xB227],
- ["87BF",0xB228],
- ["87C0",0xB229],
- ["87C1",0xB22A],
- ["87C2",0xB22B],
- ["87C3",0xB22C],
- ["87C4",0xB22D],
- ["87C5",0xB22E],
- ["87C6",0xB22F],
- ["87C7",0xB230],
- ["87C8",0xB231],
- ["87C9",0xB232],
- ["87CA",0xB233],
- ["87CB",0xB235],
- ["87CC",0xB236],
- ["87CD",0xB237],
- ["87CE",0xB238],
- ["87CF",0xB239],
- ["87D0",0xB23A],
- ["87D1",0xB23B],
- ["87D2",0xB23D],
- ["87D3",0xB23E],
- ["87D4",0xB23F],
- ["87D5",0xB240],
- ["87D6",0xB241],
- ["87D7",0xB242],
- ["87D8",0xB243],
- ["87D9",0xB244],
- ["87DA",0xB245],
- ["87DB",0xB246],
- ["87DC",0xB247],
- ["87DD",0xB248],
- ["87DE",0xB249],
- ["87DF",0xB24A],
- ["87E0",0xB24B],
- ["87E1",0xB24C],
- ["87E2",0xB24D],
- ["87E3",0xB24E],
- ["87E4",0xB24F],
- ["87E5",0xB250],
- ["87E6",0xB251],
- ["87E7",0xB252],
- ["87E8",0xB253],
- ["87E9",0xB254],
- ["87EA",0xB255],
- ["87EB",0xB256],
- ["87EC",0xB257],
- ["87ED",0xB259],
- ["87EE",0xB25A],
- ["87EF",0xB25B],
- ["87F0",0xB25D],
- ["87F1",0xB25E],
- ["87F2",0xB25F],
- ["87F3",0xB261],
- ["87F4",0xB262],
- ["87F5",0xB263],
- ["87F6",0xB264],
- ["87F7",0xB265],
- ["87F8",0xB266],
- ["87F9",0xB267],
- ["87FA",0xB26A],
- ["87FB",0xB26B],
- ["87FC",0xB26C],
- ["87FD",0xB26D],
- ["87FE",0xB26E],
- ["8841",0xB26F],
- ["8842",0xB270],
- ["8843",0xB271],
- ["8844",0xB272],
- ["8845",0xB273],
- ["8846",0xB276],
- ["8847",0xB277],
- ["8848",0xB278],
- ["8849",0xB279],
- ["884A",0xB27A],
- ["884B",0xB27B],
- ["884C",0xB27D],
- ["884D",0xB27E],
- ["884E",0xB27F],
- ["884F",0xB280],
- ["8850",0xB281],
- ["8851",0xB282],
- ["8852",0xB283],
- ["8853",0xB286],
- ["8854",0xB287],
- ["8855",0xB288],
- ["8856",0xB28A],
- ["8857",0xB28B],
- ["8858",0xB28C],
- ["8859",0xB28D],
- ["885A",0xB28E],
- ["8861",0xB28F],
- ["8862",0xB292],
- ["8863",0xB293],
- ["8864",0xB295],
- ["8865",0xB296],
- ["8866",0xB297],
- ["8867",0xB29B],
- ["8868",0xB29C],
- ["8869",0xB29D],
- ["886A",0xB29E],
- ["886B",0xB29F],
- ["886C",0xB2A2],
- ["886D",0xB2A4],
- ["886E",0xB2A7],
- ["886F",0xB2A8],
- ["8870",0xB2A9],
- ["8871",0xB2AB],
- ["8872",0xB2AD],
- ["8873",0xB2AE],
- ["8874",0xB2AF],
- ["8875",0xB2B1],
- ["8876",0xB2B2],
- ["8877",0xB2B3],
- ["8878",0xB2B5],
- ["8879",0xB2B6],
- ["887A",0xB2B7],
- ["8881",0xB2B8],
- ["8882",0xB2B9],
- ["8883",0xB2BA],
- ["8884",0xB2BB],
- ["8885",0xB2BC],
- ["8886",0xB2BD],
- ["8887",0xB2BE],
- ["8888",0xB2BF],
- ["8889",0xB2C0],
- ["888A",0xB2C1],
- ["888B",0xB2C2],
- ["888C",0xB2C3],
- ["888D",0xB2C4],
- ["888E",0xB2C5],
- ["888F",0xB2C6],
- ["8890",0xB2C7],
- ["8891",0xB2CA],
- ["8892",0xB2CB],
- ["8893",0xB2CD],
- ["8894",0xB2CE],
- ["8895",0xB2CF],
- ["8896",0xB2D1],
- ["8897",0xB2D3],
- ["8898",0xB2D4],
- ["8899",0xB2D5],
- ["889A",0xB2D6],
- ["889B",0xB2D7],
- ["889C",0xB2DA],
- ["889D",0xB2DC],
- ["889E",0xB2DE],
- ["889F",0xB2DF],
- ["88A0",0xB2E0],
- ["88A1",0xB2E1],
- ["88A2",0xB2E3],
- ["88A3",0xB2E7],
- ["88A4",0xB2E9],
- ["88A5",0xB2EA],
- ["88A6",0xB2F0],
- ["88A7",0xB2F1],
- ["88A8",0xB2F2],
- ["88A9",0xB2F6],
- ["88AA",0xB2FC],
- ["88AB",0xB2FD],
- ["88AC",0xB2FE],
- ["88AD",0xB302],
- ["88AE",0xB303],
- ["88AF",0xB305],
- ["88B0",0xB306],
- ["88B1",0xB307],
- ["88B2",0xB309],
- ["88B3",0xB30A],
- ["88B4",0xB30B],
- ["88B5",0xB30C],
- ["88B6",0xB30D],
- ["88B7",0xB30E],
- ["88B8",0xB30F],
- ["88B9",0xB312],
- ["88BA",0xB316],
- ["88BB",0xB317],
- ["88BC",0xB318],
- ["88BD",0xB319],
- ["88BE",0xB31A],
- ["88BF",0xB31B],
- ["88C0",0xB31D],
- ["88C1",0xB31E],
- ["88C2",0xB31F],
- ["88C3",0xB320],
- ["88C4",0xB321],
- ["88C5",0xB322],
- ["88C6",0xB323],
- ["88C7",0xB324],
- ["88C8",0xB325],
- ["88C9",0xB326],
- ["88CA",0xB327],
- ["88CB",0xB328],
- ["88CC",0xB329],
- ["88CD",0xB32A],
- ["88CE",0xB32B],
- ["88CF",0xB32C],
- ["88D0",0xB32D],
- ["88D1",0xB32E],
- ["88D2",0xB32F],
- ["88D3",0xB330],
- ["88D4",0xB331],
- ["88D5",0xB332],
- ["88D6",0xB333],
- ["88D7",0xB334],
- ["88D8",0xB335],
- ["88D9",0xB336],
- ["88DA",0xB337],
- ["88DB",0xB338],
- ["88DC",0xB339],
- ["88DD",0xB33A],
- ["88DE",0xB33B],
- ["88DF",0xB33C],
- ["88E0",0xB33D],
- ["88E1",0xB33E],
- ["88E2",0xB33F],
- ["88E3",0xB340],
- ["88E4",0xB341],
- ["88E5",0xB342],
- ["88E6",0xB343],
- ["88E7",0xB344],
- ["88E8",0xB345],
- ["88E9",0xB346],
- ["88EA",0xB347],
- ["88EB",0xB348],
- ["88EC",0xB349],
- ["88ED",0xB34A],
- ["88EE",0xB34B],
- ["88EF",0xB34C],
- ["88F0",0xB34D],
- ["88F1",0xB34E],
- ["88F2",0xB34F],
- ["88F3",0xB350],
- ["88F4",0xB351],
- ["88F5",0xB352],
- ["88F6",0xB353],
- ["88F7",0xB357],
- ["88F8",0xB359],
- ["88F9",0xB35A],
- ["88FA",0xB35D],
- ["88FB",0xB360],
- ["88FC",0xB361],
- ["88FD",0xB362],
- ["88FE",0xB363],
- ["8941",0xB366],
- ["8942",0xB368],
- ["8943",0xB36A],
- ["8944",0xB36C],
- ["8945",0xB36D],
- ["8946",0xB36F],
- ["8947",0xB372],
- ["8948",0xB373],
- ["8949",0xB375],
- ["894A",0xB376],
- ["894B",0xB377],
- ["894C",0xB379],
- ["894D",0xB37A],
- ["894E",0xB37B],
- ["894F",0xB37C],
- ["8950",0xB37D],
- ["8951",0xB37E],
- ["8952",0xB37F],
- ["8953",0xB382],
- ["8954",0xB386],
- ["8955",0xB387],
- ["8956",0xB388],
- ["8957",0xB389],
- ["8958",0xB38A],
- ["8959",0xB38B],
- ["895A",0xB38D],
- ["8961",0xB38E],
- ["8962",0xB38F],
- ["8963",0xB391],
- ["8964",0xB392],
- ["8965",0xB393],
- ["8966",0xB395],
- ["8967",0xB396],
- ["8968",0xB397],
- ["8969",0xB398],
- ["896A",0xB399],
- ["896B",0xB39A],
- ["896C",0xB39B],
- ["896D",0xB39C],
- ["896E",0xB39D],
- ["896F",0xB39E],
- ["8970",0xB39F],
- ["8971",0xB3A2],
- ["8972",0xB3A3],
- ["8973",0xB3A4],
- ["8974",0xB3A5],
- ["8975",0xB3A6],
- ["8976",0xB3A7],
- ["8977",0xB3A9],
- ["8978",0xB3AA],
- ["8979",0xB3AB],
- ["897A",0xB3AD],
- ["8981",0xB3AE],
- ["8982",0xB3AF],
- ["8983",0xB3B0],
- ["8984",0xB3B1],
- ["8985",0xB3B2],
- ["8986",0xB3B3],
- ["8987",0xB3B4],
- ["8988",0xB3B5],
- ["8989",0xB3B6],
- ["898A",0xB3B7],
- ["898B",0xB3B8],
- ["898C",0xB3B9],
- ["898D",0xB3BA],
- ["898E",0xB3BB],
- ["898F",0xB3BC],
- ["8990",0xB3BD],
- ["8991",0xB3BE],
- ["8992",0xB3BF],
- ["8993",0xB3C0],
- ["8994",0xB3C1],
- ["8995",0xB3C2],
- ["8996",0xB3C3],
- ["8997",0xB3C6],
- ["8998",0xB3C7],
- ["8999",0xB3C9],
- ["899A",0xB3CA],
- ["899B",0xB3CD],
- ["899C",0xB3CF],
- ["899D",0xB3D1],
- ["899E",0xB3D2],
- ["899F",0xB3D3],
- ["89A0",0xB3D6],
- ["89A1",0xB3D8],
- ["89A2",0xB3DA],
- ["89A3",0xB3DC],
- ["89A4",0xB3DE],
- ["89A5",0xB3DF],
- ["89A6",0xB3E1],
- ["89A7",0xB3E2],
- ["89A8",0xB3E3],
- ["89A9",0xB3E5],
- ["89AA",0xB3E6],
- ["89AB",0xB3E7],
- ["89AC",0xB3E9],
- ["89AD",0xB3EA],
- ["89AE",0xB3EB],
- ["89AF",0xB3EC],
- ["89B0",0xB3ED],
- ["89B1",0xB3EE],
- ["89B2",0xB3EF],
- ["89B3",0xB3F0],
- ["89B4",0xB3F1],
- ["89B5",0xB3F2],
- ["89B6",0xB3F3],
- ["89B7",0xB3F4],
- ["89B8",0xB3F5],
- ["89B9",0xB3F6],
- ["89BA",0xB3F7],
- ["89BB",0xB3F8],
- ["89BC",0xB3F9],
- ["89BD",0xB3FA],
- ["89BE",0xB3FB],
- ["89BF",0xB3FD],
- ["89C0",0xB3FE],
- ["89C1",0xB3FF],
- ["89C2",0xB400],
- ["89C3",0xB401],
- ["89C4",0xB402],
- ["89C5",0xB403],
- ["89C6",0xB404],
- ["89C7",0xB405],
- ["89C8",0xB406],
- ["89C9",0xB407],
- ["89CA",0xB408],
- ["89CB",0xB409],
- ["89CC",0xB40A],
- ["89CD",0xB40B],
- ["89CE",0xB40C],
- ["89CF",0xB40D],
- ["89D0",0xB40E],
- ["89D1",0xB40F],
- ["89D2",0xB411],
- ["89D3",0xB412],
- ["89D4",0xB413],
- ["89D5",0xB414],
- ["89D6",0xB415],
- ["89D7",0xB416],
- ["89D8",0xB417],
- ["89D9",0xB419],
- ["89DA",0xB41A],
- ["89DB",0xB41B],
- ["89DC",0xB41D],
- ["89DD",0xB41E],
- ["89DE",0xB41F],
- ["89DF",0xB421],
- ["89E0",0xB422],
- ["89E1",0xB423],
- ["89E2",0xB424],
- ["89E3",0xB425],
- ["89E4",0xB426],
- ["89E5",0xB427],
- ["89E6",0xB42A],
- ["89E7",0xB42C],
- ["89E8",0xB42D],
- ["89E9",0xB42E],
- ["89EA",0xB42F],
- ["89EB",0xB430],
- ["89EC",0xB431],
- ["89ED",0xB432],
- ["89EE",0xB433],
- ["89EF",0xB435],
- ["89F0",0xB436],
- ["89F1",0xB437],
- ["89F2",0xB438],
- ["89F3",0xB439],
- ["89F4",0xB43A],
- ["89F5",0xB43B],
- ["89F6",0xB43C],
- ["89F7",0xB43D],
- ["89F8",0xB43E],
- ["89F9",0xB43F],
- ["89FA",0xB440],
- ["89FB",0xB441],
- ["89FC",0xB442],
- ["89FD",0xB443],
- ["89FE",0xB444],
- ["8A41",0xB445],
- ["8A42",0xB446],
- ["8A43",0xB447],
- ["8A44",0xB448],
- ["8A45",0xB449],
- ["8A46",0xB44A],
- ["8A47",0xB44B],
- ["8A48",0xB44C],
- ["8A49",0xB44D],
- ["8A4A",0xB44E],
- ["8A4B",0xB44F],
- ["8A4C",0xB452],
- ["8A4D",0xB453],
- ["8A4E",0xB455],
- ["8A4F",0xB456],
- ["8A50",0xB457],
- ["8A51",0xB459],
- ["8A52",0xB45A],
- ["8A53",0xB45B],
- ["8A54",0xB45C],
- ["8A55",0xB45D],
- ["8A56",0xB45E],
- ["8A57",0xB45F],
- ["8A58",0xB462],
- ["8A59",0xB464],
- ["8A5A",0xB466],
- ["8A61",0xB467],
- ["8A62",0xB468],
- ["8A63",0xB469],
- ["8A64",0xB46A],
- ["8A65",0xB46B],
- ["8A66",0xB46D],
- ["8A67",0xB46E],
- ["8A68",0xB46F],
- ["8A69",0xB470],
- ["8A6A",0xB471],
- ["8A6B",0xB472],
- ["8A6C",0xB473],
- ["8A6D",0xB474],
- ["8A6E",0xB475],
- ["8A6F",0xB476],
- ["8A70",0xB477],
- ["8A71",0xB478],
- ["8A72",0xB479],
- ["8A73",0xB47A],
- ["8A74",0xB47B],
- ["8A75",0xB47C],
- ["8A76",0xB47D],
- ["8A77",0xB47E],
- ["8A78",0xB47F],
- ["8A79",0xB481],
- ["8A7A",0xB482],
- ["8A81",0xB483],
- ["8A82",0xB484],
- ["8A83",0xB485],
- ["8A84",0xB486],
- ["8A85",0xB487],
- ["8A86",0xB489],
- ["8A87",0xB48A],
- ["8A88",0xB48B],
- ["8A89",0xB48C],
- ["8A8A",0xB48D],
- ["8A8B",0xB48E],
- ["8A8C",0xB48F],
- ["8A8D",0xB490],
- ["8A8E",0xB491],
- ["8A8F",0xB492],
- ["8A90",0xB493],
- ["8A91",0xB494],
- ["8A92",0xB495],
- ["8A93",0xB496],
- ["8A94",0xB497],
- ["8A95",0xB498],
- ["8A96",0xB499],
- ["8A97",0xB49A],
- ["8A98",0xB49B],
- ["8A99",0xB49C],
- ["8A9A",0xB49E],
- ["8A9B",0xB49F],
- ["8A9C",0xB4A0],
- ["8A9D",0xB4A1],
- ["8A9E",0xB4A2],
- ["8A9F",0xB4A3],
- ["8AA0",0xB4A5],
- ["8AA1",0xB4A6],
- ["8AA2",0xB4A7],
- ["8AA3",0xB4A9],
- ["8AA4",0xB4AA],
- ["8AA5",0xB4AB],
- ["8AA6",0xB4AD],
- ["8AA7",0xB4AE],
- ["8AA8",0xB4AF],
- ["8AA9",0xB4B0],
- ["8AAA",0xB4B1],
- ["8AAB",0xB4B2],
- ["8AAC",0xB4B3],
- ["8AAD",0xB4B4],
- ["8AAE",0xB4B6],
- ["8AAF",0xB4B8],
- ["8AB0",0xB4BA],
- ["8AB1",0xB4BB],
- ["8AB2",0xB4BC],
- ["8AB3",0xB4BD],
- ["8AB4",0xB4BE],
- ["8AB5",0xB4BF],
- ["8AB6",0xB4C1],
- ["8AB7",0xB4C2],
- ["8AB8",0xB4C3],
- ["8AB9",0xB4C5],
- ["8ABA",0xB4C6],
- ["8ABB",0xB4C7],
- ["8ABC",0xB4C9],
- ["8ABD",0xB4CA],
- ["8ABE",0xB4CB],
- ["8ABF",0xB4CC],
- ["8AC0",0xB4CD],
- ["8AC1",0xB4CE],
- ["8AC2",0xB4CF],
- ["8AC3",0xB4D1],
- ["8AC4",0xB4D2],
- ["8AC5",0xB4D3],
- ["8AC6",0xB4D4],
- ["8AC7",0xB4D6],
- ["8AC8",0xB4D7],
- ["8AC9",0xB4D8],
- ["8ACA",0xB4D9],
- ["8ACB",0xB4DA],
- ["8ACC",0xB4DB],
- ["8ACD",0xB4DE],
- ["8ACE",0xB4DF],
- ["8ACF",0xB4E1],
- ["8AD0",0xB4E2],
- ["8AD1",0xB4E5],
- ["8AD2",0xB4E7],
- ["8AD3",0xB4E8],
- ["8AD4",0xB4E9],
- ["8AD5",0xB4EA],
- ["8AD6",0xB4EB],
- ["8AD7",0xB4EE],
- ["8AD8",0xB4F0],
- ["8AD9",0xB4F2],
- ["8ADA",0xB4F3],
- ["8ADB",0xB4F4],
- ["8ADC",0xB4F5],
- ["8ADD",0xB4F6],
- ["8ADE",0xB4F7],
- ["8ADF",0xB4F9],
- ["8AE0",0xB4FA],
- ["8AE1",0xB4FB],
- ["8AE2",0xB4FC],
- ["8AE3",0xB4FD],
- ["8AE4",0xB4FE],
- ["8AE5",0xB4FF],
- ["8AE6",0xB500],
- ["8AE7",0xB501],
- ["8AE8",0xB502],
- ["8AE9",0xB503],
- ["8AEA",0xB504],
- ["8AEB",0xB505],
- ["8AEC",0xB506],
- ["8AED",0xB507],
- ["8AEE",0xB508],
- ["8AEF",0xB509],
- ["8AF0",0xB50A],
- ["8AF1",0xB50B],
- ["8AF2",0xB50C],
- ["8AF3",0xB50D],
- ["8AF4",0xB50E],
- ["8AF5",0xB50F],
- ["8AF6",0xB510],
- ["8AF7",0xB511],
- ["8AF8",0xB512],
- ["8AF9",0xB513],
- ["8AFA",0xB516],
- ["8AFB",0xB517],
- ["8AFC",0xB519],
- ["8AFD",0xB51A],
- ["8AFE",0xB51D],
- ["8B41",0xB51E],
- ["8B42",0xB51F],
- ["8B43",0xB520],
- ["8B44",0xB521],
- ["8B45",0xB522],
- ["8B46",0xB523],
- ["8B47",0xB526],
- ["8B48",0xB52B],
- ["8B49",0xB52C],
- ["8B4A",0xB52D],
- ["8B4B",0xB52E],
- ["8B4C",0xB52F],
- ["8B4D",0xB532],
- ["8B4E",0xB533],
- ["8B4F",0xB535],
- ["8B50",0xB536],
- ["8B51",0xB537],
- ["8B52",0xB539],
- ["8B53",0xB53A],
- ["8B54",0xB53B],
- ["8B55",0xB53C],
- ["8B56",0xB53D],
- ["8B57",0xB53E],
- ["8B58",0xB53F],
- ["8B59",0xB542],
- ["8B5A",0xB546],
- ["8B61",0xB547],
- ["8B62",0xB548],
- ["8B63",0xB549],
- ["8B64",0xB54A],
- ["8B65",0xB54E],
- ["8B66",0xB54F],
- ["8B67",0xB551],
- ["8B68",0xB552],
- ["8B69",0xB553],
- ["8B6A",0xB555],
- ["8B6B",0xB556],
- ["8B6C",0xB557],
- ["8B6D",0xB558],
- ["8B6E",0xB559],
- ["8B6F",0xB55A],
- ["8B70",0xB55B],
- ["8B71",0xB55E],
- ["8B72",0xB562],
- ["8B73",0xB563],
- ["8B74",0xB564],
- ["8B75",0xB565],
- ["8B76",0xB566],
- ["8B77",0xB567],
- ["8B78",0xB568],
- ["8B79",0xB569],
- ["8B7A",0xB56A],
- ["8B81",0xB56B],
- ["8B82",0xB56C],
- ["8B83",0xB56D],
- ["8B84",0xB56E],
- ["8B85",0xB56F],
- ["8B86",0xB570],
- ["8B87",0xB571],
- ["8B88",0xB572],
- ["8B89",0xB573],
- ["8B8A",0xB574],
- ["8B8B",0xB575],
- ["8B8C",0xB576],
- ["8B8D",0xB577],
- ["8B8E",0xB578],
- ["8B8F",0xB579],
- ["8B90",0xB57A],
- ["8B91",0xB57B],
- ["8B92",0xB57C],
- ["8B93",0xB57D],
- ["8B94",0xB57E],
- ["8B95",0xB57F],
- ["8B96",0xB580],
- ["8B97",0xB581],
- ["8B98",0xB582],
- ["8B99",0xB583],
- ["8B9A",0xB584],
- ["8B9B",0xB585],
- ["8B9C",0xB586],
- ["8B9D",0xB587],
- ["8B9E",0xB588],
- ["8B9F",0xB589],
- ["8BA0",0xB58A],
- ["8BA1",0xB58B],
- ["8BA2",0xB58C],
- ["8BA3",0xB58D],
- ["8BA4",0xB58E],
- ["8BA5",0xB58F],
- ["8BA6",0xB590],
- ["8BA7",0xB591],
- ["8BA8",0xB592],
- ["8BA9",0xB593],
- ["8BAA",0xB594],
- ["8BAB",0xB595],
- ["8BAC",0xB596],
- ["8BAD",0xB597],
- ["8BAE",0xB598],
- ["8BAF",0xB599],
- ["8BB0",0xB59A],
- ["8BB1",0xB59B],
- ["8BB2",0xB59C],
- ["8BB3",0xB59D],
- ["8BB4",0xB59E],
- ["8BB5",0xB59F],
- ["8BB6",0xB5A2],
- ["8BB7",0xB5A3],
- ["8BB8",0xB5A5],
- ["8BB9",0xB5A6],
- ["8BBA",0xB5A7],
- ["8BBB",0xB5A9],
- ["8BBC",0xB5AC],
- ["8BBD",0xB5AD],
- ["8BBE",0xB5AE],
- ["8BBF",0xB5AF],
- ["8BC0",0xB5B2],
- ["8BC1",0xB5B6],
- ["8BC2",0xB5B7],
- ["8BC3",0xB5B8],
- ["8BC4",0xB5B9],
- ["8BC5",0xB5BA],
- ["8BC6",0xB5BE],
- ["8BC7",0xB5BF],
- ["8BC8",0xB5C1],
- ["8BC9",0xB5C2],
- ["8BCA",0xB5C3],
- ["8BCB",0xB5C5],
- ["8BCC",0xB5C6],
- ["8BCD",0xB5C7],
- ["8BCE",0xB5C8],
- ["8BCF",0xB5C9],
- ["8BD0",0xB5CA],
- ["8BD1",0xB5CB],
- ["8BD2",0xB5CE],
- ["8BD3",0xB5D2],
- ["8BD4",0xB5D3],
- ["8BD5",0xB5D4],
- ["8BD6",0xB5D5],
- ["8BD7",0xB5D6],
- ["8BD8",0xB5D7],
- ["8BD9",0xB5D9],
- ["8BDA",0xB5DA],
- ["8BDB",0xB5DB],
- ["8BDC",0xB5DC],
- ["8BDD",0xB5DD],
- ["8BDE",0xB5DE],
- ["8BDF",0xB5DF],
- ["8BE0",0xB5E0],
- ["8BE1",0xB5E1],
- ["8BE2",0xB5E2],
- ["8BE3",0xB5E3],
- ["8BE4",0xB5E4],
- ["8BE5",0xB5E5],
- ["8BE6",0xB5E6],
- ["8BE7",0xB5E7],
- ["8BE8",0xB5E8],
- ["8BE9",0xB5E9],
- ["8BEA",0xB5EA],
- ["8BEB",0xB5EB],
- ["8BEC",0xB5ED],
- ["8BED",0xB5EE],
- ["8BEE",0xB5EF],
- ["8BEF",0xB5F0],
- ["8BF0",0xB5F1],
- ["8BF1",0xB5F2],
- ["8BF2",0xB5F3],
- ["8BF3",0xB5F4],
- ["8BF4",0xB5F5],
- ["8BF5",0xB5F6],
- ["8BF6",0xB5F7],
- ["8BF7",0xB5F8],
- ["8BF8",0xB5F9],
- ["8BF9",0xB5FA],
- ["8BFA",0xB5FB],
- ["8BFB",0xB5FC],
- ["8BFC",0xB5FD],
- ["8BFD",0xB5FE],
- ["8BFE",0xB5FF],
- ["8C41",0xB600],
- ["8C42",0xB601],
- ["8C43",0xB602],
- ["8C44",0xB603],
- ["8C45",0xB604],
- ["8C46",0xB605],
- ["8C47",0xB606],
- ["8C48",0xB607],
- ["8C49",0xB608],
- ["8C4A",0xB609],
- ["8C4B",0xB60A],
- ["8C4C",0xB60B],
- ["8C4D",0xB60C],
- ["8C4E",0xB60D],
- ["8C4F",0xB60E],
- ["8C50",0xB60F],
- ["8C51",0xB612],
- ["8C52",0xB613],
- ["8C53",0xB615],
- ["8C54",0xB616],
- ["8C55",0xB617],
- ["8C56",0xB619],
- ["8C57",0xB61A],
- ["8C58",0xB61B],
- ["8C59",0xB61C],
- ["8C5A",0xB61D],
- ["8C61",0xB61E],
- ["8C62",0xB61F],
- ["8C63",0xB620],
- ["8C64",0xB621],
- ["8C65",0xB622],
- ["8C66",0xB623],
- ["8C67",0xB624],
- ["8C68",0xB626],
- ["8C69",0xB627],
- ["8C6A",0xB628],
- ["8C6B",0xB629],
- ["8C6C",0xB62A],
- ["8C6D",0xB62B],
- ["8C6E",0xB62D],
- ["8C6F",0xB62E],
- ["8C70",0xB62F],
- ["8C71",0xB630],
- ["8C72",0xB631],
- ["8C73",0xB632],
- ["8C74",0xB633],
- ["8C75",0xB635],
- ["8C76",0xB636],
- ["8C77",0xB637],
- ["8C78",0xB638],
- ["8C79",0xB639],
- ["8C7A",0xB63A],
- ["8C81",0xB63B],
- ["8C82",0xB63C],
- ["8C83",0xB63D],
- ["8C84",0xB63E],
- ["8C85",0xB63F],
- ["8C86",0xB640],
- ["8C87",0xB641],
- ["8C88",0xB642],
- ["8C89",0xB643],
- ["8C8A",0xB644],
- ["8C8B",0xB645],
- ["8C8C",0xB646],
- ["8C8D",0xB647],
- ["8C8E",0xB649],
- ["8C8F",0xB64A],
- ["8C90",0xB64B],
- ["8C91",0xB64C],
- ["8C92",0xB64D],
- ["8C93",0xB64E],
- ["8C94",0xB64F],
- ["8C95",0xB650],
- ["8C96",0xB651],
- ["8C97",0xB652],
- ["8C98",0xB653],
- ["8C99",0xB654],
- ["8C9A",0xB655],
- ["8C9B",0xB656],
- ["8C9C",0xB657],
- ["8C9D",0xB658],
- ["8C9E",0xB659],
- ["8C9F",0xB65A],
- ["8CA0",0xB65B],
- ["8CA1",0xB65C],
- ["8CA2",0xB65D],
- ["8CA3",0xB65E],
- ["8CA4",0xB65F],
- ["8CA5",0xB660],
- ["8CA6",0xB661],
- ["8CA7",0xB662],
- ["8CA8",0xB663],
- ["8CA9",0xB665],
- ["8CAA",0xB666],
- ["8CAB",0xB667],
- ["8CAC",0xB669],
- ["8CAD",0xB66A],
- ["8CAE",0xB66B],
- ["8CAF",0xB66C],
- ["8CB0",0xB66D],
- ["8CB1",0xB66E],
- ["8CB2",0xB66F],
- ["8CB3",0xB670],
- ["8CB4",0xB671],
- ["8CB5",0xB672],
- ["8CB6",0xB673],
- ["8CB7",0xB674],
- ["8CB8",0xB675],
- ["8CB9",0xB676],
- ["8CBA",0xB677],
- ["8CBB",0xB678],
- ["8CBC",0xB679],
- ["8CBD",0xB67A],
- ["8CBE",0xB67B],
- ["8CBF",0xB67C],
- ["8CC0",0xB67D],
- ["8CC1",0xB67E],
- ["8CC2",0xB67F],
- ["8CC3",0xB680],
- ["8CC4",0xB681],
- ["8CC5",0xB682],
- ["8CC6",0xB683],
- ["8CC7",0xB684],
- ["8CC8",0xB685],
- ["8CC9",0xB686],
- ["8CCA",0xB687],
- ["8CCB",0xB688],
- ["8CCC",0xB689],
- ["8CCD",0xB68A],
- ["8CCE",0xB68B],
- ["8CCF",0xB68C],
- ["8CD0",0xB68D],
- ["8CD1",0xB68E],
- ["8CD2",0xB68F],
- ["8CD3",0xB690],
- ["8CD4",0xB691],
- ["8CD5",0xB692],
- ["8CD6",0xB693],
- ["8CD7",0xB694],
- ["8CD8",0xB695],
- ["8CD9",0xB696],
- ["8CDA",0xB697],
- ["8CDB",0xB698],
- ["8CDC",0xB699],
- ["8CDD",0xB69A],
- ["8CDE",0xB69B],
- ["8CDF",0xB69E],
- ["8CE0",0xB69F],
- ["8CE1",0xB6A1],
- ["8CE2",0xB6A2],
- ["8CE3",0xB6A3],
- ["8CE4",0xB6A5],
- ["8CE5",0xB6A6],
- ["8CE6",0xB6A7],
- ["8CE7",0xB6A8],
- ["8CE8",0xB6A9],
- ["8CE9",0xB6AA],
- ["8CEA",0xB6AD],
- ["8CEB",0xB6AE],
- ["8CEC",0xB6AF],
- ["8CED",0xB6B0],
- ["8CEE",0xB6B2],
- ["8CEF",0xB6B3],
- ["8CF0",0xB6B4],
- ["8CF1",0xB6B5],
- ["8CF2",0xB6B6],
- ["8CF3",0xB6B7],
- ["8CF4",0xB6B8],
- ["8CF5",0xB6B9],
- ["8CF6",0xB6BA],
- ["8CF7",0xB6BB],
- ["8CF8",0xB6BC],
- ["8CF9",0xB6BD],
- ["8CFA",0xB6BE],
- ["8CFB",0xB6BF],
- ["8CFC",0xB6C0],
- ["8CFD",0xB6C1],
- ["8CFE",0xB6C2],
- ["8D41",0xB6C3],
- ["8D42",0xB6C4],
- ["8D43",0xB6C5],
- ["8D44",0xB6C6],
- ["8D45",0xB6C7],
- ["8D46",0xB6C8],
- ["8D47",0xB6C9],
- ["8D48",0xB6CA],
- ["8D49",0xB6CB],
- ["8D4A",0xB6CC],
- ["8D4B",0xB6CD],
- ["8D4C",0xB6CE],
- ["8D4D",0xB6CF],
- ["8D4E",0xB6D0],
- ["8D4F",0xB6D1],
- ["8D50",0xB6D2],
- ["8D51",0xB6D3],
- ["8D52",0xB6D5],
- ["8D53",0xB6D6],
- ["8D54",0xB6D7],
- ["8D55",0xB6D8],
- ["8D56",0xB6D9],
- ["8D57",0xB6DA],
- ["8D58",0xB6DB],
- ["8D59",0xB6DC],
- ["8D5A",0xB6DD],
- ["8D61",0xB6DE],
- ["8D62",0xB6DF],
- ["8D63",0xB6E0],
- ["8D64",0xB6E1],
- ["8D65",0xB6E2],
- ["8D66",0xB6E3],
- ["8D67",0xB6E4],
- ["8D68",0xB6E5],
- ["8D69",0xB6E6],
- ["8D6A",0xB6E7],
- ["8D6B",0xB6E8],
- ["8D6C",0xB6E9],
- ["8D6D",0xB6EA],
- ["8D6E",0xB6EB],
- ["8D6F",0xB6EC],
- ["8D70",0xB6ED],
- ["8D71",0xB6EE],
- ["8D72",0xB6EF],
- ["8D73",0xB6F1],
- ["8D74",0xB6F2],
- ["8D75",0xB6F3],
- ["8D76",0xB6F5],
- ["8D77",0xB6F6],
- ["8D78",0xB6F7],
- ["8D79",0xB6F9],
- ["8D7A",0xB6FA],
- ["8D81",0xB6FB],
- ["8D82",0xB6FC],
- ["8D83",0xB6FD],
- ["8D84",0xB6FE],
- ["8D85",0xB6FF],
- ["8D86",0xB702],
- ["8D87",0xB703],
- ["8D88",0xB704],
- ["8D89",0xB706],
- ["8D8A",0xB707],
- ["8D8B",0xB708],
- ["8D8C",0xB709],
- ["8D8D",0xB70A],
- ["8D8E",0xB70B],
- ["8D8F",0xB70C],
- ["8D90",0xB70D],
- ["8D91",0xB70E],
- ["8D92",0xB70F],
- ["8D93",0xB710],
- ["8D94",0xB711],
- ["8D95",0xB712],
- ["8D96",0xB713],
- ["8D97",0xB714],
- ["8D98",0xB715],
- ["8D99",0xB716],
- ["8D9A",0xB717],
- ["8D9B",0xB718],
- ["8D9C",0xB719],
- ["8D9D",0xB71A],
- ["8D9E",0xB71B],
- ["8D9F",0xB71C],
- ["8DA0",0xB71D],
- ["8DA1",0xB71E],
- ["8DA2",0xB71F],
- ["8DA3",0xB720],
- ["8DA4",0xB721],
- ["8DA5",0xB722],
- ["8DA6",0xB723],
- ["8DA7",0xB724],
- ["8DA8",0xB725],
- ["8DA9",0xB726],
- ["8DAA",0xB727],
- ["8DAB",0xB72A],
- ["8DAC",0xB72B],
- ["8DAD",0xB72D],
- ["8DAE",0xB72E],
- ["8DAF",0xB731],
- ["8DB0",0xB732],
- ["8DB1",0xB733],
- ["8DB2",0xB734],
- ["8DB3",0xB735],
- ["8DB4",0xB736],
- ["8DB5",0xB737],
- ["8DB6",0xB73A],
- ["8DB7",0xB73C],
- ["8DB8",0xB73D],
- ["8DB9",0xB73E],
- ["8DBA",0xB73F],
- ["8DBB",0xB740],
- ["8DBC",0xB741],
- ["8DBD",0xB742],
- ["8DBE",0xB743],
- ["8DBF",0xB745],
- ["8DC0",0xB746],
- ["8DC1",0xB747],
- ["8DC2",0xB749],
- ["8DC3",0xB74A],
- ["8DC4",0xB74B],
- ["8DC5",0xB74D],
- ["8DC6",0xB74E],
- ["8DC7",0xB74F],
- ["8DC8",0xB750],
- ["8DC9",0xB751],
- ["8DCA",0xB752],
- ["8DCB",0xB753],
- ["8DCC",0xB756],
- ["8DCD",0xB757],
- ["8DCE",0xB758],
- ["8DCF",0xB759],
- ["8DD0",0xB75A],
- ["8DD1",0xB75B],
- ["8DD2",0xB75C],
- ["8DD3",0xB75D],
- ["8DD4",0xB75E],
- ["8DD5",0xB75F],
- ["8DD6",0xB761],
- ["8DD7",0xB762],
- ["8DD8",0xB763],
- ["8DD9",0xB765],
- ["8DDA",0xB766],
- ["8DDB",0xB767],
- ["8DDC",0xB769],
- ["8DDD",0xB76A],
- ["8DDE",0xB76B],
- ["8DDF",0xB76C],
- ["8DE0",0xB76D],
- ["8DE1",0xB76E],
- ["8DE2",0xB76F],
- ["8DE3",0xB772],
- ["8DE4",0xB774],
- ["8DE5",0xB776],
- ["8DE6",0xB777],
- ["8DE7",0xB778],
- ["8DE8",0xB779],
- ["8DE9",0xB77A],
- ["8DEA",0xB77B],
- ["8DEB",0xB77E],
- ["8DEC",0xB77F],
- ["8DED",0xB781],
- ["8DEE",0xB782],
- ["8DEF",0xB783],
- ["8DF0",0xB785],
- ["8DF1",0xB786],
- ["8DF2",0xB787],
- ["8DF3",0xB788],
- ["8DF4",0xB789],
- ["8DF5",0xB78A],
- ["8DF6",0xB78B],
- ["8DF7",0xB78E],
- ["8DF8",0xB793],
- ["8DF9",0xB794],
- ["8DFA",0xB795],
- ["8DFB",0xB79A],
- ["8DFC",0xB79B],
- ["8DFD",0xB79D],
- ["8DFE",0xB79E],
- ["8E41",0xB79F],
- ["8E42",0xB7A1],
- ["8E43",0xB7A2],
- ["8E44",0xB7A3],
- ["8E45",0xB7A4],
- ["8E46",0xB7A5],
- ["8E47",0xB7A6],
- ["8E48",0xB7A7],
- ["8E49",0xB7AA],
- ["8E4A",0xB7AE],
- ["8E4B",0xB7AF],
- ["8E4C",0xB7B0],
- ["8E4D",0xB7B1],
- ["8E4E",0xB7B2],
- ["8E4F",0xB7B3],
- ["8E50",0xB7B6],
- ["8E51",0xB7B7],
- ["8E52",0xB7B9],
- ["8E53",0xB7BA],
- ["8E54",0xB7BB],
- ["8E55",0xB7BC],
- ["8E56",0xB7BD],
- ["8E57",0xB7BE],
- ["8E58",0xB7BF],
- ["8E59",0xB7C0],
- ["8E5A",0xB7C1],
- ["8E61",0xB7C2],
- ["8E62",0xB7C3],
- ["8E63",0xB7C4],
- ["8E64",0xB7C5],
- ["8E65",0xB7C6],
- ["8E66",0xB7C8],
- ["8E67",0xB7CA],
- ["8E68",0xB7CB],
- ["8E69",0xB7CC],
- ["8E6A",0xB7CD],
- ["8E6B",0xB7CE],
- ["8E6C",0xB7CF],
- ["8E6D",0xB7D0],
- ["8E6E",0xB7D1],
- ["8E6F",0xB7D2],
- ["8E70",0xB7D3],
- ["8E71",0xB7D4],
- ["8E72",0xB7D5],
- ["8E73",0xB7D6],
- ["8E74",0xB7D7],
- ["8E75",0xB7D8],
- ["8E76",0xB7D9],
- ["8E77",0xB7DA],
- ["8E78",0xB7DB],
- ["8E79",0xB7DC],
- ["8E7A",0xB7DD],
- ["8E81",0xB7DE],
- ["8E82",0xB7DF],
- ["8E83",0xB7E0],
- ["8E84",0xB7E1],
- ["8E85",0xB7E2],
- ["8E86",0xB7E3],
- ["8E87",0xB7E4],
- ["8E88",0xB7E5],
- ["8E89",0xB7E6],
- ["8E8A",0xB7E7],
- ["8E8B",0xB7E8],
- ["8E8C",0xB7E9],
- ["8E8D",0xB7EA],
- ["8E8E",0xB7EB],
- ["8E8F",0xB7EE],
- ["8E90",0xB7EF],
- ["8E91",0xB7F1],
- ["8E92",0xB7F2],
- ["8E93",0xB7F3],
- ["8E94",0xB7F5],
- ["8E95",0xB7F6],
- ["8E96",0xB7F7],
- ["8E97",0xB7F8],
- ["8E98",0xB7F9],
- ["8E99",0xB7FA],
- ["8E9A",0xB7FB],
- ["8E9B",0xB7FE],
- ["8E9C",0xB802],
- ["8E9D",0xB803],
- ["8E9E",0xB804],
- ["8E9F",0xB805],
- ["8EA0",0xB806],
- ["8EA1",0xB80A],
- ["8EA2",0xB80B],
- ["8EA3",0xB80D],
- ["8EA4",0xB80E],
- ["8EA5",0xB80F],
- ["8EA6",0xB811],
- ["8EA7",0xB812],
- ["8EA8",0xB813],
- ["8EA9",0xB814],
- ["8EAA",0xB815],
- ["8EAB",0xB816],
- ["8EAC",0xB817],
- ["8EAD",0xB81A],
- ["8EAE",0xB81C],
- ["8EAF",0xB81E],
- ["8EB0",0xB81F],
- ["8EB1",0xB820],
- ["8EB2",0xB821],
- ["8EB3",0xB822],
- ["8EB4",0xB823],
- ["8EB5",0xB826],
- ["8EB6",0xB827],
- ["8EB7",0xB829],
- ["8EB8",0xB82A],
- ["8EB9",0xB82B],
- ["8EBA",0xB82D],
- ["8EBB",0xB82E],
- ["8EBC",0xB82F],
- ["8EBD",0xB830],
- ["8EBE",0xB831],
- ["8EBF",0xB832],
- ["8EC0",0xB833],
- ["8EC1",0xB836],
- ["8EC2",0xB83A],
- ["8EC3",0xB83B],
- ["8EC4",0xB83C],
- ["8EC5",0xB83D],
- ["8EC6",0xB83E],
- ["8EC7",0xB83F],
- ["8EC8",0xB841],
- ["8EC9",0xB842],
- ["8ECA",0xB843],
- ["8ECB",0xB845],
- ["8ECC",0xB846],
- ["8ECD",0xB847],
- ["8ECE",0xB848],
- ["8ECF",0xB849],
- ["8ED0",0xB84A],
- ["8ED1",0xB84B],
- ["8ED2",0xB84C],
- ["8ED3",0xB84D],
- ["8ED4",0xB84E],
- ["8ED5",0xB84F],
- ["8ED6",0xB850],
- ["8ED7",0xB852],
- ["8ED8",0xB854],
- ["8ED9",0xB855],
- ["8EDA",0xB856],
- ["8EDB",0xB857],
- ["8EDC",0xB858],
- ["8EDD",0xB859],
- ["8EDE",0xB85A],
- ["8EDF",0xB85B],
- ["8EE0",0xB85E],
- ["8EE1",0xB85F],
- ["8EE2",0xB861],
- ["8EE3",0xB862],
- ["8EE4",0xB863],
- ["8EE5",0xB865],
- ["8EE6",0xB866],
- ["8EE7",0xB867],
- ["8EE8",0xB868],
- ["8EE9",0xB869],
- ["8EEA",0xB86A],
- ["8EEB",0xB86B],
- ["8EEC",0xB86E],
- ["8EED",0xB870],
- ["8EEE",0xB872],
- ["8EEF",0xB873],
- ["8EF0",0xB874],
- ["8EF1",0xB875],
- ["8EF2",0xB876],
- ["8EF3",0xB877],
- ["8EF4",0xB879],
- ["8EF5",0xB87A],
- ["8EF6",0xB87B],
- ["8EF7",0xB87D],
- ["8EF8",0xB87E],
- ["8EF9",0xB87F],
- ["8EFA",0xB880],
- ["8EFB",0xB881],
- ["8EFC",0xB882],
- ["8EFD",0xB883],
- ["8EFE",0xB884],
- ["8F41",0xB885],
- ["8F42",0xB886],
- ["8F43",0xB887],
- ["8F44",0xB888],
- ["8F45",0xB889],
- ["8F46",0xB88A],
- ["8F47",0xB88B],
- ["8F48",0xB88C],
- ["8F49",0xB88E],
- ["8F4A",0xB88F],
- ["8F4B",0xB890],
- ["8F4C",0xB891],
- ["8F4D",0xB892],
- ["8F4E",0xB893],
- ["8F4F",0xB894],
- ["8F50",0xB895],
- ["8F51",0xB896],
- ["8F52",0xB897],
- ["8F53",0xB898],
- ["8F54",0xB899],
- ["8F55",0xB89A],
- ["8F56",0xB89B],
- ["8F57",0xB89C],
- ["8F58",0xB89D],
- ["8F59",0xB89E],
- ["8F5A",0xB89F],
- ["8F61",0xB8A0],
- ["8F62",0xB8A1],
- ["8F63",0xB8A2],
- ["8F64",0xB8A3],
- ["8F65",0xB8A4],
- ["8F66",0xB8A5],
- ["8F67",0xB8A6],
- ["8F68",0xB8A7],
- ["8F69",0xB8A9],
- ["8F6A",0xB8AA],
- ["8F6B",0xB8AB],
- ["8F6C",0xB8AC],
- ["8F6D",0xB8AD],
- ["8F6E",0xB8AE],
- ["8F6F",0xB8AF],
- ["8F70",0xB8B1],
- ["8F71",0xB8B2],
- ["8F72",0xB8B3],
- ["8F73",0xB8B5],
- ["8F74",0xB8B6],
- ["8F75",0xB8B7],
- ["8F76",0xB8B9],
- ["8F77",0xB8BA],
- ["8F78",0xB8BB],
- ["8F79",0xB8BC],
- ["8F7A",0xB8BD],
- ["8F81",0xB8BE],
- ["8F82",0xB8BF],
- ["8F83",0xB8C2],
- ["8F84",0xB8C4],
- ["8F85",0xB8C6],
- ["8F86",0xB8C7],
- ["8F87",0xB8C8],
- ["8F88",0xB8C9],
- ["8F89",0xB8CA],
- ["8F8A",0xB8CB],
- ["8F8B",0xB8CD],
- ["8F8C",0xB8CE],
- ["8F8D",0xB8CF],
- ["8F8E",0xB8D1],
- ["8F8F",0xB8D2],
- ["8F90",0xB8D3],
- ["8F91",0xB8D5],
- ["8F92",0xB8D6],
- ["8F93",0xB8D7],
- ["8F94",0xB8D8],
- ["8F95",0xB8D9],
- ["8F96",0xB8DA],
- ["8F97",0xB8DB],
- ["8F98",0xB8DC],
- ["8F99",0xB8DE],
- ["8F9A",0xB8E0],
- ["8F9B",0xB8E2],
- ["8F9C",0xB8E3],
- ["8F9D",0xB8E4],
- ["8F9E",0xB8E5],
- ["8F9F",0xB8E6],
- ["8FA0",0xB8E7],
- ["8FA1",0xB8EA],
- ["8FA2",0xB8EB],
- ["8FA3",0xB8ED],
- ["8FA4",0xB8EE],
- ["8FA5",0xB8EF],
- ["8FA6",0xB8F1],
- ["8FA7",0xB8F2],
- ["8FA8",0xB8F3],
- ["8FA9",0xB8F4],
- ["8FAA",0xB8F5],
- ["8FAB",0xB8F6],
- ["8FAC",0xB8F7],
- ["8FAD",0xB8FA],
- ["8FAE",0xB8FC],
- ["8FAF",0xB8FE],
- ["8FB0",0xB8FF],
- ["8FB1",0xB900],
- ["8FB2",0xB901],
- ["8FB3",0xB902],
- ["8FB4",0xB903],
- ["8FB5",0xB905],
- ["8FB6",0xB906],
- ["8FB7",0xB907],
- ["8FB8",0xB908],
- ["8FB9",0xB909],
- ["8FBA",0xB90A],
- ["8FBB",0xB90B],
- ["8FBC",0xB90C],
- ["8FBD",0xB90D],
- ["8FBE",0xB90E],
- ["8FBF",0xB90F],
- ["8FC0",0xB910],
- ["8FC1",0xB911],
- ["8FC2",0xB912],
- ["8FC3",0xB913],
- ["8FC4",0xB914],
- ["8FC5",0xB915],
- ["8FC6",0xB916],
- ["8FC7",0xB917],
- ["8FC8",0xB919],
- ["8FC9",0xB91A],
- ["8FCA",0xB91B],
- ["8FCB",0xB91C],
- ["8FCC",0xB91D],
- ["8FCD",0xB91E],
- ["8FCE",0xB91F],
- ["8FCF",0xB921],
- ["8FD0",0xB922],
- ["8FD1",0xB923],
- ["8FD2",0xB924],
- ["8FD3",0xB925],
- ["8FD4",0xB926],
- ["8FD5",0xB927],
- ["8FD6",0xB928],
- ["8FD7",0xB929],
- ["8FD8",0xB92A],
- ["8FD9",0xB92B],
- ["8FDA",0xB92C],
- ["8FDB",0xB92D],
- ["8FDC",0xB92E],
- ["8FDD",0xB92F],
- ["8FDE",0xB930],
- ["8FDF",0xB931],
- ["8FE0",0xB932],
- ["8FE1",0xB933],
- ["8FE2",0xB934],
- ["8FE3",0xB935],
- ["8FE4",0xB936],
- ["8FE5",0xB937],
- ["8FE6",0xB938],
- ["8FE7",0xB939],
- ["8FE8",0xB93A],
- ["8FE9",0xB93B],
- ["8FEA",0xB93E],
- ["8FEB",0xB93F],
- ["8FEC",0xB941],
- ["8FED",0xB942],
- ["8FEE",0xB943],
- ["8FEF",0xB945],
- ["8FF0",0xB946],
- ["8FF1",0xB947],
- ["8FF2",0xB948],
- ["8FF3",0xB949],
- ["8FF4",0xB94A],
- ["8FF5",0xB94B],
- ["8FF6",0xB94D],
- ["8FF7",0xB94E],
- ["8FF8",0xB950],
- ["8FF9",0xB952],
- ["8FFA",0xB953],
- ["8FFB",0xB954],
- ["8FFC",0xB955],
- ["8FFD",0xB956],
- ["8FFE",0xB957],
- ["9041",0xB95A],
- ["9042",0xB95B],
- ["9043",0xB95D],
- ["9044",0xB95E],
- ["9045",0xB95F],
- ["9046",0xB961],
- ["9047",0xB962],
- ["9048",0xB963],
- ["9049",0xB964],
- ["904A",0xB965],
- ["904B",0xB966],
- ["904C",0xB967],
- ["904D",0xB96A],
- ["904E",0xB96C],
- ["904F",0xB96E],
- ["9050",0xB96F],
- ["9051",0xB970],
- ["9052",0xB971],
- ["9053",0xB972],
- ["9054",0xB973],
- ["9055",0xB976],
- ["9056",0xB977],
- ["9057",0xB979],
- ["9058",0xB97A],
- ["9059",0xB97B],
- ["905A",0xB97D],
- ["9061",0xB97E],
- ["9062",0xB97F],
- ["9063",0xB980],
- ["9064",0xB981],
- ["9065",0xB982],
- ["9066",0xB983],
- ["9067",0xB986],
- ["9068",0xB988],
- ["9069",0xB98B],
- ["906A",0xB98C],
- ["906B",0xB98F],
- ["906C",0xB990],
- ["906D",0xB991],
- ["906E",0xB992],
- ["906F",0xB993],
- ["9070",0xB994],
- ["9071",0xB995],
- ["9072",0xB996],
- ["9073",0xB997],
- ["9074",0xB998],
- ["9075",0xB999],
- ["9076",0xB99A],
- ["9077",0xB99B],
- ["9078",0xB99C],
- ["9079",0xB99D],
- ["907A",0xB99E],
- ["9081",0xB99F],
- ["9082",0xB9A0],
- ["9083",0xB9A1],
- ["9084",0xB9A2],
- ["9085",0xB9A3],
- ["9086",0xB9A4],
- ["9087",0xB9A5],
- ["9088",0xB9A6],
- ["9089",0xB9A7],
- ["908A",0xB9A8],
- ["908B",0xB9A9],
- ["908C",0xB9AA],
- ["908D",0xB9AB],
- ["908E",0xB9AE],
- ["908F",0xB9AF],
- ["9090",0xB9B1],
- ["9091",0xB9B2],
- ["9092",0xB9B3],
- ["9093",0xB9B5],
- ["9094",0xB9B6],
- ["9095",0xB9B7],
- ["9096",0xB9B8],
- ["9097",0xB9B9],
- ["9098",0xB9BA],
- ["9099",0xB9BB],
- ["909A",0xB9BE],
- ["909B",0xB9C0],
- ["909C",0xB9C2],
- ["909D",0xB9C3],
- ["909E",0xB9C4],
- ["909F",0xB9C5],
- ["90A0",0xB9C6],
- ["90A1",0xB9C7],
- ["90A2",0xB9CA],
- ["90A3",0xB9CB],
- ["90A4",0xB9CD],
- ["90A5",0xB9D3],
- ["90A6",0xB9D4],
- ["90A7",0xB9D5],
- ["90A8",0xB9D6],
- ["90A9",0xB9D7],
- ["90AA",0xB9DA],
- ["90AB",0xB9DC],
- ["90AC",0xB9DF],
- ["90AD",0xB9E0],
- ["90AE",0xB9E2],
- ["90AF",0xB9E6],
- ["90B0",0xB9E7],
- ["90B1",0xB9E9],
- ["90B2",0xB9EA],
- ["90B3",0xB9EB],
- ["90B4",0xB9ED],
- ["90B5",0xB9EE],
- ["90B6",0xB9EF],
- ["90B7",0xB9F0],
- ["90B8",0xB9F1],
- ["90B9",0xB9F2],
- ["90BA",0xB9F3],
- ["90BB",0xB9F6],
- ["90BC",0xB9FB],
- ["90BD",0xB9FC],
- ["90BE",0xB9FD],
- ["90BF",0xB9FE],
- ["90C0",0xB9FF],
- ["90C1",0xBA02],
- ["90C2",0xBA03],
- ["90C3",0xBA04],
- ["90C4",0xBA05],
- ["90C5",0xBA06],
- ["90C6",0xBA07],
- ["90C7",0xBA09],
- ["90C8",0xBA0A],
- ["90C9",0xBA0B],
- ["90CA",0xBA0C],
- ["90CB",0xBA0D],
- ["90CC",0xBA0E],
- ["90CD",0xBA0F],
- ["90CE",0xBA10],
- ["90CF",0xBA11],
- ["90D0",0xBA12],
- ["90D1",0xBA13],
- ["90D2",0xBA14],
- ["90D3",0xBA16],
- ["90D4",0xBA17],
- ["90D5",0xBA18],
- ["90D6",0xBA19],
- ["90D7",0xBA1A],
- ["90D8",0xBA1B],
- ["90D9",0xBA1C],
- ["90DA",0xBA1D],
- ["90DB",0xBA1E],
- ["90DC",0xBA1F],
- ["90DD",0xBA20],
- ["90DE",0xBA21],
- ["90DF",0xBA22],
- ["90E0",0xBA23],
- ["90E1",0xBA24],
- ["90E2",0xBA25],
- ["90E3",0xBA26],
- ["90E4",0xBA27],
- ["90E5",0xBA28],
- ["90E6",0xBA29],
- ["90E7",0xBA2A],
- ["90E8",0xBA2B],
- ["90E9",0xBA2C],
- ["90EA",0xBA2D],
- ["90EB",0xBA2E],
- ["90EC",0xBA2F],
- ["90ED",0xBA30],
- ["90EE",0xBA31],
- ["90EF",0xBA32],
- ["90F0",0xBA33],
- ["90F1",0xBA34],
- ["90F2",0xBA35],
- ["90F3",0xBA36],
- ["90F4",0xBA37],
- ["90F5",0xBA3A],
- ["90F6",0xBA3B],
- ["90F7",0xBA3D],
- ["90F8",0xBA3E],
- ["90F9",0xBA3F],
- ["90FA",0xBA41],
- ["90FB",0xBA43],
- ["90FC",0xBA44],
- ["90FD",0xBA45],
- ["90FE",0xBA46],
- ["9141",0xBA47],
- ["9142",0xBA4A],
- ["9143",0xBA4C],
- ["9144",0xBA4F],
- ["9145",0xBA50],
- ["9146",0xBA51],
- ["9147",0xBA52],
- ["9148",0xBA56],
- ["9149",0xBA57],
- ["914A",0xBA59],
- ["914B",0xBA5A],
- ["914C",0xBA5B],
- ["914D",0xBA5D],
- ["914E",0xBA5E],
- ["914F",0xBA5F],
- ["9150",0xBA60],
- ["9151",0xBA61],
- ["9152",0xBA62],
- ["9153",0xBA63],
- ["9154",0xBA66],
- ["9155",0xBA6A],
- ["9156",0xBA6B],
- ["9157",0xBA6C],
- ["9158",0xBA6D],
- ["9159",0xBA6E],
- ["915A",0xBA6F],
- ["9161",0xBA72],
- ["9162",0xBA73],
- ["9163",0xBA75],
- ["9164",0xBA76],
- ["9165",0xBA77],
- ["9166",0xBA79],
- ["9167",0xBA7A],
- ["9168",0xBA7B],
- ["9169",0xBA7C],
- ["916A",0xBA7D],
- ["916B",0xBA7E],
- ["916C",0xBA7F],
- ["916D",0xBA80],
- ["916E",0xBA81],
- ["916F",0xBA82],
- ["9170",0xBA86],
- ["9171",0xBA88],
- ["9172",0xBA89],
- ["9173",0xBA8A],
- ["9174",0xBA8B],
- ["9175",0xBA8D],
- ["9176",0xBA8E],
- ["9177",0xBA8F],
- ["9178",0xBA90],
- ["9179",0xBA91],
- ["917A",0xBA92],
- ["9181",0xBA93],
- ["9182",0xBA94],
- ["9183",0xBA95],
- ["9184",0xBA96],
- ["9185",0xBA97],
- ["9186",0xBA98],
- ["9187",0xBA99],
- ["9188",0xBA9A],
- ["9189",0xBA9B],
- ["918A",0xBA9C],
- ["918B",0xBA9D],
- ["918C",0xBA9E],
- ["918D",0xBA9F],
- ["918E",0xBAA0],
- ["918F",0xBAA1],
- ["9190",0xBAA2],
- ["9191",0xBAA3],
- ["9192",0xBAA4],
- ["9193",0xBAA5],
- ["9194",0xBAA6],
- ["9195",0xBAA7],
- ["9196",0xBAAA],
- ["9197",0xBAAD],
- ["9198",0xBAAE],
- ["9199",0xBAAF],
- ["919A",0xBAB1],
- ["919B",0xBAB3],
- ["919C",0xBAB4],
- ["919D",0xBAB5],
- ["919E",0xBAB6],
- ["919F",0xBAB7],
- ["91A0",0xBABA],
- ["91A1",0xBABC],
- ["91A2",0xBABE],
- ["91A3",0xBABF],
- ["91A4",0xBAC0],
- ["91A5",0xBAC1],
- ["91A6",0xBAC2],
- ["91A7",0xBAC3],
- ["91A8",0xBAC5],
- ["91A9",0xBAC6],
- ["91AA",0xBAC7],
- ["91AB",0xBAC9],
- ["91AC",0xBACA],
- ["91AD",0xBACB],
- ["91AE",0xBACC],
- ["91AF",0xBACD],
- ["91B0",0xBACE],
- ["91B1",0xBACF],
- ["91B2",0xBAD0],
- ["91B3",0xBAD1],
- ["91B4",0xBAD2],
- ["91B5",0xBAD3],
- ["91B6",0xBAD4],
- ["91B7",0xBAD5],
- ["91B8",0xBAD6],
- ["91B9",0xBAD7],
- ["91BA",0xBADA],
- ["91BB",0xBADB],
- ["91BC",0xBADC],
- ["91BD",0xBADD],
- ["91BE",0xBADE],
- ["91BF",0xBADF],
- ["91C0",0xBAE0],
- ["91C1",0xBAE1],
- ["91C2",0xBAE2],
- ["91C3",0xBAE3],
- ["91C4",0xBAE4],
- ["91C5",0xBAE5],
- ["91C6",0xBAE6],
- ["91C7",0xBAE7],
- ["91C8",0xBAE8],
- ["91C9",0xBAE9],
- ["91CA",0xBAEA],
- ["91CB",0xBAEB],
- ["91CC",0xBAEC],
- ["91CD",0xBAED],
- ["91CE",0xBAEE],
- ["91CF",0xBAEF],
- ["91D0",0xBAF0],
- ["91D1",0xBAF1],
- ["91D2",0xBAF2],
- ["91D3",0xBAF3],
- ["91D4",0xBAF4],
- ["91D5",0xBAF5],
- ["91D6",0xBAF6],
- ["91D7",0xBAF7],
- ["91D8",0xBAF8],
- ["91D9",0xBAF9],
- ["91DA",0xBAFA],
- ["91DB",0xBAFB],
- ["91DC",0xBAFD],
- ["91DD",0xBAFE],
- ["91DE",0xBAFF],
- ["91DF",0xBB01],
- ["91E0",0xBB02],
- ["91E1",0xBB03],
- ["91E2",0xBB05],
- ["91E3",0xBB06],
- ["91E4",0xBB07],
- ["91E5",0xBB08],
- ["91E6",0xBB09],
- ["91E7",0xBB0A],
- ["91E8",0xBB0B],
- ["91E9",0xBB0C],
- ["91EA",0xBB0E],
- ["91EB",0xBB10],
- ["91EC",0xBB12],
- ["91ED",0xBB13],
- ["91EE",0xBB14],
- ["91EF",0xBB15],
- ["91F0",0xBB16],
- ["91F1",0xBB17],
- ["91F2",0xBB19],
- ["91F3",0xBB1A],
- ["91F4",0xBB1B],
- ["91F5",0xBB1D],
- ["91F6",0xBB1E],
- ["91F7",0xBB1F],
- ["91F8",0xBB21],
- ["91F9",0xBB22],
- ["91FA",0xBB23],
- ["91FB",0xBB24],
- ["91FC",0xBB25],
- ["91FD",0xBB26],
- ["91FE",0xBB27],
- ["9241",0xBB28],
- ["9242",0xBB2A],
- ["9243",0xBB2C],
- ["9244",0xBB2D],
- ["9245",0xBB2E],
- ["9246",0xBB2F],
- ["9247",0xBB30],
- ["9248",0xBB31],
- ["9249",0xBB32],
- ["924A",0xBB33],
- ["924B",0xBB37],
- ["924C",0xBB39],
- ["924D",0xBB3A],
- ["924E",0xBB3F],
- ["924F",0xBB40],
- ["9250",0xBB41],
- ["9251",0xBB42],
- ["9252",0xBB43],
- ["9253",0xBB46],
- ["9254",0xBB48],
- ["9255",0xBB4A],
- ["9256",0xBB4B],
- ["9257",0xBB4C],
- ["9258",0xBB4E],
- ["9259",0xBB51],
- ["925A",0xBB52],
- ["9261",0xBB53],
- ["9262",0xBB55],
- ["9263",0xBB56],
- ["9264",0xBB57],
- ["9265",0xBB59],
- ["9266",0xBB5A],
- ["9267",0xBB5B],
- ["9268",0xBB5C],
- ["9269",0xBB5D],
- ["926A",0xBB5E],
- ["926B",0xBB5F],
- ["926C",0xBB60],
- ["926D",0xBB62],
- ["926E",0xBB64],
- ["926F",0xBB65],
- ["9270",0xBB66],
- ["9271",0xBB67],
- ["9272",0xBB68],
- ["9273",0xBB69],
- ["9274",0xBB6A],
- ["9275",0xBB6B],
- ["9276",0xBB6D],
- ["9277",0xBB6E],
- ["9278",0xBB6F],
- ["9279",0xBB70],
- ["927A",0xBB71],
- ["9281",0xBB72],
- ["9282",0xBB73],
- ["9283",0xBB74],
- ["9284",0xBB75],
- ["9285",0xBB76],
- ["9286",0xBB77],
- ["9287",0xBB78],
- ["9288",0xBB79],
- ["9289",0xBB7A],
- ["928A",0xBB7B],
- ["928B",0xBB7C],
- ["928C",0xBB7D],
- ["928D",0xBB7E],
- ["928E",0xBB7F],
- ["928F",0xBB80],
- ["9290",0xBB81],
- ["9291",0xBB82],
- ["9292",0xBB83],
- ["9293",0xBB84],
- ["9294",0xBB85],
- ["9295",0xBB86],
- ["9296",0xBB87],
- ["9297",0xBB89],
- ["9298",0xBB8A],
- ["9299",0xBB8B],
- ["929A",0xBB8D],
- ["929B",0xBB8E],
- ["929C",0xBB8F],
- ["929D",0xBB91],
- ["929E",0xBB92],
- ["929F",0xBB93],
- ["92A0",0xBB94],
- ["92A1",0xBB95],
- ["92A2",0xBB96],
- ["92A3",0xBB97],
- ["92A4",0xBB98],
- ["92A5",0xBB99],
- ["92A6",0xBB9A],
- ["92A7",0xBB9B],
- ["92A8",0xBB9C],
- ["92A9",0xBB9D],
- ["92AA",0xBB9E],
- ["92AB",0xBB9F],
- ["92AC",0xBBA0],
- ["92AD",0xBBA1],
- ["92AE",0xBBA2],
- ["92AF",0xBBA3],
- ["92B0",0xBBA5],
- ["92B1",0xBBA6],
- ["92B2",0xBBA7],
- ["92B3",0xBBA9],
- ["92B4",0xBBAA],
- ["92B5",0xBBAB],
- ["92B6",0xBBAD],
- ["92B7",0xBBAE],
- ["92B8",0xBBAF],
- ["92B9",0xBBB0],
- ["92BA",0xBBB1],
- ["92BB",0xBBB2],
- ["92BC",0xBBB3],
- ["92BD",0xBBB5],
- ["92BE",0xBBB6],
- ["92BF",0xBBB8],
- ["92C0",0xBBB9],
- ["92C1",0xBBBA],
- ["92C2",0xBBBB],
- ["92C3",0xBBBC],
- ["92C4",0xBBBD],
- ["92C5",0xBBBE],
- ["92C6",0xBBBF],
- ["92C7",0xBBC1],
- ["92C8",0xBBC2],
- ["92C9",0xBBC3],
- ["92CA",0xBBC5],
- ["92CB",0xBBC6],
- ["92CC",0xBBC7],
- ["92CD",0xBBC9],
- ["92CE",0xBBCA],
- ["92CF",0xBBCB],
- ["92D0",0xBBCC],
- ["92D1",0xBBCD],
- ["92D2",0xBBCE],
- ["92D3",0xBBCF],
- ["92D4",0xBBD1],
- ["92D5",0xBBD2],
- ["92D6",0xBBD4],
- ["92D7",0xBBD5],
- ["92D8",0xBBD6],
- ["92D9",0xBBD7],
- ["92DA",0xBBD8],
- ["92DB",0xBBD9],
- ["92DC",0xBBDA],
- ["92DD",0xBBDB],
- ["92DE",0xBBDC],
- ["92DF",0xBBDD],
- ["92E0",0xBBDE],
- ["92E1",0xBBDF],
- ["92E2",0xBBE0],
- ["92E3",0xBBE1],
- ["92E4",0xBBE2],
- ["92E5",0xBBE3],
- ["92E6",0xBBE4],
- ["92E7",0xBBE5],
- ["92E8",0xBBE6],
- ["92E9",0xBBE7],
- ["92EA",0xBBE8],
- ["92EB",0xBBE9],
- ["92EC",0xBBEA],
- ["92ED",0xBBEB],
- ["92EE",0xBBEC],
- ["92EF",0xBBED],
- ["92F0",0xBBEE],
- ["92F1",0xBBEF],
- ["92F2",0xBBF0],
- ["92F3",0xBBF1],
- ["92F4",0xBBF2],
- ["92F5",0xBBF3],
- ["92F6",0xBBF4],
- ["92F7",0xBBF5],
- ["92F8",0xBBF6],
- ["92F9",0xBBF7],
- ["92FA",0xBBFA],
- ["92FB",0xBBFB],
- ["92FC",0xBBFD],
- ["92FD",0xBBFE],
- ["92FE",0xBC01],
- ["9341",0xBC03],
- ["9342",0xBC04],
- ["9343",0xBC05],
- ["9344",0xBC06],
- ["9345",0xBC07],
- ["9346",0xBC0A],
- ["9347",0xBC0E],
- ["9348",0xBC10],
- ["9349",0xBC12],
- ["934A",0xBC13],
- ["934B",0xBC19],
- ["934C",0xBC1A],
- ["934D",0xBC20],
- ["934E",0xBC21],
- ["934F",0xBC22],
- ["9350",0xBC23],
- ["9351",0xBC26],
- ["9352",0xBC28],
- ["9353",0xBC2A],
- ["9354",0xBC2B],
- ["9355",0xBC2C],
- ["9356",0xBC2E],
- ["9357",0xBC2F],
- ["9358",0xBC32],
- ["9359",0xBC33],
- ["935A",0xBC35],
- ["9361",0xBC36],
- ["9362",0xBC37],
- ["9363",0xBC39],
- ["9364",0xBC3A],
- ["9365",0xBC3B],
- ["9366",0xBC3C],
- ["9367",0xBC3D],
- ["9368",0xBC3E],
- ["9369",0xBC3F],
- ["936A",0xBC42],
- ["936B",0xBC46],
- ["936C",0xBC47],
- ["936D",0xBC48],
- ["936E",0xBC4A],
- ["936F",0xBC4B],
- ["9370",0xBC4E],
- ["9371",0xBC4F],
- ["9372",0xBC51],
- ["9373",0xBC52],
- ["9374",0xBC53],
- ["9375",0xBC54],
- ["9376",0xBC55],
- ["9377",0xBC56],
- ["9378",0xBC57],
- ["9379",0xBC58],
- ["937A",0xBC59],
- ["9381",0xBC5A],
- ["9382",0xBC5B],
- ["9383",0xBC5C],
- ["9384",0xBC5E],
- ["9385",0xBC5F],
- ["9386",0xBC60],
- ["9387",0xBC61],
- ["9388",0xBC62],
- ["9389",0xBC63],
- ["938A",0xBC64],
- ["938B",0xBC65],
- ["938C",0xBC66],
- ["938D",0xBC67],
- ["938E",0xBC68],
- ["938F",0xBC69],
- ["9390",0xBC6A],
- ["9391",0xBC6B],
- ["9392",0xBC6C],
- ["9393",0xBC6D],
- ["9394",0xBC6E],
- ["9395",0xBC6F],
- ["9396",0xBC70],
- ["9397",0xBC71],
- ["9398",0xBC72],
- ["9399",0xBC73],
- ["939A",0xBC74],
- ["939B",0xBC75],
- ["939C",0xBC76],
- ["939D",0xBC77],
- ["939E",0xBC78],
- ["939F",0xBC79],
- ["93A0",0xBC7A],
- ["93A1",0xBC7B],
- ["93A2",0xBC7C],
- ["93A3",0xBC7D],
- ["93A4",0xBC7E],
- ["93A5",0xBC7F],
- ["93A6",0xBC80],
- ["93A7",0xBC81],
- ["93A8",0xBC82],
- ["93A9",0xBC83],
- ["93AA",0xBC86],
- ["93AB",0xBC87],
- ["93AC",0xBC89],
- ["93AD",0xBC8A],
- ["93AE",0xBC8D],
- ["93AF",0xBC8F],
- ["93B0",0xBC90],
- ["93B1",0xBC91],
- ["93B2",0xBC92],
- ["93B3",0xBC93],
- ["93B4",0xBC96],
- ["93B5",0xBC98],
- ["93B6",0xBC9B],
- ["93B7",0xBC9C],
- ["93B8",0xBC9D],
- ["93B9",0xBC9E],
- ["93BA",0xBC9F],
- ["93BB",0xBCA2],
- ["93BC",0xBCA3],
- ["93BD",0xBCA5],
- ["93BE",0xBCA6],
- ["93BF",0xBCA9],
- ["93C0",0xBCAA],
- ["93C1",0xBCAB],
- ["93C2",0xBCAC],
- ["93C3",0xBCAD],
- ["93C4",0xBCAE],
- ["93C5",0xBCAF],
- ["93C6",0xBCB2],
- ["93C7",0xBCB6],
- ["93C8",0xBCB7],
- ["93C9",0xBCB8],
- ["93CA",0xBCB9],
- ["93CB",0xBCBA],
- ["93CC",0xBCBB],
- ["93CD",0xBCBE],
- ["93CE",0xBCBF],
- ["93CF",0xBCC1],
- ["93D0",0xBCC2],
- ["93D1",0xBCC3],
- ["93D2",0xBCC5],
- ["93D3",0xBCC6],
- ["93D4",0xBCC7],
- ["93D5",0xBCC8],
- ["93D6",0xBCC9],
- ["93D7",0xBCCA],
- ["93D8",0xBCCB],
- ["93D9",0xBCCC],
- ["93DA",0xBCCE],
- ["93DB",0xBCD2],
- ["93DC",0xBCD3],
- ["93DD",0xBCD4],
- ["93DE",0xBCD6],
- ["93DF",0xBCD7],
- ["93E0",0xBCD9],
- ["93E1",0xBCDA],
- ["93E2",0xBCDB],
- ["93E3",0xBCDD],
- ["93E4",0xBCDE],
- ["93E5",0xBCDF],
- ["93E6",0xBCE0],
- ["93E7",0xBCE1],
- ["93E8",0xBCE2],
- ["93E9",0xBCE3],
- ["93EA",0xBCE4],
- ["93EB",0xBCE5],
- ["93EC",0xBCE6],
- ["93ED",0xBCE7],
- ["93EE",0xBCE8],
- ["93EF",0xBCE9],
- ["93F0",0xBCEA],
- ["93F1",0xBCEB],
- ["93F2",0xBCEC],
- ["93F3",0xBCED],
- ["93F4",0xBCEE],
- ["93F5",0xBCEF],
- ["93F6",0xBCF0],
- ["93F7",0xBCF1],
- ["93F8",0xBCF2],
- ["93F9",0xBCF3],
- ["93FA",0xBCF7],
- ["93FB",0xBCF9],
- ["93FC",0xBCFA],
- ["93FD",0xBCFB],
- ["93FE",0xBCFD],
- ["9441",0xBCFE],
- ["9442",0xBCFF],
- ["9443",0xBD00],
- ["9444",0xBD01],
- ["9445",0xBD02],
- ["9446",0xBD03],
- ["9447",0xBD06],
- ["9448",0xBD08],
- ["9449",0xBD0A],
- ["944A",0xBD0B],
- ["944B",0xBD0C],
- ["944C",0xBD0D],
- ["944D",0xBD0E],
- ["944E",0xBD0F],
- ["944F",0xBD11],
- ["9450",0xBD12],
- ["9451",0xBD13],
- ["9452",0xBD15],
- ["9453",0xBD16],
- ["9454",0xBD17],
- ["9455",0xBD18],
- ["9456",0xBD19],
- ["9457",0xBD1A],
- ["9458",0xBD1B],
- ["9459",0xBD1C],
- ["945A",0xBD1D],
- ["9461",0xBD1E],
- ["9462",0xBD1F],
- ["9463",0xBD20],
- ["9464",0xBD21],
- ["9465",0xBD22],
- ["9466",0xBD23],
- ["9467",0xBD25],
- ["9468",0xBD26],
- ["9469",0xBD27],
- ["946A",0xBD28],
- ["946B",0xBD29],
- ["946C",0xBD2A],
- ["946D",0xBD2B],
- ["946E",0xBD2D],
- ["946F",0xBD2E],
- ["9470",0xBD2F],
- ["9471",0xBD30],
- ["9472",0xBD31],
- ["9473",0xBD32],
- ["9474",0xBD33],
- ["9475",0xBD34],
- ["9476",0xBD35],
- ["9477",0xBD36],
- ["9478",0xBD37],
- ["9479",0xBD38],
- ["947A",0xBD39],
- ["9481",0xBD3A],
- ["9482",0xBD3B],
- ["9483",0xBD3C],
- ["9484",0xBD3D],
- ["9485",0xBD3E],
- ["9486",0xBD3F],
- ["9487",0xBD41],
- ["9488",0xBD42],
- ["9489",0xBD43],
- ["948A",0xBD44],
- ["948B",0xBD45],
- ["948C",0xBD46],
- ["948D",0xBD47],
- ["948E",0xBD4A],
- ["948F",0xBD4B],
- ["9490",0xBD4D],
- ["9491",0xBD4E],
- ["9492",0xBD4F],
- ["9493",0xBD51],
- ["9494",0xBD52],
- ["9495",0xBD53],
- ["9496",0xBD54],
- ["9497",0xBD55],
- ["9498",0xBD56],
- ["9499",0xBD57],
- ["949A",0xBD5A],
- ["949B",0xBD5B],
- ["949C",0xBD5C],
- ["949D",0xBD5D],
- ["949E",0xBD5E],
- ["949F",0xBD5F],
- ["94A0",0xBD60],
- ["94A1",0xBD61],
- ["94A2",0xBD62],
- ["94A3",0xBD63],
- ["94A4",0xBD65],
- ["94A5",0xBD66],
- ["94A6",0xBD67],
- ["94A7",0xBD69],
- ["94A8",0xBD6A],
- ["94A9",0xBD6B],
- ["94AA",0xBD6C],
- ["94AB",0xBD6D],
- ["94AC",0xBD6E],
- ["94AD",0xBD6F],
- ["94AE",0xBD70],
- ["94AF",0xBD71],
- ["94B0",0xBD72],
- ["94B1",0xBD73],
- ["94B2",0xBD74],
- ["94B3",0xBD75],
- ["94B4",0xBD76],
- ["94B5",0xBD77],
- ["94B6",0xBD78],
- ["94B7",0xBD79],
- ["94B8",0xBD7A],
- ["94B9",0xBD7B],
- ["94BA",0xBD7C],
- ["94BB",0xBD7D],
- ["94BC",0xBD7E],
- ["94BD",0xBD7F],
- ["94BE",0xBD82],
- ["94BF",0xBD83],
- ["94C0",0xBD85],
- ["94C1",0xBD86],
- ["94C2",0xBD8B],
- ["94C3",0xBD8C],
- ["94C4",0xBD8D],
- ["94C5",0xBD8E],
- ["94C6",0xBD8F],
- ["94C7",0xBD92],
- ["94C8",0xBD94],
- ["94C9",0xBD96],
- ["94CA",0xBD97],
- ["94CB",0xBD98],
- ["94CC",0xBD9B],
- ["94CD",0xBD9D],
- ["94CE",0xBD9E],
- ["94CF",0xBD9F],
- ["94D0",0xBDA0],
- ["94D1",0xBDA1],
- ["94D2",0xBDA2],
- ["94D3",0xBDA3],
- ["94D4",0xBDA5],
- ["94D5",0xBDA6],
- ["94D6",0xBDA7],
- ["94D7",0xBDA8],
- ["94D8",0xBDA9],
- ["94D9",0xBDAA],
- ["94DA",0xBDAB],
- ["94DB",0xBDAC],
- ["94DC",0xBDAD],
- ["94DD",0xBDAE],
- ["94DE",0xBDAF],
- ["94DF",0xBDB1],
- ["94E0",0xBDB2],
- ["94E1",0xBDB3],
- ["94E2",0xBDB4],
- ["94E3",0xBDB5],
- ["94E4",0xBDB6],
- ["94E5",0xBDB7],
- ["94E6",0xBDB9],
- ["94E7",0xBDBA],
- ["94E8",0xBDBB],
- ["94E9",0xBDBC],
- ["94EA",0xBDBD],
- ["94EB",0xBDBE],
- ["94EC",0xBDBF],
- ["94ED",0xBDC0],
- ["94EE",0xBDC1],
- ["94EF",0xBDC2],
- ["94F0",0xBDC3],
- ["94F1",0xBDC4],
- ["94F2",0xBDC5],
- ["94F3",0xBDC6],
- ["94F4",0xBDC7],
- ["94F5",0xBDC8],
- ["94F6",0xBDC9],
- ["94F7",0xBDCA],
- ["94F8",0xBDCB],
- ["94F9",0xBDCC],
- ["94FA",0xBDCD],
- ["94FB",0xBDCE],
- ["94FC",0xBDCF],
- ["94FD",0xBDD0],
- ["94FE",0xBDD1],
- ["9541",0xBDD2],
- ["9542",0xBDD3],
- ["9543",0xBDD6],
- ["9544",0xBDD7],
- ["9545",0xBDD9],
- ["9546",0xBDDA],
- ["9547",0xBDDB],
- ["9548",0xBDDD],
- ["9549",0xBDDE],
- ["954A",0xBDDF],
- ["954B",0xBDE0],
- ["954C",0xBDE1],
- ["954D",0xBDE2],
- ["954E",0xBDE3],
- ["954F",0xBDE4],
- ["9550",0xBDE5],
- ["9551",0xBDE6],
- ["9552",0xBDE7],
- ["9553",0xBDE8],
- ["9554",0xBDEA],
- ["9555",0xBDEB],
- ["9556",0xBDEC],
- ["9557",0xBDED],
- ["9558",0xBDEE],
- ["9559",0xBDEF],
- ["955A",0xBDF1],
- ["9561",0xBDF2],
- ["9562",0xBDF3],
- ["9563",0xBDF5],
- ["9564",0xBDF6],
- ["9565",0xBDF7],
- ["9566",0xBDF9],
- ["9567",0xBDFA],
- ["9568",0xBDFB],
- ["9569",0xBDFC],
- ["956A",0xBDFD],
- ["956B",0xBDFE],
- ["956C",0xBDFF],
- ["956D",0xBE01],
- ["956E",0xBE02],
- ["956F",0xBE04],
- ["9570",0xBE06],
- ["9571",0xBE07],
- ["9572",0xBE08],
- ["9573",0xBE09],
- ["9574",0xBE0A],
- ["9575",0xBE0B],
- ["9576",0xBE0E],
- ["9577",0xBE0F],
- ["9578",0xBE11],
- ["9579",0xBE12],
- ["957A",0xBE13],
- ["9581",0xBE15],
- ["9582",0xBE16],
- ["9583",0xBE17],
- ["9584",0xBE18],
- ["9585",0xBE19],
- ["9586",0xBE1A],
- ["9587",0xBE1B],
- ["9588",0xBE1E],
- ["9589",0xBE20],
- ["958A",0xBE21],
- ["958B",0xBE22],
- ["958C",0xBE23],
- ["958D",0xBE24],
- ["958E",0xBE25],
- ["958F",0xBE26],
- ["9590",0xBE27],
- ["9591",0xBE28],
- ["9592",0xBE29],
- ["9593",0xBE2A],
- ["9594",0xBE2B],
- ["9595",0xBE2C],
- ["9596",0xBE2D],
- ["9597",0xBE2E],
- ["9598",0xBE2F],
- ["9599",0xBE30],
- ["959A",0xBE31],
- ["959B",0xBE32],
- ["959C",0xBE33],
- ["959D",0xBE34],
- ["959E",0xBE35],
- ["959F",0xBE36],
- ["95A0",0xBE37],
- ["95A1",0xBE38],
- ["95A2",0xBE39],
- ["95A3",0xBE3A],
- ["95A4",0xBE3B],
- ["95A5",0xBE3C],
- ["95A6",0xBE3D],
- ["95A7",0xBE3E],
- ["95A8",0xBE3F],
- ["95A9",0xBE40],
- ["95AA",0xBE41],
- ["95AB",0xBE42],
- ["95AC",0xBE43],
- ["95AD",0xBE46],
- ["95AE",0xBE47],
- ["95AF",0xBE49],
- ["95B0",0xBE4A],
- ["95B1",0xBE4B],
- ["95B2",0xBE4D],
- ["95B3",0xBE4F],
- ["95B4",0xBE50],
- ["95B5",0xBE51],
- ["95B6",0xBE52],
- ["95B7",0xBE53],
- ["95B8",0xBE56],
- ["95B9",0xBE58],
- ["95BA",0xBE5C],
- ["95BB",0xBE5D],
- ["95BC",0xBE5E],
- ["95BD",0xBE5F],
- ["95BE",0xBE62],
- ["95BF",0xBE63],
- ["95C0",0xBE65],
- ["95C1",0xBE66],
- ["95C2",0xBE67],
- ["95C3",0xBE69],
- ["95C4",0xBE6B],
- ["95C5",0xBE6C],
- ["95C6",0xBE6D],
- ["95C7",0xBE6E],
- ["95C8",0xBE6F],
- ["95C9",0xBE72],
- ["95CA",0xBE76],
- ["95CB",0xBE77],
- ["95CC",0xBE78],
- ["95CD",0xBE79],
- ["95CE",0xBE7A],
- ["95CF",0xBE7E],
- ["95D0",0xBE7F],
- ["95D1",0xBE81],
- ["95D2",0xBE82],
- ["95D3",0xBE83],
- ["95D4",0xBE85],
- ["95D5",0xBE86],
- ["95D6",0xBE87],
- ["95D7",0xBE88],
- ["95D8",0xBE89],
- ["95D9",0xBE8A],
- ["95DA",0xBE8B],
- ["95DB",0xBE8E],
- ["95DC",0xBE92],
- ["95DD",0xBE93],
- ["95DE",0xBE94],
- ["95DF",0xBE95],
- ["95E0",0xBE96],
- ["95E1",0xBE97],
- ["95E2",0xBE9A],
- ["95E3",0xBE9B],
- ["95E4",0xBE9C],
- ["95E5",0xBE9D],
- ["95E6",0xBE9E],
- ["95E7",0xBE9F],
- ["95E8",0xBEA0],
- ["95E9",0xBEA1],
- ["95EA",0xBEA2],
- ["95EB",0xBEA3],
- ["95EC",0xBEA4],
- ["95ED",0xBEA5],
- ["95EE",0xBEA6],
- ["95EF",0xBEA7],
- ["95F0",0xBEA9],
- ["95F1",0xBEAA],
- ["95F2",0xBEAB],
- ["95F3",0xBEAC],
- ["95F4",0xBEAD],
- ["95F5",0xBEAE],
- ["95F6",0xBEAF],
- ["95F7",0xBEB0],
- ["95F8",0xBEB1],
- ["95F9",0xBEB2],
- ["95FA",0xBEB3],
- ["95FB",0xBEB4],
- ["95FC",0xBEB5],
- ["95FD",0xBEB6],
- ["95FE",0xBEB7],
- ["9641",0xBEB8],
- ["9642",0xBEB9],
- ["9643",0xBEBA],
- ["9644",0xBEBB],
- ["9645",0xBEBC],
- ["9646",0xBEBD],
- ["9647",0xBEBE],
- ["9648",0xBEBF],
- ["9649",0xBEC0],
- ["964A",0xBEC1],
- ["964B",0xBEC2],
- ["964C",0xBEC3],
- ["964D",0xBEC4],
- ["964E",0xBEC5],
- ["964F",0xBEC6],
- ["9650",0xBEC7],
- ["9651",0xBEC8],
- ["9652",0xBEC9],
- ["9653",0xBECA],
- ["9654",0xBECB],
- ["9655",0xBECC],
- ["9656",0xBECD],
- ["9657",0xBECE],
- ["9658",0xBECF],
- ["9659",0xBED2],
- ["965A",0xBED3],
- ["9661",0xBED5],
- ["9662",0xBED6],
- ["9663",0xBED9],
- ["9664",0xBEDA],
- ["9665",0xBEDB],
- ["9666",0xBEDC],
- ["9667",0xBEDD],
- ["9668",0xBEDE],
- ["9669",0xBEDF],
- ["966A",0xBEE1],
- ["966B",0xBEE2],
- ["966C",0xBEE6],
- ["966D",0xBEE7],
- ["966E",0xBEE8],
- ["966F",0xBEE9],
- ["9670",0xBEEA],
- ["9671",0xBEEB],
- ["9672",0xBEED],
- ["9673",0xBEEE],
- ["9674",0xBEEF],
- ["9675",0xBEF0],
- ["9676",0xBEF1],
- ["9677",0xBEF2],
- ["9678",0xBEF3],
- ["9679",0xBEF4],
- ["967A",0xBEF5],
- ["9681",0xBEF6],
- ["9682",0xBEF7],
- ["9683",0xBEF8],
- ["9684",0xBEF9],
- ["9685",0xBEFA],
- ["9686",0xBEFB],
- ["9687",0xBEFC],
- ["9688",0xBEFD],
- ["9689",0xBEFE],
- ["968A",0xBEFF],
- ["968B",0xBF00],
- ["968C",0xBF02],
- ["968D",0xBF03],
- ["968E",0xBF04],
- ["968F",0xBF05],
- ["9690",0xBF06],
- ["9691",0xBF07],
- ["9692",0xBF0A],
- ["9693",0xBF0B],
- ["9694",0xBF0C],
- ["9695",0xBF0D],
- ["9696",0xBF0E],
- ["9697",0xBF0F],
- ["9698",0xBF10],
- ["9699",0xBF11],
- ["969A",0xBF12],
- ["969B",0xBF13],
- ["969C",0xBF14],
- ["969D",0xBF15],
- ["969E",0xBF16],
- ["969F",0xBF17],
- ["96A0",0xBF1A],
- ["96A1",0xBF1E],
- ["96A2",0xBF1F],
- ["96A3",0xBF20],
- ["96A4",0xBF21],
- ["96A5",0xBF22],
- ["96A6",0xBF23],
- ["96A7",0xBF24],
- ["96A8",0xBF25],
- ["96A9",0xBF26],
- ["96AA",0xBF27],
- ["96AB",0xBF28],
- ["96AC",0xBF29],
- ["96AD",0xBF2A],
- ["96AE",0xBF2B],
- ["96AF",0xBF2C],
- ["96B0",0xBF2D],
- ["96B1",0xBF2E],
- ["96B2",0xBF2F],
- ["96B3",0xBF30],
- ["96B4",0xBF31],
- ["96B5",0xBF32],
- ["96B6",0xBF33],
- ["96B7",0xBF34],
- ["96B8",0xBF35],
- ["96B9",0xBF36],
- ["96BA",0xBF37],
- ["96BB",0xBF38],
- ["96BC",0xBF39],
- ["96BD",0xBF3A],
- ["96BE",0xBF3B],
- ["96BF",0xBF3C],
- ["96C0",0xBF3D],
- ["96C1",0xBF3E],
- ["96C2",0xBF3F],
- ["96C3",0xBF42],
- ["96C4",0xBF43],
- ["96C5",0xBF45],
- ["96C6",0xBF46],
- ["96C7",0xBF47],
- ["96C8",0xBF49],
- ["96C9",0xBF4A],
- ["96CA",0xBF4B],
- ["96CB",0xBF4C],
- ["96CC",0xBF4D],
- ["96CD",0xBF4E],
- ["96CE",0xBF4F],
- ["96CF",0xBF52],
- ["96D0",0xBF53],
- ["96D1",0xBF54],
- ["96D2",0xBF56],
- ["96D3",0xBF57],
- ["96D4",0xBF58],
- ["96D5",0xBF59],
- ["96D6",0xBF5A],
- ["96D7",0xBF5B],
- ["96D8",0xBF5C],
- ["96D9",0xBF5D],
- ["96DA",0xBF5E],
- ["96DB",0xBF5F],
- ["96DC",0xBF60],
- ["96DD",0xBF61],
- ["96DE",0xBF62],
- ["96DF",0xBF63],
- ["96E0",0xBF64],
- ["96E1",0xBF65],
- ["96E2",0xBF66],
- ["96E3",0xBF67],
- ["96E4",0xBF68],
- ["96E5",0xBF69],
- ["96E6",0xBF6A],
- ["96E7",0xBF6B],
- ["96E8",0xBF6C],
- ["96E9",0xBF6D],
- ["96EA",0xBF6E],
- ["96EB",0xBF6F],
- ["96EC",0xBF70],
- ["96ED",0xBF71],
- ["96EE",0xBF72],
- ["96EF",0xBF73],
- ["96F0",0xBF74],
- ["96F1",0xBF75],
- ["96F2",0xBF76],
- ["96F3",0xBF77],
- ["96F4",0xBF78],
- ["96F5",0xBF79],
- ["96F6",0xBF7A],
- ["96F7",0xBF7B],
- ["96F8",0xBF7C],
- ["96F9",0xBF7D],
- ["96FA",0xBF7E],
- ["96FB",0xBF7F],
- ["96FC",0xBF80],
- ["96FD",0xBF81],
- ["96FE",0xBF82],
- ["9741",0xBF83],
- ["9742",0xBF84],
- ["9743",0xBF85],
- ["9744",0xBF86],
- ["9745",0xBF87],
- ["9746",0xBF88],
- ["9747",0xBF89],
- ["9748",0xBF8A],
- ["9749",0xBF8B],
- ["974A",0xBF8C],
- ["974B",0xBF8D],
- ["974C",0xBF8E],
- ["974D",0xBF8F],
- ["974E",0xBF90],
- ["974F",0xBF91],
- ["9750",0xBF92],
- ["9751",0xBF93],
- ["9752",0xBF95],
- ["9753",0xBF96],
- ["9754",0xBF97],
- ["9755",0xBF98],
- ["9756",0xBF99],
- ["9757",0xBF9A],
- ["9758",0xBF9B],
- ["9759",0xBF9C],
- ["975A",0xBF9D],
- ["9761",0xBF9E],
- ["9762",0xBF9F],
- ["9763",0xBFA0],
- ["9764",0xBFA1],
- ["9765",0xBFA2],
- ["9766",0xBFA3],
- ["9767",0xBFA4],
- ["9768",0xBFA5],
- ["9769",0xBFA6],
- ["976A",0xBFA7],
- ["976B",0xBFA8],
- ["976C",0xBFA9],
- ["976D",0xBFAA],
- ["976E",0xBFAB],
- ["976F",0xBFAC],
- ["9770",0xBFAD],
- ["9771",0xBFAE],
- ["9772",0xBFAF],
- ["9773",0xBFB1],
- ["9774",0xBFB2],
- ["9775",0xBFB3],
- ["9776",0xBFB4],
- ["9777",0xBFB5],
- ["9778",0xBFB6],
- ["9779",0xBFB7],
- ["977A",0xBFB8],
- ["9781",0xBFB9],
- ["9782",0xBFBA],
- ["9783",0xBFBB],
- ["9784",0xBFBC],
- ["9785",0xBFBD],
- ["9786",0xBFBE],
- ["9787",0xBFBF],
- ["9788",0xBFC0],
- ["9789",0xBFC1],
- ["978A",0xBFC2],
- ["978B",0xBFC3],
- ["978C",0xBFC4],
- ["978D",0xBFC6],
- ["978E",0xBFC7],
- ["978F",0xBFC8],
- ["9790",0xBFC9],
- ["9791",0xBFCA],
- ["9792",0xBFCB],
- ["9793",0xBFCE],
- ["9794",0xBFCF],
- ["9795",0xBFD1],
- ["9796",0xBFD2],
- ["9797",0xBFD3],
- ["9798",0xBFD5],
- ["9799",0xBFD6],
- ["979A",0xBFD7],
- ["979B",0xBFD8],
- ["979C",0xBFD9],
- ["979D",0xBFDA],
- ["979E",0xBFDB],
- ["979F",0xBFDD],
- ["97A0",0xBFDE],
- ["97A1",0xBFE0],
- ["97A2",0xBFE2],
- ["97A3",0xBFE3],
- ["97A4",0xBFE4],
- ["97A5",0xBFE5],
- ["97A6",0xBFE6],
- ["97A7",0xBFE7],
- ["97A8",0xBFE8],
- ["97A9",0xBFE9],
- ["97AA",0xBFEA],
- ["97AB",0xBFEB],
- ["97AC",0xBFEC],
- ["97AD",0xBFED],
- ["97AE",0xBFEE],
- ["97AF",0xBFEF],
- ["97B0",0xBFF0],
- ["97B1",0xBFF1],
- ["97B2",0xBFF2],
- ["97B3",0xBFF3],
- ["97B4",0xBFF4],
- ["97B5",0xBFF5],
- ["97B6",0xBFF6],
- ["97B7",0xBFF7],
- ["97B8",0xBFF8],
- ["97B9",0xBFF9],
- ["97BA",0xBFFA],
- ["97BB",0xBFFB],
- ["97BC",0xBFFC],
- ["97BD",0xBFFD],
- ["97BE",0xBFFE],
- ["97BF",0xBFFF],
- ["97C0",0xC000],
- ["97C1",0xC001],
- ["97C2",0xC002],
- ["97C3",0xC003],
- ["97C4",0xC004],
- ["97C5",0xC005],
- ["97C6",0xC006],
- ["97C7",0xC007],
- ["97C8",0xC008],
- ["97C9",0xC009],
- ["97CA",0xC00A],
- ["97CB",0xC00B],
- ["97CC",0xC00C],
- ["97CD",0xC00D],
- ["97CE",0xC00E],
- ["97CF",0xC00F],
- ["97D0",0xC010],
- ["97D1",0xC011],
- ["97D2",0xC012],
- ["97D3",0xC013],
- ["97D4",0xC014],
- ["97D5",0xC015],
- ["97D6",0xC016],
- ["97D7",0xC017],
- ["97D8",0xC018],
- ["97D9",0xC019],
- ["97DA",0xC01A],
- ["97DB",0xC01B],
- ["97DC",0xC01C],
- ["97DD",0xC01D],
- ["97DE",0xC01E],
- ["97DF",0xC01F],
- ["97E0",0xC020],
- ["97E1",0xC021],
- ["97E2",0xC022],
- ["97E3",0xC023],
- ["97E4",0xC024],
- ["97E5",0xC025],
- ["97E6",0xC026],
- ["97E7",0xC027],
- ["97E8",0xC028],
- ["97E9",0xC029],
- ["97EA",0xC02A],
- ["97EB",0xC02B],
- ["97EC",0xC02C],
- ["97ED",0xC02D],
- ["97EE",0xC02E],
- ["97EF",0xC02F],
- ["97F0",0xC030],
- ["97F1",0xC031],
- ["97F2",0xC032],
- ["97F3",0xC033],
- ["97F4",0xC034],
- ["97F5",0xC035],
- ["97F6",0xC036],
- ["97F7",0xC037],
- ["97F8",0xC038],
- ["97F9",0xC039],
- ["97FA",0xC03A],
- ["97FB",0xC03B],
- ["97FC",0xC03D],
- ["97FD",0xC03E],
- ["97FE",0xC03F],
- ["9841",0xC040],
- ["9842",0xC041],
- ["9843",0xC042],
- ["9844",0xC043],
- ["9845",0xC044],
- ["9846",0xC045],
- ["9847",0xC046],
- ["9848",0xC047],
- ["9849",0xC048],
- ["984A",0xC049],
- ["984B",0xC04A],
- ["984C",0xC04B],
- ["984D",0xC04C],
- ["984E",0xC04D],
- ["984F",0xC04E],
- ["9850",0xC04F],
- ["9851",0xC050],
- ["9852",0xC052],
- ["9853",0xC053],
- ["9854",0xC054],
- ["9855",0xC055],
- ["9856",0xC056],
- ["9857",0xC057],
- ["9858",0xC059],
- ["9859",0xC05A],
- ["985A",0xC05B],
- ["9861",0xC05D],
- ["9862",0xC05E],
- ["9863",0xC05F],
- ["9864",0xC061],
- ["9865",0xC062],
- ["9866",0xC063],
- ["9867",0xC064],
- ["9868",0xC065],
- ["9869",0xC066],
- ["986A",0xC067],
- ["986B",0xC06A],
- ["986C",0xC06B],
- ["986D",0xC06C],
- ["986E",0xC06D],
- ["986F",0xC06E],
- ["9870",0xC06F],
- ["9871",0xC070],
- ["9872",0xC071],
- ["9873",0xC072],
- ["9874",0xC073],
- ["9875",0xC074],
- ["9876",0xC075],
- ["9877",0xC076],
- ["9878",0xC077],
- ["9879",0xC078],
- ["987A",0xC079],
- ["9881",0xC07A],
- ["9882",0xC07B],
- ["9883",0xC07C],
- ["9884",0xC07D],
- ["9885",0xC07E],
- ["9886",0xC07F],
- ["9887",0xC080],
- ["9888",0xC081],
- ["9889",0xC082],
- ["988A",0xC083],
- ["988B",0xC084],
- ["988C",0xC085],
- ["988D",0xC086],
- ["988E",0xC087],
- ["988F",0xC088],
- ["9890",0xC089],
- ["9891",0xC08A],
- ["9892",0xC08B],
- ["9893",0xC08C],
- ["9894",0xC08D],
- ["9895",0xC08E],
- ["9896",0xC08F],
- ["9897",0xC092],
- ["9898",0xC093],
- ["9899",0xC095],
- ["989A",0xC096],
- ["989B",0xC097],
- ["989C",0xC099],
- ["989D",0xC09A],
- ["989E",0xC09B],
- ["989F",0xC09C],
- ["98A0",0xC09D],
- ["98A1",0xC09E],
- ["98A2",0xC09F],
- ["98A3",0xC0A2],
- ["98A4",0xC0A4],
- ["98A5",0xC0A6],
- ["98A6",0xC0A7],
- ["98A7",0xC0A8],
- ["98A8",0xC0A9],
- ["98A9",0xC0AA],
- ["98AA",0xC0AB],
- ["98AB",0xC0AE],
- ["98AC",0xC0B1],
- ["98AD",0xC0B2],
- ["98AE",0xC0B7],
- ["98AF",0xC0B8],
- ["98B0",0xC0B9],
- ["98B1",0xC0BA],
- ["98B2",0xC0BB],
- ["98B3",0xC0BE],
- ["98B4",0xC0C2],
- ["98B5",0xC0C3],
- ["98B6",0xC0C4],
- ["98B7",0xC0C6],
- ["98B8",0xC0C7],
- ["98B9",0xC0CA],
- ["98BA",0xC0CB],
- ["98BB",0xC0CD],
- ["98BC",0xC0CE],
- ["98BD",0xC0CF],
- ["98BE",0xC0D1],
- ["98BF",0xC0D2],
- ["98C0",0xC0D3],
- ["98C1",0xC0D4],
- ["98C2",0xC0D5],
- ["98C3",0xC0D6],
- ["98C4",0xC0D7],
- ["98C5",0xC0DA],
- ["98C6",0xC0DE],
- ["98C7",0xC0DF],
- ["98C8",0xC0E0],
- ["98C9",0xC0E1],
- ["98CA",0xC0E2],
- ["98CB",0xC0E3],
- ["98CC",0xC0E6],
- ["98CD",0xC0E7],
- ["98CE",0xC0E9],
- ["98CF",0xC0EA],
- ["98D0",0xC0EB],
- ["98D1",0xC0ED],
- ["98D2",0xC0EE],
- ["98D3",0xC0EF],
- ["98D4",0xC0F0],
- ["98D5",0xC0F1],
- ["98D6",0xC0F2],
- ["98D7",0xC0F3],
- ["98D8",0xC0F6],
- ["98D9",0xC0F8],
- ["98DA",0xC0FA],
- ["98DB",0xC0FB],
- ["98DC",0xC0FC],
- ["98DD",0xC0FD],
- ["98DE",0xC0FE],
- ["98DF",0xC0FF],
- ["98E0",0xC101],
- ["98E1",0xC102],
- ["98E2",0xC103],
- ["98E3",0xC105],
- ["98E4",0xC106],
- ["98E5",0xC107],
- ["98E6",0xC109],
- ["98E7",0xC10A],
- ["98E8",0xC10B],
- ["98E9",0xC10C],
- ["98EA",0xC10D],
- ["98EB",0xC10E],
- ["98EC",0xC10F],
- ["98ED",0xC111],
- ["98EE",0xC112],
- ["98EF",0xC113],
- ["98F0",0xC114],
- ["98F1",0xC116],
- ["98F2",0xC117],
- ["98F3",0xC118],
- ["98F4",0xC119],
- ["98F5",0xC11A],
- ["98F6",0xC11B],
- ["98F7",0xC121],
- ["98F8",0xC122],
- ["98F9",0xC125],
- ["98FA",0xC128],
- ["98FB",0xC129],
- ["98FC",0xC12A],
- ["98FD",0xC12B],
- ["98FE",0xC12E],
- ["9941",0xC132],
- ["9942",0xC133],
- ["9943",0xC134],
- ["9944",0xC135],
- ["9945",0xC137],
- ["9946",0xC13A],
- ["9947",0xC13B],
- ["9948",0xC13D],
- ["9949",0xC13E],
- ["994A",0xC13F],
- ["994B",0xC141],
- ["994C",0xC142],
- ["994D",0xC143],
- ["994E",0xC144],
- ["994F",0xC145],
- ["9950",0xC146],
- ["9951",0xC147],
- ["9952",0xC14A],
- ["9953",0xC14E],
- ["9954",0xC14F],
- ["9955",0xC150],
- ["9956",0xC151],
- ["9957",0xC152],
- ["9958",0xC153],
- ["9959",0xC156],
- ["995A",0xC157],
- ["9961",0xC159],
- ["9962",0xC15A],
- ["9963",0xC15B],
- ["9964",0xC15D],
- ["9965",0xC15E],
- ["9966",0xC15F],
- ["9967",0xC160],
- ["9968",0xC161],
- ["9969",0xC162],
- ["996A",0xC163],
- ["996B",0xC166],
- ["996C",0xC16A],
- ["996D",0xC16B],
- ["996E",0xC16C],
- ["996F",0xC16D],
- ["9970",0xC16E],
- ["9971",0xC16F],
- ["9972",0xC171],
- ["9973",0xC172],
- ["9974",0xC173],
- ["9975",0xC175],
- ["9976",0xC176],
- ["9977",0xC177],
- ["9978",0xC179],
- ["9979",0xC17A],
- ["997A",0xC17B],
- ["9981",0xC17C],
- ["9982",0xC17D],
- ["9983",0xC17E],
- ["9984",0xC17F],
- ["9985",0xC180],
- ["9986",0xC181],
- ["9987",0xC182],
- ["9988",0xC183],
- ["9989",0xC184],
- ["998A",0xC186],
- ["998B",0xC187],
- ["998C",0xC188],
- ["998D",0xC189],
- ["998E",0xC18A],
- ["998F",0xC18B],
- ["9990",0xC18F],
- ["9991",0xC191],
- ["9992",0xC192],
- ["9993",0xC193],
- ["9994",0xC195],
- ["9995",0xC197],
- ["9996",0xC198],
- ["9997",0xC199],
- ["9998",0xC19A],
- ["9999",0xC19B],
- ["999A",0xC19E],
- ["999B",0xC1A0],
- ["999C",0xC1A2],
- ["999D",0xC1A3],
- ["999E",0xC1A4],
- ["999F",0xC1A6],
- ["99A0",0xC1A7],
- ["99A1",0xC1AA],
- ["99A2",0xC1AB],
- ["99A3",0xC1AD],
- ["99A4",0xC1AE],
- ["99A5",0xC1AF],
- ["99A6",0xC1B1],
- ["99A7",0xC1B2],
- ["99A8",0xC1B3],
- ["99A9",0xC1B4],
- ["99AA",0xC1B5],
- ["99AB",0xC1B6],
- ["99AC",0xC1B7],
- ["99AD",0xC1B8],
- ["99AE",0xC1B9],
- ["99AF",0xC1BA],
- ["99B0",0xC1BB],
- ["99B1",0xC1BC],
- ["99B2",0xC1BE],
- ["99B3",0xC1BF],
- ["99B4",0xC1C0],
- ["99B5",0xC1C1],
- ["99B6",0xC1C2],
- ["99B7",0xC1C3],
- ["99B8",0xC1C5],
- ["99B9",0xC1C6],
- ["99BA",0xC1C7],
- ["99BB",0xC1C9],
- ["99BC",0xC1CA],
- ["99BD",0xC1CB],
- ["99BE",0xC1CD],
- ["99BF",0xC1CE],
- ["99C0",0xC1CF],
- ["99C1",0xC1D0],
- ["99C2",0xC1D1],
- ["99C3",0xC1D2],
- ["99C4",0xC1D3],
- ["99C5",0xC1D5],
- ["99C6",0xC1D6],
- ["99C7",0xC1D9],
- ["99C8",0xC1DA],
- ["99C9",0xC1DB],
- ["99CA",0xC1DC],
- ["99CB",0xC1DD],
- ["99CC",0xC1DE],
- ["99CD",0xC1DF],
- ["99CE",0xC1E1],
- ["99CF",0xC1E2],
- ["99D0",0xC1E3],
- ["99D1",0xC1E5],
- ["99D2",0xC1E6],
- ["99D3",0xC1E7],
- ["99D4",0xC1E9],
- ["99D5",0xC1EA],
- ["99D6",0xC1EB],
- ["99D7",0xC1EC],
- ["99D8",0xC1ED],
- ["99D9",0xC1EE],
- ["99DA",0xC1EF],
- ["99DB",0xC1F2],
- ["99DC",0xC1F4],
- ["99DD",0xC1F5],
- ["99DE",0xC1F6],
- ["99DF",0xC1F7],
- ["99E0",0xC1F8],
- ["99E1",0xC1F9],
- ["99E2",0xC1FA],
- ["99E3",0xC1FB],
- ["99E4",0xC1FE],
- ["99E5",0xC1FF],
- ["99E6",0xC201],
- ["99E7",0xC202],
- ["99E8",0xC203],
- ["99E9",0xC205],
- ["99EA",0xC206],
- ["99EB",0xC207],
- ["99EC",0xC208],
- ["99ED",0xC209],
- ["99EE",0xC20A],
- ["99EF",0xC20B],
- ["99F0",0xC20E],
- ["99F1",0xC210],
- ["99F2",0xC212],
- ["99F3",0xC213],
- ["99F4",0xC214],
- ["99F5",0xC215],
- ["99F6",0xC216],
- ["99F7",0xC217],
- ["99F8",0xC21A],
- ["99F9",0xC21B],
- ["99FA",0xC21D],
- ["99FB",0xC21E],
- ["99FC",0xC221],
- ["99FD",0xC222],
- ["99FE",0xC223],
- ["9A41",0xC224],
- ["9A42",0xC225],
- ["9A43",0xC226],
- ["9A44",0xC227],
- ["9A45",0xC22A],
- ["9A46",0xC22C],
- ["9A47",0xC22E],
- ["9A48",0xC230],
- ["9A49",0xC233],
- ["9A4A",0xC235],
- ["9A4B",0xC236],
- ["9A4C",0xC237],
- ["9A4D",0xC238],
- ["9A4E",0xC239],
- ["9A4F",0xC23A],
- ["9A50",0xC23B],
- ["9A51",0xC23C],
- ["9A52",0xC23D],
- ["9A53",0xC23E],
- ["9A54",0xC23F],
- ["9A55",0xC240],
- ["9A56",0xC241],
- ["9A57",0xC242],
- ["9A58",0xC243],
- ["9A59",0xC244],
- ["9A5A",0xC245],
- ["9A61",0xC246],
- ["9A62",0xC247],
- ["9A63",0xC249],
- ["9A64",0xC24A],
- ["9A65",0xC24B],
- ["9A66",0xC24C],
- ["9A67",0xC24D],
- ["9A68",0xC24E],
- ["9A69",0xC24F],
- ["9A6A",0xC252],
- ["9A6B",0xC253],
- ["9A6C",0xC255],
- ["9A6D",0xC256],
- ["9A6E",0xC257],
- ["9A6F",0xC259],
- ["9A70",0xC25A],
- ["9A71",0xC25B],
- ["9A72",0xC25C],
- ["9A73",0xC25D],
- ["9A74",0xC25E],
- ["9A75",0xC25F],
- ["9A76",0xC261],
- ["9A77",0xC262],
- ["9A78",0xC263],
- ["9A79",0xC264],
- ["9A7A",0xC266],
- ["9A81",0xC267],
- ["9A82",0xC268],
- ["9A83",0xC269],
- ["9A84",0xC26A],
- ["9A85",0xC26B],
- ["9A86",0xC26E],
- ["9A87",0xC26F],
- ["9A88",0xC271],
- ["9A89",0xC272],
- ["9A8A",0xC273],
- ["9A8B",0xC275],
- ["9A8C",0xC276],
- ["9A8D",0xC277],
- ["9A8E",0xC278],
- ["9A8F",0xC279],
- ["9A90",0xC27A],
- ["9A91",0xC27B],
- ["9A92",0xC27E],
- ["9A93",0xC280],
- ["9A94",0xC282],
- ["9A95",0xC283],
- ["9A96",0xC284],
- ["9A97",0xC285],
- ["9A98",0xC286],
- ["9A99",0xC287],
- ["9A9A",0xC28A],
- ["9A9B",0xC28B],
- ["9A9C",0xC28C],
- ["9A9D",0xC28D],
- ["9A9E",0xC28E],
- ["9A9F",0xC28F],
- ["9AA0",0xC291],
- ["9AA1",0xC292],
- ["9AA2",0xC293],
- ["9AA3",0xC294],
- ["9AA4",0xC295],
- ["9AA5",0xC296],
- ["9AA6",0xC297],
- ["9AA7",0xC299],
- ["9AA8",0xC29A],
- ["9AA9",0xC29C],
- ["9AAA",0xC29E],
- ["9AAB",0xC29F],
- ["9AAC",0xC2A0],
- ["9AAD",0xC2A1],
- ["9AAE",0xC2A2],
- ["9AAF",0xC2A3],
- ["9AB0",0xC2A6],
- ["9AB1",0xC2A7],
- ["9AB2",0xC2A9],
- ["9AB3",0xC2AA],
- ["9AB4",0xC2AB],
- ["9AB5",0xC2AE],
- ["9AB6",0xC2AF],
- ["9AB7",0xC2B0],
- ["9AB8",0xC2B1],
- ["9AB9",0xC2B2],
- ["9ABA",0xC2B3],
- ["9ABB",0xC2B6],
- ["9ABC",0xC2B8],
- ["9ABD",0xC2BA],
- ["9ABE",0xC2BB],
- ["9ABF",0xC2BC],
- ["9AC0",0xC2BD],
- ["9AC1",0xC2BE],
- ["9AC2",0xC2BF],
- ["9AC3",0xC2C0],
- ["9AC4",0xC2C1],
- ["9AC5",0xC2C2],
- ["9AC6",0xC2C3],
- ["9AC7",0xC2C4],
- ["9AC8",0xC2C5],
- ["9AC9",0xC2C6],
- ["9ACA",0xC2C7],
- ["9ACB",0xC2C8],
- ["9ACC",0xC2C9],
- ["9ACD",0xC2CA],
- ["9ACE",0xC2CB],
- ["9ACF",0xC2CC],
- ["9AD0",0xC2CD],
- ["9AD1",0xC2CE],
- ["9AD2",0xC2CF],
- ["9AD3",0xC2D0],
- ["9AD4",0xC2D1],
- ["9AD5",0xC2D2],
- ["9AD6",0xC2D3],
- ["9AD7",0xC2D4],
- ["9AD8",0xC2D5],
- ["9AD9",0xC2D6],
- ["9ADA",0xC2D7],
- ["9ADB",0xC2D8],
- ["9ADC",0xC2D9],
- ["9ADD",0xC2DA],
- ["9ADE",0xC2DB],
- ["9ADF",0xC2DE],
- ["9AE0",0xC2DF],
- ["9AE1",0xC2E1],
- ["9AE2",0xC2E2],
- ["9AE3",0xC2E5],
- ["9AE4",0xC2E6],
- ["9AE5",0xC2E7],
- ["9AE6",0xC2E8],
- ["9AE7",0xC2E9],
- ["9AE8",0xC2EA],
- ["9AE9",0xC2EE],
- ["9AEA",0xC2F0],
- ["9AEB",0xC2F2],
- ["9AEC",0xC2F3],
- ["9AED",0xC2F4],
- ["9AEE",0xC2F5],
- ["9AEF",0xC2F7],
- ["9AF0",0xC2FA],
- ["9AF1",0xC2FD],
- ["9AF2",0xC2FE],
- ["9AF3",0xC2FF],
- ["9AF4",0xC301],
- ["9AF5",0xC302],
- ["9AF6",0xC303],
- ["9AF7",0xC304],
- ["9AF8",0xC305],
- ["9AF9",0xC306],
- ["9AFA",0xC307],
- ["9AFB",0xC30A],
- ["9AFC",0xC30B],
- ["9AFD",0xC30E],
- ["9AFE",0xC30F],
- ["9B41",0xC310],
- ["9B42",0xC311],
- ["9B43",0xC312],
- ["9B44",0xC316],
- ["9B45",0xC317],
- ["9B46",0xC319],
- ["9B47",0xC31A],
- ["9B48",0xC31B],
- ["9B49",0xC31D],
- ["9B4A",0xC31E],
- ["9B4B",0xC31F],
- ["9B4C",0xC320],
- ["9B4D",0xC321],
- ["9B4E",0xC322],
- ["9B4F",0xC323],
- ["9B50",0xC326],
- ["9B51",0xC327],
- ["9B52",0xC32A],
- ["9B53",0xC32B],
- ["9B54",0xC32C],
- ["9B55",0xC32D],
- ["9B56",0xC32E],
- ["9B57",0xC32F],
- ["9B58",0xC330],
- ["9B59",0xC331],
- ["9B5A",0xC332],
- ["9B61",0xC333],
- ["9B62",0xC334],
- ["9B63",0xC335],
- ["9B64",0xC336],
- ["9B65",0xC337],
- ["9B66",0xC338],
- ["9B67",0xC339],
- ["9B68",0xC33A],
- ["9B69",0xC33B],
- ["9B6A",0xC33C],
- ["9B6B",0xC33D],
- ["9B6C",0xC33E],
- ["9B6D",0xC33F],
- ["9B6E",0xC340],
- ["9B6F",0xC341],
- ["9B70",0xC342],
- ["9B71",0xC343],
- ["9B72",0xC344],
- ["9B73",0xC346],
- ["9B74",0xC347],
- ["9B75",0xC348],
- ["9B76",0xC349],
- ["9B77",0xC34A],
- ["9B78",0xC34B],
- ["9B79",0xC34C],
- ["9B7A",0xC34D],
- ["9B81",0xC34E],
- ["9B82",0xC34F],
- ["9B83",0xC350],
- ["9B84",0xC351],
- ["9B85",0xC352],
- ["9B86",0xC353],
- ["9B87",0xC354],
- ["9B88",0xC355],
- ["9B89",0xC356],
- ["9B8A",0xC357],
- ["9B8B",0xC358],
- ["9B8C",0xC359],
- ["9B8D",0xC35A],
- ["9B8E",0xC35B],
- ["9B8F",0xC35C],
- ["9B90",0xC35D],
- ["9B91",0xC35E],
- ["9B92",0xC35F],
- ["9B93",0xC360],
- ["9B94",0xC361],
- ["9B95",0xC362],
- ["9B96",0xC363],
- ["9B97",0xC364],
- ["9B98",0xC365],
- ["9B99",0xC366],
- ["9B9A",0xC367],
- ["9B9B",0xC36A],
- ["9B9C",0xC36B],
- ["9B9D",0xC36D],
- ["9B9E",0xC36E],
- ["9B9F",0xC36F],
- ["9BA0",0xC371],
- ["9BA1",0xC373],
- ["9BA2",0xC374],
- ["9BA3",0xC375],
- ["9BA4",0xC376],
- ["9BA5",0xC377],
- ["9BA6",0xC37A],
- ["9BA7",0xC37B],
- ["9BA8",0xC37E],
- ["9BA9",0xC37F],
- ["9BAA",0xC380],
- ["9BAB",0xC381],
- ["9BAC",0xC382],
- ["9BAD",0xC383],
- ["9BAE",0xC385],
- ["9BAF",0xC386],
- ["9BB0",0xC387],
- ["9BB1",0xC389],
- ["9BB2",0xC38A],
- ["9BB3",0xC38B],
- ["9BB4",0xC38D],
- ["9BB5",0xC38E],
- ["9BB6",0xC38F],
- ["9BB7",0xC390],
- ["9BB8",0xC391],
- ["9BB9",0xC392],
- ["9BBA",0xC393],
- ["9BBB",0xC394],
- ["9BBC",0xC395],
- ["9BBD",0xC396],
- ["9BBE",0xC397],
- ["9BBF",0xC398],
- ["9BC0",0xC399],
- ["9BC1",0xC39A],
- ["9BC2",0xC39B],
- ["9BC3",0xC39C],
- ["9BC4",0xC39D],
- ["9BC5",0xC39E],
- ["9BC6",0xC39F],
- ["9BC7",0xC3A0],
- ["9BC8",0xC3A1],
- ["9BC9",0xC3A2],
- ["9BCA",0xC3A3],
- ["9BCB",0xC3A4],
- ["9BCC",0xC3A5],
- ["9BCD",0xC3A6],
- ["9BCE",0xC3A7],
- ["9BCF",0xC3A8],
- ["9BD0",0xC3A9],
- ["9BD1",0xC3AA],
- ["9BD2",0xC3AB],
- ["9BD3",0xC3AC],
- ["9BD4",0xC3AD],
- ["9BD5",0xC3AE],
- ["9BD6",0xC3AF],
- ["9BD7",0xC3B0],
- ["9BD8",0xC3B1],
- ["9BD9",0xC3B2],
- ["9BDA",0xC3B3],
- ["9BDB",0xC3B4],
- ["9BDC",0xC3B5],
- ["9BDD",0xC3B6],
- ["9BDE",0xC3B7],
- ["9BDF",0xC3B8],
- ["9BE0",0xC3B9],
- ["9BE1",0xC3BA],
- ["9BE2",0xC3BB],
- ["9BE3",0xC3BC],
- ["9BE4",0xC3BD],
- ["9BE5",0xC3BE],
- ["9BE6",0xC3BF],
- ["9BE7",0xC3C1],
- ["9BE8",0xC3C2],
- ["9BE9",0xC3C3],
- ["9BEA",0xC3C4],
- ["9BEB",0xC3C5],
- ["9BEC",0xC3C6],
- ["9BED",0xC3C7],
- ["9BEE",0xC3C8],
- ["9BEF",0xC3C9],
- ["9BF0",0xC3CA],
- ["9BF1",0xC3CB],
- ["9BF2",0xC3CC],
- ["9BF3",0xC3CD],
- ["9BF4",0xC3CE],
- ["9BF5",0xC3CF],
- ["9BF6",0xC3D0],
- ["9BF7",0xC3D1],
- ["9BF8",0xC3D2],
- ["9BF9",0xC3D3],
- ["9BFA",0xC3D4],
- ["9BFB",0xC3D5],
- ["9BFC",0xC3D6],
- ["9BFD",0xC3D7],
- ["9BFE",0xC3DA],
- ["9C41",0xC3DB],
- ["9C42",0xC3DD],
- ["9C43",0xC3DE],
- ["9C44",0xC3E1],
- ["9C45",0xC3E3],
- ["9C46",0xC3E4],
- ["9C47",0xC3E5],
- ["9C48",0xC3E6],
- ["9C49",0xC3E7],
- ["9C4A",0xC3EA],
- ["9C4B",0xC3EB],
- ["9C4C",0xC3EC],
- ["9C4D",0xC3EE],
- ["9C4E",0xC3EF],
- ["9C4F",0xC3F0],
- ["9C50",0xC3F1],
- ["9C51",0xC3F2],
- ["9C52",0xC3F3],
- ["9C53",0xC3F6],
- ["9C54",0xC3F7],
- ["9C55",0xC3F9],
- ["9C56",0xC3FA],
- ["9C57",0xC3FB],
- ["9C58",0xC3FC],
- ["9C59",0xC3FD],
- ["9C5A",0xC3FE],
- ["9C61",0xC3FF],
- ["9C62",0xC400],
- ["9C63",0xC401],
- ["9C64",0xC402],
- ["9C65",0xC403],
- ["9C66",0xC404],
- ["9C67",0xC405],
- ["9C68",0xC406],
- ["9C69",0xC407],
- ["9C6A",0xC409],
- ["9C6B",0xC40A],
- ["9C6C",0xC40B],
- ["9C6D",0xC40C],
- ["9C6E",0xC40D],
- ["9C6F",0xC40E],
- ["9C70",0xC40F],
- ["9C71",0xC411],
- ["9C72",0xC412],
- ["9C73",0xC413],
- ["9C74",0xC414],
- ["9C75",0xC415],
- ["9C76",0xC416],
- ["9C77",0xC417],
- ["9C78",0xC418],
- ["9C79",0xC419],
- ["9C7A",0xC41A],
- ["9C81",0xC41B],
- ["9C82",0xC41C],
- ["9C83",0xC41D],
- ["9C84",0xC41E],
- ["9C85",0xC41F],
- ["9C86",0xC420],
- ["9C87",0xC421],
- ["9C88",0xC422],
- ["9C89",0xC423],
- ["9C8A",0xC425],
- ["9C8B",0xC426],
- ["9C8C",0xC427],
- ["9C8D",0xC428],
- ["9C8E",0xC429],
- ["9C8F",0xC42A],
- ["9C90",0xC42B],
- ["9C91",0xC42D],
- ["9C92",0xC42E],
- ["9C93",0xC42F],
- ["9C94",0xC431],
- ["9C95",0xC432],
- ["9C96",0xC433],
- ["9C97",0xC435],
- ["9C98",0xC436],
- ["9C99",0xC437],
- ["9C9A",0xC438],
- ["9C9B",0xC439],
- ["9C9C",0xC43A],
- ["9C9D",0xC43B],
- ["9C9E",0xC43E],
- ["9C9F",0xC43F],
- ["9CA0",0xC440],
- ["9CA1",0xC441],
- ["9CA2",0xC442],
- ["9CA3",0xC443],
- ["9CA4",0xC444],
- ["9CA5",0xC445],
- ["9CA6",0xC446],
- ["9CA7",0xC447],
- ["9CA8",0xC449],
- ["9CA9",0xC44A],
- ["9CAA",0xC44B],
- ["9CAB",0xC44C],
- ["9CAC",0xC44D],
- ["9CAD",0xC44E],
- ["9CAE",0xC44F],
- ["9CAF",0xC450],
- ["9CB0",0xC451],
- ["9CB1",0xC452],
- ["9CB2",0xC453],
- ["9CB3",0xC454],
- ["9CB4",0xC455],
- ["9CB5",0xC456],
- ["9CB6",0xC457],
- ["9CB7",0xC458],
- ["9CB8",0xC459],
- ["9CB9",0xC45A],
- ["9CBA",0xC45B],
- ["9CBB",0xC45C],
- ["9CBC",0xC45D],
- ["9CBD",0xC45E],
- ["9CBE",0xC45F],
- ["9CBF",0xC460],
- ["9CC0",0xC461],
- ["9CC1",0xC462],
- ["9CC2",0xC463],
- ["9CC3",0xC466],
- ["9CC4",0xC467],
- ["9CC5",0xC469],
- ["9CC6",0xC46A],
- ["9CC7",0xC46B],
- ["9CC8",0xC46D],
- ["9CC9",0xC46E],
- ["9CCA",0xC46F],
- ["9CCB",0xC470],
- ["9CCC",0xC471],
- ["9CCD",0xC472],
- ["9CCE",0xC473],
- ["9CCF",0xC476],
- ["9CD0",0xC477],
- ["9CD1",0xC478],
- ["9CD2",0xC47A],
- ["9CD3",0xC47B],
- ["9CD4",0xC47C],
- ["9CD5",0xC47D],
- ["9CD6",0xC47E],
- ["9CD7",0xC47F],
- ["9CD8",0xC481],
- ["9CD9",0xC482],
- ["9CDA",0xC483],
- ["9CDB",0xC484],
- ["9CDC",0xC485],
- ["9CDD",0xC486],
- ["9CDE",0xC487],
- ["9CDF",0xC488],
- ["9CE0",0xC489],
- ["9CE1",0xC48A],
- ["9CE2",0xC48B],
- ["9CE3",0xC48C],
- ["9CE4",0xC48D],
- ["9CE5",0xC48E],
- ["9CE6",0xC48F],
- ["9CE7",0xC490],
- ["9CE8",0xC491],
- ["9CE9",0xC492],
- ["9CEA",0xC493],
- ["9CEB",0xC495],
- ["9CEC",0xC496],
- ["9CED",0xC497],
- ["9CEE",0xC498],
- ["9CEF",0xC499],
- ["9CF0",0xC49A],
- ["9CF1",0xC49B],
- ["9CF2",0xC49D],
- ["9CF3",0xC49E],
- ["9CF4",0xC49F],
- ["9CF5",0xC4A0],
- ["9CF6",0xC4A1],
- ["9CF7",0xC4A2],
- ["9CF8",0xC4A3],
- ["9CF9",0xC4A4],
- ["9CFA",0xC4A5],
- ["9CFB",0xC4A6],
- ["9CFC",0xC4A7],
- ["9CFD",0xC4A8],
- ["9CFE",0xC4A9],
- ["9D41",0xC4AA],
- ["9D42",0xC4AB],
- ["9D43",0xC4AC],
- ["9D44",0xC4AD],
- ["9D45",0xC4AE],
- ["9D46",0xC4AF],
- ["9D47",0xC4B0],
- ["9D48",0xC4B1],
- ["9D49",0xC4B2],
- ["9D4A",0xC4B3],
- ["9D4B",0xC4B4],
- ["9D4C",0xC4B5],
- ["9D4D",0xC4B6],
- ["9D4E",0xC4B7],
- ["9D4F",0xC4B9],
- ["9D50",0xC4BA],
- ["9D51",0xC4BB],
- ["9D52",0xC4BD],
- ["9D53",0xC4BE],
- ["9D54",0xC4BF],
- ["9D55",0xC4C0],
- ["9D56",0xC4C1],
- ["9D57",0xC4C2],
- ["9D58",0xC4C3],
- ["9D59",0xC4C4],
- ["9D5A",0xC4C5],
- ["9D61",0xC4C6],
- ["9D62",0xC4C7],
- ["9D63",0xC4C8],
- ["9D64",0xC4C9],
- ["9D65",0xC4CA],
- ["9D66",0xC4CB],
- ["9D67",0xC4CC],
- ["9D68",0xC4CD],
- ["9D69",0xC4CE],
- ["9D6A",0xC4CF],
- ["9D6B",0xC4D0],
- ["9D6C",0xC4D1],
- ["9D6D",0xC4D2],
- ["9D6E",0xC4D3],
- ["9D6F",0xC4D4],
- ["9D70",0xC4D5],
- ["9D71",0xC4D6],
- ["9D72",0xC4D7],
- ["9D73",0xC4D8],
- ["9D74",0xC4D9],
- ["9D75",0xC4DA],
- ["9D76",0xC4DB],
- ["9D77",0xC4DC],
- ["9D78",0xC4DD],
- ["9D79",0xC4DE],
- ["9D7A",0xC4DF],
- ["9D81",0xC4E0],
- ["9D82",0xC4E1],
- ["9D83",0xC4E2],
- ["9D84",0xC4E3],
- ["9D85",0xC4E4],
- ["9D86",0xC4E5],
- ["9D87",0xC4E6],
- ["9D88",0xC4E7],
- ["9D89",0xC4E8],
- ["9D8A",0xC4EA],
- ["9D8B",0xC4EB],
- ["9D8C",0xC4EC],
- ["9D8D",0xC4ED],
- ["9D8E",0xC4EE],
- ["9D8F",0xC4EF],
- ["9D90",0xC4F2],
- ["9D91",0xC4F3],
- ["9D92",0xC4F5],
- ["9D93",0xC4F6],
- ["9D94",0xC4F7],
- ["9D95",0xC4F9],
- ["9D96",0xC4FB],
- ["9D97",0xC4FC],
- ["9D98",0xC4FD],
- ["9D99",0xC4FE],
- ["9D9A",0xC502],
- ["9D9B",0xC503],
- ["9D9C",0xC504],
- ["9D9D",0xC505],
- ["9D9E",0xC506],
- ["9D9F",0xC507],
- ["9DA0",0xC508],
- ["9DA1",0xC509],
- ["9DA2",0xC50A],
- ["9DA3",0xC50B],
- ["9DA4",0xC50D],
- ["9DA5",0xC50E],
- ["9DA6",0xC50F],
- ["9DA7",0xC511],
- ["9DA8",0xC512],
- ["9DA9",0xC513],
- ["9DAA",0xC515],
- ["9DAB",0xC516],
- ["9DAC",0xC517],
- ["9DAD",0xC518],
- ["9DAE",0xC519],
- ["9DAF",0xC51A],
- ["9DB0",0xC51B],
- ["9DB1",0xC51D],
- ["9DB2",0xC51E],
- ["9DB3",0xC51F],
- ["9DB4",0xC520],
- ["9DB5",0xC521],
- ["9DB6",0xC522],
- ["9DB7",0xC523],
- ["9DB8",0xC524],
- ["9DB9",0xC525],
- ["9DBA",0xC526],
- ["9DBB",0xC527],
- ["9DBC",0xC52A],
- ["9DBD",0xC52B],
- ["9DBE",0xC52D],
- ["9DBF",0xC52E],
- ["9DC0",0xC52F],
- ["9DC1",0xC531],
- ["9DC2",0xC532],
- ["9DC3",0xC533],
- ["9DC4",0xC534],
- ["9DC5",0xC535],
- ["9DC6",0xC536],
- ["9DC7",0xC537],
- ["9DC8",0xC53A],
- ["9DC9",0xC53C],
- ["9DCA",0xC53E],
- ["9DCB",0xC53F],
- ["9DCC",0xC540],
- ["9DCD",0xC541],
- ["9DCE",0xC542],
- ["9DCF",0xC543],
- ["9DD0",0xC546],
- ["9DD1",0xC547],
- ["9DD2",0xC54B],
- ["9DD3",0xC54F],
- ["9DD4",0xC550],
- ["9DD5",0xC551],
- ["9DD6",0xC552],
- ["9DD7",0xC556],
- ["9DD8",0xC55A],
- ["9DD9",0xC55B],
- ["9DDA",0xC55C],
- ["9DDB",0xC55F],
- ["9DDC",0xC562],
- ["9DDD",0xC563],
- ["9DDE",0xC565],
- ["9DDF",0xC566],
- ["9DE0",0xC567],
- ["9DE1",0xC569],
- ["9DE2",0xC56A],
- ["9DE3",0xC56B],
- ["9DE4",0xC56C],
- ["9DE5",0xC56D],
- ["9DE6",0xC56E],
- ["9DE7",0xC56F],
- ["9DE8",0xC572],
- ["9DE9",0xC576],
- ["9DEA",0xC577],
- ["9DEB",0xC578],
- ["9DEC",0xC579],
- ["9DED",0xC57A],
- ["9DEE",0xC57B],
- ["9DEF",0xC57E],
- ["9DF0",0xC57F],
- ["9DF1",0xC581],
- ["9DF2",0xC582],
- ["9DF3",0xC583],
- ["9DF4",0xC585],
- ["9DF5",0xC586],
- ["9DF6",0xC588],
- ["9DF7",0xC589],
- ["9DF8",0xC58A],
- ["9DF9",0xC58B],
- ["9DFA",0xC58E],
- ["9DFB",0xC590],
- ["9DFC",0xC592],
- ["9DFD",0xC593],
- ["9DFE",0xC594],
- ["9E41",0xC596],
- ["9E42",0xC599],
- ["9E43",0xC59A],
- ["9E44",0xC59B],
- ["9E45",0xC59D],
- ["9E46",0xC59E],
- ["9E47",0xC59F],
- ["9E48",0xC5A1],
- ["9E49",0xC5A2],
- ["9E4A",0xC5A3],
- ["9E4B",0xC5A4],
- ["9E4C",0xC5A5],
- ["9E4D",0xC5A6],
- ["9E4E",0xC5A7],
- ["9E4F",0xC5A8],
- ["9E50",0xC5AA],
- ["9E51",0xC5AB],
- ["9E52",0xC5AC],
- ["9E53",0xC5AD],
- ["9E54",0xC5AE],
- ["9E55",0xC5AF],
- ["9E56",0xC5B0],
- ["9E57",0xC5B1],
- ["9E58",0xC5B2],
- ["9E59",0xC5B3],
- ["9E5A",0xC5B6],
- ["9E61",0xC5B7],
- ["9E62",0xC5BA],
- ["9E63",0xC5BF],
- ["9E64",0xC5C0],
- ["9E65",0xC5C1],
- ["9E66",0xC5C2],
- ["9E67",0xC5C3],
- ["9E68",0xC5CB],
- ["9E69",0xC5CD],
- ["9E6A",0xC5CF],
- ["9E6B",0xC5D2],
- ["9E6C",0xC5D3],
- ["9E6D",0xC5D5],
- ["9E6E",0xC5D6],
- ["9E6F",0xC5D7],
- ["9E70",0xC5D9],
- ["9E71",0xC5DA],
- ["9E72",0xC5DB],
- ["9E73",0xC5DC],
- ["9E74",0xC5DD],
- ["9E75",0xC5DE],
- ["9E76",0xC5DF],
- ["9E77",0xC5E2],
- ["9E78",0xC5E4],
- ["9E79",0xC5E6],
- ["9E7A",0xC5E7],
- ["9E81",0xC5E8],
- ["9E82",0xC5E9],
- ["9E83",0xC5EA],
- ["9E84",0xC5EB],
- ["9E85",0xC5EF],
- ["9E86",0xC5F1],
- ["9E87",0xC5F2],
- ["9E88",0xC5F3],
- ["9E89",0xC5F5],
- ["9E8A",0xC5F8],
- ["9E8B",0xC5F9],
- ["9E8C",0xC5FA],
- ["9E8D",0xC5FB],
- ["9E8E",0xC602],
- ["9E8F",0xC603],
- ["9E90",0xC604],
- ["9E91",0xC609],
- ["9E92",0xC60A],
- ["9E93",0xC60B],
- ["9E94",0xC60D],
- ["9E95",0xC60E],
- ["9E96",0xC60F],
- ["9E97",0xC611],
- ["9E98",0xC612],
- ["9E99",0xC613],
- ["9E9A",0xC614],
- ["9E9B",0xC615],
- ["9E9C",0xC616],
- ["9E9D",0xC617],
- ["9E9E",0xC61A],
- ["9E9F",0xC61D],
- ["9EA0",0xC61E],
- ["9EA1",0xC61F],
- ["9EA2",0xC620],
- ["9EA3",0xC621],
- ["9EA4",0xC622],
- ["9EA5",0xC623],
- ["9EA6",0xC626],
- ["9EA7",0xC627],
- ["9EA8",0xC629],
- ["9EA9",0xC62A],
- ["9EAA",0xC62B],
- ["9EAB",0xC62F],
- ["9EAC",0xC631],
- ["9EAD",0xC632],
- ["9EAE",0xC636],
- ["9EAF",0xC638],
- ["9EB0",0xC63A],
- ["9EB1",0xC63C],
- ["9EB2",0xC63D],
- ["9EB3",0xC63E],
- ["9EB4",0xC63F],
- ["9EB5",0xC642],
- ["9EB6",0xC643],
- ["9EB7",0xC645],
- ["9EB8",0xC646],
- ["9EB9",0xC647],
- ["9EBA",0xC649],
- ["9EBB",0xC64A],
- ["9EBC",0xC64B],
- ["9EBD",0xC64C],
- ["9EBE",0xC64D],
- ["9EBF",0xC64E],
- ["9EC0",0xC64F],
- ["9EC1",0xC652],
- ["9EC2",0xC656],
- ["9EC3",0xC657],
- ["9EC4",0xC658],
- ["9EC5",0xC659],
- ["9EC6",0xC65A],
- ["9EC7",0xC65B],
- ["9EC8",0xC65E],
- ["9EC9",0xC65F],
- ["9ECA",0xC661],
- ["9ECB",0xC662],
- ["9ECC",0xC663],
- ["9ECD",0xC664],
- ["9ECE",0xC665],
- ["9ECF",0xC666],
- ["9ED0",0xC667],
- ["9ED1",0xC668],
- ["9ED2",0xC669],
- ["9ED3",0xC66A],
- ["9ED4",0xC66B],
- ["9ED5",0xC66D],
- ["9ED6",0xC66E],
- ["9ED7",0xC670],
- ["9ED8",0xC672],
- ["9ED9",0xC673],
- ["9EDA",0xC674],
- ["9EDB",0xC675],
- ["9EDC",0xC676],
- ["9EDD",0xC677],
- ["9EDE",0xC67A],
- ["9EDF",0xC67B],
- ["9EE0",0xC67D],
- ["9EE1",0xC67E],
- ["9EE2",0xC67F],
- ["9EE3",0xC681],
- ["9EE4",0xC682],
- ["9EE5",0xC683],
- ["9EE6",0xC684],
- ["9EE7",0xC685],
- ["9EE8",0xC686],
- ["9EE9",0xC687],
- ["9EEA",0xC68A],
- ["9EEB",0xC68C],
- ["9EEC",0xC68E],
- ["9EED",0xC68F],
- ["9EEE",0xC690],
- ["9EEF",0xC691],
- ["9EF0",0xC692],
- ["9EF1",0xC693],
- ["9EF2",0xC696],
- ["9EF3",0xC697],
- ["9EF4",0xC699],
- ["9EF5",0xC69A],
- ["9EF6",0xC69B],
- ["9EF7",0xC69D],
- ["9EF8",0xC69E],
- ["9EF9",0xC69F],
- ["9EFA",0xC6A0],
- ["9EFB",0xC6A1],
- ["9EFC",0xC6A2],
- ["9EFD",0xC6A3],
- ["9EFE",0xC6A6],
- ["9F41",0xC6A8],
- ["9F42",0xC6AA],
- ["9F43",0xC6AB],
- ["9F44",0xC6AC],
- ["9F45",0xC6AD],
- ["9F46",0xC6AE],
- ["9F47",0xC6AF],
- ["9F48",0xC6B2],
- ["9F49",0xC6B3],
- ["9F4A",0xC6B5],
- ["9F4B",0xC6B6],
- ["9F4C",0xC6B7],
- ["9F4D",0xC6BB],
- ["9F4E",0xC6BC],
- ["9F4F",0xC6BD],
- ["9F50",0xC6BE],
- ["9F51",0xC6BF],
- ["9F52",0xC6C2],
- ["9F53",0xC6C4],
- ["9F54",0xC6C6],
- ["9F55",0xC6C7],
- ["9F56",0xC6C8],
- ["9F57",0xC6C9],
- ["9F58",0xC6CA],
- ["9F59",0xC6CB],
- ["9F5A",0xC6CE],
- ["9F61",0xC6CF],
- ["9F62",0xC6D1],
- ["9F63",0xC6D2],
- ["9F64",0xC6D3],
- ["9F65",0xC6D5],
- ["9F66",0xC6D6],
- ["9F67",0xC6D7],
- ["9F68",0xC6D8],
- ["9F69",0xC6D9],
- ["9F6A",0xC6DA],
- ["9F6B",0xC6DB],
- ["9F6C",0xC6DE],
- ["9F6D",0xC6DF],
- ["9F6E",0xC6E2],
- ["9F6F",0xC6E3],
- ["9F70",0xC6E4],
- ["9F71",0xC6E5],
- ["9F72",0xC6E6],
- ["9F73",0xC6E7],
- ["9F74",0xC6EA],
- ["9F75",0xC6EB],
- ["9F76",0xC6ED],
- ["9F77",0xC6EE],
- ["9F78",0xC6EF],
- ["9F79",0xC6F1],
- ["9F7A",0xC6F2],
- ["9F81",0xC6F3],
- ["9F82",0xC6F4],
- ["9F83",0xC6F5],
- ["9F84",0xC6F6],
- ["9F85",0xC6F7],
- ["9F86",0xC6FA],
- ["9F87",0xC6FB],
- ["9F88",0xC6FC],
- ["9F89",0xC6FE],
- ["9F8A",0xC6FF],
- ["9F8B",0xC700],
- ["9F8C",0xC701],
- ["9F8D",0xC702],
- ["9F8E",0xC703],
- ["9F8F",0xC706],
- ["9F90",0xC707],
- ["9F91",0xC709],
- ["9F92",0xC70A],
- ["9F93",0xC70B],
- ["9F94",0xC70D],
- ["9F95",0xC70E],
- ["9F96",0xC70F],
- ["9F97",0xC710],
- ["9F98",0xC711],
- ["9F99",0xC712],
- ["9F9A",0xC713],
- ["9F9B",0xC716],
- ["9F9C",0xC718],
- ["9F9D",0xC71A],
- ["9F9E",0xC71B],
- ["9F9F",0xC71C],
- ["9FA0",0xC71D],
- ["9FA1",0xC71E],
- ["9FA2",0xC71F],
- ["9FA3",0xC722],
- ["9FA4",0xC723],
- ["9FA5",0xC725],
- ["9FA6",0xC726],
- ["9FA7",0xC727],
- ["9FA8",0xC729],
- ["9FA9",0xC72A],
- ["9FAA",0xC72B],
- ["9FAB",0xC72C],
- ["9FAC",0xC72D],
- ["9FAD",0xC72E],
- ["9FAE",0xC72F],
- ["9FAF",0xC732],
- ["9FB0",0xC734],
- ["9FB1",0xC736],
- ["9FB2",0xC738],
- ["9FB3",0xC739],
- ["9FB4",0xC73A],
- ["9FB5",0xC73B],
- ["9FB6",0xC73E],
- ["9FB7",0xC73F],
- ["9FB8",0xC741],
- ["9FB9",0xC742],
- ["9FBA",0xC743],
- ["9FBB",0xC745],
- ["9FBC",0xC746],
- ["9FBD",0xC747],
- ["9FBE",0xC748],
- ["9FBF",0xC749],
- ["9FC0",0xC74B],
- ["9FC1",0xC74E],
- ["9FC2",0xC750],
- ["9FC3",0xC759],
- ["9FC4",0xC75A],
- ["9FC5",0xC75B],
- ["9FC6",0xC75D],
- ["9FC7",0xC75E],
- ["9FC8",0xC75F],
- ["9FC9",0xC761],
- ["9FCA",0xC762],
- ["9FCB",0xC763],
- ["9FCC",0xC764],
- ["9FCD",0xC765],
- ["9FCE",0xC766],
- ["9FCF",0xC767],
- ["9FD0",0xC769],
- ["9FD1",0xC76A],
- ["9FD2",0xC76C],
- ["9FD3",0xC76D],
- ["9FD4",0xC76E],
- ["9FD5",0xC76F],
- ["9FD6",0xC770],
- ["9FD7",0xC771],
- ["9FD8",0xC772],
- ["9FD9",0xC773],
- ["9FDA",0xC776],
- ["9FDB",0xC777],
- ["9FDC",0xC779],
- ["9FDD",0xC77A],
- ["9FDE",0xC77B],
- ["9FDF",0xC77F],
- ["9FE0",0xC780],
- ["9FE1",0xC781],
- ["9FE2",0xC782],
- ["9FE3",0xC786],
- ["9FE4",0xC78B],
- ["9FE5",0xC78C],
- ["9FE6",0xC78D],
- ["9FE7",0xC78F],
- ["9FE8",0xC792],
- ["9FE9",0xC793],
- ["9FEA",0xC795],
- ["9FEB",0xC799],
- ["9FEC",0xC79B],
- ["9FED",0xC79C],
- ["9FEE",0xC79D],
- ["9FEF",0xC79E],
- ["9FF0",0xC79F],
- ["9FF1",0xC7A2],
- ["9FF2",0xC7A7],
- ["9FF3",0xC7A8],
- ["9FF4",0xC7A9],
- ["9FF5",0xC7AA],
- ["9FF6",0xC7AB],
- ["9FF7",0xC7AE],
- ["9FF8",0xC7AF],
- ["9FF9",0xC7B1],
- ["9FFA",0xC7B2],
- ["9FFB",0xC7B3],
- ["9FFC",0xC7B5],
- ["9FFD",0xC7B6],
- ["9FFE",0xC7B7],
- ["A041",0xC7B8],
- ["A042",0xC7B9],
- ["A043",0xC7BA],
- ["A044",0xC7BB],
- ["A045",0xC7BE],
- ["A046",0xC7C2],
- ["A047",0xC7C3],
- ["A048",0xC7C4],
- ["A049",0xC7C5],
- ["A04A",0xC7C6],
- ["A04B",0xC7C7],
- ["A04C",0xC7CA],
- ["A04D",0xC7CB],
- ["A04E",0xC7CD],
- ["A04F",0xC7CF],
- ["A050",0xC7D1],
- ["A051",0xC7D2],
- ["A052",0xC7D3],
- ["A053",0xC7D4],
- ["A054",0xC7D5],
- ["A055",0xC7D6],
- ["A056",0xC7D7],
- ["A057",0xC7D9],
- ["A058",0xC7DA],
- ["A059",0xC7DB],
- ["A05A",0xC7DC],
- ["A061",0xC7DE],
- ["A062",0xC7DF],
- ["A063",0xC7E0],
- ["A064",0xC7E1],
- ["A065",0xC7E2],
- ["A066",0xC7E3],
- ["A067",0xC7E5],
- ["A068",0xC7E6],
- ["A069",0xC7E7],
- ["A06A",0xC7E9],
- ["A06B",0xC7EA],
- ["A06C",0xC7EB],
- ["A06D",0xC7ED],
- ["A06E",0xC7EE],
- ["A06F",0xC7EF],
- ["A070",0xC7F0],
- ["A071",0xC7F1],
- ["A072",0xC7F2],
- ["A073",0xC7F3],
- ["A074",0xC7F4],
- ["A075",0xC7F5],
- ["A076",0xC7F6],
- ["A077",0xC7F7],
- ["A078",0xC7F8],
- ["A079",0xC7F9],
- ["A07A",0xC7FA],
- ["A081",0xC7FB],
- ["A082",0xC7FC],
- ["A083",0xC7FD],
- ["A084",0xC7FE],
- ["A085",0xC7FF],
- ["A086",0xC802],
- ["A087",0xC803],
- ["A088",0xC805],
- ["A089",0xC806],
- ["A08A",0xC807],
- ["A08B",0xC809],
- ["A08C",0xC80B],
- ["A08D",0xC80C],
- ["A08E",0xC80D],
- ["A08F",0xC80E],
- ["A090",0xC80F],
- ["A091",0xC812],
- ["A092",0xC814],
- ["A093",0xC817],
- ["A094",0xC818],
- ["A095",0xC819],
- ["A096",0xC81A],
- ["A097",0xC81B],
- ["A098",0xC81E],
- ["A099",0xC81F],
- ["A09A",0xC821],
- ["A09B",0xC822],
- ["A09C",0xC823],
- ["A09D",0xC825],
- ["A09E",0xC826],
- ["A09F",0xC827],
- ["A0A0",0xC828],
- ["A0A1",0xC829],
- ["A0A2",0xC82A],
- ["A0A3",0xC82B],
- ["A0A4",0xC82E],
- ["A0A5",0xC830],
- ["A0A6",0xC832],
- ["A0A7",0xC833],
- ["A0A8",0xC834],
- ["A0A9",0xC835],
- ["A0AA",0xC836],
- ["A0AB",0xC837],
- ["A0AC",0xC839],
- ["A0AD",0xC83A],
- ["A0AE",0xC83B],
- ["A0AF",0xC83D],
- ["A0B0",0xC83E],
- ["A0B1",0xC83F],
- ["A0B2",0xC841],
- ["A0B3",0xC842],
- ["A0B4",0xC843],
- ["A0B5",0xC844],
- ["A0B6",0xC845],
- ["A0B7",0xC846],
- ["A0B8",0xC847],
- ["A0B9",0xC84A],
- ["A0BA",0xC84B],
- ["A0BB",0xC84E],
- ["A0BC",0xC84F],
- ["A0BD",0xC850],
- ["A0BE",0xC851],
- ["A0BF",0xC852],
- ["A0C0",0xC853],
- ["A0C1",0xC855],
- ["A0C2",0xC856],
- ["A0C3",0xC857],
- ["A0C4",0xC858],
- ["A0C5",0xC859],
- ["A0C6",0xC85A],
- ["A0C7",0xC85B],
- ["A0C8",0xC85C],
- ["A0C9",0xC85D],
- ["A0CA",0xC85E],
- ["A0CB",0xC85F],
- ["A0CC",0xC860],
- ["A0CD",0xC861],
- ["A0CE",0xC862],
- ["A0CF",0xC863],
- ["A0D0",0xC864],
- ["A0D1",0xC865],
- ["A0D2",0xC866],
- ["A0D3",0xC867],
- ["A0D4",0xC868],
- ["A0D5",0xC869],
- ["A0D6",0xC86A],
- ["A0D7",0xC86B],
- ["A0D8",0xC86C],
- ["A0D9",0xC86D],
- ["A0DA",0xC86E],
- ["A0DB",0xC86F],
- ["A0DC",0xC872],
- ["A0DD",0xC873],
- ["A0DE",0xC875],
- ["A0DF",0xC876],
- ["A0E0",0xC877],
- ["A0E1",0xC879],
- ["A0E2",0xC87B],
- ["A0E3",0xC87C],
- ["A0E4",0xC87D],
- ["A0E5",0xC87E],
- ["A0E6",0xC87F],
- ["A0E7",0xC882],
- ["A0E8",0xC884],
- ["A0E9",0xC888],
- ["A0EA",0xC889],
- ["A0EB",0xC88A],
- ["A0EC",0xC88E],
- ["A0ED",0xC88F],
- ["A0EE",0xC890],
- ["A0EF",0xC891],
- ["A0F0",0xC892],
- ["A0F1",0xC893],
- ["A0F2",0xC895],
- ["A0F3",0xC896],
- ["A0F4",0xC897],
- ["A0F5",0xC898],
- ["A0F6",0xC899],
- ["A0F7",0xC89A],
- ["A0F8",0xC89B],
- ["A0F9",0xC89C],
- ["A0FA",0xC89E],
- ["A0FB",0xC8A0],
- ["A0FC",0xC8A2],
- ["A0FD",0xC8A3],
- ["A0FE",0xC8A4],
- ["A141",0xC8A5],
- ["A142",0xC8A6],
- ["A143",0xC8A7],
- ["A144",0xC8A9],
- ["A145",0xC8AA],
- ["A146",0xC8AB],
- ["A147",0xC8AC],
- ["A148",0xC8AD],
- ["A149",0xC8AE],
- ["A14A",0xC8AF],
- ["A14B",0xC8B0],
- ["A14C",0xC8B1],
- ["A14D",0xC8B2],
- ["A14E",0xC8B3],
- ["A14F",0xC8B4],
- ["A150",0xC8B5],
- ["A151",0xC8B6],
- ["A152",0xC8B7],
- ["A153",0xC8B8],
- ["A154",0xC8B9],
- ["A155",0xC8BA],
- ["A156",0xC8BB],
- ["A157",0xC8BE],
- ["A158",0xC8BF],
- ["A159",0xC8C0],
- ["A15A",0xC8C1],
- ["A161",0xC8C2],
- ["A162",0xC8C3],
- ["A163",0xC8C5],
- ["A164",0xC8C6],
- ["A165",0xC8C7],
- ["A166",0xC8C9],
- ["A167",0xC8CA],
- ["A168",0xC8CB],
- ["A169",0xC8CD],
- ["A16A",0xC8CE],
- ["A16B",0xC8CF],
- ["A16C",0xC8D0],
- ["A16D",0xC8D1],
- ["A16E",0xC8D2],
- ["A16F",0xC8D3],
- ["A170",0xC8D6],
- ["A171",0xC8D8],
- ["A172",0xC8DA],
- ["A173",0xC8DB],
- ["A174",0xC8DC],
- ["A175",0xC8DD],
- ["A176",0xC8DE],
- ["A177",0xC8DF],
- ["A178",0xC8E2],
- ["A179",0xC8E3],
- ["A17A",0xC8E5],
- ["A181",0xC8E6],
- ["A182",0xC8E7],
- ["A183",0xC8E8],
- ["A184",0xC8E9],
- ["A185",0xC8EA],
- ["A186",0xC8EB],
- ["A187",0xC8EC],
- ["A188",0xC8ED],
- ["A189",0xC8EE],
- ["A18A",0xC8EF],
- ["A18B",0xC8F0],
- ["A18C",0xC8F1],
- ["A18D",0xC8F2],
- ["A18E",0xC8F3],
- ["A18F",0xC8F4],
- ["A190",0xC8F6],
- ["A191",0xC8F7],
- ["A192",0xC8F8],
- ["A193",0xC8F9],
- ["A194",0xC8FA],
- ["A195",0xC8FB],
- ["A196",0xC8FE],
- ["A197",0xC8FF],
- ["A198",0xC901],
- ["A199",0xC902],
- ["A19A",0xC903],
- ["A19B",0xC907],
- ["A19C",0xC908],
- ["A19D",0xC909],
- ["A19E",0xC90A],
- ["A19F",0xC90B],
- ["A1A0",0xC90E],
- ["A241",0xC910],
- ["A242",0xC912],
- ["A243",0xC913],
- ["A244",0xC914],
- ["A245",0xC915],
- ["A246",0xC916],
- ["A247",0xC917],
- ["A248",0xC919],
- ["A249",0xC91A],
- ["A24A",0xC91B],
- ["A24B",0xC91C],
- ["A24C",0xC91D],
- ["A24D",0xC91E],
- ["A24E",0xC91F],
- ["A24F",0xC920],
- ["A250",0xC921],
- ["A251",0xC922],
- ["A252",0xC923],
- ["A253",0xC924],
- ["A254",0xC925],
- ["A255",0xC926],
- ["A256",0xC927],
- ["A257",0xC928],
- ["A258",0xC929],
- ["A259",0xC92A],
- ["A25A",0xC92B],
- ["A261",0xC92D],
- ["A262",0xC92E],
- ["A263",0xC92F],
- ["A264",0xC930],
- ["A265",0xC931],
- ["A266",0xC932],
- ["A267",0xC933],
- ["A268",0xC935],
- ["A269",0xC936],
- ["A26A",0xC937],
- ["A26B",0xC938],
- ["A26C",0xC939],
- ["A26D",0xC93A],
- ["A26E",0xC93B],
- ["A26F",0xC93C],
- ["A270",0xC93D],
- ["A271",0xC93E],
- ["A272",0xC93F],
- ["A273",0xC940],
- ["A274",0xC941],
- ["A275",0xC942],
- ["A276",0xC943],
- ["A277",0xC944],
- ["A278",0xC945],
- ["A279",0xC946],
- ["A27A",0xC947],
- ["A281",0xC948],
- ["A282",0xC949],
- ["A283",0xC94A],
- ["A284",0xC94B],
- ["A285",0xC94C],
- ["A286",0xC94D],
- ["A287",0xC94E],
- ["A288",0xC94F],
- ["A289",0xC952],
- ["A28A",0xC953],
- ["A28B",0xC955],
- ["A28C",0xC956],
- ["A28D",0xC957],
- ["A28E",0xC959],
- ["A28F",0xC95A],
- ["A290",0xC95B],
- ["A291",0xC95C],
- ["A292",0xC95D],
- ["A293",0xC95E],
- ["A294",0xC95F],
- ["A295",0xC962],
- ["A296",0xC964],
- ["A297",0xC965],
- ["A298",0xC966],
- ["A299",0xC967],
- ["A29A",0xC968],
- ["A29B",0xC969],
- ["A29C",0xC96A],
- ["A29D",0xC96B],
- ["A29E",0xC96D],
- ["A29F",0xC96E],
- ["A2A0",0xC96F],
- ["A2E6",0x20AC],
- ["A2E7",0xAE],
- ["A341",0xC971],
- ["A342",0xC972],
- ["A343",0xC973],
- ["A344",0xC975],
- ["A345",0xC976],
- ["A346",0xC977],
- ["A347",0xC978],
- ["A348",0xC979],
- ["A349",0xC97A],
- ["A34A",0xC97B],
- ["A34B",0xC97D],
- ["A34C",0xC97E],
- ["A34D",0xC97F],
- ["A34E",0xC980],
- ["A34F",0xC981],
- ["A350",0xC982],
- ["A351",0xC983],
- ["A352",0xC984],
- ["A353",0xC985],
- ["A354",0xC986],
- ["A355",0xC987],
- ["A356",0xC98A],
- ["A357",0xC98B],
- ["A358",0xC98D],
- ["A359",0xC98E],
- ["A35A",0xC98F],
- ["A361",0xC991],
- ["A362",0xC992],
- ["A363",0xC993],
- ["A364",0xC994],
- ["A365",0xC995],
- ["A366",0xC996],
- ["A367",0xC997],
- ["A368",0xC99A],
- ["A369",0xC99C],
- ["A36A",0xC99E],
- ["A36B",0xC99F],
- ["A36C",0xC9A0],
- ["A36D",0xC9A1],
- ["A36E",0xC9A2],
- ["A36F",0xC9A3],
- ["A370",0xC9A4],
- ["A371",0xC9A5],
- ["A372",0xC9A6],
- ["A373",0xC9A7],
- ["A374",0xC9A8],
- ["A375",0xC9A9],
- ["A376",0xC9AA],
- ["A377",0xC9AB],
- ["A378",0xC9AC],
- ["A379",0xC9AD],
- ["A37A",0xC9AE],
- ["A381",0xC9AF],
- ["A382",0xC9B0],
- ["A383",0xC9B1],
- ["A384",0xC9B2],
- ["A385",0xC9B3],
- ["A386",0xC9B4],
- ["A387",0xC9B5],
- ["A388",0xC9B6],
- ["A389",0xC9B7],
- ["A38A",0xC9B8],
- ["A38B",0xC9B9],
- ["A38C",0xC9BA],
- ["A38D",0xC9BB],
- ["A38E",0xC9BC],
- ["A38F",0xC9BD],
- ["A390",0xC9BE],
- ["A391",0xC9BF],
- ["A392",0xC9C2],
- ["A393",0xC9C3],
- ["A394",0xC9C5],
- ["A395",0xC9C6],
- ["A396",0xC9C9],
- ["A397",0xC9CB],
- ["A398",0xC9CC],
- ["A399",0xC9CD],
- ["A39A",0xC9CE],
- ["A39B",0xC9CF],
- ["A39C",0xC9D2],
- ["A39D",0xC9D4],
- ["A39E",0xC9D7],
- ["A39F",0xC9D8],
- ["A3A0",0xC9DB],
- ["A441",0xC9DE],
- ["A442",0xC9DF],
- ["A443",0xC9E1],
- ["A444",0xC9E3],
- ["A445",0xC9E5],
- ["A446",0xC9E6],
- ["A447",0xC9E8],
- ["A448",0xC9E9],
- ["A449",0xC9EA],
- ["A44A",0xC9EB],
- ["A44B",0xC9EE],
- ["A44C",0xC9F2],
- ["A44D",0xC9F3],
- ["A44E",0xC9F4],
- ["A44F",0xC9F5],
- ["A450",0xC9F6],
- ["A451",0xC9F7],
- ["A452",0xC9FA],
- ["A453",0xC9FB],
- ["A454",0xC9FD],
- ["A455",0xC9FE],
- ["A456",0xC9FF],
- ["A457",0xCA01],
- ["A458",0xCA02],
- ["A459",0xCA03],
- ["A45A",0xCA04],
- ["A461",0xCA05],
- ["A462",0xCA06],
- ["A463",0xCA07],
- ["A464",0xCA0A],
- ["A465",0xCA0E],
- ["A466",0xCA0F],
- ["A467",0xCA10],
- ["A468",0xCA11],
- ["A469",0xCA12],
- ["A46A",0xCA13],
- ["A46B",0xCA15],
- ["A46C",0xCA16],
- ["A46D",0xCA17],
- ["A46E",0xCA19],
- ["A46F",0xCA1A],
- ["A470",0xCA1B],
- ["A471",0xCA1C],
- ["A472",0xCA1D],
- ["A473",0xCA1E],
- ["A474",0xCA1F],
- ["A475",0xCA20],
- ["A476",0xCA21],
- ["A477",0xCA22],
- ["A478",0xCA23],
- ["A479",0xCA24],
- ["A47A",0xCA25],
- ["A481",0xCA26],
- ["A482",0xCA27],
- ["A483",0xCA28],
- ["A484",0xCA2A],
- ["A485",0xCA2B],
- ["A486",0xCA2C],
- ["A487",0xCA2D],
- ["A488",0xCA2E],
- ["A489",0xCA2F],
- ["A48A",0xCA30],
- ["A48B",0xCA31],
- ["A48C",0xCA32],
- ["A48D",0xCA33],
- ["A48E",0xCA34],
- ["A48F",0xCA35],
- ["A490",0xCA36],
- ["A491",0xCA37],
- ["A492",0xCA38],
- ["A493",0xCA39],
- ["A494",0xCA3A],
- ["A495",0xCA3B],
- ["A496",0xCA3C],
- ["A497",0xCA3D],
- ["A498",0xCA3E],
- ["A499",0xCA3F],
- ["A49A",0xCA40],
- ["A49B",0xCA41],
- ["A49C",0xCA42],
- ["A49D",0xCA43],
- ["A49E",0xCA44],
- ["A49F",0xCA45],
- ["A4A0",0xCA46],
- ["A541",0xCA47],
- ["A542",0xCA48],
- ["A543",0xCA49],
- ["A544",0xCA4A],
- ["A545",0xCA4B],
- ["A546",0xCA4E],
- ["A547",0xCA4F],
- ["A548",0xCA51],
- ["A549",0xCA52],
- ["A54A",0xCA53],
- ["A54B",0xCA55],
- ["A54C",0xCA56],
- ["A54D",0xCA57],
- ["A54E",0xCA58],
- ["A54F",0xCA59],
- ["A550",0xCA5A],
- ["A551",0xCA5B],
- ["A552",0xCA5E],
- ["A553",0xCA62],
- ["A554",0xCA63],
- ["A555",0xCA64],
- ["A556",0xCA65],
- ["A557",0xCA66],
- ["A558",0xCA67],
- ["A559",0xCA69],
- ["A55A",0xCA6A],
- ["A561",0xCA6B],
- ["A562",0xCA6C],
- ["A563",0xCA6D],
- ["A564",0xCA6E],
- ["A565",0xCA6F],
- ["A566",0xCA70],
- ["A567",0xCA71],
- ["A568",0xCA72],
- ["A569",0xCA73],
- ["A56A",0xCA74],
- ["A56B",0xCA75],
- ["A56C",0xCA76],
- ["A56D",0xCA77],
- ["A56E",0xCA78],
- ["A56F",0xCA79],
- ["A570",0xCA7A],
- ["A571",0xCA7B],
- ["A572",0xCA7C],
- ["A573",0xCA7E],
- ["A574",0xCA7F],
- ["A575",0xCA80],
- ["A576",0xCA81],
- ["A577",0xCA82],
- ["A578",0xCA83],
- ["A579",0xCA85],
- ["A57A",0xCA86],
- ["A581",0xCA87],
- ["A582",0xCA88],
- ["A583",0xCA89],
- ["A584",0xCA8A],
- ["A585",0xCA8B],
- ["A586",0xCA8C],
- ["A587",0xCA8D],
- ["A588",0xCA8E],
- ["A589",0xCA8F],
- ["A58A",0xCA90],
- ["A58B",0xCA91],
- ["A58C",0xCA92],
- ["A58D",0xCA93],
- ["A58E",0xCA94],
- ["A58F",0xCA95],
- ["A590",0xCA96],
- ["A591",0xCA97],
- ["A592",0xCA99],
- ["A593",0xCA9A],
- ["A594",0xCA9B],
- ["A595",0xCA9C],
- ["A596",0xCA9D],
- ["A597",0xCA9E],
- ["A598",0xCA9F],
- ["A599",0xCAA0],
- ["A59A",0xCAA1],
- ["A59B",0xCAA2],
- ["A59C",0xCAA3],
- ["A59D",0xCAA4],
- ["A59E",0xCAA5],
- ["A59F",0xCAA6],
- ["A5A0",0xCAA7],
- ["A641",0xCAA8],
- ["A642",0xCAA9],
- ["A643",0xCAAA],
- ["A644",0xCAAB],
- ["A645",0xCAAC],
- ["A646",0xCAAD],
- ["A647",0xCAAE],
- ["A648",0xCAAF],
- ["A649",0xCAB0],
- ["A64A",0xCAB1],
- ["A64B",0xCAB2],
- ["A64C",0xCAB3],
- ["A64D",0xCAB4],
- ["A64E",0xCAB5],
- ["A64F",0xCAB6],
- ["A650",0xCAB7],
- ["A651",0xCAB8],
- ["A652",0xCAB9],
- ["A653",0xCABA],
- ["A654",0xCABB],
- ["A655",0xCABE],
- ["A656",0xCABF],
- ["A657",0xCAC1],
- ["A658",0xCAC2],
- ["A659",0xCAC3],
- ["A65A",0xCAC5],
- ["A661",0xCAC6],
- ["A662",0xCAC7],
- ["A663",0xCAC8],
- ["A664",0xCAC9],
- ["A665",0xCACA],
- ["A666",0xCACB],
- ["A667",0xCACE],
- ["A668",0xCAD0],
- ["A669",0xCAD2],
- ["A66A",0xCAD4],
- ["A66B",0xCAD5],
- ["A66C",0xCAD6],
- ["A66D",0xCAD7],
- ["A66E",0xCADA],
- ["A66F",0xCADB],
- ["A670",0xCADC],
- ["A671",0xCADD],
- ["A672",0xCADE],
- ["A673",0xCADF],
- ["A674",0xCAE1],
- ["A675",0xCAE2],
- ["A676",0xCAE3],
- ["A677",0xCAE4],
- ["A678",0xCAE5],
- ["A679",0xCAE6],
- ["A67A",0xCAE7],
- ["A681",0xCAE8],
- ["A682",0xCAE9],
- ["A683",0xCAEA],
- ["A684",0xCAEB],
- ["A685",0xCAED],
- ["A686",0xCAEE],
- ["A687",0xCAEF],
- ["A688",0xCAF0],
- ["A689",0xCAF1],
- ["A68A",0xCAF2],
- ["A68B",0xCAF3],
- ["A68C",0xCAF5],
- ["A68D",0xCAF6],
- ["A68E",0xCAF7],
- ["A68F",0xCAF8],
- ["A690",0xCAF9],
- ["A691",0xCAFA],
- ["A692",0xCAFB],
- ["A693",0xCAFC],
- ["A694",0xCAFD],
- ["A695",0xCAFE],
- ["A696",0xCAFF],
- ["A697",0xCB00],
- ["A698",0xCB01],
- ["A699",0xCB02],
- ["A69A",0xCB03],
- ["A69B",0xCB04],
- ["A69C",0xCB05],
- ["A69D",0xCB06],
- ["A69E",0xCB07],
- ["A69F",0xCB09],
- ["A6A0",0xCB0A],
- ["A741",0xCB0B],
- ["A742",0xCB0C],
- ["A743",0xCB0D],
- ["A744",0xCB0E],
- ["A745",0xCB0F],
- ["A746",0xCB11],
- ["A747",0xCB12],
- ["A748",0xCB13],
- ["A749",0xCB15],
- ["A74A",0xCB16],
- ["A74B",0xCB17],
- ["A74C",0xCB19],
- ["A74D",0xCB1A],
- ["A74E",0xCB1B],
- ["A74F",0xCB1C],
- ["A750",0xCB1D],
- ["A751",0xCB1E],
- ["A752",0xCB1F],
- ["A753",0xCB22],
- ["A754",0xCB23],
- ["A755",0xCB24],
- ["A756",0xCB25],
- ["A757",0xCB26],
- ["A758",0xCB27],
- ["A759",0xCB28],
- ["A75A",0xCB29],
- ["A761",0xCB2A],
- ["A762",0xCB2B],
- ["A763",0xCB2C],
- ["A764",0xCB2D],
- ["A765",0xCB2E],
- ["A766",0xCB2F],
- ["A767",0xCB30],
- ["A768",0xCB31],
- ["A769",0xCB32],
- ["A76A",0xCB33],
- ["A76B",0xCB34],
- ["A76C",0xCB35],
- ["A76D",0xCB36],
- ["A76E",0xCB37],
- ["A76F",0xCB38],
- ["A770",0xCB39],
- ["A771",0xCB3A],
- ["A772",0xCB3B],
- ["A773",0xCB3C],
- ["A774",0xCB3D],
- ["A775",0xCB3E],
- ["A776",0xCB3F],
- ["A777",0xCB40],
- ["A778",0xCB42],
- ["A779",0xCB43],
- ["A77A",0xCB44],
- ["A781",0xCB45],
- ["A782",0xCB46],
- ["A783",0xCB47],
- ["A784",0xCB4A],
- ["A785",0xCB4B],
- ["A786",0xCB4D],
- ["A787",0xCB4E],
- ["A788",0xCB4F],
- ["A789",0xCB51],
- ["A78A",0xCB52],
- ["A78B",0xCB53],
- ["A78C",0xCB54],
- ["A78D",0xCB55],
- ["A78E",0xCB56],
- ["A78F",0xCB57],
- ["A790",0xCB5A],
- ["A791",0xCB5B],
- ["A792",0xCB5C],
- ["A793",0xCB5E],
- ["A794",0xCB5F],
- ["A795",0xCB60],
- ["A796",0xCB61],
- ["A797",0xCB62],
- ["A798",0xCB63],
- ["A799",0xCB65],
- ["A79A",0xCB66],
- ["A79B",0xCB67],
- ["A79C",0xCB68],
- ["A79D",0xCB69],
- ["A79E",0xCB6A],
- ["A79F",0xCB6B],
- ["A7A0",0xCB6C],
- ["A841",0xCB6D],
- ["A842",0xCB6E],
- ["A843",0xCB6F],
- ["A844",0xCB70],
- ["A845",0xCB71],
- ["A846",0xCB72],
- ["A847",0xCB73],
- ["A848",0xCB74],
- ["A849",0xCB75],
- ["A84A",0xCB76],
- ["A84B",0xCB77],
- ["A84C",0xCB7A],
- ["A84D",0xCB7B],
- ["A84E",0xCB7C],
- ["A84F",0xCB7D],
- ["A850",0xCB7E],
- ["A851",0xCB7F],
- ["A852",0xCB80],
- ["A853",0xCB81],
- ["A854",0xCB82],
- ["A855",0xCB83],
- ["A856",0xCB84],
- ["A857",0xCB85],
- ["A858",0xCB86],
- ["A859",0xCB87],
- ["A85A",0xCB88],
- ["A861",0xCB89],
- ["A862",0xCB8A],
- ["A863",0xCB8B],
- ["A864",0xCB8C],
- ["A865",0xCB8D],
- ["A866",0xCB8E],
- ["A867",0xCB8F],
- ["A868",0xCB90],
- ["A869",0xCB91],
- ["A86A",0xCB92],
- ["A86B",0xCB93],
- ["A86C",0xCB94],
- ["A86D",0xCB95],
- ["A86E",0xCB96],
- ["A86F",0xCB97],
- ["A870",0xCB98],
- ["A871",0xCB99],
- ["A872",0xCB9A],
- ["A873",0xCB9B],
- ["A874",0xCB9D],
- ["A875",0xCB9E],
- ["A876",0xCB9F],
- ["A877",0xCBA0],
- ["A878",0xCBA1],
- ["A879",0xCBA2],
- ["A87A",0xCBA3],
- ["A881",0xCBA4],
- ["A882",0xCBA5],
- ["A883",0xCBA6],
- ["A884",0xCBA7],
- ["A885",0xCBA8],
- ["A886",0xCBA9],
- ["A887",0xCBAA],
- ["A888",0xCBAB],
- ["A889",0xCBAC],
- ["A88A",0xCBAD],
- ["A88B",0xCBAE],
- ["A88C",0xCBAF],
- ["A88D",0xCBB0],
- ["A88E",0xCBB1],
- ["A88F",0xCBB2],
- ["A890",0xCBB3],
- ["A891",0xCBB4],
- ["A892",0xCBB5],
- ["A893",0xCBB6],
- ["A894",0xCBB7],
- ["A895",0xCBB9],
- ["A896",0xCBBA],
- ["A897",0xCBBB],
- ["A898",0xCBBC],
- ["A899",0xCBBD],
- ["A89A",0xCBBE],
- ["A89B",0xCBBF],
- ["A89C",0xCBC0],
- ["A89D",0xCBC1],
- ["A89E",0xCBC2],
- ["A89F",0xCBC3],
- ["A8A0",0xCBC4],
- ["A941",0xCBC5],
- ["A942",0xCBC6],
- ["A943",0xCBC7],
- ["A944",0xCBC8],
- ["A945",0xCBC9],
- ["A946",0xCBCA],
- ["A947",0xCBCB],
- ["A948",0xCBCC],
- ["A949",0xCBCD],
- ["A94A",0xCBCE],
- ["A94B",0xCBCF],
- ["A94C",0xCBD0],
- ["A94D",0xCBD1],
- ["A94E",0xCBD2],
- ["A94F",0xCBD3],
- ["A950",0xCBD5],
- ["A951",0xCBD6],
- ["A952",0xCBD7],
- ["A953",0xCBD8],
- ["A954",0xCBD9],
- ["A955",0xCBDA],
- ["A956",0xCBDB],
- ["A957",0xCBDC],
- ["A958",0xCBDD],
- ["A959",0xCBDE],
- ["A95A",0xCBDF],
- ["A961",0xCBE0],
- ["A962",0xCBE1],
- ["A963",0xCBE2],
- ["A964",0xCBE3],
- ["A965",0xCBE5],
- ["A966",0xCBE6],
- ["A967",0xCBE8],
- ["A968",0xCBEA],
- ["A969",0xCBEB],
- ["A96A",0xCBEC],
- ["A96B",0xCBED],
- ["A96C",0xCBEE],
- ["A96D",0xCBEF],
- ["A96E",0xCBF0],
- ["A96F",0xCBF1],
- ["A970",0xCBF2],
- ["A971",0xCBF3],
- ["A972",0xCBF4],
- ["A973",0xCBF5],
- ["A974",0xCBF6],
- ["A975",0xCBF7],
- ["A976",0xCBF8],
- ["A977",0xCBF9],
- ["A978",0xCBFA],
- ["A979",0xCBFB],
- ["A97A",0xCBFC],
- ["A981",0xCBFD],
- ["A982",0xCBFE],
- ["A983",0xCBFF],
- ["A984",0xCC00],
- ["A985",0xCC01],
- ["A986",0xCC02],
- ["A987",0xCC03],
- ["A988",0xCC04],
- ["A989",0xCC05],
- ["A98A",0xCC06],
- ["A98B",0xCC07],
- ["A98C",0xCC08],
- ["A98D",0xCC09],
- ["A98E",0xCC0A],
- ["A98F",0xCC0B],
- ["A990",0xCC0E],
- ["A991",0xCC0F],
- ["A992",0xCC11],
- ["A993",0xCC12],
- ["A994",0xCC13],
- ["A995",0xCC15],
- ["A996",0xCC16],
- ["A997",0xCC17],
- ["A998",0xCC18],
- ["A999",0xCC19],
- ["A99A",0xCC1A],
- ["A99B",0xCC1B],
- ["A99C",0xCC1E],
- ["A99D",0xCC1F],
- ["A99E",0xCC20],
- ["A99F",0xCC23],
- ["A9A0",0xCC24],
- ["AA41",0xCC25],
- ["AA42",0xCC26],
- ["AA43",0xCC2A],
- ["AA44",0xCC2B],
- ["AA45",0xCC2D],
- ["AA46",0xCC2F],
- ["AA47",0xCC31],
- ["AA48",0xCC32],
- ["AA49",0xCC33],
- ["AA4A",0xCC34],
- ["AA4B",0xCC35],
- ["AA4C",0xCC36],
- ["AA4D",0xCC37],
- ["AA4E",0xCC3A],
- ["AA4F",0xCC3F],
- ["AA50",0xCC40],
- ["AA51",0xCC41],
- ["AA52",0xCC42],
- ["AA53",0xCC43],
- ["AA54",0xCC46],
- ["AA55",0xCC47],
- ["AA56",0xCC49],
- ["AA57",0xCC4A],
- ["AA58",0xCC4B],
- ["AA59",0xCC4D],
- ["AA5A",0xCC4E],
- ["AA61",0xCC4F],
- ["AA62",0xCC50],
- ["AA63",0xCC51],
- ["AA64",0xCC52],
- ["AA65",0xCC53],
- ["AA66",0xCC56],
- ["AA67",0xCC5A],
- ["AA68",0xCC5B],
- ["AA69",0xCC5C],
- ["AA6A",0xCC5D],
- ["AA6B",0xCC5E],
- ["AA6C",0xCC5F],
- ["AA6D",0xCC61],
- ["AA6E",0xCC62],
- ["AA6F",0xCC63],
- ["AA70",0xCC65],
- ["AA71",0xCC67],
- ["AA72",0xCC69],
- ["AA73",0xCC6A],
- ["AA74",0xCC6B],
- ["AA75",0xCC6C],
- ["AA76",0xCC6D],
- ["AA77",0xCC6E],
- ["AA78",0xCC6F],
- ["AA79",0xCC71],
- ["AA7A",0xCC72],
- ["AA81",0xCC73],
- ["AA82",0xCC74],
- ["AA83",0xCC76],
- ["AA84",0xCC77],
- ["AA85",0xCC78],
- ["AA86",0xCC79],
- ["AA87",0xCC7A],
- ["AA88",0xCC7B],
- ["AA89",0xCC7C],
- ["AA8A",0xCC7D],
- ["AA8B",0xCC7E],
- ["AA8C",0xCC7F],
- ["AA8D",0xCC80],
- ["AA8E",0xCC81],
- ["AA8F",0xCC82],
- ["AA90",0xCC83],
- ["AA91",0xCC84],
- ["AA92",0xCC85],
- ["AA93",0xCC86],
- ["AA94",0xCC87],
- ["AA95",0xCC88],
- ["AA96",0xCC89],
- ["AA97",0xCC8A],
- ["AA98",0xCC8B],
- ["AA99",0xCC8C],
- ["AA9A",0xCC8D],
- ["AA9B",0xCC8E],
- ["AA9C",0xCC8F],
- ["AA9D",0xCC90],
- ["AA9E",0xCC91],
- ["AA9F",0xCC92],
- ["AAA0",0xCC93],
- ["AB41",0xCC94],
- ["AB42",0xCC95],
- ["AB43",0xCC96],
- ["AB44",0xCC97],
- ["AB45",0xCC9A],
- ["AB46",0xCC9B],
- ["AB47",0xCC9D],
- ["AB48",0xCC9E],
- ["AB49",0xCC9F],
- ["AB4A",0xCCA1],
- ["AB4B",0xCCA2],
- ["AB4C",0xCCA3],
- ["AB4D",0xCCA4],
- ["AB4E",0xCCA5],
- ["AB4F",0xCCA6],
- ["AB50",0xCCA7],
- ["AB51",0xCCAA],
- ["AB52",0xCCAE],
- ["AB53",0xCCAF],
- ["AB54",0xCCB0],
- ["AB55",0xCCB1],
- ["AB56",0xCCB2],
- ["AB57",0xCCB3],
- ["AB58",0xCCB6],
- ["AB59",0xCCB7],
- ["AB5A",0xCCB9],
- ["AB61",0xCCBA],
- ["AB62",0xCCBB],
- ["AB63",0xCCBD],
- ["AB64",0xCCBE],
- ["AB65",0xCCBF],
- ["AB66",0xCCC0],
- ["AB67",0xCCC1],
- ["AB68",0xCCC2],
- ["AB69",0xCCC3],
- ["AB6A",0xCCC6],
- ["AB6B",0xCCC8],
- ["AB6C",0xCCCA],
- ["AB6D",0xCCCB],
- ["AB6E",0xCCCC],
- ["AB6F",0xCCCD],
- ["AB70",0xCCCE],
- ["AB71",0xCCCF],
- ["AB72",0xCCD1],
- ["AB73",0xCCD2],
- ["AB74",0xCCD3],
- ["AB75",0xCCD5],
- ["AB76",0xCCD6],
- ["AB77",0xCCD7],
- ["AB78",0xCCD8],
- ["AB79",0xCCD9],
- ["AB7A",0xCCDA],
- ["AB81",0xCCDB],
- ["AB82",0xCCDC],
- ["AB83",0xCCDD],
- ["AB84",0xCCDE],
- ["AB85",0xCCDF],
- ["AB86",0xCCE0],
- ["AB87",0xCCE1],
- ["AB88",0xCCE2],
- ["AB89",0xCCE3],
- ["AB8A",0xCCE5],
- ["AB8B",0xCCE6],
- ["AB8C",0xCCE7],
- ["AB8D",0xCCE8],
- ["AB8E",0xCCE9],
- ["AB8F",0xCCEA],
- ["AB90",0xCCEB],
- ["AB91",0xCCED],
- ["AB92",0xCCEE],
- ["AB93",0xCCEF],
- ["AB94",0xCCF1],
- ["AB95",0xCCF2],
- ["AB96",0xCCF3],
- ["AB97",0xCCF4],
- ["AB98",0xCCF5],
- ["AB99",0xCCF6],
- ["AB9A",0xCCF7],
- ["AB9B",0xCCF8],
- ["AB9C",0xCCF9],
- ["AB9D",0xCCFA],
- ["AB9E",0xCCFB],
- ["AB9F",0xCCFC],
- ["ABA0",0xCCFD],
- ["AC41",0xCCFE],
- ["AC42",0xCCFF],
- ["AC43",0xCD00],
- ["AC44",0xCD02],
- ["AC45",0xCD03],
- ["AC46",0xCD04],
- ["AC47",0xCD05],
- ["AC48",0xCD06],
- ["AC49",0xCD07],
- ["AC4A",0xCD0A],
- ["AC4B",0xCD0B],
- ["AC4C",0xCD0D],
- ["AC4D",0xCD0E],
- ["AC4E",0xCD0F],
- ["AC4F",0xCD11],
- ["AC50",0xCD12],
- ["AC51",0xCD13],
- ["AC52",0xCD14],
- ["AC53",0xCD15],
- ["AC54",0xCD16],
- ["AC55",0xCD17],
- ["AC56",0xCD1A],
- ["AC57",0xCD1C],
- ["AC58",0xCD1E],
- ["AC59",0xCD1F],
- ["AC5A",0xCD20],
- ["AC61",0xCD21],
- ["AC62",0xCD22],
- ["AC63",0xCD23],
- ["AC64",0xCD25],
- ["AC65",0xCD26],
- ["AC66",0xCD27],
- ["AC67",0xCD29],
- ["AC68",0xCD2A],
- ["AC69",0xCD2B],
- ["AC6A",0xCD2D],
- ["AC6B",0xCD2E],
- ["AC6C",0xCD2F],
- ["AC6D",0xCD30],
- ["AC6E",0xCD31],
- ["AC6F",0xCD32],
- ["AC70",0xCD33],
- ["AC71",0xCD34],
- ["AC72",0xCD35],
- ["AC73",0xCD36],
- ["AC74",0xCD37],
- ["AC75",0xCD38],
- ["AC76",0xCD3A],
- ["AC77",0xCD3B],
- ["AC78",0xCD3C],
- ["AC79",0xCD3D],
- ["AC7A",0xCD3E],
- ["AC81",0xCD3F],
- ["AC82",0xCD40],
- ["AC83",0xCD41],
- ["AC84",0xCD42],
- ["AC85",0xCD43],
- ["AC86",0xCD44],
- ["AC87",0xCD45],
- ["AC88",0xCD46],
- ["AC89",0xCD47],
- ["AC8A",0xCD48],
- ["AC8B",0xCD49],
- ["AC8C",0xCD4A],
- ["AC8D",0xCD4B],
- ["AC8E",0xCD4C],
- ["AC8F",0xCD4D],
- ["AC90",0xCD4E],
- ["AC91",0xCD4F],
- ["AC92",0xCD50],
- ["AC93",0xCD51],
- ["AC94",0xCD52],
- ["AC95",0xCD53],
- ["AC96",0xCD54],
- ["AC97",0xCD55],
- ["AC98",0xCD56],
- ["AC99",0xCD57],
- ["AC9A",0xCD58],
- ["AC9B",0xCD59],
- ["AC9C",0xCD5A],
- ["AC9D",0xCD5B],
- ["AC9E",0xCD5D],
- ["AC9F",0xCD5E],
- ["ACA0",0xCD5F],
- ["AD41",0xCD61],
- ["AD42",0xCD62],
- ["AD43",0xCD63],
- ["AD44",0xCD65],
- ["AD45",0xCD66],
- ["AD46",0xCD67],
- ["AD47",0xCD68],
- ["AD48",0xCD69],
- ["AD49",0xCD6A],
- ["AD4A",0xCD6B],
- ["AD4B",0xCD6E],
- ["AD4C",0xCD70],
- ["AD4D",0xCD72],
- ["AD4E",0xCD73],
- ["AD4F",0xCD74],
- ["AD50",0xCD75],
- ["AD51",0xCD76],
- ["AD52",0xCD77],
- ["AD53",0xCD79],
- ["AD54",0xCD7A],
- ["AD55",0xCD7B],
- ["AD56",0xCD7C],
- ["AD57",0xCD7D],
- ["AD58",0xCD7E],
- ["AD59",0xCD7F],
- ["AD5A",0xCD80],
- ["AD61",0xCD81],
- ["AD62",0xCD82],
- ["AD63",0xCD83],
- ["AD64",0xCD84],
- ["AD65",0xCD85],
- ["AD66",0xCD86],
- ["AD67",0xCD87],
- ["AD68",0xCD89],
- ["AD69",0xCD8A],
- ["AD6A",0xCD8B],
- ["AD6B",0xCD8C],
- ["AD6C",0xCD8D],
- ["AD6D",0xCD8E],
- ["AD6E",0xCD8F],
- ["AD6F",0xCD90],
- ["AD70",0xCD91],
- ["AD71",0xCD92],
- ["AD72",0xCD93],
- ["AD73",0xCD96],
- ["AD74",0xCD97],
- ["AD75",0xCD99],
- ["AD76",0xCD9A],
- ["AD77",0xCD9B],
- ["AD78",0xCD9D],
- ["AD79",0xCD9E],
- ["AD7A",0xCD9F],
- ["AD81",0xCDA0],
- ["AD82",0xCDA1],
- ["AD83",0xCDA2],
- ["AD84",0xCDA3],
- ["AD85",0xCDA6],
- ["AD86",0xCDA8],
- ["AD87",0xCDAA],
- ["AD88",0xCDAB],
- ["AD89",0xCDAC],
- ["AD8A",0xCDAD],
- ["AD8B",0xCDAE],
- ["AD8C",0xCDAF],
- ["AD8D",0xCDB1],
- ["AD8E",0xCDB2],
- ["AD8F",0xCDB3],
- ["AD90",0xCDB4],
- ["AD91",0xCDB5],
- ["AD92",0xCDB6],
- ["AD93",0xCDB7],
- ["AD94",0xCDB8],
- ["AD95",0xCDB9],
- ["AD96",0xCDBA],
- ["AD97",0xCDBB],
- ["AD98",0xCDBC],
- ["AD99",0xCDBD],
- ["AD9A",0xCDBE],
- ["AD9B",0xCDBF],
- ["AD9C",0xCDC0],
- ["AD9D",0xCDC1],
- ["AD9E",0xCDC2],
- ["AD9F",0xCDC3],
- ["ADA0",0xCDC5],
- ["AE41",0xCDC6],
- ["AE42",0xCDC7],
- ["AE43",0xCDC8],
- ["AE44",0xCDC9],
- ["AE45",0xCDCA],
- ["AE46",0xCDCB],
- ["AE47",0xCDCD],
- ["AE48",0xCDCE],
- ["AE49",0xCDCF],
- ["AE4A",0xCDD1],
- ["AE4B",0xCDD2],
- ["AE4C",0xCDD3],
- ["AE4D",0xCDD4],
- ["AE4E",0xCDD5],
- ["AE4F",0xCDD6],
- ["AE50",0xCDD7],
- ["AE51",0xCDD8],
- ["AE52",0xCDD9],
- ["AE53",0xCDDA],
- ["AE54",0xCDDB],
- ["AE55",0xCDDC],
- ["AE56",0xCDDD],
- ["AE57",0xCDDE],
- ["AE58",0xCDDF],
- ["AE59",0xCDE0],
- ["AE5A",0xCDE1],
- ["AE61",0xCDE2],
- ["AE62",0xCDE3],
- ["AE63",0xCDE4],
- ["AE64",0xCDE5],
- ["AE65",0xCDE6],
- ["AE66",0xCDE7],
- ["AE67",0xCDE9],
- ["AE68",0xCDEA],
- ["AE69",0xCDEB],
- ["AE6A",0xCDED],
- ["AE6B",0xCDEE],
- ["AE6C",0xCDEF],
- ["AE6D",0xCDF1],
- ["AE6E",0xCDF2],
- ["AE6F",0xCDF3],
- ["AE70",0xCDF4],
- ["AE71",0xCDF5],
- ["AE72",0xCDF6],
- ["AE73",0xCDF7],
- ["AE74",0xCDFA],
- ["AE75",0xCDFC],
- ["AE76",0xCDFE],
- ["AE77",0xCDFF],
- ["AE78",0xCE00],
- ["AE79",0xCE01],
- ["AE7A",0xCE02],
- ["AE81",0xCE03],
- ["AE82",0xCE05],
- ["AE83",0xCE06],
- ["AE84",0xCE07],
- ["AE85",0xCE09],
- ["AE86",0xCE0A],
- ["AE87",0xCE0B],
- ["AE88",0xCE0D],
- ["AE89",0xCE0E],
- ["AE8A",0xCE0F],
- ["AE8B",0xCE10],
- ["AE8C",0xCE11],
- ["AE8D",0xCE12],
- ["AE8E",0xCE13],
- ["AE8F",0xCE15],
- ["AE90",0xCE16],
- ["AE91",0xCE17],
- ["AE92",0xCE18],
- ["AE93",0xCE1A],
- ["AE94",0xCE1B],
- ["AE95",0xCE1C],
- ["AE96",0xCE1D],
- ["AE97",0xCE1E],
- ["AE98",0xCE1F],
- ["AE99",0xCE22],
- ["AE9A",0xCE23],
- ["AE9B",0xCE25],
- ["AE9C",0xCE26],
- ["AE9D",0xCE27],
- ["AE9E",0xCE29],
- ["AE9F",0xCE2A],
- ["AEA0",0xCE2B],
- ["AF41",0xCE2C],
- ["AF42",0xCE2D],
- ["AF43",0xCE2E],
- ["AF44",0xCE2F],
- ["AF45",0xCE32],
- ["AF46",0xCE34],
- ["AF47",0xCE36],
- ["AF48",0xCE37],
- ["AF49",0xCE38],
- ["AF4A",0xCE39],
- ["AF4B",0xCE3A],
- ["AF4C",0xCE3B],
- ["AF4D",0xCE3C],
- ["AF4E",0xCE3D],
- ["AF4F",0xCE3E],
- ["AF50",0xCE3F],
- ["AF51",0xCE40],
- ["AF52",0xCE41],
- ["AF53",0xCE42],
- ["AF54",0xCE43],
- ["AF55",0xCE44],
- ["AF56",0xCE45],
- ["AF57",0xCE46],
- ["AF58",0xCE47],
- ["AF59",0xCE48],
- ["AF5A",0xCE49],
- ["AF61",0xCE4A],
- ["AF62",0xCE4B],
- ["AF63",0xCE4C],
- ["AF64",0xCE4D],
- ["AF65",0xCE4E],
- ["AF66",0xCE4F],
- ["AF67",0xCE50],
- ["AF68",0xCE51],
- ["AF69",0xCE52],
- ["AF6A",0xCE53],
- ["AF6B",0xCE54],
- ["AF6C",0xCE55],
- ["AF6D",0xCE56],
- ["AF6E",0xCE57],
- ["AF6F",0xCE5A],
- ["AF70",0xCE5B],
- ["AF71",0xCE5D],
- ["AF72",0xCE5E],
- ["AF73",0xCE62],
- ["AF74",0xCE63],
- ["AF75",0xCE64],
- ["AF76",0xCE65],
- ["AF77",0xCE66],
- ["AF78",0xCE67],
- ["AF79",0xCE6A],
- ["AF7A",0xCE6C],
- ["AF81",0xCE6E],
- ["AF82",0xCE6F],
- ["AF83",0xCE70],
- ["AF84",0xCE71],
- ["AF85",0xCE72],
- ["AF86",0xCE73],
- ["AF87",0xCE76],
- ["AF88",0xCE77],
- ["AF89",0xCE79],
- ["AF8A",0xCE7A],
- ["AF8B",0xCE7B],
- ["AF8C",0xCE7D],
- ["AF8D",0xCE7E],
- ["AF8E",0xCE7F],
- ["AF8F",0xCE80],
- ["AF90",0xCE81],
- ["AF91",0xCE82],
- ["AF92",0xCE83],
- ["AF93",0xCE86],
- ["AF94",0xCE88],
- ["AF95",0xCE8A],
- ["AF96",0xCE8B],
- ["AF97",0xCE8C],
- ["AF98",0xCE8D],
- ["AF99",0xCE8E],
- ["AF9A",0xCE8F],
- ["AF9B",0xCE92],
- ["AF9C",0xCE93],
- ["AF9D",0xCE95],
- ["AF9E",0xCE96],
- ["AF9F",0xCE97],
- ["AFA0",0xCE99],
- ["B041",0xCE9A],
- ["B042",0xCE9B],
- ["B043",0xCE9C],
- ["B044",0xCE9D],
- ["B045",0xCE9E],
- ["B046",0xCE9F],
- ["B047",0xCEA2],
- ["B048",0xCEA6],
- ["B049",0xCEA7],
- ["B04A",0xCEA8],
- ["B04B",0xCEA9],
- ["B04C",0xCEAA],
- ["B04D",0xCEAB],
- ["B04E",0xCEAE],
- ["B04F",0xCEAF],
- ["B050",0xCEB0],
- ["B051",0xCEB1],
- ["B052",0xCEB2],
- ["B053",0xCEB3],
- ["B054",0xCEB4],
- ["B055",0xCEB5],
- ["B056",0xCEB6],
- ["B057",0xCEB7],
- ["B058",0xCEB8],
- ["B059",0xCEB9],
- ["B05A",0xCEBA],
- ["B061",0xCEBB],
- ["B062",0xCEBC],
- ["B063",0xCEBD],
- ["B064",0xCEBE],
- ["B065",0xCEBF],
- ["B066",0xCEC0],
- ["B067",0xCEC2],
- ["B068",0xCEC3],
- ["B069",0xCEC4],
- ["B06A",0xCEC5],
- ["B06B",0xCEC6],
- ["B06C",0xCEC7],
- ["B06D",0xCEC8],
- ["B06E",0xCEC9],
- ["B06F",0xCECA],
- ["B070",0xCECB],
- ["B071",0xCECC],
- ["B072",0xCECD],
- ["B073",0xCECE],
- ["B074",0xCECF],
- ["B075",0xCED0],
- ["B076",0xCED1],
- ["B077",0xCED2],
- ["B078",0xCED3],
- ["B079",0xCED4],
- ["B07A",0xCED5],
- ["B081",0xCED6],
- ["B082",0xCED7],
- ["B083",0xCED8],
- ["B084",0xCED9],
- ["B085",0xCEDA],
- ["B086",0xCEDB],
- ["B087",0xCEDC],
- ["B088",0xCEDD],
- ["B089",0xCEDE],
- ["B08A",0xCEDF],
- ["B08B",0xCEE0],
- ["B08C",0xCEE1],
- ["B08D",0xCEE2],
- ["B08E",0xCEE3],
- ["B08F",0xCEE6],
- ["B090",0xCEE7],
- ["B091",0xCEE9],
- ["B092",0xCEEA],
- ["B093",0xCEED],
- ["B094",0xCEEE],
- ["B095",0xCEEF],
- ["B096",0xCEF0],
- ["B097",0xCEF1],
- ["B098",0xCEF2],
- ["B099",0xCEF3],
- ["B09A",0xCEF6],
- ["B09B",0xCEFA],
- ["B09C",0xCEFB],
- ["B09D",0xCEFC],
- ["B09E",0xCEFD],
- ["B09F",0xCEFE],
- ["B0A0",0xCEFF],
- ["B141",0xCF02],
- ["B142",0xCF03],
- ["B143",0xCF05],
- ["B144",0xCF06],
- ["B145",0xCF07],
- ["B146",0xCF09],
- ["B147",0xCF0A],
- ["B148",0xCF0B],
- ["B149",0xCF0C],
- ["B14A",0xCF0D],
- ["B14B",0xCF0E],
- ["B14C",0xCF0F],
- ["B14D",0xCF12],
- ["B14E",0xCF14],
- ["B14F",0xCF16],
- ["B150",0xCF17],
- ["B151",0xCF18],
- ["B152",0xCF19],
- ["B153",0xCF1A],
- ["B154",0xCF1B],
- ["B155",0xCF1D],
- ["B156",0xCF1E],
- ["B157",0xCF1F],
- ["B158",0xCF21],
- ["B159",0xCF22],
- ["B15A",0xCF23],
- ["B161",0xCF25],
- ["B162",0xCF26],
- ["B163",0xCF27],
- ["B164",0xCF28],
- ["B165",0xCF29],
- ["B166",0xCF2A],
- ["B167",0xCF2B],
- ["B168",0xCF2E],
- ["B169",0xCF32],
- ["B16A",0xCF33],
- ["B16B",0xCF34],
- ["B16C",0xCF35],
- ["B16D",0xCF36],
- ["B16E",0xCF37],
- ["B16F",0xCF39],
- ["B170",0xCF3A],
- ["B171",0xCF3B],
- ["B172",0xCF3C],
- ["B173",0xCF3D],
- ["B174",0xCF3E],
- ["B175",0xCF3F],
- ["B176",0xCF40],
- ["B177",0xCF41],
- ["B178",0xCF42],
- ["B179",0xCF43],
- ["B17A",0xCF44],
- ["B181",0xCF45],
- ["B182",0xCF46],
- ["B183",0xCF47],
- ["B184",0xCF48],
- ["B185",0xCF49],
- ["B186",0xCF4A],
- ["B187",0xCF4B],
- ["B188",0xCF4C],
- ["B189",0xCF4D],
- ["B18A",0xCF4E],
- ["B18B",0xCF4F],
- ["B18C",0xCF50],
- ["B18D",0xCF51],
- ["B18E",0xCF52],
- ["B18F",0xCF53],
- ["B190",0xCF56],
- ["B191",0xCF57],
- ["B192",0xCF59],
- ["B193",0xCF5A],
- ["B194",0xCF5B],
- ["B195",0xCF5D],
- ["B196",0xCF5E],
- ["B197",0xCF5F],
- ["B198",0xCF60],
- ["B199",0xCF61],
- ["B19A",0xCF62],
- ["B19B",0xCF63],
- ["B19C",0xCF66],
- ["B19D",0xCF68],
- ["B19E",0xCF6A],
- ["B19F",0xCF6B],
- ["B1A0",0xCF6C],
- ["B241",0xCF6D],
- ["B242",0xCF6E],
- ["B243",0xCF6F],
- ["B244",0xCF72],
- ["B245",0xCF73],
- ["B246",0xCF75],
- ["B247",0xCF76],
- ["B248",0xCF77],
- ["B249",0xCF79],
- ["B24A",0xCF7A],
- ["B24B",0xCF7B],
- ["B24C",0xCF7C],
- ["B24D",0xCF7D],
- ["B24E",0xCF7E],
- ["B24F",0xCF7F],
- ["B250",0xCF81],
- ["B251",0xCF82],
- ["B252",0xCF83],
- ["B253",0xCF84],
- ["B254",0xCF86],
- ["B255",0xCF87],
- ["B256",0xCF88],
- ["B257",0xCF89],
- ["B258",0xCF8A],
- ["B259",0xCF8B],
- ["B25A",0xCF8D],
- ["B261",0xCF8E],
- ["B262",0xCF8F],
- ["B263",0xCF90],
- ["B264",0xCF91],
- ["B265",0xCF92],
- ["B266",0xCF93],
- ["B267",0xCF94],
- ["B268",0xCF95],
- ["B269",0xCF96],
- ["B26A",0xCF97],
- ["B26B",0xCF98],
- ["B26C",0xCF99],
- ["B26D",0xCF9A],
- ["B26E",0xCF9B],
- ["B26F",0xCF9C],
- ["B270",0xCF9D],
- ["B271",0xCF9E],
- ["B272",0xCF9F],
- ["B273",0xCFA0],
- ["B274",0xCFA2],
- ["B275",0xCFA3],
- ["B276",0xCFA4],
- ["B277",0xCFA5],
- ["B278",0xCFA6],
- ["B279",0xCFA7],
- ["B27A",0xCFA9],
- ["B281",0xCFAA],
- ["B282",0xCFAB],
- ["B283",0xCFAC],
- ["B284",0xCFAD],
- ["B285",0xCFAE],
- ["B286",0xCFAF],
- ["B287",0xCFB1],
- ["B288",0xCFB2],
- ["B289",0xCFB3],
- ["B28A",0xCFB4],
- ["B28B",0xCFB5],
- ["B28C",0xCFB6],
- ["B28D",0xCFB7],
- ["B28E",0xCFB8],
- ["B28F",0xCFB9],
- ["B290",0xCFBA],
- ["B291",0xCFBB],
- ["B292",0xCFBC],
- ["B293",0xCFBD],
- ["B294",0xCFBE],
- ["B295",0xCFBF],
- ["B296",0xCFC0],
- ["B297",0xCFC1],
- ["B298",0xCFC2],
- ["B299",0xCFC3],
- ["B29A",0xCFC5],
- ["B29B",0xCFC6],
- ["B29C",0xCFC7],
- ["B29D",0xCFC8],
- ["B29E",0xCFC9],
- ["B29F",0xCFCA],
- ["B2A0",0xCFCB],
- ["B341",0xCFCC],
- ["B342",0xCFCD],
- ["B343",0xCFCE],
- ["B344",0xCFCF],
- ["B345",0xCFD0],
- ["B346",0xCFD1],
- ["B347",0xCFD2],
- ["B348",0xCFD3],
- ["B349",0xCFD4],
- ["B34A",0xCFD5],
- ["B34B",0xCFD6],
- ["B34C",0xCFD7],
- ["B34D",0xCFD8],
- ["B34E",0xCFD9],
- ["B34F",0xCFDA],
- ["B350",0xCFDB],
- ["B351",0xCFDC],
- ["B352",0xCFDD],
- ["B353",0xCFDE],
- ["B354",0xCFDF],
- ["B355",0xCFE2],
- ["B356",0xCFE3],
- ["B357",0xCFE5],
- ["B358",0xCFE6],
- ["B359",0xCFE7],
- ["B35A",0xCFE9],
- ["B361",0xCFEA],
- ["B362",0xCFEB],
- ["B363",0xCFEC],
- ["B364",0xCFED],
- ["B365",0xCFEE],
- ["B366",0xCFEF],
- ["B367",0xCFF2],
- ["B368",0xCFF4],
- ["B369",0xCFF6],
- ["B36A",0xCFF7],
- ["B36B",0xCFF8],
- ["B36C",0xCFF9],
- ["B36D",0xCFFA],
- ["B36E",0xCFFB],
- ["B36F",0xCFFD],
- ["B370",0xCFFE],
- ["B371",0xCFFF],
- ["B372",0xD001],
- ["B373",0xD002],
- ["B374",0xD003],
- ["B375",0xD005],
- ["B376",0xD006],
- ["B377",0xD007],
- ["B378",0xD008],
- ["B379",0xD009],
- ["B37A",0xD00A],
- ["B381",0xD00B],
- ["B382",0xD00C],
- ["B383",0xD00D],
- ["B384",0xD00E],
- ["B385",0xD00F],
- ["B386",0xD010],
- ["B387",0xD012],
- ["B388",0xD013],
- ["B389",0xD014],
- ["B38A",0xD015],
- ["B38B",0xD016],
- ["B38C",0xD017],
- ["B38D",0xD019],
- ["B38E",0xD01A],
- ["B38F",0xD01B],
- ["B390",0xD01C],
- ["B391",0xD01D],
- ["B392",0xD01E],
- ["B393",0xD01F],
- ["B394",0xD020],
- ["B395",0xD021],
- ["B396",0xD022],
- ["B397",0xD023],
- ["B398",0xD024],
- ["B399",0xD025],
- ["B39A",0xD026],
- ["B39B",0xD027],
- ["B39C",0xD028],
- ["B39D",0xD029],
- ["B39E",0xD02A],
- ["B39F",0xD02B],
- ["B3A0",0xD02C],
- ["B441",0xD02E],
- ["B442",0xD02F],
- ["B443",0xD030],
- ["B444",0xD031],
- ["B445",0xD032],
- ["B446",0xD033],
- ["B447",0xD036],
- ["B448",0xD037],
- ["B449",0xD039],
- ["B44A",0xD03A],
- ["B44B",0xD03B],
- ["B44C",0xD03D],
- ["B44D",0xD03E],
- ["B44E",0xD03F],
- ["B44F",0xD040],
- ["B450",0xD041],
- ["B451",0xD042],
- ["B452",0xD043],
- ["B453",0xD046],
- ["B454",0xD048],
- ["B455",0xD04A],
- ["B456",0xD04B],
- ["B457",0xD04C],
- ["B458",0xD04D],
- ["B459",0xD04E],
- ["B45A",0xD04F],
- ["B461",0xD051],
- ["B462",0xD052],
- ["B463",0xD053],
- ["B464",0xD055],
- ["B465",0xD056],
- ["B466",0xD057],
- ["B467",0xD059],
- ["B468",0xD05A],
- ["B469",0xD05B],
- ["B46A",0xD05C],
- ["B46B",0xD05D],
- ["B46C",0xD05E],
- ["B46D",0xD05F],
- ["B46E",0xD061],
- ["B46F",0xD062],
- ["B470",0xD063],
- ["B471",0xD064],
- ["B472",0xD065],
- ["B473",0xD066],
- ["B474",0xD067],
- ["B475",0xD068],
- ["B476",0xD069],
- ["B477",0xD06A],
- ["B478",0xD06B],
- ["B479",0xD06E],
- ["B47A",0xD06F],
- ["B481",0xD071],
- ["B482",0xD072],
- ["B483",0xD073],
- ["B484",0xD075],
- ["B485",0xD076],
- ["B486",0xD077],
- ["B487",0xD078],
- ["B488",0xD079],
- ["B489",0xD07A],
- ["B48A",0xD07B],
- ["B48B",0xD07E],
- ["B48C",0xD07F],
- ["B48D",0xD080],
- ["B48E",0xD082],
- ["B48F",0xD083],
- ["B490",0xD084],
- ["B491",0xD085],
- ["B492",0xD086],
- ["B493",0xD087],
- ["B494",0xD088],
- ["B495",0xD089],
- ["B496",0xD08A],
- ["B497",0xD08B],
- ["B498",0xD08C],
- ["B499",0xD08D],
- ["B49A",0xD08E],
- ["B49B",0xD08F],
- ["B49C",0xD090],
- ["B49D",0xD091],
- ["B49E",0xD092],
- ["B49F",0xD093],
- ["B4A0",0xD094],
- ["B541",0xD095],
- ["B542",0xD096],
- ["B543",0xD097],
- ["B544",0xD098],
- ["B545",0xD099],
- ["B546",0xD09A],
- ["B547",0xD09B],
- ["B548",0xD09C],
- ["B549",0xD09D],
- ["B54A",0xD09E],
- ["B54B",0xD09F],
- ["B54C",0xD0A0],
- ["B54D",0xD0A1],
- ["B54E",0xD0A2],
- ["B54F",0xD0A3],
- ["B550",0xD0A6],
- ["B551",0xD0A7],
- ["B552",0xD0A9],
- ["B553",0xD0AA],
- ["B554",0xD0AB],
- ["B555",0xD0AD],
- ["B556",0xD0AE],
- ["B557",0xD0AF],
- ["B558",0xD0B0],
- ["B559",0xD0B1],
- ["B55A",0xD0B2],
- ["B561",0xD0B3],
- ["B562",0xD0B6],
- ["B563",0xD0B8],
- ["B564",0xD0BA],
- ["B565",0xD0BB],
- ["B566",0xD0BC],
- ["B567",0xD0BD],
- ["B568",0xD0BE],
- ["B569",0xD0BF],
- ["B56A",0xD0C2],
- ["B56B",0xD0C3],
- ["B56C",0xD0C5],
- ["B56D",0xD0C6],
- ["B56E",0xD0C7],
- ["B56F",0xD0CA],
- ["B570",0xD0CB],
- ["B571",0xD0CC],
- ["B572",0xD0CD],
- ["B573",0xD0CE],
- ["B574",0xD0CF],
- ["B575",0xD0D2],
- ["B576",0xD0D6],
- ["B577",0xD0D7],
- ["B578",0xD0D8],
- ["B579",0xD0D9],
- ["B57A",0xD0DA],
- ["B581",0xD0DB],
- ["B582",0xD0DE],
- ["B583",0xD0DF],
- ["B584",0xD0E1],
- ["B585",0xD0E2],
- ["B586",0xD0E3],
- ["B587",0xD0E5],
- ["B588",0xD0E6],
- ["B589",0xD0E7],
- ["B58A",0xD0E8],
- ["B58B",0xD0E9],
- ["B58C",0xD0EA],
- ["B58D",0xD0EB],
- ["B58E",0xD0EE],
- ["B58F",0xD0F2],
- ["B590",0xD0F3],
- ["B591",0xD0F4],
- ["B592",0xD0F5],
- ["B593",0xD0F6],
- ["B594",0xD0F7],
- ["B595",0xD0F9],
- ["B596",0xD0FA],
- ["B597",0xD0FB],
- ["B598",0xD0FC],
- ["B599",0xD0FD],
- ["B59A",0xD0FE],
- ["B59B",0xD0FF],
- ["B59C",0xD100],
- ["B59D",0xD101],
- ["B59E",0xD102],
- ["B59F",0xD103],
- ["B5A0",0xD104],
- ["B641",0xD105],
- ["B642",0xD106],
- ["B643",0xD107],
- ["B644",0xD108],
- ["B645",0xD109],
- ["B646",0xD10A],
- ["B647",0xD10B],
- ["B648",0xD10C],
- ["B649",0xD10E],
- ["B64A",0xD10F],
- ["B64B",0xD110],
- ["B64C",0xD111],
- ["B64D",0xD112],
- ["B64E",0xD113],
- ["B64F",0xD114],
- ["B650",0xD115],
- ["B651",0xD116],
- ["B652",0xD117],
- ["B653",0xD118],
- ["B654",0xD119],
- ["B655",0xD11A],
- ["B656",0xD11B],
- ["B657",0xD11C],
- ["B658",0xD11D],
- ["B659",0xD11E],
- ["B65A",0xD11F],
- ["B661",0xD120],
- ["B662",0xD121],
- ["B663",0xD122],
- ["B664",0xD123],
- ["B665",0xD124],
- ["B666",0xD125],
- ["B667",0xD126],
- ["B668",0xD127],
- ["B669",0xD128],
- ["B66A",0xD129],
- ["B66B",0xD12A],
- ["B66C",0xD12B],
- ["B66D",0xD12C],
- ["B66E",0xD12D],
- ["B66F",0xD12E],
- ["B670",0xD12F],
- ["B671",0xD132],
- ["B672",0xD133],
- ["B673",0xD135],
- ["B674",0xD136],
- ["B675",0xD137],
- ["B676",0xD139],
- ["B677",0xD13B],
- ["B678",0xD13C],
- ["B679",0xD13D],
- ["B67A",0xD13E],
- ["B681",0xD13F],
- ["B682",0xD142],
- ["B683",0xD146],
- ["B684",0xD147],
- ["B685",0xD148],
- ["B686",0xD149],
- ["B687",0xD14A],
- ["B688",0xD14B],
- ["B689",0xD14E],
- ["B68A",0xD14F],
- ["B68B",0xD151],
- ["B68C",0xD152],
- ["B68D",0xD153],
- ["B68E",0xD155],
- ["B68F",0xD156],
- ["B690",0xD157],
- ["B691",0xD158],
- ["B692",0xD159],
- ["B693",0xD15A],
- ["B694",0xD15B],
- ["B695",0xD15E],
- ["B696",0xD160],
- ["B697",0xD162],
- ["B698",0xD163],
- ["B699",0xD164],
- ["B69A",0xD165],
- ["B69B",0xD166],
- ["B69C",0xD167],
- ["B69D",0xD169],
- ["B69E",0xD16A],
- ["B69F",0xD16B],
- ["B6A0",0xD16D],
- ["B741",0xD16E],
- ["B742",0xD16F],
- ["B743",0xD170],
- ["B744",0xD171],
- ["B745",0xD172],
- ["B746",0xD173],
- ["B747",0xD174],
- ["B748",0xD175],
- ["B749",0xD176],
- ["B74A",0xD177],
- ["B74B",0xD178],
- ["B74C",0xD179],
- ["B74D",0xD17A],
- ["B74E",0xD17B],
- ["B74F",0xD17D],
- ["B750",0xD17E],
- ["B751",0xD17F],
- ["B752",0xD180],
- ["B753",0xD181],
- ["B754",0xD182],
- ["B755",0xD183],
- ["B756",0xD185],
- ["B757",0xD186],
- ["B758",0xD187],
- ["B759",0xD189],
- ["B75A",0xD18A],
- ["B761",0xD18B],
- ["B762",0xD18C],
- ["B763",0xD18D],
- ["B764",0xD18E],
- ["B765",0xD18F],
- ["B766",0xD190],
- ["B767",0xD191],
- ["B768",0xD192],
- ["B769",0xD193],
- ["B76A",0xD194],
- ["B76B",0xD195],
- ["B76C",0xD196],
- ["B76D",0xD197],
- ["B76E",0xD198],
- ["B76F",0xD199],
- ["B770",0xD19A],
- ["B771",0xD19B],
- ["B772",0xD19C],
- ["B773",0xD19D],
- ["B774",0xD19E],
- ["B775",0xD19F],
- ["B776",0xD1A2],
- ["B777",0xD1A3],
- ["B778",0xD1A5],
- ["B779",0xD1A6],
- ["B77A",0xD1A7],
- ["B781",0xD1A9],
- ["B782",0xD1AA],
- ["B783",0xD1AB],
- ["B784",0xD1AC],
- ["B785",0xD1AD],
- ["B786",0xD1AE],
- ["B787",0xD1AF],
- ["B788",0xD1B2],
- ["B789",0xD1B4],
- ["B78A",0xD1B6],
- ["B78B",0xD1B7],
- ["B78C",0xD1B8],
- ["B78D",0xD1B9],
- ["B78E",0xD1BB],
- ["B78F",0xD1BD],
- ["B790",0xD1BE],
- ["B791",0xD1BF],
- ["B792",0xD1C1],
- ["B793",0xD1C2],
- ["B794",0xD1C3],
- ["B795",0xD1C4],
- ["B796",0xD1C5],
- ["B797",0xD1C6],
- ["B798",0xD1C7],
- ["B799",0xD1C8],
- ["B79A",0xD1C9],
- ["B79B",0xD1CA],
- ["B79C",0xD1CB],
- ["B79D",0xD1CC],
- ["B79E",0xD1CD],
- ["B79F",0xD1CE],
- ["B7A0",0xD1CF],
- ["B841",0xD1D0],
- ["B842",0xD1D1],
- ["B843",0xD1D2],
- ["B844",0xD1D3],
- ["B845",0xD1D4],
- ["B846",0xD1D5],
- ["B847",0xD1D6],
- ["B848",0xD1D7],
- ["B849",0xD1D9],
- ["B84A",0xD1DA],
- ["B84B",0xD1DB],
- ["B84C",0xD1DC],
- ["B84D",0xD1DD],
- ["B84E",0xD1DE],
- ["B84F",0xD1DF],
- ["B850",0xD1E0],
- ["B851",0xD1E1],
- ["B852",0xD1E2],
- ["B853",0xD1E3],
- ["B854",0xD1E4],
- ["B855",0xD1E5],
- ["B856",0xD1E6],
- ["B857",0xD1E7],
- ["B858",0xD1E8],
- ["B859",0xD1E9],
- ["B85A",0xD1EA],
- ["B861",0xD1EB],
- ["B862",0xD1EC],
- ["B863",0xD1ED],
- ["B864",0xD1EE],
- ["B865",0xD1EF],
- ["B866",0xD1F0],
- ["B867",0xD1F1],
- ["B868",0xD1F2],
- ["B869",0xD1F3],
- ["B86A",0xD1F5],
- ["B86B",0xD1F6],
- ["B86C",0xD1F7],
- ["B86D",0xD1F9],
- ["B86E",0xD1FA],
- ["B86F",0xD1FB],
- ["B870",0xD1FC],
- ["B871",0xD1FD],
- ["B872",0xD1FE],
- ["B873",0xD1FF],
- ["B874",0xD200],
- ["B875",0xD201],
- ["B876",0xD202],
- ["B877",0xD203],
- ["B878",0xD204],
- ["B879",0xD205],
- ["B87A",0xD206],
- ["B881",0xD208],
- ["B882",0xD20A],
- ["B883",0xD20B],
- ["B884",0xD20C],
- ["B885",0xD20D],
- ["B886",0xD20E],
- ["B887",0xD20F],
- ["B888",0xD211],
- ["B889",0xD212],
- ["B88A",0xD213],
- ["B88B",0xD214],
- ["B88C",0xD215],
- ["B88D",0xD216],
- ["B88E",0xD217],
- ["B88F",0xD218],
- ["B890",0xD219],
- ["B891",0xD21A],
- ["B892",0xD21B],
- ["B893",0xD21C],
- ["B894",0xD21D],
- ["B895",0xD21E],
- ["B896",0xD21F],
- ["B897",0xD220],
- ["B898",0xD221],
- ["B899",0xD222],
- ["B89A",0xD223],
- ["B89B",0xD224],
- ["B89C",0xD225],
- ["B89D",0xD226],
- ["B89E",0xD227],
- ["B89F",0xD228],
- ["B8A0",0xD229],
- ["B941",0xD22A],
- ["B942",0xD22B],
- ["B943",0xD22E],
- ["B944",0xD22F],
- ["B945",0xD231],
- ["B946",0xD232],
- ["B947",0xD233],
- ["B948",0xD235],
- ["B949",0xD236],
- ["B94A",0xD237],
- ["B94B",0xD238],
- ["B94C",0xD239],
- ["B94D",0xD23A],
- ["B94E",0xD23B],
- ["B94F",0xD23E],
- ["B950",0xD240],
- ["B951",0xD242],
- ["B952",0xD243],
- ["B953",0xD244],
- ["B954",0xD245],
- ["B955",0xD246],
- ["B956",0xD247],
- ["B957",0xD249],
- ["B958",0xD24A],
- ["B959",0xD24B],
- ["B95A",0xD24C],
- ["B961",0xD24D],
- ["B962",0xD24E],
- ["B963",0xD24F],
- ["B964",0xD250],
- ["B965",0xD251],
- ["B966",0xD252],
- ["B967",0xD253],
- ["B968",0xD254],
- ["B969",0xD255],
- ["B96A",0xD256],
- ["B96B",0xD257],
- ["B96C",0xD258],
- ["B96D",0xD259],
- ["B96E",0xD25A],
- ["B96F",0xD25B],
- ["B970",0xD25D],
- ["B971",0xD25E],
- ["B972",0xD25F],
- ["B973",0xD260],
- ["B974",0xD261],
- ["B975",0xD262],
- ["B976",0xD263],
- ["B977",0xD265],
- ["B978",0xD266],
- ["B979",0xD267],
- ["B97A",0xD268],
- ["B981",0xD269],
- ["B982",0xD26A],
- ["B983",0xD26B],
- ["B984",0xD26C],
- ["B985",0xD26D],
- ["B986",0xD26E],
- ["B987",0xD26F],
- ["B988",0xD270],
- ["B989",0xD271],
- ["B98A",0xD272],
- ["B98B",0xD273],
- ["B98C",0xD274],
- ["B98D",0xD275],
- ["B98E",0xD276],
- ["B98F",0xD277],
- ["B990",0xD278],
- ["B991",0xD279],
- ["B992",0xD27A],
- ["B993",0xD27B],
- ["B994",0xD27C],
- ["B995",0xD27D],
- ["B996",0xD27E],
- ["B997",0xD27F],
- ["B998",0xD282],
- ["B999",0xD283],
- ["B99A",0xD285],
- ["B99B",0xD286],
- ["B99C",0xD287],
- ["B99D",0xD289],
- ["B99E",0xD28A],
- ["B99F",0xD28B],
- ["B9A0",0xD28C],
- ["BA41",0xD28D],
- ["BA42",0xD28E],
- ["BA43",0xD28F],
- ["BA44",0xD292],
- ["BA45",0xD293],
- ["BA46",0xD294],
- ["BA47",0xD296],
- ["BA48",0xD297],
- ["BA49",0xD298],
- ["BA4A",0xD299],
- ["BA4B",0xD29A],
- ["BA4C",0xD29B],
- ["BA4D",0xD29D],
- ["BA4E",0xD29E],
- ["BA4F",0xD29F],
- ["BA50",0xD2A1],
- ["BA51",0xD2A2],
- ["BA52",0xD2A3],
- ["BA53",0xD2A5],
- ["BA54",0xD2A6],
- ["BA55",0xD2A7],
- ["BA56",0xD2A8],
- ["BA57",0xD2A9],
- ["BA58",0xD2AA],
- ["BA59",0xD2AB],
- ["BA5A",0xD2AD],
- ["BA61",0xD2AE],
- ["BA62",0xD2AF],
- ["BA63",0xD2B0],
- ["BA64",0xD2B2],
- ["BA65",0xD2B3],
- ["BA66",0xD2B4],
- ["BA67",0xD2B5],
- ["BA68",0xD2B6],
- ["BA69",0xD2B7],
- ["BA6A",0xD2BA],
- ["BA6B",0xD2BB],
- ["BA6C",0xD2BD],
- ["BA6D",0xD2BE],
- ["BA6E",0xD2C1],
- ["BA6F",0xD2C3],
- ["BA70",0xD2C4],
- ["BA71",0xD2C5],
- ["BA72",0xD2C6],
- ["BA73",0xD2C7],
- ["BA74",0xD2CA],
- ["BA75",0xD2CC],
- ["BA76",0xD2CD],
- ["BA77",0xD2CE],
- ["BA78",0xD2CF],
- ["BA79",0xD2D0],
- ["BA7A",0xD2D1],
- ["BA81",0xD2D2],
- ["BA82",0xD2D3],
- ["BA83",0xD2D5],
- ["BA84",0xD2D6],
- ["BA85",0xD2D7],
- ["BA86",0xD2D9],
- ["BA87",0xD2DA],
- ["BA88",0xD2DB],
- ["BA89",0xD2DD],
- ["BA8A",0xD2DE],
- ["BA8B",0xD2DF],
- ["BA8C",0xD2E0],
- ["BA8D",0xD2E1],
- ["BA8E",0xD2E2],
- ["BA8F",0xD2E3],
- ["BA90",0xD2E6],
- ["BA91",0xD2E7],
- ["BA92",0xD2E8],
- ["BA93",0xD2E9],
- ["BA94",0xD2EA],
- ["BA95",0xD2EB],
- ["BA96",0xD2EC],
- ["BA97",0xD2ED],
- ["BA98",0xD2EE],
- ["BA99",0xD2EF],
- ["BA9A",0xD2F2],
- ["BA9B",0xD2F3],
- ["BA9C",0xD2F5],
- ["BA9D",0xD2F6],
- ["BA9E",0xD2F7],
- ["BA9F",0xD2F9],
- ["BAA0",0xD2FA],
- ["BB41",0xD2FB],
- ["BB42",0xD2FC],
- ["BB43",0xD2FD],
- ["BB44",0xD2FE],
- ["BB45",0xD2FF],
- ["BB46",0xD302],
- ["BB47",0xD304],
- ["BB48",0xD306],
- ["BB49",0xD307],
- ["BB4A",0xD308],
- ["BB4B",0xD309],
- ["BB4C",0xD30A],
- ["BB4D",0xD30B],
- ["BB4E",0xD30F],
- ["BB4F",0xD311],
- ["BB50",0xD312],
- ["BB51",0xD313],
- ["BB52",0xD315],
- ["BB53",0xD317],
- ["BB54",0xD318],
- ["BB55",0xD319],
- ["BB56",0xD31A],
- ["BB57",0xD31B],
- ["BB58",0xD31E],
- ["BB59",0xD322],
- ["BB5A",0xD323],
- ["BB61",0xD324],
- ["BB62",0xD326],
- ["BB63",0xD327],
- ["BB64",0xD32A],
- ["BB65",0xD32B],
- ["BB66",0xD32D],
- ["BB67",0xD32E],
- ["BB68",0xD32F],
- ["BB69",0xD331],
- ["BB6A",0xD332],
- ["BB6B",0xD333],
- ["BB6C",0xD334],
- ["BB6D",0xD335],
- ["BB6E",0xD336],
- ["BB6F",0xD337],
- ["BB70",0xD33A],
- ["BB71",0xD33E],
- ["BB72",0xD33F],
- ["BB73",0xD340],
- ["BB74",0xD341],
- ["BB75",0xD342],
- ["BB76",0xD343],
- ["BB77",0xD346],
- ["BB78",0xD347],
- ["BB79",0xD348],
- ["BB7A",0xD349],
- ["BB81",0xD34A],
- ["BB82",0xD34B],
- ["BB83",0xD34C],
- ["BB84",0xD34D],
- ["BB85",0xD34E],
- ["BB86",0xD34F],
- ["BB87",0xD350],
- ["BB88",0xD351],
- ["BB89",0xD352],
- ["BB8A",0xD353],
- ["BB8B",0xD354],
- ["BB8C",0xD355],
- ["BB8D",0xD356],
- ["BB8E",0xD357],
- ["BB8F",0xD358],
- ["BB90",0xD359],
- ["BB91",0xD35A],
- ["BB92",0xD35B],
- ["BB93",0xD35C],
- ["BB94",0xD35D],
- ["BB95",0xD35E],
- ["BB96",0xD35F],
- ["BB97",0xD360],
- ["BB98",0xD361],
- ["BB99",0xD362],
- ["BB9A",0xD363],
- ["BB9B",0xD364],
- ["BB9C",0xD365],
- ["BB9D",0xD366],
- ["BB9E",0xD367],
- ["BB9F",0xD368],
- ["BBA0",0xD369],
- ["BC41",0xD36A],
- ["BC42",0xD36B],
- ["BC43",0xD36C],
- ["BC44",0xD36D],
- ["BC45",0xD36E],
- ["BC46",0xD36F],
- ["BC47",0xD370],
- ["BC48",0xD371],
- ["BC49",0xD372],
- ["BC4A",0xD373],
- ["BC4B",0xD374],
- ["BC4C",0xD375],
- ["BC4D",0xD376],
- ["BC4E",0xD377],
- ["BC4F",0xD378],
- ["BC50",0xD379],
- ["BC51",0xD37A],
- ["BC52",0xD37B],
- ["BC53",0xD37E],
- ["BC54",0xD37F],
- ["BC55",0xD381],
- ["BC56",0xD382],
- ["BC57",0xD383],
- ["BC58",0xD385],
- ["BC59",0xD386],
- ["BC5A",0xD387],
- ["BC61",0xD388],
- ["BC62",0xD389],
- ["BC63",0xD38A],
- ["BC64",0xD38B],
- ["BC65",0xD38E],
- ["BC66",0xD392],
- ["BC67",0xD393],
- ["BC68",0xD394],
- ["BC69",0xD395],
- ["BC6A",0xD396],
- ["BC6B",0xD397],
- ["BC6C",0xD39A],
- ["BC6D",0xD39B],
- ["BC6E",0xD39D],
- ["BC6F",0xD39E],
- ["BC70",0xD39F],
- ["BC71",0xD3A1],
- ["BC72",0xD3A2],
- ["BC73",0xD3A3],
- ["BC74",0xD3A4],
- ["BC75",0xD3A5],
- ["BC76",0xD3A6],
- ["BC77",0xD3A7],
- ["BC78",0xD3AA],
- ["BC79",0xD3AC],
- ["BC7A",0xD3AE],
- ["BC81",0xD3AF],
- ["BC82",0xD3B0],
- ["BC83",0xD3B1],
- ["BC84",0xD3B2],
- ["BC85",0xD3B3],
- ["BC86",0xD3B5],
- ["BC87",0xD3B6],
- ["BC88",0xD3B7],
- ["BC89",0xD3B9],
- ["BC8A",0xD3BA],
- ["BC8B",0xD3BB],
- ["BC8C",0xD3BD],
- ["BC8D",0xD3BE],
- ["BC8E",0xD3BF],
- ["BC8F",0xD3C0],
- ["BC90",0xD3C1],
- ["BC91",0xD3C2],
- ["BC92",0xD3C3],
- ["BC93",0xD3C6],
- ["BC94",0xD3C7],
- ["BC95",0xD3CA],
- ["BC96",0xD3CB],
- ["BC97",0xD3CC],
- ["BC98",0xD3CD],
- ["BC99",0xD3CE],
- ["BC9A",0xD3CF],
- ["BC9B",0xD3D1],
- ["BC9C",0xD3D2],
- ["BC9D",0xD3D3],
- ["BC9E",0xD3D4],
- ["BC9F",0xD3D5],
- ["BCA0",0xD3D6],
- ["BD41",0xD3D7],
- ["BD42",0xD3D9],
- ["BD43",0xD3DA],
- ["BD44",0xD3DB],
- ["BD45",0xD3DC],
- ["BD46",0xD3DD],
- ["BD47",0xD3DE],
- ["BD48",0xD3DF],
- ["BD49",0xD3E0],
- ["BD4A",0xD3E2],
- ["BD4B",0xD3E4],
- ["BD4C",0xD3E5],
- ["BD4D",0xD3E6],
- ["BD4E",0xD3E7],
- ["BD4F",0xD3E8],
- ["BD50",0xD3E9],
- ["BD51",0xD3EA],
- ["BD52",0xD3EB],
- ["BD53",0xD3EE],
- ["BD54",0xD3EF],
- ["BD55",0xD3F1],
- ["BD56",0xD3F2],
- ["BD57",0xD3F3],
- ["BD58",0xD3F5],
- ["BD59",0xD3F6],
- ["BD5A",0xD3F7],
- ["BD61",0xD3F8],
- ["BD62",0xD3F9],
- ["BD63",0xD3FA],
- ["BD64",0xD3FB],
- ["BD65",0xD3FE],
- ["BD66",0xD400],
- ["BD67",0xD402],
- ["BD68",0xD403],
- ["BD69",0xD404],
- ["BD6A",0xD405],
- ["BD6B",0xD406],
- ["BD6C",0xD407],
- ["BD6D",0xD409],
- ["BD6E",0xD40A],
- ["BD6F",0xD40B],
- ["BD70",0xD40C],
- ["BD71",0xD40D],
- ["BD72",0xD40E],
- ["BD73",0xD40F],
- ["BD74",0xD410],
- ["BD75",0xD411],
- ["BD76",0xD412],
- ["BD77",0xD413],
- ["BD78",0xD414],
- ["BD79",0xD415],
- ["BD7A",0xD416],
- ["BD81",0xD417],
- ["BD82",0xD418],
- ["BD83",0xD419],
- ["BD84",0xD41A],
- ["BD85",0xD41B],
- ["BD86",0xD41C],
- ["BD87",0xD41E],
- ["BD88",0xD41F],
- ["BD89",0xD420],
- ["BD8A",0xD421],
- ["BD8B",0xD422],
- ["BD8C",0xD423],
- ["BD8D",0xD424],
- ["BD8E",0xD425],
- ["BD8F",0xD426],
- ["BD90",0xD427],
- ["BD91",0xD428],
- ["BD92",0xD429],
- ["BD93",0xD42A],
- ["BD94",0xD42B],
- ["BD95",0xD42C],
- ["BD96",0xD42D],
- ["BD97",0xD42E],
- ["BD98",0xD42F],
- ["BD99",0xD430],
- ["BD9A",0xD431],
- ["BD9B",0xD432],
- ["BD9C",0xD433],
- ["BD9D",0xD434],
- ["BD9E",0xD435],
- ["BD9F",0xD436],
- ["BDA0",0xD437],
- ["BE41",0xD438],
- ["BE42",0xD439],
- ["BE43",0xD43A],
- ["BE44",0xD43B],
- ["BE45",0xD43C],
- ["BE46",0xD43D],
- ["BE47",0xD43E],
- ["BE48",0xD43F],
- ["BE49",0xD441],
- ["BE4A",0xD442],
- ["BE4B",0xD443],
- ["BE4C",0xD445],
- ["BE4D",0xD446],
- ["BE4E",0xD447],
- ["BE4F",0xD448],
- ["BE50",0xD449],
- ["BE51",0xD44A],
- ["BE52",0xD44B],
- ["BE53",0xD44C],
- ["BE54",0xD44D],
- ["BE55",0xD44E],
- ["BE56",0xD44F],
- ["BE57",0xD450],
- ["BE58",0xD451],
- ["BE59",0xD452],
- ["BE5A",0xD453],
- ["BE61",0xD454],
- ["BE62",0xD455],
- ["BE63",0xD456],
- ["BE64",0xD457],
- ["BE65",0xD458],
- ["BE66",0xD459],
- ["BE67",0xD45A],
- ["BE68",0xD45B],
- ["BE69",0xD45D],
- ["BE6A",0xD45E],
- ["BE6B",0xD45F],
- ["BE6C",0xD461],
- ["BE6D",0xD462],
- ["BE6E",0xD463],
- ["BE6F",0xD465],
- ["BE70",0xD466],
- ["BE71",0xD467],
- ["BE72",0xD468],
- ["BE73",0xD469],
- ["BE74",0xD46A],
- ["BE75",0xD46B],
- ["BE76",0xD46C],
- ["BE77",0xD46E],
- ["BE78",0xD470],
- ["BE79",0xD471],
- ["BE7A",0xD472],
- ["BE81",0xD473],
- ["BE82",0xD474],
- ["BE83",0xD475],
- ["BE84",0xD476],
- ["BE85",0xD477],
- ["BE86",0xD47A],
- ["BE87",0xD47B],
- ["BE88",0xD47D],
- ["BE89",0xD47E],
- ["BE8A",0xD481],
- ["BE8B",0xD483],
- ["BE8C",0xD484],
- ["BE8D",0xD485],
- ["BE8E",0xD486],
- ["BE8F",0xD487],
- ["BE90",0xD48A],
- ["BE91",0xD48C],
- ["BE92",0xD48E],
- ["BE93",0xD48F],
- ["BE94",0xD490],
- ["BE95",0xD491],
- ["BE96",0xD492],
- ["BE97",0xD493],
- ["BE98",0xD495],
- ["BE99",0xD496],
- ["BE9A",0xD497],
- ["BE9B",0xD498],
- ["BE9C",0xD499],
- ["BE9D",0xD49A],
- ["BE9E",0xD49B],
- ["BE9F",0xD49C],
- ["BEA0",0xD49D],
- ["BF41",0xD49E],
- ["BF42",0xD49F],
- ["BF43",0xD4A0],
- ["BF44",0xD4A1],
- ["BF45",0xD4A2],
- ["BF46",0xD4A3],
- ["BF47",0xD4A4],
- ["BF48",0xD4A5],
- ["BF49",0xD4A6],
- ["BF4A",0xD4A7],
- ["BF4B",0xD4A8],
- ["BF4C",0xD4AA],
- ["BF4D",0xD4AB],
- ["BF4E",0xD4AC],
- ["BF4F",0xD4AD],
- ["BF50",0xD4AE],
- ["BF51",0xD4AF],
- ["BF52",0xD4B0],
- ["BF53",0xD4B1],
- ["BF54",0xD4B2],
- ["BF55",0xD4B3],
- ["BF56",0xD4B4],
- ["BF57",0xD4B5],
- ["BF58",0xD4B6],
- ["BF59",0xD4B7],
- ["BF5A",0xD4B8],
- ["BF61",0xD4B9],
- ["BF62",0xD4BA],
- ["BF63",0xD4BB],
- ["BF64",0xD4BC],
- ["BF65",0xD4BD],
- ["BF66",0xD4BE],
- ["BF67",0xD4BF],
- ["BF68",0xD4C0],
- ["BF69",0xD4C1],
- ["BF6A",0xD4C2],
- ["BF6B",0xD4C3],
- ["BF6C",0xD4C4],
- ["BF6D",0xD4C5],
- ["BF6E",0xD4C6],
- ["BF6F",0xD4C7],
- ["BF70",0xD4C8],
- ["BF71",0xD4C9],
- ["BF72",0xD4CA],
- ["BF73",0xD4CB],
- ["BF74",0xD4CD],
- ["BF75",0xD4CE],
- ["BF76",0xD4CF],
- ["BF77",0xD4D1],
- ["BF78",0xD4D2],
- ["BF79",0xD4D3],
- ["BF7A",0xD4D5],
- ["BF81",0xD4D6],
- ["BF82",0xD4D7],
- ["BF83",0xD4D8],
- ["BF84",0xD4D9],
- ["BF85",0xD4DA],
- ["BF86",0xD4DB],
- ["BF87",0xD4DD],
- ["BF88",0xD4DE],
- ["BF89",0xD4E0],
- ["BF8A",0xD4E1],
- ["BF8B",0xD4E2],
- ["BF8C",0xD4E3],
- ["BF8D",0xD4E4],
- ["BF8E",0xD4E5],
- ["BF8F",0xD4E6],
- ["BF90",0xD4E7],
- ["BF91",0xD4E9],
- ["BF92",0xD4EA],
- ["BF93",0xD4EB],
- ["BF94",0xD4ED],
- ["BF95",0xD4EE],
- ["BF96",0xD4EF],
- ["BF97",0xD4F1],
- ["BF98",0xD4F2],
- ["BF99",0xD4F3],
- ["BF9A",0xD4F4],
- ["BF9B",0xD4F5],
- ["BF9C",0xD4F6],
- ["BF9D",0xD4F7],
- ["BF9E",0xD4F9],
- ["BF9F",0xD4FA],
- ["BFA0",0xD4FC],
- ["C041",0xD4FE],
- ["C042",0xD4FF],
- ["C043",0xD500],
- ["C044",0xD501],
- ["C045",0xD502],
- ["C046",0xD503],
- ["C047",0xD505],
- ["C048",0xD506],
- ["C049",0xD507],
- ["C04A",0xD509],
- ["C04B",0xD50A],
- ["C04C",0xD50B],
- ["C04D",0xD50D],
- ["C04E",0xD50E],
- ["C04F",0xD50F],
- ["C050",0xD510],
- ["C051",0xD511],
- ["C052",0xD512],
- ["C053",0xD513],
- ["C054",0xD516],
- ["C055",0xD518],
- ["C056",0xD519],
- ["C057",0xD51A],
- ["C058",0xD51B],
- ["C059",0xD51C],
- ["C05A",0xD51D],
- ["C061",0xD51E],
- ["C062",0xD51F],
- ["C063",0xD520],
- ["C064",0xD521],
- ["C065",0xD522],
- ["C066",0xD523],
- ["C067",0xD524],
- ["C068",0xD525],
- ["C069",0xD526],
- ["C06A",0xD527],
- ["C06B",0xD528],
- ["C06C",0xD529],
- ["C06D",0xD52A],
- ["C06E",0xD52B],
- ["C06F",0xD52C],
- ["C070",0xD52D],
- ["C071",0xD52E],
- ["C072",0xD52F],
- ["C073",0xD530],
- ["C074",0xD531],
- ["C075",0xD532],
- ["C076",0xD533],
- ["C077",0xD534],
- ["C078",0xD535],
- ["C079",0xD536],
- ["C07A",0xD537],
- ["C081",0xD538],
- ["C082",0xD539],
- ["C083",0xD53A],
- ["C084",0xD53B],
- ["C085",0xD53E],
- ["C086",0xD53F],
- ["C087",0xD541],
- ["C088",0xD542],
- ["C089",0xD543],
- ["C08A",0xD545],
- ["C08B",0xD546],
- ["C08C",0xD547],
- ["C08D",0xD548],
- ["C08E",0xD549],
- ["C08F",0xD54A],
- ["C090",0xD54B],
- ["C091",0xD54E],
- ["C092",0xD550],
- ["C093",0xD552],
- ["C094",0xD553],
- ["C095",0xD554],
- ["C096",0xD555],
- ["C097",0xD556],
- ["C098",0xD557],
- ["C099",0xD55A],
- ["C09A",0xD55B],
- ["C09B",0xD55D],
- ["C09C",0xD55E],
- ["C09D",0xD55F],
- ["C09E",0xD561],
- ["C09F",0xD562],
- ["C0A0",0xD563],
- ["C141",0xD564],
- ["C142",0xD566],
- ["C143",0xD567],
- ["C144",0xD56A],
- ["C145",0xD56C],
- ["C146",0xD56E],
- ["C147",0xD56F],
- ["C148",0xD570],
- ["C149",0xD571],
- ["C14A",0xD572],
- ["C14B",0xD573],
- ["C14C",0xD576],
- ["C14D",0xD577],
- ["C14E",0xD579],
- ["C14F",0xD57A],
- ["C150",0xD57B],
- ["C151",0xD57D],
- ["C152",0xD57E],
- ["C153",0xD57F],
- ["C154",0xD580],
- ["C155",0xD581],
- ["C156",0xD582],
- ["C157",0xD583],
- ["C158",0xD586],
- ["C159",0xD58A],
- ["C15A",0xD58B],
- ["C161",0xD58C],
- ["C162",0xD58D],
- ["C163",0xD58E],
- ["C164",0xD58F],
- ["C165",0xD591],
- ["C166",0xD592],
- ["C167",0xD593],
- ["C168",0xD594],
- ["C169",0xD595],
- ["C16A",0xD596],
- ["C16B",0xD597],
- ["C16C",0xD598],
- ["C16D",0xD599],
- ["C16E",0xD59A],
- ["C16F",0xD59B],
- ["C170",0xD59C],
- ["C171",0xD59D],
- ["C172",0xD59E],
- ["C173",0xD59F],
- ["C174",0xD5A0],
- ["C175",0xD5A1],
- ["C176",0xD5A2],
- ["C177",0xD5A3],
- ["C178",0xD5A4],
- ["C179",0xD5A6],
- ["C17A",0xD5A7],
- ["C181",0xD5A8],
- ["C182",0xD5A9],
- ["C183",0xD5AA],
- ["C184",0xD5AB],
- ["C185",0xD5AC],
- ["C186",0xD5AD],
- ["C187",0xD5AE],
- ["C188",0xD5AF],
- ["C189",0xD5B0],
- ["C18A",0xD5B1],
- ["C18B",0xD5B2],
- ["C18C",0xD5B3],
- ["C18D",0xD5B4],
- ["C18E",0xD5B5],
- ["C18F",0xD5B6],
- ["C190",0xD5B7],
- ["C191",0xD5B8],
- ["C192",0xD5B9],
- ["C193",0xD5BA],
- ["C194",0xD5BB],
- ["C195",0xD5BC],
- ["C196",0xD5BD],
- ["C197",0xD5BE],
- ["C198",0xD5BF],
- ["C199",0xD5C0],
- ["C19A",0xD5C1],
- ["C19B",0xD5C2],
- ["C19C",0xD5C3],
- ["C19D",0xD5C4],
- ["C19E",0xD5C5],
- ["C19F",0xD5C6],
- ["C1A0",0xD5C7],
- ["C241",0xD5CA],
- ["C242",0xD5CB],
- ["C243",0xD5CD],
- ["C244",0xD5CE],
- ["C245",0xD5CF],
- ["C246",0xD5D1],
- ["C247",0xD5D3],
- ["C248",0xD5D4],
- ["C249",0xD5D5],
- ["C24A",0xD5D6],
- ["C24B",0xD5D7],
- ["C24C",0xD5DA],
- ["C24D",0xD5DC],
- ["C24E",0xD5DE],
- ["C24F",0xD5DF],
- ["C250",0xD5E0],
- ["C251",0xD5E1],
- ["C252",0xD5E2],
- ["C253",0xD5E3],
- ["C254",0xD5E6],
- ["C255",0xD5E7],
- ["C256",0xD5E9],
- ["C257",0xD5EA],
- ["C258",0xD5EB],
- ["C259",0xD5ED],
- ["C25A",0xD5EE],
- ["C261",0xD5EF],
- ["C262",0xD5F0],
- ["C263",0xD5F1],
- ["C264",0xD5F2],
- ["C265",0xD5F3],
- ["C266",0xD5F6],
- ["C267",0xD5F8],
- ["C268",0xD5FA],
- ["C269",0xD5FB],
- ["C26A",0xD5FC],
- ["C26B",0xD5FD],
- ["C26C",0xD5FE],
- ["C26D",0xD5FF],
- ["C26E",0xD602],
- ["C26F",0xD603],
- ["C270",0xD605],
- ["C271",0xD606],
- ["C272",0xD607],
- ["C273",0xD609],
- ["C274",0xD60A],
- ["C275",0xD60B],
- ["C276",0xD60C],
- ["C277",0xD60D],
- ["C278",0xD60E],
- ["C279",0xD60F],
- ["C27A",0xD612],
- ["C281",0xD616],
- ["C282",0xD617],
- ["C283",0xD618],
- ["C284",0xD619],
- ["C285",0xD61A],
- ["C286",0xD61B],
- ["C287",0xD61D],
- ["C288",0xD61E],
- ["C289",0xD61F],
- ["C28A",0xD621],
- ["C28B",0xD622],
- ["C28C",0xD623],
- ["C28D",0xD625],
- ["C28E",0xD626],
- ["C28F",0xD627],
- ["C290",0xD628],
- ["C291",0xD629],
- ["C292",0xD62A],
- ["C293",0xD62B],
- ["C294",0xD62C],
- ["C295",0xD62E],
- ["C296",0xD62F],
- ["C297",0xD630],
- ["C298",0xD631],
- ["C299",0xD632],
- ["C29A",0xD633],
- ["C29B",0xD634],
- ["C29C",0xD635],
- ["C29D",0xD636],
- ["C29E",0xD637],
- ["C29F",0xD63A],
- ["C2A0",0xD63B],
- ["C341",0xD63D],
- ["C342",0xD63E],
- ["C343",0xD63F],
- ["C344",0xD641],
- ["C345",0xD642],
- ["C346",0xD643],
- ["C347",0xD644],
- ["C348",0xD646],
- ["C349",0xD647],
- ["C34A",0xD64A],
- ["C34B",0xD64C],
- ["C34C",0xD64E],
- ["C34D",0xD64F],
- ["C34E",0xD650],
- ["C34F",0xD652],
- ["C350",0xD653],
- ["C351",0xD656],
- ["C352",0xD657],
- ["C353",0xD659],
- ["C354",0xD65A],
- ["C355",0xD65B],
- ["C356",0xD65D],
- ["C357",0xD65E],
- ["C358",0xD65F],
- ["C359",0xD660],
- ["C35A",0xD661],
- ["C361",0xD662],
- ["C362",0xD663],
- ["C363",0xD664],
- ["C364",0xD665],
- ["C365",0xD666],
- ["C366",0xD668],
- ["C367",0xD66A],
- ["C368",0xD66B],
- ["C369",0xD66C],
- ["C36A",0xD66D],
- ["C36B",0xD66E],
- ["C36C",0xD66F],
- ["C36D",0xD672],
- ["C36E",0xD673],
- ["C36F",0xD675],
- ["C370",0xD676],
- ["C371",0xD677],
- ["C372",0xD678],
- ["C373",0xD679],
- ["C374",0xD67A],
- ["C375",0xD67B],
- ["C376",0xD67C],
- ["C377",0xD67D],
- ["C378",0xD67E],
- ["C379",0xD67F],
- ["C37A",0xD680],
- ["C381",0xD681],
- ["C382",0xD682],
- ["C383",0xD684],
- ["C384",0xD686],
- ["C385",0xD687],
- ["C386",0xD688],
- ["C387",0xD689],
- ["C388",0xD68A],
- ["C389",0xD68B],
- ["C38A",0xD68E],
- ["C38B",0xD68F],
- ["C38C",0xD691],
- ["C38D",0xD692],
- ["C38E",0xD693],
- ["C38F",0xD695],
- ["C390",0xD696],
- ["C391",0xD697],
- ["C392",0xD698],
- ["C393",0xD699],
- ["C394",0xD69A],
- ["C395",0xD69B],
- ["C396",0xD69C],
- ["C397",0xD69E],
- ["C398",0xD6A0],
- ["C399",0xD6A2],
- ["C39A",0xD6A3],
- ["C39B",0xD6A4],
- ["C39C",0xD6A5],
- ["C39D",0xD6A6],
- ["C39E",0xD6A7],
- ["C39F",0xD6A9],
- ["C3A0",0xD6AA],
- ["C441",0xD6AB],
- ["C442",0xD6AD],
- ["C443",0xD6AE],
- ["C444",0xD6AF],
- ["C445",0xD6B1],
- ["C446",0xD6B2],
- ["C447",0xD6B3],
- ["C448",0xD6B4],
- ["C449",0xD6B5],
- ["C44A",0xD6B6],
- ["C44B",0xD6B7],
- ["C44C",0xD6B8],
- ["C44D",0xD6BA],
- ["C44E",0xD6BC],
- ["C44F",0xD6BD],
- ["C450",0xD6BE],
- ["C451",0xD6BF],
- ["C452",0xD6C0],
- ["C453",0xD6C1],
- ["C454",0xD6C2],
- ["C455",0xD6C3],
- ["C456",0xD6C6],
- ["C457",0xD6C7],
- ["C458",0xD6C9],
- ["C459",0xD6CA],
- ["C45A",0xD6CB],
- ["C461",0xD6CD],
- ["C462",0xD6CE],
- ["C463",0xD6CF],
- ["C464",0xD6D0],
- ["C465",0xD6D2],
- ["C466",0xD6D3],
- ["C467",0xD6D5],
- ["C468",0xD6D6],
- ["C469",0xD6D8],
- ["C46A",0xD6DA],
- ["C46B",0xD6DB],
- ["C46C",0xD6DC],
- ["C46D",0xD6DD],
- ["C46E",0xD6DE],
- ["C46F",0xD6DF],
- ["C470",0xD6E1],
- ["C471",0xD6E2],
- ["C472",0xD6E3],
- ["C473",0xD6E5],
- ["C474",0xD6E6],
- ["C475",0xD6E7],
- ["C476",0xD6E9],
- ["C477",0xD6EA],
- ["C478",0xD6EB],
- ["C479",0xD6EC],
- ["C47A",0xD6ED],
- ["C481",0xD6EE],
- ["C482",0xD6EF],
- ["C483",0xD6F1],
- ["C484",0xD6F2],
- ["C485",0xD6F3],
- ["C486",0xD6F4],
- ["C487",0xD6F6],
- ["C488",0xD6F7],
- ["C489",0xD6F8],
- ["C48A",0xD6F9],
- ["C48B",0xD6FA],
- ["C48C",0xD6FB],
- ["C48D",0xD6FE],
- ["C48E",0xD6FF],
- ["C48F",0xD701],
- ["C490",0xD702],
- ["C491",0xD703],
- ["C492",0xD705],
- ["C493",0xD706],
- ["C494",0xD707],
- ["C495",0xD708],
- ["C496",0xD709],
- ["C497",0xD70A],
- ["C498",0xD70B],
- ["C499",0xD70C],
- ["C49A",0xD70D],
- ["C49B",0xD70E],
- ["C49C",0xD70F],
- ["C49D",0xD710],
- ["C49E",0xD712],
- ["C49F",0xD713],
- ["C4A0",0xD714],
- ["C541",0xD715],
- ["C542",0xD716],
- ["C543",0xD717],
- ["C544",0xD71A],
- ["C545",0xD71B],
- ["C546",0xD71D],
- ["C547",0xD71E],
- ["C548",0xD71F],
- ["C549",0xD721],
- ["C54A",0xD722],
- ["C54B",0xD723],
- ["C54C",0xD724],
- ["C54D",0xD725],
- ["C54E",0xD726],
- ["C54F",0xD727],
- ["C550",0xD72A],
- ["C551",0xD72C],
- ["C552",0xD72E],
- ["C553",0xD72F],
- ["C554",0xD730],
- ["C555",0xD731],
- ["C556",0xD732],
- ["C557",0xD733],
- ["C558",0xD736],
- ["C559",0xD737],
- ["C55A",0xD739],
- ["C561",0xD73A],
- ["C562",0xD73B],
- ["C563",0xD73D],
- ["C564",0xD73E],
- ["C565",0xD73F],
- ["C566",0xD740],
- ["C567",0xD741],
- ["C568",0xD742],
- ["C569",0xD743],
- ["C56A",0xD745],
- ["C56B",0xD746],
- ["C56C",0xD748],
- ["C56D",0xD74A],
- ["C56E",0xD74B],
- ["C56F",0xD74C],
- ["C570",0xD74D],
- ["C571",0xD74E],
- ["C572",0xD74F],
- ["C573",0xD752],
- ["C574",0xD753],
- ["C575",0xD755],
- ["C576",0xD75A],
- ["C577",0xD75B],
- ["C578",0xD75C],
- ["C579",0xD75D],
- ["C57A",0xD75E],
- ["C581",0xD75F],
- ["C582",0xD762],
- ["C583",0xD764],
- ["C584",0xD766],
- ["C585",0xD767],
- ["C586",0xD768],
- ["C587",0xD76A],
- ["C588",0xD76B],
- ["C589",0xD76D],
- ["C58A",0xD76E],
- ["C58B",0xD76F],
- ["C58C",0xD771],
- ["C58D",0xD772],
- ["C58E",0xD773],
- ["C58F",0xD775],
- ["C590",0xD776],
- ["C591",0xD777],
- ["C592",0xD778],
- ["C593",0xD779],
- ["C594",0xD77A],
- ["C595",0xD77B],
- ["C596",0xD77E],
- ["C597",0xD77F],
- ["C598",0xD780],
- ["C599",0xD782],
- ["C59A",0xD783],
- ["C59B",0xD784],
- ["C59C",0xD785],
- ["C59D",0xD786],
- ["C59E",0xD787],
- ["C59F",0xD78A],
- ["C5A0",0xD78B],
- ["C641",0xD78D],
- ["C642",0xD78E],
- ["C643",0xD78F],
- ["C644",0xD791],
- ["C645",0xD792],
- ["C646",0xD793],
- ["C647",0xD794],
- ["C648",0xD795],
- ["C649",0xD796],
- ["C64A",0xD797],
- ["C64B",0xD79A],
- ["C64C",0xD79C],
- ["C64D",0xD79E],
- ["C64E",0xD79F],
- ["C64F",0xD7A0],
- ["C650",0xD7A1],
- ["C651",0xD7A2],
- ["C652",0xD7A3],
-]
-
-CP949_TO_UCS_TBL = EUCKR_TO_UCS_TBL + CP949_TO_UCS_ADDITIONAL_TBL
-UCS_TO_CP949_TBL = CP949_TO_UCS_TBL.map {|a,b| [b,a]}
diff --git a/enc/trans/escape.trans b/enc/trans/escape.trans
deleted file mode 100644
index f45f27bc41..0000000000
--- a/enc/trans/escape.trans
+++ /dev/null
@@ -1,94 +0,0 @@
-#include "transcode_data.h"
-
-<%
- def hexstr(str)
- str.unpack("H*")[0]
- end
-
- transcode_tblgen("", "amp_escape", [
- ["{00-25,27-FF}", :nomap],
- ["26", hexstr("&amp;")]
- ])
-
- transcode_tblgen("", "xml_text_escape", [
- ["{00-25,27-3B,3D,3F-FF}", :nomap],
- ["26", hexstr("&amp;")],
- ["3C", hexstr("&lt;")],
- ["3E", hexstr("&gt;")]
- ])
-
- transcode_tblgen("", "xml_attr_content_escape", [
- ["{00-21,23-25,27-3B,3D,3F-FF}", :nomap],
- ["22", hexstr("&quot;")],
- ["26", hexstr("&amp;")],
- ["3C", hexstr("&lt;")],
- ["3E", hexstr("&gt;")]
- ])
-
- map_xml_attr_quote = {}
- map_xml_attr_quote["{00-FF}"] = :func_so
- transcode_generate_node(ActionMap.parse(map_xml_attr_quote), "escape_xml_attr_quote")
-%>
-
-<%= transcode_generated_code %>
-
-#define END 0
-#define NORMAL 1
-
-static int
-escape_xml_attr_quote_init(void *statep)
-{
- unsigned char *sp = statep;
- *sp = END;
- return 0;
-}
-
-static ssize_t
-fun_so_escape_xml_attr_quote(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
-{
- unsigned char *sp = statep;
- int n = 0;
- if (*sp == END) {
- *sp = NORMAL;
- o[n++] = '"';
- }
- o[n++] = s[0];
- return n;
-}
-
-static ssize_t
-escape_xml_attr_quote_finish(void *statep, unsigned char *o, size_t osize)
-{
- unsigned char *sp = statep;
- int n = 0;
-
- if (*sp == END) {
- o[n++] = '"';
- }
-
- o[n++] = '"';
- *sp = END;
-
- return n;
-}
-
-static const rb_transcoder
-rb_escape_xml_attr_quote = {
- "", "xml_attr_quote", escape_xml_attr_quote,
- TRANSCODE_TABLE_INFO,
- 1, /* input_unit_length */
- 1, /* max_input */
- 7, /* max_output */
- asciicompat_encoder, /* asciicompat_type */
- 1, escape_xml_attr_quote_init, escape_xml_attr_quote_init,
- NULL, NULL, NULL, fun_so_escape_xml_attr_quote,
- escape_xml_attr_quote_finish
-};
-
-void
-Init_escape(void)
-{
-<%= transcode_register_code %>
- rb_register_transcoder(&rb_escape_xml_attr_quote);
-}
-
diff --git a/enc/trans/euckr-tbl.rb b/enc/trans/euckr-tbl.rb
deleted file mode 100644
index 773cd90122..0000000000
--- a/enc/trans/euckr-tbl.rb
+++ /dev/null
@@ -1,8228 +0,0 @@
-EUCKR_TO_UCS_TBL = [
- ["A1A1",0x3000],
- ["A1A2",0x3001],
- ["A1A3",0x3002],
- ["A1A4",0xB7],
- ["A1A5",0x2025],
- ["A1A6",0x2026],
- ["A1A7",0xA8],
- ["A1A8",0x3003],
- ["A1A9",0xAD],
- ["A1AA",0x2015],
- ["A1AB",0x2225],
- ["A1AC",0xFF3C],
- ["A1AD",0x223C],
- ["A1AE",0x2018],
- ["A1AF",0x2019],
- ["A1B0",0x201C],
- ["A1B1",0x201D],
- ["A1B2",0x3014],
- ["A1B3",0x3015],
- ["A1B4",0x3008],
- ["A1B5",0x3009],
- ["A1B6",0x300A],
- ["A1B7",0x300B],
- ["A1B8",0x300C],
- ["A1B9",0x300D],
- ["A1BA",0x300E],
- ["A1BB",0x300F],
- ["A1BC",0x3010],
- ["A1BD",0x3011],
- ["A1BE",0xB1],
- ["A1BF",0xD7],
- ["A1C0",0xF7],
- ["A1C1",0x2260],
- ["A1C2",0x2264],
- ["A1C3",0x2265],
- ["A1C4",0x221E],
- ["A1C5",0x2234],
- ["A1C6",0xB0],
- ["A1C7",0x2032],
- ["A1C8",0x2033],
- ["A1C9",0x2103],
- ["A1CA",0x212B],
- ["A1CB",0xFFE0],
- ["A1CC",0xFFE1],
- ["A1CD",0xFFE5],
- ["A1CE",0x2642],
- ["A1CF",0x2640],
- ["A1D0",0x2220],
- ["A1D1",0x22A5],
- ["A1D2",0x2312],
- ["A1D3",0x2202],
- ["A1D4",0x2207],
- ["A1D5",0x2261],
- ["A1D6",0x2252],
- ["A1D7",0xA7],
- ["A1D8",0x203B],
- ["A1D9",0x2606],
- ["A1DA",0x2605],
- ["A1DB",0x25CB],
- ["A1DC",0x25CF],
- ["A1DD",0x25CE],
- ["A1DE",0x25C7],
- ["A1DF",0x25C6],
- ["A1E0",0x25A1],
- ["A1E1",0x25A0],
- ["A1E2",0x25B3],
- ["A1E3",0x25B2],
- ["A1E4",0x25BD],
- ["A1E5",0x25BC],
- ["A1E6",0x2192],
- ["A1E7",0x2190],
- ["A1E8",0x2191],
- ["A1E9",0x2193],
- ["A1EA",0x2194],
- ["A1EB",0x3013],
- ["A1EC",0x226A],
- ["A1ED",0x226B],
- ["A1EE",0x221A],
- ["A1EF",0x223D],
- ["A1F0",0x221D],
- ["A1F1",0x2235],
- ["A1F2",0x222B],
- ["A1F3",0x222C],
- ["A1F4",0x2208],
- ["A1F5",0x220B],
- ["A1F6",0x2286],
- ["A1F7",0x2287],
- ["A1F8",0x2282],
- ["A1F9",0x2283],
- ["A1FA",0x222A],
- ["A1FB",0x2229],
- ["A1FC",0x2227],
- ["A1FD",0x2228],
- ["A1FE",0xFFE2],
- ["A2A1",0x21D2],
- ["A2A2",0x21D4],
- ["A2A3",0x2200],
- ["A2A4",0x2203],
- ["A2A5",0xB4],
- ["A2A6",0xFF5E],
- ["A2A7",0x2C7],
- ["A2A8",0x2D8],
- ["A2A9",0x2DD],
- ["A2AA",0x2DA],
- ["A2AB",0x2D9],
- ["A2AC",0xB8],
- ["A2AD",0x2DB],
- ["A2AE",0xA1],
- ["A2AF",0xBF],
- ["A2B0",0x2D0],
- ["A2B1",0x222E],
- ["A2B2",0x2211],
- ["A2B3",0x220F],
- ["A2B4",0xA4],
- ["A2B5",0x2109],
- ["A2B6",0x2030],
- ["A2B7",0x25C1],
- ["A2B8",0x25C0],
- ["A2B9",0x25B7],
- ["A2BA",0x25B6],
- ["A2BB",0x2664],
- ["A2BC",0x2660],
- ["A2BD",0x2661],
- ["A2BE",0x2665],
- ["A2BF",0x2667],
- ["A2C0",0x2663],
- ["A2C1",0x2299],
- ["A2C2",0x25C8],
- ["A2C3",0x25A3],
- ["A2C4",0x25D0],
- ["A2C5",0x25D1],
- ["A2C6",0x2592],
- ["A2C7",0x25A4],
- ["A2C8",0x25A5],
- ["A2C9",0x25A8],
- ["A2CA",0x25A7],
- ["A2CB",0x25A6],
- ["A2CC",0x25A9],
- ["A2CD",0x2668],
- ["A2CE",0x260F],
- ["A2CF",0x260E],
- ["A2D0",0x261C],
- ["A2D1",0x261E],
- ["A2D2",0xB6],
- ["A2D3",0x2020],
- ["A2D4",0x2021],
- ["A2D5",0x2195],
- ["A2D6",0x2197],
- ["A2D7",0x2199],
- ["A2D8",0x2196],
- ["A2D9",0x2198],
- ["A2DA",0x266D],
- ["A2DB",0x2669],
- ["A2DC",0x266A],
- ["A2DD",0x266C],
- ["A2DE",0x327F],
- ["A2DF",0x321C],
- ["A2E0",0x2116],
- ["A2E1",0x33C7],
- ["A2E2",0x2122],
- ["A2E3",0x33C2],
- ["A2E4",0x33D8],
- ["A2E5",0x2121],
- ["A3A1",0xFF01],
- ["A3A2",0xFF02],
- ["A3A3",0xFF03],
- ["A3A4",0xFF04],
- ["A3A5",0xFF05],
- ["A3A6",0xFF06],
- ["A3A7",0xFF07],
- ["A3A8",0xFF08],
- ["A3A9",0xFF09],
- ["A3AA",0xFF0A],
- ["A3AB",0xFF0B],
- ["A3AC",0xFF0C],
- ["A3AD",0xFF0D],
- ["A3AE",0xFF0E],
- ["A3AF",0xFF0F],
- ["A3B0",0xFF10],
- ["A3B1",0xFF11],
- ["A3B2",0xFF12],
- ["A3B3",0xFF13],
- ["A3B4",0xFF14],
- ["A3B5",0xFF15],
- ["A3B6",0xFF16],
- ["A3B7",0xFF17],
- ["A3B8",0xFF18],
- ["A3B9",0xFF19],
- ["A3BA",0xFF1A],
- ["A3BB",0xFF1B],
- ["A3BC",0xFF1C],
- ["A3BD",0xFF1D],
- ["A3BE",0xFF1E],
- ["A3BF",0xFF1F],
- ["A3C0",0xFF20],
- ["A3C1",0xFF21],
- ["A3C2",0xFF22],
- ["A3C3",0xFF23],
- ["A3C4",0xFF24],
- ["A3C5",0xFF25],
- ["A3C6",0xFF26],
- ["A3C7",0xFF27],
- ["A3C8",0xFF28],
- ["A3C9",0xFF29],
- ["A3CA",0xFF2A],
- ["A3CB",0xFF2B],
- ["A3CC",0xFF2C],
- ["A3CD",0xFF2D],
- ["A3CE",0xFF2E],
- ["A3CF",0xFF2F],
- ["A3D0",0xFF30],
- ["A3D1",0xFF31],
- ["A3D2",0xFF32],
- ["A3D3",0xFF33],
- ["A3D4",0xFF34],
- ["A3D5",0xFF35],
- ["A3D6",0xFF36],
- ["A3D7",0xFF37],
- ["A3D8",0xFF38],
- ["A3D9",0xFF39],
- ["A3DA",0xFF3A],
- ["A3DB",0xFF3B],
- ["A3DC",0xFFE6],
- ["A3DD",0xFF3D],
- ["A3DE",0xFF3E],
- ["A3DF",0xFF3F],
- ["A3E0",0xFF40],
- ["A3E1",0xFF41],
- ["A3E2",0xFF42],
- ["A3E3",0xFF43],
- ["A3E4",0xFF44],
- ["A3E5",0xFF45],
- ["A3E6",0xFF46],
- ["A3E7",0xFF47],
- ["A3E8",0xFF48],
- ["A3E9",0xFF49],
- ["A3EA",0xFF4A],
- ["A3EB",0xFF4B],
- ["A3EC",0xFF4C],
- ["A3ED",0xFF4D],
- ["A3EE",0xFF4E],
- ["A3EF",0xFF4F],
- ["A3F0",0xFF50],
- ["A3F1",0xFF51],
- ["A3F2",0xFF52],
- ["A3F3",0xFF53],
- ["A3F4",0xFF54],
- ["A3F5",0xFF55],
- ["A3F6",0xFF56],
- ["A3F7",0xFF57],
- ["A3F8",0xFF58],
- ["A3F9",0xFF59],
- ["A3FA",0xFF5A],
- ["A3FB",0xFF5B],
- ["A3FC",0xFF5C],
- ["A3FD",0xFF5D],
- ["A3FE",0xFFE3],
- ["A4A1",0x3131],
- ["A4A2",0x3132],
- ["A4A3",0x3133],
- ["A4A4",0x3134],
- ["A4A5",0x3135],
- ["A4A6",0x3136],
- ["A4A7",0x3137],
- ["A4A8",0x3138],
- ["A4A9",0x3139],
- ["A4AA",0x313A],
- ["A4AB",0x313B],
- ["A4AC",0x313C],
- ["A4AD",0x313D],
- ["A4AE",0x313E],
- ["A4AF",0x313F],
- ["A4B0",0x3140],
- ["A4B1",0x3141],
- ["A4B2",0x3142],
- ["A4B3",0x3143],
- ["A4B4",0x3144],
- ["A4B5",0x3145],
- ["A4B6",0x3146],
- ["A4B7",0x3147],
- ["A4B8",0x3148],
- ["A4B9",0x3149],
- ["A4BA",0x314A],
- ["A4BB",0x314B],
- ["A4BC",0x314C],
- ["A4BD",0x314D],
- ["A4BE",0x314E],
- ["A4BF",0x314F],
- ["A4C0",0x3150],
- ["A4C1",0x3151],
- ["A4C2",0x3152],
- ["A4C3",0x3153],
- ["A4C4",0x3154],
- ["A4C5",0x3155],
- ["A4C6",0x3156],
- ["A4C7",0x3157],
- ["A4C8",0x3158],
- ["A4C9",0x3159],
- ["A4CA",0x315A],
- ["A4CB",0x315B],
- ["A4CC",0x315C],
- ["A4CD",0x315D],
- ["A4CE",0x315E],
- ["A4CF",0x315F],
- ["A4D0",0x3160],
- ["A4D1",0x3161],
- ["A4D2",0x3162],
- ["A4D3",0x3163],
- ["A4D4",0x3164],
- ["A4D5",0x3165],
- ["A4D6",0x3166],
- ["A4D7",0x3167],
- ["A4D8",0x3168],
- ["A4D9",0x3169],
- ["A4DA",0x316A],
- ["A4DB",0x316B],
- ["A4DC",0x316C],
- ["A4DD",0x316D],
- ["A4DE",0x316E],
- ["A4DF",0x316F],
- ["A4E0",0x3170],
- ["A4E1",0x3171],
- ["A4E2",0x3172],
- ["A4E3",0x3173],
- ["A4E4",0x3174],
- ["A4E5",0x3175],
- ["A4E6",0x3176],
- ["A4E7",0x3177],
- ["A4E8",0x3178],
- ["A4E9",0x3179],
- ["A4EA",0x317A],
- ["A4EB",0x317B],
- ["A4EC",0x317C],
- ["A4ED",0x317D],
- ["A4EE",0x317E],
- ["A4EF",0x317F],
- ["A4F0",0x3180],
- ["A4F1",0x3181],
- ["A4F2",0x3182],
- ["A4F3",0x3183],
- ["A4F4",0x3184],
- ["A4F5",0x3185],
- ["A4F6",0x3186],
- ["A4F7",0x3187],
- ["A4F8",0x3188],
- ["A4F9",0x3189],
- ["A4FA",0x318A],
- ["A4FB",0x318B],
- ["A4FC",0x318C],
- ["A4FD",0x318D],
- ["A4FE",0x318E],
- ["A5A1",0x2170],
- ["A5A2",0x2171],
- ["A5A3",0x2172],
- ["A5A4",0x2173],
- ["A5A5",0x2174],
- ["A5A6",0x2175],
- ["A5A7",0x2176],
- ["A5A8",0x2177],
- ["A5A9",0x2178],
- ["A5AA",0x2179],
- ["A5B0",0x2160],
- ["A5B1",0x2161],
- ["A5B2",0x2162],
- ["A5B3",0x2163],
- ["A5B4",0x2164],
- ["A5B5",0x2165],
- ["A5B6",0x2166],
- ["A5B7",0x2167],
- ["A5B8",0x2168],
- ["A5B9",0x2169],
- ["A5C1",0x391],
- ["A5C2",0x392],
- ["A5C3",0x393],
- ["A5C4",0x394],
- ["A5C5",0x395],
- ["A5C6",0x396],
- ["A5C7",0x397],
- ["A5C8",0x398],
- ["A5C9",0x399],
- ["A5CA",0x39A],
- ["A5CB",0x39B],
- ["A5CC",0x39C],
- ["A5CD",0x39D],
- ["A5CE",0x39E],
- ["A5CF",0x39F],
- ["A5D0",0x3A0],
- ["A5D1",0x3A1],
- ["A5D2",0x3A3],
- ["A5D3",0x3A4],
- ["A5D4",0x3A5],
- ["A5D5",0x3A6],
- ["A5D6",0x3A7],
- ["A5D7",0x3A8],
- ["A5D8",0x3A9],
- ["A5E1",0x3B1],
- ["A5E2",0x3B2],
- ["A5E3",0x3B3],
- ["A5E4",0x3B4],
- ["A5E5",0x3B5],
- ["A5E6",0x3B6],
- ["A5E7",0x3B7],
- ["A5E8",0x3B8],
- ["A5E9",0x3B9],
- ["A5EA",0x3BA],
- ["A5EB",0x3BB],
- ["A5EC",0x3BC],
- ["A5ED",0x3BD],
- ["A5EE",0x3BE],
- ["A5EF",0x3BF],
- ["A5F0",0x3C0],
- ["A5F1",0x3C1],
- ["A5F2",0x3C3],
- ["A5F3",0x3C4],
- ["A5F4",0x3C5],
- ["A5F5",0x3C6],
- ["A5F6",0x3C7],
- ["A5F7",0x3C8],
- ["A5F8",0x3C9],
- ["A6A1",0x2500],
- ["A6A2",0x2502],
- ["A6A3",0x250C],
- ["A6A4",0x2510],
- ["A6A5",0x2518],
- ["A6A6",0x2514],
- ["A6A7",0x251C],
- ["A6A8",0x252C],
- ["A6A9",0x2524],
- ["A6AA",0x2534],
- ["A6AB",0x253C],
- ["A6AC",0x2501],
- ["A6AD",0x2503],
- ["A6AE",0x250F],
- ["A6AF",0x2513],
- ["A6B0",0x251B],
- ["A6B1",0x2517],
- ["A6B2",0x2523],
- ["A6B3",0x2533],
- ["A6B4",0x252B],
- ["A6B5",0x253B],
- ["A6B6",0x254B],
- ["A6B7",0x2520],
- ["A6B8",0x252F],
- ["A6B9",0x2528],
- ["A6BA",0x2537],
- ["A6BB",0x253F],
- ["A6BC",0x251D],
- ["A6BD",0x2530],
- ["A6BE",0x2525],
- ["A6BF",0x2538],
- ["A6C0",0x2542],
- ["A6C1",0x2512],
- ["A6C2",0x2511],
- ["A6C3",0x251A],
- ["A6C4",0x2519],
- ["A6C5",0x2516],
- ["A6C6",0x2515],
- ["A6C7",0x250E],
- ["A6C8",0x250D],
- ["A6C9",0x251E],
- ["A6CA",0x251F],
- ["A6CB",0x2521],
- ["A6CC",0x2522],
- ["A6CD",0x2526],
- ["A6CE",0x2527],
- ["A6CF",0x2529],
- ["A6D0",0x252A],
- ["A6D1",0x252D],
- ["A6D2",0x252E],
- ["A6D3",0x2531],
- ["A6D4",0x2532],
- ["A6D5",0x2535],
- ["A6D6",0x2536],
- ["A6D7",0x2539],
- ["A6D8",0x253A],
- ["A6D9",0x253D],
- ["A6DA",0x253E],
- ["A6DB",0x2540],
- ["A6DC",0x2541],
- ["A6DD",0x2543],
- ["A6DE",0x2544],
- ["A6DF",0x2545],
- ["A6E0",0x2546],
- ["A6E1",0x2547],
- ["A6E2",0x2548],
- ["A6E3",0x2549],
- ["A6E4",0x254A],
- ["A7A1",0x3395],
- ["A7A2",0x3396],
- ["A7A3",0x3397],
- ["A7A4",0x2113],
- ["A7A5",0x3398],
- ["A7A6",0x33C4],
- ["A7A7",0x33A3],
- ["A7A8",0x33A4],
- ["A7A9",0x33A5],
- ["A7AA",0x33A6],
- ["A7AB",0x3399],
- ["A7AC",0x339A],
- ["A7AD",0x339B],
- ["A7AE",0x339C],
- ["A7AF",0x339D],
- ["A7B0",0x339E],
- ["A7B1",0x339F],
- ["A7B2",0x33A0],
- ["A7B3",0x33A1],
- ["A7B4",0x33A2],
- ["A7B5",0x33CA],
- ["A7B6",0x338D],
- ["A7B7",0x338E],
- ["A7B8",0x338F],
- ["A7B9",0x33CF],
- ["A7BA",0x3388],
- ["A7BB",0x3389],
- ["A7BC",0x33C8],
- ["A7BD",0x33A7],
- ["A7BE",0x33A8],
- ["A7BF",0x33B0],
- ["A7C0",0x33B1],
- ["A7C1",0x33B2],
- ["A7C2",0x33B3],
- ["A7C3",0x33B4],
- ["A7C4",0x33B5],
- ["A7C5",0x33B6],
- ["A7C6",0x33B7],
- ["A7C7",0x33B8],
- ["A7C8",0x33B9],
- ["A7C9",0x3380],
- ["A7CA",0x3381],
- ["A7CB",0x3382],
- ["A7CC",0x3383],
- ["A7CD",0x3384],
- ["A7CE",0x33BA],
- ["A7CF",0x33BB],
- ["A7D0",0x33BC],
- ["A7D1",0x33BD],
- ["A7D2",0x33BE],
- ["A7D3",0x33BF],
- ["A7D4",0x3390],
- ["A7D5",0x3391],
- ["A7D6",0x3392],
- ["A7D7",0x3393],
- ["A7D8",0x3394],
- ["A7D9",0x2126],
- ["A7DA",0x33C0],
- ["A7DB",0x33C1],
- ["A7DC",0x338A],
- ["A7DD",0x338B],
- ["A7DE",0x338C],
- ["A7DF",0x33D6],
- ["A7E0",0x33C5],
- ["A7E1",0x33AD],
- ["A7E2",0x33AE],
- ["A7E3",0x33AF],
- ["A7E4",0x33DB],
- ["A7E5",0x33A9],
- ["A7E6",0x33AA],
- ["A7E7",0x33AB],
- ["A7E8",0x33AC],
- ["A7E9",0x33DD],
- ["A7EA",0x33D0],
- ["A7EB",0x33D3],
- ["A7EC",0x33C3],
- ["A7ED",0x33C9],
- ["A7EE",0x33DC],
- ["A7EF",0x33C6],
- ["A8A1",0xC6],
- ["A8A2",0xD0],
- ["A8A3",0xAA],
- ["A8A4",0x126],
- ["A8A6",0x132],
- ["A8A8",0x13F],
- ["A8A9",0x141],
- ["A8AA",0xD8],
- ["A8AB",0x152],
- ["A8AC",0xBA],
- ["A8AD",0xDE],
- ["A8AE",0x166],
- ["A8AF",0x14A],
- ["A8B1",0x3260],
- ["A8B2",0x3261],
- ["A8B3",0x3262],
- ["A8B4",0x3263],
- ["A8B5",0x3264],
- ["A8B6",0x3265],
- ["A8B7",0x3266],
- ["A8B8",0x3267],
- ["A8B9",0x3268],
- ["A8BA",0x3269],
- ["A8BB",0x326A],
- ["A8BC",0x326B],
- ["A8BD",0x326C],
- ["A8BE",0x326D],
- ["A8BF",0x326E],
- ["A8C0",0x326F],
- ["A8C1",0x3270],
- ["A8C2",0x3271],
- ["A8C3",0x3272],
- ["A8C4",0x3273],
- ["A8C5",0x3274],
- ["A8C6",0x3275],
- ["A8C7",0x3276],
- ["A8C8",0x3277],
- ["A8C9",0x3278],
- ["A8CA",0x3279],
- ["A8CB",0x327A],
- ["A8CC",0x327B],
- ["A8CD",0x24D0],
- ["A8CE",0x24D1],
- ["A8CF",0x24D2],
- ["A8D0",0x24D3],
- ["A8D1",0x24D4],
- ["A8D2",0x24D5],
- ["A8D3",0x24D6],
- ["A8D4",0x24D7],
- ["A8D5",0x24D8],
- ["A8D6",0x24D9],
- ["A8D7",0x24DA],
- ["A8D8",0x24DB],
- ["A8D9",0x24DC],
- ["A8DA",0x24DD],
- ["A8DB",0x24DE],
- ["A8DC",0x24DF],
- ["A8DD",0x24E0],
- ["A8DE",0x24E1],
- ["A8DF",0x24E2],
- ["A8E0",0x24E3],
- ["A8E1",0x24E4],
- ["A8E2",0x24E5],
- ["A8E3",0x24E6],
- ["A8E4",0x24E7],
- ["A8E5",0x24E8],
- ["A8E6",0x24E9],
- ["A8E7",0x2460],
- ["A8E8",0x2461],
- ["A8E9",0x2462],
- ["A8EA",0x2463],
- ["A8EB",0x2464],
- ["A8EC",0x2465],
- ["A8ED",0x2466],
- ["A8EE",0x2467],
- ["A8EF",0x2468],
- ["A8F0",0x2469],
- ["A8F1",0x246A],
- ["A8F2",0x246B],
- ["A8F3",0x246C],
- ["A8F4",0x246D],
- ["A8F5",0x246E],
- ["A8F6",0xBD],
- ["A8F7",0x2153],
- ["A8F8",0x2154],
- ["A8F9",0xBC],
- ["A8FA",0xBE],
- ["A8FB",0x215B],
- ["A8FC",0x215C],
- ["A8FD",0x215D],
- ["A8FE",0x215E],
- ["A9A1",0xE6],
- ["A9A2",0x111],
- ["A9A3",0xF0],
- ["A9A4",0x127],
- ["A9A5",0x131],
- ["A9A6",0x133],
- ["A9A7",0x138],
- ["A9A8",0x140],
- ["A9A9",0x142],
- ["A9AA",0xF8],
- ["A9AB",0x153],
- ["A9AC",0xDF],
- ["A9AD",0xFE],
- ["A9AE",0x167],
- ["A9AF",0x14B],
- ["A9B0",0x149],
- ["A9B1",0x3200],
- ["A9B2",0x3201],
- ["A9B3",0x3202],
- ["A9B4",0x3203],
- ["A9B5",0x3204],
- ["A9B6",0x3205],
- ["A9B7",0x3206],
- ["A9B8",0x3207],
- ["A9B9",0x3208],
- ["A9BA",0x3209],
- ["A9BB",0x320A],
- ["A9BC",0x320B],
- ["A9BD",0x320C],
- ["A9BE",0x320D],
- ["A9BF",0x320E],
- ["A9C0",0x320F],
- ["A9C1",0x3210],
- ["A9C2",0x3211],
- ["A9C3",0x3212],
- ["A9C4",0x3213],
- ["A9C5",0x3214],
- ["A9C6",0x3215],
- ["A9C7",0x3216],
- ["A9C8",0x3217],
- ["A9C9",0x3218],
- ["A9CA",0x3219],
- ["A9CB",0x321A],
- ["A9CC",0x321B],
- ["A9CD",0x249C],
- ["A9CE",0x249D],
- ["A9CF",0x249E],
- ["A9D0",0x249F],
- ["A9D1",0x24A0],
- ["A9D2",0x24A1],
- ["A9D3",0x24A2],
- ["A9D4",0x24A3],
- ["A9D5",0x24A4],
- ["A9D6",0x24A5],
- ["A9D7",0x24A6],
- ["A9D8",0x24A7],
- ["A9D9",0x24A8],
- ["A9DA",0x24A9],
- ["A9DB",0x24AA],
- ["A9DC",0x24AB],
- ["A9DD",0x24AC],
- ["A9DE",0x24AD],
- ["A9DF",0x24AE],
- ["A9E0",0x24AF],
- ["A9E1",0x24B0],
- ["A9E2",0x24B1],
- ["A9E3",0x24B2],
- ["A9E4",0x24B3],
- ["A9E5",0x24B4],
- ["A9E6",0x24B5],
- ["A9E7",0x2474],
- ["A9E8",0x2475],
- ["A9E9",0x2476],
- ["A9EA",0x2477],
- ["A9EB",0x2478],
- ["A9EC",0x2479],
- ["A9ED",0x247A],
- ["A9EE",0x247B],
- ["A9EF",0x247C],
- ["A9F0",0x247D],
- ["A9F1",0x247E],
- ["A9F2",0x247F],
- ["A9F3",0x2480],
- ["A9F4",0x2481],
- ["A9F5",0x2482],
- ["A9F6",0xB9],
- ["A9F7",0xB2],
- ["A9F8",0xB3],
- ["A9F9",0x2074],
- ["A9FA",0x207F],
- ["A9FB",0x2081],
- ["A9FC",0x2082],
- ["A9FD",0x2083],
- ["A9FE",0x2084],
- ["AAA1",0x3041],
- ["AAA2",0x3042],
- ["AAA3",0x3043],
- ["AAA4",0x3044],
- ["AAA5",0x3045],
- ["AAA6",0x3046],
- ["AAA7",0x3047],
- ["AAA8",0x3048],
- ["AAA9",0x3049],
- ["AAAA",0x304A],
- ["AAAB",0x304B],
- ["AAAC",0x304C],
- ["AAAD",0x304D],
- ["AAAE",0x304E],
- ["AAAF",0x304F],
- ["AAB0",0x3050],
- ["AAB1",0x3051],
- ["AAB2",0x3052],
- ["AAB3",0x3053],
- ["AAB4",0x3054],
- ["AAB5",0x3055],
- ["AAB6",0x3056],
- ["AAB7",0x3057],
- ["AAB8",0x3058],
- ["AAB9",0x3059],
- ["AABA",0x305A],
- ["AABB",0x305B],
- ["AABC",0x305C],
- ["AABD",0x305D],
- ["AABE",0x305E],
- ["AABF",0x305F],
- ["AAC0",0x3060],
- ["AAC1",0x3061],
- ["AAC2",0x3062],
- ["AAC3",0x3063],
- ["AAC4",0x3064],
- ["AAC5",0x3065],
- ["AAC6",0x3066],
- ["AAC7",0x3067],
- ["AAC8",0x3068],
- ["AAC9",0x3069],
- ["AACA",0x306A],
- ["AACB",0x306B],
- ["AACC",0x306C],
- ["AACD",0x306D],
- ["AACE",0x306E],
- ["AACF",0x306F],
- ["AAD0",0x3070],
- ["AAD1",0x3071],
- ["AAD2",0x3072],
- ["AAD3",0x3073],
- ["AAD4",0x3074],
- ["AAD5",0x3075],
- ["AAD6",0x3076],
- ["AAD7",0x3077],
- ["AAD8",0x3078],
- ["AAD9",0x3079],
- ["AADA",0x307A],
- ["AADB",0x307B],
- ["AADC",0x307C],
- ["AADD",0x307D],
- ["AADE",0x307E],
- ["AADF",0x307F],
- ["AAE0",0x3080],
- ["AAE1",0x3081],
- ["AAE2",0x3082],
- ["AAE3",0x3083],
- ["AAE4",0x3084],
- ["AAE5",0x3085],
- ["AAE6",0x3086],
- ["AAE7",0x3087],
- ["AAE8",0x3088],
- ["AAE9",0x3089],
- ["AAEA",0x308A],
- ["AAEB",0x308B],
- ["AAEC",0x308C],
- ["AAED",0x308D],
- ["AAEE",0x308E],
- ["AAEF",0x308F],
- ["AAF0",0x3090],
- ["AAF1",0x3091],
- ["AAF2",0x3092],
- ["AAF3",0x3093],
- ["ABA1",0x30A1],
- ["ABA2",0x30A2],
- ["ABA3",0x30A3],
- ["ABA4",0x30A4],
- ["ABA5",0x30A5],
- ["ABA6",0x30A6],
- ["ABA7",0x30A7],
- ["ABA8",0x30A8],
- ["ABA9",0x30A9],
- ["ABAA",0x30AA],
- ["ABAB",0x30AB],
- ["ABAC",0x30AC],
- ["ABAD",0x30AD],
- ["ABAE",0x30AE],
- ["ABAF",0x30AF],
- ["ABB0",0x30B0],
- ["ABB1",0x30B1],
- ["ABB2",0x30B2],
- ["ABB3",0x30B3],
- ["ABB4",0x30B4],
- ["ABB5",0x30B5],
- ["ABB6",0x30B6],
- ["ABB7",0x30B7],
- ["ABB8",0x30B8],
- ["ABB9",0x30B9],
- ["ABBA",0x30BA],
- ["ABBB",0x30BB],
- ["ABBC",0x30BC],
- ["ABBD",0x30BD],
- ["ABBE",0x30BE],
- ["ABBF",0x30BF],
- ["ABC0",0x30C0],
- ["ABC1",0x30C1],
- ["ABC2",0x30C2],
- ["ABC3",0x30C3],
- ["ABC4",0x30C4],
- ["ABC5",0x30C5],
- ["ABC6",0x30C6],
- ["ABC7",0x30C7],
- ["ABC8",0x30C8],
- ["ABC9",0x30C9],
- ["ABCA",0x30CA],
- ["ABCB",0x30CB],
- ["ABCC",0x30CC],
- ["ABCD",0x30CD],
- ["ABCE",0x30CE],
- ["ABCF",0x30CF],
- ["ABD0",0x30D0],
- ["ABD1",0x30D1],
- ["ABD2",0x30D2],
- ["ABD3",0x30D3],
- ["ABD4",0x30D4],
- ["ABD5",0x30D5],
- ["ABD6",0x30D6],
- ["ABD7",0x30D7],
- ["ABD8",0x30D8],
- ["ABD9",0x30D9],
- ["ABDA",0x30DA],
- ["ABDB",0x30DB],
- ["ABDC",0x30DC],
- ["ABDD",0x30DD],
- ["ABDE",0x30DE],
- ["ABDF",0x30DF],
- ["ABE0",0x30E0],
- ["ABE1",0x30E1],
- ["ABE2",0x30E2],
- ["ABE3",0x30E3],
- ["ABE4",0x30E4],
- ["ABE5",0x30E5],
- ["ABE6",0x30E6],
- ["ABE7",0x30E7],
- ["ABE8",0x30E8],
- ["ABE9",0x30E9],
- ["ABEA",0x30EA],
- ["ABEB",0x30EB],
- ["ABEC",0x30EC],
- ["ABED",0x30ED],
- ["ABEE",0x30EE],
- ["ABEF",0x30EF],
- ["ABF0",0x30F0],
- ["ABF1",0x30F1],
- ["ABF2",0x30F2],
- ["ABF3",0x30F3],
- ["ABF4",0x30F4],
- ["ABF5",0x30F5],
- ["ABF6",0x30F6],
- ["ACA1",0x410],
- ["ACA2",0x411],
- ["ACA3",0x412],
- ["ACA4",0x413],
- ["ACA5",0x414],
- ["ACA6",0x415],
- ["ACA7",0x401],
- ["ACA8",0x416],
- ["ACA9",0x417],
- ["ACAA",0x418],
- ["ACAB",0x419],
- ["ACAC",0x41A],
- ["ACAD",0x41B],
- ["ACAE",0x41C],
- ["ACAF",0x41D],
- ["ACB0",0x41E],
- ["ACB1",0x41F],
- ["ACB2",0x420],
- ["ACB3",0x421],
- ["ACB4",0x422],
- ["ACB5",0x423],
- ["ACB6",0x424],
- ["ACB7",0x425],
- ["ACB8",0x426],
- ["ACB9",0x427],
- ["ACBA",0x428],
- ["ACBB",0x429],
- ["ACBC",0x42A],
- ["ACBD",0x42B],
- ["ACBE",0x42C],
- ["ACBF",0x42D],
- ["ACC0",0x42E],
- ["ACC1",0x42F],
- ["ACD1",0x430],
- ["ACD2",0x431],
- ["ACD3",0x432],
- ["ACD4",0x433],
- ["ACD5",0x434],
- ["ACD6",0x435],
- ["ACD7",0x451],
- ["ACD8",0x436],
- ["ACD9",0x437],
- ["ACDA",0x438],
- ["ACDB",0x439],
- ["ACDC",0x43A],
- ["ACDD",0x43B],
- ["ACDE",0x43C],
- ["ACDF",0x43D],
- ["ACE0",0x43E],
- ["ACE1",0x43F],
- ["ACE2",0x440],
- ["ACE3",0x441],
- ["ACE4",0x442],
- ["ACE5",0x443],
- ["ACE6",0x444],
- ["ACE7",0x445],
- ["ACE8",0x446],
- ["ACE9",0x447],
- ["ACEA",0x448],
- ["ACEB",0x449],
- ["ACEC",0x44A],
- ["ACED",0x44B],
- ["ACEE",0x44C],
- ["ACEF",0x44D],
- ["ACF0",0x44E],
- ["ACF1",0x44F],
- ["B0A1",0xAC00],
- ["B0A2",0xAC01],
- ["B0A3",0xAC04],
- ["B0A4",0xAC07],
- ["B0A5",0xAC08],
- ["B0A6",0xAC09],
- ["B0A7",0xAC0A],
- ["B0A8",0xAC10],
- ["B0A9",0xAC11],
- ["B0AA",0xAC12],
- ["B0AB",0xAC13],
- ["B0AC",0xAC14],
- ["B0AD",0xAC15],
- ["B0AE",0xAC16],
- ["B0AF",0xAC17],
- ["B0B0",0xAC19],
- ["B0B1",0xAC1A],
- ["B0B2",0xAC1B],
- ["B0B3",0xAC1C],
- ["B0B4",0xAC1D],
- ["B0B5",0xAC20],
- ["B0B6",0xAC24],
- ["B0B7",0xAC2C],
- ["B0B8",0xAC2D],
- ["B0B9",0xAC2F],
- ["B0BA",0xAC30],
- ["B0BB",0xAC31],
- ["B0BC",0xAC38],
- ["B0BD",0xAC39],
- ["B0BE",0xAC3C],
- ["B0BF",0xAC40],
- ["B0C0",0xAC4B],
- ["B0C1",0xAC4D],
- ["B0C2",0xAC54],
- ["B0C3",0xAC58],
- ["B0C4",0xAC5C],
- ["B0C5",0xAC70],
- ["B0C6",0xAC71],
- ["B0C7",0xAC74],
- ["B0C8",0xAC77],
- ["B0C9",0xAC78],
- ["B0CA",0xAC7A],
- ["B0CB",0xAC80],
- ["B0CC",0xAC81],
- ["B0CD",0xAC83],
- ["B0CE",0xAC84],
- ["B0CF",0xAC85],
- ["B0D0",0xAC86],
- ["B0D1",0xAC89],
- ["B0D2",0xAC8A],
- ["B0D3",0xAC8B],
- ["B0D4",0xAC8C],
- ["B0D5",0xAC90],
- ["B0D6",0xAC94],
- ["B0D7",0xAC9C],
- ["B0D8",0xAC9D],
- ["B0D9",0xAC9F],
- ["B0DA",0xACA0],
- ["B0DB",0xACA1],
- ["B0DC",0xACA8],
- ["B0DD",0xACA9],
- ["B0DE",0xACAA],
- ["B0DF",0xACAC],
- ["B0E0",0xACAF],
- ["B0E1",0xACB0],
- ["B0E2",0xACB8],
- ["B0E3",0xACB9],
- ["B0E4",0xACBB],
- ["B0E5",0xACBC],
- ["B0E6",0xACBD],
- ["B0E7",0xACC1],
- ["B0E8",0xACC4],
- ["B0E9",0xACC8],
- ["B0EA",0xACCC],
- ["B0EB",0xACD5],
- ["B0EC",0xACD7],
- ["B0ED",0xACE0],
- ["B0EE",0xACE1],
- ["B0EF",0xACE4],
- ["B0F0",0xACE7],
- ["B0F1",0xACE8],
- ["B0F2",0xACEA],
- ["B0F3",0xACEC],
- ["B0F4",0xACEF],
- ["B0F5",0xACF0],
- ["B0F6",0xACF1],
- ["B0F7",0xACF3],
- ["B0F8",0xACF5],
- ["B0F9",0xACF6],
- ["B0FA",0xACFC],
- ["B0FB",0xACFD],
- ["B0FC",0xAD00],
- ["B0FD",0xAD04],
- ["B0FE",0xAD06],
- ["B1A1",0xAD0C],
- ["B1A2",0xAD0D],
- ["B1A3",0xAD0F],
- ["B1A4",0xAD11],
- ["B1A5",0xAD18],
- ["B1A6",0xAD1C],
- ["B1A7",0xAD20],
- ["B1A8",0xAD29],
- ["B1A9",0xAD2C],
- ["B1AA",0xAD2D],
- ["B1AB",0xAD34],
- ["B1AC",0xAD35],
- ["B1AD",0xAD38],
- ["B1AE",0xAD3C],
- ["B1AF",0xAD44],
- ["B1B0",0xAD45],
- ["B1B1",0xAD47],
- ["B1B2",0xAD49],
- ["B1B3",0xAD50],
- ["B1B4",0xAD54],
- ["B1B5",0xAD58],
- ["B1B6",0xAD61],
- ["B1B7",0xAD63],
- ["B1B8",0xAD6C],
- ["B1B9",0xAD6D],
- ["B1BA",0xAD70],
- ["B1BB",0xAD73],
- ["B1BC",0xAD74],
- ["B1BD",0xAD75],
- ["B1BE",0xAD76],
- ["B1BF",0xAD7B],
- ["B1C0",0xAD7C],
- ["B1C1",0xAD7D],
- ["B1C2",0xAD7F],
- ["B1C3",0xAD81],
- ["B1C4",0xAD82],
- ["B1C5",0xAD88],
- ["B1C6",0xAD89],
- ["B1C7",0xAD8C],
- ["B1C8",0xAD90],
- ["B1C9",0xAD9C],
- ["B1CA",0xAD9D],
- ["B1CB",0xADA4],
- ["B1CC",0xADB7],
- ["B1CD",0xADC0],
- ["B1CE",0xADC1],
- ["B1CF",0xADC4],
- ["B1D0",0xADC8],
- ["B1D1",0xADD0],
- ["B1D2",0xADD1],
- ["B1D3",0xADD3],
- ["B1D4",0xADDC],
- ["B1D5",0xADE0],
- ["B1D6",0xADE4],
- ["B1D7",0xADF8],
- ["B1D8",0xADF9],
- ["B1D9",0xADFC],
- ["B1DA",0xADFF],
- ["B1DB",0xAE00],
- ["B1DC",0xAE01],
- ["B1DD",0xAE08],
- ["B1DE",0xAE09],
- ["B1DF",0xAE0B],
- ["B1E0",0xAE0D],
- ["B1E1",0xAE14],
- ["B1E2",0xAE30],
- ["B1E3",0xAE31],
- ["B1E4",0xAE34],
- ["B1E5",0xAE37],
- ["B1E6",0xAE38],
- ["B1E7",0xAE3A],
- ["B1E8",0xAE40],
- ["B1E9",0xAE41],
- ["B1EA",0xAE43],
- ["B1EB",0xAE45],
- ["B1EC",0xAE46],
- ["B1ED",0xAE4A],
- ["B1EE",0xAE4C],
- ["B1EF",0xAE4D],
- ["B1F0",0xAE4E],
- ["B1F1",0xAE50],
- ["B1F2",0xAE54],
- ["B1F3",0xAE56],
- ["B1F4",0xAE5C],
- ["B1F5",0xAE5D],
- ["B1F6",0xAE5F],
- ["B1F7",0xAE60],
- ["B1F8",0xAE61],
- ["B1F9",0xAE65],
- ["B1FA",0xAE68],
- ["B1FB",0xAE69],
- ["B1FC",0xAE6C],
- ["B1FD",0xAE70],
- ["B1FE",0xAE78],
- ["B2A1",0xAE79],
- ["B2A2",0xAE7B],
- ["B2A3",0xAE7C],
- ["B2A4",0xAE7D],
- ["B2A5",0xAE84],
- ["B2A6",0xAE85],
- ["B2A7",0xAE8C],
- ["B2A8",0xAEBC],
- ["B2A9",0xAEBD],
- ["B2AA",0xAEBE],
- ["B2AB",0xAEC0],
- ["B2AC",0xAEC4],
- ["B2AD",0xAECC],
- ["B2AE",0xAECD],
- ["B2AF",0xAECF],
- ["B2B0",0xAED0],
- ["B2B1",0xAED1],
- ["B2B2",0xAED8],
- ["B2B3",0xAED9],
- ["B2B4",0xAEDC],
- ["B2B5",0xAEE8],
- ["B2B6",0xAEEB],
- ["B2B7",0xAEED],
- ["B2B8",0xAEF4],
- ["B2B9",0xAEF8],
- ["B2BA",0xAEFC],
- ["B2BB",0xAF07],
- ["B2BC",0xAF08],
- ["B2BD",0xAF0D],
- ["B2BE",0xAF10],
- ["B2BF",0xAF2C],
- ["B2C0",0xAF2D],
- ["B2C1",0xAF30],
- ["B2C2",0xAF32],
- ["B2C3",0xAF34],
- ["B2C4",0xAF3C],
- ["B2C5",0xAF3D],
- ["B2C6",0xAF3F],
- ["B2C7",0xAF41],
- ["B2C8",0xAF42],
- ["B2C9",0xAF43],
- ["B2CA",0xAF48],
- ["B2CB",0xAF49],
- ["B2CC",0xAF50],
- ["B2CD",0xAF5C],
- ["B2CE",0xAF5D],
- ["B2CF",0xAF64],
- ["B2D0",0xAF65],
- ["B2D1",0xAF79],
- ["B2D2",0xAF80],
- ["B2D3",0xAF84],
- ["B2D4",0xAF88],
- ["B2D5",0xAF90],
- ["B2D6",0xAF91],
- ["B2D7",0xAF95],
- ["B2D8",0xAF9C],
- ["B2D9",0xAFB8],
- ["B2DA",0xAFB9],
- ["B2DB",0xAFBC],
- ["B2DC",0xAFC0],
- ["B2DD",0xAFC7],
- ["B2DE",0xAFC8],
- ["B2DF",0xAFC9],
- ["B2E0",0xAFCB],
- ["B2E1",0xAFCD],
- ["B2E2",0xAFCE],
- ["B2E3",0xAFD4],
- ["B2E4",0xAFDC],
- ["B2E5",0xAFE8],
- ["B2E6",0xAFE9],
- ["B2E7",0xAFF0],
- ["B2E8",0xAFF1],
- ["B2E9",0xAFF4],
- ["B2EA",0xAFF8],
- ["B2EB",0xB000],
- ["B2EC",0xB001],
- ["B2ED",0xB004],
- ["B2EE",0xB00C],
- ["B2EF",0xB010],
- ["B2F0",0xB014],
- ["B2F1",0xB01C],
- ["B2F2",0xB01D],
- ["B2F3",0xB028],
- ["B2F4",0xB044],
- ["B2F5",0xB045],
- ["B2F6",0xB048],
- ["B2F7",0xB04A],
- ["B2F8",0xB04C],
- ["B2F9",0xB04E],
- ["B2FA",0xB053],
- ["B2FB",0xB054],
- ["B2FC",0xB055],
- ["B2FD",0xB057],
- ["B2FE",0xB059],
- ["B3A1",0xB05D],
- ["B3A2",0xB07C],
- ["B3A3",0xB07D],
- ["B3A4",0xB080],
- ["B3A5",0xB084],
- ["B3A6",0xB08C],
- ["B3A7",0xB08D],
- ["B3A8",0xB08F],
- ["B3A9",0xB091],
- ["B3AA",0xB098],
- ["B3AB",0xB099],
- ["B3AC",0xB09A],
- ["B3AD",0xB09C],
- ["B3AE",0xB09F],
- ["B3AF",0xB0A0],
- ["B3B0",0xB0A1],
- ["B3B1",0xB0A2],
- ["B3B2",0xB0A8],
- ["B3B3",0xB0A9],
- ["B3B4",0xB0AB],
- ["B3B5",0xB0AC],
- ["B3B6",0xB0AD],
- ["B3B7",0xB0AE],
- ["B3B8",0xB0AF],
- ["B3B9",0xB0B1],
- ["B3BA",0xB0B3],
- ["B3BB",0xB0B4],
- ["B3BC",0xB0B5],
- ["B3BD",0xB0B8],
- ["B3BE",0xB0BC],
- ["B3BF",0xB0C4],
- ["B3C0",0xB0C5],
- ["B3C1",0xB0C7],
- ["B3C2",0xB0C8],
- ["B3C3",0xB0C9],
- ["B3C4",0xB0D0],
- ["B3C5",0xB0D1],
- ["B3C6",0xB0D4],
- ["B3C7",0xB0D8],
- ["B3C8",0xB0E0],
- ["B3C9",0xB0E5],
- ["B3CA",0xB108],
- ["B3CB",0xB109],
- ["B3CC",0xB10B],
- ["B3CD",0xB10C],
- ["B3CE",0xB110],
- ["B3CF",0xB112],
- ["B3D0",0xB113],
- ["B3D1",0xB118],
- ["B3D2",0xB119],
- ["B3D3",0xB11B],
- ["B3D4",0xB11C],
- ["B3D5",0xB11D],
- ["B3D6",0xB123],
- ["B3D7",0xB124],
- ["B3D8",0xB125],
- ["B3D9",0xB128],
- ["B3DA",0xB12C],
- ["B3DB",0xB134],
- ["B3DC",0xB135],
- ["B3DD",0xB137],
- ["B3DE",0xB138],
- ["B3DF",0xB139],
- ["B3E0",0xB140],
- ["B3E1",0xB141],
- ["B3E2",0xB144],
- ["B3E3",0xB148],
- ["B3E4",0xB150],
- ["B3E5",0xB151],
- ["B3E6",0xB154],
- ["B3E7",0xB155],
- ["B3E8",0xB158],
- ["B3E9",0xB15C],
- ["B3EA",0xB160],
- ["B3EB",0xB178],
- ["B3EC",0xB179],
- ["B3ED",0xB17C],
- ["B3EE",0xB180],
- ["B3EF",0xB182],
- ["B3F0",0xB188],
- ["B3F1",0xB189],
- ["B3F2",0xB18B],
- ["B3F3",0xB18D],
- ["B3F4",0xB192],
- ["B3F5",0xB193],
- ["B3F6",0xB194],
- ["B3F7",0xB198],
- ["B3F8",0xB19C],
- ["B3F9",0xB1A8],
- ["B3FA",0xB1CC],
- ["B3FB",0xB1D0],
- ["B3FC",0xB1D4],
- ["B3FD",0xB1DC],
- ["B3FE",0xB1DD],
- ["B4A1",0xB1DF],
- ["B4A2",0xB1E8],
- ["B4A3",0xB1E9],
- ["B4A4",0xB1EC],
- ["B4A5",0xB1F0],
- ["B4A6",0xB1F9],
- ["B4A7",0xB1FB],
- ["B4A8",0xB1FD],
- ["B4A9",0xB204],
- ["B4AA",0xB205],
- ["B4AB",0xB208],
- ["B4AC",0xB20B],
- ["B4AD",0xB20C],
- ["B4AE",0xB214],
- ["B4AF",0xB215],
- ["B4B0",0xB217],
- ["B4B1",0xB219],
- ["B4B2",0xB220],
- ["B4B3",0xB234],
- ["B4B4",0xB23C],
- ["B4B5",0xB258],
- ["B4B6",0xB25C],
- ["B4B7",0xB260],
- ["B4B8",0xB268],
- ["B4B9",0xB269],
- ["B4BA",0xB274],
- ["B4BB",0xB275],
- ["B4BC",0xB27C],
- ["B4BD",0xB284],
- ["B4BE",0xB285],
- ["B4BF",0xB289],
- ["B4C0",0xB290],
- ["B4C1",0xB291],
- ["B4C2",0xB294],
- ["B4C3",0xB298],
- ["B4C4",0xB299],
- ["B4C5",0xB29A],
- ["B4C6",0xB2A0],
- ["B4C7",0xB2A1],
- ["B4C8",0xB2A3],
- ["B4C9",0xB2A5],
- ["B4CA",0xB2A6],
- ["B4CB",0xB2AA],
- ["B4CC",0xB2AC],
- ["B4CD",0xB2B0],
- ["B4CE",0xB2B4],
- ["B4CF",0xB2C8],
- ["B4D0",0xB2C9],
- ["B4D1",0xB2CC],
- ["B4D2",0xB2D0],
- ["B4D3",0xB2D2],
- ["B4D4",0xB2D8],
- ["B4D5",0xB2D9],
- ["B4D6",0xB2DB],
- ["B4D7",0xB2DD],
- ["B4D8",0xB2E2],
- ["B4D9",0xB2E4],
- ["B4DA",0xB2E5],
- ["B4DB",0xB2E6],
- ["B4DC",0xB2E8],
- ["B4DD",0xB2EB],
- ["B4DE",0xB2EC],
- ["B4DF",0xB2ED],
- ["B4E0",0xB2EE],
- ["B4E1",0xB2EF],
- ["B4E2",0xB2F3],
- ["B4E3",0xB2F4],
- ["B4E4",0xB2F5],
- ["B4E5",0xB2F7],
- ["B4E6",0xB2F8],
- ["B4E7",0xB2F9],
- ["B4E8",0xB2FA],
- ["B4E9",0xB2FB],
- ["B4EA",0xB2FF],
- ["B4EB",0xB300],
- ["B4EC",0xB301],
- ["B4ED",0xB304],
- ["B4EE",0xB308],
- ["B4EF",0xB310],
- ["B4F0",0xB311],
- ["B4F1",0xB313],
- ["B4F2",0xB314],
- ["B4F3",0xB315],
- ["B4F4",0xB31C],
- ["B4F5",0xB354],
- ["B4F6",0xB355],
- ["B4F7",0xB356],
- ["B4F8",0xB358],
- ["B4F9",0xB35B],
- ["B4FA",0xB35C],
- ["B4FB",0xB35E],
- ["B4FC",0xB35F],
- ["B4FD",0xB364],
- ["B4FE",0xB365],
- ["B5A1",0xB367],
- ["B5A2",0xB369],
- ["B5A3",0xB36B],
- ["B5A4",0xB36E],
- ["B5A5",0xB370],
- ["B5A6",0xB371],
- ["B5A7",0xB374],
- ["B5A8",0xB378],
- ["B5A9",0xB380],
- ["B5AA",0xB381],
- ["B5AB",0xB383],
- ["B5AC",0xB384],
- ["B5AD",0xB385],
- ["B5AE",0xB38C],
- ["B5AF",0xB390],
- ["B5B0",0xB394],
- ["B5B1",0xB3A0],
- ["B5B2",0xB3A1],
- ["B5B3",0xB3A8],
- ["B5B4",0xB3AC],
- ["B5B5",0xB3C4],
- ["B5B6",0xB3C5],
- ["B5B7",0xB3C8],
- ["B5B8",0xB3CB],
- ["B5B9",0xB3CC],
- ["B5BA",0xB3CE],
- ["B5BB",0xB3D0],
- ["B5BC",0xB3D4],
- ["B5BD",0xB3D5],
- ["B5BE",0xB3D7],
- ["B5BF",0xB3D9],
- ["B5C0",0xB3DB],
- ["B5C1",0xB3DD],
- ["B5C2",0xB3E0],
- ["B5C3",0xB3E4],
- ["B5C4",0xB3E8],
- ["B5C5",0xB3FC],
- ["B5C6",0xB410],
- ["B5C7",0xB418],
- ["B5C8",0xB41C],
- ["B5C9",0xB420],
- ["B5CA",0xB428],
- ["B5CB",0xB429],
- ["B5CC",0xB42B],
- ["B5CD",0xB434],
- ["B5CE",0xB450],
- ["B5CF",0xB451],
- ["B5D0",0xB454],
- ["B5D1",0xB458],
- ["B5D2",0xB460],
- ["B5D3",0xB461],
- ["B5D4",0xB463],
- ["B5D5",0xB465],
- ["B5D6",0xB46C],
- ["B5D7",0xB480],
- ["B5D8",0xB488],
- ["B5D9",0xB49D],
- ["B5DA",0xB4A4],
- ["B5DB",0xB4A8],
- ["B5DC",0xB4AC],
- ["B5DD",0xB4B5],
- ["B5DE",0xB4B7],
- ["B5DF",0xB4B9],
- ["B5E0",0xB4C0],
- ["B5E1",0xB4C4],
- ["B5E2",0xB4C8],
- ["B5E3",0xB4D0],
- ["B5E4",0xB4D5],
- ["B5E5",0xB4DC],
- ["B5E6",0xB4DD],
- ["B5E7",0xB4E0],
- ["B5E8",0xB4E3],
- ["B5E9",0xB4E4],
- ["B5EA",0xB4E6],
- ["B5EB",0xB4EC],
- ["B5EC",0xB4ED],
- ["B5ED",0xB4EF],
- ["B5EE",0xB4F1],
- ["B5EF",0xB4F8],
- ["B5F0",0xB514],
- ["B5F1",0xB515],
- ["B5F2",0xB518],
- ["B5F3",0xB51B],
- ["B5F4",0xB51C],
- ["B5F5",0xB524],
- ["B5F6",0xB525],
- ["B5F7",0xB527],
- ["B5F8",0xB528],
- ["B5F9",0xB529],
- ["B5FA",0xB52A],
- ["B5FB",0xB530],
- ["B5FC",0xB531],
- ["B5FD",0xB534],
- ["B5FE",0xB538],
- ["B6A1",0xB540],
- ["B6A2",0xB541],
- ["B6A3",0xB543],
- ["B6A4",0xB544],
- ["B6A5",0xB545],
- ["B6A6",0xB54B],
- ["B6A7",0xB54C],
- ["B6A8",0xB54D],
- ["B6A9",0xB550],
- ["B6AA",0xB554],
- ["B6AB",0xB55C],
- ["B6AC",0xB55D],
- ["B6AD",0xB55F],
- ["B6AE",0xB560],
- ["B6AF",0xB561],
- ["B6B0",0xB5A0],
- ["B6B1",0xB5A1],
- ["B6B2",0xB5A4],
- ["B6B3",0xB5A8],
- ["B6B4",0xB5AA],
- ["B6B5",0xB5AB],
- ["B6B6",0xB5B0],
- ["B6B7",0xB5B1],
- ["B6B8",0xB5B3],
- ["B6B9",0xB5B4],
- ["B6BA",0xB5B5],
- ["B6BB",0xB5BB],
- ["B6BC",0xB5BC],
- ["B6BD",0xB5BD],
- ["B6BE",0xB5C0],
- ["B6BF",0xB5C4],
- ["B6C0",0xB5CC],
- ["B6C1",0xB5CD],
- ["B6C2",0xB5CF],
- ["B6C3",0xB5D0],
- ["B6C4",0xB5D1],
- ["B6C5",0xB5D8],
- ["B6C6",0xB5EC],
- ["B6C7",0xB610],
- ["B6C8",0xB611],
- ["B6C9",0xB614],
- ["B6CA",0xB618],
- ["B6CB",0xB625],
- ["B6CC",0xB62C],
- ["B6CD",0xB634],
- ["B6CE",0xB648],
- ["B6CF",0xB664],
- ["B6D0",0xB668],
- ["B6D1",0xB69C],
- ["B6D2",0xB69D],
- ["B6D3",0xB6A0],
- ["B6D4",0xB6A4],
- ["B6D5",0xB6AB],
- ["B6D6",0xB6AC],
- ["B6D7",0xB6B1],
- ["B6D8",0xB6D4],
- ["B6D9",0xB6F0],
- ["B6DA",0xB6F4],
- ["B6DB",0xB6F8],
- ["B6DC",0xB700],
- ["B6DD",0xB701],
- ["B6DE",0xB705],
- ["B6DF",0xB728],
- ["B6E0",0xB729],
- ["B6E1",0xB72C],
- ["B6E2",0xB72F],
- ["B6E3",0xB730],
- ["B6E4",0xB738],
- ["B6E5",0xB739],
- ["B6E6",0xB73B],
- ["B6E7",0xB744],
- ["B6E8",0xB748],
- ["B6E9",0xB74C],
- ["B6EA",0xB754],
- ["B6EB",0xB755],
- ["B6EC",0xB760],
- ["B6ED",0xB764],
- ["B6EE",0xB768],
- ["B6EF",0xB770],
- ["B6F0",0xB771],
- ["B6F1",0xB773],
- ["B6F2",0xB775],
- ["B6F3",0xB77C],
- ["B6F4",0xB77D],
- ["B6F5",0xB780],
- ["B6F6",0xB784],
- ["B6F7",0xB78C],
- ["B6F8",0xB78D],
- ["B6F9",0xB78F],
- ["B6FA",0xB790],
- ["B6FB",0xB791],
- ["B6FC",0xB792],
- ["B6FD",0xB796],
- ["B6FE",0xB797],
- ["B7A1",0xB798],
- ["B7A2",0xB799],
- ["B7A3",0xB79C],
- ["B7A4",0xB7A0],
- ["B7A5",0xB7A8],
- ["B7A6",0xB7A9],
- ["B7A7",0xB7AB],
- ["B7A8",0xB7AC],
- ["B7A9",0xB7AD],
- ["B7AA",0xB7B4],
- ["B7AB",0xB7B5],
- ["B7AC",0xB7B8],
- ["B7AD",0xB7C7],
- ["B7AE",0xB7C9],
- ["B7AF",0xB7EC],
- ["B7B0",0xB7ED],
- ["B7B1",0xB7F0],
- ["B7B2",0xB7F4],
- ["B7B3",0xB7FC],
- ["B7B4",0xB7FD],
- ["B7B5",0xB7FF],
- ["B7B6",0xB800],
- ["B7B7",0xB801],
- ["B7B8",0xB807],
- ["B7B9",0xB808],
- ["B7BA",0xB809],
- ["B7BB",0xB80C],
- ["B7BC",0xB810],
- ["B7BD",0xB818],
- ["B7BE",0xB819],
- ["B7BF",0xB81B],
- ["B7C0",0xB81D],
- ["B7C1",0xB824],
- ["B7C2",0xB825],
- ["B7C3",0xB828],
- ["B7C4",0xB82C],
- ["B7C5",0xB834],
- ["B7C6",0xB835],
- ["B7C7",0xB837],
- ["B7C8",0xB838],
- ["B7C9",0xB839],
- ["B7CA",0xB840],
- ["B7CB",0xB844],
- ["B7CC",0xB851],
- ["B7CD",0xB853],
- ["B7CE",0xB85C],
- ["B7CF",0xB85D],
- ["B7D0",0xB860],
- ["B7D1",0xB864],
- ["B7D2",0xB86C],
- ["B7D3",0xB86D],
- ["B7D4",0xB86F],
- ["B7D5",0xB871],
- ["B7D6",0xB878],
- ["B7D7",0xB87C],
- ["B7D8",0xB88D],
- ["B7D9",0xB8A8],
- ["B7DA",0xB8B0],
- ["B7DB",0xB8B4],
- ["B7DC",0xB8B8],
- ["B7DD",0xB8C0],
- ["B7DE",0xB8C1],
- ["B7DF",0xB8C3],
- ["B7E0",0xB8C5],
- ["B7E1",0xB8CC],
- ["B7E2",0xB8D0],
- ["B7E3",0xB8D4],
- ["B7E4",0xB8DD],
- ["B7E5",0xB8DF],
- ["B7E6",0xB8E1],
- ["B7E7",0xB8E8],
- ["B7E8",0xB8E9],
- ["B7E9",0xB8EC],
- ["B7EA",0xB8F0],
- ["B7EB",0xB8F8],
- ["B7EC",0xB8F9],
- ["B7ED",0xB8FB],
- ["B7EE",0xB8FD],
- ["B7EF",0xB904],
- ["B7F0",0xB918],
- ["B7F1",0xB920],
- ["B7F2",0xB93C],
- ["B7F3",0xB93D],
- ["B7F4",0xB940],
- ["B7F5",0xB944],
- ["B7F6",0xB94C],
- ["B7F7",0xB94F],
- ["B7F8",0xB951],
- ["B7F9",0xB958],
- ["B7FA",0xB959],
- ["B7FB",0xB95C],
- ["B7FC",0xB960],
- ["B7FD",0xB968],
- ["B7FE",0xB969],
- ["B8A1",0xB96B],
- ["B8A2",0xB96D],
- ["B8A3",0xB974],
- ["B8A4",0xB975],
- ["B8A5",0xB978],
- ["B8A6",0xB97C],
- ["B8A7",0xB984],
- ["B8A8",0xB985],
- ["B8A9",0xB987],
- ["B8AA",0xB989],
- ["B8AB",0xB98A],
- ["B8AC",0xB98D],
- ["B8AD",0xB98E],
- ["B8AE",0xB9AC],
- ["B8AF",0xB9AD],
- ["B8B0",0xB9B0],
- ["B8B1",0xB9B4],
- ["B8B2",0xB9BC],
- ["B8B3",0xB9BD],
- ["B8B4",0xB9BF],
- ["B8B5",0xB9C1],
- ["B8B6",0xB9C8],
- ["B8B7",0xB9C9],
- ["B8B8",0xB9CC],
- ["B8B9",0xB9CE],
- ["B8BA",0xB9CF],
- ["B8BB",0xB9D0],
- ["B8BC",0xB9D1],
- ["B8BD",0xB9D2],
- ["B8BE",0xB9D8],
- ["B8BF",0xB9D9],
- ["B8C0",0xB9DB],
- ["B8C1",0xB9DD],
- ["B8C2",0xB9DE],
- ["B8C3",0xB9E1],
- ["B8C4",0xB9E3],
- ["B8C5",0xB9E4],
- ["B8C6",0xB9E5],
- ["B8C7",0xB9E8],
- ["B8C8",0xB9EC],
- ["B8C9",0xB9F4],
- ["B8CA",0xB9F5],
- ["B8CB",0xB9F7],
- ["B8CC",0xB9F8],
- ["B8CD",0xB9F9],
- ["B8CE",0xB9FA],
- ["B8CF",0xBA00],
- ["B8D0",0xBA01],
- ["B8D1",0xBA08],
- ["B8D2",0xBA15],
- ["B8D3",0xBA38],
- ["B8D4",0xBA39],
- ["B8D5",0xBA3C],
- ["B8D6",0xBA40],
- ["B8D7",0xBA42],
- ["B8D8",0xBA48],
- ["B8D9",0xBA49],
- ["B8DA",0xBA4B],
- ["B8DB",0xBA4D],
- ["B8DC",0xBA4E],
- ["B8DD",0xBA53],
- ["B8DE",0xBA54],
- ["B8DF",0xBA55],
- ["B8E0",0xBA58],
- ["B8E1",0xBA5C],
- ["B8E2",0xBA64],
- ["B8E3",0xBA65],
- ["B8E4",0xBA67],
- ["B8E5",0xBA68],
- ["B8E6",0xBA69],
- ["B8E7",0xBA70],
- ["B8E8",0xBA71],
- ["B8E9",0xBA74],
- ["B8EA",0xBA78],
- ["B8EB",0xBA83],
- ["B8EC",0xBA84],
- ["B8ED",0xBA85],
- ["B8EE",0xBA87],
- ["B8EF",0xBA8C],
- ["B8F0",0xBAA8],
- ["B8F1",0xBAA9],
- ["B8F2",0xBAAB],
- ["B8F3",0xBAAC],
- ["B8F4",0xBAB0],
- ["B8F5",0xBAB2],
- ["B8F6",0xBAB8],
- ["B8F7",0xBAB9],
- ["B8F8",0xBABB],
- ["B8F9",0xBABD],
- ["B8FA",0xBAC4],
- ["B8FB",0xBAC8],
- ["B8FC",0xBAD8],
- ["B8FD",0xBAD9],
- ["B8FE",0xBAFC],
- ["B9A1",0xBB00],
- ["B9A2",0xBB04],
- ["B9A3",0xBB0D],
- ["B9A4",0xBB0F],
- ["B9A5",0xBB11],
- ["B9A6",0xBB18],
- ["B9A7",0xBB1C],
- ["B9A8",0xBB20],
- ["B9A9",0xBB29],
- ["B9AA",0xBB2B],
- ["B9AB",0xBB34],
- ["B9AC",0xBB35],
- ["B9AD",0xBB36],
- ["B9AE",0xBB38],
- ["B9AF",0xBB3B],
- ["B9B0",0xBB3C],
- ["B9B1",0xBB3D],
- ["B9B2",0xBB3E],
- ["B9B3",0xBB44],
- ["B9B4",0xBB45],
- ["B9B5",0xBB47],
- ["B9B6",0xBB49],
- ["B9B7",0xBB4D],
- ["B9B8",0xBB4F],
- ["B9B9",0xBB50],
- ["B9BA",0xBB54],
- ["B9BB",0xBB58],
- ["B9BC",0xBB61],
- ["B9BD",0xBB63],
- ["B9BE",0xBB6C],
- ["B9BF",0xBB88],
- ["B9C0",0xBB8C],
- ["B9C1",0xBB90],
- ["B9C2",0xBBA4],
- ["B9C3",0xBBA8],
- ["B9C4",0xBBAC],
- ["B9C5",0xBBB4],
- ["B9C6",0xBBB7],
- ["B9C7",0xBBC0],
- ["B9C8",0xBBC4],
- ["B9C9",0xBBC8],
- ["B9CA",0xBBD0],
- ["B9CB",0xBBD3],
- ["B9CC",0xBBF8],
- ["B9CD",0xBBF9],
- ["B9CE",0xBBFC],
- ["B9CF",0xBBFF],
- ["B9D0",0xBC00],
- ["B9D1",0xBC02],
- ["B9D2",0xBC08],
- ["B9D3",0xBC09],
- ["B9D4",0xBC0B],
- ["B9D5",0xBC0C],
- ["B9D6",0xBC0D],
- ["B9D7",0xBC0F],
- ["B9D8",0xBC11],
- ["B9D9",0xBC14],
- ["B9DA",0xBC15],
- ["B9DB",0xBC16],
- ["B9DC",0xBC17],
- ["B9DD",0xBC18],
- ["B9DE",0xBC1B],
- ["B9DF",0xBC1C],
- ["B9E0",0xBC1D],
- ["B9E1",0xBC1E],
- ["B9E2",0xBC1F],
- ["B9E3",0xBC24],
- ["B9E4",0xBC25],
- ["B9E5",0xBC27],
- ["B9E6",0xBC29],
- ["B9E7",0xBC2D],
- ["B9E8",0xBC30],
- ["B9E9",0xBC31],
- ["B9EA",0xBC34],
- ["B9EB",0xBC38],
- ["B9EC",0xBC40],
- ["B9ED",0xBC41],
- ["B9EE",0xBC43],
- ["B9EF",0xBC44],
- ["B9F0",0xBC45],
- ["B9F1",0xBC49],
- ["B9F2",0xBC4C],
- ["B9F3",0xBC4D],
- ["B9F4",0xBC50],
- ["B9F5",0xBC5D],
- ["B9F6",0xBC84],
- ["B9F7",0xBC85],
- ["B9F8",0xBC88],
- ["B9F9",0xBC8B],
- ["B9FA",0xBC8C],
- ["B9FB",0xBC8E],
- ["B9FC",0xBC94],
- ["B9FD",0xBC95],
- ["B9FE",0xBC97],
- ["BAA1",0xBC99],
- ["BAA2",0xBC9A],
- ["BAA3",0xBCA0],
- ["BAA4",0xBCA1],
- ["BAA5",0xBCA4],
- ["BAA6",0xBCA7],
- ["BAA7",0xBCA8],
- ["BAA8",0xBCB0],
- ["BAA9",0xBCB1],
- ["BAAA",0xBCB3],
- ["BAAB",0xBCB4],
- ["BAAC",0xBCB5],
- ["BAAD",0xBCBC],
- ["BAAE",0xBCBD],
- ["BAAF",0xBCC0],
- ["BAB0",0xBCC4],
- ["BAB1",0xBCCD],
- ["BAB2",0xBCCF],
- ["BAB3",0xBCD0],
- ["BAB4",0xBCD1],
- ["BAB5",0xBCD5],
- ["BAB6",0xBCD8],
- ["BAB7",0xBCDC],
- ["BAB8",0xBCF4],
- ["BAB9",0xBCF5],
- ["BABA",0xBCF6],
- ["BABB",0xBCF8],
- ["BABC",0xBCFC],
- ["BABD",0xBD04],
- ["BABE",0xBD05],
- ["BABF",0xBD07],
- ["BAC0",0xBD09],
- ["BAC1",0xBD10],
- ["BAC2",0xBD14],
- ["BAC3",0xBD24],
- ["BAC4",0xBD2C],
- ["BAC5",0xBD40],
- ["BAC6",0xBD48],
- ["BAC7",0xBD49],
- ["BAC8",0xBD4C],
- ["BAC9",0xBD50],
- ["BACA",0xBD58],
- ["BACB",0xBD59],
- ["BACC",0xBD64],
- ["BACD",0xBD68],
- ["BACE",0xBD80],
- ["BACF",0xBD81],
- ["BAD0",0xBD84],
- ["BAD1",0xBD87],
- ["BAD2",0xBD88],
- ["BAD3",0xBD89],
- ["BAD4",0xBD8A],
- ["BAD5",0xBD90],
- ["BAD6",0xBD91],
- ["BAD7",0xBD93],
- ["BAD8",0xBD95],
- ["BAD9",0xBD99],
- ["BADA",0xBD9A],
- ["BADB",0xBD9C],
- ["BADC",0xBDA4],
- ["BADD",0xBDB0],
- ["BADE",0xBDB8],
- ["BADF",0xBDD4],
- ["BAE0",0xBDD5],
- ["BAE1",0xBDD8],
- ["BAE2",0xBDDC],
- ["BAE3",0xBDE9],
- ["BAE4",0xBDF0],
- ["BAE5",0xBDF4],
- ["BAE6",0xBDF8],
- ["BAE7",0xBE00],
- ["BAE8",0xBE03],
- ["BAE9",0xBE05],
- ["BAEA",0xBE0C],
- ["BAEB",0xBE0D],
- ["BAEC",0xBE10],
- ["BAED",0xBE14],
- ["BAEE",0xBE1C],
- ["BAEF",0xBE1D],
- ["BAF0",0xBE1F],
- ["BAF1",0xBE44],
- ["BAF2",0xBE45],
- ["BAF3",0xBE48],
- ["BAF4",0xBE4C],
- ["BAF5",0xBE4E],
- ["BAF6",0xBE54],
- ["BAF7",0xBE55],
- ["BAF8",0xBE57],
- ["BAF9",0xBE59],
- ["BAFA",0xBE5A],
- ["BAFB",0xBE5B],
- ["BAFC",0xBE60],
- ["BAFD",0xBE61],
- ["BAFE",0xBE64],
- ["BBA1",0xBE68],
- ["BBA2",0xBE6A],
- ["BBA3",0xBE70],
- ["BBA4",0xBE71],
- ["BBA5",0xBE73],
- ["BBA6",0xBE74],
- ["BBA7",0xBE75],
- ["BBA8",0xBE7B],
- ["BBA9",0xBE7C],
- ["BBAA",0xBE7D],
- ["BBAB",0xBE80],
- ["BBAC",0xBE84],
- ["BBAD",0xBE8C],
- ["BBAE",0xBE8D],
- ["BBAF",0xBE8F],
- ["BBB0",0xBE90],
- ["BBB1",0xBE91],
- ["BBB2",0xBE98],
- ["BBB3",0xBE99],
- ["BBB4",0xBEA8],
- ["BBB5",0xBED0],
- ["BBB6",0xBED1],
- ["BBB7",0xBED4],
- ["BBB8",0xBED7],
- ["BBB9",0xBED8],
- ["BBBA",0xBEE0],
- ["BBBB",0xBEE3],
- ["BBBC",0xBEE4],
- ["BBBD",0xBEE5],
- ["BBBE",0xBEEC],
- ["BBBF",0xBF01],
- ["BBC0",0xBF08],
- ["BBC1",0xBF09],
- ["BBC2",0xBF18],
- ["BBC3",0xBF19],
- ["BBC4",0xBF1B],
- ["BBC5",0xBF1C],
- ["BBC6",0xBF1D],
- ["BBC7",0xBF40],
- ["BBC8",0xBF41],
- ["BBC9",0xBF44],
- ["BBCA",0xBF48],
- ["BBCB",0xBF50],
- ["BBCC",0xBF51],
- ["BBCD",0xBF55],
- ["BBCE",0xBF94],
- ["BBCF",0xBFB0],
- ["BBD0",0xBFC5],
- ["BBD1",0xBFCC],
- ["BBD2",0xBFCD],
- ["BBD3",0xBFD0],
- ["BBD4",0xBFD4],
- ["BBD5",0xBFDC],
- ["BBD6",0xBFDF],
- ["BBD7",0xBFE1],
- ["BBD8",0xC03C],
- ["BBD9",0xC051],
- ["BBDA",0xC058],
- ["BBDB",0xC05C],
- ["BBDC",0xC060],
- ["BBDD",0xC068],
- ["BBDE",0xC069],
- ["BBDF",0xC090],
- ["BBE0",0xC091],
- ["BBE1",0xC094],
- ["BBE2",0xC098],
- ["BBE3",0xC0A0],
- ["BBE4",0xC0A1],
- ["BBE5",0xC0A3],
- ["BBE6",0xC0A5],
- ["BBE7",0xC0AC],
- ["BBE8",0xC0AD],
- ["BBE9",0xC0AF],
- ["BBEA",0xC0B0],
- ["BBEB",0xC0B3],
- ["BBEC",0xC0B4],
- ["BBED",0xC0B5],
- ["BBEE",0xC0B6],
- ["BBEF",0xC0BC],
- ["BBF0",0xC0BD],
- ["BBF1",0xC0BF],
- ["BBF2",0xC0C0],
- ["BBF3",0xC0C1],
- ["BBF4",0xC0C5],
- ["BBF5",0xC0C8],
- ["BBF6",0xC0C9],
- ["BBF7",0xC0CC],
- ["BBF8",0xC0D0],
- ["BBF9",0xC0D8],
- ["BBFA",0xC0D9],
- ["BBFB",0xC0DB],
- ["BBFC",0xC0DC],
- ["BBFD",0xC0DD],
- ["BBFE",0xC0E4],
- ["BCA1",0xC0E5],
- ["BCA2",0xC0E8],
- ["BCA3",0xC0EC],
- ["BCA4",0xC0F4],
- ["BCA5",0xC0F5],
- ["BCA6",0xC0F7],
- ["BCA7",0xC0F9],
- ["BCA8",0xC100],
- ["BCA9",0xC104],
- ["BCAA",0xC108],
- ["BCAB",0xC110],
- ["BCAC",0xC115],
- ["BCAD",0xC11C],
- ["BCAE",0xC11D],
- ["BCAF",0xC11E],
- ["BCB0",0xC11F],
- ["BCB1",0xC120],
- ["BCB2",0xC123],
- ["BCB3",0xC124],
- ["BCB4",0xC126],
- ["BCB5",0xC127],
- ["BCB6",0xC12C],
- ["BCB7",0xC12D],
- ["BCB8",0xC12F],
- ["BCB9",0xC130],
- ["BCBA",0xC131],
- ["BCBB",0xC136],
- ["BCBC",0xC138],
- ["BCBD",0xC139],
- ["BCBE",0xC13C],
- ["BCBF",0xC140],
- ["BCC0",0xC148],
- ["BCC1",0xC149],
- ["BCC2",0xC14B],
- ["BCC3",0xC14C],
- ["BCC4",0xC14D],
- ["BCC5",0xC154],
- ["BCC6",0xC155],
- ["BCC7",0xC158],
- ["BCC8",0xC15C],
- ["BCC9",0xC164],
- ["BCCA",0xC165],
- ["BCCB",0xC167],
- ["BCCC",0xC168],
- ["BCCD",0xC169],
- ["BCCE",0xC170],
- ["BCCF",0xC174],
- ["BCD0",0xC178],
- ["BCD1",0xC185],
- ["BCD2",0xC18C],
- ["BCD3",0xC18D],
- ["BCD4",0xC18E],
- ["BCD5",0xC190],
- ["BCD6",0xC194],
- ["BCD7",0xC196],
- ["BCD8",0xC19C],
- ["BCD9",0xC19D],
- ["BCDA",0xC19F],
- ["BCDB",0xC1A1],
- ["BCDC",0xC1A5],
- ["BCDD",0xC1A8],
- ["BCDE",0xC1A9],
- ["BCDF",0xC1AC],
- ["BCE0",0xC1B0],
- ["BCE1",0xC1BD],
- ["BCE2",0xC1C4],
- ["BCE3",0xC1C8],
- ["BCE4",0xC1CC],
- ["BCE5",0xC1D4],
- ["BCE6",0xC1D7],
- ["BCE7",0xC1D8],
- ["BCE8",0xC1E0],
- ["BCE9",0xC1E4],
- ["BCEA",0xC1E8],
- ["BCEB",0xC1F0],
- ["BCEC",0xC1F1],
- ["BCED",0xC1F3],
- ["BCEE",0xC1FC],
- ["BCEF",0xC1FD],
- ["BCF0",0xC200],
- ["BCF1",0xC204],
- ["BCF2",0xC20C],
- ["BCF3",0xC20D],
- ["BCF4",0xC20F],
- ["BCF5",0xC211],
- ["BCF6",0xC218],
- ["BCF7",0xC219],
- ["BCF8",0xC21C],
- ["BCF9",0xC21F],
- ["BCFA",0xC220],
- ["BCFB",0xC228],
- ["BCFC",0xC229],
- ["BCFD",0xC22B],
- ["BCFE",0xC22D],
- ["BDA1",0xC22F],
- ["BDA2",0xC231],
- ["BDA3",0xC232],
- ["BDA4",0xC234],
- ["BDA5",0xC248],
- ["BDA6",0xC250],
- ["BDA7",0xC251],
- ["BDA8",0xC254],
- ["BDA9",0xC258],
- ["BDAA",0xC260],
- ["BDAB",0xC265],
- ["BDAC",0xC26C],
- ["BDAD",0xC26D],
- ["BDAE",0xC270],
- ["BDAF",0xC274],
- ["BDB0",0xC27C],
- ["BDB1",0xC27D],
- ["BDB2",0xC27F],
- ["BDB3",0xC281],
- ["BDB4",0xC288],
- ["BDB5",0xC289],
- ["BDB6",0xC290],
- ["BDB7",0xC298],
- ["BDB8",0xC29B],
- ["BDB9",0xC29D],
- ["BDBA",0xC2A4],
- ["BDBB",0xC2A5],
- ["BDBC",0xC2A8],
- ["BDBD",0xC2AC],
- ["BDBE",0xC2AD],
- ["BDBF",0xC2B4],
- ["BDC0",0xC2B5],
- ["BDC1",0xC2B7],
- ["BDC2",0xC2B9],
- ["BDC3",0xC2DC],
- ["BDC4",0xC2DD],
- ["BDC5",0xC2E0],
- ["BDC6",0xC2E3],
- ["BDC7",0xC2E4],
- ["BDC8",0xC2EB],
- ["BDC9",0xC2EC],
- ["BDCA",0xC2ED],
- ["BDCB",0xC2EF],
- ["BDCC",0xC2F1],
- ["BDCD",0xC2F6],
- ["BDCE",0xC2F8],
- ["BDCF",0xC2F9],
- ["BDD0",0xC2FB],
- ["BDD1",0xC2FC],
- ["BDD2",0xC300],
- ["BDD3",0xC308],
- ["BDD4",0xC309],
- ["BDD5",0xC30C],
- ["BDD6",0xC30D],
- ["BDD7",0xC313],
- ["BDD8",0xC314],
- ["BDD9",0xC315],
- ["BDDA",0xC318],
- ["BDDB",0xC31C],
- ["BDDC",0xC324],
- ["BDDD",0xC325],
- ["BDDE",0xC328],
- ["BDDF",0xC329],
- ["BDE0",0xC345],
- ["BDE1",0xC368],
- ["BDE2",0xC369],
- ["BDE3",0xC36C],
- ["BDE4",0xC370],
- ["BDE5",0xC372],
- ["BDE6",0xC378],
- ["BDE7",0xC379],
- ["BDE8",0xC37C],
- ["BDE9",0xC37D],
- ["BDEA",0xC384],
- ["BDEB",0xC388],
- ["BDEC",0xC38C],
- ["BDED",0xC3C0],
- ["BDEE",0xC3D8],
- ["BDEF",0xC3D9],
- ["BDF0",0xC3DC],
- ["BDF1",0xC3DF],
- ["BDF2",0xC3E0],
- ["BDF3",0xC3E2],
- ["BDF4",0xC3E8],
- ["BDF5",0xC3E9],
- ["BDF6",0xC3ED],
- ["BDF7",0xC3F4],
- ["BDF8",0xC3F5],
- ["BDF9",0xC3F8],
- ["BDFA",0xC408],
- ["BDFB",0xC410],
- ["BDFC",0xC424],
- ["BDFD",0xC42C],
- ["BDFE",0xC430],
- ["BEA1",0xC434],
- ["BEA2",0xC43C],
- ["BEA3",0xC43D],
- ["BEA4",0xC448],
- ["BEA5",0xC464],
- ["BEA6",0xC465],
- ["BEA7",0xC468],
- ["BEA8",0xC46C],
- ["BEA9",0xC474],
- ["BEAA",0xC475],
- ["BEAB",0xC479],
- ["BEAC",0xC480],
- ["BEAD",0xC494],
- ["BEAE",0xC49C],
- ["BEAF",0xC4B8],
- ["BEB0",0xC4BC],
- ["BEB1",0xC4E9],
- ["BEB2",0xC4F0],
- ["BEB3",0xC4F1],
- ["BEB4",0xC4F4],
- ["BEB5",0xC4F8],
- ["BEB6",0xC4FA],
- ["BEB7",0xC4FF],
- ["BEB8",0xC500],
- ["BEB9",0xC501],
- ["BEBA",0xC50C],
- ["BEBB",0xC510],
- ["BEBC",0xC514],
- ["BEBD",0xC51C],
- ["BEBE",0xC528],
- ["BEBF",0xC529],
- ["BEC0",0xC52C],
- ["BEC1",0xC530],
- ["BEC2",0xC538],
- ["BEC3",0xC539],
- ["BEC4",0xC53B],
- ["BEC5",0xC53D],
- ["BEC6",0xC544],
- ["BEC7",0xC545],
- ["BEC8",0xC548],
- ["BEC9",0xC549],
- ["BECA",0xC54A],
- ["BECB",0xC54C],
- ["BECC",0xC54D],
- ["BECD",0xC54E],
- ["BECE",0xC553],
- ["BECF",0xC554],
- ["BED0",0xC555],
- ["BED1",0xC557],
- ["BED2",0xC558],
- ["BED3",0xC559],
- ["BED4",0xC55D],
- ["BED5",0xC55E],
- ["BED6",0xC560],
- ["BED7",0xC561],
- ["BED8",0xC564],
- ["BED9",0xC568],
- ["BEDA",0xC570],
- ["BEDB",0xC571],
- ["BEDC",0xC573],
- ["BEDD",0xC574],
- ["BEDE",0xC575],
- ["BEDF",0xC57C],
- ["BEE0",0xC57D],
- ["BEE1",0xC580],
- ["BEE2",0xC584],
- ["BEE3",0xC587],
- ["BEE4",0xC58C],
- ["BEE5",0xC58D],
- ["BEE6",0xC58F],
- ["BEE7",0xC591],
- ["BEE8",0xC595],
- ["BEE9",0xC597],
- ["BEEA",0xC598],
- ["BEEB",0xC59C],
- ["BEEC",0xC5A0],
- ["BEED",0xC5A9],
- ["BEEE",0xC5B4],
- ["BEEF",0xC5B5],
- ["BEF0",0xC5B8],
- ["BEF1",0xC5B9],
- ["BEF2",0xC5BB],
- ["BEF3",0xC5BC],
- ["BEF4",0xC5BD],
- ["BEF5",0xC5BE],
- ["BEF6",0xC5C4],
- ["BEF7",0xC5C5],
- ["BEF8",0xC5C6],
- ["BEF9",0xC5C7],
- ["BEFA",0xC5C8],
- ["BEFB",0xC5C9],
- ["BEFC",0xC5CA],
- ["BEFD",0xC5CC],
- ["BEFE",0xC5CE],
- ["BFA1",0xC5D0],
- ["BFA2",0xC5D1],
- ["BFA3",0xC5D4],
- ["BFA4",0xC5D8],
- ["BFA5",0xC5E0],
- ["BFA6",0xC5E1],
- ["BFA7",0xC5E3],
- ["BFA8",0xC5E5],
- ["BFA9",0xC5EC],
- ["BFAA",0xC5ED],
- ["BFAB",0xC5EE],
- ["BFAC",0xC5F0],
- ["BFAD",0xC5F4],
- ["BFAE",0xC5F6],
- ["BFAF",0xC5F7],
- ["BFB0",0xC5FC],
- ["BFB1",0xC5FD],
- ["BFB2",0xC5FE],
- ["BFB3",0xC5FF],
- ["BFB4",0xC600],
- ["BFB5",0xC601],
- ["BFB6",0xC605],
- ["BFB7",0xC606],
- ["BFB8",0xC607],
- ["BFB9",0xC608],
- ["BFBA",0xC60C],
- ["BFBB",0xC610],
- ["BFBC",0xC618],
- ["BFBD",0xC619],
- ["BFBE",0xC61B],
- ["BFBF",0xC61C],
- ["BFC0",0xC624],
- ["BFC1",0xC625],
- ["BFC2",0xC628],
- ["BFC3",0xC62C],
- ["BFC4",0xC62D],
- ["BFC5",0xC62E],
- ["BFC6",0xC630],
- ["BFC7",0xC633],
- ["BFC8",0xC634],
- ["BFC9",0xC635],
- ["BFCA",0xC637],
- ["BFCB",0xC639],
- ["BFCC",0xC63B],
- ["BFCD",0xC640],
- ["BFCE",0xC641],
- ["BFCF",0xC644],
- ["BFD0",0xC648],
- ["BFD1",0xC650],
- ["BFD2",0xC651],
- ["BFD3",0xC653],
- ["BFD4",0xC654],
- ["BFD5",0xC655],
- ["BFD6",0xC65C],
- ["BFD7",0xC65D],
- ["BFD8",0xC660],
- ["BFD9",0xC66C],
- ["BFDA",0xC66F],
- ["BFDB",0xC671],
- ["BFDC",0xC678],
- ["BFDD",0xC679],
- ["BFDE",0xC67C],
- ["BFDF",0xC680],
- ["BFE0",0xC688],
- ["BFE1",0xC689],
- ["BFE2",0xC68B],
- ["BFE3",0xC68D],
- ["BFE4",0xC694],
- ["BFE5",0xC695],
- ["BFE6",0xC698],
- ["BFE7",0xC69C],
- ["BFE8",0xC6A4],
- ["BFE9",0xC6A5],
- ["BFEA",0xC6A7],
- ["BFEB",0xC6A9],
- ["BFEC",0xC6B0],
- ["BFED",0xC6B1],
- ["BFEE",0xC6B4],
- ["BFEF",0xC6B8],
- ["BFF0",0xC6B9],
- ["BFF1",0xC6BA],
- ["BFF2",0xC6C0],
- ["BFF3",0xC6C1],
- ["BFF4",0xC6C3],
- ["BFF5",0xC6C5],
- ["BFF6",0xC6CC],
- ["BFF7",0xC6CD],
- ["BFF8",0xC6D0],
- ["BFF9",0xC6D4],
- ["BFFA",0xC6DC],
- ["BFFB",0xC6DD],
- ["BFFC",0xC6E0],
- ["BFFD",0xC6E1],
- ["BFFE",0xC6E8],
- ["C0A1",0xC6E9],
- ["C0A2",0xC6EC],
- ["C0A3",0xC6F0],
- ["C0A4",0xC6F8],
- ["C0A5",0xC6F9],
- ["C0A6",0xC6FD],
- ["C0A7",0xC704],
- ["C0A8",0xC705],
- ["C0A9",0xC708],
- ["C0AA",0xC70C],
- ["C0AB",0xC714],
- ["C0AC",0xC715],
- ["C0AD",0xC717],
- ["C0AE",0xC719],
- ["C0AF",0xC720],
- ["C0B0",0xC721],
- ["C0B1",0xC724],
- ["C0B2",0xC728],
- ["C0B3",0xC730],
- ["C0B4",0xC731],
- ["C0B5",0xC733],
- ["C0B6",0xC735],
- ["C0B7",0xC737],
- ["C0B8",0xC73C],
- ["C0B9",0xC73D],
- ["C0BA",0xC740],
- ["C0BB",0xC744],
- ["C0BC",0xC74A],
- ["C0BD",0xC74C],
- ["C0BE",0xC74D],
- ["C0BF",0xC74F],
- ["C0C0",0xC751],
- ["C0C1",0xC752],
- ["C0C2",0xC753],
- ["C0C3",0xC754],
- ["C0C4",0xC755],
- ["C0C5",0xC756],
- ["C0C6",0xC757],
- ["C0C7",0xC758],
- ["C0C8",0xC75C],
- ["C0C9",0xC760],
- ["C0CA",0xC768],
- ["C0CB",0xC76B],
- ["C0CC",0xC774],
- ["C0CD",0xC775],
- ["C0CE",0xC778],
- ["C0CF",0xC77C],
- ["C0D0",0xC77D],
- ["C0D1",0xC77E],
- ["C0D2",0xC783],
- ["C0D3",0xC784],
- ["C0D4",0xC785],
- ["C0D5",0xC787],
- ["C0D6",0xC788],
- ["C0D7",0xC789],
- ["C0D8",0xC78A],
- ["C0D9",0xC78E],
- ["C0DA",0xC790],
- ["C0DB",0xC791],
- ["C0DC",0xC794],
- ["C0DD",0xC796],
- ["C0DE",0xC797],
- ["C0DF",0xC798],
- ["C0E0",0xC79A],
- ["C0E1",0xC7A0],
- ["C0E2",0xC7A1],
- ["C0E3",0xC7A3],
- ["C0E4",0xC7A4],
- ["C0E5",0xC7A5],
- ["C0E6",0xC7A6],
- ["C0E7",0xC7AC],
- ["C0E8",0xC7AD],
- ["C0E9",0xC7B0],
- ["C0EA",0xC7B4],
- ["C0EB",0xC7BC],
- ["C0EC",0xC7BD],
- ["C0ED",0xC7BF],
- ["C0EE",0xC7C0],
- ["C0EF",0xC7C1],
- ["C0F0",0xC7C8],
- ["C0F1",0xC7C9],
- ["C0F2",0xC7CC],
- ["C0F3",0xC7CE],
- ["C0F4",0xC7D0],
- ["C0F5",0xC7D8],
- ["C0F6",0xC7DD],
- ["C0F7",0xC7E4],
- ["C0F8",0xC7E8],
- ["C0F9",0xC7EC],
- ["C0FA",0xC800],
- ["C0FB",0xC801],
- ["C0FC",0xC804],
- ["C0FD",0xC808],
- ["C0FE",0xC80A],
- ["C1A1",0xC810],
- ["C1A2",0xC811],
- ["C1A3",0xC813],
- ["C1A4",0xC815],
- ["C1A5",0xC816],
- ["C1A6",0xC81C],
- ["C1A7",0xC81D],
- ["C1A8",0xC820],
- ["C1A9",0xC824],
- ["C1AA",0xC82C],
- ["C1AB",0xC82D],
- ["C1AC",0xC82F],
- ["C1AD",0xC831],
- ["C1AE",0xC838],
- ["C1AF",0xC83C],
- ["C1B0",0xC840],
- ["C1B1",0xC848],
- ["C1B2",0xC849],
- ["C1B3",0xC84C],
- ["C1B4",0xC84D],
- ["C1B5",0xC854],
- ["C1B6",0xC870],
- ["C1B7",0xC871],
- ["C1B8",0xC874],
- ["C1B9",0xC878],
- ["C1BA",0xC87A],
- ["C1BB",0xC880],
- ["C1BC",0xC881],
- ["C1BD",0xC883],
- ["C1BE",0xC885],
- ["C1BF",0xC886],
- ["C1C0",0xC887],
- ["C1C1",0xC88B],
- ["C1C2",0xC88C],
- ["C1C3",0xC88D],
- ["C1C4",0xC894],
- ["C1C5",0xC89D],
- ["C1C6",0xC89F],
- ["C1C7",0xC8A1],
- ["C1C8",0xC8A8],
- ["C1C9",0xC8BC],
- ["C1CA",0xC8BD],
- ["C1CB",0xC8C4],
- ["C1CC",0xC8C8],
- ["C1CD",0xC8CC],
- ["C1CE",0xC8D4],
- ["C1CF",0xC8D5],
- ["C1D0",0xC8D7],
- ["C1D1",0xC8D9],
- ["C1D2",0xC8E0],
- ["C1D3",0xC8E1],
- ["C1D4",0xC8E4],
- ["C1D5",0xC8F5],
- ["C1D6",0xC8FC],
- ["C1D7",0xC8FD],
- ["C1D8",0xC900],
- ["C1D9",0xC904],
- ["C1DA",0xC905],
- ["C1DB",0xC906],
- ["C1DC",0xC90C],
- ["C1DD",0xC90D],
- ["C1DE",0xC90F],
- ["C1DF",0xC911],
- ["C1E0",0xC918],
- ["C1E1",0xC92C],
- ["C1E2",0xC934],
- ["C1E3",0xC950],
- ["C1E4",0xC951],
- ["C1E5",0xC954],
- ["C1E6",0xC958],
- ["C1E7",0xC960],
- ["C1E8",0xC961],
- ["C1E9",0xC963],
- ["C1EA",0xC96C],
- ["C1EB",0xC970],
- ["C1EC",0xC974],
- ["C1ED",0xC97C],
- ["C1EE",0xC988],
- ["C1EF",0xC989],
- ["C1F0",0xC98C],
- ["C1F1",0xC990],
- ["C1F2",0xC998],
- ["C1F3",0xC999],
- ["C1F4",0xC99B],
- ["C1F5",0xC99D],
- ["C1F6",0xC9C0],
- ["C1F7",0xC9C1],
- ["C1F8",0xC9C4],
- ["C1F9",0xC9C7],
- ["C1FA",0xC9C8],
- ["C1FB",0xC9CA],
- ["C1FC",0xC9D0],
- ["C1FD",0xC9D1],
- ["C1FE",0xC9D3],
- ["C2A1",0xC9D5],
- ["C2A2",0xC9D6],
- ["C2A3",0xC9D9],
- ["C2A4",0xC9DA],
- ["C2A5",0xC9DC],
- ["C2A6",0xC9DD],
- ["C2A7",0xC9E0],
- ["C2A8",0xC9E2],
- ["C2A9",0xC9E4],
- ["C2AA",0xC9E7],
- ["C2AB",0xC9EC],
- ["C2AC",0xC9ED],
- ["C2AD",0xC9EF],
- ["C2AE",0xC9F0],
- ["C2AF",0xC9F1],
- ["C2B0",0xC9F8],
- ["C2B1",0xC9F9],
- ["C2B2",0xC9FC],
- ["C2B3",0xCA00],
- ["C2B4",0xCA08],
- ["C2B5",0xCA09],
- ["C2B6",0xCA0B],
- ["C2B7",0xCA0C],
- ["C2B8",0xCA0D],
- ["C2B9",0xCA14],
- ["C2BA",0xCA18],
- ["C2BB",0xCA29],
- ["C2BC",0xCA4C],
- ["C2BD",0xCA4D],
- ["C2BE",0xCA50],
- ["C2BF",0xCA54],
- ["C2C0",0xCA5C],
- ["C2C1",0xCA5D],
- ["C2C2",0xCA5F],
- ["C2C3",0xCA60],
- ["C2C4",0xCA61],
- ["C2C5",0xCA68],
- ["C2C6",0xCA7D],
- ["C2C7",0xCA84],
- ["C2C8",0xCA98],
- ["C2C9",0xCABC],
- ["C2CA",0xCABD],
- ["C2CB",0xCAC0],
- ["C2CC",0xCAC4],
- ["C2CD",0xCACC],
- ["C2CE",0xCACD],
- ["C2CF",0xCACF],
- ["C2D0",0xCAD1],
- ["C2D1",0xCAD3],
- ["C2D2",0xCAD8],
- ["C2D3",0xCAD9],
- ["C2D4",0xCAE0],
- ["C2D5",0xCAEC],
- ["C2D6",0xCAF4],
- ["C2D7",0xCB08],
- ["C2D8",0xCB10],
- ["C2D9",0xCB14],
- ["C2DA",0xCB18],
- ["C2DB",0xCB20],
- ["C2DC",0xCB21],
- ["C2DD",0xCB41],
- ["C2DE",0xCB48],
- ["C2DF",0xCB49],
- ["C2E0",0xCB4C],
- ["C2E1",0xCB50],
- ["C2E2",0xCB58],
- ["C2E3",0xCB59],
- ["C2E4",0xCB5D],
- ["C2E5",0xCB64],
- ["C2E6",0xCB78],
- ["C2E7",0xCB79],
- ["C2E8",0xCB9C],
- ["C2E9",0xCBB8],
- ["C2EA",0xCBD4],
- ["C2EB",0xCBE4],
- ["C2EC",0xCBE7],
- ["C2ED",0xCBE9],
- ["C2EE",0xCC0C],
- ["C2EF",0xCC0D],
- ["C2F0",0xCC10],
- ["C2F1",0xCC14],
- ["C2F2",0xCC1C],
- ["C2F3",0xCC1D],
- ["C2F4",0xCC21],
- ["C2F5",0xCC22],
- ["C2F6",0xCC27],
- ["C2F7",0xCC28],
- ["C2F8",0xCC29],
- ["C2F9",0xCC2C],
- ["C2FA",0xCC2E],
- ["C2FB",0xCC30],
- ["C2FC",0xCC38],
- ["C2FD",0xCC39],
- ["C2FE",0xCC3B],
- ["C3A1",0xCC3C],
- ["C3A2",0xCC3D],
- ["C3A3",0xCC3E],
- ["C3A4",0xCC44],
- ["C3A5",0xCC45],
- ["C3A6",0xCC48],
- ["C3A7",0xCC4C],
- ["C3A8",0xCC54],
- ["C3A9",0xCC55],
- ["C3AA",0xCC57],
- ["C3AB",0xCC58],
- ["C3AC",0xCC59],
- ["C3AD",0xCC60],
- ["C3AE",0xCC64],
- ["C3AF",0xCC66],
- ["C3B0",0xCC68],
- ["C3B1",0xCC70],
- ["C3B2",0xCC75],
- ["C3B3",0xCC98],
- ["C3B4",0xCC99],
- ["C3B5",0xCC9C],
- ["C3B6",0xCCA0],
- ["C3B7",0xCCA8],
- ["C3B8",0xCCA9],
- ["C3B9",0xCCAB],
- ["C3BA",0xCCAC],
- ["C3BB",0xCCAD],
- ["C3BC",0xCCB4],
- ["C3BD",0xCCB5],
- ["C3BE",0xCCB8],
- ["C3BF",0xCCBC],
- ["C3C0",0xCCC4],
- ["C3C1",0xCCC5],
- ["C3C2",0xCCC7],
- ["C3C3",0xCCC9],
- ["C3C4",0xCCD0],
- ["C3C5",0xCCD4],
- ["C3C6",0xCCE4],
- ["C3C7",0xCCEC],
- ["C3C8",0xCCF0],
- ["C3C9",0xCD01],
- ["C3CA",0xCD08],
- ["C3CB",0xCD09],
- ["C3CC",0xCD0C],
- ["C3CD",0xCD10],
- ["C3CE",0xCD18],
- ["C3CF",0xCD19],
- ["C3D0",0xCD1B],
- ["C3D1",0xCD1D],
- ["C3D2",0xCD24],
- ["C3D3",0xCD28],
- ["C3D4",0xCD2C],
- ["C3D5",0xCD39],
- ["C3D6",0xCD5C],
- ["C3D7",0xCD60],
- ["C3D8",0xCD64],
- ["C3D9",0xCD6C],
- ["C3DA",0xCD6D],
- ["C3DB",0xCD6F],
- ["C3DC",0xCD71],
- ["C3DD",0xCD78],
- ["C3DE",0xCD88],
- ["C3DF",0xCD94],
- ["C3E0",0xCD95],
- ["C3E1",0xCD98],
- ["C3E2",0xCD9C],
- ["C3E3",0xCDA4],
- ["C3E4",0xCDA5],
- ["C3E5",0xCDA7],
- ["C3E6",0xCDA9],
- ["C3E7",0xCDB0],
- ["C3E8",0xCDC4],
- ["C3E9",0xCDCC],
- ["C3EA",0xCDD0],
- ["C3EB",0xCDE8],
- ["C3EC",0xCDEC],
- ["C3ED",0xCDF0],
- ["C3EE",0xCDF8],
- ["C3EF",0xCDF9],
- ["C3F0",0xCDFB],
- ["C3F1",0xCDFD],
- ["C3F2",0xCE04],
- ["C3F3",0xCE08],
- ["C3F4",0xCE0C],
- ["C3F5",0xCE14],
- ["C3F6",0xCE19],
- ["C3F7",0xCE20],
- ["C3F8",0xCE21],
- ["C3F9",0xCE24],
- ["C3FA",0xCE28],
- ["C3FB",0xCE30],
- ["C3FC",0xCE31],
- ["C3FD",0xCE33],
- ["C3FE",0xCE35],
- ["C4A1",0xCE58],
- ["C4A2",0xCE59],
- ["C4A3",0xCE5C],
- ["C4A4",0xCE5F],
- ["C4A5",0xCE60],
- ["C4A6",0xCE61],
- ["C4A7",0xCE68],
- ["C4A8",0xCE69],
- ["C4A9",0xCE6B],
- ["C4AA",0xCE6D],
- ["C4AB",0xCE74],
- ["C4AC",0xCE75],
- ["C4AD",0xCE78],
- ["C4AE",0xCE7C],
- ["C4AF",0xCE84],
- ["C4B0",0xCE85],
- ["C4B1",0xCE87],
- ["C4B2",0xCE89],
- ["C4B3",0xCE90],
- ["C4B4",0xCE91],
- ["C4B5",0xCE94],
- ["C4B6",0xCE98],
- ["C4B7",0xCEA0],
- ["C4B8",0xCEA1],
- ["C4B9",0xCEA3],
- ["C4BA",0xCEA4],
- ["C4BB",0xCEA5],
- ["C4BC",0xCEAC],
- ["C4BD",0xCEAD],
- ["C4BE",0xCEC1],
- ["C4BF",0xCEE4],
- ["C4C0",0xCEE5],
- ["C4C1",0xCEE8],
- ["C4C2",0xCEEB],
- ["C4C3",0xCEEC],
- ["C4C4",0xCEF4],
- ["C4C5",0xCEF5],
- ["C4C6",0xCEF7],
- ["C4C7",0xCEF8],
- ["C4C8",0xCEF9],
- ["C4C9",0xCF00],
- ["C4CA",0xCF01],
- ["C4CB",0xCF04],
- ["C4CC",0xCF08],
- ["C4CD",0xCF10],
- ["C4CE",0xCF11],
- ["C4CF",0xCF13],
- ["C4D0",0xCF15],
- ["C4D1",0xCF1C],
- ["C4D2",0xCF20],
- ["C4D3",0xCF24],
- ["C4D4",0xCF2C],
- ["C4D5",0xCF2D],
- ["C4D6",0xCF2F],
- ["C4D7",0xCF30],
- ["C4D8",0xCF31],
- ["C4D9",0xCF38],
- ["C4DA",0xCF54],
- ["C4DB",0xCF55],
- ["C4DC",0xCF58],
- ["C4DD",0xCF5C],
- ["C4DE",0xCF64],
- ["C4DF",0xCF65],
- ["C4E0",0xCF67],
- ["C4E1",0xCF69],
- ["C4E2",0xCF70],
- ["C4E3",0xCF71],
- ["C4E4",0xCF74],
- ["C4E5",0xCF78],
- ["C4E6",0xCF80],
- ["C4E7",0xCF85],
- ["C4E8",0xCF8C],
- ["C4E9",0xCFA1],
- ["C4EA",0xCFA8],
- ["C4EB",0xCFB0],
- ["C4EC",0xCFC4],
- ["C4ED",0xCFE0],
- ["C4EE",0xCFE1],
- ["C4EF",0xCFE4],
- ["C4F0",0xCFE8],
- ["C4F1",0xCFF0],
- ["C4F2",0xCFF1],
- ["C4F3",0xCFF3],
- ["C4F4",0xCFF5],
- ["C4F5",0xCFFC],
- ["C4F6",0xD000],
- ["C4F7",0xD004],
- ["C4F8",0xD011],
- ["C4F9",0xD018],
- ["C4FA",0xD02D],
- ["C4FB",0xD034],
- ["C4FC",0xD035],
- ["C4FD",0xD038],
- ["C4FE",0xD03C],
- ["C5A1",0xD044],
- ["C5A2",0xD045],
- ["C5A3",0xD047],
- ["C5A4",0xD049],
- ["C5A5",0xD050],
- ["C5A6",0xD054],
- ["C5A7",0xD058],
- ["C5A8",0xD060],
- ["C5A9",0xD06C],
- ["C5AA",0xD06D],
- ["C5AB",0xD070],
- ["C5AC",0xD074],
- ["C5AD",0xD07C],
- ["C5AE",0xD07D],
- ["C5AF",0xD081],
- ["C5B0",0xD0A4],
- ["C5B1",0xD0A5],
- ["C5B2",0xD0A8],
- ["C5B3",0xD0AC],
- ["C5B4",0xD0B4],
- ["C5B5",0xD0B5],
- ["C5B6",0xD0B7],
- ["C5B7",0xD0B9],
- ["C5B8",0xD0C0],
- ["C5B9",0xD0C1],
- ["C5BA",0xD0C4],
- ["C5BB",0xD0C8],
- ["C5BC",0xD0C9],
- ["C5BD",0xD0D0],
- ["C5BE",0xD0D1],
- ["C5BF",0xD0D3],
- ["C5C0",0xD0D4],
- ["C5C1",0xD0D5],
- ["C5C2",0xD0DC],
- ["C5C3",0xD0DD],
- ["C5C4",0xD0E0],
- ["C5C5",0xD0E4],
- ["C5C6",0xD0EC],
- ["C5C7",0xD0ED],
- ["C5C8",0xD0EF],
- ["C5C9",0xD0F0],
- ["C5CA",0xD0F1],
- ["C5CB",0xD0F8],
- ["C5CC",0xD10D],
- ["C5CD",0xD130],
- ["C5CE",0xD131],
- ["C5CF",0xD134],
- ["C5D0",0xD138],
- ["C5D1",0xD13A],
- ["C5D2",0xD140],
- ["C5D3",0xD141],
- ["C5D4",0xD143],
- ["C5D5",0xD144],
- ["C5D6",0xD145],
- ["C5D7",0xD14C],
- ["C5D8",0xD14D],
- ["C5D9",0xD150],
- ["C5DA",0xD154],
- ["C5DB",0xD15C],
- ["C5DC",0xD15D],
- ["C5DD",0xD15F],
- ["C5DE",0xD161],
- ["C5DF",0xD168],
- ["C5E0",0xD16C],
- ["C5E1",0xD17C],
- ["C5E2",0xD184],
- ["C5E3",0xD188],
- ["C5E4",0xD1A0],
- ["C5E5",0xD1A1],
- ["C5E6",0xD1A4],
- ["C5E7",0xD1A8],
- ["C5E8",0xD1B0],
- ["C5E9",0xD1B1],
- ["C5EA",0xD1B3],
- ["C5EB",0xD1B5],
- ["C5EC",0xD1BA],
- ["C5ED",0xD1BC],
- ["C5EE",0xD1C0],
- ["C5EF",0xD1D8],
- ["C5F0",0xD1F4],
- ["C5F1",0xD1F8],
- ["C5F2",0xD207],
- ["C5F3",0xD209],
- ["C5F4",0xD210],
- ["C5F5",0xD22C],
- ["C5F6",0xD22D],
- ["C5F7",0xD230],
- ["C5F8",0xD234],
- ["C5F9",0xD23C],
- ["C5FA",0xD23D],
- ["C5FB",0xD23F],
- ["C5FC",0xD241],
- ["C5FD",0xD248],
- ["C5FE",0xD25C],
- ["C6A1",0xD264],
- ["C6A2",0xD280],
- ["C6A3",0xD281],
- ["C6A4",0xD284],
- ["C6A5",0xD288],
- ["C6A6",0xD290],
- ["C6A7",0xD291],
- ["C6A8",0xD295],
- ["C6A9",0xD29C],
- ["C6AA",0xD2A0],
- ["C6AB",0xD2A4],
- ["C6AC",0xD2AC],
- ["C6AD",0xD2B1],
- ["C6AE",0xD2B8],
- ["C6AF",0xD2B9],
- ["C6B0",0xD2BC],
- ["C6B1",0xD2BF],
- ["C6B2",0xD2C0],
- ["C6B3",0xD2C2],
- ["C6B4",0xD2C8],
- ["C6B5",0xD2C9],
- ["C6B6",0xD2CB],
- ["C6B7",0xD2D4],
- ["C6B8",0xD2D8],
- ["C6B9",0xD2DC],
- ["C6BA",0xD2E4],
- ["C6BB",0xD2E5],
- ["C6BC",0xD2F0],
- ["C6BD",0xD2F1],
- ["C6BE",0xD2F4],
- ["C6BF",0xD2F8],
- ["C6C0",0xD300],
- ["C6C1",0xD301],
- ["C6C2",0xD303],
- ["C6C3",0xD305],
- ["C6C4",0xD30C],
- ["C6C5",0xD30D],
- ["C6C6",0xD30E],
- ["C6C7",0xD310],
- ["C6C8",0xD314],
- ["C6C9",0xD316],
- ["C6CA",0xD31C],
- ["C6CB",0xD31D],
- ["C6CC",0xD31F],
- ["C6CD",0xD320],
- ["C6CE",0xD321],
- ["C6CF",0xD325],
- ["C6D0",0xD328],
- ["C6D1",0xD329],
- ["C6D2",0xD32C],
- ["C6D3",0xD330],
- ["C6D4",0xD338],
- ["C6D5",0xD339],
- ["C6D6",0xD33B],
- ["C6D7",0xD33C],
- ["C6D8",0xD33D],
- ["C6D9",0xD344],
- ["C6DA",0xD345],
- ["C6DB",0xD37C],
- ["C6DC",0xD37D],
- ["C6DD",0xD380],
- ["C6DE",0xD384],
- ["C6DF",0xD38C],
- ["C6E0",0xD38D],
- ["C6E1",0xD38F],
- ["C6E2",0xD390],
- ["C6E3",0xD391],
- ["C6E4",0xD398],
- ["C6E5",0xD399],
- ["C6E6",0xD39C],
- ["C6E7",0xD3A0],
- ["C6E8",0xD3A8],
- ["C6E9",0xD3A9],
- ["C6EA",0xD3AB],
- ["C6EB",0xD3AD],
- ["C6EC",0xD3B4],
- ["C6ED",0xD3B8],
- ["C6EE",0xD3BC],
- ["C6EF",0xD3C4],
- ["C6F0",0xD3C5],
- ["C6F1",0xD3C8],
- ["C6F2",0xD3C9],
- ["C6F3",0xD3D0],
- ["C6F4",0xD3D8],
- ["C6F5",0xD3E1],
- ["C6F6",0xD3E3],
- ["C6F7",0xD3EC],
- ["C6F8",0xD3ED],
- ["C6F9",0xD3F0],
- ["C6FA",0xD3F4],
- ["C6FB",0xD3FC],
- ["C6FC",0xD3FD],
- ["C6FD",0xD3FF],
- ["C6FE",0xD401],
- ["C7A1",0xD408],
- ["C7A2",0xD41D],
- ["C7A3",0xD440],
- ["C7A4",0xD444],
- ["C7A5",0xD45C],
- ["C7A6",0xD460],
- ["C7A7",0xD464],
- ["C7A8",0xD46D],
- ["C7A9",0xD46F],
- ["C7AA",0xD478],
- ["C7AB",0xD479],
- ["C7AC",0xD47C],
- ["C7AD",0xD47F],
- ["C7AE",0xD480],
- ["C7AF",0xD482],
- ["C7B0",0xD488],
- ["C7B1",0xD489],
- ["C7B2",0xD48B],
- ["C7B3",0xD48D],
- ["C7B4",0xD494],
- ["C7B5",0xD4A9],
- ["C7B6",0xD4CC],
- ["C7B7",0xD4D0],
- ["C7B8",0xD4D4],
- ["C7B9",0xD4DC],
- ["C7BA",0xD4DF],
- ["C7BB",0xD4E8],
- ["C7BC",0xD4EC],
- ["C7BD",0xD4F0],
- ["C7BE",0xD4F8],
- ["C7BF",0xD4FB],
- ["C7C0",0xD4FD],
- ["C7C1",0xD504],
- ["C7C2",0xD508],
- ["C7C3",0xD50C],
- ["C7C4",0xD514],
- ["C7C5",0xD515],
- ["C7C6",0xD517],
- ["C7C7",0xD53C],
- ["C7C8",0xD53D],
- ["C7C9",0xD540],
- ["C7CA",0xD544],
- ["C7CB",0xD54C],
- ["C7CC",0xD54D],
- ["C7CD",0xD54F],
- ["C7CE",0xD551],
- ["C7CF",0xD558],
- ["C7D0",0xD559],
- ["C7D1",0xD55C],
- ["C7D2",0xD560],
- ["C7D3",0xD565],
- ["C7D4",0xD568],
- ["C7D5",0xD569],
- ["C7D6",0xD56B],
- ["C7D7",0xD56D],
- ["C7D8",0xD574],
- ["C7D9",0xD575],
- ["C7DA",0xD578],
- ["C7DB",0xD57C],
- ["C7DC",0xD584],
- ["C7DD",0xD585],
- ["C7DE",0xD587],
- ["C7DF",0xD588],
- ["C7E0",0xD589],
- ["C7E1",0xD590],
- ["C7E2",0xD5A5],
- ["C7E3",0xD5C8],
- ["C7E4",0xD5C9],
- ["C7E5",0xD5CC],
- ["C7E6",0xD5D0],
- ["C7E7",0xD5D2],
- ["C7E8",0xD5D8],
- ["C7E9",0xD5D9],
- ["C7EA",0xD5DB],
- ["C7EB",0xD5DD],
- ["C7EC",0xD5E4],
- ["C7ED",0xD5E5],
- ["C7EE",0xD5E8],
- ["C7EF",0xD5EC],
- ["C7F0",0xD5F4],
- ["C7F1",0xD5F5],
- ["C7F2",0xD5F7],
- ["C7F3",0xD5F9],
- ["C7F4",0xD600],
- ["C7F5",0xD601],
- ["C7F6",0xD604],
- ["C7F7",0xD608],
- ["C7F8",0xD610],
- ["C7F9",0xD611],
- ["C7FA",0xD613],
- ["C7FB",0xD614],
- ["C7FC",0xD615],
- ["C7FD",0xD61C],
- ["C7FE",0xD620],
- ["C8A1",0xD624],
- ["C8A2",0xD62D],
- ["C8A3",0xD638],
- ["C8A4",0xD639],
- ["C8A5",0xD63C],
- ["C8A6",0xD640],
- ["C8A7",0xD645],
- ["C8A8",0xD648],
- ["C8A9",0xD649],
- ["C8AA",0xD64B],
- ["C8AB",0xD64D],
- ["C8AC",0xD651],
- ["C8AD",0xD654],
- ["C8AE",0xD655],
- ["C8AF",0xD658],
- ["C8B0",0xD65C],
- ["C8B1",0xD667],
- ["C8B2",0xD669],
- ["C8B3",0xD670],
- ["C8B4",0xD671],
- ["C8B5",0xD674],
- ["C8B6",0xD683],
- ["C8B7",0xD685],
- ["C8B8",0xD68C],
- ["C8B9",0xD68D],
- ["C8BA",0xD690],
- ["C8BB",0xD694],
- ["C8BC",0xD69D],
- ["C8BD",0xD69F],
- ["C8BE",0xD6A1],
- ["C8BF",0xD6A8],
- ["C8C0",0xD6AC],
- ["C8C1",0xD6B0],
- ["C8C2",0xD6B9],
- ["C8C3",0xD6BB],
- ["C8C4",0xD6C4],
- ["C8C5",0xD6C5],
- ["C8C6",0xD6C8],
- ["C8C7",0xD6CC],
- ["C8C8",0xD6D1],
- ["C8C9",0xD6D4],
- ["C8CA",0xD6D7],
- ["C8CB",0xD6D9],
- ["C8CC",0xD6E0],
- ["C8CD",0xD6E4],
- ["C8CE",0xD6E8],
- ["C8CF",0xD6F0],
- ["C8D0",0xD6F5],
- ["C8D1",0xD6FC],
- ["C8D2",0xD6FD],
- ["C8D3",0xD700],
- ["C8D4",0xD704],
- ["C8D5",0xD711],
- ["C8D6",0xD718],
- ["C8D7",0xD719],
- ["C8D8",0xD71C],
- ["C8D9",0xD720],
- ["C8DA",0xD728],
- ["C8DB",0xD729],
- ["C8DC",0xD72B],
- ["C8DD",0xD72D],
- ["C8DE",0xD734],
- ["C8DF",0xD735],
- ["C8E0",0xD738],
- ["C8E1",0xD73C],
- ["C8E2",0xD744],
- ["C8E3",0xD747],
- ["C8E4",0xD749],
- ["C8E5",0xD750],
- ["C8E6",0xD751],
- ["C8E7",0xD754],
- ["C8E8",0xD756],
- ["C8E9",0xD757],
- ["C8EA",0xD758],
- ["C8EB",0xD759],
- ["C8EC",0xD760],
- ["C8ED",0xD761],
- ["C8EE",0xD763],
- ["C8EF",0xD765],
- ["C8F0",0xD769],
- ["C8F1",0xD76C],
- ["C8F2",0xD770],
- ["C8F3",0xD774],
- ["C8F4",0xD77C],
- ["C8F5",0xD77D],
- ["C8F6",0xD781],
- ["C8F7",0xD788],
- ["C8F8",0xD789],
- ["C8F9",0xD78C],
- ["C8FA",0xD790],
- ["C8FB",0xD798],
- ["C8FC",0xD799],
- ["C8FD",0xD79B],
- ["C8FE",0xD79D],
- ["CAA1",0x4F3D],
- ["CAA2",0x4F73],
- ["CAA3",0x5047],
- ["CAA4",0x50F9],
- ["CAA5",0x52A0],
- ["CAA6",0x53EF],
- ["CAA7",0x5475],
- ["CAA8",0x54E5],
- ["CAA9",0x5609],
- ["CAAA",0x5AC1],
- ["CAAB",0x5BB6],
- ["CAAC",0x6687],
- ["CAAD",0x67B6],
- ["CAAE",0x67B7],
- ["CAAF",0x67EF],
- ["CAB0",0x6B4C],
- ["CAB1",0x73C2],
- ["CAB2",0x75C2],
- ["CAB3",0x7A3C],
- ["CAB4",0x82DB],
- ["CAB5",0x8304],
- ["CAB6",0x8857],
- ["CAB7",0x8888],
- ["CAB8",0x8A36],
- ["CAB9",0x8CC8],
- ["CABA",0x8DCF],
- ["CABB",0x8EFB],
- ["CABC",0x8FE6],
- ["CABD",0x99D5],
- ["CABE",0x523B],
- ["CABF",0x5374],
- ["CAC0",0x5404],
- ["CAC1",0x606A],
- ["CAC2",0x6164],
- ["CAC3",0x6BBC],
- ["CAC4",0x73CF],
- ["CAC5",0x811A],
- ["CAC6",0x89BA],
- ["CAC7",0x89D2],
- ["CAC8",0x95A3],
- ["CAC9",0x4F83],
- ["CACA",0x520A],
- ["CACB",0x58BE],
- ["CACC",0x5978],
- ["CACD",0x59E6],
- ["CACE",0x5E72],
- ["CACF",0x5E79],
- ["CAD0",0x61C7],
- ["CAD1",0x63C0],
- ["CAD2",0x6746],
- ["CAD3",0x67EC],
- ["CAD4",0x687F],
- ["CAD5",0x6F97],
- ["CAD6",0x764E],
- ["CAD7",0x770B],
- ["CAD8",0x78F5],
- ["CAD9",0x7A08],
- ["CADA",0x7AFF],
- ["CADB",0x7C21],
- ["CADC",0x809D],
- ["CADD",0x826E],
- ["CADE",0x8271],
- ["CADF",0x8AEB],
- ["CAE0",0x9593],
- ["CAE1",0x4E6B],
- ["CAE2",0x559D],
- ["CAE3",0x66F7],
- ["CAE4",0x6E34],
- ["CAE5",0x78A3],
- ["CAE6",0x7AED],
- ["CAE7",0x845B],
- ["CAE8",0x8910],
- ["CAE9",0x874E],
- ["CAEA",0x97A8],
- ["CAEB",0x52D8],
- ["CAEC",0x574E],
- ["CAED",0x582A],
- ["CAEE",0x5D4C],
- ["CAEF",0x611F],
- ["CAF0",0x61BE],
- ["CAF1",0x6221],
- ["CAF2",0x6562],
- ["CAF3",0x67D1],
- ["CAF4",0x6A44],
- ["CAF5",0x6E1B],
- ["CAF6",0x7518],
- ["CAF7",0x75B3],
- ["CAF8",0x76E3],
- ["CAF9",0x77B0],
- ["CAFA",0x7D3A],
- ["CAFB",0x90AF],
- ["CAFC",0x9451],
- ["CAFD",0x9452],
- ["CAFE",0x9F95],
- ["CBA1",0x5323],
- ["CBA2",0x5CAC],
- ["CBA3",0x7532],
- ["CBA4",0x80DB],
- ["CBA5",0x9240],
- ["CBA6",0x9598],
- ["CBA7",0x525B],
- ["CBA8",0x5808],
- ["CBA9",0x59DC],
- ["CBAA",0x5CA1],
- ["CBAB",0x5D17],
- ["CBAC",0x5EB7],
- ["CBAD",0x5F3A],
- ["CBAE",0x5F4A],
- ["CBAF",0x6177],
- ["CBB0",0x6C5F],
- ["CBB1",0x757A],
- ["CBB2",0x7586],
- ["CBB3",0x7CE0],
- ["CBB4",0x7D73],
- ["CBB5",0x7DB1],
- ["CBB6",0x7F8C],
- ["CBB7",0x8154],
- ["CBB8",0x8221],
- ["CBB9",0x8591],
- ["CBBA",0x8941],
- ["CBBB",0x8B1B],
- ["CBBC",0x92FC],
- ["CBBD",0x964D],
- ["CBBE",0x9C47],
- ["CBBF",0x4ECB],
- ["CBC0",0x4EF7],
- ["CBC1",0x500B],
- ["CBC2",0x51F1],
- ["CBC3",0x584F],
- ["CBC4",0x6137],
- ["CBC5",0x613E],
- ["CBC6",0x6168],
- ["CBC7",0x6539],
- ["CBC8",0x69EA],
- ["CBC9",0x6F11],
- ["CBCA",0x75A5],
- ["CBCB",0x7686],
- ["CBCC",0x76D6],
- ["CBCD",0x7B87],
- ["CBCE",0x82A5],
- ["CBCF",0x84CB],
- ["CBD0",0xF900],
- ["CBD1",0x93A7],
- ["CBD2",0x958B],
- ["CBD3",0x5580],
- ["CBD4",0x5BA2],
- ["CBD5",0x5751],
- ["CBD6",0xF901],
- ["CBD7",0x7CB3],
- ["CBD8",0x7FB9],
- ["CBD9",0x91B5],
- ["CBDA",0x5028],
- ["CBDB",0x53BB],
- ["CBDC",0x5C45],
- ["CBDD",0x5DE8],
- ["CBDE",0x62D2],
- ["CBDF",0x636E],
- ["CBE0",0x64DA],
- ["CBE1",0x64E7],
- ["CBE2",0x6E20],
- ["CBE3",0x70AC],
- ["CBE4",0x795B],
- ["CBE5",0x8DDD],
- ["CBE6",0x8E1E],
- ["CBE7",0xF902],
- ["CBE8",0x907D],
- ["CBE9",0x9245],
- ["CBEA",0x92F8],
- ["CBEB",0x4E7E],
- ["CBEC",0x4EF6],
- ["CBED",0x5065],
- ["CBEE",0x5DFE],
- ["CBEF",0x5EFA],
- ["CBF0",0x6106],
- ["CBF1",0x6957],
- ["CBF2",0x8171],
- ["CBF3",0x8654],
- ["CBF4",0x8E47],
- ["CBF5",0x9375],
- ["CBF6",0x9A2B],
- ["CBF7",0x4E5E],
- ["CBF8",0x5091],
- ["CBF9",0x6770],
- ["CBFA",0x6840],
- ["CBFB",0x5109],
- ["CBFC",0x528D],
- ["CBFD",0x5292],
- ["CBFE",0x6AA2],
- ["CCA1",0x77BC],
- ["CCA2",0x9210],
- ["CCA3",0x9ED4],
- ["CCA4",0x52AB],
- ["CCA5",0x602F],
- ["CCA6",0x8FF2],
- ["CCA7",0x5048],
- ["CCA8",0x61A9],
- ["CCA9",0x63ED],
- ["CCAA",0x64CA],
- ["CCAB",0x683C],
- ["CCAC",0x6A84],
- ["CCAD",0x6FC0],
- ["CCAE",0x8188],
- ["CCAF",0x89A1],
- ["CCB0",0x9694],
- ["CCB1",0x5805],
- ["CCB2",0x727D],
- ["CCB3",0x72AC],
- ["CCB4",0x7504],
- ["CCB5",0x7D79],
- ["CCB6",0x7E6D],
- ["CCB7",0x80A9],
- ["CCB8",0x898B],
- ["CCB9",0x8B74],
- ["CCBA",0x9063],
- ["CCBB",0x9D51],
- ["CCBC",0x6289],
- ["CCBD",0x6C7A],
- ["CCBE",0x6F54],
- ["CCBF",0x7D50],
- ["CCC0",0x7F3A],
- ["CCC1",0x8A23],
- ["CCC2",0x517C],
- ["CCC3",0x614A],
- ["CCC4",0x7B9D],
- ["CCC5",0x8B19],
- ["CCC6",0x9257],
- ["CCC7",0x938C],
- ["CCC8",0x4EAC],
- ["CCC9",0x4FD3],
- ["CCCA",0x501E],
- ["CCCB",0x50BE],
- ["CCCC",0x5106],
- ["CCCD",0x52C1],
- ["CCCE",0x52CD],
- ["CCCF",0x537F],
- ["CCD0",0x5770],
- ["CCD1",0x5883],
- ["CCD2",0x5E9A],
- ["CCD3",0x5F91],
- ["CCD4",0x6176],
- ["CCD5",0x61AC],
- ["CCD6",0x64CE],
- ["CCD7",0x656C],
- ["CCD8",0x666F],
- ["CCD9",0x66BB],
- ["CCDA",0x66F4],
- ["CCDB",0x6897],
- ["CCDC",0x6D87],
- ["CCDD",0x7085],
- ["CCDE",0x70F1],
- ["CCDF",0x749F],
- ["CCE0",0x74A5],
- ["CCE1",0x74CA],
- ["CCE2",0x75D9],
- ["CCE3",0x786C],
- ["CCE4",0x78EC],
- ["CCE5",0x7ADF],
- ["CCE6",0x7AF6],
- ["CCE7",0x7D45],
- ["CCE8",0x7D93],
- ["CCE9",0x8015],
- ["CCEA",0x803F],
- ["CCEB",0x811B],
- ["CCEC",0x8396],
- ["CCED",0x8B66],
- ["CCEE",0x8F15],
- ["CCEF",0x9015],
- ["CCF0",0x93E1],
- ["CCF1",0x9803],
- ["CCF2",0x9838],
- ["CCF3",0x9A5A],
- ["CCF4",0x9BE8],
- ["CCF5",0x4FC2],
- ["CCF6",0x5553],
- ["CCF7",0x583A],
- ["CCF8",0x5951],
- ["CCF9",0x5B63],
- ["CCFA",0x5C46],
- ["CCFB",0x60B8],
- ["CCFC",0x6212],
- ["CCFD",0x6842],
- ["CCFE",0x68B0],
- ["CDA1",0x68E8],
- ["CDA2",0x6EAA],
- ["CDA3",0x754C],
- ["CDA4",0x7678],
- ["CDA5",0x78CE],
- ["CDA6",0x7A3D],
- ["CDA7",0x7CFB],
- ["CDA8",0x7E6B],
- ["CDA9",0x7E7C],
- ["CDAA",0x8A08],
- ["CDAB",0x8AA1],
- ["CDAC",0x8C3F],
- ["CDAD",0x968E],
- ["CDAE",0x9DC4],
- ["CDAF",0x53E4],
- ["CDB0",0x53E9],
- ["CDB1",0x544A],
- ["CDB2",0x5471],
- ["CDB3",0x56FA],
- ["CDB4",0x59D1],
- ["CDB5",0x5B64],
- ["CDB6",0x5C3B],
- ["CDB7",0x5EAB],
- ["CDB8",0x62F7],
- ["CDB9",0x6537],
- ["CDBA",0x6545],
- ["CDBB",0x6572],
- ["CDBC",0x66A0],
- ["CDBD",0x67AF],
- ["CDBE",0x69C1],
- ["CDBF",0x6CBD],
- ["CDC0",0x75FC],
- ["CDC1",0x7690],
- ["CDC2",0x777E],
- ["CDC3",0x7A3F],
- ["CDC4",0x7F94],
- ["CDC5",0x8003],
- ["CDC6",0x80A1],
- ["CDC7",0x818F],
- ["CDC8",0x82E6],
- ["CDC9",0x82FD],
- ["CDCA",0x83F0],
- ["CDCB",0x85C1],
- ["CDCC",0x8831],
- ["CDCD",0x88B4],
- ["CDCE",0x8AA5],
- ["CDCF",0xF903],
- ["CDD0",0x8F9C],
- ["CDD1",0x932E],
- ["CDD2",0x96C7],
- ["CDD3",0x9867],
- ["CDD4",0x9AD8],
- ["CDD5",0x9F13],
- ["CDD6",0x54ED],
- ["CDD7",0x659B],
- ["CDD8",0x66F2],
- ["CDD9",0x688F],
- ["CDDA",0x7A40],
- ["CDDB",0x8C37],
- ["CDDC",0x9D60],
- ["CDDD",0x56F0],
- ["CDDE",0x5764],
- ["CDDF",0x5D11],
- ["CDE0",0x6606],
- ["CDE1",0x68B1],
- ["CDE2",0x68CD],
- ["CDE3",0x6EFE],
- ["CDE4",0x7428],
- ["CDE5",0x889E],
- ["CDE6",0x9BE4],
- ["CDE7",0x6C68],
- ["CDE8",0xF904],
- ["CDE9",0x9AA8],
- ["CDEA",0x4F9B],
- ["CDEB",0x516C],
- ["CDEC",0x5171],
- ["CDED",0x529F],
- ["CDEE",0x5B54],
- ["CDEF",0x5DE5],
- ["CDF0",0x6050],
- ["CDF1",0x606D],
- ["CDF2",0x62F1],
- ["CDF3",0x63A7],
- ["CDF4",0x653B],
- ["CDF5",0x73D9],
- ["CDF6",0x7A7A],
- ["CDF7",0x86A3],
- ["CDF8",0x8CA2],
- ["CDF9",0x978F],
- ["CDFA",0x4E32],
- ["CDFB",0x5BE1],
- ["CDFC",0x6208],
- ["CDFD",0x679C],
- ["CDFE",0x74DC],
- ["CEA1",0x79D1],
- ["CEA2",0x83D3],
- ["CEA3",0x8A87],
- ["CEA4",0x8AB2],
- ["CEA5",0x8DE8],
- ["CEA6",0x904E],
- ["CEA7",0x934B],
- ["CEA8",0x9846],
- ["CEA9",0x5ED3],
- ["CEAA",0x69E8],
- ["CEAB",0x85FF],
- ["CEAC",0x90ED],
- ["CEAD",0xF905],
- ["CEAE",0x51A0],
- ["CEAF",0x5B98],
- ["CEB0",0x5BEC],
- ["CEB1",0x6163],
- ["CEB2",0x68FA],
- ["CEB3",0x6B3E],
- ["CEB4",0x704C],
- ["CEB5",0x742F],
- ["CEB6",0x74D8],
- ["CEB7",0x7BA1],
- ["CEB8",0x7F50],
- ["CEB9",0x83C5],
- ["CEBA",0x89C0],
- ["CEBB",0x8CAB],
- ["CEBC",0x95DC],
- ["CEBD",0x9928],
- ["CEBE",0x522E],
- ["CEBF",0x605D],
- ["CEC0",0x62EC],
- ["CEC1",0x9002],
- ["CEC2",0x4F8A],
- ["CEC3",0x5149],
- ["CEC4",0x5321],
- ["CEC5",0x58D9],
- ["CEC6",0x5EE3],
- ["CEC7",0x66E0],
- ["CEC8",0x6D38],
- ["CEC9",0x709A],
- ["CECA",0x72C2],
- ["CECB",0x73D6],
- ["CECC",0x7B50],
- ["CECD",0x80F1],
- ["CECE",0x945B],
- ["CECF",0x5366],
- ["CED0",0x639B],
- ["CED1",0x7F6B],
- ["CED2",0x4E56],
- ["CED3",0x5080],
- ["CED4",0x584A],
- ["CED5",0x58DE],
- ["CED6",0x602A],
- ["CED7",0x6127],
- ["CED8",0x62D0],
- ["CED9",0x69D0],
- ["CEDA",0x9B41],
- ["CEDB",0x5B8F],
- ["CEDC",0x7D18],
- ["CEDD",0x80B1],
- ["CEDE",0x8F5F],
- ["CEDF",0x4EA4],
- ["CEE0",0x50D1],
- ["CEE1",0x54AC],
- ["CEE2",0x55AC],
- ["CEE3",0x5B0C],
- ["CEE4",0x5DA0],
- ["CEE5",0x5DE7],
- ["CEE6",0x652A],
- ["CEE7",0x654E],
- ["CEE8",0x6821],
- ["CEE9",0x6A4B],
- ["CEEA",0x72E1],
- ["CEEB",0x768E],
- ["CEEC",0x77EF],
- ["CEED",0x7D5E],
- ["CEEE",0x7FF9],
- ["CEEF",0x81A0],
- ["CEF0",0x854E],
- ["CEF1",0x86DF],
- ["CEF2",0x8F03],
- ["CEF3",0x8F4E],
- ["CEF4",0x90CA],
- ["CEF5",0x9903],
- ["CEF6",0x9A55],
- ["CEF7",0x9BAB],
- ["CEF8",0x4E18],
- ["CEF9",0x4E45],
- ["CEFA",0x4E5D],
- ["CEFB",0x4EC7],
- ["CEFC",0x4FF1],
- ["CEFD",0x5177],
- ["CEFE",0x52FE],
- ["CFA1",0x5340],
- ["CFA2",0x53E3],
- ["CFA3",0x53E5],
- ["CFA4",0x548E],
- ["CFA5",0x5614],
- ["CFA6",0x5775],
- ["CFA7",0x57A2],
- ["CFA8",0x5BC7],
- ["CFA9",0x5D87],
- ["CFAA",0x5ED0],
- ["CFAB",0x61FC],
- ["CFAC",0x62D8],
- ["CFAD",0x6551],
- ["CFAE",0x67B8],
- ["CFAF",0x67E9],
- ["CFB0",0x69CB],
- ["CFB1",0x6B50],
- ["CFB2",0x6BC6],
- ["CFB3",0x6BEC],
- ["CFB4",0x6C42],
- ["CFB5",0x6E9D],
- ["CFB6",0x7078],
- ["CFB7",0x72D7],
- ["CFB8",0x7396],
- ["CFB9",0x7403],
- ["CFBA",0x77BF],
- ["CFBB",0x77E9],
- ["CFBC",0x7A76],
- ["CFBD",0x7D7F],
- ["CFBE",0x8009],
- ["CFBF",0x81FC],
- ["CFC0",0x8205],
- ["CFC1",0x820A],
- ["CFC2",0x82DF],
- ["CFC3",0x8862],
- ["CFC4",0x8B33],
- ["CFC5",0x8CFC],
- ["CFC6",0x8EC0],
- ["CFC7",0x9011],
- ["CFC8",0x90B1],
- ["CFC9",0x9264],
- ["CFCA",0x92B6],
- ["CFCB",0x99D2],
- ["CFCC",0x9A45],
- ["CFCD",0x9CE9],
- ["CFCE",0x9DD7],
- ["CFCF",0x9F9C],
- ["CFD0",0x570B],
- ["CFD1",0x5C40],
- ["CFD2",0x83CA],
- ["CFD3",0x97A0],
- ["CFD4",0x97AB],
- ["CFD5",0x9EB4],
- ["CFD6",0x541B],
- ["CFD7",0x7A98],
- ["CFD8",0x7FA4],
- ["CFD9",0x88D9],
- ["CFDA",0x8ECD],
- ["CFDB",0x90E1],
- ["CFDC",0x5800],
- ["CFDD",0x5C48],
- ["CFDE",0x6398],
- ["CFDF",0x7A9F],
- ["CFE0",0x5BAE],
- ["CFE1",0x5F13],
- ["CFE2",0x7A79],
- ["CFE3",0x7AAE],
- ["CFE4",0x828E],
- ["CFE5",0x8EAC],
- ["CFE6",0x5026],
- ["CFE7",0x5238],
- ["CFE8",0x52F8],
- ["CFE9",0x5377],
- ["CFEA",0x5708],
- ["CFEB",0x62F3],
- ["CFEC",0x6372],
- ["CFED",0x6B0A],
- ["CFEE",0x6DC3],
- ["CFEF",0x7737],
- ["CFF0",0x53A5],
- ["CFF1",0x7357],
- ["CFF2",0x8568],
- ["CFF3",0x8E76],
- ["CFF4",0x95D5],
- ["CFF5",0x673A],
- ["CFF6",0x6AC3],
- ["CFF7",0x6F70],
- ["CFF8",0x8A6D],
- ["CFF9",0x8ECC],
- ["CFFA",0x994B],
- ["CFFB",0xF906],
- ["CFFC",0x6677],
- ["CFFD",0x6B78],
- ["CFFE",0x8CB4],
- ["D0A1",0x9B3C],
- ["D0A2",0xF907],
- ["D0A3",0x53EB],
- ["D0A4",0x572D],
- ["D0A5",0x594E],
- ["D0A6",0x63C6],
- ["D0A7",0x69FB],
- ["D0A8",0x73EA],
- ["D0A9",0x7845],
- ["D0AA",0x7ABA],
- ["D0AB",0x7AC5],
- ["D0AC",0x7CFE],
- ["D0AD",0x8475],
- ["D0AE",0x898F],
- ["D0AF",0x8D73],
- ["D0B0",0x9035],
- ["D0B1",0x95A8],
- ["D0B2",0x52FB],
- ["D0B3",0x5747],
- ["D0B4",0x7547],
- ["D0B5",0x7B60],
- ["D0B6",0x83CC],
- ["D0B7",0x921E],
- ["D0B8",0xF908],
- ["D0B9",0x6A58],
- ["D0BA",0x514B],
- ["D0BB",0x524B],
- ["D0BC",0x5287],
- ["D0BD",0x621F],
- ["D0BE",0x68D8],
- ["D0BF",0x6975],
- ["D0C0",0x9699],
- ["D0C1",0x50C5],
- ["D0C2",0x52A4],
- ["D0C3",0x52E4],
- ["D0C4",0x61C3],
- ["D0C5",0x65A4],
- ["D0C6",0x6839],
- ["D0C7",0x69FF],
- ["D0C8",0x747E],
- ["D0C9",0x7B4B],
- ["D0CA",0x82B9],
- ["D0CB",0x83EB],
- ["D0CC",0x89B2],
- ["D0CD",0x8B39],
- ["D0CE",0x8FD1],
- ["D0CF",0x9949],
- ["D0D0",0xF909],
- ["D0D1",0x4ECA],
- ["D0D2",0x5997],
- ["D0D3",0x64D2],
- ["D0D4",0x6611],
- ["D0D5",0x6A8E],
- ["D0D6",0x7434],
- ["D0D7",0x7981],
- ["D0D8",0x79BD],
- ["D0D9",0x82A9],
- ["D0DA",0x887E],
- ["D0DB",0x887F],
- ["D0DC",0x895F],
- ["D0DD",0xF90A],
- ["D0DE",0x9326],
- ["D0DF",0x4F0B],
- ["D0E0",0x53CA],
- ["D0E1",0x6025],
- ["D0E2",0x6271],
- ["D0E3",0x6C72],
- ["D0E4",0x7D1A],
- ["D0E5",0x7D66],
- ["D0E6",0x4E98],
- ["D0E7",0x5162],
- ["D0E8",0x77DC],
- ["D0E9",0x80AF],
- ["D0EA",0x4F01],
- ["D0EB",0x4F0E],
- ["D0EC",0x5176],
- ["D0ED",0x5180],
- ["D0EE",0x55DC],
- ["D0EF",0x5668],
- ["D0F0",0x573B],
- ["D0F1",0x57FA],
- ["D0F2",0x57FC],
- ["D0F3",0x5914],
- ["D0F4",0x5947],
- ["D0F5",0x5993],
- ["D0F6",0x5BC4],
- ["D0F7",0x5C90],
- ["D0F8",0x5D0E],
- ["D0F9",0x5DF1],
- ["D0FA",0x5E7E],
- ["D0FB",0x5FCC],
- ["D0FC",0x6280],
- ["D0FD",0x65D7],
- ["D0FE",0x65E3],
- ["D1A1",0x671E],
- ["D1A2",0x671F],
- ["D1A3",0x675E],
- ["D1A4",0x68CB],
- ["D1A5",0x68C4],
- ["D1A6",0x6A5F],
- ["D1A7",0x6B3A],
- ["D1A8",0x6C23],
- ["D1A9",0x6C7D],
- ["D1AA",0x6C82],
- ["D1AB",0x6DC7],
- ["D1AC",0x7398],
- ["D1AD",0x7426],
- ["D1AE",0x742A],
- ["D1AF",0x7482],
- ["D1B0",0x74A3],
- ["D1B1",0x7578],
- ["D1B2",0x757F],
- ["D1B3",0x7881],
- ["D1B4",0x78EF],
- ["D1B5",0x7941],
- ["D1B6",0x7947],
- ["D1B7",0x7948],
- ["D1B8",0x797A],
- ["D1B9",0x7B95],
- ["D1BA",0x7D00],
- ["D1BB",0x7DBA],
- ["D1BC",0x7F88],
- ["D1BD",0x8006],
- ["D1BE",0x802D],
- ["D1BF",0x808C],
- ["D1C0",0x8A18],
- ["D1C1",0x8B4F],
- ["D1C2",0x8C48],
- ["D1C3",0x8D77],
- ["D1C4",0x9321],
- ["D1C5",0x9324],
- ["D1C6",0x98E2],
- ["D1C7",0x9951],
- ["D1C8",0x9A0E],
- ["D1C9",0x9A0F],
- ["D1CA",0x9A65],
- ["D1CB",0x9E92],
- ["D1CC",0x7DCA],
- ["D1CD",0x4F76],
- ["D1CE",0x5409],
- ["D1CF",0x62EE],
- ["D1D0",0x6854],
- ["D1D1",0x91D1],
- ["D1D2",0x55AB],
- ["D1D3",0x513A],
- ["D1D4",0xF90B],
- ["D1D5",0xF90C],
- ["D1D6",0x5A1C],
- ["D1D7",0x61E6],
- ["D1D8",0xF90D],
- ["D1D9",0x62CF],
- ["D1DA",0x62FF],
- ["D1DB",0xF90E],
- ["D1DC",0xF90F],
- ["D1DD",0xF910],
- ["D1DE",0xF911],
- ["D1DF",0xF912],
- ["D1E0",0xF913],
- ["D1E1",0x90A3],
- ["D1E2",0xF914],
- ["D1E3",0xF915],
- ["D1E4",0xF916],
- ["D1E5",0xF917],
- ["D1E6",0xF918],
- ["D1E7",0x8AFE],
- ["D1E8",0xF919],
- ["D1E9",0xF91A],
- ["D1EA",0xF91B],
- ["D1EB",0xF91C],
- ["D1EC",0x6696],
- ["D1ED",0xF91D],
- ["D1EE",0x7156],
- ["D1EF",0xF91E],
- ["D1F0",0xF91F],
- ["D1F1",0x96E3],
- ["D1F2",0xF920],
- ["D1F3",0x634F],
- ["D1F4",0x637A],
- ["D1F5",0x5357],
- ["D1F6",0xF921],
- ["D1F7",0x678F],
- ["D1F8",0x6960],
- ["D1F9",0x6E73],
- ["D1FA",0xF922],
- ["D1FB",0x7537],
- ["D1FC",0xF923],
- ["D1FD",0xF924],
- ["D1FE",0xF925],
- ["D2A1",0x7D0D],
- ["D2A2",0xF926],
- ["D2A3",0xF927],
- ["D2A4",0x8872],
- ["D2A5",0x56CA],
- ["D2A6",0x5A18],
- ["D2A7",0xF928],
- ["D2A8",0xF929],
- ["D2A9",0xF92A],
- ["D2AA",0xF92B],
- ["D2AB",0xF92C],
- ["D2AC",0x4E43],
- ["D2AD",0xF92D],
- ["D2AE",0x5167],
- ["D2AF",0x5948],
- ["D2B0",0x67F0],
- ["D2B1",0x8010],
- ["D2B2",0xF92E],
- ["D2B3",0x5973],
- ["D2B4",0x5E74],
- ["D2B5",0x649A],
- ["D2B6",0x79CA],
- ["D2B7",0x5FF5],
- ["D2B8",0x606C],
- ["D2B9",0x62C8],
- ["D2BA",0x637B],
- ["D2BB",0x5BE7],
- ["D2BC",0x5BD7],
- ["D2BD",0x52AA],
- ["D2BE",0xF92F],
- ["D2BF",0x5974],
- ["D2C0",0x5F29],
- ["D2C1",0x6012],
- ["D2C2",0xF930],
- ["D2C3",0xF931],
- ["D2C4",0xF932],
- ["D2C5",0x7459],
- ["D2C6",0xF933],
- ["D2C7",0xF934],
- ["D2C8",0xF935],
- ["D2C9",0xF936],
- ["D2CA",0xF937],
- ["D2CB",0xF938],
- ["D2CC",0x99D1],
- ["D2CD",0xF939],
- ["D2CE",0xF93A],
- ["D2CF",0xF93B],
- ["D2D0",0xF93C],
- ["D2D1",0xF93D],
- ["D2D2",0xF93E],
- ["D2D3",0xF93F],
- ["D2D4",0xF940],
- ["D2D5",0xF941],
- ["D2D6",0xF942],
- ["D2D7",0xF943],
- ["D2D8",0x6FC3],
- ["D2D9",0xF944],
- ["D2DA",0xF945],
- ["D2DB",0x81BF],
- ["D2DC",0x8FB2],
- ["D2DD",0x60F1],
- ["D2DE",0xF946],
- ["D2DF",0xF947],
- ["D2E0",0x8166],
- ["D2E1",0xF948],
- ["D2E2",0xF949],
- ["D2E3",0x5C3F],
- ["D2E4",0xF94A],
- ["D2E5",0xF94B],
- ["D2E6",0xF94C],
- ["D2E7",0xF94D],
- ["D2E8",0xF94E],
- ["D2E9",0xF94F],
- ["D2EA",0xF950],
- ["D2EB",0xF951],
- ["D2EC",0x5AE9],
- ["D2ED",0x8A25],
- ["D2EE",0x677B],
- ["D2EF",0x7D10],
- ["D2F0",0xF952],
- ["D2F1",0xF953],
- ["D2F2",0xF954],
- ["D2F3",0xF955],
- ["D2F4",0xF956],
- ["D2F5",0xF957],
- ["D2F6",0x80FD],
- ["D2F7",0xF958],
- ["D2F8",0xF959],
- ["D2F9",0x5C3C],
- ["D2FA",0x6CE5],
- ["D2FB",0x533F],
- ["D2FC",0x6EBA],
- ["D2FD",0x591A],
- ["D2FE",0x8336],
- ["D3A1",0x4E39],
- ["D3A2",0x4EB6],
- ["D3A3",0x4F46],
- ["D3A4",0x55AE],
- ["D3A5",0x5718],
- ["D3A6",0x58C7],
- ["D3A7",0x5F56],
- ["D3A8",0x65B7],
- ["D3A9",0x65E6],
- ["D3AA",0x6A80],
- ["D3AB",0x6BB5],
- ["D3AC",0x6E4D],
- ["D3AD",0x77ED],
- ["D3AE",0x7AEF],
- ["D3AF",0x7C1E],
- ["D3B0",0x7DDE],
- ["D3B1",0x86CB],
- ["D3B2",0x8892],
- ["D3B3",0x9132],
- ["D3B4",0x935B],
- ["D3B5",0x64BB],
- ["D3B6",0x6FBE],
- ["D3B7",0x737A],
- ["D3B8",0x75B8],
- ["D3B9",0x9054],
- ["D3BA",0x5556],
- ["D3BB",0x574D],
- ["D3BC",0x61BA],
- ["D3BD",0x64D4],
- ["D3BE",0x66C7],
- ["D3BF",0x6DE1],
- ["D3C0",0x6E5B],
- ["D3C1",0x6F6D],
- ["D3C2",0x6FB9],
- ["D3C3",0x75F0],
- ["D3C4",0x8043],
- ["D3C5",0x81BD],
- ["D3C6",0x8541],
- ["D3C7",0x8983],
- ["D3C8",0x8AC7],
- ["D3C9",0x8B5A],
- ["D3CA",0x931F],
- ["D3CB",0x6C93],
- ["D3CC",0x7553],
- ["D3CD",0x7B54],
- ["D3CE",0x8E0F],
- ["D3CF",0x905D],
- ["D3D0",0x5510],
- ["D3D1",0x5802],
- ["D3D2",0x5858],
- ["D3D3",0x5E62],
- ["D3D4",0x6207],
- ["D3D5",0x649E],
- ["D3D6",0x68E0],
- ["D3D7",0x7576],
- ["D3D8",0x7CD6],
- ["D3D9",0x87B3],
- ["D3DA",0x9EE8],
- ["D3DB",0x4EE3],
- ["D3DC",0x5788],
- ["D3DD",0x576E],
- ["D3DE",0x5927],
- ["D3DF",0x5C0D],
- ["D3E0",0x5CB1],
- ["D3E1",0x5E36],
- ["D3E2",0x5F85],
- ["D3E3",0x6234],
- ["D3E4",0x64E1],
- ["D3E5",0x73B3],
- ["D3E6",0x81FA],
- ["D3E7",0x888B],
- ["D3E8",0x8CB8],
- ["D3E9",0x968A],
- ["D3EA",0x9EDB],
- ["D3EB",0x5B85],
- ["D3EC",0x5FB7],
- ["D3ED",0x60B3],
- ["D3EE",0x5012],
- ["D3EF",0x5200],
- ["D3F0",0x5230],
- ["D3F1",0x5716],
- ["D3F2",0x5835],
- ["D3F3",0x5857],
- ["D3F4",0x5C0E],
- ["D3F5",0x5C60],
- ["D3F6",0x5CF6],
- ["D3F7",0x5D8B],
- ["D3F8",0x5EA6],
- ["D3F9",0x5F92],
- ["D3FA",0x60BC],
- ["D3FB",0x6311],
- ["D3FC",0x6389],
- ["D3FD",0x6417],
- ["D3FE",0x6843],
- ["D4A1",0x68F9],
- ["D4A2",0x6AC2],
- ["D4A3",0x6DD8],
- ["D4A4",0x6E21],
- ["D4A5",0x6ED4],
- ["D4A6",0x6FE4],
- ["D4A7",0x71FE],
- ["D4A8",0x76DC],
- ["D4A9",0x7779],
- ["D4AA",0x79B1],
- ["D4AB",0x7A3B],
- ["D4AC",0x8404],
- ["D4AD",0x89A9],
- ["D4AE",0x8CED],
- ["D4AF",0x8DF3],
- ["D4B0",0x8E48],
- ["D4B1",0x9003],
- ["D4B2",0x9014],
- ["D4B3",0x9053],
- ["D4B4",0x90FD],
- ["D4B5",0x934D],
- ["D4B6",0x9676],
- ["D4B7",0x97DC],
- ["D4B8",0x6BD2],
- ["D4B9",0x7006],
- ["D4BA",0x7258],
- ["D4BB",0x72A2],
- ["D4BC",0x7368],
- ["D4BD",0x7763],
- ["D4BE",0x79BF],
- ["D4BF",0x7BE4],
- ["D4C0",0x7E9B],
- ["D4C1",0x8B80],
- ["D4C2",0x58A9],
- ["D4C3",0x60C7],
- ["D4C4",0x6566],
- ["D4C5",0x65FD],
- ["D4C6",0x66BE],
- ["D4C7",0x6C8C],
- ["D4C8",0x711E],
- ["D4C9",0x71C9],
- ["D4CA",0x8C5A],
- ["D4CB",0x9813],
- ["D4CC",0x4E6D],
- ["D4CD",0x7A81],
- ["D4CE",0x4EDD],
- ["D4CF",0x51AC],
- ["D4D0",0x51CD],
- ["D4D1",0x52D5],
- ["D4D2",0x540C],
- ["D4D3",0x61A7],
- ["D4D4",0x6771],
- ["D4D5",0x6850],
- ["D4D6",0x68DF],
- ["D4D7",0x6D1E],
- ["D4D8",0x6F7C],
- ["D4D9",0x75BC],
- ["D4DA",0x77B3],
- ["D4DB",0x7AE5],
- ["D4DC",0x80F4],
- ["D4DD",0x8463],
- ["D4DE",0x9285],
- ["D4DF",0x515C],
- ["D4E0",0x6597],
- ["D4E1",0x675C],
- ["D4E2",0x6793],
- ["D4E3",0x75D8],
- ["D4E4",0x7AC7],
- ["D4E5",0x8373],
- ["D4E6",0xF95A],
- ["D4E7",0x8C46],
- ["D4E8",0x9017],
- ["D4E9",0x982D],
- ["D4EA",0x5C6F],
- ["D4EB",0x81C0],
- ["D4EC",0x829A],
- ["D4ED",0x9041],
- ["D4EE",0x906F],
- ["D4EF",0x920D],
- ["D4F0",0x5F97],
- ["D4F1",0x5D9D],
- ["D4F2",0x6A59],
- ["D4F3",0x71C8],
- ["D4F4",0x767B],
- ["D4F5",0x7B49],
- ["D4F6",0x85E4],
- ["D4F7",0x8B04],
- ["D4F8",0x9127],
- ["D4F9",0x9A30],
- ["D4FA",0x5587],
- ["D4FB",0x61F6],
- ["D4FC",0xF95B],
- ["D4FD",0x7669],
- ["D4FE",0x7F85],
- ["D5A1",0x863F],
- ["D5A2",0x87BA],
- ["D5A3",0x88F8],
- ["D5A4",0x908F],
- ["D5A5",0xF95C],
- ["D5A6",0x6D1B],
- ["D5A7",0x70D9],
- ["D5A8",0x73DE],
- ["D5A9",0x7D61],
- ["D5AA",0x843D],
- ["D5AB",0xF95D],
- ["D5AC",0x916A],
- ["D5AD",0x99F1],
- ["D5AE",0xF95E],
- ["D5AF",0x4E82],
- ["D5B0",0x5375],
- ["D5B1",0x6B04],
- ["D5B2",0x6B12],
- ["D5B3",0x703E],
- ["D5B4",0x721B],
- ["D5B5",0x862D],
- ["D5B6",0x9E1E],
- ["D5B7",0x524C],
- ["D5B8",0x8FA3],
- ["D5B9",0x5D50],
- ["D5BA",0x64E5],
- ["D5BB",0x652C],
- ["D5BC",0x6B16],
- ["D5BD",0x6FEB],
- ["D5BE",0x7C43],
- ["D5BF",0x7E9C],
- ["D5C0",0x85CD],
- ["D5C1",0x8964],
- ["D5C2",0x89BD],
- ["D5C3",0x62C9],
- ["D5C4",0x81D8],
- ["D5C5",0x881F],
- ["D5C6",0x5ECA],
- ["D5C7",0x6717],
- ["D5C8",0x6D6A],
- ["D5C9",0x72FC],
- ["D5CA",0x7405],
- ["D5CB",0x746F],
- ["D5CC",0x8782],
- ["D5CD",0x90DE],
- ["D5CE",0x4F86],
- ["D5CF",0x5D0D],
- ["D5D0",0x5FA0],
- ["D5D1",0x840A],
- ["D5D2",0x51B7],
- ["D5D3",0x63A0],
- ["D5D4",0x7565],
- ["D5D5",0x4EAE],
- ["D5D6",0x5006],
- ["D5D7",0x5169],
- ["D5D8",0x51C9],
- ["D5D9",0x6881],
- ["D5DA",0x6A11],
- ["D5DB",0x7CAE],
- ["D5DC",0x7CB1],
- ["D5DD",0x7CE7],
- ["D5DE",0x826F],
- ["D5DF",0x8AD2],
- ["D5E0",0x8F1B],
- ["D5E1",0x91CF],
- ["D5E2",0x4FB6],
- ["D5E3",0x5137],
- ["D5E4",0x52F5],
- ["D5E5",0x5442],
- ["D5E6",0x5EEC],
- ["D5E7",0x616E],
- ["D5E8",0x623E],
- ["D5E9",0x65C5],
- ["D5EA",0x6ADA],
- ["D5EB",0x6FFE],
- ["D5EC",0x792A],
- ["D5ED",0x85DC],
- ["D5EE",0x8823],
- ["D5EF",0x95AD],
- ["D5F0",0x9A62],
- ["D5F1",0x9A6A],
- ["D5F2",0x9E97],
- ["D5F3",0x9ECE],
- ["D5F4",0x529B],
- ["D5F5",0x66C6],
- ["D5F6",0x6B77],
- ["D5F7",0x701D],
- ["D5F8",0x792B],
- ["D5F9",0x8F62],
- ["D5FA",0x9742],
- ["D5FB",0x6190],
- ["D5FC",0x6200],
- ["D5FD",0x6523],
- ["D5FE",0x6F23],
- ["D6A1",0x7149],
- ["D6A2",0x7489],
- ["D6A3",0x7DF4],
- ["D6A4",0x806F],
- ["D6A5",0x84EE],
- ["D6A6",0x8F26],
- ["D6A7",0x9023],
- ["D6A8",0x934A],
- ["D6A9",0x51BD],
- ["D6AA",0x5217],
- ["D6AB",0x52A3],
- ["D6AC",0x6D0C],
- ["D6AD",0x70C8],
- ["D6AE",0x88C2],
- ["D6AF",0x5EC9],
- ["D6B0",0x6582],
- ["D6B1",0x6BAE],
- ["D6B2",0x6FC2],
- ["D6B3",0x7C3E],
- ["D6B4",0x7375],
- ["D6B5",0x4EE4],
- ["D6B6",0x4F36],
- ["D6B7",0x56F9],
- ["D6B8",0xF95F],
- ["D6B9",0x5CBA],
- ["D6BA",0x5DBA],
- ["D6BB",0x601C],
- ["D6BC",0x73B2],
- ["D6BD",0x7B2D],
- ["D6BE",0x7F9A],
- ["D6BF",0x7FCE],
- ["D6C0",0x8046],
- ["D6C1",0x901E],
- ["D6C2",0x9234],
- ["D6C3",0x96F6],
- ["D6C4",0x9748],
- ["D6C5",0x9818],
- ["D6C6",0x9F61],
- ["D6C7",0x4F8B],
- ["D6C8",0x6FA7],
- ["D6C9",0x79AE],
- ["D6CA",0x91B4],
- ["D6CB",0x96B7],
- ["D6CC",0x52DE],
- ["D6CD",0xF960],
- ["D6CE",0x6488],
- ["D6CF",0x64C4],
- ["D6D0",0x6AD3],
- ["D6D1",0x6F5E],
- ["D6D2",0x7018],
- ["D6D3",0x7210],
- ["D6D4",0x76E7],
- ["D6D5",0x8001],
- ["D6D6",0x8606],
- ["D6D7",0x865C],
- ["D6D8",0x8DEF],
- ["D6D9",0x8F05],
- ["D6DA",0x9732],
- ["D6DB",0x9B6F],
- ["D6DC",0x9DFA],
- ["D6DD",0x9E75],
- ["D6DE",0x788C],
- ["D6DF",0x797F],
- ["D6E0",0x7DA0],
- ["D6E1",0x83C9],
- ["D6E2",0x9304],
- ["D6E3",0x9E7F],
- ["D6E4",0x9E93],
- ["D6E5",0x8AD6],
- ["D6E6",0x58DF],
- ["D6E7",0x5F04],
- ["D6E8",0x6727],
- ["D6E9",0x7027],
- ["D6EA",0x74CF],
- ["D6EB",0x7C60],
- ["D6EC",0x807E],
- ["D6ED",0x5121],
- ["D6EE",0x7028],
- ["D6EF",0x7262],
- ["D6F0",0x78CA],
- ["D6F1",0x8CC2],
- ["D6F2",0x8CDA],
- ["D6F3",0x8CF4],
- ["D6F4",0x96F7],
- ["D6F5",0x4E86],
- ["D6F6",0x50DA],
- ["D6F7",0x5BEE],
- ["D6F8",0x5ED6],
- ["D6F9",0x6599],
- ["D6FA",0x71CE],
- ["D6FB",0x7642],
- ["D6FC",0x77AD],
- ["D6FD",0x804A],
- ["D6FE",0x84FC],
- ["D7A1",0x907C],
- ["D7A2",0x9B27],
- ["D7A3",0x9F8D],
- ["D7A4",0x58D8],
- ["D7A5",0x5A41],
- ["D7A6",0x5C62],
- ["D7A7",0x6A13],
- ["D7A8",0x6DDA],
- ["D7A9",0x6F0F],
- ["D7AA",0x763B],
- ["D7AB",0x7D2F],
- ["D7AC",0x7E37],
- ["D7AD",0x851E],
- ["D7AE",0x8938],
- ["D7AF",0x93E4],
- ["D7B0",0x964B],
- ["D7B1",0x5289],
- ["D7B2",0x65D2],
- ["D7B3",0x67F3],
- ["D7B4",0x69B4],
- ["D7B5",0x6D41],
- ["D7B6",0x6E9C],
- ["D7B7",0x700F],
- ["D7B8",0x7409],
- ["D7B9",0x7460],
- ["D7BA",0x7559],
- ["D7BB",0x7624],
- ["D7BC",0x786B],
- ["D7BD",0x8B2C],
- ["D7BE",0x985E],
- ["D7BF",0x516D],
- ["D7C0",0x622E],
- ["D7C1",0x9678],
- ["D7C2",0x4F96],
- ["D7C3",0x502B],
- ["D7C4",0x5D19],
- ["D7C5",0x6DEA],
- ["D7C6",0x7DB8],
- ["D7C7",0x8F2A],
- ["D7C8",0x5F8B],
- ["D7C9",0x6144],
- ["D7CA",0x6817],
- ["D7CB",0xF961],
- ["D7CC",0x9686],
- ["D7CD",0x52D2],
- ["D7CE",0x808B],
- ["D7CF",0x51DC],
- ["D7D0",0x51CC],
- ["D7D1",0x695E],
- ["D7D2",0x7A1C],
- ["D7D3",0x7DBE],
- ["D7D4",0x83F1],
- ["D7D5",0x9675],
- ["D7D6",0x4FDA],
- ["D7D7",0x5229],
- ["D7D8",0x5398],
- ["D7D9",0x540F],
- ["D7DA",0x550E],
- ["D7DB",0x5C65],
- ["D7DC",0x60A7],
- ["D7DD",0x674E],
- ["D7DE",0x68A8],
- ["D7DF",0x6D6C],
- ["D7E0",0x7281],
- ["D7E1",0x72F8],
- ["D7E2",0x7406],
- ["D7E3",0x7483],
- ["D7E4",0xF962],
- ["D7E5",0x75E2],
- ["D7E6",0x7C6C],
- ["D7E7",0x7F79],
- ["D7E8",0x7FB8],
- ["D7E9",0x8389],
- ["D7EA",0x88CF],
- ["D7EB",0x88E1],
- ["D7EC",0x91CC],
- ["D7ED",0x91D0],
- ["D7EE",0x96E2],
- ["D7EF",0x9BC9],
- ["D7F0",0x541D],
- ["D7F1",0x6F7E],
- ["D7F2",0x71D0],
- ["D7F3",0x7498],
- ["D7F4",0x85FA],
- ["D7F5",0x8EAA],
- ["D7F6",0x96A3],
- ["D7F7",0x9C57],
- ["D7F8",0x9E9F],
- ["D7F9",0x6797],
- ["D7FA",0x6DCB],
- ["D7FB",0x7433],
- ["D7FC",0x81E8],
- ["D7FD",0x9716],
- ["D7FE",0x782C],
- ["D8A1",0x7ACB],
- ["D8A2",0x7B20],
- ["D8A3",0x7C92],
- ["D8A4",0x6469],
- ["D8A5",0x746A],
- ["D8A6",0x75F2],
- ["D8A7",0x78BC],
- ["D8A8",0x78E8],
- ["D8A9",0x99AC],
- ["D8AA",0x9B54],
- ["D8AB",0x9EBB],
- ["D8AC",0x5BDE],
- ["D8AD",0x5E55],
- ["D8AE",0x6F20],
- ["D8AF",0x819C],
- ["D8B0",0x83AB],
- ["D8B1",0x9088],
- ["D8B2",0x4E07],
- ["D8B3",0x534D],
- ["D8B4",0x5A29],
- ["D8B5",0x5DD2],
- ["D8B6",0x5F4E],
- ["D8B7",0x6162],
- ["D8B8",0x633D],
- ["D8B9",0x6669],
- ["D8BA",0x66FC],
- ["D8BB",0x6EFF],
- ["D8BC",0x6F2B],
- ["D8BD",0x7063],
- ["D8BE",0x779E],
- ["D8BF",0x842C],
- ["D8C0",0x8513],
- ["D8C1",0x883B],
- ["D8C2",0x8F13],
- ["D8C3",0x9945],
- ["D8C4",0x9C3B],
- ["D8C5",0x551C],
- ["D8C6",0x62B9],
- ["D8C7",0x672B],
- ["D8C8",0x6CAB],
- ["D8C9",0x8309],
- ["D8CA",0x896A],
- ["D8CB",0x977A],
- ["D8CC",0x4EA1],
- ["D8CD",0x5984],
- ["D8CE",0x5FD8],
- ["D8CF",0x5FD9],
- ["D8D0",0x671B],
- ["D8D1",0x7DB2],
- ["D8D2",0x7F54],
- ["D8D3",0x8292],
- ["D8D4",0x832B],
- ["D8D5",0x83BD],
- ["D8D6",0x8F1E],
- ["D8D7",0x9099],
- ["D8D8",0x57CB],
- ["D8D9",0x59B9],
- ["D8DA",0x5A92],
- ["D8DB",0x5BD0],
- ["D8DC",0x6627],
- ["D8DD",0x679A],
- ["D8DE",0x6885],
- ["D8DF",0x6BCF],
- ["D8E0",0x7164],
- ["D8E1",0x7F75],
- ["D8E2",0x8CB7],
- ["D8E3",0x8CE3],
- ["D8E4",0x9081],
- ["D8E5",0x9B45],
- ["D8E6",0x8108],
- ["D8E7",0x8C8A],
- ["D8E8",0x964C],
- ["D8E9",0x9A40],
- ["D8EA",0x9EA5],
- ["D8EB",0x5B5F],
- ["D8EC",0x6C13],
- ["D8ED",0x731B],
- ["D8EE",0x76F2],
- ["D8EF",0x76DF],
- ["D8F0",0x840C],
- ["D8F1",0x51AA],
- ["D8F2",0x8993],
- ["D8F3",0x514D],
- ["D8F4",0x5195],
- ["D8F5",0x52C9],
- ["D8F6",0x68C9],
- ["D8F7",0x6C94],
- ["D8F8",0x7704],
- ["D8F9",0x7720],
- ["D8FA",0x7DBF],
- ["D8FB",0x7DEC],
- ["D8FC",0x9762],
- ["D8FD",0x9EB5],
- ["D8FE",0x6EC5],
- ["D9A1",0x8511],
- ["D9A2",0x51A5],
- ["D9A3",0x540D],
- ["D9A4",0x547D],
- ["D9A5",0x660E],
- ["D9A6",0x669D],
- ["D9A7",0x6927],
- ["D9A8",0x6E9F],
- ["D9A9",0x76BF],
- ["D9AA",0x7791],
- ["D9AB",0x8317],
- ["D9AC",0x84C2],
- ["D9AD",0x879F],
- ["D9AE",0x9169],
- ["D9AF",0x9298],
- ["D9B0",0x9CF4],
- ["D9B1",0x8882],
- ["D9B2",0x4FAE],
- ["D9B3",0x5192],
- ["D9B4",0x52DF],
- ["D9B5",0x59C6],
- ["D9B6",0x5E3D],
- ["D9B7",0x6155],
- ["D9B8",0x6478],
- ["D9B9",0x6479],
- ["D9BA",0x66AE],
- ["D9BB",0x67D0],
- ["D9BC",0x6A21],
- ["D9BD",0x6BCD],
- ["D9BE",0x6BDB],
- ["D9BF",0x725F],
- ["D9C0",0x7261],
- ["D9C1",0x7441],
- ["D9C2",0x7738],
- ["D9C3",0x77DB],
- ["D9C4",0x8017],
- ["D9C5",0x82BC],
- ["D9C6",0x8305],
- ["D9C7",0x8B00],
- ["D9C8",0x8B28],
- ["D9C9",0x8C8C],
- ["D9CA",0x6728],
- ["D9CB",0x6C90],
- ["D9CC",0x7267],
- ["D9CD",0x76EE],
- ["D9CE",0x7766],
- ["D9CF",0x7A46],
- ["D9D0",0x9DA9],
- ["D9D1",0x6B7F],
- ["D9D2",0x6C92],
- ["D9D3",0x5922],
- ["D9D4",0x6726],
- ["D9D5",0x8499],
- ["D9D6",0x536F],
- ["D9D7",0x5893],
- ["D9D8",0x5999],
- ["D9D9",0x5EDF],
- ["D9DA",0x63CF],
- ["D9DB",0x6634],
- ["D9DC",0x6773],
- ["D9DD",0x6E3A],
- ["D9DE",0x732B],
- ["D9DF",0x7AD7],
- ["D9E0",0x82D7],
- ["D9E1",0x9328],
- ["D9E2",0x52D9],
- ["D9E3",0x5DEB],
- ["D9E4",0x61AE],
- ["D9E5",0x61CB],
- ["D9E6",0x620A],
- ["D9E7",0x62C7],
- ["D9E8",0x64AB],
- ["D9E9",0x65E0],
- ["D9EA",0x6959],
- ["D9EB",0x6B66],
- ["D9EC",0x6BCB],
- ["D9ED",0x7121],
- ["D9EE",0x73F7],
- ["D9EF",0x755D],
- ["D9F0",0x7E46],
- ["D9F1",0x821E],
- ["D9F2",0x8302],
- ["D9F3",0x856A],
- ["D9F4",0x8AA3],
- ["D9F5",0x8CBF],
- ["D9F6",0x9727],
- ["D9F7",0x9D61],
- ["D9F8",0x58A8],
- ["D9F9",0x9ED8],
- ["D9FA",0x5011],
- ["D9FB",0x520E],
- ["D9FC",0x543B],
- ["D9FD",0x554F],
- ["D9FE",0x6587],
- ["DAA1",0x6C76],
- ["DAA2",0x7D0A],
- ["DAA3",0x7D0B],
- ["DAA4",0x805E],
- ["DAA5",0x868A],
- ["DAA6",0x9580],
- ["DAA7",0x96EF],
- ["DAA8",0x52FF],
- ["DAA9",0x6C95],
- ["DAAA",0x7269],
- ["DAAB",0x5473],
- ["DAAC",0x5A9A],
- ["DAAD",0x5C3E],
- ["DAAE",0x5D4B],
- ["DAAF",0x5F4C],
- ["DAB0",0x5FAE],
- ["DAB1",0x672A],
- ["DAB2",0x68B6],
- ["DAB3",0x6963],
- ["DAB4",0x6E3C],
- ["DAB5",0x6E44],
- ["DAB6",0x7709],
- ["DAB7",0x7C73],
- ["DAB8",0x7F8E],
- ["DAB9",0x8587],
- ["DABA",0x8B0E],
- ["DABB",0x8FF7],
- ["DABC",0x9761],
- ["DABD",0x9EF4],
- ["DABE",0x5CB7],
- ["DABF",0x60B6],
- ["DAC0",0x610D],
- ["DAC1",0x61AB],
- ["DAC2",0x654F],
- ["DAC3",0x65FB],
- ["DAC4",0x65FC],
- ["DAC5",0x6C11],
- ["DAC6",0x6CEF],
- ["DAC7",0x739F],
- ["DAC8",0x73C9],
- ["DAC9",0x7DE1],
- ["DACA",0x9594],
- ["DACB",0x5BC6],
- ["DACC",0x871C],
- ["DACD",0x8B10],
- ["DACE",0x525D],
- ["DACF",0x535A],
- ["DAD0",0x62CD],
- ["DAD1",0x640F],
- ["DAD2",0x64B2],
- ["DAD3",0x6734],
- ["DAD4",0x6A38],
- ["DAD5",0x6CCA],
- ["DAD6",0x73C0],
- ["DAD7",0x749E],
- ["DAD8",0x7B94],
- ["DAD9",0x7C95],
- ["DADA",0x7E1B],
- ["DADB",0x818A],
- ["DADC",0x8236],
- ["DADD",0x8584],
- ["DADE",0x8FEB],
- ["DADF",0x96F9],
- ["DAE0",0x99C1],
- ["DAE1",0x4F34],
- ["DAE2",0x534A],
- ["DAE3",0x53CD],
- ["DAE4",0x53DB],
- ["DAE5",0x62CC],
- ["DAE6",0x642C],
- ["DAE7",0x6500],
- ["DAE8",0x6591],
- ["DAE9",0x69C3],
- ["DAEA",0x6CEE],
- ["DAEB",0x6F58],
- ["DAEC",0x73ED],
- ["DAED",0x7554],
- ["DAEE",0x7622],
- ["DAEF",0x76E4],
- ["DAF0",0x76FC],
- ["DAF1",0x78D0],
- ["DAF2",0x78FB],
- ["DAF3",0x792C],
- ["DAF4",0x7D46],
- ["DAF5",0x822C],
- ["DAF6",0x87E0],
- ["DAF7",0x8FD4],
- ["DAF8",0x9812],
- ["DAF9",0x98EF],
- ["DAFA",0x52C3],
- ["DAFB",0x62D4],
- ["DAFC",0x64A5],
- ["DAFD",0x6E24],
- ["DAFE",0x6F51],
- ["DBA1",0x767C],
- ["DBA2",0x8DCB],
- ["DBA3",0x91B1],
- ["DBA4",0x9262],
- ["DBA5",0x9AEE],
- ["DBA6",0x9B43],
- ["DBA7",0x5023],
- ["DBA8",0x508D],
- ["DBA9",0x574A],
- ["DBAA",0x59A8],
- ["DBAB",0x5C28],
- ["DBAC",0x5E47],
- ["DBAD",0x5F77],
- ["DBAE",0x623F],
- ["DBAF",0x653E],
- ["DBB0",0x65B9],
- ["DBB1",0x65C1],
- ["DBB2",0x6609],
- ["DBB3",0x678B],
- ["DBB4",0x699C],
- ["DBB5",0x6EC2],
- ["DBB6",0x78C5],
- ["DBB7",0x7D21],
- ["DBB8",0x80AA],
- ["DBB9",0x8180],
- ["DBBA",0x822B],
- ["DBBB",0x82B3],
- ["DBBC",0x84A1],
- ["DBBD",0x868C],
- ["DBBE",0x8A2A],
- ["DBBF",0x8B17],
- ["DBC0",0x90A6],
- ["DBC1",0x9632],
- ["DBC2",0x9F90],
- ["DBC3",0x500D],
- ["DBC4",0x4FF3],
- ["DBC5",0xF963],
- ["DBC6",0x57F9],
- ["DBC7",0x5F98],
- ["DBC8",0x62DC],
- ["DBC9",0x6392],
- ["DBCA",0x676F],
- ["DBCB",0x6E43],
- ["DBCC",0x7119],
- ["DBCD",0x76C3],
- ["DBCE",0x80CC],
- ["DBCF",0x80DA],
- ["DBD0",0x88F4],
- ["DBD1",0x88F5],
- ["DBD2",0x8919],
- ["DBD3",0x8CE0],
- ["DBD4",0x8F29],
- ["DBD5",0x914D],
- ["DBD6",0x966A],
- ["DBD7",0x4F2F],
- ["DBD8",0x4F70],
- ["DBD9",0x5E1B],
- ["DBDA",0x67CF],
- ["DBDB",0x6822],
- ["DBDC",0x767D],
- ["DBDD",0x767E],
- ["DBDE",0x9B44],
- ["DBDF",0x5E61],
- ["DBE0",0x6A0A],
- ["DBE1",0x7169],
- ["DBE2",0x71D4],
- ["DBE3",0x756A],
- ["DBE4",0xF964],
- ["DBE5",0x7E41],
- ["DBE6",0x8543],
- ["DBE7",0x85E9],
- ["DBE8",0x98DC],
- ["DBE9",0x4F10],
- ["DBEA",0x7B4F],
- ["DBEB",0x7F70],
- ["DBEC",0x95A5],
- ["DBED",0x51E1],
- ["DBEE",0x5E06],
- ["DBEF",0x68B5],
- ["DBF0",0x6C3E],
- ["DBF1",0x6C4E],
- ["DBF2",0x6CDB],
- ["DBF3",0x72AF],
- ["DBF4",0x7BC4],
- ["DBF5",0x8303],
- ["DBF6",0x6CD5],
- ["DBF7",0x743A],
- ["DBF8",0x50FB],
- ["DBF9",0x5288],
- ["DBFA",0x58C1],
- ["DBFB",0x64D8],
- ["DBFC",0x6A97],
- ["DBFD",0x74A7],
- ["DBFE",0x7656],
- ["DCA1",0x78A7],
- ["DCA2",0x8617],
- ["DCA3",0x95E2],
- ["DCA4",0x9739],
- ["DCA5",0xF965],
- ["DCA6",0x535E],
- ["DCA7",0x5F01],
- ["DCA8",0x8B8A],
- ["DCA9",0x8FA8],
- ["DCAA",0x8FAF],
- ["DCAB",0x908A],
- ["DCAC",0x5225],
- ["DCAD",0x77A5],
- ["DCAE",0x9C49],
- ["DCAF",0x9F08],
- ["DCB0",0x4E19],
- ["DCB1",0x5002],
- ["DCB2",0x5175],
- ["DCB3",0x5C5B],
- ["DCB4",0x5E77],
- ["DCB5",0x661E],
- ["DCB6",0x663A],
- ["DCB7",0x67C4],
- ["DCB8",0x68C5],
- ["DCB9",0x70B3],
- ["DCBA",0x7501],
- ["DCBB",0x75C5],
- ["DCBC",0x79C9],
- ["DCBD",0x7ADD],
- ["DCBE",0x8F27],
- ["DCBF",0x9920],
- ["DCC0",0x9A08],
- ["DCC1",0x4FDD],
- ["DCC2",0x5821],
- ["DCC3",0x5831],
- ["DCC4",0x5BF6],
- ["DCC5",0x666E],
- ["DCC6",0x6B65],
- ["DCC7",0x6D11],
- ["DCC8",0x6E7A],
- ["DCC9",0x6F7D],
- ["DCCA",0x73E4],
- ["DCCB",0x752B],
- ["DCCC",0x83E9],
- ["DCCD",0x88DC],
- ["DCCE",0x8913],
- ["DCCF",0x8B5C],
- ["DCD0",0x8F14],
- ["DCD1",0x4F0F],
- ["DCD2",0x50D5],
- ["DCD3",0x5310],
- ["DCD4",0x535C],
- ["DCD5",0x5B93],
- ["DCD6",0x5FA9],
- ["DCD7",0x670D],
- ["DCD8",0x798F],
- ["DCD9",0x8179],
- ["DCDA",0x832F],
- ["DCDB",0x8514],
- ["DCDC",0x8907],
- ["DCDD",0x8986],
- ["DCDE",0x8F39],
- ["DCDF",0x8F3B],
- ["DCE0",0x99A5],
- ["DCE1",0x9C12],
- ["DCE2",0x672C],
- ["DCE3",0x4E76],
- ["DCE4",0x4FF8],
- ["DCE5",0x5949],
- ["DCE6",0x5C01],
- ["DCE7",0x5CEF],
- ["DCE8",0x5CF0],
- ["DCE9",0x6367],
- ["DCEA",0x68D2],
- ["DCEB",0x70FD],
- ["DCEC",0x71A2],
- ["DCED",0x742B],
- ["DCEE",0x7E2B],
- ["DCEF",0x84EC],
- ["DCF0",0x8702],
- ["DCF1",0x9022],
- ["DCF2",0x92D2],
- ["DCF3",0x9CF3],
- ["DCF4",0x4E0D],
- ["DCF5",0x4ED8],
- ["DCF6",0x4FEF],
- ["DCF7",0x5085],
- ["DCF8",0x5256],
- ["DCF9",0x526F],
- ["DCFA",0x5426],
- ["DCFB",0x5490],
- ["DCFC",0x57E0],
- ["DCFD",0x592B],
- ["DCFE",0x5A66],
- ["DDA1",0x5B5A],
- ["DDA2",0x5B75],
- ["DDA3",0x5BCC],
- ["DDA4",0x5E9C],
- ["DDA5",0xF966],
- ["DDA6",0x6276],
- ["DDA7",0x6577],
- ["DDA8",0x65A7],
- ["DDA9",0x6D6E],
- ["DDAA",0x6EA5],
- ["DDAB",0x7236],
- ["DDAC",0x7B26],
- ["DDAD",0x7C3F],
- ["DDAE",0x7F36],
- ["DDAF",0x8150],
- ["DDB0",0x8151],
- ["DDB1",0x819A],
- ["DDB2",0x8240],
- ["DDB3",0x8299],
- ["DDB4",0x83A9],
- ["DDB5",0x8A03],
- ["DDB6",0x8CA0],
- ["DDB7",0x8CE6],
- ["DDB8",0x8CFB],
- ["DDB9",0x8D74],
- ["DDBA",0x8DBA],
- ["DDBB",0x90E8],
- ["DDBC",0x91DC],
- ["DDBD",0x961C],
- ["DDBE",0x9644],
- ["DDBF",0x99D9],
- ["DDC0",0x9CE7],
- ["DDC1",0x5317],
- ["DDC2",0x5206],
- ["DDC3",0x5429],
- ["DDC4",0x5674],
- ["DDC5",0x58B3],
- ["DDC6",0x5954],
- ["DDC7",0x596E],
- ["DDC8",0x5FFF],
- ["DDC9",0x61A4],
- ["DDCA",0x626E],
- ["DDCB",0x6610],
- ["DDCC",0x6C7E],
- ["DDCD",0x711A],
- ["DDCE",0x76C6],
- ["DDCF",0x7C89],
- ["DDD0",0x7CDE],
- ["DDD1",0x7D1B],
- ["DDD2",0x82AC],
- ["DDD3",0x8CC1],
- ["DDD4",0x96F0],
- ["DDD5",0xF967],
- ["DDD6",0x4F5B],
- ["DDD7",0x5F17],
- ["DDD8",0x5F7F],
- ["DDD9",0x62C2],
- ["DDDA",0x5D29],
- ["DDDB",0x670B],
- ["DDDC",0x68DA],
- ["DDDD",0x787C],
- ["DDDE",0x7E43],
- ["DDDF",0x9D6C],
- ["DDE0",0x4E15],
- ["DDE1",0x5099],
- ["DDE2",0x5315],
- ["DDE3",0x532A],
- ["DDE4",0x5351],
- ["DDE5",0x5983],
- ["DDE6",0x5A62],
- ["DDE7",0x5E87],
- ["DDE8",0x60B2],
- ["DDE9",0x618A],
- ["DDEA",0x6249],
- ["DDEB",0x6279],
- ["DDEC",0x6590],
- ["DDED",0x6787],
- ["DDEE",0x69A7],
- ["DDEF",0x6BD4],
- ["DDF0",0x6BD6],
- ["DDF1",0x6BD7],
- ["DDF2",0x6BD8],
- ["DDF3",0x6CB8],
- ["DDF4",0xF968],
- ["DDF5",0x7435],
- ["DDF6",0x75FA],
- ["DDF7",0x7812],
- ["DDF8",0x7891],
- ["DDF9",0x79D5],
- ["DDFA",0x79D8],
- ["DDFB",0x7C83],
- ["DDFC",0x7DCB],
- ["DDFD",0x7FE1],
- ["DDFE",0x80A5],
- ["DEA1",0x813E],
- ["DEA2",0x81C2],
- ["DEA3",0x83F2],
- ["DEA4",0x871A],
- ["DEA5",0x88E8],
- ["DEA6",0x8AB9],
- ["DEA7",0x8B6C],
- ["DEA8",0x8CBB],
- ["DEA9",0x9119],
- ["DEAA",0x975E],
- ["DEAB",0x98DB],
- ["DEAC",0x9F3B],
- ["DEAD",0x56AC],
- ["DEAE",0x5B2A],
- ["DEAF",0x5F6C],
- ["DEB0",0x658C],
- ["DEB1",0x6AB3],
- ["DEB2",0x6BAF],
- ["DEB3",0x6D5C],
- ["DEB4",0x6FF1],
- ["DEB5",0x7015],
- ["DEB6",0x725D],
- ["DEB7",0x73AD],
- ["DEB8",0x8CA7],
- ["DEB9",0x8CD3],
- ["DEBA",0x983B],
- ["DEBB",0x6191],
- ["DEBC",0x6C37],
- ["DEBD",0x8058],
- ["DEBE",0x9A01],
- ["DEBF",0x4E4D],
- ["DEC0",0x4E8B],
- ["DEC1",0x4E9B],
- ["DEC2",0x4ED5],
- ["DEC3",0x4F3A],
- ["DEC4",0x4F3C],
- ["DEC5",0x4F7F],
- ["DEC6",0x4FDF],
- ["DEC7",0x50FF],
- ["DEC8",0x53F2],
- ["DEC9",0x53F8],
- ["DECA",0x5506],
- ["DECB",0x55E3],
- ["DECC",0x56DB],
- ["DECD",0x58EB],
- ["DECE",0x5962],
- ["DECF",0x5A11],
- ["DED0",0x5BEB],
- ["DED1",0x5BFA],
- ["DED2",0x5C04],
- ["DED3",0x5DF3],
- ["DED4",0x5E2B],
- ["DED5",0x5F99],
- ["DED6",0x601D],
- ["DED7",0x6368],
- ["DED8",0x659C],
- ["DED9",0x65AF],
- ["DEDA",0x67F6],
- ["DEDB",0x67FB],
- ["DEDC",0x68AD],
- ["DEDD",0x6B7B],
- ["DEDE",0x6C99],
- ["DEDF",0x6CD7],
- ["DEE0",0x6E23],
- ["DEE1",0x7009],
- ["DEE2",0x7345],
- ["DEE3",0x7802],
- ["DEE4",0x793E],
- ["DEE5",0x7940],
- ["DEE6",0x7960],
- ["DEE7",0x79C1],
- ["DEE8",0x7BE9],
- ["DEE9",0x7D17],
- ["DEEA",0x7D72],
- ["DEEB",0x8086],
- ["DEEC",0x820D],
- ["DEED",0x838E],
- ["DEEE",0x84D1],
- ["DEEF",0x86C7],
- ["DEF0",0x88DF],
- ["DEF1",0x8A50],
- ["DEF2",0x8A5E],
- ["DEF3",0x8B1D],
- ["DEF4",0x8CDC],
- ["DEF5",0x8D66],
- ["DEF6",0x8FAD],
- ["DEF7",0x90AA],
- ["DEF8",0x98FC],
- ["DEF9",0x99DF],
- ["DEFA",0x9E9D],
- ["DEFB",0x524A],
- ["DEFC",0xF969],
- ["DEFD",0x6714],
- ["DEFE",0xF96A],
- ["DFA1",0x5098],
- ["DFA2",0x522A],
- ["DFA3",0x5C71],
- ["DFA4",0x6563],
- ["DFA5",0x6C55],
- ["DFA6",0x73CA],
- ["DFA7",0x7523],
- ["DFA8",0x759D],
- ["DFA9",0x7B97],
- ["DFAA",0x849C],
- ["DFAB",0x9178],
- ["DFAC",0x9730],
- ["DFAD",0x4E77],
- ["DFAE",0x6492],
- ["DFAF",0x6BBA],
- ["DFB0",0x715E],
- ["DFB1",0x85A9],
- ["DFB2",0x4E09],
- ["DFB3",0xF96B],
- ["DFB4",0x6749],
- ["DFB5",0x68EE],
- ["DFB6",0x6E17],
- ["DFB7",0x829F],
- ["DFB8",0x8518],
- ["DFB9",0x886B],
- ["DFBA",0x63F7],
- ["DFBB",0x6F81],
- ["DFBC",0x9212],
- ["DFBD",0x98AF],
- ["DFBE",0x4E0A],
- ["DFBF",0x50B7],
- ["DFC0",0x50CF],
- ["DFC1",0x511F],
- ["DFC2",0x5546],
- ["DFC3",0x55AA],
- ["DFC4",0x5617],
- ["DFC5",0x5B40],
- ["DFC6",0x5C19],
- ["DFC7",0x5CE0],
- ["DFC8",0x5E38],
- ["DFC9",0x5E8A],
- ["DFCA",0x5EA0],
- ["DFCB",0x5EC2],
- ["DFCC",0x60F3],
- ["DFCD",0x6851],
- ["DFCE",0x6A61],
- ["DFCF",0x6E58],
- ["DFD0",0x723D],
- ["DFD1",0x7240],
- ["DFD2",0x72C0],
- ["DFD3",0x76F8],
- ["DFD4",0x7965],
- ["DFD5",0x7BB1],
- ["DFD6",0x7FD4],
- ["DFD7",0x88F3],
- ["DFD8",0x89F4],
- ["DFD9",0x8A73],
- ["DFDA",0x8C61],
- ["DFDB",0x8CDE],
- ["DFDC",0x971C],
- ["DFDD",0x585E],
- ["DFDE",0x74BD],
- ["DFDF",0x8CFD],
- ["DFE0",0x55C7],
- ["DFE1",0xF96C],
- ["DFE2",0x7A61],
- ["DFE3",0x7D22],
- ["DFE4",0x8272],
- ["DFE5",0x7272],
- ["DFE6",0x751F],
- ["DFE7",0x7525],
- ["DFE8",0xF96D],
- ["DFE9",0x7B19],
- ["DFEA",0x5885],
- ["DFEB",0x58FB],
- ["DFEC",0x5DBC],
- ["DFED",0x5E8F],
- ["DFEE",0x5EB6],
- ["DFEF",0x5F90],
- ["DFF0",0x6055],
- ["DFF1",0x6292],
- ["DFF2",0x637F],
- ["DFF3",0x654D],
- ["DFF4",0x6691],
- ["DFF5",0x66D9],
- ["DFF6",0x66F8],
- ["DFF7",0x6816],
- ["DFF8",0x68F2],
- ["DFF9",0x7280],
- ["DFFA",0x745E],
- ["DFFB",0x7B6E],
- ["DFFC",0x7D6E],
- ["DFFD",0x7DD6],
- ["DFFE",0x7F72],
- ["E0A1",0x80E5],
- ["E0A2",0x8212],
- ["E0A3",0x85AF],
- ["E0A4",0x897F],
- ["E0A5",0x8A93],
- ["E0A6",0x901D],
- ["E0A7",0x92E4],
- ["E0A8",0x9ECD],
- ["E0A9",0x9F20],
- ["E0AA",0x5915],
- ["E0AB",0x596D],
- ["E0AC",0x5E2D],
- ["E0AD",0x60DC],
- ["E0AE",0x6614],
- ["E0AF",0x6673],
- ["E0B0",0x6790],
- ["E0B1",0x6C50],
- ["E0B2",0x6DC5],
- ["E0B3",0x6F5F],
- ["E0B4",0x77F3],
- ["E0B5",0x78A9],
- ["E0B6",0x84C6],
- ["E0B7",0x91CB],
- ["E0B8",0x932B],
- ["E0B9",0x4ED9],
- ["E0BA",0x50CA],
- ["E0BB",0x5148],
- ["E0BC",0x5584],
- ["E0BD",0x5B0B],
- ["E0BE",0x5BA3],
- ["E0BF",0x6247],
- ["E0C0",0x657E],
- ["E0C1",0x65CB],
- ["E0C2",0x6E32],
- ["E0C3",0x717D],
- ["E0C4",0x7401],
- ["E0C5",0x7444],
- ["E0C6",0x7487],
- ["E0C7",0x74BF],
- ["E0C8",0x766C],
- ["E0C9",0x79AA],
- ["E0CA",0x7DDA],
- ["E0CB",0x7E55],
- ["E0CC",0x7FA8],
- ["E0CD",0x817A],
- ["E0CE",0x81B3],
- ["E0CF",0x8239],
- ["E0D0",0x861A],
- ["E0D1",0x87EC],
- ["E0D2",0x8A75],
- ["E0D3",0x8DE3],
- ["E0D4",0x9078],
- ["E0D5",0x9291],
- ["E0D6",0x9425],
- ["E0D7",0x994D],
- ["E0D8",0x9BAE],
- ["E0D9",0x5368],
- ["E0DA",0x5C51],
- ["E0DB",0x6954],
- ["E0DC",0x6CC4],
- ["E0DD",0x6D29],
- ["E0DE",0x6E2B],
- ["E0DF",0x820C],
- ["E0E0",0x859B],
- ["E0E1",0x893B],
- ["E0E2",0x8A2D],
- ["E0E3",0x8AAA],
- ["E0E4",0x96EA],
- ["E0E5",0x9F67],
- ["E0E6",0x5261],
- ["E0E7",0x66B9],
- ["E0E8",0x6BB2],
- ["E0E9",0x7E96],
- ["E0EA",0x87FE],
- ["E0EB",0x8D0D],
- ["E0EC",0x9583],
- ["E0ED",0x965D],
- ["E0EE",0x651D],
- ["E0EF",0x6D89],
- ["E0F0",0x71EE],
- ["E0F1",0xF96E],
- ["E0F2",0x57CE],
- ["E0F3",0x59D3],
- ["E0F4",0x5BAC],
- ["E0F5",0x6027],
- ["E0F6",0x60FA],
- ["E0F7",0x6210],
- ["E0F8",0x661F],
- ["E0F9",0x665F],
- ["E0FA",0x7329],
- ["E0FB",0x73F9],
- ["E0FC",0x76DB],
- ["E0FD",0x7701],
- ["E0FE",0x7B6C],
- ["E1A1",0x8056],
- ["E1A2",0x8072],
- ["E1A3",0x8165],
- ["E1A4",0x8AA0],
- ["E1A5",0x9192],
- ["E1A6",0x4E16],
- ["E1A7",0x52E2],
- ["E1A8",0x6B72],
- ["E1A9",0x6D17],
- ["E1AA",0x7A05],
- ["E1AB",0x7B39],
- ["E1AC",0x7D30],
- ["E1AD",0xF96F],
- ["E1AE",0x8CB0],
- ["E1AF",0x53EC],
- ["E1B0",0x562F],
- ["E1B1",0x5851],
- ["E1B2",0x5BB5],
- ["E1B3",0x5C0F],
- ["E1B4",0x5C11],
- ["E1B5",0x5DE2],
- ["E1B6",0x6240],
- ["E1B7",0x6383],
- ["E1B8",0x6414],
- ["E1B9",0x662D],
- ["E1BA",0x68B3],
- ["E1BB",0x6CBC],
- ["E1BC",0x6D88],
- ["E1BD",0x6EAF],
- ["E1BE",0x701F],
- ["E1BF",0x70A4],
- ["E1C0",0x71D2],
- ["E1C1",0x7526],
- ["E1C2",0x758F],
- ["E1C3",0x758E],
- ["E1C4",0x7619],
- ["E1C5",0x7B11],
- ["E1C6",0x7BE0],
- ["E1C7",0x7C2B],
- ["E1C8",0x7D20],
- ["E1C9",0x7D39],
- ["E1CA",0x852C],
- ["E1CB",0x856D],
- ["E1CC",0x8607],
- ["E1CD",0x8A34],
- ["E1CE",0x900D],
- ["E1CF",0x9061],
- ["E1D0",0x90B5],
- ["E1D1",0x92B7],
- ["E1D2",0x97F6],
- ["E1D3",0x9A37],
- ["E1D4",0x4FD7],
- ["E1D5",0x5C6C],
- ["E1D6",0x675F],
- ["E1D7",0x6D91],
- ["E1D8",0x7C9F],
- ["E1D9",0x7E8C],
- ["E1DA",0x8B16],
- ["E1DB",0x8D16],
- ["E1DC",0x901F],
- ["E1DD",0x5B6B],
- ["E1DE",0x5DFD],
- ["E1DF",0x640D],
- ["E1E0",0x84C0],
- ["E1E1",0x905C],
- ["E1E2",0x98E1],
- ["E1E3",0x7387],
- ["E1E4",0x5B8B],
- ["E1E5",0x609A],
- ["E1E6",0x677E],
- ["E1E7",0x6DDE],
- ["E1E8",0x8A1F],
- ["E1E9",0x8AA6],
- ["E1EA",0x9001],
- ["E1EB",0x980C],
- ["E1EC",0x5237],
- ["E1ED",0xF970],
- ["E1EE",0x7051],
- ["E1EF",0x788E],
- ["E1F0",0x9396],
- ["E1F1",0x8870],
- ["E1F2",0x91D7],
- ["E1F3",0x4FEE],
- ["E1F4",0x53D7],
- ["E1F5",0x55FD],
- ["E1F6",0x56DA],
- ["E1F7",0x5782],
- ["E1F8",0x58FD],
- ["E1F9",0x5AC2],
- ["E1FA",0x5B88],
- ["E1FB",0x5CAB],
- ["E1FC",0x5CC0],
- ["E1FD",0x5E25],
- ["E1FE",0x6101],
- ["E2A1",0x620D],
- ["E2A2",0x624B],
- ["E2A3",0x6388],
- ["E2A4",0x641C],
- ["E2A5",0x6536],
- ["E2A6",0x6578],
- ["E2A7",0x6A39],
- ["E2A8",0x6B8A],
- ["E2A9",0x6C34],
- ["E2AA",0x6D19],
- ["E2AB",0x6F31],
- ["E2AC",0x71E7],
- ["E2AD",0x72E9],
- ["E2AE",0x7378],
- ["E2AF",0x7407],
- ["E2B0",0x74B2],
- ["E2B1",0x7626],
- ["E2B2",0x7761],
- ["E2B3",0x79C0],
- ["E2B4",0x7A57],
- ["E2B5",0x7AEA],
- ["E2B6",0x7CB9],
- ["E2B7",0x7D8F],
- ["E2B8",0x7DAC],
- ["E2B9",0x7E61],
- ["E2BA",0x7F9E],
- ["E2BB",0x8129],
- ["E2BC",0x8331],
- ["E2BD",0x8490],
- ["E2BE",0x84DA],
- ["E2BF",0x85EA],
- ["E2C0",0x8896],
- ["E2C1",0x8AB0],
- ["E2C2",0x8B90],
- ["E2C3",0x8F38],
- ["E2C4",0x9042],
- ["E2C5",0x9083],
- ["E2C6",0x916C],
- ["E2C7",0x9296],
- ["E2C8",0x92B9],
- ["E2C9",0x968B],
- ["E2CA",0x96A7],
- ["E2CB",0x96A8],
- ["E2CC",0x96D6],
- ["E2CD",0x9700],
- ["E2CE",0x9808],
- ["E2CF",0x9996],
- ["E2D0",0x9AD3],
- ["E2D1",0x9B1A],
- ["E2D2",0x53D4],
- ["E2D3",0x587E],
- ["E2D4",0x5919],
- ["E2D5",0x5B70],
- ["E2D6",0x5BBF],
- ["E2D7",0x6DD1],
- ["E2D8",0x6F5A],
- ["E2D9",0x719F],
- ["E2DA",0x7421],
- ["E2DB",0x74B9],
- ["E2DC",0x8085],
- ["E2DD",0x83FD],
- ["E2DE",0x5DE1],
- ["E2DF",0x5F87],
- ["E2E0",0x5FAA],
- ["E2E1",0x6042],
- ["E2E2",0x65EC],
- ["E2E3",0x6812],
- ["E2E4",0x696F],
- ["E2E5",0x6A53],
- ["E2E6",0x6B89],
- ["E2E7",0x6D35],
- ["E2E8",0x6DF3],
- ["E2E9",0x73E3],
- ["E2EA",0x76FE],
- ["E2EB",0x77AC],
- ["E2EC",0x7B4D],
- ["E2ED",0x7D14],
- ["E2EE",0x8123],
- ["E2EF",0x821C],
- ["E2F0",0x8340],
- ["E2F1",0x84F4],
- ["E2F2",0x8563],
- ["E2F3",0x8A62],
- ["E2F4",0x8AC4],
- ["E2F5",0x9187],
- ["E2F6",0x931E],
- ["E2F7",0x9806],
- ["E2F8",0x99B4],
- ["E2F9",0x620C],
- ["E2FA",0x8853],
- ["E2FB",0x8FF0],
- ["E2FC",0x9265],
- ["E2FD",0x5D07],
- ["E2FE",0x5D27],
- ["E3A1",0x5D69],
- ["E3A2",0x745F],
- ["E3A3",0x819D],
- ["E3A4",0x8768],
- ["E3A5",0x6FD5],
- ["E3A6",0x62FE],
- ["E3A7",0x7FD2],
- ["E3A8",0x8936],
- ["E3A9",0x8972],
- ["E3AA",0x4E1E],
- ["E3AB",0x4E58],
- ["E3AC",0x50E7],
- ["E3AD",0x52DD],
- ["E3AE",0x5347],
- ["E3AF",0x627F],
- ["E3B0",0x6607],
- ["E3B1",0x7E69],
- ["E3B2",0x8805],
- ["E3B3",0x965E],
- ["E3B4",0x4F8D],
- ["E3B5",0x5319],
- ["E3B6",0x5636],
- ["E3B7",0x59CB],
- ["E3B8",0x5AA4],
- ["E3B9",0x5C38],
- ["E3BA",0x5C4E],
- ["E3BB",0x5C4D],
- ["E3BC",0x5E02],
- ["E3BD",0x5F11],
- ["E3BE",0x6043],
- ["E3BF",0x65BD],
- ["E3C0",0x662F],
- ["E3C1",0x6642],
- ["E3C2",0x67BE],
- ["E3C3",0x67F4],
- ["E3C4",0x731C],
- ["E3C5",0x77E2],
- ["E3C6",0x793A],
- ["E3C7",0x7FC5],
- ["E3C8",0x8494],
- ["E3C9",0x84CD],
- ["E3CA",0x8996],
- ["E3CB",0x8A66],
- ["E3CC",0x8A69],
- ["E3CD",0x8AE1],
- ["E3CE",0x8C55],
- ["E3CF",0x8C7A],
- ["E3D0",0x57F4],
- ["E3D1",0x5BD4],
- ["E3D2",0x5F0F],
- ["E3D3",0x606F],
- ["E3D4",0x62ED],
- ["E3D5",0x690D],
- ["E3D6",0x6B96],
- ["E3D7",0x6E5C],
- ["E3D8",0x7184],
- ["E3D9",0x7BD2],
- ["E3DA",0x8755],
- ["E3DB",0x8B58],
- ["E3DC",0x8EFE],
- ["E3DD",0x98DF],
- ["E3DE",0x98FE],
- ["E3DF",0x4F38],
- ["E3E0",0x4F81],
- ["E3E1",0x4FE1],
- ["E3E2",0x547B],
- ["E3E3",0x5A20],
- ["E3E4",0x5BB8],
- ["E3E5",0x613C],
- ["E3E6",0x65B0],
- ["E3E7",0x6668],
- ["E3E8",0x71FC],
- ["E3E9",0x7533],
- ["E3EA",0x795E],
- ["E3EB",0x7D33],
- ["E3EC",0x814E],
- ["E3ED",0x81E3],
- ["E3EE",0x8398],
- ["E3EF",0x85AA],
- ["E3F0",0x85CE],
- ["E3F1",0x8703],
- ["E3F2",0x8A0A],
- ["E3F3",0x8EAB],
- ["E3F4",0x8F9B],
- ["E3F5",0xF971],
- ["E3F6",0x8FC5],
- ["E3F7",0x5931],
- ["E3F8",0x5BA4],
- ["E3F9",0x5BE6],
- ["E3FA",0x6089],
- ["E3FB",0x5BE9],
- ["E3FC",0x5C0B],
- ["E3FD",0x5FC3],
- ["E3FE",0x6C81],
- ["E4A1",0xF972],
- ["E4A2",0x6DF1],
- ["E4A3",0x700B],
- ["E4A4",0x751A],
- ["E4A5",0x82AF],
- ["E4A6",0x8AF6],
- ["E4A7",0x4EC0],
- ["E4A8",0x5341],
- ["E4A9",0xF973],
- ["E4AA",0x96D9],
- ["E4AB",0x6C0F],
- ["E4AC",0x4E9E],
- ["E4AD",0x4FC4],
- ["E4AE",0x5152],
- ["E4AF",0x555E],
- ["E4B0",0x5A25],
- ["E4B1",0x5CE8],
- ["E4B2",0x6211],
- ["E4B3",0x7259],
- ["E4B4",0x82BD],
- ["E4B5",0x83AA],
- ["E4B6",0x86FE],
- ["E4B7",0x8859],
- ["E4B8",0x8A1D],
- ["E4B9",0x963F],
- ["E4BA",0x96C5],
- ["E4BB",0x9913],
- ["E4BC",0x9D09],
- ["E4BD",0x9D5D],
- ["E4BE",0x580A],
- ["E4BF",0x5CB3],
- ["E4C0",0x5DBD],
- ["E4C1",0x5E44],
- ["E4C2",0x60E1],
- ["E4C3",0x6115],
- ["E4C4",0x63E1],
- ["E4C5",0x6A02],
- ["E4C6",0x6E25],
- ["E4C7",0x9102],
- ["E4C8",0x9354],
- ["E4C9",0x984E],
- ["E4CA",0x9C10],
- ["E4CB",0x9F77],
- ["E4CC",0x5B89],
- ["E4CD",0x5CB8],
- ["E4CE",0x6309],
- ["E4CF",0x664F],
- ["E4D0",0x6848],
- ["E4D1",0x773C],
- ["E4D2",0x96C1],
- ["E4D3",0x978D],
- ["E4D4",0x9854],
- ["E4D5",0x9B9F],
- ["E4D6",0x65A1],
- ["E4D7",0x8B01],
- ["E4D8",0x8ECB],
- ["E4D9",0x95BC],
- ["E4DA",0x5535],
- ["E4DB",0x5CA9],
- ["E4DC",0x5DD6],
- ["E4DD",0x5EB5],
- ["E4DE",0x6697],
- ["E4DF",0x764C],
- ["E4E0",0x83F4],
- ["E4E1",0x95C7],
- ["E4E2",0x58D3],
- ["E4E3",0x62BC],
- ["E4E4",0x72CE],
- ["E4E5",0x9D28],
- ["E4E6",0x4EF0],
- ["E4E7",0x592E],
- ["E4E8",0x600F],
- ["E4E9",0x663B],
- ["E4EA",0x6B83],
- ["E4EB",0x79E7],
- ["E4EC",0x9D26],
- ["E4ED",0x5393],
- ["E4EE",0x54C0],
- ["E4EF",0x57C3],
- ["E4F0",0x5D16],
- ["E4F1",0x611B],
- ["E4F2",0x66D6],
- ["E4F3",0x6DAF],
- ["E4F4",0x788D],
- ["E4F5",0x827E],
- ["E4F6",0x9698],
- ["E4F7",0x9744],
- ["E4F8",0x5384],
- ["E4F9",0x627C],
- ["E4FA",0x6396],
- ["E4FB",0x6DB2],
- ["E4FC",0x7E0A],
- ["E4FD",0x814B],
- ["E4FE",0x984D],
- ["E5A1",0x6AFB],
- ["E5A2",0x7F4C],
- ["E5A3",0x9DAF],
- ["E5A4",0x9E1A],
- ["E5A5",0x4E5F],
- ["E5A6",0x503B],
- ["E5A7",0x51B6],
- ["E5A8",0x591C],
- ["E5A9",0x60F9],
- ["E5AA",0x63F6],
- ["E5AB",0x6930],
- ["E5AC",0x723A],
- ["E5AD",0x8036],
- ["E5AE",0xF974],
- ["E5AF",0x91CE],
- ["E5B0",0x5F31],
- ["E5B1",0xF975],
- ["E5B2",0xF976],
- ["E5B3",0x7D04],
- ["E5B4",0x82E5],
- ["E5B5",0x846F],
- ["E5B6",0x84BB],
- ["E5B7",0x85E5],
- ["E5B8",0x8E8D],
- ["E5B9",0xF977],
- ["E5BA",0x4F6F],
- ["E5BB",0xF978],
- ["E5BC",0xF979],
- ["E5BD",0x58E4],
- ["E5BE",0x5B43],
- ["E5BF",0x6059],
- ["E5C0",0x63DA],
- ["E5C1",0x6518],
- ["E5C2",0x656D],
- ["E5C3",0x6698],
- ["E5C4",0xF97A],
- ["E5C5",0x694A],
- ["E5C6",0x6A23],
- ["E5C7",0x6D0B],
- ["E5C8",0x7001],
- ["E5C9",0x716C],
- ["E5CA",0x75D2],
- ["E5CB",0x760D],
- ["E5CC",0x79B3],
- ["E5CD",0x7A70],
- ["E5CE",0xF97B],
- ["E5CF",0x7F8A],
- ["E5D0",0xF97C],
- ["E5D1",0x8944],
- ["E5D2",0xF97D],
- ["E5D3",0x8B93],
- ["E5D4",0x91C0],
- ["E5D5",0x967D],
- ["E5D6",0xF97E],
- ["E5D7",0x990A],
- ["E5D8",0x5704],
- ["E5D9",0x5FA1],
- ["E5DA",0x65BC],
- ["E5DB",0x6F01],
- ["E5DC",0x7600],
- ["E5DD",0x79A6],
- ["E5DE",0x8A9E],
- ["E5DF",0x99AD],
- ["E5E0",0x9B5A],
- ["E5E1",0x9F6C],
- ["E5E2",0x5104],
- ["E5E3",0x61B6],
- ["E5E4",0x6291],
- ["E5E5",0x6A8D],
- ["E5E6",0x81C6],
- ["E5E7",0x5043],
- ["E5E8",0x5830],
- ["E5E9",0x5F66],
- ["E5EA",0x7109],
- ["E5EB",0x8A00],
- ["E5EC",0x8AFA],
- ["E5ED",0x5B7C],
- ["E5EE",0x8616],
- ["E5EF",0x4FFA],
- ["E5F0",0x513C],
- ["E5F1",0x56B4],
- ["E5F2",0x5944],
- ["E5F3",0x63A9],
- ["E5F4",0x6DF9],
- ["E5F5",0x5DAA],
- ["E5F6",0x696D],
- ["E5F7",0x5186],
- ["E5F8",0x4E88],
- ["E5F9",0x4F59],
- ["E5FA",0xF97F],
- ["E5FB",0xF980],
- ["E5FC",0xF981],
- ["E5FD",0x5982],
- ["E5FE",0xF982],
- ["E6A1",0xF983],
- ["E6A2",0x6B5F],
- ["E6A3",0x6C5D],
- ["E6A4",0xF984],
- ["E6A5",0x74B5],
- ["E6A6",0x7916],
- ["E6A7",0xF985],
- ["E6A8",0x8207],
- ["E6A9",0x8245],
- ["E6AA",0x8339],
- ["E6AB",0x8F3F],
- ["E6AC",0x8F5D],
- ["E6AD",0xF986],
- ["E6AE",0x9918],
- ["E6AF",0xF987],
- ["E6B0",0xF988],
- ["E6B1",0xF989],
- ["E6B2",0x4EA6],
- ["E6B3",0xF98A],
- ["E6B4",0x57DF],
- ["E6B5",0x5F79],
- ["E6B6",0x6613],
- ["E6B7",0xF98B],
- ["E6B8",0xF98C],
- ["E6B9",0x75AB],
- ["E6BA",0x7E79],
- ["E6BB",0x8B6F],
- ["E6BC",0xF98D],
- ["E6BD",0x9006],
- ["E6BE",0x9A5B],
- ["E6BF",0x56A5],
- ["E6C0",0x5827],
- ["E6C1",0x59F8],
- ["E6C2",0x5A1F],
- ["E6C3",0x5BB4],
- ["E6C4",0xF98E],
- ["E6C5",0x5EF6],
- ["E6C6",0xF98F],
- ["E6C7",0xF990],
- ["E6C8",0x6350],
- ["E6C9",0x633B],
- ["E6CA",0xF991],
- ["E6CB",0x693D],
- ["E6CC",0x6C87],
- ["E6CD",0x6CBF],
- ["E6CE",0x6D8E],
- ["E6CF",0x6D93],
- ["E6D0",0x6DF5],
- ["E6D1",0x6F14],
- ["E6D2",0xF992],
- ["E6D3",0x70DF],
- ["E6D4",0x7136],
- ["E6D5",0x7159],
- ["E6D6",0xF993],
- ["E6D7",0x71C3],
- ["E6D8",0x71D5],
- ["E6D9",0xF994],
- ["E6DA",0x784F],
- ["E6DB",0x786F],
- ["E6DC",0xF995],
- ["E6DD",0x7B75],
- ["E6DE",0x7DE3],
- ["E6DF",0xF996],
- ["E6E0",0x7E2F],
- ["E6E1",0xF997],
- ["E6E2",0x884D],
- ["E6E3",0x8EDF],
- ["E6E4",0xF998],
- ["E6E5",0xF999],
- ["E6E6",0xF99A],
- ["E6E7",0x925B],
- ["E6E8",0xF99B],
- ["E6E9",0x9CF6],
- ["E6EA",0xF99C],
- ["E6EB",0xF99D],
- ["E6EC",0xF99E],
- ["E6ED",0x6085],
- ["E6EE",0x6D85],
- ["E6EF",0xF99F],
- ["E6F0",0x71B1],
- ["E6F1",0xF9A0],
- ["E6F2",0xF9A1],
- ["E6F3",0x95B1],
- ["E6F4",0x53AD],
- ["E6F5",0xF9A2],
- ["E6F6",0xF9A3],
- ["E6F7",0xF9A4],
- ["E6F8",0x67D3],
- ["E6F9",0xF9A5],
- ["E6FA",0x708E],
- ["E6FB",0x7130],
- ["E6FC",0x7430],
- ["E6FD",0x8276],
- ["E6FE",0x82D2],
- ["E7A1",0xF9A6],
- ["E7A2",0x95BB],
- ["E7A3",0x9AE5],
- ["E7A4",0x9E7D],
- ["E7A5",0x66C4],
- ["E7A6",0xF9A7],
- ["E7A7",0x71C1],
- ["E7A8",0x8449],
- ["E7A9",0xF9A8],
- ["E7AA",0xF9A9],
- ["E7AB",0x584B],
- ["E7AC",0xF9AA],
- ["E7AD",0xF9AB],
- ["E7AE",0x5DB8],
- ["E7AF",0x5F71],
- ["E7B0",0xF9AC],
- ["E7B1",0x6620],
- ["E7B2",0x668E],
- ["E7B3",0x6979],
- ["E7B4",0x69AE],
- ["E7B5",0x6C38],
- ["E7B6",0x6CF3],
- ["E7B7",0x6E36],
- ["E7B8",0x6F41],
- ["E7B9",0x6FDA],
- ["E7BA",0x701B],
- ["E7BB",0x702F],
- ["E7BC",0x7150],
- ["E7BD",0x71DF],
- ["E7BE",0x7370],
- ["E7BF",0xF9AD],
- ["E7C0",0x745B],
- ["E7C1",0xF9AE],
- ["E7C2",0x74D4],
- ["E7C3",0x76C8],
- ["E7C4",0x7A4E],
- ["E7C5",0x7E93],
- ["E7C6",0xF9AF],
- ["E7C7",0xF9B0],
- ["E7C8",0x82F1],
- ["E7C9",0x8A60],
- ["E7CA",0x8FCE],
- ["E7CB",0xF9B1],
- ["E7CC",0x9348],
- ["E7CD",0xF9B2],
- ["E7CE",0x9719],
- ["E7CF",0xF9B3],
- ["E7D0",0xF9B4],
- ["E7D1",0x4E42],
- ["E7D2",0x502A],
- ["E7D3",0xF9B5],
- ["E7D4",0x5208],
- ["E7D5",0x53E1],
- ["E7D6",0x66F3],
- ["E7D7",0x6C6D],
- ["E7D8",0x6FCA],
- ["E7D9",0x730A],
- ["E7DA",0x777F],
- ["E7DB",0x7A62],
- ["E7DC",0x82AE],
- ["E7DD",0x85DD],
- ["E7DE",0x8602],
- ["E7DF",0xF9B6],
- ["E7E0",0x88D4],
- ["E7E1",0x8A63],
- ["E7E2",0x8B7D],
- ["E7E3",0x8C6B],
- ["E7E4",0xF9B7],
- ["E7E5",0x92B3],
- ["E7E6",0xF9B8],
- ["E7E7",0x9713],
- ["E7E8",0x9810],
- ["E7E9",0x4E94],
- ["E7EA",0x4F0D],
- ["E7EB",0x4FC9],
- ["E7EC",0x50B2],
- ["E7ED",0x5348],
- ["E7EE",0x543E],
- ["E7EF",0x5433],
- ["E7F0",0x55DA],
- ["E7F1",0x5862],
- ["E7F2",0x58BA],
- ["E7F3",0x5967],
- ["E7F4",0x5A1B],
- ["E7F5",0x5BE4],
- ["E7F6",0x609F],
- ["E7F7",0xF9B9],
- ["E7F8",0x61CA],
- ["E7F9",0x6556],
- ["E7FA",0x65FF],
- ["E7FB",0x6664],
- ["E7FC",0x68A7],
- ["E7FD",0x6C5A],
- ["E7FE",0x6FB3],
- ["E8A1",0x70CF],
- ["E8A2",0x71AC],
- ["E8A3",0x7352],
- ["E8A4",0x7B7D],
- ["E8A5",0x8708],
- ["E8A6",0x8AA4],
- ["E8A7",0x9C32],
- ["E8A8",0x9F07],
- ["E8A9",0x5C4B],
- ["E8AA",0x6C83],
- ["E8AB",0x7344],
- ["E8AC",0x7389],
- ["E8AD",0x923A],
- ["E8AE",0x6EAB],
- ["E8AF",0x7465],
- ["E8B0",0x761F],
- ["E8B1",0x7A69],
- ["E8B2",0x7E15],
- ["E8B3",0x860A],
- ["E8B4",0x5140],
- ["E8B5",0x58C5],
- ["E8B6",0x64C1],
- ["E8B7",0x74EE],
- ["E8B8",0x7515],
- ["E8B9",0x7670],
- ["E8BA",0x7FC1],
- ["E8BB",0x9095],
- ["E8BC",0x96CD],
- ["E8BD",0x9954],
- ["E8BE",0x6E26],
- ["E8BF",0x74E6],
- ["E8C0",0x7AA9],
- ["E8C1",0x7AAA],
- ["E8C2",0x81E5],
- ["E8C3",0x86D9],
- ["E8C4",0x8778],
- ["E8C5",0x8A1B],
- ["E8C6",0x5A49],
- ["E8C7",0x5B8C],
- ["E8C8",0x5B9B],
- ["E8C9",0x68A1],
- ["E8CA",0x6900],
- ["E8CB",0x6D63],
- ["E8CC",0x73A9],
- ["E8CD",0x7413],
- ["E8CE",0x742C],
- ["E8CF",0x7897],
- ["E8D0",0x7DE9],
- ["E8D1",0x7FEB],
- ["E8D2",0x8118],
- ["E8D3",0x8155],
- ["E8D4",0x839E],
- ["E8D5",0x8C4C],
- ["E8D6",0x962E],
- ["E8D7",0x9811],
- ["E8D8",0x66F0],
- ["E8D9",0x5F80],
- ["E8DA",0x65FA],
- ["E8DB",0x6789],
- ["E8DC",0x6C6A],
- ["E8DD",0x738B],
- ["E8DE",0x502D],
- ["E8DF",0x5A03],
- ["E8E0",0x6B6A],
- ["E8E1",0x77EE],
- ["E8E2",0x5916],
- ["E8E3",0x5D6C],
- ["E8E4",0x5DCD],
- ["E8E5",0x7325],
- ["E8E6",0x754F],
- ["E8E7",0xF9BA],
- ["E8E8",0xF9BB],
- ["E8E9",0x50E5],
- ["E8EA",0x51F9],
- ["E8EB",0x582F],
- ["E8EC",0x592D],
- ["E8ED",0x5996],
- ["E8EE",0x59DA],
- ["E8EF",0x5BE5],
- ["E8F0",0xF9BC],
- ["E8F1",0xF9BD],
- ["E8F2",0x5DA2],
- ["E8F3",0x62D7],
- ["E8F4",0x6416],
- ["E8F5",0x6493],
- ["E8F6",0x64FE],
- ["E8F7",0xF9BE],
- ["E8F8",0x66DC],
- ["E8F9",0xF9BF],
- ["E8FA",0x6A48],
- ["E8FB",0xF9C0],
- ["E8FC",0x71FF],
- ["E8FD",0x7464],
- ["E8FE",0xF9C1],
- ["E9A1",0x7A88],
- ["E9A2",0x7AAF],
- ["E9A3",0x7E47],
- ["E9A4",0x7E5E],
- ["E9A5",0x8000],
- ["E9A6",0x8170],
- ["E9A7",0xF9C2],
- ["E9A8",0x87EF],
- ["E9A9",0x8981],
- ["E9AA",0x8B20],
- ["E9AB",0x9059],
- ["E9AC",0xF9C3],
- ["E9AD",0x9080],
- ["E9AE",0x9952],
- ["E9AF",0x617E],
- ["E9B0",0x6B32],
- ["E9B1",0x6D74],
- ["E9B2",0x7E1F],
- ["E9B3",0x8925],
- ["E9B4",0x8FB1],
- ["E9B5",0x4FD1],
- ["E9B6",0x50AD],
- ["E9B7",0x5197],
- ["E9B8",0x52C7],
- ["E9B9",0x57C7],
- ["E9BA",0x5889],
- ["E9BB",0x5BB9],
- ["E9BC",0x5EB8],
- ["E9BD",0x6142],
- ["E9BE",0x6995],
- ["E9BF",0x6D8C],
- ["E9C0",0x6E67],
- ["E9C1",0x6EB6],
- ["E9C2",0x7194],
- ["E9C3",0x7462],
- ["E9C4",0x7528],
- ["E9C5",0x752C],
- ["E9C6",0x8073],
- ["E9C7",0x8338],
- ["E9C8",0x84C9],
- ["E9C9",0x8E0A],
- ["E9CA",0x9394],
- ["E9CB",0x93DE],
- ["E9CC",0xF9C4],
- ["E9CD",0x4E8E],
- ["E9CE",0x4F51],
- ["E9CF",0x5076],
- ["E9D0",0x512A],
- ["E9D1",0x53C8],
- ["E9D2",0x53CB],
- ["E9D3",0x53F3],
- ["E9D4",0x5B87],
- ["E9D5",0x5BD3],
- ["E9D6",0x5C24],
- ["E9D7",0x611A],
- ["E9D8",0x6182],
- ["E9D9",0x65F4],
- ["E9DA",0x725B],
- ["E9DB",0x7397],
- ["E9DC",0x7440],
- ["E9DD",0x76C2],
- ["E9DE",0x7950],
- ["E9DF",0x7991],
- ["E9E0",0x79B9],
- ["E9E1",0x7D06],
- ["E9E2",0x7FBD],
- ["E9E3",0x828B],
- ["E9E4",0x85D5],
- ["E9E5",0x865E],
- ["E9E6",0x8FC2],
- ["E9E7",0x9047],
- ["E9E8",0x90F5],
- ["E9E9",0x91EA],
- ["E9EA",0x9685],
- ["E9EB",0x96E8],
- ["E9EC",0x96E9],
- ["E9ED",0x52D6],
- ["E9EE",0x5F67],
- ["E9EF",0x65ED],
- ["E9F0",0x6631],
- ["E9F1",0x682F],
- ["E9F2",0x715C],
- ["E9F3",0x7A36],
- ["E9F4",0x90C1],
- ["E9F5",0x980A],
- ["E9F6",0x4E91],
- ["E9F7",0xF9C5],
- ["E9F8",0x6A52],
- ["E9F9",0x6B9E],
- ["E9FA",0x6F90],
- ["E9FB",0x7189],
- ["E9FC",0x8018],
- ["E9FD",0x82B8],
- ["E9FE",0x8553],
- ["EAA1",0x904B],
- ["EAA2",0x9695],
- ["EAA3",0x96F2],
- ["EAA4",0x97FB],
- ["EAA5",0x851A],
- ["EAA6",0x9B31],
- ["EAA7",0x4E90],
- ["EAA8",0x718A],
- ["EAA9",0x96C4],
- ["EAAA",0x5143],
- ["EAAB",0x539F],
- ["EAAC",0x54E1],
- ["EAAD",0x5713],
- ["EAAE",0x5712],
- ["EAAF",0x57A3],
- ["EAB0",0x5A9B],
- ["EAB1",0x5AC4],
- ["EAB2",0x5BC3],
- ["EAB3",0x6028],
- ["EAB4",0x613F],
- ["EAB5",0x63F4],
- ["EAB6",0x6C85],
- ["EAB7",0x6D39],
- ["EAB8",0x6E72],
- ["EAB9",0x6E90],
- ["EABA",0x7230],
- ["EABB",0x733F],
- ["EABC",0x7457],
- ["EABD",0x82D1],
- ["EABE",0x8881],
- ["EABF",0x8F45],
- ["EAC0",0x9060],
- ["EAC1",0xF9C6],
- ["EAC2",0x9662],
- ["EAC3",0x9858],
- ["EAC4",0x9D1B],
- ["EAC5",0x6708],
- ["EAC6",0x8D8A],
- ["EAC7",0x925E],
- ["EAC8",0x4F4D],
- ["EAC9",0x5049],
- ["EACA",0x50DE],
- ["EACB",0x5371],
- ["EACC",0x570D],
- ["EACD",0x59D4],
- ["EACE",0x5A01],
- ["EACF",0x5C09],
- ["EAD0",0x6170],
- ["EAD1",0x6690],
- ["EAD2",0x6E2D],
- ["EAD3",0x7232],
- ["EAD4",0x744B],
- ["EAD5",0x7DEF],
- ["EAD6",0x80C3],
- ["EAD7",0x840E],
- ["EAD8",0x8466],
- ["EAD9",0x853F],
- ["EADA",0x875F],
- ["EADB",0x885B],
- ["EADC",0x8918],
- ["EADD",0x8B02],
- ["EADE",0x9055],
- ["EADF",0x97CB],
- ["EAE0",0x9B4F],
- ["EAE1",0x4E73],
- ["EAE2",0x4F91],
- ["EAE3",0x5112],
- ["EAE4",0x516A],
- ["EAE5",0xF9C7],
- ["EAE6",0x552F],
- ["EAE7",0x55A9],
- ["EAE8",0x5B7A],
- ["EAE9",0x5BA5],
- ["EAEA",0x5E7C],
- ["EAEB",0x5E7D],
- ["EAEC",0x5EBE],
- ["EAED",0x60A0],
- ["EAEE",0x60DF],
- ["EAEF",0x6108],
- ["EAF0",0x6109],
- ["EAF1",0x63C4],
- ["EAF2",0x6538],
- ["EAF3",0x6709],
- ["EAF4",0xF9C8],
- ["EAF5",0x67D4],
- ["EAF6",0x67DA],
- ["EAF7",0xF9C9],
- ["EAF8",0x6961],
- ["EAF9",0x6962],
- ["EAFA",0x6CB9],
- ["EAFB",0x6D27],
- ["EAFC",0xF9CA],
- ["EAFD",0x6E38],
- ["EAFE",0xF9CB],
- ["EBA1",0x6FE1],
- ["EBA2",0x7336],
- ["EBA3",0x7337],
- ["EBA4",0xF9CC],
- ["EBA5",0x745C],
- ["EBA6",0x7531],
- ["EBA7",0xF9CD],
- ["EBA8",0x7652],
- ["EBA9",0xF9CE],
- ["EBAA",0xF9CF],
- ["EBAB",0x7DAD],
- ["EBAC",0x81FE],
- ["EBAD",0x8438],
- ["EBAE",0x88D5],
- ["EBAF",0x8A98],
- ["EBB0",0x8ADB],
- ["EBB1",0x8AED],
- ["EBB2",0x8E30],
- ["EBB3",0x8E42],
- ["EBB4",0x904A],
- ["EBB5",0x903E],
- ["EBB6",0x907A],
- ["EBB7",0x9149],
- ["EBB8",0x91C9],
- ["EBB9",0x936E],
- ["EBBA",0xF9D0],
- ["EBBB",0xF9D1],
- ["EBBC",0x5809],
- ["EBBD",0xF9D2],
- ["EBBE",0x6BD3],
- ["EBBF",0x8089],
- ["EBC0",0x80B2],
- ["EBC1",0xF9D3],
- ["EBC2",0xF9D4],
- ["EBC3",0x5141],
- ["EBC4",0x596B],
- ["EBC5",0x5C39],
- ["EBC6",0xF9D5],
- ["EBC7",0xF9D6],
- ["EBC8",0x6F64],
- ["EBC9",0x73A7],
- ["EBCA",0x80E4],
- ["EBCB",0x8D07],
- ["EBCC",0xF9D7],
- ["EBCD",0x9217],
- ["EBCE",0x958F],
- ["EBCF",0xF9D8],
- ["EBD0",0xF9D9],
- ["EBD1",0xF9DA],
- ["EBD2",0xF9DB],
- ["EBD3",0x807F],
- ["EBD4",0x620E],
- ["EBD5",0x701C],
- ["EBD6",0x7D68],
- ["EBD7",0x878D],
- ["EBD8",0xF9DC],
- ["EBD9",0x57A0],
- ["EBDA",0x6069],
- ["EBDB",0x6147],
- ["EBDC",0x6BB7],
- ["EBDD",0x8ABE],
- ["EBDE",0x9280],
- ["EBDF",0x96B1],
- ["EBE0",0x4E59],
- ["EBE1",0x541F],
- ["EBE2",0x6DEB],
- ["EBE3",0x852D],
- ["EBE4",0x9670],
- ["EBE5",0x97F3],
- ["EBE6",0x98EE],
- ["EBE7",0x63D6],
- ["EBE8",0x6CE3],
- ["EBE9",0x9091],
- ["EBEA",0x51DD],
- ["EBEB",0x61C9],
- ["EBEC",0x81BA],
- ["EBED",0x9DF9],
- ["EBEE",0x4F9D],
- ["EBEF",0x501A],
- ["EBF0",0x5100],
- ["EBF1",0x5B9C],
- ["EBF2",0x610F],
- ["EBF3",0x61FF],
- ["EBF4",0x64EC],
- ["EBF5",0x6905],
- ["EBF6",0x6BC5],
- ["EBF7",0x7591],
- ["EBF8",0x77E3],
- ["EBF9",0x7FA9],
- ["EBFA",0x8264],
- ["EBFB",0x858F],
- ["EBFC",0x87FB],
- ["EBFD",0x8863],
- ["EBFE",0x8ABC],
- ["ECA1",0x8B70],
- ["ECA2",0x91AB],
- ["ECA3",0x4E8C],
- ["ECA4",0x4EE5],
- ["ECA5",0x4F0A],
- ["ECA6",0xF9DD],
- ["ECA7",0xF9DE],
- ["ECA8",0x5937],
- ["ECA9",0x59E8],
- ["ECAA",0xF9DF],
- ["ECAB",0x5DF2],
- ["ECAC",0x5F1B],
- ["ECAD",0x5F5B],
- ["ECAE",0x6021],
- ["ECAF",0xF9E0],
- ["ECB0",0xF9E1],
- ["ECB1",0xF9E2],
- ["ECB2",0xF9E3],
- ["ECB3",0x723E],
- ["ECB4",0x73E5],
- ["ECB5",0xF9E4],
- ["ECB6",0x7570],
- ["ECB7",0x75CD],
- ["ECB8",0xF9E5],
- ["ECB9",0x79FB],
- ["ECBA",0xF9E6],
- ["ECBB",0x800C],
- ["ECBC",0x8033],
- ["ECBD",0x8084],
- ["ECBE",0x82E1],
- ["ECBF",0x8351],
- ["ECC0",0xF9E7],
- ["ECC1",0xF9E8],
- ["ECC2",0x8CBD],
- ["ECC3",0x8CB3],
- ["ECC4",0x9087],
- ["ECC5",0xF9E9],
- ["ECC6",0xF9EA],
- ["ECC7",0x98F4],
- ["ECC8",0x990C],
- ["ECC9",0xF9EB],
- ["ECCA",0xF9EC],
- ["ECCB",0x7037],
- ["ECCC",0x76CA],
- ["ECCD",0x7FCA],
- ["ECCE",0x7FCC],
- ["ECCF",0x7FFC],
- ["ECD0",0x8B1A],
- ["ECD1",0x4EBA],
- ["ECD2",0x4EC1],
- ["ECD3",0x5203],
- ["ECD4",0x5370],
- ["ECD5",0xF9ED],
- ["ECD6",0x54BD],
- ["ECD7",0x56E0],
- ["ECD8",0x59FB],
- ["ECD9",0x5BC5],
- ["ECDA",0x5F15],
- ["ECDB",0x5FCD],
- ["ECDC",0x6E6E],
- ["ECDD",0xF9EE],
- ["ECDE",0xF9EF],
- ["ECDF",0x7D6A],
- ["ECE0",0x8335],
- ["ECE1",0xF9F0],
- ["ECE2",0x8693],
- ["ECE3",0x8A8D],
- ["ECE4",0xF9F1],
- ["ECE5",0x976D],
- ["ECE6",0x9777],
- ["ECE7",0xF9F2],
- ["ECE8",0xF9F3],
- ["ECE9",0x4E00],
- ["ECEA",0x4F5A],
- ["ECEB",0x4F7E],
- ["ECEC",0x58F9],
- ["ECED",0x65E5],
- ["ECEE",0x6EA2],
- ["ECEF",0x9038],
- ["ECF0",0x93B0],
- ["ECF1",0x99B9],
- ["ECF2",0x4EFB],
- ["ECF3",0x58EC],
- ["ECF4",0x598A],
- ["ECF5",0x59D9],
- ["ECF6",0x6041],
- ["ECF7",0xF9F4],
- ["ECF8",0xF9F5],
- ["ECF9",0x7A14],
- ["ECFA",0xF9F6],
- ["ECFB",0x834F],
- ["ECFC",0x8CC3],
- ["ECFD",0x5165],
- ["ECFE",0x5344],
- ["EDA1",0xF9F7],
- ["EDA2",0xF9F8],
- ["EDA3",0xF9F9],
- ["EDA4",0x4ECD],
- ["EDA5",0x5269],
- ["EDA6",0x5B55],
- ["EDA7",0x82BF],
- ["EDA8",0x4ED4],
- ["EDA9",0x523A],
- ["EDAA",0x54A8],
- ["EDAB",0x59C9],
- ["EDAC",0x59FF],
- ["EDAD",0x5B50],
- ["EDAE",0x5B57],
- ["EDAF",0x5B5C],
- ["EDB0",0x6063],
- ["EDB1",0x6148],
- ["EDB2",0x6ECB],
- ["EDB3",0x7099],
- ["EDB4",0x716E],
- ["EDB5",0x7386],
- ["EDB6",0x74F7],
- ["EDB7",0x75B5],
- ["EDB8",0x78C1],
- ["EDB9",0x7D2B],
- ["EDBA",0x8005],
- ["EDBB",0x81EA],
- ["EDBC",0x8328],
- ["EDBD",0x8517],
- ["EDBE",0x85C9],
- ["EDBF",0x8AEE],
- ["EDC0",0x8CC7],
- ["EDC1",0x96CC],
- ["EDC2",0x4F5C],
- ["EDC3",0x52FA],
- ["EDC4",0x56BC],
- ["EDC5",0x65AB],
- ["EDC6",0x6628],
- ["EDC7",0x707C],
- ["EDC8",0x70B8],
- ["EDC9",0x7235],
- ["EDCA",0x7DBD],
- ["EDCB",0x828D],
- ["EDCC",0x914C],
- ["EDCD",0x96C0],
- ["EDCE",0x9D72],
- ["EDCF",0x5B71],
- ["EDD0",0x68E7],
- ["EDD1",0x6B98],
- ["EDD2",0x6F7A],
- ["EDD3",0x76DE],
- ["EDD4",0x5C91],
- ["EDD5",0x66AB],
- ["EDD6",0x6F5B],
- ["EDD7",0x7BB4],
- ["EDD8",0x7C2A],
- ["EDD9",0x8836],
- ["EDDA",0x96DC],
- ["EDDB",0x4E08],
- ["EDDC",0x4ED7],
- ["EDDD",0x5320],
- ["EDDE",0x5834],
- ["EDDF",0x58BB],
- ["EDE0",0x58EF],
- ["EDE1",0x596C],
- ["EDE2",0x5C07],
- ["EDE3",0x5E33],
- ["EDE4",0x5E84],
- ["EDE5",0x5F35],
- ["EDE6",0x638C],
- ["EDE7",0x66B2],
- ["EDE8",0x6756],
- ["EDE9",0x6A1F],
- ["EDEA",0x6AA3],
- ["EDEB",0x6B0C],
- ["EDEC",0x6F3F],
- ["EDED",0x7246],
- ["EDEE",0xF9FA],
- ["EDEF",0x7350],
- ["EDF0",0x748B],
- ["EDF1",0x7AE0],
- ["EDF2",0x7CA7],
- ["EDF3",0x8178],
- ["EDF4",0x81DF],
- ["EDF5",0x81E7],
- ["EDF6",0x838A],
- ["EDF7",0x846C],
- ["EDF8",0x8523],
- ["EDF9",0x8594],
- ["EDFA",0x85CF],
- ["EDFB",0x88DD],
- ["EDFC",0x8D13],
- ["EDFD",0x91AC],
- ["EDFE",0x9577],
- ["EEA1",0x969C],
- ["EEA2",0x518D],
- ["EEA3",0x54C9],
- ["EEA4",0x5728],
- ["EEA5",0x5BB0],
- ["EEA6",0x624D],
- ["EEA7",0x6750],
- ["EEA8",0x683D],
- ["EEA9",0x6893],
- ["EEAA",0x6E3D],
- ["EEAB",0x6ED3],
- ["EEAC",0x707D],
- ["EEAD",0x7E21],
- ["EEAE",0x88C1],
- ["EEAF",0x8CA1],
- ["EEB0",0x8F09],
- ["EEB1",0x9F4B],
- ["EEB2",0x9F4E],
- ["EEB3",0x722D],
- ["EEB4",0x7B8F],
- ["EEB5",0x8ACD],
- ["EEB6",0x931A],
- ["EEB7",0x4F47],
- ["EEB8",0x4F4E],
- ["EEB9",0x5132],
- ["EEBA",0x5480],
- ["EEBB",0x59D0],
- ["EEBC",0x5E95],
- ["EEBD",0x62B5],
- ["EEBE",0x6775],
- ["EEBF",0x696E],
- ["EEC0",0x6A17],
- ["EEC1",0x6CAE],
- ["EEC2",0x6E1A],
- ["EEC3",0x72D9],
- ["EEC4",0x732A],
- ["EEC5",0x75BD],
- ["EEC6",0x7BB8],
- ["EEC7",0x7D35],
- ["EEC8",0x82E7],
- ["EEC9",0x83F9],
- ["EECA",0x8457],
- ["EECB",0x85F7],
- ["EECC",0x8A5B],
- ["EECD",0x8CAF],
- ["EECE",0x8E87],
- ["EECF",0x9019],
- ["EED0",0x90B8],
- ["EED1",0x96CE],
- ["EED2",0x9F5F],
- ["EED3",0x52E3],
- ["EED4",0x540A],
- ["EED5",0x5AE1],
- ["EED6",0x5BC2],
- ["EED7",0x6458],
- ["EED8",0x6575],
- ["EED9",0x6EF4],
- ["EEDA",0x72C4],
- ["EEDB",0xF9FB],
- ["EEDC",0x7684],
- ["EEDD",0x7A4D],
- ["EEDE",0x7B1B],
- ["EEDF",0x7C4D],
- ["EEE0",0x7E3E],
- ["EEE1",0x7FDF],
- ["EEE2",0x837B],
- ["EEE3",0x8B2B],
- ["EEE4",0x8CCA],
- ["EEE5",0x8D64],
- ["EEE6",0x8DE1],
- ["EEE7",0x8E5F],
- ["EEE8",0x8FEA],
- ["EEE9",0x8FF9],
- ["EEEA",0x9069],
- ["EEEB",0x93D1],
- ["EEEC",0x4F43],
- ["EEED",0x4F7A],
- ["EEEE",0x50B3],
- ["EEEF",0x5168],
- ["EEF0",0x5178],
- ["EEF1",0x524D],
- ["EEF2",0x526A],
- ["EEF3",0x5861],
- ["EEF4",0x587C],
- ["EEF5",0x5960],
- ["EEF6",0x5C08],
- ["EEF7",0x5C55],
- ["EEF8",0x5EDB],
- ["EEF9",0x609B],
- ["EEFA",0x6230],
- ["EEFB",0x6813],
- ["EEFC",0x6BBF],
- ["EEFD",0x6C08],
- ["EEFE",0x6FB1],
- ["EFA1",0x714E],
- ["EFA2",0x7420],
- ["EFA3",0x7530],
- ["EFA4",0x7538],
- ["EFA5",0x7551],
- ["EFA6",0x7672],
- ["EFA7",0x7B4C],
- ["EFA8",0x7B8B],
- ["EFA9",0x7BAD],
- ["EFAA",0x7BC6],
- ["EFAB",0x7E8F],
- ["EFAC",0x8A6E],
- ["EFAD",0x8F3E],
- ["EFAE",0x8F49],
- ["EFAF",0x923F],
- ["EFB0",0x9293],
- ["EFB1",0x9322],
- ["EFB2",0x942B],
- ["EFB3",0x96FB],
- ["EFB4",0x985A],
- ["EFB5",0x986B],
- ["EFB6",0x991E],
- ["EFB7",0x5207],
- ["EFB8",0x622A],
- ["EFB9",0x6298],
- ["EFBA",0x6D59],
- ["EFBB",0x7664],
- ["EFBC",0x7ACA],
- ["EFBD",0x7BC0],
- ["EFBE",0x7D76],
- ["EFBF",0x5360],
- ["EFC0",0x5CBE],
- ["EFC1",0x5E97],
- ["EFC2",0x6F38],
- ["EFC3",0x70B9],
- ["EFC4",0x7C98],
- ["EFC5",0x9711],
- ["EFC6",0x9B8E],
- ["EFC7",0x9EDE],
- ["EFC8",0x63A5],
- ["EFC9",0x647A],
- ["EFCA",0x8776],
- ["EFCB",0x4E01],
- ["EFCC",0x4E95],
- ["EFCD",0x4EAD],
- ["EFCE",0x505C],
- ["EFCF",0x5075],
- ["EFD0",0x5448],
- ["EFD1",0x59C3],
- ["EFD2",0x5B9A],
- ["EFD3",0x5E40],
- ["EFD4",0x5EAD],
- ["EFD5",0x5EF7],
- ["EFD6",0x5F81],
- ["EFD7",0x60C5],
- ["EFD8",0x633A],
- ["EFD9",0x653F],
- ["EFDA",0x6574],
- ["EFDB",0x65CC],
- ["EFDC",0x6676],
- ["EFDD",0x6678],
- ["EFDE",0x67FE],
- ["EFDF",0x6968],
- ["EFE0",0x6A89],
- ["EFE1",0x6B63],
- ["EFE2",0x6C40],
- ["EFE3",0x6DC0],
- ["EFE4",0x6DE8],
- ["EFE5",0x6E1F],
- ["EFE6",0x6E5E],
- ["EFE7",0x701E],
- ["EFE8",0x70A1],
- ["EFE9",0x738E],
- ["EFEA",0x73FD],
- ["EFEB",0x753A],
- ["EFEC",0x775B],
- ["EFED",0x7887],
- ["EFEE",0x798E],
- ["EFEF",0x7A0B],
- ["EFF0",0x7A7D],
- ["EFF1",0x7CBE],
- ["EFF2",0x7D8E],
- ["EFF3",0x8247],
- ["EFF4",0x8A02],
- ["EFF5",0x8AEA],
- ["EFF6",0x8C9E],
- ["EFF7",0x912D],
- ["EFF8",0x914A],
- ["EFF9",0x91D8],
- ["EFFA",0x9266],
- ["EFFB",0x92CC],
- ["EFFC",0x9320],
- ["EFFD",0x9706],
- ["EFFE",0x9756],
- ["F0A1",0x975C],
- ["F0A2",0x9802],
- ["F0A3",0x9F0E],
- ["F0A4",0x5236],
- ["F0A5",0x5291],
- ["F0A6",0x557C],
- ["F0A7",0x5824],
- ["F0A8",0x5E1D],
- ["F0A9",0x5F1F],
- ["F0AA",0x608C],
- ["F0AB",0x63D0],
- ["F0AC",0x68AF],
- ["F0AD",0x6FDF],
- ["F0AE",0x796D],
- ["F0AF",0x7B2C],
- ["F0B0",0x81CD],
- ["F0B1",0x85BA],
- ["F0B2",0x88FD],
- ["F0B3",0x8AF8],
- ["F0B4",0x8E44],
- ["F0B5",0x918D],
- ["F0B6",0x9664],
- ["F0B7",0x969B],
- ["F0B8",0x973D],
- ["F0B9",0x984C],
- ["F0BA",0x9F4A],
- ["F0BB",0x4FCE],
- ["F0BC",0x5146],
- ["F0BD",0x51CB],
- ["F0BE",0x52A9],
- ["F0BF",0x5632],
- ["F0C0",0x5F14],
- ["F0C1",0x5F6B],
- ["F0C2",0x63AA],
- ["F0C3",0x64CD],
- ["F0C4",0x65E9],
- ["F0C5",0x6641],
- ["F0C6",0x66FA],
- ["F0C7",0x66F9],
- ["F0C8",0x671D],
- ["F0C9",0x689D],
- ["F0CA",0x68D7],
- ["F0CB",0x69FD],
- ["F0CC",0x6F15],
- ["F0CD",0x6F6E],
- ["F0CE",0x7167],
- ["F0CF",0x71E5],
- ["F0D0",0x722A],
- ["F0D1",0x74AA],
- ["F0D2",0x773A],
- ["F0D3",0x7956],
- ["F0D4",0x795A],
- ["F0D5",0x79DF],
- ["F0D6",0x7A20],
- ["F0D7",0x7A95],
- ["F0D8",0x7C97],
- ["F0D9",0x7CDF],
- ["F0DA",0x7D44],
- ["F0DB",0x7E70],
- ["F0DC",0x8087],
- ["F0DD",0x85FB],
- ["F0DE",0x86A4],
- ["F0DF",0x8A54],
- ["F0E0",0x8ABF],
- ["F0E1",0x8D99],
- ["F0E2",0x8E81],
- ["F0E3",0x9020],
- ["F0E4",0x906D],
- ["F0E5",0x91E3],
- ["F0E6",0x963B],
- ["F0E7",0x96D5],
- ["F0E8",0x9CE5],
- ["F0E9",0x65CF],
- ["F0EA",0x7C07],
- ["F0EB",0x8DB3],
- ["F0EC",0x93C3],
- ["F0ED",0x5B58],
- ["F0EE",0x5C0A],
- ["F0EF",0x5352],
- ["F0F0",0x62D9],
- ["F0F1",0x731D],
- ["F0F2",0x5027],
- ["F0F3",0x5B97],
- ["F0F4",0x5F9E],
- ["F0F5",0x60B0],
- ["F0F6",0x616B],
- ["F0F7",0x68D5],
- ["F0F8",0x6DD9],
- ["F0F9",0x742E],
- ["F0FA",0x7A2E],
- ["F0FB",0x7D42],
- ["F0FC",0x7D9C],
- ["F0FD",0x7E31],
- ["F0FE",0x816B],
- ["F1A1",0x8E2A],
- ["F1A2",0x8E35],
- ["F1A3",0x937E],
- ["F1A4",0x9418],
- ["F1A5",0x4F50],
- ["F1A6",0x5750],
- ["F1A7",0x5DE6],
- ["F1A8",0x5EA7],
- ["F1A9",0x632B],
- ["F1AA",0x7F6A],
- ["F1AB",0x4E3B],
- ["F1AC",0x4F4F],
- ["F1AD",0x4F8F],
- ["F1AE",0x505A],
- ["F1AF",0x59DD],
- ["F1B0",0x80C4],
- ["F1B1",0x546A],
- ["F1B2",0x5468],
- ["F1B3",0x55FE],
- ["F1B4",0x594F],
- ["F1B5",0x5B99],
- ["F1B6",0x5DDE],
- ["F1B7",0x5EDA],
- ["F1B8",0x665D],
- ["F1B9",0x6731],
- ["F1BA",0x67F1],
- ["F1BB",0x682A],
- ["F1BC",0x6CE8],
- ["F1BD",0x6D32],
- ["F1BE",0x6E4A],
- ["F1BF",0x6F8D],
- ["F1C0",0x70B7],
- ["F1C1",0x73E0],
- ["F1C2",0x7587],
- ["F1C3",0x7C4C],
- ["F1C4",0x7D02],
- ["F1C5",0x7D2C],
- ["F1C6",0x7DA2],
- ["F1C7",0x821F],
- ["F1C8",0x86DB],
- ["F1C9",0x8A3B],
- ["F1CA",0x8A85],
- ["F1CB",0x8D70],
- ["F1CC",0x8E8A],
- ["F1CD",0x8F33],
- ["F1CE",0x9031],
- ["F1CF",0x914E],
- ["F1D0",0x9152],
- ["F1D1",0x9444],
- ["F1D2",0x99D0],
- ["F1D3",0x7AF9],
- ["F1D4",0x7CA5],
- ["F1D5",0x4FCA],
- ["F1D6",0x5101],
- ["F1D7",0x51C6],
- ["F1D8",0x57C8],
- ["F1D9",0x5BEF],
- ["F1DA",0x5CFB],
- ["F1DB",0x6659],
- ["F1DC",0x6A3D],
- ["F1DD",0x6D5A],
- ["F1DE",0x6E96],
- ["F1DF",0x6FEC],
- ["F1E0",0x710C],
- ["F1E1",0x756F],
- ["F1E2",0x7AE3],
- ["F1E3",0x8822],
- ["F1E4",0x9021],
- ["F1E5",0x9075],
- ["F1E6",0x96CB],
- ["F1E7",0x99FF],
- ["F1E8",0x8301],
- ["F1E9",0x4E2D],
- ["F1EA",0x4EF2],
- ["F1EB",0x8846],
- ["F1EC",0x91CD],
- ["F1ED",0x537D],
- ["F1EE",0x6ADB],
- ["F1EF",0x696B],
- ["F1F0",0x6C41],
- ["F1F1",0x847A],
- ["F1F2",0x589E],
- ["F1F3",0x618E],
- ["F1F4",0x66FE],
- ["F1F5",0x62EF],
- ["F1F6",0x70DD],
- ["F1F7",0x7511],
- ["F1F8",0x75C7],
- ["F1F9",0x7E52],
- ["F1FA",0x84B8],
- ["F1FB",0x8B49],
- ["F1FC",0x8D08],
- ["F1FD",0x4E4B],
- ["F1FE",0x53EA],
- ["F2A1",0x54AB],
- ["F2A2",0x5730],
- ["F2A3",0x5740],
- ["F2A4",0x5FD7],
- ["F2A5",0x6301],
- ["F2A6",0x6307],
- ["F2A7",0x646F],
- ["F2A8",0x652F],
- ["F2A9",0x65E8],
- ["F2AA",0x667A],
- ["F2AB",0x679D],
- ["F2AC",0x67B3],
- ["F2AD",0x6B62],
- ["F2AE",0x6C60],
- ["F2AF",0x6C9A],
- ["F2B0",0x6F2C],
- ["F2B1",0x77E5],
- ["F2B2",0x7825],
- ["F2B3",0x7949],
- ["F2B4",0x7957],
- ["F2B5",0x7D19],
- ["F2B6",0x80A2],
- ["F2B7",0x8102],
- ["F2B8",0x81F3],
- ["F2B9",0x829D],
- ["F2BA",0x82B7],
- ["F2BB",0x8718],
- ["F2BC",0x8A8C],
- ["F2BD",0xF9FC],
- ["F2BE",0x8D04],
- ["F2BF",0x8DBE],
- ["F2C0",0x9072],
- ["F2C1",0x76F4],
- ["F2C2",0x7A19],
- ["F2C3",0x7A37],
- ["F2C4",0x7E54],
- ["F2C5",0x8077],
- ["F2C6",0x5507],
- ["F2C7",0x55D4],
- ["F2C8",0x5875],
- ["F2C9",0x632F],
- ["F2CA",0x6422],
- ["F2CB",0x6649],
- ["F2CC",0x664B],
- ["F2CD",0x686D],
- ["F2CE",0x699B],
- ["F2CF",0x6B84],
- ["F2D0",0x6D25],
- ["F2D1",0x6EB1],
- ["F2D2",0x73CD],
- ["F2D3",0x7468],
- ["F2D4",0x74A1],
- ["F2D5",0x755B],
- ["F2D6",0x75B9],
- ["F2D7",0x76E1],
- ["F2D8",0x771E],
- ["F2D9",0x778B],
- ["F2DA",0x79E6],
- ["F2DB",0x7E09],
- ["F2DC",0x7E1D],
- ["F2DD",0x81FB],
- ["F2DE",0x852F],
- ["F2DF",0x8897],
- ["F2E0",0x8A3A],
- ["F2E1",0x8CD1],
- ["F2E2",0x8EEB],
- ["F2E3",0x8FB0],
- ["F2E4",0x9032],
- ["F2E5",0x93AD],
- ["F2E6",0x9663],
- ["F2E7",0x9673],
- ["F2E8",0x9707],
- ["F2E9",0x4F84],
- ["F2EA",0x53F1],
- ["F2EB",0x59EA],
- ["F2EC",0x5AC9],
- ["F2ED",0x5E19],
- ["F2EE",0x684E],
- ["F2EF",0x74C6],
- ["F2F0",0x75BE],
- ["F2F1",0x79E9],
- ["F2F2",0x7A92],
- ["F2F3",0x81A3],
- ["F2F4",0x86ED],
- ["F2F5",0x8CEA],
- ["F2F6",0x8DCC],
- ["F2F7",0x8FED],
- ["F2F8",0x659F],
- ["F2F9",0x6715],
- ["F2FA",0xF9FD],
- ["F2FB",0x57F7],
- ["F2FC",0x6F57],
- ["F2FD",0x7DDD],
- ["F2FE",0x8F2F],
- ["F3A1",0x93F6],
- ["F3A2",0x96C6],
- ["F3A3",0x5FB5],
- ["F3A4",0x61F2],
- ["F3A5",0x6F84],
- ["F3A6",0x4E14],
- ["F3A7",0x4F98],
- ["F3A8",0x501F],
- ["F3A9",0x53C9],
- ["F3AA",0x55DF],
- ["F3AB",0x5D6F],
- ["F3AC",0x5DEE],
- ["F3AD",0x6B21],
- ["F3AE",0x6B64],
- ["F3AF",0x78CB],
- ["F3B0",0x7B9A],
- ["F3B1",0xF9FE],
- ["F3B2",0x8E49],
- ["F3B3",0x8ECA],
- ["F3B4",0x906E],
- ["F3B5",0x6349],
- ["F3B6",0x643E],
- ["F3B7",0x7740],
- ["F3B8",0x7A84],
- ["F3B9",0x932F],
- ["F3BA",0x947F],
- ["F3BB",0x9F6A],
- ["F3BC",0x64B0],
- ["F3BD",0x6FAF],
- ["F3BE",0x71E6],
- ["F3BF",0x74A8],
- ["F3C0",0x74DA],
- ["F3C1",0x7AC4],
- ["F3C2",0x7C12],
- ["F3C3",0x7E82],
- ["F3C4",0x7CB2],
- ["F3C5",0x7E98],
- ["F3C6",0x8B9A],
- ["F3C7",0x8D0A],
- ["F3C8",0x947D],
- ["F3C9",0x9910],
- ["F3CA",0x994C],
- ["F3CB",0x5239],
- ["F3CC",0x5BDF],
- ["F3CD",0x64E6],
- ["F3CE",0x672D],
- ["F3CF",0x7D2E],
- ["F3D0",0x50ED],
- ["F3D1",0x53C3],
- ["F3D2",0x5879],
- ["F3D3",0x6158],
- ["F3D4",0x6159],
- ["F3D5",0x61FA],
- ["F3D6",0x65AC],
- ["F3D7",0x7AD9],
- ["F3D8",0x8B92],
- ["F3D9",0x8B96],
- ["F3DA",0x5009],
- ["F3DB",0x5021],
- ["F3DC",0x5275],
- ["F3DD",0x5531],
- ["F3DE",0x5A3C],
- ["F3DF",0x5EE0],
- ["F3E0",0x5F70],
- ["F3E1",0x6134],
- ["F3E2",0x655E],
- ["F3E3",0x660C],
- ["F3E4",0x6636],
- ["F3E5",0x66A2],
- ["F3E6",0x69CD],
- ["F3E7",0x6EC4],
- ["F3E8",0x6F32],
- ["F3E9",0x7316],
- ["F3EA",0x7621],
- ["F3EB",0x7A93],
- ["F3EC",0x8139],
- ["F3ED",0x8259],
- ["F3EE",0x83D6],
- ["F3EF",0x84BC],
- ["F3F0",0x50B5],
- ["F3F1",0x57F0],
- ["F3F2",0x5BC0],
- ["F3F3",0x5BE8],
- ["F3F4",0x5F69],
- ["F3F5",0x63A1],
- ["F3F6",0x7826],
- ["F3F7",0x7DB5],
- ["F3F8",0x83DC],
- ["F3F9",0x8521],
- ["F3FA",0x91C7],
- ["F3FB",0x91F5],
- ["F3FC",0x518A],
- ["F3FD",0x67F5],
- ["F3FE",0x7B56],
- ["F4A1",0x8CAC],
- ["F4A2",0x51C4],
- ["F4A3",0x59BB],
- ["F4A4",0x60BD],
- ["F4A5",0x8655],
- ["F4A6",0x501C],
- ["F4A7",0xF9FF],
- ["F4A8",0x5254],
- ["F4A9",0x5C3A],
- ["F4AA",0x617D],
- ["F4AB",0x621A],
- ["F4AC",0x62D3],
- ["F4AD",0x64F2],
- ["F4AE",0x65A5],
- ["F4AF",0x6ECC],
- ["F4B0",0x7620],
- ["F4B1",0x810A],
- ["F4B2",0x8E60],
- ["F4B3",0x965F],
- ["F4B4",0x96BB],
- ["F4B5",0x4EDF],
- ["F4B6",0x5343],
- ["F4B7",0x5598],
- ["F4B8",0x5929],
- ["F4B9",0x5DDD],
- ["F4BA",0x64C5],
- ["F4BB",0x6CC9],
- ["F4BC",0x6DFA],
- ["F4BD",0x7394],
- ["F4BE",0x7A7F],
- ["F4BF",0x821B],
- ["F4C0",0x85A6],
- ["F4C1",0x8CE4],
- ["F4C2",0x8E10],
- ["F4C3",0x9077],
- ["F4C4",0x91E7],
- ["F4C5",0x95E1],
- ["F4C6",0x9621],
- ["F4C7",0x97C6],
- ["F4C8",0x51F8],
- ["F4C9",0x54F2],
- ["F4CA",0x5586],
- ["F4CB",0x5FB9],
- ["F4CC",0x64A4],
- ["F4CD",0x6F88],
- ["F4CE",0x7DB4],
- ["F4CF",0x8F1F],
- ["F4D0",0x8F4D],
- ["F4D1",0x9435],
- ["F4D2",0x50C9],
- ["F4D3",0x5C16],
- ["F4D4",0x6CBE],
- ["F4D5",0x6DFB],
- ["F4D6",0x751B],
- ["F4D7",0x77BB],
- ["F4D8",0x7C3D],
- ["F4D9",0x7C64],
- ["F4DA",0x8A79],
- ["F4DB",0x8AC2],
- ["F4DC",0x581E],
- ["F4DD",0x59BE],
- ["F4DE",0x5E16],
- ["F4DF",0x6377],
- ["F4E0",0x7252],
- ["F4E1",0x758A],
- ["F4E2",0x776B],
- ["F4E3",0x8ADC],
- ["F4E4",0x8CBC],
- ["F4E5",0x8F12],
- ["F4E6",0x5EF3],
- ["F4E7",0x6674],
- ["F4E8",0x6DF8],
- ["F4E9",0x807D],
- ["F4EA",0x83C1],
- ["F4EB",0x8ACB],
- ["F4EC",0x9751],
- ["F4ED",0x9BD6],
- ["F4EE",0xFA00],
- ["F4EF",0x5243],
- ["F4F0",0x66FF],
- ["F4F1",0x6D95],
- ["F4F2",0x6EEF],
- ["F4F3",0x7DE0],
- ["F4F4",0x8AE6],
- ["F4F5",0x902E],
- ["F4F6",0x905E],
- ["F4F7",0x9AD4],
- ["F4F8",0x521D],
- ["F4F9",0x527F],
- ["F4FA",0x54E8],
- ["F4FB",0x6194],
- ["F4FC",0x6284],
- ["F4FD",0x62DB],
- ["F4FE",0x68A2],
- ["F5A1",0x6912],
- ["F5A2",0x695A],
- ["F5A3",0x6A35],
- ["F5A4",0x7092],
- ["F5A5",0x7126],
- ["F5A6",0x785D],
- ["F5A7",0x7901],
- ["F5A8",0x790E],
- ["F5A9",0x79D2],
- ["F5AA",0x7A0D],
- ["F5AB",0x8096],
- ["F5AC",0x8278],
- ["F5AD",0x82D5],
- ["F5AE",0x8349],
- ["F5AF",0x8549],
- ["F5B0",0x8C82],
- ["F5B1",0x8D85],
- ["F5B2",0x9162],
- ["F5B3",0x918B],
- ["F5B4",0x91AE],
- ["F5B5",0x4FC3],
- ["F5B6",0x56D1],
- ["F5B7",0x71ED],
- ["F5B8",0x77D7],
- ["F5B9",0x8700],
- ["F5BA",0x89F8],
- ["F5BB",0x5BF8],
- ["F5BC",0x5FD6],
- ["F5BD",0x6751],
- ["F5BE",0x90A8],
- ["F5BF",0x53E2],
- ["F5C0",0x585A],
- ["F5C1",0x5BF5],
- ["F5C2",0x60A4],
- ["F5C3",0x6181],
- ["F5C4",0x6460],
- ["F5C5",0x7E3D],
- ["F5C6",0x8070],
- ["F5C7",0x8525],
- ["F5C8",0x9283],
- ["F5C9",0x64AE],
- ["F5CA",0x50AC],
- ["F5CB",0x5D14],
- ["F5CC",0x6700],
- ["F5CD",0x589C],
- ["F5CE",0x62BD],
- ["F5CF",0x63A8],
- ["F5D0",0x690E],
- ["F5D1",0x6978],
- ["F5D2",0x6A1E],
- ["F5D3",0x6E6B],
- ["F5D4",0x76BA],
- ["F5D5",0x79CB],
- ["F5D6",0x82BB],
- ["F5D7",0x8429],
- ["F5D8",0x8ACF],
- ["F5D9",0x8DA8],
- ["F5DA",0x8FFD],
- ["F5DB",0x9112],
- ["F5DC",0x914B],
- ["F5DD",0x919C],
- ["F5DE",0x9310],
- ["F5DF",0x9318],
- ["F5E0",0x939A],
- ["F5E1",0x96DB],
- ["F5E2",0x9A36],
- ["F5E3",0x9C0D],
- ["F5E4",0x4E11],
- ["F5E5",0x755C],
- ["F5E6",0x795D],
- ["F5E7",0x7AFA],
- ["F5E8",0x7B51],
- ["F5E9",0x7BC9],
- ["F5EA",0x7E2E],
- ["F5EB",0x84C4],
- ["F5EC",0x8E59],
- ["F5ED",0x8E74],
- ["F5EE",0x8EF8],
- ["F5EF",0x9010],
- ["F5F0",0x6625],
- ["F5F1",0x693F],
- ["F5F2",0x7443],
- ["F5F3",0x51FA],
- ["F5F4",0x672E],
- ["F5F5",0x9EDC],
- ["F5F6",0x5145],
- ["F5F7",0x5FE0],
- ["F5F8",0x6C96],
- ["F5F9",0x87F2],
- ["F5FA",0x885D],
- ["F5FB",0x8877],
- ["F5FC",0x60B4],
- ["F5FD",0x81B5],
- ["F5FE",0x8403],
- ["F6A1",0x8D05],
- ["F6A2",0x53D6],
- ["F6A3",0x5439],
- ["F6A4",0x5634],
- ["F6A5",0x5A36],
- ["F6A6",0x5C31],
- ["F6A7",0x708A],
- ["F6A8",0x7FE0],
- ["F6A9",0x805A],
- ["F6AA",0x8106],
- ["F6AB",0x81ED],
- ["F6AC",0x8DA3],
- ["F6AD",0x9189],
- ["F6AE",0x9A5F],
- ["F6AF",0x9DF2],
- ["F6B0",0x5074],
- ["F6B1",0x4EC4],
- ["F6B2",0x53A0],
- ["F6B3",0x60FB],
- ["F6B4",0x6E2C],
- ["F6B5",0x5C64],
- ["F6B6",0x4F88],
- ["F6B7",0x5024],
- ["F6B8",0x55E4],
- ["F6B9",0x5CD9],
- ["F6BA",0x5E5F],
- ["F6BB",0x6065],
- ["F6BC",0x6894],
- ["F6BD",0x6CBB],
- ["F6BE",0x6DC4],
- ["F6BF",0x71BE],
- ["F6C0",0x75D4],
- ["F6C1",0x75F4],
- ["F6C2",0x7661],
- ["F6C3",0x7A1A],
- ["F6C4",0x7A49],
- ["F6C5",0x7DC7],
- ["F6C6",0x7DFB],
- ["F6C7",0x7F6E],
- ["F6C8",0x81F4],
- ["F6C9",0x86A9],
- ["F6CA",0x8F1C],
- ["F6CB",0x96C9],
- ["F6CC",0x99B3],
- ["F6CD",0x9F52],
- ["F6CE",0x5247],
- ["F6CF",0x52C5],
- ["F6D0",0x98ED],
- ["F6D1",0x89AA],
- ["F6D2",0x4E03],
- ["F6D3",0x67D2],
- ["F6D4",0x6F06],
- ["F6D5",0x4FB5],
- ["F6D6",0x5BE2],
- ["F6D7",0x6795],
- ["F6D8",0x6C88],
- ["F6D9",0x6D78],
- ["F6DA",0x741B],
- ["F6DB",0x7827],
- ["F6DC",0x91DD],
- ["F6DD",0x937C],
- ["F6DE",0x87C4],
- ["F6DF",0x79E4],
- ["F6E0",0x7A31],
- ["F6E1",0x5FEB],
- ["F6E2",0x4ED6],
- ["F6E3",0x54A4],
- ["F6E4",0x553E],
- ["F6E5",0x58AE],
- ["F6E6",0x59A5],
- ["F6E7",0x60F0],
- ["F6E8",0x6253],
- ["F6E9",0x62D6],
- ["F6EA",0x6736],
- ["F6EB",0x6955],
- ["F6EC",0x8235],
- ["F6ED",0x9640],
- ["F6EE",0x99B1],
- ["F6EF",0x99DD],
- ["F6F0",0x502C],
- ["F6F1",0x5353],
- ["F6F2",0x5544],
- ["F6F3",0x577C],
- ["F6F4",0xFA01],
- ["F6F5",0x6258],
- ["F6F6",0xFA02],
- ["F6F7",0x64E2],
- ["F6F8",0x666B],
- ["F6F9",0x67DD],
- ["F6FA",0x6FC1],
- ["F6FB",0x6FEF],
- ["F6FC",0x7422],
- ["F6FD",0x7438],
- ["F6FE",0x8A17],
- ["F7A1",0x9438],
- ["F7A2",0x5451],
- ["F7A3",0x5606],
- ["F7A4",0x5766],
- ["F7A5",0x5F48],
- ["F7A6",0x619A],
- ["F7A7",0x6B4E],
- ["F7A8",0x7058],
- ["F7A9",0x70AD],
- ["F7AA",0x7DBB],
- ["F7AB",0x8A95],
- ["F7AC",0x596A],
- ["F7AD",0x812B],
- ["F7AE",0x63A2],
- ["F7AF",0x7708],
- ["F7B0",0x803D],
- ["F7B1",0x8CAA],
- ["F7B2",0x5854],
- ["F7B3",0x642D],
- ["F7B4",0x69BB],
- ["F7B5",0x5B95],
- ["F7B6",0x5E11],
- ["F7B7",0x6E6F],
- ["F7B8",0xFA03],
- ["F7B9",0x8569],
- ["F7BA",0x514C],
- ["F7BB",0x53F0],
- ["F7BC",0x592A],
- ["F7BD",0x6020],
- ["F7BE",0x614B],
- ["F7BF",0x6B86],
- ["F7C0",0x6C70],
- ["F7C1",0x6CF0],
- ["F7C2",0x7B1E],
- ["F7C3",0x80CE],
- ["F7C4",0x82D4],
- ["F7C5",0x8DC6],
- ["F7C6",0x90B0],
- ["F7C7",0x98B1],
- ["F7C8",0xFA04],
- ["F7C9",0x64C7],
- ["F7CA",0x6FA4],
- ["F7CB",0x6491],
- ["F7CC",0x6504],
- ["F7CD",0x514E],
- ["F7CE",0x5410],
- ["F7CF",0x571F],
- ["F7D0",0x8A0E],
- ["F7D1",0x615F],
- ["F7D2",0x6876],
- ["F7D3",0xFA05],
- ["F7D4",0x75DB],
- ["F7D5",0x7B52],
- ["F7D6",0x7D71],
- ["F7D7",0x901A],
- ["F7D8",0x5806],
- ["F7D9",0x69CC],
- ["F7DA",0x817F],
- ["F7DB",0x892A],
- ["F7DC",0x9000],
- ["F7DD",0x9839],
- ["F7DE",0x5078],
- ["F7DF",0x5957],
- ["F7E0",0x59AC],
- ["F7E1",0x6295],
- ["F7E2",0x900F],
- ["F7E3",0x9B2A],
- ["F7E4",0x615D],
- ["F7E5",0x7279],
- ["F7E6",0x95D6],
- ["F7E7",0x5761],
- ["F7E8",0x5A46],
- ["F7E9",0x5DF4],
- ["F7EA",0x628A],
- ["F7EB",0x64AD],
- ["F7EC",0x64FA],
- ["F7ED",0x6777],
- ["F7EE",0x6CE2],
- ["F7EF",0x6D3E],
- ["F7F0",0x722C],
- ["F7F1",0x7436],
- ["F7F2",0x7834],
- ["F7F3",0x7F77],
- ["F7F4",0x82AD],
- ["F7F5",0x8DDB],
- ["F7F6",0x9817],
- ["F7F7",0x5224],
- ["F7F8",0x5742],
- ["F7F9",0x677F],
- ["F7FA",0x7248],
- ["F7FB",0x74E3],
- ["F7FC",0x8CA9],
- ["F7FD",0x8FA6],
- ["F7FE",0x9211],
- ["F8A1",0x962A],
- ["F8A2",0x516B],
- ["F8A3",0x53ED],
- ["F8A4",0x634C],
- ["F8A5",0x4F69],
- ["F8A6",0x5504],
- ["F8A7",0x6096],
- ["F8A8",0x6557],
- ["F8A9",0x6C9B],
- ["F8AA",0x6D7F],
- ["F8AB",0x724C],
- ["F8AC",0x72FD],
- ["F8AD",0x7A17],
- ["F8AE",0x8987],
- ["F8AF",0x8C9D],
- ["F8B0",0x5F6D],
- ["F8B1",0x6F8E],
- ["F8B2",0x70F9],
- ["F8B3",0x81A8],
- ["F8B4",0x610E],
- ["F8B5",0x4FBF],
- ["F8B6",0x504F],
- ["F8B7",0x6241],
- ["F8B8",0x7247],
- ["F8B9",0x7BC7],
- ["F8BA",0x7DE8],
- ["F8BB",0x7FE9],
- ["F8BC",0x904D],
- ["F8BD",0x97AD],
- ["F8BE",0x9A19],
- ["F8BF",0x8CB6],
- ["F8C0",0x576A],
- ["F8C1",0x5E73],
- ["F8C2",0x67B0],
- ["F8C3",0x840D],
- ["F8C4",0x8A55],
- ["F8C5",0x5420],
- ["F8C6",0x5B16],
- ["F8C7",0x5E63],
- ["F8C8",0x5EE2],
- ["F8C9",0x5F0A],
- ["F8CA",0x6583],
- ["F8CB",0x80BA],
- ["F8CC",0x853D],
- ["F8CD",0x9589],
- ["F8CE",0x965B],
- ["F8CF",0x4F48],
- ["F8D0",0x5305],
- ["F8D1",0x530D],
- ["F8D2",0x530F],
- ["F8D3",0x5486],
- ["F8D4",0x54FA],
- ["F8D5",0x5703],
- ["F8D6",0x5E03],
- ["F8D7",0x6016],
- ["F8D8",0x629B],
- ["F8D9",0x62B1],
- ["F8DA",0x6355],
- ["F8DB",0xFA06],
- ["F8DC",0x6CE1],
- ["F8DD",0x6D66],
- ["F8DE",0x75B1],
- ["F8DF",0x7832],
- ["F8E0",0x80DE],
- ["F8E1",0x812F],
- ["F8E2",0x82DE],
- ["F8E3",0x8461],
- ["F8E4",0x84B2],
- ["F8E5",0x888D],
- ["F8E6",0x8912],
- ["F8E7",0x900B],
- ["F8E8",0x92EA],
- ["F8E9",0x98FD],
- ["F8EA",0x9B91],
- ["F8EB",0x5E45],
- ["F8EC",0x66B4],
- ["F8ED",0x66DD],
- ["F8EE",0x7011],
- ["F8EF",0x7206],
- ["F8F0",0xFA07],
- ["F8F1",0x4FF5],
- ["F8F2",0x527D],
- ["F8F3",0x5F6A],
- ["F8F4",0x6153],
- ["F8F5",0x6753],
- ["F8F6",0x6A19],
- ["F8F7",0x6F02],
- ["F8F8",0x74E2],
- ["F8F9",0x7968],
- ["F8FA",0x8868],
- ["F8FB",0x8C79],
- ["F8FC",0x98C7],
- ["F8FD",0x98C4],
- ["F8FE",0x9A43],
- ["F9A1",0x54C1],
- ["F9A2",0x7A1F],
- ["F9A3",0x6953],
- ["F9A4",0x8AF7],
- ["F9A5",0x8C4A],
- ["F9A6",0x98A8],
- ["F9A7",0x99AE],
- ["F9A8",0x5F7C],
- ["F9A9",0x62AB],
- ["F9AA",0x75B2],
- ["F9AB",0x76AE],
- ["F9AC",0x88AB],
- ["F9AD",0x907F],
- ["F9AE",0x9642],
- ["F9AF",0x5339],
- ["F9B0",0x5F3C],
- ["F9B1",0x5FC5],
- ["F9B2",0x6CCC],
- ["F9B3",0x73CC],
- ["F9B4",0x7562],
- ["F9B5",0x758B],
- ["F9B6",0x7B46],
- ["F9B7",0x82FE],
- ["F9B8",0x999D],
- ["F9B9",0x4E4F],
- ["F9BA",0x903C],
- ["F9BB",0x4E0B],
- ["F9BC",0x4F55],
- ["F9BD",0x53A6],
- ["F9BE",0x590F],
- ["F9BF",0x5EC8],
- ["F9C0",0x6630],
- ["F9C1",0x6CB3],
- ["F9C2",0x7455],
- ["F9C3",0x8377],
- ["F9C4",0x8766],
- ["F9C5",0x8CC0],
- ["F9C6",0x9050],
- ["F9C7",0x971E],
- ["F9C8",0x9C15],
- ["F9C9",0x58D1],
- ["F9CA",0x5B78],
- ["F9CB",0x8650],
- ["F9CC",0x8B14],
- ["F9CD",0x9DB4],
- ["F9CE",0x5BD2],
- ["F9CF",0x6068],
- ["F9D0",0x608D],
- ["F9D1",0x65F1],
- ["F9D2",0x6C57],
- ["F9D3",0x6F22],
- ["F9D4",0x6FA3],
- ["F9D5",0x701A],
- ["F9D6",0x7F55],
- ["F9D7",0x7FF0],
- ["F9D8",0x9591],
- ["F9D9",0x9592],
- ["F9DA",0x9650],
- ["F9DB",0x97D3],
- ["F9DC",0x5272],
- ["F9DD",0x8F44],
- ["F9DE",0x51FD],
- ["F9DF",0x542B],
- ["F9E0",0x54B8],
- ["F9E1",0x5563],
- ["F9E2",0x558A],
- ["F9E3",0x6ABB],
- ["F9E4",0x6DB5],
- ["F9E5",0x7DD8],
- ["F9E6",0x8266],
- ["F9E7",0x929C],
- ["F9E8",0x9677],
- ["F9E9",0x9E79],
- ["F9EA",0x5408],
- ["F9EB",0x54C8],
- ["F9EC",0x76D2],
- ["F9ED",0x86E4],
- ["F9EE",0x95A4],
- ["F9EF",0x95D4],
- ["F9F0",0x965C],
- ["F9F1",0x4EA2],
- ["F9F2",0x4F09],
- ["F9F3",0x59EE],
- ["F9F4",0x5AE6],
- ["F9F5",0x5DF7],
- ["F9F6",0x6052],
- ["F9F7",0x6297],
- ["F9F8",0x676D],
- ["F9F9",0x6841],
- ["F9FA",0x6C86],
- ["F9FB",0x6E2F],
- ["F9FC",0x7F38],
- ["F9FD",0x809B],
- ["F9FE",0x822A],
- ["FAA1",0xFA08],
- ["FAA2",0xFA09],
- ["FAA3",0x9805],
- ["FAA4",0x4EA5],
- ["FAA5",0x5055],
- ["FAA6",0x54B3],
- ["FAA7",0x5793],
- ["FAA8",0x595A],
- ["FAA9",0x5B69],
- ["FAAA",0x5BB3],
- ["FAAB",0x61C8],
- ["FAAC",0x6977],
- ["FAAD",0x6D77],
- ["FAAE",0x7023],
- ["FAAF",0x87F9],
- ["FAB0",0x89E3],
- ["FAB1",0x8A72],
- ["FAB2",0x8AE7],
- ["FAB3",0x9082],
- ["FAB4",0x99ED],
- ["FAB5",0x9AB8],
- ["FAB6",0x52BE],
- ["FAB7",0x6838],
- ["FAB8",0x5016],
- ["FAB9",0x5E78],
- ["FABA",0x674F],
- ["FABB",0x8347],
- ["FABC",0x884C],
- ["FABD",0x4EAB],
- ["FABE",0x5411],
- ["FABF",0x56AE],
- ["FAC0",0x73E6],
- ["FAC1",0x9115],
- ["FAC2",0x97FF],
- ["FAC3",0x9909],
- ["FAC4",0x9957],
- ["FAC5",0x9999],
- ["FAC6",0x5653],
- ["FAC7",0x589F],
- ["FAC8",0x865B],
- ["FAC9",0x8A31],
- ["FACA",0x61B2],
- ["FACB",0x6AF6],
- ["FACC",0x737B],
- ["FACD",0x8ED2],
- ["FACE",0x6B47],
- ["FACF",0x96AA],
- ["FAD0",0x9A57],
- ["FAD1",0x5955],
- ["FAD2",0x7200],
- ["FAD3",0x8D6B],
- ["FAD4",0x9769],
- ["FAD5",0x4FD4],
- ["FAD6",0x5CF4],
- ["FAD7",0x5F26],
- ["FAD8",0x61F8],
- ["FAD9",0x665B],
- ["FADA",0x6CEB],
- ["FADB",0x70AB],
- ["FADC",0x7384],
- ["FADD",0x73B9],
- ["FADE",0x73FE],
- ["FADF",0x7729],
- ["FAE0",0x774D],
- ["FAE1",0x7D43],
- ["FAE2",0x7D62],
- ["FAE3",0x7E23],
- ["FAE4",0x8237],
- ["FAE5",0x8852],
- ["FAE6",0xFA0A],
- ["FAE7",0x8CE2],
- ["FAE8",0x9249],
- ["FAE9",0x986F],
- ["FAEA",0x5B51],
- ["FAEB",0x7A74],
- ["FAEC",0x8840],
- ["FAED",0x9801],
- ["FAEE",0x5ACC],
- ["FAEF",0x4FE0],
- ["FAF0",0x5354],
- ["FAF1",0x593E],
- ["FAF2",0x5CFD],
- ["FAF3",0x633E],
- ["FAF4",0x6D79],
- ["FAF5",0x72F9],
- ["FAF6",0x8105],
- ["FAF7",0x8107],
- ["FAF8",0x83A2],
- ["FAF9",0x92CF],
- ["FAFA",0x9830],
- ["FAFB",0x4EA8],
- ["FAFC",0x5144],
- ["FAFD",0x5211],
- ["FAFE",0x578B],
- ["FBA1",0x5F62],
- ["FBA2",0x6CC2],
- ["FBA3",0x6ECE],
- ["FBA4",0x7005],
- ["FBA5",0x7050],
- ["FBA6",0x70AF],
- ["FBA7",0x7192],
- ["FBA8",0x73E9],
- ["FBA9",0x7469],
- ["FBAA",0x834A],
- ["FBAB",0x87A2],
- ["FBAC",0x8861],
- ["FBAD",0x9008],
- ["FBAE",0x90A2],
- ["FBAF",0x93A3],
- ["FBB0",0x99A8],
- ["FBB1",0x516E],
- ["FBB2",0x5F57],
- ["FBB3",0x60E0],
- ["FBB4",0x6167],
- ["FBB5",0x66B3],
- ["FBB6",0x8559],
- ["FBB7",0x8E4A],
- ["FBB8",0x91AF],
- ["FBB9",0x978B],
- ["FBBA",0x4E4E],
- ["FBBB",0x4E92],
- ["FBBC",0x547C],
- ["FBBD",0x58D5],
- ["FBBE",0x58FA],
- ["FBBF",0x597D],
- ["FBC0",0x5CB5],
- ["FBC1",0x5F27],
- ["FBC2",0x6236],
- ["FBC3",0x6248],
- ["FBC4",0x660A],
- ["FBC5",0x6667],
- ["FBC6",0x6BEB],
- ["FBC7",0x6D69],
- ["FBC8",0x6DCF],
- ["FBC9",0x6E56],
- ["FBCA",0x6EF8],
- ["FBCB",0x6F94],
- ["FBCC",0x6FE0],
- ["FBCD",0x6FE9],
- ["FBCE",0x705D],
- ["FBCF",0x72D0],
- ["FBD0",0x7425],
- ["FBD1",0x745A],
- ["FBD2",0x74E0],
- ["FBD3",0x7693],
- ["FBD4",0x795C],
- ["FBD5",0x7CCA],
- ["FBD6",0x7E1E],
- ["FBD7",0x80E1],
- ["FBD8",0x82A6],
- ["FBD9",0x846B],
- ["FBDA",0x84BF],
- ["FBDB",0x864E],
- ["FBDC",0x865F],
- ["FBDD",0x8774],
- ["FBDE",0x8B77],
- ["FBDF",0x8C6A],
- ["FBE0",0x93AC],
- ["FBE1",0x9800],
- ["FBE2",0x9865],
- ["FBE3",0x60D1],
- ["FBE4",0x6216],
- ["FBE5",0x9177],
- ["FBE6",0x5A5A],
- ["FBE7",0x660F],
- ["FBE8",0x6DF7],
- ["FBE9",0x6E3E],
- ["FBEA",0x743F],
- ["FBEB",0x9B42],
- ["FBEC",0x5FFD],
- ["FBED",0x60DA],
- ["FBEE",0x7B0F],
- ["FBEF",0x54C4],
- ["FBF0",0x5F18],
- ["FBF1",0x6C5E],
- ["FBF2",0x6CD3],
- ["FBF3",0x6D2A],
- ["FBF4",0x70D8],
- ["FBF5",0x7D05],
- ["FBF6",0x8679],
- ["FBF7",0x8A0C],
- ["FBF8",0x9D3B],
- ["FBF9",0x5316],
- ["FBFA",0x548C],
- ["FBFB",0x5B05],
- ["FBFC",0x6A3A],
- ["FBFD",0x706B],
- ["FBFE",0x7575],
- ["FCA1",0x798D],
- ["FCA2",0x79BE],
- ["FCA3",0x82B1],
- ["FCA4",0x83EF],
- ["FCA5",0x8A71],
- ["FCA6",0x8B41],
- ["FCA7",0x8CA8],
- ["FCA8",0x9774],
- ["FCA9",0xFA0B],
- ["FCAA",0x64F4],
- ["FCAB",0x652B],
- ["FCAC",0x78BA],
- ["FCAD",0x78BB],
- ["FCAE",0x7A6B],
- ["FCAF",0x4E38],
- ["FCB0",0x559A],
- ["FCB1",0x5950],
- ["FCB2",0x5BA6],
- ["FCB3",0x5E7B],
- ["FCB4",0x60A3],
- ["FCB5",0x63DB],
- ["FCB6",0x6B61],
- ["FCB7",0x6665],
- ["FCB8",0x6853],
- ["FCB9",0x6E19],
- ["FCBA",0x7165],
- ["FCBB",0x74B0],
- ["FCBC",0x7D08],
- ["FCBD",0x9084],
- ["FCBE",0x9A69],
- ["FCBF",0x9C25],
- ["FCC0",0x6D3B],
- ["FCC1",0x6ED1],
- ["FCC2",0x733E],
- ["FCC3",0x8C41],
- ["FCC4",0x95CA],
- ["FCC5",0x51F0],
- ["FCC6",0x5E4C],
- ["FCC7",0x5FA8],
- ["FCC8",0x604D],
- ["FCC9",0x60F6],
- ["FCCA",0x6130],
- ["FCCB",0x614C],
- ["FCCC",0x6643],
- ["FCCD",0x6644],
- ["FCCE",0x69A5],
- ["FCCF",0x6CC1],
- ["FCD0",0x6E5F],
- ["FCD1",0x6EC9],
- ["FCD2",0x6F62],
- ["FCD3",0x714C],
- ["FCD4",0x749C],
- ["FCD5",0x7687],
- ["FCD6",0x7BC1],
- ["FCD7",0x7C27],
- ["FCD8",0x8352],
- ["FCD9",0x8757],
- ["FCDA",0x9051],
- ["FCDB",0x968D],
- ["FCDC",0x9EC3],
- ["FCDD",0x532F],
- ["FCDE",0x56DE],
- ["FCDF",0x5EFB],
- ["FCE0",0x5F8A],
- ["FCE1",0x6062],
- ["FCE2",0x6094],
- ["FCE3",0x61F7],
- ["FCE4",0x6666],
- ["FCE5",0x6703],
- ["FCE6",0x6A9C],
- ["FCE7",0x6DEE],
- ["FCE8",0x6FAE],
- ["FCE9",0x7070],
- ["FCEA",0x736A],
- ["FCEB",0x7E6A],
- ["FCEC",0x81BE],
- ["FCED",0x8334],
- ["FCEE",0x86D4],
- ["FCEF",0x8AA8],
- ["FCF0",0x8CC4],
- ["FCF1",0x5283],
- ["FCF2",0x7372],
- ["FCF3",0x5B96],
- ["FCF4",0x6A6B],
- ["FCF5",0x9404],
- ["FCF6",0x54EE],
- ["FCF7",0x5686],
- ["FCF8",0x5B5D],
- ["FCF9",0x6548],
- ["FCFA",0x6585],
- ["FCFB",0x66C9],
- ["FCFC",0x689F],
- ["FCFD",0x6D8D],
- ["FCFE",0x6DC6],
- ["FDA1",0x723B],
- ["FDA2",0x80B4],
- ["FDA3",0x9175],
- ["FDA4",0x9A4D],
- ["FDA5",0x4FAF],
- ["FDA6",0x5019],
- ["FDA7",0x539A],
- ["FDA8",0x540E],
- ["FDA9",0x543C],
- ["FDAA",0x5589],
- ["FDAB",0x55C5],
- ["FDAC",0x5E3F],
- ["FDAD",0x5F8C],
- ["FDAE",0x673D],
- ["FDAF",0x7166],
- ["FDB0",0x73DD],
- ["FDB1",0x9005],
- ["FDB2",0x52DB],
- ["FDB3",0x52F3],
- ["FDB4",0x5864],
- ["FDB5",0x58CE],
- ["FDB6",0x7104],
- ["FDB7",0x718F],
- ["FDB8",0x71FB],
- ["FDB9",0x85B0],
- ["FDBA",0x8A13],
- ["FDBB",0x6688],
- ["FDBC",0x85A8],
- ["FDBD",0x55A7],
- ["FDBE",0x6684],
- ["FDBF",0x714A],
- ["FDC0",0x8431],
- ["FDC1",0x5349],
- ["FDC2",0x5599],
- ["FDC3",0x6BC1],
- ["FDC4",0x5F59],
- ["FDC5",0x5FBD],
- ["FDC6",0x63EE],
- ["FDC7",0x6689],
- ["FDC8",0x7147],
- ["FDC9",0x8AF1],
- ["FDCA",0x8F1D],
- ["FDCB",0x9EBE],
- ["FDCC",0x4F11],
- ["FDCD",0x643A],
- ["FDCE",0x70CB],
- ["FDCF",0x7566],
- ["FDD0",0x8667],
- ["FDD1",0x6064],
- ["FDD2",0x8B4E],
- ["FDD3",0x9DF8],
- ["FDD4",0x5147],
- ["FDD5",0x51F6],
- ["FDD6",0x5308],
- ["FDD7",0x6D36],
- ["FDD8",0x80F8],
- ["FDD9",0x9ED1],
- ["FDDA",0x6615],
- ["FDDB",0x6B23],
- ["FDDC",0x7098],
- ["FDDD",0x75D5],
- ["FDDE",0x5403],
- ["FDDF",0x5C79],
- ["FDE0",0x7D07],
- ["FDE1",0x8A16],
- ["FDE2",0x6B20],
- ["FDE3",0x6B3D],
- ["FDE4",0x6B46],
- ["FDE5",0x5438],
- ["FDE6",0x6070],
- ["FDE7",0x6D3D],
- ["FDE8",0x7FD5],
- ["FDE9",0x8208],
- ["FDEA",0x50D6],
- ["FDEB",0x51DE],
- ["FDEC",0x559C],
- ["FDED",0x566B],
- ["FDEE",0x56CD],
- ["FDEF",0x59EC],
- ["FDF0",0x5B09],
- ["FDF1",0x5E0C],
- ["FDF2",0x6199],
- ["FDF3",0x6198],
- ["FDF4",0x6231],
- ["FDF5",0x665E],
- ["FDF6",0x66E6],
- ["FDF7",0x7199],
- ["FDF8",0x71B9],
- ["FDF9",0x71BA],
- ["FDFA",0x72A7],
- ["FDFB",0x79A7],
- ["FDFC",0x7A00],
- ["FDFD",0x7FB2],
- ["FDFE",0x8A70],
-]
-
-UCS_TO_EUCKR_TBL = EUCKR_TO_UCS_TBL.map {|a,b| [b,a] }
diff --git a/enc/trans/gb18030-tbl.rb b/enc/trans/gb18030-tbl.rb
deleted file mode 100644
index 17a01d8885..0000000000
--- a/enc/trans/gb18030-tbl.rb
+++ /dev/null
@@ -1,63330 +0,0 @@
-GB18030_TO_UCS_TBL = [
- ["81308432",0xA0],
- ["81308433",0xA1],
- ["81308434",0xA2],
- ["81308435",0xA3],
- ["A1E8",0xA4],
- ["81308436",0xA5],
- ["81308437",0xA6],
- ["A1EC",0xA7],
- ["A1A7",0xA8],
- ["81308438",0xA9],
- ["81308439",0xAA],
- ["81308530",0xAB],
- ["81308531",0xAC],
- ["81308532",0xAD],
- ["81308533",0xAE],
- ["81308534",0xAF],
- ["A1E3",0xB0],
- ["A1C0",0xB1],
- ["81308535",0xB2],
- ["81308536",0xB3],
- ["81308537",0xB4],
- ["81308538",0xB5],
- ["81308539",0xB6],
- ["A1A4",0xB7],
- ["81308630",0xB8],
- ["81308631",0xB9],
- ["81308632",0xBA],
- ["81308633",0xBB],
- ["81308634",0xBC],
- ["81308635",0xBD],
- ["81308636",0xBE],
- ["81308637",0xBF],
- ["81308638",0xC0],
- ["81308639",0xC1],
- ["81308730",0xC2],
- ["81308731",0xC3],
- ["81308732",0xC4],
- ["81308733",0xC5],
- ["81308734",0xC6],
- ["81308735",0xC7],
- ["81308736",0xC8],
- ["81308737",0xC9],
- ["81308738",0xCA],
- ["81308739",0xCB],
- ["81308830",0xCC],
- ["81308831",0xCD],
- ["81308832",0xCE],
- ["81308833",0xCF],
- ["81308834",0xD0],
- ["81308835",0xD1],
- ["81308836",0xD2],
- ["81308837",0xD3],
- ["81308838",0xD4],
- ["81308839",0xD5],
- ["81308930",0xD6],
- ["A1C1",0xD7],
- ["81308931",0xD8],
- ["81308932",0xD9],
- ["81308933",0xDA],
- ["81308934",0xDB],
- ["81308935",0xDC],
- ["81308936",0xDD],
- ["81308937",0xDE],
- ["81308938",0xDF],
- ["A8A4",0xE0],
- ["A8A2",0xE1],
- ["81308939",0xE2],
- ["81308A30",0xE3],
- ["81308A31",0xE4],
- ["81308A32",0xE5],
- ["81308A33",0xE6],
- ["81308A34",0xE7],
- ["A8A8",0xE8],
- ["A8A6",0xE9],
- ["A8BA",0xEA],
- ["81308A35",0xEB],
- ["A8AC",0xEC],
- ["A8AA",0xED],
- ["81308A36",0xEE],
- ["81308A37",0xEF],
- ["81308A38",0xF0],
- ["81308A39",0xF1],
- ["A8B0",0xF2],
- ["A8AE",0xF3],
- ["81308B30",0xF4],
- ["81308B31",0xF5],
- ["81308B32",0xF6],
- ["A1C2",0xF7],
- ["81308B33",0xF8],
- ["A8B4",0xF9],
- ["A8B2",0xFA],
- ["81308B34",0xFB],
- ["A8B9",0xFC],
- ["81308B35",0xFD],
- ["81308B36",0xFE],
- ["81308B37",0xFF],
- ["81308B38",0x100],
- ["A8A1",0x101],
- ["81308B39",0x102],
- ["81308C30",0x103],
- ["81308C31",0x104],
- ["81308C32",0x105],
- ["81308C33",0x106],
- ["81308C34",0x107],
- ["81308C35",0x108],
- ["81308C36",0x109],
- ["81308C37",0x10A],
- ["81308C38",0x10B],
- ["81308C39",0x10C],
- ["81308D30",0x10D],
- ["81308D31",0x10E],
- ["81308D32",0x10F],
- ["81308D33",0x110],
- ["81308D34",0x111],
- ["81308D35",0x112],
- ["A8A5",0x113],
- ["81308D36",0x114],
- ["81308D37",0x115],
- ["81308D38",0x116],
- ["81308D39",0x117],
- ["81308E30",0x118],
- ["81308E31",0x119],
- ["81308E32",0x11A],
- ["A8A7",0x11B],
- ["81308E33",0x11C],
- ["81308E34",0x11D],
- ["81308E35",0x11E],
- ["81308E36",0x11F],
- ["81308E37",0x120],
- ["81308E38",0x121],
- ["81308E39",0x122],
- ["81308F30",0x123],
- ["81308F31",0x124],
- ["81308F32",0x125],
- ["81308F33",0x126],
- ["81308F34",0x127],
- ["81308F35",0x128],
- ["81308F36",0x129],
- ["81308F37",0x12A],
- ["A8A9",0x12B],
- ["81308F38",0x12C],
- ["81308F39",0x12D],
- ["81309030",0x12E],
- ["81309031",0x12F],
- ["81309032",0x130],
- ["81309033",0x131],
- ["81309034",0x132],
- ["81309035",0x133],
- ["81309036",0x134],
- ["81309037",0x135],
- ["81309038",0x136],
- ["81309039",0x137],
- ["81309130",0x138],
- ["81309131",0x139],
- ["81309132",0x13A],
- ["81309133",0x13B],
- ["81309134",0x13C],
- ["81309135",0x13D],
- ["81309136",0x13E],
- ["81309137",0x13F],
- ["81309138",0x140],
- ["81309139",0x141],
- ["81309230",0x142],
- ["81309231",0x143],
- ["A8BD",0x144],
- ["81309232",0x145],
- ["81309233",0x146],
- ["81309234",0x147],
- ["A8BE",0x148],
- ["81309235",0x149],
- ["81309236",0x14A],
- ["81309237",0x14B],
- ["81309238",0x14C],
- ["A8AD",0x14D],
- ["81309239",0x14E],
- ["81309330",0x14F],
- ["81309331",0x150],
- ["81309332",0x151],
- ["81309333",0x152],
- ["81309334",0x153],
- ["81309335",0x154],
- ["81309336",0x155],
- ["81309337",0x156],
- ["81309338",0x157],
- ["81309339",0x158],
- ["81309430",0x159],
- ["81309431",0x15A],
- ["81309432",0x15B],
- ["81309433",0x15C],
- ["81309434",0x15D],
- ["81309435",0x15E],
- ["81309436",0x15F],
- ["81309437",0x160],
- ["81309438",0x161],
- ["81309439",0x162],
- ["81309530",0x163],
- ["81309531",0x164],
- ["81309532",0x165],
- ["81309533",0x166],
- ["81309534",0x167],
- ["81309535",0x168],
- ["81309536",0x169],
- ["81309537",0x16A],
- ["A8B1",0x16B],
- ["81309538",0x16C],
- ["81309539",0x16D],
- ["81309630",0x16E],
- ["81309631",0x16F],
- ["81309632",0x170],
- ["81309633",0x171],
- ["81309634",0x172],
- ["81309635",0x173],
- ["81309636",0x174],
- ["81309637",0x175],
- ["81309638",0x176],
- ["81309639",0x177],
- ["81309730",0x178],
- ["81309731",0x179],
- ["81309732",0x17A],
- ["81309733",0x17B],
- ["81309734",0x17C],
- ["81309735",0x17D],
- ["81309736",0x17E],
- ["81309737",0x17F],
- ["81309738",0x180],
- ["81309739",0x181],
- ["81309830",0x182],
- ["81309831",0x183],
- ["81309832",0x184],
- ["81309833",0x185],
- ["81309834",0x186],
- ["81309835",0x187],
- ["81309836",0x188],
- ["81309837",0x189],
- ["81309838",0x18A],
- ["81309839",0x18B],
- ["81309930",0x18C],
- ["81309931",0x18D],
- ["81309932",0x18E],
- ["81309933",0x18F],
- ["81309934",0x190],
- ["81309935",0x191],
- ["81309936",0x192],
- ["81309937",0x193],
- ["81309938",0x194],
- ["81309939",0x195],
- ["81309A30",0x196],
- ["81309A31",0x197],
- ["81309A32",0x198],
- ["81309A33",0x199],
- ["81309A34",0x19A],
- ["81309A35",0x19B],
- ["81309A36",0x19C],
- ["81309A37",0x19D],
- ["81309A38",0x19E],
- ["81309A39",0x19F],
- ["81309B30",0x1A0],
- ["81309B31",0x1A1],
- ["81309B32",0x1A2],
- ["81309B33",0x1A3],
- ["81309B34",0x1A4],
- ["81309B35",0x1A5],
- ["81309B36",0x1A6],
- ["81309B37",0x1A7],
- ["81309B38",0x1A8],
- ["81309B39",0x1A9],
- ["81309C30",0x1AA],
- ["81309C31",0x1AB],
- ["81309C32",0x1AC],
- ["81309C33",0x1AD],
- ["81309C34",0x1AE],
- ["81309C35",0x1AF],
- ["81309C36",0x1B0],
- ["81309C37",0x1B1],
- ["81309C38",0x1B2],
- ["81309C39",0x1B3],
- ["81309D30",0x1B4],
- ["81309D31",0x1B5],
- ["81309D32",0x1B6],
- ["81309D33",0x1B7],
- ["81309D34",0x1B8],
- ["81309D35",0x1B9],
- ["81309D36",0x1BA],
- ["81309D37",0x1BB],
- ["81309D38",0x1BC],
- ["81309D39",0x1BD],
- ["81309E30",0x1BE],
- ["81309E31",0x1BF],
- ["81309E32",0x1C0],
- ["81309E33",0x1C1],
- ["81309E34",0x1C2],
- ["81309E35",0x1C3],
- ["81309E36",0x1C4],
- ["81309E37",0x1C5],
- ["81309E38",0x1C6],
- ["81309E39",0x1C7],
- ["81309F30",0x1C8],
- ["81309F31",0x1C9],
- ["81309F32",0x1CA],
- ["81309F33",0x1CB],
- ["81309F34",0x1CC],
- ["81309F35",0x1CD],
- ["A8A3",0x1CE],
- ["81309F36",0x1CF],
- ["A8AB",0x1D0],
- ["81309F37",0x1D1],
- ["A8AF",0x1D2],
- ["81309F38",0x1D3],
- ["A8B3",0x1D4],
- ["81309F39",0x1D5],
- ["A8B5",0x1D6],
- ["8130A030",0x1D7],
- ["A8B6",0x1D8],
- ["8130A031",0x1D9],
- ["A8B7",0x1DA],
- ["8130A032",0x1DB],
- ["A8B8",0x1DC],
- ["8130A033",0x1DD],
- ["8130A034",0x1DE],
- ["8130A035",0x1DF],
- ["8130A036",0x1E0],
- ["8130A037",0x1E1],
- ["8130A038",0x1E2],
- ["8130A039",0x1E3],
- ["8130A130",0x1E4],
- ["8130A131",0x1E5],
- ["8130A132",0x1E6],
- ["8130A133",0x1E7],
- ["8130A134",0x1E8],
- ["8130A135",0x1E9],
- ["8130A136",0x1EA],
- ["8130A137",0x1EB],
- ["8130A138",0x1EC],
- ["8130A139",0x1ED],
- ["8130A230",0x1EE],
- ["8130A231",0x1EF],
- ["8130A232",0x1F0],
- ["8130A233",0x1F1],
- ["8130A234",0x1F2],
- ["8130A235",0x1F3],
- ["8130A236",0x1F4],
- ["8130A237",0x1F5],
- ["8130A238",0x1F6],
- ["8130A239",0x1F7],
- ["8130A330",0x1F8],
- ["A8BF",0x1F9],
- ["8130A331",0x1FA],
- ["8130A332",0x1FB],
- ["8130A333",0x1FC],
- ["8130A334",0x1FD],
- ["8130A335",0x1FE],
- ["8130A336",0x1FF],
- ["8130A337",0x200],
- ["8130A338",0x201],
- ["8130A339",0x202],
- ["8130A430",0x203],
- ["8130A431",0x204],
- ["8130A432",0x205],
- ["8130A433",0x206],
- ["8130A434",0x207],
- ["8130A435",0x208],
- ["8130A436",0x209],
- ["8130A437",0x20A],
- ["8130A438",0x20B],
- ["8130A439",0x20C],
- ["8130A530",0x20D],
- ["8130A531",0x20E],
- ["8130A532",0x20F],
- ["8130A533",0x210],
- ["8130A534",0x211],
- ["8130A535",0x212],
- ["8130A536",0x213],
- ["8130A537",0x214],
- ["8130A538",0x215],
- ["8130A539",0x216],
- ["8130A630",0x217],
- ["8130A631",0x218],
- ["8130A632",0x219],
- ["8130A633",0x21A],
- ["8130A634",0x21B],
- ["8130A635",0x21C],
- ["8130A636",0x21D],
- ["8130A637",0x21E],
- ["8130A638",0x21F],
- ["8130A639",0x220],
- ["8130A730",0x221],
- ["8130A731",0x222],
- ["8130A732",0x223],
- ["8130A733",0x224],
- ["8130A734",0x225],
- ["8130A735",0x226],
- ["8130A736",0x227],
- ["8130A737",0x228],
- ["8130A738",0x229],
- ["8130A739",0x22A],
- ["8130A830",0x22B],
- ["8130A831",0x22C],
- ["8130A832",0x22D],
- ["8130A833",0x22E],
- ["8130A834",0x22F],
- ["8130A835",0x230],
- ["8130A836",0x231],
- ["8130A837",0x232],
- ["8130A838",0x233],
- ["8130A839",0x234],
- ["8130A930",0x235],
- ["8130A931",0x236],
- ["8130A932",0x237],
- ["8130A933",0x238],
- ["8130A934",0x239],
- ["8130A935",0x23A],
- ["8130A936",0x23B],
- ["8130A937",0x23C],
- ["8130A938",0x23D],
- ["8130A939",0x23E],
- ["8130AA30",0x23F],
- ["8130AA31",0x240],
- ["8130AA32",0x241],
- ["8130AA33",0x242],
- ["8130AA34",0x243],
- ["8130AA35",0x244],
- ["8130AA36",0x245],
- ["8130AA37",0x246],
- ["8130AA38",0x247],
- ["8130AA39",0x248],
- ["8130AB30",0x249],
- ["8130AB31",0x24A],
- ["8130AB32",0x24B],
- ["8130AB33",0x24C],
- ["8130AB34",0x24D],
- ["8130AB35",0x24E],
- ["8130AB36",0x24F],
- ["8130AB37",0x250],
- ["A8BB",0x251],
- ["8130AB38",0x252],
- ["8130AB39",0x253],
- ["8130AC30",0x254],
- ["8130AC31",0x255],
- ["8130AC32",0x256],
- ["8130AC33",0x257],
- ["8130AC34",0x258],
- ["8130AC35",0x259],
- ["8130AC36",0x25A],
- ["8130AC37",0x25B],
- ["8130AC38",0x25C],
- ["8130AC39",0x25D],
- ["8130AD30",0x25E],
- ["8130AD31",0x25F],
- ["8130AD32",0x260],
- ["A8C0",0x261],
- ["8130AD33",0x262],
- ["8130AD34",0x263],
- ["8130AD35",0x264],
- ["8130AD36",0x265],
- ["8130AD37",0x266],
- ["8130AD38",0x267],
- ["8130AD39",0x268],
- ["8130AE30",0x269],
- ["8130AE31",0x26A],
- ["8130AE32",0x26B],
- ["8130AE33",0x26C],
- ["8130AE34",0x26D],
- ["8130AE35",0x26E],
- ["8130AE36",0x26F],
- ["8130AE37",0x270],
- ["8130AE38",0x271],
- ["8130AE39",0x272],
- ["8130AF30",0x273],
- ["8130AF31",0x274],
- ["8130AF32",0x275],
- ["8130AF33",0x276],
- ["8130AF34",0x277],
- ["8130AF35",0x278],
- ["8130AF36",0x279],
- ["8130AF37",0x27A],
- ["8130AF38",0x27B],
- ["8130AF39",0x27C],
- ["8130B030",0x27D],
- ["8130B031",0x27E],
- ["8130B032",0x27F],
- ["8130B033",0x280],
- ["8130B034",0x281],
- ["8130B035",0x282],
- ["8130B036",0x283],
- ["8130B037",0x284],
- ["8130B038",0x285],
- ["8130B039",0x286],
- ["8130B130",0x287],
- ["8130B131",0x288],
- ["8130B132",0x289],
- ["8130B133",0x28A],
- ["8130B134",0x28B],
- ["8130B135",0x28C],
- ["8130B136",0x28D],
- ["8130B137",0x28E],
- ["8130B138",0x28F],
- ["8130B139",0x290],
- ["8130B230",0x291],
- ["8130B231",0x292],
- ["8130B232",0x293],
- ["8130B233",0x294],
- ["8130B234",0x295],
- ["8130B235",0x296],
- ["8130B236",0x297],
- ["8130B237",0x298],
- ["8130B238",0x299],
- ["8130B239",0x29A],
- ["8130B330",0x29B],
- ["8130B331",0x29C],
- ["8130B332",0x29D],
- ["8130B333",0x29E],
- ["8130B334",0x29F],
- ["8130B335",0x2A0],
- ["8130B336",0x2A1],
- ["8130B337",0x2A2],
- ["8130B338",0x2A3],
- ["8130B339",0x2A4],
- ["8130B430",0x2A5],
- ["8130B431",0x2A6],
- ["8130B432",0x2A7],
- ["8130B433",0x2A8],
- ["8130B434",0x2A9],
- ["8130B435",0x2AA],
- ["8130B436",0x2AB],
- ["8130B437",0x2AC],
- ["8130B438",0x2AD],
- ["8130B439",0x2AE],
- ["8130B530",0x2AF],
- ["8130B531",0x2B0],
- ["8130B532",0x2B1],
- ["8130B533",0x2B2],
- ["8130B534",0x2B3],
- ["8130B535",0x2B4],
- ["8130B536",0x2B5],
- ["8130B537",0x2B6],
- ["8130B538",0x2B7],
- ["8130B539",0x2B8],
- ["8130B630",0x2B9],
- ["8130B631",0x2BA],
- ["8130B632",0x2BB],
- ["8130B633",0x2BC],
- ["8130B634",0x2BD],
- ["8130B635",0x2BE],
- ["8130B636",0x2BF],
- ["8130B637",0x2C0],
- ["8130B638",0x2C1],
- ["8130B639",0x2C2],
- ["8130B730",0x2C3],
- ["8130B731",0x2C4],
- ["8130B732",0x2C5],
- ["8130B733",0x2C6],
- ["A1A6",0x2C7],
- ["8130B734",0x2C8],
- ["A1A5",0x2C9],
- ["A840",0x2CA],
- ["A841",0x2CB],
- ["8130B735",0x2CC],
- ["8130B736",0x2CD],
- ["8130B737",0x2CE],
- ["8130B738",0x2CF],
- ["8130B739",0x2D0],
- ["8130B830",0x2D1],
- ["8130B831",0x2D2],
- ["8130B832",0x2D3],
- ["8130B833",0x2D4],
- ["8130B834",0x2D5],
- ["8130B835",0x2D6],
- ["8130B836",0x2D7],
- ["8130B837",0x2D8],
- ["A842",0x2D9],
- ["8130B838",0x2DA],
- ["8130B839",0x2DB],
- ["8130B930",0x2DC],
- ["8130B931",0x2DD],
- ["8130B932",0x2DE],
- ["8130B933",0x2DF],
- ["8130B934",0x2E0],
- ["8130B935",0x2E1],
- ["8130B936",0x2E2],
- ["8130B937",0x2E3],
- ["8130B938",0x2E4],
- ["8130B939",0x2E5],
- ["8130BA30",0x2E6],
- ["8130BA31",0x2E7],
- ["8130BA32",0x2E8],
- ["8130BA33",0x2E9],
- ["8130BA34",0x2EA],
- ["8130BA35",0x2EB],
- ["8130BA36",0x2EC],
- ["8130BA37",0x2ED],
- ["8130BA38",0x2EE],
- ["8130BA39",0x2EF],
- ["8130BB30",0x2F0],
- ["8130BB31",0x2F1],
- ["8130BB32",0x2F2],
- ["8130BB33",0x2F3],
- ["8130BB34",0x2F4],
- ["8130BB35",0x2F5],
- ["8130BB36",0x2F6],
- ["8130BB37",0x2F7],
- ["8130BB38",0x2F8],
- ["8130BB39",0x2F9],
- ["8130BC30",0x2FA],
- ["8130BC31",0x2FB],
- ["8130BC32",0x2FC],
- ["8130BC33",0x2FD],
- ["8130BC34",0x2FE],
- ["8130BC35",0x2FF],
- ["8130BC36",0x300],
- ["8130BC37",0x301],
- ["8130BC38",0x302],
- ["8130BC39",0x303],
- ["8130BD30",0x304],
- ["8130BD31",0x305],
- ["8130BD32",0x306],
- ["8130BD33",0x307],
- ["8130BD34",0x308],
- ["8130BD35",0x309],
- ["8130BD36",0x30A],
- ["8130BD37",0x30B],
- ["8130BD38",0x30C],
- ["8130BD39",0x30D],
- ["8130BE30",0x30E],
- ["8130BE31",0x30F],
- ["8130BE32",0x310],
- ["8130BE33",0x311],
- ["8130BE34",0x312],
- ["8130BE35",0x313],
- ["8130BE36",0x314],
- ["8130BE37",0x315],
- ["8130BE38",0x316],
- ["8130BE39",0x317],
- ["8130BF30",0x318],
- ["8130BF31",0x319],
- ["8130BF32",0x31A],
- ["8130BF33",0x31B],
- ["8130BF34",0x31C],
- ["8130BF35",0x31D],
- ["8130BF36",0x31E],
- ["8130BF37",0x31F],
- ["8130BF38",0x320],
- ["8130BF39",0x321],
- ["8130C030",0x322],
- ["8130C031",0x323],
- ["8130C032",0x324],
- ["8130C033",0x325],
- ["8130C034",0x326],
- ["8130C035",0x327],
- ["8130C036",0x328],
- ["8130C037",0x329],
- ["8130C038",0x32A],
- ["8130C039",0x32B],
- ["8130C130",0x32C],
- ["8130C131",0x32D],
- ["8130C132",0x32E],
- ["8130C133",0x32F],
- ["8130C134",0x330],
- ["8130C135",0x331],
- ["8130C136",0x332],
- ["8130C137",0x333],
- ["8130C138",0x334],
- ["8130C139",0x335],
- ["8130C230",0x336],
- ["8130C231",0x337],
- ["8130C232",0x338],
- ["8130C233",0x339],
- ["8130C234",0x33A],
- ["8130C235",0x33B],
- ["8130C236",0x33C],
- ["8130C237",0x33D],
- ["8130C238",0x33E],
- ["8130C239",0x33F],
- ["8130C330",0x340],
- ["8130C331",0x341],
- ["8130C332",0x342],
- ["8130C333",0x343],
- ["8130C334",0x344],
- ["8130C335",0x345],
- ["8130C336",0x346],
- ["8130C337",0x347],
- ["8130C338",0x348],
- ["8130C339",0x349],
- ["8130C430",0x34A],
- ["8130C431",0x34B],
- ["8130C432",0x34C],
- ["8130C433",0x34D],
- ["8130C434",0x34E],
- ["8130C435",0x34F],
- ["8130C436",0x350],
- ["8130C437",0x351],
- ["8130C438",0x352],
- ["8130C439",0x353],
- ["8130C530",0x354],
- ["8130C531",0x355],
- ["8130C532",0x356],
- ["8130C533",0x357],
- ["8130C534",0x358],
- ["8130C535",0x359],
- ["8130C536",0x35A],
- ["8130C537",0x35B],
- ["8130C538",0x35C],
- ["8130C539",0x35D],
- ["8130C630",0x35E],
- ["8130C631",0x35F],
- ["8130C632",0x360],
- ["8130C633",0x361],
- ["8130C634",0x362],
- ["8130C635",0x363],
- ["8130C636",0x364],
- ["8130C637",0x365],
- ["8130C638",0x366],
- ["8130C639",0x367],
- ["8130C730",0x368],
- ["8130C731",0x369],
- ["8130C732",0x36A],
- ["8130C733",0x36B],
- ["8130C734",0x36C],
- ["8130C735",0x36D],
- ["8130C736",0x36E],
- ["8130C737",0x36F],
- ["8130C738",0x370],
- ["8130C739",0x371],
- ["8130C830",0x372],
- ["8130C831",0x373],
- ["8130C832",0x374],
- ["8130C833",0x375],
- ["8130C834",0x376],
- ["8130C835",0x377],
- ["8130C836",0x378],
- ["8130C837",0x379],
- ["8130C838",0x37A],
- ["8130C839",0x37B],
- ["8130C930",0x37C],
- ["8130C931",0x37D],
- ["8130C932",0x37E],
- ["8130C933",0x37F],
- ["8130C934",0x380],
- ["8130C935",0x381],
- ["8130C936",0x382],
- ["8130C937",0x383],
- ["8130C938",0x384],
- ["8130C939",0x385],
- ["8130CA30",0x386],
- ["8130CA31",0x387],
- ["8130CA32",0x388],
- ["8130CA33",0x389],
- ["8130CA34",0x38A],
- ["8130CA35",0x38B],
- ["8130CA36",0x38C],
- ["8130CA37",0x38D],
- ["8130CA38",0x38E],
- ["8130CA39",0x38F],
- ["8130CB30",0x390],
- ["A6A1",0x391],
- ["A6A2",0x392],
- ["A6A3",0x393],
- ["A6A4",0x394],
- ["A6A5",0x395],
- ["A6A6",0x396],
- ["A6A7",0x397],
- ["A6A8",0x398],
- ["A6A9",0x399],
- ["A6AA",0x39A],
- ["A6AB",0x39B],
- ["A6AC",0x39C],
- ["A6AD",0x39D],
- ["A6AE",0x39E],
- ["A6AF",0x39F],
- ["A6B0",0x3A0],
- ["A6B1",0x3A1],
- ["8130CB31",0x3A2],
- ["A6B2",0x3A3],
- ["A6B3",0x3A4],
- ["A6B4",0x3A5],
- ["A6B5",0x3A6],
- ["A6B6",0x3A7],
- ["A6B7",0x3A8],
- ["A6B8",0x3A9],
- ["8130CB32",0x3AA],
- ["8130CB33",0x3AB],
- ["8130CB34",0x3AC],
- ["8130CB35",0x3AD],
- ["8130CB36",0x3AE],
- ["8130CB37",0x3AF],
- ["8130CB38",0x3B0],
- ["A6C1",0x3B1],
- ["A6C2",0x3B2],
- ["A6C3",0x3B3],
- ["A6C4",0x3B4],
- ["A6C5",0x3B5],
- ["A6C6",0x3B6],
- ["A6C7",0x3B7],
- ["A6C8",0x3B8],
- ["A6C9",0x3B9],
- ["A6CA",0x3BA],
- ["A6CB",0x3BB],
- ["A6CC",0x3BC],
- ["A6CD",0x3BD],
- ["A6CE",0x3BE],
- ["A6CF",0x3BF],
- ["A6D0",0x3C0],
- ["A6D1",0x3C1],
- ["8130CB39",0x3C2],
- ["A6D2",0x3C3],
- ["A6D3",0x3C4],
- ["A6D4",0x3C5],
- ["A6D5",0x3C6],
- ["A6D6",0x3C7],
- ["A6D7",0x3C8],
- ["A6D8",0x3C9],
- ["8130CC30",0x3CA],
- ["8130CC31",0x3CB],
- ["8130CC32",0x3CC],
- ["8130CC33",0x3CD],
- ["8130CC34",0x3CE],
- ["8130CC35",0x3CF],
- ["8130CC36",0x3D0],
- ["8130CC37",0x3D1],
- ["8130CC38",0x3D2],
- ["8130CC39",0x3D3],
- ["8130CD30",0x3D4],
- ["8130CD31",0x3D5],
- ["8130CD32",0x3D6],
- ["8130CD33",0x3D7],
- ["8130CD34",0x3D8],
- ["8130CD35",0x3D9],
- ["8130CD36",0x3DA],
- ["8130CD37",0x3DB],
- ["8130CD38",0x3DC],
- ["8130CD39",0x3DD],
- ["8130CE30",0x3DE],
- ["8130CE31",0x3DF],
- ["8130CE32",0x3E0],
- ["8130CE33",0x3E1],
- ["8130CE34",0x3E2],
- ["8130CE35",0x3E3],
- ["8130CE36",0x3E4],
- ["8130CE37",0x3E5],
- ["8130CE38",0x3E6],
- ["8130CE39",0x3E7],
- ["8130CF30",0x3E8],
- ["8130CF31",0x3E9],
- ["8130CF32",0x3EA],
- ["8130CF33",0x3EB],
- ["8130CF34",0x3EC],
- ["8130CF35",0x3ED],
- ["8130CF36",0x3EE],
- ["8130CF37",0x3EF],
- ["8130CF38",0x3F0],
- ["8130CF39",0x3F1],
- ["8130D030",0x3F2],
- ["8130D031",0x3F3],
- ["8130D032",0x3F4],
- ["8130D033",0x3F5],
- ["8130D034",0x3F6],
- ["8130D035",0x3F7],
- ["8130D036",0x3F8],
- ["8130D037",0x3F9],
- ["8130D038",0x3FA],
- ["8130D039",0x3FB],
- ["8130D130",0x3FC],
- ["8130D131",0x3FD],
- ["8130D132",0x3FE],
- ["8130D133",0x3FF],
- ["8130D134",0x400],
- ["A7A7",0x401],
- ["8130D135",0x402],
- ["8130D136",0x403],
- ["8130D137",0x404],
- ["8130D138",0x405],
- ["8130D139",0x406],
- ["8130D230",0x407],
- ["8130D231",0x408],
- ["8130D232",0x409],
- ["8130D233",0x40A],
- ["8130D234",0x40B],
- ["8130D235",0x40C],
- ["8130D236",0x40D],
- ["8130D237",0x40E],
- ["8130D238",0x40F],
- ["A7A1",0x410],
- ["A7A2",0x411],
- ["A7A3",0x412],
- ["A7A4",0x413],
- ["A7A5",0x414],
- ["A7A6",0x415],
- ["A7A8",0x416],
- ["A7A9",0x417],
- ["A7AA",0x418],
- ["A7AB",0x419],
- ["A7AC",0x41A],
- ["A7AD",0x41B],
- ["A7AE",0x41C],
- ["A7AF",0x41D],
- ["A7B0",0x41E],
- ["A7B1",0x41F],
- ["A7B2",0x420],
- ["A7B3",0x421],
- ["A7B4",0x422],
- ["A7B5",0x423],
- ["A7B6",0x424],
- ["A7B7",0x425],
- ["A7B8",0x426],
- ["A7B9",0x427],
- ["A7BA",0x428],
- ["A7BB",0x429],
- ["A7BC",0x42A],
- ["A7BD",0x42B],
- ["A7BE",0x42C],
- ["A7BF",0x42D],
- ["A7C0",0x42E],
- ["A7C1",0x42F],
- ["A7D1",0x430],
- ["A7D2",0x431],
- ["A7D3",0x432],
- ["A7D4",0x433],
- ["A7D5",0x434],
- ["A7D6",0x435],
- ["A7D8",0x436],
- ["A7D9",0x437],
- ["A7DA",0x438],
- ["A7DB",0x439],
- ["A7DC",0x43A],
- ["A7DD",0x43B],
- ["A7DE",0x43C],
- ["A7DF",0x43D],
- ["A7E0",0x43E],
- ["A7E1",0x43F],
- ["A7E2",0x440],
- ["A7E3",0x441],
- ["A7E4",0x442],
- ["A7E5",0x443],
- ["A7E6",0x444],
- ["A7E7",0x445],
- ["A7E8",0x446],
- ["A7E9",0x447],
- ["A7EA",0x448],
- ["A7EB",0x449],
- ["A7EC",0x44A],
- ["A7ED",0x44B],
- ["A7EE",0x44C],
- ["A7EF",0x44D],
- ["A7F0",0x44E],
- ["A7F1",0x44F],
- ["8130D239",0x450],
- ["A7D7",0x451],
- ["8130D330",0x452],
- ["8130D331",0x453],
- ["8130D332",0x454],
- ["8130D333",0x455],
- ["8130D334",0x456],
- ["8130D335",0x457],
- ["8130D336",0x458],
- ["8130D337",0x459],
- ["8130D338",0x45A],
- ["8130D339",0x45B],
- ["8130D430",0x45C],
- ["8130D431",0x45D],
- ["8130D432",0x45E],
- ["8130D433",0x45F],
- ["8130D434",0x460],
- ["8130D435",0x461],
- ["8130D436",0x462],
- ["8130D437",0x463],
- ["8130D438",0x464],
- ["8130D439",0x465],
- ["8130D530",0x466],
- ["8130D531",0x467],
- ["8130D532",0x468],
- ["8130D533",0x469],
- ["8130D534",0x46A],
- ["8130D535",0x46B],
- ["8130D536",0x46C],
- ["8130D537",0x46D],
- ["8130D538",0x46E],
- ["8130D539",0x46F],
- ["8130D630",0x470],
- ["8130D631",0x471],
- ["8130D632",0x472],
- ["8130D633",0x473],
- ["8130D634",0x474],
- ["8130D635",0x475],
- ["8130D636",0x476],
- ["8130D637",0x477],
- ["8130D638",0x478],
- ["8130D639",0x479],
- ["8130D730",0x47A],
- ["8130D731",0x47B],
- ["8130D732",0x47C],
- ["8130D733",0x47D],
- ["8130D734",0x47E],
- ["8130D735",0x47F],
- ["8130D736",0x480],
- ["8130D737",0x481],
- ["8130D738",0x482],
- ["8130D739",0x483],
- ["8130D830",0x484],
- ["8130D831",0x485],
- ["8130D832",0x486],
- ["8130D833",0x487],
- ["8130D834",0x488],
- ["8130D835",0x489],
- ["8130D836",0x48A],
- ["8130D837",0x48B],
- ["8130D838",0x48C],
- ["8130D839",0x48D],
- ["8130D930",0x48E],
- ["8130D931",0x48F],
- ["8130D932",0x490],
- ["8130D933",0x491],
- ["8130D934",0x492],
- ["8130D935",0x493],
- ["8130D936",0x494],
- ["8130D937",0x495],
- ["8130D938",0x496],
- ["8130D939",0x497],
- ["8130DA30",0x498],
- ["8130DA31",0x499],
- ["8130DA32",0x49A],
- ["8130DA33",0x49B],
- ["8130DA34",0x49C],
- ["8130DA35",0x49D],
- ["8130DA36",0x49E],
- ["8130DA37",0x49F],
- ["8130DA38",0x4A0],
- ["8130DA39",0x4A1],
- ["8130DB30",0x4A2],
- ["8130DB31",0x4A3],
- ["8130DB32",0x4A4],
- ["8130DB33",0x4A5],
- ["8130DB34",0x4A6],
- ["8130DB35",0x4A7],
- ["8130DB36",0x4A8],
- ["8130DB37",0x4A9],
- ["8130DB38",0x4AA],
- ["8130DB39",0x4AB],
- ["8130DC30",0x4AC],
- ["8130DC31",0x4AD],
- ["8130DC32",0x4AE],
- ["8130DC33",0x4AF],
- ["8130DC34",0x4B0],
- ["8130DC35",0x4B1],
- ["8130DC36",0x4B2],
- ["8130DC37",0x4B3],
- ["8130DC38",0x4B4],
- ["8130DC39",0x4B5],
- ["8130DD30",0x4B6],
- ["8130DD31",0x4B7],
- ["8130DD32",0x4B8],
- ["8130DD33",0x4B9],
- ["8130DD34",0x4BA],
- ["8130DD35",0x4BB],
- ["8130DD36",0x4BC],
- ["8130DD37",0x4BD],
- ["8130DD38",0x4BE],
- ["8130DD39",0x4BF],
- ["8130DE30",0x4C0],
- ["8130DE31",0x4C1],
- ["8130DE32",0x4C2],
- ["8130DE33",0x4C3],
- ["8130DE34",0x4C4],
- ["8130DE35",0x4C5],
- ["8130DE36",0x4C6],
- ["8130DE37",0x4C7],
- ["8130DE38",0x4C8],
- ["8130DE39",0x4C9],
- ["8130DF30",0x4CA],
- ["8130DF31",0x4CB],
- ["8130DF32",0x4CC],
- ["8130DF33",0x4CD],
- ["8130DF34",0x4CE],
- ["8130DF35",0x4CF],
- ["8130DF36",0x4D0],
- ["8130DF37",0x4D1],
- ["8130DF38",0x4D2],
- ["8130DF39",0x4D3],
- ["8130E030",0x4D4],
- ["8130E031",0x4D5],
- ["8130E032",0x4D6],
- ["8130E033",0x4D7],
- ["8130E034",0x4D8],
- ["8130E035",0x4D9],
- ["8130E036",0x4DA],
- ["8130E037",0x4DB],
- ["8130E038",0x4DC],
- ["8130E039",0x4DD],
- ["8130E130",0x4DE],
- ["8130E131",0x4DF],
- ["8130E132",0x4E0],
- ["8130E133",0x4E1],
- ["8130E134",0x4E2],
- ["8130E135",0x4E3],
- ["8130E136",0x4E4],
- ["8130E137",0x4E5],
- ["8130E138",0x4E6],
- ["8130E139",0x4E7],
- ["8130E230",0x4E8],
- ["8130E231",0x4E9],
- ["8130E232",0x4EA],
- ["8130E233",0x4EB],
- ["8130E234",0x4EC],
- ["8130E235",0x4ED],
- ["8130E236",0x4EE],
- ["8130E237",0x4EF],
- ["8130E238",0x4F0],
- ["8130E239",0x4F1],
- ["8130E330",0x4F2],
- ["8130E331",0x4F3],
- ["8130E332",0x4F4],
- ["8130E333",0x4F5],
- ["8130E334",0x4F6],
- ["8130E335",0x4F7],
- ["8130E336",0x4F8],
- ["8130E337",0x4F9],
- ["8130E338",0x4FA],
- ["8130E339",0x4FB],
- ["8130E430",0x4FC],
- ["8130E431",0x4FD],
- ["8130E432",0x4FE],
- ["8130E433",0x4FF],
- ["8130E434",0x500],
- ["8130E435",0x501],
- ["8130E436",0x502],
- ["8130E437",0x503],
- ["8130E438",0x504],
- ["8130E439",0x505],
- ["8130E530",0x506],
- ["8130E531",0x507],
- ["8130E532",0x508],
- ["8130E533",0x509],
- ["8130E534",0x50A],
- ["8130E535",0x50B],
- ["8130E536",0x50C],
- ["8130E537",0x50D],
- ["8130E538",0x50E],
- ["8130E539",0x50F],
- ["8130E630",0x510],
- ["8130E631",0x511],
- ["8130E632",0x512],
- ["8130E633",0x513],
- ["8130E634",0x514],
- ["8130E635",0x515],
- ["8130E636",0x516],
- ["8130E637",0x517],
- ["8130E638",0x518],
- ["8130E639",0x519],
- ["8130E730",0x51A],
- ["8130E731",0x51B],
- ["8130E732",0x51C],
- ["8130E733",0x51D],
- ["8130E734",0x51E],
- ["8130E735",0x51F],
- ["8130E736",0x520],
- ["8130E737",0x521],
- ["8130E738",0x522],
- ["8130E739",0x523],
- ["8130E830",0x524],
- ["8130E831",0x525],
- ["8130E832",0x526],
- ["8130E833",0x527],
- ["8130E834",0x528],
- ["8130E835",0x529],
- ["8130E836",0x52A],
- ["8130E837",0x52B],
- ["8130E838",0x52C],
- ["8130E839",0x52D],
- ["8130E930",0x52E],
- ["8130E931",0x52F],
- ["8130E932",0x530],
- ["8130E933",0x531],
- ["8130E934",0x532],
- ["8130E935",0x533],
- ["8130E936",0x534],
- ["8130E937",0x535],
- ["8130E938",0x536],
- ["8130E939",0x537],
- ["8130EA30",0x538],
- ["8130EA31",0x539],
- ["8130EA32",0x53A],
- ["8130EA33",0x53B],
- ["8130EA34",0x53C],
- ["8130EA35",0x53D],
- ["8130EA36",0x53E],
- ["8130EA37",0x53F],
- ["8130EA38",0x540],
- ["8130EA39",0x541],
- ["8130EB30",0x542],
- ["8130EB31",0x543],
- ["8130EB32",0x544],
- ["8130EB33",0x545],
- ["8130EB34",0x546],
- ["8130EB35",0x547],
- ["8130EB36",0x548],
- ["8130EB37",0x549],
- ["8130EB38",0x54A],
- ["8130EB39",0x54B],
- ["8130EC30",0x54C],
- ["8130EC31",0x54D],
- ["8130EC32",0x54E],
- ["8130EC33",0x54F],
- ["8130EC34",0x550],
- ["8130EC35",0x551],
- ["8130EC36",0x552],
- ["8130EC37",0x553],
- ["8130EC38",0x554],
- ["8130EC39",0x555],
- ["8130ED30",0x556],
- ["8130ED31",0x557],
- ["8130ED32",0x558],
- ["8130ED33",0x559],
- ["8130ED34",0x55A],
- ["8130ED35",0x55B],
- ["8130ED36",0x55C],
- ["8130ED37",0x55D],
- ["8130ED38",0x55E],
- ["8130ED39",0x55F],
- ["8130EE30",0x560],
- ["8130EE31",0x561],
- ["8130EE32",0x562],
- ["8130EE33",0x563],
- ["8130EE34",0x564],
- ["8130EE35",0x565],
- ["8130EE36",0x566],
- ["8130EE37",0x567],
- ["8130EE38",0x568],
- ["8130EE39",0x569],
- ["8130EF30",0x56A],
- ["8130EF31",0x56B],
- ["8130EF32",0x56C],
- ["8130EF33",0x56D],
- ["8130EF34",0x56E],
- ["8130EF35",0x56F],
- ["8130EF36",0x570],
- ["8130EF37",0x571],
- ["8130EF38",0x572],
- ["8130EF39",0x573],
- ["8130F030",0x574],
- ["8130F031",0x575],
- ["8130F032",0x576],
- ["8130F033",0x577],
- ["8130F034",0x578],
- ["8130F035",0x579],
- ["8130F036",0x57A],
- ["8130F037",0x57B],
- ["8130F038",0x57C],
- ["8130F039",0x57D],
- ["8130F130",0x57E],
- ["8130F131",0x57F],
- ["8130F132",0x580],
- ["8130F133",0x581],
- ["8130F134",0x582],
- ["8130F135",0x583],
- ["8130F136",0x584],
- ["8130F137",0x585],
- ["8130F138",0x586],
- ["8130F139",0x587],
- ["8130F230",0x588],
- ["8130F231",0x589],
- ["8130F232",0x58A],
- ["8130F233",0x58B],
- ["8130F234",0x58C],
- ["8130F235",0x58D],
- ["8130F236",0x58E],
- ["8130F237",0x58F],
- ["8130F238",0x590],
- ["8130F239",0x591],
- ["8130F330",0x592],
- ["8130F331",0x593],
- ["8130F332",0x594],
- ["8130F333",0x595],
- ["8130F334",0x596],
- ["8130F335",0x597],
- ["8130F336",0x598],
- ["8130F337",0x599],
- ["8130F338",0x59A],
- ["8130F339",0x59B],
- ["8130F430",0x59C],
- ["8130F431",0x59D],
- ["8130F432",0x59E],
- ["8130F433",0x59F],
- ["8130F434",0x5A0],
- ["8130F435",0x5A1],
- ["8130F436",0x5A2],
- ["8130F437",0x5A3],
- ["8130F438",0x5A4],
- ["8130F439",0x5A5],
- ["8130F530",0x5A6],
- ["8130F531",0x5A7],
- ["8130F532",0x5A8],
- ["8130F533",0x5A9],
- ["8130F534",0x5AA],
- ["8130F535",0x5AB],
- ["8130F536",0x5AC],
- ["8130F537",0x5AD],
- ["8130F538",0x5AE],
- ["8130F539",0x5AF],
- ["8130F630",0x5B0],
- ["8130F631",0x5B1],
- ["8130F632",0x5B2],
- ["8130F633",0x5B3],
- ["8130F634",0x5B4],
- ["8130F635",0x5B5],
- ["8130F636",0x5B6],
- ["8130F637",0x5B7],
- ["8130F638",0x5B8],
- ["8130F639",0x5B9],
- ["8130F730",0x5BA],
- ["8130F731",0x5BB],
- ["8130F732",0x5BC],
- ["8130F733",0x5BD],
- ["8130F734",0x5BE],
- ["8130F735",0x5BF],
- ["8130F736",0x5C0],
- ["8130F737",0x5C1],
- ["8130F738",0x5C2],
- ["8130F739",0x5C3],
- ["8130F830",0x5C4],
- ["8130F831",0x5C5],
- ["8130F832",0x5C6],
- ["8130F833",0x5C7],
- ["8130F834",0x5C8],
- ["8130F835",0x5C9],
- ["8130F836",0x5CA],
- ["8130F837",0x5CB],
- ["8130F838",0x5CC],
- ["8130F839",0x5CD],
- ["8130F930",0x5CE],
- ["8130F931",0x5CF],
- ["8130F932",0x5D0],
- ["8130F933",0x5D1],
- ["8130F934",0x5D2],
- ["8130F935",0x5D3],
- ["8130F936",0x5D4],
- ["8130F937",0x5D5],
- ["8130F938",0x5D6],
- ["8130F939",0x5D7],
- ["8130FA30",0x5D8],
- ["8130FA31",0x5D9],
- ["8130FA32",0x5DA],
- ["8130FA33",0x5DB],
- ["8130FA34",0x5DC],
- ["8130FA35",0x5DD],
- ["8130FA36",0x5DE],
- ["8130FA37",0x5DF],
- ["8130FA38",0x5E0],
- ["8130FA39",0x5E1],
- ["8130FB30",0x5E2],
- ["8130FB31",0x5E3],
- ["8130FB32",0x5E4],
- ["8130FB33",0x5E5],
- ["8130FB34",0x5E6],
- ["8130FB35",0x5E7],
- ["8130FB36",0x5E8],
- ["8130FB37",0x5E9],
- ["8130FB38",0x5EA],
- ["8130FB39",0x5EB],
- ["8130FC30",0x5EC],
- ["8130FC31",0x5ED],
- ["8130FC32",0x5EE],
- ["8130FC33",0x5EF],
- ["8130FC34",0x5F0],
- ["8130FC35",0x5F1],
- ["8130FC36",0x5F2],
- ["8130FC37",0x5F3],
- ["8130FC38",0x5F4],
- ["8130FC39",0x5F5],
- ["8130FD30",0x5F6],
- ["8130FD31",0x5F7],
- ["8130FD32",0x5F8],
- ["8130FD33",0x5F9],
- ["8130FD34",0x5FA],
- ["8130FD35",0x5FB],
- ["8130FD36",0x5FC],
- ["8130FD37",0x5FD],
- ["8130FD38",0x5FE],
- ["8130FD39",0x5FF],
- ["8130FE30",0x600],
- ["8130FE31",0x601],
- ["8130FE32",0x602],
- ["8130FE33",0x603],
- ["8130FE34",0x604],
- ["8130FE35",0x605],
- ["8130FE36",0x606],
- ["8130FE37",0x607],
- ["8130FE38",0x608],
- ["8130FE39",0x609],
- ["81318130",0x60A],
- ["81318131",0x60B],
- ["81318132",0x60C],
- ["81318133",0x60D],
- ["81318134",0x60E],
- ["81318135",0x60F],
- ["81318136",0x610],
- ["81318137",0x611],
- ["81318138",0x612],
- ["81318139",0x613],
- ["81318230",0x614],
- ["81318231",0x615],
- ["81318232",0x616],
- ["81318233",0x617],
- ["81318234",0x618],
- ["81318235",0x619],
- ["81318236",0x61A],
- ["81318237",0x61B],
- ["81318238",0x61C],
- ["81318239",0x61D],
- ["81318330",0x61E],
- ["81318331",0x61F],
- ["81318332",0x620],
- ["81318333",0x621],
- ["81318334",0x622],
- ["81318335",0x623],
- ["81318336",0x624],
- ["81318337",0x625],
- ["81318338",0x626],
- ["81318339",0x627],
- ["81318430",0x628],
- ["81318431",0x629],
- ["81318432",0x62A],
- ["81318433",0x62B],
- ["81318434",0x62C],
- ["81318435",0x62D],
- ["81318436",0x62E],
- ["81318437",0x62F],
- ["81318438",0x630],
- ["81318439",0x631],
- ["81318530",0x632],
- ["81318531",0x633],
- ["81318532",0x634],
- ["81318533",0x635],
- ["81318534",0x636],
- ["81318535",0x637],
- ["81318536",0x638],
- ["81318537",0x639],
- ["81318538",0x63A],
- ["81318539",0x63B],
- ["81318630",0x63C],
- ["81318631",0x63D],
- ["81318632",0x63E],
- ["81318633",0x63F],
- ["81318634",0x640],
- ["81318635",0x641],
- ["81318636",0x642],
- ["81318637",0x643],
- ["81318638",0x644],
- ["81318639",0x645],
- ["81318730",0x646],
- ["81318731",0x647],
- ["81318732",0x648],
- ["81318733",0x649],
- ["81318734",0x64A],
- ["81318735",0x64B],
- ["81318736",0x64C],
- ["81318737",0x64D],
- ["81318738",0x64E],
- ["81318739",0x64F],
- ["81318830",0x650],
- ["81318831",0x651],
- ["81318832",0x652],
- ["81318833",0x653],
- ["81318834",0x654],
- ["81318835",0x655],
- ["81318836",0x656],
- ["81318837",0x657],
- ["81318838",0x658],
- ["81318839",0x659],
- ["81318930",0x65A],
- ["81318931",0x65B],
- ["81318932",0x65C],
- ["81318933",0x65D],
- ["81318934",0x65E],
- ["81318935",0x65F],
- ["81318936",0x660],
- ["81318937",0x661],
- ["81318938",0x662],
- ["81318939",0x663],
- ["81318A30",0x664],
- ["81318A31",0x665],
- ["81318A32",0x666],
- ["81318A33",0x667],
- ["81318A34",0x668],
- ["81318A35",0x669],
- ["81318A36",0x66A],
- ["81318A37",0x66B],
- ["81318A38",0x66C],
- ["81318A39",0x66D],
- ["81318B30",0x66E],
- ["81318B31",0x66F],
- ["81318B32",0x670],
- ["81318B33",0x671],
- ["81318B34",0x672],
- ["81318B35",0x673],
- ["81318B36",0x674],
- ["81318B37",0x675],
- ["81318B38",0x676],
- ["81318B39",0x677],
- ["81318C30",0x678],
- ["81318C31",0x679],
- ["81318C32",0x67A],
- ["81318C33",0x67B],
- ["81318C34",0x67C],
- ["81318C35",0x67D],
- ["81318C36",0x67E],
- ["81318C37",0x67F],
- ["81318C38",0x680],
- ["81318C39",0x681],
- ["81318D30",0x682],
- ["81318D31",0x683],
- ["81318D32",0x684],
- ["81318D33",0x685],
- ["81318D34",0x686],
- ["81318D35",0x687],
- ["81318D36",0x688],
- ["81318D37",0x689],
- ["81318D38",0x68A],
- ["81318D39",0x68B],
- ["81318E30",0x68C],
- ["81318E31",0x68D],
- ["81318E32",0x68E],
- ["81318E33",0x68F],
- ["81318E34",0x690],
- ["81318E35",0x691],
- ["81318E36",0x692],
- ["81318E37",0x693],
- ["81318E38",0x694],
- ["81318E39",0x695],
- ["81318F30",0x696],
- ["81318F31",0x697],
- ["81318F32",0x698],
- ["81318F33",0x699],
- ["81318F34",0x69A],
- ["81318F35",0x69B],
- ["81318F36",0x69C],
- ["81318F37",0x69D],
- ["81318F38",0x69E],
- ["81318F39",0x69F],
- ["81319030",0x6A0],
- ["81319031",0x6A1],
- ["81319032",0x6A2],
- ["81319033",0x6A3],
- ["81319034",0x6A4],
- ["81319035",0x6A5],
- ["81319036",0x6A6],
- ["81319037",0x6A7],
- ["81319038",0x6A8],
- ["81319039",0x6A9],
- ["81319130",0x6AA],
- ["81319131",0x6AB],
- ["81319132",0x6AC],
- ["81319133",0x6AD],
- ["81319134",0x6AE],
- ["81319135",0x6AF],
- ["81319136",0x6B0],
- ["81319137",0x6B1],
- ["81319138",0x6B2],
- ["81319139",0x6B3],
- ["81319230",0x6B4],
- ["81319231",0x6B5],
- ["81319232",0x6B6],
- ["81319233",0x6B7],
- ["81319234",0x6B8],
- ["81319235",0x6B9],
- ["81319236",0x6BA],
- ["81319237",0x6BB],
- ["81319238",0x6BC],
- ["81319239",0x6BD],
- ["81319330",0x6BE],
- ["81319331",0x6BF],
- ["81319332",0x6C0],
- ["81319333",0x6C1],
- ["81319334",0x6C2],
- ["81319335",0x6C3],
- ["81319336",0x6C4],
- ["81319337",0x6C5],
- ["81319338",0x6C6],
- ["81319339",0x6C7],
- ["81319430",0x6C8],
- ["81319431",0x6C9],
- ["81319432",0x6CA],
- ["81319433",0x6CB],
- ["81319434",0x6CC],
- ["81319435",0x6CD],
- ["81319436",0x6CE],
- ["81319437",0x6CF],
- ["81319438",0x6D0],
- ["81319439",0x6D1],
- ["81319530",0x6D2],
- ["81319531",0x6D3],
- ["81319532",0x6D4],
- ["81319533",0x6D5],
- ["81319534",0x6D6],
- ["81319535",0x6D7],
- ["81319536",0x6D8],
- ["81319537",0x6D9],
- ["81319538",0x6DA],
- ["81319539",0x6DB],
- ["81319630",0x6DC],
- ["81319631",0x6DD],
- ["81319632",0x6DE],
- ["81319633",0x6DF],
- ["81319634",0x6E0],
- ["81319635",0x6E1],
- ["81319636",0x6E2],
- ["81319637",0x6E3],
- ["81319638",0x6E4],
- ["81319639",0x6E5],
- ["81319730",0x6E6],
- ["81319731",0x6E7],
- ["81319732",0x6E8],
- ["81319733",0x6E9],
- ["81319734",0x6EA],
- ["81319735",0x6EB],
- ["81319736",0x6EC],
- ["81319737",0x6ED],
- ["81319738",0x6EE],
- ["81319739",0x6EF],
- ["81319830",0x6F0],
- ["81319831",0x6F1],
- ["81319832",0x6F2],
- ["81319833",0x6F3],
- ["81319834",0x6F4],
- ["81319835",0x6F5],
- ["81319836",0x6F6],
- ["81319837",0x6F7],
- ["81319838",0x6F8],
- ["81319839",0x6F9],
- ["81319930",0x6FA],
- ["81319931",0x6FB],
- ["81319932",0x6FC],
- ["81319933",0x6FD],
- ["81319934",0x6FE],
- ["81319935",0x6FF],
- ["81319936",0x700],
- ["81319937",0x701],
- ["81319938",0x702],
- ["81319939",0x703],
- ["81319A30",0x704],
- ["81319A31",0x705],
- ["81319A32",0x706],
- ["81319A33",0x707],
- ["81319A34",0x708],
- ["81319A35",0x709],
- ["81319A36",0x70A],
- ["81319A37",0x70B],
- ["81319A38",0x70C],
- ["81319A39",0x70D],
- ["81319B30",0x70E],
- ["81319B31",0x70F],
- ["81319B32",0x710],
- ["81319B33",0x711],
- ["81319B34",0x712],
- ["81319B35",0x713],
- ["81319B36",0x714],
- ["81319B37",0x715],
- ["81319B38",0x716],
- ["81319B39",0x717],
- ["81319C30",0x718],
- ["81319C31",0x719],
- ["81319C32",0x71A],
- ["81319C33",0x71B],
- ["81319C34",0x71C],
- ["81319C35",0x71D],
- ["81319C36",0x71E],
- ["81319C37",0x71F],
- ["81319C38",0x720],
- ["81319C39",0x721],
- ["81319D30",0x722],
- ["81319D31",0x723],
- ["81319D32",0x724],
- ["81319D33",0x725],
- ["81319D34",0x726],
- ["81319D35",0x727],
- ["81319D36",0x728],
- ["81319D37",0x729],
- ["81319D38",0x72A],
- ["81319D39",0x72B],
- ["81319E30",0x72C],
- ["81319E31",0x72D],
- ["81319E32",0x72E],
- ["81319E33",0x72F],
- ["81319E34",0x730],
- ["81319E35",0x731],
- ["81319E36",0x732],
- ["81319E37",0x733],
- ["81319E38",0x734],
- ["81319E39",0x735],
- ["81319F30",0x736],
- ["81319F31",0x737],
- ["81319F32",0x738],
- ["81319F33",0x739],
- ["81319F34",0x73A],
- ["81319F35",0x73B],
- ["81319F36",0x73C],
- ["81319F37",0x73D],
- ["81319F38",0x73E],
- ["81319F39",0x73F],
- ["8131A030",0x740],
- ["8131A031",0x741],
- ["8131A032",0x742],
- ["8131A033",0x743],
- ["8131A034",0x744],
- ["8131A035",0x745],
- ["8131A036",0x746],
- ["8131A037",0x747],
- ["8131A038",0x748],
- ["8131A039",0x749],
- ["8131A130",0x74A],
- ["8131A131",0x74B],
- ["8131A132",0x74C],
- ["8131A133",0x74D],
- ["8131A134",0x74E],
- ["8131A135",0x74F],
- ["8131A136",0x750],
- ["8131A137",0x751],
- ["8131A138",0x752],
- ["8131A139",0x753],
- ["8131A230",0x754],
- ["8131A231",0x755],
- ["8131A232",0x756],
- ["8131A233",0x757],
- ["8131A234",0x758],
- ["8131A235",0x759],
- ["8131A236",0x75A],
- ["8131A237",0x75B],
- ["8131A238",0x75C],
- ["8131A239",0x75D],
- ["8131A330",0x75E],
- ["8131A331",0x75F],
- ["8131A332",0x760],
- ["8131A333",0x761],
- ["8131A334",0x762],
- ["8131A335",0x763],
- ["8131A336",0x764],
- ["8131A337",0x765],
- ["8131A338",0x766],
- ["8131A339",0x767],
- ["8131A430",0x768],
- ["8131A431",0x769],
- ["8131A432",0x76A],
- ["8131A433",0x76B],
- ["8131A434",0x76C],
- ["8131A435",0x76D],
- ["8131A436",0x76E],
- ["8131A437",0x76F],
- ["8131A438",0x770],
- ["8131A439",0x771],
- ["8131A530",0x772],
- ["8131A531",0x773],
- ["8131A532",0x774],
- ["8131A533",0x775],
- ["8131A534",0x776],
- ["8131A535",0x777],
- ["8131A536",0x778],
- ["8131A537",0x779],
- ["8131A538",0x77A],
- ["8131A539",0x77B],
- ["8131A630",0x77C],
- ["8131A631",0x77D],
- ["8131A632",0x77E],
- ["8131A633",0x77F],
- ["8131A634",0x780],
- ["8131A635",0x781],
- ["8131A636",0x782],
- ["8131A637",0x783],
- ["8131A638",0x784],
- ["8131A639",0x785],
- ["8131A730",0x786],
- ["8131A731",0x787],
- ["8131A732",0x788],
- ["8131A733",0x789],
- ["8131A734",0x78A],
- ["8131A735",0x78B],
- ["8131A736",0x78C],
- ["8131A737",0x78D],
- ["8131A738",0x78E],
- ["8131A739",0x78F],
- ["8131A830",0x790],
- ["8131A831",0x791],
- ["8131A832",0x792],
- ["8131A833",0x793],
- ["8131A834",0x794],
- ["8131A835",0x795],
- ["8131A836",0x796],
- ["8131A837",0x797],
- ["8131A838",0x798],
- ["8131A839",0x799],
- ["8131A930",0x79A],
- ["8131A931",0x79B],
- ["8131A932",0x79C],
- ["8131A933",0x79D],
- ["8131A934",0x79E],
- ["8131A935",0x79F],
- ["8131A936",0x7A0],
- ["8131A937",0x7A1],
- ["8131A938",0x7A2],
- ["8131A939",0x7A3],
- ["8131AA30",0x7A4],
- ["8131AA31",0x7A5],
- ["8131AA32",0x7A6],
- ["8131AA33",0x7A7],
- ["8131AA34",0x7A8],
- ["8131AA35",0x7A9],
- ["8131AA36",0x7AA],
- ["8131AA37",0x7AB],
- ["8131AA38",0x7AC],
- ["8131AA39",0x7AD],
- ["8131AB30",0x7AE],
- ["8131AB31",0x7AF],
- ["8131AB32",0x7B0],
- ["8131AB33",0x7B1],
- ["8131AB34",0x7B2],
- ["8131AB35",0x7B3],
- ["8131AB36",0x7B4],
- ["8131AB37",0x7B5],
- ["8131AB38",0x7B6],
- ["8131AB39",0x7B7],
- ["8131AC30",0x7B8],
- ["8131AC31",0x7B9],
- ["8131AC32",0x7BA],
- ["8131AC33",0x7BB],
- ["8131AC34",0x7BC],
- ["8131AC35",0x7BD],
- ["8131AC36",0x7BE],
- ["8131AC37",0x7BF],
- ["8131AC38",0x7C0],
- ["8131AC39",0x7C1],
- ["8131AD30",0x7C2],
- ["8131AD31",0x7C3],
- ["8131AD32",0x7C4],
- ["8131AD33",0x7C5],
- ["8131AD34",0x7C6],
- ["8131AD35",0x7C7],
- ["8131AD36",0x7C8],
- ["8131AD37",0x7C9],
- ["8131AD38",0x7CA],
- ["8131AD39",0x7CB],
- ["8131AE30",0x7CC],
- ["8131AE31",0x7CD],
- ["8131AE32",0x7CE],
- ["8131AE33",0x7CF],
- ["8131AE34",0x7D0],
- ["8131AE35",0x7D1],
- ["8131AE36",0x7D2],
- ["8131AE37",0x7D3],
- ["8131AE38",0x7D4],
- ["8131AE39",0x7D5],
- ["8131AF30",0x7D6],
- ["8131AF31",0x7D7],
- ["8131AF32",0x7D8],
- ["8131AF33",0x7D9],
- ["8131AF34",0x7DA],
- ["8131AF35",0x7DB],
- ["8131AF36",0x7DC],
- ["8131AF37",0x7DD],
- ["8131AF38",0x7DE],
- ["8131AF39",0x7DF],
- ["8131B030",0x7E0],
- ["8131B031",0x7E1],
- ["8131B032",0x7E2],
- ["8131B033",0x7E3],
- ["8131B034",0x7E4],
- ["8131B035",0x7E5],
- ["8131B036",0x7E6],
- ["8131B037",0x7E7],
- ["8131B038",0x7E8],
- ["8131B039",0x7E9],
- ["8131B130",0x7EA],
- ["8131B131",0x7EB],
- ["8131B132",0x7EC],
- ["8131B133",0x7ED],
- ["8131B134",0x7EE],
- ["8131B135",0x7EF],
- ["8131B136",0x7F0],
- ["8131B137",0x7F1],
- ["8131B138",0x7F2],
- ["8131B139",0x7F3],
- ["8131B230",0x7F4],
- ["8131B231",0x7F5],
- ["8131B232",0x7F6],
- ["8131B233",0x7F7],
- ["8131B234",0x7F8],
- ["8131B235",0x7F9],
- ["8131B236",0x7FA],
- ["8131B237",0x7FB],
- ["8131B238",0x7FC],
- ["8131B239",0x7FD],
- ["8131B330",0x7FE],
- ["8131B331",0x7FF],
- ["8131B332",0x800],
- ["8131B333",0x801],
- ["8131B334",0x802],
- ["8131B335",0x803],
- ["8131B336",0x804],
- ["8131B337",0x805],
- ["8131B338",0x806],
- ["8131B339",0x807],
- ["8131B430",0x808],
- ["8131B431",0x809],
- ["8131B432",0x80A],
- ["8131B433",0x80B],
- ["8131B434",0x80C],
- ["8131B435",0x80D],
- ["8131B436",0x80E],
- ["8131B437",0x80F],
- ["8131B438",0x810],
- ["8131B439",0x811],
- ["8131B530",0x812],
- ["8131B531",0x813],
- ["8131B532",0x814],
- ["8131B533",0x815],
- ["8131B534",0x816],
- ["8131B535",0x817],
- ["8131B536",0x818],
- ["8131B537",0x819],
- ["8131B538",0x81A],
- ["8131B539",0x81B],
- ["8131B630",0x81C],
- ["8131B631",0x81D],
- ["8131B632",0x81E],
- ["8131B633",0x81F],
- ["8131B634",0x820],
- ["8131B635",0x821],
- ["8131B636",0x822],
- ["8131B637",0x823],
- ["8131B638",0x824],
- ["8131B639",0x825],
- ["8131B730",0x826],
- ["8131B731",0x827],
- ["8131B732",0x828],
- ["8131B733",0x829],
- ["8131B734",0x82A],
- ["8131B735",0x82B],
- ["8131B736",0x82C],
- ["8131B737",0x82D],
- ["8131B738",0x82E],
- ["8131B739",0x82F],
- ["8131B830",0x830],
- ["8131B831",0x831],
- ["8131B832",0x832],
- ["8131B833",0x833],
- ["8131B834",0x834],
- ["8131B835",0x835],
- ["8131B836",0x836],
- ["8131B837",0x837],
- ["8131B838",0x838],
- ["8131B839",0x839],
- ["8131B930",0x83A],
- ["8131B931",0x83B],
- ["8131B932",0x83C],
- ["8131B933",0x83D],
- ["8131B934",0x83E],
- ["8131B935",0x83F],
- ["8131B936",0x840],
- ["8131B937",0x841],
- ["8131B938",0x842],
- ["8131B939",0x843],
- ["8131BA30",0x844],
- ["8131BA31",0x845],
- ["8131BA32",0x846],
- ["8131BA33",0x847],
- ["8131BA34",0x848],
- ["8131BA35",0x849],
- ["8131BA36",0x84A],
- ["8131BA37",0x84B],
- ["8131BA38",0x84C],
- ["8131BA39",0x84D],
- ["8131BB30",0x84E],
- ["8131BB31",0x84F],
- ["8131BB32",0x850],
- ["8131BB33",0x851],
- ["8131BB34",0x852],
- ["8131BB35",0x853],
- ["8131BB36",0x854],
- ["8131BB37",0x855],
- ["8131BB38",0x856],
- ["8131BB39",0x857],
- ["8131BC30",0x858],
- ["8131BC31",0x859],
- ["8131BC32",0x85A],
- ["8131BC33",0x85B],
- ["8131BC34",0x85C],
- ["8131BC35",0x85D],
- ["8131BC36",0x85E],
- ["8131BC37",0x85F],
- ["8131BC38",0x860],
- ["8131BC39",0x861],
- ["8131BD30",0x862],
- ["8131BD31",0x863],
- ["8131BD32",0x864],
- ["8131BD33",0x865],
- ["8131BD34",0x866],
- ["8131BD35",0x867],
- ["8131BD36",0x868],
- ["8131BD37",0x869],
- ["8131BD38",0x86A],
- ["8131BD39",0x86B],
- ["8131BE30",0x86C],
- ["8131BE31",0x86D],
- ["8131BE32",0x86E],
- ["8131BE33",0x86F],
- ["8131BE34",0x870],
- ["8131BE35",0x871],
- ["8131BE36",0x872],
- ["8131BE37",0x873],
- ["8131BE38",0x874],
- ["8131BE39",0x875],
- ["8131BF30",0x876],
- ["8131BF31",0x877],
- ["8131BF32",0x878],
- ["8131BF33",0x879],
- ["8131BF34",0x87A],
- ["8131BF35",0x87B],
- ["8131BF36",0x87C],
- ["8131BF37",0x87D],
- ["8131BF38",0x87E],
- ["8131BF39",0x87F],
- ["8131C030",0x880],
- ["8131C031",0x881],
- ["8131C032",0x882],
- ["8131C033",0x883],
- ["8131C034",0x884],
- ["8131C035",0x885],
- ["8131C036",0x886],
- ["8131C037",0x887],
- ["8131C038",0x888],
- ["8131C039",0x889],
- ["8131C130",0x88A],
- ["8131C131",0x88B],
- ["8131C132",0x88C],
- ["8131C133",0x88D],
- ["8131C134",0x88E],
- ["8131C135",0x88F],
- ["8131C136",0x890],
- ["8131C137",0x891],
- ["8131C138",0x892],
- ["8131C139",0x893],
- ["8131C230",0x894],
- ["8131C231",0x895],
- ["8131C232",0x896],
- ["8131C233",0x897],
- ["8131C234",0x898],
- ["8131C235",0x899],
- ["8131C236",0x89A],
- ["8131C237",0x89B],
- ["8131C238",0x89C],
- ["8131C239",0x89D],
- ["8131C330",0x89E],
- ["8131C331",0x89F],
- ["8131C332",0x8A0],
- ["8131C333",0x8A1],
- ["8131C334",0x8A2],
- ["8131C335",0x8A3],
- ["8131C336",0x8A4],
- ["8131C337",0x8A5],
- ["8131C338",0x8A6],
- ["8131C339",0x8A7],
- ["8131C430",0x8A8],
- ["8131C431",0x8A9],
- ["8131C432",0x8AA],
- ["8131C433",0x8AB],
- ["8131C434",0x8AC],
- ["8131C435",0x8AD],
- ["8131C436",0x8AE],
- ["8131C437",0x8AF],
- ["8131C438",0x8B0],
- ["8131C439",0x8B1],
- ["8131C530",0x8B2],
- ["8131C531",0x8B3],
- ["8131C532",0x8B4],
- ["8131C533",0x8B5],
- ["8131C534",0x8B6],
- ["8131C535",0x8B7],
- ["8131C536",0x8B8],
- ["8131C537",0x8B9],
- ["8131C538",0x8BA],
- ["8131C539",0x8BB],
- ["8131C630",0x8BC],
- ["8131C631",0x8BD],
- ["8131C632",0x8BE],
- ["8131C633",0x8BF],
- ["8131C634",0x8C0],
- ["8131C635",0x8C1],
- ["8131C636",0x8C2],
- ["8131C637",0x8C3],
- ["8131C638",0x8C4],
- ["8131C639",0x8C5],
- ["8131C730",0x8C6],
- ["8131C731",0x8C7],
- ["8131C732",0x8C8],
- ["8131C733",0x8C9],
- ["8131C734",0x8CA],
- ["8131C735",0x8CB],
- ["8131C736",0x8CC],
- ["8131C737",0x8CD],
- ["8131C738",0x8CE],
- ["8131C739",0x8CF],
- ["8131C830",0x8D0],
- ["8131C831",0x8D1],
- ["8131C832",0x8D2],
- ["8131C833",0x8D3],
- ["8131C834",0x8D4],
- ["8131C835",0x8D5],
- ["8131C836",0x8D6],
- ["8131C837",0x8D7],
- ["8131C838",0x8D8],
- ["8131C839",0x8D9],
- ["8131C930",0x8DA],
- ["8131C931",0x8DB],
- ["8131C932",0x8DC],
- ["8131C933",0x8DD],
- ["8131C934",0x8DE],
- ["8131C935",0x8DF],
- ["8131C936",0x8E0],
- ["8131C937",0x8E1],
- ["8131C938",0x8E2],
- ["8131C939",0x8E3],
- ["8131CA30",0x8E4],
- ["8131CA31",0x8E5],
- ["8131CA32",0x8E6],
- ["8131CA33",0x8E7],
- ["8131CA34",0x8E8],
- ["8131CA35",0x8E9],
- ["8131CA36",0x8EA],
- ["8131CA37",0x8EB],
- ["8131CA38",0x8EC],
- ["8131CA39",0x8ED],
- ["8131CB30",0x8EE],
- ["8131CB31",0x8EF],
- ["8131CB32",0x8F0],
- ["8131CB33",0x8F1],
- ["8131CB34",0x8F2],
- ["8131CB35",0x8F3],
- ["8131CB36",0x8F4],
- ["8131CB37",0x8F5],
- ["8131CB38",0x8F6],
- ["8131CB39",0x8F7],
- ["8131CC30",0x8F8],
- ["8131CC31",0x8F9],
- ["8131CC32",0x8FA],
- ["8131CC33",0x8FB],
- ["8131CC34",0x8FC],
- ["8131CC35",0x8FD],
- ["8131CC36",0x8FE],
- ["8131CC37",0x8FF],
- ["8131CC38",0x900],
- ["8131CC39",0x901],
- ["8131CD30",0x902],
- ["8131CD31",0x903],
- ["8131CD32",0x904],
- ["8131CD33",0x905],
- ["8131CD34",0x906],
- ["8131CD35",0x907],
- ["8131CD36",0x908],
- ["8131CD37",0x909],
- ["8131CD38",0x90A],
- ["8131CD39",0x90B],
- ["8131CE30",0x90C],
- ["8131CE31",0x90D],
- ["8131CE32",0x90E],
- ["8131CE33",0x90F],
- ["8131CE34",0x910],
- ["8131CE35",0x911],
- ["8131CE36",0x912],
- ["8131CE37",0x913],
- ["8131CE38",0x914],
- ["8131CE39",0x915],
- ["8131CF30",0x916],
- ["8131CF31",0x917],
- ["8131CF32",0x918],
- ["8131CF33",0x919],
- ["8131CF34",0x91A],
- ["8131CF35",0x91B],
- ["8131CF36",0x91C],
- ["8131CF37",0x91D],
- ["8131CF38",0x91E],
- ["8131CF39",0x91F],
- ["8131D030",0x920],
- ["8131D031",0x921],
- ["8131D032",0x922],
- ["8131D033",0x923],
- ["8131D034",0x924],
- ["8131D035",0x925],
- ["8131D036",0x926],
- ["8131D037",0x927],
- ["8131D038",0x928],
- ["8131D039",0x929],
- ["8131D130",0x92A],
- ["8131D131",0x92B],
- ["8131D132",0x92C],
- ["8131D133",0x92D],
- ["8131D134",0x92E],
- ["8131D135",0x92F],
- ["8131D136",0x930],
- ["8131D137",0x931],
- ["8131D138",0x932],
- ["8131D139",0x933],
- ["8131D230",0x934],
- ["8131D231",0x935],
- ["8131D232",0x936],
- ["8131D233",0x937],
- ["8131D234",0x938],
- ["8131D235",0x939],
- ["8131D236",0x93A],
- ["8131D237",0x93B],
- ["8131D238",0x93C],
- ["8131D239",0x93D],
- ["8131D330",0x93E],
- ["8131D331",0x93F],
- ["8131D332",0x940],
- ["8131D333",0x941],
- ["8131D334",0x942],
- ["8131D335",0x943],
- ["8131D336",0x944],
- ["8131D337",0x945],
- ["8131D338",0x946],
- ["8131D339",0x947],
- ["8131D430",0x948],
- ["8131D431",0x949],
- ["8131D432",0x94A],
- ["8131D433",0x94B],
- ["8131D434",0x94C],
- ["8131D435",0x94D],
- ["8131D436",0x94E],
- ["8131D437",0x94F],
- ["8131D438",0x950],
- ["8131D439",0x951],
- ["8131D530",0x952],
- ["8131D531",0x953],
- ["8131D532",0x954],
- ["8131D533",0x955],
- ["8131D534",0x956],
- ["8131D535",0x957],
- ["8131D536",0x958],
- ["8131D537",0x959],
- ["8131D538",0x95A],
- ["8131D539",0x95B],
- ["8131D630",0x95C],
- ["8131D631",0x95D],
- ["8131D632",0x95E],
- ["8131D633",0x95F],
- ["8131D634",0x960],
- ["8131D635",0x961],
- ["8131D636",0x962],
- ["8131D637",0x963],
- ["8131D638",0x964],
- ["8131D639",0x965],
- ["8131D730",0x966],
- ["8131D731",0x967],
- ["8131D732",0x968],
- ["8131D733",0x969],
- ["8131D734",0x96A],
- ["8131D735",0x96B],
- ["8131D736",0x96C],
- ["8131D737",0x96D],
- ["8131D738",0x96E],
- ["8131D739",0x96F],
- ["8131D830",0x970],
- ["8131D831",0x971],
- ["8131D832",0x972],
- ["8131D833",0x973],
- ["8131D834",0x974],
- ["8131D835",0x975],
- ["8131D836",0x976],
- ["8131D837",0x977],
- ["8131D838",0x978],
- ["8131D839",0x979],
- ["8131D930",0x97A],
- ["8131D931",0x97B],
- ["8131D932",0x97C],
- ["8131D933",0x97D],
- ["8131D934",0x97E],
- ["8131D935",0x97F],
- ["8131D936",0x980],
- ["8131D937",0x981],
- ["8131D938",0x982],
- ["8131D939",0x983],
- ["8131DA30",0x984],
- ["8131DA31",0x985],
- ["8131DA32",0x986],
- ["8131DA33",0x987],
- ["8131DA34",0x988],
- ["8131DA35",0x989],
- ["8131DA36",0x98A],
- ["8131DA37",0x98B],
- ["8131DA38",0x98C],
- ["8131DA39",0x98D],
- ["8131DB30",0x98E],
- ["8131DB31",0x98F],
- ["8131DB32",0x990],
- ["8131DB33",0x991],
- ["8131DB34",0x992],
- ["8131DB35",0x993],
- ["8131DB36",0x994],
- ["8131DB37",0x995],
- ["8131DB38",0x996],
- ["8131DB39",0x997],
- ["8131DC30",0x998],
- ["8131DC31",0x999],
- ["8131DC32",0x99A],
- ["8131DC33",0x99B],
- ["8131DC34",0x99C],
- ["8131DC35",0x99D],
- ["8131DC36",0x99E],
- ["8131DC37",0x99F],
- ["8131DC38",0x9A0],
- ["8131DC39",0x9A1],
- ["8131DD30",0x9A2],
- ["8131DD31",0x9A3],
- ["8131DD32",0x9A4],
- ["8131DD33",0x9A5],
- ["8131DD34",0x9A6],
- ["8131DD35",0x9A7],
- ["8131DD36",0x9A8],
- ["8131DD37",0x9A9],
- ["8131DD38",0x9AA],
- ["8131DD39",0x9AB],
- ["8131DE30",0x9AC],
- ["8131DE31",0x9AD],
- ["8131DE32",0x9AE],
- ["8131DE33",0x9AF],
- ["8131DE34",0x9B0],
- ["8131DE35",0x9B1],
- ["8131DE36",0x9B2],
- ["8131DE37",0x9B3],
- ["8131DE38",0x9B4],
- ["8131DE39",0x9B5],
- ["8131DF30",0x9B6],
- ["8131DF31",0x9B7],
- ["8131DF32",0x9B8],
- ["8131DF33",0x9B9],
- ["8131DF34",0x9BA],
- ["8131DF35",0x9BB],
- ["8131DF36",0x9BC],
- ["8131DF37",0x9BD],
- ["8131DF38",0x9BE],
- ["8131DF39",0x9BF],
- ["8131E030",0x9C0],
- ["8131E031",0x9C1],
- ["8131E032",0x9C2],
- ["8131E033",0x9C3],
- ["8131E034",0x9C4],
- ["8131E035",0x9C5],
- ["8131E036",0x9C6],
- ["8131E037",0x9C7],
- ["8131E038",0x9C8],
- ["8131E039",0x9C9],
- ["8131E130",0x9CA],
- ["8131E131",0x9CB],
- ["8131E132",0x9CC],
- ["8131E133",0x9CD],
- ["8131E134",0x9CE],
- ["8131E135",0x9CF],
- ["8131E136",0x9D0],
- ["8131E137",0x9D1],
- ["8131E138",0x9D2],
- ["8131E139",0x9D3],
- ["8131E230",0x9D4],
- ["8131E231",0x9D5],
- ["8131E232",0x9D6],
- ["8131E233",0x9D7],
- ["8131E234",0x9D8],
- ["8131E235",0x9D9],
- ["8131E236",0x9DA],
- ["8131E237",0x9DB],
- ["8131E238",0x9DC],
- ["8131E239",0x9DD],
- ["8131E330",0x9DE],
- ["8131E331",0x9DF],
- ["8131E332",0x9E0],
- ["8131E333",0x9E1],
- ["8131E334",0x9E2],
- ["8131E335",0x9E3],
- ["8131E336",0x9E4],
- ["8131E337",0x9E5],
- ["8131E338",0x9E6],
- ["8131E339",0x9E7],
- ["8131E430",0x9E8],
- ["8131E431",0x9E9],
- ["8131E432",0x9EA],
- ["8131E433",0x9EB],
- ["8131E434",0x9EC],
- ["8131E435",0x9ED],
- ["8131E436",0x9EE],
- ["8131E437",0x9EF],
- ["8131E438",0x9F0],
- ["8131E439",0x9F1],
- ["8131E530",0x9F2],
- ["8131E531",0x9F3],
- ["8131E532",0x9F4],
- ["8131E533",0x9F5],
- ["8131E534",0x9F6],
- ["8131E535",0x9F7],
- ["8131E536",0x9F8],
- ["8131E537",0x9F9],
- ["8131E538",0x9FA],
- ["8131E539",0x9FB],
- ["8131E630",0x9FC],
- ["8131E631",0x9FD],
- ["8131E632",0x9FE],
- ["8131E633",0x9FF],
- ["8131E634",0xA00],
- ["8131E635",0xA01],
- ["8131E636",0xA02],
- ["8131E637",0xA03],
- ["8131E638",0xA04],
- ["8131E639",0xA05],
- ["8131E730",0xA06],
- ["8131E731",0xA07],
- ["8131E732",0xA08],
- ["8131E733",0xA09],
- ["8131E734",0xA0A],
- ["8131E735",0xA0B],
- ["8131E736",0xA0C],
- ["8131E737",0xA0D],
- ["8131E738",0xA0E],
- ["8131E739",0xA0F],
- ["8131E830",0xA10],
- ["8131E831",0xA11],
- ["8131E832",0xA12],
- ["8131E833",0xA13],
- ["8131E834",0xA14],
- ["8131E835",0xA15],
- ["8131E836",0xA16],
- ["8131E837",0xA17],
- ["8131E838",0xA18],
- ["8131E839",0xA19],
- ["8131E930",0xA1A],
- ["8131E931",0xA1B],
- ["8131E932",0xA1C],
- ["8131E933",0xA1D],
- ["8131E934",0xA1E],
- ["8131E935",0xA1F],
- ["8131E936",0xA20],
- ["8131E937",0xA21],
- ["8131E938",0xA22],
- ["8131E939",0xA23],
- ["8131EA30",0xA24],
- ["8131EA31",0xA25],
- ["8131EA32",0xA26],
- ["8131EA33",0xA27],
- ["8131EA34",0xA28],
- ["8131EA35",0xA29],
- ["8131EA36",0xA2A],
- ["8131EA37",0xA2B],
- ["8131EA38",0xA2C],
- ["8131EA39",0xA2D],
- ["8131EB30",0xA2E],
- ["8131EB31",0xA2F],
- ["8131EB32",0xA30],
- ["8131EB33",0xA31],
- ["8131EB34",0xA32],
- ["8131EB35",0xA33],
- ["8131EB36",0xA34],
- ["8131EB37",0xA35],
- ["8131EB38",0xA36],
- ["8131EB39",0xA37],
- ["8131EC30",0xA38],
- ["8131EC31",0xA39],
- ["8131EC32",0xA3A],
- ["8131EC33",0xA3B],
- ["8131EC34",0xA3C],
- ["8131EC35",0xA3D],
- ["8131EC36",0xA3E],
- ["8131EC37",0xA3F],
- ["8131EC38",0xA40],
- ["8131EC39",0xA41],
- ["8131ED30",0xA42],
- ["8131ED31",0xA43],
- ["8131ED32",0xA44],
- ["8131ED33",0xA45],
- ["8131ED34",0xA46],
- ["8131ED35",0xA47],
- ["8131ED36",0xA48],
- ["8131ED37",0xA49],
- ["8131ED38",0xA4A],
- ["8131ED39",0xA4B],
- ["8131EE30",0xA4C],
- ["8131EE31",0xA4D],
- ["8131EE32",0xA4E],
- ["8131EE33",0xA4F],
- ["8131EE34",0xA50],
- ["8131EE35",0xA51],
- ["8131EE36",0xA52],
- ["8131EE37",0xA53],
- ["8131EE38",0xA54],
- ["8131EE39",0xA55],
- ["8131EF30",0xA56],
- ["8131EF31",0xA57],
- ["8131EF32",0xA58],
- ["8131EF33",0xA59],
- ["8131EF34",0xA5A],
- ["8131EF35",0xA5B],
- ["8131EF36",0xA5C],
- ["8131EF37",0xA5D],
- ["8131EF38",0xA5E],
- ["8131EF39",0xA5F],
- ["8131F030",0xA60],
- ["8131F031",0xA61],
- ["8131F032",0xA62],
- ["8131F033",0xA63],
- ["8131F034",0xA64],
- ["8131F035",0xA65],
- ["8131F036",0xA66],
- ["8131F037",0xA67],
- ["8131F038",0xA68],
- ["8131F039",0xA69],
- ["8131F130",0xA6A],
- ["8131F131",0xA6B],
- ["8131F132",0xA6C],
- ["8131F133",0xA6D],
- ["8131F134",0xA6E],
- ["8131F135",0xA6F],
- ["8131F136",0xA70],
- ["8131F137",0xA71],
- ["8131F138",0xA72],
- ["8131F139",0xA73],
- ["8131F230",0xA74],
- ["8131F231",0xA75],
- ["8131F232",0xA76],
- ["8131F233",0xA77],
- ["8131F234",0xA78],
- ["8131F235",0xA79],
- ["8131F236",0xA7A],
- ["8131F237",0xA7B],
- ["8131F238",0xA7C],
- ["8131F239",0xA7D],
- ["8131F330",0xA7E],
- ["8131F331",0xA7F],
- ["8131F332",0xA80],
- ["8131F333",0xA81],
- ["8131F334",0xA82],
- ["8131F335",0xA83],
- ["8131F336",0xA84],
- ["8131F337",0xA85],
- ["8131F338",0xA86],
- ["8131F339",0xA87],
- ["8131F430",0xA88],
- ["8131F431",0xA89],
- ["8131F432",0xA8A],
- ["8131F433",0xA8B],
- ["8131F434",0xA8C],
- ["8131F435",0xA8D],
- ["8131F436",0xA8E],
- ["8131F437",0xA8F],
- ["8131F438",0xA90],
- ["8131F439",0xA91],
- ["8131F530",0xA92],
- ["8131F531",0xA93],
- ["8131F532",0xA94],
- ["8131F533",0xA95],
- ["8131F534",0xA96],
- ["8131F535",0xA97],
- ["8131F536",0xA98],
- ["8131F537",0xA99],
- ["8131F538",0xA9A],
- ["8131F539",0xA9B],
- ["8131F630",0xA9C],
- ["8131F631",0xA9D],
- ["8131F632",0xA9E],
- ["8131F633",0xA9F],
- ["8131F634",0xAA0],
- ["8131F635",0xAA1],
- ["8131F636",0xAA2],
- ["8131F637",0xAA3],
- ["8131F638",0xAA4],
- ["8131F639",0xAA5],
- ["8131F730",0xAA6],
- ["8131F731",0xAA7],
- ["8131F732",0xAA8],
- ["8131F733",0xAA9],
- ["8131F734",0xAAA],
- ["8131F735",0xAAB],
- ["8131F736",0xAAC],
- ["8131F737",0xAAD],
- ["8131F738",0xAAE],
- ["8131F739",0xAAF],
- ["8131F830",0xAB0],
- ["8131F831",0xAB1],
- ["8131F832",0xAB2],
- ["8131F833",0xAB3],
- ["8131F834",0xAB4],
- ["8131F835",0xAB5],
- ["8131F836",0xAB6],
- ["8131F837",0xAB7],
- ["8131F838",0xAB8],
- ["8131F839",0xAB9],
- ["8131F930",0xABA],
- ["8131F931",0xABB],
- ["8131F932",0xABC],
- ["8131F933",0xABD],
- ["8131F934",0xABE],
- ["8131F935",0xABF],
- ["8131F936",0xAC0],
- ["8131F937",0xAC1],
- ["8131F938",0xAC2],
- ["8131F939",0xAC3],
- ["8131FA30",0xAC4],
- ["8131FA31",0xAC5],
- ["8131FA32",0xAC6],
- ["8131FA33",0xAC7],
- ["8131FA34",0xAC8],
- ["8131FA35",0xAC9],
- ["8131FA36",0xACA],
- ["8131FA37",0xACB],
- ["8131FA38",0xACC],
- ["8131FA39",0xACD],
- ["8131FB30",0xACE],
- ["8131FB31",0xACF],
- ["8131FB32",0xAD0],
- ["8131FB33",0xAD1],
- ["8131FB34",0xAD2],
- ["8131FB35",0xAD3],
- ["8131FB36",0xAD4],
- ["8131FB37",0xAD5],
- ["8131FB38",0xAD6],
- ["8131FB39",0xAD7],
- ["8131FC30",0xAD8],
- ["8131FC31",0xAD9],
- ["8131FC32",0xADA],
- ["8131FC33",0xADB],
- ["8131FC34",0xADC],
- ["8131FC35",0xADD],
- ["8131FC36",0xADE],
- ["8131FC37",0xADF],
- ["8131FC38",0xAE0],
- ["8131FC39",0xAE1],
- ["8131FD30",0xAE2],
- ["8131FD31",0xAE3],
- ["8131FD32",0xAE4],
- ["8131FD33",0xAE5],
- ["8131FD34",0xAE6],
- ["8131FD35",0xAE7],
- ["8131FD36",0xAE8],
- ["8131FD37",0xAE9],
- ["8131FD38",0xAEA],
- ["8131FD39",0xAEB],
- ["8131FE30",0xAEC],
- ["8131FE31",0xAED],
- ["8131FE32",0xAEE],
- ["8131FE33",0xAEF],
- ["8131FE34",0xAF0],
- ["8131FE35",0xAF1],
- ["8131FE36",0xAF2],
- ["8131FE37",0xAF3],
- ["8131FE38",0xAF4],
- ["8131FE39",0xAF5],
- ["81328130",0xAF6],
- ["81328131",0xAF7],
- ["81328132",0xAF8],
- ["81328133",0xAF9],
- ["81328134",0xAFA],
- ["81328135",0xAFB],
- ["81328136",0xAFC],
- ["81328137",0xAFD],
- ["81328138",0xAFE],
- ["81328139",0xAFF],
- ["81328230",0xB00],
- ["81328231",0xB01],
- ["81328232",0xB02],
- ["81328233",0xB03],
- ["81328234",0xB04],
- ["81328235",0xB05],
- ["81328236",0xB06],
- ["81328237",0xB07],
- ["81328238",0xB08],
- ["81328239",0xB09],
- ["81328330",0xB0A],
- ["81328331",0xB0B],
- ["81328332",0xB0C],
- ["81328333",0xB0D],
- ["81328334",0xB0E],
- ["81328335",0xB0F],
- ["81328336",0xB10],
- ["81328337",0xB11],
- ["81328338",0xB12],
- ["81328339",0xB13],
- ["81328430",0xB14],
- ["81328431",0xB15],
- ["81328432",0xB16],
- ["81328433",0xB17],
- ["81328434",0xB18],
- ["81328435",0xB19],
- ["81328436",0xB1A],
- ["81328437",0xB1B],
- ["81328438",0xB1C],
- ["81328439",0xB1D],
- ["81328530",0xB1E],
- ["81328531",0xB1F],
- ["81328532",0xB20],
- ["81328533",0xB21],
- ["81328534",0xB22],
- ["81328535",0xB23],
- ["81328536",0xB24],
- ["81328537",0xB25],
- ["81328538",0xB26],
- ["81328539",0xB27],
- ["81328630",0xB28],
- ["81328631",0xB29],
- ["81328632",0xB2A],
- ["81328633",0xB2B],
- ["81328634",0xB2C],
- ["81328635",0xB2D],
- ["81328636",0xB2E],
- ["81328637",0xB2F],
- ["81328638",0xB30],
- ["81328639",0xB31],
- ["81328730",0xB32],
- ["81328731",0xB33],
- ["81328732",0xB34],
- ["81328733",0xB35],
- ["81328734",0xB36],
- ["81328735",0xB37],
- ["81328736",0xB38],
- ["81328737",0xB39],
- ["81328738",0xB3A],
- ["81328739",0xB3B],
- ["81328830",0xB3C],
- ["81328831",0xB3D],
- ["81328832",0xB3E],
- ["81328833",0xB3F],
- ["81328834",0xB40],
- ["81328835",0xB41],
- ["81328836",0xB42],
- ["81328837",0xB43],
- ["81328838",0xB44],
- ["81328839",0xB45],
- ["81328930",0xB46],
- ["81328931",0xB47],
- ["81328932",0xB48],
- ["81328933",0xB49],
- ["81328934",0xB4A],
- ["81328935",0xB4B],
- ["81328936",0xB4C],
- ["81328937",0xB4D],
- ["81328938",0xB4E],
- ["81328939",0xB4F],
- ["81328A30",0xB50],
- ["81328A31",0xB51],
- ["81328A32",0xB52],
- ["81328A33",0xB53],
- ["81328A34",0xB54],
- ["81328A35",0xB55],
- ["81328A36",0xB56],
- ["81328A37",0xB57],
- ["81328A38",0xB58],
- ["81328A39",0xB59],
- ["81328B30",0xB5A],
- ["81328B31",0xB5B],
- ["81328B32",0xB5C],
- ["81328B33",0xB5D],
- ["81328B34",0xB5E],
- ["81328B35",0xB5F],
- ["81328B36",0xB60],
- ["81328B37",0xB61],
- ["81328B38",0xB62],
- ["81328B39",0xB63],
- ["81328C30",0xB64],
- ["81328C31",0xB65],
- ["81328C32",0xB66],
- ["81328C33",0xB67],
- ["81328C34",0xB68],
- ["81328C35",0xB69],
- ["81328C36",0xB6A],
- ["81328C37",0xB6B],
- ["81328C38",0xB6C],
- ["81328C39",0xB6D],
- ["81328D30",0xB6E],
- ["81328D31",0xB6F],
- ["81328D32",0xB70],
- ["81328D33",0xB71],
- ["81328D34",0xB72],
- ["81328D35",0xB73],
- ["81328D36",0xB74],
- ["81328D37",0xB75],
- ["81328D38",0xB76],
- ["81328D39",0xB77],
- ["81328E30",0xB78],
- ["81328E31",0xB79],
- ["81328E32",0xB7A],
- ["81328E33",0xB7B],
- ["81328E34",0xB7C],
- ["81328E35",0xB7D],
- ["81328E36",0xB7E],
- ["81328E37",0xB7F],
- ["81328E38",0xB80],
- ["81328E39",0xB81],
- ["81328F30",0xB82],
- ["81328F31",0xB83],
- ["81328F32",0xB84],
- ["81328F33",0xB85],
- ["81328F34",0xB86],
- ["81328F35",0xB87],
- ["81328F36",0xB88],
- ["81328F37",0xB89],
- ["81328F38",0xB8A],
- ["81328F39",0xB8B],
- ["81329030",0xB8C],
- ["81329031",0xB8D],
- ["81329032",0xB8E],
- ["81329033",0xB8F],
- ["81329034",0xB90],
- ["81329035",0xB91],
- ["81329036",0xB92],
- ["81329037",0xB93],
- ["81329038",0xB94],
- ["81329039",0xB95],
- ["81329130",0xB96],
- ["81329131",0xB97],
- ["81329132",0xB98],
- ["81329133",0xB99],
- ["81329134",0xB9A],
- ["81329135",0xB9B],
- ["81329136",0xB9C],
- ["81329137",0xB9D],
- ["81329138",0xB9E],
- ["81329139",0xB9F],
- ["81329230",0xBA0],
- ["81329231",0xBA1],
- ["81329232",0xBA2],
- ["81329233",0xBA3],
- ["81329234",0xBA4],
- ["81329235",0xBA5],
- ["81329236",0xBA6],
- ["81329237",0xBA7],
- ["81329238",0xBA8],
- ["81329239",0xBA9],
- ["81329330",0xBAA],
- ["81329331",0xBAB],
- ["81329332",0xBAC],
- ["81329333",0xBAD],
- ["81329334",0xBAE],
- ["81329335",0xBAF],
- ["81329336",0xBB0],
- ["81329337",0xBB1],
- ["81329338",0xBB2],
- ["81329339",0xBB3],
- ["81329430",0xBB4],
- ["81329431",0xBB5],
- ["81329432",0xBB6],
- ["81329433",0xBB7],
- ["81329434",0xBB8],
- ["81329435",0xBB9],
- ["81329436",0xBBA],
- ["81329437",0xBBB],
- ["81329438",0xBBC],
- ["81329439",0xBBD],
- ["81329530",0xBBE],
- ["81329531",0xBBF],
- ["81329532",0xBC0],
- ["81329533",0xBC1],
- ["81329534",0xBC2],
- ["81329535",0xBC3],
- ["81329536",0xBC4],
- ["81329537",0xBC5],
- ["81329538",0xBC6],
- ["81329539",0xBC7],
- ["81329630",0xBC8],
- ["81329631",0xBC9],
- ["81329632",0xBCA],
- ["81329633",0xBCB],
- ["81329634",0xBCC],
- ["81329635",0xBCD],
- ["81329636",0xBCE],
- ["81329637",0xBCF],
- ["81329638",0xBD0],
- ["81329639",0xBD1],
- ["81329730",0xBD2],
- ["81329731",0xBD3],
- ["81329732",0xBD4],
- ["81329733",0xBD5],
- ["81329734",0xBD6],
- ["81329735",0xBD7],
- ["81329736",0xBD8],
- ["81329737",0xBD9],
- ["81329738",0xBDA],
- ["81329739",0xBDB],
- ["81329830",0xBDC],
- ["81329831",0xBDD],
- ["81329832",0xBDE],
- ["81329833",0xBDF],
- ["81329834",0xBE0],
- ["81329835",0xBE1],
- ["81329836",0xBE2],
- ["81329837",0xBE3],
- ["81329838",0xBE4],
- ["81329839",0xBE5],
- ["81329930",0xBE6],
- ["81329931",0xBE7],
- ["81329932",0xBE8],
- ["81329933",0xBE9],
- ["81329934",0xBEA],
- ["81329935",0xBEB],
- ["81329936",0xBEC],
- ["81329937",0xBED],
- ["81329938",0xBEE],
- ["81329939",0xBEF],
- ["81329A30",0xBF0],
- ["81329A31",0xBF1],
- ["81329A32",0xBF2],
- ["81329A33",0xBF3],
- ["81329A34",0xBF4],
- ["81329A35",0xBF5],
- ["81329A36",0xBF6],
- ["81329A37",0xBF7],
- ["81329A38",0xBF8],
- ["81329A39",0xBF9],
- ["81329B30",0xBFA],
- ["81329B31",0xBFB],
- ["81329B32",0xBFC],
- ["81329B33",0xBFD],
- ["81329B34",0xBFE],
- ["81329B35",0xBFF],
- ["81329B36",0xC00],
- ["81329B37",0xC01],
- ["81329B38",0xC02],
- ["81329B39",0xC03],
- ["81329C30",0xC04],
- ["81329C31",0xC05],
- ["81329C32",0xC06],
- ["81329C33",0xC07],
- ["81329C34",0xC08],
- ["81329C35",0xC09],
- ["81329C36",0xC0A],
- ["81329C37",0xC0B],
- ["81329C38",0xC0C],
- ["81329C39",0xC0D],
- ["81329D30",0xC0E],
- ["81329D31",0xC0F],
- ["81329D32",0xC10],
- ["81329D33",0xC11],
- ["81329D34",0xC12],
- ["81329D35",0xC13],
- ["81329D36",0xC14],
- ["81329D37",0xC15],
- ["81329D38",0xC16],
- ["81329D39",0xC17],
- ["81329E30",0xC18],
- ["81329E31",0xC19],
- ["81329E32",0xC1A],
- ["81329E33",0xC1B],
- ["81329E34",0xC1C],
- ["81329E35",0xC1D],
- ["81329E36",0xC1E],
- ["81329E37",0xC1F],
- ["81329E38",0xC20],
- ["81329E39",0xC21],
- ["81329F30",0xC22],
- ["81329F31",0xC23],
- ["81329F32",0xC24],
- ["81329F33",0xC25],
- ["81329F34",0xC26],
- ["81329F35",0xC27],
- ["81329F36",0xC28],
- ["81329F37",0xC29],
- ["81329F38",0xC2A],
- ["81329F39",0xC2B],
- ["8132A030",0xC2C],
- ["8132A031",0xC2D],
- ["8132A032",0xC2E],
- ["8132A033",0xC2F],
- ["8132A034",0xC30],
- ["8132A035",0xC31],
- ["8132A036",0xC32],
- ["8132A037",0xC33],
- ["8132A038",0xC34],
- ["8132A039",0xC35],
- ["8132A130",0xC36],
- ["8132A131",0xC37],
- ["8132A132",0xC38],
- ["8132A133",0xC39],
- ["8132A134",0xC3A],
- ["8132A135",0xC3B],
- ["8132A136",0xC3C],
- ["8132A137",0xC3D],
- ["8132A138",0xC3E],
- ["8132A139",0xC3F],
- ["8132A230",0xC40],
- ["8132A231",0xC41],
- ["8132A232",0xC42],
- ["8132A233",0xC43],
- ["8132A234",0xC44],
- ["8132A235",0xC45],
- ["8132A236",0xC46],
- ["8132A237",0xC47],
- ["8132A238",0xC48],
- ["8132A239",0xC49],
- ["8132A330",0xC4A],
- ["8132A331",0xC4B],
- ["8132A332",0xC4C],
- ["8132A333",0xC4D],
- ["8132A334",0xC4E],
- ["8132A335",0xC4F],
- ["8132A336",0xC50],
- ["8132A337",0xC51],
- ["8132A338",0xC52],
- ["8132A339",0xC53],
- ["8132A430",0xC54],
- ["8132A431",0xC55],
- ["8132A432",0xC56],
- ["8132A433",0xC57],
- ["8132A434",0xC58],
- ["8132A435",0xC59],
- ["8132A436",0xC5A],
- ["8132A437",0xC5B],
- ["8132A438",0xC5C],
- ["8132A439",0xC5D],
- ["8132A530",0xC5E],
- ["8132A531",0xC5F],
- ["8132A532",0xC60],
- ["8132A533",0xC61],
- ["8132A534",0xC62],
- ["8132A535",0xC63],
- ["8132A536",0xC64],
- ["8132A537",0xC65],
- ["8132A538",0xC66],
- ["8132A539",0xC67],
- ["8132A630",0xC68],
- ["8132A631",0xC69],
- ["8132A632",0xC6A],
- ["8132A633",0xC6B],
- ["8132A634",0xC6C],
- ["8132A635",0xC6D],
- ["8132A636",0xC6E],
- ["8132A637",0xC6F],
- ["8132A638",0xC70],
- ["8132A639",0xC71],
- ["8132A730",0xC72],
- ["8132A731",0xC73],
- ["8132A732",0xC74],
- ["8132A733",0xC75],
- ["8132A734",0xC76],
- ["8132A735",0xC77],
- ["8132A736",0xC78],
- ["8132A737",0xC79],
- ["8132A738",0xC7A],
- ["8132A739",0xC7B],
- ["8132A830",0xC7C],
- ["8132A831",0xC7D],
- ["8132A832",0xC7E],
- ["8132A833",0xC7F],
- ["8132A834",0xC80],
- ["8132A835",0xC81],
- ["8132A836",0xC82],
- ["8132A837",0xC83],
- ["8132A838",0xC84],
- ["8132A839",0xC85],
- ["8132A930",0xC86],
- ["8132A931",0xC87],
- ["8132A932",0xC88],
- ["8132A933",0xC89],
- ["8132A934",0xC8A],
- ["8132A935",0xC8B],
- ["8132A936",0xC8C],
- ["8132A937",0xC8D],
- ["8132A938",0xC8E],
- ["8132A939",0xC8F],
- ["8132AA30",0xC90],
- ["8132AA31",0xC91],
- ["8132AA32",0xC92],
- ["8132AA33",0xC93],
- ["8132AA34",0xC94],
- ["8132AA35",0xC95],
- ["8132AA36",0xC96],
- ["8132AA37",0xC97],
- ["8132AA38",0xC98],
- ["8132AA39",0xC99],
- ["8132AB30",0xC9A],
- ["8132AB31",0xC9B],
- ["8132AB32",0xC9C],
- ["8132AB33",0xC9D],
- ["8132AB34",0xC9E],
- ["8132AB35",0xC9F],
- ["8132AB36",0xCA0],
- ["8132AB37",0xCA1],
- ["8132AB38",0xCA2],
- ["8132AB39",0xCA3],
- ["8132AC30",0xCA4],
- ["8132AC31",0xCA5],
- ["8132AC32",0xCA6],
- ["8132AC33",0xCA7],
- ["8132AC34",0xCA8],
- ["8132AC35",0xCA9],
- ["8132AC36",0xCAA],
- ["8132AC37",0xCAB],
- ["8132AC38",0xCAC],
- ["8132AC39",0xCAD],
- ["8132AD30",0xCAE],
- ["8132AD31",0xCAF],
- ["8132AD32",0xCB0],
- ["8132AD33",0xCB1],
- ["8132AD34",0xCB2],
- ["8132AD35",0xCB3],
- ["8132AD36",0xCB4],
- ["8132AD37",0xCB5],
- ["8132AD38",0xCB6],
- ["8132AD39",0xCB7],
- ["8132AE30",0xCB8],
- ["8132AE31",0xCB9],
- ["8132AE32",0xCBA],
- ["8132AE33",0xCBB],
- ["8132AE34",0xCBC],
- ["8132AE35",0xCBD],
- ["8132AE36",0xCBE],
- ["8132AE37",0xCBF],
- ["8132AE38",0xCC0],
- ["8132AE39",0xCC1],
- ["8132AF30",0xCC2],
- ["8132AF31",0xCC3],
- ["8132AF32",0xCC4],
- ["8132AF33",0xCC5],
- ["8132AF34",0xCC6],
- ["8132AF35",0xCC7],
- ["8132AF36",0xCC8],
- ["8132AF37",0xCC9],
- ["8132AF38",0xCCA],
- ["8132AF39",0xCCB],
- ["8132B030",0xCCC],
- ["8132B031",0xCCD],
- ["8132B032",0xCCE],
- ["8132B033",0xCCF],
- ["8132B034",0xCD0],
- ["8132B035",0xCD1],
- ["8132B036",0xCD2],
- ["8132B037",0xCD3],
- ["8132B038",0xCD4],
- ["8132B039",0xCD5],
- ["8132B130",0xCD6],
- ["8132B131",0xCD7],
- ["8132B132",0xCD8],
- ["8132B133",0xCD9],
- ["8132B134",0xCDA],
- ["8132B135",0xCDB],
- ["8132B136",0xCDC],
- ["8132B137",0xCDD],
- ["8132B138",0xCDE],
- ["8132B139",0xCDF],
- ["8132B230",0xCE0],
- ["8132B231",0xCE1],
- ["8132B232",0xCE2],
- ["8132B233",0xCE3],
- ["8132B234",0xCE4],
- ["8132B235",0xCE5],
- ["8132B236",0xCE6],
- ["8132B237",0xCE7],
- ["8132B238",0xCE8],
- ["8132B239",0xCE9],
- ["8132B330",0xCEA],
- ["8132B331",0xCEB],
- ["8132B332",0xCEC],
- ["8132B333",0xCED],
- ["8132B334",0xCEE],
- ["8132B335",0xCEF],
- ["8132B336",0xCF0],
- ["8132B337",0xCF1],
- ["8132B338",0xCF2],
- ["8132B339",0xCF3],
- ["8132B430",0xCF4],
- ["8132B431",0xCF5],
- ["8132B432",0xCF6],
- ["8132B433",0xCF7],
- ["8132B434",0xCF8],
- ["8132B435",0xCF9],
- ["8132B436",0xCFA],
- ["8132B437",0xCFB],
- ["8132B438",0xCFC],
- ["8132B439",0xCFD],
- ["8132B530",0xCFE],
- ["8132B531",0xCFF],
- ["8132B532",0xD00],
- ["8132B533",0xD01],
- ["8132B534",0xD02],
- ["8132B535",0xD03],
- ["8132B536",0xD04],
- ["8132B537",0xD05],
- ["8132B538",0xD06],
- ["8132B539",0xD07],
- ["8132B630",0xD08],
- ["8132B631",0xD09],
- ["8132B632",0xD0A],
- ["8132B633",0xD0B],
- ["8132B634",0xD0C],
- ["8132B635",0xD0D],
- ["8132B636",0xD0E],
- ["8132B637",0xD0F],
- ["8132B638",0xD10],
- ["8132B639",0xD11],
- ["8132B730",0xD12],
- ["8132B731",0xD13],
- ["8132B732",0xD14],
- ["8132B733",0xD15],
- ["8132B734",0xD16],
- ["8132B735",0xD17],
- ["8132B736",0xD18],
- ["8132B737",0xD19],
- ["8132B738",0xD1A],
- ["8132B739",0xD1B],
- ["8132B830",0xD1C],
- ["8132B831",0xD1D],
- ["8132B832",0xD1E],
- ["8132B833",0xD1F],
- ["8132B834",0xD20],
- ["8132B835",0xD21],
- ["8132B836",0xD22],
- ["8132B837",0xD23],
- ["8132B838",0xD24],
- ["8132B839",0xD25],
- ["8132B930",0xD26],
- ["8132B931",0xD27],
- ["8132B932",0xD28],
- ["8132B933",0xD29],
- ["8132B934",0xD2A],
- ["8132B935",0xD2B],
- ["8132B936",0xD2C],
- ["8132B937",0xD2D],
- ["8132B938",0xD2E],
- ["8132B939",0xD2F],
- ["8132BA30",0xD30],
- ["8132BA31",0xD31],
- ["8132BA32",0xD32],
- ["8132BA33",0xD33],
- ["8132BA34",0xD34],
- ["8132BA35",0xD35],
- ["8132BA36",0xD36],
- ["8132BA37",0xD37],
- ["8132BA38",0xD38],
- ["8132BA39",0xD39],
- ["8132BB30",0xD3A],
- ["8132BB31",0xD3B],
- ["8132BB32",0xD3C],
- ["8132BB33",0xD3D],
- ["8132BB34",0xD3E],
- ["8132BB35",0xD3F],
- ["8132BB36",0xD40],
- ["8132BB37",0xD41],
- ["8132BB38",0xD42],
- ["8132BB39",0xD43],
- ["8132BC30",0xD44],
- ["8132BC31",0xD45],
- ["8132BC32",0xD46],
- ["8132BC33",0xD47],
- ["8132BC34",0xD48],
- ["8132BC35",0xD49],
- ["8132BC36",0xD4A],
- ["8132BC37",0xD4B],
- ["8132BC38",0xD4C],
- ["8132BC39",0xD4D],
- ["8132BD30",0xD4E],
- ["8132BD31",0xD4F],
- ["8132BD32",0xD50],
- ["8132BD33",0xD51],
- ["8132BD34",0xD52],
- ["8132BD35",0xD53],
- ["8132BD36",0xD54],
- ["8132BD37",0xD55],
- ["8132BD38",0xD56],
- ["8132BD39",0xD57],
- ["8132BE30",0xD58],
- ["8132BE31",0xD59],
- ["8132BE32",0xD5A],
- ["8132BE33",0xD5B],
- ["8132BE34",0xD5C],
- ["8132BE35",0xD5D],
- ["8132BE36",0xD5E],
- ["8132BE37",0xD5F],
- ["8132BE38",0xD60],
- ["8132BE39",0xD61],
- ["8132BF30",0xD62],
- ["8132BF31",0xD63],
- ["8132BF32",0xD64],
- ["8132BF33",0xD65],
- ["8132BF34",0xD66],
- ["8132BF35",0xD67],
- ["8132BF36",0xD68],
- ["8132BF37",0xD69],
- ["8132BF38",0xD6A],
- ["8132BF39",0xD6B],
- ["8132C030",0xD6C],
- ["8132C031",0xD6D],
- ["8132C032",0xD6E],
- ["8132C033",0xD6F],
- ["8132C034",0xD70],
- ["8132C035",0xD71],
- ["8132C036",0xD72],
- ["8132C037",0xD73],
- ["8132C038",0xD74],
- ["8132C039",0xD75],
- ["8132C130",0xD76],
- ["8132C131",0xD77],
- ["8132C132",0xD78],
- ["8132C133",0xD79],
- ["8132C134",0xD7A],
- ["8132C135",0xD7B],
- ["8132C136",0xD7C],
- ["8132C137",0xD7D],
- ["8132C138",0xD7E],
- ["8132C139",0xD7F],
- ["8132C230",0xD80],
- ["8132C231",0xD81],
- ["8132C232",0xD82],
- ["8132C233",0xD83],
- ["8132C234",0xD84],
- ["8132C235",0xD85],
- ["8132C236",0xD86],
- ["8132C237",0xD87],
- ["8132C238",0xD88],
- ["8132C239",0xD89],
- ["8132C330",0xD8A],
- ["8132C331",0xD8B],
- ["8132C332",0xD8C],
- ["8132C333",0xD8D],
- ["8132C334",0xD8E],
- ["8132C335",0xD8F],
- ["8132C336",0xD90],
- ["8132C337",0xD91],
- ["8132C338",0xD92],
- ["8132C339",0xD93],
- ["8132C430",0xD94],
- ["8132C431",0xD95],
- ["8132C432",0xD96],
- ["8132C433",0xD97],
- ["8132C434",0xD98],
- ["8132C435",0xD99],
- ["8132C436",0xD9A],
- ["8132C437",0xD9B],
- ["8132C438",0xD9C],
- ["8132C439",0xD9D],
- ["8132C530",0xD9E],
- ["8132C531",0xD9F],
- ["8132C532",0xDA0],
- ["8132C533",0xDA1],
- ["8132C534",0xDA2],
- ["8132C535",0xDA3],
- ["8132C536",0xDA4],
- ["8132C537",0xDA5],
- ["8132C538",0xDA6],
- ["8132C539",0xDA7],
- ["8132C630",0xDA8],
- ["8132C631",0xDA9],
- ["8132C632",0xDAA],
- ["8132C633",0xDAB],
- ["8132C634",0xDAC],
- ["8132C635",0xDAD],
- ["8132C636",0xDAE],
- ["8132C637",0xDAF],
- ["8132C638",0xDB0],
- ["8132C639",0xDB1],
- ["8132C730",0xDB2],
- ["8132C731",0xDB3],
- ["8132C732",0xDB4],
- ["8132C733",0xDB5],
- ["8132C734",0xDB6],
- ["8132C735",0xDB7],
- ["8132C736",0xDB8],
- ["8132C737",0xDB9],
- ["8132C738",0xDBA],
- ["8132C739",0xDBB],
- ["8132C830",0xDBC],
- ["8132C831",0xDBD],
- ["8132C832",0xDBE],
- ["8132C833",0xDBF],
- ["8132C834",0xDC0],
- ["8132C835",0xDC1],
- ["8132C836",0xDC2],
- ["8132C837",0xDC3],
- ["8132C838",0xDC4],
- ["8132C839",0xDC5],
- ["8132C930",0xDC6],
- ["8132C931",0xDC7],
- ["8132C932",0xDC8],
- ["8132C933",0xDC9],
- ["8132C934",0xDCA],
- ["8132C935",0xDCB],
- ["8132C936",0xDCC],
- ["8132C937",0xDCD],
- ["8132C938",0xDCE],
- ["8132C939",0xDCF],
- ["8132CA30",0xDD0],
- ["8132CA31",0xDD1],
- ["8132CA32",0xDD2],
- ["8132CA33",0xDD3],
- ["8132CA34",0xDD4],
- ["8132CA35",0xDD5],
- ["8132CA36",0xDD6],
- ["8132CA37",0xDD7],
- ["8132CA38",0xDD8],
- ["8132CA39",0xDD9],
- ["8132CB30",0xDDA],
- ["8132CB31",0xDDB],
- ["8132CB32",0xDDC],
- ["8132CB33",0xDDD],
- ["8132CB34",0xDDE],
- ["8132CB35",0xDDF],
- ["8132CB36",0xDE0],
- ["8132CB37",0xDE1],
- ["8132CB38",0xDE2],
- ["8132CB39",0xDE3],
- ["8132CC30",0xDE4],
- ["8132CC31",0xDE5],
- ["8132CC32",0xDE6],
- ["8132CC33",0xDE7],
- ["8132CC34",0xDE8],
- ["8132CC35",0xDE9],
- ["8132CC36",0xDEA],
- ["8132CC37",0xDEB],
- ["8132CC38",0xDEC],
- ["8132CC39",0xDED],
- ["8132CD30",0xDEE],
- ["8132CD31",0xDEF],
- ["8132CD32",0xDF0],
- ["8132CD33",0xDF1],
- ["8132CD34",0xDF2],
- ["8132CD35",0xDF3],
- ["8132CD36",0xDF4],
- ["8132CD37",0xDF5],
- ["8132CD38",0xDF6],
- ["8132CD39",0xDF7],
- ["8132CE30",0xDF8],
- ["8132CE31",0xDF9],
- ["8132CE32",0xDFA],
- ["8132CE33",0xDFB],
- ["8132CE34",0xDFC],
- ["8132CE35",0xDFD],
- ["8132CE36",0xDFE],
- ["8132CE37",0xDFF],
- ["8132CE38",0xE00],
- ["8132CE39",0xE01],
- ["8132CF30",0xE02],
- ["8132CF31",0xE03],
- ["8132CF32",0xE04],
- ["8132CF33",0xE05],
- ["8132CF34",0xE06],
- ["8132CF35",0xE07],
- ["8132CF36",0xE08],
- ["8132CF37",0xE09],
- ["8132CF38",0xE0A],
- ["8132CF39",0xE0B],
- ["8132D030",0xE0C],
- ["8132D031",0xE0D],
- ["8132D032",0xE0E],
- ["8132D033",0xE0F],
- ["8132D034",0xE10],
- ["8132D035",0xE11],
- ["8132D036",0xE12],
- ["8132D037",0xE13],
- ["8132D038",0xE14],
- ["8132D039",0xE15],
- ["8132D130",0xE16],
- ["8132D131",0xE17],
- ["8132D132",0xE18],
- ["8132D133",0xE19],
- ["8132D134",0xE1A],
- ["8132D135",0xE1B],
- ["8132D136",0xE1C],
- ["8132D137",0xE1D],
- ["8132D138",0xE1E],
- ["8132D139",0xE1F],
- ["8132D230",0xE20],
- ["8132D231",0xE21],
- ["8132D232",0xE22],
- ["8132D233",0xE23],
- ["8132D234",0xE24],
- ["8132D235",0xE25],
- ["8132D236",0xE26],
- ["8132D237",0xE27],
- ["8132D238",0xE28],
- ["8132D239",0xE29],
- ["8132D330",0xE2A],
- ["8132D331",0xE2B],
- ["8132D332",0xE2C],
- ["8132D333",0xE2D],
- ["8132D334",0xE2E],
- ["8132D335",0xE2F],
- ["8132D336",0xE30],
- ["8132D337",0xE31],
- ["8132D338",0xE32],
- ["8132D339",0xE33],
- ["8132D430",0xE34],
- ["8132D431",0xE35],
- ["8132D432",0xE36],
- ["8132D433",0xE37],
- ["8132D434",0xE38],
- ["8132D435",0xE39],
- ["8132D436",0xE3A],
- ["8132D437",0xE3B],
- ["8132D438",0xE3C],
- ["8132D439",0xE3D],
- ["8132D530",0xE3E],
- ["8132D531",0xE3F],
- ["8132D532",0xE40],
- ["8132D533",0xE41],
- ["8132D534",0xE42],
- ["8132D535",0xE43],
- ["8132D536",0xE44],
- ["8132D537",0xE45],
- ["8132D538",0xE46],
- ["8132D539",0xE47],
- ["8132D630",0xE48],
- ["8132D631",0xE49],
- ["8132D632",0xE4A],
- ["8132D633",0xE4B],
- ["8132D634",0xE4C],
- ["8132D635",0xE4D],
- ["8132D636",0xE4E],
- ["8132D637",0xE4F],
- ["8132D638",0xE50],
- ["8132D639",0xE51],
- ["8132D730",0xE52],
- ["8132D731",0xE53],
- ["8132D732",0xE54],
- ["8132D733",0xE55],
- ["8132D734",0xE56],
- ["8132D735",0xE57],
- ["8132D736",0xE58],
- ["8132D737",0xE59],
- ["8132D738",0xE5A],
- ["8132D739",0xE5B],
- ["8132D830",0xE5C],
- ["8132D831",0xE5D],
- ["8132D832",0xE5E],
- ["8132D833",0xE5F],
- ["8132D834",0xE60],
- ["8132D835",0xE61],
- ["8132D836",0xE62],
- ["8132D837",0xE63],
- ["8132D838",0xE64],
- ["8132D839",0xE65],
- ["8132D930",0xE66],
- ["8132D931",0xE67],
- ["8132D932",0xE68],
- ["8132D933",0xE69],
- ["8132D934",0xE6A],
- ["8132D935",0xE6B],
- ["8132D936",0xE6C],
- ["8132D937",0xE6D],
- ["8132D938",0xE6E],
- ["8132D939",0xE6F],
- ["8132DA30",0xE70],
- ["8132DA31",0xE71],
- ["8132DA32",0xE72],
- ["8132DA33",0xE73],
- ["8132DA34",0xE74],
- ["8132DA35",0xE75],
- ["8132DA36",0xE76],
- ["8132DA37",0xE77],
- ["8132DA38",0xE78],
- ["8132DA39",0xE79],
- ["8132DB30",0xE7A],
- ["8132DB31",0xE7B],
- ["8132DB32",0xE7C],
- ["8132DB33",0xE7D],
- ["8132DB34",0xE7E],
- ["8132DB35",0xE7F],
- ["8132DB36",0xE80],
- ["8132DB37",0xE81],
- ["8132DB38",0xE82],
- ["8132DB39",0xE83],
- ["8132DC30",0xE84],
- ["8132DC31",0xE85],
- ["8132DC32",0xE86],
- ["8132DC33",0xE87],
- ["8132DC34",0xE88],
- ["8132DC35",0xE89],
- ["8132DC36",0xE8A],
- ["8132DC37",0xE8B],
- ["8132DC38",0xE8C],
- ["8132DC39",0xE8D],
- ["8132DD30",0xE8E],
- ["8132DD31",0xE8F],
- ["8132DD32",0xE90],
- ["8132DD33",0xE91],
- ["8132DD34",0xE92],
- ["8132DD35",0xE93],
- ["8132DD36",0xE94],
- ["8132DD37",0xE95],
- ["8132DD38",0xE96],
- ["8132DD39",0xE97],
- ["8132DE30",0xE98],
- ["8132DE31",0xE99],
- ["8132DE32",0xE9A],
- ["8132DE33",0xE9B],
- ["8132DE34",0xE9C],
- ["8132DE35",0xE9D],
- ["8132DE36",0xE9E],
- ["8132DE37",0xE9F],
- ["8132DE38",0xEA0],
- ["8132DE39",0xEA1],
- ["8132DF30",0xEA2],
- ["8132DF31",0xEA3],
- ["8132DF32",0xEA4],
- ["8132DF33",0xEA5],
- ["8132DF34",0xEA6],
- ["8132DF35",0xEA7],
- ["8132DF36",0xEA8],
- ["8132DF37",0xEA9],
- ["8132DF38",0xEAA],
- ["8132DF39",0xEAB],
- ["8132E030",0xEAC],
- ["8132E031",0xEAD],
- ["8132E032",0xEAE],
- ["8132E033",0xEAF],
- ["8132E034",0xEB0],
- ["8132E035",0xEB1],
- ["8132E036",0xEB2],
- ["8132E037",0xEB3],
- ["8132E038",0xEB4],
- ["8132E039",0xEB5],
- ["8132E130",0xEB6],
- ["8132E131",0xEB7],
- ["8132E132",0xEB8],
- ["8132E133",0xEB9],
- ["8132E134",0xEBA],
- ["8132E135",0xEBB],
- ["8132E136",0xEBC],
- ["8132E137",0xEBD],
- ["8132E138",0xEBE],
- ["8132E139",0xEBF],
- ["8132E230",0xEC0],
- ["8132E231",0xEC1],
- ["8132E232",0xEC2],
- ["8132E233",0xEC3],
- ["8132E234",0xEC4],
- ["8132E235",0xEC5],
- ["8132E236",0xEC6],
- ["8132E237",0xEC7],
- ["8132E238",0xEC8],
- ["8132E239",0xEC9],
- ["8132E330",0xECA],
- ["8132E331",0xECB],
- ["8132E332",0xECC],
- ["8132E333",0xECD],
- ["8132E334",0xECE],
- ["8132E335",0xECF],
- ["8132E336",0xED0],
- ["8132E337",0xED1],
- ["8132E338",0xED2],
- ["8132E339",0xED3],
- ["8132E430",0xED4],
- ["8132E431",0xED5],
- ["8132E432",0xED6],
- ["8132E433",0xED7],
- ["8132E434",0xED8],
- ["8132E435",0xED9],
- ["8132E436",0xEDA],
- ["8132E437",0xEDB],
- ["8132E438",0xEDC],
- ["8132E439",0xEDD],
- ["8132E530",0xEDE],
- ["8132E531",0xEDF],
- ["8132E532",0xEE0],
- ["8132E533",0xEE1],
- ["8132E534",0xEE2],
- ["8132E535",0xEE3],
- ["8132E536",0xEE4],
- ["8132E537",0xEE5],
- ["8132E538",0xEE6],
- ["8132E539",0xEE7],
- ["8132E630",0xEE8],
- ["8132E631",0xEE9],
- ["8132E632",0xEEA],
- ["8132E633",0xEEB],
- ["8132E634",0xEEC],
- ["8132E635",0xEED],
- ["8132E636",0xEEE],
- ["8132E637",0xEEF],
- ["8132E638",0xEF0],
- ["8132E639",0xEF1],
- ["8132E730",0xEF2],
- ["8132E731",0xEF3],
- ["8132E732",0xEF4],
- ["8132E733",0xEF5],
- ["8132E734",0xEF6],
- ["8132E735",0xEF7],
- ["8132E736",0xEF8],
- ["8132E737",0xEF9],
- ["8132E738",0xEFA],
- ["8132E739",0xEFB],
- ["8132E830",0xEFC],
- ["8132E831",0xEFD],
- ["8132E832",0xEFE],
- ["8132E833",0xEFF],
- ["8132E834",0xF00],
- ["8132E835",0xF01],
- ["8132E836",0xF02],
- ["8132E837",0xF03],
- ["8132E838",0xF04],
- ["8132E839",0xF05],
- ["8132E930",0xF06],
- ["8132E931",0xF07],
- ["8132E932",0xF08],
- ["8132E933",0xF09],
- ["8132E934",0xF0A],
- ["8132E935",0xF0B],
- ["8132E936",0xF0C],
- ["8132E937",0xF0D],
- ["8132E938",0xF0E],
- ["8132E939",0xF0F],
- ["8132EA30",0xF10],
- ["8132EA31",0xF11],
- ["8132EA32",0xF12],
- ["8132EA33",0xF13],
- ["8132EA34",0xF14],
- ["8132EA35",0xF15],
- ["8132EA36",0xF16],
- ["8132EA37",0xF17],
- ["8132EA38",0xF18],
- ["8132EA39",0xF19],
- ["8132EB30",0xF1A],
- ["8132EB31",0xF1B],
- ["8132EB32",0xF1C],
- ["8132EB33",0xF1D],
- ["8132EB34",0xF1E],
- ["8132EB35",0xF1F],
- ["8132EB36",0xF20],
- ["8132EB37",0xF21],
- ["8132EB38",0xF22],
- ["8132EB39",0xF23],
- ["8132EC30",0xF24],
- ["8132EC31",0xF25],
- ["8132EC32",0xF26],
- ["8132EC33",0xF27],
- ["8132EC34",0xF28],
- ["8132EC35",0xF29],
- ["8132EC36",0xF2A],
- ["8132EC37",0xF2B],
- ["8132EC38",0xF2C],
- ["8132EC39",0xF2D],
- ["8132ED30",0xF2E],
- ["8132ED31",0xF2F],
- ["8132ED32",0xF30],
- ["8132ED33",0xF31],
- ["8132ED34",0xF32],
- ["8132ED35",0xF33],
- ["8132ED36",0xF34],
- ["8132ED37",0xF35],
- ["8132ED38",0xF36],
- ["8132ED39",0xF37],
- ["8132EE30",0xF38],
- ["8132EE31",0xF39],
- ["8132EE32",0xF3A],
- ["8132EE33",0xF3B],
- ["8132EE34",0xF3C],
- ["8132EE35",0xF3D],
- ["8132EE36",0xF3E],
- ["8132EE37",0xF3F],
- ["8132EE38",0xF40],
- ["8132EE39",0xF41],
- ["8132EF30",0xF42],
- ["8132EF31",0xF43],
- ["8132EF32",0xF44],
- ["8132EF33",0xF45],
- ["8132EF34",0xF46],
- ["8132EF35",0xF47],
- ["8132EF36",0xF48],
- ["8132EF37",0xF49],
- ["8132EF38",0xF4A],
- ["8132EF39",0xF4B],
- ["8132F030",0xF4C],
- ["8132F031",0xF4D],
- ["8132F032",0xF4E],
- ["8132F033",0xF4F],
- ["8132F034",0xF50],
- ["8132F035",0xF51],
- ["8132F036",0xF52],
- ["8132F037",0xF53],
- ["8132F038",0xF54],
- ["8132F039",0xF55],
- ["8132F130",0xF56],
- ["8132F131",0xF57],
- ["8132F132",0xF58],
- ["8132F133",0xF59],
- ["8132F134",0xF5A],
- ["8132F135",0xF5B],
- ["8132F136",0xF5C],
- ["8132F137",0xF5D],
- ["8132F138",0xF5E],
- ["8132F139",0xF5F],
- ["8132F230",0xF60],
- ["8132F231",0xF61],
- ["8132F232",0xF62],
- ["8132F233",0xF63],
- ["8132F234",0xF64],
- ["8132F235",0xF65],
- ["8132F236",0xF66],
- ["8132F237",0xF67],
- ["8132F238",0xF68],
- ["8132F239",0xF69],
- ["8132F330",0xF6A],
- ["8132F331",0xF6B],
- ["8132F332",0xF6C],
- ["8132F333",0xF6D],
- ["8132F334",0xF6E],
- ["8132F335",0xF6F],
- ["8132F336",0xF70],
- ["8132F337",0xF71],
- ["8132F338",0xF72],
- ["8132F339",0xF73],
- ["8132F430",0xF74],
- ["8132F431",0xF75],
- ["8132F432",0xF76],
- ["8132F433",0xF77],
- ["8132F434",0xF78],
- ["8132F435",0xF79],
- ["8132F436",0xF7A],
- ["8132F437",0xF7B],
- ["8132F438",0xF7C],
- ["8132F439",0xF7D],
- ["8132F530",0xF7E],
- ["8132F531",0xF7F],
- ["8132F532",0xF80],
- ["8132F533",0xF81],
- ["8132F534",0xF82],
- ["8132F535",0xF83],
- ["8132F536",0xF84],
- ["8132F537",0xF85],
- ["8132F538",0xF86],
- ["8132F539",0xF87],
- ["8132F630",0xF88],
- ["8132F631",0xF89],
- ["8132F632",0xF8A],
- ["8132F633",0xF8B],
- ["8132F634",0xF8C],
- ["8132F635",0xF8D],
- ["8132F636",0xF8E],
- ["8132F637",0xF8F],
- ["8132F638",0xF90],
- ["8132F639",0xF91],
- ["8132F730",0xF92],
- ["8132F731",0xF93],
- ["8132F732",0xF94],
- ["8132F733",0xF95],
- ["8132F734",0xF96],
- ["8132F735",0xF97],
- ["8132F736",0xF98],
- ["8132F737",0xF99],
- ["8132F738",0xF9A],
- ["8132F739",0xF9B],
- ["8132F830",0xF9C],
- ["8132F831",0xF9D],
- ["8132F832",0xF9E],
- ["8132F833",0xF9F],
- ["8132F834",0xFA0],
- ["8132F835",0xFA1],
- ["8132F836",0xFA2],
- ["8132F837",0xFA3],
- ["8132F838",0xFA4],
- ["8132F839",0xFA5],
- ["8132F930",0xFA6],
- ["8132F931",0xFA7],
- ["8132F932",0xFA8],
- ["8132F933",0xFA9],
- ["8132F934",0xFAA],
- ["8132F935",0xFAB],
- ["8132F936",0xFAC],
- ["8132F937",0xFAD],
- ["8132F938",0xFAE],
- ["8132F939",0xFAF],
- ["8132FA30",0xFB0],
- ["8132FA31",0xFB1],
- ["8132FA32",0xFB2],
- ["8132FA33",0xFB3],
- ["8132FA34",0xFB4],
- ["8132FA35",0xFB5],
- ["8132FA36",0xFB6],
- ["8132FA37",0xFB7],
- ["8132FA38",0xFB8],
- ["8132FA39",0xFB9],
- ["8132FB30",0xFBA],
- ["8132FB31",0xFBB],
- ["8132FB32",0xFBC],
- ["8132FB33",0xFBD],
- ["8132FB34",0xFBE],
- ["8132FB35",0xFBF],
- ["8132FB36",0xFC0],
- ["8132FB37",0xFC1],
- ["8132FB38",0xFC2],
- ["8132FB39",0xFC3],
- ["8132FC30",0xFC4],
- ["8132FC31",0xFC5],
- ["8132FC32",0xFC6],
- ["8132FC33",0xFC7],
- ["8132FC34",0xFC8],
- ["8132FC35",0xFC9],
- ["8132FC36",0xFCA],
- ["8132FC37",0xFCB],
- ["8132FC38",0xFCC],
- ["8132FC39",0xFCD],
- ["8132FD30",0xFCE],
- ["8132FD31",0xFCF],
- ["8132FD32",0xFD0],
- ["8132FD33",0xFD1],
- ["8132FD34",0xFD2],
- ["8132FD35",0xFD3],
- ["8132FD36",0xFD4],
- ["8132FD37",0xFD5],
- ["8132FD38",0xFD6],
- ["8132FD39",0xFD7],
- ["8132FE30",0xFD8],
- ["8132FE31",0xFD9],
- ["8132FE32",0xFDA],
- ["8132FE33",0xFDB],
- ["8132FE34",0xFDC],
- ["8132FE35",0xFDD],
- ["8132FE36",0xFDE],
- ["8132FE37",0xFDF],
- ["8132FE38",0xFE0],
- ["8132FE39",0xFE1],
- ["81338130",0xFE2],
- ["81338131",0xFE3],
- ["81338132",0xFE4],
- ["81338133",0xFE5],
- ["81338134",0xFE6],
- ["81338135",0xFE7],
- ["81338136",0xFE8],
- ["81338137",0xFE9],
- ["81338138",0xFEA],
- ["81338139",0xFEB],
- ["81338230",0xFEC],
- ["81338231",0xFED],
- ["81338232",0xFEE],
- ["81338233",0xFEF],
- ["81338234",0xFF0],
- ["81338235",0xFF1],
- ["81338236",0xFF2],
- ["81338237",0xFF3],
- ["81338238",0xFF4],
- ["81338239",0xFF5],
- ["81338330",0xFF6],
- ["81338331",0xFF7],
- ["81338332",0xFF8],
- ["81338333",0xFF9],
- ["81338334",0xFFA],
- ["81338335",0xFFB],
- ["81338336",0xFFC],
- ["81338337",0xFFD],
- ["81338338",0xFFE],
- ["81338339",0xFFF],
- ["81338430",0x1000],
- ["81338431",0x1001],
- ["81338432",0x1002],
- ["81338433",0x1003],
- ["81338434",0x1004],
- ["81338435",0x1005],
- ["81338436",0x1006],
- ["81338437",0x1007],
- ["81338438",0x1008],
- ["81338439",0x1009],
- ["81338530",0x100A],
- ["81338531",0x100B],
- ["81338532",0x100C],
- ["81338533",0x100D],
- ["81338534",0x100E],
- ["81338535",0x100F],
- ["81338536",0x1010],
- ["81338537",0x1011],
- ["81338538",0x1012],
- ["81338539",0x1013],
- ["81338630",0x1014],
- ["81338631",0x1015],
- ["81338632",0x1016],
- ["81338633",0x1017],
- ["81338634",0x1018],
- ["81338635",0x1019],
- ["81338636",0x101A],
- ["81338637",0x101B],
- ["81338638",0x101C],
- ["81338639",0x101D],
- ["81338730",0x101E],
- ["81338731",0x101F],
- ["81338732",0x1020],
- ["81338733",0x1021],
- ["81338734",0x1022],
- ["81338735",0x1023],
- ["81338736",0x1024],
- ["81338737",0x1025],
- ["81338738",0x1026],
- ["81338739",0x1027],
- ["81338830",0x1028],
- ["81338831",0x1029],
- ["81338832",0x102A],
- ["81338833",0x102B],
- ["81338834",0x102C],
- ["81338835",0x102D],
- ["81338836",0x102E],
- ["81338837",0x102F],
- ["81338838",0x1030],
- ["81338839",0x1031],
- ["81338930",0x1032],
- ["81338931",0x1033],
- ["81338932",0x1034],
- ["81338933",0x1035],
- ["81338934",0x1036],
- ["81338935",0x1037],
- ["81338936",0x1038],
- ["81338937",0x1039],
- ["81338938",0x103A],
- ["81338939",0x103B],
- ["81338A30",0x103C],
- ["81338A31",0x103D],
- ["81338A32",0x103E],
- ["81338A33",0x103F],
- ["81338A34",0x1040],
- ["81338A35",0x1041],
- ["81338A36",0x1042],
- ["81338A37",0x1043],
- ["81338A38",0x1044],
- ["81338A39",0x1045],
- ["81338B30",0x1046],
- ["81338B31",0x1047],
- ["81338B32",0x1048],
- ["81338B33",0x1049],
- ["81338B34",0x104A],
- ["81338B35",0x104B],
- ["81338B36",0x104C],
- ["81338B37",0x104D],
- ["81338B38",0x104E],
- ["81338B39",0x104F],
- ["81338C30",0x1050],
- ["81338C31",0x1051],
- ["81338C32",0x1052],
- ["81338C33",0x1053],
- ["81338C34",0x1054],
- ["81338C35",0x1055],
- ["81338C36",0x1056],
- ["81338C37",0x1057],
- ["81338C38",0x1058],
- ["81338C39",0x1059],
- ["81338D30",0x105A],
- ["81338D31",0x105B],
- ["81338D32",0x105C],
- ["81338D33",0x105D],
- ["81338D34",0x105E],
- ["81338D35",0x105F],
- ["81338D36",0x1060],
- ["81338D37",0x1061],
- ["81338D38",0x1062],
- ["81338D39",0x1063],
- ["81338E30",0x1064],
- ["81338E31",0x1065],
- ["81338E32",0x1066],
- ["81338E33",0x1067],
- ["81338E34",0x1068],
- ["81338E35",0x1069],
- ["81338E36",0x106A],
- ["81338E37",0x106B],
- ["81338E38",0x106C],
- ["81338E39",0x106D],
- ["81338F30",0x106E],
- ["81338F31",0x106F],
- ["81338F32",0x1070],
- ["81338F33",0x1071],
- ["81338F34",0x1072],
- ["81338F35",0x1073],
- ["81338F36",0x1074],
- ["81338F37",0x1075],
- ["81338F38",0x1076],
- ["81338F39",0x1077],
- ["81339030",0x1078],
- ["81339031",0x1079],
- ["81339032",0x107A],
- ["81339033",0x107B],
- ["81339034",0x107C],
- ["81339035",0x107D],
- ["81339036",0x107E],
- ["81339037",0x107F],
- ["81339038",0x1080],
- ["81339039",0x1081],
- ["81339130",0x1082],
- ["81339131",0x1083],
- ["81339132",0x1084],
- ["81339133",0x1085],
- ["81339134",0x1086],
- ["81339135",0x1087],
- ["81339136",0x1088],
- ["81339137",0x1089],
- ["81339138",0x108A],
- ["81339139",0x108B],
- ["81339230",0x108C],
- ["81339231",0x108D],
- ["81339232",0x108E],
- ["81339233",0x108F],
- ["81339234",0x1090],
- ["81339235",0x1091],
- ["81339236",0x1092],
- ["81339237",0x1093],
- ["81339238",0x1094],
- ["81339239",0x1095],
- ["81339330",0x1096],
- ["81339331",0x1097],
- ["81339332",0x1098],
- ["81339333",0x1099],
- ["81339334",0x109A],
- ["81339335",0x109B],
- ["81339336",0x109C],
- ["81339337",0x109D],
- ["81339338",0x109E],
- ["81339339",0x109F],
- ["81339430",0x10A0],
- ["81339431",0x10A1],
- ["81339432",0x10A2],
- ["81339433",0x10A3],
- ["81339434",0x10A4],
- ["81339435",0x10A5],
- ["81339436",0x10A6],
- ["81339437",0x10A7],
- ["81339438",0x10A8],
- ["81339439",0x10A9],
- ["81339530",0x10AA],
- ["81339531",0x10AB],
- ["81339532",0x10AC],
- ["81339533",0x10AD],
- ["81339534",0x10AE],
- ["81339535",0x10AF],
- ["81339536",0x10B0],
- ["81339537",0x10B1],
- ["81339538",0x10B2],
- ["81339539",0x10B3],
- ["81339630",0x10B4],
- ["81339631",0x10B5],
- ["81339632",0x10B6],
- ["81339633",0x10B7],
- ["81339634",0x10B8],
- ["81339635",0x10B9],
- ["81339636",0x10BA],
- ["81339637",0x10BB],
- ["81339638",0x10BC],
- ["81339639",0x10BD],
- ["81339730",0x10BE],
- ["81339731",0x10BF],
- ["81339732",0x10C0],
- ["81339733",0x10C1],
- ["81339734",0x10C2],
- ["81339735",0x10C3],
- ["81339736",0x10C4],
- ["81339737",0x10C5],
- ["81339738",0x10C6],
- ["81339739",0x10C7],
- ["81339830",0x10C8],
- ["81339831",0x10C9],
- ["81339832",0x10CA],
- ["81339833",0x10CB],
- ["81339834",0x10CC],
- ["81339835",0x10CD],
- ["81339836",0x10CE],
- ["81339837",0x10CF],
- ["81339838",0x10D0],
- ["81339839",0x10D1],
- ["81339930",0x10D2],
- ["81339931",0x10D3],
- ["81339932",0x10D4],
- ["81339933",0x10D5],
- ["81339934",0x10D6],
- ["81339935",0x10D7],
- ["81339936",0x10D8],
- ["81339937",0x10D9],
- ["81339938",0x10DA],
- ["81339939",0x10DB],
- ["81339A30",0x10DC],
- ["81339A31",0x10DD],
- ["81339A32",0x10DE],
- ["81339A33",0x10DF],
- ["81339A34",0x10E0],
- ["81339A35",0x10E1],
- ["81339A36",0x10E2],
- ["81339A37",0x10E3],
- ["81339A38",0x10E4],
- ["81339A39",0x10E5],
- ["81339B30",0x10E6],
- ["81339B31",0x10E7],
- ["81339B32",0x10E8],
- ["81339B33",0x10E9],
- ["81339B34",0x10EA],
- ["81339B35",0x10EB],
- ["81339B36",0x10EC],
- ["81339B37",0x10ED],
- ["81339B38",0x10EE],
- ["81339B39",0x10EF],
- ["81339C30",0x10F0],
- ["81339C31",0x10F1],
- ["81339C32",0x10F2],
- ["81339C33",0x10F3],
- ["81339C34",0x10F4],
- ["81339C35",0x10F5],
- ["81339C36",0x10F6],
- ["81339C37",0x10F7],
- ["81339C38",0x10F8],
- ["81339C39",0x10F9],
- ["81339D30",0x10FA],
- ["81339D31",0x10FB],
- ["81339D32",0x10FC],
- ["81339D33",0x10FD],
- ["81339D34",0x10FE],
- ["81339D35",0x10FF],
- ["81339D36",0x1100],
- ["81339D37",0x1101],
- ["81339D38",0x1102],
- ["81339D39",0x1103],
- ["81339E30",0x1104],
- ["81339E31",0x1105],
- ["81339E32",0x1106],
- ["81339E33",0x1107],
- ["81339E34",0x1108],
- ["81339E35",0x1109],
- ["81339E36",0x110A],
- ["81339E37",0x110B],
- ["81339E38",0x110C],
- ["81339E39",0x110D],
- ["81339F30",0x110E],
- ["81339F31",0x110F],
- ["81339F32",0x1110],
- ["81339F33",0x1111],
- ["81339F34",0x1112],
- ["81339F35",0x1113],
- ["81339F36",0x1114],
- ["81339F37",0x1115],
- ["81339F38",0x1116],
- ["81339F39",0x1117],
- ["8133A030",0x1118],
- ["8133A031",0x1119],
- ["8133A032",0x111A],
- ["8133A033",0x111B],
- ["8133A034",0x111C],
- ["8133A035",0x111D],
- ["8133A036",0x111E],
- ["8133A037",0x111F],
- ["8133A038",0x1120],
- ["8133A039",0x1121],
- ["8133A130",0x1122],
- ["8133A131",0x1123],
- ["8133A132",0x1124],
- ["8133A133",0x1125],
- ["8133A134",0x1126],
- ["8133A135",0x1127],
- ["8133A136",0x1128],
- ["8133A137",0x1129],
- ["8133A138",0x112A],
- ["8133A139",0x112B],
- ["8133A230",0x112C],
- ["8133A231",0x112D],
- ["8133A232",0x112E],
- ["8133A233",0x112F],
- ["8133A234",0x1130],
- ["8133A235",0x1131],
- ["8133A236",0x1132],
- ["8133A237",0x1133],
- ["8133A238",0x1134],
- ["8133A239",0x1135],
- ["8133A330",0x1136],
- ["8133A331",0x1137],
- ["8133A332",0x1138],
- ["8133A333",0x1139],
- ["8133A334",0x113A],
- ["8133A335",0x113B],
- ["8133A336",0x113C],
- ["8133A337",0x113D],
- ["8133A338",0x113E],
- ["8133A339",0x113F],
- ["8133A430",0x1140],
- ["8133A431",0x1141],
- ["8133A432",0x1142],
- ["8133A433",0x1143],
- ["8133A434",0x1144],
- ["8133A435",0x1145],
- ["8133A436",0x1146],
- ["8133A437",0x1147],
- ["8133A438",0x1148],
- ["8133A439",0x1149],
- ["8133A530",0x114A],
- ["8133A531",0x114B],
- ["8133A532",0x114C],
- ["8133A533",0x114D],
- ["8133A534",0x114E],
- ["8133A535",0x114F],
- ["8133A536",0x1150],
- ["8133A537",0x1151],
- ["8133A538",0x1152],
- ["8133A539",0x1153],
- ["8133A630",0x1154],
- ["8133A631",0x1155],
- ["8133A632",0x1156],
- ["8133A633",0x1157],
- ["8133A634",0x1158],
- ["8133A635",0x1159],
- ["8133A636",0x115A],
- ["8133A637",0x115B],
- ["8133A638",0x115C],
- ["8133A639",0x115D],
- ["8133A730",0x115E],
- ["8133A731",0x115F],
- ["8133A732",0x1160],
- ["8133A733",0x1161],
- ["8133A734",0x1162],
- ["8133A735",0x1163],
- ["8133A736",0x1164],
- ["8133A737",0x1165],
- ["8133A738",0x1166],
- ["8133A739",0x1167],
- ["8133A830",0x1168],
- ["8133A831",0x1169],
- ["8133A832",0x116A],
- ["8133A833",0x116B],
- ["8133A834",0x116C],
- ["8133A835",0x116D],
- ["8133A836",0x116E],
- ["8133A837",0x116F],
- ["8133A838",0x1170],
- ["8133A839",0x1171],
- ["8133A930",0x1172],
- ["8133A931",0x1173],
- ["8133A932",0x1174],
- ["8133A933",0x1175],
- ["8133A934",0x1176],
- ["8133A935",0x1177],
- ["8133A936",0x1178],
- ["8133A937",0x1179],
- ["8133A938",0x117A],
- ["8133A939",0x117B],
- ["8133AA30",0x117C],
- ["8133AA31",0x117D],
- ["8133AA32",0x117E],
- ["8133AA33",0x117F],
- ["8133AA34",0x1180],
- ["8133AA35",0x1181],
- ["8133AA36",0x1182],
- ["8133AA37",0x1183],
- ["8133AA38",0x1184],
- ["8133AA39",0x1185],
- ["8133AB30",0x1186],
- ["8133AB31",0x1187],
- ["8133AB32",0x1188],
- ["8133AB33",0x1189],
- ["8133AB34",0x118A],
- ["8133AB35",0x118B],
- ["8133AB36",0x118C],
- ["8133AB37",0x118D],
- ["8133AB38",0x118E],
- ["8133AB39",0x118F],
- ["8133AC30",0x1190],
- ["8133AC31",0x1191],
- ["8133AC32",0x1192],
- ["8133AC33",0x1193],
- ["8133AC34",0x1194],
- ["8133AC35",0x1195],
- ["8133AC36",0x1196],
- ["8133AC37",0x1197],
- ["8133AC38",0x1198],
- ["8133AC39",0x1199],
- ["8133AD30",0x119A],
- ["8133AD31",0x119B],
- ["8133AD32",0x119C],
- ["8133AD33",0x119D],
- ["8133AD34",0x119E],
- ["8133AD35",0x119F],
- ["8133AD36",0x11A0],
- ["8133AD37",0x11A1],
- ["8133AD38",0x11A2],
- ["8133AD39",0x11A3],
- ["8133AE30",0x11A4],
- ["8133AE31",0x11A5],
- ["8133AE32",0x11A6],
- ["8133AE33",0x11A7],
- ["8133AE34",0x11A8],
- ["8133AE35",0x11A9],
- ["8133AE36",0x11AA],
- ["8133AE37",0x11AB],
- ["8133AE38",0x11AC],
- ["8133AE39",0x11AD],
- ["8133AF30",0x11AE],
- ["8133AF31",0x11AF],
- ["8133AF32",0x11B0],
- ["8133AF33",0x11B1],
- ["8133AF34",0x11B2],
- ["8133AF35",0x11B3],
- ["8133AF36",0x11B4],
- ["8133AF37",0x11B5],
- ["8133AF38",0x11B6],
- ["8133AF39",0x11B7],
- ["8133B030",0x11B8],
- ["8133B031",0x11B9],
- ["8133B032",0x11BA],
- ["8133B033",0x11BB],
- ["8133B034",0x11BC],
- ["8133B035",0x11BD],
- ["8133B036",0x11BE],
- ["8133B037",0x11BF],
- ["8133B038",0x11C0],
- ["8133B039",0x11C1],
- ["8133B130",0x11C2],
- ["8133B131",0x11C3],
- ["8133B132",0x11C4],
- ["8133B133",0x11C5],
- ["8133B134",0x11C6],
- ["8133B135",0x11C7],
- ["8133B136",0x11C8],
- ["8133B137",0x11C9],
- ["8133B138",0x11CA],
- ["8133B139",0x11CB],
- ["8133B230",0x11CC],
- ["8133B231",0x11CD],
- ["8133B232",0x11CE],
- ["8133B233",0x11CF],
- ["8133B234",0x11D0],
- ["8133B235",0x11D1],
- ["8133B236",0x11D2],
- ["8133B237",0x11D3],
- ["8133B238",0x11D4],
- ["8133B239",0x11D5],
- ["8133B330",0x11D6],
- ["8133B331",0x11D7],
- ["8133B332",0x11D8],
- ["8133B333",0x11D9],
- ["8133B334",0x11DA],
- ["8133B335",0x11DB],
- ["8133B336",0x11DC],
- ["8133B337",0x11DD],
- ["8133B338",0x11DE],
- ["8133B339",0x11DF],
- ["8133B430",0x11E0],
- ["8133B431",0x11E1],
- ["8133B432",0x11E2],
- ["8133B433",0x11E3],
- ["8133B434",0x11E4],
- ["8133B435",0x11E5],
- ["8133B436",0x11E6],
- ["8133B437",0x11E7],
- ["8133B438",0x11E8],
- ["8133B439",0x11E9],
- ["8133B530",0x11EA],
- ["8133B531",0x11EB],
- ["8133B532",0x11EC],
- ["8133B533",0x11ED],
- ["8133B534",0x11EE],
- ["8133B535",0x11EF],
- ["8133B536",0x11F0],
- ["8133B537",0x11F1],
- ["8133B538",0x11F2],
- ["8133B539",0x11F3],
- ["8133B630",0x11F4],
- ["8133B631",0x11F5],
- ["8133B632",0x11F6],
- ["8133B633",0x11F7],
- ["8133B634",0x11F8],
- ["8133B635",0x11F9],
- ["8133B636",0x11FA],
- ["8133B637",0x11FB],
- ["8133B638",0x11FC],
- ["8133B639",0x11FD],
- ["8133B730",0x11FE],
- ["8133B731",0x11FF],
- ["8133B732",0x1200],
- ["8133B733",0x1201],
- ["8133B734",0x1202],
- ["8133B735",0x1203],
- ["8133B736",0x1204],
- ["8133B737",0x1205],
- ["8133B738",0x1206],
- ["8133B739",0x1207],
- ["8133B830",0x1208],
- ["8133B831",0x1209],
- ["8133B832",0x120A],
- ["8133B833",0x120B],
- ["8133B834",0x120C],
- ["8133B835",0x120D],
- ["8133B836",0x120E],
- ["8133B837",0x120F],
- ["8133B838",0x1210],
- ["8133B839",0x1211],
- ["8133B930",0x1212],
- ["8133B931",0x1213],
- ["8133B932",0x1214],
- ["8133B933",0x1215],
- ["8133B934",0x1216],
- ["8133B935",0x1217],
- ["8133B936",0x1218],
- ["8133B937",0x1219],
- ["8133B938",0x121A],
- ["8133B939",0x121B],
- ["8133BA30",0x121C],
- ["8133BA31",0x121D],
- ["8133BA32",0x121E],
- ["8133BA33",0x121F],
- ["8133BA34",0x1220],
- ["8133BA35",0x1221],
- ["8133BA36",0x1222],
- ["8133BA37",0x1223],
- ["8133BA38",0x1224],
- ["8133BA39",0x1225],
- ["8133BB30",0x1226],
- ["8133BB31",0x1227],
- ["8133BB32",0x1228],
- ["8133BB33",0x1229],
- ["8133BB34",0x122A],
- ["8133BB35",0x122B],
- ["8133BB36",0x122C],
- ["8133BB37",0x122D],
- ["8133BB38",0x122E],
- ["8133BB39",0x122F],
- ["8133BC30",0x1230],
- ["8133BC31",0x1231],
- ["8133BC32",0x1232],
- ["8133BC33",0x1233],
- ["8133BC34",0x1234],
- ["8133BC35",0x1235],
- ["8133BC36",0x1236],
- ["8133BC37",0x1237],
- ["8133BC38",0x1238],
- ["8133BC39",0x1239],
- ["8133BD30",0x123A],
- ["8133BD31",0x123B],
- ["8133BD32",0x123C],
- ["8133BD33",0x123D],
- ["8133BD34",0x123E],
- ["8133BD35",0x123F],
- ["8133BD36",0x1240],
- ["8133BD37",0x1241],
- ["8133BD38",0x1242],
- ["8133BD39",0x1243],
- ["8133BE30",0x1244],
- ["8133BE31",0x1245],
- ["8133BE32",0x1246],
- ["8133BE33",0x1247],
- ["8133BE34",0x1248],
- ["8133BE35",0x1249],
- ["8133BE36",0x124A],
- ["8133BE37",0x124B],
- ["8133BE38",0x124C],
- ["8133BE39",0x124D],
- ["8133BF30",0x124E],
- ["8133BF31",0x124F],
- ["8133BF32",0x1250],
- ["8133BF33",0x1251],
- ["8133BF34",0x1252],
- ["8133BF35",0x1253],
- ["8133BF36",0x1254],
- ["8133BF37",0x1255],
- ["8133BF38",0x1256],
- ["8133BF39",0x1257],
- ["8133C030",0x1258],
- ["8133C031",0x1259],
- ["8133C032",0x125A],
- ["8133C033",0x125B],
- ["8133C034",0x125C],
- ["8133C035",0x125D],
- ["8133C036",0x125E],
- ["8133C037",0x125F],
- ["8133C038",0x1260],
- ["8133C039",0x1261],
- ["8133C130",0x1262],
- ["8133C131",0x1263],
- ["8133C132",0x1264],
- ["8133C133",0x1265],
- ["8133C134",0x1266],
- ["8133C135",0x1267],
- ["8133C136",0x1268],
- ["8133C137",0x1269],
- ["8133C138",0x126A],
- ["8133C139",0x126B],
- ["8133C230",0x126C],
- ["8133C231",0x126D],
- ["8133C232",0x126E],
- ["8133C233",0x126F],
- ["8133C234",0x1270],
- ["8133C235",0x1271],
- ["8133C236",0x1272],
- ["8133C237",0x1273],
- ["8133C238",0x1274],
- ["8133C239",0x1275],
- ["8133C330",0x1276],
- ["8133C331",0x1277],
- ["8133C332",0x1278],
- ["8133C333",0x1279],
- ["8133C334",0x127A],
- ["8133C335",0x127B],
- ["8133C336",0x127C],
- ["8133C337",0x127D],
- ["8133C338",0x127E],
- ["8133C339",0x127F],
- ["8133C430",0x1280],
- ["8133C431",0x1281],
- ["8133C432",0x1282],
- ["8133C433",0x1283],
- ["8133C434",0x1284],
- ["8133C435",0x1285],
- ["8133C436",0x1286],
- ["8133C437",0x1287],
- ["8133C438",0x1288],
- ["8133C439",0x1289],
- ["8133C530",0x128A],
- ["8133C531",0x128B],
- ["8133C532",0x128C],
- ["8133C533",0x128D],
- ["8133C534",0x128E],
- ["8133C535",0x128F],
- ["8133C536",0x1290],
- ["8133C537",0x1291],
- ["8133C538",0x1292],
- ["8133C539",0x1293],
- ["8133C630",0x1294],
- ["8133C631",0x1295],
- ["8133C632",0x1296],
- ["8133C633",0x1297],
- ["8133C634",0x1298],
- ["8133C635",0x1299],
- ["8133C636",0x129A],
- ["8133C637",0x129B],
- ["8133C638",0x129C],
- ["8133C639",0x129D],
- ["8133C730",0x129E],
- ["8133C731",0x129F],
- ["8133C732",0x12A0],
- ["8133C733",0x12A1],
- ["8133C734",0x12A2],
- ["8133C735",0x12A3],
- ["8133C736",0x12A4],
- ["8133C737",0x12A5],
- ["8133C738",0x12A6],
- ["8133C739",0x12A7],
- ["8133C830",0x12A8],
- ["8133C831",0x12A9],
- ["8133C832",0x12AA],
- ["8133C833",0x12AB],
- ["8133C834",0x12AC],
- ["8133C835",0x12AD],
- ["8133C836",0x12AE],
- ["8133C837",0x12AF],
- ["8133C838",0x12B0],
- ["8133C839",0x12B1],
- ["8133C930",0x12B2],
- ["8133C931",0x12B3],
- ["8133C932",0x12B4],
- ["8133C933",0x12B5],
- ["8133C934",0x12B6],
- ["8133C935",0x12B7],
- ["8133C936",0x12B8],
- ["8133C937",0x12B9],
- ["8133C938",0x12BA],
- ["8133C939",0x12BB],
- ["8133CA30",0x12BC],
- ["8133CA31",0x12BD],
- ["8133CA32",0x12BE],
- ["8133CA33",0x12BF],
- ["8133CA34",0x12C0],
- ["8133CA35",0x12C1],
- ["8133CA36",0x12C2],
- ["8133CA37",0x12C3],
- ["8133CA38",0x12C4],
- ["8133CA39",0x12C5],
- ["8133CB30",0x12C6],
- ["8133CB31",0x12C7],
- ["8133CB32",0x12C8],
- ["8133CB33",0x12C9],
- ["8133CB34",0x12CA],
- ["8133CB35",0x12CB],
- ["8133CB36",0x12CC],
- ["8133CB37",0x12CD],
- ["8133CB38",0x12CE],
- ["8133CB39",0x12CF],
- ["8133CC30",0x12D0],
- ["8133CC31",0x12D1],
- ["8133CC32",0x12D2],
- ["8133CC33",0x12D3],
- ["8133CC34",0x12D4],
- ["8133CC35",0x12D5],
- ["8133CC36",0x12D6],
- ["8133CC37",0x12D7],
- ["8133CC38",0x12D8],
- ["8133CC39",0x12D9],
- ["8133CD30",0x12DA],
- ["8133CD31",0x12DB],
- ["8133CD32",0x12DC],
- ["8133CD33",0x12DD],
- ["8133CD34",0x12DE],
- ["8133CD35",0x12DF],
- ["8133CD36",0x12E0],
- ["8133CD37",0x12E1],
- ["8133CD38",0x12E2],
- ["8133CD39",0x12E3],
- ["8133CE30",0x12E4],
- ["8133CE31",0x12E5],
- ["8133CE32",0x12E6],
- ["8133CE33",0x12E7],
- ["8133CE34",0x12E8],
- ["8133CE35",0x12E9],
- ["8133CE36",0x12EA],
- ["8133CE37",0x12EB],
- ["8133CE38",0x12EC],
- ["8133CE39",0x12ED],
- ["8133CF30",0x12EE],
- ["8133CF31",0x12EF],
- ["8133CF32",0x12F0],
- ["8133CF33",0x12F1],
- ["8133CF34",0x12F2],
- ["8133CF35",0x12F3],
- ["8133CF36",0x12F4],
- ["8133CF37",0x12F5],
- ["8133CF38",0x12F6],
- ["8133CF39",0x12F7],
- ["8133D030",0x12F8],
- ["8133D031",0x12F9],
- ["8133D032",0x12FA],
- ["8133D033",0x12FB],
- ["8133D034",0x12FC],
- ["8133D035",0x12FD],
- ["8133D036",0x12FE],
- ["8133D037",0x12FF],
- ["8133D038",0x1300],
- ["8133D039",0x1301],
- ["8133D130",0x1302],
- ["8133D131",0x1303],
- ["8133D132",0x1304],
- ["8133D133",0x1305],
- ["8133D134",0x1306],
- ["8133D135",0x1307],
- ["8133D136",0x1308],
- ["8133D137",0x1309],
- ["8133D138",0x130A],
- ["8133D139",0x130B],
- ["8133D230",0x130C],
- ["8133D231",0x130D],
- ["8133D232",0x130E],
- ["8133D233",0x130F],
- ["8133D234",0x1310],
- ["8133D235",0x1311],
- ["8133D236",0x1312],
- ["8133D237",0x1313],
- ["8133D238",0x1314],
- ["8133D239",0x1315],
- ["8133D330",0x1316],
- ["8133D331",0x1317],
- ["8133D332",0x1318],
- ["8133D333",0x1319],
- ["8133D334",0x131A],
- ["8133D335",0x131B],
- ["8133D336",0x131C],
- ["8133D337",0x131D],
- ["8133D338",0x131E],
- ["8133D339",0x131F],
- ["8133D430",0x1320],
- ["8133D431",0x1321],
- ["8133D432",0x1322],
- ["8133D433",0x1323],
- ["8133D434",0x1324],
- ["8133D435",0x1325],
- ["8133D436",0x1326],
- ["8133D437",0x1327],
- ["8133D438",0x1328],
- ["8133D439",0x1329],
- ["8133D530",0x132A],
- ["8133D531",0x132B],
- ["8133D532",0x132C],
- ["8133D533",0x132D],
- ["8133D534",0x132E],
- ["8133D535",0x132F],
- ["8133D536",0x1330],
- ["8133D537",0x1331],
- ["8133D538",0x1332],
- ["8133D539",0x1333],
- ["8133D630",0x1334],
- ["8133D631",0x1335],
- ["8133D632",0x1336],
- ["8133D633",0x1337],
- ["8133D634",0x1338],
- ["8133D635",0x1339],
- ["8133D636",0x133A],
- ["8133D637",0x133B],
- ["8133D638",0x133C],
- ["8133D639",0x133D],
- ["8133D730",0x133E],
- ["8133D731",0x133F],
- ["8133D732",0x1340],
- ["8133D733",0x1341],
- ["8133D734",0x1342],
- ["8133D735",0x1343],
- ["8133D736",0x1344],
- ["8133D737",0x1345],
- ["8133D738",0x1346],
- ["8133D739",0x1347],
- ["8133D830",0x1348],
- ["8133D831",0x1349],
- ["8133D832",0x134A],
- ["8133D833",0x134B],
- ["8133D834",0x134C],
- ["8133D835",0x134D],
- ["8133D836",0x134E],
- ["8133D837",0x134F],
- ["8133D838",0x1350],
- ["8133D839",0x1351],
- ["8133D930",0x1352],
- ["8133D931",0x1353],
- ["8133D932",0x1354],
- ["8133D933",0x1355],
- ["8133D934",0x1356],
- ["8133D935",0x1357],
- ["8133D936",0x1358],
- ["8133D937",0x1359],
- ["8133D938",0x135A],
- ["8133D939",0x135B],
- ["8133DA30",0x135C],
- ["8133DA31",0x135D],
- ["8133DA32",0x135E],
- ["8133DA33",0x135F],
- ["8133DA34",0x1360],
- ["8133DA35",0x1361],
- ["8133DA36",0x1362],
- ["8133DA37",0x1363],
- ["8133DA38",0x1364],
- ["8133DA39",0x1365],
- ["8133DB30",0x1366],
- ["8133DB31",0x1367],
- ["8133DB32",0x1368],
- ["8133DB33",0x1369],
- ["8133DB34",0x136A],
- ["8133DB35",0x136B],
- ["8133DB36",0x136C],
- ["8133DB37",0x136D],
- ["8133DB38",0x136E],
- ["8133DB39",0x136F],
- ["8133DC30",0x1370],
- ["8133DC31",0x1371],
- ["8133DC32",0x1372],
- ["8133DC33",0x1373],
- ["8133DC34",0x1374],
- ["8133DC35",0x1375],
- ["8133DC36",0x1376],
- ["8133DC37",0x1377],
- ["8133DC38",0x1378],
- ["8133DC39",0x1379],
- ["8133DD30",0x137A],
- ["8133DD31",0x137B],
- ["8133DD32",0x137C],
- ["8133DD33",0x137D],
- ["8133DD34",0x137E],
- ["8133DD35",0x137F],
- ["8133DD36",0x1380],
- ["8133DD37",0x1381],
- ["8133DD38",0x1382],
- ["8133DD39",0x1383],
- ["8133DE30",0x1384],
- ["8133DE31",0x1385],
- ["8133DE32",0x1386],
- ["8133DE33",0x1387],
- ["8133DE34",0x1388],
- ["8133DE35",0x1389],
- ["8133DE36",0x138A],
- ["8133DE37",0x138B],
- ["8133DE38",0x138C],
- ["8133DE39",0x138D],
- ["8133DF30",0x138E],
- ["8133DF31",0x138F],
- ["8133DF32",0x1390],
- ["8133DF33",0x1391],
- ["8133DF34",0x1392],
- ["8133DF35",0x1393],
- ["8133DF36",0x1394],
- ["8133DF37",0x1395],
- ["8133DF38",0x1396],
- ["8133DF39",0x1397],
- ["8133E030",0x1398],
- ["8133E031",0x1399],
- ["8133E032",0x139A],
- ["8133E033",0x139B],
- ["8133E034",0x139C],
- ["8133E035",0x139D],
- ["8133E036",0x139E],
- ["8133E037",0x139F],
- ["8133E038",0x13A0],
- ["8133E039",0x13A1],
- ["8133E130",0x13A2],
- ["8133E131",0x13A3],
- ["8133E132",0x13A4],
- ["8133E133",0x13A5],
- ["8133E134",0x13A6],
- ["8133E135",0x13A7],
- ["8133E136",0x13A8],
- ["8133E137",0x13A9],
- ["8133E138",0x13AA],
- ["8133E139",0x13AB],
- ["8133E230",0x13AC],
- ["8133E231",0x13AD],
- ["8133E232",0x13AE],
- ["8133E233",0x13AF],
- ["8133E234",0x13B0],
- ["8133E235",0x13B1],
- ["8133E236",0x13B2],
- ["8133E237",0x13B3],
- ["8133E238",0x13B4],
- ["8133E239",0x13B5],
- ["8133E330",0x13B6],
- ["8133E331",0x13B7],
- ["8133E332",0x13B8],
- ["8133E333",0x13B9],
- ["8133E334",0x13BA],
- ["8133E335",0x13BB],
- ["8133E336",0x13BC],
- ["8133E337",0x13BD],
- ["8133E338",0x13BE],
- ["8133E339",0x13BF],
- ["8133E430",0x13C0],
- ["8133E431",0x13C1],
- ["8133E432",0x13C2],
- ["8133E433",0x13C3],
- ["8133E434",0x13C4],
- ["8133E435",0x13C5],
- ["8133E436",0x13C6],
- ["8133E437",0x13C7],
- ["8133E438",0x13C8],
- ["8133E439",0x13C9],
- ["8133E530",0x13CA],
- ["8133E531",0x13CB],
- ["8133E532",0x13CC],
- ["8133E533",0x13CD],
- ["8133E534",0x13CE],
- ["8133E535",0x13CF],
- ["8133E536",0x13D0],
- ["8133E537",0x13D1],
- ["8133E538",0x13D2],
- ["8133E539",0x13D3],
- ["8133E630",0x13D4],
- ["8133E631",0x13D5],
- ["8133E632",0x13D6],
- ["8133E633",0x13D7],
- ["8133E634",0x13D8],
- ["8133E635",0x13D9],
- ["8133E636",0x13DA],
- ["8133E637",0x13DB],
- ["8133E638",0x13DC],
- ["8133E639",0x13DD],
- ["8133E730",0x13DE],
- ["8133E731",0x13DF],
- ["8133E732",0x13E0],
- ["8133E733",0x13E1],
- ["8133E734",0x13E2],
- ["8133E735",0x13E3],
- ["8133E736",0x13E4],
- ["8133E737",0x13E5],
- ["8133E738",0x13E6],
- ["8133E739",0x13E7],
- ["8133E830",0x13E8],
- ["8133E831",0x13E9],
- ["8133E832",0x13EA],
- ["8133E833",0x13EB],
- ["8133E834",0x13EC],
- ["8133E835",0x13ED],
- ["8133E836",0x13EE],
- ["8133E837",0x13EF],
- ["8133E838",0x13F0],
- ["8133E839",0x13F1],
- ["8133E930",0x13F2],
- ["8133E931",0x13F3],
- ["8133E932",0x13F4],
- ["8133E933",0x13F5],
- ["8133E934",0x13F6],
- ["8133E935",0x13F7],
- ["8133E936",0x13F8],
- ["8133E937",0x13F9],
- ["8133E938",0x13FA],
- ["8133E939",0x13FB],
- ["8133EA30",0x13FC],
- ["8133EA31",0x13FD],
- ["8133EA32",0x13FE],
- ["8133EA33",0x13FF],
- ["8133EA34",0x1400],
- ["8133EA35",0x1401],
- ["8133EA36",0x1402],
- ["8133EA37",0x1403],
- ["8133EA38",0x1404],
- ["8133EA39",0x1405],
- ["8133EB30",0x1406],
- ["8133EB31",0x1407],
- ["8133EB32",0x1408],
- ["8133EB33",0x1409],
- ["8133EB34",0x140A],
- ["8133EB35",0x140B],
- ["8133EB36",0x140C],
- ["8133EB37",0x140D],
- ["8133EB38",0x140E],
- ["8133EB39",0x140F],
- ["8133EC30",0x1410],
- ["8133EC31",0x1411],
- ["8133EC32",0x1412],
- ["8133EC33",0x1413],
- ["8133EC34",0x1414],
- ["8133EC35",0x1415],
- ["8133EC36",0x1416],
- ["8133EC37",0x1417],
- ["8133EC38",0x1418],
- ["8133EC39",0x1419],
- ["8133ED30",0x141A],
- ["8133ED31",0x141B],
- ["8133ED32",0x141C],
- ["8133ED33",0x141D],
- ["8133ED34",0x141E],
- ["8133ED35",0x141F],
- ["8133ED36",0x1420],
- ["8133ED37",0x1421],
- ["8133ED38",0x1422],
- ["8133ED39",0x1423],
- ["8133EE30",0x1424],
- ["8133EE31",0x1425],
- ["8133EE32",0x1426],
- ["8133EE33",0x1427],
- ["8133EE34",0x1428],
- ["8133EE35",0x1429],
- ["8133EE36",0x142A],
- ["8133EE37",0x142B],
- ["8133EE38",0x142C],
- ["8133EE39",0x142D],
- ["8133EF30",0x142E],
- ["8133EF31",0x142F],
- ["8133EF32",0x1430],
- ["8133EF33",0x1431],
- ["8133EF34",0x1432],
- ["8133EF35",0x1433],
- ["8133EF36",0x1434],
- ["8133EF37",0x1435],
- ["8133EF38",0x1436],
- ["8133EF39",0x1437],
- ["8133F030",0x1438],
- ["8133F031",0x1439],
- ["8133F032",0x143A],
- ["8133F033",0x143B],
- ["8133F034",0x143C],
- ["8133F035",0x143D],
- ["8133F036",0x143E],
- ["8133F037",0x143F],
- ["8133F038",0x1440],
- ["8133F039",0x1441],
- ["8133F130",0x1442],
- ["8133F131",0x1443],
- ["8133F132",0x1444],
- ["8133F133",0x1445],
- ["8133F134",0x1446],
- ["8133F135",0x1447],
- ["8133F136",0x1448],
- ["8133F137",0x1449],
- ["8133F138",0x144A],
- ["8133F139",0x144B],
- ["8133F230",0x144C],
- ["8133F231",0x144D],
- ["8133F232",0x144E],
- ["8133F233",0x144F],
- ["8133F234",0x1450],
- ["8133F235",0x1451],
- ["8133F236",0x1452],
- ["8133F237",0x1453],
- ["8133F238",0x1454],
- ["8133F239",0x1455],
- ["8133F330",0x1456],
- ["8133F331",0x1457],
- ["8133F332",0x1458],
- ["8133F333",0x1459],
- ["8133F334",0x145A],
- ["8133F335",0x145B],
- ["8133F336",0x145C],
- ["8133F337",0x145D],
- ["8133F338",0x145E],
- ["8133F339",0x145F],
- ["8133F430",0x1460],
- ["8133F431",0x1461],
- ["8133F432",0x1462],
- ["8133F433",0x1463],
- ["8133F434",0x1464],
- ["8133F435",0x1465],
- ["8133F436",0x1466],
- ["8133F437",0x1467],
- ["8133F438",0x1468],
- ["8133F439",0x1469],
- ["8133F530",0x146A],
- ["8133F531",0x146B],
- ["8133F532",0x146C],
- ["8133F533",0x146D],
- ["8133F534",0x146E],
- ["8133F535",0x146F],
- ["8133F536",0x1470],
- ["8133F537",0x1471],
- ["8133F538",0x1472],
- ["8133F539",0x1473],
- ["8133F630",0x1474],
- ["8133F631",0x1475],
- ["8133F632",0x1476],
- ["8133F633",0x1477],
- ["8133F634",0x1478],
- ["8133F635",0x1479],
- ["8133F636",0x147A],
- ["8133F637",0x147B],
- ["8133F638",0x147C],
- ["8133F639",0x147D],
- ["8133F730",0x147E],
- ["8133F731",0x147F],
- ["8133F732",0x1480],
- ["8133F733",0x1481],
- ["8133F734",0x1482],
- ["8133F735",0x1483],
- ["8133F736",0x1484],
- ["8133F737",0x1485],
- ["8133F738",0x1486],
- ["8133F739",0x1487],
- ["8133F830",0x1488],
- ["8133F831",0x1489],
- ["8133F832",0x148A],
- ["8133F833",0x148B],
- ["8133F834",0x148C],
- ["8133F835",0x148D],
- ["8133F836",0x148E],
- ["8133F837",0x148F],
- ["8133F838",0x1490],
- ["8133F839",0x1491],
- ["8133F930",0x1492],
- ["8133F931",0x1493],
- ["8133F932",0x1494],
- ["8133F933",0x1495],
- ["8133F934",0x1496],
- ["8133F935",0x1497],
- ["8133F936",0x1498],
- ["8133F937",0x1499],
- ["8133F938",0x149A],
- ["8133F939",0x149B],
- ["8133FA30",0x149C],
- ["8133FA31",0x149D],
- ["8133FA32",0x149E],
- ["8133FA33",0x149F],
- ["8133FA34",0x14A0],
- ["8133FA35",0x14A1],
- ["8133FA36",0x14A2],
- ["8133FA37",0x14A3],
- ["8133FA38",0x14A4],
- ["8133FA39",0x14A5],
- ["8133FB30",0x14A6],
- ["8133FB31",0x14A7],
- ["8133FB32",0x14A8],
- ["8133FB33",0x14A9],
- ["8133FB34",0x14AA],
- ["8133FB35",0x14AB],
- ["8133FB36",0x14AC],
- ["8133FB37",0x14AD],
- ["8133FB38",0x14AE],
- ["8133FB39",0x14AF],
- ["8133FC30",0x14B0],
- ["8133FC31",0x14B1],
- ["8133FC32",0x14B2],
- ["8133FC33",0x14B3],
- ["8133FC34",0x14B4],
- ["8133FC35",0x14B5],
- ["8133FC36",0x14B6],
- ["8133FC37",0x14B7],
- ["8133FC38",0x14B8],
- ["8133FC39",0x14B9],
- ["8133FD30",0x14BA],
- ["8133FD31",0x14BB],
- ["8133FD32",0x14BC],
- ["8133FD33",0x14BD],
- ["8133FD34",0x14BE],
- ["8133FD35",0x14BF],
- ["8133FD36",0x14C0],
- ["8133FD37",0x14C1],
- ["8133FD38",0x14C2],
- ["8133FD39",0x14C3],
- ["8133FE30",0x14C4],
- ["8133FE31",0x14C5],
- ["8133FE32",0x14C6],
- ["8133FE33",0x14C7],
- ["8133FE34",0x14C8],
- ["8133FE35",0x14C9],
- ["8133FE36",0x14CA],
- ["8133FE37",0x14CB],
- ["8133FE38",0x14CC],
- ["8133FE39",0x14CD],
- ["81348130",0x14CE],
- ["81348131",0x14CF],
- ["81348132",0x14D0],
- ["81348133",0x14D1],
- ["81348134",0x14D2],
- ["81348135",0x14D3],
- ["81348136",0x14D4],
- ["81348137",0x14D5],
- ["81348138",0x14D6],
- ["81348139",0x14D7],
- ["81348230",0x14D8],
- ["81348231",0x14D9],
- ["81348232",0x14DA],
- ["81348233",0x14DB],
- ["81348234",0x14DC],
- ["81348235",0x14DD],
- ["81348236",0x14DE],
- ["81348237",0x14DF],
- ["81348238",0x14E0],
- ["81348239",0x14E1],
- ["81348330",0x14E2],
- ["81348331",0x14E3],
- ["81348332",0x14E4],
- ["81348333",0x14E5],
- ["81348334",0x14E6],
- ["81348335",0x14E7],
- ["81348336",0x14E8],
- ["81348337",0x14E9],
- ["81348338",0x14EA],
- ["81348339",0x14EB],
- ["81348430",0x14EC],
- ["81348431",0x14ED],
- ["81348432",0x14EE],
- ["81348433",0x14EF],
- ["81348434",0x14F0],
- ["81348435",0x14F1],
- ["81348436",0x14F2],
- ["81348437",0x14F3],
- ["81348438",0x14F4],
- ["81348439",0x14F5],
- ["81348530",0x14F6],
- ["81348531",0x14F7],
- ["81348532",0x14F8],
- ["81348533",0x14F9],
- ["81348534",0x14FA],
- ["81348535",0x14FB],
- ["81348536",0x14FC],
- ["81348537",0x14FD],
- ["81348538",0x14FE],
- ["81348539",0x14FF],
- ["81348630",0x1500],
- ["81348631",0x1501],
- ["81348632",0x1502],
- ["81348633",0x1503],
- ["81348634",0x1504],
- ["81348635",0x1505],
- ["81348636",0x1506],
- ["81348637",0x1507],
- ["81348638",0x1508],
- ["81348639",0x1509],
- ["81348730",0x150A],
- ["81348731",0x150B],
- ["81348732",0x150C],
- ["81348733",0x150D],
- ["81348734",0x150E],
- ["81348735",0x150F],
- ["81348736",0x1510],
- ["81348737",0x1511],
- ["81348738",0x1512],
- ["81348739",0x1513],
- ["81348830",0x1514],
- ["81348831",0x1515],
- ["81348832",0x1516],
- ["81348833",0x1517],
- ["81348834",0x1518],
- ["81348835",0x1519],
- ["81348836",0x151A],
- ["81348837",0x151B],
- ["81348838",0x151C],
- ["81348839",0x151D],
- ["81348930",0x151E],
- ["81348931",0x151F],
- ["81348932",0x1520],
- ["81348933",0x1521],
- ["81348934",0x1522],
- ["81348935",0x1523],
- ["81348936",0x1524],
- ["81348937",0x1525],
- ["81348938",0x1526],
- ["81348939",0x1527],
- ["81348A30",0x1528],
- ["81348A31",0x1529],
- ["81348A32",0x152A],
- ["81348A33",0x152B],
- ["81348A34",0x152C],
- ["81348A35",0x152D],
- ["81348A36",0x152E],
- ["81348A37",0x152F],
- ["81348A38",0x1530],
- ["81348A39",0x1531],
- ["81348B30",0x1532],
- ["81348B31",0x1533],
- ["81348B32",0x1534],
- ["81348B33",0x1535],
- ["81348B34",0x1536],
- ["81348B35",0x1537],
- ["81348B36",0x1538],
- ["81348B37",0x1539],
- ["81348B38",0x153A],
- ["81348B39",0x153B],
- ["81348C30",0x153C],
- ["81348C31",0x153D],
- ["81348C32",0x153E],
- ["81348C33",0x153F],
- ["81348C34",0x1540],
- ["81348C35",0x1541],
- ["81348C36",0x1542],
- ["81348C37",0x1543],
- ["81348C38",0x1544],
- ["81348C39",0x1545],
- ["81348D30",0x1546],
- ["81348D31",0x1547],
- ["81348D32",0x1548],
- ["81348D33",0x1549],
- ["81348D34",0x154A],
- ["81348D35",0x154B],
- ["81348D36",0x154C],
- ["81348D37",0x154D],
- ["81348D38",0x154E],
- ["81348D39",0x154F],
- ["81348E30",0x1550],
- ["81348E31",0x1551],
- ["81348E32",0x1552],
- ["81348E33",0x1553],
- ["81348E34",0x1554],
- ["81348E35",0x1555],
- ["81348E36",0x1556],
- ["81348E37",0x1557],
- ["81348E38",0x1558],
- ["81348E39",0x1559],
- ["81348F30",0x155A],
- ["81348F31",0x155B],
- ["81348F32",0x155C],
- ["81348F33",0x155D],
- ["81348F34",0x155E],
- ["81348F35",0x155F],
- ["81348F36",0x1560],
- ["81348F37",0x1561],
- ["81348F38",0x1562],
- ["81348F39",0x1563],
- ["81349030",0x1564],
- ["81349031",0x1565],
- ["81349032",0x1566],
- ["81349033",0x1567],
- ["81349034",0x1568],
- ["81349035",0x1569],
- ["81349036",0x156A],
- ["81349037",0x156B],
- ["81349038",0x156C],
- ["81349039",0x156D],
- ["81349130",0x156E],
- ["81349131",0x156F],
- ["81349132",0x1570],
- ["81349133",0x1571],
- ["81349134",0x1572],
- ["81349135",0x1573],
- ["81349136",0x1574],
- ["81349137",0x1575],
- ["81349138",0x1576],
- ["81349139",0x1577],
- ["81349230",0x1578],
- ["81349231",0x1579],
- ["81349232",0x157A],
- ["81349233",0x157B],
- ["81349234",0x157C],
- ["81349235",0x157D],
- ["81349236",0x157E],
- ["81349237",0x157F],
- ["81349238",0x1580],
- ["81349239",0x1581],
- ["81349330",0x1582],
- ["81349331",0x1583],
- ["81349332",0x1584],
- ["81349333",0x1585],
- ["81349334",0x1586],
- ["81349335",0x1587],
- ["81349336",0x1588],
- ["81349337",0x1589],
- ["81349338",0x158A],
- ["81349339",0x158B],
- ["81349430",0x158C],
- ["81349431",0x158D],
- ["81349432",0x158E],
- ["81349433",0x158F],
- ["81349434",0x1590],
- ["81349435",0x1591],
- ["81349436",0x1592],
- ["81349437",0x1593],
- ["81349438",0x1594],
- ["81349439",0x1595],
- ["81349530",0x1596],
- ["81349531",0x1597],
- ["81349532",0x1598],
- ["81349533",0x1599],
- ["81349534",0x159A],
- ["81349535",0x159B],
- ["81349536",0x159C],
- ["81349537",0x159D],
- ["81349538",0x159E],
- ["81349539",0x159F],
- ["81349630",0x15A0],
- ["81349631",0x15A1],
- ["81349632",0x15A2],
- ["81349633",0x15A3],
- ["81349634",0x15A4],
- ["81349635",0x15A5],
- ["81349636",0x15A6],
- ["81349637",0x15A7],
- ["81349638",0x15A8],
- ["81349639",0x15A9],
- ["81349730",0x15AA],
- ["81349731",0x15AB],
- ["81349732",0x15AC],
- ["81349733",0x15AD],
- ["81349734",0x15AE],
- ["81349735",0x15AF],
- ["81349736",0x15B0],
- ["81349737",0x15B1],
- ["81349738",0x15B2],
- ["81349739",0x15B3],
- ["81349830",0x15B4],
- ["81349831",0x15B5],
- ["81349832",0x15B6],
- ["81349833",0x15B7],
- ["81349834",0x15B8],
- ["81349835",0x15B9],
- ["81349836",0x15BA],
- ["81349837",0x15BB],
- ["81349838",0x15BC],
- ["81349839",0x15BD],
- ["81349930",0x15BE],
- ["81349931",0x15BF],
- ["81349932",0x15C0],
- ["81349933",0x15C1],
- ["81349934",0x15C2],
- ["81349935",0x15C3],
- ["81349936",0x15C4],
- ["81349937",0x15C5],
- ["81349938",0x15C6],
- ["81349939",0x15C7],
- ["81349A30",0x15C8],
- ["81349A31",0x15C9],
- ["81349A32",0x15CA],
- ["81349A33",0x15CB],
- ["81349A34",0x15CC],
- ["81349A35",0x15CD],
- ["81349A36",0x15CE],
- ["81349A37",0x15CF],
- ["81349A38",0x15D0],
- ["81349A39",0x15D1],
- ["81349B30",0x15D2],
- ["81349B31",0x15D3],
- ["81349B32",0x15D4],
- ["81349B33",0x15D5],
- ["81349B34",0x15D6],
- ["81349B35",0x15D7],
- ["81349B36",0x15D8],
- ["81349B37",0x15D9],
- ["81349B38",0x15DA],
- ["81349B39",0x15DB],
- ["81349C30",0x15DC],
- ["81349C31",0x15DD],
- ["81349C32",0x15DE],
- ["81349C33",0x15DF],
- ["81349C34",0x15E0],
- ["81349C35",0x15E1],
- ["81349C36",0x15E2],
- ["81349C37",0x15E3],
- ["81349C38",0x15E4],
- ["81349C39",0x15E5],
- ["81349D30",0x15E6],
- ["81349D31",0x15E7],
- ["81349D32",0x15E8],
- ["81349D33",0x15E9],
- ["81349D34",0x15EA],
- ["81349D35",0x15EB],
- ["81349D36",0x15EC],
- ["81349D37",0x15ED],
- ["81349D38",0x15EE],
- ["81349D39",0x15EF],
- ["81349E30",0x15F0],
- ["81349E31",0x15F1],
- ["81349E32",0x15F2],
- ["81349E33",0x15F3],
- ["81349E34",0x15F4],
- ["81349E35",0x15F5],
- ["81349E36",0x15F6],
- ["81349E37",0x15F7],
- ["81349E38",0x15F8],
- ["81349E39",0x15F9],
- ["81349F30",0x15FA],
- ["81349F31",0x15FB],
- ["81349F32",0x15FC],
- ["81349F33",0x15FD],
- ["81349F34",0x15FE],
- ["81349F35",0x15FF],
- ["81349F36",0x1600],
- ["81349F37",0x1601],
- ["81349F38",0x1602],
- ["81349F39",0x1603],
- ["8134A030",0x1604],
- ["8134A031",0x1605],
- ["8134A032",0x1606],
- ["8134A033",0x1607],
- ["8134A034",0x1608],
- ["8134A035",0x1609],
- ["8134A036",0x160A],
- ["8134A037",0x160B],
- ["8134A038",0x160C],
- ["8134A039",0x160D],
- ["8134A130",0x160E],
- ["8134A131",0x160F],
- ["8134A132",0x1610],
- ["8134A133",0x1611],
- ["8134A134",0x1612],
- ["8134A135",0x1613],
- ["8134A136",0x1614],
- ["8134A137",0x1615],
- ["8134A138",0x1616],
- ["8134A139",0x1617],
- ["8134A230",0x1618],
- ["8134A231",0x1619],
- ["8134A232",0x161A],
- ["8134A233",0x161B],
- ["8134A234",0x161C],
- ["8134A235",0x161D],
- ["8134A236",0x161E],
- ["8134A237",0x161F],
- ["8134A238",0x1620],
- ["8134A239",0x1621],
- ["8134A330",0x1622],
- ["8134A331",0x1623],
- ["8134A332",0x1624],
- ["8134A333",0x1625],
- ["8134A334",0x1626],
- ["8134A335",0x1627],
- ["8134A336",0x1628],
- ["8134A337",0x1629],
- ["8134A338",0x162A],
- ["8134A339",0x162B],
- ["8134A430",0x162C],
- ["8134A431",0x162D],
- ["8134A432",0x162E],
- ["8134A433",0x162F],
- ["8134A434",0x1630],
- ["8134A435",0x1631],
- ["8134A436",0x1632],
- ["8134A437",0x1633],
- ["8134A438",0x1634],
- ["8134A439",0x1635],
- ["8134A530",0x1636],
- ["8134A531",0x1637],
- ["8134A532",0x1638],
- ["8134A533",0x1639],
- ["8134A534",0x163A],
- ["8134A535",0x163B],
- ["8134A536",0x163C],
- ["8134A537",0x163D],
- ["8134A538",0x163E],
- ["8134A539",0x163F],
- ["8134A630",0x1640],
- ["8134A631",0x1641],
- ["8134A632",0x1642],
- ["8134A633",0x1643],
- ["8134A634",0x1644],
- ["8134A635",0x1645],
- ["8134A636",0x1646],
- ["8134A637",0x1647],
- ["8134A638",0x1648],
- ["8134A639",0x1649],
- ["8134A730",0x164A],
- ["8134A731",0x164B],
- ["8134A732",0x164C],
- ["8134A733",0x164D],
- ["8134A734",0x164E],
- ["8134A735",0x164F],
- ["8134A736",0x1650],
- ["8134A737",0x1651],
- ["8134A738",0x1652],
- ["8134A739",0x1653],
- ["8134A830",0x1654],
- ["8134A831",0x1655],
- ["8134A832",0x1656],
- ["8134A833",0x1657],
- ["8134A834",0x1658],
- ["8134A835",0x1659],
- ["8134A836",0x165A],
- ["8134A837",0x165B],
- ["8134A838",0x165C],
- ["8134A839",0x165D],
- ["8134A930",0x165E],
- ["8134A931",0x165F],
- ["8134A932",0x1660],
- ["8134A933",0x1661],
- ["8134A934",0x1662],
- ["8134A935",0x1663],
- ["8134A936",0x1664],
- ["8134A937",0x1665],
- ["8134A938",0x1666],
- ["8134A939",0x1667],
- ["8134AA30",0x1668],
- ["8134AA31",0x1669],
- ["8134AA32",0x166A],
- ["8134AA33",0x166B],
- ["8134AA34",0x166C],
- ["8134AA35",0x166D],
- ["8134AA36",0x166E],
- ["8134AA37",0x166F],
- ["8134AA38",0x1670],
- ["8134AA39",0x1671],
- ["8134AB30",0x1672],
- ["8134AB31",0x1673],
- ["8134AB32",0x1674],
- ["8134AB33",0x1675],
- ["8134AB34",0x1676],
- ["8134AB35",0x1677],
- ["8134AB36",0x1678],
- ["8134AB37",0x1679],
- ["8134AB38",0x167A],
- ["8134AB39",0x167B],
- ["8134AC30",0x167C],
- ["8134AC31",0x167D],
- ["8134AC32",0x167E],
- ["8134AC33",0x167F],
- ["8134AC34",0x1680],
- ["8134AC35",0x1681],
- ["8134AC36",0x1682],
- ["8134AC37",0x1683],
- ["8134AC38",0x1684],
- ["8134AC39",0x1685],
- ["8134AD30",0x1686],
- ["8134AD31",0x1687],
- ["8134AD32",0x1688],
- ["8134AD33",0x1689],
- ["8134AD34",0x168A],
- ["8134AD35",0x168B],
- ["8134AD36",0x168C],
- ["8134AD37",0x168D],
- ["8134AD38",0x168E],
- ["8134AD39",0x168F],
- ["8134AE30",0x1690],
- ["8134AE31",0x1691],
- ["8134AE32",0x1692],
- ["8134AE33",0x1693],
- ["8134AE34",0x1694],
- ["8134AE35",0x1695],
- ["8134AE36",0x1696],
- ["8134AE37",0x1697],
- ["8134AE38",0x1698],
- ["8134AE39",0x1699],
- ["8134AF30",0x169A],
- ["8134AF31",0x169B],
- ["8134AF32",0x169C],
- ["8134AF33",0x169D],
- ["8134AF34",0x169E],
- ["8134AF35",0x169F],
- ["8134AF36",0x16A0],
- ["8134AF37",0x16A1],
- ["8134AF38",0x16A2],
- ["8134AF39",0x16A3],
- ["8134B030",0x16A4],
- ["8134B031",0x16A5],
- ["8134B032",0x16A6],
- ["8134B033",0x16A7],
- ["8134B034",0x16A8],
- ["8134B035",0x16A9],
- ["8134B036",0x16AA],
- ["8134B037",0x16AB],
- ["8134B038",0x16AC],
- ["8134B039",0x16AD],
- ["8134B130",0x16AE],
- ["8134B131",0x16AF],
- ["8134B132",0x16B0],
- ["8134B133",0x16B1],
- ["8134B134",0x16B2],
- ["8134B135",0x16B3],
- ["8134B136",0x16B4],
- ["8134B137",0x16B5],
- ["8134B138",0x16B6],
- ["8134B139",0x16B7],
- ["8134B230",0x16B8],
- ["8134B231",0x16B9],
- ["8134B232",0x16BA],
- ["8134B233",0x16BB],
- ["8134B234",0x16BC],
- ["8134B235",0x16BD],
- ["8134B236",0x16BE],
- ["8134B237",0x16BF],
- ["8134B238",0x16C0],
- ["8134B239",0x16C1],
- ["8134B330",0x16C2],
- ["8134B331",0x16C3],
- ["8134B332",0x16C4],
- ["8134B333",0x16C5],
- ["8134B334",0x16C6],
- ["8134B335",0x16C7],
- ["8134B336",0x16C8],
- ["8134B337",0x16C9],
- ["8134B338",0x16CA],
- ["8134B339",0x16CB],
- ["8134B430",0x16CC],
- ["8134B431",0x16CD],
- ["8134B432",0x16CE],
- ["8134B433",0x16CF],
- ["8134B434",0x16D0],
- ["8134B435",0x16D1],
- ["8134B436",0x16D2],
- ["8134B437",0x16D3],
- ["8134B438",0x16D4],
- ["8134B439",0x16D5],
- ["8134B530",0x16D6],
- ["8134B531",0x16D7],
- ["8134B532",0x16D8],
- ["8134B533",0x16D9],
- ["8134B534",0x16DA],
- ["8134B535",0x16DB],
- ["8134B536",0x16DC],
- ["8134B537",0x16DD],
- ["8134B538",0x16DE],
- ["8134B539",0x16DF],
- ["8134B630",0x16E0],
- ["8134B631",0x16E1],
- ["8134B632",0x16E2],
- ["8134B633",0x16E3],
- ["8134B634",0x16E4],
- ["8134B635",0x16E5],
- ["8134B636",0x16E6],
- ["8134B637",0x16E7],
- ["8134B638",0x16E8],
- ["8134B639",0x16E9],
- ["8134B730",0x16EA],
- ["8134B731",0x16EB],
- ["8134B732",0x16EC],
- ["8134B733",0x16ED],
- ["8134B734",0x16EE],
- ["8134B735",0x16EF],
- ["8134B736",0x16F0],
- ["8134B737",0x16F1],
- ["8134B738",0x16F2],
- ["8134B739",0x16F3],
- ["8134B830",0x16F4],
- ["8134B831",0x16F5],
- ["8134B832",0x16F6],
- ["8134B833",0x16F7],
- ["8134B834",0x16F8],
- ["8134B835",0x16F9],
- ["8134B836",0x16FA],
- ["8134B837",0x16FB],
- ["8134B838",0x16FC],
- ["8134B839",0x16FD],
- ["8134B930",0x16FE],
- ["8134B931",0x16FF],
- ["8134B932",0x1700],
- ["8134B933",0x1701],
- ["8134B934",0x1702],
- ["8134B935",0x1703],
- ["8134B936",0x1704],
- ["8134B937",0x1705],
- ["8134B938",0x1706],
- ["8134B939",0x1707],
- ["8134BA30",0x1708],
- ["8134BA31",0x1709],
- ["8134BA32",0x170A],
- ["8134BA33",0x170B],
- ["8134BA34",0x170C],
- ["8134BA35",0x170D],
- ["8134BA36",0x170E],
- ["8134BA37",0x170F],
- ["8134BA38",0x1710],
- ["8134BA39",0x1711],
- ["8134BB30",0x1712],
- ["8134BB31",0x1713],
- ["8134BB32",0x1714],
- ["8134BB33",0x1715],
- ["8134BB34",0x1716],
- ["8134BB35",0x1717],
- ["8134BB36",0x1718],
- ["8134BB37",0x1719],
- ["8134BB38",0x171A],
- ["8134BB39",0x171B],
- ["8134BC30",0x171C],
- ["8134BC31",0x171D],
- ["8134BC32",0x171E],
- ["8134BC33",0x171F],
- ["8134BC34",0x1720],
- ["8134BC35",0x1721],
- ["8134BC36",0x1722],
- ["8134BC37",0x1723],
- ["8134BC38",0x1724],
- ["8134BC39",0x1725],
- ["8134BD30",0x1726],
- ["8134BD31",0x1727],
- ["8134BD32",0x1728],
- ["8134BD33",0x1729],
- ["8134BD34",0x172A],
- ["8134BD35",0x172B],
- ["8134BD36",0x172C],
- ["8134BD37",0x172D],
- ["8134BD38",0x172E],
- ["8134BD39",0x172F],
- ["8134BE30",0x1730],
- ["8134BE31",0x1731],
- ["8134BE32",0x1732],
- ["8134BE33",0x1733],
- ["8134BE34",0x1734],
- ["8134BE35",0x1735],
- ["8134BE36",0x1736],
- ["8134BE37",0x1737],
- ["8134BE38",0x1738],
- ["8134BE39",0x1739],
- ["8134BF30",0x173A],
- ["8134BF31",0x173B],
- ["8134BF32",0x173C],
- ["8134BF33",0x173D],
- ["8134BF34",0x173E],
- ["8134BF35",0x173F],
- ["8134BF36",0x1740],
- ["8134BF37",0x1741],
- ["8134BF38",0x1742],
- ["8134BF39",0x1743],
- ["8134C030",0x1744],
- ["8134C031",0x1745],
- ["8134C032",0x1746],
- ["8134C033",0x1747],
- ["8134C034",0x1748],
- ["8134C035",0x1749],
- ["8134C036",0x174A],
- ["8134C037",0x174B],
- ["8134C038",0x174C],
- ["8134C039",0x174D],
- ["8134C130",0x174E],
- ["8134C131",0x174F],
- ["8134C132",0x1750],
- ["8134C133",0x1751],
- ["8134C134",0x1752],
- ["8134C135",0x1753],
- ["8134C136",0x1754],
- ["8134C137",0x1755],
- ["8134C138",0x1756],
- ["8134C139",0x1757],
- ["8134C230",0x1758],
- ["8134C231",0x1759],
- ["8134C232",0x175A],
- ["8134C233",0x175B],
- ["8134C234",0x175C],
- ["8134C235",0x175D],
- ["8134C236",0x175E],
- ["8134C237",0x175F],
- ["8134C238",0x1760],
- ["8134C239",0x1761],
- ["8134C330",0x1762],
- ["8134C331",0x1763],
- ["8134C332",0x1764],
- ["8134C333",0x1765],
- ["8134C334",0x1766],
- ["8134C335",0x1767],
- ["8134C336",0x1768],
- ["8134C337",0x1769],
- ["8134C338",0x176A],
- ["8134C339",0x176B],
- ["8134C430",0x176C],
- ["8134C431",0x176D],
- ["8134C432",0x176E],
- ["8134C433",0x176F],
- ["8134C434",0x1770],
- ["8134C435",0x1771],
- ["8134C436",0x1772],
- ["8134C437",0x1773],
- ["8134C438",0x1774],
- ["8134C439",0x1775],
- ["8134C530",0x1776],
- ["8134C531",0x1777],
- ["8134C532",0x1778],
- ["8134C533",0x1779],
- ["8134C534",0x177A],
- ["8134C535",0x177B],
- ["8134C536",0x177C],
- ["8134C537",0x177D],
- ["8134C538",0x177E],
- ["8134C539",0x177F],
- ["8134C630",0x1780],
- ["8134C631",0x1781],
- ["8134C632",0x1782],
- ["8134C633",0x1783],
- ["8134C634",0x1784],
- ["8134C635",0x1785],
- ["8134C636",0x1786],
- ["8134C637",0x1787],
- ["8134C638",0x1788],
- ["8134C639",0x1789],
- ["8134C730",0x178A],
- ["8134C731",0x178B],
- ["8134C732",0x178C],
- ["8134C733",0x178D],
- ["8134C734",0x178E],
- ["8134C735",0x178F],
- ["8134C736",0x1790],
- ["8134C737",0x1791],
- ["8134C738",0x1792],
- ["8134C739",0x1793],
- ["8134C830",0x1794],
- ["8134C831",0x1795],
- ["8134C832",0x1796],
- ["8134C833",0x1797],
- ["8134C834",0x1798],
- ["8134C835",0x1799],
- ["8134C836",0x179A],
- ["8134C837",0x179B],
- ["8134C838",0x179C],
- ["8134C839",0x179D],
- ["8134C930",0x179E],
- ["8134C931",0x179F],
- ["8134C932",0x17A0],
- ["8134C933",0x17A1],
- ["8134C934",0x17A2],
- ["8134C935",0x17A3],
- ["8134C936",0x17A4],
- ["8134C937",0x17A5],
- ["8134C938",0x17A6],
- ["8134C939",0x17A7],
- ["8134CA30",0x17A8],
- ["8134CA31",0x17A9],
- ["8134CA32",0x17AA],
- ["8134CA33",0x17AB],
- ["8134CA34",0x17AC],
- ["8134CA35",0x17AD],
- ["8134CA36",0x17AE],
- ["8134CA37",0x17AF],
- ["8134CA38",0x17B0],
- ["8134CA39",0x17B1],
- ["8134CB30",0x17B2],
- ["8134CB31",0x17B3],
- ["8134CB32",0x17B4],
- ["8134CB33",0x17B5],
- ["8134CB34",0x17B6],
- ["8134CB35",0x17B7],
- ["8134CB36",0x17B8],
- ["8134CB37",0x17B9],
- ["8134CB38",0x17BA],
- ["8134CB39",0x17BB],
- ["8134CC30",0x17BC],
- ["8134CC31",0x17BD],
- ["8134CC32",0x17BE],
- ["8134CC33",0x17BF],
- ["8134CC34",0x17C0],
- ["8134CC35",0x17C1],
- ["8134CC36",0x17C2],
- ["8134CC37",0x17C3],
- ["8134CC38",0x17C4],
- ["8134CC39",0x17C5],
- ["8134CD30",0x17C6],
- ["8134CD31",0x17C7],
- ["8134CD32",0x17C8],
- ["8134CD33",0x17C9],
- ["8134CD34",0x17CA],
- ["8134CD35",0x17CB],
- ["8134CD36",0x17CC],
- ["8134CD37",0x17CD],
- ["8134CD38",0x17CE],
- ["8134CD39",0x17CF],
- ["8134CE30",0x17D0],
- ["8134CE31",0x17D1],
- ["8134CE32",0x17D2],
- ["8134CE33",0x17D3],
- ["8134CE34",0x17D4],
- ["8134CE35",0x17D5],
- ["8134CE36",0x17D6],
- ["8134CE37",0x17D7],
- ["8134CE38",0x17D8],
- ["8134CE39",0x17D9],
- ["8134CF30",0x17DA],
- ["8134CF31",0x17DB],
- ["8134CF32",0x17DC],
- ["8134CF33",0x17DD],
- ["8134CF34",0x17DE],
- ["8134CF35",0x17DF],
- ["8134CF36",0x17E0],
- ["8134CF37",0x17E1],
- ["8134CF38",0x17E2],
- ["8134CF39",0x17E3],
- ["8134D030",0x17E4],
- ["8134D031",0x17E5],
- ["8134D032",0x17E6],
- ["8134D033",0x17E7],
- ["8134D034",0x17E8],
- ["8134D035",0x17E9],
- ["8134D036",0x17EA],
- ["8134D037",0x17EB],
- ["8134D038",0x17EC],
- ["8134D039",0x17ED],
- ["8134D130",0x17EE],
- ["8134D131",0x17EF],
- ["8134D132",0x17F0],
- ["8134D133",0x17F1],
- ["8134D134",0x17F2],
- ["8134D135",0x17F3],
- ["8134D136",0x17F4],
- ["8134D137",0x17F5],
- ["8134D138",0x17F6],
- ["8134D139",0x17F7],
- ["8134D230",0x17F8],
- ["8134D231",0x17F9],
- ["8134D232",0x17FA],
- ["8134D233",0x17FB],
- ["8134D234",0x17FC],
- ["8134D235",0x17FD],
- ["8134D236",0x17FE],
- ["8134D237",0x17FF],
- ["8134D238",0x1800],
- ["8134D239",0x1801],
- ["8134D330",0x1802],
- ["8134D331",0x1803],
- ["8134D332",0x1804],
- ["8134D333",0x1805],
- ["8134D334",0x1806],
- ["8134D335",0x1807],
- ["8134D336",0x1808],
- ["8134D337",0x1809],
- ["8134D338",0x180A],
- ["8134D339",0x180B],
- ["8134D430",0x180C],
- ["8134D431",0x180D],
- ["8134D432",0x180E],
- ["8134D433",0x180F],
- ["8134D434",0x1810],
- ["8134D435",0x1811],
- ["8134D436",0x1812],
- ["8134D437",0x1813],
- ["8134D438",0x1814],
- ["8134D439",0x1815],
- ["8134D530",0x1816],
- ["8134D531",0x1817],
- ["8134D532",0x1818],
- ["8134D533",0x1819],
- ["8134D534",0x181A],
- ["8134D535",0x181B],
- ["8134D536",0x181C],
- ["8134D537",0x181D],
- ["8134D538",0x181E],
- ["8134D539",0x181F],
- ["8134D630",0x1820],
- ["8134D631",0x1821],
- ["8134D632",0x1822],
- ["8134D633",0x1823],
- ["8134D634",0x1824],
- ["8134D635",0x1825],
- ["8134D636",0x1826],
- ["8134D637",0x1827],
- ["8134D638",0x1828],
- ["8134D639",0x1829],
- ["8134D730",0x182A],
- ["8134D731",0x182B],
- ["8134D732",0x182C],
- ["8134D733",0x182D],
- ["8134D734",0x182E],
- ["8134D735",0x182F],
- ["8134D736",0x1830],
- ["8134D737",0x1831],
- ["8134D738",0x1832],
- ["8134D739",0x1833],
- ["8134D830",0x1834],
- ["8134D831",0x1835],
- ["8134D832",0x1836],
- ["8134D833",0x1837],
- ["8134D834",0x1838],
- ["8134D835",0x1839],
- ["8134D836",0x183A],
- ["8134D837",0x183B],
- ["8134D838",0x183C],
- ["8134D839",0x183D],
- ["8134D930",0x183E],
- ["8134D931",0x183F],
- ["8134D932",0x1840],
- ["8134D933",0x1841],
- ["8134D934",0x1842],
- ["8134D935",0x1843],
- ["8134D936",0x1844],
- ["8134D937",0x1845],
- ["8134D938",0x1846],
- ["8134D939",0x1847],
- ["8134DA30",0x1848],
- ["8134DA31",0x1849],
- ["8134DA32",0x184A],
- ["8134DA33",0x184B],
- ["8134DA34",0x184C],
- ["8134DA35",0x184D],
- ["8134DA36",0x184E],
- ["8134DA37",0x184F],
- ["8134DA38",0x1850],
- ["8134DA39",0x1851],
- ["8134DB30",0x1852],
- ["8134DB31",0x1853],
- ["8134DB32",0x1854],
- ["8134DB33",0x1855],
- ["8134DB34",0x1856],
- ["8134DB35",0x1857],
- ["8134DB36",0x1858],
- ["8134DB37",0x1859],
- ["8134DB38",0x185A],
- ["8134DB39",0x185B],
- ["8134DC30",0x185C],
- ["8134DC31",0x185D],
- ["8134DC32",0x185E],
- ["8134DC33",0x185F],
- ["8134DC34",0x1860],
- ["8134DC35",0x1861],
- ["8134DC36",0x1862],
- ["8134DC37",0x1863],
- ["8134DC38",0x1864],
- ["8134DC39",0x1865],
- ["8134DD30",0x1866],
- ["8134DD31",0x1867],
- ["8134DD32",0x1868],
- ["8134DD33",0x1869],
- ["8134DD34",0x186A],
- ["8134DD35",0x186B],
- ["8134DD36",0x186C],
- ["8134DD37",0x186D],
- ["8134DD38",0x186E],
- ["8134DD39",0x186F],
- ["8134DE30",0x1870],
- ["8134DE31",0x1871],
- ["8134DE32",0x1872],
- ["8134DE33",0x1873],
- ["8134DE34",0x1874],
- ["8134DE35",0x1875],
- ["8134DE36",0x1876],
- ["8134DE37",0x1877],
- ["8134DE38",0x1878],
- ["8134DE39",0x1879],
- ["8134DF30",0x187A],
- ["8134DF31",0x187B],
- ["8134DF32",0x187C],
- ["8134DF33",0x187D],
- ["8134DF34",0x187E],
- ["8134DF35",0x187F],
- ["8134DF36",0x1880],
- ["8134DF37",0x1881],
- ["8134DF38",0x1882],
- ["8134DF39",0x1883],
- ["8134E030",0x1884],
- ["8134E031",0x1885],
- ["8134E032",0x1886],
- ["8134E033",0x1887],
- ["8134E034",0x1888],
- ["8134E035",0x1889],
- ["8134E036",0x188A],
- ["8134E037",0x188B],
- ["8134E038",0x188C],
- ["8134E039",0x188D],
- ["8134E130",0x188E],
- ["8134E131",0x188F],
- ["8134E132",0x1890],
- ["8134E133",0x1891],
- ["8134E134",0x1892],
- ["8134E135",0x1893],
- ["8134E136",0x1894],
- ["8134E137",0x1895],
- ["8134E138",0x1896],
- ["8134E139",0x1897],
- ["8134E230",0x1898],
- ["8134E231",0x1899],
- ["8134E232",0x189A],
- ["8134E233",0x189B],
- ["8134E234",0x189C],
- ["8134E235",0x189D],
- ["8134E236",0x189E],
- ["8134E237",0x189F],
- ["8134E238",0x18A0],
- ["8134E239",0x18A1],
- ["8134E330",0x18A2],
- ["8134E331",0x18A3],
- ["8134E332",0x18A4],
- ["8134E333",0x18A5],
- ["8134E334",0x18A6],
- ["8134E335",0x18A7],
- ["8134E336",0x18A8],
- ["8134E337",0x18A9],
- ["8134E338",0x18AA],
- ["8134E339",0x18AB],
- ["8134E430",0x18AC],
- ["8134E431",0x18AD],
- ["8134E432",0x18AE],
- ["8134E433",0x18AF],
- ["8134E434",0x18B0],
- ["8134E435",0x18B1],
- ["8134E436",0x18B2],
- ["8134E437",0x18B3],
- ["8134E438",0x18B4],
- ["8134E439",0x18B5],
- ["8134E530",0x18B6],
- ["8134E531",0x18B7],
- ["8134E532",0x18B8],
- ["8134E533",0x18B9],
- ["8134E534",0x18BA],
- ["8134E535",0x18BB],
- ["8134E536",0x18BC],
- ["8134E537",0x18BD],
- ["8134E538",0x18BE],
- ["8134E539",0x18BF],
- ["8134E630",0x18C0],
- ["8134E631",0x18C1],
- ["8134E632",0x18C2],
- ["8134E633",0x18C3],
- ["8134E634",0x18C4],
- ["8134E635",0x18C5],
- ["8134E636",0x18C6],
- ["8134E637",0x18C7],
- ["8134E638",0x18C8],
- ["8134E639",0x18C9],
- ["8134E730",0x18CA],
- ["8134E731",0x18CB],
- ["8134E732",0x18CC],
- ["8134E733",0x18CD],
- ["8134E734",0x18CE],
- ["8134E735",0x18CF],
- ["8134E736",0x18D0],
- ["8134E737",0x18D1],
- ["8134E738",0x18D2],
- ["8134E739",0x18D3],
- ["8134E830",0x18D4],
- ["8134E831",0x18D5],
- ["8134E832",0x18D6],
- ["8134E833",0x18D7],
- ["8134E834",0x18D8],
- ["8134E835",0x18D9],
- ["8134E836",0x18DA],
- ["8134E837",0x18DB],
- ["8134E838",0x18DC],
- ["8134E839",0x18DD],
- ["8134E930",0x18DE],
- ["8134E931",0x18DF],
- ["8134E932",0x18E0],
- ["8134E933",0x18E1],
- ["8134E934",0x18E2],
- ["8134E935",0x18E3],
- ["8134E936",0x18E4],
- ["8134E937",0x18E5],
- ["8134E938",0x18E6],
- ["8134E939",0x18E7],
- ["8134EA30",0x18E8],
- ["8134EA31",0x18E9],
- ["8134EA32",0x18EA],
- ["8134EA33",0x18EB],
- ["8134EA34",0x18EC],
- ["8134EA35",0x18ED],
- ["8134EA36",0x18EE],
- ["8134EA37",0x18EF],
- ["8134EA38",0x18F0],
- ["8134EA39",0x18F1],
- ["8134EB30",0x18F2],
- ["8134EB31",0x18F3],
- ["8134EB32",0x18F4],
- ["8134EB33",0x18F5],
- ["8134EB34",0x18F6],
- ["8134EB35",0x18F7],
- ["8134EB36",0x18F8],
- ["8134EB37",0x18F9],
- ["8134EB38",0x18FA],
- ["8134EB39",0x18FB],
- ["8134EC30",0x18FC],
- ["8134EC31",0x18FD],
- ["8134EC32",0x18FE],
- ["8134EC33",0x18FF],
- ["8134EC34",0x1900],
- ["8134EC35",0x1901],
- ["8134EC36",0x1902],
- ["8134EC37",0x1903],
- ["8134EC38",0x1904],
- ["8134EC39",0x1905],
- ["8134ED30",0x1906],
- ["8134ED31",0x1907],
- ["8134ED32",0x1908],
- ["8134ED33",0x1909],
- ["8134ED34",0x190A],
- ["8134ED35",0x190B],
- ["8134ED36",0x190C],
- ["8134ED37",0x190D],
- ["8134ED38",0x190E],
- ["8134ED39",0x190F],
- ["8134EE30",0x1910],
- ["8134EE31",0x1911],
- ["8134EE32",0x1912],
- ["8134EE33",0x1913],
- ["8134EE34",0x1914],
- ["8134EE35",0x1915],
- ["8134EE36",0x1916],
- ["8134EE37",0x1917],
- ["8134EE38",0x1918],
- ["8134EE39",0x1919],
- ["8134EF30",0x191A],
- ["8134EF31",0x191B],
- ["8134EF32",0x191C],
- ["8134EF33",0x191D],
- ["8134EF34",0x191E],
- ["8134EF35",0x191F],
- ["8134EF36",0x1920],
- ["8134EF37",0x1921],
- ["8134EF38",0x1922],
- ["8134EF39",0x1923],
- ["8134F030",0x1924],
- ["8134F031",0x1925],
- ["8134F032",0x1926],
- ["8134F033",0x1927],
- ["8134F034",0x1928],
- ["8134F035",0x1929],
- ["8134F036",0x192A],
- ["8134F037",0x192B],
- ["8134F038",0x192C],
- ["8134F039",0x192D],
- ["8134F130",0x192E],
- ["8134F131",0x192F],
- ["8134F132",0x1930],
- ["8134F133",0x1931],
- ["8134F134",0x1932],
- ["8134F135",0x1933],
- ["8134F136",0x1934],
- ["8134F137",0x1935],
- ["8134F138",0x1936],
- ["8134F139",0x1937],
- ["8134F230",0x1938],
- ["8134F231",0x1939],
- ["8134F232",0x193A],
- ["8134F233",0x193B],
- ["8134F234",0x193C],
- ["8134F235",0x193D],
- ["8134F236",0x193E],
- ["8134F237",0x193F],
- ["8134F238",0x1940],
- ["8134F239",0x1941],
- ["8134F330",0x1942],
- ["8134F331",0x1943],
- ["8134F332",0x1944],
- ["8134F333",0x1945],
- ["8134F334",0x1946],
- ["8134F335",0x1947],
- ["8134F336",0x1948],
- ["8134F337",0x1949],
- ["8134F338",0x194A],
- ["8134F339",0x194B],
- ["8134F430",0x194C],
- ["8134F431",0x194D],
- ["8134F432",0x194E],
- ["8134F433",0x194F],
- ["8134F434",0x1950],
- ["8134F435",0x1951],
- ["8134F436",0x1952],
- ["8134F437",0x1953],
- ["8134F438",0x1954],
- ["8134F439",0x1955],
- ["8134F530",0x1956],
- ["8134F531",0x1957],
- ["8134F532",0x1958],
- ["8134F533",0x1959],
- ["8134F534",0x195A],
- ["8134F535",0x195B],
- ["8134F536",0x195C],
- ["8134F537",0x195D],
- ["8134F538",0x195E],
- ["8134F539",0x195F],
- ["8134F630",0x1960],
- ["8134F631",0x1961],
- ["8134F632",0x1962],
- ["8134F633",0x1963],
- ["8134F634",0x1964],
- ["8134F635",0x1965],
- ["8134F636",0x1966],
- ["8134F637",0x1967],
- ["8134F638",0x1968],
- ["8134F639",0x1969],
- ["8134F730",0x196A],
- ["8134F731",0x196B],
- ["8134F732",0x196C],
- ["8134F733",0x196D],
- ["8134F734",0x196E],
- ["8134F735",0x196F],
- ["8134F736",0x1970],
- ["8134F737",0x1971],
- ["8134F738",0x1972],
- ["8134F739",0x1973],
- ["8134F830",0x1974],
- ["8134F831",0x1975],
- ["8134F832",0x1976],
- ["8134F833",0x1977],
- ["8134F834",0x1978],
- ["8134F835",0x1979],
- ["8134F836",0x197A],
- ["8134F837",0x197B],
- ["8134F838",0x197C],
- ["8134F839",0x197D],
- ["8134F930",0x197E],
- ["8134F931",0x197F],
- ["8134F932",0x1980],
- ["8134F933",0x1981],
- ["8134F934",0x1982],
- ["8134F935",0x1983],
- ["8134F936",0x1984],
- ["8134F937",0x1985],
- ["8134F938",0x1986],
- ["8134F939",0x1987],
- ["8134FA30",0x1988],
- ["8134FA31",0x1989],
- ["8134FA32",0x198A],
- ["8134FA33",0x198B],
- ["8134FA34",0x198C],
- ["8134FA35",0x198D],
- ["8134FA36",0x198E],
- ["8134FA37",0x198F],
- ["8134FA38",0x1990],
- ["8134FA39",0x1991],
- ["8134FB30",0x1992],
- ["8134FB31",0x1993],
- ["8134FB32",0x1994],
- ["8134FB33",0x1995],
- ["8134FB34",0x1996],
- ["8134FB35",0x1997],
- ["8134FB36",0x1998],
- ["8134FB37",0x1999],
- ["8134FB38",0x199A],
- ["8134FB39",0x199B],
- ["8134FC30",0x199C],
- ["8134FC31",0x199D],
- ["8134FC32",0x199E],
- ["8134FC33",0x199F],
- ["8134FC34",0x19A0],
- ["8134FC35",0x19A1],
- ["8134FC36",0x19A2],
- ["8134FC37",0x19A3],
- ["8134FC38",0x19A4],
- ["8134FC39",0x19A5],
- ["8134FD30",0x19A6],
- ["8134FD31",0x19A7],
- ["8134FD32",0x19A8],
- ["8134FD33",0x19A9],
- ["8134FD34",0x19AA],
- ["8134FD35",0x19AB],
- ["8134FD36",0x19AC],
- ["8134FD37",0x19AD],
- ["8134FD38",0x19AE],
- ["8134FD39",0x19AF],
- ["8134FE30",0x19B0],
- ["8134FE31",0x19B1],
- ["8134FE32",0x19B2],
- ["8134FE33",0x19B3],
- ["8134FE34",0x19B4],
- ["8134FE35",0x19B5],
- ["8134FE36",0x19B6],
- ["8134FE37",0x19B7],
- ["8134FE38",0x19B8],
- ["8134FE39",0x19B9],
- ["81358130",0x19BA],
- ["81358131",0x19BB],
- ["81358132",0x19BC],
- ["81358133",0x19BD],
- ["81358134",0x19BE],
- ["81358135",0x19BF],
- ["81358136",0x19C0],
- ["81358137",0x19C1],
- ["81358138",0x19C2],
- ["81358139",0x19C3],
- ["81358230",0x19C4],
- ["81358231",0x19C5],
- ["81358232",0x19C6],
- ["81358233",0x19C7],
- ["81358234",0x19C8],
- ["81358235",0x19C9],
- ["81358236",0x19CA],
- ["81358237",0x19CB],
- ["81358238",0x19CC],
- ["81358239",0x19CD],
- ["81358330",0x19CE],
- ["81358331",0x19CF],
- ["81358332",0x19D0],
- ["81358333",0x19D1],
- ["81358334",0x19D2],
- ["81358335",0x19D3],
- ["81358336",0x19D4],
- ["81358337",0x19D5],
- ["81358338",0x19D6],
- ["81358339",0x19D7],
- ["81358430",0x19D8],
- ["81358431",0x19D9],
- ["81358432",0x19DA],
- ["81358433",0x19DB],
- ["81358434",0x19DC],
- ["81358435",0x19DD],
- ["81358436",0x19DE],
- ["81358437",0x19DF],
- ["81358438",0x19E0],
- ["81358439",0x19E1],
- ["81358530",0x19E2],
- ["81358531",0x19E3],
- ["81358532",0x19E4],
- ["81358533",0x19E5],
- ["81358534",0x19E6],
- ["81358535",0x19E7],
- ["81358536",0x19E8],
- ["81358537",0x19E9],
- ["81358538",0x19EA],
- ["81358539",0x19EB],
- ["81358630",0x19EC],
- ["81358631",0x19ED],
- ["81358632",0x19EE],
- ["81358633",0x19EF],
- ["81358634",0x19F0],
- ["81358635",0x19F1],
- ["81358636",0x19F2],
- ["81358637",0x19F3],
- ["81358638",0x19F4],
- ["81358639",0x19F5],
- ["81358730",0x19F6],
- ["81358731",0x19F7],
- ["81358732",0x19F8],
- ["81358733",0x19F9],
- ["81358734",0x19FA],
- ["81358735",0x19FB],
- ["81358736",0x19FC],
- ["81358737",0x19FD],
- ["81358738",0x19FE],
- ["81358739",0x19FF],
- ["81358830",0x1A00],
- ["81358831",0x1A01],
- ["81358832",0x1A02],
- ["81358833",0x1A03],
- ["81358834",0x1A04],
- ["81358835",0x1A05],
- ["81358836",0x1A06],
- ["81358837",0x1A07],
- ["81358838",0x1A08],
- ["81358839",0x1A09],
- ["81358930",0x1A0A],
- ["81358931",0x1A0B],
- ["81358932",0x1A0C],
- ["81358933",0x1A0D],
- ["81358934",0x1A0E],
- ["81358935",0x1A0F],
- ["81358936",0x1A10],
- ["81358937",0x1A11],
- ["81358938",0x1A12],
- ["81358939",0x1A13],
- ["81358A30",0x1A14],
- ["81358A31",0x1A15],
- ["81358A32",0x1A16],
- ["81358A33",0x1A17],
- ["81358A34",0x1A18],
- ["81358A35",0x1A19],
- ["81358A36",0x1A1A],
- ["81358A37",0x1A1B],
- ["81358A38",0x1A1C],
- ["81358A39",0x1A1D],
- ["81358B30",0x1A1E],
- ["81358B31",0x1A1F],
- ["81358B32",0x1A20],
- ["81358B33",0x1A21],
- ["81358B34",0x1A22],
- ["81358B35",0x1A23],
- ["81358B36",0x1A24],
- ["81358B37",0x1A25],
- ["81358B38",0x1A26],
- ["81358B39",0x1A27],
- ["81358C30",0x1A28],
- ["81358C31",0x1A29],
- ["81358C32",0x1A2A],
- ["81358C33",0x1A2B],
- ["81358C34",0x1A2C],
- ["81358C35",0x1A2D],
- ["81358C36",0x1A2E],
- ["81358C37",0x1A2F],
- ["81358C38",0x1A30],
- ["81358C39",0x1A31],
- ["81358D30",0x1A32],
- ["81358D31",0x1A33],
- ["81358D32",0x1A34],
- ["81358D33",0x1A35],
- ["81358D34",0x1A36],
- ["81358D35",0x1A37],
- ["81358D36",0x1A38],
- ["81358D37",0x1A39],
- ["81358D38",0x1A3A],
- ["81358D39",0x1A3B],
- ["81358E30",0x1A3C],
- ["81358E31",0x1A3D],
- ["81358E32",0x1A3E],
- ["81358E33",0x1A3F],
- ["81358E34",0x1A40],
- ["81358E35",0x1A41],
- ["81358E36",0x1A42],
- ["81358E37",0x1A43],
- ["81358E38",0x1A44],
- ["81358E39",0x1A45],
- ["81358F30",0x1A46],
- ["81358F31",0x1A47],
- ["81358F32",0x1A48],
- ["81358F33",0x1A49],
- ["81358F34",0x1A4A],
- ["81358F35",0x1A4B],
- ["81358F36",0x1A4C],
- ["81358F37",0x1A4D],
- ["81358F38",0x1A4E],
- ["81358F39",0x1A4F],
- ["81359030",0x1A50],
- ["81359031",0x1A51],
- ["81359032",0x1A52],
- ["81359033",0x1A53],
- ["81359034",0x1A54],
- ["81359035",0x1A55],
- ["81359036",0x1A56],
- ["81359037",0x1A57],
- ["81359038",0x1A58],
- ["81359039",0x1A59],
- ["81359130",0x1A5A],
- ["81359131",0x1A5B],
- ["81359132",0x1A5C],
- ["81359133",0x1A5D],
- ["81359134",0x1A5E],
- ["81359135",0x1A5F],
- ["81359136",0x1A60],
- ["81359137",0x1A61],
- ["81359138",0x1A62],
- ["81359139",0x1A63],
- ["81359230",0x1A64],
- ["81359231",0x1A65],
- ["81359232",0x1A66],
- ["81359233",0x1A67],
- ["81359234",0x1A68],
- ["81359235",0x1A69],
- ["81359236",0x1A6A],
- ["81359237",0x1A6B],
- ["81359238",0x1A6C],
- ["81359239",0x1A6D],
- ["81359330",0x1A6E],
- ["81359331",0x1A6F],
- ["81359332",0x1A70],
- ["81359333",0x1A71],
- ["81359334",0x1A72],
- ["81359335",0x1A73],
- ["81359336",0x1A74],
- ["81359337",0x1A75],
- ["81359338",0x1A76],
- ["81359339",0x1A77],
- ["81359430",0x1A78],
- ["81359431",0x1A79],
- ["81359432",0x1A7A],
- ["81359433",0x1A7B],
- ["81359434",0x1A7C],
- ["81359435",0x1A7D],
- ["81359436",0x1A7E],
- ["81359437",0x1A7F],
- ["81359438",0x1A80],
- ["81359439",0x1A81],
- ["81359530",0x1A82],
- ["81359531",0x1A83],
- ["81359532",0x1A84],
- ["81359533",0x1A85],
- ["81359534",0x1A86],
- ["81359535",0x1A87],
- ["81359536",0x1A88],
- ["81359537",0x1A89],
- ["81359538",0x1A8A],
- ["81359539",0x1A8B],
- ["81359630",0x1A8C],
- ["81359631",0x1A8D],
- ["81359632",0x1A8E],
- ["81359633",0x1A8F],
- ["81359634",0x1A90],
- ["81359635",0x1A91],
- ["81359636",0x1A92],
- ["81359637",0x1A93],
- ["81359638",0x1A94],
- ["81359639",0x1A95],
- ["81359730",0x1A96],
- ["81359731",0x1A97],
- ["81359732",0x1A98],
- ["81359733",0x1A99],
- ["81359734",0x1A9A],
- ["81359735",0x1A9B],
- ["81359736",0x1A9C],
- ["81359737",0x1A9D],
- ["81359738",0x1A9E],
- ["81359739",0x1A9F],
- ["81359830",0x1AA0],
- ["81359831",0x1AA1],
- ["81359832",0x1AA2],
- ["81359833",0x1AA3],
- ["81359834",0x1AA4],
- ["81359835",0x1AA5],
- ["81359836",0x1AA6],
- ["81359837",0x1AA7],
- ["81359838",0x1AA8],
- ["81359839",0x1AA9],
- ["81359930",0x1AAA],
- ["81359931",0x1AAB],
- ["81359932",0x1AAC],
- ["81359933",0x1AAD],
- ["81359934",0x1AAE],
- ["81359935",0x1AAF],
- ["81359936",0x1AB0],
- ["81359937",0x1AB1],
- ["81359938",0x1AB2],
- ["81359939",0x1AB3],
- ["81359A30",0x1AB4],
- ["81359A31",0x1AB5],
- ["81359A32",0x1AB6],
- ["81359A33",0x1AB7],
- ["81359A34",0x1AB8],
- ["81359A35",0x1AB9],
- ["81359A36",0x1ABA],
- ["81359A37",0x1ABB],
- ["81359A38",0x1ABC],
- ["81359A39",0x1ABD],
- ["81359B30",0x1ABE],
- ["81359B31",0x1ABF],
- ["81359B32",0x1AC0],
- ["81359B33",0x1AC1],
- ["81359B34",0x1AC2],
- ["81359B35",0x1AC3],
- ["81359B36",0x1AC4],
- ["81359B37",0x1AC5],
- ["81359B38",0x1AC6],
- ["81359B39",0x1AC7],
- ["81359C30",0x1AC8],
- ["81359C31",0x1AC9],
- ["81359C32",0x1ACA],
- ["81359C33",0x1ACB],
- ["81359C34",0x1ACC],
- ["81359C35",0x1ACD],
- ["81359C36",0x1ACE],
- ["81359C37",0x1ACF],
- ["81359C38",0x1AD0],
- ["81359C39",0x1AD1],
- ["81359D30",0x1AD2],
- ["81359D31",0x1AD3],
- ["81359D32",0x1AD4],
- ["81359D33",0x1AD5],
- ["81359D34",0x1AD6],
- ["81359D35",0x1AD7],
- ["81359D36",0x1AD8],
- ["81359D37",0x1AD9],
- ["81359D38",0x1ADA],
- ["81359D39",0x1ADB],
- ["81359E30",0x1ADC],
- ["81359E31",0x1ADD],
- ["81359E32",0x1ADE],
- ["81359E33",0x1ADF],
- ["81359E34",0x1AE0],
- ["81359E35",0x1AE1],
- ["81359E36",0x1AE2],
- ["81359E37",0x1AE3],
- ["81359E38",0x1AE4],
- ["81359E39",0x1AE5],
- ["81359F30",0x1AE6],
- ["81359F31",0x1AE7],
- ["81359F32",0x1AE8],
- ["81359F33",0x1AE9],
- ["81359F34",0x1AEA],
- ["81359F35",0x1AEB],
- ["81359F36",0x1AEC],
- ["81359F37",0x1AED],
- ["81359F38",0x1AEE],
- ["81359F39",0x1AEF],
- ["8135A030",0x1AF0],
- ["8135A031",0x1AF1],
- ["8135A032",0x1AF2],
- ["8135A033",0x1AF3],
- ["8135A034",0x1AF4],
- ["8135A035",0x1AF5],
- ["8135A036",0x1AF6],
- ["8135A037",0x1AF7],
- ["8135A038",0x1AF8],
- ["8135A039",0x1AF9],
- ["8135A130",0x1AFA],
- ["8135A131",0x1AFB],
- ["8135A132",0x1AFC],
- ["8135A133",0x1AFD],
- ["8135A134",0x1AFE],
- ["8135A135",0x1AFF],
- ["8135A136",0x1B00],
- ["8135A137",0x1B01],
- ["8135A138",0x1B02],
- ["8135A139",0x1B03],
- ["8135A230",0x1B04],
- ["8135A231",0x1B05],
- ["8135A232",0x1B06],
- ["8135A233",0x1B07],
- ["8135A234",0x1B08],
- ["8135A235",0x1B09],
- ["8135A236",0x1B0A],
- ["8135A237",0x1B0B],
- ["8135A238",0x1B0C],
- ["8135A239",0x1B0D],
- ["8135A330",0x1B0E],
- ["8135A331",0x1B0F],
- ["8135A332",0x1B10],
- ["8135A333",0x1B11],
- ["8135A334",0x1B12],
- ["8135A335",0x1B13],
- ["8135A336",0x1B14],
- ["8135A337",0x1B15],
- ["8135A338",0x1B16],
- ["8135A339",0x1B17],
- ["8135A430",0x1B18],
- ["8135A431",0x1B19],
- ["8135A432",0x1B1A],
- ["8135A433",0x1B1B],
- ["8135A434",0x1B1C],
- ["8135A435",0x1B1D],
- ["8135A436",0x1B1E],
- ["8135A437",0x1B1F],
- ["8135A438",0x1B20],
- ["8135A439",0x1B21],
- ["8135A530",0x1B22],
- ["8135A531",0x1B23],
- ["8135A532",0x1B24],
- ["8135A533",0x1B25],
- ["8135A534",0x1B26],
- ["8135A535",0x1B27],
- ["8135A536",0x1B28],
- ["8135A537",0x1B29],
- ["8135A538",0x1B2A],
- ["8135A539",0x1B2B],
- ["8135A630",0x1B2C],
- ["8135A631",0x1B2D],
- ["8135A632",0x1B2E],
- ["8135A633",0x1B2F],
- ["8135A634",0x1B30],
- ["8135A635",0x1B31],
- ["8135A636",0x1B32],
- ["8135A637",0x1B33],
- ["8135A638",0x1B34],
- ["8135A639",0x1B35],
- ["8135A730",0x1B36],
- ["8135A731",0x1B37],
- ["8135A732",0x1B38],
- ["8135A733",0x1B39],
- ["8135A734",0x1B3A],
- ["8135A735",0x1B3B],
- ["8135A736",0x1B3C],
- ["8135A737",0x1B3D],
- ["8135A738",0x1B3E],
- ["8135A739",0x1B3F],
- ["8135A830",0x1B40],
- ["8135A831",0x1B41],
- ["8135A832",0x1B42],
- ["8135A833",0x1B43],
- ["8135A834",0x1B44],
- ["8135A835",0x1B45],
- ["8135A836",0x1B46],
- ["8135A837",0x1B47],
- ["8135A838",0x1B48],
- ["8135A839",0x1B49],
- ["8135A930",0x1B4A],
- ["8135A931",0x1B4B],
- ["8135A932",0x1B4C],
- ["8135A933",0x1B4D],
- ["8135A934",0x1B4E],
- ["8135A935",0x1B4F],
- ["8135A936",0x1B50],
- ["8135A937",0x1B51],
- ["8135A938",0x1B52],
- ["8135A939",0x1B53],
- ["8135AA30",0x1B54],
- ["8135AA31",0x1B55],
- ["8135AA32",0x1B56],
- ["8135AA33",0x1B57],
- ["8135AA34",0x1B58],
- ["8135AA35",0x1B59],
- ["8135AA36",0x1B5A],
- ["8135AA37",0x1B5B],
- ["8135AA38",0x1B5C],
- ["8135AA39",0x1B5D],
- ["8135AB30",0x1B5E],
- ["8135AB31",0x1B5F],
- ["8135AB32",0x1B60],
- ["8135AB33",0x1B61],
- ["8135AB34",0x1B62],
- ["8135AB35",0x1B63],
- ["8135AB36",0x1B64],
- ["8135AB37",0x1B65],
- ["8135AB38",0x1B66],
- ["8135AB39",0x1B67],
- ["8135AC30",0x1B68],
- ["8135AC31",0x1B69],
- ["8135AC32",0x1B6A],
- ["8135AC33",0x1B6B],
- ["8135AC34",0x1B6C],
- ["8135AC35",0x1B6D],
- ["8135AC36",0x1B6E],
- ["8135AC37",0x1B6F],
- ["8135AC38",0x1B70],
- ["8135AC39",0x1B71],
- ["8135AD30",0x1B72],
- ["8135AD31",0x1B73],
- ["8135AD32",0x1B74],
- ["8135AD33",0x1B75],
- ["8135AD34",0x1B76],
- ["8135AD35",0x1B77],
- ["8135AD36",0x1B78],
- ["8135AD37",0x1B79],
- ["8135AD38",0x1B7A],
- ["8135AD39",0x1B7B],
- ["8135AE30",0x1B7C],
- ["8135AE31",0x1B7D],
- ["8135AE32",0x1B7E],
- ["8135AE33",0x1B7F],
- ["8135AE34",0x1B80],
- ["8135AE35",0x1B81],
- ["8135AE36",0x1B82],
- ["8135AE37",0x1B83],
- ["8135AE38",0x1B84],
- ["8135AE39",0x1B85],
- ["8135AF30",0x1B86],
- ["8135AF31",0x1B87],
- ["8135AF32",0x1B88],
- ["8135AF33",0x1B89],
- ["8135AF34",0x1B8A],
- ["8135AF35",0x1B8B],
- ["8135AF36",0x1B8C],
- ["8135AF37",0x1B8D],
- ["8135AF38",0x1B8E],
- ["8135AF39",0x1B8F],
- ["8135B030",0x1B90],
- ["8135B031",0x1B91],
- ["8135B032",0x1B92],
- ["8135B033",0x1B93],
- ["8135B034",0x1B94],
- ["8135B035",0x1B95],
- ["8135B036",0x1B96],
- ["8135B037",0x1B97],
- ["8135B038",0x1B98],
- ["8135B039",0x1B99],
- ["8135B130",0x1B9A],
- ["8135B131",0x1B9B],
- ["8135B132",0x1B9C],
- ["8135B133",0x1B9D],
- ["8135B134",0x1B9E],
- ["8135B135",0x1B9F],
- ["8135B136",0x1BA0],
- ["8135B137",0x1BA1],
- ["8135B138",0x1BA2],
- ["8135B139",0x1BA3],
- ["8135B230",0x1BA4],
- ["8135B231",0x1BA5],
- ["8135B232",0x1BA6],
- ["8135B233",0x1BA7],
- ["8135B234",0x1BA8],
- ["8135B235",0x1BA9],
- ["8135B236",0x1BAA],
- ["8135B237",0x1BAB],
- ["8135B238",0x1BAC],
- ["8135B239",0x1BAD],
- ["8135B330",0x1BAE],
- ["8135B331",0x1BAF],
- ["8135B332",0x1BB0],
- ["8135B333",0x1BB1],
- ["8135B334",0x1BB2],
- ["8135B335",0x1BB3],
- ["8135B336",0x1BB4],
- ["8135B337",0x1BB5],
- ["8135B338",0x1BB6],
- ["8135B339",0x1BB7],
- ["8135B430",0x1BB8],
- ["8135B431",0x1BB9],
- ["8135B432",0x1BBA],
- ["8135B433",0x1BBB],
- ["8135B434",0x1BBC],
- ["8135B435",0x1BBD],
- ["8135B436",0x1BBE],
- ["8135B437",0x1BBF],
- ["8135B438",0x1BC0],
- ["8135B439",0x1BC1],
- ["8135B530",0x1BC2],
- ["8135B531",0x1BC3],
- ["8135B532",0x1BC4],
- ["8135B533",0x1BC5],
- ["8135B534",0x1BC6],
- ["8135B535",0x1BC7],
- ["8135B536",0x1BC8],
- ["8135B537",0x1BC9],
- ["8135B538",0x1BCA],
- ["8135B539",0x1BCB],
- ["8135B630",0x1BCC],
- ["8135B631",0x1BCD],
- ["8135B632",0x1BCE],
- ["8135B633",0x1BCF],
- ["8135B634",0x1BD0],
- ["8135B635",0x1BD1],
- ["8135B636",0x1BD2],
- ["8135B637",0x1BD3],
- ["8135B638",0x1BD4],
- ["8135B639",0x1BD5],
- ["8135B730",0x1BD6],
- ["8135B731",0x1BD7],
- ["8135B732",0x1BD8],
- ["8135B733",0x1BD9],
- ["8135B734",0x1BDA],
- ["8135B735",0x1BDB],
- ["8135B736",0x1BDC],
- ["8135B737",0x1BDD],
- ["8135B738",0x1BDE],
- ["8135B739",0x1BDF],
- ["8135B830",0x1BE0],
- ["8135B831",0x1BE1],
- ["8135B832",0x1BE2],
- ["8135B833",0x1BE3],
- ["8135B834",0x1BE4],
- ["8135B835",0x1BE5],
- ["8135B836",0x1BE6],
- ["8135B837",0x1BE7],
- ["8135B838",0x1BE8],
- ["8135B839",0x1BE9],
- ["8135B930",0x1BEA],
- ["8135B931",0x1BEB],
- ["8135B932",0x1BEC],
- ["8135B933",0x1BED],
- ["8135B934",0x1BEE],
- ["8135B935",0x1BEF],
- ["8135B936",0x1BF0],
- ["8135B937",0x1BF1],
- ["8135B938",0x1BF2],
- ["8135B939",0x1BF3],
- ["8135BA30",0x1BF4],
- ["8135BA31",0x1BF5],
- ["8135BA32",0x1BF6],
- ["8135BA33",0x1BF7],
- ["8135BA34",0x1BF8],
- ["8135BA35",0x1BF9],
- ["8135BA36",0x1BFA],
- ["8135BA37",0x1BFB],
- ["8135BA38",0x1BFC],
- ["8135BA39",0x1BFD],
- ["8135BB30",0x1BFE],
- ["8135BB31",0x1BFF],
- ["8135BB32",0x1C00],
- ["8135BB33",0x1C01],
- ["8135BB34",0x1C02],
- ["8135BB35",0x1C03],
- ["8135BB36",0x1C04],
- ["8135BB37",0x1C05],
- ["8135BB38",0x1C06],
- ["8135BB39",0x1C07],
- ["8135BC30",0x1C08],
- ["8135BC31",0x1C09],
- ["8135BC32",0x1C0A],
- ["8135BC33",0x1C0B],
- ["8135BC34",0x1C0C],
- ["8135BC35",0x1C0D],
- ["8135BC36",0x1C0E],
- ["8135BC37",0x1C0F],
- ["8135BC38",0x1C10],
- ["8135BC39",0x1C11],
- ["8135BD30",0x1C12],
- ["8135BD31",0x1C13],
- ["8135BD32",0x1C14],
- ["8135BD33",0x1C15],
- ["8135BD34",0x1C16],
- ["8135BD35",0x1C17],
- ["8135BD36",0x1C18],
- ["8135BD37",0x1C19],
- ["8135BD38",0x1C1A],
- ["8135BD39",0x1C1B],
- ["8135BE30",0x1C1C],
- ["8135BE31",0x1C1D],
- ["8135BE32",0x1C1E],
- ["8135BE33",0x1C1F],
- ["8135BE34",0x1C20],
- ["8135BE35",0x1C21],
- ["8135BE36",0x1C22],
- ["8135BE37",0x1C23],
- ["8135BE38",0x1C24],
- ["8135BE39",0x1C25],
- ["8135BF30",0x1C26],
- ["8135BF31",0x1C27],
- ["8135BF32",0x1C28],
- ["8135BF33",0x1C29],
- ["8135BF34",0x1C2A],
- ["8135BF35",0x1C2B],
- ["8135BF36",0x1C2C],
- ["8135BF37",0x1C2D],
- ["8135BF38",0x1C2E],
- ["8135BF39",0x1C2F],
- ["8135C030",0x1C30],
- ["8135C031",0x1C31],
- ["8135C032",0x1C32],
- ["8135C033",0x1C33],
- ["8135C034",0x1C34],
- ["8135C035",0x1C35],
- ["8135C036",0x1C36],
- ["8135C037",0x1C37],
- ["8135C038",0x1C38],
- ["8135C039",0x1C39],
- ["8135C130",0x1C3A],
- ["8135C131",0x1C3B],
- ["8135C132",0x1C3C],
- ["8135C133",0x1C3D],
- ["8135C134",0x1C3E],
- ["8135C135",0x1C3F],
- ["8135C136",0x1C40],
- ["8135C137",0x1C41],
- ["8135C138",0x1C42],
- ["8135C139",0x1C43],
- ["8135C230",0x1C44],
- ["8135C231",0x1C45],
- ["8135C232",0x1C46],
- ["8135C233",0x1C47],
- ["8135C234",0x1C48],
- ["8135C235",0x1C49],
- ["8135C236",0x1C4A],
- ["8135C237",0x1C4B],
- ["8135C238",0x1C4C],
- ["8135C239",0x1C4D],
- ["8135C330",0x1C4E],
- ["8135C331",0x1C4F],
- ["8135C332",0x1C50],
- ["8135C333",0x1C51],
- ["8135C334",0x1C52],
- ["8135C335",0x1C53],
- ["8135C336",0x1C54],
- ["8135C337",0x1C55],
- ["8135C338",0x1C56],
- ["8135C339",0x1C57],
- ["8135C430",0x1C58],
- ["8135C431",0x1C59],
- ["8135C432",0x1C5A],
- ["8135C433",0x1C5B],
- ["8135C434",0x1C5C],
- ["8135C435",0x1C5D],
- ["8135C436",0x1C5E],
- ["8135C437",0x1C5F],
- ["8135C438",0x1C60],
- ["8135C439",0x1C61],
- ["8135C530",0x1C62],
- ["8135C531",0x1C63],
- ["8135C532",0x1C64],
- ["8135C533",0x1C65],
- ["8135C534",0x1C66],
- ["8135C535",0x1C67],
- ["8135C536",0x1C68],
- ["8135C537",0x1C69],
- ["8135C538",0x1C6A],
- ["8135C539",0x1C6B],
- ["8135C630",0x1C6C],
- ["8135C631",0x1C6D],
- ["8135C632",0x1C6E],
- ["8135C633",0x1C6F],
- ["8135C634",0x1C70],
- ["8135C635",0x1C71],
- ["8135C636",0x1C72],
- ["8135C637",0x1C73],
- ["8135C638",0x1C74],
- ["8135C639",0x1C75],
- ["8135C730",0x1C76],
- ["8135C731",0x1C77],
- ["8135C732",0x1C78],
- ["8135C733",0x1C79],
- ["8135C734",0x1C7A],
- ["8135C735",0x1C7B],
- ["8135C736",0x1C7C],
- ["8135C737",0x1C7D],
- ["8135C738",0x1C7E],
- ["8135C739",0x1C7F],
- ["8135C830",0x1C80],
- ["8135C831",0x1C81],
- ["8135C832",0x1C82],
- ["8135C833",0x1C83],
- ["8135C834",0x1C84],
- ["8135C835",0x1C85],
- ["8135C836",0x1C86],
- ["8135C837",0x1C87],
- ["8135C838",0x1C88],
- ["8135C839",0x1C89],
- ["8135C930",0x1C8A],
- ["8135C931",0x1C8B],
- ["8135C932",0x1C8C],
- ["8135C933",0x1C8D],
- ["8135C934",0x1C8E],
- ["8135C935",0x1C8F],
- ["8135C936",0x1C90],
- ["8135C937",0x1C91],
- ["8135C938",0x1C92],
- ["8135C939",0x1C93],
- ["8135CA30",0x1C94],
- ["8135CA31",0x1C95],
- ["8135CA32",0x1C96],
- ["8135CA33",0x1C97],
- ["8135CA34",0x1C98],
- ["8135CA35",0x1C99],
- ["8135CA36",0x1C9A],
- ["8135CA37",0x1C9B],
- ["8135CA38",0x1C9C],
- ["8135CA39",0x1C9D],
- ["8135CB30",0x1C9E],
- ["8135CB31",0x1C9F],
- ["8135CB32",0x1CA0],
- ["8135CB33",0x1CA1],
- ["8135CB34",0x1CA2],
- ["8135CB35",0x1CA3],
- ["8135CB36",0x1CA4],
- ["8135CB37",0x1CA5],
- ["8135CB38",0x1CA6],
- ["8135CB39",0x1CA7],
- ["8135CC30",0x1CA8],
- ["8135CC31",0x1CA9],
- ["8135CC32",0x1CAA],
- ["8135CC33",0x1CAB],
- ["8135CC34",0x1CAC],
- ["8135CC35",0x1CAD],
- ["8135CC36",0x1CAE],
- ["8135CC37",0x1CAF],
- ["8135CC38",0x1CB0],
- ["8135CC39",0x1CB1],
- ["8135CD30",0x1CB2],
- ["8135CD31",0x1CB3],
- ["8135CD32",0x1CB4],
- ["8135CD33",0x1CB5],
- ["8135CD34",0x1CB6],
- ["8135CD35",0x1CB7],
- ["8135CD36",0x1CB8],
- ["8135CD37",0x1CB9],
- ["8135CD38",0x1CBA],
- ["8135CD39",0x1CBB],
- ["8135CE30",0x1CBC],
- ["8135CE31",0x1CBD],
- ["8135CE32",0x1CBE],
- ["8135CE33",0x1CBF],
- ["8135CE34",0x1CC0],
- ["8135CE35",0x1CC1],
- ["8135CE36",0x1CC2],
- ["8135CE37",0x1CC3],
- ["8135CE38",0x1CC4],
- ["8135CE39",0x1CC5],
- ["8135CF30",0x1CC6],
- ["8135CF31",0x1CC7],
- ["8135CF32",0x1CC8],
- ["8135CF33",0x1CC9],
- ["8135CF34",0x1CCA],
- ["8135CF35",0x1CCB],
- ["8135CF36",0x1CCC],
- ["8135CF37",0x1CCD],
- ["8135CF38",0x1CCE],
- ["8135CF39",0x1CCF],
- ["8135D030",0x1CD0],
- ["8135D031",0x1CD1],
- ["8135D032",0x1CD2],
- ["8135D033",0x1CD3],
- ["8135D034",0x1CD4],
- ["8135D035",0x1CD5],
- ["8135D036",0x1CD6],
- ["8135D037",0x1CD7],
- ["8135D038",0x1CD8],
- ["8135D039",0x1CD9],
- ["8135D130",0x1CDA],
- ["8135D131",0x1CDB],
- ["8135D132",0x1CDC],
- ["8135D133",0x1CDD],
- ["8135D134",0x1CDE],
- ["8135D135",0x1CDF],
- ["8135D136",0x1CE0],
- ["8135D137",0x1CE1],
- ["8135D138",0x1CE2],
- ["8135D139",0x1CE3],
- ["8135D230",0x1CE4],
- ["8135D231",0x1CE5],
- ["8135D232",0x1CE6],
- ["8135D233",0x1CE7],
- ["8135D234",0x1CE8],
- ["8135D235",0x1CE9],
- ["8135D236",0x1CEA],
- ["8135D237",0x1CEB],
- ["8135D238",0x1CEC],
- ["8135D239",0x1CED],
- ["8135D330",0x1CEE],
- ["8135D331",0x1CEF],
- ["8135D332",0x1CF0],
- ["8135D333",0x1CF1],
- ["8135D334",0x1CF2],
- ["8135D335",0x1CF3],
- ["8135D336",0x1CF4],
- ["8135D337",0x1CF5],
- ["8135D338",0x1CF6],
- ["8135D339",0x1CF7],
- ["8135D430",0x1CF8],
- ["8135D431",0x1CF9],
- ["8135D432",0x1CFA],
- ["8135D433",0x1CFB],
- ["8135D434",0x1CFC],
- ["8135D435",0x1CFD],
- ["8135D436",0x1CFE],
- ["8135D437",0x1CFF],
- ["8135D438",0x1D00],
- ["8135D439",0x1D01],
- ["8135D530",0x1D02],
- ["8135D531",0x1D03],
- ["8135D532",0x1D04],
- ["8135D533",0x1D05],
- ["8135D534",0x1D06],
- ["8135D535",0x1D07],
- ["8135D536",0x1D08],
- ["8135D537",0x1D09],
- ["8135D538",0x1D0A],
- ["8135D539",0x1D0B],
- ["8135D630",0x1D0C],
- ["8135D631",0x1D0D],
- ["8135D632",0x1D0E],
- ["8135D633",0x1D0F],
- ["8135D634",0x1D10],
- ["8135D635",0x1D11],
- ["8135D636",0x1D12],
- ["8135D637",0x1D13],
- ["8135D638",0x1D14],
- ["8135D639",0x1D15],
- ["8135D730",0x1D16],
- ["8135D731",0x1D17],
- ["8135D732",0x1D18],
- ["8135D733",0x1D19],
- ["8135D734",0x1D1A],
- ["8135D735",0x1D1B],
- ["8135D736",0x1D1C],
- ["8135D737",0x1D1D],
- ["8135D738",0x1D1E],
- ["8135D739",0x1D1F],
- ["8135D830",0x1D20],
- ["8135D831",0x1D21],
- ["8135D832",0x1D22],
- ["8135D833",0x1D23],
- ["8135D834",0x1D24],
- ["8135D835",0x1D25],
- ["8135D836",0x1D26],
- ["8135D837",0x1D27],
- ["8135D838",0x1D28],
- ["8135D839",0x1D29],
- ["8135D930",0x1D2A],
- ["8135D931",0x1D2B],
- ["8135D932",0x1D2C],
- ["8135D933",0x1D2D],
- ["8135D934",0x1D2E],
- ["8135D935",0x1D2F],
- ["8135D936",0x1D30],
- ["8135D937",0x1D31],
- ["8135D938",0x1D32],
- ["8135D939",0x1D33],
- ["8135DA30",0x1D34],
- ["8135DA31",0x1D35],
- ["8135DA32",0x1D36],
- ["8135DA33",0x1D37],
- ["8135DA34",0x1D38],
- ["8135DA35",0x1D39],
- ["8135DA36",0x1D3A],
- ["8135DA37",0x1D3B],
- ["8135DA38",0x1D3C],
- ["8135DA39",0x1D3D],
- ["8135DB30",0x1D3E],
- ["8135DB31",0x1D3F],
- ["8135DB32",0x1D40],
- ["8135DB33",0x1D41],
- ["8135DB34",0x1D42],
- ["8135DB35",0x1D43],
- ["8135DB36",0x1D44],
- ["8135DB37",0x1D45],
- ["8135DB38",0x1D46],
- ["8135DB39",0x1D47],
- ["8135DC30",0x1D48],
- ["8135DC31",0x1D49],
- ["8135DC32",0x1D4A],
- ["8135DC33",0x1D4B],
- ["8135DC34",0x1D4C],
- ["8135DC35",0x1D4D],
- ["8135DC36",0x1D4E],
- ["8135DC37",0x1D4F],
- ["8135DC38",0x1D50],
- ["8135DC39",0x1D51],
- ["8135DD30",0x1D52],
- ["8135DD31",0x1D53],
- ["8135DD32",0x1D54],
- ["8135DD33",0x1D55],
- ["8135DD34",0x1D56],
- ["8135DD35",0x1D57],
- ["8135DD36",0x1D58],
- ["8135DD37",0x1D59],
- ["8135DD38",0x1D5A],
- ["8135DD39",0x1D5B],
- ["8135DE30",0x1D5C],
- ["8135DE31",0x1D5D],
- ["8135DE32",0x1D5E],
- ["8135DE33",0x1D5F],
- ["8135DE34",0x1D60],
- ["8135DE35",0x1D61],
- ["8135DE36",0x1D62],
- ["8135DE37",0x1D63],
- ["8135DE38",0x1D64],
- ["8135DE39",0x1D65],
- ["8135DF30",0x1D66],
- ["8135DF31",0x1D67],
- ["8135DF32",0x1D68],
- ["8135DF33",0x1D69],
- ["8135DF34",0x1D6A],
- ["8135DF35",0x1D6B],
- ["8135DF36",0x1D6C],
- ["8135DF37",0x1D6D],
- ["8135DF38",0x1D6E],
- ["8135DF39",0x1D6F],
- ["8135E030",0x1D70],
- ["8135E031",0x1D71],
- ["8135E032",0x1D72],
- ["8135E033",0x1D73],
- ["8135E034",0x1D74],
- ["8135E035",0x1D75],
- ["8135E036",0x1D76],
- ["8135E037",0x1D77],
- ["8135E038",0x1D78],
- ["8135E039",0x1D79],
- ["8135E130",0x1D7A],
- ["8135E131",0x1D7B],
- ["8135E132",0x1D7C],
- ["8135E133",0x1D7D],
- ["8135E134",0x1D7E],
- ["8135E135",0x1D7F],
- ["8135E136",0x1D80],
- ["8135E137",0x1D81],
- ["8135E138",0x1D82],
- ["8135E139",0x1D83],
- ["8135E230",0x1D84],
- ["8135E231",0x1D85],
- ["8135E232",0x1D86],
- ["8135E233",0x1D87],
- ["8135E234",0x1D88],
- ["8135E235",0x1D89],
- ["8135E236",0x1D8A],
- ["8135E237",0x1D8B],
- ["8135E238",0x1D8C],
- ["8135E239",0x1D8D],
- ["8135E330",0x1D8E],
- ["8135E331",0x1D8F],
- ["8135E332",0x1D90],
- ["8135E333",0x1D91],
- ["8135E334",0x1D92],
- ["8135E335",0x1D93],
- ["8135E336",0x1D94],
- ["8135E337",0x1D95],
- ["8135E338",0x1D96],
- ["8135E339",0x1D97],
- ["8135E430",0x1D98],
- ["8135E431",0x1D99],
- ["8135E432",0x1D9A],
- ["8135E433",0x1D9B],
- ["8135E434",0x1D9C],
- ["8135E435",0x1D9D],
- ["8135E436",0x1D9E],
- ["8135E437",0x1D9F],
- ["8135E438",0x1DA0],
- ["8135E439",0x1DA1],
- ["8135E530",0x1DA2],
- ["8135E531",0x1DA3],
- ["8135E532",0x1DA4],
- ["8135E533",0x1DA5],
- ["8135E534",0x1DA6],
- ["8135E535",0x1DA7],
- ["8135E536",0x1DA8],
- ["8135E537",0x1DA9],
- ["8135E538",0x1DAA],
- ["8135E539",0x1DAB],
- ["8135E630",0x1DAC],
- ["8135E631",0x1DAD],
- ["8135E632",0x1DAE],
- ["8135E633",0x1DAF],
- ["8135E634",0x1DB0],
- ["8135E635",0x1DB1],
- ["8135E636",0x1DB2],
- ["8135E637",0x1DB3],
- ["8135E638",0x1DB4],
- ["8135E639",0x1DB5],
- ["8135E730",0x1DB6],
- ["8135E731",0x1DB7],
- ["8135E732",0x1DB8],
- ["8135E733",0x1DB9],
- ["8135E734",0x1DBA],
- ["8135E735",0x1DBB],
- ["8135E736",0x1DBC],
- ["8135E737",0x1DBD],
- ["8135E738",0x1DBE],
- ["8135E739",0x1DBF],
- ["8135E830",0x1DC0],
- ["8135E831",0x1DC1],
- ["8135E832",0x1DC2],
- ["8135E833",0x1DC3],
- ["8135E834",0x1DC4],
- ["8135E835",0x1DC5],
- ["8135E836",0x1DC6],
- ["8135E837",0x1DC7],
- ["8135E838",0x1DC8],
- ["8135E839",0x1DC9],
- ["8135E930",0x1DCA],
- ["8135E931",0x1DCB],
- ["8135E932",0x1DCC],
- ["8135E933",0x1DCD],
- ["8135E934",0x1DCE],
- ["8135E935",0x1DCF],
- ["8135E936",0x1DD0],
- ["8135E937",0x1DD1],
- ["8135E938",0x1DD2],
- ["8135E939",0x1DD3],
- ["8135EA30",0x1DD4],
- ["8135EA31",0x1DD5],
- ["8135EA32",0x1DD6],
- ["8135EA33",0x1DD7],
- ["8135EA34",0x1DD8],
- ["8135EA35",0x1DD9],
- ["8135EA36",0x1DDA],
- ["8135EA37",0x1DDB],
- ["8135EA38",0x1DDC],
- ["8135EA39",0x1DDD],
- ["8135EB30",0x1DDE],
- ["8135EB31",0x1DDF],
- ["8135EB32",0x1DE0],
- ["8135EB33",0x1DE1],
- ["8135EB34",0x1DE2],
- ["8135EB35",0x1DE3],
- ["8135EB36",0x1DE4],
- ["8135EB37",0x1DE5],
- ["8135EB38",0x1DE6],
- ["8135EB39",0x1DE7],
- ["8135EC30",0x1DE8],
- ["8135EC31",0x1DE9],
- ["8135EC32",0x1DEA],
- ["8135EC33",0x1DEB],
- ["8135EC34",0x1DEC],
- ["8135EC35",0x1DED],
- ["8135EC36",0x1DEE],
- ["8135EC37",0x1DEF],
- ["8135EC38",0x1DF0],
- ["8135EC39",0x1DF1],
- ["8135ED30",0x1DF2],
- ["8135ED31",0x1DF3],
- ["8135ED32",0x1DF4],
- ["8135ED33",0x1DF5],
- ["8135ED34",0x1DF6],
- ["8135ED35",0x1DF7],
- ["8135ED36",0x1DF8],
- ["8135ED37",0x1DF9],
- ["8135ED38",0x1DFA],
- ["8135ED39",0x1DFB],
- ["8135EE30",0x1DFC],
- ["8135EE31",0x1DFD],
- ["8135EE32",0x1DFE],
- ["8135EE33",0x1DFF],
- ["8135EE34",0x1E00],
- ["8135EE35",0x1E01],
- ["8135EE36",0x1E02],
- ["8135EE37",0x1E03],
- ["8135EE38",0x1E04],
- ["8135EE39",0x1E05],
- ["8135EF30",0x1E06],
- ["8135EF31",0x1E07],
- ["8135EF32",0x1E08],
- ["8135EF33",0x1E09],
- ["8135EF34",0x1E0A],
- ["8135EF35",0x1E0B],
- ["8135EF36",0x1E0C],
- ["8135EF37",0x1E0D],
- ["8135EF38",0x1E0E],
- ["8135EF39",0x1E0F],
- ["8135F030",0x1E10],
- ["8135F031",0x1E11],
- ["8135F032",0x1E12],
- ["8135F033",0x1E13],
- ["8135F034",0x1E14],
- ["8135F035",0x1E15],
- ["8135F036",0x1E16],
- ["8135F037",0x1E17],
- ["8135F038",0x1E18],
- ["8135F039",0x1E19],
- ["8135F130",0x1E1A],
- ["8135F131",0x1E1B],
- ["8135F132",0x1E1C],
- ["8135F133",0x1E1D],
- ["8135F134",0x1E1E],
- ["8135F135",0x1E1F],
- ["8135F136",0x1E20],
- ["8135F137",0x1E21],
- ["8135F138",0x1E22],
- ["8135F139",0x1E23],
- ["8135F230",0x1E24],
- ["8135F231",0x1E25],
- ["8135F232",0x1E26],
- ["8135F233",0x1E27],
- ["8135F234",0x1E28],
- ["8135F235",0x1E29],
- ["8135F236",0x1E2A],
- ["8135F237",0x1E2B],
- ["8135F238",0x1E2C],
- ["8135F239",0x1E2D],
- ["8135F330",0x1E2E],
- ["8135F331",0x1E2F],
- ["8135F332",0x1E30],
- ["8135F333",0x1E31],
- ["8135F334",0x1E32],
- ["8135F335",0x1E33],
- ["8135F336",0x1E34],
- ["8135F337",0x1E35],
- ["8135F338",0x1E36],
- ["8135F339",0x1E37],
- ["8135F430",0x1E38],
- ["8135F431",0x1E39],
- ["8135F432",0x1E3A],
- ["8135F433",0x1E3B],
- ["8135F434",0x1E3C],
- ["8135F435",0x1E3D],
- ["8135F436",0x1E3E],
- ["8135F437",0x1E3F],
- ["8135F438",0x1E40],
- ["8135F439",0x1E41],
- ["8135F530",0x1E42],
- ["8135F531",0x1E43],
- ["8135F532",0x1E44],
- ["8135F533",0x1E45],
- ["8135F534",0x1E46],
- ["8135F535",0x1E47],
- ["8135F536",0x1E48],
- ["8135F537",0x1E49],
- ["8135F538",0x1E4A],
- ["8135F539",0x1E4B],
- ["8135F630",0x1E4C],
- ["8135F631",0x1E4D],
- ["8135F632",0x1E4E],
- ["8135F633",0x1E4F],
- ["8135F634",0x1E50],
- ["8135F635",0x1E51],
- ["8135F636",0x1E52],
- ["8135F637",0x1E53],
- ["8135F638",0x1E54],
- ["8135F639",0x1E55],
- ["8135F730",0x1E56],
- ["8135F731",0x1E57],
- ["8135F732",0x1E58],
- ["8135F733",0x1E59],
- ["8135F734",0x1E5A],
- ["8135F735",0x1E5B],
- ["8135F736",0x1E5C],
- ["8135F737",0x1E5D],
- ["8135F738",0x1E5E],
- ["8135F739",0x1E5F],
- ["8135F830",0x1E60],
- ["8135F831",0x1E61],
- ["8135F832",0x1E62],
- ["8135F833",0x1E63],
- ["8135F834",0x1E64],
- ["8135F835",0x1E65],
- ["8135F836",0x1E66],
- ["8135F837",0x1E67],
- ["8135F838",0x1E68],
- ["8135F839",0x1E69],
- ["8135F930",0x1E6A],
- ["8135F931",0x1E6B],
- ["8135F932",0x1E6C],
- ["8135F933",0x1E6D],
- ["8135F934",0x1E6E],
- ["8135F935",0x1E6F],
- ["8135F936",0x1E70],
- ["8135F937",0x1E71],
- ["8135F938",0x1E72],
- ["8135F939",0x1E73],
- ["8135FA30",0x1E74],
- ["8135FA31",0x1E75],
- ["8135FA32",0x1E76],
- ["8135FA33",0x1E77],
- ["8135FA34",0x1E78],
- ["8135FA35",0x1E79],
- ["8135FA36",0x1E7A],
- ["8135FA37",0x1E7B],
- ["8135FA38",0x1E7C],
- ["8135FA39",0x1E7D],
- ["8135FB30",0x1E7E],
- ["8135FB31",0x1E7F],
- ["8135FB32",0x1E80],
- ["8135FB33",0x1E81],
- ["8135FB34",0x1E82],
- ["8135FB35",0x1E83],
- ["8135FB36",0x1E84],
- ["8135FB37",0x1E85],
- ["8135FB38",0x1E86],
- ["8135FB39",0x1E87],
- ["8135FC30",0x1E88],
- ["8135FC31",0x1E89],
- ["8135FC32",0x1E8A],
- ["8135FC33",0x1E8B],
- ["8135FC34",0x1E8C],
- ["8135FC35",0x1E8D],
- ["8135FC36",0x1E8E],
- ["8135FC37",0x1E8F],
- ["8135FC38",0x1E90],
- ["8135FC39",0x1E91],
- ["8135FD30",0x1E92],
- ["8135FD31",0x1E93],
- ["8135FD32",0x1E94],
- ["8135FD33",0x1E95],
- ["8135FD34",0x1E96],
- ["8135FD35",0x1E97],
- ["8135FD36",0x1E98],
- ["8135FD37",0x1E99],
- ["8135FD38",0x1E9A],
- ["8135FD39",0x1E9B],
- ["8135FE30",0x1E9C],
- ["8135FE31",0x1E9D],
- ["8135FE32",0x1E9E],
- ["8135FE33",0x1E9F],
- ["8135FE34",0x1EA0],
- ["8135FE35",0x1EA1],
- ["8135FE36",0x1EA2],
- ["8135FE37",0x1EA3],
- ["8135FE38",0x1EA4],
- ["8135FE39",0x1EA5],
- ["81368130",0x1EA6],
- ["81368131",0x1EA7],
- ["81368132",0x1EA8],
- ["81368133",0x1EA9],
- ["81368134",0x1EAA],
- ["81368135",0x1EAB],
- ["81368136",0x1EAC],
- ["81368137",0x1EAD],
- ["81368138",0x1EAE],
- ["81368139",0x1EAF],
- ["81368230",0x1EB0],
- ["81368231",0x1EB1],
- ["81368232",0x1EB2],
- ["81368233",0x1EB3],
- ["81368234",0x1EB4],
- ["81368235",0x1EB5],
- ["81368236",0x1EB6],
- ["81368237",0x1EB7],
- ["81368238",0x1EB8],
- ["81368239",0x1EB9],
- ["81368330",0x1EBA],
- ["81368331",0x1EBB],
- ["81368332",0x1EBC],
- ["81368333",0x1EBD],
- ["81368334",0x1EBE],
- ["81368335",0x1EBF],
- ["81368336",0x1EC0],
- ["81368337",0x1EC1],
- ["81368338",0x1EC2],
- ["81368339",0x1EC3],
- ["81368430",0x1EC4],
- ["81368431",0x1EC5],
- ["81368432",0x1EC6],
- ["81368433",0x1EC7],
- ["81368434",0x1EC8],
- ["81368435",0x1EC9],
- ["81368436",0x1ECA],
- ["81368437",0x1ECB],
- ["81368438",0x1ECC],
- ["81368439",0x1ECD],
- ["81368530",0x1ECE],
- ["81368531",0x1ECF],
- ["81368532",0x1ED0],
- ["81368533",0x1ED1],
- ["81368534",0x1ED2],
- ["81368535",0x1ED3],
- ["81368536",0x1ED4],
- ["81368537",0x1ED5],
- ["81368538",0x1ED6],
- ["81368539",0x1ED7],
- ["81368630",0x1ED8],
- ["81368631",0x1ED9],
- ["81368632",0x1EDA],
- ["81368633",0x1EDB],
- ["81368634",0x1EDC],
- ["81368635",0x1EDD],
- ["81368636",0x1EDE],
- ["81368637",0x1EDF],
- ["81368638",0x1EE0],
- ["81368639",0x1EE1],
- ["81368730",0x1EE2],
- ["81368731",0x1EE3],
- ["81368732",0x1EE4],
- ["81368733",0x1EE5],
- ["81368734",0x1EE6],
- ["81368735",0x1EE7],
- ["81368736",0x1EE8],
- ["81368737",0x1EE9],
- ["81368738",0x1EEA],
- ["81368739",0x1EEB],
- ["81368830",0x1EEC],
- ["81368831",0x1EED],
- ["81368832",0x1EEE],
- ["81368833",0x1EEF],
- ["81368834",0x1EF0],
- ["81368835",0x1EF1],
- ["81368836",0x1EF2],
- ["81368837",0x1EF3],
- ["81368838",0x1EF4],
- ["81368839",0x1EF5],
- ["81368930",0x1EF6],
- ["81368931",0x1EF7],
- ["81368932",0x1EF8],
- ["81368933",0x1EF9],
- ["81368934",0x1EFA],
- ["81368935",0x1EFB],
- ["81368936",0x1EFC],
- ["81368937",0x1EFD],
- ["81368938",0x1EFE],
- ["81368939",0x1EFF],
- ["81368A30",0x1F00],
- ["81368A31",0x1F01],
- ["81368A32",0x1F02],
- ["81368A33",0x1F03],
- ["81368A34",0x1F04],
- ["81368A35",0x1F05],
- ["81368A36",0x1F06],
- ["81368A37",0x1F07],
- ["81368A38",0x1F08],
- ["81368A39",0x1F09],
- ["81368B30",0x1F0A],
- ["81368B31",0x1F0B],
- ["81368B32",0x1F0C],
- ["81368B33",0x1F0D],
- ["81368B34",0x1F0E],
- ["81368B35",0x1F0F],
- ["81368B36",0x1F10],
- ["81368B37",0x1F11],
- ["81368B38",0x1F12],
- ["81368B39",0x1F13],
- ["81368C30",0x1F14],
- ["81368C31",0x1F15],
- ["81368C32",0x1F16],
- ["81368C33",0x1F17],
- ["81368C34",0x1F18],
- ["81368C35",0x1F19],
- ["81368C36",0x1F1A],
- ["81368C37",0x1F1B],
- ["81368C38",0x1F1C],
- ["81368C39",0x1F1D],
- ["81368D30",0x1F1E],
- ["81368D31",0x1F1F],
- ["81368D32",0x1F20],
- ["81368D33",0x1F21],
- ["81368D34",0x1F22],
- ["81368D35",0x1F23],
- ["81368D36",0x1F24],
- ["81368D37",0x1F25],
- ["81368D38",0x1F26],
- ["81368D39",0x1F27],
- ["81368E30",0x1F28],
- ["81368E31",0x1F29],
- ["81368E32",0x1F2A],
- ["81368E33",0x1F2B],
- ["81368E34",0x1F2C],
- ["81368E35",0x1F2D],
- ["81368E36",0x1F2E],
- ["81368E37",0x1F2F],
- ["81368E38",0x1F30],
- ["81368E39",0x1F31],
- ["81368F30",0x1F32],
- ["81368F31",0x1F33],
- ["81368F32",0x1F34],
- ["81368F33",0x1F35],
- ["81368F34",0x1F36],
- ["81368F35",0x1F37],
- ["81368F36",0x1F38],
- ["81368F37",0x1F39],
- ["81368F38",0x1F3A],
- ["81368F39",0x1F3B],
- ["81369030",0x1F3C],
- ["81369031",0x1F3D],
- ["81369032",0x1F3E],
- ["81369033",0x1F3F],
- ["81369034",0x1F40],
- ["81369035",0x1F41],
- ["81369036",0x1F42],
- ["81369037",0x1F43],
- ["81369038",0x1F44],
- ["81369039",0x1F45],
- ["81369130",0x1F46],
- ["81369131",0x1F47],
- ["81369132",0x1F48],
- ["81369133",0x1F49],
- ["81369134",0x1F4A],
- ["81369135",0x1F4B],
- ["81369136",0x1F4C],
- ["81369137",0x1F4D],
- ["81369138",0x1F4E],
- ["81369139",0x1F4F],
- ["81369230",0x1F50],
- ["81369231",0x1F51],
- ["81369232",0x1F52],
- ["81369233",0x1F53],
- ["81369234",0x1F54],
- ["81369235",0x1F55],
- ["81369236",0x1F56],
- ["81369237",0x1F57],
- ["81369238",0x1F58],
- ["81369239",0x1F59],
- ["81369330",0x1F5A],
- ["81369331",0x1F5B],
- ["81369332",0x1F5C],
- ["81369333",0x1F5D],
- ["81369334",0x1F5E],
- ["81369335",0x1F5F],
- ["81369336",0x1F60],
- ["81369337",0x1F61],
- ["81369338",0x1F62],
- ["81369339",0x1F63],
- ["81369430",0x1F64],
- ["81369431",0x1F65],
- ["81369432",0x1F66],
- ["81369433",0x1F67],
- ["81369434",0x1F68],
- ["81369435",0x1F69],
- ["81369436",0x1F6A],
- ["81369437",0x1F6B],
- ["81369438",0x1F6C],
- ["81369439",0x1F6D],
- ["81369530",0x1F6E],
- ["81369531",0x1F6F],
- ["81369532",0x1F70],
- ["81369533",0x1F71],
- ["81369534",0x1F72],
- ["81369535",0x1F73],
- ["81369536",0x1F74],
- ["81369537",0x1F75],
- ["81369538",0x1F76],
- ["81369539",0x1F77],
- ["81369630",0x1F78],
- ["81369631",0x1F79],
- ["81369632",0x1F7A],
- ["81369633",0x1F7B],
- ["81369634",0x1F7C],
- ["81369635",0x1F7D],
- ["81369636",0x1F7E],
- ["81369637",0x1F7F],
- ["81369638",0x1F80],
- ["81369639",0x1F81],
- ["81369730",0x1F82],
- ["81369731",0x1F83],
- ["81369732",0x1F84],
- ["81369733",0x1F85],
- ["81369734",0x1F86],
- ["81369735",0x1F87],
- ["81369736",0x1F88],
- ["81369737",0x1F89],
- ["81369738",0x1F8A],
- ["81369739",0x1F8B],
- ["81369830",0x1F8C],
- ["81369831",0x1F8D],
- ["81369832",0x1F8E],
- ["81369833",0x1F8F],
- ["81369834",0x1F90],
- ["81369835",0x1F91],
- ["81369836",0x1F92],
- ["81369837",0x1F93],
- ["81369838",0x1F94],
- ["81369839",0x1F95],
- ["81369930",0x1F96],
- ["81369931",0x1F97],
- ["81369932",0x1F98],
- ["81369933",0x1F99],
- ["81369934",0x1F9A],
- ["81369935",0x1F9B],
- ["81369936",0x1F9C],
- ["81369937",0x1F9D],
- ["81369938",0x1F9E],
- ["81369939",0x1F9F],
- ["81369A30",0x1FA0],
- ["81369A31",0x1FA1],
- ["81369A32",0x1FA2],
- ["81369A33",0x1FA3],
- ["81369A34",0x1FA4],
- ["81369A35",0x1FA5],
- ["81369A36",0x1FA6],
- ["81369A37",0x1FA7],
- ["81369A38",0x1FA8],
- ["81369A39",0x1FA9],
- ["81369B30",0x1FAA],
- ["81369B31",0x1FAB],
- ["81369B32",0x1FAC],
- ["81369B33",0x1FAD],
- ["81369B34",0x1FAE],
- ["81369B35",0x1FAF],
- ["81369B36",0x1FB0],
- ["81369B37",0x1FB1],
- ["81369B38",0x1FB2],
- ["81369B39",0x1FB3],
- ["81369C30",0x1FB4],
- ["81369C31",0x1FB5],
- ["81369C32",0x1FB6],
- ["81369C33",0x1FB7],
- ["81369C34",0x1FB8],
- ["81369C35",0x1FB9],
- ["81369C36",0x1FBA],
- ["81369C37",0x1FBB],
- ["81369C38",0x1FBC],
- ["81369C39",0x1FBD],
- ["81369D30",0x1FBE],
- ["81369D31",0x1FBF],
- ["81369D32",0x1FC0],
- ["81369D33",0x1FC1],
- ["81369D34",0x1FC2],
- ["81369D35",0x1FC3],
- ["81369D36",0x1FC4],
- ["81369D37",0x1FC5],
- ["81369D38",0x1FC6],
- ["81369D39",0x1FC7],
- ["81369E30",0x1FC8],
- ["81369E31",0x1FC9],
- ["81369E32",0x1FCA],
- ["81369E33",0x1FCB],
- ["81369E34",0x1FCC],
- ["81369E35",0x1FCD],
- ["81369E36",0x1FCE],
- ["81369E37",0x1FCF],
- ["81369E38",0x1FD0],
- ["81369E39",0x1FD1],
- ["81369F30",0x1FD2],
- ["81369F31",0x1FD3],
- ["81369F32",0x1FD4],
- ["81369F33",0x1FD5],
- ["81369F34",0x1FD6],
- ["81369F35",0x1FD7],
- ["81369F36",0x1FD8],
- ["81369F37",0x1FD9],
- ["81369F38",0x1FDA],
- ["81369F39",0x1FDB],
- ["8136A030",0x1FDC],
- ["8136A031",0x1FDD],
- ["8136A032",0x1FDE],
- ["8136A033",0x1FDF],
- ["8136A034",0x1FE0],
- ["8136A035",0x1FE1],
- ["8136A036",0x1FE2],
- ["8136A037",0x1FE3],
- ["8136A038",0x1FE4],
- ["8136A039",0x1FE5],
- ["8136A130",0x1FE6],
- ["8136A131",0x1FE7],
- ["8136A132",0x1FE8],
- ["8136A133",0x1FE9],
- ["8136A134",0x1FEA],
- ["8136A135",0x1FEB],
- ["8136A136",0x1FEC],
- ["8136A137",0x1FED],
- ["8136A138",0x1FEE],
- ["8136A139",0x1FEF],
- ["8136A230",0x1FF0],
- ["8136A231",0x1FF1],
- ["8136A232",0x1FF2],
- ["8136A233",0x1FF3],
- ["8136A234",0x1FF4],
- ["8136A235",0x1FF5],
- ["8136A236",0x1FF6],
- ["8136A237",0x1FF7],
- ["8136A238",0x1FF8],
- ["8136A239",0x1FF9],
- ["8136A330",0x1FFA],
- ["8136A331",0x1FFB],
- ["8136A332",0x1FFC],
- ["8136A333",0x1FFD],
- ["8136A334",0x1FFE],
- ["8136A335",0x1FFF],
- ["8136A336",0x2000],
- ["8136A337",0x2001],
- ["8136A338",0x2002],
- ["8136A339",0x2003],
- ["8136A430",0x2004],
- ["8136A431",0x2005],
- ["8136A432",0x2006],
- ["8136A433",0x2007],
- ["8136A434",0x2008],
- ["8136A435",0x2009],
- ["8136A436",0x200A],
- ["8136A437",0x200B],
- ["8136A438",0x200C],
- ["8136A439",0x200D],
- ["8136A530",0x200E],
- ["8136A531",0x200F],
- ["A95C",0x2010],
- ["8136A532",0x2011],
- ["8136A533",0x2012],
- ["A843",0x2013],
- ["A1AA",0x2014],
- ["A844",0x2015],
- ["A1AC",0x2016],
- ["8136A534",0x2017],
- ["A1AE",0x2018],
- ["A1AF",0x2019],
- ["8136A535",0x201A],
- ["8136A536",0x201B],
- ["A1B0",0x201C],
- ["A1B1",0x201D],
- ["8136A537",0x201E],
- ["8136A538",0x201F],
- ["8136A539",0x2020],
- ["8136A630",0x2021],
- ["8136A631",0x2022],
- ["8136A632",0x2023],
- ["8136A633",0x2024],
- ["A845",0x2025],
- ["A1AD",0x2026],
- ["8136A634",0x2027],
- ["8136A635",0x2028],
- ["8136A636",0x2029],
- ["8136A637",0x202A],
- ["8136A638",0x202B],
- ["8136A639",0x202C],
- ["8136A730",0x202D],
- ["8136A731",0x202E],
- ["8136A732",0x202F],
- ["A1EB",0x2030],
- ["8136A733",0x2031],
- ["A1E4",0x2032],
- ["A1E5",0x2033],
- ["8136A734",0x2034],
- ["A846",0x2035],
- ["8136A735",0x2036],
- ["8136A736",0x2037],
- ["8136A737",0x2038],
- ["8136A738",0x2039],
- ["8136A739",0x203A],
- ["A1F9",0x203B],
- ["8136A830",0x203C],
- ["8136A831",0x203D],
- ["8136A832",0x203E],
- ["8136A833",0x203F],
- ["8136A834",0x2040],
- ["8136A835",0x2041],
- ["8136A836",0x2042],
- ["8136A837",0x2043],
- ["8136A838",0x2044],
- ["8136A839",0x2045],
- ["8136A930",0x2046],
- ["8136A931",0x2047],
- ["8136A932",0x2048],
- ["8136A933",0x2049],
- ["8136A934",0x204A],
- ["8136A935",0x204B],
- ["8136A936",0x204C],
- ["8136A937",0x204D],
- ["8136A938",0x204E],
- ["8136A939",0x204F],
- ["8136AA30",0x2050],
- ["8136AA31",0x2051],
- ["8136AA32",0x2052],
- ["8136AA33",0x2053],
- ["8136AA34",0x2054],
- ["8136AA35",0x2055],
- ["8136AA36",0x2056],
- ["8136AA37",0x2057],
- ["8136AA38",0x2058],
- ["8136AA39",0x2059],
- ["8136AB30",0x205A],
- ["8136AB31",0x205B],
- ["8136AB32",0x205C],
- ["8136AB33",0x205D],
- ["8136AB34",0x205E],
- ["8136AB35",0x205F],
- ["8136AB36",0x2060],
- ["8136AB37",0x2061],
- ["8136AB38",0x2062],
- ["8136AB39",0x2063],
- ["8136AC30",0x2064],
- ["8136AC31",0x2065],
- ["8136AC32",0x2066],
- ["8136AC33",0x2067],
- ["8136AC34",0x2068],
- ["8136AC35",0x2069],
- ["8136AC36",0x206A],
- ["8136AC37",0x206B],
- ["8136AC38",0x206C],
- ["8136AC39",0x206D],
- ["8136AD30",0x206E],
- ["8136AD31",0x206F],
- ["8136AD32",0x2070],
- ["8136AD33",0x2071],
- ["8136AD34",0x2072],
- ["8136AD35",0x2073],
- ["8136AD36",0x2074],
- ["8136AD37",0x2075],
- ["8136AD38",0x2076],
- ["8136AD39",0x2077],
- ["8136AE30",0x2078],
- ["8136AE31",0x2079],
- ["8136AE32",0x207A],
- ["8136AE33",0x207B],
- ["8136AE34",0x207C],
- ["8136AE35",0x207D],
- ["8136AE36",0x207E],
- ["8136AE37",0x207F],
- ["8136AE38",0x2080],
- ["8136AE39",0x2081],
- ["8136AF30",0x2082],
- ["8136AF31",0x2083],
- ["8136AF32",0x2084],
- ["8136AF33",0x2085],
- ["8136AF34",0x2086],
- ["8136AF35",0x2087],
- ["8136AF36",0x2088],
- ["8136AF37",0x2089],
- ["8136AF38",0x208A],
- ["8136AF39",0x208B],
- ["8136B030",0x208C],
- ["8136B031",0x208D],
- ["8136B032",0x208E],
- ["8136B033",0x208F],
- ["8136B034",0x2090],
- ["8136B035",0x2091],
- ["8136B036",0x2092],
- ["8136B037",0x2093],
- ["8136B038",0x2094],
- ["8136B039",0x2095],
- ["8136B130",0x2096],
- ["8136B131",0x2097],
- ["8136B132",0x2098],
- ["8136B133",0x2099],
- ["8136B134",0x209A],
- ["8136B135",0x209B],
- ["8136B136",0x209C],
- ["8136B137",0x209D],
- ["8136B138",0x209E],
- ["8136B139",0x209F],
- ["8136B230",0x20A0],
- ["8136B231",0x20A1],
- ["8136B232",0x20A2],
- ["8136B233",0x20A3],
- ["8136B234",0x20A4],
- ["8136B235",0x20A5],
- ["8136B236",0x20A6],
- ["8136B237",0x20A7],
- ["8136B238",0x20A8],
- ["8136B239",0x20A9],
- ["8136B330",0x20AA],
- ["8136B331",0x20AB],
- ["A2E3",0x20AC],
- ["8136B332",0x20AD],
- ["8136B333",0x20AE],
- ["8136B334",0x20AF],
- ["8136B335",0x20B0],
- ["8136B336",0x20B1],
- ["8136B337",0x20B2],
- ["8136B338",0x20B3],
- ["8136B339",0x20B4],
- ["8136B430",0x20B5],
- ["8136B431",0x20B6],
- ["8136B432",0x20B7],
- ["8136B433",0x20B8],
- ["8136B434",0x20B9],
- ["8136B435",0x20BA],
- ["8136B436",0x20BB],
- ["8136B437",0x20BC],
- ["8136B438",0x20BD],
- ["8136B439",0x20BE],
- ["8136B530",0x20BF],
- ["8136B531",0x20C0],
- ["8136B532",0x20C1],
- ["8136B533",0x20C2],
- ["8136B534",0x20C3],
- ["8136B535",0x20C4],
- ["8136B536",0x20C5],
- ["8136B537",0x20C6],
- ["8136B538",0x20C7],
- ["8136B539",0x20C8],
- ["8136B630",0x20C9],
- ["8136B631",0x20CA],
- ["8136B632",0x20CB],
- ["8136B633",0x20CC],
- ["8136B634",0x20CD],
- ["8136B635",0x20CE],
- ["8136B636",0x20CF],
- ["8136B637",0x20D0],
- ["8136B638",0x20D1],
- ["8136B639",0x20D2],
- ["8136B730",0x20D3],
- ["8136B731",0x20D4],
- ["8136B732",0x20D5],
- ["8136B733",0x20D6],
- ["8136B734",0x20D7],
- ["8136B735",0x20D8],
- ["8136B736",0x20D9],
- ["8136B737",0x20DA],
- ["8136B738",0x20DB],
- ["8136B739",0x20DC],
- ["8136B830",0x20DD],
- ["8136B831",0x20DE],
- ["8136B832",0x20DF],
- ["8136B833",0x20E0],
- ["8136B834",0x20E1],
- ["8136B835",0x20E2],
- ["8136B836",0x20E3],
- ["8136B837",0x20E4],
- ["8136B838",0x20E5],
- ["8136B839",0x20E6],
- ["8136B930",0x20E7],
- ["8136B931",0x20E8],
- ["8136B932",0x20E9],
- ["8136B933",0x20EA],
- ["8136B934",0x20EB],
- ["8136B935",0x20EC],
- ["8136B936",0x20ED],
- ["8136B937",0x20EE],
- ["8136B938",0x20EF],
- ["8136B939",0x20F0],
- ["8136BA30",0x20F1],
- ["8136BA31",0x20F2],
- ["8136BA32",0x20F3],
- ["8136BA33",0x20F4],
- ["8136BA34",0x20F5],
- ["8136BA35",0x20F6],
- ["8136BA36",0x20F7],
- ["8136BA37",0x20F8],
- ["8136BA38",0x20F9],
- ["8136BA39",0x20FA],
- ["8136BB30",0x20FB],
- ["8136BB31",0x20FC],
- ["8136BB32",0x20FD],
- ["8136BB33",0x20FE],
- ["8136BB34",0x20FF],
- ["8136BB35",0x2100],
- ["8136BB36",0x2101],
- ["8136BB37",0x2102],
- ["A1E6",0x2103],
- ["8136BB38",0x2104],
- ["A847",0x2105],
- ["8136BB39",0x2106],
- ["8136BC30",0x2107],
- ["8136BC31",0x2108],
- ["A848",0x2109],
- ["8136BC32",0x210A],
- ["8136BC33",0x210B],
- ["8136BC34",0x210C],
- ["8136BC35",0x210D],
- ["8136BC36",0x210E],
- ["8136BC37",0x210F],
- ["8136BC38",0x2110],
- ["8136BC39",0x2111],
- ["8136BD30",0x2112],
- ["8136BD31",0x2113],
- ["8136BD32",0x2114],
- ["8136BD33",0x2115],
- ["A1ED",0x2116],
- ["8136BD34",0x2117],
- ["8136BD35",0x2118],
- ["8136BD36",0x2119],
- ["8136BD37",0x211A],
- ["8136BD38",0x211B],
- ["8136BD39",0x211C],
- ["8136BE30",0x211D],
- ["8136BE31",0x211E],
- ["8136BE32",0x211F],
- ["8136BE33",0x2120],
- ["A959",0x2121],
- ["8136BE34",0x2122],
- ["8136BE35",0x2123],
- ["8136BE36",0x2124],
- ["8136BE37",0x2125],
- ["8136BE38",0x2126],
- ["8136BE39",0x2127],
- ["8136BF30",0x2128],
- ["8136BF31",0x2129],
- ["8136BF32",0x212A],
- ["8136BF33",0x212B],
- ["8136BF34",0x212C],
- ["8136BF35",0x212D],
- ["8136BF36",0x212E],
- ["8136BF37",0x212F],
- ["8136BF38",0x2130],
- ["8136BF39",0x2131],
- ["8136C030",0x2132],
- ["8136C031",0x2133],
- ["8136C032",0x2134],
- ["8136C033",0x2135],
- ["8136C034",0x2136],
- ["8136C035",0x2137],
- ["8136C036",0x2138],
- ["8136C037",0x2139],
- ["8136C038",0x213A],
- ["8136C039",0x213B],
- ["8136C130",0x213C],
- ["8136C131",0x213D],
- ["8136C132",0x213E],
- ["8136C133",0x213F],
- ["8136C134",0x2140],
- ["8136C135",0x2141],
- ["8136C136",0x2142],
- ["8136C137",0x2143],
- ["8136C138",0x2144],
- ["8136C139",0x2145],
- ["8136C230",0x2146],
- ["8136C231",0x2147],
- ["8136C232",0x2148],
- ["8136C233",0x2149],
- ["8136C234",0x214A],
- ["8136C235",0x214B],
- ["8136C236",0x214C],
- ["8136C237",0x214D],
- ["8136C238",0x214E],
- ["8136C239",0x214F],
- ["8136C330",0x2150],
- ["8136C331",0x2151],
- ["8136C332",0x2152],
- ["8136C333",0x2153],
- ["8136C334",0x2154],
- ["8136C335",0x2155],
- ["8136C336",0x2156],
- ["8136C337",0x2157],
- ["8136C338",0x2158],
- ["8136C339",0x2159],
- ["8136C430",0x215A],
- ["8136C431",0x215B],
- ["8136C432",0x215C],
- ["8136C433",0x215D],
- ["8136C434",0x215E],
- ["8136C435",0x215F],
- ["A2F1",0x2160],
- ["A2F2",0x2161],
- ["A2F3",0x2162],
- ["A2F4",0x2163],
- ["A2F5",0x2164],
- ["A2F6",0x2165],
- ["A2F7",0x2166],
- ["A2F8",0x2167],
- ["A2F9",0x2168],
- ["A2FA",0x2169],
- ["A2FB",0x216A],
- ["A2FC",0x216B],
- ["8136C436",0x216C],
- ["8136C437",0x216D],
- ["8136C438",0x216E],
- ["8136C439",0x216F],
- ["A2A1",0x2170],
- ["A2A2",0x2171],
- ["A2A3",0x2172],
- ["A2A4",0x2173],
- ["A2A5",0x2174],
- ["A2A6",0x2175],
- ["A2A7",0x2176],
- ["A2A8",0x2177],
- ["A2A9",0x2178],
- ["A2AA",0x2179],
- ["8136C530",0x217A],
- ["8136C531",0x217B],
- ["8136C532",0x217C],
- ["8136C533",0x217D],
- ["8136C534",0x217E],
- ["8136C535",0x217F],
- ["8136C536",0x2180],
- ["8136C537",0x2181],
- ["8136C538",0x2182],
- ["8136C539",0x2183],
- ["8136C630",0x2184],
- ["8136C631",0x2185],
- ["8136C632",0x2186],
- ["8136C633",0x2187],
- ["8136C634",0x2188],
- ["8136C635",0x2189],
- ["8136C636",0x218A],
- ["8136C637",0x218B],
- ["8136C638",0x218C],
- ["8136C639",0x218D],
- ["8136C730",0x218E],
- ["8136C731",0x218F],
- ["A1FB",0x2190],
- ["A1FC",0x2191],
- ["A1FA",0x2192],
- ["A1FD",0x2193],
- ["8136C732",0x2194],
- ["8136C733",0x2195],
- ["A849",0x2196],
- ["A84A",0x2197],
- ["A84B",0x2198],
- ["A84C",0x2199],
- ["8136C734",0x219A],
- ["8136C735",0x219B],
- ["8136C736",0x219C],
- ["8136C737",0x219D],
- ["8136C738",0x219E],
- ["8136C739",0x219F],
- ["8136C830",0x21A0],
- ["8136C831",0x21A1],
- ["8136C832",0x21A2],
- ["8136C833",0x21A3],
- ["8136C834",0x21A4],
- ["8136C835",0x21A5],
- ["8136C836",0x21A6],
- ["8136C837",0x21A7],
- ["8136C838",0x21A8],
- ["8136C839",0x21A9],
- ["8136C930",0x21AA],
- ["8136C931",0x21AB],
- ["8136C932",0x21AC],
- ["8136C933",0x21AD],
- ["8136C934",0x21AE],
- ["8136C935",0x21AF],
- ["8136C936",0x21B0],
- ["8136C937",0x21B1],
- ["8136C938",0x21B2],
- ["8136C939",0x21B3],
- ["8136CA30",0x21B4],
- ["8136CA31",0x21B5],
- ["8136CA32",0x21B6],
- ["8136CA33",0x21B7],
- ["8136CA34",0x21B8],
- ["8136CA35",0x21B9],
- ["8136CA36",0x21BA],
- ["8136CA37",0x21BB],
- ["8136CA38",0x21BC],
- ["8136CA39",0x21BD],
- ["8136CB30",0x21BE],
- ["8136CB31",0x21BF],
- ["8136CB32",0x21C0],
- ["8136CB33",0x21C1],
- ["8136CB34",0x21C2],
- ["8136CB35",0x21C3],
- ["8136CB36",0x21C4],
- ["8136CB37",0x21C5],
- ["8136CB38",0x21C6],
- ["8136CB39",0x21C7],
- ["8136CC30",0x21C8],
- ["8136CC31",0x21C9],
- ["8136CC32",0x21CA],
- ["8136CC33",0x21CB],
- ["8136CC34",0x21CC],
- ["8136CC35",0x21CD],
- ["8136CC36",0x21CE],
- ["8136CC37",0x21CF],
- ["8136CC38",0x21D0],
- ["8136CC39",0x21D1],
- ["8136CD30",0x21D2],
- ["8136CD31",0x21D3],
- ["8136CD32",0x21D4],
- ["8136CD33",0x21D5],
- ["8136CD34",0x21D6],
- ["8136CD35",0x21D7],
- ["8136CD36",0x21D8],
- ["8136CD37",0x21D9],
- ["8136CD38",0x21DA],
- ["8136CD39",0x21DB],
- ["8136CE30",0x21DC],
- ["8136CE31",0x21DD],
- ["8136CE32",0x21DE],
- ["8136CE33",0x21DF],
- ["8136CE34",0x21E0],
- ["8136CE35",0x21E1],
- ["8136CE36",0x21E2],
- ["8136CE37",0x21E3],
- ["8136CE38",0x21E4],
- ["8136CE39",0x21E5],
- ["8136CF30",0x21E6],
- ["8136CF31",0x21E7],
- ["8136CF32",0x21E8],
- ["8136CF33",0x21E9],
- ["8136CF34",0x21EA],
- ["8136CF35",0x21EB],
- ["8136CF36",0x21EC],
- ["8136CF37",0x21ED],
- ["8136CF38",0x21EE],
- ["8136CF39",0x21EF],
- ["8136D030",0x21F0],
- ["8136D031",0x21F1],
- ["8136D032",0x21F2],
- ["8136D033",0x21F3],
- ["8136D034",0x21F4],
- ["8136D035",0x21F5],
- ["8136D036",0x21F6],
- ["8136D037",0x21F7],
- ["8136D038",0x21F8],
- ["8136D039",0x21F9],
- ["8136D130",0x21FA],
- ["8136D131",0x21FB],
- ["8136D132",0x21FC],
- ["8136D133",0x21FD],
- ["8136D134",0x21FE],
- ["8136D135",0x21FF],
- ["8136D136",0x2200],
- ["8136D137",0x2201],
- ["8136D138",0x2202],
- ["8136D139",0x2203],
- ["8136D230",0x2204],
- ["8136D231",0x2205],
- ["8136D232",0x2206],
- ["8136D233",0x2207],
- ["A1CA",0x2208],
- ["8136D234",0x2209],
- ["8136D235",0x220A],
- ["8136D236",0x220B],
- ["8136D237",0x220C],
- ["8136D238",0x220D],
- ["8136D239",0x220E],
- ["A1C7",0x220F],
- ["8136D330",0x2210],
- ["A1C6",0x2211],
- ["8136D331",0x2212],
- ["8136D332",0x2213],
- ["8136D333",0x2214],
- ["A84D",0x2215],
- ["8136D334",0x2216],
- ["8136D335",0x2217],
- ["8136D336",0x2218],
- ["8136D337",0x2219],
- ["A1CC",0x221A],
- ["8136D338",0x221B],
- ["8136D339",0x221C],
- ["A1D8",0x221D],
- ["A1DE",0x221E],
- ["A84E",0x221F],
- ["A1CF",0x2220],
- ["8136D430",0x2221],
- ["8136D431",0x2222],
- ["A84F",0x2223],
- ["8136D432",0x2224],
- ["A1CE",0x2225],
- ["8136D433",0x2226],
- ["A1C4",0x2227],
- ["A1C5",0x2228],
- ["A1C9",0x2229],
- ["A1C8",0x222A],
- ["A1D2",0x222B],
- ["8136D434",0x222C],
- ["8136D435",0x222D],
- ["A1D3",0x222E],
- ["8136D436",0x222F],
- ["8136D437",0x2230],
- ["8136D438",0x2231],
- ["8136D439",0x2232],
- ["8136D530",0x2233],
- ["A1E0",0x2234],
- ["A1DF",0x2235],
- ["A1C3",0x2236],
- ["A1CB",0x2237],
- ["8136D531",0x2238],
- ["8136D532",0x2239],
- ["8136D533",0x223A],
- ["8136D534",0x223B],
- ["8136D535",0x223C],
- ["A1D7",0x223D],
- ["8136D536",0x223E],
- ["8136D537",0x223F],
- ["8136D538",0x2240],
- ["8136D539",0x2241],
- ["8136D630",0x2242],
- ["8136D631",0x2243],
- ["8136D632",0x2244],
- ["8136D633",0x2245],
- ["8136D634",0x2246],
- ["8136D635",0x2247],
- ["A1D6",0x2248],
- ["8136D636",0x2249],
- ["8136D637",0x224A],
- ["8136D638",0x224B],
- ["A1D5",0x224C],
- ["8136D639",0x224D],
- ["8136D730",0x224E],
- ["8136D731",0x224F],
- ["8136D732",0x2250],
- ["8136D733",0x2251],
- ["A850",0x2252],
- ["8136D734",0x2253],
- ["8136D735",0x2254],
- ["8136D736",0x2255],
- ["8136D737",0x2256],
- ["8136D738",0x2257],
- ["8136D739",0x2258],
- ["8136D830",0x2259],
- ["8136D831",0x225A],
- ["8136D832",0x225B],
- ["8136D833",0x225C],
- ["8136D834",0x225D],
- ["8136D835",0x225E],
- ["8136D836",0x225F],
- ["A1D9",0x2260],
- ["A1D4",0x2261],
- ["8136D837",0x2262],
- ["8136D838",0x2263],
- ["A1DC",0x2264],
- ["A1DD",0x2265],
- ["A851",0x2266],
- ["A852",0x2267],
- ["8136D839",0x2268],
- ["8136D930",0x2269],
- ["8136D931",0x226A],
- ["8136D932",0x226B],
- ["8136D933",0x226C],
- ["8136D934",0x226D],
- ["A1DA",0x226E],
- ["A1DB",0x226F],
- ["8136D935",0x2270],
- ["8136D936",0x2271],
- ["8136D937",0x2272],
- ["8136D938",0x2273],
- ["8136D939",0x2274],
- ["8136DA30",0x2275],
- ["8136DA31",0x2276],
- ["8136DA32",0x2277],
- ["8136DA33",0x2278],
- ["8136DA34",0x2279],
- ["8136DA35",0x227A],
- ["8136DA36",0x227B],
- ["8136DA37",0x227C],
- ["8136DA38",0x227D],
- ["8136DA39",0x227E],
- ["8136DB30",0x227F],
- ["8136DB31",0x2280],
- ["8136DB32",0x2281],
- ["8136DB33",0x2282],
- ["8136DB34",0x2283],
- ["8136DB35",0x2284],
- ["8136DB36",0x2285],
- ["8136DB37",0x2286],
- ["8136DB38",0x2287],
- ["8136DB39",0x2288],
- ["8136DC30",0x2289],
- ["8136DC31",0x228A],
- ["8136DC32",0x228B],
- ["8136DC33",0x228C],
- ["8136DC34",0x228D],
- ["8136DC35",0x228E],
- ["8136DC36",0x228F],
- ["8136DC37",0x2290],
- ["8136DC38",0x2291],
- ["8136DC39",0x2292],
- ["8136DD30",0x2293],
- ["8136DD31",0x2294],
- ["A892",0x2295],
- ["8136DD32",0x2296],
- ["8136DD33",0x2297],
- ["8136DD34",0x2298],
- ["A1D1",0x2299],
- ["8136DD35",0x229A],
- ["8136DD36",0x229B],
- ["8136DD37",0x229C],
- ["8136DD38",0x229D],
- ["8136DD39",0x229E],
- ["8136DE30",0x229F],
- ["8136DE31",0x22A0],
- ["8136DE32",0x22A1],
- ["8136DE33",0x22A2],
- ["8136DE34",0x22A3],
- ["8136DE35",0x22A4],
- ["A1CD",0x22A5],
- ["8136DE36",0x22A6],
- ["8136DE37",0x22A7],
- ["8136DE38",0x22A8],
- ["8136DE39",0x22A9],
- ["8136DF30",0x22AA],
- ["8136DF31",0x22AB],
- ["8136DF32",0x22AC],
- ["8136DF33",0x22AD],
- ["8136DF34",0x22AE],
- ["8136DF35",0x22AF],
- ["8136DF36",0x22B0],
- ["8136DF37",0x22B1],
- ["8136DF38",0x22B2],
- ["8136DF39",0x22B3],
- ["8136E030",0x22B4],
- ["8136E031",0x22B5],
- ["8136E032",0x22B6],
- ["8136E033",0x22B7],
- ["8136E034",0x22B8],
- ["8136E035",0x22B9],
- ["8136E036",0x22BA],
- ["8136E037",0x22BB],
- ["8136E038",0x22BC],
- ["8136E039",0x22BD],
- ["8136E130",0x22BE],
- ["A853",0x22BF],
- ["8136E131",0x22C0],
- ["8136E132",0x22C1],
- ["8136E133",0x22C2],
- ["8136E134",0x22C3],
- ["8136E135",0x22C4],
- ["8136E136",0x22C5],
- ["8136E137",0x22C6],
- ["8136E138",0x22C7],
- ["8136E139",0x22C8],
- ["8136E230",0x22C9],
- ["8136E231",0x22CA],
- ["8136E232",0x22CB],
- ["8136E233",0x22CC],
- ["8136E234",0x22CD],
- ["8136E235",0x22CE],
- ["8136E236",0x22CF],
- ["8136E237",0x22D0],
- ["8136E238",0x22D1],
- ["8136E239",0x22D2],
- ["8136E330",0x22D3],
- ["8136E331",0x22D4],
- ["8136E332",0x22D5],
- ["8136E333",0x22D6],
- ["8136E334",0x22D7],
- ["8136E335",0x22D8],
- ["8136E336",0x22D9],
- ["8136E337",0x22DA],
- ["8136E338",0x22DB],
- ["8136E339",0x22DC],
- ["8136E430",0x22DD],
- ["8136E431",0x22DE],
- ["8136E432",0x22DF],
- ["8136E433",0x22E0],
- ["8136E434",0x22E1],
- ["8136E435",0x22E2],
- ["8136E436",0x22E3],
- ["8136E437",0x22E4],
- ["8136E438",0x22E5],
- ["8136E439",0x22E6],
- ["8136E530",0x22E7],
- ["8136E531",0x22E8],
- ["8136E532",0x22E9],
- ["8136E533",0x22EA],
- ["8136E534",0x22EB],
- ["8136E535",0x22EC],
- ["8136E536",0x22ED],
- ["8136E537",0x22EE],
- ["8136E538",0x22EF],
- ["8136E539",0x22F0],
- ["8136E630",0x22F1],
- ["8136E631",0x22F2],
- ["8136E632",0x22F3],
- ["8136E633",0x22F4],
- ["8136E634",0x22F5],
- ["8136E635",0x22F6],
- ["8136E636",0x22F7],
- ["8136E637",0x22F8],
- ["8136E638",0x22F9],
- ["8136E639",0x22FA],
- ["8136E730",0x22FB],
- ["8136E731",0x22FC],
- ["8136E732",0x22FD],
- ["8136E733",0x22FE],
- ["8136E734",0x22FF],
- ["8136E735",0x2300],
- ["8136E736",0x2301],
- ["8136E737",0x2302],
- ["8136E738",0x2303],
- ["8136E739",0x2304],
- ["8136E830",0x2305],
- ["8136E831",0x2306],
- ["8136E832",0x2307],
- ["8136E833",0x2308],
- ["8136E834",0x2309],
- ["8136E835",0x230A],
- ["8136E836",0x230B],
- ["8136E837",0x230C],
- ["8136E838",0x230D],
- ["8136E839",0x230E],
- ["8136E930",0x230F],
- ["8136E931",0x2310],
- ["8136E932",0x2311],
- ["A1D0",0x2312],
- ["8136E933",0x2313],
- ["8136E934",0x2314],
- ["8136E935",0x2315],
- ["8136E936",0x2316],
- ["8136E937",0x2317],
- ["8136E938",0x2318],
- ["8136E939",0x2319],
- ["8136EA30",0x231A],
- ["8136EA31",0x231B],
- ["8136EA32",0x231C],
- ["8136EA33",0x231D],
- ["8136EA34",0x231E],
- ["8136EA35",0x231F],
- ["8136EA36",0x2320],
- ["8136EA37",0x2321],
- ["8136EA38",0x2322],
- ["8136EA39",0x2323],
- ["8136EB30",0x2324],
- ["8136EB31",0x2325],
- ["8136EB32",0x2326],
- ["8136EB33",0x2327],
- ["8136EB34",0x2328],
- ["8136EB35",0x2329],
- ["8136EB36",0x232A],
- ["8136EB37",0x232B],
- ["8136EB38",0x232C],
- ["8136EB39",0x232D],
- ["8136EC30",0x232E],
- ["8136EC31",0x232F],
- ["8136EC32",0x2330],
- ["8136EC33",0x2331],
- ["8136EC34",0x2332],
- ["8136EC35",0x2333],
- ["8136EC36",0x2334],
- ["8136EC37",0x2335],
- ["8136EC38",0x2336],
- ["8136EC39",0x2337],
- ["8136ED30",0x2338],
- ["8136ED31",0x2339],
- ["8136ED32",0x233A],
- ["8136ED33",0x233B],
- ["8136ED34",0x233C],
- ["8136ED35",0x233D],
- ["8136ED36",0x233E],
- ["8136ED37",0x233F],
- ["8136ED38",0x2340],
- ["8136ED39",0x2341],
- ["8136EE30",0x2342],
- ["8136EE31",0x2343],
- ["8136EE32",0x2344],
- ["8136EE33",0x2345],
- ["8136EE34",0x2346],
- ["8136EE35",0x2347],
- ["8136EE36",0x2348],
- ["8136EE37",0x2349],
- ["8136EE38",0x234A],
- ["8136EE39",0x234B],
- ["8136EF30",0x234C],
- ["8136EF31",0x234D],
- ["8136EF32",0x234E],
- ["8136EF33",0x234F],
- ["8136EF34",0x2350],
- ["8136EF35",0x2351],
- ["8136EF36",0x2352],
- ["8136EF37",0x2353],
- ["8136EF38",0x2354],
- ["8136EF39",0x2355],
- ["8136F030",0x2356],
- ["8136F031",0x2357],
- ["8136F032",0x2358],
- ["8136F033",0x2359],
- ["8136F034",0x235A],
- ["8136F035",0x235B],
- ["8136F036",0x235C],
- ["8136F037",0x235D],
- ["8136F038",0x235E],
- ["8136F039",0x235F],
- ["8136F130",0x2360],
- ["8136F131",0x2361],
- ["8136F132",0x2362],
- ["8136F133",0x2363],
- ["8136F134",0x2364],
- ["8136F135",0x2365],
- ["8136F136",0x2366],
- ["8136F137",0x2367],
- ["8136F138",0x2368],
- ["8136F139",0x2369],
- ["8136F230",0x236A],
- ["8136F231",0x236B],
- ["8136F232",0x236C],
- ["8136F233",0x236D],
- ["8136F234",0x236E],
- ["8136F235",0x236F],
- ["8136F236",0x2370],
- ["8136F237",0x2371],
- ["8136F238",0x2372],
- ["8136F239",0x2373],
- ["8136F330",0x2374],
- ["8136F331",0x2375],
- ["8136F332",0x2376],
- ["8136F333",0x2377],
- ["8136F334",0x2378],
- ["8136F335",0x2379],
- ["8136F336",0x237A],
- ["8136F337",0x237B],
- ["8136F338",0x237C],
- ["8136F339",0x237D],
- ["8136F430",0x237E],
- ["8136F431",0x237F],
- ["8136F432",0x2380],
- ["8136F433",0x2381],
- ["8136F434",0x2382],
- ["8136F435",0x2383],
- ["8136F436",0x2384],
- ["8136F437",0x2385],
- ["8136F438",0x2386],
- ["8136F439",0x2387],
- ["8136F530",0x2388],
- ["8136F531",0x2389],
- ["8136F532",0x238A],
- ["8136F533",0x238B],
- ["8136F534",0x238C],
- ["8136F535",0x238D],
- ["8136F536",0x238E],
- ["8136F537",0x238F],
- ["8136F538",0x2390],
- ["8136F539",0x2391],
- ["8136F630",0x2392],
- ["8136F631",0x2393],
- ["8136F632",0x2394],
- ["8136F633",0x2395],
- ["8136F634",0x2396],
- ["8136F635",0x2397],
- ["8136F636",0x2398],
- ["8136F637",0x2399],
- ["8136F638",0x239A],
- ["8136F639",0x239B],
- ["8136F730",0x239C],
- ["8136F731",0x239D],
- ["8136F732",0x239E],
- ["8136F733",0x239F],
- ["8136F734",0x23A0],
- ["8136F735",0x23A1],
- ["8136F736",0x23A2],
- ["8136F737",0x23A3],
- ["8136F738",0x23A4],
- ["8136F739",0x23A5],
- ["8136F830",0x23A6],
- ["8136F831",0x23A7],
- ["8136F832",0x23A8],
- ["8136F833",0x23A9],
- ["8136F834",0x23AA],
- ["8136F835",0x23AB],
- ["8136F836",0x23AC],
- ["8136F837",0x23AD],
- ["8136F838",0x23AE],
- ["8136F839",0x23AF],
- ["8136F930",0x23B0],
- ["8136F931",0x23B1],
- ["8136F932",0x23B2],
- ["8136F933",0x23B3],
- ["8136F934",0x23B4],
- ["8136F935",0x23B5],
- ["8136F936",0x23B6],
- ["8136F937",0x23B7],
- ["8136F938",0x23B8],
- ["8136F939",0x23B9],
- ["8136FA30",0x23BA],
- ["8136FA31",0x23BB],
- ["8136FA32",0x23BC],
- ["8136FA33",0x23BD],
- ["8136FA34",0x23BE],
- ["8136FA35",0x23BF],
- ["8136FA36",0x23C0],
- ["8136FA37",0x23C1],
- ["8136FA38",0x23C2],
- ["8136FA39",0x23C3],
- ["8136FB30",0x23C4],
- ["8136FB31",0x23C5],
- ["8136FB32",0x23C6],
- ["8136FB33",0x23C7],
- ["8136FB34",0x23C8],
- ["8136FB35",0x23C9],
- ["8136FB36",0x23CA],
- ["8136FB37",0x23CB],
- ["8136FB38",0x23CC],
- ["8136FB39",0x23CD],
- ["8136FC30",0x23CE],
- ["8136FC31",0x23CF],
- ["8136FC32",0x23D0],
- ["8136FC33",0x23D1],
- ["8136FC34",0x23D2],
- ["8136FC35",0x23D3],
- ["8136FC36",0x23D4],
- ["8136FC37",0x23D5],
- ["8136FC38",0x23D6],
- ["8136FC39",0x23D7],
- ["8136FD30",0x23D8],
- ["8136FD31",0x23D9],
- ["8136FD32",0x23DA],
- ["8136FD33",0x23DB],
- ["8136FD34",0x23DC],
- ["8136FD35",0x23DD],
- ["8136FD36",0x23DE],
- ["8136FD37",0x23DF],
- ["8136FD38",0x23E0],
- ["8136FD39",0x23E1],
- ["8136FE30",0x23E2],
- ["8136FE31",0x23E3],
- ["8136FE32",0x23E4],
- ["8136FE33",0x23E5],
- ["8136FE34",0x23E6],
- ["8136FE35",0x23E7],
- ["8136FE36",0x23E8],
- ["8136FE37",0x23E9],
- ["8136FE38",0x23EA],
- ["8136FE39",0x23EB],
- ["81378130",0x23EC],
- ["81378131",0x23ED],
- ["81378132",0x23EE],
- ["81378133",0x23EF],
- ["81378134",0x23F0],
- ["81378135",0x23F1],
- ["81378136",0x23F2],
- ["81378137",0x23F3],
- ["81378138",0x23F4],
- ["81378139",0x23F5],
- ["81378230",0x23F6],
- ["81378231",0x23F7],
- ["81378232",0x23F8],
- ["81378233",0x23F9],
- ["81378234",0x23FA],
- ["81378235",0x23FB],
- ["81378236",0x23FC],
- ["81378237",0x23FD],
- ["81378238",0x23FE],
- ["81378239",0x23FF],
- ["81378330",0x2400],
- ["81378331",0x2401],
- ["81378332",0x2402],
- ["81378333",0x2403],
- ["81378334",0x2404],
- ["81378335",0x2405],
- ["81378336",0x2406],
- ["81378337",0x2407],
- ["81378338",0x2408],
- ["81378339",0x2409],
- ["81378430",0x240A],
- ["81378431",0x240B],
- ["81378432",0x240C],
- ["81378433",0x240D],
- ["81378434",0x240E],
- ["81378435",0x240F],
- ["81378436",0x2410],
- ["81378437",0x2411],
- ["81378438",0x2412],
- ["81378439",0x2413],
- ["81378530",0x2414],
- ["81378531",0x2415],
- ["81378532",0x2416],
- ["81378533",0x2417],
- ["81378534",0x2418],
- ["81378535",0x2419],
- ["81378536",0x241A],
- ["81378537",0x241B],
- ["81378538",0x241C],
- ["81378539",0x241D],
- ["81378630",0x241E],
- ["81378631",0x241F],
- ["81378632",0x2420],
- ["81378633",0x2421],
- ["81378634",0x2422],
- ["81378635",0x2423],
- ["81378636",0x2424],
- ["81378637",0x2425],
- ["81378638",0x2426],
- ["81378639",0x2427],
- ["81378730",0x2428],
- ["81378731",0x2429],
- ["81378732",0x242A],
- ["81378733",0x242B],
- ["81378734",0x242C],
- ["81378735",0x242D],
- ["81378736",0x242E],
- ["81378737",0x242F],
- ["81378738",0x2430],
- ["81378739",0x2431],
- ["81378830",0x2432],
- ["81378831",0x2433],
- ["81378832",0x2434],
- ["81378833",0x2435],
- ["81378834",0x2436],
- ["81378835",0x2437],
- ["81378836",0x2438],
- ["81378837",0x2439],
- ["81378838",0x243A],
- ["81378839",0x243B],
- ["81378930",0x243C],
- ["81378931",0x243D],
- ["81378932",0x243E],
- ["81378933",0x243F],
- ["81378934",0x2440],
- ["81378935",0x2441],
- ["81378936",0x2442],
- ["81378937",0x2443],
- ["81378938",0x2444],
- ["81378939",0x2445],
- ["81378A30",0x2446],
- ["81378A31",0x2447],
- ["81378A32",0x2448],
- ["81378A33",0x2449],
- ["81378A34",0x244A],
- ["81378A35",0x244B],
- ["81378A36",0x244C],
- ["81378A37",0x244D],
- ["81378A38",0x244E],
- ["81378A39",0x244F],
- ["81378B30",0x2450],
- ["81378B31",0x2451],
- ["81378B32",0x2452],
- ["81378B33",0x2453],
- ["81378B34",0x2454],
- ["81378B35",0x2455],
- ["81378B36",0x2456],
- ["81378B37",0x2457],
- ["81378B38",0x2458],
- ["81378B39",0x2459],
- ["81378C30",0x245A],
- ["81378C31",0x245B],
- ["81378C32",0x245C],
- ["81378C33",0x245D],
- ["81378C34",0x245E],
- ["81378C35",0x245F],
- ["A2D9",0x2460],
- ["A2DA",0x2461],
- ["A2DB",0x2462],
- ["A2DC",0x2463],
- ["A2DD",0x2464],
- ["A2DE",0x2465],
- ["A2DF",0x2466],
- ["A2E0",0x2467],
- ["A2E1",0x2468],
- ["A2E2",0x2469],
- ["81378C36",0x246A],
- ["81378C37",0x246B],
- ["81378C38",0x246C],
- ["81378C39",0x246D],
- ["81378D30",0x246E],
- ["81378D31",0x246F],
- ["81378D32",0x2470],
- ["81378D33",0x2471],
- ["81378D34",0x2472],
- ["81378D35",0x2473],
- ["A2C5",0x2474],
- ["A2C6",0x2475],
- ["A2C7",0x2476],
- ["A2C8",0x2477],
- ["A2C9",0x2478],
- ["A2CA",0x2479],
- ["A2CB",0x247A],
- ["A2CC",0x247B],
- ["A2CD",0x247C],
- ["A2CE",0x247D],
- ["A2CF",0x247E],
- ["A2D0",0x247F],
- ["A2D1",0x2480],
- ["A2D2",0x2481],
- ["A2D3",0x2482],
- ["A2D4",0x2483],
- ["A2D5",0x2484],
- ["A2D6",0x2485],
- ["A2D7",0x2486],
- ["A2D8",0x2487],
- ["A2B1",0x2488],
- ["A2B2",0x2489],
- ["A2B3",0x248A],
- ["A2B4",0x248B],
- ["A2B5",0x248C],
- ["A2B6",0x248D],
- ["A2B7",0x248E],
- ["A2B8",0x248F],
- ["A2B9",0x2490],
- ["A2BA",0x2491],
- ["A2BB",0x2492],
- ["A2BC",0x2493],
- ["A2BD",0x2494],
- ["A2BE",0x2495],
- ["A2BF",0x2496],
- ["A2C0",0x2497],
- ["A2C1",0x2498],
- ["A2C2",0x2499],
- ["A2C3",0x249A],
- ["A2C4",0x249B],
- ["81378D36",0x249C],
- ["81378D37",0x249D],
- ["81378D38",0x249E],
- ["81378D39",0x249F],
- ["81378E30",0x24A0],
- ["81378E31",0x24A1],
- ["81378E32",0x24A2],
- ["81378E33",0x24A3],
- ["81378E34",0x24A4],
- ["81378E35",0x24A5],
- ["81378E36",0x24A6],
- ["81378E37",0x24A7],
- ["81378E38",0x24A8],
- ["81378E39",0x24A9],
- ["81378F30",0x24AA],
- ["81378F31",0x24AB],
- ["81378F32",0x24AC],
- ["81378F33",0x24AD],
- ["81378F34",0x24AE],
- ["81378F35",0x24AF],
- ["81378F36",0x24B0],
- ["81378F37",0x24B1],
- ["81378F38",0x24B2],
- ["81378F39",0x24B3],
- ["81379030",0x24B4],
- ["81379031",0x24B5],
- ["81379032",0x24B6],
- ["81379033",0x24B7],
- ["81379034",0x24B8],
- ["81379035",0x24B9],
- ["81379036",0x24BA],
- ["81379037",0x24BB],
- ["81379038",0x24BC],
- ["81379039",0x24BD],
- ["81379130",0x24BE],
- ["81379131",0x24BF],
- ["81379132",0x24C0],
- ["81379133",0x24C1],
- ["81379134",0x24C2],
- ["81379135",0x24C3],
- ["81379136",0x24C4],
- ["81379137",0x24C5],
- ["81379138",0x24C6],
- ["81379139",0x24C7],
- ["81379230",0x24C8],
- ["81379231",0x24C9],
- ["81379232",0x24CA],
- ["81379233",0x24CB],
- ["81379234",0x24CC],
- ["81379235",0x24CD],
- ["81379236",0x24CE],
- ["81379237",0x24CF],
- ["81379238",0x24D0],
- ["81379239",0x24D1],
- ["81379330",0x24D2],
- ["81379331",0x24D3],
- ["81379332",0x24D4],
- ["81379333",0x24D5],
- ["81379334",0x24D6],
- ["81379335",0x24D7],
- ["81379336",0x24D8],
- ["81379337",0x24D9],
- ["81379338",0x24DA],
- ["81379339",0x24DB],
- ["81379430",0x24DC],
- ["81379431",0x24DD],
- ["81379432",0x24DE],
- ["81379433",0x24DF],
- ["81379434",0x24E0],
- ["81379435",0x24E1],
- ["81379436",0x24E2],
- ["81379437",0x24E3],
- ["81379438",0x24E4],
- ["81379439",0x24E5],
- ["81379530",0x24E6],
- ["81379531",0x24E7],
- ["81379532",0x24E8],
- ["81379533",0x24E9],
- ["81379534",0x24EA],
- ["81379535",0x24EB],
- ["81379536",0x24EC],
- ["81379537",0x24ED],
- ["81379538",0x24EE],
- ["81379539",0x24EF],
- ["81379630",0x24F0],
- ["81379631",0x24F1],
- ["81379632",0x24F2],
- ["81379633",0x24F3],
- ["81379634",0x24F4],
- ["81379635",0x24F5],
- ["81379636",0x24F6],
- ["81379637",0x24F7],
- ["81379638",0x24F8],
- ["81379639",0x24F9],
- ["81379730",0x24FA],
- ["81379731",0x24FB],
- ["81379732",0x24FC],
- ["81379733",0x24FD],
- ["81379734",0x24FE],
- ["81379735",0x24FF],
- ["A9A4",0x2500],
- ["A9A5",0x2501],
- ["A9A6",0x2502],
- ["A9A7",0x2503],
- ["A9A8",0x2504],
- ["A9A9",0x2505],
- ["A9AA",0x2506],
- ["A9AB",0x2507],
- ["A9AC",0x2508],
- ["A9AD",0x2509],
- ["A9AE",0x250A],
- ["A9AF",0x250B],
- ["A9B0",0x250C],
- ["A9B1",0x250D],
- ["A9B2",0x250E],
- ["A9B3",0x250F],
- ["A9B4",0x2510],
- ["A9B5",0x2511],
- ["A9B6",0x2512],
- ["A9B7",0x2513],
- ["A9B8",0x2514],
- ["A9B9",0x2515],
- ["A9BA",0x2516],
- ["A9BB",0x2517],
- ["A9BC",0x2518],
- ["A9BD",0x2519],
- ["A9BE",0x251A],
- ["A9BF",0x251B],
- ["A9C0",0x251C],
- ["A9C1",0x251D],
- ["A9C2",0x251E],
- ["A9C3",0x251F],
- ["A9C4",0x2520],
- ["A9C5",0x2521],
- ["A9C6",0x2522],
- ["A9C7",0x2523],
- ["A9C8",0x2524],
- ["A9C9",0x2525],
- ["A9CA",0x2526],
- ["A9CB",0x2527],
- ["A9CC",0x2528],
- ["A9CD",0x2529],
- ["A9CE",0x252A],
- ["A9CF",0x252B],
- ["A9D0",0x252C],
- ["A9D1",0x252D],
- ["A9D2",0x252E],
- ["A9D3",0x252F],
- ["A9D4",0x2530],
- ["A9D5",0x2531],
- ["A9D6",0x2532],
- ["A9D7",0x2533],
- ["A9D8",0x2534],
- ["A9D9",0x2535],
- ["A9DA",0x2536],
- ["A9DB",0x2537],
- ["A9DC",0x2538],
- ["A9DD",0x2539],
- ["A9DE",0x253A],
- ["A9DF",0x253B],
- ["A9E0",0x253C],
- ["A9E1",0x253D],
- ["A9E2",0x253E],
- ["A9E3",0x253F],
- ["A9E4",0x2540],
- ["A9E5",0x2541],
- ["A9E6",0x2542],
- ["A9E7",0x2543],
- ["A9E8",0x2544],
- ["A9E9",0x2545],
- ["A9EA",0x2546],
- ["A9EB",0x2547],
- ["A9EC",0x2548],
- ["A9ED",0x2549],
- ["A9EE",0x254A],
- ["A9EF",0x254B],
- ["81379736",0x254C],
- ["81379737",0x254D],
- ["81379738",0x254E],
- ["81379739",0x254F],
- ["A854",0x2550],
- ["A855",0x2551],
- ["A856",0x2552],
- ["A857",0x2553],
- ["A858",0x2554],
- ["A859",0x2555],
- ["A85A",0x2556],
- ["A85B",0x2557],
- ["A85C",0x2558],
- ["A85D",0x2559],
- ["A85E",0x255A],
- ["A85F",0x255B],
- ["A860",0x255C],
- ["A861",0x255D],
- ["A862",0x255E],
- ["A863",0x255F],
- ["A864",0x2560],
- ["A865",0x2561],
- ["A866",0x2562],
- ["A867",0x2563],
- ["A868",0x2564],
- ["A869",0x2565],
- ["A86A",0x2566],
- ["A86B",0x2567],
- ["A86C",0x2568],
- ["A86D",0x2569],
- ["A86E",0x256A],
- ["A86F",0x256B],
- ["A870",0x256C],
- ["A871",0x256D],
- ["A872",0x256E],
- ["A873",0x256F],
- ["A874",0x2570],
- ["A875",0x2571],
- ["A876",0x2572],
- ["A877",0x2573],
- ["81379830",0x2574],
- ["81379831",0x2575],
- ["81379832",0x2576],
- ["81379833",0x2577],
- ["81379834",0x2578],
- ["81379835",0x2579],
- ["81379836",0x257A],
- ["81379837",0x257B],
- ["81379838",0x257C],
- ["81379839",0x257D],
- ["81379930",0x257E],
- ["81379931",0x257F],
- ["81379932",0x2580],
- ["A878",0x2581],
- ["A879",0x2582],
- ["A87A",0x2583],
- ["A87B",0x2584],
- ["A87C",0x2585],
- ["A87D",0x2586],
- ["A87E",0x2587],
- ["A880",0x2588],
- ["A881",0x2589],
- ["A882",0x258A],
- ["A883",0x258B],
- ["A884",0x258C],
- ["A885",0x258D],
- ["A886",0x258E],
- ["A887",0x258F],
- ["81379933",0x2590],
- ["81379934",0x2591],
- ["81379935",0x2592],
- ["A888",0x2593],
- ["A889",0x2594],
- ["A88A",0x2595],
- ["81379936",0x2596],
- ["81379937",0x2597],
- ["81379938",0x2598],
- ["81379939",0x2599],
- ["81379A30",0x259A],
- ["81379A31",0x259B],
- ["81379A32",0x259C],
- ["81379A33",0x259D],
- ["81379A34",0x259E],
- ["81379A35",0x259F],
- ["A1F6",0x25A0],
- ["A1F5",0x25A1],
- ["81379A36",0x25A2],
- ["81379A37",0x25A3],
- ["81379A38",0x25A4],
- ["81379A39",0x25A5],
- ["81379B30",0x25A6],
- ["81379B31",0x25A7],
- ["81379B32",0x25A8],
- ["81379B33",0x25A9],
- ["81379B34",0x25AA],
- ["81379B35",0x25AB],
- ["81379B36",0x25AC],
- ["81379B37",0x25AD],
- ["81379B38",0x25AE],
- ["81379B39",0x25AF],
- ["81379C30",0x25B0],
- ["81379C31",0x25B1],
- ["A1F8",0x25B2],
- ["A1F7",0x25B3],
- ["81379C32",0x25B4],
- ["81379C33",0x25B5],
- ["81379C34",0x25B6],
- ["81379C35",0x25B7],
- ["81379C36",0x25B8],
- ["81379C37",0x25B9],
- ["81379C38",0x25BA],
- ["81379C39",0x25BB],
- ["A88B",0x25BC],
- ["A88C",0x25BD],
- ["81379D30",0x25BE],
- ["81379D31",0x25BF],
- ["81379D32",0x25C0],
- ["81379D33",0x25C1],
- ["81379D34",0x25C2],
- ["81379D35",0x25C3],
- ["81379D36",0x25C4],
- ["81379D37",0x25C5],
- ["A1F4",0x25C6],
- ["A1F3",0x25C7],
- ["81379D38",0x25C8],
- ["81379D39",0x25C9],
- ["81379E30",0x25CA],
- ["A1F0",0x25CB],
- ["81379E31",0x25CC],
- ["81379E32",0x25CD],
- ["A1F2",0x25CE],
- ["A1F1",0x25CF],
- ["81379E33",0x25D0],
- ["81379E34",0x25D1],
- ["81379E35",0x25D2],
- ["81379E36",0x25D3],
- ["81379E37",0x25D4],
- ["81379E38",0x25D5],
- ["81379E39",0x25D6],
- ["81379F30",0x25D7],
- ["81379F31",0x25D8],
- ["81379F32",0x25D9],
- ["81379F33",0x25DA],
- ["81379F34",0x25DB],
- ["81379F35",0x25DC],
- ["81379F36",0x25DD],
- ["81379F37",0x25DE],
- ["81379F38",0x25DF],
- ["81379F39",0x25E0],
- ["8137A030",0x25E1],
- ["A88D",0x25E2],
- ["A88E",0x25E3],
- ["A88F",0x25E4],
- ["A890",0x25E5],
- ["8137A031",0x25E6],
- ["8137A032",0x25E7],
- ["8137A033",0x25E8],
- ["8137A034",0x25E9],
- ["8137A035",0x25EA],
- ["8137A036",0x25EB],
- ["8137A037",0x25EC],
- ["8137A038",0x25ED],
- ["8137A039",0x25EE],
- ["8137A130",0x25EF],
- ["8137A131",0x25F0],
- ["8137A132",0x25F1],
- ["8137A133",0x25F2],
- ["8137A134",0x25F3],
- ["8137A135",0x25F4],
- ["8137A136",0x25F5],
- ["8137A137",0x25F6],
- ["8137A138",0x25F7],
- ["8137A139",0x25F8],
- ["8137A230",0x25F9],
- ["8137A231",0x25FA],
- ["8137A232",0x25FB],
- ["8137A233",0x25FC],
- ["8137A234",0x25FD],
- ["8137A235",0x25FE],
- ["8137A236",0x25FF],
- ["8137A237",0x2600],
- ["8137A238",0x2601],
- ["8137A239",0x2602],
- ["8137A330",0x2603],
- ["8137A331",0x2604],
- ["A1EF",0x2605],
- ["A1EE",0x2606],
- ["8137A332",0x2607],
- ["8137A333",0x2608],
- ["A891",0x2609],
- ["8137A334",0x260A],
- ["8137A335",0x260B],
- ["8137A336",0x260C],
- ["8137A337",0x260D],
- ["8137A338",0x260E],
- ["8137A339",0x260F],
- ["8137A430",0x2610],
- ["8137A431",0x2611],
- ["8137A432",0x2612],
- ["8137A433",0x2613],
- ["8137A434",0x2614],
- ["8137A435",0x2615],
- ["8137A436",0x2616],
- ["8137A437",0x2617],
- ["8137A438",0x2618],
- ["8137A439",0x2619],
- ["8137A530",0x261A],
- ["8137A531",0x261B],
- ["8137A532",0x261C],
- ["8137A533",0x261D],
- ["8137A534",0x261E],
- ["8137A535",0x261F],
- ["8137A536",0x2620],
- ["8137A537",0x2621],
- ["8137A538",0x2622],
- ["8137A539",0x2623],
- ["8137A630",0x2624],
- ["8137A631",0x2625],
- ["8137A632",0x2626],
- ["8137A633",0x2627],
- ["8137A634",0x2628],
- ["8137A635",0x2629],
- ["8137A636",0x262A],
- ["8137A637",0x262B],
- ["8137A638",0x262C],
- ["8137A639",0x262D],
- ["8137A730",0x262E],
- ["8137A731",0x262F],
- ["8137A732",0x2630],
- ["8137A733",0x2631],
- ["8137A734",0x2632],
- ["8137A735",0x2633],
- ["8137A736",0x2634],
- ["8137A737",0x2635],
- ["8137A738",0x2636],
- ["8137A739",0x2637],
- ["8137A830",0x2638],
- ["8137A831",0x2639],
- ["8137A832",0x263A],
- ["8137A833",0x263B],
- ["8137A834",0x263C],
- ["8137A835",0x263D],
- ["8137A836",0x263E],
- ["8137A837",0x263F],
- ["A1E2",0x2640],
- ["8137A838",0x2641],
- ["A1E1",0x2642],
- ["8137A839",0x2643],
- ["8137A930",0x2644],
- ["8137A931",0x2645],
- ["8137A932",0x2646],
- ["8137A933",0x2647],
- ["8137A934",0x2648],
- ["8137A935",0x2649],
- ["8137A936",0x264A],
- ["8137A937",0x264B],
- ["8137A938",0x264C],
- ["8137A939",0x264D],
- ["8137AA30",0x264E],
- ["8137AA31",0x264F],
- ["8137AA32",0x2650],
- ["8137AA33",0x2651],
- ["8137AA34",0x2652],
- ["8137AA35",0x2653],
- ["8137AA36",0x2654],
- ["8137AA37",0x2655],
- ["8137AA38",0x2656],
- ["8137AA39",0x2657],
- ["8137AB30",0x2658],
- ["8137AB31",0x2659],
- ["8137AB32",0x265A],
- ["8137AB33",0x265B],
- ["8137AB34",0x265C],
- ["8137AB35",0x265D],
- ["8137AB36",0x265E],
- ["8137AB37",0x265F],
- ["8137AB38",0x2660],
- ["8137AB39",0x2661],
- ["8137AC30",0x2662],
- ["8137AC31",0x2663],
- ["8137AC32",0x2664],
- ["8137AC33",0x2665],
- ["8137AC34",0x2666],
- ["8137AC35",0x2667],
- ["8137AC36",0x2668],
- ["8137AC37",0x2669],
- ["8137AC38",0x266A],
- ["8137AC39",0x266B],
- ["8137AD30",0x266C],
- ["8137AD31",0x266D],
- ["8137AD32",0x266E],
- ["8137AD33",0x266F],
- ["8137AD34",0x2670],
- ["8137AD35",0x2671],
- ["8137AD36",0x2672],
- ["8137AD37",0x2673],
- ["8137AD38",0x2674],
- ["8137AD39",0x2675],
- ["8137AE30",0x2676],
- ["8137AE31",0x2677],
- ["8137AE32",0x2678],
- ["8137AE33",0x2679],
- ["8137AE34",0x267A],
- ["8137AE35",0x267B],
- ["8137AE36",0x267C],
- ["8137AE37",0x267D],
- ["8137AE38",0x267E],
- ["8137AE39",0x267F],
- ["8137AF30",0x2680],
- ["8137AF31",0x2681],
- ["8137AF32",0x2682],
- ["8137AF33",0x2683],
- ["8137AF34",0x2684],
- ["8137AF35",0x2685],
- ["8137AF36",0x2686],
- ["8137AF37",0x2687],
- ["8137AF38",0x2688],
- ["8137AF39",0x2689],
- ["8137B030",0x268A],
- ["8137B031",0x268B],
- ["8137B032",0x268C],
- ["8137B033",0x268D],
- ["8137B034",0x268E],
- ["8137B035",0x268F],
- ["8137B036",0x2690],
- ["8137B037",0x2691],
- ["8137B038",0x2692],
- ["8137B039",0x2693],
- ["8137B130",0x2694],
- ["8137B131",0x2695],
- ["8137B132",0x2696],
- ["8137B133",0x2697],
- ["8137B134",0x2698],
- ["8137B135",0x2699],
- ["8137B136",0x269A],
- ["8137B137",0x269B],
- ["8137B138",0x269C],
- ["8137B139",0x269D],
- ["8137B230",0x269E],
- ["8137B231",0x269F],
- ["8137B232",0x26A0],
- ["8137B233",0x26A1],
- ["8137B234",0x26A2],
- ["8137B235",0x26A3],
- ["8137B236",0x26A4],
- ["8137B237",0x26A5],
- ["8137B238",0x26A6],
- ["8137B239",0x26A7],
- ["8137B330",0x26A8],
- ["8137B331",0x26A9],
- ["8137B332",0x26AA],
- ["8137B333",0x26AB],
- ["8137B334",0x26AC],
- ["8137B335",0x26AD],
- ["8137B336",0x26AE],
- ["8137B337",0x26AF],
- ["8137B338",0x26B0],
- ["8137B339",0x26B1],
- ["8137B430",0x26B2],
- ["8137B431",0x26B3],
- ["8137B432",0x26B4],
- ["8137B433",0x26B5],
- ["8137B434",0x26B6],
- ["8137B435",0x26B7],
- ["8137B436",0x26B8],
- ["8137B437",0x26B9],
- ["8137B438",0x26BA],
- ["8137B439",0x26BB],
- ["8137B530",0x26BC],
- ["8137B531",0x26BD],
- ["8137B532",0x26BE],
- ["8137B533",0x26BF],
- ["8137B534",0x26C0],
- ["8137B535",0x26C1],
- ["8137B536",0x26C2],
- ["8137B537",0x26C3],
- ["8137B538",0x26C4],
- ["8137B539",0x26C5],
- ["8137B630",0x26C6],
- ["8137B631",0x26C7],
- ["8137B632",0x26C8],
- ["8137B633",0x26C9],
- ["8137B634",0x26CA],
- ["8137B635",0x26CB],
- ["8137B636",0x26CC],
- ["8137B637",0x26CD],
- ["8137B638",0x26CE],
- ["8137B639",0x26CF],
- ["8137B730",0x26D0],
- ["8137B731",0x26D1],
- ["8137B732",0x26D2],
- ["8137B733",0x26D3],
- ["8137B734",0x26D4],
- ["8137B735",0x26D5],
- ["8137B736",0x26D6],
- ["8137B737",0x26D7],
- ["8137B738",0x26D8],
- ["8137B739",0x26D9],
- ["8137B830",0x26DA],
- ["8137B831",0x26DB],
- ["8137B832",0x26DC],
- ["8137B833",0x26DD],
- ["8137B834",0x26DE],
- ["8137B835",0x26DF],
- ["8137B836",0x26E0],
- ["8137B837",0x26E1],
- ["8137B838",0x26E2],
- ["8137B839",0x26E3],
- ["8137B930",0x26E4],
- ["8137B931",0x26E5],
- ["8137B932",0x26E6],
- ["8137B933",0x26E7],
- ["8137B934",0x26E8],
- ["8137B935",0x26E9],
- ["8137B936",0x26EA],
- ["8137B937",0x26EB],
- ["8137B938",0x26EC],
- ["8137B939",0x26ED],
- ["8137BA30",0x26EE],
- ["8137BA31",0x26EF],
- ["8137BA32",0x26F0],
- ["8137BA33",0x26F1],
- ["8137BA34",0x26F2],
- ["8137BA35",0x26F3],
- ["8137BA36",0x26F4],
- ["8137BA37",0x26F5],
- ["8137BA38",0x26F6],
- ["8137BA39",0x26F7],
- ["8137BB30",0x26F8],
- ["8137BB31",0x26F9],
- ["8137BB32",0x26FA],
- ["8137BB33",0x26FB],
- ["8137BB34",0x26FC],
- ["8137BB35",0x26FD],
- ["8137BB36",0x26FE],
- ["8137BB37",0x26FF],
- ["8137BB38",0x2700],
- ["8137BB39",0x2701],
- ["8137BC30",0x2702],
- ["8137BC31",0x2703],
- ["8137BC32",0x2704],
- ["8137BC33",0x2705],
- ["8137BC34",0x2706],
- ["8137BC35",0x2707],
- ["8137BC36",0x2708],
- ["8137BC37",0x2709],
- ["8137BC38",0x270A],
- ["8137BC39",0x270B],
- ["8137BD30",0x270C],
- ["8137BD31",0x270D],
- ["8137BD32",0x270E],
- ["8137BD33",0x270F],
- ["8137BD34",0x2710],
- ["8137BD35",0x2711],
- ["8137BD36",0x2712],
- ["8137BD37",0x2713],
- ["8137BD38",0x2714],
- ["8137BD39",0x2715],
- ["8137BE30",0x2716],
- ["8137BE31",0x2717],
- ["8137BE32",0x2718],
- ["8137BE33",0x2719],
- ["8137BE34",0x271A],
- ["8137BE35",0x271B],
- ["8137BE36",0x271C],
- ["8137BE37",0x271D],
- ["8137BE38",0x271E],
- ["8137BE39",0x271F],
- ["8137BF30",0x2720],
- ["8137BF31",0x2721],
- ["8137BF32",0x2722],
- ["8137BF33",0x2723],
- ["8137BF34",0x2724],
- ["8137BF35",0x2725],
- ["8137BF36",0x2726],
- ["8137BF37",0x2727],
- ["8137BF38",0x2728],
- ["8137BF39",0x2729],
- ["8137C030",0x272A],
- ["8137C031",0x272B],
- ["8137C032",0x272C],
- ["8137C033",0x272D],
- ["8137C034",0x272E],
- ["8137C035",0x272F],
- ["8137C036",0x2730],
- ["8137C037",0x2731],
- ["8137C038",0x2732],
- ["8137C039",0x2733],
- ["8137C130",0x2734],
- ["8137C131",0x2735],
- ["8137C132",0x2736],
- ["8137C133",0x2737],
- ["8137C134",0x2738],
- ["8137C135",0x2739],
- ["8137C136",0x273A],
- ["8137C137",0x273B],
- ["8137C138",0x273C],
- ["8137C139",0x273D],
- ["8137C230",0x273E],
- ["8137C231",0x273F],
- ["8137C232",0x2740],
- ["8137C233",0x2741],
- ["8137C234",0x2742],
- ["8137C235",0x2743],
- ["8137C236",0x2744],
- ["8137C237",0x2745],
- ["8137C238",0x2746],
- ["8137C239",0x2747],
- ["8137C330",0x2748],
- ["8137C331",0x2749],
- ["8137C332",0x274A],
- ["8137C333",0x274B],
- ["8137C334",0x274C],
- ["8137C335",0x274D],
- ["8137C336",0x274E],
- ["8137C337",0x274F],
- ["8137C338",0x2750],
- ["8137C339",0x2751],
- ["8137C430",0x2752],
- ["8137C431",0x2753],
- ["8137C432",0x2754],
- ["8137C433",0x2755],
- ["8137C434",0x2756],
- ["8137C435",0x2757],
- ["8137C436",0x2758],
- ["8137C437",0x2759],
- ["8137C438",0x275A],
- ["8137C439",0x275B],
- ["8137C530",0x275C],
- ["8137C531",0x275D],
- ["8137C532",0x275E],
- ["8137C533",0x275F],
- ["8137C534",0x2760],
- ["8137C535",0x2761],
- ["8137C536",0x2762],
- ["8137C537",0x2763],
- ["8137C538",0x2764],
- ["8137C539",0x2765],
- ["8137C630",0x2766],
- ["8137C631",0x2767],
- ["8137C632",0x2768],
- ["8137C633",0x2769],
- ["8137C634",0x276A],
- ["8137C635",0x276B],
- ["8137C636",0x276C],
- ["8137C637",0x276D],
- ["8137C638",0x276E],
- ["8137C639",0x276F],
- ["8137C730",0x2770],
- ["8137C731",0x2771],
- ["8137C732",0x2772],
- ["8137C733",0x2773],
- ["8137C734",0x2774],
- ["8137C735",0x2775],
- ["8137C736",0x2776],
- ["8137C737",0x2777],
- ["8137C738",0x2778],
- ["8137C739",0x2779],
- ["8137C830",0x277A],
- ["8137C831",0x277B],
- ["8137C832",0x277C],
- ["8137C833",0x277D],
- ["8137C834",0x277E],
- ["8137C835",0x277F],
- ["8137C836",0x2780],
- ["8137C837",0x2781],
- ["8137C838",0x2782],
- ["8137C839",0x2783],
- ["8137C930",0x2784],
- ["8137C931",0x2785],
- ["8137C932",0x2786],
- ["8137C933",0x2787],
- ["8137C934",0x2788],
- ["8137C935",0x2789],
- ["8137C936",0x278A],
- ["8137C937",0x278B],
- ["8137C938",0x278C],
- ["8137C939",0x278D],
- ["8137CA30",0x278E],
- ["8137CA31",0x278F],
- ["8137CA32",0x2790],
- ["8137CA33",0x2791],
- ["8137CA34",0x2792],
- ["8137CA35",0x2793],
- ["8137CA36",0x2794],
- ["8137CA37",0x2795],
- ["8137CA38",0x2796],
- ["8137CA39",0x2797],
- ["8137CB30",0x2798],
- ["8137CB31",0x2799],
- ["8137CB32",0x279A],
- ["8137CB33",0x279B],
- ["8137CB34",0x279C],
- ["8137CB35",0x279D],
- ["8137CB36",0x279E],
- ["8137CB37",0x279F],
- ["8137CB38",0x27A0],
- ["8137CB39",0x27A1],
- ["8137CC30",0x27A2],
- ["8137CC31",0x27A3],
- ["8137CC32",0x27A4],
- ["8137CC33",0x27A5],
- ["8137CC34",0x27A6],
- ["8137CC35",0x27A7],
- ["8137CC36",0x27A8],
- ["8137CC37",0x27A9],
- ["8137CC38",0x27AA],
- ["8137CC39",0x27AB],
- ["8137CD30",0x27AC],
- ["8137CD31",0x27AD],
- ["8137CD32",0x27AE],
- ["8137CD33",0x27AF],
- ["8137CD34",0x27B0],
- ["8137CD35",0x27B1],
- ["8137CD36",0x27B2],
- ["8137CD37",0x27B3],
- ["8137CD38",0x27B4],
- ["8137CD39",0x27B5],
- ["8137CE30",0x27B6],
- ["8137CE31",0x27B7],
- ["8137CE32",0x27B8],
- ["8137CE33",0x27B9],
- ["8137CE34",0x27BA],
- ["8137CE35",0x27BB],
- ["8137CE36",0x27BC],
- ["8137CE37",0x27BD],
- ["8137CE38",0x27BE],
- ["8137CE39",0x27BF],
- ["8137CF30",0x27C0],
- ["8137CF31",0x27C1],
- ["8137CF32",0x27C2],
- ["8137CF33",0x27C3],
- ["8137CF34",0x27C4],
- ["8137CF35",0x27C5],
- ["8137CF36",0x27C6],
- ["8137CF37",0x27C7],
- ["8137CF38",0x27C8],
- ["8137CF39",0x27C9],
- ["8137D030",0x27CA],
- ["8137D031",0x27CB],
- ["8137D032",0x27CC],
- ["8137D033",0x27CD],
- ["8137D034",0x27CE],
- ["8137D035",0x27CF],
- ["8137D036",0x27D0],
- ["8137D037",0x27D1],
- ["8137D038",0x27D2],
- ["8137D039",0x27D3],
- ["8137D130",0x27D4],
- ["8137D131",0x27D5],
- ["8137D132",0x27D6],
- ["8137D133",0x27D7],
- ["8137D134",0x27D8],
- ["8137D135",0x27D9],
- ["8137D136",0x27DA],
- ["8137D137",0x27DB],
- ["8137D138",0x27DC],
- ["8137D139",0x27DD],
- ["8137D230",0x27DE],
- ["8137D231",0x27DF],
- ["8137D232",0x27E0],
- ["8137D233",0x27E1],
- ["8137D234",0x27E2],
- ["8137D235",0x27E3],
- ["8137D236",0x27E4],
- ["8137D237",0x27E5],
- ["8137D238",0x27E6],
- ["8137D239",0x27E7],
- ["8137D330",0x27E8],
- ["8137D331",0x27E9],
- ["8137D332",0x27EA],
- ["8137D333",0x27EB],
- ["8137D334",0x27EC],
- ["8137D335",0x27ED],
- ["8137D336",0x27EE],
- ["8137D337",0x27EF],
- ["8137D338",0x27F0],
- ["8137D339",0x27F1],
- ["8137D430",0x27F2],
- ["8137D431",0x27F3],
- ["8137D432",0x27F4],
- ["8137D433",0x27F5],
- ["8137D434",0x27F6],
- ["8137D435",0x27F7],
- ["8137D436",0x27F8],
- ["8137D437",0x27F9],
- ["8137D438",0x27FA],
- ["8137D439",0x27FB],
- ["8137D530",0x27FC],
- ["8137D531",0x27FD],
- ["8137D532",0x27FE],
- ["8137D533",0x27FF],
- ["8137D534",0x2800],
- ["8137D535",0x2801],
- ["8137D536",0x2802],
- ["8137D537",0x2803],
- ["8137D538",0x2804],
- ["8137D539",0x2805],
- ["8137D630",0x2806],
- ["8137D631",0x2807],
- ["8137D632",0x2808],
- ["8137D633",0x2809],
- ["8137D634",0x280A],
- ["8137D635",0x280B],
- ["8137D636",0x280C],
- ["8137D637",0x280D],
- ["8137D638",0x280E],
- ["8137D639",0x280F],
- ["8137D730",0x2810],
- ["8137D731",0x2811],
- ["8137D732",0x2812],
- ["8137D733",0x2813],
- ["8137D734",0x2814],
- ["8137D735",0x2815],
- ["8137D736",0x2816],
- ["8137D737",0x2817],
- ["8137D738",0x2818],
- ["8137D739",0x2819],
- ["8137D830",0x281A],
- ["8137D831",0x281B],
- ["8137D832",0x281C],
- ["8137D833",0x281D],
- ["8137D834",0x281E],
- ["8137D835",0x281F],
- ["8137D836",0x2820],
- ["8137D837",0x2821],
- ["8137D838",0x2822],
- ["8137D839",0x2823],
- ["8137D930",0x2824],
- ["8137D931",0x2825],
- ["8137D932",0x2826],
- ["8137D933",0x2827],
- ["8137D934",0x2828],
- ["8137D935",0x2829],
- ["8137D936",0x282A],
- ["8137D937",0x282B],
- ["8137D938",0x282C],
- ["8137D939",0x282D],
- ["8137DA30",0x282E],
- ["8137DA31",0x282F],
- ["8137DA32",0x2830],
- ["8137DA33",0x2831],
- ["8137DA34",0x2832],
- ["8137DA35",0x2833],
- ["8137DA36",0x2834],
- ["8137DA37",0x2835],
- ["8137DA38",0x2836],
- ["8137DA39",0x2837],
- ["8137DB30",0x2838],
- ["8137DB31",0x2839],
- ["8137DB32",0x283A],
- ["8137DB33",0x283B],
- ["8137DB34",0x283C],
- ["8137DB35",0x283D],
- ["8137DB36",0x283E],
- ["8137DB37",0x283F],
- ["8137DB38",0x2840],
- ["8137DB39",0x2841],
- ["8137DC30",0x2842],
- ["8137DC31",0x2843],
- ["8137DC32",0x2844],
- ["8137DC33",0x2845],
- ["8137DC34",0x2846],
- ["8137DC35",0x2847],
- ["8137DC36",0x2848],
- ["8137DC37",0x2849],
- ["8137DC38",0x284A],
- ["8137DC39",0x284B],
- ["8137DD30",0x284C],
- ["8137DD31",0x284D],
- ["8137DD32",0x284E],
- ["8137DD33",0x284F],
- ["8137DD34",0x2850],
- ["8137DD35",0x2851],
- ["8137DD36",0x2852],
- ["8137DD37",0x2853],
- ["8137DD38",0x2854],
- ["8137DD39",0x2855],
- ["8137DE30",0x2856],
- ["8137DE31",0x2857],
- ["8137DE32",0x2858],
- ["8137DE33",0x2859],
- ["8137DE34",0x285A],
- ["8137DE35",0x285B],
- ["8137DE36",0x285C],
- ["8137DE37",0x285D],
- ["8137DE38",0x285E],
- ["8137DE39",0x285F],
- ["8137DF30",0x2860],
- ["8137DF31",0x2861],
- ["8137DF32",0x2862],
- ["8137DF33",0x2863],
- ["8137DF34",0x2864],
- ["8137DF35",0x2865],
- ["8137DF36",0x2866],
- ["8137DF37",0x2867],
- ["8137DF38",0x2868],
- ["8137DF39",0x2869],
- ["8137E030",0x286A],
- ["8137E031",0x286B],
- ["8137E032",0x286C],
- ["8137E033",0x286D],
- ["8137E034",0x286E],
- ["8137E035",0x286F],
- ["8137E036",0x2870],
- ["8137E037",0x2871],
- ["8137E038",0x2872],
- ["8137E039",0x2873],
- ["8137E130",0x2874],
- ["8137E131",0x2875],
- ["8137E132",0x2876],
- ["8137E133",0x2877],
- ["8137E134",0x2878],
- ["8137E135",0x2879],
- ["8137E136",0x287A],
- ["8137E137",0x287B],
- ["8137E138",0x287C],
- ["8137E139",0x287D],
- ["8137E230",0x287E],
- ["8137E231",0x287F],
- ["8137E232",0x2880],
- ["8137E233",0x2881],
- ["8137E234",0x2882],
- ["8137E235",0x2883],
- ["8137E236",0x2884],
- ["8137E237",0x2885],
- ["8137E238",0x2886],
- ["8137E239",0x2887],
- ["8137E330",0x2888],
- ["8137E331",0x2889],
- ["8137E332",0x288A],
- ["8137E333",0x288B],
- ["8137E334",0x288C],
- ["8137E335",0x288D],
- ["8137E336",0x288E],
- ["8137E337",0x288F],
- ["8137E338",0x2890],
- ["8137E339",0x2891],
- ["8137E430",0x2892],
- ["8137E431",0x2893],
- ["8137E432",0x2894],
- ["8137E433",0x2895],
- ["8137E434",0x2896],
- ["8137E435",0x2897],
- ["8137E436",0x2898],
- ["8137E437",0x2899],
- ["8137E438",0x289A],
- ["8137E439",0x289B],
- ["8137E530",0x289C],
- ["8137E531",0x289D],
- ["8137E532",0x289E],
- ["8137E533",0x289F],
- ["8137E534",0x28A0],
- ["8137E535",0x28A1],
- ["8137E536",0x28A2],
- ["8137E537",0x28A3],
- ["8137E538",0x28A4],
- ["8137E539",0x28A5],
- ["8137E630",0x28A6],
- ["8137E631",0x28A7],
- ["8137E632",0x28A8],
- ["8137E633",0x28A9],
- ["8137E634",0x28AA],
- ["8137E635",0x28AB],
- ["8137E636",0x28AC],
- ["8137E637",0x28AD],
- ["8137E638",0x28AE],
- ["8137E639",0x28AF],
- ["8137E730",0x28B0],
- ["8137E731",0x28B1],
- ["8137E732",0x28B2],
- ["8137E733",0x28B3],
- ["8137E734",0x28B4],
- ["8137E735",0x28B5],
- ["8137E736",0x28B6],
- ["8137E737",0x28B7],
- ["8137E738",0x28B8],
- ["8137E739",0x28B9],
- ["8137E830",0x28BA],
- ["8137E831",0x28BB],
- ["8137E832",0x28BC],
- ["8137E833",0x28BD],
- ["8137E834",0x28BE],
- ["8137E835",0x28BF],
- ["8137E836",0x28C0],
- ["8137E837",0x28C1],
- ["8137E838",0x28C2],
- ["8137E839",0x28C3],
- ["8137E930",0x28C4],
- ["8137E931",0x28C5],
- ["8137E932",0x28C6],
- ["8137E933",0x28C7],
- ["8137E934",0x28C8],
- ["8137E935",0x28C9],
- ["8137E936",0x28CA],
- ["8137E937",0x28CB],
- ["8137E938",0x28CC],
- ["8137E939",0x28CD],
- ["8137EA30",0x28CE],
- ["8137EA31",0x28CF],
- ["8137EA32",0x28D0],
- ["8137EA33",0x28D1],
- ["8137EA34",0x28D2],
- ["8137EA35",0x28D3],
- ["8137EA36",0x28D4],
- ["8137EA37",0x28D5],
- ["8137EA38",0x28D6],
- ["8137EA39",0x28D7],
- ["8137EB30",0x28D8],
- ["8137EB31",0x28D9],
- ["8137EB32",0x28DA],
- ["8137EB33",0x28DB],
- ["8137EB34",0x28DC],
- ["8137EB35",0x28DD],
- ["8137EB36",0x28DE],
- ["8137EB37",0x28DF],
- ["8137EB38",0x28E0],
- ["8137EB39",0x28E1],
- ["8137EC30",0x28E2],
- ["8137EC31",0x28E3],
- ["8137EC32",0x28E4],
- ["8137EC33",0x28E5],
- ["8137EC34",0x28E6],
- ["8137EC35",0x28E7],
- ["8137EC36",0x28E8],
- ["8137EC37",0x28E9],
- ["8137EC38",0x28EA],
- ["8137EC39",0x28EB],
- ["8137ED30",0x28EC],
- ["8137ED31",0x28ED],
- ["8137ED32",0x28EE],
- ["8137ED33",0x28EF],
- ["8137ED34",0x28F0],
- ["8137ED35",0x28F1],
- ["8137ED36",0x28F2],
- ["8137ED37",0x28F3],
- ["8137ED38",0x28F4],
- ["8137ED39",0x28F5],
- ["8137EE30",0x28F6],
- ["8137EE31",0x28F7],
- ["8137EE32",0x28F8],
- ["8137EE33",0x28F9],
- ["8137EE34",0x28FA],
- ["8137EE35",0x28FB],
- ["8137EE36",0x28FC],
- ["8137EE37",0x28FD],
- ["8137EE38",0x28FE],
- ["8137EE39",0x28FF],
- ["8137EF30",0x2900],
- ["8137EF31",0x2901],
- ["8137EF32",0x2902],
- ["8137EF33",0x2903],
- ["8137EF34",0x2904],
- ["8137EF35",0x2905],
- ["8137EF36",0x2906],
- ["8137EF37",0x2907],
- ["8137EF38",0x2908],
- ["8137EF39",0x2909],
- ["8137F030",0x290A],
- ["8137F031",0x290B],
- ["8137F032",0x290C],
- ["8137F033",0x290D],
- ["8137F034",0x290E],
- ["8137F035",0x290F],
- ["8137F036",0x2910],
- ["8137F037",0x2911],
- ["8137F038",0x2912],
- ["8137F039",0x2913],
- ["8137F130",0x2914],
- ["8137F131",0x2915],
- ["8137F132",0x2916],
- ["8137F133",0x2917],
- ["8137F134",0x2918],
- ["8137F135",0x2919],
- ["8137F136",0x291A],
- ["8137F137",0x291B],
- ["8137F138",0x291C],
- ["8137F139",0x291D],
- ["8137F230",0x291E],
- ["8137F231",0x291F],
- ["8137F232",0x2920],
- ["8137F233",0x2921],
- ["8137F234",0x2922],
- ["8137F235",0x2923],
- ["8137F236",0x2924],
- ["8137F237",0x2925],
- ["8137F238",0x2926],
- ["8137F239",0x2927],
- ["8137F330",0x2928],
- ["8137F331",0x2929],
- ["8137F332",0x292A],
- ["8137F333",0x292B],
- ["8137F334",0x292C],
- ["8137F335",0x292D],
- ["8137F336",0x292E],
- ["8137F337",0x292F],
- ["8137F338",0x2930],
- ["8137F339",0x2931],
- ["8137F430",0x2932],
- ["8137F431",0x2933],
- ["8137F432",0x2934],
- ["8137F433",0x2935],
- ["8137F434",0x2936],
- ["8137F435",0x2937],
- ["8137F436",0x2938],
- ["8137F437",0x2939],
- ["8137F438",0x293A],
- ["8137F439",0x293B],
- ["8137F530",0x293C],
- ["8137F531",0x293D],
- ["8137F532",0x293E],
- ["8137F533",0x293F],
- ["8137F534",0x2940],
- ["8137F535",0x2941],
- ["8137F536",0x2942],
- ["8137F537",0x2943],
- ["8137F538",0x2944],
- ["8137F539",0x2945],
- ["8137F630",0x2946],
- ["8137F631",0x2947],
- ["8137F632",0x2948],
- ["8137F633",0x2949],
- ["8137F634",0x294A],
- ["8137F635",0x294B],
- ["8137F636",0x294C],
- ["8137F637",0x294D],
- ["8137F638",0x294E],
- ["8137F639",0x294F],
- ["8137F730",0x2950],
- ["8137F731",0x2951],
- ["8137F732",0x2952],
- ["8137F733",0x2953],
- ["8137F734",0x2954],
- ["8137F735",0x2955],
- ["8137F736",0x2956],
- ["8137F737",0x2957],
- ["8137F738",0x2958],
- ["8137F739",0x2959],
- ["8137F830",0x295A],
- ["8137F831",0x295B],
- ["8137F832",0x295C],
- ["8137F833",0x295D],
- ["8137F834",0x295E],
- ["8137F835",0x295F],
- ["8137F836",0x2960],
- ["8137F837",0x2961],
- ["8137F838",0x2962],
- ["8137F839",0x2963],
- ["8137F930",0x2964],
- ["8137F931",0x2965],
- ["8137F932",0x2966],
- ["8137F933",0x2967],
- ["8137F934",0x2968],
- ["8137F935",0x2969],
- ["8137F936",0x296A],
- ["8137F937",0x296B],
- ["8137F938",0x296C],
- ["8137F939",0x296D],
- ["8137FA30",0x296E],
- ["8137FA31",0x296F],
- ["8137FA32",0x2970],
- ["8137FA33",0x2971],
- ["8137FA34",0x2972],
- ["8137FA35",0x2973],
- ["8137FA36",0x2974],
- ["8137FA37",0x2975],
- ["8137FA38",0x2976],
- ["8137FA39",0x2977],
- ["8137FB30",0x2978],
- ["8137FB31",0x2979],
- ["8137FB32",0x297A],
- ["8137FB33",0x297B],
- ["8137FB34",0x297C],
- ["8137FB35",0x297D],
- ["8137FB36",0x297E],
- ["8137FB37",0x297F],
- ["8137FB38",0x2980],
- ["8137FB39",0x2981],
- ["8137FC30",0x2982],
- ["8137FC31",0x2983],
- ["8137FC32",0x2984],
- ["8137FC33",0x2985],
- ["8137FC34",0x2986],
- ["8137FC35",0x2987],
- ["8137FC36",0x2988],
- ["8137FC37",0x2989],
- ["8137FC38",0x298A],
- ["8137FC39",0x298B],
- ["8137FD30",0x298C],
- ["8137FD31",0x298D],
- ["8137FD32",0x298E],
- ["8137FD33",0x298F],
- ["8137FD34",0x2990],
- ["8137FD35",0x2991],
- ["8137FD36",0x2992],
- ["8137FD37",0x2993],
- ["8137FD38",0x2994],
- ["8137FD39",0x2995],
- ["8137FE30",0x2996],
- ["8137FE31",0x2997],
- ["8137FE32",0x2998],
- ["8137FE33",0x2999],
- ["8137FE34",0x299A],
- ["8137FE35",0x299B],
- ["8137FE36",0x299C],
- ["8137FE37",0x299D],
- ["8137FE38",0x299E],
- ["8137FE39",0x299F],
- ["81388130",0x29A0],
- ["81388131",0x29A1],
- ["81388132",0x29A2],
- ["81388133",0x29A3],
- ["81388134",0x29A4],
- ["81388135",0x29A5],
- ["81388136",0x29A6],
- ["81388137",0x29A7],
- ["81388138",0x29A8],
- ["81388139",0x29A9],
- ["81388230",0x29AA],
- ["81388231",0x29AB],
- ["81388232",0x29AC],
- ["81388233",0x29AD],
- ["81388234",0x29AE],
- ["81388235",0x29AF],
- ["81388236",0x29B0],
- ["81388237",0x29B1],
- ["81388238",0x29B2],
- ["81388239",0x29B3],
- ["81388330",0x29B4],
- ["81388331",0x29B5],
- ["81388332",0x29B6],
- ["81388333",0x29B7],
- ["81388334",0x29B8],
- ["81388335",0x29B9],
- ["81388336",0x29BA],
- ["81388337",0x29BB],
- ["81388338",0x29BC],
- ["81388339",0x29BD],
- ["81388430",0x29BE],
- ["81388431",0x29BF],
- ["81388432",0x29C0],
- ["81388433",0x29C1],
- ["81388434",0x29C2],
- ["81388435",0x29C3],
- ["81388436",0x29C4],
- ["81388437",0x29C5],
- ["81388438",0x29C6],
- ["81388439",0x29C7],
- ["81388530",0x29C8],
- ["81388531",0x29C9],
- ["81388532",0x29CA],
- ["81388533",0x29CB],
- ["81388534",0x29CC],
- ["81388535",0x29CD],
- ["81388536",0x29CE],
- ["81388537",0x29CF],
- ["81388538",0x29D0],
- ["81388539",0x29D1],
- ["81388630",0x29D2],
- ["81388631",0x29D3],
- ["81388632",0x29D4],
- ["81388633",0x29D5],
- ["81388634",0x29D6],
- ["81388635",0x29D7],
- ["81388636",0x29D8],
- ["81388637",0x29D9],
- ["81388638",0x29DA],
- ["81388639",0x29DB],
- ["81388730",0x29DC],
- ["81388731",0x29DD],
- ["81388732",0x29DE],
- ["81388733",0x29DF],
- ["81388734",0x29E0],
- ["81388735",0x29E1],
- ["81388736",0x29E2],
- ["81388737",0x29E3],
- ["81388738",0x29E4],
- ["81388739",0x29E5],
- ["81388830",0x29E6],
- ["81388831",0x29E7],
- ["81388832",0x29E8],
- ["81388833",0x29E9],
- ["81388834",0x29EA],
- ["81388835",0x29EB],
- ["81388836",0x29EC],
- ["81388837",0x29ED],
- ["81388838",0x29EE],
- ["81388839",0x29EF],
- ["81388930",0x29F0],
- ["81388931",0x29F1],
- ["81388932",0x29F2],
- ["81388933",0x29F3],
- ["81388934",0x29F4],
- ["81388935",0x29F5],
- ["81388936",0x29F6],
- ["81388937",0x29F7],
- ["81388938",0x29F8],
- ["81388939",0x29F9],
- ["81388A30",0x29FA],
- ["81388A31",0x29FB],
- ["81388A32",0x29FC],
- ["81388A33",0x29FD],
- ["81388A34",0x29FE],
- ["81388A35",0x29FF],
- ["81388A36",0x2A00],
- ["81388A37",0x2A01],
- ["81388A38",0x2A02],
- ["81388A39",0x2A03],
- ["81388B30",0x2A04],
- ["81388B31",0x2A05],
- ["81388B32",0x2A06],
- ["81388B33",0x2A07],
- ["81388B34",0x2A08],
- ["81388B35",0x2A09],
- ["81388B36",0x2A0A],
- ["81388B37",0x2A0B],
- ["81388B38",0x2A0C],
- ["81388B39",0x2A0D],
- ["81388C30",0x2A0E],
- ["81388C31",0x2A0F],
- ["81388C32",0x2A10],
- ["81388C33",0x2A11],
- ["81388C34",0x2A12],
- ["81388C35",0x2A13],
- ["81388C36",0x2A14],
- ["81388C37",0x2A15],
- ["81388C38",0x2A16],
- ["81388C39",0x2A17],
- ["81388D30",0x2A18],
- ["81388D31",0x2A19],
- ["81388D32",0x2A1A],
- ["81388D33",0x2A1B],
- ["81388D34",0x2A1C],
- ["81388D35",0x2A1D],
- ["81388D36",0x2A1E],
- ["81388D37",0x2A1F],
- ["81388D38",0x2A20],
- ["81388D39",0x2A21],
- ["81388E30",0x2A22],
- ["81388E31",0x2A23],
- ["81388E32",0x2A24],
- ["81388E33",0x2A25],
- ["81388E34",0x2A26],
- ["81388E35",0x2A27],
- ["81388E36",0x2A28],
- ["81388E37",0x2A29],
- ["81388E38",0x2A2A],
- ["81388E39",0x2A2B],
- ["81388F30",0x2A2C],
- ["81388F31",0x2A2D],
- ["81388F32",0x2A2E],
- ["81388F33",0x2A2F],
- ["81388F34",0x2A30],
- ["81388F35",0x2A31],
- ["81388F36",0x2A32],
- ["81388F37",0x2A33],
- ["81388F38",0x2A34],
- ["81388F39",0x2A35],
- ["81389030",0x2A36],
- ["81389031",0x2A37],
- ["81389032",0x2A38],
- ["81389033",0x2A39],
- ["81389034",0x2A3A],
- ["81389035",0x2A3B],
- ["81389036",0x2A3C],
- ["81389037",0x2A3D],
- ["81389038",0x2A3E],
- ["81389039",0x2A3F],
- ["81389130",0x2A40],
- ["81389131",0x2A41],
- ["81389132",0x2A42],
- ["81389133",0x2A43],
- ["81389134",0x2A44],
- ["81389135",0x2A45],
- ["81389136",0x2A46],
- ["81389137",0x2A47],
- ["81389138",0x2A48],
- ["81389139",0x2A49],
- ["81389230",0x2A4A],
- ["81389231",0x2A4B],
- ["81389232",0x2A4C],
- ["81389233",0x2A4D],
- ["81389234",0x2A4E],
- ["81389235",0x2A4F],
- ["81389236",0x2A50],
- ["81389237",0x2A51],
- ["81389238",0x2A52],
- ["81389239",0x2A53],
- ["81389330",0x2A54],
- ["81389331",0x2A55],
- ["81389332",0x2A56],
- ["81389333",0x2A57],
- ["81389334",0x2A58],
- ["81389335",0x2A59],
- ["81389336",0x2A5A],
- ["81389337",0x2A5B],
- ["81389338",0x2A5C],
- ["81389339",0x2A5D],
- ["81389430",0x2A5E],
- ["81389431",0x2A5F],
- ["81389432",0x2A60],
- ["81389433",0x2A61],
- ["81389434",0x2A62],
- ["81389435",0x2A63],
- ["81389436",0x2A64],
- ["81389437",0x2A65],
- ["81389438",0x2A66],
- ["81389439",0x2A67],
- ["81389530",0x2A68],
- ["81389531",0x2A69],
- ["81389532",0x2A6A],
- ["81389533",0x2A6B],
- ["81389534",0x2A6C],
- ["81389535",0x2A6D],
- ["81389536",0x2A6E],
- ["81389537",0x2A6F],
- ["81389538",0x2A70],
- ["81389539",0x2A71],
- ["81389630",0x2A72],
- ["81389631",0x2A73],
- ["81389632",0x2A74],
- ["81389633",0x2A75],
- ["81389634",0x2A76],
- ["81389635",0x2A77],
- ["81389636",0x2A78],
- ["81389637",0x2A79],
- ["81389638",0x2A7A],
- ["81389639",0x2A7B],
- ["81389730",0x2A7C],
- ["81389731",0x2A7D],
- ["81389732",0x2A7E],
- ["81389733",0x2A7F],
- ["81389734",0x2A80],
- ["81389735",0x2A81],
- ["81389736",0x2A82],
- ["81389737",0x2A83],
- ["81389738",0x2A84],
- ["81389739",0x2A85],
- ["81389830",0x2A86],
- ["81389831",0x2A87],
- ["81389832",0x2A88],
- ["81389833",0x2A89],
- ["81389834",0x2A8A],
- ["81389835",0x2A8B],
- ["81389836",0x2A8C],
- ["81389837",0x2A8D],
- ["81389838",0x2A8E],
- ["81389839",0x2A8F],
- ["81389930",0x2A90],
- ["81389931",0x2A91],
- ["81389932",0x2A92],
- ["81389933",0x2A93],
- ["81389934",0x2A94],
- ["81389935",0x2A95],
- ["81389936",0x2A96],
- ["81389937",0x2A97],
- ["81389938",0x2A98],
- ["81389939",0x2A99],
- ["81389A30",0x2A9A],
- ["81389A31",0x2A9B],
- ["81389A32",0x2A9C],
- ["81389A33",0x2A9D],
- ["81389A34",0x2A9E],
- ["81389A35",0x2A9F],
- ["81389A36",0x2AA0],
- ["81389A37",0x2AA1],
- ["81389A38",0x2AA2],
- ["81389A39",0x2AA3],
- ["81389B30",0x2AA4],
- ["81389B31",0x2AA5],
- ["81389B32",0x2AA6],
- ["81389B33",0x2AA7],
- ["81389B34",0x2AA8],
- ["81389B35",0x2AA9],
- ["81389B36",0x2AAA],
- ["81389B37",0x2AAB],
- ["81389B38",0x2AAC],
- ["81389B39",0x2AAD],
- ["81389C30",0x2AAE],
- ["81389C31",0x2AAF],
- ["81389C32",0x2AB0],
- ["81389C33",0x2AB1],
- ["81389C34",0x2AB2],
- ["81389C35",0x2AB3],
- ["81389C36",0x2AB4],
- ["81389C37",0x2AB5],
- ["81389C38",0x2AB6],
- ["81389C39",0x2AB7],
- ["81389D30",0x2AB8],
- ["81389D31",0x2AB9],
- ["81389D32",0x2ABA],
- ["81389D33",0x2ABB],
- ["81389D34",0x2ABC],
- ["81389D35",0x2ABD],
- ["81389D36",0x2ABE],
- ["81389D37",0x2ABF],
- ["81389D38",0x2AC0],
- ["81389D39",0x2AC1],
- ["81389E30",0x2AC2],
- ["81389E31",0x2AC3],
- ["81389E32",0x2AC4],
- ["81389E33",0x2AC5],
- ["81389E34",0x2AC6],
- ["81389E35",0x2AC7],
- ["81389E36",0x2AC8],
- ["81389E37",0x2AC9],
- ["81389E38",0x2ACA],
- ["81389E39",0x2ACB],
- ["81389F30",0x2ACC],
- ["81389F31",0x2ACD],
- ["81389F32",0x2ACE],
- ["81389F33",0x2ACF],
- ["81389F34",0x2AD0],
- ["81389F35",0x2AD1],
- ["81389F36",0x2AD2],
- ["81389F37",0x2AD3],
- ["81389F38",0x2AD4],
- ["81389F39",0x2AD5],
- ["8138A030",0x2AD6],
- ["8138A031",0x2AD7],
- ["8138A032",0x2AD8],
- ["8138A033",0x2AD9],
- ["8138A034",0x2ADA],
- ["8138A035",0x2ADB],
- ["8138A036",0x2ADC],
- ["8138A037",0x2ADD],
- ["8138A038",0x2ADE],
- ["8138A039",0x2ADF],
- ["8138A130",0x2AE0],
- ["8138A131",0x2AE1],
- ["8138A132",0x2AE2],
- ["8138A133",0x2AE3],
- ["8138A134",0x2AE4],
- ["8138A135",0x2AE5],
- ["8138A136",0x2AE6],
- ["8138A137",0x2AE7],
- ["8138A138",0x2AE8],
- ["8138A139",0x2AE9],
- ["8138A230",0x2AEA],
- ["8138A231",0x2AEB],
- ["8138A232",0x2AEC],
- ["8138A233",0x2AED],
- ["8138A234",0x2AEE],
- ["8138A235",0x2AEF],
- ["8138A236",0x2AF0],
- ["8138A237",0x2AF1],
- ["8138A238",0x2AF2],
- ["8138A239",0x2AF3],
- ["8138A330",0x2AF4],
- ["8138A331",0x2AF5],
- ["8138A332",0x2AF6],
- ["8138A333",0x2AF7],
- ["8138A334",0x2AF8],
- ["8138A335",0x2AF9],
- ["8138A336",0x2AFA],
- ["8138A337",0x2AFB],
- ["8138A338",0x2AFC],
- ["8138A339",0x2AFD],
- ["8138A430",0x2AFE],
- ["8138A431",0x2AFF],
- ["8138A432",0x2B00],
- ["8138A433",0x2B01],
- ["8138A434",0x2B02],
- ["8138A435",0x2B03],
- ["8138A436",0x2B04],
- ["8138A437",0x2B05],
- ["8138A438",0x2B06],
- ["8138A439",0x2B07],
- ["8138A530",0x2B08],
- ["8138A531",0x2B09],
- ["8138A532",0x2B0A],
- ["8138A533",0x2B0B],
- ["8138A534",0x2B0C],
- ["8138A535",0x2B0D],
- ["8138A536",0x2B0E],
- ["8138A537",0x2B0F],
- ["8138A538",0x2B10],
- ["8138A539",0x2B11],
- ["8138A630",0x2B12],
- ["8138A631",0x2B13],
- ["8138A632",0x2B14],
- ["8138A633",0x2B15],
- ["8138A634",0x2B16],
- ["8138A635",0x2B17],
- ["8138A636",0x2B18],
- ["8138A637",0x2B19],
- ["8138A638",0x2B1A],
- ["8138A639",0x2B1B],
- ["8138A730",0x2B1C],
- ["8138A731",0x2B1D],
- ["8138A732",0x2B1E],
- ["8138A733",0x2B1F],
- ["8138A734",0x2B20],
- ["8138A735",0x2B21],
- ["8138A736",0x2B22],
- ["8138A737",0x2B23],
- ["8138A738",0x2B24],
- ["8138A739",0x2B25],
- ["8138A830",0x2B26],
- ["8138A831",0x2B27],
- ["8138A832",0x2B28],
- ["8138A833",0x2B29],
- ["8138A834",0x2B2A],
- ["8138A835",0x2B2B],
- ["8138A836",0x2B2C],
- ["8138A837",0x2B2D],
- ["8138A838",0x2B2E],
- ["8138A839",0x2B2F],
- ["8138A930",0x2B30],
- ["8138A931",0x2B31],
- ["8138A932",0x2B32],
- ["8138A933",0x2B33],
- ["8138A934",0x2B34],
- ["8138A935",0x2B35],
- ["8138A936",0x2B36],
- ["8138A937",0x2B37],
- ["8138A938",0x2B38],
- ["8138A939",0x2B39],
- ["8138AA30",0x2B3A],
- ["8138AA31",0x2B3B],
- ["8138AA32",0x2B3C],
- ["8138AA33",0x2B3D],
- ["8138AA34",0x2B3E],
- ["8138AA35",0x2B3F],
- ["8138AA36",0x2B40],
- ["8138AA37",0x2B41],
- ["8138AA38",0x2B42],
- ["8138AA39",0x2B43],
- ["8138AB30",0x2B44],
- ["8138AB31",0x2B45],
- ["8138AB32",0x2B46],
- ["8138AB33",0x2B47],
- ["8138AB34",0x2B48],
- ["8138AB35",0x2B49],
- ["8138AB36",0x2B4A],
- ["8138AB37",0x2B4B],
- ["8138AB38",0x2B4C],
- ["8138AB39",0x2B4D],
- ["8138AC30",0x2B4E],
- ["8138AC31",0x2B4F],
- ["8138AC32",0x2B50],
- ["8138AC33",0x2B51],
- ["8138AC34",0x2B52],
- ["8138AC35",0x2B53],
- ["8138AC36",0x2B54],
- ["8138AC37",0x2B55],
- ["8138AC38",0x2B56],
- ["8138AC39",0x2B57],
- ["8138AD30",0x2B58],
- ["8138AD31",0x2B59],
- ["8138AD32",0x2B5A],
- ["8138AD33",0x2B5B],
- ["8138AD34",0x2B5C],
- ["8138AD35",0x2B5D],
- ["8138AD36",0x2B5E],
- ["8138AD37",0x2B5F],
- ["8138AD38",0x2B60],
- ["8138AD39",0x2B61],
- ["8138AE30",0x2B62],
- ["8138AE31",0x2B63],
- ["8138AE32",0x2B64],
- ["8138AE33",0x2B65],
- ["8138AE34",0x2B66],
- ["8138AE35",0x2B67],
- ["8138AE36",0x2B68],
- ["8138AE37",0x2B69],
- ["8138AE38",0x2B6A],
- ["8138AE39",0x2B6B],
- ["8138AF30",0x2B6C],
- ["8138AF31",0x2B6D],
- ["8138AF32",0x2B6E],
- ["8138AF33",0x2B6F],
- ["8138AF34",0x2B70],
- ["8138AF35",0x2B71],
- ["8138AF36",0x2B72],
- ["8138AF37",0x2B73],
- ["8138AF38",0x2B74],
- ["8138AF39",0x2B75],
- ["8138B030",0x2B76],
- ["8138B031",0x2B77],
- ["8138B032",0x2B78],
- ["8138B033",0x2B79],
- ["8138B034",0x2B7A],
- ["8138B035",0x2B7B],
- ["8138B036",0x2B7C],
- ["8138B037",0x2B7D],
- ["8138B038",0x2B7E],
- ["8138B039",0x2B7F],
- ["8138B130",0x2B80],
- ["8138B131",0x2B81],
- ["8138B132",0x2B82],
- ["8138B133",0x2B83],
- ["8138B134",0x2B84],
- ["8138B135",0x2B85],
- ["8138B136",0x2B86],
- ["8138B137",0x2B87],
- ["8138B138",0x2B88],
- ["8138B139",0x2B89],
- ["8138B230",0x2B8A],
- ["8138B231",0x2B8B],
- ["8138B232",0x2B8C],
- ["8138B233",0x2B8D],
- ["8138B234",0x2B8E],
- ["8138B235",0x2B8F],
- ["8138B236",0x2B90],
- ["8138B237",0x2B91],
- ["8138B238",0x2B92],
- ["8138B239",0x2B93],
- ["8138B330",0x2B94],
- ["8138B331",0x2B95],
- ["8138B332",0x2B96],
- ["8138B333",0x2B97],
- ["8138B334",0x2B98],
- ["8138B335",0x2B99],
- ["8138B336",0x2B9A],
- ["8138B337",0x2B9B],
- ["8138B338",0x2B9C],
- ["8138B339",0x2B9D],
- ["8138B430",0x2B9E],
- ["8138B431",0x2B9F],
- ["8138B432",0x2BA0],
- ["8138B433",0x2BA1],
- ["8138B434",0x2BA2],
- ["8138B435",0x2BA3],
- ["8138B436",0x2BA4],
- ["8138B437",0x2BA5],
- ["8138B438",0x2BA6],
- ["8138B439",0x2BA7],
- ["8138B530",0x2BA8],
- ["8138B531",0x2BA9],
- ["8138B532",0x2BAA],
- ["8138B533",0x2BAB],
- ["8138B534",0x2BAC],
- ["8138B535",0x2BAD],
- ["8138B536",0x2BAE],
- ["8138B537",0x2BAF],
- ["8138B538",0x2BB0],
- ["8138B539",0x2BB1],
- ["8138B630",0x2BB2],
- ["8138B631",0x2BB3],
- ["8138B632",0x2BB4],
- ["8138B633",0x2BB5],
- ["8138B634",0x2BB6],
- ["8138B635",0x2BB7],
- ["8138B636",0x2BB8],
- ["8138B637",0x2BB9],
- ["8138B638",0x2BBA],
- ["8138B639",0x2BBB],
- ["8138B730",0x2BBC],
- ["8138B731",0x2BBD],
- ["8138B732",0x2BBE],
- ["8138B733",0x2BBF],
- ["8138B734",0x2BC0],
- ["8138B735",0x2BC1],
- ["8138B736",0x2BC2],
- ["8138B737",0x2BC3],
- ["8138B738",0x2BC4],
- ["8138B739",0x2BC5],
- ["8138B830",0x2BC6],
- ["8138B831",0x2BC7],
- ["8138B832",0x2BC8],
- ["8138B833",0x2BC9],
- ["8138B834",0x2BCA],
- ["8138B835",0x2BCB],
- ["8138B836",0x2BCC],
- ["8138B837",0x2BCD],
- ["8138B838",0x2BCE],
- ["8138B839",0x2BCF],
- ["8138B930",0x2BD0],
- ["8138B931",0x2BD1],
- ["8138B932",0x2BD2],
- ["8138B933",0x2BD3],
- ["8138B934",0x2BD4],
- ["8138B935",0x2BD5],
- ["8138B936",0x2BD6],
- ["8138B937",0x2BD7],
- ["8138B938",0x2BD8],
- ["8138B939",0x2BD9],
- ["8138BA30",0x2BDA],
- ["8138BA31",0x2BDB],
- ["8138BA32",0x2BDC],
- ["8138BA33",0x2BDD],
- ["8138BA34",0x2BDE],
- ["8138BA35",0x2BDF],
- ["8138BA36",0x2BE0],
- ["8138BA37",0x2BE1],
- ["8138BA38",0x2BE2],
- ["8138BA39",0x2BE3],
- ["8138BB30",0x2BE4],
- ["8138BB31",0x2BE5],
- ["8138BB32",0x2BE6],
- ["8138BB33",0x2BE7],
- ["8138BB34",0x2BE8],
- ["8138BB35",0x2BE9],
- ["8138BB36",0x2BEA],
- ["8138BB37",0x2BEB],
- ["8138BB38",0x2BEC],
- ["8138BB39",0x2BED],
- ["8138BC30",0x2BEE],
- ["8138BC31",0x2BEF],
- ["8138BC32",0x2BF0],
- ["8138BC33",0x2BF1],
- ["8138BC34",0x2BF2],
- ["8138BC35",0x2BF3],
- ["8138BC36",0x2BF4],
- ["8138BC37",0x2BF5],
- ["8138BC38",0x2BF6],
- ["8138BC39",0x2BF7],
- ["8138BD30",0x2BF8],
- ["8138BD31",0x2BF9],
- ["8138BD32",0x2BFA],
- ["8138BD33",0x2BFB],
- ["8138BD34",0x2BFC],
- ["8138BD35",0x2BFD],
- ["8138BD36",0x2BFE],
- ["8138BD37",0x2BFF],
- ["8138BD38",0x2C00],
- ["8138BD39",0x2C01],
- ["8138BE30",0x2C02],
- ["8138BE31",0x2C03],
- ["8138BE32",0x2C04],
- ["8138BE33",0x2C05],
- ["8138BE34",0x2C06],
- ["8138BE35",0x2C07],
- ["8138BE36",0x2C08],
- ["8138BE37",0x2C09],
- ["8138BE38",0x2C0A],
- ["8138BE39",0x2C0B],
- ["8138BF30",0x2C0C],
- ["8138BF31",0x2C0D],
- ["8138BF32",0x2C0E],
- ["8138BF33",0x2C0F],
- ["8138BF34",0x2C10],
- ["8138BF35",0x2C11],
- ["8138BF36",0x2C12],
- ["8138BF37",0x2C13],
- ["8138BF38",0x2C14],
- ["8138BF39",0x2C15],
- ["8138C030",0x2C16],
- ["8138C031",0x2C17],
- ["8138C032",0x2C18],
- ["8138C033",0x2C19],
- ["8138C034",0x2C1A],
- ["8138C035",0x2C1B],
- ["8138C036",0x2C1C],
- ["8138C037",0x2C1D],
- ["8138C038",0x2C1E],
- ["8138C039",0x2C1F],
- ["8138C130",0x2C20],
- ["8138C131",0x2C21],
- ["8138C132",0x2C22],
- ["8138C133",0x2C23],
- ["8138C134",0x2C24],
- ["8138C135",0x2C25],
- ["8138C136",0x2C26],
- ["8138C137",0x2C27],
- ["8138C138",0x2C28],
- ["8138C139",0x2C29],
- ["8138C230",0x2C2A],
- ["8138C231",0x2C2B],
- ["8138C232",0x2C2C],
- ["8138C233",0x2C2D],
- ["8138C234",0x2C2E],
- ["8138C235",0x2C2F],
- ["8138C236",0x2C30],
- ["8138C237",0x2C31],
- ["8138C238",0x2C32],
- ["8138C239",0x2C33],
- ["8138C330",0x2C34],
- ["8138C331",0x2C35],
- ["8138C332",0x2C36],
- ["8138C333",0x2C37],
- ["8138C334",0x2C38],
- ["8138C335",0x2C39],
- ["8138C336",0x2C3A],
- ["8138C337",0x2C3B],
- ["8138C338",0x2C3C],
- ["8138C339",0x2C3D],
- ["8138C430",0x2C3E],
- ["8138C431",0x2C3F],
- ["8138C432",0x2C40],
- ["8138C433",0x2C41],
- ["8138C434",0x2C42],
- ["8138C435",0x2C43],
- ["8138C436",0x2C44],
- ["8138C437",0x2C45],
- ["8138C438",0x2C46],
- ["8138C439",0x2C47],
- ["8138C530",0x2C48],
- ["8138C531",0x2C49],
- ["8138C532",0x2C4A],
- ["8138C533",0x2C4B],
- ["8138C534",0x2C4C],
- ["8138C535",0x2C4D],
- ["8138C536",0x2C4E],
- ["8138C537",0x2C4F],
- ["8138C538",0x2C50],
- ["8138C539",0x2C51],
- ["8138C630",0x2C52],
- ["8138C631",0x2C53],
- ["8138C632",0x2C54],
- ["8138C633",0x2C55],
- ["8138C634",0x2C56],
- ["8138C635",0x2C57],
- ["8138C636",0x2C58],
- ["8138C637",0x2C59],
- ["8138C638",0x2C5A],
- ["8138C639",0x2C5B],
- ["8138C730",0x2C5C],
- ["8138C731",0x2C5D],
- ["8138C732",0x2C5E],
- ["8138C733",0x2C5F],
- ["8138C734",0x2C60],
- ["8138C735",0x2C61],
- ["8138C736",0x2C62],
- ["8138C737",0x2C63],
- ["8138C738",0x2C64],
- ["8138C739",0x2C65],
- ["8138C830",0x2C66],
- ["8138C831",0x2C67],
- ["8138C832",0x2C68],
- ["8138C833",0x2C69],
- ["8138C834",0x2C6A],
- ["8138C835",0x2C6B],
- ["8138C836",0x2C6C],
- ["8138C837",0x2C6D],
- ["8138C838",0x2C6E],
- ["8138C839",0x2C6F],
- ["8138C930",0x2C70],
- ["8138C931",0x2C71],
- ["8138C932",0x2C72],
- ["8138C933",0x2C73],
- ["8138C934",0x2C74],
- ["8138C935",0x2C75],
- ["8138C936",0x2C76],
- ["8138C937",0x2C77],
- ["8138C938",0x2C78],
- ["8138C939",0x2C79],
- ["8138CA30",0x2C7A],
- ["8138CA31",0x2C7B],
- ["8138CA32",0x2C7C],
- ["8138CA33",0x2C7D],
- ["8138CA34",0x2C7E],
- ["8138CA35",0x2C7F],
- ["8138CA36",0x2C80],
- ["8138CA37",0x2C81],
- ["8138CA38",0x2C82],
- ["8138CA39",0x2C83],
- ["8138CB30",0x2C84],
- ["8138CB31",0x2C85],
- ["8138CB32",0x2C86],
- ["8138CB33",0x2C87],
- ["8138CB34",0x2C88],
- ["8138CB35",0x2C89],
- ["8138CB36",0x2C8A],
- ["8138CB37",0x2C8B],
- ["8138CB38",0x2C8C],
- ["8138CB39",0x2C8D],
- ["8138CC30",0x2C8E],
- ["8138CC31",0x2C8F],
- ["8138CC32",0x2C90],
- ["8138CC33",0x2C91],
- ["8138CC34",0x2C92],
- ["8138CC35",0x2C93],
- ["8138CC36",0x2C94],
- ["8138CC37",0x2C95],
- ["8138CC38",0x2C96],
- ["8138CC39",0x2C97],
- ["8138CD30",0x2C98],
- ["8138CD31",0x2C99],
- ["8138CD32",0x2C9A],
- ["8138CD33",0x2C9B],
- ["8138CD34",0x2C9C],
- ["8138CD35",0x2C9D],
- ["8138CD36",0x2C9E],
- ["8138CD37",0x2C9F],
- ["8138CD38",0x2CA0],
- ["8138CD39",0x2CA1],
- ["8138CE30",0x2CA2],
- ["8138CE31",0x2CA3],
- ["8138CE32",0x2CA4],
- ["8138CE33",0x2CA5],
- ["8138CE34",0x2CA6],
- ["8138CE35",0x2CA7],
- ["8138CE36",0x2CA8],
- ["8138CE37",0x2CA9],
- ["8138CE38",0x2CAA],
- ["8138CE39",0x2CAB],
- ["8138CF30",0x2CAC],
- ["8138CF31",0x2CAD],
- ["8138CF32",0x2CAE],
- ["8138CF33",0x2CAF],
- ["8138CF34",0x2CB0],
- ["8138CF35",0x2CB1],
- ["8138CF36",0x2CB2],
- ["8138CF37",0x2CB3],
- ["8138CF38",0x2CB4],
- ["8138CF39",0x2CB5],
- ["8138D030",0x2CB6],
- ["8138D031",0x2CB7],
- ["8138D032",0x2CB8],
- ["8138D033",0x2CB9],
- ["8138D034",0x2CBA],
- ["8138D035",0x2CBB],
- ["8138D036",0x2CBC],
- ["8138D037",0x2CBD],
- ["8138D038",0x2CBE],
- ["8138D039",0x2CBF],
- ["8138D130",0x2CC0],
- ["8138D131",0x2CC1],
- ["8138D132",0x2CC2],
- ["8138D133",0x2CC3],
- ["8138D134",0x2CC4],
- ["8138D135",0x2CC5],
- ["8138D136",0x2CC6],
- ["8138D137",0x2CC7],
- ["8138D138",0x2CC8],
- ["8138D139",0x2CC9],
- ["8138D230",0x2CCA],
- ["8138D231",0x2CCB],
- ["8138D232",0x2CCC],
- ["8138D233",0x2CCD],
- ["8138D234",0x2CCE],
- ["8138D235",0x2CCF],
- ["8138D236",0x2CD0],
- ["8138D237",0x2CD1],
- ["8138D238",0x2CD2],
- ["8138D239",0x2CD3],
- ["8138D330",0x2CD4],
- ["8138D331",0x2CD5],
- ["8138D332",0x2CD6],
- ["8138D333",0x2CD7],
- ["8138D334",0x2CD8],
- ["8138D335",0x2CD9],
- ["8138D336",0x2CDA],
- ["8138D337",0x2CDB],
- ["8138D338",0x2CDC],
- ["8138D339",0x2CDD],
- ["8138D430",0x2CDE],
- ["8138D431",0x2CDF],
- ["8138D432",0x2CE0],
- ["8138D433",0x2CE1],
- ["8138D434",0x2CE2],
- ["8138D435",0x2CE3],
- ["8138D436",0x2CE4],
- ["8138D437",0x2CE5],
- ["8138D438",0x2CE6],
- ["8138D439",0x2CE7],
- ["8138D530",0x2CE8],
- ["8138D531",0x2CE9],
- ["8138D532",0x2CEA],
- ["8138D533",0x2CEB],
- ["8138D534",0x2CEC],
- ["8138D535",0x2CED],
- ["8138D536",0x2CEE],
- ["8138D537",0x2CEF],
- ["8138D538",0x2CF0],
- ["8138D539",0x2CF1],
- ["8138D630",0x2CF2],
- ["8138D631",0x2CF3],
- ["8138D632",0x2CF4],
- ["8138D633",0x2CF5],
- ["8138D634",0x2CF6],
- ["8138D635",0x2CF7],
- ["8138D636",0x2CF8],
- ["8138D637",0x2CF9],
- ["8138D638",0x2CFA],
- ["8138D639",0x2CFB],
- ["8138D730",0x2CFC],
- ["8138D731",0x2CFD],
- ["8138D732",0x2CFE],
- ["8138D733",0x2CFF],
- ["8138D734",0x2D00],
- ["8138D735",0x2D01],
- ["8138D736",0x2D02],
- ["8138D737",0x2D03],
- ["8138D738",0x2D04],
- ["8138D739",0x2D05],
- ["8138D830",0x2D06],
- ["8138D831",0x2D07],
- ["8138D832",0x2D08],
- ["8138D833",0x2D09],
- ["8138D834",0x2D0A],
- ["8138D835",0x2D0B],
- ["8138D836",0x2D0C],
- ["8138D837",0x2D0D],
- ["8138D838",0x2D0E],
- ["8138D839",0x2D0F],
- ["8138D930",0x2D10],
- ["8138D931",0x2D11],
- ["8138D932",0x2D12],
- ["8138D933",0x2D13],
- ["8138D934",0x2D14],
- ["8138D935",0x2D15],
- ["8138D936",0x2D16],
- ["8138D937",0x2D17],
- ["8138D938",0x2D18],
- ["8138D939",0x2D19],
- ["8138DA30",0x2D1A],
- ["8138DA31",0x2D1B],
- ["8138DA32",0x2D1C],
- ["8138DA33",0x2D1D],
- ["8138DA34",0x2D1E],
- ["8138DA35",0x2D1F],
- ["8138DA36",0x2D20],
- ["8138DA37",0x2D21],
- ["8138DA38",0x2D22],
- ["8138DA39",0x2D23],
- ["8138DB30",0x2D24],
- ["8138DB31",0x2D25],
- ["8138DB32",0x2D26],
- ["8138DB33",0x2D27],
- ["8138DB34",0x2D28],
- ["8138DB35",0x2D29],
- ["8138DB36",0x2D2A],
- ["8138DB37",0x2D2B],
- ["8138DB38",0x2D2C],
- ["8138DB39",0x2D2D],
- ["8138DC30",0x2D2E],
- ["8138DC31",0x2D2F],
- ["8138DC32",0x2D30],
- ["8138DC33",0x2D31],
- ["8138DC34",0x2D32],
- ["8138DC35",0x2D33],
- ["8138DC36",0x2D34],
- ["8138DC37",0x2D35],
- ["8138DC38",0x2D36],
- ["8138DC39",0x2D37],
- ["8138DD30",0x2D38],
- ["8138DD31",0x2D39],
- ["8138DD32",0x2D3A],
- ["8138DD33",0x2D3B],
- ["8138DD34",0x2D3C],
- ["8138DD35",0x2D3D],
- ["8138DD36",0x2D3E],
- ["8138DD37",0x2D3F],
- ["8138DD38",0x2D40],
- ["8138DD39",0x2D41],
- ["8138DE30",0x2D42],
- ["8138DE31",0x2D43],
- ["8138DE32",0x2D44],
- ["8138DE33",0x2D45],
- ["8138DE34",0x2D46],
- ["8138DE35",0x2D47],
- ["8138DE36",0x2D48],
- ["8138DE37",0x2D49],
- ["8138DE38",0x2D4A],
- ["8138DE39",0x2D4B],
- ["8138DF30",0x2D4C],
- ["8138DF31",0x2D4D],
- ["8138DF32",0x2D4E],
- ["8138DF33",0x2D4F],
- ["8138DF34",0x2D50],
- ["8138DF35",0x2D51],
- ["8138DF36",0x2D52],
- ["8138DF37",0x2D53],
- ["8138DF38",0x2D54],
- ["8138DF39",0x2D55],
- ["8138E030",0x2D56],
- ["8138E031",0x2D57],
- ["8138E032",0x2D58],
- ["8138E033",0x2D59],
- ["8138E034",0x2D5A],
- ["8138E035",0x2D5B],
- ["8138E036",0x2D5C],
- ["8138E037",0x2D5D],
- ["8138E038",0x2D5E],
- ["8138E039",0x2D5F],
- ["8138E130",0x2D60],
- ["8138E131",0x2D61],
- ["8138E132",0x2D62],
- ["8138E133",0x2D63],
- ["8138E134",0x2D64],
- ["8138E135",0x2D65],
- ["8138E136",0x2D66],
- ["8138E137",0x2D67],
- ["8138E138",0x2D68],
- ["8138E139",0x2D69],
- ["8138E230",0x2D6A],
- ["8138E231",0x2D6B],
- ["8138E232",0x2D6C],
- ["8138E233",0x2D6D],
- ["8138E234",0x2D6E],
- ["8138E235",0x2D6F],
- ["8138E236",0x2D70],
- ["8138E237",0x2D71],
- ["8138E238",0x2D72],
- ["8138E239",0x2D73],
- ["8138E330",0x2D74],
- ["8138E331",0x2D75],
- ["8138E332",0x2D76],
- ["8138E333",0x2D77],
- ["8138E334",0x2D78],
- ["8138E335",0x2D79],
- ["8138E336",0x2D7A],
- ["8138E337",0x2D7B],
- ["8138E338",0x2D7C],
- ["8138E339",0x2D7D],
- ["8138E430",0x2D7E],
- ["8138E431",0x2D7F],
- ["8138E432",0x2D80],
- ["8138E433",0x2D81],
- ["8138E434",0x2D82],
- ["8138E435",0x2D83],
- ["8138E436",0x2D84],
- ["8138E437",0x2D85],
- ["8138E438",0x2D86],
- ["8138E439",0x2D87],
- ["8138E530",0x2D88],
- ["8138E531",0x2D89],
- ["8138E532",0x2D8A],
- ["8138E533",0x2D8B],
- ["8138E534",0x2D8C],
- ["8138E535",0x2D8D],
- ["8138E536",0x2D8E],
- ["8138E537",0x2D8F],
- ["8138E538",0x2D90],
- ["8138E539",0x2D91],
- ["8138E630",0x2D92],
- ["8138E631",0x2D93],
- ["8138E632",0x2D94],
- ["8138E633",0x2D95],
- ["8138E634",0x2D96],
- ["8138E635",0x2D97],
- ["8138E636",0x2D98],
- ["8138E637",0x2D99],
- ["8138E638",0x2D9A],
- ["8138E639",0x2D9B],
- ["8138E730",0x2D9C],
- ["8138E731",0x2D9D],
- ["8138E732",0x2D9E],
- ["8138E733",0x2D9F],
- ["8138E734",0x2DA0],
- ["8138E735",0x2DA1],
- ["8138E736",0x2DA2],
- ["8138E737",0x2DA3],
- ["8138E738",0x2DA4],
- ["8138E739",0x2DA5],
- ["8138E830",0x2DA6],
- ["8138E831",0x2DA7],
- ["8138E832",0x2DA8],
- ["8138E833",0x2DA9],
- ["8138E834",0x2DAA],
- ["8138E835",0x2DAB],
- ["8138E836",0x2DAC],
- ["8138E837",0x2DAD],
- ["8138E838",0x2DAE],
- ["8138E839",0x2DAF],
- ["8138E930",0x2DB0],
- ["8138E931",0x2DB1],
- ["8138E932",0x2DB2],
- ["8138E933",0x2DB3],
- ["8138E934",0x2DB4],
- ["8138E935",0x2DB5],
- ["8138E936",0x2DB6],
- ["8138E937",0x2DB7],
- ["8138E938",0x2DB8],
- ["8138E939",0x2DB9],
- ["8138EA30",0x2DBA],
- ["8138EA31",0x2DBB],
- ["8138EA32",0x2DBC],
- ["8138EA33",0x2DBD],
- ["8138EA34",0x2DBE],
- ["8138EA35",0x2DBF],
- ["8138EA36",0x2DC0],
- ["8138EA37",0x2DC1],
- ["8138EA38",0x2DC2],
- ["8138EA39",0x2DC3],
- ["8138EB30",0x2DC4],
- ["8138EB31",0x2DC5],
- ["8138EB32",0x2DC6],
- ["8138EB33",0x2DC7],
- ["8138EB34",0x2DC8],
- ["8138EB35",0x2DC9],
- ["8138EB36",0x2DCA],
- ["8138EB37",0x2DCB],
- ["8138EB38",0x2DCC],
- ["8138EB39",0x2DCD],
- ["8138EC30",0x2DCE],
- ["8138EC31",0x2DCF],
- ["8138EC32",0x2DD0],
- ["8138EC33",0x2DD1],
- ["8138EC34",0x2DD2],
- ["8138EC35",0x2DD3],
- ["8138EC36",0x2DD4],
- ["8138EC37",0x2DD5],
- ["8138EC38",0x2DD6],
- ["8138EC39",0x2DD7],
- ["8138ED30",0x2DD8],
- ["8138ED31",0x2DD9],
- ["8138ED32",0x2DDA],
- ["8138ED33",0x2DDB],
- ["8138ED34",0x2DDC],
- ["8138ED35",0x2DDD],
- ["8138ED36",0x2DDE],
- ["8138ED37",0x2DDF],
- ["8138ED38",0x2DE0],
- ["8138ED39",0x2DE1],
- ["8138EE30",0x2DE2],
- ["8138EE31",0x2DE3],
- ["8138EE32",0x2DE4],
- ["8138EE33",0x2DE5],
- ["8138EE34",0x2DE6],
- ["8138EE35",0x2DE7],
- ["8138EE36",0x2DE8],
- ["8138EE37",0x2DE9],
- ["8138EE38",0x2DEA],
- ["8138EE39",0x2DEB],
- ["8138EF30",0x2DEC],
- ["8138EF31",0x2DED],
- ["8138EF32",0x2DEE],
- ["8138EF33",0x2DEF],
- ["8138EF34",0x2DF0],
- ["8138EF35",0x2DF1],
- ["8138EF36",0x2DF2],
- ["8138EF37",0x2DF3],
- ["8138EF38",0x2DF4],
- ["8138EF39",0x2DF5],
- ["8138F030",0x2DF6],
- ["8138F031",0x2DF7],
- ["8138F032",0x2DF8],
- ["8138F033",0x2DF9],
- ["8138F034",0x2DFA],
- ["8138F035",0x2DFB],
- ["8138F036",0x2DFC],
- ["8138F037",0x2DFD],
- ["8138F038",0x2DFE],
- ["8138F039",0x2DFF],
- ["8138F130",0x2E00],
- ["8138F131",0x2E01],
- ["8138F132",0x2E02],
- ["8138F133",0x2E03],
- ["8138F134",0x2E04],
- ["8138F135",0x2E05],
- ["8138F136",0x2E06],
- ["8138F137",0x2E07],
- ["8138F138",0x2E08],
- ["8138F139",0x2E09],
- ["8138F230",0x2E0A],
- ["8138F231",0x2E0B],
- ["8138F232",0x2E0C],
- ["8138F233",0x2E0D],
- ["8138F234",0x2E0E],
- ["8138F235",0x2E0F],
- ["8138F236",0x2E10],
- ["8138F237",0x2E11],
- ["8138F238",0x2E12],
- ["8138F239",0x2E13],
- ["8138F330",0x2E14],
- ["8138F331",0x2E15],
- ["8138F332",0x2E16],
- ["8138F333",0x2E17],
- ["8138F334",0x2E18],
- ["8138F335",0x2E19],
- ["8138F336",0x2E1A],
- ["8138F337",0x2E1B],
- ["8138F338",0x2E1C],
- ["8138F339",0x2E1D],
- ["8138F430",0x2E1E],
- ["8138F431",0x2E1F],
- ["8138F432",0x2E20],
- ["8138F433",0x2E21],
- ["8138F434",0x2E22],
- ["8138F435",0x2E23],
- ["8138F436",0x2E24],
- ["8138F437",0x2E25],
- ["8138F438",0x2E26],
- ["8138F439",0x2E27],
- ["8138F530",0x2E28],
- ["8138F531",0x2E29],
- ["8138F532",0x2E2A],
- ["8138F533",0x2E2B],
- ["8138F534",0x2E2C],
- ["8138F535",0x2E2D],
- ["8138F536",0x2E2E],
- ["8138F537",0x2E2F],
- ["8138F538",0x2E30],
- ["8138F539",0x2E31],
- ["8138F630",0x2E32],
- ["8138F631",0x2E33],
- ["8138F632",0x2E34],
- ["8138F633",0x2E35],
- ["8138F634",0x2E36],
- ["8138F635",0x2E37],
- ["8138F636",0x2E38],
- ["8138F637",0x2E39],
- ["8138F638",0x2E3A],
- ["8138F639",0x2E3B],
- ["8138F730",0x2E3C],
- ["8138F731",0x2E3D],
- ["8138F732",0x2E3E],
- ["8138F733",0x2E3F],
- ["8138F734",0x2E40],
- ["8138F735",0x2E41],
- ["8138F736",0x2E42],
- ["8138F737",0x2E43],
- ["8138F738",0x2E44],
- ["8138F739",0x2E45],
- ["8138F830",0x2E46],
- ["8138F831",0x2E47],
- ["8138F832",0x2E48],
- ["8138F833",0x2E49],
- ["8138F834",0x2E4A],
- ["8138F835",0x2E4B],
- ["8138F836",0x2E4C],
- ["8138F837",0x2E4D],
- ["8138F838",0x2E4E],
- ["8138F839",0x2E4F],
- ["8138F930",0x2E50],
- ["8138F931",0x2E51],
- ["8138F932",0x2E52],
- ["8138F933",0x2E53],
- ["8138F934",0x2E54],
- ["8138F935",0x2E55],
- ["8138F936",0x2E56],
- ["8138F937",0x2E57],
- ["8138F938",0x2E58],
- ["8138F939",0x2E59],
- ["8138FA30",0x2E5A],
- ["8138FA31",0x2E5B],
- ["8138FA32",0x2E5C],
- ["8138FA33",0x2E5D],
- ["8138FA34",0x2E5E],
- ["8138FA35",0x2E5F],
- ["8138FA36",0x2E60],
- ["8138FA37",0x2E61],
- ["8138FA38",0x2E62],
- ["8138FA39",0x2E63],
- ["8138FB30",0x2E64],
- ["8138FB31",0x2E65],
- ["8138FB32",0x2E66],
- ["8138FB33",0x2E67],
- ["8138FB34",0x2E68],
- ["8138FB35",0x2E69],
- ["8138FB36",0x2E6A],
- ["8138FB37",0x2E6B],
- ["8138FB38",0x2E6C],
- ["8138FB39",0x2E6D],
- ["8138FC30",0x2E6E],
- ["8138FC31",0x2E6F],
- ["8138FC32",0x2E70],
- ["8138FC33",0x2E71],
- ["8138FC34",0x2E72],
- ["8138FC35",0x2E73],
- ["8138FC36",0x2E74],
- ["8138FC37",0x2E75],
- ["8138FC38",0x2E76],
- ["8138FC39",0x2E77],
- ["8138FD30",0x2E78],
- ["8138FD31",0x2E79],
- ["8138FD32",0x2E7A],
- ["8138FD33",0x2E7B],
- ["8138FD34",0x2E7C],
- ["8138FD35",0x2E7D],
- ["8138FD36",0x2E7E],
- ["8138FD37",0x2E7F],
- ["8138FD38",0x2E80],
- ["FE50",0x2E81],
- ["8138FD39",0x2E82],
- ["8138FE30",0x2E83],
- ["FE54",0x2E84],
- ["8138FE31",0x2E85],
- ["8138FE32",0x2E86],
- ["8138FE33",0x2E87],
- ["FE57",0x2E88],
- ["8138FE34",0x2E89],
- ["8138FE35",0x2E8A],
- ["FE58",0x2E8B],
- ["FE5D",0x2E8C],
- ["8138FE36",0x2E8D],
- ["8138FE37",0x2E8E],
- ["8138FE38",0x2E8F],
- ["8138FE39",0x2E90],
- ["81398130",0x2E91],
- ["81398131",0x2E92],
- ["81398132",0x2E93],
- ["81398133",0x2E94],
- ["81398134",0x2E95],
- ["81398135",0x2E96],
- ["FE5E",0x2E97],
- ["81398136",0x2E98],
- ["81398137",0x2E99],
- ["81398138",0x2E9A],
- ["81398139",0x2E9B],
- ["81398230",0x2E9C],
- ["81398231",0x2E9D],
- ["81398232",0x2E9E],
- ["81398233",0x2E9F],
- ["81398234",0x2EA0],
- ["81398235",0x2EA1],
- ["81398236",0x2EA2],
- ["81398237",0x2EA3],
- ["81398238",0x2EA4],
- ["81398239",0x2EA5],
- ["81398330",0x2EA6],
- ["FE6B",0x2EA7],
- ["81398331",0x2EA8],
- ["81398332",0x2EA9],
- ["FE6E",0x2EAA],
- ["81398333",0x2EAB],
- ["81398334",0x2EAC],
- ["81398335",0x2EAD],
- ["FE71",0x2EAE],
- ["81398336",0x2EAF],
- ["81398337",0x2EB0],
- ["81398338",0x2EB1],
- ["81398339",0x2EB2],
- ["FE73",0x2EB3],
- ["81398430",0x2EB4],
- ["81398431",0x2EB5],
- ["FE74",0x2EB6],
- ["FE75",0x2EB7],
- ["81398432",0x2EB8],
- ["81398433",0x2EB9],
- ["81398434",0x2EBA],
- ["FE79",0x2EBB],
- ["81398435",0x2EBC],
- ["81398436",0x2EBD],
- ["81398437",0x2EBE],
- ["81398438",0x2EBF],
- ["81398439",0x2EC0],
- ["81398530",0x2EC1],
- ["81398531",0x2EC2],
- ["81398532",0x2EC3],
- ["81398533",0x2EC4],
- ["81398534",0x2EC5],
- ["81398535",0x2EC6],
- ["81398536",0x2EC7],
- ["81398537",0x2EC8],
- ["81398538",0x2EC9],
- ["FE84",0x2ECA],
- ["81398539",0x2ECB],
- ["81398630",0x2ECC],
- ["81398631",0x2ECD],
- ["81398632",0x2ECE],
- ["81398633",0x2ECF],
- ["81398634",0x2ED0],
- ["81398635",0x2ED1],
- ["81398636",0x2ED2],
- ["81398637",0x2ED3],
- ["81398638",0x2ED4],
- ["81398639",0x2ED5],
- ["81398730",0x2ED6],
- ["81398731",0x2ED7],
- ["81398732",0x2ED8],
- ["81398733",0x2ED9],
- ["81398734",0x2EDA],
- ["81398735",0x2EDB],
- ["81398736",0x2EDC],
- ["81398737",0x2EDD],
- ["81398738",0x2EDE],
- ["81398739",0x2EDF],
- ["81398830",0x2EE0],
- ["81398831",0x2EE1],
- ["81398832",0x2EE2],
- ["81398833",0x2EE3],
- ["81398834",0x2EE4],
- ["81398835",0x2EE5],
- ["81398836",0x2EE6],
- ["81398837",0x2EE7],
- ["81398838",0x2EE8],
- ["81398839",0x2EE9],
- ["81398930",0x2EEA],
- ["81398931",0x2EEB],
- ["81398932",0x2EEC],
- ["81398933",0x2EED],
- ["81398934",0x2EEE],
- ["81398935",0x2EEF],
- ["81398936",0x2EF0],
- ["81398937",0x2EF1],
- ["81398938",0x2EF2],
- ["81398939",0x2EF3],
- ["81398A30",0x2EF4],
- ["81398A31",0x2EF5],
- ["81398A32",0x2EF6],
- ["81398A33",0x2EF7],
- ["81398A34",0x2EF8],
- ["81398A35",0x2EF9],
- ["81398A36",0x2EFA],
- ["81398A37",0x2EFB],
- ["81398A38",0x2EFC],
- ["81398A39",0x2EFD],
- ["81398B30",0x2EFE],
- ["81398B31",0x2EFF],
- ["81398B32",0x2F00],
- ["81398B33",0x2F01],
- ["81398B34",0x2F02],
- ["81398B35",0x2F03],
- ["81398B36",0x2F04],
- ["81398B37",0x2F05],
- ["81398B38",0x2F06],
- ["81398B39",0x2F07],
- ["81398C30",0x2F08],
- ["81398C31",0x2F09],
- ["81398C32",0x2F0A],
- ["81398C33",0x2F0B],
- ["81398C34",0x2F0C],
- ["81398C35",0x2F0D],
- ["81398C36",0x2F0E],
- ["81398C37",0x2F0F],
- ["81398C38",0x2F10],
- ["81398C39",0x2F11],
- ["81398D30",0x2F12],
- ["81398D31",0x2F13],
- ["81398D32",0x2F14],
- ["81398D33",0x2F15],
- ["81398D34",0x2F16],
- ["81398D35",0x2F17],
- ["81398D36",0x2F18],
- ["81398D37",0x2F19],
- ["81398D38",0x2F1A],
- ["81398D39",0x2F1B],
- ["81398E30",0x2F1C],
- ["81398E31",0x2F1D],
- ["81398E32",0x2F1E],
- ["81398E33",0x2F1F],
- ["81398E34",0x2F20],
- ["81398E35",0x2F21],
- ["81398E36",0x2F22],
- ["81398E37",0x2F23],
- ["81398E38",0x2F24],
- ["81398E39",0x2F25],
- ["81398F30",0x2F26],
- ["81398F31",0x2F27],
- ["81398F32",0x2F28],
- ["81398F33",0x2F29],
- ["81398F34",0x2F2A],
- ["81398F35",0x2F2B],
- ["81398F36",0x2F2C],
- ["81398F37",0x2F2D],
- ["81398F38",0x2F2E],
- ["81398F39",0x2F2F],
- ["81399030",0x2F30],
- ["81399031",0x2F31],
- ["81399032",0x2F32],
- ["81399033",0x2F33],
- ["81399034",0x2F34],
- ["81399035",0x2F35],
- ["81399036",0x2F36],
- ["81399037",0x2F37],
- ["81399038",0x2F38],
- ["81399039",0x2F39],
- ["81399130",0x2F3A],
- ["81399131",0x2F3B],
- ["81399132",0x2F3C],
- ["81399133",0x2F3D],
- ["81399134",0x2F3E],
- ["81399135",0x2F3F],
- ["81399136",0x2F40],
- ["81399137",0x2F41],
- ["81399138",0x2F42],
- ["81399139",0x2F43],
- ["81399230",0x2F44],
- ["81399231",0x2F45],
- ["81399232",0x2F46],
- ["81399233",0x2F47],
- ["81399234",0x2F48],
- ["81399235",0x2F49],
- ["81399236",0x2F4A],
- ["81399237",0x2F4B],
- ["81399238",0x2F4C],
- ["81399239",0x2F4D],
- ["81399330",0x2F4E],
- ["81399331",0x2F4F],
- ["81399332",0x2F50],
- ["81399333",0x2F51],
- ["81399334",0x2F52],
- ["81399335",0x2F53],
- ["81399336",0x2F54],
- ["81399337",0x2F55],
- ["81399338",0x2F56],
- ["81399339",0x2F57],
- ["81399430",0x2F58],
- ["81399431",0x2F59],
- ["81399432",0x2F5A],
- ["81399433",0x2F5B],
- ["81399434",0x2F5C],
- ["81399435",0x2F5D],
- ["81399436",0x2F5E],
- ["81399437",0x2F5F],
- ["81399438",0x2F60],
- ["81399439",0x2F61],
- ["81399530",0x2F62],
- ["81399531",0x2F63],
- ["81399532",0x2F64],
- ["81399533",0x2F65],
- ["81399534",0x2F66],
- ["81399535",0x2F67],
- ["81399536",0x2F68],
- ["81399537",0x2F69],
- ["81399538",0x2F6A],
- ["81399539",0x2F6B],
- ["81399630",0x2F6C],
- ["81399631",0x2F6D],
- ["81399632",0x2F6E],
- ["81399633",0x2F6F],
- ["81399634",0x2F70],
- ["81399635",0x2F71],
- ["81399636",0x2F72],
- ["81399637",0x2F73],
- ["81399638",0x2F74],
- ["81399639",0x2F75],
- ["81399730",0x2F76],
- ["81399731",0x2F77],
- ["81399732",0x2F78],
- ["81399733",0x2F79],
- ["81399734",0x2F7A],
- ["81399735",0x2F7B],
- ["81399736",0x2F7C],
- ["81399737",0x2F7D],
- ["81399738",0x2F7E],
- ["81399739",0x2F7F],
- ["81399830",0x2F80],
- ["81399831",0x2F81],
- ["81399832",0x2F82],
- ["81399833",0x2F83],
- ["81399834",0x2F84],
- ["81399835",0x2F85],
- ["81399836",0x2F86],
- ["81399837",0x2F87],
- ["81399838",0x2F88],
- ["81399839",0x2F89],
- ["81399930",0x2F8A],
- ["81399931",0x2F8B],
- ["81399932",0x2F8C],
- ["81399933",0x2F8D],
- ["81399934",0x2F8E],
- ["81399935",0x2F8F],
- ["81399936",0x2F90],
- ["81399937",0x2F91],
- ["81399938",0x2F92],
- ["81399939",0x2F93],
- ["81399A30",0x2F94],
- ["81399A31",0x2F95],
- ["81399A32",0x2F96],
- ["81399A33",0x2F97],
- ["81399A34",0x2F98],
- ["81399A35",0x2F99],
- ["81399A36",0x2F9A],
- ["81399A37",0x2F9B],
- ["81399A38",0x2F9C],
- ["81399A39",0x2F9D],
- ["81399B30",0x2F9E],
- ["81399B31",0x2F9F],
- ["81399B32",0x2FA0],
- ["81399B33",0x2FA1],
- ["81399B34",0x2FA2],
- ["81399B35",0x2FA3],
- ["81399B36",0x2FA4],
- ["81399B37",0x2FA5],
- ["81399B38",0x2FA6],
- ["81399B39",0x2FA7],
- ["81399C30",0x2FA8],
- ["81399C31",0x2FA9],
- ["81399C32",0x2FAA],
- ["81399C33",0x2FAB],
- ["81399C34",0x2FAC],
- ["81399C35",0x2FAD],
- ["81399C36",0x2FAE],
- ["81399C37",0x2FAF],
- ["81399C38",0x2FB0],
- ["81399C39",0x2FB1],
- ["81399D30",0x2FB2],
- ["81399D31",0x2FB3],
- ["81399D32",0x2FB4],
- ["81399D33",0x2FB5],
- ["81399D34",0x2FB6],
- ["81399D35",0x2FB7],
- ["81399D36",0x2FB8],
- ["81399D37",0x2FB9],
- ["81399D38",0x2FBA],
- ["81399D39",0x2FBB],
- ["81399E30",0x2FBC],
- ["81399E31",0x2FBD],
- ["81399E32",0x2FBE],
- ["81399E33",0x2FBF],
- ["81399E34",0x2FC0],
- ["81399E35",0x2FC1],
- ["81399E36",0x2FC2],
- ["81399E37",0x2FC3],
- ["81399E38",0x2FC4],
- ["81399E39",0x2FC5],
- ["81399F30",0x2FC6],
- ["81399F31",0x2FC7],
- ["81399F32",0x2FC8],
- ["81399F33",0x2FC9],
- ["81399F34",0x2FCA],
- ["81399F35",0x2FCB],
- ["81399F36",0x2FCC],
- ["81399F37",0x2FCD],
- ["81399F38",0x2FCE],
- ["81399F39",0x2FCF],
- ["8139A030",0x2FD0],
- ["8139A031",0x2FD1],
- ["8139A032",0x2FD2],
- ["8139A033",0x2FD3],
- ["8139A034",0x2FD4],
- ["8139A035",0x2FD5],
- ["8139A036",0x2FD6],
- ["8139A037",0x2FD7],
- ["8139A038",0x2FD8],
- ["8139A039",0x2FD9],
- ["8139A130",0x2FDA],
- ["8139A131",0x2FDB],
- ["8139A132",0x2FDC],
- ["8139A133",0x2FDD],
- ["8139A134",0x2FDE],
- ["8139A135",0x2FDF],
- ["8139A136",0x2FE0],
- ["8139A137",0x2FE1],
- ["8139A138",0x2FE2],
- ["8139A139",0x2FE3],
- ["8139A230",0x2FE4],
- ["8139A231",0x2FE5],
- ["8139A232",0x2FE6],
- ["8139A233",0x2FE7],
- ["8139A234",0x2FE8],
- ["8139A235",0x2FE9],
- ["8139A236",0x2FEA],
- ["8139A237",0x2FEB],
- ["8139A238",0x2FEC],
- ["8139A239",0x2FED],
- ["8139A330",0x2FEE],
- ["8139A331",0x2FEF],
- ["A98A",0x2FF0],
- ["A98B",0x2FF1],
- ["A98C",0x2FF2],
- ["A98D",0x2FF3],
- ["A98E",0x2FF4],
- ["A98F",0x2FF5],
- ["A990",0x2FF6],
- ["A991",0x2FF7],
- ["A992",0x2FF8],
- ["A993",0x2FF9],
- ["A994",0x2FFA],
- ["A995",0x2FFB],
- ["8139A332",0x2FFC],
- ["8139A333",0x2FFD],
- ["8139A334",0x2FFE],
- ["8139A335",0x2FFF],
- ["A1A1",0x3000],
- ["A1A2",0x3001],
- ["A1A3",0x3002],
- ["A1A8",0x3003],
- ["8139A336",0x3004],
- ["A1A9",0x3005],
- ["A965",0x3006],
- ["A996",0x3007],
- ["A1B4",0x3008],
- ["A1B5",0x3009],
- ["A1B6",0x300A],
- ["A1B7",0x300B],
- ["A1B8",0x300C],
- ["A1B9",0x300D],
- ["A1BA",0x300E],
- ["A1BB",0x300F],
- ["A1BE",0x3010],
- ["A1BF",0x3011],
- ["A893",0x3012],
- ["A1FE",0x3013],
- ["A1B2",0x3014],
- ["A1B3",0x3015],
- ["A1BC",0x3016],
- ["A1BD",0x3017],
- ["8139A337",0x3018],
- ["8139A338",0x3019],
- ["8139A339",0x301A],
- ["8139A430",0x301B],
- ["8139A431",0x301C],
- ["A894",0x301D],
- ["A895",0x301E],
- ["8139A432",0x301F],
- ["8139A433",0x3020],
- ["A940",0x3021],
- ["A941",0x3022],
- ["A942",0x3023],
- ["A943",0x3024],
- ["A944",0x3025],
- ["A945",0x3026],
- ["A946",0x3027],
- ["A947",0x3028],
- ["A948",0x3029],
- ["8139A434",0x302A],
- ["8139A435",0x302B],
- ["8139A436",0x302C],
- ["8139A437",0x302D],
- ["8139A438",0x302E],
- ["8139A439",0x302F],
- ["8139A530",0x3030],
- ["8139A531",0x3031],
- ["8139A532",0x3032],
- ["8139A533",0x3033],
- ["8139A534",0x3034],
- ["8139A535",0x3035],
- ["8139A536",0x3036],
- ["8139A537",0x3037],
- ["8139A538",0x3038],
- ["8139A539",0x3039],
- ["8139A630",0x303A],
- ["8139A631",0x303B],
- ["8139A632",0x303C],
- ["8139A633",0x303D],
- ["A989",0x303E],
- ["8139A634",0x303F],
- ["8139A635",0x3040],
- ["A4A1",0x3041],
- ["A4A2",0x3042],
- ["A4A3",0x3043],
- ["A4A4",0x3044],
- ["A4A5",0x3045],
- ["A4A6",0x3046],
- ["A4A7",0x3047],
- ["A4A8",0x3048],
- ["A4A9",0x3049],
- ["A4AA",0x304A],
- ["A4AB",0x304B],
- ["A4AC",0x304C],
- ["A4AD",0x304D],
- ["A4AE",0x304E],
- ["A4AF",0x304F],
- ["A4B0",0x3050],
- ["A4B1",0x3051],
- ["A4B2",0x3052],
- ["A4B3",0x3053],
- ["A4B4",0x3054],
- ["A4B5",0x3055],
- ["A4B6",0x3056],
- ["A4B7",0x3057],
- ["A4B8",0x3058],
- ["A4B9",0x3059],
- ["A4BA",0x305A],
- ["A4BB",0x305B],
- ["A4BC",0x305C],
- ["A4BD",0x305D],
- ["A4BE",0x305E],
- ["A4BF",0x305F],
- ["A4C0",0x3060],
- ["A4C1",0x3061],
- ["A4C2",0x3062],
- ["A4C3",0x3063],
- ["A4C4",0x3064],
- ["A4C5",0x3065],
- ["A4C6",0x3066],
- ["A4C7",0x3067],
- ["A4C8",0x3068],
- ["A4C9",0x3069],
- ["A4CA",0x306A],
- ["A4CB",0x306B],
- ["A4CC",0x306C],
- ["A4CD",0x306D],
- ["A4CE",0x306E],
- ["A4CF",0x306F],
- ["A4D0",0x3070],
- ["A4D1",0x3071],
- ["A4D2",0x3072],
- ["A4D3",0x3073],
- ["A4D4",0x3074],
- ["A4D5",0x3075],
- ["A4D6",0x3076],
- ["A4D7",0x3077],
- ["A4D8",0x3078],
- ["A4D9",0x3079],
- ["A4DA",0x307A],
- ["A4DB",0x307B],
- ["A4DC",0x307C],
- ["A4DD",0x307D],
- ["A4DE",0x307E],
- ["A4DF",0x307F],
- ["A4E0",0x3080],
- ["A4E1",0x3081],
- ["A4E2",0x3082],
- ["A4E3",0x3083],
- ["A4E4",0x3084],
- ["A4E5",0x3085],
- ["A4E6",0x3086],
- ["A4E7",0x3087],
- ["A4E8",0x3088],
- ["A4E9",0x3089],
- ["A4EA",0x308A],
- ["A4EB",0x308B],
- ["A4EC",0x308C],
- ["A4ED",0x308D],
- ["A4EE",0x308E],
- ["A4EF",0x308F],
- ["A4F0",0x3090],
- ["A4F1",0x3091],
- ["A4F2",0x3092],
- ["A4F3",0x3093],
- ["8139A636",0x3094],
- ["8139A637",0x3095],
- ["8139A638",0x3096],
- ["8139A639",0x3097],
- ["8139A730",0x3098],
- ["8139A731",0x3099],
- ["8139A732",0x309A],
- ["A961",0x309B],
- ["A962",0x309C],
- ["A966",0x309D],
- ["A967",0x309E],
- ["8139A733",0x309F],
- ["8139A734",0x30A0],
- ["A5A1",0x30A1],
- ["A5A2",0x30A2],
- ["A5A3",0x30A3],
- ["A5A4",0x30A4],
- ["A5A5",0x30A5],
- ["A5A6",0x30A6],
- ["A5A7",0x30A7],
- ["A5A8",0x30A8],
- ["A5A9",0x30A9],
- ["A5AA",0x30AA],
- ["A5AB",0x30AB],
- ["A5AC",0x30AC],
- ["A5AD",0x30AD],
- ["A5AE",0x30AE],
- ["A5AF",0x30AF],
- ["A5B0",0x30B0],
- ["A5B1",0x30B1],
- ["A5B2",0x30B2],
- ["A5B3",0x30B3],
- ["A5B4",0x30B4],
- ["A5B5",0x30B5],
- ["A5B6",0x30B6],
- ["A5B7",0x30B7],
- ["A5B8",0x30B8],
- ["A5B9",0x30B9],
- ["A5BA",0x30BA],
- ["A5BB",0x30BB],
- ["A5BC",0x30BC],
- ["A5BD",0x30BD],
- ["A5BE",0x30BE],
- ["A5BF",0x30BF],
- ["A5C0",0x30C0],
- ["A5C1",0x30C1],
- ["A5C2",0x30C2],
- ["A5C3",0x30C3],
- ["A5C4",0x30C4],
- ["A5C5",0x30C5],
- ["A5C6",0x30C6],
- ["A5C7",0x30C7],
- ["A5C8",0x30C8],
- ["A5C9",0x30C9],
- ["A5CA",0x30CA],
- ["A5CB",0x30CB],
- ["A5CC",0x30CC],
- ["A5CD",0x30CD],
- ["A5CE",0x30CE],
- ["A5CF",0x30CF],
- ["A5D0",0x30D0],
- ["A5D1",0x30D1],
- ["A5D2",0x30D2],
- ["A5D3",0x30D3],
- ["A5D4",0x30D4],
- ["A5D5",0x30D5],
- ["A5D6",0x30D6],
- ["A5D7",0x30D7],
- ["A5D8",0x30D8],
- ["A5D9",0x30D9],
- ["A5DA",0x30DA],
- ["A5DB",0x30DB],
- ["A5DC",0x30DC],
- ["A5DD",0x30DD],
- ["A5DE",0x30DE],
- ["A5DF",0x30DF],
- ["A5E0",0x30E0],
- ["A5E1",0x30E1],
- ["A5E2",0x30E2],
- ["A5E3",0x30E3],
- ["A5E4",0x30E4],
- ["A5E5",0x30E5],
- ["A5E6",0x30E6],
- ["A5E7",0x30E7],
- ["A5E8",0x30E8],
- ["A5E9",0x30E9],
- ["A5EA",0x30EA],
- ["A5EB",0x30EB],
- ["A5EC",0x30EC],
- ["A5ED",0x30ED],
- ["A5EE",0x30EE],
- ["A5EF",0x30EF],
- ["A5F0",0x30F0],
- ["A5F1",0x30F1],
- ["A5F2",0x30F2],
- ["A5F3",0x30F3],
- ["A5F4",0x30F4],
- ["A5F5",0x30F5],
- ["A5F6",0x30F6],
- ["8139A735",0x30F7],
- ["8139A736",0x30F8],
- ["8139A737",0x30F9],
- ["8139A738",0x30FA],
- ["8139A739",0x30FB],
- ["A960",0x30FC],
- ["A963",0x30FD],
- ["A964",0x30FE],
- ["8139A830",0x30FF],
- ["8139A831",0x3100],
- ["8139A832",0x3101],
- ["8139A833",0x3102],
- ["8139A834",0x3103],
- ["8139A835",0x3104],
- ["A8C5",0x3105],
- ["A8C6",0x3106],
- ["A8C7",0x3107],
- ["A8C8",0x3108],
- ["A8C9",0x3109],
- ["A8CA",0x310A],
- ["A8CB",0x310B],
- ["A8CC",0x310C],
- ["A8CD",0x310D],
- ["A8CE",0x310E],
- ["A8CF",0x310F],
- ["A8D0",0x3110],
- ["A8D1",0x3111],
- ["A8D2",0x3112],
- ["A8D3",0x3113],
- ["A8D4",0x3114],
- ["A8D5",0x3115],
- ["A8D6",0x3116],
- ["A8D7",0x3117],
- ["A8D8",0x3118],
- ["A8D9",0x3119],
- ["A8DA",0x311A],
- ["A8DB",0x311B],
- ["A8DC",0x311C],
- ["A8DD",0x311D],
- ["A8DE",0x311E],
- ["A8DF",0x311F],
- ["A8E0",0x3120],
- ["A8E1",0x3121],
- ["A8E2",0x3122],
- ["A8E3",0x3123],
- ["A8E4",0x3124],
- ["A8E5",0x3125],
- ["A8E6",0x3126],
- ["A8E7",0x3127],
- ["A8E8",0x3128],
- ["A8E9",0x3129],
- ["8139A836",0x312A],
- ["8139A837",0x312B],
- ["8139A838",0x312C],
- ["8139A839",0x312D],
- ["8139A930",0x312E],
- ["8139A931",0x312F],
- ["8139A932",0x3130],
- ["8139A933",0x3131],
- ["8139A934",0x3132],
- ["8139A935",0x3133],
- ["8139A936",0x3134],
- ["8139A937",0x3135],
- ["8139A938",0x3136],
- ["8139A939",0x3137],
- ["8139AA30",0x3138],
- ["8139AA31",0x3139],
- ["8139AA32",0x313A],
- ["8139AA33",0x313B],
- ["8139AA34",0x313C],
- ["8139AA35",0x313D],
- ["8139AA36",0x313E],
- ["8139AA37",0x313F],
- ["8139AA38",0x3140],
- ["8139AA39",0x3141],
- ["8139AB30",0x3142],
- ["8139AB31",0x3143],
- ["8139AB32",0x3144],
- ["8139AB33",0x3145],
- ["8139AB34",0x3146],
- ["8139AB35",0x3147],
- ["8139AB36",0x3148],
- ["8139AB37",0x3149],
- ["8139AB38",0x314A],
- ["8139AB39",0x314B],
- ["8139AC30",0x314C],
- ["8139AC31",0x314D],
- ["8139AC32",0x314E],
- ["8139AC33",0x314F],
- ["8139AC34",0x3150],
- ["8139AC35",0x3151],
- ["8139AC36",0x3152],
- ["8139AC37",0x3153],
- ["8139AC38",0x3154],
- ["8139AC39",0x3155],
- ["8139AD30",0x3156],
- ["8139AD31",0x3157],
- ["8139AD32",0x3158],
- ["8139AD33",0x3159],
- ["8139AD34",0x315A],
- ["8139AD35",0x315B],
- ["8139AD36",0x315C],
- ["8139AD37",0x315D],
- ["8139AD38",0x315E],
- ["8139AD39",0x315F],
- ["8139AE30",0x3160],
- ["8139AE31",0x3161],
- ["8139AE32",0x3162],
- ["8139AE33",0x3163],
- ["8139AE34",0x3164],
- ["8139AE35",0x3165],
- ["8139AE36",0x3166],
- ["8139AE37",0x3167],
- ["8139AE38",0x3168],
- ["8139AE39",0x3169],
- ["8139AF30",0x316A],
- ["8139AF31",0x316B],
- ["8139AF32",0x316C],
- ["8139AF33",0x316D],
- ["8139AF34",0x316E],
- ["8139AF35",0x316F],
- ["8139AF36",0x3170],
- ["8139AF37",0x3171],
- ["8139AF38",0x3172],
- ["8139AF39",0x3173],
- ["8139B030",0x3174],
- ["8139B031",0x3175],
- ["8139B032",0x3176],
- ["8139B033",0x3177],
- ["8139B034",0x3178],
- ["8139B035",0x3179],
- ["8139B036",0x317A],
- ["8139B037",0x317B],
- ["8139B038",0x317C],
- ["8139B039",0x317D],
- ["8139B130",0x317E],
- ["8139B131",0x317F],
- ["8139B132",0x3180],
- ["8139B133",0x3181],
- ["8139B134",0x3182],
- ["8139B135",0x3183],
- ["8139B136",0x3184],
- ["8139B137",0x3185],
- ["8139B138",0x3186],
- ["8139B139",0x3187],
- ["8139B230",0x3188],
- ["8139B231",0x3189],
- ["8139B232",0x318A],
- ["8139B233",0x318B],
- ["8139B234",0x318C],
- ["8139B235",0x318D],
- ["8139B236",0x318E],
- ["8139B237",0x318F],
- ["8139B238",0x3190],
- ["8139B239",0x3191],
- ["8139B330",0x3192],
- ["8139B331",0x3193],
- ["8139B332",0x3194],
- ["8139B333",0x3195],
- ["8139B334",0x3196],
- ["8139B335",0x3197],
- ["8139B336",0x3198],
- ["8139B337",0x3199],
- ["8139B338",0x319A],
- ["8139B339",0x319B],
- ["8139B430",0x319C],
- ["8139B431",0x319D],
- ["8139B432",0x319E],
- ["8139B433",0x319F],
- ["8139B434",0x31A0],
- ["8139B435",0x31A1],
- ["8139B436",0x31A2],
- ["8139B437",0x31A3],
- ["8139B438",0x31A4],
- ["8139B439",0x31A5],
- ["8139B530",0x31A6],
- ["8139B531",0x31A7],
- ["8139B532",0x31A8],
- ["8139B533",0x31A9],
- ["8139B534",0x31AA],
- ["8139B535",0x31AB],
- ["8139B536",0x31AC],
- ["8139B537",0x31AD],
- ["8139B538",0x31AE],
- ["8139B539",0x31AF],
- ["8139B630",0x31B0],
- ["8139B631",0x31B1],
- ["8139B632",0x31B2],
- ["8139B633",0x31B3],
- ["8139B634",0x31B4],
- ["8139B635",0x31B5],
- ["8139B636",0x31B6],
- ["8139B637",0x31B7],
- ["8139B638",0x31B8],
- ["8139B639",0x31B9],
- ["8139B730",0x31BA],
- ["8139B731",0x31BB],
- ["8139B732",0x31BC],
- ["8139B733",0x31BD],
- ["8139B734",0x31BE],
- ["8139B735",0x31BF],
- ["8139B736",0x31C0],
- ["8139B737",0x31C1],
- ["8139B738",0x31C2],
- ["8139B739",0x31C3],
- ["8139B830",0x31C4],
- ["8139B831",0x31C5],
- ["8139B832",0x31C6],
- ["8139B833",0x31C7],
- ["8139B834",0x31C8],
- ["8139B835",0x31C9],
- ["8139B836",0x31CA],
- ["8139B837",0x31CB],
- ["8139B838",0x31CC],
- ["8139B839",0x31CD],
- ["8139B930",0x31CE],
- ["8139B931",0x31CF],
- ["8139B932",0x31D0],
- ["8139B933",0x31D1],
- ["8139B934",0x31D2],
- ["8139B935",0x31D3],
- ["8139B936",0x31D4],
- ["8139B937",0x31D5],
- ["8139B938",0x31D6],
- ["8139B939",0x31D7],
- ["8139BA30",0x31D8],
- ["8139BA31",0x31D9],
- ["8139BA32",0x31DA],
- ["8139BA33",0x31DB],
- ["8139BA34",0x31DC],
- ["8139BA35",0x31DD],
- ["8139BA36",0x31DE],
- ["8139BA37",0x31DF],
- ["8139BA38",0x31E0],
- ["8139BA39",0x31E1],
- ["8139BB30",0x31E2],
- ["8139BB31",0x31E3],
- ["8139BB32",0x31E4],
- ["8139BB33",0x31E5],
- ["8139BB34",0x31E6],
- ["8139BB35",0x31E7],
- ["8139BB36",0x31E8],
- ["8139BB37",0x31E9],
- ["8139BB38",0x31EA],
- ["8139BB39",0x31EB],
- ["8139BC30",0x31EC],
- ["8139BC31",0x31ED],
- ["8139BC32",0x31EE],
- ["8139BC33",0x31EF],
- ["8139BC34",0x31F0],
- ["8139BC35",0x31F1],
- ["8139BC36",0x31F2],
- ["8139BC37",0x31F3],
- ["8139BC38",0x31F4],
- ["8139BC39",0x31F5],
- ["8139BD30",0x31F6],
- ["8139BD31",0x31F7],
- ["8139BD32",0x31F8],
- ["8139BD33",0x31F9],
- ["8139BD34",0x31FA],
- ["8139BD35",0x31FB],
- ["8139BD36",0x31FC],
- ["8139BD37",0x31FD],
- ["8139BD38",0x31FE],
- ["8139BD39",0x31FF],
- ["8139BE30",0x3200],
- ["8139BE31",0x3201],
- ["8139BE32",0x3202],
- ["8139BE33",0x3203],
- ["8139BE34",0x3204],
- ["8139BE35",0x3205],
- ["8139BE36",0x3206],
- ["8139BE37",0x3207],
- ["8139BE38",0x3208],
- ["8139BE39",0x3209],
- ["8139BF30",0x320A],
- ["8139BF31",0x320B],
- ["8139BF32",0x320C],
- ["8139BF33",0x320D],
- ["8139BF34",0x320E],
- ["8139BF35",0x320F],
- ["8139BF36",0x3210],
- ["8139BF37",0x3211],
- ["8139BF38",0x3212],
- ["8139BF39",0x3213],
- ["8139C030",0x3214],
- ["8139C031",0x3215],
- ["8139C032",0x3216],
- ["8139C033",0x3217],
- ["8139C034",0x3218],
- ["8139C035",0x3219],
- ["8139C036",0x321A],
- ["8139C037",0x321B],
- ["8139C038",0x321C],
- ["8139C039",0x321D],
- ["8139C130",0x321E],
- ["8139C131",0x321F],
- ["A2E5",0x3220],
- ["A2E6",0x3221],
- ["A2E7",0x3222],
- ["A2E8",0x3223],
- ["A2E9",0x3224],
- ["A2EA",0x3225],
- ["A2EB",0x3226],
- ["A2EC",0x3227],
- ["A2ED",0x3228],
- ["A2EE",0x3229],
- ["8139C132",0x322A],
- ["8139C133",0x322B],
- ["8139C134",0x322C],
- ["8139C135",0x322D],
- ["8139C136",0x322E],
- ["8139C137",0x322F],
- ["8139C138",0x3230],
- ["A95A",0x3231],
- ["8139C139",0x3232],
- ["8139C230",0x3233],
- ["8139C231",0x3234],
- ["8139C232",0x3235],
- ["8139C233",0x3236],
- ["8139C234",0x3237],
- ["8139C235",0x3238],
- ["8139C236",0x3239],
- ["8139C237",0x323A],
- ["8139C238",0x323B],
- ["8139C239",0x323C],
- ["8139C330",0x323D],
- ["8139C331",0x323E],
- ["8139C332",0x323F],
- ["8139C333",0x3240],
- ["8139C334",0x3241],
- ["8139C335",0x3242],
- ["8139C336",0x3243],
- ["8139C337",0x3244],
- ["8139C338",0x3245],
- ["8139C339",0x3246],
- ["8139C430",0x3247],
- ["8139C431",0x3248],
- ["8139C432",0x3249],
- ["8139C433",0x324A],
- ["8139C434",0x324B],
- ["8139C435",0x324C],
- ["8139C436",0x324D],
- ["8139C437",0x324E],
- ["8139C438",0x324F],
- ["8139C439",0x3250],
- ["8139C530",0x3251],
- ["8139C531",0x3252],
- ["8139C532",0x3253],
- ["8139C533",0x3254],
- ["8139C534",0x3255],
- ["8139C535",0x3256],
- ["8139C536",0x3257],
- ["8139C537",0x3258],
- ["8139C538",0x3259],
- ["8139C539",0x325A],
- ["8139C630",0x325B],
- ["8139C631",0x325C],
- ["8139C632",0x325D],
- ["8139C633",0x325E],
- ["8139C634",0x325F],
- ["8139C635",0x3260],
- ["8139C636",0x3261],
- ["8139C637",0x3262],
- ["8139C638",0x3263],
- ["8139C639",0x3264],
- ["8139C730",0x3265],
- ["8139C731",0x3266],
- ["8139C732",0x3267],
- ["8139C733",0x3268],
- ["8139C734",0x3269],
- ["8139C735",0x326A],
- ["8139C736",0x326B],
- ["8139C737",0x326C],
- ["8139C738",0x326D],
- ["8139C739",0x326E],
- ["8139C830",0x326F],
- ["8139C831",0x3270],
- ["8139C832",0x3271],
- ["8139C833",0x3272],
- ["8139C834",0x3273],
- ["8139C835",0x3274],
- ["8139C836",0x3275],
- ["8139C837",0x3276],
- ["8139C838",0x3277],
- ["8139C839",0x3278],
- ["8139C930",0x3279],
- ["8139C931",0x327A],
- ["8139C932",0x327B],
- ["8139C933",0x327C],
- ["8139C934",0x327D],
- ["8139C935",0x327E],
- ["8139C936",0x327F],
- ["8139C937",0x3280],
- ["8139C938",0x3281],
- ["8139C939",0x3282],
- ["8139CA30",0x3283],
- ["8139CA31",0x3284],
- ["8139CA32",0x3285],
- ["8139CA33",0x3286],
- ["8139CA34",0x3287],
- ["8139CA35",0x3288],
- ["8139CA36",0x3289],
- ["8139CA37",0x328A],
- ["8139CA38",0x328B],
- ["8139CA39",0x328C],
- ["8139CB30",0x328D],
- ["8139CB31",0x328E],
- ["8139CB32",0x328F],
- ["8139CB33",0x3290],
- ["8139CB34",0x3291],
- ["8139CB35",0x3292],
- ["8139CB36",0x3293],
- ["8139CB37",0x3294],
- ["8139CB38",0x3295],
- ["8139CB39",0x3296],
- ["8139CC30",0x3297],
- ["8139CC31",0x3298],
- ["8139CC32",0x3299],
- ["8139CC33",0x329A],
- ["8139CC34",0x329B],
- ["8139CC35",0x329C],
- ["8139CC36",0x329D],
- ["8139CC37",0x329E],
- ["8139CC38",0x329F],
- ["8139CC39",0x32A0],
- ["8139CD30",0x32A1],
- ["8139CD31",0x32A2],
- ["A949",0x32A3],
- ["8139CD32",0x32A4],
- ["8139CD33",0x32A5],
- ["8139CD34",0x32A6],
- ["8139CD35",0x32A7],
- ["8139CD36",0x32A8],
- ["8139CD37",0x32A9],
- ["8139CD38",0x32AA],
- ["8139CD39",0x32AB],
- ["8139CE30",0x32AC],
- ["8139CE31",0x32AD],
- ["8139CE32",0x32AE],
- ["8139CE33",0x32AF],
- ["8139CE34",0x32B0],
- ["8139CE35",0x32B1],
- ["8139CE36",0x32B2],
- ["8139CE37",0x32B3],
- ["8139CE38",0x32B4],
- ["8139CE39",0x32B5],
- ["8139CF30",0x32B6],
- ["8139CF31",0x32B7],
- ["8139CF32",0x32B8],
- ["8139CF33",0x32B9],
- ["8139CF34",0x32BA],
- ["8139CF35",0x32BB],
- ["8139CF36",0x32BC],
- ["8139CF37",0x32BD],
- ["8139CF38",0x32BE],
- ["8139CF39",0x32BF],
- ["8139D030",0x32C0],
- ["8139D031",0x32C1],
- ["8139D032",0x32C2],
- ["8139D033",0x32C3],
- ["8139D034",0x32C4],
- ["8139D035",0x32C5],
- ["8139D036",0x32C6],
- ["8139D037",0x32C7],
- ["8139D038",0x32C8],
- ["8139D039",0x32C9],
- ["8139D130",0x32CA],
- ["8139D131",0x32CB],
- ["8139D132",0x32CC],
- ["8139D133",0x32CD],
- ["8139D134",0x32CE],
- ["8139D135",0x32CF],
- ["8139D136",0x32D0],
- ["8139D137",0x32D1],
- ["8139D138",0x32D2],
- ["8139D139",0x32D3],
- ["8139D230",0x32D4],
- ["8139D231",0x32D5],
- ["8139D232",0x32D6],
- ["8139D233",0x32D7],
- ["8139D234",0x32D8],
- ["8139D235",0x32D9],
- ["8139D236",0x32DA],
- ["8139D237",0x32DB],
- ["8139D238",0x32DC],
- ["8139D239",0x32DD],
- ["8139D330",0x32DE],
- ["8139D331",0x32DF],
- ["8139D332",0x32E0],
- ["8139D333",0x32E1],
- ["8139D334",0x32E2],
- ["8139D335",0x32E3],
- ["8139D336",0x32E4],
- ["8139D337",0x32E5],
- ["8139D338",0x32E6],
- ["8139D339",0x32E7],
- ["8139D430",0x32E8],
- ["8139D431",0x32E9],
- ["8139D432",0x32EA],
- ["8139D433",0x32EB],
- ["8139D434",0x32EC],
- ["8139D435",0x32ED],
- ["8139D436",0x32EE],
- ["8139D437",0x32EF],
- ["8139D438",0x32F0],
- ["8139D439",0x32F1],
- ["8139D530",0x32F2],
- ["8139D531",0x32F3],
- ["8139D532",0x32F4],
- ["8139D533",0x32F5],
- ["8139D534",0x32F6],
- ["8139D535",0x32F7],
- ["8139D536",0x32F8],
- ["8139D537",0x32F9],
- ["8139D538",0x32FA],
- ["8139D539",0x32FB],
- ["8139D630",0x32FC],
- ["8139D631",0x32FD],
- ["8139D632",0x32FE],
- ["8139D633",0x32FF],
- ["8139D634",0x3300],
- ["8139D635",0x3301],
- ["8139D636",0x3302],
- ["8139D637",0x3303],
- ["8139D638",0x3304],
- ["8139D639",0x3305],
- ["8139D730",0x3306],
- ["8139D731",0x3307],
- ["8139D732",0x3308],
- ["8139D733",0x3309],
- ["8139D734",0x330A],
- ["8139D735",0x330B],
- ["8139D736",0x330C],
- ["8139D737",0x330D],
- ["8139D738",0x330E],
- ["8139D739",0x330F],
- ["8139D830",0x3310],
- ["8139D831",0x3311],
- ["8139D832",0x3312],
- ["8139D833",0x3313],
- ["8139D834",0x3314],
- ["8139D835",0x3315],
- ["8139D836",0x3316],
- ["8139D837",0x3317],
- ["8139D838",0x3318],
- ["8139D839",0x3319],
- ["8139D930",0x331A],
- ["8139D931",0x331B],
- ["8139D932",0x331C],
- ["8139D933",0x331D],
- ["8139D934",0x331E],
- ["8139D935",0x331F],
- ["8139D936",0x3320],
- ["8139D937",0x3321],
- ["8139D938",0x3322],
- ["8139D939",0x3323],
- ["8139DA30",0x3324],
- ["8139DA31",0x3325],
- ["8139DA32",0x3326],
- ["8139DA33",0x3327],
- ["8139DA34",0x3328],
- ["8139DA35",0x3329],
- ["8139DA36",0x332A],
- ["8139DA37",0x332B],
- ["8139DA38",0x332C],
- ["8139DA39",0x332D],
- ["8139DB30",0x332E],
- ["8139DB31",0x332F],
- ["8139DB32",0x3330],
- ["8139DB33",0x3331],
- ["8139DB34",0x3332],
- ["8139DB35",0x3333],
- ["8139DB36",0x3334],
- ["8139DB37",0x3335],
- ["8139DB38",0x3336],
- ["8139DB39",0x3337],
- ["8139DC30",0x3338],
- ["8139DC31",0x3339],
- ["8139DC32",0x333A],
- ["8139DC33",0x333B],
- ["8139DC34",0x333C],
- ["8139DC35",0x333D],
- ["8139DC36",0x333E],
- ["8139DC37",0x333F],
- ["8139DC38",0x3340],
- ["8139DC39",0x3341],
- ["8139DD30",0x3342],
- ["8139DD31",0x3343],
- ["8139DD32",0x3344],
- ["8139DD33",0x3345],
- ["8139DD34",0x3346],
- ["8139DD35",0x3347],
- ["8139DD36",0x3348],
- ["8139DD37",0x3349],
- ["8139DD38",0x334A],
- ["8139DD39",0x334B],
- ["8139DE30",0x334C],
- ["8139DE31",0x334D],
- ["8139DE32",0x334E],
- ["8139DE33",0x334F],
- ["8139DE34",0x3350],
- ["8139DE35",0x3351],
- ["8139DE36",0x3352],
- ["8139DE37",0x3353],
- ["8139DE38",0x3354],
- ["8139DE39",0x3355],
- ["8139DF30",0x3356],
- ["8139DF31",0x3357],
- ["8139DF32",0x3358],
- ["8139DF33",0x3359],
- ["8139DF34",0x335A],
- ["8139DF35",0x335B],
- ["8139DF36",0x335C],
- ["8139DF37",0x335D],
- ["8139DF38",0x335E],
- ["8139DF39",0x335F],
- ["8139E030",0x3360],
- ["8139E031",0x3361],
- ["8139E032",0x3362],
- ["8139E033",0x3363],
- ["8139E034",0x3364],
- ["8139E035",0x3365],
- ["8139E036",0x3366],
- ["8139E037",0x3367],
- ["8139E038",0x3368],
- ["8139E039",0x3369],
- ["8139E130",0x336A],
- ["8139E131",0x336B],
- ["8139E132",0x336C],
- ["8139E133",0x336D],
- ["8139E134",0x336E],
- ["8139E135",0x336F],
- ["8139E136",0x3370],
- ["8139E137",0x3371],
- ["8139E138",0x3372],
- ["8139E139",0x3373],
- ["8139E230",0x3374],
- ["8139E231",0x3375],
- ["8139E232",0x3376],
- ["8139E233",0x3377],
- ["8139E234",0x3378],
- ["8139E235",0x3379],
- ["8139E236",0x337A],
- ["8139E237",0x337B],
- ["8139E238",0x337C],
- ["8139E239",0x337D],
- ["8139E330",0x337E],
- ["8139E331",0x337F],
- ["8139E332",0x3380],
- ["8139E333",0x3381],
- ["8139E334",0x3382],
- ["8139E335",0x3383],
- ["8139E336",0x3384],
- ["8139E337",0x3385],
- ["8139E338",0x3386],
- ["8139E339",0x3387],
- ["8139E430",0x3388],
- ["8139E431",0x3389],
- ["8139E432",0x338A],
- ["8139E433",0x338B],
- ["8139E434",0x338C],
- ["8139E435",0x338D],
- ["A94A",0x338E],
- ["A94B",0x338F],
- ["8139E436",0x3390],
- ["8139E437",0x3391],
- ["8139E438",0x3392],
- ["8139E439",0x3393],
- ["8139E530",0x3394],
- ["8139E531",0x3395],
- ["8139E532",0x3396],
- ["8139E533",0x3397],
- ["8139E534",0x3398],
- ["8139E535",0x3399],
- ["8139E536",0x339A],
- ["8139E537",0x339B],
- ["A94C",0x339C],
- ["A94D",0x339D],
- ["A94E",0x339E],
- ["8139E538",0x339F],
- ["8139E539",0x33A0],
- ["A94F",0x33A1],
- ["8139E630",0x33A2],
- ["8139E631",0x33A3],
- ["8139E632",0x33A4],
- ["8139E633",0x33A5],
- ["8139E634",0x33A6],
- ["8139E635",0x33A7],
- ["8139E636",0x33A8],
- ["8139E637",0x33A9],
- ["8139E638",0x33AA],
- ["8139E639",0x33AB],
- ["8139E730",0x33AC],
- ["8139E731",0x33AD],
- ["8139E732",0x33AE],
- ["8139E733",0x33AF],
- ["8139E734",0x33B0],
- ["8139E735",0x33B1],
- ["8139E736",0x33B2],
- ["8139E737",0x33B3],
- ["8139E738",0x33B4],
- ["8139E739",0x33B5],
- ["8139E830",0x33B6],
- ["8139E831",0x33B7],
- ["8139E832",0x33B8],
- ["8139E833",0x33B9],
- ["8139E834",0x33BA],
- ["8139E835",0x33BB],
- ["8139E836",0x33BC],
- ["8139E837",0x33BD],
- ["8139E838",0x33BE],
- ["8139E839",0x33BF],
- ["8139E930",0x33C0],
- ["8139E931",0x33C1],
- ["8139E932",0x33C2],
- ["8139E933",0x33C3],
- ["A950",0x33C4],
- ["8139E934",0x33C5],
- ["8139E935",0x33C6],
- ["8139E936",0x33C7],
- ["8139E937",0x33C8],
- ["8139E938",0x33C9],
- ["8139E939",0x33CA],
- ["8139EA30",0x33CB],
- ["8139EA31",0x33CC],
- ["8139EA32",0x33CD],
- ["A951",0x33CE],
- ["8139EA33",0x33CF],
- ["8139EA34",0x33D0],
- ["A952",0x33D1],
- ["A953",0x33D2],
- ["8139EA35",0x33D3],
- ["8139EA36",0x33D4],
- ["A954",0x33D5],
- ["8139EA37",0x33D6],
- ["8139EA38",0x33D7],
- ["8139EA39",0x33D8],
- ["8139EB30",0x33D9],
- ["8139EB31",0x33DA],
- ["8139EB32",0x33DB],
- ["8139EB33",0x33DC],
- ["8139EB34",0x33DD],
- ["8139EB35",0x33DE],
- ["8139EB36",0x33DF],
- ["8139EB37",0x33E0],
- ["8139EB38",0x33E1],
- ["8139EB39",0x33E2],
- ["8139EC30",0x33E3],
- ["8139EC31",0x33E4],
- ["8139EC32",0x33E5],
- ["8139EC33",0x33E6],
- ["8139EC34",0x33E7],
- ["8139EC35",0x33E8],
- ["8139EC36",0x33E9],
- ["8139EC37",0x33EA],
- ["8139EC38",0x33EB],
- ["8139EC39",0x33EC],
- ["8139ED30",0x33ED],
- ["8139ED31",0x33EE],
- ["8139ED32",0x33EF],
- ["8139ED33",0x33F0],
- ["8139ED34",0x33F1],
- ["8139ED35",0x33F2],
- ["8139ED36",0x33F3],
- ["8139ED37",0x33F4],
- ["8139ED38",0x33F5],
- ["8139ED39",0x33F6],
- ["8139EE30",0x33F7],
- ["8139EE31",0x33F8],
- ["8139EE32",0x33F9],
- ["8139EE33",0x33FA],
- ["8139EE34",0x33FB],
- ["8139EE35",0x33FC],
- ["8139EE36",0x33FD],
- ["8139EE37",0x33FE],
- ["8139EE38",0x33FF],
- ["8139EE39",0x3400],
- ["8139EF30",0x3401],
- ["8139EF31",0x3402],
- ["8139EF32",0x3403],
- ["8139EF33",0x3404],
- ["8139EF34",0x3405],
- ["8139EF35",0x3406],
- ["8139EF36",0x3407],
- ["8139EF37",0x3408],
- ["8139EF38",0x3409],
- ["8139EF39",0x340A],
- ["8139F030",0x340B],
- ["8139F031",0x340C],
- ["8139F032",0x340D],
- ["8139F033",0x340E],
- ["8139F034",0x340F],
- ["8139F035",0x3410],
- ["8139F036",0x3411],
- ["8139F037",0x3412],
- ["8139F038",0x3413],
- ["8139F039",0x3414],
- ["8139F130",0x3415],
- ["8139F131",0x3416],
- ["8139F132",0x3417],
- ["8139F133",0x3418],
- ["8139F134",0x3419],
- ["8139F135",0x341A],
- ["8139F136",0x341B],
- ["8139F137",0x341C],
- ["8139F138",0x341D],
- ["8139F139",0x341E],
- ["8139F230",0x341F],
- ["8139F231",0x3420],
- ["8139F232",0x3421],
- ["8139F233",0x3422],
- ["8139F234",0x3423],
- ["8139F235",0x3424],
- ["8139F236",0x3425],
- ["8139F237",0x3426],
- ["8139F238",0x3427],
- ["8139F239",0x3428],
- ["8139F330",0x3429],
- ["8139F331",0x342A],
- ["8139F332",0x342B],
- ["8139F333",0x342C],
- ["8139F334",0x342D],
- ["8139F335",0x342E],
- ["8139F336",0x342F],
- ["8139F337",0x3430],
- ["8139F338",0x3431],
- ["8139F339",0x3432],
- ["8139F430",0x3433],
- ["8139F431",0x3434],
- ["8139F432",0x3435],
- ["8139F433",0x3436],
- ["8139F434",0x3437],
- ["8139F435",0x3438],
- ["8139F436",0x3439],
- ["8139F437",0x343A],
- ["8139F438",0x343B],
- ["8139F439",0x343C],
- ["8139F530",0x343D],
- ["8139F531",0x343E],
- ["8139F532",0x343F],
- ["8139F533",0x3440],
- ["8139F534",0x3441],
- ["8139F535",0x3442],
- ["8139F536",0x3443],
- ["8139F537",0x3444],
- ["8139F538",0x3445],
- ["8139F539",0x3446],
- ["FE56",0x3447],
- ["8139F630",0x3448],
- ["8139F631",0x3449],
- ["8139F632",0x344A],
- ["8139F633",0x344B],
- ["8139F634",0x344C],
- ["8139F635",0x344D],
- ["8139F636",0x344E],
- ["8139F637",0x344F],
- ["8139F638",0x3450],
- ["8139F639",0x3451],
- ["8139F730",0x3452],
- ["8139F731",0x3453],
- ["8139F732",0x3454],
- ["8139F733",0x3455],
- ["8139F734",0x3456],
- ["8139F735",0x3457],
- ["8139F736",0x3458],
- ["8139F737",0x3459],
- ["8139F738",0x345A],
- ["8139F739",0x345B],
- ["8139F830",0x345C],
- ["8139F831",0x345D],
- ["8139F832",0x345E],
- ["8139F833",0x345F],
- ["8139F834",0x3460],
- ["8139F835",0x3461],
- ["8139F836",0x3462],
- ["8139F837",0x3463],
- ["8139F838",0x3464],
- ["8139F839",0x3465],
- ["8139F930",0x3466],
- ["8139F931",0x3467],
- ["8139F932",0x3468],
- ["8139F933",0x3469],
- ["8139F934",0x346A],
- ["8139F935",0x346B],
- ["8139F936",0x346C],
- ["8139F937",0x346D],
- ["8139F938",0x346E],
- ["8139F939",0x346F],
- ["8139FA30",0x3470],
- ["8139FA31",0x3471],
- ["8139FA32",0x3472],
- ["FE55",0x3473],
- ["8139FA33",0x3474],
- ["8139FA34",0x3475],
- ["8139FA35",0x3476],
- ["8139FA36",0x3477],
- ["8139FA37",0x3478],
- ["8139FA38",0x3479],
- ["8139FA39",0x347A],
- ["8139FB30",0x347B],
- ["8139FB31",0x347C],
- ["8139FB32",0x347D],
- ["8139FB33",0x347E],
- ["8139FB34",0x347F],
- ["8139FB35",0x3480],
- ["8139FB36",0x3481],
- ["8139FB37",0x3482],
- ["8139FB38",0x3483],
- ["8139FB39",0x3484],
- ["8139FC30",0x3485],
- ["8139FC31",0x3486],
- ["8139FC32",0x3487],
- ["8139FC33",0x3488],
- ["8139FC34",0x3489],
- ["8139FC35",0x348A],
- ["8139FC36",0x348B],
- ["8139FC37",0x348C],
- ["8139FC38",0x348D],
- ["8139FC39",0x348E],
- ["8139FD30",0x348F],
- ["8139FD31",0x3490],
- ["8139FD32",0x3491],
- ["8139FD33",0x3492],
- ["8139FD34",0x3493],
- ["8139FD35",0x3494],
- ["8139FD36",0x3495],
- ["8139FD37",0x3496],
- ["8139FD38",0x3497],
- ["8139FD39",0x3498],
- ["8139FE30",0x3499],
- ["8139FE31",0x349A],
- ["8139FE32",0x349B],
- ["8139FE33",0x349C],
- ["8139FE34",0x349D],
- ["8139FE35",0x349E],
- ["8139FE36",0x349F],
- ["8139FE37",0x34A0],
- ["8139FE38",0x34A1],
- ["8139FE39",0x34A2],
- ["82308130",0x34A3],
- ["82308131",0x34A4],
- ["82308132",0x34A5],
- ["82308133",0x34A6],
- ["82308134",0x34A7],
- ["82308135",0x34A8],
- ["82308136",0x34A9],
- ["82308137",0x34AA],
- ["82308138",0x34AB],
- ["82308139",0x34AC],
- ["82308230",0x34AD],
- ["82308231",0x34AE],
- ["82308232",0x34AF],
- ["82308233",0x34B0],
- ["82308234",0x34B1],
- ["82308235",0x34B2],
- ["82308236",0x34B3],
- ["82308237",0x34B4],
- ["82308238",0x34B5],
- ["82308239",0x34B6],
- ["82308330",0x34B7],
- ["82308331",0x34B8],
- ["82308332",0x34B9],
- ["82308333",0x34BA],
- ["82308334",0x34BB],
- ["82308335",0x34BC],
- ["82308336",0x34BD],
- ["82308337",0x34BE],
- ["82308338",0x34BF],
- ["82308339",0x34C0],
- ["82308430",0x34C1],
- ["82308431",0x34C2],
- ["82308432",0x34C3],
- ["82308433",0x34C4],
- ["82308434",0x34C5],
- ["82308435",0x34C6],
- ["82308436",0x34C7],
- ["82308437",0x34C8],
- ["82308438",0x34C9],
- ["82308439",0x34CA],
- ["82308530",0x34CB],
- ["82308531",0x34CC],
- ["82308532",0x34CD],
- ["82308533",0x34CE],
- ["82308534",0x34CF],
- ["82308535",0x34D0],
- ["82308536",0x34D1],
- ["82308537",0x34D2],
- ["82308538",0x34D3],
- ["82308539",0x34D4],
- ["82308630",0x34D5],
- ["82308631",0x34D6],
- ["82308632",0x34D7],
- ["82308633",0x34D8],
- ["82308634",0x34D9],
- ["82308635",0x34DA],
- ["82308636",0x34DB],
- ["82308637",0x34DC],
- ["82308638",0x34DD],
- ["82308639",0x34DE],
- ["82308730",0x34DF],
- ["82308731",0x34E0],
- ["82308732",0x34E1],
- ["82308733",0x34E2],
- ["82308734",0x34E3],
- ["82308735",0x34E4],
- ["82308736",0x34E5],
- ["82308737",0x34E6],
- ["82308738",0x34E7],
- ["82308739",0x34E8],
- ["82308830",0x34E9],
- ["82308831",0x34EA],
- ["82308832",0x34EB],
- ["82308833",0x34EC],
- ["82308834",0x34ED],
- ["82308835",0x34EE],
- ["82308836",0x34EF],
- ["82308837",0x34F0],
- ["82308838",0x34F1],
- ["82308839",0x34F2],
- ["82308930",0x34F3],
- ["82308931",0x34F4],
- ["82308932",0x34F5],
- ["82308933",0x34F6],
- ["82308934",0x34F7],
- ["82308935",0x34F8],
- ["82308936",0x34F9],
- ["82308937",0x34FA],
- ["82308938",0x34FB],
- ["82308939",0x34FC],
- ["82308A30",0x34FD],
- ["82308A31",0x34FE],
- ["82308A32",0x34FF],
- ["82308A33",0x3500],
- ["82308A34",0x3501],
- ["82308A35",0x3502],
- ["82308A36",0x3503],
- ["82308A37",0x3504],
- ["82308A38",0x3505],
- ["82308A39",0x3506],
- ["82308B30",0x3507],
- ["82308B31",0x3508],
- ["82308B32",0x3509],
- ["82308B33",0x350A],
- ["82308B34",0x350B],
- ["82308B35",0x350C],
- ["82308B36",0x350D],
- ["82308B37",0x350E],
- ["82308B38",0x350F],
- ["82308B39",0x3510],
- ["82308C30",0x3511],
- ["82308C31",0x3512],
- ["82308C32",0x3513],
- ["82308C33",0x3514],
- ["82308C34",0x3515],
- ["82308C35",0x3516],
- ["82308C36",0x3517],
- ["82308C37",0x3518],
- ["82308C38",0x3519],
- ["82308C39",0x351A],
- ["82308D30",0x351B],
- ["82308D31",0x351C],
- ["82308D32",0x351D],
- ["82308D33",0x351E],
- ["82308D34",0x351F],
- ["82308D35",0x3520],
- ["82308D36",0x3521],
- ["82308D37",0x3522],
- ["82308D38",0x3523],
- ["82308D39",0x3524],
- ["82308E30",0x3525],
- ["82308E31",0x3526],
- ["82308E32",0x3527],
- ["82308E33",0x3528],
- ["82308E34",0x3529],
- ["82308E35",0x352A],
- ["82308E36",0x352B],
- ["82308E37",0x352C],
- ["82308E38",0x352D],
- ["82308E39",0x352E],
- ["82308F30",0x352F],
- ["82308F31",0x3530],
- ["82308F32",0x3531],
- ["82308F33",0x3532],
- ["82308F34",0x3533],
- ["82308F35",0x3534],
- ["82308F36",0x3535],
- ["82308F37",0x3536],
- ["82308F38",0x3537],
- ["82308F39",0x3538],
- ["82309030",0x3539],
- ["82309031",0x353A],
- ["82309032",0x353B],
- ["82309033",0x353C],
- ["82309034",0x353D],
- ["82309035",0x353E],
- ["82309036",0x353F],
- ["82309037",0x3540],
- ["82309038",0x3541],
- ["82309039",0x3542],
- ["82309130",0x3543],
- ["82309131",0x3544],
- ["82309132",0x3545],
- ["82309133",0x3546],
- ["82309134",0x3547],
- ["82309135",0x3548],
- ["82309136",0x3549],
- ["82309137",0x354A],
- ["82309138",0x354B],
- ["82309139",0x354C],
- ["82309230",0x354D],
- ["82309231",0x354E],
- ["82309232",0x354F],
- ["82309233",0x3550],
- ["82309234",0x3551],
- ["82309235",0x3552],
- ["82309236",0x3553],
- ["82309237",0x3554],
- ["82309238",0x3555],
- ["82309239",0x3556],
- ["82309330",0x3557],
- ["82309331",0x3558],
- ["82309332",0x3559],
- ["82309333",0x355A],
- ["82309334",0x355B],
- ["82309335",0x355C],
- ["82309336",0x355D],
- ["82309337",0x355E],
- ["82309338",0x355F],
- ["82309339",0x3560],
- ["82309430",0x3561],
- ["82309431",0x3562],
- ["82309432",0x3563],
- ["82309433",0x3564],
- ["82309434",0x3565],
- ["82309435",0x3566],
- ["82309436",0x3567],
- ["82309437",0x3568],
- ["82309438",0x3569],
- ["82309439",0x356A],
- ["82309530",0x356B],
- ["82309531",0x356C],
- ["82309532",0x356D],
- ["82309533",0x356E],
- ["82309534",0x356F],
- ["82309535",0x3570],
- ["82309536",0x3571],
- ["82309537",0x3572],
- ["82309538",0x3573],
- ["82309539",0x3574],
- ["82309630",0x3575],
- ["82309631",0x3576],
- ["82309632",0x3577],
- ["82309633",0x3578],
- ["82309634",0x3579],
- ["82309635",0x357A],
- ["82309636",0x357B],
- ["82309637",0x357C],
- ["82309638",0x357D],
- ["82309639",0x357E],
- ["82309730",0x357F],
- ["82309731",0x3580],
- ["82309732",0x3581],
- ["82309733",0x3582],
- ["82309734",0x3583],
- ["82309735",0x3584],
- ["82309736",0x3585],
- ["82309737",0x3586],
- ["82309738",0x3587],
- ["82309739",0x3588],
- ["82309830",0x3589],
- ["82309831",0x358A],
- ["82309832",0x358B],
- ["82309833",0x358C],
- ["82309834",0x358D],
- ["82309835",0x358E],
- ["82309836",0x358F],
- ["82309837",0x3590],
- ["82309838",0x3591],
- ["82309839",0x3592],
- ["82309930",0x3593],
- ["82309931",0x3594],
- ["82309932",0x3595],
- ["82309933",0x3596],
- ["82309934",0x3597],
- ["82309935",0x3598],
- ["82309936",0x3599],
- ["82309937",0x359A],
- ["82309938",0x359B],
- ["82309939",0x359C],
- ["82309A30",0x359D],
- ["FE5A",0x359E],
- ["82309A31",0x359F],
- ["82309A32",0x35A0],
- ["82309A33",0x35A1],
- ["82309A34",0x35A2],
- ["82309A35",0x35A3],
- ["82309A36",0x35A4],
- ["82309A37",0x35A5],
- ["82309A38",0x35A6],
- ["82309A39",0x35A7],
- ["82309B30",0x35A8],
- ["82309B31",0x35A9],
- ["82309B32",0x35AA],
- ["82309B33",0x35AB],
- ["82309B34",0x35AC],
- ["82309B35",0x35AD],
- ["82309B36",0x35AE],
- ["82309B37",0x35AF],
- ["82309B38",0x35B0],
- ["82309B39",0x35B1],
- ["82309C30",0x35B2],
- ["82309C31",0x35B3],
- ["82309C32",0x35B4],
- ["82309C33",0x35B5],
- ["82309C34",0x35B6],
- ["82309C35",0x35B7],
- ["82309C36",0x35B8],
- ["82309C37",0x35B9],
- ["82309C38",0x35BA],
- ["82309C39",0x35BB],
- ["82309D30",0x35BC],
- ["82309D31",0x35BD],
- ["82309D32",0x35BE],
- ["82309D33",0x35BF],
- ["82309D34",0x35C0],
- ["82309D35",0x35C1],
- ["82309D36",0x35C2],
- ["82309D37",0x35C3],
- ["82309D38",0x35C4],
- ["82309D39",0x35C5],
- ["82309E30",0x35C6],
- ["82309E31",0x35C7],
- ["82309E32",0x35C8],
- ["82309E33",0x35C9],
- ["82309E34",0x35CA],
- ["82309E35",0x35CB],
- ["82309E36",0x35CC],
- ["82309E37",0x35CD],
- ["82309E38",0x35CE],
- ["82309E39",0x35CF],
- ["82309F30",0x35D0],
- ["82309F31",0x35D1],
- ["82309F32",0x35D2],
- ["82309F33",0x35D3],
- ["82309F34",0x35D4],
- ["82309F35",0x35D5],
- ["82309F36",0x35D6],
- ["82309F37",0x35D7],
- ["82309F38",0x35D8],
- ["82309F39",0x35D9],
- ["8230A030",0x35DA],
- ["8230A031",0x35DB],
- ["8230A032",0x35DC],
- ["8230A033",0x35DD],
- ["8230A034",0x35DE],
- ["8230A035",0x35DF],
- ["8230A036",0x35E0],
- ["8230A037",0x35E1],
- ["8230A038",0x35E2],
- ["8230A039",0x35E3],
- ["8230A130",0x35E4],
- ["8230A131",0x35E5],
- ["8230A132",0x35E6],
- ["8230A133",0x35E7],
- ["8230A134",0x35E8],
- ["8230A135",0x35E9],
- ["8230A136",0x35EA],
- ["8230A137",0x35EB],
- ["8230A138",0x35EC],
- ["8230A139",0x35ED],
- ["8230A230",0x35EE],
- ["8230A231",0x35EF],
- ["8230A232",0x35F0],
- ["8230A233",0x35F1],
- ["8230A234",0x35F2],
- ["8230A235",0x35F3],
- ["8230A236",0x35F4],
- ["8230A237",0x35F5],
- ["8230A238",0x35F6],
- ["8230A239",0x35F7],
- ["8230A330",0x35F8],
- ["8230A331",0x35F9],
- ["8230A332",0x35FA],
- ["8230A333",0x35FB],
- ["8230A334",0x35FC],
- ["8230A335",0x35FD],
- ["8230A336",0x35FE],
- ["8230A337",0x35FF],
- ["8230A338",0x3600],
- ["8230A339",0x3601],
- ["8230A430",0x3602],
- ["8230A431",0x3603],
- ["8230A432",0x3604],
- ["8230A433",0x3605],
- ["8230A434",0x3606],
- ["8230A435",0x3607],
- ["8230A436",0x3608],
- ["8230A437",0x3609],
- ["8230A438",0x360A],
- ["8230A439",0x360B],
- ["8230A530",0x360C],
- ["8230A531",0x360D],
- ["FE5C",0x360E],
- ["8230A532",0x360F],
- ["8230A533",0x3610],
- ["8230A534",0x3611],
- ["8230A535",0x3612],
- ["8230A536",0x3613],
- ["8230A537",0x3614],
- ["8230A538",0x3615],
- ["8230A539",0x3616],
- ["8230A630",0x3617],
- ["8230A631",0x3618],
- ["8230A632",0x3619],
- ["FE5B",0x361A],
- ["8230A633",0x361B],
- ["8230A634",0x361C],
- ["8230A635",0x361D],
- ["8230A636",0x361E],
- ["8230A637",0x361F],
- ["8230A638",0x3620],
- ["8230A639",0x3621],
- ["8230A730",0x3622],
- ["8230A731",0x3623],
- ["8230A732",0x3624],
- ["8230A733",0x3625],
- ["8230A734",0x3626],
- ["8230A735",0x3627],
- ["8230A736",0x3628],
- ["8230A737",0x3629],
- ["8230A738",0x362A],
- ["8230A739",0x362B],
- ["8230A830",0x362C],
- ["8230A831",0x362D],
- ["8230A832",0x362E],
- ["8230A833",0x362F],
- ["8230A834",0x3630],
- ["8230A835",0x3631],
- ["8230A836",0x3632],
- ["8230A837",0x3633],
- ["8230A838",0x3634],
- ["8230A839",0x3635],
- ["8230A930",0x3636],
- ["8230A931",0x3637],
- ["8230A932",0x3638],
- ["8230A933",0x3639],
- ["8230A934",0x363A],
- ["8230A935",0x363B],
- ["8230A936",0x363C],
- ["8230A937",0x363D],
- ["8230A938",0x363E],
- ["8230A939",0x363F],
- ["8230AA30",0x3640],
- ["8230AA31",0x3641],
- ["8230AA32",0x3642],
- ["8230AA33",0x3643],
- ["8230AA34",0x3644],
- ["8230AA35",0x3645],
- ["8230AA36",0x3646],
- ["8230AA37",0x3647],
- ["8230AA38",0x3648],
- ["8230AA39",0x3649],
- ["8230AB30",0x364A],
- ["8230AB31",0x364B],
- ["8230AB32",0x364C],
- ["8230AB33",0x364D],
- ["8230AB34",0x364E],
- ["8230AB35",0x364F],
- ["8230AB36",0x3650],
- ["8230AB37",0x3651],
- ["8230AB38",0x3652],
- ["8230AB39",0x3653],
- ["8230AC30",0x3654],
- ["8230AC31",0x3655],
- ["8230AC32",0x3656],
- ["8230AC33",0x3657],
- ["8230AC34",0x3658],
- ["8230AC35",0x3659],
- ["8230AC36",0x365A],
- ["8230AC37",0x365B],
- ["8230AC38",0x365C],
- ["8230AC39",0x365D],
- ["8230AD30",0x365E],
- ["8230AD31",0x365F],
- ["8230AD32",0x3660],
- ["8230AD33",0x3661],
- ["8230AD34",0x3662],
- ["8230AD35",0x3663],
- ["8230AD36",0x3664],
- ["8230AD37",0x3665],
- ["8230AD38",0x3666],
- ["8230AD39",0x3667],
- ["8230AE30",0x3668],
- ["8230AE31",0x3669],
- ["8230AE32",0x366A],
- ["8230AE33",0x366B],
- ["8230AE34",0x366C],
- ["8230AE35",0x366D],
- ["8230AE36",0x366E],
- ["8230AE37",0x366F],
- ["8230AE38",0x3670],
- ["8230AE39",0x3671],
- ["8230AF30",0x3672],
- ["8230AF31",0x3673],
- ["8230AF32",0x3674],
- ["8230AF33",0x3675],
- ["8230AF34",0x3676],
- ["8230AF35",0x3677],
- ["8230AF36",0x3678],
- ["8230AF37",0x3679],
- ["8230AF38",0x367A],
- ["8230AF39",0x367B],
- ["8230B030",0x367C],
- ["8230B031",0x367D],
- ["8230B032",0x367E],
- ["8230B033",0x367F],
- ["8230B034",0x3680],
- ["8230B035",0x3681],
- ["8230B036",0x3682],
- ["8230B037",0x3683],
- ["8230B038",0x3684],
- ["8230B039",0x3685],
- ["8230B130",0x3686],
- ["8230B131",0x3687],
- ["8230B132",0x3688],
- ["8230B133",0x3689],
- ["8230B134",0x368A],
- ["8230B135",0x368B],
- ["8230B136",0x368C],
- ["8230B137",0x368D],
- ["8230B138",0x368E],
- ["8230B139",0x368F],
- ["8230B230",0x3690],
- ["8230B231",0x3691],
- ["8230B232",0x3692],
- ["8230B233",0x3693],
- ["8230B234",0x3694],
- ["8230B235",0x3695],
- ["8230B236",0x3696],
- ["8230B237",0x3697],
- ["8230B238",0x3698],
- ["8230B239",0x3699],
- ["8230B330",0x369A],
- ["8230B331",0x369B],
- ["8230B332",0x369C],
- ["8230B333",0x369D],
- ["8230B334",0x369E],
- ["8230B335",0x369F],
- ["8230B336",0x36A0],
- ["8230B337",0x36A1],
- ["8230B338",0x36A2],
- ["8230B339",0x36A3],
- ["8230B430",0x36A4],
- ["8230B431",0x36A5],
- ["8230B432",0x36A6],
- ["8230B433",0x36A7],
- ["8230B434",0x36A8],
- ["8230B435",0x36A9],
- ["8230B436",0x36AA],
- ["8230B437",0x36AB],
- ["8230B438",0x36AC],
- ["8230B439",0x36AD],
- ["8230B530",0x36AE],
- ["8230B531",0x36AF],
- ["8230B532",0x36B0],
- ["8230B533",0x36B1],
- ["8230B534",0x36B2],
- ["8230B535",0x36B3],
- ["8230B536",0x36B4],
- ["8230B537",0x36B5],
- ["8230B538",0x36B6],
- ["8230B539",0x36B7],
- ["8230B630",0x36B8],
- ["8230B631",0x36B9],
- ["8230B632",0x36BA],
- ["8230B633",0x36BB],
- ["8230B634",0x36BC],
- ["8230B635",0x36BD],
- ["8230B636",0x36BE],
- ["8230B637",0x36BF],
- ["8230B638",0x36C0],
- ["8230B639",0x36C1],
- ["8230B730",0x36C2],
- ["8230B731",0x36C3],
- ["8230B732",0x36C4],
- ["8230B733",0x36C5],
- ["8230B734",0x36C6],
- ["8230B735",0x36C7],
- ["8230B736",0x36C8],
- ["8230B737",0x36C9],
- ["8230B738",0x36CA],
- ["8230B739",0x36CB],
- ["8230B830",0x36CC],
- ["8230B831",0x36CD],
- ["8230B832",0x36CE],
- ["8230B833",0x36CF],
- ["8230B834",0x36D0],
- ["8230B835",0x36D1],
- ["8230B836",0x36D2],
- ["8230B837",0x36D3],
- ["8230B838",0x36D4],
- ["8230B839",0x36D5],
- ["8230B930",0x36D6],
- ["8230B931",0x36D7],
- ["8230B932",0x36D8],
- ["8230B933",0x36D9],
- ["8230B934",0x36DA],
- ["8230B935",0x36DB],
- ["8230B936",0x36DC],
- ["8230B937",0x36DD],
- ["8230B938",0x36DE],
- ["8230B939",0x36DF],
- ["8230BA30",0x36E0],
- ["8230BA31",0x36E1],
- ["8230BA32",0x36E2],
- ["8230BA33",0x36E3],
- ["8230BA34",0x36E4],
- ["8230BA35",0x36E5],
- ["8230BA36",0x36E6],
- ["8230BA37",0x36E7],
- ["8230BA38",0x36E8],
- ["8230BA39",0x36E9],
- ["8230BB30",0x36EA],
- ["8230BB31",0x36EB],
- ["8230BB32",0x36EC],
- ["8230BB33",0x36ED],
- ["8230BB34",0x36EE],
- ["8230BB35",0x36EF],
- ["8230BB36",0x36F0],
- ["8230BB37",0x36F1],
- ["8230BB38",0x36F2],
- ["8230BB39",0x36F3],
- ["8230BC30",0x36F4],
- ["8230BC31",0x36F5],
- ["8230BC32",0x36F6],
- ["8230BC33",0x36F7],
- ["8230BC34",0x36F8],
- ["8230BC35",0x36F9],
- ["8230BC36",0x36FA],
- ["8230BC37",0x36FB],
- ["8230BC38",0x36FC],
- ["8230BC39",0x36FD],
- ["8230BD30",0x36FE],
- ["8230BD31",0x36FF],
- ["8230BD32",0x3700],
- ["8230BD33",0x3701],
- ["8230BD34",0x3702],
- ["8230BD35",0x3703],
- ["8230BD36",0x3704],
- ["8230BD37",0x3705],
- ["8230BD38",0x3706],
- ["8230BD39",0x3707],
- ["8230BE30",0x3708],
- ["8230BE31",0x3709],
- ["8230BE32",0x370A],
- ["8230BE33",0x370B],
- ["8230BE34",0x370C],
- ["8230BE35",0x370D],
- ["8230BE36",0x370E],
- ["8230BE37",0x370F],
- ["8230BE38",0x3710],
- ["8230BE39",0x3711],
- ["8230BF30",0x3712],
- ["8230BF31",0x3713],
- ["8230BF32",0x3714],
- ["8230BF33",0x3715],
- ["8230BF34",0x3716],
- ["8230BF35",0x3717],
- ["8230BF36",0x3718],
- ["8230BF37",0x3719],
- ["8230BF38",0x371A],
- ["8230BF39",0x371B],
- ["8230C030",0x371C],
- ["8230C031",0x371D],
- ["8230C032",0x371E],
- ["8230C033",0x371F],
- ["8230C034",0x3720],
- ["8230C035",0x3721],
- ["8230C036",0x3722],
- ["8230C037",0x3723],
- ["8230C038",0x3724],
- ["8230C039",0x3725],
- ["8230C130",0x3726],
- ["8230C131",0x3727],
- ["8230C132",0x3728],
- ["8230C133",0x3729],
- ["8230C134",0x372A],
- ["8230C135",0x372B],
- ["8230C136",0x372C],
- ["8230C137",0x372D],
- ["8230C138",0x372E],
- ["8230C139",0x372F],
- ["8230C230",0x3730],
- ["8230C231",0x3731],
- ["8230C232",0x3732],
- ["8230C233",0x3733],
- ["8230C234",0x3734],
- ["8230C235",0x3735],
- ["8230C236",0x3736],
- ["8230C237",0x3737],
- ["8230C238",0x3738],
- ["8230C239",0x3739],
- ["8230C330",0x373A],
- ["8230C331",0x373B],
- ["8230C332",0x373C],
- ["8230C333",0x373D],
- ["8230C334",0x373E],
- ["8230C335",0x373F],
- ["8230C336",0x3740],
- ["8230C337",0x3741],
- ["8230C338",0x3742],
- ["8230C339",0x3743],
- ["8230C430",0x3744],
- ["8230C431",0x3745],
- ["8230C432",0x3746],
- ["8230C433",0x3747],
- ["8230C434",0x3748],
- ["8230C435",0x3749],
- ["8230C436",0x374A],
- ["8230C437",0x374B],
- ["8230C438",0x374C],
- ["8230C439",0x374D],
- ["8230C530",0x374E],
- ["8230C531",0x374F],
- ["8230C532",0x3750],
- ["8230C533",0x3751],
- ["8230C534",0x3752],
- ["8230C535",0x3753],
- ["8230C536",0x3754],
- ["8230C537",0x3755],
- ["8230C538",0x3756],
- ["8230C539",0x3757],
- ["8230C630",0x3758],
- ["8230C631",0x3759],
- ["8230C632",0x375A],
- ["8230C633",0x375B],
- ["8230C634",0x375C],
- ["8230C635",0x375D],
- ["8230C636",0x375E],
- ["8230C637",0x375F],
- ["8230C638",0x3760],
- ["8230C639",0x3761],
- ["8230C730",0x3762],
- ["8230C731",0x3763],
- ["8230C732",0x3764],
- ["8230C733",0x3765],
- ["8230C734",0x3766],
- ["8230C735",0x3767],
- ["8230C736",0x3768],
- ["8230C737",0x3769],
- ["8230C738",0x376A],
- ["8230C739",0x376B],
- ["8230C830",0x376C],
- ["8230C831",0x376D],
- ["8230C832",0x376E],
- ["8230C833",0x376F],
- ["8230C834",0x3770],
- ["8230C835",0x3771],
- ["8230C836",0x3772],
- ["8230C837",0x3773],
- ["8230C838",0x3774],
- ["8230C839",0x3775],
- ["8230C930",0x3776],
- ["8230C931",0x3777],
- ["8230C932",0x3778],
- ["8230C933",0x3779],
- ["8230C934",0x377A],
- ["8230C935",0x377B],
- ["8230C936",0x377C],
- ["8230C937",0x377D],
- ["8230C938",0x377E],
- ["8230C939",0x377F],
- ["8230CA30",0x3780],
- ["8230CA31",0x3781],
- ["8230CA32",0x3782],
- ["8230CA33",0x3783],
- ["8230CA34",0x3784],
- ["8230CA35",0x3785],
- ["8230CA36",0x3786],
- ["8230CA37",0x3787],
- ["8230CA38",0x3788],
- ["8230CA39",0x3789],
- ["8230CB30",0x378A],
- ["8230CB31",0x378B],
- ["8230CB32",0x378C],
- ["8230CB33",0x378D],
- ["8230CB34",0x378E],
- ["8230CB35",0x378F],
- ["8230CB36",0x3790],
- ["8230CB37",0x3791],
- ["8230CB38",0x3792],
- ["8230CB39",0x3793],
- ["8230CC30",0x3794],
- ["8230CC31",0x3795],
- ["8230CC32",0x3796],
- ["8230CC33",0x3797],
- ["8230CC34",0x3798],
- ["8230CC35",0x3799],
- ["8230CC36",0x379A],
- ["8230CC37",0x379B],
- ["8230CC38",0x379C],
- ["8230CC39",0x379D],
- ["8230CD30",0x379E],
- ["8230CD31",0x379F],
- ["8230CD32",0x37A0],
- ["8230CD33",0x37A1],
- ["8230CD34",0x37A2],
- ["8230CD35",0x37A3],
- ["8230CD36",0x37A4],
- ["8230CD37",0x37A5],
- ["8230CD38",0x37A6],
- ["8230CD39",0x37A7],
- ["8230CE30",0x37A8],
- ["8230CE31",0x37A9],
- ["8230CE32",0x37AA],
- ["8230CE33",0x37AB],
- ["8230CE34",0x37AC],
- ["8230CE35",0x37AD],
- ["8230CE36",0x37AE],
- ["8230CE37",0x37AF],
- ["8230CE38",0x37B0],
- ["8230CE39",0x37B1],
- ["8230CF30",0x37B2],
- ["8230CF31",0x37B3],
- ["8230CF32",0x37B4],
- ["8230CF33",0x37B5],
- ["8230CF34",0x37B6],
- ["8230CF35",0x37B7],
- ["8230CF36",0x37B8],
- ["8230CF37",0x37B9],
- ["8230CF38",0x37BA],
- ["8230CF39",0x37BB],
- ["8230D030",0x37BC],
- ["8230D031",0x37BD],
- ["8230D032",0x37BE],
- ["8230D033",0x37BF],
- ["8230D034",0x37C0],
- ["8230D035",0x37C1],
- ["8230D036",0x37C2],
- ["8230D037",0x37C3],
- ["8230D038",0x37C4],
- ["8230D039",0x37C5],
- ["8230D130",0x37C6],
- ["8230D131",0x37C7],
- ["8230D132",0x37C8],
- ["8230D133",0x37C9],
- ["8230D134",0x37CA],
- ["8230D135",0x37CB],
- ["8230D136",0x37CC],
- ["8230D137",0x37CD],
- ["8230D138",0x37CE],
- ["8230D139",0x37CF],
- ["8230D230",0x37D0],
- ["8230D231",0x37D1],
- ["8230D232",0x37D2],
- ["8230D233",0x37D3],
- ["8230D234",0x37D4],
- ["8230D235",0x37D5],
- ["8230D236",0x37D6],
- ["8230D237",0x37D7],
- ["8230D238",0x37D8],
- ["8230D239",0x37D9],
- ["8230D330",0x37DA],
- ["8230D331",0x37DB],
- ["8230D332",0x37DC],
- ["8230D333",0x37DD],
- ["8230D334",0x37DE],
- ["8230D335",0x37DF],
- ["8230D336",0x37E0],
- ["8230D337",0x37E1],
- ["8230D338",0x37E2],
- ["8230D339",0x37E3],
- ["8230D430",0x37E4],
- ["8230D431",0x37E5],
- ["8230D432",0x37E6],
- ["8230D433",0x37E7],
- ["8230D434",0x37E8],
- ["8230D435",0x37E9],
- ["8230D436",0x37EA],
- ["8230D437",0x37EB],
- ["8230D438",0x37EC],
- ["8230D439",0x37ED],
- ["8230D530",0x37EE],
- ["8230D531",0x37EF],
- ["8230D532",0x37F0],
- ["8230D533",0x37F1],
- ["8230D534",0x37F2],
- ["8230D535",0x37F3],
- ["8230D536",0x37F4],
- ["8230D537",0x37F5],
- ["8230D538",0x37F6],
- ["8230D539",0x37F7],
- ["8230D630",0x37F8],
- ["8230D631",0x37F9],
- ["8230D632",0x37FA],
- ["8230D633",0x37FB],
- ["8230D634",0x37FC],
- ["8230D635",0x37FD],
- ["8230D636",0x37FE],
- ["8230D637",0x37FF],
- ["8230D638",0x3800],
- ["8230D639",0x3801],
- ["8230D730",0x3802],
- ["8230D731",0x3803],
- ["8230D732",0x3804],
- ["8230D733",0x3805],
- ["8230D734",0x3806],
- ["8230D735",0x3807],
- ["8230D736",0x3808],
- ["8230D737",0x3809],
- ["8230D738",0x380A],
- ["8230D739",0x380B],
- ["8230D830",0x380C],
- ["8230D831",0x380D],
- ["8230D832",0x380E],
- ["8230D833",0x380F],
- ["8230D834",0x3810],
- ["8230D835",0x3811],
- ["8230D836",0x3812],
- ["8230D837",0x3813],
- ["8230D838",0x3814],
- ["8230D839",0x3815],
- ["8230D930",0x3816],
- ["8230D931",0x3817],
- ["8230D932",0x3818],
- ["8230D933",0x3819],
- ["8230D934",0x381A],
- ["8230D935",0x381B],
- ["8230D936",0x381C],
- ["8230D937",0x381D],
- ["8230D938",0x381E],
- ["8230D939",0x381F],
- ["8230DA30",0x3820],
- ["8230DA31",0x3821],
- ["8230DA32",0x3822],
- ["8230DA33",0x3823],
- ["8230DA34",0x3824],
- ["8230DA35",0x3825],
- ["8230DA36",0x3826],
- ["8230DA37",0x3827],
- ["8230DA38",0x3828],
- ["8230DA39",0x3829],
- ["8230DB30",0x382A],
- ["8230DB31",0x382B],
- ["8230DB32",0x382C],
- ["8230DB33",0x382D],
- ["8230DB34",0x382E],
- ["8230DB35",0x382F],
- ["8230DB36",0x3830],
- ["8230DB37",0x3831],
- ["8230DB38",0x3832],
- ["8230DB39",0x3833],
- ["8230DC30",0x3834],
- ["8230DC31",0x3835],
- ["8230DC32",0x3836],
- ["8230DC33",0x3837],
- ["8230DC34",0x3838],
- ["8230DC35",0x3839],
- ["8230DC36",0x383A],
- ["8230DC37",0x383B],
- ["8230DC38",0x383C],
- ["8230DC39",0x383D],
- ["8230DD30",0x383E],
- ["8230DD31",0x383F],
- ["8230DD32",0x3840],
- ["8230DD33",0x3841],
- ["8230DD34",0x3842],
- ["8230DD35",0x3843],
- ["8230DD36",0x3844],
- ["8230DD37",0x3845],
- ["8230DD38",0x3846],
- ["8230DD39",0x3847],
- ["8230DE30",0x3848],
- ["8230DE31",0x3849],
- ["8230DE32",0x384A],
- ["8230DE33",0x384B],
- ["8230DE34",0x384C],
- ["8230DE35",0x384D],
- ["8230DE36",0x384E],
- ["8230DE37",0x384F],
- ["8230DE38",0x3850],
- ["8230DE39",0x3851],
- ["8230DF30",0x3852],
- ["8230DF31",0x3853],
- ["8230DF32",0x3854],
- ["8230DF33",0x3855],
- ["8230DF34",0x3856],
- ["8230DF35",0x3857],
- ["8230DF36",0x3858],
- ["8230DF37",0x3859],
- ["8230DF38",0x385A],
- ["8230DF39",0x385B],
- ["8230E030",0x385C],
- ["8230E031",0x385D],
- ["8230E032",0x385E],
- ["8230E033",0x385F],
- ["8230E034",0x3860],
- ["8230E035",0x3861],
- ["8230E036",0x3862],
- ["8230E037",0x3863],
- ["8230E038",0x3864],
- ["8230E039",0x3865],
- ["8230E130",0x3866],
- ["8230E131",0x3867],
- ["8230E132",0x3868],
- ["8230E133",0x3869],
- ["8230E134",0x386A],
- ["8230E135",0x386B],
- ["8230E136",0x386C],
- ["8230E137",0x386D],
- ["8230E138",0x386E],
- ["8230E139",0x386F],
- ["8230E230",0x3870],
- ["8230E231",0x3871],
- ["8230E232",0x3872],
- ["8230E233",0x3873],
- ["8230E234",0x3874],
- ["8230E235",0x3875],
- ["8230E236",0x3876],
- ["8230E237",0x3877],
- ["8230E238",0x3878],
- ["8230E239",0x3879],
- ["8230E330",0x387A],
- ["8230E331",0x387B],
- ["8230E332",0x387C],
- ["8230E333",0x387D],
- ["8230E334",0x387E],
- ["8230E335",0x387F],
- ["8230E336",0x3880],
- ["8230E337",0x3881],
- ["8230E338",0x3882],
- ["8230E339",0x3883],
- ["8230E430",0x3884],
- ["8230E431",0x3885],
- ["8230E432",0x3886],
- ["8230E433",0x3887],
- ["8230E434",0x3888],
- ["8230E435",0x3889],
- ["8230E436",0x388A],
- ["8230E437",0x388B],
- ["8230E438",0x388C],
- ["8230E439",0x388D],
- ["8230E530",0x388E],
- ["8230E531",0x388F],
- ["8230E532",0x3890],
- ["8230E533",0x3891],
- ["8230E534",0x3892],
- ["8230E535",0x3893],
- ["8230E536",0x3894],
- ["8230E537",0x3895],
- ["8230E538",0x3896],
- ["8230E539",0x3897],
- ["8230E630",0x3898],
- ["8230E631",0x3899],
- ["8230E632",0x389A],
- ["8230E633",0x389B],
- ["8230E634",0x389C],
- ["8230E635",0x389D],
- ["8230E636",0x389E],
- ["8230E637",0x389F],
- ["8230E638",0x38A0],
- ["8230E639",0x38A1],
- ["8230E730",0x38A2],
- ["8230E731",0x38A3],
- ["8230E732",0x38A4],
- ["8230E733",0x38A5],
- ["8230E734",0x38A6],
- ["8230E735",0x38A7],
- ["8230E736",0x38A8],
- ["8230E737",0x38A9],
- ["8230E738",0x38AA],
- ["8230E739",0x38AB],
- ["8230E830",0x38AC],
- ["8230E831",0x38AD],
- ["8230E832",0x38AE],
- ["8230E833",0x38AF],
- ["8230E834",0x38B0],
- ["8230E835",0x38B1],
- ["8230E836",0x38B2],
- ["8230E837",0x38B3],
- ["8230E838",0x38B4],
- ["8230E839",0x38B5],
- ["8230E930",0x38B6],
- ["8230E931",0x38B7],
- ["8230E932",0x38B8],
- ["8230E933",0x38B9],
- ["8230E934",0x38BA],
- ["8230E935",0x38BB],
- ["8230E936",0x38BC],
- ["8230E937",0x38BD],
- ["8230E938",0x38BE],
- ["8230E939",0x38BF],
- ["8230EA30",0x38C0],
- ["8230EA31",0x38C1],
- ["8230EA32",0x38C2],
- ["8230EA33",0x38C3],
- ["8230EA34",0x38C4],
- ["8230EA35",0x38C5],
- ["8230EA36",0x38C6],
- ["8230EA37",0x38C7],
- ["8230EA38",0x38C8],
- ["8230EA39",0x38C9],
- ["8230EB30",0x38CA],
- ["8230EB31",0x38CB],
- ["8230EB32",0x38CC],
- ["8230EB33",0x38CD],
- ["8230EB34",0x38CE],
- ["8230EB35",0x38CF],
- ["8230EB36",0x38D0],
- ["8230EB37",0x38D1],
- ["8230EB38",0x38D2],
- ["8230EB39",0x38D3],
- ["8230EC30",0x38D4],
- ["8230EC31",0x38D5],
- ["8230EC32",0x38D6],
- ["8230EC33",0x38D7],
- ["8230EC34",0x38D8],
- ["8230EC35",0x38D9],
- ["8230EC36",0x38DA],
- ["8230EC37",0x38DB],
- ["8230EC38",0x38DC],
- ["8230EC39",0x38DD],
- ["8230ED30",0x38DE],
- ["8230ED31",0x38DF],
- ["8230ED32",0x38E0],
- ["8230ED33",0x38E1],
- ["8230ED34",0x38E2],
- ["8230ED35",0x38E3],
- ["8230ED36",0x38E4],
- ["8230ED37",0x38E5],
- ["8230ED38",0x38E6],
- ["8230ED39",0x38E7],
- ["8230EE30",0x38E8],
- ["8230EE31",0x38E9],
- ["8230EE32",0x38EA],
- ["8230EE33",0x38EB],
- ["8230EE34",0x38EC],
- ["8230EE35",0x38ED],
- ["8230EE36",0x38EE],
- ["8230EE37",0x38EF],
- ["8230EE38",0x38F0],
- ["8230EE39",0x38F1],
- ["8230EF30",0x38F2],
- ["8230EF31",0x38F3],
- ["8230EF32",0x38F4],
- ["8230EF33",0x38F5],
- ["8230EF34",0x38F6],
- ["8230EF35",0x38F7],
- ["8230EF36",0x38F8],
- ["8230EF37",0x38F9],
- ["8230EF38",0x38FA],
- ["8230EF39",0x38FB],
- ["8230F030",0x38FC],
- ["8230F031",0x38FD],
- ["8230F032",0x38FE],
- ["8230F033",0x38FF],
- ["8230F034",0x3900],
- ["8230F035",0x3901],
- ["8230F036",0x3902],
- ["8230F037",0x3903],
- ["8230F038",0x3904],
- ["8230F039",0x3905],
- ["8230F130",0x3906],
- ["8230F131",0x3907],
- ["8230F132",0x3908],
- ["8230F133",0x3909],
- ["8230F134",0x390A],
- ["8230F135",0x390B],
- ["8230F136",0x390C],
- ["8230F137",0x390D],
- ["8230F138",0x390E],
- ["8230F139",0x390F],
- ["8230F230",0x3910],
- ["8230F231",0x3911],
- ["8230F232",0x3912],
- ["8230F233",0x3913],
- ["8230F234",0x3914],
- ["8230F235",0x3915],
- ["8230F236",0x3916],
- ["8230F237",0x3917],
- ["FE60",0x3918],
- ["8230F238",0x3919],
- ["8230F239",0x391A],
- ["8230F330",0x391B],
- ["8230F331",0x391C],
- ["8230F332",0x391D],
- ["8230F333",0x391E],
- ["8230F334",0x391F],
- ["8230F335",0x3920],
- ["8230F336",0x3921],
- ["8230F337",0x3922],
- ["8230F338",0x3923],
- ["8230F339",0x3924],
- ["8230F430",0x3925],
- ["8230F431",0x3926],
- ["8230F432",0x3927],
- ["8230F433",0x3928],
- ["8230F434",0x3929],
- ["8230F435",0x392A],
- ["8230F436",0x392B],
- ["8230F437",0x392C],
- ["8230F438",0x392D],
- ["8230F439",0x392E],
- ["8230F530",0x392F],
- ["8230F531",0x3930],
- ["8230F532",0x3931],
- ["8230F533",0x3932],
- ["8230F534",0x3933],
- ["8230F535",0x3934],
- ["8230F536",0x3935],
- ["8230F537",0x3936],
- ["8230F538",0x3937],
- ["8230F539",0x3938],
- ["8230F630",0x3939],
- ["8230F631",0x393A],
- ["8230F632",0x393B],
- ["8230F633",0x393C],
- ["8230F634",0x393D],
- ["8230F635",0x393E],
- ["8230F636",0x393F],
- ["8230F637",0x3940],
- ["8230F638",0x3941],
- ["8230F639",0x3942],
- ["8230F730",0x3943],
- ["8230F731",0x3944],
- ["8230F732",0x3945],
- ["8230F733",0x3946],
- ["8230F734",0x3947],
- ["8230F735",0x3948],
- ["8230F736",0x3949],
- ["8230F737",0x394A],
- ["8230F738",0x394B],
- ["8230F739",0x394C],
- ["8230F830",0x394D],
- ["8230F831",0x394E],
- ["8230F832",0x394F],
- ["8230F833",0x3950],
- ["8230F834",0x3951],
- ["8230F835",0x3952],
- ["8230F836",0x3953],
- ["8230F837",0x3954],
- ["8230F838",0x3955],
- ["8230F839",0x3956],
- ["8230F930",0x3957],
- ["8230F931",0x3958],
- ["8230F932",0x3959],
- ["8230F933",0x395A],
- ["8230F934",0x395B],
- ["8230F935",0x395C],
- ["8230F936",0x395D],
- ["8230F937",0x395E],
- ["8230F938",0x395F],
- ["8230F939",0x3960],
- ["8230FA30",0x3961],
- ["8230FA31",0x3962],
- ["8230FA32",0x3963],
- ["8230FA33",0x3964],
- ["8230FA34",0x3965],
- ["8230FA35",0x3966],
- ["8230FA36",0x3967],
- ["8230FA37",0x3968],
- ["8230FA38",0x3969],
- ["8230FA39",0x396A],
- ["8230FB30",0x396B],
- ["8230FB31",0x396C],
- ["8230FB32",0x396D],
- ["FE5F",0x396E],
- ["8230FB33",0x396F],
- ["8230FB34",0x3970],
- ["8230FB35",0x3971],
- ["8230FB36",0x3972],
- ["8230FB37",0x3973],
- ["8230FB38",0x3974],
- ["8230FB39",0x3975],
- ["8230FC30",0x3976],
- ["8230FC31",0x3977],
- ["8230FC32",0x3978],
- ["8230FC33",0x3979],
- ["8230FC34",0x397A],
- ["8230FC35",0x397B],
- ["8230FC36",0x397C],
- ["8230FC37",0x397D],
- ["8230FC38",0x397E],
- ["8230FC39",0x397F],
- ["8230FD30",0x3980],
- ["8230FD31",0x3981],
- ["8230FD32",0x3982],
- ["8230FD33",0x3983],
- ["8230FD34",0x3984],
- ["8230FD35",0x3985],
- ["8230FD36",0x3986],
- ["8230FD37",0x3987],
- ["8230FD38",0x3988],
- ["8230FD39",0x3989],
- ["8230FE30",0x398A],
- ["8230FE31",0x398B],
- ["8230FE32",0x398C],
- ["8230FE33",0x398D],
- ["8230FE34",0x398E],
- ["8230FE35",0x398F],
- ["8230FE36",0x3990],
- ["8230FE37",0x3991],
- ["8230FE38",0x3992],
- ["8230FE39",0x3993],
- ["82318130",0x3994],
- ["82318131",0x3995],
- ["82318132",0x3996],
- ["82318133",0x3997],
- ["82318134",0x3998],
- ["82318135",0x3999],
- ["82318136",0x399A],
- ["82318137",0x399B],
- ["82318138",0x399C],
- ["82318139",0x399D],
- ["82318230",0x399E],
- ["82318231",0x399F],
- ["82318232",0x39A0],
- ["82318233",0x39A1],
- ["82318234",0x39A2],
- ["82318235",0x39A3],
- ["82318236",0x39A4],
- ["82318237",0x39A5],
- ["82318238",0x39A6],
- ["82318239",0x39A7],
- ["82318330",0x39A8],
- ["82318331",0x39A9],
- ["82318332",0x39AA],
- ["82318333",0x39AB],
- ["82318334",0x39AC],
- ["82318335",0x39AD],
- ["82318336",0x39AE],
- ["82318337",0x39AF],
- ["82318338",0x39B0],
- ["82318339",0x39B1],
- ["82318430",0x39B2],
- ["82318431",0x39B3],
- ["82318432",0x39B4],
- ["82318433",0x39B5],
- ["82318434",0x39B6],
- ["82318435",0x39B7],
- ["82318436",0x39B8],
- ["82318437",0x39B9],
- ["82318438",0x39BA],
- ["82318439",0x39BB],
- ["82318530",0x39BC],
- ["82318531",0x39BD],
- ["82318532",0x39BE],
- ["82318533",0x39BF],
- ["82318534",0x39C0],
- ["82318535",0x39C1],
- ["82318536",0x39C2],
- ["82318537",0x39C3],
- ["82318538",0x39C4],
- ["82318539",0x39C5],
- ["82318630",0x39C6],
- ["82318631",0x39C7],
- ["82318632",0x39C8],
- ["82318633",0x39C9],
- ["82318634",0x39CA],
- ["82318635",0x39CB],
- ["82318636",0x39CC],
- ["82318637",0x39CD],
- ["82318638",0x39CE],
- ["FE62",0x39CF],
- ["FE65",0x39D0],
- ["82318639",0x39D1],
- ["82318730",0x39D2],
- ["82318731",0x39D3],
- ["82318732",0x39D4],
- ["82318733",0x39D5],
- ["82318734",0x39D6],
- ["82318735",0x39D7],
- ["82318736",0x39D8],
- ["82318737",0x39D9],
- ["82318738",0x39DA],
- ["82318739",0x39DB],
- ["82318830",0x39DC],
- ["82318831",0x39DD],
- ["82318832",0x39DE],
- ["FE63",0x39DF],
- ["82318833",0x39E0],
- ["82318834",0x39E1],
- ["82318835",0x39E2],
- ["82318836",0x39E3],
- ["82318837",0x39E4],
- ["82318838",0x39E5],
- ["82318839",0x39E6],
- ["82318930",0x39E7],
- ["82318931",0x39E8],
- ["82318932",0x39E9],
- ["82318933",0x39EA],
- ["82318934",0x39EB],
- ["82318935",0x39EC],
- ["82318936",0x39ED],
- ["82318937",0x39EE],
- ["82318938",0x39EF],
- ["82318939",0x39F0],
- ["82318A30",0x39F1],
- ["82318A31",0x39F2],
- ["82318A32",0x39F3],
- ["82318A33",0x39F4],
- ["82318A34",0x39F5],
- ["82318A35",0x39F6],
- ["82318A36",0x39F7],
- ["82318A37",0x39F8],
- ["82318A38",0x39F9],
- ["82318A39",0x39FA],
- ["82318B30",0x39FB],
- ["82318B31",0x39FC],
- ["82318B32",0x39FD],
- ["82318B33",0x39FE],
- ["82318B34",0x39FF],
- ["82318B35",0x3A00],
- ["82318B36",0x3A01],
- ["82318B37",0x3A02],
- ["82318B38",0x3A03],
- ["82318B39",0x3A04],
- ["82318C30",0x3A05],
- ["82318C31",0x3A06],
- ["82318C32",0x3A07],
- ["82318C33",0x3A08],
- ["82318C34",0x3A09],
- ["82318C35",0x3A0A],
- ["82318C36",0x3A0B],
- ["82318C37",0x3A0C],
- ["82318C38",0x3A0D],
- ["82318C39",0x3A0E],
- ["82318D30",0x3A0F],
- ["82318D31",0x3A10],
- ["82318D32",0x3A11],
- ["82318D33",0x3A12],
- ["82318D34",0x3A13],
- ["82318D35",0x3A14],
- ["82318D36",0x3A15],
- ["82318D37",0x3A16],
- ["82318D38",0x3A17],
- ["82318D39",0x3A18],
- ["82318E30",0x3A19],
- ["82318E31",0x3A1A],
- ["82318E32",0x3A1B],
- ["82318E33",0x3A1C],
- ["82318E34",0x3A1D],
- ["82318E35",0x3A1E],
- ["82318E36",0x3A1F],
- ["82318E37",0x3A20],
- ["82318E38",0x3A21],
- ["82318E39",0x3A22],
- ["82318F30",0x3A23],
- ["82318F31",0x3A24],
- ["82318F32",0x3A25],
- ["82318F33",0x3A26],
- ["82318F34",0x3A27],
- ["82318F35",0x3A28],
- ["82318F36",0x3A29],
- ["82318F37",0x3A2A],
- ["82318F38",0x3A2B],
- ["82318F39",0x3A2C],
- ["82319030",0x3A2D],
- ["82319031",0x3A2E],
- ["82319032",0x3A2F],
- ["82319033",0x3A30],
- ["82319034",0x3A31],
- ["82319035",0x3A32],
- ["82319036",0x3A33],
- ["82319037",0x3A34],
- ["82319038",0x3A35],
- ["82319039",0x3A36],
- ["82319130",0x3A37],
- ["82319131",0x3A38],
- ["82319132",0x3A39],
- ["82319133",0x3A3A],
- ["82319134",0x3A3B],
- ["82319135",0x3A3C],
- ["82319136",0x3A3D],
- ["82319137",0x3A3E],
- ["82319138",0x3A3F],
- ["82319139",0x3A40],
- ["82319230",0x3A41],
- ["82319231",0x3A42],
- ["82319232",0x3A43],
- ["82319233",0x3A44],
- ["82319234",0x3A45],
- ["82319235",0x3A46],
- ["82319236",0x3A47],
- ["82319237",0x3A48],
- ["82319238",0x3A49],
- ["82319239",0x3A4A],
- ["82319330",0x3A4B],
- ["82319331",0x3A4C],
- ["82319332",0x3A4D],
- ["82319333",0x3A4E],
- ["82319334",0x3A4F],
- ["82319335",0x3A50],
- ["82319336",0x3A51],
- ["82319337",0x3A52],
- ["82319338",0x3A53],
- ["82319339",0x3A54],
- ["82319430",0x3A55],
- ["82319431",0x3A56],
- ["82319432",0x3A57],
- ["82319433",0x3A58],
- ["82319434",0x3A59],
- ["82319435",0x3A5A],
- ["82319436",0x3A5B],
- ["82319437",0x3A5C],
- ["82319438",0x3A5D],
- ["82319439",0x3A5E],
- ["82319530",0x3A5F],
- ["82319531",0x3A60],
- ["82319532",0x3A61],
- ["82319533",0x3A62],
- ["82319534",0x3A63],
- ["82319535",0x3A64],
- ["82319536",0x3A65],
- ["82319537",0x3A66],
- ["82319538",0x3A67],
- ["82319539",0x3A68],
- ["82319630",0x3A69],
- ["82319631",0x3A6A],
- ["82319632",0x3A6B],
- ["82319633",0x3A6C],
- ["82319634",0x3A6D],
- ["82319635",0x3A6E],
- ["82319636",0x3A6F],
- ["82319637",0x3A70],
- ["82319638",0x3A71],
- ["82319639",0x3A72],
- ["FE64",0x3A73],
- ["82319730",0x3A74],
- ["82319731",0x3A75],
- ["82319732",0x3A76],
- ["82319733",0x3A77],
- ["82319734",0x3A78],
- ["82319735",0x3A79],
- ["82319736",0x3A7A],
- ["82319737",0x3A7B],
- ["82319738",0x3A7C],
- ["82319739",0x3A7D],
- ["82319830",0x3A7E],
- ["82319831",0x3A7F],
- ["82319832",0x3A80],
- ["82319833",0x3A81],
- ["82319834",0x3A82],
- ["82319835",0x3A83],
- ["82319836",0x3A84],
- ["82319837",0x3A85],
- ["82319838",0x3A86],
- ["82319839",0x3A87],
- ["82319930",0x3A88],
- ["82319931",0x3A89],
- ["82319932",0x3A8A],
- ["82319933",0x3A8B],
- ["82319934",0x3A8C],
- ["82319935",0x3A8D],
- ["82319936",0x3A8E],
- ["82319937",0x3A8F],
- ["82319938",0x3A90],
- ["82319939",0x3A91],
- ["82319A30",0x3A92],
- ["82319A31",0x3A93],
- ["82319A32",0x3A94],
- ["82319A33",0x3A95],
- ["82319A34",0x3A96],
- ["82319A35",0x3A97],
- ["82319A36",0x3A98],
- ["82319A37",0x3A99],
- ["82319A38",0x3A9A],
- ["82319A39",0x3A9B],
- ["82319B30",0x3A9C],
- ["82319B31",0x3A9D],
- ["82319B32",0x3A9E],
- ["82319B33",0x3A9F],
- ["82319B34",0x3AA0],
- ["82319B35",0x3AA1],
- ["82319B36",0x3AA2],
- ["82319B37",0x3AA3],
- ["82319B38",0x3AA4],
- ["82319B39",0x3AA5],
- ["82319C30",0x3AA6],
- ["82319C31",0x3AA7],
- ["82319C32",0x3AA8],
- ["82319C33",0x3AA9],
- ["82319C34",0x3AAA],
- ["82319C35",0x3AAB],
- ["82319C36",0x3AAC],
- ["82319C37",0x3AAD],
- ["82319C38",0x3AAE],
- ["82319C39",0x3AAF],
- ["82319D30",0x3AB0],
- ["82319D31",0x3AB1],
- ["82319D32",0x3AB2],
- ["82319D33",0x3AB3],
- ["82319D34",0x3AB4],
- ["82319D35",0x3AB5],
- ["82319D36",0x3AB6],
- ["82319D37",0x3AB7],
- ["82319D38",0x3AB8],
- ["82319D39",0x3AB9],
- ["82319E30",0x3ABA],
- ["82319E31",0x3ABB],
- ["82319E32",0x3ABC],
- ["82319E33",0x3ABD],
- ["82319E34",0x3ABE],
- ["82319E35",0x3ABF],
- ["82319E36",0x3AC0],
- ["82319E37",0x3AC1],
- ["82319E38",0x3AC2],
- ["82319E39",0x3AC3],
- ["82319F30",0x3AC4],
- ["82319F31",0x3AC5],
- ["82319F32",0x3AC6],
- ["82319F33",0x3AC7],
- ["82319F34",0x3AC8],
- ["82319F35",0x3AC9],
- ["82319F36",0x3ACA],
- ["82319F37",0x3ACB],
- ["82319F38",0x3ACC],
- ["82319F39",0x3ACD],
- ["8231A030",0x3ACE],
- ["8231A031",0x3ACF],
- ["8231A032",0x3AD0],
- ["8231A033",0x3AD1],
- ["8231A034",0x3AD2],
- ["8231A035",0x3AD3],
- ["8231A036",0x3AD4],
- ["8231A037",0x3AD5],
- ["8231A038",0x3AD6],
- ["8231A039",0x3AD7],
- ["8231A130",0x3AD8],
- ["8231A131",0x3AD9],
- ["8231A132",0x3ADA],
- ["8231A133",0x3ADB],
- ["8231A134",0x3ADC],
- ["8231A135",0x3ADD],
- ["8231A136",0x3ADE],
- ["8231A137",0x3ADF],
- ["8231A138",0x3AE0],
- ["8231A139",0x3AE1],
- ["8231A230",0x3AE2],
- ["8231A231",0x3AE3],
- ["8231A232",0x3AE4],
- ["8231A233",0x3AE5],
- ["8231A234",0x3AE6],
- ["8231A235",0x3AE7],
- ["8231A236",0x3AE8],
- ["8231A237",0x3AE9],
- ["8231A238",0x3AEA],
- ["8231A239",0x3AEB],
- ["8231A330",0x3AEC],
- ["8231A331",0x3AED],
- ["8231A332",0x3AEE],
- ["8231A333",0x3AEF],
- ["8231A334",0x3AF0],
- ["8231A335",0x3AF1],
- ["8231A336",0x3AF2],
- ["8231A337",0x3AF3],
- ["8231A338",0x3AF4],
- ["8231A339",0x3AF5],
- ["8231A430",0x3AF6],
- ["8231A431",0x3AF7],
- ["8231A432",0x3AF8],
- ["8231A433",0x3AF9],
- ["8231A434",0x3AFA],
- ["8231A435",0x3AFB],
- ["8231A436",0x3AFC],
- ["8231A437",0x3AFD],
- ["8231A438",0x3AFE],
- ["8231A439",0x3AFF],
- ["8231A530",0x3B00],
- ["8231A531",0x3B01],
- ["8231A532",0x3B02],
- ["8231A533",0x3B03],
- ["8231A534",0x3B04],
- ["8231A535",0x3B05],
- ["8231A536",0x3B06],
- ["8231A537",0x3B07],
- ["8231A538",0x3B08],
- ["8231A539",0x3B09],
- ["8231A630",0x3B0A],
- ["8231A631",0x3B0B],
- ["8231A632",0x3B0C],
- ["8231A633",0x3B0D],
- ["8231A634",0x3B0E],
- ["8231A635",0x3B0F],
- ["8231A636",0x3B10],
- ["8231A637",0x3B11],
- ["8231A638",0x3B12],
- ["8231A639",0x3B13],
- ["8231A730",0x3B14],
- ["8231A731",0x3B15],
- ["8231A732",0x3B16],
- ["8231A733",0x3B17],
- ["8231A734",0x3B18],
- ["8231A735",0x3B19],
- ["8231A736",0x3B1A],
- ["8231A737",0x3B1B],
- ["8231A738",0x3B1C],
- ["8231A739",0x3B1D],
- ["8231A830",0x3B1E],
- ["8231A831",0x3B1F],
- ["8231A832",0x3B20],
- ["8231A833",0x3B21],
- ["8231A834",0x3B22],
- ["8231A835",0x3B23],
- ["8231A836",0x3B24],
- ["8231A837",0x3B25],
- ["8231A838",0x3B26],
- ["8231A839",0x3B27],
- ["8231A930",0x3B28],
- ["8231A931",0x3B29],
- ["8231A932",0x3B2A],
- ["8231A933",0x3B2B],
- ["8231A934",0x3B2C],
- ["8231A935",0x3B2D],
- ["8231A936",0x3B2E],
- ["8231A937",0x3B2F],
- ["8231A938",0x3B30],
- ["8231A939",0x3B31],
- ["8231AA30",0x3B32],
- ["8231AA31",0x3B33],
- ["8231AA32",0x3B34],
- ["8231AA33",0x3B35],
- ["8231AA34",0x3B36],
- ["8231AA35",0x3B37],
- ["8231AA36",0x3B38],
- ["8231AA37",0x3B39],
- ["8231AA38",0x3B3A],
- ["8231AA39",0x3B3B],
- ["8231AB30",0x3B3C],
- ["8231AB31",0x3B3D],
- ["8231AB32",0x3B3E],
- ["8231AB33",0x3B3F],
- ["8231AB34",0x3B40],
- ["8231AB35",0x3B41],
- ["8231AB36",0x3B42],
- ["8231AB37",0x3B43],
- ["8231AB38",0x3B44],
- ["8231AB39",0x3B45],
- ["8231AC30",0x3B46],
- ["8231AC31",0x3B47],
- ["8231AC32",0x3B48],
- ["8231AC33",0x3B49],
- ["8231AC34",0x3B4A],
- ["8231AC35",0x3B4B],
- ["8231AC36",0x3B4C],
- ["8231AC37",0x3B4D],
- ["FE68",0x3B4E],
- ["8231AC38",0x3B4F],
- ["8231AC39",0x3B50],
- ["8231AD30",0x3B51],
- ["8231AD31",0x3B52],
- ["8231AD32",0x3B53],
- ["8231AD33",0x3B54],
- ["8231AD34",0x3B55],
- ["8231AD35",0x3B56],
- ["8231AD36",0x3B57],
- ["8231AD37",0x3B58],
- ["8231AD38",0x3B59],
- ["8231AD39",0x3B5A],
- ["8231AE30",0x3B5B],
- ["8231AE31",0x3B5C],
- ["8231AE32",0x3B5D],
- ["8231AE33",0x3B5E],
- ["8231AE34",0x3B5F],
- ["8231AE35",0x3B60],
- ["8231AE36",0x3B61],
- ["8231AE37",0x3B62],
- ["8231AE38",0x3B63],
- ["8231AE39",0x3B64],
- ["8231AF30",0x3B65],
- ["8231AF31",0x3B66],
- ["8231AF32",0x3B67],
- ["8231AF33",0x3B68],
- ["8231AF34",0x3B69],
- ["8231AF35",0x3B6A],
- ["8231AF36",0x3B6B],
- ["8231AF37",0x3B6C],
- ["8231AF38",0x3B6D],
- ["8231AF39",0x3B6E],
- ["8231B030",0x3B6F],
- ["8231B031",0x3B70],
- ["8231B032",0x3B71],
- ["8231B033",0x3B72],
- ["8231B034",0x3B73],
- ["8231B035",0x3B74],
- ["8231B036",0x3B75],
- ["8231B037",0x3B76],
- ["8231B038",0x3B77],
- ["8231B039",0x3B78],
- ["8231B130",0x3B79],
- ["8231B131",0x3B7A],
- ["8231B132",0x3B7B],
- ["8231B133",0x3B7C],
- ["8231B134",0x3B7D],
- ["8231B135",0x3B7E],
- ["8231B136",0x3B7F],
- ["8231B137",0x3B80],
- ["8231B138",0x3B81],
- ["8231B139",0x3B82],
- ["8231B230",0x3B83],
- ["8231B231",0x3B84],
- ["8231B232",0x3B85],
- ["8231B233",0x3B86],
- ["8231B234",0x3B87],
- ["8231B235",0x3B88],
- ["8231B236",0x3B89],
- ["8231B237",0x3B8A],
- ["8231B238",0x3B8B],
- ["8231B239",0x3B8C],
- ["8231B330",0x3B8D],
- ["8231B331",0x3B8E],
- ["8231B332",0x3B8F],
- ["8231B333",0x3B90],
- ["8231B334",0x3B91],
- ["8231B335",0x3B92],
- ["8231B336",0x3B93],
- ["8231B337",0x3B94],
- ["8231B338",0x3B95],
- ["8231B339",0x3B96],
- ["8231B430",0x3B97],
- ["8231B431",0x3B98],
- ["8231B432",0x3B99],
- ["8231B433",0x3B9A],
- ["8231B434",0x3B9B],
- ["8231B435",0x3B9C],
- ["8231B436",0x3B9D],
- ["8231B437",0x3B9E],
- ["8231B438",0x3B9F],
- ["8231B439",0x3BA0],
- ["8231B530",0x3BA1],
- ["8231B531",0x3BA2],
- ["8231B532",0x3BA3],
- ["8231B533",0x3BA4],
- ["8231B534",0x3BA5],
- ["8231B535",0x3BA6],
- ["8231B536",0x3BA7],
- ["8231B537",0x3BA8],
- ["8231B538",0x3BA9],
- ["8231B539",0x3BAA],
- ["8231B630",0x3BAB],
- ["8231B631",0x3BAC],
- ["8231B632",0x3BAD],
- ["8231B633",0x3BAE],
- ["8231B634",0x3BAF],
- ["8231B635",0x3BB0],
- ["8231B636",0x3BB1],
- ["8231B637",0x3BB2],
- ["8231B638",0x3BB3],
- ["8231B639",0x3BB4],
- ["8231B730",0x3BB5],
- ["8231B731",0x3BB6],
- ["8231B732",0x3BB7],
- ["8231B733",0x3BB8],
- ["8231B734",0x3BB9],
- ["8231B735",0x3BBA],
- ["8231B736",0x3BBB],
- ["8231B737",0x3BBC],
- ["8231B738",0x3BBD],
- ["8231B739",0x3BBE],
- ["8231B830",0x3BBF],
- ["8231B831",0x3BC0],
- ["8231B832",0x3BC1],
- ["8231B833",0x3BC2],
- ["8231B834",0x3BC3],
- ["8231B835",0x3BC4],
- ["8231B836",0x3BC5],
- ["8231B837",0x3BC6],
- ["8231B838",0x3BC7],
- ["8231B839",0x3BC8],
- ["8231B930",0x3BC9],
- ["8231B931",0x3BCA],
- ["8231B932",0x3BCB],
- ["8231B933",0x3BCC],
- ["8231B934",0x3BCD],
- ["8231B935",0x3BCE],
- ["8231B936",0x3BCF],
- ["8231B937",0x3BD0],
- ["8231B938",0x3BD1],
- ["8231B939",0x3BD2],
- ["8231BA30",0x3BD3],
- ["8231BA31",0x3BD4],
- ["8231BA32",0x3BD5],
- ["8231BA33",0x3BD6],
- ["8231BA34",0x3BD7],
- ["8231BA35",0x3BD8],
- ["8231BA36",0x3BD9],
- ["8231BA37",0x3BDA],
- ["8231BA38",0x3BDB],
- ["8231BA39",0x3BDC],
- ["8231BB30",0x3BDD],
- ["8231BB31",0x3BDE],
- ["8231BB32",0x3BDF],
- ["8231BB33",0x3BE0],
- ["8231BB34",0x3BE1],
- ["8231BB35",0x3BE2],
- ["8231BB36",0x3BE3],
- ["8231BB37",0x3BE4],
- ["8231BB38",0x3BE5],
- ["8231BB39",0x3BE6],
- ["8231BC30",0x3BE7],
- ["8231BC31",0x3BE8],
- ["8231BC32",0x3BE9],
- ["8231BC33",0x3BEA],
- ["8231BC34",0x3BEB],
- ["8231BC35",0x3BEC],
- ["8231BC36",0x3BED],
- ["8231BC37",0x3BEE],
- ["8231BC38",0x3BEF],
- ["8231BC39",0x3BF0],
- ["8231BD30",0x3BF1],
- ["8231BD31",0x3BF2],
- ["8231BD32",0x3BF3],
- ["8231BD33",0x3BF4],
- ["8231BD34",0x3BF5],
- ["8231BD35",0x3BF6],
- ["8231BD36",0x3BF7],
- ["8231BD37",0x3BF8],
- ["8231BD38",0x3BF9],
- ["8231BD39",0x3BFA],
- ["8231BE30",0x3BFB],
- ["8231BE31",0x3BFC],
- ["8231BE32",0x3BFD],
- ["8231BE33",0x3BFE],
- ["8231BE34",0x3BFF],
- ["8231BE35",0x3C00],
- ["8231BE36",0x3C01],
- ["8231BE37",0x3C02],
- ["8231BE38",0x3C03],
- ["8231BE39",0x3C04],
- ["8231BF30",0x3C05],
- ["8231BF31",0x3C06],
- ["8231BF32",0x3C07],
- ["8231BF33",0x3C08],
- ["8231BF34",0x3C09],
- ["8231BF35",0x3C0A],
- ["8231BF36",0x3C0B],
- ["8231BF37",0x3C0C],
- ["8231BF38",0x3C0D],
- ["8231BF39",0x3C0E],
- ["8231C030",0x3C0F],
- ["8231C031",0x3C10],
- ["8231C032",0x3C11],
- ["8231C033",0x3C12],
- ["8231C034",0x3C13],
- ["8231C035",0x3C14],
- ["8231C036",0x3C15],
- ["8231C037",0x3C16],
- ["8231C038",0x3C17],
- ["8231C039",0x3C18],
- ["8231C130",0x3C19],
- ["8231C131",0x3C1A],
- ["8231C132",0x3C1B],
- ["8231C133",0x3C1C],
- ["8231C134",0x3C1D],
- ["8231C135",0x3C1E],
- ["8231C136",0x3C1F],
- ["8231C137",0x3C20],
- ["8231C138",0x3C21],
- ["8231C139",0x3C22],
- ["8231C230",0x3C23],
- ["8231C231",0x3C24],
- ["8231C232",0x3C25],
- ["8231C233",0x3C26],
- ["8231C234",0x3C27],
- ["8231C235",0x3C28],
- ["8231C236",0x3C29],
- ["8231C237",0x3C2A],
- ["8231C238",0x3C2B],
- ["8231C239",0x3C2C],
- ["8231C330",0x3C2D],
- ["8231C331",0x3C2E],
- ["8231C332",0x3C2F],
- ["8231C333",0x3C30],
- ["8231C334",0x3C31],
- ["8231C335",0x3C32],
- ["8231C336",0x3C33],
- ["8231C337",0x3C34],
- ["8231C338",0x3C35],
- ["8231C339",0x3C36],
- ["8231C430",0x3C37],
- ["8231C431",0x3C38],
- ["8231C432",0x3C39],
- ["8231C433",0x3C3A],
- ["8231C434",0x3C3B],
- ["8231C435",0x3C3C],
- ["8231C436",0x3C3D],
- ["8231C437",0x3C3E],
- ["8231C438",0x3C3F],
- ["8231C439",0x3C40],
- ["8231C530",0x3C41],
- ["8231C531",0x3C42],
- ["8231C532",0x3C43],
- ["8231C533",0x3C44],
- ["8231C534",0x3C45],
- ["8231C535",0x3C46],
- ["8231C536",0x3C47],
- ["8231C537",0x3C48],
- ["8231C538",0x3C49],
- ["8231C539",0x3C4A],
- ["8231C630",0x3C4B],
- ["8231C631",0x3C4C],
- ["8231C632",0x3C4D],
- ["8231C633",0x3C4E],
- ["8231C634",0x3C4F],
- ["8231C635",0x3C50],
- ["8231C636",0x3C51],
- ["8231C637",0x3C52],
- ["8231C638",0x3C53],
- ["8231C639",0x3C54],
- ["8231C730",0x3C55],
- ["8231C731",0x3C56],
- ["8231C732",0x3C57],
- ["8231C733",0x3C58],
- ["8231C734",0x3C59],
- ["8231C735",0x3C5A],
- ["8231C736",0x3C5B],
- ["8231C737",0x3C5C],
- ["8231C738",0x3C5D],
- ["8231C739",0x3C5E],
- ["8231C830",0x3C5F],
- ["8231C831",0x3C60],
- ["8231C832",0x3C61],
- ["8231C833",0x3C62],
- ["8231C834",0x3C63],
- ["8231C835",0x3C64],
- ["8231C836",0x3C65],
- ["8231C837",0x3C66],
- ["8231C838",0x3C67],
- ["8231C839",0x3C68],
- ["8231C930",0x3C69],
- ["8231C931",0x3C6A],
- ["8231C932",0x3C6B],
- ["8231C933",0x3C6C],
- ["8231C934",0x3C6D],
- ["FE69",0x3C6E],
- ["8231C935",0x3C6F],
- ["8231C936",0x3C70],
- ["8231C937",0x3C71],
- ["8231C938",0x3C72],
- ["8231C939",0x3C73],
- ["8231CA30",0x3C74],
- ["8231CA31",0x3C75],
- ["8231CA32",0x3C76],
- ["8231CA33",0x3C77],
- ["8231CA34",0x3C78],
- ["8231CA35",0x3C79],
- ["8231CA36",0x3C7A],
- ["8231CA37",0x3C7B],
- ["8231CA38",0x3C7C],
- ["8231CA39",0x3C7D],
- ["8231CB30",0x3C7E],
- ["8231CB31",0x3C7F],
- ["8231CB32",0x3C80],
- ["8231CB33",0x3C81],
- ["8231CB34",0x3C82],
- ["8231CB35",0x3C83],
- ["8231CB36",0x3C84],
- ["8231CB37",0x3C85],
- ["8231CB38",0x3C86],
- ["8231CB39",0x3C87],
- ["8231CC30",0x3C88],
- ["8231CC31",0x3C89],
- ["8231CC32",0x3C8A],
- ["8231CC33",0x3C8B],
- ["8231CC34",0x3C8C],
- ["8231CC35",0x3C8D],
- ["8231CC36",0x3C8E],
- ["8231CC37",0x3C8F],
- ["8231CC38",0x3C90],
- ["8231CC39",0x3C91],
- ["8231CD30",0x3C92],
- ["8231CD31",0x3C93],
- ["8231CD32",0x3C94],
- ["8231CD33",0x3C95],
- ["8231CD34",0x3C96],
- ["8231CD35",0x3C97],
- ["8231CD36",0x3C98],
- ["8231CD37",0x3C99],
- ["8231CD38",0x3C9A],
- ["8231CD39",0x3C9B],
- ["8231CE30",0x3C9C],
- ["8231CE31",0x3C9D],
- ["8231CE32",0x3C9E],
- ["8231CE33",0x3C9F],
- ["8231CE34",0x3CA0],
- ["8231CE35",0x3CA1],
- ["8231CE36",0x3CA2],
- ["8231CE37",0x3CA3],
- ["8231CE38",0x3CA4],
- ["8231CE39",0x3CA5],
- ["8231CF30",0x3CA6],
- ["8231CF31",0x3CA7],
- ["8231CF32",0x3CA8],
- ["8231CF33",0x3CA9],
- ["8231CF34",0x3CAA],
- ["8231CF35",0x3CAB],
- ["8231CF36",0x3CAC],
- ["8231CF37",0x3CAD],
- ["8231CF38",0x3CAE],
- ["8231CF39",0x3CAF],
- ["8231D030",0x3CB0],
- ["8231D031",0x3CB1],
- ["8231D032",0x3CB2],
- ["8231D033",0x3CB3],
- ["8231D034",0x3CB4],
- ["8231D035",0x3CB5],
- ["8231D036",0x3CB6],
- ["8231D037",0x3CB7],
- ["8231D038",0x3CB8],
- ["8231D039",0x3CB9],
- ["8231D130",0x3CBA],
- ["8231D131",0x3CBB],
- ["8231D132",0x3CBC],
- ["8231D133",0x3CBD],
- ["8231D134",0x3CBE],
- ["8231D135",0x3CBF],
- ["8231D136",0x3CC0],
- ["8231D137",0x3CC1],
- ["8231D138",0x3CC2],
- ["8231D139",0x3CC3],
- ["8231D230",0x3CC4],
- ["8231D231",0x3CC5],
- ["8231D232",0x3CC6],
- ["8231D233",0x3CC7],
- ["8231D234",0x3CC8],
- ["8231D235",0x3CC9],
- ["8231D236",0x3CCA],
- ["8231D237",0x3CCB],
- ["8231D238",0x3CCC],
- ["8231D239",0x3CCD],
- ["8231D330",0x3CCE],
- ["8231D331",0x3CCF],
- ["8231D332",0x3CD0],
- ["8231D333",0x3CD1],
- ["8231D334",0x3CD2],
- ["8231D335",0x3CD3],
- ["8231D336",0x3CD4],
- ["8231D337",0x3CD5],
- ["8231D338",0x3CD6],
- ["8231D339",0x3CD7],
- ["8231D430",0x3CD8],
- ["8231D431",0x3CD9],
- ["8231D432",0x3CDA],
- ["8231D433",0x3CDB],
- ["8231D434",0x3CDC],
- ["8231D435",0x3CDD],
- ["8231D436",0x3CDE],
- ["8231D437",0x3CDF],
- ["FE6A",0x3CE0],
- ["8231D438",0x3CE1],
- ["8231D439",0x3CE2],
- ["8231D530",0x3CE3],
- ["8231D531",0x3CE4],
- ["8231D532",0x3CE5],
- ["8231D533",0x3CE6],
- ["8231D534",0x3CE7],
- ["8231D535",0x3CE8],
- ["8231D536",0x3CE9],
- ["8231D537",0x3CEA],
- ["8231D538",0x3CEB],
- ["8231D539",0x3CEC],
- ["8231D630",0x3CED],
- ["8231D631",0x3CEE],
- ["8231D632",0x3CEF],
- ["8231D633",0x3CF0],
- ["8231D634",0x3CF1],
- ["8231D635",0x3CF2],
- ["8231D636",0x3CF3],
- ["8231D637",0x3CF4],
- ["8231D638",0x3CF5],
- ["8231D639",0x3CF6],
- ["8231D730",0x3CF7],
- ["8231D731",0x3CF8],
- ["8231D732",0x3CF9],
- ["8231D733",0x3CFA],
- ["8231D734",0x3CFB],
- ["8231D735",0x3CFC],
- ["8231D736",0x3CFD],
- ["8231D737",0x3CFE],
- ["8231D738",0x3CFF],
- ["8231D739",0x3D00],
- ["8231D830",0x3D01],
- ["8231D831",0x3D02],
- ["8231D832",0x3D03],
- ["8231D833",0x3D04],
- ["8231D834",0x3D05],
- ["8231D835",0x3D06],
- ["8231D836",0x3D07],
- ["8231D837",0x3D08],
- ["8231D838",0x3D09],
- ["8231D839",0x3D0A],
- ["8231D930",0x3D0B],
- ["8231D931",0x3D0C],
- ["8231D932",0x3D0D],
- ["8231D933",0x3D0E],
- ["8231D934",0x3D0F],
- ["8231D935",0x3D10],
- ["8231D936",0x3D11],
- ["8231D937",0x3D12],
- ["8231D938",0x3D13],
- ["8231D939",0x3D14],
- ["8231DA30",0x3D15],
- ["8231DA31",0x3D16],
- ["8231DA32",0x3D17],
- ["8231DA33",0x3D18],
- ["8231DA34",0x3D19],
- ["8231DA35",0x3D1A],
- ["8231DA36",0x3D1B],
- ["8231DA37",0x3D1C],
- ["8231DA38",0x3D1D],
- ["8231DA39",0x3D1E],
- ["8231DB30",0x3D1F],
- ["8231DB31",0x3D20],
- ["8231DB32",0x3D21],
- ["8231DB33",0x3D22],
- ["8231DB34",0x3D23],
- ["8231DB35",0x3D24],
- ["8231DB36",0x3D25],
- ["8231DB37",0x3D26],
- ["8231DB38",0x3D27],
- ["8231DB39",0x3D28],
- ["8231DC30",0x3D29],
- ["8231DC31",0x3D2A],
- ["8231DC32",0x3D2B],
- ["8231DC33",0x3D2C],
- ["8231DC34",0x3D2D],
- ["8231DC35",0x3D2E],
- ["8231DC36",0x3D2F],
- ["8231DC37",0x3D30],
- ["8231DC38",0x3D31],
- ["8231DC39",0x3D32],
- ["8231DD30",0x3D33],
- ["8231DD31",0x3D34],
- ["8231DD32",0x3D35],
- ["8231DD33",0x3D36],
- ["8231DD34",0x3D37],
- ["8231DD35",0x3D38],
- ["8231DD36",0x3D39],
- ["8231DD37",0x3D3A],
- ["8231DD38",0x3D3B],
- ["8231DD39",0x3D3C],
- ["8231DE30",0x3D3D],
- ["8231DE31",0x3D3E],
- ["8231DE32",0x3D3F],
- ["8231DE33",0x3D40],
- ["8231DE34",0x3D41],
- ["8231DE35",0x3D42],
- ["8231DE36",0x3D43],
- ["8231DE37",0x3D44],
- ["8231DE38",0x3D45],
- ["8231DE39",0x3D46],
- ["8231DF30",0x3D47],
- ["8231DF31",0x3D48],
- ["8231DF32",0x3D49],
- ["8231DF33",0x3D4A],
- ["8231DF34",0x3D4B],
- ["8231DF35",0x3D4C],
- ["8231DF36",0x3D4D],
- ["8231DF37",0x3D4E],
- ["8231DF38",0x3D4F],
- ["8231DF39",0x3D50],
- ["8231E030",0x3D51],
- ["8231E031",0x3D52],
- ["8231E032",0x3D53],
- ["8231E033",0x3D54],
- ["8231E034",0x3D55],
- ["8231E035",0x3D56],
- ["8231E036",0x3D57],
- ["8231E037",0x3D58],
- ["8231E038",0x3D59],
- ["8231E039",0x3D5A],
- ["8231E130",0x3D5B],
- ["8231E131",0x3D5C],
- ["8231E132",0x3D5D],
- ["8231E133",0x3D5E],
- ["8231E134",0x3D5F],
- ["8231E135",0x3D60],
- ["8231E136",0x3D61],
- ["8231E137",0x3D62],
- ["8231E138",0x3D63],
- ["8231E139",0x3D64],
- ["8231E230",0x3D65],
- ["8231E231",0x3D66],
- ["8231E232",0x3D67],
- ["8231E233",0x3D68],
- ["8231E234",0x3D69],
- ["8231E235",0x3D6A],
- ["8231E236",0x3D6B],
- ["8231E237",0x3D6C],
- ["8231E238",0x3D6D],
- ["8231E239",0x3D6E],
- ["8231E330",0x3D6F],
- ["8231E331",0x3D70],
- ["8231E332",0x3D71],
- ["8231E333",0x3D72],
- ["8231E334",0x3D73],
- ["8231E335",0x3D74],
- ["8231E336",0x3D75],
- ["8231E337",0x3D76],
- ["8231E338",0x3D77],
- ["8231E339",0x3D78],
- ["8231E430",0x3D79],
- ["8231E431",0x3D7A],
- ["8231E432",0x3D7B],
- ["8231E433",0x3D7C],
- ["8231E434",0x3D7D],
- ["8231E435",0x3D7E],
- ["8231E436",0x3D7F],
- ["8231E437",0x3D80],
- ["8231E438",0x3D81],
- ["8231E439",0x3D82],
- ["8231E530",0x3D83],
- ["8231E531",0x3D84],
- ["8231E532",0x3D85],
- ["8231E533",0x3D86],
- ["8231E534",0x3D87],
- ["8231E535",0x3D88],
- ["8231E536",0x3D89],
- ["8231E537",0x3D8A],
- ["8231E538",0x3D8B],
- ["8231E539",0x3D8C],
- ["8231E630",0x3D8D],
- ["8231E631",0x3D8E],
- ["8231E632",0x3D8F],
- ["8231E633",0x3D90],
- ["8231E634",0x3D91],
- ["8231E635",0x3D92],
- ["8231E636",0x3D93],
- ["8231E637",0x3D94],
- ["8231E638",0x3D95],
- ["8231E639",0x3D96],
- ["8231E730",0x3D97],
- ["8231E731",0x3D98],
- ["8231E732",0x3D99],
- ["8231E733",0x3D9A],
- ["8231E734",0x3D9B],
- ["8231E735",0x3D9C],
- ["8231E736",0x3D9D],
- ["8231E737",0x3D9E],
- ["8231E738",0x3D9F],
- ["8231E739",0x3DA0],
- ["8231E830",0x3DA1],
- ["8231E831",0x3DA2],
- ["8231E832",0x3DA3],
- ["8231E833",0x3DA4],
- ["8231E834",0x3DA5],
- ["8231E835",0x3DA6],
- ["8231E836",0x3DA7],
- ["8231E837",0x3DA8],
- ["8231E838",0x3DA9],
- ["8231E839",0x3DAA],
- ["8231E930",0x3DAB],
- ["8231E931",0x3DAC],
- ["8231E932",0x3DAD],
- ["8231E933",0x3DAE],
- ["8231E934",0x3DAF],
- ["8231E935",0x3DB0],
- ["8231E936",0x3DB1],
- ["8231E937",0x3DB2],
- ["8231E938",0x3DB3],
- ["8231E939",0x3DB4],
- ["8231EA30",0x3DB5],
- ["8231EA31",0x3DB6],
- ["8231EA32",0x3DB7],
- ["8231EA33",0x3DB8],
- ["8231EA34",0x3DB9],
- ["8231EA35",0x3DBA],
- ["8231EA36",0x3DBB],
- ["8231EA37",0x3DBC],
- ["8231EA38",0x3DBD],
- ["8231EA39",0x3DBE],
- ["8231EB30",0x3DBF],
- ["8231EB31",0x3DC0],
- ["8231EB32",0x3DC1],
- ["8231EB33",0x3DC2],
- ["8231EB34",0x3DC3],
- ["8231EB35",0x3DC4],
- ["8231EB36",0x3DC5],
- ["8231EB37",0x3DC6],
- ["8231EB38",0x3DC7],
- ["8231EB39",0x3DC8],
- ["8231EC30",0x3DC9],
- ["8231EC31",0x3DCA],
- ["8231EC32",0x3DCB],
- ["8231EC33",0x3DCC],
- ["8231EC34",0x3DCD],
- ["8231EC35",0x3DCE],
- ["8231EC36",0x3DCF],
- ["8231EC37",0x3DD0],
- ["8231EC38",0x3DD1],
- ["8231EC39",0x3DD2],
- ["8231ED30",0x3DD3],
- ["8231ED31",0x3DD4],
- ["8231ED32",0x3DD5],
- ["8231ED33",0x3DD6],
- ["8231ED34",0x3DD7],
- ["8231ED35",0x3DD8],
- ["8231ED36",0x3DD9],
- ["8231ED37",0x3DDA],
- ["8231ED38",0x3DDB],
- ["8231ED39",0x3DDC],
- ["8231EE30",0x3DDD],
- ["8231EE31",0x3DDE],
- ["8231EE32",0x3DDF],
- ["8231EE33",0x3DE0],
- ["8231EE34",0x3DE1],
- ["8231EE35",0x3DE2],
- ["8231EE36",0x3DE3],
- ["8231EE37",0x3DE4],
- ["8231EE38",0x3DE5],
- ["8231EE39",0x3DE6],
- ["8231EF30",0x3DE7],
- ["8231EF31",0x3DE8],
- ["8231EF32",0x3DE9],
- ["8231EF33",0x3DEA],
- ["8231EF34",0x3DEB],
- ["8231EF35",0x3DEC],
- ["8231EF36",0x3DED],
- ["8231EF37",0x3DEE],
- ["8231EF38",0x3DEF],
- ["8231EF39",0x3DF0],
- ["8231F030",0x3DF1],
- ["8231F031",0x3DF2],
- ["8231F032",0x3DF3],
- ["8231F033",0x3DF4],
- ["8231F034",0x3DF5],
- ["8231F035",0x3DF6],
- ["8231F036",0x3DF7],
- ["8231F037",0x3DF8],
- ["8231F038",0x3DF9],
- ["8231F039",0x3DFA],
- ["8231F130",0x3DFB],
- ["8231F131",0x3DFC],
- ["8231F132",0x3DFD],
- ["8231F133",0x3DFE],
- ["8231F134",0x3DFF],
- ["8231F135",0x3E00],
- ["8231F136",0x3E01],
- ["8231F137",0x3E02],
- ["8231F138",0x3E03],
- ["8231F139",0x3E04],
- ["8231F230",0x3E05],
- ["8231F231",0x3E06],
- ["8231F232",0x3E07],
- ["8231F233",0x3E08],
- ["8231F234",0x3E09],
- ["8231F235",0x3E0A],
- ["8231F236",0x3E0B],
- ["8231F237",0x3E0C],
- ["8231F238",0x3E0D],
- ["8231F239",0x3E0E],
- ["8231F330",0x3E0F],
- ["8231F331",0x3E10],
- ["8231F332",0x3E11],
- ["8231F333",0x3E12],
- ["8231F334",0x3E13],
- ["8231F335",0x3E14],
- ["8231F336",0x3E15],
- ["8231F337",0x3E16],
- ["8231F338",0x3E17],
- ["8231F339",0x3E18],
- ["8231F430",0x3E19],
- ["8231F431",0x3E1A],
- ["8231F432",0x3E1B],
- ["8231F433",0x3E1C],
- ["8231F434",0x3E1D],
- ["8231F435",0x3E1E],
- ["8231F436",0x3E1F],
- ["8231F437",0x3E20],
- ["8231F438",0x3E21],
- ["8231F439",0x3E22],
- ["8231F530",0x3E23],
- ["8231F531",0x3E24],
- ["8231F532",0x3E25],
- ["8231F533",0x3E26],
- ["8231F534",0x3E27],
- ["8231F535",0x3E28],
- ["8231F536",0x3E29],
- ["8231F537",0x3E2A],
- ["8231F538",0x3E2B],
- ["8231F539",0x3E2C],
- ["8231F630",0x3E2D],
- ["8231F631",0x3E2E],
- ["8231F632",0x3E2F],
- ["8231F633",0x3E30],
- ["8231F634",0x3E31],
- ["8231F635",0x3E32],
- ["8231F636",0x3E33],
- ["8231F637",0x3E34],
- ["8231F638",0x3E35],
- ["8231F639",0x3E36],
- ["8231F730",0x3E37],
- ["8231F731",0x3E38],
- ["8231F732",0x3E39],
- ["8231F733",0x3E3A],
- ["8231F734",0x3E3B],
- ["8231F735",0x3E3C],
- ["8231F736",0x3E3D],
- ["8231F737",0x3E3E],
- ["8231F738",0x3E3F],
- ["8231F739",0x3E40],
- ["8231F830",0x3E41],
- ["8231F831",0x3E42],
- ["8231F832",0x3E43],
- ["8231F833",0x3E44],
- ["8231F834",0x3E45],
- ["8231F835",0x3E46],
- ["8231F836",0x3E47],
- ["8231F837",0x3E48],
- ["8231F838",0x3E49],
- ["8231F839",0x3E4A],
- ["8231F930",0x3E4B],
- ["8231F931",0x3E4C],
- ["8231F932",0x3E4D],
- ["8231F933",0x3E4E],
- ["8231F934",0x3E4F],
- ["8231F935",0x3E50],
- ["8231F936",0x3E51],
- ["8231F937",0x3E52],
- ["8231F938",0x3E53],
- ["8231F939",0x3E54],
- ["8231FA30",0x3E55],
- ["8231FA31",0x3E56],
- ["8231FA32",0x3E57],
- ["8231FA33",0x3E58],
- ["8231FA34",0x3E59],
- ["8231FA35",0x3E5A],
- ["8231FA36",0x3E5B],
- ["8231FA37",0x3E5C],
- ["8231FA38",0x3E5D],
- ["8231FA39",0x3E5E],
- ["8231FB30",0x3E5F],
- ["8231FB31",0x3E60],
- ["8231FB32",0x3E61],
- ["8231FB33",0x3E62],
- ["8231FB34",0x3E63],
- ["8231FB35",0x3E64],
- ["8231FB36",0x3E65],
- ["8231FB37",0x3E66],
- ["8231FB38",0x3E67],
- ["8231FB39",0x3E68],
- ["8231FC30",0x3E69],
- ["8231FC31",0x3E6A],
- ["8231FC32",0x3E6B],
- ["8231FC33",0x3E6C],
- ["8231FC34",0x3E6D],
- ["8231FC35",0x3E6E],
- ["8231FC36",0x3E6F],
- ["8231FC37",0x3E70],
- ["8231FC38",0x3E71],
- ["8231FC39",0x3E72],
- ["8231FD30",0x3E73],
- ["8231FD31",0x3E74],
- ["8231FD32",0x3E75],
- ["8231FD33",0x3E76],
- ["8231FD34",0x3E77],
- ["8231FD35",0x3E78],
- ["8231FD36",0x3E79],
- ["8231FD37",0x3E7A],
- ["8231FD38",0x3E7B],
- ["8231FD39",0x3E7C],
- ["8231FE30",0x3E7D],
- ["8231FE31",0x3E7E],
- ["8231FE32",0x3E7F],
- ["8231FE33",0x3E80],
- ["8231FE34",0x3E81],
- ["8231FE35",0x3E82],
- ["8231FE36",0x3E83],
- ["8231FE37",0x3E84],
- ["8231FE38",0x3E85],
- ["8231FE39",0x3E86],
- ["82328130",0x3E87],
- ["82328131",0x3E88],
- ["82328132",0x3E89],
- ["82328133",0x3E8A],
- ["82328134",0x3E8B],
- ["82328135",0x3E8C],
- ["82328136",0x3E8D],
- ["82328137",0x3E8E],
- ["82328138",0x3E8F],
- ["82328139",0x3E90],
- ["82328230",0x3E91],
- ["82328231",0x3E92],
- ["82328232",0x3E93],
- ["82328233",0x3E94],
- ["82328234",0x3E95],
- ["82328235",0x3E96],
- ["82328236",0x3E97],
- ["82328237",0x3E98],
- ["82328238",0x3E99],
- ["82328239",0x3E9A],
- ["82328330",0x3E9B],
- ["82328331",0x3E9C],
- ["82328332",0x3E9D],
- ["82328333",0x3E9E],
- ["82328334",0x3E9F],
- ["82328335",0x3EA0],
- ["82328336",0x3EA1],
- ["82328337",0x3EA2],
- ["82328338",0x3EA3],
- ["82328339",0x3EA4],
- ["82328430",0x3EA5],
- ["82328431",0x3EA6],
- ["82328432",0x3EA7],
- ["82328433",0x3EA8],
- ["82328434",0x3EA9],
- ["82328435",0x3EAA],
- ["82328436",0x3EAB],
- ["82328437",0x3EAC],
- ["82328438",0x3EAD],
- ["82328439",0x3EAE],
- ["82328530",0x3EAF],
- ["82328531",0x3EB0],
- ["82328532",0x3EB1],
- ["82328533",0x3EB2],
- ["82328534",0x3EB3],
- ["82328535",0x3EB4],
- ["82328536",0x3EB5],
- ["82328537",0x3EB6],
- ["82328538",0x3EB7],
- ["82328539",0x3EB8],
- ["82328630",0x3EB9],
- ["82328631",0x3EBA],
- ["82328632",0x3EBB],
- ["82328633",0x3EBC],
- ["82328634",0x3EBD],
- ["82328635",0x3EBE],
- ["82328636",0x3EBF],
- ["82328637",0x3EC0],
- ["82328638",0x3EC1],
- ["82328639",0x3EC2],
- ["82328730",0x3EC3],
- ["82328731",0x3EC4],
- ["82328732",0x3EC5],
- ["82328733",0x3EC6],
- ["82328734",0x3EC7],
- ["82328735",0x3EC8],
- ["82328736",0x3EC9],
- ["82328737",0x3ECA],
- ["82328738",0x3ECB],
- ["82328739",0x3ECC],
- ["82328830",0x3ECD],
- ["82328831",0x3ECE],
- ["82328832",0x3ECF],
- ["82328833",0x3ED0],
- ["82328834",0x3ED1],
- ["82328835",0x3ED2],
- ["82328836",0x3ED3],
- ["82328837",0x3ED4],
- ["82328838",0x3ED5],
- ["82328839",0x3ED6],
- ["82328930",0x3ED7],
- ["82328931",0x3ED8],
- ["82328932",0x3ED9],
- ["82328933",0x3EDA],
- ["82328934",0x3EDB],
- ["82328935",0x3EDC],
- ["82328936",0x3EDD],
- ["82328937",0x3EDE],
- ["82328938",0x3EDF],
- ["82328939",0x3EE0],
- ["82328A30",0x3EE1],
- ["82328A31",0x3EE2],
- ["82328A32",0x3EE3],
- ["82328A33",0x3EE4],
- ["82328A34",0x3EE5],
- ["82328A35",0x3EE6],
- ["82328A36",0x3EE7],
- ["82328A37",0x3EE8],
- ["82328A38",0x3EE9],
- ["82328A39",0x3EEA],
- ["82328B30",0x3EEB],
- ["82328B31",0x3EEC],
- ["82328B32",0x3EED],
- ["82328B33",0x3EEE],
- ["82328B34",0x3EEF],
- ["82328B35",0x3EF0],
- ["82328B36",0x3EF1],
- ["82328B37",0x3EF2],
- ["82328B38",0x3EF3],
- ["82328B39",0x3EF4],
- ["82328C30",0x3EF5],
- ["82328C31",0x3EF6],
- ["82328C32",0x3EF7],
- ["82328C33",0x3EF8],
- ["82328C34",0x3EF9],
- ["82328C35",0x3EFA],
- ["82328C36",0x3EFB],
- ["82328C37",0x3EFC],
- ["82328C38",0x3EFD],
- ["82328C39",0x3EFE],
- ["82328D30",0x3EFF],
- ["82328D31",0x3F00],
- ["82328D32",0x3F01],
- ["82328D33",0x3F02],
- ["82328D34",0x3F03],
- ["82328D35",0x3F04],
- ["82328D36",0x3F05],
- ["82328D37",0x3F06],
- ["82328D38",0x3F07],
- ["82328D39",0x3F08],
- ["82328E30",0x3F09],
- ["82328E31",0x3F0A],
- ["82328E32",0x3F0B],
- ["82328E33",0x3F0C],
- ["82328E34",0x3F0D],
- ["82328E35",0x3F0E],
- ["82328E36",0x3F0F],
- ["82328E37",0x3F10],
- ["82328E38",0x3F11],
- ["82328E39",0x3F12],
- ["82328F30",0x3F13],
- ["82328F31",0x3F14],
- ["82328F32",0x3F15],
- ["82328F33",0x3F16],
- ["82328F34",0x3F17],
- ["82328F35",0x3F18],
- ["82328F36",0x3F19],
- ["82328F37",0x3F1A],
- ["82328F38",0x3F1B],
- ["82328F39",0x3F1C],
- ["82329030",0x3F1D],
- ["82329031",0x3F1E],
- ["82329032",0x3F1F],
- ["82329033",0x3F20],
- ["82329034",0x3F21],
- ["82329035",0x3F22],
- ["82329036",0x3F23],
- ["82329037",0x3F24],
- ["82329038",0x3F25],
- ["82329039",0x3F26],
- ["82329130",0x3F27],
- ["82329131",0x3F28],
- ["82329132",0x3F29],
- ["82329133",0x3F2A],
- ["82329134",0x3F2B],
- ["82329135",0x3F2C],
- ["82329136",0x3F2D],
- ["82329137",0x3F2E],
- ["82329138",0x3F2F],
- ["82329139",0x3F30],
- ["82329230",0x3F31],
- ["82329231",0x3F32],
- ["82329232",0x3F33],
- ["82329233",0x3F34],
- ["82329234",0x3F35],
- ["82329235",0x3F36],
- ["82329236",0x3F37],
- ["82329237",0x3F38],
- ["82329238",0x3F39],
- ["82329239",0x3F3A],
- ["82329330",0x3F3B],
- ["82329331",0x3F3C],
- ["82329332",0x3F3D],
- ["82329333",0x3F3E],
- ["82329334",0x3F3F],
- ["82329335",0x3F40],
- ["82329336",0x3F41],
- ["82329337",0x3F42],
- ["82329338",0x3F43],
- ["82329339",0x3F44],
- ["82329430",0x3F45],
- ["82329431",0x3F46],
- ["82329432",0x3F47],
- ["82329433",0x3F48],
- ["82329434",0x3F49],
- ["82329435",0x3F4A],
- ["82329436",0x3F4B],
- ["82329437",0x3F4C],
- ["82329438",0x3F4D],
- ["82329439",0x3F4E],
- ["82329530",0x3F4F],
- ["82329531",0x3F50],
- ["82329532",0x3F51],
- ["82329533",0x3F52],
- ["82329534",0x3F53],
- ["82329535",0x3F54],
- ["82329536",0x3F55],
- ["82329537",0x3F56],
- ["82329538",0x3F57],
- ["82329539",0x3F58],
- ["82329630",0x3F59],
- ["82329631",0x3F5A],
- ["82329632",0x3F5B],
- ["82329633",0x3F5C],
- ["82329634",0x3F5D],
- ["82329635",0x3F5E],
- ["82329636",0x3F5F],
- ["82329637",0x3F60],
- ["82329638",0x3F61],
- ["82329639",0x3F62],
- ["82329730",0x3F63],
- ["82329731",0x3F64],
- ["82329732",0x3F65],
- ["82329733",0x3F66],
- ["82329734",0x3F67],
- ["82329735",0x3F68],
- ["82329736",0x3F69],
- ["82329737",0x3F6A],
- ["82329738",0x3F6B],
- ["82329739",0x3F6C],
- ["82329830",0x3F6D],
- ["82329831",0x3F6E],
- ["82329832",0x3F6F],
- ["82329833",0x3F70],
- ["82329834",0x3F71],
- ["82329835",0x3F72],
- ["82329836",0x3F73],
- ["82329837",0x3F74],
- ["82329838",0x3F75],
- ["82329839",0x3F76],
- ["82329930",0x3F77],
- ["82329931",0x3F78],
- ["82329932",0x3F79],
- ["82329933",0x3F7A],
- ["82329934",0x3F7B],
- ["82329935",0x3F7C],
- ["82329936",0x3F7D],
- ["82329937",0x3F7E],
- ["82329938",0x3F7F],
- ["82329939",0x3F80],
- ["82329A30",0x3F81],
- ["82329A31",0x3F82],
- ["82329A32",0x3F83],
- ["82329A33",0x3F84],
- ["82329A34",0x3F85],
- ["82329A35",0x3F86],
- ["82329A36",0x3F87],
- ["82329A37",0x3F88],
- ["82329A38",0x3F89],
- ["82329A39",0x3F8A],
- ["82329B30",0x3F8B],
- ["82329B31",0x3F8C],
- ["82329B32",0x3F8D],
- ["82329B33",0x3F8E],
- ["82329B34",0x3F8F],
- ["82329B35",0x3F90],
- ["82329B36",0x3F91],
- ["82329B37",0x3F92],
- ["82329B38",0x3F93],
- ["82329B39",0x3F94],
- ["82329C30",0x3F95],
- ["82329C31",0x3F96],
- ["82329C32",0x3F97],
- ["82329C33",0x3F98],
- ["82329C34",0x3F99],
- ["82329C35",0x3F9A],
- ["82329C36",0x3F9B],
- ["82329C37",0x3F9C],
- ["82329C38",0x3F9D],
- ["82329C39",0x3F9E],
- ["82329D30",0x3F9F],
- ["82329D31",0x3FA0],
- ["82329D32",0x3FA1],
- ["82329D33",0x3FA2],
- ["82329D34",0x3FA3],
- ["82329D35",0x3FA4],
- ["82329D36",0x3FA5],
- ["82329D37",0x3FA6],
- ["82329D38",0x3FA7],
- ["82329D39",0x3FA8],
- ["82329E30",0x3FA9],
- ["82329E31",0x3FAA],
- ["82329E32",0x3FAB],
- ["82329E33",0x3FAC],
- ["82329E34",0x3FAD],
- ["82329E35",0x3FAE],
- ["82329E36",0x3FAF],
- ["82329E37",0x3FB0],
- ["82329E38",0x3FB1],
- ["82329E39",0x3FB2],
- ["82329F30",0x3FB3],
- ["82329F31",0x3FB4],
- ["82329F32",0x3FB5],
- ["82329F33",0x3FB6],
- ["82329F34",0x3FB7],
- ["82329F35",0x3FB8],
- ["82329F36",0x3FB9],
- ["82329F37",0x3FBA],
- ["82329F38",0x3FBB],
- ["82329F39",0x3FBC],
- ["8232A030",0x3FBD],
- ["8232A031",0x3FBE],
- ["8232A032",0x3FBF],
- ["8232A033",0x3FC0],
- ["8232A034",0x3FC1],
- ["8232A035",0x3FC2],
- ["8232A036",0x3FC3],
- ["8232A037",0x3FC4],
- ["8232A038",0x3FC5],
- ["8232A039",0x3FC6],
- ["8232A130",0x3FC7],
- ["8232A131",0x3FC8],
- ["8232A132",0x3FC9],
- ["8232A133",0x3FCA],
- ["8232A134",0x3FCB],
- ["8232A135",0x3FCC],
- ["8232A136",0x3FCD],
- ["8232A137",0x3FCE],
- ["8232A138",0x3FCF],
- ["8232A139",0x3FD0],
- ["8232A230",0x3FD1],
- ["8232A231",0x3FD2],
- ["8232A232",0x3FD3],
- ["8232A233",0x3FD4],
- ["8232A234",0x3FD5],
- ["8232A235",0x3FD6],
- ["8232A236",0x3FD7],
- ["8232A237",0x3FD8],
- ["8232A238",0x3FD9],
- ["8232A239",0x3FDA],
- ["8232A330",0x3FDB],
- ["8232A331",0x3FDC],
- ["8232A332",0x3FDD],
- ["8232A333",0x3FDE],
- ["8232A334",0x3FDF],
- ["8232A335",0x3FE0],
- ["8232A336",0x3FE1],
- ["8232A337",0x3FE2],
- ["8232A338",0x3FE3],
- ["8232A339",0x3FE4],
- ["8232A430",0x3FE5],
- ["8232A431",0x3FE6],
- ["8232A432",0x3FE7],
- ["8232A433",0x3FE8],
- ["8232A434",0x3FE9],
- ["8232A435",0x3FEA],
- ["8232A436",0x3FEB],
- ["8232A437",0x3FEC],
- ["8232A438",0x3FED],
- ["8232A439",0x3FEE],
- ["8232A530",0x3FEF],
- ["8232A531",0x3FF0],
- ["8232A532",0x3FF1],
- ["8232A533",0x3FF2],
- ["8232A534",0x3FF3],
- ["8232A535",0x3FF4],
- ["8232A536",0x3FF5],
- ["8232A537",0x3FF6],
- ["8232A538",0x3FF7],
- ["8232A539",0x3FF8],
- ["8232A630",0x3FF9],
- ["8232A631",0x3FFA],
- ["8232A632",0x3FFB],
- ["8232A633",0x3FFC],
- ["8232A634",0x3FFD],
- ["8232A635",0x3FFE],
- ["8232A636",0x3FFF],
- ["8232A637",0x4000],
- ["8232A638",0x4001],
- ["8232A639",0x4002],
- ["8232A730",0x4003],
- ["8232A731",0x4004],
- ["8232A732",0x4005],
- ["8232A733",0x4006],
- ["8232A734",0x4007],
- ["8232A735",0x4008],
- ["8232A736",0x4009],
- ["8232A737",0x400A],
- ["8232A738",0x400B],
- ["8232A739",0x400C],
- ["8232A830",0x400D],
- ["8232A831",0x400E],
- ["8232A832",0x400F],
- ["8232A833",0x4010],
- ["8232A834",0x4011],
- ["8232A835",0x4012],
- ["8232A836",0x4013],
- ["8232A837",0x4014],
- ["8232A838",0x4015],
- ["8232A839",0x4016],
- ["8232A930",0x4017],
- ["8232A931",0x4018],
- ["8232A932",0x4019],
- ["8232A933",0x401A],
- ["8232A934",0x401B],
- ["8232A935",0x401C],
- ["8232A936",0x401D],
- ["8232A937",0x401E],
- ["8232A938",0x401F],
- ["8232A939",0x4020],
- ["8232AA30",0x4021],
- ["8232AA31",0x4022],
- ["8232AA32",0x4023],
- ["8232AA33",0x4024],
- ["8232AA34",0x4025],
- ["8232AA35",0x4026],
- ["8232AA36",0x4027],
- ["8232AA37",0x4028],
- ["8232AA38",0x4029],
- ["8232AA39",0x402A],
- ["8232AB30",0x402B],
- ["8232AB31",0x402C],
- ["8232AB32",0x402D],
- ["8232AB33",0x402E],
- ["8232AB34",0x402F],
- ["8232AB35",0x4030],
- ["8232AB36",0x4031],
- ["8232AB37",0x4032],
- ["8232AB38",0x4033],
- ["8232AB39",0x4034],
- ["8232AC30",0x4035],
- ["8232AC31",0x4036],
- ["8232AC32",0x4037],
- ["8232AC33",0x4038],
- ["8232AC34",0x4039],
- ["8232AC35",0x403A],
- ["8232AC36",0x403B],
- ["8232AC37",0x403C],
- ["8232AC38",0x403D],
- ["8232AC39",0x403E],
- ["8232AD30",0x403F],
- ["8232AD31",0x4040],
- ["8232AD32",0x4041],
- ["8232AD33",0x4042],
- ["8232AD34",0x4043],
- ["8232AD35",0x4044],
- ["8232AD36",0x4045],
- ["8232AD37",0x4046],
- ["8232AD38",0x4047],
- ["8232AD39",0x4048],
- ["8232AE30",0x4049],
- ["8232AE31",0x404A],
- ["8232AE32",0x404B],
- ["8232AE33",0x404C],
- ["8232AE34",0x404D],
- ["8232AE35",0x404E],
- ["8232AE36",0x404F],
- ["8232AE37",0x4050],
- ["8232AE38",0x4051],
- ["8232AE39",0x4052],
- ["8232AF30",0x4053],
- ["8232AF31",0x4054],
- ["8232AF32",0x4055],
- ["FE6F",0x4056],
- ["8232AF33",0x4057],
- ["8232AF34",0x4058],
- ["8232AF35",0x4059],
- ["8232AF36",0x405A],
- ["8232AF37",0x405B],
- ["8232AF38",0x405C],
- ["8232AF39",0x405D],
- ["8232B030",0x405E],
- ["8232B031",0x405F],
- ["8232B032",0x4060],
- ["8232B033",0x4061],
- ["8232B034",0x4062],
- ["8232B035",0x4063],
- ["8232B036",0x4064],
- ["8232B037",0x4065],
- ["8232B038",0x4066],
- ["8232B039",0x4067],
- ["8232B130",0x4068],
- ["8232B131",0x4069],
- ["8232B132",0x406A],
- ["8232B133",0x406B],
- ["8232B134",0x406C],
- ["8232B135",0x406D],
- ["8232B136",0x406E],
- ["8232B137",0x406F],
- ["8232B138",0x4070],
- ["8232B139",0x4071],
- ["8232B230",0x4072],
- ["8232B231",0x4073],
- ["8232B232",0x4074],
- ["8232B233",0x4075],
- ["8232B234",0x4076],
- ["8232B235",0x4077],
- ["8232B236",0x4078],
- ["8232B237",0x4079],
- ["8232B238",0x407A],
- ["8232B239",0x407B],
- ["8232B330",0x407C],
- ["8232B331",0x407D],
- ["8232B332",0x407E],
- ["8232B333",0x407F],
- ["8232B334",0x4080],
- ["8232B335",0x4081],
- ["8232B336",0x4082],
- ["8232B337",0x4083],
- ["8232B338",0x4084],
- ["8232B339",0x4085],
- ["8232B430",0x4086],
- ["8232B431",0x4087],
- ["8232B432",0x4088],
- ["8232B433",0x4089],
- ["8232B434",0x408A],
- ["8232B435",0x408B],
- ["8232B436",0x408C],
- ["8232B437",0x408D],
- ["8232B438",0x408E],
- ["8232B439",0x408F],
- ["8232B530",0x4090],
- ["8232B531",0x4091],
- ["8232B532",0x4092],
- ["8232B533",0x4093],
- ["8232B534",0x4094],
- ["8232B535",0x4095],
- ["8232B536",0x4096],
- ["8232B537",0x4097],
- ["8232B538",0x4098],
- ["8232B539",0x4099],
- ["8232B630",0x409A],
- ["8232B631",0x409B],
- ["8232B632",0x409C],
- ["8232B633",0x409D],
- ["8232B634",0x409E],
- ["8232B635",0x409F],
- ["8232B636",0x40A0],
- ["8232B637",0x40A1],
- ["8232B638",0x40A2],
- ["8232B639",0x40A3],
- ["8232B730",0x40A4],
- ["8232B731",0x40A5],
- ["8232B732",0x40A6],
- ["8232B733",0x40A7],
- ["8232B734",0x40A8],
- ["8232B735",0x40A9],
- ["8232B736",0x40AA],
- ["8232B737",0x40AB],
- ["8232B738",0x40AC],
- ["8232B739",0x40AD],
- ["8232B830",0x40AE],
- ["8232B831",0x40AF],
- ["8232B832",0x40B0],
- ["8232B833",0x40B1],
- ["8232B834",0x40B2],
- ["8232B835",0x40B3],
- ["8232B836",0x40B4],
- ["8232B837",0x40B5],
- ["8232B838",0x40B6],
- ["8232B839",0x40B7],
- ["8232B930",0x40B8],
- ["8232B931",0x40B9],
- ["8232B932",0x40BA],
- ["8232B933",0x40BB],
- ["8232B934",0x40BC],
- ["8232B935",0x40BD],
- ["8232B936",0x40BE],
- ["8232B937",0x40BF],
- ["8232B938",0x40C0],
- ["8232B939",0x40C1],
- ["8232BA30",0x40C2],
- ["8232BA31",0x40C3],
- ["8232BA32",0x40C4],
- ["8232BA33",0x40C5],
- ["8232BA34",0x40C6],
- ["8232BA35",0x40C7],
- ["8232BA36",0x40C8],
- ["8232BA37",0x40C9],
- ["8232BA38",0x40CA],
- ["8232BA39",0x40CB],
- ["8232BB30",0x40CC],
- ["8232BB31",0x40CD],
- ["8232BB32",0x40CE],
- ["8232BB33",0x40CF],
- ["8232BB34",0x40D0],
- ["8232BB35",0x40D1],
- ["8232BB36",0x40D2],
- ["8232BB37",0x40D3],
- ["8232BB38",0x40D4],
- ["8232BB39",0x40D5],
- ["8232BC30",0x40D6],
- ["8232BC31",0x40D7],
- ["8232BC32",0x40D8],
- ["8232BC33",0x40D9],
- ["8232BC34",0x40DA],
- ["8232BC35",0x40DB],
- ["8232BC36",0x40DC],
- ["8232BC37",0x40DD],
- ["8232BC38",0x40DE],
- ["8232BC39",0x40DF],
- ["8232BD30",0x40E0],
- ["8232BD31",0x40E1],
- ["8232BD32",0x40E2],
- ["8232BD33",0x40E3],
- ["8232BD34",0x40E4],
- ["8232BD35",0x40E5],
- ["8232BD36",0x40E6],
- ["8232BD37",0x40E7],
- ["8232BD38",0x40E8],
- ["8232BD39",0x40E9],
- ["8232BE30",0x40EA],
- ["8232BE31",0x40EB],
- ["8232BE32",0x40EC],
- ["8232BE33",0x40ED],
- ["8232BE34",0x40EE],
- ["8232BE35",0x40EF],
- ["8232BE36",0x40F0],
- ["8232BE37",0x40F1],
- ["8232BE38",0x40F2],
- ["8232BE39",0x40F3],
- ["8232BF30",0x40F4],
- ["8232BF31",0x40F5],
- ["8232BF32",0x40F6],
- ["8232BF33",0x40F7],
- ["8232BF34",0x40F8],
- ["8232BF35",0x40F9],
- ["8232BF36",0x40FA],
- ["8232BF37",0x40FB],
- ["8232BF38",0x40FC],
- ["8232BF39",0x40FD],
- ["8232C030",0x40FE],
- ["8232C031",0x40FF],
- ["8232C032",0x4100],
- ["8232C033",0x4101],
- ["8232C034",0x4102],
- ["8232C035",0x4103],
- ["8232C036",0x4104],
- ["8232C037",0x4105],
- ["8232C038",0x4106],
- ["8232C039",0x4107],
- ["8232C130",0x4108],
- ["8232C131",0x4109],
- ["8232C132",0x410A],
- ["8232C133",0x410B],
- ["8232C134",0x410C],
- ["8232C135",0x410D],
- ["8232C136",0x410E],
- ["8232C137",0x410F],
- ["8232C138",0x4110],
- ["8232C139",0x4111],
- ["8232C230",0x4112],
- ["8232C231",0x4113],
- ["8232C232",0x4114],
- ["8232C233",0x4115],
- ["8232C234",0x4116],
- ["8232C235",0x4117],
- ["8232C236",0x4118],
- ["8232C237",0x4119],
- ["8232C238",0x411A],
- ["8232C239",0x411B],
- ["8232C330",0x411C],
- ["8232C331",0x411D],
- ["8232C332",0x411E],
- ["8232C333",0x411F],
- ["8232C334",0x4120],
- ["8232C335",0x4121],
- ["8232C336",0x4122],
- ["8232C337",0x4123],
- ["8232C338",0x4124],
- ["8232C339",0x4125],
- ["8232C430",0x4126],
- ["8232C431",0x4127],
- ["8232C432",0x4128],
- ["8232C433",0x4129],
- ["8232C434",0x412A],
- ["8232C435",0x412B],
- ["8232C436",0x412C],
- ["8232C437",0x412D],
- ["8232C438",0x412E],
- ["8232C439",0x412F],
- ["8232C530",0x4130],
- ["8232C531",0x4131],
- ["8232C532",0x4132],
- ["8232C533",0x4133],
- ["8232C534",0x4134],
- ["8232C535",0x4135],
- ["8232C536",0x4136],
- ["8232C537",0x4137],
- ["8232C538",0x4138],
- ["8232C539",0x4139],
- ["8232C630",0x413A],
- ["8232C631",0x413B],
- ["8232C632",0x413C],
- ["8232C633",0x413D],
- ["8232C634",0x413E],
- ["8232C635",0x413F],
- ["8232C636",0x4140],
- ["8232C637",0x4141],
- ["8232C638",0x4142],
- ["8232C639",0x4143],
- ["8232C730",0x4144],
- ["8232C731",0x4145],
- ["8232C732",0x4146],
- ["8232C733",0x4147],
- ["8232C734",0x4148],
- ["8232C735",0x4149],
- ["8232C736",0x414A],
- ["8232C737",0x414B],
- ["8232C738",0x414C],
- ["8232C739",0x414D],
- ["8232C830",0x414E],
- ["8232C831",0x414F],
- ["8232C832",0x4150],
- ["8232C833",0x4151],
- ["8232C834",0x4152],
- ["8232C835",0x4153],
- ["8232C836",0x4154],
- ["8232C837",0x4155],
- ["8232C838",0x4156],
- ["8232C839",0x4157],
- ["8232C930",0x4158],
- ["8232C931",0x4159],
- ["8232C932",0x415A],
- ["8232C933",0x415B],
- ["8232C934",0x415C],
- ["8232C935",0x415D],
- ["8232C936",0x415E],
- ["FE70",0x415F],
- ["8232C937",0x4160],
- ["8232C938",0x4161],
- ["8232C939",0x4162],
- ["8232CA30",0x4163],
- ["8232CA31",0x4164],
- ["8232CA32",0x4165],
- ["8232CA33",0x4166],
- ["8232CA34",0x4167],
- ["8232CA35",0x4168],
- ["8232CA36",0x4169],
- ["8232CA37",0x416A],
- ["8232CA38",0x416B],
- ["8232CA39",0x416C],
- ["8232CB30",0x416D],
- ["8232CB31",0x416E],
- ["8232CB32",0x416F],
- ["8232CB33",0x4170],
- ["8232CB34",0x4171],
- ["8232CB35",0x4172],
- ["8232CB36",0x4173],
- ["8232CB37",0x4174],
- ["8232CB38",0x4175],
- ["8232CB39",0x4176],
- ["8232CC30",0x4177],
- ["8232CC31",0x4178],
- ["8232CC32",0x4179],
- ["8232CC33",0x417A],
- ["8232CC34",0x417B],
- ["8232CC35",0x417C],
- ["8232CC36",0x417D],
- ["8232CC37",0x417E],
- ["8232CC38",0x417F],
- ["8232CC39",0x4180],
- ["8232CD30",0x4181],
- ["8232CD31",0x4182],
- ["8232CD32",0x4183],
- ["8232CD33",0x4184],
- ["8232CD34",0x4185],
- ["8232CD35",0x4186],
- ["8232CD36",0x4187],
- ["8232CD37",0x4188],
- ["8232CD38",0x4189],
- ["8232CD39",0x418A],
- ["8232CE30",0x418B],
- ["8232CE31",0x418C],
- ["8232CE32",0x418D],
- ["8232CE33",0x418E],
- ["8232CE34",0x418F],
- ["8232CE35",0x4190],
- ["8232CE36",0x4191],
- ["8232CE37",0x4192],
- ["8232CE38",0x4193],
- ["8232CE39",0x4194],
- ["8232CF30",0x4195],
- ["8232CF31",0x4196],
- ["8232CF32",0x4197],
- ["8232CF33",0x4198],
- ["8232CF34",0x4199],
- ["8232CF35",0x419A],
- ["8232CF36",0x419B],
- ["8232CF37",0x419C],
- ["8232CF38",0x419D],
- ["8232CF39",0x419E],
- ["8232D030",0x419F],
- ["8232D031",0x41A0],
- ["8232D032",0x41A1],
- ["8232D033",0x41A2],
- ["8232D034",0x41A3],
- ["8232D035",0x41A4],
- ["8232D036",0x41A5],
- ["8232D037",0x41A6],
- ["8232D038",0x41A7],
- ["8232D039",0x41A8],
- ["8232D130",0x41A9],
- ["8232D131",0x41AA],
- ["8232D132",0x41AB],
- ["8232D133",0x41AC],
- ["8232D134",0x41AD],
- ["8232D135",0x41AE],
- ["8232D136",0x41AF],
- ["8232D137",0x41B0],
- ["8232D138",0x41B1],
- ["8232D139",0x41B2],
- ["8232D230",0x41B3],
- ["8232D231",0x41B4],
- ["8232D232",0x41B5],
- ["8232D233",0x41B6],
- ["8232D234",0x41B7],
- ["8232D235",0x41B8],
- ["8232D236",0x41B9],
- ["8232D237",0x41BA],
- ["8232D238",0x41BB],
- ["8232D239",0x41BC],
- ["8232D330",0x41BD],
- ["8232D331",0x41BE],
- ["8232D332",0x41BF],
- ["8232D333",0x41C0],
- ["8232D334",0x41C1],
- ["8232D335",0x41C2],
- ["8232D336",0x41C3],
- ["8232D337",0x41C4],
- ["8232D338",0x41C5],
- ["8232D339",0x41C6],
- ["8232D430",0x41C7],
- ["8232D431",0x41C8],
- ["8232D432",0x41C9],
- ["8232D433",0x41CA],
- ["8232D434",0x41CB],
- ["8232D435",0x41CC],
- ["8232D436",0x41CD],
- ["8232D437",0x41CE],
- ["8232D438",0x41CF],
- ["8232D439",0x41D0],
- ["8232D530",0x41D1],
- ["8232D531",0x41D2],
- ["8232D532",0x41D3],
- ["8232D533",0x41D4],
- ["8232D534",0x41D5],
- ["8232D535",0x41D6],
- ["8232D536",0x41D7],
- ["8232D537",0x41D8],
- ["8232D538",0x41D9],
- ["8232D539",0x41DA],
- ["8232D630",0x41DB],
- ["8232D631",0x41DC],
- ["8232D632",0x41DD],
- ["8232D633",0x41DE],
- ["8232D634",0x41DF],
- ["8232D635",0x41E0],
- ["8232D636",0x41E1],
- ["8232D637",0x41E2],
- ["8232D638",0x41E3],
- ["8232D639",0x41E4],
- ["8232D730",0x41E5],
- ["8232D731",0x41E6],
- ["8232D732",0x41E7],
- ["8232D733",0x41E8],
- ["8232D734",0x41E9],
- ["8232D735",0x41EA],
- ["8232D736",0x41EB],
- ["8232D737",0x41EC],
- ["8232D738",0x41ED],
- ["8232D739",0x41EE],
- ["8232D830",0x41EF],
- ["8232D831",0x41F0],
- ["8232D832",0x41F1],
- ["8232D833",0x41F2],
- ["8232D834",0x41F3],
- ["8232D835",0x41F4],
- ["8232D836",0x41F5],
- ["8232D837",0x41F6],
- ["8232D838",0x41F7],
- ["8232D839",0x41F8],
- ["8232D930",0x41F9],
- ["8232D931",0x41FA],
- ["8232D932",0x41FB],
- ["8232D933",0x41FC],
- ["8232D934",0x41FD],
- ["8232D935",0x41FE],
- ["8232D936",0x41FF],
- ["8232D937",0x4200],
- ["8232D938",0x4201],
- ["8232D939",0x4202],
- ["8232DA30",0x4203],
- ["8232DA31",0x4204],
- ["8232DA32",0x4205],
- ["8232DA33",0x4206],
- ["8232DA34",0x4207],
- ["8232DA35",0x4208],
- ["8232DA36",0x4209],
- ["8232DA37",0x420A],
- ["8232DA38",0x420B],
- ["8232DA39",0x420C],
- ["8232DB30",0x420D],
- ["8232DB31",0x420E],
- ["8232DB32",0x420F],
- ["8232DB33",0x4210],
- ["8232DB34",0x4211],
- ["8232DB35",0x4212],
- ["8232DB36",0x4213],
- ["8232DB37",0x4214],
- ["8232DB38",0x4215],
- ["8232DB39",0x4216],
- ["8232DC30",0x4217],
- ["8232DC31",0x4218],
- ["8232DC32",0x4219],
- ["8232DC33",0x421A],
- ["8232DC34",0x421B],
- ["8232DC35",0x421C],
- ["8232DC36",0x421D],
- ["8232DC37",0x421E],
- ["8232DC38",0x421F],
- ["8232DC39",0x4220],
- ["8232DD30",0x4221],
- ["8232DD31",0x4222],
- ["8232DD32",0x4223],
- ["8232DD33",0x4224],
- ["8232DD34",0x4225],
- ["8232DD35",0x4226],
- ["8232DD36",0x4227],
- ["8232DD37",0x4228],
- ["8232DD38",0x4229],
- ["8232DD39",0x422A],
- ["8232DE30",0x422B],
- ["8232DE31",0x422C],
- ["8232DE32",0x422D],
- ["8232DE33",0x422E],
- ["8232DE34",0x422F],
- ["8232DE35",0x4230],
- ["8232DE36",0x4231],
- ["8232DE37",0x4232],
- ["8232DE38",0x4233],
- ["8232DE39",0x4234],
- ["8232DF30",0x4235],
- ["8232DF31",0x4236],
- ["8232DF32",0x4237],
- ["8232DF33",0x4238],
- ["8232DF34",0x4239],
- ["8232DF35",0x423A],
- ["8232DF36",0x423B],
- ["8232DF37",0x423C],
- ["8232DF38",0x423D],
- ["8232DF39",0x423E],
- ["8232E030",0x423F],
- ["8232E031",0x4240],
- ["8232E032",0x4241],
- ["8232E033",0x4242],
- ["8232E034",0x4243],
- ["8232E035",0x4244],
- ["8232E036",0x4245],
- ["8232E037",0x4246],
- ["8232E038",0x4247],
- ["8232E039",0x4248],
- ["8232E130",0x4249],
- ["8232E131",0x424A],
- ["8232E132",0x424B],
- ["8232E133",0x424C],
- ["8232E134",0x424D],
- ["8232E135",0x424E],
- ["8232E136",0x424F],
- ["8232E137",0x4250],
- ["8232E138",0x4251],
- ["8232E139",0x4252],
- ["8232E230",0x4253],
- ["8232E231",0x4254],
- ["8232E232",0x4255],
- ["8232E233",0x4256],
- ["8232E234",0x4257],
- ["8232E235",0x4258],
- ["8232E236",0x4259],
- ["8232E237",0x425A],
- ["8232E238",0x425B],
- ["8232E239",0x425C],
- ["8232E330",0x425D],
- ["8232E331",0x425E],
- ["8232E332",0x425F],
- ["8232E333",0x4260],
- ["8232E334",0x4261],
- ["8232E335",0x4262],
- ["8232E336",0x4263],
- ["8232E337",0x4264],
- ["8232E338",0x4265],
- ["8232E339",0x4266],
- ["8232E430",0x4267],
- ["8232E431",0x4268],
- ["8232E432",0x4269],
- ["8232E433",0x426A],
- ["8232E434",0x426B],
- ["8232E435",0x426C],
- ["8232E436",0x426D],
- ["8232E437",0x426E],
- ["8232E438",0x426F],
- ["8232E439",0x4270],
- ["8232E530",0x4271],
- ["8232E531",0x4272],
- ["8232E532",0x4273],
- ["8232E533",0x4274],
- ["8232E534",0x4275],
- ["8232E535",0x4276],
- ["8232E536",0x4277],
- ["8232E537",0x4278],
- ["8232E538",0x4279],
- ["8232E539",0x427A],
- ["8232E630",0x427B],
- ["8232E631",0x427C],
- ["8232E632",0x427D],
- ["8232E633",0x427E],
- ["8232E634",0x427F],
- ["8232E635",0x4280],
- ["8232E636",0x4281],
- ["8232E637",0x4282],
- ["8232E638",0x4283],
- ["8232E639",0x4284],
- ["8232E730",0x4285],
- ["8232E731",0x4286],
- ["8232E732",0x4287],
- ["8232E733",0x4288],
- ["8232E734",0x4289],
- ["8232E735",0x428A],
- ["8232E736",0x428B],
- ["8232E737",0x428C],
- ["8232E738",0x428D],
- ["8232E739",0x428E],
- ["8232E830",0x428F],
- ["8232E831",0x4290],
- ["8232E832",0x4291],
- ["8232E833",0x4292],
- ["8232E834",0x4293],
- ["8232E835",0x4294],
- ["8232E836",0x4295],
- ["8232E837",0x4296],
- ["8232E838",0x4297],
- ["8232E839",0x4298],
- ["8232E930",0x4299],
- ["8232E931",0x429A],
- ["8232E932",0x429B],
- ["8232E933",0x429C],
- ["8232E934",0x429D],
- ["8232E935",0x429E],
- ["8232E936",0x429F],
- ["8232E937",0x42A0],
- ["8232E938",0x42A1],
- ["8232E939",0x42A2],
- ["8232EA30",0x42A3],
- ["8232EA31",0x42A4],
- ["8232EA32",0x42A5],
- ["8232EA33",0x42A6],
- ["8232EA34",0x42A7],
- ["8232EA35",0x42A8],
- ["8232EA36",0x42A9],
- ["8232EA37",0x42AA],
- ["8232EA38",0x42AB],
- ["8232EA39",0x42AC],
- ["8232EB30",0x42AD],
- ["8232EB31",0x42AE],
- ["8232EB32",0x42AF],
- ["8232EB33",0x42B0],
- ["8232EB34",0x42B1],
- ["8232EB35",0x42B2],
- ["8232EB36",0x42B3],
- ["8232EB37",0x42B4],
- ["8232EB38",0x42B5],
- ["8232EB39",0x42B6],
- ["8232EC30",0x42B7],
- ["8232EC31",0x42B8],
- ["8232EC32",0x42B9],
- ["8232EC33",0x42BA],
- ["8232EC34",0x42BB],
- ["8232EC35",0x42BC],
- ["8232EC36",0x42BD],
- ["8232EC37",0x42BE],
- ["8232EC38",0x42BF],
- ["8232EC39",0x42C0],
- ["8232ED30",0x42C1],
- ["8232ED31",0x42C2],
- ["8232ED32",0x42C3],
- ["8232ED33",0x42C4],
- ["8232ED34",0x42C5],
- ["8232ED35",0x42C6],
- ["8232ED36",0x42C7],
- ["8232ED37",0x42C8],
- ["8232ED38",0x42C9],
- ["8232ED39",0x42CA],
- ["8232EE30",0x42CB],
- ["8232EE31",0x42CC],
- ["8232EE32",0x42CD],
- ["8232EE33",0x42CE],
- ["8232EE34",0x42CF],
- ["8232EE35",0x42D0],
- ["8232EE36",0x42D1],
- ["8232EE37",0x42D2],
- ["8232EE38",0x42D3],
- ["8232EE39",0x42D4],
- ["8232EF30",0x42D5],
- ["8232EF31",0x42D6],
- ["8232EF32",0x42D7],
- ["8232EF33",0x42D8],
- ["8232EF34",0x42D9],
- ["8232EF35",0x42DA],
- ["8232EF36",0x42DB],
- ["8232EF37",0x42DC],
- ["8232EF38",0x42DD],
- ["8232EF39",0x42DE],
- ["8232F030",0x42DF],
- ["8232F031",0x42E0],
- ["8232F032",0x42E1],
- ["8232F033",0x42E2],
- ["8232F034",0x42E3],
- ["8232F035",0x42E4],
- ["8232F036",0x42E5],
- ["8232F037",0x42E6],
- ["8232F038",0x42E7],
- ["8232F039",0x42E8],
- ["8232F130",0x42E9],
- ["8232F131",0x42EA],
- ["8232F132",0x42EB],
- ["8232F133",0x42EC],
- ["8232F134",0x42ED],
- ["8232F135",0x42EE],
- ["8232F136",0x42EF],
- ["8232F137",0x42F0],
- ["8232F138",0x42F1],
- ["8232F139",0x42F2],
- ["8232F230",0x42F3],
- ["8232F231",0x42F4],
- ["8232F232",0x42F5],
- ["8232F233",0x42F6],
- ["8232F234",0x42F7],
- ["8232F235",0x42F8],
- ["8232F236",0x42F9],
- ["8232F237",0x42FA],
- ["8232F238",0x42FB],
- ["8232F239",0x42FC],
- ["8232F330",0x42FD],
- ["8232F331",0x42FE],
- ["8232F332",0x42FF],
- ["8232F333",0x4300],
- ["8232F334",0x4301],
- ["8232F335",0x4302],
- ["8232F336",0x4303],
- ["8232F337",0x4304],
- ["8232F338",0x4305],
- ["8232F339",0x4306],
- ["8232F430",0x4307],
- ["8232F431",0x4308],
- ["8232F432",0x4309],
- ["8232F433",0x430A],
- ["8232F434",0x430B],
- ["8232F435",0x430C],
- ["8232F436",0x430D],
- ["8232F437",0x430E],
- ["8232F438",0x430F],
- ["8232F439",0x4310],
- ["8232F530",0x4311],
- ["8232F531",0x4312],
- ["8232F532",0x4313],
- ["8232F533",0x4314],
- ["8232F534",0x4315],
- ["8232F535",0x4316],
- ["8232F536",0x4317],
- ["8232F537",0x4318],
- ["8232F538",0x4319],
- ["8232F539",0x431A],
- ["8232F630",0x431B],
- ["8232F631",0x431C],
- ["8232F632",0x431D],
- ["8232F633",0x431E],
- ["8232F634",0x431F],
- ["8232F635",0x4320],
- ["8232F636",0x4321],
- ["8232F637",0x4322],
- ["8232F638",0x4323],
- ["8232F639",0x4324],
- ["8232F730",0x4325],
- ["8232F731",0x4326],
- ["8232F732",0x4327],
- ["8232F733",0x4328],
- ["8232F734",0x4329],
- ["8232F735",0x432A],
- ["8232F736",0x432B],
- ["8232F737",0x432C],
- ["8232F738",0x432D],
- ["8232F739",0x432E],
- ["8232F830",0x432F],
- ["8232F831",0x4330],
- ["8232F832",0x4331],
- ["8232F833",0x4332],
- ["8232F834",0x4333],
- ["8232F835",0x4334],
- ["8232F836",0x4335],
- ["8232F837",0x4336],
- ["FE72",0x4337],
- ["8232F838",0x4338],
- ["8232F839",0x4339],
- ["8232F930",0x433A],
- ["8232F931",0x433B],
- ["8232F932",0x433C],
- ["8232F933",0x433D],
- ["8232F934",0x433E],
- ["8232F935",0x433F],
- ["8232F936",0x4340],
- ["8232F937",0x4341],
- ["8232F938",0x4342],
- ["8232F939",0x4343],
- ["8232FA30",0x4344],
- ["8232FA31",0x4345],
- ["8232FA32",0x4346],
- ["8232FA33",0x4347],
- ["8232FA34",0x4348],
- ["8232FA35",0x4349],
- ["8232FA36",0x434A],
- ["8232FA37",0x434B],
- ["8232FA38",0x434C],
- ["8232FA39",0x434D],
- ["8232FB30",0x434E],
- ["8232FB31",0x434F],
- ["8232FB32",0x4350],
- ["8232FB33",0x4351],
- ["8232FB34",0x4352],
- ["8232FB35",0x4353],
- ["8232FB36",0x4354],
- ["8232FB37",0x4355],
- ["8232FB38",0x4356],
- ["8232FB39",0x4357],
- ["8232FC30",0x4358],
- ["8232FC31",0x4359],
- ["8232FC32",0x435A],
- ["8232FC33",0x435B],
- ["8232FC34",0x435C],
- ["8232FC35",0x435D],
- ["8232FC36",0x435E],
- ["8232FC37",0x435F],
- ["8232FC38",0x4360],
- ["8232FC39",0x4361],
- ["8232FD30",0x4362],
- ["8232FD31",0x4363],
- ["8232FD32",0x4364],
- ["8232FD33",0x4365],
- ["8232FD34",0x4366],
- ["8232FD35",0x4367],
- ["8232FD36",0x4368],
- ["8232FD37",0x4369],
- ["8232FD38",0x436A],
- ["8232FD39",0x436B],
- ["8232FE30",0x436C],
- ["8232FE31",0x436D],
- ["8232FE32",0x436E],
- ["8232FE33",0x436F],
- ["8232FE34",0x4370],
- ["8232FE35",0x4371],
- ["8232FE36",0x4372],
- ["8232FE37",0x4373],
- ["8232FE38",0x4374],
- ["8232FE39",0x4375],
- ["82338130",0x4376],
- ["82338131",0x4377],
- ["82338132",0x4378],
- ["82338133",0x4379],
- ["82338134",0x437A],
- ["82338135",0x437B],
- ["82338136",0x437C],
- ["82338137",0x437D],
- ["82338138",0x437E],
- ["82338139",0x437F],
- ["82338230",0x4380],
- ["82338231",0x4381],
- ["82338232",0x4382],
- ["82338233",0x4383],
- ["82338234",0x4384],
- ["82338235",0x4385],
- ["82338236",0x4386],
- ["82338237",0x4387],
- ["82338238",0x4388],
- ["82338239",0x4389],
- ["82338330",0x438A],
- ["82338331",0x438B],
- ["82338332",0x438C],
- ["82338333",0x438D],
- ["82338334",0x438E],
- ["82338335",0x438F],
- ["82338336",0x4390],
- ["82338337",0x4391],
- ["82338338",0x4392],
- ["82338339",0x4393],
- ["82338430",0x4394],
- ["82338431",0x4395],
- ["82338432",0x4396],
- ["82338433",0x4397],
- ["82338434",0x4398],
- ["82338435",0x4399],
- ["82338436",0x439A],
- ["82338437",0x439B],
- ["82338438",0x439C],
- ["82338439",0x439D],
- ["82338530",0x439E],
- ["82338531",0x439F],
- ["82338532",0x43A0],
- ["82338533",0x43A1],
- ["82338534",0x43A2],
- ["82338535",0x43A3],
- ["82338536",0x43A4],
- ["82338537",0x43A5],
- ["82338538",0x43A6],
- ["82338539",0x43A7],
- ["82338630",0x43A8],
- ["82338631",0x43A9],
- ["82338632",0x43AA],
- ["82338633",0x43AB],
- ["FE78",0x43AC],
- ["82338634",0x43AD],
- ["82338635",0x43AE],
- ["82338636",0x43AF],
- ["82338637",0x43B0],
- ["FE77",0x43B1],
- ["82338638",0x43B2],
- ["82338639",0x43B3],
- ["82338730",0x43B4],
- ["82338731",0x43B5],
- ["82338732",0x43B6],
- ["82338733",0x43B7],
- ["82338734",0x43B8],
- ["82338735",0x43B9],
- ["82338736",0x43BA],
- ["82338737",0x43BB],
- ["82338738",0x43BC],
- ["82338739",0x43BD],
- ["82338830",0x43BE],
- ["82338831",0x43BF],
- ["82338832",0x43C0],
- ["82338833",0x43C1],
- ["82338834",0x43C2],
- ["82338835",0x43C3],
- ["82338836",0x43C4],
- ["82338837",0x43C5],
- ["82338838",0x43C6],
- ["82338839",0x43C7],
- ["82338930",0x43C8],
- ["82338931",0x43C9],
- ["82338932",0x43CA],
- ["82338933",0x43CB],
- ["82338934",0x43CC],
- ["82338935",0x43CD],
- ["82338936",0x43CE],
- ["82338937",0x43CF],
- ["82338938",0x43D0],
- ["82338939",0x43D1],
- ["82338A30",0x43D2],
- ["82338A31",0x43D3],
- ["82338A32",0x43D4],
- ["82338A33",0x43D5],
- ["82338A34",0x43D6],
- ["82338A35",0x43D7],
- ["82338A36",0x43D8],
- ["82338A37",0x43D9],
- ["82338A38",0x43DA],
- ["82338A39",0x43DB],
- ["82338B30",0x43DC],
- ["FE7A",0x43DD],
- ["82338B31",0x43DE],
- ["82338B32",0x43DF],
- ["82338B33",0x43E0],
- ["82338B34",0x43E1],
- ["82338B35",0x43E2],
- ["82338B36",0x43E3],
- ["82338B37",0x43E4],
- ["82338B38",0x43E5],
- ["82338B39",0x43E6],
- ["82338C30",0x43E7],
- ["82338C31",0x43E8],
- ["82338C32",0x43E9],
- ["82338C33",0x43EA],
- ["82338C34",0x43EB],
- ["82338C35",0x43EC],
- ["82338C36",0x43ED],
- ["82338C37",0x43EE],
- ["82338C38",0x43EF],
- ["82338C39",0x43F0],
- ["82338D30",0x43F1],
- ["82338D31",0x43F2],
- ["82338D32",0x43F3],
- ["82338D33",0x43F4],
- ["82338D34",0x43F5],
- ["82338D35",0x43F6],
- ["82338D36",0x43F7],
- ["82338D37",0x43F8],
- ["82338D38",0x43F9],
- ["82338D39",0x43FA],
- ["82338E30",0x43FB],
- ["82338E31",0x43FC],
- ["82338E32",0x43FD],
- ["82338E33",0x43FE],
- ["82338E34",0x43FF],
- ["82338E35",0x4400],
- ["82338E36",0x4401],
- ["82338E37",0x4402],
- ["82338E38",0x4403],
- ["82338E39",0x4404],
- ["82338F30",0x4405],
- ["82338F31",0x4406],
- ["82338F32",0x4407],
- ["82338F33",0x4408],
- ["82338F34",0x4409],
- ["82338F35",0x440A],
- ["82338F36",0x440B],
- ["82338F37",0x440C],
- ["82338F38",0x440D],
- ["82338F39",0x440E],
- ["82339030",0x440F],
- ["82339031",0x4410],
- ["82339032",0x4411],
- ["82339033",0x4412],
- ["82339034",0x4413],
- ["82339035",0x4414],
- ["82339036",0x4415],
- ["82339037",0x4416],
- ["82339038",0x4417],
- ["82339039",0x4418],
- ["82339130",0x4419],
- ["82339131",0x441A],
- ["82339132",0x441B],
- ["82339133",0x441C],
- ["82339134",0x441D],
- ["82339135",0x441E],
- ["82339136",0x441F],
- ["82339137",0x4420],
- ["82339138",0x4421],
- ["82339139",0x4422],
- ["82339230",0x4423],
- ["82339231",0x4424],
- ["82339232",0x4425],
- ["82339233",0x4426],
- ["82339234",0x4427],
- ["82339235",0x4428],
- ["82339236",0x4429],
- ["82339237",0x442A],
- ["82339238",0x442B],
- ["82339239",0x442C],
- ["82339330",0x442D],
- ["82339331",0x442E],
- ["82339332",0x442F],
- ["82339333",0x4430],
- ["82339334",0x4431],
- ["82339335",0x4432],
- ["82339336",0x4433],
- ["82339337",0x4434],
- ["82339338",0x4435],
- ["82339339",0x4436],
- ["82339430",0x4437],
- ["82339431",0x4438],
- ["82339432",0x4439],
- ["82339433",0x443A],
- ["82339434",0x443B],
- ["82339435",0x443C],
- ["82339436",0x443D],
- ["82339437",0x443E],
- ["82339438",0x443F],
- ["82339439",0x4440],
- ["82339530",0x4441],
- ["82339531",0x4442],
- ["82339532",0x4443],
- ["82339533",0x4444],
- ["82339534",0x4445],
- ["82339535",0x4446],
- ["82339536",0x4447],
- ["82339537",0x4448],
- ["82339538",0x4449],
- ["82339539",0x444A],
- ["82339630",0x444B],
- ["82339631",0x444C],
- ["82339632",0x444D],
- ["82339633",0x444E],
- ["82339634",0x444F],
- ["82339635",0x4450],
- ["82339636",0x4451],
- ["82339637",0x4452],
- ["82339638",0x4453],
- ["82339639",0x4454],
- ["82339730",0x4455],
- ["82339731",0x4456],
- ["82339732",0x4457],
- ["82339733",0x4458],
- ["82339734",0x4459],
- ["82339735",0x445A],
- ["82339736",0x445B],
- ["82339737",0x445C],
- ["82339738",0x445D],
- ["82339739",0x445E],
- ["82339830",0x445F],
- ["82339831",0x4460],
- ["82339832",0x4461],
- ["82339833",0x4462],
- ["82339834",0x4463],
- ["82339835",0x4464],
- ["82339836",0x4465],
- ["82339837",0x4466],
- ["82339838",0x4467],
- ["82339839",0x4468],
- ["82339930",0x4469],
- ["82339931",0x446A],
- ["82339932",0x446B],
- ["82339933",0x446C],
- ["82339934",0x446D],
- ["82339935",0x446E],
- ["82339936",0x446F],
- ["82339937",0x4470],
- ["82339938",0x4471],
- ["82339939",0x4472],
- ["82339A30",0x4473],
- ["82339A31",0x4474],
- ["82339A32",0x4475],
- ["82339A33",0x4476],
- ["82339A34",0x4477],
- ["82339A35",0x4478],
- ["82339A36",0x4479],
- ["82339A37",0x447A],
- ["82339A38",0x447B],
- ["82339A39",0x447C],
- ["82339B30",0x447D],
- ["82339B31",0x447E],
- ["82339B32",0x447F],
- ["82339B33",0x4480],
- ["82339B34",0x4481],
- ["82339B35",0x4482],
- ["82339B36",0x4483],
- ["82339B37",0x4484],
- ["82339B38",0x4485],
- ["82339B39",0x4486],
- ["82339C30",0x4487],
- ["82339C31",0x4488],
- ["82339C32",0x4489],
- ["82339C33",0x448A],
- ["82339C34",0x448B],
- ["82339C35",0x448C],
- ["82339C36",0x448D],
- ["82339C37",0x448E],
- ["82339C38",0x448F],
- ["82339C39",0x4490],
- ["82339D30",0x4491],
- ["82339D31",0x4492],
- ["82339D32",0x4493],
- ["82339D33",0x4494],
- ["82339D34",0x4495],
- ["82339D35",0x4496],
- ["82339D36",0x4497],
- ["82339D37",0x4498],
- ["82339D38",0x4499],
- ["82339D39",0x449A],
- ["82339E30",0x449B],
- ["82339E31",0x449C],
- ["82339E32",0x449D],
- ["82339E33",0x449E],
- ["82339E34",0x449F],
- ["82339E35",0x44A0],
- ["82339E36",0x44A1],
- ["82339E37",0x44A2],
- ["82339E38",0x44A3],
- ["82339E39",0x44A4],
- ["82339F30",0x44A5],
- ["82339F31",0x44A6],
- ["82339F32",0x44A7],
- ["82339F33",0x44A8],
- ["82339F34",0x44A9],
- ["82339F35",0x44AA],
- ["82339F36",0x44AB],
- ["82339F37",0x44AC],
- ["82339F38",0x44AD],
- ["82339F39",0x44AE],
- ["8233A030",0x44AF],
- ["8233A031",0x44B0],
- ["8233A032",0x44B1],
- ["8233A033",0x44B2],
- ["8233A034",0x44B3],
- ["8233A035",0x44B4],
- ["8233A036",0x44B5],
- ["8233A037",0x44B6],
- ["8233A038",0x44B7],
- ["8233A039",0x44B8],
- ["8233A130",0x44B9],
- ["8233A131",0x44BA],
- ["8233A132",0x44BB],
- ["8233A133",0x44BC],
- ["8233A134",0x44BD],
- ["8233A135",0x44BE],
- ["8233A136",0x44BF],
- ["8233A137",0x44C0],
- ["8233A138",0x44C1],
- ["8233A139",0x44C2],
- ["8233A230",0x44C3],
- ["8233A231",0x44C4],
- ["8233A232",0x44C5],
- ["8233A233",0x44C6],
- ["8233A234",0x44C7],
- ["8233A235",0x44C8],
- ["8233A236",0x44C9],
- ["8233A237",0x44CA],
- ["8233A238",0x44CB],
- ["8233A239",0x44CC],
- ["8233A330",0x44CD],
- ["8233A331",0x44CE],
- ["8233A332",0x44CF],
- ["8233A333",0x44D0],
- ["8233A334",0x44D1],
- ["8233A335",0x44D2],
- ["8233A336",0x44D3],
- ["8233A337",0x44D4],
- ["8233A338",0x44D5],
- ["FE7B",0x44D6],
- ["8233A339",0x44D7],
- ["8233A430",0x44D8],
- ["8233A431",0x44D9],
- ["8233A432",0x44DA],
- ["8233A433",0x44DB],
- ["8233A434",0x44DC],
- ["8233A435",0x44DD],
- ["8233A436",0x44DE],
- ["8233A437",0x44DF],
- ["8233A438",0x44E0],
- ["8233A439",0x44E1],
- ["8233A530",0x44E2],
- ["8233A531",0x44E3],
- ["8233A532",0x44E4],
- ["8233A533",0x44E5],
- ["8233A534",0x44E6],
- ["8233A535",0x44E7],
- ["8233A536",0x44E8],
- ["8233A537",0x44E9],
- ["8233A538",0x44EA],
- ["8233A539",0x44EB],
- ["8233A630",0x44EC],
- ["8233A631",0x44ED],
- ["8233A632",0x44EE],
- ["8233A633",0x44EF],
- ["8233A634",0x44F0],
- ["8233A635",0x44F1],
- ["8233A636",0x44F2],
- ["8233A637",0x44F3],
- ["8233A638",0x44F4],
- ["8233A639",0x44F5],
- ["8233A730",0x44F6],
- ["8233A731",0x44F7],
- ["8233A732",0x44F8],
- ["8233A733",0x44F9],
- ["8233A734",0x44FA],
- ["8233A735",0x44FB],
- ["8233A736",0x44FC],
- ["8233A737",0x44FD],
- ["8233A738",0x44FE],
- ["8233A739",0x44FF],
- ["8233A830",0x4500],
- ["8233A831",0x4501],
- ["8233A832",0x4502],
- ["8233A833",0x4503],
- ["8233A834",0x4504],
- ["8233A835",0x4505],
- ["8233A836",0x4506],
- ["8233A837",0x4507],
- ["8233A838",0x4508],
- ["8233A839",0x4509],
- ["8233A930",0x450A],
- ["8233A931",0x450B],
- ["8233A932",0x450C],
- ["8233A933",0x450D],
- ["8233A934",0x450E],
- ["8233A935",0x450F],
- ["8233A936",0x4510],
- ["8233A937",0x4511],
- ["8233A938",0x4512],
- ["8233A939",0x4513],
- ["8233AA30",0x4514],
- ["8233AA31",0x4515],
- ["8233AA32",0x4516],
- ["8233AA33",0x4517],
- ["8233AA34",0x4518],
- ["8233AA35",0x4519],
- ["8233AA36",0x451A],
- ["8233AA37",0x451B],
- ["8233AA38",0x451C],
- ["8233AA39",0x451D],
- ["8233AB30",0x451E],
- ["8233AB31",0x451F],
- ["8233AB32",0x4520],
- ["8233AB33",0x4521],
- ["8233AB34",0x4522],
- ["8233AB35",0x4523],
- ["8233AB36",0x4524],
- ["8233AB37",0x4525],
- ["8233AB38",0x4526],
- ["8233AB39",0x4527],
- ["8233AC30",0x4528],
- ["8233AC31",0x4529],
- ["8233AC32",0x452A],
- ["8233AC33",0x452B],
- ["8233AC34",0x452C],
- ["8233AC35",0x452D],
- ["8233AC36",0x452E],
- ["8233AC37",0x452F],
- ["8233AC38",0x4530],
- ["8233AC39",0x4531],
- ["8233AD30",0x4532],
- ["8233AD31",0x4533],
- ["8233AD32",0x4534],
- ["8233AD33",0x4535],
- ["8233AD34",0x4536],
- ["8233AD35",0x4537],
- ["8233AD36",0x4538],
- ["8233AD37",0x4539],
- ["8233AD38",0x453A],
- ["8233AD39",0x453B],
- ["8233AE30",0x453C],
- ["8233AE31",0x453D],
- ["8233AE32",0x453E],
- ["8233AE33",0x453F],
- ["8233AE34",0x4540],
- ["8233AE35",0x4541],
- ["8233AE36",0x4542],
- ["8233AE37",0x4543],
- ["8233AE38",0x4544],
- ["8233AE39",0x4545],
- ["8233AF30",0x4546],
- ["8233AF31",0x4547],
- ["8233AF32",0x4548],
- ["8233AF33",0x4549],
- ["8233AF34",0x454A],
- ["8233AF35",0x454B],
- ["8233AF36",0x454C],
- ["8233AF37",0x454D],
- ["8233AF38",0x454E],
- ["8233AF39",0x454F],
- ["8233B030",0x4550],
- ["8233B031",0x4551],
- ["8233B032",0x4552],
- ["8233B033",0x4553],
- ["8233B034",0x4554],
- ["8233B035",0x4555],
- ["8233B036",0x4556],
- ["8233B037",0x4557],
- ["8233B038",0x4558],
- ["8233B039",0x4559],
- ["8233B130",0x455A],
- ["8233B131",0x455B],
- ["8233B132",0x455C],
- ["8233B133",0x455D],
- ["8233B134",0x455E],
- ["8233B135",0x455F],
- ["8233B136",0x4560],
- ["8233B137",0x4561],
- ["8233B138",0x4562],
- ["8233B139",0x4563],
- ["8233B230",0x4564],
- ["8233B231",0x4565],
- ["8233B232",0x4566],
- ["8233B233",0x4567],
- ["8233B234",0x4568],
- ["8233B235",0x4569],
- ["8233B236",0x456A],
- ["8233B237",0x456B],
- ["8233B238",0x456C],
- ["8233B239",0x456D],
- ["8233B330",0x456E],
- ["8233B331",0x456F],
- ["8233B332",0x4570],
- ["8233B333",0x4571],
- ["8233B334",0x4572],
- ["8233B335",0x4573],
- ["8233B336",0x4574],
- ["8233B337",0x4575],
- ["8233B338",0x4576],
- ["8233B339",0x4577],
- ["8233B430",0x4578],
- ["8233B431",0x4579],
- ["8233B432",0x457A],
- ["8233B433",0x457B],
- ["8233B434",0x457C],
- ["8233B435",0x457D],
- ["8233B436",0x457E],
- ["8233B437",0x457F],
- ["8233B438",0x4580],
- ["8233B439",0x4581],
- ["8233B530",0x4582],
- ["8233B531",0x4583],
- ["8233B532",0x4584],
- ["8233B533",0x4585],
- ["8233B534",0x4586],
- ["8233B535",0x4587],
- ["8233B536",0x4588],
- ["8233B537",0x4589],
- ["8233B538",0x458A],
- ["8233B539",0x458B],
- ["8233B630",0x458C],
- ["8233B631",0x458D],
- ["8233B632",0x458E],
- ["8233B633",0x458F],
- ["8233B634",0x4590],
- ["8233B635",0x4591],
- ["8233B636",0x4592],
- ["8233B637",0x4593],
- ["8233B638",0x4594],
- ["8233B639",0x4595],
- ["8233B730",0x4596],
- ["8233B731",0x4597],
- ["8233B732",0x4598],
- ["8233B733",0x4599],
- ["8233B734",0x459A],
- ["8233B735",0x459B],
- ["8233B736",0x459C],
- ["8233B737",0x459D],
- ["8233B738",0x459E],
- ["8233B739",0x459F],
- ["8233B830",0x45A0],
- ["8233B831",0x45A1],
- ["8233B832",0x45A2],
- ["8233B833",0x45A3],
- ["8233B834",0x45A4],
- ["8233B835",0x45A5],
- ["8233B836",0x45A6],
- ["8233B837",0x45A7],
- ["8233B838",0x45A8],
- ["8233B839",0x45A9],
- ["8233B930",0x45AA],
- ["8233B931",0x45AB],
- ["8233B932",0x45AC],
- ["8233B933",0x45AD],
- ["8233B934",0x45AE],
- ["8233B935",0x45AF],
- ["8233B936",0x45B0],
- ["8233B937",0x45B1],
- ["8233B938",0x45B2],
- ["8233B939",0x45B3],
- ["8233BA30",0x45B4],
- ["8233BA31",0x45B5],
- ["8233BA32",0x45B6],
- ["8233BA33",0x45B7],
- ["8233BA34",0x45B8],
- ["8233BA35",0x45B9],
- ["8233BA36",0x45BA],
- ["8233BA37",0x45BB],
- ["8233BA38",0x45BC],
- ["8233BA39",0x45BD],
- ["8233BB30",0x45BE],
- ["8233BB31",0x45BF],
- ["8233BB32",0x45C0],
- ["8233BB33",0x45C1],
- ["8233BB34",0x45C2],
- ["8233BB35",0x45C3],
- ["8233BB36",0x45C4],
- ["8233BB37",0x45C5],
- ["8233BB38",0x45C6],
- ["8233BB39",0x45C7],
- ["8233BC30",0x45C8],
- ["8233BC31",0x45C9],
- ["8233BC32",0x45CA],
- ["8233BC33",0x45CB],
- ["8233BC34",0x45CC],
- ["8233BC35",0x45CD],
- ["8233BC36",0x45CE],
- ["8233BC37",0x45CF],
- ["8233BC38",0x45D0],
- ["8233BC39",0x45D1],
- ["8233BD30",0x45D2],
- ["8233BD31",0x45D3],
- ["8233BD32",0x45D4],
- ["8233BD33",0x45D5],
- ["8233BD34",0x45D6],
- ["8233BD35",0x45D7],
- ["8233BD36",0x45D8],
- ["8233BD37",0x45D9],
- ["8233BD38",0x45DA],
- ["8233BD39",0x45DB],
- ["8233BE30",0x45DC],
- ["8233BE31",0x45DD],
- ["8233BE32",0x45DE],
- ["8233BE33",0x45DF],
- ["8233BE34",0x45E0],
- ["8233BE35",0x45E1],
- ["8233BE36",0x45E2],
- ["8233BE37",0x45E3],
- ["8233BE38",0x45E4],
- ["8233BE39",0x45E5],
- ["8233BF30",0x45E6],
- ["8233BF31",0x45E7],
- ["8233BF32",0x45E8],
- ["8233BF33",0x45E9],
- ["8233BF34",0x45EA],
- ["8233BF35",0x45EB],
- ["8233BF36",0x45EC],
- ["8233BF37",0x45ED],
- ["8233BF38",0x45EE],
- ["8233BF39",0x45EF],
- ["8233C030",0x45F0],
- ["8233C031",0x45F1],
- ["8233C032",0x45F2],
- ["8233C033",0x45F3],
- ["8233C034",0x45F4],
- ["8233C035",0x45F5],
- ["8233C036",0x45F6],
- ["8233C037",0x45F7],
- ["8233C038",0x45F8],
- ["8233C039",0x45F9],
- ["8233C130",0x45FA],
- ["8233C131",0x45FB],
- ["8233C132",0x45FC],
- ["8233C133",0x45FD],
- ["8233C134",0x45FE],
- ["8233C135",0x45FF],
- ["8233C136",0x4600],
- ["8233C137",0x4601],
- ["8233C138",0x4602],
- ["8233C139",0x4603],
- ["8233C230",0x4604],
- ["8233C231",0x4605],
- ["8233C232",0x4606],
- ["8233C233",0x4607],
- ["8233C234",0x4608],
- ["8233C235",0x4609],
- ["8233C236",0x460A],
- ["8233C237",0x460B],
- ["8233C238",0x460C],
- ["8233C239",0x460D],
- ["8233C330",0x460E],
- ["8233C331",0x460F],
- ["8233C332",0x4610],
- ["8233C333",0x4611],
- ["8233C334",0x4612],
- ["8233C335",0x4613],
- ["8233C336",0x4614],
- ["8233C337",0x4615],
- ["8233C338",0x4616],
- ["8233C339",0x4617],
- ["8233C430",0x4618],
- ["8233C431",0x4619],
- ["8233C432",0x461A],
- ["8233C433",0x461B],
- ["8233C434",0x461C],
- ["8233C435",0x461D],
- ["8233C436",0x461E],
- ["8233C437",0x461F],
- ["8233C438",0x4620],
- ["8233C439",0x4621],
- ["8233C530",0x4622],
- ["8233C531",0x4623],
- ["8233C532",0x4624],
- ["8233C533",0x4625],
- ["8233C534",0x4626],
- ["8233C535",0x4627],
- ["8233C536",0x4628],
- ["8233C537",0x4629],
- ["8233C538",0x462A],
- ["8233C539",0x462B],
- ["8233C630",0x462C],
- ["8233C631",0x462D],
- ["8233C632",0x462E],
- ["8233C633",0x462F],
- ["8233C634",0x4630],
- ["8233C635",0x4631],
- ["8233C636",0x4632],
- ["8233C637",0x4633],
- ["8233C638",0x4634],
- ["8233C639",0x4635],
- ["8233C730",0x4636],
- ["8233C731",0x4637],
- ["8233C732",0x4638],
- ["8233C733",0x4639],
- ["8233C734",0x463A],
- ["8233C735",0x463B],
- ["8233C736",0x463C],
- ["8233C737",0x463D],
- ["8233C738",0x463E],
- ["8233C739",0x463F],
- ["8233C830",0x4640],
- ["8233C831",0x4641],
- ["8233C832",0x4642],
- ["8233C833",0x4643],
- ["8233C834",0x4644],
- ["8233C835",0x4645],
- ["8233C836",0x4646],
- ["8233C837",0x4647],
- ["8233C838",0x4648],
- ["8233C839",0x4649],
- ["8233C930",0x464A],
- ["8233C931",0x464B],
- ["FE7D",0x464C],
- ["8233C932",0x464D],
- ["8233C933",0x464E],
- ["8233C934",0x464F],
- ["8233C935",0x4650],
- ["8233C936",0x4651],
- ["8233C937",0x4652],
- ["8233C938",0x4653],
- ["8233C939",0x4654],
- ["8233CA30",0x4655],
- ["8233CA31",0x4656],
- ["8233CA32",0x4657],
- ["8233CA33",0x4658],
- ["8233CA34",0x4659],
- ["8233CA35",0x465A],
- ["8233CA36",0x465B],
- ["8233CA37",0x465C],
- ["8233CA38",0x465D],
- ["8233CA39",0x465E],
- ["8233CB30",0x465F],
- ["8233CB31",0x4660],
- ["FE7C",0x4661],
- ["8233CB32",0x4662],
- ["8233CB33",0x4663],
- ["8233CB34",0x4664],
- ["8233CB35",0x4665],
- ["8233CB36",0x4666],
- ["8233CB37",0x4667],
- ["8233CB38",0x4668],
- ["8233CB39",0x4669],
- ["8233CC30",0x466A],
- ["8233CC31",0x466B],
- ["8233CC32",0x466C],
- ["8233CC33",0x466D],
- ["8233CC34",0x466E],
- ["8233CC35",0x466F],
- ["8233CC36",0x4670],
- ["8233CC37",0x4671],
- ["8233CC38",0x4672],
- ["8233CC39",0x4673],
- ["8233CD30",0x4674],
- ["8233CD31",0x4675],
- ["8233CD32",0x4676],
- ["8233CD33",0x4677],
- ["8233CD34",0x4678],
- ["8233CD35",0x4679],
- ["8233CD36",0x467A],
- ["8233CD37",0x467B],
- ["8233CD38",0x467C],
- ["8233CD39",0x467D],
- ["8233CE30",0x467E],
- ["8233CE31",0x467F],
- ["8233CE32",0x4680],
- ["8233CE33",0x4681],
- ["8233CE34",0x4682],
- ["8233CE35",0x4683],
- ["8233CE36",0x4684],
- ["8233CE37",0x4685],
- ["8233CE38",0x4686],
- ["8233CE39",0x4687],
- ["8233CF30",0x4688],
- ["8233CF31",0x4689],
- ["8233CF32",0x468A],
- ["8233CF33",0x468B],
- ["8233CF34",0x468C],
- ["8233CF35",0x468D],
- ["8233CF36",0x468E],
- ["8233CF37",0x468F],
- ["8233CF38",0x4690],
- ["8233CF39",0x4691],
- ["8233D030",0x4692],
- ["8233D031",0x4693],
- ["8233D032",0x4694],
- ["8233D033",0x4695],
- ["8233D034",0x4696],
- ["8233D035",0x4697],
- ["8233D036",0x4698],
- ["8233D037",0x4699],
- ["8233D038",0x469A],
- ["8233D039",0x469B],
- ["8233D130",0x469C],
- ["8233D131",0x469D],
- ["8233D132",0x469E],
- ["8233D133",0x469F],
- ["8233D134",0x46A0],
- ["8233D135",0x46A1],
- ["8233D136",0x46A2],
- ["8233D137",0x46A3],
- ["8233D138",0x46A4],
- ["8233D139",0x46A5],
- ["8233D230",0x46A6],
- ["8233D231",0x46A7],
- ["8233D232",0x46A8],
- ["8233D233",0x46A9],
- ["8233D234",0x46AA],
- ["8233D235",0x46AB],
- ["8233D236",0x46AC],
- ["8233D237",0x46AD],
- ["8233D238",0x46AE],
- ["8233D239",0x46AF],
- ["8233D330",0x46B0],
- ["8233D331",0x46B1],
- ["8233D332",0x46B2],
- ["8233D333",0x46B3],
- ["8233D334",0x46B4],
- ["8233D335",0x46B5],
- ["8233D336",0x46B6],
- ["8233D337",0x46B7],
- ["8233D338",0x46B8],
- ["8233D339",0x46B9],
- ["8233D430",0x46BA],
- ["8233D431",0x46BB],
- ["8233D432",0x46BC],
- ["8233D433",0x46BD],
- ["8233D434",0x46BE],
- ["8233D435",0x46BF],
- ["8233D436",0x46C0],
- ["8233D437",0x46C1],
- ["8233D438",0x46C2],
- ["8233D439",0x46C3],
- ["8233D530",0x46C4],
- ["8233D531",0x46C5],
- ["8233D532",0x46C6],
- ["8233D533",0x46C7],
- ["8233D534",0x46C8],
- ["8233D535",0x46C9],
- ["8233D536",0x46CA],
- ["8233D537",0x46CB],
- ["8233D538",0x46CC],
- ["8233D539",0x46CD],
- ["8233D630",0x46CE],
- ["8233D631",0x46CF],
- ["8233D632",0x46D0],
- ["8233D633",0x46D1],
- ["8233D634",0x46D2],
- ["8233D635",0x46D3],
- ["8233D636",0x46D4],
- ["8233D637",0x46D5],
- ["8233D638",0x46D6],
- ["8233D639",0x46D7],
- ["8233D730",0x46D8],
- ["8233D731",0x46D9],
- ["8233D732",0x46DA],
- ["8233D733",0x46DB],
- ["8233D734",0x46DC],
- ["8233D735",0x46DD],
- ["8233D736",0x46DE],
- ["8233D737",0x46DF],
- ["8233D738",0x46E0],
- ["8233D739",0x46E1],
- ["8233D830",0x46E2],
- ["8233D831",0x46E3],
- ["8233D832",0x46E4],
- ["8233D833",0x46E5],
- ["8233D834",0x46E6],
- ["8233D835",0x46E7],
- ["8233D836",0x46E8],
- ["8233D837",0x46E9],
- ["8233D838",0x46EA],
- ["8233D839",0x46EB],
- ["8233D930",0x46EC],
- ["8233D931",0x46ED],
- ["8233D932",0x46EE],
- ["8233D933",0x46EF],
- ["8233D934",0x46F0],
- ["8233D935",0x46F1],
- ["8233D936",0x46F2],
- ["8233D937",0x46F3],
- ["8233D938",0x46F4],
- ["8233D939",0x46F5],
- ["8233DA30",0x46F6],
- ["8233DA31",0x46F7],
- ["8233DA32",0x46F8],
- ["8233DA33",0x46F9],
- ["8233DA34",0x46FA],
- ["8233DA35",0x46FB],
- ["8233DA36",0x46FC],
- ["8233DA37",0x46FD],
- ["8233DA38",0x46FE],
- ["8233DA39",0x46FF],
- ["8233DB30",0x4700],
- ["8233DB31",0x4701],
- ["8233DB32",0x4702],
- ["8233DB33",0x4703],
- ["8233DB34",0x4704],
- ["8233DB35",0x4705],
- ["8233DB36",0x4706],
- ["8233DB37",0x4707],
- ["8233DB38",0x4708],
- ["8233DB39",0x4709],
- ["8233DC30",0x470A],
- ["8233DC31",0x470B],
- ["8233DC32",0x470C],
- ["8233DC33",0x470D],
- ["8233DC34",0x470E],
- ["8233DC35",0x470F],
- ["8233DC36",0x4710],
- ["8233DC37",0x4711],
- ["8233DC38",0x4712],
- ["8233DC39",0x4713],
- ["8233DD30",0x4714],
- ["8233DD31",0x4715],
- ["8233DD32",0x4716],
- ["8233DD33",0x4717],
- ["8233DD34",0x4718],
- ["8233DD35",0x4719],
- ["8233DD36",0x471A],
- ["8233DD37",0x471B],
- ["8233DD38",0x471C],
- ["8233DD39",0x471D],
- ["8233DE30",0x471E],
- ["8233DE31",0x471F],
- ["8233DE32",0x4720],
- ["8233DE33",0x4721],
- ["8233DE34",0x4722],
- ["FE80",0x4723],
- ["8233DE35",0x4724],
- ["8233DE36",0x4725],
- ["8233DE37",0x4726],
- ["8233DE38",0x4727],
- ["8233DE39",0x4728],
- ["FE81",0x4729],
- ["8233DF30",0x472A],
- ["8233DF31",0x472B],
- ["8233DF32",0x472C],
- ["8233DF33",0x472D],
- ["8233DF34",0x472E],
- ["8233DF35",0x472F],
- ["8233DF36",0x4730],
- ["8233DF37",0x4731],
- ["8233DF38",0x4732],
- ["8233DF39",0x4733],
- ["8233E030",0x4734],
- ["8233E031",0x4735],
- ["8233E032",0x4736],
- ["8233E033",0x4737],
- ["8233E034",0x4738],
- ["8233E035",0x4739],
- ["8233E036",0x473A],
- ["8233E037",0x473B],
- ["8233E038",0x473C],
- ["8233E039",0x473D],
- ["8233E130",0x473E],
- ["8233E131",0x473F],
- ["8233E132",0x4740],
- ["8233E133",0x4741],
- ["8233E134",0x4742],
- ["8233E135",0x4743],
- ["8233E136",0x4744],
- ["8233E137",0x4745],
- ["8233E138",0x4746],
- ["8233E139",0x4747],
- ["8233E230",0x4748],
- ["8233E231",0x4749],
- ["8233E232",0x474A],
- ["8233E233",0x474B],
- ["8233E234",0x474C],
- ["8233E235",0x474D],
- ["8233E236",0x474E],
- ["8233E237",0x474F],
- ["8233E238",0x4750],
- ["8233E239",0x4751],
- ["8233E330",0x4752],
- ["8233E331",0x4753],
- ["8233E332",0x4754],
- ["8233E333",0x4755],
- ["8233E334",0x4756],
- ["8233E335",0x4757],
- ["8233E336",0x4758],
- ["8233E337",0x4759],
- ["8233E338",0x475A],
- ["8233E339",0x475B],
- ["8233E430",0x475C],
- ["8233E431",0x475D],
- ["8233E432",0x475E],
- ["8233E433",0x475F],
- ["8233E434",0x4760],
- ["8233E435",0x4761],
- ["8233E436",0x4762],
- ["8233E437",0x4763],
- ["8233E438",0x4764],
- ["8233E439",0x4765],
- ["8233E530",0x4766],
- ["8233E531",0x4767],
- ["8233E532",0x4768],
- ["8233E533",0x4769],
- ["8233E534",0x476A],
- ["8233E535",0x476B],
- ["8233E536",0x476C],
- ["8233E537",0x476D],
- ["8233E538",0x476E],
- ["8233E539",0x476F],
- ["8233E630",0x4770],
- ["8233E631",0x4771],
- ["8233E632",0x4772],
- ["8233E633",0x4773],
- ["8233E634",0x4774],
- ["8233E635",0x4775],
- ["8233E636",0x4776],
- ["8233E637",0x4777],
- ["8233E638",0x4778],
- ["8233E639",0x4779],
- ["8233E730",0x477A],
- ["8233E731",0x477B],
- ["FE82",0x477C],
- ["8233E732",0x477D],
- ["8233E733",0x477E],
- ["8233E734",0x477F],
- ["8233E735",0x4780],
- ["8233E736",0x4781],
- ["8233E737",0x4782],
- ["8233E738",0x4783],
- ["8233E739",0x4784],
- ["8233E830",0x4785],
- ["8233E831",0x4786],
- ["8233E832",0x4787],
- ["8233E833",0x4788],
- ["8233E834",0x4789],
- ["8233E835",0x478A],
- ["8233E836",0x478B],
- ["8233E837",0x478C],
- ["FE83",0x478D],
- ["8233E838",0x478E],
- ["8233E839",0x478F],
- ["8233E930",0x4790],
- ["8233E931",0x4791],
- ["8233E932",0x4792],
- ["8233E933",0x4793],
- ["8233E934",0x4794],
- ["8233E935",0x4795],
- ["8233E936",0x4796],
- ["8233E937",0x4797],
- ["8233E938",0x4798],
- ["8233E939",0x4799],
- ["8233EA30",0x479A],
- ["8233EA31",0x479B],
- ["8233EA32",0x479C],
- ["8233EA33",0x479D],
- ["8233EA34",0x479E],
- ["8233EA35",0x479F],
- ["8233EA36",0x47A0],
- ["8233EA37",0x47A1],
- ["8233EA38",0x47A2],
- ["8233EA39",0x47A3],
- ["8233EB30",0x47A4],
- ["8233EB31",0x47A5],
- ["8233EB32",0x47A6],
- ["8233EB33",0x47A7],
- ["8233EB34",0x47A8],
- ["8233EB35",0x47A9],
- ["8233EB36",0x47AA],
- ["8233EB37",0x47AB],
- ["8233EB38",0x47AC],
- ["8233EB39",0x47AD],
- ["8233EC30",0x47AE],
- ["8233EC31",0x47AF],
- ["8233EC32",0x47B0],
- ["8233EC33",0x47B1],
- ["8233EC34",0x47B2],
- ["8233EC35",0x47B3],
- ["8233EC36",0x47B4],
- ["8233EC37",0x47B5],
- ["8233EC38",0x47B6],
- ["8233EC39",0x47B7],
- ["8233ED30",0x47B8],
- ["8233ED31",0x47B9],
- ["8233ED32",0x47BA],
- ["8233ED33",0x47BB],
- ["8233ED34",0x47BC],
- ["8233ED35",0x47BD],
- ["8233ED36",0x47BE],
- ["8233ED37",0x47BF],
- ["8233ED38",0x47C0],
- ["8233ED39",0x47C1],
- ["8233EE30",0x47C2],
- ["8233EE31",0x47C3],
- ["8233EE32",0x47C4],
- ["8233EE33",0x47C5],
- ["8233EE34",0x47C6],
- ["8233EE35",0x47C7],
- ["8233EE36",0x47C8],
- ["8233EE37",0x47C9],
- ["8233EE38",0x47CA],
- ["8233EE39",0x47CB],
- ["8233EF30",0x47CC],
- ["8233EF31",0x47CD],
- ["8233EF32",0x47CE],
- ["8233EF33",0x47CF],
- ["8233EF34",0x47D0],
- ["8233EF35",0x47D1],
- ["8233EF36",0x47D2],
- ["8233EF37",0x47D3],
- ["8233EF38",0x47D4],
- ["8233EF39",0x47D5],
- ["8233F030",0x47D6],
- ["8233F031",0x47D7],
- ["8233F032",0x47D8],
- ["8233F033",0x47D9],
- ["8233F034",0x47DA],
- ["8233F035",0x47DB],
- ["8233F036",0x47DC],
- ["8233F037",0x47DD],
- ["8233F038",0x47DE],
- ["8233F039",0x47DF],
- ["8233F130",0x47E0],
- ["8233F131",0x47E1],
- ["8233F132",0x47E2],
- ["8233F133",0x47E3],
- ["8233F134",0x47E4],
- ["8233F135",0x47E5],
- ["8233F136",0x47E6],
- ["8233F137",0x47E7],
- ["8233F138",0x47E8],
- ["8233F139",0x47E9],
- ["8233F230",0x47EA],
- ["8233F231",0x47EB],
- ["8233F232",0x47EC],
- ["8233F233",0x47ED],
- ["8233F234",0x47EE],
- ["8233F235",0x47EF],
- ["8233F236",0x47F0],
- ["8233F237",0x47F1],
- ["8233F238",0x47F2],
- ["8233F239",0x47F3],
- ["8233F330",0x47F4],
- ["8233F331",0x47F5],
- ["8233F332",0x47F6],
- ["8233F333",0x47F7],
- ["8233F334",0x47F8],
- ["8233F335",0x47F9],
- ["8233F336",0x47FA],
- ["8233F337",0x47FB],
- ["8233F338",0x47FC],
- ["8233F339",0x47FD],
- ["8233F430",0x47FE],
- ["8233F431",0x47FF],
- ["8233F432",0x4800],
- ["8233F433",0x4801],
- ["8233F434",0x4802],
- ["8233F435",0x4803],
- ["8233F436",0x4804],
- ["8233F437",0x4805],
- ["8233F438",0x4806],
- ["8233F439",0x4807],
- ["8233F530",0x4808],
- ["8233F531",0x4809],
- ["8233F532",0x480A],
- ["8233F533",0x480B],
- ["8233F534",0x480C],
- ["8233F535",0x480D],
- ["8233F536",0x480E],
- ["8233F537",0x480F],
- ["8233F538",0x4810],
- ["8233F539",0x4811],
- ["8233F630",0x4812],
- ["8233F631",0x4813],
- ["8233F632",0x4814],
- ["8233F633",0x4815],
- ["8233F634",0x4816],
- ["8233F635",0x4817],
- ["8233F636",0x4818],
- ["8233F637",0x4819],
- ["8233F638",0x481A],
- ["8233F639",0x481B],
- ["8233F730",0x481C],
- ["8233F731",0x481D],
- ["8233F732",0x481E],
- ["8233F733",0x481F],
- ["8233F734",0x4820],
- ["8233F735",0x4821],
- ["8233F736",0x4822],
- ["8233F737",0x4823],
- ["8233F738",0x4824],
- ["8233F739",0x4825],
- ["8233F830",0x4826],
- ["8233F831",0x4827],
- ["8233F832",0x4828],
- ["8233F833",0x4829],
- ["8233F834",0x482A],
- ["8233F835",0x482B],
- ["8233F836",0x482C],
- ["8233F837",0x482D],
- ["8233F838",0x482E],
- ["8233F839",0x482F],
- ["8233F930",0x4830],
- ["8233F931",0x4831],
- ["8233F932",0x4832],
- ["8233F933",0x4833],
- ["8233F934",0x4834],
- ["8233F935",0x4835],
- ["8233F936",0x4836],
- ["8233F937",0x4837],
- ["8233F938",0x4838],
- ["8233F939",0x4839],
- ["8233FA30",0x483A],
- ["8233FA31",0x483B],
- ["8233FA32",0x483C],
- ["8233FA33",0x483D],
- ["8233FA34",0x483E],
- ["8233FA35",0x483F],
- ["8233FA36",0x4840],
- ["8233FA37",0x4841],
- ["8233FA38",0x4842],
- ["8233FA39",0x4843],
- ["8233FB30",0x4844],
- ["8233FB31",0x4845],
- ["8233FB32",0x4846],
- ["8233FB33",0x4847],
- ["8233FB34",0x4848],
- ["8233FB35",0x4849],
- ["8233FB36",0x484A],
- ["8233FB37",0x484B],
- ["8233FB38",0x484C],
- ["8233FB39",0x484D],
- ["8233FC30",0x484E],
- ["8233FC31",0x484F],
- ["8233FC32",0x4850],
- ["8233FC33",0x4851],
- ["8233FC34",0x4852],
- ["8233FC35",0x4853],
- ["8233FC36",0x4854],
- ["8233FC37",0x4855],
- ["8233FC38",0x4856],
- ["8233FC39",0x4857],
- ["8233FD30",0x4858],
- ["8233FD31",0x4859],
- ["8233FD32",0x485A],
- ["8233FD33",0x485B],
- ["8233FD34",0x485C],
- ["8233FD35",0x485D],
- ["8233FD36",0x485E],
- ["8233FD37",0x485F],
- ["8233FD38",0x4860],
- ["8233FD39",0x4861],
- ["8233FE30",0x4862],
- ["8233FE31",0x4863],
- ["8233FE32",0x4864],
- ["8233FE33",0x4865],
- ["8233FE34",0x4866],
- ["8233FE35",0x4867],
- ["8233FE36",0x4868],
- ["8233FE37",0x4869],
- ["8233FE38",0x486A],
- ["8233FE39",0x486B],
- ["82348130",0x486C],
- ["82348131",0x486D],
- ["82348132",0x486E],
- ["82348133",0x486F],
- ["82348134",0x4870],
- ["82348135",0x4871],
- ["82348136",0x4872],
- ["82348137",0x4873],
- ["82348138",0x4874],
- ["82348139",0x4875],
- ["82348230",0x4876],
- ["82348231",0x4877],
- ["82348232",0x4878],
- ["82348233",0x4879],
- ["82348234",0x487A],
- ["82348235",0x487B],
- ["82348236",0x487C],
- ["82348237",0x487D],
- ["82348238",0x487E],
- ["82348239",0x487F],
- ["82348330",0x4880],
- ["82348331",0x4881],
- ["82348332",0x4882],
- ["82348333",0x4883],
- ["82348334",0x4884],
- ["82348335",0x4885],
- ["82348336",0x4886],
- ["82348337",0x4887],
- ["82348338",0x4888],
- ["82348339",0x4889],
- ["82348430",0x488A],
- ["82348431",0x488B],
- ["82348432",0x488C],
- ["82348433",0x488D],
- ["82348434",0x488E],
- ["82348435",0x488F],
- ["82348436",0x4890],
- ["82348437",0x4891],
- ["82348438",0x4892],
- ["82348439",0x4893],
- ["82348530",0x4894],
- ["82348531",0x4895],
- ["82348532",0x4896],
- ["82348533",0x4897],
- ["82348534",0x4898],
- ["82348535",0x4899],
- ["82348536",0x489A],
- ["82348537",0x489B],
- ["82348538",0x489C],
- ["82348539",0x489D],
- ["82348630",0x489E],
- ["82348631",0x489F],
- ["82348632",0x48A0],
- ["82348633",0x48A1],
- ["82348634",0x48A2],
- ["82348635",0x48A3],
- ["82348636",0x48A4],
- ["82348637",0x48A5],
- ["82348638",0x48A6],
- ["82348639",0x48A7],
- ["82348730",0x48A8],
- ["82348731",0x48A9],
- ["82348732",0x48AA],
- ["82348733",0x48AB],
- ["82348734",0x48AC],
- ["82348735",0x48AD],
- ["82348736",0x48AE],
- ["82348737",0x48AF],
- ["82348738",0x48B0],
- ["82348739",0x48B1],
- ["82348830",0x48B2],
- ["82348831",0x48B3],
- ["82348832",0x48B4],
- ["82348833",0x48B5],
- ["82348834",0x48B6],
- ["82348835",0x48B7],
- ["82348836",0x48B8],
- ["82348837",0x48B9],
- ["82348838",0x48BA],
- ["82348839",0x48BB],
- ["82348930",0x48BC],
- ["82348931",0x48BD],
- ["82348932",0x48BE],
- ["82348933",0x48BF],
- ["82348934",0x48C0],
- ["82348935",0x48C1],
- ["82348936",0x48C2],
- ["82348937",0x48C3],
- ["82348938",0x48C4],
- ["82348939",0x48C5],
- ["82348A30",0x48C6],
- ["82348A31",0x48C7],
- ["82348A32",0x48C8],
- ["82348A33",0x48C9],
- ["82348A34",0x48CA],
- ["82348A35",0x48CB],
- ["82348A36",0x48CC],
- ["82348A37",0x48CD],
- ["82348A38",0x48CE],
- ["82348A39",0x48CF],
- ["82348B30",0x48D0],
- ["82348B31",0x48D1],
- ["82348B32",0x48D2],
- ["82348B33",0x48D3],
- ["82348B34",0x48D4],
- ["82348B35",0x48D5],
- ["82348B36",0x48D6],
- ["82348B37",0x48D7],
- ["82348B38",0x48D8],
- ["82348B39",0x48D9],
- ["82348C30",0x48DA],
- ["82348C31",0x48DB],
- ["82348C32",0x48DC],
- ["82348C33",0x48DD],
- ["82348C34",0x48DE],
- ["82348C35",0x48DF],
- ["82348C36",0x48E0],
- ["82348C37",0x48E1],
- ["82348C38",0x48E2],
- ["82348C39",0x48E3],
- ["82348D30",0x48E4],
- ["82348D31",0x48E5],
- ["82348D32",0x48E6],
- ["82348D33",0x48E7],
- ["82348D34",0x48E8],
- ["82348D35",0x48E9],
- ["82348D36",0x48EA],
- ["82348D37",0x48EB],
- ["82348D38",0x48EC],
- ["82348D39",0x48ED],
- ["82348E30",0x48EE],
- ["82348E31",0x48EF],
- ["82348E32",0x48F0],
- ["82348E33",0x48F1],
- ["82348E34",0x48F2],
- ["82348E35",0x48F3],
- ["82348E36",0x48F4],
- ["82348E37",0x48F5],
- ["82348E38",0x48F6],
- ["82348E39",0x48F7],
- ["82348F30",0x48F8],
- ["82348F31",0x48F9],
- ["82348F32",0x48FA],
- ["82348F33",0x48FB],
- ["82348F34",0x48FC],
- ["82348F35",0x48FD],
- ["82348F36",0x48FE],
- ["82348F37",0x48FF],
- ["82348F38",0x4900],
- ["82348F39",0x4901],
- ["82349030",0x4902],
- ["82349031",0x4903],
- ["82349032",0x4904],
- ["82349033",0x4905],
- ["82349034",0x4906],
- ["82349035",0x4907],
- ["82349036",0x4908],
- ["82349037",0x4909],
- ["82349038",0x490A],
- ["82349039",0x490B],
- ["82349130",0x490C],
- ["82349131",0x490D],
- ["82349132",0x490E],
- ["82349133",0x490F],
- ["82349134",0x4910],
- ["82349135",0x4911],
- ["82349136",0x4912],
- ["82349137",0x4913],
- ["82349138",0x4914],
- ["82349139",0x4915],
- ["82349230",0x4916],
- ["82349231",0x4917],
- ["82349232",0x4918],
- ["82349233",0x4919],
- ["82349234",0x491A],
- ["82349235",0x491B],
- ["82349236",0x491C],
- ["82349237",0x491D],
- ["82349238",0x491E],
- ["82349239",0x491F],
- ["82349330",0x4920],
- ["82349331",0x4921],
- ["82349332",0x4922],
- ["82349333",0x4923],
- ["82349334",0x4924],
- ["82349335",0x4925],
- ["82349336",0x4926],
- ["82349337",0x4927],
- ["82349338",0x4928],
- ["82349339",0x4929],
- ["82349430",0x492A],
- ["82349431",0x492B],
- ["82349432",0x492C],
- ["82349433",0x492D],
- ["82349434",0x492E],
- ["82349435",0x492F],
- ["82349436",0x4930],
- ["82349437",0x4931],
- ["82349438",0x4932],
- ["82349439",0x4933],
- ["82349530",0x4934],
- ["82349531",0x4935],
- ["82349532",0x4936],
- ["82349533",0x4937],
- ["82349534",0x4938],
- ["82349535",0x4939],
- ["82349536",0x493A],
- ["82349537",0x493B],
- ["82349538",0x493C],
- ["82349539",0x493D],
- ["82349630",0x493E],
- ["82349631",0x493F],
- ["82349632",0x4940],
- ["82349633",0x4941],
- ["82349634",0x4942],
- ["82349635",0x4943],
- ["82349636",0x4944],
- ["82349637",0x4945],
- ["82349638",0x4946],
- ["FE85",0x4947],
- ["82349639",0x4948],
- ["82349730",0x4949],
- ["82349731",0x494A],
- ["82349732",0x494B],
- ["82349733",0x494C],
- ["82349734",0x494D],
- ["82349735",0x494E],
- ["82349736",0x494F],
- ["82349737",0x4950],
- ["82349738",0x4951],
- ["82349739",0x4952],
- ["82349830",0x4953],
- ["82349831",0x4954],
- ["82349832",0x4955],
- ["82349833",0x4956],
- ["82349834",0x4957],
- ["82349835",0x4958],
- ["82349836",0x4959],
- ["82349837",0x495A],
- ["82349838",0x495B],
- ["82349839",0x495C],
- ["82349930",0x495D],
- ["82349931",0x495E],
- ["82349932",0x495F],
- ["82349933",0x4960],
- ["82349934",0x4961],
- ["82349935",0x4962],
- ["82349936",0x4963],
- ["82349937",0x4964],
- ["82349938",0x4965],
- ["82349939",0x4966],
- ["82349A30",0x4967],
- ["82349A31",0x4968],
- ["82349A32",0x4969],
- ["82349A33",0x496A],
- ["82349A34",0x496B],
- ["82349A35",0x496C],
- ["82349A36",0x496D],
- ["82349A37",0x496E],
- ["82349A38",0x496F],
- ["82349A39",0x4970],
- ["82349B30",0x4971],
- ["82349B31",0x4972],
- ["82349B32",0x4973],
- ["82349B33",0x4974],
- ["82349B34",0x4975],
- ["82349B35",0x4976],
- ["82349B36",0x4977],
- ["82349B37",0x4978],
- ["82349B38",0x4979],
- ["FE86",0x497A],
- ["82349B39",0x497B],
- ["82349C30",0x497C],
- ["FE87",0x497D],
- ["82349C31",0x497E],
- ["82349C32",0x497F],
- ["82349C33",0x4980],
- ["82349C34",0x4981],
- ["FE88",0x4982],
- ["FE89",0x4983],
- ["82349C35",0x4984],
- ["FE8A",0x4985],
- ["FE8B",0x4986],
- ["82349C36",0x4987],
- ["82349C37",0x4988],
- ["82349C38",0x4989],
- ["82349C39",0x498A],
- ["82349D30",0x498B],
- ["82349D31",0x498C],
- ["82349D32",0x498D],
- ["82349D33",0x498E],
- ["82349D34",0x498F],
- ["82349D35",0x4990],
- ["82349D36",0x4991],
- ["82349D37",0x4992],
- ["82349D38",0x4993],
- ["82349D39",0x4994],
- ["82349E30",0x4995],
- ["82349E31",0x4996],
- ["82349E32",0x4997],
- ["82349E33",0x4998],
- ["82349E34",0x4999],
- ["82349E35",0x499A],
- ["FE8D",0x499B],
- ["82349E36",0x499C],
- ["82349E37",0x499D],
- ["82349E38",0x499E],
- ["FE8C",0x499F],
- ["82349E39",0x49A0],
- ["82349F30",0x49A1],
- ["82349F31",0x49A2],
- ["82349F32",0x49A3],
- ["82349F33",0x49A4],
- ["82349F34",0x49A5],
- ["82349F35",0x49A6],
- ["82349F36",0x49A7],
- ["82349F37",0x49A8],
- ["82349F38",0x49A9],
- ["82349F39",0x49AA],
- ["8234A030",0x49AB],
- ["8234A031",0x49AC],
- ["8234A032",0x49AD],
- ["8234A033",0x49AE],
- ["8234A034",0x49AF],
- ["8234A035",0x49B0],
- ["8234A036",0x49B1],
- ["8234A037",0x49B2],
- ["8234A038",0x49B3],
- ["8234A039",0x49B4],
- ["8234A130",0x49B5],
- ["FE8F",0x49B6],
- ["FE8E",0x49B7],
- ["8234A131",0x49B8],
- ["8234A132",0x49B9],
- ["8234A133",0x49BA],
- ["8234A134",0x49BB],
- ["8234A135",0x49BC],
- ["8234A136",0x49BD],
- ["8234A137",0x49BE],
- ["8234A138",0x49BF],
- ["8234A139",0x49C0],
- ["8234A230",0x49C1],
- ["8234A231",0x49C2],
- ["8234A232",0x49C3],
- ["8234A233",0x49C4],
- ["8234A234",0x49C5],
- ["8234A235",0x49C6],
- ["8234A236",0x49C7],
- ["8234A237",0x49C8],
- ["8234A238",0x49C9],
- ["8234A239",0x49CA],
- ["8234A330",0x49CB],
- ["8234A331",0x49CC],
- ["8234A332",0x49CD],
- ["8234A333",0x49CE],
- ["8234A334",0x49CF],
- ["8234A335",0x49D0],
- ["8234A336",0x49D1],
- ["8234A337",0x49D2],
- ["8234A338",0x49D3],
- ["8234A339",0x49D4],
- ["8234A430",0x49D5],
- ["8234A431",0x49D6],
- ["8234A432",0x49D7],
- ["8234A433",0x49D8],
- ["8234A434",0x49D9],
- ["8234A435",0x49DA],
- ["8234A436",0x49DB],
- ["8234A437",0x49DC],
- ["8234A438",0x49DD],
- ["8234A439",0x49DE],
- ["8234A530",0x49DF],
- ["8234A531",0x49E0],
- ["8234A532",0x49E1],
- ["8234A533",0x49E2],
- ["8234A534",0x49E3],
- ["8234A535",0x49E4],
- ["8234A536",0x49E5],
- ["8234A537",0x49E6],
- ["8234A538",0x49E7],
- ["8234A539",0x49E8],
- ["8234A630",0x49E9],
- ["8234A631",0x49EA],
- ["8234A632",0x49EB],
- ["8234A633",0x49EC],
- ["8234A634",0x49ED],
- ["8234A635",0x49EE],
- ["8234A636",0x49EF],
- ["8234A637",0x49F0],
- ["8234A638",0x49F1],
- ["8234A639",0x49F2],
- ["8234A730",0x49F3],
- ["8234A731",0x49F4],
- ["8234A732",0x49F5],
- ["8234A733",0x49F6],
- ["8234A734",0x49F7],
- ["8234A735",0x49F8],
- ["8234A736",0x49F9],
- ["8234A737",0x49FA],
- ["8234A738",0x49FB],
- ["8234A739",0x49FC],
- ["8234A830",0x49FD],
- ["8234A831",0x49FE],
- ["8234A832",0x49FF],
- ["8234A833",0x4A00],
- ["8234A834",0x4A01],
- ["8234A835",0x4A02],
- ["8234A836",0x4A03],
- ["8234A837",0x4A04],
- ["8234A838",0x4A05],
- ["8234A839",0x4A06],
- ["8234A930",0x4A07],
- ["8234A931",0x4A08],
- ["8234A932",0x4A09],
- ["8234A933",0x4A0A],
- ["8234A934",0x4A0B],
- ["8234A935",0x4A0C],
- ["8234A936",0x4A0D],
- ["8234A937",0x4A0E],
- ["8234A938",0x4A0F],
- ["8234A939",0x4A10],
- ["8234AA30",0x4A11],
- ["8234AA31",0x4A12],
- ["8234AA32",0x4A13],
- ["8234AA33",0x4A14],
- ["8234AA34",0x4A15],
- ["8234AA35",0x4A16],
- ["8234AA36",0x4A17],
- ["8234AA37",0x4A18],
- ["8234AA38",0x4A19],
- ["8234AA39",0x4A1A],
- ["8234AB30",0x4A1B],
- ["8234AB31",0x4A1C],
- ["8234AB32",0x4A1D],
- ["8234AB33",0x4A1E],
- ["8234AB34",0x4A1F],
- ["8234AB35",0x4A20],
- ["8234AB36",0x4A21],
- ["8234AB37",0x4A22],
- ["8234AB38",0x4A23],
- ["8234AB39",0x4A24],
- ["8234AC30",0x4A25],
- ["8234AC31",0x4A26],
- ["8234AC32",0x4A27],
- ["8234AC33",0x4A28],
- ["8234AC34",0x4A29],
- ["8234AC35",0x4A2A],
- ["8234AC36",0x4A2B],
- ["8234AC37",0x4A2C],
- ["8234AC38",0x4A2D],
- ["8234AC39",0x4A2E],
- ["8234AD30",0x4A2F],
- ["8234AD31",0x4A30],
- ["8234AD32",0x4A31],
- ["8234AD33",0x4A32],
- ["8234AD34",0x4A33],
- ["8234AD35",0x4A34],
- ["8234AD36",0x4A35],
- ["8234AD37",0x4A36],
- ["8234AD38",0x4A37],
- ["8234AD39",0x4A38],
- ["8234AE30",0x4A39],
- ["8234AE31",0x4A3A],
- ["8234AE32",0x4A3B],
- ["8234AE33",0x4A3C],
- ["8234AE34",0x4A3D],
- ["8234AE35",0x4A3E],
- ["8234AE36",0x4A3F],
- ["8234AE37",0x4A40],
- ["8234AE38",0x4A41],
- ["8234AE39",0x4A42],
- ["8234AF30",0x4A43],
- ["8234AF31",0x4A44],
- ["8234AF32",0x4A45],
- ["8234AF33",0x4A46],
- ["8234AF34",0x4A47],
- ["8234AF35",0x4A48],
- ["8234AF36",0x4A49],
- ["8234AF37",0x4A4A],
- ["8234AF38",0x4A4B],
- ["8234AF39",0x4A4C],
- ["8234B030",0x4A4D],
- ["8234B031",0x4A4E],
- ["8234B032",0x4A4F],
- ["8234B033",0x4A50],
- ["8234B034",0x4A51],
- ["8234B035",0x4A52],
- ["8234B036",0x4A53],
- ["8234B037",0x4A54],
- ["8234B038",0x4A55],
- ["8234B039",0x4A56],
- ["8234B130",0x4A57],
- ["8234B131",0x4A58],
- ["8234B132",0x4A59],
- ["8234B133",0x4A5A],
- ["8234B134",0x4A5B],
- ["8234B135",0x4A5C],
- ["8234B136",0x4A5D],
- ["8234B137",0x4A5E],
- ["8234B138",0x4A5F],
- ["8234B139",0x4A60],
- ["8234B230",0x4A61],
- ["8234B231",0x4A62],
- ["8234B232",0x4A63],
- ["8234B233",0x4A64],
- ["8234B234",0x4A65],
- ["8234B235",0x4A66],
- ["8234B236",0x4A67],
- ["8234B237",0x4A68],
- ["8234B238",0x4A69],
- ["8234B239",0x4A6A],
- ["8234B330",0x4A6B],
- ["8234B331",0x4A6C],
- ["8234B332",0x4A6D],
- ["8234B333",0x4A6E],
- ["8234B334",0x4A6F],
- ["8234B335",0x4A70],
- ["8234B336",0x4A71],
- ["8234B337",0x4A72],
- ["8234B338",0x4A73],
- ["8234B339",0x4A74],
- ["8234B430",0x4A75],
- ["8234B431",0x4A76],
- ["8234B432",0x4A77],
- ["8234B433",0x4A78],
- ["8234B434",0x4A79],
- ["8234B435",0x4A7A],
- ["8234B436",0x4A7B],
- ["8234B437",0x4A7C],
- ["8234B438",0x4A7D],
- ["8234B439",0x4A7E],
- ["8234B530",0x4A7F],
- ["8234B531",0x4A80],
- ["8234B532",0x4A81],
- ["8234B533",0x4A82],
- ["8234B534",0x4A83],
- ["8234B535",0x4A84],
- ["8234B536",0x4A85],
- ["8234B537",0x4A86],
- ["8234B538",0x4A87],
- ["8234B539",0x4A88],
- ["8234B630",0x4A89],
- ["8234B631",0x4A8A],
- ["8234B632",0x4A8B],
- ["8234B633",0x4A8C],
- ["8234B634",0x4A8D],
- ["8234B635",0x4A8E],
- ["8234B636",0x4A8F],
- ["8234B637",0x4A90],
- ["8234B638",0x4A91],
- ["8234B639",0x4A92],
- ["8234B730",0x4A93],
- ["8234B731",0x4A94],
- ["8234B732",0x4A95],
- ["8234B733",0x4A96],
- ["8234B734",0x4A97],
- ["8234B735",0x4A98],
- ["8234B736",0x4A99],
- ["8234B737",0x4A9A],
- ["8234B738",0x4A9B],
- ["8234B739",0x4A9C],
- ["8234B830",0x4A9D],
- ["8234B831",0x4A9E],
- ["8234B832",0x4A9F],
- ["8234B833",0x4AA0],
- ["8234B834",0x4AA1],
- ["8234B835",0x4AA2],
- ["8234B836",0x4AA3],
- ["8234B837",0x4AA4],
- ["8234B838",0x4AA5],
- ["8234B839",0x4AA6],
- ["8234B930",0x4AA7],
- ["8234B931",0x4AA8],
- ["8234B932",0x4AA9],
- ["8234B933",0x4AAA],
- ["8234B934",0x4AAB],
- ["8234B935",0x4AAC],
- ["8234B936",0x4AAD],
- ["8234B937",0x4AAE],
- ["8234B938",0x4AAF],
- ["8234B939",0x4AB0],
- ["8234BA30",0x4AB1],
- ["8234BA31",0x4AB2],
- ["8234BA32",0x4AB3],
- ["8234BA33",0x4AB4],
- ["8234BA34",0x4AB5],
- ["8234BA35",0x4AB6],
- ["8234BA36",0x4AB7],
- ["8234BA37",0x4AB8],
- ["8234BA38",0x4AB9],
- ["8234BA39",0x4ABA],
- ["8234BB30",0x4ABB],
- ["8234BB31",0x4ABC],
- ["8234BB32",0x4ABD],
- ["8234BB33",0x4ABE],
- ["8234BB34",0x4ABF],
- ["8234BB35",0x4AC0],
- ["8234BB36",0x4AC1],
- ["8234BB37",0x4AC2],
- ["8234BB38",0x4AC3],
- ["8234BB39",0x4AC4],
- ["8234BC30",0x4AC5],
- ["8234BC31",0x4AC6],
- ["8234BC32",0x4AC7],
- ["8234BC33",0x4AC8],
- ["8234BC34",0x4AC9],
- ["8234BC35",0x4ACA],
- ["8234BC36",0x4ACB],
- ["8234BC37",0x4ACC],
- ["8234BC38",0x4ACD],
- ["8234BC39",0x4ACE],
- ["8234BD30",0x4ACF],
- ["8234BD31",0x4AD0],
- ["8234BD32",0x4AD1],
- ["8234BD33",0x4AD2],
- ["8234BD34",0x4AD3],
- ["8234BD35",0x4AD4],
- ["8234BD36",0x4AD5],
- ["8234BD37",0x4AD6],
- ["8234BD38",0x4AD7],
- ["8234BD39",0x4AD8],
- ["8234BE30",0x4AD9],
- ["8234BE31",0x4ADA],
- ["8234BE32",0x4ADB],
- ["8234BE33",0x4ADC],
- ["8234BE34",0x4ADD],
- ["8234BE35",0x4ADE],
- ["8234BE36",0x4ADF],
- ["8234BE37",0x4AE0],
- ["8234BE38",0x4AE1],
- ["8234BE39",0x4AE2],
- ["8234BF30",0x4AE3],
- ["8234BF31",0x4AE4],
- ["8234BF32",0x4AE5],
- ["8234BF33",0x4AE6],
- ["8234BF34",0x4AE7],
- ["8234BF35",0x4AE8],
- ["8234BF36",0x4AE9],
- ["8234BF37",0x4AEA],
- ["8234BF38",0x4AEB],
- ["8234BF39",0x4AEC],
- ["8234C030",0x4AED],
- ["8234C031",0x4AEE],
- ["8234C032",0x4AEF],
- ["8234C033",0x4AF0],
- ["8234C034",0x4AF1],
- ["8234C035",0x4AF2],
- ["8234C036",0x4AF3],
- ["8234C037",0x4AF4],
- ["8234C038",0x4AF5],
- ["8234C039",0x4AF6],
- ["8234C130",0x4AF7],
- ["8234C131",0x4AF8],
- ["8234C132",0x4AF9],
- ["8234C133",0x4AFA],
- ["8234C134",0x4AFB],
- ["8234C135",0x4AFC],
- ["8234C136",0x4AFD],
- ["8234C137",0x4AFE],
- ["8234C138",0x4AFF],
- ["8234C139",0x4B00],
- ["8234C230",0x4B01],
- ["8234C231",0x4B02],
- ["8234C232",0x4B03],
- ["8234C233",0x4B04],
- ["8234C234",0x4B05],
- ["8234C235",0x4B06],
- ["8234C236",0x4B07],
- ["8234C237",0x4B08],
- ["8234C238",0x4B09],
- ["8234C239",0x4B0A],
- ["8234C330",0x4B0B],
- ["8234C331",0x4B0C],
- ["8234C332",0x4B0D],
- ["8234C333",0x4B0E],
- ["8234C334",0x4B0F],
- ["8234C335",0x4B10],
- ["8234C336",0x4B11],
- ["8234C337",0x4B12],
- ["8234C338",0x4B13],
- ["8234C339",0x4B14],
- ["8234C430",0x4B15],
- ["8234C431",0x4B16],
- ["8234C432",0x4B17],
- ["8234C433",0x4B18],
- ["8234C434",0x4B19],
- ["8234C435",0x4B1A],
- ["8234C436",0x4B1B],
- ["8234C437",0x4B1C],
- ["8234C438",0x4B1D],
- ["8234C439",0x4B1E],
- ["8234C530",0x4B1F],
- ["8234C531",0x4B20],
- ["8234C532",0x4B21],
- ["8234C533",0x4B22],
- ["8234C534",0x4B23],
- ["8234C535",0x4B24],
- ["8234C536",0x4B25],
- ["8234C537",0x4B26],
- ["8234C538",0x4B27],
- ["8234C539",0x4B28],
- ["8234C630",0x4B29],
- ["8234C631",0x4B2A],
- ["8234C632",0x4B2B],
- ["8234C633",0x4B2C],
- ["8234C634",0x4B2D],
- ["8234C635",0x4B2E],
- ["8234C636",0x4B2F],
- ["8234C637",0x4B30],
- ["8234C638",0x4B31],
- ["8234C639",0x4B32],
- ["8234C730",0x4B33],
- ["8234C731",0x4B34],
- ["8234C732",0x4B35],
- ["8234C733",0x4B36],
- ["8234C734",0x4B37],
- ["8234C735",0x4B38],
- ["8234C736",0x4B39],
- ["8234C737",0x4B3A],
- ["8234C738",0x4B3B],
- ["8234C739",0x4B3C],
- ["8234C830",0x4B3D],
- ["8234C831",0x4B3E],
- ["8234C832",0x4B3F],
- ["8234C833",0x4B40],
- ["8234C834",0x4B41],
- ["8234C835",0x4B42],
- ["8234C836",0x4B43],
- ["8234C837",0x4B44],
- ["8234C838",0x4B45],
- ["8234C839",0x4B46],
- ["8234C930",0x4B47],
- ["8234C931",0x4B48],
- ["8234C932",0x4B49],
- ["8234C933",0x4B4A],
- ["8234C934",0x4B4B],
- ["8234C935",0x4B4C],
- ["8234C936",0x4B4D],
- ["8234C937",0x4B4E],
- ["8234C938",0x4B4F],
- ["8234C939",0x4B50],
- ["8234CA30",0x4B51],
- ["8234CA31",0x4B52],
- ["8234CA32",0x4B53],
- ["8234CA33",0x4B54],
- ["8234CA34",0x4B55],
- ["8234CA35",0x4B56],
- ["8234CA36",0x4B57],
- ["8234CA37",0x4B58],
- ["8234CA38",0x4B59],
- ["8234CA39",0x4B5A],
- ["8234CB30",0x4B5B],
- ["8234CB31",0x4B5C],
- ["8234CB32",0x4B5D],
- ["8234CB33",0x4B5E],
- ["8234CB34",0x4B5F],
- ["8234CB35",0x4B60],
- ["8234CB36",0x4B61],
- ["8234CB37",0x4B62],
- ["8234CB38",0x4B63],
- ["8234CB39",0x4B64],
- ["8234CC30",0x4B65],
- ["8234CC31",0x4B66],
- ["8234CC32",0x4B67],
- ["8234CC33",0x4B68],
- ["8234CC34",0x4B69],
- ["8234CC35",0x4B6A],
- ["8234CC36",0x4B6B],
- ["8234CC37",0x4B6C],
- ["8234CC38",0x4B6D],
- ["8234CC39",0x4B6E],
- ["8234CD30",0x4B6F],
- ["8234CD31",0x4B70],
- ["8234CD32",0x4B71],
- ["8234CD33",0x4B72],
- ["8234CD34",0x4B73],
- ["8234CD35",0x4B74],
- ["8234CD36",0x4B75],
- ["8234CD37",0x4B76],
- ["8234CD38",0x4B77],
- ["8234CD39",0x4B78],
- ["8234CE30",0x4B79],
- ["8234CE31",0x4B7A],
- ["8234CE32",0x4B7B],
- ["8234CE33",0x4B7C],
- ["8234CE34",0x4B7D],
- ["8234CE35",0x4B7E],
- ["8234CE36",0x4B7F],
- ["8234CE37",0x4B80],
- ["8234CE38",0x4B81],
- ["8234CE39",0x4B82],
- ["8234CF30",0x4B83],
- ["8234CF31",0x4B84],
- ["8234CF32",0x4B85],
- ["8234CF33",0x4B86],
- ["8234CF34",0x4B87],
- ["8234CF35",0x4B88],
- ["8234CF36",0x4B89],
- ["8234CF37",0x4B8A],
- ["8234CF38",0x4B8B],
- ["8234CF39",0x4B8C],
- ["8234D030",0x4B8D],
- ["8234D031",0x4B8E],
- ["8234D032",0x4B8F],
- ["8234D033",0x4B90],
- ["8234D034",0x4B91],
- ["8234D035",0x4B92],
- ["8234D036",0x4B93],
- ["8234D037",0x4B94],
- ["8234D038",0x4B95],
- ["8234D039",0x4B96],
- ["8234D130",0x4B97],
- ["8234D131",0x4B98],
- ["8234D132",0x4B99],
- ["8234D133",0x4B9A],
- ["8234D134",0x4B9B],
- ["8234D135",0x4B9C],
- ["8234D136",0x4B9D],
- ["8234D137",0x4B9E],
- ["8234D138",0x4B9F],
- ["8234D139",0x4BA0],
- ["8234D230",0x4BA1],
- ["8234D231",0x4BA2],
- ["8234D232",0x4BA3],
- ["8234D233",0x4BA4],
- ["8234D234",0x4BA5],
- ["8234D235",0x4BA6],
- ["8234D236",0x4BA7],
- ["8234D237",0x4BA8],
- ["8234D238",0x4BA9],
- ["8234D239",0x4BAA],
- ["8234D330",0x4BAB],
- ["8234D331",0x4BAC],
- ["8234D332",0x4BAD],
- ["8234D333",0x4BAE],
- ["8234D334",0x4BAF],
- ["8234D335",0x4BB0],
- ["8234D336",0x4BB1],
- ["8234D337",0x4BB2],
- ["8234D338",0x4BB3],
- ["8234D339",0x4BB4],
- ["8234D430",0x4BB5],
- ["8234D431",0x4BB6],
- ["8234D432",0x4BB7],
- ["8234D433",0x4BB8],
- ["8234D434",0x4BB9],
- ["8234D435",0x4BBA],
- ["8234D436",0x4BBB],
- ["8234D437",0x4BBC],
- ["8234D438",0x4BBD],
- ["8234D439",0x4BBE],
- ["8234D530",0x4BBF],
- ["8234D531",0x4BC0],
- ["8234D532",0x4BC1],
- ["8234D533",0x4BC2],
- ["8234D534",0x4BC3],
- ["8234D535",0x4BC4],
- ["8234D536",0x4BC5],
- ["8234D537",0x4BC6],
- ["8234D538",0x4BC7],
- ["8234D539",0x4BC8],
- ["8234D630",0x4BC9],
- ["8234D631",0x4BCA],
- ["8234D632",0x4BCB],
- ["8234D633",0x4BCC],
- ["8234D634",0x4BCD],
- ["8234D635",0x4BCE],
- ["8234D636",0x4BCF],
- ["8234D637",0x4BD0],
- ["8234D638",0x4BD1],
- ["8234D639",0x4BD2],
- ["8234D730",0x4BD3],
- ["8234D731",0x4BD4],
- ["8234D732",0x4BD5],
- ["8234D733",0x4BD6],
- ["8234D734",0x4BD7],
- ["8234D735",0x4BD8],
- ["8234D736",0x4BD9],
- ["8234D737",0x4BDA],
- ["8234D738",0x4BDB],
- ["8234D739",0x4BDC],
- ["8234D830",0x4BDD],
- ["8234D831",0x4BDE],
- ["8234D832",0x4BDF],
- ["8234D833",0x4BE0],
- ["8234D834",0x4BE1],
- ["8234D835",0x4BE2],
- ["8234D836",0x4BE3],
- ["8234D837",0x4BE4],
- ["8234D838",0x4BE5],
- ["8234D839",0x4BE6],
- ["8234D930",0x4BE7],
- ["8234D931",0x4BE8],
- ["8234D932",0x4BE9],
- ["8234D933",0x4BEA],
- ["8234D934",0x4BEB],
- ["8234D935",0x4BEC],
- ["8234D936",0x4BED],
- ["8234D937",0x4BEE],
- ["8234D938",0x4BEF],
- ["8234D939",0x4BF0],
- ["8234DA30",0x4BF1],
- ["8234DA31",0x4BF2],
- ["8234DA32",0x4BF3],
- ["8234DA33",0x4BF4],
- ["8234DA34",0x4BF5],
- ["8234DA35",0x4BF6],
- ["8234DA36",0x4BF7],
- ["8234DA37",0x4BF8],
- ["8234DA38",0x4BF9],
- ["8234DA39",0x4BFA],
- ["8234DB30",0x4BFB],
- ["8234DB31",0x4BFC],
- ["8234DB32",0x4BFD],
- ["8234DB33",0x4BFE],
- ["8234DB34",0x4BFF],
- ["8234DB35",0x4C00],
- ["8234DB36",0x4C01],
- ["8234DB37",0x4C02],
- ["8234DB38",0x4C03],
- ["8234DB39",0x4C04],
- ["8234DC30",0x4C05],
- ["8234DC31",0x4C06],
- ["8234DC32",0x4C07],
- ["8234DC33",0x4C08],
- ["8234DC34",0x4C09],
- ["8234DC35",0x4C0A],
- ["8234DC36",0x4C0B],
- ["8234DC37",0x4C0C],
- ["8234DC38",0x4C0D],
- ["8234DC39",0x4C0E],
- ["8234DD30",0x4C0F],
- ["8234DD31",0x4C10],
- ["8234DD32",0x4C11],
- ["8234DD33",0x4C12],
- ["8234DD34",0x4C13],
- ["8234DD35",0x4C14],
- ["8234DD36",0x4C15],
- ["8234DD37",0x4C16],
- ["8234DD38",0x4C17],
- ["8234DD39",0x4C18],
- ["8234DE30",0x4C19],
- ["8234DE31",0x4C1A],
- ["8234DE32",0x4C1B],
- ["8234DE33",0x4C1C],
- ["8234DE34",0x4C1D],
- ["8234DE35",0x4C1E],
- ["8234DE36",0x4C1F],
- ["8234DE37",0x4C20],
- ["8234DE38",0x4C21],
- ["8234DE39",0x4C22],
- ["8234DF30",0x4C23],
- ["8234DF31",0x4C24],
- ["8234DF32",0x4C25],
- ["8234DF33",0x4C26],
- ["8234DF34",0x4C27],
- ["8234DF35",0x4C28],
- ["8234DF36",0x4C29],
- ["8234DF37",0x4C2A],
- ["8234DF38",0x4C2B],
- ["8234DF39",0x4C2C],
- ["8234E030",0x4C2D],
- ["8234E031",0x4C2E],
- ["8234E032",0x4C2F],
- ["8234E033",0x4C30],
- ["8234E034",0x4C31],
- ["8234E035",0x4C32],
- ["8234E036",0x4C33],
- ["8234E037",0x4C34],
- ["8234E038",0x4C35],
- ["8234E039",0x4C36],
- ["8234E130",0x4C37],
- ["8234E131",0x4C38],
- ["8234E132",0x4C39],
- ["8234E133",0x4C3A],
- ["8234E134",0x4C3B],
- ["8234E135",0x4C3C],
- ["8234E136",0x4C3D],
- ["8234E137",0x4C3E],
- ["8234E138",0x4C3F],
- ["8234E139",0x4C40],
- ["8234E230",0x4C41],
- ["8234E231",0x4C42],
- ["8234E232",0x4C43],
- ["8234E233",0x4C44],
- ["8234E234",0x4C45],
- ["8234E235",0x4C46],
- ["8234E236",0x4C47],
- ["8234E237",0x4C48],
- ["8234E238",0x4C49],
- ["8234E239",0x4C4A],
- ["8234E330",0x4C4B],
- ["8234E331",0x4C4C],
- ["8234E332",0x4C4D],
- ["8234E333",0x4C4E],
- ["8234E334",0x4C4F],
- ["8234E335",0x4C50],
- ["8234E336",0x4C51],
- ["8234E337",0x4C52],
- ["8234E338",0x4C53],
- ["8234E339",0x4C54],
- ["8234E430",0x4C55],
- ["8234E431",0x4C56],
- ["8234E432",0x4C57],
- ["8234E433",0x4C58],
- ["8234E434",0x4C59],
- ["8234E435",0x4C5A],
- ["8234E436",0x4C5B],
- ["8234E437",0x4C5C],
- ["8234E438",0x4C5D],
- ["8234E439",0x4C5E],
- ["8234E530",0x4C5F],
- ["8234E531",0x4C60],
- ["8234E532",0x4C61],
- ["8234E533",0x4C62],
- ["8234E534",0x4C63],
- ["8234E535",0x4C64],
- ["8234E536",0x4C65],
- ["8234E537",0x4C66],
- ["8234E538",0x4C67],
- ["8234E539",0x4C68],
- ["8234E630",0x4C69],
- ["8234E631",0x4C6A],
- ["8234E632",0x4C6B],
- ["8234E633",0x4C6C],
- ["8234E634",0x4C6D],
- ["8234E635",0x4C6E],
- ["8234E636",0x4C6F],
- ["8234E637",0x4C70],
- ["8234E638",0x4C71],
- ["8234E639",0x4C72],
- ["8234E730",0x4C73],
- ["8234E731",0x4C74],
- ["8234E732",0x4C75],
- ["8234E733",0x4C76],
- ["FE96",0x4C77],
- ["8234E734",0x4C78],
- ["8234E735",0x4C79],
- ["8234E736",0x4C7A],
- ["8234E737",0x4C7B],
- ["8234E738",0x4C7C],
- ["8234E739",0x4C7D],
- ["8234E830",0x4C7E],
- ["8234E831",0x4C7F],
- ["8234E832",0x4C80],
- ["8234E833",0x4C81],
- ["8234E834",0x4C82],
- ["8234E835",0x4C83],
- ["8234E836",0x4C84],
- ["8234E837",0x4C85],
- ["8234E838",0x4C86],
- ["8234E839",0x4C87],
- ["8234E930",0x4C88],
- ["8234E931",0x4C89],
- ["8234E932",0x4C8A],
- ["8234E933",0x4C8B],
- ["8234E934",0x4C8C],
- ["8234E935",0x4C8D],
- ["8234E936",0x4C8E],
- ["8234E937",0x4C8F],
- ["8234E938",0x4C90],
- ["8234E939",0x4C91],
- ["8234EA30",0x4C92],
- ["8234EA31",0x4C93],
- ["8234EA32",0x4C94],
- ["8234EA33",0x4C95],
- ["8234EA34",0x4C96],
- ["8234EA35",0x4C97],
- ["8234EA36",0x4C98],
- ["8234EA37",0x4C99],
- ["8234EA38",0x4C9A],
- ["8234EA39",0x4C9B],
- ["8234EB30",0x4C9C],
- ["8234EB31",0x4C9D],
- ["8234EB32",0x4C9E],
- ["FE93",0x4C9F],
- ["FE94",0x4CA0],
- ["FE95",0x4CA1],
- ["FE97",0x4CA2],
- ["FE92",0x4CA3],
- ["8234EB33",0x4CA4],
- ["8234EB34",0x4CA5],
- ["8234EB35",0x4CA6],
- ["8234EB36",0x4CA7],
- ["8234EB37",0x4CA8],
- ["8234EB38",0x4CA9],
- ["8234EB39",0x4CAA],
- ["8234EC30",0x4CAB],
- ["8234EC31",0x4CAC],
- ["8234EC32",0x4CAD],
- ["8234EC33",0x4CAE],
- ["8234EC34",0x4CAF],
- ["8234EC35",0x4CB0],
- ["8234EC36",0x4CB1],
- ["8234EC37",0x4CB2],
- ["8234EC38",0x4CB3],
- ["8234EC39",0x4CB4],
- ["8234ED30",0x4CB5],
- ["8234ED31",0x4CB6],
- ["8234ED32",0x4CB7],
- ["8234ED33",0x4CB8],
- ["8234ED34",0x4CB9],
- ["8234ED35",0x4CBA],
- ["8234ED36",0x4CBB],
- ["8234ED37",0x4CBC],
- ["8234ED38",0x4CBD],
- ["8234ED39",0x4CBE],
- ["8234EE30",0x4CBF],
- ["8234EE31",0x4CC0],
- ["8234EE32",0x4CC1],
- ["8234EE33",0x4CC2],
- ["8234EE34",0x4CC3],
- ["8234EE35",0x4CC4],
- ["8234EE36",0x4CC5],
- ["8234EE37",0x4CC6],
- ["8234EE38",0x4CC7],
- ["8234EE39",0x4CC8],
- ["8234EF30",0x4CC9],
- ["8234EF31",0x4CCA],
- ["8234EF32",0x4CCB],
- ["8234EF33",0x4CCC],
- ["8234EF34",0x4CCD],
- ["8234EF35",0x4CCE],
- ["8234EF36",0x4CCF],
- ["8234EF37",0x4CD0],
- ["8234EF38",0x4CD1],
- ["8234EF39",0x4CD2],
- ["8234F030",0x4CD3],
- ["8234F031",0x4CD4],
- ["8234F032",0x4CD5],
- ["8234F033",0x4CD6],
- ["8234F034",0x4CD7],
- ["8234F035",0x4CD8],
- ["8234F036",0x4CD9],
- ["8234F037",0x4CDA],
- ["8234F038",0x4CDB],
- ["8234F039",0x4CDC],
- ["8234F130",0x4CDD],
- ["8234F131",0x4CDE],
- ["8234F132",0x4CDF],
- ["8234F133",0x4CE0],
- ["8234F134",0x4CE1],
- ["8234F135",0x4CE2],
- ["8234F136",0x4CE3],
- ["8234F137",0x4CE4],
- ["8234F138",0x4CE5],
- ["8234F139",0x4CE6],
- ["8234F230",0x4CE7],
- ["8234F231",0x4CE8],
- ["8234F232",0x4CE9],
- ["8234F233",0x4CEA],
- ["8234F234",0x4CEB],
- ["8234F235",0x4CEC],
- ["8234F236",0x4CED],
- ["8234F237",0x4CEE],
- ["8234F238",0x4CEF],
- ["8234F239",0x4CF0],
- ["8234F330",0x4CF1],
- ["8234F331",0x4CF2],
- ["8234F332",0x4CF3],
- ["8234F333",0x4CF4],
- ["8234F334",0x4CF5],
- ["8234F335",0x4CF6],
- ["8234F336",0x4CF7],
- ["8234F337",0x4CF8],
- ["8234F338",0x4CF9],
- ["8234F339",0x4CFA],
- ["8234F430",0x4CFB],
- ["8234F431",0x4CFC],
- ["8234F432",0x4CFD],
- ["8234F433",0x4CFE],
- ["8234F434",0x4CFF],
- ["8234F435",0x4D00],
- ["8234F436",0x4D01],
- ["8234F437",0x4D02],
- ["8234F438",0x4D03],
- ["8234F439",0x4D04],
- ["8234F530",0x4D05],
- ["8234F531",0x4D06],
- ["8234F532",0x4D07],
- ["8234F533",0x4D08],
- ["8234F534",0x4D09],
- ["8234F535",0x4D0A],
- ["8234F536",0x4D0B],
- ["8234F537",0x4D0C],
- ["8234F538",0x4D0D],
- ["8234F539",0x4D0E],
- ["8234F630",0x4D0F],
- ["8234F631",0x4D10],
- ["8234F632",0x4D11],
- ["8234F633",0x4D12],
- ["FE98",0x4D13],
- ["FE99",0x4D14],
- ["FE9A",0x4D15],
- ["FE9B",0x4D16],
- ["FE9C",0x4D17],
- ["FE9D",0x4D18],
- ["FE9E",0x4D19],
- ["8234F634",0x4D1A],
- ["8234F635",0x4D1B],
- ["8234F636",0x4D1C],
- ["8234F637",0x4D1D],
- ["8234F638",0x4D1E],
- ["8234F639",0x4D1F],
- ["8234F730",0x4D20],
- ["8234F731",0x4D21],
- ["8234F732",0x4D22],
- ["8234F733",0x4D23],
- ["8234F734",0x4D24],
- ["8234F735",0x4D25],
- ["8234F736",0x4D26],
- ["8234F737",0x4D27],
- ["8234F738",0x4D28],
- ["8234F739",0x4D29],
- ["8234F830",0x4D2A],
- ["8234F831",0x4D2B],
- ["8234F832",0x4D2C],
- ["8234F833",0x4D2D],
- ["8234F834",0x4D2E],
- ["8234F835",0x4D2F],
- ["8234F836",0x4D30],
- ["8234F837",0x4D31],
- ["8234F838",0x4D32],
- ["8234F839",0x4D33],
- ["8234F930",0x4D34],
- ["8234F931",0x4D35],
- ["8234F932",0x4D36],
- ["8234F933",0x4D37],
- ["8234F934",0x4D38],
- ["8234F935",0x4D39],
- ["8234F936",0x4D3A],
- ["8234F937",0x4D3B],
- ["8234F938",0x4D3C],
- ["8234F939",0x4D3D],
- ["8234FA30",0x4D3E],
- ["8234FA31",0x4D3F],
- ["8234FA32",0x4D40],
- ["8234FA33",0x4D41],
- ["8234FA34",0x4D42],
- ["8234FA35",0x4D43],
- ["8234FA36",0x4D44],
- ["8234FA37",0x4D45],
- ["8234FA38",0x4D46],
- ["8234FA39",0x4D47],
- ["8234FB30",0x4D48],
- ["8234FB31",0x4D49],
- ["8234FB32",0x4D4A],
- ["8234FB33",0x4D4B],
- ["8234FB34",0x4D4C],
- ["8234FB35",0x4D4D],
- ["8234FB36",0x4D4E],
- ["8234FB37",0x4D4F],
- ["8234FB38",0x4D50],
- ["8234FB39",0x4D51],
- ["8234FC30",0x4D52],
- ["8234FC31",0x4D53],
- ["8234FC32",0x4D54],
- ["8234FC33",0x4D55],
- ["8234FC34",0x4D56],
- ["8234FC35",0x4D57],
- ["8234FC36",0x4D58],
- ["8234FC37",0x4D59],
- ["8234FC38",0x4D5A],
- ["8234FC39",0x4D5B],
- ["8234FD30",0x4D5C],
- ["8234FD31",0x4D5D],
- ["8234FD32",0x4D5E],
- ["8234FD33",0x4D5F],
- ["8234FD34",0x4D60],
- ["8234FD35",0x4D61],
- ["8234FD36",0x4D62],
- ["8234FD37",0x4D63],
- ["8234FD38",0x4D64],
- ["8234FD39",0x4D65],
- ["8234FE30",0x4D66],
- ["8234FE31",0x4D67],
- ["8234FE32",0x4D68],
- ["8234FE33",0x4D69],
- ["8234FE34",0x4D6A],
- ["8234FE35",0x4D6B],
- ["8234FE36",0x4D6C],
- ["8234FE37",0x4D6D],
- ["8234FE38",0x4D6E],
- ["8234FE39",0x4D6F],
- ["82358130",0x4D70],
- ["82358131",0x4D71],
- ["82358132",0x4D72],
- ["82358133",0x4D73],
- ["82358134",0x4D74],
- ["82358135",0x4D75],
- ["82358136",0x4D76],
- ["82358137",0x4D77],
- ["82358138",0x4D78],
- ["82358139",0x4D79],
- ["82358230",0x4D7A],
- ["82358231",0x4D7B],
- ["82358232",0x4D7C],
- ["82358233",0x4D7D],
- ["82358234",0x4D7E],
- ["82358235",0x4D7F],
- ["82358236",0x4D80],
- ["82358237",0x4D81],
- ["82358238",0x4D82],
- ["82358239",0x4D83],
- ["82358330",0x4D84],
- ["82358331",0x4D85],
- ["82358332",0x4D86],
- ["82358333",0x4D87],
- ["82358334",0x4D88],
- ["82358335",0x4D89],
- ["82358336",0x4D8A],
- ["82358337",0x4D8B],
- ["82358338",0x4D8C],
- ["82358339",0x4D8D],
- ["82358430",0x4D8E],
- ["82358431",0x4D8F],
- ["82358432",0x4D90],
- ["82358433",0x4D91],
- ["82358434",0x4D92],
- ["82358435",0x4D93],
- ["82358436",0x4D94],
- ["82358437",0x4D95],
- ["82358438",0x4D96],
- ["82358439",0x4D97],
- ["82358530",0x4D98],
- ["82358531",0x4D99],
- ["82358532",0x4D9A],
- ["82358533",0x4D9B],
- ["82358534",0x4D9C],
- ["82358535",0x4D9D],
- ["82358536",0x4D9E],
- ["82358537",0x4D9F],
- ["82358538",0x4DA0],
- ["82358539",0x4DA1],
- ["82358630",0x4DA2],
- ["82358631",0x4DA3],
- ["82358632",0x4DA4],
- ["82358633",0x4DA5],
- ["82358634",0x4DA6],
- ["82358635",0x4DA7],
- ["82358636",0x4DA8],
- ["82358637",0x4DA9],
- ["82358638",0x4DAA],
- ["82358639",0x4DAB],
- ["82358730",0x4DAC],
- ["82358731",0x4DAD],
- ["FE9F",0x4DAE],
- ["82358732",0x4DAF],
- ["82358733",0x4DB0],
- ["82358734",0x4DB1],
- ["82358735",0x4DB2],
- ["82358736",0x4DB3],
- ["82358737",0x4DB4],
- ["82358738",0x4DB5],
- ["82358739",0x4DB6],
- ["82358830",0x4DB7],
- ["82358831",0x4DB8],
- ["82358832",0x4DB9],
- ["82358833",0x4DBA],
- ["82358834",0x4DBB],
- ["82358835",0x4DBC],
- ["82358836",0x4DBD],
- ["82358837",0x4DBE],
- ["82358838",0x4DBF],
- ["82358839",0x4DC0],
- ["82358930",0x4DC1],
- ["82358931",0x4DC2],
- ["82358932",0x4DC3],
- ["82358933",0x4DC4],
- ["82358934",0x4DC5],
- ["82358935",0x4DC6],
- ["82358936",0x4DC7],
- ["82358937",0x4DC8],
- ["82358938",0x4DC9],
- ["82358939",0x4DCA],
- ["82358A30",0x4DCB],
- ["82358A31",0x4DCC],
- ["82358A32",0x4DCD],
- ["82358A33",0x4DCE],
- ["82358A34",0x4DCF],
- ["82358A35",0x4DD0],
- ["82358A36",0x4DD1],
- ["82358A37",0x4DD2],
- ["82358A38",0x4DD3],
- ["82358A39",0x4DD4],
- ["82358B30",0x4DD5],
- ["82358B31",0x4DD6],
- ["82358B32",0x4DD7],
- ["82358B33",0x4DD8],
- ["82358B34",0x4DD9],
- ["82358B35",0x4DDA],
- ["82358B36",0x4DDB],
- ["82358B37",0x4DDC],
- ["82358B38",0x4DDD],
- ["82358B39",0x4DDE],
- ["82358C30",0x4DDF],
- ["82358C31",0x4DE0],
- ["82358C32",0x4DE1],
- ["82358C33",0x4DE2],
- ["82358C34",0x4DE3],
- ["82358C35",0x4DE4],
- ["82358C36",0x4DE5],
- ["82358C37",0x4DE6],
- ["82358C38",0x4DE7],
- ["82358C39",0x4DE8],
- ["82358D30",0x4DE9],
- ["82358D31",0x4DEA],
- ["82358D32",0x4DEB],
- ["82358D33",0x4DEC],
- ["82358D34",0x4DED],
- ["82358D35",0x4DEE],
- ["82358D36",0x4DEF],
- ["82358D37",0x4DF0],
- ["82358D38",0x4DF1],
- ["82358D39",0x4DF2],
- ["82358E30",0x4DF3],
- ["82358E31",0x4DF4],
- ["82358E32",0x4DF5],
- ["82358E33",0x4DF6],
- ["82358E34",0x4DF7],
- ["82358E35",0x4DF8],
- ["82358E36",0x4DF9],
- ["82358E37",0x4DFA],
- ["82358E38",0x4DFB],
- ["82358E39",0x4DFC],
- ["82358F30",0x4DFD],
- ["82358F31",0x4DFE],
- ["82358F32",0x4DFF],
- ["D2BB",0x4E00],
- ["B6A1",0x4E01],
- ["8140",0x4E02],
- ["C6DF",0x4E03],
- ["8141",0x4E04],
- ["8142",0x4E05],
- ["8143",0x4E06],
- ["CDF2",0x4E07],
- ["D5C9",0x4E08],
- ["C8FD",0x4E09],
- ["C9CF",0x4E0A],
- ["CFC2",0x4E0B],
- ["D8A2",0x4E0C],
- ["B2BB",0x4E0D],
- ["D3EB",0x4E0E],
- ["8144",0x4E0F],
- ["D8A4",0x4E10],
- ["B3F3",0x4E11],
- ["8145",0x4E12],
- ["D7A8",0x4E13],
- ["C7D2",0x4E14],
- ["D8A7",0x4E15],
- ["CAC0",0x4E16],
- ["8146",0x4E17],
- ["C7F0",0x4E18],
- ["B1FB",0x4E19],
- ["D2B5",0x4E1A],
- ["B4D4",0x4E1B],
- ["B6AB",0x4E1C],
- ["CBBF",0x4E1D],
- ["D8A9",0x4E1E],
- ["8147",0x4E1F],
- ["8148",0x4E20],
- ["8149",0x4E21],
- ["B6AA",0x4E22],
- ["814A",0x4E23],
- ["C1BD",0x4E24],
- ["D1CF",0x4E25],
- ["814B",0x4E26],
- ["C9A5",0x4E27],
- ["D8AD",0x4E28],
- ["814C",0x4E29],
- ["B8F6",0x4E2A],
- ["D1BE",0x4E2B],
- ["E3DC",0x4E2C],
- ["D6D0",0x4E2D],
- ["814D",0x4E2E],
- ["814E",0x4E2F],
- ["B7E1",0x4E30],
- ["814F",0x4E31],
- ["B4AE",0x4E32],
- ["8150",0x4E33],
- ["C1D9",0x4E34],
- ["8151",0x4E35],
- ["D8BC",0x4E36],
- ["8152",0x4E37],
- ["CDE8",0x4E38],
- ["B5A4",0x4E39],
- ["CEAA",0x4E3A],
- ["D6F7",0x4E3B],
- ["8153",0x4E3C],
- ["C0F6",0x4E3D],
- ["BED9",0x4E3E],
- ["D8AF",0x4E3F],
- ["8154",0x4E40],
- ["8155",0x4E41],
- ["8156",0x4E42],
- ["C4CB",0x4E43],
- ["8157",0x4E44],
- ["BEC3",0x4E45],
- ["8158",0x4E46],
- ["D8B1",0x4E47],
- ["C3B4",0x4E48],
- ["D2E5",0x4E49],
- ["8159",0x4E4A],
- ["D6AE",0x4E4B],
- ["CEDA",0x4E4C],
- ["D5A7",0x4E4D],
- ["BAF5",0x4E4E],
- ["B7A6",0x4E4F],
- ["C0D6",0x4E50],
- ["815A",0x4E51],
- ["C6B9",0x4E52],
- ["C5D2",0x4E53],
- ["C7C7",0x4E54],
- ["815B",0x4E55],
- ["B9D4",0x4E56],
- ["815C",0x4E57],
- ["B3CB",0x4E58],
- ["D2D2",0x4E59],
- ["815D",0x4E5A],
- ["815E",0x4E5B],
- ["D8BF",0x4E5C],
- ["BEC5",0x4E5D],
- ["C6F2",0x4E5E],
- ["D2B2",0x4E5F],
- ["CFB0",0x4E60],
- ["CFE7",0x4E61],
- ["815F",0x4E62],
- ["8160",0x4E63],
- ["8161",0x4E64],
- ["8162",0x4E65],
- ["CAE9",0x4E66],
- ["8163",0x4E67],
- ["8164",0x4E68],
- ["D8C0",0x4E69],
- ["8165",0x4E6A],
- ["8166",0x4E6B],
- ["8167",0x4E6C],
- ["8168",0x4E6D],
- ["8169",0x4E6E],
- ["816A",0x4E6F],
- ["C2F2",0x4E70],
- ["C2D2",0x4E71],
- ["816B",0x4E72],
- ["C8E9",0x4E73],
- ["816C",0x4E74],
- ["816D",0x4E75],
- ["816E",0x4E76],
- ["816F",0x4E77],
- ["8170",0x4E78],
- ["8171",0x4E79],
- ["8172",0x4E7A],
- ["8173",0x4E7B],
- ["8174",0x4E7C],
- ["8175",0x4E7D],
- ["C7AC",0x4E7E],
- ["8176",0x4E7F],
- ["8177",0x4E80],
- ["8178",0x4E81],
- ["8179",0x4E82],
- ["817A",0x4E83],
- ["817B",0x4E84],
- ["817C",0x4E85],
- ["C1CB",0x4E86],
- ["817D",0x4E87],
- ["D3E8",0x4E88],
- ["D5F9",0x4E89],
- ["817E",0x4E8A],
- ["CAC2",0x4E8B],
- ["B6FE",0x4E8C],
- ["D8A1",0x4E8D],
- ["D3DA",0x4E8E],
- ["BFF7",0x4E8F],
- ["8180",0x4E90],
- ["D4C6",0x4E91],
- ["BBA5",0x4E92],
- ["D8C1",0x4E93],
- ["CEE5",0x4E94],
- ["BEAE",0x4E95],
- ["8181",0x4E96],
- ["8182",0x4E97],
- ["D8A8",0x4E98],
- ["8183",0x4E99],
- ["D1C7",0x4E9A],
- ["D0A9",0x4E9B],
- ["8184",0x4E9C],
- ["8185",0x4E9D],
- ["8186",0x4E9E],
- ["D8BD",0x4E9F],
- ["D9EF",0x4EA0],
- ["CDF6",0x4EA1],
- ["BFBA",0x4EA2],
- ["8187",0x4EA3],
- ["BDBB",0x4EA4],
- ["BAA5",0x4EA5],
- ["D2E0",0x4EA6],
- ["B2FA",0x4EA7],
- ["BAE0",0x4EA8],
- ["C4B6",0x4EA9],
- ["8188",0x4EAA],
- ["CFED",0x4EAB],
- ["BEA9",0x4EAC],
- ["CDA4",0x4EAD],
- ["C1C1",0x4EAE],
- ["8189",0x4EAF],
- ["818A",0x4EB0],
- ["818B",0x4EB1],
- ["C7D7",0x4EB2],
- ["D9F1",0x4EB3],
- ["818C",0x4EB4],
- ["D9F4",0x4EB5],
- ["818D",0x4EB6],
- ["818E",0x4EB7],
- ["818F",0x4EB8],
- ["8190",0x4EB9],
- ["C8CB",0x4EBA],
- ["D8E9",0x4EBB],
- ["8191",0x4EBC],
- ["8192",0x4EBD],
- ["8193",0x4EBE],
- ["D2DA",0x4EBF],
- ["CAB2",0x4EC0],
- ["C8CA",0x4EC1],
- ["D8EC",0x4EC2],
- ["D8EA",0x4EC3],
- ["D8C6",0x4EC4],
- ["BDF6",0x4EC5],
- ["C6CD",0x4EC6],
- ["B3F0",0x4EC7],
- ["8194",0x4EC8],
- ["D8EB",0x4EC9],
- ["BDF1",0x4ECA],
- ["BDE9",0x4ECB],
- ["8195",0x4ECC],
- ["C8D4",0x4ECD],
- ["B4D3",0x4ECE],
- ["8196",0x4ECF],
- ["8197",0x4ED0],
- ["C2D8",0x4ED1],
- ["8198",0x4ED2],
- ["B2D6",0x4ED3],
- ["D7D0",0x4ED4],
- ["CACB",0x4ED5],
- ["CBFB",0x4ED6],
- ["D5CC",0x4ED7],
- ["B8B6",0x4ED8],
- ["CFC9",0x4ED9],
- ["8199",0x4EDA],
- ["819A",0x4EDB],
- ["819B",0x4EDC],
- ["D9DA",0x4EDD],
- ["D8F0",0x4EDE],
- ["C7AA",0x4EDF],
- ["819C",0x4EE0],
- ["D8EE",0x4EE1],
- ["819D",0x4EE2],
- ["B4FA",0x4EE3],
- ["C1EE",0x4EE4],
- ["D2D4",0x4EE5],
- ["819E",0x4EE6],
- ["819F",0x4EE7],
- ["D8ED",0x4EE8],
- ["81A0",0x4EE9],
- ["D2C7",0x4EEA],
- ["D8EF",0x4EEB],
- ["C3C7",0x4EEC],
- ["81A1",0x4EED],
- ["81A2",0x4EEE],
- ["81A3",0x4EEF],
- ["D1F6",0x4EF0],
- ["81A4",0x4EF1],
- ["D6D9",0x4EF2],
- ["D8F2",0x4EF3],
- ["81A5",0x4EF4],
- ["D8F5",0x4EF5],
- ["BCFE",0x4EF6],
- ["BCDB",0x4EF7],
- ["81A6",0x4EF8],
- ["81A7",0x4EF9],
- ["81A8",0x4EFA],
- ["C8CE",0x4EFB],
- ["81A9",0x4EFC],
- ["B7DD",0x4EFD],
- ["81AA",0x4EFE],
- ["B7C2",0x4EFF],
- ["81AB",0x4F00],
- ["C6F3",0x4F01],
- ["81AC",0x4F02],
- ["81AD",0x4F03],
- ["81AE",0x4F04],
- ["81AF",0x4F05],
- ["81B0",0x4F06],
- ["81B1",0x4F07],
- ["81B2",0x4F08],
- ["D8F8",0x4F09],
- ["D2C1",0x4F0A],
- ["81B3",0x4F0B],
- ["81B4",0x4F0C],
- ["CEE9",0x4F0D],
- ["BCBF",0x4F0E],
- ["B7FC",0x4F0F],
- ["B7A5",0x4F10],
- ["D0DD",0x4F11],
- ["81B5",0x4F12],
- ["81B6",0x4F13],
- ["81B7",0x4F14],
- ["81B8",0x4F15],
- ["81B9",0x4F16],
- ["D6DA",0x4F17],
- ["D3C5",0x4F18],
- ["BBEF",0x4F19],
- ["BBE1",0x4F1A],
- ["D8F1",0x4F1B],
- ["81BA",0x4F1C],
- ["81BB",0x4F1D],
- ["C9A1",0x4F1E],
- ["CEB0",0x4F1F],
- ["B4AB",0x4F20],
- ["81BC",0x4F21],
- ["D8F3",0x4F22],
- ["81BD",0x4F23],
- ["C9CB",0x4F24],
- ["D8F6",0x4F25],
- ["C2D7",0x4F26],
- ["D8F7",0x4F27],
- ["81BE",0x4F28],
- ["81BF",0x4F29],
- ["CEB1",0x4F2A],
- ["D8F9",0x4F2B],
- ["81C0",0x4F2C],
- ["81C1",0x4F2D],
- ["81C2",0x4F2E],
- ["B2AE",0x4F2F],
- ["B9C0",0x4F30],
- ["81C3",0x4F31],
- ["D9A3",0x4F32],
- ["81C4",0x4F33],
- ["B0E9",0x4F34],
- ["81C5",0x4F35],
- ["C1E6",0x4F36],
- ["81C6",0x4F37],
- ["C9EC",0x4F38],
- ["81C7",0x4F39],
- ["CBC5",0x4F3A],
- ["81C8",0x4F3B],
- ["CBC6",0x4F3C],
- ["D9A4",0x4F3D],
- ["81C9",0x4F3E],
- ["81CA",0x4F3F],
- ["81CB",0x4F40],
- ["81CC",0x4F41],
- ["81CD",0x4F42],
- ["B5E8",0x4F43],
- ["81CE",0x4F44],
- ["81CF",0x4F45],
- ["B5AB",0x4F46],
- ["81D0",0x4F47],
- ["81D1",0x4F48],
- ["81D2",0x4F49],
- ["81D3",0x4F4A],
- ["81D4",0x4F4B],
- ["81D5",0x4F4C],
- ["CEBB",0x4F4D],
- ["B5CD",0x4F4E],
- ["D7A1",0x4F4F],
- ["D7F4",0x4F50],
- ["D3D3",0x4F51],
- ["81D6",0x4F52],
- ["CCE5",0x4F53],
- ["81D7",0x4F54],
- ["BACE",0x4F55],
- ["81D8",0x4F56],
- ["D9A2",0x4F57],
- ["D9DC",0x4F58],
- ["D3E0",0x4F59],
- ["D8FD",0x4F5A],
- ["B7F0",0x4F5B],
- ["D7F7",0x4F5C],
- ["D8FE",0x4F5D],
- ["D8FA",0x4F5E],
- ["D9A1",0x4F5F],
- ["C4E3",0x4F60],
- ["81D9",0x4F61],
- ["81DA",0x4F62],
- ["D3B6",0x4F63],
- ["D8F4",0x4F64],
- ["D9DD",0x4F65],
- ["81DB",0x4F66],
- ["D8FB",0x4F67],
- ["81DC",0x4F68],
- ["C5E5",0x4F69],
- ["81DD",0x4F6A],
- ["81DE",0x4F6B],
- ["C0D0",0x4F6C],
- ["81DF",0x4F6D],
- ["81E0",0x4F6E],
- ["D1F0",0x4F6F],
- ["B0DB",0x4F70],
- ["81E1",0x4F71],
- ["81E2",0x4F72],
- ["BCD1",0x4F73],
- ["D9A6",0x4F74],
- ["81E3",0x4F75],
- ["D9A5",0x4F76],
- ["81E4",0x4F77],
- ["81E5",0x4F78],
- ["81E6",0x4F79],
- ["81E7",0x4F7A],
- ["D9AC",0x4F7B],
- ["D9AE",0x4F7C],
- ["81E8",0x4F7D],
- ["D9AB",0x4F7E],
- ["CAB9",0x4F7F],
- ["81E9",0x4F80],
- ["81EA",0x4F81],
- ["81EB",0x4F82],
- ["D9A9",0x4F83],
- ["D6B6",0x4F84],
- ["81EC",0x4F85],
- ["81ED",0x4F86],
- ["81EE",0x4F87],
- ["B3DE",0x4F88],
- ["D9A8",0x4F89],
- ["81EF",0x4F8A],
- ["C0FD",0x4F8B],
- ["81F0",0x4F8C],
- ["CACC",0x4F8D],
- ["81F1",0x4F8E],
- ["D9AA",0x4F8F],
- ["81F2",0x4F90],
- ["D9A7",0x4F91],
- ["81F3",0x4F92],
- ["81F4",0x4F93],
- ["D9B0",0x4F94],
- ["81F5",0x4F95],
- ["81F6",0x4F96],
- ["B6B1",0x4F97],
- ["81F7",0x4F98],
- ["81F8",0x4F99],
- ["81F9",0x4F9A],
- ["B9A9",0x4F9B],
- ["81FA",0x4F9C],
- ["D2C0",0x4F9D],
- ["81FB",0x4F9E],
- ["81FC",0x4F9F],
- ["CFC0",0x4FA0],
- ["81FD",0x4FA1],
- ["81FE",0x4FA2],
- ["C2C2",0x4FA3],
- ["8240",0x4FA4],
- ["BDC4",0x4FA5],
- ["D5EC",0x4FA6],
- ["B2E0",0x4FA7],
- ["C7C8",0x4FA8],
- ["BFEB",0x4FA9],
- ["D9AD",0x4FAA],
- ["8241",0x4FAB],
- ["D9AF",0x4FAC],
- ["8242",0x4FAD],
- ["CEEA",0x4FAE],
- ["BAEE",0x4FAF],
- ["8243",0x4FB0],
- ["8244",0x4FB1],
- ["8245",0x4FB2],
- ["8246",0x4FB3],
- ["8247",0x4FB4],
- ["C7D6",0x4FB5],
- ["8248",0x4FB6],
- ["8249",0x4FB7],
- ["824A",0x4FB8],
- ["824B",0x4FB9],
- ["824C",0x4FBA],
- ["824D",0x4FBB],
- ["824E",0x4FBC],
- ["824F",0x4FBD],
- ["8250",0x4FBE],
- ["B1E3",0x4FBF],
- ["8251",0x4FC0],
- ["8252",0x4FC1],
- ["8253",0x4FC2],
- ["B4D9",0x4FC3],
- ["B6ED",0x4FC4],
- ["D9B4",0x4FC5],
- ["8254",0x4FC6],
- ["8255",0x4FC7],
- ["8256",0x4FC8],
- ["8257",0x4FC9],
- ["BFA1",0x4FCA],
- ["8258",0x4FCB],
- ["8259",0x4FCC],
- ["825A",0x4FCD],
- ["D9DE",0x4FCE],
- ["C7CE",0x4FCF],
- ["C0FE",0x4FD0],
- ["D9B8",0x4FD1],
- ["825B",0x4FD2],
- ["825C",0x4FD3],
- ["825D",0x4FD4],
- ["825E",0x4FD5],
- ["825F",0x4FD6],
- ["CBD7",0x4FD7],
- ["B7FD",0x4FD8],
- ["8260",0x4FD9],
- ["D9B5",0x4FDA],
- ["8261",0x4FDB],
- ["D9B7",0x4FDC],
- ["B1A3",0x4FDD],
- ["D3E1",0x4FDE],
- ["D9B9",0x4FDF],
- ["8262",0x4FE0],
- ["D0C5",0x4FE1],
- ["8263",0x4FE2],
- ["D9B6",0x4FE3],
- ["8264",0x4FE4],
- ["8265",0x4FE5],
- ["D9B1",0x4FE6],
- ["8266",0x4FE7],
- ["D9B2",0x4FE8],
- ["C1A9",0x4FE9],
- ["D9B3",0x4FEA],
- ["8267",0x4FEB],
- ["8268",0x4FEC],
- ["BCF3",0x4FED],
- ["D0DE",0x4FEE],
- ["B8A9",0x4FEF],
- ["8269",0x4FF0],
- ["BEE3",0x4FF1],
- ["826A",0x4FF2],
- ["D9BD",0x4FF3],
- ["826B",0x4FF4],
- ["826C",0x4FF5],
- ["826D",0x4FF6],
- ["826E",0x4FF7],
- ["D9BA",0x4FF8],
- ["826F",0x4FF9],
- ["B0B3",0x4FFA],
- ["8270",0x4FFB],
- ["8271",0x4FFC],
- ["8272",0x4FFD],
- ["D9C2",0x4FFE],
- ["8273",0x4FFF],
- ["8274",0x5000],
- ["8275",0x5001],
- ["8276",0x5002],
- ["8277",0x5003],
- ["8278",0x5004],
- ["8279",0x5005],
- ["827A",0x5006],
- ["827B",0x5007],
- ["827C",0x5008],
- ["827D",0x5009],
- ["827E",0x500A],
- ["8280",0x500B],
- ["D9C4",0x500C],
- ["B1B6",0x500D],
- ["8281",0x500E],
- ["D9BF",0x500F],
- ["8282",0x5010],
- ["8283",0x5011],
- ["B5B9",0x5012],
- ["8284",0x5013],
- ["BEF3",0x5014],
- ["8285",0x5015],
- ["8286",0x5016],
- ["8287",0x5017],
- ["CCC8",0x5018],
- ["BAF2",0x5019],
- ["D2D0",0x501A],
- ["8288",0x501B],
- ["D9C3",0x501C],
- ["8289",0x501D],
- ["828A",0x501E],
- ["BDE8",0x501F],
- ["828B",0x5020],
- ["B3AB",0x5021],
- ["828C",0x5022],
- ["828D",0x5023],
- ["828E",0x5024],
- ["D9C5",0x5025],
- ["BEEB",0x5026],
- ["828F",0x5027],
- ["D9C6",0x5028],
- ["D9BB",0x5029],
- ["C4DF",0x502A],
- ["8290",0x502B],
- ["D9BE",0x502C],
- ["D9C1",0x502D],
- ["D9C0",0x502E],
- ["8291",0x502F],
- ["8292",0x5030],
- ["8293",0x5031],
- ["8294",0x5032],
- ["8295",0x5033],
- ["8296",0x5034],
- ["8297",0x5035],
- ["8298",0x5036],
- ["8299",0x5037],
- ["829A",0x5038],
- ["829B",0x5039],
- ["D5AE",0x503A],
- ["829C",0x503B],
- ["D6B5",0x503C],
- ["829D",0x503D],
- ["C7E3",0x503E],
- ["829E",0x503F],
- ["829F",0x5040],
- ["82A0",0x5041],
- ["82A1",0x5042],
- ["D9C8",0x5043],
- ["82A2",0x5044],
- ["82A3",0x5045],
- ["82A4",0x5046],
- ["BCD9",0x5047],
- ["D9CA",0x5048],
- ["82A5",0x5049],
- ["82A6",0x504A],
- ["82A7",0x504B],
- ["D9BC",0x504C],
- ["82A8",0x504D],
- ["D9CB",0x504E],
- ["C6AB",0x504F],
- ["82A9",0x5050],
- ["82AA",0x5051],
- ["82AB",0x5052],
- ["82AC",0x5053],
- ["82AD",0x5054],
- ["D9C9",0x5055],
- ["82AE",0x5056],
- ["82AF",0x5057],
- ["82B0",0x5058],
- ["82B1",0x5059],
- ["D7F6",0x505A],
- ["82B2",0x505B],
- ["CDA3",0x505C],
- ["82B3",0x505D],
- ["82B4",0x505E],
- ["82B5",0x505F],
- ["82B6",0x5060],
- ["82B7",0x5061],
- ["82B8",0x5062],
- ["82B9",0x5063],
- ["82BA",0x5064],
- ["BDA1",0x5065],
- ["82BB",0x5066],
- ["82BC",0x5067],
- ["82BD",0x5068],
- ["82BE",0x5069],
- ["82BF",0x506A],
- ["82C0",0x506B],
- ["D9CC",0x506C],
- ["82C1",0x506D],
- ["82C2",0x506E],
- ["82C3",0x506F],
- ["82C4",0x5070],
- ["82C5",0x5071],
- ["82C6",0x5072],
- ["82C7",0x5073],
- ["82C8",0x5074],
- ["82C9",0x5075],
- ["C5BC",0x5076],
- ["CDB5",0x5077],
- ["82CA",0x5078],
- ["82CB",0x5079],
- ["82CC",0x507A],
- ["D9CD",0x507B],
- ["82CD",0x507C],
- ["82CE",0x507D],
- ["D9C7",0x507E],
- ["B3A5",0x507F],
- ["BFFE",0x5080],
- ["82CF",0x5081],
- ["82D0",0x5082],
- ["82D1",0x5083],
- ["82D2",0x5084],
- ["B8B5",0x5085],
- ["82D3",0x5086],
- ["82D4",0x5087],
- ["C0FC",0x5088],
- ["82D5",0x5089],
- ["82D6",0x508A],
- ["82D7",0x508B],
- ["82D8",0x508C],
- ["B0F8",0x508D],
- ["82D9",0x508E],
- ["82DA",0x508F],
- ["82DB",0x5090],
- ["82DC",0x5091],
- ["82DD",0x5092],
- ["82DE",0x5093],
- ["82DF",0x5094],
- ["82E0",0x5095],
- ["82E1",0x5096],
- ["82E2",0x5097],
- ["82E3",0x5098],
- ["82E4",0x5099],
- ["82E5",0x509A],
- ["82E6",0x509B],
- ["82E7",0x509C],
- ["82E8",0x509D],
- ["82E9",0x509E],
- ["82EA",0x509F],
- ["82EB",0x50A0],
- ["82EC",0x50A1],
- ["82ED",0x50A2],
- ["B4F6",0x50A3],
- ["82EE",0x50A4],
- ["D9CE",0x50A5],
- ["82EF",0x50A6],
- ["D9CF",0x50A7],
- ["B4A2",0x50A8],
- ["D9D0",0x50A9],
- ["82F0",0x50AA],
- ["82F1",0x50AB],
- ["B4DF",0x50AC],
- ["82F2",0x50AD],
- ["82F3",0x50AE],
- ["82F4",0x50AF],
- ["82F5",0x50B0],
- ["82F6",0x50B1],
- ["B0C1",0x50B2],
- ["82F7",0x50B3],
- ["82F8",0x50B4],
- ["82F9",0x50B5],
- ["82FA",0x50B6],
- ["82FB",0x50B7],
- ["82FC",0x50B8],
- ["82FD",0x50B9],
- ["D9D1",0x50BA],
- ["C9B5",0x50BB],
- ["82FE",0x50BC],
- ["8340",0x50BD],
- ["8341",0x50BE],
- ["8342",0x50BF],
- ["8343",0x50C0],
- ["8344",0x50C1],
- ["8345",0x50C2],
- ["8346",0x50C3],
- ["8347",0x50C4],
- ["8348",0x50C5],
- ["8349",0x50C6],
- ["834A",0x50C7],
- ["834B",0x50C8],
- ["834C",0x50C9],
- ["834D",0x50CA],
- ["834E",0x50CB],
- ["834F",0x50CC],
- ["8350",0x50CD],
- ["8351",0x50CE],
- ["CFF1",0x50CF],
- ["8352",0x50D0],
- ["8353",0x50D1],
- ["8354",0x50D2],
- ["8355",0x50D3],
- ["8356",0x50D4],
- ["8357",0x50D5],
- ["D9D2",0x50D6],
- ["8358",0x50D7],
- ["8359",0x50D8],
- ["835A",0x50D9],
- ["C1C5",0x50DA],
- ["835B",0x50DB],
- ["835C",0x50DC],
- ["835D",0x50DD],
- ["835E",0x50DE],
- ["835F",0x50DF],
- ["8360",0x50E0],
- ["8361",0x50E1],
- ["8362",0x50E2],
- ["8363",0x50E3],
- ["8364",0x50E4],
- ["8365",0x50E5],
- ["D9D6",0x50E6],
- ["C9AE",0x50E7],
- ["8366",0x50E8],
- ["8367",0x50E9],
- ["8368",0x50EA],
- ["8369",0x50EB],
- ["D9D5",0x50EC],
- ["D9D4",0x50ED],
- ["D9D7",0x50EE],
- ["836A",0x50EF],
- ["836B",0x50F0],
- ["836C",0x50F1],
- ["836D",0x50F2],
- ["CBDB",0x50F3],
- ["836E",0x50F4],
- ["BDA9",0x50F5],
- ["836F",0x50F6],
- ["8370",0x50F7],
- ["8371",0x50F8],
- ["8372",0x50F9],
- ["8373",0x50FA],
- ["C6A7",0x50FB],
- ["8374",0x50FC],
- ["8375",0x50FD],
- ["8376",0x50FE],
- ["8377",0x50FF],
- ["8378",0x5100],
- ["8379",0x5101],
- ["837A",0x5102],
- ["837B",0x5103],
- ["837C",0x5104],
- ["837D",0x5105],
- ["D9D3",0x5106],
- ["D9D8",0x5107],
- ["837E",0x5108],
- ["8380",0x5109],
- ["8381",0x510A],
- ["D9D9",0x510B],
- ["8382",0x510C],
- ["8383",0x510D],
- ["8384",0x510E],
- ["8385",0x510F],
- ["8386",0x5110],
- ["8387",0x5111],
- ["C8E5",0x5112],
- ["8388",0x5113],
- ["8389",0x5114],
- ["838A",0x5115],
- ["838B",0x5116],
- ["838C",0x5117],
- ["838D",0x5118],
- ["838E",0x5119],
- ["838F",0x511A],
- ["8390",0x511B],
- ["8391",0x511C],
- ["8392",0x511D],
- ["8393",0x511E],
- ["8394",0x511F],
- ["8395",0x5120],
- ["C0DC",0x5121],
- ["8396",0x5122],
- ["8397",0x5123],
- ["8398",0x5124],
- ["8399",0x5125],
- ["839A",0x5126],
- ["839B",0x5127],
- ["839C",0x5128],
- ["839D",0x5129],
- ["839E",0x512A],
- ["839F",0x512B],
- ["83A0",0x512C],
- ["83A1",0x512D],
- ["83A2",0x512E],
- ["83A3",0x512F],
- ["83A4",0x5130],
- ["83A5",0x5131],
- ["83A6",0x5132],
- ["83A7",0x5133],
- ["83A8",0x5134],
- ["83A9",0x5135],
- ["83AA",0x5136],
- ["83AB",0x5137],
- ["83AC",0x5138],
- ["83AD",0x5139],
- ["83AE",0x513A],
- ["83AF",0x513B],
- ["83B0",0x513C],
- ["83B1",0x513D],
- ["83B2",0x513E],
- ["B6F9",0x513F],
- ["D8A3",0x5140],
- ["D4CA",0x5141],
- ["83B3",0x5142],
- ["D4AA",0x5143],
- ["D0D6",0x5144],
- ["B3E4",0x5145],
- ["D5D7",0x5146],
- ["83B4",0x5147],
- ["CFC8",0x5148],
- ["B9E2",0x5149],
- ["83B5",0x514A],
- ["BFCB",0x514B],
- ["83B6",0x514C],
- ["C3E2",0x514D],
- ["83B7",0x514E],
- ["83B8",0x514F],
- ["83B9",0x5150],
- ["B6D2",0x5151],
- ["83BA",0x5152],
- ["83BB",0x5153],
- ["CDC3",0x5154],
- ["D9EE",0x5155],
- ["D9F0",0x5156],
- ["83BC",0x5157],
- ["83BD",0x5158],
- ["83BE",0x5159],
- ["B5B3",0x515A],
- ["83BF",0x515B],
- ["B6B5",0x515C],
- ["83C0",0x515D],
- ["83C1",0x515E],
- ["83C2",0x515F],
- ["83C3",0x5160],
- ["83C4",0x5161],
- ["BEA4",0x5162],
- ["83C5",0x5163],
- ["83C6",0x5164],
- ["C8EB",0x5165],
- ["83C7",0x5166],
- ["83C8",0x5167],
- ["C8AB",0x5168],
- ["83C9",0x5169],
- ["83CA",0x516A],
- ["B0CB",0x516B],
- ["B9AB",0x516C],
- ["C1F9",0x516D],
- ["D9E2",0x516E],
- ["83CB",0x516F],
- ["C0BC",0x5170],
- ["B9B2",0x5171],
- ["83CC",0x5172],
- ["B9D8",0x5173],
- ["D0CB",0x5174],
- ["B1F8",0x5175],
- ["C6E4",0x5176],
- ["BEDF",0x5177],
- ["B5E4",0x5178],
- ["D7C8",0x5179],
- ["83CD",0x517A],
- ["D1F8",0x517B],
- ["BCE6",0x517C],
- ["CADE",0x517D],
- ["83CE",0x517E],
- ["83CF",0x517F],
- ["BCBD",0x5180],
- ["D9E6",0x5181],
- ["D8E7",0x5182],
- ["83D0",0x5183],
- ["83D1",0x5184],
- ["C4DA",0x5185],
- ["83D2",0x5186],
- ["83D3",0x5187],
- ["B8D4",0x5188],
- ["C8BD",0x5189],
- ["83D4",0x518A],
- ["83D5",0x518B],
- ["B2E1",0x518C],
- ["D4D9",0x518D],
- ["83D6",0x518E],
- ["83D7",0x518F],
- ["83D8",0x5190],
- ["83D9",0x5191],
- ["C3B0",0x5192],
- ["83DA",0x5193],
- ["83DB",0x5194],
- ["C3E1",0x5195],
- ["DAA2",0x5196],
- ["C8DF",0x5197],
- ["83DC",0x5198],
- ["D0B4",0x5199],
- ["83DD",0x519A],
- ["BEFC",0x519B],
- ["C5A9",0x519C],
- ["83DE",0x519D],
- ["83DF",0x519E],
- ["83E0",0x519F],
- ["B9DA",0x51A0],
- ["83E1",0x51A1],
- ["DAA3",0x51A2],
- ["83E2",0x51A3],
- ["D4A9",0x51A4],
- ["DAA4",0x51A5],
- ["83E3",0x51A6],
- ["83E4",0x51A7],
- ["83E5",0x51A8],
- ["83E6",0x51A9],
- ["83E7",0x51AA],
- ["D9FB",0x51AB],
- ["B6AC",0x51AC],
- ["83E8",0x51AD],
- ["83E9",0x51AE],
- ["B7EB",0x51AF],
- ["B1F9",0x51B0],
- ["D9FC",0x51B1],
- ["B3E5",0x51B2],
- ["BEF6",0x51B3],
- ["83EA",0x51B4],
- ["BFF6",0x51B5],
- ["D2B1",0x51B6],
- ["C0E4",0x51B7],
- ["83EB",0x51B8],
- ["83EC",0x51B9],
- ["83ED",0x51BA],
- ["B6B3",0x51BB],
- ["D9FE",0x51BC],
- ["D9FD",0x51BD],
- ["83EE",0x51BE],
- ["83EF",0x51BF],
- ["BEBB",0x51C0],
- ["83F0",0x51C1],
- ["83F1",0x51C2],
- ["83F2",0x51C3],
- ["C6E0",0x51C4],
- ["83F3",0x51C5],
- ["D7BC",0x51C6],
- ["DAA1",0x51C7],
- ["83F4",0x51C8],
- ["C1B9",0x51C9],
- ["83F5",0x51CA],
- ["B5F2",0x51CB],
- ["C1E8",0x51CC],
- ["83F6",0x51CD],
- ["83F7",0x51CE],
- ["BCF5",0x51CF],
- ["83F8",0x51D0],
- ["B4D5",0x51D1],
- ["83F9",0x51D2],
- ["83FA",0x51D3],
- ["83FB",0x51D4],
- ["83FC",0x51D5],
- ["83FD",0x51D6],
- ["83FE",0x51D7],
- ["8440",0x51D8],
- ["8441",0x51D9],
- ["8442",0x51DA],
- ["C1DD",0x51DB],
- ["8443",0x51DC],
- ["C4FD",0x51DD],
- ["8444",0x51DE],
- ["8445",0x51DF],
- ["BCB8",0x51E0],
- ["B7B2",0x51E1],
- ["8446",0x51E2],
- ["8447",0x51E3],
- ["B7EF",0x51E4],
- ["8448",0x51E5],
- ["8449",0x51E6],
- ["844A",0x51E7],
- ["844B",0x51E8],
- ["844C",0x51E9],
- ["844D",0x51EA],
- ["D9EC",0x51EB],
- ["844E",0x51EC],
- ["C6BE",0x51ED],
- ["844F",0x51EE],
- ["BFAD",0x51EF],
- ["BBCB",0x51F0],
- ["8450",0x51F1],
- ["8451",0x51F2],
- ["B5CA",0x51F3],
- ["8452",0x51F4],
- ["DBC9",0x51F5],
- ["D0D7",0x51F6],
- ["8453",0x51F7],
- ["CDB9",0x51F8],
- ["B0BC",0x51F9],
- ["B3F6",0x51FA],
- ["BBF7",0x51FB],
- ["DBCA",0x51FC],
- ["BAAF",0x51FD],
- ["8454",0x51FE],
- ["D4E4",0x51FF],
- ["B5B6",0x5200],
- ["B5F3",0x5201],
- ["D8D6",0x5202],
- ["C8D0",0x5203],
- ["8455",0x5204],
- ["8456",0x5205],
- ["B7D6",0x5206],
- ["C7D0",0x5207],
- ["D8D7",0x5208],
- ["8457",0x5209],
- ["BFAF",0x520A],
- ["8458",0x520B],
- ["8459",0x520C],
- ["DBBB",0x520D],
- ["D8D8",0x520E],
- ["845A",0x520F],
- ["845B",0x5210],
- ["D0CC",0x5211],
- ["BBAE",0x5212],
- ["845C",0x5213],
- ["845D",0x5214],
- ["845E",0x5215],
- ["EBBE",0x5216],
- ["C1D0",0x5217],
- ["C1F5",0x5218],
- ["D4F2",0x5219],
- ["B8D5",0x521A],
- ["B4B4",0x521B],
- ["845F",0x521C],
- ["B3F5",0x521D],
- ["8460",0x521E],
- ["8461",0x521F],
- ["C9BE",0x5220],
- ["8462",0x5221],
- ["8463",0x5222],
- ["8464",0x5223],
- ["C5D0",0x5224],
- ["8465",0x5225],
- ["8466",0x5226],
- ["8467",0x5227],
- ["C5D9",0x5228],
- ["C0FB",0x5229],
- ["8468",0x522A],
- ["B1F0",0x522B],
- ["8469",0x522C],
- ["D8D9",0x522D],
- ["B9CE",0x522E],
- ["846A",0x522F],
- ["B5BD",0x5230],
- ["846B",0x5231],
- ["846C",0x5232],
- ["D8DA",0x5233],
- ["846D",0x5234],
- ["846E",0x5235],
- ["D6C6",0x5236],
- ["CBA2",0x5237],
- ["C8AF",0x5238],
- ["C9B2",0x5239],
- ["B4CC",0x523A],
- ["BFCC",0x523B],
- ["846F",0x523C],
- ["B9F4",0x523D],
- ["8470",0x523E],
- ["D8DB",0x523F],
- ["D8DC",0x5240],
- ["B6E7",0x5241],
- ["BCC1",0x5242],
- ["CCEA",0x5243],
- ["8471",0x5244],
- ["8472",0x5245],
- ["8473",0x5246],
- ["8474",0x5247],
- ["8475",0x5248],
- ["8476",0x5249],
- ["CFF7",0x524A],
- ["8477",0x524B],
- ["D8DD",0x524C],
- ["C7B0",0x524D],
- ["8478",0x524E],
- ["8479",0x524F],
- ["B9D0",0x5250],
- ["BDA3",0x5251],
- ["847A",0x5252],
- ["847B",0x5253],
- ["CCDE",0x5254],
- ["847C",0x5255],
- ["C6CA",0x5256],
- ["847D",0x5257],
- ["847E",0x5258],
- ["8480",0x5259],
- ["8481",0x525A],
- ["8482",0x525B],
- ["D8E0",0x525C],
- ["8483",0x525D],
- ["D8DE",0x525E],
- ["8484",0x525F],
- ["8485",0x5260],
- ["D8DF",0x5261],
- ["8486",0x5262],
- ["8487",0x5263],
- ["8488",0x5264],
- ["B0FE",0x5265],
- ["8489",0x5266],
- ["BEE7",0x5267],
- ["848A",0x5268],
- ["CAA3",0x5269],
- ["BCF4",0x526A],
- ["848B",0x526B],
- ["848C",0x526C],
- ["848D",0x526D],
- ["848E",0x526E],
- ["B8B1",0x526F],
- ["848F",0x5270],
- ["8490",0x5271],
- ["B8EE",0x5272],
- ["8491",0x5273],
- ["8492",0x5274],
- ["8493",0x5275],
- ["8494",0x5276],
- ["8495",0x5277],
- ["8496",0x5278],
- ["8497",0x5279],
- ["8498",0x527A],
- ["8499",0x527B],
- ["849A",0x527C],
- ["D8E2",0x527D],
- ["849B",0x527E],
- ["BDCB",0x527F],
- ["849C",0x5280],
- ["D8E4",0x5281],
- ["D8E3",0x5282],
- ["849D",0x5283],
- ["849E",0x5284],
- ["849F",0x5285],
- ["84A0",0x5286],
- ["84A1",0x5287],
- ["C5FC",0x5288],
- ["84A2",0x5289],
- ["84A3",0x528A],
- ["84A4",0x528B],
- ["84A5",0x528C],
- ["84A6",0x528D],
- ["84A7",0x528E],
- ["84A8",0x528F],
- ["D8E5",0x5290],
- ["84A9",0x5291],
- ["84AA",0x5292],
- ["D8E6",0x5293],
- ["84AB",0x5294],
- ["84AC",0x5295],
- ["84AD",0x5296],
- ["84AE",0x5297],
- ["84AF",0x5298],
- ["84B0",0x5299],
- ["84B1",0x529A],
- ["C1A6",0x529B],
- ["84B2",0x529C],
- ["C8B0",0x529D],
- ["B0EC",0x529E],
- ["B9A6",0x529F],
- ["BCD3",0x52A0],
- ["CEF1",0x52A1],
- ["DBBD",0x52A2],
- ["C1D3",0x52A3],
- ["84B3",0x52A4],
- ["84B4",0x52A5],
- ["84B5",0x52A6],
- ["84B6",0x52A7],
- ["B6AF",0x52A8],
- ["D6FA",0x52A9],
- ["C5AC",0x52AA],
- ["BDD9",0x52AB],
- ["DBBE",0x52AC],
- ["DBBF",0x52AD],
- ["84B7",0x52AE],
- ["84B8",0x52AF],
- ["84B9",0x52B0],
- ["C0F8",0x52B1],
- ["BEA2",0x52B2],
- ["C0CD",0x52B3],
- ["84BA",0x52B4],
- ["84BB",0x52B5],
- ["84BC",0x52B6],
- ["84BD",0x52B7],
- ["84BE",0x52B8],
- ["84BF",0x52B9],
- ["84C0",0x52BA],
- ["84C1",0x52BB],
- ["84C2",0x52BC],
- ["84C3",0x52BD],
- ["DBC0",0x52BE],
- ["CAC6",0x52BF],
- ["84C4",0x52C0],
- ["84C5",0x52C1],
- ["84C6",0x52C2],
- ["B2AA",0x52C3],
- ["84C7",0x52C4],
- ["84C8",0x52C5],
- ["84C9",0x52C6],
- ["D3C2",0x52C7],
- ["84CA",0x52C8],
- ["C3E3",0x52C9],
- ["84CB",0x52CA],
- ["D1AB",0x52CB],
- ["84CC",0x52CC],
- ["84CD",0x52CD],
- ["84CE",0x52CE],
- ["84CF",0x52CF],
- ["DBC2",0x52D0],
- ["84D0",0x52D1],
- ["C0D5",0x52D2],
- ["84D1",0x52D3],
- ["84D2",0x52D4],
- ["84D3",0x52D5],
- ["DBC3",0x52D6],
- ["84D4",0x52D7],
- ["BFB1",0x52D8],
- ["84D5",0x52D9],
- ["84D6",0x52DA],
- ["84D7",0x52DB],
- ["84D8",0x52DC],
- ["84D9",0x52DD],
- ["84DA",0x52DE],
- ["C4BC",0x52DF],
- ["84DB",0x52E0],
- ["84DC",0x52E1],
- ["84DD",0x52E2],
- ["84DE",0x52E3],
- ["C7DA",0x52E4],
- ["84DF",0x52E5],
- ["84E0",0x52E6],
- ["84E1",0x52E7],
- ["84E2",0x52E8],
- ["84E3",0x52E9],
- ["84E4",0x52EA],
- ["84E5",0x52EB],
- ["84E6",0x52EC],
- ["84E7",0x52ED],
- ["84E8",0x52EE],
- ["84E9",0x52EF],
- ["DBC4",0x52F0],
- ["84EA",0x52F1],
- ["84EB",0x52F2],
- ["84EC",0x52F3],
- ["84ED",0x52F4],
- ["84EE",0x52F5],
- ["84EF",0x52F6],
- ["84F0",0x52F7],
- ["84F1",0x52F8],
- ["D9E8",0x52F9],
- ["C9D7",0x52FA],
- ["84F2",0x52FB],
- ["84F3",0x52FC],
- ["84F4",0x52FD],
- ["B9B4",0x52FE],
- ["CEF0",0x52FF],
- ["D4C8",0x5300],
- ["84F5",0x5301],
- ["84F6",0x5302],
- ["84F7",0x5303],
- ["84F8",0x5304],
- ["B0FC",0x5305],
- ["B4D2",0x5306],
- ["84F9",0x5307],
- ["D0D9",0x5308],
- ["84FA",0x5309],
- ["84FB",0x530A],
- ["84FC",0x530B],
- ["84FD",0x530C],
- ["D9E9",0x530D],
- ["84FE",0x530E],
- ["DECB",0x530F],
- ["D9EB",0x5310],
- ["8540",0x5311],
- ["8541",0x5312],
- ["8542",0x5313],
- ["8543",0x5314],
- ["D8B0",0x5315],
- ["BBAF",0x5316],
- ["B1B1",0x5317],
- ["8544",0x5318],
- ["B3D7",0x5319],
- ["D8CE",0x531A],
- ["8545",0x531B],
- ["8546",0x531C],
- ["D4D1",0x531D],
- ["8547",0x531E],
- ["8548",0x531F],
- ["BDB3",0x5320],
- ["BFEF",0x5321],
- ["8549",0x5322],
- ["CFBB",0x5323],
- ["854A",0x5324],
- ["854B",0x5325],
- ["D8D0",0x5326],
- ["854C",0x5327],
- ["854D",0x5328],
- ["854E",0x5329],
- ["B7CB",0x532A],
- ["854F",0x532B],
- ["8550",0x532C],
- ["8551",0x532D],
- ["D8D1",0x532E],
- ["8552",0x532F],
- ["8553",0x5330],
- ["8554",0x5331],
- ["8555",0x5332],
- ["8556",0x5333],
- ["8557",0x5334],
- ["8558",0x5335],
- ["8559",0x5336],
- ["855A",0x5337],
- ["855B",0x5338],
- ["C6A5",0x5339],
- ["C7F8",0x533A],
- ["D2BD",0x533B],
- ["855C",0x533C],
- ["855D",0x533D],
- ["D8D2",0x533E],
- ["C4E4",0x533F],
- ["855E",0x5340],
- ["CAAE",0x5341],
- ["855F",0x5342],
- ["C7A7",0x5343],
- ["8560",0x5344],
- ["D8A6",0x5345],
- ["8561",0x5346],
- ["C9FD",0x5347],
- ["CEE7",0x5348],
- ["BBDC",0x5349],
- ["B0EB",0x534A],
- ["8562",0x534B],
- ["8563",0x534C],
- ["8564",0x534D],
- ["BBAA",0x534E],
- ["D0AD",0x534F],
- ["8565",0x5350],
- ["B1B0",0x5351],
- ["D7E4",0x5352],
- ["D7BF",0x5353],
- ["8566",0x5354],
- ["B5A5",0x5355],
- ["C2F4",0x5356],
- ["C4CF",0x5357],
- ["8567",0x5358],
- ["8568",0x5359],
- ["B2A9",0x535A],
- ["8569",0x535B],
- ["B2B7",0x535C],
- ["856A",0x535D],
- ["B1E5",0x535E],
- ["DFB2",0x535F],
- ["D5BC",0x5360],
- ["BFA8",0x5361],
- ["C2AC",0x5362],
- ["D8D5",0x5363],
- ["C2B1",0x5364],
- ["856B",0x5365],
- ["D8D4",0x5366],
- ["CED4",0x5367],
- ["856C",0x5368],
- ["DAE0",0x5369],
- ["856D",0x536A],
- ["CEC0",0x536B],
- ["856E",0x536C],
- ["856F",0x536D],
- ["D8B4",0x536E],
- ["C3AE",0x536F],
- ["D3A1",0x5370],
- ["CEA3",0x5371],
- ["8570",0x5372],
- ["BCB4",0x5373],
- ["C8B4",0x5374],
- ["C2D1",0x5375],
- ["8571",0x5376],
- ["BEED",0x5377],
- ["D0B6",0x5378],
- ["8572",0x5379],
- ["DAE1",0x537A],
- ["8573",0x537B],
- ["8574",0x537C],
- ["8575",0x537D],
- ["8576",0x537E],
- ["C7E4",0x537F],
- ["8577",0x5380],
- ["8578",0x5381],
- ["B3A7",0x5382],
- ["8579",0x5383],
- ["B6F2",0x5384],
- ["CCFC",0x5385],
- ["C0FA",0x5386],
- ["857A",0x5387],
- ["857B",0x5388],
- ["C0F7",0x5389],
- ["857C",0x538A],
- ["D1B9",0x538B],
- ["D1E1",0x538C],
- ["D8C7",0x538D],
- ["857D",0x538E],
- ["857E",0x538F],
- ["8580",0x5390],
- ["8581",0x5391],
- ["8582",0x5392],
- ["8583",0x5393],
- ["8584",0x5394],
- ["B2DE",0x5395],
- ["8585",0x5396],
- ["8586",0x5397],
- ["C0E5",0x5398],
- ["8587",0x5399],
- ["BAF1",0x539A],
- ["8588",0x539B],
- ["8589",0x539C],
- ["D8C8",0x539D],
- ["858A",0x539E],
- ["D4AD",0x539F],
- ["858B",0x53A0],
- ["858C",0x53A1],
- ["CFE1",0x53A2],
- ["D8C9",0x53A3],
- ["858D",0x53A4],
- ["D8CA",0x53A5],
- ["CFC3",0x53A6],
- ["858E",0x53A7],
- ["B3F8",0x53A8],
- ["BEC7",0x53A9],
- ["858F",0x53AA],
- ["8590",0x53AB],
- ["8591",0x53AC],
- ["8592",0x53AD],
- ["D8CB",0x53AE],
- ["8593",0x53AF],
- ["8594",0x53B0],
- ["8595",0x53B1],
- ["8596",0x53B2],
- ["8597",0x53B3],
- ["8598",0x53B4],
- ["8599",0x53B5],
- ["DBCC",0x53B6],
- ["859A",0x53B7],
- ["859B",0x53B8],
- ["859C",0x53B9],
- ["859D",0x53BA],
- ["C8A5",0x53BB],
- ["859E",0x53BC],
- ["859F",0x53BD],
- ["85A0",0x53BE],
- ["CFD8",0x53BF],
- ["85A1",0x53C0],
- ["C8FE",0x53C1],
- ["B2CE",0x53C2],
- ["85A2",0x53C3],
- ["85A3",0x53C4],
- ["85A4",0x53C5],
- ["85A5",0x53C6],
- ["85A6",0x53C7],
- ["D3D6",0x53C8],
- ["B2E6",0x53C9],
- ["BCB0",0x53CA],
- ["D3D1",0x53CB],
- ["CBAB",0x53CC],
- ["B7B4",0x53CD],
- ["85A7",0x53CE],
- ["85A8",0x53CF],
- ["85A9",0x53D0],
- ["B7A2",0x53D1],
- ["85AA",0x53D2],
- ["85AB",0x53D3],
- ["CAE5",0x53D4],
- ["85AC",0x53D5],
- ["C8A1",0x53D6],
- ["CADC",0x53D7],
- ["B1E4",0x53D8],
- ["D0F0",0x53D9],
- ["85AD",0x53DA],
- ["C5D1",0x53DB],
- ["85AE",0x53DC],
- ["85AF",0x53DD],
- ["85B0",0x53DE],
- ["DBC5",0x53DF],
- ["B5FE",0x53E0],
- ["85B1",0x53E1],
- ["85B2",0x53E2],
- ["BFDA",0x53E3],
- ["B9C5",0x53E4],
- ["BEE4",0x53E5],
- ["C1ED",0x53E6],
- ["85B3",0x53E7],
- ["DFB6",0x53E8],
- ["DFB5",0x53E9],
- ["D6BB",0x53EA],
- ["BDD0",0x53EB],
- ["D5D9",0x53EC],
- ["B0C8",0x53ED],
- ["B6A3",0x53EE],
- ["BFC9",0x53EF],
- ["CCA8",0x53F0],
- ["DFB3",0x53F1],
- ["CAB7",0x53F2],
- ["D3D2",0x53F3],
- ["85B4",0x53F4],
- ["D8CF",0x53F5],
- ["D2B6",0x53F6],
- ["BAC5",0x53F7],
- ["CBBE",0x53F8],
- ["CCBE",0x53F9],
- ["85B5",0x53FA],
- ["DFB7",0x53FB],
- ["B5F0",0x53FC],
- ["DFB4",0x53FD],
- ["85B6",0x53FE],
- ["85B7",0x53FF],
- ["85B8",0x5400],
- ["D3F5",0x5401],
- ["85B9",0x5402],
- ["B3D4",0x5403],
- ["B8F7",0x5404],
- ["85BA",0x5405],
- ["DFBA",0x5406],
- ["85BB",0x5407],
- ["BACF",0x5408],
- ["BCAA",0x5409],
- ["B5F5",0x540A],
- ["85BC",0x540B],
- ["CDAC",0x540C],
- ["C3FB",0x540D],
- ["BAF3",0x540E],
- ["C0F4",0x540F],
- ["CDC2",0x5410],
- ["CFF2",0x5411],
- ["DFB8",0x5412],
- ["CFC5",0x5413],
- ["85BD",0x5414],
- ["C2C0",0x5415],
- ["DFB9",0x5416],
- ["C2F0",0x5417],
- ["85BE",0x5418],
- ["85BF",0x5419],
- ["85C0",0x541A],
- ["BEFD",0x541B],
- ["85C1",0x541C],
- ["C1DF",0x541D],
- ["CDCC",0x541E],
- ["D2F7",0x541F],
- ["B7CD",0x5420],
- ["DFC1",0x5421],
- ["85C2",0x5422],
- ["DFC4",0x5423],
- ["85C3",0x5424],
- ["85C4",0x5425],
- ["B7F1",0x5426],
- ["B0C9",0x5427],
- ["B6D6",0x5428],
- ["B7D4",0x5429],
- ["85C5",0x542A],
- ["BAAC",0x542B],
- ["CCFD",0x542C],
- ["BFD4",0x542D],
- ["CBB1",0x542E],
- ["C6F4",0x542F],
- ["85C6",0x5430],
- ["D6A8",0x5431],
- ["DFC5",0x5432],
- ["85C7",0x5433],
- ["CEE2",0x5434],
- ["B3B3",0x5435],
- ["85C8",0x5436],
- ["85C9",0x5437],
- ["CEFC",0x5438],
- ["B4B5",0x5439],
- ["85CA",0x543A],
- ["CEC7",0x543B],
- ["BAF0",0x543C],
- ["85CB",0x543D],
- ["CEE1",0x543E],
- ["85CC",0x543F],
- ["D1BD",0x5440],
- ["85CD",0x5441],
- ["85CE",0x5442],
- ["DFC0",0x5443],
- ["85CF",0x5444],
- ["85D0",0x5445],
- ["B4F4",0x5446],
- ["85D1",0x5447],
- ["B3CA",0x5448],
- ["85D2",0x5449],
- ["B8E6",0x544A],
- ["DFBB",0x544B],
- ["85D3",0x544C],
- ["85D4",0x544D],
- ["85D5",0x544E],
- ["85D6",0x544F],
- ["C4C5",0x5450],
- ["85D7",0x5451],
- ["DFBC",0x5452],
- ["DFBD",0x5453],
- ["DFBE",0x5454],
- ["C5BB",0x5455],
- ["DFBF",0x5456],
- ["DFC2",0x5457],
- ["D4B1",0x5458],
- ["DFC3",0x5459],
- ["85D8",0x545A],
- ["C7BA",0x545B],
- ["CED8",0x545C],
- ["85D9",0x545D],
- ["85DA",0x545E],
- ["85DB",0x545F],
- ["85DC",0x5460],
- ["85DD",0x5461],
- ["C4D8",0x5462],
- ["85DE",0x5463],
- ["DFCA",0x5464],
- ["85DF",0x5465],
- ["DFCF",0x5466],
- ["85E0",0x5467],
- ["D6DC",0x5468],
- ["85E1",0x5469],
- ["85E2",0x546A],
- ["85E3",0x546B],
- ["85E4",0x546C],
- ["85E5",0x546D],
- ["85E6",0x546E],
- ["85E7",0x546F],
- ["85E8",0x5470],
- ["DFC9",0x5471],
- ["DFDA",0x5472],
- ["CEB6",0x5473],
- ["85E9",0x5474],
- ["BAC7",0x5475],
- ["DFCE",0x5476],
- ["DFC8",0x5477],
- ["C5DE",0x5478],
- ["85EA",0x5479],
- ["85EB",0x547A],
- ["C9EB",0x547B],
- ["BAF4",0x547C],
- ["C3FC",0x547D],
- ["85EC",0x547E],
- ["85ED",0x547F],
- ["BED7",0x5480],
- ["85EE",0x5481],
- ["DFC6",0x5482],
- ["85EF",0x5483],
- ["DFCD",0x5484],
- ["85F0",0x5485],
- ["C5D8",0x5486],
- ["85F1",0x5487],
- ["85F2",0x5488],
- ["85F3",0x5489],
- ["85F4",0x548A],
- ["D5A6",0x548B],
- ["BACD",0x548C],
- ["85F5",0x548D],
- ["BECC",0x548E],
- ["D3BD",0x548F],
- ["B8C0",0x5490],
- ["85F6",0x5491],
- ["D6E4",0x5492],
- ["85F7",0x5493],
- ["DFC7",0x5494],
- ["B9BE",0x5495],
- ["BFA7",0x5496],
- ["85F8",0x5497],
- ["85F9",0x5498],
- ["C1FC",0x5499],
- ["DFCB",0x549A],
- ["DFCC",0x549B],
- ["85FA",0x549C],
- ["DFD0",0x549D],
- ["85FB",0x549E],
- ["85FC",0x549F],
- ["85FD",0x54A0],
- ["85FE",0x54A1],
- ["8640",0x54A2],
- ["DFDB",0x54A3],
- ["DFE5",0x54A4],
- ["8641",0x54A5],
- ["DFD7",0x54A6],
- ["DFD6",0x54A7],
- ["D7C9",0x54A8],
- ["DFE3",0x54A9],
- ["DFE4",0x54AA],
- ["E5EB",0x54AB],
- ["D2A7",0x54AC],
- ["DFD2",0x54AD],
- ["8642",0x54AE],
- ["BFA9",0x54AF],
- ["8643",0x54B0],
- ["D4DB",0x54B1],
- ["8644",0x54B2],
- ["BFC8",0x54B3],
- ["DFD4",0x54B4],
- ["8645",0x54B5],
- ["8646",0x54B6],
- ["8647",0x54B7],
- ["CFCC",0x54B8],
- ["8648",0x54B9],
- ["8649",0x54BA],
- ["DFDD",0x54BB],
- ["864A",0x54BC],
- ["D1CA",0x54BD],
- ["864B",0x54BE],
- ["DFDE",0x54BF],
- ["B0A7",0x54C0],
- ["C6B7",0x54C1],
- ["DFD3",0x54C2],
- ["864C",0x54C3],
- ["BAE5",0x54C4],
- ["864D",0x54C5],
- ["B6DF",0x54C6],
- ["CDDB",0x54C7],
- ["B9FE",0x54C8],
- ["D4D5",0x54C9],
- ["864E",0x54CA],
- ["864F",0x54CB],
- ["DFDF",0x54CC],
- ["CFEC",0x54CD],
- ["B0A5",0x54CE],
- ["DFE7",0x54CF],
- ["DFD1",0x54D0],
- ["D1C6",0x54D1],
- ["DFD5",0x54D2],
- ["DFD8",0x54D3],
- ["DFD9",0x54D4],
- ["DFDC",0x54D5],
- ["8650",0x54D6],
- ["BBA9",0x54D7],
- ["8651",0x54D8],
- ["DFE0",0x54D9],
- ["DFE1",0x54DA],
- ["8652",0x54DB],
- ["DFE2",0x54DC],
- ["DFE6",0x54DD],
- ["DFE8",0x54DE],
- ["D3B4",0x54DF],
- ["8653",0x54E0],
- ["8654",0x54E1],
- ["8655",0x54E2],
- ["8656",0x54E3],
- ["8657",0x54E4],
- ["B8E7",0x54E5],
- ["C5B6",0x54E6],
- ["DFEA",0x54E7],
- ["C9DA",0x54E8],
- ["C1A8",0x54E9],
- ["C4C4",0x54EA],
- ["8658",0x54EB],
- ["8659",0x54EC],
- ["BFDE",0x54ED],
- ["CFF8",0x54EE],
- ["865A",0x54EF],
- ["865B",0x54F0],
- ["865C",0x54F1],
- ["D5DC",0x54F2],
- ["DFEE",0x54F3],
- ["865D",0x54F4],
- ["865E",0x54F5],
- ["865F",0x54F6],
- ["8660",0x54F7],
- ["8661",0x54F8],
- ["8662",0x54F9],
- ["B2B8",0x54FA],
- ["8663",0x54FB],
- ["BADF",0x54FC],
- ["DFEC",0x54FD],
- ["8664",0x54FE],
- ["DBC1",0x54FF],
- ["8665",0x5500],
- ["D1E4",0x5501],
- ["8666",0x5502],
- ["8667",0x5503],
- ["8668",0x5504],
- ["8669",0x5505],
- ["CBF4",0x5506],
- ["B4BD",0x5507],
- ["866A",0x5508],
- ["B0A6",0x5509],
- ["866B",0x550A],
- ["866C",0x550B],
- ["866D",0x550C],
- ["866E",0x550D],
- ["866F",0x550E],
- ["DFF1",0x550F],
- ["CCC6",0x5510],
- ["DFF2",0x5511],
- ["8670",0x5512],
- ["8671",0x5513],
- ["DFED",0x5514],
- ["8672",0x5515],
- ["8673",0x5516],
- ["8674",0x5517],
- ["8675",0x5518],
- ["8676",0x5519],
- ["8677",0x551A],
- ["DFE9",0x551B],
- ["8678",0x551C],
- ["8679",0x551D],
- ["867A",0x551E],
- ["867B",0x551F],
- ["DFEB",0x5520],
- ["867C",0x5521],
- ["DFEF",0x5522],
- ["DFF0",0x5523],
- ["BBBD",0x5524],
- ["867D",0x5525],
- ["867E",0x5526],
- ["DFF3",0x5527],
- ["8680",0x5528],
- ["8681",0x5529],
- ["DFF4",0x552A],
- ["8682",0x552B],
- ["BBA3",0x552C],
- ["8683",0x552D],
- ["CADB",0x552E],
- ["CEA8",0x552F],
- ["E0A7",0x5530],
- ["B3AA",0x5531],
- ["8684",0x5532],
- ["E0A6",0x5533],
- ["8685",0x5534],
- ["8686",0x5535],
- ["8687",0x5536],
- ["E0A1",0x5537],
- ["8688",0x5538],
- ["8689",0x5539],
- ["868A",0x553A],
- ["868B",0x553B],
- ["DFFE",0x553C],
- ["868C",0x553D],
- ["CDD9",0x553E],
- ["DFFC",0x553F],
- ["868D",0x5540],
- ["DFFA",0x5541],
- ["868E",0x5542],
- ["BFD0",0x5543],
- ["D7C4",0x5544],
- ["868F",0x5545],
- ["C9CC",0x5546],
- ["8690",0x5547],
- ["8691",0x5548],
- ["DFF8",0x5549],
- ["B0A1",0x554A],
- ["8692",0x554B],
- ["8693",0x554C],
- ["8694",0x554D],
- ["8695",0x554E],
- ["8696",0x554F],
- ["DFFD",0x5550],
- ["8697",0x5551],
- ["8698",0x5552],
- ["8699",0x5553],
- ["869A",0x5554],
- ["DFFB",0x5555],
- ["E0A2",0x5556],
- ["869B",0x5557],
- ["869C",0x5558],
- ["869D",0x5559],
- ["869E",0x555A],
- ["869F",0x555B],
- ["E0A8",0x555C],
- ["86A0",0x555D],
- ["86A1",0x555E],
- ["86A2",0x555F],
- ["86A3",0x5560],
- ["B7C8",0x5561],
- ["86A4",0x5562],
- ["86A5",0x5563],
- ["C6A1",0x5564],
- ["C9B6",0x5565],
- ["C0B2",0x5566],
- ["DFF5",0x5567],
- ["86A6",0x5568],
- ["86A7",0x5569],
- ["C5BE",0x556A],
- ["86A8",0x556B],
- ["D8C4",0x556C],
- ["DFF9",0x556D],
- ["C4F6",0x556E],
- ["86A9",0x556F],
- ["86AA",0x5570],
- ["86AB",0x5571],
- ["86AC",0x5572],
- ["86AD",0x5573],
- ["86AE",0x5574],
- ["E0A3",0x5575],
- ["E0A4",0x5576],
- ["E0A5",0x5577],
- ["D0A5",0x5578],
- ["86AF",0x5579],
- ["86B0",0x557A],
- ["E0B4",0x557B],
- ["CCE4",0x557C],
- ["86B1",0x557D],
- ["E0B1",0x557E],
- ["86B2",0x557F],
- ["BFA6",0x5580],
- ["E0AF",0x5581],
- ["CEB9",0x5582],
- ["E0AB",0x5583],
- ["C9C6",0x5584],
- ["86B3",0x5585],
- ["86B4",0x5586],
- ["C0AE",0x5587],
- ["E0AE",0x5588],
- ["BAED",0x5589],
- ["BAB0",0x558A],
- ["E0A9",0x558B],
- ["86B5",0x558C],
- ["86B6",0x558D],
- ["86B7",0x558E],
- ["DFF6",0x558F],
- ["86B8",0x5590],
- ["E0B3",0x5591],
- ["86B9",0x5592],
- ["86BA",0x5593],
- ["E0B8",0x5594],
- ["86BB",0x5595],
- ["86BC",0x5596],
- ["86BD",0x5597],
- ["B4AD",0x5598],
- ["E0B9",0x5599],
- ["86BE",0x559A],
- ["86BF",0x559B],
- ["CFB2",0x559C],
- ["BAC8",0x559D],
- ["86C0",0x559E],
- ["E0B0",0x559F],
- ["86C1",0x55A0],
- ["86C2",0x55A1],
- ["86C3",0x55A2],
- ["86C4",0x55A3],
- ["86C5",0x55A4],
- ["86C6",0x55A5],
- ["86C7",0x55A6],
- ["D0FA",0x55A7],
- ["86C8",0x55A8],
- ["86C9",0x55A9],
- ["86CA",0x55AA],
- ["86CB",0x55AB],
- ["86CC",0x55AC],
- ["86CD",0x55AD],
- ["86CE",0x55AE],
- ["86CF",0x55AF],
- ["86D0",0x55B0],
- ["E0AC",0x55B1],
- ["86D1",0x55B2],
- ["D4FB",0x55B3],
- ["86D2",0x55B4],
- ["DFF7",0x55B5],
- ["86D3",0x55B6],
- ["C5E7",0x55B7],
- ["86D4",0x55B8],
- ["E0AD",0x55B9],
- ["86D5",0x55BA],
- ["D3F7",0x55BB],
- ["86D6",0x55BC],
- ["E0B6",0x55BD],
- ["E0B7",0x55BE],
- ["86D7",0x55BF],
- ["86D8",0x55C0],
- ["86D9",0x55C1],
- ["86DA",0x55C2],
- ["86DB",0x55C3],
- ["E0C4",0x55C4],
- ["D0E1",0x55C5],
- ["86DC",0x55C6],
- ["86DD",0x55C7],
- ["86DE",0x55C8],
- ["E0BC",0x55C9],
- ["86DF",0x55CA],
- ["86E0",0x55CB],
- ["E0C9",0x55CC],
- ["E0CA",0x55CD],
- ["86E1",0x55CE],
- ["86E2",0x55CF],
- ["86E3",0x55D0],
- ["E0BE",0x55D1],
- ["E0AA",0x55D2],
- ["C9A4",0x55D3],
- ["E0C1",0x55D4],
- ["86E4",0x55D5],
- ["E0B2",0x55D6],
- ["86E5",0x55D7],
- ["86E6",0x55D8],
- ["86E7",0x55D9],
- ["86E8",0x55DA],
- ["86E9",0x55DB],
- ["CAC8",0x55DC],
- ["E0C3",0x55DD],
- ["86EA",0x55DE],
- ["E0B5",0x55DF],
- ["86EB",0x55E0],
- ["CECB",0x55E1],
- ["86EC",0x55E2],
- ["CBC3",0x55E3],
- ["E0CD",0x55E4],
- ["E0C6",0x55E5],
- ["E0C2",0x55E6],
- ["86ED",0x55E7],
- ["E0CB",0x55E8],
- ["86EE",0x55E9],
- ["E0BA",0x55EA],
- ["E0BF",0x55EB],
- ["E0C0",0x55EC],
- ["86EF",0x55ED],
- ["86F0",0x55EE],
- ["E0C5",0x55EF],
- ["86F1",0x55F0],
- ["86F2",0x55F1],
- ["E0C7",0x55F2],
- ["E0C8",0x55F3],
- ["86F3",0x55F4],
- ["E0CC",0x55F5],
- ["86F4",0x55F6],
- ["E0BB",0x55F7],
- ["86F5",0x55F8],
- ["86F6",0x55F9],
- ["86F7",0x55FA],
- ["86F8",0x55FB],
- ["86F9",0x55FC],
- ["CBD4",0x55FD],
- ["E0D5",0x55FE],
- ["86FA",0x55FF],
- ["E0D6",0x5600],
- ["E0D2",0x5601],
- ["86FB",0x5602],
- ["86FC",0x5603],
- ["86FD",0x5604],
- ["86FE",0x5605],
- ["8740",0x5606],
- ["8741",0x5607],
- ["E0D0",0x5608],
- ["BCCE",0x5609],
- ["8742",0x560A],
- ["8743",0x560B],
- ["E0D1",0x560C],
- ["8744",0x560D],
- ["B8C2",0x560E],
- ["D8C5",0x560F],
- ["8745",0x5610],
- ["8746",0x5611],
- ["8747",0x5612],
- ["8748",0x5613],
- ["8749",0x5614],
- ["874A",0x5615],
- ["874B",0x5616],
- ["874C",0x5617],
- ["D0EA",0x5618],
- ["874D",0x5619],
- ["874E",0x561A],
- ["C2EF",0x561B],
- ["874F",0x561C],
- ["8750",0x561D],
- ["E0CF",0x561E],
- ["E0BD",0x561F],
- ["8751",0x5620],
- ["8752",0x5621],
- ["8753",0x5622],
- ["E0D4",0x5623],
- ["E0D3",0x5624],
- ["8754",0x5625],
- ["8755",0x5626],
- ["E0D7",0x5627],
- ["8756",0x5628],
- ["8757",0x5629],
- ["8758",0x562A],
- ["8759",0x562B],
- ["E0DC",0x562C],
- ["E0D8",0x562D],
- ["875A",0x562E],
- ["875B",0x562F],
- ["875C",0x5630],
- ["D6F6",0x5631],
- ["B3B0",0x5632],
- ["875D",0x5633],
- ["D7EC",0x5634],
- ["875E",0x5635],
- ["CBBB",0x5636],
- ["875F",0x5637],
- ["8760",0x5638],
- ["E0DA",0x5639],
- ["8761",0x563A],
- ["CEFB",0x563B],
- ["8762",0x563C],
- ["8763",0x563D],
- ["8764",0x563E],
- ["BAD9",0x563F],
- ["8765",0x5640],
- ["8766",0x5641],
- ["8767",0x5642],
- ["8768",0x5643],
- ["8769",0x5644],
- ["876A",0x5645],
- ["876B",0x5646],
- ["876C",0x5647],
- ["876D",0x5648],
- ["876E",0x5649],
- ["876F",0x564A],
- ["8770",0x564B],
- ["E0E1",0x564C],
- ["E0DD",0x564D],
- ["D2AD",0x564E],
- ["8771",0x564F],
- ["8772",0x5650],
- ["8773",0x5651],
- ["8774",0x5652],
- ["8775",0x5653],
- ["E0E2",0x5654],
- ["8776",0x5655],
- ["8777",0x5656],
- ["E0DB",0x5657],
- ["E0D9",0x5658],
- ["E0DF",0x5659],
- ["8778",0x565A],
- ["8779",0x565B],
- ["E0E0",0x565C],
- ["877A",0x565D],
- ["877B",0x565E],
- ["877C",0x565F],
- ["877D",0x5660],
- ["877E",0x5661],
- ["E0DE",0x5662],
- ["8780",0x5663],
- ["E0E4",0x5664],
- ["8781",0x5665],
- ["8782",0x5666],
- ["8783",0x5667],
- ["C6F7",0x5668],
- ["D8AC",0x5669],
- ["D4EB",0x566A],
- ["E0E6",0x566B],
- ["CAC9",0x566C],
- ["8784",0x566D],
- ["8785",0x566E],
- ["8786",0x566F],
- ["8787",0x5670],
- ["E0E5",0x5671],
- ["8788",0x5672],
- ["8789",0x5673],
- ["878A",0x5674],
- ["878B",0x5675],
- ["B8C1",0x5676],
- ["878C",0x5677],
- ["878D",0x5678],
- ["878E",0x5679],
- ["878F",0x567A],
- ["E0E7",0x567B],
- ["E0E8",0x567C],
- ["8790",0x567D],
- ["8791",0x567E],
- ["8792",0x567F],
- ["8793",0x5680],
- ["8794",0x5681],
- ["8795",0x5682],
- ["8796",0x5683],
- ["8797",0x5684],
- ["E0E9",0x5685],
- ["E0E3",0x5686],
- ["8798",0x5687],
- ["8799",0x5688],
- ["879A",0x5689],
- ["879B",0x568A],
- ["879C",0x568B],
- ["879D",0x568C],
- ["879E",0x568D],
- ["BABF",0x568E],
- ["CCE7",0x568F],
- ["879F",0x5690],
- ["87A0",0x5691],
- ["87A1",0x5692],
- ["E0EA",0x5693],
- ["87A2",0x5694],
- ["87A3",0x5695],
- ["87A4",0x5696],
- ["87A5",0x5697],
- ["87A6",0x5698],
- ["87A7",0x5699],
- ["87A8",0x569A],
- ["87A9",0x569B],
- ["87AA",0x569C],
- ["87AB",0x569D],
- ["87AC",0x569E],
- ["87AD",0x569F],
- ["87AE",0x56A0],
- ["87AF",0x56A1],
- ["87B0",0x56A2],
- ["CFF9",0x56A3],
- ["87B1",0x56A4],
- ["87B2",0x56A5],
- ["87B3",0x56A6],
- ["87B4",0x56A7],
- ["87B5",0x56A8],
- ["87B6",0x56A9],
- ["87B7",0x56AA],
- ["87B8",0x56AB],
- ["87B9",0x56AC],
- ["87BA",0x56AD],
- ["87BB",0x56AE],
- ["E0EB",0x56AF],
- ["87BC",0x56B0],
- ["87BD",0x56B1],
- ["87BE",0x56B2],
- ["87BF",0x56B3],
- ["87C0",0x56B4],
- ["87C1",0x56B5],
- ["87C2",0x56B6],
- ["C8C2",0x56B7],
- ["87C3",0x56B8],
- ["87C4",0x56B9],
- ["87C5",0x56BA],
- ["87C6",0x56BB],
- ["BDC0",0x56BC],
- ["87C7",0x56BD],
- ["87C8",0x56BE],
- ["87C9",0x56BF],
- ["87CA",0x56C0],
- ["87CB",0x56C1],
- ["87CC",0x56C2],
- ["87CD",0x56C3],
- ["87CE",0x56C4],
- ["87CF",0x56C5],
- ["87D0",0x56C6],
- ["87D1",0x56C7],
- ["87D2",0x56C8],
- ["87D3",0x56C9],
- ["C4D2",0x56CA],
- ["87D4",0x56CB],
- ["87D5",0x56CC],
- ["87D6",0x56CD],
- ["87D7",0x56CE],
- ["87D8",0x56CF],
- ["87D9",0x56D0],
- ["87DA",0x56D1],
- ["87DB",0x56D2],
- ["87DC",0x56D3],
- ["E0EC",0x56D4],
- ["87DD",0x56D5],
- ["87DE",0x56D6],
- ["E0ED",0x56D7],
- ["87DF",0x56D8],
- ["87E0",0x56D9],
- ["C7F4",0x56DA],
- ["CBC4",0x56DB],
- ["87E1",0x56DC],
- ["E0EE",0x56DD],
- ["BBD8",0x56DE],
- ["D8B6",0x56DF],
- ["D2F2",0x56E0],
- ["E0EF",0x56E1],
- ["CDC5",0x56E2],
- ["87E2",0x56E3],
- ["B6DA",0x56E4],
- ["87E3",0x56E5],
- ["87E4",0x56E6],
- ["87E5",0x56E7],
- ["87E6",0x56E8],
- ["87E7",0x56E9],
- ["87E8",0x56EA],
- ["E0F1",0x56EB],
- ["87E9",0x56EC],
- ["D4B0",0x56ED],
- ["87EA",0x56EE],
- ["87EB",0x56EF],
- ["C0A7",0x56F0],
- ["B4D1",0x56F1],
- ["87EC",0x56F2],
- ["87ED",0x56F3],
- ["CEA7",0x56F4],
- ["E0F0",0x56F5],
- ["87EE",0x56F6],
- ["87EF",0x56F7],
- ["87F0",0x56F8],
- ["E0F2",0x56F9],
- ["B9CC",0x56FA],
- ["87F1",0x56FB],
- ["87F2",0x56FC],
- ["B9FA",0x56FD],
- ["CDBC",0x56FE],
- ["E0F3",0x56FF],
- ["87F3",0x5700],
- ["87F4",0x5701],
- ["87F5",0x5702],
- ["C6D4",0x5703],
- ["E0F4",0x5704],
- ["87F6",0x5705],
- ["D4B2",0x5706],
- ["87F7",0x5707],
- ["C8A6",0x5708],
- ["E0F6",0x5709],
- ["E0F5",0x570A],
- ["87F8",0x570B],
- ["87F9",0x570C],
- ["87FA",0x570D],
- ["87FB",0x570E],
- ["87FC",0x570F],
- ["87FD",0x5710],
- ["87FE",0x5711],
- ["8840",0x5712],
- ["8841",0x5713],
- ["8842",0x5714],
- ["8843",0x5715],
- ["8844",0x5716],
- ["8845",0x5717],
- ["8846",0x5718],
- ["8847",0x5719],
- ["8848",0x571A],
- ["8849",0x571B],
- ["E0F7",0x571C],
- ["884A",0x571D],
- ["884B",0x571E],
- ["CDC1",0x571F],
- ["884C",0x5720],
- ["884D",0x5721],
- ["884E",0x5722],
- ["CAA5",0x5723],
- ["884F",0x5724],
- ["8850",0x5725],
- ["8851",0x5726],
- ["8852",0x5727],
- ["D4DA",0x5728],
- ["DBD7",0x5729],
- ["DBD9",0x572A],
- ["8853",0x572B],
- ["DBD8",0x572C],
- ["B9E7",0x572D],
- ["DBDC",0x572E],
- ["DBDD",0x572F],
- ["B5D8",0x5730],
- ["8854",0x5731],
- ["8855",0x5732],
- ["DBDA",0x5733],
- ["8856",0x5734],
- ["8857",0x5735],
- ["8858",0x5736],
- ["8859",0x5737],
- ["885A",0x5738],
- ["DBDB",0x5739],
- ["B3A1",0x573A],
- ["DBDF",0x573B],
- ["885B",0x573C],
- ["885C",0x573D],
- ["BBF8",0x573E],
- ["885D",0x573F],
- ["D6B7",0x5740],
- ["885E",0x5741],
- ["DBE0",0x5742],
- ["885F",0x5743],
- ["8860",0x5744],
- ["8861",0x5745],
- ["8862",0x5746],
- ["BEF9",0x5747],
- ["8863",0x5748],
- ["8864",0x5749],
- ["B7BB",0x574A],
- ["8865",0x574B],
- ["DBD0",0x574C],
- ["CCAE",0x574D],
- ["BFB2",0x574E],
- ["BBB5",0x574F],
- ["D7F8",0x5750],
- ["BFD3",0x5751],
- ["8866",0x5752],
- ["8867",0x5753],
- ["8868",0x5754],
- ["8869",0x5755],
- ["886A",0x5756],
- ["BFE9",0x5757],
- ["886B",0x5758],
- ["886C",0x5759],
- ["BCE1",0x575A],
- ["CCB3",0x575B],
- ["DBDE",0x575C],
- ["B0D3",0x575D],
- ["CEEB",0x575E],
- ["B7D8",0x575F],
- ["D7B9",0x5760],
- ["C6C2",0x5761],
- ["886D",0x5762],
- ["886E",0x5763],
- ["C0A4",0x5764],
- ["886F",0x5765],
- ["CCB9",0x5766],
- ["8870",0x5767],
- ["DBE7",0x5768],
- ["DBE1",0x5769],
- ["C6BA",0x576A],
- ["DBE3",0x576B],
- ["8871",0x576C],
- ["DBE8",0x576D],
- ["8872",0x576E],
- ["C5F7",0x576F],
- ["8873",0x5770],
- ["8874",0x5771],
- ["8875",0x5772],
- ["DBEA",0x5773],
- ["8876",0x5774],
- ["8877",0x5775],
- ["DBE9",0x5776],
- ["BFC0",0x5777],
- ["8878",0x5778],
- ["8879",0x5779],
- ["887A",0x577A],
- ["DBE6",0x577B],
- ["DBE5",0x577C],
- ["887B",0x577D],
- ["887C",0x577E],
- ["887D",0x577F],
- ["887E",0x5780],
- ["8880",0x5781],
- ["B4B9",0x5782],
- ["C0AC",0x5783],
- ["C2A2",0x5784],
- ["DBE2",0x5785],
- ["DBE4",0x5786],
- ["8881",0x5787],
- ["8882",0x5788],
- ["8883",0x5789],
- ["8884",0x578A],
- ["D0CD",0x578B],
- ["DBED",0x578C],
- ["8885",0x578D],
- ["8886",0x578E],
- ["8887",0x578F],
- ["8888",0x5790],
- ["8889",0x5791],
- ["C0DD",0x5792],
- ["DBF2",0x5793],
- ["888A",0x5794],
- ["888B",0x5795],
- ["888C",0x5796],
- ["888D",0x5797],
- ["888E",0x5798],
- ["888F",0x5799],
- ["8890",0x579A],
- ["B6E2",0x579B],
- ["8891",0x579C],
- ["8892",0x579D],
- ["8893",0x579E],
- ["8894",0x579F],
- ["DBF3",0x57A0],
- ["DBD2",0x57A1],
- ["B9B8",0x57A2],
- ["D4AB",0x57A3],
- ["DBEC",0x57A4],
- ["8895",0x57A5],
- ["BFD1",0x57A6],
- ["DBF0",0x57A7],
- ["8896",0x57A8],
- ["DBD1",0x57A9],
- ["8897",0x57AA],
- ["B5E6",0x57AB],
- ["8898",0x57AC],
- ["DBEB",0x57AD],
- ["BFE5",0x57AE],
- ["8899",0x57AF],
- ["889A",0x57B0],
- ["889B",0x57B1],
- ["DBEE",0x57B2],
- ["889C",0x57B3],
- ["DBF1",0x57B4],
- ["889D",0x57B5],
- ["889E",0x57B6],
- ["889F",0x57B7],
- ["DBF9",0x57B8],
- ["88A0",0x57B9],
- ["88A1",0x57BA],
- ["88A2",0x57BB],
- ["88A3",0x57BC],
- ["88A4",0x57BD],
- ["88A5",0x57BE],
- ["88A6",0x57BF],
- ["88A7",0x57C0],
- ["88A8",0x57C1],
- ["B9A1",0x57C2],
- ["B0A3",0x57C3],
- ["88A9",0x57C4],
- ["88AA",0x57C5],
- ["88AB",0x57C6],
- ["88AC",0x57C7],
- ["88AD",0x57C8],
- ["88AE",0x57C9],
- ["88AF",0x57CA],
- ["C2F1",0x57CB],
- ["88B0",0x57CC],
- ["88B1",0x57CD],
- ["B3C7",0x57CE],
- ["DBEF",0x57CF],
- ["88B2",0x57D0],
- ["88B3",0x57D1],
- ["DBF8",0x57D2],
- ["88B4",0x57D3],
- ["C6D2",0x57D4],
- ["DBF4",0x57D5],
- ["88B5",0x57D6],
- ["88B6",0x57D7],
- ["DBF5",0x57D8],
- ["DBF7",0x57D9],
- ["DBF6",0x57DA],
- ["88B7",0x57DB],
- ["88B8",0x57DC],
- ["DBFE",0x57DD],
- ["88B9",0x57DE],
- ["D3F2",0x57DF],
- ["B2BA",0x57E0],
- ["88BA",0x57E1],
- ["88BB",0x57E2],
- ["88BC",0x57E3],
- ["DBFD",0x57E4],
- ["88BD",0x57E5],
- ["88BE",0x57E6],
- ["88BF",0x57E7],
- ["88C0",0x57E8],
- ["88C1",0x57E9],
- ["88C2",0x57EA],
- ["88C3",0x57EB],
- ["88C4",0x57EC],
- ["DCA4",0x57ED],
- ["88C5",0x57EE],
- ["DBFB",0x57EF],
- ["88C6",0x57F0],
- ["88C7",0x57F1],
- ["88C8",0x57F2],
- ["88C9",0x57F3],
- ["DBFA",0x57F4],
- ["88CA",0x57F5],
- ["88CB",0x57F6],
- ["88CC",0x57F7],
- ["DBFC",0x57F8],
- ["C5E0",0x57F9],
- ["BBF9",0x57FA],
- ["88CD",0x57FB],
- ["88CE",0x57FC],
- ["DCA3",0x57FD],
- ["88CF",0x57FE],
- ["88D0",0x57FF],
- ["DCA5",0x5800],
- ["88D1",0x5801],
- ["CCC3",0x5802],
- ["88D2",0x5803],
- ["88D3",0x5804],
- ["88D4",0x5805],
- ["B6D1",0x5806],
- ["DDC0",0x5807],
- ["88D5",0x5808],
- ["88D6",0x5809],
- ["88D7",0x580A],
- ["DCA1",0x580B],
- ["88D8",0x580C],
- ["DCA2",0x580D],
- ["88D9",0x580E],
- ["88DA",0x580F],
- ["88DB",0x5810],
- ["C7B5",0x5811],
- ["88DC",0x5812],
- ["88DD",0x5813],
- ["88DE",0x5814],
- ["B6E9",0x5815],
- ["88DF",0x5816],
- ["88E0",0x5817],
- ["88E1",0x5818],
- ["DCA7",0x5819],
- ["88E2",0x581A],
- ["88E3",0x581B],
- ["88E4",0x581C],
- ["88E5",0x581D],
- ["DCA6",0x581E],
- ["88E6",0x581F],
- ["DCA9",0x5820],
- ["B1A4",0x5821],
- ["88E7",0x5822],
- ["88E8",0x5823],
- ["B5CC",0x5824],
- ["88E9",0x5825],
- ["88EA",0x5826],
- ["88EB",0x5827],
- ["88EC",0x5828],
- ["88ED",0x5829],
- ["BFB0",0x582A],
- ["88EE",0x582B],
- ["88EF",0x582C],
- ["88F0",0x582D],
- ["88F1",0x582E],
- ["88F2",0x582F],
- ["D1DF",0x5830],
- ["88F3",0x5831],
- ["88F4",0x5832],
- ["88F5",0x5833],
- ["88F6",0x5834],
- ["B6C2",0x5835],
- ["88F7",0x5836],
- ["88F8",0x5837],
- ["88F9",0x5838],
- ["88FA",0x5839],
- ["88FB",0x583A],
- ["88FC",0x583B],
- ["88FD",0x583C],
- ["88FE",0x583D],
- ["8940",0x583E],
- ["8941",0x583F],
- ["8942",0x5840],
- ["8943",0x5841],
- ["8944",0x5842],
- ["8945",0x5843],
- ["DCA8",0x5844],
- ["8946",0x5845],
- ["8947",0x5846],
- ["8948",0x5847],
- ["8949",0x5848],
- ["894A",0x5849],
- ["894B",0x584A],
- ["894C",0x584B],
- ["CBFA",0x584C],
- ["EBF3",0x584D],
- ["894D",0x584E],
- ["894E",0x584F],
- ["894F",0x5850],
- ["CBDC",0x5851],
- ["8950",0x5852],
- ["8951",0x5853],
- ["CBFE",0x5854],
- ["8952",0x5855],
- ["8953",0x5856],
- ["8954",0x5857],
- ["CCC1",0x5858],
- ["8955",0x5859],
- ["8956",0x585A],
- ["8957",0x585B],
- ["8958",0x585C],
- ["8959",0x585D],
- ["C8FB",0x585E],
- ["895A",0x585F],
- ["895B",0x5860],
- ["895C",0x5861],
- ["895D",0x5862],
- ["895E",0x5863],
- ["895F",0x5864],
- ["DCAA",0x5865],
- ["8960",0x5866],
- ["8961",0x5867],
- ["8962",0x5868],
- ["8963",0x5869],
- ["8964",0x586A],
- ["CCEE",0x586B],
- ["DCAB",0x586C],
- ["8965",0x586D],
- ["8966",0x586E],
- ["8967",0x586F],
- ["8968",0x5870],
- ["8969",0x5871],
- ["896A",0x5872],
- ["896B",0x5873],
- ["896C",0x5874],
- ["896D",0x5875],
- ["896E",0x5876],
- ["896F",0x5877],
- ["8970",0x5878],
- ["8971",0x5879],
- ["8972",0x587A],
- ["8973",0x587B],
- ["8974",0x587C],
- ["8975",0x587D],
- ["DBD3",0x587E],
- ["8976",0x587F],
- ["DCAF",0x5880],
- ["DCAC",0x5881],
- ["8977",0x5882],
- ["BEB3",0x5883],
- ["8978",0x5884],
- ["CAFB",0x5885],
- ["8979",0x5886],
- ["897A",0x5887],
- ["897B",0x5888],
- ["DCAD",0x5889],
- ["897C",0x588A],
- ["897D",0x588B],
- ["897E",0x588C],
- ["8980",0x588D],
- ["8981",0x588E],
- ["8982",0x588F],
- ["8983",0x5890],
- ["8984",0x5891],
- ["C9CA",0x5892],
- ["C4B9",0x5893],
- ["8985",0x5894],
- ["8986",0x5895],
- ["8987",0x5896],
- ["8988",0x5897],
- ["8989",0x5898],
- ["C7BD",0x5899],
- ["DCAE",0x589A],
- ["898A",0x589B],
- ["898B",0x589C],
- ["898C",0x589D],
- ["D4F6",0x589E],
- ["D0E6",0x589F],
- ["898D",0x58A0],
- ["898E",0x58A1],
- ["898F",0x58A2],
- ["8990",0x58A3],
- ["8991",0x58A4],
- ["8992",0x58A5],
- ["8993",0x58A6],
- ["8994",0x58A7],
- ["C4AB",0x58A8],
- ["B6D5",0x58A9],
- ["8995",0x58AA],
- ["8996",0x58AB],
- ["8997",0x58AC],
- ["8998",0x58AD],
- ["8999",0x58AE],
- ["899A",0x58AF],
- ["899B",0x58B0],
- ["899C",0x58B1],
- ["899D",0x58B2],
- ["899E",0x58B3],
- ["899F",0x58B4],
- ["89A0",0x58B5],
- ["89A1",0x58B6],
- ["89A2",0x58B7],
- ["89A3",0x58B8],
- ["89A4",0x58B9],
- ["89A5",0x58BA],
- ["89A6",0x58BB],
- ["DBD4",0x58BC],
- ["89A7",0x58BD],
- ["89A8",0x58BE],
- ["89A9",0x58BF],
- ["89AA",0x58C0],
- ["B1DA",0x58C1],
- ["89AB",0x58C2],
- ["89AC",0x58C3],
- ["89AD",0x58C4],
- ["DBD5",0x58C5],
- ["89AE",0x58C6],
- ["89AF",0x58C7],
- ["89B0",0x58C8],
- ["89B1",0x58C9],
- ["89B2",0x58CA],
- ["89B3",0x58CB],
- ["89B4",0x58CC],
- ["89B5",0x58CD],
- ["89B6",0x58CE],
- ["89B7",0x58CF],
- ["89B8",0x58D0],
- ["DBD6",0x58D1],
- ["89B9",0x58D2],
- ["89BA",0x58D3],
- ["89BB",0x58D4],
- ["BABE",0x58D5],
- ["89BC",0x58D6],
- ["89BD",0x58D7],
- ["89BE",0x58D8],
- ["89BF",0x58D9],
- ["89C0",0x58DA],
- ["89C1",0x58DB],
- ["89C2",0x58DC],
- ["89C3",0x58DD],
- ["89C4",0x58DE],
- ["89C5",0x58DF],
- ["89C6",0x58E0],
- ["89C7",0x58E1],
- ["89C8",0x58E2],
- ["89C9",0x58E3],
- ["C8C0",0x58E4],
- ["89CA",0x58E5],
- ["89CB",0x58E6],
- ["89CC",0x58E7],
- ["89CD",0x58E8],
- ["89CE",0x58E9],
- ["89CF",0x58EA],
- ["CABF",0x58EB],
- ["C8C9",0x58EC],
- ["89D0",0x58ED],
- ["D7B3",0x58EE],
- ["89D1",0x58EF],
- ["C9F9",0x58F0],
- ["89D2",0x58F1],
- ["89D3",0x58F2],
- ["BFC7",0x58F3],
- ["89D4",0x58F4],
- ["89D5",0x58F5],
- ["BAF8",0x58F6],
- ["89D6",0x58F7],
- ["89D7",0x58F8],
- ["D2BC",0x58F9],
- ["89D8",0x58FA],
- ["89D9",0x58FB],
- ["89DA",0x58FC],
- ["89DB",0x58FD],
- ["89DC",0x58FE],
- ["89DD",0x58FF],
- ["89DE",0x5900],
- ["89DF",0x5901],
- ["E2BA",0x5902],
- ["89E0",0x5903],
- ["B4A6",0x5904],
- ["89E1",0x5905],
- ["89E2",0x5906],
- ["B1B8",0x5907],
- ["89E3",0x5908],
- ["89E4",0x5909],
- ["89E5",0x590A],
- ["89E6",0x590B],
- ["89E7",0x590C],
- ["B8B4",0x590D],
- ["89E8",0x590E],
- ["CFC4",0x590F],
- ["89E9",0x5910],
- ["89EA",0x5911],
- ["89EB",0x5912],
- ["89EC",0x5913],
- ["D9E7",0x5914],
- ["CFA6",0x5915],
- ["CDE2",0x5916],
- ["89ED",0x5917],
- ["89EE",0x5918],
- ["D9ED",0x5919],
- ["B6E0",0x591A],
- ["89EF",0x591B],
- ["D2B9",0x591C],
- ["89F0",0x591D],
- ["89F1",0x591E],
- ["B9BB",0x591F],
- ["89F2",0x5920],
- ["89F3",0x5921],
- ["89F4",0x5922],
- ["89F5",0x5923],
- ["E2B9",0x5924],
- ["E2B7",0x5925],
- ["89F6",0x5926],
- ["B4F3",0x5927],
- ["89F7",0x5928],
- ["CCEC",0x5929],
- ["CCAB",0x592A],
- ["B7F2",0x592B],
- ["89F8",0x592C],
- ["D8B2",0x592D],
- ["D1EB",0x592E],
- ["BABB",0x592F],
- ["89F9",0x5930],
- ["CAA7",0x5931],
- ["89FA",0x5932],
- ["89FB",0x5933],
- ["CDB7",0x5934],
- ["89FC",0x5935],
- ["89FD",0x5936],
- ["D2C4",0x5937],
- ["BFE4",0x5938],
- ["BCD0",0x5939],
- ["B6E1",0x593A],
- ["89FE",0x593B],
- ["DEC5",0x593C],
- ["8A40",0x593D],
- ["8A41",0x593E],
- ["8A42",0x593F],
- ["8A43",0x5940],
- ["DEC6",0x5941],
- ["DBBC",0x5942],
- ["8A44",0x5943],
- ["D1D9",0x5944],
- ["8A45",0x5945],
- ["8A46",0x5946],
- ["C6E6",0x5947],
- ["C4CE",0x5948],
- ["B7EE",0x5949],
- ["8A47",0x594A],
- ["B7DC",0x594B],
- ["8A48",0x594C],
- ["8A49",0x594D],
- ["BFFC",0x594E],
- ["D7E0",0x594F],
- ["8A4A",0x5950],
- ["C6F5",0x5951],
- ["8A4B",0x5952],
- ["8A4C",0x5953],
- ["B1BC",0x5954],
- ["DEC8",0x5955],
- ["BDB1",0x5956],
- ["CCD7",0x5957],
- ["DECA",0x5958],
- ["8A4D",0x5959],
- ["DEC9",0x595A],
- ["8A4E",0x595B],
- ["8A4F",0x595C],
- ["8A50",0x595D],
- ["8A51",0x595E],
- ["8A52",0x595F],
- ["B5EC",0x5960],
- ["8A53",0x5961],
- ["C9DD",0x5962],
- ["8A54",0x5963],
- ["8A55",0x5964],
- ["B0C2",0x5965],
- ["8A56",0x5966],
- ["8A57",0x5967],
- ["8A58",0x5968],
- ["8A59",0x5969],
- ["8A5A",0x596A],
- ["8A5B",0x596B],
- ["8A5C",0x596C],
- ["8A5D",0x596D],
- ["8A5E",0x596E],
- ["8A5F",0x596F],
- ["8A60",0x5970],
- ["8A61",0x5971],
- ["8A62",0x5972],
- ["C5AE",0x5973],
- ["C5AB",0x5974],
- ["8A63",0x5975],
- ["C4CC",0x5976],
- ["8A64",0x5977],
- ["BCE9",0x5978],
- ["CBFD",0x5979],
- ["8A65",0x597A],
- ["8A66",0x597B],
- ["8A67",0x597C],
- ["BAC3",0x597D],
- ["8A68",0x597E],
- ["8A69",0x597F],
- ["8A6A",0x5980],
- ["E5F9",0x5981],
- ["C8E7",0x5982],
- ["E5FA",0x5983],
- ["CDFD",0x5984],
- ["8A6B",0x5985],
- ["D7B1",0x5986],
- ["B8BE",0x5987],
- ["C2E8",0x5988],
- ["8A6C",0x5989],
- ["C8D1",0x598A],
- ["8A6D",0x598B],
- ["8A6E",0x598C],
- ["E5FB",0x598D],
- ["8A6F",0x598E],
- ["8A70",0x598F],
- ["8A71",0x5990],
- ["8A72",0x5991],
- ["B6CA",0x5992],
- ["BCCB",0x5993],
- ["8A73",0x5994],
- ["8A74",0x5995],
- ["D1FD",0x5996],
- ["E6A1",0x5997],
- ["8A75",0x5998],
- ["C3EE",0x5999],
- ["8A76",0x599A],
- ["8A77",0x599B],
- ["8A78",0x599C],
- ["8A79",0x599D],
- ["E6A4",0x599E],
- ["8A7A",0x599F],
- ["8A7B",0x59A0],
- ["8A7C",0x59A1],
- ["8A7D",0x59A2],
- ["E5FE",0x59A3],
- ["E6A5",0x59A4],
- ["CDD7",0x59A5],
- ["8A7E",0x59A6],
- ["8A80",0x59A7],
- ["B7C1",0x59A8],
- ["E5FC",0x59A9],
- ["E5FD",0x59AA],
- ["E6A3",0x59AB],
- ["8A81",0x59AC],
- ["8A82",0x59AD],
- ["C4DD",0x59AE],
- ["E6A8",0x59AF],
- ["8A83",0x59B0],
- ["8A84",0x59B1],
- ["E6A7",0x59B2],
- ["8A85",0x59B3],
- ["8A86",0x59B4],
- ["8A87",0x59B5],
- ["8A88",0x59B6],
- ["8A89",0x59B7],
- ["8A8A",0x59B8],
- ["C3C3",0x59B9],
- ["8A8B",0x59BA],
- ["C6DE",0x59BB],
- ["8A8C",0x59BC],
- ["8A8D",0x59BD],
- ["E6AA",0x59BE],
- ["8A8E",0x59BF],
- ["8A8F",0x59C0],
- ["8A90",0x59C1],
- ["8A91",0x59C2],
- ["8A92",0x59C3],
- ["8A93",0x59C4],
- ["8A94",0x59C5],
- ["C4B7",0x59C6],
- ["8A95",0x59C7],
- ["8A96",0x59C8],
- ["8A97",0x59C9],
- ["E6A2",0x59CA],
- ["CABC",0x59CB],
- ["8A98",0x59CC],
- ["8A99",0x59CD],
- ["8A9A",0x59CE],
- ["8A9B",0x59CF],
- ["BDE3",0x59D0],
- ["B9C3",0x59D1],
- ["E6A6",0x59D2],
- ["D0D5",0x59D3],
- ["CEAF",0x59D4],
- ["8A9C",0x59D5],
- ["8A9D",0x59D6],
- ["E6A9",0x59D7],
- ["E6B0",0x59D8],
- ["8A9E",0x59D9],
- ["D2A6",0x59DA],
- ["8A9F",0x59DB],
- ["BDAA",0x59DC],
- ["E6AD",0x59DD],
- ["8AA0",0x59DE],
- ["8AA1",0x59DF],
- ["8AA2",0x59E0],
- ["8AA3",0x59E1],
- ["8AA4",0x59E2],
- ["E6AF",0x59E3],
- ["8AA5",0x59E4],
- ["C0D1",0x59E5],
- ["8AA6",0x59E6],
- ["8AA7",0x59E7],
- ["D2CC",0x59E8],
- ["8AA8",0x59E9],
- ["8AA9",0x59EA],
- ["8AAA",0x59EB],
- ["BCA7",0x59EC],
- ["8AAB",0x59ED],
- ["8AAC",0x59EE],
- ["8AAD",0x59EF],
- ["8AAE",0x59F0],
- ["8AAF",0x59F1],
- ["8AB0",0x59F2],
- ["8AB1",0x59F3],
- ["8AB2",0x59F4],
- ["8AB3",0x59F5],
- ["8AB4",0x59F6],
- ["8AB5",0x59F7],
- ["8AB6",0x59F8],
- ["E6B1",0x59F9],
- ["8AB7",0x59FA],
- ["D2F6",0x59FB],
- ["8AB8",0x59FC],
- ["8AB9",0x59FD],
- ["8ABA",0x59FE],
- ["D7CB",0x59FF],
- ["8ABB",0x5A00],
- ["CDFE",0x5A01],
- ["8ABC",0x5A02],
- ["CDDE",0x5A03],
- ["C2A6",0x5A04],
- ["E6AB",0x5A05],
- ["E6AC",0x5A06],
- ["BDBF",0x5A07],
- ["E6AE",0x5A08],
- ["E6B3",0x5A09],
- ["8ABD",0x5A0A],
- ["8ABE",0x5A0B],
- ["E6B2",0x5A0C],
- ["8ABF",0x5A0D],
- ["8AC0",0x5A0E],
- ["8AC1",0x5A0F],
- ["8AC2",0x5A10],
- ["E6B6",0x5A11],
- ["8AC3",0x5A12],
- ["E6B8",0x5A13],
- ["8AC4",0x5A14],
- ["8AC5",0x5A15],
- ["8AC6",0x5A16],
- ["8AC7",0x5A17],
- ["C4EF",0x5A18],
- ["8AC8",0x5A19],
- ["8AC9",0x5A1A],
- ["8ACA",0x5A1B],
- ["C4C8",0x5A1C],
- ["8ACB",0x5A1D],
- ["8ACC",0x5A1E],
- ["BEEA",0x5A1F],
- ["C9EF",0x5A20],
- ["8ACD",0x5A21],
- ["8ACE",0x5A22],
- ["E6B7",0x5A23],
- ["8ACF",0x5A24],
- ["B6F0",0x5A25],
- ["8AD0",0x5A26],
- ["8AD1",0x5A27],
- ["8AD2",0x5A28],
- ["C3E4",0x5A29],
- ["8AD3",0x5A2A],
- ["8AD4",0x5A2B],
- ["8AD5",0x5A2C],
- ["8AD6",0x5A2D],
- ["8AD7",0x5A2E],
- ["8AD8",0x5A2F],
- ["8AD9",0x5A30],
- ["D3E9",0x5A31],
- ["E6B4",0x5A32],
- ["8ADA",0x5A33],
- ["E6B5",0x5A34],
- ["8ADB",0x5A35],
- ["C8A2",0x5A36],
- ["8ADC",0x5A37],
- ["8ADD",0x5A38],
- ["8ADE",0x5A39],
- ["8ADF",0x5A3A],
- ["8AE0",0x5A3B],
- ["E6BD",0x5A3C],
- ["8AE1",0x5A3D],
- ["8AE2",0x5A3E],
- ["8AE3",0x5A3F],
- ["E6B9",0x5A40],
- ["8AE4",0x5A41],
- ["8AE5",0x5A42],
- ["8AE6",0x5A43],
- ["8AE7",0x5A44],
- ["8AE8",0x5A45],
- ["C6C5",0x5A46],
- ["8AE9",0x5A47],
- ["8AEA",0x5A48],
- ["CDF1",0x5A49],
- ["E6BB",0x5A4A],
- ["8AEB",0x5A4B],
- ["8AEC",0x5A4C],
- ["8AED",0x5A4D],
- ["8AEE",0x5A4E],
- ["8AEF",0x5A4F],
- ["8AF0",0x5A50],
- ["8AF1",0x5A51],
- ["8AF2",0x5A52],
- ["8AF3",0x5A53],
- ["8AF4",0x5A54],
- ["E6BC",0x5A55],
- ["8AF5",0x5A56],
- ["8AF6",0x5A57],
- ["8AF7",0x5A58],
- ["8AF8",0x5A59],
- ["BBE9",0x5A5A],
- ["8AF9",0x5A5B],
- ["8AFA",0x5A5C],
- ["8AFB",0x5A5D],
- ["8AFC",0x5A5E],
- ["8AFD",0x5A5F],
- ["8AFE",0x5A60],
- ["8B40",0x5A61],
- ["E6BE",0x5A62],
- ["8B41",0x5A63],
- ["8B42",0x5A64],
- ["8B43",0x5A65],
- ["8B44",0x5A66],
- ["E6BA",0x5A67],
- ["8B45",0x5A68],
- ["8B46",0x5A69],
- ["C0B7",0x5A6A],
- ["8B47",0x5A6B],
- ["8B48",0x5A6C],
- ["8B49",0x5A6D],
- ["8B4A",0x5A6E],
- ["8B4B",0x5A6F],
- ["8B4C",0x5A70],
- ["8B4D",0x5A71],
- ["8B4E",0x5A72],
- ["8B4F",0x5A73],
- ["D3A4",0x5A74],
- ["E6BF",0x5A75],
- ["C9F4",0x5A76],
- ["E6C3",0x5A77],
- ["8B50",0x5A78],
- ["8B51",0x5A79],
- ["E6C4",0x5A7A],
- ["8B52",0x5A7B],
- ["8B53",0x5A7C],
- ["8B54",0x5A7D],
- ["8B55",0x5A7E],
- ["D0F6",0x5A7F],
- ["8B56",0x5A80],
- ["8B57",0x5A81],
- ["8B58",0x5A82],
- ["8B59",0x5A83],
- ["8B5A",0x5A84],
- ["8B5B",0x5A85],
- ["8B5C",0x5A86],
- ["8B5D",0x5A87],
- ["8B5E",0x5A88],
- ["8B5F",0x5A89],
- ["8B60",0x5A8A],
- ["8B61",0x5A8B],
- ["8B62",0x5A8C],
- ["8B63",0x5A8D],
- ["8B64",0x5A8E],
- ["8B65",0x5A8F],
- ["8B66",0x5A90],
- ["8B67",0x5A91],
- ["C3BD",0x5A92],
- ["8B68",0x5A93],
- ["8B69",0x5A94],
- ["8B6A",0x5A95],
- ["8B6B",0x5A96],
- ["8B6C",0x5A97],
- ["8B6D",0x5A98],
- ["8B6E",0x5A99],
- ["C3C4",0x5A9A],
- ["E6C2",0x5A9B],
- ["8B6F",0x5A9C],
- ["8B70",0x5A9D],
- ["8B71",0x5A9E],
- ["8B72",0x5A9F],
- ["8B73",0x5AA0],
- ["8B74",0x5AA1],
- ["8B75",0x5AA2],
- ["8B76",0x5AA3],
- ["8B77",0x5AA4],
- ["8B78",0x5AA5],
- ["8B79",0x5AA6],
- ["8B7A",0x5AA7],
- ["8B7B",0x5AA8],
- ["8B7C",0x5AA9],
- ["E6C1",0x5AAA],
- ["8B7D",0x5AAB],
- ["8B7E",0x5AAC],
- ["8B80",0x5AAD],
- ["8B81",0x5AAE],
- ["8B82",0x5AAF],
- ["8B83",0x5AB0],
- ["8B84",0x5AB1],
- ["E6C7",0x5AB2],
- ["CFB1",0x5AB3],
- ["8B85",0x5AB4],
- ["EBF4",0x5AB5],
- ["8B86",0x5AB6],
- ["8B87",0x5AB7],
- ["E6CA",0x5AB8],
- ["8B88",0x5AB9],
- ["8B89",0x5ABA],
- ["8B8A",0x5ABB],
- ["8B8B",0x5ABC],
- ["8B8C",0x5ABD],
- ["E6C5",0x5ABE],
- ["8B8D",0x5ABF],
- ["8B8E",0x5AC0],
- ["BCDE",0x5AC1],
- ["C9A9",0x5AC2],
- ["8B8F",0x5AC3],
- ["8B90",0x5AC4],
- ["8B91",0x5AC5],
- ["8B92",0x5AC6],
- ["8B93",0x5AC7],
- ["8B94",0x5AC8],
- ["BCB5",0x5AC9],
- ["8B95",0x5ACA],
- ["8B96",0x5ACB],
- ["CFD3",0x5ACC],
- ["8B97",0x5ACD],
- ["8B98",0x5ACE],
- ["8B99",0x5ACF],
- ["8B9A",0x5AD0],
- ["8B9B",0x5AD1],
- ["E6C8",0x5AD2],
- ["8B9C",0x5AD3],
- ["E6C9",0x5AD4],
- ["8B9D",0x5AD5],
- ["E6CE",0x5AD6],
- ["8B9E",0x5AD7],
- ["E6D0",0x5AD8],
- ["8B9F",0x5AD9],
- ["8BA0",0x5ADA],
- ["8BA1",0x5ADB],
- ["E6D1",0x5ADC],
- ["8BA2",0x5ADD],
- ["8BA3",0x5ADE],
- ["8BA4",0x5ADF],
- ["E6CB",0x5AE0],
- ["B5D5",0x5AE1],
- ["8BA5",0x5AE2],
- ["E6CC",0x5AE3],
- ["8BA6",0x5AE4],
- ["8BA7",0x5AE5],
- ["E6CF",0x5AE6],
- ["8BA8",0x5AE7],
- ["8BA9",0x5AE8],
- ["C4DB",0x5AE9],
- ["8BAA",0x5AEA],
- ["E6C6",0x5AEB],
- ["8BAB",0x5AEC],
- ["8BAC",0x5AED],
- ["8BAD",0x5AEE],
- ["8BAE",0x5AEF],
- ["8BAF",0x5AF0],
- ["E6CD",0x5AF1],
- ["8BB0",0x5AF2],
- ["8BB1",0x5AF3],
- ["8BB2",0x5AF4],
- ["8BB3",0x5AF5],
- ["8BB4",0x5AF6],
- ["8BB5",0x5AF7],
- ["8BB6",0x5AF8],
- ["8BB7",0x5AF9],
- ["8BB8",0x5AFA],
- ["8BB9",0x5AFB],
- ["8BBA",0x5AFC],
- ["8BBB",0x5AFD],
- ["8BBC",0x5AFE],
- ["8BBD",0x5AFF],
- ["8BBE",0x5B00],
- ["8BBF",0x5B01],
- ["8BC0",0x5B02],
- ["8BC1",0x5B03],
- ["8BC2",0x5B04],
- ["8BC3",0x5B05],
- ["8BC4",0x5B06],
- ["8BC5",0x5B07],
- ["8BC6",0x5B08],
- ["E6D2",0x5B09],
- ["8BC7",0x5B0A],
- ["8BC8",0x5B0B],
- ["8BC9",0x5B0C],
- ["8BCA",0x5B0D],
- ["8BCB",0x5B0E],
- ["8BCC",0x5B0F],
- ["8BCD",0x5B10],
- ["8BCE",0x5B11],
- ["8BCF",0x5B12],
- ["8BD0",0x5B13],
- ["8BD1",0x5B14],
- ["8BD2",0x5B15],
- ["E6D4",0x5B16],
- ["E6D3",0x5B17],
- ["8BD3",0x5B18],
- ["8BD4",0x5B19],
- ["8BD5",0x5B1A],
- ["8BD6",0x5B1B],
- ["8BD7",0x5B1C],
- ["8BD8",0x5B1D],
- ["8BD9",0x5B1E],
- ["8BDA",0x5B1F],
- ["8BDB",0x5B20],
- ["8BDC",0x5B21],
- ["8BDD",0x5B22],
- ["8BDE",0x5B23],
- ["8BDF",0x5B24],
- ["8BE0",0x5B25],
- ["8BE1",0x5B26],
- ["8BE2",0x5B27],
- ["8BE3",0x5B28],
- ["8BE4",0x5B29],
- ["8BE5",0x5B2A],
- ["8BE6",0x5B2B],
- ["8BE7",0x5B2C],
- ["8BE8",0x5B2D],
- ["8BE9",0x5B2E],
- ["8BEA",0x5B2F],
- ["8BEB",0x5B30],
- ["8BEC",0x5B31],
- ["E6D5",0x5B32],
- ["8BED",0x5B33],
- ["D9F8",0x5B34],
- ["8BEE",0x5B35],
- ["8BEF",0x5B36],
- ["E6D6",0x5B37],
- ["8BF0",0x5B38],
- ["8BF1",0x5B39],
- ["8BF2",0x5B3A],
- ["8BF3",0x5B3B],
- ["8BF4",0x5B3C],
- ["8BF5",0x5B3D],
- ["8BF6",0x5B3E],
- ["8BF7",0x5B3F],
- ["E6D7",0x5B40],
- ["8BF8",0x5B41],
- ["8BF9",0x5B42],
- ["8BFA",0x5B43],
- ["8BFB",0x5B44],
- ["8BFC",0x5B45],
- ["8BFD",0x5B46],
- ["8BFE",0x5B47],
- ["8C40",0x5B48],
- ["8C41",0x5B49],
- ["8C42",0x5B4A],
- ["8C43",0x5B4B],
- ["8C44",0x5B4C],
- ["8C45",0x5B4D],
- ["8C46",0x5B4E],
- ["8C47",0x5B4F],
- ["D7D3",0x5B50],
- ["E6DD",0x5B51],
- ["8C48",0x5B52],
- ["E6DE",0x5B53],
- ["BFD7",0x5B54],
- ["D4D0",0x5B55],
- ["8C49",0x5B56],
- ["D7D6",0x5B57],
- ["B4E6",0x5B58],
- ["CBEF",0x5B59],
- ["E6DA",0x5B5A],
- ["D8C3",0x5B5B],
- ["D7CE",0x5B5C],
- ["D0A2",0x5B5D],
- ["8C4A",0x5B5E],
- ["C3CF",0x5B5F],
- ["8C4B",0x5B60],
- ["8C4C",0x5B61],
- ["E6DF",0x5B62],
- ["BCBE",0x5B63],
- ["B9C2",0x5B64],
- ["E6DB",0x5B65],
- ["D1A7",0x5B66],
- ["8C4D",0x5B67],
- ["8C4E",0x5B68],
- ["BAA2",0x5B69],
- ["C2CF",0x5B6A],
- ["8C4F",0x5B6B],
- ["D8AB",0x5B6C],
- ["8C50",0x5B6D],
- ["8C51",0x5B6E],
- ["8C52",0x5B6F],
- ["CAEB",0x5B70],
- ["E5EE",0x5B71],
- ["8C53",0x5B72],
- ["E6DC",0x5B73],
- ["8C54",0x5B74],
- ["B7F5",0x5B75],
- ["8C55",0x5B76],
- ["8C56",0x5B77],
- ["8C57",0x5B78],
- ["8C58",0x5B79],
- ["C8E6",0x5B7A],
- ["8C59",0x5B7B],
- ["8C5A",0x5B7C],
- ["C4F5",0x5B7D],
- ["8C5B",0x5B7E],
- ["8C5C",0x5B7F],
- ["E5B2",0x5B80],
- ["C4FE",0x5B81],
- ["8C5D",0x5B82],
- ["CBFC",0x5B83],
- ["E5B3",0x5B84],
- ["D5AC",0x5B85],
- ["8C5E",0x5B86],
- ["D3EE",0x5B87],
- ["CAD8",0x5B88],
- ["B0B2",0x5B89],
- ["8C5F",0x5B8A],
- ["CBCE",0x5B8B],
- ["CDEA",0x5B8C],
- ["8C60",0x5B8D],
- ["8C61",0x5B8E],
- ["BAEA",0x5B8F],
- ["8C62",0x5B90],
- ["8C63",0x5B91],
- ["8C64",0x5B92],
- ["E5B5",0x5B93],
- ["8C65",0x5B94],
- ["E5B4",0x5B95],
- ["8C66",0x5B96],
- ["D7DA",0x5B97],
- ["B9D9",0x5B98],
- ["D6E6",0x5B99],
- ["B6A8",0x5B9A],
- ["CDF0",0x5B9B],
- ["D2CB",0x5B9C],
- ["B1A6",0x5B9D],
- ["CAB5",0x5B9E],
- ["8C67",0x5B9F],
- ["B3E8",0x5BA0],
- ["C9F3",0x5BA1],
- ["BFCD",0x5BA2],
- ["D0FB",0x5BA3],
- ["CAD2",0x5BA4],
- ["E5B6",0x5BA5],
- ["BBC2",0x5BA6],
- ["8C68",0x5BA7],
- ["8C69",0x5BA8],
- ["8C6A",0x5BA9],
- ["CFDC",0x5BAA],
- ["B9AC",0x5BAB],
- ["8C6B",0x5BAC],
- ["8C6C",0x5BAD],
- ["8C6D",0x5BAE],
- ["8C6E",0x5BAF],
- ["D4D7",0x5BB0],
- ["8C6F",0x5BB1],
- ["8C70",0x5BB2],
- ["BAA6",0x5BB3],
- ["D1E7",0x5BB4],
- ["CFFC",0x5BB5],
- ["BCD2",0x5BB6],
- ["8C71",0x5BB7],
- ["E5B7",0x5BB8],
- ["C8DD",0x5BB9],
- ["8C72",0x5BBA],
- ["8C73",0x5BBB],
- ["8C74",0x5BBC],
- ["BFED",0x5BBD],
- ["B1F6",0x5BBE],
- ["CBDE",0x5BBF],
- ["8C75",0x5BC0],
- ["8C76",0x5BC1],
- ["BCC5",0x5BC2],
- ["8C77",0x5BC3],
- ["BCC4",0x5BC4],
- ["D2FA",0x5BC5],
- ["C3DC",0x5BC6],
- ["BFDC",0x5BC7],
- ["8C78",0x5BC8],
- ["8C79",0x5BC9],
- ["8C7A",0x5BCA],
- ["8C7B",0x5BCB],
- ["B8BB",0x5BCC],
- ["8C7C",0x5BCD],
- ["8C7D",0x5BCE],
- ["8C7E",0x5BCF],
- ["C3C2",0x5BD0],
- ["8C80",0x5BD1],
- ["BAAE",0x5BD2],
- ["D4A2",0x5BD3],
- ["8C81",0x5BD4],
- ["8C82",0x5BD5],
- ["8C83",0x5BD6],
- ["8C84",0x5BD7],
- ["8C85",0x5BD8],
- ["8C86",0x5BD9],
- ["8C87",0x5BDA],
- ["8C88",0x5BDB],
- ["8C89",0x5BDC],
- ["C7DE",0x5BDD],
- ["C4AF",0x5BDE],
- ["B2EC",0x5BDF],
- ["8C8A",0x5BE0],
- ["B9D1",0x5BE1],
- ["8C8B",0x5BE2],
- ["8C8C",0x5BE3],
- ["E5BB",0x5BE4],
- ["C1C8",0x5BE5],
- ["8C8D",0x5BE6],
- ["8C8E",0x5BE7],
- ["D5AF",0x5BE8],
- ["8C8F",0x5BE9],
- ["8C90",0x5BEA],
- ["8C91",0x5BEB],
- ["8C92",0x5BEC],
- ["8C93",0x5BED],
- ["E5BC",0x5BEE],
- ["8C94",0x5BEF],
- ["E5BE",0x5BF0],
- ["8C95",0x5BF1],
- ["8C96",0x5BF2],
- ["8C97",0x5BF3],
- ["8C98",0x5BF4],
- ["8C99",0x5BF5],
- ["8C9A",0x5BF6],
- ["8C9B",0x5BF7],
- ["B4E7",0x5BF8],
- ["B6D4",0x5BF9],
- ["CBC2",0x5BFA],
- ["D1B0",0x5BFB],
- ["B5BC",0x5BFC],
- ["8C9C",0x5BFD],
- ["8C9D",0x5BFE],
- ["CAD9",0x5BFF],
- ["8C9E",0x5C00],
- ["B7E2",0x5C01],
- ["8C9F",0x5C02],
- ["8CA0",0x5C03],
- ["C9E4",0x5C04],
- ["8CA1",0x5C05],
- ["BDAB",0x5C06],
- ["8CA2",0x5C07],
- ["8CA3",0x5C08],
- ["CEBE",0x5C09],
- ["D7F0",0x5C0A],
- ["8CA4",0x5C0B],
- ["8CA5",0x5C0C],
- ["8CA6",0x5C0D],
- ["8CA7",0x5C0E],
- ["D0A1",0x5C0F],
- ["8CA8",0x5C10],
- ["C9D9",0x5C11],
- ["8CA9",0x5C12],
- ["8CAA",0x5C13],
- ["B6FB",0x5C14],
- ["E6D8",0x5C15],
- ["BCE2",0x5C16],
- ["8CAB",0x5C17],
- ["B3BE",0x5C18],
- ["8CAC",0x5C19],
- ["C9D0",0x5C1A],
- ["8CAD",0x5C1B],
- ["E6D9",0x5C1C],
- ["B3A2",0x5C1D],
- ["8CAE",0x5C1E],
- ["8CAF",0x5C1F],
- ["8CB0",0x5C20],
- ["8CB1",0x5C21],
- ["DECC",0x5C22],
- ["8CB2",0x5C23],
- ["D3C8",0x5C24],
- ["DECD",0x5C25],
- ["8CB3",0x5C26],
- ["D2A2",0x5C27],
- ["8CB4",0x5C28],
- ["8CB5",0x5C29],
- ["8CB6",0x5C2A],
- ["8CB7",0x5C2B],
- ["DECE",0x5C2C],
- ["8CB8",0x5C2D],
- ["8CB9",0x5C2E],
- ["8CBA",0x5C2F],
- ["8CBB",0x5C30],
- ["BECD",0x5C31],
- ["8CBC",0x5C32],
- ["8CBD",0x5C33],
- ["DECF",0x5C34],
- ["8CBE",0x5C35],
- ["8CBF",0x5C36],
- ["8CC0",0x5C37],
- ["CAAC",0x5C38],
- ["D2FC",0x5C39],
- ["B3DF",0x5C3A],
- ["E5EA",0x5C3B],
- ["C4E1",0x5C3C],
- ["BEA1",0x5C3D],
- ["CEB2",0x5C3E],
- ["C4F2",0x5C3F],
- ["BED6",0x5C40],
- ["C6A8",0x5C41],
- ["B2E3",0x5C42],
- ["8CC1",0x5C43],
- ["8CC2",0x5C44],
- ["BED3",0x5C45],
- ["8CC3",0x5C46],
- ["8CC4",0x5C47],
- ["C7FC",0x5C48],
- ["CCEB",0x5C49],
- ["BDEC",0x5C4A],
- ["CEDD",0x5C4B],
- ["8CC5",0x5C4C],
- ["8CC6",0x5C4D],
- ["CABA",0x5C4E],
- ["C6C1",0x5C4F],
- ["E5EC",0x5C50],
- ["D0BC",0x5C51],
- ["8CC7",0x5C52],
- ["8CC8",0x5C53],
- ["8CC9",0x5C54],
- ["D5B9",0x5C55],
- ["8CCA",0x5C56],
- ["8CCB",0x5C57],
- ["8CCC",0x5C58],
- ["E5ED",0x5C59],
- ["8CCD",0x5C5A],
- ["8CCE",0x5C5B],
- ["8CCF",0x5C5C],
- ["8CD0",0x5C5D],
- ["CAF4",0x5C5E],
- ["8CD1",0x5C5F],
- ["CDC0",0x5C60],
- ["C2C5",0x5C61],
- ["8CD2",0x5C62],
- ["E5EF",0x5C63],
- ["8CD3",0x5C64],
- ["C2C4",0x5C65],
- ["E5F0",0x5C66],
- ["8CD4",0x5C67],
- ["8CD5",0x5C68],
- ["8CD6",0x5C69],
- ["8CD7",0x5C6A],
- ["8CD8",0x5C6B],
- ["8CD9",0x5C6C],
- ["8CDA",0x5C6D],
- ["E5F8",0x5C6E],
- ["CDCD",0x5C6F],
- ["8CDB",0x5C70],
- ["C9BD",0x5C71],
- ["8CDC",0x5C72],
- ["8CDD",0x5C73],
- ["8CDE",0x5C74],
- ["8CDF",0x5C75],
- ["8CE0",0x5C76],
- ["8CE1",0x5C77],
- ["8CE2",0x5C78],
- ["D2D9",0x5C79],
- ["E1A8",0x5C7A],
- ["8CE3",0x5C7B],
- ["8CE4",0x5C7C],
- ["8CE5",0x5C7D],
- ["8CE6",0x5C7E],
- ["D3EC",0x5C7F],
- ["8CE7",0x5C80],
- ["CBEA",0x5C81],
- ["C6F1",0x5C82],
- ["8CE8",0x5C83],
- ["8CE9",0x5C84],
- ["8CEA",0x5C85],
- ["8CEB",0x5C86],
- ["8CEC",0x5C87],
- ["E1AC",0x5C88],
- ["8CED",0x5C89],
- ["8CEE",0x5C8A],
- ["8CEF",0x5C8B],
- ["E1A7",0x5C8C],
- ["E1A9",0x5C8D],
- ["8CF0",0x5C8E],
- ["8CF1",0x5C8F],
- ["E1AA",0x5C90],
- ["E1AF",0x5C91],
- ["8CF2",0x5C92],
- ["8CF3",0x5C93],
- ["B2ED",0x5C94],
- ["8CF4",0x5C95],
- ["E1AB",0x5C96],
- ["B8DA",0x5C97],
- ["E1AD",0x5C98],
- ["E1AE",0x5C99],
- ["E1B0",0x5C9A],
- ["B5BA",0x5C9B],
- ["E1B1",0x5C9C],
- ["8CF5",0x5C9D],
- ["8CF6",0x5C9E],
- ["8CF7",0x5C9F],
- ["8CF8",0x5CA0],
- ["8CF9",0x5CA1],
- ["E1B3",0x5CA2],
- ["E1B8",0x5CA3],
- ["8CFA",0x5CA4],
- ["8CFB",0x5CA5],
- ["8CFC",0x5CA6],
- ["8CFD",0x5CA7],
- ["8CFE",0x5CA8],
- ["D1D2",0x5CA9],
- ["8D40",0x5CAA],
- ["E1B6",0x5CAB],
- ["E1B5",0x5CAC],
- ["C1EB",0x5CAD],
- ["8D41",0x5CAE],
- ["8D42",0x5CAF],
- ["8D43",0x5CB0],
- ["E1B7",0x5CB1],
- ["8D44",0x5CB2],
- ["D4C0",0x5CB3],
- ["8D45",0x5CB4],
- ["E1B2",0x5CB5],
- ["8D46",0x5CB6],
- ["E1BA",0x5CB7],
- ["B0B6",0x5CB8],
- ["8D47",0x5CB9],
- ["8D48",0x5CBA],
- ["8D49",0x5CBB],
- ["8D4A",0x5CBC],
- ["E1B4",0x5CBD],
- ["8D4B",0x5CBE],
- ["BFF9",0x5CBF],
- ["8D4C",0x5CC0],
- ["E1B9",0x5CC1],
- ["8D4D",0x5CC2],
- ["8D4E",0x5CC3],
- ["E1BB",0x5CC4],
- ["8D4F",0x5CC5],
- ["8D50",0x5CC6],
- ["8D51",0x5CC7],
- ["8D52",0x5CC8],
- ["8D53",0x5CC9],
- ["8D54",0x5CCA],
- ["E1BE",0x5CCB],
- ["8D55",0x5CCC],
- ["8D56",0x5CCD],
- ["8D57",0x5CCE],
- ["8D58",0x5CCF],
- ["8D59",0x5CD0],
- ["8D5A",0x5CD1],
- ["E1BC",0x5CD2],
- ["8D5B",0x5CD3],
- ["8D5C",0x5CD4],
- ["8D5D",0x5CD5],
- ["8D5E",0x5CD6],
- ["8D5F",0x5CD7],
- ["8D60",0x5CD8],
- ["D6C5",0x5CD9],
- ["8D61",0x5CDA],
- ["8D62",0x5CDB],
- ["8D63",0x5CDC],
- ["8D64",0x5CDD],
- ["8D65",0x5CDE],
- ["8D66",0x5CDF],
- ["8D67",0x5CE0],
- ["CFBF",0x5CE1],
- ["8D68",0x5CE2],
- ["8D69",0x5CE3],
- ["E1BD",0x5CE4],
- ["E1BF",0x5CE5],
- ["C2CD",0x5CE6],
- ["8D6A",0x5CE7],
- ["B6EB",0x5CE8],
- ["8D6B",0x5CE9],
- ["D3F8",0x5CEA],
- ["8D6C",0x5CEB],
- ["8D6D",0x5CEC],
- ["C7CD",0x5CED],
- ["8D6E",0x5CEE],
- ["8D6F",0x5CEF],
- ["B7E5",0x5CF0],
- ["8D70",0x5CF1],
- ["8D71",0x5CF2],
- ["8D72",0x5CF3],
- ["8D73",0x5CF4],
- ["8D74",0x5CF5],
- ["8D75",0x5CF6],
- ["8D76",0x5CF7],
- ["8D77",0x5CF8],
- ["8D78",0x5CF9],
- ["8D79",0x5CFA],
- ["BEFE",0x5CFB],
- ["8D7A",0x5CFC],
- ["8D7B",0x5CFD],
- ["8D7C",0x5CFE],
- ["8D7D",0x5CFF],
- ["8D7E",0x5D00],
- ["8D80",0x5D01],
- ["E1C0",0x5D02],
- ["E1C1",0x5D03],
- ["8D81",0x5D04],
- ["8D82",0x5D05],
- ["E1C7",0x5D06],
- ["B3E7",0x5D07],
- ["8D83",0x5D08],
- ["8D84",0x5D09],
- ["8D85",0x5D0A],
- ["8D86",0x5D0B],
- ["8D87",0x5D0C],
- ["8D88",0x5D0D],
- ["C6E9",0x5D0E],
- ["8D89",0x5D0F],
- ["8D8A",0x5D10],
- ["8D8B",0x5D11],
- ["8D8C",0x5D12],
- ["8D8D",0x5D13],
- ["B4DE",0x5D14],
- ["8D8E",0x5D15],
- ["D1C2",0x5D16],
- ["8D8F",0x5D17],
- ["8D90",0x5D18],
- ["8D91",0x5D19],
- ["8D92",0x5D1A],
- ["E1C8",0x5D1B],
- ["8D93",0x5D1C],
- ["8D94",0x5D1D],
- ["E1C6",0x5D1E],
- ["8D95",0x5D1F],
- ["8D96",0x5D20],
- ["8D97",0x5D21],
- ["8D98",0x5D22],
- ["8D99",0x5D23],
- ["E1C5",0x5D24],
- ["8D9A",0x5D25],
- ["E1C3",0x5D26],
- ["E1C2",0x5D27],
- ["8D9B",0x5D28],
- ["B1C0",0x5D29],
- ["8D9C",0x5D2A],
- ["8D9D",0x5D2B],
- ["8D9E",0x5D2C],
- ["D5B8",0x5D2D],
- ["E1C4",0x5D2E],
- ["8D9F",0x5D2F],
- ["8DA0",0x5D30],
- ["8DA1",0x5D31],
- ["8DA2",0x5D32],
- ["8DA3",0x5D33],
- ["E1CB",0x5D34],
- ["8DA4",0x5D35],
- ["8DA5",0x5D36],
- ["8DA6",0x5D37],
- ["8DA7",0x5D38],
- ["8DA8",0x5D39],
- ["8DA9",0x5D3A],
- ["8DAA",0x5D3B],
- ["8DAB",0x5D3C],
- ["E1CC",0x5D3D],
- ["E1CA",0x5D3E],
- ["8DAC",0x5D3F],
- ["8DAD",0x5D40],
- ["8DAE",0x5D41],
- ["8DAF",0x5D42],
- ["8DB0",0x5D43],
- ["8DB1",0x5D44],
- ["8DB2",0x5D45],
- ["8DB3",0x5D46],
- ["EFFA",0x5D47],
- ["8DB4",0x5D48],
- ["8DB5",0x5D49],
- ["E1D3",0x5D4A],
- ["E1D2",0x5D4B],
- ["C7B6",0x5D4C],
- ["8DB6",0x5D4D],
- ["8DB7",0x5D4E],
- ["8DB8",0x5D4F],
- ["8DB9",0x5D50],
- ["8DBA",0x5D51],
- ["8DBB",0x5D52],
- ["8DBC",0x5D53],
- ["8DBD",0x5D54],
- ["8DBE",0x5D55],
- ["8DBF",0x5D56],
- ["8DC0",0x5D57],
- ["E1C9",0x5D58],
- ["8DC1",0x5D59],
- ["8DC2",0x5D5A],
- ["E1CE",0x5D5B],
- ["8DC3",0x5D5C],
- ["E1D0",0x5D5D],
- ["8DC4",0x5D5E],
- ["8DC5",0x5D5F],
- ["8DC6",0x5D60],
- ["8DC7",0x5D61],
- ["8DC8",0x5D62],
- ["8DC9",0x5D63],
- ["8DCA",0x5D64],
- ["8DCB",0x5D65],
- ["8DCC",0x5D66],
- ["8DCD",0x5D67],
- ["8DCE",0x5D68],
- ["E1D4",0x5D69],
- ["8DCF",0x5D6A],
- ["E1D1",0x5D6B],
- ["E1CD",0x5D6C],
- ["8DD0",0x5D6D],
- ["8DD1",0x5D6E],
- ["E1CF",0x5D6F],
- ["8DD2",0x5D70],
- ["8DD3",0x5D71],
- ["8DD4",0x5D72],
- ["8DD5",0x5D73],
- ["E1D5",0x5D74],
- ["8DD6",0x5D75],
- ["8DD7",0x5D76],
- ["8DD8",0x5D77],
- ["8DD9",0x5D78],
- ["8DDA",0x5D79],
- ["8DDB",0x5D7A],
- ["8DDC",0x5D7B],
- ["8DDD",0x5D7C],
- ["8DDE",0x5D7D],
- ["8DDF",0x5D7E],
- ["8DE0",0x5D7F],
- ["8DE1",0x5D80],
- ["8DE2",0x5D81],
- ["E1D6",0x5D82],
- ["8DE3",0x5D83],
- ["8DE4",0x5D84],
- ["8DE5",0x5D85],
- ["8DE6",0x5D86],
- ["8DE7",0x5D87],
- ["8DE8",0x5D88],
- ["8DE9",0x5D89],
- ["8DEA",0x5D8A],
- ["8DEB",0x5D8B],
- ["8DEC",0x5D8C],
- ["8DED",0x5D8D],
- ["8DEE",0x5D8E],
- ["8DEF",0x5D8F],
- ["8DF0",0x5D90],
- ["8DF1",0x5D91],
- ["8DF2",0x5D92],
- ["8DF3",0x5D93],
- ["8DF4",0x5D94],
- ["8DF5",0x5D95],
- ["8DF6",0x5D96],
- ["8DF7",0x5D97],
- ["8DF8",0x5D98],
- ["E1D7",0x5D99],
- ["8DF9",0x5D9A],
- ["8DFA",0x5D9B],
- ["8DFB",0x5D9C],
- ["E1D8",0x5D9D],
- ["8DFC",0x5D9E],
- ["8DFD",0x5D9F],
- ["8DFE",0x5DA0],
- ["8E40",0x5DA1],
- ["8E41",0x5DA2],
- ["8E42",0x5DA3],
- ["8E43",0x5DA4],
- ["8E44",0x5DA5],
- ["8E45",0x5DA6],
- ["8E46",0x5DA7],
- ["8E47",0x5DA8],
- ["8E48",0x5DA9],
- ["8E49",0x5DAA],
- ["8E4A",0x5DAB],
- ["8E4B",0x5DAC],
- ["8E4C",0x5DAD],
- ["8E4D",0x5DAE],
- ["8E4E",0x5DAF],
- ["8E4F",0x5DB0],
- ["8E50",0x5DB1],
- ["8E51",0x5DB2],
- ["8E52",0x5DB3],
- ["8E53",0x5DB4],
- ["8E54",0x5DB5],
- ["8E55",0x5DB6],
- ["E1DA",0x5DB7],
- ["8E56",0x5DB8],
- ["8E57",0x5DB9],
- ["8E58",0x5DBA],
- ["8E59",0x5DBB],
- ["8E5A",0x5DBC],
- ["8E5B",0x5DBD],
- ["8E5C",0x5DBE],
- ["8E5D",0x5DBF],
- ["8E5E",0x5DC0],
- ["8E5F",0x5DC1],
- ["8E60",0x5DC2],
- ["8E61",0x5DC3],
- ["8E62",0x5DC4],
- ["E1DB",0x5DC5],
- ["8E63",0x5DC6],
- ["8E64",0x5DC7],
- ["8E65",0x5DC8],
- ["8E66",0x5DC9],
- ["8E67",0x5DCA],
- ["8E68",0x5DCB],
- ["8E69",0x5DCC],
- ["CEA1",0x5DCD],
- ["8E6A",0x5DCE],
- ["8E6B",0x5DCF],
- ["8E6C",0x5DD0],
- ["8E6D",0x5DD1],
- ["8E6E",0x5DD2],
- ["8E6F",0x5DD3],
- ["8E70",0x5DD4],
- ["8E71",0x5DD5],
- ["8E72",0x5DD6],
- ["8E73",0x5DD7],
- ["8E74",0x5DD8],
- ["8E75",0x5DD9],
- ["8E76",0x5DDA],
- ["E7DD",0x5DDB],
- ["8E77",0x5DDC],
- ["B4A8",0x5DDD],
- ["D6DD",0x5DDE],
- ["8E78",0x5DDF],
- ["8E79",0x5DE0],
- ["D1B2",0x5DE1],
- ["B3B2",0x5DE2],
- ["8E7A",0x5DE3],
- ["8E7B",0x5DE4],
- ["B9A4",0x5DE5],
- ["D7F3",0x5DE6],
- ["C7C9",0x5DE7],
- ["BEDE",0x5DE8],
- ["B9AE",0x5DE9],
- ["8E7C",0x5DEA],
- ["CED7",0x5DEB],
- ["8E7D",0x5DEC],
- ["8E7E",0x5DED],
- ["B2EE",0x5DEE],
- ["DBCF",0x5DEF],
- ["8E80",0x5DF0],
- ["BCBA",0x5DF1],
- ["D2D1",0x5DF2],
- ["CBC8",0x5DF3],
- ["B0CD",0x5DF4],
- ["8E81",0x5DF5],
- ["8E82",0x5DF6],
- ["CFEF",0x5DF7],
- ["8E83",0x5DF8],
- ["8E84",0x5DF9],
- ["8E85",0x5DFA],
- ["8E86",0x5DFB],
- ["8E87",0x5DFC],
- ["D9E3",0x5DFD],
- ["BDED",0x5DFE],
- ["8E88",0x5DFF],
- ["8E89",0x5E00],
- ["B1D2",0x5E01],
- ["CAD0",0x5E02],
- ["B2BC",0x5E03],
- ["8E8A",0x5E04],
- ["CBA7",0x5E05],
- ["B7AB",0x5E06],
- ["8E8B",0x5E07],
- ["CAA6",0x5E08],
- ["8E8C",0x5E09],
- ["8E8D",0x5E0A],
- ["8E8E",0x5E0B],
- ["CFA3",0x5E0C],
- ["8E8F",0x5E0D],
- ["8E90",0x5E0E],
- ["E0F8",0x5E0F],
- ["D5CA",0x5E10],
- ["E0FB",0x5E11],
- ["8E91",0x5E12],
- ["8E92",0x5E13],
- ["E0FA",0x5E14],
- ["C5C1",0x5E15],
- ["CCFB",0x5E16],
- ["8E93",0x5E17],
- ["C1B1",0x5E18],
- ["E0F9",0x5E19],
- ["D6E3",0x5E1A],
- ["B2AF",0x5E1B],
- ["D6C4",0x5E1C],
- ["B5DB",0x5E1D],
- ["8E94",0x5E1E],
- ["8E95",0x5E1F],
- ["8E96",0x5E20],
- ["8E97",0x5E21],
- ["8E98",0x5E22],
- ["8E99",0x5E23],
- ["8E9A",0x5E24],
- ["8E9B",0x5E25],
- ["B4F8",0x5E26],
- ["D6A1",0x5E27],
- ["8E9C",0x5E28],
- ["8E9D",0x5E29],
- ["8E9E",0x5E2A],
- ["8E9F",0x5E2B],
- ["8EA0",0x5E2C],
- ["CFAF",0x5E2D],
- ["B0EF",0x5E2E],
- ["8EA1",0x5E2F],
- ["8EA2",0x5E30],
- ["E0FC",0x5E31],
- ["8EA3",0x5E32],
- ["8EA4",0x5E33],
- ["8EA5",0x5E34],
- ["8EA6",0x5E35],
- ["8EA7",0x5E36],
- ["E1A1",0x5E37],
- ["B3A3",0x5E38],
- ["8EA8",0x5E39],
- ["8EA9",0x5E3A],
- ["E0FD",0x5E3B],
- ["E0FE",0x5E3C],
- ["C3B1",0x5E3D],
- ["8EAA",0x5E3E],
- ["8EAB",0x5E3F],
- ["8EAC",0x5E40],
- ["8EAD",0x5E41],
- ["C3DD",0x5E42],
- ["8EAE",0x5E43],
- ["E1A2",0x5E44],
- ["B7F9",0x5E45],
- ["8EAF",0x5E46],
- ["8EB0",0x5E47],
- ["8EB1",0x5E48],
- ["8EB2",0x5E49],
- ["8EB3",0x5E4A],
- ["8EB4",0x5E4B],
- ["BBCF",0x5E4C],
- ["8EB5",0x5E4D],
- ["8EB6",0x5E4E],
- ["8EB7",0x5E4F],
- ["8EB8",0x5E50],
- ["8EB9",0x5E51],
- ["8EBA",0x5E52],
- ["8EBB",0x5E53],
- ["E1A3",0x5E54],
- ["C4BB",0x5E55],
- ["8EBC",0x5E56],
- ["8EBD",0x5E57],
- ["8EBE",0x5E58],
- ["8EBF",0x5E59],
- ["8EC0",0x5E5A],
- ["E1A4",0x5E5B],
- ["8EC1",0x5E5C],
- ["8EC2",0x5E5D],
- ["E1A5",0x5E5E],
- ["8EC3",0x5E5F],
- ["8EC4",0x5E60],
- ["E1A6",0x5E61],
- ["B4B1",0x5E62],
- ["8EC5",0x5E63],
- ["8EC6",0x5E64],
- ["8EC7",0x5E65],
- ["8EC8",0x5E66],
- ["8EC9",0x5E67],
- ["8ECA",0x5E68],
- ["8ECB",0x5E69],
- ["8ECC",0x5E6A],
- ["8ECD",0x5E6B],
- ["8ECE",0x5E6C],
- ["8ECF",0x5E6D],
- ["8ED0",0x5E6E],
- ["8ED1",0x5E6F],
- ["8ED2",0x5E70],
- ["8ED3",0x5E71],
- ["B8C9",0x5E72],
- ["C6BD",0x5E73],
- ["C4EA",0x5E74],
- ["8ED4",0x5E75],
- ["B2A2",0x5E76],
- ["8ED5",0x5E77],
- ["D0D2",0x5E78],
- ["8ED6",0x5E79],
- ["E7DB",0x5E7A],
- ["BBC3",0x5E7B],
- ["D3D7",0x5E7C],
- ["D3C4",0x5E7D],
- ["8ED7",0x5E7E],
- ["B9E3",0x5E7F],
- ["E2CF",0x5E80],
- ["8ED8",0x5E81],
- ["8ED9",0x5E82],
- ["8EDA",0x5E83],
- ["D7AF",0x5E84],
- ["8EDB",0x5E85],
- ["C7EC",0x5E86],
- ["B1D3",0x5E87],
- ["8EDC",0x5E88],
- ["8EDD",0x5E89],
- ["B4B2",0x5E8A],
- ["E2D1",0x5E8B],
- ["8EDE",0x5E8C],
- ["8EDF",0x5E8D],
- ["8EE0",0x5E8E],
- ["D0F2",0x5E8F],
- ["C2AE",0x5E90],
- ["E2D0",0x5E91],
- ["8EE1",0x5E92],
- ["BFE2",0x5E93],
- ["D3A6",0x5E94],
- ["B5D7",0x5E95],
- ["E2D2",0x5E96],
- ["B5EA",0x5E97],
- ["8EE2",0x5E98],
- ["C3ED",0x5E99],
- ["B8FD",0x5E9A],
- ["8EE3",0x5E9B],
- ["B8AE",0x5E9C],
- ["8EE4",0x5E9D],
- ["C5D3",0x5E9E],
- ["B7CF",0x5E9F],
- ["E2D4",0x5EA0],
- ["8EE5",0x5EA1],
- ["8EE6",0x5EA2],
- ["8EE7",0x5EA3],
- ["8EE8",0x5EA4],
- ["E2D3",0x5EA5],
- ["B6C8",0x5EA6],
- ["D7F9",0x5EA7],
- ["8EE9",0x5EA8],
- ["8EEA",0x5EA9],
- ["8EEB",0x5EAA],
- ["8EEC",0x5EAB],
- ["8EED",0x5EAC],
- ["CDA5",0x5EAD],
- ["8EEE",0x5EAE],
- ["8EEF",0x5EAF],
- ["8EF0",0x5EB0],
- ["8EF1",0x5EB1],
- ["8EF2",0x5EB2],
- ["E2D8",0x5EB3],
- ["8EF3",0x5EB4],
- ["E2D6",0x5EB5],
- ["CAFC",0x5EB6],
- ["BFB5",0x5EB7],
- ["D3B9",0x5EB8],
- ["E2D5",0x5EB9],
- ["8EF4",0x5EBA],
- ["8EF5",0x5EBB],
- ["8EF6",0x5EBC],
- ["8EF7",0x5EBD],
- ["E2D7",0x5EBE],
- ["8EF8",0x5EBF],
- ["8EF9",0x5EC0],
- ["8EFA",0x5EC1],
- ["8EFB",0x5EC2],
- ["8EFC",0x5EC3],
- ["8EFD",0x5EC4],
- ["8EFE",0x5EC5],
- ["8F40",0x5EC6],
- ["8F41",0x5EC7],
- ["8F42",0x5EC8],
- ["C1AE",0x5EC9],
- ["C0C8",0x5ECA],
- ["8F43",0x5ECB],
- ["8F44",0x5ECC],
- ["8F45",0x5ECD],
- ["8F46",0x5ECE],
- ["8F47",0x5ECF],
- ["8F48",0x5ED0],
- ["E2DB",0x5ED1],
- ["E2DA",0x5ED2],
- ["C0AA",0x5ED3],
- ["8F49",0x5ED4],
- ["8F4A",0x5ED5],
- ["C1CE",0x5ED6],
- ["8F4B",0x5ED7],
- ["8F4C",0x5ED8],
- ["8F4D",0x5ED9],
- ["8F4E",0x5EDA],
- ["E2DC",0x5EDB],
- ["8F4F",0x5EDC],
- ["8F50",0x5EDD],
- ["8F51",0x5EDE],
- ["8F52",0x5EDF],
- ["8F53",0x5EE0],
- ["8F54",0x5EE1],
- ["8F55",0x5EE2],
- ["8F56",0x5EE3],
- ["8F57",0x5EE4],
- ["8F58",0x5EE5],
- ["8F59",0x5EE6],
- ["8F5A",0x5EE7],
- ["E2DD",0x5EE8],
- ["8F5B",0x5EE9],
- ["E2DE",0x5EEA],
- ["8F5C",0x5EEB],
- ["8F5D",0x5EEC],
- ["8F5E",0x5EED],
- ["8F5F",0x5EEE],
- ["8F60",0x5EEF],
- ["8F61",0x5EF0],
- ["8F62",0x5EF1],
- ["8F63",0x5EF2],
- ["8F64",0x5EF3],
- ["DBC8",0x5EF4],
- ["8F65",0x5EF5],
- ["D1D3",0x5EF6],
- ["CDA2",0x5EF7],
- ["8F66",0x5EF8],
- ["8F67",0x5EF9],
- ["BDA8",0x5EFA],
- ["8F68",0x5EFB],
- ["8F69",0x5EFC],
- ["8F6A",0x5EFD],
- ["DEC3",0x5EFE],
- ["D8A5",0x5EFF],
- ["BFAA",0x5F00],
- ["DBCD",0x5F01],
- ["D2EC",0x5F02],
- ["C6FA",0x5F03],
- ["C5AA",0x5F04],
- ["8F6B",0x5F05],
- ["8F6C",0x5F06],
- ["8F6D",0x5F07],
- ["DEC4",0x5F08],
- ["8F6E",0x5F09],
- ["B1D7",0x5F0A],
- ["DFAE",0x5F0B],
- ["8F6F",0x5F0C],
- ["8F70",0x5F0D],
- ["8F71",0x5F0E],
- ["CABD",0x5F0F],
- ["8F72",0x5F10],
- ["DFB1",0x5F11],
- ["8F73",0x5F12],
- ["B9AD",0x5F13],
- ["8F74",0x5F14],
- ["D2FD",0x5F15],
- ["8F75",0x5F16],
- ["B8A5",0x5F17],
- ["BAEB",0x5F18],
- ["8F76",0x5F19],
- ["8F77",0x5F1A],
- ["B3DA",0x5F1B],
- ["8F78",0x5F1C],
- ["8F79",0x5F1D],
- ["8F7A",0x5F1E],
- ["B5DC",0x5F1F],
- ["D5C5",0x5F20],
- ["8F7B",0x5F21],
- ["8F7C",0x5F22],
- ["8F7D",0x5F23],
- ["8F7E",0x5F24],
- ["C3D6",0x5F25],
- ["CFD2",0x5F26],
- ["BBA1",0x5F27],
- ["8F80",0x5F28],
- ["E5F3",0x5F29],
- ["E5F2",0x5F2A],
- ["8F81",0x5F2B],
- ["8F82",0x5F2C],
- ["E5F4",0x5F2D],
- ["8F83",0x5F2E],
- ["CDE4",0x5F2F],
- ["8F84",0x5F30],
- ["C8F5",0x5F31],
- ["8F85",0x5F32],
- ["8F86",0x5F33],
- ["8F87",0x5F34],
- ["8F88",0x5F35],
- ["8F89",0x5F36],
- ["8F8A",0x5F37],
- ["8F8B",0x5F38],
- ["B5AF",0x5F39],
- ["C7BF",0x5F3A],
- ["8F8C",0x5F3B],
- ["E5F6",0x5F3C],
- ["8F8D",0x5F3D],
- ["8F8E",0x5F3E],
- ["8F8F",0x5F3F],
- ["ECB0",0x5F40],
- ["8F90",0x5F41],
- ["8F91",0x5F42],
- ["8F92",0x5F43],
- ["8F93",0x5F44],
- ["8F94",0x5F45],
- ["8F95",0x5F46],
- ["8F96",0x5F47],
- ["8F97",0x5F48],
- ["8F98",0x5F49],
- ["8F99",0x5F4A],
- ["8F9A",0x5F4B],
- ["8F9B",0x5F4C],
- ["8F9C",0x5F4D],
- ["8F9D",0x5F4E],
- ["8F9E",0x5F4F],
- ["E5E6",0x5F50],
- ["8F9F",0x5F51],
- ["B9E9",0x5F52],
- ["B5B1",0x5F53],
- ["8FA0",0x5F54],
- ["C2BC",0x5F55],
- ["E5E8",0x5F56],
- ["E5E7",0x5F57],
- ["E5E9",0x5F58],
- ["8FA1",0x5F59],
- ["8FA2",0x5F5A],
- ["8FA3",0x5F5B],
- ["8FA4",0x5F5C],
- ["D2CD",0x5F5D],
- ["8FA5",0x5F5E],
- ["8FA6",0x5F5F],
- ["8FA7",0x5F60],
- ["E1EA",0x5F61],
- ["D0CE",0x5F62],
- ["8FA8",0x5F63],
- ["CDAE",0x5F64],
- ["8FA9",0x5F65],
- ["D1E5",0x5F66],
- ["8FAA",0x5F67],
- ["8FAB",0x5F68],
- ["B2CA",0x5F69],
- ["B1EB",0x5F6A],
- ["8FAC",0x5F6B],
- ["B1F2",0x5F6C],
- ["C5ED",0x5F6D],
- ["8FAD",0x5F6E],
- ["8FAE",0x5F6F],
- ["D5C3",0x5F70],
- ["D3B0",0x5F71],
- ["8FAF",0x5F72],
- ["E1DC",0x5F73],
- ["8FB0",0x5F74],
- ["8FB1",0x5F75],
- ["8FB2",0x5F76],
- ["E1DD",0x5F77],
- ["8FB3",0x5F78],
- ["D2DB",0x5F79],
- ["8FB4",0x5F7A],
- ["B3B9",0x5F7B],
- ["B1CB",0x5F7C],
- ["8FB5",0x5F7D],
- ["8FB6",0x5F7E],
- ["8FB7",0x5F7F],
- ["CDF9",0x5F80],
- ["D5F7",0x5F81],
- ["E1DE",0x5F82],
- ["8FB8",0x5F83],
- ["BEB6",0x5F84],
- ["B4FD",0x5F85],
- ["8FB9",0x5F86],
- ["E1DF",0x5F87],
- ["BADC",0x5F88],
- ["E1E0",0x5F89],
- ["BBB2",0x5F8A],
- ["C2C9",0x5F8B],
- ["E1E1",0x5F8C],
- ["8FBA",0x5F8D],
- ["8FBB",0x5F8E],
- ["8FBC",0x5F8F],
- ["D0EC",0x5F90],
- ["8FBD",0x5F91],
- ["CDBD",0x5F92],
- ["8FBE",0x5F93],
- ["8FBF",0x5F94],
- ["E1E2",0x5F95],
- ["8FC0",0x5F96],
- ["B5C3",0x5F97],
- ["C5C7",0x5F98],
- ["E1E3",0x5F99],
- ["8FC1",0x5F9A],
- ["8FC2",0x5F9B],
- ["E1E4",0x5F9C],
- ["8FC3",0x5F9D],
- ["8FC4",0x5F9E],
- ["8FC5",0x5F9F],
- ["8FC6",0x5FA0],
- ["D3F9",0x5FA1],
- ["8FC7",0x5FA2],
- ["8FC8",0x5FA3],
- ["8FC9",0x5FA4],
- ["8FCA",0x5FA5],
- ["8FCB",0x5FA6],
- ["8FCC",0x5FA7],
- ["E1E5",0x5FA8],
- ["8FCD",0x5FA9],
- ["D1AD",0x5FAA],
- ["8FCE",0x5FAB],
- ["8FCF",0x5FAC],
- ["E1E6",0x5FAD],
- ["CEA2",0x5FAE],
- ["8FD0",0x5FAF],
- ["8FD1",0x5FB0],
- ["8FD2",0x5FB1],
- ["8FD3",0x5FB2],
- ["8FD4",0x5FB3],
- ["8FD5",0x5FB4],
- ["E1E7",0x5FB5],
- ["8FD6",0x5FB6],
- ["B5C2",0x5FB7],
- ["8FD7",0x5FB8],
- ["8FD8",0x5FB9],
- ["8FD9",0x5FBA],
- ["8FDA",0x5FBB],
- ["E1E8",0x5FBC],
- ["BBD5",0x5FBD],
- ["8FDB",0x5FBE],
- ["8FDC",0x5FBF],
- ["8FDD",0x5FC0],
- ["8FDE",0x5FC1],
- ["8FDF",0x5FC2],
- ["D0C4",0x5FC3],
- ["E2E0",0x5FC4],
- ["B1D8",0x5FC5],
- ["D2E4",0x5FC6],
- ["8FE0",0x5FC7],
- ["8FE1",0x5FC8],
- ["E2E1",0x5FC9],
- ["8FE2",0x5FCA],
- ["8FE3",0x5FCB],
- ["BCC9",0x5FCC],
- ["C8CC",0x5FCD],
- ["8FE4",0x5FCE],
- ["E2E3",0x5FCF],
- ["ECFE",0x5FD0],
- ["ECFD",0x5FD1],
- ["DFAF",0x5FD2],
- ["8FE5",0x5FD3],
- ["8FE6",0x5FD4],
- ["8FE7",0x5FD5],
- ["E2E2",0x5FD6],
- ["D6BE",0x5FD7],
- ["CDFC",0x5FD8],
- ["C3A6",0x5FD9],
- ["8FE8",0x5FDA],
- ["8FE9",0x5FDB],
- ["8FEA",0x5FDC],
- ["E3C3",0x5FDD],
- ["8FEB",0x5FDE],
- ["8FEC",0x5FDF],
- ["D6D2",0x5FE0],
- ["E2E7",0x5FE1],
- ["8FED",0x5FE2],
- ["8FEE",0x5FE3],
- ["E2E8",0x5FE4],
- ["8FEF",0x5FE5],
- ["8FF0",0x5FE6],
- ["D3C7",0x5FE7],
- ["8FF1",0x5FE8],
- ["8FF2",0x5FE9],
- ["E2EC",0x5FEA],
- ["BFEC",0x5FEB],
- ["8FF3",0x5FEC],
- ["E2ED",0x5FED],
- ["E2E5",0x5FEE],
- ["8FF4",0x5FEF],
- ["8FF5",0x5FF0],
- ["B3C0",0x5FF1],
- ["8FF6",0x5FF2],
- ["8FF7",0x5FF3],
- ["8FF8",0x5FF4],
- ["C4EE",0x5FF5],
- ["8FF9",0x5FF6],
- ["8FFA",0x5FF7],
- ["E2EE",0x5FF8],
- ["8FFB",0x5FF9],
- ["8FFC",0x5FFA],
- ["D0C3",0x5FFB],
- ["8FFD",0x5FFC],
- ["BAF6",0x5FFD],
- ["E2E9",0x5FFE],
- ["B7DE",0x5FFF],
- ["BBB3",0x6000],
- ["CCAC",0x6001],
- ["CBCB",0x6002],
- ["E2E4",0x6003],
- ["E2E6",0x6004],
- ["E2EA",0x6005],
- ["E2EB",0x6006],
- ["8FFE",0x6007],
- ["9040",0x6008],
- ["9041",0x6009],
- ["E2F7",0x600A],
- ["9042",0x600B],
- ["9043",0x600C],
- ["E2F4",0x600D],
- ["D4F5",0x600E],
- ["E2F3",0x600F],
- ["9044",0x6010],
- ["9045",0x6011],
- ["C5AD",0x6012],
- ["9046",0x6013],
- ["D5FA",0x6014],
- ["C5C2",0x6015],
- ["B2C0",0x6016],
- ["9047",0x6017],
- ["9048",0x6018],
- ["E2EF",0x6019],
- ["9049",0x601A],
- ["E2F2",0x601B],
- ["C1AF",0x601C],
- ["CBBC",0x601D],
- ["904A",0x601E],
- ["904B",0x601F],
- ["B5A1",0x6020],
- ["E2F9",0x6021],
- ["904C",0x6022],
- ["904D",0x6023],
- ["904E",0x6024],
- ["BCB1",0x6025],
- ["E2F1",0x6026],
- ["D0D4",0x6027],
- ["D4B9",0x6028],
- ["E2F5",0x6029],
- ["B9D6",0x602A],
- ["E2F6",0x602B],
- ["904F",0x602C],
- ["9050",0x602D],
- ["9051",0x602E],
- ["C7D3",0x602F],
- ["9052",0x6030],
- ["9053",0x6031],
- ["9054",0x6032],
- ["9055",0x6033],
- ["9056",0x6034],
- ["E2F0",0x6035],
- ["9057",0x6036],
- ["9058",0x6037],
- ["9059",0x6038],
- ["905A",0x6039],
- ["905B",0x603A],
- ["D7DC",0x603B],
- ["EDA1",0x603C],
- ["905C",0x603D],
- ["905D",0x603E],
- ["E2F8",0x603F],
- ["905E",0x6040],
- ["EDA5",0x6041],
- ["E2FE",0x6042],
- ["CAD1",0x6043],
- ["905F",0x6044],
- ["9060",0x6045],
- ["9061",0x6046],
- ["9062",0x6047],
- ["9063",0x6048],
- ["9064",0x6049],
- ["9065",0x604A],
- ["C1B5",0x604B],
- ["9066",0x604C],
- ["BBD0",0x604D],
- ["9067",0x604E],
- ["9068",0x604F],
- ["BFD6",0x6050],
- ["9069",0x6051],
- ["BAE3",0x6052],
- ["906A",0x6053],
- ["906B",0x6054],
- ["CBA1",0x6055],
- ["906C",0x6056],
- ["906D",0x6057],
- ["906E",0x6058],
- ["EDA6",0x6059],
- ["EDA3",0x605A],
- ["906F",0x605B],
- ["9070",0x605C],
- ["EDA2",0x605D],
- ["9071",0x605E],
- ["9072",0x605F],
- ["9073",0x6060],
- ["9074",0x6061],
- ["BBD6",0x6062],
- ["EDA7",0x6063],
- ["D0F4",0x6064],
- ["9075",0x6065],
- ["9076",0x6066],
- ["EDA4",0x6067],
- ["BADE",0x6068],
- ["B6F7",0x6069],
- ["E3A1",0x606A],
- ["B6B2",0x606B],
- ["CCF1",0x606C],
- ["B9A7",0x606D],
- ["9077",0x606E],
- ["CFA2",0x606F],
- ["C7A1",0x6070],
- ["9078",0x6071],
- ["9079",0x6072],
- ["BFD2",0x6073],
- ["907A",0x6074],
- ["907B",0x6075],
- ["B6F1",0x6076],
- ["907C",0x6077],
- ["E2FA",0x6078],
- ["E2FB",0x6079],
- ["E2FD",0x607A],
- ["E2FC",0x607B],
- ["C4D5",0x607C],
- ["E3A2",0x607D],
- ["907D",0x607E],
- ["D3C1",0x607F],
- ["907E",0x6080],
- ["9080",0x6081],
- ["9081",0x6082],
- ["E3A7",0x6083],
- ["C7C4",0x6084],
- ["9082",0x6085],
- ["9083",0x6086],
- ["9084",0x6087],
- ["9085",0x6088],
- ["CFA4",0x6089],
- ["9086",0x608A],
- ["9087",0x608B],
- ["E3A9",0x608C],
- ["BAB7",0x608D],
- ["9088",0x608E],
- ["9089",0x608F],
- ["908A",0x6090],
- ["908B",0x6091],
- ["E3A8",0x6092],
- ["908C",0x6093],
- ["BBDA",0x6094],
- ["908D",0x6095],
- ["E3A3",0x6096],
- ["908E",0x6097],
- ["908F",0x6098],
- ["9090",0x6099],
- ["E3A4",0x609A],
- ["E3AA",0x609B],
- ["9091",0x609C],
- ["E3A6",0x609D],
- ["9092",0x609E],
- ["CEF2",0x609F],
- ["D3C6",0x60A0],
- ["9093",0x60A1],
- ["9094",0x60A2],
- ["BBBC",0x60A3],
- ["9095",0x60A4],
- ["9096",0x60A5],
- ["D4C3",0x60A6],
- ["9097",0x60A7],
- ["C4FA",0x60A8],
- ["9098",0x60A9],
- ["9099",0x60AA],
- ["EDA8",0x60AB],
- ["D0FC",0x60AC],
- ["E3A5",0x60AD],
- ["909A",0x60AE],
- ["C3F5",0x60AF],
- ["909B",0x60B0],
- ["E3AD",0x60B1],
- ["B1AF",0x60B2],
- ["909C",0x60B3],
- ["E3B2",0x60B4],
- ["909D",0x60B5],
- ["909E",0x60B6],
- ["909F",0x60B7],
- ["BCC2",0x60B8],
- ["90A0",0x60B9],
- ["90A1",0x60BA],
- ["E3AC",0x60BB],
- ["B5BF",0x60BC],
- ["90A2",0x60BD],
- ["90A3",0x60BE],
- ["90A4",0x60BF],
- ["90A5",0x60C0],
- ["90A6",0x60C1],
- ["90A7",0x60C2],
- ["90A8",0x60C3],
- ["90A9",0x60C4],
- ["C7E9",0x60C5],
- ["E3B0",0x60C6],
- ["90AA",0x60C7],
- ["90AB",0x60C8],
- ["90AC",0x60C9],
- ["BEAA",0x60CA],
- ["CDEF",0x60CB],
- ["90AD",0x60CC],
- ["90AE",0x60CD],
- ["90AF",0x60CE],
- ["90B0",0x60CF],
- ["90B1",0x60D0],
- ["BBF3",0x60D1],
- ["90B2",0x60D2],
- ["90B3",0x60D3],
- ["90B4",0x60D4],
- ["CCE8",0x60D5],
- ["90B5",0x60D6],
- ["90B6",0x60D7],
- ["E3AF",0x60D8],
- ["90B7",0x60D9],
- ["E3B1",0x60DA],
- ["90B8",0x60DB],
- ["CFA7",0x60DC],
- ["E3AE",0x60DD],
- ["90B9",0x60DE],
- ["CEA9",0x60DF],
- ["BBDD",0x60E0],
- ["90BA",0x60E1],
- ["90BB",0x60E2],
- ["90BC",0x60E3],
- ["90BD",0x60E4],
- ["90BE",0x60E5],
- ["B5EB",0x60E6],
- ["BEE5",0x60E7],
- ["B2D2",0x60E8],
- ["B3CD",0x60E9],
- ["90BF",0x60EA],
- ["B1B9",0x60EB],
- ["E3AB",0x60EC],
- ["B2D1",0x60ED],
- ["B5AC",0x60EE],
- ["B9DF",0x60EF],
- ["B6E8",0x60F0],
- ["90C0",0x60F1],
- ["90C1",0x60F2],
- ["CFEB",0x60F3],
- ["E3B7",0x60F4],
- ["90C2",0x60F5],
- ["BBCC",0x60F6],
- ["90C3",0x60F7],
- ["90C4",0x60F8],
- ["C8C7",0x60F9],
- ["D0CA",0x60FA],
- ["90C5",0x60FB],
- ["90C6",0x60FC],
- ["90C7",0x60FD],
- ["90C8",0x60FE],
- ["90C9",0x60FF],
- ["E3B8",0x6100],
- ["B3EE",0x6101],
- ["90CA",0x6102],
- ["90CB",0x6103],
- ["90CC",0x6104],
- ["90CD",0x6105],
- ["EDA9",0x6106],
- ["90CE",0x6107],
- ["D3FA",0x6108],
- ["D3E4",0x6109],
- ["90CF",0x610A],
- ["90D0",0x610B],
- ["90D1",0x610C],
- ["EDAA",0x610D],
- ["E3B9",0x610E],
- ["D2E2",0x610F],
- ["90D2",0x6110],
- ["90D3",0x6111],
- ["90D4",0x6112],
- ["90D5",0x6113],
- ["90D6",0x6114],
- ["E3B5",0x6115],
- ["90D7",0x6116],
- ["90D8",0x6117],
- ["90D9",0x6118],
- ["90DA",0x6119],
- ["D3DE",0x611A],
- ["90DB",0x611B],
- ["90DC",0x611C],
- ["90DD",0x611D],
- ["90DE",0x611E],
- ["B8D0",0x611F],
- ["E3B3",0x6120],
- ["90DF",0x6121],
- ["90E0",0x6122],
- ["E3B6",0x6123],
- ["B7DF",0x6124],
- ["90E1",0x6125],
- ["E3B4",0x6126],
- ["C0A2",0x6127],
- ["90E2",0x6128],
- ["90E3",0x6129],
- ["90E4",0x612A],
- ["E3BA",0x612B],
- ["90E5",0x612C],
- ["90E6",0x612D],
- ["90E7",0x612E],
- ["90E8",0x612F],
- ["90E9",0x6130],
- ["90EA",0x6131],
- ["90EB",0x6132],
- ["90EC",0x6133],
- ["90ED",0x6134],
- ["90EE",0x6135],
- ["90EF",0x6136],
- ["90F0",0x6137],
- ["90F1",0x6138],
- ["90F2",0x6139],
- ["90F3",0x613A],
- ["90F4",0x613B],
- ["90F5",0x613C],
- ["90F6",0x613D],
- ["90F7",0x613E],
- ["D4B8",0x613F],
- ["90F8",0x6140],
- ["90F9",0x6141],
- ["90FA",0x6142],
- ["90FB",0x6143],
- ["90FC",0x6144],
- ["90FD",0x6145],
- ["90FE",0x6146],
- ["9140",0x6147],
- ["B4C8",0x6148],
- ["9141",0x6149],
- ["E3BB",0x614A],
- ["9142",0x614B],
- ["BBC5",0x614C],
- ["9143",0x614D],
- ["C9F7",0x614E],
- ["9144",0x614F],
- ["9145",0x6150],
- ["C9E5",0x6151],
- ["9146",0x6152],
- ["9147",0x6153],
- ["9148",0x6154],
- ["C4BD",0x6155],
- ["9149",0x6156],
- ["914A",0x6157],
- ["914B",0x6158],
- ["914C",0x6159],
- ["914D",0x615A],
- ["914E",0x615B],
- ["914F",0x615C],
- ["EDAB",0x615D],
- ["9150",0x615E],
- ["9151",0x615F],
- ["9152",0x6160],
- ["9153",0x6161],
- ["C2FD",0x6162],
- ["9154",0x6163],
- ["9155",0x6164],
- ["9156",0x6165],
- ["9157",0x6166],
- ["BBDB",0x6167],
- ["BFAE",0x6168],
- ["9158",0x6169],
- ["9159",0x616A],
- ["915A",0x616B],
- ["915B",0x616C],
- ["915C",0x616D],
- ["915D",0x616E],
- ["915E",0x616F],
- ["CEBF",0x6170],
- ["915F",0x6171],
- ["9160",0x6172],
- ["9161",0x6173],
- ["9162",0x6174],
- ["E3BC",0x6175],
- ["9163",0x6176],
- ["BFB6",0x6177],
- ["9164",0x6178],
- ["9165",0x6179],
- ["9166",0x617A],
- ["9167",0x617B],
- ["9168",0x617C],
- ["9169",0x617D],
- ["916A",0x617E],
- ["916B",0x617F],
- ["916C",0x6180],
- ["916D",0x6181],
- ["916E",0x6182],
- ["916F",0x6183],
- ["9170",0x6184],
- ["9171",0x6185],
- ["9172",0x6186],
- ["9173",0x6187],
- ["9174",0x6188],
- ["9175",0x6189],
- ["9176",0x618A],
- ["B1EF",0x618B],
- ["9177",0x618C],
- ["9178",0x618D],
- ["D4F7",0x618E],
- ["9179",0x618F],
- ["917A",0x6190],
- ["917B",0x6191],
- ["917C",0x6192],
- ["917D",0x6193],
- ["E3BE",0x6194],
- ["917E",0x6195],
- ["9180",0x6196],
- ["9181",0x6197],
- ["9182",0x6198],
- ["9183",0x6199],
- ["9184",0x619A],
- ["9185",0x619B],
- ["9186",0x619C],
- ["EDAD",0x619D],
- ["9187",0x619E],
- ["9188",0x619F],
- ["9189",0x61A0],
- ["918A",0x61A1],
- ["918B",0x61A2],
- ["918C",0x61A3],
- ["918D",0x61A4],
- ["918E",0x61A5],
- ["918F",0x61A6],
- ["E3BF",0x61A7],
- ["BAA9",0x61A8],
- ["EDAC",0x61A9],
- ["9190",0x61AA],
- ["9191",0x61AB],
- ["E3BD",0x61AC],
- ["9192",0x61AD],
- ["9193",0x61AE],
- ["9194",0x61AF],
- ["9195",0x61B0],
- ["9196",0x61B1],
- ["9197",0x61B2],
- ["9198",0x61B3],
- ["9199",0x61B4],
- ["919A",0x61B5],
- ["919B",0x61B6],
- ["E3C0",0x61B7],
- ["919C",0x61B8],
- ["919D",0x61B9],
- ["919E",0x61BA],
- ["919F",0x61BB],
- ["91A0",0x61BC],
- ["91A1",0x61BD],
- ["BAB6",0x61BE],
- ["91A2",0x61BF],
- ["91A3",0x61C0],
- ["91A4",0x61C1],
- ["B6AE",0x61C2],
- ["91A5",0x61C3],
- ["91A6",0x61C4],
- ["91A7",0x61C5],
- ["91A8",0x61C6],
- ["91A9",0x61C7],
- ["D0B8",0x61C8],
- ["91AA",0x61C9],
- ["B0C3",0x61CA],
- ["EDAE",0x61CB],
- ["91AB",0x61CC],
- ["91AC",0x61CD],
- ["91AD",0x61CE],
- ["91AE",0x61CF],
- ["91AF",0x61D0],
- ["EDAF",0x61D1],
- ["C0C1",0x61D2],
- ["91B0",0x61D3],
- ["E3C1",0x61D4],
- ["91B1",0x61D5],
- ["91B2",0x61D6],
- ["91B3",0x61D7],
- ["91B4",0x61D8],
- ["91B5",0x61D9],
- ["91B6",0x61DA],
- ["91B7",0x61DB],
- ["91B8",0x61DC],
- ["91B9",0x61DD],
- ["91BA",0x61DE],
- ["91BB",0x61DF],
- ["91BC",0x61E0],
- ["91BD",0x61E1],
- ["91BE",0x61E2],
- ["91BF",0x61E3],
- ["91C0",0x61E4],
- ["91C1",0x61E5],
- ["C5B3",0x61E6],
- ["91C2",0x61E7],
- ["91C3",0x61E8],
- ["91C4",0x61E9],
- ["91C5",0x61EA],
- ["91C6",0x61EB],
- ["91C7",0x61EC],
- ["91C8",0x61ED],
- ["91C9",0x61EE],
- ["91CA",0x61EF],
- ["91CB",0x61F0],
- ["91CC",0x61F1],
- ["91CD",0x61F2],
- ["91CE",0x61F3],
- ["91CF",0x61F4],
- ["E3C2",0x61F5],
- ["91D0",0x61F6],
- ["91D1",0x61F7],
- ["91D2",0x61F8],
- ["91D3",0x61F9],
- ["91D4",0x61FA],
- ["91D5",0x61FB],
- ["91D6",0x61FC],
- ["91D7",0x61FD],
- ["91D8",0x61FE],
- ["DCB2",0x61FF],
- ["91D9",0x6200],
- ["91DA",0x6201],
- ["91DB",0x6202],
- ["91DC",0x6203],
- ["91DD",0x6204],
- ["91DE",0x6205],
- ["EDB0",0x6206],
- ["91DF",0x6207],
- ["B8EA",0x6208],
- ["91E0",0x6209],
- ["CEEC",0x620A],
- ["EAA7",0x620B],
- ["D0E7",0x620C],
- ["CAF9",0x620D],
- ["C8D6",0x620E],
- ["CFB7",0x620F],
- ["B3C9",0x6210],
- ["CED2",0x6211],
- ["BDE4",0x6212],
- ["91E1",0x6213],
- ["91E2",0x6214],
- ["E3DE",0x6215],
- ["BBF2",0x6216],
- ["EAA8",0x6217],
- ["D5BD",0x6218],
- ["91E3",0x6219],
- ["C6DD",0x621A],
- ["EAA9",0x621B],
- ["91E4",0x621C],
- ["91E5",0x621D],
- ["91E6",0x621E],
- ["EAAA",0x621F],
- ["91E7",0x6220],
- ["EAAC",0x6221],
- ["EAAB",0x6222],
- ["91E8",0x6223],
- ["EAAE",0x6224],
- ["EAAD",0x6225],
- ["91E9",0x6226],
- ["91EA",0x6227],
- ["91EB",0x6228],
- ["91EC",0x6229],
- ["BDD8",0x622A],
- ["91ED",0x622B],
- ["EAAF",0x622C],
- ["91EE",0x622D],
- ["C2BE",0x622E],
- ["91EF",0x622F],
- ["91F0",0x6230],
- ["91F1",0x6231],
- ["91F2",0x6232],
- ["B4C1",0x6233],
- ["B4F7",0x6234],
- ["91F3",0x6235],
- ["91F4",0x6236],
- ["BBA7",0x6237],
- ["91F5",0x6238],
- ["91F6",0x6239],
- ["91F7",0x623A],
- ["91F8",0x623B],
- ["91F9",0x623C],
- ["ECE6",0x623D],
- ["ECE5",0x623E],
- ["B7BF",0x623F],
- ["CBF9",0x6240],
- ["B1E2",0x6241],
- ["91FA",0x6242],
- ["ECE7",0x6243],
- ["91FB",0x6244],
- ["91FC",0x6245],
- ["91FD",0x6246],
- ["C9C8",0x6247],
- ["ECE8",0x6248],
- ["ECE9",0x6249],
- ["91FE",0x624A],
- ["CAD6",0x624B],
- ["DED0",0x624C],
- ["B2C5",0x624D],
- ["D4FA",0x624E],
- ["9240",0x624F],
- ["9241",0x6250],
- ["C6CB",0x6251],
- ["B0C7",0x6252],
- ["B4F2",0x6253],
- ["C8D3",0x6254],
- ["9242",0x6255],
- ["9243",0x6256],
- ["9244",0x6257],
- ["CDD0",0x6258],
- ["9245",0x6259],
- ["9246",0x625A],
- ["BFB8",0x625B],
- ["9247",0x625C],
- ["9248",0x625D],
- ["9249",0x625E],
- ["924A",0x625F],
- ["924B",0x6260],
- ["924C",0x6261],
- ["924D",0x6262],
- ["BFDB",0x6263],
- ["924E",0x6264],
- ["924F",0x6265],
- ["C7A4",0x6266],
- ["D6B4",0x6267],
- ["9250",0x6268],
- ["C0A9",0x6269],
- ["DED1",0x626A],
- ["C9A8",0x626B],
- ["D1EF",0x626C],
- ["C5A4",0x626D],
- ["B0E7",0x626E],
- ["B3B6",0x626F],
- ["C8C5",0x6270],
- ["9251",0x6271],
- ["9252",0x6272],
- ["B0E2",0x6273],
- ["9253",0x6274],
- ["9254",0x6275],
- ["B7F6",0x6276],
- ["9255",0x6277],
- ["9256",0x6278],
- ["C5FA",0x6279],
- ["9257",0x627A],
- ["9258",0x627B],
- ["B6F3",0x627C],
- ["9259",0x627D],
- ["D5D2",0x627E],
- ["B3D0",0x627F],
- ["BCBC",0x6280],
- ["925A",0x6281],
- ["925B",0x6282],
- ["925C",0x6283],
- ["B3AD",0x6284],
- ["925D",0x6285],
- ["925E",0x6286],
- ["925F",0x6287],
- ["9260",0x6288],
- ["BEF1",0x6289],
- ["B0D1",0x628A],
- ["9261",0x628B],
- ["9262",0x628C],
- ["9263",0x628D],
- ["9264",0x628E],
- ["9265",0x628F],
- ["9266",0x6290],
- ["D2D6",0x6291],
- ["CAE3",0x6292],
- ["D7A5",0x6293],
- ["9267",0x6294],
- ["CDB6",0x6295],
- ["B6B6",0x6296],
- ["BFB9",0x6297],
- ["D5DB",0x6298],
- ["9268",0x6299],
- ["B8A7",0x629A],
- ["C5D7",0x629B],
- ["9269",0x629C],
- ["926A",0x629D],
- ["926B",0x629E],
- ["DED2",0x629F],
- ["BFD9",0x62A0],
- ["C2D5",0x62A1],
- ["C7C0",0x62A2],
- ["926C",0x62A3],
- ["BBA4",0x62A4],
- ["B1A8",0x62A5],
- ["926D",0x62A6],
- ["926E",0x62A7],
- ["C5EA",0x62A8],
- ["926F",0x62A9],
- ["9270",0x62AA],
- ["C5FB",0x62AB],
- ["CCA7",0x62AC],
- ["9271",0x62AD],
- ["9272",0x62AE],
- ["9273",0x62AF],
- ["9274",0x62B0],
- ["B1A7",0x62B1],
- ["9275",0x62B2],
- ["9276",0x62B3],
- ["9277",0x62B4],
- ["B5D6",0x62B5],
- ["9278",0x62B6],
- ["9279",0x62B7],
- ["927A",0x62B8],
- ["C4A8",0x62B9],
- ["927B",0x62BA],
- ["DED3",0x62BB],
- ["D1BA",0x62BC],
- ["B3E9",0x62BD],
- ["927C",0x62BE],
- ["C3F2",0x62BF],
- ["927D",0x62C0],
- ["927E",0x62C1],
- ["B7F7",0x62C2],
- ["9280",0x62C3],
- ["D6F4",0x62C4],
- ["B5A3",0x62C5],
- ["B2F0",0x62C6],
- ["C4B4",0x62C7],
- ["C4E9",0x62C8],
- ["C0AD",0x62C9],
- ["DED4",0x62CA],
- ["9281",0x62CB],
- ["B0E8",0x62CC],
- ["C5C4",0x62CD],
- ["C1E0",0x62CE],
- ["9282",0x62CF],
- ["B9D5",0x62D0],
- ["9283",0x62D1],
- ["BEDC",0x62D2],
- ["CDD8",0x62D3],
- ["B0CE",0x62D4],
- ["9284",0x62D5],
- ["CDCF",0x62D6],
- ["DED6",0x62D7],
- ["BED0",0x62D8],
- ["D7BE",0x62D9],
- ["DED5",0x62DA],
- ["D5D0",0x62DB],
- ["B0DD",0x62DC],
- ["9285",0x62DD],
- ["9286",0x62DE],
- ["C4E2",0x62DF],
- ["9287",0x62E0],
- ["9288",0x62E1],
- ["C2A3",0x62E2],
- ["BCF0",0x62E3],
- ["9289",0x62E4],
- ["D3B5",0x62E5],
- ["C0B9",0x62E6],
- ["C5A1",0x62E7],
- ["B2A6",0x62E8],
- ["D4F1",0x62E9],
- ["928A",0x62EA],
- ["928B",0x62EB],
- ["C0A8",0x62EC],
- ["CAC3",0x62ED],
- ["DED7",0x62EE],
- ["D5FC",0x62EF],
- ["928C",0x62F0],
- ["B9B0",0x62F1],
- ["928D",0x62F2],
- ["C8AD",0x62F3],
- ["CBA9",0x62F4],
- ["928E",0x62F5],
- ["DED9",0x62F6],
- ["BFBD",0x62F7],
- ["928F",0x62F8],
- ["9290",0x62F9],
- ["9291",0x62FA],
- ["9292",0x62FB],
- ["C6B4",0x62FC],
- ["D7A7",0x62FD],
- ["CAB0",0x62FE],
- ["C4C3",0x62FF],
- ["9293",0x6300],
- ["B3D6",0x6301],
- ["B9D2",0x6302],
- ["9294",0x6303],
- ["9295",0x6304],
- ["9296",0x6305],
- ["9297",0x6306],
- ["D6B8",0x6307],
- ["EAFC",0x6308],
- ["B0B4",0x6309],
- ["9298",0x630A],
- ["9299",0x630B],
- ["929A",0x630C],
- ["929B",0x630D],
- ["BFE6",0x630E],
- ["929C",0x630F],
- ["929D",0x6310],
- ["CCF4",0x6311],
- ["929E",0x6312],
- ["929F",0x6313],
- ["92A0",0x6314],
- ["92A1",0x6315],
- ["CDDA",0x6316],
- ["92A2",0x6317],
- ["92A3",0x6318],
- ["92A4",0x6319],
- ["D6BF",0x631A],
- ["C2CE",0x631B],
- ["92A5",0x631C],
- ["CECE",0x631D],
- ["CCA2",0x631E],
- ["D0AE",0x631F],
- ["C4D3",0x6320],
- ["B5B2",0x6321],
- ["DED8",0x6322],
- ["D5F5",0x6323],
- ["BCB7",0x6324],
- ["BBD3",0x6325],
- ["92A6",0x6326],
- ["92A7",0x6327],
- ["B0A4",0x6328],
- ["92A8",0x6329],
- ["C5B2",0x632A],
- ["B4EC",0x632B],
- ["92A9",0x632C],
- ["92AA",0x632D],
- ["92AB",0x632E],
- ["D5F1",0x632F],
- ["92AC",0x6330],
- ["92AD",0x6331],
- ["EAFD",0x6332],
- ["92AE",0x6333],
- ["92AF",0x6334],
- ["92B0",0x6335],
- ["92B1",0x6336],
- ["92B2",0x6337],
- ["92B3",0x6338],
- ["DEDA",0x6339],
- ["CDA6",0x633A],
- ["92B4",0x633B],
- ["92B5",0x633C],
- ["CDEC",0x633D],
- ["92B6",0x633E],
- ["92B7",0x633F],
- ["92B8",0x6340],
- ["92B9",0x6341],
- ["CEE6",0x6342],
- ["DEDC",0x6343],
- ["92BA",0x6344],
- ["CDB1",0x6345],
- ["C0A6",0x6346],
- ["92BB",0x6347],
- ["92BC",0x6348],
- ["D7BD",0x6349],
- ["92BD",0x634A],
- ["DEDB",0x634B],
- ["B0C6",0x634C],
- ["BAB4",0x634D],
- ["C9D3",0x634E],
- ["C4F3",0x634F],
- ["BEE8",0x6350],
- ["92BE",0x6351],
- ["92BF",0x6352],
- ["92C0",0x6353],
- ["92C1",0x6354],
- ["B2B6",0x6355],
- ["92C2",0x6356],
- ["92C3",0x6357],
- ["92C4",0x6358],
- ["92C5",0x6359],
- ["92C6",0x635A],
- ["92C7",0x635B],
- ["92C8",0x635C],
- ["92C9",0x635D],
- ["C0CC",0x635E],
- ["CBF0",0x635F],
- ["92CA",0x6360],
- ["BCF1",0x6361],
- ["BBBB",0x6362],
- ["B5B7",0x6363],
- ["92CB",0x6364],
- ["92CC",0x6365],
- ["92CD",0x6366],
- ["C5F5",0x6367],
- ["92CE",0x6368],
- ["DEE6",0x6369],
- ["92CF",0x636A],
- ["92D0",0x636B],
- ["92D1",0x636C],
- ["DEE3",0x636D],
- ["BEDD",0x636E],
- ["92D2",0x636F],
- ["92D3",0x6370],
- ["DEDF",0x6371],
- ["92D4",0x6372],
- ["92D5",0x6373],
- ["92D6",0x6374],
- ["92D7",0x6375],
- ["B4B7",0x6376],
- ["BDDD",0x6377],
- ["92D8",0x6378],
- ["92D9",0x6379],
- ["DEE0",0x637A],
- ["C4ED",0x637B],
- ["92DA",0x637C],
- ["92DB",0x637D],
- ["92DC",0x637E],
- ["92DD",0x637F],
- ["CFC6",0x6380],
- ["92DE",0x6381],
- ["B5E0",0x6382],
- ["92DF",0x6383],
- ["92E0",0x6384],
- ["92E1",0x6385],
- ["92E2",0x6386],
- ["B6DE",0x6387],
- ["CADA",0x6388],
- ["B5F4",0x6389],
- ["DEE5",0x638A],
- ["92E3",0x638B],
- ["D5C6",0x638C],
- ["92E4",0x638D],
- ["DEE1",0x638E],
- ["CCCD",0x638F],
- ["C6FE",0x6390],
- ["92E5",0x6391],
- ["C5C5",0x6392],
- ["92E6",0x6393],
- ["92E7",0x6394],
- ["92E8",0x6395],
- ["D2B4",0x6396],
- ["92E9",0x6397],
- ["BEF2",0x6398],
- ["92EA",0x6399],
- ["92EB",0x639A],
- ["92EC",0x639B],
- ["92ED",0x639C],
- ["92EE",0x639D],
- ["92EF",0x639E],
- ["92F0",0x639F],
- ["C2D3",0x63A0],
- ["92F1",0x63A1],
- ["CCBD",0x63A2],
- ["B3B8",0x63A3],
- ["92F2",0x63A4],
- ["BDD3",0x63A5],
- ["92F3",0x63A6],
- ["BFD8",0x63A7],
- ["CDC6",0x63A8],
- ["D1DA",0x63A9],
- ["B4EB",0x63AA],
- ["92F4",0x63AB],
- ["DEE4",0x63AC],
- ["DEDD",0x63AD],
- ["DEE7",0x63AE],
- ["92F5",0x63AF],
- ["EAFE",0x63B0],
- ["92F6",0x63B1],
- ["92F7",0x63B2],
- ["C2B0",0x63B3],
- ["DEE2",0x63B4],
- ["92F8",0x63B5],
- ["92F9",0x63B6],
- ["D6C0",0x63B7],
- ["B5A7",0x63B8],
- ["92FA",0x63B9],
- ["B2F4",0x63BA],
- ["92FB",0x63BB],
- ["DEE8",0x63BC],
- ["92FC",0x63BD],
- ["DEF2",0x63BE],
- ["92FD",0x63BF],
- ["92FE",0x63C0],
- ["9340",0x63C1],
- ["9341",0x63C2],
- ["9342",0x63C3],
- ["DEED",0x63C4],
- ["9343",0x63C5],
- ["DEF1",0x63C6],
- ["9344",0x63C7],
- ["9345",0x63C8],
- ["C8E0",0x63C9],
- ["9346",0x63CA],
- ["9347",0x63CB],
- ["9348",0x63CC],
- ["D7E1",0x63CD],
- ["DEEF",0x63CE],
- ["C3E8",0x63CF],
- ["CCE1",0x63D0],
- ["9349",0x63D1],
- ["B2E5",0x63D2],
- ["934A",0x63D3],
- ["934B",0x63D4],
- ["934C",0x63D5],
- ["D2BE",0x63D6],
- ["934D",0x63D7],
- ["934E",0x63D8],
- ["934F",0x63D9],
- ["9350",0x63DA],
- ["9351",0x63DB],
- ["9352",0x63DC],
- ["9353",0x63DD],
- ["DEEE",0x63DE],
- ["9354",0x63DF],
- ["DEEB",0x63E0],
- ["CED5",0x63E1],
- ["9355",0x63E2],
- ["B4A7",0x63E3],
- ["9356",0x63E4],
- ["9357",0x63E5],
- ["9358",0x63E6],
- ["9359",0x63E7],
- ["935A",0x63E8],
- ["BFAB",0x63E9],
- ["BEBE",0x63EA],
- ["935B",0x63EB],
- ["935C",0x63EC],
- ["BDD2",0x63ED],
- ["935D",0x63EE],
- ["935E",0x63EF],
- ["935F",0x63F0],
- ["9360",0x63F1],
- ["DEE9",0x63F2],
- ["9361",0x63F3],
- ["D4AE",0x63F4],
- ["9362",0x63F5],
- ["DEDE",0x63F6],
- ["9363",0x63F7],
- ["DEEA",0x63F8],
- ["9364",0x63F9],
- ["9365",0x63FA],
- ["9366",0x63FB],
- ["9367",0x63FC],
- ["C0BF",0x63FD],
- ["9368",0x63FE],
- ["DEEC",0x63FF],
- ["B2F3",0x6400],
- ["B8E9",0x6401],
- ["C2A7",0x6402],
- ["9369",0x6403],
- ["936A",0x6404],
- ["BDC1",0x6405],
- ["936B",0x6406],
- ["936C",0x6407],
- ["936D",0x6408],
- ["936E",0x6409],
- ["936F",0x640A],
- ["DEF5",0x640B],
- ["DEF8",0x640C],
- ["9370",0x640D],
- ["9371",0x640E],
- ["B2AB",0x640F],
- ["B4A4",0x6410],
- ["9372",0x6411],
- ["9373",0x6412],
- ["B4EA",0x6413],
- ["C9A6",0x6414],
- ["9374",0x6415],
- ["9375",0x6416],
- ["9376",0x6417],
- ["9377",0x6418],
- ["9378",0x6419],
- ["9379",0x641A],
- ["DEF6",0x641B],
- ["CBD1",0x641C],
- ["937A",0x641D],
- ["B8E3",0x641E],
- ["937B",0x641F],
- ["DEF7",0x6420],
- ["DEFA",0x6421],
- ["937C",0x6422],
- ["937D",0x6423],
- ["937E",0x6424],
- ["9380",0x6425],
- ["DEF9",0x6426],
- ["9381",0x6427],
- ["9382",0x6428],
- ["9383",0x6429],
- ["CCC2",0x642A],
- ["9384",0x642B],
- ["B0E1",0x642C],
- ["B4EE",0x642D],
- ["9385",0x642E],
- ["9386",0x642F],
- ["9387",0x6430],
- ["9388",0x6431],
- ["9389",0x6432],
- ["938A",0x6433],
- ["E5BA",0x6434],
- ["938B",0x6435],
- ["938C",0x6436],
- ["938D",0x6437],
- ["938E",0x6438],
- ["938F",0x6439],
- ["D0AF",0x643A],
- ["9390",0x643B],
- ["9391",0x643C],
- ["B2EB",0x643D],
- ["9392",0x643E],
- ["EBA1",0x643F],
- ["9393",0x6440],
- ["DEF4",0x6441],
- ["9394",0x6442],
- ["9395",0x6443],
- ["C9E3",0x6444],
- ["DEF3",0x6445],
- ["B0DA",0x6446],
- ["D2A1",0x6447],
- ["B1F7",0x6448],
- ["9396",0x6449],
- ["CCAF",0x644A],
- ["9397",0x644B],
- ["9398",0x644C],
- ["9399",0x644D],
- ["939A",0x644E],
- ["939B",0x644F],
- ["939C",0x6450],
- ["939D",0x6451],
- ["DEF0",0x6452],
- ["939E",0x6453],
- ["CBA4",0x6454],
- ["939F",0x6455],
- ["93A0",0x6456],
- ["93A1",0x6457],
- ["D5AA",0x6458],
- ["93A2",0x6459],
- ["93A3",0x645A],
- ["93A4",0x645B],
- ["93A5",0x645C],
- ["93A6",0x645D],
- ["DEFB",0x645E],
- ["93A7",0x645F],
- ["93A8",0x6460],
- ["93A9",0x6461],
- ["93AA",0x6462],
- ["93AB",0x6463],
- ["93AC",0x6464],
- ["93AD",0x6465],
- ["93AE",0x6466],
- ["B4DD",0x6467],
- ["93AF",0x6468],
- ["C4A6",0x6469],
- ["93B0",0x646A],
- ["93B1",0x646B],
- ["93B2",0x646C],
- ["DEFD",0x646D],
- ["93B3",0x646E],
- ["93B4",0x646F],
- ["93B5",0x6470],
- ["93B6",0x6471],
- ["93B7",0x6472],
- ["93B8",0x6473],
- ["93B9",0x6474],
- ["93BA",0x6475],
- ["93BB",0x6476],
- ["93BC",0x6477],
- ["C3FE",0x6478],
- ["C4A1",0x6479],
- ["DFA1",0x647A],
- ["93BD",0x647B],
- ["93BE",0x647C],
- ["93BF",0x647D],
- ["93C0",0x647E],
- ["93C1",0x647F],
- ["93C2",0x6480],
- ["93C3",0x6481],
- ["C1CC",0x6482],
- ["93C4",0x6483],
- ["DEFC",0x6484],
- ["BEEF",0x6485],
- ["93C5",0x6486],
- ["C6B2",0x6487],
- ["93C6",0x6488],
- ["93C7",0x6489],
- ["93C8",0x648A],
- ["93C9",0x648B],
- ["93CA",0x648C],
- ["93CB",0x648D],
- ["93CC",0x648E],
- ["93CD",0x648F],
- ["93CE",0x6490],
- ["B3C5",0x6491],
- ["C8F6",0x6492],
- ["93CF",0x6493],
- ["93D0",0x6494],
- ["CBBA",0x6495],
- ["DEFE",0x6496],
- ["93D1",0x6497],
- ["93D2",0x6498],
- ["DFA4",0x6499],
- ["93D3",0x649A],
- ["93D4",0x649B],
- ["93D5",0x649C],
- ["93D6",0x649D],
- ["D7B2",0x649E],
- ["93D7",0x649F],
- ["93D8",0x64A0],
- ["93D9",0x64A1],
- ["93DA",0x64A2],
- ["93DB",0x64A3],
- ["B3B7",0x64A4],
- ["93DC",0x64A5],
- ["93DD",0x64A6],
- ["93DE",0x64A7],
- ["93DF",0x64A8],
- ["C1C3",0x64A9],
- ["93E0",0x64AA],
- ["93E1",0x64AB],
- ["C7CB",0x64AC],
- ["B2A5",0x64AD],
- ["B4E9",0x64AE],
- ["93E2",0x64AF],
- ["D7AB",0x64B0],
- ["93E3",0x64B1],
- ["93E4",0x64B2],
- ["93E5",0x64B3],
- ["93E6",0x64B4],
- ["C4EC",0x64B5],
- ["93E7",0x64B6],
- ["DFA2",0x64B7],
- ["DFA3",0x64B8],
- ["93E8",0x64B9],
- ["DFA5",0x64BA],
- ["93E9",0x64BB],
- ["BAB3",0x64BC],
- ["93EA",0x64BD],
- ["93EB",0x64BE],
- ["93EC",0x64BF],
- ["DFA6",0x64C0],
- ["93ED",0x64C1],
- ["C0DE",0x64C2],
- ["93EE",0x64C3],
- ["93EF",0x64C4],
- ["C9C3",0x64C5],
- ["93F0",0x64C6],
- ["93F1",0x64C7],
- ["93F2",0x64C8],
- ["93F3",0x64C9],
- ["93F4",0x64CA],
- ["93F5",0x64CB],
- ["93F6",0x64CC],
- ["B2D9",0x64CD],
- ["C7E6",0x64CE],
- ["93F7",0x64CF],
- ["DFA7",0x64D0],
- ["93F8",0x64D1],
- ["C7DC",0x64D2],
- ["93F9",0x64D3],
- ["93FA",0x64D4],
- ["93FB",0x64D5],
- ["93FC",0x64D6],
- ["DFA8",0x64D7],
- ["EBA2",0x64D8],
- ["93FD",0x64D9],
- ["93FE",0x64DA],
- ["9440",0x64DB],
- ["9441",0x64DC],
- ["9442",0x64DD],
- ["CBD3",0x64DE],
- ["9443",0x64DF],
- ["9444",0x64E0],
- ["9445",0x64E1],
- ["DFAA",0x64E2],
- ["9446",0x64E3],
- ["DFA9",0x64E4],
- ["9447",0x64E5],
- ["B2C1",0x64E6],
- ["9448",0x64E7],
- ["9449",0x64E8],
- ["944A",0x64E9],
- ["944B",0x64EA],
- ["944C",0x64EB],
- ["944D",0x64EC],
- ["944E",0x64ED],
- ["944F",0x64EE],
- ["9450",0x64EF],
- ["9451",0x64F0],
- ["9452",0x64F1],
- ["9453",0x64F2],
- ["9454",0x64F3],
- ["9455",0x64F4],
- ["9456",0x64F5],
- ["9457",0x64F6],
- ["9458",0x64F7],
- ["9459",0x64F8],
- ["945A",0x64F9],
- ["945B",0x64FA],
- ["945C",0x64FB],
- ["945D",0x64FC],
- ["945E",0x64FD],
- ["945F",0x64FE],
- ["9460",0x64FF],
- ["C5CA",0x6500],
- ["9461",0x6501],
- ["9462",0x6502],
- ["9463",0x6503],
- ["9464",0x6504],
- ["9465",0x6505],
- ["9466",0x6506],
- ["9467",0x6507],
- ["9468",0x6508],
- ["DFAB",0x6509],
- ["9469",0x650A],
- ["946A",0x650B],
- ["946B",0x650C],
- ["946C",0x650D],
- ["946D",0x650E],
- ["946E",0x650F],
- ["946F",0x6510],
- ["9470",0x6511],
- ["D4DC",0x6512],
- ["9471",0x6513],
- ["9472",0x6514],
- ["9473",0x6515],
- ["9474",0x6516],
- ["9475",0x6517],
- ["C8C1",0x6518],
- ["9476",0x6519],
- ["9477",0x651A],
- ["9478",0x651B],
- ["9479",0x651C],
- ["947A",0x651D],
- ["947B",0x651E],
- ["947C",0x651F],
- ["947D",0x6520],
- ["947E",0x6521],
- ["9480",0x6522],
- ["9481",0x6523],
- ["9482",0x6524],
- ["DFAC",0x6525],
- ["9483",0x6526],
- ["9484",0x6527],
- ["9485",0x6528],
- ["9486",0x6529],
- ["9487",0x652A],
- ["BEF0",0x652B],
- ["9488",0x652C],
- ["9489",0x652D],
- ["DFAD",0x652E],
- ["D6A7",0x652F],
- ["948A",0x6530],
- ["948B",0x6531],
- ["948C",0x6532],
- ["948D",0x6533],
- ["EAB7",0x6534],
- ["EBB6",0x6535],
- ["CAD5",0x6536],
- ["948E",0x6537],
- ["D8FC",0x6538],
- ["B8C4",0x6539],
- ["948F",0x653A],
- ["B9A5",0x653B],
- ["9490",0x653C],
- ["9491",0x653D],
- ["B7C5",0x653E],
- ["D5FE",0x653F],
- ["9492",0x6540],
- ["9493",0x6541],
- ["9494",0x6542],
- ["9495",0x6543],
- ["9496",0x6544],
- ["B9CA",0x6545],
- ["9497",0x6546],
- ["9498",0x6547],
- ["D0A7",0x6548],
- ["F4CD",0x6549],
- ["9499",0x654A],
- ["949A",0x654B],
- ["B5D0",0x654C],
- ["949B",0x654D],
- ["949C",0x654E],
- ["C3F4",0x654F],
- ["949D",0x6550],
- ["BEC8",0x6551],
- ["949E",0x6552],
- ["949F",0x6553],
- ["94A0",0x6554],
- ["EBB7",0x6555],
- ["B0BD",0x6556],
- ["94A1",0x6557],
- ["94A2",0x6558],
- ["BDCC",0x6559],
- ["94A3",0x655A],
- ["C1B2",0x655B],
- ["94A4",0x655C],
- ["B1D6",0x655D],
- ["B3A8",0x655E],
- ["94A5",0x655F],
- ["94A6",0x6560],
- ["94A7",0x6561],
- ["B8D2",0x6562],
- ["C9A2",0x6563],
- ["94A8",0x6564],
- ["94A9",0x6565],
- ["B6D8",0x6566],
- ["94AA",0x6567],
- ["94AB",0x6568],
- ["94AC",0x6569],
- ["94AD",0x656A],
- ["EBB8",0x656B],
- ["BEB4",0x656C],
- ["94AE",0x656D],
- ["94AF",0x656E],
- ["94B0",0x656F],
- ["CAFD",0x6570],
- ["94B1",0x6571],
- ["C7C3",0x6572],
- ["94B2",0x6573],
- ["D5FB",0x6574],
- ["94B3",0x6575],
- ["94B4",0x6576],
- ["B7F3",0x6577],
- ["94B5",0x6578],
- ["94B6",0x6579],
- ["94B7",0x657A],
- ["94B8",0x657B],
- ["94B9",0x657C],
- ["94BA",0x657D],
- ["94BB",0x657E],
- ["94BC",0x657F],
- ["94BD",0x6580],
- ["94BE",0x6581],
- ["94BF",0x6582],
- ["94C0",0x6583],
- ["94C1",0x6584],
- ["94C2",0x6585],
- ["94C3",0x6586],
- ["CEC4",0x6587],
- ["94C4",0x6588],
- ["94C5",0x6589],
- ["94C6",0x658A],
- ["D5AB",0x658B],
- ["B1F3",0x658C],
- ["94C7",0x658D],
- ["94C8",0x658E],
- ["94C9",0x658F],
- ["ECB3",0x6590],
- ["B0DF",0x6591],
- ["94CA",0x6592],
- ["ECB5",0x6593],
- ["94CB",0x6594],
- ["94CC",0x6595],
- ["94CD",0x6596],
- ["B6B7",0x6597],
- ["94CE",0x6598],
- ["C1CF",0x6599],
- ["94CF",0x659A],
- ["F5FA",0x659B],
- ["D0B1",0x659C],
- ["94D0",0x659D],
- ["94D1",0x659E],
- ["D5E5",0x659F],
- ["94D2",0x65A0],
- ["CED3",0x65A1],
- ["94D3",0x65A2],
- ["94D4",0x65A3],
- ["BDEF",0x65A4],
- ["B3E2",0x65A5],
- ["94D5",0x65A6],
- ["B8AB",0x65A7],
- ["94D6",0x65A8],
- ["D5B6",0x65A9],
- ["94D7",0x65AA],
- ["EDBD",0x65AB],
- ["94D8",0x65AC],
- ["B6CF",0x65AD],
- ["94D9",0x65AE],
- ["CBB9",0x65AF],
- ["D0C2",0x65B0],
- ["94DA",0x65B1],
- ["94DB",0x65B2],
- ["94DC",0x65B3],
- ["94DD",0x65B4],
- ["94DE",0x65B5],
- ["94DF",0x65B6],
- ["94E0",0x65B7],
- ["94E1",0x65B8],
- ["B7BD",0x65B9],
- ["94E2",0x65BA],
- ["94E3",0x65BB],
- ["ECB6",0x65BC],
- ["CAA9",0x65BD],
- ["94E4",0x65BE],
- ["94E5",0x65BF],
- ["94E6",0x65C0],
- ["C5D4",0x65C1],
- ["94E7",0x65C2],
- ["ECB9",0x65C3],
- ["ECB8",0x65C4],
- ["C2C3",0x65C5],
- ["ECB7",0x65C6],
- ["94E8",0x65C7],
- ["94E9",0x65C8],
- ["94EA",0x65C9],
- ["94EB",0x65CA],
- ["D0FD",0x65CB],
- ["ECBA",0x65CC],
- ["94EC",0x65CD],
- ["ECBB",0x65CE],
- ["D7E5",0x65CF],
- ["94ED",0x65D0],
- ["94EE",0x65D1],
- ["ECBC",0x65D2],
- ["94EF",0x65D3],
- ["94F0",0x65D4],
- ["94F1",0x65D5],
- ["ECBD",0x65D6],
- ["C6EC",0x65D7],
- ["94F2",0x65D8],
- ["94F3",0x65D9],
- ["94F4",0x65DA],
- ["94F5",0x65DB],
- ["94F6",0x65DC],
- ["94F7",0x65DD],
- ["94F8",0x65DE],
- ["94F9",0x65DF],
- ["CEDE",0x65E0],
- ["94FA",0x65E1],
- ["BCC8",0x65E2],
- ["94FB",0x65E3],
- ["94FC",0x65E4],
- ["C8D5",0x65E5],
- ["B5A9",0x65E6],
- ["BEC9",0x65E7],
- ["D6BC",0x65E8],
- ["D4E7",0x65E9],
- ["94FD",0x65EA],
- ["94FE",0x65EB],
- ["D1AE",0x65EC],
- ["D0F1",0x65ED],
- ["EAB8",0x65EE],
- ["EAB9",0x65EF],
- ["EABA",0x65F0],
- ["BAB5",0x65F1],
- ["9540",0x65F2],
- ["9541",0x65F3],
- ["9542",0x65F4],
- ["9543",0x65F5],
- ["CAB1",0x65F6],
- ["BFF5",0x65F7],
- ["9544",0x65F8],
- ["9545",0x65F9],
- ["CDFA",0x65FA],
- ["9546",0x65FB],
- ["9547",0x65FC],
- ["9548",0x65FD],
- ["9549",0x65FE],
- ["954A",0x65FF],
- ["EAC0",0x6600],
- ["954B",0x6601],
- ["B0BA",0x6602],
- ["EABE",0x6603],
- ["954C",0x6604],
- ["954D",0x6605],
- ["C0A5",0x6606],
- ["954E",0x6607],
- ["954F",0x6608],
- ["9550",0x6609],
- ["EABB",0x660A],
- ["9551",0x660B],
- ["B2FD",0x660C],
- ["9552",0x660D],
- ["C3F7",0x660E],
- ["BBE8",0x660F],
- ["9553",0x6610],
- ["9554",0x6611],
- ["9555",0x6612],
- ["D2D7",0x6613],
- ["CEF4",0x6614],
- ["EABF",0x6615],
- ["9556",0x6616],
- ["9557",0x6617],
- ["9558",0x6618],
- ["EABC",0x6619],
- ["9559",0x661A],
- ["955A",0x661B],
- ["955B",0x661C],
- ["EAC3",0x661D],
- ["955C",0x661E],
- ["D0C7",0x661F],
- ["D3B3",0x6620],
- ["955D",0x6621],
- ["955E",0x6622],
- ["955F",0x6623],
- ["9560",0x6624],
- ["B4BA",0x6625],
- ["9561",0x6626],
- ["C3C1",0x6627],
- ["D7F2",0x6628],
- ["9562",0x6629],
- ["9563",0x662A],
- ["9564",0x662B],
- ["9565",0x662C],
- ["D5D1",0x662D],
- ["9566",0x662E],
- ["CAC7",0x662F],
- ["9567",0x6630],
- ["EAC5",0x6631],
- ["9568",0x6632],
- ["9569",0x6633],
- ["EAC4",0x6634],
- ["EAC7",0x6635],
- ["EAC6",0x6636],
- ["956A",0x6637],
- ["956B",0x6638],
- ["956C",0x6639],
- ["956D",0x663A],
- ["956E",0x663B],
- ["D6E7",0x663C],
- ["956F",0x663D],
- ["CFD4",0x663E],
- ["9570",0x663F],
- ["9571",0x6640],
- ["EACB",0x6641],
- ["9572",0x6642],
- ["BBCE",0x6643],
- ["9573",0x6644],
- ["9574",0x6645],
- ["9575",0x6646],
- ["9576",0x6647],
- ["9577",0x6648],
- ["9578",0x6649],
- ["9579",0x664A],
- ["BDFA",0x664B],
- ["C9CE",0x664C],
- ["957A",0x664D],
- ["957B",0x664E],
- ["EACC",0x664F],
- ["957C",0x6650],
- ["957D",0x6651],
- ["C9B9",0x6652],
- ["CFFE",0x6653],
- ["EACA",0x6654],
- ["D4CE",0x6655],
- ["EACD",0x6656],
- ["EACF",0x6657],
- ["957E",0x6658],
- ["9580",0x6659],
- ["CDED",0x665A],
- ["9581",0x665B],
- ["9582",0x665C],
- ["9583",0x665D],
- ["9584",0x665E],
- ["EAC9",0x665F],
- ["9585",0x6660],
- ["EACE",0x6661],
- ["9586",0x6662],
- ["9587",0x6663],
- ["CEEE",0x6664],
- ["9588",0x6665],
- ["BBDE",0x6666],
- ["9589",0x6667],
- ["B3BF",0x6668],
- ["958A",0x6669],
- ["958B",0x666A],
- ["958C",0x666B],
- ["958D",0x666C],
- ["958E",0x666D],
- ["C6D5",0x666E],
- ["BEB0",0x666F],
- ["CEFA",0x6670],
- ["958F",0x6671],
- ["9590",0x6672],
- ["9591",0x6673],
- ["C7E7",0x6674],
- ["9592",0x6675],
- ["BEA7",0x6676],
- ["EAD0",0x6677],
- ["9593",0x6678],
- ["9594",0x6679],
- ["D6C7",0x667A],
- ["9595",0x667B],
- ["9596",0x667C],
- ["9597",0x667D],
- ["C1C0",0x667E],
- ["9598",0x667F],
- ["9599",0x6680],
- ["959A",0x6681],
- ["D4DD",0x6682],
- ["959B",0x6683],
- ["EAD1",0x6684],
- ["959C",0x6685],
- ["959D",0x6686],
- ["CFBE",0x6687],
- ["959E",0x6688],
- ["959F",0x6689],
- ["95A0",0x668A],
- ["95A1",0x668B],
- ["EAD2",0x668C],
- ["95A2",0x668D],
- ["95A3",0x668E],
- ["95A4",0x668F],
- ["95A5",0x6690],
- ["CAEE",0x6691],
- ["95A6",0x6692],
- ["95A7",0x6693],
- ["95A8",0x6694],
- ["95A9",0x6695],
- ["C5AF",0x6696],
- ["B0B5",0x6697],
- ["95AA",0x6698],
- ["95AB",0x6699],
- ["95AC",0x669A],
- ["95AD",0x669B],
- ["95AE",0x669C],
- ["EAD4",0x669D],
- ["95AF",0x669E],
- ["95B0",0x669F],
- ["95B1",0x66A0],
- ["95B2",0x66A1],
- ["95B3",0x66A2],
- ["95B4",0x66A3],
- ["95B5",0x66A4],
- ["95B6",0x66A5],
- ["95B7",0x66A6],
- ["EAD3",0x66A7],
- ["F4DF",0x66A8],
- ["95B8",0x66A9],
- ["95B9",0x66AA],
- ["95BA",0x66AB],
- ["95BB",0x66AC],
- ["95BC",0x66AD],
- ["C4BA",0x66AE],
- ["95BD",0x66AF],
- ["95BE",0x66B0],
- ["95BF",0x66B1],
- ["95C0",0x66B2],
- ["95C1",0x66B3],
- ["B1A9",0x66B4],
- ["95C2",0x66B5],
- ["95C3",0x66B6],
- ["95C4",0x66B7],
- ["95C5",0x66B8],
- ["E5DF",0x66B9],
- ["95C6",0x66BA],
- ["95C7",0x66BB],
- ["95C8",0x66BC],
- ["95C9",0x66BD],
- ["EAD5",0x66BE],
- ["95CA",0x66BF],
- ["95CB",0x66C0],
- ["95CC",0x66C1],
- ["95CD",0x66C2],
- ["95CE",0x66C3],
- ["95CF",0x66C4],
- ["95D0",0x66C5],
- ["95D1",0x66C6],
- ["95D2",0x66C7],
- ["95D3",0x66C8],
- ["95D4",0x66C9],
- ["95D5",0x66CA],
- ["95D6",0x66CB],
- ["95D7",0x66CC],
- ["95D8",0x66CD],
- ["95D9",0x66CE],
- ["95DA",0x66CF],
- ["95DB",0x66D0],
- ["95DC",0x66D1],
- ["95DD",0x66D2],
- ["95DE",0x66D3],
- ["95DF",0x66D4],
- ["95E0",0x66D5],
- ["95E1",0x66D6],
- ["95E2",0x66D7],
- ["95E3",0x66D8],
- ["CAEF",0x66D9],
- ["95E4",0x66DA],
- ["EAD6",0x66DB],
- ["EAD7",0x66DC],
- ["C6D8",0x66DD],
- ["95E5",0x66DE],
- ["95E6",0x66DF],
- ["95E7",0x66E0],
- ["95E8",0x66E1],
- ["95E9",0x66E2],
- ["95EA",0x66E3],
- ["95EB",0x66E4],
- ["95EC",0x66E5],
- ["EAD8",0x66E6],
- ["95ED",0x66E7],
- ["95EE",0x66E8],
- ["EAD9",0x66E9],
- ["95EF",0x66EA],
- ["95F0",0x66EB],
- ["95F1",0x66EC],
- ["95F2",0x66ED],
- ["95F3",0x66EE],
- ["95F4",0x66EF],
- ["D4BB",0x66F0],
- ["95F5",0x66F1],
- ["C7FA",0x66F2],
- ["D2B7",0x66F3],
- ["B8FC",0x66F4],
- ["95F6",0x66F5],
- ["95F7",0x66F6],
- ["EAC2",0x66F7],
- ["95F8",0x66F8],
- ["B2DC",0x66F9],
- ["95F9",0x66FA],
- ["95FA",0x66FB],
- ["C2FC",0x66FC],
- ["95FB",0x66FD],
- ["D4F8",0x66FE],
- ["CCE6",0x66FF],
- ["D7EE",0x6700],
- ["95FC",0x6701],
- ["95FD",0x6702],
- ["95FE",0x6703],
- ["9640",0x6704],
- ["9641",0x6705],
- ["9642",0x6706],
- ["9643",0x6707],
- ["D4C2",0x6708],
- ["D3D0",0x6709],
- ["EBC3",0x670A],
- ["C5F3",0x670B],
- ["9644",0x670C],
- ["B7FE",0x670D],
- ["9645",0x670E],
- ["9646",0x670F],
- ["EBD4",0x6710],
- ["9647",0x6711],
- ["9648",0x6712],
- ["9649",0x6713],
- ["CBB7",0x6714],
- ["EBDE",0x6715],
- ["964A",0x6716],
- ["C0CA",0x6717],
- ["964B",0x6718],
- ["964C",0x6719],
- ["964D",0x671A],
- ["CDFB",0x671B],
- ["964E",0x671C],
- ["B3AF",0x671D],
- ["964F",0x671E],
- ["C6DA",0x671F],
- ["9650",0x6720],
- ["9651",0x6721],
- ["9652",0x6722],
- ["9653",0x6723],
- ["9654",0x6724],
- ["9655",0x6725],
- ["EBFC",0x6726],
- ["9656",0x6727],
- ["C4BE",0x6728],
- ["9657",0x6729],
- ["CEB4",0x672A],
- ["C4A9",0x672B],
- ["B1BE",0x672C],
- ["D4FD",0x672D],
- ["9658",0x672E],
- ["CAF5",0x672F],
- ["9659",0x6730],
- ["D6EC",0x6731],
- ["965A",0x6732],
- ["965B",0x6733],
- ["C6D3",0x6734],
- ["B6E4",0x6735],
- ["965C",0x6736],
- ["965D",0x6737],
- ["965E",0x6738],
- ["965F",0x6739],
- ["BBFA",0x673A],
- ["9660",0x673B],
- ["9661",0x673C],
- ["D0E0",0x673D],
- ["9662",0x673E],
- ["9663",0x673F],
- ["C9B1",0x6740],
- ["9664",0x6741],
- ["D4D3",0x6742],
- ["C8A8",0x6743],
- ["9665",0x6744],
- ["9666",0x6745],
- ["B8CB",0x6746],
- ["9667",0x6747],
- ["E8BE",0x6748],
- ["C9BC",0x6749],
- ["9668",0x674A],
- ["9669",0x674B],
- ["E8BB",0x674C],
- ["966A",0x674D],
- ["C0EE",0x674E],
- ["D0D3",0x674F],
- ["B2C4",0x6750],
- ["B4E5",0x6751],
- ["966B",0x6752],
- ["E8BC",0x6753],
- ["966C",0x6754],
- ["966D",0x6755],
- ["D5C8",0x6756],
- ["966E",0x6757],
- ["966F",0x6758],
- ["9670",0x6759],
- ["9671",0x675A],
- ["9672",0x675B],
- ["B6C5",0x675C],
- ["9673",0x675D],
- ["E8BD",0x675E],
- ["CAF8",0x675F],
- ["B8DC",0x6760],
- ["CCF5",0x6761],
- ["9674",0x6762],
- ["9675",0x6763],
- ["9676",0x6764],
- ["C0B4",0x6765],
- ["9677",0x6766],
- ["9678",0x6767],
- ["D1EE",0x6768],
- ["E8BF",0x6769],
- ["E8C2",0x676A],
- ["9679",0x676B],
- ["967A",0x676C],
- ["BABC",0x676D],
- ["967B",0x676E],
- ["B1AD",0x676F],
- ["BDDC",0x6770],
- ["967C",0x6771],
- ["EABD",0x6772],
- ["E8C3",0x6773],
- ["967D",0x6774],
- ["E8C6",0x6775],
- ["967E",0x6776],
- ["E8CB",0x6777],
- ["9680",0x6778],
- ["9681",0x6779],
- ["9682",0x677A],
- ["9683",0x677B],
- ["E8CC",0x677C],
- ["9684",0x677D],
- ["CBC9",0x677E],
- ["B0E5",0x677F],
- ["9685",0x6780],
- ["BCAB",0x6781],
- ["9686",0x6782],
- ["9687",0x6783],
- ["B9B9",0x6784],
- ["9688",0x6785],
- ["9689",0x6786],
- ["E8C1",0x6787],
- ["968A",0x6788],
- ["CDF7",0x6789],
- ["968B",0x678A],
- ["E8CA",0x678B],
- ["968C",0x678C],
- ["968D",0x678D],
- ["968E",0x678E],
- ["968F",0x678F],
- ["CEF6",0x6790],
- ["9690",0x6791],
- ["9691",0x6792],
- ["9692",0x6793],
- ["9693",0x6794],
- ["D5ED",0x6795],
- ["9694",0x6796],
- ["C1D6",0x6797],
- ["E8C4",0x6798],
- ["9695",0x6799],
- ["C3B6",0x679A],
- ["9696",0x679B],
- ["B9FB",0x679C],
- ["D6A6",0x679D],
- ["E8C8",0x679E],
- ["9697",0x679F],
- ["9698",0x67A0],
- ["9699",0x67A1],
- ["CAE0",0x67A2],
- ["D4E6",0x67A3],
- ["969A",0x67A4],
- ["E8C0",0x67A5],
- ["969B",0x67A6],
- ["E8C5",0x67A7],
- ["E8C7",0x67A8],
- ["969C",0x67A9],
- ["C7B9",0x67AA],
- ["B7E3",0x67AB],
- ["969D",0x67AC],
- ["E8C9",0x67AD],
- ["969E",0x67AE],
- ["BFDD",0x67AF],
- ["E8D2",0x67B0],
- ["969F",0x67B1],
- ["96A0",0x67B2],
- ["E8D7",0x67B3],
- ["96A1",0x67B4],
- ["E8D5",0x67B5],
- ["BCDC",0x67B6],
- ["BCCF",0x67B7],
- ["E8DB",0x67B8],
- ["96A2",0x67B9],
- ["96A3",0x67BA],
- ["96A4",0x67BB],
- ["96A5",0x67BC],
- ["96A6",0x67BD],
- ["96A7",0x67BE],
- ["96A8",0x67BF],
- ["96A9",0x67C0],
- ["E8DE",0x67C1],
- ["96AA",0x67C2],
- ["E8DA",0x67C3],
- ["B1FA",0x67C4],
- ["96AB",0x67C5],
- ["96AC",0x67C6],
- ["96AD",0x67C7],
- ["96AE",0x67C8],
- ["96AF",0x67C9],
- ["96B0",0x67CA],
- ["96B1",0x67CB],
- ["96B2",0x67CC],
- ["96B3",0x67CD],
- ["96B4",0x67CE],
- ["B0D8",0x67CF],
- ["C4B3",0x67D0],
- ["B8CC",0x67D1],
- ["C6E2",0x67D2],
- ["C8BE",0x67D3],
- ["C8E1",0x67D4],
- ["96B5",0x67D5],
- ["96B6",0x67D6],
- ["96B7",0x67D7],
- ["E8CF",0x67D8],
- ["E8D4",0x67D9],
- ["E8D6",0x67DA],
- ["96B8",0x67DB],
- ["B9F1",0x67DC],
- ["E8D8",0x67DD],
- ["D7F5",0x67DE],
- ["96B9",0x67DF],
- ["C4FB",0x67E0],
- ["96BA",0x67E1],
- ["E8DC",0x67E2],
- ["96BB",0x67E3],
- ["96BC",0x67E4],
- ["B2E9",0x67E5],
- ["96BD",0x67E6],
- ["96BE",0x67E7],
- ["96BF",0x67E8],
- ["E8D1",0x67E9],
- ["96C0",0x67EA],
- ["96C1",0x67EB],
- ["BCED",0x67EC],
- ["96C2",0x67ED],
- ["96C3",0x67EE],
- ["BFC2",0x67EF],
- ["E8CD",0x67F0],
- ["D6F9",0x67F1],
- ["96C4",0x67F2],
- ["C1F8",0x67F3],
- ["B2F1",0x67F4],
- ["96C5",0x67F5],
- ["96C6",0x67F6],
- ["96C7",0x67F7],
- ["96C8",0x67F8],
- ["96C9",0x67F9],
- ["96CA",0x67FA],
- ["96CB",0x67FB],
- ["96CC",0x67FC],
- ["E8DF",0x67FD],
- ["96CD",0x67FE],
- ["CAC1",0x67FF],
- ["E8D9",0x6800],
- ["96CE",0x6801],
- ["96CF",0x6802],
- ["96D0",0x6803],
- ["96D1",0x6804],
- ["D5A4",0x6805],
- ["96D2",0x6806],
- ["B1EA",0x6807],
- ["D5BB",0x6808],
- ["E8CE",0x6809],
- ["E8D0",0x680A],
- ["B6B0",0x680B],
- ["E8D3",0x680C],
- ["96D3",0x680D],
- ["E8DD",0x680E],
- ["C0B8",0x680F],
- ["96D4",0x6810],
- ["CAF7",0x6811],
- ["96D5",0x6812],
- ["CBA8",0x6813],
- ["96D6",0x6814],
- ["96D7",0x6815],
- ["C6DC",0x6816],
- ["C0F5",0x6817],
- ["96D8",0x6818],
- ["96D9",0x6819],
- ["96DA",0x681A],
- ["96DB",0x681B],
- ["96DC",0x681C],
- ["E8E9",0x681D],
- ["96DD",0x681E],
- ["96DE",0x681F],
- ["96DF",0x6820],
- ["D0A3",0x6821],
- ["96E0",0x6822],
- ["96E1",0x6823],
- ["96E2",0x6824],
- ["96E3",0x6825],
- ["96E4",0x6826],
- ["96E5",0x6827],
- ["96E6",0x6828],
- ["E8F2",0x6829],
- ["D6EA",0x682A],
- ["96E7",0x682B],
- ["96E8",0x682C],
- ["96E9",0x682D],
- ["96EA",0x682E],
- ["96EB",0x682F],
- ["96EC",0x6830],
- ["96ED",0x6831],
- ["E8E0",0x6832],
- ["E8E1",0x6833],
- ["96EE",0x6834],
- ["96EF",0x6835],
- ["96F0",0x6836],
- ["D1F9",0x6837],
- ["BACB",0x6838],
- ["B8F9",0x6839],
- ["96F1",0x683A],
- ["96F2",0x683B],
- ["B8F1",0x683C],
- ["D4D4",0x683D],
- ["E8EF",0x683E],
- ["96F3",0x683F],
- ["E8EE",0x6840],
- ["E8EC",0x6841],
- ["B9F0",0x6842],
- ["CCD2",0x6843],
- ["E8E6",0x6844],
- ["CEA6",0x6845],
- ["BFF2",0x6846],
- ["96F4",0x6847],
- ["B0B8",0x6848],
- ["E8F1",0x6849],
- ["E8F0",0x684A],
- ["96F5",0x684B],
- ["D7C0",0x684C],
- ["96F6",0x684D],
- ["E8E4",0x684E],
- ["96F7",0x684F],
- ["CDA9",0x6850],
- ["C9A3",0x6851],
- ["96F8",0x6852],
- ["BBB8",0x6853],
- ["BDDB",0x6854],
- ["E8EA",0x6855],
- ["96F9",0x6856],
- ["96FA",0x6857],
- ["96FB",0x6858],
- ["96FC",0x6859],
- ["96FD",0x685A],
- ["96FE",0x685B],
- ["9740",0x685C],
- ["9741",0x685D],
- ["9742",0x685E],
- ["9743",0x685F],
- ["E8E2",0x6860],
- ["E8E3",0x6861],
- ["E8E5",0x6862],
- ["B5B5",0x6863],
- ["E8E7",0x6864],
- ["C7C5",0x6865],
- ["E8EB",0x6866],
- ["E8ED",0x6867],
- ["BDB0",0x6868],
- ["D7AE",0x6869],
- ["9744",0x686A],
- ["E8F8",0x686B],
- ["9745",0x686C],
- ["9746",0x686D],
- ["9747",0x686E],
- ["9748",0x686F],
- ["9749",0x6870],
- ["974A",0x6871],
- ["974B",0x6872],
- ["974C",0x6873],
- ["E8F5",0x6874],
- ["974D",0x6875],
- ["CDB0",0x6876],
- ["E8F6",0x6877],
- ["974E",0x6878],
- ["974F",0x6879],
- ["9750",0x687A],
- ["9751",0x687B],
- ["9752",0x687C],
- ["9753",0x687D],
- ["9754",0x687E],
- ["9755",0x687F],
- ["9756",0x6880],
- ["C1BA",0x6881],
- ["9757",0x6882],
- ["E8E8",0x6883],
- ["9758",0x6884],
- ["C3B7",0x6885],
- ["B0F0",0x6886],
- ["9759",0x6887],
- ["975A",0x6888],
- ["975B",0x6889],
- ["975C",0x688A],
- ["975D",0x688B],
- ["975E",0x688C],
- ["975F",0x688D],
- ["9760",0x688E],
- ["E8F4",0x688F],
- ["9761",0x6890],
- ["9762",0x6891],
- ["9763",0x6892],
- ["E8F7",0x6893],
- ["9764",0x6894],
- ["9765",0x6895],
- ["9766",0x6896],
- ["B9A3",0x6897],
- ["9767",0x6898],
- ["9768",0x6899],
- ["9769",0x689A],
- ["976A",0x689B],
- ["976B",0x689C],
- ["976C",0x689D],
- ["976D",0x689E],
- ["976E",0x689F],
- ["976F",0x68A0],
- ["9770",0x68A1],
- ["C9D2",0x68A2],
- ["9771",0x68A3],
- ["9772",0x68A4],
- ["9773",0x68A5],
- ["C3CE",0x68A6],
- ["CEE0",0x68A7],
- ["C0E6",0x68A8],
- ["9774",0x68A9],
- ["9775",0x68AA],
- ["9776",0x68AB],
- ["9777",0x68AC],
- ["CBF3",0x68AD],
- ["9778",0x68AE],
- ["CCDD",0x68AF],
- ["D0B5",0x68B0],
- ["9779",0x68B1],
- ["977A",0x68B2],
- ["CAE1",0x68B3],
- ["977B",0x68B4],
- ["E8F3",0x68B5],
- ["977C",0x68B6],
- ["977D",0x68B7],
- ["977E",0x68B8],
- ["9780",0x68B9],
- ["9781",0x68BA],
- ["9782",0x68BB],
- ["9783",0x68BC],
- ["9784",0x68BD],
- ["9785",0x68BE],
- ["9786",0x68BF],
- ["BCEC",0x68C0],
- ["9787",0x68C1],
- ["E8F9",0x68C2],
- ["9788",0x68C3],
- ["9789",0x68C4],
- ["978A",0x68C5],
- ["978B",0x68C6],
- ["978C",0x68C7],
- ["978D",0x68C8],
- ["C3DE",0x68C9],
- ["978E",0x68CA],
- ["C6E5",0x68CB],
- ["978F",0x68CC],
- ["B9F7",0x68CD],
- ["9790",0x68CE],
- ["9791",0x68CF],
- ["9792",0x68D0],
- ["9793",0x68D1],
- ["B0F4",0x68D2],
- ["9794",0x68D3],
- ["9795",0x68D4],
- ["D7D8",0x68D5],
- ["9796",0x68D6],
- ["9797",0x68D7],
- ["BCAC",0x68D8],
- ["9798",0x68D9],
- ["C5EF",0x68DA],
- ["9799",0x68DB],
- ["979A",0x68DC],
- ["979B",0x68DD],
- ["979C",0x68DE],
- ["979D",0x68DF],
- ["CCC4",0x68E0],
- ["979E",0x68E1],
- ["979F",0x68E2],
- ["E9A6",0x68E3],
- ["97A0",0x68E4],
- ["97A1",0x68E5],
- ["97A2",0x68E6],
- ["97A3",0x68E7],
- ["97A4",0x68E8],
- ["97A5",0x68E9],
- ["97A6",0x68EA],
- ["97A7",0x68EB],
- ["97A8",0x68EC],
- ["97A9",0x68ED],
- ["C9AD",0x68EE],
- ["97AA",0x68EF],
- ["E9A2",0x68F0],
- ["C0E2",0x68F1],
- ["97AB",0x68F2],
- ["97AC",0x68F3],
- ["97AD",0x68F4],
- ["BFC3",0x68F5],
- ["97AE",0x68F6],
- ["97AF",0x68F7],
- ["97B0",0x68F8],
- ["E8FE",0x68F9],
- ["B9D7",0x68FA],
- ["97B1",0x68FB],
- ["E8FB",0x68FC],
- ["97B2",0x68FD],
- ["97B3",0x68FE],
- ["97B4",0x68FF],
- ["97B5",0x6900],
- ["E9A4",0x6901],
- ["97B6",0x6902],
- ["97B7",0x6903],
- ["97B8",0x6904],
- ["D2CE",0x6905],
- ["97B9",0x6906],
- ["97BA",0x6907],
- ["97BB",0x6908],
- ["97BC",0x6909],
- ["97BD",0x690A],
- ["E9A3",0x690B],
- ["97BE",0x690C],
- ["D6B2",0x690D],
- ["D7B5",0x690E],
- ["97BF",0x690F],
- ["E9A7",0x6910],
- ["97C0",0x6911],
- ["BDB7",0x6912],
- ["97C1",0x6913],
- ["97C2",0x6914],
- ["97C3",0x6915],
- ["97C4",0x6916],
- ["97C5",0x6917],
- ["97C6",0x6918],
- ["97C7",0x6919],
- ["97C8",0x691A],
- ["97C9",0x691B],
- ["97CA",0x691C],
- ["97CB",0x691D],
- ["97CC",0x691E],
- ["E8FC",0x691F],
- ["E8FD",0x6920],
- ["97CD",0x6921],
- ["97CE",0x6922],
- ["97CF",0x6923],
- ["E9A1",0x6924],
- ["97D0",0x6925],
- ["97D1",0x6926],
- ["97D2",0x6927],
- ["97D3",0x6928],
- ["97D4",0x6929],
- ["97D5",0x692A],
- ["97D6",0x692B],
- ["97D7",0x692C],
- ["CDD6",0x692D],
- ["97D8",0x692E],
- ["97D9",0x692F],
- ["D2AC",0x6930],
- ["97DA",0x6931],
- ["97DB",0x6932],
- ["97DC",0x6933],
- ["E9B2",0x6934],
- ["97DD",0x6935],
- ["97DE",0x6936],
- ["97DF",0x6937],
- ["97E0",0x6938],
- ["E9A9",0x6939],
- ["97E1",0x693A],
- ["97E2",0x693B],
- ["97E3",0x693C],
- ["B4AA",0x693D],
- ["97E4",0x693E],
- ["B4BB",0x693F],
- ["97E5",0x6940],
- ["97E6",0x6941],
- ["E9AB",0x6942],
- ["97E7",0x6943],
- ["97E8",0x6944],
- ["97E9",0x6945],
- ["97EA",0x6946],
- ["97EB",0x6947],
- ["97EC",0x6948],
- ["97ED",0x6949],
- ["97EE",0x694A],
- ["97EF",0x694B],
- ["97F0",0x694C],
- ["97F1",0x694D],
- ["97F2",0x694E],
- ["97F3",0x694F],
- ["97F4",0x6950],
- ["97F5",0x6951],
- ["97F6",0x6952],
- ["97F7",0x6953],
- ["D0A8",0x6954],
- ["97F8",0x6955],
- ["97F9",0x6956],
- ["E9A5",0x6957],
- ["97FA",0x6958],
- ["97FB",0x6959],
- ["B3FE",0x695A],
- ["97FC",0x695B],
- ["97FD",0x695C],
- ["E9AC",0x695D],
- ["C0E3",0x695E],
- ["97FE",0x695F],
- ["E9AA",0x6960],
- ["9840",0x6961],
- ["9841",0x6962],
- ["E9B9",0x6963],
- ["9842",0x6964],
- ["9843",0x6965],
- ["E9B8",0x6966],
- ["9844",0x6967],
- ["9845",0x6968],
- ["9846",0x6969],
- ["9847",0x696A],
- ["E9AE",0x696B],
- ["9848",0x696C],
- ["9849",0x696D],
- ["E8FA",0x696E],
- ["984A",0x696F],
- ["984B",0x6970],
- ["E9A8",0x6971],
- ["984C",0x6972],
- ["984D",0x6973],
- ["984E",0x6974],
- ["984F",0x6975],
- ["9850",0x6976],
- ["BFAC",0x6977],
- ["E9B1",0x6978],
- ["E9BA",0x6979],
- ["9851",0x697A],
- ["9852",0x697B],
- ["C2A5",0x697C],
- ["9853",0x697D],
- ["9854",0x697E],
- ["9855",0x697F],
- ["E9AF",0x6980],
- ["9856",0x6981],
- ["B8C5",0x6982],
- ["9857",0x6983],
- ["E9AD",0x6984],
- ["9858",0x6985],
- ["D3DC",0x6986],
- ["E9B4",0x6987],
- ["E9B5",0x6988],
- ["E9B7",0x6989],
- ["9859",0x698A],
- ["985A",0x698B],
- ["985B",0x698C],
- ["E9C7",0x698D],
- ["985C",0x698E],
- ["985D",0x698F],
- ["985E",0x6990],
- ["985F",0x6991],
- ["9860",0x6992],
- ["9861",0x6993],
- ["C0C6",0x6994],
- ["E9C5",0x6995],
- ["9862",0x6996],
- ["9863",0x6997],
- ["E9B0",0x6998],
- ["9864",0x6999],
- ["9865",0x699A],
- ["E9BB",0x699B],
- ["B0F1",0x699C],
- ["9866",0x699D],
- ["9867",0x699E],
- ["9868",0x699F],
- ["9869",0x69A0],
- ["986A",0x69A1],
- ["986B",0x69A2],
- ["986C",0x69A3],
- ["986D",0x69A4],
- ["986E",0x69A5],
- ["986F",0x69A6],
- ["E9BC",0x69A7],
- ["D5A5",0x69A8],
- ["9870",0x69A9],
- ["9871",0x69AA],
- ["E9BE",0x69AB],
- ["9872",0x69AC],
- ["E9BF",0x69AD],
- ["9873",0x69AE],
- ["9874",0x69AF],
- ["9875",0x69B0],
- ["E9C1",0x69B1],
- ["9876",0x69B2],
- ["9877",0x69B3],
- ["C1F1",0x69B4],
- ["9878",0x69B5],
- ["9879",0x69B6],
- ["C8B6",0x69B7],
- ["987A",0x69B8],
- ["987B",0x69B9],
- ["987C",0x69BA],
- ["E9BD",0x69BB],
- ["987D",0x69BC],
- ["987E",0x69BD],
- ["9880",0x69BE],
- ["9881",0x69BF],
- ["9882",0x69C0],
- ["E9C2",0x69C1],
- ["9883",0x69C2],
- ["9884",0x69C3],
- ["9885",0x69C4],
- ["9886",0x69C5],
- ["9887",0x69C6],
- ["9888",0x69C7],
- ["9889",0x69C8],
- ["988A",0x69C9],
- ["E9C3",0x69CA],
- ["988B",0x69CB],
- ["E9B3",0x69CC],
- ["988C",0x69CD],
- ["E9B6",0x69CE],
- ["988D",0x69CF],
- ["BBB1",0x69D0],
- ["988E",0x69D1],
- ["988F",0x69D2],
- ["9890",0x69D3],
- ["E9C0",0x69D4],
- ["9891",0x69D5],
- ["9892",0x69D6],
- ["9893",0x69D7],
- ["9894",0x69D8],
- ["9895",0x69D9],
- ["9896",0x69DA],
- ["BCF7",0x69DB],
- ["9897",0x69DC],
- ["9898",0x69DD],
- ["9899",0x69DE],
- ["E9C4",0x69DF],
- ["E9C6",0x69E0],
- ["989A",0x69E1],
- ["989B",0x69E2],
- ["989C",0x69E3],
- ["989D",0x69E4],
- ["989E",0x69E5],
- ["989F",0x69E6],
- ["98A0",0x69E7],
- ["98A1",0x69E8],
- ["98A2",0x69E9],
- ["98A3",0x69EA],
- ["98A4",0x69EB],
- ["98A5",0x69EC],
- ["E9CA",0x69ED],
- ["98A6",0x69EE],
- ["98A7",0x69EF],
- ["98A8",0x69F0],
- ["98A9",0x69F1],
- ["E9CE",0x69F2],
- ["98AA",0x69F3],
- ["98AB",0x69F4],
- ["98AC",0x69F5],
- ["98AD",0x69F6],
- ["98AE",0x69F7],
- ["98AF",0x69F8],
- ["98B0",0x69F9],
- ["98B1",0x69FA],
- ["98B2",0x69FB],
- ["98B3",0x69FC],
- ["B2DB",0x69FD],
- ["98B4",0x69FE],
- ["E9C8",0x69FF],
- ["98B5",0x6A00],
- ["98B6",0x6A01],
- ["98B7",0x6A02],
- ["98B8",0x6A03],
- ["98B9",0x6A04],
- ["98BA",0x6A05],
- ["98BB",0x6A06],
- ["98BC",0x6A07],
- ["98BD",0x6A08],
- ["98BE",0x6A09],
- ["B7AE",0x6A0A],
- ["98BF",0x6A0B],
- ["98C0",0x6A0C],
- ["98C1",0x6A0D],
- ["98C2",0x6A0E],
- ["98C3",0x6A0F],
- ["98C4",0x6A10],
- ["98C5",0x6A11],
- ["98C6",0x6A12],
- ["98C7",0x6A13],
- ["98C8",0x6A14],
- ["98C9",0x6A15],
- ["98CA",0x6A16],
- ["E9CB",0x6A17],
- ["E9CC",0x6A18],
- ["98CB",0x6A19],
- ["98CC",0x6A1A],
- ["98CD",0x6A1B],
- ["98CE",0x6A1C],
- ["98CF",0x6A1D],
- ["98D0",0x6A1E],
- ["D5C1",0x6A1F],
- ["98D1",0x6A20],
- ["C4A3",0x6A21],
- ["98D2",0x6A22],
- ["98D3",0x6A23],
- ["98D4",0x6A24],
- ["98D5",0x6A25],
- ["98D6",0x6A26],
- ["98D7",0x6A27],
- ["E9D8",0x6A28],
- ["98D8",0x6A29],
- ["BAE1",0x6A2A],
- ["98D9",0x6A2B],
- ["98DA",0x6A2C],
- ["98DB",0x6A2D],
- ["98DC",0x6A2E],
- ["E9C9",0x6A2F],
- ["98DD",0x6A30],
- ["D3A3",0x6A31],
- ["98DE",0x6A32],
- ["98DF",0x6A33],
- ["98E0",0x6A34],
- ["E9D4",0x6A35],
- ["98E1",0x6A36],
- ["98E2",0x6A37],
- ["98E3",0x6A38],
- ["98E4",0x6A39],
- ["98E5",0x6A3A],
- ["98E6",0x6A3B],
- ["98E7",0x6A3C],
- ["E9D7",0x6A3D],
- ["E9D0",0x6A3E],
- ["98E8",0x6A3F],
- ["98E9",0x6A40],
- ["98EA",0x6A41],
- ["98EB",0x6A42],
- ["98EC",0x6A43],
- ["E9CF",0x6A44],
- ["98ED",0x6A45],
- ["98EE",0x6A46],
- ["C7C1",0x6A47],
- ["98EF",0x6A48],
- ["98F0",0x6A49],
- ["98F1",0x6A4A],
- ["98F2",0x6A4B],
- ["98F3",0x6A4C],
- ["98F4",0x6A4D],
- ["98F5",0x6A4E],
- ["98F6",0x6A4F],
- ["E9D2",0x6A50],
- ["98F7",0x6A51],
- ["98F8",0x6A52],
- ["98F9",0x6A53],
- ["98FA",0x6A54],
- ["98FB",0x6A55],
- ["98FC",0x6A56],
- ["98FD",0x6A57],
- ["E9D9",0x6A58],
- ["B3C8",0x6A59],
- ["98FE",0x6A5A],
- ["E9D3",0x6A5B],
- ["9940",0x6A5C],
- ["9941",0x6A5D],
- ["9942",0x6A5E],
- ["9943",0x6A5F],
- ["9944",0x6A60],
- ["CFF0",0x6A61],
- ["9945",0x6A62],
- ["9946",0x6A63],
- ["9947",0x6A64],
- ["E9CD",0x6A65],
- ["9948",0x6A66],
- ["9949",0x6A67],
- ["994A",0x6A68],
- ["994B",0x6A69],
- ["994C",0x6A6A],
- ["994D",0x6A6B],
- ["994E",0x6A6C],
- ["994F",0x6A6D],
- ["9950",0x6A6E],
- ["9951",0x6A6F],
- ["9952",0x6A70],
- ["B3F7",0x6A71],
- ["9953",0x6A72],
- ["9954",0x6A73],
- ["9955",0x6A74],
- ["9956",0x6A75],
- ["9957",0x6A76],
- ["9958",0x6A77],
- ["9959",0x6A78],
- ["E9D6",0x6A79],
- ["995A",0x6A7A],
- ["995B",0x6A7B],
- ["E9DA",0x6A7C],
- ["995C",0x6A7D],
- ["995D",0x6A7E],
- ["995E",0x6A7F],
- ["CCB4",0x6A80],
- ["995F",0x6A81],
- ["9960",0x6A82],
- ["9961",0x6A83],
- ["CFAD",0x6A84],
- ["9962",0x6A85],
- ["9963",0x6A86],
- ["9964",0x6A87],
- ["9965",0x6A88],
- ["9966",0x6A89],
- ["9967",0x6A8A],
- ["9968",0x6A8B],
- ["9969",0x6A8C],
- ["996A",0x6A8D],
- ["E9D5",0x6A8E],
- ["996B",0x6A8F],
- ["E9DC",0x6A90],
- ["E9DB",0x6A91],
- ["996C",0x6A92],
- ["996D",0x6A93],
- ["996E",0x6A94],
- ["996F",0x6A95],
- ["9970",0x6A96],
- ["E9DE",0x6A97],
- ["9971",0x6A98],
- ["9972",0x6A99],
- ["9973",0x6A9A],
- ["9974",0x6A9B],
- ["9975",0x6A9C],
- ["9976",0x6A9D],
- ["9977",0x6A9E],
- ["9978",0x6A9F],
- ["E9D1",0x6AA0],
- ["9979",0x6AA1],
- ["997A",0x6AA2],
- ["997B",0x6AA3],
- ["997C",0x6AA4],
- ["997D",0x6AA5],
- ["997E",0x6AA6],
- ["9980",0x6AA7],
- ["9981",0x6AA8],
- ["E9DD",0x6AA9],
- ["9982",0x6AAA],
- ["E9DF",0x6AAB],
- ["C3CA",0x6AAC],
- ["9983",0x6AAD],
- ["9984",0x6AAE],
- ["9985",0x6AAF],
- ["9986",0x6AB0],
- ["9987",0x6AB1],
- ["9988",0x6AB2],
- ["9989",0x6AB3],
- ["998A",0x6AB4],
- ["998B",0x6AB5],
- ["998C",0x6AB6],
- ["998D",0x6AB7],
- ["998E",0x6AB8],
- ["998F",0x6AB9],
- ["9990",0x6ABA],
- ["9991",0x6ABB],
- ["9992",0x6ABC],
- ["9993",0x6ABD],
- ["9994",0x6ABE],
- ["9995",0x6ABF],
- ["9996",0x6AC0],
- ["9997",0x6AC1],
- ["9998",0x6AC2],
- ["9999",0x6AC3],
- ["999A",0x6AC4],
- ["999B",0x6AC5],
- ["999C",0x6AC6],
- ["999D",0x6AC7],
- ["999E",0x6AC8],
- ["999F",0x6AC9],
- ["99A0",0x6ACA],
- ["99A1",0x6ACB],
- ["99A2",0x6ACC],
- ["99A3",0x6ACD],
- ["99A4",0x6ACE],
- ["99A5",0x6ACF],
- ["99A6",0x6AD0],
- ["99A7",0x6AD1],
- ["99A8",0x6AD2],
- ["99A9",0x6AD3],
- ["99AA",0x6AD4],
- ["99AB",0x6AD5],
- ["99AC",0x6AD6],
- ["99AD",0x6AD7],
- ["99AE",0x6AD8],
- ["99AF",0x6AD9],
- ["99B0",0x6ADA],
- ["99B1",0x6ADB],
- ["99B2",0x6ADC],
- ["99B3",0x6ADD],
- ["99B4",0x6ADE],
- ["99B5",0x6ADF],
- ["99B6",0x6AE0],
- ["99B7",0x6AE1],
- ["99B8",0x6AE2],
- ["99B9",0x6AE3],
- ["99BA",0x6AE4],
- ["99BB",0x6AE5],
- ["99BC",0x6AE6],
- ["99BD",0x6AE7],
- ["99BE",0x6AE8],
- ["99BF",0x6AE9],
- ["99C0",0x6AEA],
- ["99C1",0x6AEB],
- ["99C2",0x6AEC],
- ["99C3",0x6AED],
- ["99C4",0x6AEE],
- ["99C5",0x6AEF],
- ["99C6",0x6AF0],
- ["99C7",0x6AF1],
- ["99C8",0x6AF2],
- ["99C9",0x6AF3],
- ["99CA",0x6AF4],
- ["99CB",0x6AF5],
- ["99CC",0x6AF6],
- ["99CD",0x6AF7],
- ["99CE",0x6AF8],
- ["99CF",0x6AF9],
- ["99D0",0x6AFA],
- ["99D1",0x6AFB],
- ["99D2",0x6AFC],
- ["99D3",0x6AFD],
- ["99D4",0x6AFE],
- ["99D5",0x6AFF],
- ["99D6",0x6B00],
- ["99D7",0x6B01],
- ["99D8",0x6B02],
- ["99D9",0x6B03],
- ["99DA",0x6B04],
- ["99DB",0x6B05],
- ["99DC",0x6B06],
- ["99DD",0x6B07],
- ["99DE",0x6B08],
- ["99DF",0x6B09],
- ["99E0",0x6B0A],
- ["99E1",0x6B0B],
- ["99E2",0x6B0C],
- ["99E3",0x6B0D],
- ["99E4",0x6B0E],
- ["99E5",0x6B0F],
- ["99E6",0x6B10],
- ["99E7",0x6B11],
- ["99E8",0x6B12],
- ["99E9",0x6B13],
- ["99EA",0x6B14],
- ["99EB",0x6B15],
- ["99EC",0x6B16],
- ["99ED",0x6B17],
- ["99EE",0x6B18],
- ["99EF",0x6B19],
- ["99F0",0x6B1A],
- ["99F1",0x6B1B],
- ["99F2",0x6B1C],
- ["99F3",0x6B1D],
- ["99F4",0x6B1E],
- ["99F5",0x6B1F],
- ["C7B7",0x6B20],
- ["B4CE",0x6B21],
- ["BBB6",0x6B22],
- ["D0C0",0x6B23],
- ["ECA3",0x6B24],
- ["99F6",0x6B25],
- ["99F7",0x6B26],
- ["C5B7",0x6B27],
- ["99F8",0x6B28],
- ["99F9",0x6B29],
- ["99FA",0x6B2A],
- ["99FB",0x6B2B],
- ["99FC",0x6B2C],
- ["99FD",0x6B2D],
- ["99FE",0x6B2E],
- ["9A40",0x6B2F],
- ["9A41",0x6B30],
- ["9A42",0x6B31],
- ["D3FB",0x6B32],
- ["9A43",0x6B33],
- ["9A44",0x6B34],
- ["9A45",0x6B35],
- ["9A46",0x6B36],
- ["ECA4",0x6B37],
- ["9A47",0x6B38],
- ["ECA5",0x6B39],
- ["C6DB",0x6B3A],
- ["9A48",0x6B3B],
- ["9A49",0x6B3C],
- ["9A4A",0x6B3D],
- ["BFEE",0x6B3E],
- ["9A4B",0x6B3F],
- ["9A4C",0x6B40],
- ["9A4D",0x6B41],
- ["9A4E",0x6B42],
- ["ECA6",0x6B43],
- ["9A4F",0x6B44],
- ["9A50",0x6B45],
- ["ECA7",0x6B46],
- ["D0AA",0x6B47],
- ["9A51",0x6B48],
- ["C7B8",0x6B49],
- ["9A52",0x6B4A],
- ["9A53",0x6B4B],
- ["B8E8",0x6B4C],
- ["9A54",0x6B4D],
- ["9A55",0x6B4E],
- ["9A56",0x6B4F],
- ["9A57",0x6B50],
- ["9A58",0x6B51],
- ["9A59",0x6B52],
- ["9A5A",0x6B53],
- ["9A5B",0x6B54],
- ["9A5C",0x6B55],
- ["9A5D",0x6B56],
- ["9A5E",0x6B57],
- ["9A5F",0x6B58],
- ["ECA8",0x6B59],
- ["9A60",0x6B5A],
- ["9A61",0x6B5B],
- ["9A62",0x6B5C],
- ["9A63",0x6B5D],
- ["9A64",0x6B5E],
- ["9A65",0x6B5F],
- ["9A66",0x6B60],
- ["9A67",0x6B61],
- ["D6B9",0x6B62],
- ["D5FD",0x6B63],
- ["B4CB",0x6B64],
- ["B2BD",0x6B65],
- ["CEE4",0x6B66],
- ["C6E7",0x6B67],
- ["9A68",0x6B68],
- ["9A69",0x6B69],
- ["CDE1",0x6B6A],
- ["9A6A",0x6B6B],
- ["9A6B",0x6B6C],
- ["9A6C",0x6B6D],
- ["9A6D",0x6B6E],
- ["9A6E",0x6B6F],
- ["9A6F",0x6B70],
- ["9A70",0x6B71],
- ["9A71",0x6B72],
- ["9A72",0x6B73],
- ["9A73",0x6B74],
- ["9A74",0x6B75],
- ["9A75",0x6B76],
- ["9A76",0x6B77],
- ["9A77",0x6B78],
- ["B4F5",0x6B79],
- ["9A78",0x6B7A],
- ["CBC0",0x6B7B],
- ["BCDF",0x6B7C],
- ["9A79",0x6B7D],
- ["9A7A",0x6B7E],
- ["9A7B",0x6B7F],
- ["9A7C",0x6B80],
- ["E9E2",0x6B81],
- ["E9E3",0x6B82],
- ["D1EA",0x6B83],
- ["E9E5",0x6B84],
- ["9A7D",0x6B85],
- ["B4F9",0x6B86],
- ["E9E4",0x6B87],
- ["9A7E",0x6B88],
- ["D1B3",0x6B89],
- ["CAE2",0x6B8A],
- ["B2D0",0x6B8B],
- ["9A80",0x6B8C],
- ["E9E8",0x6B8D],
- ["9A81",0x6B8E],
- ["9A82",0x6B8F],
- ["9A83",0x6B90],
- ["9A84",0x6B91],
- ["E9E6",0x6B92],
- ["E9E7",0x6B93],
- ["9A85",0x6B94],
- ["9A86",0x6B95],
- ["D6B3",0x6B96],
- ["9A87",0x6B97],
- ["9A88",0x6B98],
- ["9A89",0x6B99],
- ["E9E9",0x6B9A],
- ["E9EA",0x6B9B],
- ["9A8A",0x6B9C],
- ["9A8B",0x6B9D],
- ["9A8C",0x6B9E],
- ["9A8D",0x6B9F],
- ["9A8E",0x6BA0],
- ["E9EB",0x6BA1],
- ["9A8F",0x6BA2],
- ["9A90",0x6BA3],
- ["9A91",0x6BA4],
- ["9A92",0x6BA5],
- ["9A93",0x6BA6],
- ["9A94",0x6BA7],
- ["9A95",0x6BA8],
- ["9A96",0x6BA9],
- ["E9EC",0x6BAA],
- ["9A97",0x6BAB],
- ["9A98",0x6BAC],
- ["9A99",0x6BAD],
- ["9A9A",0x6BAE],
- ["9A9B",0x6BAF],
- ["9A9C",0x6BB0],
- ["9A9D",0x6BB1],
- ["9A9E",0x6BB2],
- ["ECAF",0x6BB3],
- ["C5B9",0x6BB4],
- ["B6CE",0x6BB5],
- ["9A9F",0x6BB6],
- ["D2F3",0x6BB7],
- ["9AA0",0x6BB8],
- ["9AA1",0x6BB9],
- ["9AA2",0x6BBA],
- ["9AA3",0x6BBB],
- ["9AA4",0x6BBC],
- ["9AA5",0x6BBD],
- ["9AA6",0x6BBE],
- ["B5EE",0x6BBF],
- ["9AA7",0x6BC0],
- ["BBD9",0x6BC1],
- ["ECB1",0x6BC2],
- ["9AA8",0x6BC3],
- ["9AA9",0x6BC4],
- ["D2E3",0x6BC5],
- ["9AAA",0x6BC6],
- ["9AAB",0x6BC7],
- ["9AAC",0x6BC8],
- ["9AAD",0x6BC9],
- ["9AAE",0x6BCA],
- ["CEE3",0x6BCB],
- ["9AAF",0x6BCC],
- ["C4B8",0x6BCD],
- ["9AB0",0x6BCE],
- ["C3BF",0x6BCF],
- ["9AB1",0x6BD0],
- ["9AB2",0x6BD1],
- ["B6BE",0x6BD2],
- ["D8B9",0x6BD3],
- ["B1C8",0x6BD4],
- ["B1CF",0x6BD5],
- ["B1D1",0x6BD6],
- ["C5FE",0x6BD7],
- ["9AB3",0x6BD8],
- ["B1D0",0x6BD9],
- ["9AB4",0x6BDA],
- ["C3AB",0x6BDB],
- ["9AB5",0x6BDC],
- ["9AB6",0x6BDD],
- ["9AB7",0x6BDE],
- ["9AB8",0x6BDF],
- ["9AB9",0x6BE0],
- ["D5B1",0x6BE1],
- ["9ABA",0x6BE2],
- ["9ABB",0x6BE3],
- ["9ABC",0x6BE4],
- ["9ABD",0x6BE5],
- ["9ABE",0x6BE6],
- ["9ABF",0x6BE7],
- ["9AC0",0x6BE8],
- ["9AC1",0x6BE9],
- ["EBA4",0x6BEA],
- ["BAC1",0x6BEB],
- ["9AC2",0x6BEC],
- ["9AC3",0x6BED],
- ["9AC4",0x6BEE],
- ["CCBA",0x6BEF],
- ["9AC5",0x6BF0],
- ["9AC6",0x6BF1],
- ["9AC7",0x6BF2],
- ["EBA5",0x6BF3],
- ["9AC8",0x6BF4],
- ["EBA7",0x6BF5],
- ["9AC9",0x6BF6],
- ["9ACA",0x6BF7],
- ["9ACB",0x6BF8],
- ["EBA8",0x6BF9],
- ["9ACC",0x6BFA],
- ["9ACD",0x6BFB],
- ["9ACE",0x6BFC],
- ["EBA6",0x6BFD],
- ["9ACF",0x6BFE],
- ["9AD0",0x6BFF],
- ["9AD1",0x6C00],
- ["9AD2",0x6C01],
- ["9AD3",0x6C02],
- ["9AD4",0x6C03],
- ["9AD5",0x6C04],
- ["EBA9",0x6C05],
- ["EBAB",0x6C06],
- ["EBAA",0x6C07],
- ["9AD6",0x6C08],
- ["9AD7",0x6C09],
- ["9AD8",0x6C0A],
- ["9AD9",0x6C0B],
- ["9ADA",0x6C0C],
- ["EBAC",0x6C0D],
- ["9ADB",0x6C0E],
- ["CACF",0x6C0F],
- ["D8B5",0x6C10],
- ["C3F1",0x6C11],
- ["9ADC",0x6C12],
- ["C3A5",0x6C13],
- ["C6F8",0x6C14],
- ["EBAD",0x6C15],
- ["C4CA",0x6C16],
- ["9ADD",0x6C17],
- ["EBAE",0x6C18],
- ["EBAF",0x6C19],
- ["EBB0",0x6C1A],
- ["B7D5",0x6C1B],
- ["9ADE",0x6C1C],
- ["9ADF",0x6C1D],
- ["9AE0",0x6C1E],
- ["B7FA",0x6C1F],
- ["9AE1",0x6C20],
- ["EBB1",0x6C21],
- ["C7E2",0x6C22],
- ["9AE2",0x6C23],
- ["EBB3",0x6C24],
- ["9AE3",0x6C25],
- ["BAA4",0x6C26],
- ["D1F5",0x6C27],
- ["B0B1",0x6C28],
- ["EBB2",0x6C29],
- ["EBB4",0x6C2A],
- ["9AE4",0x6C2B],
- ["9AE5",0x6C2C],
- ["9AE6",0x6C2D],
- ["B5AA",0x6C2E],
- ["C2C8",0x6C2F],
- ["C7E8",0x6C30],
- ["9AE7",0x6C31],
- ["EBB5",0x6C32],
- ["9AE8",0x6C33],
- ["CBAE",0x6C34],
- ["E3DF",0x6C35],
- ["9AE9",0x6C36],
- ["9AEA",0x6C37],
- ["D3C0",0x6C38],
- ["9AEB",0x6C39],
- ["9AEC",0x6C3A],
- ["9AED",0x6C3B],
- ["9AEE",0x6C3C],
- ["D9DB",0x6C3D],
- ["9AEF",0x6C3E],
- ["9AF0",0x6C3F],
- ["CDA1",0x6C40],
- ["D6AD",0x6C41],
- ["C7F3",0x6C42],
- ["9AF1",0x6C43],
- ["9AF2",0x6C44],
- ["9AF3",0x6C45],
- ["D9E0",0x6C46],
- ["BBE3",0x6C47],
- ["9AF4",0x6C48],
- ["BABA",0x6C49],
- ["E3E2",0x6C4A],
- ["9AF5",0x6C4B],
- ["9AF6",0x6C4C],
- ["9AF7",0x6C4D],
- ["9AF8",0x6C4E],
- ["9AF9",0x6C4F],
- ["CFAB",0x6C50],
- ["9AFA",0x6C51],
- ["9AFB",0x6C52],
- ["9AFC",0x6C53],
- ["E3E0",0x6C54],
- ["C9C7",0x6C55],
- ["9AFD",0x6C56],
- ["BAB9",0x6C57],
- ["9AFE",0x6C58],
- ["9B40",0x6C59],
- ["9B41",0x6C5A],
- ["D1B4",0x6C5B],
- ["E3E1",0x6C5C],
- ["C8EA",0x6C5D],
- ["B9AF",0x6C5E],
- ["BDAD",0x6C5F],
- ["B3D8",0x6C60],
- ["CEDB",0x6C61],
- ["9B42",0x6C62],
- ["9B43",0x6C63],
- ["CCC0",0x6C64],
- ["9B44",0x6C65],
- ["9B45",0x6C66],
- ["9B46",0x6C67],
- ["E3E8",0x6C68],
- ["E3E9",0x6C69],
- ["CDF4",0x6C6A],
- ["9B47",0x6C6B],
- ["9B48",0x6C6C],
- ["9B49",0x6C6D],
- ["9B4A",0x6C6E],
- ["9B4B",0x6C6F],
- ["CCAD",0x6C70],
- ["9B4C",0x6C71],
- ["BCB3",0x6C72],
- ["9B4D",0x6C73],
- ["E3EA",0x6C74],
- ["9B4E",0x6C75],
- ["E3EB",0x6C76],
- ["9B4F",0x6C77],
- ["9B50",0x6C78],
- ["D0DA",0x6C79],
- ["9B51",0x6C7A],
- ["9B52",0x6C7B],
- ["9B53",0x6C7C],
- ["C6FB",0x6C7D],
- ["B7DA",0x6C7E],
- ["9B54",0x6C7F],
- ["9B55",0x6C80],
- ["C7DF",0x6C81],
- ["D2CA",0x6C82],
- ["CED6",0x6C83],
- ["9B56",0x6C84],
- ["E3E4",0x6C85],
- ["E3EC",0x6C86],
- ["9B57",0x6C87],
- ["C9F2",0x6C88],
- ["B3C1",0x6C89],
- ["9B58",0x6C8A],
- ["9B59",0x6C8B],
- ["E3E7",0x6C8C],
- ["9B5A",0x6C8D],
- ["9B5B",0x6C8E],
- ["C6E3",0x6C8F],
- ["E3E5",0x6C90],
- ["9B5C",0x6C91],
- ["9B5D",0x6C92],
- ["EDB3",0x6C93],
- ["E3E6",0x6C94],
- ["9B5E",0x6C95],
- ["9B5F",0x6C96],
- ["9B60",0x6C97],
- ["9B61",0x6C98],
- ["C9B3",0x6C99],
- ["9B62",0x6C9A],
- ["C5E6",0x6C9B],
- ["9B63",0x6C9C],
- ["9B64",0x6C9D],
- ["9B65",0x6C9E],
- ["B9B5",0x6C9F],
- ["9B66",0x6CA0],
- ["C3BB",0x6CA1],
- ["9B67",0x6CA2],
- ["E3E3",0x6CA3],
- ["C5BD",0x6CA4],
- ["C1A4",0x6CA5],
- ["C2D9",0x6CA6],
- ["B2D7",0x6CA7],
- ["9B68",0x6CA8],
- ["E3ED",0x6CA9],
- ["BBA6",0x6CAA],
- ["C4AD",0x6CAB],
- ["9B69",0x6CAC],
- ["E3F0",0x6CAD],
- ["BEDA",0x6CAE],
- ["9B6A",0x6CAF],
- ["9B6B",0x6CB0],
- ["E3FB",0x6CB1],
- ["E3F5",0x6CB2],
- ["BAD3",0x6CB3],
- ["9B6C",0x6CB4],
- ["9B6D",0x6CB5],
- ["9B6E",0x6CB6],
- ["9B6F",0x6CB7],
- ["B7D0",0x6CB8],
- ["D3CD",0x6CB9],
- ["9B70",0x6CBA],
- ["D6CE",0x6CBB],
- ["D5D3",0x6CBC],
- ["B9C1",0x6CBD],
- ["D5B4",0x6CBE],
- ["D1D8",0x6CBF],
- ["9B71",0x6CC0],
- ["9B72",0x6CC1],
- ["9B73",0x6CC2],
- ["9B74",0x6CC3],
- ["D0B9",0x6CC4],
- ["C7F6",0x6CC5],
- ["9B75",0x6CC6],
- ["9B76",0x6CC7],
- ["9B77",0x6CC8],
- ["C8AA",0x6CC9],
- ["B2B4",0x6CCA],
- ["9B78",0x6CCB],
- ["C3DA",0x6CCC],
- ["9B79",0x6CCD],
- ["9B7A",0x6CCE],
- ["9B7B",0x6CCF],
- ["E3EE",0x6CD0],
- ["9B7C",0x6CD1],
- ["9B7D",0x6CD2],
- ["E3FC",0x6CD3],
- ["E3EF",0x6CD4],
- ["B7A8",0x6CD5],
- ["E3F7",0x6CD6],
- ["E3F4",0x6CD7],
- ["9B7E",0x6CD8],
- ["9B80",0x6CD9],
- ["9B81",0x6CDA],
- ["B7BA",0x6CDB],
- ["9B82",0x6CDC],
- ["9B83",0x6CDD],
- ["C5A2",0x6CDE],
- ["9B84",0x6CDF],
- ["E3F6",0x6CE0],
- ["C5DD",0x6CE1],
- ["B2A8",0x6CE2],
- ["C6FC",0x6CE3],
- ["9B85",0x6CE4],
- ["C4E0",0x6CE5],
- ["9B86",0x6CE6],
- ["9B87",0x6CE7],
- ["D7A2",0x6CE8],
- ["9B88",0x6CE9],
- ["C0E1",0x6CEA],
- ["E3F9",0x6CEB],
- ["9B89",0x6CEC],
- ["9B8A",0x6CED],
- ["E3FA",0x6CEE],
- ["E3FD",0x6CEF],
- ["CCA9",0x6CF0],
- ["E3F3",0x6CF1],
- ["9B8B",0x6CF2],
- ["D3BE",0x6CF3],
- ["9B8C",0x6CF4],
- ["B1C3",0x6CF5],
- ["EDB4",0x6CF6],
- ["E3F1",0x6CF7],
- ["E3F2",0x6CF8],
- ["9B8D",0x6CF9],
- ["E3F8",0x6CFA],
- ["D0BA",0x6CFB],
- ["C6C3",0x6CFC],
- ["D4F3",0x6CFD],
- ["E3FE",0x6CFE],
- ["9B8E",0x6CFF],
- ["9B8F",0x6D00],
- ["BDE0",0x6D01],
- ["9B90",0x6D02],
- ["9B91",0x6D03],
- ["E4A7",0x6D04],
- ["9B92",0x6D05],
- ["9B93",0x6D06],
- ["E4A6",0x6D07],
- ["9B94",0x6D08],
- ["9B95",0x6D09],
- ["9B96",0x6D0A],
- ["D1F3",0x6D0B],
- ["E4A3",0x6D0C],
- ["9B97",0x6D0D],
- ["E4A9",0x6D0E],
- ["9B98",0x6D0F],
- ["9B99",0x6D10],
- ["9B9A",0x6D11],
- ["C8F7",0x6D12],
- ["9B9B",0x6D13],
- ["9B9C",0x6D14],
- ["9B9D",0x6D15],
- ["9B9E",0x6D16],
- ["CFB4",0x6D17],
- ["9B9F",0x6D18],
- ["E4A8",0x6D19],
- ["E4AE",0x6D1A],
- ["C2E5",0x6D1B],
- ["9BA0",0x6D1C],
- ["9BA1",0x6D1D],
- ["B6B4",0x6D1E],
- ["9BA2",0x6D1F],
- ["9BA3",0x6D20],
- ["9BA4",0x6D21],
- ["9BA5",0x6D22],
- ["9BA6",0x6D23],
- ["9BA7",0x6D24],
- ["BDF2",0x6D25],
- ["9BA8",0x6D26],
- ["E4A2",0x6D27],
- ["9BA9",0x6D28],
- ["9BAA",0x6D29],
- ["BAE9",0x6D2A],
- ["E4AA",0x6D2B],
- ["9BAB",0x6D2C],
- ["9BAC",0x6D2D],
- ["E4AC",0x6D2E],
- ["9BAD",0x6D2F],
- ["9BAE",0x6D30],
- ["B6FD",0x6D31],
- ["D6DE",0x6D32],
- ["E4B2",0x6D33],
- ["9BAF",0x6D34],
- ["E4AD",0x6D35],
- ["9BB0",0x6D36],
- ["9BB1",0x6D37],
- ["9BB2",0x6D38],
- ["E4A1",0x6D39],
- ["9BB3",0x6D3A],
- ["BBEE",0x6D3B],
- ["CDDD",0x6D3C],
- ["C7A2",0x6D3D],
- ["C5C9",0x6D3E],
- ["9BB4",0x6D3F],
- ["9BB5",0x6D40],
- ["C1F7",0x6D41],
- ["9BB6",0x6D42],
- ["E4A4",0x6D43],
- ["9BB7",0x6D44],
- ["C7B3",0x6D45],
- ["BDAC",0x6D46],
- ["BDBD",0x6D47],
- ["E4A5",0x6D48],
- ["9BB8",0x6D49],
- ["D7C7",0x6D4A],
- ["B2E2",0x6D4B],
- ["9BB9",0x6D4C],
- ["E4AB",0x6D4D],
- ["BCC3",0x6D4E],
- ["E4AF",0x6D4F],
- ["9BBA",0x6D50],
- ["BBEB",0x6D51],
- ["E4B0",0x6D52],
- ["C5A8",0x6D53],
- ["E4B1",0x6D54],
- ["9BBB",0x6D55],
- ["9BBC",0x6D56],
- ["9BBD",0x6D57],
- ["9BBE",0x6D58],
- ["D5E3",0x6D59],
- ["BFA3",0x6D5A],
- ["9BBF",0x6D5B],
- ["E4BA",0x6D5C],
- ["9BC0",0x6D5D],
- ["E4B7",0x6D5E],
- ["9BC1",0x6D5F],
- ["E4BB",0x6D60],
- ["9BC2",0x6D61],
- ["9BC3",0x6D62],
- ["E4BD",0x6D63],
- ["9BC4",0x6D64],
- ["9BC5",0x6D65],
- ["C6D6",0x6D66],
- ["9BC6",0x6D67],
- ["9BC7",0x6D68],
- ["BAC6",0x6D69],
- ["C0CB",0x6D6A],
- ["9BC8",0x6D6B],
- ["9BC9",0x6D6C],
- ["9BCA",0x6D6D],
- ["B8A1",0x6D6E],
- ["E4B4",0x6D6F],
- ["9BCB",0x6D70],
- ["9BCC",0x6D71],
- ["9BCD",0x6D72],
- ["9BCE",0x6D73],
- ["D4A1",0x6D74],
- ["9BCF",0x6D75],
- ["9BD0",0x6D76],
- ["BAA3",0x6D77],
- ["BDFE",0x6D78],
- ["9BD1",0x6D79],
- ["9BD2",0x6D7A],
- ["9BD3",0x6D7B],
- ["E4BC",0x6D7C],
- ["9BD4",0x6D7D],
- ["9BD5",0x6D7E],
- ["9BD6",0x6D7F],
- ["9BD7",0x6D80],
- ["9BD8",0x6D81],
- ["CDBF",0x6D82],
- ["9BD9",0x6D83],
- ["9BDA",0x6D84],
- ["C4F9",0x6D85],
- ["9BDB",0x6D86],
- ["9BDC",0x6D87],
- ["CFFB",0x6D88],
- ["C9E6",0x6D89],
- ["9BDD",0x6D8A],
- ["9BDE",0x6D8B],
- ["D3BF",0x6D8C],
- ["9BDF",0x6D8D],
- ["CFD1",0x6D8E],
- ["9BE0",0x6D8F],
- ["9BE1",0x6D90],
- ["E4B3",0x6D91],
- ["9BE2",0x6D92],
- ["E4B8",0x6D93],
- ["E4B9",0x6D94],
- ["CCE9",0x6D95],
- ["9BE3",0x6D96],
- ["9BE4",0x6D97],
- ["9BE5",0x6D98],
- ["9BE6",0x6D99],
- ["9BE7",0x6D9A],
- ["CCCE",0x6D9B],
- ["9BE8",0x6D9C],
- ["C0D4",0x6D9D],
- ["E4B5",0x6D9E],
- ["C1B0",0x6D9F],
- ["E4B6",0x6DA0],
- ["CED0",0x6DA1],
- ["9BE9",0x6DA2],
- ["BBC1",0x6DA3],
- ["B5D3",0x6DA4],
- ["9BEA",0x6DA5],
- ["C8F3",0x6DA6],
- ["BDA7",0x6DA7],
- ["D5C7",0x6DA8],
- ["C9AC",0x6DA9],
- ["B8A2",0x6DAA],
- ["E4CA",0x6DAB],
- ["9BEB",0x6DAC],
- ["9BEC",0x6DAD],
- ["E4CC",0x6DAE],
- ["D1C4",0x6DAF],
- ["9BED",0x6DB0],
- ["9BEE",0x6DB1],
- ["D2BA",0x6DB2],
- ["9BEF",0x6DB3],
- ["9BF0",0x6DB4],
- ["BAAD",0x6DB5],
- ["9BF1",0x6DB6],
- ["9BF2",0x6DB7],
- ["BAD4",0x6DB8],
- ["9BF3",0x6DB9],
- ["9BF4",0x6DBA],
- ["9BF5",0x6DBB],
- ["9BF6",0x6DBC],
- ["9BF7",0x6DBD],
- ["9BF8",0x6DBE],
- ["E4C3",0x6DBF],
- ["B5ED",0x6DC0],
- ["9BF9",0x6DC1],
- ["9BFA",0x6DC2],
- ["9BFB",0x6DC3],
- ["D7CD",0x6DC4],
- ["E4C0",0x6DC5],
- ["CFFD",0x6DC6],
- ["E4BF",0x6DC7],
- ["9BFC",0x6DC8],
- ["9BFD",0x6DC9],
- ["9BFE",0x6DCA],
- ["C1DC",0x6DCB],
- ["CCCA",0x6DCC],
- ["9C40",0x6DCD],
- ["9C41",0x6DCE],
- ["9C42",0x6DCF],
- ["9C43",0x6DD0],
- ["CAE7",0x6DD1],
- ["9C44",0x6DD2],
- ["9C45",0x6DD3],
- ["9C46",0x6DD4],
- ["9C47",0x6DD5],
- ["C4D7",0x6DD6],
- ["9C48",0x6DD7],
- ["CCD4",0x6DD8],
- ["E4C8",0x6DD9],
- ["9C49",0x6DDA],
- ["9C4A",0x6DDB],
- ["9C4B",0x6DDC],
- ["E4C7",0x6DDD],
- ["E4C1",0x6DDE],
- ["9C4C",0x6DDF],
- ["E4C4",0x6DE0],
- ["B5AD",0x6DE1],
- ["9C4D",0x6DE2],
- ["9C4E",0x6DE3],
- ["D3D9",0x6DE4],
- ["9C4F",0x6DE5],
- ["E4C6",0x6DE6],
- ["9C50",0x6DE7],
- ["9C51",0x6DE8],
- ["9C52",0x6DE9],
- ["9C53",0x6DEA],
- ["D2F9",0x6DEB],
- ["B4E3",0x6DEC],
- ["9C54",0x6DED],
- ["BBB4",0x6DEE],
- ["9C55",0x6DEF],
- ["9C56",0x6DF0],
- ["C9EE",0x6DF1],
- ["9C57",0x6DF2],
- ["B4BE",0x6DF3],
- ["9C58",0x6DF4],
- ["9C59",0x6DF5],
- ["9C5A",0x6DF6],
- ["BBEC",0x6DF7],
- ["9C5B",0x6DF8],
- ["D1CD",0x6DF9],
- ["9C5C",0x6DFA],
- ["CCED",0x6DFB],
- ["EDB5",0x6DFC],
- ["9C5D",0x6DFD],
- ["9C5E",0x6DFE],
- ["9C5F",0x6DFF],
- ["9C60",0x6E00],
- ["9C61",0x6E01],
- ["9C62",0x6E02],
- ["9C63",0x6E03],
- ["9C64",0x6E04],
- ["C7E5",0x6E05],
- ["9C65",0x6E06],
- ["9C66",0x6E07],
- ["9C67",0x6E08],
- ["9C68",0x6E09],
- ["D4A8",0x6E0A],
- ["9C69",0x6E0B],
- ["E4CB",0x6E0C],
- ["D7D5",0x6E0D],
- ["E4C2",0x6E0E],
- ["9C6A",0x6E0F],
- ["BDA5",0x6E10],
- ["E4C5",0x6E11],
- ["9C6B",0x6E12],
- ["9C6C",0x6E13],
- ["D3E6",0x6E14],
- ["9C6D",0x6E15],
- ["E4C9",0x6E16],
- ["C9F8",0x6E17],
- ["9C6E",0x6E18],
- ["9C6F",0x6E19],
- ["E4BE",0x6E1A],
- ["9C70",0x6E1B],
- ["9C71",0x6E1C],
- ["D3E5",0x6E1D],
- ["9C72",0x6E1E],
- ["9C73",0x6E1F],
- ["C7FE",0x6E20],
- ["B6C9",0x6E21],
- ["9C74",0x6E22],
- ["D4FC",0x6E23],
- ["B2B3",0x6E24],
- ["E4D7",0x6E25],
- ["9C75",0x6E26],
- ["9C76",0x6E27],
- ["9C77",0x6E28],
- ["CEC2",0x6E29],
- ["9C78",0x6E2A],
- ["E4CD",0x6E2B],
- ["9C79",0x6E2C],
- ["CEBC",0x6E2D],
- ["9C7A",0x6E2E],
- ["B8DB",0x6E2F],
- ["9C7B",0x6E30],
- ["9C7C",0x6E31],
- ["E4D6",0x6E32],
- ["9C7D",0x6E33],
- ["BFCA",0x6E34],
- ["9C7E",0x6E35],
- ["9C80",0x6E36],
- ["9C81",0x6E37],
- ["D3CE",0x6E38],
- ["9C82",0x6E39],
- ["C3EC",0x6E3A],
- ["9C83",0x6E3B],
- ["9C84",0x6E3C],
- ["9C85",0x6E3D],
- ["9C86",0x6E3E],
- ["9C87",0x6E3F],
- ["9C88",0x6E40],
- ["9C89",0x6E41],
- ["9C8A",0x6E42],
- ["C5C8",0x6E43],
- ["E4D8",0x6E44],
- ["9C8B",0x6E45],
- ["9C8C",0x6E46],
- ["9C8D",0x6E47],
- ["9C8E",0x6E48],
- ["9C8F",0x6E49],
- ["9C90",0x6E4A],
- ["9C91",0x6E4B],
- ["9C92",0x6E4C],
- ["CDC4",0x6E4D],
- ["E4CF",0x6E4E],
- ["9C93",0x6E4F],
- ["9C94",0x6E50],
- ["9C95",0x6E51],
- ["9C96",0x6E52],
- ["E4D4",0x6E53],
- ["E4D5",0x6E54],
- ["9C97",0x6E55],
- ["BAFE",0x6E56],
- ["9C98",0x6E57],
- ["CFE6",0x6E58],
- ["9C99",0x6E59],
- ["9C9A",0x6E5A],
- ["D5BF",0x6E5B],
- ["9C9B",0x6E5C],
- ["9C9C",0x6E5D],
- ["9C9D",0x6E5E],
- ["E4D2",0x6E5F],
- ["9C9E",0x6E60],
- ["9C9F",0x6E61],
- ["9CA0",0x6E62],
- ["9CA1",0x6E63],
- ["9CA2",0x6E64],
- ["9CA3",0x6E65],
- ["9CA4",0x6E66],
- ["9CA5",0x6E67],
- ["9CA6",0x6E68],
- ["9CA7",0x6E69],
- ["9CA8",0x6E6A],
- ["E4D0",0x6E6B],
- ["9CA9",0x6E6C],
- ["9CAA",0x6E6D],
- ["E4CE",0x6E6E],
- ["9CAB",0x6E6F],
- ["9CAC",0x6E70],
- ["9CAD",0x6E71],
- ["9CAE",0x6E72],
- ["9CAF",0x6E73],
- ["9CB0",0x6E74],
- ["9CB1",0x6E75],
- ["9CB2",0x6E76],
- ["9CB3",0x6E77],
- ["9CB4",0x6E78],
- ["9CB5",0x6E79],
- ["9CB6",0x6E7A],
- ["9CB7",0x6E7B],
- ["9CB8",0x6E7C],
- ["9CB9",0x6E7D],
- ["CDE5",0x6E7E],
- ["CAAA",0x6E7F],
- ["9CBA",0x6E80],
- ["9CBB",0x6E81],
- ["9CBC",0x6E82],
- ["C0A3",0x6E83],
- ["9CBD",0x6E84],
- ["BDA6",0x6E85],
- ["E4D3",0x6E86],
- ["9CBE",0x6E87],
- ["9CBF",0x6E88],
- ["B8C8",0x6E89],
- ["9CC0",0x6E8A],
- ["9CC1",0x6E8B],
- ["9CC2",0x6E8C],
- ["9CC3",0x6E8D],
- ["9CC4",0x6E8E],
- ["E4E7",0x6E8F],
- ["D4B4",0x6E90],
- ["9CC5",0x6E91],
- ["9CC6",0x6E92],
- ["9CC7",0x6E93],
- ["9CC8",0x6E94],
- ["9CC9",0x6E95],
- ["9CCA",0x6E96],
- ["9CCB",0x6E97],
- ["E4DB",0x6E98],
- ["9CCC",0x6E99],
- ["9CCD",0x6E9A],
- ["9CCE",0x6E9B],
- ["C1EF",0x6E9C],
- ["9CCF",0x6E9D],
- ["9CD0",0x6E9E],
- ["E4E9",0x6E9F],
- ["9CD1",0x6EA0],
- ["9CD2",0x6EA1],
- ["D2E7",0x6EA2],
- ["9CD3",0x6EA3],
- ["9CD4",0x6EA4],
- ["E4DF",0x6EA5],
- ["9CD5",0x6EA6],
- ["E4E0",0x6EA7],
- ["9CD6",0x6EA8],
- ["9CD7",0x6EA9],
- ["CFAA",0x6EAA],
- ["9CD8",0x6EAB],
- ["9CD9",0x6EAC],
- ["9CDA",0x6EAD],
- ["9CDB",0x6EAE],
- ["CBDD",0x6EAF],
- ["9CDC",0x6EB0],
- ["E4DA",0x6EB1],
- ["E4D1",0x6EB2],
- ["9CDD",0x6EB3],
- ["E4E5",0x6EB4],
- ["9CDE",0x6EB5],
- ["C8DC",0x6EB6],
- ["E4E3",0x6EB7],
- ["9CDF",0x6EB8],
- ["9CE0",0x6EB9],
- ["C4E7",0x6EBA],
- ["E4E2",0x6EBB],
- ["9CE1",0x6EBC],
- ["E4E1",0x6EBD],
- ["9CE2",0x6EBE],
- ["9CE3",0x6EBF],
- ["9CE4",0x6EC0],
- ["B3FC",0x6EC1],
- ["E4E8",0x6EC2],
- ["9CE5",0x6EC3],
- ["9CE6",0x6EC4],
- ["9CE7",0x6EC5],
- ["9CE8",0x6EC6],
- ["B5E1",0x6EC7],
- ["9CE9",0x6EC8],
- ["9CEA",0x6EC9],
- ["9CEB",0x6ECA],
- ["D7CC",0x6ECB],
- ["9CEC",0x6ECC],
- ["9CED",0x6ECD],
- ["9CEE",0x6ECE],
- ["E4E6",0x6ECF],
- ["9CEF",0x6ED0],
- ["BBAC",0x6ED1],
- ["9CF0",0x6ED2],
- ["D7D2",0x6ED3],
- ["CCCF",0x6ED4],
- ["EBF8",0x6ED5],
- ["9CF1",0x6ED6],
- ["E4E4",0x6ED7],
- ["9CF2",0x6ED8],
- ["9CF3",0x6ED9],
- ["B9F6",0x6EDA],
- ["9CF4",0x6EDB],
- ["9CF5",0x6EDC],
- ["9CF6",0x6EDD],
- ["D6CD",0x6EDE],
- ["E4D9",0x6EDF],
- ["E4DC",0x6EE0],
- ["C2FA",0x6EE1],
- ["E4DE",0x6EE2],
- ["9CF7",0x6EE3],
- ["C2CB",0x6EE4],
- ["C0C4",0x6EE5],
- ["C2D0",0x6EE6],
- ["9CF8",0x6EE7],
- ["B1F5",0x6EE8],
- ["CCB2",0x6EE9],
- ["9CF9",0x6EEA],
- ["9CFA",0x6EEB],
- ["9CFB",0x6EEC],
- ["9CFC",0x6EED],
- ["9CFD",0x6EEE],
- ["9CFE",0x6EEF],
- ["9D40",0x6EF0],
- ["9D41",0x6EF1],
- ["9D42",0x6EF2],
- ["9D43",0x6EF3],
- ["B5CE",0x6EF4],
- ["9D44",0x6EF5],
- ["9D45",0x6EF6],
- ["9D46",0x6EF7],
- ["9D47",0x6EF8],
- ["E4EF",0x6EF9],
- ["9D48",0x6EFA],
- ["9D49",0x6EFB],
- ["9D4A",0x6EFC],
- ["9D4B",0x6EFD],
- ["9D4C",0x6EFE],
- ["9D4D",0x6EFF],
- ["9D4E",0x6F00],
- ["9D4F",0x6F01],
- ["C6AF",0x6F02],
- ["9D50",0x6F03],
- ["9D51",0x6F04],
- ["9D52",0x6F05],
- ["C6E1",0x6F06],
- ["9D53",0x6F07],
- ["9D54",0x6F08],
- ["E4F5",0x6F09],
- ["9D55",0x6F0A],
- ["9D56",0x6F0B],
- ["9D57",0x6F0C],
- ["9D58",0x6F0D],
- ["9D59",0x6F0E],
- ["C2A9",0x6F0F],
- ["9D5A",0x6F10],
- ["9D5B",0x6F11],
- ["9D5C",0x6F12],
- ["C0EC",0x6F13],
- ["D1DD",0x6F14],
- ["E4EE",0x6F15],
- ["9D5D",0x6F16],
- ["9D5E",0x6F17],
- ["9D5F",0x6F18],
- ["9D60",0x6F19],
- ["9D61",0x6F1A],
- ["9D62",0x6F1B],
- ["9D63",0x6F1C],
- ["9D64",0x6F1D],
- ["9D65",0x6F1E],
- ["9D66",0x6F1F],
- ["C4AE",0x6F20],
- ["9D67",0x6F21],
- ["9D68",0x6F22],
- ["9D69",0x6F23],
- ["E4ED",0x6F24],
- ["9D6A",0x6F25],
- ["9D6B",0x6F26],
- ["9D6C",0x6F27],
- ["9D6D",0x6F28],
- ["E4F6",0x6F29],
- ["E4F4",0x6F2A],
- ["C2FE",0x6F2B],
- ["9D6E",0x6F2C],
- ["E4DD",0x6F2D],
- ["9D6F",0x6F2E],
- ["E4F0",0x6F2F],
- ["9D70",0x6F30],
- ["CAFE",0x6F31],
- ["9D71",0x6F32],
- ["D5C4",0x6F33],
- ["9D72",0x6F34],
- ["9D73",0x6F35],
- ["E4F1",0x6F36],
- ["9D74",0x6F37],
- ["9D75",0x6F38],
- ["9D76",0x6F39],
- ["9D77",0x6F3A],
- ["9D78",0x6F3B],
- ["9D79",0x6F3C],
- ["9D7A",0x6F3D],
- ["D1FA",0x6F3E],
- ["9D7B",0x6F3F],
- ["9D7C",0x6F40],
- ["9D7D",0x6F41],
- ["9D7E",0x6F42],
- ["9D80",0x6F43],
- ["9D81",0x6F44],
- ["9D82",0x6F45],
- ["E4EB",0x6F46],
- ["E4EC",0x6F47],
- ["9D83",0x6F48],
- ["9D84",0x6F49],
- ["9D85",0x6F4A],
- ["E4F2",0x6F4B],
- ["9D86",0x6F4C],
- ["CEAB",0x6F4D],
- ["9D87",0x6F4E],
- ["9D88",0x6F4F],
- ["9D89",0x6F50],
- ["9D8A",0x6F51],
- ["9D8B",0x6F52],
- ["9D8C",0x6F53],
- ["9D8D",0x6F54],
- ["9D8E",0x6F55],
- ["9D8F",0x6F56],
- ["9D90",0x6F57],
- ["C5CB",0x6F58],
- ["9D91",0x6F59],
- ["9D92",0x6F5A],
- ["9D93",0x6F5B],
- ["C7B1",0x6F5C],
- ["9D94",0x6F5D],
- ["C2BA",0x6F5E],
- ["9D95",0x6F5F],
- ["9D96",0x6F60],
- ["9D97",0x6F61],
- ["E4EA",0x6F62],
- ["9D98",0x6F63],
- ["9D99",0x6F64],
- ["9D9A",0x6F65],
- ["C1CA",0x6F66],
- ["9D9B",0x6F67],
- ["9D9C",0x6F68],
- ["9D9D",0x6F69],
- ["9D9E",0x6F6A],
- ["9D9F",0x6F6B],
- ["9DA0",0x6F6C],
- ["CCB6",0x6F6D],
- ["B3B1",0x6F6E],
- ["9DA1",0x6F6F],
- ["9DA2",0x6F70],
- ["9DA3",0x6F71],
- ["E4FB",0x6F72],
- ["9DA4",0x6F73],
- ["E4F3",0x6F74],
- ["9DA5",0x6F75],
- ["9DA6",0x6F76],
- ["9DA7",0x6F77],
- ["E4FA",0x6F78],
- ["9DA8",0x6F79],
- ["E4FD",0x6F7A],
- ["9DA9",0x6F7B],
- ["E4FC",0x6F7C],
- ["9DAA",0x6F7D],
- ["9DAB",0x6F7E],
- ["9DAC",0x6F7F],
- ["9DAD",0x6F80],
- ["9DAE",0x6F81],
- ["9DAF",0x6F82],
- ["9DB0",0x6F83],
- ["B3CE",0x6F84],
- ["9DB1",0x6F85],
- ["9DB2",0x6F86],
- ["9DB3",0x6F87],
- ["B3BA",0x6F88],
- ["E4F7",0x6F89],
- ["9DB4",0x6F8A],
- ["9DB5",0x6F8B],
- ["E4F9",0x6F8C],
- ["E4F8",0x6F8D],
- ["C5EC",0x6F8E],
- ["9DB6",0x6F8F],
- ["9DB7",0x6F90],
- ["9DB8",0x6F91],
- ["9DB9",0x6F92],
- ["9DBA",0x6F93],
- ["9DBB",0x6F94],
- ["9DBC",0x6F95],
- ["9DBD",0x6F96],
- ["9DBE",0x6F97],
- ["9DBF",0x6F98],
- ["9DC0",0x6F99],
- ["9DC1",0x6F9A],
- ["9DC2",0x6F9B],
- ["C0BD",0x6F9C],
- ["9DC3",0x6F9D],
- ["9DC4",0x6F9E],
- ["9DC5",0x6F9F],
- ["9DC6",0x6FA0],
- ["D4E8",0x6FA1],
- ["9DC7",0x6FA2],
- ["9DC8",0x6FA3],
- ["9DC9",0x6FA4],
- ["9DCA",0x6FA5],
- ["9DCB",0x6FA6],
- ["E5A2",0x6FA7],
- ["9DCC",0x6FA8],
- ["9DCD",0x6FA9],
- ["9DCE",0x6FAA],
- ["9DCF",0x6FAB],
- ["9DD0",0x6FAC],
- ["9DD1",0x6FAD],
- ["9DD2",0x6FAE],
- ["9DD3",0x6FAF],
- ["9DD4",0x6FB0],
- ["9DD5",0x6FB1],
- ["9DD6",0x6FB2],
- ["B0C4",0x6FB3],
- ["9DD7",0x6FB4],
- ["9DD8",0x6FB5],
- ["E5A4",0x6FB6],
- ["9DD9",0x6FB7],
- ["9DDA",0x6FB8],
- ["E5A3",0x6FB9],
- ["9DDB",0x6FBA],
- ["9DDC",0x6FBB],
- ["9DDD",0x6FBC],
- ["9DDE",0x6FBD],
- ["9DDF",0x6FBE],
- ["9DE0",0x6FBF],
- ["BCA4",0x6FC0],
- ["9DE1",0x6FC1],
- ["E5A5",0x6FC2],
- ["9DE2",0x6FC3],
- ["9DE3",0x6FC4],
- ["9DE4",0x6FC5],
- ["9DE5",0x6FC6],
- ["9DE6",0x6FC7],
- ["9DE7",0x6FC8],
- ["E5A1",0x6FC9],
- ["9DE8",0x6FCA],
- ["9DE9",0x6FCB],
- ["9DEA",0x6FCC],
- ["9DEB",0x6FCD],
- ["9DEC",0x6FCE],
- ["9DED",0x6FCF],
- ["9DEE",0x6FD0],
- ["E4FE",0x6FD1],
- ["B1F4",0x6FD2],
- ["9DEF",0x6FD3],
- ["9DF0",0x6FD4],
- ["9DF1",0x6FD5],
- ["9DF2",0x6FD6],
- ["9DF3",0x6FD7],
- ["9DF4",0x6FD8],
- ["9DF5",0x6FD9],
- ["9DF6",0x6FDA],
- ["9DF7",0x6FDB],
- ["9DF8",0x6FDC],
- ["9DF9",0x6FDD],
- ["E5A8",0x6FDE],
- ["9DFA",0x6FDF],
- ["E5A9",0x6FE0],
- ["E5A6",0x6FE1],
- ["9DFB",0x6FE2],
- ["9DFC",0x6FE3],
- ["9DFD",0x6FE4],
- ["9DFE",0x6FE5],
- ["9E40",0x6FE6],
- ["9E41",0x6FE7],
- ["9E42",0x6FE8],
- ["9E43",0x6FE9],
- ["9E44",0x6FEA],
- ["9E45",0x6FEB],
- ["9E46",0x6FEC],
- ["9E47",0x6FED],
- ["E5A7",0x6FEE],
- ["E5AA",0x6FEF],
- ["9E48",0x6FF0],
- ["9E49",0x6FF1],
- ["9E4A",0x6FF2],
- ["9E4B",0x6FF3],
- ["9E4C",0x6FF4],
- ["9E4D",0x6FF5],
- ["9E4E",0x6FF6],
- ["9E4F",0x6FF7],
- ["9E50",0x6FF8],
- ["9E51",0x6FF9],
- ["9E52",0x6FFA],
- ["9E53",0x6FFB],
- ["9E54",0x6FFC],
- ["9E55",0x6FFD],
- ["9E56",0x6FFE],
- ["9E57",0x6FFF],
- ["9E58",0x7000],
- ["9E59",0x7001],
- ["9E5A",0x7002],
- ["9E5B",0x7003],
- ["9E5C",0x7004],
- ["9E5D",0x7005],
- ["9E5E",0x7006],
- ["9E5F",0x7007],
- ["9E60",0x7008],
- ["9E61",0x7009],
- ["9E62",0x700A],
- ["9E63",0x700B],
- ["9E64",0x700C],
- ["9E65",0x700D],
- ["9E66",0x700E],
- ["9E67",0x700F],
- ["9E68",0x7010],
- ["C6D9",0x7011],
- ["9E69",0x7012],
- ["9E6A",0x7013],
- ["9E6B",0x7014],
- ["9E6C",0x7015],
- ["9E6D",0x7016],
- ["9E6E",0x7017],
- ["9E6F",0x7018],
- ["9E70",0x7019],
- ["E5AB",0x701A],
- ["E5AD",0x701B],
- ["9E71",0x701C],
- ["9E72",0x701D],
- ["9E73",0x701E],
- ["9E74",0x701F],
- ["9E75",0x7020],
- ["9E76",0x7021],
- ["9E77",0x7022],
- ["E5AC",0x7023],
- ["9E78",0x7024],
- ["9E79",0x7025],
- ["9E7A",0x7026],
- ["9E7B",0x7027],
- ["9E7C",0x7028],
- ["9E7D",0x7029],
- ["9E7E",0x702A],
- ["9E80",0x702B],
- ["9E81",0x702C],
- ["9E82",0x702D],
- ["9E83",0x702E],
- ["9E84",0x702F],
- ["9E85",0x7030],
- ["9E86",0x7031],
- ["9E87",0x7032],
- ["9E88",0x7033],
- ["9E89",0x7034],
- ["E5AF",0x7035],
- ["9E8A",0x7036],
- ["9E8B",0x7037],
- ["9E8C",0x7038],
- ["E5AE",0x7039],
- ["9E8D",0x703A],
- ["9E8E",0x703B],
- ["9E8F",0x703C],
- ["9E90",0x703D],
- ["9E91",0x703E],
- ["9E92",0x703F],
- ["9E93",0x7040],
- ["9E94",0x7041],
- ["9E95",0x7042],
- ["9E96",0x7043],
- ["9E97",0x7044],
- ["9E98",0x7045],
- ["9E99",0x7046],
- ["9E9A",0x7047],
- ["9E9B",0x7048],
- ["9E9C",0x7049],
- ["9E9D",0x704A],
- ["9E9E",0x704B],
- ["B9E0",0x704C],
- ["9E9F",0x704D],
- ["9EA0",0x704E],
- ["E5B0",0x704F],
- ["9EA1",0x7050],
- ["9EA2",0x7051],
- ["9EA3",0x7052],
- ["9EA4",0x7053],
- ["9EA5",0x7054],
- ["9EA6",0x7055],
- ["9EA7",0x7056],
- ["9EA8",0x7057],
- ["9EA9",0x7058],
- ["9EAA",0x7059],
- ["9EAB",0x705A],
- ["9EAC",0x705B],
- ["9EAD",0x705C],
- ["9EAE",0x705D],
- ["E5B1",0x705E],
- ["9EAF",0x705F],
- ["9EB0",0x7060],
- ["9EB1",0x7061],
- ["9EB2",0x7062],
- ["9EB3",0x7063],
- ["9EB4",0x7064],
- ["9EB5",0x7065],
- ["9EB6",0x7066],
- ["9EB7",0x7067],
- ["9EB8",0x7068],
- ["9EB9",0x7069],
- ["9EBA",0x706A],
- ["BBF0",0x706B],
- ["ECE1",0x706C],
- ["C3F0",0x706D],
- ["9EBB",0x706E],
- ["B5C6",0x706F],
- ["BBD2",0x7070],
- ["9EBC",0x7071],
- ["9EBD",0x7072],
- ["9EBE",0x7073],
- ["9EBF",0x7074],
- ["C1E9",0x7075],
- ["D4EE",0x7076],
- ["9EC0",0x7077],
- ["BEC4",0x7078],
- ["9EC1",0x7079],
- ["9EC2",0x707A],
- ["9EC3",0x707B],
- ["D7C6",0x707C],
- ["9EC4",0x707D],
- ["D4D6",0x707E],
- ["B2D3",0x707F],
- ["ECBE",0x7080],
- ["9EC5",0x7081],
- ["9EC6",0x7082],
- ["9EC7",0x7083],
- ["9EC8",0x7084],
- ["EAC1",0x7085],
- ["9EC9",0x7086],
- ["9ECA",0x7087],
- ["9ECB",0x7088],
- ["C2AF",0x7089],
- ["B4B6",0x708A],
- ["9ECC",0x708B],
- ["9ECD",0x708C],
- ["9ECE",0x708D],
- ["D1D7",0x708E],
- ["9ECF",0x708F],
- ["9ED0",0x7090],
- ["9ED1",0x7091],
- ["B3B4",0x7092],
- ["9ED2",0x7093],
- ["C8B2",0x7094],
- ["BFBB",0x7095],
- ["ECC0",0x7096],
- ["9ED3",0x7097],
- ["9ED4",0x7098],
- ["D6CB",0x7099],
- ["9ED5",0x709A],
- ["9ED6",0x709B],
- ["ECBF",0x709C],
- ["ECC1",0x709D],
- ["9ED7",0x709E],
- ["9ED8",0x709F],
- ["9ED9",0x70A0],
- ["9EDA",0x70A1],
- ["9EDB",0x70A2],
- ["9EDC",0x70A3],
- ["9EDD",0x70A4],
- ["9EDE",0x70A5],
- ["9EDF",0x70A6],
- ["9EE0",0x70A7],
- ["9EE1",0x70A8],
- ["9EE2",0x70A9],
- ["9EE3",0x70AA],
- ["ECC5",0x70AB],
- ["BEE6",0x70AC],
- ["CCBF",0x70AD],
- ["C5DA",0x70AE],
- ["BEBC",0x70AF],
- ["9EE4",0x70B0],
- ["ECC6",0x70B1],
- ["9EE5",0x70B2],
- ["B1FE",0x70B3],
- ["9EE6",0x70B4],
- ["9EE7",0x70B5],
- ["9EE8",0x70B6],
- ["ECC4",0x70B7],
- ["D5A8",0x70B8],
- ["B5E3",0x70B9],
- ["9EE9",0x70BA],
- ["ECC2",0x70BB],
- ["C1B6",0x70BC],
- ["B3E3",0x70BD],
- ["9EEA",0x70BE],
- ["9EEB",0x70BF],
- ["ECC3",0x70C0],
- ["CBB8",0x70C1],
- ["C0C3",0x70C2],
- ["CCFE",0x70C3],
- ["9EEC",0x70C4],
- ["9EED",0x70C5],
- ["9EEE",0x70C6],
- ["9EEF",0x70C7],
- ["C1D2",0x70C8],
- ["9EF0",0x70C9],
- ["ECC8",0x70CA],
- ["9EF1",0x70CB],
- ["9EF2",0x70CC],
- ["9EF3",0x70CD],
- ["9EF4",0x70CE],
- ["9EF5",0x70CF],
- ["9EF6",0x70D0],
- ["9EF7",0x70D1],
- ["9EF8",0x70D2],
- ["9EF9",0x70D3],
- ["9EFA",0x70D4],
- ["9EFB",0x70D5],
- ["9EFC",0x70D6],
- ["9EFD",0x70D7],
- ["BAE6",0x70D8],
- ["C0D3",0x70D9],
- ["9EFE",0x70DA],
- ["D6F2",0x70DB],
- ["9F40",0x70DC],
- ["9F41",0x70DD],
- ["9F42",0x70DE],
- ["D1CC",0x70DF],
- ["9F43",0x70E0],
- ["9F44",0x70E1],
- ["9F45",0x70E2],
- ["9F46",0x70E3],
- ["BFBE",0x70E4],
- ["9F47",0x70E5],
- ["B7B3",0x70E6],
- ["C9D5",0x70E7],
- ["ECC7",0x70E8],
- ["BBE2",0x70E9],
- ["9F48",0x70EA],
- ["CCCC",0x70EB],
- ["BDFD",0x70EC],
- ["C8C8",0x70ED],
- ["9F49",0x70EE],
- ["CFA9",0x70EF],
- ["9F4A",0x70F0],
- ["9F4B",0x70F1],
- ["9F4C",0x70F2],
- ["9F4D",0x70F3],
- ["9F4E",0x70F4],
- ["9F4F",0x70F5],
- ["9F50",0x70F6],
- ["CDE9",0x70F7],
- ["9F51",0x70F8],
- ["C5EB",0x70F9],
- ["9F52",0x70FA],
- ["9F53",0x70FB],
- ["9F54",0x70FC],
- ["B7E9",0x70FD],
- ["9F55",0x70FE],
- ["9F56",0x70FF],
- ["9F57",0x7100],
- ["9F58",0x7101],
- ["9F59",0x7102],
- ["9F5A",0x7103],
- ["9F5B",0x7104],
- ["9F5C",0x7105],
- ["9F5D",0x7106],
- ["9F5E",0x7107],
- ["9F5F",0x7108],
- ["D1C9",0x7109],
- ["BAB8",0x710A],
- ["9F60",0x710B],
- ["9F61",0x710C],
- ["9F62",0x710D],
- ["9F63",0x710E],
- ["9F64",0x710F],
- ["ECC9",0x7110],
- ["9F65",0x7111],
- ["9F66",0x7112],
- ["ECCA",0x7113],
- ["9F67",0x7114],
- ["BBC0",0x7115],
- ["ECCB",0x7116],
- ["9F68",0x7117],
- ["ECE2",0x7118],
- ["B1BA",0x7119],
- ["B7D9",0x711A],
- ["9F69",0x711B],
- ["9F6A",0x711C],
- ["9F6B",0x711D],
- ["9F6C",0x711E],
- ["9F6D",0x711F],
- ["9F6E",0x7120],
- ["9F6F",0x7121],
- ["9F70",0x7122],
- ["9F71",0x7123],
- ["9F72",0x7124],
- ["9F73",0x7125],
- ["BDB9",0x7126],
- ["9F74",0x7127],
- ["9F75",0x7128],
- ["9F76",0x7129],
- ["9F77",0x712A],
- ["9F78",0x712B],
- ["9F79",0x712C],
- ["9F7A",0x712D],
- ["9F7B",0x712E],
- ["ECCC",0x712F],
- ["D1E6",0x7130],
- ["ECCD",0x7131],
- ["9F7C",0x7132],
- ["9F7D",0x7133],
- ["9F7E",0x7134],
- ["9F80",0x7135],
- ["C8BB",0x7136],
- ["9F81",0x7137],
- ["9F82",0x7138],
- ["9F83",0x7139],
- ["9F84",0x713A],
- ["9F85",0x713B],
- ["9F86",0x713C],
- ["9F87",0x713D],
- ["9F88",0x713E],
- ["9F89",0x713F],
- ["9F8A",0x7140],
- ["9F8B",0x7141],
- ["9F8C",0x7142],
- ["9F8D",0x7143],
- ["9F8E",0x7144],
- ["ECD1",0x7145],
- ["9F8F",0x7146],
- ["9F90",0x7147],
- ["9F91",0x7148],
- ["9F92",0x7149],
- ["ECD3",0x714A],
- ["9F93",0x714B],
- ["BBCD",0x714C],
- ["9F94",0x714D],
- ["BCE5",0x714E],
- ["9F95",0x714F],
- ["9F96",0x7150],
- ["9F97",0x7151],
- ["9F98",0x7152],
- ["9F99",0x7153],
- ["9F9A",0x7154],
- ["9F9B",0x7155],
- ["9F9C",0x7156],
- ["9F9D",0x7157],
- ["9F9E",0x7158],
- ["9F9F",0x7159],
- ["9FA0",0x715A],
- ["9FA1",0x715B],
- ["ECCF",0x715C],
- ["9FA2",0x715D],
- ["C9B7",0x715E],
- ["9FA3",0x715F],
- ["9FA4",0x7160],
- ["9FA5",0x7161],
- ["9FA6",0x7162],
- ["9FA7",0x7163],
- ["C3BA",0x7164],
- ["9FA8",0x7165],
- ["ECE3",0x7166],
- ["D5D5",0x7167],
- ["ECD0",0x7168],
- ["9FA9",0x7169],
- ["9FAA",0x716A],
- ["9FAB",0x716B],
- ["9FAC",0x716C],
- ["9FAD",0x716D],
- ["D6F3",0x716E],
- ["9FAE",0x716F],
- ["9FAF",0x7170],
- ["9FB0",0x7171],
- ["ECD2",0x7172],
- ["ECCE",0x7173],
- ["9FB1",0x7174],
- ["9FB2",0x7175],
- ["9FB3",0x7176],
- ["9FB4",0x7177],
- ["ECD4",0x7178],
- ["9FB5",0x7179],
- ["ECD5",0x717A],
- ["9FB6",0x717B],
- ["9FB7",0x717C],
- ["C9BF",0x717D],
- ["9FB8",0x717E],
- ["9FB9",0x717F],
- ["9FBA",0x7180],
- ["9FBB",0x7181],
- ["9FBC",0x7182],
- ["9FBD",0x7183],
- ["CFA8",0x7184],
- ["9FBE",0x7185],
- ["9FBF",0x7186],
- ["9FC0",0x7187],
- ["9FC1",0x7188],
- ["9FC2",0x7189],
- ["D0DC",0x718A],
- ["9FC3",0x718B],
- ["9FC4",0x718C],
- ["9FC5",0x718D],
- ["9FC6",0x718E],
- ["D1AC",0x718F],
- ["9FC7",0x7190],
- ["9FC8",0x7191],
- ["9FC9",0x7192],
- ["9FCA",0x7193],
- ["C8DB",0x7194],
- ["9FCB",0x7195],
- ["9FCC",0x7196],
- ["9FCD",0x7197],
- ["ECD6",0x7198],
- ["CEF5",0x7199],
- ["9FCE",0x719A],
- ["9FCF",0x719B],
- ["9FD0",0x719C],
- ["9FD1",0x719D],
- ["9FD2",0x719E],
- ["CAEC",0x719F],
- ["ECDA",0x71A0],
- ["9FD3",0x71A1],
- ["9FD4",0x71A2],
- ["9FD5",0x71A3],
- ["9FD6",0x71A4],
- ["9FD7",0x71A5],
- ["9FD8",0x71A6],
- ["9FD9",0x71A7],
- ["ECD9",0x71A8],
- ["9FDA",0x71A9],
- ["9FDB",0x71AA],
- ["9FDC",0x71AB],
- ["B0BE",0x71AC],
- ["9FDD",0x71AD],
- ["9FDE",0x71AE],
- ["9FDF",0x71AF],
- ["9FE0",0x71B0],
- ["9FE1",0x71B1],
- ["9FE2",0x71B2],
- ["ECD7",0x71B3],
- ["9FE3",0x71B4],
- ["ECD8",0x71B5],
- ["9FE4",0x71B6],
- ["9FE5",0x71B7],
- ["9FE6",0x71B8],
- ["ECE4",0x71B9],
- ["9FE7",0x71BA],
- ["9FE8",0x71BB],
- ["9FE9",0x71BC],
- ["9FEA",0x71BD],
- ["9FEB",0x71BE],
- ["9FEC",0x71BF],
- ["9FED",0x71C0],
- ["9FEE",0x71C1],
- ["9FEF",0x71C2],
- ["C8BC",0x71C3],
- ["9FF0",0x71C4],
- ["9FF1",0x71C5],
- ["9FF2",0x71C6],
- ["9FF3",0x71C7],
- ["9FF4",0x71C8],
- ["9FF5",0x71C9],
- ["9FF6",0x71CA],
- ["9FF7",0x71CB],
- ["9FF8",0x71CC],
- ["9FF9",0x71CD],
- ["C1C7",0x71CE],
- ["9FFA",0x71CF],
- ["9FFB",0x71D0],
- ["9FFC",0x71D1],
- ["9FFD",0x71D2],
- ["9FFE",0x71D3],
- ["ECDC",0x71D4],
- ["D1E0",0x71D5],
- ["A040",0x71D6],
- ["A041",0x71D7],
- ["A042",0x71D8],
- ["A043",0x71D9],
- ["A044",0x71DA],
- ["A045",0x71DB],
- ["A046",0x71DC],
- ["A047",0x71DD],
- ["A048",0x71DE],
- ["A049",0x71DF],
- ["ECDB",0x71E0],
- ["A04A",0x71E1],
- ["A04B",0x71E2],
- ["A04C",0x71E3],
- ["A04D",0x71E4],
- ["D4EF",0x71E5],
- ["A04E",0x71E6],
- ["ECDD",0x71E7],
- ["A04F",0x71E8],
- ["A050",0x71E9],
- ["A051",0x71EA],
- ["A052",0x71EB],
- ["A053",0x71EC],
- ["A054",0x71ED],
- ["DBC6",0x71EE],
- ["A055",0x71EF],
- ["A056",0x71F0],
- ["A057",0x71F1],
- ["A058",0x71F2],
- ["A059",0x71F3],
- ["A05A",0x71F4],
- ["A05B",0x71F5],
- ["A05C",0x71F6],
- ["A05D",0x71F7],
- ["A05E",0x71F8],
- ["ECDE",0x71F9],
- ["A05F",0x71FA],
- ["A060",0x71FB],
- ["A061",0x71FC],
- ["A062",0x71FD],
- ["A063",0x71FE],
- ["A064",0x71FF],
- ["A065",0x7200],
- ["A066",0x7201],
- ["A067",0x7202],
- ["A068",0x7203],
- ["A069",0x7204],
- ["A06A",0x7205],
- ["B1AC",0x7206],
- ["A06B",0x7207],
- ["A06C",0x7208],
- ["A06D",0x7209],
- ["A06E",0x720A],
- ["A06F",0x720B],
- ["A070",0x720C],
- ["A071",0x720D],
- ["A072",0x720E],
- ["A073",0x720F],
- ["A074",0x7210],
- ["A075",0x7211],
- ["A076",0x7212],
- ["A077",0x7213],
- ["A078",0x7214],
- ["A079",0x7215],
- ["A07A",0x7216],
- ["A07B",0x7217],
- ["A07C",0x7218],
- ["A07D",0x7219],
- ["A07E",0x721A],
- ["A080",0x721B],
- ["A081",0x721C],
- ["ECDF",0x721D],
- ["A082",0x721E],
- ["A083",0x721F],
- ["A084",0x7220],
- ["A085",0x7221],
- ["A086",0x7222],
- ["A087",0x7223],
- ["A088",0x7224],
- ["A089",0x7225],
- ["A08A",0x7226],
- ["A08B",0x7227],
- ["ECE0",0x7228],
- ["A08C",0x7229],
- ["D7A6",0x722A],
- ["A08D",0x722B],
- ["C5C0",0x722C],
- ["A08E",0x722D],
- ["A08F",0x722E],
- ["A090",0x722F],
- ["EBBC",0x7230],
- ["B0AE",0x7231],
- ["A091",0x7232],
- ["A092",0x7233],
- ["A093",0x7234],
- ["BEF4",0x7235],
- ["B8B8",0x7236],
- ["D2AF",0x7237],
- ["B0D6",0x7238],
- ["B5F9",0x7239],
- ["A094",0x723A],
- ["D8B3",0x723B],
- ["A095",0x723C],
- ["CBAC",0x723D],
- ["A096",0x723E],
- ["E3DD",0x723F],
- ["A097",0x7240],
- ["A098",0x7241],
- ["A099",0x7242],
- ["A09A",0x7243],
- ["A09B",0x7244],
- ["A09C",0x7245],
- ["A09D",0x7246],
- ["C6AC",0x7247],
- ["B0E6",0x7248],
- ["A09E",0x7249],
- ["A09F",0x724A],
- ["A0A0",0x724B],
- ["C5C6",0x724C],
- ["EBB9",0x724D],
- ["A0A1",0x724E],
- ["A0A2",0x724F],
- ["A0A3",0x7250],
- ["A0A4",0x7251],
- ["EBBA",0x7252],
- ["A0A5",0x7253],
- ["A0A6",0x7254],
- ["A0A7",0x7255],
- ["EBBB",0x7256],
- ["A0A8",0x7257],
- ["A0A9",0x7258],
- ["D1C0",0x7259],
- ["A0AA",0x725A],
- ["C5A3",0x725B],
- ["A0AB",0x725C],
- ["EAF2",0x725D],
- ["A0AC",0x725E],
- ["C4B2",0x725F],
- ["A0AD",0x7260],
- ["C4B5",0x7261],
- ["C0CE",0x7262],
- ["A0AE",0x7263],
- ["A0AF",0x7264],
- ["A0B0",0x7265],
- ["EAF3",0x7266],
- ["C4C1",0x7267],
- ["A0B1",0x7268],
- ["CEEF",0x7269],
- ["A0B2",0x726A],
- ["A0B3",0x726B],
- ["A0B4",0x726C],
- ["A0B5",0x726D],
- ["EAF0",0x726E],
- ["EAF4",0x726F],
- ["A0B6",0x7270],
- ["A0B7",0x7271],
- ["C9FC",0x7272],
- ["A0B8",0x7273],
- ["A0B9",0x7274],
- ["C7A3",0x7275],
- ["A0BA",0x7276],
- ["A0BB",0x7277],
- ["A0BC",0x7278],
- ["CCD8",0x7279],
- ["CEFE",0x727A],
- ["A0BD",0x727B],
- ["A0BE",0x727C],
- ["A0BF",0x727D],
- ["EAF5",0x727E],
- ["EAF6",0x727F],
- ["CFAC",0x7280],
- ["C0E7",0x7281],
- ["A0C0",0x7282],
- ["A0C1",0x7283],
- ["EAF7",0x7284],
- ["A0C2",0x7285],
- ["A0C3",0x7286],
- ["A0C4",0x7287],
- ["A0C5",0x7288],
- ["A0C6",0x7289],
- ["B6BF",0x728A],
- ["EAF8",0x728B],
- ["A0C7",0x728C],
- ["EAF9",0x728D],
- ["A0C8",0x728E],
- ["EAFA",0x728F],
- ["A0C9",0x7290],
- ["A0CA",0x7291],
- ["EAFB",0x7292],
- ["A0CB",0x7293],
- ["A0CC",0x7294],
- ["A0CD",0x7295],
- ["A0CE",0x7296],
- ["A0CF",0x7297],
- ["A0D0",0x7298],
- ["A0D1",0x7299],
- ["A0D2",0x729A],
- ["A0D3",0x729B],
- ["A0D4",0x729C],
- ["A0D5",0x729D],
- ["A0D6",0x729E],
- ["EAF1",0x729F],
- ["A0D7",0x72A0],
- ["A0D8",0x72A1],
- ["A0D9",0x72A2],
- ["A0DA",0x72A3],
- ["A0DB",0x72A4],
- ["A0DC",0x72A5],
- ["A0DD",0x72A6],
- ["A0DE",0x72A7],
- ["A0DF",0x72A8],
- ["A0E0",0x72A9],
- ["A0E1",0x72AA],
- ["A0E2",0x72AB],
- ["C8AE",0x72AC],
- ["E1EB",0x72AD],
- ["A0E3",0x72AE],
- ["B7B8",0x72AF],
- ["E1EC",0x72B0],
- ["A0E4",0x72B1],
- ["A0E5",0x72B2],
- ["A0E6",0x72B3],
- ["E1ED",0x72B4],
- ["A0E7",0x72B5],
- ["D7B4",0x72B6],
- ["E1EE",0x72B7],
- ["E1EF",0x72B8],
- ["D3CC",0x72B9],
- ["A0E8",0x72BA],
- ["A0E9",0x72BB],
- ["A0EA",0x72BC],
- ["A0EB",0x72BD],
- ["A0EC",0x72BE],
- ["A0ED",0x72BF],
- ["A0EE",0x72C0],
- ["E1F1",0x72C1],
- ["BFF1",0x72C2],
- ["E1F0",0x72C3],
- ["B5D2",0x72C4],
- ["A0EF",0x72C5],
- ["A0F0",0x72C6],
- ["A0F1",0x72C7],
- ["B1B7",0x72C8],
- ["A0F2",0x72C9],
- ["A0F3",0x72CA],
- ["A0F4",0x72CB],
- ["A0F5",0x72CC],
- ["E1F3",0x72CD],
- ["E1F2",0x72CE],
- ["A0F6",0x72CF],
- ["BAFC",0x72D0],
- ["A0F7",0x72D1],
- ["E1F4",0x72D2],
- ["A0F8",0x72D3],
- ["A0F9",0x72D4],
- ["A0FA",0x72D5],
- ["A0FB",0x72D6],
- ["B9B7",0x72D7],
- ["A0FC",0x72D8],
- ["BED1",0x72D9],
- ["A0FD",0x72DA],
- ["A0FE",0x72DB],
- ["AA40",0x72DC],
- ["AA41",0x72DD],
- ["C4FC",0x72DE],
- ["AA42",0x72DF],
- ["BADD",0x72E0],
- ["BDC6",0x72E1],
- ["AA43",0x72E2],
- ["AA44",0x72E3],
- ["AA45",0x72E4],
- ["AA46",0x72E5],
- ["AA47",0x72E6],
- ["AA48",0x72E7],
- ["E1F5",0x72E8],
- ["E1F7",0x72E9],
- ["AA49",0x72EA],
- ["AA4A",0x72EB],
- ["B6C0",0x72EC],
- ["CFC1",0x72ED],
- ["CAA8",0x72EE],
- ["E1F6",0x72EF],
- ["D5F8",0x72F0],
- ["D3FC",0x72F1],
- ["E1F8",0x72F2],
- ["E1FC",0x72F3],
- ["E1F9",0x72F4],
- ["AA4B",0x72F5],
- ["AA4C",0x72F6],
- ["E1FA",0x72F7],
- ["C0EA",0x72F8],
- ["AA4D",0x72F9],
- ["E1FE",0x72FA],
- ["E2A1",0x72FB],
- ["C0C7",0x72FC],
- ["AA4E",0x72FD],
- ["AA4F",0x72FE],
- ["AA50",0x72FF],
- ["AA51",0x7300],
- ["E1FB",0x7301],
- ["AA52",0x7302],
- ["E1FD",0x7303],
- ["AA53",0x7304],
- ["AA54",0x7305],
- ["AA55",0x7306],
- ["AA56",0x7307],
- ["AA57",0x7308],
- ["AA58",0x7309],
- ["E2A5",0x730A],
- ["AA59",0x730B],
- ["AA5A",0x730C],
- ["AA5B",0x730D],
- ["C1D4",0x730E],
- ["AA5C",0x730F],
- ["AA5D",0x7310],
- ["AA5E",0x7311],
- ["AA5F",0x7312],
- ["E2A3",0x7313],
- ["AA60",0x7314],
- ["E2A8",0x7315],
- ["B2FE",0x7316],
- ["E2A2",0x7317],
- ["AA61",0x7318],
- ["AA62",0x7319],
- ["AA63",0x731A],
- ["C3CD",0x731B],
- ["B2C2",0x731C],
- ["E2A7",0x731D],
- ["E2A6",0x731E],
- ["AA64",0x731F],
- ["AA65",0x7320],
- ["E2A4",0x7321],
- ["E2A9",0x7322],
- ["AA66",0x7323],
- ["AA67",0x7324],
- ["E2AB",0x7325],
- ["AA68",0x7326],
- ["AA69",0x7327],
- ["AA6A",0x7328],
- ["D0C9",0x7329],
- ["D6ED",0x732A],
- ["C3A8",0x732B],
- ["E2AC",0x732C],
- ["AA6B",0x732D],
- ["CFD7",0x732E],
- ["AA6C",0x732F],
- ["AA6D",0x7330],
- ["E2AE",0x7331],
- ["AA6E",0x7332],
- ["AA6F",0x7333],
- ["BAEF",0x7334],
- ["AA70",0x7335],
- ["AA71",0x7336],
- ["E9E0",0x7337],
- ["E2AD",0x7338],
- ["E2AA",0x7339],
- ["AA72",0x733A],
- ["AA73",0x733B],
- ["AA74",0x733C],
- ["AA75",0x733D],
- ["BBAB",0x733E],
- ["D4B3",0x733F],
- ["AA76",0x7340],
- ["AA77",0x7341],
- ["AA78",0x7342],
- ["AA79",0x7343],
- ["AA7A",0x7344],
- ["AA7B",0x7345],
- ["AA7C",0x7346],
- ["AA7D",0x7347],
- ["AA7E",0x7348],
- ["AA80",0x7349],
- ["AA81",0x734A],
- ["AA82",0x734B],
- ["AA83",0x734C],
- ["E2B0",0x734D],
- ["AA84",0x734E],
- ["AA85",0x734F],
- ["E2AF",0x7350],
- ["AA86",0x7351],
- ["E9E1",0x7352],
- ["AA87",0x7353],
- ["AA88",0x7354],
- ["AA89",0x7355],
- ["AA8A",0x7356],
- ["E2B1",0x7357],
- ["AA8B",0x7358],
- ["AA8C",0x7359],
- ["AA8D",0x735A],
- ["AA8E",0x735B],
- ["AA8F",0x735C],
- ["AA90",0x735D],
- ["AA91",0x735E],
- ["AA92",0x735F],
- ["E2B2",0x7360],
- ["AA93",0x7361],
- ["AA94",0x7362],
- ["AA95",0x7363],
- ["AA96",0x7364],
- ["AA97",0x7365],
- ["AA98",0x7366],
- ["AA99",0x7367],
- ["AA9A",0x7368],
- ["AA9B",0x7369],
- ["AA9C",0x736A],
- ["AA9D",0x736B],
- ["E2B3",0x736C],
- ["CCA1",0x736D],
- ["AA9E",0x736E],
- ["E2B4",0x736F],
- ["AA9F",0x7370],
- ["AAA0",0x7371],
- ["AB40",0x7372],
- ["AB41",0x7373],
- ["AB42",0x7374],
- ["AB43",0x7375],
- ["AB44",0x7376],
- ["AB45",0x7377],
- ["AB46",0x7378],
- ["AB47",0x7379],
- ["AB48",0x737A],
- ["AB49",0x737B],
- ["AB4A",0x737C],
- ["AB4B",0x737D],
- ["E2B5",0x737E],
- ["AB4C",0x737F],
- ["AB4D",0x7380],
- ["AB4E",0x7381],
- ["AB4F",0x7382],
- ["AB50",0x7383],
- ["D0FE",0x7384],
- ["AB51",0x7385],
- ["AB52",0x7386],
- ["C2CA",0x7387],
- ["AB53",0x7388],
- ["D3F1",0x7389],
- ["AB54",0x738A],
- ["CDF5",0x738B],
- ["AB55",0x738C],
- ["AB56",0x738D],
- ["E7E0",0x738E],
- ["AB57",0x738F],
- ["AB58",0x7390],
- ["E7E1",0x7391],
- ["AB59",0x7392],
- ["AB5A",0x7393],
- ["AB5B",0x7394],
- ["AB5C",0x7395],
- ["BEC1",0x7396],
- ["AB5D",0x7397],
- ["AB5E",0x7398],
- ["AB5F",0x7399],
- ["AB60",0x739A],
- ["C2EA",0x739B],
- ["AB61",0x739C],
- ["AB62",0x739D],
- ["AB63",0x739E],
- ["E7E4",0x739F],
- ["AB64",0x73A0],
- ["AB65",0x73A1],
- ["E7E3",0x73A2],
- ["AB66",0x73A3],
- ["AB67",0x73A4],
- ["AB68",0x73A5],
- ["AB69",0x73A6],
- ["AB6A",0x73A7],
- ["AB6B",0x73A8],
- ["CDE6",0x73A9],
- ["AB6C",0x73AA],
- ["C3B5",0x73AB],
- ["AB6D",0x73AC],
- ["AB6E",0x73AD],
- ["E7E2",0x73AE],
- ["BBB7",0x73AF],
- ["CFD6",0x73B0],
- ["AB6F",0x73B1],
- ["C1E1",0x73B2],
- ["E7E9",0x73B3],
- ["AB70",0x73B4],
- ["AB71",0x73B5],
- ["AB72",0x73B6],
- ["E7E8",0x73B7],
- ["AB73",0x73B8],
- ["AB74",0x73B9],
- ["E7F4",0x73BA],
- ["B2A3",0x73BB],
- ["AB75",0x73BC],
- ["AB76",0x73BD],
- ["AB77",0x73BE],
- ["AB78",0x73BF],
- ["E7EA",0x73C0],
- ["AB79",0x73C1],
- ["E7E6",0x73C2],
- ["AB7A",0x73C3],
- ["AB7B",0x73C4],
- ["AB7C",0x73C5],
- ["AB7D",0x73C6],
- ["AB7E",0x73C7],
- ["E7EC",0x73C8],
- ["E7EB",0x73C9],
- ["C9BA",0x73CA],
- ["AB80",0x73CB],
- ["AB81",0x73CC],
- ["D5E4",0x73CD],
- ["AB82",0x73CE],
- ["E7E5",0x73CF],
- ["B7A9",0x73D0],
- ["E7E7",0x73D1],
- ["AB83",0x73D2],
- ["AB84",0x73D3],
- ["AB85",0x73D4],
- ["AB86",0x73D5],
- ["AB87",0x73D6],
- ["AB88",0x73D7],
- ["AB89",0x73D8],
- ["E7EE",0x73D9],
- ["AB8A",0x73DA],
- ["AB8B",0x73DB],
- ["AB8C",0x73DC],
- ["AB8D",0x73DD],
- ["E7F3",0x73DE],
- ["AB8E",0x73DF],
- ["D6E9",0x73E0],
- ["AB8F",0x73E1],
- ["AB90",0x73E2],
- ["AB91",0x73E3],
- ["AB92",0x73E4],
- ["E7ED",0x73E5],
- ["AB93",0x73E6],
- ["E7F2",0x73E7],
- ["AB94",0x73E8],
- ["E7F1",0x73E9],
- ["AB95",0x73EA],
- ["AB96",0x73EB],
- ["AB97",0x73EC],
- ["B0E0",0x73ED],
- ["AB98",0x73EE],
- ["AB99",0x73EF],
- ["AB9A",0x73F0],
- ["AB9B",0x73F1],
- ["E7F5",0x73F2],
- ["AB9C",0x73F3],
- ["AB9D",0x73F4],
- ["AB9E",0x73F5],
- ["AB9F",0x73F6],
- ["ABA0",0x73F7],
- ["AC40",0x73F8],
- ["AC41",0x73F9],
- ["AC42",0x73FA],
- ["AC43",0x73FB],
- ["AC44",0x73FC],
- ["AC45",0x73FD],
- ["AC46",0x73FE],
- ["AC47",0x73FF],
- ["AC48",0x7400],
- ["AC49",0x7401],
- ["AC4A",0x7402],
- ["C7F2",0x7403],
- ["AC4B",0x7404],
- ["C0C5",0x7405],
- ["C0ED",0x7406],
- ["AC4C",0x7407],
- ["AC4D",0x7408],
- ["C1F0",0x7409],
- ["E7F0",0x740A],
- ["AC4E",0x740B],
- ["AC4F",0x740C],
- ["AC50",0x740D],
- ["AC51",0x740E],
- ["E7F6",0x740F],
- ["CBF6",0x7410],
- ["AC52",0x7411],
- ["AC53",0x7412],
- ["AC54",0x7413],
- ["AC55",0x7414],
- ["AC56",0x7415],
- ["AC57",0x7416],
- ["AC58",0x7417],
- ["AC59",0x7418],
- ["AC5A",0x7419],
- ["E8A2",0x741A],
- ["E8A1",0x741B],
- ["AC5B",0x741C],
- ["AC5C",0x741D],
- ["AC5D",0x741E],
- ["AC5E",0x741F],
- ["AC5F",0x7420],
- ["AC60",0x7421],
- ["D7C1",0x7422],
- ["AC61",0x7423],
- ["AC62",0x7424],
- ["E7FA",0x7425],
- ["E7F9",0x7426],
- ["AC63",0x7427],
- ["E7FB",0x7428],
- ["AC64",0x7429],
- ["E7F7",0x742A],
- ["AC65",0x742B],
- ["E7FE",0x742C],
- ["AC66",0x742D],
- ["E7FD",0x742E],
- ["AC67",0x742F],
- ["E7FC",0x7430],
- ["AC68",0x7431],
- ["AC69",0x7432],
- ["C1D5",0x7433],
- ["C7D9",0x7434],
- ["C5FD",0x7435],
- ["C5C3",0x7436],
- ["AC6A",0x7437],
- ["AC6B",0x7438],
- ["AC6C",0x7439],
- ["AC6D",0x743A],
- ["AC6E",0x743B],
- ["C7ED",0x743C],
- ["AC6F",0x743D],
- ["AC70",0x743E],
- ["AC71",0x743F],
- ["AC72",0x7440],
- ["E8A3",0x7441],
- ["AC73",0x7442],
- ["AC74",0x7443],
- ["AC75",0x7444],
- ["AC76",0x7445],
- ["AC77",0x7446],
- ["AC78",0x7447],
- ["AC79",0x7448],
- ["AC7A",0x7449],
- ["AC7B",0x744A],
- ["AC7C",0x744B],
- ["AC7D",0x744C],
- ["AC7E",0x744D],
- ["AC80",0x744E],
- ["AC81",0x744F],
- ["AC82",0x7450],
- ["AC83",0x7451],
- ["AC84",0x7452],
- ["AC85",0x7453],
- ["AC86",0x7454],
- ["E8A6",0x7455],
- ["AC87",0x7456],
- ["E8A5",0x7457],
- ["AC88",0x7458],
- ["E8A7",0x7459],
- ["BAF7",0x745A],
- ["E7F8",0x745B],
- ["E8A4",0x745C],
- ["AC89",0x745D],
- ["C8F0",0x745E],
- ["C9AA",0x745F],
- ["AC8A",0x7460],
- ["AC8B",0x7461],
- ["AC8C",0x7462],
- ["AC8D",0x7463],
- ["AC8E",0x7464],
- ["AC8F",0x7465],
- ["AC90",0x7466],
- ["AC91",0x7467],
- ["AC92",0x7468],
- ["AC93",0x7469],
- ["AC94",0x746A],
- ["AC95",0x746B],
- ["AC96",0x746C],
- ["E8A9",0x746D],
- ["AC97",0x746E],
- ["AC98",0x746F],
- ["B9E5",0x7470],
- ["AC99",0x7471],
- ["AC9A",0x7472],
- ["AC9B",0x7473],
- ["AC9C",0x7474],
- ["AC9D",0x7475],
- ["D1FE",0x7476],
- ["E8A8",0x7477],
- ["AC9E",0x7478],
- ["AC9F",0x7479],
- ["ACA0",0x747A],
- ["AD40",0x747B],
- ["AD41",0x747C],
- ["AD42",0x747D],
- ["E8AA",0x747E],
- ["AD43",0x747F],
- ["E8AD",0x7480],
- ["E8AE",0x7481],
- ["AD44",0x7482],
- ["C1A7",0x7483],
- ["AD45",0x7484],
- ["AD46",0x7485],
- ["AD47",0x7486],
- ["E8AF",0x7487],
- ["AD48",0x7488],
- ["AD49",0x7489],
- ["AD4A",0x748A],
- ["E8B0",0x748B],
- ["AD4B",0x748C],
- ["AD4C",0x748D],
- ["E8AC",0x748E],
- ["AD4D",0x748F],
- ["E8B4",0x7490],
- ["AD4E",0x7491],
- ["AD4F",0x7492],
- ["AD50",0x7493],
- ["AD51",0x7494],
- ["AD52",0x7495],
- ["AD53",0x7496],
- ["AD54",0x7497],
- ["AD55",0x7498],
- ["AD56",0x7499],
- ["AD57",0x749A],
- ["AD58",0x749B],
- ["E8AB",0x749C],
- ["AD59",0x749D],
- ["E8B1",0x749E],
- ["AD5A",0x749F],
- ["AD5B",0x74A0],
- ["AD5C",0x74A1],
- ["AD5D",0x74A2],
- ["AD5E",0x74A3],
- ["AD5F",0x74A4],
- ["AD60",0x74A5],
- ["AD61",0x74A6],
- ["E8B5",0x74A7],
- ["E8B2",0x74A8],
- ["E8B3",0x74A9],
- ["AD62",0x74AA],
- ["AD63",0x74AB],
- ["AD64",0x74AC],
- ["AD65",0x74AD],
- ["AD66",0x74AE],
- ["AD67",0x74AF],
- ["AD68",0x74B0],
- ["AD69",0x74B1],
- ["AD6A",0x74B2],
- ["AD6B",0x74B3],
- ["AD6C",0x74B4],
- ["AD6D",0x74B5],
- ["AD6E",0x74B6],
- ["AD6F",0x74B7],
- ["AD70",0x74B8],
- ["AD71",0x74B9],
- ["E8B7",0x74BA],
- ["AD72",0x74BB],
- ["AD73",0x74BC],
- ["AD74",0x74BD],
- ["AD75",0x74BE],
- ["AD76",0x74BF],
- ["AD77",0x74C0],
- ["AD78",0x74C1],
- ["AD79",0x74C2],
- ["AD7A",0x74C3],
- ["AD7B",0x74C4],
- ["AD7C",0x74C5],
- ["AD7D",0x74C6],
- ["AD7E",0x74C7],
- ["AD80",0x74C8],
- ["AD81",0x74C9],
- ["AD82",0x74CA],
- ["AD83",0x74CB],
- ["AD84",0x74CC],
- ["AD85",0x74CD],
- ["AD86",0x74CE],
- ["AD87",0x74CF],
- ["AD88",0x74D0],
- ["AD89",0x74D1],
- ["E8B6",0x74D2],
- ["AD8A",0x74D3],
- ["AD8B",0x74D4],
- ["AD8C",0x74D5],
- ["AD8D",0x74D6],
- ["AD8E",0x74D7],
- ["AD8F",0x74D8],
- ["AD90",0x74D9],
- ["AD91",0x74DA],
- ["AD92",0x74DB],
- ["B9CF",0x74DC],
- ["AD93",0x74DD],
- ["F0AC",0x74DE],
- ["AD94",0x74DF],
- ["F0AD",0x74E0],
- ["AD95",0x74E1],
- ["C6B0",0x74E2],
- ["B0EA",0x74E3],
- ["C8BF",0x74E4],
- ["AD96",0x74E5],
- ["CDDF",0x74E6],
- ["AD97",0x74E7],
- ["AD98",0x74E8],
- ["AD99",0x74E9],
- ["AD9A",0x74EA],
- ["AD9B",0x74EB],
- ["AD9C",0x74EC],
- ["AD9D",0x74ED],
- ["CECD",0x74EE],
- ["EAB1",0x74EF],
- ["AD9E",0x74F0],
- ["AD9F",0x74F1],
- ["ADA0",0x74F2],
- ["AE40",0x74F3],
- ["EAB2",0x74F4],
- ["AE41",0x74F5],
- ["C6BF",0x74F6],
- ["B4C9",0x74F7],
- ["AE42",0x74F8],
- ["AE43",0x74F9],
- ["AE44",0x74FA],
- ["AE45",0x74FB],
- ["AE46",0x74FC],
- ["AE47",0x74FD],
- ["AE48",0x74FE],
- ["EAB3",0x74FF],
- ["AE49",0x7500],
- ["AE4A",0x7501],
- ["AE4B",0x7502],
- ["AE4C",0x7503],
- ["D5E7",0x7504],
- ["AE4D",0x7505],
- ["AE4E",0x7506],
- ["AE4F",0x7507],
- ["AE50",0x7508],
- ["AE51",0x7509],
- ["AE52",0x750A],
- ["AE53",0x750B],
- ["AE54",0x750C],
- ["DDF9",0x750D],
- ["AE55",0x750E],
- ["EAB4",0x750F],
- ["AE56",0x7510],
- ["EAB5",0x7511],
- ["AE57",0x7512],
- ["EAB6",0x7513],
- ["AE58",0x7514],
- ["AE59",0x7515],
- ["AE5A",0x7516],
- ["AE5B",0x7517],
- ["B8CA",0x7518],
- ["DFB0",0x7519],
- ["C9F5",0x751A],
- ["AE5C",0x751B],
- ["CCF0",0x751C],
- ["AE5D",0x751D],
- ["AE5E",0x751E],
- ["C9FA",0x751F],
- ["AE5F",0x7520],
- ["AE60",0x7521],
- ["AE61",0x7522],
- ["AE62",0x7523],
- ["AE63",0x7524],
- ["C9FB",0x7525],
- ["AE64",0x7526],
- ["AE65",0x7527],
- ["D3C3",0x7528],
- ["CBA6",0x7529],
- ["AE66",0x752A],
- ["B8A6",0x752B],
- ["F0AE",0x752C],
- ["B1C2",0x752D],
- ["AE67",0x752E],
- ["E5B8",0x752F],
- ["CCEF",0x7530],
- ["D3C9",0x7531],
- ["BCD7",0x7532],
- ["C9EA",0x7533],
- ["AE68",0x7534],
- ["B5E7",0x7535],
- ["AE69",0x7536],
- ["C4D0",0x7537],
- ["B5E9",0x7538],
- ["AE6A",0x7539],
- ["EEAE",0x753A],
- ["BBAD",0x753B],
- ["AE6B",0x753C],
- ["AE6C",0x753D],
- ["E7DE",0x753E],
- ["AE6D",0x753F],
- ["EEAF",0x7540],
- ["AE6E",0x7541],
- ["AE6F",0x7542],
- ["AE70",0x7543],
- ["AE71",0x7544],
- ["B3A9",0x7545],
- ["AE72",0x7546],
- ["AE73",0x7547],
- ["EEB2",0x7548],
- ["AE74",0x7549],
- ["AE75",0x754A],
- ["EEB1",0x754B],
- ["BDE7",0x754C],
- ["AE76",0x754D],
- ["EEB0",0x754E],
- ["CEB7",0x754F],
- ["AE77",0x7550],
- ["AE78",0x7551],
- ["AE79",0x7552],
- ["AE7A",0x7553],
- ["C5CF",0x7554],
- ["AE7B",0x7555],
- ["AE7C",0x7556],
- ["AE7D",0x7557],
- ["AE7E",0x7558],
- ["C1F4",0x7559],
- ["DBCE",0x755A],
- ["EEB3",0x755B],
- ["D0F3",0x755C],
- ["AE80",0x755D],
- ["AE81",0x755E],
- ["AE82",0x755F],
- ["AE83",0x7560],
- ["AE84",0x7561],
- ["AE85",0x7562],
- ["AE86",0x7563],
- ["AE87",0x7564],
- ["C2D4",0x7565],
- ["C6E8",0x7566],
- ["AE88",0x7567],
- ["AE89",0x7568],
- ["AE8A",0x7569],
- ["B7AC",0x756A],
- ["AE8B",0x756B],
- ["AE8C",0x756C],
- ["AE8D",0x756D],
- ["AE8E",0x756E],
- ["AE8F",0x756F],
- ["AE90",0x7570],
- ["AE91",0x7571],
- ["EEB4",0x7572],
- ["AE92",0x7573],
- ["B3EB",0x7574],
- ["AE93",0x7575],
- ["AE94",0x7576],
- ["AE95",0x7577],
- ["BBFB",0x7578],
- ["EEB5",0x7579],
- ["AE96",0x757A],
- ["AE97",0x757B],
- ["AE98",0x757C],
- ["AE99",0x757D],
- ["AE9A",0x757E],
- ["E7DC",0x757F],
- ["AE9B",0x7580],
- ["AE9C",0x7581],
- ["AE9D",0x7582],
- ["EEB6",0x7583],
- ["AE9E",0x7584],
- ["AE9F",0x7585],
- ["BDAE",0x7586],
- ["AEA0",0x7587],
- ["AF40",0x7588],
- ["AF41",0x7589],
- ["AF42",0x758A],
- ["F1E2",0x758B],
- ["AF43",0x758C],
- ["AF44",0x758D],
- ["AF45",0x758E],
- ["CAE8",0x758F],
- ["AF46",0x7590],
- ["D2C9",0x7591],
- ["F0DA",0x7592],
- ["AF47",0x7593],
- ["F0DB",0x7594],
- ["AF48",0x7595],
- ["F0DC",0x7596],
- ["C1C6",0x7597],
- ["AF49",0x7598],
- ["B8ED",0x7599],
- ["BECE",0x759A],
- ["AF4A",0x759B],
- ["AF4B",0x759C],
- ["F0DE",0x759D],
- ["AF4C",0x759E],
- ["C5B1",0x759F],
- ["F0DD",0x75A0],
- ["D1F1",0x75A1],
- ["AF4D",0x75A2],
- ["F0E0",0x75A3],
- ["B0CC",0x75A4],
- ["BDEA",0x75A5],
- ["AF4E",0x75A6],
- ["AF4F",0x75A7],
- ["AF50",0x75A8],
- ["AF51",0x75A9],
- ["AF52",0x75AA],
- ["D2DF",0x75AB],
- ["F0DF",0x75AC],
- ["AF53",0x75AD],
- ["B4AF",0x75AE],
- ["B7E8",0x75AF],
- ["F0E6",0x75B0],
- ["F0E5",0x75B1],
- ["C6A3",0x75B2],
- ["F0E1",0x75B3],
- ["F0E2",0x75B4],
- ["B4C3",0x75B5],
- ["AF54",0x75B6],
- ["AF55",0x75B7],
- ["F0E3",0x75B8],
- ["D5EE",0x75B9],
- ["AF56",0x75BA],
- ["AF57",0x75BB],
- ["CCDB",0x75BC],
- ["BED2",0x75BD],
- ["BCB2",0x75BE],
- ["AF58",0x75BF],
- ["AF59",0x75C0],
- ["AF5A",0x75C1],
- ["F0E8",0x75C2],
- ["F0E7",0x75C3],
- ["F0E4",0x75C4],
- ["B2A1",0x75C5],
- ["AF5B",0x75C6],
- ["D6A2",0x75C7],
- ["D3B8",0x75C8],
- ["BEB7",0x75C9],
- ["C8AC",0x75CA],
- ["AF5C",0x75CB],
- ["AF5D",0x75CC],
- ["F0EA",0x75CD],
- ["AF5E",0x75CE],
- ["AF5F",0x75CF],
- ["AF60",0x75D0],
- ["AF61",0x75D1],
- ["D1F7",0x75D2],
- ["AF62",0x75D3],
- ["D6CC",0x75D4],
- ["BADB",0x75D5],
- ["F0E9",0x75D6],
- ["AF63",0x75D7],
- ["B6BB",0x75D8],
- ["AF64",0x75D9],
- ["AF65",0x75DA],
- ["CDB4",0x75DB],
- ["AF66",0x75DC],
- ["AF67",0x75DD],
- ["C6A6",0x75DE],
- ["AF68",0x75DF],
- ["AF69",0x75E0],
- ["AF6A",0x75E1],
- ["C1A1",0x75E2],
- ["F0EB",0x75E3],
- ["F0EE",0x75E4],
- ["AF6B",0x75E5],
- ["F0ED",0x75E6],
- ["F0F0",0x75E7],
- ["F0EC",0x75E8],
- ["AF6C",0x75E9],
- ["BBBE",0x75EA],
- ["F0EF",0x75EB],
- ["AF6D",0x75EC],
- ["AF6E",0x75ED],
- ["AF6F",0x75EE],
- ["AF70",0x75EF],
- ["CCB5",0x75F0],
- ["F0F2",0x75F1],
- ["AF71",0x75F2],
- ["AF72",0x75F3],
- ["B3D5",0x75F4],
- ["AF73",0x75F5],
- ["AF74",0x75F6],
- ["AF75",0x75F7],
- ["AF76",0x75F8],
- ["B1D4",0x75F9],
- ["AF77",0x75FA],
- ["AF78",0x75FB],
- ["F0F3",0x75FC],
- ["AF79",0x75FD],
- ["AF7A",0x75FE],
- ["F0F4",0x75FF],
- ["F0F6",0x7600],
- ["B4E1",0x7601],
- ["AF7B",0x7602],
- ["F0F1",0x7603],
- ["AF7C",0x7604],
- ["F0F7",0x7605],
- ["AF7D",0x7606],
- ["AF7E",0x7607],
- ["AF80",0x7608],
- ["AF81",0x7609],
- ["F0FA",0x760A],
- ["AF82",0x760B],
- ["F0F8",0x760C],
- ["AF83",0x760D],
- ["AF84",0x760E],
- ["AF85",0x760F],
- ["F0F5",0x7610],
- ["AF86",0x7611],
- ["AF87",0x7612],
- ["AF88",0x7613],
- ["AF89",0x7614],
- ["F0FD",0x7615],
- ["AF8A",0x7616],
- ["F0F9",0x7617],
- ["F0FC",0x7618],
- ["F0FE",0x7619],
- ["AF8B",0x761A],
- ["F1A1",0x761B],
- ["AF8C",0x761C],
- ["AF8D",0x761D],
- ["AF8E",0x761E],
- ["CEC1",0x761F],
- ["F1A4",0x7620],
- ["AF8F",0x7621],
- ["F1A3",0x7622],
- ["AF90",0x7623],
- ["C1F6",0x7624],
- ["F0FB",0x7625],
- ["CADD",0x7626],
- ["AF91",0x7627],
- ["AF92",0x7628],
- ["B4F1",0x7629],
- ["B1F1",0x762A],
- ["CCB1",0x762B],
- ["AF93",0x762C],
- ["F1A6",0x762D],
- ["AF94",0x762E],
- ["AF95",0x762F],
- ["F1A7",0x7630],
- ["AF96",0x7631],
- ["AF97",0x7632],
- ["F1AC",0x7633],
- ["D5CE",0x7634],
- ["F1A9",0x7635],
- ["AF98",0x7636],
- ["AF99",0x7637],
- ["C8B3",0x7638],
- ["AF9A",0x7639],
- ["AF9B",0x763A],
- ["AF9C",0x763B],
- ["F1A2",0x763C],
- ["AF9D",0x763D],
- ["F1AB",0x763E],
- ["F1A8",0x763F],
- ["F1A5",0x7640],
- ["AF9E",0x7641],
- ["AF9F",0x7642],
- ["F1AA",0x7643],
- ["AFA0",0x7644],
- ["B040",0x7645],
- ["B041",0x7646],
- ["B042",0x7647],
- ["B043",0x7648],
- ["B044",0x7649],
- ["B045",0x764A],
- ["B046",0x764B],
- ["B0A9",0x764C],
- ["F1AD",0x764D],
- ["B047",0x764E],
- ["B048",0x764F],
- ["B049",0x7650],
- ["B04A",0x7651],
- ["B04B",0x7652],
- ["B04C",0x7653],
- ["F1AF",0x7654],
- ["B04D",0x7655],
- ["F1B1",0x7656],
- ["B04E",0x7657],
- ["B04F",0x7658],
- ["B050",0x7659],
- ["B051",0x765A],
- ["B052",0x765B],
- ["F1B0",0x765C],
- ["B053",0x765D],
- ["F1AE",0x765E],
- ["B054",0x765F],
- ["B055",0x7660],
- ["B056",0x7661],
- ["B057",0x7662],
- ["D1A2",0x7663],
- ["B058",0x7664],
- ["B059",0x7665],
- ["B05A",0x7666],
- ["B05B",0x7667],
- ["B05C",0x7668],
- ["B05D",0x7669],
- ["B05E",0x766A],
- ["F1B2",0x766B],
- ["B05F",0x766C],
- ["B060",0x766D],
- ["B061",0x766E],
- ["F1B3",0x766F],
- ["B062",0x7670],
- ["B063",0x7671],
- ["B064",0x7672],
- ["B065",0x7673],
- ["B066",0x7674],
- ["B067",0x7675],
- ["B068",0x7676],
- ["B069",0x7677],
- ["B9EF",0x7678],
- ["B06A",0x7679],
- ["B06B",0x767A],
- ["B5C7",0x767B],
- ["B06C",0x767C],
- ["B0D7",0x767D],
- ["B0D9",0x767E],
- ["B06D",0x767F],
- ["B06E",0x7680],
- ["B06F",0x7681],
- ["D4ED",0x7682],
- ["B070",0x7683],
- ["B5C4",0x7684],
- ["B071",0x7685],
- ["BDD4",0x7686],
- ["BBCA",0x7687],
- ["F0A7",0x7688],
- ["B072",0x7689],
- ["B073",0x768A],
- ["B8DE",0x768B],
- ["B074",0x768C],
- ["B075",0x768D],
- ["F0A8",0x768E],
- ["B076",0x768F],
- ["B077",0x7690],
- ["B0A8",0x7691],
- ["B078",0x7692],
- ["F0A9",0x7693],
- ["B079",0x7694],
- ["B07A",0x7695],
- ["CDEE",0x7696],
- ["B07B",0x7697],
- ["B07C",0x7698],
- ["F0AA",0x7699],
- ["B07D",0x769A],
- ["B07E",0x769B],
- ["B080",0x769C],
- ["B081",0x769D],
- ["B082",0x769E],
- ["B083",0x769F],
- ["B084",0x76A0],
- ["B085",0x76A1],
- ["B086",0x76A2],
- ["B087",0x76A3],
- ["F0AB",0x76A4],
- ["B088",0x76A5],
- ["B089",0x76A6],
- ["B08A",0x76A7],
- ["B08B",0x76A8],
- ["B08C",0x76A9],
- ["B08D",0x76AA],
- ["B08E",0x76AB],
- ["B08F",0x76AC],
- ["B090",0x76AD],
- ["C6A4",0x76AE],
- ["B091",0x76AF],
- ["B092",0x76B0],
- ["D6E5",0x76B1],
- ["F1E4",0x76B2],
- ["B093",0x76B3],
- ["F1E5",0x76B4],
- ["B094",0x76B5],
- ["B095",0x76B6],
- ["B096",0x76B7],
- ["B097",0x76B8],
- ["B098",0x76B9],
- ["B099",0x76BA],
- ["B09A",0x76BB],
- ["B09B",0x76BC],
- ["B09C",0x76BD],
- ["B09D",0x76BE],
- ["C3F3",0x76BF],
- ["B09E",0x76C0],
- ["B09F",0x76C1],
- ["D3DB",0x76C2],
- ["B0A0",0x76C3],
- ["B140",0x76C4],
- ["D6D1",0x76C5],
- ["C5E8",0x76C6],
- ["B141",0x76C7],
- ["D3AF",0x76C8],
- ["B142",0x76C9],
- ["D2E6",0x76CA],
- ["B143",0x76CB],
- ["B144",0x76CC],
- ["EEC1",0x76CD],
- ["B0BB",0x76CE],
- ["D5B5",0x76CF],
- ["D1CE",0x76D0],
- ["BCE0",0x76D1],
- ["BAD0",0x76D2],
- ["B145",0x76D3],
- ["BFF8",0x76D4],
- ["B146",0x76D5],
- ["B8C7",0x76D6],
- ["B5C1",0x76D7],
- ["C5CC",0x76D8],
- ["B147",0x76D9],
- ["B148",0x76DA],
- ["CAA2",0x76DB],
- ["B149",0x76DC],
- ["B14A",0x76DD],
- ["B14B",0x76DE],
- ["C3CB",0x76DF],
- ["B14C",0x76E0],
- ["B14D",0x76E1],
- ["B14E",0x76E2],
- ["B14F",0x76E3],
- ["B150",0x76E4],
- ["EEC2",0x76E5],
- ["B151",0x76E6],
- ["B152",0x76E7],
- ["B153",0x76E8],
- ["B154",0x76E9],
- ["B155",0x76EA],
- ["B156",0x76EB],
- ["B157",0x76EC],
- ["B158",0x76ED],
- ["C4BF",0x76EE],
- ["B6A2",0x76EF],
- ["B159",0x76F0],
- ["EDEC",0x76F1],
- ["C3A4",0x76F2],
- ["B15A",0x76F3],
- ["D6B1",0x76F4],
- ["B15B",0x76F5],
- ["B15C",0x76F6],
- ["B15D",0x76F7],
- ["CFE0",0x76F8],
- ["EDEF",0x76F9],
- ["B15E",0x76FA],
- ["B15F",0x76FB],
- ["C5CE",0x76FC],
- ["B160",0x76FD],
- ["B6DC",0x76FE],
- ["B161",0x76FF],
- ["B162",0x7700],
- ["CAA1",0x7701],
- ["B163",0x7702],
- ["B164",0x7703],
- ["EDED",0x7704],
- ["B165",0x7705],
- ["B166",0x7706],
- ["EDF0",0x7707],
- ["EDF1",0x7708],
- ["C3BC",0x7709],
- ["B167",0x770A],
- ["BFB4",0x770B],
- ["B168",0x770C],
- ["EDEE",0x770D],
- ["B169",0x770E],
- ["B16A",0x770F],
- ["B16B",0x7710],
- ["B16C",0x7711],
- ["B16D",0x7712],
- ["B16E",0x7713],
- ["B16F",0x7714],
- ["B170",0x7715],
- ["B171",0x7716],
- ["B172",0x7717],
- ["B173",0x7718],
- ["EDF4",0x7719],
- ["EDF2",0x771A],
- ["B174",0x771B],
- ["B175",0x771C],
- ["B176",0x771D],
- ["B177",0x771E],
- ["D5E6",0x771F],
- ["C3DF",0x7720],
- ["B178",0x7721],
- ["EDF3",0x7722],
- ["B179",0x7723],
- ["B17A",0x7724],
- ["B17B",0x7725],
- ["EDF6",0x7726],
- ["B17C",0x7727],
- ["D5A3",0x7728],
- ["D1A3",0x7729],
- ["B17D",0x772A],
- ["B17E",0x772B],
- ["B180",0x772C],
- ["EDF5",0x772D],
- ["B181",0x772E],
- ["C3D0",0x772F],
- ["B182",0x7730],
- ["B183",0x7731],
- ["B184",0x7732],
- ["B185",0x7733],
- ["B186",0x7734],
- ["EDF7",0x7735],
- ["BFF4",0x7736],
- ["BEEC",0x7737],
- ["EDF8",0x7738],
- ["B187",0x7739],
- ["CCF7",0x773A],
- ["B188",0x773B],
- ["D1DB",0x773C],
- ["B189",0x773D],
- ["B18A",0x773E],
- ["B18B",0x773F],
- ["D7C5",0x7740],
- ["D5F6",0x7741],
- ["B18C",0x7742],
- ["EDFC",0x7743],
- ["B18D",0x7744],
- ["B18E",0x7745],
- ["B18F",0x7746],
- ["EDFB",0x7747],
- ["B190",0x7748],
- ["B191",0x7749],
- ["B192",0x774A],
- ["B193",0x774B],
- ["B194",0x774C],
- ["B195",0x774D],
- ["B196",0x774E],
- ["B197",0x774F],
- ["EDF9",0x7750],
- ["EDFA",0x7751],
- ["B198",0x7752],
- ["B199",0x7753],
- ["B19A",0x7754],
- ["B19B",0x7755],
- ["B19C",0x7756],
- ["B19D",0x7757],
- ["B19E",0x7758],
- ["B19F",0x7759],
- ["EDFD",0x775A],
- ["BEA6",0x775B],
- ["B1A0",0x775C],
- ["B240",0x775D],
- ["B241",0x775E],
- ["B242",0x775F],
- ["B243",0x7760],
- ["CBAF",0x7761],
- ["EEA1",0x7762],
- ["B6BD",0x7763],
- ["B244",0x7764],
- ["EEA2",0x7765],
- ["C4C0",0x7766],
- ["B245",0x7767],
- ["EDFE",0x7768],
- ["B246",0x7769],
- ["B247",0x776A],
- ["BDDE",0x776B],
- ["B2C7",0x776C],
- ["B248",0x776D],
- ["B249",0x776E],
- ["B24A",0x776F],
- ["B24B",0x7770],
- ["B24C",0x7771],
- ["B24D",0x7772],
- ["B24E",0x7773],
- ["B24F",0x7774],
- ["B250",0x7775],
- ["B251",0x7776],
- ["B252",0x7777],
- ["B253",0x7778],
- ["B6C3",0x7779],
- ["B254",0x777A],
- ["B255",0x777B],
- ["B256",0x777C],
- ["EEA5",0x777D],
- ["D8BA",0x777E],
- ["EEA3",0x777F],
- ["EEA6",0x7780],
- ["B257",0x7781],
- ["B258",0x7782],
- ["B259",0x7783],
- ["C3E9",0x7784],
- ["B3F2",0x7785],
- ["B25A",0x7786],
- ["B25B",0x7787],
- ["B25C",0x7788],
- ["B25D",0x7789],
- ["B25E",0x778A],
- ["B25F",0x778B],
- ["EEA7",0x778C],
- ["EEA4",0x778D],
- ["CFB9",0x778E],
- ["B260",0x778F],
- ["B261",0x7790],
- ["EEA8",0x7791],
- ["C2F7",0x7792],
- ["B262",0x7793],
- ["B263",0x7794],
- ["B264",0x7795],
- ["B265",0x7796],
- ["B266",0x7797],
- ["B267",0x7798],
- ["B268",0x7799],
- ["B269",0x779A],
- ["B26A",0x779B],
- ["B26B",0x779C],
- ["B26C",0x779D],
- ["B26D",0x779E],
- ["EEA9",0x779F],
- ["EEAA",0x77A0],
- ["B26E",0x77A1],
- ["DEAB",0x77A2],
- ["B26F",0x77A3],
- ["B270",0x77A4],
- ["C6B3",0x77A5],
- ["B271",0x77A6],
- ["C7C6",0x77A7],
- ["B272",0x77A8],
- ["D6F5",0x77A9],
- ["B5C9",0x77AA],
- ["B273",0x77AB],
- ["CBB2",0x77AC],
- ["B274",0x77AD],
- ["B275",0x77AE],
- ["B276",0x77AF],
- ["EEAB",0x77B0],
- ["B277",0x77B1],
- ["B278",0x77B2],
- ["CDAB",0x77B3],
- ["B279",0x77B4],
- ["EEAC",0x77B5],
- ["B27A",0x77B6],
- ["B27B",0x77B7],
- ["B27C",0x77B8],
- ["B27D",0x77B9],
- ["B27E",0x77BA],
- ["D5B0",0x77BB],
- ["B280",0x77BC],
- ["EEAD",0x77BD],
- ["B281",0x77BE],
- ["F6C4",0x77BF],
- ["B282",0x77C0],
- ["B283",0x77C1],
- ["B284",0x77C2],
- ["B285",0x77C3],
- ["B286",0x77C4],
- ["B287",0x77C5],
- ["B288",0x77C6],
- ["B289",0x77C7],
- ["B28A",0x77C8],
- ["B28B",0x77C9],
- ["B28C",0x77CA],
- ["B28D",0x77CB],
- ["B28E",0x77CC],
- ["DBC7",0x77CD],
- ["B28F",0x77CE],
- ["B290",0x77CF],
- ["B291",0x77D0],
- ["B292",0x77D1],
- ["B293",0x77D2],
- ["B294",0x77D3],
- ["B295",0x77D4],
- ["B296",0x77D5],
- ["B297",0x77D6],
- ["B4A3",0x77D7],
- ["B298",0x77D8],
- ["B299",0x77D9],
- ["B29A",0x77DA],
- ["C3AC",0x77DB],
- ["F1E6",0x77DC],
- ["B29B",0x77DD],
- ["B29C",0x77DE],
- ["B29D",0x77DF],
- ["B29E",0x77E0],
- ["B29F",0x77E1],
- ["CAB8",0x77E2],
- ["D2D3",0x77E3],
- ["B2A0",0x77E4],
- ["D6AA",0x77E5],
- ["B340",0x77E6],
- ["EFF2",0x77E7],
- ["B341",0x77E8],
- ["BED8",0x77E9],
- ["B342",0x77EA],
- ["BDC3",0x77EB],
- ["EFF3",0x77EC],
- ["B6CC",0x77ED],
- ["B0AB",0x77EE],
- ["B343",0x77EF],
- ["B344",0x77F0],
- ["B345",0x77F1],
- ["B346",0x77F2],
- ["CAAF",0x77F3],
- ["B347",0x77F4],
- ["B348",0x77F5],
- ["EDB6",0x77F6],
- ["B349",0x77F7],
- ["EDB7",0x77F8],
- ["B34A",0x77F9],
- ["B34B",0x77FA],
- ["B34C",0x77FB],
- ["B34D",0x77FC],
- ["CEF9",0x77FD],
- ["B7AF",0x77FE],
- ["BFF3",0x77FF],
- ["EDB8",0x7800],
- ["C2EB",0x7801],
- ["C9B0",0x7802],
- ["B34E",0x7803],
- ["B34F",0x7804],
- ["B350",0x7805],
- ["B351",0x7806],
- ["B352",0x7807],
- ["B353",0x7808],
- ["EDB9",0x7809],
- ["B354",0x780A],
- ["B355",0x780B],
- ["C6F6",0x780C],
- ["BFB3",0x780D],
- ["B356",0x780E],
- ["B357",0x780F],
- ["B358",0x7810],
- ["EDBC",0x7811],
- ["C5F8",0x7812],
- ["B359",0x7813],
- ["D1D0",0x7814],
- ["B35A",0x7815],
- ["D7A9",0x7816],
- ["EDBA",0x7817],
- ["EDBB",0x7818],
- ["B35B",0x7819],
- ["D1E2",0x781A],
- ["B35C",0x781B],
- ["EDBF",0x781C],
- ["EDC0",0x781D],
- ["B35D",0x781E],
- ["EDC4",0x781F],
- ["B35E",0x7820],
- ["B35F",0x7821],
- ["B360",0x7822],
- ["EDC8",0x7823],
- ["B361",0x7824],
- ["EDC6",0x7825],
- ["EDCE",0x7826],
- ["D5E8",0x7827],
- ["B362",0x7828],
- ["EDC9",0x7829],
- ["B363",0x782A],
- ["B364",0x782B],
- ["EDC7",0x782C],
- ["EDBE",0x782D],
- ["B365",0x782E],
- ["B366",0x782F],
- ["C5E9",0x7830],
- ["B367",0x7831],
- ["B368",0x7832],
- ["B369",0x7833],
- ["C6C6",0x7834],
- ["B36A",0x7835],
- ["B36B",0x7836],
- ["C9E9",0x7837],
- ["D4D2",0x7838],
- ["EDC1",0x7839],
- ["EDC2",0x783A],
- ["EDC3",0x783B],
- ["EDC5",0x783C],
- ["B36C",0x783D],
- ["C0F9",0x783E],
- ["B36D",0x783F],
- ["B4A1",0x7840],
- ["B36E",0x7841],
- ["B36F",0x7842],
- ["B370",0x7843],
- ["B371",0x7844],
- ["B9E8",0x7845],
- ["B372",0x7846],
- ["EDD0",0x7847],
- ["B373",0x7848],
- ["B374",0x7849],
- ["B375",0x784A],
- ["B376",0x784B],
- ["EDD1",0x784C],
- ["B377",0x784D],
- ["EDCA",0x784E],
- ["B378",0x784F],
- ["EDCF",0x7850],
- ["B379",0x7851],
- ["CEF8",0x7852],
- ["B37A",0x7853],
- ["B37B",0x7854],
- ["CBB6",0x7855],
- ["EDCC",0x7856],
- ["EDCD",0x7857],
- ["B37C",0x7858],
- ["B37D",0x7859],
- ["B37E",0x785A],
- ["B380",0x785B],
- ["B381",0x785C],
- ["CFF5",0x785D],
- ["B382",0x785E],
- ["B383",0x785F],
- ["B384",0x7860],
- ["B385",0x7861],
- ["B386",0x7862],
- ["B387",0x7863],
- ["B388",0x7864],
- ["B389",0x7865],
- ["B38A",0x7866],
- ["B38B",0x7867],
- ["B38C",0x7868],
- ["B38D",0x7869],
- ["EDD2",0x786A],
- ["C1F2",0x786B],
- ["D3B2",0x786C],
- ["EDCB",0x786D],
- ["C8B7",0x786E],
- ["B38E",0x786F],
- ["B38F",0x7870],
- ["B390",0x7871],
- ["B391",0x7872],
- ["B392",0x7873],
- ["B393",0x7874],
- ["B394",0x7875],
- ["B395",0x7876],
- ["BCEF",0x7877],
- ["B396",0x7878],
- ["B397",0x7879],
- ["B398",0x787A],
- ["B399",0x787B],
- ["C5F0",0x787C],
- ["B39A",0x787D],
- ["B39B",0x787E],
- ["B39C",0x787F],
- ["B39D",0x7880],
- ["B39E",0x7881],
- ["B39F",0x7882],
- ["B3A0",0x7883],
- ["B440",0x7884],
- ["B441",0x7885],
- ["B442",0x7886],
- ["EDD6",0x7887],
- ["B443",0x7888],
- ["B5EF",0x7889],
- ["B444",0x788A],
- ["B445",0x788B],
- ["C2B5",0x788C],
- ["B0AD",0x788D],
- ["CBE9",0x788E],
- ["B446",0x788F],
- ["B447",0x7890],
- ["B1AE",0x7891],
- ["B448",0x7892],
- ["EDD4",0x7893],
- ["B449",0x7894],
- ["B44A",0x7895],
- ["B44B",0x7896],
- ["CDEB",0x7897],
- ["B5E2",0x7898],
- ["B44C",0x7899],
- ["EDD5",0x789A],
- ["EDD3",0x789B],
- ["EDD7",0x789C],
- ["B44D",0x789D],
- ["B44E",0x789E],
- ["B5FA",0x789F],
- ["B44F",0x78A0],
- ["EDD8",0x78A1],
- ["B450",0x78A2],
- ["EDD9",0x78A3],
- ["B451",0x78A4],
- ["EDDC",0x78A5],
- ["B452",0x78A6],
- ["B1CC",0x78A7],
- ["B453",0x78A8],
- ["B454",0x78A9],
- ["B455",0x78AA],
- ["B456",0x78AB],
- ["B457",0x78AC],
- ["B458",0x78AD],
- ["B459",0x78AE],
- ["B45A",0x78AF],
- ["C5F6",0x78B0],
- ["BCEE",0x78B1],
- ["EDDA",0x78B2],
- ["CCBC",0x78B3],
- ["B2EA",0x78B4],
- ["B45B",0x78B5],
- ["B45C",0x78B6],
- ["B45D",0x78B7],
- ["B45E",0x78B8],
- ["EDDB",0x78B9],
- ["B45F",0x78BA],
- ["B460",0x78BB],
- ["B461",0x78BC],
- ["B462",0x78BD],
- ["C4EB",0x78BE],
- ["B463",0x78BF],
- ["B464",0x78C0],
- ["B4C5",0x78C1],
- ["B465",0x78C2],
- ["B466",0x78C3],
- ["B467",0x78C4],
- ["B0F5",0x78C5],
- ["B468",0x78C6],
- ["B469",0x78C7],
- ["B46A",0x78C8],
- ["EDDF",0x78C9],
- ["C0DA",0x78CA],
- ["B4E8",0x78CB],
- ["B46B",0x78CC],
- ["B46C",0x78CD],
- ["B46D",0x78CE],
- ["B46E",0x78CF],
- ["C5CD",0x78D0],
- ["B46F",0x78D1],
- ["B470",0x78D2],
- ["B471",0x78D3],
- ["EDDD",0x78D4],
- ["BFC4",0x78D5],
- ["B472",0x78D6],
- ["B473",0x78D7],
- ["B474",0x78D8],
- ["EDDE",0x78D9],
- ["B475",0x78DA],
- ["B476",0x78DB],
- ["B477",0x78DC],
- ["B478",0x78DD],
- ["B479",0x78DE],
- ["B47A",0x78DF],
- ["B47B",0x78E0],
- ["B47C",0x78E1],
- ["B47D",0x78E2],
- ["B47E",0x78E3],
- ["B480",0x78E4],
- ["B481",0x78E5],
- ["B482",0x78E6],
- ["B483",0x78E7],
- ["C4A5",0x78E8],
- ["B484",0x78E9],
- ["B485",0x78EA],
- ["B486",0x78EB],
- ["EDE0",0x78EC],
- ["B487",0x78ED],
- ["B488",0x78EE],
- ["B489",0x78EF],
- ["B48A",0x78F0],
- ["B48B",0x78F1],
- ["EDE1",0x78F2],
- ["B48C",0x78F3],
- ["EDE3",0x78F4],
- ["B48D",0x78F5],
- ["B48E",0x78F6],
- ["C1D7",0x78F7],
- ["B48F",0x78F8],
- ["B490",0x78F9],
- ["BBC7",0x78FA],
- ["B491",0x78FB],
- ["B492",0x78FC],
- ["B493",0x78FD],
- ["B494",0x78FE],
- ["B495",0x78FF],
- ["B496",0x7900],
- ["BDB8",0x7901],
- ["B497",0x7902],
- ["B498",0x7903],
- ["B499",0x7904],
- ["EDE2",0x7905],
- ["B49A",0x7906],
- ["B49B",0x7907],
- ["B49C",0x7908],
- ["B49D",0x7909],
- ["B49E",0x790A],
- ["B49F",0x790B],
- ["B4A0",0x790C],
- ["B540",0x790D],
- ["B541",0x790E],
- ["B542",0x790F],
- ["B543",0x7910],
- ["B544",0x7911],
- ["B545",0x7912],
- ["EDE4",0x7913],
- ["B546",0x7914],
- ["B547",0x7915],
- ["B548",0x7916],
- ["B549",0x7917],
- ["B54A",0x7918],
- ["B54B",0x7919],
- ["B54C",0x791A],
- ["B54D",0x791B],
- ["B54E",0x791C],
- ["B54F",0x791D],
- ["EDE6",0x791E],
- ["B550",0x791F],
- ["B551",0x7920],
- ["B552",0x7921],
- ["B553",0x7922],
- ["B554",0x7923],
- ["EDE5",0x7924],
- ["B555",0x7925],
- ["B556",0x7926],
- ["B557",0x7927],
- ["B558",0x7928],
- ["B559",0x7929],
- ["B55A",0x792A],
- ["B55B",0x792B],
- ["B55C",0x792C],
- ["B55D",0x792D],
- ["B55E",0x792E],
- ["B55F",0x792F],
- ["B560",0x7930],
- ["B561",0x7931],
- ["B562",0x7932],
- ["B563",0x7933],
- ["EDE7",0x7934],
- ["B564",0x7935],
- ["B565",0x7936],
- ["B566",0x7937],
- ["B567",0x7938],
- ["B568",0x7939],
- ["CABE",0x793A],
- ["ECEA",0x793B],
- ["C0F1",0x793C],
- ["B569",0x793D],
- ["C9E7",0x793E],
- ["B56A",0x793F],
- ["ECEB",0x7940],
- ["C6EE",0x7941],
- ["B56B",0x7942],
- ["B56C",0x7943],
- ["B56D",0x7944],
- ["B56E",0x7945],
- ["ECEC",0x7946],
- ["B56F",0x7947],
- ["C6ED",0x7948],
- ["ECED",0x7949],
- ["B570",0x794A],
- ["B571",0x794B],
- ["B572",0x794C],
- ["B573",0x794D],
- ["B574",0x794E],
- ["B575",0x794F],
- ["B576",0x7950],
- ["B577",0x7951],
- ["B578",0x7952],
- ["ECF0",0x7953],
- ["B579",0x7954],
- ["B57A",0x7955],
- ["D7E6",0x7956],
- ["ECF3",0x7957],
- ["B57B",0x7958],
- ["B57C",0x7959],
- ["ECF1",0x795A],
- ["ECEE",0x795B],
- ["ECEF",0x795C],
- ["D7A3",0x795D],
- ["C9F1",0x795E],
- ["CBEE",0x795F],
- ["ECF4",0x7960],
- ["B57D",0x7961],
- ["ECF2",0x7962],
- ["B57E",0x7963],
- ["B580",0x7964],
- ["CFE9",0x7965],
- ["B581",0x7966],
- ["ECF6",0x7967],
- ["C6B1",0x7968],
- ["B582",0x7969],
- ["B583",0x796A],
- ["B584",0x796B],
- ["B585",0x796C],
- ["BCC0",0x796D],
- ["B586",0x796E],
- ["ECF5",0x796F],
- ["B587",0x7970],
- ["B588",0x7971],
- ["B589",0x7972],
- ["B58A",0x7973],
- ["B58B",0x7974],
- ["B58C",0x7975],
- ["B58D",0x7976],
- ["B5BB",0x7977],
- ["BBF6",0x7978],
- ["B58E",0x7979],
- ["ECF7",0x797A],
- ["B58F",0x797B],
- ["B590",0x797C],
- ["B591",0x797D],
- ["B592",0x797E],
- ["B593",0x797F],
- ["D9F7",0x7980],
- ["BDFB",0x7981],
- ["B594",0x7982],
- ["B595",0x7983],
- ["C2BB",0x7984],
- ["ECF8",0x7985],
- ["B596",0x7986],
- ["B597",0x7987],
- ["B598",0x7988],
- ["B599",0x7989],
- ["ECF9",0x798A],
- ["B59A",0x798B],
- ["B59B",0x798C],
- ["B59C",0x798D],
- ["B59D",0x798E],
- ["B8A3",0x798F],
- ["B59E",0x7990],
- ["B59F",0x7991],
- ["B5A0",0x7992],
- ["B640",0x7993],
- ["B641",0x7994],
- ["B642",0x7995],
- ["B643",0x7996],
- ["B644",0x7997],
- ["B645",0x7998],
- ["B646",0x7999],
- ["ECFA",0x799A],
- ["B647",0x799B],
- ["B648",0x799C],
- ["B649",0x799D],
- ["B64A",0x799E],
- ["B64B",0x799F],
- ["B64C",0x79A0],
- ["B64D",0x79A1],
- ["B64E",0x79A2],
- ["B64F",0x79A3],
- ["B650",0x79A4],
- ["B651",0x79A5],
- ["B652",0x79A6],
- ["ECFB",0x79A7],
- ["B653",0x79A8],
- ["B654",0x79A9],
- ["B655",0x79AA],
- ["B656",0x79AB],
- ["B657",0x79AC],
- ["B658",0x79AD],
- ["B659",0x79AE],
- ["B65A",0x79AF],
- ["B65B",0x79B0],
- ["B65C",0x79B1],
- ["B65D",0x79B2],
- ["ECFC",0x79B3],
- ["B65E",0x79B4],
- ["B65F",0x79B5],
- ["B660",0x79B6],
- ["B661",0x79B7],
- ["B662",0x79B8],
- ["D3ED",0x79B9],
- ["D8AE",0x79BA],
- ["C0EB",0x79BB],
- ["B663",0x79BC],
- ["C7DD",0x79BD],
- ["BACC",0x79BE],
- ["B664",0x79BF],
- ["D0E3",0x79C0],
- ["CBBD",0x79C1],
- ["B665",0x79C2],
- ["CDBA",0x79C3],
- ["B666",0x79C4],
- ["B667",0x79C5],
- ["B8D1",0x79C6],
- ["B668",0x79C7],
- ["B669",0x79C8],
- ["B1FC",0x79C9],
- ["B66A",0x79CA],
- ["C7EF",0x79CB],
- ["B66B",0x79CC],
- ["D6D6",0x79CD],
- ["B66C",0x79CE],
- ["B66D",0x79CF],
- ["B66E",0x79D0],
- ["BFC6",0x79D1],
- ["C3EB",0x79D2],
- ["B66F",0x79D3],
- ["B670",0x79D4],
- ["EFF5",0x79D5],
- ["B671",0x79D6],
- ["B672",0x79D7],
- ["C3D8",0x79D8],
- ["B673",0x79D9],
- ["B674",0x79DA],
- ["B675",0x79DB],
- ["B676",0x79DC],
- ["B677",0x79DD],
- ["B678",0x79DE],
- ["D7E2",0x79DF],
- ["B679",0x79E0],
- ["B67A",0x79E1],
- ["B67B",0x79E2],
- ["EFF7",0x79E3],
- ["B3D3",0x79E4],
- ["B67C",0x79E5],
- ["C7D8",0x79E6],
- ["D1ED",0x79E7],
- ["B67D",0x79E8],
- ["D6C8",0x79E9],
- ["B67E",0x79EA],
- ["EFF8",0x79EB],
- ["B680",0x79EC],
- ["EFF6",0x79ED],
- ["B681",0x79EE],
- ["BBFD",0x79EF],
- ["B3C6",0x79F0],
- ["B682",0x79F1],
- ["B683",0x79F2],
- ["B684",0x79F3],
- ["B685",0x79F4],
- ["B686",0x79F5],
- ["B687",0x79F6],
- ["B688",0x79F7],
- ["BDD5",0x79F8],
- ["B689",0x79F9],
- ["B68A",0x79FA],
- ["D2C6",0x79FB],
- ["B68B",0x79FC],
- ["BBE0",0x79FD],
- ["B68C",0x79FE],
- ["B68D",0x79FF],
- ["CFA1",0x7A00],
- ["B68E",0x7A01],
- ["EFFC",0x7A02],
- ["EFFB",0x7A03],
- ["B68F",0x7A04],
- ["B690",0x7A05],
- ["EFF9",0x7A06],
- ["B691",0x7A07],
- ["B692",0x7A08],
- ["B693",0x7A09],
- ["B694",0x7A0A],
- ["B3CC",0x7A0B],
- ["B695",0x7A0C],
- ["C9D4",0x7A0D],
- ["CBB0",0x7A0E],
- ["B696",0x7A0F],
- ["B697",0x7A10],
- ["B698",0x7A11],
- ["B699",0x7A12],
- ["B69A",0x7A13],
- ["EFFE",0x7A14],
- ["B69B",0x7A15],
- ["B69C",0x7A16],
- ["B0DE",0x7A17],
- ["B69D",0x7A18],
- ["B69E",0x7A19],
- ["D6C9",0x7A1A],
- ["B69F",0x7A1B],
- ["B6A0",0x7A1C],
- ["B740",0x7A1D],
- ["EFFD",0x7A1E],
- ["B741",0x7A1F],
- ["B3ED",0x7A20],
- ["B742",0x7A21],
- ["B743",0x7A22],
- ["F6D5",0x7A23],
- ["B744",0x7A24],
- ["B745",0x7A25],
- ["B746",0x7A26],
- ["B747",0x7A27],
- ["B748",0x7A28],
- ["B749",0x7A29],
- ["B74A",0x7A2A],
- ["B74B",0x7A2B],
- ["B74C",0x7A2C],
- ["B74D",0x7A2D],
- ["B74E",0x7A2E],
- ["B74F",0x7A2F],
- ["B750",0x7A30],
- ["B751",0x7A31],
- ["B752",0x7A32],
- ["CEC8",0x7A33],
- ["B753",0x7A34],
- ["B754",0x7A35],
- ["B755",0x7A36],
- ["F0A2",0x7A37],
- ["B756",0x7A38],
- ["F0A1",0x7A39],
- ["B757",0x7A3A],
- ["B5BE",0x7A3B],
- ["BCDA",0x7A3C],
- ["BBFC",0x7A3D],
- ["B758",0x7A3E],
- ["B8E5",0x7A3F],
- ["B759",0x7A40],
- ["B75A",0x7A41],
- ["B75B",0x7A42],
- ["B75C",0x7A43],
- ["B75D",0x7A44],
- ["B75E",0x7A45],
- ["C4C2",0x7A46],
- ["B75F",0x7A47],
- ["B760",0x7A48],
- ["B761",0x7A49],
- ["B762",0x7A4A],
- ["B763",0x7A4B],
- ["B764",0x7A4C],
- ["B765",0x7A4D],
- ["B766",0x7A4E],
- ["B767",0x7A4F],
- ["B768",0x7A50],
- ["F0A3",0x7A51],
- ["B769",0x7A52],
- ["B76A",0x7A53],
- ["B76B",0x7A54],
- ["B76C",0x7A55],
- ["B76D",0x7A56],
- ["CBEB",0x7A57],
- ["B76E",0x7A58],
- ["B76F",0x7A59],
- ["B770",0x7A5A],
- ["B771",0x7A5B],
- ["B772",0x7A5C],
- ["B773",0x7A5D],
- ["B774",0x7A5E],
- ["B775",0x7A5F],
- ["B776",0x7A60],
- ["B777",0x7A61],
- ["B778",0x7A62],
- ["B779",0x7A63],
- ["B77A",0x7A64],
- ["B77B",0x7A65],
- ["B77C",0x7A66],
- ["B77D",0x7A67],
- ["B77E",0x7A68],
- ["B780",0x7A69],
- ["B781",0x7A6A],
- ["B782",0x7A6B],
- ["B783",0x7A6C],
- ["B784",0x7A6D],
- ["B785",0x7A6E],
- ["B786",0x7A6F],
- ["F0A6",0x7A70],
- ["B787",0x7A71],
- ["B788",0x7A72],
- ["B789",0x7A73],
- ["D1A8",0x7A74],
- ["B78A",0x7A75],
- ["BEBF",0x7A76],
- ["C7EE",0x7A77],
- ["F1B6",0x7A78],
- ["F1B7",0x7A79],
- ["BFD5",0x7A7A],
- ["B78B",0x7A7B],
- ["B78C",0x7A7C],
- ["B78D",0x7A7D],
- ["B78E",0x7A7E],
- ["B4A9",0x7A7F],
- ["F1B8",0x7A80],
- ["CDBB",0x7A81],
- ["B78F",0x7A82],
- ["C7D4",0x7A83],
- ["D5AD",0x7A84],
- ["B790",0x7A85],
- ["F1B9",0x7A86],
- ["B791",0x7A87],
- ["F1BA",0x7A88],
- ["B792",0x7A89],
- ["B793",0x7A8A],
- ["B794",0x7A8B],
- ["B795",0x7A8C],
- ["C7CF",0x7A8D],
- ["B796",0x7A8E],
- ["B797",0x7A8F],
- ["B798",0x7A90],
- ["D2A4",0x7A91],
- ["D6CF",0x7A92],
- ["B799",0x7A93],
- ["B79A",0x7A94],
- ["F1BB",0x7A95],
- ["BDD1",0x7A96],
- ["B4B0",0x7A97],
- ["BEBD",0x7A98],
- ["B79B",0x7A99],
- ["B79C",0x7A9A],
- ["B79D",0x7A9B],
- ["B4DC",0x7A9C],
- ["CED1",0x7A9D],
- ["B79E",0x7A9E],
- ["BFDF",0x7A9F],
- ["F1BD",0x7AA0],
- ["B79F",0x7AA1],
- ["B7A0",0x7AA2],
- ["B840",0x7AA3],
- ["B841",0x7AA4],
- ["BFFA",0x7AA5],
- ["F1BC",0x7AA6],
- ["B842",0x7AA7],
- ["F1BF",0x7AA8],
- ["B843",0x7AA9],
- ["B844",0x7AAA],
- ["B845",0x7AAB],
- ["F1BE",0x7AAC],
- ["F1C0",0x7AAD],
- ["B846",0x7AAE],
- ["B847",0x7AAF],
- ["B848",0x7AB0],
- ["B849",0x7AB1],
- ["B84A",0x7AB2],
- ["F1C1",0x7AB3],
- ["B84B",0x7AB4],
- ["B84C",0x7AB5],
- ["B84D",0x7AB6],
- ["B84E",0x7AB7],
- ["B84F",0x7AB8],
- ["B850",0x7AB9],
- ["B851",0x7ABA],
- ["B852",0x7ABB],
- ["B853",0x7ABC],
- ["B854",0x7ABD],
- ["B855",0x7ABE],
- ["C1FE",0x7ABF],
- ["B856",0x7AC0],
- ["B857",0x7AC1],
- ["B858",0x7AC2],
- ["B859",0x7AC3],
- ["B85A",0x7AC4],
- ["B85B",0x7AC5],
- ["B85C",0x7AC6],
- ["B85D",0x7AC7],
- ["B85E",0x7AC8],
- ["B85F",0x7AC9],
- ["B860",0x7ACA],
- ["C1A2",0x7ACB],
- ["B861",0x7ACC],
- ["B862",0x7ACD],
- ["B863",0x7ACE],
- ["B864",0x7ACF],
- ["B865",0x7AD0],
- ["B866",0x7AD1],
- ["B867",0x7AD2],
- ["B868",0x7AD3],
- ["B869",0x7AD4],
- ["B86A",0x7AD5],
- ["CAFA",0x7AD6],
- ["B86B",0x7AD7],
- ["B86C",0x7AD8],
- ["D5BE",0x7AD9],
- ["B86D",0x7ADA],
- ["B86E",0x7ADB],
- ["B86F",0x7ADC],
- ["B870",0x7ADD],
- ["BEBA",0x7ADE],
- ["BEB9",0x7ADF],
- ["D5C2",0x7AE0],
- ["B871",0x7AE1],
- ["B872",0x7AE2],
- ["BFA2",0x7AE3],
- ["B873",0x7AE4],
- ["CDAF",0x7AE5],
- ["F1B5",0x7AE6],
- ["B874",0x7AE7],
- ["B875",0x7AE8],
- ["B876",0x7AE9],
- ["B877",0x7AEA],
- ["B878",0x7AEB],
- ["B879",0x7AEC],
- ["BDDF",0x7AED],
- ["B87A",0x7AEE],
- ["B6CB",0x7AEF],
- ["B87B",0x7AF0],
- ["B87C",0x7AF1],
- ["B87D",0x7AF2],
- ["B87E",0x7AF3],
- ["B880",0x7AF4],
- ["B881",0x7AF5],
- ["B882",0x7AF6],
- ["B883",0x7AF7],
- ["B884",0x7AF8],
- ["D6F1",0x7AF9],
- ["F3C3",0x7AFA],
- ["B885",0x7AFB],
- ["B886",0x7AFC],
- ["F3C4",0x7AFD],
- ["B887",0x7AFE],
- ["B8CD",0x7AFF],
- ["B888",0x7B00],
- ["B889",0x7B01],
- ["B88A",0x7B02],
- ["F3C6",0x7B03],
- ["F3C7",0x7B04],
- ["B88B",0x7B05],
- ["B0CA",0x7B06],
- ["B88C",0x7B07],
- ["F3C5",0x7B08],
- ["B88D",0x7B09],
- ["F3C9",0x7B0A],
- ["CBF1",0x7B0B],
- ["B88E",0x7B0C],
- ["B88F",0x7B0D],
- ["B890",0x7B0E],
- ["F3CB",0x7B0F],
- ["B891",0x7B10],
- ["D0A6",0x7B11],
- ["B892",0x7B12],
- ["B893",0x7B13],
- ["B1CA",0x7B14],
- ["F3C8",0x7B15],
- ["B894",0x7B16],
- ["B895",0x7B17],
- ["B896",0x7B18],
- ["F3CF",0x7B19],
- ["B897",0x7B1A],
- ["B5D1",0x7B1B],
- ["B898",0x7B1C],
- ["B899",0x7B1D],
- ["F3D7",0x7B1E],
- ["B89A",0x7B1F],
- ["F3D2",0x7B20],
- ["B89B",0x7B21],
- ["B89C",0x7B22],
- ["B89D",0x7B23],
- ["F3D4",0x7B24],
- ["F3D3",0x7B25],
- ["B7FB",0x7B26],
- ["B89E",0x7B27],
- ["B1BF",0x7B28],
- ["B89F",0x7B29],
- ["F3CE",0x7B2A],
- ["F3CA",0x7B2B],
- ["B5DA",0x7B2C],
- ["B8A0",0x7B2D],
- ["F3D0",0x7B2E],
- ["B940",0x7B2F],
- ["B941",0x7B30],
- ["F3D1",0x7B31],
- ["B942",0x7B32],
- ["F3D5",0x7B33],
- ["B943",0x7B34],
- ["B944",0x7B35],
- ["B945",0x7B36],
- ["B946",0x7B37],
- ["F3CD",0x7B38],
- ["B947",0x7B39],
- ["BCE3",0x7B3A],
- ["B948",0x7B3B],
- ["C1FD",0x7B3C],
- ["B949",0x7B3D],
- ["F3D6",0x7B3E],
- ["B94A",0x7B3F],
- ["B94B",0x7B40],
- ["B94C",0x7B41],
- ["B94D",0x7B42],
- ["B94E",0x7B43],
- ["B94F",0x7B44],
- ["F3DA",0x7B45],
- ["B950",0x7B46],
- ["F3CC",0x7B47],
- ["B951",0x7B48],
- ["B5C8",0x7B49],
- ["B952",0x7B4A],
- ["BDEE",0x7B4B],
- ["F3DC",0x7B4C],
- ["B953",0x7B4D],
- ["B954",0x7B4E],
- ["B7A4",0x7B4F],
- ["BFF0",0x7B50],
- ["D6FE",0x7B51],
- ["CDB2",0x7B52],
- ["B955",0x7B53],
- ["B4F0",0x7B54],
- ["B956",0x7B55],
- ["B2DF",0x7B56],
- ["B957",0x7B57],
- ["F3D8",0x7B58],
- ["B958",0x7B59],
- ["F3D9",0x7B5A],
- ["C9B8",0x7B5B],
- ["B959",0x7B5C],
- ["F3DD",0x7B5D],
- ["B95A",0x7B5E],
- ["B95B",0x7B5F],
- ["F3DE",0x7B60],
- ["B95C",0x7B61],
- ["F3E1",0x7B62],
- ["B95D",0x7B63],
- ["B95E",0x7B64],
- ["B95F",0x7B65],
- ["B960",0x7B66],
- ["B961",0x7B67],
- ["B962",0x7B68],
- ["B963",0x7B69],
- ["B964",0x7B6A],
- ["B965",0x7B6B],
- ["B966",0x7B6C],
- ["B967",0x7B6D],
- ["F3DF",0x7B6E],
- ["B968",0x7B6F],
- ["B969",0x7B70],
- ["F3E3",0x7B71],
- ["F3E2",0x7B72],
- ["B96A",0x7B73],
- ["B96B",0x7B74],
- ["F3DB",0x7B75],
- ["B96C",0x7B76],
- ["BFEA",0x7B77],
- ["B96D",0x7B78],
- ["B3EF",0x7B79],
- ["B96E",0x7B7A],
- ["F3E0",0x7B7B],
- ["B96F",0x7B7C],
- ["B970",0x7B7D],
- ["C7A9",0x7B7E],
- ["B971",0x7B7F],
- ["BCF2",0x7B80],
- ["B972",0x7B81],
- ["B973",0x7B82],
- ["B974",0x7B83],
- ["B975",0x7B84],
- ["F3EB",0x7B85],
- ["B976",0x7B86],
- ["B977",0x7B87],
- ["B978",0x7B88],
- ["B979",0x7B89],
- ["B97A",0x7B8A],
- ["B97B",0x7B8B],
- ["B97C",0x7B8C],
- ["B9BF",0x7B8D],
- ["B97D",0x7B8E],
- ["B97E",0x7B8F],
- ["F3E4",0x7B90],
- ["B980",0x7B91],
- ["B981",0x7B92],
- ["B982",0x7B93],
- ["B2AD",0x7B94],
- ["BBFE",0x7B95],
- ["B983",0x7B96],
- ["CBE3",0x7B97],
- ["B984",0x7B98],
- ["B985",0x7B99],
- ["B986",0x7B9A],
- ["B987",0x7B9B],
- ["F3ED",0x7B9C],
- ["F3E9",0x7B9D],
- ["B988",0x7B9E],
- ["B989",0x7B9F],
- ["B98A",0x7BA0],
- ["B9DC",0x7BA1],
- ["F3EE",0x7BA2],
- ["B98B",0x7BA3],
- ["B98C",0x7BA4],
- ["B98D",0x7BA5],
- ["F3E5",0x7BA6],
- ["F3E6",0x7BA7],
- ["F3EA",0x7BA8],
- ["C2E1",0x7BA9],
- ["F3EC",0x7BAA],
- ["F3EF",0x7BAB],
- ["F3E8",0x7BAC],
- ["BCFD",0x7BAD],
- ["B98E",0x7BAE],
- ["B98F",0x7BAF],
- ["B990",0x7BB0],
- ["CFE4",0x7BB1],
- ["B991",0x7BB2],
- ["B992",0x7BB3],
- ["F3F0",0x7BB4],
- ["B993",0x7BB5],
- ["B994",0x7BB6],
- ["B995",0x7BB7],
- ["F3E7",0x7BB8],
- ["B996",0x7BB9],
- ["B997",0x7BBA],
- ["B998",0x7BBB],
- ["B999",0x7BBC],
- ["B99A",0x7BBD],
- ["B99B",0x7BBE],
- ["B99C",0x7BBF],
- ["B99D",0x7BC0],
- ["F3F2",0x7BC1],
- ["B99E",0x7BC2],
- ["B99F",0x7BC3],
- ["B9A0",0x7BC4],
- ["BA40",0x7BC5],
- ["D7AD",0x7BC6],
- ["C6AA",0x7BC7],
- ["BA41",0x7BC8],
- ["BA42",0x7BC9],
- ["BA43",0x7BCA],
- ["BA44",0x7BCB],
- ["F3F3",0x7BCC],
- ["BA45",0x7BCD],
- ["BA46",0x7BCE],
- ["BA47",0x7BCF],
- ["BA48",0x7BD0],
- ["F3F1",0x7BD1],
- ["BA49",0x7BD2],
- ["C2A8",0x7BD3],
- ["BA4A",0x7BD4],
- ["BA4B",0x7BD5],
- ["BA4C",0x7BD6],
- ["BA4D",0x7BD7],
- ["BA4E",0x7BD8],
- ["B8DD",0x7BD9],
- ["F3F5",0x7BDA],
- ["BA4F",0x7BDB],
- ["BA50",0x7BDC],
- ["F3F4",0x7BDD],
- ["BA51",0x7BDE],
- ["BA52",0x7BDF],
- ["BA53",0x7BE0],
- ["B4DB",0x7BE1],
- ["BA54",0x7BE2],
- ["BA55",0x7BE3],
- ["BA56",0x7BE4],
- ["F3F6",0x7BE5],
- ["F3F7",0x7BE6],
- ["BA57",0x7BE7],
- ["BA58",0x7BE8],
- ["BA59",0x7BE9],
- ["F3F8",0x7BEA],
- ["BA5A",0x7BEB],
- ["BA5B",0x7BEC],
- ["BA5C",0x7BED],
- ["C0BA",0x7BEE],
- ["BA5D",0x7BEF],
- ["BA5E",0x7BF0],
- ["C0E9",0x7BF1],
- ["BA5F",0x7BF2],
- ["BA60",0x7BF3],
- ["BA61",0x7BF4],
- ["BA62",0x7BF5],
- ["BA63",0x7BF6],
- ["C5F1",0x7BF7],
- ["BA64",0x7BF8],
- ["BA65",0x7BF9],
- ["BA66",0x7BFA],
- ["BA67",0x7BFB],
- ["F3FB",0x7BFC],
- ["BA68",0x7BFD],
- ["F3FA",0x7BFE],
- ["BA69",0x7BFF],
- ["BA6A",0x7C00],
- ["BA6B",0x7C01],
- ["BA6C",0x7C02],
- ["BA6D",0x7C03],
- ["BA6E",0x7C04],
- ["BA6F",0x7C05],
- ["BA70",0x7C06],
- ["B4D8",0x7C07],
- ["BA71",0x7C08],
- ["BA72",0x7C09],
- ["BA73",0x7C0A],
- ["F3FE",0x7C0B],
- ["F3F9",0x7C0C],
- ["BA74",0x7C0D],
- ["BA75",0x7C0E],
- ["F3FC",0x7C0F],
- ["BA76",0x7C10],
- ["BA77",0x7C11],
- ["BA78",0x7C12],
- ["BA79",0x7C13],
- ["BA7A",0x7C14],
- ["BA7B",0x7C15],
- ["F3FD",0x7C16],
- ["BA7C",0x7C17],
- ["BA7D",0x7C18],
- ["BA7E",0x7C19],
- ["BA80",0x7C1A],
- ["BA81",0x7C1B],
- ["BA82",0x7C1C],
- ["BA83",0x7C1D],
- ["BA84",0x7C1E],
- ["F4A1",0x7C1F],
- ["BA85",0x7C20],
- ["BA86",0x7C21],
- ["BA87",0x7C22],
- ["BA88",0x7C23],
- ["BA89",0x7C24],
- ["BA8A",0x7C25],
- ["F4A3",0x7C26],
- ["BBC9",0x7C27],
- ["BA8B",0x7C28],
- ["BA8C",0x7C29],
- ["F4A2",0x7C2A],
- ["BA8D",0x7C2B],
- ["BA8E",0x7C2C],
- ["BA8F",0x7C2D],
- ["BA90",0x7C2E],
- ["BA91",0x7C2F],
- ["BA92",0x7C30],
- ["BA93",0x7C31],
- ["BA94",0x7C32],
- ["BA95",0x7C33],
- ["BA96",0x7C34],
- ["BA97",0x7C35],
- ["BA98",0x7C36],
- ["BA99",0x7C37],
- ["F4A4",0x7C38],
- ["BA9A",0x7C39],
- ["BA9B",0x7C3A],
- ["BA9C",0x7C3B],
- ["BA9D",0x7C3C],
- ["BA9E",0x7C3D],
- ["BA9F",0x7C3E],
- ["B2BE",0x7C3F],
- ["F4A6",0x7C40],
- ["F4A5",0x7C41],
- ["BAA0",0x7C42],
- ["BB40",0x7C43],
- ["BB41",0x7C44],
- ["BB42",0x7C45],
- ["BB43",0x7C46],
- ["BB44",0x7C47],
- ["BB45",0x7C48],
- ["BB46",0x7C49],
- ["BB47",0x7C4A],
- ["BB48",0x7C4B],
- ["BB49",0x7C4C],
- ["BCAE",0x7C4D],
- ["BB4A",0x7C4E],
- ["BB4B",0x7C4F],
- ["BB4C",0x7C50],
- ["BB4D",0x7C51],
- ["BB4E",0x7C52],
- ["BB4F",0x7C53],
- ["BB50",0x7C54],
- ["BB51",0x7C55],
- ["BB52",0x7C56],
- ["BB53",0x7C57],
- ["BB54",0x7C58],
- ["BB55",0x7C59],
- ["BB56",0x7C5A],
- ["BB57",0x7C5B],
- ["BB58",0x7C5C],
- ["BB59",0x7C5D],
- ["BB5A",0x7C5E],
- ["BB5B",0x7C5F],
- ["BB5C",0x7C60],
- ["BB5D",0x7C61],
- ["BB5E",0x7C62],
- ["BB5F",0x7C63],
- ["BB60",0x7C64],
- ["BB61",0x7C65],
- ["BB62",0x7C66],
- ["BB63",0x7C67],
- ["BB64",0x7C68],
- ["BB65",0x7C69],
- ["BB66",0x7C6A],
- ["BB67",0x7C6B],
- ["BB68",0x7C6C],
- ["BB69",0x7C6D],
- ["BB6A",0x7C6E],
- ["BB6B",0x7C6F],
- ["BB6C",0x7C70],
- ["BB6D",0x7C71],
- ["BB6E",0x7C72],
- ["C3D7",0x7C73],
- ["D9E1",0x7C74],
- ["BB6F",0x7C75],
- ["BB70",0x7C76],
- ["BB71",0x7C77],
- ["BB72",0x7C78],
- ["BB73",0x7C79],
- ["BB74",0x7C7A],
- ["C0E0",0x7C7B],
- ["F4CC",0x7C7C],
- ["D7D1",0x7C7D],
- ["BB75",0x7C7E],
- ["BB76",0x7C7F],
- ["BB77",0x7C80],
- ["BB78",0x7C81],
- ["BB79",0x7C82],
- ["BB7A",0x7C83],
- ["BB7B",0x7C84],
- ["BB7C",0x7C85],
- ["BB7D",0x7C86],
- ["BB7E",0x7C87],
- ["BB80",0x7C88],
- ["B7DB",0x7C89],
- ["BB81",0x7C8A],
- ["BB82",0x7C8B],
- ["BB83",0x7C8C],
- ["BB84",0x7C8D],
- ["BB85",0x7C8E],
- ["BB86",0x7C8F],
- ["BB87",0x7C90],
- ["F4CE",0x7C91],
- ["C1A3",0x7C92],
- ["BB88",0x7C93],
- ["BB89",0x7C94],
- ["C6C9",0x7C95],
- ["BB8A",0x7C96],
- ["B4D6",0x7C97],
- ["D5B3",0x7C98],
- ["BB8B",0x7C99],
- ["BB8C",0x7C9A],
- ["BB8D",0x7C9B],
- ["F4D0",0x7C9C],
- ["F4CF",0x7C9D],
- ["F4D1",0x7C9E],
- ["CBDA",0x7C9F],
- ["BB8E",0x7CA0],
- ["BB8F",0x7CA1],
- ["F4D2",0x7CA2],
- ["BB90",0x7CA3],
- ["D4C1",0x7CA4],
- ["D6E0",0x7CA5],
- ["BB91",0x7CA6],
- ["BB92",0x7CA7],
- ["BB93",0x7CA8],
- ["BB94",0x7CA9],
- ["B7E0",0x7CAA],
- ["BB95",0x7CAB],
- ["BB96",0x7CAC],
- ["BB97",0x7CAD],
- ["C1B8",0x7CAE],
- ["BB98",0x7CAF],
- ["BB99",0x7CB0],
- ["C1BB",0x7CB1],
- ["F4D3",0x7CB2],
- ["BEAC",0x7CB3],
- ["BB9A",0x7CB4],
- ["BB9B",0x7CB5],
- ["BB9C",0x7CB6],
- ["BB9D",0x7CB7],
- ["BB9E",0x7CB8],
- ["B4E2",0x7CB9],
- ["BB9F",0x7CBA],
- ["BBA0",0x7CBB],
- ["F4D4",0x7CBC],
- ["F4D5",0x7CBD],
- ["BEAB",0x7CBE],
- ["BC40",0x7CBF],
- ["BC41",0x7CC0],
- ["F4D6",0x7CC1],
- ["BC42",0x7CC2],
- ["BC43",0x7CC3],
- ["BC44",0x7CC4],
- ["F4DB",0x7CC5],
- ["BC45",0x7CC6],
- ["F4D7",0x7CC7],
- ["F4DA",0x7CC8],
- ["BC46",0x7CC9],
- ["BAFD",0x7CCA],
- ["BC47",0x7CCB],
- ["F4D8",0x7CCC],
- ["F4D9",0x7CCD],
- ["BC48",0x7CCE],
- ["BC49",0x7CCF],
- ["BC4A",0x7CD0],
- ["BC4B",0x7CD1],
- ["BC4C",0x7CD2],
- ["BC4D",0x7CD3],
- ["BC4E",0x7CD4],
- ["B8E2",0x7CD5],
- ["CCC7",0x7CD6],
- ["F4DC",0x7CD7],
- ["BC4F",0x7CD8],
- ["B2DA",0x7CD9],
- ["BC50",0x7CDA],
- ["BC51",0x7CDB],
- ["C3D3",0x7CDC],
- ["BC52",0x7CDD],
- ["BC53",0x7CDE],
- ["D4E3",0x7CDF],
- ["BFB7",0x7CE0],
- ["BC54",0x7CE1],
- ["BC55",0x7CE2],
- ["BC56",0x7CE3],
- ["BC57",0x7CE4],
- ["BC58",0x7CE5],
- ["BC59",0x7CE6],
- ["BC5A",0x7CE7],
- ["F4DD",0x7CE8],
- ["BC5B",0x7CE9],
- ["BC5C",0x7CEA],
- ["BC5D",0x7CEB],
- ["BC5E",0x7CEC],
- ["BC5F",0x7CED],
- ["BC60",0x7CEE],
- ["C5B4",0x7CEF],
- ["BC61",0x7CF0],
- ["BC62",0x7CF1],
- ["BC63",0x7CF2],
- ["BC64",0x7CF3],
- ["BC65",0x7CF4],
- ["BC66",0x7CF5],
- ["BC67",0x7CF6],
- ["BC68",0x7CF7],
- ["F4E9",0x7CF8],
- ["BC69",0x7CF9],
- ["BC6A",0x7CFA],
- ["CFB5",0x7CFB],
- ["BC6B",0x7CFC],
- ["BC6C",0x7CFD],
- ["BC6D",0x7CFE],
- ["BC6E",0x7CFF],
- ["BC6F",0x7D00],
- ["BC70",0x7D01],
- ["BC71",0x7D02],
- ["BC72",0x7D03],
- ["BC73",0x7D04],
- ["BC74",0x7D05],
- ["BC75",0x7D06],
- ["BC76",0x7D07],
- ["BC77",0x7D08],
- ["BC78",0x7D09],
- ["CEC9",0x7D0A],
- ["BC79",0x7D0B],
- ["BC7A",0x7D0C],
- ["BC7B",0x7D0D],
- ["BC7C",0x7D0E],
- ["BC7D",0x7D0F],
- ["BC7E",0x7D10],
- ["BC80",0x7D11],
- ["BC81",0x7D12],
- ["BC82",0x7D13],
- ["BC83",0x7D14],
- ["BC84",0x7D15],
- ["BC85",0x7D16],
- ["BC86",0x7D17],
- ["BC87",0x7D18],
- ["BC88",0x7D19],
- ["BC89",0x7D1A],
- ["BC8A",0x7D1B],
- ["BC8B",0x7D1C],
- ["BC8C",0x7D1D],
- ["BC8D",0x7D1E],
- ["BC8E",0x7D1F],
- ["CBD8",0x7D20],
- ["BC8F",0x7D21],
- ["CBF7",0x7D22],
- ["BC90",0x7D23],
- ["BC91",0x7D24],
- ["BC92",0x7D25],
- ["BC93",0x7D26],
- ["BDF4",0x7D27],
- ["BC94",0x7D28],
- ["BC95",0x7D29],
- ["BC96",0x7D2A],
- ["D7CF",0x7D2B],
- ["BC97",0x7D2C],
- ["BC98",0x7D2D],
- ["BC99",0x7D2E],
- ["C0DB",0x7D2F],
- ["BC9A",0x7D30],
- ["BC9B",0x7D31],
- ["BC9C",0x7D32],
- ["BC9D",0x7D33],
- ["BC9E",0x7D34],
- ["BC9F",0x7D35],
- ["BCA0",0x7D36],
- ["BD40",0x7D37],
- ["BD41",0x7D38],
- ["BD42",0x7D39],
- ["BD43",0x7D3A],
- ["BD44",0x7D3B],
- ["BD45",0x7D3C],
- ["BD46",0x7D3D],
- ["BD47",0x7D3E],
- ["BD48",0x7D3F],
- ["BD49",0x7D40],
- ["BD4A",0x7D41],
- ["BD4B",0x7D42],
- ["BD4C",0x7D43],
- ["BD4D",0x7D44],
- ["BD4E",0x7D45],
- ["BD4F",0x7D46],
- ["BD50",0x7D47],
- ["BD51",0x7D48],
- ["BD52",0x7D49],
- ["BD53",0x7D4A],
- ["BD54",0x7D4B],
- ["BD55",0x7D4C],
- ["BD56",0x7D4D],
- ["BD57",0x7D4E],
- ["BD58",0x7D4F],
- ["BD59",0x7D50],
- ["BD5A",0x7D51],
- ["BD5B",0x7D52],
- ["BD5C",0x7D53],
- ["BD5D",0x7D54],
- ["BD5E",0x7D55],
- ["BD5F",0x7D56],
- ["BD60",0x7D57],
- ["BD61",0x7D58],
- ["BD62",0x7D59],
- ["BD63",0x7D5A],
- ["BD64",0x7D5B],
- ["BD65",0x7D5C],
- ["BD66",0x7D5D],
- ["BD67",0x7D5E],
- ["BD68",0x7D5F],
- ["BD69",0x7D60],
- ["BD6A",0x7D61],
- ["BD6B",0x7D62],
- ["BD6C",0x7D63],
- ["BD6D",0x7D64],
- ["BD6E",0x7D65],
- ["BD6F",0x7D66],
- ["BD70",0x7D67],
- ["BD71",0x7D68],
- ["BD72",0x7D69],
- ["BD73",0x7D6A],
- ["BD74",0x7D6B],
- ["BD75",0x7D6C],
- ["BD76",0x7D6D],
- ["D0F5",0x7D6E],
- ["BD77",0x7D6F],
- ["BD78",0x7D70],
- ["BD79",0x7D71],
- ["BD7A",0x7D72],
- ["BD7B",0x7D73],
- ["BD7C",0x7D74],
- ["BD7D",0x7D75],
- ["BD7E",0x7D76],
- ["F4EA",0x7D77],
- ["BD80",0x7D78],
- ["BD81",0x7D79],
- ["BD82",0x7D7A],
- ["BD83",0x7D7B],
- ["BD84",0x7D7C],
- ["BD85",0x7D7D],
- ["BD86",0x7D7E],
- ["BD87",0x7D7F],
- ["BD88",0x7D80],
- ["BD89",0x7D81],
- ["BD8A",0x7D82],
- ["BD8B",0x7D83],
- ["BD8C",0x7D84],
- ["BD8D",0x7D85],
- ["BD8E",0x7D86],
- ["BD8F",0x7D87],
- ["BD90",0x7D88],
- ["BD91",0x7D89],
- ["BD92",0x7D8A],
- ["BD93",0x7D8B],
- ["BD94",0x7D8C],
- ["BD95",0x7D8D],
- ["BD96",0x7D8E],
- ["BD97",0x7D8F],
- ["BD98",0x7D90],
- ["BD99",0x7D91],
- ["BD9A",0x7D92],
- ["BD9B",0x7D93],
- ["BD9C",0x7D94],
- ["BD9D",0x7D95],
- ["BD9E",0x7D96],
- ["BD9F",0x7D97],
- ["BDA0",0x7D98],
- ["BE40",0x7D99],
- ["BE41",0x7D9A],
- ["BE42",0x7D9B],
- ["BE43",0x7D9C],
- ["BE44",0x7D9D],
- ["BE45",0x7D9E],
- ["BE46",0x7D9F],
- ["BE47",0x7DA0],
- ["BE48",0x7DA1],
- ["BE49",0x7DA2],
- ["BE4A",0x7DA3],
- ["BE4B",0x7DA4],
- ["BE4C",0x7DA5],
- ["F4EB",0x7DA6],
- ["BE4D",0x7DA7],
- ["BE4E",0x7DA8],
- ["BE4F",0x7DA9],
- ["BE50",0x7DAA],
- ["BE51",0x7DAB],
- ["BE52",0x7DAC],
- ["BE53",0x7DAD],
- ["F4EC",0x7DAE],
- ["BE54",0x7DAF],
- ["BE55",0x7DB0],
- ["BE56",0x7DB1],
- ["BE57",0x7DB2],
- ["BE58",0x7DB3],
- ["BE59",0x7DB4],
- ["BE5A",0x7DB5],
- ["BE5B",0x7DB6],
- ["BE5C",0x7DB7],
- ["BE5D",0x7DB8],
- ["BE5E",0x7DB9],
- ["BE5F",0x7DBA],
- ["BE60",0x7DBB],
- ["BE61",0x7DBC],
- ["BE62",0x7DBD],
- ["BE63",0x7DBE],
- ["BE64",0x7DBF],
- ["BE65",0x7DC0],
- ["BE66",0x7DC1],
- ["BE67",0x7DC2],
- ["BE68",0x7DC3],
- ["BE69",0x7DC4],
- ["BE6A",0x7DC5],
- ["BE6B",0x7DC6],
- ["BE6C",0x7DC7],
- ["BE6D",0x7DC8],
- ["BE6E",0x7DC9],
- ["BE6F",0x7DCA],
- ["BE70",0x7DCB],
- ["BE71",0x7DCC],
- ["BE72",0x7DCD],
- ["BE73",0x7DCE],
- ["BE74",0x7DCF],
- ["BE75",0x7DD0],
- ["BE76",0x7DD1],
- ["BE77",0x7DD2],
- ["BE78",0x7DD3],
- ["BE79",0x7DD4],
- ["BE7A",0x7DD5],
- ["BE7B",0x7DD6],
- ["BE7C",0x7DD7],
- ["BE7D",0x7DD8],
- ["BE7E",0x7DD9],
- ["BE80",0x7DDA],
- ["BE81",0x7DDB],
- ["BE82",0x7DDC],
- ["BE83",0x7DDD],
- ["BE84",0x7DDE],
- ["BE85",0x7DDF],
- ["BE86",0x7DE0],
- ["BE87",0x7DE1],
- ["BE88",0x7DE2],
- ["BE89",0x7DE3],
- ["BE8A",0x7DE4],
- ["BE8B",0x7DE5],
- ["BE8C",0x7DE6],
- ["BE8D",0x7DE7],
- ["BE8E",0x7DE8],
- ["BE8F",0x7DE9],
- ["BE90",0x7DEA],
- ["BE91",0x7DEB],
- ["BE92",0x7DEC],
- ["BE93",0x7DED],
- ["BE94",0x7DEE],
- ["BE95",0x7DEF],
- ["BE96",0x7DF0],
- ["BE97",0x7DF1],
- ["BE98",0x7DF2],
- ["BE99",0x7DF3],
- ["BE9A",0x7DF4],
- ["BE9B",0x7DF5],
- ["BE9C",0x7DF6],
- ["BE9D",0x7DF7],
- ["BE9E",0x7DF8],
- ["BE9F",0x7DF9],
- ["BEA0",0x7DFA],
- ["BF40",0x7DFB],
- ["BF41",0x7DFC],
- ["BF42",0x7DFD],
- ["BF43",0x7DFE],
- ["BF44",0x7DFF],
- ["BF45",0x7E00],
- ["BF46",0x7E01],
- ["BF47",0x7E02],
- ["BF48",0x7E03],
- ["BF49",0x7E04],
- ["BF4A",0x7E05],
- ["BF4B",0x7E06],
- ["BF4C",0x7E07],
- ["BF4D",0x7E08],
- ["BF4E",0x7E09],
- ["BF4F",0x7E0A],
- ["BF50",0x7E0B],
- ["BF51",0x7E0C],
- ["BF52",0x7E0D],
- ["BF53",0x7E0E],
- ["BF54",0x7E0F],
- ["BF55",0x7E10],
- ["BF56",0x7E11],
- ["BF57",0x7E12],
- ["BF58",0x7E13],
- ["BF59",0x7E14],
- ["BF5A",0x7E15],
- ["BF5B",0x7E16],
- ["BF5C",0x7E17],
- ["BF5D",0x7E18],
- ["BF5E",0x7E19],
- ["BF5F",0x7E1A],
- ["BF60",0x7E1B],
- ["BF61",0x7E1C],
- ["BF62",0x7E1D],
- ["BF63",0x7E1E],
- ["BF64",0x7E1F],
- ["BF65",0x7E20],
- ["BF66",0x7E21],
- ["BF67",0x7E22],
- ["BF68",0x7E23],
- ["BF69",0x7E24],
- ["BF6A",0x7E25],
- ["BF6B",0x7E26],
- ["BF6C",0x7E27],
- ["BF6D",0x7E28],
- ["BF6E",0x7E29],
- ["BF6F",0x7E2A],
- ["BF70",0x7E2B],
- ["BF71",0x7E2C],
- ["BF72",0x7E2D],
- ["BF73",0x7E2E],
- ["BF74",0x7E2F],
- ["BF75",0x7E30],
- ["BF76",0x7E31],
- ["BF77",0x7E32],
- ["BF78",0x7E33],
- ["BF79",0x7E34],
- ["BF7A",0x7E35],
- ["BF7B",0x7E36],
- ["BF7C",0x7E37],
- ["BF7D",0x7E38],
- ["BF7E",0x7E39],
- ["BF80",0x7E3A],
- ["F7E3",0x7E3B],
- ["BF81",0x7E3C],
- ["BF82",0x7E3D],
- ["BF83",0x7E3E],
- ["BF84",0x7E3F],
- ["BF85",0x7E40],
- ["B7B1",0x7E41],
- ["BF86",0x7E42],
- ["BF87",0x7E43],
- ["BF88",0x7E44],
- ["BF89",0x7E45],
- ["BF8A",0x7E46],
- ["F4ED",0x7E47],
- ["BF8B",0x7E48],
- ["BF8C",0x7E49],
- ["BF8D",0x7E4A],
- ["BF8E",0x7E4B],
- ["BF8F",0x7E4C],
- ["BF90",0x7E4D],
- ["BF91",0x7E4E],
- ["BF92",0x7E4F],
- ["BF93",0x7E50],
- ["BF94",0x7E51],
- ["BF95",0x7E52],
- ["BF96",0x7E53],
- ["BF97",0x7E54],
- ["BF98",0x7E55],
- ["BF99",0x7E56],
- ["BF9A",0x7E57],
- ["BF9B",0x7E58],
- ["BF9C",0x7E59],
- ["BF9D",0x7E5A],
- ["BF9E",0x7E5B],
- ["BF9F",0x7E5C],
- ["BFA0",0x7E5D],
- ["C040",0x7E5E],
- ["C041",0x7E5F],
- ["C042",0x7E60],
- ["C043",0x7E61],
- ["C044",0x7E62],
- ["C045",0x7E63],
- ["C046",0x7E64],
- ["C047",0x7E65],
- ["C048",0x7E66],
- ["C049",0x7E67],
- ["C04A",0x7E68],
- ["C04B",0x7E69],
- ["C04C",0x7E6A],
- ["C04D",0x7E6B],
- ["C04E",0x7E6C],
- ["C04F",0x7E6D],
- ["C050",0x7E6E],
- ["C051",0x7E6F],
- ["C052",0x7E70],
- ["C053",0x7E71],
- ["C054",0x7E72],
- ["C055",0x7E73],
- ["C056",0x7E74],
- ["C057",0x7E75],
- ["C058",0x7E76],
- ["C059",0x7E77],
- ["C05A",0x7E78],
- ["C05B",0x7E79],
- ["C05C",0x7E7A],
- ["C05D",0x7E7B],
- ["C05E",0x7E7C],
- ["C05F",0x7E7D],
- ["C060",0x7E7E],
- ["C061",0x7E7F],
- ["C062",0x7E80],
- ["C063",0x7E81],
- ["D7EB",0x7E82],
- ["C064",0x7E83],
- ["C065",0x7E84],
- ["C066",0x7E85],
- ["C067",0x7E86],
- ["C068",0x7E87],
- ["C069",0x7E88],
- ["C06A",0x7E89],
- ["C06B",0x7E8A],
- ["C06C",0x7E8B],
- ["C06D",0x7E8C],
- ["C06E",0x7E8D],
- ["C06F",0x7E8E],
- ["C070",0x7E8F],
- ["C071",0x7E90],
- ["C072",0x7E91],
- ["C073",0x7E92],
- ["C074",0x7E93],
- ["C075",0x7E94],
- ["C076",0x7E95],
- ["C077",0x7E96],
- ["C078",0x7E97],
- ["C079",0x7E98],
- ["C07A",0x7E99],
- ["C07B",0x7E9A],
- ["F4EE",0x7E9B],
- ["C07C",0x7E9C],
- ["C07D",0x7E9D],
- ["C07E",0x7E9E],
- ["E6F9",0x7E9F],
- ["BEC0",0x7EA0],
- ["E6FA",0x7EA1],
- ["BAEC",0x7EA2],
- ["E6FB",0x7EA3],
- ["CFCB",0x7EA4],
- ["E6FC",0x7EA5],
- ["D4BC",0x7EA6],
- ["BCB6",0x7EA7],
- ["E6FD",0x7EA8],
- ["E6FE",0x7EA9],
- ["BCCD",0x7EAA],
- ["C8D2",0x7EAB],
- ["CEB3",0x7EAC],
- ["E7A1",0x7EAD],
- ["C080",0x7EAE],
- ["B4BF",0x7EAF],
- ["E7A2",0x7EB0],
- ["C9B4",0x7EB1],
- ["B8D9",0x7EB2],
- ["C4C9",0x7EB3],
- ["C081",0x7EB4],
- ["D7DD",0x7EB5],
- ["C2DA",0x7EB6],
- ["B7D7",0x7EB7],
- ["D6BD",0x7EB8],
- ["CEC6",0x7EB9],
- ["B7C4",0x7EBA],
- ["C082",0x7EBB],
- ["C083",0x7EBC],
- ["C5A6",0x7EBD],
- ["E7A3",0x7EBE],
- ["CFDF",0x7EBF],
- ["E7A4",0x7EC0],
- ["E7A5",0x7EC1],
- ["E7A6",0x7EC2],
- ["C1B7",0x7EC3],
- ["D7E9",0x7EC4],
- ["C9F0",0x7EC5],
- ["CFB8",0x7EC6],
- ["D6AF",0x7EC7],
- ["D6D5",0x7EC8],
- ["E7A7",0x7EC9],
- ["B0ED",0x7ECA],
- ["E7A8",0x7ECB],
- ["E7A9",0x7ECC],
- ["C9DC",0x7ECD],
- ["D2EF",0x7ECE],
- ["BEAD",0x7ECF],
- ["E7AA",0x7ED0],
- ["B0F3",0x7ED1],
- ["C8DE",0x7ED2],
- ["BDE1",0x7ED3],
- ["E7AB",0x7ED4],
- ["C8C6",0x7ED5],
- ["C084",0x7ED6],
- ["E7AC",0x7ED7],
- ["BBE6",0x7ED8],
- ["B8F8",0x7ED9],
- ["D1A4",0x7EDA],
- ["E7AD",0x7EDB],
- ["C2E7",0x7EDC],
- ["BEF8",0x7EDD],
- ["BDCA",0x7EDE],
- ["CDB3",0x7EDF],
- ["E7AE",0x7EE0],
- ["E7AF",0x7EE1],
- ["BEEE",0x7EE2],
- ["D0E5",0x7EE3],
- ["C085",0x7EE4],
- ["CBE7",0x7EE5],
- ["CCD0",0x7EE6],
- ["BCCC",0x7EE7],
- ["E7B0",0x7EE8],
- ["BCA8",0x7EE9],
- ["D0F7",0x7EEA],
- ["E7B1",0x7EEB],
- ["C086",0x7EEC],
- ["D0F8",0x7EED],
- ["E7B2",0x7EEE],
- ["E7B3",0x7EEF],
- ["B4C2",0x7EF0],
- ["E7B4",0x7EF1],
- ["E7B5",0x7EF2],
- ["C9FE",0x7EF3],
- ["CEAC",0x7EF4],
- ["C3E0",0x7EF5],
- ["E7B7",0x7EF6],
- ["B1C1",0x7EF7],
- ["B3F1",0x7EF8],
- ["C087",0x7EF9],
- ["E7B8",0x7EFA],
- ["E7B9",0x7EFB],
- ["D7DB",0x7EFC],
- ["D5C0",0x7EFD],
- ["E7BA",0x7EFE],
- ["C2CC",0x7EFF],
- ["D7BA",0x7F00],
- ["E7BB",0x7F01],
- ["E7BC",0x7F02],
- ["E7BD",0x7F03],
- ["BCEA",0x7F04],
- ["C3E5",0x7F05],
- ["C0C2",0x7F06],
- ["E7BE",0x7F07],
- ["E7BF",0x7F08],
- ["BCA9",0x7F09],
- ["C088",0x7F0A],
- ["E7C0",0x7F0B],
- ["E7C1",0x7F0C],
- ["E7B6",0x7F0D],
- ["B6D0",0x7F0E],
- ["E7C2",0x7F0F],
- ["C089",0x7F10],
- ["E7C3",0x7F11],
- ["E7C4",0x7F12],
- ["BBBA",0x7F13],
- ["B5DE",0x7F14],
- ["C2C6",0x7F15],
- ["B1E0",0x7F16],
- ["E7C5",0x7F17],
- ["D4B5",0x7F18],
- ["E7C6",0x7F19],
- ["B8BF",0x7F1A],
- ["E7C8",0x7F1B],
- ["E7C7",0x7F1C],
- ["B7EC",0x7F1D],
- ["C08A",0x7F1E],
- ["E7C9",0x7F1F],
- ["B2F8",0x7F20],
- ["E7CA",0x7F21],
- ["E7CB",0x7F22],
- ["E7CC",0x7F23],
- ["E7CD",0x7F24],
- ["E7CE",0x7F25],
- ["E7CF",0x7F26],
- ["E7D0",0x7F27],
- ["D3A7",0x7F28],
- ["CBF5",0x7F29],
- ["E7D1",0x7F2A],
- ["E7D2",0x7F2B],
- ["E7D3",0x7F2C],
- ["E7D4",0x7F2D],
- ["C9C9",0x7F2E],
- ["E7D5",0x7F2F],
- ["E7D6",0x7F30],
- ["E7D7",0x7F31],
- ["E7D8",0x7F32],
- ["E7D9",0x7F33],
- ["BDC9",0x7F34],
- ["E7DA",0x7F35],
- ["F3BE",0x7F36],
- ["C08B",0x7F37],
- ["B8D7",0x7F38],
- ["C08C",0x7F39],
- ["C8B1",0x7F3A],
- ["C08D",0x7F3B],
- ["C08E",0x7F3C],
- ["C08F",0x7F3D],
- ["C090",0x7F3E],
- ["C091",0x7F3F],
- ["C092",0x7F40],
- ["C093",0x7F41],
- ["F3BF",0x7F42],
- ["C094",0x7F43],
- ["F3C0",0x7F44],
- ["F3C1",0x7F45],
- ["C095",0x7F46],
- ["C096",0x7F47],
- ["C097",0x7F48],
- ["C098",0x7F49],
- ["C099",0x7F4A],
- ["C09A",0x7F4B],
- ["C09B",0x7F4C],
- ["C09C",0x7F4D],
- ["C09D",0x7F4E],
- ["C09E",0x7F4F],
- ["B9DE",0x7F50],
- ["CDF8",0x7F51],
- ["C09F",0x7F52],
- ["C0A0",0x7F53],
- ["D8E8",0x7F54],
- ["BAB1",0x7F55],
- ["C140",0x7F56],
- ["C2DE",0x7F57],
- ["EEB7",0x7F58],
- ["C141",0x7F59],
- ["B7A3",0x7F5A],
- ["C142",0x7F5B],
- ["C143",0x7F5C],
- ["C144",0x7F5D],
- ["C145",0x7F5E],
- ["EEB9",0x7F5F],
- ["C146",0x7F60],
- ["EEB8",0x7F61],
- ["B0D5",0x7F62],
- ["C147",0x7F63],
- ["C148",0x7F64],
- ["C149",0x7F65],
- ["C14A",0x7F66],
- ["C14B",0x7F67],
- ["EEBB",0x7F68],
- ["D5D6",0x7F69],
- ["D7EF",0x7F6A],
- ["C14C",0x7F6B],
- ["C14D",0x7F6C],
- ["C14E",0x7F6D],
- ["D6C3",0x7F6E],
- ["C14F",0x7F6F],
- ["C150",0x7F70],
- ["EEBD",0x7F71],
- ["CAF0",0x7F72],
- ["C151",0x7F73],
- ["EEBC",0x7F74],
- ["C152",0x7F75],
- ["C153",0x7F76],
- ["C154",0x7F77],
- ["C155",0x7F78],
- ["EEBE",0x7F79],
- ["C156",0x7F7A],
- ["C157",0x7F7B],
- ["C158",0x7F7C],
- ["C159",0x7F7D],
- ["EEC0",0x7F7E],
- ["C15A",0x7F7F],
- ["C15B",0x7F80],
- ["EEBF",0x7F81],
- ["C15C",0x7F82],
- ["C15D",0x7F83],
- ["C15E",0x7F84],
- ["C15F",0x7F85],
- ["C160",0x7F86],
- ["C161",0x7F87],
- ["C162",0x7F88],
- ["C163",0x7F89],
- ["D1F2",0x7F8A],
- ["C164",0x7F8B],
- ["C7BC",0x7F8C],
- ["C165",0x7F8D],
- ["C3C0",0x7F8E],
- ["C166",0x7F8F],
- ["C167",0x7F90],
- ["C168",0x7F91],
- ["C169",0x7F92],
- ["C16A",0x7F93],
- ["B8E1",0x7F94],
- ["C16B",0x7F95],
- ["C16C",0x7F96],
- ["C16D",0x7F97],
- ["C16E",0x7F98],
- ["C16F",0x7F99],
- ["C1E7",0x7F9A],
- ["C170",0x7F9B],
- ["C171",0x7F9C],
- ["F4C6",0x7F9D],
- ["D0DF",0x7F9E],
- ["F4C7",0x7F9F],
- ["C172",0x7FA0],
- ["CFDB",0x7FA1],
- ["C173",0x7FA2],
- ["C174",0x7FA3],
- ["C8BA",0x7FA4],
- ["C175",0x7FA5],
- ["C176",0x7FA6],
- ["F4C8",0x7FA7],
- ["C177",0x7FA8],
- ["C178",0x7FA9],
- ["C179",0x7FAA],
- ["C17A",0x7FAB],
- ["C17B",0x7FAC],
- ["C17C",0x7FAD],
- ["C17D",0x7FAE],
- ["F4C9",0x7FAF],
- ["F4CA",0x7FB0],
- ["C17E",0x7FB1],
- ["F4CB",0x7FB2],
- ["C180",0x7FB3],
- ["C181",0x7FB4],
- ["C182",0x7FB5],
- ["C183",0x7FB6],
- ["C184",0x7FB7],
- ["D9FA",0x7FB8],
- ["B8FE",0x7FB9],
- ["C185",0x7FBA],
- ["C186",0x7FBB],
- ["E5F1",0x7FBC],
- ["D3F0",0x7FBD],
- ["C187",0x7FBE],
- ["F4E0",0x7FBF],
- ["C188",0x7FC0],
- ["CECC",0x7FC1],
- ["C189",0x7FC2],
- ["C18A",0x7FC3],
- ["C18B",0x7FC4],
- ["B3E1",0x7FC5],
- ["C18C",0x7FC6],
- ["C18D",0x7FC7],
- ["C18E",0x7FC8],
- ["C18F",0x7FC9],
- ["F1B4",0x7FCA],
- ["C190",0x7FCB],
- ["D2EE",0x7FCC],
- ["C191",0x7FCD],
- ["F4E1",0x7FCE],
- ["C192",0x7FCF],
- ["C193",0x7FD0],
- ["C194",0x7FD1],
- ["C195",0x7FD2],
- ["C196",0x7FD3],
- ["CFE8",0x7FD4],
- ["F4E2",0x7FD5],
- ["C197",0x7FD6],
- ["C198",0x7FD7],
- ["C7CC",0x7FD8],
- ["C199",0x7FD9],
- ["C19A",0x7FDA],
- ["C19B",0x7FDB],
- ["C19C",0x7FDC],
- ["C19D",0x7FDD],
- ["C19E",0x7FDE],
- ["B5D4",0x7FDF],
- ["B4E4",0x7FE0],
- ["F4E4",0x7FE1],
- ["C19F",0x7FE2],
- ["C1A0",0x7FE3],
- ["C240",0x7FE4],
- ["F4E3",0x7FE5],
- ["F4E5",0x7FE6],
- ["C241",0x7FE7],
- ["C242",0x7FE8],
- ["F4E6",0x7FE9],
- ["C243",0x7FEA],
- ["C244",0x7FEB],
- ["C245",0x7FEC],
- ["C246",0x7FED],
- ["F4E7",0x7FEE],
- ["C247",0x7FEF],
- ["BAB2",0x7FF0],
- ["B0BF",0x7FF1],
- ["C248",0x7FF2],
- ["F4E8",0x7FF3],
- ["C249",0x7FF4],
- ["C24A",0x7FF5],
- ["C24B",0x7FF6],
- ["C24C",0x7FF7],
- ["C24D",0x7FF8],
- ["C24E",0x7FF9],
- ["C24F",0x7FFA],
- ["B7AD",0x7FFB],
- ["D2ED",0x7FFC],
- ["C250",0x7FFD],
- ["C251",0x7FFE],
- ["C252",0x7FFF],
- ["D2AB",0x8000],
- ["C0CF",0x8001],
- ["C253",0x8002],
- ["BFBC",0x8003],
- ["EBA3",0x8004],
- ["D5DF",0x8005],
- ["EAC8",0x8006],
- ["C254",0x8007],
- ["C255",0x8008],
- ["C256",0x8009],
- ["C257",0x800A],
- ["F1F3",0x800B],
- ["B6F8",0x800C],
- ["CBA3",0x800D],
- ["C258",0x800E],
- ["C259",0x800F],
- ["C4CD",0x8010],
- ["C25A",0x8011],
- ["F1E7",0x8012],
- ["C25B",0x8013],
- ["F1E8",0x8014],
- ["B8FB",0x8015],
- ["F1E9",0x8016],
- ["BAC4",0x8017],
- ["D4C5",0x8018],
- ["B0D2",0x8019],
- ["C25C",0x801A],
- ["C25D",0x801B],
- ["F1EA",0x801C],
- ["C25E",0x801D],
- ["C25F",0x801E],
- ["C260",0x801F],
- ["F1EB",0x8020],
- ["C261",0x8021],
- ["F1EC",0x8022],
- ["C262",0x8023],
- ["C263",0x8024],
- ["F1ED",0x8025],
- ["F1EE",0x8026],
- ["F1EF",0x8027],
- ["F1F1",0x8028],
- ["F1F0",0x8029],
- ["C5D5",0x802A],
- ["C264",0x802B],
- ["C265",0x802C],
- ["C266",0x802D],
- ["C267",0x802E],
- ["C268",0x802F],
- ["C269",0x8030],
- ["F1F2",0x8031],
- ["C26A",0x8032],
- ["B6FA",0x8033],
- ["C26B",0x8034],
- ["F1F4",0x8035],
- ["D2AE",0x8036],
- ["DEC7",0x8037],
- ["CBCA",0x8038],
- ["C26C",0x8039],
- ["C26D",0x803A],
- ["B3DC",0x803B],
- ["C26E",0x803C],
- ["B5A2",0x803D],
- ["C26F",0x803E],
- ["B9A2",0x803F],
- ["C270",0x8040],
- ["C271",0x8041],
- ["C4F4",0x8042],
- ["F1F5",0x8043],
- ["C272",0x8044],
- ["C273",0x8045],
- ["F1F6",0x8046],
- ["C274",0x8047],
- ["C275",0x8048],
- ["C276",0x8049],
- ["C1C4",0x804A],
- ["C1FB",0x804B],
- ["D6B0",0x804C],
- ["F1F7",0x804D],
- ["C277",0x804E],
- ["C278",0x804F],
- ["C279",0x8050],
- ["C27A",0x8051],
- ["F1F8",0x8052],
- ["C27B",0x8053],
- ["C1AA",0x8054],
- ["C27C",0x8055],
- ["C27D",0x8056],
- ["C27E",0x8057],
- ["C6B8",0x8058],
- ["C280",0x8059],
- ["BEDB",0x805A],
- ["C281",0x805B],
- ["C282",0x805C],
- ["C283",0x805D],
- ["C284",0x805E],
- ["C285",0x805F],
- ["C286",0x8060],
- ["C287",0x8061],
- ["C288",0x8062],
- ["C289",0x8063],
- ["C28A",0x8064],
- ["C28B",0x8065],
- ["C28C",0x8066],
- ["C28D",0x8067],
- ["C28E",0x8068],
- ["F1F9",0x8069],
- ["B4CF",0x806A],
- ["C28F",0x806B],
- ["C290",0x806C],
- ["C291",0x806D],
- ["C292",0x806E],
- ["C293",0x806F],
- ["C294",0x8070],
- ["F1FA",0x8071],
- ["C295",0x8072],
- ["C296",0x8073],
- ["C297",0x8074],
- ["C298",0x8075],
- ["C299",0x8076],
- ["C29A",0x8077],
- ["C29B",0x8078],
- ["C29C",0x8079],
- ["C29D",0x807A],
- ["C29E",0x807B],
- ["C29F",0x807C],
- ["C2A0",0x807D],
- ["C340",0x807E],
- ["EDB2",0x807F],
- ["EDB1",0x8080],
- ["C341",0x8081],
- ["C342",0x8082],
- ["CBE0",0x8083],
- ["D2DE",0x8084],
- ["C343",0x8085],
- ["CBC1",0x8086],
- ["D5D8",0x8087],
- ["C344",0x8088],
- ["C8E2",0x8089],
- ["C345",0x808A],
- ["C0DF",0x808B],
- ["BCA1",0x808C],
- ["C346",0x808D],
- ["C347",0x808E],
- ["C348",0x808F],
- ["C349",0x8090],
- ["C34A",0x8091],
- ["C34B",0x8092],
- ["EBC1",0x8093],
- ["C34C",0x8094],
- ["C34D",0x8095],
- ["D0A4",0x8096],
- ["C34E",0x8097],
- ["D6E2",0x8098],
- ["C34F",0x8099],
- ["B6C7",0x809A],
- ["B8D8",0x809B],
- ["EBC0",0x809C],
- ["B8CE",0x809D],
- ["C350",0x809E],
- ["EBBF",0x809F],
- ["B3A6",0x80A0],
- ["B9C9",0x80A1],
- ["D6AB",0x80A2],
- ["C351",0x80A3],
- ["B7F4",0x80A4],
- ["B7CA",0x80A5],
- ["C352",0x80A6],
- ["C353",0x80A7],
- ["C354",0x80A8],
- ["BCE7",0x80A9],
- ["B7BE",0x80AA],
- ["EBC6",0x80AB],
- ["C355",0x80AC],
- ["EBC7",0x80AD],
- ["B0B9",0x80AE],
- ["BFCF",0x80AF],
- ["C356",0x80B0],
- ["EBC5",0x80B1],
- ["D3FD",0x80B2],
- ["C357",0x80B3],
- ["EBC8",0x80B4],
- ["C358",0x80B5],
- ["C359",0x80B6],
- ["EBC9",0x80B7],
- ["C35A",0x80B8],
- ["C35B",0x80B9],
- ["B7CE",0x80BA],
- ["C35C",0x80BB],
- ["EBC2",0x80BC],
- ["EBC4",0x80BD],
- ["C9F6",0x80BE],
- ["D6D7",0x80BF],
- ["D5CD",0x80C0],
- ["D0B2",0x80C1],
- ["EBCF",0x80C2],
- ["CEB8",0x80C3],
- ["EBD0",0x80C4],
- ["C35D",0x80C5],
- ["B5A8",0x80C6],
- ["C35E",0x80C7],
- ["C35F",0x80C8],
- ["C360",0x80C9],
- ["C361",0x80CA],
- ["C362",0x80CB],
- ["B1B3",0x80CC],
- ["EBD2",0x80CD],
- ["CCA5",0x80CE],
- ["C363",0x80CF],
- ["C364",0x80D0],
- ["C365",0x80D1],
- ["C366",0x80D2],
- ["C367",0x80D3],
- ["C368",0x80D4],
- ["C369",0x80D5],
- ["C5D6",0x80D6],
- ["EBD3",0x80D7],
- ["C36A",0x80D8],
- ["EBD1",0x80D9],
- ["C5DF",0x80DA],
- ["EBCE",0x80DB],
- ["CAA4",0x80DC],
- ["EBD5",0x80DD],
- ["B0FB",0x80DE],
- ["C36B",0x80DF],
- ["C36C",0x80E0],
- ["BAFA",0x80E1],
- ["C36D",0x80E2],
- ["C36E",0x80E3],
- ["D8B7",0x80E4],
- ["F1E3",0x80E5],
- ["C36F",0x80E6],
- ["EBCA",0x80E7],
- ["EBCB",0x80E8],
- ["EBCC",0x80E9],
- ["EBCD",0x80EA],
- ["EBD6",0x80EB],
- ["E6C0",0x80EC],
- ["EBD9",0x80ED],
- ["C370",0x80EE],
- ["BFE8",0x80EF],
- ["D2C8",0x80F0],
- ["EBD7",0x80F1],
- ["EBDC",0x80F2],
- ["B8EC",0x80F3],
- ["EBD8",0x80F4],
- ["C371",0x80F5],
- ["BDBA",0x80F6],
- ["C372",0x80F7],
- ["D0D8",0x80F8],
- ["C373",0x80F9],
- ["B0B7",0x80FA],
- ["C374",0x80FB],
- ["EBDD",0x80FC],
- ["C4DC",0x80FD],
- ["C375",0x80FE],
- ["C376",0x80FF],
- ["C377",0x8100],
- ["C378",0x8101],
- ["D6AC",0x8102],
- ["C379",0x8103],
- ["C37A",0x8104],
- ["C37B",0x8105],
- ["B4E0",0x8106],
- ["C37C",0x8107],
- ["C37D",0x8108],
- ["C2F6",0x8109],
- ["BCB9",0x810A],
- ["C37E",0x810B],
- ["C380",0x810C],
- ["EBDA",0x810D],
- ["EBDB",0x810E],
- ["D4E0",0x810F],
- ["C6EA",0x8110],
- ["C4D4",0x8111],
- ["EBDF",0x8112],
- ["C5A7",0x8113],
- ["D9F5",0x8114],
- ["C381",0x8115],
- ["B2B1",0x8116],
- ["C382",0x8117],
- ["EBE4",0x8118],
- ["C383",0x8119],
- ["BDC5",0x811A],
- ["C384",0x811B],
- ["C385",0x811C],
- ["C386",0x811D],
- ["EBE2",0x811E],
- ["C387",0x811F],
- ["C388",0x8120],
- ["C389",0x8121],
- ["C38A",0x8122],
- ["C38B",0x8123],
- ["C38C",0x8124],
- ["C38D",0x8125],
- ["C38E",0x8126],
- ["C38F",0x8127],
- ["C390",0x8128],
- ["C391",0x8129],
- ["C392",0x812A],
- ["C393",0x812B],
- ["EBE3",0x812C],
- ["C394",0x812D],
- ["C395",0x812E],
- ["B8AC",0x812F],
- ["C396",0x8130],
- ["CDD1",0x8131],
- ["EBE5",0x8132],
- ["C397",0x8133],
- ["C398",0x8134],
- ["C399",0x8135],
- ["EBE1",0x8136],
- ["C39A",0x8137],
- ["C1B3",0x8138],
- ["C39B",0x8139],
- ["C39C",0x813A],
- ["C39D",0x813B],
- ["C39E",0x813C],
- ["C39F",0x813D],
- ["C6A2",0x813E],
- ["C3A0",0x813F],
- ["C440",0x8140],
- ["C441",0x8141],
- ["C442",0x8142],
- ["C443",0x8143],
- ["C444",0x8144],
- ["C445",0x8145],
- ["CCF3",0x8146],
- ["C446",0x8147],
- ["EBE6",0x8148],
- ["C447",0x8149],
- ["C0B0",0x814A],
- ["D2B8",0x814B],
- ["EBE7",0x814C],
- ["C448",0x814D],
- ["C449",0x814E],
- ["C44A",0x814F],
- ["B8AF",0x8150],
- ["B8AD",0x8151],
- ["C44B",0x8152],
- ["EBE8",0x8153],
- ["C7BB",0x8154],
- ["CDF3",0x8155],
- ["C44C",0x8156],
- ["C44D",0x8157],
- ["C44E",0x8158],
- ["EBEA",0x8159],
- ["EBEB",0x815A],
- ["C44F",0x815B],
- ["C450",0x815C],
- ["C451",0x815D],
- ["C452",0x815E],
- ["C453",0x815F],
- ["EBED",0x8160],
- ["C454",0x8161],
- ["C455",0x8162],
- ["C456",0x8163],
- ["C457",0x8164],
- ["D0C8",0x8165],
- ["C458",0x8166],
- ["EBF2",0x8167],
- ["C459",0x8168],
- ["EBEE",0x8169],
- ["C45A",0x816A],
- ["C45B",0x816B],
- ["C45C",0x816C],
- ["EBF1",0x816D],
- ["C8F9",0x816E],
- ["C45D",0x816F],
- ["D1FC",0x8170],
- ["EBEC",0x8171],
- ["C45E",0x8172],
- ["C45F",0x8173],
- ["EBE9",0x8174],
- ["C460",0x8175],
- ["C461",0x8176],
- ["C462",0x8177],
- ["C463",0x8178],
- ["B8B9",0x8179],
- ["CFD9",0x817A],
- ["C4E5",0x817B],
- ["EBEF",0x817C],
- ["EBF0",0x817D],
- ["CCDA",0x817E],
- ["CDC8",0x817F],
- ["B0F2",0x8180],
- ["C464",0x8181],
- ["EBF6",0x8182],
- ["C465",0x8183],
- ["C466",0x8184],
- ["C467",0x8185],
- ["C468",0x8186],
- ["C469",0x8187],
- ["EBF5",0x8188],
- ["C46A",0x8189],
- ["B2B2",0x818A],
- ["C46B",0x818B],
- ["C46C",0x818C],
- ["C46D",0x818D],
- ["C46E",0x818E],
- ["B8E0",0x818F],
- ["C46F",0x8190],
- ["EBF7",0x8191],
- ["C470",0x8192],
- ["C471",0x8193],
- ["C472",0x8194],
- ["C473",0x8195],
- ["C474",0x8196],
- ["C475",0x8197],
- ["B1EC",0x8198],
- ["C476",0x8199],
- ["C477",0x819A],
- ["CCC5",0x819B],
- ["C4A4",0x819C],
- ["CFA5",0x819D],
- ["C478",0x819E],
- ["C479",0x819F],
- ["C47A",0x81A0],
- ["C47B",0x81A1],
- ["C47C",0x81A2],
- ["EBF9",0x81A3],
- ["C47D",0x81A4],
- ["C47E",0x81A5],
- ["ECA2",0x81A6],
- ["C480",0x81A7],
- ["C5F2",0x81A8],
- ["C481",0x81A9],
- ["EBFA",0x81AA],
- ["C482",0x81AB],
- ["C483",0x81AC],
- ["C484",0x81AD],
- ["C485",0x81AE],
- ["C486",0x81AF],
- ["C487",0x81B0],
- ["C488",0x81B1],
- ["C489",0x81B2],
- ["C9C5",0x81B3],
- ["C48A",0x81B4],
- ["C48B",0x81B5],
- ["C48C",0x81B6],
- ["C48D",0x81B7],
- ["C48E",0x81B8],
- ["C48F",0x81B9],
- ["E2DF",0x81BA],
- ["EBFE",0x81BB],
- ["C490",0x81BC],
- ["C491",0x81BD],
- ["C492",0x81BE],
- ["C493",0x81BF],
- ["CDCE",0x81C0],
- ["ECA1",0x81C1],
- ["B1DB",0x81C2],
- ["D3B7",0x81C3],
- ["C494",0x81C4],
- ["C495",0x81C5],
- ["D2DC",0x81C6],
- ["C496",0x81C7],
- ["C497",0x81C8],
- ["C498",0x81C9],
- ["EBFD",0x81CA],
- ["C499",0x81CB],
- ["EBFB",0x81CC],
- ["C49A",0x81CD],
- ["C49B",0x81CE],
- ["C49C",0x81CF],
- ["C49D",0x81D0],
- ["C49E",0x81D1],
- ["C49F",0x81D2],
- ["C4A0",0x81D3],
- ["C540",0x81D4],
- ["C541",0x81D5],
- ["C542",0x81D6],
- ["C543",0x81D7],
- ["C544",0x81D8],
- ["C545",0x81D9],
- ["C546",0x81DA],
- ["C547",0x81DB],
- ["C548",0x81DC],
- ["C549",0x81DD],
- ["C54A",0x81DE],
- ["C54B",0x81DF],
- ["C54C",0x81E0],
- ["C54D",0x81E1],
- ["C54E",0x81E2],
- ["B3BC",0x81E3],
- ["C54F",0x81E4],
- ["C550",0x81E5],
- ["C551",0x81E6],
- ["EAB0",0x81E7],
- ["C552",0x81E8],
- ["C553",0x81E9],
- ["D7D4",0x81EA],
- ["C554",0x81EB],
- ["F4AB",0x81EC],
- ["B3F4",0x81ED],
- ["C555",0x81EE],
- ["C556",0x81EF],
- ["C557",0x81F0],
- ["C558",0x81F1],
- ["C559",0x81F2],
- ["D6C1",0x81F3],
- ["D6C2",0x81F4],
- ["C55A",0x81F5],
- ["C55B",0x81F6],
- ["C55C",0x81F7],
- ["C55D",0x81F8],
- ["C55E",0x81F9],
- ["C55F",0x81FA],
- ["D5E9",0x81FB],
- ["BECA",0x81FC],
- ["C560",0x81FD],
- ["F4A7",0x81FE],
- ["C561",0x81FF],
- ["D2A8",0x8200],
- ["F4A8",0x8201],
- ["F4A9",0x8202],
- ["C562",0x8203],
- ["F4AA",0x8204],
- ["BECB",0x8205],
- ["D3DF",0x8206],
- ["C563",0x8207],
- ["C564",0x8208],
- ["C565",0x8209],
- ["C566",0x820A],
- ["C567",0x820B],
- ["C9E0",0x820C],
- ["C9E1",0x820D],
- ["C568",0x820E],
- ["C569",0x820F],
- ["F3C2",0x8210],
- ["C56A",0x8211],
- ["CAE6",0x8212],
- ["C56B",0x8213],
- ["CCF2",0x8214],
- ["C56C",0x8215],
- ["C56D",0x8216],
- ["C56E",0x8217],
- ["C56F",0x8218],
- ["C570",0x8219],
- ["C571",0x821A],
- ["E2B6",0x821B],
- ["CBB4",0x821C],
- ["C572",0x821D],
- ["CEE8",0x821E],
- ["D6DB",0x821F],
- ["C573",0x8220],
- ["F4AD",0x8221],
- ["F4AE",0x8222],
- ["F4AF",0x8223],
- ["C574",0x8224],
- ["C575",0x8225],
- ["C576",0x8226],
- ["C577",0x8227],
- ["F4B2",0x8228],
- ["C578",0x8229],
- ["BABD",0x822A],
- ["F4B3",0x822B],
- ["B0E3",0x822C],
- ["F4B0",0x822D],
- ["C579",0x822E],
- ["F4B1",0x822F],
- ["BDA2",0x8230],
- ["B2D5",0x8231],
- ["C57A",0x8232],
- ["F4B6",0x8233],
- ["F4B7",0x8234],
- ["B6E6",0x8235],
- ["B2B0",0x8236],
- ["CFCF",0x8237],
- ["F4B4",0x8238],
- ["B4AC",0x8239],
- ["C57B",0x823A],
- ["F4B5",0x823B],
- ["C57C",0x823C],
- ["C57D",0x823D],
- ["F4B8",0x823E],
- ["C57E",0x823F],
- ["C580",0x8240],
- ["C581",0x8241],
- ["C582",0x8242],
- ["C583",0x8243],
- ["F4B9",0x8244],
- ["C584",0x8245],
- ["C585",0x8246],
- ["CDA7",0x8247],
- ["C586",0x8248],
- ["F4BA",0x8249],
- ["C587",0x824A],
- ["F4BB",0x824B],
- ["C588",0x824C],
- ["C589",0x824D],
- ["C58A",0x824E],
- ["F4BC",0x824F],
- ["C58B",0x8250],
- ["C58C",0x8251],
- ["C58D",0x8252],
- ["C58E",0x8253],
- ["C58F",0x8254],
- ["C590",0x8255],
- ["C591",0x8256],
- ["C592",0x8257],
- ["CBD2",0x8258],
- ["C593",0x8259],
- ["F4BD",0x825A],
- ["C594",0x825B],
- ["C595",0x825C],
- ["C596",0x825D],
- ["C597",0x825E],
- ["F4BE",0x825F],
- ["C598",0x8260],
- ["C599",0x8261],
- ["C59A",0x8262],
- ["C59B",0x8263],
- ["C59C",0x8264],
- ["C59D",0x8265],
- ["C59E",0x8266],
- ["C59F",0x8267],
- ["F4BF",0x8268],
- ["C5A0",0x8269],
- ["C640",0x826A],
- ["C641",0x826B],
- ["C642",0x826C],
- ["C643",0x826D],
- ["F4DE",0x826E],
- ["C1BC",0x826F],
- ["BCE8",0x8270],
- ["C644",0x8271],
- ["C9AB",0x8272],
- ["D1DE",0x8273],
- ["E5F5",0x8274],
- ["C645",0x8275],
- ["C646",0x8276],
- ["C647",0x8277],
- ["C648",0x8278],
- ["DCB3",0x8279],
- ["D2D5",0x827A],
- ["C649",0x827B],
- ["C64A",0x827C],
- ["DCB4",0x827D],
- ["B0AC",0x827E],
- ["DCB5",0x827F],
- ["C64B",0x8280],
- ["C64C",0x8281],
- ["BDDA",0x8282],
- ["C64D",0x8283],
- ["DCB9",0x8284],
- ["C64E",0x8285],
- ["C64F",0x8286],
- ["C650",0x8287],
- ["D8C2",0x8288],
- ["C651",0x8289],
- ["DCB7",0x828A],
- ["D3F3",0x828B],
- ["C652",0x828C],
- ["C9D6",0x828D],
- ["DCBA",0x828E],
- ["DCB6",0x828F],
- ["C653",0x8290],
- ["DCBB",0x8291],
- ["C3A2",0x8292],
- ["C654",0x8293],
- ["C655",0x8294],
- ["C656",0x8295],
- ["C657",0x8296],
- ["DCBC",0x8297],
- ["DCC5",0x8298],
- ["DCBD",0x8299],
- ["C658",0x829A],
- ["C659",0x829B],
- ["CEDF",0x829C],
- ["D6A5",0x829D],
- ["C65A",0x829E],
- ["DCCF",0x829F],
- ["C65B",0x82A0],
- ["DCCD",0x82A1],
- ["C65C",0x82A2],
- ["C65D",0x82A3],
- ["DCD2",0x82A4],
- ["BDE6",0x82A5],
- ["C2AB",0x82A6],
- ["C65E",0x82A7],
- ["DCB8",0x82A8],
- ["DCCB",0x82A9],
- ["DCCE",0x82AA],
- ["DCBE",0x82AB],
- ["B7D2",0x82AC],
- ["B0C5",0x82AD],
- ["DCC7",0x82AE],
- ["D0BE",0x82AF],
- ["DCC1",0x82B0],
- ["BBA8",0x82B1],
- ["C65F",0x82B2],
- ["B7BC",0x82B3],
- ["DCCC",0x82B4],
- ["C660",0x82B5],
- ["C661",0x82B6],
- ["DCC6",0x82B7],
- ["DCBF",0x82B8],
- ["C7DB",0x82B9],
- ["C662",0x82BA],
- ["C663",0x82BB],
- ["C664",0x82BC],
- ["D1BF",0x82BD],
- ["DCC0",0x82BE],
- ["C665",0x82BF],
- ["C666",0x82C0],
- ["DCCA",0x82C1],
- ["C667",0x82C2],
- ["C668",0x82C3],
- ["DCD0",0x82C4],
- ["C669",0x82C5],
- ["C66A",0x82C6],
- ["CEAD",0x82C7],
- ["DCC2",0x82C8],
- ["C66B",0x82C9],
- ["DCC3",0x82CA],
- ["DCC8",0x82CB],
- ["DCC9",0x82CC],
- ["B2D4",0x82CD],
- ["DCD1",0x82CE],
- ["CBD5",0x82CF],
- ["C66C",0x82D0],
- ["D4B7",0x82D1],
- ["DCDB",0x82D2],
- ["DCDF",0x82D3],
- ["CCA6",0x82D4],
- ["DCE6",0x82D5],
- ["C66D",0x82D6],
- ["C3E7",0x82D7],
- ["DCDC",0x82D8],
- ["C66E",0x82D9],
- ["C66F",0x82DA],
- ["BFC1",0x82DB],
- ["DCD9",0x82DC],
- ["C670",0x82DD],
- ["B0FA",0x82DE],
- ["B9B6",0x82DF],
- ["DCE5",0x82E0],
- ["DCD3",0x82E1],
- ["C671",0x82E2],
- ["DCC4",0x82E3],
- ["DCD6",0x82E4],
- ["C8F4",0x82E5],
- ["BFE0",0x82E6],
- ["C672",0x82E7],
- ["C673",0x82E8],
- ["C674",0x82E9],
- ["C675",0x82EA],
- ["C9BB",0x82EB],
- ["C676",0x82EC],
- ["C677",0x82ED],
- ["C678",0x82EE],
- ["B1BD",0x82EF],
- ["C679",0x82F0],
- ["D3A2",0x82F1],
- ["C67A",0x82F2],
- ["C67B",0x82F3],
- ["DCDA",0x82F4],
- ["C67C",0x82F5],
- ["C67D",0x82F6],
- ["DCD5",0x82F7],
- ["C67E",0x82F8],
- ["C6BB",0x82F9],
- ["C680",0x82FA],
- ["DCDE",0x82FB],
- ["C681",0x82FC],
- ["C682",0x82FD],
- ["C683",0x82FE],
- ["C684",0x82FF],
- ["C685",0x8300],
- ["D7C2",0x8301],
- ["C3AF",0x8302],
- ["B7B6",0x8303],
- ["C7D1",0x8304],
- ["C3A9",0x8305],
- ["DCE2",0x8306],
- ["DCD8",0x8307],
- ["DCEB",0x8308],
- ["DCD4",0x8309],
- ["C686",0x830A],
- ["C687",0x830B],
- ["DCDD",0x830C],
- ["C688",0x830D],
- ["BEA5",0x830E],
- ["DCD7",0x830F],
- ["C689",0x8310],
- ["DCE0",0x8311],
- ["C68A",0x8312],
- ["C68B",0x8313],
- ["DCE3",0x8314],
- ["DCE4",0x8315],
- ["C68C",0x8316],
- ["DCF8",0x8317],
- ["C68D",0x8318],
- ["C68E",0x8319],
- ["DCE1",0x831A],
- ["DDA2",0x831B],
- ["DCE7",0x831C],
- ["C68F",0x831D],
- ["C690",0x831E],
- ["C691",0x831F],
- ["C692",0x8320],
- ["C693",0x8321],
- ["C694",0x8322],
- ["C695",0x8323],
- ["C696",0x8324],
- ["C697",0x8325],
- ["C698",0x8326],
- ["BCEB",0x8327],
- ["B4C4",0x8328],
- ["C699",0x8329],
- ["C69A",0x832A],
- ["C3A3",0x832B],
- ["B2E7",0x832C],
- ["DCFA",0x832D],
- ["C69B",0x832E],
- ["DCF2",0x832F],
- ["C69C",0x8330],
- ["DCEF",0x8331],
- ["C69D",0x8332],
- ["DCFC",0x8333],
- ["DCEE",0x8334],
- ["D2F0",0x8335],
- ["B2E8",0x8336],
- ["C69E",0x8337],
- ["C8D7",0x8338],
- ["C8E3",0x8339],
- ["DCFB",0x833A],
- ["C69F",0x833B],
- ["DCED",0x833C],
- ["C6A0",0x833D],
- ["C740",0x833E],
- ["C741",0x833F],
- ["DCF7",0x8340],
- ["C742",0x8341],
- ["C743",0x8342],
- ["DCF5",0x8343],
- ["C744",0x8344],
- ["C745",0x8345],
- ["BEA3",0x8346],
- ["DCF4",0x8347],
- ["C746",0x8348],
- ["B2DD",0x8349],
- ["C747",0x834A],
- ["C748",0x834B],
- ["C749",0x834C],
- ["C74A",0x834D],
- ["C74B",0x834E],
- ["DCF3",0x834F],
- ["BCF6",0x8350],
- ["DCE8",0x8351],
- ["BBC4",0x8352],
- ["C74C",0x8353],
- ["C0F3",0x8354],
- ["C74D",0x8355],
- ["C74E",0x8356],
- ["C74F",0x8357],
- ["C750",0x8358],
- ["C751",0x8359],
- ["BCD4",0x835A],
- ["DCE9",0x835B],
- ["DCEA",0x835C],
- ["C752",0x835D],
- ["DCF1",0x835E],
- ["DCF6",0x835F],
- ["DCF9",0x8360],
- ["B5B4",0x8361],
- ["C753",0x8362],
- ["C8D9",0x8363],
- ["BBE7",0x8364],
- ["DCFE",0x8365],
- ["DCFD",0x8366],
- ["D3AB",0x8367],
- ["DDA1",0x8368],
- ["DDA3",0x8369],
- ["DDA5",0x836A],
- ["D2F1",0x836B],
- ["DDA4",0x836C],
- ["DDA6",0x836D],
- ["DDA7",0x836E],
- ["D2A9",0x836F],
- ["C754",0x8370],
- ["C755",0x8371],
- ["C756",0x8372],
- ["C757",0x8373],
- ["C758",0x8374],
- ["C759",0x8375],
- ["C75A",0x8376],
- ["BAC9",0x8377],
- ["DDA9",0x8378],
- ["C75B",0x8379],
- ["C75C",0x837A],
- ["DDB6",0x837B],
- ["DDB1",0x837C],
- ["DDB4",0x837D],
- ["C75D",0x837E],
- ["C75E",0x837F],
- ["C75F",0x8380],
- ["C760",0x8381],
- ["C761",0x8382],
- ["C762",0x8383],
- ["C763",0x8384],
- ["DDB0",0x8385],
- ["C6CE",0x8386],
- ["C764",0x8387],
- ["C765",0x8388],
- ["C0F2",0x8389],
- ["C766",0x838A],
- ["C767",0x838B],
- ["C768",0x838C],
- ["C769",0x838D],
- ["C9AF",0x838E],
- ["C76A",0x838F],
- ["C76B",0x8390],
- ["C76C",0x8391],
- ["DCEC",0x8392],
- ["DDAE",0x8393],
- ["C76D",0x8394],
- ["C76E",0x8395],
- ["C76F",0x8396],
- ["C770",0x8397],
- ["DDB7",0x8398],
- ["C771",0x8399],
- ["C772",0x839A],
- ["DCF0",0x839B],
- ["DDAF",0x839C],
- ["C773",0x839D],
- ["DDB8",0x839E],
- ["C774",0x839F],
- ["DDAC",0x83A0],
- ["C775",0x83A1],
- ["C776",0x83A2],
- ["C777",0x83A3],
- ["C778",0x83A4],
- ["C779",0x83A5],
- ["C77A",0x83A6],
- ["C77B",0x83A7],
- ["DDB9",0x83A8],
- ["DDB3",0x83A9],
- ["DDAD",0x83AA],
- ["C4AA",0x83AB],
- ["C77C",0x83AC],
- ["C77D",0x83AD],
- ["C77E",0x83AE],
- ["C780",0x83AF],
- ["DDA8",0x83B0],
- ["C0B3",0x83B1],
- ["C1AB",0x83B2],
- ["DDAA",0x83B3],
- ["DDAB",0x83B4],
- ["C781",0x83B5],
- ["DDB2",0x83B6],
- ["BBF1",0x83B7],
- ["DDB5",0x83B8],
- ["D3A8",0x83B9],
- ["DDBA",0x83BA],
- ["C782",0x83BB],
- ["DDBB",0x83BC],
- ["C3A7",0x83BD],
- ["C783",0x83BE],
- ["C784",0x83BF],
- ["DDD2",0x83C0],
- ["DDBC",0x83C1],
- ["C785",0x83C2],
- ["C786",0x83C3],
- ["C787",0x83C4],
- ["DDD1",0x83C5],
- ["C788",0x83C6],
- ["B9BD",0x83C7],
- ["C789",0x83C8],
- ["C78A",0x83C9],
- ["BED5",0x83CA],
- ["C78B",0x83CB],
- ["BEFA",0x83CC],
- ["C78C",0x83CD],
- ["C78D",0x83CE],
- ["BACA",0x83CF],
- ["C78E",0x83D0],
- ["C78F",0x83D1],
- ["C790",0x83D2],
- ["C791",0x83D3],
- ["DDCA",0x83D4],
- ["C792",0x83D5],
- ["DDC5",0x83D6],
- ["C793",0x83D7],
- ["DDBF",0x83D8],
- ["C794",0x83D9],
- ["C795",0x83DA],
- ["C796",0x83DB],
- ["B2CB",0x83DC],
- ["DDC3",0x83DD],
- ["C797",0x83DE],
- ["DDCB",0x83DF],
- ["B2A4",0x83E0],
- ["DDD5",0x83E1],
- ["C798",0x83E2],
- ["C799",0x83E3],
- ["C79A",0x83E4],
- ["DDBE",0x83E5],
- ["C79B",0x83E6],
- ["C79C",0x83E7],
- ["C79D",0x83E8],
- ["C6D0",0x83E9],
- ["DDD0",0x83EA],
- ["C79E",0x83EB],
- ["C79F",0x83EC],
- ["C7A0",0x83ED],
- ["C840",0x83EE],
- ["C841",0x83EF],
- ["DDD4",0x83F0],
- ["C1E2",0x83F1],
- ["B7C6",0x83F2],
- ["C842",0x83F3],
- ["C843",0x83F4],
- ["C844",0x83F5],
- ["C845",0x83F6],
- ["C846",0x83F7],
- ["DDCE",0x83F8],
- ["DDCF",0x83F9],
- ["C847",0x83FA],
- ["C848",0x83FB],
- ["C849",0x83FC],
- ["DDC4",0x83FD],
- ["C84A",0x83FE],
- ["C84B",0x83FF],
- ["C84C",0x8400],
- ["DDBD",0x8401],
- ["C84D",0x8402],
- ["DDCD",0x8403],
- ["CCD1",0x8404],
- ["C84E",0x8405],
- ["DDC9",0x8406],
- ["C84F",0x8407],
- ["C850",0x8408],
- ["C851",0x8409],
- ["C852",0x840A],
- ["DDC2",0x840B],
- ["C3C8",0x840C],
- ["C6BC",0x840D],
- ["CEAE",0x840E],
- ["DDCC",0x840F],
- ["C853",0x8410],
- ["DDC8",0x8411],
- ["C854",0x8412],
- ["C855",0x8413],
- ["C856",0x8414],
- ["C857",0x8415],
- ["C858",0x8416],
- ["C859",0x8417],
- ["DDC1",0x8418],
- ["C85A",0x8419],
- ["C85B",0x841A],
- ["C85C",0x841B],
- ["DDC6",0x841C],
- ["C2DC",0x841D],
- ["C85D",0x841E],
- ["C85E",0x841F],
- ["C85F",0x8420],
- ["C860",0x8421],
- ["C861",0x8422],
- ["C862",0x8423],
- ["D3A9",0x8424],
- ["D3AA",0x8425],
- ["DDD3",0x8426],
- ["CFF4",0x8427],
- ["C8F8",0x8428],
- ["C863",0x8429],
- ["C864",0x842A],
- ["C865",0x842B],
- ["C866",0x842C],
- ["C867",0x842D],
- ["C868",0x842E],
- ["C869",0x842F],
- ["C86A",0x8430],
- ["DDE6",0x8431],
- ["C86B",0x8432],
- ["C86C",0x8433],
- ["C86D",0x8434],
- ["C86E",0x8435],
- ["C86F",0x8436],
- ["C870",0x8437],
- ["DDC7",0x8438],
- ["C871",0x8439],
- ["C872",0x843A],
- ["C873",0x843B],
- ["DDE0",0x843C],
- ["C2E4",0x843D],
- ["C874",0x843E],
- ["C875",0x843F],
- ["C876",0x8440],
- ["C877",0x8441],
- ["C878",0x8442],
- ["C879",0x8443],
- ["C87A",0x8444],
- ["C87B",0x8445],
- ["DDE1",0x8446],
- ["C87C",0x8447],
- ["C87D",0x8448],
- ["C87E",0x8449],
- ["C880",0x844A],
- ["C881",0x844B],
- ["C882",0x844C],
- ["C883",0x844D],
- ["C884",0x844E],
- ["C885",0x844F],
- ["C886",0x8450],
- ["DDD7",0x8451],
- ["C887",0x8452],
- ["C888",0x8453],
- ["C889",0x8454],
- ["C88A",0x8455],
- ["C88B",0x8456],
- ["D6F8",0x8457],
- ["C88C",0x8458],
- ["DDD9",0x8459],
- ["DDD8",0x845A],
- ["B8F0",0x845B],
- ["DDD6",0x845C],
- ["C88D",0x845D],
- ["C88E",0x845E],
- ["C88F",0x845F],
- ["C890",0x8460],
- ["C6CF",0x8461],
- ["C891",0x8462],
- ["B6AD",0x8463],
- ["C892",0x8464],
- ["C893",0x8465],
- ["C894",0x8466],
- ["C895",0x8467],
- ["C896",0x8468],
- ["DDE2",0x8469],
- ["C897",0x846A],
- ["BAF9",0x846B],
- ["D4E1",0x846C],
- ["DDE7",0x846D],
- ["C898",0x846E],
- ["C899",0x846F],
- ["C89A",0x8470],
- ["B4D0",0x8471],
- ["C89B",0x8472],
- ["DDDA",0x8473],
- ["C89C",0x8474],
- ["BFFB",0x8475],
- ["DDE3",0x8476],
- ["C89D",0x8477],
- ["DDDF",0x8478],
- ["C89E",0x8479],
- ["DDDD",0x847A],
- ["C89F",0x847B],
- ["C8A0",0x847C],
- ["C940",0x847D],
- ["C941",0x847E],
- ["C942",0x847F],
- ["C943",0x8480],
- ["C944",0x8481],
- ["B5D9",0x8482],
- ["C945",0x8483],
- ["C946",0x8484],
- ["C947",0x8485],
- ["C948",0x8486],
- ["DDDB",0x8487],
- ["DDDC",0x8488],
- ["DDDE",0x8489],
- ["C949",0x848A],
- ["BDAF",0x848B],
- ["DDE4",0x848C],
- ["C94A",0x848D],
- ["DDE5",0x848E],
- ["C94B",0x848F],
- ["C94C",0x8490],
- ["C94D",0x8491],
- ["C94E",0x8492],
- ["C94F",0x8493],
- ["C950",0x8494],
- ["C951",0x8495],
- ["C952",0x8496],
- ["DDF5",0x8497],
- ["C953",0x8498],
- ["C3C9",0x8499],
- ["C954",0x849A],
- ["C955",0x849B],
- ["CBE2",0x849C],
- ["C956",0x849D],
- ["C957",0x849E],
- ["C958",0x849F],
- ["C959",0x84A0],
- ["DDF2",0x84A1],
- ["C95A",0x84A2],
- ["C95B",0x84A3],
- ["C95C",0x84A4],
- ["C95D",0x84A5],
- ["C95E",0x84A6],
- ["C95F",0x84A7],
- ["C960",0x84A8],
- ["C961",0x84A9],
- ["C962",0x84AA],
- ["C963",0x84AB],
- ["C964",0x84AC],
- ["C965",0x84AD],
- ["C966",0x84AE],
- ["D8E1",0x84AF],
- ["C967",0x84B0],
- ["C968",0x84B1],
- ["C6D1",0x84B2],
- ["C969",0x84B3],
- ["DDF4",0x84B4],
- ["C96A",0x84B5],
- ["C96B",0x84B6],
- ["C96C",0x84B7],
- ["D5F4",0x84B8],
- ["DDF3",0x84B9],
- ["DDF0",0x84BA],
- ["C96D",0x84BB],
- ["C96E",0x84BC],
- ["DDEC",0x84BD],
- ["C96F",0x84BE],
- ["DDEF",0x84BF],
- ["C970",0x84C0],
- ["DDE8",0x84C1],
- ["C971",0x84C2],
- ["C972",0x84C3],
- ["D0EE",0x84C4],
- ["C973",0x84C5],
- ["C974",0x84C6],
- ["C975",0x84C7],
- ["C976",0x84C8],
- ["C8D8",0x84C9],
- ["DDEE",0x84CA],
- ["C977",0x84CB],
- ["C978",0x84CC],
- ["DDE9",0x84CD],
- ["C979",0x84CE],
- ["C97A",0x84CF],
- ["DDEA",0x84D0],
- ["CBF2",0x84D1],
- ["C97B",0x84D2],
- ["DDED",0x84D3],
- ["C97C",0x84D4],
- ["C97D",0x84D5],
- ["B1CD",0x84D6],
- ["C97E",0x84D7],
- ["C980",0x84D8],
- ["C981",0x84D9],
- ["C982",0x84DA],
- ["C983",0x84DB],
- ["C984",0x84DC],
- ["C0B6",0x84DD],
- ["C985",0x84DE],
- ["BCBB",0x84DF],
- ["DDF1",0x84E0],
- ["C986",0x84E1],
- ["C987",0x84E2],
- ["DDF7",0x84E3],
- ["C988",0x84E4],
- ["DDF6",0x84E5],
- ["DDEB",0x84E6],
- ["C989",0x84E7],
- ["C98A",0x84E8],
- ["C98B",0x84E9],
- ["C98C",0x84EA],
- ["C98D",0x84EB],
- ["C5EE",0x84EC],
- ["C98E",0x84ED],
- ["C98F",0x84EE],
- ["C990",0x84EF],
- ["DDFB",0x84F0],
- ["C991",0x84F1],
- ["C992",0x84F2],
- ["C993",0x84F3],
- ["C994",0x84F4],
- ["C995",0x84F5],
- ["C996",0x84F6],
- ["C997",0x84F7],
- ["C998",0x84F8],
- ["C999",0x84F9],
- ["C99A",0x84FA],
- ["C99B",0x84FB],
- ["DEA4",0x84FC],
- ["C99C",0x84FD],
- ["C99D",0x84FE],
- ["DEA3",0x84FF],
- ["C99E",0x8500],
- ["C99F",0x8501],
- ["C9A0",0x8502],
- ["CA40",0x8503],
- ["CA41",0x8504],
- ["CA42",0x8505],
- ["CA43",0x8506],
- ["CA44",0x8507],
- ["CA45",0x8508],
- ["CA46",0x8509],
- ["CA47",0x850A],
- ["CA48",0x850B],
- ["DDF8",0x850C],
- ["CA49",0x850D],
- ["CA4A",0x850E],
- ["CA4B",0x850F],
- ["CA4C",0x8510],
- ["C3EF",0x8511],
- ["CA4D",0x8512],
- ["C2FB",0x8513],
- ["CA4E",0x8514],
- ["CA4F",0x8515],
- ["CA50",0x8516],
- ["D5E1",0x8517],
- ["CA51",0x8518],
- ["CA52",0x8519],
- ["CEB5",0x851A],
- ["CA53",0x851B],
- ["CA54",0x851C],
- ["CA55",0x851D],
- ["CA56",0x851E],
- ["DDFD",0x851F],
- ["CA57",0x8520],
- ["B2CC",0x8521],
- ["CA58",0x8522],
- ["CA59",0x8523],
- ["CA5A",0x8524],
- ["CA5B",0x8525],
- ["CA5C",0x8526],
- ["CA5D",0x8527],
- ["CA5E",0x8528],
- ["CA5F",0x8529],
- ["CA60",0x852A],
- ["C4E8",0x852B],
- ["CADF",0x852C],
- ["CA61",0x852D],
- ["CA62",0x852E],
- ["CA63",0x852F],
- ["CA64",0x8530],
- ["CA65",0x8531],
- ["CA66",0x8532],
- ["CA67",0x8533],
- ["CA68",0x8534],
- ["CA69",0x8535],
- ["CA6A",0x8536],
- ["C7BE",0x8537],
- ["DDFA",0x8538],
- ["DDFC",0x8539],
- ["DDFE",0x853A],
- ["DEA2",0x853B],
- ["B0AA",0x853C],
- ["B1CE",0x853D],
- ["CA6B",0x853E],
- ["CA6C",0x853F],
- ["CA6D",0x8540],
- ["CA6E",0x8541],
- ["CA6F",0x8542],
- ["DEAC",0x8543],
- ["CA70",0x8544],
- ["CA71",0x8545],
- ["CA72",0x8546],
- ["CA73",0x8547],
- ["DEA6",0x8548],
- ["BDB6",0x8549],
- ["C8EF",0x854A],
- ["CA74",0x854B],
- ["CA75",0x854C],
- ["CA76",0x854D],
- ["CA77",0x854E],
- ["CA78",0x854F],
- ["CA79",0x8550],
- ["CA7A",0x8551],
- ["CA7B",0x8552],
- ["CA7C",0x8553],
- ["CA7D",0x8554],
- ["CA7E",0x8555],
- ["DEA1",0x8556],
- ["CA80",0x8557],
- ["CA81",0x8558],
- ["DEA5",0x8559],
- ["CA82",0x855A],
- ["CA83",0x855B],
- ["CA84",0x855C],
- ["CA85",0x855D],
- ["DEA9",0x855E],
- ["CA86",0x855F],
- ["CA87",0x8560],
- ["CA88",0x8561],
- ["CA89",0x8562],
- ["CA8A",0x8563],
- ["DEA8",0x8564],
- ["CA8B",0x8565],
- ["CA8C",0x8566],
- ["CA8D",0x8567],
- ["DEA7",0x8568],
- ["CA8E",0x8569],
- ["CA8F",0x856A],
- ["CA90",0x856B],
- ["CA91",0x856C],
- ["CA92",0x856D],
- ["CA93",0x856E],
- ["CA94",0x856F],
- ["CA95",0x8570],
- ["CA96",0x8571],
- ["DEAD",0x8572],
- ["CA97",0x8573],
- ["D4CC",0x8574],
- ["CA98",0x8575],
- ["CA99",0x8576],
- ["CA9A",0x8577],
- ["CA9B",0x8578],
- ["DEB3",0x8579],
- ["DEAA",0x857A],
- ["DEAE",0x857B],
- ["CA9C",0x857C],
- ["CA9D",0x857D],
- ["C0D9",0x857E],
- ["CA9E",0x857F],
- ["CA9F",0x8580],
- ["CAA0",0x8581],
- ["CB40",0x8582],
- ["CB41",0x8583],
- ["B1A1",0x8584],
- ["DEB6",0x8585],
- ["CB42",0x8586],
- ["DEB1",0x8587],
- ["CB43",0x8588],
- ["CB44",0x8589],
- ["CB45",0x858A],
- ["CB46",0x858B],
- ["CB47",0x858C],
- ["CB48",0x858D],
- ["CB49",0x858E],
- ["DEB2",0x858F],
- ["CB4A",0x8590],
- ["CB4B",0x8591],
- ["CB4C",0x8592],
- ["CB4D",0x8593],
- ["CB4E",0x8594],
- ["CB4F",0x8595],
- ["CB50",0x8596],
- ["CB51",0x8597],
- ["CB52",0x8598],
- ["CB53",0x8599],
- ["CB54",0x859A],
- ["D1A6",0x859B],
- ["DEB5",0x859C],
- ["CB55",0x859D],
- ["CB56",0x859E],
- ["CB57",0x859F],
- ["CB58",0x85A0],
- ["CB59",0x85A1],
- ["CB5A",0x85A2],
- ["CB5B",0x85A3],
- ["DEAF",0x85A4],
- ["CB5C",0x85A5],
- ["CB5D",0x85A6],
- ["CB5E",0x85A7],
- ["DEB0",0x85A8],
- ["CB5F",0x85A9],
- ["D0BD",0x85AA],
- ["CB60",0x85AB],
- ["CB61",0x85AC],
- ["CB62",0x85AD],
- ["DEB4",0x85AE],
- ["CAED",0x85AF],
- ["DEB9",0x85B0],
- ["CB63",0x85B1],
- ["CB64",0x85B2],
- ["CB65",0x85B3],
- ["CB66",0x85B4],
- ["CB67",0x85B5],
- ["CB68",0x85B6],
- ["DEB8",0x85B7],
- ["CB69",0x85B8],
- ["DEB7",0x85B9],
- ["CB6A",0x85BA],
- ["CB6B",0x85BB],
- ["CB6C",0x85BC],
- ["CB6D",0x85BD],
- ["CB6E",0x85BE],
- ["CB6F",0x85BF],
- ["CB70",0x85C0],
- ["DEBB",0x85C1],
- ["CB71",0x85C2],
- ["CB72",0x85C3],
- ["CB73",0x85C4],
- ["CB74",0x85C5],
- ["CB75",0x85C6],
- ["CB76",0x85C7],
- ["CB77",0x85C8],
- ["BDE5",0x85C9],
- ["CB78",0x85CA],
- ["CB79",0x85CB],
- ["CB7A",0x85CC],
- ["CB7B",0x85CD],
- ["CB7C",0x85CE],
- ["B2D8",0x85CF],
- ["C3EA",0x85D0],
- ["CB7D",0x85D1],
- ["CB7E",0x85D2],
- ["DEBA",0x85D3],
- ["CB80",0x85D4],
- ["C5BA",0x85D5],
- ["CB81",0x85D6],
- ["CB82",0x85D7],
- ["CB83",0x85D8],
- ["CB84",0x85D9],
- ["CB85",0x85DA],
- ["CB86",0x85DB],
- ["DEBC",0x85DC],
- ["CB87",0x85DD],
- ["CB88",0x85DE],
- ["CB89",0x85DF],
- ["CB8A",0x85E0],
- ["CB8B",0x85E1],
- ["CB8C",0x85E2],
- ["CB8D",0x85E3],
- ["CCD9",0x85E4],
- ["CB8E",0x85E5],
- ["CB8F",0x85E6],
- ["CB90",0x85E7],
- ["CB91",0x85E8],
- ["B7AA",0x85E9],
- ["CB92",0x85EA],
- ["CB93",0x85EB],
- ["CB94",0x85EC],
- ["CB95",0x85ED],
- ["CB96",0x85EE],
- ["CB97",0x85EF],
- ["CB98",0x85F0],
- ["CB99",0x85F1],
- ["CB9A",0x85F2],
- ["CB9B",0x85F3],
- ["CB9C",0x85F4],
- ["CB9D",0x85F5],
- ["CB9E",0x85F6],
- ["CB9F",0x85F7],
- ["CBA0",0x85F8],
- ["CC40",0x85F9],
- ["CC41",0x85FA],
- ["D4E5",0x85FB],
- ["CC42",0x85FC],
- ["CC43",0x85FD],
- ["CC44",0x85FE],
- ["DEBD",0x85FF],
- ["CC45",0x8600],
- ["CC46",0x8601],
- ["CC47",0x8602],
- ["CC48",0x8603],
- ["CC49",0x8604],
- ["DEBF",0x8605],
- ["CC4A",0x8606],
- ["CC4B",0x8607],
- ["CC4C",0x8608],
- ["CC4D",0x8609],
- ["CC4E",0x860A],
- ["CC4F",0x860B],
- ["CC50",0x860C],
- ["CC51",0x860D],
- ["CC52",0x860E],
- ["CC53",0x860F],
- ["CC54",0x8610],
- ["C4A2",0x8611],
- ["CC55",0x8612],
- ["CC56",0x8613],
- ["CC57",0x8614],
- ["CC58",0x8615],
- ["DEC1",0x8616],
- ["CC59",0x8617],
- ["CC5A",0x8618],
- ["CC5B",0x8619],
- ["CC5C",0x861A],
- ["CC5D",0x861B],
- ["CC5E",0x861C],
- ["CC5F",0x861D],
- ["CC60",0x861E],
- ["CC61",0x861F],
- ["CC62",0x8620],
- ["CC63",0x8621],
- ["CC64",0x8622],
- ["CC65",0x8623],
- ["CC66",0x8624],
- ["CC67",0x8625],
- ["CC68",0x8626],
- ["DEBE",0x8627],
- ["CC69",0x8628],
- ["DEC0",0x8629],
- ["CC6A",0x862A],
- ["CC6B",0x862B],
- ["CC6C",0x862C],
- ["CC6D",0x862D],
- ["CC6E",0x862E],
- ["CC6F",0x862F],
- ["CC70",0x8630],
- ["CC71",0x8631],
- ["CC72",0x8632],
- ["CC73",0x8633],
- ["CC74",0x8634],
- ["CC75",0x8635],
- ["CC76",0x8636],
- ["CC77",0x8637],
- ["D5BA",0x8638],
- ["CC78",0x8639],
- ["CC79",0x863A],
- ["CC7A",0x863B],
- ["DEC2",0x863C],
- ["CC7B",0x863D],
- ["CC7C",0x863E],
- ["CC7D",0x863F],
- ["CC7E",0x8640],
- ["CC80",0x8641],
- ["CC81",0x8642],
- ["CC82",0x8643],
- ["CC83",0x8644],
- ["CC84",0x8645],
- ["CC85",0x8646],
- ["CC86",0x8647],
- ["CC87",0x8648],
- ["CC88",0x8649],
- ["CC89",0x864A],
- ["CC8A",0x864B],
- ["CC8B",0x864C],
- ["F2AE",0x864D],
- ["BBA2",0x864E],
- ["C2B2",0x864F],
- ["C5B0",0x8650],
- ["C2C7",0x8651],
- ["CC8C",0x8652],
- ["CC8D",0x8653],
- ["F2AF",0x8654],
- ["CC8E",0x8655],
- ["CC8F",0x8656],
- ["CC90",0x8657],
- ["CC91",0x8658],
- ["CC92",0x8659],
- ["D0E9",0x865A],
- ["CC93",0x865B],
- ["CC94",0x865C],
- ["CC95",0x865D],
- ["D3DD",0x865E],
- ["CC96",0x865F],
- ["CC97",0x8660],
- ["CC98",0x8661],
- ["EBBD",0x8662],
- ["CC99",0x8663],
- ["CC9A",0x8664],
- ["CC9B",0x8665],
- ["CC9C",0x8666],
- ["CC9D",0x8667],
- ["CC9E",0x8668],
- ["CC9F",0x8669],
- ["CCA0",0x866A],
- ["B3E6",0x866B],
- ["F2B0",0x866C],
- ["CD40",0x866D],
- ["F2B1",0x866E],
- ["CD41",0x866F],
- ["CD42",0x8670],
- ["CAAD",0x8671],
- ["CD43",0x8672],
- ["CD44",0x8673],
- ["CD45",0x8674],
- ["CD46",0x8675],
- ["CD47",0x8676],
- ["CD48",0x8677],
- ["CD49",0x8678],
- ["BAE7",0x8679],
- ["F2B3",0x867A],
- ["F2B5",0x867B],
- ["F2B4",0x867C],
- ["CBE4",0x867D],
- ["CFBA",0x867E],
- ["F2B2",0x867F],
- ["CAB4",0x8680],
- ["D2CF",0x8681],
- ["C2EC",0x8682],
- ["CD4A",0x8683],
- ["CD4B",0x8684],
- ["CD4C",0x8685],
- ["CD4D",0x8686],
- ["CD4E",0x8687],
- ["CD4F",0x8688],
- ["CD50",0x8689],
- ["CEC3",0x868A],
- ["F2B8",0x868B],
- ["B0F6",0x868C],
- ["F2B7",0x868D],
- ["CD51",0x868E],
- ["CD52",0x868F],
- ["CD53",0x8690],
- ["CD54",0x8691],
- ["CD55",0x8692],
- ["F2BE",0x8693],
- ["CD56",0x8694],
- ["B2CF",0x8695],
- ["CD57",0x8696],
- ["CD58",0x8697],
- ["CD59",0x8698],
- ["CD5A",0x8699],
- ["CD5B",0x869A],
- ["CD5C",0x869B],
- ["D1C1",0x869C],
- ["F2BA",0x869D],
- ["CD5D",0x869E],
- ["CD5E",0x869F],
- ["CD5F",0x86A0],
- ["CD60",0x86A1],
- ["CD61",0x86A2],
- ["F2BC",0x86A3],
- ["D4E9",0x86A4],
- ["CD62",0x86A5],
- ["CD63",0x86A6],
- ["F2BB",0x86A7],
- ["F2B6",0x86A8],
- ["F2BF",0x86A9],
- ["F2BD",0x86AA],
- ["CD64",0x86AB],
- ["F2B9",0x86AC],
- ["CD65",0x86AD],
- ["CD66",0x86AE],
- ["F2C7",0x86AF],
- ["F2C4",0x86B0],
- ["F2C6",0x86B1],
- ["CD67",0x86B2],
- ["CD68",0x86B3],
- ["F2CA",0x86B4],
- ["F2C2",0x86B5],
- ["F2C0",0x86B6],
- ["CD69",0x86B7],
- ["CD6A",0x86B8],
- ["CD6B",0x86B9],
- ["F2C5",0x86BA],
- ["CD6C",0x86BB],
- ["CD6D",0x86BC],
- ["CD6E",0x86BD],
- ["CD6F",0x86BE],
- ["CD70",0x86BF],
- ["D6FB",0x86C0],
- ["CD71",0x86C1],
- ["CD72",0x86C2],
- ["CD73",0x86C3],
- ["F2C1",0x86C4],
- ["CD74",0x86C5],
- ["C7F9",0x86C6],
- ["C9DF",0x86C7],
- ["CD75",0x86C8],
- ["F2C8",0x86C9],
- ["B9C6",0x86CA],
- ["B5B0",0x86CB],
- ["CD76",0x86CC],
- ["CD77",0x86CD],
- ["F2C3",0x86CE],
- ["F2C9",0x86CF],
- ["F2D0",0x86D0],
- ["F2D6",0x86D1],
- ["CD78",0x86D2],
- ["CD79",0x86D3],
- ["BBD7",0x86D4],
- ["CD7A",0x86D5],
- ["CD7B",0x86D6],
- ["CD7C",0x86D7],
- ["F2D5",0x86D8],
- ["CDDC",0x86D9],
- ["CD7D",0x86DA],
- ["D6EB",0x86DB],
- ["CD7E",0x86DC],
- ["CD80",0x86DD],
- ["F2D2",0x86DE],
- ["F2D4",0x86DF],
- ["CD81",0x86E0],
- ["CD82",0x86E1],
- ["CD83",0x86E2],
- ["CD84",0x86E3],
- ["B8F2",0x86E4],
- ["CD85",0x86E5],
- ["CD86",0x86E6],
- ["CD87",0x86E7],
- ["CD88",0x86E8],
- ["F2CB",0x86E9],
- ["CD89",0x86EA],
- ["CD8A",0x86EB],
- ["CD8B",0x86EC],
- ["F2CE",0x86ED],
- ["C2F9",0x86EE],
- ["CD8C",0x86EF],
- ["D5DD",0x86F0],
- ["F2CC",0x86F1],
- ["F2CD",0x86F2],
- ["F2CF",0x86F3],
- ["F2D3",0x86F4],
- ["CD8D",0x86F5],
- ["CD8E",0x86F6],
- ["CD8F",0x86F7],
- ["F2D9",0x86F8],
- ["D3BC",0x86F9],
- ["CD90",0x86FA],
- ["CD91",0x86FB],
- ["CD92",0x86FC],
- ["CD93",0x86FD],
- ["B6EA",0x86FE],
- ["CD94",0x86FF],
- ["CAF1",0x8700],
- ["CD95",0x8701],
- ["B7E4",0x8702],
- ["F2D7",0x8703],
- ["CD96",0x8704],
- ["CD97",0x8705],
- ["CD98",0x8706],
- ["F2D8",0x8707],
- ["F2DA",0x8708],
- ["F2DD",0x8709],
- ["F2DB",0x870A],
- ["CD99",0x870B],
- ["CD9A",0x870C],
- ["F2DC",0x870D],
- ["CD9B",0x870E],
- ["CD9C",0x870F],
- ["CD9D",0x8710],
- ["CD9E",0x8711],
- ["D1D1",0x8712],
- ["F2D1",0x8713],
- ["CD9F",0x8714],
- ["CDC9",0x8715],
- ["CDA0",0x8716],
- ["CECF",0x8717],
- ["D6A9",0x8718],
- ["CE40",0x8719],
- ["F2E3",0x871A],
- ["CE41",0x871B],
- ["C3DB",0x871C],
- ["CE42",0x871D],
- ["F2E0",0x871E],
- ["CE43",0x871F],
- ["CE44",0x8720],
- ["C0AF",0x8721],
- ["F2EC",0x8722],
- ["F2DE",0x8723],
- ["CE45",0x8724],
- ["F2E1",0x8725],
- ["CE46",0x8726],
- ["CE47",0x8727],
- ["CE48",0x8728],
- ["F2E8",0x8729],
- ["CE49",0x872A],
- ["CE4A",0x872B],
- ["CE4B",0x872C],
- ["CE4C",0x872D],
- ["F2E2",0x872E],
- ["CE4D",0x872F],
- ["CE4E",0x8730],
- ["F2E7",0x8731],
- ["CE4F",0x8732],
- ["CE50",0x8733],
- ["F2E6",0x8734],
- ["CE51",0x8735],
- ["CE52",0x8736],
- ["F2E9",0x8737],
- ["CE53",0x8738],
- ["CE54",0x8739],
- ["CE55",0x873A],
- ["F2DF",0x873B],
- ["CE56",0x873C],
- ["CE57",0x873D],
- ["F2E4",0x873E],
- ["F2EA",0x873F],
- ["CE58",0x8740],
- ["CE59",0x8741],
- ["CE5A",0x8742],
- ["CE5B",0x8743],
- ["CE5C",0x8744],
- ["CE5D",0x8745],
- ["CE5E",0x8746],
- ["D3AC",0x8747],
- ["F2E5",0x8748],
- ["B2F5",0x8749],
- ["CE5F",0x874A],
- ["CE60",0x874B],
- ["F2F2",0x874C],
- ["CE61",0x874D],
- ["D0AB",0x874E],
- ["CE62",0x874F],
- ["CE63",0x8750],
- ["CE64",0x8751],
- ["CE65",0x8752],
- ["F2F5",0x8753],
- ["CE66",0x8754],
- ["CE67",0x8755],
- ["CE68",0x8756],
- ["BBC8",0x8757],
- ["CE69",0x8758],
- ["F2F9",0x8759],
- ["CE6A",0x875A],
- ["CE6B",0x875B],
- ["CE6C",0x875C],
- ["CE6D",0x875D],
- ["CE6E",0x875E],
- ["CE6F",0x875F],
- ["F2F0",0x8760],
- ["CE70",0x8761],
- ["CE71",0x8762],
- ["F2F6",0x8763],
- ["F2F8",0x8764],
- ["F2FA",0x8765],
- ["CE72",0x8766],
- ["CE73",0x8767],
- ["CE74",0x8768],
- ["CE75",0x8769],
- ["CE76",0x876A],
- ["CE77",0x876B],
- ["CE78",0x876C],
- ["CE79",0x876D],
- ["F2F3",0x876E],
- ["CE7A",0x876F],
- ["F2F1",0x8770],
- ["CE7B",0x8771],
- ["CE7C",0x8772],
- ["CE7D",0x8773],
- ["BAFB",0x8774],
- ["CE7E",0x8775],
- ["B5FB",0x8776],
- ["CE80",0x8777],
- ["CE81",0x8778],
- ["CE82",0x8779],
- ["CE83",0x877A],
- ["F2EF",0x877B],
- ["F2F7",0x877C],
- ["F2ED",0x877D],
- ["F2EE",0x877E],
- ["CE84",0x877F],
- ["CE85",0x8780],
- ["CE86",0x8781],
- ["F2EB",0x8782],
- ["F3A6",0x8783],
- ["CE87",0x8784],
- ["F3A3",0x8785],
- ["CE88",0x8786],
- ["CE89",0x8787],
- ["F3A2",0x8788],
- ["CE8A",0x8789],
- ["CE8B",0x878A],
- ["F2F4",0x878B],
- ["CE8C",0x878C],
- ["C8DA",0x878D],
- ["CE8D",0x878E],
- ["CE8E",0x878F],
- ["CE8F",0x8790],
- ["CE90",0x8791],
- ["CE91",0x8792],
- ["F2FB",0x8793],
- ["CE92",0x8794],
- ["CE93",0x8795],
- ["CE94",0x8796],
- ["F3A5",0x8797],
- ["CE95",0x8798],
- ["CE96",0x8799],
- ["CE97",0x879A],
- ["CE98",0x879B],
- ["CE99",0x879C],
- ["CE9A",0x879D],
- ["CE9B",0x879E],
- ["C3F8",0x879F],
- ["CE9C",0x87A0],
- ["CE9D",0x87A1],
- ["CE9E",0x87A2],
- ["CE9F",0x87A3],
- ["CEA0",0x87A4],
- ["CF40",0x87A5],
- ["CF41",0x87A6],
- ["CF42",0x87A7],
- ["F2FD",0x87A8],
- ["CF43",0x87A9],
- ["CF44",0x87AA],
- ["F3A7",0x87AB],
- ["F3A9",0x87AC],
- ["F3A4",0x87AD],
- ["CF45",0x87AE],
- ["F2FC",0x87AF],
- ["CF46",0x87B0],
- ["CF47",0x87B1],
- ["CF48",0x87B2],
- ["F3AB",0x87B3],
- ["CF49",0x87B4],
- ["F3AA",0x87B5],
- ["CF4A",0x87B6],
- ["CF4B",0x87B7],
- ["CF4C",0x87B8],
- ["CF4D",0x87B9],
- ["C2DD",0x87BA],
- ["CF4E",0x87BB],
- ["CF4F",0x87BC],
- ["F3AE",0x87BD],
- ["CF50",0x87BE],
- ["CF51",0x87BF],
- ["F3B0",0x87C0],
- ["CF52",0x87C1],
- ["CF53",0x87C2],
- ["CF54",0x87C3],
- ["CF55",0x87C4],
- ["CF56",0x87C5],
- ["F3A1",0x87C6],
- ["CF57",0x87C7],
- ["CF58",0x87C8],
- ["CF59",0x87C9],
- ["F3B1",0x87CA],
- ["F3AC",0x87CB],
- ["CF5A",0x87CC],
- ["CF5B",0x87CD],
- ["CF5C",0x87CE],
- ["CF5D",0x87CF],
- ["CF5E",0x87D0],
- ["F3AF",0x87D1],
- ["F2FE",0x87D2],
- ["F3AD",0x87D3],
- ["CF5F",0x87D4],
- ["CF60",0x87D5],
- ["CF61",0x87D6],
- ["CF62",0x87D7],
- ["CF63",0x87D8],
- ["CF64",0x87D9],
- ["CF65",0x87DA],
- ["F3B2",0x87DB],
- ["CF66",0x87DC],
- ["CF67",0x87DD],
- ["CF68",0x87DE],
- ["CF69",0x87DF],
- ["F3B4",0x87E0],
- ["CF6A",0x87E1],
- ["CF6B",0x87E2],
- ["CF6C",0x87E3],
- ["CF6D",0x87E4],
- ["F3A8",0x87E5],
- ["CF6E",0x87E6],
- ["CF6F",0x87E7],
- ["CF70",0x87E8],
- ["CF71",0x87E9],
- ["F3B3",0x87EA],
- ["CF72",0x87EB],
- ["CF73",0x87EC],
- ["CF74",0x87ED],
- ["F3B5",0x87EE],
- ["CF75",0x87EF],
- ["CF76",0x87F0],
- ["CF77",0x87F1],
- ["CF78",0x87F2],
- ["CF79",0x87F3],
- ["CF7A",0x87F4],
- ["CF7B",0x87F5],
- ["CF7C",0x87F6],
- ["CF7D",0x87F7],
- ["CF7E",0x87F8],
- ["D0B7",0x87F9],
- ["CF80",0x87FA],
- ["CF81",0x87FB],
- ["CF82",0x87FC],
- ["CF83",0x87FD],
- ["F3B8",0x87FE],
- ["CF84",0x87FF],
- ["CF85",0x8800],
- ["CF86",0x8801],
- ["CF87",0x8802],
- ["D9F9",0x8803],
- ["CF88",0x8804],
- ["CF89",0x8805],
- ["CF8A",0x8806],
- ["CF8B",0x8807],
- ["CF8C",0x8808],
- ["CF8D",0x8809],
- ["F3B9",0x880A],
- ["CF8E",0x880B],
- ["CF8F",0x880C],
- ["CF90",0x880D],
- ["CF91",0x880E],
- ["CF92",0x880F],
- ["CF93",0x8810],
- ["CF94",0x8811],
- ["CF95",0x8812],
- ["F3B7",0x8813],
- ["CF96",0x8814],
- ["C8E4",0x8815],
- ["F3B6",0x8816],
- ["CF97",0x8817],
- ["CF98",0x8818],
- ["CF99",0x8819],
- ["CF9A",0x881A],
- ["F3BA",0x881B],
- ["CF9B",0x881C],
- ["CF9C",0x881D],
- ["CF9D",0x881E],
- ["CF9E",0x881F],
- ["CF9F",0x8820],
- ["F3BB",0x8821],
- ["B4C0",0x8822],
- ["CFA0",0x8823],
- ["D040",0x8824],
- ["D041",0x8825],
- ["D042",0x8826],
- ["D043",0x8827],
- ["D044",0x8828],
- ["D045",0x8829],
- ["D046",0x882A],
- ["D047",0x882B],
- ["D048",0x882C],
- ["D049",0x882D],
- ["D04A",0x882E],
- ["D04B",0x882F],
- ["D04C",0x8830],
- ["D04D",0x8831],
- ["EEC3",0x8832],
- ["D04E",0x8833],
- ["D04F",0x8834],
- ["D050",0x8835],
- ["D051",0x8836],
- ["D052",0x8837],
- ["D053",0x8838],
- ["F3BC",0x8839],
- ["D054",0x883A],
- ["D055",0x883B],
- ["F3BD",0x883C],
- ["D056",0x883D],
- ["D057",0x883E],
- ["D058",0x883F],
- ["D1AA",0x8840],
- ["D059",0x8841],
- ["D05A",0x8842],
- ["D05B",0x8843],
- ["F4AC",0x8844],
- ["D0C6",0x8845],
- ["D05C",0x8846],
- ["D05D",0x8847],
- ["D05E",0x8848],
- ["D05F",0x8849],
- ["D060",0x884A],
- ["D061",0x884B],
- ["D0D0",0x884C],
- ["D1DC",0x884D],
- ["D062",0x884E],
- ["D063",0x884F],
- ["D064",0x8850],
- ["D065",0x8851],
- ["D066",0x8852],
- ["D067",0x8853],
- ["CFCE",0x8854],
- ["D068",0x8855],
- ["D069",0x8856],
- ["BDD6",0x8857],
- ["D06A",0x8858],
- ["D1C3",0x8859],
- ["D06B",0x885A],
- ["D06C",0x885B],
- ["D06D",0x885C],
- ["D06E",0x885D],
- ["D06F",0x885E],
- ["D070",0x885F],
- ["D071",0x8860],
- ["BAE2",0x8861],
- ["E1E9",0x8862],
- ["D2C2",0x8863],
- ["F1C2",0x8864],
- ["B2B9",0x8865],
- ["D072",0x8866],
- ["D073",0x8867],
- ["B1ED",0x8868],
- ["F1C3",0x8869],
- ["D074",0x886A],
- ["C9C0",0x886B],
- ["B3C4",0x886C],
- ["D075",0x886D],
- ["D9F2",0x886E],
- ["D076",0x886F],
- ["CBA5",0x8870],
- ["D077",0x8871],
- ["F1C4",0x8872],
- ["D078",0x8873],
- ["D079",0x8874],
- ["D07A",0x8875],
- ["D07B",0x8876],
- ["D6D4",0x8877],
- ["D07C",0x8878],
- ["D07D",0x8879],
- ["D07E",0x887A],
- ["D080",0x887B],
- ["D081",0x887C],
- ["F1C5",0x887D],
- ["F4C0",0x887E],
- ["F1C6",0x887F],
- ["D082",0x8880],
- ["D4AC",0x8881],
- ["F1C7",0x8882],
- ["D083",0x8883],
- ["B0C0",0x8884],
- ["F4C1",0x8885],
- ["D084",0x8886],
- ["D085",0x8887],
- ["F4C2",0x8888],
- ["D086",0x8889],
- ["D087",0x888A],
- ["B4FC",0x888B],
- ["D088",0x888C],
- ["C5DB",0x888D],
- ["D089",0x888E],
- ["D08A",0x888F],
- ["D08B",0x8890],
- ["D08C",0x8891],
- ["CCBB",0x8892],
- ["D08D",0x8893],
- ["D08E",0x8894],
- ["D08F",0x8895],
- ["D0E4",0x8896],
- ["D090",0x8897],
- ["D091",0x8898],
- ["D092",0x8899],
- ["D093",0x889A],
- ["D094",0x889B],
- ["CDE0",0x889C],
- ["D095",0x889D],
- ["D096",0x889E],
- ["D097",0x889F],
- ["D098",0x88A0],
- ["D099",0x88A1],
- ["F1C8",0x88A2],
- ["D09A",0x88A3],
- ["D9F3",0x88A4],
- ["D09B",0x88A5],
- ["D09C",0x88A6],
- ["D09D",0x88A7],
- ["D09E",0x88A8],
- ["D09F",0x88A9],
- ["D0A0",0x88AA],
- ["B1BB",0x88AB],
- ["D140",0x88AC],
- ["CFAE",0x88AD],
- ["D141",0x88AE],
- ["D142",0x88AF],
- ["D143",0x88B0],
- ["B8A4",0x88B1],
- ["D144",0x88B2],
- ["D145",0x88B3],
- ["D146",0x88B4],
- ["D147",0x88B5],
- ["D148",0x88B6],
- ["F1CA",0x88B7],
- ["D149",0x88B8],
- ["D14A",0x88B9],
- ["D14B",0x88BA],
- ["D14C",0x88BB],
- ["F1CB",0x88BC],
- ["D14D",0x88BD],
- ["D14E",0x88BE],
- ["D14F",0x88BF],
- ["D150",0x88C0],
- ["B2C3",0x88C1],
- ["C1D1",0x88C2],
- ["D151",0x88C3],
- ["D152",0x88C4],
- ["D7B0",0x88C5],
- ["F1C9",0x88C6],
- ["D153",0x88C7],
- ["D154",0x88C8],
- ["F1CC",0x88C9],
- ["D155",0x88CA],
- ["D156",0x88CB],
- ["D157",0x88CC],
- ["D158",0x88CD],
- ["F1CE",0x88CE],
- ["D159",0x88CF],
- ["D15A",0x88D0],
- ["D15B",0x88D1],
- ["D9F6",0x88D2],
- ["D15C",0x88D3],
- ["D2E1",0x88D4],
- ["D4A3",0x88D5],
- ["D15D",0x88D6],
- ["D15E",0x88D7],
- ["F4C3",0x88D8],
- ["C8B9",0x88D9],
- ["D15F",0x88DA],
- ["D160",0x88DB],
- ["D161",0x88DC],
- ["D162",0x88DD],
- ["D163",0x88DE],
- ["F4C4",0x88DF],
- ["D164",0x88E0],
- ["D165",0x88E1],
- ["F1CD",0x88E2],
- ["F1CF",0x88E3],
- ["BFE3",0x88E4],
- ["F1D0",0x88E5],
- ["D166",0x88E6],
- ["D167",0x88E7],
- ["F1D4",0x88E8],
- ["D168",0x88E9],
- ["D169",0x88EA],
- ["D16A",0x88EB],
- ["D16B",0x88EC],
- ["D16C",0x88ED],
- ["D16D",0x88EE],
- ["D16E",0x88EF],
- ["F1D6",0x88F0],
- ["F1D1",0x88F1],
- ["D16F",0x88F2],
- ["C9D1",0x88F3],
- ["C5E1",0x88F4],
- ["D170",0x88F5],
- ["D171",0x88F6],
- ["D172",0x88F7],
- ["C2E3",0x88F8],
- ["B9FC",0x88F9],
- ["D173",0x88FA],
- ["D174",0x88FB],
- ["F1D3",0x88FC],
- ["D175",0x88FD],
- ["F1D5",0x88FE],
- ["D176",0x88FF],
- ["D177",0x8900],
- ["D178",0x8901],
- ["B9D3",0x8902],
- ["D179",0x8903],
- ["D17A",0x8904],
- ["D17B",0x8905],
- ["D17C",0x8906],
- ["D17D",0x8907],
- ["D17E",0x8908],
- ["D180",0x8909],
- ["F1DB",0x890A],
- ["D181",0x890B],
- ["D182",0x890C],
- ["D183",0x890D],
- ["D184",0x890E],
- ["D185",0x890F],
- ["BAD6",0x8910],
- ["D186",0x8911],
- ["B0FD",0x8912],
- ["F1D9",0x8913],
- ["D187",0x8914],
- ["D188",0x8915],
- ["D189",0x8916],
- ["D18A",0x8917],
- ["D18B",0x8918],
- ["F1D8",0x8919],
- ["F1D2",0x891A],
- ["F1DA",0x891B],
- ["D18C",0x891C],
- ["D18D",0x891D],
- ["D18E",0x891E],
- ["D18F",0x891F],
- ["D190",0x8920],
- ["F1D7",0x8921],
- ["D191",0x8922],
- ["D192",0x8923],
- ["D193",0x8924],
- ["C8EC",0x8925],
- ["D194",0x8926],
- ["D195",0x8927],
- ["D196",0x8928],
- ["D197",0x8929],
- ["CDCA",0x892A],
- ["F1DD",0x892B],
- ["D198",0x892C],
- ["D199",0x892D],
- ["D19A",0x892E],
- ["D19B",0x892F],
- ["E5BD",0x8930],
- ["D19C",0x8931],
- ["D19D",0x8932],
- ["D19E",0x8933],
- ["F1DC",0x8934],
- ["D19F",0x8935],
- ["F1DE",0x8936],
- ["D1A0",0x8937],
- ["D240",0x8938],
- ["D241",0x8939],
- ["D242",0x893A],
- ["D243",0x893B],
- ["D244",0x893C],
- ["D245",0x893D],
- ["D246",0x893E],
- ["D247",0x893F],
- ["D248",0x8940],
- ["F1DF",0x8941],
- ["D249",0x8942],
- ["D24A",0x8943],
- ["CFE5",0x8944],
- ["D24B",0x8945],
- ["D24C",0x8946],
- ["D24D",0x8947],
- ["D24E",0x8948],
- ["D24F",0x8949],
- ["D250",0x894A],
- ["D251",0x894B],
- ["D252",0x894C],
- ["D253",0x894D],
- ["D254",0x894E],
- ["D255",0x894F],
- ["D256",0x8950],
- ["D257",0x8951],
- ["D258",0x8952],
- ["D259",0x8953],
- ["D25A",0x8954],
- ["D25B",0x8955],
- ["D25C",0x8956],
- ["D25D",0x8957],
- ["D25E",0x8958],
- ["D25F",0x8959],
- ["D260",0x895A],
- ["D261",0x895B],
- ["D262",0x895C],
- ["D263",0x895D],
- ["F4C5",0x895E],
- ["BDF3",0x895F],
- ["D264",0x8960],
- ["D265",0x8961],
- ["D266",0x8962],
- ["D267",0x8963],
- ["D268",0x8964],
- ["D269",0x8965],
- ["F1E0",0x8966],
- ["D26A",0x8967],
- ["D26B",0x8968],
- ["D26C",0x8969],
- ["D26D",0x896A],
- ["D26E",0x896B],
- ["D26F",0x896C],
- ["D270",0x896D],
- ["D271",0x896E],
- ["D272",0x896F],
- ["D273",0x8970],
- ["D274",0x8971],
- ["D275",0x8972],
- ["D276",0x8973],
- ["D277",0x8974],
- ["D278",0x8975],
- ["D279",0x8976],
- ["D27A",0x8977],
- ["D27B",0x8978],
- ["D27C",0x8979],
- ["D27D",0x897A],
- ["F1E1",0x897B],
- ["D27E",0x897C],
- ["D280",0x897D],
- ["D281",0x897E],
- ["CEF7",0x897F],
- ["D282",0x8980],
- ["D2AA",0x8981],
- ["D283",0x8982],
- ["F1FB",0x8983],
- ["D284",0x8984],
- ["D285",0x8985],
- ["B8B2",0x8986],
- ["D286",0x8987],
- ["D287",0x8988],
- ["D288",0x8989],
- ["D289",0x898A],
- ["D28A",0x898B],
- ["D28B",0x898C],
- ["D28C",0x898D],
- ["D28D",0x898E],
- ["D28E",0x898F],
- ["D28F",0x8990],
- ["D290",0x8991],
- ["D291",0x8992],
- ["D292",0x8993],
- ["D293",0x8994],
- ["D294",0x8995],
- ["D295",0x8996],
- ["D296",0x8997],
- ["D297",0x8998],
- ["D298",0x8999],
- ["D299",0x899A],
- ["D29A",0x899B],
- ["D29B",0x899C],
- ["D29C",0x899D],
- ["D29D",0x899E],
- ["D29E",0x899F],
- ["D29F",0x89A0],
- ["D2A0",0x89A1],
- ["D340",0x89A2],
- ["D341",0x89A3],
- ["D342",0x89A4],
- ["D343",0x89A5],
- ["D344",0x89A6],
- ["D345",0x89A7],
- ["D346",0x89A8],
- ["D347",0x89A9],
- ["D348",0x89AA],
- ["D349",0x89AB],
- ["D34A",0x89AC],
- ["D34B",0x89AD],
- ["D34C",0x89AE],
- ["D34D",0x89AF],
- ["D34E",0x89B0],
- ["D34F",0x89B1],
- ["D350",0x89B2],
- ["D351",0x89B3],
- ["D352",0x89B4],
- ["D353",0x89B5],
- ["D354",0x89B6],
- ["D355",0x89B7],
- ["D356",0x89B8],
- ["D357",0x89B9],
- ["D358",0x89BA],
- ["D359",0x89BB],
- ["D35A",0x89BC],
- ["D35B",0x89BD],
- ["D35C",0x89BE],
- ["D35D",0x89BF],
- ["D35E",0x89C0],
- ["BCFB",0x89C1],
- ["B9DB",0x89C2],
- ["D35F",0x89C3],
- ["B9E6",0x89C4],
- ["C3D9",0x89C5],
- ["CAD3",0x89C6],
- ["EAE8",0x89C7],
- ["C0C0",0x89C8],
- ["BEF5",0x89C9],
- ["EAE9",0x89CA],
- ["EAEA",0x89CB],
- ["EAEB",0x89CC],
- ["D360",0x89CD],
- ["EAEC",0x89CE],
- ["EAED",0x89CF],
- ["EAEE",0x89D0],
- ["EAEF",0x89D1],
- ["BDC7",0x89D2],
- ["D361",0x89D3],
- ["D362",0x89D4],
- ["D363",0x89D5],
- ["F5FB",0x89D6],
- ["D364",0x89D7],
- ["D365",0x89D8],
- ["D366",0x89D9],
- ["F5FD",0x89DA],
- ["D367",0x89DB],
- ["F5FE",0x89DC],
- ["D368",0x89DD],
- ["F5FC",0x89DE],
- ["D369",0x89DF],
- ["D36A",0x89E0],
- ["D36B",0x89E1],
- ["D36C",0x89E2],
- ["BDE2",0x89E3],
- ["D36D",0x89E4],
- ["F6A1",0x89E5],
- ["B4A5",0x89E6],
- ["D36E",0x89E7],
- ["D36F",0x89E8],
- ["D370",0x89E9],
- ["D371",0x89EA],
- ["F6A2",0x89EB],
- ["D372",0x89EC],
- ["D373",0x89ED],
- ["D374",0x89EE],
- ["F6A3",0x89EF],
- ["D375",0x89F0],
- ["D376",0x89F1],
- ["D377",0x89F2],
- ["ECB2",0x89F3],
- ["D378",0x89F4],
- ["D379",0x89F5],
- ["D37A",0x89F6],
- ["D37B",0x89F7],
- ["D37C",0x89F8],
- ["D37D",0x89F9],
- ["D37E",0x89FA],
- ["D380",0x89FB],
- ["D381",0x89FC],
- ["D382",0x89FD],
- ["D383",0x89FE],
- ["D384",0x89FF],
- ["D1D4",0x8A00],
- ["D385",0x8A01],
- ["D386",0x8A02],
- ["D387",0x8A03],
- ["D388",0x8A04],
- ["D389",0x8A05],
- ["D38A",0x8A06],
- ["D9EA",0x8A07],
- ["D38B",0x8A08],
- ["D38C",0x8A09],
- ["D38D",0x8A0A],
- ["D38E",0x8A0B],
- ["D38F",0x8A0C],
- ["D390",0x8A0D],
- ["D391",0x8A0E],
- ["D392",0x8A0F],
- ["D393",0x8A10],
- ["D394",0x8A11],
- ["D395",0x8A12],
- ["D396",0x8A13],
- ["D397",0x8A14],
- ["D398",0x8A15],
- ["D399",0x8A16],
- ["D39A",0x8A17],
- ["D39B",0x8A18],
- ["D39C",0x8A19],
- ["D39D",0x8A1A],
- ["D39E",0x8A1B],
- ["D39F",0x8A1C],
- ["D3A0",0x8A1D],
- ["D440",0x8A1E],
- ["D441",0x8A1F],
- ["D442",0x8A20],
- ["D443",0x8A21],
- ["D444",0x8A22],
- ["D445",0x8A23],
- ["D446",0x8A24],
- ["D447",0x8A25],
- ["D448",0x8A26],
- ["D449",0x8A27],
- ["D44A",0x8A28],
- ["D44B",0x8A29],
- ["D44C",0x8A2A],
- ["D44D",0x8A2B],
- ["D44E",0x8A2C],
- ["D44F",0x8A2D],
- ["D450",0x8A2E],
- ["D451",0x8A2F],
- ["D452",0x8A30],
- ["D453",0x8A31],
- ["D454",0x8A32],
- ["D455",0x8A33],
- ["D456",0x8A34],
- ["D457",0x8A35],
- ["D458",0x8A36],
- ["D459",0x8A37],
- ["D45A",0x8A38],
- ["D45B",0x8A39],
- ["D45C",0x8A3A],
- ["D45D",0x8A3B],
- ["D45E",0x8A3C],
- ["D45F",0x8A3D],
- ["F6A4",0x8A3E],
- ["D460",0x8A3F],
- ["D461",0x8A40],
- ["D462",0x8A41],
- ["D463",0x8A42],
- ["D464",0x8A43],
- ["D465",0x8A44],
- ["D466",0x8A45],
- ["D467",0x8A46],
- ["D468",0x8A47],
- ["EEBA",0x8A48],
- ["D469",0x8A49],
- ["D46A",0x8A4A],
- ["D46B",0x8A4B],
- ["D46C",0x8A4C],
- ["D46D",0x8A4D],
- ["D46E",0x8A4E],
- ["D46F",0x8A4F],
- ["D470",0x8A50],
- ["D471",0x8A51],
- ["D472",0x8A52],
- ["D473",0x8A53],
- ["D474",0x8A54],
- ["D475",0x8A55],
- ["D476",0x8A56],
- ["D477",0x8A57],
- ["D478",0x8A58],
- ["D479",0x8A59],
- ["D47A",0x8A5A],
- ["D47B",0x8A5B],
- ["D47C",0x8A5C],
- ["D47D",0x8A5D],
- ["D47E",0x8A5E],
- ["D480",0x8A5F],
- ["D481",0x8A60],
- ["D482",0x8A61],
- ["D483",0x8A62],
- ["D484",0x8A63],
- ["D485",0x8A64],
- ["D486",0x8A65],
- ["D487",0x8A66],
- ["D488",0x8A67],
- ["D489",0x8A68],
- ["D48A",0x8A69],
- ["D48B",0x8A6A],
- ["D48C",0x8A6B],
- ["D48D",0x8A6C],
- ["D48E",0x8A6D],
- ["D48F",0x8A6E],
- ["D490",0x8A6F],
- ["D491",0x8A70],
- ["D492",0x8A71],
- ["D493",0x8A72],
- ["D494",0x8A73],
- ["D495",0x8A74],
- ["D496",0x8A75],
- ["D497",0x8A76],
- ["D498",0x8A77],
- ["D499",0x8A78],
- ["D5B2",0x8A79],
- ["D49A",0x8A7A],
- ["D49B",0x8A7B],
- ["D49C",0x8A7C],
- ["D49D",0x8A7D],
- ["D49E",0x8A7E],
- ["D49F",0x8A7F],
- ["D4A0",0x8A80],
- ["D540",0x8A81],
- ["D541",0x8A82],
- ["D542",0x8A83],
- ["D543",0x8A84],
- ["D544",0x8A85],
- ["D545",0x8A86],
- ["D546",0x8A87],
- ["D547",0x8A88],
- ["D3FE",0x8A89],
- ["CCDC",0x8A8A],
- ["D548",0x8A8B],
- ["D549",0x8A8C],
- ["D54A",0x8A8D],
- ["D54B",0x8A8E],
- ["D54C",0x8A8F],
- ["D54D",0x8A90],
- ["D54E",0x8A91],
- ["D54F",0x8A92],
- ["CAC4",0x8A93],
- ["D550",0x8A94],
- ["D551",0x8A95],
- ["D552",0x8A96],
- ["D553",0x8A97],
- ["D554",0x8A98],
- ["D555",0x8A99],
- ["D556",0x8A9A],
- ["D557",0x8A9B],
- ["D558",0x8A9C],
- ["D559",0x8A9D],
- ["D55A",0x8A9E],
- ["D55B",0x8A9F],
- ["D55C",0x8AA0],
- ["D55D",0x8AA1],
- ["D55E",0x8AA2],
- ["D55F",0x8AA3],
- ["D560",0x8AA4],
- ["D561",0x8AA5],
- ["D562",0x8AA6],
- ["D563",0x8AA7],
- ["D564",0x8AA8],
- ["D565",0x8AA9],
- ["D566",0x8AAA],
- ["D567",0x8AAB],
- ["D568",0x8AAC],
- ["D569",0x8AAD],
- ["D56A",0x8AAE],
- ["D56B",0x8AAF],
- ["D56C",0x8AB0],
- ["D56D",0x8AB1],
- ["D56E",0x8AB2],
- ["D56F",0x8AB3],
- ["D570",0x8AB4],
- ["D571",0x8AB5],
- ["D572",0x8AB6],
- ["D573",0x8AB7],
- ["D574",0x8AB8],
- ["D575",0x8AB9],
- ["D576",0x8ABA],
- ["D577",0x8ABB],
- ["D578",0x8ABC],
- ["D579",0x8ABD],
- ["D57A",0x8ABE],
- ["D57B",0x8ABF],
- ["D57C",0x8AC0],
- ["D57D",0x8AC1],
- ["D57E",0x8AC2],
- ["D580",0x8AC3],
- ["D581",0x8AC4],
- ["D582",0x8AC5],
- ["D583",0x8AC6],
- ["D584",0x8AC7],
- ["D585",0x8AC8],
- ["D586",0x8AC9],
- ["D587",0x8ACA],
- ["D588",0x8ACB],
- ["D589",0x8ACC],
- ["D58A",0x8ACD],
- ["D58B",0x8ACE],
- ["D58C",0x8ACF],
- ["D58D",0x8AD0],
- ["D58E",0x8AD1],
- ["D58F",0x8AD2],
- ["D590",0x8AD3],
- ["D591",0x8AD4],
- ["D592",0x8AD5],
- ["D593",0x8AD6],
- ["D594",0x8AD7],
- ["D595",0x8AD8],
- ["D596",0x8AD9],
- ["D597",0x8ADA],
- ["D598",0x8ADB],
- ["D599",0x8ADC],
- ["D59A",0x8ADD],
- ["D59B",0x8ADE],
- ["D59C",0x8ADF],
- ["D59D",0x8AE0],
- ["D59E",0x8AE1],
- ["D59F",0x8AE2],
- ["D5A0",0x8AE3],
- ["D640",0x8AE4],
- ["D641",0x8AE5],
- ["D642",0x8AE6],
- ["D643",0x8AE7],
- ["D644",0x8AE8],
- ["D645",0x8AE9],
- ["D646",0x8AEA],
- ["D647",0x8AEB],
- ["D648",0x8AEC],
- ["D649",0x8AED],
- ["D64A",0x8AEE],
- ["D64B",0x8AEF],
- ["D64C",0x8AF0],
- ["D64D",0x8AF1],
- ["D64E",0x8AF2],
- ["D64F",0x8AF3],
- ["D650",0x8AF4],
- ["D651",0x8AF5],
- ["D652",0x8AF6],
- ["D653",0x8AF7],
- ["D654",0x8AF8],
- ["D655",0x8AF9],
- ["D656",0x8AFA],
- ["D657",0x8AFB],
- ["D658",0x8AFC],
- ["D659",0x8AFD],
- ["D65A",0x8AFE],
- ["D65B",0x8AFF],
- ["D65C",0x8B00],
- ["D65D",0x8B01],
- ["D65E",0x8B02],
- ["D65F",0x8B03],
- ["D660",0x8B04],
- ["D661",0x8B05],
- ["D662",0x8B06],
- ["E5C0",0x8B07],
- ["D663",0x8B08],
- ["D664",0x8B09],
- ["D665",0x8B0A],
- ["D666",0x8B0B],
- ["D667",0x8B0C],
- ["D668",0x8B0D],
- ["D669",0x8B0E],
- ["D66A",0x8B0F],
- ["D66B",0x8B10],
- ["D66C",0x8B11],
- ["D66D",0x8B12],
- ["D66E",0x8B13],
- ["D66F",0x8B14],
- ["D670",0x8B15],
- ["D671",0x8B16],
- ["D672",0x8B17],
- ["D673",0x8B18],
- ["D674",0x8B19],
- ["D675",0x8B1A],
- ["D676",0x8B1B],
- ["D677",0x8B1C],
- ["D678",0x8B1D],
- ["D679",0x8B1E],
- ["D67A",0x8B1F],
- ["D67B",0x8B20],
- ["D67C",0x8B21],
- ["D67D",0x8B22],
- ["D67E",0x8B23],
- ["D680",0x8B24],
- ["D681",0x8B25],
- ["F6A5",0x8B26],
- ["D682",0x8B27],
- ["D683",0x8B28],
- ["D684",0x8B29],
- ["D685",0x8B2A],
- ["D686",0x8B2B],
- ["D687",0x8B2C],
- ["D688",0x8B2D],
- ["D689",0x8B2E],
- ["D68A",0x8B2F],
- ["D68B",0x8B30],
- ["D68C",0x8B31],
- ["D68D",0x8B32],
- ["D68E",0x8B33],
- ["D68F",0x8B34],
- ["D690",0x8B35],
- ["D691",0x8B36],
- ["D692",0x8B37],
- ["D693",0x8B38],
- ["D694",0x8B39],
- ["D695",0x8B3A],
- ["D696",0x8B3B],
- ["D697",0x8B3C],
- ["D698",0x8B3D],
- ["D699",0x8B3E],
- ["D69A",0x8B3F],
- ["D69B",0x8B40],
- ["D69C",0x8B41],
- ["D69D",0x8B42],
- ["D69E",0x8B43],
- ["D69F",0x8B44],
- ["D6A0",0x8B45],
- ["D740",0x8B46],
- ["D741",0x8B47],
- ["D742",0x8B48],
- ["D743",0x8B49],
- ["D744",0x8B4A],
- ["D745",0x8B4B],
- ["D746",0x8B4C],
- ["D747",0x8B4D],
- ["D748",0x8B4E],
- ["D749",0x8B4F],
- ["D74A",0x8B50],
- ["D74B",0x8B51],
- ["D74C",0x8B52],
- ["D74D",0x8B53],
- ["D74E",0x8B54],
- ["D74F",0x8B55],
- ["D750",0x8B56],
- ["D751",0x8B57],
- ["D752",0x8B58],
- ["D753",0x8B59],
- ["D754",0x8B5A],
- ["D755",0x8B5B],
- ["D756",0x8B5C],
- ["D757",0x8B5D],
- ["D758",0x8B5E],
- ["D759",0x8B5F],
- ["D75A",0x8B60],
- ["D75B",0x8B61],
- ["D75C",0x8B62],
- ["D75D",0x8B63],
- ["D75E",0x8B64],
- ["D75F",0x8B65],
- ["BEAF",0x8B66],
- ["D760",0x8B67],
- ["D761",0x8B68],
- ["D762",0x8B69],
- ["D763",0x8B6A],
- ["D764",0x8B6B],
- ["C6A9",0x8B6C],
- ["D765",0x8B6D],
- ["D766",0x8B6E],
- ["D767",0x8B6F],
- ["D768",0x8B70],
- ["D769",0x8B71],
- ["D76A",0x8B72],
- ["D76B",0x8B73],
- ["D76C",0x8B74],
- ["D76D",0x8B75],
- ["D76E",0x8B76],
- ["D76F",0x8B77],
- ["D770",0x8B78],
- ["D771",0x8B79],
- ["D772",0x8B7A],
- ["D773",0x8B7B],
- ["D774",0x8B7C],
- ["D775",0x8B7D],
- ["D776",0x8B7E],
- ["D777",0x8B7F],
- ["D778",0x8B80],
- ["D779",0x8B81],
- ["D77A",0x8B82],
- ["D77B",0x8B83],
- ["D77C",0x8B84],
- ["D77D",0x8B85],
- ["D77E",0x8B86],
- ["D780",0x8B87],
- ["D781",0x8B88],
- ["D782",0x8B89],
- ["D783",0x8B8A],
- ["D784",0x8B8B],
- ["D785",0x8B8C],
- ["D786",0x8B8D],
- ["D787",0x8B8E],
- ["D788",0x8B8F],
- ["D789",0x8B90],
- ["D78A",0x8B91],
- ["D78B",0x8B92],
- ["D78C",0x8B93],
- ["D78D",0x8B94],
- ["D78E",0x8B95],
- ["D78F",0x8B96],
- ["D790",0x8B97],
- ["D791",0x8B98],
- ["D792",0x8B99],
- ["D793",0x8B9A],
- ["D794",0x8B9B],
- ["D795",0x8B9C],
- ["D796",0x8B9D],
- ["D797",0x8B9E],
- ["D798",0x8B9F],
- ["DAA5",0x8BA0],
- ["BCC6",0x8BA1],
- ["B6A9",0x8BA2],
- ["B8BC",0x8BA3],
- ["C8CF",0x8BA4],
- ["BCA5",0x8BA5],
- ["DAA6",0x8BA6],
- ["DAA7",0x8BA7],
- ["CCD6",0x8BA8],
- ["C8C3",0x8BA9],
- ["DAA8",0x8BAA],
- ["C6FD",0x8BAB],
- ["D799",0x8BAC],
- ["D1B5",0x8BAD],
- ["D2E9",0x8BAE],
- ["D1B6",0x8BAF],
- ["BCC7",0x8BB0],
- ["D79A",0x8BB1],
- ["BDB2",0x8BB2],
- ["BBE4",0x8BB3],
- ["DAA9",0x8BB4],
- ["DAAA",0x8BB5],
- ["D1C8",0x8BB6],
- ["DAAB",0x8BB7],
- ["D0ED",0x8BB8],
- ["B6EF",0x8BB9],
- ["C2DB",0x8BBA],
- ["D79B",0x8BBB],
- ["CBCF",0x8BBC],
- ["B7ED",0x8BBD],
- ["C9E8",0x8BBE],
- ["B7C3",0x8BBF],
- ["BEF7",0x8BC0],
- ["D6A4",0x8BC1],
- ["DAAC",0x8BC2],
- ["DAAD",0x8BC3],
- ["C6C0",0x8BC4],
- ["D7E7",0x8BC5],
- ["CAB6",0x8BC6],
- ["D79C",0x8BC7],
- ["D5A9",0x8BC8],
- ["CBDF",0x8BC9],
- ["D5EF",0x8BCA],
- ["DAAE",0x8BCB],
- ["D6DF",0x8BCC],
- ["B4CA",0x8BCD],
- ["DAB0",0x8BCE],
- ["DAAF",0x8BCF],
- ["D79D",0x8BD0],
- ["D2EB",0x8BD1],
- ["DAB1",0x8BD2],
- ["DAB2",0x8BD3],
- ["DAB3",0x8BD4],
- ["CAD4",0x8BD5],
- ["DAB4",0x8BD6],
- ["CAAB",0x8BD7],
- ["DAB5",0x8BD8],
- ["DAB6",0x8BD9],
- ["B3CF",0x8BDA],
- ["D6EF",0x8BDB],
- ["DAB7",0x8BDC],
- ["BBB0",0x8BDD],
- ["B5AE",0x8BDE],
- ["DAB8",0x8BDF],
- ["DAB9",0x8BE0],
- ["B9EE",0x8BE1],
- ["D1AF",0x8BE2],
- ["D2E8",0x8BE3],
- ["DABA",0x8BE4],
- ["B8C3",0x8BE5],
- ["CFEA",0x8BE6],
- ["B2EF",0x8BE7],
- ["DABB",0x8BE8],
- ["DABC",0x8BE9],
- ["D79E",0x8BEA],
- ["BDEB",0x8BEB],
- ["CEDC",0x8BEC],
- ["D3EF",0x8BED],
- ["DABD",0x8BEE],
- ["CEF3",0x8BEF],
- ["DABE",0x8BF0],
- ["D3D5",0x8BF1],
- ["BBE5",0x8BF2],
- ["DABF",0x8BF3],
- ["CBB5",0x8BF4],
- ["CBD0",0x8BF5],
- ["DAC0",0x8BF6],
- ["C7EB",0x8BF7],
- ["D6EE",0x8BF8],
- ["DAC1",0x8BF9],
- ["C5B5",0x8BFA],
- ["B6C1",0x8BFB],
- ["DAC2",0x8BFC],
- ["B7CC",0x8BFD],
- ["BFCE",0x8BFE],
- ["DAC3",0x8BFF],
- ["DAC4",0x8C00],
- ["CBAD",0x8C01],
- ["DAC5",0x8C02],
- ["B5F7",0x8C03],
- ["DAC6",0x8C04],
- ["C1C2",0x8C05],
- ["D7BB",0x8C06],
- ["DAC7",0x8C07],
- ["CCB8",0x8C08],
- ["D79F",0x8C09],
- ["D2EA",0x8C0A],
- ["C4B1",0x8C0B],
- ["DAC8",0x8C0C],
- ["B5FD",0x8C0D],
- ["BBD1",0x8C0E],
- ["DAC9",0x8C0F],
- ["D0B3",0x8C10],
- ["DACA",0x8C11],
- ["DACB",0x8C12],
- ["CEBD",0x8C13],
- ["DACC",0x8C14],
- ["DACD",0x8C15],
- ["DACE",0x8C16],
- ["B2F7",0x8C17],
- ["DAD1",0x8C18],
- ["DACF",0x8C19],
- ["D1E8",0x8C1A],
- ["DAD0",0x8C1B],
- ["C3D5",0x8C1C],
- ["DAD2",0x8C1D],
- ["D7A0",0x8C1E],
- ["DAD3",0x8C1F],
- ["DAD4",0x8C20],
- ["DAD5",0x8C21],
- ["D0BB",0x8C22],
- ["D2A5",0x8C23],
- ["B0F9",0x8C24],
- ["DAD6",0x8C25],
- ["C7AB",0x8C26],
- ["DAD7",0x8C27],
- ["BDF7",0x8C28],
- ["C3A1",0x8C29],
- ["DAD8",0x8C2A],
- ["DAD9",0x8C2B],
- ["C3FD",0x8C2C],
- ["CCB7",0x8C2D],
- ["DADA",0x8C2E],
- ["DADB",0x8C2F],
- ["C0BE",0x8C30],
- ["C6D7",0x8C31],
- ["DADC",0x8C32],
- ["DADD",0x8C33],
- ["C7B4",0x8C34],
- ["DADE",0x8C35],
- ["DADF",0x8C36],
- ["B9C8",0x8C37],
- ["D840",0x8C38],
- ["D841",0x8C39],
- ["D842",0x8C3A],
- ["D843",0x8C3B],
- ["D844",0x8C3C],
- ["D845",0x8C3D],
- ["D846",0x8C3E],
- ["D847",0x8C3F],
- ["D848",0x8C40],
- ["BBED",0x8C41],
- ["D849",0x8C42],
- ["D84A",0x8C43],
- ["D84B",0x8C44],
- ["D84C",0x8C45],
- ["B6B9",0x8C46],
- ["F4F8",0x8C47],
- ["D84D",0x8C48],
- ["F4F9",0x8C49],
- ["D84E",0x8C4A],
- ["D84F",0x8C4B],
- ["CDE3",0x8C4C],
- ["D850",0x8C4D],
- ["D851",0x8C4E],
- ["D852",0x8C4F],
- ["D853",0x8C50],
- ["D854",0x8C51],
- ["D855",0x8C52],
- ["D856",0x8C53],
- ["D857",0x8C54],
- ["F5B9",0x8C55],
- ["D858",0x8C56],
- ["D859",0x8C57],
- ["D85A",0x8C58],
- ["D85B",0x8C59],
- ["EBE0",0x8C5A],
- ["D85C",0x8C5B],
- ["D85D",0x8C5C],
- ["D85E",0x8C5D],
- ["D85F",0x8C5E],
- ["D860",0x8C5F],
- ["D861",0x8C60],
- ["CFF3",0x8C61],
- ["BBBF",0x8C62],
- ["D862",0x8C63],
- ["D863",0x8C64],
- ["D864",0x8C65],
- ["D865",0x8C66],
- ["D866",0x8C67],
- ["D867",0x8C68],
- ["D868",0x8C69],
- ["BAC0",0x8C6A],
- ["D4A5",0x8C6B],
- ["D869",0x8C6C],
- ["D86A",0x8C6D],
- ["D86B",0x8C6E],
- ["D86C",0x8C6F],
- ["D86D",0x8C70],
- ["D86E",0x8C71],
- ["D86F",0x8C72],
- ["E1D9",0x8C73],
- ["D870",0x8C74],
- ["D871",0x8C75],
- ["D872",0x8C76],
- ["D873",0x8C77],
- ["F5F4",0x8C78],
- ["B1AA",0x8C79],
- ["B2F2",0x8C7A],
- ["D874",0x8C7B],
- ["D875",0x8C7C],
- ["D876",0x8C7D],
- ["D877",0x8C7E],
- ["D878",0x8C7F],
- ["D879",0x8C80],
- ["D87A",0x8C81],
- ["F5F5",0x8C82],
- ["D87B",0x8C83],
- ["D87C",0x8C84],
- ["F5F7",0x8C85],
- ["D87D",0x8C86],
- ["D87E",0x8C87],
- ["D880",0x8C88],
- ["BAD1",0x8C89],
- ["F5F6",0x8C8A],
- ["D881",0x8C8B],
- ["C3B2",0x8C8C],
- ["D882",0x8C8D],
- ["D883",0x8C8E],
- ["D884",0x8C8F],
- ["D885",0x8C90],
- ["D886",0x8C91],
- ["D887",0x8C92],
- ["D888",0x8C93],
- ["F5F9",0x8C94],
- ["D889",0x8C95],
- ["D88A",0x8C96],
- ["D88B",0x8C97],
- ["F5F8",0x8C98],
- ["D88C",0x8C99],
- ["D88D",0x8C9A],
- ["D88E",0x8C9B],
- ["D88F",0x8C9C],
- ["D890",0x8C9D],
- ["D891",0x8C9E],
- ["D892",0x8C9F],
- ["D893",0x8CA0],
- ["D894",0x8CA1],
- ["D895",0x8CA2],
- ["D896",0x8CA3],
- ["D897",0x8CA4],
- ["D898",0x8CA5],
- ["D899",0x8CA6],
- ["D89A",0x8CA7],
- ["D89B",0x8CA8],
- ["D89C",0x8CA9],
- ["D89D",0x8CAA],
- ["D89E",0x8CAB],
- ["D89F",0x8CAC],
- ["D8A0",0x8CAD],
- ["D940",0x8CAE],
- ["D941",0x8CAF],
- ["D942",0x8CB0],
- ["D943",0x8CB1],
- ["D944",0x8CB2],
- ["D945",0x8CB3],
- ["D946",0x8CB4],
- ["D947",0x8CB5],
- ["D948",0x8CB6],
- ["D949",0x8CB7],
- ["D94A",0x8CB8],
- ["D94B",0x8CB9],
- ["D94C",0x8CBA],
- ["D94D",0x8CBB],
- ["D94E",0x8CBC],
- ["D94F",0x8CBD],
- ["D950",0x8CBE],
- ["D951",0x8CBF],
- ["D952",0x8CC0],
- ["D953",0x8CC1],
- ["D954",0x8CC2],
- ["D955",0x8CC3],
- ["D956",0x8CC4],
- ["D957",0x8CC5],
- ["D958",0x8CC6],
- ["D959",0x8CC7],
- ["D95A",0x8CC8],
- ["D95B",0x8CC9],
- ["D95C",0x8CCA],
- ["D95D",0x8CCB],
- ["D95E",0x8CCC],
- ["D95F",0x8CCD],
- ["D960",0x8CCE],
- ["D961",0x8CCF],
- ["D962",0x8CD0],
- ["D963",0x8CD1],
- ["D964",0x8CD2],
- ["D965",0x8CD3],
- ["D966",0x8CD4],
- ["D967",0x8CD5],
- ["D968",0x8CD6],
- ["D969",0x8CD7],
- ["D96A",0x8CD8],
- ["D96B",0x8CD9],
- ["D96C",0x8CDA],
- ["D96D",0x8CDB],
- ["D96E",0x8CDC],
- ["D96F",0x8CDD],
- ["D970",0x8CDE],
- ["D971",0x8CDF],
- ["D972",0x8CE0],
- ["D973",0x8CE1],
- ["D974",0x8CE2],
- ["D975",0x8CE3],
- ["D976",0x8CE4],
- ["D977",0x8CE5],
- ["D978",0x8CE6],
- ["D979",0x8CE7],
- ["D97A",0x8CE8],
- ["D97B",0x8CE9],
- ["D97C",0x8CEA],
- ["D97D",0x8CEB],
- ["D97E",0x8CEC],
- ["D980",0x8CED],
- ["D981",0x8CEE],
- ["D982",0x8CEF],
- ["D983",0x8CF0],
- ["D984",0x8CF1],
- ["D985",0x8CF2],
- ["D986",0x8CF3],
- ["D987",0x8CF4],
- ["D988",0x8CF5],
- ["D989",0x8CF6],
- ["D98A",0x8CF7],
- ["D98B",0x8CF8],
- ["D98C",0x8CF9],
- ["D98D",0x8CFA],
- ["D98E",0x8CFB],
- ["D98F",0x8CFC],
- ["D990",0x8CFD],
- ["D991",0x8CFE],
- ["D992",0x8CFF],
- ["D993",0x8D00],
- ["D994",0x8D01],
- ["D995",0x8D02],
- ["D996",0x8D03],
- ["D997",0x8D04],
- ["D998",0x8D05],
- ["D999",0x8D06],
- ["D99A",0x8D07],
- ["D99B",0x8D08],
- ["D99C",0x8D09],
- ["D99D",0x8D0A],
- ["D99E",0x8D0B],
- ["D99F",0x8D0C],
- ["D9A0",0x8D0D],
- ["DA40",0x8D0E],
- ["DA41",0x8D0F],
- ["DA42",0x8D10],
- ["DA43",0x8D11],
- ["DA44",0x8D12],
- ["DA45",0x8D13],
- ["DA46",0x8D14],
- ["DA47",0x8D15],
- ["DA48",0x8D16],
- ["DA49",0x8D17],
- ["DA4A",0x8D18],
- ["DA4B",0x8D19],
- ["DA4C",0x8D1A],
- ["DA4D",0x8D1B],
- ["DA4E",0x8D1C],
- ["B1B4",0x8D1D],
- ["D5EA",0x8D1E],
- ["B8BA",0x8D1F],
- ["DA4F",0x8D20],
- ["B9B1",0x8D21],
- ["B2C6",0x8D22],
- ["D4F0",0x8D23],
- ["CFCD",0x8D24],
- ["B0DC",0x8D25],
- ["D5CB",0x8D26],
- ["BBF5",0x8D27],
- ["D6CA",0x8D28],
- ["B7B7",0x8D29],
- ["CCB0",0x8D2A],
- ["C6B6",0x8D2B],
- ["B1E1",0x8D2C],
- ["B9BA",0x8D2D],
- ["D6FC",0x8D2E],
- ["B9E1",0x8D2F],
- ["B7A1",0x8D30],
- ["BCFA",0x8D31],
- ["EADA",0x8D32],
- ["EADB",0x8D33],
- ["CCF9",0x8D34],
- ["B9F3",0x8D35],
- ["EADC",0x8D36],
- ["B4FB",0x8D37],
- ["C3B3",0x8D38],
- ["B7D1",0x8D39],
- ["BAD8",0x8D3A],
- ["EADD",0x8D3B],
- ["D4F4",0x8D3C],
- ["EADE",0x8D3D],
- ["BCD6",0x8D3E],
- ["BBDF",0x8D3F],
- ["EADF",0x8D40],
- ["C1DE",0x8D41],
- ["C2B8",0x8D42],
- ["D4DF",0x8D43],
- ["D7CA",0x8D44],
- ["EAE0",0x8D45],
- ["EAE1",0x8D46],
- ["EAE4",0x8D47],
- ["EAE2",0x8D48],
- ["EAE3",0x8D49],
- ["C9DE",0x8D4A],
- ["B8B3",0x8D4B],
- ["B6C4",0x8D4C],
- ["EAE5",0x8D4D],
- ["CAEA",0x8D4E],
- ["C9CD",0x8D4F],
- ["B4CD",0x8D50],
- ["DA50",0x8D51],
- ["DA51",0x8D52],
- ["E2D9",0x8D53],
- ["C5E2",0x8D54],
- ["EAE6",0x8D55],
- ["C0B5",0x8D56],
- ["DA52",0x8D57],
- ["D7B8",0x8D58],
- ["EAE7",0x8D59],
- ["D7AC",0x8D5A],
- ["C8FC",0x8D5B],
- ["D8D3",0x8D5C],
- ["D8CD",0x8D5D],
- ["D4DE",0x8D5E],
- ["DA53",0x8D5F],
- ["D4F9",0x8D60],
- ["C9C4",0x8D61],
- ["D3AE",0x8D62],
- ["B8D3",0x8D63],
- ["B3E0",0x8D64],
- ["DA54",0x8D65],
- ["C9E2",0x8D66],
- ["F4F6",0x8D67],
- ["DA55",0x8D68],
- ["DA56",0x8D69],
- ["DA57",0x8D6A],
- ["BAD5",0x8D6B],
- ["DA58",0x8D6C],
- ["F4F7",0x8D6D],
- ["DA59",0x8D6E],
- ["DA5A",0x8D6F],
- ["D7DF",0x8D70],
- ["DA5B",0x8D71],
- ["DA5C",0x8D72],
- ["F4F1",0x8D73],
- ["B8B0",0x8D74],
- ["D5D4",0x8D75],
- ["B8CF",0x8D76],
- ["C6F0",0x8D77],
- ["DA5D",0x8D78],
- ["DA5E",0x8D79],
- ["DA5F",0x8D7A],
- ["DA60",0x8D7B],
- ["DA61",0x8D7C],
- ["DA62",0x8D7D],
- ["DA63",0x8D7E],
- ["DA64",0x8D7F],
- ["DA65",0x8D80],
- ["B3C3",0x8D81],
- ["DA66",0x8D82],
- ["DA67",0x8D83],
- ["F4F2",0x8D84],
- ["B3AC",0x8D85],
- ["DA68",0x8D86],
- ["DA69",0x8D87],
- ["DA6A",0x8D88],
- ["DA6B",0x8D89],
- ["D4BD",0x8D8A],
- ["C7F7",0x8D8B],
- ["DA6C",0x8D8C],
- ["DA6D",0x8D8D],
- ["DA6E",0x8D8E],
- ["DA6F",0x8D8F],
- ["DA70",0x8D90],
- ["F4F4",0x8D91],
- ["DA71",0x8D92],
- ["DA72",0x8D93],
- ["F4F3",0x8D94],
- ["DA73",0x8D95],
- ["DA74",0x8D96],
- ["DA75",0x8D97],
- ["DA76",0x8D98],
- ["DA77",0x8D99],
- ["DA78",0x8D9A],
- ["DA79",0x8D9B],
- ["DA7A",0x8D9C],
- ["DA7B",0x8D9D],
- ["DA7C",0x8D9E],
- ["CCCB",0x8D9F],
- ["DA7D",0x8DA0],
- ["DA7E",0x8DA1],
- ["DA80",0x8DA2],
- ["C8A4",0x8DA3],
- ["DA81",0x8DA4],
- ["DA82",0x8DA5],
- ["DA83",0x8DA6],
- ["DA84",0x8DA7],
- ["DA85",0x8DA8],
- ["DA86",0x8DA9],
- ["DA87",0x8DAA],
- ["DA88",0x8DAB],
- ["DA89",0x8DAC],
- ["DA8A",0x8DAD],
- ["DA8B",0x8DAE],
- ["DA8C",0x8DAF],
- ["DA8D",0x8DB0],
- ["F4F5",0x8DB1],
- ["DA8E",0x8DB2],
- ["D7E3",0x8DB3],
- ["C5BF",0x8DB4],
- ["F5C0",0x8DB5],
- ["DA8F",0x8DB6],
- ["DA90",0x8DB7],
- ["F5BB",0x8DB8],
- ["DA91",0x8DB9],
- ["F5C3",0x8DBA],
- ["DA92",0x8DBB],
- ["F5C2",0x8DBC],
- ["DA93",0x8DBD],
- ["D6BA",0x8DBE],
- ["F5C1",0x8DBF],
- ["DA94",0x8DC0],
- ["DA95",0x8DC1],
- ["DA96",0x8DC2],
- ["D4BE",0x8DC3],
- ["F5C4",0x8DC4],
- ["DA97",0x8DC5],
- ["F5CC",0x8DC6],
- ["DA98",0x8DC7],
- ["DA99",0x8DC8],
- ["DA9A",0x8DC9],
- ["DA9B",0x8DCA],
- ["B0CF",0x8DCB],
- ["B5F8",0x8DCC],
- ["DA9C",0x8DCD],
- ["F5C9",0x8DCE],
- ["F5CA",0x8DCF],
- ["DA9D",0x8DD0],
- ["C5DC",0x8DD1],
- ["DA9E",0x8DD2],
- ["DA9F",0x8DD3],
- ["DAA0",0x8DD4],
- ["DB40",0x8DD5],
- ["F5C5",0x8DD6],
- ["F5C6",0x8DD7],
- ["DB41",0x8DD8],
- ["DB42",0x8DD9],
- ["F5C7",0x8DDA],
- ["F5CB",0x8DDB],
- ["DB43",0x8DDC],
- ["BEE0",0x8DDD],
- ["F5C8",0x8DDE],
- ["B8FA",0x8DDF],
- ["DB44",0x8DE0],
- ["DB45",0x8DE1],
- ["DB46",0x8DE2],
- ["F5D0",0x8DE3],
- ["F5D3",0x8DE4],
- ["DB47",0x8DE5],
- ["DB48",0x8DE6],
- ["DB49",0x8DE7],
- ["BFE7",0x8DE8],
- ["DB4A",0x8DE9],
- ["B9F2",0x8DEA],
- ["F5BC",0x8DEB],
- ["F5CD",0x8DEC],
- ["DB4B",0x8DED],
- ["DB4C",0x8DEE],
- ["C2B7",0x8DEF],
- ["DB4D",0x8DF0],
- ["DB4E",0x8DF1],
- ["DB4F",0x8DF2],
- ["CCF8",0x8DF3],
- ["DB50",0x8DF4],
- ["BCF9",0x8DF5],
- ["DB51",0x8DF6],
- ["F5CE",0x8DF7],
- ["F5CF",0x8DF8],
- ["F5D1",0x8DF9],
- ["B6E5",0x8DFA],
- ["F5D2",0x8DFB],
- ["DB52",0x8DFC],
- ["F5D5",0x8DFD],
- ["DB53",0x8DFE],
- ["DB54",0x8DFF],
- ["DB55",0x8E00],
- ["DB56",0x8E01],
- ["DB57",0x8E02],
- ["DB58",0x8E03],
- ["DB59",0x8E04],
- ["F5BD",0x8E05],
- ["DB5A",0x8E06],
- ["DB5B",0x8E07],
- ["DB5C",0x8E08],
- ["F5D4",0x8E09],
- ["D3BB",0x8E0A],
- ["DB5D",0x8E0B],
- ["B3EC",0x8E0C],
- ["DB5E",0x8E0D],
- ["DB5F",0x8E0E],
- ["CCA4",0x8E0F],
- ["DB60",0x8E10],
- ["DB61",0x8E11],
- ["DB62",0x8E12],
- ["DB63",0x8E13],
- ["F5D6",0x8E14],
- ["DB64",0x8E15],
- ["DB65",0x8E16],
- ["DB66",0x8E17],
- ["DB67",0x8E18],
- ["DB68",0x8E19],
- ["DB69",0x8E1A],
- ["DB6A",0x8E1B],
- ["DB6B",0x8E1C],
- ["F5D7",0x8E1D],
- ["BEE1",0x8E1E],
- ["F5D8",0x8E1F],
- ["DB6C",0x8E20],
- ["DB6D",0x8E21],
- ["CCDF",0x8E22],
- ["F5DB",0x8E23],
- ["DB6E",0x8E24],
- ["DB6F",0x8E25],
- ["DB70",0x8E26],
- ["DB71",0x8E27],
- ["DB72",0x8E28],
- ["B2C8",0x8E29],
- ["D7D9",0x8E2A],
- ["DB73",0x8E2B],
- ["F5D9",0x8E2C],
- ["DB74",0x8E2D],
- ["F5DA",0x8E2E],
- ["F5DC",0x8E2F],
- ["DB75",0x8E30],
- ["F5E2",0x8E31],
- ["DB76",0x8E32],
- ["DB77",0x8E33],
- ["DB78",0x8E34],
- ["F5E0",0x8E35],
- ["DB79",0x8E36],
- ["DB7A",0x8E37],
- ["DB7B",0x8E38],
- ["F5DF",0x8E39],
- ["F5DD",0x8E3A],
- ["DB7C",0x8E3B],
- ["DB7D",0x8E3C],
- ["F5E1",0x8E3D],
- ["DB7E",0x8E3E],
- ["DB80",0x8E3F],
- ["F5DE",0x8E40],
- ["F5E4",0x8E41],
- ["F5E5",0x8E42],
- ["DB81",0x8E43],
- ["CCE3",0x8E44],
- ["DB82",0x8E45],
- ["DB83",0x8E46],
- ["E5BF",0x8E47],
- ["B5B8",0x8E48],
- ["F5E3",0x8E49],
- ["F5E8",0x8E4A],
- ["CCA3",0x8E4B],
- ["DB84",0x8E4C],
- ["DB85",0x8E4D],
- ["DB86",0x8E4E],
- ["DB87",0x8E4F],
- ["DB88",0x8E50],
- ["F5E6",0x8E51],
- ["F5E7",0x8E52],
- ["DB89",0x8E53],
- ["DB8A",0x8E54],
- ["DB8B",0x8E55],
- ["DB8C",0x8E56],
- ["DB8D",0x8E57],
- ["DB8E",0x8E58],
- ["F5BE",0x8E59],
- ["DB8F",0x8E5A],
- ["DB90",0x8E5B],
- ["DB91",0x8E5C],
- ["DB92",0x8E5D],
- ["DB93",0x8E5E],
- ["DB94",0x8E5F],
- ["DB95",0x8E60],
- ["DB96",0x8E61],
- ["DB97",0x8E62],
- ["DB98",0x8E63],
- ["DB99",0x8E64],
- ["DB9A",0x8E65],
- ["B1C4",0x8E66],
- ["DB9B",0x8E67],
- ["DB9C",0x8E68],
- ["F5BF",0x8E69],
- ["DB9D",0x8E6A],
- ["DB9E",0x8E6B],
- ["B5C5",0x8E6C],
- ["B2E4",0x8E6D],
- ["DB9F",0x8E6E],
- ["F5EC",0x8E6F],
- ["F5E9",0x8E70],
- ["DBA0",0x8E71],
- ["B6D7",0x8E72],
- ["DC40",0x8E73],
- ["F5ED",0x8E74],
- ["DC41",0x8E75],
- ["F5EA",0x8E76],
- ["DC42",0x8E77],
- ["DC43",0x8E78],
- ["DC44",0x8E79],
- ["DC45",0x8E7A],
- ["DC46",0x8E7B],
- ["F5EB",0x8E7C],
- ["DC47",0x8E7D],
- ["DC48",0x8E7E],
- ["B4DA",0x8E7F],
- ["DC49",0x8E80],
- ["D4EA",0x8E81],
- ["DC4A",0x8E82],
- ["DC4B",0x8E83],
- ["DC4C",0x8E84],
- ["F5EE",0x8E85],
- ["DC4D",0x8E86],
- ["B3F9",0x8E87],
- ["DC4E",0x8E88],
- ["DC4F",0x8E89],
- ["DC50",0x8E8A],
- ["DC51",0x8E8B],
- ["DC52",0x8E8C],
- ["DC53",0x8E8D],
- ["DC54",0x8E8E],
- ["F5EF",0x8E8F],
- ["F5F1",0x8E90],
- ["DC55",0x8E91],
- ["DC56",0x8E92],
- ["DC57",0x8E93],
- ["F5F0",0x8E94],
- ["DC58",0x8E95],
- ["DC59",0x8E96],
- ["DC5A",0x8E97],
- ["DC5B",0x8E98],
- ["DC5C",0x8E99],
- ["DC5D",0x8E9A],
- ["DC5E",0x8E9B],
- ["F5F2",0x8E9C],
- ["DC5F",0x8E9D],
- ["F5F3",0x8E9E],
- ["DC60",0x8E9F],
- ["DC61",0x8EA0],
- ["DC62",0x8EA1],
- ["DC63",0x8EA2],
- ["DC64",0x8EA3],
- ["DC65",0x8EA4],
- ["DC66",0x8EA5],
- ["DC67",0x8EA6],
- ["DC68",0x8EA7],
- ["DC69",0x8EA8],
- ["DC6A",0x8EA9],
- ["DC6B",0x8EAA],
- ["C9ED",0x8EAB],
- ["B9AA",0x8EAC],
- ["DC6C",0x8EAD],
- ["DC6D",0x8EAE],
- ["C7FB",0x8EAF],
- ["DC6E",0x8EB0],
- ["DC6F",0x8EB1],
- ["B6E3",0x8EB2],
- ["DC70",0x8EB3],
- ["DC71",0x8EB4],
- ["DC72",0x8EB5],
- ["DC73",0x8EB6],
- ["DC74",0x8EB7],
- ["DC75",0x8EB8],
- ["DC76",0x8EB9],
- ["CCC9",0x8EBA],
- ["DC77",0x8EBB],
- ["DC78",0x8EBC],
- ["DC79",0x8EBD],
- ["DC7A",0x8EBE],
- ["DC7B",0x8EBF],
- ["DC7C",0x8EC0],
- ["DC7D",0x8EC1],
- ["DC7E",0x8EC2],
- ["DC80",0x8EC3],
- ["DC81",0x8EC4],
- ["DC82",0x8EC5],
- ["DC83",0x8EC6],
- ["DC84",0x8EC7],
- ["DC85",0x8EC8],
- ["DC86",0x8EC9],
- ["DC87",0x8ECA],
- ["DC88",0x8ECB],
- ["DC89",0x8ECC],
- ["DC8A",0x8ECD],
- ["EAA6",0x8ECE],
- ["DC8B",0x8ECF],
- ["DC8C",0x8ED0],
- ["DC8D",0x8ED1],
- ["DC8E",0x8ED2],
- ["DC8F",0x8ED3],
- ["DC90",0x8ED4],
- ["DC91",0x8ED5],
- ["DC92",0x8ED6],
- ["DC93",0x8ED7],
- ["DC94",0x8ED8],
- ["DC95",0x8ED9],
- ["DC96",0x8EDA],
- ["DC97",0x8EDB],
- ["DC98",0x8EDC],
- ["DC99",0x8EDD],
- ["DC9A",0x8EDE],
- ["DC9B",0x8EDF],
- ["DC9C",0x8EE0],
- ["DC9D",0x8EE1],
- ["DC9E",0x8EE2],
- ["DC9F",0x8EE3],
- ["DCA0",0x8EE4],
- ["DD40",0x8EE5],
- ["DD41",0x8EE6],
- ["DD42",0x8EE7],
- ["DD43",0x8EE8],
- ["DD44",0x8EE9],
- ["DD45",0x8EEA],
- ["DD46",0x8EEB],
- ["DD47",0x8EEC],
- ["DD48",0x8EED],
- ["DD49",0x8EEE],
- ["DD4A",0x8EEF],
- ["DD4B",0x8EF0],
- ["DD4C",0x8EF1],
- ["DD4D",0x8EF2],
- ["DD4E",0x8EF3],
- ["DD4F",0x8EF4],
- ["DD50",0x8EF5],
- ["DD51",0x8EF6],
- ["DD52",0x8EF7],
- ["DD53",0x8EF8],
- ["DD54",0x8EF9],
- ["DD55",0x8EFA],
- ["DD56",0x8EFB],
- ["DD57",0x8EFC],
- ["DD58",0x8EFD],
- ["DD59",0x8EFE],
- ["DD5A",0x8EFF],
- ["DD5B",0x8F00],
- ["DD5C",0x8F01],
- ["DD5D",0x8F02],
- ["DD5E",0x8F03],
- ["DD5F",0x8F04],
- ["DD60",0x8F05],
- ["DD61",0x8F06],
- ["DD62",0x8F07],
- ["DD63",0x8F08],
- ["DD64",0x8F09],
- ["DD65",0x8F0A],
- ["DD66",0x8F0B],
- ["DD67",0x8F0C],
- ["DD68",0x8F0D],
- ["DD69",0x8F0E],
- ["DD6A",0x8F0F],
- ["DD6B",0x8F10],
- ["DD6C",0x8F11],
- ["DD6D",0x8F12],
- ["DD6E",0x8F13],
- ["DD6F",0x8F14],
- ["DD70",0x8F15],
- ["DD71",0x8F16],
- ["DD72",0x8F17],
- ["DD73",0x8F18],
- ["DD74",0x8F19],
- ["DD75",0x8F1A],
- ["DD76",0x8F1B],
- ["DD77",0x8F1C],
- ["DD78",0x8F1D],
- ["DD79",0x8F1E],
- ["DD7A",0x8F1F],
- ["DD7B",0x8F20],
- ["DD7C",0x8F21],
- ["DD7D",0x8F22],
- ["DD7E",0x8F23],
- ["DD80",0x8F24],
- ["DD81",0x8F25],
- ["DD82",0x8F26],
- ["DD83",0x8F27],
- ["DD84",0x8F28],
- ["DD85",0x8F29],
- ["DD86",0x8F2A],
- ["DD87",0x8F2B],
- ["DD88",0x8F2C],
- ["DD89",0x8F2D],
- ["DD8A",0x8F2E],
- ["DD8B",0x8F2F],
- ["DD8C",0x8F30],
- ["DD8D",0x8F31],
- ["DD8E",0x8F32],
- ["DD8F",0x8F33],
- ["DD90",0x8F34],
- ["DD91",0x8F35],
- ["DD92",0x8F36],
- ["DD93",0x8F37],
- ["DD94",0x8F38],
- ["DD95",0x8F39],
- ["DD96",0x8F3A],
- ["DD97",0x8F3B],
- ["DD98",0x8F3C],
- ["DD99",0x8F3D],
- ["DD9A",0x8F3E],
- ["DD9B",0x8F3F],
- ["DD9C",0x8F40],
- ["DD9D",0x8F41],
- ["DD9E",0x8F42],
- ["DD9F",0x8F43],
- ["DDA0",0x8F44],
- ["DE40",0x8F45],
- ["DE41",0x8F46],
- ["DE42",0x8F47],
- ["DE43",0x8F48],
- ["DE44",0x8F49],
- ["DE45",0x8F4A],
- ["DE46",0x8F4B],
- ["DE47",0x8F4C],
- ["DE48",0x8F4D],
- ["DE49",0x8F4E],
- ["DE4A",0x8F4F],
- ["DE4B",0x8F50],
- ["DE4C",0x8F51],
- ["DE4D",0x8F52],
- ["DE4E",0x8F53],
- ["DE4F",0x8F54],
- ["DE50",0x8F55],
- ["DE51",0x8F56],
- ["DE52",0x8F57],
- ["DE53",0x8F58],
- ["DE54",0x8F59],
- ["DE55",0x8F5A],
- ["DE56",0x8F5B],
- ["DE57",0x8F5C],
- ["DE58",0x8F5D],
- ["DE59",0x8F5E],
- ["DE5A",0x8F5F],
- ["DE5B",0x8F60],
- ["DE5C",0x8F61],
- ["DE5D",0x8F62],
- ["DE5E",0x8F63],
- ["DE5F",0x8F64],
- ["DE60",0x8F65],
- ["B3B5",0x8F66],
- ["D4FE",0x8F67],
- ["B9EC",0x8F68],
- ["D0F9",0x8F69],
- ["DE61",0x8F6A],
- ["E9ED",0x8F6B],
- ["D7AA",0x8F6C],
- ["E9EE",0x8F6D],
- ["C2D6",0x8F6E],
- ["C8ED",0x8F6F],
- ["BAE4",0x8F70],
- ["E9EF",0x8F71],
- ["E9F0",0x8F72],
- ["E9F1",0x8F73],
- ["D6E1",0x8F74],
- ["E9F2",0x8F75],
- ["E9F3",0x8F76],
- ["E9F5",0x8F77],
- ["E9F4",0x8F78],
- ["E9F6",0x8F79],
- ["E9F7",0x8F7A],
- ["C7E1",0x8F7B],
- ["E9F8",0x8F7C],
- ["D4D8",0x8F7D],
- ["E9F9",0x8F7E],
- ["BDCE",0x8F7F],
- ["DE62",0x8F80],
- ["E9FA",0x8F81],
- ["E9FB",0x8F82],
- ["BDCF",0x8F83],
- ["E9FC",0x8F84],
- ["B8A8",0x8F85],
- ["C1BE",0x8F86],
- ["E9FD",0x8F87],
- ["B1B2",0x8F88],
- ["BBD4",0x8F89],
- ["B9F5",0x8F8A],
- ["E9FE",0x8F8B],
- ["DE63",0x8F8C],
- ["EAA1",0x8F8D],
- ["EAA2",0x8F8E],
- ["EAA3",0x8F8F],
- ["B7F8",0x8F90],
- ["BCAD",0x8F91],
- ["DE64",0x8F92],
- ["CAE4",0x8F93],
- ["E0CE",0x8F94],
- ["D4AF",0x8F95],
- ["CFBD",0x8F96],
- ["D5B7",0x8F97],
- ["EAA4",0x8F98],
- ["D5DE",0x8F99],
- ["EAA5",0x8F9A],
- ["D0C1",0x8F9B],
- ["B9BC",0x8F9C],
- ["DE65",0x8F9D],
- ["B4C7",0x8F9E],
- ["B1D9",0x8F9F],
- ["DE66",0x8FA0],
- ["DE67",0x8FA1],
- ["DE68",0x8FA2],
- ["C0B1",0x8FA3],
- ["DE69",0x8FA4],
- ["DE6A",0x8FA5],
- ["DE6B",0x8FA6],
- ["DE6C",0x8FA7],
- ["B1E6",0x8FA8],
- ["B1E7",0x8FA9],
- ["DE6D",0x8FAA],
- ["B1E8",0x8FAB],
- ["DE6E",0x8FAC],
- ["DE6F",0x8FAD],
- ["DE70",0x8FAE],
- ["DE71",0x8FAF],
- ["B3BD",0x8FB0],
- ["C8E8",0x8FB1],
- ["DE72",0x8FB2],
- ["DE73",0x8FB3],
- ["DE74",0x8FB4],
- ["DE75",0x8FB5],
- ["E5C1",0x8FB6],
- ["DE76",0x8FB7],
- ["DE77",0x8FB8],
- ["B1DF",0x8FB9],
- ["DE78",0x8FBA],
- ["DE79",0x8FBB],
- ["DE7A",0x8FBC],
- ["C1C9",0x8FBD],
- ["B4EF",0x8FBE],
- ["DE7B",0x8FBF],
- ["DE7C",0x8FC0],
- ["C7A8",0x8FC1],
- ["D3D8",0x8FC2],
- ["DE7D",0x8FC3],
- ["C6F9",0x8FC4],
- ["D1B8",0x8FC5],
- ["DE7E",0x8FC6],
- ["B9FD",0x8FC7],
- ["C2F5",0x8FC8],
- ["DE80",0x8FC9],
- ["DE81",0x8FCA],
- ["DE82",0x8FCB],
- ["DE83",0x8FCC],
- ["DE84",0x8FCD],
- ["D3AD",0x8FCE],
- ["DE85",0x8FCF],
- ["D4CB",0x8FD0],
- ["BDFC",0x8FD1],
- ["DE86",0x8FD2],
- ["E5C2",0x8FD3],
- ["B7B5",0x8FD4],
- ["E5C3",0x8FD5],
- ["DE87",0x8FD6],
- ["DE88",0x8FD7],
- ["BBB9",0x8FD8],
- ["D5E2",0x8FD9],
- ["DE89",0x8FDA],
- ["BDF8",0x8FDB],
- ["D4B6",0x8FDC],
- ["CEA5",0x8FDD],
- ["C1AC",0x8FDE],
- ["B3D9",0x8FDF],
- ["DE8A",0x8FE0],
- ["DE8B",0x8FE1],
- ["CCF6",0x8FE2],
- ["DE8C",0x8FE3],
- ["E5C6",0x8FE4],
- ["E5C4",0x8FE5],
- ["E5C8",0x8FE6],
- ["DE8D",0x8FE7],
- ["E5CA",0x8FE8],
- ["E5C7",0x8FE9],
- ["B5CF",0x8FEA],
- ["C6C8",0x8FEB],
- ["DE8E",0x8FEC],
- ["B5FC",0x8FED],
- ["E5C5",0x8FEE],
- ["DE8F",0x8FEF],
- ["CAF6",0x8FF0],
- ["DE90",0x8FF1],
- ["DE91",0x8FF2],
- ["E5C9",0x8FF3],
- ["DE92",0x8FF4],
- ["DE93",0x8FF5],
- ["DE94",0x8FF6],
- ["C3D4",0x8FF7],
- ["B1C5",0x8FF8],
- ["BCA3",0x8FF9],
- ["DE95",0x8FFA],
- ["DE96",0x8FFB],
- ["DE97",0x8FFC],
- ["D7B7",0x8FFD],
- ["DE98",0x8FFE],
- ["DE99",0x8FFF],
- ["CDCB",0x9000],
- ["CBCD",0x9001],
- ["CACA",0x9002],
- ["CCD3",0x9003],
- ["E5CC",0x9004],
- ["E5CB",0x9005],
- ["C4E6",0x9006],
- ["DE9A",0x9007],
- ["DE9B",0x9008],
- ["D1A1",0x9009],
- ["D1B7",0x900A],
- ["E5CD",0x900B],
- ["DE9C",0x900C],
- ["E5D0",0x900D],
- ["DE9D",0x900E],
- ["CDB8",0x900F],
- ["D6F0",0x9010],
- ["E5CF",0x9011],
- ["B5DD",0x9012],
- ["DE9E",0x9013],
- ["CDBE",0x9014],
- ["DE9F",0x9015],
- ["E5D1",0x9016],
- ["B6BA",0x9017],
- ["DEA0",0x9018],
- ["DF40",0x9019],
- ["CDA8",0x901A],
- ["B9E4",0x901B],
- ["DF41",0x901C],
- ["CAC5",0x901D],
- ["B3D1",0x901E],
- ["CBD9",0x901F],
- ["D4EC",0x9020],
- ["E5D2",0x9021],
- ["B7EA",0x9022],
- ["DF42",0x9023],
- ["DF43",0x9024],
- ["DF44",0x9025],
- ["E5CE",0x9026],
- ["DF45",0x9027],
- ["DF46",0x9028],
- ["DF47",0x9029],
- ["DF48",0x902A],
- ["DF49",0x902B],
- ["DF4A",0x902C],
- ["E5D5",0x902D],
- ["B4FE",0x902E],
- ["E5D6",0x902F],
- ["DF4B",0x9030],
- ["DF4C",0x9031],
- ["DF4D",0x9032],
- ["DF4E",0x9033],
- ["DF4F",0x9034],
- ["E5D3",0x9035],
- ["E5D4",0x9036],
- ["DF50",0x9037],
- ["D2DD",0x9038],
- ["DF51",0x9039],
- ["DF52",0x903A],
- ["C2DF",0x903B],
- ["B1C6",0x903C],
- ["DF53",0x903D],
- ["D3E2",0x903E],
- ["DF54",0x903F],
- ["DF55",0x9040],
- ["B6DD",0x9041],
- ["CBEC",0x9042],
- ["DF56",0x9043],
- ["E5D7",0x9044],
- ["DF57",0x9045],
- ["DF58",0x9046],
- ["D3F6",0x9047],
- ["DF59",0x9048],
- ["DF5A",0x9049],
- ["DF5B",0x904A],
- ["DF5C",0x904B],
- ["DF5D",0x904C],
- ["B1E9",0x904D],
- ["DF5E",0x904E],
- ["B6F4",0x904F],
- ["E5DA",0x9050],
- ["E5D8",0x9051],
- ["E5D9",0x9052],
- ["B5C0",0x9053],
- ["DF5F",0x9054],
- ["DF60",0x9055],
- ["DF61",0x9056],
- ["D2C5",0x9057],
- ["E5DC",0x9058],
- ["DF62",0x9059],
- ["DF63",0x905A],
- ["E5DE",0x905B],
- ["DF64",0x905C],
- ["DF65",0x905D],
- ["DF66",0x905E],
- ["DF67",0x905F],
- ["DF68",0x9060],
- ["DF69",0x9061],
- ["E5DD",0x9062],
- ["C7B2",0x9063],
- ["DF6A",0x9064],
- ["D2A3",0x9065],
- ["DF6B",0x9066],
- ["DF6C",0x9067],
- ["E5DB",0x9068],
- ["DF6D",0x9069],
- ["DF6E",0x906A],
- ["DF6F",0x906B],
- ["DF70",0x906C],
- ["D4E2",0x906D],
- ["D5DA",0x906E],
- ["DF71",0x906F],
- ["DF72",0x9070],
- ["DF73",0x9071],
- ["DF74",0x9072],
- ["DF75",0x9073],
- ["E5E0",0x9074],
- ["D7F1",0x9075],
- ["DF76",0x9076],
- ["DF77",0x9077],
- ["DF78",0x9078],
- ["DF79",0x9079],
- ["DF7A",0x907A],
- ["DF7B",0x907B],
- ["DF7C",0x907C],
- ["E5E1",0x907D],
- ["DF7D",0x907E],
- ["B1DC",0x907F],
- ["D1FB",0x9080],
- ["DF7E",0x9081],
- ["E5E2",0x9082],
- ["E5E4",0x9083],
- ["DF80",0x9084],
- ["DF81",0x9085],
- ["DF82",0x9086],
- ["DF83",0x9087],
- ["E5E3",0x9088],
- ["DF84",0x9089],
- ["DF85",0x908A],
- ["E5E5",0x908B],
- ["DF86",0x908C],
- ["DF87",0x908D],
- ["DF88",0x908E],
- ["DF89",0x908F],
- ["DF8A",0x9090],
- ["D2D8",0x9091],
- ["DF8B",0x9092],
- ["B5CB",0x9093],
- ["DF8C",0x9094],
- ["E7DF",0x9095],
- ["DF8D",0x9096],
- ["DAF5",0x9097],
- ["DF8E",0x9098],
- ["DAF8",0x9099],
- ["DF8F",0x909A],
- ["DAF6",0x909B],
- ["DF90",0x909C],
- ["DAF7",0x909D],
- ["DF91",0x909E],
- ["DF92",0x909F],
- ["DF93",0x90A0],
- ["DAFA",0x90A1],
- ["D0CF",0x90A2],
- ["C4C7",0x90A3],
- ["DF94",0x90A4],
- ["DF95",0x90A5],
- ["B0EE",0x90A6],
- ["DF96",0x90A7],
- ["DF97",0x90A8],
- ["DF98",0x90A9],
- ["D0B0",0x90AA],
- ["DF99",0x90AB],
- ["DAF9",0x90AC],
- ["DF9A",0x90AD],
- ["D3CA",0x90AE],
- ["BAAA",0x90AF],
- ["DBA2",0x90B0],
- ["C7F1",0x90B1],
- ["DF9B",0x90B2],
- ["DAFC",0x90B3],
- ["DAFB",0x90B4],
- ["C9DB",0x90B5],
- ["DAFD",0x90B6],
- ["DF9C",0x90B7],
- ["DBA1",0x90B8],
- ["D7DE",0x90B9],
- ["DAFE",0x90BA],
- ["C1DA",0x90BB],
- ["DF9D",0x90BC],
- ["DF9E",0x90BD],
- ["DBA5",0x90BE],
- ["DF9F",0x90BF],
- ["DFA0",0x90C0],
- ["D3F4",0x90C1],
- ["E040",0x90C2],
- ["E041",0x90C3],
- ["DBA7",0x90C4],
- ["DBA4",0x90C5],
- ["E042",0x90C6],
- ["DBA8",0x90C7],
- ["E043",0x90C8],
- ["E044",0x90C9],
- ["BDBC",0x90CA],
- ["E045",0x90CB],
- ["E046",0x90CC],
- ["E047",0x90CD],
- ["C0C9",0x90CE],
- ["DBA3",0x90CF],
- ["DBA6",0x90D0],
- ["D6A3",0x90D1],
- ["E048",0x90D2],
- ["DBA9",0x90D3],
- ["E049",0x90D4],
- ["E04A",0x90D5],
- ["E04B",0x90D6],
- ["DBAD",0x90D7],
- ["E04C",0x90D8],
- ["E04D",0x90D9],
- ["E04E",0x90DA],
- ["DBAE",0x90DB],
- ["DBAC",0x90DC],
- ["BAC2",0x90DD],
- ["E04F",0x90DE],
- ["E050",0x90DF],
- ["E051",0x90E0],
- ["BFA4",0x90E1],
- ["DBAB",0x90E2],
- ["E052",0x90E3],
- ["E053",0x90E4],
- ["E054",0x90E5],
- ["DBAA",0x90E6],
- ["D4C7",0x90E7],
- ["B2BF",0x90E8],
- ["E055",0x90E9],
- ["E056",0x90EA],
- ["DBAF",0x90EB],
- ["E057",0x90EC],
- ["B9F9",0x90ED],
- ["E058",0x90EE],
- ["DBB0",0x90EF],
- ["E059",0x90F0],
- ["E05A",0x90F1],
- ["E05B",0x90F2],
- ["E05C",0x90F3],
- ["B3BB",0x90F4],
- ["E05D",0x90F5],
- ["E05E",0x90F6],
- ["E05F",0x90F7],
- ["B5A6",0x90F8],
- ["E060",0x90F9],
- ["E061",0x90FA],
- ["E062",0x90FB],
- ["E063",0x90FC],
- ["B6BC",0x90FD],
- ["DBB1",0x90FE],
- ["E064",0x90FF],
- ["E065",0x9100],
- ["E066",0x9101],
- ["B6F5",0x9102],
- ["E067",0x9103],
- ["DBB2",0x9104],
- ["E068",0x9105],
- ["E069",0x9106],
- ["E06A",0x9107],
- ["E06B",0x9108],
- ["E06C",0x9109],
- ["E06D",0x910A],
- ["E06E",0x910B],
- ["E06F",0x910C],
- ["E070",0x910D],
- ["E071",0x910E],
- ["E072",0x910F],
- ["E073",0x9110],
- ["E074",0x9111],
- ["E075",0x9112],
- ["E076",0x9113],
- ["E077",0x9114],
- ["E078",0x9115],
- ["E079",0x9116],
- ["E07A",0x9117],
- ["E07B",0x9118],
- ["B1C9",0x9119],
- ["E07C",0x911A],
- ["E07D",0x911B],
- ["E07E",0x911C],
- ["E080",0x911D],
- ["DBB4",0x911E],
- ["E081",0x911F],
- ["E082",0x9120],
- ["E083",0x9121],
- ["DBB3",0x9122],
- ["DBB5",0x9123],
- ["E084",0x9124],
- ["E085",0x9125],
- ["E086",0x9126],
- ["E087",0x9127],
- ["E088",0x9128],
- ["E089",0x9129],
- ["E08A",0x912A],
- ["E08B",0x912B],
- ["E08C",0x912C],
- ["E08D",0x912D],
- ["E08E",0x912E],
- ["DBB7",0x912F],
- ["E08F",0x9130],
- ["DBB6",0x9131],
- ["E090",0x9132],
- ["E091",0x9133],
- ["E092",0x9134],
- ["E093",0x9135],
- ["E094",0x9136],
- ["E095",0x9137],
- ["E096",0x9138],
- ["DBB8",0x9139],
- ["E097",0x913A],
- ["E098",0x913B],
- ["E099",0x913C],
- ["E09A",0x913D],
- ["E09B",0x913E],
- ["E09C",0x913F],
- ["E09D",0x9140],
- ["E09E",0x9141],
- ["E09F",0x9142],
- ["DBB9",0x9143],
- ["E0A0",0x9144],
- ["E140",0x9145],
- ["DBBA",0x9146],
- ["E141",0x9147],
- ["E142",0x9148],
- ["D3CF",0x9149],
- ["F4FA",0x914A],
- ["C7F5",0x914B],
- ["D7C3",0x914C],
- ["C5E4",0x914D],
- ["F4FC",0x914E],
- ["F4FD",0x914F],
- ["F4FB",0x9150],
- ["E143",0x9151],
- ["BEC6",0x9152],
- ["E144",0x9153],
- ["E145",0x9154],
- ["E146",0x9155],
- ["E147",0x9156],
- ["D0EF",0x9157],
- ["E148",0x9158],
- ["E149",0x9159],
- ["B7D3",0x915A],
- ["E14A",0x915B],
- ["E14B",0x915C],
- ["D4CD",0x915D],
- ["CCAA",0x915E],
- ["E14C",0x915F],
- ["E14D",0x9160],
- ["F5A2",0x9161],
- ["F5A1",0x9162],
- ["BAA8",0x9163],
- ["F4FE",0x9164],
- ["CBD6",0x9165],
- ["E14E",0x9166],
- ["E14F",0x9167],
- ["E150",0x9168],
- ["F5A4",0x9169],
- ["C0D2",0x916A],
- ["E151",0x916B],
- ["B3EA",0x916C],
- ["E152",0x916D],
- ["CDAA",0x916E],
- ["F5A5",0x916F],
- ["F5A3",0x9170],
- ["BDB4",0x9171],
- ["F5A8",0x9172],
- ["E153",0x9173],
- ["F5A9",0x9174],
- ["BDCD",0x9175],
- ["C3B8",0x9176],
- ["BFE1",0x9177],
- ["CBE1",0x9178],
- ["F5AA",0x9179],
- ["E154",0x917A],
- ["E155",0x917B],
- ["E156",0x917C],
- ["F5A6",0x917D],
- ["F5A7",0x917E],
- ["C4F0",0x917F],
- ["E157",0x9180],
- ["E158",0x9181],
- ["E159",0x9182],
- ["E15A",0x9183],
- ["E15B",0x9184],
- ["F5AC",0x9185],
- ["E15C",0x9186],
- ["B4BC",0x9187],
- ["E15D",0x9188],
- ["D7ED",0x9189],
- ["E15E",0x918A],
- ["B4D7",0x918B],
- ["F5AB",0x918C],
- ["F5AE",0x918D],
- ["E15F",0x918E],
- ["E160",0x918F],
- ["F5AD",0x9190],
- ["F5AF",0x9191],
- ["D0D1",0x9192],
- ["E161",0x9193],
- ["E162",0x9194],
- ["E163",0x9195],
- ["E164",0x9196],
- ["E165",0x9197],
- ["E166",0x9198],
- ["E167",0x9199],
- ["C3D1",0x919A],
- ["C8A9",0x919B],
- ["E168",0x919C],
- ["E169",0x919D],
- ["E16A",0x919E],
- ["E16B",0x919F],
- ["E16C",0x91A0],
- ["E16D",0x91A1],
- ["F5B0",0x91A2],
- ["F5B1",0x91A3],
- ["E16E",0x91A4],
- ["E16F",0x91A5],
- ["E170",0x91A6],
- ["E171",0x91A7],
- ["E172",0x91A8],
- ["E173",0x91A9],
- ["F5B2",0x91AA],
- ["E174",0x91AB],
- ["E175",0x91AC],
- ["F5B3",0x91AD],
- ["F5B4",0x91AE],
- ["F5B5",0x91AF],
- ["E176",0x91B0],
- ["E177",0x91B1],
- ["E178",0x91B2],
- ["E179",0x91B3],
- ["F5B7",0x91B4],
- ["F5B6",0x91B5],
- ["E17A",0x91B6],
- ["E17B",0x91B7],
- ["E17C",0x91B8],
- ["E17D",0x91B9],
- ["F5B8",0x91BA],
- ["E17E",0x91BB],
- ["E180",0x91BC],
- ["E181",0x91BD],
- ["E182",0x91BE],
- ["E183",0x91BF],
- ["E184",0x91C0],
- ["E185",0x91C1],
- ["E186",0x91C2],
- ["E187",0x91C3],
- ["E188",0x91C4],
- ["E189",0x91C5],
- ["E18A",0x91C6],
- ["B2C9",0x91C7],
- ["E18B",0x91C8],
- ["D3D4",0x91C9],
- ["CACD",0x91CA],
- ["E18C",0x91CB],
- ["C0EF",0x91CC],
- ["D6D8",0x91CD],
- ["D2B0",0x91CE],
- ["C1BF",0x91CF],
- ["E18D",0x91D0],
- ["BDF0",0x91D1],
- ["E18E",0x91D2],
- ["E18F",0x91D3],
- ["E190",0x91D4],
- ["E191",0x91D5],
- ["E192",0x91D6],
- ["E193",0x91D7],
- ["E194",0x91D8],
- ["E195",0x91D9],
- ["E196",0x91DA],
- ["E197",0x91DB],
- ["B8AA",0x91DC],
- ["E198",0x91DD],
- ["E199",0x91DE],
- ["E19A",0x91DF],
- ["E19B",0x91E0],
- ["E19C",0x91E1],
- ["E19D",0x91E2],
- ["E19E",0x91E3],
- ["E19F",0x91E4],
- ["E1A0",0x91E5],
- ["E240",0x91E6],
- ["E241",0x91E7],
- ["E242",0x91E8],
- ["E243",0x91E9],
- ["E244",0x91EA],
- ["E245",0x91EB],
- ["E246",0x91EC],
- ["E247",0x91ED],
- ["E248",0x91EE],
- ["E249",0x91EF],
- ["E24A",0x91F0],
- ["E24B",0x91F1],
- ["E24C",0x91F2],
- ["E24D",0x91F3],
- ["E24E",0x91F4],
- ["E24F",0x91F5],
- ["E250",0x91F6],
- ["E251",0x91F7],
- ["E252",0x91F8],
- ["E253",0x91F9],
- ["E254",0x91FA],
- ["E255",0x91FB],
- ["E256",0x91FC],
- ["E257",0x91FD],
- ["E258",0x91FE],
- ["E259",0x91FF],
- ["E25A",0x9200],
- ["E25B",0x9201],
- ["E25C",0x9202],
- ["E25D",0x9203],
- ["E25E",0x9204],
- ["E25F",0x9205],
- ["E260",0x9206],
- ["E261",0x9207],
- ["E262",0x9208],
- ["E263",0x9209],
- ["E264",0x920A],
- ["E265",0x920B],
- ["E266",0x920C],
- ["E267",0x920D],
- ["E268",0x920E],
- ["E269",0x920F],
- ["E26A",0x9210],
- ["E26B",0x9211],
- ["E26C",0x9212],
- ["E26D",0x9213],
- ["E26E",0x9214],
- ["E26F",0x9215],
- ["E270",0x9216],
- ["E271",0x9217],
- ["E272",0x9218],
- ["E273",0x9219],
- ["E274",0x921A],
- ["E275",0x921B],
- ["E276",0x921C],
- ["E277",0x921D],
- ["E278",0x921E],
- ["E279",0x921F],
- ["E27A",0x9220],
- ["E27B",0x9221],
- ["E27C",0x9222],
- ["E27D",0x9223],
- ["E27E",0x9224],
- ["E280",0x9225],
- ["E281",0x9226],
- ["E282",0x9227],
- ["E283",0x9228],
- ["E284",0x9229],
- ["E285",0x922A],
- ["E286",0x922B],
- ["E287",0x922C],
- ["E288",0x922D],
- ["E289",0x922E],
- ["E28A",0x922F],
- ["E28B",0x9230],
- ["E28C",0x9231],
- ["E28D",0x9232],
- ["E28E",0x9233],
- ["E28F",0x9234],
- ["E290",0x9235],
- ["E291",0x9236],
- ["E292",0x9237],
- ["E293",0x9238],
- ["E294",0x9239],
- ["E295",0x923A],
- ["E296",0x923B],
- ["E297",0x923C],
- ["E298",0x923D],
- ["E299",0x923E],
- ["E29A",0x923F],
- ["E29B",0x9240],
- ["E29C",0x9241],
- ["E29D",0x9242],
- ["E29E",0x9243],
- ["E29F",0x9244],
- ["E2A0",0x9245],
- ["E340",0x9246],
- ["E341",0x9247],
- ["E342",0x9248],
- ["E343",0x9249],
- ["E344",0x924A],
- ["E345",0x924B],
- ["E346",0x924C],
- ["E347",0x924D],
- ["E348",0x924E],
- ["E349",0x924F],
- ["E34A",0x9250],
- ["E34B",0x9251],
- ["E34C",0x9252],
- ["E34D",0x9253],
- ["E34E",0x9254],
- ["E34F",0x9255],
- ["E350",0x9256],
- ["E351",0x9257],
- ["E352",0x9258],
- ["E353",0x9259],
- ["E354",0x925A],
- ["E355",0x925B],
- ["E356",0x925C],
- ["E357",0x925D],
- ["E358",0x925E],
- ["E359",0x925F],
- ["E35A",0x9260],
- ["E35B",0x9261],
- ["E35C",0x9262],
- ["E35D",0x9263],
- ["E35E",0x9264],
- ["E35F",0x9265],
- ["E360",0x9266],
- ["E361",0x9267],
- ["E362",0x9268],
- ["E363",0x9269],
- ["E364",0x926A],
- ["E365",0x926B],
- ["E366",0x926C],
- ["E367",0x926D],
- ["E368",0x926E],
- ["E369",0x926F],
- ["E36A",0x9270],
- ["E36B",0x9271],
- ["E36C",0x9272],
- ["E36D",0x9273],
- ["BCF8",0x9274],
- ["E36E",0x9275],
- ["E36F",0x9276],
- ["E370",0x9277],
- ["E371",0x9278],
- ["E372",0x9279],
- ["E373",0x927A],
- ["E374",0x927B],
- ["E375",0x927C],
- ["E376",0x927D],
- ["E377",0x927E],
- ["E378",0x927F],
- ["E379",0x9280],
- ["E37A",0x9281],
- ["E37B",0x9282],
- ["E37C",0x9283],
- ["E37D",0x9284],
- ["E37E",0x9285],
- ["E380",0x9286],
- ["E381",0x9287],
- ["E382",0x9288],
- ["E383",0x9289],
- ["E384",0x928A],
- ["E385",0x928B],
- ["E386",0x928C],
- ["E387",0x928D],
- ["F6C6",0x928E],
- ["E388",0x928F],
- ["E389",0x9290],
- ["E38A",0x9291],
- ["E38B",0x9292],
- ["E38C",0x9293],
- ["E38D",0x9294],
- ["E38E",0x9295],
- ["E38F",0x9296],
- ["E390",0x9297],
- ["E391",0x9298],
- ["E392",0x9299],
- ["E393",0x929A],
- ["E394",0x929B],
- ["E395",0x929C],
- ["E396",0x929D],
- ["E397",0x929E],
- ["E398",0x929F],
- ["E399",0x92A0],
- ["E39A",0x92A1],
- ["E39B",0x92A2],
- ["E39C",0x92A3],
- ["E39D",0x92A4],
- ["E39E",0x92A5],
- ["E39F",0x92A6],
- ["E3A0",0x92A7],
- ["E440",0x92A8],
- ["E441",0x92A9],
- ["E442",0x92AA],
- ["E443",0x92AB],
- ["E444",0x92AC],
- ["E445",0x92AD],
- ["F6C7",0x92AE],
- ["E446",0x92AF],
- ["E447",0x92B0],
- ["E448",0x92B1],
- ["E449",0x92B2],
- ["E44A",0x92B3],
- ["E44B",0x92B4],
- ["E44C",0x92B5],
- ["E44D",0x92B6],
- ["E44E",0x92B7],
- ["E44F",0x92B8],
- ["E450",0x92B9],
- ["E451",0x92BA],
- ["E452",0x92BB],
- ["E453",0x92BC],
- ["E454",0x92BD],
- ["E455",0x92BE],
- ["E456",0x92BF],
- ["E457",0x92C0],
- ["E458",0x92C1],
- ["E459",0x92C2],
- ["E45A",0x92C3],
- ["E45B",0x92C4],
- ["E45C",0x92C5],
- ["E45D",0x92C6],
- ["E45E",0x92C7],
- ["F6C8",0x92C8],
- ["E45F",0x92C9],
- ["E460",0x92CA],
- ["E461",0x92CB],
- ["E462",0x92CC],
- ["E463",0x92CD],
- ["E464",0x92CE],
- ["E465",0x92CF],
- ["E466",0x92D0],
- ["E467",0x92D1],
- ["E468",0x92D2],
- ["E469",0x92D3],
- ["E46A",0x92D4],
- ["E46B",0x92D5],
- ["E46C",0x92D6],
- ["E46D",0x92D7],
- ["E46E",0x92D8],
- ["E46F",0x92D9],
- ["E470",0x92DA],
- ["E471",0x92DB],
- ["E472",0x92DC],
- ["E473",0x92DD],
- ["E474",0x92DE],
- ["E475",0x92DF],
- ["E476",0x92E0],
- ["E477",0x92E1],
- ["E478",0x92E2],
- ["E479",0x92E3],
- ["E47A",0x92E4],
- ["E47B",0x92E5],
- ["E47C",0x92E6],
- ["E47D",0x92E7],
- ["E47E",0x92E8],
- ["E480",0x92E9],
- ["E481",0x92EA],
- ["E482",0x92EB],
- ["E483",0x92EC],
- ["E484",0x92ED],
- ["E485",0x92EE],
- ["E486",0x92EF],
- ["E487",0x92F0],
- ["E488",0x92F1],
- ["E489",0x92F2],
- ["E48A",0x92F3],
- ["E48B",0x92F4],
- ["E48C",0x92F5],
- ["E48D",0x92F6],
- ["E48E",0x92F7],
- ["E48F",0x92F8],
- ["E490",0x92F9],
- ["E491",0x92FA],
- ["E492",0x92FB],
- ["E493",0x92FC],
- ["E494",0x92FD],
- ["E495",0x92FE],
- ["E496",0x92FF],
- ["E497",0x9300],
- ["E498",0x9301],
- ["E499",0x9302],
- ["E49A",0x9303],
- ["E49B",0x9304],
- ["E49C",0x9305],
- ["E49D",0x9306],
- ["E49E",0x9307],
- ["E49F",0x9308],
- ["E4A0",0x9309],
- ["E540",0x930A],
- ["E541",0x930B],
- ["E542",0x930C],
- ["E543",0x930D],
- ["E544",0x930E],
- ["E545",0x930F],
- ["E546",0x9310],
- ["E547",0x9311],
- ["E548",0x9312],
- ["E549",0x9313],
- ["E54A",0x9314],
- ["E54B",0x9315],
- ["E54C",0x9316],
- ["E54D",0x9317],
- ["E54E",0x9318],
- ["E54F",0x9319],
- ["E550",0x931A],
- ["E551",0x931B],
- ["E552",0x931C],
- ["E553",0x931D],
- ["E554",0x931E],
- ["E555",0x931F],
- ["E556",0x9320],
- ["E557",0x9321],
- ["E558",0x9322],
- ["E559",0x9323],
- ["E55A",0x9324],
- ["E55B",0x9325],
- ["E55C",0x9326],
- ["E55D",0x9327],
- ["E55E",0x9328],
- ["E55F",0x9329],
- ["E560",0x932A],
- ["E561",0x932B],
- ["E562",0x932C],
- ["E563",0x932D],
- ["E564",0x932E],
- ["E565",0x932F],
- ["E566",0x9330],
- ["E567",0x9331],
- ["E568",0x9332],
- ["E569",0x9333],
- ["E56A",0x9334],
- ["E56B",0x9335],
- ["E56C",0x9336],
- ["E56D",0x9337],
- ["E56E",0x9338],
- ["E56F",0x9339],
- ["E570",0x933A],
- ["E571",0x933B],
- ["E572",0x933C],
- ["E573",0x933D],
- ["F6C9",0x933E],
- ["E574",0x933F],
- ["E575",0x9340],
- ["E576",0x9341],
- ["E577",0x9342],
- ["E578",0x9343],
- ["E579",0x9344],
- ["E57A",0x9345],
- ["E57B",0x9346],
- ["E57C",0x9347],
- ["E57D",0x9348],
- ["E57E",0x9349],
- ["E580",0x934A],
- ["E581",0x934B],
- ["E582",0x934C],
- ["E583",0x934D],
- ["E584",0x934E],
- ["E585",0x934F],
- ["E586",0x9350],
- ["E587",0x9351],
- ["E588",0x9352],
- ["E589",0x9353],
- ["E58A",0x9354],
- ["E58B",0x9355],
- ["E58C",0x9356],
- ["E58D",0x9357],
- ["E58E",0x9358],
- ["E58F",0x9359],
- ["E590",0x935A],
- ["E591",0x935B],
- ["E592",0x935C],
- ["E593",0x935D],
- ["E594",0x935E],
- ["E595",0x935F],
- ["E596",0x9360],
- ["E597",0x9361],
- ["E598",0x9362],
- ["E599",0x9363],
- ["E59A",0x9364],
- ["E59B",0x9365],
- ["E59C",0x9366],
- ["E59D",0x9367],
- ["E59E",0x9368],
- ["E59F",0x9369],
- ["F6CA",0x936A],
- ["E5A0",0x936B],
- ["E640",0x936C],
- ["E641",0x936D],
- ["E642",0x936E],
- ["E643",0x936F],
- ["E644",0x9370],
- ["E645",0x9371],
- ["E646",0x9372],
- ["E647",0x9373],
- ["E648",0x9374],
- ["E649",0x9375],
- ["E64A",0x9376],
- ["E64B",0x9377],
- ["E64C",0x9378],
- ["E64D",0x9379],
- ["E64E",0x937A],
- ["E64F",0x937B],
- ["E650",0x937C],
- ["E651",0x937D],
- ["E652",0x937E],
- ["E653",0x937F],
- ["E654",0x9380],
- ["E655",0x9381],
- ["E656",0x9382],
- ["E657",0x9383],
- ["E658",0x9384],
- ["E659",0x9385],
- ["E65A",0x9386],
- ["E65B",0x9387],
- ["E65C",0x9388],
- ["E65D",0x9389],
- ["E65E",0x938A],
- ["E65F",0x938B],
- ["E660",0x938C],
- ["E661",0x938D],
- ["E662",0x938E],
- ["F6CC",0x938F],
- ["E663",0x9390],
- ["E664",0x9391],
- ["E665",0x9392],
- ["E666",0x9393],
- ["E667",0x9394],
- ["E668",0x9395],
- ["E669",0x9396],
- ["E66A",0x9397],
- ["E66B",0x9398],
- ["E66C",0x9399],
- ["E66D",0x939A],
- ["E66E",0x939B],
- ["E66F",0x939C],
- ["E670",0x939D],
- ["E671",0x939E],
- ["E672",0x939F],
- ["E673",0x93A0],
- ["E674",0x93A1],
- ["E675",0x93A2],
- ["E676",0x93A3],
- ["E677",0x93A4],
- ["E678",0x93A5],
- ["E679",0x93A6],
- ["E67A",0x93A7],
- ["E67B",0x93A8],
- ["E67C",0x93A9],
- ["E67D",0x93AA],
- ["E67E",0x93AB],
- ["E680",0x93AC],
- ["E681",0x93AD],
- ["E682",0x93AE],
- ["E683",0x93AF],
- ["E684",0x93B0],
- ["E685",0x93B1],
- ["E686",0x93B2],
- ["E687",0x93B3],
- ["E688",0x93B4],
- ["E689",0x93B5],
- ["E68A",0x93B6],
- ["E68B",0x93B7],
- ["E68C",0x93B8],
- ["E68D",0x93B9],
- ["E68E",0x93BA],
- ["E68F",0x93BB],
- ["E690",0x93BC],
- ["E691",0x93BD],
- ["E692",0x93BE],
- ["E693",0x93BF],
- ["E694",0x93C0],
- ["E695",0x93C1],
- ["E696",0x93C2],
- ["E697",0x93C3],
- ["E698",0x93C4],
- ["E699",0x93C5],
- ["E69A",0x93C6],
- ["E69B",0x93C7],
- ["E69C",0x93C8],
- ["E69D",0x93C9],
- ["F6CB",0x93CA],
- ["E69E",0x93CB],
- ["E69F",0x93CC],
- ["E6A0",0x93CD],
- ["E740",0x93CE],
- ["E741",0x93CF],
- ["E742",0x93D0],
- ["E743",0x93D1],
- ["E744",0x93D2],
- ["E745",0x93D3],
- ["E746",0x93D4],
- ["E747",0x93D5],
- ["F7E9",0x93D6],
- ["E748",0x93D7],
- ["E749",0x93D8],
- ["E74A",0x93D9],
- ["E74B",0x93DA],
- ["E74C",0x93DB],
- ["E74D",0x93DC],
- ["E74E",0x93DD],
- ["E74F",0x93DE],
- ["E750",0x93DF],
- ["E751",0x93E0],
- ["E752",0x93E1],
- ["E753",0x93E2],
- ["E754",0x93E3],
- ["E755",0x93E4],
- ["E756",0x93E5],
- ["E757",0x93E6],
- ["E758",0x93E7],
- ["E759",0x93E8],
- ["E75A",0x93E9],
- ["E75B",0x93EA],
- ["E75C",0x93EB],
- ["E75D",0x93EC],
- ["E75E",0x93ED],
- ["E75F",0x93EE],
- ["E760",0x93EF],
- ["E761",0x93F0],
- ["E762",0x93F1],
- ["E763",0x93F2],
- ["E764",0x93F3],
- ["E765",0x93F4],
- ["E766",0x93F5],
- ["E767",0x93F6],
- ["E768",0x93F7],
- ["E769",0x93F8],
- ["E76A",0x93F9],
- ["E76B",0x93FA],
- ["E76C",0x93FB],
- ["E76D",0x93FC],
- ["E76E",0x93FD],
- ["E76F",0x93FE],
- ["E770",0x93FF],
- ["E771",0x9400],
- ["E772",0x9401],
- ["E773",0x9402],
- ["E774",0x9403],
- ["E775",0x9404],
- ["E776",0x9405],
- ["E777",0x9406],
- ["E778",0x9407],
- ["E779",0x9408],
- ["E77A",0x9409],
- ["E77B",0x940A],
- ["E77C",0x940B],
- ["E77D",0x940C],
- ["E77E",0x940D],
- ["E780",0x940E],
- ["E781",0x940F],
- ["E782",0x9410],
- ["E783",0x9411],
- ["E784",0x9412],
- ["E785",0x9413],
- ["E786",0x9414],
- ["E787",0x9415],
- ["E788",0x9416],
- ["E789",0x9417],
- ["E78A",0x9418],
- ["E78B",0x9419],
- ["E78C",0x941A],
- ["E78D",0x941B],
- ["E78E",0x941C],
- ["E78F",0x941D],
- ["E790",0x941E],
- ["E791",0x941F],
- ["E792",0x9420],
- ["E793",0x9421],
- ["E794",0x9422],
- ["E795",0x9423],
- ["E796",0x9424],
- ["E797",0x9425],
- ["E798",0x9426],
- ["E799",0x9427],
- ["E79A",0x9428],
- ["E79B",0x9429],
- ["E79C",0x942A],
- ["E79D",0x942B],
- ["E79E",0x942C],
- ["E79F",0x942D],
- ["E7A0",0x942E],
- ["E840",0x942F],
- ["E841",0x9430],
- ["E842",0x9431],
- ["E843",0x9432],
- ["E844",0x9433],
- ["E845",0x9434],
- ["E846",0x9435],
- ["E847",0x9436],
- ["E848",0x9437],
- ["E849",0x9438],
- ["E84A",0x9439],
- ["E84B",0x943A],
- ["E84C",0x943B],
- ["E84D",0x943C],
- ["E84E",0x943D],
- ["F6CD",0x943E],
- ["E84F",0x943F],
- ["E850",0x9440],
- ["E851",0x9441],
- ["E852",0x9442],
- ["E853",0x9443],
- ["E854",0x9444],
- ["E855",0x9445],
- ["E856",0x9446],
- ["E857",0x9447],
- ["E858",0x9448],
- ["E859",0x9449],
- ["E85A",0x944A],
- ["E85B",0x944B],
- ["E85C",0x944C],
- ["E85D",0x944D],
- ["E85E",0x944E],
- ["E85F",0x944F],
- ["E860",0x9450],
- ["E861",0x9451],
- ["E862",0x9452],
- ["E863",0x9453],
- ["E864",0x9454],
- ["E865",0x9455],
- ["E866",0x9456],
- ["E867",0x9457],
- ["E868",0x9458],
- ["E869",0x9459],
- ["E86A",0x945A],
- ["E86B",0x945B],
- ["E86C",0x945C],
- ["E86D",0x945D],
- ["E86E",0x945E],
- ["E86F",0x945F],
- ["E870",0x9460],
- ["E871",0x9461],
- ["E872",0x9462],
- ["E873",0x9463],
- ["E874",0x9464],
- ["E875",0x9465],
- ["E876",0x9466],
- ["E877",0x9467],
- ["E878",0x9468],
- ["E879",0x9469],
- ["E87A",0x946A],
- ["F6CE",0x946B],
- ["E87B",0x946C],
- ["E87C",0x946D],
- ["E87D",0x946E],
- ["E87E",0x946F],
- ["E880",0x9470],
- ["E881",0x9471],
- ["E882",0x9472],
- ["E883",0x9473],
- ["E884",0x9474],
- ["E885",0x9475],
- ["E886",0x9476],
- ["E887",0x9477],
- ["E888",0x9478],
- ["E889",0x9479],
- ["E88A",0x947A],
- ["E88B",0x947B],
- ["E88C",0x947C],
- ["E88D",0x947D],
- ["E88E",0x947E],
- ["E88F",0x947F],
- ["E890",0x9480],
- ["E891",0x9481],
- ["E892",0x9482],
- ["E893",0x9483],
- ["E894",0x9484],
- ["EEC4",0x9485],
- ["EEC5",0x9486],
- ["EEC6",0x9487],
- ["D5EB",0x9488],
- ["B6A4",0x9489],
- ["EEC8",0x948A],
- ["EEC7",0x948B],
- ["EEC9",0x948C],
- ["EECA",0x948D],
- ["C7A5",0x948E],
- ["EECB",0x948F],
- ["EECC",0x9490],
- ["E895",0x9491],
- ["B7B0",0x9492],
- ["B5F6",0x9493],
- ["EECD",0x9494],
- ["EECF",0x9495],
- ["E896",0x9496],
- ["EECE",0x9497],
- ["E897",0x9498],
- ["B8C6",0x9499],
- ["EED0",0x949A],
- ["EED1",0x949B],
- ["EED2",0x949C],
- ["B6DB",0x949D],
- ["B3AE",0x949E],
- ["D6D3",0x949F],
- ["C4C6",0x94A0],
- ["B1B5",0x94A1],
- ["B8D6",0x94A2],
- ["EED3",0x94A3],
- ["EED4",0x94A4],
- ["D4BF",0x94A5],
- ["C7D5",0x94A6],
- ["BEFB",0x94A7],
- ["CED9",0x94A8],
- ["B9B3",0x94A9],
- ["EED6",0x94AA],
- ["EED5",0x94AB],
- ["EED8",0x94AC],
- ["EED7",0x94AD],
- ["C5A5",0x94AE],
- ["EED9",0x94AF],
- ["EEDA",0x94B0],
- ["C7AE",0x94B1],
- ["EEDB",0x94B2],
- ["C7AF",0x94B3],
- ["EEDC",0x94B4],
- ["B2A7",0x94B5],
- ["EEDD",0x94B6],
- ["EEDE",0x94B7],
- ["EEDF",0x94B8],
- ["EEE0",0x94B9],
- ["EEE1",0x94BA],
- ["D7EA",0x94BB],
- ["EEE2",0x94BC],
- ["EEE3",0x94BD],
- ["BCD8",0x94BE],
- ["EEE4",0x94BF],
- ["D3CB",0x94C0],
- ["CCFA",0x94C1],
- ["B2AC",0x94C2],
- ["C1E5",0x94C3],
- ["EEE5",0x94C4],
- ["C7A6",0x94C5],
- ["C3AD",0x94C6],
- ["E898",0x94C7],
- ["EEE6",0x94C8],
- ["EEE7",0x94C9],
- ["EEE8",0x94CA],
- ["EEE9",0x94CB],
- ["EEEA",0x94CC],
- ["EEEB",0x94CD],
- ["EEEC",0x94CE],
- ["E899",0x94CF],
- ["EEED",0x94D0],
- ["EEEE",0x94D1],
- ["EEEF",0x94D2],
- ["E89A",0x94D3],
- ["E89B",0x94D4],
- ["EEF0",0x94D5],
- ["EEF1",0x94D6],
- ["EEF2",0x94D7],
- ["EEF4",0x94D8],
- ["EEF3",0x94D9],
- ["E89C",0x94DA],
- ["EEF5",0x94DB],
- ["CDAD",0x94DC],
- ["C2C1",0x94DD],
- ["EEF6",0x94DE],
- ["EEF7",0x94DF],
- ["EEF8",0x94E0],
- ["D5A1",0x94E1],
- ["EEF9",0x94E2],
- ["CFB3",0x94E3],
- ["EEFA",0x94E4],
- ["EEFB",0x94E5],
- ["E89D",0x94E6],
- ["EEFC",0x94E7],
- ["EEFD",0x94E8],
- ["EFA1",0x94E9],
- ["EEFE",0x94EA],
- ["EFA2",0x94EB],
- ["B8F5",0x94EC],
- ["C3FA",0x94ED],
- ["EFA3",0x94EE],
- ["EFA4",0x94EF],
- ["BDC2",0x94F0],
- ["D2BF",0x94F1],
- ["B2F9",0x94F2],
- ["EFA5",0x94F3],
- ["EFA6",0x94F4],
- ["EFA7",0x94F5],
- ["D2F8",0x94F6],
- ["EFA8",0x94F7],
- ["D6FD",0x94F8],
- ["EFA9",0x94F9],
- ["C6CC",0x94FA],
- ["E89E",0x94FB],
- ["EFAA",0x94FC],
- ["EFAB",0x94FD],
- ["C1B4",0x94FE],
- ["EFAC",0x94FF],
- ["CFFA",0x9500],
- ["CBF8",0x9501],
- ["EFAE",0x9502],
- ["EFAD",0x9503],
- ["B3FA",0x9504],
- ["B9F8",0x9505],
- ["EFAF",0x9506],
- ["EFB0",0x9507],
- ["D0E2",0x9508],
- ["EFB1",0x9509],
- ["EFB2",0x950A],
- ["B7E6",0x950B],
- ["D0BF",0x950C],
- ["EFB3",0x950D],
- ["EFB4",0x950E],
- ["EFB5",0x950F],
- ["C8F1",0x9510],
- ["CCE0",0x9511],
- ["EFB6",0x9512],
- ["EFB7",0x9513],
- ["EFB8",0x9514],
- ["EFB9",0x9515],
- ["EFBA",0x9516],
- ["D5E0",0x9517],
- ["EFBB",0x9518],
- ["B4ED",0x9519],
- ["C3AA",0x951A],
- ["EFBC",0x951B],
- ["E89F",0x951C],
- ["EFBD",0x951D],
- ["EFBE",0x951E],
- ["EFBF",0x951F],
- ["E8A0",0x9520],
- ["CEFD",0x9521],
- ["EFC0",0x9522],
- ["C2E0",0x9523],
- ["B4B8",0x9524],
- ["D7B6",0x9525],
- ["BDF5",0x9526],
- ["E940",0x9527],
- ["CFC7",0x9528],
- ["EFC3",0x9529],
- ["EFC1",0x952A],
- ["EFC2",0x952B],
- ["EFC4",0x952C],
- ["B6A7",0x952D],
- ["BCFC",0x952E],
- ["BEE2",0x952F],
- ["C3CC",0x9530],
- ["EFC5",0x9531],
- ["EFC6",0x9532],
- ["E941",0x9533],
- ["EFC7",0x9534],
- ["EFCF",0x9535],
- ["EFC8",0x9536],
- ["EFC9",0x9537],
- ["EFCA",0x9538],
- ["C7C2",0x9539],
- ["EFF1",0x953A],
- ["B6CD",0x953B],
- ["EFCB",0x953C],
- ["E942",0x953D],
- ["EFCC",0x953E],
- ["EFCD",0x953F],
- ["B6C6",0x9540],
- ["C3BE",0x9541],
- ["EFCE",0x9542],
- ["E943",0x9543],
- ["EFD0",0x9544],
- ["EFD1",0x9545],
- ["EFD2",0x9546],
- ["D5F2",0x9547],
- ["E944",0x9548],
- ["EFD3",0x9549],
- ["C4F7",0x954A],
- ["E945",0x954B],
- ["EFD4",0x954C],
- ["C4F8",0x954D],
- ["EFD5",0x954E],
- ["EFD6",0x954F],
- ["B8E4",0x9550],
- ["B0F7",0x9551],
- ["EFD7",0x9552],
- ["EFD8",0x9553],
- ["EFD9",0x9554],
- ["E946",0x9555],
- ["EFDA",0x9556],
- ["EFDB",0x9557],
- ["EFDC",0x9558],
- ["EFDD",0x9559],
- ["E947",0x955A],
- ["EFDE",0x955B],
- ["BEB5",0x955C],
- ["EFE1",0x955D],
- ["EFDF",0x955E],
- ["EFE0",0x955F],
- ["E948",0x9560],
- ["EFE2",0x9561],
- ["EFE3",0x9562],
- ["C1CD",0x9563],
- ["EFE4",0x9564],
- ["EFE5",0x9565],
- ["EFE6",0x9566],
- ["EFE7",0x9567],
- ["EFE8",0x9568],
- ["EFE9",0x9569],
- ["EFEA",0x956A],
- ["EFEB",0x956B],
- ["EFEC",0x956C],
- ["C0D8",0x956D],
- ["E949",0x956E],
- ["EFED",0x956F],
- ["C1AD",0x9570],
- ["EFEE",0x9571],
- ["EFEF",0x9572],
- ["EFF0",0x9573],
- ["E94A",0x9574],
- ["E94B",0x9575],
- ["CFE2",0x9576],
- ["E94C",0x9577],
- ["E94D",0x9578],
- ["E94E",0x9579],
- ["E94F",0x957A],
- ["E950",0x957B],
- ["E951",0x957C],
- ["E952",0x957D],
- ["E953",0x957E],
- ["B3A4",0x957F],
- ["E954",0x9580],
- ["E955",0x9581],
- ["E956",0x9582],
- ["E957",0x9583],
- ["E958",0x9584],
- ["E959",0x9585],
- ["E95A",0x9586],
- ["E95B",0x9587],
- ["E95C",0x9588],
- ["E95D",0x9589],
- ["E95E",0x958A],
- ["E95F",0x958B],
- ["E960",0x958C],
- ["E961",0x958D],
- ["E962",0x958E],
- ["E963",0x958F],
- ["E964",0x9590],
- ["E965",0x9591],
- ["E966",0x9592],
- ["E967",0x9593],
- ["E968",0x9594],
- ["E969",0x9595],
- ["E96A",0x9596],
- ["E96B",0x9597],
- ["E96C",0x9598],
- ["E96D",0x9599],
- ["E96E",0x959A],
- ["E96F",0x959B],
- ["E970",0x959C],
- ["E971",0x959D],
- ["E972",0x959E],
- ["E973",0x959F],
- ["E974",0x95A0],
- ["E975",0x95A1],
- ["E976",0x95A2],
- ["E977",0x95A3],
- ["E978",0x95A4],
- ["E979",0x95A5],
- ["E97A",0x95A6],
- ["E97B",0x95A7],
- ["E97C",0x95A8],
- ["E97D",0x95A9],
- ["E97E",0x95AA],
- ["E980",0x95AB],
- ["E981",0x95AC],
- ["E982",0x95AD],
- ["E983",0x95AE],
- ["E984",0x95AF],
- ["E985",0x95B0],
- ["E986",0x95B1],
- ["E987",0x95B2],
- ["E988",0x95B3],
- ["E989",0x95B4],
- ["E98A",0x95B5],
- ["E98B",0x95B6],
- ["E98C",0x95B7],
- ["E98D",0x95B8],
- ["E98E",0x95B9],
- ["E98F",0x95BA],
- ["E990",0x95BB],
- ["E991",0x95BC],
- ["E992",0x95BD],
- ["E993",0x95BE],
- ["E994",0x95BF],
- ["E995",0x95C0],
- ["E996",0x95C1],
- ["E997",0x95C2],
- ["E998",0x95C3],
- ["E999",0x95C4],
- ["E99A",0x95C5],
- ["E99B",0x95C6],
- ["E99C",0x95C7],
- ["E99D",0x95C8],
- ["E99E",0x95C9],
- ["E99F",0x95CA],
- ["E9A0",0x95CB],
- ["EA40",0x95CC],
- ["EA41",0x95CD],
- ["EA42",0x95CE],
- ["EA43",0x95CF],
- ["EA44",0x95D0],
- ["EA45",0x95D1],
- ["EA46",0x95D2],
- ["EA47",0x95D3],
- ["EA48",0x95D4],
- ["EA49",0x95D5],
- ["EA4A",0x95D6],
- ["EA4B",0x95D7],
- ["EA4C",0x95D8],
- ["EA4D",0x95D9],
- ["EA4E",0x95DA],
- ["EA4F",0x95DB],
- ["EA50",0x95DC],
- ["EA51",0x95DD],
- ["EA52",0x95DE],
- ["EA53",0x95DF],
- ["EA54",0x95E0],
- ["EA55",0x95E1],
- ["EA56",0x95E2],
- ["EA57",0x95E3],
- ["EA58",0x95E4],
- ["EA59",0x95E5],
- ["EA5A",0x95E6],
- ["EA5B",0x95E7],
- ["C3C5",0x95E8],
- ["E3C5",0x95E9],
- ["C9C1",0x95EA],
- ["E3C6",0x95EB],
- ["EA5C",0x95EC],
- ["B1D5",0x95ED],
- ["CECA",0x95EE],
- ["B4B3",0x95EF],
- ["C8F2",0x95F0],
- ["E3C7",0x95F1],
- ["CFD0",0x95F2],
- ["E3C8",0x95F3],
- ["BCE4",0x95F4],
- ["E3C9",0x95F5],
- ["E3CA",0x95F6],
- ["C3C6",0x95F7],
- ["D5A2",0x95F8],
- ["C4D6",0x95F9],
- ["B9EB",0x95FA],
- ["CEC5",0x95FB],
- ["E3CB",0x95FC],
- ["C3F6",0x95FD],
- ["E3CC",0x95FE],
- ["EA5D",0x95FF],
- ["B7A7",0x9600],
- ["B8F3",0x9601],
- ["BAD2",0x9602],
- ["E3CD",0x9603],
- ["E3CE",0x9604],
- ["D4C4",0x9605],
- ["E3CF",0x9606],
- ["EA5E",0x9607],
- ["E3D0",0x9608],
- ["D1CB",0x9609],
- ["E3D1",0x960A],
- ["E3D2",0x960B],
- ["E3D3",0x960C],
- ["E3D4",0x960D],
- ["D1D6",0x960E],
- ["E3D5",0x960F],
- ["B2FB",0x9610],
- ["C0BB",0x9611],
- ["E3D6",0x9612],
- ["EA5F",0x9613],
- ["C0AB",0x9614],
- ["E3D7",0x9615],
- ["E3D8",0x9616],
- ["E3D9",0x9617],
- ["EA60",0x9618],
- ["E3DA",0x9619],
- ["E3DB",0x961A],
- ["EA61",0x961B],
- ["B8B7",0x961C],
- ["DAE2",0x961D],
- ["EA62",0x961E],
- ["B6D3",0x961F],
- ["EA63",0x9620],
- ["DAE4",0x9621],
- ["DAE3",0x9622],
- ["EA64",0x9623],
- ["EA65",0x9624],
- ["EA66",0x9625],
- ["EA67",0x9626],
- ["EA68",0x9627],
- ["EA69",0x9628],
- ["EA6A",0x9629],
- ["DAE6",0x962A],
- ["EA6B",0x962B],
- ["EA6C",0x962C],
- ["EA6D",0x962D],
- ["C8EE",0x962E],
- ["EA6E",0x962F],
- ["EA6F",0x9630],
- ["DAE5",0x9631],
- ["B7C0",0x9632],
- ["D1F4",0x9633],
- ["D2F5",0x9634],
- ["D5F3",0x9635],
- ["BDD7",0x9636],
- ["EA70",0x9637],
- ["EA71",0x9638],
- ["EA72",0x9639],
- ["EA73",0x963A],
- ["D7E8",0x963B],
- ["DAE8",0x963C],
- ["DAE7",0x963D],
- ["EA74",0x963E],
- ["B0A2",0x963F],
- ["CDD3",0x9640],
- ["EA75",0x9641],
- ["DAE9",0x9642],
- ["EA76",0x9643],
- ["B8BD",0x9644],
- ["BCCA",0x9645],
- ["C2BD",0x9646],
- ["C2A4",0x9647],
- ["B3C2",0x9648],
- ["DAEA",0x9649],
- ["EA77",0x964A],
- ["C2AA",0x964B],
- ["C4B0",0x964C],
- ["BDB5",0x964D],
- ["EA78",0x964E],
- ["EA79",0x964F],
- ["CFDE",0x9650],
- ["EA7A",0x9651],
- ["EA7B",0x9652],
- ["EA7C",0x9653],
- ["DAEB",0x9654],
- ["C9C2",0x9655],
- ["EA7D",0x9656],
- ["EA7E",0x9657],
- ["EA80",0x9658],
- ["EA81",0x9659],
- ["EA82",0x965A],
- ["B1DD",0x965B],
- ["EA83",0x965C],
- ["EA84",0x965D],
- ["EA85",0x965E],
- ["DAEC",0x965F],
- ["EA86",0x9660],
- ["B6B8",0x9661],
- ["D4BA",0x9662],
- ["EA87",0x9663],
- ["B3FD",0x9664],
- ["EA88",0x9665],
- ["EA89",0x9666],
- ["DAED",0x9667],
- ["D4C9",0x9668],
- ["CFD5",0x9669],
- ["C5E3",0x966A],
- ["EA8A",0x966B],
- ["DAEE",0x966C],
- ["EA8B",0x966D],
- ["EA8C",0x966E],
- ["EA8D",0x966F],
- ["EA8E",0x9670],
- ["EA8F",0x9671],
- ["DAEF",0x9672],
- ["EA90",0x9673],
- ["DAF0",0x9674],
- ["C1EA",0x9675],
- ["CCD5",0x9676],
- ["CFDD",0x9677],
- ["EA91",0x9678],
- ["EA92",0x9679],
- ["EA93",0x967A],
- ["EA94",0x967B],
- ["EA95",0x967C],
- ["EA96",0x967D],
- ["EA97",0x967E],
- ["EA98",0x967F],
- ["EA99",0x9680],
- ["EA9A",0x9681],
- ["EA9B",0x9682],
- ["EA9C",0x9683],
- ["EA9D",0x9684],
- ["D3E7",0x9685],
- ["C2A1",0x9686],
- ["EA9E",0x9687],
- ["DAF1",0x9688],
- ["EA9F",0x9689],
- ["EAA0",0x968A],
- ["CBE5",0x968B],
- ["EB40",0x968C],
- ["DAF2",0x968D],
- ["EB41",0x968E],
- ["CBE6",0x968F],
- ["D2FE",0x9690],
- ["EB42",0x9691],
- ["EB43",0x9692],
- ["EB44",0x9693],
- ["B8F4",0x9694],
- ["EB45",0x9695],
- ["EB46",0x9696],
- ["DAF3",0x9697],
- ["B0AF",0x9698],
- ["CFB6",0x9699],
- ["EB47",0x969A],
- ["EB48",0x969B],
- ["D5CF",0x969C],
- ["EB49",0x969D],
- ["EB4A",0x969E],
- ["EB4B",0x969F],
- ["EB4C",0x96A0],
- ["EB4D",0x96A1],
- ["EB4E",0x96A2],
- ["EB4F",0x96A3],
- ["EB50",0x96A4],
- ["EB51",0x96A5],
- ["EB52",0x96A6],
- ["CBED",0x96A7],
- ["EB53",0x96A8],
- ["EB54",0x96A9],
- ["EB55",0x96AA],
- ["EB56",0x96AB],
- ["EB57",0x96AC],
- ["EB58",0x96AD],
- ["EB59",0x96AE],
- ["EB5A",0x96AF],
- ["DAF4",0x96B0],
- ["EB5B",0x96B1],
- ["EB5C",0x96B2],
- ["E3C4",0x96B3],
- ["EB5D",0x96B4],
- ["EB5E",0x96B5],
- ["C1A5",0x96B6],
- ["EB5F",0x96B7],
- ["EB60",0x96B8],
- ["F6BF",0x96B9],
- ["EB61",0x96BA],
- ["EB62",0x96BB],
- ["F6C0",0x96BC],
- ["F6C1",0x96BD],
- ["C4D1",0x96BE],
- ["EB63",0x96BF],
- ["C8B8",0x96C0],
- ["D1E3",0x96C1],
- ["EB64",0x96C2],
- ["EB65",0x96C3],
- ["D0DB",0x96C4],
- ["D1C5",0x96C5],
- ["BCAF",0x96C6],
- ["B9CD",0x96C7],
- ["EB66",0x96C8],
- ["EFF4",0x96C9],
- ["EB67",0x96CA],
- ["EB68",0x96CB],
- ["B4C6",0x96CC],
- ["D3BA",0x96CD],
- ["F6C2",0x96CE],
- ["B3FB",0x96CF],
- ["EB69",0x96D0],
- ["EB6A",0x96D1],
- ["F6C3",0x96D2],
- ["EB6B",0x96D3],
- ["EB6C",0x96D4],
- ["B5F1",0x96D5],
- ["EB6D",0x96D6],
- ["EB6E",0x96D7],
- ["EB6F",0x96D8],
- ["EB70",0x96D9],
- ["EB71",0x96DA],
- ["EB72",0x96DB],
- ["EB73",0x96DC],
- ["EB74",0x96DD],
- ["EB75",0x96DE],
- ["EB76",0x96DF],
- ["F6C5",0x96E0],
- ["EB77",0x96E1],
- ["EB78",0x96E2],
- ["EB79",0x96E3],
- ["EB7A",0x96E4],
- ["EB7B",0x96E5],
- ["EB7C",0x96E6],
- ["EB7D",0x96E7],
- ["D3EA",0x96E8],
- ["F6A7",0x96E9],
- ["D1A9",0x96EA],
- ["EB7E",0x96EB],
- ["EB80",0x96EC],
- ["EB81",0x96ED],
- ["EB82",0x96EE],
- ["F6A9",0x96EF],
- ["EB83",0x96F0],
- ["EB84",0x96F1],
- ["EB85",0x96F2],
- ["F6A8",0x96F3],
- ["EB86",0x96F4],
- ["EB87",0x96F5],
- ["C1E3",0x96F6],
- ["C0D7",0x96F7],
- ["EB88",0x96F8],
- ["B1A2",0x96F9],
- ["EB89",0x96FA],
- ["EB8A",0x96FB],
- ["EB8B",0x96FC],
- ["EB8C",0x96FD],
- ["CEED",0x96FE],
- ["EB8D",0x96FF],
- ["D0E8",0x9700],
- ["F6AB",0x9701],
- ["EB8E",0x9702],
- ["EB8F",0x9703],
- ["CFF6",0x9704],
- ["EB90",0x9705],
- ["F6AA",0x9706],
- ["D5F0",0x9707],
- ["F6AC",0x9708],
- ["C3B9",0x9709],
- ["EB91",0x970A],
- ["EB92",0x970B],
- ["EB93",0x970C],
- ["BBF4",0x970D],
- ["F6AE",0x970E],
- ["F6AD",0x970F],
- ["EB94",0x9710],
- ["EB95",0x9711],
- ["EB96",0x9712],
- ["C4DE",0x9713],
- ["EB97",0x9714],
- ["EB98",0x9715],
- ["C1D8",0x9716],
- ["EB99",0x9717],
- ["EB9A",0x9718],
- ["EB9B",0x9719],
- ["EB9C",0x971A],
- ["EB9D",0x971B],
- ["CBAA",0x971C],
- ["EB9E",0x971D],
- ["CFBC",0x971E],
- ["EB9F",0x971F],
- ["EBA0",0x9720],
- ["EC40",0x9721],
- ["EC41",0x9722],
- ["EC42",0x9723],
- ["EC43",0x9724],
- ["EC44",0x9725],
- ["EC45",0x9726],
- ["EC46",0x9727],
- ["EC47",0x9728],
- ["EC48",0x9729],
- ["F6AF",0x972A],
- ["EC49",0x972B],
- ["EC4A",0x972C],
- ["F6B0",0x972D],
- ["EC4B",0x972E],
- ["EC4C",0x972F],
- ["F6B1",0x9730],
- ["EC4D",0x9731],
- ["C2B6",0x9732],
- ["EC4E",0x9733],
- ["EC4F",0x9734],
- ["EC50",0x9735],
- ["EC51",0x9736],
- ["EC52",0x9737],
- ["B0D4",0x9738],
- ["C5F9",0x9739],
- ["EC53",0x973A],
- ["EC54",0x973B],
- ["EC55",0x973C],
- ["EC56",0x973D],
- ["F6B2",0x973E],
- ["EC57",0x973F],
- ["EC58",0x9740],
- ["EC59",0x9741],
- ["EC5A",0x9742],
- ["EC5B",0x9743],
- ["EC5C",0x9744],
- ["EC5D",0x9745],
- ["EC5E",0x9746],
- ["EC5F",0x9747],
- ["EC60",0x9748],
- ["EC61",0x9749],
- ["EC62",0x974A],
- ["EC63",0x974B],
- ["EC64",0x974C],
- ["EC65",0x974D],
- ["EC66",0x974E],
- ["EC67",0x974F],
- ["EC68",0x9750],
- ["EC69",0x9751],
- ["C7E0",0x9752],
- ["F6A6",0x9753],
- ["EC6A",0x9754],
- ["EC6B",0x9755],
- ["BEB8",0x9756],
- ["EC6C",0x9757],
- ["EC6D",0x9758],
- ["BEB2",0x9759],
- ["EC6E",0x975A],
- ["B5E5",0x975B],
- ["EC6F",0x975C],
- ["EC70",0x975D],
- ["B7C7",0x975E],
- ["EC71",0x975F],
- ["BFBF",0x9760],
- ["C3D2",0x9761],
- ["C3E6",0x9762],
- ["EC72",0x9763],
- ["EC73",0x9764],
- ["D8CC",0x9765],
- ["EC74",0x9766],
- ["EC75",0x9767],
- ["EC76",0x9768],
- ["B8EF",0x9769],
- ["EC77",0x976A],
- ["EC78",0x976B],
- ["EC79",0x976C],
- ["EC7A",0x976D],
- ["EC7B",0x976E],
- ["EC7C",0x976F],
- ["EC7D",0x9770],
- ["EC7E",0x9771],
- ["EC80",0x9772],
- ["BDF9",0x9773],
- ["D1A5",0x9774],
- ["EC81",0x9775],
- ["B0D0",0x9776],
- ["EC82",0x9777],
- ["EC83",0x9778],
- ["EC84",0x9779],
- ["EC85",0x977A],
- ["EC86",0x977B],
- ["F7B0",0x977C],
- ["EC87",0x977D],
- ["EC88",0x977E],
- ["EC89",0x977F],
- ["EC8A",0x9780],
- ["EC8B",0x9781],
- ["EC8C",0x9782],
- ["EC8D",0x9783],
- ["EC8E",0x9784],
- ["F7B1",0x9785],
- ["EC8F",0x9786],
- ["EC90",0x9787],
- ["EC91",0x9788],
- ["EC92",0x9789],
- ["EC93",0x978A],
- ["D0AC",0x978B],
- ["EC94",0x978C],
- ["B0B0",0x978D],
- ["EC95",0x978E],
- ["EC96",0x978F],
- ["EC97",0x9790],
- ["F7B2",0x9791],
- ["F7B3",0x9792],
- ["EC98",0x9793],
- ["F7B4",0x9794],
- ["EC99",0x9795],
- ["EC9A",0x9796],
- ["EC9B",0x9797],
- ["C7CA",0x9798],
- ["EC9C",0x9799],
- ["EC9D",0x979A],
- ["EC9E",0x979B],
- ["EC9F",0x979C],
- ["ECA0",0x979D],
- ["ED40",0x979E],
- ["ED41",0x979F],
- ["BECF",0x97A0],
- ["ED42",0x97A1],
- ["ED43",0x97A2],
- ["F7B7",0x97A3],
- ["ED44",0x97A4],
- ["ED45",0x97A5],
- ["ED46",0x97A6],
- ["ED47",0x97A7],
- ["ED48",0x97A8],
- ["ED49",0x97A9],
- ["ED4A",0x97AA],
- ["F7B6",0x97AB],
- ["ED4B",0x97AC],
- ["B1DE",0x97AD],
- ["ED4C",0x97AE],
- ["F7B5",0x97AF],
- ["ED4D",0x97B0],
- ["ED4E",0x97B1],
- ["F7B8",0x97B2],
- ["ED4F",0x97B3],
- ["F7B9",0x97B4],
- ["ED50",0x97B5],
- ["ED51",0x97B6],
- ["ED52",0x97B7],
- ["ED53",0x97B8],
- ["ED54",0x97B9],
- ["ED55",0x97BA],
- ["ED56",0x97BB],
- ["ED57",0x97BC],
- ["ED58",0x97BD],
- ["ED59",0x97BE],
- ["ED5A",0x97BF],
- ["ED5B",0x97C0],
- ["ED5C",0x97C1],
- ["ED5D",0x97C2],
- ["ED5E",0x97C3],
- ["ED5F",0x97C4],
- ["ED60",0x97C5],
- ["ED61",0x97C6],
- ["ED62",0x97C7],
- ["ED63",0x97C8],
- ["ED64",0x97C9],
- ["ED65",0x97CA],
- ["ED66",0x97CB],
- ["ED67",0x97CC],
- ["ED68",0x97CD],
- ["ED69",0x97CE],
- ["ED6A",0x97CF],
- ["ED6B",0x97D0],
- ["ED6C",0x97D1],
- ["ED6D",0x97D2],
- ["ED6E",0x97D3],
- ["ED6F",0x97D4],
- ["ED70",0x97D5],
- ["ED71",0x97D6],
- ["ED72",0x97D7],
- ["ED73",0x97D8],
- ["ED74",0x97D9],
- ["ED75",0x97DA],
- ["ED76",0x97DB],
- ["ED77",0x97DC],
- ["ED78",0x97DD],
- ["ED79",0x97DE],
- ["ED7A",0x97DF],
- ["ED7B",0x97E0],
- ["ED7C",0x97E1],
- ["ED7D",0x97E2],
- ["ED7E",0x97E3],
- ["ED80",0x97E4],
- ["ED81",0x97E5],
- ["CEA4",0x97E6],
- ["C8CD",0x97E7],
- ["ED82",0x97E8],
- ["BAAB",0x97E9],
- ["E8B8",0x97EA],
- ["E8B9",0x97EB],
- ["E8BA",0x97EC],
- ["BEC2",0x97ED],
- ["ED83",0x97EE],
- ["ED84",0x97EF],
- ["ED85",0x97F0],
- ["ED86",0x97F1],
- ["ED87",0x97F2],
- ["D2F4",0x97F3],
- ["ED88",0x97F4],
- ["D4CF",0x97F5],
- ["C9D8",0x97F6],
- ["ED89",0x97F7],
- ["ED8A",0x97F8],
- ["ED8B",0x97F9],
- ["ED8C",0x97FA],
- ["ED8D",0x97FB],
- ["ED8E",0x97FC],
- ["ED8F",0x97FD],
- ["ED90",0x97FE],
- ["ED91",0x97FF],
- ["ED92",0x9800],
- ["ED93",0x9801],
- ["ED94",0x9802],
- ["ED95",0x9803],
- ["ED96",0x9804],
- ["ED97",0x9805],
- ["ED98",0x9806],
- ["ED99",0x9807],
- ["ED9A",0x9808],
- ["ED9B",0x9809],
- ["ED9C",0x980A],
- ["ED9D",0x980B],
- ["ED9E",0x980C],
- ["ED9F",0x980D],
- ["EDA0",0x980E],
- ["EE40",0x980F],
- ["EE41",0x9810],
- ["EE42",0x9811],
- ["EE43",0x9812],
- ["EE44",0x9813],
- ["EE45",0x9814],
- ["EE46",0x9815],
- ["EE47",0x9816],
- ["EE48",0x9817],
- ["EE49",0x9818],
- ["EE4A",0x9819],
- ["EE4B",0x981A],
- ["EE4C",0x981B],
- ["EE4D",0x981C],
- ["EE4E",0x981D],
- ["EE4F",0x981E],
- ["EE50",0x981F],
- ["EE51",0x9820],
- ["EE52",0x9821],
- ["EE53",0x9822],
- ["EE54",0x9823],
- ["EE55",0x9824],
- ["EE56",0x9825],
- ["EE57",0x9826],
- ["EE58",0x9827],
- ["EE59",0x9828],
- ["EE5A",0x9829],
- ["EE5B",0x982A],
- ["EE5C",0x982B],
- ["EE5D",0x982C],
- ["EE5E",0x982D],
- ["EE5F",0x982E],
- ["EE60",0x982F],
- ["EE61",0x9830],
- ["EE62",0x9831],
- ["EE63",0x9832],
- ["EE64",0x9833],
- ["EE65",0x9834],
- ["EE66",0x9835],
- ["EE67",0x9836],
- ["EE68",0x9837],
- ["EE69",0x9838],
- ["EE6A",0x9839],
- ["EE6B",0x983A],
- ["EE6C",0x983B],
- ["EE6D",0x983C],
- ["EE6E",0x983D],
- ["EE6F",0x983E],
- ["EE70",0x983F],
- ["EE71",0x9840],
- ["EE72",0x9841],
- ["EE73",0x9842],
- ["EE74",0x9843],
- ["EE75",0x9844],
- ["EE76",0x9845],
- ["EE77",0x9846],
- ["EE78",0x9847],
- ["EE79",0x9848],
- ["EE7A",0x9849],
- ["EE7B",0x984A],
- ["EE7C",0x984B],
- ["EE7D",0x984C],
- ["EE7E",0x984D],
- ["EE80",0x984E],
- ["EE81",0x984F],
- ["EE82",0x9850],
- ["EE83",0x9851],
- ["EE84",0x9852],
- ["EE85",0x9853],
- ["EE86",0x9854],
- ["EE87",0x9855],
- ["EE88",0x9856],
- ["EE89",0x9857],
- ["EE8A",0x9858],
- ["EE8B",0x9859],
- ["EE8C",0x985A],
- ["EE8D",0x985B],
- ["EE8E",0x985C],
- ["EE8F",0x985D],
- ["EE90",0x985E],
- ["EE91",0x985F],
- ["EE92",0x9860],
- ["EE93",0x9861],
- ["EE94",0x9862],
- ["EE95",0x9863],
- ["EE96",0x9864],
- ["EE97",0x9865],
- ["EE98",0x9866],
- ["EE99",0x9867],
- ["EE9A",0x9868],
- ["EE9B",0x9869],
- ["EE9C",0x986A],
- ["EE9D",0x986B],
- ["EE9E",0x986C],
- ["EE9F",0x986D],
- ["EEA0",0x986E],
- ["EF40",0x986F],
- ["EF41",0x9870],
- ["EF42",0x9871],
- ["EF43",0x9872],
- ["EF44",0x9873],
- ["EF45",0x9874],
- ["D2B3",0x9875],
- ["B6A5",0x9876],
- ["C7EA",0x9877],
- ["F1FC",0x9878],
- ["CFEE",0x9879],
- ["CBB3",0x987A],
- ["D0EB",0x987B],
- ["E7EF",0x987C],
- ["CDE7",0x987D],
- ["B9CB",0x987E],
- ["B6D9",0x987F],
- ["F1FD",0x9880],
- ["B0E4",0x9881],
- ["CBCC",0x9882],
- ["F1FE",0x9883],
- ["D4A4",0x9884],
- ["C2AD",0x9885],
- ["C1EC",0x9886],
- ["C6C4",0x9887],
- ["BEB1",0x9888],
- ["F2A1",0x9889],
- ["BCD5",0x988A],
- ["EF46",0x988B],
- ["F2A2",0x988C],
- ["F2A3",0x988D],
- ["EF47",0x988E],
- ["F2A4",0x988F],
- ["D2C3",0x9890],
- ["C6B5",0x9891],
- ["EF48",0x9892],
- ["CDC7",0x9893],
- ["F2A5",0x9894],
- ["EF49",0x9895],
- ["D3B1",0x9896],
- ["BFC5",0x9897],
- ["CCE2",0x9898],
- ["EF4A",0x9899],
- ["F2A6",0x989A],
- ["F2A7",0x989B],
- ["D1D5",0x989C],
- ["B6EE",0x989D],
- ["F2A8",0x989E],
- ["F2A9",0x989F],
- ["B5DF",0x98A0],
- ["F2AA",0x98A1],
- ["F2AB",0x98A2],
- ["EF4B",0x98A3],
- ["B2FC",0x98A4],
- ["F2AC",0x98A5],
- ["F2AD",0x98A6],
- ["C8A7",0x98A7],
- ["EF4C",0x98A8],
- ["EF4D",0x98A9],
- ["EF4E",0x98AA],
- ["EF4F",0x98AB],
- ["EF50",0x98AC],
- ["EF51",0x98AD],
- ["EF52",0x98AE],
- ["EF53",0x98AF],
- ["EF54",0x98B0],
- ["EF55",0x98B1],
- ["EF56",0x98B2],
- ["EF57",0x98B3],
- ["EF58",0x98B4],
- ["EF59",0x98B5],
- ["EF5A",0x98B6],
- ["EF5B",0x98B7],
- ["EF5C",0x98B8],
- ["EF5D",0x98B9],
- ["EF5E",0x98BA],
- ["EF5F",0x98BB],
- ["EF60",0x98BC],
- ["EF61",0x98BD],
- ["EF62",0x98BE],
- ["EF63",0x98BF],
- ["EF64",0x98C0],
- ["EF65",0x98C1],
- ["EF66",0x98C2],
- ["EF67",0x98C3],
- ["EF68",0x98C4],
- ["EF69",0x98C5],
- ["EF6A",0x98C6],
- ["EF6B",0x98C7],
- ["EF6C",0x98C8],
- ["EF6D",0x98C9],
- ["EF6E",0x98CA],
- ["EF6F",0x98CB],
- ["EF70",0x98CC],
- ["EF71",0x98CD],
- ["B7E7",0x98CE],
- ["EF72",0x98CF],
- ["EF73",0x98D0],
- ["ECA9",0x98D1],
- ["ECAA",0x98D2],
- ["ECAB",0x98D3],
- ["EF74",0x98D4],
- ["ECAC",0x98D5],
- ["EF75",0x98D6],
- ["EF76",0x98D7],
- ["C6AE",0x98D8],
- ["ECAD",0x98D9],
- ["ECAE",0x98DA],
- ["EF77",0x98DB],
- ["EF78",0x98DC],
- ["EF79",0x98DD],
- ["B7C9",0x98DE],
- ["CAB3",0x98DF],
- ["EF7A",0x98E0],
- ["EF7B",0x98E1],
- ["EF7C",0x98E2],
- ["EF7D",0x98E3],
- ["EF7E",0x98E4],
- ["EF80",0x98E5],
- ["EF81",0x98E6],
- ["E2B8",0x98E7],
- ["F7CF",0x98E8],
- ["EF82",0x98E9],
- ["EF83",0x98EA],
- ["EF84",0x98EB],
- ["EF85",0x98EC],
- ["EF86",0x98ED],
- ["EF87",0x98EE],
- ["EF88",0x98EF],
- ["EF89",0x98F0],
- ["EF8A",0x98F1],
- ["EF8B",0x98F2],
- ["EF8C",0x98F3],
- ["EF8D",0x98F4],
- ["EF8E",0x98F5],
- ["EF8F",0x98F6],
- ["EF90",0x98F7],
- ["EF91",0x98F8],
- ["EF92",0x98F9],
- ["EF93",0x98FA],
- ["EF94",0x98FB],
- ["EF95",0x98FC],
- ["EF96",0x98FD],
- ["EF97",0x98FE],
- ["EF98",0x98FF],
- ["EF99",0x9900],
- ["EF9A",0x9901],
- ["EF9B",0x9902],
- ["EF9C",0x9903],
- ["EF9D",0x9904],
- ["EF9E",0x9905],
- ["EF9F",0x9906],
- ["EFA0",0x9907],
- ["F040",0x9908],
- ["F041",0x9909],
- ["F042",0x990A],
- ["F043",0x990B],
- ["F044",0x990C],
- ["F7D0",0x990D],
- ["F045",0x990E],
- ["F046",0x990F],
- ["B2CD",0x9910],
- ["F047",0x9911],
- ["F048",0x9912],
- ["F049",0x9913],
- ["F04A",0x9914],
- ["F04B",0x9915],
- ["F04C",0x9916],
- ["F04D",0x9917],
- ["F04E",0x9918],
- ["F04F",0x9919],
- ["F050",0x991A],
- ["F051",0x991B],
- ["F052",0x991C],
- ["F053",0x991D],
- ["F054",0x991E],
- ["F055",0x991F],
- ["F056",0x9920],
- ["F057",0x9921],
- ["F058",0x9922],
- ["F059",0x9923],
- ["F05A",0x9924],
- ["F05B",0x9925],
- ["F05C",0x9926],
- ["F05D",0x9927],
- ["F05E",0x9928],
- ["F05F",0x9929],
- ["F060",0x992A],
- ["F061",0x992B],
- ["F062",0x992C],
- ["F063",0x992D],
- ["F7D1",0x992E],
- ["F064",0x992F],
- ["F065",0x9930],
- ["F066",0x9931],
- ["F067",0x9932],
- ["F068",0x9933],
- ["F069",0x9934],
- ["F06A",0x9935],
- ["F06B",0x9936],
- ["F06C",0x9937],
- ["F06D",0x9938],
- ["F06E",0x9939],
- ["F06F",0x993A],
- ["F070",0x993B],
- ["F071",0x993C],
- ["F072",0x993D],
- ["F073",0x993E],
- ["F074",0x993F],
- ["F075",0x9940],
- ["F076",0x9941],
- ["F077",0x9942],
- ["F078",0x9943],
- ["F079",0x9944],
- ["F07A",0x9945],
- ["F07B",0x9946],
- ["F07C",0x9947],
- ["F07D",0x9948],
- ["F07E",0x9949],
- ["F080",0x994A],
- ["F081",0x994B],
- ["F082",0x994C],
- ["F083",0x994D],
- ["F084",0x994E],
- ["F085",0x994F],
- ["F086",0x9950],
- ["F087",0x9951],
- ["F088",0x9952],
- ["F089",0x9953],
- ["F7D3",0x9954],
- ["F7D2",0x9955],
- ["F08A",0x9956],
- ["F08B",0x9957],
- ["F08C",0x9958],
- ["F08D",0x9959],
- ["F08E",0x995A],
- ["F08F",0x995B],
- ["F090",0x995C],
- ["F091",0x995D],
- ["F092",0x995E],
- ["F093",0x995F],
- ["F094",0x9960],
- ["F095",0x9961],
- ["F096",0x9962],
- ["E2BB",0x9963],
- ["F097",0x9964],
- ["BCA2",0x9965],
- ["F098",0x9966],
- ["E2BC",0x9967],
- ["E2BD",0x9968],
- ["E2BE",0x9969],
- ["E2BF",0x996A],
- ["E2C0",0x996B],
- ["E2C1",0x996C],
- ["B7B9",0x996D],
- ["D2FB",0x996E],
- ["BDA4",0x996F],
- ["CACE",0x9970],
- ["B1A5",0x9971],
- ["CBC7",0x9972],
- ["F099",0x9973],
- ["E2C2",0x9974],
- ["B6FC",0x9975],
- ["C8C4",0x9976],
- ["E2C3",0x9977],
- ["F09A",0x9978],
- ["F09B",0x9979],
- ["BDC8",0x997A],
- ["F09C",0x997B],
- ["B1FD",0x997C],
- ["E2C4",0x997D],
- ["F09D",0x997E],
- ["B6F6",0x997F],
- ["E2C5",0x9980],
- ["C4D9",0x9981],
- ["F09E",0x9982],
- ["F09F",0x9983],
- ["E2C6",0x9984],
- ["CFDA",0x9985],
- ["B9DD",0x9986],
- ["E2C7",0x9987],
- ["C0A1",0x9988],
- ["F0A0",0x9989],
- ["E2C8",0x998A],
- ["B2F6",0x998B],
- ["F140",0x998C],
- ["E2C9",0x998D],
- ["F141",0x998E],
- ["C1F3",0x998F],
- ["E2CA",0x9990],
- ["E2CB",0x9991],
- ["C2F8",0x9992],
- ["E2CC",0x9993],
- ["E2CD",0x9994],
- ["E2CE",0x9995],
- ["CAD7",0x9996],
- ["D8B8",0x9997],
- ["D9E5",0x9998],
- ["CFE3",0x9999],
- ["F142",0x999A],
- ["F143",0x999B],
- ["F144",0x999C],
- ["F145",0x999D],
- ["F146",0x999E],
- ["F147",0x999F],
- ["F148",0x99A0],
- ["F149",0x99A1],
- ["F14A",0x99A2],
- ["F14B",0x99A3],
- ["F14C",0x99A4],
- ["F0A5",0x99A5],
- ["F14D",0x99A6],
- ["F14E",0x99A7],
- ["DCB0",0x99A8],
- ["F14F",0x99A9],
- ["F150",0x99AA],
- ["F151",0x99AB],
- ["F152",0x99AC],
- ["F153",0x99AD],
- ["F154",0x99AE],
- ["F155",0x99AF],
- ["F156",0x99B0],
- ["F157",0x99B1],
- ["F158",0x99B2],
- ["F159",0x99B3],
- ["F15A",0x99B4],
- ["F15B",0x99B5],
- ["F15C",0x99B6],
- ["F15D",0x99B7],
- ["F15E",0x99B8],
- ["F15F",0x99B9],
- ["F160",0x99BA],
- ["F161",0x99BB],
- ["F162",0x99BC],
- ["F163",0x99BD],
- ["F164",0x99BE],
- ["F165",0x99BF],
- ["F166",0x99C0],
- ["F167",0x99C1],
- ["F168",0x99C2],
- ["F169",0x99C3],
- ["F16A",0x99C4],
- ["F16B",0x99C5],
- ["F16C",0x99C6],
- ["F16D",0x99C7],
- ["F16E",0x99C8],
- ["F16F",0x99C9],
- ["F170",0x99CA],
- ["F171",0x99CB],
- ["F172",0x99CC],
- ["F173",0x99CD],
- ["F174",0x99CE],
- ["F175",0x99CF],
- ["F176",0x99D0],
- ["F177",0x99D1],
- ["F178",0x99D2],
- ["F179",0x99D3],
- ["F17A",0x99D4],
- ["F17B",0x99D5],
- ["F17C",0x99D6],
- ["F17D",0x99D7],
- ["F17E",0x99D8],
- ["F180",0x99D9],
- ["F181",0x99DA],
- ["F182",0x99DB],
- ["F183",0x99DC],
- ["F184",0x99DD],
- ["F185",0x99DE],
- ["F186",0x99DF],
- ["F187",0x99E0],
- ["F188",0x99E1],
- ["F189",0x99E2],
- ["F18A",0x99E3],
- ["F18B",0x99E4],
- ["F18C",0x99E5],
- ["F18D",0x99E6],
- ["F18E",0x99E7],
- ["F18F",0x99E8],
- ["F190",0x99E9],
- ["F191",0x99EA],
- ["F192",0x99EB],
- ["F193",0x99EC],
- ["F194",0x99ED],
- ["F195",0x99EE],
- ["F196",0x99EF],
- ["F197",0x99F0],
- ["F198",0x99F1],
- ["F199",0x99F2],
- ["F19A",0x99F3],
- ["F19B",0x99F4],
- ["F19C",0x99F5],
- ["F19D",0x99F6],
- ["F19E",0x99F7],
- ["F19F",0x99F8],
- ["F1A0",0x99F9],
- ["F240",0x99FA],
- ["F241",0x99FB],
- ["F242",0x99FC],
- ["F243",0x99FD],
- ["F244",0x99FE],
- ["F245",0x99FF],
- ["F246",0x9A00],
- ["F247",0x9A01],
- ["F248",0x9A02],
- ["F249",0x9A03],
- ["F24A",0x9A04],
- ["F24B",0x9A05],
- ["F24C",0x9A06],
- ["F24D",0x9A07],
- ["F24E",0x9A08],
- ["F24F",0x9A09],
- ["F250",0x9A0A],
- ["F251",0x9A0B],
- ["F252",0x9A0C],
- ["F253",0x9A0D],
- ["F254",0x9A0E],
- ["F255",0x9A0F],
- ["F256",0x9A10],
- ["F257",0x9A11],
- ["F258",0x9A12],
- ["F259",0x9A13],
- ["F25A",0x9A14],
- ["F25B",0x9A15],
- ["F25C",0x9A16],
- ["F25D",0x9A17],
- ["F25E",0x9A18],
- ["F25F",0x9A19],
- ["F260",0x9A1A],
- ["F261",0x9A1B],
- ["F262",0x9A1C],
- ["F263",0x9A1D],
- ["F264",0x9A1E],
- ["F265",0x9A1F],
- ["F266",0x9A20],
- ["F267",0x9A21],
- ["F268",0x9A22],
- ["F269",0x9A23],
- ["F26A",0x9A24],
- ["F26B",0x9A25],
- ["F26C",0x9A26],
- ["F26D",0x9A27],
- ["F26E",0x9A28],
- ["F26F",0x9A29],
- ["F270",0x9A2A],
- ["F271",0x9A2B],
- ["F272",0x9A2C],
- ["F273",0x9A2D],
- ["F274",0x9A2E],
- ["F275",0x9A2F],
- ["F276",0x9A30],
- ["F277",0x9A31],
- ["F278",0x9A32],
- ["F279",0x9A33],
- ["F27A",0x9A34],
- ["F27B",0x9A35],
- ["F27C",0x9A36],
- ["F27D",0x9A37],
- ["F27E",0x9A38],
- ["F280",0x9A39],
- ["F281",0x9A3A],
- ["F282",0x9A3B],
- ["F283",0x9A3C],
- ["F284",0x9A3D],
- ["F285",0x9A3E],
- ["F286",0x9A3F],
- ["F287",0x9A40],
- ["F288",0x9A41],
- ["F289",0x9A42],
- ["F28A",0x9A43],
- ["F28B",0x9A44],
- ["F28C",0x9A45],
- ["F28D",0x9A46],
- ["F28E",0x9A47],
- ["F28F",0x9A48],
- ["F290",0x9A49],
- ["F291",0x9A4A],
- ["F292",0x9A4B],
- ["F293",0x9A4C],
- ["F294",0x9A4D],
- ["F295",0x9A4E],
- ["F296",0x9A4F],
- ["F297",0x9A50],
- ["F298",0x9A51],
- ["F299",0x9A52],
- ["F29A",0x9A53],
- ["F29B",0x9A54],
- ["F29C",0x9A55],
- ["F29D",0x9A56],
- ["F29E",0x9A57],
- ["F29F",0x9A58],
- ["F2A0",0x9A59],
- ["F340",0x9A5A],
- ["F341",0x9A5B],
- ["F342",0x9A5C],
- ["F343",0x9A5D],
- ["F344",0x9A5E],
- ["F345",0x9A5F],
- ["F346",0x9A60],
- ["F347",0x9A61],
- ["F348",0x9A62],
- ["F349",0x9A63],
- ["F34A",0x9A64],
- ["F34B",0x9A65],
- ["F34C",0x9A66],
- ["F34D",0x9A67],
- ["F34E",0x9A68],
- ["F34F",0x9A69],
- ["F350",0x9A6A],
- ["F351",0x9A6B],
- ["C2ED",0x9A6C],
- ["D4A6",0x9A6D],
- ["CDD4",0x9A6E],
- ["D1B1",0x9A6F],
- ["B3DB",0x9A70],
- ["C7FD",0x9A71],
- ["F352",0x9A72],
- ["B2B5",0x9A73],
- ["C2BF",0x9A74],
- ["E6E0",0x9A75],
- ["CABB",0x9A76],
- ["E6E1",0x9A77],
- ["E6E2",0x9A78],
- ["BED4",0x9A79],
- ["E6E3",0x9A7A],
- ["D7A4",0x9A7B],
- ["CDD5",0x9A7C],
- ["E6E5",0x9A7D],
- ["BCDD",0x9A7E],
- ["E6E4",0x9A7F],
- ["E6E6",0x9A80],
- ["E6E7",0x9A81],
- ["C2EE",0x9A82],
- ["F353",0x9A83],
- ["BDBE",0x9A84],
- ["E6E8",0x9A85],
- ["C2E6",0x9A86],
- ["BAA7",0x9A87],
- ["E6E9",0x9A88],
- ["F354",0x9A89],
- ["E6EA",0x9A8A],
- ["B3D2",0x9A8B],
- ["D1E9",0x9A8C],
- ["F355",0x9A8D],
- ["F356",0x9A8E],
- ["BFA5",0x9A8F],
- ["E6EB",0x9A90],
- ["C6EF",0x9A91],
- ["E6EC",0x9A92],
- ["E6ED",0x9A93],
- ["F357",0x9A94],
- ["F358",0x9A95],
- ["E6EE",0x9A96],
- ["C6AD",0x9A97],
- ["E6EF",0x9A98],
- ["F359",0x9A99],
- ["C9A7",0x9A9A],
- ["E6F0",0x9A9B],
- ["E6F1",0x9A9C],
- ["E6F2",0x9A9D],
- ["E5B9",0x9A9E],
- ["E6F3",0x9A9F],
- ["E6F4",0x9AA0],
- ["C2E2",0x9AA1],
- ["E6F5",0x9AA2],
- ["E6F6",0x9AA3],
- ["D6E8",0x9AA4],
- ["E6F7",0x9AA5],
- ["F35A",0x9AA6],
- ["E6F8",0x9AA7],
- ["B9C7",0x9AA8],
- ["F35B",0x9AA9],
- ["F35C",0x9AAA],
- ["F35D",0x9AAB],
- ["F35E",0x9AAC],
- ["F35F",0x9AAD],
- ["F360",0x9AAE],
- ["F361",0x9AAF],
- ["F7BB",0x9AB0],
- ["F7BA",0x9AB1],
- ["F362",0x9AB2],
- ["F363",0x9AB3],
- ["F364",0x9AB4],
- ["F365",0x9AB5],
- ["F7BE",0x9AB6],
- ["F7BC",0x9AB7],
- ["BAA1",0x9AB8],
- ["F366",0x9AB9],
- ["F7BF",0x9ABA],
- ["F367",0x9ABB],
- ["F7C0",0x9ABC],
- ["F368",0x9ABD],
- ["F369",0x9ABE],
- ["F36A",0x9ABF],
- ["F7C2",0x9AC0],
- ["F7C1",0x9AC1],
- ["F7C4",0x9AC2],
- ["F36B",0x9AC3],
- ["F36C",0x9AC4],
- ["F7C3",0x9AC5],
- ["F36D",0x9AC6],
- ["F36E",0x9AC7],
- ["F36F",0x9AC8],
- ["F370",0x9AC9],
- ["F371",0x9ACA],
- ["F7C5",0x9ACB],
- ["F7C6",0x9ACC],
- ["F372",0x9ACD],
- ["F373",0x9ACE],
- ["F374",0x9ACF],
- ["F375",0x9AD0],
- ["F7C7",0x9AD1],
- ["F376",0x9AD2],
- ["CBE8",0x9AD3],
- ["F377",0x9AD4],
- ["F378",0x9AD5],
- ["F379",0x9AD6],
- ["F37A",0x9AD7],
- ["B8DF",0x9AD8],
- ["F37B",0x9AD9],
- ["F37C",0x9ADA],
- ["F37D",0x9ADB],
- ["F37E",0x9ADC],
- ["F380",0x9ADD],
- ["F381",0x9ADE],
- ["F7D4",0x9ADF],
- ["F382",0x9AE0],
- ["F7D5",0x9AE1],
- ["F383",0x9AE2],
- ["F384",0x9AE3],
- ["F385",0x9AE4],
- ["F386",0x9AE5],
- ["F7D6",0x9AE6],
- ["F387",0x9AE7],
- ["F388",0x9AE8],
- ["F389",0x9AE9],
- ["F38A",0x9AEA],
- ["F7D8",0x9AEB],
- ["F38B",0x9AEC],
- ["F7DA",0x9AED],
- ["F38C",0x9AEE],
- ["F7D7",0x9AEF],
- ["F38D",0x9AF0],
- ["F38E",0x9AF1],
- ["F38F",0x9AF2],
- ["F390",0x9AF3],
- ["F391",0x9AF4],
- ["F392",0x9AF5],
- ["F393",0x9AF6],
- ["F394",0x9AF7],
- ["F395",0x9AF8],
- ["F7DB",0x9AF9],
- ["F396",0x9AFA],
- ["F7D9",0x9AFB],
- ["F397",0x9AFC],
- ["F398",0x9AFD],
- ["F399",0x9AFE],
- ["F39A",0x9AFF],
- ["F39B",0x9B00],
- ["F39C",0x9B01],
- ["F39D",0x9B02],
- ["D7D7",0x9B03],
- ["F39E",0x9B04],
- ["F39F",0x9B05],
- ["F3A0",0x9B06],
- ["F440",0x9B07],
- ["F7DC",0x9B08],
- ["F441",0x9B09],
- ["F442",0x9B0A],
- ["F443",0x9B0B],
- ["F444",0x9B0C],
- ["F445",0x9B0D],
- ["F446",0x9B0E],
- ["F7DD",0x9B0F],
- ["F447",0x9B10],
- ["F448",0x9B11],
- ["F449",0x9B12],
- ["F7DE",0x9B13],
- ["F44A",0x9B14],
- ["F44B",0x9B15],
- ["F44C",0x9B16],
- ["F44D",0x9B17],
- ["F44E",0x9B18],
- ["F44F",0x9B19],
- ["F450",0x9B1A],
- ["F451",0x9B1B],
- ["F452",0x9B1C],
- ["F453",0x9B1D],
- ["F454",0x9B1E],
- ["F7DF",0x9B1F],
- ["F455",0x9B20],
- ["F456",0x9B21],
- ["F457",0x9B22],
- ["F7E0",0x9B23],
- ["F458",0x9B24],
- ["F459",0x9B25],
- ["F45A",0x9B26],
- ["F45B",0x9B27],
- ["F45C",0x9B28],
- ["F45D",0x9B29],
- ["F45E",0x9B2A],
- ["F45F",0x9B2B],
- ["F460",0x9B2C],
- ["F461",0x9B2D],
- ["F462",0x9B2E],
- ["DBCB",0x9B2F],
- ["F463",0x9B30],
- ["F464",0x9B31],
- ["D8AA",0x9B32],
- ["F465",0x9B33],
- ["F466",0x9B34],
- ["F467",0x9B35],
- ["F468",0x9B36],
- ["F469",0x9B37],
- ["F46A",0x9B38],
- ["F46B",0x9B39],
- ["F46C",0x9B3A],
- ["E5F7",0x9B3B],
- ["B9ED",0x9B3C],
- ["F46D",0x9B3D],
- ["F46E",0x9B3E],
- ["F46F",0x9B3F],
- ["F470",0x9B40],
- ["BFFD",0x9B41],
- ["BBEA",0x9B42],
- ["F7C9",0x9B43],
- ["C6C7",0x9B44],
- ["F7C8",0x9B45],
- ["F471",0x9B46],
- ["F7CA",0x9B47],
- ["F7CC",0x9B48],
- ["F7CB",0x9B49],
- ["F472",0x9B4A],
- ["F473",0x9B4B],
- ["F474",0x9B4C],
- ["F7CD",0x9B4D],
- ["F475",0x9B4E],
- ["CEBA",0x9B4F],
- ["F476",0x9B50],
- ["F7CE",0x9B51],
- ["F477",0x9B52],
- ["F478",0x9B53],
- ["C4A7",0x9B54],
- ["F479",0x9B55],
- ["F47A",0x9B56],
- ["F47B",0x9B57],
- ["F47C",0x9B58],
- ["F47D",0x9B59],
- ["F47E",0x9B5A],
- ["F480",0x9B5B],
- ["F481",0x9B5C],
- ["F482",0x9B5D],
- ["F483",0x9B5E],
- ["F484",0x9B5F],
- ["F485",0x9B60],
- ["F486",0x9B61],
- ["F487",0x9B62],
- ["F488",0x9B63],
- ["F489",0x9B64],
- ["F48A",0x9B65],
- ["F48B",0x9B66],
- ["F48C",0x9B67],
- ["F48D",0x9B68],
- ["F48E",0x9B69],
- ["F48F",0x9B6A],
- ["F490",0x9B6B],
- ["F491",0x9B6C],
- ["F492",0x9B6D],
- ["F493",0x9B6E],
- ["F494",0x9B6F],
- ["F495",0x9B70],
- ["F496",0x9B71],
- ["F497",0x9B72],
- ["F498",0x9B73],
- ["F499",0x9B74],
- ["F49A",0x9B75],
- ["F49B",0x9B76],
- ["F49C",0x9B77],
- ["F49D",0x9B78],
- ["F49E",0x9B79],
- ["F49F",0x9B7A],
- ["F4A0",0x9B7B],
- ["F540",0x9B7C],
- ["F541",0x9B7D],
- ["F542",0x9B7E],
- ["F543",0x9B7F],
- ["F544",0x9B80],
- ["F545",0x9B81],
- ["F546",0x9B82],
- ["F547",0x9B83],
- ["F548",0x9B84],
- ["F549",0x9B85],
- ["F54A",0x9B86],
- ["F54B",0x9B87],
- ["F54C",0x9B88],
- ["F54D",0x9B89],
- ["F54E",0x9B8A],
- ["F54F",0x9B8B],
- ["F550",0x9B8C],
- ["F551",0x9B8D],
- ["F552",0x9B8E],
- ["F553",0x9B8F],
- ["F554",0x9B90],
- ["F555",0x9B91],
- ["F556",0x9B92],
- ["F557",0x9B93],
- ["F558",0x9B94],
- ["F559",0x9B95],
- ["F55A",0x9B96],
- ["F55B",0x9B97],
- ["F55C",0x9B98],
- ["F55D",0x9B99],
- ["F55E",0x9B9A],
- ["F55F",0x9B9B],
- ["F560",0x9B9C],
- ["F561",0x9B9D],
- ["F562",0x9B9E],
- ["F563",0x9B9F],
- ["F564",0x9BA0],
- ["F565",0x9BA1],
- ["F566",0x9BA2],
- ["F567",0x9BA3],
- ["F568",0x9BA4],
- ["F569",0x9BA5],
- ["F56A",0x9BA6],
- ["F56B",0x9BA7],
- ["F56C",0x9BA8],
- ["F56D",0x9BA9],
- ["F56E",0x9BAA],
- ["F56F",0x9BAB],
- ["F570",0x9BAC],
- ["F571",0x9BAD],
- ["F572",0x9BAE],
- ["F573",0x9BAF],
- ["F574",0x9BB0],
- ["F575",0x9BB1],
- ["F576",0x9BB2],
- ["F577",0x9BB3],
- ["F578",0x9BB4],
- ["F579",0x9BB5],
- ["F57A",0x9BB6],
- ["F57B",0x9BB7],
- ["F57C",0x9BB8],
- ["F57D",0x9BB9],
- ["F57E",0x9BBA],
- ["F580",0x9BBB],
- ["F581",0x9BBC],
- ["F582",0x9BBD],
- ["F583",0x9BBE],
- ["F584",0x9BBF],
- ["F585",0x9BC0],
- ["F586",0x9BC1],
- ["F587",0x9BC2],
- ["F588",0x9BC3],
- ["F589",0x9BC4],
- ["F58A",0x9BC5],
- ["F58B",0x9BC6],
- ["F58C",0x9BC7],
- ["F58D",0x9BC8],
- ["F58E",0x9BC9],
- ["F58F",0x9BCA],
- ["F590",0x9BCB],
- ["F591",0x9BCC],
- ["F592",0x9BCD],
- ["F593",0x9BCE],
- ["F594",0x9BCF],
- ["F595",0x9BD0],
- ["F596",0x9BD1],
- ["F597",0x9BD2],
- ["F598",0x9BD3],
- ["F599",0x9BD4],
- ["F59A",0x9BD5],
- ["F59B",0x9BD6],
- ["F59C",0x9BD7],
- ["F59D",0x9BD8],
- ["F59E",0x9BD9],
- ["F59F",0x9BDA],
- ["F5A0",0x9BDB],
- ["F640",0x9BDC],
- ["F641",0x9BDD],
- ["F642",0x9BDE],
- ["F643",0x9BDF],
- ["F644",0x9BE0],
- ["F645",0x9BE1],
- ["F646",0x9BE2],
- ["F647",0x9BE3],
- ["F648",0x9BE4],
- ["F649",0x9BE5],
- ["F64A",0x9BE6],
- ["F64B",0x9BE7],
- ["F64C",0x9BE8],
- ["F64D",0x9BE9],
- ["F64E",0x9BEA],
- ["F64F",0x9BEB],
- ["F650",0x9BEC],
- ["F651",0x9BED],
- ["F652",0x9BEE],
- ["F653",0x9BEF],
- ["F654",0x9BF0],
- ["F655",0x9BF1],
- ["F656",0x9BF2],
- ["F657",0x9BF3],
- ["F658",0x9BF4],
- ["F659",0x9BF5],
- ["F65A",0x9BF6],
- ["F65B",0x9BF7],
- ["F65C",0x9BF8],
- ["F65D",0x9BF9],
- ["F65E",0x9BFA],
- ["F65F",0x9BFB],
- ["F660",0x9BFC],
- ["F661",0x9BFD],
- ["F662",0x9BFE],
- ["F663",0x9BFF],
- ["F664",0x9C00],
- ["F665",0x9C01],
- ["F666",0x9C02],
- ["F667",0x9C03],
- ["F668",0x9C04],
- ["F669",0x9C05],
- ["F66A",0x9C06],
- ["F66B",0x9C07],
- ["F66C",0x9C08],
- ["F66D",0x9C09],
- ["F66E",0x9C0A],
- ["F66F",0x9C0B],
- ["F670",0x9C0C],
- ["F671",0x9C0D],
- ["F672",0x9C0E],
- ["F673",0x9C0F],
- ["F674",0x9C10],
- ["F675",0x9C11],
- ["F676",0x9C12],
- ["F677",0x9C13],
- ["F678",0x9C14],
- ["F679",0x9C15],
- ["F67A",0x9C16],
- ["F67B",0x9C17],
- ["F67C",0x9C18],
- ["F67D",0x9C19],
- ["F67E",0x9C1A],
- ["F680",0x9C1B],
- ["F681",0x9C1C],
- ["F682",0x9C1D],
- ["F683",0x9C1E],
- ["F684",0x9C1F],
- ["F685",0x9C20],
- ["F686",0x9C21],
- ["F687",0x9C22],
- ["F688",0x9C23],
- ["F689",0x9C24],
- ["F68A",0x9C25],
- ["F68B",0x9C26],
- ["F68C",0x9C27],
- ["F68D",0x9C28],
- ["F68E",0x9C29],
- ["F68F",0x9C2A],
- ["F690",0x9C2B],
- ["F691",0x9C2C],
- ["F692",0x9C2D],
- ["F693",0x9C2E],
- ["F694",0x9C2F],
- ["F695",0x9C30],
- ["F696",0x9C31],
- ["F697",0x9C32],
- ["F698",0x9C33],
- ["F699",0x9C34],
- ["F69A",0x9C35],
- ["F69B",0x9C36],
- ["F69C",0x9C37],
- ["F69D",0x9C38],
- ["F69E",0x9C39],
- ["F69F",0x9C3A],
- ["F6A0",0x9C3B],
- ["F740",0x9C3C],
- ["F741",0x9C3D],
- ["F742",0x9C3E],
- ["F743",0x9C3F],
- ["F744",0x9C40],
- ["F745",0x9C41],
- ["F746",0x9C42],
- ["F747",0x9C43],
- ["F748",0x9C44],
- ["F749",0x9C45],
- ["F74A",0x9C46],
- ["F74B",0x9C47],
- ["F74C",0x9C48],
- ["F74D",0x9C49],
- ["F74E",0x9C4A],
- ["F74F",0x9C4B],
- ["F750",0x9C4C],
- ["F751",0x9C4D],
- ["F752",0x9C4E],
- ["F753",0x9C4F],
- ["F754",0x9C50],
- ["F755",0x9C51],
- ["F756",0x9C52],
- ["F757",0x9C53],
- ["F758",0x9C54],
- ["F759",0x9C55],
- ["F75A",0x9C56],
- ["F75B",0x9C57],
- ["F75C",0x9C58],
- ["F75D",0x9C59],
- ["F75E",0x9C5A],
- ["F75F",0x9C5B],
- ["F760",0x9C5C],
- ["F761",0x9C5D],
- ["F762",0x9C5E],
- ["F763",0x9C5F],
- ["F764",0x9C60],
- ["F765",0x9C61],
- ["F766",0x9C62],
- ["F767",0x9C63],
- ["F768",0x9C64],
- ["F769",0x9C65],
- ["F76A",0x9C66],
- ["F76B",0x9C67],
- ["F76C",0x9C68],
- ["F76D",0x9C69],
- ["F76E",0x9C6A],
- ["F76F",0x9C6B],
- ["F770",0x9C6C],
- ["F771",0x9C6D],
- ["F772",0x9C6E],
- ["F773",0x9C6F],
- ["F774",0x9C70],
- ["F775",0x9C71],
- ["F776",0x9C72],
- ["F777",0x9C73],
- ["F778",0x9C74],
- ["F779",0x9C75],
- ["F77A",0x9C76],
- ["F77B",0x9C77],
- ["F77C",0x9C78],
- ["F77D",0x9C79],
- ["F77E",0x9C7A],
- ["F780",0x9C7B],
- ["D3E3",0x9C7C],
- ["F781",0x9C7D],
- ["F782",0x9C7E],
- ["F6CF",0x9C7F],
- ["F783",0x9C80],
- ["C2B3",0x9C81],
- ["F6D0",0x9C82],
- ["F784",0x9C83],
- ["F785",0x9C84],
- ["F6D1",0x9C85],
- ["F6D2",0x9C86],
- ["F6D3",0x9C87],
- ["F6D4",0x9C88],
- ["F786",0x9C89],
- ["F787",0x9C8A],
- ["F6D6",0x9C8B],
- ["F788",0x9C8C],
- ["B1AB",0x9C8D],
- ["F6D7",0x9C8E],
- ["F789",0x9C8F],
- ["F6D8",0x9C90],
- ["F6D9",0x9C91],
- ["F6DA",0x9C92],
- ["F78A",0x9C93],
- ["F6DB",0x9C94],
- ["F6DC",0x9C95],
- ["F78B",0x9C96],
- ["F78C",0x9C97],
- ["F78D",0x9C98],
- ["F78E",0x9C99],
- ["F6DD",0x9C9A],
- ["F6DE",0x9C9B],
- ["CFCA",0x9C9C],
- ["F78F",0x9C9D],
- ["F6DF",0x9C9E],
- ["F6E0",0x9C9F],
- ["F6E1",0x9CA0],
- ["F6E2",0x9CA1],
- ["F6E3",0x9CA2],
- ["F6E4",0x9CA3],
- ["C0F0",0x9CA4],
- ["F6E5",0x9CA5],
- ["F6E6",0x9CA6],
- ["F6E7",0x9CA7],
- ["F6E8",0x9CA8],
- ["F6E9",0x9CA9],
- ["F790",0x9CAA],
- ["F6EA",0x9CAB],
- ["F791",0x9CAC],
- ["F6EB",0x9CAD],
- ["F6EC",0x9CAE],
- ["F792",0x9CAF],
- ["F6ED",0x9CB0],
- ["F6EE",0x9CB1],
- ["F6EF",0x9CB2],
- ["F6F0",0x9CB3],
- ["F6F1",0x9CB4],
- ["F6F2",0x9CB5],
- ["F6F3",0x9CB6],
- ["F6F4",0x9CB7],
- ["BEA8",0x9CB8],
- ["F793",0x9CB9],
- ["F6F5",0x9CBA],
- ["F6F6",0x9CBB],
- ["F6F7",0x9CBC],
- ["F6F8",0x9CBD],
- ["F794",0x9CBE],
- ["F795",0x9CBF],
- ["F796",0x9CC0],
- ["F797",0x9CC1],
- ["F798",0x9CC2],
- ["C8FA",0x9CC3],
- ["F6F9",0x9CC4],
- ["F6FA",0x9CC5],
- ["F6FB",0x9CC6],
- ["F6FC",0x9CC7],
- ["F799",0x9CC8],
- ["F79A",0x9CC9],
- ["F6FD",0x9CCA],
- ["F6FE",0x9CCB],
- ["F7A1",0x9CCC],
- ["F7A2",0x9CCD],
- ["F7A3",0x9CCE],
- ["F7A4",0x9CCF],
- ["F7A5",0x9CD0],
- ["F79B",0x9CD1],
- ["F79C",0x9CD2],
- ["F7A6",0x9CD3],
- ["F7A7",0x9CD4],
- ["F7A8",0x9CD5],
- ["B1EE",0x9CD6],
- ["F7A9",0x9CD7],
- ["F7AA",0x9CD8],
- ["F7AB",0x9CD9],
- ["F79D",0x9CDA],
- ["F79E",0x9CDB],
- ["F7AC",0x9CDC],
- ["F7AD",0x9CDD],
- ["C1DB",0x9CDE],
- ["F7AE",0x9CDF],
- ["F79F",0x9CE0],
- ["F7A0",0x9CE1],
- ["F7AF",0x9CE2],
- ["F840",0x9CE3],
- ["F841",0x9CE4],
- ["F842",0x9CE5],
- ["F843",0x9CE6],
- ["F844",0x9CE7],
- ["F845",0x9CE8],
- ["F846",0x9CE9],
- ["F847",0x9CEA],
- ["F848",0x9CEB],
- ["F849",0x9CEC],
- ["F84A",0x9CED],
- ["F84B",0x9CEE],
- ["F84C",0x9CEF],
- ["F84D",0x9CF0],
- ["F84E",0x9CF1],
- ["F84F",0x9CF2],
- ["F850",0x9CF3],
- ["F851",0x9CF4],
- ["F852",0x9CF5],
- ["F853",0x9CF6],
- ["F854",0x9CF7],
- ["F855",0x9CF8],
- ["F856",0x9CF9],
- ["F857",0x9CFA],
- ["F858",0x9CFB],
- ["F859",0x9CFC],
- ["F85A",0x9CFD],
- ["F85B",0x9CFE],
- ["F85C",0x9CFF],
- ["F85D",0x9D00],
- ["F85E",0x9D01],
- ["F85F",0x9D02],
- ["F860",0x9D03],
- ["F861",0x9D04],
- ["F862",0x9D05],
- ["F863",0x9D06],
- ["F864",0x9D07],
- ["F865",0x9D08],
- ["F866",0x9D09],
- ["F867",0x9D0A],
- ["F868",0x9D0B],
- ["F869",0x9D0C],
- ["F86A",0x9D0D],
- ["F86B",0x9D0E],
- ["F86C",0x9D0F],
- ["F86D",0x9D10],
- ["F86E",0x9D11],
- ["F86F",0x9D12],
- ["F870",0x9D13],
- ["F871",0x9D14],
- ["F872",0x9D15],
- ["F873",0x9D16],
- ["F874",0x9D17],
- ["F875",0x9D18],
- ["F876",0x9D19],
- ["F877",0x9D1A],
- ["F878",0x9D1B],
- ["F879",0x9D1C],
- ["F87A",0x9D1D],
- ["F87B",0x9D1E],
- ["F87C",0x9D1F],
- ["F87D",0x9D20],
- ["F87E",0x9D21],
- ["F880",0x9D22],
- ["F881",0x9D23],
- ["F882",0x9D24],
- ["F883",0x9D25],
- ["F884",0x9D26],
- ["F885",0x9D27],
- ["F886",0x9D28],
- ["F887",0x9D29],
- ["F888",0x9D2A],
- ["F889",0x9D2B],
- ["F88A",0x9D2C],
- ["F88B",0x9D2D],
- ["F88C",0x9D2E],
- ["F88D",0x9D2F],
- ["F88E",0x9D30],
- ["F88F",0x9D31],
- ["F890",0x9D32],
- ["F891",0x9D33],
- ["F892",0x9D34],
- ["F893",0x9D35],
- ["F894",0x9D36],
- ["F895",0x9D37],
- ["F896",0x9D38],
- ["F897",0x9D39],
- ["F898",0x9D3A],
- ["F899",0x9D3B],
- ["F89A",0x9D3C],
- ["F89B",0x9D3D],
- ["F89C",0x9D3E],
- ["F89D",0x9D3F],
- ["F89E",0x9D40],
- ["F89F",0x9D41],
- ["F8A0",0x9D42],
- ["F940",0x9D43],
- ["F941",0x9D44],
- ["F942",0x9D45],
- ["F943",0x9D46],
- ["F944",0x9D47],
- ["F945",0x9D48],
- ["F946",0x9D49],
- ["F947",0x9D4A],
- ["F948",0x9D4B],
- ["F949",0x9D4C],
- ["F94A",0x9D4D],
- ["F94B",0x9D4E],
- ["F94C",0x9D4F],
- ["F94D",0x9D50],
- ["F94E",0x9D51],
- ["F94F",0x9D52],
- ["F950",0x9D53],
- ["F951",0x9D54],
- ["F952",0x9D55],
- ["F953",0x9D56],
- ["F954",0x9D57],
- ["F955",0x9D58],
- ["F956",0x9D59],
- ["F957",0x9D5A],
- ["F958",0x9D5B],
- ["F959",0x9D5C],
- ["F95A",0x9D5D],
- ["F95B",0x9D5E],
- ["F95C",0x9D5F],
- ["F95D",0x9D60],
- ["F95E",0x9D61],
- ["F95F",0x9D62],
- ["F960",0x9D63],
- ["F961",0x9D64],
- ["F962",0x9D65],
- ["F963",0x9D66],
- ["F964",0x9D67],
- ["F965",0x9D68],
- ["F966",0x9D69],
- ["F967",0x9D6A],
- ["F968",0x9D6B],
- ["F969",0x9D6C],
- ["F96A",0x9D6D],
- ["F96B",0x9D6E],
- ["F96C",0x9D6F],
- ["F96D",0x9D70],
- ["F96E",0x9D71],
- ["F96F",0x9D72],
- ["F970",0x9D73],
- ["F971",0x9D74],
- ["F972",0x9D75],
- ["F973",0x9D76],
- ["F974",0x9D77],
- ["F975",0x9D78],
- ["F976",0x9D79],
- ["F977",0x9D7A],
- ["F978",0x9D7B],
- ["F979",0x9D7C],
- ["F97A",0x9D7D],
- ["F97B",0x9D7E],
- ["F97C",0x9D7F],
- ["F97D",0x9D80],
- ["F97E",0x9D81],
- ["F980",0x9D82],
- ["F981",0x9D83],
- ["F982",0x9D84],
- ["F983",0x9D85],
- ["F984",0x9D86],
- ["F985",0x9D87],
- ["F986",0x9D88],
- ["F987",0x9D89],
- ["F988",0x9D8A],
- ["F989",0x9D8B],
- ["F98A",0x9D8C],
- ["F98B",0x9D8D],
- ["F98C",0x9D8E],
- ["F98D",0x9D8F],
- ["F98E",0x9D90],
- ["F98F",0x9D91],
- ["F990",0x9D92],
- ["F991",0x9D93],
- ["F992",0x9D94],
- ["F993",0x9D95],
- ["F994",0x9D96],
- ["F995",0x9D97],
- ["F996",0x9D98],
- ["F997",0x9D99],
- ["F998",0x9D9A],
- ["F999",0x9D9B],
- ["F99A",0x9D9C],
- ["F99B",0x9D9D],
- ["F99C",0x9D9E],
- ["F99D",0x9D9F],
- ["F99E",0x9DA0],
- ["F99F",0x9DA1],
- ["F9A0",0x9DA2],
- ["FA40",0x9DA3],
- ["FA41",0x9DA4],
- ["FA42",0x9DA5],
- ["FA43",0x9DA6],
- ["FA44",0x9DA7],
- ["FA45",0x9DA8],
- ["FA46",0x9DA9],
- ["FA47",0x9DAA],
- ["FA48",0x9DAB],
- ["FA49",0x9DAC],
- ["FA4A",0x9DAD],
- ["FA4B",0x9DAE],
- ["FA4C",0x9DAF],
- ["FA4D",0x9DB0],
- ["FA4E",0x9DB1],
- ["FA4F",0x9DB2],
- ["FA50",0x9DB3],
- ["FA51",0x9DB4],
- ["FA52",0x9DB5],
- ["FA53",0x9DB6],
- ["FA54",0x9DB7],
- ["FA55",0x9DB8],
- ["FA56",0x9DB9],
- ["FA57",0x9DBA],
- ["FA58",0x9DBB],
- ["FA59",0x9DBC],
- ["FA5A",0x9DBD],
- ["FA5B",0x9DBE],
- ["FA5C",0x9DBF],
- ["FA5D",0x9DC0],
- ["FA5E",0x9DC1],
- ["FA5F",0x9DC2],
- ["FA60",0x9DC3],
- ["FA61",0x9DC4],
- ["FA62",0x9DC5],
- ["FA63",0x9DC6],
- ["FA64",0x9DC7],
- ["FA65",0x9DC8],
- ["FA66",0x9DC9],
- ["FA67",0x9DCA],
- ["FA68",0x9DCB],
- ["FA69",0x9DCC],
- ["FA6A",0x9DCD],
- ["FA6B",0x9DCE],
- ["FA6C",0x9DCF],
- ["FA6D",0x9DD0],
- ["FA6E",0x9DD1],
- ["FA6F",0x9DD2],
- ["FA70",0x9DD3],
- ["FA71",0x9DD4],
- ["FA72",0x9DD5],
- ["FA73",0x9DD6],
- ["FA74",0x9DD7],
- ["FA75",0x9DD8],
- ["FA76",0x9DD9],
- ["FA77",0x9DDA],
- ["FA78",0x9DDB],
- ["FA79",0x9DDC],
- ["FA7A",0x9DDD],
- ["FA7B",0x9DDE],
- ["FA7C",0x9DDF],
- ["FA7D",0x9DE0],
- ["FA7E",0x9DE1],
- ["FA80",0x9DE2],
- ["FA81",0x9DE3],
- ["FA82",0x9DE4],
- ["FA83",0x9DE5],
- ["FA84",0x9DE6],
- ["FA85",0x9DE7],
- ["FA86",0x9DE8],
- ["FA87",0x9DE9],
- ["FA88",0x9DEA],
- ["FA89",0x9DEB],
- ["FA8A",0x9DEC],
- ["FA8B",0x9DED],
- ["FA8C",0x9DEE],
- ["FA8D",0x9DEF],
- ["FA8E",0x9DF0],
- ["FA8F",0x9DF1],
- ["FA90",0x9DF2],
- ["FA91",0x9DF3],
- ["FA92",0x9DF4],
- ["FA93",0x9DF5],
- ["FA94",0x9DF6],
- ["FA95",0x9DF7],
- ["FA96",0x9DF8],
- ["FA97",0x9DF9],
- ["FA98",0x9DFA],
- ["FA99",0x9DFB],
- ["FA9A",0x9DFC],
- ["FA9B",0x9DFD],
- ["FA9C",0x9DFE],
- ["FA9D",0x9DFF],
- ["FA9E",0x9E00],
- ["FA9F",0x9E01],
- ["FAA0",0x9E02],
- ["FB40",0x9E03],
- ["FB41",0x9E04],
- ["FB42",0x9E05],
- ["FB43",0x9E06],
- ["FB44",0x9E07],
- ["FB45",0x9E08],
- ["FB46",0x9E09],
- ["FB47",0x9E0A],
- ["FB48",0x9E0B],
- ["FB49",0x9E0C],
- ["FB4A",0x9E0D],
- ["FB4B",0x9E0E],
- ["FB4C",0x9E0F],
- ["FB4D",0x9E10],
- ["FB4E",0x9E11],
- ["FB4F",0x9E12],
- ["FB50",0x9E13],
- ["FB51",0x9E14],
- ["FB52",0x9E15],
- ["FB53",0x9E16],
- ["FB54",0x9E17],
- ["FB55",0x9E18],
- ["FB56",0x9E19],
- ["FB57",0x9E1A],
- ["FB58",0x9E1B],
- ["FB59",0x9E1C],
- ["FB5A",0x9E1D],
- ["FB5B",0x9E1E],
- ["C4F1",0x9E1F],
- ["F0AF",0x9E20],
- ["BCA6",0x9E21],
- ["F0B0",0x9E22],
- ["C3F9",0x9E23],
- ["FB5C",0x9E24],
- ["C5B8",0x9E25],
- ["D1BB",0x9E26],
- ["FB5D",0x9E27],
- ["F0B1",0x9E28],
- ["F0B2",0x9E29],
- ["F0B3",0x9E2A],
- ["F0B4",0x9E2B],
- ["F0B5",0x9E2C],
- ["D1BC",0x9E2D],
- ["FB5E",0x9E2E],
- ["D1EC",0x9E2F],
- ["FB5F",0x9E30],
- ["F0B7",0x9E31],
- ["F0B6",0x9E32],
- ["D4A7",0x9E33],
- ["FB60",0x9E34],
- ["CDD2",0x9E35],
- ["F0B8",0x9E36],
- ["F0BA",0x9E37],
- ["F0B9",0x9E38],
- ["F0BB",0x9E39],
- ["F0BC",0x9E3A],
- ["FB61",0x9E3B],
- ["FB62",0x9E3C],
- ["B8EB",0x9E3D],
- ["F0BD",0x9E3E],
- ["BAE8",0x9E3F],
- ["FB63",0x9E40],
- ["F0BE",0x9E41],
- ["F0BF",0x9E42],
- ["BEE9",0x9E43],
- ["F0C0",0x9E44],
- ["B6EC",0x9E45],
- ["F0C1",0x9E46],
- ["F0C2",0x9E47],
- ["F0C3",0x9E48],
- ["F0C4",0x9E49],
- ["C8B5",0x9E4A],
- ["F0C5",0x9E4B],
- ["F0C6",0x9E4C],
- ["FB64",0x9E4D],
- ["F0C7",0x9E4E],
- ["C5F4",0x9E4F],
- ["FB65",0x9E50],
- ["F0C8",0x9E51],
- ["FB66",0x9E52],
- ["FB67",0x9E53],
- ["FB68",0x9E54],
- ["F0C9",0x9E55],
- ["FB69",0x9E56],
- ["F0CA",0x9E57],
- ["F7BD",0x9E58],
- ["FB6A",0x9E59],
- ["F0CB",0x9E5A],
- ["F0CC",0x9E5B],
- ["F0CD",0x9E5C],
- ["FB6B",0x9E5D],
- ["F0CE",0x9E5E],
- ["FB6C",0x9E5F],
- ["FB6D",0x9E60],
- ["FB6E",0x9E61],
- ["FB6F",0x9E62],
- ["F0CF",0x9E63],
- ["BAD7",0x9E64],
- ["FB70",0x9E65],
- ["F0D0",0x9E66],
- ["F0D1",0x9E67],
- ["F0D2",0x9E68],
- ["F0D3",0x9E69],
- ["F0D4",0x9E6A],
- ["F0D5",0x9E6B],
- ["F0D6",0x9E6C],
- ["F0D8",0x9E6D],
- ["FB71",0x9E6E],
- ["FB72",0x9E6F],
- ["D3A5",0x9E70],
- ["F0D7",0x9E71],
- ["FB73",0x9E72],
- ["F0D9",0x9E73],
- ["FB74",0x9E74],
- ["FB75",0x9E75],
- ["FB76",0x9E76],
- ["FB77",0x9E77],
- ["FB78",0x9E78],
- ["FB79",0x9E79],
- ["FB7A",0x9E7A],
- ["FB7B",0x9E7B],
- ["FB7C",0x9E7C],
- ["FB7D",0x9E7D],
- ["F5BA",0x9E7E],
- ["C2B9",0x9E7F],
- ["FB7E",0x9E80],
- ["FB80",0x9E81],
- ["F7E4",0x9E82],
- ["FB81",0x9E83],
- ["FB82",0x9E84],
- ["FB83",0x9E85],
- ["FB84",0x9E86],
- ["F7E5",0x9E87],
- ["F7E6",0x9E88],
- ["FB85",0x9E89],
- ["FB86",0x9E8A],
- ["F7E7",0x9E8B],
- ["FB87",0x9E8C],
- ["FB88",0x9E8D],
- ["FB89",0x9E8E],
- ["FB8A",0x9E8F],
- ["FB8B",0x9E90],
- ["FB8C",0x9E91],
- ["F7E8",0x9E92],
- ["C2B4",0x9E93],
- ["FB8D",0x9E94],
- ["FB8E",0x9E95],
- ["FB8F",0x9E96],
- ["FB90",0x9E97],
- ["FB91",0x9E98],
- ["FB92",0x9E99],
- ["FB93",0x9E9A],
- ["FB94",0x9E9B],
- ["FB95",0x9E9C],
- ["F7EA",0x9E9D],
- ["FB96",0x9E9E],
- ["F7EB",0x9E9F],
- ["FB97",0x9EA0],
- ["FB98",0x9EA1],
- ["FB99",0x9EA2],
- ["FB9A",0x9EA3],
- ["FB9B",0x9EA4],
- ["FB9C",0x9EA5],
- ["C2F3",0x9EA6],
- ["FB9D",0x9EA7],
- ["FB9E",0x9EA8],
- ["FB9F",0x9EA9],
- ["FBA0",0x9EAA],
- ["FC40",0x9EAB],
- ["FC41",0x9EAC],
- ["FC42",0x9EAD],
- ["FC43",0x9EAE],
- ["FC44",0x9EAF],
- ["FC45",0x9EB0],
- ["FC46",0x9EB1],
- ["FC47",0x9EB2],
- ["FC48",0x9EB3],
- ["F4F0",0x9EB4],
- ["FC49",0x9EB5],
- ["FC4A",0x9EB6],
- ["FC4B",0x9EB7],
- ["F4EF",0x9EB8],
- ["FC4C",0x9EB9],
- ["FC4D",0x9EBA],
- ["C2E9",0x9EBB],
- ["FC4E",0x9EBC],
- ["F7E1",0x9EBD],
- ["F7E2",0x9EBE],
- ["FC4F",0x9EBF],
- ["FC50",0x9EC0],
- ["FC51",0x9EC1],
- ["FC52",0x9EC2],
- ["FC53",0x9EC3],
- ["BBC6",0x9EC4],
- ["FC54",0x9EC5],
- ["FC55",0x9EC6],
- ["FC56",0x9EC7],
- ["FC57",0x9EC8],
- ["D9E4",0x9EC9],
- ["FC58",0x9ECA],
- ["FC59",0x9ECB],
- ["FC5A",0x9ECC],
- ["CAF2",0x9ECD],
- ["C0E8",0x9ECE],
- ["F0A4",0x9ECF],
- ["FC5B",0x9ED0],
- ["BADA",0x9ED1],
- ["FC5C",0x9ED2],
- ["FC5D",0x9ED3],
- ["C7AD",0x9ED4],
- ["FC5E",0x9ED5],
- ["FC5F",0x9ED6],
- ["FC60",0x9ED7],
- ["C4AC",0x9ED8],
- ["FC61",0x9ED9],
- ["FC62",0x9EDA],
- ["F7EC",0x9EDB],
- ["F7ED",0x9EDC],
- ["F7EE",0x9EDD],
- ["FC63",0x9EDE],
- ["F7F0",0x9EDF],
- ["F7EF",0x9EE0],
- ["FC64",0x9EE1],
- ["F7F1",0x9EE2],
- ["FC65",0x9EE3],
- ["FC66",0x9EE4],
- ["F7F4",0x9EE5],
- ["FC67",0x9EE6],
- ["F7F3",0x9EE7],
- ["FC68",0x9EE8],
- ["F7F2",0x9EE9],
- ["F7F5",0x9EEA],
- ["FC69",0x9EEB],
- ["FC6A",0x9EEC],
- ["FC6B",0x9EED],
- ["FC6C",0x9EEE],
- ["F7F6",0x9EEF],
- ["FC6D",0x9EF0],
- ["FC6E",0x9EF1],
- ["FC6F",0x9EF2],
- ["FC70",0x9EF3],
- ["FC71",0x9EF4],
- ["FC72",0x9EF5],
- ["FC73",0x9EF6],
- ["FC74",0x9EF7],
- ["FC75",0x9EF8],
- ["EDE9",0x9EF9],
- ["FC76",0x9EFA],
- ["EDEA",0x9EFB],
- ["EDEB",0x9EFC],
- ["FC77",0x9EFD],
- ["F6BC",0x9EFE],
- ["FC78",0x9EFF],
- ["FC79",0x9F00],
- ["FC7A",0x9F01],
- ["FC7B",0x9F02],
- ["FC7C",0x9F03],
- ["FC7D",0x9F04],
- ["FC7E",0x9F05],
- ["FC80",0x9F06],
- ["FC81",0x9F07],
- ["FC82",0x9F08],
- ["FC83",0x9F09],
- ["FC84",0x9F0A],
- ["F6BD",0x9F0B],
- ["FC85",0x9F0C],
- ["F6BE",0x9F0D],
- ["B6A6",0x9F0E],
- ["FC86",0x9F0F],
- ["D8BE",0x9F10],
- ["FC87",0x9F11],
- ["FC88",0x9F12],
- ["B9C4",0x9F13],
- ["FC89",0x9F14],
- ["FC8A",0x9F15],
- ["FC8B",0x9F16],
- ["D8BB",0x9F17],
- ["FC8C",0x9F18],
- ["DCB1",0x9F19],
- ["FC8D",0x9F1A],
- ["FC8E",0x9F1B],
- ["FC8F",0x9F1C],
- ["FC90",0x9F1D],
- ["FC91",0x9F1E],
- ["FC92",0x9F1F],
- ["CAF3",0x9F20],
- ["FC93",0x9F21],
- ["F7F7",0x9F22],
- ["FC94",0x9F23],
- ["FC95",0x9F24],
- ["FC96",0x9F25],
- ["FC97",0x9F26],
- ["FC98",0x9F27],
- ["FC99",0x9F28],
- ["FC9A",0x9F29],
- ["FC9B",0x9F2A],
- ["FC9C",0x9F2B],
- ["F7F8",0x9F2C],
- ["FC9D",0x9F2D],
- ["FC9E",0x9F2E],
- ["F7F9",0x9F2F],
- ["FC9F",0x9F30],
- ["FCA0",0x9F31],
- ["FD40",0x9F32],
- ["FD41",0x9F33],
- ["FD42",0x9F34],
- ["FD43",0x9F35],
- ["FD44",0x9F36],
- ["F7FB",0x9F37],
- ["FD45",0x9F38],
- ["F7FA",0x9F39],
- ["FD46",0x9F3A],
- ["B1C7",0x9F3B],
- ["FD47",0x9F3C],
- ["F7FC",0x9F3D],
- ["F7FD",0x9F3E],
- ["FD48",0x9F3F],
- ["FD49",0x9F40],
- ["FD4A",0x9F41],
- ["FD4B",0x9F42],
- ["FD4C",0x9F43],
- ["F7FE",0x9F44],
- ["FD4D",0x9F45],
- ["FD4E",0x9F46],
- ["FD4F",0x9F47],
- ["FD50",0x9F48],
- ["FD51",0x9F49],
- ["FD52",0x9F4A],
- ["FD53",0x9F4B],
- ["FD54",0x9F4C],
- ["FD55",0x9F4D],
- ["FD56",0x9F4E],
- ["FD57",0x9F4F],
- ["C6EB",0x9F50],
- ["ECB4",0x9F51],
- ["FD58",0x9F52],
- ["FD59",0x9F53],
- ["FD5A",0x9F54],
- ["FD5B",0x9F55],
- ["FD5C",0x9F56],
- ["FD5D",0x9F57],
- ["FD5E",0x9F58],
- ["FD5F",0x9F59],
- ["FD60",0x9F5A],
- ["FD61",0x9F5B],
- ["FD62",0x9F5C],
- ["FD63",0x9F5D],
- ["FD64",0x9F5E],
- ["FD65",0x9F5F],
- ["FD66",0x9F60],
- ["FD67",0x9F61],
- ["FD68",0x9F62],
- ["FD69",0x9F63],
- ["FD6A",0x9F64],
- ["FD6B",0x9F65],
- ["FD6C",0x9F66],
- ["FD6D",0x9F67],
- ["FD6E",0x9F68],
- ["FD6F",0x9F69],
- ["FD70",0x9F6A],
- ["FD71",0x9F6B],
- ["FD72",0x9F6C],
- ["FD73",0x9F6D],
- ["FD74",0x9F6E],
- ["FD75",0x9F6F],
- ["FD76",0x9F70],
- ["FD77",0x9F71],
- ["FD78",0x9F72],
- ["FD79",0x9F73],
- ["FD7A",0x9F74],
- ["FD7B",0x9F75],
- ["FD7C",0x9F76],
- ["FD7D",0x9F77],
- ["FD7E",0x9F78],
- ["FD80",0x9F79],
- ["FD81",0x9F7A],
- ["FD82",0x9F7B],
- ["FD83",0x9F7C],
- ["FD84",0x9F7D],
- ["FD85",0x9F7E],
- ["B3DD",0x9F7F],
- ["F6B3",0x9F80],
- ["FD86",0x9F81],
- ["FD87",0x9F82],
- ["F6B4",0x9F83],
- ["C1E4",0x9F84],
- ["F6B5",0x9F85],
- ["F6B6",0x9F86],
- ["F6B7",0x9F87],
- ["F6B8",0x9F88],
- ["F6B9",0x9F89],
- ["F6BA",0x9F8A],
- ["C8A3",0x9F8B],
- ["F6BB",0x9F8C],
- ["FD88",0x9F8D],
- ["FD89",0x9F8E],
- ["FD8A",0x9F8F],
- ["FD8B",0x9F90],
- ["FD8C",0x9F91],
- ["FD8D",0x9F92],
- ["FD8E",0x9F93],
- ["FD8F",0x9F94],
- ["FD90",0x9F95],
- ["FD91",0x9F96],
- ["FD92",0x9F97],
- ["FD93",0x9F98],
- ["C1FA",0x9F99],
- ["B9A8",0x9F9A],
- ["EDE8",0x9F9B],
- ["FD94",0x9F9C],
- ["FD95",0x9F9D],
- ["FD96",0x9F9E],
- ["B9EA",0x9F9F],
- ["D9DF",0x9FA0],
- ["FD97",0x9FA1],
- ["FD98",0x9FA2],
- ["FD99",0x9FA3],
- ["FD9A",0x9FA4],
- ["FD9B",0x9FA5],
- ["82358F33",0x9FA6],
- ["82358F34",0x9FA7],
- ["82358F35",0x9FA8],
- ["82358F36",0x9FA9],
- ["82358F37",0x9FAA],
- ["82358F38",0x9FAB],
- ["82358F39",0x9FAC],
- ["82359030",0x9FAD],
- ["82359031",0x9FAE],
- ["82359032",0x9FAF],
- ["82359033",0x9FB0],
- ["82359034",0x9FB1],
- ["82359035",0x9FB2],
- ["82359036",0x9FB3],
- ["82359037",0x9FB4],
- ["82359038",0x9FB5],
- ["82359039",0x9FB6],
- ["82359130",0x9FB7],
- ["82359131",0x9FB8],
- ["82359132",0x9FB9],
- ["82359133",0x9FBA],
- ["82359134",0x9FBB],
- ["82359135",0x9FBC],
- ["82359136",0x9FBD],
- ["82359137",0x9FBE],
- ["82359138",0x9FBF],
- ["82359139",0x9FC0],
- ["82359230",0x9FC1],
- ["82359231",0x9FC2],
- ["82359232",0x9FC3],
- ["82359233",0x9FC4],
- ["82359234",0x9FC5],
- ["82359235",0x9FC6],
- ["82359236",0x9FC7],
- ["82359237",0x9FC8],
- ["82359238",0x9FC9],
- ["82359239",0x9FCA],
- ["82359330",0x9FCB],
- ["82359331",0x9FCC],
- ["82359332",0x9FCD],
- ["82359333",0x9FCE],
- ["82359334",0x9FCF],
- ["82359335",0x9FD0],
- ["82359336",0x9FD1],
- ["82359337",0x9FD2],
- ["82359338",0x9FD3],
- ["82359339",0x9FD4],
- ["82359430",0x9FD5],
- ["82359431",0x9FD6],
- ["82359432",0x9FD7],
- ["82359433",0x9FD8],
- ["82359434",0x9FD9],
- ["82359435",0x9FDA],
- ["82359436",0x9FDB],
- ["82359437",0x9FDC],
- ["82359438",0x9FDD],
- ["82359439",0x9FDE],
- ["82359530",0x9FDF],
- ["82359531",0x9FE0],
- ["82359532",0x9FE1],
- ["82359533",0x9FE2],
- ["82359534",0x9FE3],
- ["82359535",0x9FE4],
- ["82359536",0x9FE5],
- ["82359537",0x9FE6],
- ["82359538",0x9FE7],
- ["82359539",0x9FE8],
- ["82359630",0x9FE9],
- ["82359631",0x9FEA],
- ["82359632",0x9FEB],
- ["82359633",0x9FEC],
- ["82359634",0x9FED],
- ["82359635",0x9FEE],
- ["82359636",0x9FEF],
- ["82359637",0x9FF0],
- ["82359638",0x9FF1],
- ["82359639",0x9FF2],
- ["82359730",0x9FF3],
- ["82359731",0x9FF4],
- ["82359732",0x9FF5],
- ["82359733",0x9FF6],
- ["82359734",0x9FF7],
- ["82359735",0x9FF8],
- ["82359736",0x9FF9],
- ["82359737",0x9FFA],
- ["82359738",0x9FFB],
- ["82359739",0x9FFC],
- ["82359830",0x9FFD],
- ["82359831",0x9FFE],
- ["82359832",0x9FFF],
- ["82359833",0xA000],
- ["82359834",0xA001],
- ["82359835",0xA002],
- ["82359836",0xA003],
- ["82359837",0xA004],
- ["82359838",0xA005],
- ["82359839",0xA006],
- ["82359930",0xA007],
- ["82359931",0xA008],
- ["82359932",0xA009],
- ["82359933",0xA00A],
- ["82359934",0xA00B],
- ["82359935",0xA00C],
- ["82359936",0xA00D],
- ["82359937",0xA00E],
- ["82359938",0xA00F],
- ["82359939",0xA010],
- ["82359A30",0xA011],
- ["82359A31",0xA012],
- ["82359A32",0xA013],
- ["82359A33",0xA014],
- ["82359A34",0xA015],
- ["82359A35",0xA016],
- ["82359A36",0xA017],
- ["82359A37",0xA018],
- ["82359A38",0xA019],
- ["82359A39",0xA01A],
- ["82359B30",0xA01B],
- ["82359B31",0xA01C],
- ["82359B32",0xA01D],
- ["82359B33",0xA01E],
- ["82359B34",0xA01F],
- ["82359B35",0xA020],
- ["82359B36",0xA021],
- ["82359B37",0xA022],
- ["82359B38",0xA023],
- ["82359B39",0xA024],
- ["82359C30",0xA025],
- ["82359C31",0xA026],
- ["82359C32",0xA027],
- ["82359C33",0xA028],
- ["82359C34",0xA029],
- ["82359C35",0xA02A],
- ["82359C36",0xA02B],
- ["82359C37",0xA02C],
- ["82359C38",0xA02D],
- ["82359C39",0xA02E],
- ["82359D30",0xA02F],
- ["82359D31",0xA030],
- ["82359D32",0xA031],
- ["82359D33",0xA032],
- ["82359D34",0xA033],
- ["82359D35",0xA034],
- ["82359D36",0xA035],
- ["82359D37",0xA036],
- ["82359D38",0xA037],
- ["82359D39",0xA038],
- ["82359E30",0xA039],
- ["82359E31",0xA03A],
- ["82359E32",0xA03B],
- ["82359E33",0xA03C],
- ["82359E34",0xA03D],
- ["82359E35",0xA03E],
- ["82359E36",0xA03F],
- ["82359E37",0xA040],
- ["82359E38",0xA041],
- ["82359E39",0xA042],
- ["82359F30",0xA043],
- ["82359F31",0xA044],
- ["82359F32",0xA045],
- ["82359F33",0xA046],
- ["82359F34",0xA047],
- ["82359F35",0xA048],
- ["82359F36",0xA049],
- ["82359F37",0xA04A],
- ["82359F38",0xA04B],
- ["82359F39",0xA04C],
- ["8235A030",0xA04D],
- ["8235A031",0xA04E],
- ["8235A032",0xA04F],
- ["8235A033",0xA050],
- ["8235A034",0xA051],
- ["8235A035",0xA052],
- ["8235A036",0xA053],
- ["8235A037",0xA054],
- ["8235A038",0xA055],
- ["8235A039",0xA056],
- ["8235A130",0xA057],
- ["8235A131",0xA058],
- ["8235A132",0xA059],
- ["8235A133",0xA05A],
- ["8235A134",0xA05B],
- ["8235A135",0xA05C],
- ["8235A136",0xA05D],
- ["8235A137",0xA05E],
- ["8235A138",0xA05F],
- ["8235A139",0xA060],
- ["8235A230",0xA061],
- ["8235A231",0xA062],
- ["8235A232",0xA063],
- ["8235A233",0xA064],
- ["8235A234",0xA065],
- ["8235A235",0xA066],
- ["8235A236",0xA067],
- ["8235A237",0xA068],
- ["8235A238",0xA069],
- ["8235A239",0xA06A],
- ["8235A330",0xA06B],
- ["8235A331",0xA06C],
- ["8235A332",0xA06D],
- ["8235A333",0xA06E],
- ["8235A334",0xA06F],
- ["8235A335",0xA070],
- ["8235A336",0xA071],
- ["8235A337",0xA072],
- ["8235A338",0xA073],
- ["8235A339",0xA074],
- ["8235A430",0xA075],
- ["8235A431",0xA076],
- ["8235A432",0xA077],
- ["8235A433",0xA078],
- ["8235A434",0xA079],
- ["8235A435",0xA07A],
- ["8235A436",0xA07B],
- ["8235A437",0xA07C],
- ["8235A438",0xA07D],
- ["8235A439",0xA07E],
- ["8235A530",0xA07F],
- ["8235A531",0xA080],
- ["8235A532",0xA081],
- ["8235A533",0xA082],
- ["8235A534",0xA083],
- ["8235A535",0xA084],
- ["8235A536",0xA085],
- ["8235A537",0xA086],
- ["8235A538",0xA087],
- ["8235A539",0xA088],
- ["8235A630",0xA089],
- ["8235A631",0xA08A],
- ["8235A632",0xA08B],
- ["8235A633",0xA08C],
- ["8235A634",0xA08D],
- ["8235A635",0xA08E],
- ["8235A636",0xA08F],
- ["8235A637",0xA090],
- ["8235A638",0xA091],
- ["8235A639",0xA092],
- ["8235A730",0xA093],
- ["8235A731",0xA094],
- ["8235A732",0xA095],
- ["8235A733",0xA096],
- ["8235A734",0xA097],
- ["8235A735",0xA098],
- ["8235A736",0xA099],
- ["8235A737",0xA09A],
- ["8235A738",0xA09B],
- ["8235A739",0xA09C],
- ["8235A830",0xA09D],
- ["8235A831",0xA09E],
- ["8235A832",0xA09F],
- ["8235A833",0xA0A0],
- ["8235A834",0xA0A1],
- ["8235A835",0xA0A2],
- ["8235A836",0xA0A3],
- ["8235A837",0xA0A4],
- ["8235A838",0xA0A5],
- ["8235A839",0xA0A6],
- ["8235A930",0xA0A7],
- ["8235A931",0xA0A8],
- ["8235A932",0xA0A9],
- ["8235A933",0xA0AA],
- ["8235A934",0xA0AB],
- ["8235A935",0xA0AC],
- ["8235A936",0xA0AD],
- ["8235A937",0xA0AE],
- ["8235A938",0xA0AF],
- ["8235A939",0xA0B0],
- ["8235AA30",0xA0B1],
- ["8235AA31",0xA0B2],
- ["8235AA32",0xA0B3],
- ["8235AA33",0xA0B4],
- ["8235AA34",0xA0B5],
- ["8235AA35",0xA0B6],
- ["8235AA36",0xA0B7],
- ["8235AA37",0xA0B8],
- ["8235AA38",0xA0B9],
- ["8235AA39",0xA0BA],
- ["8235AB30",0xA0BB],
- ["8235AB31",0xA0BC],
- ["8235AB32",0xA0BD],
- ["8235AB33",0xA0BE],
- ["8235AB34",0xA0BF],
- ["8235AB35",0xA0C0],
- ["8235AB36",0xA0C1],
- ["8235AB37",0xA0C2],
- ["8235AB38",0xA0C3],
- ["8235AB39",0xA0C4],
- ["8235AC30",0xA0C5],
- ["8235AC31",0xA0C6],
- ["8235AC32",0xA0C7],
- ["8235AC33",0xA0C8],
- ["8235AC34",0xA0C9],
- ["8235AC35",0xA0CA],
- ["8235AC36",0xA0CB],
- ["8235AC37",0xA0CC],
- ["8235AC38",0xA0CD],
- ["8235AC39",0xA0CE],
- ["8235AD30",0xA0CF],
- ["8235AD31",0xA0D0],
- ["8235AD32",0xA0D1],
- ["8235AD33",0xA0D2],
- ["8235AD34",0xA0D3],
- ["8235AD35",0xA0D4],
- ["8235AD36",0xA0D5],
- ["8235AD37",0xA0D6],
- ["8235AD38",0xA0D7],
- ["8235AD39",0xA0D8],
- ["8235AE30",0xA0D9],
- ["8235AE31",0xA0DA],
- ["8235AE32",0xA0DB],
- ["8235AE33",0xA0DC],
- ["8235AE34",0xA0DD],
- ["8235AE35",0xA0DE],
- ["8235AE36",0xA0DF],
- ["8235AE37",0xA0E0],
- ["8235AE38",0xA0E1],
- ["8235AE39",0xA0E2],
- ["8235AF30",0xA0E3],
- ["8235AF31",0xA0E4],
- ["8235AF32",0xA0E5],
- ["8235AF33",0xA0E6],
- ["8235AF34",0xA0E7],
- ["8235AF35",0xA0E8],
- ["8235AF36",0xA0E9],
- ["8235AF37",0xA0EA],
- ["8235AF38",0xA0EB],
- ["8235AF39",0xA0EC],
- ["8235B030",0xA0ED],
- ["8235B031",0xA0EE],
- ["8235B032",0xA0EF],
- ["8235B033",0xA0F0],
- ["8235B034",0xA0F1],
- ["8235B035",0xA0F2],
- ["8235B036",0xA0F3],
- ["8235B037",0xA0F4],
- ["8235B038",0xA0F5],
- ["8235B039",0xA0F6],
- ["8235B130",0xA0F7],
- ["8235B131",0xA0F8],
- ["8235B132",0xA0F9],
- ["8235B133",0xA0FA],
- ["8235B134",0xA0FB],
- ["8235B135",0xA0FC],
- ["8235B136",0xA0FD],
- ["8235B137",0xA0FE],
- ["8235B138",0xA0FF],
- ["8235B139",0xA100],
- ["8235B230",0xA101],
- ["8235B231",0xA102],
- ["8235B232",0xA103],
- ["8235B233",0xA104],
- ["8235B234",0xA105],
- ["8235B235",0xA106],
- ["8235B236",0xA107],
- ["8235B237",0xA108],
- ["8235B238",0xA109],
- ["8235B239",0xA10A],
- ["8235B330",0xA10B],
- ["8235B331",0xA10C],
- ["8235B332",0xA10D],
- ["8235B333",0xA10E],
- ["8235B334",0xA10F],
- ["8235B335",0xA110],
- ["8235B336",0xA111],
- ["8235B337",0xA112],
- ["8235B338",0xA113],
- ["8235B339",0xA114],
- ["8235B430",0xA115],
- ["8235B431",0xA116],
- ["8235B432",0xA117],
- ["8235B433",0xA118],
- ["8235B434",0xA119],
- ["8235B435",0xA11A],
- ["8235B436",0xA11B],
- ["8235B437",0xA11C],
- ["8235B438",0xA11D],
- ["8235B439",0xA11E],
- ["8235B530",0xA11F],
- ["8235B531",0xA120],
- ["8235B532",0xA121],
- ["8235B533",0xA122],
- ["8235B534",0xA123],
- ["8235B535",0xA124],
- ["8235B536",0xA125],
- ["8235B537",0xA126],
- ["8235B538",0xA127],
- ["8235B539",0xA128],
- ["8235B630",0xA129],
- ["8235B631",0xA12A],
- ["8235B632",0xA12B],
- ["8235B633",0xA12C],
- ["8235B634",0xA12D],
- ["8235B635",0xA12E],
- ["8235B636",0xA12F],
- ["8235B637",0xA130],
- ["8235B638",0xA131],
- ["8235B639",0xA132],
- ["8235B730",0xA133],
- ["8235B731",0xA134],
- ["8235B732",0xA135],
- ["8235B733",0xA136],
- ["8235B734",0xA137],
- ["8235B735",0xA138],
- ["8235B736",0xA139],
- ["8235B737",0xA13A],
- ["8235B738",0xA13B],
- ["8235B739",0xA13C],
- ["8235B830",0xA13D],
- ["8235B831",0xA13E],
- ["8235B832",0xA13F],
- ["8235B833",0xA140],
- ["8235B834",0xA141],
- ["8235B835",0xA142],
- ["8235B836",0xA143],
- ["8235B837",0xA144],
- ["8235B838",0xA145],
- ["8235B839",0xA146],
- ["8235B930",0xA147],
- ["8235B931",0xA148],
- ["8235B932",0xA149],
- ["8235B933",0xA14A],
- ["8235B934",0xA14B],
- ["8235B935",0xA14C],
- ["8235B936",0xA14D],
- ["8235B937",0xA14E],
- ["8235B938",0xA14F],
- ["8235B939",0xA150],
- ["8235BA30",0xA151],
- ["8235BA31",0xA152],
- ["8235BA32",0xA153],
- ["8235BA33",0xA154],
- ["8235BA34",0xA155],
- ["8235BA35",0xA156],
- ["8235BA36",0xA157],
- ["8235BA37",0xA158],
- ["8235BA38",0xA159],
- ["8235BA39",0xA15A],
- ["8235BB30",0xA15B],
- ["8235BB31",0xA15C],
- ["8235BB32",0xA15D],
- ["8235BB33",0xA15E],
- ["8235BB34",0xA15F],
- ["8235BB35",0xA160],
- ["8235BB36",0xA161],
- ["8235BB37",0xA162],
- ["8235BB38",0xA163],
- ["8235BB39",0xA164],
- ["8235BC30",0xA165],
- ["8235BC31",0xA166],
- ["8235BC32",0xA167],
- ["8235BC33",0xA168],
- ["8235BC34",0xA169],
- ["8235BC35",0xA16A],
- ["8235BC36",0xA16B],
- ["8235BC37",0xA16C],
- ["8235BC38",0xA16D],
- ["8235BC39",0xA16E],
- ["8235BD30",0xA16F],
- ["8235BD31",0xA170],
- ["8235BD32",0xA171],
- ["8235BD33",0xA172],
- ["8235BD34",0xA173],
- ["8235BD35",0xA174],
- ["8235BD36",0xA175],
- ["8235BD37",0xA176],
- ["8235BD38",0xA177],
- ["8235BD39",0xA178],
- ["8235BE30",0xA179],
- ["8235BE31",0xA17A],
- ["8235BE32",0xA17B],
- ["8235BE33",0xA17C],
- ["8235BE34",0xA17D],
- ["8235BE35",0xA17E],
- ["8235BE36",0xA17F],
- ["8235BE37",0xA180],
- ["8235BE38",0xA181],
- ["8235BE39",0xA182],
- ["8235BF30",0xA183],
- ["8235BF31",0xA184],
- ["8235BF32",0xA185],
- ["8235BF33",0xA186],
- ["8235BF34",0xA187],
- ["8235BF35",0xA188],
- ["8235BF36",0xA189],
- ["8235BF37",0xA18A],
- ["8235BF38",0xA18B],
- ["8235BF39",0xA18C],
- ["8235C030",0xA18D],
- ["8235C031",0xA18E],
- ["8235C032",0xA18F],
- ["8235C033",0xA190],
- ["8235C034",0xA191],
- ["8235C035",0xA192],
- ["8235C036",0xA193],
- ["8235C037",0xA194],
- ["8235C038",0xA195],
- ["8235C039",0xA196],
- ["8235C130",0xA197],
- ["8235C131",0xA198],
- ["8235C132",0xA199],
- ["8235C133",0xA19A],
- ["8235C134",0xA19B],
- ["8235C135",0xA19C],
- ["8235C136",0xA19D],
- ["8235C137",0xA19E],
- ["8235C138",0xA19F],
- ["8235C139",0xA1A0],
- ["8235C230",0xA1A1],
- ["8235C231",0xA1A2],
- ["8235C232",0xA1A3],
- ["8235C233",0xA1A4],
- ["8235C234",0xA1A5],
- ["8235C235",0xA1A6],
- ["8235C236",0xA1A7],
- ["8235C237",0xA1A8],
- ["8235C238",0xA1A9],
- ["8235C239",0xA1AA],
- ["8235C330",0xA1AB],
- ["8235C331",0xA1AC],
- ["8235C332",0xA1AD],
- ["8235C333",0xA1AE],
- ["8235C334",0xA1AF],
- ["8235C335",0xA1B0],
- ["8235C336",0xA1B1],
- ["8235C337",0xA1B2],
- ["8235C338",0xA1B3],
- ["8235C339",0xA1B4],
- ["8235C430",0xA1B5],
- ["8235C431",0xA1B6],
- ["8235C432",0xA1B7],
- ["8235C433",0xA1B8],
- ["8235C434",0xA1B9],
- ["8235C435",0xA1BA],
- ["8235C436",0xA1BB],
- ["8235C437",0xA1BC],
- ["8235C438",0xA1BD],
- ["8235C439",0xA1BE],
- ["8235C530",0xA1BF],
- ["8235C531",0xA1C0],
- ["8235C532",0xA1C1],
- ["8235C533",0xA1C2],
- ["8235C534",0xA1C3],
- ["8235C535",0xA1C4],
- ["8235C536",0xA1C5],
- ["8235C537",0xA1C6],
- ["8235C538",0xA1C7],
- ["8235C539",0xA1C8],
- ["8235C630",0xA1C9],
- ["8235C631",0xA1CA],
- ["8235C632",0xA1CB],
- ["8235C633",0xA1CC],
- ["8235C634",0xA1CD],
- ["8235C635",0xA1CE],
- ["8235C636",0xA1CF],
- ["8235C637",0xA1D0],
- ["8235C638",0xA1D1],
- ["8235C639",0xA1D2],
- ["8235C730",0xA1D3],
- ["8235C731",0xA1D4],
- ["8235C732",0xA1D5],
- ["8235C733",0xA1D6],
- ["8235C734",0xA1D7],
- ["8235C735",0xA1D8],
- ["8235C736",0xA1D9],
- ["8235C737",0xA1DA],
- ["8235C738",0xA1DB],
- ["8235C739",0xA1DC],
- ["8235C830",0xA1DD],
- ["8235C831",0xA1DE],
- ["8235C832",0xA1DF],
- ["8235C833",0xA1E0],
- ["8235C834",0xA1E1],
- ["8235C835",0xA1E2],
- ["8235C836",0xA1E3],
- ["8235C837",0xA1E4],
- ["8235C838",0xA1E5],
- ["8235C839",0xA1E6],
- ["8235C930",0xA1E7],
- ["8235C931",0xA1E8],
- ["8235C932",0xA1E9],
- ["8235C933",0xA1EA],
- ["8235C934",0xA1EB],
- ["8235C935",0xA1EC],
- ["8235C936",0xA1ED],
- ["8235C937",0xA1EE],
- ["8235C938",0xA1EF],
- ["8235C939",0xA1F0],
- ["8235CA30",0xA1F1],
- ["8235CA31",0xA1F2],
- ["8235CA32",0xA1F3],
- ["8235CA33",0xA1F4],
- ["8235CA34",0xA1F5],
- ["8235CA35",0xA1F6],
- ["8235CA36",0xA1F7],
- ["8235CA37",0xA1F8],
- ["8235CA38",0xA1F9],
- ["8235CA39",0xA1FA],
- ["8235CB30",0xA1FB],
- ["8235CB31",0xA1FC],
- ["8235CB32",0xA1FD],
- ["8235CB33",0xA1FE],
- ["8235CB34",0xA1FF],
- ["8235CB35",0xA200],
- ["8235CB36",0xA201],
- ["8235CB37",0xA202],
- ["8235CB38",0xA203],
- ["8235CB39",0xA204],
- ["8235CC30",0xA205],
- ["8235CC31",0xA206],
- ["8235CC32",0xA207],
- ["8235CC33",0xA208],
- ["8235CC34",0xA209],
- ["8235CC35",0xA20A],
- ["8235CC36",0xA20B],
- ["8235CC37",0xA20C],
- ["8235CC38",0xA20D],
- ["8235CC39",0xA20E],
- ["8235CD30",0xA20F],
- ["8235CD31",0xA210],
- ["8235CD32",0xA211],
- ["8235CD33",0xA212],
- ["8235CD34",0xA213],
- ["8235CD35",0xA214],
- ["8235CD36",0xA215],
- ["8235CD37",0xA216],
- ["8235CD38",0xA217],
- ["8235CD39",0xA218],
- ["8235CE30",0xA219],
- ["8235CE31",0xA21A],
- ["8235CE32",0xA21B],
- ["8235CE33",0xA21C],
- ["8235CE34",0xA21D],
- ["8235CE35",0xA21E],
- ["8235CE36",0xA21F],
- ["8235CE37",0xA220],
- ["8235CE38",0xA221],
- ["8235CE39",0xA222],
- ["8235CF30",0xA223],
- ["8235CF31",0xA224],
- ["8235CF32",0xA225],
- ["8235CF33",0xA226],
- ["8235CF34",0xA227],
- ["8235CF35",0xA228],
- ["8235CF36",0xA229],
- ["8235CF37",0xA22A],
- ["8235CF38",0xA22B],
- ["8235CF39",0xA22C],
- ["8235D030",0xA22D],
- ["8235D031",0xA22E],
- ["8235D032",0xA22F],
- ["8235D033",0xA230],
- ["8235D034",0xA231],
- ["8235D035",0xA232],
- ["8235D036",0xA233],
- ["8235D037",0xA234],
- ["8235D038",0xA235],
- ["8235D039",0xA236],
- ["8235D130",0xA237],
- ["8235D131",0xA238],
- ["8235D132",0xA239],
- ["8235D133",0xA23A],
- ["8235D134",0xA23B],
- ["8235D135",0xA23C],
- ["8235D136",0xA23D],
- ["8235D137",0xA23E],
- ["8235D138",0xA23F],
- ["8235D139",0xA240],
- ["8235D230",0xA241],
- ["8235D231",0xA242],
- ["8235D232",0xA243],
- ["8235D233",0xA244],
- ["8235D234",0xA245],
- ["8235D235",0xA246],
- ["8235D236",0xA247],
- ["8235D237",0xA248],
- ["8235D238",0xA249],
- ["8235D239",0xA24A],
- ["8235D330",0xA24B],
- ["8235D331",0xA24C],
- ["8235D332",0xA24D],
- ["8235D333",0xA24E],
- ["8235D334",0xA24F],
- ["8235D335",0xA250],
- ["8235D336",0xA251],
- ["8235D337",0xA252],
- ["8235D338",0xA253],
- ["8235D339",0xA254],
- ["8235D430",0xA255],
- ["8235D431",0xA256],
- ["8235D432",0xA257],
- ["8235D433",0xA258],
- ["8235D434",0xA259],
- ["8235D435",0xA25A],
- ["8235D436",0xA25B],
- ["8235D437",0xA25C],
- ["8235D438",0xA25D],
- ["8235D439",0xA25E],
- ["8235D530",0xA25F],
- ["8235D531",0xA260],
- ["8235D532",0xA261],
- ["8235D533",0xA262],
- ["8235D534",0xA263],
- ["8235D535",0xA264],
- ["8235D536",0xA265],
- ["8235D537",0xA266],
- ["8235D538",0xA267],
- ["8235D539",0xA268],
- ["8235D630",0xA269],
- ["8235D631",0xA26A],
- ["8235D632",0xA26B],
- ["8235D633",0xA26C],
- ["8235D634",0xA26D],
- ["8235D635",0xA26E],
- ["8235D636",0xA26F],
- ["8235D637",0xA270],
- ["8235D638",0xA271],
- ["8235D639",0xA272],
- ["8235D730",0xA273],
- ["8235D731",0xA274],
- ["8235D732",0xA275],
- ["8235D733",0xA276],
- ["8235D734",0xA277],
- ["8235D735",0xA278],
- ["8235D736",0xA279],
- ["8235D737",0xA27A],
- ["8235D738",0xA27B],
- ["8235D739",0xA27C],
- ["8235D830",0xA27D],
- ["8235D831",0xA27E],
- ["8235D832",0xA27F],
- ["8235D833",0xA280],
- ["8235D834",0xA281],
- ["8235D835",0xA282],
- ["8235D836",0xA283],
- ["8235D837",0xA284],
- ["8235D838",0xA285],
- ["8235D839",0xA286],
- ["8235D930",0xA287],
- ["8235D931",0xA288],
- ["8235D932",0xA289],
- ["8235D933",0xA28A],
- ["8235D934",0xA28B],
- ["8235D935",0xA28C],
- ["8235D936",0xA28D],
- ["8235D937",0xA28E],
- ["8235D938",0xA28F],
- ["8235D939",0xA290],
- ["8235DA30",0xA291],
- ["8235DA31",0xA292],
- ["8235DA32",0xA293],
- ["8235DA33",0xA294],
- ["8235DA34",0xA295],
- ["8235DA35",0xA296],
- ["8235DA36",0xA297],
- ["8235DA37",0xA298],
- ["8235DA38",0xA299],
- ["8235DA39",0xA29A],
- ["8235DB30",0xA29B],
- ["8235DB31",0xA29C],
- ["8235DB32",0xA29D],
- ["8235DB33",0xA29E],
- ["8235DB34",0xA29F],
- ["8235DB35",0xA2A0],
- ["8235DB36",0xA2A1],
- ["8235DB37",0xA2A2],
- ["8235DB38",0xA2A3],
- ["8235DB39",0xA2A4],
- ["8235DC30",0xA2A5],
- ["8235DC31",0xA2A6],
- ["8235DC32",0xA2A7],
- ["8235DC33",0xA2A8],
- ["8235DC34",0xA2A9],
- ["8235DC35",0xA2AA],
- ["8235DC36",0xA2AB],
- ["8235DC37",0xA2AC],
- ["8235DC38",0xA2AD],
- ["8235DC39",0xA2AE],
- ["8235DD30",0xA2AF],
- ["8235DD31",0xA2B0],
- ["8235DD32",0xA2B1],
- ["8235DD33",0xA2B2],
- ["8235DD34",0xA2B3],
- ["8235DD35",0xA2B4],
- ["8235DD36",0xA2B5],
- ["8235DD37",0xA2B6],
- ["8235DD38",0xA2B7],
- ["8235DD39",0xA2B8],
- ["8235DE30",0xA2B9],
- ["8235DE31",0xA2BA],
- ["8235DE32",0xA2BB],
- ["8235DE33",0xA2BC],
- ["8235DE34",0xA2BD],
- ["8235DE35",0xA2BE],
- ["8235DE36",0xA2BF],
- ["8235DE37",0xA2C0],
- ["8235DE38",0xA2C1],
- ["8235DE39",0xA2C2],
- ["8235DF30",0xA2C3],
- ["8235DF31",0xA2C4],
- ["8235DF32",0xA2C5],
- ["8235DF33",0xA2C6],
- ["8235DF34",0xA2C7],
- ["8235DF35",0xA2C8],
- ["8235DF36",0xA2C9],
- ["8235DF37",0xA2CA],
- ["8235DF38",0xA2CB],
- ["8235DF39",0xA2CC],
- ["8235E030",0xA2CD],
- ["8235E031",0xA2CE],
- ["8235E032",0xA2CF],
- ["8235E033",0xA2D0],
- ["8235E034",0xA2D1],
- ["8235E035",0xA2D2],
- ["8235E036",0xA2D3],
- ["8235E037",0xA2D4],
- ["8235E038",0xA2D5],
- ["8235E039",0xA2D6],
- ["8235E130",0xA2D7],
- ["8235E131",0xA2D8],
- ["8235E132",0xA2D9],
- ["8235E133",0xA2DA],
- ["8235E134",0xA2DB],
- ["8235E135",0xA2DC],
- ["8235E136",0xA2DD],
- ["8235E137",0xA2DE],
- ["8235E138",0xA2DF],
- ["8235E139",0xA2E0],
- ["8235E230",0xA2E1],
- ["8235E231",0xA2E2],
- ["8235E232",0xA2E3],
- ["8235E233",0xA2E4],
- ["8235E234",0xA2E5],
- ["8235E235",0xA2E6],
- ["8235E236",0xA2E7],
- ["8235E237",0xA2E8],
- ["8235E238",0xA2E9],
- ["8235E239",0xA2EA],
- ["8235E330",0xA2EB],
- ["8235E331",0xA2EC],
- ["8235E332",0xA2ED],
- ["8235E333",0xA2EE],
- ["8235E334",0xA2EF],
- ["8235E335",0xA2F0],
- ["8235E336",0xA2F1],
- ["8235E337",0xA2F2],
- ["8235E338",0xA2F3],
- ["8235E339",0xA2F4],
- ["8235E430",0xA2F5],
- ["8235E431",0xA2F6],
- ["8235E432",0xA2F7],
- ["8235E433",0xA2F8],
- ["8235E434",0xA2F9],
- ["8235E435",0xA2FA],
- ["8235E436",0xA2FB],
- ["8235E437",0xA2FC],
- ["8235E438",0xA2FD],
- ["8235E439",0xA2FE],
- ["8235E530",0xA2FF],
- ["8235E531",0xA300],
- ["8235E532",0xA301],
- ["8235E533",0xA302],
- ["8235E534",0xA303],
- ["8235E535",0xA304],
- ["8235E536",0xA305],
- ["8235E537",0xA306],
- ["8235E538",0xA307],
- ["8235E539",0xA308],
- ["8235E630",0xA309],
- ["8235E631",0xA30A],
- ["8235E632",0xA30B],
- ["8235E633",0xA30C],
- ["8235E634",0xA30D],
- ["8235E635",0xA30E],
- ["8235E636",0xA30F],
- ["8235E637",0xA310],
- ["8235E638",0xA311],
- ["8235E639",0xA312],
- ["8235E730",0xA313],
- ["8235E731",0xA314],
- ["8235E732",0xA315],
- ["8235E733",0xA316],
- ["8235E734",0xA317],
- ["8235E735",0xA318],
- ["8235E736",0xA319],
- ["8235E737",0xA31A],
- ["8235E738",0xA31B],
- ["8235E739",0xA31C],
- ["8235E830",0xA31D],
- ["8235E831",0xA31E],
- ["8235E832",0xA31F],
- ["8235E833",0xA320],
- ["8235E834",0xA321],
- ["8235E835",0xA322],
- ["8235E836",0xA323],
- ["8235E837",0xA324],
- ["8235E838",0xA325],
- ["8235E839",0xA326],
- ["8235E930",0xA327],
- ["8235E931",0xA328],
- ["8235E932",0xA329],
- ["8235E933",0xA32A],
- ["8235E934",0xA32B],
- ["8235E935",0xA32C],
- ["8235E936",0xA32D],
- ["8235E937",0xA32E],
- ["8235E938",0xA32F],
- ["8235E939",0xA330],
- ["8235EA30",0xA331],
- ["8235EA31",0xA332],
- ["8235EA32",0xA333],
- ["8235EA33",0xA334],
- ["8235EA34",0xA335],
- ["8235EA35",0xA336],
- ["8235EA36",0xA337],
- ["8235EA37",0xA338],
- ["8235EA38",0xA339],
- ["8235EA39",0xA33A],
- ["8235EB30",0xA33B],
- ["8235EB31",0xA33C],
- ["8235EB32",0xA33D],
- ["8235EB33",0xA33E],
- ["8235EB34",0xA33F],
- ["8235EB35",0xA340],
- ["8235EB36",0xA341],
- ["8235EB37",0xA342],
- ["8235EB38",0xA343],
- ["8235EB39",0xA344],
- ["8235EC30",0xA345],
- ["8235EC31",0xA346],
- ["8235EC32",0xA347],
- ["8235EC33",0xA348],
- ["8235EC34",0xA349],
- ["8235EC35",0xA34A],
- ["8235EC36",0xA34B],
- ["8235EC37",0xA34C],
- ["8235EC38",0xA34D],
- ["8235EC39",0xA34E],
- ["8235ED30",0xA34F],
- ["8235ED31",0xA350],
- ["8235ED32",0xA351],
- ["8235ED33",0xA352],
- ["8235ED34",0xA353],
- ["8235ED35",0xA354],
- ["8235ED36",0xA355],
- ["8235ED37",0xA356],
- ["8235ED38",0xA357],
- ["8235ED39",0xA358],
- ["8235EE30",0xA359],
- ["8235EE31",0xA35A],
- ["8235EE32",0xA35B],
- ["8235EE33",0xA35C],
- ["8235EE34",0xA35D],
- ["8235EE35",0xA35E],
- ["8235EE36",0xA35F],
- ["8235EE37",0xA360],
- ["8235EE38",0xA361],
- ["8235EE39",0xA362],
- ["8235EF30",0xA363],
- ["8235EF31",0xA364],
- ["8235EF32",0xA365],
- ["8235EF33",0xA366],
- ["8235EF34",0xA367],
- ["8235EF35",0xA368],
- ["8235EF36",0xA369],
- ["8235EF37",0xA36A],
- ["8235EF38",0xA36B],
- ["8235EF39",0xA36C],
- ["8235F030",0xA36D],
- ["8235F031",0xA36E],
- ["8235F032",0xA36F],
- ["8235F033",0xA370],
- ["8235F034",0xA371],
- ["8235F035",0xA372],
- ["8235F036",0xA373],
- ["8235F037",0xA374],
- ["8235F038",0xA375],
- ["8235F039",0xA376],
- ["8235F130",0xA377],
- ["8235F131",0xA378],
- ["8235F132",0xA379],
- ["8235F133",0xA37A],
- ["8235F134",0xA37B],
- ["8235F135",0xA37C],
- ["8235F136",0xA37D],
- ["8235F137",0xA37E],
- ["8235F138",0xA37F],
- ["8235F139",0xA380],
- ["8235F230",0xA381],
- ["8235F231",0xA382],
- ["8235F232",0xA383],
- ["8235F233",0xA384],
- ["8235F234",0xA385],
- ["8235F235",0xA386],
- ["8235F236",0xA387],
- ["8235F237",0xA388],
- ["8235F238",0xA389],
- ["8235F239",0xA38A],
- ["8235F330",0xA38B],
- ["8235F331",0xA38C],
- ["8235F332",0xA38D],
- ["8235F333",0xA38E],
- ["8235F334",0xA38F],
- ["8235F335",0xA390],
- ["8235F336",0xA391],
- ["8235F337",0xA392],
- ["8235F338",0xA393],
- ["8235F339",0xA394],
- ["8235F430",0xA395],
- ["8235F431",0xA396],
- ["8235F432",0xA397],
- ["8235F433",0xA398],
- ["8235F434",0xA399],
- ["8235F435",0xA39A],
- ["8235F436",0xA39B],
- ["8235F437",0xA39C],
- ["8235F438",0xA39D],
- ["8235F439",0xA39E],
- ["8235F530",0xA39F],
- ["8235F531",0xA3A0],
- ["8235F532",0xA3A1],
- ["8235F533",0xA3A2],
- ["8235F534",0xA3A3],
- ["8235F535",0xA3A4],
- ["8235F536",0xA3A5],
- ["8235F537",0xA3A6],
- ["8235F538",0xA3A7],
- ["8235F539",0xA3A8],
- ["8235F630",0xA3A9],
- ["8235F631",0xA3AA],
- ["8235F632",0xA3AB],
- ["8235F633",0xA3AC],
- ["8235F634",0xA3AD],
- ["8235F635",0xA3AE],
- ["8235F636",0xA3AF],
- ["8235F637",0xA3B0],
- ["8235F638",0xA3B1],
- ["8235F639",0xA3B2],
- ["8235F730",0xA3B3],
- ["8235F731",0xA3B4],
- ["8235F732",0xA3B5],
- ["8235F733",0xA3B6],
- ["8235F734",0xA3B7],
- ["8235F735",0xA3B8],
- ["8235F736",0xA3B9],
- ["8235F737",0xA3BA],
- ["8235F738",0xA3BB],
- ["8235F739",0xA3BC],
- ["8235F830",0xA3BD],
- ["8235F831",0xA3BE],
- ["8235F832",0xA3BF],
- ["8235F833",0xA3C0],
- ["8235F834",0xA3C1],
- ["8235F835",0xA3C2],
- ["8235F836",0xA3C3],
- ["8235F837",0xA3C4],
- ["8235F838",0xA3C5],
- ["8235F839",0xA3C6],
- ["8235F930",0xA3C7],
- ["8235F931",0xA3C8],
- ["8235F932",0xA3C9],
- ["8235F933",0xA3CA],
- ["8235F934",0xA3CB],
- ["8235F935",0xA3CC],
- ["8235F936",0xA3CD],
- ["8235F937",0xA3CE],
- ["8235F938",0xA3CF],
- ["8235F939",0xA3D0],
- ["8235FA30",0xA3D1],
- ["8235FA31",0xA3D2],
- ["8235FA32",0xA3D3],
- ["8235FA33",0xA3D4],
- ["8235FA34",0xA3D5],
- ["8235FA35",0xA3D6],
- ["8235FA36",0xA3D7],
- ["8235FA37",0xA3D8],
- ["8235FA38",0xA3D9],
- ["8235FA39",0xA3DA],
- ["8235FB30",0xA3DB],
- ["8235FB31",0xA3DC],
- ["8235FB32",0xA3DD],
- ["8235FB33",0xA3DE],
- ["8235FB34",0xA3DF],
- ["8235FB35",0xA3E0],
- ["8235FB36",0xA3E1],
- ["8235FB37",0xA3E2],
- ["8235FB38",0xA3E3],
- ["8235FB39",0xA3E4],
- ["8235FC30",0xA3E5],
- ["8235FC31",0xA3E6],
- ["8235FC32",0xA3E7],
- ["8235FC33",0xA3E8],
- ["8235FC34",0xA3E9],
- ["8235FC35",0xA3EA],
- ["8235FC36",0xA3EB],
- ["8235FC37",0xA3EC],
- ["8235FC38",0xA3ED],
- ["8235FC39",0xA3EE],
- ["8235FD30",0xA3EF],
- ["8235FD31",0xA3F0],
- ["8235FD32",0xA3F1],
- ["8235FD33",0xA3F2],
- ["8235FD34",0xA3F3],
- ["8235FD35",0xA3F4],
- ["8235FD36",0xA3F5],
- ["8235FD37",0xA3F6],
- ["8235FD38",0xA3F7],
- ["8235FD39",0xA3F8],
- ["8235FE30",0xA3F9],
- ["8235FE31",0xA3FA],
- ["8235FE32",0xA3FB],
- ["8235FE33",0xA3FC],
- ["8235FE34",0xA3FD],
- ["8235FE35",0xA3FE],
- ["8235FE36",0xA3FF],
- ["8235FE37",0xA400],
- ["8235FE38",0xA401],
- ["8235FE39",0xA402],
- ["82368130",0xA403],
- ["82368131",0xA404],
- ["82368132",0xA405],
- ["82368133",0xA406],
- ["82368134",0xA407],
- ["82368135",0xA408],
- ["82368136",0xA409],
- ["82368137",0xA40A],
- ["82368138",0xA40B],
- ["82368139",0xA40C],
- ["82368230",0xA40D],
- ["82368231",0xA40E],
- ["82368232",0xA40F],
- ["82368233",0xA410],
- ["82368234",0xA411],
- ["82368235",0xA412],
- ["82368236",0xA413],
- ["82368237",0xA414],
- ["82368238",0xA415],
- ["82368239",0xA416],
- ["82368330",0xA417],
- ["82368331",0xA418],
- ["82368332",0xA419],
- ["82368333",0xA41A],
- ["82368334",0xA41B],
- ["82368335",0xA41C],
- ["82368336",0xA41D],
- ["82368337",0xA41E],
- ["82368338",0xA41F],
- ["82368339",0xA420],
- ["82368430",0xA421],
- ["82368431",0xA422],
- ["82368432",0xA423],
- ["82368433",0xA424],
- ["82368434",0xA425],
- ["82368435",0xA426],
- ["82368436",0xA427],
- ["82368437",0xA428],
- ["82368438",0xA429],
- ["82368439",0xA42A],
- ["82368530",0xA42B],
- ["82368531",0xA42C],
- ["82368532",0xA42D],
- ["82368533",0xA42E],
- ["82368534",0xA42F],
- ["82368535",0xA430],
- ["82368536",0xA431],
- ["82368537",0xA432],
- ["82368538",0xA433],
- ["82368539",0xA434],
- ["82368630",0xA435],
- ["82368631",0xA436],
- ["82368632",0xA437],
- ["82368633",0xA438],
- ["82368634",0xA439],
- ["82368635",0xA43A],
- ["82368636",0xA43B],
- ["82368637",0xA43C],
- ["82368638",0xA43D],
- ["82368639",0xA43E],
- ["82368730",0xA43F],
- ["82368731",0xA440],
- ["82368732",0xA441],
- ["82368733",0xA442],
- ["82368734",0xA443],
- ["82368735",0xA444],
- ["82368736",0xA445],
- ["82368737",0xA446],
- ["82368738",0xA447],
- ["82368739",0xA448],
- ["82368830",0xA449],
- ["82368831",0xA44A],
- ["82368832",0xA44B],
- ["82368833",0xA44C],
- ["82368834",0xA44D],
- ["82368835",0xA44E],
- ["82368836",0xA44F],
- ["82368837",0xA450],
- ["82368838",0xA451],
- ["82368839",0xA452],
- ["82368930",0xA453],
- ["82368931",0xA454],
- ["82368932",0xA455],
- ["82368933",0xA456],
- ["82368934",0xA457],
- ["82368935",0xA458],
- ["82368936",0xA459],
- ["82368937",0xA45A],
- ["82368938",0xA45B],
- ["82368939",0xA45C],
- ["82368A30",0xA45D],
- ["82368A31",0xA45E],
- ["82368A32",0xA45F],
- ["82368A33",0xA460],
- ["82368A34",0xA461],
- ["82368A35",0xA462],
- ["82368A36",0xA463],
- ["82368A37",0xA464],
- ["82368A38",0xA465],
- ["82368A39",0xA466],
- ["82368B30",0xA467],
- ["82368B31",0xA468],
- ["82368B32",0xA469],
- ["82368B33",0xA46A],
- ["82368B34",0xA46B],
- ["82368B35",0xA46C],
- ["82368B36",0xA46D],
- ["82368B37",0xA46E],
- ["82368B38",0xA46F],
- ["82368B39",0xA470],
- ["82368C30",0xA471],
- ["82368C31",0xA472],
- ["82368C32",0xA473],
- ["82368C33",0xA474],
- ["82368C34",0xA475],
- ["82368C35",0xA476],
- ["82368C36",0xA477],
- ["82368C37",0xA478],
- ["82368C38",0xA479],
- ["82368C39",0xA47A],
- ["82368D30",0xA47B],
- ["82368D31",0xA47C],
- ["82368D32",0xA47D],
- ["82368D33",0xA47E],
- ["82368D34",0xA47F],
- ["82368D35",0xA480],
- ["82368D36",0xA481],
- ["82368D37",0xA482],
- ["82368D38",0xA483],
- ["82368D39",0xA484],
- ["82368E30",0xA485],
- ["82368E31",0xA486],
- ["82368E32",0xA487],
- ["82368E33",0xA488],
- ["82368E34",0xA489],
- ["82368E35",0xA48A],
- ["82368E36",0xA48B],
- ["82368E37",0xA48C],
- ["82368E38",0xA48D],
- ["82368E39",0xA48E],
- ["82368F30",0xA48F],
- ["82368F31",0xA490],
- ["82368F32",0xA491],
- ["82368F33",0xA492],
- ["82368F34",0xA493],
- ["82368F35",0xA494],
- ["82368F36",0xA495],
- ["82368F37",0xA496],
- ["82368F38",0xA497],
- ["82368F39",0xA498],
- ["82369030",0xA499],
- ["82369031",0xA49A],
- ["82369032",0xA49B],
- ["82369033",0xA49C],
- ["82369034",0xA49D],
- ["82369035",0xA49E],
- ["82369036",0xA49F],
- ["82369037",0xA4A0],
- ["82369038",0xA4A1],
- ["82369039",0xA4A2],
- ["82369130",0xA4A3],
- ["82369131",0xA4A4],
- ["82369132",0xA4A5],
- ["82369133",0xA4A6],
- ["82369134",0xA4A7],
- ["82369135",0xA4A8],
- ["82369136",0xA4A9],
- ["82369137",0xA4AA],
- ["82369138",0xA4AB],
- ["82369139",0xA4AC],
- ["82369230",0xA4AD],
- ["82369231",0xA4AE],
- ["82369232",0xA4AF],
- ["82369233",0xA4B0],
- ["82369234",0xA4B1],
- ["82369235",0xA4B2],
- ["82369236",0xA4B3],
- ["82369237",0xA4B4],
- ["82369238",0xA4B5],
- ["82369239",0xA4B6],
- ["82369330",0xA4B7],
- ["82369331",0xA4B8],
- ["82369332",0xA4B9],
- ["82369333",0xA4BA],
- ["82369334",0xA4BB],
- ["82369335",0xA4BC],
- ["82369336",0xA4BD],
- ["82369337",0xA4BE],
- ["82369338",0xA4BF],
- ["82369339",0xA4C0],
- ["82369430",0xA4C1],
- ["82369431",0xA4C2],
- ["82369432",0xA4C3],
- ["82369433",0xA4C4],
- ["82369434",0xA4C5],
- ["82369435",0xA4C6],
- ["82369436",0xA4C7],
- ["82369437",0xA4C8],
- ["82369438",0xA4C9],
- ["82369439",0xA4CA],
- ["82369530",0xA4CB],
- ["82369531",0xA4CC],
- ["82369532",0xA4CD],
- ["82369533",0xA4CE],
- ["82369534",0xA4CF],
- ["82369535",0xA4D0],
- ["82369536",0xA4D1],
- ["82369537",0xA4D2],
- ["82369538",0xA4D3],
- ["82369539",0xA4D4],
- ["82369630",0xA4D5],
- ["82369631",0xA4D6],
- ["82369632",0xA4D7],
- ["82369633",0xA4D8],
- ["82369634",0xA4D9],
- ["82369635",0xA4DA],
- ["82369636",0xA4DB],
- ["82369637",0xA4DC],
- ["82369638",0xA4DD],
- ["82369639",0xA4DE],
- ["82369730",0xA4DF],
- ["82369731",0xA4E0],
- ["82369732",0xA4E1],
- ["82369733",0xA4E2],
- ["82369734",0xA4E3],
- ["82369735",0xA4E4],
- ["82369736",0xA4E5],
- ["82369737",0xA4E6],
- ["82369738",0xA4E7],
- ["82369739",0xA4E8],
- ["82369830",0xA4E9],
- ["82369831",0xA4EA],
- ["82369832",0xA4EB],
- ["82369833",0xA4EC],
- ["82369834",0xA4ED],
- ["82369835",0xA4EE],
- ["82369836",0xA4EF],
- ["82369837",0xA4F0],
- ["82369838",0xA4F1],
- ["82369839",0xA4F2],
- ["82369930",0xA4F3],
- ["82369931",0xA4F4],
- ["82369932",0xA4F5],
- ["82369933",0xA4F6],
- ["82369934",0xA4F7],
- ["82369935",0xA4F8],
- ["82369936",0xA4F9],
- ["82369937",0xA4FA],
- ["82369938",0xA4FB],
- ["82369939",0xA4FC],
- ["82369A30",0xA4FD],
- ["82369A31",0xA4FE],
- ["82369A32",0xA4FF],
- ["82369A33",0xA500],
- ["82369A34",0xA501],
- ["82369A35",0xA502],
- ["82369A36",0xA503],
- ["82369A37",0xA504],
- ["82369A38",0xA505],
- ["82369A39",0xA506],
- ["82369B30",0xA507],
- ["82369B31",0xA508],
- ["82369B32",0xA509],
- ["82369B33",0xA50A],
- ["82369B34",0xA50B],
- ["82369B35",0xA50C],
- ["82369B36",0xA50D],
- ["82369B37",0xA50E],
- ["82369B38",0xA50F],
- ["82369B39",0xA510],
- ["82369C30",0xA511],
- ["82369C31",0xA512],
- ["82369C32",0xA513],
- ["82369C33",0xA514],
- ["82369C34",0xA515],
- ["82369C35",0xA516],
- ["82369C36",0xA517],
- ["82369C37",0xA518],
- ["82369C38",0xA519],
- ["82369C39",0xA51A],
- ["82369D30",0xA51B],
- ["82369D31",0xA51C],
- ["82369D32",0xA51D],
- ["82369D33",0xA51E],
- ["82369D34",0xA51F],
- ["82369D35",0xA520],
- ["82369D36",0xA521],
- ["82369D37",0xA522],
- ["82369D38",0xA523],
- ["82369D39",0xA524],
- ["82369E30",0xA525],
- ["82369E31",0xA526],
- ["82369E32",0xA527],
- ["82369E33",0xA528],
- ["82369E34",0xA529],
- ["82369E35",0xA52A],
- ["82369E36",0xA52B],
- ["82369E37",0xA52C],
- ["82369E38",0xA52D],
- ["82369E39",0xA52E],
- ["82369F30",0xA52F],
- ["82369F31",0xA530],
- ["82369F32",0xA531],
- ["82369F33",0xA532],
- ["82369F34",0xA533],
- ["82369F35",0xA534],
- ["82369F36",0xA535],
- ["82369F37",0xA536],
- ["82369F38",0xA537],
- ["82369F39",0xA538],
- ["8236A030",0xA539],
- ["8236A031",0xA53A],
- ["8236A032",0xA53B],
- ["8236A033",0xA53C],
- ["8236A034",0xA53D],
- ["8236A035",0xA53E],
- ["8236A036",0xA53F],
- ["8236A037",0xA540],
- ["8236A038",0xA541],
- ["8236A039",0xA542],
- ["8236A130",0xA543],
- ["8236A131",0xA544],
- ["8236A132",0xA545],
- ["8236A133",0xA546],
- ["8236A134",0xA547],
- ["8236A135",0xA548],
- ["8236A136",0xA549],
- ["8236A137",0xA54A],
- ["8236A138",0xA54B],
- ["8236A139",0xA54C],
- ["8236A230",0xA54D],
- ["8236A231",0xA54E],
- ["8236A232",0xA54F],
- ["8236A233",0xA550],
- ["8236A234",0xA551],
- ["8236A235",0xA552],
- ["8236A236",0xA553],
- ["8236A237",0xA554],
- ["8236A238",0xA555],
- ["8236A239",0xA556],
- ["8236A330",0xA557],
- ["8236A331",0xA558],
- ["8236A332",0xA559],
- ["8236A333",0xA55A],
- ["8236A334",0xA55B],
- ["8236A335",0xA55C],
- ["8236A336",0xA55D],
- ["8236A337",0xA55E],
- ["8236A338",0xA55F],
- ["8236A339",0xA560],
- ["8236A430",0xA561],
- ["8236A431",0xA562],
- ["8236A432",0xA563],
- ["8236A433",0xA564],
- ["8236A434",0xA565],
- ["8236A435",0xA566],
- ["8236A436",0xA567],
- ["8236A437",0xA568],
- ["8236A438",0xA569],
- ["8236A439",0xA56A],
- ["8236A530",0xA56B],
- ["8236A531",0xA56C],
- ["8236A532",0xA56D],
- ["8236A533",0xA56E],
- ["8236A534",0xA56F],
- ["8236A535",0xA570],
- ["8236A536",0xA571],
- ["8236A537",0xA572],
- ["8236A538",0xA573],
- ["8236A539",0xA574],
- ["8236A630",0xA575],
- ["8236A631",0xA576],
- ["8236A632",0xA577],
- ["8236A633",0xA578],
- ["8236A634",0xA579],
- ["8236A635",0xA57A],
- ["8236A636",0xA57B],
- ["8236A637",0xA57C],
- ["8236A638",0xA57D],
- ["8236A639",0xA57E],
- ["8236A730",0xA57F],
- ["8236A731",0xA580],
- ["8236A732",0xA581],
- ["8236A733",0xA582],
- ["8236A734",0xA583],
- ["8236A735",0xA584],
- ["8236A736",0xA585],
- ["8236A737",0xA586],
- ["8236A738",0xA587],
- ["8236A739",0xA588],
- ["8236A830",0xA589],
- ["8236A831",0xA58A],
- ["8236A832",0xA58B],
- ["8236A833",0xA58C],
- ["8236A834",0xA58D],
- ["8236A835",0xA58E],
- ["8236A836",0xA58F],
- ["8236A837",0xA590],
- ["8236A838",0xA591],
- ["8236A839",0xA592],
- ["8236A930",0xA593],
- ["8236A931",0xA594],
- ["8236A932",0xA595],
- ["8236A933",0xA596],
- ["8236A934",0xA597],
- ["8236A935",0xA598],
- ["8236A936",0xA599],
- ["8236A937",0xA59A],
- ["8236A938",0xA59B],
- ["8236A939",0xA59C],
- ["8236AA30",0xA59D],
- ["8236AA31",0xA59E],
- ["8236AA32",0xA59F],
- ["8236AA33",0xA5A0],
- ["8236AA34",0xA5A1],
- ["8236AA35",0xA5A2],
- ["8236AA36",0xA5A3],
- ["8236AA37",0xA5A4],
- ["8236AA38",0xA5A5],
- ["8236AA39",0xA5A6],
- ["8236AB30",0xA5A7],
- ["8236AB31",0xA5A8],
- ["8236AB32",0xA5A9],
- ["8236AB33",0xA5AA],
- ["8236AB34",0xA5AB],
- ["8236AB35",0xA5AC],
- ["8236AB36",0xA5AD],
- ["8236AB37",0xA5AE],
- ["8236AB38",0xA5AF],
- ["8236AB39",0xA5B0],
- ["8236AC30",0xA5B1],
- ["8236AC31",0xA5B2],
- ["8236AC32",0xA5B3],
- ["8236AC33",0xA5B4],
- ["8236AC34",0xA5B5],
- ["8236AC35",0xA5B6],
- ["8236AC36",0xA5B7],
- ["8236AC37",0xA5B8],
- ["8236AC38",0xA5B9],
- ["8236AC39",0xA5BA],
- ["8236AD30",0xA5BB],
- ["8236AD31",0xA5BC],
- ["8236AD32",0xA5BD],
- ["8236AD33",0xA5BE],
- ["8236AD34",0xA5BF],
- ["8236AD35",0xA5C0],
- ["8236AD36",0xA5C1],
- ["8236AD37",0xA5C2],
- ["8236AD38",0xA5C3],
- ["8236AD39",0xA5C4],
- ["8236AE30",0xA5C5],
- ["8236AE31",0xA5C6],
- ["8236AE32",0xA5C7],
- ["8236AE33",0xA5C8],
- ["8236AE34",0xA5C9],
- ["8236AE35",0xA5CA],
- ["8236AE36",0xA5CB],
- ["8236AE37",0xA5CC],
- ["8236AE38",0xA5CD],
- ["8236AE39",0xA5CE],
- ["8236AF30",0xA5CF],
- ["8236AF31",0xA5D0],
- ["8236AF32",0xA5D1],
- ["8236AF33",0xA5D2],
- ["8236AF34",0xA5D3],
- ["8236AF35",0xA5D4],
- ["8236AF36",0xA5D5],
- ["8236AF37",0xA5D6],
- ["8236AF38",0xA5D7],
- ["8236AF39",0xA5D8],
- ["8236B030",0xA5D9],
- ["8236B031",0xA5DA],
- ["8236B032",0xA5DB],
- ["8236B033",0xA5DC],
- ["8236B034",0xA5DD],
- ["8236B035",0xA5DE],
- ["8236B036",0xA5DF],
- ["8236B037",0xA5E0],
- ["8236B038",0xA5E1],
- ["8236B039",0xA5E2],
- ["8236B130",0xA5E3],
- ["8236B131",0xA5E4],
- ["8236B132",0xA5E5],
- ["8236B133",0xA5E6],
- ["8236B134",0xA5E7],
- ["8236B135",0xA5E8],
- ["8236B136",0xA5E9],
- ["8236B137",0xA5EA],
- ["8236B138",0xA5EB],
- ["8236B139",0xA5EC],
- ["8236B230",0xA5ED],
- ["8236B231",0xA5EE],
- ["8236B232",0xA5EF],
- ["8236B233",0xA5F0],
- ["8236B234",0xA5F1],
- ["8236B235",0xA5F2],
- ["8236B236",0xA5F3],
- ["8236B237",0xA5F4],
- ["8236B238",0xA5F5],
- ["8236B239",0xA5F6],
- ["8236B330",0xA5F7],
- ["8236B331",0xA5F8],
- ["8236B332",0xA5F9],
- ["8236B333",0xA5FA],
- ["8236B334",0xA5FB],
- ["8236B335",0xA5FC],
- ["8236B336",0xA5FD],
- ["8236B337",0xA5FE],
- ["8236B338",0xA5FF],
- ["8236B339",0xA600],
- ["8236B430",0xA601],
- ["8236B431",0xA602],
- ["8236B432",0xA603],
- ["8236B433",0xA604],
- ["8236B434",0xA605],
- ["8236B435",0xA606],
- ["8236B436",0xA607],
- ["8236B437",0xA608],
- ["8236B438",0xA609],
- ["8236B439",0xA60A],
- ["8236B530",0xA60B],
- ["8236B531",0xA60C],
- ["8236B532",0xA60D],
- ["8236B533",0xA60E],
- ["8236B534",0xA60F],
- ["8236B535",0xA610],
- ["8236B536",0xA611],
- ["8236B537",0xA612],
- ["8236B538",0xA613],
- ["8236B539",0xA614],
- ["8236B630",0xA615],
- ["8236B631",0xA616],
- ["8236B632",0xA617],
- ["8236B633",0xA618],
- ["8236B634",0xA619],
- ["8236B635",0xA61A],
- ["8236B636",0xA61B],
- ["8236B637",0xA61C],
- ["8236B638",0xA61D],
- ["8236B639",0xA61E],
- ["8236B730",0xA61F],
- ["8236B731",0xA620],
- ["8236B732",0xA621],
- ["8236B733",0xA622],
- ["8236B734",0xA623],
- ["8236B735",0xA624],
- ["8236B736",0xA625],
- ["8236B737",0xA626],
- ["8236B738",0xA627],
- ["8236B739",0xA628],
- ["8236B830",0xA629],
- ["8236B831",0xA62A],
- ["8236B832",0xA62B],
- ["8236B833",0xA62C],
- ["8236B834",0xA62D],
- ["8236B835",0xA62E],
- ["8236B836",0xA62F],
- ["8236B837",0xA630],
- ["8236B838",0xA631],
- ["8236B839",0xA632],
- ["8236B930",0xA633],
- ["8236B931",0xA634],
- ["8236B932",0xA635],
- ["8236B933",0xA636],
- ["8236B934",0xA637],
- ["8236B935",0xA638],
- ["8236B936",0xA639],
- ["8236B937",0xA63A],
- ["8236B938",0xA63B],
- ["8236B939",0xA63C],
- ["8236BA30",0xA63D],
- ["8236BA31",0xA63E],
- ["8236BA32",0xA63F],
- ["8236BA33",0xA640],
- ["8236BA34",0xA641],
- ["8236BA35",0xA642],
- ["8236BA36",0xA643],
- ["8236BA37",0xA644],
- ["8236BA38",0xA645],
- ["8236BA39",0xA646],
- ["8236BB30",0xA647],
- ["8236BB31",0xA648],
- ["8236BB32",0xA649],
- ["8236BB33",0xA64A],
- ["8236BB34",0xA64B],
- ["8236BB35",0xA64C],
- ["8236BB36",0xA64D],
- ["8236BB37",0xA64E],
- ["8236BB38",0xA64F],
- ["8236BB39",0xA650],
- ["8236BC30",0xA651],
- ["8236BC31",0xA652],
- ["8236BC32",0xA653],
- ["8236BC33",0xA654],
- ["8236BC34",0xA655],
- ["8236BC35",0xA656],
- ["8236BC36",0xA657],
- ["8236BC37",0xA658],
- ["8236BC38",0xA659],
- ["8236BC39",0xA65A],
- ["8236BD30",0xA65B],
- ["8236BD31",0xA65C],
- ["8236BD32",0xA65D],
- ["8236BD33",0xA65E],
- ["8236BD34",0xA65F],
- ["8236BD35",0xA660],
- ["8236BD36",0xA661],
- ["8236BD37",0xA662],
- ["8236BD38",0xA663],
- ["8236BD39",0xA664],
- ["8236BE30",0xA665],
- ["8236BE31",0xA666],
- ["8236BE32",0xA667],
- ["8236BE33",0xA668],
- ["8236BE34",0xA669],
- ["8236BE35",0xA66A],
- ["8236BE36",0xA66B],
- ["8236BE37",0xA66C],
- ["8236BE38",0xA66D],
- ["8236BE39",0xA66E],
- ["8236BF30",0xA66F],
- ["8236BF31",0xA670],
- ["8236BF32",0xA671],
- ["8236BF33",0xA672],
- ["8236BF34",0xA673],
- ["8236BF35",0xA674],
- ["8236BF36",0xA675],
- ["8236BF37",0xA676],
- ["8236BF38",0xA677],
- ["8236BF39",0xA678],
- ["8236C030",0xA679],
- ["8236C031",0xA67A],
- ["8236C032",0xA67B],
- ["8236C033",0xA67C],
- ["8236C034",0xA67D],
- ["8236C035",0xA67E],
- ["8236C036",0xA67F],
- ["8236C037",0xA680],
- ["8236C038",0xA681],
- ["8236C039",0xA682],
- ["8236C130",0xA683],
- ["8236C131",0xA684],
- ["8236C132",0xA685],
- ["8236C133",0xA686],
- ["8236C134",0xA687],
- ["8236C135",0xA688],
- ["8236C136",0xA689],
- ["8236C137",0xA68A],
- ["8236C138",0xA68B],
- ["8236C139",0xA68C],
- ["8236C230",0xA68D],
- ["8236C231",0xA68E],
- ["8236C232",0xA68F],
- ["8236C233",0xA690],
- ["8236C234",0xA691],
- ["8236C235",0xA692],
- ["8236C236",0xA693],
- ["8236C237",0xA694],
- ["8236C238",0xA695],
- ["8236C239",0xA696],
- ["8236C330",0xA697],
- ["8236C331",0xA698],
- ["8236C332",0xA699],
- ["8236C333",0xA69A],
- ["8236C334",0xA69B],
- ["8236C335",0xA69C],
- ["8236C336",0xA69D],
- ["8236C337",0xA69E],
- ["8236C338",0xA69F],
- ["8236C339",0xA6A0],
- ["8236C430",0xA6A1],
- ["8236C431",0xA6A2],
- ["8236C432",0xA6A3],
- ["8236C433",0xA6A4],
- ["8236C434",0xA6A5],
- ["8236C435",0xA6A6],
- ["8236C436",0xA6A7],
- ["8236C437",0xA6A8],
- ["8236C438",0xA6A9],
- ["8236C439",0xA6AA],
- ["8236C530",0xA6AB],
- ["8236C531",0xA6AC],
- ["8236C532",0xA6AD],
- ["8236C533",0xA6AE],
- ["8236C534",0xA6AF],
- ["8236C535",0xA6B0],
- ["8236C536",0xA6B1],
- ["8236C537",0xA6B2],
- ["8236C538",0xA6B3],
- ["8236C539",0xA6B4],
- ["8236C630",0xA6B5],
- ["8236C631",0xA6B6],
- ["8236C632",0xA6B7],
- ["8236C633",0xA6B8],
- ["8236C634",0xA6B9],
- ["8236C635",0xA6BA],
- ["8236C636",0xA6BB],
- ["8236C637",0xA6BC],
- ["8236C638",0xA6BD],
- ["8236C639",0xA6BE],
- ["8236C730",0xA6BF],
- ["8236C731",0xA6C0],
- ["8236C732",0xA6C1],
- ["8236C733",0xA6C2],
- ["8236C734",0xA6C3],
- ["8236C735",0xA6C4],
- ["8236C736",0xA6C5],
- ["8236C737",0xA6C6],
- ["8236C738",0xA6C7],
- ["8236C739",0xA6C8],
- ["8236C830",0xA6C9],
- ["8236C831",0xA6CA],
- ["8236C832",0xA6CB],
- ["8236C833",0xA6CC],
- ["8236C834",0xA6CD],
- ["8236C835",0xA6CE],
- ["8236C836",0xA6CF],
- ["8236C837",0xA6D0],
- ["8236C838",0xA6D1],
- ["8236C839",0xA6D2],
- ["8236C930",0xA6D3],
- ["8236C931",0xA6D4],
- ["8236C932",0xA6D5],
- ["8236C933",0xA6D6],
- ["8236C934",0xA6D7],
- ["8236C935",0xA6D8],
- ["8236C936",0xA6D9],
- ["8236C937",0xA6DA],
- ["8236C938",0xA6DB],
- ["8236C939",0xA6DC],
- ["8236CA30",0xA6DD],
- ["8236CA31",0xA6DE],
- ["8236CA32",0xA6DF],
- ["8236CA33",0xA6E0],
- ["8236CA34",0xA6E1],
- ["8236CA35",0xA6E2],
- ["8236CA36",0xA6E3],
- ["8236CA37",0xA6E4],
- ["8236CA38",0xA6E5],
- ["8236CA39",0xA6E6],
- ["8236CB30",0xA6E7],
- ["8236CB31",0xA6E8],
- ["8236CB32",0xA6E9],
- ["8236CB33",0xA6EA],
- ["8236CB34",0xA6EB],
- ["8236CB35",0xA6EC],
- ["8236CB36",0xA6ED],
- ["8236CB37",0xA6EE],
- ["8236CB38",0xA6EF],
- ["8236CB39",0xA6F0],
- ["8236CC30",0xA6F1],
- ["8236CC31",0xA6F2],
- ["8236CC32",0xA6F3],
- ["8236CC33",0xA6F4],
- ["8236CC34",0xA6F5],
- ["8236CC35",0xA6F6],
- ["8236CC36",0xA6F7],
- ["8236CC37",0xA6F8],
- ["8236CC38",0xA6F9],
- ["8236CC39",0xA6FA],
- ["8236CD30",0xA6FB],
- ["8236CD31",0xA6FC],
- ["8236CD32",0xA6FD],
- ["8236CD33",0xA6FE],
- ["8236CD34",0xA6FF],
- ["8236CD35",0xA700],
- ["8236CD36",0xA701],
- ["8236CD37",0xA702],
- ["8236CD38",0xA703],
- ["8236CD39",0xA704],
- ["8236CE30",0xA705],
- ["8236CE31",0xA706],
- ["8236CE32",0xA707],
- ["8236CE33",0xA708],
- ["8236CE34",0xA709],
- ["8236CE35",0xA70A],
- ["8236CE36",0xA70B],
- ["8236CE37",0xA70C],
- ["8236CE38",0xA70D],
- ["8236CE39",0xA70E],
- ["8236CF30",0xA70F],
- ["8236CF31",0xA710],
- ["8236CF32",0xA711],
- ["8236CF33",0xA712],
- ["8236CF34",0xA713],
- ["8236CF35",0xA714],
- ["8236CF36",0xA715],
- ["8236CF37",0xA716],
- ["8236CF38",0xA717],
- ["8236CF39",0xA718],
- ["8236D030",0xA719],
- ["8236D031",0xA71A],
- ["8236D032",0xA71B],
- ["8236D033",0xA71C],
- ["8236D034",0xA71D],
- ["8236D035",0xA71E],
- ["8236D036",0xA71F],
- ["8236D037",0xA720],
- ["8236D038",0xA721],
- ["8236D039",0xA722],
- ["8236D130",0xA723],
- ["8236D131",0xA724],
- ["8236D132",0xA725],
- ["8236D133",0xA726],
- ["8236D134",0xA727],
- ["8236D135",0xA728],
- ["8236D136",0xA729],
- ["8236D137",0xA72A],
- ["8236D138",0xA72B],
- ["8236D139",0xA72C],
- ["8236D230",0xA72D],
- ["8236D231",0xA72E],
- ["8236D232",0xA72F],
- ["8236D233",0xA730],
- ["8236D234",0xA731],
- ["8236D235",0xA732],
- ["8236D236",0xA733],
- ["8236D237",0xA734],
- ["8236D238",0xA735],
- ["8236D239",0xA736],
- ["8236D330",0xA737],
- ["8236D331",0xA738],
- ["8236D332",0xA739],
- ["8236D333",0xA73A],
- ["8236D334",0xA73B],
- ["8236D335",0xA73C],
- ["8236D336",0xA73D],
- ["8236D337",0xA73E],
- ["8236D338",0xA73F],
- ["8236D339",0xA740],
- ["8236D430",0xA741],
- ["8236D431",0xA742],
- ["8236D432",0xA743],
- ["8236D433",0xA744],
- ["8236D434",0xA745],
- ["8236D435",0xA746],
- ["8236D436",0xA747],
- ["8236D437",0xA748],
- ["8236D438",0xA749],
- ["8236D439",0xA74A],
- ["8236D530",0xA74B],
- ["8236D531",0xA74C],
- ["8236D532",0xA74D],
- ["8236D533",0xA74E],
- ["8236D534",0xA74F],
- ["8236D535",0xA750],
- ["8236D536",0xA751],
- ["8236D537",0xA752],
- ["8236D538",0xA753],
- ["8236D539",0xA754],
- ["8236D630",0xA755],
- ["8236D631",0xA756],
- ["8236D632",0xA757],
- ["8236D633",0xA758],
- ["8236D634",0xA759],
- ["8236D635",0xA75A],
- ["8236D636",0xA75B],
- ["8236D637",0xA75C],
- ["8236D638",0xA75D],
- ["8236D639",0xA75E],
- ["8236D730",0xA75F],
- ["8236D731",0xA760],
- ["8236D732",0xA761],
- ["8236D733",0xA762],
- ["8236D734",0xA763],
- ["8236D735",0xA764],
- ["8236D736",0xA765],
- ["8236D737",0xA766],
- ["8236D738",0xA767],
- ["8236D739",0xA768],
- ["8236D830",0xA769],
- ["8236D831",0xA76A],
- ["8236D832",0xA76B],
- ["8236D833",0xA76C],
- ["8236D834",0xA76D],
- ["8236D835",0xA76E],
- ["8236D836",0xA76F],
- ["8236D837",0xA770],
- ["8236D838",0xA771],
- ["8236D839",0xA772],
- ["8236D930",0xA773],
- ["8236D931",0xA774],
- ["8236D932",0xA775],
- ["8236D933",0xA776],
- ["8236D934",0xA777],
- ["8236D935",0xA778],
- ["8236D936",0xA779],
- ["8236D937",0xA77A],
- ["8236D938",0xA77B],
- ["8236D939",0xA77C],
- ["8236DA30",0xA77D],
- ["8236DA31",0xA77E],
- ["8236DA32",0xA77F],
- ["8236DA33",0xA780],
- ["8236DA34",0xA781],
- ["8236DA35",0xA782],
- ["8236DA36",0xA783],
- ["8236DA37",0xA784],
- ["8236DA38",0xA785],
- ["8236DA39",0xA786],
- ["8236DB30",0xA787],
- ["8236DB31",0xA788],
- ["8236DB32",0xA789],
- ["8236DB33",0xA78A],
- ["8236DB34",0xA78B],
- ["8236DB35",0xA78C],
- ["8236DB36",0xA78D],
- ["8236DB37",0xA78E],
- ["8236DB38",0xA78F],
- ["8236DB39",0xA790],
- ["8236DC30",0xA791],
- ["8236DC31",0xA792],
- ["8236DC32",0xA793],
- ["8236DC33",0xA794],
- ["8236DC34",0xA795],
- ["8236DC35",0xA796],
- ["8236DC36",0xA797],
- ["8236DC37",0xA798],
- ["8236DC38",0xA799],
- ["8236DC39",0xA79A],
- ["8236DD30",0xA79B],
- ["8236DD31",0xA79C],
- ["8236DD32",0xA79D],
- ["8236DD33",0xA79E],
- ["8236DD34",0xA79F],
- ["8236DD35",0xA7A0],
- ["8236DD36",0xA7A1],
- ["8236DD37",0xA7A2],
- ["8236DD38",0xA7A3],
- ["8236DD39",0xA7A4],
- ["8236DE30",0xA7A5],
- ["8236DE31",0xA7A6],
- ["8236DE32",0xA7A7],
- ["8236DE33",0xA7A8],
- ["8236DE34",0xA7A9],
- ["8236DE35",0xA7AA],
- ["8236DE36",0xA7AB],
- ["8236DE37",0xA7AC],
- ["8236DE38",0xA7AD],
- ["8236DE39",0xA7AE],
- ["8236DF30",0xA7AF],
- ["8236DF31",0xA7B0],
- ["8236DF32",0xA7B1],
- ["8236DF33",0xA7B2],
- ["8236DF34",0xA7B3],
- ["8236DF35",0xA7B4],
- ["8236DF36",0xA7B5],
- ["8236DF37",0xA7B6],
- ["8236DF38",0xA7B7],
- ["8236DF39",0xA7B8],
- ["8236E030",0xA7B9],
- ["8236E031",0xA7BA],
- ["8236E032",0xA7BB],
- ["8236E033",0xA7BC],
- ["8236E034",0xA7BD],
- ["8236E035",0xA7BE],
- ["8236E036",0xA7BF],
- ["8236E037",0xA7C0],
- ["8236E038",0xA7C1],
- ["8236E039",0xA7C2],
- ["8236E130",0xA7C3],
- ["8236E131",0xA7C4],
- ["8236E132",0xA7C5],
- ["8236E133",0xA7C6],
- ["8236E134",0xA7C7],
- ["8236E135",0xA7C8],
- ["8236E136",0xA7C9],
- ["8236E137",0xA7CA],
- ["8236E138",0xA7CB],
- ["8236E139",0xA7CC],
- ["8236E230",0xA7CD],
- ["8236E231",0xA7CE],
- ["8236E232",0xA7CF],
- ["8236E233",0xA7D0],
- ["8236E234",0xA7D1],
- ["8236E235",0xA7D2],
- ["8236E236",0xA7D3],
- ["8236E237",0xA7D4],
- ["8236E238",0xA7D5],
- ["8236E239",0xA7D6],
- ["8236E330",0xA7D7],
- ["8236E331",0xA7D8],
- ["8236E332",0xA7D9],
- ["8236E333",0xA7DA],
- ["8236E334",0xA7DB],
- ["8236E335",0xA7DC],
- ["8236E336",0xA7DD],
- ["8236E337",0xA7DE],
- ["8236E338",0xA7DF],
- ["8236E339",0xA7E0],
- ["8236E430",0xA7E1],
- ["8236E431",0xA7E2],
- ["8236E432",0xA7E3],
- ["8236E433",0xA7E4],
- ["8236E434",0xA7E5],
- ["8236E435",0xA7E6],
- ["8236E436",0xA7E7],
- ["8236E437",0xA7E8],
- ["8236E438",0xA7E9],
- ["8236E439",0xA7EA],
- ["8236E530",0xA7EB],
- ["8236E531",0xA7EC],
- ["8236E532",0xA7ED],
- ["8236E533",0xA7EE],
- ["8236E534",0xA7EF],
- ["8236E535",0xA7F0],
- ["8236E536",0xA7F1],
- ["8236E537",0xA7F2],
- ["8236E538",0xA7F3],
- ["8236E539",0xA7F4],
- ["8236E630",0xA7F5],
- ["8236E631",0xA7F6],
- ["8236E632",0xA7F7],
- ["8236E633",0xA7F8],
- ["8236E634",0xA7F9],
- ["8236E635",0xA7FA],
- ["8236E636",0xA7FB],
- ["8236E637",0xA7FC],
- ["8236E638",0xA7FD],
- ["8236E639",0xA7FE],
- ["8236E730",0xA7FF],
- ["8236E731",0xA800],
- ["8236E732",0xA801],
- ["8236E733",0xA802],
- ["8236E734",0xA803],
- ["8236E735",0xA804],
- ["8236E736",0xA805],
- ["8236E737",0xA806],
- ["8236E738",0xA807],
- ["8236E739",0xA808],
- ["8236E830",0xA809],
- ["8236E831",0xA80A],
- ["8236E832",0xA80B],
- ["8236E833",0xA80C],
- ["8236E834",0xA80D],
- ["8236E835",0xA80E],
- ["8236E836",0xA80F],
- ["8236E837",0xA810],
- ["8236E838",0xA811],
- ["8236E839",0xA812],
- ["8236E930",0xA813],
- ["8236E931",0xA814],
- ["8236E932",0xA815],
- ["8236E933",0xA816],
- ["8236E934",0xA817],
- ["8236E935",0xA818],
- ["8236E936",0xA819],
- ["8236E937",0xA81A],
- ["8236E938",0xA81B],
- ["8236E939",0xA81C],
- ["8236EA30",0xA81D],
- ["8236EA31",0xA81E],
- ["8236EA32",0xA81F],
- ["8236EA33",0xA820],
- ["8236EA34",0xA821],
- ["8236EA35",0xA822],
- ["8236EA36",0xA823],
- ["8236EA37",0xA824],
- ["8236EA38",0xA825],
- ["8236EA39",0xA826],
- ["8236EB30",0xA827],
- ["8236EB31",0xA828],
- ["8236EB32",0xA829],
- ["8236EB33",0xA82A],
- ["8236EB34",0xA82B],
- ["8236EB35",0xA82C],
- ["8236EB36",0xA82D],
- ["8236EB37",0xA82E],
- ["8236EB38",0xA82F],
- ["8236EB39",0xA830],
- ["8236EC30",0xA831],
- ["8236EC31",0xA832],
- ["8236EC32",0xA833],
- ["8236EC33",0xA834],
- ["8236EC34",0xA835],
- ["8236EC35",0xA836],
- ["8236EC36",0xA837],
- ["8236EC37",0xA838],
- ["8236EC38",0xA839],
- ["8236EC39",0xA83A],
- ["8236ED30",0xA83B],
- ["8236ED31",0xA83C],
- ["8236ED32",0xA83D],
- ["8236ED33",0xA83E],
- ["8236ED34",0xA83F],
- ["8236ED35",0xA840],
- ["8236ED36",0xA841],
- ["8236ED37",0xA842],
- ["8236ED38",0xA843],
- ["8236ED39",0xA844],
- ["8236EE30",0xA845],
- ["8236EE31",0xA846],
- ["8236EE32",0xA847],
- ["8236EE33",0xA848],
- ["8236EE34",0xA849],
- ["8236EE35",0xA84A],
- ["8236EE36",0xA84B],
- ["8236EE37",0xA84C],
- ["8236EE38",0xA84D],
- ["8236EE39",0xA84E],
- ["8236EF30",0xA84F],
- ["8236EF31",0xA850],
- ["8236EF32",0xA851],
- ["8236EF33",0xA852],
- ["8236EF34",0xA853],
- ["8236EF35",0xA854],
- ["8236EF36",0xA855],
- ["8236EF37",0xA856],
- ["8236EF38",0xA857],
- ["8236EF39",0xA858],
- ["8236F030",0xA859],
- ["8236F031",0xA85A],
- ["8236F032",0xA85B],
- ["8236F033",0xA85C],
- ["8236F034",0xA85D],
- ["8236F035",0xA85E],
- ["8236F036",0xA85F],
- ["8236F037",0xA860],
- ["8236F038",0xA861],
- ["8236F039",0xA862],
- ["8236F130",0xA863],
- ["8236F131",0xA864],
- ["8236F132",0xA865],
- ["8236F133",0xA866],
- ["8236F134",0xA867],
- ["8236F135",0xA868],
- ["8236F136",0xA869],
- ["8236F137",0xA86A],
- ["8236F138",0xA86B],
- ["8236F139",0xA86C],
- ["8236F230",0xA86D],
- ["8236F231",0xA86E],
- ["8236F232",0xA86F],
- ["8236F233",0xA870],
- ["8236F234",0xA871],
- ["8236F235",0xA872],
- ["8236F236",0xA873],
- ["8236F237",0xA874],
- ["8236F238",0xA875],
- ["8236F239",0xA876],
- ["8236F330",0xA877],
- ["8236F331",0xA878],
- ["8236F332",0xA879],
- ["8236F333",0xA87A],
- ["8236F334",0xA87B],
- ["8236F335",0xA87C],
- ["8236F336",0xA87D],
- ["8236F337",0xA87E],
- ["8236F338",0xA87F],
- ["8236F339",0xA880],
- ["8236F430",0xA881],
- ["8236F431",0xA882],
- ["8236F432",0xA883],
- ["8236F433",0xA884],
- ["8236F434",0xA885],
- ["8236F435",0xA886],
- ["8236F436",0xA887],
- ["8236F437",0xA888],
- ["8236F438",0xA889],
- ["8236F439",0xA88A],
- ["8236F530",0xA88B],
- ["8236F531",0xA88C],
- ["8236F532",0xA88D],
- ["8236F533",0xA88E],
- ["8236F534",0xA88F],
- ["8236F535",0xA890],
- ["8236F536",0xA891],
- ["8236F537",0xA892],
- ["8236F538",0xA893],
- ["8236F539",0xA894],
- ["8236F630",0xA895],
- ["8236F631",0xA896],
- ["8236F632",0xA897],
- ["8236F633",0xA898],
- ["8236F634",0xA899],
- ["8236F635",0xA89A],
- ["8236F636",0xA89B],
- ["8236F637",0xA89C],
- ["8236F638",0xA89D],
- ["8236F639",0xA89E],
- ["8236F730",0xA89F],
- ["8236F731",0xA8A0],
- ["8236F732",0xA8A1],
- ["8236F733",0xA8A2],
- ["8236F734",0xA8A3],
- ["8236F735",0xA8A4],
- ["8236F736",0xA8A5],
- ["8236F737",0xA8A6],
- ["8236F738",0xA8A7],
- ["8236F739",0xA8A8],
- ["8236F830",0xA8A9],
- ["8236F831",0xA8AA],
- ["8236F832",0xA8AB],
- ["8236F833",0xA8AC],
- ["8236F834",0xA8AD],
- ["8236F835",0xA8AE],
- ["8236F836",0xA8AF],
- ["8236F837",0xA8B0],
- ["8236F838",0xA8B1],
- ["8236F839",0xA8B2],
- ["8236F930",0xA8B3],
- ["8236F931",0xA8B4],
- ["8236F932",0xA8B5],
- ["8236F933",0xA8B6],
- ["8236F934",0xA8B7],
- ["8236F935",0xA8B8],
- ["8236F936",0xA8B9],
- ["8236F937",0xA8BA],
- ["8236F938",0xA8BB],
- ["8236F939",0xA8BC],
- ["8236FA30",0xA8BD],
- ["8236FA31",0xA8BE],
- ["8236FA32",0xA8BF],
- ["8236FA33",0xA8C0],
- ["8236FA34",0xA8C1],
- ["8236FA35",0xA8C2],
- ["8236FA36",0xA8C3],
- ["8236FA37",0xA8C4],
- ["8236FA38",0xA8C5],
- ["8236FA39",0xA8C6],
- ["8236FB30",0xA8C7],
- ["8236FB31",0xA8C8],
- ["8236FB32",0xA8C9],
- ["8236FB33",0xA8CA],
- ["8236FB34",0xA8CB],
- ["8236FB35",0xA8CC],
- ["8236FB36",0xA8CD],
- ["8236FB37",0xA8CE],
- ["8236FB38",0xA8CF],
- ["8236FB39",0xA8D0],
- ["8236FC30",0xA8D1],
- ["8236FC31",0xA8D2],
- ["8236FC32",0xA8D3],
- ["8236FC33",0xA8D4],
- ["8236FC34",0xA8D5],
- ["8236FC35",0xA8D6],
- ["8236FC36",0xA8D7],
- ["8236FC37",0xA8D8],
- ["8236FC38",0xA8D9],
- ["8236FC39",0xA8DA],
- ["8236FD30",0xA8DB],
- ["8236FD31",0xA8DC],
- ["8236FD32",0xA8DD],
- ["8236FD33",0xA8DE],
- ["8236FD34",0xA8DF],
- ["8236FD35",0xA8E0],
- ["8236FD36",0xA8E1],
- ["8236FD37",0xA8E2],
- ["8236FD38",0xA8E3],
- ["8236FD39",0xA8E4],
- ["8236FE30",0xA8E5],
- ["8236FE31",0xA8E6],
- ["8236FE32",0xA8E7],
- ["8236FE33",0xA8E8],
- ["8236FE34",0xA8E9],
- ["8236FE35",0xA8EA],
- ["8236FE36",0xA8EB],
- ["8236FE37",0xA8EC],
- ["8236FE38",0xA8ED],
- ["8236FE39",0xA8EE],
- ["82378130",0xA8EF],
- ["82378131",0xA8F0],
- ["82378132",0xA8F1],
- ["82378133",0xA8F2],
- ["82378134",0xA8F3],
- ["82378135",0xA8F4],
- ["82378136",0xA8F5],
- ["82378137",0xA8F6],
- ["82378138",0xA8F7],
- ["82378139",0xA8F8],
- ["82378230",0xA8F9],
- ["82378231",0xA8FA],
- ["82378232",0xA8FB],
- ["82378233",0xA8FC],
- ["82378234",0xA8FD],
- ["82378235",0xA8FE],
- ["82378236",0xA8FF],
- ["82378237",0xA900],
- ["82378238",0xA901],
- ["82378239",0xA902],
- ["82378330",0xA903],
- ["82378331",0xA904],
- ["82378332",0xA905],
- ["82378333",0xA906],
- ["82378334",0xA907],
- ["82378335",0xA908],
- ["82378336",0xA909],
- ["82378337",0xA90A],
- ["82378338",0xA90B],
- ["82378339",0xA90C],
- ["82378430",0xA90D],
- ["82378431",0xA90E],
- ["82378432",0xA90F],
- ["82378433",0xA910],
- ["82378434",0xA911],
- ["82378435",0xA912],
- ["82378436",0xA913],
- ["82378437",0xA914],
- ["82378438",0xA915],
- ["82378439",0xA916],
- ["82378530",0xA917],
- ["82378531",0xA918],
- ["82378532",0xA919],
- ["82378533",0xA91A],
- ["82378534",0xA91B],
- ["82378535",0xA91C],
- ["82378536",0xA91D],
- ["82378537",0xA91E],
- ["82378538",0xA91F],
- ["82378539",0xA920],
- ["82378630",0xA921],
- ["82378631",0xA922],
- ["82378632",0xA923],
- ["82378633",0xA924],
- ["82378634",0xA925],
- ["82378635",0xA926],
- ["82378636",0xA927],
- ["82378637",0xA928],
- ["82378638",0xA929],
- ["82378639",0xA92A],
- ["82378730",0xA92B],
- ["82378731",0xA92C],
- ["82378732",0xA92D],
- ["82378733",0xA92E],
- ["82378734",0xA92F],
- ["82378735",0xA930],
- ["82378736",0xA931],
- ["82378737",0xA932],
- ["82378738",0xA933],
- ["82378739",0xA934],
- ["82378830",0xA935],
- ["82378831",0xA936],
- ["82378832",0xA937],
- ["82378833",0xA938],
- ["82378834",0xA939],
- ["82378835",0xA93A],
- ["82378836",0xA93B],
- ["82378837",0xA93C],
- ["82378838",0xA93D],
- ["82378839",0xA93E],
- ["82378930",0xA93F],
- ["82378931",0xA940],
- ["82378932",0xA941],
- ["82378933",0xA942],
- ["82378934",0xA943],
- ["82378935",0xA944],
- ["82378936",0xA945],
- ["82378937",0xA946],
- ["82378938",0xA947],
- ["82378939",0xA948],
- ["82378A30",0xA949],
- ["82378A31",0xA94A],
- ["82378A32",0xA94B],
- ["82378A33",0xA94C],
- ["82378A34",0xA94D],
- ["82378A35",0xA94E],
- ["82378A36",0xA94F],
- ["82378A37",0xA950],
- ["82378A38",0xA951],
- ["82378A39",0xA952],
- ["82378B30",0xA953],
- ["82378B31",0xA954],
- ["82378B32",0xA955],
- ["82378B33",0xA956],
- ["82378B34",0xA957],
- ["82378B35",0xA958],
- ["82378B36",0xA959],
- ["82378B37",0xA95A],
- ["82378B38",0xA95B],
- ["82378B39",0xA95C],
- ["82378C30",0xA95D],
- ["82378C31",0xA95E],
- ["82378C32",0xA95F],
- ["82378C33",0xA960],
- ["82378C34",0xA961],
- ["82378C35",0xA962],
- ["82378C36",0xA963],
- ["82378C37",0xA964],
- ["82378C38",0xA965],
- ["82378C39",0xA966],
- ["82378D30",0xA967],
- ["82378D31",0xA968],
- ["82378D32",0xA969],
- ["82378D33",0xA96A],
- ["82378D34",0xA96B],
- ["82378D35",0xA96C],
- ["82378D36",0xA96D],
- ["82378D37",0xA96E],
- ["82378D38",0xA96F],
- ["82378D39",0xA970],
- ["82378E30",0xA971],
- ["82378E31",0xA972],
- ["82378E32",0xA973],
- ["82378E33",0xA974],
- ["82378E34",0xA975],
- ["82378E35",0xA976],
- ["82378E36",0xA977],
- ["82378E37",0xA978],
- ["82378E38",0xA979],
- ["82378E39",0xA97A],
- ["82378F30",0xA97B],
- ["82378F31",0xA97C],
- ["82378F32",0xA97D],
- ["82378F33",0xA97E],
- ["82378F34",0xA97F],
- ["82378F35",0xA980],
- ["82378F36",0xA981],
- ["82378F37",0xA982],
- ["82378F38",0xA983],
- ["82378F39",0xA984],
- ["82379030",0xA985],
- ["82379031",0xA986],
- ["82379032",0xA987],
- ["82379033",0xA988],
- ["82379034",0xA989],
- ["82379035",0xA98A],
- ["82379036",0xA98B],
- ["82379037",0xA98C],
- ["82379038",0xA98D],
- ["82379039",0xA98E],
- ["82379130",0xA98F],
- ["82379131",0xA990],
- ["82379132",0xA991],
- ["82379133",0xA992],
- ["82379134",0xA993],
- ["82379135",0xA994],
- ["82379136",0xA995],
- ["82379137",0xA996],
- ["82379138",0xA997],
- ["82379139",0xA998],
- ["82379230",0xA999],
- ["82379231",0xA99A],
- ["82379232",0xA99B],
- ["82379233",0xA99C],
- ["82379234",0xA99D],
- ["82379235",0xA99E],
- ["82379236",0xA99F],
- ["82379237",0xA9A0],
- ["82379238",0xA9A1],
- ["82379239",0xA9A2],
- ["82379330",0xA9A3],
- ["82379331",0xA9A4],
- ["82379332",0xA9A5],
- ["82379333",0xA9A6],
- ["82379334",0xA9A7],
- ["82379335",0xA9A8],
- ["82379336",0xA9A9],
- ["82379337",0xA9AA],
- ["82379338",0xA9AB],
- ["82379339",0xA9AC],
- ["82379430",0xA9AD],
- ["82379431",0xA9AE],
- ["82379432",0xA9AF],
- ["82379433",0xA9B0],
- ["82379434",0xA9B1],
- ["82379435",0xA9B2],
- ["82379436",0xA9B3],
- ["82379437",0xA9B4],
- ["82379438",0xA9B5],
- ["82379439",0xA9B6],
- ["82379530",0xA9B7],
- ["82379531",0xA9B8],
- ["82379532",0xA9B9],
- ["82379533",0xA9BA],
- ["82379534",0xA9BB],
- ["82379535",0xA9BC],
- ["82379536",0xA9BD],
- ["82379537",0xA9BE],
- ["82379538",0xA9BF],
- ["82379539",0xA9C0],
- ["82379630",0xA9C1],
- ["82379631",0xA9C2],
- ["82379632",0xA9C3],
- ["82379633",0xA9C4],
- ["82379634",0xA9C5],
- ["82379635",0xA9C6],
- ["82379636",0xA9C7],
- ["82379637",0xA9C8],
- ["82379638",0xA9C9],
- ["82379639",0xA9CA],
- ["82379730",0xA9CB],
- ["82379731",0xA9CC],
- ["82379732",0xA9CD],
- ["82379733",0xA9CE],
- ["82379734",0xA9CF],
- ["82379735",0xA9D0],
- ["82379736",0xA9D1],
- ["82379737",0xA9D2],
- ["82379738",0xA9D3],
- ["82379739",0xA9D4],
- ["82379830",0xA9D5],
- ["82379831",0xA9D6],
- ["82379832",0xA9D7],
- ["82379833",0xA9D8],
- ["82379834",0xA9D9],
- ["82379835",0xA9DA],
- ["82379836",0xA9DB],
- ["82379837",0xA9DC],
- ["82379838",0xA9DD],
- ["82379839",0xA9DE],
- ["82379930",0xA9DF],
- ["82379931",0xA9E0],
- ["82379932",0xA9E1],
- ["82379933",0xA9E2],
- ["82379934",0xA9E3],
- ["82379935",0xA9E4],
- ["82379936",0xA9E5],
- ["82379937",0xA9E6],
- ["82379938",0xA9E7],
- ["82379939",0xA9E8],
- ["82379A30",0xA9E9],
- ["82379A31",0xA9EA],
- ["82379A32",0xA9EB],
- ["82379A33",0xA9EC],
- ["82379A34",0xA9ED],
- ["82379A35",0xA9EE],
- ["82379A36",0xA9EF],
- ["82379A37",0xA9F0],
- ["82379A38",0xA9F1],
- ["82379A39",0xA9F2],
- ["82379B30",0xA9F3],
- ["82379B31",0xA9F4],
- ["82379B32",0xA9F5],
- ["82379B33",0xA9F6],
- ["82379B34",0xA9F7],
- ["82379B35",0xA9F8],
- ["82379B36",0xA9F9],
- ["82379B37",0xA9FA],
- ["82379B38",0xA9FB],
- ["82379B39",0xA9FC],
- ["82379C30",0xA9FD],
- ["82379C31",0xA9FE],
- ["82379C32",0xA9FF],
- ["82379C33",0xAA00],
- ["82379C34",0xAA01],
- ["82379C35",0xAA02],
- ["82379C36",0xAA03],
- ["82379C37",0xAA04],
- ["82379C38",0xAA05],
- ["82379C39",0xAA06],
- ["82379D30",0xAA07],
- ["82379D31",0xAA08],
- ["82379D32",0xAA09],
- ["82379D33",0xAA0A],
- ["82379D34",0xAA0B],
- ["82379D35",0xAA0C],
- ["82379D36",0xAA0D],
- ["82379D37",0xAA0E],
- ["82379D38",0xAA0F],
- ["82379D39",0xAA10],
- ["82379E30",0xAA11],
- ["82379E31",0xAA12],
- ["82379E32",0xAA13],
- ["82379E33",0xAA14],
- ["82379E34",0xAA15],
- ["82379E35",0xAA16],
- ["82379E36",0xAA17],
- ["82379E37",0xAA18],
- ["82379E38",0xAA19],
- ["82379E39",0xAA1A],
- ["82379F30",0xAA1B],
- ["82379F31",0xAA1C],
- ["82379F32",0xAA1D],
- ["82379F33",0xAA1E],
- ["82379F34",0xAA1F],
- ["82379F35",0xAA20],
- ["82379F36",0xAA21],
- ["82379F37",0xAA22],
- ["82379F38",0xAA23],
- ["82379F39",0xAA24],
- ["8237A030",0xAA25],
- ["8237A031",0xAA26],
- ["8237A032",0xAA27],
- ["8237A033",0xAA28],
- ["8237A034",0xAA29],
- ["8237A035",0xAA2A],
- ["8237A036",0xAA2B],
- ["8237A037",0xAA2C],
- ["8237A038",0xAA2D],
- ["8237A039",0xAA2E],
- ["8237A130",0xAA2F],
- ["8237A131",0xAA30],
- ["8237A132",0xAA31],
- ["8237A133",0xAA32],
- ["8237A134",0xAA33],
- ["8237A135",0xAA34],
- ["8237A136",0xAA35],
- ["8237A137",0xAA36],
- ["8237A138",0xAA37],
- ["8237A139",0xAA38],
- ["8237A230",0xAA39],
- ["8237A231",0xAA3A],
- ["8237A232",0xAA3B],
- ["8237A233",0xAA3C],
- ["8237A234",0xAA3D],
- ["8237A235",0xAA3E],
- ["8237A236",0xAA3F],
- ["8237A237",0xAA40],
- ["8237A238",0xAA41],
- ["8237A239",0xAA42],
- ["8237A330",0xAA43],
- ["8237A331",0xAA44],
- ["8237A332",0xAA45],
- ["8237A333",0xAA46],
- ["8237A334",0xAA47],
- ["8237A335",0xAA48],
- ["8237A336",0xAA49],
- ["8237A337",0xAA4A],
- ["8237A338",0xAA4B],
- ["8237A339",0xAA4C],
- ["8237A430",0xAA4D],
- ["8237A431",0xAA4E],
- ["8237A432",0xAA4F],
- ["8237A433",0xAA50],
- ["8237A434",0xAA51],
- ["8237A435",0xAA52],
- ["8237A436",0xAA53],
- ["8237A437",0xAA54],
- ["8237A438",0xAA55],
- ["8237A439",0xAA56],
- ["8237A530",0xAA57],
- ["8237A531",0xAA58],
- ["8237A532",0xAA59],
- ["8237A533",0xAA5A],
- ["8237A534",0xAA5B],
- ["8237A535",0xAA5C],
- ["8237A536",0xAA5D],
- ["8237A537",0xAA5E],
- ["8237A538",0xAA5F],
- ["8237A539",0xAA60],
- ["8237A630",0xAA61],
- ["8237A631",0xAA62],
- ["8237A632",0xAA63],
- ["8237A633",0xAA64],
- ["8237A634",0xAA65],
- ["8237A635",0xAA66],
- ["8237A636",0xAA67],
- ["8237A637",0xAA68],
- ["8237A638",0xAA69],
- ["8237A639",0xAA6A],
- ["8237A730",0xAA6B],
- ["8237A731",0xAA6C],
- ["8237A732",0xAA6D],
- ["8237A733",0xAA6E],
- ["8237A734",0xAA6F],
- ["8237A735",0xAA70],
- ["8237A736",0xAA71],
- ["8237A737",0xAA72],
- ["8237A738",0xAA73],
- ["8237A739",0xAA74],
- ["8237A830",0xAA75],
- ["8237A831",0xAA76],
- ["8237A832",0xAA77],
- ["8237A833",0xAA78],
- ["8237A834",0xAA79],
- ["8237A835",0xAA7A],
- ["8237A836",0xAA7B],
- ["8237A837",0xAA7C],
- ["8237A838",0xAA7D],
- ["8237A839",0xAA7E],
- ["8237A930",0xAA7F],
- ["8237A931",0xAA80],
- ["8237A932",0xAA81],
- ["8237A933",0xAA82],
- ["8237A934",0xAA83],
- ["8237A935",0xAA84],
- ["8237A936",0xAA85],
- ["8237A937",0xAA86],
- ["8237A938",0xAA87],
- ["8237A939",0xAA88],
- ["8237AA30",0xAA89],
- ["8237AA31",0xAA8A],
- ["8237AA32",0xAA8B],
- ["8237AA33",0xAA8C],
- ["8237AA34",0xAA8D],
- ["8237AA35",0xAA8E],
- ["8237AA36",0xAA8F],
- ["8237AA37",0xAA90],
- ["8237AA38",0xAA91],
- ["8237AA39",0xAA92],
- ["8237AB30",0xAA93],
- ["8237AB31",0xAA94],
- ["8237AB32",0xAA95],
- ["8237AB33",0xAA96],
- ["8237AB34",0xAA97],
- ["8237AB35",0xAA98],
- ["8237AB36",0xAA99],
- ["8237AB37",0xAA9A],
- ["8237AB38",0xAA9B],
- ["8237AB39",0xAA9C],
- ["8237AC30",0xAA9D],
- ["8237AC31",0xAA9E],
- ["8237AC32",0xAA9F],
- ["8237AC33",0xAAA0],
- ["8237AC34",0xAAA1],
- ["8237AC35",0xAAA2],
- ["8237AC36",0xAAA3],
- ["8237AC37",0xAAA4],
- ["8237AC38",0xAAA5],
- ["8237AC39",0xAAA6],
- ["8237AD30",0xAAA7],
- ["8237AD31",0xAAA8],
- ["8237AD32",0xAAA9],
- ["8237AD33",0xAAAA],
- ["8237AD34",0xAAAB],
- ["8237AD35",0xAAAC],
- ["8237AD36",0xAAAD],
- ["8237AD37",0xAAAE],
- ["8237AD38",0xAAAF],
- ["8237AD39",0xAAB0],
- ["8237AE30",0xAAB1],
- ["8237AE31",0xAAB2],
- ["8237AE32",0xAAB3],
- ["8237AE33",0xAAB4],
- ["8237AE34",0xAAB5],
- ["8237AE35",0xAAB6],
- ["8237AE36",0xAAB7],
- ["8237AE37",0xAAB8],
- ["8237AE38",0xAAB9],
- ["8237AE39",0xAABA],
- ["8237AF30",0xAABB],
- ["8237AF31",0xAABC],
- ["8237AF32",0xAABD],
- ["8237AF33",0xAABE],
- ["8237AF34",0xAABF],
- ["8237AF35",0xAAC0],
- ["8237AF36",0xAAC1],
- ["8237AF37",0xAAC2],
- ["8237AF38",0xAAC3],
- ["8237AF39",0xAAC4],
- ["8237B030",0xAAC5],
- ["8237B031",0xAAC6],
- ["8237B032",0xAAC7],
- ["8237B033",0xAAC8],
- ["8237B034",0xAAC9],
- ["8237B035",0xAACA],
- ["8237B036",0xAACB],
- ["8237B037",0xAACC],
- ["8237B038",0xAACD],
- ["8237B039",0xAACE],
- ["8237B130",0xAACF],
- ["8237B131",0xAAD0],
- ["8237B132",0xAAD1],
- ["8237B133",0xAAD2],
- ["8237B134",0xAAD3],
- ["8237B135",0xAAD4],
- ["8237B136",0xAAD5],
- ["8237B137",0xAAD6],
- ["8237B138",0xAAD7],
- ["8237B139",0xAAD8],
- ["8237B230",0xAAD9],
- ["8237B231",0xAADA],
- ["8237B232",0xAADB],
- ["8237B233",0xAADC],
- ["8237B234",0xAADD],
- ["8237B235",0xAADE],
- ["8237B236",0xAADF],
- ["8237B237",0xAAE0],
- ["8237B238",0xAAE1],
- ["8237B239",0xAAE2],
- ["8237B330",0xAAE3],
- ["8237B331",0xAAE4],
- ["8237B332",0xAAE5],
- ["8237B333",0xAAE6],
- ["8237B334",0xAAE7],
- ["8237B335",0xAAE8],
- ["8237B336",0xAAE9],
- ["8237B337",0xAAEA],
- ["8237B338",0xAAEB],
- ["8237B339",0xAAEC],
- ["8237B430",0xAAED],
- ["8237B431",0xAAEE],
- ["8237B432",0xAAEF],
- ["8237B433",0xAAF0],
- ["8237B434",0xAAF1],
- ["8237B435",0xAAF2],
- ["8237B436",0xAAF3],
- ["8237B437",0xAAF4],
- ["8237B438",0xAAF5],
- ["8237B439",0xAAF6],
- ["8237B530",0xAAF7],
- ["8237B531",0xAAF8],
- ["8237B532",0xAAF9],
- ["8237B533",0xAAFA],
- ["8237B534",0xAAFB],
- ["8237B535",0xAAFC],
- ["8237B536",0xAAFD],
- ["8237B537",0xAAFE],
- ["8237B538",0xAAFF],
- ["8237B539",0xAB00],
- ["8237B630",0xAB01],
- ["8237B631",0xAB02],
- ["8237B632",0xAB03],
- ["8237B633",0xAB04],
- ["8237B634",0xAB05],
- ["8237B635",0xAB06],
- ["8237B636",0xAB07],
- ["8237B637",0xAB08],
- ["8237B638",0xAB09],
- ["8237B639",0xAB0A],
- ["8237B730",0xAB0B],
- ["8237B731",0xAB0C],
- ["8237B732",0xAB0D],
- ["8237B733",0xAB0E],
- ["8237B734",0xAB0F],
- ["8237B735",0xAB10],
- ["8237B736",0xAB11],
- ["8237B737",0xAB12],
- ["8237B738",0xAB13],
- ["8237B739",0xAB14],
- ["8237B830",0xAB15],
- ["8237B831",0xAB16],
- ["8237B832",0xAB17],
- ["8237B833",0xAB18],
- ["8237B834",0xAB19],
- ["8237B835",0xAB1A],
- ["8237B836",0xAB1B],
- ["8237B837",0xAB1C],
- ["8237B838",0xAB1D],
- ["8237B839",0xAB1E],
- ["8237B930",0xAB1F],
- ["8237B931",0xAB20],
- ["8237B932",0xAB21],
- ["8237B933",0xAB22],
- ["8237B934",0xAB23],
- ["8237B935",0xAB24],
- ["8237B936",0xAB25],
- ["8237B937",0xAB26],
- ["8237B938",0xAB27],
- ["8237B939",0xAB28],
- ["8237BA30",0xAB29],
- ["8237BA31",0xAB2A],
- ["8237BA32",0xAB2B],
- ["8237BA33",0xAB2C],
- ["8237BA34",0xAB2D],
- ["8237BA35",0xAB2E],
- ["8237BA36",0xAB2F],
- ["8237BA37",0xAB30],
- ["8237BA38",0xAB31],
- ["8237BA39",0xAB32],
- ["8237BB30",0xAB33],
- ["8237BB31",0xAB34],
- ["8237BB32",0xAB35],
- ["8237BB33",0xAB36],
- ["8237BB34",0xAB37],
- ["8237BB35",0xAB38],
- ["8237BB36",0xAB39],
- ["8237BB37",0xAB3A],
- ["8237BB38",0xAB3B],
- ["8237BB39",0xAB3C],
- ["8237BC30",0xAB3D],
- ["8237BC31",0xAB3E],
- ["8237BC32",0xAB3F],
- ["8237BC33",0xAB40],
- ["8237BC34",0xAB41],
- ["8237BC35",0xAB42],
- ["8237BC36",0xAB43],
- ["8237BC37",0xAB44],
- ["8237BC38",0xAB45],
- ["8237BC39",0xAB46],
- ["8237BD30",0xAB47],
- ["8237BD31",0xAB48],
- ["8237BD32",0xAB49],
- ["8237BD33",0xAB4A],
- ["8237BD34",0xAB4B],
- ["8237BD35",0xAB4C],
- ["8237BD36",0xAB4D],
- ["8237BD37",0xAB4E],
- ["8237BD38",0xAB4F],
- ["8237BD39",0xAB50],
- ["8237BE30",0xAB51],
- ["8237BE31",0xAB52],
- ["8237BE32",0xAB53],
- ["8237BE33",0xAB54],
- ["8237BE34",0xAB55],
- ["8237BE35",0xAB56],
- ["8237BE36",0xAB57],
- ["8237BE37",0xAB58],
- ["8237BE38",0xAB59],
- ["8237BE39",0xAB5A],
- ["8237BF30",0xAB5B],
- ["8237BF31",0xAB5C],
- ["8237BF32",0xAB5D],
- ["8237BF33",0xAB5E],
- ["8237BF34",0xAB5F],
- ["8237BF35",0xAB60],
- ["8237BF36",0xAB61],
- ["8237BF37",0xAB62],
- ["8237BF38",0xAB63],
- ["8237BF39",0xAB64],
- ["8237C030",0xAB65],
- ["8237C031",0xAB66],
- ["8237C032",0xAB67],
- ["8237C033",0xAB68],
- ["8237C034",0xAB69],
- ["8237C035",0xAB6A],
- ["8237C036",0xAB6B],
- ["8237C037",0xAB6C],
- ["8237C038",0xAB6D],
- ["8237C039",0xAB6E],
- ["8237C130",0xAB6F],
- ["8237C131",0xAB70],
- ["8237C132",0xAB71],
- ["8237C133",0xAB72],
- ["8237C134",0xAB73],
- ["8237C135",0xAB74],
- ["8237C136",0xAB75],
- ["8237C137",0xAB76],
- ["8237C138",0xAB77],
- ["8237C139",0xAB78],
- ["8237C230",0xAB79],
- ["8237C231",0xAB7A],
- ["8237C232",0xAB7B],
- ["8237C233",0xAB7C],
- ["8237C234",0xAB7D],
- ["8237C235",0xAB7E],
- ["8237C236",0xAB7F],
- ["8237C237",0xAB80],
- ["8237C238",0xAB81],
- ["8237C239",0xAB82],
- ["8237C330",0xAB83],
- ["8237C331",0xAB84],
- ["8237C332",0xAB85],
- ["8237C333",0xAB86],
- ["8237C334",0xAB87],
- ["8237C335",0xAB88],
- ["8237C336",0xAB89],
- ["8237C337",0xAB8A],
- ["8237C338",0xAB8B],
- ["8237C339",0xAB8C],
- ["8237C430",0xAB8D],
- ["8237C431",0xAB8E],
- ["8237C432",0xAB8F],
- ["8237C433",0xAB90],
- ["8237C434",0xAB91],
- ["8237C435",0xAB92],
- ["8237C436",0xAB93],
- ["8237C437",0xAB94],
- ["8237C438",0xAB95],
- ["8237C439",0xAB96],
- ["8237C530",0xAB97],
- ["8237C531",0xAB98],
- ["8237C532",0xAB99],
- ["8237C533",0xAB9A],
- ["8237C534",0xAB9B],
- ["8237C535",0xAB9C],
- ["8237C536",0xAB9D],
- ["8237C537",0xAB9E],
- ["8237C538",0xAB9F],
- ["8237C539",0xABA0],
- ["8237C630",0xABA1],
- ["8237C631",0xABA2],
- ["8237C632",0xABA3],
- ["8237C633",0xABA4],
- ["8237C634",0xABA5],
- ["8237C635",0xABA6],
- ["8237C636",0xABA7],
- ["8237C637",0xABA8],
- ["8237C638",0xABA9],
- ["8237C639",0xABAA],
- ["8237C730",0xABAB],
- ["8237C731",0xABAC],
- ["8237C732",0xABAD],
- ["8237C733",0xABAE],
- ["8237C734",0xABAF],
- ["8237C735",0xABB0],
- ["8237C736",0xABB1],
- ["8237C737",0xABB2],
- ["8237C738",0xABB3],
- ["8237C739",0xABB4],
- ["8237C830",0xABB5],
- ["8237C831",0xABB6],
- ["8237C832",0xABB7],
- ["8237C833",0xABB8],
- ["8237C834",0xABB9],
- ["8237C835",0xABBA],
- ["8237C836",0xABBB],
- ["8237C837",0xABBC],
- ["8237C838",0xABBD],
- ["8237C839",0xABBE],
- ["8237C930",0xABBF],
- ["8237C931",0xABC0],
- ["8237C932",0xABC1],
- ["8237C933",0xABC2],
- ["8237C934",0xABC3],
- ["8237C935",0xABC4],
- ["8237C936",0xABC5],
- ["8237C937",0xABC6],
- ["8237C938",0xABC7],
- ["8237C939",0xABC8],
- ["8237CA30",0xABC9],
- ["8237CA31",0xABCA],
- ["8237CA32",0xABCB],
- ["8237CA33",0xABCC],
- ["8237CA34",0xABCD],
- ["8237CA35",0xABCE],
- ["8237CA36",0xABCF],
- ["8237CA37",0xABD0],
- ["8237CA38",0xABD1],
- ["8237CA39",0xABD2],
- ["8237CB30",0xABD3],
- ["8237CB31",0xABD4],
- ["8237CB32",0xABD5],
- ["8237CB33",0xABD6],
- ["8237CB34",0xABD7],
- ["8237CB35",0xABD8],
- ["8237CB36",0xABD9],
- ["8237CB37",0xABDA],
- ["8237CB38",0xABDB],
- ["8237CB39",0xABDC],
- ["8237CC30",0xABDD],
- ["8237CC31",0xABDE],
- ["8237CC32",0xABDF],
- ["8237CC33",0xABE0],
- ["8237CC34",0xABE1],
- ["8237CC35",0xABE2],
- ["8237CC36",0xABE3],
- ["8237CC37",0xABE4],
- ["8237CC38",0xABE5],
- ["8237CC39",0xABE6],
- ["8237CD30",0xABE7],
- ["8237CD31",0xABE8],
- ["8237CD32",0xABE9],
- ["8237CD33",0xABEA],
- ["8237CD34",0xABEB],
- ["8237CD35",0xABEC],
- ["8237CD36",0xABED],
- ["8237CD37",0xABEE],
- ["8237CD38",0xABEF],
- ["8237CD39",0xABF0],
- ["8237CE30",0xABF1],
- ["8237CE31",0xABF2],
- ["8237CE32",0xABF3],
- ["8237CE33",0xABF4],
- ["8237CE34",0xABF5],
- ["8237CE35",0xABF6],
- ["8237CE36",0xABF7],
- ["8237CE37",0xABF8],
- ["8237CE38",0xABF9],
- ["8237CE39",0xABFA],
- ["8237CF30",0xABFB],
- ["8237CF31",0xABFC],
- ["8237CF32",0xABFD],
- ["8237CF33",0xABFE],
- ["8237CF34",0xABFF],
- ["8237CF35",0xAC00],
- ["8237CF36",0xAC01],
- ["8237CF37",0xAC02],
- ["8237CF38",0xAC03],
- ["8237CF39",0xAC04],
- ["8237D030",0xAC05],
- ["8237D031",0xAC06],
- ["8237D032",0xAC07],
- ["8237D033",0xAC08],
- ["8237D034",0xAC09],
- ["8237D035",0xAC0A],
- ["8237D036",0xAC0B],
- ["8237D037",0xAC0C],
- ["8237D038",0xAC0D],
- ["8237D039",0xAC0E],
- ["8237D130",0xAC0F],
- ["8237D131",0xAC10],
- ["8237D132",0xAC11],
- ["8237D133",0xAC12],
- ["8237D134",0xAC13],
- ["8237D135",0xAC14],
- ["8237D136",0xAC15],
- ["8237D137",0xAC16],
- ["8237D138",0xAC17],
- ["8237D139",0xAC18],
- ["8237D230",0xAC19],
- ["8237D231",0xAC1A],
- ["8237D232",0xAC1B],
- ["8237D233",0xAC1C],
- ["8237D234",0xAC1D],
- ["8237D235",0xAC1E],
- ["8237D236",0xAC1F],
- ["8237D237",0xAC20],
- ["8237D238",0xAC21],
- ["8237D239",0xAC22],
- ["8237D330",0xAC23],
- ["8237D331",0xAC24],
- ["8237D332",0xAC25],
- ["8237D333",0xAC26],
- ["8237D334",0xAC27],
- ["8237D335",0xAC28],
- ["8237D336",0xAC29],
- ["8237D337",0xAC2A],
- ["8237D338",0xAC2B],
- ["8237D339",0xAC2C],
- ["8237D430",0xAC2D],
- ["8237D431",0xAC2E],
- ["8237D432",0xAC2F],
- ["8237D433",0xAC30],
- ["8237D434",0xAC31],
- ["8237D435",0xAC32],
- ["8237D436",0xAC33],
- ["8237D437",0xAC34],
- ["8237D438",0xAC35],
- ["8237D439",0xAC36],
- ["8237D530",0xAC37],
- ["8237D531",0xAC38],
- ["8237D532",0xAC39],
- ["8237D533",0xAC3A],
- ["8237D534",0xAC3B],
- ["8237D535",0xAC3C],
- ["8237D536",0xAC3D],
- ["8237D537",0xAC3E],
- ["8237D538",0xAC3F],
- ["8237D539",0xAC40],
- ["8237D630",0xAC41],
- ["8237D631",0xAC42],
- ["8237D632",0xAC43],
- ["8237D633",0xAC44],
- ["8237D634",0xAC45],
- ["8237D635",0xAC46],
- ["8237D636",0xAC47],
- ["8237D637",0xAC48],
- ["8237D638",0xAC49],
- ["8237D639",0xAC4A],
- ["8237D730",0xAC4B],
- ["8237D731",0xAC4C],
- ["8237D732",0xAC4D],
- ["8237D733",0xAC4E],
- ["8237D734",0xAC4F],
- ["8237D735",0xAC50],
- ["8237D736",0xAC51],
- ["8237D737",0xAC52],
- ["8237D738",0xAC53],
- ["8237D739",0xAC54],
- ["8237D830",0xAC55],
- ["8237D831",0xAC56],
- ["8237D832",0xAC57],
- ["8237D833",0xAC58],
- ["8237D834",0xAC59],
- ["8237D835",0xAC5A],
- ["8237D836",0xAC5B],
- ["8237D837",0xAC5C],
- ["8237D838",0xAC5D],
- ["8237D839",0xAC5E],
- ["8237D930",0xAC5F],
- ["8237D931",0xAC60],
- ["8237D932",0xAC61],
- ["8237D933",0xAC62],
- ["8237D934",0xAC63],
- ["8237D935",0xAC64],
- ["8237D936",0xAC65],
- ["8237D937",0xAC66],
- ["8237D938",0xAC67],
- ["8237D939",0xAC68],
- ["8237DA30",0xAC69],
- ["8237DA31",0xAC6A],
- ["8237DA32",0xAC6B],
- ["8237DA33",0xAC6C],
- ["8237DA34",0xAC6D],
- ["8237DA35",0xAC6E],
- ["8237DA36",0xAC6F],
- ["8237DA37",0xAC70],
- ["8237DA38",0xAC71],
- ["8237DA39",0xAC72],
- ["8237DB30",0xAC73],
- ["8237DB31",0xAC74],
- ["8237DB32",0xAC75],
- ["8237DB33",0xAC76],
- ["8237DB34",0xAC77],
- ["8237DB35",0xAC78],
- ["8237DB36",0xAC79],
- ["8237DB37",0xAC7A],
- ["8237DB38",0xAC7B],
- ["8237DB39",0xAC7C],
- ["8237DC30",0xAC7D],
- ["8237DC31",0xAC7E],
- ["8237DC32",0xAC7F],
- ["8237DC33",0xAC80],
- ["8237DC34",0xAC81],
- ["8237DC35",0xAC82],
- ["8237DC36",0xAC83],
- ["8237DC37",0xAC84],
- ["8237DC38",0xAC85],
- ["8237DC39",0xAC86],
- ["8237DD30",0xAC87],
- ["8237DD31",0xAC88],
- ["8237DD32",0xAC89],
- ["8237DD33",0xAC8A],
- ["8237DD34",0xAC8B],
- ["8237DD35",0xAC8C],
- ["8237DD36",0xAC8D],
- ["8237DD37",0xAC8E],
- ["8237DD38",0xAC8F],
- ["8237DD39",0xAC90],
- ["8237DE30",0xAC91],
- ["8237DE31",0xAC92],
- ["8237DE32",0xAC93],
- ["8237DE33",0xAC94],
- ["8237DE34",0xAC95],
- ["8237DE35",0xAC96],
- ["8237DE36",0xAC97],
- ["8237DE37",0xAC98],
- ["8237DE38",0xAC99],
- ["8237DE39",0xAC9A],
- ["8237DF30",0xAC9B],
- ["8237DF31",0xAC9C],
- ["8237DF32",0xAC9D],
- ["8237DF33",0xAC9E],
- ["8237DF34",0xAC9F],
- ["8237DF35",0xACA0],
- ["8237DF36",0xACA1],
- ["8237DF37",0xACA2],
- ["8237DF38",0xACA3],
- ["8237DF39",0xACA4],
- ["8237E030",0xACA5],
- ["8237E031",0xACA6],
- ["8237E032",0xACA7],
- ["8237E033",0xACA8],
- ["8237E034",0xACA9],
- ["8237E035",0xACAA],
- ["8237E036",0xACAB],
- ["8237E037",0xACAC],
- ["8237E038",0xACAD],
- ["8237E039",0xACAE],
- ["8237E130",0xACAF],
- ["8237E131",0xACB0],
- ["8237E132",0xACB1],
- ["8237E133",0xACB2],
- ["8237E134",0xACB3],
- ["8237E135",0xACB4],
- ["8237E136",0xACB5],
- ["8237E137",0xACB6],
- ["8237E138",0xACB7],
- ["8237E139",0xACB8],
- ["8237E230",0xACB9],
- ["8237E231",0xACBA],
- ["8237E232",0xACBB],
- ["8237E233",0xACBC],
- ["8237E234",0xACBD],
- ["8237E235",0xACBE],
- ["8237E236",0xACBF],
- ["8237E237",0xACC0],
- ["8237E238",0xACC1],
- ["8237E239",0xACC2],
- ["8237E330",0xACC3],
- ["8237E331",0xACC4],
- ["8237E332",0xACC5],
- ["8237E333",0xACC6],
- ["8237E334",0xACC7],
- ["8237E335",0xACC8],
- ["8237E336",0xACC9],
- ["8237E337",0xACCA],
- ["8237E338",0xACCB],
- ["8237E339",0xACCC],
- ["8237E430",0xACCD],
- ["8237E431",0xACCE],
- ["8237E432",0xACCF],
- ["8237E433",0xACD0],
- ["8237E434",0xACD1],
- ["8237E435",0xACD2],
- ["8237E436",0xACD3],
- ["8237E437",0xACD4],
- ["8237E438",0xACD5],
- ["8237E439",0xACD6],
- ["8237E530",0xACD7],
- ["8237E531",0xACD8],
- ["8237E532",0xACD9],
- ["8237E533",0xACDA],
- ["8237E534",0xACDB],
- ["8237E535",0xACDC],
- ["8237E536",0xACDD],
- ["8237E537",0xACDE],
- ["8237E538",0xACDF],
- ["8237E539",0xACE0],
- ["8237E630",0xACE1],
- ["8237E631",0xACE2],
- ["8237E632",0xACE3],
- ["8237E633",0xACE4],
- ["8237E634",0xACE5],
- ["8237E635",0xACE6],
- ["8237E636",0xACE7],
- ["8237E637",0xACE8],
- ["8237E638",0xACE9],
- ["8237E639",0xACEA],
- ["8237E730",0xACEB],
- ["8237E731",0xACEC],
- ["8237E732",0xACED],
- ["8237E733",0xACEE],
- ["8237E734",0xACEF],
- ["8237E735",0xACF0],
- ["8237E736",0xACF1],
- ["8237E737",0xACF2],
- ["8237E738",0xACF3],
- ["8237E739",0xACF4],
- ["8237E830",0xACF5],
- ["8237E831",0xACF6],
- ["8237E832",0xACF7],
- ["8237E833",0xACF8],
- ["8237E834",0xACF9],
- ["8237E835",0xACFA],
- ["8237E836",0xACFB],
- ["8237E837",0xACFC],
- ["8237E838",0xACFD],
- ["8237E839",0xACFE],
- ["8237E930",0xACFF],
- ["8237E931",0xAD00],
- ["8237E932",0xAD01],
- ["8237E933",0xAD02],
- ["8237E934",0xAD03],
- ["8237E935",0xAD04],
- ["8237E936",0xAD05],
- ["8237E937",0xAD06],
- ["8237E938",0xAD07],
- ["8237E939",0xAD08],
- ["8237EA30",0xAD09],
- ["8237EA31",0xAD0A],
- ["8237EA32",0xAD0B],
- ["8237EA33",0xAD0C],
- ["8237EA34",0xAD0D],
- ["8237EA35",0xAD0E],
- ["8237EA36",0xAD0F],
- ["8237EA37",0xAD10],
- ["8237EA38",0xAD11],
- ["8237EA39",0xAD12],
- ["8237EB30",0xAD13],
- ["8237EB31",0xAD14],
- ["8237EB32",0xAD15],
- ["8237EB33",0xAD16],
- ["8237EB34",0xAD17],
- ["8237EB35",0xAD18],
- ["8237EB36",0xAD19],
- ["8237EB37",0xAD1A],
- ["8237EB38",0xAD1B],
- ["8237EB39",0xAD1C],
- ["8237EC30",0xAD1D],
- ["8237EC31",0xAD1E],
- ["8237EC32",0xAD1F],
- ["8237EC33",0xAD20],
- ["8237EC34",0xAD21],
- ["8237EC35",0xAD22],
- ["8237EC36",0xAD23],
- ["8237EC37",0xAD24],
- ["8237EC38",0xAD25],
- ["8237EC39",0xAD26],
- ["8237ED30",0xAD27],
- ["8237ED31",0xAD28],
- ["8237ED32",0xAD29],
- ["8237ED33",0xAD2A],
- ["8237ED34",0xAD2B],
- ["8237ED35",0xAD2C],
- ["8237ED36",0xAD2D],
- ["8237ED37",0xAD2E],
- ["8237ED38",0xAD2F],
- ["8237ED39",0xAD30],
- ["8237EE30",0xAD31],
- ["8237EE31",0xAD32],
- ["8237EE32",0xAD33],
- ["8237EE33",0xAD34],
- ["8237EE34",0xAD35],
- ["8237EE35",0xAD36],
- ["8237EE36",0xAD37],
- ["8237EE37",0xAD38],
- ["8237EE38",0xAD39],
- ["8237EE39",0xAD3A],
- ["8237EF30",0xAD3B],
- ["8237EF31",0xAD3C],
- ["8237EF32",0xAD3D],
- ["8237EF33",0xAD3E],
- ["8237EF34",0xAD3F],
- ["8237EF35",0xAD40],
- ["8237EF36",0xAD41],
- ["8237EF37",0xAD42],
- ["8237EF38",0xAD43],
- ["8237EF39",0xAD44],
- ["8237F030",0xAD45],
- ["8237F031",0xAD46],
- ["8237F032",0xAD47],
- ["8237F033",0xAD48],
- ["8237F034",0xAD49],
- ["8237F035",0xAD4A],
- ["8237F036",0xAD4B],
- ["8237F037",0xAD4C],
- ["8237F038",0xAD4D],
- ["8237F039",0xAD4E],
- ["8237F130",0xAD4F],
- ["8237F131",0xAD50],
- ["8237F132",0xAD51],
- ["8237F133",0xAD52],
- ["8237F134",0xAD53],
- ["8237F135",0xAD54],
- ["8237F136",0xAD55],
- ["8237F137",0xAD56],
- ["8237F138",0xAD57],
- ["8237F139",0xAD58],
- ["8237F230",0xAD59],
- ["8237F231",0xAD5A],
- ["8237F232",0xAD5B],
- ["8237F233",0xAD5C],
- ["8237F234",0xAD5D],
- ["8237F235",0xAD5E],
- ["8237F236",0xAD5F],
- ["8237F237",0xAD60],
- ["8237F238",0xAD61],
- ["8237F239",0xAD62],
- ["8237F330",0xAD63],
- ["8237F331",0xAD64],
- ["8237F332",0xAD65],
- ["8237F333",0xAD66],
- ["8237F334",0xAD67],
- ["8237F335",0xAD68],
- ["8237F336",0xAD69],
- ["8237F337",0xAD6A],
- ["8237F338",0xAD6B],
- ["8237F339",0xAD6C],
- ["8237F430",0xAD6D],
- ["8237F431",0xAD6E],
- ["8237F432",0xAD6F],
- ["8237F433",0xAD70],
- ["8237F434",0xAD71],
- ["8237F435",0xAD72],
- ["8237F436",0xAD73],
- ["8237F437",0xAD74],
- ["8237F438",0xAD75],
- ["8237F439",0xAD76],
- ["8237F530",0xAD77],
- ["8237F531",0xAD78],
- ["8237F532",0xAD79],
- ["8237F533",0xAD7A],
- ["8237F534",0xAD7B],
- ["8237F535",0xAD7C],
- ["8237F536",0xAD7D],
- ["8237F537",0xAD7E],
- ["8237F538",0xAD7F],
- ["8237F539",0xAD80],
- ["8237F630",0xAD81],
- ["8237F631",0xAD82],
- ["8237F632",0xAD83],
- ["8237F633",0xAD84],
- ["8237F634",0xAD85],
- ["8237F635",0xAD86],
- ["8237F636",0xAD87],
- ["8237F637",0xAD88],
- ["8237F638",0xAD89],
- ["8237F639",0xAD8A],
- ["8237F730",0xAD8B],
- ["8237F731",0xAD8C],
- ["8237F732",0xAD8D],
- ["8237F733",0xAD8E],
- ["8237F734",0xAD8F],
- ["8237F735",0xAD90],
- ["8237F736",0xAD91],
- ["8237F737",0xAD92],
- ["8237F738",0xAD93],
- ["8237F739",0xAD94],
- ["8237F830",0xAD95],
- ["8237F831",0xAD96],
- ["8237F832",0xAD97],
- ["8237F833",0xAD98],
- ["8237F834",0xAD99],
- ["8237F835",0xAD9A],
- ["8237F836",0xAD9B],
- ["8237F837",0xAD9C],
- ["8237F838",0xAD9D],
- ["8237F839",0xAD9E],
- ["8237F930",0xAD9F],
- ["8237F931",0xADA0],
- ["8237F932",0xADA1],
- ["8237F933",0xADA2],
- ["8237F934",0xADA3],
- ["8237F935",0xADA4],
- ["8237F936",0xADA5],
- ["8237F937",0xADA6],
- ["8237F938",0xADA7],
- ["8237F939",0xADA8],
- ["8237FA30",0xADA9],
- ["8237FA31",0xADAA],
- ["8237FA32",0xADAB],
- ["8237FA33",0xADAC],
- ["8237FA34",0xADAD],
- ["8237FA35",0xADAE],
- ["8237FA36",0xADAF],
- ["8237FA37",0xADB0],
- ["8237FA38",0xADB1],
- ["8237FA39",0xADB2],
- ["8237FB30",0xADB3],
- ["8237FB31",0xADB4],
- ["8237FB32",0xADB5],
- ["8237FB33",0xADB6],
- ["8237FB34",0xADB7],
- ["8237FB35",0xADB8],
- ["8237FB36",0xADB9],
- ["8237FB37",0xADBA],
- ["8237FB38",0xADBB],
- ["8237FB39",0xADBC],
- ["8237FC30",0xADBD],
- ["8237FC31",0xADBE],
- ["8237FC32",0xADBF],
- ["8237FC33",0xADC0],
- ["8237FC34",0xADC1],
- ["8237FC35",0xADC2],
- ["8237FC36",0xADC3],
- ["8237FC37",0xADC4],
- ["8237FC38",0xADC5],
- ["8237FC39",0xADC6],
- ["8237FD30",0xADC7],
- ["8237FD31",0xADC8],
- ["8237FD32",0xADC9],
- ["8237FD33",0xADCA],
- ["8237FD34",0xADCB],
- ["8237FD35",0xADCC],
- ["8237FD36",0xADCD],
- ["8237FD37",0xADCE],
- ["8237FD38",0xADCF],
- ["8237FD39",0xADD0],
- ["8237FE30",0xADD1],
- ["8237FE31",0xADD2],
- ["8237FE32",0xADD3],
- ["8237FE33",0xADD4],
- ["8237FE34",0xADD5],
- ["8237FE35",0xADD6],
- ["8237FE36",0xADD7],
- ["8237FE37",0xADD8],
- ["8237FE38",0xADD9],
- ["8237FE39",0xADDA],
- ["82388130",0xADDB],
- ["82388131",0xADDC],
- ["82388132",0xADDD],
- ["82388133",0xADDE],
- ["82388134",0xADDF],
- ["82388135",0xADE0],
- ["82388136",0xADE1],
- ["82388137",0xADE2],
- ["82388138",0xADE3],
- ["82388139",0xADE4],
- ["82388230",0xADE5],
- ["82388231",0xADE6],
- ["82388232",0xADE7],
- ["82388233",0xADE8],
- ["82388234",0xADE9],
- ["82388235",0xADEA],
- ["82388236",0xADEB],
- ["82388237",0xADEC],
- ["82388238",0xADED],
- ["82388239",0xADEE],
- ["82388330",0xADEF],
- ["82388331",0xADF0],
- ["82388332",0xADF1],
- ["82388333",0xADF2],
- ["82388334",0xADF3],
- ["82388335",0xADF4],
- ["82388336",0xADF5],
- ["82388337",0xADF6],
- ["82388338",0xADF7],
- ["82388339",0xADF8],
- ["82388430",0xADF9],
- ["82388431",0xADFA],
- ["82388432",0xADFB],
- ["82388433",0xADFC],
- ["82388434",0xADFD],
- ["82388435",0xADFE],
- ["82388436",0xADFF],
- ["82388437",0xAE00],
- ["82388438",0xAE01],
- ["82388439",0xAE02],
- ["82388530",0xAE03],
- ["82388531",0xAE04],
- ["82388532",0xAE05],
- ["82388533",0xAE06],
- ["82388534",0xAE07],
- ["82388535",0xAE08],
- ["82388536",0xAE09],
- ["82388537",0xAE0A],
- ["82388538",0xAE0B],
- ["82388539",0xAE0C],
- ["82388630",0xAE0D],
- ["82388631",0xAE0E],
- ["82388632",0xAE0F],
- ["82388633",0xAE10],
- ["82388634",0xAE11],
- ["82388635",0xAE12],
- ["82388636",0xAE13],
- ["82388637",0xAE14],
- ["82388638",0xAE15],
- ["82388639",0xAE16],
- ["82388730",0xAE17],
- ["82388731",0xAE18],
- ["82388732",0xAE19],
- ["82388733",0xAE1A],
- ["82388734",0xAE1B],
- ["82388735",0xAE1C],
- ["82388736",0xAE1D],
- ["82388737",0xAE1E],
- ["82388738",0xAE1F],
- ["82388739",0xAE20],
- ["82388830",0xAE21],
- ["82388831",0xAE22],
- ["82388832",0xAE23],
- ["82388833",0xAE24],
- ["82388834",0xAE25],
- ["82388835",0xAE26],
- ["82388836",0xAE27],
- ["82388837",0xAE28],
- ["82388838",0xAE29],
- ["82388839",0xAE2A],
- ["82388930",0xAE2B],
- ["82388931",0xAE2C],
- ["82388932",0xAE2D],
- ["82388933",0xAE2E],
- ["82388934",0xAE2F],
- ["82388935",0xAE30],
- ["82388936",0xAE31],
- ["82388937",0xAE32],
- ["82388938",0xAE33],
- ["82388939",0xAE34],
- ["82388A30",0xAE35],
- ["82388A31",0xAE36],
- ["82388A32",0xAE37],
- ["82388A33",0xAE38],
- ["82388A34",0xAE39],
- ["82388A35",0xAE3A],
- ["82388A36",0xAE3B],
- ["82388A37",0xAE3C],
- ["82388A38",0xAE3D],
- ["82388A39",0xAE3E],
- ["82388B30",0xAE3F],
- ["82388B31",0xAE40],
- ["82388B32",0xAE41],
- ["82388B33",0xAE42],
- ["82388B34",0xAE43],
- ["82388B35",0xAE44],
- ["82388B36",0xAE45],
- ["82388B37",0xAE46],
- ["82388B38",0xAE47],
- ["82388B39",0xAE48],
- ["82388C30",0xAE49],
- ["82388C31",0xAE4A],
- ["82388C32",0xAE4B],
- ["82388C33",0xAE4C],
- ["82388C34",0xAE4D],
- ["82388C35",0xAE4E],
- ["82388C36",0xAE4F],
- ["82388C37",0xAE50],
- ["82388C38",0xAE51],
- ["82388C39",0xAE52],
- ["82388D30",0xAE53],
- ["82388D31",0xAE54],
- ["82388D32",0xAE55],
- ["82388D33",0xAE56],
- ["82388D34",0xAE57],
- ["82388D35",0xAE58],
- ["82388D36",0xAE59],
- ["82388D37",0xAE5A],
- ["82388D38",0xAE5B],
- ["82388D39",0xAE5C],
- ["82388E30",0xAE5D],
- ["82388E31",0xAE5E],
- ["82388E32",0xAE5F],
- ["82388E33",0xAE60],
- ["82388E34",0xAE61],
- ["82388E35",0xAE62],
- ["82388E36",0xAE63],
- ["82388E37",0xAE64],
- ["82388E38",0xAE65],
- ["82388E39",0xAE66],
- ["82388F30",0xAE67],
- ["82388F31",0xAE68],
- ["82388F32",0xAE69],
- ["82388F33",0xAE6A],
- ["82388F34",0xAE6B],
- ["82388F35",0xAE6C],
- ["82388F36",0xAE6D],
- ["82388F37",0xAE6E],
- ["82388F38",0xAE6F],
- ["82388F39",0xAE70],
- ["82389030",0xAE71],
- ["82389031",0xAE72],
- ["82389032",0xAE73],
- ["82389033",0xAE74],
- ["82389034",0xAE75],
- ["82389035",0xAE76],
- ["82389036",0xAE77],
- ["82389037",0xAE78],
- ["82389038",0xAE79],
- ["82389039",0xAE7A],
- ["82389130",0xAE7B],
- ["82389131",0xAE7C],
- ["82389132",0xAE7D],
- ["82389133",0xAE7E],
- ["82389134",0xAE7F],
- ["82389135",0xAE80],
- ["82389136",0xAE81],
- ["82389137",0xAE82],
- ["82389138",0xAE83],
- ["82389139",0xAE84],
- ["82389230",0xAE85],
- ["82389231",0xAE86],
- ["82389232",0xAE87],
- ["82389233",0xAE88],
- ["82389234",0xAE89],
- ["82389235",0xAE8A],
- ["82389236",0xAE8B],
- ["82389237",0xAE8C],
- ["82389238",0xAE8D],
- ["82389239",0xAE8E],
- ["82389330",0xAE8F],
- ["82389331",0xAE90],
- ["82389332",0xAE91],
- ["82389333",0xAE92],
- ["82389334",0xAE93],
- ["82389335",0xAE94],
- ["82389336",0xAE95],
- ["82389337",0xAE96],
- ["82389338",0xAE97],
- ["82389339",0xAE98],
- ["82389430",0xAE99],
- ["82389431",0xAE9A],
- ["82389432",0xAE9B],
- ["82389433",0xAE9C],
- ["82389434",0xAE9D],
- ["82389435",0xAE9E],
- ["82389436",0xAE9F],
- ["82389437",0xAEA0],
- ["82389438",0xAEA1],
- ["82389439",0xAEA2],
- ["82389530",0xAEA3],
- ["82389531",0xAEA4],
- ["82389532",0xAEA5],
- ["82389533",0xAEA6],
- ["82389534",0xAEA7],
- ["82389535",0xAEA8],
- ["82389536",0xAEA9],
- ["82389537",0xAEAA],
- ["82389538",0xAEAB],
- ["82389539",0xAEAC],
- ["82389630",0xAEAD],
- ["82389631",0xAEAE],
- ["82389632",0xAEAF],
- ["82389633",0xAEB0],
- ["82389634",0xAEB1],
- ["82389635",0xAEB2],
- ["82389636",0xAEB3],
- ["82389637",0xAEB4],
- ["82389638",0xAEB5],
- ["82389639",0xAEB6],
- ["82389730",0xAEB7],
- ["82389731",0xAEB8],
- ["82389732",0xAEB9],
- ["82389733",0xAEBA],
- ["82389734",0xAEBB],
- ["82389735",0xAEBC],
- ["82389736",0xAEBD],
- ["82389737",0xAEBE],
- ["82389738",0xAEBF],
- ["82389739",0xAEC0],
- ["82389830",0xAEC1],
- ["82389831",0xAEC2],
- ["82389832",0xAEC3],
- ["82389833",0xAEC4],
- ["82389834",0xAEC5],
- ["82389835",0xAEC6],
- ["82389836",0xAEC7],
- ["82389837",0xAEC8],
- ["82389838",0xAEC9],
- ["82389839",0xAECA],
- ["82389930",0xAECB],
- ["82389931",0xAECC],
- ["82389932",0xAECD],
- ["82389933",0xAECE],
- ["82389934",0xAECF],
- ["82389935",0xAED0],
- ["82389936",0xAED1],
- ["82389937",0xAED2],
- ["82389938",0xAED3],
- ["82389939",0xAED4],
- ["82389A30",0xAED5],
- ["82389A31",0xAED6],
- ["82389A32",0xAED7],
- ["82389A33",0xAED8],
- ["82389A34",0xAED9],
- ["82389A35",0xAEDA],
- ["82389A36",0xAEDB],
- ["82389A37",0xAEDC],
- ["82389A38",0xAEDD],
- ["82389A39",0xAEDE],
- ["82389B30",0xAEDF],
- ["82389B31",0xAEE0],
- ["82389B32",0xAEE1],
- ["82389B33",0xAEE2],
- ["82389B34",0xAEE3],
- ["82389B35",0xAEE4],
- ["82389B36",0xAEE5],
- ["82389B37",0xAEE6],
- ["82389B38",0xAEE7],
- ["82389B39",0xAEE8],
- ["82389C30",0xAEE9],
- ["82389C31",0xAEEA],
- ["82389C32",0xAEEB],
- ["82389C33",0xAEEC],
- ["82389C34",0xAEED],
- ["82389C35",0xAEEE],
- ["82389C36",0xAEEF],
- ["82389C37",0xAEF0],
- ["82389C38",0xAEF1],
- ["82389C39",0xAEF2],
- ["82389D30",0xAEF3],
- ["82389D31",0xAEF4],
- ["82389D32",0xAEF5],
- ["82389D33",0xAEF6],
- ["82389D34",0xAEF7],
- ["82389D35",0xAEF8],
- ["82389D36",0xAEF9],
- ["82389D37",0xAEFA],
- ["82389D38",0xAEFB],
- ["82389D39",0xAEFC],
- ["82389E30",0xAEFD],
- ["82389E31",0xAEFE],
- ["82389E32",0xAEFF],
- ["82389E33",0xAF00],
- ["82389E34",0xAF01],
- ["82389E35",0xAF02],
- ["82389E36",0xAF03],
- ["82389E37",0xAF04],
- ["82389E38",0xAF05],
- ["82389E39",0xAF06],
- ["82389F30",0xAF07],
- ["82389F31",0xAF08],
- ["82389F32",0xAF09],
- ["82389F33",0xAF0A],
- ["82389F34",0xAF0B],
- ["82389F35",0xAF0C],
- ["82389F36",0xAF0D],
- ["82389F37",0xAF0E],
- ["82389F38",0xAF0F],
- ["82389F39",0xAF10],
- ["8238A030",0xAF11],
- ["8238A031",0xAF12],
- ["8238A032",0xAF13],
- ["8238A033",0xAF14],
- ["8238A034",0xAF15],
- ["8238A035",0xAF16],
- ["8238A036",0xAF17],
- ["8238A037",0xAF18],
- ["8238A038",0xAF19],
- ["8238A039",0xAF1A],
- ["8238A130",0xAF1B],
- ["8238A131",0xAF1C],
- ["8238A132",0xAF1D],
- ["8238A133",0xAF1E],
- ["8238A134",0xAF1F],
- ["8238A135",0xAF20],
- ["8238A136",0xAF21],
- ["8238A137",0xAF22],
- ["8238A138",0xAF23],
- ["8238A139",0xAF24],
- ["8238A230",0xAF25],
- ["8238A231",0xAF26],
- ["8238A232",0xAF27],
- ["8238A233",0xAF28],
- ["8238A234",0xAF29],
- ["8238A235",0xAF2A],
- ["8238A236",0xAF2B],
- ["8238A237",0xAF2C],
- ["8238A238",0xAF2D],
- ["8238A239",0xAF2E],
- ["8238A330",0xAF2F],
- ["8238A331",0xAF30],
- ["8238A332",0xAF31],
- ["8238A333",0xAF32],
- ["8238A334",0xAF33],
- ["8238A335",0xAF34],
- ["8238A336",0xAF35],
- ["8238A337",0xAF36],
- ["8238A338",0xAF37],
- ["8238A339",0xAF38],
- ["8238A430",0xAF39],
- ["8238A431",0xAF3A],
- ["8238A432",0xAF3B],
- ["8238A433",0xAF3C],
- ["8238A434",0xAF3D],
- ["8238A435",0xAF3E],
- ["8238A436",0xAF3F],
- ["8238A437",0xAF40],
- ["8238A438",0xAF41],
- ["8238A439",0xAF42],
- ["8238A530",0xAF43],
- ["8238A531",0xAF44],
- ["8238A532",0xAF45],
- ["8238A533",0xAF46],
- ["8238A534",0xAF47],
- ["8238A535",0xAF48],
- ["8238A536",0xAF49],
- ["8238A537",0xAF4A],
- ["8238A538",0xAF4B],
- ["8238A539",0xAF4C],
- ["8238A630",0xAF4D],
- ["8238A631",0xAF4E],
- ["8238A632",0xAF4F],
- ["8238A633",0xAF50],
- ["8238A634",0xAF51],
- ["8238A635",0xAF52],
- ["8238A636",0xAF53],
- ["8238A637",0xAF54],
- ["8238A638",0xAF55],
- ["8238A639",0xAF56],
- ["8238A730",0xAF57],
- ["8238A731",0xAF58],
- ["8238A732",0xAF59],
- ["8238A733",0xAF5A],
- ["8238A734",0xAF5B],
- ["8238A735",0xAF5C],
- ["8238A736",0xAF5D],
- ["8238A737",0xAF5E],
- ["8238A738",0xAF5F],
- ["8238A739",0xAF60],
- ["8238A830",0xAF61],
- ["8238A831",0xAF62],
- ["8238A832",0xAF63],
- ["8238A833",0xAF64],
- ["8238A834",0xAF65],
- ["8238A835",0xAF66],
- ["8238A836",0xAF67],
- ["8238A837",0xAF68],
- ["8238A838",0xAF69],
- ["8238A839",0xAF6A],
- ["8238A930",0xAF6B],
- ["8238A931",0xAF6C],
- ["8238A932",0xAF6D],
- ["8238A933",0xAF6E],
- ["8238A934",0xAF6F],
- ["8238A935",0xAF70],
- ["8238A936",0xAF71],
- ["8238A937",0xAF72],
- ["8238A938",0xAF73],
- ["8238A939",0xAF74],
- ["8238AA30",0xAF75],
- ["8238AA31",0xAF76],
- ["8238AA32",0xAF77],
- ["8238AA33",0xAF78],
- ["8238AA34",0xAF79],
- ["8238AA35",0xAF7A],
- ["8238AA36",0xAF7B],
- ["8238AA37",0xAF7C],
- ["8238AA38",0xAF7D],
- ["8238AA39",0xAF7E],
- ["8238AB30",0xAF7F],
- ["8238AB31",0xAF80],
- ["8238AB32",0xAF81],
- ["8238AB33",0xAF82],
- ["8238AB34",0xAF83],
- ["8238AB35",0xAF84],
- ["8238AB36",0xAF85],
- ["8238AB37",0xAF86],
- ["8238AB38",0xAF87],
- ["8238AB39",0xAF88],
- ["8238AC30",0xAF89],
- ["8238AC31",0xAF8A],
- ["8238AC32",0xAF8B],
- ["8238AC33",0xAF8C],
- ["8238AC34",0xAF8D],
- ["8238AC35",0xAF8E],
- ["8238AC36",0xAF8F],
- ["8238AC37",0xAF90],
- ["8238AC38",0xAF91],
- ["8238AC39",0xAF92],
- ["8238AD30",0xAF93],
- ["8238AD31",0xAF94],
- ["8238AD32",0xAF95],
- ["8238AD33",0xAF96],
- ["8238AD34",0xAF97],
- ["8238AD35",0xAF98],
- ["8238AD36",0xAF99],
- ["8238AD37",0xAF9A],
- ["8238AD38",0xAF9B],
- ["8238AD39",0xAF9C],
- ["8238AE30",0xAF9D],
- ["8238AE31",0xAF9E],
- ["8238AE32",0xAF9F],
- ["8238AE33",0xAFA0],
- ["8238AE34",0xAFA1],
- ["8238AE35",0xAFA2],
- ["8238AE36",0xAFA3],
- ["8238AE37",0xAFA4],
- ["8238AE38",0xAFA5],
- ["8238AE39",0xAFA6],
- ["8238AF30",0xAFA7],
- ["8238AF31",0xAFA8],
- ["8238AF32",0xAFA9],
- ["8238AF33",0xAFAA],
- ["8238AF34",0xAFAB],
- ["8238AF35",0xAFAC],
- ["8238AF36",0xAFAD],
- ["8238AF37",0xAFAE],
- ["8238AF38",0xAFAF],
- ["8238AF39",0xAFB0],
- ["8238B030",0xAFB1],
- ["8238B031",0xAFB2],
- ["8238B032",0xAFB3],
- ["8238B033",0xAFB4],
- ["8238B034",0xAFB5],
- ["8238B035",0xAFB6],
- ["8238B036",0xAFB7],
- ["8238B037",0xAFB8],
- ["8238B038",0xAFB9],
- ["8238B039",0xAFBA],
- ["8238B130",0xAFBB],
- ["8238B131",0xAFBC],
- ["8238B132",0xAFBD],
- ["8238B133",0xAFBE],
- ["8238B134",0xAFBF],
- ["8238B135",0xAFC0],
- ["8238B136",0xAFC1],
- ["8238B137",0xAFC2],
- ["8238B138",0xAFC3],
- ["8238B139",0xAFC4],
- ["8238B230",0xAFC5],
- ["8238B231",0xAFC6],
- ["8238B232",0xAFC7],
- ["8238B233",0xAFC8],
- ["8238B234",0xAFC9],
- ["8238B235",0xAFCA],
- ["8238B236",0xAFCB],
- ["8238B237",0xAFCC],
- ["8238B238",0xAFCD],
- ["8238B239",0xAFCE],
- ["8238B330",0xAFCF],
- ["8238B331",0xAFD0],
- ["8238B332",0xAFD1],
- ["8238B333",0xAFD2],
- ["8238B334",0xAFD3],
- ["8238B335",0xAFD4],
- ["8238B336",0xAFD5],
- ["8238B337",0xAFD6],
- ["8238B338",0xAFD7],
- ["8238B339",0xAFD8],
- ["8238B430",0xAFD9],
- ["8238B431",0xAFDA],
- ["8238B432",0xAFDB],
- ["8238B433",0xAFDC],
- ["8238B434",0xAFDD],
- ["8238B435",0xAFDE],
- ["8238B436",0xAFDF],
- ["8238B437",0xAFE0],
- ["8238B438",0xAFE1],
- ["8238B439",0xAFE2],
- ["8238B530",0xAFE3],
- ["8238B531",0xAFE4],
- ["8238B532",0xAFE5],
- ["8238B533",0xAFE6],
- ["8238B534",0xAFE7],
- ["8238B535",0xAFE8],
- ["8238B536",0xAFE9],
- ["8238B537",0xAFEA],
- ["8238B538",0xAFEB],
- ["8238B539",0xAFEC],
- ["8238B630",0xAFED],
- ["8238B631",0xAFEE],
- ["8238B632",0xAFEF],
- ["8238B633",0xAFF0],
- ["8238B634",0xAFF1],
- ["8238B635",0xAFF2],
- ["8238B636",0xAFF3],
- ["8238B637",0xAFF4],
- ["8238B638",0xAFF5],
- ["8238B639",0xAFF6],
- ["8238B730",0xAFF7],
- ["8238B731",0xAFF8],
- ["8238B732",0xAFF9],
- ["8238B733",0xAFFA],
- ["8238B734",0xAFFB],
- ["8238B735",0xAFFC],
- ["8238B736",0xAFFD],
- ["8238B737",0xAFFE],
- ["8238B738",0xAFFF],
- ["8238B739",0xB000],
- ["8238B830",0xB001],
- ["8238B831",0xB002],
- ["8238B832",0xB003],
- ["8238B833",0xB004],
- ["8238B834",0xB005],
- ["8238B835",0xB006],
- ["8238B836",0xB007],
- ["8238B837",0xB008],
- ["8238B838",0xB009],
- ["8238B839",0xB00A],
- ["8238B930",0xB00B],
- ["8238B931",0xB00C],
- ["8238B932",0xB00D],
- ["8238B933",0xB00E],
- ["8238B934",0xB00F],
- ["8238B935",0xB010],
- ["8238B936",0xB011],
- ["8238B937",0xB012],
- ["8238B938",0xB013],
- ["8238B939",0xB014],
- ["8238BA30",0xB015],
- ["8238BA31",0xB016],
- ["8238BA32",0xB017],
- ["8238BA33",0xB018],
- ["8238BA34",0xB019],
- ["8238BA35",0xB01A],
- ["8238BA36",0xB01B],
- ["8238BA37",0xB01C],
- ["8238BA38",0xB01D],
- ["8238BA39",0xB01E],
- ["8238BB30",0xB01F],
- ["8238BB31",0xB020],
- ["8238BB32",0xB021],
- ["8238BB33",0xB022],
- ["8238BB34",0xB023],
- ["8238BB35",0xB024],
- ["8238BB36",0xB025],
- ["8238BB37",0xB026],
- ["8238BB38",0xB027],
- ["8238BB39",0xB028],
- ["8238BC30",0xB029],
- ["8238BC31",0xB02A],
- ["8238BC32",0xB02B],
- ["8238BC33",0xB02C],
- ["8238BC34",0xB02D],
- ["8238BC35",0xB02E],
- ["8238BC36",0xB02F],
- ["8238BC37",0xB030],
- ["8238BC38",0xB031],
- ["8238BC39",0xB032],
- ["8238BD30",0xB033],
- ["8238BD31",0xB034],
- ["8238BD32",0xB035],
- ["8238BD33",0xB036],
- ["8238BD34",0xB037],
- ["8238BD35",0xB038],
- ["8238BD36",0xB039],
- ["8238BD37",0xB03A],
- ["8238BD38",0xB03B],
- ["8238BD39",0xB03C],
- ["8238BE30",0xB03D],
- ["8238BE31",0xB03E],
- ["8238BE32",0xB03F],
- ["8238BE33",0xB040],
- ["8238BE34",0xB041],
- ["8238BE35",0xB042],
- ["8238BE36",0xB043],
- ["8238BE37",0xB044],
- ["8238BE38",0xB045],
- ["8238BE39",0xB046],
- ["8238BF30",0xB047],
- ["8238BF31",0xB048],
- ["8238BF32",0xB049],
- ["8238BF33",0xB04A],
- ["8238BF34",0xB04B],
- ["8238BF35",0xB04C],
- ["8238BF36",0xB04D],
- ["8238BF37",0xB04E],
- ["8238BF38",0xB04F],
- ["8238BF39",0xB050],
- ["8238C030",0xB051],
- ["8238C031",0xB052],
- ["8238C032",0xB053],
- ["8238C033",0xB054],
- ["8238C034",0xB055],
- ["8238C035",0xB056],
- ["8238C036",0xB057],
- ["8238C037",0xB058],
- ["8238C038",0xB059],
- ["8238C039",0xB05A],
- ["8238C130",0xB05B],
- ["8238C131",0xB05C],
- ["8238C132",0xB05D],
- ["8238C133",0xB05E],
- ["8238C134",0xB05F],
- ["8238C135",0xB060],
- ["8238C136",0xB061],
- ["8238C137",0xB062],
- ["8238C138",0xB063],
- ["8238C139",0xB064],
- ["8238C230",0xB065],
- ["8238C231",0xB066],
- ["8238C232",0xB067],
- ["8238C233",0xB068],
- ["8238C234",0xB069],
- ["8238C235",0xB06A],
- ["8238C236",0xB06B],
- ["8238C237",0xB06C],
- ["8238C238",0xB06D],
- ["8238C239",0xB06E],
- ["8238C330",0xB06F],
- ["8238C331",0xB070],
- ["8238C332",0xB071],
- ["8238C333",0xB072],
- ["8238C334",0xB073],
- ["8238C335",0xB074],
- ["8238C336",0xB075],
- ["8238C337",0xB076],
- ["8238C338",0xB077],
- ["8238C339",0xB078],
- ["8238C430",0xB079],
- ["8238C431",0xB07A],
- ["8238C432",0xB07B],
- ["8238C433",0xB07C],
- ["8238C434",0xB07D],
- ["8238C435",0xB07E],
- ["8238C436",0xB07F],
- ["8238C437",0xB080],
- ["8238C438",0xB081],
- ["8238C439",0xB082],
- ["8238C530",0xB083],
- ["8238C531",0xB084],
- ["8238C532",0xB085],
- ["8238C533",0xB086],
- ["8238C534",0xB087],
- ["8238C535",0xB088],
- ["8238C536",0xB089],
- ["8238C537",0xB08A],
- ["8238C538",0xB08B],
- ["8238C539",0xB08C],
- ["8238C630",0xB08D],
- ["8238C631",0xB08E],
- ["8238C632",0xB08F],
- ["8238C633",0xB090],
- ["8238C634",0xB091],
- ["8238C635",0xB092],
- ["8238C636",0xB093],
- ["8238C637",0xB094],
- ["8238C638",0xB095],
- ["8238C639",0xB096],
- ["8238C730",0xB097],
- ["8238C731",0xB098],
- ["8238C732",0xB099],
- ["8238C733",0xB09A],
- ["8238C734",0xB09B],
- ["8238C735",0xB09C],
- ["8238C736",0xB09D],
- ["8238C737",0xB09E],
- ["8238C738",0xB09F],
- ["8238C739",0xB0A0],
- ["8238C830",0xB0A1],
- ["8238C831",0xB0A2],
- ["8238C832",0xB0A3],
- ["8238C833",0xB0A4],
- ["8238C834",0xB0A5],
- ["8238C835",0xB0A6],
- ["8238C836",0xB0A7],
- ["8238C837",0xB0A8],
- ["8238C838",0xB0A9],
- ["8238C839",0xB0AA],
- ["8238C930",0xB0AB],
- ["8238C931",0xB0AC],
- ["8238C932",0xB0AD],
- ["8238C933",0xB0AE],
- ["8238C934",0xB0AF],
- ["8238C935",0xB0B0],
- ["8238C936",0xB0B1],
- ["8238C937",0xB0B2],
- ["8238C938",0xB0B3],
- ["8238C939",0xB0B4],
- ["8238CA30",0xB0B5],
- ["8238CA31",0xB0B6],
- ["8238CA32",0xB0B7],
- ["8238CA33",0xB0B8],
- ["8238CA34",0xB0B9],
- ["8238CA35",0xB0BA],
- ["8238CA36",0xB0BB],
- ["8238CA37",0xB0BC],
- ["8238CA38",0xB0BD],
- ["8238CA39",0xB0BE],
- ["8238CB30",0xB0BF],
- ["8238CB31",0xB0C0],
- ["8238CB32",0xB0C1],
- ["8238CB33",0xB0C2],
- ["8238CB34",0xB0C3],
- ["8238CB35",0xB0C4],
- ["8238CB36",0xB0C5],
- ["8238CB37",0xB0C6],
- ["8238CB38",0xB0C7],
- ["8238CB39",0xB0C8],
- ["8238CC30",0xB0C9],
- ["8238CC31",0xB0CA],
- ["8238CC32",0xB0CB],
- ["8238CC33",0xB0CC],
- ["8238CC34",0xB0CD],
- ["8238CC35",0xB0CE],
- ["8238CC36",0xB0CF],
- ["8238CC37",0xB0D0],
- ["8238CC38",0xB0D1],
- ["8238CC39",0xB0D2],
- ["8238CD30",0xB0D3],
- ["8238CD31",0xB0D4],
- ["8238CD32",0xB0D5],
- ["8238CD33",0xB0D6],
- ["8238CD34",0xB0D7],
- ["8238CD35",0xB0D8],
- ["8238CD36",0xB0D9],
- ["8238CD37",0xB0DA],
- ["8238CD38",0xB0DB],
- ["8238CD39",0xB0DC],
- ["8238CE30",0xB0DD],
- ["8238CE31",0xB0DE],
- ["8238CE32",0xB0DF],
- ["8238CE33",0xB0E0],
- ["8238CE34",0xB0E1],
- ["8238CE35",0xB0E2],
- ["8238CE36",0xB0E3],
- ["8238CE37",0xB0E4],
- ["8238CE38",0xB0E5],
- ["8238CE39",0xB0E6],
- ["8238CF30",0xB0E7],
- ["8238CF31",0xB0E8],
- ["8238CF32",0xB0E9],
- ["8238CF33",0xB0EA],
- ["8238CF34",0xB0EB],
- ["8238CF35",0xB0EC],
- ["8238CF36",0xB0ED],
- ["8238CF37",0xB0EE],
- ["8238CF38",0xB0EF],
- ["8238CF39",0xB0F0],
- ["8238D030",0xB0F1],
- ["8238D031",0xB0F2],
- ["8238D032",0xB0F3],
- ["8238D033",0xB0F4],
- ["8238D034",0xB0F5],
- ["8238D035",0xB0F6],
- ["8238D036",0xB0F7],
- ["8238D037",0xB0F8],
- ["8238D038",0xB0F9],
- ["8238D039",0xB0FA],
- ["8238D130",0xB0FB],
- ["8238D131",0xB0FC],
- ["8238D132",0xB0FD],
- ["8238D133",0xB0FE],
- ["8238D134",0xB0FF],
- ["8238D135",0xB100],
- ["8238D136",0xB101],
- ["8238D137",0xB102],
- ["8238D138",0xB103],
- ["8238D139",0xB104],
- ["8238D230",0xB105],
- ["8238D231",0xB106],
- ["8238D232",0xB107],
- ["8238D233",0xB108],
- ["8238D234",0xB109],
- ["8238D235",0xB10A],
- ["8238D236",0xB10B],
- ["8238D237",0xB10C],
- ["8238D238",0xB10D],
- ["8238D239",0xB10E],
- ["8238D330",0xB10F],
- ["8238D331",0xB110],
- ["8238D332",0xB111],
- ["8238D333",0xB112],
- ["8238D334",0xB113],
- ["8238D335",0xB114],
- ["8238D336",0xB115],
- ["8238D337",0xB116],
- ["8238D338",0xB117],
- ["8238D339",0xB118],
- ["8238D430",0xB119],
- ["8238D431",0xB11A],
- ["8238D432",0xB11B],
- ["8238D433",0xB11C],
- ["8238D434",0xB11D],
- ["8238D435",0xB11E],
- ["8238D436",0xB11F],
- ["8238D437",0xB120],
- ["8238D438",0xB121],
- ["8238D439",0xB122],
- ["8238D530",0xB123],
- ["8238D531",0xB124],
- ["8238D532",0xB125],
- ["8238D533",0xB126],
- ["8238D534",0xB127],
- ["8238D535",0xB128],
- ["8238D536",0xB129],
- ["8238D537",0xB12A],
- ["8238D538",0xB12B],
- ["8238D539",0xB12C],
- ["8238D630",0xB12D],
- ["8238D631",0xB12E],
- ["8238D632",0xB12F],
- ["8238D633",0xB130],
- ["8238D634",0xB131],
- ["8238D635",0xB132],
- ["8238D636",0xB133],
- ["8238D637",0xB134],
- ["8238D638",0xB135],
- ["8238D639",0xB136],
- ["8238D730",0xB137],
- ["8238D731",0xB138],
- ["8238D732",0xB139],
- ["8238D733",0xB13A],
- ["8238D734",0xB13B],
- ["8238D735",0xB13C],
- ["8238D736",0xB13D],
- ["8238D737",0xB13E],
- ["8238D738",0xB13F],
- ["8238D739",0xB140],
- ["8238D830",0xB141],
- ["8238D831",0xB142],
- ["8238D832",0xB143],
- ["8238D833",0xB144],
- ["8238D834",0xB145],
- ["8238D835",0xB146],
- ["8238D836",0xB147],
- ["8238D837",0xB148],
- ["8238D838",0xB149],
- ["8238D839",0xB14A],
- ["8238D930",0xB14B],
- ["8238D931",0xB14C],
- ["8238D932",0xB14D],
- ["8238D933",0xB14E],
- ["8238D934",0xB14F],
- ["8238D935",0xB150],
- ["8238D936",0xB151],
- ["8238D937",0xB152],
- ["8238D938",0xB153],
- ["8238D939",0xB154],
- ["8238DA30",0xB155],
- ["8238DA31",0xB156],
- ["8238DA32",0xB157],
- ["8238DA33",0xB158],
- ["8238DA34",0xB159],
- ["8238DA35",0xB15A],
- ["8238DA36",0xB15B],
- ["8238DA37",0xB15C],
- ["8238DA38",0xB15D],
- ["8238DA39",0xB15E],
- ["8238DB30",0xB15F],
- ["8238DB31",0xB160],
- ["8238DB32",0xB161],
- ["8238DB33",0xB162],
- ["8238DB34",0xB163],
- ["8238DB35",0xB164],
- ["8238DB36",0xB165],
- ["8238DB37",0xB166],
- ["8238DB38",0xB167],
- ["8238DB39",0xB168],
- ["8238DC30",0xB169],
- ["8238DC31",0xB16A],
- ["8238DC32",0xB16B],
- ["8238DC33",0xB16C],
- ["8238DC34",0xB16D],
- ["8238DC35",0xB16E],
- ["8238DC36",0xB16F],
- ["8238DC37",0xB170],
- ["8238DC38",0xB171],
- ["8238DC39",0xB172],
- ["8238DD30",0xB173],
- ["8238DD31",0xB174],
- ["8238DD32",0xB175],
- ["8238DD33",0xB176],
- ["8238DD34",0xB177],
- ["8238DD35",0xB178],
- ["8238DD36",0xB179],
- ["8238DD37",0xB17A],
- ["8238DD38",0xB17B],
- ["8238DD39",0xB17C],
- ["8238DE30",0xB17D],
- ["8238DE31",0xB17E],
- ["8238DE32",0xB17F],
- ["8238DE33",0xB180],
- ["8238DE34",0xB181],
- ["8238DE35",0xB182],
- ["8238DE36",0xB183],
- ["8238DE37",0xB184],
- ["8238DE38",0xB185],
- ["8238DE39",0xB186],
- ["8238DF30",0xB187],
- ["8238DF31",0xB188],
- ["8238DF32",0xB189],
- ["8238DF33",0xB18A],
- ["8238DF34",0xB18B],
- ["8238DF35",0xB18C],
- ["8238DF36",0xB18D],
- ["8238DF37",0xB18E],
- ["8238DF38",0xB18F],
- ["8238DF39",0xB190],
- ["8238E030",0xB191],
- ["8238E031",0xB192],
- ["8238E032",0xB193],
- ["8238E033",0xB194],
- ["8238E034",0xB195],
- ["8238E035",0xB196],
- ["8238E036",0xB197],
- ["8238E037",0xB198],
- ["8238E038",0xB199],
- ["8238E039",0xB19A],
- ["8238E130",0xB19B],
- ["8238E131",0xB19C],
- ["8238E132",0xB19D],
- ["8238E133",0xB19E],
- ["8238E134",0xB19F],
- ["8238E135",0xB1A0],
- ["8238E136",0xB1A1],
- ["8238E137",0xB1A2],
- ["8238E138",0xB1A3],
- ["8238E139",0xB1A4],
- ["8238E230",0xB1A5],
- ["8238E231",0xB1A6],
- ["8238E232",0xB1A7],
- ["8238E233",0xB1A8],
- ["8238E234",0xB1A9],
- ["8238E235",0xB1AA],
- ["8238E236",0xB1AB],
- ["8238E237",0xB1AC],
- ["8238E238",0xB1AD],
- ["8238E239",0xB1AE],
- ["8238E330",0xB1AF],
- ["8238E331",0xB1B0],
- ["8238E332",0xB1B1],
- ["8238E333",0xB1B2],
- ["8238E334",0xB1B3],
- ["8238E335",0xB1B4],
- ["8238E336",0xB1B5],
- ["8238E337",0xB1B6],
- ["8238E338",0xB1B7],
- ["8238E339",0xB1B8],
- ["8238E430",0xB1B9],
- ["8238E431",0xB1BA],
- ["8238E432",0xB1BB],
- ["8238E433",0xB1BC],
- ["8238E434",0xB1BD],
- ["8238E435",0xB1BE],
- ["8238E436",0xB1BF],
- ["8238E437",0xB1C0],
- ["8238E438",0xB1C1],
- ["8238E439",0xB1C2],
- ["8238E530",0xB1C3],
- ["8238E531",0xB1C4],
- ["8238E532",0xB1C5],
- ["8238E533",0xB1C6],
- ["8238E534",0xB1C7],
- ["8238E535",0xB1C8],
- ["8238E536",0xB1C9],
- ["8238E537",0xB1CA],
- ["8238E538",0xB1CB],
- ["8238E539",0xB1CC],
- ["8238E630",0xB1CD],
- ["8238E631",0xB1CE],
- ["8238E632",0xB1CF],
- ["8238E633",0xB1D0],
- ["8238E634",0xB1D1],
- ["8238E635",0xB1D2],
- ["8238E636",0xB1D3],
- ["8238E637",0xB1D4],
- ["8238E638",0xB1D5],
- ["8238E639",0xB1D6],
- ["8238E730",0xB1D7],
- ["8238E731",0xB1D8],
- ["8238E732",0xB1D9],
- ["8238E733",0xB1DA],
- ["8238E734",0xB1DB],
- ["8238E735",0xB1DC],
- ["8238E736",0xB1DD],
- ["8238E737",0xB1DE],
- ["8238E738",0xB1DF],
- ["8238E739",0xB1E0],
- ["8238E830",0xB1E1],
- ["8238E831",0xB1E2],
- ["8238E832",0xB1E3],
- ["8238E833",0xB1E4],
- ["8238E834",0xB1E5],
- ["8238E835",0xB1E6],
- ["8238E836",0xB1E7],
- ["8238E837",0xB1E8],
- ["8238E838",0xB1E9],
- ["8238E839",0xB1EA],
- ["8238E930",0xB1EB],
- ["8238E931",0xB1EC],
- ["8238E932",0xB1ED],
- ["8238E933",0xB1EE],
- ["8238E934",0xB1EF],
- ["8238E935",0xB1F0],
- ["8238E936",0xB1F1],
- ["8238E937",0xB1F2],
- ["8238E938",0xB1F3],
- ["8238E939",0xB1F4],
- ["8238EA30",0xB1F5],
- ["8238EA31",0xB1F6],
- ["8238EA32",0xB1F7],
- ["8238EA33",0xB1F8],
- ["8238EA34",0xB1F9],
- ["8238EA35",0xB1FA],
- ["8238EA36",0xB1FB],
- ["8238EA37",0xB1FC],
- ["8238EA38",0xB1FD],
- ["8238EA39",0xB1FE],
- ["8238EB30",0xB1FF],
- ["8238EB31",0xB200],
- ["8238EB32",0xB201],
- ["8238EB33",0xB202],
- ["8238EB34",0xB203],
- ["8238EB35",0xB204],
- ["8238EB36",0xB205],
- ["8238EB37",0xB206],
- ["8238EB38",0xB207],
- ["8238EB39",0xB208],
- ["8238EC30",0xB209],
- ["8238EC31",0xB20A],
- ["8238EC32",0xB20B],
- ["8238EC33",0xB20C],
- ["8238EC34",0xB20D],
- ["8238EC35",0xB20E],
- ["8238EC36",0xB20F],
- ["8238EC37",0xB210],
- ["8238EC38",0xB211],
- ["8238EC39",0xB212],
- ["8238ED30",0xB213],
- ["8238ED31",0xB214],
- ["8238ED32",0xB215],
- ["8238ED33",0xB216],
- ["8238ED34",0xB217],
- ["8238ED35",0xB218],
- ["8238ED36",0xB219],
- ["8238ED37",0xB21A],
- ["8238ED38",0xB21B],
- ["8238ED39",0xB21C],
- ["8238EE30",0xB21D],
- ["8238EE31",0xB21E],
- ["8238EE32",0xB21F],
- ["8238EE33",0xB220],
- ["8238EE34",0xB221],
- ["8238EE35",0xB222],
- ["8238EE36",0xB223],
- ["8238EE37",0xB224],
- ["8238EE38",0xB225],
- ["8238EE39",0xB226],
- ["8238EF30",0xB227],
- ["8238EF31",0xB228],
- ["8238EF32",0xB229],
- ["8238EF33",0xB22A],
- ["8238EF34",0xB22B],
- ["8238EF35",0xB22C],
- ["8238EF36",0xB22D],
- ["8238EF37",0xB22E],
- ["8238EF38",0xB22F],
- ["8238EF39",0xB230],
- ["8238F030",0xB231],
- ["8238F031",0xB232],
- ["8238F032",0xB233],
- ["8238F033",0xB234],
- ["8238F034",0xB235],
- ["8238F035",0xB236],
- ["8238F036",0xB237],
- ["8238F037",0xB238],
- ["8238F038",0xB239],
- ["8238F039",0xB23A],
- ["8238F130",0xB23B],
- ["8238F131",0xB23C],
- ["8238F132",0xB23D],
- ["8238F133",0xB23E],
- ["8238F134",0xB23F],
- ["8238F135",0xB240],
- ["8238F136",0xB241],
- ["8238F137",0xB242],
- ["8238F138",0xB243],
- ["8238F139",0xB244],
- ["8238F230",0xB245],
- ["8238F231",0xB246],
- ["8238F232",0xB247],
- ["8238F233",0xB248],
- ["8238F234",0xB249],
- ["8238F235",0xB24A],
- ["8238F236",0xB24B],
- ["8238F237",0xB24C],
- ["8238F238",0xB24D],
- ["8238F239",0xB24E],
- ["8238F330",0xB24F],
- ["8238F331",0xB250],
- ["8238F332",0xB251],
- ["8238F333",0xB252],
- ["8238F334",0xB253],
- ["8238F335",0xB254],
- ["8238F336",0xB255],
- ["8238F337",0xB256],
- ["8238F338",0xB257],
- ["8238F339",0xB258],
- ["8238F430",0xB259],
- ["8238F431",0xB25A],
- ["8238F432",0xB25B],
- ["8238F433",0xB25C],
- ["8238F434",0xB25D],
- ["8238F435",0xB25E],
- ["8238F436",0xB25F],
- ["8238F437",0xB260],
- ["8238F438",0xB261],
- ["8238F439",0xB262],
- ["8238F530",0xB263],
- ["8238F531",0xB264],
- ["8238F532",0xB265],
- ["8238F533",0xB266],
- ["8238F534",0xB267],
- ["8238F535",0xB268],
- ["8238F536",0xB269],
- ["8238F537",0xB26A],
- ["8238F538",0xB26B],
- ["8238F539",0xB26C],
- ["8238F630",0xB26D],
- ["8238F631",0xB26E],
- ["8238F632",0xB26F],
- ["8238F633",0xB270],
- ["8238F634",0xB271],
- ["8238F635",0xB272],
- ["8238F636",0xB273],
- ["8238F637",0xB274],
- ["8238F638",0xB275],
- ["8238F639",0xB276],
- ["8238F730",0xB277],
- ["8238F731",0xB278],
- ["8238F732",0xB279],
- ["8238F733",0xB27A],
- ["8238F734",0xB27B],
- ["8238F735",0xB27C],
- ["8238F736",0xB27D],
- ["8238F737",0xB27E],
- ["8238F738",0xB27F],
- ["8238F739",0xB280],
- ["8238F830",0xB281],
- ["8238F831",0xB282],
- ["8238F832",0xB283],
- ["8238F833",0xB284],
- ["8238F834",0xB285],
- ["8238F835",0xB286],
- ["8238F836",0xB287],
- ["8238F837",0xB288],
- ["8238F838",0xB289],
- ["8238F839",0xB28A],
- ["8238F930",0xB28B],
- ["8238F931",0xB28C],
- ["8238F932",0xB28D],
- ["8238F933",0xB28E],
- ["8238F934",0xB28F],
- ["8238F935",0xB290],
- ["8238F936",0xB291],
- ["8238F937",0xB292],
- ["8238F938",0xB293],
- ["8238F939",0xB294],
- ["8238FA30",0xB295],
- ["8238FA31",0xB296],
- ["8238FA32",0xB297],
- ["8238FA33",0xB298],
- ["8238FA34",0xB299],
- ["8238FA35",0xB29A],
- ["8238FA36",0xB29B],
- ["8238FA37",0xB29C],
- ["8238FA38",0xB29D],
- ["8238FA39",0xB29E],
- ["8238FB30",0xB29F],
- ["8238FB31",0xB2A0],
- ["8238FB32",0xB2A1],
- ["8238FB33",0xB2A2],
- ["8238FB34",0xB2A3],
- ["8238FB35",0xB2A4],
- ["8238FB36",0xB2A5],
- ["8238FB37",0xB2A6],
- ["8238FB38",0xB2A7],
- ["8238FB39",0xB2A8],
- ["8238FC30",0xB2A9],
- ["8238FC31",0xB2AA],
- ["8238FC32",0xB2AB],
- ["8238FC33",0xB2AC],
- ["8238FC34",0xB2AD],
- ["8238FC35",0xB2AE],
- ["8238FC36",0xB2AF],
- ["8238FC37",0xB2B0],
- ["8238FC38",0xB2B1],
- ["8238FC39",0xB2B2],
- ["8238FD30",0xB2B3],
- ["8238FD31",0xB2B4],
- ["8238FD32",0xB2B5],
- ["8238FD33",0xB2B6],
- ["8238FD34",0xB2B7],
- ["8238FD35",0xB2B8],
- ["8238FD36",0xB2B9],
- ["8238FD37",0xB2BA],
- ["8238FD38",0xB2BB],
- ["8238FD39",0xB2BC],
- ["8238FE30",0xB2BD],
- ["8238FE31",0xB2BE],
- ["8238FE32",0xB2BF],
- ["8238FE33",0xB2C0],
- ["8238FE34",0xB2C1],
- ["8238FE35",0xB2C2],
- ["8238FE36",0xB2C3],
- ["8238FE37",0xB2C4],
- ["8238FE38",0xB2C5],
- ["8238FE39",0xB2C6],
- ["82398130",0xB2C7],
- ["82398131",0xB2C8],
- ["82398132",0xB2C9],
- ["82398133",0xB2CA],
- ["82398134",0xB2CB],
- ["82398135",0xB2CC],
- ["82398136",0xB2CD],
- ["82398137",0xB2CE],
- ["82398138",0xB2CF],
- ["82398139",0xB2D0],
- ["82398230",0xB2D1],
- ["82398231",0xB2D2],
- ["82398232",0xB2D3],
- ["82398233",0xB2D4],
- ["82398234",0xB2D5],
- ["82398235",0xB2D6],
- ["82398236",0xB2D7],
- ["82398237",0xB2D8],
- ["82398238",0xB2D9],
- ["82398239",0xB2DA],
- ["82398330",0xB2DB],
- ["82398331",0xB2DC],
- ["82398332",0xB2DD],
- ["82398333",0xB2DE],
- ["82398334",0xB2DF],
- ["82398335",0xB2E0],
- ["82398336",0xB2E1],
- ["82398337",0xB2E2],
- ["82398338",0xB2E3],
- ["82398339",0xB2E4],
- ["82398430",0xB2E5],
- ["82398431",0xB2E6],
- ["82398432",0xB2E7],
- ["82398433",0xB2E8],
- ["82398434",0xB2E9],
- ["82398435",0xB2EA],
- ["82398436",0xB2EB],
- ["82398437",0xB2EC],
- ["82398438",0xB2ED],
- ["82398439",0xB2EE],
- ["82398530",0xB2EF],
- ["82398531",0xB2F0],
- ["82398532",0xB2F1],
- ["82398533",0xB2F2],
- ["82398534",0xB2F3],
- ["82398535",0xB2F4],
- ["82398536",0xB2F5],
- ["82398537",0xB2F6],
- ["82398538",0xB2F7],
- ["82398539",0xB2F8],
- ["82398630",0xB2F9],
- ["82398631",0xB2FA],
- ["82398632",0xB2FB],
- ["82398633",0xB2FC],
- ["82398634",0xB2FD],
- ["82398635",0xB2FE],
- ["82398636",0xB2FF],
- ["82398637",0xB300],
- ["82398638",0xB301],
- ["82398639",0xB302],
- ["82398730",0xB303],
- ["82398731",0xB304],
- ["82398732",0xB305],
- ["82398733",0xB306],
- ["82398734",0xB307],
- ["82398735",0xB308],
- ["82398736",0xB309],
- ["82398737",0xB30A],
- ["82398738",0xB30B],
- ["82398739",0xB30C],
- ["82398830",0xB30D],
- ["82398831",0xB30E],
- ["82398832",0xB30F],
- ["82398833",0xB310],
- ["82398834",0xB311],
- ["82398835",0xB312],
- ["82398836",0xB313],
- ["82398837",0xB314],
- ["82398838",0xB315],
- ["82398839",0xB316],
- ["82398930",0xB317],
- ["82398931",0xB318],
- ["82398932",0xB319],
- ["82398933",0xB31A],
- ["82398934",0xB31B],
- ["82398935",0xB31C],
- ["82398936",0xB31D],
- ["82398937",0xB31E],
- ["82398938",0xB31F],
- ["82398939",0xB320],
- ["82398A30",0xB321],
- ["82398A31",0xB322],
- ["82398A32",0xB323],
- ["82398A33",0xB324],
- ["82398A34",0xB325],
- ["82398A35",0xB326],
- ["82398A36",0xB327],
- ["82398A37",0xB328],
- ["82398A38",0xB329],
- ["82398A39",0xB32A],
- ["82398B30",0xB32B],
- ["82398B31",0xB32C],
- ["82398B32",0xB32D],
- ["82398B33",0xB32E],
- ["82398B34",0xB32F],
- ["82398B35",0xB330],
- ["82398B36",0xB331],
- ["82398B37",0xB332],
- ["82398B38",0xB333],
- ["82398B39",0xB334],
- ["82398C30",0xB335],
- ["82398C31",0xB336],
- ["82398C32",0xB337],
- ["82398C33",0xB338],
- ["82398C34",0xB339],
- ["82398C35",0xB33A],
- ["82398C36",0xB33B],
- ["82398C37",0xB33C],
- ["82398C38",0xB33D],
- ["82398C39",0xB33E],
- ["82398D30",0xB33F],
- ["82398D31",0xB340],
- ["82398D32",0xB341],
- ["82398D33",0xB342],
- ["82398D34",0xB343],
- ["82398D35",0xB344],
- ["82398D36",0xB345],
- ["82398D37",0xB346],
- ["82398D38",0xB347],
- ["82398D39",0xB348],
- ["82398E30",0xB349],
- ["82398E31",0xB34A],
- ["82398E32",0xB34B],
- ["82398E33",0xB34C],
- ["82398E34",0xB34D],
- ["82398E35",0xB34E],
- ["82398E36",0xB34F],
- ["82398E37",0xB350],
- ["82398E38",0xB351],
- ["82398E39",0xB352],
- ["82398F30",0xB353],
- ["82398F31",0xB354],
- ["82398F32",0xB355],
- ["82398F33",0xB356],
- ["82398F34",0xB357],
- ["82398F35",0xB358],
- ["82398F36",0xB359],
- ["82398F37",0xB35A],
- ["82398F38",0xB35B],
- ["82398F39",0xB35C],
- ["82399030",0xB35D],
- ["82399031",0xB35E],
- ["82399032",0xB35F],
- ["82399033",0xB360],
- ["82399034",0xB361],
- ["82399035",0xB362],
- ["82399036",0xB363],
- ["82399037",0xB364],
- ["82399038",0xB365],
- ["82399039",0xB366],
- ["82399130",0xB367],
- ["82399131",0xB368],
- ["82399132",0xB369],
- ["82399133",0xB36A],
- ["82399134",0xB36B],
- ["82399135",0xB36C],
- ["82399136",0xB36D],
- ["82399137",0xB36E],
- ["82399138",0xB36F],
- ["82399139",0xB370],
- ["82399230",0xB371],
- ["82399231",0xB372],
- ["82399232",0xB373],
- ["82399233",0xB374],
- ["82399234",0xB375],
- ["82399235",0xB376],
- ["82399236",0xB377],
- ["82399237",0xB378],
- ["82399238",0xB379],
- ["82399239",0xB37A],
- ["82399330",0xB37B],
- ["82399331",0xB37C],
- ["82399332",0xB37D],
- ["82399333",0xB37E],
- ["82399334",0xB37F],
- ["82399335",0xB380],
- ["82399336",0xB381],
- ["82399337",0xB382],
- ["82399338",0xB383],
- ["82399339",0xB384],
- ["82399430",0xB385],
- ["82399431",0xB386],
- ["82399432",0xB387],
- ["82399433",0xB388],
- ["82399434",0xB389],
- ["82399435",0xB38A],
- ["82399436",0xB38B],
- ["82399437",0xB38C],
- ["82399438",0xB38D],
- ["82399439",0xB38E],
- ["82399530",0xB38F],
- ["82399531",0xB390],
- ["82399532",0xB391],
- ["82399533",0xB392],
- ["82399534",0xB393],
- ["82399535",0xB394],
- ["82399536",0xB395],
- ["82399537",0xB396],
- ["82399538",0xB397],
- ["82399539",0xB398],
- ["82399630",0xB399],
- ["82399631",0xB39A],
- ["82399632",0xB39B],
- ["82399633",0xB39C],
- ["82399634",0xB39D],
- ["82399635",0xB39E],
- ["82399636",0xB39F],
- ["82399637",0xB3A0],
- ["82399638",0xB3A1],
- ["82399639",0xB3A2],
- ["82399730",0xB3A3],
- ["82399731",0xB3A4],
- ["82399732",0xB3A5],
- ["82399733",0xB3A6],
- ["82399734",0xB3A7],
- ["82399735",0xB3A8],
- ["82399736",0xB3A9],
- ["82399737",0xB3AA],
- ["82399738",0xB3AB],
- ["82399739",0xB3AC],
- ["82399830",0xB3AD],
- ["82399831",0xB3AE],
- ["82399832",0xB3AF],
- ["82399833",0xB3B0],
- ["82399834",0xB3B1],
- ["82399835",0xB3B2],
- ["82399836",0xB3B3],
- ["82399837",0xB3B4],
- ["82399838",0xB3B5],
- ["82399839",0xB3B6],
- ["82399930",0xB3B7],
- ["82399931",0xB3B8],
- ["82399932",0xB3B9],
- ["82399933",0xB3BA],
- ["82399934",0xB3BB],
- ["82399935",0xB3BC],
- ["82399936",0xB3BD],
- ["82399937",0xB3BE],
- ["82399938",0xB3BF],
- ["82399939",0xB3C0],
- ["82399A30",0xB3C1],
- ["82399A31",0xB3C2],
- ["82399A32",0xB3C3],
- ["82399A33",0xB3C4],
- ["82399A34",0xB3C5],
- ["82399A35",0xB3C6],
- ["82399A36",0xB3C7],
- ["82399A37",0xB3C8],
- ["82399A38",0xB3C9],
- ["82399A39",0xB3CA],
- ["82399B30",0xB3CB],
- ["82399B31",0xB3CC],
- ["82399B32",0xB3CD],
- ["82399B33",0xB3CE],
- ["82399B34",0xB3CF],
- ["82399B35",0xB3D0],
- ["82399B36",0xB3D1],
- ["82399B37",0xB3D2],
- ["82399B38",0xB3D3],
- ["82399B39",0xB3D4],
- ["82399C30",0xB3D5],
- ["82399C31",0xB3D6],
- ["82399C32",0xB3D7],
- ["82399C33",0xB3D8],
- ["82399C34",0xB3D9],
- ["82399C35",0xB3DA],
- ["82399C36",0xB3DB],
- ["82399C37",0xB3DC],
- ["82399C38",0xB3DD],
- ["82399C39",0xB3DE],
- ["82399D30",0xB3DF],
- ["82399D31",0xB3E0],
- ["82399D32",0xB3E1],
- ["82399D33",0xB3E2],
- ["82399D34",0xB3E3],
- ["82399D35",0xB3E4],
- ["82399D36",0xB3E5],
- ["82399D37",0xB3E6],
- ["82399D38",0xB3E7],
- ["82399D39",0xB3E8],
- ["82399E30",0xB3E9],
- ["82399E31",0xB3EA],
- ["82399E32",0xB3EB],
- ["82399E33",0xB3EC],
- ["82399E34",0xB3ED],
- ["82399E35",0xB3EE],
- ["82399E36",0xB3EF],
- ["82399E37",0xB3F0],
- ["82399E38",0xB3F1],
- ["82399E39",0xB3F2],
- ["82399F30",0xB3F3],
- ["82399F31",0xB3F4],
- ["82399F32",0xB3F5],
- ["82399F33",0xB3F6],
- ["82399F34",0xB3F7],
- ["82399F35",0xB3F8],
- ["82399F36",0xB3F9],
- ["82399F37",0xB3FA],
- ["82399F38",0xB3FB],
- ["82399F39",0xB3FC],
- ["8239A030",0xB3FD],
- ["8239A031",0xB3FE],
- ["8239A032",0xB3FF],
- ["8239A033",0xB400],
- ["8239A034",0xB401],
- ["8239A035",0xB402],
- ["8239A036",0xB403],
- ["8239A037",0xB404],
- ["8239A038",0xB405],
- ["8239A039",0xB406],
- ["8239A130",0xB407],
- ["8239A131",0xB408],
- ["8239A132",0xB409],
- ["8239A133",0xB40A],
- ["8239A134",0xB40B],
- ["8239A135",0xB40C],
- ["8239A136",0xB40D],
- ["8239A137",0xB40E],
- ["8239A138",0xB40F],
- ["8239A139",0xB410],
- ["8239A230",0xB411],
- ["8239A231",0xB412],
- ["8239A232",0xB413],
- ["8239A233",0xB414],
- ["8239A234",0xB415],
- ["8239A235",0xB416],
- ["8239A236",0xB417],
- ["8239A237",0xB418],
- ["8239A238",0xB419],
- ["8239A239",0xB41A],
- ["8239A330",0xB41B],
- ["8239A331",0xB41C],
- ["8239A332",0xB41D],
- ["8239A333",0xB41E],
- ["8239A334",0xB41F],
- ["8239A335",0xB420],
- ["8239A336",0xB421],
- ["8239A337",0xB422],
- ["8239A338",0xB423],
- ["8239A339",0xB424],
- ["8239A430",0xB425],
- ["8239A431",0xB426],
- ["8239A432",0xB427],
- ["8239A433",0xB428],
- ["8239A434",0xB429],
- ["8239A435",0xB42A],
- ["8239A436",0xB42B],
- ["8239A437",0xB42C],
- ["8239A438",0xB42D],
- ["8239A439",0xB42E],
- ["8239A530",0xB42F],
- ["8239A531",0xB430],
- ["8239A532",0xB431],
- ["8239A533",0xB432],
- ["8239A534",0xB433],
- ["8239A535",0xB434],
- ["8239A536",0xB435],
- ["8239A537",0xB436],
- ["8239A538",0xB437],
- ["8239A539",0xB438],
- ["8239A630",0xB439],
- ["8239A631",0xB43A],
- ["8239A632",0xB43B],
- ["8239A633",0xB43C],
- ["8239A634",0xB43D],
- ["8239A635",0xB43E],
- ["8239A636",0xB43F],
- ["8239A637",0xB440],
- ["8239A638",0xB441],
- ["8239A639",0xB442],
- ["8239A730",0xB443],
- ["8239A731",0xB444],
- ["8239A732",0xB445],
- ["8239A733",0xB446],
- ["8239A734",0xB447],
- ["8239A735",0xB448],
- ["8239A736",0xB449],
- ["8239A737",0xB44A],
- ["8239A738",0xB44B],
- ["8239A739",0xB44C],
- ["8239A830",0xB44D],
- ["8239A831",0xB44E],
- ["8239A832",0xB44F],
- ["8239A833",0xB450],
- ["8239A834",0xB451],
- ["8239A835",0xB452],
- ["8239A836",0xB453],
- ["8239A837",0xB454],
- ["8239A838",0xB455],
- ["8239A839",0xB456],
- ["8239A930",0xB457],
- ["8239A931",0xB458],
- ["8239A932",0xB459],
- ["8239A933",0xB45A],
- ["8239A934",0xB45B],
- ["8239A935",0xB45C],
- ["8239A936",0xB45D],
- ["8239A937",0xB45E],
- ["8239A938",0xB45F],
- ["8239A939",0xB460],
- ["8239AA30",0xB461],
- ["8239AA31",0xB462],
- ["8239AA32",0xB463],
- ["8239AA33",0xB464],
- ["8239AA34",0xB465],
- ["8239AA35",0xB466],
- ["8239AA36",0xB467],
- ["8239AA37",0xB468],
- ["8239AA38",0xB469],
- ["8239AA39",0xB46A],
- ["8239AB30",0xB46B],
- ["8239AB31",0xB46C],
- ["8239AB32",0xB46D],
- ["8239AB33",0xB46E],
- ["8239AB34",0xB46F],
- ["8239AB35",0xB470],
- ["8239AB36",0xB471],
- ["8239AB37",0xB472],
- ["8239AB38",0xB473],
- ["8239AB39",0xB474],
- ["8239AC30",0xB475],
- ["8239AC31",0xB476],
- ["8239AC32",0xB477],
- ["8239AC33",0xB478],
- ["8239AC34",0xB479],
- ["8239AC35",0xB47A],
- ["8239AC36",0xB47B],
- ["8239AC37",0xB47C],
- ["8239AC38",0xB47D],
- ["8239AC39",0xB47E],
- ["8239AD30",0xB47F],
- ["8239AD31",0xB480],
- ["8239AD32",0xB481],
- ["8239AD33",0xB482],
- ["8239AD34",0xB483],
- ["8239AD35",0xB484],
- ["8239AD36",0xB485],
- ["8239AD37",0xB486],
- ["8239AD38",0xB487],
- ["8239AD39",0xB488],
- ["8239AE30",0xB489],
- ["8239AE31",0xB48A],
- ["8239AE32",0xB48B],
- ["8239AE33",0xB48C],
- ["8239AE34",0xB48D],
- ["8239AE35",0xB48E],
- ["8239AE36",0xB48F],
- ["8239AE37",0xB490],
- ["8239AE38",0xB491],
- ["8239AE39",0xB492],
- ["8239AF30",0xB493],
- ["8239AF31",0xB494],
- ["8239AF32",0xB495],
- ["8239AF33",0xB496],
- ["8239AF34",0xB497],
- ["8239AF35",0xB498],
- ["8239AF36",0xB499],
- ["8239AF37",0xB49A],
- ["8239AF38",0xB49B],
- ["8239AF39",0xB49C],
- ["8239B030",0xB49D],
- ["8239B031",0xB49E],
- ["8239B032",0xB49F],
- ["8239B033",0xB4A0],
- ["8239B034",0xB4A1],
- ["8239B035",0xB4A2],
- ["8239B036",0xB4A3],
- ["8239B037",0xB4A4],
- ["8239B038",0xB4A5],
- ["8239B039",0xB4A6],
- ["8239B130",0xB4A7],
- ["8239B131",0xB4A8],
- ["8239B132",0xB4A9],
- ["8239B133",0xB4AA],
- ["8239B134",0xB4AB],
- ["8239B135",0xB4AC],
- ["8239B136",0xB4AD],
- ["8239B137",0xB4AE],
- ["8239B138",0xB4AF],
- ["8239B139",0xB4B0],
- ["8239B230",0xB4B1],
- ["8239B231",0xB4B2],
- ["8239B232",0xB4B3],
- ["8239B233",0xB4B4],
- ["8239B234",0xB4B5],
- ["8239B235",0xB4B6],
- ["8239B236",0xB4B7],
- ["8239B237",0xB4B8],
- ["8239B238",0xB4B9],
- ["8239B239",0xB4BA],
- ["8239B330",0xB4BB],
- ["8239B331",0xB4BC],
- ["8239B332",0xB4BD],
- ["8239B333",0xB4BE],
- ["8239B334",0xB4BF],
- ["8239B335",0xB4C0],
- ["8239B336",0xB4C1],
- ["8239B337",0xB4C2],
- ["8239B338",0xB4C3],
- ["8239B339",0xB4C4],
- ["8239B430",0xB4C5],
- ["8239B431",0xB4C6],
- ["8239B432",0xB4C7],
- ["8239B433",0xB4C8],
- ["8239B434",0xB4C9],
- ["8239B435",0xB4CA],
- ["8239B436",0xB4CB],
- ["8239B437",0xB4CC],
- ["8239B438",0xB4CD],
- ["8239B439",0xB4CE],
- ["8239B530",0xB4CF],
- ["8239B531",0xB4D0],
- ["8239B532",0xB4D1],
- ["8239B533",0xB4D2],
- ["8239B534",0xB4D3],
- ["8239B535",0xB4D4],
- ["8239B536",0xB4D5],
- ["8239B537",0xB4D6],
- ["8239B538",0xB4D7],
- ["8239B539",0xB4D8],
- ["8239B630",0xB4D9],
- ["8239B631",0xB4DA],
- ["8239B632",0xB4DB],
- ["8239B633",0xB4DC],
- ["8239B634",0xB4DD],
- ["8239B635",0xB4DE],
- ["8239B636",0xB4DF],
- ["8239B637",0xB4E0],
- ["8239B638",0xB4E1],
- ["8239B639",0xB4E2],
- ["8239B730",0xB4E3],
- ["8239B731",0xB4E4],
- ["8239B732",0xB4E5],
- ["8239B733",0xB4E6],
- ["8239B734",0xB4E7],
- ["8239B735",0xB4E8],
- ["8239B736",0xB4E9],
- ["8239B737",0xB4EA],
- ["8239B738",0xB4EB],
- ["8239B739",0xB4EC],
- ["8239B830",0xB4ED],
- ["8239B831",0xB4EE],
- ["8239B832",0xB4EF],
- ["8239B833",0xB4F0],
- ["8239B834",0xB4F1],
- ["8239B835",0xB4F2],
- ["8239B836",0xB4F3],
- ["8239B837",0xB4F4],
- ["8239B838",0xB4F5],
- ["8239B839",0xB4F6],
- ["8239B930",0xB4F7],
- ["8239B931",0xB4F8],
- ["8239B932",0xB4F9],
- ["8239B933",0xB4FA],
- ["8239B934",0xB4FB],
- ["8239B935",0xB4FC],
- ["8239B936",0xB4FD],
- ["8239B937",0xB4FE],
- ["8239B938",0xB4FF],
- ["8239B939",0xB500],
- ["8239BA30",0xB501],
- ["8239BA31",0xB502],
- ["8239BA32",0xB503],
- ["8239BA33",0xB504],
- ["8239BA34",0xB505],
- ["8239BA35",0xB506],
- ["8239BA36",0xB507],
- ["8239BA37",0xB508],
- ["8239BA38",0xB509],
- ["8239BA39",0xB50A],
- ["8239BB30",0xB50B],
- ["8239BB31",0xB50C],
- ["8239BB32",0xB50D],
- ["8239BB33",0xB50E],
- ["8239BB34",0xB50F],
- ["8239BB35",0xB510],
- ["8239BB36",0xB511],
- ["8239BB37",0xB512],
- ["8239BB38",0xB513],
- ["8239BB39",0xB514],
- ["8239BC30",0xB515],
- ["8239BC31",0xB516],
- ["8239BC32",0xB517],
- ["8239BC33",0xB518],
- ["8239BC34",0xB519],
- ["8239BC35",0xB51A],
- ["8239BC36",0xB51B],
- ["8239BC37",0xB51C],
- ["8239BC38",0xB51D],
- ["8239BC39",0xB51E],
- ["8239BD30",0xB51F],
- ["8239BD31",0xB520],
- ["8239BD32",0xB521],
- ["8239BD33",0xB522],
- ["8239BD34",0xB523],
- ["8239BD35",0xB524],
- ["8239BD36",0xB525],
- ["8239BD37",0xB526],
- ["8239BD38",0xB527],
- ["8239BD39",0xB528],
- ["8239BE30",0xB529],
- ["8239BE31",0xB52A],
- ["8239BE32",0xB52B],
- ["8239BE33",0xB52C],
- ["8239BE34",0xB52D],
- ["8239BE35",0xB52E],
- ["8239BE36",0xB52F],
- ["8239BE37",0xB530],
- ["8239BE38",0xB531],
- ["8239BE39",0xB532],
- ["8239BF30",0xB533],
- ["8239BF31",0xB534],
- ["8239BF32",0xB535],
- ["8239BF33",0xB536],
- ["8239BF34",0xB537],
- ["8239BF35",0xB538],
- ["8239BF36",0xB539],
- ["8239BF37",0xB53A],
- ["8239BF38",0xB53B],
- ["8239BF39",0xB53C],
- ["8239C030",0xB53D],
- ["8239C031",0xB53E],
- ["8239C032",0xB53F],
- ["8239C033",0xB540],
- ["8239C034",0xB541],
- ["8239C035",0xB542],
- ["8239C036",0xB543],
- ["8239C037",0xB544],
- ["8239C038",0xB545],
- ["8239C039",0xB546],
- ["8239C130",0xB547],
- ["8239C131",0xB548],
- ["8239C132",0xB549],
- ["8239C133",0xB54A],
- ["8239C134",0xB54B],
- ["8239C135",0xB54C],
- ["8239C136",0xB54D],
- ["8239C137",0xB54E],
- ["8239C138",0xB54F],
- ["8239C139",0xB550],
- ["8239C230",0xB551],
- ["8239C231",0xB552],
- ["8239C232",0xB553],
- ["8239C233",0xB554],
- ["8239C234",0xB555],
- ["8239C235",0xB556],
- ["8239C236",0xB557],
- ["8239C237",0xB558],
- ["8239C238",0xB559],
- ["8239C239",0xB55A],
- ["8239C330",0xB55B],
- ["8239C331",0xB55C],
- ["8239C332",0xB55D],
- ["8239C333",0xB55E],
- ["8239C334",0xB55F],
- ["8239C335",0xB560],
- ["8239C336",0xB561],
- ["8239C337",0xB562],
- ["8239C338",0xB563],
- ["8239C339",0xB564],
- ["8239C430",0xB565],
- ["8239C431",0xB566],
- ["8239C432",0xB567],
- ["8239C433",0xB568],
- ["8239C434",0xB569],
- ["8239C435",0xB56A],
- ["8239C436",0xB56B],
- ["8239C437",0xB56C],
- ["8239C438",0xB56D],
- ["8239C439",0xB56E],
- ["8239C530",0xB56F],
- ["8239C531",0xB570],
- ["8239C532",0xB571],
- ["8239C533",0xB572],
- ["8239C534",0xB573],
- ["8239C535",0xB574],
- ["8239C536",0xB575],
- ["8239C537",0xB576],
- ["8239C538",0xB577],
- ["8239C539",0xB578],
- ["8239C630",0xB579],
- ["8239C631",0xB57A],
- ["8239C632",0xB57B],
- ["8239C633",0xB57C],
- ["8239C634",0xB57D],
- ["8239C635",0xB57E],
- ["8239C636",0xB57F],
- ["8239C637",0xB580],
- ["8239C638",0xB581],
- ["8239C639",0xB582],
- ["8239C730",0xB583],
- ["8239C731",0xB584],
- ["8239C732",0xB585],
- ["8239C733",0xB586],
- ["8239C734",0xB587],
- ["8239C735",0xB588],
- ["8239C736",0xB589],
- ["8239C737",0xB58A],
- ["8239C738",0xB58B],
- ["8239C739",0xB58C],
- ["8239C830",0xB58D],
- ["8239C831",0xB58E],
- ["8239C832",0xB58F],
- ["8239C833",0xB590],
- ["8239C834",0xB591],
- ["8239C835",0xB592],
- ["8239C836",0xB593],
- ["8239C837",0xB594],
- ["8239C838",0xB595],
- ["8239C839",0xB596],
- ["8239C930",0xB597],
- ["8239C931",0xB598],
- ["8239C932",0xB599],
- ["8239C933",0xB59A],
- ["8239C934",0xB59B],
- ["8239C935",0xB59C],
- ["8239C936",0xB59D],
- ["8239C937",0xB59E],
- ["8239C938",0xB59F],
- ["8239C939",0xB5A0],
- ["8239CA30",0xB5A1],
- ["8239CA31",0xB5A2],
- ["8239CA32",0xB5A3],
- ["8239CA33",0xB5A4],
- ["8239CA34",0xB5A5],
- ["8239CA35",0xB5A6],
- ["8239CA36",0xB5A7],
- ["8239CA37",0xB5A8],
- ["8239CA38",0xB5A9],
- ["8239CA39",0xB5AA],
- ["8239CB30",0xB5AB],
- ["8239CB31",0xB5AC],
- ["8239CB32",0xB5AD],
- ["8239CB33",0xB5AE],
- ["8239CB34",0xB5AF],
- ["8239CB35",0xB5B0],
- ["8239CB36",0xB5B1],
- ["8239CB37",0xB5B2],
- ["8239CB38",0xB5B3],
- ["8239CB39",0xB5B4],
- ["8239CC30",0xB5B5],
- ["8239CC31",0xB5B6],
- ["8239CC32",0xB5B7],
- ["8239CC33",0xB5B8],
- ["8239CC34",0xB5B9],
- ["8239CC35",0xB5BA],
- ["8239CC36",0xB5BB],
- ["8239CC37",0xB5BC],
- ["8239CC38",0xB5BD],
- ["8239CC39",0xB5BE],
- ["8239CD30",0xB5BF],
- ["8239CD31",0xB5C0],
- ["8239CD32",0xB5C1],
- ["8239CD33",0xB5C2],
- ["8239CD34",0xB5C3],
- ["8239CD35",0xB5C4],
- ["8239CD36",0xB5C5],
- ["8239CD37",0xB5C6],
- ["8239CD38",0xB5C7],
- ["8239CD39",0xB5C8],
- ["8239CE30",0xB5C9],
- ["8239CE31",0xB5CA],
- ["8239CE32",0xB5CB],
- ["8239CE33",0xB5CC],
- ["8239CE34",0xB5CD],
- ["8239CE35",0xB5CE],
- ["8239CE36",0xB5CF],
- ["8239CE37",0xB5D0],
- ["8239CE38",0xB5D1],
- ["8239CE39",0xB5D2],
- ["8239CF30",0xB5D3],
- ["8239CF31",0xB5D4],
- ["8239CF32",0xB5D5],
- ["8239CF33",0xB5D6],
- ["8239CF34",0xB5D7],
- ["8239CF35",0xB5D8],
- ["8239CF36",0xB5D9],
- ["8239CF37",0xB5DA],
- ["8239CF38",0xB5DB],
- ["8239CF39",0xB5DC],
- ["8239D030",0xB5DD],
- ["8239D031",0xB5DE],
- ["8239D032",0xB5DF],
- ["8239D033",0xB5E0],
- ["8239D034",0xB5E1],
- ["8239D035",0xB5E2],
- ["8239D036",0xB5E3],
- ["8239D037",0xB5E4],
- ["8239D038",0xB5E5],
- ["8239D039",0xB5E6],
- ["8239D130",0xB5E7],
- ["8239D131",0xB5E8],
- ["8239D132",0xB5E9],
- ["8239D133",0xB5EA],
- ["8239D134",0xB5EB],
- ["8239D135",0xB5EC],
- ["8239D136",0xB5ED],
- ["8239D137",0xB5EE],
- ["8239D138",0xB5EF],
- ["8239D139",0xB5F0],
- ["8239D230",0xB5F1],
- ["8239D231",0xB5F2],
- ["8239D232",0xB5F3],
- ["8239D233",0xB5F4],
- ["8239D234",0xB5F5],
- ["8239D235",0xB5F6],
- ["8239D236",0xB5F7],
- ["8239D237",0xB5F8],
- ["8239D238",0xB5F9],
- ["8239D239",0xB5FA],
- ["8239D330",0xB5FB],
- ["8239D331",0xB5FC],
- ["8239D332",0xB5FD],
- ["8239D333",0xB5FE],
- ["8239D334",0xB5FF],
- ["8239D335",0xB600],
- ["8239D336",0xB601],
- ["8239D337",0xB602],
- ["8239D338",0xB603],
- ["8239D339",0xB604],
- ["8239D430",0xB605],
- ["8239D431",0xB606],
- ["8239D432",0xB607],
- ["8239D433",0xB608],
- ["8239D434",0xB609],
- ["8239D435",0xB60A],
- ["8239D436",0xB60B],
- ["8239D437",0xB60C],
- ["8239D438",0xB60D],
- ["8239D439",0xB60E],
- ["8239D530",0xB60F],
- ["8239D531",0xB610],
- ["8239D532",0xB611],
- ["8239D533",0xB612],
- ["8239D534",0xB613],
- ["8239D535",0xB614],
- ["8239D536",0xB615],
- ["8239D537",0xB616],
- ["8239D538",0xB617],
- ["8239D539",0xB618],
- ["8239D630",0xB619],
- ["8239D631",0xB61A],
- ["8239D632",0xB61B],
- ["8239D633",0xB61C],
- ["8239D634",0xB61D],
- ["8239D635",0xB61E],
- ["8239D636",0xB61F],
- ["8239D637",0xB620],
- ["8239D638",0xB621],
- ["8239D639",0xB622],
- ["8239D730",0xB623],
- ["8239D731",0xB624],
- ["8239D732",0xB625],
- ["8239D733",0xB626],
- ["8239D734",0xB627],
- ["8239D735",0xB628],
- ["8239D736",0xB629],
- ["8239D737",0xB62A],
- ["8239D738",0xB62B],
- ["8239D739",0xB62C],
- ["8239D830",0xB62D],
- ["8239D831",0xB62E],
- ["8239D832",0xB62F],
- ["8239D833",0xB630],
- ["8239D834",0xB631],
- ["8239D835",0xB632],
- ["8239D836",0xB633],
- ["8239D837",0xB634],
- ["8239D838",0xB635],
- ["8239D839",0xB636],
- ["8239D930",0xB637],
- ["8239D931",0xB638],
- ["8239D932",0xB639],
- ["8239D933",0xB63A],
- ["8239D934",0xB63B],
- ["8239D935",0xB63C],
- ["8239D936",0xB63D],
- ["8239D937",0xB63E],
- ["8239D938",0xB63F],
- ["8239D939",0xB640],
- ["8239DA30",0xB641],
- ["8239DA31",0xB642],
- ["8239DA32",0xB643],
- ["8239DA33",0xB644],
- ["8239DA34",0xB645],
- ["8239DA35",0xB646],
- ["8239DA36",0xB647],
- ["8239DA37",0xB648],
- ["8239DA38",0xB649],
- ["8239DA39",0xB64A],
- ["8239DB30",0xB64B],
- ["8239DB31",0xB64C],
- ["8239DB32",0xB64D],
- ["8239DB33",0xB64E],
- ["8239DB34",0xB64F],
- ["8239DB35",0xB650],
- ["8239DB36",0xB651],
- ["8239DB37",0xB652],
- ["8239DB38",0xB653],
- ["8239DB39",0xB654],
- ["8239DC30",0xB655],
- ["8239DC31",0xB656],
- ["8239DC32",0xB657],
- ["8239DC33",0xB658],
- ["8239DC34",0xB659],
- ["8239DC35",0xB65A],
- ["8239DC36",0xB65B],
- ["8239DC37",0xB65C],
- ["8239DC38",0xB65D],
- ["8239DC39",0xB65E],
- ["8239DD30",0xB65F],
- ["8239DD31",0xB660],
- ["8239DD32",0xB661],
- ["8239DD33",0xB662],
- ["8239DD34",0xB663],
- ["8239DD35",0xB664],
- ["8239DD36",0xB665],
- ["8239DD37",0xB666],
- ["8239DD38",0xB667],
- ["8239DD39",0xB668],
- ["8239DE30",0xB669],
- ["8239DE31",0xB66A],
- ["8239DE32",0xB66B],
- ["8239DE33",0xB66C],
- ["8239DE34",0xB66D],
- ["8239DE35",0xB66E],
- ["8239DE36",0xB66F],
- ["8239DE37",0xB670],
- ["8239DE38",0xB671],
- ["8239DE39",0xB672],
- ["8239DF30",0xB673],
- ["8239DF31",0xB674],
- ["8239DF32",0xB675],
- ["8239DF33",0xB676],
- ["8239DF34",0xB677],
- ["8239DF35",0xB678],
- ["8239DF36",0xB679],
- ["8239DF37",0xB67A],
- ["8239DF38",0xB67B],
- ["8239DF39",0xB67C],
- ["8239E030",0xB67D],
- ["8239E031",0xB67E],
- ["8239E032",0xB67F],
- ["8239E033",0xB680],
- ["8239E034",0xB681],
- ["8239E035",0xB682],
- ["8239E036",0xB683],
- ["8239E037",0xB684],
- ["8239E038",0xB685],
- ["8239E039",0xB686],
- ["8239E130",0xB687],
- ["8239E131",0xB688],
- ["8239E132",0xB689],
- ["8239E133",0xB68A],
- ["8239E134",0xB68B],
- ["8239E135",0xB68C],
- ["8239E136",0xB68D],
- ["8239E137",0xB68E],
- ["8239E138",0xB68F],
- ["8239E139",0xB690],
- ["8239E230",0xB691],
- ["8239E231",0xB692],
- ["8239E232",0xB693],
- ["8239E233",0xB694],
- ["8239E234",0xB695],
- ["8239E235",0xB696],
- ["8239E236",0xB697],
- ["8239E237",0xB698],
- ["8239E238",0xB699],
- ["8239E239",0xB69A],
- ["8239E330",0xB69B],
- ["8239E331",0xB69C],
- ["8239E332",0xB69D],
- ["8239E333",0xB69E],
- ["8239E334",0xB69F],
- ["8239E335",0xB6A0],
- ["8239E336",0xB6A1],
- ["8239E337",0xB6A2],
- ["8239E338",0xB6A3],
- ["8239E339",0xB6A4],
- ["8239E430",0xB6A5],
- ["8239E431",0xB6A6],
- ["8239E432",0xB6A7],
- ["8239E433",0xB6A8],
- ["8239E434",0xB6A9],
- ["8239E435",0xB6AA],
- ["8239E436",0xB6AB],
- ["8239E437",0xB6AC],
- ["8239E438",0xB6AD],
- ["8239E439",0xB6AE],
- ["8239E530",0xB6AF],
- ["8239E531",0xB6B0],
- ["8239E532",0xB6B1],
- ["8239E533",0xB6B2],
- ["8239E534",0xB6B3],
- ["8239E535",0xB6B4],
- ["8239E536",0xB6B5],
- ["8239E537",0xB6B6],
- ["8239E538",0xB6B7],
- ["8239E539",0xB6B8],
- ["8239E630",0xB6B9],
- ["8239E631",0xB6BA],
- ["8239E632",0xB6BB],
- ["8239E633",0xB6BC],
- ["8239E634",0xB6BD],
- ["8239E635",0xB6BE],
- ["8239E636",0xB6BF],
- ["8239E637",0xB6C0],
- ["8239E638",0xB6C1],
- ["8239E639",0xB6C2],
- ["8239E730",0xB6C3],
- ["8239E731",0xB6C4],
- ["8239E732",0xB6C5],
- ["8239E733",0xB6C6],
- ["8239E734",0xB6C7],
- ["8239E735",0xB6C8],
- ["8239E736",0xB6C9],
- ["8239E737",0xB6CA],
- ["8239E738",0xB6CB],
- ["8239E739",0xB6CC],
- ["8239E830",0xB6CD],
- ["8239E831",0xB6CE],
- ["8239E832",0xB6CF],
- ["8239E833",0xB6D0],
- ["8239E834",0xB6D1],
- ["8239E835",0xB6D2],
- ["8239E836",0xB6D3],
- ["8239E837",0xB6D4],
- ["8239E838",0xB6D5],
- ["8239E839",0xB6D6],
- ["8239E930",0xB6D7],
- ["8239E931",0xB6D8],
- ["8239E932",0xB6D9],
- ["8239E933",0xB6DA],
- ["8239E934",0xB6DB],
- ["8239E935",0xB6DC],
- ["8239E936",0xB6DD],
- ["8239E937",0xB6DE],
- ["8239E938",0xB6DF],
- ["8239E939",0xB6E0],
- ["8239EA30",0xB6E1],
- ["8239EA31",0xB6E2],
- ["8239EA32",0xB6E3],
- ["8239EA33",0xB6E4],
- ["8239EA34",0xB6E5],
- ["8239EA35",0xB6E6],
- ["8239EA36",0xB6E7],
- ["8239EA37",0xB6E8],
- ["8239EA38",0xB6E9],
- ["8239EA39",0xB6EA],
- ["8239EB30",0xB6EB],
- ["8239EB31",0xB6EC],
- ["8239EB32",0xB6ED],
- ["8239EB33",0xB6EE],
- ["8239EB34",0xB6EF],
- ["8239EB35",0xB6F0],
- ["8239EB36",0xB6F1],
- ["8239EB37",0xB6F2],
- ["8239EB38",0xB6F3],
- ["8239EB39",0xB6F4],
- ["8239EC30",0xB6F5],
- ["8239EC31",0xB6F6],
- ["8239EC32",0xB6F7],
- ["8239EC33",0xB6F8],
- ["8239EC34",0xB6F9],
- ["8239EC35",0xB6FA],
- ["8239EC36",0xB6FB],
- ["8239EC37",0xB6FC],
- ["8239EC38",0xB6FD],
- ["8239EC39",0xB6FE],
- ["8239ED30",0xB6FF],
- ["8239ED31",0xB700],
- ["8239ED32",0xB701],
- ["8239ED33",0xB702],
- ["8239ED34",0xB703],
- ["8239ED35",0xB704],
- ["8239ED36",0xB705],
- ["8239ED37",0xB706],
- ["8239ED38",0xB707],
- ["8239ED39",0xB708],
- ["8239EE30",0xB709],
- ["8239EE31",0xB70A],
- ["8239EE32",0xB70B],
- ["8239EE33",0xB70C],
- ["8239EE34",0xB70D],
- ["8239EE35",0xB70E],
- ["8239EE36",0xB70F],
- ["8239EE37",0xB710],
- ["8239EE38",0xB711],
- ["8239EE39",0xB712],
- ["8239EF30",0xB713],
- ["8239EF31",0xB714],
- ["8239EF32",0xB715],
- ["8239EF33",0xB716],
- ["8239EF34",0xB717],
- ["8239EF35",0xB718],
- ["8239EF36",0xB719],
- ["8239EF37",0xB71A],
- ["8239EF38",0xB71B],
- ["8239EF39",0xB71C],
- ["8239F030",0xB71D],
- ["8239F031",0xB71E],
- ["8239F032",0xB71F],
- ["8239F033",0xB720],
- ["8239F034",0xB721],
- ["8239F035",0xB722],
- ["8239F036",0xB723],
- ["8239F037",0xB724],
- ["8239F038",0xB725],
- ["8239F039",0xB726],
- ["8239F130",0xB727],
- ["8239F131",0xB728],
- ["8239F132",0xB729],
- ["8239F133",0xB72A],
- ["8239F134",0xB72B],
- ["8239F135",0xB72C],
- ["8239F136",0xB72D],
- ["8239F137",0xB72E],
- ["8239F138",0xB72F],
- ["8239F139",0xB730],
- ["8239F230",0xB731],
- ["8239F231",0xB732],
- ["8239F232",0xB733],
- ["8239F233",0xB734],
- ["8239F234",0xB735],
- ["8239F235",0xB736],
- ["8239F236",0xB737],
- ["8239F237",0xB738],
- ["8239F238",0xB739],
- ["8239F239",0xB73A],
- ["8239F330",0xB73B],
- ["8239F331",0xB73C],
- ["8239F332",0xB73D],
- ["8239F333",0xB73E],
- ["8239F334",0xB73F],
- ["8239F335",0xB740],
- ["8239F336",0xB741],
- ["8239F337",0xB742],
- ["8239F338",0xB743],
- ["8239F339",0xB744],
- ["8239F430",0xB745],
- ["8239F431",0xB746],
- ["8239F432",0xB747],
- ["8239F433",0xB748],
- ["8239F434",0xB749],
- ["8239F435",0xB74A],
- ["8239F436",0xB74B],
- ["8239F437",0xB74C],
- ["8239F438",0xB74D],
- ["8239F439",0xB74E],
- ["8239F530",0xB74F],
- ["8239F531",0xB750],
- ["8239F532",0xB751],
- ["8239F533",0xB752],
- ["8239F534",0xB753],
- ["8239F535",0xB754],
- ["8239F536",0xB755],
- ["8239F537",0xB756],
- ["8239F538",0xB757],
- ["8239F539",0xB758],
- ["8239F630",0xB759],
- ["8239F631",0xB75A],
- ["8239F632",0xB75B],
- ["8239F633",0xB75C],
- ["8239F634",0xB75D],
- ["8239F635",0xB75E],
- ["8239F636",0xB75F],
- ["8239F637",0xB760],
- ["8239F638",0xB761],
- ["8239F639",0xB762],
- ["8239F730",0xB763],
- ["8239F731",0xB764],
- ["8239F732",0xB765],
- ["8239F733",0xB766],
- ["8239F734",0xB767],
- ["8239F735",0xB768],
- ["8239F736",0xB769],
- ["8239F737",0xB76A],
- ["8239F738",0xB76B],
- ["8239F739",0xB76C],
- ["8239F830",0xB76D],
- ["8239F831",0xB76E],
- ["8239F832",0xB76F],
- ["8239F833",0xB770],
- ["8239F834",0xB771],
- ["8239F835",0xB772],
- ["8239F836",0xB773],
- ["8239F837",0xB774],
- ["8239F838",0xB775],
- ["8239F839",0xB776],
- ["8239F930",0xB777],
- ["8239F931",0xB778],
- ["8239F932",0xB779],
- ["8239F933",0xB77A],
- ["8239F934",0xB77B],
- ["8239F935",0xB77C],
- ["8239F936",0xB77D],
- ["8239F937",0xB77E],
- ["8239F938",0xB77F],
- ["8239F939",0xB780],
- ["8239FA30",0xB781],
- ["8239FA31",0xB782],
- ["8239FA32",0xB783],
- ["8239FA33",0xB784],
- ["8239FA34",0xB785],
- ["8239FA35",0xB786],
- ["8239FA36",0xB787],
- ["8239FA37",0xB788],
- ["8239FA38",0xB789],
- ["8239FA39",0xB78A],
- ["8239FB30",0xB78B],
- ["8239FB31",0xB78C],
- ["8239FB32",0xB78D],
- ["8239FB33",0xB78E],
- ["8239FB34",0xB78F],
- ["8239FB35",0xB790],
- ["8239FB36",0xB791],
- ["8239FB37",0xB792],
- ["8239FB38",0xB793],
- ["8239FB39",0xB794],
- ["8239FC30",0xB795],
- ["8239FC31",0xB796],
- ["8239FC32",0xB797],
- ["8239FC33",0xB798],
- ["8239FC34",0xB799],
- ["8239FC35",0xB79A],
- ["8239FC36",0xB79B],
- ["8239FC37",0xB79C],
- ["8239FC38",0xB79D],
- ["8239FC39",0xB79E],
- ["8239FD30",0xB79F],
- ["8239FD31",0xB7A0],
- ["8239FD32",0xB7A1],
- ["8239FD33",0xB7A2],
- ["8239FD34",0xB7A3],
- ["8239FD35",0xB7A4],
- ["8239FD36",0xB7A5],
- ["8239FD37",0xB7A6],
- ["8239FD38",0xB7A7],
- ["8239FD39",0xB7A8],
- ["8239FE30",0xB7A9],
- ["8239FE31",0xB7AA],
- ["8239FE32",0xB7AB],
- ["8239FE33",0xB7AC],
- ["8239FE34",0xB7AD],
- ["8239FE35",0xB7AE],
- ["8239FE36",0xB7AF],
- ["8239FE37",0xB7B0],
- ["8239FE38",0xB7B1],
- ["8239FE39",0xB7B2],
- ["83308130",0xB7B3],
- ["83308131",0xB7B4],
- ["83308132",0xB7B5],
- ["83308133",0xB7B6],
- ["83308134",0xB7B7],
- ["83308135",0xB7B8],
- ["83308136",0xB7B9],
- ["83308137",0xB7BA],
- ["83308138",0xB7BB],
- ["83308139",0xB7BC],
- ["83308230",0xB7BD],
- ["83308231",0xB7BE],
- ["83308232",0xB7BF],
- ["83308233",0xB7C0],
- ["83308234",0xB7C1],
- ["83308235",0xB7C2],
- ["83308236",0xB7C3],
- ["83308237",0xB7C4],
- ["83308238",0xB7C5],
- ["83308239",0xB7C6],
- ["83308330",0xB7C7],
- ["83308331",0xB7C8],
- ["83308332",0xB7C9],
- ["83308333",0xB7CA],
- ["83308334",0xB7CB],
- ["83308335",0xB7CC],
- ["83308336",0xB7CD],
- ["83308337",0xB7CE],
- ["83308338",0xB7CF],
- ["83308339",0xB7D0],
- ["83308430",0xB7D1],
- ["83308431",0xB7D2],
- ["83308432",0xB7D3],
- ["83308433",0xB7D4],
- ["83308434",0xB7D5],
- ["83308435",0xB7D6],
- ["83308436",0xB7D7],
- ["83308437",0xB7D8],
- ["83308438",0xB7D9],
- ["83308439",0xB7DA],
- ["83308530",0xB7DB],
- ["83308531",0xB7DC],
- ["83308532",0xB7DD],
- ["83308533",0xB7DE],
- ["83308534",0xB7DF],
- ["83308535",0xB7E0],
- ["83308536",0xB7E1],
- ["83308537",0xB7E2],
- ["83308538",0xB7E3],
- ["83308539",0xB7E4],
- ["83308630",0xB7E5],
- ["83308631",0xB7E6],
- ["83308632",0xB7E7],
- ["83308633",0xB7E8],
- ["83308634",0xB7E9],
- ["83308635",0xB7EA],
- ["83308636",0xB7EB],
- ["83308637",0xB7EC],
- ["83308638",0xB7ED],
- ["83308639",0xB7EE],
- ["83308730",0xB7EF],
- ["83308731",0xB7F0],
- ["83308732",0xB7F1],
- ["83308733",0xB7F2],
- ["83308734",0xB7F3],
- ["83308735",0xB7F4],
- ["83308736",0xB7F5],
- ["83308737",0xB7F6],
- ["83308738",0xB7F7],
- ["83308739",0xB7F8],
- ["83308830",0xB7F9],
- ["83308831",0xB7FA],
- ["83308832",0xB7FB],
- ["83308833",0xB7FC],
- ["83308834",0xB7FD],
- ["83308835",0xB7FE],
- ["83308836",0xB7FF],
- ["83308837",0xB800],
- ["83308838",0xB801],
- ["83308839",0xB802],
- ["83308930",0xB803],
- ["83308931",0xB804],
- ["83308932",0xB805],
- ["83308933",0xB806],
- ["83308934",0xB807],
- ["83308935",0xB808],
- ["83308936",0xB809],
- ["83308937",0xB80A],
- ["83308938",0xB80B],
- ["83308939",0xB80C],
- ["83308A30",0xB80D],
- ["83308A31",0xB80E],
- ["83308A32",0xB80F],
- ["83308A33",0xB810],
- ["83308A34",0xB811],
- ["83308A35",0xB812],
- ["83308A36",0xB813],
- ["83308A37",0xB814],
- ["83308A38",0xB815],
- ["83308A39",0xB816],
- ["83308B30",0xB817],
- ["83308B31",0xB818],
- ["83308B32",0xB819],
- ["83308B33",0xB81A],
- ["83308B34",0xB81B],
- ["83308B35",0xB81C],
- ["83308B36",0xB81D],
- ["83308B37",0xB81E],
- ["83308B38",0xB81F],
- ["83308B39",0xB820],
- ["83308C30",0xB821],
- ["83308C31",0xB822],
- ["83308C32",0xB823],
- ["83308C33",0xB824],
- ["83308C34",0xB825],
- ["83308C35",0xB826],
- ["83308C36",0xB827],
- ["83308C37",0xB828],
- ["83308C38",0xB829],
- ["83308C39",0xB82A],
- ["83308D30",0xB82B],
- ["83308D31",0xB82C],
- ["83308D32",0xB82D],
- ["83308D33",0xB82E],
- ["83308D34",0xB82F],
- ["83308D35",0xB830],
- ["83308D36",0xB831],
- ["83308D37",0xB832],
- ["83308D38",0xB833],
- ["83308D39",0xB834],
- ["83308E30",0xB835],
- ["83308E31",0xB836],
- ["83308E32",0xB837],
- ["83308E33",0xB838],
- ["83308E34",0xB839],
- ["83308E35",0xB83A],
- ["83308E36",0xB83B],
- ["83308E37",0xB83C],
- ["83308E38",0xB83D],
- ["83308E39",0xB83E],
- ["83308F30",0xB83F],
- ["83308F31",0xB840],
- ["83308F32",0xB841],
- ["83308F33",0xB842],
- ["83308F34",0xB843],
- ["83308F35",0xB844],
- ["83308F36",0xB845],
- ["83308F37",0xB846],
- ["83308F38",0xB847],
- ["83308F39",0xB848],
- ["83309030",0xB849],
- ["83309031",0xB84A],
- ["83309032",0xB84B],
- ["83309033",0xB84C],
- ["83309034",0xB84D],
- ["83309035",0xB84E],
- ["83309036",0xB84F],
- ["83309037",0xB850],
- ["83309038",0xB851],
- ["83309039",0xB852],
- ["83309130",0xB853],
- ["83309131",0xB854],
- ["83309132",0xB855],
- ["83309133",0xB856],
- ["83309134",0xB857],
- ["83309135",0xB858],
- ["83309136",0xB859],
- ["83309137",0xB85A],
- ["83309138",0xB85B],
- ["83309139",0xB85C],
- ["83309230",0xB85D],
- ["83309231",0xB85E],
- ["83309232",0xB85F],
- ["83309233",0xB860],
- ["83309234",0xB861],
- ["83309235",0xB862],
- ["83309236",0xB863],
- ["83309237",0xB864],
- ["83309238",0xB865],
- ["83309239",0xB866],
- ["83309330",0xB867],
- ["83309331",0xB868],
- ["83309332",0xB869],
- ["83309333",0xB86A],
- ["83309334",0xB86B],
- ["83309335",0xB86C],
- ["83309336",0xB86D],
- ["83309337",0xB86E],
- ["83309338",0xB86F],
- ["83309339",0xB870],
- ["83309430",0xB871],
- ["83309431",0xB872],
- ["83309432",0xB873],
- ["83309433",0xB874],
- ["83309434",0xB875],
- ["83309435",0xB876],
- ["83309436",0xB877],
- ["83309437",0xB878],
- ["83309438",0xB879],
- ["83309439",0xB87A],
- ["83309530",0xB87B],
- ["83309531",0xB87C],
- ["83309532",0xB87D],
- ["83309533",0xB87E],
- ["83309534",0xB87F],
- ["83309535",0xB880],
- ["83309536",0xB881],
- ["83309537",0xB882],
- ["83309538",0xB883],
- ["83309539",0xB884],
- ["83309630",0xB885],
- ["83309631",0xB886],
- ["83309632",0xB887],
- ["83309633",0xB888],
- ["83309634",0xB889],
- ["83309635",0xB88A],
- ["83309636",0xB88B],
- ["83309637",0xB88C],
- ["83309638",0xB88D],
- ["83309639",0xB88E],
- ["83309730",0xB88F],
- ["83309731",0xB890],
- ["83309732",0xB891],
- ["83309733",0xB892],
- ["83309734",0xB893],
- ["83309735",0xB894],
- ["83309736",0xB895],
- ["83309737",0xB896],
- ["83309738",0xB897],
- ["83309739",0xB898],
- ["83309830",0xB899],
- ["83309831",0xB89A],
- ["83309832",0xB89B],
- ["83309833",0xB89C],
- ["83309834",0xB89D],
- ["83309835",0xB89E],
- ["83309836",0xB89F],
- ["83309837",0xB8A0],
- ["83309838",0xB8A1],
- ["83309839",0xB8A2],
- ["83309930",0xB8A3],
- ["83309931",0xB8A4],
- ["83309932",0xB8A5],
- ["83309933",0xB8A6],
- ["83309934",0xB8A7],
- ["83309935",0xB8A8],
- ["83309936",0xB8A9],
- ["83309937",0xB8AA],
- ["83309938",0xB8AB],
- ["83309939",0xB8AC],
- ["83309A30",0xB8AD],
- ["83309A31",0xB8AE],
- ["83309A32",0xB8AF],
- ["83309A33",0xB8B0],
- ["83309A34",0xB8B1],
- ["83309A35",0xB8B2],
- ["83309A36",0xB8B3],
- ["83309A37",0xB8B4],
- ["83309A38",0xB8B5],
- ["83309A39",0xB8B6],
- ["83309B30",0xB8B7],
- ["83309B31",0xB8B8],
- ["83309B32",0xB8B9],
- ["83309B33",0xB8BA],
- ["83309B34",0xB8BB],
- ["83309B35",0xB8BC],
- ["83309B36",0xB8BD],
- ["83309B37",0xB8BE],
- ["83309B38",0xB8BF],
- ["83309B39",0xB8C0],
- ["83309C30",0xB8C1],
- ["83309C31",0xB8C2],
- ["83309C32",0xB8C3],
- ["83309C33",0xB8C4],
- ["83309C34",0xB8C5],
- ["83309C35",0xB8C6],
- ["83309C36",0xB8C7],
- ["83309C37",0xB8C8],
- ["83309C38",0xB8C9],
- ["83309C39",0xB8CA],
- ["83309D30",0xB8CB],
- ["83309D31",0xB8CC],
- ["83309D32",0xB8CD],
- ["83309D33",0xB8CE],
- ["83309D34",0xB8CF],
- ["83309D35",0xB8D0],
- ["83309D36",0xB8D1],
- ["83309D37",0xB8D2],
- ["83309D38",0xB8D3],
- ["83309D39",0xB8D4],
- ["83309E30",0xB8D5],
- ["83309E31",0xB8D6],
- ["83309E32",0xB8D7],
- ["83309E33",0xB8D8],
- ["83309E34",0xB8D9],
- ["83309E35",0xB8DA],
- ["83309E36",0xB8DB],
- ["83309E37",0xB8DC],
- ["83309E38",0xB8DD],
- ["83309E39",0xB8DE],
- ["83309F30",0xB8DF],
- ["83309F31",0xB8E0],
- ["83309F32",0xB8E1],
- ["83309F33",0xB8E2],
- ["83309F34",0xB8E3],
- ["83309F35",0xB8E4],
- ["83309F36",0xB8E5],
- ["83309F37",0xB8E6],
- ["83309F38",0xB8E7],
- ["83309F39",0xB8E8],
- ["8330A030",0xB8E9],
- ["8330A031",0xB8EA],
- ["8330A032",0xB8EB],
- ["8330A033",0xB8EC],
- ["8330A034",0xB8ED],
- ["8330A035",0xB8EE],
- ["8330A036",0xB8EF],
- ["8330A037",0xB8F0],
- ["8330A038",0xB8F1],
- ["8330A039",0xB8F2],
- ["8330A130",0xB8F3],
- ["8330A131",0xB8F4],
- ["8330A132",0xB8F5],
- ["8330A133",0xB8F6],
- ["8330A134",0xB8F7],
- ["8330A135",0xB8F8],
- ["8330A136",0xB8F9],
- ["8330A137",0xB8FA],
- ["8330A138",0xB8FB],
- ["8330A139",0xB8FC],
- ["8330A230",0xB8FD],
- ["8330A231",0xB8FE],
- ["8330A232",0xB8FF],
- ["8330A233",0xB900],
- ["8330A234",0xB901],
- ["8330A235",0xB902],
- ["8330A236",0xB903],
- ["8330A237",0xB904],
- ["8330A238",0xB905],
- ["8330A239",0xB906],
- ["8330A330",0xB907],
- ["8330A331",0xB908],
- ["8330A332",0xB909],
- ["8330A333",0xB90A],
- ["8330A334",0xB90B],
- ["8330A335",0xB90C],
- ["8330A336",0xB90D],
- ["8330A337",0xB90E],
- ["8330A338",0xB90F],
- ["8330A339",0xB910],
- ["8330A430",0xB911],
- ["8330A431",0xB912],
- ["8330A432",0xB913],
- ["8330A433",0xB914],
- ["8330A434",0xB915],
- ["8330A435",0xB916],
- ["8330A436",0xB917],
- ["8330A437",0xB918],
- ["8330A438",0xB919],
- ["8330A439",0xB91A],
- ["8330A530",0xB91B],
- ["8330A531",0xB91C],
- ["8330A532",0xB91D],
- ["8330A533",0xB91E],
- ["8330A534",0xB91F],
- ["8330A535",0xB920],
- ["8330A536",0xB921],
- ["8330A537",0xB922],
- ["8330A538",0xB923],
- ["8330A539",0xB924],
- ["8330A630",0xB925],
- ["8330A631",0xB926],
- ["8330A632",0xB927],
- ["8330A633",0xB928],
- ["8330A634",0xB929],
- ["8330A635",0xB92A],
- ["8330A636",0xB92B],
- ["8330A637",0xB92C],
- ["8330A638",0xB92D],
- ["8330A639",0xB92E],
- ["8330A730",0xB92F],
- ["8330A731",0xB930],
- ["8330A732",0xB931],
- ["8330A733",0xB932],
- ["8330A734",0xB933],
- ["8330A735",0xB934],
- ["8330A736",0xB935],
- ["8330A737",0xB936],
- ["8330A738",0xB937],
- ["8330A739",0xB938],
- ["8330A830",0xB939],
- ["8330A831",0xB93A],
- ["8330A832",0xB93B],
- ["8330A833",0xB93C],
- ["8330A834",0xB93D],
- ["8330A835",0xB93E],
- ["8330A836",0xB93F],
- ["8330A837",0xB940],
- ["8330A838",0xB941],
- ["8330A839",0xB942],
- ["8330A930",0xB943],
- ["8330A931",0xB944],
- ["8330A932",0xB945],
- ["8330A933",0xB946],
- ["8330A934",0xB947],
- ["8330A935",0xB948],
- ["8330A936",0xB949],
- ["8330A937",0xB94A],
- ["8330A938",0xB94B],
- ["8330A939",0xB94C],
- ["8330AA30",0xB94D],
- ["8330AA31",0xB94E],
- ["8330AA32",0xB94F],
- ["8330AA33",0xB950],
- ["8330AA34",0xB951],
- ["8330AA35",0xB952],
- ["8330AA36",0xB953],
- ["8330AA37",0xB954],
- ["8330AA38",0xB955],
- ["8330AA39",0xB956],
- ["8330AB30",0xB957],
- ["8330AB31",0xB958],
- ["8330AB32",0xB959],
- ["8330AB33",0xB95A],
- ["8330AB34",0xB95B],
- ["8330AB35",0xB95C],
- ["8330AB36",0xB95D],
- ["8330AB37",0xB95E],
- ["8330AB38",0xB95F],
- ["8330AB39",0xB960],
- ["8330AC30",0xB961],
- ["8330AC31",0xB962],
- ["8330AC32",0xB963],
- ["8330AC33",0xB964],
- ["8330AC34",0xB965],
- ["8330AC35",0xB966],
- ["8330AC36",0xB967],
- ["8330AC37",0xB968],
- ["8330AC38",0xB969],
- ["8330AC39",0xB96A],
- ["8330AD30",0xB96B],
- ["8330AD31",0xB96C],
- ["8330AD32",0xB96D],
- ["8330AD33",0xB96E],
- ["8330AD34",0xB96F],
- ["8330AD35",0xB970],
- ["8330AD36",0xB971],
- ["8330AD37",0xB972],
- ["8330AD38",0xB973],
- ["8330AD39",0xB974],
- ["8330AE30",0xB975],
- ["8330AE31",0xB976],
- ["8330AE32",0xB977],
- ["8330AE33",0xB978],
- ["8330AE34",0xB979],
- ["8330AE35",0xB97A],
- ["8330AE36",0xB97B],
- ["8330AE37",0xB97C],
- ["8330AE38",0xB97D],
- ["8330AE39",0xB97E],
- ["8330AF30",0xB97F],
- ["8330AF31",0xB980],
- ["8330AF32",0xB981],
- ["8330AF33",0xB982],
- ["8330AF34",0xB983],
- ["8330AF35",0xB984],
- ["8330AF36",0xB985],
- ["8330AF37",0xB986],
- ["8330AF38",0xB987],
- ["8330AF39",0xB988],
- ["8330B030",0xB989],
- ["8330B031",0xB98A],
- ["8330B032",0xB98B],
- ["8330B033",0xB98C],
- ["8330B034",0xB98D],
- ["8330B035",0xB98E],
- ["8330B036",0xB98F],
- ["8330B037",0xB990],
- ["8330B038",0xB991],
- ["8330B039",0xB992],
- ["8330B130",0xB993],
- ["8330B131",0xB994],
- ["8330B132",0xB995],
- ["8330B133",0xB996],
- ["8330B134",0xB997],
- ["8330B135",0xB998],
- ["8330B136",0xB999],
- ["8330B137",0xB99A],
- ["8330B138",0xB99B],
- ["8330B139",0xB99C],
- ["8330B230",0xB99D],
- ["8330B231",0xB99E],
- ["8330B232",0xB99F],
- ["8330B233",0xB9A0],
- ["8330B234",0xB9A1],
- ["8330B235",0xB9A2],
- ["8330B236",0xB9A3],
- ["8330B237",0xB9A4],
- ["8330B238",0xB9A5],
- ["8330B239",0xB9A6],
- ["8330B330",0xB9A7],
- ["8330B331",0xB9A8],
- ["8330B332",0xB9A9],
- ["8330B333",0xB9AA],
- ["8330B334",0xB9AB],
- ["8330B335",0xB9AC],
- ["8330B336",0xB9AD],
- ["8330B337",0xB9AE],
- ["8330B338",0xB9AF],
- ["8330B339",0xB9B0],
- ["8330B430",0xB9B1],
- ["8330B431",0xB9B2],
- ["8330B432",0xB9B3],
- ["8330B433",0xB9B4],
- ["8330B434",0xB9B5],
- ["8330B435",0xB9B6],
- ["8330B436",0xB9B7],
- ["8330B437",0xB9B8],
- ["8330B438",0xB9B9],
- ["8330B439",0xB9BA],
- ["8330B530",0xB9BB],
- ["8330B531",0xB9BC],
- ["8330B532",0xB9BD],
- ["8330B533",0xB9BE],
- ["8330B534",0xB9BF],
- ["8330B535",0xB9C0],
- ["8330B536",0xB9C1],
- ["8330B537",0xB9C2],
- ["8330B538",0xB9C3],
- ["8330B539",0xB9C4],
- ["8330B630",0xB9C5],
- ["8330B631",0xB9C6],
- ["8330B632",0xB9C7],
- ["8330B633",0xB9C8],
- ["8330B634",0xB9C9],
- ["8330B635",0xB9CA],
- ["8330B636",0xB9CB],
- ["8330B637",0xB9CC],
- ["8330B638",0xB9CD],
- ["8330B639",0xB9CE],
- ["8330B730",0xB9CF],
- ["8330B731",0xB9D0],
- ["8330B732",0xB9D1],
- ["8330B733",0xB9D2],
- ["8330B734",0xB9D3],
- ["8330B735",0xB9D4],
- ["8330B736",0xB9D5],
- ["8330B737",0xB9D6],
- ["8330B738",0xB9D7],
- ["8330B739",0xB9D8],
- ["8330B830",0xB9D9],
- ["8330B831",0xB9DA],
- ["8330B832",0xB9DB],
- ["8330B833",0xB9DC],
- ["8330B834",0xB9DD],
- ["8330B835",0xB9DE],
- ["8330B836",0xB9DF],
- ["8330B837",0xB9E0],
- ["8330B838",0xB9E1],
- ["8330B839",0xB9E2],
- ["8330B930",0xB9E3],
- ["8330B931",0xB9E4],
- ["8330B932",0xB9E5],
- ["8330B933",0xB9E6],
- ["8330B934",0xB9E7],
- ["8330B935",0xB9E8],
- ["8330B936",0xB9E9],
- ["8330B937",0xB9EA],
- ["8330B938",0xB9EB],
- ["8330B939",0xB9EC],
- ["8330BA30",0xB9ED],
- ["8330BA31",0xB9EE],
- ["8330BA32",0xB9EF],
- ["8330BA33",0xB9F0],
- ["8330BA34",0xB9F1],
- ["8330BA35",0xB9F2],
- ["8330BA36",0xB9F3],
- ["8330BA37",0xB9F4],
- ["8330BA38",0xB9F5],
- ["8330BA39",0xB9F6],
- ["8330BB30",0xB9F7],
- ["8330BB31",0xB9F8],
- ["8330BB32",0xB9F9],
- ["8330BB33",0xB9FA],
- ["8330BB34",0xB9FB],
- ["8330BB35",0xB9FC],
- ["8330BB36",0xB9FD],
- ["8330BB37",0xB9FE],
- ["8330BB38",0xB9FF],
- ["8330BB39",0xBA00],
- ["8330BC30",0xBA01],
- ["8330BC31",0xBA02],
- ["8330BC32",0xBA03],
- ["8330BC33",0xBA04],
- ["8330BC34",0xBA05],
- ["8330BC35",0xBA06],
- ["8330BC36",0xBA07],
- ["8330BC37",0xBA08],
- ["8330BC38",0xBA09],
- ["8330BC39",0xBA0A],
- ["8330BD30",0xBA0B],
- ["8330BD31",0xBA0C],
- ["8330BD32",0xBA0D],
- ["8330BD33",0xBA0E],
- ["8330BD34",0xBA0F],
- ["8330BD35",0xBA10],
- ["8330BD36",0xBA11],
- ["8330BD37",0xBA12],
- ["8330BD38",0xBA13],
- ["8330BD39",0xBA14],
- ["8330BE30",0xBA15],
- ["8330BE31",0xBA16],
- ["8330BE32",0xBA17],
- ["8330BE33",0xBA18],
- ["8330BE34",0xBA19],
- ["8330BE35",0xBA1A],
- ["8330BE36",0xBA1B],
- ["8330BE37",0xBA1C],
- ["8330BE38",0xBA1D],
- ["8330BE39",0xBA1E],
- ["8330BF30",0xBA1F],
- ["8330BF31",0xBA20],
- ["8330BF32",0xBA21],
- ["8330BF33",0xBA22],
- ["8330BF34",0xBA23],
- ["8330BF35",0xBA24],
- ["8330BF36",0xBA25],
- ["8330BF37",0xBA26],
- ["8330BF38",0xBA27],
- ["8330BF39",0xBA28],
- ["8330C030",0xBA29],
- ["8330C031",0xBA2A],
- ["8330C032",0xBA2B],
- ["8330C033",0xBA2C],
- ["8330C034",0xBA2D],
- ["8330C035",0xBA2E],
- ["8330C036",0xBA2F],
- ["8330C037",0xBA30],
- ["8330C038",0xBA31],
- ["8330C039",0xBA32],
- ["8330C130",0xBA33],
- ["8330C131",0xBA34],
- ["8330C132",0xBA35],
- ["8330C133",0xBA36],
- ["8330C134",0xBA37],
- ["8330C135",0xBA38],
- ["8330C136",0xBA39],
- ["8330C137",0xBA3A],
- ["8330C138",0xBA3B],
- ["8330C139",0xBA3C],
- ["8330C230",0xBA3D],
- ["8330C231",0xBA3E],
- ["8330C232",0xBA3F],
- ["8330C233",0xBA40],
- ["8330C234",0xBA41],
- ["8330C235",0xBA42],
- ["8330C236",0xBA43],
- ["8330C237",0xBA44],
- ["8330C238",0xBA45],
- ["8330C239",0xBA46],
- ["8330C330",0xBA47],
- ["8330C331",0xBA48],
- ["8330C332",0xBA49],
- ["8330C333",0xBA4A],
- ["8330C334",0xBA4B],
- ["8330C335",0xBA4C],
- ["8330C336",0xBA4D],
- ["8330C337",0xBA4E],
- ["8330C338",0xBA4F],
- ["8330C339",0xBA50],
- ["8330C430",0xBA51],
- ["8330C431",0xBA52],
- ["8330C432",0xBA53],
- ["8330C433",0xBA54],
- ["8330C434",0xBA55],
- ["8330C435",0xBA56],
- ["8330C436",0xBA57],
- ["8330C437",0xBA58],
- ["8330C438",0xBA59],
- ["8330C439",0xBA5A],
- ["8330C530",0xBA5B],
- ["8330C531",0xBA5C],
- ["8330C532",0xBA5D],
- ["8330C533",0xBA5E],
- ["8330C534",0xBA5F],
- ["8330C535",0xBA60],
- ["8330C536",0xBA61],
- ["8330C537",0xBA62],
- ["8330C538",0xBA63],
- ["8330C539",0xBA64],
- ["8330C630",0xBA65],
- ["8330C631",0xBA66],
- ["8330C632",0xBA67],
- ["8330C633",0xBA68],
- ["8330C634",0xBA69],
- ["8330C635",0xBA6A],
- ["8330C636",0xBA6B],
- ["8330C637",0xBA6C],
- ["8330C638",0xBA6D],
- ["8330C639",0xBA6E],
- ["8330C730",0xBA6F],
- ["8330C731",0xBA70],
- ["8330C732",0xBA71],
- ["8330C733",0xBA72],
- ["8330C734",0xBA73],
- ["8330C735",0xBA74],
- ["8330C736",0xBA75],
- ["8330C737",0xBA76],
- ["8330C738",0xBA77],
- ["8330C739",0xBA78],
- ["8330C830",0xBA79],
- ["8330C831",0xBA7A],
- ["8330C832",0xBA7B],
- ["8330C833",0xBA7C],
- ["8330C834",0xBA7D],
- ["8330C835",0xBA7E],
- ["8330C836",0xBA7F],
- ["8330C837",0xBA80],
- ["8330C838",0xBA81],
- ["8330C839",0xBA82],
- ["8330C930",0xBA83],
- ["8330C931",0xBA84],
- ["8330C932",0xBA85],
- ["8330C933",0xBA86],
- ["8330C934",0xBA87],
- ["8330C935",0xBA88],
- ["8330C936",0xBA89],
- ["8330C937",0xBA8A],
- ["8330C938",0xBA8B],
- ["8330C939",0xBA8C],
- ["8330CA30",0xBA8D],
- ["8330CA31",0xBA8E],
- ["8330CA32",0xBA8F],
- ["8330CA33",0xBA90],
- ["8330CA34",0xBA91],
- ["8330CA35",0xBA92],
- ["8330CA36",0xBA93],
- ["8330CA37",0xBA94],
- ["8330CA38",0xBA95],
- ["8330CA39",0xBA96],
- ["8330CB30",0xBA97],
- ["8330CB31",0xBA98],
- ["8330CB32",0xBA99],
- ["8330CB33",0xBA9A],
- ["8330CB34",0xBA9B],
- ["8330CB35",0xBA9C],
- ["8330CB36",0xBA9D],
- ["8330CB37",0xBA9E],
- ["8330CB38",0xBA9F],
- ["8330CB39",0xBAA0],
- ["8330CC30",0xBAA1],
- ["8330CC31",0xBAA2],
- ["8330CC32",0xBAA3],
- ["8330CC33",0xBAA4],
- ["8330CC34",0xBAA5],
- ["8330CC35",0xBAA6],
- ["8330CC36",0xBAA7],
- ["8330CC37",0xBAA8],
- ["8330CC38",0xBAA9],
- ["8330CC39",0xBAAA],
- ["8330CD30",0xBAAB],
- ["8330CD31",0xBAAC],
- ["8330CD32",0xBAAD],
- ["8330CD33",0xBAAE],
- ["8330CD34",0xBAAF],
- ["8330CD35",0xBAB0],
- ["8330CD36",0xBAB1],
- ["8330CD37",0xBAB2],
- ["8330CD38",0xBAB3],
- ["8330CD39",0xBAB4],
- ["8330CE30",0xBAB5],
- ["8330CE31",0xBAB6],
- ["8330CE32",0xBAB7],
- ["8330CE33",0xBAB8],
- ["8330CE34",0xBAB9],
- ["8330CE35",0xBABA],
- ["8330CE36",0xBABB],
- ["8330CE37",0xBABC],
- ["8330CE38",0xBABD],
- ["8330CE39",0xBABE],
- ["8330CF30",0xBABF],
- ["8330CF31",0xBAC0],
- ["8330CF32",0xBAC1],
- ["8330CF33",0xBAC2],
- ["8330CF34",0xBAC3],
- ["8330CF35",0xBAC4],
- ["8330CF36",0xBAC5],
- ["8330CF37",0xBAC6],
- ["8330CF38",0xBAC7],
- ["8330CF39",0xBAC8],
- ["8330D030",0xBAC9],
- ["8330D031",0xBACA],
- ["8330D032",0xBACB],
- ["8330D033",0xBACC],
- ["8330D034",0xBACD],
- ["8330D035",0xBACE],
- ["8330D036",0xBACF],
- ["8330D037",0xBAD0],
- ["8330D038",0xBAD1],
- ["8330D039",0xBAD2],
- ["8330D130",0xBAD3],
- ["8330D131",0xBAD4],
- ["8330D132",0xBAD5],
- ["8330D133",0xBAD6],
- ["8330D134",0xBAD7],
- ["8330D135",0xBAD8],
- ["8330D136",0xBAD9],
- ["8330D137",0xBADA],
- ["8330D138",0xBADB],
- ["8330D139",0xBADC],
- ["8330D230",0xBADD],
- ["8330D231",0xBADE],
- ["8330D232",0xBADF],
- ["8330D233",0xBAE0],
- ["8330D234",0xBAE1],
- ["8330D235",0xBAE2],
- ["8330D236",0xBAE3],
- ["8330D237",0xBAE4],
- ["8330D238",0xBAE5],
- ["8330D239",0xBAE6],
- ["8330D330",0xBAE7],
- ["8330D331",0xBAE8],
- ["8330D332",0xBAE9],
- ["8330D333",0xBAEA],
- ["8330D334",0xBAEB],
- ["8330D335",0xBAEC],
- ["8330D336",0xBAED],
- ["8330D337",0xBAEE],
- ["8330D338",0xBAEF],
- ["8330D339",0xBAF0],
- ["8330D430",0xBAF1],
- ["8330D431",0xBAF2],
- ["8330D432",0xBAF3],
- ["8330D433",0xBAF4],
- ["8330D434",0xBAF5],
- ["8330D435",0xBAF6],
- ["8330D436",0xBAF7],
- ["8330D437",0xBAF8],
- ["8330D438",0xBAF9],
- ["8330D439",0xBAFA],
- ["8330D530",0xBAFB],
- ["8330D531",0xBAFC],
- ["8330D532",0xBAFD],
- ["8330D533",0xBAFE],
- ["8330D534",0xBAFF],
- ["8330D535",0xBB00],
- ["8330D536",0xBB01],
- ["8330D537",0xBB02],
- ["8330D538",0xBB03],
- ["8330D539",0xBB04],
- ["8330D630",0xBB05],
- ["8330D631",0xBB06],
- ["8330D632",0xBB07],
- ["8330D633",0xBB08],
- ["8330D634",0xBB09],
- ["8330D635",0xBB0A],
- ["8330D636",0xBB0B],
- ["8330D637",0xBB0C],
- ["8330D638",0xBB0D],
- ["8330D639",0xBB0E],
- ["8330D730",0xBB0F],
- ["8330D731",0xBB10],
- ["8330D732",0xBB11],
- ["8330D733",0xBB12],
- ["8330D734",0xBB13],
- ["8330D735",0xBB14],
- ["8330D736",0xBB15],
- ["8330D737",0xBB16],
- ["8330D738",0xBB17],
- ["8330D739",0xBB18],
- ["8330D830",0xBB19],
- ["8330D831",0xBB1A],
- ["8330D832",0xBB1B],
- ["8330D833",0xBB1C],
- ["8330D834",0xBB1D],
- ["8330D835",0xBB1E],
- ["8330D836",0xBB1F],
- ["8330D837",0xBB20],
- ["8330D838",0xBB21],
- ["8330D839",0xBB22],
- ["8330D930",0xBB23],
- ["8330D931",0xBB24],
- ["8330D932",0xBB25],
- ["8330D933",0xBB26],
- ["8330D934",0xBB27],
- ["8330D935",0xBB28],
- ["8330D936",0xBB29],
- ["8330D937",0xBB2A],
- ["8330D938",0xBB2B],
- ["8330D939",0xBB2C],
- ["8330DA30",0xBB2D],
- ["8330DA31",0xBB2E],
- ["8330DA32",0xBB2F],
- ["8330DA33",0xBB30],
- ["8330DA34",0xBB31],
- ["8330DA35",0xBB32],
- ["8330DA36",0xBB33],
- ["8330DA37",0xBB34],
- ["8330DA38",0xBB35],
- ["8330DA39",0xBB36],
- ["8330DB30",0xBB37],
- ["8330DB31",0xBB38],
- ["8330DB32",0xBB39],
- ["8330DB33",0xBB3A],
- ["8330DB34",0xBB3B],
- ["8330DB35",0xBB3C],
- ["8330DB36",0xBB3D],
- ["8330DB37",0xBB3E],
- ["8330DB38",0xBB3F],
- ["8330DB39",0xBB40],
- ["8330DC30",0xBB41],
- ["8330DC31",0xBB42],
- ["8330DC32",0xBB43],
- ["8330DC33",0xBB44],
- ["8330DC34",0xBB45],
- ["8330DC35",0xBB46],
- ["8330DC36",0xBB47],
- ["8330DC37",0xBB48],
- ["8330DC38",0xBB49],
- ["8330DC39",0xBB4A],
- ["8330DD30",0xBB4B],
- ["8330DD31",0xBB4C],
- ["8330DD32",0xBB4D],
- ["8330DD33",0xBB4E],
- ["8330DD34",0xBB4F],
- ["8330DD35",0xBB50],
- ["8330DD36",0xBB51],
- ["8330DD37",0xBB52],
- ["8330DD38",0xBB53],
- ["8330DD39",0xBB54],
- ["8330DE30",0xBB55],
- ["8330DE31",0xBB56],
- ["8330DE32",0xBB57],
- ["8330DE33",0xBB58],
- ["8330DE34",0xBB59],
- ["8330DE35",0xBB5A],
- ["8330DE36",0xBB5B],
- ["8330DE37",0xBB5C],
- ["8330DE38",0xBB5D],
- ["8330DE39",0xBB5E],
- ["8330DF30",0xBB5F],
- ["8330DF31",0xBB60],
- ["8330DF32",0xBB61],
- ["8330DF33",0xBB62],
- ["8330DF34",0xBB63],
- ["8330DF35",0xBB64],
- ["8330DF36",0xBB65],
- ["8330DF37",0xBB66],
- ["8330DF38",0xBB67],
- ["8330DF39",0xBB68],
- ["8330E030",0xBB69],
- ["8330E031",0xBB6A],
- ["8330E032",0xBB6B],
- ["8330E033",0xBB6C],
- ["8330E034",0xBB6D],
- ["8330E035",0xBB6E],
- ["8330E036",0xBB6F],
- ["8330E037",0xBB70],
- ["8330E038",0xBB71],
- ["8330E039",0xBB72],
- ["8330E130",0xBB73],
- ["8330E131",0xBB74],
- ["8330E132",0xBB75],
- ["8330E133",0xBB76],
- ["8330E134",0xBB77],
- ["8330E135",0xBB78],
- ["8330E136",0xBB79],
- ["8330E137",0xBB7A],
- ["8330E138",0xBB7B],
- ["8330E139",0xBB7C],
- ["8330E230",0xBB7D],
- ["8330E231",0xBB7E],
- ["8330E232",0xBB7F],
- ["8330E233",0xBB80],
- ["8330E234",0xBB81],
- ["8330E235",0xBB82],
- ["8330E236",0xBB83],
- ["8330E237",0xBB84],
- ["8330E238",0xBB85],
- ["8330E239",0xBB86],
- ["8330E330",0xBB87],
- ["8330E331",0xBB88],
- ["8330E332",0xBB89],
- ["8330E333",0xBB8A],
- ["8330E334",0xBB8B],
- ["8330E335",0xBB8C],
- ["8330E336",0xBB8D],
- ["8330E337",0xBB8E],
- ["8330E338",0xBB8F],
- ["8330E339",0xBB90],
- ["8330E430",0xBB91],
- ["8330E431",0xBB92],
- ["8330E432",0xBB93],
- ["8330E433",0xBB94],
- ["8330E434",0xBB95],
- ["8330E435",0xBB96],
- ["8330E436",0xBB97],
- ["8330E437",0xBB98],
- ["8330E438",0xBB99],
- ["8330E439",0xBB9A],
- ["8330E530",0xBB9B],
- ["8330E531",0xBB9C],
- ["8330E532",0xBB9D],
- ["8330E533",0xBB9E],
- ["8330E534",0xBB9F],
- ["8330E535",0xBBA0],
- ["8330E536",0xBBA1],
- ["8330E537",0xBBA2],
- ["8330E538",0xBBA3],
- ["8330E539",0xBBA4],
- ["8330E630",0xBBA5],
- ["8330E631",0xBBA6],
- ["8330E632",0xBBA7],
- ["8330E633",0xBBA8],
- ["8330E634",0xBBA9],
- ["8330E635",0xBBAA],
- ["8330E636",0xBBAB],
- ["8330E637",0xBBAC],
- ["8330E638",0xBBAD],
- ["8330E639",0xBBAE],
- ["8330E730",0xBBAF],
- ["8330E731",0xBBB0],
- ["8330E732",0xBBB1],
- ["8330E733",0xBBB2],
- ["8330E734",0xBBB3],
- ["8330E735",0xBBB4],
- ["8330E736",0xBBB5],
- ["8330E737",0xBBB6],
- ["8330E738",0xBBB7],
- ["8330E739",0xBBB8],
- ["8330E830",0xBBB9],
- ["8330E831",0xBBBA],
- ["8330E832",0xBBBB],
- ["8330E833",0xBBBC],
- ["8330E834",0xBBBD],
- ["8330E835",0xBBBE],
- ["8330E836",0xBBBF],
- ["8330E837",0xBBC0],
- ["8330E838",0xBBC1],
- ["8330E839",0xBBC2],
- ["8330E930",0xBBC3],
- ["8330E931",0xBBC4],
- ["8330E932",0xBBC5],
- ["8330E933",0xBBC6],
- ["8330E934",0xBBC7],
- ["8330E935",0xBBC8],
- ["8330E936",0xBBC9],
- ["8330E937",0xBBCA],
- ["8330E938",0xBBCB],
- ["8330E939",0xBBCC],
- ["8330EA30",0xBBCD],
- ["8330EA31",0xBBCE],
- ["8330EA32",0xBBCF],
- ["8330EA33",0xBBD0],
- ["8330EA34",0xBBD1],
- ["8330EA35",0xBBD2],
- ["8330EA36",0xBBD3],
- ["8330EA37",0xBBD4],
- ["8330EA38",0xBBD5],
- ["8330EA39",0xBBD6],
- ["8330EB30",0xBBD7],
- ["8330EB31",0xBBD8],
- ["8330EB32",0xBBD9],
- ["8330EB33",0xBBDA],
- ["8330EB34",0xBBDB],
- ["8330EB35",0xBBDC],
- ["8330EB36",0xBBDD],
- ["8330EB37",0xBBDE],
- ["8330EB38",0xBBDF],
- ["8330EB39",0xBBE0],
- ["8330EC30",0xBBE1],
- ["8330EC31",0xBBE2],
- ["8330EC32",0xBBE3],
- ["8330EC33",0xBBE4],
- ["8330EC34",0xBBE5],
- ["8330EC35",0xBBE6],
- ["8330EC36",0xBBE7],
- ["8330EC37",0xBBE8],
- ["8330EC38",0xBBE9],
- ["8330EC39",0xBBEA],
- ["8330ED30",0xBBEB],
- ["8330ED31",0xBBEC],
- ["8330ED32",0xBBED],
- ["8330ED33",0xBBEE],
- ["8330ED34",0xBBEF],
- ["8330ED35",0xBBF0],
- ["8330ED36",0xBBF1],
- ["8330ED37",0xBBF2],
- ["8330ED38",0xBBF3],
- ["8330ED39",0xBBF4],
- ["8330EE30",0xBBF5],
- ["8330EE31",0xBBF6],
- ["8330EE32",0xBBF7],
- ["8330EE33",0xBBF8],
- ["8330EE34",0xBBF9],
- ["8330EE35",0xBBFA],
- ["8330EE36",0xBBFB],
- ["8330EE37",0xBBFC],
- ["8330EE38",0xBBFD],
- ["8330EE39",0xBBFE],
- ["8330EF30",0xBBFF],
- ["8330EF31",0xBC00],
- ["8330EF32",0xBC01],
- ["8330EF33",0xBC02],
- ["8330EF34",0xBC03],
- ["8330EF35",0xBC04],
- ["8330EF36",0xBC05],
- ["8330EF37",0xBC06],
- ["8330EF38",0xBC07],
- ["8330EF39",0xBC08],
- ["8330F030",0xBC09],
- ["8330F031",0xBC0A],
- ["8330F032",0xBC0B],
- ["8330F033",0xBC0C],
- ["8330F034",0xBC0D],
- ["8330F035",0xBC0E],
- ["8330F036",0xBC0F],
- ["8330F037",0xBC10],
- ["8330F038",0xBC11],
- ["8330F039",0xBC12],
- ["8330F130",0xBC13],
- ["8330F131",0xBC14],
- ["8330F132",0xBC15],
- ["8330F133",0xBC16],
- ["8330F134",0xBC17],
- ["8330F135",0xBC18],
- ["8330F136",0xBC19],
- ["8330F137",0xBC1A],
- ["8330F138",0xBC1B],
- ["8330F139",0xBC1C],
- ["8330F230",0xBC1D],
- ["8330F231",0xBC1E],
- ["8330F232",0xBC1F],
- ["8330F233",0xBC20],
- ["8330F234",0xBC21],
- ["8330F235",0xBC22],
- ["8330F236",0xBC23],
- ["8330F237",0xBC24],
- ["8330F238",0xBC25],
- ["8330F239",0xBC26],
- ["8330F330",0xBC27],
- ["8330F331",0xBC28],
- ["8330F332",0xBC29],
- ["8330F333",0xBC2A],
- ["8330F334",0xBC2B],
- ["8330F335",0xBC2C],
- ["8330F336",0xBC2D],
- ["8330F337",0xBC2E],
- ["8330F338",0xBC2F],
- ["8330F339",0xBC30],
- ["8330F430",0xBC31],
- ["8330F431",0xBC32],
- ["8330F432",0xBC33],
- ["8330F433",0xBC34],
- ["8330F434",0xBC35],
- ["8330F435",0xBC36],
- ["8330F436",0xBC37],
- ["8330F437",0xBC38],
- ["8330F438",0xBC39],
- ["8330F439",0xBC3A],
- ["8330F530",0xBC3B],
- ["8330F531",0xBC3C],
- ["8330F532",0xBC3D],
- ["8330F533",0xBC3E],
- ["8330F534",0xBC3F],
- ["8330F535",0xBC40],
- ["8330F536",0xBC41],
- ["8330F537",0xBC42],
- ["8330F538",0xBC43],
- ["8330F539",0xBC44],
- ["8330F630",0xBC45],
- ["8330F631",0xBC46],
- ["8330F632",0xBC47],
- ["8330F633",0xBC48],
- ["8330F634",0xBC49],
- ["8330F635",0xBC4A],
- ["8330F636",0xBC4B],
- ["8330F637",0xBC4C],
- ["8330F638",0xBC4D],
- ["8330F639",0xBC4E],
- ["8330F730",0xBC4F],
- ["8330F731",0xBC50],
- ["8330F732",0xBC51],
- ["8330F733",0xBC52],
- ["8330F734",0xBC53],
- ["8330F735",0xBC54],
- ["8330F736",0xBC55],
- ["8330F737",0xBC56],
- ["8330F738",0xBC57],
- ["8330F739",0xBC58],
- ["8330F830",0xBC59],
- ["8330F831",0xBC5A],
- ["8330F832",0xBC5B],
- ["8330F833",0xBC5C],
- ["8330F834",0xBC5D],
- ["8330F835",0xBC5E],
- ["8330F836",0xBC5F],
- ["8330F837",0xBC60],
- ["8330F838",0xBC61],
- ["8330F839",0xBC62],
- ["8330F930",0xBC63],
- ["8330F931",0xBC64],
- ["8330F932",0xBC65],
- ["8330F933",0xBC66],
- ["8330F934",0xBC67],
- ["8330F935",0xBC68],
- ["8330F936",0xBC69],
- ["8330F937",0xBC6A],
- ["8330F938",0xBC6B],
- ["8330F939",0xBC6C],
- ["8330FA30",0xBC6D],
- ["8330FA31",0xBC6E],
- ["8330FA32",0xBC6F],
- ["8330FA33",0xBC70],
- ["8330FA34",0xBC71],
- ["8330FA35",0xBC72],
- ["8330FA36",0xBC73],
- ["8330FA37",0xBC74],
- ["8330FA38",0xBC75],
- ["8330FA39",0xBC76],
- ["8330FB30",0xBC77],
- ["8330FB31",0xBC78],
- ["8330FB32",0xBC79],
- ["8330FB33",0xBC7A],
- ["8330FB34",0xBC7B],
- ["8330FB35",0xBC7C],
- ["8330FB36",0xBC7D],
- ["8330FB37",0xBC7E],
- ["8330FB38",0xBC7F],
- ["8330FB39",0xBC80],
- ["8330FC30",0xBC81],
- ["8330FC31",0xBC82],
- ["8330FC32",0xBC83],
- ["8330FC33",0xBC84],
- ["8330FC34",0xBC85],
- ["8330FC35",0xBC86],
- ["8330FC36",0xBC87],
- ["8330FC37",0xBC88],
- ["8330FC38",0xBC89],
- ["8330FC39",0xBC8A],
- ["8330FD30",0xBC8B],
- ["8330FD31",0xBC8C],
- ["8330FD32",0xBC8D],
- ["8330FD33",0xBC8E],
- ["8330FD34",0xBC8F],
- ["8330FD35",0xBC90],
- ["8330FD36",0xBC91],
- ["8330FD37",0xBC92],
- ["8330FD38",0xBC93],
- ["8330FD39",0xBC94],
- ["8330FE30",0xBC95],
- ["8330FE31",0xBC96],
- ["8330FE32",0xBC97],
- ["8330FE33",0xBC98],
- ["8330FE34",0xBC99],
- ["8330FE35",0xBC9A],
- ["8330FE36",0xBC9B],
- ["8330FE37",0xBC9C],
- ["8330FE38",0xBC9D],
- ["8330FE39",0xBC9E],
- ["83318130",0xBC9F],
- ["83318131",0xBCA0],
- ["83318132",0xBCA1],
- ["83318133",0xBCA2],
- ["83318134",0xBCA3],
- ["83318135",0xBCA4],
- ["83318136",0xBCA5],
- ["83318137",0xBCA6],
- ["83318138",0xBCA7],
- ["83318139",0xBCA8],
- ["83318230",0xBCA9],
- ["83318231",0xBCAA],
- ["83318232",0xBCAB],
- ["83318233",0xBCAC],
- ["83318234",0xBCAD],
- ["83318235",0xBCAE],
- ["83318236",0xBCAF],
- ["83318237",0xBCB0],
- ["83318238",0xBCB1],
- ["83318239",0xBCB2],
- ["83318330",0xBCB3],
- ["83318331",0xBCB4],
- ["83318332",0xBCB5],
- ["83318333",0xBCB6],
- ["83318334",0xBCB7],
- ["83318335",0xBCB8],
- ["83318336",0xBCB9],
- ["83318337",0xBCBA],
- ["83318338",0xBCBB],
- ["83318339",0xBCBC],
- ["83318430",0xBCBD],
- ["83318431",0xBCBE],
- ["83318432",0xBCBF],
- ["83318433",0xBCC0],
- ["83318434",0xBCC1],
- ["83318435",0xBCC2],
- ["83318436",0xBCC3],
- ["83318437",0xBCC4],
- ["83318438",0xBCC5],
- ["83318439",0xBCC6],
- ["83318530",0xBCC7],
- ["83318531",0xBCC8],
- ["83318532",0xBCC9],
- ["83318533",0xBCCA],
- ["83318534",0xBCCB],
- ["83318535",0xBCCC],
- ["83318536",0xBCCD],
- ["83318537",0xBCCE],
- ["83318538",0xBCCF],
- ["83318539",0xBCD0],
- ["83318630",0xBCD1],
- ["83318631",0xBCD2],
- ["83318632",0xBCD3],
- ["83318633",0xBCD4],
- ["83318634",0xBCD5],
- ["83318635",0xBCD6],
- ["83318636",0xBCD7],
- ["83318637",0xBCD8],
- ["83318638",0xBCD9],
- ["83318639",0xBCDA],
- ["83318730",0xBCDB],
- ["83318731",0xBCDC],
- ["83318732",0xBCDD],
- ["83318733",0xBCDE],
- ["83318734",0xBCDF],
- ["83318735",0xBCE0],
- ["83318736",0xBCE1],
- ["83318737",0xBCE2],
- ["83318738",0xBCE3],
- ["83318739",0xBCE4],
- ["83318830",0xBCE5],
- ["83318831",0xBCE6],
- ["83318832",0xBCE7],
- ["83318833",0xBCE8],
- ["83318834",0xBCE9],
- ["83318835",0xBCEA],
- ["83318836",0xBCEB],
- ["83318837",0xBCEC],
- ["83318838",0xBCED],
- ["83318839",0xBCEE],
- ["83318930",0xBCEF],
- ["83318931",0xBCF0],
- ["83318932",0xBCF1],
- ["83318933",0xBCF2],
- ["83318934",0xBCF3],
- ["83318935",0xBCF4],
- ["83318936",0xBCF5],
- ["83318937",0xBCF6],
- ["83318938",0xBCF7],
- ["83318939",0xBCF8],
- ["83318A30",0xBCF9],
- ["83318A31",0xBCFA],
- ["83318A32",0xBCFB],
- ["83318A33",0xBCFC],
- ["83318A34",0xBCFD],
- ["83318A35",0xBCFE],
- ["83318A36",0xBCFF],
- ["83318A37",0xBD00],
- ["83318A38",0xBD01],
- ["83318A39",0xBD02],
- ["83318B30",0xBD03],
- ["83318B31",0xBD04],
- ["83318B32",0xBD05],
- ["83318B33",0xBD06],
- ["83318B34",0xBD07],
- ["83318B35",0xBD08],
- ["83318B36",0xBD09],
- ["83318B37",0xBD0A],
- ["83318B38",0xBD0B],
- ["83318B39",0xBD0C],
- ["83318C30",0xBD0D],
- ["83318C31",0xBD0E],
- ["83318C32",0xBD0F],
- ["83318C33",0xBD10],
- ["83318C34",0xBD11],
- ["83318C35",0xBD12],
- ["83318C36",0xBD13],
- ["83318C37",0xBD14],
- ["83318C38",0xBD15],
- ["83318C39",0xBD16],
- ["83318D30",0xBD17],
- ["83318D31",0xBD18],
- ["83318D32",0xBD19],
- ["83318D33",0xBD1A],
- ["83318D34",0xBD1B],
- ["83318D35",0xBD1C],
- ["83318D36",0xBD1D],
- ["83318D37",0xBD1E],
- ["83318D38",0xBD1F],
- ["83318D39",0xBD20],
- ["83318E30",0xBD21],
- ["83318E31",0xBD22],
- ["83318E32",0xBD23],
- ["83318E33",0xBD24],
- ["83318E34",0xBD25],
- ["83318E35",0xBD26],
- ["83318E36",0xBD27],
- ["83318E37",0xBD28],
- ["83318E38",0xBD29],
- ["83318E39",0xBD2A],
- ["83318F30",0xBD2B],
- ["83318F31",0xBD2C],
- ["83318F32",0xBD2D],
- ["83318F33",0xBD2E],
- ["83318F34",0xBD2F],
- ["83318F35",0xBD30],
- ["83318F36",0xBD31],
- ["83318F37",0xBD32],
- ["83318F38",0xBD33],
- ["83318F39",0xBD34],
- ["83319030",0xBD35],
- ["83319031",0xBD36],
- ["83319032",0xBD37],
- ["83319033",0xBD38],
- ["83319034",0xBD39],
- ["83319035",0xBD3A],
- ["83319036",0xBD3B],
- ["83319037",0xBD3C],
- ["83319038",0xBD3D],
- ["83319039",0xBD3E],
- ["83319130",0xBD3F],
- ["83319131",0xBD40],
- ["83319132",0xBD41],
- ["83319133",0xBD42],
- ["83319134",0xBD43],
- ["83319135",0xBD44],
- ["83319136",0xBD45],
- ["83319137",0xBD46],
- ["83319138",0xBD47],
- ["83319139",0xBD48],
- ["83319230",0xBD49],
- ["83319231",0xBD4A],
- ["83319232",0xBD4B],
- ["83319233",0xBD4C],
- ["83319234",0xBD4D],
- ["83319235",0xBD4E],
- ["83319236",0xBD4F],
- ["83319237",0xBD50],
- ["83319238",0xBD51],
- ["83319239",0xBD52],
- ["83319330",0xBD53],
- ["83319331",0xBD54],
- ["83319332",0xBD55],
- ["83319333",0xBD56],
- ["83319334",0xBD57],
- ["83319335",0xBD58],
- ["83319336",0xBD59],
- ["83319337",0xBD5A],
- ["83319338",0xBD5B],
- ["83319339",0xBD5C],
- ["83319430",0xBD5D],
- ["83319431",0xBD5E],
- ["83319432",0xBD5F],
- ["83319433",0xBD60],
- ["83319434",0xBD61],
- ["83319435",0xBD62],
- ["83319436",0xBD63],
- ["83319437",0xBD64],
- ["83319438",0xBD65],
- ["83319439",0xBD66],
- ["83319530",0xBD67],
- ["83319531",0xBD68],
- ["83319532",0xBD69],
- ["83319533",0xBD6A],
- ["83319534",0xBD6B],
- ["83319535",0xBD6C],
- ["83319536",0xBD6D],
- ["83319537",0xBD6E],
- ["83319538",0xBD6F],
- ["83319539",0xBD70],
- ["83319630",0xBD71],
- ["83319631",0xBD72],
- ["83319632",0xBD73],
- ["83319633",0xBD74],
- ["83319634",0xBD75],
- ["83319635",0xBD76],
- ["83319636",0xBD77],
- ["83319637",0xBD78],
- ["83319638",0xBD79],
- ["83319639",0xBD7A],
- ["83319730",0xBD7B],
- ["83319731",0xBD7C],
- ["83319732",0xBD7D],
- ["83319733",0xBD7E],
- ["83319734",0xBD7F],
- ["83319735",0xBD80],
- ["83319736",0xBD81],
- ["83319737",0xBD82],
- ["83319738",0xBD83],
- ["83319739",0xBD84],
- ["83319830",0xBD85],
- ["83319831",0xBD86],
- ["83319832",0xBD87],
- ["83319833",0xBD88],
- ["83319834",0xBD89],
- ["83319835",0xBD8A],
- ["83319836",0xBD8B],
- ["83319837",0xBD8C],
- ["83319838",0xBD8D],
- ["83319839",0xBD8E],
- ["83319930",0xBD8F],
- ["83319931",0xBD90],
- ["83319932",0xBD91],
- ["83319933",0xBD92],
- ["83319934",0xBD93],
- ["83319935",0xBD94],
- ["83319936",0xBD95],
- ["83319937",0xBD96],
- ["83319938",0xBD97],
- ["83319939",0xBD98],
- ["83319A30",0xBD99],
- ["83319A31",0xBD9A],
- ["83319A32",0xBD9B],
- ["83319A33",0xBD9C],
- ["83319A34",0xBD9D],
- ["83319A35",0xBD9E],
- ["83319A36",0xBD9F],
- ["83319A37",0xBDA0],
- ["83319A38",0xBDA1],
- ["83319A39",0xBDA2],
- ["83319B30",0xBDA3],
- ["83319B31",0xBDA4],
- ["83319B32",0xBDA5],
- ["83319B33",0xBDA6],
- ["83319B34",0xBDA7],
- ["83319B35",0xBDA8],
- ["83319B36",0xBDA9],
- ["83319B37",0xBDAA],
- ["83319B38",0xBDAB],
- ["83319B39",0xBDAC],
- ["83319C30",0xBDAD],
- ["83319C31",0xBDAE],
- ["83319C32",0xBDAF],
- ["83319C33",0xBDB0],
- ["83319C34",0xBDB1],
- ["83319C35",0xBDB2],
- ["83319C36",0xBDB3],
- ["83319C37",0xBDB4],
- ["83319C38",0xBDB5],
- ["83319C39",0xBDB6],
- ["83319D30",0xBDB7],
- ["83319D31",0xBDB8],
- ["83319D32",0xBDB9],
- ["83319D33",0xBDBA],
- ["83319D34",0xBDBB],
- ["83319D35",0xBDBC],
- ["83319D36",0xBDBD],
- ["83319D37",0xBDBE],
- ["83319D38",0xBDBF],
- ["83319D39",0xBDC0],
- ["83319E30",0xBDC1],
- ["83319E31",0xBDC2],
- ["83319E32",0xBDC3],
- ["83319E33",0xBDC4],
- ["83319E34",0xBDC5],
- ["83319E35",0xBDC6],
- ["83319E36",0xBDC7],
- ["83319E37",0xBDC8],
- ["83319E38",0xBDC9],
- ["83319E39",0xBDCA],
- ["83319F30",0xBDCB],
- ["83319F31",0xBDCC],
- ["83319F32",0xBDCD],
- ["83319F33",0xBDCE],
- ["83319F34",0xBDCF],
- ["83319F35",0xBDD0],
- ["83319F36",0xBDD1],
- ["83319F37",0xBDD2],
- ["83319F38",0xBDD3],
- ["83319F39",0xBDD4],
- ["8331A030",0xBDD5],
- ["8331A031",0xBDD6],
- ["8331A032",0xBDD7],
- ["8331A033",0xBDD8],
- ["8331A034",0xBDD9],
- ["8331A035",0xBDDA],
- ["8331A036",0xBDDB],
- ["8331A037",0xBDDC],
- ["8331A038",0xBDDD],
- ["8331A039",0xBDDE],
- ["8331A130",0xBDDF],
- ["8331A131",0xBDE0],
- ["8331A132",0xBDE1],
- ["8331A133",0xBDE2],
- ["8331A134",0xBDE3],
- ["8331A135",0xBDE4],
- ["8331A136",0xBDE5],
- ["8331A137",0xBDE6],
- ["8331A138",0xBDE7],
- ["8331A139",0xBDE8],
- ["8331A230",0xBDE9],
- ["8331A231",0xBDEA],
- ["8331A232",0xBDEB],
- ["8331A233",0xBDEC],
- ["8331A234",0xBDED],
- ["8331A235",0xBDEE],
- ["8331A236",0xBDEF],
- ["8331A237",0xBDF0],
- ["8331A238",0xBDF1],
- ["8331A239",0xBDF2],
- ["8331A330",0xBDF3],
- ["8331A331",0xBDF4],
- ["8331A332",0xBDF5],
- ["8331A333",0xBDF6],
- ["8331A334",0xBDF7],
- ["8331A335",0xBDF8],
- ["8331A336",0xBDF9],
- ["8331A337",0xBDFA],
- ["8331A338",0xBDFB],
- ["8331A339",0xBDFC],
- ["8331A430",0xBDFD],
- ["8331A431",0xBDFE],
- ["8331A432",0xBDFF],
- ["8331A433",0xBE00],
- ["8331A434",0xBE01],
- ["8331A435",0xBE02],
- ["8331A436",0xBE03],
- ["8331A437",0xBE04],
- ["8331A438",0xBE05],
- ["8331A439",0xBE06],
- ["8331A530",0xBE07],
- ["8331A531",0xBE08],
- ["8331A532",0xBE09],
- ["8331A533",0xBE0A],
- ["8331A534",0xBE0B],
- ["8331A535",0xBE0C],
- ["8331A536",0xBE0D],
- ["8331A537",0xBE0E],
- ["8331A538",0xBE0F],
- ["8331A539",0xBE10],
- ["8331A630",0xBE11],
- ["8331A631",0xBE12],
- ["8331A632",0xBE13],
- ["8331A633",0xBE14],
- ["8331A634",0xBE15],
- ["8331A635",0xBE16],
- ["8331A636",0xBE17],
- ["8331A637",0xBE18],
- ["8331A638",0xBE19],
- ["8331A639",0xBE1A],
- ["8331A730",0xBE1B],
- ["8331A731",0xBE1C],
- ["8331A732",0xBE1D],
- ["8331A733",0xBE1E],
- ["8331A734",0xBE1F],
- ["8331A735",0xBE20],
- ["8331A736",0xBE21],
- ["8331A737",0xBE22],
- ["8331A738",0xBE23],
- ["8331A739",0xBE24],
- ["8331A830",0xBE25],
- ["8331A831",0xBE26],
- ["8331A832",0xBE27],
- ["8331A833",0xBE28],
- ["8331A834",0xBE29],
- ["8331A835",0xBE2A],
- ["8331A836",0xBE2B],
- ["8331A837",0xBE2C],
- ["8331A838",0xBE2D],
- ["8331A839",0xBE2E],
- ["8331A930",0xBE2F],
- ["8331A931",0xBE30],
- ["8331A932",0xBE31],
- ["8331A933",0xBE32],
- ["8331A934",0xBE33],
- ["8331A935",0xBE34],
- ["8331A936",0xBE35],
- ["8331A937",0xBE36],
- ["8331A938",0xBE37],
- ["8331A939",0xBE38],
- ["8331AA30",0xBE39],
- ["8331AA31",0xBE3A],
- ["8331AA32",0xBE3B],
- ["8331AA33",0xBE3C],
- ["8331AA34",0xBE3D],
- ["8331AA35",0xBE3E],
- ["8331AA36",0xBE3F],
- ["8331AA37",0xBE40],
- ["8331AA38",0xBE41],
- ["8331AA39",0xBE42],
- ["8331AB30",0xBE43],
- ["8331AB31",0xBE44],
- ["8331AB32",0xBE45],
- ["8331AB33",0xBE46],
- ["8331AB34",0xBE47],
- ["8331AB35",0xBE48],
- ["8331AB36",0xBE49],
- ["8331AB37",0xBE4A],
- ["8331AB38",0xBE4B],
- ["8331AB39",0xBE4C],
- ["8331AC30",0xBE4D],
- ["8331AC31",0xBE4E],
- ["8331AC32",0xBE4F],
- ["8331AC33",0xBE50],
- ["8331AC34",0xBE51],
- ["8331AC35",0xBE52],
- ["8331AC36",0xBE53],
- ["8331AC37",0xBE54],
- ["8331AC38",0xBE55],
- ["8331AC39",0xBE56],
- ["8331AD30",0xBE57],
- ["8331AD31",0xBE58],
- ["8331AD32",0xBE59],
- ["8331AD33",0xBE5A],
- ["8331AD34",0xBE5B],
- ["8331AD35",0xBE5C],
- ["8331AD36",0xBE5D],
- ["8331AD37",0xBE5E],
- ["8331AD38",0xBE5F],
- ["8331AD39",0xBE60],
- ["8331AE30",0xBE61],
- ["8331AE31",0xBE62],
- ["8331AE32",0xBE63],
- ["8331AE33",0xBE64],
- ["8331AE34",0xBE65],
- ["8331AE35",0xBE66],
- ["8331AE36",0xBE67],
- ["8331AE37",0xBE68],
- ["8331AE38",0xBE69],
- ["8331AE39",0xBE6A],
- ["8331AF30",0xBE6B],
- ["8331AF31",0xBE6C],
- ["8331AF32",0xBE6D],
- ["8331AF33",0xBE6E],
- ["8331AF34",0xBE6F],
- ["8331AF35",0xBE70],
- ["8331AF36",0xBE71],
- ["8331AF37",0xBE72],
- ["8331AF38",0xBE73],
- ["8331AF39",0xBE74],
- ["8331B030",0xBE75],
- ["8331B031",0xBE76],
- ["8331B032",0xBE77],
- ["8331B033",0xBE78],
- ["8331B034",0xBE79],
- ["8331B035",0xBE7A],
- ["8331B036",0xBE7B],
- ["8331B037",0xBE7C],
- ["8331B038",0xBE7D],
- ["8331B039",0xBE7E],
- ["8331B130",0xBE7F],
- ["8331B131",0xBE80],
- ["8331B132",0xBE81],
- ["8331B133",0xBE82],
- ["8331B134",0xBE83],
- ["8331B135",0xBE84],
- ["8331B136",0xBE85],
- ["8331B137",0xBE86],
- ["8331B138",0xBE87],
- ["8331B139",0xBE88],
- ["8331B230",0xBE89],
- ["8331B231",0xBE8A],
- ["8331B232",0xBE8B],
- ["8331B233",0xBE8C],
- ["8331B234",0xBE8D],
- ["8331B235",0xBE8E],
- ["8331B236",0xBE8F],
- ["8331B237",0xBE90],
- ["8331B238",0xBE91],
- ["8331B239",0xBE92],
- ["8331B330",0xBE93],
- ["8331B331",0xBE94],
- ["8331B332",0xBE95],
- ["8331B333",0xBE96],
- ["8331B334",0xBE97],
- ["8331B335",0xBE98],
- ["8331B336",0xBE99],
- ["8331B337",0xBE9A],
- ["8331B338",0xBE9B],
- ["8331B339",0xBE9C],
- ["8331B430",0xBE9D],
- ["8331B431",0xBE9E],
- ["8331B432",0xBE9F],
- ["8331B433",0xBEA0],
- ["8331B434",0xBEA1],
- ["8331B435",0xBEA2],
- ["8331B436",0xBEA3],
- ["8331B437",0xBEA4],
- ["8331B438",0xBEA5],
- ["8331B439",0xBEA6],
- ["8331B530",0xBEA7],
- ["8331B531",0xBEA8],
- ["8331B532",0xBEA9],
- ["8331B533",0xBEAA],
- ["8331B534",0xBEAB],
- ["8331B535",0xBEAC],
- ["8331B536",0xBEAD],
- ["8331B537",0xBEAE],
- ["8331B538",0xBEAF],
- ["8331B539",0xBEB0],
- ["8331B630",0xBEB1],
- ["8331B631",0xBEB2],
- ["8331B632",0xBEB3],
- ["8331B633",0xBEB4],
- ["8331B634",0xBEB5],
- ["8331B635",0xBEB6],
- ["8331B636",0xBEB7],
- ["8331B637",0xBEB8],
- ["8331B638",0xBEB9],
- ["8331B639",0xBEBA],
- ["8331B730",0xBEBB],
- ["8331B731",0xBEBC],
- ["8331B732",0xBEBD],
- ["8331B733",0xBEBE],
- ["8331B734",0xBEBF],
- ["8331B735",0xBEC0],
- ["8331B736",0xBEC1],
- ["8331B737",0xBEC2],
- ["8331B738",0xBEC3],
- ["8331B739",0xBEC4],
- ["8331B830",0xBEC5],
- ["8331B831",0xBEC6],
- ["8331B832",0xBEC7],
- ["8331B833",0xBEC8],
- ["8331B834",0xBEC9],
- ["8331B835",0xBECA],
- ["8331B836",0xBECB],
- ["8331B837",0xBECC],
- ["8331B838",0xBECD],
- ["8331B839",0xBECE],
- ["8331B930",0xBECF],
- ["8331B931",0xBED0],
- ["8331B932",0xBED1],
- ["8331B933",0xBED2],
- ["8331B934",0xBED3],
- ["8331B935",0xBED4],
- ["8331B936",0xBED5],
- ["8331B937",0xBED6],
- ["8331B938",0xBED7],
- ["8331B939",0xBED8],
- ["8331BA30",0xBED9],
- ["8331BA31",0xBEDA],
- ["8331BA32",0xBEDB],
- ["8331BA33",0xBEDC],
- ["8331BA34",0xBEDD],
- ["8331BA35",0xBEDE],
- ["8331BA36",0xBEDF],
- ["8331BA37",0xBEE0],
- ["8331BA38",0xBEE1],
- ["8331BA39",0xBEE2],
- ["8331BB30",0xBEE3],
- ["8331BB31",0xBEE4],
- ["8331BB32",0xBEE5],
- ["8331BB33",0xBEE6],
- ["8331BB34",0xBEE7],
- ["8331BB35",0xBEE8],
- ["8331BB36",0xBEE9],
- ["8331BB37",0xBEEA],
- ["8331BB38",0xBEEB],
- ["8331BB39",0xBEEC],
- ["8331BC30",0xBEED],
- ["8331BC31",0xBEEE],
- ["8331BC32",0xBEEF],
- ["8331BC33",0xBEF0],
- ["8331BC34",0xBEF1],
- ["8331BC35",0xBEF2],
- ["8331BC36",0xBEF3],
- ["8331BC37",0xBEF4],
- ["8331BC38",0xBEF5],
- ["8331BC39",0xBEF6],
- ["8331BD30",0xBEF7],
- ["8331BD31",0xBEF8],
- ["8331BD32",0xBEF9],
- ["8331BD33",0xBEFA],
- ["8331BD34",0xBEFB],
- ["8331BD35",0xBEFC],
- ["8331BD36",0xBEFD],
- ["8331BD37",0xBEFE],
- ["8331BD38",0xBEFF],
- ["8331BD39",0xBF00],
- ["8331BE30",0xBF01],
- ["8331BE31",0xBF02],
- ["8331BE32",0xBF03],
- ["8331BE33",0xBF04],
- ["8331BE34",0xBF05],
- ["8331BE35",0xBF06],
- ["8331BE36",0xBF07],
- ["8331BE37",0xBF08],
- ["8331BE38",0xBF09],
- ["8331BE39",0xBF0A],
- ["8331BF30",0xBF0B],
- ["8331BF31",0xBF0C],
- ["8331BF32",0xBF0D],
- ["8331BF33",0xBF0E],
- ["8331BF34",0xBF0F],
- ["8331BF35",0xBF10],
- ["8331BF36",0xBF11],
- ["8331BF37",0xBF12],
- ["8331BF38",0xBF13],
- ["8331BF39",0xBF14],
- ["8331C030",0xBF15],
- ["8331C031",0xBF16],
- ["8331C032",0xBF17],
- ["8331C033",0xBF18],
- ["8331C034",0xBF19],
- ["8331C035",0xBF1A],
- ["8331C036",0xBF1B],
- ["8331C037",0xBF1C],
- ["8331C038",0xBF1D],
- ["8331C039",0xBF1E],
- ["8331C130",0xBF1F],
- ["8331C131",0xBF20],
- ["8331C132",0xBF21],
- ["8331C133",0xBF22],
- ["8331C134",0xBF23],
- ["8331C135",0xBF24],
- ["8331C136",0xBF25],
- ["8331C137",0xBF26],
- ["8331C138",0xBF27],
- ["8331C139",0xBF28],
- ["8331C230",0xBF29],
- ["8331C231",0xBF2A],
- ["8331C232",0xBF2B],
- ["8331C233",0xBF2C],
- ["8331C234",0xBF2D],
- ["8331C235",0xBF2E],
- ["8331C236",0xBF2F],
- ["8331C237",0xBF30],
- ["8331C238",0xBF31],
- ["8331C239",0xBF32],
- ["8331C330",0xBF33],
- ["8331C331",0xBF34],
- ["8331C332",0xBF35],
- ["8331C333",0xBF36],
- ["8331C334",0xBF37],
- ["8331C335",0xBF38],
- ["8331C336",0xBF39],
- ["8331C337",0xBF3A],
- ["8331C338",0xBF3B],
- ["8331C339",0xBF3C],
- ["8331C430",0xBF3D],
- ["8331C431",0xBF3E],
- ["8331C432",0xBF3F],
- ["8331C433",0xBF40],
- ["8331C434",0xBF41],
- ["8331C435",0xBF42],
- ["8331C436",0xBF43],
- ["8331C437",0xBF44],
- ["8331C438",0xBF45],
- ["8331C439",0xBF46],
- ["8331C530",0xBF47],
- ["8331C531",0xBF48],
- ["8331C532",0xBF49],
- ["8331C533",0xBF4A],
- ["8331C534",0xBF4B],
- ["8331C535",0xBF4C],
- ["8331C536",0xBF4D],
- ["8331C537",0xBF4E],
- ["8331C538",0xBF4F],
- ["8331C539",0xBF50],
- ["8331C630",0xBF51],
- ["8331C631",0xBF52],
- ["8331C632",0xBF53],
- ["8331C633",0xBF54],
- ["8331C634",0xBF55],
- ["8331C635",0xBF56],
- ["8331C636",0xBF57],
- ["8331C637",0xBF58],
- ["8331C638",0xBF59],
- ["8331C639",0xBF5A],
- ["8331C730",0xBF5B],
- ["8331C731",0xBF5C],
- ["8331C732",0xBF5D],
- ["8331C733",0xBF5E],
- ["8331C734",0xBF5F],
- ["8331C735",0xBF60],
- ["8331C736",0xBF61],
- ["8331C737",0xBF62],
- ["8331C738",0xBF63],
- ["8331C739",0xBF64],
- ["8331C830",0xBF65],
- ["8331C831",0xBF66],
- ["8331C832",0xBF67],
- ["8331C833",0xBF68],
- ["8331C834",0xBF69],
- ["8331C835",0xBF6A],
- ["8331C836",0xBF6B],
- ["8331C837",0xBF6C],
- ["8331C838",0xBF6D],
- ["8331C839",0xBF6E],
- ["8331C930",0xBF6F],
- ["8331C931",0xBF70],
- ["8331C932",0xBF71],
- ["8331C933",0xBF72],
- ["8331C934",0xBF73],
- ["8331C935",0xBF74],
- ["8331C936",0xBF75],
- ["8331C937",0xBF76],
- ["8331C938",0xBF77],
- ["8331C939",0xBF78],
- ["8331CA30",0xBF79],
- ["8331CA31",0xBF7A],
- ["8331CA32",0xBF7B],
- ["8331CA33",0xBF7C],
- ["8331CA34",0xBF7D],
- ["8331CA35",0xBF7E],
- ["8331CA36",0xBF7F],
- ["8331CA37",0xBF80],
- ["8331CA38",0xBF81],
- ["8331CA39",0xBF82],
- ["8331CB30",0xBF83],
- ["8331CB31",0xBF84],
- ["8331CB32",0xBF85],
- ["8331CB33",0xBF86],
- ["8331CB34",0xBF87],
- ["8331CB35",0xBF88],
- ["8331CB36",0xBF89],
- ["8331CB37",0xBF8A],
- ["8331CB38",0xBF8B],
- ["8331CB39",0xBF8C],
- ["8331CC30",0xBF8D],
- ["8331CC31",0xBF8E],
- ["8331CC32",0xBF8F],
- ["8331CC33",0xBF90],
- ["8331CC34",0xBF91],
- ["8331CC35",0xBF92],
- ["8331CC36",0xBF93],
- ["8331CC37",0xBF94],
- ["8331CC38",0xBF95],
- ["8331CC39",0xBF96],
- ["8331CD30",0xBF97],
- ["8331CD31",0xBF98],
- ["8331CD32",0xBF99],
- ["8331CD33",0xBF9A],
- ["8331CD34",0xBF9B],
- ["8331CD35",0xBF9C],
- ["8331CD36",0xBF9D],
- ["8331CD37",0xBF9E],
- ["8331CD38",0xBF9F],
- ["8331CD39",0xBFA0],
- ["8331CE30",0xBFA1],
- ["8331CE31",0xBFA2],
- ["8331CE32",0xBFA3],
- ["8331CE33",0xBFA4],
- ["8331CE34",0xBFA5],
- ["8331CE35",0xBFA6],
- ["8331CE36",0xBFA7],
- ["8331CE37",0xBFA8],
- ["8331CE38",0xBFA9],
- ["8331CE39",0xBFAA],
- ["8331CF30",0xBFAB],
- ["8331CF31",0xBFAC],
- ["8331CF32",0xBFAD],
- ["8331CF33",0xBFAE],
- ["8331CF34",0xBFAF],
- ["8331CF35",0xBFB0],
- ["8331CF36",0xBFB1],
- ["8331CF37",0xBFB2],
- ["8331CF38",0xBFB3],
- ["8331CF39",0xBFB4],
- ["8331D030",0xBFB5],
- ["8331D031",0xBFB6],
- ["8331D032",0xBFB7],
- ["8331D033",0xBFB8],
- ["8331D034",0xBFB9],
- ["8331D035",0xBFBA],
- ["8331D036",0xBFBB],
- ["8331D037",0xBFBC],
- ["8331D038",0xBFBD],
- ["8331D039",0xBFBE],
- ["8331D130",0xBFBF],
- ["8331D131",0xBFC0],
- ["8331D132",0xBFC1],
- ["8331D133",0xBFC2],
- ["8331D134",0xBFC3],
- ["8331D135",0xBFC4],
- ["8331D136",0xBFC5],
- ["8331D137",0xBFC6],
- ["8331D138",0xBFC7],
- ["8331D139",0xBFC8],
- ["8331D230",0xBFC9],
- ["8331D231",0xBFCA],
- ["8331D232",0xBFCB],
- ["8331D233",0xBFCC],
- ["8331D234",0xBFCD],
- ["8331D235",0xBFCE],
- ["8331D236",0xBFCF],
- ["8331D237",0xBFD0],
- ["8331D238",0xBFD1],
- ["8331D239",0xBFD2],
- ["8331D330",0xBFD3],
- ["8331D331",0xBFD4],
- ["8331D332",0xBFD5],
- ["8331D333",0xBFD6],
- ["8331D334",0xBFD7],
- ["8331D335",0xBFD8],
- ["8331D336",0xBFD9],
- ["8331D337",0xBFDA],
- ["8331D338",0xBFDB],
- ["8331D339",0xBFDC],
- ["8331D430",0xBFDD],
- ["8331D431",0xBFDE],
- ["8331D432",0xBFDF],
- ["8331D433",0xBFE0],
- ["8331D434",0xBFE1],
- ["8331D435",0xBFE2],
- ["8331D436",0xBFE3],
- ["8331D437",0xBFE4],
- ["8331D438",0xBFE5],
- ["8331D439",0xBFE6],
- ["8331D530",0xBFE7],
- ["8331D531",0xBFE8],
- ["8331D532",0xBFE9],
- ["8331D533",0xBFEA],
- ["8331D534",0xBFEB],
- ["8331D535",0xBFEC],
- ["8331D536",0xBFED],
- ["8331D537",0xBFEE],
- ["8331D538",0xBFEF],
- ["8331D539",0xBFF0],
- ["8331D630",0xBFF1],
- ["8331D631",0xBFF2],
- ["8331D632",0xBFF3],
- ["8331D633",0xBFF4],
- ["8331D634",0xBFF5],
- ["8331D635",0xBFF6],
- ["8331D636",0xBFF7],
- ["8331D637",0xBFF8],
- ["8331D638",0xBFF9],
- ["8331D639",0xBFFA],
- ["8331D730",0xBFFB],
- ["8331D731",0xBFFC],
- ["8331D732",0xBFFD],
- ["8331D733",0xBFFE],
- ["8331D734",0xBFFF],
- ["8331D735",0xC000],
- ["8331D736",0xC001],
- ["8331D737",0xC002],
- ["8331D738",0xC003],
- ["8331D739",0xC004],
- ["8331D830",0xC005],
- ["8331D831",0xC006],
- ["8331D832",0xC007],
- ["8331D833",0xC008],
- ["8331D834",0xC009],
- ["8331D835",0xC00A],
- ["8331D836",0xC00B],
- ["8331D837",0xC00C],
- ["8331D838",0xC00D],
- ["8331D839",0xC00E],
- ["8331D930",0xC00F],
- ["8331D931",0xC010],
- ["8331D932",0xC011],
- ["8331D933",0xC012],
- ["8331D934",0xC013],
- ["8331D935",0xC014],
- ["8331D936",0xC015],
- ["8331D937",0xC016],
- ["8331D938",0xC017],
- ["8331D939",0xC018],
- ["8331DA30",0xC019],
- ["8331DA31",0xC01A],
- ["8331DA32",0xC01B],
- ["8331DA33",0xC01C],
- ["8331DA34",0xC01D],
- ["8331DA35",0xC01E],
- ["8331DA36",0xC01F],
- ["8331DA37",0xC020],
- ["8331DA38",0xC021],
- ["8331DA39",0xC022],
- ["8331DB30",0xC023],
- ["8331DB31",0xC024],
- ["8331DB32",0xC025],
- ["8331DB33",0xC026],
- ["8331DB34",0xC027],
- ["8331DB35",0xC028],
- ["8331DB36",0xC029],
- ["8331DB37",0xC02A],
- ["8331DB38",0xC02B],
- ["8331DB39",0xC02C],
- ["8331DC30",0xC02D],
- ["8331DC31",0xC02E],
- ["8331DC32",0xC02F],
- ["8331DC33",0xC030],
- ["8331DC34",0xC031],
- ["8331DC35",0xC032],
- ["8331DC36",0xC033],
- ["8331DC37",0xC034],
- ["8331DC38",0xC035],
- ["8331DC39",0xC036],
- ["8331DD30",0xC037],
- ["8331DD31",0xC038],
- ["8331DD32",0xC039],
- ["8331DD33",0xC03A],
- ["8331DD34",0xC03B],
- ["8331DD35",0xC03C],
- ["8331DD36",0xC03D],
- ["8331DD37",0xC03E],
- ["8331DD38",0xC03F],
- ["8331DD39",0xC040],
- ["8331DE30",0xC041],
- ["8331DE31",0xC042],
- ["8331DE32",0xC043],
- ["8331DE33",0xC044],
- ["8331DE34",0xC045],
- ["8331DE35",0xC046],
- ["8331DE36",0xC047],
- ["8331DE37",0xC048],
- ["8331DE38",0xC049],
- ["8331DE39",0xC04A],
- ["8331DF30",0xC04B],
- ["8331DF31",0xC04C],
- ["8331DF32",0xC04D],
- ["8331DF33",0xC04E],
- ["8331DF34",0xC04F],
- ["8331DF35",0xC050],
- ["8331DF36",0xC051],
- ["8331DF37",0xC052],
- ["8331DF38",0xC053],
- ["8331DF39",0xC054],
- ["8331E030",0xC055],
- ["8331E031",0xC056],
- ["8331E032",0xC057],
- ["8331E033",0xC058],
- ["8331E034",0xC059],
- ["8331E035",0xC05A],
- ["8331E036",0xC05B],
- ["8331E037",0xC05C],
- ["8331E038",0xC05D],
- ["8331E039",0xC05E],
- ["8331E130",0xC05F],
- ["8331E131",0xC060],
- ["8331E132",0xC061],
- ["8331E133",0xC062],
- ["8331E134",0xC063],
- ["8331E135",0xC064],
- ["8331E136",0xC065],
- ["8331E137",0xC066],
- ["8331E138",0xC067],
- ["8331E139",0xC068],
- ["8331E230",0xC069],
- ["8331E231",0xC06A],
- ["8331E232",0xC06B],
- ["8331E233",0xC06C],
- ["8331E234",0xC06D],
- ["8331E235",0xC06E],
- ["8331E236",0xC06F],
- ["8331E237",0xC070],
- ["8331E238",0xC071],
- ["8331E239",0xC072],
- ["8331E330",0xC073],
- ["8331E331",0xC074],
- ["8331E332",0xC075],
- ["8331E333",0xC076],
- ["8331E334",0xC077],
- ["8331E335",0xC078],
- ["8331E336",0xC079],
- ["8331E337",0xC07A],
- ["8331E338",0xC07B],
- ["8331E339",0xC07C],
- ["8331E430",0xC07D],
- ["8331E431",0xC07E],
- ["8331E432",0xC07F],
- ["8331E433",0xC080],
- ["8331E434",0xC081],
- ["8331E435",0xC082],
- ["8331E436",0xC083],
- ["8331E437",0xC084],
- ["8331E438",0xC085],
- ["8331E439",0xC086],
- ["8331E530",0xC087],
- ["8331E531",0xC088],
- ["8331E532",0xC089],
- ["8331E533",0xC08A],
- ["8331E534",0xC08B],
- ["8331E535",0xC08C],
- ["8331E536",0xC08D],
- ["8331E537",0xC08E],
- ["8331E538",0xC08F],
- ["8331E539",0xC090],
- ["8331E630",0xC091],
- ["8331E631",0xC092],
- ["8331E632",0xC093],
- ["8331E633",0xC094],
- ["8331E634",0xC095],
- ["8331E635",0xC096],
- ["8331E636",0xC097],
- ["8331E637",0xC098],
- ["8331E638",0xC099],
- ["8331E639",0xC09A],
- ["8331E730",0xC09B],
- ["8331E731",0xC09C],
- ["8331E732",0xC09D],
- ["8331E733",0xC09E],
- ["8331E734",0xC09F],
- ["8331E735",0xC0A0],
- ["8331E736",0xC0A1],
- ["8331E737",0xC0A2],
- ["8331E738",0xC0A3],
- ["8331E739",0xC0A4],
- ["8331E830",0xC0A5],
- ["8331E831",0xC0A6],
- ["8331E832",0xC0A7],
- ["8331E833",0xC0A8],
- ["8331E834",0xC0A9],
- ["8331E835",0xC0AA],
- ["8331E836",0xC0AB],
- ["8331E837",0xC0AC],
- ["8331E838",0xC0AD],
- ["8331E839",0xC0AE],
- ["8331E930",0xC0AF],
- ["8331E931",0xC0B0],
- ["8331E932",0xC0B1],
- ["8331E933",0xC0B2],
- ["8331E934",0xC0B3],
- ["8331E935",0xC0B4],
- ["8331E936",0xC0B5],
- ["8331E937",0xC0B6],
- ["8331E938",0xC0B7],
- ["8331E939",0xC0B8],
- ["8331EA30",0xC0B9],
- ["8331EA31",0xC0BA],
- ["8331EA32",0xC0BB],
- ["8331EA33",0xC0BC],
- ["8331EA34",0xC0BD],
- ["8331EA35",0xC0BE],
- ["8331EA36",0xC0BF],
- ["8331EA37",0xC0C0],
- ["8331EA38",0xC0C1],
- ["8331EA39",0xC0C2],
- ["8331EB30",0xC0C3],
- ["8331EB31",0xC0C4],
- ["8331EB32",0xC0C5],
- ["8331EB33",0xC0C6],
- ["8331EB34",0xC0C7],
- ["8331EB35",0xC0C8],
- ["8331EB36",0xC0C9],
- ["8331EB37",0xC0CA],
- ["8331EB38",0xC0CB],
- ["8331EB39",0xC0CC],
- ["8331EC30",0xC0CD],
- ["8331EC31",0xC0CE],
- ["8331EC32",0xC0CF],
- ["8331EC33",0xC0D0],
- ["8331EC34",0xC0D1],
- ["8331EC35",0xC0D2],
- ["8331EC36",0xC0D3],
- ["8331EC37",0xC0D4],
- ["8331EC38",0xC0D5],
- ["8331EC39",0xC0D6],
- ["8331ED30",0xC0D7],
- ["8331ED31",0xC0D8],
- ["8331ED32",0xC0D9],
- ["8331ED33",0xC0DA],
- ["8331ED34",0xC0DB],
- ["8331ED35",0xC0DC],
- ["8331ED36",0xC0DD],
- ["8331ED37",0xC0DE],
- ["8331ED38",0xC0DF],
- ["8331ED39",0xC0E0],
- ["8331EE30",0xC0E1],
- ["8331EE31",0xC0E2],
- ["8331EE32",0xC0E3],
- ["8331EE33",0xC0E4],
- ["8331EE34",0xC0E5],
- ["8331EE35",0xC0E6],
- ["8331EE36",0xC0E7],
- ["8331EE37",0xC0E8],
- ["8331EE38",0xC0E9],
- ["8331EE39",0xC0EA],
- ["8331EF30",0xC0EB],
- ["8331EF31",0xC0EC],
- ["8331EF32",0xC0ED],
- ["8331EF33",0xC0EE],
- ["8331EF34",0xC0EF],
- ["8331EF35",0xC0F0],
- ["8331EF36",0xC0F1],
- ["8331EF37",0xC0F2],
- ["8331EF38",0xC0F3],
- ["8331EF39",0xC0F4],
- ["8331F030",0xC0F5],
- ["8331F031",0xC0F6],
- ["8331F032",0xC0F7],
- ["8331F033",0xC0F8],
- ["8331F034",0xC0F9],
- ["8331F035",0xC0FA],
- ["8331F036",0xC0FB],
- ["8331F037",0xC0FC],
- ["8331F038",0xC0FD],
- ["8331F039",0xC0FE],
- ["8331F130",0xC0FF],
- ["8331F131",0xC100],
- ["8331F132",0xC101],
- ["8331F133",0xC102],
- ["8331F134",0xC103],
- ["8331F135",0xC104],
- ["8331F136",0xC105],
- ["8331F137",0xC106],
- ["8331F138",0xC107],
- ["8331F139",0xC108],
- ["8331F230",0xC109],
- ["8331F231",0xC10A],
- ["8331F232",0xC10B],
- ["8331F233",0xC10C],
- ["8331F234",0xC10D],
- ["8331F235",0xC10E],
- ["8331F236",0xC10F],
- ["8331F237",0xC110],
- ["8331F238",0xC111],
- ["8331F239",0xC112],
- ["8331F330",0xC113],
- ["8331F331",0xC114],
- ["8331F332",0xC115],
- ["8331F333",0xC116],
- ["8331F334",0xC117],
- ["8331F335",0xC118],
- ["8331F336",0xC119],
- ["8331F337",0xC11A],
- ["8331F338",0xC11B],
- ["8331F339",0xC11C],
- ["8331F430",0xC11D],
- ["8331F431",0xC11E],
- ["8331F432",0xC11F],
- ["8331F433",0xC120],
- ["8331F434",0xC121],
- ["8331F435",0xC122],
- ["8331F436",0xC123],
- ["8331F437",0xC124],
- ["8331F438",0xC125],
- ["8331F439",0xC126],
- ["8331F530",0xC127],
- ["8331F531",0xC128],
- ["8331F532",0xC129],
- ["8331F533",0xC12A],
- ["8331F534",0xC12B],
- ["8331F535",0xC12C],
- ["8331F536",0xC12D],
- ["8331F537",0xC12E],
- ["8331F538",0xC12F],
- ["8331F539",0xC130],
- ["8331F630",0xC131],
- ["8331F631",0xC132],
- ["8331F632",0xC133],
- ["8331F633",0xC134],
- ["8331F634",0xC135],
- ["8331F635",0xC136],
- ["8331F636",0xC137],
- ["8331F637",0xC138],
- ["8331F638",0xC139],
- ["8331F639",0xC13A],
- ["8331F730",0xC13B],
- ["8331F731",0xC13C],
- ["8331F732",0xC13D],
- ["8331F733",0xC13E],
- ["8331F734",0xC13F],
- ["8331F735",0xC140],
- ["8331F736",0xC141],
- ["8331F737",0xC142],
- ["8331F738",0xC143],
- ["8331F739",0xC144],
- ["8331F830",0xC145],
- ["8331F831",0xC146],
- ["8331F832",0xC147],
- ["8331F833",0xC148],
- ["8331F834",0xC149],
- ["8331F835",0xC14A],
- ["8331F836",0xC14B],
- ["8331F837",0xC14C],
- ["8331F838",0xC14D],
- ["8331F839",0xC14E],
- ["8331F930",0xC14F],
- ["8331F931",0xC150],
- ["8331F932",0xC151],
- ["8331F933",0xC152],
- ["8331F934",0xC153],
- ["8331F935",0xC154],
- ["8331F936",0xC155],
- ["8331F937",0xC156],
- ["8331F938",0xC157],
- ["8331F939",0xC158],
- ["8331FA30",0xC159],
- ["8331FA31",0xC15A],
- ["8331FA32",0xC15B],
- ["8331FA33",0xC15C],
- ["8331FA34",0xC15D],
- ["8331FA35",0xC15E],
- ["8331FA36",0xC15F],
- ["8331FA37",0xC160],
- ["8331FA38",0xC161],
- ["8331FA39",0xC162],
- ["8331FB30",0xC163],
- ["8331FB31",0xC164],
- ["8331FB32",0xC165],
- ["8331FB33",0xC166],
- ["8331FB34",0xC167],
- ["8331FB35",0xC168],
- ["8331FB36",0xC169],
- ["8331FB37",0xC16A],
- ["8331FB38",0xC16B],
- ["8331FB39",0xC16C],
- ["8331FC30",0xC16D],
- ["8331FC31",0xC16E],
- ["8331FC32",0xC16F],
- ["8331FC33",0xC170],
- ["8331FC34",0xC171],
- ["8331FC35",0xC172],
- ["8331FC36",0xC173],
- ["8331FC37",0xC174],
- ["8331FC38",0xC175],
- ["8331FC39",0xC176],
- ["8331FD30",0xC177],
- ["8331FD31",0xC178],
- ["8331FD32",0xC179],
- ["8331FD33",0xC17A],
- ["8331FD34",0xC17B],
- ["8331FD35",0xC17C],
- ["8331FD36",0xC17D],
- ["8331FD37",0xC17E],
- ["8331FD38",0xC17F],
- ["8331FD39",0xC180],
- ["8331FE30",0xC181],
- ["8331FE31",0xC182],
- ["8331FE32",0xC183],
- ["8331FE33",0xC184],
- ["8331FE34",0xC185],
- ["8331FE35",0xC186],
- ["8331FE36",0xC187],
- ["8331FE37",0xC188],
- ["8331FE38",0xC189],
- ["8331FE39",0xC18A],
- ["83328130",0xC18B],
- ["83328131",0xC18C],
- ["83328132",0xC18D],
- ["83328133",0xC18E],
- ["83328134",0xC18F],
- ["83328135",0xC190],
- ["83328136",0xC191],
- ["83328137",0xC192],
- ["83328138",0xC193],
- ["83328139",0xC194],
- ["83328230",0xC195],
- ["83328231",0xC196],
- ["83328232",0xC197],
- ["83328233",0xC198],
- ["83328234",0xC199],
- ["83328235",0xC19A],
- ["83328236",0xC19B],
- ["83328237",0xC19C],
- ["83328238",0xC19D],
- ["83328239",0xC19E],
- ["83328330",0xC19F],
- ["83328331",0xC1A0],
- ["83328332",0xC1A1],
- ["83328333",0xC1A2],
- ["83328334",0xC1A3],
- ["83328335",0xC1A4],
- ["83328336",0xC1A5],
- ["83328337",0xC1A6],
- ["83328338",0xC1A7],
- ["83328339",0xC1A8],
- ["83328430",0xC1A9],
- ["83328431",0xC1AA],
- ["83328432",0xC1AB],
- ["83328433",0xC1AC],
- ["83328434",0xC1AD],
- ["83328435",0xC1AE],
- ["83328436",0xC1AF],
- ["83328437",0xC1B0],
- ["83328438",0xC1B1],
- ["83328439",0xC1B2],
- ["83328530",0xC1B3],
- ["83328531",0xC1B4],
- ["83328532",0xC1B5],
- ["83328533",0xC1B6],
- ["83328534",0xC1B7],
- ["83328535",0xC1B8],
- ["83328536",0xC1B9],
- ["83328537",0xC1BA],
- ["83328538",0xC1BB],
- ["83328539",0xC1BC],
- ["83328630",0xC1BD],
- ["83328631",0xC1BE],
- ["83328632",0xC1BF],
- ["83328633",0xC1C0],
- ["83328634",0xC1C1],
- ["83328635",0xC1C2],
- ["83328636",0xC1C3],
- ["83328637",0xC1C4],
- ["83328638",0xC1C5],
- ["83328639",0xC1C6],
- ["83328730",0xC1C7],
- ["83328731",0xC1C8],
- ["83328732",0xC1C9],
- ["83328733",0xC1CA],
- ["83328734",0xC1CB],
- ["83328735",0xC1CC],
- ["83328736",0xC1CD],
- ["83328737",0xC1CE],
- ["83328738",0xC1CF],
- ["83328739",0xC1D0],
- ["83328830",0xC1D1],
- ["83328831",0xC1D2],
- ["83328832",0xC1D3],
- ["83328833",0xC1D4],
- ["83328834",0xC1D5],
- ["83328835",0xC1D6],
- ["83328836",0xC1D7],
- ["83328837",0xC1D8],
- ["83328838",0xC1D9],
- ["83328839",0xC1DA],
- ["83328930",0xC1DB],
- ["83328931",0xC1DC],
- ["83328932",0xC1DD],
- ["83328933",0xC1DE],
- ["83328934",0xC1DF],
- ["83328935",0xC1E0],
- ["83328936",0xC1E1],
- ["83328937",0xC1E2],
- ["83328938",0xC1E3],
- ["83328939",0xC1E4],
- ["83328A30",0xC1E5],
- ["83328A31",0xC1E6],
- ["83328A32",0xC1E7],
- ["83328A33",0xC1E8],
- ["83328A34",0xC1E9],
- ["83328A35",0xC1EA],
- ["83328A36",0xC1EB],
- ["83328A37",0xC1EC],
- ["83328A38",0xC1ED],
- ["83328A39",0xC1EE],
- ["83328B30",0xC1EF],
- ["83328B31",0xC1F0],
- ["83328B32",0xC1F1],
- ["83328B33",0xC1F2],
- ["83328B34",0xC1F3],
- ["83328B35",0xC1F4],
- ["83328B36",0xC1F5],
- ["83328B37",0xC1F6],
- ["83328B38",0xC1F7],
- ["83328B39",0xC1F8],
- ["83328C30",0xC1F9],
- ["83328C31",0xC1FA],
- ["83328C32",0xC1FB],
- ["83328C33",0xC1FC],
- ["83328C34",0xC1FD],
- ["83328C35",0xC1FE],
- ["83328C36",0xC1FF],
- ["83328C37",0xC200],
- ["83328C38",0xC201],
- ["83328C39",0xC202],
- ["83328D30",0xC203],
- ["83328D31",0xC204],
- ["83328D32",0xC205],
- ["83328D33",0xC206],
- ["83328D34",0xC207],
- ["83328D35",0xC208],
- ["83328D36",0xC209],
- ["83328D37",0xC20A],
- ["83328D38",0xC20B],
- ["83328D39",0xC20C],
- ["83328E30",0xC20D],
- ["83328E31",0xC20E],
- ["83328E32",0xC20F],
- ["83328E33",0xC210],
- ["83328E34",0xC211],
- ["83328E35",0xC212],
- ["83328E36",0xC213],
- ["83328E37",0xC214],
- ["83328E38",0xC215],
- ["83328E39",0xC216],
- ["83328F30",0xC217],
- ["83328F31",0xC218],
- ["83328F32",0xC219],
- ["83328F33",0xC21A],
- ["83328F34",0xC21B],
- ["83328F35",0xC21C],
- ["83328F36",0xC21D],
- ["83328F37",0xC21E],
- ["83328F38",0xC21F],
- ["83328F39",0xC220],
- ["83329030",0xC221],
- ["83329031",0xC222],
- ["83329032",0xC223],
- ["83329033",0xC224],
- ["83329034",0xC225],
- ["83329035",0xC226],
- ["83329036",0xC227],
- ["83329037",0xC228],
- ["83329038",0xC229],
- ["83329039",0xC22A],
- ["83329130",0xC22B],
- ["83329131",0xC22C],
- ["83329132",0xC22D],
- ["83329133",0xC22E],
- ["83329134",0xC22F],
- ["83329135",0xC230],
- ["83329136",0xC231],
- ["83329137",0xC232],
- ["83329138",0xC233],
- ["83329139",0xC234],
- ["83329230",0xC235],
- ["83329231",0xC236],
- ["83329232",0xC237],
- ["83329233",0xC238],
- ["83329234",0xC239],
- ["83329235",0xC23A],
- ["83329236",0xC23B],
- ["83329237",0xC23C],
- ["83329238",0xC23D],
- ["83329239",0xC23E],
- ["83329330",0xC23F],
- ["83329331",0xC240],
- ["83329332",0xC241],
- ["83329333",0xC242],
- ["83329334",0xC243],
- ["83329335",0xC244],
- ["83329336",0xC245],
- ["83329337",0xC246],
- ["83329338",0xC247],
- ["83329339",0xC248],
- ["83329430",0xC249],
- ["83329431",0xC24A],
- ["83329432",0xC24B],
- ["83329433",0xC24C],
- ["83329434",0xC24D],
- ["83329435",0xC24E],
- ["83329436",0xC24F],
- ["83329437",0xC250],
- ["83329438",0xC251],
- ["83329439",0xC252],
- ["83329530",0xC253],
- ["83329531",0xC254],
- ["83329532",0xC255],
- ["83329533",0xC256],
- ["83329534",0xC257],
- ["83329535",0xC258],
- ["83329536",0xC259],
- ["83329537",0xC25A],
- ["83329538",0xC25B],
- ["83329539",0xC25C],
- ["83329630",0xC25D],
- ["83329631",0xC25E],
- ["83329632",0xC25F],
- ["83329633",0xC260],
- ["83329634",0xC261],
- ["83329635",0xC262],
- ["83329636",0xC263],
- ["83329637",0xC264],
- ["83329638",0xC265],
- ["83329639",0xC266],
- ["83329730",0xC267],
- ["83329731",0xC268],
- ["83329732",0xC269],
- ["83329733",0xC26A],
- ["83329734",0xC26B],
- ["83329735",0xC26C],
- ["83329736",0xC26D],
- ["83329737",0xC26E],
- ["83329738",0xC26F],
- ["83329739",0xC270],
- ["83329830",0xC271],
- ["83329831",0xC272],
- ["83329832",0xC273],
- ["83329833",0xC274],
- ["83329834",0xC275],
- ["83329835",0xC276],
- ["83329836",0xC277],
- ["83329837",0xC278],
- ["83329838",0xC279],
- ["83329839",0xC27A],
- ["83329930",0xC27B],
- ["83329931",0xC27C],
- ["83329932",0xC27D],
- ["83329933",0xC27E],
- ["83329934",0xC27F],
- ["83329935",0xC280],
- ["83329936",0xC281],
- ["83329937",0xC282],
- ["83329938",0xC283],
- ["83329939",0xC284],
- ["83329A30",0xC285],
- ["83329A31",0xC286],
- ["83329A32",0xC287],
- ["83329A33",0xC288],
- ["83329A34",0xC289],
- ["83329A35",0xC28A],
- ["83329A36",0xC28B],
- ["83329A37",0xC28C],
- ["83329A38",0xC28D],
- ["83329A39",0xC28E],
- ["83329B30",0xC28F],
- ["83329B31",0xC290],
- ["83329B32",0xC291],
- ["83329B33",0xC292],
- ["83329B34",0xC293],
- ["83329B35",0xC294],
- ["83329B36",0xC295],
- ["83329B37",0xC296],
- ["83329B38",0xC297],
- ["83329B39",0xC298],
- ["83329C30",0xC299],
- ["83329C31",0xC29A],
- ["83329C32",0xC29B],
- ["83329C33",0xC29C],
- ["83329C34",0xC29D],
- ["83329C35",0xC29E],
- ["83329C36",0xC29F],
- ["83329C37",0xC2A0],
- ["83329C38",0xC2A1],
- ["83329C39",0xC2A2],
- ["83329D30",0xC2A3],
- ["83329D31",0xC2A4],
- ["83329D32",0xC2A5],
- ["83329D33",0xC2A6],
- ["83329D34",0xC2A7],
- ["83329D35",0xC2A8],
- ["83329D36",0xC2A9],
- ["83329D37",0xC2AA],
- ["83329D38",0xC2AB],
- ["83329D39",0xC2AC],
- ["83329E30",0xC2AD],
- ["83329E31",0xC2AE],
- ["83329E32",0xC2AF],
- ["83329E33",0xC2B0],
- ["83329E34",0xC2B1],
- ["83329E35",0xC2B2],
- ["83329E36",0xC2B3],
- ["83329E37",0xC2B4],
- ["83329E38",0xC2B5],
- ["83329E39",0xC2B6],
- ["83329F30",0xC2B7],
- ["83329F31",0xC2B8],
- ["83329F32",0xC2B9],
- ["83329F33",0xC2BA],
- ["83329F34",0xC2BB],
- ["83329F35",0xC2BC],
- ["83329F36",0xC2BD],
- ["83329F37",0xC2BE],
- ["83329F38",0xC2BF],
- ["83329F39",0xC2C0],
- ["8332A030",0xC2C1],
- ["8332A031",0xC2C2],
- ["8332A032",0xC2C3],
- ["8332A033",0xC2C4],
- ["8332A034",0xC2C5],
- ["8332A035",0xC2C6],
- ["8332A036",0xC2C7],
- ["8332A037",0xC2C8],
- ["8332A038",0xC2C9],
- ["8332A039",0xC2CA],
- ["8332A130",0xC2CB],
- ["8332A131",0xC2CC],
- ["8332A132",0xC2CD],
- ["8332A133",0xC2CE],
- ["8332A134",0xC2CF],
- ["8332A135",0xC2D0],
- ["8332A136",0xC2D1],
- ["8332A137",0xC2D2],
- ["8332A138",0xC2D3],
- ["8332A139",0xC2D4],
- ["8332A230",0xC2D5],
- ["8332A231",0xC2D6],
- ["8332A232",0xC2D7],
- ["8332A233",0xC2D8],
- ["8332A234",0xC2D9],
- ["8332A235",0xC2DA],
- ["8332A236",0xC2DB],
- ["8332A237",0xC2DC],
- ["8332A238",0xC2DD],
- ["8332A239",0xC2DE],
- ["8332A330",0xC2DF],
- ["8332A331",0xC2E0],
- ["8332A332",0xC2E1],
- ["8332A333",0xC2E2],
- ["8332A334",0xC2E3],
- ["8332A335",0xC2E4],
- ["8332A336",0xC2E5],
- ["8332A337",0xC2E6],
- ["8332A338",0xC2E7],
- ["8332A339",0xC2E8],
- ["8332A430",0xC2E9],
- ["8332A431",0xC2EA],
- ["8332A432",0xC2EB],
- ["8332A433",0xC2EC],
- ["8332A434",0xC2ED],
- ["8332A435",0xC2EE],
- ["8332A436",0xC2EF],
- ["8332A437",0xC2F0],
- ["8332A438",0xC2F1],
- ["8332A439",0xC2F2],
- ["8332A530",0xC2F3],
- ["8332A531",0xC2F4],
- ["8332A532",0xC2F5],
- ["8332A533",0xC2F6],
- ["8332A534",0xC2F7],
- ["8332A535",0xC2F8],
- ["8332A536",0xC2F9],
- ["8332A537",0xC2FA],
- ["8332A538",0xC2FB],
- ["8332A539",0xC2FC],
- ["8332A630",0xC2FD],
- ["8332A631",0xC2FE],
- ["8332A632",0xC2FF],
- ["8332A633",0xC300],
- ["8332A634",0xC301],
- ["8332A635",0xC302],
- ["8332A636",0xC303],
- ["8332A637",0xC304],
- ["8332A638",0xC305],
- ["8332A639",0xC306],
- ["8332A730",0xC307],
- ["8332A731",0xC308],
- ["8332A732",0xC309],
- ["8332A733",0xC30A],
- ["8332A734",0xC30B],
- ["8332A735",0xC30C],
- ["8332A736",0xC30D],
- ["8332A737",0xC30E],
- ["8332A738",0xC30F],
- ["8332A739",0xC310],
- ["8332A830",0xC311],
- ["8332A831",0xC312],
- ["8332A832",0xC313],
- ["8332A833",0xC314],
- ["8332A834",0xC315],
- ["8332A835",0xC316],
- ["8332A836",0xC317],
- ["8332A837",0xC318],
- ["8332A838",0xC319],
- ["8332A839",0xC31A],
- ["8332A930",0xC31B],
- ["8332A931",0xC31C],
- ["8332A932",0xC31D],
- ["8332A933",0xC31E],
- ["8332A934",0xC31F],
- ["8332A935",0xC320],
- ["8332A936",0xC321],
- ["8332A937",0xC322],
- ["8332A938",0xC323],
- ["8332A939",0xC324],
- ["8332AA30",0xC325],
- ["8332AA31",0xC326],
- ["8332AA32",0xC327],
- ["8332AA33",0xC328],
- ["8332AA34",0xC329],
- ["8332AA35",0xC32A],
- ["8332AA36",0xC32B],
- ["8332AA37",0xC32C],
- ["8332AA38",0xC32D],
- ["8332AA39",0xC32E],
- ["8332AB30",0xC32F],
- ["8332AB31",0xC330],
- ["8332AB32",0xC331],
- ["8332AB33",0xC332],
- ["8332AB34",0xC333],
- ["8332AB35",0xC334],
- ["8332AB36",0xC335],
- ["8332AB37",0xC336],
- ["8332AB38",0xC337],
- ["8332AB39",0xC338],
- ["8332AC30",0xC339],
- ["8332AC31",0xC33A],
- ["8332AC32",0xC33B],
- ["8332AC33",0xC33C],
- ["8332AC34",0xC33D],
- ["8332AC35",0xC33E],
- ["8332AC36",0xC33F],
- ["8332AC37",0xC340],
- ["8332AC38",0xC341],
- ["8332AC39",0xC342],
- ["8332AD30",0xC343],
- ["8332AD31",0xC344],
- ["8332AD32",0xC345],
- ["8332AD33",0xC346],
- ["8332AD34",0xC347],
- ["8332AD35",0xC348],
- ["8332AD36",0xC349],
- ["8332AD37",0xC34A],
- ["8332AD38",0xC34B],
- ["8332AD39",0xC34C],
- ["8332AE30",0xC34D],
- ["8332AE31",0xC34E],
- ["8332AE32",0xC34F],
- ["8332AE33",0xC350],
- ["8332AE34",0xC351],
- ["8332AE35",0xC352],
- ["8332AE36",0xC353],
- ["8332AE37",0xC354],
- ["8332AE38",0xC355],
- ["8332AE39",0xC356],
- ["8332AF30",0xC357],
- ["8332AF31",0xC358],
- ["8332AF32",0xC359],
- ["8332AF33",0xC35A],
- ["8332AF34",0xC35B],
- ["8332AF35",0xC35C],
- ["8332AF36",0xC35D],
- ["8332AF37",0xC35E],
- ["8332AF38",0xC35F],
- ["8332AF39",0xC360],
- ["8332B030",0xC361],
- ["8332B031",0xC362],
- ["8332B032",0xC363],
- ["8332B033",0xC364],
- ["8332B034",0xC365],
- ["8332B035",0xC366],
- ["8332B036",0xC367],
- ["8332B037",0xC368],
- ["8332B038",0xC369],
- ["8332B039",0xC36A],
- ["8332B130",0xC36B],
- ["8332B131",0xC36C],
- ["8332B132",0xC36D],
- ["8332B133",0xC36E],
- ["8332B134",0xC36F],
- ["8332B135",0xC370],
- ["8332B136",0xC371],
- ["8332B137",0xC372],
- ["8332B138",0xC373],
- ["8332B139",0xC374],
- ["8332B230",0xC375],
- ["8332B231",0xC376],
- ["8332B232",0xC377],
- ["8332B233",0xC378],
- ["8332B234",0xC379],
- ["8332B235",0xC37A],
- ["8332B236",0xC37B],
- ["8332B237",0xC37C],
- ["8332B238",0xC37D],
- ["8332B239",0xC37E],
- ["8332B330",0xC37F],
- ["8332B331",0xC380],
- ["8332B332",0xC381],
- ["8332B333",0xC382],
- ["8332B334",0xC383],
- ["8332B335",0xC384],
- ["8332B336",0xC385],
- ["8332B337",0xC386],
- ["8332B338",0xC387],
- ["8332B339",0xC388],
- ["8332B430",0xC389],
- ["8332B431",0xC38A],
- ["8332B432",0xC38B],
- ["8332B433",0xC38C],
- ["8332B434",0xC38D],
- ["8332B435",0xC38E],
- ["8332B436",0xC38F],
- ["8332B437",0xC390],
- ["8332B438",0xC391],
- ["8332B439",0xC392],
- ["8332B530",0xC393],
- ["8332B531",0xC394],
- ["8332B532",0xC395],
- ["8332B533",0xC396],
- ["8332B534",0xC397],
- ["8332B535",0xC398],
- ["8332B536",0xC399],
- ["8332B537",0xC39A],
- ["8332B538",0xC39B],
- ["8332B539",0xC39C],
- ["8332B630",0xC39D],
- ["8332B631",0xC39E],
- ["8332B632",0xC39F],
- ["8332B633",0xC3A0],
- ["8332B634",0xC3A1],
- ["8332B635",0xC3A2],
- ["8332B636",0xC3A3],
- ["8332B637",0xC3A4],
- ["8332B638",0xC3A5],
- ["8332B639",0xC3A6],
- ["8332B730",0xC3A7],
- ["8332B731",0xC3A8],
- ["8332B732",0xC3A9],
- ["8332B733",0xC3AA],
- ["8332B734",0xC3AB],
- ["8332B735",0xC3AC],
- ["8332B736",0xC3AD],
- ["8332B737",0xC3AE],
- ["8332B738",0xC3AF],
- ["8332B739",0xC3B0],
- ["8332B830",0xC3B1],
- ["8332B831",0xC3B2],
- ["8332B832",0xC3B3],
- ["8332B833",0xC3B4],
- ["8332B834",0xC3B5],
- ["8332B835",0xC3B6],
- ["8332B836",0xC3B7],
- ["8332B837",0xC3B8],
- ["8332B838",0xC3B9],
- ["8332B839",0xC3BA],
- ["8332B930",0xC3BB],
- ["8332B931",0xC3BC],
- ["8332B932",0xC3BD],
- ["8332B933",0xC3BE],
- ["8332B934",0xC3BF],
- ["8332B935",0xC3C0],
- ["8332B936",0xC3C1],
- ["8332B937",0xC3C2],
- ["8332B938",0xC3C3],
- ["8332B939",0xC3C4],
- ["8332BA30",0xC3C5],
- ["8332BA31",0xC3C6],
- ["8332BA32",0xC3C7],
- ["8332BA33",0xC3C8],
- ["8332BA34",0xC3C9],
- ["8332BA35",0xC3CA],
- ["8332BA36",0xC3CB],
- ["8332BA37",0xC3CC],
- ["8332BA38",0xC3CD],
- ["8332BA39",0xC3CE],
- ["8332BB30",0xC3CF],
- ["8332BB31",0xC3D0],
- ["8332BB32",0xC3D1],
- ["8332BB33",0xC3D2],
- ["8332BB34",0xC3D3],
- ["8332BB35",0xC3D4],
- ["8332BB36",0xC3D5],
- ["8332BB37",0xC3D6],
- ["8332BB38",0xC3D7],
- ["8332BB39",0xC3D8],
- ["8332BC30",0xC3D9],
- ["8332BC31",0xC3DA],
- ["8332BC32",0xC3DB],
- ["8332BC33",0xC3DC],
- ["8332BC34",0xC3DD],
- ["8332BC35",0xC3DE],
- ["8332BC36",0xC3DF],
- ["8332BC37",0xC3E0],
- ["8332BC38",0xC3E1],
- ["8332BC39",0xC3E2],
- ["8332BD30",0xC3E3],
- ["8332BD31",0xC3E4],
- ["8332BD32",0xC3E5],
- ["8332BD33",0xC3E6],
- ["8332BD34",0xC3E7],
- ["8332BD35",0xC3E8],
- ["8332BD36",0xC3E9],
- ["8332BD37",0xC3EA],
- ["8332BD38",0xC3EB],
- ["8332BD39",0xC3EC],
- ["8332BE30",0xC3ED],
- ["8332BE31",0xC3EE],
- ["8332BE32",0xC3EF],
- ["8332BE33",0xC3F0],
- ["8332BE34",0xC3F1],
- ["8332BE35",0xC3F2],
- ["8332BE36",0xC3F3],
- ["8332BE37",0xC3F4],
- ["8332BE38",0xC3F5],
- ["8332BE39",0xC3F6],
- ["8332BF30",0xC3F7],
- ["8332BF31",0xC3F8],
- ["8332BF32",0xC3F9],
- ["8332BF33",0xC3FA],
- ["8332BF34",0xC3FB],
- ["8332BF35",0xC3FC],
- ["8332BF36",0xC3FD],
- ["8332BF37",0xC3FE],
- ["8332BF38",0xC3FF],
- ["8332BF39",0xC400],
- ["8332C030",0xC401],
- ["8332C031",0xC402],
- ["8332C032",0xC403],
- ["8332C033",0xC404],
- ["8332C034",0xC405],
- ["8332C035",0xC406],
- ["8332C036",0xC407],
- ["8332C037",0xC408],
- ["8332C038",0xC409],
- ["8332C039",0xC40A],
- ["8332C130",0xC40B],
- ["8332C131",0xC40C],
- ["8332C132",0xC40D],
- ["8332C133",0xC40E],
- ["8332C134",0xC40F],
- ["8332C135",0xC410],
- ["8332C136",0xC411],
- ["8332C137",0xC412],
- ["8332C138",0xC413],
- ["8332C139",0xC414],
- ["8332C230",0xC415],
- ["8332C231",0xC416],
- ["8332C232",0xC417],
- ["8332C233",0xC418],
- ["8332C234",0xC419],
- ["8332C235",0xC41A],
- ["8332C236",0xC41B],
- ["8332C237",0xC41C],
- ["8332C238",0xC41D],
- ["8332C239",0xC41E],
- ["8332C330",0xC41F],
- ["8332C331",0xC420],
- ["8332C332",0xC421],
- ["8332C333",0xC422],
- ["8332C334",0xC423],
- ["8332C335",0xC424],
- ["8332C336",0xC425],
- ["8332C337",0xC426],
- ["8332C338",0xC427],
- ["8332C339",0xC428],
- ["8332C430",0xC429],
- ["8332C431",0xC42A],
- ["8332C432",0xC42B],
- ["8332C433",0xC42C],
- ["8332C434",0xC42D],
- ["8332C435",0xC42E],
- ["8332C436",0xC42F],
- ["8332C437",0xC430],
- ["8332C438",0xC431],
- ["8332C439",0xC432],
- ["8332C530",0xC433],
- ["8332C531",0xC434],
- ["8332C532",0xC435],
- ["8332C533",0xC436],
- ["8332C534",0xC437],
- ["8332C535",0xC438],
- ["8332C536",0xC439],
- ["8332C537",0xC43A],
- ["8332C538",0xC43B],
- ["8332C539",0xC43C],
- ["8332C630",0xC43D],
- ["8332C631",0xC43E],
- ["8332C632",0xC43F],
- ["8332C633",0xC440],
- ["8332C634",0xC441],
- ["8332C635",0xC442],
- ["8332C636",0xC443],
- ["8332C637",0xC444],
- ["8332C638",0xC445],
- ["8332C639",0xC446],
- ["8332C730",0xC447],
- ["8332C731",0xC448],
- ["8332C732",0xC449],
- ["8332C733",0xC44A],
- ["8332C734",0xC44B],
- ["8332C735",0xC44C],
- ["8332C736",0xC44D],
- ["8332C737",0xC44E],
- ["8332C738",0xC44F],
- ["8332C739",0xC450],
- ["8332C830",0xC451],
- ["8332C831",0xC452],
- ["8332C832",0xC453],
- ["8332C833",0xC454],
- ["8332C834",0xC455],
- ["8332C835",0xC456],
- ["8332C836",0xC457],
- ["8332C837",0xC458],
- ["8332C838",0xC459],
- ["8332C839",0xC45A],
- ["8332C930",0xC45B],
- ["8332C931",0xC45C],
- ["8332C932",0xC45D],
- ["8332C933",0xC45E],
- ["8332C934",0xC45F],
- ["8332C935",0xC460],
- ["8332C936",0xC461],
- ["8332C937",0xC462],
- ["8332C938",0xC463],
- ["8332C939",0xC464],
- ["8332CA30",0xC465],
- ["8332CA31",0xC466],
- ["8332CA32",0xC467],
- ["8332CA33",0xC468],
- ["8332CA34",0xC469],
- ["8332CA35",0xC46A],
- ["8332CA36",0xC46B],
- ["8332CA37",0xC46C],
- ["8332CA38",0xC46D],
- ["8332CA39",0xC46E],
- ["8332CB30",0xC46F],
- ["8332CB31",0xC470],
- ["8332CB32",0xC471],
- ["8332CB33",0xC472],
- ["8332CB34",0xC473],
- ["8332CB35",0xC474],
- ["8332CB36",0xC475],
- ["8332CB37",0xC476],
- ["8332CB38",0xC477],
- ["8332CB39",0xC478],
- ["8332CC30",0xC479],
- ["8332CC31",0xC47A],
- ["8332CC32",0xC47B],
- ["8332CC33",0xC47C],
- ["8332CC34",0xC47D],
- ["8332CC35",0xC47E],
- ["8332CC36",0xC47F],
- ["8332CC37",0xC480],
- ["8332CC38",0xC481],
- ["8332CC39",0xC482],
- ["8332CD30",0xC483],
- ["8332CD31",0xC484],
- ["8332CD32",0xC485],
- ["8332CD33",0xC486],
- ["8332CD34",0xC487],
- ["8332CD35",0xC488],
- ["8332CD36",0xC489],
- ["8332CD37",0xC48A],
- ["8332CD38",0xC48B],
- ["8332CD39",0xC48C],
- ["8332CE30",0xC48D],
- ["8332CE31",0xC48E],
- ["8332CE32",0xC48F],
- ["8332CE33",0xC490],
- ["8332CE34",0xC491],
- ["8332CE35",0xC492],
- ["8332CE36",0xC493],
- ["8332CE37",0xC494],
- ["8332CE38",0xC495],
- ["8332CE39",0xC496],
- ["8332CF30",0xC497],
- ["8332CF31",0xC498],
- ["8332CF32",0xC499],
- ["8332CF33",0xC49A],
- ["8332CF34",0xC49B],
- ["8332CF35",0xC49C],
- ["8332CF36",0xC49D],
- ["8332CF37",0xC49E],
- ["8332CF38",0xC49F],
- ["8332CF39",0xC4A0],
- ["8332D030",0xC4A1],
- ["8332D031",0xC4A2],
- ["8332D032",0xC4A3],
- ["8332D033",0xC4A4],
- ["8332D034",0xC4A5],
- ["8332D035",0xC4A6],
- ["8332D036",0xC4A7],
- ["8332D037",0xC4A8],
- ["8332D038",0xC4A9],
- ["8332D039",0xC4AA],
- ["8332D130",0xC4AB],
- ["8332D131",0xC4AC],
- ["8332D132",0xC4AD],
- ["8332D133",0xC4AE],
- ["8332D134",0xC4AF],
- ["8332D135",0xC4B0],
- ["8332D136",0xC4B1],
- ["8332D137",0xC4B2],
- ["8332D138",0xC4B3],
- ["8332D139",0xC4B4],
- ["8332D230",0xC4B5],
- ["8332D231",0xC4B6],
- ["8332D232",0xC4B7],
- ["8332D233",0xC4B8],
- ["8332D234",0xC4B9],
- ["8332D235",0xC4BA],
- ["8332D236",0xC4BB],
- ["8332D237",0xC4BC],
- ["8332D238",0xC4BD],
- ["8332D239",0xC4BE],
- ["8332D330",0xC4BF],
- ["8332D331",0xC4C0],
- ["8332D332",0xC4C1],
- ["8332D333",0xC4C2],
- ["8332D334",0xC4C3],
- ["8332D335",0xC4C4],
- ["8332D336",0xC4C5],
- ["8332D337",0xC4C6],
- ["8332D338",0xC4C7],
- ["8332D339",0xC4C8],
- ["8332D430",0xC4C9],
- ["8332D431",0xC4CA],
- ["8332D432",0xC4CB],
- ["8332D433",0xC4CC],
- ["8332D434",0xC4CD],
- ["8332D435",0xC4CE],
- ["8332D436",0xC4CF],
- ["8332D437",0xC4D0],
- ["8332D438",0xC4D1],
- ["8332D439",0xC4D2],
- ["8332D530",0xC4D3],
- ["8332D531",0xC4D4],
- ["8332D532",0xC4D5],
- ["8332D533",0xC4D6],
- ["8332D534",0xC4D7],
- ["8332D535",0xC4D8],
- ["8332D536",0xC4D9],
- ["8332D537",0xC4DA],
- ["8332D538",0xC4DB],
- ["8332D539",0xC4DC],
- ["8332D630",0xC4DD],
- ["8332D631",0xC4DE],
- ["8332D632",0xC4DF],
- ["8332D633",0xC4E0],
- ["8332D634",0xC4E1],
- ["8332D635",0xC4E2],
- ["8332D636",0xC4E3],
- ["8332D637",0xC4E4],
- ["8332D638",0xC4E5],
- ["8332D639",0xC4E6],
- ["8332D730",0xC4E7],
- ["8332D731",0xC4E8],
- ["8332D732",0xC4E9],
- ["8332D733",0xC4EA],
- ["8332D734",0xC4EB],
- ["8332D735",0xC4EC],
- ["8332D736",0xC4ED],
- ["8332D737",0xC4EE],
- ["8332D738",0xC4EF],
- ["8332D739",0xC4F0],
- ["8332D830",0xC4F1],
- ["8332D831",0xC4F2],
- ["8332D832",0xC4F3],
- ["8332D833",0xC4F4],
- ["8332D834",0xC4F5],
- ["8332D835",0xC4F6],
- ["8332D836",0xC4F7],
- ["8332D837",0xC4F8],
- ["8332D838",0xC4F9],
- ["8332D839",0xC4FA],
- ["8332D930",0xC4FB],
- ["8332D931",0xC4FC],
- ["8332D932",0xC4FD],
- ["8332D933",0xC4FE],
- ["8332D934",0xC4FF],
- ["8332D935",0xC500],
- ["8332D936",0xC501],
- ["8332D937",0xC502],
- ["8332D938",0xC503],
- ["8332D939",0xC504],
- ["8332DA30",0xC505],
- ["8332DA31",0xC506],
- ["8332DA32",0xC507],
- ["8332DA33",0xC508],
- ["8332DA34",0xC509],
- ["8332DA35",0xC50A],
- ["8332DA36",0xC50B],
- ["8332DA37",0xC50C],
- ["8332DA38",0xC50D],
- ["8332DA39",0xC50E],
- ["8332DB30",0xC50F],
- ["8332DB31",0xC510],
- ["8332DB32",0xC511],
- ["8332DB33",0xC512],
- ["8332DB34",0xC513],
- ["8332DB35",0xC514],
- ["8332DB36",0xC515],
- ["8332DB37",0xC516],
- ["8332DB38",0xC517],
- ["8332DB39",0xC518],
- ["8332DC30",0xC519],
- ["8332DC31",0xC51A],
- ["8332DC32",0xC51B],
- ["8332DC33",0xC51C],
- ["8332DC34",0xC51D],
- ["8332DC35",0xC51E],
- ["8332DC36",0xC51F],
- ["8332DC37",0xC520],
- ["8332DC38",0xC521],
- ["8332DC39",0xC522],
- ["8332DD30",0xC523],
- ["8332DD31",0xC524],
- ["8332DD32",0xC525],
- ["8332DD33",0xC526],
- ["8332DD34",0xC527],
- ["8332DD35",0xC528],
- ["8332DD36",0xC529],
- ["8332DD37",0xC52A],
- ["8332DD38",0xC52B],
- ["8332DD39",0xC52C],
- ["8332DE30",0xC52D],
- ["8332DE31",0xC52E],
- ["8332DE32",0xC52F],
- ["8332DE33",0xC530],
- ["8332DE34",0xC531],
- ["8332DE35",0xC532],
- ["8332DE36",0xC533],
- ["8332DE37",0xC534],
- ["8332DE38",0xC535],
- ["8332DE39",0xC536],
- ["8332DF30",0xC537],
- ["8332DF31",0xC538],
- ["8332DF32",0xC539],
- ["8332DF33",0xC53A],
- ["8332DF34",0xC53B],
- ["8332DF35",0xC53C],
- ["8332DF36",0xC53D],
- ["8332DF37",0xC53E],
- ["8332DF38",0xC53F],
- ["8332DF39",0xC540],
- ["8332E030",0xC541],
- ["8332E031",0xC542],
- ["8332E032",0xC543],
- ["8332E033",0xC544],
- ["8332E034",0xC545],
- ["8332E035",0xC546],
- ["8332E036",0xC547],
- ["8332E037",0xC548],
- ["8332E038",0xC549],
- ["8332E039",0xC54A],
- ["8332E130",0xC54B],
- ["8332E131",0xC54C],
- ["8332E132",0xC54D],
- ["8332E133",0xC54E],
- ["8332E134",0xC54F],
- ["8332E135",0xC550],
- ["8332E136",0xC551],
- ["8332E137",0xC552],
- ["8332E138",0xC553],
- ["8332E139",0xC554],
- ["8332E230",0xC555],
- ["8332E231",0xC556],
- ["8332E232",0xC557],
- ["8332E233",0xC558],
- ["8332E234",0xC559],
- ["8332E235",0xC55A],
- ["8332E236",0xC55B],
- ["8332E237",0xC55C],
- ["8332E238",0xC55D],
- ["8332E239",0xC55E],
- ["8332E330",0xC55F],
- ["8332E331",0xC560],
- ["8332E332",0xC561],
- ["8332E333",0xC562],
- ["8332E334",0xC563],
- ["8332E335",0xC564],
- ["8332E336",0xC565],
- ["8332E337",0xC566],
- ["8332E338",0xC567],
- ["8332E339",0xC568],
- ["8332E430",0xC569],
- ["8332E431",0xC56A],
- ["8332E432",0xC56B],
- ["8332E433",0xC56C],
- ["8332E434",0xC56D],
- ["8332E435",0xC56E],
- ["8332E436",0xC56F],
- ["8332E437",0xC570],
- ["8332E438",0xC571],
- ["8332E439",0xC572],
- ["8332E530",0xC573],
- ["8332E531",0xC574],
- ["8332E532",0xC575],
- ["8332E533",0xC576],
- ["8332E534",0xC577],
- ["8332E535",0xC578],
- ["8332E536",0xC579],
- ["8332E537",0xC57A],
- ["8332E538",0xC57B],
- ["8332E539",0xC57C],
- ["8332E630",0xC57D],
- ["8332E631",0xC57E],
- ["8332E632",0xC57F],
- ["8332E633",0xC580],
- ["8332E634",0xC581],
- ["8332E635",0xC582],
- ["8332E636",0xC583],
- ["8332E637",0xC584],
- ["8332E638",0xC585],
- ["8332E639",0xC586],
- ["8332E730",0xC587],
- ["8332E731",0xC588],
- ["8332E732",0xC589],
- ["8332E733",0xC58A],
- ["8332E734",0xC58B],
- ["8332E735",0xC58C],
- ["8332E736",0xC58D],
- ["8332E737",0xC58E],
- ["8332E738",0xC58F],
- ["8332E739",0xC590],
- ["8332E830",0xC591],
- ["8332E831",0xC592],
- ["8332E832",0xC593],
- ["8332E833",0xC594],
- ["8332E834",0xC595],
- ["8332E835",0xC596],
- ["8332E836",0xC597],
- ["8332E837",0xC598],
- ["8332E838",0xC599],
- ["8332E839",0xC59A],
- ["8332E930",0xC59B],
- ["8332E931",0xC59C],
- ["8332E932",0xC59D],
- ["8332E933",0xC59E],
- ["8332E934",0xC59F],
- ["8332E935",0xC5A0],
- ["8332E936",0xC5A1],
- ["8332E937",0xC5A2],
- ["8332E938",0xC5A3],
- ["8332E939",0xC5A4],
- ["8332EA30",0xC5A5],
- ["8332EA31",0xC5A6],
- ["8332EA32",0xC5A7],
- ["8332EA33",0xC5A8],
- ["8332EA34",0xC5A9],
- ["8332EA35",0xC5AA],
- ["8332EA36",0xC5AB],
- ["8332EA37",0xC5AC],
- ["8332EA38",0xC5AD],
- ["8332EA39",0xC5AE],
- ["8332EB30",0xC5AF],
- ["8332EB31",0xC5B0],
- ["8332EB32",0xC5B1],
- ["8332EB33",0xC5B2],
- ["8332EB34",0xC5B3],
- ["8332EB35",0xC5B4],
- ["8332EB36",0xC5B5],
- ["8332EB37",0xC5B6],
- ["8332EB38",0xC5B7],
- ["8332EB39",0xC5B8],
- ["8332EC30",0xC5B9],
- ["8332EC31",0xC5BA],
- ["8332EC32",0xC5BB],
- ["8332EC33",0xC5BC],
- ["8332EC34",0xC5BD],
- ["8332EC35",0xC5BE],
- ["8332EC36",0xC5BF],
- ["8332EC37",0xC5C0],
- ["8332EC38",0xC5C1],
- ["8332EC39",0xC5C2],
- ["8332ED30",0xC5C3],
- ["8332ED31",0xC5C4],
- ["8332ED32",0xC5C5],
- ["8332ED33",0xC5C6],
- ["8332ED34",0xC5C7],
- ["8332ED35",0xC5C8],
- ["8332ED36",0xC5C9],
- ["8332ED37",0xC5CA],
- ["8332ED38",0xC5CB],
- ["8332ED39",0xC5CC],
- ["8332EE30",0xC5CD],
- ["8332EE31",0xC5CE],
- ["8332EE32",0xC5CF],
- ["8332EE33",0xC5D0],
- ["8332EE34",0xC5D1],
- ["8332EE35",0xC5D2],
- ["8332EE36",0xC5D3],
- ["8332EE37",0xC5D4],
- ["8332EE38",0xC5D5],
- ["8332EE39",0xC5D6],
- ["8332EF30",0xC5D7],
- ["8332EF31",0xC5D8],
- ["8332EF32",0xC5D9],
- ["8332EF33",0xC5DA],
- ["8332EF34",0xC5DB],
- ["8332EF35",0xC5DC],
- ["8332EF36",0xC5DD],
- ["8332EF37",0xC5DE],
- ["8332EF38",0xC5DF],
- ["8332EF39",0xC5E0],
- ["8332F030",0xC5E1],
- ["8332F031",0xC5E2],
- ["8332F032",0xC5E3],
- ["8332F033",0xC5E4],
- ["8332F034",0xC5E5],
- ["8332F035",0xC5E6],
- ["8332F036",0xC5E7],
- ["8332F037",0xC5E8],
- ["8332F038",0xC5E9],
- ["8332F039",0xC5EA],
- ["8332F130",0xC5EB],
- ["8332F131",0xC5EC],
- ["8332F132",0xC5ED],
- ["8332F133",0xC5EE],
- ["8332F134",0xC5EF],
- ["8332F135",0xC5F0],
- ["8332F136",0xC5F1],
- ["8332F137",0xC5F2],
- ["8332F138",0xC5F3],
- ["8332F139",0xC5F4],
- ["8332F230",0xC5F5],
- ["8332F231",0xC5F6],
- ["8332F232",0xC5F7],
- ["8332F233",0xC5F8],
- ["8332F234",0xC5F9],
- ["8332F235",0xC5FA],
- ["8332F236",0xC5FB],
- ["8332F237",0xC5FC],
- ["8332F238",0xC5FD],
- ["8332F239",0xC5FE],
- ["8332F330",0xC5FF],
- ["8332F331",0xC600],
- ["8332F332",0xC601],
- ["8332F333",0xC602],
- ["8332F334",0xC603],
- ["8332F335",0xC604],
- ["8332F336",0xC605],
- ["8332F337",0xC606],
- ["8332F338",0xC607],
- ["8332F339",0xC608],
- ["8332F430",0xC609],
- ["8332F431",0xC60A],
- ["8332F432",0xC60B],
- ["8332F433",0xC60C],
- ["8332F434",0xC60D],
- ["8332F435",0xC60E],
- ["8332F436",0xC60F],
- ["8332F437",0xC610],
- ["8332F438",0xC611],
- ["8332F439",0xC612],
- ["8332F530",0xC613],
- ["8332F531",0xC614],
- ["8332F532",0xC615],
- ["8332F533",0xC616],
- ["8332F534",0xC617],
- ["8332F535",0xC618],
- ["8332F536",0xC619],
- ["8332F537",0xC61A],
- ["8332F538",0xC61B],
- ["8332F539",0xC61C],
- ["8332F630",0xC61D],
- ["8332F631",0xC61E],
- ["8332F632",0xC61F],
- ["8332F633",0xC620],
- ["8332F634",0xC621],
- ["8332F635",0xC622],
- ["8332F636",0xC623],
- ["8332F637",0xC624],
- ["8332F638",0xC625],
- ["8332F639",0xC626],
- ["8332F730",0xC627],
- ["8332F731",0xC628],
- ["8332F732",0xC629],
- ["8332F733",0xC62A],
- ["8332F734",0xC62B],
- ["8332F735",0xC62C],
- ["8332F736",0xC62D],
- ["8332F737",0xC62E],
- ["8332F738",0xC62F],
- ["8332F739",0xC630],
- ["8332F830",0xC631],
- ["8332F831",0xC632],
- ["8332F832",0xC633],
- ["8332F833",0xC634],
- ["8332F834",0xC635],
- ["8332F835",0xC636],
- ["8332F836",0xC637],
- ["8332F837",0xC638],
- ["8332F838",0xC639],
- ["8332F839",0xC63A],
- ["8332F930",0xC63B],
- ["8332F931",0xC63C],
- ["8332F932",0xC63D],
- ["8332F933",0xC63E],
- ["8332F934",0xC63F],
- ["8332F935",0xC640],
- ["8332F936",0xC641],
- ["8332F937",0xC642],
- ["8332F938",0xC643],
- ["8332F939",0xC644],
- ["8332FA30",0xC645],
- ["8332FA31",0xC646],
- ["8332FA32",0xC647],
- ["8332FA33",0xC648],
- ["8332FA34",0xC649],
- ["8332FA35",0xC64A],
- ["8332FA36",0xC64B],
- ["8332FA37",0xC64C],
- ["8332FA38",0xC64D],
- ["8332FA39",0xC64E],
- ["8332FB30",0xC64F],
- ["8332FB31",0xC650],
- ["8332FB32",0xC651],
- ["8332FB33",0xC652],
- ["8332FB34",0xC653],
- ["8332FB35",0xC654],
- ["8332FB36",0xC655],
- ["8332FB37",0xC656],
- ["8332FB38",0xC657],
- ["8332FB39",0xC658],
- ["8332FC30",0xC659],
- ["8332FC31",0xC65A],
- ["8332FC32",0xC65B],
- ["8332FC33",0xC65C],
- ["8332FC34",0xC65D],
- ["8332FC35",0xC65E],
- ["8332FC36",0xC65F],
- ["8332FC37",0xC660],
- ["8332FC38",0xC661],
- ["8332FC39",0xC662],
- ["8332FD30",0xC663],
- ["8332FD31",0xC664],
- ["8332FD32",0xC665],
- ["8332FD33",0xC666],
- ["8332FD34",0xC667],
- ["8332FD35",0xC668],
- ["8332FD36",0xC669],
- ["8332FD37",0xC66A],
- ["8332FD38",0xC66B],
- ["8332FD39",0xC66C],
- ["8332FE30",0xC66D],
- ["8332FE31",0xC66E],
- ["8332FE32",0xC66F],
- ["8332FE33",0xC670],
- ["8332FE34",0xC671],
- ["8332FE35",0xC672],
- ["8332FE36",0xC673],
- ["8332FE37",0xC674],
- ["8332FE38",0xC675],
- ["8332FE39",0xC676],
- ["83338130",0xC677],
- ["83338131",0xC678],
- ["83338132",0xC679],
- ["83338133",0xC67A],
- ["83338134",0xC67B],
- ["83338135",0xC67C],
- ["83338136",0xC67D],
- ["83338137",0xC67E],
- ["83338138",0xC67F],
- ["83338139",0xC680],
- ["83338230",0xC681],
- ["83338231",0xC682],
- ["83338232",0xC683],
- ["83338233",0xC684],
- ["83338234",0xC685],
- ["83338235",0xC686],
- ["83338236",0xC687],
- ["83338237",0xC688],
- ["83338238",0xC689],
- ["83338239",0xC68A],
- ["83338330",0xC68B],
- ["83338331",0xC68C],
- ["83338332",0xC68D],
- ["83338333",0xC68E],
- ["83338334",0xC68F],
- ["83338335",0xC690],
- ["83338336",0xC691],
- ["83338337",0xC692],
- ["83338338",0xC693],
- ["83338339",0xC694],
- ["83338430",0xC695],
- ["83338431",0xC696],
- ["83338432",0xC697],
- ["83338433",0xC698],
- ["83338434",0xC699],
- ["83338435",0xC69A],
- ["83338436",0xC69B],
- ["83338437",0xC69C],
- ["83338438",0xC69D],
- ["83338439",0xC69E],
- ["83338530",0xC69F],
- ["83338531",0xC6A0],
- ["83338532",0xC6A1],
- ["83338533",0xC6A2],
- ["83338534",0xC6A3],
- ["83338535",0xC6A4],
- ["83338536",0xC6A5],
- ["83338537",0xC6A6],
- ["83338538",0xC6A7],
- ["83338539",0xC6A8],
- ["83338630",0xC6A9],
- ["83338631",0xC6AA],
- ["83338632",0xC6AB],
- ["83338633",0xC6AC],
- ["83338634",0xC6AD],
- ["83338635",0xC6AE],
- ["83338636",0xC6AF],
- ["83338637",0xC6B0],
- ["83338638",0xC6B1],
- ["83338639",0xC6B2],
- ["83338730",0xC6B3],
- ["83338731",0xC6B4],
- ["83338732",0xC6B5],
- ["83338733",0xC6B6],
- ["83338734",0xC6B7],
- ["83338735",0xC6B8],
- ["83338736",0xC6B9],
- ["83338737",0xC6BA],
- ["83338738",0xC6BB],
- ["83338739",0xC6BC],
- ["83338830",0xC6BD],
- ["83338831",0xC6BE],
- ["83338832",0xC6BF],
- ["83338833",0xC6C0],
- ["83338834",0xC6C1],
- ["83338835",0xC6C2],
- ["83338836",0xC6C3],
- ["83338837",0xC6C4],
- ["83338838",0xC6C5],
- ["83338839",0xC6C6],
- ["83338930",0xC6C7],
- ["83338931",0xC6C8],
- ["83338932",0xC6C9],
- ["83338933",0xC6CA],
- ["83338934",0xC6CB],
- ["83338935",0xC6CC],
- ["83338936",0xC6CD],
- ["83338937",0xC6CE],
- ["83338938",0xC6CF],
- ["83338939",0xC6D0],
- ["83338A30",0xC6D1],
- ["83338A31",0xC6D2],
- ["83338A32",0xC6D3],
- ["83338A33",0xC6D4],
- ["83338A34",0xC6D5],
- ["83338A35",0xC6D6],
- ["83338A36",0xC6D7],
- ["83338A37",0xC6D8],
- ["83338A38",0xC6D9],
- ["83338A39",0xC6DA],
- ["83338B30",0xC6DB],
- ["83338B31",0xC6DC],
- ["83338B32",0xC6DD],
- ["83338B33",0xC6DE],
- ["83338B34",0xC6DF],
- ["83338B35",0xC6E0],
- ["83338B36",0xC6E1],
- ["83338B37",0xC6E2],
- ["83338B38",0xC6E3],
- ["83338B39",0xC6E4],
- ["83338C30",0xC6E5],
- ["83338C31",0xC6E6],
- ["83338C32",0xC6E7],
- ["83338C33",0xC6E8],
- ["83338C34",0xC6E9],
- ["83338C35",0xC6EA],
- ["83338C36",0xC6EB],
- ["83338C37",0xC6EC],
- ["83338C38",0xC6ED],
- ["83338C39",0xC6EE],
- ["83338D30",0xC6EF],
- ["83338D31",0xC6F0],
- ["83338D32",0xC6F1],
- ["83338D33",0xC6F2],
- ["83338D34",0xC6F3],
- ["83338D35",0xC6F4],
- ["83338D36",0xC6F5],
- ["83338D37",0xC6F6],
- ["83338D38",0xC6F7],
- ["83338D39",0xC6F8],
- ["83338E30",0xC6F9],
- ["83338E31",0xC6FA],
- ["83338E32",0xC6FB],
- ["83338E33",0xC6FC],
- ["83338E34",0xC6FD],
- ["83338E35",0xC6FE],
- ["83338E36",0xC6FF],
- ["83338E37",0xC700],
- ["83338E38",0xC701],
- ["83338E39",0xC702],
- ["83338F30",0xC703],
- ["83338F31",0xC704],
- ["83338F32",0xC705],
- ["83338F33",0xC706],
- ["83338F34",0xC707],
- ["83338F35",0xC708],
- ["83338F36",0xC709],
- ["83338F37",0xC70A],
- ["83338F38",0xC70B],
- ["83338F39",0xC70C],
- ["83339030",0xC70D],
- ["83339031",0xC70E],
- ["83339032",0xC70F],
- ["83339033",0xC710],
- ["83339034",0xC711],
- ["83339035",0xC712],
- ["83339036",0xC713],
- ["83339037",0xC714],
- ["83339038",0xC715],
- ["83339039",0xC716],
- ["83339130",0xC717],
- ["83339131",0xC718],
- ["83339132",0xC719],
- ["83339133",0xC71A],
- ["83339134",0xC71B],
- ["83339135",0xC71C],
- ["83339136",0xC71D],
- ["83339137",0xC71E],
- ["83339138",0xC71F],
- ["83339139",0xC720],
- ["83339230",0xC721],
- ["83339231",0xC722],
- ["83339232",0xC723],
- ["83339233",0xC724],
- ["83339234",0xC725],
- ["83339235",0xC726],
- ["83339236",0xC727],
- ["83339237",0xC728],
- ["83339238",0xC729],
- ["83339239",0xC72A],
- ["83339330",0xC72B],
- ["83339331",0xC72C],
- ["83339332",0xC72D],
- ["83339333",0xC72E],
- ["83339334",0xC72F],
- ["83339335",0xC730],
- ["83339336",0xC731],
- ["83339337",0xC732],
- ["83339338",0xC733],
- ["83339339",0xC734],
- ["83339430",0xC735],
- ["83339431",0xC736],
- ["83339432",0xC737],
- ["83339433",0xC738],
- ["83339434",0xC739],
- ["83339435",0xC73A],
- ["83339436",0xC73B],
- ["83339437",0xC73C],
- ["83339438",0xC73D],
- ["83339439",0xC73E],
- ["83339530",0xC73F],
- ["83339531",0xC740],
- ["83339532",0xC741],
- ["83339533",0xC742],
- ["83339534",0xC743],
- ["83339535",0xC744],
- ["83339536",0xC745],
- ["83339537",0xC746],
- ["83339538",0xC747],
- ["83339539",0xC748],
- ["83339630",0xC749],
- ["83339631",0xC74A],
- ["83339632",0xC74B],
- ["83339633",0xC74C],
- ["83339634",0xC74D],
- ["83339635",0xC74E],
- ["83339636",0xC74F],
- ["83339637",0xC750],
- ["83339638",0xC751],
- ["83339639",0xC752],
- ["83339730",0xC753],
- ["83339731",0xC754],
- ["83339732",0xC755],
- ["83339733",0xC756],
- ["83339734",0xC757],
- ["83339735",0xC758],
- ["83339736",0xC759],
- ["83339737",0xC75A],
- ["83339738",0xC75B],
- ["83339739",0xC75C],
- ["83339830",0xC75D],
- ["83339831",0xC75E],
- ["83339832",0xC75F],
- ["83339833",0xC760],
- ["83339834",0xC761],
- ["83339835",0xC762],
- ["83339836",0xC763],
- ["83339837",0xC764],
- ["83339838",0xC765],
- ["83339839",0xC766],
- ["83339930",0xC767],
- ["83339931",0xC768],
- ["83339932",0xC769],
- ["83339933",0xC76A],
- ["83339934",0xC76B],
- ["83339935",0xC76C],
- ["83339936",0xC76D],
- ["83339937",0xC76E],
- ["83339938",0xC76F],
- ["83339939",0xC770],
- ["83339A30",0xC771],
- ["83339A31",0xC772],
- ["83339A32",0xC773],
- ["83339A33",0xC774],
- ["83339A34",0xC775],
- ["83339A35",0xC776],
- ["83339A36",0xC777],
- ["83339A37",0xC778],
- ["83339A38",0xC779],
- ["83339A39",0xC77A],
- ["83339B30",0xC77B],
- ["83339B31",0xC77C],
- ["83339B32",0xC77D],
- ["83339B33",0xC77E],
- ["83339B34",0xC77F],
- ["83339B35",0xC780],
- ["83339B36",0xC781],
- ["83339B37",0xC782],
- ["83339B38",0xC783],
- ["83339B39",0xC784],
- ["83339C30",0xC785],
- ["83339C31",0xC786],
- ["83339C32",0xC787],
- ["83339C33",0xC788],
- ["83339C34",0xC789],
- ["83339C35",0xC78A],
- ["83339C36",0xC78B],
- ["83339C37",0xC78C],
- ["83339C38",0xC78D],
- ["83339C39",0xC78E],
- ["83339D30",0xC78F],
- ["83339D31",0xC790],
- ["83339D32",0xC791],
- ["83339D33",0xC792],
- ["83339D34",0xC793],
- ["83339D35",0xC794],
- ["83339D36",0xC795],
- ["83339D37",0xC796],
- ["83339D38",0xC797],
- ["83339D39",0xC798],
- ["83339E30",0xC799],
- ["83339E31",0xC79A],
- ["83339E32",0xC79B],
- ["83339E33",0xC79C],
- ["83339E34",0xC79D],
- ["83339E35",0xC79E],
- ["83339E36",0xC79F],
- ["83339E37",0xC7A0],
- ["83339E38",0xC7A1],
- ["83339E39",0xC7A2],
- ["83339F30",0xC7A3],
- ["83339F31",0xC7A4],
- ["83339F32",0xC7A5],
- ["83339F33",0xC7A6],
- ["83339F34",0xC7A7],
- ["83339F35",0xC7A8],
- ["83339F36",0xC7A9],
- ["83339F37",0xC7AA],
- ["83339F38",0xC7AB],
- ["83339F39",0xC7AC],
- ["8333A030",0xC7AD],
- ["8333A031",0xC7AE],
- ["8333A032",0xC7AF],
- ["8333A033",0xC7B0],
- ["8333A034",0xC7B1],
- ["8333A035",0xC7B2],
- ["8333A036",0xC7B3],
- ["8333A037",0xC7B4],
- ["8333A038",0xC7B5],
- ["8333A039",0xC7B6],
- ["8333A130",0xC7B7],
- ["8333A131",0xC7B8],
- ["8333A132",0xC7B9],
- ["8333A133",0xC7BA],
- ["8333A134",0xC7BB],
- ["8333A135",0xC7BC],
- ["8333A136",0xC7BD],
- ["8333A137",0xC7BE],
- ["8333A138",0xC7BF],
- ["8333A139",0xC7C0],
- ["8333A230",0xC7C1],
- ["8333A231",0xC7C2],
- ["8333A232",0xC7C3],
- ["8333A233",0xC7C4],
- ["8333A234",0xC7C5],
- ["8333A235",0xC7C6],
- ["8333A236",0xC7C7],
- ["8333A237",0xC7C8],
- ["8333A238",0xC7C9],
- ["8333A239",0xC7CA],
- ["8333A330",0xC7CB],
- ["8333A331",0xC7CC],
- ["8333A332",0xC7CD],
- ["8333A333",0xC7CE],
- ["8333A334",0xC7CF],
- ["8333A335",0xC7D0],
- ["8333A336",0xC7D1],
- ["8333A337",0xC7D2],
- ["8333A338",0xC7D3],
- ["8333A339",0xC7D4],
- ["8333A430",0xC7D5],
- ["8333A431",0xC7D6],
- ["8333A432",0xC7D7],
- ["8333A433",0xC7D8],
- ["8333A434",0xC7D9],
- ["8333A435",0xC7DA],
- ["8333A436",0xC7DB],
- ["8333A437",0xC7DC],
- ["8333A438",0xC7DD],
- ["8333A439",0xC7DE],
- ["8333A530",0xC7DF],
- ["8333A531",0xC7E0],
- ["8333A532",0xC7E1],
- ["8333A533",0xC7E2],
- ["8333A534",0xC7E3],
- ["8333A535",0xC7E4],
- ["8333A536",0xC7E5],
- ["8333A537",0xC7E6],
- ["8333A538",0xC7E7],
- ["8333A539",0xC7E8],
- ["8333A630",0xC7E9],
- ["8333A631",0xC7EA],
- ["8333A632",0xC7EB],
- ["8333A633",0xC7EC],
- ["8333A634",0xC7ED],
- ["8333A635",0xC7EE],
- ["8333A636",0xC7EF],
- ["8333A637",0xC7F0],
- ["8333A638",0xC7F1],
- ["8333A639",0xC7F2],
- ["8333A730",0xC7F3],
- ["8333A731",0xC7F4],
- ["8333A732",0xC7F5],
- ["8333A733",0xC7F6],
- ["8333A734",0xC7F7],
- ["8333A735",0xC7F8],
- ["8333A736",0xC7F9],
- ["8333A737",0xC7FA],
- ["8333A738",0xC7FB],
- ["8333A739",0xC7FC],
- ["8333A830",0xC7FD],
- ["8333A831",0xC7FE],
- ["8333A832",0xC7FF],
- ["8333A833",0xC800],
- ["8333A834",0xC801],
- ["8333A835",0xC802],
- ["8333A836",0xC803],
- ["8333A837",0xC804],
- ["8333A838",0xC805],
- ["8333A839",0xC806],
- ["8333A930",0xC807],
- ["8333A931",0xC808],
- ["8333A932",0xC809],
- ["8333A933",0xC80A],
- ["8333A934",0xC80B],
- ["8333A935",0xC80C],
- ["8333A936",0xC80D],
- ["8333A937",0xC80E],
- ["8333A938",0xC80F],
- ["8333A939",0xC810],
- ["8333AA30",0xC811],
- ["8333AA31",0xC812],
- ["8333AA32",0xC813],
- ["8333AA33",0xC814],
- ["8333AA34",0xC815],
- ["8333AA35",0xC816],
- ["8333AA36",0xC817],
- ["8333AA37",0xC818],
- ["8333AA38",0xC819],
- ["8333AA39",0xC81A],
- ["8333AB30",0xC81B],
- ["8333AB31",0xC81C],
- ["8333AB32",0xC81D],
- ["8333AB33",0xC81E],
- ["8333AB34",0xC81F],
- ["8333AB35",0xC820],
- ["8333AB36",0xC821],
- ["8333AB37",0xC822],
- ["8333AB38",0xC823],
- ["8333AB39",0xC824],
- ["8333AC30",0xC825],
- ["8333AC31",0xC826],
- ["8333AC32",0xC827],
- ["8333AC33",0xC828],
- ["8333AC34",0xC829],
- ["8333AC35",0xC82A],
- ["8333AC36",0xC82B],
- ["8333AC37",0xC82C],
- ["8333AC38",0xC82D],
- ["8333AC39",0xC82E],
- ["8333AD30",0xC82F],
- ["8333AD31",0xC830],
- ["8333AD32",0xC831],
- ["8333AD33",0xC832],
- ["8333AD34",0xC833],
- ["8333AD35",0xC834],
- ["8333AD36",0xC835],
- ["8333AD37",0xC836],
- ["8333AD38",0xC837],
- ["8333AD39",0xC838],
- ["8333AE30",0xC839],
- ["8333AE31",0xC83A],
- ["8333AE32",0xC83B],
- ["8333AE33",0xC83C],
- ["8333AE34",0xC83D],
- ["8333AE35",0xC83E],
- ["8333AE36",0xC83F],
- ["8333AE37",0xC840],
- ["8333AE38",0xC841],
- ["8333AE39",0xC842],
- ["8333AF30",0xC843],
- ["8333AF31",0xC844],
- ["8333AF32",0xC845],
- ["8333AF33",0xC846],
- ["8333AF34",0xC847],
- ["8333AF35",0xC848],
- ["8333AF36",0xC849],
- ["8333AF37",0xC84A],
- ["8333AF38",0xC84B],
- ["8333AF39",0xC84C],
- ["8333B030",0xC84D],
- ["8333B031",0xC84E],
- ["8333B032",0xC84F],
- ["8333B033",0xC850],
- ["8333B034",0xC851],
- ["8333B035",0xC852],
- ["8333B036",0xC853],
- ["8333B037",0xC854],
- ["8333B038",0xC855],
- ["8333B039",0xC856],
- ["8333B130",0xC857],
- ["8333B131",0xC858],
- ["8333B132",0xC859],
- ["8333B133",0xC85A],
- ["8333B134",0xC85B],
- ["8333B135",0xC85C],
- ["8333B136",0xC85D],
- ["8333B137",0xC85E],
- ["8333B138",0xC85F],
- ["8333B139",0xC860],
- ["8333B230",0xC861],
- ["8333B231",0xC862],
- ["8333B232",0xC863],
- ["8333B233",0xC864],
- ["8333B234",0xC865],
- ["8333B235",0xC866],
- ["8333B236",0xC867],
- ["8333B237",0xC868],
- ["8333B238",0xC869],
- ["8333B239",0xC86A],
- ["8333B330",0xC86B],
- ["8333B331",0xC86C],
- ["8333B332",0xC86D],
- ["8333B333",0xC86E],
- ["8333B334",0xC86F],
- ["8333B335",0xC870],
- ["8333B336",0xC871],
- ["8333B337",0xC872],
- ["8333B338",0xC873],
- ["8333B339",0xC874],
- ["8333B430",0xC875],
- ["8333B431",0xC876],
- ["8333B432",0xC877],
- ["8333B433",0xC878],
- ["8333B434",0xC879],
- ["8333B435",0xC87A],
- ["8333B436",0xC87B],
- ["8333B437",0xC87C],
- ["8333B438",0xC87D],
- ["8333B439",0xC87E],
- ["8333B530",0xC87F],
- ["8333B531",0xC880],
- ["8333B532",0xC881],
- ["8333B533",0xC882],
- ["8333B534",0xC883],
- ["8333B535",0xC884],
- ["8333B536",0xC885],
- ["8333B537",0xC886],
- ["8333B538",0xC887],
- ["8333B539",0xC888],
- ["8333B630",0xC889],
- ["8333B631",0xC88A],
- ["8333B632",0xC88B],
- ["8333B633",0xC88C],
- ["8333B634",0xC88D],
- ["8333B635",0xC88E],
- ["8333B636",0xC88F],
- ["8333B637",0xC890],
- ["8333B638",0xC891],
- ["8333B639",0xC892],
- ["8333B730",0xC893],
- ["8333B731",0xC894],
- ["8333B732",0xC895],
- ["8333B733",0xC896],
- ["8333B734",0xC897],
- ["8333B735",0xC898],
- ["8333B736",0xC899],
- ["8333B737",0xC89A],
- ["8333B738",0xC89B],
- ["8333B739",0xC89C],
- ["8333B830",0xC89D],
- ["8333B831",0xC89E],
- ["8333B832",0xC89F],
- ["8333B833",0xC8A0],
- ["8333B834",0xC8A1],
- ["8333B835",0xC8A2],
- ["8333B836",0xC8A3],
- ["8333B837",0xC8A4],
- ["8333B838",0xC8A5],
- ["8333B839",0xC8A6],
- ["8333B930",0xC8A7],
- ["8333B931",0xC8A8],
- ["8333B932",0xC8A9],
- ["8333B933",0xC8AA],
- ["8333B934",0xC8AB],
- ["8333B935",0xC8AC],
- ["8333B936",0xC8AD],
- ["8333B937",0xC8AE],
- ["8333B938",0xC8AF],
- ["8333B939",0xC8B0],
- ["8333BA30",0xC8B1],
- ["8333BA31",0xC8B2],
- ["8333BA32",0xC8B3],
- ["8333BA33",0xC8B4],
- ["8333BA34",0xC8B5],
- ["8333BA35",0xC8B6],
- ["8333BA36",0xC8B7],
- ["8333BA37",0xC8B8],
- ["8333BA38",0xC8B9],
- ["8333BA39",0xC8BA],
- ["8333BB30",0xC8BB],
- ["8333BB31",0xC8BC],
- ["8333BB32",0xC8BD],
- ["8333BB33",0xC8BE],
- ["8333BB34",0xC8BF],
- ["8333BB35",0xC8C0],
- ["8333BB36",0xC8C1],
- ["8333BB37",0xC8C2],
- ["8333BB38",0xC8C3],
- ["8333BB39",0xC8C4],
- ["8333BC30",0xC8C5],
- ["8333BC31",0xC8C6],
- ["8333BC32",0xC8C7],
- ["8333BC33",0xC8C8],
- ["8333BC34",0xC8C9],
- ["8333BC35",0xC8CA],
- ["8333BC36",0xC8CB],
- ["8333BC37",0xC8CC],
- ["8333BC38",0xC8CD],
- ["8333BC39",0xC8CE],
- ["8333BD30",0xC8CF],
- ["8333BD31",0xC8D0],
- ["8333BD32",0xC8D1],
- ["8333BD33",0xC8D2],
- ["8333BD34",0xC8D3],
- ["8333BD35",0xC8D4],
- ["8333BD36",0xC8D5],
- ["8333BD37",0xC8D6],
- ["8333BD38",0xC8D7],
- ["8333BD39",0xC8D8],
- ["8333BE30",0xC8D9],
- ["8333BE31",0xC8DA],
- ["8333BE32",0xC8DB],
- ["8333BE33",0xC8DC],
- ["8333BE34",0xC8DD],
- ["8333BE35",0xC8DE],
- ["8333BE36",0xC8DF],
- ["8333BE37",0xC8E0],
- ["8333BE38",0xC8E1],
- ["8333BE39",0xC8E2],
- ["8333BF30",0xC8E3],
- ["8333BF31",0xC8E4],
- ["8333BF32",0xC8E5],
- ["8333BF33",0xC8E6],
- ["8333BF34",0xC8E7],
- ["8333BF35",0xC8E8],
- ["8333BF36",0xC8E9],
- ["8333BF37",0xC8EA],
- ["8333BF38",0xC8EB],
- ["8333BF39",0xC8EC],
- ["8333C030",0xC8ED],
- ["8333C031",0xC8EE],
- ["8333C032",0xC8EF],
- ["8333C033",0xC8F0],
- ["8333C034",0xC8F1],
- ["8333C035",0xC8F2],
- ["8333C036",0xC8F3],
- ["8333C037",0xC8F4],
- ["8333C038",0xC8F5],
- ["8333C039",0xC8F6],
- ["8333C130",0xC8F7],
- ["8333C131",0xC8F8],
- ["8333C132",0xC8F9],
- ["8333C133",0xC8FA],
- ["8333C134",0xC8FB],
- ["8333C135",0xC8FC],
- ["8333C136",0xC8FD],
- ["8333C137",0xC8FE],
- ["8333C138",0xC8FF],
- ["8333C139",0xC900],
- ["8333C230",0xC901],
- ["8333C231",0xC902],
- ["8333C232",0xC903],
- ["8333C233",0xC904],
- ["8333C234",0xC905],
- ["8333C235",0xC906],
- ["8333C236",0xC907],
- ["8333C237",0xC908],
- ["8333C238",0xC909],
- ["8333C239",0xC90A],
- ["8333C330",0xC90B],
- ["8333C331",0xC90C],
- ["8333C332",0xC90D],
- ["8333C333",0xC90E],
- ["8333C334",0xC90F],
- ["8333C335",0xC910],
- ["8333C336",0xC911],
- ["8333C337",0xC912],
- ["8333C338",0xC913],
- ["8333C339",0xC914],
- ["8333C430",0xC915],
- ["8333C431",0xC916],
- ["8333C432",0xC917],
- ["8333C433",0xC918],
- ["8333C434",0xC919],
- ["8333C435",0xC91A],
- ["8333C436",0xC91B],
- ["8333C437",0xC91C],
- ["8333C438",0xC91D],
- ["8333C439",0xC91E],
- ["8333C530",0xC91F],
- ["8333C531",0xC920],
- ["8333C532",0xC921],
- ["8333C533",0xC922],
- ["8333C534",0xC923],
- ["8333C535",0xC924],
- ["8333C536",0xC925],
- ["8333C537",0xC926],
- ["8333C538",0xC927],
- ["8333C539",0xC928],
- ["8333C630",0xC929],
- ["8333C631",0xC92A],
- ["8333C632",0xC92B],
- ["8333C633",0xC92C],
- ["8333C634",0xC92D],
- ["8333C635",0xC92E],
- ["8333C636",0xC92F],
- ["8333C637",0xC930],
- ["8333C638",0xC931],
- ["8333C639",0xC932],
- ["8333C730",0xC933],
- ["8333C731",0xC934],
- ["8333C732",0xC935],
- ["8333C733",0xC936],
- ["8333C734",0xC937],
- ["8333C735",0xC938],
- ["8333C736",0xC939],
- ["8333C737",0xC93A],
- ["8333C738",0xC93B],
- ["8333C739",0xC93C],
- ["8333C830",0xC93D],
- ["8333C831",0xC93E],
- ["8333C832",0xC93F],
- ["8333C833",0xC940],
- ["8333C834",0xC941],
- ["8333C835",0xC942],
- ["8333C836",0xC943],
- ["8333C837",0xC944],
- ["8333C838",0xC945],
- ["8333C839",0xC946],
- ["8333C930",0xC947],
- ["8333C931",0xC948],
- ["8333C932",0xC949],
- ["8333C933",0xC94A],
- ["8333C934",0xC94B],
- ["8333C935",0xC94C],
- ["8333C936",0xC94D],
- ["8333C937",0xC94E],
- ["8333C938",0xC94F],
- ["8333C939",0xC950],
- ["8333CA30",0xC951],
- ["8333CA31",0xC952],
- ["8333CA32",0xC953],
- ["8333CA33",0xC954],
- ["8333CA34",0xC955],
- ["8333CA35",0xC956],
- ["8333CA36",0xC957],
- ["8333CA37",0xC958],
- ["8333CA38",0xC959],
- ["8333CA39",0xC95A],
- ["8333CB30",0xC95B],
- ["8333CB31",0xC95C],
- ["8333CB32",0xC95D],
- ["8333CB33",0xC95E],
- ["8333CB34",0xC95F],
- ["8333CB35",0xC960],
- ["8333CB36",0xC961],
- ["8333CB37",0xC962],
- ["8333CB38",0xC963],
- ["8333CB39",0xC964],
- ["8333CC30",0xC965],
- ["8333CC31",0xC966],
- ["8333CC32",0xC967],
- ["8333CC33",0xC968],
- ["8333CC34",0xC969],
- ["8333CC35",0xC96A],
- ["8333CC36",0xC96B],
- ["8333CC37",0xC96C],
- ["8333CC38",0xC96D],
- ["8333CC39",0xC96E],
- ["8333CD30",0xC96F],
- ["8333CD31",0xC970],
- ["8333CD32",0xC971],
- ["8333CD33",0xC972],
- ["8333CD34",0xC973],
- ["8333CD35",0xC974],
- ["8333CD36",0xC975],
- ["8333CD37",0xC976],
- ["8333CD38",0xC977],
- ["8333CD39",0xC978],
- ["8333CE30",0xC979],
- ["8333CE31",0xC97A],
- ["8333CE32",0xC97B],
- ["8333CE33",0xC97C],
- ["8333CE34",0xC97D],
- ["8333CE35",0xC97E],
- ["8333CE36",0xC97F],
- ["8333CE37",0xC980],
- ["8333CE38",0xC981],
- ["8333CE39",0xC982],
- ["8333CF30",0xC983],
- ["8333CF31",0xC984],
- ["8333CF32",0xC985],
- ["8333CF33",0xC986],
- ["8333CF34",0xC987],
- ["8333CF35",0xC988],
- ["8333CF36",0xC989],
- ["8333CF37",0xC98A],
- ["8333CF38",0xC98B],
- ["8333CF39",0xC98C],
- ["8333D030",0xC98D],
- ["8333D031",0xC98E],
- ["8333D032",0xC98F],
- ["8333D033",0xC990],
- ["8333D034",0xC991],
- ["8333D035",0xC992],
- ["8333D036",0xC993],
- ["8333D037",0xC994],
- ["8333D038",0xC995],
- ["8333D039",0xC996],
- ["8333D130",0xC997],
- ["8333D131",0xC998],
- ["8333D132",0xC999],
- ["8333D133",0xC99A],
- ["8333D134",0xC99B],
- ["8333D135",0xC99C],
- ["8333D136",0xC99D],
- ["8333D137",0xC99E],
- ["8333D138",0xC99F],
- ["8333D139",0xC9A0],
- ["8333D230",0xC9A1],
- ["8333D231",0xC9A2],
- ["8333D232",0xC9A3],
- ["8333D233",0xC9A4],
- ["8333D234",0xC9A5],
- ["8333D235",0xC9A6],
- ["8333D236",0xC9A7],
- ["8333D237",0xC9A8],
- ["8333D238",0xC9A9],
- ["8333D239",0xC9AA],
- ["8333D330",0xC9AB],
- ["8333D331",0xC9AC],
- ["8333D332",0xC9AD],
- ["8333D333",0xC9AE],
- ["8333D334",0xC9AF],
- ["8333D335",0xC9B0],
- ["8333D336",0xC9B1],
- ["8333D337",0xC9B2],
- ["8333D338",0xC9B3],
- ["8333D339",0xC9B4],
- ["8333D430",0xC9B5],
- ["8333D431",0xC9B6],
- ["8333D432",0xC9B7],
- ["8333D433",0xC9B8],
- ["8333D434",0xC9B9],
- ["8333D435",0xC9BA],
- ["8333D436",0xC9BB],
- ["8333D437",0xC9BC],
- ["8333D438",0xC9BD],
- ["8333D439",0xC9BE],
- ["8333D530",0xC9BF],
- ["8333D531",0xC9C0],
- ["8333D532",0xC9C1],
- ["8333D533",0xC9C2],
- ["8333D534",0xC9C3],
- ["8333D535",0xC9C4],
- ["8333D536",0xC9C5],
- ["8333D537",0xC9C6],
- ["8333D538",0xC9C7],
- ["8333D539",0xC9C8],
- ["8333D630",0xC9C9],
- ["8333D631",0xC9CA],
- ["8333D632",0xC9CB],
- ["8333D633",0xC9CC],
- ["8333D634",0xC9CD],
- ["8333D635",0xC9CE],
- ["8333D636",0xC9CF],
- ["8333D637",0xC9D0],
- ["8333D638",0xC9D1],
- ["8333D639",0xC9D2],
- ["8333D730",0xC9D3],
- ["8333D731",0xC9D4],
- ["8333D732",0xC9D5],
- ["8333D733",0xC9D6],
- ["8333D734",0xC9D7],
- ["8333D735",0xC9D8],
- ["8333D736",0xC9D9],
- ["8333D737",0xC9DA],
- ["8333D738",0xC9DB],
- ["8333D739",0xC9DC],
- ["8333D830",0xC9DD],
- ["8333D831",0xC9DE],
- ["8333D832",0xC9DF],
- ["8333D833",0xC9E0],
- ["8333D834",0xC9E1],
- ["8333D835",0xC9E2],
- ["8333D836",0xC9E3],
- ["8333D837",0xC9E4],
- ["8333D838",0xC9E5],
- ["8333D839",0xC9E6],
- ["8333D930",0xC9E7],
- ["8333D931",0xC9E8],
- ["8333D932",0xC9E9],
- ["8333D933",0xC9EA],
- ["8333D934",0xC9EB],
- ["8333D935",0xC9EC],
- ["8333D936",0xC9ED],
- ["8333D937",0xC9EE],
- ["8333D938",0xC9EF],
- ["8333D939",0xC9F0],
- ["8333DA30",0xC9F1],
- ["8333DA31",0xC9F2],
- ["8333DA32",0xC9F3],
- ["8333DA33",0xC9F4],
- ["8333DA34",0xC9F5],
- ["8333DA35",0xC9F6],
- ["8333DA36",0xC9F7],
- ["8333DA37",0xC9F8],
- ["8333DA38",0xC9F9],
- ["8333DA39",0xC9FA],
- ["8333DB30",0xC9FB],
- ["8333DB31",0xC9FC],
- ["8333DB32",0xC9FD],
- ["8333DB33",0xC9FE],
- ["8333DB34",0xC9FF],
- ["8333DB35",0xCA00],
- ["8333DB36",0xCA01],
- ["8333DB37",0xCA02],
- ["8333DB38",0xCA03],
- ["8333DB39",0xCA04],
- ["8333DC30",0xCA05],
- ["8333DC31",0xCA06],
- ["8333DC32",0xCA07],
- ["8333DC33",0xCA08],
- ["8333DC34",0xCA09],
- ["8333DC35",0xCA0A],
- ["8333DC36",0xCA0B],
- ["8333DC37",0xCA0C],
- ["8333DC38",0xCA0D],
- ["8333DC39",0xCA0E],
- ["8333DD30",0xCA0F],
- ["8333DD31",0xCA10],
- ["8333DD32",0xCA11],
- ["8333DD33",0xCA12],
- ["8333DD34",0xCA13],
- ["8333DD35",0xCA14],
- ["8333DD36",0xCA15],
- ["8333DD37",0xCA16],
- ["8333DD38",0xCA17],
- ["8333DD39",0xCA18],
- ["8333DE30",0xCA19],
- ["8333DE31",0xCA1A],
- ["8333DE32",0xCA1B],
- ["8333DE33",0xCA1C],
- ["8333DE34",0xCA1D],
- ["8333DE35",0xCA1E],
- ["8333DE36",0xCA1F],
- ["8333DE37",0xCA20],
- ["8333DE38",0xCA21],
- ["8333DE39",0xCA22],
- ["8333DF30",0xCA23],
- ["8333DF31",0xCA24],
- ["8333DF32",0xCA25],
- ["8333DF33",0xCA26],
- ["8333DF34",0xCA27],
- ["8333DF35",0xCA28],
- ["8333DF36",0xCA29],
- ["8333DF37",0xCA2A],
- ["8333DF38",0xCA2B],
- ["8333DF39",0xCA2C],
- ["8333E030",0xCA2D],
- ["8333E031",0xCA2E],
- ["8333E032",0xCA2F],
- ["8333E033",0xCA30],
- ["8333E034",0xCA31],
- ["8333E035",0xCA32],
- ["8333E036",0xCA33],
- ["8333E037",0xCA34],
- ["8333E038",0xCA35],
- ["8333E039",0xCA36],
- ["8333E130",0xCA37],
- ["8333E131",0xCA38],
- ["8333E132",0xCA39],
- ["8333E133",0xCA3A],
- ["8333E134",0xCA3B],
- ["8333E135",0xCA3C],
- ["8333E136",0xCA3D],
- ["8333E137",0xCA3E],
- ["8333E138",0xCA3F],
- ["8333E139",0xCA40],
- ["8333E230",0xCA41],
- ["8333E231",0xCA42],
- ["8333E232",0xCA43],
- ["8333E233",0xCA44],
- ["8333E234",0xCA45],
- ["8333E235",0xCA46],
- ["8333E236",0xCA47],
- ["8333E237",0xCA48],
- ["8333E238",0xCA49],
- ["8333E239",0xCA4A],
- ["8333E330",0xCA4B],
- ["8333E331",0xCA4C],
- ["8333E332",0xCA4D],
- ["8333E333",0xCA4E],
- ["8333E334",0xCA4F],
- ["8333E335",0xCA50],
- ["8333E336",0xCA51],
- ["8333E337",0xCA52],
- ["8333E338",0xCA53],
- ["8333E339",0xCA54],
- ["8333E430",0xCA55],
- ["8333E431",0xCA56],
- ["8333E432",0xCA57],
- ["8333E433",0xCA58],
- ["8333E434",0xCA59],
- ["8333E435",0xCA5A],
- ["8333E436",0xCA5B],
- ["8333E437",0xCA5C],
- ["8333E438",0xCA5D],
- ["8333E439",0xCA5E],
- ["8333E530",0xCA5F],
- ["8333E531",0xCA60],
- ["8333E532",0xCA61],
- ["8333E533",0xCA62],
- ["8333E534",0xCA63],
- ["8333E535",0xCA64],
- ["8333E536",0xCA65],
- ["8333E537",0xCA66],
- ["8333E538",0xCA67],
- ["8333E539",0xCA68],
- ["8333E630",0xCA69],
- ["8333E631",0xCA6A],
- ["8333E632",0xCA6B],
- ["8333E633",0xCA6C],
- ["8333E634",0xCA6D],
- ["8333E635",0xCA6E],
- ["8333E636",0xCA6F],
- ["8333E637",0xCA70],
- ["8333E638",0xCA71],
- ["8333E639",0xCA72],
- ["8333E730",0xCA73],
- ["8333E731",0xCA74],
- ["8333E732",0xCA75],
- ["8333E733",0xCA76],
- ["8333E734",0xCA77],
- ["8333E735",0xCA78],
- ["8333E736",0xCA79],
- ["8333E737",0xCA7A],
- ["8333E738",0xCA7B],
- ["8333E739",0xCA7C],
- ["8333E830",0xCA7D],
- ["8333E831",0xCA7E],
- ["8333E832",0xCA7F],
- ["8333E833",0xCA80],
- ["8333E834",0xCA81],
- ["8333E835",0xCA82],
- ["8333E836",0xCA83],
- ["8333E837",0xCA84],
- ["8333E838",0xCA85],
- ["8333E839",0xCA86],
- ["8333E930",0xCA87],
- ["8333E931",0xCA88],
- ["8333E932",0xCA89],
- ["8333E933",0xCA8A],
- ["8333E934",0xCA8B],
- ["8333E935",0xCA8C],
- ["8333E936",0xCA8D],
- ["8333E937",0xCA8E],
- ["8333E938",0xCA8F],
- ["8333E939",0xCA90],
- ["8333EA30",0xCA91],
- ["8333EA31",0xCA92],
- ["8333EA32",0xCA93],
- ["8333EA33",0xCA94],
- ["8333EA34",0xCA95],
- ["8333EA35",0xCA96],
- ["8333EA36",0xCA97],
- ["8333EA37",0xCA98],
- ["8333EA38",0xCA99],
- ["8333EA39",0xCA9A],
- ["8333EB30",0xCA9B],
- ["8333EB31",0xCA9C],
- ["8333EB32",0xCA9D],
- ["8333EB33",0xCA9E],
- ["8333EB34",0xCA9F],
- ["8333EB35",0xCAA0],
- ["8333EB36",0xCAA1],
- ["8333EB37",0xCAA2],
- ["8333EB38",0xCAA3],
- ["8333EB39",0xCAA4],
- ["8333EC30",0xCAA5],
- ["8333EC31",0xCAA6],
- ["8333EC32",0xCAA7],
- ["8333EC33",0xCAA8],
- ["8333EC34",0xCAA9],
- ["8333EC35",0xCAAA],
- ["8333EC36",0xCAAB],
- ["8333EC37",0xCAAC],
- ["8333EC38",0xCAAD],
- ["8333EC39",0xCAAE],
- ["8333ED30",0xCAAF],
- ["8333ED31",0xCAB0],
- ["8333ED32",0xCAB1],
- ["8333ED33",0xCAB2],
- ["8333ED34",0xCAB3],
- ["8333ED35",0xCAB4],
- ["8333ED36",0xCAB5],
- ["8333ED37",0xCAB6],
- ["8333ED38",0xCAB7],
- ["8333ED39",0xCAB8],
- ["8333EE30",0xCAB9],
- ["8333EE31",0xCABA],
- ["8333EE32",0xCABB],
- ["8333EE33",0xCABC],
- ["8333EE34",0xCABD],
- ["8333EE35",0xCABE],
- ["8333EE36",0xCABF],
- ["8333EE37",0xCAC0],
- ["8333EE38",0xCAC1],
- ["8333EE39",0xCAC2],
- ["8333EF30",0xCAC3],
- ["8333EF31",0xCAC4],
- ["8333EF32",0xCAC5],
- ["8333EF33",0xCAC6],
- ["8333EF34",0xCAC7],
- ["8333EF35",0xCAC8],
- ["8333EF36",0xCAC9],
- ["8333EF37",0xCACA],
- ["8333EF38",0xCACB],
- ["8333EF39",0xCACC],
- ["8333F030",0xCACD],
- ["8333F031",0xCACE],
- ["8333F032",0xCACF],
- ["8333F033",0xCAD0],
- ["8333F034",0xCAD1],
- ["8333F035",0xCAD2],
- ["8333F036",0xCAD3],
- ["8333F037",0xCAD4],
- ["8333F038",0xCAD5],
- ["8333F039",0xCAD6],
- ["8333F130",0xCAD7],
- ["8333F131",0xCAD8],
- ["8333F132",0xCAD9],
- ["8333F133",0xCADA],
- ["8333F134",0xCADB],
- ["8333F135",0xCADC],
- ["8333F136",0xCADD],
- ["8333F137",0xCADE],
- ["8333F138",0xCADF],
- ["8333F139",0xCAE0],
- ["8333F230",0xCAE1],
- ["8333F231",0xCAE2],
- ["8333F232",0xCAE3],
- ["8333F233",0xCAE4],
- ["8333F234",0xCAE5],
- ["8333F235",0xCAE6],
- ["8333F236",0xCAE7],
- ["8333F237",0xCAE8],
- ["8333F238",0xCAE9],
- ["8333F239",0xCAEA],
- ["8333F330",0xCAEB],
- ["8333F331",0xCAEC],
- ["8333F332",0xCAED],
- ["8333F333",0xCAEE],
- ["8333F334",0xCAEF],
- ["8333F335",0xCAF0],
- ["8333F336",0xCAF1],
- ["8333F337",0xCAF2],
- ["8333F338",0xCAF3],
- ["8333F339",0xCAF4],
- ["8333F430",0xCAF5],
- ["8333F431",0xCAF6],
- ["8333F432",0xCAF7],
- ["8333F433",0xCAF8],
- ["8333F434",0xCAF9],
- ["8333F435",0xCAFA],
- ["8333F436",0xCAFB],
- ["8333F437",0xCAFC],
- ["8333F438",0xCAFD],
- ["8333F439",0xCAFE],
- ["8333F530",0xCAFF],
- ["8333F531",0xCB00],
- ["8333F532",0xCB01],
- ["8333F533",0xCB02],
- ["8333F534",0xCB03],
- ["8333F535",0xCB04],
- ["8333F536",0xCB05],
- ["8333F537",0xCB06],
- ["8333F538",0xCB07],
- ["8333F539",0xCB08],
- ["8333F630",0xCB09],
- ["8333F631",0xCB0A],
- ["8333F632",0xCB0B],
- ["8333F633",0xCB0C],
- ["8333F634",0xCB0D],
- ["8333F635",0xCB0E],
- ["8333F636",0xCB0F],
- ["8333F637",0xCB10],
- ["8333F638",0xCB11],
- ["8333F639",0xCB12],
- ["8333F730",0xCB13],
- ["8333F731",0xCB14],
- ["8333F732",0xCB15],
- ["8333F733",0xCB16],
- ["8333F734",0xCB17],
- ["8333F735",0xCB18],
- ["8333F736",0xCB19],
- ["8333F737",0xCB1A],
- ["8333F738",0xCB1B],
- ["8333F739",0xCB1C],
- ["8333F830",0xCB1D],
- ["8333F831",0xCB1E],
- ["8333F832",0xCB1F],
- ["8333F833",0xCB20],
- ["8333F834",0xCB21],
- ["8333F835",0xCB22],
- ["8333F836",0xCB23],
- ["8333F837",0xCB24],
- ["8333F838",0xCB25],
- ["8333F839",0xCB26],
- ["8333F930",0xCB27],
- ["8333F931",0xCB28],
- ["8333F932",0xCB29],
- ["8333F933",0xCB2A],
- ["8333F934",0xCB2B],
- ["8333F935",0xCB2C],
- ["8333F936",0xCB2D],
- ["8333F937",0xCB2E],
- ["8333F938",0xCB2F],
- ["8333F939",0xCB30],
- ["8333FA30",0xCB31],
- ["8333FA31",0xCB32],
- ["8333FA32",0xCB33],
- ["8333FA33",0xCB34],
- ["8333FA34",0xCB35],
- ["8333FA35",0xCB36],
- ["8333FA36",0xCB37],
- ["8333FA37",0xCB38],
- ["8333FA38",0xCB39],
- ["8333FA39",0xCB3A],
- ["8333FB30",0xCB3B],
- ["8333FB31",0xCB3C],
- ["8333FB32",0xCB3D],
- ["8333FB33",0xCB3E],
- ["8333FB34",0xCB3F],
- ["8333FB35",0xCB40],
- ["8333FB36",0xCB41],
- ["8333FB37",0xCB42],
- ["8333FB38",0xCB43],
- ["8333FB39",0xCB44],
- ["8333FC30",0xCB45],
- ["8333FC31",0xCB46],
- ["8333FC32",0xCB47],
- ["8333FC33",0xCB48],
- ["8333FC34",0xCB49],
- ["8333FC35",0xCB4A],
- ["8333FC36",0xCB4B],
- ["8333FC37",0xCB4C],
- ["8333FC38",0xCB4D],
- ["8333FC39",0xCB4E],
- ["8333FD30",0xCB4F],
- ["8333FD31",0xCB50],
- ["8333FD32",0xCB51],
- ["8333FD33",0xCB52],
- ["8333FD34",0xCB53],
- ["8333FD35",0xCB54],
- ["8333FD36",0xCB55],
- ["8333FD37",0xCB56],
- ["8333FD38",0xCB57],
- ["8333FD39",0xCB58],
- ["8333FE30",0xCB59],
- ["8333FE31",0xCB5A],
- ["8333FE32",0xCB5B],
- ["8333FE33",0xCB5C],
- ["8333FE34",0xCB5D],
- ["8333FE35",0xCB5E],
- ["8333FE36",0xCB5F],
- ["8333FE37",0xCB60],
- ["8333FE38",0xCB61],
- ["8333FE39",0xCB62],
- ["83348130",0xCB63],
- ["83348131",0xCB64],
- ["83348132",0xCB65],
- ["83348133",0xCB66],
- ["83348134",0xCB67],
- ["83348135",0xCB68],
- ["83348136",0xCB69],
- ["83348137",0xCB6A],
- ["83348138",0xCB6B],
- ["83348139",0xCB6C],
- ["83348230",0xCB6D],
- ["83348231",0xCB6E],
- ["83348232",0xCB6F],
- ["83348233",0xCB70],
- ["83348234",0xCB71],
- ["83348235",0xCB72],
- ["83348236",0xCB73],
- ["83348237",0xCB74],
- ["83348238",0xCB75],
- ["83348239",0xCB76],
- ["83348330",0xCB77],
- ["83348331",0xCB78],
- ["83348332",0xCB79],
- ["83348333",0xCB7A],
- ["83348334",0xCB7B],
- ["83348335",0xCB7C],
- ["83348336",0xCB7D],
- ["83348337",0xCB7E],
- ["83348338",0xCB7F],
- ["83348339",0xCB80],
- ["83348430",0xCB81],
- ["83348431",0xCB82],
- ["83348432",0xCB83],
- ["83348433",0xCB84],
- ["83348434",0xCB85],
- ["83348435",0xCB86],
- ["83348436",0xCB87],
- ["83348437",0xCB88],
- ["83348438",0xCB89],
- ["83348439",0xCB8A],
- ["83348530",0xCB8B],
- ["83348531",0xCB8C],
- ["83348532",0xCB8D],
- ["83348533",0xCB8E],
- ["83348534",0xCB8F],
- ["83348535",0xCB90],
- ["83348536",0xCB91],
- ["83348537",0xCB92],
- ["83348538",0xCB93],
- ["83348539",0xCB94],
- ["83348630",0xCB95],
- ["83348631",0xCB96],
- ["83348632",0xCB97],
- ["83348633",0xCB98],
- ["83348634",0xCB99],
- ["83348635",0xCB9A],
- ["83348636",0xCB9B],
- ["83348637",0xCB9C],
- ["83348638",0xCB9D],
- ["83348639",0xCB9E],
- ["83348730",0xCB9F],
- ["83348731",0xCBA0],
- ["83348732",0xCBA1],
- ["83348733",0xCBA2],
- ["83348734",0xCBA3],
- ["83348735",0xCBA4],
- ["83348736",0xCBA5],
- ["83348737",0xCBA6],
- ["83348738",0xCBA7],
- ["83348739",0xCBA8],
- ["83348830",0xCBA9],
- ["83348831",0xCBAA],
- ["83348832",0xCBAB],
- ["83348833",0xCBAC],
- ["83348834",0xCBAD],
- ["83348835",0xCBAE],
- ["83348836",0xCBAF],
- ["83348837",0xCBB0],
- ["83348838",0xCBB1],
- ["83348839",0xCBB2],
- ["83348930",0xCBB3],
- ["83348931",0xCBB4],
- ["83348932",0xCBB5],
- ["83348933",0xCBB6],
- ["83348934",0xCBB7],
- ["83348935",0xCBB8],
- ["83348936",0xCBB9],
- ["83348937",0xCBBA],
- ["83348938",0xCBBB],
- ["83348939",0xCBBC],
- ["83348A30",0xCBBD],
- ["83348A31",0xCBBE],
- ["83348A32",0xCBBF],
- ["83348A33",0xCBC0],
- ["83348A34",0xCBC1],
- ["83348A35",0xCBC2],
- ["83348A36",0xCBC3],
- ["83348A37",0xCBC4],
- ["83348A38",0xCBC5],
- ["83348A39",0xCBC6],
- ["83348B30",0xCBC7],
- ["83348B31",0xCBC8],
- ["83348B32",0xCBC9],
- ["83348B33",0xCBCA],
- ["83348B34",0xCBCB],
- ["83348B35",0xCBCC],
- ["83348B36",0xCBCD],
- ["83348B37",0xCBCE],
- ["83348B38",0xCBCF],
- ["83348B39",0xCBD0],
- ["83348C30",0xCBD1],
- ["83348C31",0xCBD2],
- ["83348C32",0xCBD3],
- ["83348C33",0xCBD4],
- ["83348C34",0xCBD5],
- ["83348C35",0xCBD6],
- ["83348C36",0xCBD7],
- ["83348C37",0xCBD8],
- ["83348C38",0xCBD9],
- ["83348C39",0xCBDA],
- ["83348D30",0xCBDB],
- ["83348D31",0xCBDC],
- ["83348D32",0xCBDD],
- ["83348D33",0xCBDE],
- ["83348D34",0xCBDF],
- ["83348D35",0xCBE0],
- ["83348D36",0xCBE1],
- ["83348D37",0xCBE2],
- ["83348D38",0xCBE3],
- ["83348D39",0xCBE4],
- ["83348E30",0xCBE5],
- ["83348E31",0xCBE6],
- ["83348E32",0xCBE7],
- ["83348E33",0xCBE8],
- ["83348E34",0xCBE9],
- ["83348E35",0xCBEA],
- ["83348E36",0xCBEB],
- ["83348E37",0xCBEC],
- ["83348E38",0xCBED],
- ["83348E39",0xCBEE],
- ["83348F30",0xCBEF],
- ["83348F31",0xCBF0],
- ["83348F32",0xCBF1],
- ["83348F33",0xCBF2],
- ["83348F34",0xCBF3],
- ["83348F35",0xCBF4],
- ["83348F36",0xCBF5],
- ["83348F37",0xCBF6],
- ["83348F38",0xCBF7],
- ["83348F39",0xCBF8],
- ["83349030",0xCBF9],
- ["83349031",0xCBFA],
- ["83349032",0xCBFB],
- ["83349033",0xCBFC],
- ["83349034",0xCBFD],
- ["83349035",0xCBFE],
- ["83349036",0xCBFF],
- ["83349037",0xCC00],
- ["83349038",0xCC01],
- ["83349039",0xCC02],
- ["83349130",0xCC03],
- ["83349131",0xCC04],
- ["83349132",0xCC05],
- ["83349133",0xCC06],
- ["83349134",0xCC07],
- ["83349135",0xCC08],
- ["83349136",0xCC09],
- ["83349137",0xCC0A],
- ["83349138",0xCC0B],
- ["83349139",0xCC0C],
- ["83349230",0xCC0D],
- ["83349231",0xCC0E],
- ["83349232",0xCC0F],
- ["83349233",0xCC10],
- ["83349234",0xCC11],
- ["83349235",0xCC12],
- ["83349236",0xCC13],
- ["83349237",0xCC14],
- ["83349238",0xCC15],
- ["83349239",0xCC16],
- ["83349330",0xCC17],
- ["83349331",0xCC18],
- ["83349332",0xCC19],
- ["83349333",0xCC1A],
- ["83349334",0xCC1B],
- ["83349335",0xCC1C],
- ["83349336",0xCC1D],
- ["83349337",0xCC1E],
- ["83349338",0xCC1F],
- ["83349339",0xCC20],
- ["83349430",0xCC21],
- ["83349431",0xCC22],
- ["83349432",0xCC23],
- ["83349433",0xCC24],
- ["83349434",0xCC25],
- ["83349435",0xCC26],
- ["83349436",0xCC27],
- ["83349437",0xCC28],
- ["83349438",0xCC29],
- ["83349439",0xCC2A],
- ["83349530",0xCC2B],
- ["83349531",0xCC2C],
- ["83349532",0xCC2D],
- ["83349533",0xCC2E],
- ["83349534",0xCC2F],
- ["83349535",0xCC30],
- ["83349536",0xCC31],
- ["83349537",0xCC32],
- ["83349538",0xCC33],
- ["83349539",0xCC34],
- ["83349630",0xCC35],
- ["83349631",0xCC36],
- ["83349632",0xCC37],
- ["83349633",0xCC38],
- ["83349634",0xCC39],
- ["83349635",0xCC3A],
- ["83349636",0xCC3B],
- ["83349637",0xCC3C],
- ["83349638",0xCC3D],
- ["83349639",0xCC3E],
- ["83349730",0xCC3F],
- ["83349731",0xCC40],
- ["83349732",0xCC41],
- ["83349733",0xCC42],
- ["83349734",0xCC43],
- ["83349735",0xCC44],
- ["83349736",0xCC45],
- ["83349737",0xCC46],
- ["83349738",0xCC47],
- ["83349739",0xCC48],
- ["83349830",0xCC49],
- ["83349831",0xCC4A],
- ["83349832",0xCC4B],
- ["83349833",0xCC4C],
- ["83349834",0xCC4D],
- ["83349835",0xCC4E],
- ["83349836",0xCC4F],
- ["83349837",0xCC50],
- ["83349838",0xCC51],
- ["83349839",0xCC52],
- ["83349930",0xCC53],
- ["83349931",0xCC54],
- ["83349932",0xCC55],
- ["83349933",0xCC56],
- ["83349934",0xCC57],
- ["83349935",0xCC58],
- ["83349936",0xCC59],
- ["83349937",0xCC5A],
- ["83349938",0xCC5B],
- ["83349939",0xCC5C],
- ["83349A30",0xCC5D],
- ["83349A31",0xCC5E],
- ["83349A32",0xCC5F],
- ["83349A33",0xCC60],
- ["83349A34",0xCC61],
- ["83349A35",0xCC62],
- ["83349A36",0xCC63],
- ["83349A37",0xCC64],
- ["83349A38",0xCC65],
- ["83349A39",0xCC66],
- ["83349B30",0xCC67],
- ["83349B31",0xCC68],
- ["83349B32",0xCC69],
- ["83349B33",0xCC6A],
- ["83349B34",0xCC6B],
- ["83349B35",0xCC6C],
- ["83349B36",0xCC6D],
- ["83349B37",0xCC6E],
- ["83349B38",0xCC6F],
- ["83349B39",0xCC70],
- ["83349C30",0xCC71],
- ["83349C31",0xCC72],
- ["83349C32",0xCC73],
- ["83349C33",0xCC74],
- ["83349C34",0xCC75],
- ["83349C35",0xCC76],
- ["83349C36",0xCC77],
- ["83349C37",0xCC78],
- ["83349C38",0xCC79],
- ["83349C39",0xCC7A],
- ["83349D30",0xCC7B],
- ["83349D31",0xCC7C],
- ["83349D32",0xCC7D],
- ["83349D33",0xCC7E],
- ["83349D34",0xCC7F],
- ["83349D35",0xCC80],
- ["83349D36",0xCC81],
- ["83349D37",0xCC82],
- ["83349D38",0xCC83],
- ["83349D39",0xCC84],
- ["83349E30",0xCC85],
- ["83349E31",0xCC86],
- ["83349E32",0xCC87],
- ["83349E33",0xCC88],
- ["83349E34",0xCC89],
- ["83349E35",0xCC8A],
- ["83349E36",0xCC8B],
- ["83349E37",0xCC8C],
- ["83349E38",0xCC8D],
- ["83349E39",0xCC8E],
- ["83349F30",0xCC8F],
- ["83349F31",0xCC90],
- ["83349F32",0xCC91],
- ["83349F33",0xCC92],
- ["83349F34",0xCC93],
- ["83349F35",0xCC94],
- ["83349F36",0xCC95],
- ["83349F37",0xCC96],
- ["83349F38",0xCC97],
- ["83349F39",0xCC98],
- ["8334A030",0xCC99],
- ["8334A031",0xCC9A],
- ["8334A032",0xCC9B],
- ["8334A033",0xCC9C],
- ["8334A034",0xCC9D],
- ["8334A035",0xCC9E],
- ["8334A036",0xCC9F],
- ["8334A037",0xCCA0],
- ["8334A038",0xCCA1],
- ["8334A039",0xCCA2],
- ["8334A130",0xCCA3],
- ["8334A131",0xCCA4],
- ["8334A132",0xCCA5],
- ["8334A133",0xCCA6],
- ["8334A134",0xCCA7],
- ["8334A135",0xCCA8],
- ["8334A136",0xCCA9],
- ["8334A137",0xCCAA],
- ["8334A138",0xCCAB],
- ["8334A139",0xCCAC],
- ["8334A230",0xCCAD],
- ["8334A231",0xCCAE],
- ["8334A232",0xCCAF],
- ["8334A233",0xCCB0],
- ["8334A234",0xCCB1],
- ["8334A235",0xCCB2],
- ["8334A236",0xCCB3],
- ["8334A237",0xCCB4],
- ["8334A238",0xCCB5],
- ["8334A239",0xCCB6],
- ["8334A330",0xCCB7],
- ["8334A331",0xCCB8],
- ["8334A332",0xCCB9],
- ["8334A333",0xCCBA],
- ["8334A334",0xCCBB],
- ["8334A335",0xCCBC],
- ["8334A336",0xCCBD],
- ["8334A337",0xCCBE],
- ["8334A338",0xCCBF],
- ["8334A339",0xCCC0],
- ["8334A430",0xCCC1],
- ["8334A431",0xCCC2],
- ["8334A432",0xCCC3],
- ["8334A433",0xCCC4],
- ["8334A434",0xCCC5],
- ["8334A435",0xCCC6],
- ["8334A436",0xCCC7],
- ["8334A437",0xCCC8],
- ["8334A438",0xCCC9],
- ["8334A439",0xCCCA],
- ["8334A530",0xCCCB],
- ["8334A531",0xCCCC],
- ["8334A532",0xCCCD],
- ["8334A533",0xCCCE],
- ["8334A534",0xCCCF],
- ["8334A535",0xCCD0],
- ["8334A536",0xCCD1],
- ["8334A537",0xCCD2],
- ["8334A538",0xCCD3],
- ["8334A539",0xCCD4],
- ["8334A630",0xCCD5],
- ["8334A631",0xCCD6],
- ["8334A632",0xCCD7],
- ["8334A633",0xCCD8],
- ["8334A634",0xCCD9],
- ["8334A635",0xCCDA],
- ["8334A636",0xCCDB],
- ["8334A637",0xCCDC],
- ["8334A638",0xCCDD],
- ["8334A639",0xCCDE],
- ["8334A730",0xCCDF],
- ["8334A731",0xCCE0],
- ["8334A732",0xCCE1],
- ["8334A733",0xCCE2],
- ["8334A734",0xCCE3],
- ["8334A735",0xCCE4],
- ["8334A736",0xCCE5],
- ["8334A737",0xCCE6],
- ["8334A738",0xCCE7],
- ["8334A739",0xCCE8],
- ["8334A830",0xCCE9],
- ["8334A831",0xCCEA],
- ["8334A832",0xCCEB],
- ["8334A833",0xCCEC],
- ["8334A834",0xCCED],
- ["8334A835",0xCCEE],
- ["8334A836",0xCCEF],
- ["8334A837",0xCCF0],
- ["8334A838",0xCCF1],
- ["8334A839",0xCCF2],
- ["8334A930",0xCCF3],
- ["8334A931",0xCCF4],
- ["8334A932",0xCCF5],
- ["8334A933",0xCCF6],
- ["8334A934",0xCCF7],
- ["8334A935",0xCCF8],
- ["8334A936",0xCCF9],
- ["8334A937",0xCCFA],
- ["8334A938",0xCCFB],
- ["8334A939",0xCCFC],
- ["8334AA30",0xCCFD],
- ["8334AA31",0xCCFE],
- ["8334AA32",0xCCFF],
- ["8334AA33",0xCD00],
- ["8334AA34",0xCD01],
- ["8334AA35",0xCD02],
- ["8334AA36",0xCD03],
- ["8334AA37",0xCD04],
- ["8334AA38",0xCD05],
- ["8334AA39",0xCD06],
- ["8334AB30",0xCD07],
- ["8334AB31",0xCD08],
- ["8334AB32",0xCD09],
- ["8334AB33",0xCD0A],
- ["8334AB34",0xCD0B],
- ["8334AB35",0xCD0C],
- ["8334AB36",0xCD0D],
- ["8334AB37",0xCD0E],
- ["8334AB38",0xCD0F],
- ["8334AB39",0xCD10],
- ["8334AC30",0xCD11],
- ["8334AC31",0xCD12],
- ["8334AC32",0xCD13],
- ["8334AC33",0xCD14],
- ["8334AC34",0xCD15],
- ["8334AC35",0xCD16],
- ["8334AC36",0xCD17],
- ["8334AC37",0xCD18],
- ["8334AC38",0xCD19],
- ["8334AC39",0xCD1A],
- ["8334AD30",0xCD1B],
- ["8334AD31",0xCD1C],
- ["8334AD32",0xCD1D],
- ["8334AD33",0xCD1E],
- ["8334AD34",0xCD1F],
- ["8334AD35",0xCD20],
- ["8334AD36",0xCD21],
- ["8334AD37",0xCD22],
- ["8334AD38",0xCD23],
- ["8334AD39",0xCD24],
- ["8334AE30",0xCD25],
- ["8334AE31",0xCD26],
- ["8334AE32",0xCD27],
- ["8334AE33",0xCD28],
- ["8334AE34",0xCD29],
- ["8334AE35",0xCD2A],
- ["8334AE36",0xCD2B],
- ["8334AE37",0xCD2C],
- ["8334AE38",0xCD2D],
- ["8334AE39",0xCD2E],
- ["8334AF30",0xCD2F],
- ["8334AF31",0xCD30],
- ["8334AF32",0xCD31],
- ["8334AF33",0xCD32],
- ["8334AF34",0xCD33],
- ["8334AF35",0xCD34],
- ["8334AF36",0xCD35],
- ["8334AF37",0xCD36],
- ["8334AF38",0xCD37],
- ["8334AF39",0xCD38],
- ["8334B030",0xCD39],
- ["8334B031",0xCD3A],
- ["8334B032",0xCD3B],
- ["8334B033",0xCD3C],
- ["8334B034",0xCD3D],
- ["8334B035",0xCD3E],
- ["8334B036",0xCD3F],
- ["8334B037",0xCD40],
- ["8334B038",0xCD41],
- ["8334B039",0xCD42],
- ["8334B130",0xCD43],
- ["8334B131",0xCD44],
- ["8334B132",0xCD45],
- ["8334B133",0xCD46],
- ["8334B134",0xCD47],
- ["8334B135",0xCD48],
- ["8334B136",0xCD49],
- ["8334B137",0xCD4A],
- ["8334B138",0xCD4B],
- ["8334B139",0xCD4C],
- ["8334B230",0xCD4D],
- ["8334B231",0xCD4E],
- ["8334B232",0xCD4F],
- ["8334B233",0xCD50],
- ["8334B234",0xCD51],
- ["8334B235",0xCD52],
- ["8334B236",0xCD53],
- ["8334B237",0xCD54],
- ["8334B238",0xCD55],
- ["8334B239",0xCD56],
- ["8334B330",0xCD57],
- ["8334B331",0xCD58],
- ["8334B332",0xCD59],
- ["8334B333",0xCD5A],
- ["8334B334",0xCD5B],
- ["8334B335",0xCD5C],
- ["8334B336",0xCD5D],
- ["8334B337",0xCD5E],
- ["8334B338",0xCD5F],
- ["8334B339",0xCD60],
- ["8334B430",0xCD61],
- ["8334B431",0xCD62],
- ["8334B432",0xCD63],
- ["8334B433",0xCD64],
- ["8334B434",0xCD65],
- ["8334B435",0xCD66],
- ["8334B436",0xCD67],
- ["8334B437",0xCD68],
- ["8334B438",0xCD69],
- ["8334B439",0xCD6A],
- ["8334B530",0xCD6B],
- ["8334B531",0xCD6C],
- ["8334B532",0xCD6D],
- ["8334B533",0xCD6E],
- ["8334B534",0xCD6F],
- ["8334B535",0xCD70],
- ["8334B536",0xCD71],
- ["8334B537",0xCD72],
- ["8334B538",0xCD73],
- ["8334B539",0xCD74],
- ["8334B630",0xCD75],
- ["8334B631",0xCD76],
- ["8334B632",0xCD77],
- ["8334B633",0xCD78],
- ["8334B634",0xCD79],
- ["8334B635",0xCD7A],
- ["8334B636",0xCD7B],
- ["8334B637",0xCD7C],
- ["8334B638",0xCD7D],
- ["8334B639",0xCD7E],
- ["8334B730",0xCD7F],
- ["8334B731",0xCD80],
- ["8334B732",0xCD81],
- ["8334B733",0xCD82],
- ["8334B734",0xCD83],
- ["8334B735",0xCD84],
- ["8334B736",0xCD85],
- ["8334B737",0xCD86],
- ["8334B738",0xCD87],
- ["8334B739",0xCD88],
- ["8334B830",0xCD89],
- ["8334B831",0xCD8A],
- ["8334B832",0xCD8B],
- ["8334B833",0xCD8C],
- ["8334B834",0xCD8D],
- ["8334B835",0xCD8E],
- ["8334B836",0xCD8F],
- ["8334B837",0xCD90],
- ["8334B838",0xCD91],
- ["8334B839",0xCD92],
- ["8334B930",0xCD93],
- ["8334B931",0xCD94],
- ["8334B932",0xCD95],
- ["8334B933",0xCD96],
- ["8334B934",0xCD97],
- ["8334B935",0xCD98],
- ["8334B936",0xCD99],
- ["8334B937",0xCD9A],
- ["8334B938",0xCD9B],
- ["8334B939",0xCD9C],
- ["8334BA30",0xCD9D],
- ["8334BA31",0xCD9E],
- ["8334BA32",0xCD9F],
- ["8334BA33",0xCDA0],
- ["8334BA34",0xCDA1],
- ["8334BA35",0xCDA2],
- ["8334BA36",0xCDA3],
- ["8334BA37",0xCDA4],
- ["8334BA38",0xCDA5],
- ["8334BA39",0xCDA6],
- ["8334BB30",0xCDA7],
- ["8334BB31",0xCDA8],
- ["8334BB32",0xCDA9],
- ["8334BB33",0xCDAA],
- ["8334BB34",0xCDAB],
- ["8334BB35",0xCDAC],
- ["8334BB36",0xCDAD],
- ["8334BB37",0xCDAE],
- ["8334BB38",0xCDAF],
- ["8334BB39",0xCDB0],
- ["8334BC30",0xCDB1],
- ["8334BC31",0xCDB2],
- ["8334BC32",0xCDB3],
- ["8334BC33",0xCDB4],
- ["8334BC34",0xCDB5],
- ["8334BC35",0xCDB6],
- ["8334BC36",0xCDB7],
- ["8334BC37",0xCDB8],
- ["8334BC38",0xCDB9],
- ["8334BC39",0xCDBA],
- ["8334BD30",0xCDBB],
- ["8334BD31",0xCDBC],
- ["8334BD32",0xCDBD],
- ["8334BD33",0xCDBE],
- ["8334BD34",0xCDBF],
- ["8334BD35",0xCDC0],
- ["8334BD36",0xCDC1],
- ["8334BD37",0xCDC2],
- ["8334BD38",0xCDC3],
- ["8334BD39",0xCDC4],
- ["8334BE30",0xCDC5],
- ["8334BE31",0xCDC6],
- ["8334BE32",0xCDC7],
- ["8334BE33",0xCDC8],
- ["8334BE34",0xCDC9],
- ["8334BE35",0xCDCA],
- ["8334BE36",0xCDCB],
- ["8334BE37",0xCDCC],
- ["8334BE38",0xCDCD],
- ["8334BE39",0xCDCE],
- ["8334BF30",0xCDCF],
- ["8334BF31",0xCDD0],
- ["8334BF32",0xCDD1],
- ["8334BF33",0xCDD2],
- ["8334BF34",0xCDD3],
- ["8334BF35",0xCDD4],
- ["8334BF36",0xCDD5],
- ["8334BF37",0xCDD6],
- ["8334BF38",0xCDD7],
- ["8334BF39",0xCDD8],
- ["8334C030",0xCDD9],
- ["8334C031",0xCDDA],
- ["8334C032",0xCDDB],
- ["8334C033",0xCDDC],
- ["8334C034",0xCDDD],
- ["8334C035",0xCDDE],
- ["8334C036",0xCDDF],
- ["8334C037",0xCDE0],
- ["8334C038",0xCDE1],
- ["8334C039",0xCDE2],
- ["8334C130",0xCDE3],
- ["8334C131",0xCDE4],
- ["8334C132",0xCDE5],
- ["8334C133",0xCDE6],
- ["8334C134",0xCDE7],
- ["8334C135",0xCDE8],
- ["8334C136",0xCDE9],
- ["8334C137",0xCDEA],
- ["8334C138",0xCDEB],
- ["8334C139",0xCDEC],
- ["8334C230",0xCDED],
- ["8334C231",0xCDEE],
- ["8334C232",0xCDEF],
- ["8334C233",0xCDF0],
- ["8334C234",0xCDF1],
- ["8334C235",0xCDF2],
- ["8334C236",0xCDF3],
- ["8334C237",0xCDF4],
- ["8334C238",0xCDF5],
- ["8334C239",0xCDF6],
- ["8334C330",0xCDF7],
- ["8334C331",0xCDF8],
- ["8334C332",0xCDF9],
- ["8334C333",0xCDFA],
- ["8334C334",0xCDFB],
- ["8334C335",0xCDFC],
- ["8334C336",0xCDFD],
- ["8334C337",0xCDFE],
- ["8334C338",0xCDFF],
- ["8334C339",0xCE00],
- ["8334C430",0xCE01],
- ["8334C431",0xCE02],
- ["8334C432",0xCE03],
- ["8334C433",0xCE04],
- ["8334C434",0xCE05],
- ["8334C435",0xCE06],
- ["8334C436",0xCE07],
- ["8334C437",0xCE08],
- ["8334C438",0xCE09],
- ["8334C439",0xCE0A],
- ["8334C530",0xCE0B],
- ["8334C531",0xCE0C],
- ["8334C532",0xCE0D],
- ["8334C533",0xCE0E],
- ["8334C534",0xCE0F],
- ["8334C535",0xCE10],
- ["8334C536",0xCE11],
- ["8334C537",0xCE12],
- ["8334C538",0xCE13],
- ["8334C539",0xCE14],
- ["8334C630",0xCE15],
- ["8334C631",0xCE16],
- ["8334C632",0xCE17],
- ["8334C633",0xCE18],
- ["8334C634",0xCE19],
- ["8334C635",0xCE1A],
- ["8334C636",0xCE1B],
- ["8334C637",0xCE1C],
- ["8334C638",0xCE1D],
- ["8334C639",0xCE1E],
- ["8334C730",0xCE1F],
- ["8334C731",0xCE20],
- ["8334C732",0xCE21],
- ["8334C733",0xCE22],
- ["8334C734",0xCE23],
- ["8334C735",0xCE24],
- ["8334C736",0xCE25],
- ["8334C737",0xCE26],
- ["8334C738",0xCE27],
- ["8334C739",0xCE28],
- ["8334C830",0xCE29],
- ["8334C831",0xCE2A],
- ["8334C832",0xCE2B],
- ["8334C833",0xCE2C],
- ["8334C834",0xCE2D],
- ["8334C835",0xCE2E],
- ["8334C836",0xCE2F],
- ["8334C837",0xCE30],
- ["8334C838",0xCE31],
- ["8334C839",0xCE32],
- ["8334C930",0xCE33],
- ["8334C931",0xCE34],
- ["8334C932",0xCE35],
- ["8334C933",0xCE36],
- ["8334C934",0xCE37],
- ["8334C935",0xCE38],
- ["8334C936",0xCE39],
- ["8334C937",0xCE3A],
- ["8334C938",0xCE3B],
- ["8334C939",0xCE3C],
- ["8334CA30",0xCE3D],
- ["8334CA31",0xCE3E],
- ["8334CA32",0xCE3F],
- ["8334CA33",0xCE40],
- ["8334CA34",0xCE41],
- ["8334CA35",0xCE42],
- ["8334CA36",0xCE43],
- ["8334CA37",0xCE44],
- ["8334CA38",0xCE45],
- ["8334CA39",0xCE46],
- ["8334CB30",0xCE47],
- ["8334CB31",0xCE48],
- ["8334CB32",0xCE49],
- ["8334CB33",0xCE4A],
- ["8334CB34",0xCE4B],
- ["8334CB35",0xCE4C],
- ["8334CB36",0xCE4D],
- ["8334CB37",0xCE4E],
- ["8334CB38",0xCE4F],
- ["8334CB39",0xCE50],
- ["8334CC30",0xCE51],
- ["8334CC31",0xCE52],
- ["8334CC32",0xCE53],
- ["8334CC33",0xCE54],
- ["8334CC34",0xCE55],
- ["8334CC35",0xCE56],
- ["8334CC36",0xCE57],
- ["8334CC37",0xCE58],
- ["8334CC38",0xCE59],
- ["8334CC39",0xCE5A],
- ["8334CD30",0xCE5B],
- ["8334CD31",0xCE5C],
- ["8334CD32",0xCE5D],
- ["8334CD33",0xCE5E],
- ["8334CD34",0xCE5F],
- ["8334CD35",0xCE60],
- ["8334CD36",0xCE61],
- ["8334CD37",0xCE62],
- ["8334CD38",0xCE63],
- ["8334CD39",0xCE64],
- ["8334CE30",0xCE65],
- ["8334CE31",0xCE66],
- ["8334CE32",0xCE67],
- ["8334CE33",0xCE68],
- ["8334CE34",0xCE69],
- ["8334CE35",0xCE6A],
- ["8334CE36",0xCE6B],
- ["8334CE37",0xCE6C],
- ["8334CE38",0xCE6D],
- ["8334CE39",0xCE6E],
- ["8334CF30",0xCE6F],
- ["8334CF31",0xCE70],
- ["8334CF32",0xCE71],
- ["8334CF33",0xCE72],
- ["8334CF34",0xCE73],
- ["8334CF35",0xCE74],
- ["8334CF36",0xCE75],
- ["8334CF37",0xCE76],
- ["8334CF38",0xCE77],
- ["8334CF39",0xCE78],
- ["8334D030",0xCE79],
- ["8334D031",0xCE7A],
- ["8334D032",0xCE7B],
- ["8334D033",0xCE7C],
- ["8334D034",0xCE7D],
- ["8334D035",0xCE7E],
- ["8334D036",0xCE7F],
- ["8334D037",0xCE80],
- ["8334D038",0xCE81],
- ["8334D039",0xCE82],
- ["8334D130",0xCE83],
- ["8334D131",0xCE84],
- ["8334D132",0xCE85],
- ["8334D133",0xCE86],
- ["8334D134",0xCE87],
- ["8334D135",0xCE88],
- ["8334D136",0xCE89],
- ["8334D137",0xCE8A],
- ["8334D138",0xCE8B],
- ["8334D139",0xCE8C],
- ["8334D230",0xCE8D],
- ["8334D231",0xCE8E],
- ["8334D232",0xCE8F],
- ["8334D233",0xCE90],
- ["8334D234",0xCE91],
- ["8334D235",0xCE92],
- ["8334D236",0xCE93],
- ["8334D237",0xCE94],
- ["8334D238",0xCE95],
- ["8334D239",0xCE96],
- ["8334D330",0xCE97],
- ["8334D331",0xCE98],
- ["8334D332",0xCE99],
- ["8334D333",0xCE9A],
- ["8334D334",0xCE9B],
- ["8334D335",0xCE9C],
- ["8334D336",0xCE9D],
- ["8334D337",0xCE9E],
- ["8334D338",0xCE9F],
- ["8334D339",0xCEA0],
- ["8334D430",0xCEA1],
- ["8334D431",0xCEA2],
- ["8334D432",0xCEA3],
- ["8334D433",0xCEA4],
- ["8334D434",0xCEA5],
- ["8334D435",0xCEA6],
- ["8334D436",0xCEA7],
- ["8334D437",0xCEA8],
- ["8334D438",0xCEA9],
- ["8334D439",0xCEAA],
- ["8334D530",0xCEAB],
- ["8334D531",0xCEAC],
- ["8334D532",0xCEAD],
- ["8334D533",0xCEAE],
- ["8334D534",0xCEAF],
- ["8334D535",0xCEB0],
- ["8334D536",0xCEB1],
- ["8334D537",0xCEB2],
- ["8334D538",0xCEB3],
- ["8334D539",0xCEB4],
- ["8334D630",0xCEB5],
- ["8334D631",0xCEB6],
- ["8334D632",0xCEB7],
- ["8334D633",0xCEB8],
- ["8334D634",0xCEB9],
- ["8334D635",0xCEBA],
- ["8334D636",0xCEBB],
- ["8334D637",0xCEBC],
- ["8334D638",0xCEBD],
- ["8334D639",0xCEBE],
- ["8334D730",0xCEBF],
- ["8334D731",0xCEC0],
- ["8334D732",0xCEC1],
- ["8334D733",0xCEC2],
- ["8334D734",0xCEC3],
- ["8334D735",0xCEC4],
- ["8334D736",0xCEC5],
- ["8334D737",0xCEC6],
- ["8334D738",0xCEC7],
- ["8334D739",0xCEC8],
- ["8334D830",0xCEC9],
- ["8334D831",0xCECA],
- ["8334D832",0xCECB],
- ["8334D833",0xCECC],
- ["8334D834",0xCECD],
- ["8334D835",0xCECE],
- ["8334D836",0xCECF],
- ["8334D837",0xCED0],
- ["8334D838",0xCED1],
- ["8334D839",0xCED2],
- ["8334D930",0xCED3],
- ["8334D931",0xCED4],
- ["8334D932",0xCED5],
- ["8334D933",0xCED6],
- ["8334D934",0xCED7],
- ["8334D935",0xCED8],
- ["8334D936",0xCED9],
- ["8334D937",0xCEDA],
- ["8334D938",0xCEDB],
- ["8334D939",0xCEDC],
- ["8334DA30",0xCEDD],
- ["8334DA31",0xCEDE],
- ["8334DA32",0xCEDF],
- ["8334DA33",0xCEE0],
- ["8334DA34",0xCEE1],
- ["8334DA35",0xCEE2],
- ["8334DA36",0xCEE3],
- ["8334DA37",0xCEE4],
- ["8334DA38",0xCEE5],
- ["8334DA39",0xCEE6],
- ["8334DB30",0xCEE7],
- ["8334DB31",0xCEE8],
- ["8334DB32",0xCEE9],
- ["8334DB33",0xCEEA],
- ["8334DB34",0xCEEB],
- ["8334DB35",0xCEEC],
- ["8334DB36",0xCEED],
- ["8334DB37",0xCEEE],
- ["8334DB38",0xCEEF],
- ["8334DB39",0xCEF0],
- ["8334DC30",0xCEF1],
- ["8334DC31",0xCEF2],
- ["8334DC32",0xCEF3],
- ["8334DC33",0xCEF4],
- ["8334DC34",0xCEF5],
- ["8334DC35",0xCEF6],
- ["8334DC36",0xCEF7],
- ["8334DC37",0xCEF8],
- ["8334DC38",0xCEF9],
- ["8334DC39",0xCEFA],
- ["8334DD30",0xCEFB],
- ["8334DD31",0xCEFC],
- ["8334DD32",0xCEFD],
- ["8334DD33",0xCEFE],
- ["8334DD34",0xCEFF],
- ["8334DD35",0xCF00],
- ["8334DD36",0xCF01],
- ["8334DD37",0xCF02],
- ["8334DD38",0xCF03],
- ["8334DD39",0xCF04],
- ["8334DE30",0xCF05],
- ["8334DE31",0xCF06],
- ["8334DE32",0xCF07],
- ["8334DE33",0xCF08],
- ["8334DE34",0xCF09],
- ["8334DE35",0xCF0A],
- ["8334DE36",0xCF0B],
- ["8334DE37",0xCF0C],
- ["8334DE38",0xCF0D],
- ["8334DE39",0xCF0E],
- ["8334DF30",0xCF0F],
- ["8334DF31",0xCF10],
- ["8334DF32",0xCF11],
- ["8334DF33",0xCF12],
- ["8334DF34",0xCF13],
- ["8334DF35",0xCF14],
- ["8334DF36",0xCF15],
- ["8334DF37",0xCF16],
- ["8334DF38",0xCF17],
- ["8334DF39",0xCF18],
- ["8334E030",0xCF19],
- ["8334E031",0xCF1A],
- ["8334E032",0xCF1B],
- ["8334E033",0xCF1C],
- ["8334E034",0xCF1D],
- ["8334E035",0xCF1E],
- ["8334E036",0xCF1F],
- ["8334E037",0xCF20],
- ["8334E038",0xCF21],
- ["8334E039",0xCF22],
- ["8334E130",0xCF23],
- ["8334E131",0xCF24],
- ["8334E132",0xCF25],
- ["8334E133",0xCF26],
- ["8334E134",0xCF27],
- ["8334E135",0xCF28],
- ["8334E136",0xCF29],
- ["8334E137",0xCF2A],
- ["8334E138",0xCF2B],
- ["8334E139",0xCF2C],
- ["8334E230",0xCF2D],
- ["8334E231",0xCF2E],
- ["8334E232",0xCF2F],
- ["8334E233",0xCF30],
- ["8334E234",0xCF31],
- ["8334E235",0xCF32],
- ["8334E236",0xCF33],
- ["8334E237",0xCF34],
- ["8334E238",0xCF35],
- ["8334E239",0xCF36],
- ["8334E330",0xCF37],
- ["8334E331",0xCF38],
- ["8334E332",0xCF39],
- ["8334E333",0xCF3A],
- ["8334E334",0xCF3B],
- ["8334E335",0xCF3C],
- ["8334E336",0xCF3D],
- ["8334E337",0xCF3E],
- ["8334E338",0xCF3F],
- ["8334E339",0xCF40],
- ["8334E430",0xCF41],
- ["8334E431",0xCF42],
- ["8334E432",0xCF43],
- ["8334E433",0xCF44],
- ["8334E434",0xCF45],
- ["8334E435",0xCF46],
- ["8334E436",0xCF47],
- ["8334E437",0xCF48],
- ["8334E438",0xCF49],
- ["8334E439",0xCF4A],
- ["8334E530",0xCF4B],
- ["8334E531",0xCF4C],
- ["8334E532",0xCF4D],
- ["8334E533",0xCF4E],
- ["8334E534",0xCF4F],
- ["8334E535",0xCF50],
- ["8334E536",0xCF51],
- ["8334E537",0xCF52],
- ["8334E538",0xCF53],
- ["8334E539",0xCF54],
- ["8334E630",0xCF55],
- ["8334E631",0xCF56],
- ["8334E632",0xCF57],
- ["8334E633",0xCF58],
- ["8334E634",0xCF59],
- ["8334E635",0xCF5A],
- ["8334E636",0xCF5B],
- ["8334E637",0xCF5C],
- ["8334E638",0xCF5D],
- ["8334E639",0xCF5E],
- ["8334E730",0xCF5F],
- ["8334E731",0xCF60],
- ["8334E732",0xCF61],
- ["8334E733",0xCF62],
- ["8334E734",0xCF63],
- ["8334E735",0xCF64],
- ["8334E736",0xCF65],
- ["8334E737",0xCF66],
- ["8334E738",0xCF67],
- ["8334E739",0xCF68],
- ["8334E830",0xCF69],
- ["8334E831",0xCF6A],
- ["8334E832",0xCF6B],
- ["8334E833",0xCF6C],
- ["8334E834",0xCF6D],
- ["8334E835",0xCF6E],
- ["8334E836",0xCF6F],
- ["8334E837",0xCF70],
- ["8334E838",0xCF71],
- ["8334E839",0xCF72],
- ["8334E930",0xCF73],
- ["8334E931",0xCF74],
- ["8334E932",0xCF75],
- ["8334E933",0xCF76],
- ["8334E934",0xCF77],
- ["8334E935",0xCF78],
- ["8334E936",0xCF79],
- ["8334E937",0xCF7A],
- ["8334E938",0xCF7B],
- ["8334E939",0xCF7C],
- ["8334EA30",0xCF7D],
- ["8334EA31",0xCF7E],
- ["8334EA32",0xCF7F],
- ["8334EA33",0xCF80],
- ["8334EA34",0xCF81],
- ["8334EA35",0xCF82],
- ["8334EA36",0xCF83],
- ["8334EA37",0xCF84],
- ["8334EA38",0xCF85],
- ["8334EA39",0xCF86],
- ["8334EB30",0xCF87],
- ["8334EB31",0xCF88],
- ["8334EB32",0xCF89],
- ["8334EB33",0xCF8A],
- ["8334EB34",0xCF8B],
- ["8334EB35",0xCF8C],
- ["8334EB36",0xCF8D],
- ["8334EB37",0xCF8E],
- ["8334EB38",0xCF8F],
- ["8334EB39",0xCF90],
- ["8334EC30",0xCF91],
- ["8334EC31",0xCF92],
- ["8334EC32",0xCF93],
- ["8334EC33",0xCF94],
- ["8334EC34",0xCF95],
- ["8334EC35",0xCF96],
- ["8334EC36",0xCF97],
- ["8334EC37",0xCF98],
- ["8334EC38",0xCF99],
- ["8334EC39",0xCF9A],
- ["8334ED30",0xCF9B],
- ["8334ED31",0xCF9C],
- ["8334ED32",0xCF9D],
- ["8334ED33",0xCF9E],
- ["8334ED34",0xCF9F],
- ["8334ED35",0xCFA0],
- ["8334ED36",0xCFA1],
- ["8334ED37",0xCFA2],
- ["8334ED38",0xCFA3],
- ["8334ED39",0xCFA4],
- ["8334EE30",0xCFA5],
- ["8334EE31",0xCFA6],
- ["8334EE32",0xCFA7],
- ["8334EE33",0xCFA8],
- ["8334EE34",0xCFA9],
- ["8334EE35",0xCFAA],
- ["8334EE36",0xCFAB],
- ["8334EE37",0xCFAC],
- ["8334EE38",0xCFAD],
- ["8334EE39",0xCFAE],
- ["8334EF30",0xCFAF],
- ["8334EF31",0xCFB0],
- ["8334EF32",0xCFB1],
- ["8334EF33",0xCFB2],
- ["8334EF34",0xCFB3],
- ["8334EF35",0xCFB4],
- ["8334EF36",0xCFB5],
- ["8334EF37",0xCFB6],
- ["8334EF38",0xCFB7],
- ["8334EF39",0xCFB8],
- ["8334F030",0xCFB9],
- ["8334F031",0xCFBA],
- ["8334F032",0xCFBB],
- ["8334F033",0xCFBC],
- ["8334F034",0xCFBD],
- ["8334F035",0xCFBE],
- ["8334F036",0xCFBF],
- ["8334F037",0xCFC0],
- ["8334F038",0xCFC1],
- ["8334F039",0xCFC2],
- ["8334F130",0xCFC3],
- ["8334F131",0xCFC4],
- ["8334F132",0xCFC5],
- ["8334F133",0xCFC6],
- ["8334F134",0xCFC7],
- ["8334F135",0xCFC8],
- ["8334F136",0xCFC9],
- ["8334F137",0xCFCA],
- ["8334F138",0xCFCB],
- ["8334F139",0xCFCC],
- ["8334F230",0xCFCD],
- ["8334F231",0xCFCE],
- ["8334F232",0xCFCF],
- ["8334F233",0xCFD0],
- ["8334F234",0xCFD1],
- ["8334F235",0xCFD2],
- ["8334F236",0xCFD3],
- ["8334F237",0xCFD4],
- ["8334F238",0xCFD5],
- ["8334F239",0xCFD6],
- ["8334F330",0xCFD7],
- ["8334F331",0xCFD8],
- ["8334F332",0xCFD9],
- ["8334F333",0xCFDA],
- ["8334F334",0xCFDB],
- ["8334F335",0xCFDC],
- ["8334F336",0xCFDD],
- ["8334F337",0xCFDE],
- ["8334F338",0xCFDF],
- ["8334F339",0xCFE0],
- ["8334F430",0xCFE1],
- ["8334F431",0xCFE2],
- ["8334F432",0xCFE3],
- ["8334F433",0xCFE4],
- ["8334F434",0xCFE5],
- ["8334F435",0xCFE6],
- ["8334F436",0xCFE7],
- ["8334F437",0xCFE8],
- ["8334F438",0xCFE9],
- ["8334F439",0xCFEA],
- ["8334F530",0xCFEB],
- ["8334F531",0xCFEC],
- ["8334F532",0xCFED],
- ["8334F533",0xCFEE],
- ["8334F534",0xCFEF],
- ["8334F535",0xCFF0],
- ["8334F536",0xCFF1],
- ["8334F537",0xCFF2],
- ["8334F538",0xCFF3],
- ["8334F539",0xCFF4],
- ["8334F630",0xCFF5],
- ["8334F631",0xCFF6],
- ["8334F632",0xCFF7],
- ["8334F633",0xCFF8],
- ["8334F634",0xCFF9],
- ["8334F635",0xCFFA],
- ["8334F636",0xCFFB],
- ["8334F637",0xCFFC],
- ["8334F638",0xCFFD],
- ["8334F639",0xCFFE],
- ["8334F730",0xCFFF],
- ["8334F731",0xD000],
- ["8334F732",0xD001],
- ["8334F733",0xD002],
- ["8334F734",0xD003],
- ["8334F735",0xD004],
- ["8334F736",0xD005],
- ["8334F737",0xD006],
- ["8334F738",0xD007],
- ["8334F739",0xD008],
- ["8334F830",0xD009],
- ["8334F831",0xD00A],
- ["8334F832",0xD00B],
- ["8334F833",0xD00C],
- ["8334F834",0xD00D],
- ["8334F835",0xD00E],
- ["8334F836",0xD00F],
- ["8334F837",0xD010],
- ["8334F838",0xD011],
- ["8334F839",0xD012],
- ["8334F930",0xD013],
- ["8334F931",0xD014],
- ["8334F932",0xD015],
- ["8334F933",0xD016],
- ["8334F934",0xD017],
- ["8334F935",0xD018],
- ["8334F936",0xD019],
- ["8334F937",0xD01A],
- ["8334F938",0xD01B],
- ["8334F939",0xD01C],
- ["8334FA30",0xD01D],
- ["8334FA31",0xD01E],
- ["8334FA32",0xD01F],
- ["8334FA33",0xD020],
- ["8334FA34",0xD021],
- ["8334FA35",0xD022],
- ["8334FA36",0xD023],
- ["8334FA37",0xD024],
- ["8334FA38",0xD025],
- ["8334FA39",0xD026],
- ["8334FB30",0xD027],
- ["8334FB31",0xD028],
- ["8334FB32",0xD029],
- ["8334FB33",0xD02A],
- ["8334FB34",0xD02B],
- ["8334FB35",0xD02C],
- ["8334FB36",0xD02D],
- ["8334FB37",0xD02E],
- ["8334FB38",0xD02F],
- ["8334FB39",0xD030],
- ["8334FC30",0xD031],
- ["8334FC31",0xD032],
- ["8334FC32",0xD033],
- ["8334FC33",0xD034],
- ["8334FC34",0xD035],
- ["8334FC35",0xD036],
- ["8334FC36",0xD037],
- ["8334FC37",0xD038],
- ["8334FC38",0xD039],
- ["8334FC39",0xD03A],
- ["8334FD30",0xD03B],
- ["8334FD31",0xD03C],
- ["8334FD32",0xD03D],
- ["8334FD33",0xD03E],
- ["8334FD34",0xD03F],
- ["8334FD35",0xD040],
- ["8334FD36",0xD041],
- ["8334FD37",0xD042],
- ["8334FD38",0xD043],
- ["8334FD39",0xD044],
- ["8334FE30",0xD045],
- ["8334FE31",0xD046],
- ["8334FE32",0xD047],
- ["8334FE33",0xD048],
- ["8334FE34",0xD049],
- ["8334FE35",0xD04A],
- ["8334FE36",0xD04B],
- ["8334FE37",0xD04C],
- ["8334FE38",0xD04D],
- ["8334FE39",0xD04E],
- ["83358130",0xD04F],
- ["83358131",0xD050],
- ["83358132",0xD051],
- ["83358133",0xD052],
- ["83358134",0xD053],
- ["83358135",0xD054],
- ["83358136",0xD055],
- ["83358137",0xD056],
- ["83358138",0xD057],
- ["83358139",0xD058],
- ["83358230",0xD059],
- ["83358231",0xD05A],
- ["83358232",0xD05B],
- ["83358233",0xD05C],
- ["83358234",0xD05D],
- ["83358235",0xD05E],
- ["83358236",0xD05F],
- ["83358237",0xD060],
- ["83358238",0xD061],
- ["83358239",0xD062],
- ["83358330",0xD063],
- ["83358331",0xD064],
- ["83358332",0xD065],
- ["83358333",0xD066],
- ["83358334",0xD067],
- ["83358335",0xD068],
- ["83358336",0xD069],
- ["83358337",0xD06A],
- ["83358338",0xD06B],
- ["83358339",0xD06C],
- ["83358430",0xD06D],
- ["83358431",0xD06E],
- ["83358432",0xD06F],
- ["83358433",0xD070],
- ["83358434",0xD071],
- ["83358435",0xD072],
- ["83358436",0xD073],
- ["83358437",0xD074],
- ["83358438",0xD075],
- ["83358439",0xD076],
- ["83358530",0xD077],
- ["83358531",0xD078],
- ["83358532",0xD079],
- ["83358533",0xD07A],
- ["83358534",0xD07B],
- ["83358535",0xD07C],
- ["83358536",0xD07D],
- ["83358537",0xD07E],
- ["83358538",0xD07F],
- ["83358539",0xD080],
- ["83358630",0xD081],
- ["83358631",0xD082],
- ["83358632",0xD083],
- ["83358633",0xD084],
- ["83358634",0xD085],
- ["83358635",0xD086],
- ["83358636",0xD087],
- ["83358637",0xD088],
- ["83358638",0xD089],
- ["83358639",0xD08A],
- ["83358730",0xD08B],
- ["83358731",0xD08C],
- ["83358732",0xD08D],
- ["83358733",0xD08E],
- ["83358734",0xD08F],
- ["83358735",0xD090],
- ["83358736",0xD091],
- ["83358737",0xD092],
- ["83358738",0xD093],
- ["83358739",0xD094],
- ["83358830",0xD095],
- ["83358831",0xD096],
- ["83358832",0xD097],
- ["83358833",0xD098],
- ["83358834",0xD099],
- ["83358835",0xD09A],
- ["83358836",0xD09B],
- ["83358837",0xD09C],
- ["83358838",0xD09D],
- ["83358839",0xD09E],
- ["83358930",0xD09F],
- ["83358931",0xD0A0],
- ["83358932",0xD0A1],
- ["83358933",0xD0A2],
- ["83358934",0xD0A3],
- ["83358935",0xD0A4],
- ["83358936",0xD0A5],
- ["83358937",0xD0A6],
- ["83358938",0xD0A7],
- ["83358939",0xD0A8],
- ["83358A30",0xD0A9],
- ["83358A31",0xD0AA],
- ["83358A32",0xD0AB],
- ["83358A33",0xD0AC],
- ["83358A34",0xD0AD],
- ["83358A35",0xD0AE],
- ["83358A36",0xD0AF],
- ["83358A37",0xD0B0],
- ["83358A38",0xD0B1],
- ["83358A39",0xD0B2],
- ["83358B30",0xD0B3],
- ["83358B31",0xD0B4],
- ["83358B32",0xD0B5],
- ["83358B33",0xD0B6],
- ["83358B34",0xD0B7],
- ["83358B35",0xD0B8],
- ["83358B36",0xD0B9],
- ["83358B37",0xD0BA],
- ["83358B38",0xD0BB],
- ["83358B39",0xD0BC],
- ["83358C30",0xD0BD],
- ["83358C31",0xD0BE],
- ["83358C32",0xD0BF],
- ["83358C33",0xD0C0],
- ["83358C34",0xD0C1],
- ["83358C35",0xD0C2],
- ["83358C36",0xD0C3],
- ["83358C37",0xD0C4],
- ["83358C38",0xD0C5],
- ["83358C39",0xD0C6],
- ["83358D30",0xD0C7],
- ["83358D31",0xD0C8],
- ["83358D32",0xD0C9],
- ["83358D33",0xD0CA],
- ["83358D34",0xD0CB],
- ["83358D35",0xD0CC],
- ["83358D36",0xD0CD],
- ["83358D37",0xD0CE],
- ["83358D38",0xD0CF],
- ["83358D39",0xD0D0],
- ["83358E30",0xD0D1],
- ["83358E31",0xD0D2],
- ["83358E32",0xD0D3],
- ["83358E33",0xD0D4],
- ["83358E34",0xD0D5],
- ["83358E35",0xD0D6],
- ["83358E36",0xD0D7],
- ["83358E37",0xD0D8],
- ["83358E38",0xD0D9],
- ["83358E39",0xD0DA],
- ["83358F30",0xD0DB],
- ["83358F31",0xD0DC],
- ["83358F32",0xD0DD],
- ["83358F33",0xD0DE],
- ["83358F34",0xD0DF],
- ["83358F35",0xD0E0],
- ["83358F36",0xD0E1],
- ["83358F37",0xD0E2],
- ["83358F38",0xD0E3],
- ["83358F39",0xD0E4],
- ["83359030",0xD0E5],
- ["83359031",0xD0E6],
- ["83359032",0xD0E7],
- ["83359033",0xD0E8],
- ["83359034",0xD0E9],
- ["83359035",0xD0EA],
- ["83359036",0xD0EB],
- ["83359037",0xD0EC],
- ["83359038",0xD0ED],
- ["83359039",0xD0EE],
- ["83359130",0xD0EF],
- ["83359131",0xD0F0],
- ["83359132",0xD0F1],
- ["83359133",0xD0F2],
- ["83359134",0xD0F3],
- ["83359135",0xD0F4],
- ["83359136",0xD0F5],
- ["83359137",0xD0F6],
- ["83359138",0xD0F7],
- ["83359139",0xD0F8],
- ["83359230",0xD0F9],
- ["83359231",0xD0FA],
- ["83359232",0xD0FB],
- ["83359233",0xD0FC],
- ["83359234",0xD0FD],
- ["83359235",0xD0FE],
- ["83359236",0xD0FF],
- ["83359237",0xD100],
- ["83359238",0xD101],
- ["83359239",0xD102],
- ["83359330",0xD103],
- ["83359331",0xD104],
- ["83359332",0xD105],
- ["83359333",0xD106],
- ["83359334",0xD107],
- ["83359335",0xD108],
- ["83359336",0xD109],
- ["83359337",0xD10A],
- ["83359338",0xD10B],
- ["83359339",0xD10C],
- ["83359430",0xD10D],
- ["83359431",0xD10E],
- ["83359432",0xD10F],
- ["83359433",0xD110],
- ["83359434",0xD111],
- ["83359435",0xD112],
- ["83359436",0xD113],
- ["83359437",0xD114],
- ["83359438",0xD115],
- ["83359439",0xD116],
- ["83359530",0xD117],
- ["83359531",0xD118],
- ["83359532",0xD119],
- ["83359533",0xD11A],
- ["83359534",0xD11B],
- ["83359535",0xD11C],
- ["83359536",0xD11D],
- ["83359537",0xD11E],
- ["83359538",0xD11F],
- ["83359539",0xD120],
- ["83359630",0xD121],
- ["83359631",0xD122],
- ["83359632",0xD123],
- ["83359633",0xD124],
- ["83359634",0xD125],
- ["83359635",0xD126],
- ["83359636",0xD127],
- ["83359637",0xD128],
- ["83359638",0xD129],
- ["83359639",0xD12A],
- ["83359730",0xD12B],
- ["83359731",0xD12C],
- ["83359732",0xD12D],
- ["83359733",0xD12E],
- ["83359734",0xD12F],
- ["83359735",0xD130],
- ["83359736",0xD131],
- ["83359737",0xD132],
- ["83359738",0xD133],
- ["83359739",0xD134],
- ["83359830",0xD135],
- ["83359831",0xD136],
- ["83359832",0xD137],
- ["83359833",0xD138],
- ["83359834",0xD139],
- ["83359835",0xD13A],
- ["83359836",0xD13B],
- ["83359837",0xD13C],
- ["83359838",0xD13D],
- ["83359839",0xD13E],
- ["83359930",0xD13F],
- ["83359931",0xD140],
- ["83359932",0xD141],
- ["83359933",0xD142],
- ["83359934",0xD143],
- ["83359935",0xD144],
- ["83359936",0xD145],
- ["83359937",0xD146],
- ["83359938",0xD147],
- ["83359939",0xD148],
- ["83359A30",0xD149],
- ["83359A31",0xD14A],
- ["83359A32",0xD14B],
- ["83359A33",0xD14C],
- ["83359A34",0xD14D],
- ["83359A35",0xD14E],
- ["83359A36",0xD14F],
- ["83359A37",0xD150],
- ["83359A38",0xD151],
- ["83359A39",0xD152],
- ["83359B30",0xD153],
- ["83359B31",0xD154],
- ["83359B32",0xD155],
- ["83359B33",0xD156],
- ["83359B34",0xD157],
- ["83359B35",0xD158],
- ["83359B36",0xD159],
- ["83359B37",0xD15A],
- ["83359B38",0xD15B],
- ["83359B39",0xD15C],
- ["83359C30",0xD15D],
- ["83359C31",0xD15E],
- ["83359C32",0xD15F],
- ["83359C33",0xD160],
- ["83359C34",0xD161],
- ["83359C35",0xD162],
- ["83359C36",0xD163],
- ["83359C37",0xD164],
- ["83359C38",0xD165],
- ["83359C39",0xD166],
- ["83359D30",0xD167],
- ["83359D31",0xD168],
- ["83359D32",0xD169],
- ["83359D33",0xD16A],
- ["83359D34",0xD16B],
- ["83359D35",0xD16C],
- ["83359D36",0xD16D],
- ["83359D37",0xD16E],
- ["83359D38",0xD16F],
- ["83359D39",0xD170],
- ["83359E30",0xD171],
- ["83359E31",0xD172],
- ["83359E32",0xD173],
- ["83359E33",0xD174],
- ["83359E34",0xD175],
- ["83359E35",0xD176],
- ["83359E36",0xD177],
- ["83359E37",0xD178],
- ["83359E38",0xD179],
- ["83359E39",0xD17A],
- ["83359F30",0xD17B],
- ["83359F31",0xD17C],
- ["83359F32",0xD17D],
- ["83359F33",0xD17E],
- ["83359F34",0xD17F],
- ["83359F35",0xD180],
- ["83359F36",0xD181],
- ["83359F37",0xD182],
- ["83359F38",0xD183],
- ["83359F39",0xD184],
- ["8335A030",0xD185],
- ["8335A031",0xD186],
- ["8335A032",0xD187],
- ["8335A033",0xD188],
- ["8335A034",0xD189],
- ["8335A035",0xD18A],
- ["8335A036",0xD18B],
- ["8335A037",0xD18C],
- ["8335A038",0xD18D],
- ["8335A039",0xD18E],
- ["8335A130",0xD18F],
- ["8335A131",0xD190],
- ["8335A132",0xD191],
- ["8335A133",0xD192],
- ["8335A134",0xD193],
- ["8335A135",0xD194],
- ["8335A136",0xD195],
- ["8335A137",0xD196],
- ["8335A138",0xD197],
- ["8335A139",0xD198],
- ["8335A230",0xD199],
- ["8335A231",0xD19A],
- ["8335A232",0xD19B],
- ["8335A233",0xD19C],
- ["8335A234",0xD19D],
- ["8335A235",0xD19E],
- ["8335A236",0xD19F],
- ["8335A237",0xD1A0],
- ["8335A238",0xD1A1],
- ["8335A239",0xD1A2],
- ["8335A330",0xD1A3],
- ["8335A331",0xD1A4],
- ["8335A332",0xD1A5],
- ["8335A333",0xD1A6],
- ["8335A334",0xD1A7],
- ["8335A335",0xD1A8],
- ["8335A336",0xD1A9],
- ["8335A337",0xD1AA],
- ["8335A338",0xD1AB],
- ["8335A339",0xD1AC],
- ["8335A430",0xD1AD],
- ["8335A431",0xD1AE],
- ["8335A432",0xD1AF],
- ["8335A433",0xD1B0],
- ["8335A434",0xD1B1],
- ["8335A435",0xD1B2],
- ["8335A436",0xD1B3],
- ["8335A437",0xD1B4],
- ["8335A438",0xD1B5],
- ["8335A439",0xD1B6],
- ["8335A530",0xD1B7],
- ["8335A531",0xD1B8],
- ["8335A532",0xD1B9],
- ["8335A533",0xD1BA],
- ["8335A534",0xD1BB],
- ["8335A535",0xD1BC],
- ["8335A536",0xD1BD],
- ["8335A537",0xD1BE],
- ["8335A538",0xD1BF],
- ["8335A539",0xD1C0],
- ["8335A630",0xD1C1],
- ["8335A631",0xD1C2],
- ["8335A632",0xD1C3],
- ["8335A633",0xD1C4],
- ["8335A634",0xD1C5],
- ["8335A635",0xD1C6],
- ["8335A636",0xD1C7],
- ["8335A637",0xD1C8],
- ["8335A638",0xD1C9],
- ["8335A639",0xD1CA],
- ["8335A730",0xD1CB],
- ["8335A731",0xD1CC],
- ["8335A732",0xD1CD],
- ["8335A733",0xD1CE],
- ["8335A734",0xD1CF],
- ["8335A735",0xD1D0],
- ["8335A736",0xD1D1],
- ["8335A737",0xD1D2],
- ["8335A738",0xD1D3],
- ["8335A739",0xD1D4],
- ["8335A830",0xD1D5],
- ["8335A831",0xD1D6],
- ["8335A832",0xD1D7],
- ["8335A833",0xD1D8],
- ["8335A834",0xD1D9],
- ["8335A835",0xD1DA],
- ["8335A836",0xD1DB],
- ["8335A837",0xD1DC],
- ["8335A838",0xD1DD],
- ["8335A839",0xD1DE],
- ["8335A930",0xD1DF],
- ["8335A931",0xD1E0],
- ["8335A932",0xD1E1],
- ["8335A933",0xD1E2],
- ["8335A934",0xD1E3],
- ["8335A935",0xD1E4],
- ["8335A936",0xD1E5],
- ["8335A937",0xD1E6],
- ["8335A938",0xD1E7],
- ["8335A939",0xD1E8],
- ["8335AA30",0xD1E9],
- ["8335AA31",0xD1EA],
- ["8335AA32",0xD1EB],
- ["8335AA33",0xD1EC],
- ["8335AA34",0xD1ED],
- ["8335AA35",0xD1EE],
- ["8335AA36",0xD1EF],
- ["8335AA37",0xD1F0],
- ["8335AA38",0xD1F1],
- ["8335AA39",0xD1F2],
- ["8335AB30",0xD1F3],
- ["8335AB31",0xD1F4],
- ["8335AB32",0xD1F5],
- ["8335AB33",0xD1F6],
- ["8335AB34",0xD1F7],
- ["8335AB35",0xD1F8],
- ["8335AB36",0xD1F9],
- ["8335AB37",0xD1FA],
- ["8335AB38",0xD1FB],
- ["8335AB39",0xD1FC],
- ["8335AC30",0xD1FD],
- ["8335AC31",0xD1FE],
- ["8335AC32",0xD1FF],
- ["8335AC33",0xD200],
- ["8335AC34",0xD201],
- ["8335AC35",0xD202],
- ["8335AC36",0xD203],
- ["8335AC37",0xD204],
- ["8335AC38",0xD205],
- ["8335AC39",0xD206],
- ["8335AD30",0xD207],
- ["8335AD31",0xD208],
- ["8335AD32",0xD209],
- ["8335AD33",0xD20A],
- ["8335AD34",0xD20B],
- ["8335AD35",0xD20C],
- ["8335AD36",0xD20D],
- ["8335AD37",0xD20E],
- ["8335AD38",0xD20F],
- ["8335AD39",0xD210],
- ["8335AE30",0xD211],
- ["8335AE31",0xD212],
- ["8335AE32",0xD213],
- ["8335AE33",0xD214],
- ["8335AE34",0xD215],
- ["8335AE35",0xD216],
- ["8335AE36",0xD217],
- ["8335AE37",0xD218],
- ["8335AE38",0xD219],
- ["8335AE39",0xD21A],
- ["8335AF30",0xD21B],
- ["8335AF31",0xD21C],
- ["8335AF32",0xD21D],
- ["8335AF33",0xD21E],
- ["8335AF34",0xD21F],
- ["8335AF35",0xD220],
- ["8335AF36",0xD221],
- ["8335AF37",0xD222],
- ["8335AF38",0xD223],
- ["8335AF39",0xD224],
- ["8335B030",0xD225],
- ["8335B031",0xD226],
- ["8335B032",0xD227],
- ["8335B033",0xD228],
- ["8335B034",0xD229],
- ["8335B035",0xD22A],
- ["8335B036",0xD22B],
- ["8335B037",0xD22C],
- ["8335B038",0xD22D],
- ["8335B039",0xD22E],
- ["8335B130",0xD22F],
- ["8335B131",0xD230],
- ["8335B132",0xD231],
- ["8335B133",0xD232],
- ["8335B134",0xD233],
- ["8335B135",0xD234],
- ["8335B136",0xD235],
- ["8335B137",0xD236],
- ["8335B138",0xD237],
- ["8335B139",0xD238],
- ["8335B230",0xD239],
- ["8335B231",0xD23A],
- ["8335B232",0xD23B],
- ["8335B233",0xD23C],
- ["8335B234",0xD23D],
- ["8335B235",0xD23E],
- ["8335B236",0xD23F],
- ["8335B237",0xD240],
- ["8335B238",0xD241],
- ["8335B239",0xD242],
- ["8335B330",0xD243],
- ["8335B331",0xD244],
- ["8335B332",0xD245],
- ["8335B333",0xD246],
- ["8335B334",0xD247],
- ["8335B335",0xD248],
- ["8335B336",0xD249],
- ["8335B337",0xD24A],
- ["8335B338",0xD24B],
- ["8335B339",0xD24C],
- ["8335B430",0xD24D],
- ["8335B431",0xD24E],
- ["8335B432",0xD24F],
- ["8335B433",0xD250],
- ["8335B434",0xD251],
- ["8335B435",0xD252],
- ["8335B436",0xD253],
- ["8335B437",0xD254],
- ["8335B438",0xD255],
- ["8335B439",0xD256],
- ["8335B530",0xD257],
- ["8335B531",0xD258],
- ["8335B532",0xD259],
- ["8335B533",0xD25A],
- ["8335B534",0xD25B],
- ["8335B535",0xD25C],
- ["8335B536",0xD25D],
- ["8335B537",0xD25E],
- ["8335B538",0xD25F],
- ["8335B539",0xD260],
- ["8335B630",0xD261],
- ["8335B631",0xD262],
- ["8335B632",0xD263],
- ["8335B633",0xD264],
- ["8335B634",0xD265],
- ["8335B635",0xD266],
- ["8335B636",0xD267],
- ["8335B637",0xD268],
- ["8335B638",0xD269],
- ["8335B639",0xD26A],
- ["8335B730",0xD26B],
- ["8335B731",0xD26C],
- ["8335B732",0xD26D],
- ["8335B733",0xD26E],
- ["8335B734",0xD26F],
- ["8335B735",0xD270],
- ["8335B736",0xD271],
- ["8335B737",0xD272],
- ["8335B738",0xD273],
- ["8335B739",0xD274],
- ["8335B830",0xD275],
- ["8335B831",0xD276],
- ["8335B832",0xD277],
- ["8335B833",0xD278],
- ["8335B834",0xD279],
- ["8335B835",0xD27A],
- ["8335B836",0xD27B],
- ["8335B837",0xD27C],
- ["8335B838",0xD27D],
- ["8335B839",0xD27E],
- ["8335B930",0xD27F],
- ["8335B931",0xD280],
- ["8335B932",0xD281],
- ["8335B933",0xD282],
- ["8335B934",0xD283],
- ["8335B935",0xD284],
- ["8335B936",0xD285],
- ["8335B937",0xD286],
- ["8335B938",0xD287],
- ["8335B939",0xD288],
- ["8335BA30",0xD289],
- ["8335BA31",0xD28A],
- ["8335BA32",0xD28B],
- ["8335BA33",0xD28C],
- ["8335BA34",0xD28D],
- ["8335BA35",0xD28E],
- ["8335BA36",0xD28F],
- ["8335BA37",0xD290],
- ["8335BA38",0xD291],
- ["8335BA39",0xD292],
- ["8335BB30",0xD293],
- ["8335BB31",0xD294],
- ["8335BB32",0xD295],
- ["8335BB33",0xD296],
- ["8335BB34",0xD297],
- ["8335BB35",0xD298],
- ["8335BB36",0xD299],
- ["8335BB37",0xD29A],
- ["8335BB38",0xD29B],
- ["8335BB39",0xD29C],
- ["8335BC30",0xD29D],
- ["8335BC31",0xD29E],
- ["8335BC32",0xD29F],
- ["8335BC33",0xD2A0],
- ["8335BC34",0xD2A1],
- ["8335BC35",0xD2A2],
- ["8335BC36",0xD2A3],
- ["8335BC37",0xD2A4],
- ["8335BC38",0xD2A5],
- ["8335BC39",0xD2A6],
- ["8335BD30",0xD2A7],
- ["8335BD31",0xD2A8],
- ["8335BD32",0xD2A9],
- ["8335BD33",0xD2AA],
- ["8335BD34",0xD2AB],
- ["8335BD35",0xD2AC],
- ["8335BD36",0xD2AD],
- ["8335BD37",0xD2AE],
- ["8335BD38",0xD2AF],
- ["8335BD39",0xD2B0],
- ["8335BE30",0xD2B1],
- ["8335BE31",0xD2B2],
- ["8335BE32",0xD2B3],
- ["8335BE33",0xD2B4],
- ["8335BE34",0xD2B5],
- ["8335BE35",0xD2B6],
- ["8335BE36",0xD2B7],
- ["8335BE37",0xD2B8],
- ["8335BE38",0xD2B9],
- ["8335BE39",0xD2BA],
- ["8335BF30",0xD2BB],
- ["8335BF31",0xD2BC],
- ["8335BF32",0xD2BD],
- ["8335BF33",0xD2BE],
- ["8335BF34",0xD2BF],
- ["8335BF35",0xD2C0],
- ["8335BF36",0xD2C1],
- ["8335BF37",0xD2C2],
- ["8335BF38",0xD2C3],
- ["8335BF39",0xD2C4],
- ["8335C030",0xD2C5],
- ["8335C031",0xD2C6],
- ["8335C032",0xD2C7],
- ["8335C033",0xD2C8],
- ["8335C034",0xD2C9],
- ["8335C035",0xD2CA],
- ["8335C036",0xD2CB],
- ["8335C037",0xD2CC],
- ["8335C038",0xD2CD],
- ["8335C039",0xD2CE],
- ["8335C130",0xD2CF],
- ["8335C131",0xD2D0],
- ["8335C132",0xD2D1],
- ["8335C133",0xD2D2],
- ["8335C134",0xD2D3],
- ["8335C135",0xD2D4],
- ["8335C136",0xD2D5],
- ["8335C137",0xD2D6],
- ["8335C138",0xD2D7],
- ["8335C139",0xD2D8],
- ["8335C230",0xD2D9],
- ["8335C231",0xD2DA],
- ["8335C232",0xD2DB],
- ["8335C233",0xD2DC],
- ["8335C234",0xD2DD],
- ["8335C235",0xD2DE],
- ["8335C236",0xD2DF],
- ["8335C237",0xD2E0],
- ["8335C238",0xD2E1],
- ["8335C239",0xD2E2],
- ["8335C330",0xD2E3],
- ["8335C331",0xD2E4],
- ["8335C332",0xD2E5],
- ["8335C333",0xD2E6],
- ["8335C334",0xD2E7],
- ["8335C335",0xD2E8],
- ["8335C336",0xD2E9],
- ["8335C337",0xD2EA],
- ["8335C338",0xD2EB],
- ["8335C339",0xD2EC],
- ["8335C430",0xD2ED],
- ["8335C431",0xD2EE],
- ["8335C432",0xD2EF],
- ["8335C433",0xD2F0],
- ["8335C434",0xD2F1],
- ["8335C435",0xD2F2],
- ["8335C436",0xD2F3],
- ["8335C437",0xD2F4],
- ["8335C438",0xD2F5],
- ["8335C439",0xD2F6],
- ["8335C530",0xD2F7],
- ["8335C531",0xD2F8],
- ["8335C532",0xD2F9],
- ["8335C533",0xD2FA],
- ["8335C534",0xD2FB],
- ["8335C535",0xD2FC],
- ["8335C536",0xD2FD],
- ["8335C537",0xD2FE],
- ["8335C538",0xD2FF],
- ["8335C539",0xD300],
- ["8335C630",0xD301],
- ["8335C631",0xD302],
- ["8335C632",0xD303],
- ["8335C633",0xD304],
- ["8335C634",0xD305],
- ["8335C635",0xD306],
- ["8335C636",0xD307],
- ["8335C637",0xD308],
- ["8335C638",0xD309],
- ["8335C639",0xD30A],
- ["8335C730",0xD30B],
- ["8335C731",0xD30C],
- ["8335C732",0xD30D],
- ["8335C733",0xD30E],
- ["8335C734",0xD30F],
- ["8335C735",0xD310],
- ["8335C736",0xD311],
- ["8335C737",0xD312],
- ["8335C738",0xD313],
- ["8335C739",0xD314],
- ["8335C830",0xD315],
- ["8335C831",0xD316],
- ["8335C832",0xD317],
- ["8335C833",0xD318],
- ["8335C834",0xD319],
- ["8335C835",0xD31A],
- ["8335C836",0xD31B],
- ["8335C837",0xD31C],
- ["8335C838",0xD31D],
- ["8335C839",0xD31E],
- ["8335C930",0xD31F],
- ["8335C931",0xD320],
- ["8335C932",0xD321],
- ["8335C933",0xD322],
- ["8335C934",0xD323],
- ["8335C935",0xD324],
- ["8335C936",0xD325],
- ["8335C937",0xD326],
- ["8335C938",0xD327],
- ["8335C939",0xD328],
- ["8335CA30",0xD329],
- ["8335CA31",0xD32A],
- ["8335CA32",0xD32B],
- ["8335CA33",0xD32C],
- ["8335CA34",0xD32D],
- ["8335CA35",0xD32E],
- ["8335CA36",0xD32F],
- ["8335CA37",0xD330],
- ["8335CA38",0xD331],
- ["8335CA39",0xD332],
- ["8335CB30",0xD333],
- ["8335CB31",0xD334],
- ["8335CB32",0xD335],
- ["8335CB33",0xD336],
- ["8335CB34",0xD337],
- ["8335CB35",0xD338],
- ["8335CB36",0xD339],
- ["8335CB37",0xD33A],
- ["8335CB38",0xD33B],
- ["8335CB39",0xD33C],
- ["8335CC30",0xD33D],
- ["8335CC31",0xD33E],
- ["8335CC32",0xD33F],
- ["8335CC33",0xD340],
- ["8335CC34",0xD341],
- ["8335CC35",0xD342],
- ["8335CC36",0xD343],
- ["8335CC37",0xD344],
- ["8335CC38",0xD345],
- ["8335CC39",0xD346],
- ["8335CD30",0xD347],
- ["8335CD31",0xD348],
- ["8335CD32",0xD349],
- ["8335CD33",0xD34A],
- ["8335CD34",0xD34B],
- ["8335CD35",0xD34C],
- ["8335CD36",0xD34D],
- ["8335CD37",0xD34E],
- ["8335CD38",0xD34F],
- ["8335CD39",0xD350],
- ["8335CE30",0xD351],
- ["8335CE31",0xD352],
- ["8335CE32",0xD353],
- ["8335CE33",0xD354],
- ["8335CE34",0xD355],
- ["8335CE35",0xD356],
- ["8335CE36",0xD357],
- ["8335CE37",0xD358],
- ["8335CE38",0xD359],
- ["8335CE39",0xD35A],
- ["8335CF30",0xD35B],
- ["8335CF31",0xD35C],
- ["8335CF32",0xD35D],
- ["8335CF33",0xD35E],
- ["8335CF34",0xD35F],
- ["8335CF35",0xD360],
- ["8335CF36",0xD361],
- ["8335CF37",0xD362],
- ["8335CF38",0xD363],
- ["8335CF39",0xD364],
- ["8335D030",0xD365],
- ["8335D031",0xD366],
- ["8335D032",0xD367],
- ["8335D033",0xD368],
- ["8335D034",0xD369],
- ["8335D035",0xD36A],
- ["8335D036",0xD36B],
- ["8335D037",0xD36C],
- ["8335D038",0xD36D],
- ["8335D039",0xD36E],
- ["8335D130",0xD36F],
- ["8335D131",0xD370],
- ["8335D132",0xD371],
- ["8335D133",0xD372],
- ["8335D134",0xD373],
- ["8335D135",0xD374],
- ["8335D136",0xD375],
- ["8335D137",0xD376],
- ["8335D138",0xD377],
- ["8335D139",0xD378],
- ["8335D230",0xD379],
- ["8335D231",0xD37A],
- ["8335D232",0xD37B],
- ["8335D233",0xD37C],
- ["8335D234",0xD37D],
- ["8335D235",0xD37E],
- ["8335D236",0xD37F],
- ["8335D237",0xD380],
- ["8335D238",0xD381],
- ["8335D239",0xD382],
- ["8335D330",0xD383],
- ["8335D331",0xD384],
- ["8335D332",0xD385],
- ["8335D333",0xD386],
- ["8335D334",0xD387],
- ["8335D335",0xD388],
- ["8335D336",0xD389],
- ["8335D337",0xD38A],
- ["8335D338",0xD38B],
- ["8335D339",0xD38C],
- ["8335D430",0xD38D],
- ["8335D431",0xD38E],
- ["8335D432",0xD38F],
- ["8335D433",0xD390],
- ["8335D434",0xD391],
- ["8335D435",0xD392],
- ["8335D436",0xD393],
- ["8335D437",0xD394],
- ["8335D438",0xD395],
- ["8335D439",0xD396],
- ["8335D530",0xD397],
- ["8335D531",0xD398],
- ["8335D532",0xD399],
- ["8335D533",0xD39A],
- ["8335D534",0xD39B],
- ["8335D535",0xD39C],
- ["8335D536",0xD39D],
- ["8335D537",0xD39E],
- ["8335D538",0xD39F],
- ["8335D539",0xD3A0],
- ["8335D630",0xD3A1],
- ["8335D631",0xD3A2],
- ["8335D632",0xD3A3],
- ["8335D633",0xD3A4],
- ["8335D634",0xD3A5],
- ["8335D635",0xD3A6],
- ["8335D636",0xD3A7],
- ["8335D637",0xD3A8],
- ["8335D638",0xD3A9],
- ["8335D639",0xD3AA],
- ["8335D730",0xD3AB],
- ["8335D731",0xD3AC],
- ["8335D732",0xD3AD],
- ["8335D733",0xD3AE],
- ["8335D734",0xD3AF],
- ["8335D735",0xD3B0],
- ["8335D736",0xD3B1],
- ["8335D737",0xD3B2],
- ["8335D738",0xD3B3],
- ["8335D739",0xD3B4],
- ["8335D830",0xD3B5],
- ["8335D831",0xD3B6],
- ["8335D832",0xD3B7],
- ["8335D833",0xD3B8],
- ["8335D834",0xD3B9],
- ["8335D835",0xD3BA],
- ["8335D836",0xD3BB],
- ["8335D837",0xD3BC],
- ["8335D838",0xD3BD],
- ["8335D839",0xD3BE],
- ["8335D930",0xD3BF],
- ["8335D931",0xD3C0],
- ["8335D932",0xD3C1],
- ["8335D933",0xD3C2],
- ["8335D934",0xD3C3],
- ["8335D935",0xD3C4],
- ["8335D936",0xD3C5],
- ["8335D937",0xD3C6],
- ["8335D938",0xD3C7],
- ["8335D939",0xD3C8],
- ["8335DA30",0xD3C9],
- ["8335DA31",0xD3CA],
- ["8335DA32",0xD3CB],
- ["8335DA33",0xD3CC],
- ["8335DA34",0xD3CD],
- ["8335DA35",0xD3CE],
- ["8335DA36",0xD3CF],
- ["8335DA37",0xD3D0],
- ["8335DA38",0xD3D1],
- ["8335DA39",0xD3D2],
- ["8335DB30",0xD3D3],
- ["8335DB31",0xD3D4],
- ["8335DB32",0xD3D5],
- ["8335DB33",0xD3D6],
- ["8335DB34",0xD3D7],
- ["8335DB35",0xD3D8],
- ["8335DB36",0xD3D9],
- ["8335DB37",0xD3DA],
- ["8335DB38",0xD3DB],
- ["8335DB39",0xD3DC],
- ["8335DC30",0xD3DD],
- ["8335DC31",0xD3DE],
- ["8335DC32",0xD3DF],
- ["8335DC33",0xD3E0],
- ["8335DC34",0xD3E1],
- ["8335DC35",0xD3E2],
- ["8335DC36",0xD3E3],
- ["8335DC37",0xD3E4],
- ["8335DC38",0xD3E5],
- ["8335DC39",0xD3E6],
- ["8335DD30",0xD3E7],
- ["8335DD31",0xD3E8],
- ["8335DD32",0xD3E9],
- ["8335DD33",0xD3EA],
- ["8335DD34",0xD3EB],
- ["8335DD35",0xD3EC],
- ["8335DD36",0xD3ED],
- ["8335DD37",0xD3EE],
- ["8335DD38",0xD3EF],
- ["8335DD39",0xD3F0],
- ["8335DE30",0xD3F1],
- ["8335DE31",0xD3F2],
- ["8335DE32",0xD3F3],
- ["8335DE33",0xD3F4],
- ["8335DE34",0xD3F5],
- ["8335DE35",0xD3F6],
- ["8335DE36",0xD3F7],
- ["8335DE37",0xD3F8],
- ["8335DE38",0xD3F9],
- ["8335DE39",0xD3FA],
- ["8335DF30",0xD3FB],
- ["8335DF31",0xD3FC],
- ["8335DF32",0xD3FD],
- ["8335DF33",0xD3FE],
- ["8335DF34",0xD3FF],
- ["8335DF35",0xD400],
- ["8335DF36",0xD401],
- ["8335DF37",0xD402],
- ["8335DF38",0xD403],
- ["8335DF39",0xD404],
- ["8335E030",0xD405],
- ["8335E031",0xD406],
- ["8335E032",0xD407],
- ["8335E033",0xD408],
- ["8335E034",0xD409],
- ["8335E035",0xD40A],
- ["8335E036",0xD40B],
- ["8335E037",0xD40C],
- ["8335E038",0xD40D],
- ["8335E039",0xD40E],
- ["8335E130",0xD40F],
- ["8335E131",0xD410],
- ["8335E132",0xD411],
- ["8335E133",0xD412],
- ["8335E134",0xD413],
- ["8335E135",0xD414],
- ["8335E136",0xD415],
- ["8335E137",0xD416],
- ["8335E138",0xD417],
- ["8335E139",0xD418],
- ["8335E230",0xD419],
- ["8335E231",0xD41A],
- ["8335E232",0xD41B],
- ["8335E233",0xD41C],
- ["8335E234",0xD41D],
- ["8335E235",0xD41E],
- ["8335E236",0xD41F],
- ["8335E237",0xD420],
- ["8335E238",0xD421],
- ["8335E239",0xD422],
- ["8335E330",0xD423],
- ["8335E331",0xD424],
- ["8335E332",0xD425],
- ["8335E333",0xD426],
- ["8335E334",0xD427],
- ["8335E335",0xD428],
- ["8335E336",0xD429],
- ["8335E337",0xD42A],
- ["8335E338",0xD42B],
- ["8335E339",0xD42C],
- ["8335E430",0xD42D],
- ["8335E431",0xD42E],
- ["8335E432",0xD42F],
- ["8335E433",0xD430],
- ["8335E434",0xD431],
- ["8335E435",0xD432],
- ["8335E436",0xD433],
- ["8335E437",0xD434],
- ["8335E438",0xD435],
- ["8335E439",0xD436],
- ["8335E530",0xD437],
- ["8335E531",0xD438],
- ["8335E532",0xD439],
- ["8335E533",0xD43A],
- ["8335E534",0xD43B],
- ["8335E535",0xD43C],
- ["8335E536",0xD43D],
- ["8335E537",0xD43E],
- ["8335E538",0xD43F],
- ["8335E539",0xD440],
- ["8335E630",0xD441],
- ["8335E631",0xD442],
- ["8335E632",0xD443],
- ["8335E633",0xD444],
- ["8335E634",0xD445],
- ["8335E635",0xD446],
- ["8335E636",0xD447],
- ["8335E637",0xD448],
- ["8335E638",0xD449],
- ["8335E639",0xD44A],
- ["8335E730",0xD44B],
- ["8335E731",0xD44C],
- ["8335E732",0xD44D],
- ["8335E733",0xD44E],
- ["8335E734",0xD44F],
- ["8335E735",0xD450],
- ["8335E736",0xD451],
- ["8335E737",0xD452],
- ["8335E738",0xD453],
- ["8335E739",0xD454],
- ["8335E830",0xD455],
- ["8335E831",0xD456],
- ["8335E832",0xD457],
- ["8335E833",0xD458],
- ["8335E834",0xD459],
- ["8335E835",0xD45A],
- ["8335E836",0xD45B],
- ["8335E837",0xD45C],
- ["8335E838",0xD45D],
- ["8335E839",0xD45E],
- ["8335E930",0xD45F],
- ["8335E931",0xD460],
- ["8335E932",0xD461],
- ["8335E933",0xD462],
- ["8335E934",0xD463],
- ["8335E935",0xD464],
- ["8335E936",0xD465],
- ["8335E937",0xD466],
- ["8335E938",0xD467],
- ["8335E939",0xD468],
- ["8335EA30",0xD469],
- ["8335EA31",0xD46A],
- ["8335EA32",0xD46B],
- ["8335EA33",0xD46C],
- ["8335EA34",0xD46D],
- ["8335EA35",0xD46E],
- ["8335EA36",0xD46F],
- ["8335EA37",0xD470],
- ["8335EA38",0xD471],
- ["8335EA39",0xD472],
- ["8335EB30",0xD473],
- ["8335EB31",0xD474],
- ["8335EB32",0xD475],
- ["8335EB33",0xD476],
- ["8335EB34",0xD477],
- ["8335EB35",0xD478],
- ["8335EB36",0xD479],
- ["8335EB37",0xD47A],
- ["8335EB38",0xD47B],
- ["8335EB39",0xD47C],
- ["8335EC30",0xD47D],
- ["8335EC31",0xD47E],
- ["8335EC32",0xD47F],
- ["8335EC33",0xD480],
- ["8335EC34",0xD481],
- ["8335EC35",0xD482],
- ["8335EC36",0xD483],
- ["8335EC37",0xD484],
- ["8335EC38",0xD485],
- ["8335EC39",0xD486],
- ["8335ED30",0xD487],
- ["8335ED31",0xD488],
- ["8335ED32",0xD489],
- ["8335ED33",0xD48A],
- ["8335ED34",0xD48B],
- ["8335ED35",0xD48C],
- ["8335ED36",0xD48D],
- ["8335ED37",0xD48E],
- ["8335ED38",0xD48F],
- ["8335ED39",0xD490],
- ["8335EE30",0xD491],
- ["8335EE31",0xD492],
- ["8335EE32",0xD493],
- ["8335EE33",0xD494],
- ["8335EE34",0xD495],
- ["8335EE35",0xD496],
- ["8335EE36",0xD497],
- ["8335EE37",0xD498],
- ["8335EE38",0xD499],
- ["8335EE39",0xD49A],
- ["8335EF30",0xD49B],
- ["8335EF31",0xD49C],
- ["8335EF32",0xD49D],
- ["8335EF33",0xD49E],
- ["8335EF34",0xD49F],
- ["8335EF35",0xD4A0],
- ["8335EF36",0xD4A1],
- ["8335EF37",0xD4A2],
- ["8335EF38",0xD4A3],
- ["8335EF39",0xD4A4],
- ["8335F030",0xD4A5],
- ["8335F031",0xD4A6],
- ["8335F032",0xD4A7],
- ["8335F033",0xD4A8],
- ["8335F034",0xD4A9],
- ["8335F035",0xD4AA],
- ["8335F036",0xD4AB],
- ["8335F037",0xD4AC],
- ["8335F038",0xD4AD],
- ["8335F039",0xD4AE],
- ["8335F130",0xD4AF],
- ["8335F131",0xD4B0],
- ["8335F132",0xD4B1],
- ["8335F133",0xD4B2],
- ["8335F134",0xD4B3],
- ["8335F135",0xD4B4],
- ["8335F136",0xD4B5],
- ["8335F137",0xD4B6],
- ["8335F138",0xD4B7],
- ["8335F139",0xD4B8],
- ["8335F230",0xD4B9],
- ["8335F231",0xD4BA],
- ["8335F232",0xD4BB],
- ["8335F233",0xD4BC],
- ["8335F234",0xD4BD],
- ["8335F235",0xD4BE],
- ["8335F236",0xD4BF],
- ["8335F237",0xD4C0],
- ["8335F238",0xD4C1],
- ["8335F239",0xD4C2],
- ["8335F330",0xD4C3],
- ["8335F331",0xD4C4],
- ["8335F332",0xD4C5],
- ["8335F333",0xD4C6],
- ["8335F334",0xD4C7],
- ["8335F335",0xD4C8],
- ["8335F336",0xD4C9],
- ["8335F337",0xD4CA],
- ["8335F338",0xD4CB],
- ["8335F339",0xD4CC],
- ["8335F430",0xD4CD],
- ["8335F431",0xD4CE],
- ["8335F432",0xD4CF],
- ["8335F433",0xD4D0],
- ["8335F434",0xD4D1],
- ["8335F435",0xD4D2],
- ["8335F436",0xD4D3],
- ["8335F437",0xD4D4],
- ["8335F438",0xD4D5],
- ["8335F439",0xD4D6],
- ["8335F530",0xD4D7],
- ["8335F531",0xD4D8],
- ["8335F532",0xD4D9],
- ["8335F533",0xD4DA],
- ["8335F534",0xD4DB],
- ["8335F535",0xD4DC],
- ["8335F536",0xD4DD],
- ["8335F537",0xD4DE],
- ["8335F538",0xD4DF],
- ["8335F539",0xD4E0],
- ["8335F630",0xD4E1],
- ["8335F631",0xD4E2],
- ["8335F632",0xD4E3],
- ["8335F633",0xD4E4],
- ["8335F634",0xD4E5],
- ["8335F635",0xD4E6],
- ["8335F636",0xD4E7],
- ["8335F637",0xD4E8],
- ["8335F638",0xD4E9],
- ["8335F639",0xD4EA],
- ["8335F730",0xD4EB],
- ["8335F731",0xD4EC],
- ["8335F732",0xD4ED],
- ["8335F733",0xD4EE],
- ["8335F734",0xD4EF],
- ["8335F735",0xD4F0],
- ["8335F736",0xD4F1],
- ["8335F737",0xD4F2],
- ["8335F738",0xD4F3],
- ["8335F739",0xD4F4],
- ["8335F830",0xD4F5],
- ["8335F831",0xD4F6],
- ["8335F832",0xD4F7],
- ["8335F833",0xD4F8],
- ["8335F834",0xD4F9],
- ["8335F835",0xD4FA],
- ["8335F836",0xD4FB],
- ["8335F837",0xD4FC],
- ["8335F838",0xD4FD],
- ["8335F839",0xD4FE],
- ["8335F930",0xD4FF],
- ["8335F931",0xD500],
- ["8335F932",0xD501],
- ["8335F933",0xD502],
- ["8335F934",0xD503],
- ["8335F935",0xD504],
- ["8335F936",0xD505],
- ["8335F937",0xD506],
- ["8335F938",0xD507],
- ["8335F939",0xD508],
- ["8335FA30",0xD509],
- ["8335FA31",0xD50A],
- ["8335FA32",0xD50B],
- ["8335FA33",0xD50C],
- ["8335FA34",0xD50D],
- ["8335FA35",0xD50E],
- ["8335FA36",0xD50F],
- ["8335FA37",0xD510],
- ["8335FA38",0xD511],
- ["8335FA39",0xD512],
- ["8335FB30",0xD513],
- ["8335FB31",0xD514],
- ["8335FB32",0xD515],
- ["8335FB33",0xD516],
- ["8335FB34",0xD517],
- ["8335FB35",0xD518],
- ["8335FB36",0xD519],
- ["8335FB37",0xD51A],
- ["8335FB38",0xD51B],
- ["8335FB39",0xD51C],
- ["8335FC30",0xD51D],
- ["8335FC31",0xD51E],
- ["8335FC32",0xD51F],
- ["8335FC33",0xD520],
- ["8335FC34",0xD521],
- ["8335FC35",0xD522],
- ["8335FC36",0xD523],
- ["8335FC37",0xD524],
- ["8335FC38",0xD525],
- ["8335FC39",0xD526],
- ["8335FD30",0xD527],
- ["8335FD31",0xD528],
- ["8335FD32",0xD529],
- ["8335FD33",0xD52A],
- ["8335FD34",0xD52B],
- ["8335FD35",0xD52C],
- ["8335FD36",0xD52D],
- ["8335FD37",0xD52E],
- ["8335FD38",0xD52F],
- ["8335FD39",0xD530],
- ["8335FE30",0xD531],
- ["8335FE31",0xD532],
- ["8335FE32",0xD533],
- ["8335FE33",0xD534],
- ["8335FE34",0xD535],
- ["8335FE35",0xD536],
- ["8335FE36",0xD537],
- ["8335FE37",0xD538],
- ["8335FE38",0xD539],
- ["8335FE39",0xD53A],
- ["83368130",0xD53B],
- ["83368131",0xD53C],
- ["83368132",0xD53D],
- ["83368133",0xD53E],
- ["83368134",0xD53F],
- ["83368135",0xD540],
- ["83368136",0xD541],
- ["83368137",0xD542],
- ["83368138",0xD543],
- ["83368139",0xD544],
- ["83368230",0xD545],
- ["83368231",0xD546],
- ["83368232",0xD547],
- ["83368233",0xD548],
- ["83368234",0xD549],
- ["83368235",0xD54A],
- ["83368236",0xD54B],
- ["83368237",0xD54C],
- ["83368238",0xD54D],
- ["83368239",0xD54E],
- ["83368330",0xD54F],
- ["83368331",0xD550],
- ["83368332",0xD551],
- ["83368333",0xD552],
- ["83368334",0xD553],
- ["83368335",0xD554],
- ["83368336",0xD555],
- ["83368337",0xD556],
- ["83368338",0xD557],
- ["83368339",0xD558],
- ["83368430",0xD559],
- ["83368431",0xD55A],
- ["83368432",0xD55B],
- ["83368433",0xD55C],
- ["83368434",0xD55D],
- ["83368435",0xD55E],
- ["83368436",0xD55F],
- ["83368437",0xD560],
- ["83368438",0xD561],
- ["83368439",0xD562],
- ["83368530",0xD563],
- ["83368531",0xD564],
- ["83368532",0xD565],
- ["83368533",0xD566],
- ["83368534",0xD567],
- ["83368535",0xD568],
- ["83368536",0xD569],
- ["83368537",0xD56A],
- ["83368538",0xD56B],
- ["83368539",0xD56C],
- ["83368630",0xD56D],
- ["83368631",0xD56E],
- ["83368632",0xD56F],
- ["83368633",0xD570],
- ["83368634",0xD571],
- ["83368635",0xD572],
- ["83368636",0xD573],
- ["83368637",0xD574],
- ["83368638",0xD575],
- ["83368639",0xD576],
- ["83368730",0xD577],
- ["83368731",0xD578],
- ["83368732",0xD579],
- ["83368733",0xD57A],
- ["83368734",0xD57B],
- ["83368735",0xD57C],
- ["83368736",0xD57D],
- ["83368737",0xD57E],
- ["83368738",0xD57F],
- ["83368739",0xD580],
- ["83368830",0xD581],
- ["83368831",0xD582],
- ["83368832",0xD583],
- ["83368833",0xD584],
- ["83368834",0xD585],
- ["83368835",0xD586],
- ["83368836",0xD587],
- ["83368837",0xD588],
- ["83368838",0xD589],
- ["83368839",0xD58A],
- ["83368930",0xD58B],
- ["83368931",0xD58C],
- ["83368932",0xD58D],
- ["83368933",0xD58E],
- ["83368934",0xD58F],
- ["83368935",0xD590],
- ["83368936",0xD591],
- ["83368937",0xD592],
- ["83368938",0xD593],
- ["83368939",0xD594],
- ["83368A30",0xD595],
- ["83368A31",0xD596],
- ["83368A32",0xD597],
- ["83368A33",0xD598],
- ["83368A34",0xD599],
- ["83368A35",0xD59A],
- ["83368A36",0xD59B],
- ["83368A37",0xD59C],
- ["83368A38",0xD59D],
- ["83368A39",0xD59E],
- ["83368B30",0xD59F],
- ["83368B31",0xD5A0],
- ["83368B32",0xD5A1],
- ["83368B33",0xD5A2],
- ["83368B34",0xD5A3],
- ["83368B35",0xD5A4],
- ["83368B36",0xD5A5],
- ["83368B37",0xD5A6],
- ["83368B38",0xD5A7],
- ["83368B39",0xD5A8],
- ["83368C30",0xD5A9],
- ["83368C31",0xD5AA],
- ["83368C32",0xD5AB],
- ["83368C33",0xD5AC],
- ["83368C34",0xD5AD],
- ["83368C35",0xD5AE],
- ["83368C36",0xD5AF],
- ["83368C37",0xD5B0],
- ["83368C38",0xD5B1],
- ["83368C39",0xD5B2],
- ["83368D30",0xD5B3],
- ["83368D31",0xD5B4],
- ["83368D32",0xD5B5],
- ["83368D33",0xD5B6],
- ["83368D34",0xD5B7],
- ["83368D35",0xD5B8],
- ["83368D36",0xD5B9],
- ["83368D37",0xD5BA],
- ["83368D38",0xD5BB],
- ["83368D39",0xD5BC],
- ["83368E30",0xD5BD],
- ["83368E31",0xD5BE],
- ["83368E32",0xD5BF],
- ["83368E33",0xD5C0],
- ["83368E34",0xD5C1],
- ["83368E35",0xD5C2],
- ["83368E36",0xD5C3],
- ["83368E37",0xD5C4],
- ["83368E38",0xD5C5],
- ["83368E39",0xD5C6],
- ["83368F30",0xD5C7],
- ["83368F31",0xD5C8],
- ["83368F32",0xD5C9],
- ["83368F33",0xD5CA],
- ["83368F34",0xD5CB],
- ["83368F35",0xD5CC],
- ["83368F36",0xD5CD],
- ["83368F37",0xD5CE],
- ["83368F38",0xD5CF],
- ["83368F39",0xD5D0],
- ["83369030",0xD5D1],
- ["83369031",0xD5D2],
- ["83369032",0xD5D3],
- ["83369033",0xD5D4],
- ["83369034",0xD5D5],
- ["83369035",0xD5D6],
- ["83369036",0xD5D7],
- ["83369037",0xD5D8],
- ["83369038",0xD5D9],
- ["83369039",0xD5DA],
- ["83369130",0xD5DB],
- ["83369131",0xD5DC],
- ["83369132",0xD5DD],
- ["83369133",0xD5DE],
- ["83369134",0xD5DF],
- ["83369135",0xD5E0],
- ["83369136",0xD5E1],
- ["83369137",0xD5E2],
- ["83369138",0xD5E3],
- ["83369139",0xD5E4],
- ["83369230",0xD5E5],
- ["83369231",0xD5E6],
- ["83369232",0xD5E7],
- ["83369233",0xD5E8],
- ["83369234",0xD5E9],
- ["83369235",0xD5EA],
- ["83369236",0xD5EB],
- ["83369237",0xD5EC],
- ["83369238",0xD5ED],
- ["83369239",0xD5EE],
- ["83369330",0xD5EF],
- ["83369331",0xD5F0],
- ["83369332",0xD5F1],
- ["83369333",0xD5F2],
- ["83369334",0xD5F3],
- ["83369335",0xD5F4],
- ["83369336",0xD5F5],
- ["83369337",0xD5F6],
- ["83369338",0xD5F7],
- ["83369339",0xD5F8],
- ["83369430",0xD5F9],
- ["83369431",0xD5FA],
- ["83369432",0xD5FB],
- ["83369433",0xD5FC],
- ["83369434",0xD5FD],
- ["83369435",0xD5FE],
- ["83369436",0xD5FF],
- ["83369437",0xD600],
- ["83369438",0xD601],
- ["83369439",0xD602],
- ["83369530",0xD603],
- ["83369531",0xD604],
- ["83369532",0xD605],
- ["83369533",0xD606],
- ["83369534",0xD607],
- ["83369535",0xD608],
- ["83369536",0xD609],
- ["83369537",0xD60A],
- ["83369538",0xD60B],
- ["83369539",0xD60C],
- ["83369630",0xD60D],
- ["83369631",0xD60E],
- ["83369632",0xD60F],
- ["83369633",0xD610],
- ["83369634",0xD611],
- ["83369635",0xD612],
- ["83369636",0xD613],
- ["83369637",0xD614],
- ["83369638",0xD615],
- ["83369639",0xD616],
- ["83369730",0xD617],
- ["83369731",0xD618],
- ["83369732",0xD619],
- ["83369733",0xD61A],
- ["83369734",0xD61B],
- ["83369735",0xD61C],
- ["83369736",0xD61D],
- ["83369737",0xD61E],
- ["83369738",0xD61F],
- ["83369739",0xD620],
- ["83369830",0xD621],
- ["83369831",0xD622],
- ["83369832",0xD623],
- ["83369833",0xD624],
- ["83369834",0xD625],
- ["83369835",0xD626],
- ["83369836",0xD627],
- ["83369837",0xD628],
- ["83369838",0xD629],
- ["83369839",0xD62A],
- ["83369930",0xD62B],
- ["83369931",0xD62C],
- ["83369932",0xD62D],
- ["83369933",0xD62E],
- ["83369934",0xD62F],
- ["83369935",0xD630],
- ["83369936",0xD631],
- ["83369937",0xD632],
- ["83369938",0xD633],
- ["83369939",0xD634],
- ["83369A30",0xD635],
- ["83369A31",0xD636],
- ["83369A32",0xD637],
- ["83369A33",0xD638],
- ["83369A34",0xD639],
- ["83369A35",0xD63A],
- ["83369A36",0xD63B],
- ["83369A37",0xD63C],
- ["83369A38",0xD63D],
- ["83369A39",0xD63E],
- ["83369B30",0xD63F],
- ["83369B31",0xD640],
- ["83369B32",0xD641],
- ["83369B33",0xD642],
- ["83369B34",0xD643],
- ["83369B35",0xD644],
- ["83369B36",0xD645],
- ["83369B37",0xD646],
- ["83369B38",0xD647],
- ["83369B39",0xD648],
- ["83369C30",0xD649],
- ["83369C31",0xD64A],
- ["83369C32",0xD64B],
- ["83369C33",0xD64C],
- ["83369C34",0xD64D],
- ["83369C35",0xD64E],
- ["83369C36",0xD64F],
- ["83369C37",0xD650],
- ["83369C38",0xD651],
- ["83369C39",0xD652],
- ["83369D30",0xD653],
- ["83369D31",0xD654],
- ["83369D32",0xD655],
- ["83369D33",0xD656],
- ["83369D34",0xD657],
- ["83369D35",0xD658],
- ["83369D36",0xD659],
- ["83369D37",0xD65A],
- ["83369D38",0xD65B],
- ["83369D39",0xD65C],
- ["83369E30",0xD65D],
- ["83369E31",0xD65E],
- ["83369E32",0xD65F],
- ["83369E33",0xD660],
- ["83369E34",0xD661],
- ["83369E35",0xD662],
- ["83369E36",0xD663],
- ["83369E37",0xD664],
- ["83369E38",0xD665],
- ["83369E39",0xD666],
- ["83369F30",0xD667],
- ["83369F31",0xD668],
- ["83369F32",0xD669],
- ["83369F33",0xD66A],
- ["83369F34",0xD66B],
- ["83369F35",0xD66C],
- ["83369F36",0xD66D],
- ["83369F37",0xD66E],
- ["83369F38",0xD66F],
- ["83369F39",0xD670],
- ["8336A030",0xD671],
- ["8336A031",0xD672],
- ["8336A032",0xD673],
- ["8336A033",0xD674],
- ["8336A034",0xD675],
- ["8336A035",0xD676],
- ["8336A036",0xD677],
- ["8336A037",0xD678],
- ["8336A038",0xD679],
- ["8336A039",0xD67A],
- ["8336A130",0xD67B],
- ["8336A131",0xD67C],
- ["8336A132",0xD67D],
- ["8336A133",0xD67E],
- ["8336A134",0xD67F],
- ["8336A135",0xD680],
- ["8336A136",0xD681],
- ["8336A137",0xD682],
- ["8336A138",0xD683],
- ["8336A139",0xD684],
- ["8336A230",0xD685],
- ["8336A231",0xD686],
- ["8336A232",0xD687],
- ["8336A233",0xD688],
- ["8336A234",0xD689],
- ["8336A235",0xD68A],
- ["8336A236",0xD68B],
- ["8336A237",0xD68C],
- ["8336A238",0xD68D],
- ["8336A239",0xD68E],
- ["8336A330",0xD68F],
- ["8336A331",0xD690],
- ["8336A332",0xD691],
- ["8336A333",0xD692],
- ["8336A334",0xD693],
- ["8336A335",0xD694],
- ["8336A336",0xD695],
- ["8336A337",0xD696],
- ["8336A338",0xD697],
- ["8336A339",0xD698],
- ["8336A430",0xD699],
- ["8336A431",0xD69A],
- ["8336A432",0xD69B],
- ["8336A433",0xD69C],
- ["8336A434",0xD69D],
- ["8336A435",0xD69E],
- ["8336A436",0xD69F],
- ["8336A437",0xD6A0],
- ["8336A438",0xD6A1],
- ["8336A439",0xD6A2],
- ["8336A530",0xD6A3],
- ["8336A531",0xD6A4],
- ["8336A532",0xD6A5],
- ["8336A533",0xD6A6],
- ["8336A534",0xD6A7],
- ["8336A535",0xD6A8],
- ["8336A536",0xD6A9],
- ["8336A537",0xD6AA],
- ["8336A538",0xD6AB],
- ["8336A539",0xD6AC],
- ["8336A630",0xD6AD],
- ["8336A631",0xD6AE],
- ["8336A632",0xD6AF],
- ["8336A633",0xD6B0],
- ["8336A634",0xD6B1],
- ["8336A635",0xD6B2],
- ["8336A636",0xD6B3],
- ["8336A637",0xD6B4],
- ["8336A638",0xD6B5],
- ["8336A639",0xD6B6],
- ["8336A730",0xD6B7],
- ["8336A731",0xD6B8],
- ["8336A732",0xD6B9],
- ["8336A733",0xD6BA],
- ["8336A734",0xD6BB],
- ["8336A735",0xD6BC],
- ["8336A736",0xD6BD],
- ["8336A737",0xD6BE],
- ["8336A738",0xD6BF],
- ["8336A739",0xD6C0],
- ["8336A830",0xD6C1],
- ["8336A831",0xD6C2],
- ["8336A832",0xD6C3],
- ["8336A833",0xD6C4],
- ["8336A834",0xD6C5],
- ["8336A835",0xD6C6],
- ["8336A836",0xD6C7],
- ["8336A837",0xD6C8],
- ["8336A838",0xD6C9],
- ["8336A839",0xD6CA],
- ["8336A930",0xD6CB],
- ["8336A931",0xD6CC],
- ["8336A932",0xD6CD],
- ["8336A933",0xD6CE],
- ["8336A934",0xD6CF],
- ["8336A935",0xD6D0],
- ["8336A936",0xD6D1],
- ["8336A937",0xD6D2],
- ["8336A938",0xD6D3],
- ["8336A939",0xD6D4],
- ["8336AA30",0xD6D5],
- ["8336AA31",0xD6D6],
- ["8336AA32",0xD6D7],
- ["8336AA33",0xD6D8],
- ["8336AA34",0xD6D9],
- ["8336AA35",0xD6DA],
- ["8336AA36",0xD6DB],
- ["8336AA37",0xD6DC],
- ["8336AA38",0xD6DD],
- ["8336AA39",0xD6DE],
- ["8336AB30",0xD6DF],
- ["8336AB31",0xD6E0],
- ["8336AB32",0xD6E1],
- ["8336AB33",0xD6E2],
- ["8336AB34",0xD6E3],
- ["8336AB35",0xD6E4],
- ["8336AB36",0xD6E5],
- ["8336AB37",0xD6E6],
- ["8336AB38",0xD6E7],
- ["8336AB39",0xD6E8],
- ["8336AC30",0xD6E9],
- ["8336AC31",0xD6EA],
- ["8336AC32",0xD6EB],
- ["8336AC33",0xD6EC],
- ["8336AC34",0xD6ED],
- ["8336AC35",0xD6EE],
- ["8336AC36",0xD6EF],
- ["8336AC37",0xD6F0],
- ["8336AC38",0xD6F1],
- ["8336AC39",0xD6F2],
- ["8336AD30",0xD6F3],
- ["8336AD31",0xD6F4],
- ["8336AD32",0xD6F5],
- ["8336AD33",0xD6F6],
- ["8336AD34",0xD6F7],
- ["8336AD35",0xD6F8],
- ["8336AD36",0xD6F9],
- ["8336AD37",0xD6FA],
- ["8336AD38",0xD6FB],
- ["8336AD39",0xD6FC],
- ["8336AE30",0xD6FD],
- ["8336AE31",0xD6FE],
- ["8336AE32",0xD6FF],
- ["8336AE33",0xD700],
- ["8336AE34",0xD701],
- ["8336AE35",0xD702],
- ["8336AE36",0xD703],
- ["8336AE37",0xD704],
- ["8336AE38",0xD705],
- ["8336AE39",0xD706],
- ["8336AF30",0xD707],
- ["8336AF31",0xD708],
- ["8336AF32",0xD709],
- ["8336AF33",0xD70A],
- ["8336AF34",0xD70B],
- ["8336AF35",0xD70C],
- ["8336AF36",0xD70D],
- ["8336AF37",0xD70E],
- ["8336AF38",0xD70F],
- ["8336AF39",0xD710],
- ["8336B030",0xD711],
- ["8336B031",0xD712],
- ["8336B032",0xD713],
- ["8336B033",0xD714],
- ["8336B034",0xD715],
- ["8336B035",0xD716],
- ["8336B036",0xD717],
- ["8336B037",0xD718],
- ["8336B038",0xD719],
- ["8336B039",0xD71A],
- ["8336B130",0xD71B],
- ["8336B131",0xD71C],
- ["8336B132",0xD71D],
- ["8336B133",0xD71E],
- ["8336B134",0xD71F],
- ["8336B135",0xD720],
- ["8336B136",0xD721],
- ["8336B137",0xD722],
- ["8336B138",0xD723],
- ["8336B139",0xD724],
- ["8336B230",0xD725],
- ["8336B231",0xD726],
- ["8336B232",0xD727],
- ["8336B233",0xD728],
- ["8336B234",0xD729],
- ["8336B235",0xD72A],
- ["8336B236",0xD72B],
- ["8336B237",0xD72C],
- ["8336B238",0xD72D],
- ["8336B239",0xD72E],
- ["8336B330",0xD72F],
- ["8336B331",0xD730],
- ["8336B332",0xD731],
- ["8336B333",0xD732],
- ["8336B334",0xD733],
- ["8336B335",0xD734],
- ["8336B336",0xD735],
- ["8336B337",0xD736],
- ["8336B338",0xD737],
- ["8336B339",0xD738],
- ["8336B430",0xD739],
- ["8336B431",0xD73A],
- ["8336B432",0xD73B],
- ["8336B433",0xD73C],
- ["8336B434",0xD73D],
- ["8336B435",0xD73E],
- ["8336B436",0xD73F],
- ["8336B437",0xD740],
- ["8336B438",0xD741],
- ["8336B439",0xD742],
- ["8336B530",0xD743],
- ["8336B531",0xD744],
- ["8336B532",0xD745],
- ["8336B533",0xD746],
- ["8336B534",0xD747],
- ["8336B535",0xD748],
- ["8336B536",0xD749],
- ["8336B537",0xD74A],
- ["8336B538",0xD74B],
- ["8336B539",0xD74C],
- ["8336B630",0xD74D],
- ["8336B631",0xD74E],
- ["8336B632",0xD74F],
- ["8336B633",0xD750],
- ["8336B634",0xD751],
- ["8336B635",0xD752],
- ["8336B636",0xD753],
- ["8336B637",0xD754],
- ["8336B638",0xD755],
- ["8336B639",0xD756],
- ["8336B730",0xD757],
- ["8336B731",0xD758],
- ["8336B732",0xD759],
- ["8336B733",0xD75A],
- ["8336B734",0xD75B],
- ["8336B735",0xD75C],
- ["8336B736",0xD75D],
- ["8336B737",0xD75E],
- ["8336B738",0xD75F],
- ["8336B739",0xD760],
- ["8336B830",0xD761],
- ["8336B831",0xD762],
- ["8336B832",0xD763],
- ["8336B833",0xD764],
- ["8336B834",0xD765],
- ["8336B835",0xD766],
- ["8336B836",0xD767],
- ["8336B837",0xD768],
- ["8336B838",0xD769],
- ["8336B839",0xD76A],
- ["8336B930",0xD76B],
- ["8336B931",0xD76C],
- ["8336B932",0xD76D],
- ["8336B933",0xD76E],
- ["8336B934",0xD76F],
- ["8336B935",0xD770],
- ["8336B936",0xD771],
- ["8336B937",0xD772],
- ["8336B938",0xD773],
- ["8336B939",0xD774],
- ["8336BA30",0xD775],
- ["8336BA31",0xD776],
- ["8336BA32",0xD777],
- ["8336BA33",0xD778],
- ["8336BA34",0xD779],
- ["8336BA35",0xD77A],
- ["8336BA36",0xD77B],
- ["8336BA37",0xD77C],
- ["8336BA38",0xD77D],
- ["8336BA39",0xD77E],
- ["8336BB30",0xD77F],
- ["8336BB31",0xD780],
- ["8336BB32",0xD781],
- ["8336BB33",0xD782],
- ["8336BB34",0xD783],
- ["8336BB35",0xD784],
- ["8336BB36",0xD785],
- ["8336BB37",0xD786],
- ["8336BB38",0xD787],
- ["8336BB39",0xD788],
- ["8336BC30",0xD789],
- ["8336BC31",0xD78A],
- ["8336BC32",0xD78B],
- ["8336BC33",0xD78C],
- ["8336BC34",0xD78D],
- ["8336BC35",0xD78E],
- ["8336BC36",0xD78F],
- ["8336BC37",0xD790],
- ["8336BC38",0xD791],
- ["8336BC39",0xD792],
- ["8336BD30",0xD793],
- ["8336BD31",0xD794],
- ["8336BD32",0xD795],
- ["8336BD33",0xD796],
- ["8336BD34",0xD797],
- ["8336BD35",0xD798],
- ["8336BD36",0xD799],
- ["8336BD37",0xD79A],
- ["8336BD38",0xD79B],
- ["8336BD39",0xD79C],
- ["8336BE30",0xD79D],
- ["8336BE31",0xD79E],
- ["8336BE32",0xD79F],
- ["8336BE33",0xD7A0],
- ["8336BE34",0xD7A1],
- ["8336BE35",0xD7A2],
- ["8336BE36",0xD7A3],
- ["8336BE37",0xD7A4],
- ["8336BE38",0xD7A5],
- ["8336BE39",0xD7A6],
- ["8336BF30",0xD7A7],
- ["8336BF31",0xD7A8],
- ["8336BF32",0xD7A9],
- ["8336BF33",0xD7AA],
- ["8336BF34",0xD7AB],
- ["8336BF35",0xD7AC],
- ["8336BF36",0xD7AD],
- ["8336BF37",0xD7AE],
- ["8336BF38",0xD7AF],
- ["8336BF39",0xD7B0],
- ["8336C030",0xD7B1],
- ["8336C031",0xD7B2],
- ["8336C032",0xD7B3],
- ["8336C033",0xD7B4],
- ["8336C034",0xD7B5],
- ["8336C035",0xD7B6],
- ["8336C036",0xD7B7],
- ["8336C037",0xD7B8],
- ["8336C038",0xD7B9],
- ["8336C039",0xD7BA],
- ["8336C130",0xD7BB],
- ["8336C131",0xD7BC],
- ["8336C132",0xD7BD],
- ["8336C133",0xD7BE],
- ["8336C134",0xD7BF],
- ["8336C135",0xD7C0],
- ["8336C136",0xD7C1],
- ["8336C137",0xD7C2],
- ["8336C138",0xD7C3],
- ["8336C139",0xD7C4],
- ["8336C230",0xD7C5],
- ["8336C231",0xD7C6],
- ["8336C232",0xD7C7],
- ["8336C233",0xD7C8],
- ["8336C234",0xD7C9],
- ["8336C235",0xD7CA],
- ["8336C236",0xD7CB],
- ["8336C237",0xD7CC],
- ["8336C238",0xD7CD],
- ["8336C239",0xD7CE],
- ["8336C330",0xD7CF],
- ["8336C331",0xD7D0],
- ["8336C332",0xD7D1],
- ["8336C333",0xD7D2],
- ["8336C334",0xD7D3],
- ["8336C335",0xD7D4],
- ["8336C336",0xD7D5],
- ["8336C337",0xD7D6],
- ["8336C338",0xD7D7],
- ["8336C339",0xD7D8],
- ["8336C430",0xD7D9],
- ["8336C431",0xD7DA],
- ["8336C432",0xD7DB],
- ["8336C433",0xD7DC],
- ["8336C434",0xD7DD],
- ["8336C435",0xD7DE],
- ["8336C436",0xD7DF],
- ["8336C437",0xD7E0],
- ["8336C438",0xD7E1],
- ["8336C439",0xD7E2],
- ["8336C530",0xD7E3],
- ["8336C531",0xD7E4],
- ["8336C532",0xD7E5],
- ["8336C533",0xD7E6],
- ["8336C534",0xD7E7],
- ["8336C535",0xD7E8],
- ["8336C536",0xD7E9],
- ["8336C537",0xD7EA],
- ["8336C538",0xD7EB],
- ["8336C539",0xD7EC],
- ["8336C630",0xD7ED],
- ["8336C631",0xD7EE],
- ["8336C632",0xD7EF],
- ["8336C633",0xD7F0],
- ["8336C634",0xD7F1],
- ["8336C635",0xD7F2],
- ["8336C636",0xD7F3],
- ["8336C637",0xD7F4],
- ["8336C638",0xD7F5],
- ["8336C639",0xD7F6],
- ["8336C730",0xD7F7],
- ["8336C731",0xD7F8],
- ["8336C732",0xD7F9],
- ["8336C733",0xD7FA],
- ["8336C734",0xD7FB],
- ["8336C735",0xD7FC],
- ["8336C736",0xD7FD],
- ["8336C737",0xD7FE],
- ["8336C738",0xD7FF],
- ["AAA1",0xE000],
- ["AAA2",0xE001],
- ["AAA3",0xE002],
- ["AAA4",0xE003],
- ["AAA5",0xE004],
- ["AAA6",0xE005],
- ["AAA7",0xE006],
- ["AAA8",0xE007],
- ["AAA9",0xE008],
- ["AAAA",0xE009],
- ["AAAB",0xE00A],
- ["AAAC",0xE00B],
- ["AAAD",0xE00C],
- ["AAAE",0xE00D],
- ["AAAF",0xE00E],
- ["AAB0",0xE00F],
- ["AAB1",0xE010],
- ["AAB2",0xE011],
- ["AAB3",0xE012],
- ["AAB4",0xE013],
- ["AAB5",0xE014],
- ["AAB6",0xE015],
- ["AAB7",0xE016],
- ["AAB8",0xE017],
- ["AAB9",0xE018],
- ["AABA",0xE019],
- ["AABB",0xE01A],
- ["AABC",0xE01B],
- ["AABD",0xE01C],
- ["AABE",0xE01D],
- ["AABF",0xE01E],
- ["AAC0",0xE01F],
- ["AAC1",0xE020],
- ["AAC2",0xE021],
- ["AAC3",0xE022],
- ["AAC4",0xE023],
- ["AAC5",0xE024],
- ["AAC6",0xE025],
- ["AAC7",0xE026],
- ["AAC8",0xE027],
- ["AAC9",0xE028],
- ["AACA",0xE029],
- ["AACB",0xE02A],
- ["AACC",0xE02B],
- ["AACD",0xE02C],
- ["AACE",0xE02D],
- ["AACF",0xE02E],
- ["AAD0",0xE02F],
- ["AAD1",0xE030],
- ["AAD2",0xE031],
- ["AAD3",0xE032],
- ["AAD4",0xE033],
- ["AAD5",0xE034],
- ["AAD6",0xE035],
- ["AAD7",0xE036],
- ["AAD8",0xE037],
- ["AAD9",0xE038],
- ["AADA",0xE039],
- ["AADB",0xE03A],
- ["AADC",0xE03B],
- ["AADD",0xE03C],
- ["AADE",0xE03D],
- ["AADF",0xE03E],
- ["AAE0",0xE03F],
- ["AAE1",0xE040],
- ["AAE2",0xE041],
- ["AAE3",0xE042],
- ["AAE4",0xE043],
- ["AAE5",0xE044],
- ["AAE6",0xE045],
- ["AAE7",0xE046],
- ["AAE8",0xE047],
- ["AAE9",0xE048],
- ["AAEA",0xE049],
- ["AAEB",0xE04A],
- ["AAEC",0xE04B],
- ["AAED",0xE04C],
- ["AAEE",0xE04D],
- ["AAEF",0xE04E],
- ["AAF0",0xE04F],
- ["AAF1",0xE050],
- ["AAF2",0xE051],
- ["AAF3",0xE052],
- ["AAF4",0xE053],
- ["AAF5",0xE054],
- ["AAF6",0xE055],
- ["AAF7",0xE056],
- ["AAF8",0xE057],
- ["AAF9",0xE058],
- ["AAFA",0xE059],
- ["AAFB",0xE05A],
- ["AAFC",0xE05B],
- ["AAFD",0xE05C],
- ["AAFE",0xE05D],
- ["ABA1",0xE05E],
- ["ABA2",0xE05F],
- ["ABA3",0xE060],
- ["ABA4",0xE061],
- ["ABA5",0xE062],
- ["ABA6",0xE063],
- ["ABA7",0xE064],
- ["ABA8",0xE065],
- ["ABA9",0xE066],
- ["ABAA",0xE067],
- ["ABAB",0xE068],
- ["ABAC",0xE069],
- ["ABAD",0xE06A],
- ["ABAE",0xE06B],
- ["ABAF",0xE06C],
- ["ABB0",0xE06D],
- ["ABB1",0xE06E],
- ["ABB2",0xE06F],
- ["ABB3",0xE070],
- ["ABB4",0xE071],
- ["ABB5",0xE072],
- ["ABB6",0xE073],
- ["ABB7",0xE074],
- ["ABB8",0xE075],
- ["ABB9",0xE076],
- ["ABBA",0xE077],
- ["ABBB",0xE078],
- ["ABBC",0xE079],
- ["ABBD",0xE07A],
- ["ABBE",0xE07B],
- ["ABBF",0xE07C],
- ["ABC0",0xE07D],
- ["ABC1",0xE07E],
- ["ABC2",0xE07F],
- ["ABC3",0xE080],
- ["ABC4",0xE081],
- ["ABC5",0xE082],
- ["ABC6",0xE083],
- ["ABC7",0xE084],
- ["ABC8",0xE085],
- ["ABC9",0xE086],
- ["ABCA",0xE087],
- ["ABCB",0xE088],
- ["ABCC",0xE089],
- ["ABCD",0xE08A],
- ["ABCE",0xE08B],
- ["ABCF",0xE08C],
- ["ABD0",0xE08D],
- ["ABD1",0xE08E],
- ["ABD2",0xE08F],
- ["ABD3",0xE090],
- ["ABD4",0xE091],
- ["ABD5",0xE092],
- ["ABD6",0xE093],
- ["ABD7",0xE094],
- ["ABD8",0xE095],
- ["ABD9",0xE096],
- ["ABDA",0xE097],
- ["ABDB",0xE098],
- ["ABDC",0xE099],
- ["ABDD",0xE09A],
- ["ABDE",0xE09B],
- ["ABDF",0xE09C],
- ["ABE0",0xE09D],
- ["ABE1",0xE09E],
- ["ABE2",0xE09F],
- ["ABE3",0xE0A0],
- ["ABE4",0xE0A1],
- ["ABE5",0xE0A2],
- ["ABE6",0xE0A3],
- ["ABE7",0xE0A4],
- ["ABE8",0xE0A5],
- ["ABE9",0xE0A6],
- ["ABEA",0xE0A7],
- ["ABEB",0xE0A8],
- ["ABEC",0xE0A9],
- ["ABED",0xE0AA],
- ["ABEE",0xE0AB],
- ["ABEF",0xE0AC],
- ["ABF0",0xE0AD],
- ["ABF1",0xE0AE],
- ["ABF2",0xE0AF],
- ["ABF3",0xE0B0],
- ["ABF4",0xE0B1],
- ["ABF5",0xE0B2],
- ["ABF6",0xE0B3],
- ["ABF7",0xE0B4],
- ["ABF8",0xE0B5],
- ["ABF9",0xE0B6],
- ["ABFA",0xE0B7],
- ["ABFB",0xE0B8],
- ["ABFC",0xE0B9],
- ["ABFD",0xE0BA],
- ["ABFE",0xE0BB],
- ["ACA1",0xE0BC],
- ["ACA2",0xE0BD],
- ["ACA3",0xE0BE],
- ["ACA4",0xE0BF],
- ["ACA5",0xE0C0],
- ["ACA6",0xE0C1],
- ["ACA7",0xE0C2],
- ["ACA8",0xE0C3],
- ["ACA9",0xE0C4],
- ["ACAA",0xE0C5],
- ["ACAB",0xE0C6],
- ["ACAC",0xE0C7],
- ["ACAD",0xE0C8],
- ["ACAE",0xE0C9],
- ["ACAF",0xE0CA],
- ["ACB0",0xE0CB],
- ["ACB1",0xE0CC],
- ["ACB2",0xE0CD],
- ["ACB3",0xE0CE],
- ["ACB4",0xE0CF],
- ["ACB5",0xE0D0],
- ["ACB6",0xE0D1],
- ["ACB7",0xE0D2],
- ["ACB8",0xE0D3],
- ["ACB9",0xE0D4],
- ["ACBA",0xE0D5],
- ["ACBB",0xE0D6],
- ["ACBC",0xE0D7],
- ["ACBD",0xE0D8],
- ["ACBE",0xE0D9],
- ["ACBF",0xE0DA],
- ["ACC0",0xE0DB],
- ["ACC1",0xE0DC],
- ["ACC2",0xE0DD],
- ["ACC3",0xE0DE],
- ["ACC4",0xE0DF],
- ["ACC5",0xE0E0],
- ["ACC6",0xE0E1],
- ["ACC7",0xE0E2],
- ["ACC8",0xE0E3],
- ["ACC9",0xE0E4],
- ["ACCA",0xE0E5],
- ["ACCB",0xE0E6],
- ["ACCC",0xE0E7],
- ["ACCD",0xE0E8],
- ["ACCE",0xE0E9],
- ["ACCF",0xE0EA],
- ["ACD0",0xE0EB],
- ["ACD1",0xE0EC],
- ["ACD2",0xE0ED],
- ["ACD3",0xE0EE],
- ["ACD4",0xE0EF],
- ["ACD5",0xE0F0],
- ["ACD6",0xE0F1],
- ["ACD7",0xE0F2],
- ["ACD8",0xE0F3],
- ["ACD9",0xE0F4],
- ["ACDA",0xE0F5],
- ["ACDB",0xE0F6],
- ["ACDC",0xE0F7],
- ["ACDD",0xE0F8],
- ["ACDE",0xE0F9],
- ["ACDF",0xE0FA],
- ["ACE0",0xE0FB],
- ["ACE1",0xE0FC],
- ["ACE2",0xE0FD],
- ["ACE3",0xE0FE],
- ["ACE4",0xE0FF],
- ["ACE5",0xE100],
- ["ACE6",0xE101],
- ["ACE7",0xE102],
- ["ACE8",0xE103],
- ["ACE9",0xE104],
- ["ACEA",0xE105],
- ["ACEB",0xE106],
- ["ACEC",0xE107],
- ["ACED",0xE108],
- ["ACEE",0xE109],
- ["ACEF",0xE10A],
- ["ACF0",0xE10B],
- ["ACF1",0xE10C],
- ["ACF2",0xE10D],
- ["ACF3",0xE10E],
- ["ACF4",0xE10F],
- ["ACF5",0xE110],
- ["ACF6",0xE111],
- ["ACF7",0xE112],
- ["ACF8",0xE113],
- ["ACF9",0xE114],
- ["ACFA",0xE115],
- ["ACFB",0xE116],
- ["ACFC",0xE117],
- ["ACFD",0xE118],
- ["ACFE",0xE119],
- ["ADA1",0xE11A],
- ["ADA2",0xE11B],
- ["ADA3",0xE11C],
- ["ADA4",0xE11D],
- ["ADA5",0xE11E],
- ["ADA6",0xE11F],
- ["ADA7",0xE120],
- ["ADA8",0xE121],
- ["ADA9",0xE122],
- ["ADAA",0xE123],
- ["ADAB",0xE124],
- ["ADAC",0xE125],
- ["ADAD",0xE126],
- ["ADAE",0xE127],
- ["ADAF",0xE128],
- ["ADB0",0xE129],
- ["ADB1",0xE12A],
- ["ADB2",0xE12B],
- ["ADB3",0xE12C],
- ["ADB4",0xE12D],
- ["ADB5",0xE12E],
- ["ADB6",0xE12F],
- ["ADB7",0xE130],
- ["ADB8",0xE131],
- ["ADB9",0xE132],
- ["ADBA",0xE133],
- ["ADBB",0xE134],
- ["ADBC",0xE135],
- ["ADBD",0xE136],
- ["ADBE",0xE137],
- ["ADBF",0xE138],
- ["ADC0",0xE139],
- ["ADC1",0xE13A],
- ["ADC2",0xE13B],
- ["ADC3",0xE13C],
- ["ADC4",0xE13D],
- ["ADC5",0xE13E],
- ["ADC6",0xE13F],
- ["ADC7",0xE140],
- ["ADC8",0xE141],
- ["ADC9",0xE142],
- ["ADCA",0xE143],
- ["ADCB",0xE144],
- ["ADCC",0xE145],
- ["ADCD",0xE146],
- ["ADCE",0xE147],
- ["ADCF",0xE148],
- ["ADD0",0xE149],
- ["ADD1",0xE14A],
- ["ADD2",0xE14B],
- ["ADD3",0xE14C],
- ["ADD4",0xE14D],
- ["ADD5",0xE14E],
- ["ADD6",0xE14F],
- ["ADD7",0xE150],
- ["ADD8",0xE151],
- ["ADD9",0xE152],
- ["ADDA",0xE153],
- ["ADDB",0xE154],
- ["ADDC",0xE155],
- ["ADDD",0xE156],
- ["ADDE",0xE157],
- ["ADDF",0xE158],
- ["ADE0",0xE159],
- ["ADE1",0xE15A],
- ["ADE2",0xE15B],
- ["ADE3",0xE15C],
- ["ADE4",0xE15D],
- ["ADE5",0xE15E],
- ["ADE6",0xE15F],
- ["ADE7",0xE160],
- ["ADE8",0xE161],
- ["ADE9",0xE162],
- ["ADEA",0xE163],
- ["ADEB",0xE164],
- ["ADEC",0xE165],
- ["ADED",0xE166],
- ["ADEE",0xE167],
- ["ADEF",0xE168],
- ["ADF0",0xE169],
- ["ADF1",0xE16A],
- ["ADF2",0xE16B],
- ["ADF3",0xE16C],
- ["ADF4",0xE16D],
- ["ADF5",0xE16E],
- ["ADF6",0xE16F],
- ["ADF7",0xE170],
- ["ADF8",0xE171],
- ["ADF9",0xE172],
- ["ADFA",0xE173],
- ["ADFB",0xE174],
- ["ADFC",0xE175],
- ["ADFD",0xE176],
- ["ADFE",0xE177],
- ["AEA1",0xE178],
- ["AEA2",0xE179],
- ["AEA3",0xE17A],
- ["AEA4",0xE17B],
- ["AEA5",0xE17C],
- ["AEA6",0xE17D],
- ["AEA7",0xE17E],
- ["AEA8",0xE17F],
- ["AEA9",0xE180],
- ["AEAA",0xE181],
- ["AEAB",0xE182],
- ["AEAC",0xE183],
- ["AEAD",0xE184],
- ["AEAE",0xE185],
- ["AEAF",0xE186],
- ["AEB0",0xE187],
- ["AEB1",0xE188],
- ["AEB2",0xE189],
- ["AEB3",0xE18A],
- ["AEB4",0xE18B],
- ["AEB5",0xE18C],
- ["AEB6",0xE18D],
- ["AEB7",0xE18E],
- ["AEB8",0xE18F],
- ["AEB9",0xE190],
- ["AEBA",0xE191],
- ["AEBB",0xE192],
- ["AEBC",0xE193],
- ["AEBD",0xE194],
- ["AEBE",0xE195],
- ["AEBF",0xE196],
- ["AEC0",0xE197],
- ["AEC1",0xE198],
- ["AEC2",0xE199],
- ["AEC3",0xE19A],
- ["AEC4",0xE19B],
- ["AEC5",0xE19C],
- ["AEC6",0xE19D],
- ["AEC7",0xE19E],
- ["AEC8",0xE19F],
- ["AEC9",0xE1A0],
- ["AECA",0xE1A1],
- ["AECB",0xE1A2],
- ["AECC",0xE1A3],
- ["AECD",0xE1A4],
- ["AECE",0xE1A5],
- ["AECF",0xE1A6],
- ["AED0",0xE1A7],
- ["AED1",0xE1A8],
- ["AED2",0xE1A9],
- ["AED3",0xE1AA],
- ["AED4",0xE1AB],
- ["AED5",0xE1AC],
- ["AED6",0xE1AD],
- ["AED7",0xE1AE],
- ["AED8",0xE1AF],
- ["AED9",0xE1B0],
- ["AEDA",0xE1B1],
- ["AEDB",0xE1B2],
- ["AEDC",0xE1B3],
- ["AEDD",0xE1B4],
- ["AEDE",0xE1B5],
- ["AEDF",0xE1B6],
- ["AEE0",0xE1B7],
- ["AEE1",0xE1B8],
- ["AEE2",0xE1B9],
- ["AEE3",0xE1BA],
- ["AEE4",0xE1BB],
- ["AEE5",0xE1BC],
- ["AEE6",0xE1BD],
- ["AEE7",0xE1BE],
- ["AEE8",0xE1BF],
- ["AEE9",0xE1C0],
- ["AEEA",0xE1C1],
- ["AEEB",0xE1C2],
- ["AEEC",0xE1C3],
- ["AEED",0xE1C4],
- ["AEEE",0xE1C5],
- ["AEEF",0xE1C6],
- ["AEF0",0xE1C7],
- ["AEF1",0xE1C8],
- ["AEF2",0xE1C9],
- ["AEF3",0xE1CA],
- ["AEF4",0xE1CB],
- ["AEF5",0xE1CC],
- ["AEF6",0xE1CD],
- ["AEF7",0xE1CE],
- ["AEF8",0xE1CF],
- ["AEF9",0xE1D0],
- ["AEFA",0xE1D1],
- ["AEFB",0xE1D2],
- ["AEFC",0xE1D3],
- ["AEFD",0xE1D4],
- ["AEFE",0xE1D5],
- ["AFA1",0xE1D6],
- ["AFA2",0xE1D7],
- ["AFA3",0xE1D8],
- ["AFA4",0xE1D9],
- ["AFA5",0xE1DA],
- ["AFA6",0xE1DB],
- ["AFA7",0xE1DC],
- ["AFA8",0xE1DD],
- ["AFA9",0xE1DE],
- ["AFAA",0xE1DF],
- ["AFAB",0xE1E0],
- ["AFAC",0xE1E1],
- ["AFAD",0xE1E2],
- ["AFAE",0xE1E3],
- ["AFAF",0xE1E4],
- ["AFB0",0xE1E5],
- ["AFB1",0xE1E6],
- ["AFB2",0xE1E7],
- ["AFB3",0xE1E8],
- ["AFB4",0xE1E9],
- ["AFB5",0xE1EA],
- ["AFB6",0xE1EB],
- ["AFB7",0xE1EC],
- ["AFB8",0xE1ED],
- ["AFB9",0xE1EE],
- ["AFBA",0xE1EF],
- ["AFBB",0xE1F0],
- ["AFBC",0xE1F1],
- ["AFBD",0xE1F2],
- ["AFBE",0xE1F3],
- ["AFBF",0xE1F4],
- ["AFC0",0xE1F5],
- ["AFC1",0xE1F6],
- ["AFC2",0xE1F7],
- ["AFC3",0xE1F8],
- ["AFC4",0xE1F9],
- ["AFC5",0xE1FA],
- ["AFC6",0xE1FB],
- ["AFC7",0xE1FC],
- ["AFC8",0xE1FD],
- ["AFC9",0xE1FE],
- ["AFCA",0xE1FF],
- ["AFCB",0xE200],
- ["AFCC",0xE201],
- ["AFCD",0xE202],
- ["AFCE",0xE203],
- ["AFCF",0xE204],
- ["AFD0",0xE205],
- ["AFD1",0xE206],
- ["AFD2",0xE207],
- ["AFD3",0xE208],
- ["AFD4",0xE209],
- ["AFD5",0xE20A],
- ["AFD6",0xE20B],
- ["AFD7",0xE20C],
- ["AFD8",0xE20D],
- ["AFD9",0xE20E],
- ["AFDA",0xE20F],
- ["AFDB",0xE210],
- ["AFDC",0xE211],
- ["AFDD",0xE212],
- ["AFDE",0xE213],
- ["AFDF",0xE214],
- ["AFE0",0xE215],
- ["AFE1",0xE216],
- ["AFE2",0xE217],
- ["AFE3",0xE218],
- ["AFE4",0xE219],
- ["AFE5",0xE21A],
- ["AFE6",0xE21B],
- ["AFE7",0xE21C],
- ["AFE8",0xE21D],
- ["AFE9",0xE21E],
- ["AFEA",0xE21F],
- ["AFEB",0xE220],
- ["AFEC",0xE221],
- ["AFED",0xE222],
- ["AFEE",0xE223],
- ["AFEF",0xE224],
- ["AFF0",0xE225],
- ["AFF1",0xE226],
- ["AFF2",0xE227],
- ["AFF3",0xE228],
- ["AFF4",0xE229],
- ["AFF5",0xE22A],
- ["AFF6",0xE22B],
- ["AFF7",0xE22C],
- ["AFF8",0xE22D],
- ["AFF9",0xE22E],
- ["AFFA",0xE22F],
- ["AFFB",0xE230],
- ["AFFC",0xE231],
- ["AFFD",0xE232],
- ["AFFE",0xE233],
- ["F8A1",0xE234],
- ["F8A2",0xE235],
- ["F8A3",0xE236],
- ["F8A4",0xE237],
- ["F8A5",0xE238],
- ["F8A6",0xE239],
- ["F8A7",0xE23A],
- ["F8A8",0xE23B],
- ["F8A9",0xE23C],
- ["F8AA",0xE23D],
- ["F8AB",0xE23E],
- ["F8AC",0xE23F],
- ["F8AD",0xE240],
- ["F8AE",0xE241],
- ["F8AF",0xE242],
- ["F8B0",0xE243],
- ["F8B1",0xE244],
- ["F8B2",0xE245],
- ["F8B3",0xE246],
- ["F8B4",0xE247],
- ["F8B5",0xE248],
- ["F8B6",0xE249],
- ["F8B7",0xE24A],
- ["F8B8",0xE24B],
- ["F8B9",0xE24C],
- ["F8BA",0xE24D],
- ["F8BB",0xE24E],
- ["F8BC",0xE24F],
- ["F8BD",0xE250],
- ["F8BE",0xE251],
- ["F8BF",0xE252],
- ["F8C0",0xE253],
- ["F8C1",0xE254],
- ["F8C2",0xE255],
- ["F8C3",0xE256],
- ["F8C4",0xE257],
- ["F8C5",0xE258],
- ["F8C6",0xE259],
- ["F8C7",0xE25A],
- ["F8C8",0xE25B],
- ["F8C9",0xE25C],
- ["F8CA",0xE25D],
- ["F8CB",0xE25E],
- ["F8CC",0xE25F],
- ["F8CD",0xE260],
- ["F8CE",0xE261],
- ["F8CF",0xE262],
- ["F8D0",0xE263],
- ["F8D1",0xE264],
- ["F8D2",0xE265],
- ["F8D3",0xE266],
- ["F8D4",0xE267],
- ["F8D5",0xE268],
- ["F8D6",0xE269],
- ["F8D7",0xE26A],
- ["F8D8",0xE26B],
- ["F8D9",0xE26C],
- ["F8DA",0xE26D],
- ["F8DB",0xE26E],
- ["F8DC",0xE26F],
- ["F8DD",0xE270],
- ["F8DE",0xE271],
- ["F8DF",0xE272],
- ["F8E0",0xE273],
- ["F8E1",0xE274],
- ["F8E2",0xE275],
- ["F8E3",0xE276],
- ["F8E4",0xE277],
- ["F8E5",0xE278],
- ["F8E6",0xE279],
- ["F8E7",0xE27A],
- ["F8E8",0xE27B],
- ["F8E9",0xE27C],
- ["F8EA",0xE27D],
- ["F8EB",0xE27E],
- ["F8EC",0xE27F],
- ["F8ED",0xE280],
- ["F8EE",0xE281],
- ["F8EF",0xE282],
- ["F8F0",0xE283],
- ["F8F1",0xE284],
- ["F8F2",0xE285],
- ["F8F3",0xE286],
- ["F8F4",0xE287],
- ["F8F5",0xE288],
- ["F8F6",0xE289],
- ["F8F7",0xE28A],
- ["F8F8",0xE28B],
- ["F8F9",0xE28C],
- ["F8FA",0xE28D],
- ["F8FB",0xE28E],
- ["F8FC",0xE28F],
- ["F8FD",0xE290],
- ["F8FE",0xE291],
- ["F9A1",0xE292],
- ["F9A2",0xE293],
- ["F9A3",0xE294],
- ["F9A4",0xE295],
- ["F9A5",0xE296],
- ["F9A6",0xE297],
- ["F9A7",0xE298],
- ["F9A8",0xE299],
- ["F9A9",0xE29A],
- ["F9AA",0xE29B],
- ["F9AB",0xE29C],
- ["F9AC",0xE29D],
- ["F9AD",0xE29E],
- ["F9AE",0xE29F],
- ["F9AF",0xE2A0],
- ["F9B0",0xE2A1],
- ["F9B1",0xE2A2],
- ["F9B2",0xE2A3],
- ["F9B3",0xE2A4],
- ["F9B4",0xE2A5],
- ["F9B5",0xE2A6],
- ["F9B6",0xE2A7],
- ["F9B7",0xE2A8],
- ["F9B8",0xE2A9],
- ["F9B9",0xE2AA],
- ["F9BA",0xE2AB],
- ["F9BB",0xE2AC],
- ["F9BC",0xE2AD],
- ["F9BD",0xE2AE],
- ["F9BE",0xE2AF],
- ["F9BF",0xE2B0],
- ["F9C0",0xE2B1],
- ["F9C1",0xE2B2],
- ["F9C2",0xE2B3],
- ["F9C3",0xE2B4],
- ["F9C4",0xE2B5],
- ["F9C5",0xE2B6],
- ["F9C6",0xE2B7],
- ["F9C7",0xE2B8],
- ["F9C8",0xE2B9],
- ["F9C9",0xE2BA],
- ["F9CA",0xE2BB],
- ["F9CB",0xE2BC],
- ["F9CC",0xE2BD],
- ["F9CD",0xE2BE],
- ["F9CE",0xE2BF],
- ["F9CF",0xE2C0],
- ["F9D0",0xE2C1],
- ["F9D1",0xE2C2],
- ["F9D2",0xE2C3],
- ["F9D3",0xE2C4],
- ["F9D4",0xE2C5],
- ["F9D5",0xE2C6],
- ["F9D6",0xE2C7],
- ["F9D7",0xE2C8],
- ["F9D8",0xE2C9],
- ["F9D9",0xE2CA],
- ["F9DA",0xE2CB],
- ["F9DB",0xE2CC],
- ["F9DC",0xE2CD],
- ["F9DD",0xE2CE],
- ["F9DE",0xE2CF],
- ["F9DF",0xE2D0],
- ["F9E0",0xE2D1],
- ["F9E1",0xE2D2],
- ["F9E2",0xE2D3],
- ["F9E3",0xE2D4],
- ["F9E4",0xE2D5],
- ["F9E5",0xE2D6],
- ["F9E6",0xE2D7],
- ["F9E7",0xE2D8],
- ["F9E8",0xE2D9],
- ["F9E9",0xE2DA],
- ["F9EA",0xE2DB],
- ["F9EB",0xE2DC],
- ["F9EC",0xE2DD],
- ["F9ED",0xE2DE],
- ["F9EE",0xE2DF],
- ["F9EF",0xE2E0],
- ["F9F0",0xE2E1],
- ["F9F1",0xE2E2],
- ["F9F2",0xE2E3],
- ["F9F3",0xE2E4],
- ["F9F4",0xE2E5],
- ["F9F5",0xE2E6],
- ["F9F6",0xE2E7],
- ["F9F7",0xE2E8],
- ["F9F8",0xE2E9],
- ["F9F9",0xE2EA],
- ["F9FA",0xE2EB],
- ["F9FB",0xE2EC],
- ["F9FC",0xE2ED],
- ["F9FD",0xE2EE],
- ["F9FE",0xE2EF],
- ["FAA1",0xE2F0],
- ["FAA2",0xE2F1],
- ["FAA3",0xE2F2],
- ["FAA4",0xE2F3],
- ["FAA5",0xE2F4],
- ["FAA6",0xE2F5],
- ["FAA7",0xE2F6],
- ["FAA8",0xE2F7],
- ["FAA9",0xE2F8],
- ["FAAA",0xE2F9],
- ["FAAB",0xE2FA],
- ["FAAC",0xE2FB],
- ["FAAD",0xE2FC],
- ["FAAE",0xE2FD],
- ["FAAF",0xE2FE],
- ["FAB0",0xE2FF],
- ["FAB1",0xE300],
- ["FAB2",0xE301],
- ["FAB3",0xE302],
- ["FAB4",0xE303],
- ["FAB5",0xE304],
- ["FAB6",0xE305],
- ["FAB7",0xE306],
- ["FAB8",0xE307],
- ["FAB9",0xE308],
- ["FABA",0xE309],
- ["FABB",0xE30A],
- ["FABC",0xE30B],
- ["FABD",0xE30C],
- ["FABE",0xE30D],
- ["FABF",0xE30E],
- ["FAC0",0xE30F],
- ["FAC1",0xE310],
- ["FAC2",0xE311],
- ["FAC3",0xE312],
- ["FAC4",0xE313],
- ["FAC5",0xE314],
- ["FAC6",0xE315],
- ["FAC7",0xE316],
- ["FAC8",0xE317],
- ["FAC9",0xE318],
- ["FACA",0xE319],
- ["FACB",0xE31A],
- ["FACC",0xE31B],
- ["FACD",0xE31C],
- ["FACE",0xE31D],
- ["FACF",0xE31E],
- ["FAD0",0xE31F],
- ["FAD1",0xE320],
- ["FAD2",0xE321],
- ["FAD3",0xE322],
- ["FAD4",0xE323],
- ["FAD5",0xE324],
- ["FAD6",0xE325],
- ["FAD7",0xE326],
- ["FAD8",0xE327],
- ["FAD9",0xE328],
- ["FADA",0xE329],
- ["FADB",0xE32A],
- ["FADC",0xE32B],
- ["FADD",0xE32C],
- ["FADE",0xE32D],
- ["FADF",0xE32E],
- ["FAE0",0xE32F],
- ["FAE1",0xE330],
- ["FAE2",0xE331],
- ["FAE3",0xE332],
- ["FAE4",0xE333],
- ["FAE5",0xE334],
- ["FAE6",0xE335],
- ["FAE7",0xE336],
- ["FAE8",0xE337],
- ["FAE9",0xE338],
- ["FAEA",0xE339],
- ["FAEB",0xE33A],
- ["FAEC",0xE33B],
- ["FAED",0xE33C],
- ["FAEE",0xE33D],
- ["FAEF",0xE33E],
- ["FAF0",0xE33F],
- ["FAF1",0xE340],
- ["FAF2",0xE341],
- ["FAF3",0xE342],
- ["FAF4",0xE343],
- ["FAF5",0xE344],
- ["FAF6",0xE345],
- ["FAF7",0xE346],
- ["FAF8",0xE347],
- ["FAF9",0xE348],
- ["FAFA",0xE349],
- ["FAFB",0xE34A],
- ["FAFC",0xE34B],
- ["FAFD",0xE34C],
- ["FAFE",0xE34D],
- ["FBA1",0xE34E],
- ["FBA2",0xE34F],
- ["FBA3",0xE350],
- ["FBA4",0xE351],
- ["FBA5",0xE352],
- ["FBA6",0xE353],
- ["FBA7",0xE354],
- ["FBA8",0xE355],
- ["FBA9",0xE356],
- ["FBAA",0xE357],
- ["FBAB",0xE358],
- ["FBAC",0xE359],
- ["FBAD",0xE35A],
- ["FBAE",0xE35B],
- ["FBAF",0xE35C],
- ["FBB0",0xE35D],
- ["FBB1",0xE35E],
- ["FBB2",0xE35F],
- ["FBB3",0xE360],
- ["FBB4",0xE361],
- ["FBB5",0xE362],
- ["FBB6",0xE363],
- ["FBB7",0xE364],
- ["FBB8",0xE365],
- ["FBB9",0xE366],
- ["FBBA",0xE367],
- ["FBBB",0xE368],
- ["FBBC",0xE369],
- ["FBBD",0xE36A],
- ["FBBE",0xE36B],
- ["FBBF",0xE36C],
- ["FBC0",0xE36D],
- ["FBC1",0xE36E],
- ["FBC2",0xE36F],
- ["FBC3",0xE370],
- ["FBC4",0xE371],
- ["FBC5",0xE372],
- ["FBC6",0xE373],
- ["FBC7",0xE374],
- ["FBC8",0xE375],
- ["FBC9",0xE376],
- ["FBCA",0xE377],
- ["FBCB",0xE378],
- ["FBCC",0xE379],
- ["FBCD",0xE37A],
- ["FBCE",0xE37B],
- ["FBCF",0xE37C],
- ["FBD0",0xE37D],
- ["FBD1",0xE37E],
- ["FBD2",0xE37F],
- ["FBD3",0xE380],
- ["FBD4",0xE381],
- ["FBD5",0xE382],
- ["FBD6",0xE383],
- ["FBD7",0xE384],
- ["FBD8",0xE385],
- ["FBD9",0xE386],
- ["FBDA",0xE387],
- ["FBDB",0xE388],
- ["FBDC",0xE389],
- ["FBDD",0xE38A],
- ["FBDE",0xE38B],
- ["FBDF",0xE38C],
- ["FBE0",0xE38D],
- ["FBE1",0xE38E],
- ["FBE2",0xE38F],
- ["FBE3",0xE390],
- ["FBE4",0xE391],
- ["FBE5",0xE392],
- ["FBE6",0xE393],
- ["FBE7",0xE394],
- ["FBE8",0xE395],
- ["FBE9",0xE396],
- ["FBEA",0xE397],
- ["FBEB",0xE398],
- ["FBEC",0xE399],
- ["FBED",0xE39A],
- ["FBEE",0xE39B],
- ["FBEF",0xE39C],
- ["FBF0",0xE39D],
- ["FBF1",0xE39E],
- ["FBF2",0xE39F],
- ["FBF3",0xE3A0],
- ["FBF4",0xE3A1],
- ["FBF5",0xE3A2],
- ["FBF6",0xE3A3],
- ["FBF7",0xE3A4],
- ["FBF8",0xE3A5],
- ["FBF9",0xE3A6],
- ["FBFA",0xE3A7],
- ["FBFB",0xE3A8],
- ["FBFC",0xE3A9],
- ["FBFD",0xE3AA],
- ["FBFE",0xE3AB],
- ["FCA1",0xE3AC],
- ["FCA2",0xE3AD],
- ["FCA3",0xE3AE],
- ["FCA4",0xE3AF],
- ["FCA5",0xE3B0],
- ["FCA6",0xE3B1],
- ["FCA7",0xE3B2],
- ["FCA8",0xE3B3],
- ["FCA9",0xE3B4],
- ["FCAA",0xE3B5],
- ["FCAB",0xE3B6],
- ["FCAC",0xE3B7],
- ["FCAD",0xE3B8],
- ["FCAE",0xE3B9],
- ["FCAF",0xE3BA],
- ["FCB0",0xE3BB],
- ["FCB1",0xE3BC],
- ["FCB2",0xE3BD],
- ["FCB3",0xE3BE],
- ["FCB4",0xE3BF],
- ["FCB5",0xE3C0],
- ["FCB6",0xE3C1],
- ["FCB7",0xE3C2],
- ["FCB8",0xE3C3],
- ["FCB9",0xE3C4],
- ["FCBA",0xE3C5],
- ["FCBB",0xE3C6],
- ["FCBC",0xE3C7],
- ["FCBD",0xE3C8],
- ["FCBE",0xE3C9],
- ["FCBF",0xE3CA],
- ["FCC0",0xE3CB],
- ["FCC1",0xE3CC],
- ["FCC2",0xE3CD],
- ["FCC3",0xE3CE],
- ["FCC4",0xE3CF],
- ["FCC5",0xE3D0],
- ["FCC6",0xE3D1],
- ["FCC7",0xE3D2],
- ["FCC8",0xE3D3],
- ["FCC9",0xE3D4],
- ["FCCA",0xE3D5],
- ["FCCB",0xE3D6],
- ["FCCC",0xE3D7],
- ["FCCD",0xE3D8],
- ["FCCE",0xE3D9],
- ["FCCF",0xE3DA],
- ["FCD0",0xE3DB],
- ["FCD1",0xE3DC],
- ["FCD2",0xE3DD],
- ["FCD3",0xE3DE],
- ["FCD4",0xE3DF],
- ["FCD5",0xE3E0],
- ["FCD6",0xE3E1],
- ["FCD7",0xE3E2],
- ["FCD8",0xE3E3],
- ["FCD9",0xE3E4],
- ["FCDA",0xE3E5],
- ["FCDB",0xE3E6],
- ["FCDC",0xE3E7],
- ["FCDD",0xE3E8],
- ["FCDE",0xE3E9],
- ["FCDF",0xE3EA],
- ["FCE0",0xE3EB],
- ["FCE1",0xE3EC],
- ["FCE2",0xE3ED],
- ["FCE3",0xE3EE],
- ["FCE4",0xE3EF],
- ["FCE5",0xE3F0],
- ["FCE6",0xE3F1],
- ["FCE7",0xE3F2],
- ["FCE8",0xE3F3],
- ["FCE9",0xE3F4],
- ["FCEA",0xE3F5],
- ["FCEB",0xE3F6],
- ["FCEC",0xE3F7],
- ["FCED",0xE3F8],
- ["FCEE",0xE3F9],
- ["FCEF",0xE3FA],
- ["FCF0",0xE3FB],
- ["FCF1",0xE3FC],
- ["FCF2",0xE3FD],
- ["FCF3",0xE3FE],
- ["FCF4",0xE3FF],
- ["FCF5",0xE400],
- ["FCF6",0xE401],
- ["FCF7",0xE402],
- ["FCF8",0xE403],
- ["FCF9",0xE404],
- ["FCFA",0xE405],
- ["FCFB",0xE406],
- ["FCFC",0xE407],
- ["FCFD",0xE408],
- ["FCFE",0xE409],
- ["FDA1",0xE40A],
- ["FDA2",0xE40B],
- ["FDA3",0xE40C],
- ["FDA4",0xE40D],
- ["FDA5",0xE40E],
- ["FDA6",0xE40F],
- ["FDA7",0xE410],
- ["FDA8",0xE411],
- ["FDA9",0xE412],
- ["FDAA",0xE413],
- ["FDAB",0xE414],
- ["FDAC",0xE415],
- ["FDAD",0xE416],
- ["FDAE",0xE417],
- ["FDAF",0xE418],
- ["FDB0",0xE419],
- ["FDB1",0xE41A],
- ["FDB2",0xE41B],
- ["FDB3",0xE41C],
- ["FDB4",0xE41D],
- ["FDB5",0xE41E],
- ["FDB6",0xE41F],
- ["FDB7",0xE420],
- ["FDB8",0xE421],
- ["FDB9",0xE422],
- ["FDBA",0xE423],
- ["FDBB",0xE424],
- ["FDBC",0xE425],
- ["FDBD",0xE426],
- ["FDBE",0xE427],
- ["FDBF",0xE428],
- ["FDC0",0xE429],
- ["FDC1",0xE42A],
- ["FDC2",0xE42B],
- ["FDC3",0xE42C],
- ["FDC4",0xE42D],
- ["FDC5",0xE42E],
- ["FDC6",0xE42F],
- ["FDC7",0xE430],
- ["FDC8",0xE431],
- ["FDC9",0xE432],
- ["FDCA",0xE433],
- ["FDCB",0xE434],
- ["FDCC",0xE435],
- ["FDCD",0xE436],
- ["FDCE",0xE437],
- ["FDCF",0xE438],
- ["FDD0",0xE439],
- ["FDD1",0xE43A],
- ["FDD2",0xE43B],
- ["FDD3",0xE43C],
- ["FDD4",0xE43D],
- ["FDD5",0xE43E],
- ["FDD6",0xE43F],
- ["FDD7",0xE440],
- ["FDD8",0xE441],
- ["FDD9",0xE442],
- ["FDDA",0xE443],
- ["FDDB",0xE444],
- ["FDDC",0xE445],
- ["FDDD",0xE446],
- ["FDDE",0xE447],
- ["FDDF",0xE448],
- ["FDE0",0xE449],
- ["FDE1",0xE44A],
- ["FDE2",0xE44B],
- ["FDE3",0xE44C],
- ["FDE4",0xE44D],
- ["FDE5",0xE44E],
- ["FDE6",0xE44F],
- ["FDE7",0xE450],
- ["FDE8",0xE451],
- ["FDE9",0xE452],
- ["FDEA",0xE453],
- ["FDEB",0xE454],
- ["FDEC",0xE455],
- ["FDED",0xE456],
- ["FDEE",0xE457],
- ["FDEF",0xE458],
- ["FDF0",0xE459],
- ["FDF1",0xE45A],
- ["FDF2",0xE45B],
- ["FDF3",0xE45C],
- ["FDF4",0xE45D],
- ["FDF5",0xE45E],
- ["FDF6",0xE45F],
- ["FDF7",0xE460],
- ["FDF8",0xE461],
- ["FDF9",0xE462],
- ["FDFA",0xE463],
- ["FDFB",0xE464],
- ["FDFC",0xE465],
- ["FDFD",0xE466],
- ["FDFE",0xE467],
- ["FEA1",0xE468],
- ["FEA2",0xE469],
- ["FEA3",0xE46A],
- ["FEA4",0xE46B],
- ["FEA5",0xE46C],
- ["FEA6",0xE46D],
- ["FEA7",0xE46E],
- ["FEA8",0xE46F],
- ["FEA9",0xE470],
- ["FEAA",0xE471],
- ["FEAB",0xE472],
- ["FEAC",0xE473],
- ["FEAD",0xE474],
- ["FEAE",0xE475],
- ["FEAF",0xE476],
- ["FEB0",0xE477],
- ["FEB1",0xE478],
- ["FEB2",0xE479],
- ["FEB3",0xE47A],
- ["FEB4",0xE47B],
- ["FEB5",0xE47C],
- ["FEB6",0xE47D],
- ["FEB7",0xE47E],
- ["FEB8",0xE47F],
- ["FEB9",0xE480],
- ["FEBA",0xE481],
- ["FEBB",0xE482],
- ["FEBC",0xE483],
- ["FEBD",0xE484],
- ["FEBE",0xE485],
- ["FEBF",0xE486],
- ["FEC0",0xE487],
- ["FEC1",0xE488],
- ["FEC2",0xE489],
- ["FEC3",0xE48A],
- ["FEC4",0xE48B],
- ["FEC5",0xE48C],
- ["FEC6",0xE48D],
- ["FEC7",0xE48E],
- ["FEC8",0xE48F],
- ["FEC9",0xE490],
- ["FECA",0xE491],
- ["FECB",0xE492],
- ["FECC",0xE493],
- ["FECD",0xE494],
- ["FECE",0xE495],
- ["FECF",0xE496],
- ["FED0",0xE497],
- ["FED1",0xE498],
- ["FED2",0xE499],
- ["FED3",0xE49A],
- ["FED4",0xE49B],
- ["FED5",0xE49C],
- ["FED6",0xE49D],
- ["FED7",0xE49E],
- ["FED8",0xE49F],
- ["FED9",0xE4A0],
- ["FEDA",0xE4A1],
- ["FEDB",0xE4A2],
- ["FEDC",0xE4A3],
- ["FEDD",0xE4A4],
- ["FEDE",0xE4A5],
- ["FEDF",0xE4A6],
- ["FEE0",0xE4A7],
- ["FEE1",0xE4A8],
- ["FEE2",0xE4A9],
- ["FEE3",0xE4AA],
- ["FEE4",0xE4AB],
- ["FEE5",0xE4AC],
- ["FEE6",0xE4AD],
- ["FEE7",0xE4AE],
- ["FEE8",0xE4AF],
- ["FEE9",0xE4B0],
- ["FEEA",0xE4B1],
- ["FEEB",0xE4B2],
- ["FEEC",0xE4B3],
- ["FEED",0xE4B4],
- ["FEEE",0xE4B5],
- ["FEEF",0xE4B6],
- ["FEF0",0xE4B7],
- ["FEF1",0xE4B8],
- ["FEF2",0xE4B9],
- ["FEF3",0xE4BA],
- ["FEF4",0xE4BB],
- ["FEF5",0xE4BC],
- ["FEF6",0xE4BD],
- ["FEF7",0xE4BE],
- ["FEF8",0xE4BF],
- ["FEF9",0xE4C0],
- ["FEFA",0xE4C1],
- ["FEFB",0xE4C2],
- ["FEFC",0xE4C3],
- ["FEFD",0xE4C4],
- ["FEFE",0xE4C5],
- ["A140",0xE4C6],
- ["A141",0xE4C7],
- ["A142",0xE4C8],
- ["A143",0xE4C9],
- ["A144",0xE4CA],
- ["A145",0xE4CB],
- ["A146",0xE4CC],
- ["A147",0xE4CD],
- ["A148",0xE4CE],
- ["A149",0xE4CF],
- ["A14A",0xE4D0],
- ["A14B",0xE4D1],
- ["A14C",0xE4D2],
- ["A14D",0xE4D3],
- ["A14E",0xE4D4],
- ["A14F",0xE4D5],
- ["A150",0xE4D6],
- ["A151",0xE4D7],
- ["A152",0xE4D8],
- ["A153",0xE4D9],
- ["A154",0xE4DA],
- ["A155",0xE4DB],
- ["A156",0xE4DC],
- ["A157",0xE4DD],
- ["A158",0xE4DE],
- ["A159",0xE4DF],
- ["A15A",0xE4E0],
- ["A15B",0xE4E1],
- ["A15C",0xE4E2],
- ["A15D",0xE4E3],
- ["A15E",0xE4E4],
- ["A15F",0xE4E5],
- ["A160",0xE4E6],
- ["A161",0xE4E7],
- ["A162",0xE4E8],
- ["A163",0xE4E9],
- ["A164",0xE4EA],
- ["A165",0xE4EB],
- ["A166",0xE4EC],
- ["A167",0xE4ED],
- ["A168",0xE4EE],
- ["A169",0xE4EF],
- ["A16A",0xE4F0],
- ["A16B",0xE4F1],
- ["A16C",0xE4F2],
- ["A16D",0xE4F3],
- ["A16E",0xE4F4],
- ["A16F",0xE4F5],
- ["A170",0xE4F6],
- ["A171",0xE4F7],
- ["A172",0xE4F8],
- ["A173",0xE4F9],
- ["A174",0xE4FA],
- ["A175",0xE4FB],
- ["A176",0xE4FC],
- ["A177",0xE4FD],
- ["A178",0xE4FE],
- ["A179",0xE4FF],
- ["A17A",0xE500],
- ["A17B",0xE501],
- ["A17C",0xE502],
- ["A17D",0xE503],
- ["A17E",0xE504],
- ["A180",0xE505],
- ["A181",0xE506],
- ["A182",0xE507],
- ["A183",0xE508],
- ["A184",0xE509],
- ["A185",0xE50A],
- ["A186",0xE50B],
- ["A187",0xE50C],
- ["A188",0xE50D],
- ["A189",0xE50E],
- ["A18A",0xE50F],
- ["A18B",0xE510],
- ["A18C",0xE511],
- ["A18D",0xE512],
- ["A18E",0xE513],
- ["A18F",0xE514],
- ["A190",0xE515],
- ["A191",0xE516],
- ["A192",0xE517],
- ["A193",0xE518],
- ["A194",0xE519],
- ["A195",0xE51A],
- ["A196",0xE51B],
- ["A197",0xE51C],
- ["A198",0xE51D],
- ["A199",0xE51E],
- ["A19A",0xE51F],
- ["A19B",0xE520],
- ["A19C",0xE521],
- ["A19D",0xE522],
- ["A19E",0xE523],
- ["A19F",0xE524],
- ["A1A0",0xE525],
- ["A240",0xE526],
- ["A241",0xE527],
- ["A242",0xE528],
- ["A243",0xE529],
- ["A244",0xE52A],
- ["A245",0xE52B],
- ["A246",0xE52C],
- ["A247",0xE52D],
- ["A248",0xE52E],
- ["A249",0xE52F],
- ["A24A",0xE530],
- ["A24B",0xE531],
- ["A24C",0xE532],
- ["A24D",0xE533],
- ["A24E",0xE534],
- ["A24F",0xE535],
- ["A250",0xE536],
- ["A251",0xE537],
- ["A252",0xE538],
- ["A253",0xE539],
- ["A254",0xE53A],
- ["A255",0xE53B],
- ["A256",0xE53C],
- ["A257",0xE53D],
- ["A258",0xE53E],
- ["A259",0xE53F],
- ["A25A",0xE540],
- ["A25B",0xE541],
- ["A25C",0xE542],
- ["A25D",0xE543],
- ["A25E",0xE544],
- ["A25F",0xE545],
- ["A260",0xE546],
- ["A261",0xE547],
- ["A262",0xE548],
- ["A263",0xE549],
- ["A264",0xE54A],
- ["A265",0xE54B],
- ["A266",0xE54C],
- ["A267",0xE54D],
- ["A268",0xE54E],
- ["A269",0xE54F],
- ["A26A",0xE550],
- ["A26B",0xE551],
- ["A26C",0xE552],
- ["A26D",0xE553],
- ["A26E",0xE554],
- ["A26F",0xE555],
- ["A270",0xE556],
- ["A271",0xE557],
- ["A272",0xE558],
- ["A273",0xE559],
- ["A274",0xE55A],
- ["A275",0xE55B],
- ["A276",0xE55C],
- ["A277",0xE55D],
- ["A278",0xE55E],
- ["A279",0xE55F],
- ["A27A",0xE560],
- ["A27B",0xE561],
- ["A27C",0xE562],
- ["A27D",0xE563],
- ["A27E",0xE564],
- ["A280",0xE565],
- ["A281",0xE566],
- ["A282",0xE567],
- ["A283",0xE568],
- ["A284",0xE569],
- ["A285",0xE56A],
- ["A286",0xE56B],
- ["A287",0xE56C],
- ["A288",0xE56D],
- ["A289",0xE56E],
- ["A28A",0xE56F],
- ["A28B",0xE570],
- ["A28C",0xE571],
- ["A28D",0xE572],
- ["A28E",0xE573],
- ["A28F",0xE574],
- ["A290",0xE575],
- ["A291",0xE576],
- ["A292",0xE577],
- ["A293",0xE578],
- ["A294",0xE579],
- ["A295",0xE57A],
- ["A296",0xE57B],
- ["A297",0xE57C],
- ["A298",0xE57D],
- ["A299",0xE57E],
- ["A29A",0xE57F],
- ["A29B",0xE580],
- ["A29C",0xE581],
- ["A29D",0xE582],
- ["A29E",0xE583],
- ["A29F",0xE584],
- ["A2A0",0xE585],
- ["A340",0xE586],
- ["A341",0xE587],
- ["A342",0xE588],
- ["A343",0xE589],
- ["A344",0xE58A],
- ["A345",0xE58B],
- ["A346",0xE58C],
- ["A347",0xE58D],
- ["A348",0xE58E],
- ["A349",0xE58F],
- ["A34A",0xE590],
- ["A34B",0xE591],
- ["A34C",0xE592],
- ["A34D",0xE593],
- ["A34E",0xE594],
- ["A34F",0xE595],
- ["A350",0xE596],
- ["A351",0xE597],
- ["A352",0xE598],
- ["A353",0xE599],
- ["A354",0xE59A],
- ["A355",0xE59B],
- ["A356",0xE59C],
- ["A357",0xE59D],
- ["A358",0xE59E],
- ["A359",0xE59F],
- ["A35A",0xE5A0],
- ["A35B",0xE5A1],
- ["A35C",0xE5A2],
- ["A35D",0xE5A3],
- ["A35E",0xE5A4],
- ["A35F",0xE5A5],
- ["A360",0xE5A6],
- ["A361",0xE5A7],
- ["A362",0xE5A8],
- ["A363",0xE5A9],
- ["A364",0xE5AA],
- ["A365",0xE5AB],
- ["A366",0xE5AC],
- ["A367",0xE5AD],
- ["A368",0xE5AE],
- ["A369",0xE5AF],
- ["A36A",0xE5B0],
- ["A36B",0xE5B1],
- ["A36C",0xE5B2],
- ["A36D",0xE5B3],
- ["A36E",0xE5B4],
- ["A36F",0xE5B5],
- ["A370",0xE5B6],
- ["A371",0xE5B7],
- ["A372",0xE5B8],
- ["A373",0xE5B9],
- ["A374",0xE5BA],
- ["A375",0xE5BB],
- ["A376",0xE5BC],
- ["A377",0xE5BD],
- ["A378",0xE5BE],
- ["A379",0xE5BF],
- ["A37A",0xE5C0],
- ["A37B",0xE5C1],
- ["A37C",0xE5C2],
- ["A37D",0xE5C3],
- ["A37E",0xE5C4],
- ["A380",0xE5C5],
- ["A381",0xE5C6],
- ["A382",0xE5C7],
- ["A383",0xE5C8],
- ["A384",0xE5C9],
- ["A385",0xE5CA],
- ["A386",0xE5CB],
- ["A387",0xE5CC],
- ["A388",0xE5CD],
- ["A389",0xE5CE],
- ["A38A",0xE5CF],
- ["A38B",0xE5D0],
- ["A38C",0xE5D1],
- ["A38D",0xE5D2],
- ["A38E",0xE5D3],
- ["A38F",0xE5D4],
- ["A390",0xE5D5],
- ["A391",0xE5D6],
- ["A392",0xE5D7],
- ["A393",0xE5D8],
- ["A394",0xE5D9],
- ["A395",0xE5DA],
- ["A396",0xE5DB],
- ["A397",0xE5DC],
- ["A398",0xE5DD],
- ["A399",0xE5DE],
- ["A39A",0xE5DF],
- ["A39B",0xE5E0],
- ["A39C",0xE5E1],
- ["A39D",0xE5E2],
- ["A39E",0xE5E3],
- ["A39F",0xE5E4],
- ["A3A0",0xE5E5],
- ["A440",0xE5E6],
- ["A441",0xE5E7],
- ["A442",0xE5E8],
- ["A443",0xE5E9],
- ["A444",0xE5EA],
- ["A445",0xE5EB],
- ["A446",0xE5EC],
- ["A447",0xE5ED],
- ["A448",0xE5EE],
- ["A449",0xE5EF],
- ["A44A",0xE5F0],
- ["A44B",0xE5F1],
- ["A44C",0xE5F2],
- ["A44D",0xE5F3],
- ["A44E",0xE5F4],
- ["A44F",0xE5F5],
- ["A450",0xE5F6],
- ["A451",0xE5F7],
- ["A452",0xE5F8],
- ["A453",0xE5F9],
- ["A454",0xE5FA],
- ["A455",0xE5FB],
- ["A456",0xE5FC],
- ["A457",0xE5FD],
- ["A458",0xE5FE],
- ["A459",0xE5FF],
- ["A45A",0xE600],
- ["A45B",0xE601],
- ["A45C",0xE602],
- ["A45D",0xE603],
- ["A45E",0xE604],
- ["A45F",0xE605],
- ["A460",0xE606],
- ["A461",0xE607],
- ["A462",0xE608],
- ["A463",0xE609],
- ["A464",0xE60A],
- ["A465",0xE60B],
- ["A466",0xE60C],
- ["A467",0xE60D],
- ["A468",0xE60E],
- ["A469",0xE60F],
- ["A46A",0xE610],
- ["A46B",0xE611],
- ["A46C",0xE612],
- ["A46D",0xE613],
- ["A46E",0xE614],
- ["A46F",0xE615],
- ["A470",0xE616],
- ["A471",0xE617],
- ["A472",0xE618],
- ["A473",0xE619],
- ["A474",0xE61A],
- ["A475",0xE61B],
- ["A476",0xE61C],
- ["A477",0xE61D],
- ["A478",0xE61E],
- ["A479",0xE61F],
- ["A47A",0xE620],
- ["A47B",0xE621],
- ["A47C",0xE622],
- ["A47D",0xE623],
- ["A47E",0xE624],
- ["A480",0xE625],
- ["A481",0xE626],
- ["A482",0xE627],
- ["A483",0xE628],
- ["A484",0xE629],
- ["A485",0xE62A],
- ["A486",0xE62B],
- ["A487",0xE62C],
- ["A488",0xE62D],
- ["A489",0xE62E],
- ["A48A",0xE62F],
- ["A48B",0xE630],
- ["A48C",0xE631],
- ["A48D",0xE632],
- ["A48E",0xE633],
- ["A48F",0xE634],
- ["A490",0xE635],
- ["A491",0xE636],
- ["A492",0xE637],
- ["A493",0xE638],
- ["A494",0xE639],
- ["A495",0xE63A],
- ["A496",0xE63B],
- ["A497",0xE63C],
- ["A498",0xE63D],
- ["A499",0xE63E],
- ["A49A",0xE63F],
- ["A49B",0xE640],
- ["A49C",0xE641],
- ["A49D",0xE642],
- ["A49E",0xE643],
- ["A49F",0xE644],
- ["A4A0",0xE645],
- ["A540",0xE646],
- ["A541",0xE647],
- ["A542",0xE648],
- ["A543",0xE649],
- ["A544",0xE64A],
- ["A545",0xE64B],
- ["A546",0xE64C],
- ["A547",0xE64D],
- ["A548",0xE64E],
- ["A549",0xE64F],
- ["A54A",0xE650],
- ["A54B",0xE651],
- ["A54C",0xE652],
- ["A54D",0xE653],
- ["A54E",0xE654],
- ["A54F",0xE655],
- ["A550",0xE656],
- ["A551",0xE657],
- ["A552",0xE658],
- ["A553",0xE659],
- ["A554",0xE65A],
- ["A555",0xE65B],
- ["A556",0xE65C],
- ["A557",0xE65D],
- ["A558",0xE65E],
- ["A559",0xE65F],
- ["A55A",0xE660],
- ["A55B",0xE661],
- ["A55C",0xE662],
- ["A55D",0xE663],
- ["A55E",0xE664],
- ["A55F",0xE665],
- ["A560",0xE666],
- ["A561",0xE667],
- ["A562",0xE668],
- ["A563",0xE669],
- ["A564",0xE66A],
- ["A565",0xE66B],
- ["A566",0xE66C],
- ["A567",0xE66D],
- ["A568",0xE66E],
- ["A569",0xE66F],
- ["A56A",0xE670],
- ["A56B",0xE671],
- ["A56C",0xE672],
- ["A56D",0xE673],
- ["A56E",0xE674],
- ["A56F",0xE675],
- ["A570",0xE676],
- ["A571",0xE677],
- ["A572",0xE678],
- ["A573",0xE679],
- ["A574",0xE67A],
- ["A575",0xE67B],
- ["A576",0xE67C],
- ["A577",0xE67D],
- ["A578",0xE67E],
- ["A579",0xE67F],
- ["A57A",0xE680],
- ["A57B",0xE681],
- ["A57C",0xE682],
- ["A57D",0xE683],
- ["A57E",0xE684],
- ["A580",0xE685],
- ["A581",0xE686],
- ["A582",0xE687],
- ["A583",0xE688],
- ["A584",0xE689],
- ["A585",0xE68A],
- ["A586",0xE68B],
- ["A587",0xE68C],
- ["A588",0xE68D],
- ["A589",0xE68E],
- ["A58A",0xE68F],
- ["A58B",0xE690],
- ["A58C",0xE691],
- ["A58D",0xE692],
- ["A58E",0xE693],
- ["A58F",0xE694],
- ["A590",0xE695],
- ["A591",0xE696],
- ["A592",0xE697],
- ["A593",0xE698],
- ["A594",0xE699],
- ["A595",0xE69A],
- ["A596",0xE69B],
- ["A597",0xE69C],
- ["A598",0xE69D],
- ["A599",0xE69E],
- ["A59A",0xE69F],
- ["A59B",0xE6A0],
- ["A59C",0xE6A1],
- ["A59D",0xE6A2],
- ["A59E",0xE6A3],
- ["A59F",0xE6A4],
- ["A5A0",0xE6A5],
- ["A640",0xE6A6],
- ["A641",0xE6A7],
- ["A642",0xE6A8],
- ["A643",0xE6A9],
- ["A644",0xE6AA],
- ["A645",0xE6AB],
- ["A646",0xE6AC],
- ["A647",0xE6AD],
- ["A648",0xE6AE],
- ["A649",0xE6AF],
- ["A64A",0xE6B0],
- ["A64B",0xE6B1],
- ["A64C",0xE6B2],
- ["A64D",0xE6B3],
- ["A64E",0xE6B4],
- ["A64F",0xE6B5],
- ["A650",0xE6B6],
- ["A651",0xE6B7],
- ["A652",0xE6B8],
- ["A653",0xE6B9],
- ["A654",0xE6BA],
- ["A655",0xE6BB],
- ["A656",0xE6BC],
- ["A657",0xE6BD],
- ["A658",0xE6BE],
- ["A659",0xE6BF],
- ["A65A",0xE6C0],
- ["A65B",0xE6C1],
- ["A65C",0xE6C2],
- ["A65D",0xE6C3],
- ["A65E",0xE6C4],
- ["A65F",0xE6C5],
- ["A660",0xE6C6],
- ["A661",0xE6C7],
- ["A662",0xE6C8],
- ["A663",0xE6C9],
- ["A664",0xE6CA],
- ["A665",0xE6CB],
- ["A666",0xE6CC],
- ["A667",0xE6CD],
- ["A668",0xE6CE],
- ["A669",0xE6CF],
- ["A66A",0xE6D0],
- ["A66B",0xE6D1],
- ["A66C",0xE6D2],
- ["A66D",0xE6D3],
- ["A66E",0xE6D4],
- ["A66F",0xE6D5],
- ["A670",0xE6D6],
- ["A671",0xE6D7],
- ["A672",0xE6D8],
- ["A673",0xE6D9],
- ["A674",0xE6DA],
- ["A675",0xE6DB],
- ["A676",0xE6DC],
- ["A677",0xE6DD],
- ["A678",0xE6DE],
- ["A679",0xE6DF],
- ["A67A",0xE6E0],
- ["A67B",0xE6E1],
- ["A67C",0xE6E2],
- ["A67D",0xE6E3],
- ["A67E",0xE6E4],
- ["A680",0xE6E5],
- ["A681",0xE6E6],
- ["A682",0xE6E7],
- ["A683",0xE6E8],
- ["A684",0xE6E9],
- ["A685",0xE6EA],
- ["A686",0xE6EB],
- ["A687",0xE6EC],
- ["A688",0xE6ED],
- ["A689",0xE6EE],
- ["A68A",0xE6EF],
- ["A68B",0xE6F0],
- ["A68C",0xE6F1],
- ["A68D",0xE6F2],
- ["A68E",0xE6F3],
- ["A68F",0xE6F4],
- ["A690",0xE6F5],
- ["A691",0xE6F6],
- ["A692",0xE6F7],
- ["A693",0xE6F8],
- ["A694",0xE6F9],
- ["A695",0xE6FA],
- ["A696",0xE6FB],
- ["A697",0xE6FC],
- ["A698",0xE6FD],
- ["A699",0xE6FE],
- ["A69A",0xE6FF],
- ["A69B",0xE700],
- ["A69C",0xE701],
- ["A69D",0xE702],
- ["A69E",0xE703],
- ["A69F",0xE704],
- ["A6A0",0xE705],
- ["A740",0xE706],
- ["A741",0xE707],
- ["A742",0xE708],
- ["A743",0xE709],
- ["A744",0xE70A],
- ["A745",0xE70B],
- ["A746",0xE70C],
- ["A747",0xE70D],
- ["A748",0xE70E],
- ["A749",0xE70F],
- ["A74A",0xE710],
- ["A74B",0xE711],
- ["A74C",0xE712],
- ["A74D",0xE713],
- ["A74E",0xE714],
- ["A74F",0xE715],
- ["A750",0xE716],
- ["A751",0xE717],
- ["A752",0xE718],
- ["A753",0xE719],
- ["A754",0xE71A],
- ["A755",0xE71B],
- ["A756",0xE71C],
- ["A757",0xE71D],
- ["A758",0xE71E],
- ["A759",0xE71F],
- ["A75A",0xE720],
- ["A75B",0xE721],
- ["A75C",0xE722],
- ["A75D",0xE723],
- ["A75E",0xE724],
- ["A75F",0xE725],
- ["A760",0xE726],
- ["A761",0xE727],
- ["A762",0xE728],
- ["A763",0xE729],
- ["A764",0xE72A],
- ["A765",0xE72B],
- ["A766",0xE72C],
- ["A767",0xE72D],
- ["A768",0xE72E],
- ["A769",0xE72F],
- ["A76A",0xE730],
- ["A76B",0xE731],
- ["A76C",0xE732],
- ["A76D",0xE733],
- ["A76E",0xE734],
- ["A76F",0xE735],
- ["A770",0xE736],
- ["A771",0xE737],
- ["A772",0xE738],
- ["A773",0xE739],
- ["A774",0xE73A],
- ["A775",0xE73B],
- ["A776",0xE73C],
- ["A777",0xE73D],
- ["A778",0xE73E],
- ["A779",0xE73F],
- ["A77A",0xE740],
- ["A77B",0xE741],
- ["A77C",0xE742],
- ["A77D",0xE743],
- ["A77E",0xE744],
- ["A780",0xE745],
- ["A781",0xE746],
- ["A782",0xE747],
- ["A783",0xE748],
- ["A784",0xE749],
- ["A785",0xE74A],
- ["A786",0xE74B],
- ["A787",0xE74C],
- ["A788",0xE74D],
- ["A789",0xE74E],
- ["A78A",0xE74F],
- ["A78B",0xE750],
- ["A78C",0xE751],
- ["A78D",0xE752],
- ["A78E",0xE753],
- ["A78F",0xE754],
- ["A790",0xE755],
- ["A791",0xE756],
- ["A792",0xE757],
- ["A793",0xE758],
- ["A794",0xE759],
- ["A795",0xE75A],
- ["A796",0xE75B],
- ["A797",0xE75C],
- ["A798",0xE75D],
- ["A799",0xE75E],
- ["A79A",0xE75F],
- ["A79B",0xE760],
- ["A79C",0xE761],
- ["A79D",0xE762],
- ["A79E",0xE763],
- ["A79F",0xE764],
- ["A7A0",0xE765],
- ["A2AB",0xE766],
- ["A2AC",0xE767],
- ["A2AD",0xE768],
- ["A2AE",0xE769],
- ["A2AF",0xE76A],
- ["A2B0",0xE76B],
- ["8336C739",0xE76C],
- ["A2E4",0xE76D],
- ["A2EF",0xE76E],
- ["A2F0",0xE76F],
- ["A2FD",0xE770],
- ["A2FE",0xE771],
- ["A4F4",0xE772],
- ["A4F5",0xE773],
- ["A4F6",0xE774],
- ["A4F7",0xE775],
- ["A4F8",0xE776],
- ["A4F9",0xE777],
- ["A4FA",0xE778],
- ["A4FB",0xE779],
- ["A4FC",0xE77A],
- ["A4FD",0xE77B],
- ["A4FE",0xE77C],
- ["A5F7",0xE77D],
- ["A5F8",0xE77E],
- ["A5F9",0xE77F],
- ["A5FA",0xE780],
- ["A5FB",0xE781],
- ["A5FC",0xE782],
- ["A5FD",0xE783],
- ["A5FE",0xE784],
- ["A6B9",0xE785],
- ["A6BA",0xE786],
- ["A6BB",0xE787],
- ["A6BC",0xE788],
- ["A6BD",0xE789],
- ["A6BE",0xE78A],
- ["A6BF",0xE78B],
- ["A6C0",0xE78C],
- ["A6D9",0xE78D],
- ["A6DA",0xE78E],
- ["A6DB",0xE78F],
- ["A6DC",0xE790],
- ["A6DD",0xE791],
- ["A6DE",0xE792],
- ["A6DF",0xE793],
- ["A6EC",0xE794],
- ["A6ED",0xE795],
- ["A6F3",0xE796],
- ["A6F6",0xE797],
- ["A6F7",0xE798],
- ["A6F8",0xE799],
- ["A6F9",0xE79A],
- ["A6FA",0xE79B],
- ["A6FB",0xE79C],
- ["A6FC",0xE79D],
- ["A6FD",0xE79E],
- ["A6FE",0xE79F],
- ["A7C2",0xE7A0],
- ["A7C3",0xE7A1],
- ["A7C4",0xE7A2],
- ["A7C5",0xE7A3],
- ["A7C6",0xE7A4],
- ["A7C7",0xE7A5],
- ["A7C8",0xE7A6],
- ["A7C9",0xE7A7],
- ["A7CA",0xE7A8],
- ["A7CB",0xE7A9],
- ["A7CC",0xE7AA],
- ["A7CD",0xE7AB],
- ["A7CE",0xE7AC],
- ["A7CF",0xE7AD],
- ["A7D0",0xE7AE],
- ["A7F2",0xE7AF],
- ["A7F3",0xE7B0],
- ["A7F4",0xE7B1],
- ["A7F5",0xE7B2],
- ["A7F6",0xE7B3],
- ["A7F7",0xE7B4],
- ["A7F8",0xE7B5],
- ["A7F9",0xE7B6],
- ["A7FA",0xE7B7],
- ["A7FB",0xE7B8],
- ["A7FC",0xE7B9],
- ["A7FD",0xE7BA],
- ["A7FE",0xE7BB],
- ["A896",0xE7BC],
- ["A897",0xE7BD],
- ["A898",0xE7BE],
- ["A899",0xE7BF],
- ["A89A",0xE7C0],
- ["A89B",0xE7C1],
- ["A89C",0xE7C2],
- ["A89D",0xE7C3],
- ["A89E",0xE7C4],
- ["A89F",0xE7C5],
- ["A8A0",0xE7C6],
- ["A8BC",0xE7C7],
- ["8336C830",0xE7C8],
- ["A8C1",0xE7C9],
- ["A8C2",0xE7CA],
- ["A8C3",0xE7CB],
- ["A8C4",0xE7CC],
- ["A8EA",0xE7CD],
- ["A8EB",0xE7CE],
- ["A8EC",0xE7CF],
- ["A8ED",0xE7D0],
- ["A8EE",0xE7D1],
- ["A8EF",0xE7D2],
- ["A8F0",0xE7D3],
- ["A8F1",0xE7D4],
- ["A8F2",0xE7D5],
- ["A8F3",0xE7D6],
- ["A8F4",0xE7D7],
- ["A8F5",0xE7D8],
- ["A8F6",0xE7D9],
- ["A8F7",0xE7DA],
- ["A8F8",0xE7DB],
- ["A8F9",0xE7DC],
- ["A8FA",0xE7DD],
- ["A8FB",0xE7DE],
- ["A8FC",0xE7DF],
- ["A8FD",0xE7E0],
- ["A8FE",0xE7E1],
- ["A958",0xE7E2],
- ["A95B",0xE7E3],
- ["A95D",0xE7E4],
- ["A95E",0xE7E5],
- ["A95F",0xE7E6],
- ["8336C831",0xE7E7],
- ["8336C832",0xE7E8],
- ["8336C833",0xE7E9],
- ["8336C834",0xE7EA],
- ["8336C835",0xE7EB],
- ["8336C836",0xE7EC],
- ["8336C837",0xE7ED],
- ["8336C838",0xE7EE],
- ["8336C839",0xE7EF],
- ["8336C930",0xE7F0],
- ["8336C931",0xE7F1],
- ["8336C932",0xE7F2],
- ["8336C933",0xE7F3],
- ["A997",0xE7F4],
- ["A998",0xE7F5],
- ["A999",0xE7F6],
- ["A99A",0xE7F7],
- ["A99B",0xE7F8],
- ["A99C",0xE7F9],
- ["A99D",0xE7FA],
- ["A99E",0xE7FB],
- ["A99F",0xE7FC],
- ["A9A0",0xE7FD],
- ["A9A1",0xE7FE],
- ["A9A2",0xE7FF],
- ["A9A3",0xE800],
- ["A9F0",0xE801],
- ["A9F1",0xE802],
- ["A9F2",0xE803],
- ["A9F3",0xE804],
- ["A9F4",0xE805],
- ["A9F5",0xE806],
- ["A9F6",0xE807],
- ["A9F7",0xE808],
- ["A9F8",0xE809],
- ["A9F9",0xE80A],
- ["A9FA",0xE80B],
- ["A9FB",0xE80C],
- ["A9FC",0xE80D],
- ["A9FD",0xE80E],
- ["A9FE",0xE80F],
- ["D7FA",0xE810],
- ["D7FB",0xE811],
- ["D7FC",0xE812],
- ["D7FD",0xE813],
- ["D7FE",0xE814],
- ["8336C934",0xE815],
- ["FE51",0xE816],
- ["FE52",0xE817],
- ["FE53",0xE818],
- ["8336C935",0xE819],
- ["8336C936",0xE81A],
- ["8336C937",0xE81B],
- ["8336C938",0xE81C],
- ["8336C939",0xE81D],
- ["FE59",0xE81E],
- ["8336CA30",0xE81F],
- ["8336CA31",0xE820],
- ["8336CA32",0xE821],
- ["8336CA33",0xE822],
- ["8336CA34",0xE823],
- ["8336CA35",0xE824],
- ["8336CA36",0xE825],
- ["FE61",0xE826],
- ["8336CA37",0xE827],
- ["8336CA38",0xE828],
- ["8336CA39",0xE829],
- ["8336CB30",0xE82A],
- ["FE66",0xE82B],
- ["FE67",0xE82C],
- ["8336CB31",0xE82D],
- ["8336CB32",0xE82E],
- ["8336CB33",0xE82F],
- ["8336CB34",0xE830],
- ["FE6C",0xE831],
- ["FE6D",0xE832],
- ["8336CB35",0xE833],
- ["8336CB36",0xE834],
- ["8336CB37",0xE835],
- ["8336CB38",0xE836],
- ["8336CB39",0xE837],
- ["8336CC30",0xE838],
- ["8336CC31",0xE839],
- ["8336CC32",0xE83A],
- ["FE76",0xE83B],
- ["8336CC33",0xE83C],
- ["8336CC34",0xE83D],
- ["8336CC35",0xE83E],
- ["8336CC36",0xE83F],
- ["8336CC37",0xE840],
- ["8336CC38",0xE841],
- ["8336CC39",0xE842],
- ["FE7E",0xE843],
- ["8336CD30",0xE844],
- ["8336CD31",0xE845],
- ["8336CD32",0xE846],
- ["8336CD33",0xE847],
- ["8336CD34",0xE848],
- ["8336CD35",0xE849],
- ["8336CD36",0xE84A],
- ["8336CD37",0xE84B],
- ["8336CD38",0xE84C],
- ["8336CD39",0xE84D],
- ["8336CE30",0xE84E],
- ["8336CE31",0xE84F],
- ["8336CE32",0xE850],
- ["8336CE33",0xE851],
- ["8336CE34",0xE852],
- ["8336CE35",0xE853],
- ["FE90",0xE854],
- ["FE91",0xE855],
- ["8336CE36",0xE856],
- ["8336CE37",0xE857],
- ["8336CE38",0xE858],
- ["8336CE39",0xE859],
- ["8336CF30",0xE85A],
- ["8336CF31",0xE85B],
- ["8336CF32",0xE85C],
- ["8336CF33",0xE85D],
- ["8336CF34",0xE85E],
- ["8336CF35",0xE85F],
- ["8336CF36",0xE860],
- ["8336CF37",0xE861],
- ["8336CF38",0xE862],
- ["8336CF39",0xE863],
- ["FEA0",0xE864],
- ["8336D030",0xE865],
- ["8336D031",0xE866],
- ["8336D032",0xE867],
- ["8336D033",0xE868],
- ["8336D034",0xE869],
- ["8336D035",0xE86A],
- ["8336D036",0xE86B],
- ["8336D037",0xE86C],
- ["8336D038",0xE86D],
- ["8336D039",0xE86E],
- ["8336D130",0xE86F],
- ["8336D131",0xE870],
- ["8336D132",0xE871],
- ["8336D133",0xE872],
- ["8336D134",0xE873],
- ["8336D135",0xE874],
- ["8336D136",0xE875],
- ["8336D137",0xE876],
- ["8336D138",0xE877],
- ["8336D139",0xE878],
- ["8336D230",0xE879],
- ["8336D231",0xE87A],
- ["8336D232",0xE87B],
- ["8336D233",0xE87C],
- ["8336D234",0xE87D],
- ["8336D235",0xE87E],
- ["8336D236",0xE87F],
- ["8336D237",0xE880],
- ["8336D238",0xE881],
- ["8336D239",0xE882],
- ["8336D330",0xE883],
- ["8336D331",0xE884],
- ["8336D332",0xE885],
- ["8336D333",0xE886],
- ["8336D334",0xE887],
- ["8336D335",0xE888],
- ["8336D336",0xE889],
- ["8336D337",0xE88A],
- ["8336D338",0xE88B],
- ["8336D339",0xE88C],
- ["8336D430",0xE88D],
- ["8336D431",0xE88E],
- ["8336D432",0xE88F],
- ["8336D433",0xE890],
- ["8336D434",0xE891],
- ["8336D435",0xE892],
- ["8336D436",0xE893],
- ["8336D437",0xE894],
- ["8336D438",0xE895],
- ["8336D439",0xE896],
- ["8336D530",0xE897],
- ["8336D531",0xE898],
- ["8336D532",0xE899],
- ["8336D533",0xE89A],
- ["8336D534",0xE89B],
- ["8336D535",0xE89C],
- ["8336D536",0xE89D],
- ["8336D537",0xE89E],
- ["8336D538",0xE89F],
- ["8336D539",0xE8A0],
- ["8336D630",0xE8A1],
- ["8336D631",0xE8A2],
- ["8336D632",0xE8A3],
- ["8336D633",0xE8A4],
- ["8336D634",0xE8A5],
- ["8336D635",0xE8A6],
- ["8336D636",0xE8A7],
- ["8336D637",0xE8A8],
- ["8336D638",0xE8A9],
- ["8336D639",0xE8AA],
- ["8336D730",0xE8AB],
- ["8336D731",0xE8AC],
- ["8336D732",0xE8AD],
- ["8336D733",0xE8AE],
- ["8336D734",0xE8AF],
- ["8336D735",0xE8B0],
- ["8336D736",0xE8B1],
- ["8336D737",0xE8B2],
- ["8336D738",0xE8B3],
- ["8336D739",0xE8B4],
- ["8336D830",0xE8B5],
- ["8336D831",0xE8B6],
- ["8336D832",0xE8B7],
- ["8336D833",0xE8B8],
- ["8336D834",0xE8B9],
- ["8336D835",0xE8BA],
- ["8336D836",0xE8BB],
- ["8336D837",0xE8BC],
- ["8336D838",0xE8BD],
- ["8336D839",0xE8BE],
- ["8336D930",0xE8BF],
- ["8336D931",0xE8C0],
- ["8336D932",0xE8C1],
- ["8336D933",0xE8C2],
- ["8336D934",0xE8C3],
- ["8336D935",0xE8C4],
- ["8336D936",0xE8C5],
- ["8336D937",0xE8C6],
- ["8336D938",0xE8C7],
- ["8336D939",0xE8C8],
- ["8336DA30",0xE8C9],
- ["8336DA31",0xE8CA],
- ["8336DA32",0xE8CB],
- ["8336DA33",0xE8CC],
- ["8336DA34",0xE8CD],
- ["8336DA35",0xE8CE],
- ["8336DA36",0xE8CF],
- ["8336DA37",0xE8D0],
- ["8336DA38",0xE8D1],
- ["8336DA39",0xE8D2],
- ["8336DB30",0xE8D3],
- ["8336DB31",0xE8D4],
- ["8336DB32",0xE8D5],
- ["8336DB33",0xE8D6],
- ["8336DB34",0xE8D7],
- ["8336DB35",0xE8D8],
- ["8336DB36",0xE8D9],
- ["8336DB37",0xE8DA],
- ["8336DB38",0xE8DB],
- ["8336DB39",0xE8DC],
- ["8336DC30",0xE8DD],
- ["8336DC31",0xE8DE],
- ["8336DC32",0xE8DF],
- ["8336DC33",0xE8E0],
- ["8336DC34",0xE8E1],
- ["8336DC35",0xE8E2],
- ["8336DC36",0xE8E3],
- ["8336DC37",0xE8E4],
- ["8336DC38",0xE8E5],
- ["8336DC39",0xE8E6],
- ["8336DD30",0xE8E7],
- ["8336DD31",0xE8E8],
- ["8336DD32",0xE8E9],
- ["8336DD33",0xE8EA],
- ["8336DD34",0xE8EB],
- ["8336DD35",0xE8EC],
- ["8336DD36",0xE8ED],
- ["8336DD37",0xE8EE],
- ["8336DD38",0xE8EF],
- ["8336DD39",0xE8F0],
- ["8336DE30",0xE8F1],
- ["8336DE31",0xE8F2],
- ["8336DE32",0xE8F3],
- ["8336DE33",0xE8F4],
- ["8336DE34",0xE8F5],
- ["8336DE35",0xE8F6],
- ["8336DE36",0xE8F7],
- ["8336DE37",0xE8F8],
- ["8336DE38",0xE8F9],
- ["8336DE39",0xE8FA],
- ["8336DF30",0xE8FB],
- ["8336DF31",0xE8FC],
- ["8336DF32",0xE8FD],
- ["8336DF33",0xE8FE],
- ["8336DF34",0xE8FF],
- ["8336DF35",0xE900],
- ["8336DF36",0xE901],
- ["8336DF37",0xE902],
- ["8336DF38",0xE903],
- ["8336DF39",0xE904],
- ["8336E030",0xE905],
- ["8336E031",0xE906],
- ["8336E032",0xE907],
- ["8336E033",0xE908],
- ["8336E034",0xE909],
- ["8336E035",0xE90A],
- ["8336E036",0xE90B],
- ["8336E037",0xE90C],
- ["8336E038",0xE90D],
- ["8336E039",0xE90E],
- ["8336E130",0xE90F],
- ["8336E131",0xE910],
- ["8336E132",0xE911],
- ["8336E133",0xE912],
- ["8336E134",0xE913],
- ["8336E135",0xE914],
- ["8336E136",0xE915],
- ["8336E137",0xE916],
- ["8336E138",0xE917],
- ["8336E139",0xE918],
- ["8336E230",0xE919],
- ["8336E231",0xE91A],
- ["8336E232",0xE91B],
- ["8336E233",0xE91C],
- ["8336E234",0xE91D],
- ["8336E235",0xE91E],
- ["8336E236",0xE91F],
- ["8336E237",0xE920],
- ["8336E238",0xE921],
- ["8336E239",0xE922],
- ["8336E330",0xE923],
- ["8336E331",0xE924],
- ["8336E332",0xE925],
- ["8336E333",0xE926],
- ["8336E334",0xE927],
- ["8336E335",0xE928],
- ["8336E336",0xE929],
- ["8336E337",0xE92A],
- ["8336E338",0xE92B],
- ["8336E339",0xE92C],
- ["8336E430",0xE92D],
- ["8336E431",0xE92E],
- ["8336E432",0xE92F],
- ["8336E433",0xE930],
- ["8336E434",0xE931],
- ["8336E435",0xE932],
- ["8336E436",0xE933],
- ["8336E437",0xE934],
- ["8336E438",0xE935],
- ["8336E439",0xE936],
- ["8336E530",0xE937],
- ["8336E531",0xE938],
- ["8336E532",0xE939],
- ["8336E533",0xE93A],
- ["8336E534",0xE93B],
- ["8336E535",0xE93C],
- ["8336E536",0xE93D],
- ["8336E537",0xE93E],
- ["8336E538",0xE93F],
- ["8336E539",0xE940],
- ["8336E630",0xE941],
- ["8336E631",0xE942],
- ["8336E632",0xE943],
- ["8336E633",0xE944],
- ["8336E634",0xE945],
- ["8336E635",0xE946],
- ["8336E636",0xE947],
- ["8336E637",0xE948],
- ["8336E638",0xE949],
- ["8336E639",0xE94A],
- ["8336E730",0xE94B],
- ["8336E731",0xE94C],
- ["8336E732",0xE94D],
- ["8336E733",0xE94E],
- ["8336E734",0xE94F],
- ["8336E735",0xE950],
- ["8336E736",0xE951],
- ["8336E737",0xE952],
- ["8336E738",0xE953],
- ["8336E739",0xE954],
- ["8336E830",0xE955],
- ["8336E831",0xE956],
- ["8336E832",0xE957],
- ["8336E833",0xE958],
- ["8336E834",0xE959],
- ["8336E835",0xE95A],
- ["8336E836",0xE95B],
- ["8336E837",0xE95C],
- ["8336E838",0xE95D],
- ["8336E839",0xE95E],
- ["8336E930",0xE95F],
- ["8336E931",0xE960],
- ["8336E932",0xE961],
- ["8336E933",0xE962],
- ["8336E934",0xE963],
- ["8336E935",0xE964],
- ["8336E936",0xE965],
- ["8336E937",0xE966],
- ["8336E938",0xE967],
- ["8336E939",0xE968],
- ["8336EA30",0xE969],
- ["8336EA31",0xE96A],
- ["8336EA32",0xE96B],
- ["8336EA33",0xE96C],
- ["8336EA34",0xE96D],
- ["8336EA35",0xE96E],
- ["8336EA36",0xE96F],
- ["8336EA37",0xE970],
- ["8336EA38",0xE971],
- ["8336EA39",0xE972],
- ["8336EB30",0xE973],
- ["8336EB31",0xE974],
- ["8336EB32",0xE975],
- ["8336EB33",0xE976],
- ["8336EB34",0xE977],
- ["8336EB35",0xE978],
- ["8336EB36",0xE979],
- ["8336EB37",0xE97A],
- ["8336EB38",0xE97B],
- ["8336EB39",0xE97C],
- ["8336EC30",0xE97D],
- ["8336EC31",0xE97E],
- ["8336EC32",0xE97F],
- ["8336EC33",0xE980],
- ["8336EC34",0xE981],
- ["8336EC35",0xE982],
- ["8336EC36",0xE983],
- ["8336EC37",0xE984],
- ["8336EC38",0xE985],
- ["8336EC39",0xE986],
- ["8336ED30",0xE987],
- ["8336ED31",0xE988],
- ["8336ED32",0xE989],
- ["8336ED33",0xE98A],
- ["8336ED34",0xE98B],
- ["8336ED35",0xE98C],
- ["8336ED36",0xE98D],
- ["8336ED37",0xE98E],
- ["8336ED38",0xE98F],
- ["8336ED39",0xE990],
- ["8336EE30",0xE991],
- ["8336EE31",0xE992],
- ["8336EE32",0xE993],
- ["8336EE33",0xE994],
- ["8336EE34",0xE995],
- ["8336EE35",0xE996],
- ["8336EE36",0xE997],
- ["8336EE37",0xE998],
- ["8336EE38",0xE999],
- ["8336EE39",0xE99A],
- ["8336EF30",0xE99B],
- ["8336EF31",0xE99C],
- ["8336EF32",0xE99D],
- ["8336EF33",0xE99E],
- ["8336EF34",0xE99F],
- ["8336EF35",0xE9A0],
- ["8336EF36",0xE9A1],
- ["8336EF37",0xE9A2],
- ["8336EF38",0xE9A3],
- ["8336EF39",0xE9A4],
- ["8336F030",0xE9A5],
- ["8336F031",0xE9A6],
- ["8336F032",0xE9A7],
- ["8336F033",0xE9A8],
- ["8336F034",0xE9A9],
- ["8336F035",0xE9AA],
- ["8336F036",0xE9AB],
- ["8336F037",0xE9AC],
- ["8336F038",0xE9AD],
- ["8336F039",0xE9AE],
- ["8336F130",0xE9AF],
- ["8336F131",0xE9B0],
- ["8336F132",0xE9B1],
- ["8336F133",0xE9B2],
- ["8336F134",0xE9B3],
- ["8336F135",0xE9B4],
- ["8336F136",0xE9B5],
- ["8336F137",0xE9B6],
- ["8336F138",0xE9B7],
- ["8336F139",0xE9B8],
- ["8336F230",0xE9B9],
- ["8336F231",0xE9BA],
- ["8336F232",0xE9BB],
- ["8336F233",0xE9BC],
- ["8336F234",0xE9BD],
- ["8336F235",0xE9BE],
- ["8336F236",0xE9BF],
- ["8336F237",0xE9C0],
- ["8336F238",0xE9C1],
- ["8336F239",0xE9C2],
- ["8336F330",0xE9C3],
- ["8336F331",0xE9C4],
- ["8336F332",0xE9C5],
- ["8336F333",0xE9C6],
- ["8336F334",0xE9C7],
- ["8336F335",0xE9C8],
- ["8336F336",0xE9C9],
- ["8336F337",0xE9CA],
- ["8336F338",0xE9CB],
- ["8336F339",0xE9CC],
- ["8336F430",0xE9CD],
- ["8336F431",0xE9CE],
- ["8336F432",0xE9CF],
- ["8336F433",0xE9D0],
- ["8336F434",0xE9D1],
- ["8336F435",0xE9D2],
- ["8336F436",0xE9D3],
- ["8336F437",0xE9D4],
- ["8336F438",0xE9D5],
- ["8336F439",0xE9D6],
- ["8336F530",0xE9D7],
- ["8336F531",0xE9D8],
- ["8336F532",0xE9D9],
- ["8336F533",0xE9DA],
- ["8336F534",0xE9DB],
- ["8336F535",0xE9DC],
- ["8336F536",0xE9DD],
- ["8336F537",0xE9DE],
- ["8336F538",0xE9DF],
- ["8336F539",0xE9E0],
- ["8336F630",0xE9E1],
- ["8336F631",0xE9E2],
- ["8336F632",0xE9E3],
- ["8336F633",0xE9E4],
- ["8336F634",0xE9E5],
- ["8336F635",0xE9E6],
- ["8336F636",0xE9E7],
- ["8336F637",0xE9E8],
- ["8336F638",0xE9E9],
- ["8336F639",0xE9EA],
- ["8336F730",0xE9EB],
- ["8336F731",0xE9EC],
- ["8336F732",0xE9ED],
- ["8336F733",0xE9EE],
- ["8336F734",0xE9EF],
- ["8336F735",0xE9F0],
- ["8336F736",0xE9F1],
- ["8336F737",0xE9F2],
- ["8336F738",0xE9F3],
- ["8336F739",0xE9F4],
- ["8336F830",0xE9F5],
- ["8336F831",0xE9F6],
- ["8336F832",0xE9F7],
- ["8336F833",0xE9F8],
- ["8336F834",0xE9F9],
- ["8336F835",0xE9FA],
- ["8336F836",0xE9FB],
- ["8336F837",0xE9FC],
- ["8336F838",0xE9FD],
- ["8336F839",0xE9FE],
- ["8336F930",0xE9FF],
- ["8336F931",0xEA00],
- ["8336F932",0xEA01],
- ["8336F933",0xEA02],
- ["8336F934",0xEA03],
- ["8336F935",0xEA04],
- ["8336F936",0xEA05],
- ["8336F937",0xEA06],
- ["8336F938",0xEA07],
- ["8336F939",0xEA08],
- ["8336FA30",0xEA09],
- ["8336FA31",0xEA0A],
- ["8336FA32",0xEA0B],
- ["8336FA33",0xEA0C],
- ["8336FA34",0xEA0D],
- ["8336FA35",0xEA0E],
- ["8336FA36",0xEA0F],
- ["8336FA37",0xEA10],
- ["8336FA38",0xEA11],
- ["8336FA39",0xEA12],
- ["8336FB30",0xEA13],
- ["8336FB31",0xEA14],
- ["8336FB32",0xEA15],
- ["8336FB33",0xEA16],
- ["8336FB34",0xEA17],
- ["8336FB35",0xEA18],
- ["8336FB36",0xEA19],
- ["8336FB37",0xEA1A],
- ["8336FB38",0xEA1B],
- ["8336FB39",0xEA1C],
- ["8336FC30",0xEA1D],
- ["8336FC31",0xEA1E],
- ["8336FC32",0xEA1F],
- ["8336FC33",0xEA20],
- ["8336FC34",0xEA21],
- ["8336FC35",0xEA22],
- ["8336FC36",0xEA23],
- ["8336FC37",0xEA24],
- ["8336FC38",0xEA25],
- ["8336FC39",0xEA26],
- ["8336FD30",0xEA27],
- ["8336FD31",0xEA28],
- ["8336FD32",0xEA29],
- ["8336FD33",0xEA2A],
- ["8336FD34",0xEA2B],
- ["8336FD35",0xEA2C],
- ["8336FD36",0xEA2D],
- ["8336FD37",0xEA2E],
- ["8336FD38",0xEA2F],
- ["8336FD39",0xEA30],
- ["8336FE30",0xEA31],
- ["8336FE31",0xEA32],
- ["8336FE32",0xEA33],
- ["8336FE33",0xEA34],
- ["8336FE34",0xEA35],
- ["8336FE35",0xEA36],
- ["8336FE36",0xEA37],
- ["8336FE37",0xEA38],
- ["8336FE38",0xEA39],
- ["8336FE39",0xEA3A],
- ["83378130",0xEA3B],
- ["83378131",0xEA3C],
- ["83378132",0xEA3D],
- ["83378133",0xEA3E],
- ["83378134",0xEA3F],
- ["83378135",0xEA40],
- ["83378136",0xEA41],
- ["83378137",0xEA42],
- ["83378138",0xEA43],
- ["83378139",0xEA44],
- ["83378230",0xEA45],
- ["83378231",0xEA46],
- ["83378232",0xEA47],
- ["83378233",0xEA48],
- ["83378234",0xEA49],
- ["83378235",0xEA4A],
- ["83378236",0xEA4B],
- ["83378237",0xEA4C],
- ["83378238",0xEA4D],
- ["83378239",0xEA4E],
- ["83378330",0xEA4F],
- ["83378331",0xEA50],
- ["83378332",0xEA51],
- ["83378333",0xEA52],
- ["83378334",0xEA53],
- ["83378335",0xEA54],
- ["83378336",0xEA55],
- ["83378337",0xEA56],
- ["83378338",0xEA57],
- ["83378339",0xEA58],
- ["83378430",0xEA59],
- ["83378431",0xEA5A],
- ["83378432",0xEA5B],
- ["83378433",0xEA5C],
- ["83378434",0xEA5D],
- ["83378435",0xEA5E],
- ["83378436",0xEA5F],
- ["83378437",0xEA60],
- ["83378438",0xEA61],
- ["83378439",0xEA62],
- ["83378530",0xEA63],
- ["83378531",0xEA64],
- ["83378532",0xEA65],
- ["83378533",0xEA66],
- ["83378534",0xEA67],
- ["83378535",0xEA68],
- ["83378536",0xEA69],
- ["83378537",0xEA6A],
- ["83378538",0xEA6B],
- ["83378539",0xEA6C],
- ["83378630",0xEA6D],
- ["83378631",0xEA6E],
- ["83378632",0xEA6F],
- ["83378633",0xEA70],
- ["83378634",0xEA71],
- ["83378635",0xEA72],
- ["83378636",0xEA73],
- ["83378637",0xEA74],
- ["83378638",0xEA75],
- ["83378639",0xEA76],
- ["83378730",0xEA77],
- ["83378731",0xEA78],
- ["83378732",0xEA79],
- ["83378733",0xEA7A],
- ["83378734",0xEA7B],
- ["83378735",0xEA7C],
- ["83378736",0xEA7D],
- ["83378737",0xEA7E],
- ["83378738",0xEA7F],
- ["83378739",0xEA80],
- ["83378830",0xEA81],
- ["83378831",0xEA82],
- ["83378832",0xEA83],
- ["83378833",0xEA84],
- ["83378834",0xEA85],
- ["83378835",0xEA86],
- ["83378836",0xEA87],
- ["83378837",0xEA88],
- ["83378838",0xEA89],
- ["83378839",0xEA8A],
- ["83378930",0xEA8B],
- ["83378931",0xEA8C],
- ["83378932",0xEA8D],
- ["83378933",0xEA8E],
- ["83378934",0xEA8F],
- ["83378935",0xEA90],
- ["83378936",0xEA91],
- ["83378937",0xEA92],
- ["83378938",0xEA93],
- ["83378939",0xEA94],
- ["83378A30",0xEA95],
- ["83378A31",0xEA96],
- ["83378A32",0xEA97],
- ["83378A33",0xEA98],
- ["83378A34",0xEA99],
- ["83378A35",0xEA9A],
- ["83378A36",0xEA9B],
- ["83378A37",0xEA9C],
- ["83378A38",0xEA9D],
- ["83378A39",0xEA9E],
- ["83378B30",0xEA9F],
- ["83378B31",0xEAA0],
- ["83378B32",0xEAA1],
- ["83378B33",0xEAA2],
- ["83378B34",0xEAA3],
- ["83378B35",0xEAA4],
- ["83378B36",0xEAA5],
- ["83378B37",0xEAA6],
- ["83378B38",0xEAA7],
- ["83378B39",0xEAA8],
- ["83378C30",0xEAA9],
- ["83378C31",0xEAAA],
- ["83378C32",0xEAAB],
- ["83378C33",0xEAAC],
- ["83378C34",0xEAAD],
- ["83378C35",0xEAAE],
- ["83378C36",0xEAAF],
- ["83378C37",0xEAB0],
- ["83378C38",0xEAB1],
- ["83378C39",0xEAB2],
- ["83378D30",0xEAB3],
- ["83378D31",0xEAB4],
- ["83378D32",0xEAB5],
- ["83378D33",0xEAB6],
- ["83378D34",0xEAB7],
- ["83378D35",0xEAB8],
- ["83378D36",0xEAB9],
- ["83378D37",0xEABA],
- ["83378D38",0xEABB],
- ["83378D39",0xEABC],
- ["83378E30",0xEABD],
- ["83378E31",0xEABE],
- ["83378E32",0xEABF],
- ["83378E33",0xEAC0],
- ["83378E34",0xEAC1],
- ["83378E35",0xEAC2],
- ["83378E36",0xEAC3],
- ["83378E37",0xEAC4],
- ["83378E38",0xEAC5],
- ["83378E39",0xEAC6],
- ["83378F30",0xEAC7],
- ["83378F31",0xEAC8],
- ["83378F32",0xEAC9],
- ["83378F33",0xEACA],
- ["83378F34",0xEACB],
- ["83378F35",0xEACC],
- ["83378F36",0xEACD],
- ["83378F37",0xEACE],
- ["83378F38",0xEACF],
- ["83378F39",0xEAD0],
- ["83379030",0xEAD1],
- ["83379031",0xEAD2],
- ["83379032",0xEAD3],
- ["83379033",0xEAD4],
- ["83379034",0xEAD5],
- ["83379035",0xEAD6],
- ["83379036",0xEAD7],
- ["83379037",0xEAD8],
- ["83379038",0xEAD9],
- ["83379039",0xEADA],
- ["83379130",0xEADB],
- ["83379131",0xEADC],
- ["83379132",0xEADD],
- ["83379133",0xEADE],
- ["83379134",0xEADF],
- ["83379135",0xEAE0],
- ["83379136",0xEAE1],
- ["83379137",0xEAE2],
- ["83379138",0xEAE3],
- ["83379139",0xEAE4],
- ["83379230",0xEAE5],
- ["83379231",0xEAE6],
- ["83379232",0xEAE7],
- ["83379233",0xEAE8],
- ["83379234",0xEAE9],
- ["83379235",0xEAEA],
- ["83379236",0xEAEB],
- ["83379237",0xEAEC],
- ["83379238",0xEAED],
- ["83379239",0xEAEE],
- ["83379330",0xEAEF],
- ["83379331",0xEAF0],
- ["83379332",0xEAF1],
- ["83379333",0xEAF2],
- ["83379334",0xEAF3],
- ["83379335",0xEAF4],
- ["83379336",0xEAF5],
- ["83379337",0xEAF6],
- ["83379338",0xEAF7],
- ["83379339",0xEAF8],
- ["83379430",0xEAF9],
- ["83379431",0xEAFA],
- ["83379432",0xEAFB],
- ["83379433",0xEAFC],
- ["83379434",0xEAFD],
- ["83379435",0xEAFE],
- ["83379436",0xEAFF],
- ["83379437",0xEB00],
- ["83379438",0xEB01],
- ["83379439",0xEB02],
- ["83379530",0xEB03],
- ["83379531",0xEB04],
- ["83379532",0xEB05],
- ["83379533",0xEB06],
- ["83379534",0xEB07],
- ["83379535",0xEB08],
- ["83379536",0xEB09],
- ["83379537",0xEB0A],
- ["83379538",0xEB0B],
- ["83379539",0xEB0C],
- ["83379630",0xEB0D],
- ["83379631",0xEB0E],
- ["83379632",0xEB0F],
- ["83379633",0xEB10],
- ["83379634",0xEB11],
- ["83379635",0xEB12],
- ["83379636",0xEB13],
- ["83379637",0xEB14],
- ["83379638",0xEB15],
- ["83379639",0xEB16],
- ["83379730",0xEB17],
- ["83379731",0xEB18],
- ["83379732",0xEB19],
- ["83379733",0xEB1A],
- ["83379734",0xEB1B],
- ["83379735",0xEB1C],
- ["83379736",0xEB1D],
- ["83379737",0xEB1E],
- ["83379738",0xEB1F],
- ["83379739",0xEB20],
- ["83379830",0xEB21],
- ["83379831",0xEB22],
- ["83379832",0xEB23],
- ["83379833",0xEB24],
- ["83379834",0xEB25],
- ["83379835",0xEB26],
- ["83379836",0xEB27],
- ["83379837",0xEB28],
- ["83379838",0xEB29],
- ["83379839",0xEB2A],
- ["83379930",0xEB2B],
- ["83379931",0xEB2C],
- ["83379932",0xEB2D],
- ["83379933",0xEB2E],
- ["83379934",0xEB2F],
- ["83379935",0xEB30],
- ["83379936",0xEB31],
- ["83379937",0xEB32],
- ["83379938",0xEB33],
- ["83379939",0xEB34],
- ["83379A30",0xEB35],
- ["83379A31",0xEB36],
- ["83379A32",0xEB37],
- ["83379A33",0xEB38],
- ["83379A34",0xEB39],
- ["83379A35",0xEB3A],
- ["83379A36",0xEB3B],
- ["83379A37",0xEB3C],
- ["83379A38",0xEB3D],
- ["83379A39",0xEB3E],
- ["83379B30",0xEB3F],
- ["83379B31",0xEB40],
- ["83379B32",0xEB41],
- ["83379B33",0xEB42],
- ["83379B34",0xEB43],
- ["83379B35",0xEB44],
- ["83379B36",0xEB45],
- ["83379B37",0xEB46],
- ["83379B38",0xEB47],
- ["83379B39",0xEB48],
- ["83379C30",0xEB49],
- ["83379C31",0xEB4A],
- ["83379C32",0xEB4B],
- ["83379C33",0xEB4C],
- ["83379C34",0xEB4D],
- ["83379C35",0xEB4E],
- ["83379C36",0xEB4F],
- ["83379C37",0xEB50],
- ["83379C38",0xEB51],
- ["83379C39",0xEB52],
- ["83379D30",0xEB53],
- ["83379D31",0xEB54],
- ["83379D32",0xEB55],
- ["83379D33",0xEB56],
- ["83379D34",0xEB57],
- ["83379D35",0xEB58],
- ["83379D36",0xEB59],
- ["83379D37",0xEB5A],
- ["83379D38",0xEB5B],
- ["83379D39",0xEB5C],
- ["83379E30",0xEB5D],
- ["83379E31",0xEB5E],
- ["83379E32",0xEB5F],
- ["83379E33",0xEB60],
- ["83379E34",0xEB61],
- ["83379E35",0xEB62],
- ["83379E36",0xEB63],
- ["83379E37",0xEB64],
- ["83379E38",0xEB65],
- ["83379E39",0xEB66],
- ["83379F30",0xEB67],
- ["83379F31",0xEB68],
- ["83379F32",0xEB69],
- ["83379F33",0xEB6A],
- ["83379F34",0xEB6B],
- ["83379F35",0xEB6C],
- ["83379F36",0xEB6D],
- ["83379F37",0xEB6E],
- ["83379F38",0xEB6F],
- ["83379F39",0xEB70],
- ["8337A030",0xEB71],
- ["8337A031",0xEB72],
- ["8337A032",0xEB73],
- ["8337A033",0xEB74],
- ["8337A034",0xEB75],
- ["8337A035",0xEB76],
- ["8337A036",0xEB77],
- ["8337A037",0xEB78],
- ["8337A038",0xEB79],
- ["8337A039",0xEB7A],
- ["8337A130",0xEB7B],
- ["8337A131",0xEB7C],
- ["8337A132",0xEB7D],
- ["8337A133",0xEB7E],
- ["8337A134",0xEB7F],
- ["8337A135",0xEB80],
- ["8337A136",0xEB81],
- ["8337A137",0xEB82],
- ["8337A138",0xEB83],
- ["8337A139",0xEB84],
- ["8337A230",0xEB85],
- ["8337A231",0xEB86],
- ["8337A232",0xEB87],
- ["8337A233",0xEB88],
- ["8337A234",0xEB89],
- ["8337A235",0xEB8A],
- ["8337A236",0xEB8B],
- ["8337A237",0xEB8C],
- ["8337A238",0xEB8D],
- ["8337A239",0xEB8E],
- ["8337A330",0xEB8F],
- ["8337A331",0xEB90],
- ["8337A332",0xEB91],
- ["8337A333",0xEB92],
- ["8337A334",0xEB93],
- ["8337A335",0xEB94],
- ["8337A336",0xEB95],
- ["8337A337",0xEB96],
- ["8337A338",0xEB97],
- ["8337A339",0xEB98],
- ["8337A430",0xEB99],
- ["8337A431",0xEB9A],
- ["8337A432",0xEB9B],
- ["8337A433",0xEB9C],
- ["8337A434",0xEB9D],
- ["8337A435",0xEB9E],
- ["8337A436",0xEB9F],
- ["8337A437",0xEBA0],
- ["8337A438",0xEBA1],
- ["8337A439",0xEBA2],
- ["8337A530",0xEBA3],
- ["8337A531",0xEBA4],
- ["8337A532",0xEBA5],
- ["8337A533",0xEBA6],
- ["8337A534",0xEBA7],
- ["8337A535",0xEBA8],
- ["8337A536",0xEBA9],
- ["8337A537",0xEBAA],
- ["8337A538",0xEBAB],
- ["8337A539",0xEBAC],
- ["8337A630",0xEBAD],
- ["8337A631",0xEBAE],
- ["8337A632",0xEBAF],
- ["8337A633",0xEBB0],
- ["8337A634",0xEBB1],
- ["8337A635",0xEBB2],
- ["8337A636",0xEBB3],
- ["8337A637",0xEBB4],
- ["8337A638",0xEBB5],
- ["8337A639",0xEBB6],
- ["8337A730",0xEBB7],
- ["8337A731",0xEBB8],
- ["8337A732",0xEBB9],
- ["8337A733",0xEBBA],
- ["8337A734",0xEBBB],
- ["8337A735",0xEBBC],
- ["8337A736",0xEBBD],
- ["8337A737",0xEBBE],
- ["8337A738",0xEBBF],
- ["8337A739",0xEBC0],
- ["8337A830",0xEBC1],
- ["8337A831",0xEBC2],
- ["8337A832",0xEBC3],
- ["8337A833",0xEBC4],
- ["8337A834",0xEBC5],
- ["8337A835",0xEBC6],
- ["8337A836",0xEBC7],
- ["8337A837",0xEBC8],
- ["8337A838",0xEBC9],
- ["8337A839",0xEBCA],
- ["8337A930",0xEBCB],
- ["8337A931",0xEBCC],
- ["8337A932",0xEBCD],
- ["8337A933",0xEBCE],
- ["8337A934",0xEBCF],
- ["8337A935",0xEBD0],
- ["8337A936",0xEBD1],
- ["8337A937",0xEBD2],
- ["8337A938",0xEBD3],
- ["8337A939",0xEBD4],
- ["8337AA30",0xEBD5],
- ["8337AA31",0xEBD6],
- ["8337AA32",0xEBD7],
- ["8337AA33",0xEBD8],
- ["8337AA34",0xEBD9],
- ["8337AA35",0xEBDA],
- ["8337AA36",0xEBDB],
- ["8337AA37",0xEBDC],
- ["8337AA38",0xEBDD],
- ["8337AA39",0xEBDE],
- ["8337AB30",0xEBDF],
- ["8337AB31",0xEBE0],
- ["8337AB32",0xEBE1],
- ["8337AB33",0xEBE2],
- ["8337AB34",0xEBE3],
- ["8337AB35",0xEBE4],
- ["8337AB36",0xEBE5],
- ["8337AB37",0xEBE6],
- ["8337AB38",0xEBE7],
- ["8337AB39",0xEBE8],
- ["8337AC30",0xEBE9],
- ["8337AC31",0xEBEA],
- ["8337AC32",0xEBEB],
- ["8337AC33",0xEBEC],
- ["8337AC34",0xEBED],
- ["8337AC35",0xEBEE],
- ["8337AC36",0xEBEF],
- ["8337AC37",0xEBF0],
- ["8337AC38",0xEBF1],
- ["8337AC39",0xEBF2],
- ["8337AD30",0xEBF3],
- ["8337AD31",0xEBF4],
- ["8337AD32",0xEBF5],
- ["8337AD33",0xEBF6],
- ["8337AD34",0xEBF7],
- ["8337AD35",0xEBF8],
- ["8337AD36",0xEBF9],
- ["8337AD37",0xEBFA],
- ["8337AD38",0xEBFB],
- ["8337AD39",0xEBFC],
- ["8337AE30",0xEBFD],
- ["8337AE31",0xEBFE],
- ["8337AE32",0xEBFF],
- ["8337AE33",0xEC00],
- ["8337AE34",0xEC01],
- ["8337AE35",0xEC02],
- ["8337AE36",0xEC03],
- ["8337AE37",0xEC04],
- ["8337AE38",0xEC05],
- ["8337AE39",0xEC06],
- ["8337AF30",0xEC07],
- ["8337AF31",0xEC08],
- ["8337AF32",0xEC09],
- ["8337AF33",0xEC0A],
- ["8337AF34",0xEC0B],
- ["8337AF35",0xEC0C],
- ["8337AF36",0xEC0D],
- ["8337AF37",0xEC0E],
- ["8337AF38",0xEC0F],
- ["8337AF39",0xEC10],
- ["8337B030",0xEC11],
- ["8337B031",0xEC12],
- ["8337B032",0xEC13],
- ["8337B033",0xEC14],
- ["8337B034",0xEC15],
- ["8337B035",0xEC16],
- ["8337B036",0xEC17],
- ["8337B037",0xEC18],
- ["8337B038",0xEC19],
- ["8337B039",0xEC1A],
- ["8337B130",0xEC1B],
- ["8337B131",0xEC1C],
- ["8337B132",0xEC1D],
- ["8337B133",0xEC1E],
- ["8337B134",0xEC1F],
- ["8337B135",0xEC20],
- ["8337B136",0xEC21],
- ["8337B137",0xEC22],
- ["8337B138",0xEC23],
- ["8337B139",0xEC24],
- ["8337B230",0xEC25],
- ["8337B231",0xEC26],
- ["8337B232",0xEC27],
- ["8337B233",0xEC28],
- ["8337B234",0xEC29],
- ["8337B235",0xEC2A],
- ["8337B236",0xEC2B],
- ["8337B237",0xEC2C],
- ["8337B238",0xEC2D],
- ["8337B239",0xEC2E],
- ["8337B330",0xEC2F],
- ["8337B331",0xEC30],
- ["8337B332",0xEC31],
- ["8337B333",0xEC32],
- ["8337B334",0xEC33],
- ["8337B335",0xEC34],
- ["8337B336",0xEC35],
- ["8337B337",0xEC36],
- ["8337B338",0xEC37],
- ["8337B339",0xEC38],
- ["8337B430",0xEC39],
- ["8337B431",0xEC3A],
- ["8337B432",0xEC3B],
- ["8337B433",0xEC3C],
- ["8337B434",0xEC3D],
- ["8337B435",0xEC3E],
- ["8337B436",0xEC3F],
- ["8337B437",0xEC40],
- ["8337B438",0xEC41],
- ["8337B439",0xEC42],
- ["8337B530",0xEC43],
- ["8337B531",0xEC44],
- ["8337B532",0xEC45],
- ["8337B533",0xEC46],
- ["8337B534",0xEC47],
- ["8337B535",0xEC48],
- ["8337B536",0xEC49],
- ["8337B537",0xEC4A],
- ["8337B538",0xEC4B],
- ["8337B539",0xEC4C],
- ["8337B630",0xEC4D],
- ["8337B631",0xEC4E],
- ["8337B632",0xEC4F],
- ["8337B633",0xEC50],
- ["8337B634",0xEC51],
- ["8337B635",0xEC52],
- ["8337B636",0xEC53],
- ["8337B637",0xEC54],
- ["8337B638",0xEC55],
- ["8337B639",0xEC56],
- ["8337B730",0xEC57],
- ["8337B731",0xEC58],
- ["8337B732",0xEC59],
- ["8337B733",0xEC5A],
- ["8337B734",0xEC5B],
- ["8337B735",0xEC5C],
- ["8337B736",0xEC5D],
- ["8337B737",0xEC5E],
- ["8337B738",0xEC5F],
- ["8337B739",0xEC60],
- ["8337B830",0xEC61],
- ["8337B831",0xEC62],
- ["8337B832",0xEC63],
- ["8337B833",0xEC64],
- ["8337B834",0xEC65],
- ["8337B835",0xEC66],
- ["8337B836",0xEC67],
- ["8337B837",0xEC68],
- ["8337B838",0xEC69],
- ["8337B839",0xEC6A],
- ["8337B930",0xEC6B],
- ["8337B931",0xEC6C],
- ["8337B932",0xEC6D],
- ["8337B933",0xEC6E],
- ["8337B934",0xEC6F],
- ["8337B935",0xEC70],
- ["8337B936",0xEC71],
- ["8337B937",0xEC72],
- ["8337B938",0xEC73],
- ["8337B939",0xEC74],
- ["8337BA30",0xEC75],
- ["8337BA31",0xEC76],
- ["8337BA32",0xEC77],
- ["8337BA33",0xEC78],
- ["8337BA34",0xEC79],
- ["8337BA35",0xEC7A],
- ["8337BA36",0xEC7B],
- ["8337BA37",0xEC7C],
- ["8337BA38",0xEC7D],
- ["8337BA39",0xEC7E],
- ["8337BB30",0xEC7F],
- ["8337BB31",0xEC80],
- ["8337BB32",0xEC81],
- ["8337BB33",0xEC82],
- ["8337BB34",0xEC83],
- ["8337BB35",0xEC84],
- ["8337BB36",0xEC85],
- ["8337BB37",0xEC86],
- ["8337BB38",0xEC87],
- ["8337BB39",0xEC88],
- ["8337BC30",0xEC89],
- ["8337BC31",0xEC8A],
- ["8337BC32",0xEC8B],
- ["8337BC33",0xEC8C],
- ["8337BC34",0xEC8D],
- ["8337BC35",0xEC8E],
- ["8337BC36",0xEC8F],
- ["8337BC37",0xEC90],
- ["8337BC38",0xEC91],
- ["8337BC39",0xEC92],
- ["8337BD30",0xEC93],
- ["8337BD31",0xEC94],
- ["8337BD32",0xEC95],
- ["8337BD33",0xEC96],
- ["8337BD34",0xEC97],
- ["8337BD35",0xEC98],
- ["8337BD36",0xEC99],
- ["8337BD37",0xEC9A],
- ["8337BD38",0xEC9B],
- ["8337BD39",0xEC9C],
- ["8337BE30",0xEC9D],
- ["8337BE31",0xEC9E],
- ["8337BE32",0xEC9F],
- ["8337BE33",0xECA0],
- ["8337BE34",0xECA1],
- ["8337BE35",0xECA2],
- ["8337BE36",0xECA3],
- ["8337BE37",0xECA4],
- ["8337BE38",0xECA5],
- ["8337BE39",0xECA6],
- ["8337BF30",0xECA7],
- ["8337BF31",0xECA8],
- ["8337BF32",0xECA9],
- ["8337BF33",0xECAA],
- ["8337BF34",0xECAB],
- ["8337BF35",0xECAC],
- ["8337BF36",0xECAD],
- ["8337BF37",0xECAE],
- ["8337BF38",0xECAF],
- ["8337BF39",0xECB0],
- ["8337C030",0xECB1],
- ["8337C031",0xECB2],
- ["8337C032",0xECB3],
- ["8337C033",0xECB4],
- ["8337C034",0xECB5],
- ["8337C035",0xECB6],
- ["8337C036",0xECB7],
- ["8337C037",0xECB8],
- ["8337C038",0xECB9],
- ["8337C039",0xECBA],
- ["8337C130",0xECBB],
- ["8337C131",0xECBC],
- ["8337C132",0xECBD],
- ["8337C133",0xECBE],
- ["8337C134",0xECBF],
- ["8337C135",0xECC0],
- ["8337C136",0xECC1],
- ["8337C137",0xECC2],
- ["8337C138",0xECC3],
- ["8337C139",0xECC4],
- ["8337C230",0xECC5],
- ["8337C231",0xECC6],
- ["8337C232",0xECC7],
- ["8337C233",0xECC8],
- ["8337C234",0xECC9],
- ["8337C235",0xECCA],
- ["8337C236",0xECCB],
- ["8337C237",0xECCC],
- ["8337C238",0xECCD],
- ["8337C239",0xECCE],
- ["8337C330",0xECCF],
- ["8337C331",0xECD0],
- ["8337C332",0xECD1],
- ["8337C333",0xECD2],
- ["8337C334",0xECD3],
- ["8337C335",0xECD4],
- ["8337C336",0xECD5],
- ["8337C337",0xECD6],
- ["8337C338",0xECD7],
- ["8337C339",0xECD8],
- ["8337C430",0xECD9],
- ["8337C431",0xECDA],
- ["8337C432",0xECDB],
- ["8337C433",0xECDC],
- ["8337C434",0xECDD],
- ["8337C435",0xECDE],
- ["8337C436",0xECDF],
- ["8337C437",0xECE0],
- ["8337C438",0xECE1],
- ["8337C439",0xECE2],
- ["8337C530",0xECE3],
- ["8337C531",0xECE4],
- ["8337C532",0xECE5],
- ["8337C533",0xECE6],
- ["8337C534",0xECE7],
- ["8337C535",0xECE8],
- ["8337C536",0xECE9],
- ["8337C537",0xECEA],
- ["8337C538",0xECEB],
- ["8337C539",0xECEC],
- ["8337C630",0xECED],
- ["8337C631",0xECEE],
- ["8337C632",0xECEF],
- ["8337C633",0xECF0],
- ["8337C634",0xECF1],
- ["8337C635",0xECF2],
- ["8337C636",0xECF3],
- ["8337C637",0xECF4],
- ["8337C638",0xECF5],
- ["8337C639",0xECF6],
- ["8337C730",0xECF7],
- ["8337C731",0xECF8],
- ["8337C732",0xECF9],
- ["8337C733",0xECFA],
- ["8337C734",0xECFB],
- ["8337C735",0xECFC],
- ["8337C736",0xECFD],
- ["8337C737",0xECFE],
- ["8337C738",0xECFF],
- ["8337C739",0xED00],
- ["8337C830",0xED01],
- ["8337C831",0xED02],
- ["8337C832",0xED03],
- ["8337C833",0xED04],
- ["8337C834",0xED05],
- ["8337C835",0xED06],
- ["8337C836",0xED07],
- ["8337C837",0xED08],
- ["8337C838",0xED09],
- ["8337C839",0xED0A],
- ["8337C930",0xED0B],
- ["8337C931",0xED0C],
- ["8337C932",0xED0D],
- ["8337C933",0xED0E],
- ["8337C934",0xED0F],
- ["8337C935",0xED10],
- ["8337C936",0xED11],
- ["8337C937",0xED12],
- ["8337C938",0xED13],
- ["8337C939",0xED14],
- ["8337CA30",0xED15],
- ["8337CA31",0xED16],
- ["8337CA32",0xED17],
- ["8337CA33",0xED18],
- ["8337CA34",0xED19],
- ["8337CA35",0xED1A],
- ["8337CA36",0xED1B],
- ["8337CA37",0xED1C],
- ["8337CA38",0xED1D],
- ["8337CA39",0xED1E],
- ["8337CB30",0xED1F],
- ["8337CB31",0xED20],
- ["8337CB32",0xED21],
- ["8337CB33",0xED22],
- ["8337CB34",0xED23],
- ["8337CB35",0xED24],
- ["8337CB36",0xED25],
- ["8337CB37",0xED26],
- ["8337CB38",0xED27],
- ["8337CB39",0xED28],
- ["8337CC30",0xED29],
- ["8337CC31",0xED2A],
- ["8337CC32",0xED2B],
- ["8337CC33",0xED2C],
- ["8337CC34",0xED2D],
- ["8337CC35",0xED2E],
- ["8337CC36",0xED2F],
- ["8337CC37",0xED30],
- ["8337CC38",0xED31],
- ["8337CC39",0xED32],
- ["8337CD30",0xED33],
- ["8337CD31",0xED34],
- ["8337CD32",0xED35],
- ["8337CD33",0xED36],
- ["8337CD34",0xED37],
- ["8337CD35",0xED38],
- ["8337CD36",0xED39],
- ["8337CD37",0xED3A],
- ["8337CD38",0xED3B],
- ["8337CD39",0xED3C],
- ["8337CE30",0xED3D],
- ["8337CE31",0xED3E],
- ["8337CE32",0xED3F],
- ["8337CE33",0xED40],
- ["8337CE34",0xED41],
- ["8337CE35",0xED42],
- ["8337CE36",0xED43],
- ["8337CE37",0xED44],
- ["8337CE38",0xED45],
- ["8337CE39",0xED46],
- ["8337CF30",0xED47],
- ["8337CF31",0xED48],
- ["8337CF32",0xED49],
- ["8337CF33",0xED4A],
- ["8337CF34",0xED4B],
- ["8337CF35",0xED4C],
- ["8337CF36",0xED4D],
- ["8337CF37",0xED4E],
- ["8337CF38",0xED4F],
- ["8337CF39",0xED50],
- ["8337D030",0xED51],
- ["8337D031",0xED52],
- ["8337D032",0xED53],
- ["8337D033",0xED54],
- ["8337D034",0xED55],
- ["8337D035",0xED56],
- ["8337D036",0xED57],
- ["8337D037",0xED58],
- ["8337D038",0xED59],
- ["8337D039",0xED5A],
- ["8337D130",0xED5B],
- ["8337D131",0xED5C],
- ["8337D132",0xED5D],
- ["8337D133",0xED5E],
- ["8337D134",0xED5F],
- ["8337D135",0xED60],
- ["8337D136",0xED61],
- ["8337D137",0xED62],
- ["8337D138",0xED63],
- ["8337D139",0xED64],
- ["8337D230",0xED65],
- ["8337D231",0xED66],
- ["8337D232",0xED67],
- ["8337D233",0xED68],
- ["8337D234",0xED69],
- ["8337D235",0xED6A],
- ["8337D236",0xED6B],
- ["8337D237",0xED6C],
- ["8337D238",0xED6D],
- ["8337D239",0xED6E],
- ["8337D330",0xED6F],
- ["8337D331",0xED70],
- ["8337D332",0xED71],
- ["8337D333",0xED72],
- ["8337D334",0xED73],
- ["8337D335",0xED74],
- ["8337D336",0xED75],
- ["8337D337",0xED76],
- ["8337D338",0xED77],
- ["8337D339",0xED78],
- ["8337D430",0xED79],
- ["8337D431",0xED7A],
- ["8337D432",0xED7B],
- ["8337D433",0xED7C],
- ["8337D434",0xED7D],
- ["8337D435",0xED7E],
- ["8337D436",0xED7F],
- ["8337D437",0xED80],
- ["8337D438",0xED81],
- ["8337D439",0xED82],
- ["8337D530",0xED83],
- ["8337D531",0xED84],
- ["8337D532",0xED85],
- ["8337D533",0xED86],
- ["8337D534",0xED87],
- ["8337D535",0xED88],
- ["8337D536",0xED89],
- ["8337D537",0xED8A],
- ["8337D538",0xED8B],
- ["8337D539",0xED8C],
- ["8337D630",0xED8D],
- ["8337D631",0xED8E],
- ["8337D632",0xED8F],
- ["8337D633",0xED90],
- ["8337D634",0xED91],
- ["8337D635",0xED92],
- ["8337D636",0xED93],
- ["8337D637",0xED94],
- ["8337D638",0xED95],
- ["8337D639",0xED96],
- ["8337D730",0xED97],
- ["8337D731",0xED98],
- ["8337D732",0xED99],
- ["8337D733",0xED9A],
- ["8337D734",0xED9B],
- ["8337D735",0xED9C],
- ["8337D736",0xED9D],
- ["8337D737",0xED9E],
- ["8337D738",0xED9F],
- ["8337D739",0xEDA0],
- ["8337D830",0xEDA1],
- ["8337D831",0xEDA2],
- ["8337D832",0xEDA3],
- ["8337D833",0xEDA4],
- ["8337D834",0xEDA5],
- ["8337D835",0xEDA6],
- ["8337D836",0xEDA7],
- ["8337D837",0xEDA8],
- ["8337D838",0xEDA9],
- ["8337D839",0xEDAA],
- ["8337D930",0xEDAB],
- ["8337D931",0xEDAC],
- ["8337D932",0xEDAD],
- ["8337D933",0xEDAE],
- ["8337D934",0xEDAF],
- ["8337D935",0xEDB0],
- ["8337D936",0xEDB1],
- ["8337D937",0xEDB2],
- ["8337D938",0xEDB3],
- ["8337D939",0xEDB4],
- ["8337DA30",0xEDB5],
- ["8337DA31",0xEDB6],
- ["8337DA32",0xEDB7],
- ["8337DA33",0xEDB8],
- ["8337DA34",0xEDB9],
- ["8337DA35",0xEDBA],
- ["8337DA36",0xEDBB],
- ["8337DA37",0xEDBC],
- ["8337DA38",0xEDBD],
- ["8337DA39",0xEDBE],
- ["8337DB30",0xEDBF],
- ["8337DB31",0xEDC0],
- ["8337DB32",0xEDC1],
- ["8337DB33",0xEDC2],
- ["8337DB34",0xEDC3],
- ["8337DB35",0xEDC4],
- ["8337DB36",0xEDC5],
- ["8337DB37",0xEDC6],
- ["8337DB38",0xEDC7],
- ["8337DB39",0xEDC8],
- ["8337DC30",0xEDC9],
- ["8337DC31",0xEDCA],
- ["8337DC32",0xEDCB],
- ["8337DC33",0xEDCC],
- ["8337DC34",0xEDCD],
- ["8337DC35",0xEDCE],
- ["8337DC36",0xEDCF],
- ["8337DC37",0xEDD0],
- ["8337DC38",0xEDD1],
- ["8337DC39",0xEDD2],
- ["8337DD30",0xEDD3],
- ["8337DD31",0xEDD4],
- ["8337DD32",0xEDD5],
- ["8337DD33",0xEDD6],
- ["8337DD34",0xEDD7],
- ["8337DD35",0xEDD8],
- ["8337DD36",0xEDD9],
- ["8337DD37",0xEDDA],
- ["8337DD38",0xEDDB],
- ["8337DD39",0xEDDC],
- ["8337DE30",0xEDDD],
- ["8337DE31",0xEDDE],
- ["8337DE32",0xEDDF],
- ["8337DE33",0xEDE0],
- ["8337DE34",0xEDE1],
- ["8337DE35",0xEDE2],
- ["8337DE36",0xEDE3],
- ["8337DE37",0xEDE4],
- ["8337DE38",0xEDE5],
- ["8337DE39",0xEDE6],
- ["8337DF30",0xEDE7],
- ["8337DF31",0xEDE8],
- ["8337DF32",0xEDE9],
- ["8337DF33",0xEDEA],
- ["8337DF34",0xEDEB],
- ["8337DF35",0xEDEC],
- ["8337DF36",0xEDED],
- ["8337DF37",0xEDEE],
- ["8337DF38",0xEDEF],
- ["8337DF39",0xEDF0],
- ["8337E030",0xEDF1],
- ["8337E031",0xEDF2],
- ["8337E032",0xEDF3],
- ["8337E033",0xEDF4],
- ["8337E034",0xEDF5],
- ["8337E035",0xEDF6],
- ["8337E036",0xEDF7],
- ["8337E037",0xEDF8],
- ["8337E038",0xEDF9],
- ["8337E039",0xEDFA],
- ["8337E130",0xEDFB],
- ["8337E131",0xEDFC],
- ["8337E132",0xEDFD],
- ["8337E133",0xEDFE],
- ["8337E134",0xEDFF],
- ["8337E135",0xEE00],
- ["8337E136",0xEE01],
- ["8337E137",0xEE02],
- ["8337E138",0xEE03],
- ["8337E139",0xEE04],
- ["8337E230",0xEE05],
- ["8337E231",0xEE06],
- ["8337E232",0xEE07],
- ["8337E233",0xEE08],
- ["8337E234",0xEE09],
- ["8337E235",0xEE0A],
- ["8337E236",0xEE0B],
- ["8337E237",0xEE0C],
- ["8337E238",0xEE0D],
- ["8337E239",0xEE0E],
- ["8337E330",0xEE0F],
- ["8337E331",0xEE10],
- ["8337E332",0xEE11],
- ["8337E333",0xEE12],
- ["8337E334",0xEE13],
- ["8337E335",0xEE14],
- ["8337E336",0xEE15],
- ["8337E337",0xEE16],
- ["8337E338",0xEE17],
- ["8337E339",0xEE18],
- ["8337E430",0xEE19],
- ["8337E431",0xEE1A],
- ["8337E432",0xEE1B],
- ["8337E433",0xEE1C],
- ["8337E434",0xEE1D],
- ["8337E435",0xEE1E],
- ["8337E436",0xEE1F],
- ["8337E437",0xEE20],
- ["8337E438",0xEE21],
- ["8337E439",0xEE22],
- ["8337E530",0xEE23],
- ["8337E531",0xEE24],
- ["8337E532",0xEE25],
- ["8337E533",0xEE26],
- ["8337E534",0xEE27],
- ["8337E535",0xEE28],
- ["8337E536",0xEE29],
- ["8337E537",0xEE2A],
- ["8337E538",0xEE2B],
- ["8337E539",0xEE2C],
- ["8337E630",0xEE2D],
- ["8337E631",0xEE2E],
- ["8337E632",0xEE2F],
- ["8337E633",0xEE30],
- ["8337E634",0xEE31],
- ["8337E635",0xEE32],
- ["8337E636",0xEE33],
- ["8337E637",0xEE34],
- ["8337E638",0xEE35],
- ["8337E639",0xEE36],
- ["8337E730",0xEE37],
- ["8337E731",0xEE38],
- ["8337E732",0xEE39],
- ["8337E733",0xEE3A],
- ["8337E734",0xEE3B],
- ["8337E735",0xEE3C],
- ["8337E736",0xEE3D],
- ["8337E737",0xEE3E],
- ["8337E738",0xEE3F],
- ["8337E739",0xEE40],
- ["8337E830",0xEE41],
- ["8337E831",0xEE42],
- ["8337E832",0xEE43],
- ["8337E833",0xEE44],
- ["8337E834",0xEE45],
- ["8337E835",0xEE46],
- ["8337E836",0xEE47],
- ["8337E837",0xEE48],
- ["8337E838",0xEE49],
- ["8337E839",0xEE4A],
- ["8337E930",0xEE4B],
- ["8337E931",0xEE4C],
- ["8337E932",0xEE4D],
- ["8337E933",0xEE4E],
- ["8337E934",0xEE4F],
- ["8337E935",0xEE50],
- ["8337E936",0xEE51],
- ["8337E937",0xEE52],
- ["8337E938",0xEE53],
- ["8337E939",0xEE54],
- ["8337EA30",0xEE55],
- ["8337EA31",0xEE56],
- ["8337EA32",0xEE57],
- ["8337EA33",0xEE58],
- ["8337EA34",0xEE59],
- ["8337EA35",0xEE5A],
- ["8337EA36",0xEE5B],
- ["8337EA37",0xEE5C],
- ["8337EA38",0xEE5D],
- ["8337EA39",0xEE5E],
- ["8337EB30",0xEE5F],
- ["8337EB31",0xEE60],
- ["8337EB32",0xEE61],
- ["8337EB33",0xEE62],
- ["8337EB34",0xEE63],
- ["8337EB35",0xEE64],
- ["8337EB36",0xEE65],
- ["8337EB37",0xEE66],
- ["8337EB38",0xEE67],
- ["8337EB39",0xEE68],
- ["8337EC30",0xEE69],
- ["8337EC31",0xEE6A],
- ["8337EC32",0xEE6B],
- ["8337EC33",0xEE6C],
- ["8337EC34",0xEE6D],
- ["8337EC35",0xEE6E],
- ["8337EC36",0xEE6F],
- ["8337EC37",0xEE70],
- ["8337EC38",0xEE71],
- ["8337EC39",0xEE72],
- ["8337ED30",0xEE73],
- ["8337ED31",0xEE74],
- ["8337ED32",0xEE75],
- ["8337ED33",0xEE76],
- ["8337ED34",0xEE77],
- ["8337ED35",0xEE78],
- ["8337ED36",0xEE79],
- ["8337ED37",0xEE7A],
- ["8337ED38",0xEE7B],
- ["8337ED39",0xEE7C],
- ["8337EE30",0xEE7D],
- ["8337EE31",0xEE7E],
- ["8337EE32",0xEE7F],
- ["8337EE33",0xEE80],
- ["8337EE34",0xEE81],
- ["8337EE35",0xEE82],
- ["8337EE36",0xEE83],
- ["8337EE37",0xEE84],
- ["8337EE38",0xEE85],
- ["8337EE39",0xEE86],
- ["8337EF30",0xEE87],
- ["8337EF31",0xEE88],
- ["8337EF32",0xEE89],
- ["8337EF33",0xEE8A],
- ["8337EF34",0xEE8B],
- ["8337EF35",0xEE8C],
- ["8337EF36",0xEE8D],
- ["8337EF37",0xEE8E],
- ["8337EF38",0xEE8F],
- ["8337EF39",0xEE90],
- ["8337F030",0xEE91],
- ["8337F031",0xEE92],
- ["8337F032",0xEE93],
- ["8337F033",0xEE94],
- ["8337F034",0xEE95],
- ["8337F035",0xEE96],
- ["8337F036",0xEE97],
- ["8337F037",0xEE98],
- ["8337F038",0xEE99],
- ["8337F039",0xEE9A],
- ["8337F130",0xEE9B],
- ["8337F131",0xEE9C],
- ["8337F132",0xEE9D],
- ["8337F133",0xEE9E],
- ["8337F134",0xEE9F],
- ["8337F135",0xEEA0],
- ["8337F136",0xEEA1],
- ["8337F137",0xEEA2],
- ["8337F138",0xEEA3],
- ["8337F139",0xEEA4],
- ["8337F230",0xEEA5],
- ["8337F231",0xEEA6],
- ["8337F232",0xEEA7],
- ["8337F233",0xEEA8],
- ["8337F234",0xEEA9],
- ["8337F235",0xEEAA],
- ["8337F236",0xEEAB],
- ["8337F237",0xEEAC],
- ["8337F238",0xEEAD],
- ["8337F239",0xEEAE],
- ["8337F330",0xEEAF],
- ["8337F331",0xEEB0],
- ["8337F332",0xEEB1],
- ["8337F333",0xEEB2],
- ["8337F334",0xEEB3],
- ["8337F335",0xEEB4],
- ["8337F336",0xEEB5],
- ["8337F337",0xEEB6],
- ["8337F338",0xEEB7],
- ["8337F339",0xEEB8],
- ["8337F430",0xEEB9],
- ["8337F431",0xEEBA],
- ["8337F432",0xEEBB],
- ["8337F433",0xEEBC],
- ["8337F434",0xEEBD],
- ["8337F435",0xEEBE],
- ["8337F436",0xEEBF],
- ["8337F437",0xEEC0],
- ["8337F438",0xEEC1],
- ["8337F439",0xEEC2],
- ["8337F530",0xEEC3],
- ["8337F531",0xEEC4],
- ["8337F532",0xEEC5],
- ["8337F533",0xEEC6],
- ["8337F534",0xEEC7],
- ["8337F535",0xEEC8],
- ["8337F536",0xEEC9],
- ["8337F537",0xEECA],
- ["8337F538",0xEECB],
- ["8337F539",0xEECC],
- ["8337F630",0xEECD],
- ["8337F631",0xEECE],
- ["8337F632",0xEECF],
- ["8337F633",0xEED0],
- ["8337F634",0xEED1],
- ["8337F635",0xEED2],
- ["8337F636",0xEED3],
- ["8337F637",0xEED4],
- ["8337F638",0xEED5],
- ["8337F639",0xEED6],
- ["8337F730",0xEED7],
- ["8337F731",0xEED8],
- ["8337F732",0xEED9],
- ["8337F733",0xEEDA],
- ["8337F734",0xEEDB],
- ["8337F735",0xEEDC],
- ["8337F736",0xEEDD],
- ["8337F737",0xEEDE],
- ["8337F738",0xEEDF],
- ["8337F739",0xEEE0],
- ["8337F830",0xEEE1],
- ["8337F831",0xEEE2],
- ["8337F832",0xEEE3],
- ["8337F833",0xEEE4],
- ["8337F834",0xEEE5],
- ["8337F835",0xEEE6],
- ["8337F836",0xEEE7],
- ["8337F837",0xEEE8],
- ["8337F838",0xEEE9],
- ["8337F839",0xEEEA],
- ["8337F930",0xEEEB],
- ["8337F931",0xEEEC],
- ["8337F932",0xEEED],
- ["8337F933",0xEEEE],
- ["8337F934",0xEEEF],
- ["8337F935",0xEEF0],
- ["8337F936",0xEEF1],
- ["8337F937",0xEEF2],
- ["8337F938",0xEEF3],
- ["8337F939",0xEEF4],
- ["8337FA30",0xEEF5],
- ["8337FA31",0xEEF6],
- ["8337FA32",0xEEF7],
- ["8337FA33",0xEEF8],
- ["8337FA34",0xEEF9],
- ["8337FA35",0xEEFA],
- ["8337FA36",0xEEFB],
- ["8337FA37",0xEEFC],
- ["8337FA38",0xEEFD],
- ["8337FA39",0xEEFE],
- ["8337FB30",0xEEFF],
- ["8337FB31",0xEF00],
- ["8337FB32",0xEF01],
- ["8337FB33",0xEF02],
- ["8337FB34",0xEF03],
- ["8337FB35",0xEF04],
- ["8337FB36",0xEF05],
- ["8337FB37",0xEF06],
- ["8337FB38",0xEF07],
- ["8337FB39",0xEF08],
- ["8337FC30",0xEF09],
- ["8337FC31",0xEF0A],
- ["8337FC32",0xEF0B],
- ["8337FC33",0xEF0C],
- ["8337FC34",0xEF0D],
- ["8337FC35",0xEF0E],
- ["8337FC36",0xEF0F],
- ["8337FC37",0xEF10],
- ["8337FC38",0xEF11],
- ["8337FC39",0xEF12],
- ["8337FD30",0xEF13],
- ["8337FD31",0xEF14],
- ["8337FD32",0xEF15],
- ["8337FD33",0xEF16],
- ["8337FD34",0xEF17],
- ["8337FD35",0xEF18],
- ["8337FD36",0xEF19],
- ["8337FD37",0xEF1A],
- ["8337FD38",0xEF1B],
- ["8337FD39",0xEF1C],
- ["8337FE30",0xEF1D],
- ["8337FE31",0xEF1E],
- ["8337FE32",0xEF1F],
- ["8337FE33",0xEF20],
- ["8337FE34",0xEF21],
- ["8337FE35",0xEF22],
- ["8337FE36",0xEF23],
- ["8337FE37",0xEF24],
- ["8337FE38",0xEF25],
- ["8337FE39",0xEF26],
- ["83388130",0xEF27],
- ["83388131",0xEF28],
- ["83388132",0xEF29],
- ["83388133",0xEF2A],
- ["83388134",0xEF2B],
- ["83388135",0xEF2C],
- ["83388136",0xEF2D],
- ["83388137",0xEF2E],
- ["83388138",0xEF2F],
- ["83388139",0xEF30],
- ["83388230",0xEF31],
- ["83388231",0xEF32],
- ["83388232",0xEF33],
- ["83388233",0xEF34],
- ["83388234",0xEF35],
- ["83388235",0xEF36],
- ["83388236",0xEF37],
- ["83388237",0xEF38],
- ["83388238",0xEF39],
- ["83388239",0xEF3A],
- ["83388330",0xEF3B],
- ["83388331",0xEF3C],
- ["83388332",0xEF3D],
- ["83388333",0xEF3E],
- ["83388334",0xEF3F],
- ["83388335",0xEF40],
- ["83388336",0xEF41],
- ["83388337",0xEF42],
- ["83388338",0xEF43],
- ["83388339",0xEF44],
- ["83388430",0xEF45],
- ["83388431",0xEF46],
- ["83388432",0xEF47],
- ["83388433",0xEF48],
- ["83388434",0xEF49],
- ["83388435",0xEF4A],
- ["83388436",0xEF4B],
- ["83388437",0xEF4C],
- ["83388438",0xEF4D],
- ["83388439",0xEF4E],
- ["83388530",0xEF4F],
- ["83388531",0xEF50],
- ["83388532",0xEF51],
- ["83388533",0xEF52],
- ["83388534",0xEF53],
- ["83388535",0xEF54],
- ["83388536",0xEF55],
- ["83388537",0xEF56],
- ["83388538",0xEF57],
- ["83388539",0xEF58],
- ["83388630",0xEF59],
- ["83388631",0xEF5A],
- ["83388632",0xEF5B],
- ["83388633",0xEF5C],
- ["83388634",0xEF5D],
- ["83388635",0xEF5E],
- ["83388636",0xEF5F],
- ["83388637",0xEF60],
- ["83388638",0xEF61],
- ["83388639",0xEF62],
- ["83388730",0xEF63],
- ["83388731",0xEF64],
- ["83388732",0xEF65],
- ["83388733",0xEF66],
- ["83388734",0xEF67],
- ["83388735",0xEF68],
- ["83388736",0xEF69],
- ["83388737",0xEF6A],
- ["83388738",0xEF6B],
- ["83388739",0xEF6C],
- ["83388830",0xEF6D],
- ["83388831",0xEF6E],
- ["83388832",0xEF6F],
- ["83388833",0xEF70],
- ["83388834",0xEF71],
- ["83388835",0xEF72],
- ["83388836",0xEF73],
- ["83388837",0xEF74],
- ["83388838",0xEF75],
- ["83388839",0xEF76],
- ["83388930",0xEF77],
- ["83388931",0xEF78],
- ["83388932",0xEF79],
- ["83388933",0xEF7A],
- ["83388934",0xEF7B],
- ["83388935",0xEF7C],
- ["83388936",0xEF7D],
- ["83388937",0xEF7E],
- ["83388938",0xEF7F],
- ["83388939",0xEF80],
- ["83388A30",0xEF81],
- ["83388A31",0xEF82],
- ["83388A32",0xEF83],
- ["83388A33",0xEF84],
- ["83388A34",0xEF85],
- ["83388A35",0xEF86],
- ["83388A36",0xEF87],
- ["83388A37",0xEF88],
- ["83388A38",0xEF89],
- ["83388A39",0xEF8A],
- ["83388B30",0xEF8B],
- ["83388B31",0xEF8C],
- ["83388B32",0xEF8D],
- ["83388B33",0xEF8E],
- ["83388B34",0xEF8F],
- ["83388B35",0xEF90],
- ["83388B36",0xEF91],
- ["83388B37",0xEF92],
- ["83388B38",0xEF93],
- ["83388B39",0xEF94],
- ["83388C30",0xEF95],
- ["83388C31",0xEF96],
- ["83388C32",0xEF97],
- ["83388C33",0xEF98],
- ["83388C34",0xEF99],
- ["83388C35",0xEF9A],
- ["83388C36",0xEF9B],
- ["83388C37",0xEF9C],
- ["83388C38",0xEF9D],
- ["83388C39",0xEF9E],
- ["83388D30",0xEF9F],
- ["83388D31",0xEFA0],
- ["83388D32",0xEFA1],
- ["83388D33",0xEFA2],
- ["83388D34",0xEFA3],
- ["83388D35",0xEFA4],
- ["83388D36",0xEFA5],
- ["83388D37",0xEFA6],
- ["83388D38",0xEFA7],
- ["83388D39",0xEFA8],
- ["83388E30",0xEFA9],
- ["83388E31",0xEFAA],
- ["83388E32",0xEFAB],
- ["83388E33",0xEFAC],
- ["83388E34",0xEFAD],
- ["83388E35",0xEFAE],
- ["83388E36",0xEFAF],
- ["83388E37",0xEFB0],
- ["83388E38",0xEFB1],
- ["83388E39",0xEFB2],
- ["83388F30",0xEFB3],
- ["83388F31",0xEFB4],
- ["83388F32",0xEFB5],
- ["83388F33",0xEFB6],
- ["83388F34",0xEFB7],
- ["83388F35",0xEFB8],
- ["83388F36",0xEFB9],
- ["83388F37",0xEFBA],
- ["83388F38",0xEFBB],
- ["83388F39",0xEFBC],
- ["83389030",0xEFBD],
- ["83389031",0xEFBE],
- ["83389032",0xEFBF],
- ["83389033",0xEFC0],
- ["83389034",0xEFC1],
- ["83389035",0xEFC2],
- ["83389036",0xEFC3],
- ["83389037",0xEFC4],
- ["83389038",0xEFC5],
- ["83389039",0xEFC6],
- ["83389130",0xEFC7],
- ["83389131",0xEFC8],
- ["83389132",0xEFC9],
- ["83389133",0xEFCA],
- ["83389134",0xEFCB],
- ["83389135",0xEFCC],
- ["83389136",0xEFCD],
- ["83389137",0xEFCE],
- ["83389138",0xEFCF],
- ["83389139",0xEFD0],
- ["83389230",0xEFD1],
- ["83389231",0xEFD2],
- ["83389232",0xEFD3],
- ["83389233",0xEFD4],
- ["83389234",0xEFD5],
- ["83389235",0xEFD6],
- ["83389236",0xEFD7],
- ["83389237",0xEFD8],
- ["83389238",0xEFD9],
- ["83389239",0xEFDA],
- ["83389330",0xEFDB],
- ["83389331",0xEFDC],
- ["83389332",0xEFDD],
- ["83389333",0xEFDE],
- ["83389334",0xEFDF],
- ["83389335",0xEFE0],
- ["83389336",0xEFE1],
- ["83389337",0xEFE2],
- ["83389338",0xEFE3],
- ["83389339",0xEFE4],
- ["83389430",0xEFE5],
- ["83389431",0xEFE6],
- ["83389432",0xEFE7],
- ["83389433",0xEFE8],
- ["83389434",0xEFE9],
- ["83389435",0xEFEA],
- ["83389436",0xEFEB],
- ["83389437",0xEFEC],
- ["83389438",0xEFED],
- ["83389439",0xEFEE],
- ["83389530",0xEFEF],
- ["83389531",0xEFF0],
- ["83389532",0xEFF1],
- ["83389533",0xEFF2],
- ["83389534",0xEFF3],
- ["83389535",0xEFF4],
- ["83389536",0xEFF5],
- ["83389537",0xEFF6],
- ["83389538",0xEFF7],
- ["83389539",0xEFF8],
- ["83389630",0xEFF9],
- ["83389631",0xEFFA],
- ["83389632",0xEFFB],
- ["83389633",0xEFFC],
- ["83389634",0xEFFD],
- ["83389635",0xEFFE],
- ["83389636",0xEFFF],
- ["83389637",0xF000],
- ["83389638",0xF001],
- ["83389639",0xF002],
- ["83389730",0xF003],
- ["83389731",0xF004],
- ["83389732",0xF005],
- ["83389733",0xF006],
- ["83389734",0xF007],
- ["83389735",0xF008],
- ["83389736",0xF009],
- ["83389737",0xF00A],
- ["83389738",0xF00B],
- ["83389739",0xF00C],
- ["83389830",0xF00D],
- ["83389831",0xF00E],
- ["83389832",0xF00F],
- ["83389833",0xF010],
- ["83389834",0xF011],
- ["83389835",0xF012],
- ["83389836",0xF013],
- ["83389837",0xF014],
- ["83389838",0xF015],
- ["83389839",0xF016],
- ["83389930",0xF017],
- ["83389931",0xF018],
- ["83389932",0xF019],
- ["83389933",0xF01A],
- ["83389934",0xF01B],
- ["83389935",0xF01C],
- ["83389936",0xF01D],
- ["83389937",0xF01E],
- ["83389938",0xF01F],
- ["83389939",0xF020],
- ["83389A30",0xF021],
- ["83389A31",0xF022],
- ["83389A32",0xF023],
- ["83389A33",0xF024],
- ["83389A34",0xF025],
- ["83389A35",0xF026],
- ["83389A36",0xF027],
- ["83389A37",0xF028],
- ["83389A38",0xF029],
- ["83389A39",0xF02A],
- ["83389B30",0xF02B],
- ["83389B31",0xF02C],
- ["83389B32",0xF02D],
- ["83389B33",0xF02E],
- ["83389B34",0xF02F],
- ["83389B35",0xF030],
- ["83389B36",0xF031],
- ["83389B37",0xF032],
- ["83389B38",0xF033],
- ["83389B39",0xF034],
- ["83389C30",0xF035],
- ["83389C31",0xF036],
- ["83389C32",0xF037],
- ["83389C33",0xF038],
- ["83389C34",0xF039],
- ["83389C35",0xF03A],
- ["83389C36",0xF03B],
- ["83389C37",0xF03C],
- ["83389C38",0xF03D],
- ["83389C39",0xF03E],
- ["83389D30",0xF03F],
- ["83389D31",0xF040],
- ["83389D32",0xF041],
- ["83389D33",0xF042],
- ["83389D34",0xF043],
- ["83389D35",0xF044],
- ["83389D36",0xF045],
- ["83389D37",0xF046],
- ["83389D38",0xF047],
- ["83389D39",0xF048],
- ["83389E30",0xF049],
- ["83389E31",0xF04A],
- ["83389E32",0xF04B],
- ["83389E33",0xF04C],
- ["83389E34",0xF04D],
- ["83389E35",0xF04E],
- ["83389E36",0xF04F],
- ["83389E37",0xF050],
- ["83389E38",0xF051],
- ["83389E39",0xF052],
- ["83389F30",0xF053],
- ["83389F31",0xF054],
- ["83389F32",0xF055],
- ["83389F33",0xF056],
- ["83389F34",0xF057],
- ["83389F35",0xF058],
- ["83389F36",0xF059],
- ["83389F37",0xF05A],
- ["83389F38",0xF05B],
- ["83389F39",0xF05C],
- ["8338A030",0xF05D],
- ["8338A031",0xF05E],
- ["8338A032",0xF05F],
- ["8338A033",0xF060],
- ["8338A034",0xF061],
- ["8338A035",0xF062],
- ["8338A036",0xF063],
- ["8338A037",0xF064],
- ["8338A038",0xF065],
- ["8338A039",0xF066],
- ["8338A130",0xF067],
- ["8338A131",0xF068],
- ["8338A132",0xF069],
- ["8338A133",0xF06A],
- ["8338A134",0xF06B],
- ["8338A135",0xF06C],
- ["8338A136",0xF06D],
- ["8338A137",0xF06E],
- ["8338A138",0xF06F],
- ["8338A139",0xF070],
- ["8338A230",0xF071],
- ["8338A231",0xF072],
- ["8338A232",0xF073],
- ["8338A233",0xF074],
- ["8338A234",0xF075],
- ["8338A235",0xF076],
- ["8338A236",0xF077],
- ["8338A237",0xF078],
- ["8338A238",0xF079],
- ["8338A239",0xF07A],
- ["8338A330",0xF07B],
- ["8338A331",0xF07C],
- ["8338A332",0xF07D],
- ["8338A333",0xF07E],
- ["8338A334",0xF07F],
- ["8338A335",0xF080],
- ["8338A336",0xF081],
- ["8338A337",0xF082],
- ["8338A338",0xF083],
- ["8338A339",0xF084],
- ["8338A430",0xF085],
- ["8338A431",0xF086],
- ["8338A432",0xF087],
- ["8338A433",0xF088],
- ["8338A434",0xF089],
- ["8338A435",0xF08A],
- ["8338A436",0xF08B],
- ["8338A437",0xF08C],
- ["8338A438",0xF08D],
- ["8338A439",0xF08E],
- ["8338A530",0xF08F],
- ["8338A531",0xF090],
- ["8338A532",0xF091],
- ["8338A533",0xF092],
- ["8338A534",0xF093],
- ["8338A535",0xF094],
- ["8338A536",0xF095],
- ["8338A537",0xF096],
- ["8338A538",0xF097],
- ["8338A539",0xF098],
- ["8338A630",0xF099],
- ["8338A631",0xF09A],
- ["8338A632",0xF09B],
- ["8338A633",0xF09C],
- ["8338A634",0xF09D],
- ["8338A635",0xF09E],
- ["8338A636",0xF09F],
- ["8338A637",0xF0A0],
- ["8338A638",0xF0A1],
- ["8338A639",0xF0A2],
- ["8338A730",0xF0A3],
- ["8338A731",0xF0A4],
- ["8338A732",0xF0A5],
- ["8338A733",0xF0A6],
- ["8338A734",0xF0A7],
- ["8338A735",0xF0A8],
- ["8338A736",0xF0A9],
- ["8338A737",0xF0AA],
- ["8338A738",0xF0AB],
- ["8338A739",0xF0AC],
- ["8338A830",0xF0AD],
- ["8338A831",0xF0AE],
- ["8338A832",0xF0AF],
- ["8338A833",0xF0B0],
- ["8338A834",0xF0B1],
- ["8338A835",0xF0B2],
- ["8338A836",0xF0B3],
- ["8338A837",0xF0B4],
- ["8338A838",0xF0B5],
- ["8338A839",0xF0B6],
- ["8338A930",0xF0B7],
- ["8338A931",0xF0B8],
- ["8338A932",0xF0B9],
- ["8338A933",0xF0BA],
- ["8338A934",0xF0BB],
- ["8338A935",0xF0BC],
- ["8338A936",0xF0BD],
- ["8338A937",0xF0BE],
- ["8338A938",0xF0BF],
- ["8338A939",0xF0C0],
- ["8338AA30",0xF0C1],
- ["8338AA31",0xF0C2],
- ["8338AA32",0xF0C3],
- ["8338AA33",0xF0C4],
- ["8338AA34",0xF0C5],
- ["8338AA35",0xF0C6],
- ["8338AA36",0xF0C7],
- ["8338AA37",0xF0C8],
- ["8338AA38",0xF0C9],
- ["8338AA39",0xF0CA],
- ["8338AB30",0xF0CB],
- ["8338AB31",0xF0CC],
- ["8338AB32",0xF0CD],
- ["8338AB33",0xF0CE],
- ["8338AB34",0xF0CF],
- ["8338AB35",0xF0D0],
- ["8338AB36",0xF0D1],
- ["8338AB37",0xF0D2],
- ["8338AB38",0xF0D3],
- ["8338AB39",0xF0D4],
- ["8338AC30",0xF0D5],
- ["8338AC31",0xF0D6],
- ["8338AC32",0xF0D7],
- ["8338AC33",0xF0D8],
- ["8338AC34",0xF0D9],
- ["8338AC35",0xF0DA],
- ["8338AC36",0xF0DB],
- ["8338AC37",0xF0DC],
- ["8338AC38",0xF0DD],
- ["8338AC39",0xF0DE],
- ["8338AD30",0xF0DF],
- ["8338AD31",0xF0E0],
- ["8338AD32",0xF0E1],
- ["8338AD33",0xF0E2],
- ["8338AD34",0xF0E3],
- ["8338AD35",0xF0E4],
- ["8338AD36",0xF0E5],
- ["8338AD37",0xF0E6],
- ["8338AD38",0xF0E7],
- ["8338AD39",0xF0E8],
- ["8338AE30",0xF0E9],
- ["8338AE31",0xF0EA],
- ["8338AE32",0xF0EB],
- ["8338AE33",0xF0EC],
- ["8338AE34",0xF0ED],
- ["8338AE35",0xF0EE],
- ["8338AE36",0xF0EF],
- ["8338AE37",0xF0F0],
- ["8338AE38",0xF0F1],
- ["8338AE39",0xF0F2],
- ["8338AF30",0xF0F3],
- ["8338AF31",0xF0F4],
- ["8338AF32",0xF0F5],
- ["8338AF33",0xF0F6],
- ["8338AF34",0xF0F7],
- ["8338AF35",0xF0F8],
- ["8338AF36",0xF0F9],
- ["8338AF37",0xF0FA],
- ["8338AF38",0xF0FB],
- ["8338AF39",0xF0FC],
- ["8338B030",0xF0FD],
- ["8338B031",0xF0FE],
- ["8338B032",0xF0FF],
- ["8338B033",0xF100],
- ["8338B034",0xF101],
- ["8338B035",0xF102],
- ["8338B036",0xF103],
- ["8338B037",0xF104],
- ["8338B038",0xF105],
- ["8338B039",0xF106],
- ["8338B130",0xF107],
- ["8338B131",0xF108],
- ["8338B132",0xF109],
- ["8338B133",0xF10A],
- ["8338B134",0xF10B],
- ["8338B135",0xF10C],
- ["8338B136",0xF10D],
- ["8338B137",0xF10E],
- ["8338B138",0xF10F],
- ["8338B139",0xF110],
- ["8338B230",0xF111],
- ["8338B231",0xF112],
- ["8338B232",0xF113],
- ["8338B233",0xF114],
- ["8338B234",0xF115],
- ["8338B235",0xF116],
- ["8338B236",0xF117],
- ["8338B237",0xF118],
- ["8338B238",0xF119],
- ["8338B239",0xF11A],
- ["8338B330",0xF11B],
- ["8338B331",0xF11C],
- ["8338B332",0xF11D],
- ["8338B333",0xF11E],
- ["8338B334",0xF11F],
- ["8338B335",0xF120],
- ["8338B336",0xF121],
- ["8338B337",0xF122],
- ["8338B338",0xF123],
- ["8338B339",0xF124],
- ["8338B430",0xF125],
- ["8338B431",0xF126],
- ["8338B432",0xF127],
- ["8338B433",0xF128],
- ["8338B434",0xF129],
- ["8338B435",0xF12A],
- ["8338B436",0xF12B],
- ["8338B437",0xF12C],
- ["8338B438",0xF12D],
- ["8338B439",0xF12E],
- ["8338B530",0xF12F],
- ["8338B531",0xF130],
- ["8338B532",0xF131],
- ["8338B533",0xF132],
- ["8338B534",0xF133],
- ["8338B535",0xF134],
- ["8338B536",0xF135],
- ["8338B537",0xF136],
- ["8338B538",0xF137],
- ["8338B539",0xF138],
- ["8338B630",0xF139],
- ["8338B631",0xF13A],
- ["8338B632",0xF13B],
- ["8338B633",0xF13C],
- ["8338B634",0xF13D],
- ["8338B635",0xF13E],
- ["8338B636",0xF13F],
- ["8338B637",0xF140],
- ["8338B638",0xF141],
- ["8338B639",0xF142],
- ["8338B730",0xF143],
- ["8338B731",0xF144],
- ["8338B732",0xF145],
- ["8338B733",0xF146],
- ["8338B734",0xF147],
- ["8338B735",0xF148],
- ["8338B736",0xF149],
- ["8338B737",0xF14A],
- ["8338B738",0xF14B],
- ["8338B739",0xF14C],
- ["8338B830",0xF14D],
- ["8338B831",0xF14E],
- ["8338B832",0xF14F],
- ["8338B833",0xF150],
- ["8338B834",0xF151],
- ["8338B835",0xF152],
- ["8338B836",0xF153],
- ["8338B837",0xF154],
- ["8338B838",0xF155],
- ["8338B839",0xF156],
- ["8338B930",0xF157],
- ["8338B931",0xF158],
- ["8338B932",0xF159],
- ["8338B933",0xF15A],
- ["8338B934",0xF15B],
- ["8338B935",0xF15C],
- ["8338B936",0xF15D],
- ["8338B937",0xF15E],
- ["8338B938",0xF15F],
- ["8338B939",0xF160],
- ["8338BA30",0xF161],
- ["8338BA31",0xF162],
- ["8338BA32",0xF163],
- ["8338BA33",0xF164],
- ["8338BA34",0xF165],
- ["8338BA35",0xF166],
- ["8338BA36",0xF167],
- ["8338BA37",0xF168],
- ["8338BA38",0xF169],
- ["8338BA39",0xF16A],
- ["8338BB30",0xF16B],
- ["8338BB31",0xF16C],
- ["8338BB32",0xF16D],
- ["8338BB33",0xF16E],
- ["8338BB34",0xF16F],
- ["8338BB35",0xF170],
- ["8338BB36",0xF171],
- ["8338BB37",0xF172],
- ["8338BB38",0xF173],
- ["8338BB39",0xF174],
- ["8338BC30",0xF175],
- ["8338BC31",0xF176],
- ["8338BC32",0xF177],
- ["8338BC33",0xF178],
- ["8338BC34",0xF179],
- ["8338BC35",0xF17A],
- ["8338BC36",0xF17B],
- ["8338BC37",0xF17C],
- ["8338BC38",0xF17D],
- ["8338BC39",0xF17E],
- ["8338BD30",0xF17F],
- ["8338BD31",0xF180],
- ["8338BD32",0xF181],
- ["8338BD33",0xF182],
- ["8338BD34",0xF183],
- ["8338BD35",0xF184],
- ["8338BD36",0xF185],
- ["8338BD37",0xF186],
- ["8338BD38",0xF187],
- ["8338BD39",0xF188],
- ["8338BE30",0xF189],
- ["8338BE31",0xF18A],
- ["8338BE32",0xF18B],
- ["8338BE33",0xF18C],
- ["8338BE34",0xF18D],
- ["8338BE35",0xF18E],
- ["8338BE36",0xF18F],
- ["8338BE37",0xF190],
- ["8338BE38",0xF191],
- ["8338BE39",0xF192],
- ["8338BF30",0xF193],
- ["8338BF31",0xF194],
- ["8338BF32",0xF195],
- ["8338BF33",0xF196],
- ["8338BF34",0xF197],
- ["8338BF35",0xF198],
- ["8338BF36",0xF199],
- ["8338BF37",0xF19A],
- ["8338BF38",0xF19B],
- ["8338BF39",0xF19C],
- ["8338C030",0xF19D],
- ["8338C031",0xF19E],
- ["8338C032",0xF19F],
- ["8338C033",0xF1A0],
- ["8338C034",0xF1A1],
- ["8338C035",0xF1A2],
- ["8338C036",0xF1A3],
- ["8338C037",0xF1A4],
- ["8338C038",0xF1A5],
- ["8338C039",0xF1A6],
- ["8338C130",0xF1A7],
- ["8338C131",0xF1A8],
- ["8338C132",0xF1A9],
- ["8338C133",0xF1AA],
- ["8338C134",0xF1AB],
- ["8338C135",0xF1AC],
- ["8338C136",0xF1AD],
- ["8338C137",0xF1AE],
- ["8338C138",0xF1AF],
- ["8338C139",0xF1B0],
- ["8338C230",0xF1B1],
- ["8338C231",0xF1B2],
- ["8338C232",0xF1B3],
- ["8338C233",0xF1B4],
- ["8338C234",0xF1B5],
- ["8338C235",0xF1B6],
- ["8338C236",0xF1B7],
- ["8338C237",0xF1B8],
- ["8338C238",0xF1B9],
- ["8338C239",0xF1BA],
- ["8338C330",0xF1BB],
- ["8338C331",0xF1BC],
- ["8338C332",0xF1BD],
- ["8338C333",0xF1BE],
- ["8338C334",0xF1BF],
- ["8338C335",0xF1C0],
- ["8338C336",0xF1C1],
- ["8338C337",0xF1C2],
- ["8338C338",0xF1C3],
- ["8338C339",0xF1C4],
- ["8338C430",0xF1C5],
- ["8338C431",0xF1C6],
- ["8338C432",0xF1C7],
- ["8338C433",0xF1C8],
- ["8338C434",0xF1C9],
- ["8338C435",0xF1CA],
- ["8338C436",0xF1CB],
- ["8338C437",0xF1CC],
- ["8338C438",0xF1CD],
- ["8338C439",0xF1CE],
- ["8338C530",0xF1CF],
- ["8338C531",0xF1D0],
- ["8338C532",0xF1D1],
- ["8338C533",0xF1D2],
- ["8338C534",0xF1D3],
- ["8338C535",0xF1D4],
- ["8338C536",0xF1D5],
- ["8338C537",0xF1D6],
- ["8338C538",0xF1D7],
- ["8338C539",0xF1D8],
- ["8338C630",0xF1D9],
- ["8338C631",0xF1DA],
- ["8338C632",0xF1DB],
- ["8338C633",0xF1DC],
- ["8338C634",0xF1DD],
- ["8338C635",0xF1DE],
- ["8338C636",0xF1DF],
- ["8338C637",0xF1E0],
- ["8338C638",0xF1E1],
- ["8338C639",0xF1E2],
- ["8338C730",0xF1E3],
- ["8338C731",0xF1E4],
- ["8338C732",0xF1E5],
- ["8338C733",0xF1E6],
- ["8338C734",0xF1E7],
- ["8338C735",0xF1E8],
- ["8338C736",0xF1E9],
- ["8338C737",0xF1EA],
- ["8338C738",0xF1EB],
- ["8338C739",0xF1EC],
- ["8338C830",0xF1ED],
- ["8338C831",0xF1EE],
- ["8338C832",0xF1EF],
- ["8338C833",0xF1F0],
- ["8338C834",0xF1F1],
- ["8338C835",0xF1F2],
- ["8338C836",0xF1F3],
- ["8338C837",0xF1F4],
- ["8338C838",0xF1F5],
- ["8338C839",0xF1F6],
- ["8338C930",0xF1F7],
- ["8338C931",0xF1F8],
- ["8338C932",0xF1F9],
- ["8338C933",0xF1FA],
- ["8338C934",0xF1FB],
- ["8338C935",0xF1FC],
- ["8338C936",0xF1FD],
- ["8338C937",0xF1FE],
- ["8338C938",0xF1FF],
- ["8338C939",0xF200],
- ["8338CA30",0xF201],
- ["8338CA31",0xF202],
- ["8338CA32",0xF203],
- ["8338CA33",0xF204],
- ["8338CA34",0xF205],
- ["8338CA35",0xF206],
- ["8338CA36",0xF207],
- ["8338CA37",0xF208],
- ["8338CA38",0xF209],
- ["8338CA39",0xF20A],
- ["8338CB30",0xF20B],
- ["8338CB31",0xF20C],
- ["8338CB32",0xF20D],
- ["8338CB33",0xF20E],
- ["8338CB34",0xF20F],
- ["8338CB35",0xF210],
- ["8338CB36",0xF211],
- ["8338CB37",0xF212],
- ["8338CB38",0xF213],
- ["8338CB39",0xF214],
- ["8338CC30",0xF215],
- ["8338CC31",0xF216],
- ["8338CC32",0xF217],
- ["8338CC33",0xF218],
- ["8338CC34",0xF219],
- ["8338CC35",0xF21A],
- ["8338CC36",0xF21B],
- ["8338CC37",0xF21C],
- ["8338CC38",0xF21D],
- ["8338CC39",0xF21E],
- ["8338CD30",0xF21F],
- ["8338CD31",0xF220],
- ["8338CD32",0xF221],
- ["8338CD33",0xF222],
- ["8338CD34",0xF223],
- ["8338CD35",0xF224],
- ["8338CD36",0xF225],
- ["8338CD37",0xF226],
- ["8338CD38",0xF227],
- ["8338CD39",0xF228],
- ["8338CE30",0xF229],
- ["8338CE31",0xF22A],
- ["8338CE32",0xF22B],
- ["8338CE33",0xF22C],
- ["8338CE34",0xF22D],
- ["8338CE35",0xF22E],
- ["8338CE36",0xF22F],
- ["8338CE37",0xF230],
- ["8338CE38",0xF231],
- ["8338CE39",0xF232],
- ["8338CF30",0xF233],
- ["8338CF31",0xF234],
- ["8338CF32",0xF235],
- ["8338CF33",0xF236],
- ["8338CF34",0xF237],
- ["8338CF35",0xF238],
- ["8338CF36",0xF239],
- ["8338CF37",0xF23A],
- ["8338CF38",0xF23B],
- ["8338CF39",0xF23C],
- ["8338D030",0xF23D],
- ["8338D031",0xF23E],
- ["8338D032",0xF23F],
- ["8338D033",0xF240],
- ["8338D034",0xF241],
- ["8338D035",0xF242],
- ["8338D036",0xF243],
- ["8338D037",0xF244],
- ["8338D038",0xF245],
- ["8338D039",0xF246],
- ["8338D130",0xF247],
- ["8338D131",0xF248],
- ["8338D132",0xF249],
- ["8338D133",0xF24A],
- ["8338D134",0xF24B],
- ["8338D135",0xF24C],
- ["8338D136",0xF24D],
- ["8338D137",0xF24E],
- ["8338D138",0xF24F],
- ["8338D139",0xF250],
- ["8338D230",0xF251],
- ["8338D231",0xF252],
- ["8338D232",0xF253],
- ["8338D233",0xF254],
- ["8338D234",0xF255],
- ["8338D235",0xF256],
- ["8338D236",0xF257],
- ["8338D237",0xF258],
- ["8338D238",0xF259],
- ["8338D239",0xF25A],
- ["8338D330",0xF25B],
- ["8338D331",0xF25C],
- ["8338D332",0xF25D],
- ["8338D333",0xF25E],
- ["8338D334",0xF25F],
- ["8338D335",0xF260],
- ["8338D336",0xF261],
- ["8338D337",0xF262],
- ["8338D338",0xF263],
- ["8338D339",0xF264],
- ["8338D430",0xF265],
- ["8338D431",0xF266],
- ["8338D432",0xF267],
- ["8338D433",0xF268],
- ["8338D434",0xF269],
- ["8338D435",0xF26A],
- ["8338D436",0xF26B],
- ["8338D437",0xF26C],
- ["8338D438",0xF26D],
- ["8338D439",0xF26E],
- ["8338D530",0xF26F],
- ["8338D531",0xF270],
- ["8338D532",0xF271],
- ["8338D533",0xF272],
- ["8338D534",0xF273],
- ["8338D535",0xF274],
- ["8338D536",0xF275],
- ["8338D537",0xF276],
- ["8338D538",0xF277],
- ["8338D539",0xF278],
- ["8338D630",0xF279],
- ["8338D631",0xF27A],
- ["8338D632",0xF27B],
- ["8338D633",0xF27C],
- ["8338D634",0xF27D],
- ["8338D635",0xF27E],
- ["8338D636",0xF27F],
- ["8338D637",0xF280],
- ["8338D638",0xF281],
- ["8338D639",0xF282],
- ["8338D730",0xF283],
- ["8338D731",0xF284],
- ["8338D732",0xF285],
- ["8338D733",0xF286],
- ["8338D734",0xF287],
- ["8338D735",0xF288],
- ["8338D736",0xF289],
- ["8338D737",0xF28A],
- ["8338D738",0xF28B],
- ["8338D739",0xF28C],
- ["8338D830",0xF28D],
- ["8338D831",0xF28E],
- ["8338D832",0xF28F],
- ["8338D833",0xF290],
- ["8338D834",0xF291],
- ["8338D835",0xF292],
- ["8338D836",0xF293],
- ["8338D837",0xF294],
- ["8338D838",0xF295],
- ["8338D839",0xF296],
- ["8338D930",0xF297],
- ["8338D931",0xF298],
- ["8338D932",0xF299],
- ["8338D933",0xF29A],
- ["8338D934",0xF29B],
- ["8338D935",0xF29C],
- ["8338D936",0xF29D],
- ["8338D937",0xF29E],
- ["8338D938",0xF29F],
- ["8338D939",0xF2A0],
- ["8338DA30",0xF2A1],
- ["8338DA31",0xF2A2],
- ["8338DA32",0xF2A3],
- ["8338DA33",0xF2A4],
- ["8338DA34",0xF2A5],
- ["8338DA35",0xF2A6],
- ["8338DA36",0xF2A7],
- ["8338DA37",0xF2A8],
- ["8338DA38",0xF2A9],
- ["8338DA39",0xF2AA],
- ["8338DB30",0xF2AB],
- ["8338DB31",0xF2AC],
- ["8338DB32",0xF2AD],
- ["8338DB33",0xF2AE],
- ["8338DB34",0xF2AF],
- ["8338DB35",0xF2B0],
- ["8338DB36",0xF2B1],
- ["8338DB37",0xF2B2],
- ["8338DB38",0xF2B3],
- ["8338DB39",0xF2B4],
- ["8338DC30",0xF2B5],
- ["8338DC31",0xF2B6],
- ["8338DC32",0xF2B7],
- ["8338DC33",0xF2B8],
- ["8338DC34",0xF2B9],
- ["8338DC35",0xF2BA],
- ["8338DC36",0xF2BB],
- ["8338DC37",0xF2BC],
- ["8338DC38",0xF2BD],
- ["8338DC39",0xF2BE],
- ["8338DD30",0xF2BF],
- ["8338DD31",0xF2C0],
- ["8338DD32",0xF2C1],
- ["8338DD33",0xF2C2],
- ["8338DD34",0xF2C3],
- ["8338DD35",0xF2C4],
- ["8338DD36",0xF2C5],
- ["8338DD37",0xF2C6],
- ["8338DD38",0xF2C7],
- ["8338DD39",0xF2C8],
- ["8338DE30",0xF2C9],
- ["8338DE31",0xF2CA],
- ["8338DE32",0xF2CB],
- ["8338DE33",0xF2CC],
- ["8338DE34",0xF2CD],
- ["8338DE35",0xF2CE],
- ["8338DE36",0xF2CF],
- ["8338DE37",0xF2D0],
- ["8338DE38",0xF2D1],
- ["8338DE39",0xF2D2],
- ["8338DF30",0xF2D3],
- ["8338DF31",0xF2D4],
- ["8338DF32",0xF2D5],
- ["8338DF33",0xF2D6],
- ["8338DF34",0xF2D7],
- ["8338DF35",0xF2D8],
- ["8338DF36",0xF2D9],
- ["8338DF37",0xF2DA],
- ["8338DF38",0xF2DB],
- ["8338DF39",0xF2DC],
- ["8338E030",0xF2DD],
- ["8338E031",0xF2DE],
- ["8338E032",0xF2DF],
- ["8338E033",0xF2E0],
- ["8338E034",0xF2E1],
- ["8338E035",0xF2E2],
- ["8338E036",0xF2E3],
- ["8338E037",0xF2E4],
- ["8338E038",0xF2E5],
- ["8338E039",0xF2E6],
- ["8338E130",0xF2E7],
- ["8338E131",0xF2E8],
- ["8338E132",0xF2E9],
- ["8338E133",0xF2EA],
- ["8338E134",0xF2EB],
- ["8338E135",0xF2EC],
- ["8338E136",0xF2ED],
- ["8338E137",0xF2EE],
- ["8338E138",0xF2EF],
- ["8338E139",0xF2F0],
- ["8338E230",0xF2F1],
- ["8338E231",0xF2F2],
- ["8338E232",0xF2F3],
- ["8338E233",0xF2F4],
- ["8338E234",0xF2F5],
- ["8338E235",0xF2F6],
- ["8338E236",0xF2F7],
- ["8338E237",0xF2F8],
- ["8338E238",0xF2F9],
- ["8338E239",0xF2FA],
- ["8338E330",0xF2FB],
- ["8338E331",0xF2FC],
- ["8338E332",0xF2FD],
- ["8338E333",0xF2FE],
- ["8338E334",0xF2FF],
- ["8338E335",0xF300],
- ["8338E336",0xF301],
- ["8338E337",0xF302],
- ["8338E338",0xF303],
- ["8338E339",0xF304],
- ["8338E430",0xF305],
- ["8338E431",0xF306],
- ["8338E432",0xF307],
- ["8338E433",0xF308],
- ["8338E434",0xF309],
- ["8338E435",0xF30A],
- ["8338E436",0xF30B],
- ["8338E437",0xF30C],
- ["8338E438",0xF30D],
- ["8338E439",0xF30E],
- ["8338E530",0xF30F],
- ["8338E531",0xF310],
- ["8338E532",0xF311],
- ["8338E533",0xF312],
- ["8338E534",0xF313],
- ["8338E535",0xF314],
- ["8338E536",0xF315],
- ["8338E537",0xF316],
- ["8338E538",0xF317],
- ["8338E539",0xF318],
- ["8338E630",0xF319],
- ["8338E631",0xF31A],
- ["8338E632",0xF31B],
- ["8338E633",0xF31C],
- ["8338E634",0xF31D],
- ["8338E635",0xF31E],
- ["8338E636",0xF31F],
- ["8338E637",0xF320],
- ["8338E638",0xF321],
- ["8338E639",0xF322],
- ["8338E730",0xF323],
- ["8338E731",0xF324],
- ["8338E732",0xF325],
- ["8338E733",0xF326],
- ["8338E734",0xF327],
- ["8338E735",0xF328],
- ["8338E736",0xF329],
- ["8338E737",0xF32A],
- ["8338E738",0xF32B],
- ["8338E739",0xF32C],
- ["8338E830",0xF32D],
- ["8338E831",0xF32E],
- ["8338E832",0xF32F],
- ["8338E833",0xF330],
- ["8338E834",0xF331],
- ["8338E835",0xF332],
- ["8338E836",0xF333],
- ["8338E837",0xF334],
- ["8338E838",0xF335],
- ["8338E839",0xF336],
- ["8338E930",0xF337],
- ["8338E931",0xF338],
- ["8338E932",0xF339],
- ["8338E933",0xF33A],
- ["8338E934",0xF33B],
- ["8338E935",0xF33C],
- ["8338E936",0xF33D],
- ["8338E937",0xF33E],
- ["8338E938",0xF33F],
- ["8338E939",0xF340],
- ["8338EA30",0xF341],
- ["8338EA31",0xF342],
- ["8338EA32",0xF343],
- ["8338EA33",0xF344],
- ["8338EA34",0xF345],
- ["8338EA35",0xF346],
- ["8338EA36",0xF347],
- ["8338EA37",0xF348],
- ["8338EA38",0xF349],
- ["8338EA39",0xF34A],
- ["8338EB30",0xF34B],
- ["8338EB31",0xF34C],
- ["8338EB32",0xF34D],
- ["8338EB33",0xF34E],
- ["8338EB34",0xF34F],
- ["8338EB35",0xF350],
- ["8338EB36",0xF351],
- ["8338EB37",0xF352],
- ["8338EB38",0xF353],
- ["8338EB39",0xF354],
- ["8338EC30",0xF355],
- ["8338EC31",0xF356],
- ["8338EC32",0xF357],
- ["8338EC33",0xF358],
- ["8338EC34",0xF359],
- ["8338EC35",0xF35A],
- ["8338EC36",0xF35B],
- ["8338EC37",0xF35C],
- ["8338EC38",0xF35D],
- ["8338EC39",0xF35E],
- ["8338ED30",0xF35F],
- ["8338ED31",0xF360],
- ["8338ED32",0xF361],
- ["8338ED33",0xF362],
- ["8338ED34",0xF363],
- ["8338ED35",0xF364],
- ["8338ED36",0xF365],
- ["8338ED37",0xF366],
- ["8338ED38",0xF367],
- ["8338ED39",0xF368],
- ["8338EE30",0xF369],
- ["8338EE31",0xF36A],
- ["8338EE32",0xF36B],
- ["8338EE33",0xF36C],
- ["8338EE34",0xF36D],
- ["8338EE35",0xF36E],
- ["8338EE36",0xF36F],
- ["8338EE37",0xF370],
- ["8338EE38",0xF371],
- ["8338EE39",0xF372],
- ["8338EF30",0xF373],
- ["8338EF31",0xF374],
- ["8338EF32",0xF375],
- ["8338EF33",0xF376],
- ["8338EF34",0xF377],
- ["8338EF35",0xF378],
- ["8338EF36",0xF379],
- ["8338EF37",0xF37A],
- ["8338EF38",0xF37B],
- ["8338EF39",0xF37C],
- ["8338F030",0xF37D],
- ["8338F031",0xF37E],
- ["8338F032",0xF37F],
- ["8338F033",0xF380],
- ["8338F034",0xF381],
- ["8338F035",0xF382],
- ["8338F036",0xF383],
- ["8338F037",0xF384],
- ["8338F038",0xF385],
- ["8338F039",0xF386],
- ["8338F130",0xF387],
- ["8338F131",0xF388],
- ["8338F132",0xF389],
- ["8338F133",0xF38A],
- ["8338F134",0xF38B],
- ["8338F135",0xF38C],
- ["8338F136",0xF38D],
- ["8338F137",0xF38E],
- ["8338F138",0xF38F],
- ["8338F139",0xF390],
- ["8338F230",0xF391],
- ["8338F231",0xF392],
- ["8338F232",0xF393],
- ["8338F233",0xF394],
- ["8338F234",0xF395],
- ["8338F235",0xF396],
- ["8338F236",0xF397],
- ["8338F237",0xF398],
- ["8338F238",0xF399],
- ["8338F239",0xF39A],
- ["8338F330",0xF39B],
- ["8338F331",0xF39C],
- ["8338F332",0xF39D],
- ["8338F333",0xF39E],
- ["8338F334",0xF39F],
- ["8338F335",0xF3A0],
- ["8338F336",0xF3A1],
- ["8338F337",0xF3A2],
- ["8338F338",0xF3A3],
- ["8338F339",0xF3A4],
- ["8338F430",0xF3A5],
- ["8338F431",0xF3A6],
- ["8338F432",0xF3A7],
- ["8338F433",0xF3A8],
- ["8338F434",0xF3A9],
- ["8338F435",0xF3AA],
- ["8338F436",0xF3AB],
- ["8338F437",0xF3AC],
- ["8338F438",0xF3AD],
- ["8338F439",0xF3AE],
- ["8338F530",0xF3AF],
- ["8338F531",0xF3B0],
- ["8338F532",0xF3B1],
- ["8338F533",0xF3B2],
- ["8338F534",0xF3B3],
- ["8338F535",0xF3B4],
- ["8338F536",0xF3B5],
- ["8338F537",0xF3B6],
- ["8338F538",0xF3B7],
- ["8338F539",0xF3B8],
- ["8338F630",0xF3B9],
- ["8338F631",0xF3BA],
- ["8338F632",0xF3BB],
- ["8338F633",0xF3BC],
- ["8338F634",0xF3BD],
- ["8338F635",0xF3BE],
- ["8338F636",0xF3BF],
- ["8338F637",0xF3C0],
- ["8338F638",0xF3C1],
- ["8338F639",0xF3C2],
- ["8338F730",0xF3C3],
- ["8338F731",0xF3C4],
- ["8338F732",0xF3C5],
- ["8338F733",0xF3C6],
- ["8338F734",0xF3C7],
- ["8338F735",0xF3C8],
- ["8338F736",0xF3C9],
- ["8338F737",0xF3CA],
- ["8338F738",0xF3CB],
- ["8338F739",0xF3CC],
- ["8338F830",0xF3CD],
- ["8338F831",0xF3CE],
- ["8338F832",0xF3CF],
- ["8338F833",0xF3D0],
- ["8338F834",0xF3D1],
- ["8338F835",0xF3D2],
- ["8338F836",0xF3D3],
- ["8338F837",0xF3D4],
- ["8338F838",0xF3D5],
- ["8338F839",0xF3D6],
- ["8338F930",0xF3D7],
- ["8338F931",0xF3D8],
- ["8338F932",0xF3D9],
- ["8338F933",0xF3DA],
- ["8338F934",0xF3DB],
- ["8338F935",0xF3DC],
- ["8338F936",0xF3DD],
- ["8338F937",0xF3DE],
- ["8338F938",0xF3DF],
- ["8338F939",0xF3E0],
- ["8338FA30",0xF3E1],
- ["8338FA31",0xF3E2],
- ["8338FA32",0xF3E3],
- ["8338FA33",0xF3E4],
- ["8338FA34",0xF3E5],
- ["8338FA35",0xF3E6],
- ["8338FA36",0xF3E7],
- ["8338FA37",0xF3E8],
- ["8338FA38",0xF3E9],
- ["8338FA39",0xF3EA],
- ["8338FB30",0xF3EB],
- ["8338FB31",0xF3EC],
- ["8338FB32",0xF3ED],
- ["8338FB33",0xF3EE],
- ["8338FB34",0xF3EF],
- ["8338FB35",0xF3F0],
- ["8338FB36",0xF3F1],
- ["8338FB37",0xF3F2],
- ["8338FB38",0xF3F3],
- ["8338FB39",0xF3F4],
- ["8338FC30",0xF3F5],
- ["8338FC31",0xF3F6],
- ["8338FC32",0xF3F7],
- ["8338FC33",0xF3F8],
- ["8338FC34",0xF3F9],
- ["8338FC35",0xF3FA],
- ["8338FC36",0xF3FB],
- ["8338FC37",0xF3FC],
- ["8338FC38",0xF3FD],
- ["8338FC39",0xF3FE],
- ["8338FD30",0xF3FF],
- ["8338FD31",0xF400],
- ["8338FD32",0xF401],
- ["8338FD33",0xF402],
- ["8338FD34",0xF403],
- ["8338FD35",0xF404],
- ["8338FD36",0xF405],
- ["8338FD37",0xF406],
- ["8338FD38",0xF407],
- ["8338FD39",0xF408],
- ["8338FE30",0xF409],
- ["8338FE31",0xF40A],
- ["8338FE32",0xF40B],
- ["8338FE33",0xF40C],
- ["8338FE34",0xF40D],
- ["8338FE35",0xF40E],
- ["8338FE36",0xF40F],
- ["8338FE37",0xF410],
- ["8338FE38",0xF411],
- ["8338FE39",0xF412],
- ["83398130",0xF413],
- ["83398131",0xF414],
- ["83398132",0xF415],
- ["83398133",0xF416],
- ["83398134",0xF417],
- ["83398135",0xF418],
- ["83398136",0xF419],
- ["83398137",0xF41A],
- ["83398138",0xF41B],
- ["83398139",0xF41C],
- ["83398230",0xF41D],
- ["83398231",0xF41E],
- ["83398232",0xF41F],
- ["83398233",0xF420],
- ["83398234",0xF421],
- ["83398235",0xF422],
- ["83398236",0xF423],
- ["83398237",0xF424],
- ["83398238",0xF425],
- ["83398239",0xF426],
- ["83398330",0xF427],
- ["83398331",0xF428],
- ["83398332",0xF429],
- ["83398333",0xF42A],
- ["83398334",0xF42B],
- ["83398335",0xF42C],
- ["83398336",0xF42D],
- ["83398337",0xF42E],
- ["83398338",0xF42F],
- ["83398339",0xF430],
- ["83398430",0xF431],
- ["83398431",0xF432],
- ["83398432",0xF433],
- ["83398433",0xF434],
- ["83398434",0xF435],
- ["83398435",0xF436],
- ["83398436",0xF437],
- ["83398437",0xF438],
- ["83398438",0xF439],
- ["83398439",0xF43A],
- ["83398530",0xF43B],
- ["83398531",0xF43C],
- ["83398532",0xF43D],
- ["83398533",0xF43E],
- ["83398534",0xF43F],
- ["83398535",0xF440],
- ["83398536",0xF441],
- ["83398537",0xF442],
- ["83398538",0xF443],
- ["83398539",0xF444],
- ["83398630",0xF445],
- ["83398631",0xF446],
- ["83398632",0xF447],
- ["83398633",0xF448],
- ["83398634",0xF449],
- ["83398635",0xF44A],
- ["83398636",0xF44B],
- ["83398637",0xF44C],
- ["83398638",0xF44D],
- ["83398639",0xF44E],
- ["83398730",0xF44F],
- ["83398731",0xF450],
- ["83398732",0xF451],
- ["83398733",0xF452],
- ["83398734",0xF453],
- ["83398735",0xF454],
- ["83398736",0xF455],
- ["83398737",0xF456],
- ["83398738",0xF457],
- ["83398739",0xF458],
- ["83398830",0xF459],
- ["83398831",0xF45A],
- ["83398832",0xF45B],
- ["83398833",0xF45C],
- ["83398834",0xF45D],
- ["83398835",0xF45E],
- ["83398836",0xF45F],
- ["83398837",0xF460],
- ["83398838",0xF461],
- ["83398839",0xF462],
- ["83398930",0xF463],
- ["83398931",0xF464],
- ["83398932",0xF465],
- ["83398933",0xF466],
- ["83398934",0xF467],
- ["83398935",0xF468],
- ["83398936",0xF469],
- ["83398937",0xF46A],
- ["83398938",0xF46B],
- ["83398939",0xF46C],
- ["83398A30",0xF46D],
- ["83398A31",0xF46E],
- ["83398A32",0xF46F],
- ["83398A33",0xF470],
- ["83398A34",0xF471],
- ["83398A35",0xF472],
- ["83398A36",0xF473],
- ["83398A37",0xF474],
- ["83398A38",0xF475],
- ["83398A39",0xF476],
- ["83398B30",0xF477],
- ["83398B31",0xF478],
- ["83398B32",0xF479],
- ["83398B33",0xF47A],
- ["83398B34",0xF47B],
- ["83398B35",0xF47C],
- ["83398B36",0xF47D],
- ["83398B37",0xF47E],
- ["83398B38",0xF47F],
- ["83398B39",0xF480],
- ["83398C30",0xF481],
- ["83398C31",0xF482],
- ["83398C32",0xF483],
- ["83398C33",0xF484],
- ["83398C34",0xF485],
- ["83398C35",0xF486],
- ["83398C36",0xF487],
- ["83398C37",0xF488],
- ["83398C38",0xF489],
- ["83398C39",0xF48A],
- ["83398D30",0xF48B],
- ["83398D31",0xF48C],
- ["83398D32",0xF48D],
- ["83398D33",0xF48E],
- ["83398D34",0xF48F],
- ["83398D35",0xF490],
- ["83398D36",0xF491],
- ["83398D37",0xF492],
- ["83398D38",0xF493],
- ["83398D39",0xF494],
- ["83398E30",0xF495],
- ["83398E31",0xF496],
- ["83398E32",0xF497],
- ["83398E33",0xF498],
- ["83398E34",0xF499],
- ["83398E35",0xF49A],
- ["83398E36",0xF49B],
- ["83398E37",0xF49C],
- ["83398E38",0xF49D],
- ["83398E39",0xF49E],
- ["83398F30",0xF49F],
- ["83398F31",0xF4A0],
- ["83398F32",0xF4A1],
- ["83398F33",0xF4A2],
- ["83398F34",0xF4A3],
- ["83398F35",0xF4A4],
- ["83398F36",0xF4A5],
- ["83398F37",0xF4A6],
- ["83398F38",0xF4A7],
- ["83398F39",0xF4A8],
- ["83399030",0xF4A9],
- ["83399031",0xF4AA],
- ["83399032",0xF4AB],
- ["83399033",0xF4AC],
- ["83399034",0xF4AD],
- ["83399035",0xF4AE],
- ["83399036",0xF4AF],
- ["83399037",0xF4B0],
- ["83399038",0xF4B1],
- ["83399039",0xF4B2],
- ["83399130",0xF4B3],
- ["83399131",0xF4B4],
- ["83399132",0xF4B5],
- ["83399133",0xF4B6],
- ["83399134",0xF4B7],
- ["83399135",0xF4B8],
- ["83399136",0xF4B9],
- ["83399137",0xF4BA],
- ["83399138",0xF4BB],
- ["83399139",0xF4BC],
- ["83399230",0xF4BD],
- ["83399231",0xF4BE],
- ["83399232",0xF4BF],
- ["83399233",0xF4C0],
- ["83399234",0xF4C1],
- ["83399235",0xF4C2],
- ["83399236",0xF4C3],
- ["83399237",0xF4C4],
- ["83399238",0xF4C5],
- ["83399239",0xF4C6],
- ["83399330",0xF4C7],
- ["83399331",0xF4C8],
- ["83399332",0xF4C9],
- ["83399333",0xF4CA],
- ["83399334",0xF4CB],
- ["83399335",0xF4CC],
- ["83399336",0xF4CD],
- ["83399337",0xF4CE],
- ["83399338",0xF4CF],
- ["83399339",0xF4D0],
- ["83399430",0xF4D1],
- ["83399431",0xF4D2],
- ["83399432",0xF4D3],
- ["83399433",0xF4D4],
- ["83399434",0xF4D5],
- ["83399435",0xF4D6],
- ["83399436",0xF4D7],
- ["83399437",0xF4D8],
- ["83399438",0xF4D9],
- ["83399439",0xF4DA],
- ["83399530",0xF4DB],
- ["83399531",0xF4DC],
- ["83399532",0xF4DD],
- ["83399533",0xF4DE],
- ["83399534",0xF4DF],
- ["83399535",0xF4E0],
- ["83399536",0xF4E1],
- ["83399537",0xF4E2],
- ["83399538",0xF4E3],
- ["83399539",0xF4E4],
- ["83399630",0xF4E5],
- ["83399631",0xF4E6],
- ["83399632",0xF4E7],
- ["83399633",0xF4E8],
- ["83399634",0xF4E9],
- ["83399635",0xF4EA],
- ["83399636",0xF4EB],
- ["83399637",0xF4EC],
- ["83399638",0xF4ED],
- ["83399639",0xF4EE],
- ["83399730",0xF4EF],
- ["83399731",0xF4F0],
- ["83399732",0xF4F1],
- ["83399733",0xF4F2],
- ["83399734",0xF4F3],
- ["83399735",0xF4F4],
- ["83399736",0xF4F5],
- ["83399737",0xF4F6],
- ["83399738",0xF4F7],
- ["83399739",0xF4F8],
- ["83399830",0xF4F9],
- ["83399831",0xF4FA],
- ["83399832",0xF4FB],
- ["83399833",0xF4FC],
- ["83399834",0xF4FD],
- ["83399835",0xF4FE],
- ["83399836",0xF4FF],
- ["83399837",0xF500],
- ["83399838",0xF501],
- ["83399839",0xF502],
- ["83399930",0xF503],
- ["83399931",0xF504],
- ["83399932",0xF505],
- ["83399933",0xF506],
- ["83399934",0xF507],
- ["83399935",0xF508],
- ["83399936",0xF509],
- ["83399937",0xF50A],
- ["83399938",0xF50B],
- ["83399939",0xF50C],
- ["83399A30",0xF50D],
- ["83399A31",0xF50E],
- ["83399A32",0xF50F],
- ["83399A33",0xF510],
- ["83399A34",0xF511],
- ["83399A35",0xF512],
- ["83399A36",0xF513],
- ["83399A37",0xF514],
- ["83399A38",0xF515],
- ["83399A39",0xF516],
- ["83399B30",0xF517],
- ["83399B31",0xF518],
- ["83399B32",0xF519],
- ["83399B33",0xF51A],
- ["83399B34",0xF51B],
- ["83399B35",0xF51C],
- ["83399B36",0xF51D],
- ["83399B37",0xF51E],
- ["83399B38",0xF51F],
- ["83399B39",0xF520],
- ["83399C30",0xF521],
- ["83399C31",0xF522],
- ["83399C32",0xF523],
- ["83399C33",0xF524],
- ["83399C34",0xF525],
- ["83399C35",0xF526],
- ["83399C36",0xF527],
- ["83399C37",0xF528],
- ["83399C38",0xF529],
- ["83399C39",0xF52A],
- ["83399D30",0xF52B],
- ["83399D31",0xF52C],
- ["83399D32",0xF52D],
- ["83399D33",0xF52E],
- ["83399D34",0xF52F],
- ["83399D35",0xF530],
- ["83399D36",0xF531],
- ["83399D37",0xF532],
- ["83399D38",0xF533],
- ["83399D39",0xF534],
- ["83399E30",0xF535],
- ["83399E31",0xF536],
- ["83399E32",0xF537],
- ["83399E33",0xF538],
- ["83399E34",0xF539],
- ["83399E35",0xF53A],
- ["83399E36",0xF53B],
- ["83399E37",0xF53C],
- ["83399E38",0xF53D],
- ["83399E39",0xF53E],
- ["83399F30",0xF53F],
- ["83399F31",0xF540],
- ["83399F32",0xF541],
- ["83399F33",0xF542],
- ["83399F34",0xF543],
- ["83399F35",0xF544],
- ["83399F36",0xF545],
- ["83399F37",0xF546],
- ["83399F38",0xF547],
- ["83399F39",0xF548],
- ["8339A030",0xF549],
- ["8339A031",0xF54A],
- ["8339A032",0xF54B],
- ["8339A033",0xF54C],
- ["8339A034",0xF54D],
- ["8339A035",0xF54E],
- ["8339A036",0xF54F],
- ["8339A037",0xF550],
- ["8339A038",0xF551],
- ["8339A039",0xF552],
- ["8339A130",0xF553],
- ["8339A131",0xF554],
- ["8339A132",0xF555],
- ["8339A133",0xF556],
- ["8339A134",0xF557],
- ["8339A135",0xF558],
- ["8339A136",0xF559],
- ["8339A137",0xF55A],
- ["8339A138",0xF55B],
- ["8339A139",0xF55C],
- ["8339A230",0xF55D],
- ["8339A231",0xF55E],
- ["8339A232",0xF55F],
- ["8339A233",0xF560],
- ["8339A234",0xF561],
- ["8339A235",0xF562],
- ["8339A236",0xF563],
- ["8339A237",0xF564],
- ["8339A238",0xF565],
- ["8339A239",0xF566],
- ["8339A330",0xF567],
- ["8339A331",0xF568],
- ["8339A332",0xF569],
- ["8339A333",0xF56A],
- ["8339A334",0xF56B],
- ["8339A335",0xF56C],
- ["8339A336",0xF56D],
- ["8339A337",0xF56E],
- ["8339A338",0xF56F],
- ["8339A339",0xF570],
- ["8339A430",0xF571],
- ["8339A431",0xF572],
- ["8339A432",0xF573],
- ["8339A433",0xF574],
- ["8339A434",0xF575],
- ["8339A435",0xF576],
- ["8339A436",0xF577],
- ["8339A437",0xF578],
- ["8339A438",0xF579],
- ["8339A439",0xF57A],
- ["8339A530",0xF57B],
- ["8339A531",0xF57C],
- ["8339A532",0xF57D],
- ["8339A533",0xF57E],
- ["8339A534",0xF57F],
- ["8339A535",0xF580],
- ["8339A536",0xF581],
- ["8339A537",0xF582],
- ["8339A538",0xF583],
- ["8339A539",0xF584],
- ["8339A630",0xF585],
- ["8339A631",0xF586],
- ["8339A632",0xF587],
- ["8339A633",0xF588],
- ["8339A634",0xF589],
- ["8339A635",0xF58A],
- ["8339A636",0xF58B],
- ["8339A637",0xF58C],
- ["8339A638",0xF58D],
- ["8339A639",0xF58E],
- ["8339A730",0xF58F],
- ["8339A731",0xF590],
- ["8339A732",0xF591],
- ["8339A733",0xF592],
- ["8339A734",0xF593],
- ["8339A735",0xF594],
- ["8339A736",0xF595],
- ["8339A737",0xF596],
- ["8339A738",0xF597],
- ["8339A739",0xF598],
- ["8339A830",0xF599],
- ["8339A831",0xF59A],
- ["8339A832",0xF59B],
- ["8339A833",0xF59C],
- ["8339A834",0xF59D],
- ["8339A835",0xF59E],
- ["8339A836",0xF59F],
- ["8339A837",0xF5A0],
- ["8339A838",0xF5A1],
- ["8339A839",0xF5A2],
- ["8339A930",0xF5A3],
- ["8339A931",0xF5A4],
- ["8339A932",0xF5A5],
- ["8339A933",0xF5A6],
- ["8339A934",0xF5A7],
- ["8339A935",0xF5A8],
- ["8339A936",0xF5A9],
- ["8339A937",0xF5AA],
- ["8339A938",0xF5AB],
- ["8339A939",0xF5AC],
- ["8339AA30",0xF5AD],
- ["8339AA31",0xF5AE],
- ["8339AA32",0xF5AF],
- ["8339AA33",0xF5B0],
- ["8339AA34",0xF5B1],
- ["8339AA35",0xF5B2],
- ["8339AA36",0xF5B3],
- ["8339AA37",0xF5B4],
- ["8339AA38",0xF5B5],
- ["8339AA39",0xF5B6],
- ["8339AB30",0xF5B7],
- ["8339AB31",0xF5B8],
- ["8339AB32",0xF5B9],
- ["8339AB33",0xF5BA],
- ["8339AB34",0xF5BB],
- ["8339AB35",0xF5BC],
- ["8339AB36",0xF5BD],
- ["8339AB37",0xF5BE],
- ["8339AB38",0xF5BF],
- ["8339AB39",0xF5C0],
- ["8339AC30",0xF5C1],
- ["8339AC31",0xF5C2],
- ["8339AC32",0xF5C3],
- ["8339AC33",0xF5C4],
- ["8339AC34",0xF5C5],
- ["8339AC35",0xF5C6],
- ["8339AC36",0xF5C7],
- ["8339AC37",0xF5C8],
- ["8339AC38",0xF5C9],
- ["8339AC39",0xF5CA],
- ["8339AD30",0xF5CB],
- ["8339AD31",0xF5CC],
- ["8339AD32",0xF5CD],
- ["8339AD33",0xF5CE],
- ["8339AD34",0xF5CF],
- ["8339AD35",0xF5D0],
- ["8339AD36",0xF5D1],
- ["8339AD37",0xF5D2],
- ["8339AD38",0xF5D3],
- ["8339AD39",0xF5D4],
- ["8339AE30",0xF5D5],
- ["8339AE31",0xF5D6],
- ["8339AE32",0xF5D7],
- ["8339AE33",0xF5D8],
- ["8339AE34",0xF5D9],
- ["8339AE35",0xF5DA],
- ["8339AE36",0xF5DB],
- ["8339AE37",0xF5DC],
- ["8339AE38",0xF5DD],
- ["8339AE39",0xF5DE],
- ["8339AF30",0xF5DF],
- ["8339AF31",0xF5E0],
- ["8339AF32",0xF5E1],
- ["8339AF33",0xF5E2],
- ["8339AF34",0xF5E3],
- ["8339AF35",0xF5E4],
- ["8339AF36",0xF5E5],
- ["8339AF37",0xF5E6],
- ["8339AF38",0xF5E7],
- ["8339AF39",0xF5E8],
- ["8339B030",0xF5E9],
- ["8339B031",0xF5EA],
- ["8339B032",0xF5EB],
- ["8339B033",0xF5EC],
- ["8339B034",0xF5ED],
- ["8339B035",0xF5EE],
- ["8339B036",0xF5EF],
- ["8339B037",0xF5F0],
- ["8339B038",0xF5F1],
- ["8339B039",0xF5F2],
- ["8339B130",0xF5F3],
- ["8339B131",0xF5F4],
- ["8339B132",0xF5F5],
- ["8339B133",0xF5F6],
- ["8339B134",0xF5F7],
- ["8339B135",0xF5F8],
- ["8339B136",0xF5F9],
- ["8339B137",0xF5FA],
- ["8339B138",0xF5FB],
- ["8339B139",0xF5FC],
- ["8339B230",0xF5FD],
- ["8339B231",0xF5FE],
- ["8339B232",0xF5FF],
- ["8339B233",0xF600],
- ["8339B234",0xF601],
- ["8339B235",0xF602],
- ["8339B236",0xF603],
- ["8339B237",0xF604],
- ["8339B238",0xF605],
- ["8339B239",0xF606],
- ["8339B330",0xF607],
- ["8339B331",0xF608],
- ["8339B332",0xF609],
- ["8339B333",0xF60A],
- ["8339B334",0xF60B],
- ["8339B335",0xF60C],
- ["8339B336",0xF60D],
- ["8339B337",0xF60E],
- ["8339B338",0xF60F],
- ["8339B339",0xF610],
- ["8339B430",0xF611],
- ["8339B431",0xF612],
- ["8339B432",0xF613],
- ["8339B433",0xF614],
- ["8339B434",0xF615],
- ["8339B435",0xF616],
- ["8339B436",0xF617],
- ["8339B437",0xF618],
- ["8339B438",0xF619],
- ["8339B439",0xF61A],
- ["8339B530",0xF61B],
- ["8339B531",0xF61C],
- ["8339B532",0xF61D],
- ["8339B533",0xF61E],
- ["8339B534",0xF61F],
- ["8339B535",0xF620],
- ["8339B536",0xF621],
- ["8339B537",0xF622],
- ["8339B538",0xF623],
- ["8339B539",0xF624],
- ["8339B630",0xF625],
- ["8339B631",0xF626],
- ["8339B632",0xF627],
- ["8339B633",0xF628],
- ["8339B634",0xF629],
- ["8339B635",0xF62A],
- ["8339B636",0xF62B],
- ["8339B637",0xF62C],
- ["8339B638",0xF62D],
- ["8339B639",0xF62E],
- ["8339B730",0xF62F],
- ["8339B731",0xF630],
- ["8339B732",0xF631],
- ["8339B733",0xF632],
- ["8339B734",0xF633],
- ["8339B735",0xF634],
- ["8339B736",0xF635],
- ["8339B737",0xF636],
- ["8339B738",0xF637],
- ["8339B739",0xF638],
- ["8339B830",0xF639],
- ["8339B831",0xF63A],
- ["8339B832",0xF63B],
- ["8339B833",0xF63C],
- ["8339B834",0xF63D],
- ["8339B835",0xF63E],
- ["8339B836",0xF63F],
- ["8339B837",0xF640],
- ["8339B838",0xF641],
- ["8339B839",0xF642],
- ["8339B930",0xF643],
- ["8339B931",0xF644],
- ["8339B932",0xF645],
- ["8339B933",0xF646],
- ["8339B934",0xF647],
- ["8339B935",0xF648],
- ["8339B936",0xF649],
- ["8339B937",0xF64A],
- ["8339B938",0xF64B],
- ["8339B939",0xF64C],
- ["8339BA30",0xF64D],
- ["8339BA31",0xF64E],
- ["8339BA32",0xF64F],
- ["8339BA33",0xF650],
- ["8339BA34",0xF651],
- ["8339BA35",0xF652],
- ["8339BA36",0xF653],
- ["8339BA37",0xF654],
- ["8339BA38",0xF655],
- ["8339BA39",0xF656],
- ["8339BB30",0xF657],
- ["8339BB31",0xF658],
- ["8339BB32",0xF659],
- ["8339BB33",0xF65A],
- ["8339BB34",0xF65B],
- ["8339BB35",0xF65C],
- ["8339BB36",0xF65D],
- ["8339BB37",0xF65E],
- ["8339BB38",0xF65F],
- ["8339BB39",0xF660],
- ["8339BC30",0xF661],
- ["8339BC31",0xF662],
- ["8339BC32",0xF663],
- ["8339BC33",0xF664],
- ["8339BC34",0xF665],
- ["8339BC35",0xF666],
- ["8339BC36",0xF667],
- ["8339BC37",0xF668],
- ["8339BC38",0xF669],
- ["8339BC39",0xF66A],
- ["8339BD30",0xF66B],
- ["8339BD31",0xF66C],
- ["8339BD32",0xF66D],
- ["8339BD33",0xF66E],
- ["8339BD34",0xF66F],
- ["8339BD35",0xF670],
- ["8339BD36",0xF671],
- ["8339BD37",0xF672],
- ["8339BD38",0xF673],
- ["8339BD39",0xF674],
- ["8339BE30",0xF675],
- ["8339BE31",0xF676],
- ["8339BE32",0xF677],
- ["8339BE33",0xF678],
- ["8339BE34",0xF679],
- ["8339BE35",0xF67A],
- ["8339BE36",0xF67B],
- ["8339BE37",0xF67C],
- ["8339BE38",0xF67D],
- ["8339BE39",0xF67E],
- ["8339BF30",0xF67F],
- ["8339BF31",0xF680],
- ["8339BF32",0xF681],
- ["8339BF33",0xF682],
- ["8339BF34",0xF683],
- ["8339BF35",0xF684],
- ["8339BF36",0xF685],
- ["8339BF37",0xF686],
- ["8339BF38",0xF687],
- ["8339BF39",0xF688],
- ["8339C030",0xF689],
- ["8339C031",0xF68A],
- ["8339C032",0xF68B],
- ["8339C033",0xF68C],
- ["8339C034",0xF68D],
- ["8339C035",0xF68E],
- ["8339C036",0xF68F],
- ["8339C037",0xF690],
- ["8339C038",0xF691],
- ["8339C039",0xF692],
- ["8339C130",0xF693],
- ["8339C131",0xF694],
- ["8339C132",0xF695],
- ["8339C133",0xF696],
- ["8339C134",0xF697],
- ["8339C135",0xF698],
- ["8339C136",0xF699],
- ["8339C137",0xF69A],
- ["8339C138",0xF69B],
- ["8339C139",0xF69C],
- ["8339C230",0xF69D],
- ["8339C231",0xF69E],
- ["8339C232",0xF69F],
- ["8339C233",0xF6A0],
- ["8339C234",0xF6A1],
- ["8339C235",0xF6A2],
- ["8339C236",0xF6A3],
- ["8339C237",0xF6A4],
- ["8339C238",0xF6A5],
- ["8339C239",0xF6A6],
- ["8339C330",0xF6A7],
- ["8339C331",0xF6A8],
- ["8339C332",0xF6A9],
- ["8339C333",0xF6AA],
- ["8339C334",0xF6AB],
- ["8339C335",0xF6AC],
- ["8339C336",0xF6AD],
- ["8339C337",0xF6AE],
- ["8339C338",0xF6AF],
- ["8339C339",0xF6B0],
- ["8339C430",0xF6B1],
- ["8339C431",0xF6B2],
- ["8339C432",0xF6B3],
- ["8339C433",0xF6B4],
- ["8339C434",0xF6B5],
- ["8339C435",0xF6B6],
- ["8339C436",0xF6B7],
- ["8339C437",0xF6B8],
- ["8339C438",0xF6B9],
- ["8339C439",0xF6BA],
- ["8339C530",0xF6BB],
- ["8339C531",0xF6BC],
- ["8339C532",0xF6BD],
- ["8339C533",0xF6BE],
- ["8339C534",0xF6BF],
- ["8339C535",0xF6C0],
- ["8339C536",0xF6C1],
- ["8339C537",0xF6C2],
- ["8339C538",0xF6C3],
- ["8339C539",0xF6C4],
- ["8339C630",0xF6C5],
- ["8339C631",0xF6C6],
- ["8339C632",0xF6C7],
- ["8339C633",0xF6C8],
- ["8339C634",0xF6C9],
- ["8339C635",0xF6CA],
- ["8339C636",0xF6CB],
- ["8339C637",0xF6CC],
- ["8339C638",0xF6CD],
- ["8339C639",0xF6CE],
- ["8339C730",0xF6CF],
- ["8339C731",0xF6D0],
- ["8339C732",0xF6D1],
- ["8339C733",0xF6D2],
- ["8339C734",0xF6D3],
- ["8339C735",0xF6D4],
- ["8339C736",0xF6D5],
- ["8339C737",0xF6D6],
- ["8339C738",0xF6D7],
- ["8339C739",0xF6D8],
- ["8339C830",0xF6D9],
- ["8339C831",0xF6DA],
- ["8339C832",0xF6DB],
- ["8339C833",0xF6DC],
- ["8339C834",0xF6DD],
- ["8339C835",0xF6DE],
- ["8339C836",0xF6DF],
- ["8339C837",0xF6E0],
- ["8339C838",0xF6E1],
- ["8339C839",0xF6E2],
- ["8339C930",0xF6E3],
- ["8339C931",0xF6E4],
- ["8339C932",0xF6E5],
- ["8339C933",0xF6E6],
- ["8339C934",0xF6E7],
- ["8339C935",0xF6E8],
- ["8339C936",0xF6E9],
- ["8339C937",0xF6EA],
- ["8339C938",0xF6EB],
- ["8339C939",0xF6EC],
- ["8339CA30",0xF6ED],
- ["8339CA31",0xF6EE],
- ["8339CA32",0xF6EF],
- ["8339CA33",0xF6F0],
- ["8339CA34",0xF6F1],
- ["8339CA35",0xF6F2],
- ["8339CA36",0xF6F3],
- ["8339CA37",0xF6F4],
- ["8339CA38",0xF6F5],
- ["8339CA39",0xF6F6],
- ["8339CB30",0xF6F7],
- ["8339CB31",0xF6F8],
- ["8339CB32",0xF6F9],
- ["8339CB33",0xF6FA],
- ["8339CB34",0xF6FB],
- ["8339CB35",0xF6FC],
- ["8339CB36",0xF6FD],
- ["8339CB37",0xF6FE],
- ["8339CB38",0xF6FF],
- ["8339CB39",0xF700],
- ["8339CC30",0xF701],
- ["8339CC31",0xF702],
- ["8339CC32",0xF703],
- ["8339CC33",0xF704],
- ["8339CC34",0xF705],
- ["8339CC35",0xF706],
- ["8339CC36",0xF707],
- ["8339CC37",0xF708],
- ["8339CC38",0xF709],
- ["8339CC39",0xF70A],
- ["8339CD30",0xF70B],
- ["8339CD31",0xF70C],
- ["8339CD32",0xF70D],
- ["8339CD33",0xF70E],
- ["8339CD34",0xF70F],
- ["8339CD35",0xF710],
- ["8339CD36",0xF711],
- ["8339CD37",0xF712],
- ["8339CD38",0xF713],
- ["8339CD39",0xF714],
- ["8339CE30",0xF715],
- ["8339CE31",0xF716],
- ["8339CE32",0xF717],
- ["8339CE33",0xF718],
- ["8339CE34",0xF719],
- ["8339CE35",0xF71A],
- ["8339CE36",0xF71B],
- ["8339CE37",0xF71C],
- ["8339CE38",0xF71D],
- ["8339CE39",0xF71E],
- ["8339CF30",0xF71F],
- ["8339CF31",0xF720],
- ["8339CF32",0xF721],
- ["8339CF33",0xF722],
- ["8339CF34",0xF723],
- ["8339CF35",0xF724],
- ["8339CF36",0xF725],
- ["8339CF37",0xF726],
- ["8339CF38",0xF727],
- ["8339CF39",0xF728],
- ["8339D030",0xF729],
- ["8339D031",0xF72A],
- ["8339D032",0xF72B],
- ["8339D033",0xF72C],
- ["8339D034",0xF72D],
- ["8339D035",0xF72E],
- ["8339D036",0xF72F],
- ["8339D037",0xF730],
- ["8339D038",0xF731],
- ["8339D039",0xF732],
- ["8339D130",0xF733],
- ["8339D131",0xF734],
- ["8339D132",0xF735],
- ["8339D133",0xF736],
- ["8339D134",0xF737],
- ["8339D135",0xF738],
- ["8339D136",0xF739],
- ["8339D137",0xF73A],
- ["8339D138",0xF73B],
- ["8339D139",0xF73C],
- ["8339D230",0xF73D],
- ["8339D231",0xF73E],
- ["8339D232",0xF73F],
- ["8339D233",0xF740],
- ["8339D234",0xF741],
- ["8339D235",0xF742],
- ["8339D236",0xF743],
- ["8339D237",0xF744],
- ["8339D238",0xF745],
- ["8339D239",0xF746],
- ["8339D330",0xF747],
- ["8339D331",0xF748],
- ["8339D332",0xF749],
- ["8339D333",0xF74A],
- ["8339D334",0xF74B],
- ["8339D335",0xF74C],
- ["8339D336",0xF74D],
- ["8339D337",0xF74E],
- ["8339D338",0xF74F],
- ["8339D339",0xF750],
- ["8339D430",0xF751],
- ["8339D431",0xF752],
- ["8339D432",0xF753],
- ["8339D433",0xF754],
- ["8339D434",0xF755],
- ["8339D435",0xF756],
- ["8339D436",0xF757],
- ["8339D437",0xF758],
- ["8339D438",0xF759],
- ["8339D439",0xF75A],
- ["8339D530",0xF75B],
- ["8339D531",0xF75C],
- ["8339D532",0xF75D],
- ["8339D533",0xF75E],
- ["8339D534",0xF75F],
- ["8339D535",0xF760],
- ["8339D536",0xF761],
- ["8339D537",0xF762],
- ["8339D538",0xF763],
- ["8339D539",0xF764],
- ["8339D630",0xF765],
- ["8339D631",0xF766],
- ["8339D632",0xF767],
- ["8339D633",0xF768],
- ["8339D634",0xF769],
- ["8339D635",0xF76A],
- ["8339D636",0xF76B],
- ["8339D637",0xF76C],
- ["8339D638",0xF76D],
- ["8339D639",0xF76E],
- ["8339D730",0xF76F],
- ["8339D731",0xF770],
- ["8339D732",0xF771],
- ["8339D733",0xF772],
- ["8339D734",0xF773],
- ["8339D735",0xF774],
- ["8339D736",0xF775],
- ["8339D737",0xF776],
- ["8339D738",0xF777],
- ["8339D739",0xF778],
- ["8339D830",0xF779],
- ["8339D831",0xF77A],
- ["8339D832",0xF77B],
- ["8339D833",0xF77C],
- ["8339D834",0xF77D],
- ["8339D835",0xF77E],
- ["8339D836",0xF77F],
- ["8339D837",0xF780],
- ["8339D838",0xF781],
- ["8339D839",0xF782],
- ["8339D930",0xF783],
- ["8339D931",0xF784],
- ["8339D932",0xF785],
- ["8339D933",0xF786],
- ["8339D934",0xF787],
- ["8339D935",0xF788],
- ["8339D936",0xF789],
- ["8339D937",0xF78A],
- ["8339D938",0xF78B],
- ["8339D939",0xF78C],
- ["8339DA30",0xF78D],
- ["8339DA31",0xF78E],
- ["8339DA32",0xF78F],
- ["8339DA33",0xF790],
- ["8339DA34",0xF791],
- ["8339DA35",0xF792],
- ["8339DA36",0xF793],
- ["8339DA37",0xF794],
- ["8339DA38",0xF795],
- ["8339DA39",0xF796],
- ["8339DB30",0xF797],
- ["8339DB31",0xF798],
- ["8339DB32",0xF799],
- ["8339DB33",0xF79A],
- ["8339DB34",0xF79B],
- ["8339DB35",0xF79C],
- ["8339DB36",0xF79D],
- ["8339DB37",0xF79E],
- ["8339DB38",0xF79F],
- ["8339DB39",0xF7A0],
- ["8339DC30",0xF7A1],
- ["8339DC31",0xF7A2],
- ["8339DC32",0xF7A3],
- ["8339DC33",0xF7A4],
- ["8339DC34",0xF7A5],
- ["8339DC35",0xF7A6],
- ["8339DC36",0xF7A7],
- ["8339DC37",0xF7A8],
- ["8339DC38",0xF7A9],
- ["8339DC39",0xF7AA],
- ["8339DD30",0xF7AB],
- ["8339DD31",0xF7AC],
- ["8339DD32",0xF7AD],
- ["8339DD33",0xF7AE],
- ["8339DD34",0xF7AF],
- ["8339DD35",0xF7B0],
- ["8339DD36",0xF7B1],
- ["8339DD37",0xF7B2],
- ["8339DD38",0xF7B3],
- ["8339DD39",0xF7B4],
- ["8339DE30",0xF7B5],
- ["8339DE31",0xF7B6],
- ["8339DE32",0xF7B7],
- ["8339DE33",0xF7B8],
- ["8339DE34",0xF7B9],
- ["8339DE35",0xF7BA],
- ["8339DE36",0xF7BB],
- ["8339DE37",0xF7BC],
- ["8339DE38",0xF7BD],
- ["8339DE39",0xF7BE],
- ["8339DF30",0xF7BF],
- ["8339DF31",0xF7C0],
- ["8339DF32",0xF7C1],
- ["8339DF33",0xF7C2],
- ["8339DF34",0xF7C3],
- ["8339DF35",0xF7C4],
- ["8339DF36",0xF7C5],
- ["8339DF37",0xF7C6],
- ["8339DF38",0xF7C7],
- ["8339DF39",0xF7C8],
- ["8339E030",0xF7C9],
- ["8339E031",0xF7CA],
- ["8339E032",0xF7CB],
- ["8339E033",0xF7CC],
- ["8339E034",0xF7CD],
- ["8339E035",0xF7CE],
- ["8339E036",0xF7CF],
- ["8339E037",0xF7D0],
- ["8339E038",0xF7D1],
- ["8339E039",0xF7D2],
- ["8339E130",0xF7D3],
- ["8339E131",0xF7D4],
- ["8339E132",0xF7D5],
- ["8339E133",0xF7D6],
- ["8339E134",0xF7D7],
- ["8339E135",0xF7D8],
- ["8339E136",0xF7D9],
- ["8339E137",0xF7DA],
- ["8339E138",0xF7DB],
- ["8339E139",0xF7DC],
- ["8339E230",0xF7DD],
- ["8339E231",0xF7DE],
- ["8339E232",0xF7DF],
- ["8339E233",0xF7E0],
- ["8339E234",0xF7E1],
- ["8339E235",0xF7E2],
- ["8339E236",0xF7E3],
- ["8339E237",0xF7E4],
- ["8339E238",0xF7E5],
- ["8339E239",0xF7E6],
- ["8339E330",0xF7E7],
- ["8339E331",0xF7E8],
- ["8339E332",0xF7E9],
- ["8339E333",0xF7EA],
- ["8339E334",0xF7EB],
- ["8339E335",0xF7EC],
- ["8339E336",0xF7ED],
- ["8339E337",0xF7EE],
- ["8339E338",0xF7EF],
- ["8339E339",0xF7F0],
- ["8339E430",0xF7F1],
- ["8339E431",0xF7F2],
- ["8339E432",0xF7F3],
- ["8339E433",0xF7F4],
- ["8339E434",0xF7F5],
- ["8339E435",0xF7F6],
- ["8339E436",0xF7F7],
- ["8339E437",0xF7F8],
- ["8339E438",0xF7F9],
- ["8339E439",0xF7FA],
- ["8339E530",0xF7FB],
- ["8339E531",0xF7FC],
- ["8339E532",0xF7FD],
- ["8339E533",0xF7FE],
- ["8339E534",0xF7FF],
- ["8339E535",0xF800],
- ["8339E536",0xF801],
- ["8339E537",0xF802],
- ["8339E538",0xF803],
- ["8339E539",0xF804],
- ["8339E630",0xF805],
- ["8339E631",0xF806],
- ["8339E632",0xF807],
- ["8339E633",0xF808],
- ["8339E634",0xF809],
- ["8339E635",0xF80A],
- ["8339E636",0xF80B],
- ["8339E637",0xF80C],
- ["8339E638",0xF80D],
- ["8339E639",0xF80E],
- ["8339E730",0xF80F],
- ["8339E731",0xF810],
- ["8339E732",0xF811],
- ["8339E733",0xF812],
- ["8339E734",0xF813],
- ["8339E735",0xF814],
- ["8339E736",0xF815],
- ["8339E737",0xF816],
- ["8339E738",0xF817],
- ["8339E739",0xF818],
- ["8339E830",0xF819],
- ["8339E831",0xF81A],
- ["8339E832",0xF81B],
- ["8339E833",0xF81C],
- ["8339E834",0xF81D],
- ["8339E835",0xF81E],
- ["8339E836",0xF81F],
- ["8339E837",0xF820],
- ["8339E838",0xF821],
- ["8339E839",0xF822],
- ["8339E930",0xF823],
- ["8339E931",0xF824],
- ["8339E932",0xF825],
- ["8339E933",0xF826],
- ["8339E934",0xF827],
- ["8339E935",0xF828],
- ["8339E936",0xF829],
- ["8339E937",0xF82A],
- ["8339E938",0xF82B],
- ["8339E939",0xF82C],
- ["8339EA30",0xF82D],
- ["8339EA31",0xF82E],
- ["8339EA32",0xF82F],
- ["8339EA33",0xF830],
- ["8339EA34",0xF831],
- ["8339EA35",0xF832],
- ["8339EA36",0xF833],
- ["8339EA37",0xF834],
- ["8339EA38",0xF835],
- ["8339EA39",0xF836],
- ["8339EB30",0xF837],
- ["8339EB31",0xF838],
- ["8339EB32",0xF839],
- ["8339EB33",0xF83A],
- ["8339EB34",0xF83B],
- ["8339EB35",0xF83C],
- ["8339EB36",0xF83D],
- ["8339EB37",0xF83E],
- ["8339EB38",0xF83F],
- ["8339EB39",0xF840],
- ["8339EC30",0xF841],
- ["8339EC31",0xF842],
- ["8339EC32",0xF843],
- ["8339EC33",0xF844],
- ["8339EC34",0xF845],
- ["8339EC35",0xF846],
- ["8339EC36",0xF847],
- ["8339EC37",0xF848],
- ["8339EC38",0xF849],
- ["8339EC39",0xF84A],
- ["8339ED30",0xF84B],
- ["8339ED31",0xF84C],
- ["8339ED32",0xF84D],
- ["8339ED33",0xF84E],
- ["8339ED34",0xF84F],
- ["8339ED35",0xF850],
- ["8339ED36",0xF851],
- ["8339ED37",0xF852],
- ["8339ED38",0xF853],
- ["8339ED39",0xF854],
- ["8339EE30",0xF855],
- ["8339EE31",0xF856],
- ["8339EE32",0xF857],
- ["8339EE33",0xF858],
- ["8339EE34",0xF859],
- ["8339EE35",0xF85A],
- ["8339EE36",0xF85B],
- ["8339EE37",0xF85C],
- ["8339EE38",0xF85D],
- ["8339EE39",0xF85E],
- ["8339EF30",0xF85F],
- ["8339EF31",0xF860],
- ["8339EF32",0xF861],
- ["8339EF33",0xF862],
- ["8339EF34",0xF863],
- ["8339EF35",0xF864],
- ["8339EF36",0xF865],
- ["8339EF37",0xF866],
- ["8339EF38",0xF867],
- ["8339EF39",0xF868],
- ["8339F030",0xF869],
- ["8339F031",0xF86A],
- ["8339F032",0xF86B],
- ["8339F033",0xF86C],
- ["8339F034",0xF86D],
- ["8339F035",0xF86E],
- ["8339F036",0xF86F],
- ["8339F037",0xF870],
- ["8339F038",0xF871],
- ["8339F039",0xF872],
- ["8339F130",0xF873],
- ["8339F131",0xF874],
- ["8339F132",0xF875],
- ["8339F133",0xF876],
- ["8339F134",0xF877],
- ["8339F135",0xF878],
- ["8339F136",0xF879],
- ["8339F137",0xF87A],
- ["8339F138",0xF87B],
- ["8339F139",0xF87C],
- ["8339F230",0xF87D],
- ["8339F231",0xF87E],
- ["8339F232",0xF87F],
- ["8339F233",0xF880],
- ["8339F234",0xF881],
- ["8339F235",0xF882],
- ["8339F236",0xF883],
- ["8339F237",0xF884],
- ["8339F238",0xF885],
- ["8339F239",0xF886],
- ["8339F330",0xF887],
- ["8339F331",0xF888],
- ["8339F332",0xF889],
- ["8339F333",0xF88A],
- ["8339F334",0xF88B],
- ["8339F335",0xF88C],
- ["8339F336",0xF88D],
- ["8339F337",0xF88E],
- ["8339F338",0xF88F],
- ["8339F339",0xF890],
- ["8339F430",0xF891],
- ["8339F431",0xF892],
- ["8339F432",0xF893],
- ["8339F433",0xF894],
- ["8339F434",0xF895],
- ["8339F435",0xF896],
- ["8339F436",0xF897],
- ["8339F437",0xF898],
- ["8339F438",0xF899],
- ["8339F439",0xF89A],
- ["8339F530",0xF89B],
- ["8339F531",0xF89C],
- ["8339F532",0xF89D],
- ["8339F533",0xF89E],
- ["8339F534",0xF89F],
- ["8339F535",0xF8A0],
- ["8339F536",0xF8A1],
- ["8339F537",0xF8A2],
- ["8339F538",0xF8A3],
- ["8339F539",0xF8A4],
- ["8339F630",0xF8A5],
- ["8339F631",0xF8A6],
- ["8339F632",0xF8A7],
- ["8339F633",0xF8A8],
- ["8339F634",0xF8A9],
- ["8339F635",0xF8AA],
- ["8339F636",0xF8AB],
- ["8339F637",0xF8AC],
- ["8339F638",0xF8AD],
- ["8339F639",0xF8AE],
- ["8339F730",0xF8AF],
- ["8339F731",0xF8B0],
- ["8339F732",0xF8B1],
- ["8339F733",0xF8B2],
- ["8339F734",0xF8B3],
- ["8339F735",0xF8B4],
- ["8339F736",0xF8B5],
- ["8339F737",0xF8B6],
- ["8339F738",0xF8B7],
- ["8339F739",0xF8B8],
- ["8339F830",0xF8B9],
- ["8339F831",0xF8BA],
- ["8339F832",0xF8BB],
- ["8339F833",0xF8BC],
- ["8339F834",0xF8BD],
- ["8339F835",0xF8BE],
- ["8339F836",0xF8BF],
- ["8339F837",0xF8C0],
- ["8339F838",0xF8C1],
- ["8339F839",0xF8C2],
- ["8339F930",0xF8C3],
- ["8339F931",0xF8C4],
- ["8339F932",0xF8C5],
- ["8339F933",0xF8C6],
- ["8339F934",0xF8C7],
- ["8339F935",0xF8C8],
- ["8339F936",0xF8C9],
- ["8339F937",0xF8CA],
- ["8339F938",0xF8CB],
- ["8339F939",0xF8CC],
- ["8339FA30",0xF8CD],
- ["8339FA31",0xF8CE],
- ["8339FA32",0xF8CF],
- ["8339FA33",0xF8D0],
- ["8339FA34",0xF8D1],
- ["8339FA35",0xF8D2],
- ["8339FA36",0xF8D3],
- ["8339FA37",0xF8D4],
- ["8339FA38",0xF8D5],
- ["8339FA39",0xF8D6],
- ["8339FB30",0xF8D7],
- ["8339FB31",0xF8D8],
- ["8339FB32",0xF8D9],
- ["8339FB33",0xF8DA],
- ["8339FB34",0xF8DB],
- ["8339FB35",0xF8DC],
- ["8339FB36",0xF8DD],
- ["8339FB37",0xF8DE],
- ["8339FB38",0xF8DF],
- ["8339FB39",0xF8E0],
- ["8339FC30",0xF8E1],
- ["8339FC31",0xF8E2],
- ["8339FC32",0xF8E3],
- ["8339FC33",0xF8E4],
- ["8339FC34",0xF8E5],
- ["8339FC35",0xF8E6],
- ["8339FC36",0xF8E7],
- ["8339FC37",0xF8E8],
- ["8339FC38",0xF8E9],
- ["8339FC39",0xF8EA],
- ["8339FD30",0xF8EB],
- ["8339FD31",0xF8EC],
- ["8339FD32",0xF8ED],
- ["8339FD33",0xF8EE],
- ["8339FD34",0xF8EF],
- ["8339FD35",0xF8F0],
- ["8339FD36",0xF8F1],
- ["8339FD37",0xF8F2],
- ["8339FD38",0xF8F3],
- ["8339FD39",0xF8F4],
- ["8339FE30",0xF8F5],
- ["8339FE31",0xF8F6],
- ["8339FE32",0xF8F7],
- ["8339FE33",0xF8F8],
- ["8339FE34",0xF8F9],
- ["8339FE35",0xF8FA],
- ["8339FE36",0xF8FB],
- ["8339FE37",0xF8FC],
- ["8339FE38",0xF8FD],
- ["8339FE39",0xF8FE],
- ["84308130",0xF8FF],
- ["84308131",0xF900],
- ["84308132",0xF901],
- ["84308133",0xF902],
- ["84308134",0xF903],
- ["84308135",0xF904],
- ["84308136",0xF905],
- ["84308137",0xF906],
- ["84308138",0xF907],
- ["84308139",0xF908],
- ["84308230",0xF909],
- ["84308231",0xF90A],
- ["84308232",0xF90B],
- ["84308233",0xF90C],
- ["84308234",0xF90D],
- ["84308235",0xF90E],
- ["84308236",0xF90F],
- ["84308237",0xF910],
- ["84308238",0xF911],
- ["84308239",0xF912],
- ["84308330",0xF913],
- ["84308331",0xF914],
- ["84308332",0xF915],
- ["84308333",0xF916],
- ["84308334",0xF917],
- ["84308335",0xF918],
- ["84308336",0xF919],
- ["84308337",0xF91A],
- ["84308338",0xF91B],
- ["84308339",0xF91C],
- ["84308430",0xF91D],
- ["84308431",0xF91E],
- ["84308432",0xF91F],
- ["84308433",0xF920],
- ["84308434",0xF921],
- ["84308435",0xF922],
- ["84308436",0xF923],
- ["84308437",0xF924],
- ["84308438",0xF925],
- ["84308439",0xF926],
- ["84308530",0xF927],
- ["84308531",0xF928],
- ["84308532",0xF929],
- ["84308533",0xF92A],
- ["84308534",0xF92B],
- ["FD9C",0xF92C],
- ["84308535",0xF92D],
- ["84308536",0xF92E],
- ["84308537",0xF92F],
- ["84308538",0xF930],
- ["84308539",0xF931],
- ["84308630",0xF932],
- ["84308631",0xF933],
- ["84308632",0xF934],
- ["84308633",0xF935],
- ["84308634",0xF936],
- ["84308635",0xF937],
- ["84308636",0xF938],
- ["84308637",0xF939],
- ["84308638",0xF93A],
- ["84308639",0xF93B],
- ["84308730",0xF93C],
- ["84308731",0xF93D],
- ["84308732",0xF93E],
- ["84308733",0xF93F],
- ["84308734",0xF940],
- ["84308735",0xF941],
- ["84308736",0xF942],
- ["84308737",0xF943],
- ["84308738",0xF944],
- ["84308739",0xF945],
- ["84308830",0xF946],
- ["84308831",0xF947],
- ["84308832",0xF948],
- ["84308833",0xF949],
- ["84308834",0xF94A],
- ["84308835",0xF94B],
- ["84308836",0xF94C],
- ["84308837",0xF94D],
- ["84308838",0xF94E],
- ["84308839",0xF94F],
- ["84308930",0xF950],
- ["84308931",0xF951],
- ["84308932",0xF952],
- ["84308933",0xF953],
- ["84308934",0xF954],
- ["84308935",0xF955],
- ["84308936",0xF956],
- ["84308937",0xF957],
- ["84308938",0xF958],
- ["84308939",0xF959],
- ["84308A30",0xF95A],
- ["84308A31",0xF95B],
- ["84308A32",0xF95C],
- ["84308A33",0xF95D],
- ["84308A34",0xF95E],
- ["84308A35",0xF95F],
- ["84308A36",0xF960],
- ["84308A37",0xF961],
- ["84308A38",0xF962],
- ["84308A39",0xF963],
- ["84308B30",0xF964],
- ["84308B31",0xF965],
- ["84308B32",0xF966],
- ["84308B33",0xF967],
- ["84308B34",0xF968],
- ["84308B35",0xF969],
- ["84308B36",0xF96A],
- ["84308B37",0xF96B],
- ["84308B38",0xF96C],
- ["84308B39",0xF96D],
- ["84308C30",0xF96E],
- ["84308C31",0xF96F],
- ["84308C32",0xF970],
- ["84308C33",0xF971],
- ["84308C34",0xF972],
- ["84308C35",0xF973],
- ["84308C36",0xF974],
- ["84308C37",0xF975],
- ["84308C38",0xF976],
- ["84308C39",0xF977],
- ["84308D30",0xF978],
- ["FD9D",0xF979],
- ["84308D31",0xF97A],
- ["84308D32",0xF97B],
- ["84308D33",0xF97C],
- ["84308D34",0xF97D],
- ["84308D35",0xF97E],
- ["84308D36",0xF97F],
- ["84308D37",0xF980],
- ["84308D38",0xF981],
- ["84308D39",0xF982],
- ["84308E30",0xF983],
- ["84308E31",0xF984],
- ["84308E32",0xF985],
- ["84308E33",0xF986],
- ["84308E34",0xF987],
- ["84308E35",0xF988],
- ["84308E36",0xF989],
- ["84308E37",0xF98A],
- ["84308E38",0xF98B],
- ["84308E39",0xF98C],
- ["84308F30",0xF98D],
- ["84308F31",0xF98E],
- ["84308F32",0xF98F],
- ["84308F33",0xF990],
- ["84308F34",0xF991],
- ["84308F35",0xF992],
- ["84308F36",0xF993],
- ["84308F37",0xF994],
- ["FD9E",0xF995],
- ["84308F38",0xF996],
- ["84308F39",0xF997],
- ["84309030",0xF998],
- ["84309031",0xF999],
- ["84309032",0xF99A],
- ["84309033",0xF99B],
- ["84309034",0xF99C],
- ["84309035",0xF99D],
- ["84309036",0xF99E],
- ["84309037",0xF99F],
- ["84309038",0xF9A0],
- ["84309039",0xF9A1],
- ["84309130",0xF9A2],
- ["84309131",0xF9A3],
- ["84309132",0xF9A4],
- ["84309133",0xF9A5],
- ["84309134",0xF9A6],
- ["84309135",0xF9A7],
- ["84309136",0xF9A8],
- ["84309137",0xF9A9],
- ["84309138",0xF9AA],
- ["84309139",0xF9AB],
- ["84309230",0xF9AC],
- ["84309231",0xF9AD],
- ["84309232",0xF9AE],
- ["84309233",0xF9AF],
- ["84309234",0xF9B0],
- ["84309235",0xF9B1],
- ["84309236",0xF9B2],
- ["84309237",0xF9B3],
- ["84309238",0xF9B4],
- ["84309239",0xF9B5],
- ["84309330",0xF9B6],
- ["84309331",0xF9B7],
- ["84309332",0xF9B8],
- ["84309333",0xF9B9],
- ["84309334",0xF9BA],
- ["84309335",0xF9BB],
- ["84309336",0xF9BC],
- ["84309337",0xF9BD],
- ["84309338",0xF9BE],
- ["84309339",0xF9BF],
- ["84309430",0xF9C0],
- ["84309431",0xF9C1],
- ["84309432",0xF9C2],
- ["84309433",0xF9C3],
- ["84309434",0xF9C4],
- ["84309435",0xF9C5],
- ["84309436",0xF9C6],
- ["84309437",0xF9C7],
- ["84309438",0xF9C8],
- ["84309439",0xF9C9],
- ["84309530",0xF9CA],
- ["84309531",0xF9CB],
- ["84309532",0xF9CC],
- ["84309533",0xF9CD],
- ["84309534",0xF9CE],
- ["84309535",0xF9CF],
- ["84309536",0xF9D0],
- ["84309537",0xF9D1],
- ["84309538",0xF9D2],
- ["84309539",0xF9D3],
- ["84309630",0xF9D4],
- ["84309631",0xF9D5],
- ["84309632",0xF9D6],
- ["84309633",0xF9D7],
- ["84309634",0xF9D8],
- ["84309635",0xF9D9],
- ["84309636",0xF9DA],
- ["84309637",0xF9DB],
- ["84309638",0xF9DC],
- ["84309639",0xF9DD],
- ["84309730",0xF9DE],
- ["84309731",0xF9DF],
- ["84309732",0xF9E0],
- ["84309733",0xF9E1],
- ["84309734",0xF9E2],
- ["84309735",0xF9E3],
- ["84309736",0xF9E4],
- ["84309737",0xF9E5],
- ["84309738",0xF9E6],
- ["FD9F",0xF9E7],
- ["84309739",0xF9E8],
- ["84309830",0xF9E9],
- ["84309831",0xF9EA],
- ["84309832",0xF9EB],
- ["84309833",0xF9EC],
- ["84309834",0xF9ED],
- ["84309835",0xF9EE],
- ["84309836",0xF9EF],
- ["84309837",0xF9F0],
- ["FDA0",0xF9F1],
- ["84309838",0xF9F2],
- ["84309839",0xF9F3],
- ["84309930",0xF9F4],
- ["84309931",0xF9F5],
- ["84309932",0xF9F6],
- ["84309933",0xF9F7],
- ["84309934",0xF9F8],
- ["84309935",0xF9F9],
- ["84309936",0xF9FA],
- ["84309937",0xF9FB],
- ["84309938",0xF9FC],
- ["84309939",0xF9FD],
- ["84309A30",0xF9FE],
- ["84309A31",0xF9FF],
- ["84309A32",0xFA00],
- ["84309A33",0xFA01],
- ["84309A34",0xFA02],
- ["84309A35",0xFA03],
- ["84309A36",0xFA04],
- ["84309A37",0xFA05],
- ["84309A38",0xFA06],
- ["84309A39",0xFA07],
- ["84309B30",0xFA08],
- ["84309B31",0xFA09],
- ["84309B32",0xFA0A],
- ["84309B33",0xFA0B],
- ["FE40",0xFA0C],
- ["FE41",0xFA0D],
- ["FE42",0xFA0E],
- ["FE43",0xFA0F],
- ["84309B34",0xFA10],
- ["FE44",0xFA11],
- ["84309B35",0xFA12],
- ["FE45",0xFA13],
- ["FE46",0xFA14],
- ["84309B36",0xFA15],
- ["84309B37",0xFA16],
- ["84309B38",0xFA17],
- ["FE47",0xFA18],
- ["84309B39",0xFA19],
- ["84309C30",0xFA1A],
- ["84309C31",0xFA1B],
- ["84309C32",0xFA1C],
- ["84309C33",0xFA1D],
- ["84309C34",0xFA1E],
- ["FE48",0xFA1F],
- ["FE49",0xFA20],
- ["FE4A",0xFA21],
- ["84309C35",0xFA22],
- ["FE4B",0xFA23],
- ["FE4C",0xFA24],
- ["84309C36",0xFA25],
- ["84309C37",0xFA26],
- ["FE4D",0xFA27],
- ["FE4E",0xFA28],
- ["FE4F",0xFA29],
- ["84309C38",0xFA2A],
- ["84309C39",0xFA2B],
- ["84309D30",0xFA2C],
- ["84309D31",0xFA2D],
- ["84309D32",0xFA2E],
- ["84309D33",0xFA2F],
- ["84309D34",0xFA30],
- ["84309D35",0xFA31],
- ["84309D36",0xFA32],
- ["84309D37",0xFA33],
- ["84309D38",0xFA34],
- ["84309D39",0xFA35],
- ["84309E30",0xFA36],
- ["84309E31",0xFA37],
- ["84309E32",0xFA38],
- ["84309E33",0xFA39],
- ["84309E34",0xFA3A],
- ["84309E35",0xFA3B],
- ["84309E36",0xFA3C],
- ["84309E37",0xFA3D],
- ["84309E38",0xFA3E],
- ["84309E39",0xFA3F],
- ["84309F30",0xFA40],
- ["84309F31",0xFA41],
- ["84309F32",0xFA42],
- ["84309F33",0xFA43],
- ["84309F34",0xFA44],
- ["84309F35",0xFA45],
- ["84309F36",0xFA46],
- ["84309F37",0xFA47],
- ["84309F38",0xFA48],
- ["84309F39",0xFA49],
- ["8430A030",0xFA4A],
- ["8430A031",0xFA4B],
- ["8430A032",0xFA4C],
- ["8430A033",0xFA4D],
- ["8430A034",0xFA4E],
- ["8430A035",0xFA4F],
- ["8430A036",0xFA50],
- ["8430A037",0xFA51],
- ["8430A038",0xFA52],
- ["8430A039",0xFA53],
- ["8430A130",0xFA54],
- ["8430A131",0xFA55],
- ["8430A132",0xFA56],
- ["8430A133",0xFA57],
- ["8430A134",0xFA58],
- ["8430A135",0xFA59],
- ["8430A136",0xFA5A],
- ["8430A137",0xFA5B],
- ["8430A138",0xFA5C],
- ["8430A139",0xFA5D],
- ["8430A230",0xFA5E],
- ["8430A231",0xFA5F],
- ["8430A232",0xFA60],
- ["8430A233",0xFA61],
- ["8430A234",0xFA62],
- ["8430A235",0xFA63],
- ["8430A236",0xFA64],
- ["8430A237",0xFA65],
- ["8430A238",0xFA66],
- ["8430A239",0xFA67],
- ["8430A330",0xFA68],
- ["8430A331",0xFA69],
- ["8430A332",0xFA6A],
- ["8430A333",0xFA6B],
- ["8430A334",0xFA6C],
- ["8430A335",0xFA6D],
- ["8430A336",0xFA6E],
- ["8430A337",0xFA6F],
- ["8430A338",0xFA70],
- ["8430A339",0xFA71],
- ["8430A430",0xFA72],
- ["8430A431",0xFA73],
- ["8430A432",0xFA74],
- ["8430A433",0xFA75],
- ["8430A434",0xFA76],
- ["8430A435",0xFA77],
- ["8430A436",0xFA78],
- ["8430A437",0xFA79],
- ["8430A438",0xFA7A],
- ["8430A439",0xFA7B],
- ["8430A530",0xFA7C],
- ["8430A531",0xFA7D],
- ["8430A532",0xFA7E],
- ["8430A533",0xFA7F],
- ["8430A534",0xFA80],
- ["8430A535",0xFA81],
- ["8430A536",0xFA82],
- ["8430A537",0xFA83],
- ["8430A538",0xFA84],
- ["8430A539",0xFA85],
- ["8430A630",0xFA86],
- ["8430A631",0xFA87],
- ["8430A632",0xFA88],
- ["8430A633",0xFA89],
- ["8430A634",0xFA8A],
- ["8430A635",0xFA8B],
- ["8430A636",0xFA8C],
- ["8430A637",0xFA8D],
- ["8430A638",0xFA8E],
- ["8430A639",0xFA8F],
- ["8430A730",0xFA90],
- ["8430A731",0xFA91],
- ["8430A732",0xFA92],
- ["8430A733",0xFA93],
- ["8430A734",0xFA94],
- ["8430A735",0xFA95],
- ["8430A736",0xFA96],
- ["8430A737",0xFA97],
- ["8430A738",0xFA98],
- ["8430A739",0xFA99],
- ["8430A830",0xFA9A],
- ["8430A831",0xFA9B],
- ["8430A832",0xFA9C],
- ["8430A833",0xFA9D],
- ["8430A834",0xFA9E],
- ["8430A835",0xFA9F],
- ["8430A836",0xFAA0],
- ["8430A837",0xFAA1],
- ["8430A838",0xFAA2],
- ["8430A839",0xFAA3],
- ["8430A930",0xFAA4],
- ["8430A931",0xFAA5],
- ["8430A932",0xFAA6],
- ["8430A933",0xFAA7],
- ["8430A934",0xFAA8],
- ["8430A935",0xFAA9],
- ["8430A936",0xFAAA],
- ["8430A937",0xFAAB],
- ["8430A938",0xFAAC],
- ["8430A939",0xFAAD],
- ["8430AA30",0xFAAE],
- ["8430AA31",0xFAAF],
- ["8430AA32",0xFAB0],
- ["8430AA33",0xFAB1],
- ["8430AA34",0xFAB2],
- ["8430AA35",0xFAB3],
- ["8430AA36",0xFAB4],
- ["8430AA37",0xFAB5],
- ["8430AA38",0xFAB6],
- ["8430AA39",0xFAB7],
- ["8430AB30",0xFAB8],
- ["8430AB31",0xFAB9],
- ["8430AB32",0xFABA],
- ["8430AB33",0xFABB],
- ["8430AB34",0xFABC],
- ["8430AB35",0xFABD],
- ["8430AB36",0xFABE],
- ["8430AB37",0xFABF],
- ["8430AB38",0xFAC0],
- ["8430AB39",0xFAC1],
- ["8430AC30",0xFAC2],
- ["8430AC31",0xFAC3],
- ["8430AC32",0xFAC4],
- ["8430AC33",0xFAC5],
- ["8430AC34",0xFAC6],
- ["8430AC35",0xFAC7],
- ["8430AC36",0xFAC8],
- ["8430AC37",0xFAC9],
- ["8430AC38",0xFACA],
- ["8430AC39",0xFACB],
- ["8430AD30",0xFACC],
- ["8430AD31",0xFACD],
- ["8430AD32",0xFACE],
- ["8430AD33",0xFACF],
- ["8430AD34",0xFAD0],
- ["8430AD35",0xFAD1],
- ["8430AD36",0xFAD2],
- ["8430AD37",0xFAD3],
- ["8430AD38",0xFAD4],
- ["8430AD39",0xFAD5],
- ["8430AE30",0xFAD6],
- ["8430AE31",0xFAD7],
- ["8430AE32",0xFAD8],
- ["8430AE33",0xFAD9],
- ["8430AE34",0xFADA],
- ["8430AE35",0xFADB],
- ["8430AE36",0xFADC],
- ["8430AE37",0xFADD],
- ["8430AE38",0xFADE],
- ["8430AE39",0xFADF],
- ["8430AF30",0xFAE0],
- ["8430AF31",0xFAE1],
- ["8430AF32",0xFAE2],
- ["8430AF33",0xFAE3],
- ["8430AF34",0xFAE4],
- ["8430AF35",0xFAE5],
- ["8430AF36",0xFAE6],
- ["8430AF37",0xFAE7],
- ["8430AF38",0xFAE8],
- ["8430AF39",0xFAE9],
- ["8430B030",0xFAEA],
- ["8430B031",0xFAEB],
- ["8430B032",0xFAEC],
- ["8430B033",0xFAED],
- ["8430B034",0xFAEE],
- ["8430B035",0xFAEF],
- ["8430B036",0xFAF0],
- ["8430B037",0xFAF1],
- ["8430B038",0xFAF2],
- ["8430B039",0xFAF3],
- ["8430B130",0xFAF4],
- ["8430B131",0xFAF5],
- ["8430B132",0xFAF6],
- ["8430B133",0xFAF7],
- ["8430B134",0xFAF8],
- ["8430B135",0xFAF9],
- ["8430B136",0xFAFA],
- ["8430B137",0xFAFB],
- ["8430B138",0xFAFC],
- ["8430B139",0xFAFD],
- ["8430B230",0xFAFE],
- ["8430B231",0xFAFF],
- ["8430B232",0xFB00],
- ["8430B233",0xFB01],
- ["8430B234",0xFB02],
- ["8430B235",0xFB03],
- ["8430B236",0xFB04],
- ["8430B237",0xFB05],
- ["8430B238",0xFB06],
- ["8430B239",0xFB07],
- ["8430B330",0xFB08],
- ["8430B331",0xFB09],
- ["8430B332",0xFB0A],
- ["8430B333",0xFB0B],
- ["8430B334",0xFB0C],
- ["8430B335",0xFB0D],
- ["8430B336",0xFB0E],
- ["8430B337",0xFB0F],
- ["8430B338",0xFB10],
- ["8430B339",0xFB11],
- ["8430B430",0xFB12],
- ["8430B431",0xFB13],
- ["8430B432",0xFB14],
- ["8430B433",0xFB15],
- ["8430B434",0xFB16],
- ["8430B435",0xFB17],
- ["8430B436",0xFB18],
- ["8430B437",0xFB19],
- ["8430B438",0xFB1A],
- ["8430B439",0xFB1B],
- ["8430B530",0xFB1C],
- ["8430B531",0xFB1D],
- ["8430B532",0xFB1E],
- ["8430B533",0xFB1F],
- ["8430B534",0xFB20],
- ["8430B535",0xFB21],
- ["8430B536",0xFB22],
- ["8430B537",0xFB23],
- ["8430B538",0xFB24],
- ["8430B539",0xFB25],
- ["8430B630",0xFB26],
- ["8430B631",0xFB27],
- ["8430B632",0xFB28],
- ["8430B633",0xFB29],
- ["8430B634",0xFB2A],
- ["8430B635",0xFB2B],
- ["8430B636",0xFB2C],
- ["8430B637",0xFB2D],
- ["8430B638",0xFB2E],
- ["8430B639",0xFB2F],
- ["8430B730",0xFB30],
- ["8430B731",0xFB31],
- ["8430B732",0xFB32],
- ["8430B733",0xFB33],
- ["8430B734",0xFB34],
- ["8430B735",0xFB35],
- ["8430B736",0xFB36],
- ["8430B737",0xFB37],
- ["8430B738",0xFB38],
- ["8430B739",0xFB39],
- ["8430B830",0xFB3A],
- ["8430B831",0xFB3B],
- ["8430B832",0xFB3C],
- ["8430B833",0xFB3D],
- ["8430B834",0xFB3E],
- ["8430B835",0xFB3F],
- ["8430B836",0xFB40],
- ["8430B837",0xFB41],
- ["8430B838",0xFB42],
- ["8430B839",0xFB43],
- ["8430B930",0xFB44],
- ["8430B931",0xFB45],
- ["8430B932",0xFB46],
- ["8430B933",0xFB47],
- ["8430B934",0xFB48],
- ["8430B935",0xFB49],
- ["8430B936",0xFB4A],
- ["8430B937",0xFB4B],
- ["8430B938",0xFB4C],
- ["8430B939",0xFB4D],
- ["8430BA30",0xFB4E],
- ["8430BA31",0xFB4F],
- ["8430BA32",0xFB50],
- ["8430BA33",0xFB51],
- ["8430BA34",0xFB52],
- ["8430BA35",0xFB53],
- ["8430BA36",0xFB54],
- ["8430BA37",0xFB55],
- ["8430BA38",0xFB56],
- ["8430BA39",0xFB57],
- ["8430BB30",0xFB58],
- ["8430BB31",0xFB59],
- ["8430BB32",0xFB5A],
- ["8430BB33",0xFB5B],
- ["8430BB34",0xFB5C],
- ["8430BB35",0xFB5D],
- ["8430BB36",0xFB5E],
- ["8430BB37",0xFB5F],
- ["8430BB38",0xFB60],
- ["8430BB39",0xFB61],
- ["8430BC30",0xFB62],
- ["8430BC31",0xFB63],
- ["8430BC32",0xFB64],
- ["8430BC33",0xFB65],
- ["8430BC34",0xFB66],
- ["8430BC35",0xFB67],
- ["8430BC36",0xFB68],
- ["8430BC37",0xFB69],
- ["8430BC38",0xFB6A],
- ["8430BC39",0xFB6B],
- ["8430BD30",0xFB6C],
- ["8430BD31",0xFB6D],
- ["8430BD32",0xFB6E],
- ["8430BD33",0xFB6F],
- ["8430BD34",0xFB70],
- ["8430BD35",0xFB71],
- ["8430BD36",0xFB72],
- ["8430BD37",0xFB73],
- ["8430BD38",0xFB74],
- ["8430BD39",0xFB75],
- ["8430BE30",0xFB76],
- ["8430BE31",0xFB77],
- ["8430BE32",0xFB78],
- ["8430BE33",0xFB79],
- ["8430BE34",0xFB7A],
- ["8430BE35",0xFB7B],
- ["8430BE36",0xFB7C],
- ["8430BE37",0xFB7D],
- ["8430BE38",0xFB7E],
- ["8430BE39",0xFB7F],
- ["8430BF30",0xFB80],
- ["8430BF31",0xFB81],
- ["8430BF32",0xFB82],
- ["8430BF33",0xFB83],
- ["8430BF34",0xFB84],
- ["8430BF35",0xFB85],
- ["8430BF36",0xFB86],
- ["8430BF37",0xFB87],
- ["8430BF38",0xFB88],
- ["8430BF39",0xFB89],
- ["8430C030",0xFB8A],
- ["8430C031",0xFB8B],
- ["8430C032",0xFB8C],
- ["8430C033",0xFB8D],
- ["8430C034",0xFB8E],
- ["8430C035",0xFB8F],
- ["8430C036",0xFB90],
- ["8430C037",0xFB91],
- ["8430C038",0xFB92],
- ["8430C039",0xFB93],
- ["8430C130",0xFB94],
- ["8430C131",0xFB95],
- ["8430C132",0xFB96],
- ["8430C133",0xFB97],
- ["8430C134",0xFB98],
- ["8430C135",0xFB99],
- ["8430C136",0xFB9A],
- ["8430C137",0xFB9B],
- ["8430C138",0xFB9C],
- ["8430C139",0xFB9D],
- ["8430C230",0xFB9E],
- ["8430C231",0xFB9F],
- ["8430C232",0xFBA0],
- ["8430C233",0xFBA1],
- ["8430C234",0xFBA2],
- ["8430C235",0xFBA3],
- ["8430C236",0xFBA4],
- ["8430C237",0xFBA5],
- ["8430C238",0xFBA6],
- ["8430C239",0xFBA7],
- ["8430C330",0xFBA8],
- ["8430C331",0xFBA9],
- ["8430C332",0xFBAA],
- ["8430C333",0xFBAB],
- ["8430C334",0xFBAC],
- ["8430C335",0xFBAD],
- ["8430C336",0xFBAE],
- ["8430C337",0xFBAF],
- ["8430C338",0xFBB0],
- ["8430C339",0xFBB1],
- ["8430C430",0xFBB2],
- ["8430C431",0xFBB3],
- ["8430C432",0xFBB4],
- ["8430C433",0xFBB5],
- ["8430C434",0xFBB6],
- ["8430C435",0xFBB7],
- ["8430C436",0xFBB8],
- ["8430C437",0xFBB9],
- ["8430C438",0xFBBA],
- ["8430C439",0xFBBB],
- ["8430C530",0xFBBC],
- ["8430C531",0xFBBD],
- ["8430C532",0xFBBE],
- ["8430C533",0xFBBF],
- ["8430C534",0xFBC0],
- ["8430C535",0xFBC1],
- ["8430C536",0xFBC2],
- ["8430C537",0xFBC3],
- ["8430C538",0xFBC4],
- ["8430C539",0xFBC5],
- ["8430C630",0xFBC6],
- ["8430C631",0xFBC7],
- ["8430C632",0xFBC8],
- ["8430C633",0xFBC9],
- ["8430C634",0xFBCA],
- ["8430C635",0xFBCB],
- ["8430C636",0xFBCC],
- ["8430C637",0xFBCD],
- ["8430C638",0xFBCE],
- ["8430C639",0xFBCF],
- ["8430C730",0xFBD0],
- ["8430C731",0xFBD1],
- ["8430C732",0xFBD2],
- ["8430C733",0xFBD3],
- ["8430C734",0xFBD4],
- ["8430C735",0xFBD5],
- ["8430C736",0xFBD6],
- ["8430C737",0xFBD7],
- ["8430C738",0xFBD8],
- ["8430C739",0xFBD9],
- ["8430C830",0xFBDA],
- ["8430C831",0xFBDB],
- ["8430C832",0xFBDC],
- ["8430C833",0xFBDD],
- ["8430C834",0xFBDE],
- ["8430C835",0xFBDF],
- ["8430C836",0xFBE0],
- ["8430C837",0xFBE1],
- ["8430C838",0xFBE2],
- ["8430C839",0xFBE3],
- ["8430C930",0xFBE4],
- ["8430C931",0xFBE5],
- ["8430C932",0xFBE6],
- ["8430C933",0xFBE7],
- ["8430C934",0xFBE8],
- ["8430C935",0xFBE9],
- ["8430C936",0xFBEA],
- ["8430C937",0xFBEB],
- ["8430C938",0xFBEC],
- ["8430C939",0xFBED],
- ["8430CA30",0xFBEE],
- ["8430CA31",0xFBEF],
- ["8430CA32",0xFBF0],
- ["8430CA33",0xFBF1],
- ["8430CA34",0xFBF2],
- ["8430CA35",0xFBF3],
- ["8430CA36",0xFBF4],
- ["8430CA37",0xFBF5],
- ["8430CA38",0xFBF6],
- ["8430CA39",0xFBF7],
- ["8430CB30",0xFBF8],
- ["8430CB31",0xFBF9],
- ["8430CB32",0xFBFA],
- ["8430CB33",0xFBFB],
- ["8430CB34",0xFBFC],
- ["8430CB35",0xFBFD],
- ["8430CB36",0xFBFE],
- ["8430CB37",0xFBFF],
- ["8430CB38",0xFC00],
- ["8430CB39",0xFC01],
- ["8430CC30",0xFC02],
- ["8430CC31",0xFC03],
- ["8430CC32",0xFC04],
- ["8430CC33",0xFC05],
- ["8430CC34",0xFC06],
- ["8430CC35",0xFC07],
- ["8430CC36",0xFC08],
- ["8430CC37",0xFC09],
- ["8430CC38",0xFC0A],
- ["8430CC39",0xFC0B],
- ["8430CD30",0xFC0C],
- ["8430CD31",0xFC0D],
- ["8430CD32",0xFC0E],
- ["8430CD33",0xFC0F],
- ["8430CD34",0xFC10],
- ["8430CD35",0xFC11],
- ["8430CD36",0xFC12],
- ["8430CD37",0xFC13],
- ["8430CD38",0xFC14],
- ["8430CD39",0xFC15],
- ["8430CE30",0xFC16],
- ["8430CE31",0xFC17],
- ["8430CE32",0xFC18],
- ["8430CE33",0xFC19],
- ["8430CE34",0xFC1A],
- ["8430CE35",0xFC1B],
- ["8430CE36",0xFC1C],
- ["8430CE37",0xFC1D],
- ["8430CE38",0xFC1E],
- ["8430CE39",0xFC1F],
- ["8430CF30",0xFC20],
- ["8430CF31",0xFC21],
- ["8430CF32",0xFC22],
- ["8430CF33",0xFC23],
- ["8430CF34",0xFC24],
- ["8430CF35",0xFC25],
- ["8430CF36",0xFC26],
- ["8430CF37",0xFC27],
- ["8430CF38",0xFC28],
- ["8430CF39",0xFC29],
- ["8430D030",0xFC2A],
- ["8430D031",0xFC2B],
- ["8430D032",0xFC2C],
- ["8430D033",0xFC2D],
- ["8430D034",0xFC2E],
- ["8430D035",0xFC2F],
- ["8430D036",0xFC30],
- ["8430D037",0xFC31],
- ["8430D038",0xFC32],
- ["8430D039",0xFC33],
- ["8430D130",0xFC34],
- ["8430D131",0xFC35],
- ["8430D132",0xFC36],
- ["8430D133",0xFC37],
- ["8430D134",0xFC38],
- ["8430D135",0xFC39],
- ["8430D136",0xFC3A],
- ["8430D137",0xFC3B],
- ["8430D138",0xFC3C],
- ["8430D139",0xFC3D],
- ["8430D230",0xFC3E],
- ["8430D231",0xFC3F],
- ["8430D232",0xFC40],
- ["8430D233",0xFC41],
- ["8430D234",0xFC42],
- ["8430D235",0xFC43],
- ["8430D236",0xFC44],
- ["8430D237",0xFC45],
- ["8430D238",0xFC46],
- ["8430D239",0xFC47],
- ["8430D330",0xFC48],
- ["8430D331",0xFC49],
- ["8430D332",0xFC4A],
- ["8430D333",0xFC4B],
- ["8430D334",0xFC4C],
- ["8430D335",0xFC4D],
- ["8430D336",0xFC4E],
- ["8430D337",0xFC4F],
- ["8430D338",0xFC50],
- ["8430D339",0xFC51],
- ["8430D430",0xFC52],
- ["8430D431",0xFC53],
- ["8430D432",0xFC54],
- ["8430D433",0xFC55],
- ["8430D434",0xFC56],
- ["8430D435",0xFC57],
- ["8430D436",0xFC58],
- ["8430D437",0xFC59],
- ["8430D438",0xFC5A],
- ["8430D439",0xFC5B],
- ["8430D530",0xFC5C],
- ["8430D531",0xFC5D],
- ["8430D532",0xFC5E],
- ["8430D533",0xFC5F],
- ["8430D534",0xFC60],
- ["8430D535",0xFC61],
- ["8430D536",0xFC62],
- ["8430D537",0xFC63],
- ["8430D538",0xFC64],
- ["8430D539",0xFC65],
- ["8430D630",0xFC66],
- ["8430D631",0xFC67],
- ["8430D632",0xFC68],
- ["8430D633",0xFC69],
- ["8430D634",0xFC6A],
- ["8430D635",0xFC6B],
- ["8430D636",0xFC6C],
- ["8430D637",0xFC6D],
- ["8430D638",0xFC6E],
- ["8430D639",0xFC6F],
- ["8430D730",0xFC70],
- ["8430D731",0xFC71],
- ["8430D732",0xFC72],
- ["8430D733",0xFC73],
- ["8430D734",0xFC74],
- ["8430D735",0xFC75],
- ["8430D736",0xFC76],
- ["8430D737",0xFC77],
- ["8430D738",0xFC78],
- ["8430D739",0xFC79],
- ["8430D830",0xFC7A],
- ["8430D831",0xFC7B],
- ["8430D832",0xFC7C],
- ["8430D833",0xFC7D],
- ["8430D834",0xFC7E],
- ["8430D835",0xFC7F],
- ["8430D836",0xFC80],
- ["8430D837",0xFC81],
- ["8430D838",0xFC82],
- ["8430D839",0xFC83],
- ["8430D930",0xFC84],
- ["8430D931",0xFC85],
- ["8430D932",0xFC86],
- ["8430D933",0xFC87],
- ["8430D934",0xFC88],
- ["8430D935",0xFC89],
- ["8430D936",0xFC8A],
- ["8430D937",0xFC8B],
- ["8430D938",0xFC8C],
- ["8430D939",0xFC8D],
- ["8430DA30",0xFC8E],
- ["8430DA31",0xFC8F],
- ["8430DA32",0xFC90],
- ["8430DA33",0xFC91],
- ["8430DA34",0xFC92],
- ["8430DA35",0xFC93],
- ["8430DA36",0xFC94],
- ["8430DA37",0xFC95],
- ["8430DA38",0xFC96],
- ["8430DA39",0xFC97],
- ["8430DB30",0xFC98],
- ["8430DB31",0xFC99],
- ["8430DB32",0xFC9A],
- ["8430DB33",0xFC9B],
- ["8430DB34",0xFC9C],
- ["8430DB35",0xFC9D],
- ["8430DB36",0xFC9E],
- ["8430DB37",0xFC9F],
- ["8430DB38",0xFCA0],
- ["8430DB39",0xFCA1],
- ["8430DC30",0xFCA2],
- ["8430DC31",0xFCA3],
- ["8430DC32",0xFCA4],
- ["8430DC33",0xFCA5],
- ["8430DC34",0xFCA6],
- ["8430DC35",0xFCA7],
- ["8430DC36",0xFCA8],
- ["8430DC37",0xFCA9],
- ["8430DC38",0xFCAA],
- ["8430DC39",0xFCAB],
- ["8430DD30",0xFCAC],
- ["8430DD31",0xFCAD],
- ["8430DD32",0xFCAE],
- ["8430DD33",0xFCAF],
- ["8430DD34",0xFCB0],
- ["8430DD35",0xFCB1],
- ["8430DD36",0xFCB2],
- ["8430DD37",0xFCB3],
- ["8430DD38",0xFCB4],
- ["8430DD39",0xFCB5],
- ["8430DE30",0xFCB6],
- ["8430DE31",0xFCB7],
- ["8430DE32",0xFCB8],
- ["8430DE33",0xFCB9],
- ["8430DE34",0xFCBA],
- ["8430DE35",0xFCBB],
- ["8430DE36",0xFCBC],
- ["8430DE37",0xFCBD],
- ["8430DE38",0xFCBE],
- ["8430DE39",0xFCBF],
- ["8430DF30",0xFCC0],
- ["8430DF31",0xFCC1],
- ["8430DF32",0xFCC2],
- ["8430DF33",0xFCC3],
- ["8430DF34",0xFCC4],
- ["8430DF35",0xFCC5],
- ["8430DF36",0xFCC6],
- ["8430DF37",0xFCC7],
- ["8430DF38",0xFCC8],
- ["8430DF39",0xFCC9],
- ["8430E030",0xFCCA],
- ["8430E031",0xFCCB],
- ["8430E032",0xFCCC],
- ["8430E033",0xFCCD],
- ["8430E034",0xFCCE],
- ["8430E035",0xFCCF],
- ["8430E036",0xFCD0],
- ["8430E037",0xFCD1],
- ["8430E038",0xFCD2],
- ["8430E039",0xFCD3],
- ["8430E130",0xFCD4],
- ["8430E131",0xFCD5],
- ["8430E132",0xFCD6],
- ["8430E133",0xFCD7],
- ["8430E134",0xFCD8],
- ["8430E135",0xFCD9],
- ["8430E136",0xFCDA],
- ["8430E137",0xFCDB],
- ["8430E138",0xFCDC],
- ["8430E139",0xFCDD],
- ["8430E230",0xFCDE],
- ["8430E231",0xFCDF],
- ["8430E232",0xFCE0],
- ["8430E233",0xFCE1],
- ["8430E234",0xFCE2],
- ["8430E235",0xFCE3],
- ["8430E236",0xFCE4],
- ["8430E237",0xFCE5],
- ["8430E238",0xFCE6],
- ["8430E239",0xFCE7],
- ["8430E330",0xFCE8],
- ["8430E331",0xFCE9],
- ["8430E332",0xFCEA],
- ["8430E333",0xFCEB],
- ["8430E334",0xFCEC],
- ["8430E335",0xFCED],
- ["8430E336",0xFCEE],
- ["8430E337",0xFCEF],
- ["8430E338",0xFCF0],
- ["8430E339",0xFCF1],
- ["8430E430",0xFCF2],
- ["8430E431",0xFCF3],
- ["8430E432",0xFCF4],
- ["8430E433",0xFCF5],
- ["8430E434",0xFCF6],
- ["8430E435",0xFCF7],
- ["8430E436",0xFCF8],
- ["8430E437",0xFCF9],
- ["8430E438",0xFCFA],
- ["8430E439",0xFCFB],
- ["8430E530",0xFCFC],
- ["8430E531",0xFCFD],
- ["8430E532",0xFCFE],
- ["8430E533",0xFCFF],
- ["8430E534",0xFD00],
- ["8430E535",0xFD01],
- ["8430E536",0xFD02],
- ["8430E537",0xFD03],
- ["8430E538",0xFD04],
- ["8430E539",0xFD05],
- ["8430E630",0xFD06],
- ["8430E631",0xFD07],
- ["8430E632",0xFD08],
- ["8430E633",0xFD09],
- ["8430E634",0xFD0A],
- ["8430E635",0xFD0B],
- ["8430E636",0xFD0C],
- ["8430E637",0xFD0D],
- ["8430E638",0xFD0E],
- ["8430E639",0xFD0F],
- ["8430E730",0xFD10],
- ["8430E731",0xFD11],
- ["8430E732",0xFD12],
- ["8430E733",0xFD13],
- ["8430E734",0xFD14],
- ["8430E735",0xFD15],
- ["8430E736",0xFD16],
- ["8430E737",0xFD17],
- ["8430E738",0xFD18],
- ["8430E739",0xFD19],
- ["8430E830",0xFD1A],
- ["8430E831",0xFD1B],
- ["8430E832",0xFD1C],
- ["8430E833",0xFD1D],
- ["8430E834",0xFD1E],
- ["8430E835",0xFD1F],
- ["8430E836",0xFD20],
- ["8430E837",0xFD21],
- ["8430E838",0xFD22],
- ["8430E839",0xFD23],
- ["8430E930",0xFD24],
- ["8430E931",0xFD25],
- ["8430E932",0xFD26],
- ["8430E933",0xFD27],
- ["8430E934",0xFD28],
- ["8430E935",0xFD29],
- ["8430E936",0xFD2A],
- ["8430E937",0xFD2B],
- ["8430E938",0xFD2C],
- ["8430E939",0xFD2D],
- ["8430EA30",0xFD2E],
- ["8430EA31",0xFD2F],
- ["8430EA32",0xFD30],
- ["8430EA33",0xFD31],
- ["8430EA34",0xFD32],
- ["8430EA35",0xFD33],
- ["8430EA36",0xFD34],
- ["8430EA37",0xFD35],
- ["8430EA38",0xFD36],
- ["8430EA39",0xFD37],
- ["8430EB30",0xFD38],
- ["8430EB31",0xFD39],
- ["8430EB32",0xFD3A],
- ["8430EB33",0xFD3B],
- ["8430EB34",0xFD3C],
- ["8430EB35",0xFD3D],
- ["8430EB36",0xFD3E],
- ["8430EB37",0xFD3F],
- ["8430EB38",0xFD40],
- ["8430EB39",0xFD41],
- ["8430EC30",0xFD42],
- ["8430EC31",0xFD43],
- ["8430EC32",0xFD44],
- ["8430EC33",0xFD45],
- ["8430EC34",0xFD46],
- ["8430EC35",0xFD47],
- ["8430EC36",0xFD48],
- ["8430EC37",0xFD49],
- ["8430EC38",0xFD4A],
- ["8430EC39",0xFD4B],
- ["8430ED30",0xFD4C],
- ["8430ED31",0xFD4D],
- ["8430ED32",0xFD4E],
- ["8430ED33",0xFD4F],
- ["8430ED34",0xFD50],
- ["8430ED35",0xFD51],
- ["8430ED36",0xFD52],
- ["8430ED37",0xFD53],
- ["8430ED38",0xFD54],
- ["8430ED39",0xFD55],
- ["8430EE30",0xFD56],
- ["8430EE31",0xFD57],
- ["8430EE32",0xFD58],
- ["8430EE33",0xFD59],
- ["8430EE34",0xFD5A],
- ["8430EE35",0xFD5B],
- ["8430EE36",0xFD5C],
- ["8430EE37",0xFD5D],
- ["8430EE38",0xFD5E],
- ["8430EE39",0xFD5F],
- ["8430EF30",0xFD60],
- ["8430EF31",0xFD61],
- ["8430EF32",0xFD62],
- ["8430EF33",0xFD63],
- ["8430EF34",0xFD64],
- ["8430EF35",0xFD65],
- ["8430EF36",0xFD66],
- ["8430EF37",0xFD67],
- ["8430EF38",0xFD68],
- ["8430EF39",0xFD69],
- ["8430F030",0xFD6A],
- ["8430F031",0xFD6B],
- ["8430F032",0xFD6C],
- ["8430F033",0xFD6D],
- ["8430F034",0xFD6E],
- ["8430F035",0xFD6F],
- ["8430F036",0xFD70],
- ["8430F037",0xFD71],
- ["8430F038",0xFD72],
- ["8430F039",0xFD73],
- ["8430F130",0xFD74],
- ["8430F131",0xFD75],
- ["8430F132",0xFD76],
- ["8430F133",0xFD77],
- ["8430F134",0xFD78],
- ["8430F135",0xFD79],
- ["8430F136",0xFD7A],
- ["8430F137",0xFD7B],
- ["8430F138",0xFD7C],
- ["8430F139",0xFD7D],
- ["8430F230",0xFD7E],
- ["8430F231",0xFD7F],
- ["8430F232",0xFD80],
- ["8430F233",0xFD81],
- ["8430F234",0xFD82],
- ["8430F235",0xFD83],
- ["8430F236",0xFD84],
- ["8430F237",0xFD85],
- ["8430F238",0xFD86],
- ["8430F239",0xFD87],
- ["8430F330",0xFD88],
- ["8430F331",0xFD89],
- ["8430F332",0xFD8A],
- ["8430F333",0xFD8B],
- ["8430F334",0xFD8C],
- ["8430F335",0xFD8D],
- ["8430F336",0xFD8E],
- ["8430F337",0xFD8F],
- ["8430F338",0xFD90],
- ["8430F339",0xFD91],
- ["8430F430",0xFD92],
- ["8430F431",0xFD93],
- ["8430F432",0xFD94],
- ["8430F433",0xFD95],
- ["8430F434",0xFD96],
- ["8430F435",0xFD97],
- ["8430F436",0xFD98],
- ["8430F437",0xFD99],
- ["8430F438",0xFD9A],
- ["8430F439",0xFD9B],
- ["8430F530",0xFD9C],
- ["8430F531",0xFD9D],
- ["8430F532",0xFD9E],
- ["8430F533",0xFD9F],
- ["8430F534",0xFDA0],
- ["8430F535",0xFDA1],
- ["8430F536",0xFDA2],
- ["8430F537",0xFDA3],
- ["8430F538",0xFDA4],
- ["8430F539",0xFDA5],
- ["8430F630",0xFDA6],
- ["8430F631",0xFDA7],
- ["8430F632",0xFDA8],
- ["8430F633",0xFDA9],
- ["8430F634",0xFDAA],
- ["8430F635",0xFDAB],
- ["8430F636",0xFDAC],
- ["8430F637",0xFDAD],
- ["8430F638",0xFDAE],
- ["8430F639",0xFDAF],
- ["8430F730",0xFDB0],
- ["8430F731",0xFDB1],
- ["8430F732",0xFDB2],
- ["8430F733",0xFDB3],
- ["8430F734",0xFDB4],
- ["8430F735",0xFDB5],
- ["8430F736",0xFDB6],
- ["8430F737",0xFDB7],
- ["8430F738",0xFDB8],
- ["8430F739",0xFDB9],
- ["8430F830",0xFDBA],
- ["8430F831",0xFDBB],
- ["8430F832",0xFDBC],
- ["8430F833",0xFDBD],
- ["8430F834",0xFDBE],
- ["8430F835",0xFDBF],
- ["8430F836",0xFDC0],
- ["8430F837",0xFDC1],
- ["8430F838",0xFDC2],
- ["8430F839",0xFDC3],
- ["8430F930",0xFDC4],
- ["8430F931",0xFDC5],
- ["8430F932",0xFDC6],
- ["8430F933",0xFDC7],
- ["8430F934",0xFDC8],
- ["8430F935",0xFDC9],
- ["8430F936",0xFDCA],
- ["8430F937",0xFDCB],
- ["8430F938",0xFDCC],
- ["8430F939",0xFDCD],
- ["8430FA30",0xFDCE],
- ["8430FA31",0xFDCF],
- ["8430FA32",0xFDD0],
- ["8430FA33",0xFDD1],
- ["8430FA34",0xFDD2],
- ["8430FA35",0xFDD3],
- ["8430FA36",0xFDD4],
- ["8430FA37",0xFDD5],
- ["8430FA38",0xFDD6],
- ["8430FA39",0xFDD7],
- ["8430FB30",0xFDD8],
- ["8430FB31",0xFDD9],
- ["8430FB32",0xFDDA],
- ["8430FB33",0xFDDB],
- ["8430FB34",0xFDDC],
- ["8430FB35",0xFDDD],
- ["8430FB36",0xFDDE],
- ["8430FB37",0xFDDF],
- ["8430FB38",0xFDE0],
- ["8430FB39",0xFDE1],
- ["8430FC30",0xFDE2],
- ["8430FC31",0xFDE3],
- ["8430FC32",0xFDE4],
- ["8430FC33",0xFDE5],
- ["8430FC34",0xFDE6],
- ["8430FC35",0xFDE7],
- ["8430FC36",0xFDE8],
- ["8430FC37",0xFDE9],
- ["8430FC38",0xFDEA],
- ["8430FC39",0xFDEB],
- ["8430FD30",0xFDEC],
- ["8430FD31",0xFDED],
- ["8430FD32",0xFDEE],
- ["8430FD33",0xFDEF],
- ["8430FD34",0xFDF0],
- ["8430FD35",0xFDF1],
- ["8430FD36",0xFDF2],
- ["8430FD37",0xFDF3],
- ["8430FD38",0xFDF4],
- ["8430FD39",0xFDF5],
- ["8430FE30",0xFDF6],
- ["8430FE31",0xFDF7],
- ["8430FE32",0xFDF8],
- ["8430FE33",0xFDF9],
- ["8430FE34",0xFDFA],
- ["8430FE35",0xFDFB],
- ["8430FE36",0xFDFC],
- ["8430FE37",0xFDFD],
- ["8430FE38",0xFDFE],
- ["8430FE39",0xFDFF],
- ["84318130",0xFE00],
- ["84318131",0xFE01],
- ["84318132",0xFE02],
- ["84318133",0xFE03],
- ["84318134",0xFE04],
- ["84318135",0xFE05],
- ["84318136",0xFE06],
- ["84318137",0xFE07],
- ["84318138",0xFE08],
- ["84318139",0xFE09],
- ["84318230",0xFE0A],
- ["84318231",0xFE0B],
- ["84318232",0xFE0C],
- ["84318233",0xFE0D],
- ["84318234",0xFE0E],
- ["84318235",0xFE0F],
- ["84318236",0xFE10],
- ["84318237",0xFE11],
- ["84318238",0xFE12],
- ["84318239",0xFE13],
- ["84318330",0xFE14],
- ["84318331",0xFE15],
- ["84318332",0xFE16],
- ["84318333",0xFE17],
- ["84318334",0xFE18],
- ["84318335",0xFE19],
- ["84318336",0xFE1A],
- ["84318337",0xFE1B],
- ["84318338",0xFE1C],
- ["84318339",0xFE1D],
- ["84318430",0xFE1E],
- ["84318431",0xFE1F],
- ["84318432",0xFE20],
- ["84318433",0xFE21],
- ["84318434",0xFE22],
- ["84318435",0xFE23],
- ["84318436",0xFE24],
- ["84318437",0xFE25],
- ["84318438",0xFE26],
- ["84318439",0xFE27],
- ["84318530",0xFE28],
- ["84318531",0xFE29],
- ["84318532",0xFE2A],
- ["84318533",0xFE2B],
- ["84318534",0xFE2C],
- ["84318535",0xFE2D],
- ["84318536",0xFE2E],
- ["84318537",0xFE2F],
- ["A955",0xFE30],
- ["A6F2",0xFE31],
- ["84318538",0xFE32],
- ["A6F4",0xFE33],
- ["A6F5",0xFE34],
- ["A6E0",0xFE35],
- ["A6E1",0xFE36],
- ["A6F0",0xFE37],
- ["A6F1",0xFE38],
- ["A6E2",0xFE39],
- ["A6E3",0xFE3A],
- ["A6EE",0xFE3B],
- ["A6EF",0xFE3C],
- ["A6E6",0xFE3D],
- ["A6E7",0xFE3E],
- ["A6E4",0xFE3F],
- ["A6E5",0xFE40],
- ["A6E8",0xFE41],
- ["A6E9",0xFE42],
- ["A6EA",0xFE43],
- ["A6EB",0xFE44],
- ["84318539",0xFE45],
- ["84318630",0xFE46],
- ["84318631",0xFE47],
- ["84318632",0xFE48],
- ["A968",0xFE49],
- ["A969",0xFE4A],
- ["A96A",0xFE4B],
- ["A96B",0xFE4C],
- ["A96C",0xFE4D],
- ["A96D",0xFE4E],
- ["A96E",0xFE4F],
- ["A96F",0xFE50],
- ["A970",0xFE51],
- ["A971",0xFE52],
- ["84318633",0xFE53],
- ["A972",0xFE54],
- ["A973",0xFE55],
- ["A974",0xFE56],
- ["A975",0xFE57],
- ["84318634",0xFE58],
- ["A976",0xFE59],
- ["A977",0xFE5A],
- ["A978",0xFE5B],
- ["A979",0xFE5C],
- ["A97A",0xFE5D],
- ["A97B",0xFE5E],
- ["A97C",0xFE5F],
- ["A97D",0xFE60],
- ["A97E",0xFE61],
- ["A980",0xFE62],
- ["A981",0xFE63],
- ["A982",0xFE64],
- ["A983",0xFE65],
- ["A984",0xFE66],
- ["84318635",0xFE67],
- ["A985",0xFE68],
- ["A986",0xFE69],
- ["A987",0xFE6A],
- ["A988",0xFE6B],
- ["84318636",0xFE6C],
- ["84318637",0xFE6D],
- ["84318638",0xFE6E],
- ["84318639",0xFE6F],
- ["84318730",0xFE70],
- ["84318731",0xFE71],
- ["84318732",0xFE72],
- ["84318733",0xFE73],
- ["84318734",0xFE74],
- ["84318735",0xFE75],
- ["84318736",0xFE76],
- ["84318737",0xFE77],
- ["84318738",0xFE78],
- ["84318739",0xFE79],
- ["84318830",0xFE7A],
- ["84318831",0xFE7B],
- ["84318832",0xFE7C],
- ["84318833",0xFE7D],
- ["84318834",0xFE7E],
- ["84318835",0xFE7F],
- ["84318836",0xFE80],
- ["84318837",0xFE81],
- ["84318838",0xFE82],
- ["84318839",0xFE83],
- ["84318930",0xFE84],
- ["84318931",0xFE85],
- ["84318932",0xFE86],
- ["84318933",0xFE87],
- ["84318934",0xFE88],
- ["84318935",0xFE89],
- ["84318936",0xFE8A],
- ["84318937",0xFE8B],
- ["84318938",0xFE8C],
- ["84318939",0xFE8D],
- ["84318A30",0xFE8E],
- ["84318A31",0xFE8F],
- ["84318A32",0xFE90],
- ["84318A33",0xFE91],
- ["84318A34",0xFE92],
- ["84318A35",0xFE93],
- ["84318A36",0xFE94],
- ["84318A37",0xFE95],
- ["84318A38",0xFE96],
- ["84318A39",0xFE97],
- ["84318B30",0xFE98],
- ["84318B31",0xFE99],
- ["84318B32",0xFE9A],
- ["84318B33",0xFE9B],
- ["84318B34",0xFE9C],
- ["84318B35",0xFE9D],
- ["84318B36",0xFE9E],
- ["84318B37",0xFE9F],
- ["84318B38",0xFEA0],
- ["84318B39",0xFEA1],
- ["84318C30",0xFEA2],
- ["84318C31",0xFEA3],
- ["84318C32",0xFEA4],
- ["84318C33",0xFEA5],
- ["84318C34",0xFEA6],
- ["84318C35",0xFEA7],
- ["84318C36",0xFEA8],
- ["84318C37",0xFEA9],
- ["84318C38",0xFEAA],
- ["84318C39",0xFEAB],
- ["84318D30",0xFEAC],
- ["84318D31",0xFEAD],
- ["84318D32",0xFEAE],
- ["84318D33",0xFEAF],
- ["84318D34",0xFEB0],
- ["84318D35",0xFEB1],
- ["84318D36",0xFEB2],
- ["84318D37",0xFEB3],
- ["84318D38",0xFEB4],
- ["84318D39",0xFEB5],
- ["84318E30",0xFEB6],
- ["84318E31",0xFEB7],
- ["84318E32",0xFEB8],
- ["84318E33",0xFEB9],
- ["84318E34",0xFEBA],
- ["84318E35",0xFEBB],
- ["84318E36",0xFEBC],
- ["84318E37",0xFEBD],
- ["84318E38",0xFEBE],
- ["84318E39",0xFEBF],
- ["84318F30",0xFEC0],
- ["84318F31",0xFEC1],
- ["84318F32",0xFEC2],
- ["84318F33",0xFEC3],
- ["84318F34",0xFEC4],
- ["84318F35",0xFEC5],
- ["84318F36",0xFEC6],
- ["84318F37",0xFEC7],
- ["84318F38",0xFEC8],
- ["84318F39",0xFEC9],
- ["84319030",0xFECA],
- ["84319031",0xFECB],
- ["84319032",0xFECC],
- ["84319033",0xFECD],
- ["84319034",0xFECE],
- ["84319035",0xFECF],
- ["84319036",0xFED0],
- ["84319037",0xFED1],
- ["84319038",0xFED2],
- ["84319039",0xFED3],
- ["84319130",0xFED4],
- ["84319131",0xFED5],
- ["84319132",0xFED6],
- ["84319133",0xFED7],
- ["84319134",0xFED8],
- ["84319135",0xFED9],
- ["84319136",0xFEDA],
- ["84319137",0xFEDB],
- ["84319138",0xFEDC],
- ["84319139",0xFEDD],
- ["84319230",0xFEDE],
- ["84319231",0xFEDF],
- ["84319232",0xFEE0],
- ["84319233",0xFEE1],
- ["84319234",0xFEE2],
- ["84319235",0xFEE3],
- ["84319236",0xFEE4],
- ["84319237",0xFEE5],
- ["84319238",0xFEE6],
- ["84319239",0xFEE7],
- ["84319330",0xFEE8],
- ["84319331",0xFEE9],
- ["84319332",0xFEEA],
- ["84319333",0xFEEB],
- ["84319334",0xFEEC],
- ["84319335",0xFEED],
- ["84319336",0xFEEE],
- ["84319337",0xFEEF],
- ["84319338",0xFEF0],
- ["84319339",0xFEF1],
- ["84319430",0xFEF2],
- ["84319431",0xFEF3],
- ["84319432",0xFEF4],
- ["84319433",0xFEF5],
- ["84319434",0xFEF6],
- ["84319435",0xFEF7],
- ["84319436",0xFEF8],
- ["84319437",0xFEF9],
- ["84319438",0xFEFA],
- ["84319439",0xFEFB],
- ["84319530",0xFEFC],
- ["84319531",0xFEFD],
- ["84319532",0xFEFE],
- ["84319533",0xFEFF],
- ["84319534",0xFF00],
- ["A3A1",0xFF01],
- ["A3A2",0xFF02],
- ["A3A3",0xFF03],
- ["A1E7",0xFF04],
- ["A3A5",0xFF05],
- ["A3A6",0xFF06],
- ["A3A7",0xFF07],
- ["A3A8",0xFF08],
- ["A3A9",0xFF09],
- ["A3AA",0xFF0A],
- ["A3AB",0xFF0B],
- ["A3AC",0xFF0C],
- ["A3AD",0xFF0D],
- ["A3AE",0xFF0E],
- ["A3AF",0xFF0F],
- ["A3B0",0xFF10],
- ["A3B1",0xFF11],
- ["A3B2",0xFF12],
- ["A3B3",0xFF13],
- ["A3B4",0xFF14],
- ["A3B5",0xFF15],
- ["A3B6",0xFF16],
- ["A3B7",0xFF17],
- ["A3B8",0xFF18],
- ["A3B9",0xFF19],
- ["A3BA",0xFF1A],
- ["A3BB",0xFF1B],
- ["A3BC",0xFF1C],
- ["A3BD",0xFF1D],
- ["A3BE",0xFF1E],
- ["A3BF",0xFF1F],
- ["A3C0",0xFF20],
- ["A3C1",0xFF21],
- ["A3C2",0xFF22],
- ["A3C3",0xFF23],
- ["A3C4",0xFF24],
- ["A3C5",0xFF25],
- ["A3C6",0xFF26],
- ["A3C7",0xFF27],
- ["A3C8",0xFF28],
- ["A3C9",0xFF29],
- ["A3CA",0xFF2A],
- ["A3CB",0xFF2B],
- ["A3CC",0xFF2C],
- ["A3CD",0xFF2D],
- ["A3CE",0xFF2E],
- ["A3CF",0xFF2F],
- ["A3D0",0xFF30],
- ["A3D1",0xFF31],
- ["A3D2",0xFF32],
- ["A3D3",0xFF33],
- ["A3D4",0xFF34],
- ["A3D5",0xFF35],
- ["A3D6",0xFF36],
- ["A3D7",0xFF37],
- ["A3D8",0xFF38],
- ["A3D9",0xFF39],
- ["A3DA",0xFF3A],
- ["A3DB",0xFF3B],
- ["A3DC",0xFF3C],
- ["A3DD",0xFF3D],
- ["A3DE",0xFF3E],
- ["A3DF",0xFF3F],
- ["A3E0",0xFF40],
- ["A3E1",0xFF41],
- ["A3E2",0xFF42],
- ["A3E3",0xFF43],
- ["A3E4",0xFF44],
- ["A3E5",0xFF45],
- ["A3E6",0xFF46],
- ["A3E7",0xFF47],
- ["A3E8",0xFF48],
- ["A3E9",0xFF49],
- ["A3EA",0xFF4A],
- ["A3EB",0xFF4B],
- ["A3EC",0xFF4C],
- ["A3ED",0xFF4D],
- ["A3EE",0xFF4E],
- ["A3EF",0xFF4F],
- ["A3F0",0xFF50],
- ["A3F1",0xFF51],
- ["A3F2",0xFF52],
- ["A3F3",0xFF53],
- ["A3F4",0xFF54],
- ["A3F5",0xFF55],
- ["A3F6",0xFF56],
- ["A3F7",0xFF57],
- ["A3F8",0xFF58],
- ["A3F9",0xFF59],
- ["A3FA",0xFF5A],
- ["A3FB",0xFF5B],
- ["A3FC",0xFF5C],
- ["A3FD",0xFF5D],
- ["A1AB",0xFF5E],
- ["84319535",0xFF5F],
- ["84319536",0xFF60],
- ["84319537",0xFF61],
- ["84319538",0xFF62],
- ["84319539",0xFF63],
- ["84319630",0xFF64],
- ["84319631",0xFF65],
- ["84319632",0xFF66],
- ["84319633",0xFF67],
- ["84319634",0xFF68],
- ["84319635",0xFF69],
- ["84319636",0xFF6A],
- ["84319637",0xFF6B],
- ["84319638",0xFF6C],
- ["84319639",0xFF6D],
- ["84319730",0xFF6E],
- ["84319731",0xFF6F],
- ["84319732",0xFF70],
- ["84319733",0xFF71],
- ["84319734",0xFF72],
- ["84319735",0xFF73],
- ["84319736",0xFF74],
- ["84319737",0xFF75],
- ["84319738",0xFF76],
- ["84319739",0xFF77],
- ["84319830",0xFF78],
- ["84319831",0xFF79],
- ["84319832",0xFF7A],
- ["84319833",0xFF7B],
- ["84319834",0xFF7C],
- ["84319835",0xFF7D],
- ["84319836",0xFF7E],
- ["84319837",0xFF7F],
- ["84319838",0xFF80],
- ["84319839",0xFF81],
- ["84319930",0xFF82],
- ["84319931",0xFF83],
- ["84319932",0xFF84],
- ["84319933",0xFF85],
- ["84319934",0xFF86],
- ["84319935",0xFF87],
- ["84319936",0xFF88],
- ["84319937",0xFF89],
- ["84319938",0xFF8A],
- ["84319939",0xFF8B],
- ["84319A30",0xFF8C],
- ["84319A31",0xFF8D],
- ["84319A32",0xFF8E],
- ["84319A33",0xFF8F],
- ["84319A34",0xFF90],
- ["84319A35",0xFF91],
- ["84319A36",0xFF92],
- ["84319A37",0xFF93],
- ["84319A38",0xFF94],
- ["84319A39",0xFF95],
- ["84319B30",0xFF96],
- ["84319B31",0xFF97],
- ["84319B32",0xFF98],
- ["84319B33",0xFF99],
- ["84319B34",0xFF9A],
- ["84319B35",0xFF9B],
- ["84319B36",0xFF9C],
- ["84319B37",0xFF9D],
- ["84319B38",0xFF9E],
- ["84319B39",0xFF9F],
- ["84319C30",0xFFA0],
- ["84319C31",0xFFA1],
- ["84319C32",0xFFA2],
- ["84319C33",0xFFA3],
- ["84319C34",0xFFA4],
- ["84319C35",0xFFA5],
- ["84319C36",0xFFA6],
- ["84319C37",0xFFA7],
- ["84319C38",0xFFA8],
- ["84319C39",0xFFA9],
- ["84319D30",0xFFAA],
- ["84319D31",0xFFAB],
- ["84319D32",0xFFAC],
- ["84319D33",0xFFAD],
- ["84319D34",0xFFAE],
- ["84319D35",0xFFAF],
- ["84319D36",0xFFB0],
- ["84319D37",0xFFB1],
- ["84319D38",0xFFB2],
- ["84319D39",0xFFB3],
- ["84319E30",0xFFB4],
- ["84319E31",0xFFB5],
- ["84319E32",0xFFB6],
- ["84319E33",0xFFB7],
- ["84319E34",0xFFB8],
- ["84319E35",0xFFB9],
- ["84319E36",0xFFBA],
- ["84319E37",0xFFBB],
- ["84319E38",0xFFBC],
- ["84319E39",0xFFBD],
- ["84319F30",0xFFBE],
- ["84319F31",0xFFBF],
- ["84319F32",0xFFC0],
- ["84319F33",0xFFC1],
- ["84319F34",0xFFC2],
- ["84319F35",0xFFC3],
- ["84319F36",0xFFC4],
- ["84319F37",0xFFC5],
- ["84319F38",0xFFC6],
- ["84319F39",0xFFC7],
- ["8431A030",0xFFC8],
- ["8431A031",0xFFC9],
- ["8431A032",0xFFCA],
- ["8431A033",0xFFCB],
- ["8431A034",0xFFCC],
- ["8431A035",0xFFCD],
- ["8431A036",0xFFCE],
- ["8431A037",0xFFCF],
- ["8431A038",0xFFD0],
- ["8431A039",0xFFD1],
- ["8431A130",0xFFD2],
- ["8431A131",0xFFD3],
- ["8431A132",0xFFD4],
- ["8431A133",0xFFD5],
- ["8431A134",0xFFD6],
- ["8431A135",0xFFD7],
- ["8431A136",0xFFD8],
- ["8431A137",0xFFD9],
- ["8431A138",0xFFDA],
- ["8431A139",0xFFDB],
- ["8431A230",0xFFDC],
- ["8431A231",0xFFDD],
- ["8431A232",0xFFDE],
- ["8431A233",0xFFDF],
- ["A1E9",0xFFE0],
- ["A1EA",0xFFE1],
- ["A956",0xFFE2],
- ["A3FE",0xFFE3],
- ["A957",0xFFE4],
- ["A3A4",0xFFE5],
- ["8431A234",0xFFE6],
- ["8431A235",0xFFE7],
- ["8431A236",0xFFE8],
- ["8431A237",0xFFE9],
- ["8431A238",0xFFEA],
- ["8431A239",0xFFEB],
- ["8431A330",0xFFEC],
- ["8431A331",0xFFED],
- ["8431A332",0xFFEE],
- ["8431A333",0xFFEF],
- ["8431A334",0xFFF0],
- ["8431A335",0xFFF1],
- ["8431A336",0xFFF2],
- ["8431A337",0xFFF3],
- ["8431A338",0xFFF4],
- ["8431A339",0xFFF5],
- ["8431A430",0xFFF6],
- ["8431A431",0xFFF7],
- ["8431A432",0xFFF8],
- ["8431A433",0xFFF9],
- ["8431A434",0xFFFA],
- ["8431A435",0xFFFB],
- ["8431A436",0xFFFC],
- ["8431A437",0xFFFD],
- ["8431A438",0xFFFE],
- ["8431A439",0xFFFF],
-]
diff --git a/enc/trans/gb18030.trans b/enc/trans/gb18030.trans
deleted file mode 100644
index 700522c9f0..0000000000
--- a/enc/trans/gb18030.trans
+++ /dev/null
@@ -1,84 +0,0 @@
-#include "transcode_data.h"
-
-<%
- require "gb18030-tbl"
-
- transcode_tbl_only "GB18030", "UTF-8", [["{00-7f}", :nomap]] +
- GB18030_TO_UCS_TBL + [
- ["{90-e2}{30-39}{81-fe}{30-39}", :func_so],
- ["e3{30-31}{81-fe}{30-39}", :func_so],
- ["e332{81-99}{30-39}", :func_so],
- ["e3329a{30-35}", :func_so], # "E3329A35" is U+10FFFF
- ]
- transcode_tbl_only "UTF-8", "GB18030", [["{00-7f}", :nomap]] +
- GB18030_TO_UCS_TBL.map {|a,b| [b,a] } + [
- ["f0{90-bf}{80-bf}{80-bf}", :func_so],
- ["{f1-f3}{80-bf}{80-bf}{80-bf}", :func_so],
- ["f4{80-8f}{80-bf}{80-bf}", :func_so]
- ]
-%>
-
-<%= transcode_generated_code %>
-
-static ssize_t
-fun_so_from_gb18030(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
-{
- /* outside BMP only */
- /* u: Unicode Scalar Value */
- unsigned int u = (s[0]-0x90)*10*126*10 + (s[1]-0x30)*126*10 + (s[2]-0x81)*10 + (s[3]-0x30) + 0x10000;
- o[0] = 0xF0 | (u>>18);
- o[1] = 0x80 | ((u>>12)&0x3F);
- o[2] = 0x80 | ((u>>6)&0x3F);
- o[3] = 0x80 | (u&0x3F);
- return 4;
-}
-
-static ssize_t
-fun_so_to_gb18030(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
-{
- /* outside BMP only */
- /* u: Unicode Scalar Value */
- unsigned int u = ((s[0]&0x07)<<18) | ((s[1]&0x3F)<<12) | ((s[2]&0x3F)<<6) | (s[3]&0x3F);
- u -= 0x10000;
- o[3] = 0x30 + u%10;
- u /= 10;
- o[2] = 0x81 + u%126;
- u /= 126;
- o[1] = 0x30 + u%10;
- o[0] = 0x90 + u/10;
- return 4;
-}
-
-
-static const rb_transcoder
-rb_from_GB18030 = {
- "GB18030", "UTF-8", from_GB18030,
- TRANSCODE_TABLE_INFO,
- 1, /* input_unit_length */
- 4, /* max_input */
- 3, /* max_output */
- asciicompat_converter, /* asciicompat_type */
- 0, NULL, NULL, /* state_size, state_init, state_fini */
- NULL, NULL, NULL, fun_so_from_gb18030,
- NULL, NULL, NULL
-};
-static const rb_transcoder
-rb_to_GB18030 = {
- "UTF-8", "GB18030", to_GB18030,
- TRANSCODE_TABLE_INFO,
- 1, /* input_unit_length */
- 4, /* max_input */
- 4, /* max_output */
- asciicompat_converter, /* asciicompat_type */
- 0, NULL, NULL, /* state_size, state_init, state_fini */
- NULL, NULL, NULL, fun_so_to_gb18030,
- NULL, NULL, NULL
-};
-
-
-void
-Init_gb18030(void)
-{
- rb_register_transcoder(&rb_from_GB18030);
- rb_register_transcoder(&rb_to_GB18030);
-}
diff --git a/enc/trans/gbk-tbl.rb b/enc/trans/gbk-tbl.rb
deleted file mode 100644
index 5b4374bb61..0000000000
--- a/enc/trans/gbk-tbl.rb
+++ /dev/null
@@ -1,21793 +0,0 @@
-GBK_TO_UCS_TBL= [
- ["A1E8",0xA4],
- ["A1EC",0xA7],
- ["A1A7",0xA8],
- ["A1E3",0xB0],
- ["A1C0",0xB1],
- ["A1A4",0xB7],
- ["A1C1",0xD7],
- ["A8A4",0xE0],
- ["A8A2",0xE1],
- ["A8A8",0xE8],
- ["A8A6",0xE9],
- ["A8BA",0xEA],
- ["A8AC",0xEC],
- ["A8AA",0xED],
- ["A8B0",0xF2],
- ["A8AE",0xF3],
- ["A1C2",0xF7],
- ["A8B4",0xF9],
- ["A8B2",0xFA],
- ["A8B9",0xFC],
- ["A8A1",0x101],
- ["A8A5",0x113],
- ["A8A7",0x11B],
- ["A8A9",0x12B],
- ["A8BD",0x144],
- ["A8BE",0x148],
- ["A8AD",0x14D],
- ["A8B1",0x16B],
- ["A8A3",0x1CE],
- ["A8AB",0x1D0],
- ["A8AF",0x1D2],
- ["A8B3",0x1D4],
- ["A8B5",0x1D6],
- ["A8B6",0x1D8],
- ["A8B7",0x1DA],
- ["A8B8",0x1DC],
- ["A8BB",0x251],
- ["A8C0",0x261],
- ["A1A6",0x2C7],
- ["A1A5",0x2C9],
- ["A840",0x2CA],
- ["A841",0x2CB],
- ["A842",0x2D9],
- ["A6A1",0x391],
- ["A6A2",0x392],
- ["A6A3",0x393],
- ["A6A4",0x394],
- ["A6A5",0x395],
- ["A6A6",0x396],
- ["A6A7",0x397],
- ["A6A8",0x398],
- ["A6A9",0x399],
- ["A6AA",0x39A],
- ["A6AB",0x39B],
- ["A6AC",0x39C],
- ["A6AD",0x39D],
- ["A6AE",0x39E],
- ["A6AF",0x39F],
- ["A6B0",0x3A0],
- ["A6B1",0x3A1],
- ["A6B2",0x3A3],
- ["A6B3",0x3A4],
- ["A6B4",0x3A5],
- ["A6B5",0x3A6],
- ["A6B6",0x3A7],
- ["A6B7",0x3A8],
- ["A6B8",0x3A9],
- ["A6C1",0x3B1],
- ["A6C2",0x3B2],
- ["A6C3",0x3B3],
- ["A6C4",0x3B4],
- ["A6C5",0x3B5],
- ["A6C6",0x3B6],
- ["A6C7",0x3B7],
- ["A6C8",0x3B8],
- ["A6C9",0x3B9],
- ["A6CA",0x3BA],
- ["A6CB",0x3BB],
- ["A6CC",0x3BC],
- ["A6CD",0x3BD],
- ["A6CE",0x3BE],
- ["A6CF",0x3BF],
- ["A6D0",0x3C0],
- ["A6D1",0x3C1],
- ["A6D2",0x3C3],
- ["A6D3",0x3C4],
- ["A6D4",0x3C5],
- ["A6D5",0x3C6],
- ["A6D6",0x3C7],
- ["A6D7",0x3C8],
- ["A6D8",0x3C9],
- ["A7A7",0x401],
- ["A7A1",0x410],
- ["A7A2",0x411],
- ["A7A3",0x412],
- ["A7A4",0x413],
- ["A7A5",0x414],
- ["A7A6",0x415],
- ["A7A8",0x416],
- ["A7A9",0x417],
- ["A7AA",0x418],
- ["A7AB",0x419],
- ["A7AC",0x41A],
- ["A7AD",0x41B],
- ["A7AE",0x41C],
- ["A7AF",0x41D],
- ["A7B0",0x41E],
- ["A7B1",0x41F],
- ["A7B2",0x420],
- ["A7B3",0x421],
- ["A7B4",0x422],
- ["A7B5",0x423],
- ["A7B6",0x424],
- ["A7B7",0x425],
- ["A7B8",0x426],
- ["A7B9",0x427],
- ["A7BA",0x428],
- ["A7BB",0x429],
- ["A7BC",0x42A],
- ["A7BD",0x42B],
- ["A7BE",0x42C],
- ["A7BF",0x42D],
- ["A7C0",0x42E],
- ["A7C1",0x42F],
- ["A7D1",0x430],
- ["A7D2",0x431],
- ["A7D3",0x432],
- ["A7D4",0x433],
- ["A7D5",0x434],
- ["A7D6",0x435],
- ["A7D8",0x436],
- ["A7D9",0x437],
- ["A7DA",0x438],
- ["A7DB",0x439],
- ["A7DC",0x43A],
- ["A7DD",0x43B],
- ["A7DE",0x43C],
- ["A7DF",0x43D],
- ["A7E0",0x43E],
- ["A7E1",0x43F],
- ["A7E2",0x440],
- ["A7E3",0x441],
- ["A7E4",0x442],
- ["A7E5",0x443],
- ["A7E6",0x444],
- ["A7E7",0x445],
- ["A7E8",0x446],
- ["A7E9",0x447],
- ["A7EA",0x448],
- ["A7EB",0x449],
- ["A7EC",0x44A],
- ["A7ED",0x44B],
- ["A7EE",0x44C],
- ["A7EF",0x44D],
- ["A7F0",0x44E],
- ["A7F1",0x44F],
- ["A7D7",0x451],
- ["A95C",0x2010],
- ["A843",0x2013],
- ["A1AA",0x2014],
- ["A844",0x2015],
- ["A1AC",0x2016],
- ["A1AE",0x2018],
- ["A1AF",0x2019],
- ["A1B0",0x201C],
- ["A1B1",0x201D],
- ["A845",0x2025],
- ["A1AD",0x2026],
- ["A1EB",0x2030],
- ["A1E4",0x2032],
- ["A1E5",0x2033],
- ["A846",0x2035],
- ["A1F9",0x203B],
- ["A1E6",0x2103],
- ["A847",0x2105],
- ["A848",0x2109],
- ["A1ED",0x2116],
- ["A959",0x2121],
- ["A2F1",0x2160],
- ["A2F2",0x2161],
- ["A2F3",0x2162],
- ["A2F4",0x2163],
- ["A2F5",0x2164],
- ["A2F6",0x2165],
- ["A2F7",0x2166],
- ["A2F8",0x2167],
- ["A2F9",0x2168],
- ["A2FA",0x2169],
- ["A2FB",0x216A],
- ["A2FC",0x216B],
- ["A2A1",0x2170],
- ["A2A2",0x2171],
- ["A2A3",0x2172],
- ["A2A4",0x2173],
- ["A2A5",0x2174],
- ["A2A6",0x2175],
- ["A2A7",0x2176],
- ["A2A8",0x2177],
- ["A2A9",0x2178],
- ["A2AA",0x2179],
- ["A1FB",0x2190],
- ["A1FC",0x2191],
- ["A1FA",0x2192],
- ["A1FD",0x2193],
- ["A849",0x2196],
- ["A84A",0x2197],
- ["A84B",0x2198],
- ["A84C",0x2199],
- ["A1CA",0x2208],
- ["A1C7",0x220F],
- ["A1C6",0x2211],
- ["A84D",0x2215],
- ["A1CC",0x221A],
- ["A1D8",0x221D],
- ["A1DE",0x221E],
- ["A84E",0x221F],
- ["A1CF",0x2220],
- ["A84F",0x2223],
- ["A1CE",0x2225],
- ["A1C4",0x2227],
- ["A1C5",0x2228],
- ["A1C9",0x2229],
- ["A1C8",0x222A],
- ["A1D2",0x222B],
- ["A1D3",0x222E],
- ["A1E0",0x2234],
- ["A1DF",0x2235],
- ["A1C3",0x2236],
- ["A1CB",0x2237],
- ["A1D7",0x223D],
- ["A1D6",0x2248],
- ["A1D5",0x224C],
- ["A850",0x2252],
- ["A1D9",0x2260],
- ["A1D4",0x2261],
- ["A1DC",0x2264],
- ["A1DD",0x2265],
- ["A851",0x2266],
- ["A852",0x2267],
- ["A1DA",0x226E],
- ["A1DB",0x226F],
- ["A892",0x2295],
- ["A1D1",0x2299],
- ["A1CD",0x22A5],
- ["A853",0x22BF],
- ["A1D0",0x2312],
- ["A2D9",0x2460],
- ["A2DA",0x2461],
- ["A2DB",0x2462],
- ["A2DC",0x2463],
- ["A2DD",0x2464],
- ["A2DE",0x2465],
- ["A2DF",0x2466],
- ["A2E0",0x2467],
- ["A2E1",0x2468],
- ["A2E2",0x2469],
- ["A2C5",0x2474],
- ["A2C6",0x2475],
- ["A2C7",0x2476],
- ["A2C8",0x2477],
- ["A2C9",0x2478],
- ["A2CA",0x2479],
- ["A2CB",0x247A],
- ["A2CC",0x247B],
- ["A2CD",0x247C],
- ["A2CE",0x247D],
- ["A2CF",0x247E],
- ["A2D0",0x247F],
- ["A2D1",0x2480],
- ["A2D2",0x2481],
- ["A2D3",0x2482],
- ["A2D4",0x2483],
- ["A2D5",0x2484],
- ["A2D6",0x2485],
- ["A2D7",0x2486],
- ["A2D8",0x2487],
- ["A2B1",0x2488],
- ["A2B2",0x2489],
- ["A2B3",0x248A],
- ["A2B4",0x248B],
- ["A2B5",0x248C],
- ["A2B6",0x248D],
- ["A2B7",0x248E],
- ["A2B8",0x248F],
- ["A2B9",0x2490],
- ["A2BA",0x2491],
- ["A2BB",0x2492],
- ["A2BC",0x2493],
- ["A2BD",0x2494],
- ["A2BE",0x2495],
- ["A2BF",0x2496],
- ["A2C0",0x2497],
- ["A2C1",0x2498],
- ["A2C2",0x2499],
- ["A2C3",0x249A],
- ["A2C4",0x249B],
- ["A9A4",0x2500],
- ["A9A5",0x2501],
- ["A9A6",0x2502],
- ["A9A7",0x2503],
- ["A9A8",0x2504],
- ["A9A9",0x2505],
- ["A9AA",0x2506],
- ["A9AB",0x2507],
- ["A9AC",0x2508],
- ["A9AD",0x2509],
- ["A9AE",0x250A],
- ["A9AF",0x250B],
- ["A9B0",0x250C],
- ["A9B1",0x250D],
- ["A9B2",0x250E],
- ["A9B3",0x250F],
- ["A9B4",0x2510],
- ["A9B5",0x2511],
- ["A9B6",0x2512],
- ["A9B7",0x2513],
- ["A9B8",0x2514],
- ["A9B9",0x2515],
- ["A9BA",0x2516],
- ["A9BB",0x2517],
- ["A9BC",0x2518],
- ["A9BD",0x2519],
- ["A9BE",0x251A],
- ["A9BF",0x251B],
- ["A9C0",0x251C],
- ["A9C1",0x251D],
- ["A9C2",0x251E],
- ["A9C3",0x251F],
- ["A9C4",0x2520],
- ["A9C5",0x2521],
- ["A9C6",0x2522],
- ["A9C7",0x2523],
- ["A9C8",0x2524],
- ["A9C9",0x2525],
- ["A9CA",0x2526],
- ["A9CB",0x2527],
- ["A9CC",0x2528],
- ["A9CD",0x2529],
- ["A9CE",0x252A],
- ["A9CF",0x252B],
- ["A9D0",0x252C],
- ["A9D1",0x252D],
- ["A9D2",0x252E],
- ["A9D3",0x252F],
- ["A9D4",0x2530],
- ["A9D5",0x2531],
- ["A9D6",0x2532],
- ["A9D7",0x2533],
- ["A9D8",0x2534],
- ["A9D9",0x2535],
- ["A9DA",0x2536],
- ["A9DB",0x2537],
- ["A9DC",0x2538],
- ["A9DD",0x2539],
- ["A9DE",0x253A],
- ["A9DF",0x253B],
- ["A9E0",0x253C],
- ["A9E1",0x253D],
- ["A9E2",0x253E],
- ["A9E3",0x253F],
- ["A9E4",0x2540],
- ["A9E5",0x2541],
- ["A9E6",0x2542],
- ["A9E7",0x2543],
- ["A9E8",0x2544],
- ["A9E9",0x2545],
- ["A9EA",0x2546],
- ["A9EB",0x2547],
- ["A9EC",0x2548],
- ["A9ED",0x2549],
- ["A9EE",0x254A],
- ["A9EF",0x254B],
- ["A854",0x2550],
- ["A855",0x2551],
- ["A856",0x2552],
- ["A857",0x2553],
- ["A858",0x2554],
- ["A859",0x2555],
- ["A85A",0x2556],
- ["A85B",0x2557],
- ["A85C",0x2558],
- ["A85D",0x2559],
- ["A85E",0x255A],
- ["A85F",0x255B],
- ["A860",0x255C],
- ["A861",0x255D],
- ["A862",0x255E],
- ["A863",0x255F],
- ["A864",0x2560],
- ["A865",0x2561],
- ["A866",0x2562],
- ["A867",0x2563],
- ["A868",0x2564],
- ["A869",0x2565],
- ["A86A",0x2566],
- ["A86B",0x2567],
- ["A86C",0x2568],
- ["A86D",0x2569],
- ["A86E",0x256A],
- ["A86F",0x256B],
- ["A870",0x256C],
- ["A871",0x256D],
- ["A872",0x256E],
- ["A873",0x256F],
- ["A874",0x2570],
- ["A875",0x2571],
- ["A876",0x2572],
- ["A877",0x2573],
- ["A878",0x2581],
- ["A879",0x2582],
- ["A87A",0x2583],
- ["A87B",0x2584],
- ["A87C",0x2585],
- ["A87D",0x2586],
- ["A87E",0x2587],
- ["A880",0x2588],
- ["A881",0x2589],
- ["A882",0x258A],
- ["A883",0x258B],
- ["A884",0x258C],
- ["A885",0x258D],
- ["A886",0x258E],
- ["A887",0x258F],
- ["A888",0x2593],
- ["A889",0x2594],
- ["A88A",0x2595],
- ["A1F6",0x25A0],
- ["A1F5",0x25A1],
- ["A1F8",0x25B2],
- ["A1F7",0x25B3],
- ["A88B",0x25BC],
- ["A88C",0x25BD],
- ["A1F4",0x25C6],
- ["A1F3",0x25C7],
- ["A1F0",0x25CB],
- ["A1F2",0x25CE],
- ["A1F1",0x25CF],
- ["A88D",0x25E2],
- ["A88E",0x25E3],
- ["A88F",0x25E4],
- ["A890",0x25E5],
- ["A1EF",0x2605],
- ["A1EE",0x2606],
- ["A891",0x2609],
- ["A1E2",0x2640],
- ["A1E1",0x2642],
- ["A1A1",0x3000],
- ["A1A2",0x3001],
- ["A1A3",0x3002],
- ["A1A8",0x3003],
- ["A1A9",0x3005],
- ["A965",0x3006],
- ["A996",0x3007],
- ["A1B4",0x3008],
- ["A1B5",0x3009],
- ["A1B6",0x300A],
- ["A1B7",0x300B],
- ["A1B8",0x300C],
- ["A1B9",0x300D],
- ["A1BA",0x300E],
- ["A1BB",0x300F],
- ["A1BE",0x3010],
- ["A1BF",0x3011],
- ["A893",0x3012],
- ["A1FE",0x3013],
- ["A1B2",0x3014],
- ["A1B3",0x3015],
- ["A1BC",0x3016],
- ["A1BD",0x3017],
- ["A894",0x301D],
- ["A895",0x301E],
- ["A940",0x3021],
- ["A941",0x3022],
- ["A942",0x3023],
- ["A943",0x3024],
- ["A944",0x3025],
- ["A945",0x3026],
- ["A946",0x3027],
- ["A947",0x3028],
- ["A948",0x3029],
- ["A4A1",0x3041],
- ["A4A2",0x3042],
- ["A4A3",0x3043],
- ["A4A4",0x3044],
- ["A4A5",0x3045],
- ["A4A6",0x3046],
- ["A4A7",0x3047],
- ["A4A8",0x3048],
- ["A4A9",0x3049],
- ["A4AA",0x304A],
- ["A4AB",0x304B],
- ["A4AC",0x304C],
- ["A4AD",0x304D],
- ["A4AE",0x304E],
- ["A4AF",0x304F],
- ["A4B0",0x3050],
- ["A4B1",0x3051],
- ["A4B2",0x3052],
- ["A4B3",0x3053],
- ["A4B4",0x3054],
- ["A4B5",0x3055],
- ["A4B6",0x3056],
- ["A4B7",0x3057],
- ["A4B8",0x3058],
- ["A4B9",0x3059],
- ["A4BA",0x305A],
- ["A4BB",0x305B],
- ["A4BC",0x305C],
- ["A4BD",0x305D],
- ["A4BE",0x305E],
- ["A4BF",0x305F],
- ["A4C0",0x3060],
- ["A4C1",0x3061],
- ["A4C2",0x3062],
- ["A4C3",0x3063],
- ["A4C4",0x3064],
- ["A4C5",0x3065],
- ["A4C6",0x3066],
- ["A4C7",0x3067],
- ["A4C8",0x3068],
- ["A4C9",0x3069],
- ["A4CA",0x306A],
- ["A4CB",0x306B],
- ["A4CC",0x306C],
- ["A4CD",0x306D],
- ["A4CE",0x306E],
- ["A4CF",0x306F],
- ["A4D0",0x3070],
- ["A4D1",0x3071],
- ["A4D2",0x3072],
- ["A4D3",0x3073],
- ["A4D4",0x3074],
- ["A4D5",0x3075],
- ["A4D6",0x3076],
- ["A4D7",0x3077],
- ["A4D8",0x3078],
- ["A4D9",0x3079],
- ["A4DA",0x307A],
- ["A4DB",0x307B],
- ["A4DC",0x307C],
- ["A4DD",0x307D],
- ["A4DE",0x307E],
- ["A4DF",0x307F],
- ["A4E0",0x3080],
- ["A4E1",0x3081],
- ["A4E2",0x3082],
- ["A4E3",0x3083],
- ["A4E4",0x3084],
- ["A4E5",0x3085],
- ["A4E6",0x3086],
- ["A4E7",0x3087],
- ["A4E8",0x3088],
- ["A4E9",0x3089],
- ["A4EA",0x308A],
- ["A4EB",0x308B],
- ["A4EC",0x308C],
- ["A4ED",0x308D],
- ["A4EE",0x308E],
- ["A4EF",0x308F],
- ["A4F0",0x3090],
- ["A4F1",0x3091],
- ["A4F2",0x3092],
- ["A4F3",0x3093],
- ["A961",0x309B],
- ["A962",0x309C],
- ["A966",0x309D],
- ["A967",0x309E],
- ["A5A1",0x30A1],
- ["A5A2",0x30A2],
- ["A5A3",0x30A3],
- ["A5A4",0x30A4],
- ["A5A5",0x30A5],
- ["A5A6",0x30A6],
- ["A5A7",0x30A7],
- ["A5A8",0x30A8],
- ["A5A9",0x30A9],
- ["A5AA",0x30AA],
- ["A5AB",0x30AB],
- ["A5AC",0x30AC],
- ["A5AD",0x30AD],
- ["A5AE",0x30AE],
- ["A5AF",0x30AF],
- ["A5B0",0x30B0],
- ["A5B1",0x30B1],
- ["A5B2",0x30B2],
- ["A5B3",0x30B3],
- ["A5B4",0x30B4],
- ["A5B5",0x30B5],
- ["A5B6",0x30B6],
- ["A5B7",0x30B7],
- ["A5B8",0x30B8],
- ["A5B9",0x30B9],
- ["A5BA",0x30BA],
- ["A5BB",0x30BB],
- ["A5BC",0x30BC],
- ["A5BD",0x30BD],
- ["A5BE",0x30BE],
- ["A5BF",0x30BF],
- ["A5C0",0x30C0],
- ["A5C1",0x30C1],
- ["A5C2",0x30C2],
- ["A5C3",0x30C3],
- ["A5C4",0x30C4],
- ["A5C5",0x30C5],
- ["A5C6",0x30C6],
- ["A5C7",0x30C7],
- ["A5C8",0x30C8],
- ["A5C9",0x30C9],
- ["A5CA",0x30CA],
- ["A5CB",0x30CB],
- ["A5CC",0x30CC],
- ["A5CD",0x30CD],
- ["A5CE",0x30CE],
- ["A5CF",0x30CF],
- ["A5D0",0x30D0],
- ["A5D1",0x30D1],
- ["A5D2",0x30D2],
- ["A5D3",0x30D3],
- ["A5D4",0x30D4],
- ["A5D5",0x30D5],
- ["A5D6",0x30D6],
- ["A5D7",0x30D7],
- ["A5D8",0x30D8],
- ["A5D9",0x30D9],
- ["A5DA",0x30DA],
- ["A5DB",0x30DB],
- ["A5DC",0x30DC],
- ["A5DD",0x30DD],
- ["A5DE",0x30DE],
- ["A5DF",0x30DF],
- ["A5E0",0x30E0],
- ["A5E1",0x30E1],
- ["A5E2",0x30E2],
- ["A5E3",0x30E3],
- ["A5E4",0x30E4],
- ["A5E5",0x30E5],
- ["A5E6",0x30E6],
- ["A5E7",0x30E7],
- ["A5E8",0x30E8],
- ["A5E9",0x30E9],
- ["A5EA",0x30EA],
- ["A5EB",0x30EB],
- ["A5EC",0x30EC],
- ["A5ED",0x30ED],
- ["A5EE",0x30EE],
- ["A5EF",0x30EF],
- ["A5F0",0x30F0],
- ["A5F1",0x30F1],
- ["A5F2",0x30F2],
- ["A5F3",0x30F3],
- ["A5F4",0x30F4],
- ["A5F5",0x30F5],
- ["A5F6",0x30F6],
- ["A960",0x30FC],
- ["A963",0x30FD],
- ["A964",0x30FE],
- ["A8C5",0x3105],
- ["A8C6",0x3106],
- ["A8C7",0x3107],
- ["A8C8",0x3108],
- ["A8C9",0x3109],
- ["A8CA",0x310A],
- ["A8CB",0x310B],
- ["A8CC",0x310C],
- ["A8CD",0x310D],
- ["A8CE",0x310E],
- ["A8CF",0x310F],
- ["A8D0",0x3110],
- ["A8D1",0x3111],
- ["A8D2",0x3112],
- ["A8D3",0x3113],
- ["A8D4",0x3114],
- ["A8D5",0x3115],
- ["A8D6",0x3116],
- ["A8D7",0x3117],
- ["A8D8",0x3118],
- ["A8D9",0x3119],
- ["A8DA",0x311A],
- ["A8DB",0x311B],
- ["A8DC",0x311C],
- ["A8DD",0x311D],
- ["A8DE",0x311E],
- ["A8DF",0x311F],
- ["A8E0",0x3120],
- ["A8E1",0x3121],
- ["A8E2",0x3122],
- ["A8E3",0x3123],
- ["A8E4",0x3124],
- ["A8E5",0x3125],
- ["A8E6",0x3126],
- ["A8E7",0x3127],
- ["A8E8",0x3128],
- ["A8E9",0x3129],
- ["A2E5",0x3220],
- ["A2E6",0x3221],
- ["A2E7",0x3222],
- ["A2E8",0x3223],
- ["A2E9",0x3224],
- ["A2EA",0x3225],
- ["A2EB",0x3226],
- ["A2EC",0x3227],
- ["A2ED",0x3228],
- ["A2EE",0x3229],
- ["A95A",0x3231],
- ["A949",0x32A3],
- ["A94A",0x338E],
- ["A94B",0x338F],
- ["A94C",0x339C],
- ["A94D",0x339D],
- ["A94E",0x339E],
- ["A94F",0x33A1],
- ["A950",0x33C4],
- ["A951",0x33CE],
- ["A952",0x33D1],
- ["A953",0x33D2],
- ["A954",0x33D5],
- ["D2BB",0x4E00],
- ["B6A1",0x4E01],
- ["8140",0x4E02],
- ["C6DF",0x4E03],
- ["8141",0x4E04],
- ["8142",0x4E05],
- ["8143",0x4E06],
- ["CDF2",0x4E07],
- ["D5C9",0x4E08],
- ["C8FD",0x4E09],
- ["C9CF",0x4E0A],
- ["CFC2",0x4E0B],
- ["D8A2",0x4E0C],
- ["B2BB",0x4E0D],
- ["D3EB",0x4E0E],
- ["8144",0x4E0F],
- ["D8A4",0x4E10],
- ["B3F3",0x4E11],
- ["8145",0x4E12],
- ["D7A8",0x4E13],
- ["C7D2",0x4E14],
- ["D8A7",0x4E15],
- ["CAC0",0x4E16],
- ["8146",0x4E17],
- ["C7F0",0x4E18],
- ["B1FB",0x4E19],
- ["D2B5",0x4E1A],
- ["B4D4",0x4E1B],
- ["B6AB",0x4E1C],
- ["CBBF",0x4E1D],
- ["D8A9",0x4E1E],
- ["8147",0x4E1F],
- ["8148",0x4E20],
- ["8149",0x4E21],
- ["B6AA",0x4E22],
- ["814A",0x4E23],
- ["C1BD",0x4E24],
- ["D1CF",0x4E25],
- ["814B",0x4E26],
- ["C9A5",0x4E27],
- ["D8AD",0x4E28],
- ["814C",0x4E29],
- ["B8F6",0x4E2A],
- ["D1BE",0x4E2B],
- ["E3DC",0x4E2C],
- ["D6D0",0x4E2D],
- ["814D",0x4E2E],
- ["814E",0x4E2F],
- ["B7E1",0x4E30],
- ["814F",0x4E31],
- ["B4AE",0x4E32],
- ["8150",0x4E33],
- ["C1D9",0x4E34],
- ["8151",0x4E35],
- ["D8BC",0x4E36],
- ["8152",0x4E37],
- ["CDE8",0x4E38],
- ["B5A4",0x4E39],
- ["CEAA",0x4E3A],
- ["D6F7",0x4E3B],
- ["8153",0x4E3C],
- ["C0F6",0x4E3D],
- ["BED9",0x4E3E],
- ["D8AF",0x4E3F],
- ["8154",0x4E40],
- ["8155",0x4E41],
- ["8156",0x4E42],
- ["C4CB",0x4E43],
- ["8157",0x4E44],
- ["BEC3",0x4E45],
- ["8158",0x4E46],
- ["D8B1",0x4E47],
- ["C3B4",0x4E48],
- ["D2E5",0x4E49],
- ["8159",0x4E4A],
- ["D6AE",0x4E4B],
- ["CEDA",0x4E4C],
- ["D5A7",0x4E4D],
- ["BAF5",0x4E4E],
- ["B7A6",0x4E4F],
- ["C0D6",0x4E50],
- ["815A",0x4E51],
- ["C6B9",0x4E52],
- ["C5D2",0x4E53],
- ["C7C7",0x4E54],
- ["815B",0x4E55],
- ["B9D4",0x4E56],
- ["815C",0x4E57],
- ["B3CB",0x4E58],
- ["D2D2",0x4E59],
- ["815D",0x4E5A],
- ["815E",0x4E5B],
- ["D8BF",0x4E5C],
- ["BEC5",0x4E5D],
- ["C6F2",0x4E5E],
- ["D2B2",0x4E5F],
- ["CFB0",0x4E60],
- ["CFE7",0x4E61],
- ["815F",0x4E62],
- ["8160",0x4E63],
- ["8161",0x4E64],
- ["8162",0x4E65],
- ["CAE9",0x4E66],
- ["8163",0x4E67],
- ["8164",0x4E68],
- ["D8C0",0x4E69],
- ["8165",0x4E6A],
- ["8166",0x4E6B],
- ["8167",0x4E6C],
- ["8168",0x4E6D],
- ["8169",0x4E6E],
- ["816A",0x4E6F],
- ["C2F2",0x4E70],
- ["C2D2",0x4E71],
- ["816B",0x4E72],
- ["C8E9",0x4E73],
- ["816C",0x4E74],
- ["816D",0x4E75],
- ["816E",0x4E76],
- ["816F",0x4E77],
- ["8170",0x4E78],
- ["8171",0x4E79],
- ["8172",0x4E7A],
- ["8173",0x4E7B],
- ["8174",0x4E7C],
- ["8175",0x4E7D],
- ["C7AC",0x4E7E],
- ["8176",0x4E7F],
- ["8177",0x4E80],
- ["8178",0x4E81],
- ["8179",0x4E82],
- ["817A",0x4E83],
- ["817B",0x4E84],
- ["817C",0x4E85],
- ["C1CB",0x4E86],
- ["817D",0x4E87],
- ["D3E8",0x4E88],
- ["D5F9",0x4E89],
- ["817E",0x4E8A],
- ["CAC2",0x4E8B],
- ["B6FE",0x4E8C],
- ["D8A1",0x4E8D],
- ["D3DA",0x4E8E],
- ["BFF7",0x4E8F],
- ["8180",0x4E90],
- ["D4C6",0x4E91],
- ["BBA5",0x4E92],
- ["D8C1",0x4E93],
- ["CEE5",0x4E94],
- ["BEAE",0x4E95],
- ["8181",0x4E96],
- ["8182",0x4E97],
- ["D8A8",0x4E98],
- ["8183",0x4E99],
- ["D1C7",0x4E9A],
- ["D0A9",0x4E9B],
- ["8184",0x4E9C],
- ["8185",0x4E9D],
- ["8186",0x4E9E],
- ["D8BD",0x4E9F],
- ["D9EF",0x4EA0],
- ["CDF6",0x4EA1],
- ["BFBA",0x4EA2],
- ["8187",0x4EA3],
- ["BDBB",0x4EA4],
- ["BAA5",0x4EA5],
- ["D2E0",0x4EA6],
- ["B2FA",0x4EA7],
- ["BAE0",0x4EA8],
- ["C4B6",0x4EA9],
- ["8188",0x4EAA],
- ["CFED",0x4EAB],
- ["BEA9",0x4EAC],
- ["CDA4",0x4EAD],
- ["C1C1",0x4EAE],
- ["8189",0x4EAF],
- ["818A",0x4EB0],
- ["818B",0x4EB1],
- ["C7D7",0x4EB2],
- ["D9F1",0x4EB3],
- ["818C",0x4EB4],
- ["D9F4",0x4EB5],
- ["818D",0x4EB6],
- ["818E",0x4EB7],
- ["818F",0x4EB8],
- ["8190",0x4EB9],
- ["C8CB",0x4EBA],
- ["D8E9",0x4EBB],
- ["8191",0x4EBC],
- ["8192",0x4EBD],
- ["8193",0x4EBE],
- ["D2DA",0x4EBF],
- ["CAB2",0x4EC0],
- ["C8CA",0x4EC1],
- ["D8EC",0x4EC2],
- ["D8EA",0x4EC3],
- ["D8C6",0x4EC4],
- ["BDF6",0x4EC5],
- ["C6CD",0x4EC6],
- ["B3F0",0x4EC7],
- ["8194",0x4EC8],
- ["D8EB",0x4EC9],
- ["BDF1",0x4ECA],
- ["BDE9",0x4ECB],
- ["8195",0x4ECC],
- ["C8D4",0x4ECD],
- ["B4D3",0x4ECE],
- ["8196",0x4ECF],
- ["8197",0x4ED0],
- ["C2D8",0x4ED1],
- ["8198",0x4ED2],
- ["B2D6",0x4ED3],
- ["D7D0",0x4ED4],
- ["CACB",0x4ED5],
- ["CBFB",0x4ED6],
- ["D5CC",0x4ED7],
- ["B8B6",0x4ED8],
- ["CFC9",0x4ED9],
- ["8199",0x4EDA],
- ["819A",0x4EDB],
- ["819B",0x4EDC],
- ["D9DA",0x4EDD],
- ["D8F0",0x4EDE],
- ["C7AA",0x4EDF],
- ["819C",0x4EE0],
- ["D8EE",0x4EE1],
- ["819D",0x4EE2],
- ["B4FA",0x4EE3],
- ["C1EE",0x4EE4],
- ["D2D4",0x4EE5],
- ["819E",0x4EE6],
- ["819F",0x4EE7],
- ["D8ED",0x4EE8],
- ["81A0",0x4EE9],
- ["D2C7",0x4EEA],
- ["D8EF",0x4EEB],
- ["C3C7",0x4EEC],
- ["81A1",0x4EED],
- ["81A2",0x4EEE],
- ["81A3",0x4EEF],
- ["D1F6",0x4EF0],
- ["81A4",0x4EF1],
- ["D6D9",0x4EF2],
- ["D8F2",0x4EF3],
- ["81A5",0x4EF4],
- ["D8F5",0x4EF5],
- ["BCFE",0x4EF6],
- ["BCDB",0x4EF7],
- ["81A6",0x4EF8],
- ["81A7",0x4EF9],
- ["81A8",0x4EFA],
- ["C8CE",0x4EFB],
- ["81A9",0x4EFC],
- ["B7DD",0x4EFD],
- ["81AA",0x4EFE],
- ["B7C2",0x4EFF],
- ["81AB",0x4F00],
- ["C6F3",0x4F01],
- ["81AC",0x4F02],
- ["81AD",0x4F03],
- ["81AE",0x4F04],
- ["81AF",0x4F05],
- ["81B0",0x4F06],
- ["81B1",0x4F07],
- ["81B2",0x4F08],
- ["D8F8",0x4F09],
- ["D2C1",0x4F0A],
- ["81B3",0x4F0B],
- ["81B4",0x4F0C],
- ["CEE9",0x4F0D],
- ["BCBF",0x4F0E],
- ["B7FC",0x4F0F],
- ["B7A5",0x4F10],
- ["D0DD",0x4F11],
- ["81B5",0x4F12],
- ["81B6",0x4F13],
- ["81B7",0x4F14],
- ["81B8",0x4F15],
- ["81B9",0x4F16],
- ["D6DA",0x4F17],
- ["D3C5",0x4F18],
- ["BBEF",0x4F19],
- ["BBE1",0x4F1A],
- ["D8F1",0x4F1B],
- ["81BA",0x4F1C],
- ["81BB",0x4F1D],
- ["C9A1",0x4F1E],
- ["CEB0",0x4F1F],
- ["B4AB",0x4F20],
- ["81BC",0x4F21],
- ["D8F3",0x4F22],
- ["81BD",0x4F23],
- ["C9CB",0x4F24],
- ["D8F6",0x4F25],
- ["C2D7",0x4F26],
- ["D8F7",0x4F27],
- ["81BE",0x4F28],
- ["81BF",0x4F29],
- ["CEB1",0x4F2A],
- ["D8F9",0x4F2B],
- ["81C0",0x4F2C],
- ["81C1",0x4F2D],
- ["81C2",0x4F2E],
- ["B2AE",0x4F2F],
- ["B9C0",0x4F30],
- ["81C3",0x4F31],
- ["D9A3",0x4F32],
- ["81C4",0x4F33],
- ["B0E9",0x4F34],
- ["81C5",0x4F35],
- ["C1E6",0x4F36],
- ["81C6",0x4F37],
- ["C9EC",0x4F38],
- ["81C7",0x4F39],
- ["CBC5",0x4F3A],
- ["81C8",0x4F3B],
- ["CBC6",0x4F3C],
- ["D9A4",0x4F3D],
- ["81C9",0x4F3E],
- ["81CA",0x4F3F],
- ["81CB",0x4F40],
- ["81CC",0x4F41],
- ["81CD",0x4F42],
- ["B5E8",0x4F43],
- ["81CE",0x4F44],
- ["81CF",0x4F45],
- ["B5AB",0x4F46],
- ["81D0",0x4F47],
- ["81D1",0x4F48],
- ["81D2",0x4F49],
- ["81D3",0x4F4A],
- ["81D4",0x4F4B],
- ["81D5",0x4F4C],
- ["CEBB",0x4F4D],
- ["B5CD",0x4F4E],
- ["D7A1",0x4F4F],
- ["D7F4",0x4F50],
- ["D3D3",0x4F51],
- ["81D6",0x4F52],
- ["CCE5",0x4F53],
- ["81D7",0x4F54],
- ["BACE",0x4F55],
- ["81D8",0x4F56],
- ["D9A2",0x4F57],
- ["D9DC",0x4F58],
- ["D3E0",0x4F59],
- ["D8FD",0x4F5A],
- ["B7F0",0x4F5B],
- ["D7F7",0x4F5C],
- ["D8FE",0x4F5D],
- ["D8FA",0x4F5E],
- ["D9A1",0x4F5F],
- ["C4E3",0x4F60],
- ["81D9",0x4F61],
- ["81DA",0x4F62],
- ["D3B6",0x4F63],
- ["D8F4",0x4F64],
- ["D9DD",0x4F65],
- ["81DB",0x4F66],
- ["D8FB",0x4F67],
- ["81DC",0x4F68],
- ["C5E5",0x4F69],
- ["81DD",0x4F6A],
- ["81DE",0x4F6B],
- ["C0D0",0x4F6C],
- ["81DF",0x4F6D],
- ["81E0",0x4F6E],
- ["D1F0",0x4F6F],
- ["B0DB",0x4F70],
- ["81E1",0x4F71],
- ["81E2",0x4F72],
- ["BCD1",0x4F73],
- ["D9A6",0x4F74],
- ["81E3",0x4F75],
- ["D9A5",0x4F76],
- ["81E4",0x4F77],
- ["81E5",0x4F78],
- ["81E6",0x4F79],
- ["81E7",0x4F7A],
- ["D9AC",0x4F7B],
- ["D9AE",0x4F7C],
- ["81E8",0x4F7D],
- ["D9AB",0x4F7E],
- ["CAB9",0x4F7F],
- ["81E9",0x4F80],
- ["81EA",0x4F81],
- ["81EB",0x4F82],
- ["D9A9",0x4F83],
- ["D6B6",0x4F84],
- ["81EC",0x4F85],
- ["81ED",0x4F86],
- ["81EE",0x4F87],
- ["B3DE",0x4F88],
- ["D9A8",0x4F89],
- ["81EF",0x4F8A],
- ["C0FD",0x4F8B],
- ["81F0",0x4F8C],
- ["CACC",0x4F8D],
- ["81F1",0x4F8E],
- ["D9AA",0x4F8F],
- ["81F2",0x4F90],
- ["D9A7",0x4F91],
- ["81F3",0x4F92],
- ["81F4",0x4F93],
- ["D9B0",0x4F94],
- ["81F5",0x4F95],
- ["81F6",0x4F96],
- ["B6B1",0x4F97],
- ["81F7",0x4F98],
- ["81F8",0x4F99],
- ["81F9",0x4F9A],
- ["B9A9",0x4F9B],
- ["81FA",0x4F9C],
- ["D2C0",0x4F9D],
- ["81FB",0x4F9E],
- ["81FC",0x4F9F],
- ["CFC0",0x4FA0],
- ["81FD",0x4FA1],
- ["81FE",0x4FA2],
- ["C2C2",0x4FA3],
- ["8240",0x4FA4],
- ["BDC4",0x4FA5],
- ["D5EC",0x4FA6],
- ["B2E0",0x4FA7],
- ["C7C8",0x4FA8],
- ["BFEB",0x4FA9],
- ["D9AD",0x4FAA],
- ["8241",0x4FAB],
- ["D9AF",0x4FAC],
- ["8242",0x4FAD],
- ["CEEA",0x4FAE],
- ["BAEE",0x4FAF],
- ["8243",0x4FB0],
- ["8244",0x4FB1],
- ["8245",0x4FB2],
- ["8246",0x4FB3],
- ["8247",0x4FB4],
- ["C7D6",0x4FB5],
- ["8248",0x4FB6],
- ["8249",0x4FB7],
- ["824A",0x4FB8],
- ["824B",0x4FB9],
- ["824C",0x4FBA],
- ["824D",0x4FBB],
- ["824E",0x4FBC],
- ["824F",0x4FBD],
- ["8250",0x4FBE],
- ["B1E3",0x4FBF],
- ["8251",0x4FC0],
- ["8252",0x4FC1],
- ["8253",0x4FC2],
- ["B4D9",0x4FC3],
- ["B6ED",0x4FC4],
- ["D9B4",0x4FC5],
- ["8254",0x4FC6],
- ["8255",0x4FC7],
- ["8256",0x4FC8],
- ["8257",0x4FC9],
- ["BFA1",0x4FCA],
- ["8258",0x4FCB],
- ["8259",0x4FCC],
- ["825A",0x4FCD],
- ["D9DE",0x4FCE],
- ["C7CE",0x4FCF],
- ["C0FE",0x4FD0],
- ["D9B8",0x4FD1],
- ["825B",0x4FD2],
- ["825C",0x4FD3],
- ["825D",0x4FD4],
- ["825E",0x4FD5],
- ["825F",0x4FD6],
- ["CBD7",0x4FD7],
- ["B7FD",0x4FD8],
- ["8260",0x4FD9],
- ["D9B5",0x4FDA],
- ["8261",0x4FDB],
- ["D9B7",0x4FDC],
- ["B1A3",0x4FDD],
- ["D3E1",0x4FDE],
- ["D9B9",0x4FDF],
- ["8262",0x4FE0],
- ["D0C5",0x4FE1],
- ["8263",0x4FE2],
- ["D9B6",0x4FE3],
- ["8264",0x4FE4],
- ["8265",0x4FE5],
- ["D9B1",0x4FE6],
- ["8266",0x4FE7],
- ["D9B2",0x4FE8],
- ["C1A9",0x4FE9],
- ["D9B3",0x4FEA],
- ["8267",0x4FEB],
- ["8268",0x4FEC],
- ["BCF3",0x4FED],
- ["D0DE",0x4FEE],
- ["B8A9",0x4FEF],
- ["8269",0x4FF0],
- ["BEE3",0x4FF1],
- ["826A",0x4FF2],
- ["D9BD",0x4FF3],
- ["826B",0x4FF4],
- ["826C",0x4FF5],
- ["826D",0x4FF6],
- ["826E",0x4FF7],
- ["D9BA",0x4FF8],
- ["826F",0x4FF9],
- ["B0B3",0x4FFA],
- ["8270",0x4FFB],
- ["8271",0x4FFC],
- ["8272",0x4FFD],
- ["D9C2",0x4FFE],
- ["8273",0x4FFF],
- ["8274",0x5000],
- ["8275",0x5001],
- ["8276",0x5002],
- ["8277",0x5003],
- ["8278",0x5004],
- ["8279",0x5005],
- ["827A",0x5006],
- ["827B",0x5007],
- ["827C",0x5008],
- ["827D",0x5009],
- ["827E",0x500A],
- ["8280",0x500B],
- ["D9C4",0x500C],
- ["B1B6",0x500D],
- ["8281",0x500E],
- ["D9BF",0x500F],
- ["8282",0x5010],
- ["8283",0x5011],
- ["B5B9",0x5012],
- ["8284",0x5013],
- ["BEF3",0x5014],
- ["8285",0x5015],
- ["8286",0x5016],
- ["8287",0x5017],
- ["CCC8",0x5018],
- ["BAF2",0x5019],
- ["D2D0",0x501A],
- ["8288",0x501B],
- ["D9C3",0x501C],
- ["8289",0x501D],
- ["828A",0x501E],
- ["BDE8",0x501F],
- ["828B",0x5020],
- ["B3AB",0x5021],
- ["828C",0x5022],
- ["828D",0x5023],
- ["828E",0x5024],
- ["D9C5",0x5025],
- ["BEEB",0x5026],
- ["828F",0x5027],
- ["D9C6",0x5028],
- ["D9BB",0x5029],
- ["C4DF",0x502A],
- ["8290",0x502B],
- ["D9BE",0x502C],
- ["D9C1",0x502D],
- ["D9C0",0x502E],
- ["8291",0x502F],
- ["8292",0x5030],
- ["8293",0x5031],
- ["8294",0x5032],
- ["8295",0x5033],
- ["8296",0x5034],
- ["8297",0x5035],
- ["8298",0x5036],
- ["8299",0x5037],
- ["829A",0x5038],
- ["829B",0x5039],
- ["D5AE",0x503A],
- ["829C",0x503B],
- ["D6B5",0x503C],
- ["829D",0x503D],
- ["C7E3",0x503E],
- ["829E",0x503F],
- ["829F",0x5040],
- ["82A0",0x5041],
- ["82A1",0x5042],
- ["D9C8",0x5043],
- ["82A2",0x5044],
- ["82A3",0x5045],
- ["82A4",0x5046],
- ["BCD9",0x5047],
- ["D9CA",0x5048],
- ["82A5",0x5049],
- ["82A6",0x504A],
- ["82A7",0x504B],
- ["D9BC",0x504C],
- ["82A8",0x504D],
- ["D9CB",0x504E],
- ["C6AB",0x504F],
- ["82A9",0x5050],
- ["82AA",0x5051],
- ["82AB",0x5052],
- ["82AC",0x5053],
- ["82AD",0x5054],
- ["D9C9",0x5055],
- ["82AE",0x5056],
- ["82AF",0x5057],
- ["82B0",0x5058],
- ["82B1",0x5059],
- ["D7F6",0x505A],
- ["82B2",0x505B],
- ["CDA3",0x505C],
- ["82B3",0x505D],
- ["82B4",0x505E],
- ["82B5",0x505F],
- ["82B6",0x5060],
- ["82B7",0x5061],
- ["82B8",0x5062],
- ["82B9",0x5063],
- ["82BA",0x5064],
- ["BDA1",0x5065],
- ["82BB",0x5066],
- ["82BC",0x5067],
- ["82BD",0x5068],
- ["82BE",0x5069],
- ["82BF",0x506A],
- ["82C0",0x506B],
- ["D9CC",0x506C],
- ["82C1",0x506D],
- ["82C2",0x506E],
- ["82C3",0x506F],
- ["82C4",0x5070],
- ["82C5",0x5071],
- ["82C6",0x5072],
- ["82C7",0x5073],
- ["82C8",0x5074],
- ["82C9",0x5075],
- ["C5BC",0x5076],
- ["CDB5",0x5077],
- ["82CA",0x5078],
- ["82CB",0x5079],
- ["82CC",0x507A],
- ["D9CD",0x507B],
- ["82CD",0x507C],
- ["82CE",0x507D],
- ["D9C7",0x507E],
- ["B3A5",0x507F],
- ["BFFE",0x5080],
- ["82CF",0x5081],
- ["82D0",0x5082],
- ["82D1",0x5083],
- ["82D2",0x5084],
- ["B8B5",0x5085],
- ["82D3",0x5086],
- ["82D4",0x5087],
- ["C0FC",0x5088],
- ["82D5",0x5089],
- ["82D6",0x508A],
- ["82D7",0x508B],
- ["82D8",0x508C],
- ["B0F8",0x508D],
- ["82D9",0x508E],
- ["82DA",0x508F],
- ["82DB",0x5090],
- ["82DC",0x5091],
- ["82DD",0x5092],
- ["82DE",0x5093],
- ["82DF",0x5094],
- ["82E0",0x5095],
- ["82E1",0x5096],
- ["82E2",0x5097],
- ["82E3",0x5098],
- ["82E4",0x5099],
- ["82E5",0x509A],
- ["82E6",0x509B],
- ["82E7",0x509C],
- ["82E8",0x509D],
- ["82E9",0x509E],
- ["82EA",0x509F],
- ["82EB",0x50A0],
- ["82EC",0x50A1],
- ["82ED",0x50A2],
- ["B4F6",0x50A3],
- ["82EE",0x50A4],
- ["D9CE",0x50A5],
- ["82EF",0x50A6],
- ["D9CF",0x50A7],
- ["B4A2",0x50A8],
- ["D9D0",0x50A9],
- ["82F0",0x50AA],
- ["82F1",0x50AB],
- ["B4DF",0x50AC],
- ["82F2",0x50AD],
- ["82F3",0x50AE],
- ["82F4",0x50AF],
- ["82F5",0x50B0],
- ["82F6",0x50B1],
- ["B0C1",0x50B2],
- ["82F7",0x50B3],
- ["82F8",0x50B4],
- ["82F9",0x50B5],
- ["82FA",0x50B6],
- ["82FB",0x50B7],
- ["82FC",0x50B8],
- ["82FD",0x50B9],
- ["D9D1",0x50BA],
- ["C9B5",0x50BB],
- ["82FE",0x50BC],
- ["8340",0x50BD],
- ["8341",0x50BE],
- ["8342",0x50BF],
- ["8343",0x50C0],
- ["8344",0x50C1],
- ["8345",0x50C2],
- ["8346",0x50C3],
- ["8347",0x50C4],
- ["8348",0x50C5],
- ["8349",0x50C6],
- ["834A",0x50C7],
- ["834B",0x50C8],
- ["834C",0x50C9],
- ["834D",0x50CA],
- ["834E",0x50CB],
- ["834F",0x50CC],
- ["8350",0x50CD],
- ["8351",0x50CE],
- ["CFF1",0x50CF],
- ["8352",0x50D0],
- ["8353",0x50D1],
- ["8354",0x50D2],
- ["8355",0x50D3],
- ["8356",0x50D4],
- ["8357",0x50D5],
- ["D9D2",0x50D6],
- ["8358",0x50D7],
- ["8359",0x50D8],
- ["835A",0x50D9],
- ["C1C5",0x50DA],
- ["835B",0x50DB],
- ["835C",0x50DC],
- ["835D",0x50DD],
- ["835E",0x50DE],
- ["835F",0x50DF],
- ["8360",0x50E0],
- ["8361",0x50E1],
- ["8362",0x50E2],
- ["8363",0x50E3],
- ["8364",0x50E4],
- ["8365",0x50E5],
- ["D9D6",0x50E6],
- ["C9AE",0x50E7],
- ["8366",0x50E8],
- ["8367",0x50E9],
- ["8368",0x50EA],
- ["8369",0x50EB],
- ["D9D5",0x50EC],
- ["D9D4",0x50ED],
- ["D9D7",0x50EE],
- ["836A",0x50EF],
- ["836B",0x50F0],
- ["836C",0x50F1],
- ["836D",0x50F2],
- ["CBDB",0x50F3],
- ["836E",0x50F4],
- ["BDA9",0x50F5],
- ["836F",0x50F6],
- ["8370",0x50F7],
- ["8371",0x50F8],
- ["8372",0x50F9],
- ["8373",0x50FA],
- ["C6A7",0x50FB],
- ["8374",0x50FC],
- ["8375",0x50FD],
- ["8376",0x50FE],
- ["8377",0x50FF],
- ["8378",0x5100],
- ["8379",0x5101],
- ["837A",0x5102],
- ["837B",0x5103],
- ["837C",0x5104],
- ["837D",0x5105],
- ["D9D3",0x5106],
- ["D9D8",0x5107],
- ["837E",0x5108],
- ["8380",0x5109],
- ["8381",0x510A],
- ["D9D9",0x510B],
- ["8382",0x510C],
- ["8383",0x510D],
- ["8384",0x510E],
- ["8385",0x510F],
- ["8386",0x5110],
- ["8387",0x5111],
- ["C8E5",0x5112],
- ["8388",0x5113],
- ["8389",0x5114],
- ["838A",0x5115],
- ["838B",0x5116],
- ["838C",0x5117],
- ["838D",0x5118],
- ["838E",0x5119],
- ["838F",0x511A],
- ["8390",0x511B],
- ["8391",0x511C],
- ["8392",0x511D],
- ["8393",0x511E],
- ["8394",0x511F],
- ["8395",0x5120],
- ["C0DC",0x5121],
- ["8396",0x5122],
- ["8397",0x5123],
- ["8398",0x5124],
- ["8399",0x5125],
- ["839A",0x5126],
- ["839B",0x5127],
- ["839C",0x5128],
- ["839D",0x5129],
- ["839E",0x512A],
- ["839F",0x512B],
- ["83A0",0x512C],
- ["83A1",0x512D],
- ["83A2",0x512E],
- ["83A3",0x512F],
- ["83A4",0x5130],
- ["83A5",0x5131],
- ["83A6",0x5132],
- ["83A7",0x5133],
- ["83A8",0x5134],
- ["83A9",0x5135],
- ["83AA",0x5136],
- ["83AB",0x5137],
- ["83AC",0x5138],
- ["83AD",0x5139],
- ["83AE",0x513A],
- ["83AF",0x513B],
- ["83B0",0x513C],
- ["83B1",0x513D],
- ["83B2",0x513E],
- ["B6F9",0x513F],
- ["D8A3",0x5140],
- ["D4CA",0x5141],
- ["83B3",0x5142],
- ["D4AA",0x5143],
- ["D0D6",0x5144],
- ["B3E4",0x5145],
- ["D5D7",0x5146],
- ["83B4",0x5147],
- ["CFC8",0x5148],
- ["B9E2",0x5149],
- ["83B5",0x514A],
- ["BFCB",0x514B],
- ["83B6",0x514C],
- ["C3E2",0x514D],
- ["83B7",0x514E],
- ["83B8",0x514F],
- ["83B9",0x5150],
- ["B6D2",0x5151],
- ["83BA",0x5152],
- ["83BB",0x5153],
- ["CDC3",0x5154],
- ["D9EE",0x5155],
- ["D9F0",0x5156],
- ["83BC",0x5157],
- ["83BD",0x5158],
- ["83BE",0x5159],
- ["B5B3",0x515A],
- ["83BF",0x515B],
- ["B6B5",0x515C],
- ["83C0",0x515D],
- ["83C1",0x515E],
- ["83C2",0x515F],
- ["83C3",0x5160],
- ["83C4",0x5161],
- ["BEA4",0x5162],
- ["83C5",0x5163],
- ["83C6",0x5164],
- ["C8EB",0x5165],
- ["83C7",0x5166],
- ["83C8",0x5167],
- ["C8AB",0x5168],
- ["83C9",0x5169],
- ["83CA",0x516A],
- ["B0CB",0x516B],
- ["B9AB",0x516C],
- ["C1F9",0x516D],
- ["D9E2",0x516E],
- ["83CB",0x516F],
- ["C0BC",0x5170],
- ["B9B2",0x5171],
- ["83CC",0x5172],
- ["B9D8",0x5173],
- ["D0CB",0x5174],
- ["B1F8",0x5175],
- ["C6E4",0x5176],
- ["BEDF",0x5177],
- ["B5E4",0x5178],
- ["D7C8",0x5179],
- ["83CD",0x517A],
- ["D1F8",0x517B],
- ["BCE6",0x517C],
- ["CADE",0x517D],
- ["83CE",0x517E],
- ["83CF",0x517F],
- ["BCBD",0x5180],
- ["D9E6",0x5181],
- ["D8E7",0x5182],
- ["83D0",0x5183],
- ["83D1",0x5184],
- ["C4DA",0x5185],
- ["83D2",0x5186],
- ["83D3",0x5187],
- ["B8D4",0x5188],
- ["C8BD",0x5189],
- ["83D4",0x518A],
- ["83D5",0x518B],
- ["B2E1",0x518C],
- ["D4D9",0x518D],
- ["83D6",0x518E],
- ["83D7",0x518F],
- ["83D8",0x5190],
- ["83D9",0x5191],
- ["C3B0",0x5192],
- ["83DA",0x5193],
- ["83DB",0x5194],
- ["C3E1",0x5195],
- ["DAA2",0x5196],
- ["C8DF",0x5197],
- ["83DC",0x5198],
- ["D0B4",0x5199],
- ["83DD",0x519A],
- ["BEFC",0x519B],
- ["C5A9",0x519C],
- ["83DE",0x519D],
- ["83DF",0x519E],
- ["83E0",0x519F],
- ["B9DA",0x51A0],
- ["83E1",0x51A1],
- ["DAA3",0x51A2],
- ["83E2",0x51A3],
- ["D4A9",0x51A4],
- ["DAA4",0x51A5],
- ["83E3",0x51A6],
- ["83E4",0x51A7],
- ["83E5",0x51A8],
- ["83E6",0x51A9],
- ["83E7",0x51AA],
- ["D9FB",0x51AB],
- ["B6AC",0x51AC],
- ["83E8",0x51AD],
- ["83E9",0x51AE],
- ["B7EB",0x51AF],
- ["B1F9",0x51B0],
- ["D9FC",0x51B1],
- ["B3E5",0x51B2],
- ["BEF6",0x51B3],
- ["83EA",0x51B4],
- ["BFF6",0x51B5],
- ["D2B1",0x51B6],
- ["C0E4",0x51B7],
- ["83EB",0x51B8],
- ["83EC",0x51B9],
- ["83ED",0x51BA],
- ["B6B3",0x51BB],
- ["D9FE",0x51BC],
- ["D9FD",0x51BD],
- ["83EE",0x51BE],
- ["83EF",0x51BF],
- ["BEBB",0x51C0],
- ["83F0",0x51C1],
- ["83F1",0x51C2],
- ["83F2",0x51C3],
- ["C6E0",0x51C4],
- ["83F3",0x51C5],
- ["D7BC",0x51C6],
- ["DAA1",0x51C7],
- ["83F4",0x51C8],
- ["C1B9",0x51C9],
- ["83F5",0x51CA],
- ["B5F2",0x51CB],
- ["C1E8",0x51CC],
- ["83F6",0x51CD],
- ["83F7",0x51CE],
- ["BCF5",0x51CF],
- ["83F8",0x51D0],
- ["B4D5",0x51D1],
- ["83F9",0x51D2],
- ["83FA",0x51D3],
- ["83FB",0x51D4],
- ["83FC",0x51D5],
- ["83FD",0x51D6],
- ["83FE",0x51D7],
- ["8440",0x51D8],
- ["8441",0x51D9],
- ["8442",0x51DA],
- ["C1DD",0x51DB],
- ["8443",0x51DC],
- ["C4FD",0x51DD],
- ["8444",0x51DE],
- ["8445",0x51DF],
- ["BCB8",0x51E0],
- ["B7B2",0x51E1],
- ["8446",0x51E2],
- ["8447",0x51E3],
- ["B7EF",0x51E4],
- ["8448",0x51E5],
- ["8449",0x51E6],
- ["844A",0x51E7],
- ["844B",0x51E8],
- ["844C",0x51E9],
- ["844D",0x51EA],
- ["D9EC",0x51EB],
- ["844E",0x51EC],
- ["C6BE",0x51ED],
- ["844F",0x51EE],
- ["BFAD",0x51EF],
- ["BBCB",0x51F0],
- ["8450",0x51F1],
- ["8451",0x51F2],
- ["B5CA",0x51F3],
- ["8452",0x51F4],
- ["DBC9",0x51F5],
- ["D0D7",0x51F6],
- ["8453",0x51F7],
- ["CDB9",0x51F8],
- ["B0BC",0x51F9],
- ["B3F6",0x51FA],
- ["BBF7",0x51FB],
- ["DBCA",0x51FC],
- ["BAAF",0x51FD],
- ["8454",0x51FE],
- ["D4E4",0x51FF],
- ["B5B6",0x5200],
- ["B5F3",0x5201],
- ["D8D6",0x5202],
- ["C8D0",0x5203],
- ["8455",0x5204],
- ["8456",0x5205],
- ["B7D6",0x5206],
- ["C7D0",0x5207],
- ["D8D7",0x5208],
- ["8457",0x5209],
- ["BFAF",0x520A],
- ["8458",0x520B],
- ["8459",0x520C],
- ["DBBB",0x520D],
- ["D8D8",0x520E],
- ["845A",0x520F],
- ["845B",0x5210],
- ["D0CC",0x5211],
- ["BBAE",0x5212],
- ["845C",0x5213],
- ["845D",0x5214],
- ["845E",0x5215],
- ["EBBE",0x5216],
- ["C1D0",0x5217],
- ["C1F5",0x5218],
- ["D4F2",0x5219],
- ["B8D5",0x521A],
- ["B4B4",0x521B],
- ["845F",0x521C],
- ["B3F5",0x521D],
- ["8460",0x521E],
- ["8461",0x521F],
- ["C9BE",0x5220],
- ["8462",0x5221],
- ["8463",0x5222],
- ["8464",0x5223],
- ["C5D0",0x5224],
- ["8465",0x5225],
- ["8466",0x5226],
- ["8467",0x5227],
- ["C5D9",0x5228],
- ["C0FB",0x5229],
- ["8468",0x522A],
- ["B1F0",0x522B],
- ["8469",0x522C],
- ["D8D9",0x522D],
- ["B9CE",0x522E],
- ["846A",0x522F],
- ["B5BD",0x5230],
- ["846B",0x5231],
- ["846C",0x5232],
- ["D8DA",0x5233],
- ["846D",0x5234],
- ["846E",0x5235],
- ["D6C6",0x5236],
- ["CBA2",0x5237],
- ["C8AF",0x5238],
- ["C9B2",0x5239],
- ["B4CC",0x523A],
- ["BFCC",0x523B],
- ["846F",0x523C],
- ["B9F4",0x523D],
- ["8470",0x523E],
- ["D8DB",0x523F],
- ["D8DC",0x5240],
- ["B6E7",0x5241],
- ["BCC1",0x5242],
- ["CCEA",0x5243],
- ["8471",0x5244],
- ["8472",0x5245],
- ["8473",0x5246],
- ["8474",0x5247],
- ["8475",0x5248],
- ["8476",0x5249],
- ["CFF7",0x524A],
- ["8477",0x524B],
- ["D8DD",0x524C],
- ["C7B0",0x524D],
- ["8478",0x524E],
- ["8479",0x524F],
- ["B9D0",0x5250],
- ["BDA3",0x5251],
- ["847A",0x5252],
- ["847B",0x5253],
- ["CCDE",0x5254],
- ["847C",0x5255],
- ["C6CA",0x5256],
- ["847D",0x5257],
- ["847E",0x5258],
- ["8480",0x5259],
- ["8481",0x525A],
- ["8482",0x525B],
- ["D8E0",0x525C],
- ["8483",0x525D],
- ["D8DE",0x525E],
- ["8484",0x525F],
- ["8485",0x5260],
- ["D8DF",0x5261],
- ["8486",0x5262],
- ["8487",0x5263],
- ["8488",0x5264],
- ["B0FE",0x5265],
- ["8489",0x5266],
- ["BEE7",0x5267],
- ["848A",0x5268],
- ["CAA3",0x5269],
- ["BCF4",0x526A],
- ["848B",0x526B],
- ["848C",0x526C],
- ["848D",0x526D],
- ["848E",0x526E],
- ["B8B1",0x526F],
- ["848F",0x5270],
- ["8490",0x5271],
- ["B8EE",0x5272],
- ["8491",0x5273],
- ["8492",0x5274],
- ["8493",0x5275],
- ["8494",0x5276],
- ["8495",0x5277],
- ["8496",0x5278],
- ["8497",0x5279],
- ["8498",0x527A],
- ["8499",0x527B],
- ["849A",0x527C],
- ["D8E2",0x527D],
- ["849B",0x527E],
- ["BDCB",0x527F],
- ["849C",0x5280],
- ["D8E4",0x5281],
- ["D8E3",0x5282],
- ["849D",0x5283],
- ["849E",0x5284],
- ["849F",0x5285],
- ["84A0",0x5286],
- ["84A1",0x5287],
- ["C5FC",0x5288],
- ["84A2",0x5289],
- ["84A3",0x528A],
- ["84A4",0x528B],
- ["84A5",0x528C],
- ["84A6",0x528D],
- ["84A7",0x528E],
- ["84A8",0x528F],
- ["D8E5",0x5290],
- ["84A9",0x5291],
- ["84AA",0x5292],
- ["D8E6",0x5293],
- ["84AB",0x5294],
- ["84AC",0x5295],
- ["84AD",0x5296],
- ["84AE",0x5297],
- ["84AF",0x5298],
- ["84B0",0x5299],
- ["84B1",0x529A],
- ["C1A6",0x529B],
- ["84B2",0x529C],
- ["C8B0",0x529D],
- ["B0EC",0x529E],
- ["B9A6",0x529F],
- ["BCD3",0x52A0],
- ["CEF1",0x52A1],
- ["DBBD",0x52A2],
- ["C1D3",0x52A3],
- ["84B3",0x52A4],
- ["84B4",0x52A5],
- ["84B5",0x52A6],
- ["84B6",0x52A7],
- ["B6AF",0x52A8],
- ["D6FA",0x52A9],
- ["C5AC",0x52AA],
- ["BDD9",0x52AB],
- ["DBBE",0x52AC],
- ["DBBF",0x52AD],
- ["84B7",0x52AE],
- ["84B8",0x52AF],
- ["84B9",0x52B0],
- ["C0F8",0x52B1],
- ["BEA2",0x52B2],
- ["C0CD",0x52B3],
- ["84BA",0x52B4],
- ["84BB",0x52B5],
- ["84BC",0x52B6],
- ["84BD",0x52B7],
- ["84BE",0x52B8],
- ["84BF",0x52B9],
- ["84C0",0x52BA],
- ["84C1",0x52BB],
- ["84C2",0x52BC],
- ["84C3",0x52BD],
- ["DBC0",0x52BE],
- ["CAC6",0x52BF],
- ["84C4",0x52C0],
- ["84C5",0x52C1],
- ["84C6",0x52C2],
- ["B2AA",0x52C3],
- ["84C7",0x52C4],
- ["84C8",0x52C5],
- ["84C9",0x52C6],
- ["D3C2",0x52C7],
- ["84CA",0x52C8],
- ["C3E3",0x52C9],
- ["84CB",0x52CA],
- ["D1AB",0x52CB],
- ["84CC",0x52CC],
- ["84CD",0x52CD],
- ["84CE",0x52CE],
- ["84CF",0x52CF],
- ["DBC2",0x52D0],
- ["84D0",0x52D1],
- ["C0D5",0x52D2],
- ["84D1",0x52D3],
- ["84D2",0x52D4],
- ["84D3",0x52D5],
- ["DBC3",0x52D6],
- ["84D4",0x52D7],
- ["BFB1",0x52D8],
- ["84D5",0x52D9],
- ["84D6",0x52DA],
- ["84D7",0x52DB],
- ["84D8",0x52DC],
- ["84D9",0x52DD],
- ["84DA",0x52DE],
- ["C4BC",0x52DF],
- ["84DB",0x52E0],
- ["84DC",0x52E1],
- ["84DD",0x52E2],
- ["84DE",0x52E3],
- ["C7DA",0x52E4],
- ["84DF",0x52E5],
- ["84E0",0x52E6],
- ["84E1",0x52E7],
- ["84E2",0x52E8],
- ["84E3",0x52E9],
- ["84E4",0x52EA],
- ["84E5",0x52EB],
- ["84E6",0x52EC],
- ["84E7",0x52ED],
- ["84E8",0x52EE],
- ["84E9",0x52EF],
- ["DBC4",0x52F0],
- ["84EA",0x52F1],
- ["84EB",0x52F2],
- ["84EC",0x52F3],
- ["84ED",0x52F4],
- ["84EE",0x52F5],
- ["84EF",0x52F6],
- ["84F0",0x52F7],
- ["84F1",0x52F8],
- ["D9E8",0x52F9],
- ["C9D7",0x52FA],
- ["84F2",0x52FB],
- ["84F3",0x52FC],
- ["84F4",0x52FD],
- ["B9B4",0x52FE],
- ["CEF0",0x52FF],
- ["D4C8",0x5300],
- ["84F5",0x5301],
- ["84F6",0x5302],
- ["84F7",0x5303],
- ["84F8",0x5304],
- ["B0FC",0x5305],
- ["B4D2",0x5306],
- ["84F9",0x5307],
- ["D0D9",0x5308],
- ["84FA",0x5309],
- ["84FB",0x530A],
- ["84FC",0x530B],
- ["84FD",0x530C],
- ["D9E9",0x530D],
- ["84FE",0x530E],
- ["DECB",0x530F],
- ["D9EB",0x5310],
- ["8540",0x5311],
- ["8541",0x5312],
- ["8542",0x5313],
- ["8543",0x5314],
- ["D8B0",0x5315],
- ["BBAF",0x5316],
- ["B1B1",0x5317],
- ["8544",0x5318],
- ["B3D7",0x5319],
- ["D8CE",0x531A],
- ["8545",0x531B],
- ["8546",0x531C],
- ["D4D1",0x531D],
- ["8547",0x531E],
- ["8548",0x531F],
- ["BDB3",0x5320],
- ["BFEF",0x5321],
- ["8549",0x5322],
- ["CFBB",0x5323],
- ["854A",0x5324],
- ["854B",0x5325],
- ["D8D0",0x5326],
- ["854C",0x5327],
- ["854D",0x5328],
- ["854E",0x5329],
- ["B7CB",0x532A],
- ["854F",0x532B],
- ["8550",0x532C],
- ["8551",0x532D],
- ["D8D1",0x532E],
- ["8552",0x532F],
- ["8553",0x5330],
- ["8554",0x5331],
- ["8555",0x5332],
- ["8556",0x5333],
- ["8557",0x5334],
- ["8558",0x5335],
- ["8559",0x5336],
- ["855A",0x5337],
- ["855B",0x5338],
- ["C6A5",0x5339],
- ["C7F8",0x533A],
- ["D2BD",0x533B],
- ["855C",0x533C],
- ["855D",0x533D],
- ["D8D2",0x533E],
- ["C4E4",0x533F],
- ["855E",0x5340],
- ["CAAE",0x5341],
- ["855F",0x5342],
- ["C7A7",0x5343],
- ["8560",0x5344],
- ["D8A6",0x5345],
- ["8561",0x5346],
- ["C9FD",0x5347],
- ["CEE7",0x5348],
- ["BBDC",0x5349],
- ["B0EB",0x534A],
- ["8562",0x534B],
- ["8563",0x534C],
- ["8564",0x534D],
- ["BBAA",0x534E],
- ["D0AD",0x534F],
- ["8565",0x5350],
- ["B1B0",0x5351],
- ["D7E4",0x5352],
- ["D7BF",0x5353],
- ["8566",0x5354],
- ["B5A5",0x5355],
- ["C2F4",0x5356],
- ["C4CF",0x5357],
- ["8567",0x5358],
- ["8568",0x5359],
- ["B2A9",0x535A],
- ["8569",0x535B],
- ["B2B7",0x535C],
- ["856A",0x535D],
- ["B1E5",0x535E],
- ["DFB2",0x535F],
- ["D5BC",0x5360],
- ["BFA8",0x5361],
- ["C2AC",0x5362],
- ["D8D5",0x5363],
- ["C2B1",0x5364],
- ["856B",0x5365],
- ["D8D4",0x5366],
- ["CED4",0x5367],
- ["856C",0x5368],
- ["DAE0",0x5369],
- ["856D",0x536A],
- ["CEC0",0x536B],
- ["856E",0x536C],
- ["856F",0x536D],
- ["D8B4",0x536E],
- ["C3AE",0x536F],
- ["D3A1",0x5370],
- ["CEA3",0x5371],
- ["8570",0x5372],
- ["BCB4",0x5373],
- ["C8B4",0x5374],
- ["C2D1",0x5375],
- ["8571",0x5376],
- ["BEED",0x5377],
- ["D0B6",0x5378],
- ["8572",0x5379],
- ["DAE1",0x537A],
- ["8573",0x537B],
- ["8574",0x537C],
- ["8575",0x537D],
- ["8576",0x537E],
- ["C7E4",0x537F],
- ["8577",0x5380],
- ["8578",0x5381],
- ["B3A7",0x5382],
- ["8579",0x5383],
- ["B6F2",0x5384],
- ["CCFC",0x5385],
- ["C0FA",0x5386],
- ["857A",0x5387],
- ["857B",0x5388],
- ["C0F7",0x5389],
- ["857C",0x538A],
- ["D1B9",0x538B],
- ["D1E1",0x538C],
- ["D8C7",0x538D],
- ["857D",0x538E],
- ["857E",0x538F],
- ["8580",0x5390],
- ["8581",0x5391],
- ["8582",0x5392],
- ["8583",0x5393],
- ["8584",0x5394],
- ["B2DE",0x5395],
- ["8585",0x5396],
- ["8586",0x5397],
- ["C0E5",0x5398],
- ["8587",0x5399],
- ["BAF1",0x539A],
- ["8588",0x539B],
- ["8589",0x539C],
- ["D8C8",0x539D],
- ["858A",0x539E],
- ["D4AD",0x539F],
- ["858B",0x53A0],
- ["858C",0x53A1],
- ["CFE1",0x53A2],
- ["D8C9",0x53A3],
- ["858D",0x53A4],
- ["D8CA",0x53A5],
- ["CFC3",0x53A6],
- ["858E",0x53A7],
- ["B3F8",0x53A8],
- ["BEC7",0x53A9],
- ["858F",0x53AA],
- ["8590",0x53AB],
- ["8591",0x53AC],
- ["8592",0x53AD],
- ["D8CB",0x53AE],
- ["8593",0x53AF],
- ["8594",0x53B0],
- ["8595",0x53B1],
- ["8596",0x53B2],
- ["8597",0x53B3],
- ["8598",0x53B4],
- ["8599",0x53B5],
- ["DBCC",0x53B6],
- ["859A",0x53B7],
- ["859B",0x53B8],
- ["859C",0x53B9],
- ["859D",0x53BA],
- ["C8A5",0x53BB],
- ["859E",0x53BC],
- ["859F",0x53BD],
- ["85A0",0x53BE],
- ["CFD8",0x53BF],
- ["85A1",0x53C0],
- ["C8FE",0x53C1],
- ["B2CE",0x53C2],
- ["85A2",0x53C3],
- ["85A3",0x53C4],
- ["85A4",0x53C5],
- ["85A5",0x53C6],
- ["85A6",0x53C7],
- ["D3D6",0x53C8],
- ["B2E6",0x53C9],
- ["BCB0",0x53CA],
- ["D3D1",0x53CB],
- ["CBAB",0x53CC],
- ["B7B4",0x53CD],
- ["85A7",0x53CE],
- ["85A8",0x53CF],
- ["85A9",0x53D0],
- ["B7A2",0x53D1],
- ["85AA",0x53D2],
- ["85AB",0x53D3],
- ["CAE5",0x53D4],
- ["85AC",0x53D5],
- ["C8A1",0x53D6],
- ["CADC",0x53D7],
- ["B1E4",0x53D8],
- ["D0F0",0x53D9],
- ["85AD",0x53DA],
- ["C5D1",0x53DB],
- ["85AE",0x53DC],
- ["85AF",0x53DD],
- ["85B0",0x53DE],
- ["DBC5",0x53DF],
- ["B5FE",0x53E0],
- ["85B1",0x53E1],
- ["85B2",0x53E2],
- ["BFDA",0x53E3],
- ["B9C5",0x53E4],
- ["BEE4",0x53E5],
- ["C1ED",0x53E6],
- ["85B3",0x53E7],
- ["DFB6",0x53E8],
- ["DFB5",0x53E9],
- ["D6BB",0x53EA],
- ["BDD0",0x53EB],
- ["D5D9",0x53EC],
- ["B0C8",0x53ED],
- ["B6A3",0x53EE],
- ["BFC9",0x53EF],
- ["CCA8",0x53F0],
- ["DFB3",0x53F1],
- ["CAB7",0x53F2],
- ["D3D2",0x53F3],
- ["85B4",0x53F4],
- ["D8CF",0x53F5],
- ["D2B6",0x53F6],
- ["BAC5",0x53F7],
- ["CBBE",0x53F8],
- ["CCBE",0x53F9],
- ["85B5",0x53FA],
- ["DFB7",0x53FB],
- ["B5F0",0x53FC],
- ["DFB4",0x53FD],
- ["85B6",0x53FE],
- ["85B7",0x53FF],
- ["85B8",0x5400],
- ["D3F5",0x5401],
- ["85B9",0x5402],
- ["B3D4",0x5403],
- ["B8F7",0x5404],
- ["85BA",0x5405],
- ["DFBA",0x5406],
- ["85BB",0x5407],
- ["BACF",0x5408],
- ["BCAA",0x5409],
- ["B5F5",0x540A],
- ["85BC",0x540B],
- ["CDAC",0x540C],
- ["C3FB",0x540D],
- ["BAF3",0x540E],
- ["C0F4",0x540F],
- ["CDC2",0x5410],
- ["CFF2",0x5411],
- ["DFB8",0x5412],
- ["CFC5",0x5413],
- ["85BD",0x5414],
- ["C2C0",0x5415],
- ["DFB9",0x5416],
- ["C2F0",0x5417],
- ["85BE",0x5418],
- ["85BF",0x5419],
- ["85C0",0x541A],
- ["BEFD",0x541B],
- ["85C1",0x541C],
- ["C1DF",0x541D],
- ["CDCC",0x541E],
- ["D2F7",0x541F],
- ["B7CD",0x5420],
- ["DFC1",0x5421],
- ["85C2",0x5422],
- ["DFC4",0x5423],
- ["85C3",0x5424],
- ["85C4",0x5425],
- ["B7F1",0x5426],
- ["B0C9",0x5427],
- ["B6D6",0x5428],
- ["B7D4",0x5429],
- ["85C5",0x542A],
- ["BAAC",0x542B],
- ["CCFD",0x542C],
- ["BFD4",0x542D],
- ["CBB1",0x542E],
- ["C6F4",0x542F],
- ["85C6",0x5430],
- ["D6A8",0x5431],
- ["DFC5",0x5432],
- ["85C7",0x5433],
- ["CEE2",0x5434],
- ["B3B3",0x5435],
- ["85C8",0x5436],
- ["85C9",0x5437],
- ["CEFC",0x5438],
- ["B4B5",0x5439],
- ["85CA",0x543A],
- ["CEC7",0x543B],
- ["BAF0",0x543C],
- ["85CB",0x543D],
- ["CEE1",0x543E],
- ["85CC",0x543F],
- ["D1BD",0x5440],
- ["85CD",0x5441],
- ["85CE",0x5442],
- ["DFC0",0x5443],
- ["85CF",0x5444],
- ["85D0",0x5445],
- ["B4F4",0x5446],
- ["85D1",0x5447],
- ["B3CA",0x5448],
- ["85D2",0x5449],
- ["B8E6",0x544A],
- ["DFBB",0x544B],
- ["85D3",0x544C],
- ["85D4",0x544D],
- ["85D5",0x544E],
- ["85D6",0x544F],
- ["C4C5",0x5450],
- ["85D7",0x5451],
- ["DFBC",0x5452],
- ["DFBD",0x5453],
- ["DFBE",0x5454],
- ["C5BB",0x5455],
- ["DFBF",0x5456],
- ["DFC2",0x5457],
- ["D4B1",0x5458],
- ["DFC3",0x5459],
- ["85D8",0x545A],
- ["C7BA",0x545B],
- ["CED8",0x545C],
- ["85D9",0x545D],
- ["85DA",0x545E],
- ["85DB",0x545F],
- ["85DC",0x5460],
- ["85DD",0x5461],
- ["C4D8",0x5462],
- ["85DE",0x5463],
- ["DFCA",0x5464],
- ["85DF",0x5465],
- ["DFCF",0x5466],
- ["85E0",0x5467],
- ["D6DC",0x5468],
- ["85E1",0x5469],
- ["85E2",0x546A],
- ["85E3",0x546B],
- ["85E4",0x546C],
- ["85E5",0x546D],
- ["85E6",0x546E],
- ["85E7",0x546F],
- ["85E8",0x5470],
- ["DFC9",0x5471],
- ["DFDA",0x5472],
- ["CEB6",0x5473],
- ["85E9",0x5474],
- ["BAC7",0x5475],
- ["DFCE",0x5476],
- ["DFC8",0x5477],
- ["C5DE",0x5478],
- ["85EA",0x5479],
- ["85EB",0x547A],
- ["C9EB",0x547B],
- ["BAF4",0x547C],
- ["C3FC",0x547D],
- ["85EC",0x547E],
- ["85ED",0x547F],
- ["BED7",0x5480],
- ["85EE",0x5481],
- ["DFC6",0x5482],
- ["85EF",0x5483],
- ["DFCD",0x5484],
- ["85F0",0x5485],
- ["C5D8",0x5486],
- ["85F1",0x5487],
- ["85F2",0x5488],
- ["85F3",0x5489],
- ["85F4",0x548A],
- ["D5A6",0x548B],
- ["BACD",0x548C],
- ["85F5",0x548D],
- ["BECC",0x548E],
- ["D3BD",0x548F],
- ["B8C0",0x5490],
- ["85F6",0x5491],
- ["D6E4",0x5492],
- ["85F7",0x5493],
- ["DFC7",0x5494],
- ["B9BE",0x5495],
- ["BFA7",0x5496],
- ["85F8",0x5497],
- ["85F9",0x5498],
- ["C1FC",0x5499],
- ["DFCB",0x549A],
- ["DFCC",0x549B],
- ["85FA",0x549C],
- ["DFD0",0x549D],
- ["85FB",0x549E],
- ["85FC",0x549F],
- ["85FD",0x54A0],
- ["85FE",0x54A1],
- ["8640",0x54A2],
- ["DFDB",0x54A3],
- ["DFE5",0x54A4],
- ["8641",0x54A5],
- ["DFD7",0x54A6],
- ["DFD6",0x54A7],
- ["D7C9",0x54A8],
- ["DFE3",0x54A9],
- ["DFE4",0x54AA],
- ["E5EB",0x54AB],
- ["D2A7",0x54AC],
- ["DFD2",0x54AD],
- ["8642",0x54AE],
- ["BFA9",0x54AF],
- ["8643",0x54B0],
- ["D4DB",0x54B1],
- ["8644",0x54B2],
- ["BFC8",0x54B3],
- ["DFD4",0x54B4],
- ["8645",0x54B5],
- ["8646",0x54B6],
- ["8647",0x54B7],
- ["CFCC",0x54B8],
- ["8648",0x54B9],
- ["8649",0x54BA],
- ["DFDD",0x54BB],
- ["864A",0x54BC],
- ["D1CA",0x54BD],
- ["864B",0x54BE],
- ["DFDE",0x54BF],
- ["B0A7",0x54C0],
- ["C6B7",0x54C1],
- ["DFD3",0x54C2],
- ["864C",0x54C3],
- ["BAE5",0x54C4],
- ["864D",0x54C5],
- ["B6DF",0x54C6],
- ["CDDB",0x54C7],
- ["B9FE",0x54C8],
- ["D4D5",0x54C9],
- ["864E",0x54CA],
- ["864F",0x54CB],
- ["DFDF",0x54CC],
- ["CFEC",0x54CD],
- ["B0A5",0x54CE],
- ["DFE7",0x54CF],
- ["DFD1",0x54D0],
- ["D1C6",0x54D1],
- ["DFD5",0x54D2],
- ["DFD8",0x54D3],
- ["DFD9",0x54D4],
- ["DFDC",0x54D5],
- ["8650",0x54D6],
- ["BBA9",0x54D7],
- ["8651",0x54D8],
- ["DFE0",0x54D9],
- ["DFE1",0x54DA],
- ["8652",0x54DB],
- ["DFE2",0x54DC],
- ["DFE6",0x54DD],
- ["DFE8",0x54DE],
- ["D3B4",0x54DF],
- ["8653",0x54E0],
- ["8654",0x54E1],
- ["8655",0x54E2],
- ["8656",0x54E3],
- ["8657",0x54E4],
- ["B8E7",0x54E5],
- ["C5B6",0x54E6],
- ["DFEA",0x54E7],
- ["C9DA",0x54E8],
- ["C1A8",0x54E9],
- ["C4C4",0x54EA],
- ["8658",0x54EB],
- ["8659",0x54EC],
- ["BFDE",0x54ED],
- ["CFF8",0x54EE],
- ["865A",0x54EF],
- ["865B",0x54F0],
- ["865C",0x54F1],
- ["D5DC",0x54F2],
- ["DFEE",0x54F3],
- ["865D",0x54F4],
- ["865E",0x54F5],
- ["865F",0x54F6],
- ["8660",0x54F7],
- ["8661",0x54F8],
- ["8662",0x54F9],
- ["B2B8",0x54FA],
- ["8663",0x54FB],
- ["BADF",0x54FC],
- ["DFEC",0x54FD],
- ["8664",0x54FE],
- ["DBC1",0x54FF],
- ["8665",0x5500],
- ["D1E4",0x5501],
- ["8666",0x5502],
- ["8667",0x5503],
- ["8668",0x5504],
- ["8669",0x5505],
- ["CBF4",0x5506],
- ["B4BD",0x5507],
- ["866A",0x5508],
- ["B0A6",0x5509],
- ["866B",0x550A],
- ["866C",0x550B],
- ["866D",0x550C],
- ["866E",0x550D],
- ["866F",0x550E],
- ["DFF1",0x550F],
- ["CCC6",0x5510],
- ["DFF2",0x5511],
- ["8670",0x5512],
- ["8671",0x5513],
- ["DFED",0x5514],
- ["8672",0x5515],
- ["8673",0x5516],
- ["8674",0x5517],
- ["8675",0x5518],
- ["8676",0x5519],
- ["8677",0x551A],
- ["DFE9",0x551B],
- ["8678",0x551C],
- ["8679",0x551D],
- ["867A",0x551E],
- ["867B",0x551F],
- ["DFEB",0x5520],
- ["867C",0x5521],
- ["DFEF",0x5522],
- ["DFF0",0x5523],
- ["BBBD",0x5524],
- ["867D",0x5525],
- ["867E",0x5526],
- ["DFF3",0x5527],
- ["8680",0x5528],
- ["8681",0x5529],
- ["DFF4",0x552A],
- ["8682",0x552B],
- ["BBA3",0x552C],
- ["8683",0x552D],
- ["CADB",0x552E],
- ["CEA8",0x552F],
- ["E0A7",0x5530],
- ["B3AA",0x5531],
- ["8684",0x5532],
- ["E0A6",0x5533],
- ["8685",0x5534],
- ["8686",0x5535],
- ["8687",0x5536],
- ["E0A1",0x5537],
- ["8688",0x5538],
- ["8689",0x5539],
- ["868A",0x553A],
- ["868B",0x553B],
- ["DFFE",0x553C],
- ["868C",0x553D],
- ["CDD9",0x553E],
- ["DFFC",0x553F],
- ["868D",0x5540],
- ["DFFA",0x5541],
- ["868E",0x5542],
- ["BFD0",0x5543],
- ["D7C4",0x5544],
- ["868F",0x5545],
- ["C9CC",0x5546],
- ["8690",0x5547],
- ["8691",0x5548],
- ["DFF8",0x5549],
- ["B0A1",0x554A],
- ["8692",0x554B],
- ["8693",0x554C],
- ["8694",0x554D],
- ["8695",0x554E],
- ["8696",0x554F],
- ["DFFD",0x5550],
- ["8697",0x5551],
- ["8698",0x5552],
- ["8699",0x5553],
- ["869A",0x5554],
- ["DFFB",0x5555],
- ["E0A2",0x5556],
- ["869B",0x5557],
- ["869C",0x5558],
- ["869D",0x5559],
- ["869E",0x555A],
- ["869F",0x555B],
- ["E0A8",0x555C],
- ["86A0",0x555D],
- ["86A1",0x555E],
- ["86A2",0x555F],
- ["86A3",0x5560],
- ["B7C8",0x5561],
- ["86A4",0x5562],
- ["86A5",0x5563],
- ["C6A1",0x5564],
- ["C9B6",0x5565],
- ["C0B2",0x5566],
- ["DFF5",0x5567],
- ["86A6",0x5568],
- ["86A7",0x5569],
- ["C5BE",0x556A],
- ["86A8",0x556B],
- ["D8C4",0x556C],
- ["DFF9",0x556D],
- ["C4F6",0x556E],
- ["86A9",0x556F],
- ["86AA",0x5570],
- ["86AB",0x5571],
- ["86AC",0x5572],
- ["86AD",0x5573],
- ["86AE",0x5574],
- ["E0A3",0x5575],
- ["E0A4",0x5576],
- ["E0A5",0x5577],
- ["D0A5",0x5578],
- ["86AF",0x5579],
- ["86B0",0x557A],
- ["E0B4",0x557B],
- ["CCE4",0x557C],
- ["86B1",0x557D],
- ["E0B1",0x557E],
- ["86B2",0x557F],
- ["BFA6",0x5580],
- ["E0AF",0x5581],
- ["CEB9",0x5582],
- ["E0AB",0x5583],
- ["C9C6",0x5584],
- ["86B3",0x5585],
- ["86B4",0x5586],
- ["C0AE",0x5587],
- ["E0AE",0x5588],
- ["BAED",0x5589],
- ["BAB0",0x558A],
- ["E0A9",0x558B],
- ["86B5",0x558C],
- ["86B6",0x558D],
- ["86B7",0x558E],
- ["DFF6",0x558F],
- ["86B8",0x5590],
- ["E0B3",0x5591],
- ["86B9",0x5592],
- ["86BA",0x5593],
- ["E0B8",0x5594],
- ["86BB",0x5595],
- ["86BC",0x5596],
- ["86BD",0x5597],
- ["B4AD",0x5598],
- ["E0B9",0x5599],
- ["86BE",0x559A],
- ["86BF",0x559B],
- ["CFB2",0x559C],
- ["BAC8",0x559D],
- ["86C0",0x559E],
- ["E0B0",0x559F],
- ["86C1",0x55A0],
- ["86C2",0x55A1],
- ["86C3",0x55A2],
- ["86C4",0x55A3],
- ["86C5",0x55A4],
- ["86C6",0x55A5],
- ["86C7",0x55A6],
- ["D0FA",0x55A7],
- ["86C8",0x55A8],
- ["86C9",0x55A9],
- ["86CA",0x55AA],
- ["86CB",0x55AB],
- ["86CC",0x55AC],
- ["86CD",0x55AD],
- ["86CE",0x55AE],
- ["86CF",0x55AF],
- ["86D0",0x55B0],
- ["E0AC",0x55B1],
- ["86D1",0x55B2],
- ["D4FB",0x55B3],
- ["86D2",0x55B4],
- ["DFF7",0x55B5],
- ["86D3",0x55B6],
- ["C5E7",0x55B7],
- ["86D4",0x55B8],
- ["E0AD",0x55B9],
- ["86D5",0x55BA],
- ["D3F7",0x55BB],
- ["86D6",0x55BC],
- ["E0B6",0x55BD],
- ["E0B7",0x55BE],
- ["86D7",0x55BF],
- ["86D8",0x55C0],
- ["86D9",0x55C1],
- ["86DA",0x55C2],
- ["86DB",0x55C3],
- ["E0C4",0x55C4],
- ["D0E1",0x55C5],
- ["86DC",0x55C6],
- ["86DD",0x55C7],
- ["86DE",0x55C8],
- ["E0BC",0x55C9],
- ["86DF",0x55CA],
- ["86E0",0x55CB],
- ["E0C9",0x55CC],
- ["E0CA",0x55CD],
- ["86E1",0x55CE],
- ["86E2",0x55CF],
- ["86E3",0x55D0],
- ["E0BE",0x55D1],
- ["E0AA",0x55D2],
- ["C9A4",0x55D3],
- ["E0C1",0x55D4],
- ["86E4",0x55D5],
- ["E0B2",0x55D6],
- ["86E5",0x55D7],
- ["86E6",0x55D8],
- ["86E7",0x55D9],
- ["86E8",0x55DA],
- ["86E9",0x55DB],
- ["CAC8",0x55DC],
- ["E0C3",0x55DD],
- ["86EA",0x55DE],
- ["E0B5",0x55DF],
- ["86EB",0x55E0],
- ["CECB",0x55E1],
- ["86EC",0x55E2],
- ["CBC3",0x55E3],
- ["E0CD",0x55E4],
- ["E0C6",0x55E5],
- ["E0C2",0x55E6],
- ["86ED",0x55E7],
- ["E0CB",0x55E8],
- ["86EE",0x55E9],
- ["E0BA",0x55EA],
- ["E0BF",0x55EB],
- ["E0C0",0x55EC],
- ["86EF",0x55ED],
- ["86F0",0x55EE],
- ["E0C5",0x55EF],
- ["86F1",0x55F0],
- ["86F2",0x55F1],
- ["E0C7",0x55F2],
- ["E0C8",0x55F3],
- ["86F3",0x55F4],
- ["E0CC",0x55F5],
- ["86F4",0x55F6],
- ["E0BB",0x55F7],
- ["86F5",0x55F8],
- ["86F6",0x55F9],
- ["86F7",0x55FA],
- ["86F8",0x55FB],
- ["86F9",0x55FC],
- ["CBD4",0x55FD],
- ["E0D5",0x55FE],
- ["86FA",0x55FF],
- ["E0D6",0x5600],
- ["E0D2",0x5601],
- ["86FB",0x5602],
- ["86FC",0x5603],
- ["86FD",0x5604],
- ["86FE",0x5605],
- ["8740",0x5606],
- ["8741",0x5607],
- ["E0D0",0x5608],
- ["BCCE",0x5609],
- ["8742",0x560A],
- ["8743",0x560B],
- ["E0D1",0x560C],
- ["8744",0x560D],
- ["B8C2",0x560E],
- ["D8C5",0x560F],
- ["8745",0x5610],
- ["8746",0x5611],
- ["8747",0x5612],
- ["8748",0x5613],
- ["8749",0x5614],
- ["874A",0x5615],
- ["874B",0x5616],
- ["874C",0x5617],
- ["D0EA",0x5618],
- ["874D",0x5619],
- ["874E",0x561A],
- ["C2EF",0x561B],
- ["874F",0x561C],
- ["8750",0x561D],
- ["E0CF",0x561E],
- ["E0BD",0x561F],
- ["8751",0x5620],
- ["8752",0x5621],
- ["8753",0x5622],
- ["E0D4",0x5623],
- ["E0D3",0x5624],
- ["8754",0x5625],
- ["8755",0x5626],
- ["E0D7",0x5627],
- ["8756",0x5628],
- ["8757",0x5629],
- ["8758",0x562A],
- ["8759",0x562B],
- ["E0DC",0x562C],
- ["E0D8",0x562D],
- ["875A",0x562E],
- ["875B",0x562F],
- ["875C",0x5630],
- ["D6F6",0x5631],
- ["B3B0",0x5632],
- ["875D",0x5633],
- ["D7EC",0x5634],
- ["875E",0x5635],
- ["CBBB",0x5636],
- ["875F",0x5637],
- ["8760",0x5638],
- ["E0DA",0x5639],
- ["8761",0x563A],
- ["CEFB",0x563B],
- ["8762",0x563C],
- ["8763",0x563D],
- ["8764",0x563E],
- ["BAD9",0x563F],
- ["8765",0x5640],
- ["8766",0x5641],
- ["8767",0x5642],
- ["8768",0x5643],
- ["8769",0x5644],
- ["876A",0x5645],
- ["876B",0x5646],
- ["876C",0x5647],
- ["876D",0x5648],
- ["876E",0x5649],
- ["876F",0x564A],
- ["8770",0x564B],
- ["E0E1",0x564C],
- ["E0DD",0x564D],
- ["D2AD",0x564E],
- ["8771",0x564F],
- ["8772",0x5650],
- ["8773",0x5651],
- ["8774",0x5652],
- ["8775",0x5653],
- ["E0E2",0x5654],
- ["8776",0x5655],
- ["8777",0x5656],
- ["E0DB",0x5657],
- ["E0D9",0x5658],
- ["E0DF",0x5659],
- ["8778",0x565A],
- ["8779",0x565B],
- ["E0E0",0x565C],
- ["877A",0x565D],
- ["877B",0x565E],
- ["877C",0x565F],
- ["877D",0x5660],
- ["877E",0x5661],
- ["E0DE",0x5662],
- ["8780",0x5663],
- ["E0E4",0x5664],
- ["8781",0x5665],
- ["8782",0x5666],
- ["8783",0x5667],
- ["C6F7",0x5668],
- ["D8AC",0x5669],
- ["D4EB",0x566A],
- ["E0E6",0x566B],
- ["CAC9",0x566C],
- ["8784",0x566D],
- ["8785",0x566E],
- ["8786",0x566F],
- ["8787",0x5670],
- ["E0E5",0x5671],
- ["8788",0x5672],
- ["8789",0x5673],
- ["878A",0x5674],
- ["878B",0x5675],
- ["B8C1",0x5676],
- ["878C",0x5677],
- ["878D",0x5678],
- ["878E",0x5679],
- ["878F",0x567A],
- ["E0E7",0x567B],
- ["E0E8",0x567C],
- ["8790",0x567D],
- ["8791",0x567E],
- ["8792",0x567F],
- ["8793",0x5680],
- ["8794",0x5681],
- ["8795",0x5682],
- ["8796",0x5683],
- ["8797",0x5684],
- ["E0E9",0x5685],
- ["E0E3",0x5686],
- ["8798",0x5687],
- ["8799",0x5688],
- ["879A",0x5689],
- ["879B",0x568A],
- ["879C",0x568B],
- ["879D",0x568C],
- ["879E",0x568D],
- ["BABF",0x568E],
- ["CCE7",0x568F],
- ["879F",0x5690],
- ["87A0",0x5691],
- ["87A1",0x5692],
- ["E0EA",0x5693],
- ["87A2",0x5694],
- ["87A3",0x5695],
- ["87A4",0x5696],
- ["87A5",0x5697],
- ["87A6",0x5698],
- ["87A7",0x5699],
- ["87A8",0x569A],
- ["87A9",0x569B],
- ["87AA",0x569C],
- ["87AB",0x569D],
- ["87AC",0x569E],
- ["87AD",0x569F],
- ["87AE",0x56A0],
- ["87AF",0x56A1],
- ["87B0",0x56A2],
- ["CFF9",0x56A3],
- ["87B1",0x56A4],
- ["87B2",0x56A5],
- ["87B3",0x56A6],
- ["87B4",0x56A7],
- ["87B5",0x56A8],
- ["87B6",0x56A9],
- ["87B7",0x56AA],
- ["87B8",0x56AB],
- ["87B9",0x56AC],
- ["87BA",0x56AD],
- ["87BB",0x56AE],
- ["E0EB",0x56AF],
- ["87BC",0x56B0],
- ["87BD",0x56B1],
- ["87BE",0x56B2],
- ["87BF",0x56B3],
- ["87C0",0x56B4],
- ["87C1",0x56B5],
- ["87C2",0x56B6],
- ["C8C2",0x56B7],
- ["87C3",0x56B8],
- ["87C4",0x56B9],
- ["87C5",0x56BA],
- ["87C6",0x56BB],
- ["BDC0",0x56BC],
- ["87C7",0x56BD],
- ["87C8",0x56BE],
- ["87C9",0x56BF],
- ["87CA",0x56C0],
- ["87CB",0x56C1],
- ["87CC",0x56C2],
- ["87CD",0x56C3],
- ["87CE",0x56C4],
- ["87CF",0x56C5],
- ["87D0",0x56C6],
- ["87D1",0x56C7],
- ["87D2",0x56C8],
- ["87D3",0x56C9],
- ["C4D2",0x56CA],
- ["87D4",0x56CB],
- ["87D5",0x56CC],
- ["87D6",0x56CD],
- ["87D7",0x56CE],
- ["87D8",0x56CF],
- ["87D9",0x56D0],
- ["87DA",0x56D1],
- ["87DB",0x56D2],
- ["87DC",0x56D3],
- ["E0EC",0x56D4],
- ["87DD",0x56D5],
- ["87DE",0x56D6],
- ["E0ED",0x56D7],
- ["87DF",0x56D8],
- ["87E0",0x56D9],
- ["C7F4",0x56DA],
- ["CBC4",0x56DB],
- ["87E1",0x56DC],
- ["E0EE",0x56DD],
- ["BBD8",0x56DE],
- ["D8B6",0x56DF],
- ["D2F2",0x56E0],
- ["E0EF",0x56E1],
- ["CDC5",0x56E2],
- ["87E2",0x56E3],
- ["B6DA",0x56E4],
- ["87E3",0x56E5],
- ["87E4",0x56E6],
- ["87E5",0x56E7],
- ["87E6",0x56E8],
- ["87E7",0x56E9],
- ["87E8",0x56EA],
- ["E0F1",0x56EB],
- ["87E9",0x56EC],
- ["D4B0",0x56ED],
- ["87EA",0x56EE],
- ["87EB",0x56EF],
- ["C0A7",0x56F0],
- ["B4D1",0x56F1],
- ["87EC",0x56F2],
- ["87ED",0x56F3],
- ["CEA7",0x56F4],
- ["E0F0",0x56F5],
- ["87EE",0x56F6],
- ["87EF",0x56F7],
- ["87F0",0x56F8],
- ["E0F2",0x56F9],
- ["B9CC",0x56FA],
- ["87F1",0x56FB],
- ["87F2",0x56FC],
- ["B9FA",0x56FD],
- ["CDBC",0x56FE],
- ["E0F3",0x56FF],
- ["87F3",0x5700],
- ["87F4",0x5701],
- ["87F5",0x5702],
- ["C6D4",0x5703],
- ["E0F4",0x5704],
- ["87F6",0x5705],
- ["D4B2",0x5706],
- ["87F7",0x5707],
- ["C8A6",0x5708],
- ["E0F6",0x5709],
- ["E0F5",0x570A],
- ["87F8",0x570B],
- ["87F9",0x570C],
- ["87FA",0x570D],
- ["87FB",0x570E],
- ["87FC",0x570F],
- ["87FD",0x5710],
- ["87FE",0x5711],
- ["8840",0x5712],
- ["8841",0x5713],
- ["8842",0x5714],
- ["8843",0x5715],
- ["8844",0x5716],
- ["8845",0x5717],
- ["8846",0x5718],
- ["8847",0x5719],
- ["8848",0x571A],
- ["8849",0x571B],
- ["E0F7",0x571C],
- ["884A",0x571D],
- ["884B",0x571E],
- ["CDC1",0x571F],
- ["884C",0x5720],
- ["884D",0x5721],
- ["884E",0x5722],
- ["CAA5",0x5723],
- ["884F",0x5724],
- ["8850",0x5725],
- ["8851",0x5726],
- ["8852",0x5727],
- ["D4DA",0x5728],
- ["DBD7",0x5729],
- ["DBD9",0x572A],
- ["8853",0x572B],
- ["DBD8",0x572C],
- ["B9E7",0x572D],
- ["DBDC",0x572E],
- ["DBDD",0x572F],
- ["B5D8",0x5730],
- ["8854",0x5731],
- ["8855",0x5732],
- ["DBDA",0x5733],
- ["8856",0x5734],
- ["8857",0x5735],
- ["8858",0x5736],
- ["8859",0x5737],
- ["885A",0x5738],
- ["DBDB",0x5739],
- ["B3A1",0x573A],
- ["DBDF",0x573B],
- ["885B",0x573C],
- ["885C",0x573D],
- ["BBF8",0x573E],
- ["885D",0x573F],
- ["D6B7",0x5740],
- ["885E",0x5741],
- ["DBE0",0x5742],
- ["885F",0x5743],
- ["8860",0x5744],
- ["8861",0x5745],
- ["8862",0x5746],
- ["BEF9",0x5747],
- ["8863",0x5748],
- ["8864",0x5749],
- ["B7BB",0x574A],
- ["8865",0x574B],
- ["DBD0",0x574C],
- ["CCAE",0x574D],
- ["BFB2",0x574E],
- ["BBB5",0x574F],
- ["D7F8",0x5750],
- ["BFD3",0x5751],
- ["8866",0x5752],
- ["8867",0x5753],
- ["8868",0x5754],
- ["8869",0x5755],
- ["886A",0x5756],
- ["BFE9",0x5757],
- ["886B",0x5758],
- ["886C",0x5759],
- ["BCE1",0x575A],
- ["CCB3",0x575B],
- ["DBDE",0x575C],
- ["B0D3",0x575D],
- ["CEEB",0x575E],
- ["B7D8",0x575F],
- ["D7B9",0x5760],
- ["C6C2",0x5761],
- ["886D",0x5762],
- ["886E",0x5763],
- ["C0A4",0x5764],
- ["886F",0x5765],
- ["CCB9",0x5766],
- ["8870",0x5767],
- ["DBE7",0x5768],
- ["DBE1",0x5769],
- ["C6BA",0x576A],
- ["DBE3",0x576B],
- ["8871",0x576C],
- ["DBE8",0x576D],
- ["8872",0x576E],
- ["C5F7",0x576F],
- ["8873",0x5770],
- ["8874",0x5771],
- ["8875",0x5772],
- ["DBEA",0x5773],
- ["8876",0x5774],
- ["8877",0x5775],
- ["DBE9",0x5776],
- ["BFC0",0x5777],
- ["8878",0x5778],
- ["8879",0x5779],
- ["887A",0x577A],
- ["DBE6",0x577B],
- ["DBE5",0x577C],
- ["887B",0x577D],
- ["887C",0x577E],
- ["887D",0x577F],
- ["887E",0x5780],
- ["8880",0x5781],
- ["B4B9",0x5782],
- ["C0AC",0x5783],
- ["C2A2",0x5784],
- ["DBE2",0x5785],
- ["DBE4",0x5786],
- ["8881",0x5787],
- ["8882",0x5788],
- ["8883",0x5789],
- ["8884",0x578A],
- ["D0CD",0x578B],
- ["DBED",0x578C],
- ["8885",0x578D],
- ["8886",0x578E],
- ["8887",0x578F],
- ["8888",0x5790],
- ["8889",0x5791],
- ["C0DD",0x5792],
- ["DBF2",0x5793],
- ["888A",0x5794],
- ["888B",0x5795],
- ["888C",0x5796],
- ["888D",0x5797],
- ["888E",0x5798],
- ["888F",0x5799],
- ["8890",0x579A],
- ["B6E2",0x579B],
- ["8891",0x579C],
- ["8892",0x579D],
- ["8893",0x579E],
- ["8894",0x579F],
- ["DBF3",0x57A0],
- ["DBD2",0x57A1],
- ["B9B8",0x57A2],
- ["D4AB",0x57A3],
- ["DBEC",0x57A4],
- ["8895",0x57A5],
- ["BFD1",0x57A6],
- ["DBF0",0x57A7],
- ["8896",0x57A8],
- ["DBD1",0x57A9],
- ["8897",0x57AA],
- ["B5E6",0x57AB],
- ["8898",0x57AC],
- ["DBEB",0x57AD],
- ["BFE5",0x57AE],
- ["8899",0x57AF],
- ["889A",0x57B0],
- ["889B",0x57B1],
- ["DBEE",0x57B2],
- ["889C",0x57B3],
- ["DBF1",0x57B4],
- ["889D",0x57B5],
- ["889E",0x57B6],
- ["889F",0x57B7],
- ["DBF9",0x57B8],
- ["88A0",0x57B9],
- ["88A1",0x57BA],
- ["88A2",0x57BB],
- ["88A3",0x57BC],
- ["88A4",0x57BD],
- ["88A5",0x57BE],
- ["88A6",0x57BF],
- ["88A7",0x57C0],
- ["88A8",0x57C1],
- ["B9A1",0x57C2],
- ["B0A3",0x57C3],
- ["88A9",0x57C4],
- ["88AA",0x57C5],
- ["88AB",0x57C6],
- ["88AC",0x57C7],
- ["88AD",0x57C8],
- ["88AE",0x57C9],
- ["88AF",0x57CA],
- ["C2F1",0x57CB],
- ["88B0",0x57CC],
- ["88B1",0x57CD],
- ["B3C7",0x57CE],
- ["DBEF",0x57CF],
- ["88B2",0x57D0],
- ["88B3",0x57D1],
- ["DBF8",0x57D2],
- ["88B4",0x57D3],
- ["C6D2",0x57D4],
- ["DBF4",0x57D5],
- ["88B5",0x57D6],
- ["88B6",0x57D7],
- ["DBF5",0x57D8],
- ["DBF7",0x57D9],
- ["DBF6",0x57DA],
- ["88B7",0x57DB],
- ["88B8",0x57DC],
- ["DBFE",0x57DD],
- ["88B9",0x57DE],
- ["D3F2",0x57DF],
- ["B2BA",0x57E0],
- ["88BA",0x57E1],
- ["88BB",0x57E2],
- ["88BC",0x57E3],
- ["DBFD",0x57E4],
- ["88BD",0x57E5],
- ["88BE",0x57E6],
- ["88BF",0x57E7],
- ["88C0",0x57E8],
- ["88C1",0x57E9],
- ["88C2",0x57EA],
- ["88C3",0x57EB],
- ["88C4",0x57EC],
- ["DCA4",0x57ED],
- ["88C5",0x57EE],
- ["DBFB",0x57EF],
- ["88C6",0x57F0],
- ["88C7",0x57F1],
- ["88C8",0x57F2],
- ["88C9",0x57F3],
- ["DBFA",0x57F4],
- ["88CA",0x57F5],
- ["88CB",0x57F6],
- ["88CC",0x57F7],
- ["DBFC",0x57F8],
- ["C5E0",0x57F9],
- ["BBF9",0x57FA],
- ["88CD",0x57FB],
- ["88CE",0x57FC],
- ["DCA3",0x57FD],
- ["88CF",0x57FE],
- ["88D0",0x57FF],
- ["DCA5",0x5800],
- ["88D1",0x5801],
- ["CCC3",0x5802],
- ["88D2",0x5803],
- ["88D3",0x5804],
- ["88D4",0x5805],
- ["B6D1",0x5806],
- ["DDC0",0x5807],
- ["88D5",0x5808],
- ["88D6",0x5809],
- ["88D7",0x580A],
- ["DCA1",0x580B],
- ["88D8",0x580C],
- ["DCA2",0x580D],
- ["88D9",0x580E],
- ["88DA",0x580F],
- ["88DB",0x5810],
- ["C7B5",0x5811],
- ["88DC",0x5812],
- ["88DD",0x5813],
- ["88DE",0x5814],
- ["B6E9",0x5815],
- ["88DF",0x5816],
- ["88E0",0x5817],
- ["88E1",0x5818],
- ["DCA7",0x5819],
- ["88E2",0x581A],
- ["88E3",0x581B],
- ["88E4",0x581C],
- ["88E5",0x581D],
- ["DCA6",0x581E],
- ["88E6",0x581F],
- ["DCA9",0x5820],
- ["B1A4",0x5821],
- ["88E7",0x5822],
- ["88E8",0x5823],
- ["B5CC",0x5824],
- ["88E9",0x5825],
- ["88EA",0x5826],
- ["88EB",0x5827],
- ["88EC",0x5828],
- ["88ED",0x5829],
- ["BFB0",0x582A],
- ["88EE",0x582B],
- ["88EF",0x582C],
- ["88F0",0x582D],
- ["88F1",0x582E],
- ["88F2",0x582F],
- ["D1DF",0x5830],
- ["88F3",0x5831],
- ["88F4",0x5832],
- ["88F5",0x5833],
- ["88F6",0x5834],
- ["B6C2",0x5835],
- ["88F7",0x5836],
- ["88F8",0x5837],
- ["88F9",0x5838],
- ["88FA",0x5839],
- ["88FB",0x583A],
- ["88FC",0x583B],
- ["88FD",0x583C],
- ["88FE",0x583D],
- ["8940",0x583E],
- ["8941",0x583F],
- ["8942",0x5840],
- ["8943",0x5841],
- ["8944",0x5842],
- ["8945",0x5843],
- ["DCA8",0x5844],
- ["8946",0x5845],
- ["8947",0x5846],
- ["8948",0x5847],
- ["8949",0x5848],
- ["894A",0x5849],
- ["894B",0x584A],
- ["894C",0x584B],
- ["CBFA",0x584C],
- ["EBF3",0x584D],
- ["894D",0x584E],
- ["894E",0x584F],
- ["894F",0x5850],
- ["CBDC",0x5851],
- ["8950",0x5852],
- ["8951",0x5853],
- ["CBFE",0x5854],
- ["8952",0x5855],
- ["8953",0x5856],
- ["8954",0x5857],
- ["CCC1",0x5858],
- ["8955",0x5859],
- ["8956",0x585A],
- ["8957",0x585B],
- ["8958",0x585C],
- ["8959",0x585D],
- ["C8FB",0x585E],
- ["895A",0x585F],
- ["895B",0x5860],
- ["895C",0x5861],
- ["895D",0x5862],
- ["895E",0x5863],
- ["895F",0x5864],
- ["DCAA",0x5865],
- ["8960",0x5866],
- ["8961",0x5867],
- ["8962",0x5868],
- ["8963",0x5869],
- ["8964",0x586A],
- ["CCEE",0x586B],
- ["DCAB",0x586C],
- ["8965",0x586D],
- ["8966",0x586E],
- ["8967",0x586F],
- ["8968",0x5870],
- ["8969",0x5871],
- ["896A",0x5872],
- ["896B",0x5873],
- ["896C",0x5874],
- ["896D",0x5875],
- ["896E",0x5876],
- ["896F",0x5877],
- ["8970",0x5878],
- ["8971",0x5879],
- ["8972",0x587A],
- ["8973",0x587B],
- ["8974",0x587C],
- ["8975",0x587D],
- ["DBD3",0x587E],
- ["8976",0x587F],
- ["DCAF",0x5880],
- ["DCAC",0x5881],
- ["8977",0x5882],
- ["BEB3",0x5883],
- ["8978",0x5884],
- ["CAFB",0x5885],
- ["8979",0x5886],
- ["897A",0x5887],
- ["897B",0x5888],
- ["DCAD",0x5889],
- ["897C",0x588A],
- ["897D",0x588B],
- ["897E",0x588C],
- ["8980",0x588D],
- ["8981",0x588E],
- ["8982",0x588F],
- ["8983",0x5890],
- ["8984",0x5891],
- ["C9CA",0x5892],
- ["C4B9",0x5893],
- ["8985",0x5894],
- ["8986",0x5895],
- ["8987",0x5896],
- ["8988",0x5897],
- ["8989",0x5898],
- ["C7BD",0x5899],
- ["DCAE",0x589A],
- ["898A",0x589B],
- ["898B",0x589C],
- ["898C",0x589D],
- ["D4F6",0x589E],
- ["D0E6",0x589F],
- ["898D",0x58A0],
- ["898E",0x58A1],
- ["898F",0x58A2],
- ["8990",0x58A3],
- ["8991",0x58A4],
- ["8992",0x58A5],
- ["8993",0x58A6],
- ["8994",0x58A7],
- ["C4AB",0x58A8],
- ["B6D5",0x58A9],
- ["8995",0x58AA],
- ["8996",0x58AB],
- ["8997",0x58AC],
- ["8998",0x58AD],
- ["8999",0x58AE],
- ["899A",0x58AF],
- ["899B",0x58B0],
- ["899C",0x58B1],
- ["899D",0x58B2],
- ["899E",0x58B3],
- ["899F",0x58B4],
- ["89A0",0x58B5],
- ["89A1",0x58B6],
- ["89A2",0x58B7],
- ["89A3",0x58B8],
- ["89A4",0x58B9],
- ["89A5",0x58BA],
- ["89A6",0x58BB],
- ["DBD4",0x58BC],
- ["89A7",0x58BD],
- ["89A8",0x58BE],
- ["89A9",0x58BF],
- ["89AA",0x58C0],
- ["B1DA",0x58C1],
- ["89AB",0x58C2],
- ["89AC",0x58C3],
- ["89AD",0x58C4],
- ["DBD5",0x58C5],
- ["89AE",0x58C6],
- ["89AF",0x58C7],
- ["89B0",0x58C8],
- ["89B1",0x58C9],
- ["89B2",0x58CA],
- ["89B3",0x58CB],
- ["89B4",0x58CC],
- ["89B5",0x58CD],
- ["89B6",0x58CE],
- ["89B7",0x58CF],
- ["89B8",0x58D0],
- ["DBD6",0x58D1],
- ["89B9",0x58D2],
- ["89BA",0x58D3],
- ["89BB",0x58D4],
- ["BABE",0x58D5],
- ["89BC",0x58D6],
- ["89BD",0x58D7],
- ["89BE",0x58D8],
- ["89BF",0x58D9],
- ["89C0",0x58DA],
- ["89C1",0x58DB],
- ["89C2",0x58DC],
- ["89C3",0x58DD],
- ["89C4",0x58DE],
- ["89C5",0x58DF],
- ["89C6",0x58E0],
- ["89C7",0x58E1],
- ["89C8",0x58E2],
- ["89C9",0x58E3],
- ["C8C0",0x58E4],
- ["89CA",0x58E5],
- ["89CB",0x58E6],
- ["89CC",0x58E7],
- ["89CD",0x58E8],
- ["89CE",0x58E9],
- ["89CF",0x58EA],
- ["CABF",0x58EB],
- ["C8C9",0x58EC],
- ["89D0",0x58ED],
- ["D7B3",0x58EE],
- ["89D1",0x58EF],
- ["C9F9",0x58F0],
- ["89D2",0x58F1],
- ["89D3",0x58F2],
- ["BFC7",0x58F3],
- ["89D4",0x58F4],
- ["89D5",0x58F5],
- ["BAF8",0x58F6],
- ["89D6",0x58F7],
- ["89D7",0x58F8],
- ["D2BC",0x58F9],
- ["89D8",0x58FA],
- ["89D9",0x58FB],
- ["89DA",0x58FC],
- ["89DB",0x58FD],
- ["89DC",0x58FE],
- ["89DD",0x58FF],
- ["89DE",0x5900],
- ["89DF",0x5901],
- ["E2BA",0x5902],
- ["89E0",0x5903],
- ["B4A6",0x5904],
- ["89E1",0x5905],
- ["89E2",0x5906],
- ["B1B8",0x5907],
- ["89E3",0x5908],
- ["89E4",0x5909],
- ["89E5",0x590A],
- ["89E6",0x590B],
- ["89E7",0x590C],
- ["B8B4",0x590D],
- ["89E8",0x590E],
- ["CFC4",0x590F],
- ["89E9",0x5910],
- ["89EA",0x5911],
- ["89EB",0x5912],
- ["89EC",0x5913],
- ["D9E7",0x5914],
- ["CFA6",0x5915],
- ["CDE2",0x5916],
- ["89ED",0x5917],
- ["89EE",0x5918],
- ["D9ED",0x5919],
- ["B6E0",0x591A],
- ["89EF",0x591B],
- ["D2B9",0x591C],
- ["89F0",0x591D],
- ["89F1",0x591E],
- ["B9BB",0x591F],
- ["89F2",0x5920],
- ["89F3",0x5921],
- ["89F4",0x5922],
- ["89F5",0x5923],
- ["E2B9",0x5924],
- ["E2B7",0x5925],
- ["89F6",0x5926],
- ["B4F3",0x5927],
- ["89F7",0x5928],
- ["CCEC",0x5929],
- ["CCAB",0x592A],
- ["B7F2",0x592B],
- ["89F8",0x592C],
- ["D8B2",0x592D],
- ["D1EB",0x592E],
- ["BABB",0x592F],
- ["89F9",0x5930],
- ["CAA7",0x5931],
- ["89FA",0x5932],
- ["89FB",0x5933],
- ["CDB7",0x5934],
- ["89FC",0x5935],
- ["89FD",0x5936],
- ["D2C4",0x5937],
- ["BFE4",0x5938],
- ["BCD0",0x5939],
- ["B6E1",0x593A],
- ["89FE",0x593B],
- ["DEC5",0x593C],
- ["8A40",0x593D],
- ["8A41",0x593E],
- ["8A42",0x593F],
- ["8A43",0x5940],
- ["DEC6",0x5941],
- ["DBBC",0x5942],
- ["8A44",0x5943],
- ["D1D9",0x5944],
- ["8A45",0x5945],
- ["8A46",0x5946],
- ["C6E6",0x5947],
- ["C4CE",0x5948],
- ["B7EE",0x5949],
- ["8A47",0x594A],
- ["B7DC",0x594B],
- ["8A48",0x594C],
- ["8A49",0x594D],
- ["BFFC",0x594E],
- ["D7E0",0x594F],
- ["8A4A",0x5950],
- ["C6F5",0x5951],
- ["8A4B",0x5952],
- ["8A4C",0x5953],
- ["B1BC",0x5954],
- ["DEC8",0x5955],
- ["BDB1",0x5956],
- ["CCD7",0x5957],
- ["DECA",0x5958],
- ["8A4D",0x5959],
- ["DEC9",0x595A],
- ["8A4E",0x595B],
- ["8A4F",0x595C],
- ["8A50",0x595D],
- ["8A51",0x595E],
- ["8A52",0x595F],
- ["B5EC",0x5960],
- ["8A53",0x5961],
- ["C9DD",0x5962],
- ["8A54",0x5963],
- ["8A55",0x5964],
- ["B0C2",0x5965],
- ["8A56",0x5966],
- ["8A57",0x5967],
- ["8A58",0x5968],
- ["8A59",0x5969],
- ["8A5A",0x596A],
- ["8A5B",0x596B],
- ["8A5C",0x596C],
- ["8A5D",0x596D],
- ["8A5E",0x596E],
- ["8A5F",0x596F],
- ["8A60",0x5970],
- ["8A61",0x5971],
- ["8A62",0x5972],
- ["C5AE",0x5973],
- ["C5AB",0x5974],
- ["8A63",0x5975],
- ["C4CC",0x5976],
- ["8A64",0x5977],
- ["BCE9",0x5978],
- ["CBFD",0x5979],
- ["8A65",0x597A],
- ["8A66",0x597B],
- ["8A67",0x597C],
- ["BAC3",0x597D],
- ["8A68",0x597E],
- ["8A69",0x597F],
- ["8A6A",0x5980],
- ["E5F9",0x5981],
- ["C8E7",0x5982],
- ["E5FA",0x5983],
- ["CDFD",0x5984],
- ["8A6B",0x5985],
- ["D7B1",0x5986],
- ["B8BE",0x5987],
- ["C2E8",0x5988],
- ["8A6C",0x5989],
- ["C8D1",0x598A],
- ["8A6D",0x598B],
- ["8A6E",0x598C],
- ["E5FB",0x598D],
- ["8A6F",0x598E],
- ["8A70",0x598F],
- ["8A71",0x5990],
- ["8A72",0x5991],
- ["B6CA",0x5992],
- ["BCCB",0x5993],
- ["8A73",0x5994],
- ["8A74",0x5995],
- ["D1FD",0x5996],
- ["E6A1",0x5997],
- ["8A75",0x5998],
- ["C3EE",0x5999],
- ["8A76",0x599A],
- ["8A77",0x599B],
- ["8A78",0x599C],
- ["8A79",0x599D],
- ["E6A4",0x599E],
- ["8A7A",0x599F],
- ["8A7B",0x59A0],
- ["8A7C",0x59A1],
- ["8A7D",0x59A2],
- ["E5FE",0x59A3],
- ["E6A5",0x59A4],
- ["CDD7",0x59A5],
- ["8A7E",0x59A6],
- ["8A80",0x59A7],
- ["B7C1",0x59A8],
- ["E5FC",0x59A9],
- ["E5FD",0x59AA],
- ["E6A3",0x59AB],
- ["8A81",0x59AC],
- ["8A82",0x59AD],
- ["C4DD",0x59AE],
- ["E6A8",0x59AF],
- ["8A83",0x59B0],
- ["8A84",0x59B1],
- ["E6A7",0x59B2],
- ["8A85",0x59B3],
- ["8A86",0x59B4],
- ["8A87",0x59B5],
- ["8A88",0x59B6],
- ["8A89",0x59B7],
- ["8A8A",0x59B8],
- ["C3C3",0x59B9],
- ["8A8B",0x59BA],
- ["C6DE",0x59BB],
- ["8A8C",0x59BC],
- ["8A8D",0x59BD],
- ["E6AA",0x59BE],
- ["8A8E",0x59BF],
- ["8A8F",0x59C0],
- ["8A90",0x59C1],
- ["8A91",0x59C2],
- ["8A92",0x59C3],
- ["8A93",0x59C4],
- ["8A94",0x59C5],
- ["C4B7",0x59C6],
- ["8A95",0x59C7],
- ["8A96",0x59C8],
- ["8A97",0x59C9],
- ["E6A2",0x59CA],
- ["CABC",0x59CB],
- ["8A98",0x59CC],
- ["8A99",0x59CD],
- ["8A9A",0x59CE],
- ["8A9B",0x59CF],
- ["BDE3",0x59D0],
- ["B9C3",0x59D1],
- ["E6A6",0x59D2],
- ["D0D5",0x59D3],
- ["CEAF",0x59D4],
- ["8A9C",0x59D5],
- ["8A9D",0x59D6],
- ["E6A9",0x59D7],
- ["E6B0",0x59D8],
- ["8A9E",0x59D9],
- ["D2A6",0x59DA],
- ["8A9F",0x59DB],
- ["BDAA",0x59DC],
- ["E6AD",0x59DD],
- ["8AA0",0x59DE],
- ["8AA1",0x59DF],
- ["8AA2",0x59E0],
- ["8AA3",0x59E1],
- ["8AA4",0x59E2],
- ["E6AF",0x59E3],
- ["8AA5",0x59E4],
- ["C0D1",0x59E5],
- ["8AA6",0x59E6],
- ["8AA7",0x59E7],
- ["D2CC",0x59E8],
- ["8AA8",0x59E9],
- ["8AA9",0x59EA],
- ["8AAA",0x59EB],
- ["BCA7",0x59EC],
- ["8AAB",0x59ED],
- ["8AAC",0x59EE],
- ["8AAD",0x59EF],
- ["8AAE",0x59F0],
- ["8AAF",0x59F1],
- ["8AB0",0x59F2],
- ["8AB1",0x59F3],
- ["8AB2",0x59F4],
- ["8AB3",0x59F5],
- ["8AB4",0x59F6],
- ["8AB5",0x59F7],
- ["8AB6",0x59F8],
- ["E6B1",0x59F9],
- ["8AB7",0x59FA],
- ["D2F6",0x59FB],
- ["8AB8",0x59FC],
- ["8AB9",0x59FD],
- ["8ABA",0x59FE],
- ["D7CB",0x59FF],
- ["8ABB",0x5A00],
- ["CDFE",0x5A01],
- ["8ABC",0x5A02],
- ["CDDE",0x5A03],
- ["C2A6",0x5A04],
- ["E6AB",0x5A05],
- ["E6AC",0x5A06],
- ["BDBF",0x5A07],
- ["E6AE",0x5A08],
- ["E6B3",0x5A09],
- ["8ABD",0x5A0A],
- ["8ABE",0x5A0B],
- ["E6B2",0x5A0C],
- ["8ABF",0x5A0D],
- ["8AC0",0x5A0E],
- ["8AC1",0x5A0F],
- ["8AC2",0x5A10],
- ["E6B6",0x5A11],
- ["8AC3",0x5A12],
- ["E6B8",0x5A13],
- ["8AC4",0x5A14],
- ["8AC5",0x5A15],
- ["8AC6",0x5A16],
- ["8AC7",0x5A17],
- ["C4EF",0x5A18],
- ["8AC8",0x5A19],
- ["8AC9",0x5A1A],
- ["8ACA",0x5A1B],
- ["C4C8",0x5A1C],
- ["8ACB",0x5A1D],
- ["8ACC",0x5A1E],
- ["BEEA",0x5A1F],
- ["C9EF",0x5A20],
- ["8ACD",0x5A21],
- ["8ACE",0x5A22],
- ["E6B7",0x5A23],
- ["8ACF",0x5A24],
- ["B6F0",0x5A25],
- ["8AD0",0x5A26],
- ["8AD1",0x5A27],
- ["8AD2",0x5A28],
- ["C3E4",0x5A29],
- ["8AD3",0x5A2A],
- ["8AD4",0x5A2B],
- ["8AD5",0x5A2C],
- ["8AD6",0x5A2D],
- ["8AD7",0x5A2E],
- ["8AD8",0x5A2F],
- ["8AD9",0x5A30],
- ["D3E9",0x5A31],
- ["E6B4",0x5A32],
- ["8ADA",0x5A33],
- ["E6B5",0x5A34],
- ["8ADB",0x5A35],
- ["C8A2",0x5A36],
- ["8ADC",0x5A37],
- ["8ADD",0x5A38],
- ["8ADE",0x5A39],
- ["8ADF",0x5A3A],
- ["8AE0",0x5A3B],
- ["E6BD",0x5A3C],
- ["8AE1",0x5A3D],
- ["8AE2",0x5A3E],
- ["8AE3",0x5A3F],
- ["E6B9",0x5A40],
- ["8AE4",0x5A41],
- ["8AE5",0x5A42],
- ["8AE6",0x5A43],
- ["8AE7",0x5A44],
- ["8AE8",0x5A45],
- ["C6C5",0x5A46],
- ["8AE9",0x5A47],
- ["8AEA",0x5A48],
- ["CDF1",0x5A49],
- ["E6BB",0x5A4A],
- ["8AEB",0x5A4B],
- ["8AEC",0x5A4C],
- ["8AED",0x5A4D],
- ["8AEE",0x5A4E],
- ["8AEF",0x5A4F],
- ["8AF0",0x5A50],
- ["8AF1",0x5A51],
- ["8AF2",0x5A52],
- ["8AF3",0x5A53],
- ["8AF4",0x5A54],
- ["E6BC",0x5A55],
- ["8AF5",0x5A56],
- ["8AF6",0x5A57],
- ["8AF7",0x5A58],
- ["8AF8",0x5A59],
- ["BBE9",0x5A5A],
- ["8AF9",0x5A5B],
- ["8AFA",0x5A5C],
- ["8AFB",0x5A5D],
- ["8AFC",0x5A5E],
- ["8AFD",0x5A5F],
- ["8AFE",0x5A60],
- ["8B40",0x5A61],
- ["E6BE",0x5A62],
- ["8B41",0x5A63],
- ["8B42",0x5A64],
- ["8B43",0x5A65],
- ["8B44",0x5A66],
- ["E6BA",0x5A67],
- ["8B45",0x5A68],
- ["8B46",0x5A69],
- ["C0B7",0x5A6A],
- ["8B47",0x5A6B],
- ["8B48",0x5A6C],
- ["8B49",0x5A6D],
- ["8B4A",0x5A6E],
- ["8B4B",0x5A6F],
- ["8B4C",0x5A70],
- ["8B4D",0x5A71],
- ["8B4E",0x5A72],
- ["8B4F",0x5A73],
- ["D3A4",0x5A74],
- ["E6BF",0x5A75],
- ["C9F4",0x5A76],
- ["E6C3",0x5A77],
- ["8B50",0x5A78],
- ["8B51",0x5A79],
- ["E6C4",0x5A7A],
- ["8B52",0x5A7B],
- ["8B53",0x5A7C],
- ["8B54",0x5A7D],
- ["8B55",0x5A7E],
- ["D0F6",0x5A7F],
- ["8B56",0x5A80],
- ["8B57",0x5A81],
- ["8B58",0x5A82],
- ["8B59",0x5A83],
- ["8B5A",0x5A84],
- ["8B5B",0x5A85],
- ["8B5C",0x5A86],
- ["8B5D",0x5A87],
- ["8B5E",0x5A88],
- ["8B5F",0x5A89],
- ["8B60",0x5A8A],
- ["8B61",0x5A8B],
- ["8B62",0x5A8C],
- ["8B63",0x5A8D],
- ["8B64",0x5A8E],
- ["8B65",0x5A8F],
- ["8B66",0x5A90],
- ["8B67",0x5A91],
- ["C3BD",0x5A92],
- ["8B68",0x5A93],
- ["8B69",0x5A94],
- ["8B6A",0x5A95],
- ["8B6B",0x5A96],
- ["8B6C",0x5A97],
- ["8B6D",0x5A98],
- ["8B6E",0x5A99],
- ["C3C4",0x5A9A],
- ["E6C2",0x5A9B],
- ["8B6F",0x5A9C],
- ["8B70",0x5A9D],
- ["8B71",0x5A9E],
- ["8B72",0x5A9F],
- ["8B73",0x5AA0],
- ["8B74",0x5AA1],
- ["8B75",0x5AA2],
- ["8B76",0x5AA3],
- ["8B77",0x5AA4],
- ["8B78",0x5AA5],
- ["8B79",0x5AA6],
- ["8B7A",0x5AA7],
- ["8B7B",0x5AA8],
- ["8B7C",0x5AA9],
- ["E6C1",0x5AAA],
- ["8B7D",0x5AAB],
- ["8B7E",0x5AAC],
- ["8B80",0x5AAD],
- ["8B81",0x5AAE],
- ["8B82",0x5AAF],
- ["8B83",0x5AB0],
- ["8B84",0x5AB1],
- ["E6C7",0x5AB2],
- ["CFB1",0x5AB3],
- ["8B85",0x5AB4],
- ["EBF4",0x5AB5],
- ["8B86",0x5AB6],
- ["8B87",0x5AB7],
- ["E6CA",0x5AB8],
- ["8B88",0x5AB9],
- ["8B89",0x5ABA],
- ["8B8A",0x5ABB],
- ["8B8B",0x5ABC],
- ["8B8C",0x5ABD],
- ["E6C5",0x5ABE],
- ["8B8D",0x5ABF],
- ["8B8E",0x5AC0],
- ["BCDE",0x5AC1],
- ["C9A9",0x5AC2],
- ["8B8F",0x5AC3],
- ["8B90",0x5AC4],
- ["8B91",0x5AC5],
- ["8B92",0x5AC6],
- ["8B93",0x5AC7],
- ["8B94",0x5AC8],
- ["BCB5",0x5AC9],
- ["8B95",0x5ACA],
- ["8B96",0x5ACB],
- ["CFD3",0x5ACC],
- ["8B97",0x5ACD],
- ["8B98",0x5ACE],
- ["8B99",0x5ACF],
- ["8B9A",0x5AD0],
- ["8B9B",0x5AD1],
- ["E6C8",0x5AD2],
- ["8B9C",0x5AD3],
- ["E6C9",0x5AD4],
- ["8B9D",0x5AD5],
- ["E6CE",0x5AD6],
- ["8B9E",0x5AD7],
- ["E6D0",0x5AD8],
- ["8B9F",0x5AD9],
- ["8BA0",0x5ADA],
- ["8BA1",0x5ADB],
- ["E6D1",0x5ADC],
- ["8BA2",0x5ADD],
- ["8BA3",0x5ADE],
- ["8BA4",0x5ADF],
- ["E6CB",0x5AE0],
- ["B5D5",0x5AE1],
- ["8BA5",0x5AE2],
- ["E6CC",0x5AE3],
- ["8BA6",0x5AE4],
- ["8BA7",0x5AE5],
- ["E6CF",0x5AE6],
- ["8BA8",0x5AE7],
- ["8BA9",0x5AE8],
- ["C4DB",0x5AE9],
- ["8BAA",0x5AEA],
- ["E6C6",0x5AEB],
- ["8BAB",0x5AEC],
- ["8BAC",0x5AED],
- ["8BAD",0x5AEE],
- ["8BAE",0x5AEF],
- ["8BAF",0x5AF0],
- ["E6CD",0x5AF1],
- ["8BB0",0x5AF2],
- ["8BB1",0x5AF3],
- ["8BB2",0x5AF4],
- ["8BB3",0x5AF5],
- ["8BB4",0x5AF6],
- ["8BB5",0x5AF7],
- ["8BB6",0x5AF8],
- ["8BB7",0x5AF9],
- ["8BB8",0x5AFA],
- ["8BB9",0x5AFB],
- ["8BBA",0x5AFC],
- ["8BBB",0x5AFD],
- ["8BBC",0x5AFE],
- ["8BBD",0x5AFF],
- ["8BBE",0x5B00],
- ["8BBF",0x5B01],
- ["8BC0",0x5B02],
- ["8BC1",0x5B03],
- ["8BC2",0x5B04],
- ["8BC3",0x5B05],
- ["8BC4",0x5B06],
- ["8BC5",0x5B07],
- ["8BC6",0x5B08],
- ["E6D2",0x5B09],
- ["8BC7",0x5B0A],
- ["8BC8",0x5B0B],
- ["8BC9",0x5B0C],
- ["8BCA",0x5B0D],
- ["8BCB",0x5B0E],
- ["8BCC",0x5B0F],
- ["8BCD",0x5B10],
- ["8BCE",0x5B11],
- ["8BCF",0x5B12],
- ["8BD0",0x5B13],
- ["8BD1",0x5B14],
- ["8BD2",0x5B15],
- ["E6D4",0x5B16],
- ["E6D3",0x5B17],
- ["8BD3",0x5B18],
- ["8BD4",0x5B19],
- ["8BD5",0x5B1A],
- ["8BD6",0x5B1B],
- ["8BD7",0x5B1C],
- ["8BD8",0x5B1D],
- ["8BD9",0x5B1E],
- ["8BDA",0x5B1F],
- ["8BDB",0x5B20],
- ["8BDC",0x5B21],
- ["8BDD",0x5B22],
- ["8BDE",0x5B23],
- ["8BDF",0x5B24],
- ["8BE0",0x5B25],
- ["8BE1",0x5B26],
- ["8BE2",0x5B27],
- ["8BE3",0x5B28],
- ["8BE4",0x5B29],
- ["8BE5",0x5B2A],
- ["8BE6",0x5B2B],
- ["8BE7",0x5B2C],
- ["8BE8",0x5B2D],
- ["8BE9",0x5B2E],
- ["8BEA",0x5B2F],
- ["8BEB",0x5B30],
- ["8BEC",0x5B31],
- ["E6D5",0x5B32],
- ["8BED",0x5B33],
- ["D9F8",0x5B34],
- ["8BEE",0x5B35],
- ["8BEF",0x5B36],
- ["E6D6",0x5B37],
- ["8BF0",0x5B38],
- ["8BF1",0x5B39],
- ["8BF2",0x5B3A],
- ["8BF3",0x5B3B],
- ["8BF4",0x5B3C],
- ["8BF5",0x5B3D],
- ["8BF6",0x5B3E],
- ["8BF7",0x5B3F],
- ["E6D7",0x5B40],
- ["8BF8",0x5B41],
- ["8BF9",0x5B42],
- ["8BFA",0x5B43],
- ["8BFB",0x5B44],
- ["8BFC",0x5B45],
- ["8BFD",0x5B46],
- ["8BFE",0x5B47],
- ["8C40",0x5B48],
- ["8C41",0x5B49],
- ["8C42",0x5B4A],
- ["8C43",0x5B4B],
- ["8C44",0x5B4C],
- ["8C45",0x5B4D],
- ["8C46",0x5B4E],
- ["8C47",0x5B4F],
- ["D7D3",0x5B50],
- ["E6DD",0x5B51],
- ["8C48",0x5B52],
- ["E6DE",0x5B53],
- ["BFD7",0x5B54],
- ["D4D0",0x5B55],
- ["8C49",0x5B56],
- ["D7D6",0x5B57],
- ["B4E6",0x5B58],
- ["CBEF",0x5B59],
- ["E6DA",0x5B5A],
- ["D8C3",0x5B5B],
- ["D7CE",0x5B5C],
- ["D0A2",0x5B5D],
- ["8C4A",0x5B5E],
- ["C3CF",0x5B5F],
- ["8C4B",0x5B60],
- ["8C4C",0x5B61],
- ["E6DF",0x5B62],
- ["BCBE",0x5B63],
- ["B9C2",0x5B64],
- ["E6DB",0x5B65],
- ["D1A7",0x5B66],
- ["8C4D",0x5B67],
- ["8C4E",0x5B68],
- ["BAA2",0x5B69],
- ["C2CF",0x5B6A],
- ["8C4F",0x5B6B],
- ["D8AB",0x5B6C],
- ["8C50",0x5B6D],
- ["8C51",0x5B6E],
- ["8C52",0x5B6F],
- ["CAEB",0x5B70],
- ["E5EE",0x5B71],
- ["8C53",0x5B72],
- ["E6DC",0x5B73],
- ["8C54",0x5B74],
- ["B7F5",0x5B75],
- ["8C55",0x5B76],
- ["8C56",0x5B77],
- ["8C57",0x5B78],
- ["8C58",0x5B79],
- ["C8E6",0x5B7A],
- ["8C59",0x5B7B],
- ["8C5A",0x5B7C],
- ["C4F5",0x5B7D],
- ["8C5B",0x5B7E],
- ["8C5C",0x5B7F],
- ["E5B2",0x5B80],
- ["C4FE",0x5B81],
- ["8C5D",0x5B82],
- ["CBFC",0x5B83],
- ["E5B3",0x5B84],
- ["D5AC",0x5B85],
- ["8C5E",0x5B86],
- ["D3EE",0x5B87],
- ["CAD8",0x5B88],
- ["B0B2",0x5B89],
- ["8C5F",0x5B8A],
- ["CBCE",0x5B8B],
- ["CDEA",0x5B8C],
- ["8C60",0x5B8D],
- ["8C61",0x5B8E],
- ["BAEA",0x5B8F],
- ["8C62",0x5B90],
- ["8C63",0x5B91],
- ["8C64",0x5B92],
- ["E5B5",0x5B93],
- ["8C65",0x5B94],
- ["E5B4",0x5B95],
- ["8C66",0x5B96],
- ["D7DA",0x5B97],
- ["B9D9",0x5B98],
- ["D6E6",0x5B99],
- ["B6A8",0x5B9A],
- ["CDF0",0x5B9B],
- ["D2CB",0x5B9C],
- ["B1A6",0x5B9D],
- ["CAB5",0x5B9E],
- ["8C67",0x5B9F],
- ["B3E8",0x5BA0],
- ["C9F3",0x5BA1],
- ["BFCD",0x5BA2],
- ["D0FB",0x5BA3],
- ["CAD2",0x5BA4],
- ["E5B6",0x5BA5],
- ["BBC2",0x5BA6],
- ["8C68",0x5BA7],
- ["8C69",0x5BA8],
- ["8C6A",0x5BA9],
- ["CFDC",0x5BAA],
- ["B9AC",0x5BAB],
- ["8C6B",0x5BAC],
- ["8C6C",0x5BAD],
- ["8C6D",0x5BAE],
- ["8C6E",0x5BAF],
- ["D4D7",0x5BB0],
- ["8C6F",0x5BB1],
- ["8C70",0x5BB2],
- ["BAA6",0x5BB3],
- ["D1E7",0x5BB4],
- ["CFFC",0x5BB5],
- ["BCD2",0x5BB6],
- ["8C71",0x5BB7],
- ["E5B7",0x5BB8],
- ["C8DD",0x5BB9],
- ["8C72",0x5BBA],
- ["8C73",0x5BBB],
- ["8C74",0x5BBC],
- ["BFED",0x5BBD],
- ["B1F6",0x5BBE],
- ["CBDE",0x5BBF],
- ["8C75",0x5BC0],
- ["8C76",0x5BC1],
- ["BCC5",0x5BC2],
- ["8C77",0x5BC3],
- ["BCC4",0x5BC4],
- ["D2FA",0x5BC5],
- ["C3DC",0x5BC6],
- ["BFDC",0x5BC7],
- ["8C78",0x5BC8],
- ["8C79",0x5BC9],
- ["8C7A",0x5BCA],
- ["8C7B",0x5BCB],
- ["B8BB",0x5BCC],
- ["8C7C",0x5BCD],
- ["8C7D",0x5BCE],
- ["8C7E",0x5BCF],
- ["C3C2",0x5BD0],
- ["8C80",0x5BD1],
- ["BAAE",0x5BD2],
- ["D4A2",0x5BD3],
- ["8C81",0x5BD4],
- ["8C82",0x5BD5],
- ["8C83",0x5BD6],
- ["8C84",0x5BD7],
- ["8C85",0x5BD8],
- ["8C86",0x5BD9],
- ["8C87",0x5BDA],
- ["8C88",0x5BDB],
- ["8C89",0x5BDC],
- ["C7DE",0x5BDD],
- ["C4AF",0x5BDE],
- ["B2EC",0x5BDF],
- ["8C8A",0x5BE0],
- ["B9D1",0x5BE1],
- ["8C8B",0x5BE2],
- ["8C8C",0x5BE3],
- ["E5BB",0x5BE4],
- ["C1C8",0x5BE5],
- ["8C8D",0x5BE6],
- ["8C8E",0x5BE7],
- ["D5AF",0x5BE8],
- ["8C8F",0x5BE9],
- ["8C90",0x5BEA],
- ["8C91",0x5BEB],
- ["8C92",0x5BEC],
- ["8C93",0x5BED],
- ["E5BC",0x5BEE],
- ["8C94",0x5BEF],
- ["E5BE",0x5BF0],
- ["8C95",0x5BF1],
- ["8C96",0x5BF2],
- ["8C97",0x5BF3],
- ["8C98",0x5BF4],
- ["8C99",0x5BF5],
- ["8C9A",0x5BF6],
- ["8C9B",0x5BF7],
- ["B4E7",0x5BF8],
- ["B6D4",0x5BF9],
- ["CBC2",0x5BFA],
- ["D1B0",0x5BFB],
- ["B5BC",0x5BFC],
- ["8C9C",0x5BFD],
- ["8C9D",0x5BFE],
- ["CAD9",0x5BFF],
- ["8C9E",0x5C00],
- ["B7E2",0x5C01],
- ["8C9F",0x5C02],
- ["8CA0",0x5C03],
- ["C9E4",0x5C04],
- ["8CA1",0x5C05],
- ["BDAB",0x5C06],
- ["8CA2",0x5C07],
- ["8CA3",0x5C08],
- ["CEBE",0x5C09],
- ["D7F0",0x5C0A],
- ["8CA4",0x5C0B],
- ["8CA5",0x5C0C],
- ["8CA6",0x5C0D],
- ["8CA7",0x5C0E],
- ["D0A1",0x5C0F],
- ["8CA8",0x5C10],
- ["C9D9",0x5C11],
- ["8CA9",0x5C12],
- ["8CAA",0x5C13],
- ["B6FB",0x5C14],
- ["E6D8",0x5C15],
- ["BCE2",0x5C16],
- ["8CAB",0x5C17],
- ["B3BE",0x5C18],
- ["8CAC",0x5C19],
- ["C9D0",0x5C1A],
- ["8CAD",0x5C1B],
- ["E6D9",0x5C1C],
- ["B3A2",0x5C1D],
- ["8CAE",0x5C1E],
- ["8CAF",0x5C1F],
- ["8CB0",0x5C20],
- ["8CB1",0x5C21],
- ["DECC",0x5C22],
- ["8CB2",0x5C23],
- ["D3C8",0x5C24],
- ["DECD",0x5C25],
- ["8CB3",0x5C26],
- ["D2A2",0x5C27],
- ["8CB4",0x5C28],
- ["8CB5",0x5C29],
- ["8CB6",0x5C2A],
- ["8CB7",0x5C2B],
- ["DECE",0x5C2C],
- ["8CB8",0x5C2D],
- ["8CB9",0x5C2E],
- ["8CBA",0x5C2F],
- ["8CBB",0x5C30],
- ["BECD",0x5C31],
- ["8CBC",0x5C32],
- ["8CBD",0x5C33],
- ["DECF",0x5C34],
- ["8CBE",0x5C35],
- ["8CBF",0x5C36],
- ["8CC0",0x5C37],
- ["CAAC",0x5C38],
- ["D2FC",0x5C39],
- ["B3DF",0x5C3A],
- ["E5EA",0x5C3B],
- ["C4E1",0x5C3C],
- ["BEA1",0x5C3D],
- ["CEB2",0x5C3E],
- ["C4F2",0x5C3F],
- ["BED6",0x5C40],
- ["C6A8",0x5C41],
- ["B2E3",0x5C42],
- ["8CC1",0x5C43],
- ["8CC2",0x5C44],
- ["BED3",0x5C45],
- ["8CC3",0x5C46],
- ["8CC4",0x5C47],
- ["C7FC",0x5C48],
- ["CCEB",0x5C49],
- ["BDEC",0x5C4A],
- ["CEDD",0x5C4B],
- ["8CC5",0x5C4C],
- ["8CC6",0x5C4D],
- ["CABA",0x5C4E],
- ["C6C1",0x5C4F],
- ["E5EC",0x5C50],
- ["D0BC",0x5C51],
- ["8CC7",0x5C52],
- ["8CC8",0x5C53],
- ["8CC9",0x5C54],
- ["D5B9",0x5C55],
- ["8CCA",0x5C56],
- ["8CCB",0x5C57],
- ["8CCC",0x5C58],
- ["E5ED",0x5C59],
- ["8CCD",0x5C5A],
- ["8CCE",0x5C5B],
- ["8CCF",0x5C5C],
- ["8CD0",0x5C5D],
- ["CAF4",0x5C5E],
- ["8CD1",0x5C5F],
- ["CDC0",0x5C60],
- ["C2C5",0x5C61],
- ["8CD2",0x5C62],
- ["E5EF",0x5C63],
- ["8CD3",0x5C64],
- ["C2C4",0x5C65],
- ["E5F0",0x5C66],
- ["8CD4",0x5C67],
- ["8CD5",0x5C68],
- ["8CD6",0x5C69],
- ["8CD7",0x5C6A],
- ["8CD8",0x5C6B],
- ["8CD9",0x5C6C],
- ["8CDA",0x5C6D],
- ["E5F8",0x5C6E],
- ["CDCD",0x5C6F],
- ["8CDB",0x5C70],
- ["C9BD",0x5C71],
- ["8CDC",0x5C72],
- ["8CDD",0x5C73],
- ["8CDE",0x5C74],
- ["8CDF",0x5C75],
- ["8CE0",0x5C76],
- ["8CE1",0x5C77],
- ["8CE2",0x5C78],
- ["D2D9",0x5C79],
- ["E1A8",0x5C7A],
- ["8CE3",0x5C7B],
- ["8CE4",0x5C7C],
- ["8CE5",0x5C7D],
- ["8CE6",0x5C7E],
- ["D3EC",0x5C7F],
- ["8CE7",0x5C80],
- ["CBEA",0x5C81],
- ["C6F1",0x5C82],
- ["8CE8",0x5C83],
- ["8CE9",0x5C84],
- ["8CEA",0x5C85],
- ["8CEB",0x5C86],
- ["8CEC",0x5C87],
- ["E1AC",0x5C88],
- ["8CED",0x5C89],
- ["8CEE",0x5C8A],
- ["8CEF",0x5C8B],
- ["E1A7",0x5C8C],
- ["E1A9",0x5C8D],
- ["8CF0",0x5C8E],
- ["8CF1",0x5C8F],
- ["E1AA",0x5C90],
- ["E1AF",0x5C91],
- ["8CF2",0x5C92],
- ["8CF3",0x5C93],
- ["B2ED",0x5C94],
- ["8CF4",0x5C95],
- ["E1AB",0x5C96],
- ["B8DA",0x5C97],
- ["E1AD",0x5C98],
- ["E1AE",0x5C99],
- ["E1B0",0x5C9A],
- ["B5BA",0x5C9B],
- ["E1B1",0x5C9C],
- ["8CF5",0x5C9D],
- ["8CF6",0x5C9E],
- ["8CF7",0x5C9F],
- ["8CF8",0x5CA0],
- ["8CF9",0x5CA1],
- ["E1B3",0x5CA2],
- ["E1B8",0x5CA3],
- ["8CFA",0x5CA4],
- ["8CFB",0x5CA5],
- ["8CFC",0x5CA6],
- ["8CFD",0x5CA7],
- ["8CFE",0x5CA8],
- ["D1D2",0x5CA9],
- ["8D40",0x5CAA],
- ["E1B6",0x5CAB],
- ["E1B5",0x5CAC],
- ["C1EB",0x5CAD],
- ["8D41",0x5CAE],
- ["8D42",0x5CAF],
- ["8D43",0x5CB0],
- ["E1B7",0x5CB1],
- ["8D44",0x5CB2],
- ["D4C0",0x5CB3],
- ["8D45",0x5CB4],
- ["E1B2",0x5CB5],
- ["8D46",0x5CB6],
- ["E1BA",0x5CB7],
- ["B0B6",0x5CB8],
- ["8D47",0x5CB9],
- ["8D48",0x5CBA],
- ["8D49",0x5CBB],
- ["8D4A",0x5CBC],
- ["E1B4",0x5CBD],
- ["8D4B",0x5CBE],
- ["BFF9",0x5CBF],
- ["8D4C",0x5CC0],
- ["E1B9",0x5CC1],
- ["8D4D",0x5CC2],
- ["8D4E",0x5CC3],
- ["E1BB",0x5CC4],
- ["8D4F",0x5CC5],
- ["8D50",0x5CC6],
- ["8D51",0x5CC7],
- ["8D52",0x5CC8],
- ["8D53",0x5CC9],
- ["8D54",0x5CCA],
- ["E1BE",0x5CCB],
- ["8D55",0x5CCC],
- ["8D56",0x5CCD],
- ["8D57",0x5CCE],
- ["8D58",0x5CCF],
- ["8D59",0x5CD0],
- ["8D5A",0x5CD1],
- ["E1BC",0x5CD2],
- ["8D5B",0x5CD3],
- ["8D5C",0x5CD4],
- ["8D5D",0x5CD5],
- ["8D5E",0x5CD6],
- ["8D5F",0x5CD7],
- ["8D60",0x5CD8],
- ["D6C5",0x5CD9],
- ["8D61",0x5CDA],
- ["8D62",0x5CDB],
- ["8D63",0x5CDC],
- ["8D64",0x5CDD],
- ["8D65",0x5CDE],
- ["8D66",0x5CDF],
- ["8D67",0x5CE0],
- ["CFBF",0x5CE1],
- ["8D68",0x5CE2],
- ["8D69",0x5CE3],
- ["E1BD",0x5CE4],
- ["E1BF",0x5CE5],
- ["C2CD",0x5CE6],
- ["8D6A",0x5CE7],
- ["B6EB",0x5CE8],
- ["8D6B",0x5CE9],
- ["D3F8",0x5CEA],
- ["8D6C",0x5CEB],
- ["8D6D",0x5CEC],
- ["C7CD",0x5CED],
- ["8D6E",0x5CEE],
- ["8D6F",0x5CEF],
- ["B7E5",0x5CF0],
- ["8D70",0x5CF1],
- ["8D71",0x5CF2],
- ["8D72",0x5CF3],
- ["8D73",0x5CF4],
- ["8D74",0x5CF5],
- ["8D75",0x5CF6],
- ["8D76",0x5CF7],
- ["8D77",0x5CF8],
- ["8D78",0x5CF9],
- ["8D79",0x5CFA],
- ["BEFE",0x5CFB],
- ["8D7A",0x5CFC],
- ["8D7B",0x5CFD],
- ["8D7C",0x5CFE],
- ["8D7D",0x5CFF],
- ["8D7E",0x5D00],
- ["8D80",0x5D01],
- ["E1C0",0x5D02],
- ["E1C1",0x5D03],
- ["8D81",0x5D04],
- ["8D82",0x5D05],
- ["E1C7",0x5D06],
- ["B3E7",0x5D07],
- ["8D83",0x5D08],
- ["8D84",0x5D09],
- ["8D85",0x5D0A],
- ["8D86",0x5D0B],
- ["8D87",0x5D0C],
- ["8D88",0x5D0D],
- ["C6E9",0x5D0E],
- ["8D89",0x5D0F],
- ["8D8A",0x5D10],
- ["8D8B",0x5D11],
- ["8D8C",0x5D12],
- ["8D8D",0x5D13],
- ["B4DE",0x5D14],
- ["8D8E",0x5D15],
- ["D1C2",0x5D16],
- ["8D8F",0x5D17],
- ["8D90",0x5D18],
- ["8D91",0x5D19],
- ["8D92",0x5D1A],
- ["E1C8",0x5D1B],
- ["8D93",0x5D1C],
- ["8D94",0x5D1D],
- ["E1C6",0x5D1E],
- ["8D95",0x5D1F],
- ["8D96",0x5D20],
- ["8D97",0x5D21],
- ["8D98",0x5D22],
- ["8D99",0x5D23],
- ["E1C5",0x5D24],
- ["8D9A",0x5D25],
- ["E1C3",0x5D26],
- ["E1C2",0x5D27],
- ["8D9B",0x5D28],
- ["B1C0",0x5D29],
- ["8D9C",0x5D2A],
- ["8D9D",0x5D2B],
- ["8D9E",0x5D2C],
- ["D5B8",0x5D2D],
- ["E1C4",0x5D2E],
- ["8D9F",0x5D2F],
- ["8DA0",0x5D30],
- ["8DA1",0x5D31],
- ["8DA2",0x5D32],
- ["8DA3",0x5D33],
- ["E1CB",0x5D34],
- ["8DA4",0x5D35],
- ["8DA5",0x5D36],
- ["8DA6",0x5D37],
- ["8DA7",0x5D38],
- ["8DA8",0x5D39],
- ["8DA9",0x5D3A],
- ["8DAA",0x5D3B],
- ["8DAB",0x5D3C],
- ["E1CC",0x5D3D],
- ["E1CA",0x5D3E],
- ["8DAC",0x5D3F],
- ["8DAD",0x5D40],
- ["8DAE",0x5D41],
- ["8DAF",0x5D42],
- ["8DB0",0x5D43],
- ["8DB1",0x5D44],
- ["8DB2",0x5D45],
- ["8DB3",0x5D46],
- ["EFFA",0x5D47],
- ["8DB4",0x5D48],
- ["8DB5",0x5D49],
- ["E1D3",0x5D4A],
- ["E1D2",0x5D4B],
- ["C7B6",0x5D4C],
- ["8DB6",0x5D4D],
- ["8DB7",0x5D4E],
- ["8DB8",0x5D4F],
- ["8DB9",0x5D50],
- ["8DBA",0x5D51],
- ["8DBB",0x5D52],
- ["8DBC",0x5D53],
- ["8DBD",0x5D54],
- ["8DBE",0x5D55],
- ["8DBF",0x5D56],
- ["8DC0",0x5D57],
- ["E1C9",0x5D58],
- ["8DC1",0x5D59],
- ["8DC2",0x5D5A],
- ["E1CE",0x5D5B],
- ["8DC3",0x5D5C],
- ["E1D0",0x5D5D],
- ["8DC4",0x5D5E],
- ["8DC5",0x5D5F],
- ["8DC6",0x5D60],
- ["8DC7",0x5D61],
- ["8DC8",0x5D62],
- ["8DC9",0x5D63],
- ["8DCA",0x5D64],
- ["8DCB",0x5D65],
- ["8DCC",0x5D66],
- ["8DCD",0x5D67],
- ["8DCE",0x5D68],
- ["E1D4",0x5D69],
- ["8DCF",0x5D6A],
- ["E1D1",0x5D6B],
- ["E1CD",0x5D6C],
- ["8DD0",0x5D6D],
- ["8DD1",0x5D6E],
- ["E1CF",0x5D6F],
- ["8DD2",0x5D70],
- ["8DD3",0x5D71],
- ["8DD4",0x5D72],
- ["8DD5",0x5D73],
- ["E1D5",0x5D74],
- ["8DD6",0x5D75],
- ["8DD7",0x5D76],
- ["8DD8",0x5D77],
- ["8DD9",0x5D78],
- ["8DDA",0x5D79],
- ["8DDB",0x5D7A],
- ["8DDC",0x5D7B],
- ["8DDD",0x5D7C],
- ["8DDE",0x5D7D],
- ["8DDF",0x5D7E],
- ["8DE0",0x5D7F],
- ["8DE1",0x5D80],
- ["8DE2",0x5D81],
- ["E1D6",0x5D82],
- ["8DE3",0x5D83],
- ["8DE4",0x5D84],
- ["8DE5",0x5D85],
- ["8DE6",0x5D86],
- ["8DE7",0x5D87],
- ["8DE8",0x5D88],
- ["8DE9",0x5D89],
- ["8DEA",0x5D8A],
- ["8DEB",0x5D8B],
- ["8DEC",0x5D8C],
- ["8DED",0x5D8D],
- ["8DEE",0x5D8E],
- ["8DEF",0x5D8F],
- ["8DF0",0x5D90],
- ["8DF1",0x5D91],
- ["8DF2",0x5D92],
- ["8DF3",0x5D93],
- ["8DF4",0x5D94],
- ["8DF5",0x5D95],
- ["8DF6",0x5D96],
- ["8DF7",0x5D97],
- ["8DF8",0x5D98],
- ["E1D7",0x5D99],
- ["8DF9",0x5D9A],
- ["8DFA",0x5D9B],
- ["8DFB",0x5D9C],
- ["E1D8",0x5D9D],
- ["8DFC",0x5D9E],
- ["8DFD",0x5D9F],
- ["8DFE",0x5DA0],
- ["8E40",0x5DA1],
- ["8E41",0x5DA2],
- ["8E42",0x5DA3],
- ["8E43",0x5DA4],
- ["8E44",0x5DA5],
- ["8E45",0x5DA6],
- ["8E46",0x5DA7],
- ["8E47",0x5DA8],
- ["8E48",0x5DA9],
- ["8E49",0x5DAA],
- ["8E4A",0x5DAB],
- ["8E4B",0x5DAC],
- ["8E4C",0x5DAD],
- ["8E4D",0x5DAE],
- ["8E4E",0x5DAF],
- ["8E4F",0x5DB0],
- ["8E50",0x5DB1],
- ["8E51",0x5DB2],
- ["8E52",0x5DB3],
- ["8E53",0x5DB4],
- ["8E54",0x5DB5],
- ["8E55",0x5DB6],
- ["E1DA",0x5DB7],
- ["8E56",0x5DB8],
- ["8E57",0x5DB9],
- ["8E58",0x5DBA],
- ["8E59",0x5DBB],
- ["8E5A",0x5DBC],
- ["8E5B",0x5DBD],
- ["8E5C",0x5DBE],
- ["8E5D",0x5DBF],
- ["8E5E",0x5DC0],
- ["8E5F",0x5DC1],
- ["8E60",0x5DC2],
- ["8E61",0x5DC3],
- ["8E62",0x5DC4],
- ["E1DB",0x5DC5],
- ["8E63",0x5DC6],
- ["8E64",0x5DC7],
- ["8E65",0x5DC8],
- ["8E66",0x5DC9],
- ["8E67",0x5DCA],
- ["8E68",0x5DCB],
- ["8E69",0x5DCC],
- ["CEA1",0x5DCD],
- ["8E6A",0x5DCE],
- ["8E6B",0x5DCF],
- ["8E6C",0x5DD0],
- ["8E6D",0x5DD1],
- ["8E6E",0x5DD2],
- ["8E6F",0x5DD3],
- ["8E70",0x5DD4],
- ["8E71",0x5DD5],
- ["8E72",0x5DD6],
- ["8E73",0x5DD7],
- ["8E74",0x5DD8],
- ["8E75",0x5DD9],
- ["8E76",0x5DDA],
- ["E7DD",0x5DDB],
- ["8E77",0x5DDC],
- ["B4A8",0x5DDD],
- ["D6DD",0x5DDE],
- ["8E78",0x5DDF],
- ["8E79",0x5DE0],
- ["D1B2",0x5DE1],
- ["B3B2",0x5DE2],
- ["8E7A",0x5DE3],
- ["8E7B",0x5DE4],
- ["B9A4",0x5DE5],
- ["D7F3",0x5DE6],
- ["C7C9",0x5DE7],
- ["BEDE",0x5DE8],
- ["B9AE",0x5DE9],
- ["8E7C",0x5DEA],
- ["CED7",0x5DEB],
- ["8E7D",0x5DEC],
- ["8E7E",0x5DED],
- ["B2EE",0x5DEE],
- ["DBCF",0x5DEF],
- ["8E80",0x5DF0],
- ["BCBA",0x5DF1],
- ["D2D1",0x5DF2],
- ["CBC8",0x5DF3],
- ["B0CD",0x5DF4],
- ["8E81",0x5DF5],
- ["8E82",0x5DF6],
- ["CFEF",0x5DF7],
- ["8E83",0x5DF8],
- ["8E84",0x5DF9],
- ["8E85",0x5DFA],
- ["8E86",0x5DFB],
- ["8E87",0x5DFC],
- ["D9E3",0x5DFD],
- ["BDED",0x5DFE],
- ["8E88",0x5DFF],
- ["8E89",0x5E00],
- ["B1D2",0x5E01],
- ["CAD0",0x5E02],
- ["B2BC",0x5E03],
- ["8E8A",0x5E04],
- ["CBA7",0x5E05],
- ["B7AB",0x5E06],
- ["8E8B",0x5E07],
- ["CAA6",0x5E08],
- ["8E8C",0x5E09],
- ["8E8D",0x5E0A],
- ["8E8E",0x5E0B],
- ["CFA3",0x5E0C],
- ["8E8F",0x5E0D],
- ["8E90",0x5E0E],
- ["E0F8",0x5E0F],
- ["D5CA",0x5E10],
- ["E0FB",0x5E11],
- ["8E91",0x5E12],
- ["8E92",0x5E13],
- ["E0FA",0x5E14],
- ["C5C1",0x5E15],
- ["CCFB",0x5E16],
- ["8E93",0x5E17],
- ["C1B1",0x5E18],
- ["E0F9",0x5E19],
- ["D6E3",0x5E1A],
- ["B2AF",0x5E1B],
- ["D6C4",0x5E1C],
- ["B5DB",0x5E1D],
- ["8E94",0x5E1E],
- ["8E95",0x5E1F],
- ["8E96",0x5E20],
- ["8E97",0x5E21],
- ["8E98",0x5E22],
- ["8E99",0x5E23],
- ["8E9A",0x5E24],
- ["8E9B",0x5E25],
- ["B4F8",0x5E26],
- ["D6A1",0x5E27],
- ["8E9C",0x5E28],
- ["8E9D",0x5E29],
- ["8E9E",0x5E2A],
- ["8E9F",0x5E2B],
- ["8EA0",0x5E2C],
- ["CFAF",0x5E2D],
- ["B0EF",0x5E2E],
- ["8EA1",0x5E2F],
- ["8EA2",0x5E30],
- ["E0FC",0x5E31],
- ["8EA3",0x5E32],
- ["8EA4",0x5E33],
- ["8EA5",0x5E34],
- ["8EA6",0x5E35],
- ["8EA7",0x5E36],
- ["E1A1",0x5E37],
- ["B3A3",0x5E38],
- ["8EA8",0x5E39],
- ["8EA9",0x5E3A],
- ["E0FD",0x5E3B],
- ["E0FE",0x5E3C],
- ["C3B1",0x5E3D],
- ["8EAA",0x5E3E],
- ["8EAB",0x5E3F],
- ["8EAC",0x5E40],
- ["8EAD",0x5E41],
- ["C3DD",0x5E42],
- ["8EAE",0x5E43],
- ["E1A2",0x5E44],
- ["B7F9",0x5E45],
- ["8EAF",0x5E46],
- ["8EB0",0x5E47],
- ["8EB1",0x5E48],
- ["8EB2",0x5E49],
- ["8EB3",0x5E4A],
- ["8EB4",0x5E4B],
- ["BBCF",0x5E4C],
- ["8EB5",0x5E4D],
- ["8EB6",0x5E4E],
- ["8EB7",0x5E4F],
- ["8EB8",0x5E50],
- ["8EB9",0x5E51],
- ["8EBA",0x5E52],
- ["8EBB",0x5E53],
- ["E1A3",0x5E54],
- ["C4BB",0x5E55],
- ["8EBC",0x5E56],
- ["8EBD",0x5E57],
- ["8EBE",0x5E58],
- ["8EBF",0x5E59],
- ["8EC0",0x5E5A],
- ["E1A4",0x5E5B],
- ["8EC1",0x5E5C],
- ["8EC2",0x5E5D],
- ["E1A5",0x5E5E],
- ["8EC3",0x5E5F],
- ["8EC4",0x5E60],
- ["E1A6",0x5E61],
- ["B4B1",0x5E62],
- ["8EC5",0x5E63],
- ["8EC6",0x5E64],
- ["8EC7",0x5E65],
- ["8EC8",0x5E66],
- ["8EC9",0x5E67],
- ["8ECA",0x5E68],
- ["8ECB",0x5E69],
- ["8ECC",0x5E6A],
- ["8ECD",0x5E6B],
- ["8ECE",0x5E6C],
- ["8ECF",0x5E6D],
- ["8ED0",0x5E6E],
- ["8ED1",0x5E6F],
- ["8ED2",0x5E70],
- ["8ED3",0x5E71],
- ["B8C9",0x5E72],
- ["C6BD",0x5E73],
- ["C4EA",0x5E74],
- ["8ED4",0x5E75],
- ["B2A2",0x5E76],
- ["8ED5",0x5E77],
- ["D0D2",0x5E78],
- ["8ED6",0x5E79],
- ["E7DB",0x5E7A],
- ["BBC3",0x5E7B],
- ["D3D7",0x5E7C],
- ["D3C4",0x5E7D],
- ["8ED7",0x5E7E],
- ["B9E3",0x5E7F],
- ["E2CF",0x5E80],
- ["8ED8",0x5E81],
- ["8ED9",0x5E82],
- ["8EDA",0x5E83],
- ["D7AF",0x5E84],
- ["8EDB",0x5E85],
- ["C7EC",0x5E86],
- ["B1D3",0x5E87],
- ["8EDC",0x5E88],
- ["8EDD",0x5E89],
- ["B4B2",0x5E8A],
- ["E2D1",0x5E8B],
- ["8EDE",0x5E8C],
- ["8EDF",0x5E8D],
- ["8EE0",0x5E8E],
- ["D0F2",0x5E8F],
- ["C2AE",0x5E90],
- ["E2D0",0x5E91],
- ["8EE1",0x5E92],
- ["BFE2",0x5E93],
- ["D3A6",0x5E94],
- ["B5D7",0x5E95],
- ["E2D2",0x5E96],
- ["B5EA",0x5E97],
- ["8EE2",0x5E98],
- ["C3ED",0x5E99],
- ["B8FD",0x5E9A],
- ["8EE3",0x5E9B],
- ["B8AE",0x5E9C],
- ["8EE4",0x5E9D],
- ["C5D3",0x5E9E],
- ["B7CF",0x5E9F],
- ["E2D4",0x5EA0],
- ["8EE5",0x5EA1],
- ["8EE6",0x5EA2],
- ["8EE7",0x5EA3],
- ["8EE8",0x5EA4],
- ["E2D3",0x5EA5],
- ["B6C8",0x5EA6],
- ["D7F9",0x5EA7],
- ["8EE9",0x5EA8],
- ["8EEA",0x5EA9],
- ["8EEB",0x5EAA],
- ["8EEC",0x5EAB],
- ["8EED",0x5EAC],
- ["CDA5",0x5EAD],
- ["8EEE",0x5EAE],
- ["8EEF",0x5EAF],
- ["8EF0",0x5EB0],
- ["8EF1",0x5EB1],
- ["8EF2",0x5EB2],
- ["E2D8",0x5EB3],
- ["8EF3",0x5EB4],
- ["E2D6",0x5EB5],
- ["CAFC",0x5EB6],
- ["BFB5",0x5EB7],
- ["D3B9",0x5EB8],
- ["E2D5",0x5EB9],
- ["8EF4",0x5EBA],
- ["8EF5",0x5EBB],
- ["8EF6",0x5EBC],
- ["8EF7",0x5EBD],
- ["E2D7",0x5EBE],
- ["8EF8",0x5EBF],
- ["8EF9",0x5EC0],
- ["8EFA",0x5EC1],
- ["8EFB",0x5EC2],
- ["8EFC",0x5EC3],
- ["8EFD",0x5EC4],
- ["8EFE",0x5EC5],
- ["8F40",0x5EC6],
- ["8F41",0x5EC7],
- ["8F42",0x5EC8],
- ["C1AE",0x5EC9],
- ["C0C8",0x5ECA],
- ["8F43",0x5ECB],
- ["8F44",0x5ECC],
- ["8F45",0x5ECD],
- ["8F46",0x5ECE],
- ["8F47",0x5ECF],
- ["8F48",0x5ED0],
- ["E2DB",0x5ED1],
- ["E2DA",0x5ED2],
- ["C0AA",0x5ED3],
- ["8F49",0x5ED4],
- ["8F4A",0x5ED5],
- ["C1CE",0x5ED6],
- ["8F4B",0x5ED7],
- ["8F4C",0x5ED8],
- ["8F4D",0x5ED9],
- ["8F4E",0x5EDA],
- ["E2DC",0x5EDB],
- ["8F4F",0x5EDC],
- ["8F50",0x5EDD],
- ["8F51",0x5EDE],
- ["8F52",0x5EDF],
- ["8F53",0x5EE0],
- ["8F54",0x5EE1],
- ["8F55",0x5EE2],
- ["8F56",0x5EE3],
- ["8F57",0x5EE4],
- ["8F58",0x5EE5],
- ["8F59",0x5EE6],
- ["8F5A",0x5EE7],
- ["E2DD",0x5EE8],
- ["8F5B",0x5EE9],
- ["E2DE",0x5EEA],
- ["8F5C",0x5EEB],
- ["8F5D",0x5EEC],
- ["8F5E",0x5EED],
- ["8F5F",0x5EEE],
- ["8F60",0x5EEF],
- ["8F61",0x5EF0],
- ["8F62",0x5EF1],
- ["8F63",0x5EF2],
- ["8F64",0x5EF3],
- ["DBC8",0x5EF4],
- ["8F65",0x5EF5],
- ["D1D3",0x5EF6],
- ["CDA2",0x5EF7],
- ["8F66",0x5EF8],
- ["8F67",0x5EF9],
- ["BDA8",0x5EFA],
- ["8F68",0x5EFB],
- ["8F69",0x5EFC],
- ["8F6A",0x5EFD],
- ["DEC3",0x5EFE],
- ["D8A5",0x5EFF],
- ["BFAA",0x5F00],
- ["DBCD",0x5F01],
- ["D2EC",0x5F02],
- ["C6FA",0x5F03],
- ["C5AA",0x5F04],
- ["8F6B",0x5F05],
- ["8F6C",0x5F06],
- ["8F6D",0x5F07],
- ["DEC4",0x5F08],
- ["8F6E",0x5F09],
- ["B1D7",0x5F0A],
- ["DFAE",0x5F0B],
- ["8F6F",0x5F0C],
- ["8F70",0x5F0D],
- ["8F71",0x5F0E],
- ["CABD",0x5F0F],
- ["8F72",0x5F10],
- ["DFB1",0x5F11],
- ["8F73",0x5F12],
- ["B9AD",0x5F13],
- ["8F74",0x5F14],
- ["D2FD",0x5F15],
- ["8F75",0x5F16],
- ["B8A5",0x5F17],
- ["BAEB",0x5F18],
- ["8F76",0x5F19],
- ["8F77",0x5F1A],
- ["B3DA",0x5F1B],
- ["8F78",0x5F1C],
- ["8F79",0x5F1D],
- ["8F7A",0x5F1E],
- ["B5DC",0x5F1F],
- ["D5C5",0x5F20],
- ["8F7B",0x5F21],
- ["8F7C",0x5F22],
- ["8F7D",0x5F23],
- ["8F7E",0x5F24],
- ["C3D6",0x5F25],
- ["CFD2",0x5F26],
- ["BBA1",0x5F27],
- ["8F80",0x5F28],
- ["E5F3",0x5F29],
- ["E5F2",0x5F2A],
- ["8F81",0x5F2B],
- ["8F82",0x5F2C],
- ["E5F4",0x5F2D],
- ["8F83",0x5F2E],
- ["CDE4",0x5F2F],
- ["8F84",0x5F30],
- ["C8F5",0x5F31],
- ["8F85",0x5F32],
- ["8F86",0x5F33],
- ["8F87",0x5F34],
- ["8F88",0x5F35],
- ["8F89",0x5F36],
- ["8F8A",0x5F37],
- ["8F8B",0x5F38],
- ["B5AF",0x5F39],
- ["C7BF",0x5F3A],
- ["8F8C",0x5F3B],
- ["E5F6",0x5F3C],
- ["8F8D",0x5F3D],
- ["8F8E",0x5F3E],
- ["8F8F",0x5F3F],
- ["ECB0",0x5F40],
- ["8F90",0x5F41],
- ["8F91",0x5F42],
- ["8F92",0x5F43],
- ["8F93",0x5F44],
- ["8F94",0x5F45],
- ["8F95",0x5F46],
- ["8F96",0x5F47],
- ["8F97",0x5F48],
- ["8F98",0x5F49],
- ["8F99",0x5F4A],
- ["8F9A",0x5F4B],
- ["8F9B",0x5F4C],
- ["8F9C",0x5F4D],
- ["8F9D",0x5F4E],
- ["8F9E",0x5F4F],
- ["E5E6",0x5F50],
- ["8F9F",0x5F51],
- ["B9E9",0x5F52],
- ["B5B1",0x5F53],
- ["8FA0",0x5F54],
- ["C2BC",0x5F55],
- ["E5E8",0x5F56],
- ["E5E7",0x5F57],
- ["E5E9",0x5F58],
- ["8FA1",0x5F59],
- ["8FA2",0x5F5A],
- ["8FA3",0x5F5B],
- ["8FA4",0x5F5C],
- ["D2CD",0x5F5D],
- ["8FA5",0x5F5E],
- ["8FA6",0x5F5F],
- ["8FA7",0x5F60],
- ["E1EA",0x5F61],
- ["D0CE",0x5F62],
- ["8FA8",0x5F63],
- ["CDAE",0x5F64],
- ["8FA9",0x5F65],
- ["D1E5",0x5F66],
- ["8FAA",0x5F67],
- ["8FAB",0x5F68],
- ["B2CA",0x5F69],
- ["B1EB",0x5F6A],
- ["8FAC",0x5F6B],
- ["B1F2",0x5F6C],
- ["C5ED",0x5F6D],
- ["8FAD",0x5F6E],
- ["8FAE",0x5F6F],
- ["D5C3",0x5F70],
- ["D3B0",0x5F71],
- ["8FAF",0x5F72],
- ["E1DC",0x5F73],
- ["8FB0",0x5F74],
- ["8FB1",0x5F75],
- ["8FB2",0x5F76],
- ["E1DD",0x5F77],
- ["8FB3",0x5F78],
- ["D2DB",0x5F79],
- ["8FB4",0x5F7A],
- ["B3B9",0x5F7B],
- ["B1CB",0x5F7C],
- ["8FB5",0x5F7D],
- ["8FB6",0x5F7E],
- ["8FB7",0x5F7F],
- ["CDF9",0x5F80],
- ["D5F7",0x5F81],
- ["E1DE",0x5F82],
- ["8FB8",0x5F83],
- ["BEB6",0x5F84],
- ["B4FD",0x5F85],
- ["8FB9",0x5F86],
- ["E1DF",0x5F87],
- ["BADC",0x5F88],
- ["E1E0",0x5F89],
- ["BBB2",0x5F8A],
- ["C2C9",0x5F8B],
- ["E1E1",0x5F8C],
- ["8FBA",0x5F8D],
- ["8FBB",0x5F8E],
- ["8FBC",0x5F8F],
- ["D0EC",0x5F90],
- ["8FBD",0x5F91],
- ["CDBD",0x5F92],
- ["8FBE",0x5F93],
- ["8FBF",0x5F94],
- ["E1E2",0x5F95],
- ["8FC0",0x5F96],
- ["B5C3",0x5F97],
- ["C5C7",0x5F98],
- ["E1E3",0x5F99],
- ["8FC1",0x5F9A],
- ["8FC2",0x5F9B],
- ["E1E4",0x5F9C],
- ["8FC3",0x5F9D],
- ["8FC4",0x5F9E],
- ["8FC5",0x5F9F],
- ["8FC6",0x5FA0],
- ["D3F9",0x5FA1],
- ["8FC7",0x5FA2],
- ["8FC8",0x5FA3],
- ["8FC9",0x5FA4],
- ["8FCA",0x5FA5],
- ["8FCB",0x5FA6],
- ["8FCC",0x5FA7],
- ["E1E5",0x5FA8],
- ["8FCD",0x5FA9],
- ["D1AD",0x5FAA],
- ["8FCE",0x5FAB],
- ["8FCF",0x5FAC],
- ["E1E6",0x5FAD],
- ["CEA2",0x5FAE],
- ["8FD0",0x5FAF],
- ["8FD1",0x5FB0],
- ["8FD2",0x5FB1],
- ["8FD3",0x5FB2],
- ["8FD4",0x5FB3],
- ["8FD5",0x5FB4],
- ["E1E7",0x5FB5],
- ["8FD6",0x5FB6],
- ["B5C2",0x5FB7],
- ["8FD7",0x5FB8],
- ["8FD8",0x5FB9],
- ["8FD9",0x5FBA],
- ["8FDA",0x5FBB],
- ["E1E8",0x5FBC],
- ["BBD5",0x5FBD],
- ["8FDB",0x5FBE],
- ["8FDC",0x5FBF],
- ["8FDD",0x5FC0],
- ["8FDE",0x5FC1],
- ["8FDF",0x5FC2],
- ["D0C4",0x5FC3],
- ["E2E0",0x5FC4],
- ["B1D8",0x5FC5],
- ["D2E4",0x5FC6],
- ["8FE0",0x5FC7],
- ["8FE1",0x5FC8],
- ["E2E1",0x5FC9],
- ["8FE2",0x5FCA],
- ["8FE3",0x5FCB],
- ["BCC9",0x5FCC],
- ["C8CC",0x5FCD],
- ["8FE4",0x5FCE],
- ["E2E3",0x5FCF],
- ["ECFE",0x5FD0],
- ["ECFD",0x5FD1],
- ["DFAF",0x5FD2],
- ["8FE5",0x5FD3],
- ["8FE6",0x5FD4],
- ["8FE7",0x5FD5],
- ["E2E2",0x5FD6],
- ["D6BE",0x5FD7],
- ["CDFC",0x5FD8],
- ["C3A6",0x5FD9],
- ["8FE8",0x5FDA],
- ["8FE9",0x5FDB],
- ["8FEA",0x5FDC],
- ["E3C3",0x5FDD],
- ["8FEB",0x5FDE],
- ["8FEC",0x5FDF],
- ["D6D2",0x5FE0],
- ["E2E7",0x5FE1],
- ["8FED",0x5FE2],
- ["8FEE",0x5FE3],
- ["E2E8",0x5FE4],
- ["8FEF",0x5FE5],
- ["8FF0",0x5FE6],
- ["D3C7",0x5FE7],
- ["8FF1",0x5FE8],
- ["8FF2",0x5FE9],
- ["E2EC",0x5FEA],
- ["BFEC",0x5FEB],
- ["8FF3",0x5FEC],
- ["E2ED",0x5FED],
- ["E2E5",0x5FEE],
- ["8FF4",0x5FEF],
- ["8FF5",0x5FF0],
- ["B3C0",0x5FF1],
- ["8FF6",0x5FF2],
- ["8FF7",0x5FF3],
- ["8FF8",0x5FF4],
- ["C4EE",0x5FF5],
- ["8FF9",0x5FF6],
- ["8FFA",0x5FF7],
- ["E2EE",0x5FF8],
- ["8FFB",0x5FF9],
- ["8FFC",0x5FFA],
- ["D0C3",0x5FFB],
- ["8FFD",0x5FFC],
- ["BAF6",0x5FFD],
- ["E2E9",0x5FFE],
- ["B7DE",0x5FFF],
- ["BBB3",0x6000],
- ["CCAC",0x6001],
- ["CBCB",0x6002],
- ["E2E4",0x6003],
- ["E2E6",0x6004],
- ["E2EA",0x6005],
- ["E2EB",0x6006],
- ["8FFE",0x6007],
- ["9040",0x6008],
- ["9041",0x6009],
- ["E2F7",0x600A],
- ["9042",0x600B],
- ["9043",0x600C],
- ["E2F4",0x600D],
- ["D4F5",0x600E],
- ["E2F3",0x600F],
- ["9044",0x6010],
- ["9045",0x6011],
- ["C5AD",0x6012],
- ["9046",0x6013],
- ["D5FA",0x6014],
- ["C5C2",0x6015],
- ["B2C0",0x6016],
- ["9047",0x6017],
- ["9048",0x6018],
- ["E2EF",0x6019],
- ["9049",0x601A],
- ["E2F2",0x601B],
- ["C1AF",0x601C],
- ["CBBC",0x601D],
- ["904A",0x601E],
- ["904B",0x601F],
- ["B5A1",0x6020],
- ["E2F9",0x6021],
- ["904C",0x6022],
- ["904D",0x6023],
- ["904E",0x6024],
- ["BCB1",0x6025],
- ["E2F1",0x6026],
- ["D0D4",0x6027],
- ["D4B9",0x6028],
- ["E2F5",0x6029],
- ["B9D6",0x602A],
- ["E2F6",0x602B],
- ["904F",0x602C],
- ["9050",0x602D],
- ["9051",0x602E],
- ["C7D3",0x602F],
- ["9052",0x6030],
- ["9053",0x6031],
- ["9054",0x6032],
- ["9055",0x6033],
- ["9056",0x6034],
- ["E2F0",0x6035],
- ["9057",0x6036],
- ["9058",0x6037],
- ["9059",0x6038],
- ["905A",0x6039],
- ["905B",0x603A],
- ["D7DC",0x603B],
- ["EDA1",0x603C],
- ["905C",0x603D],
- ["905D",0x603E],
- ["E2F8",0x603F],
- ["905E",0x6040],
- ["EDA5",0x6041],
- ["E2FE",0x6042],
- ["CAD1",0x6043],
- ["905F",0x6044],
- ["9060",0x6045],
- ["9061",0x6046],
- ["9062",0x6047],
- ["9063",0x6048],
- ["9064",0x6049],
- ["9065",0x604A],
- ["C1B5",0x604B],
- ["9066",0x604C],
- ["BBD0",0x604D],
- ["9067",0x604E],
- ["9068",0x604F],
- ["BFD6",0x6050],
- ["9069",0x6051],
- ["BAE3",0x6052],
- ["906A",0x6053],
- ["906B",0x6054],
- ["CBA1",0x6055],
- ["906C",0x6056],
- ["906D",0x6057],
- ["906E",0x6058],
- ["EDA6",0x6059],
- ["EDA3",0x605A],
- ["906F",0x605B],
- ["9070",0x605C],
- ["EDA2",0x605D],
- ["9071",0x605E],
- ["9072",0x605F],
- ["9073",0x6060],
- ["9074",0x6061],
- ["BBD6",0x6062],
- ["EDA7",0x6063],
- ["D0F4",0x6064],
- ["9075",0x6065],
- ["9076",0x6066],
- ["EDA4",0x6067],
- ["BADE",0x6068],
- ["B6F7",0x6069],
- ["E3A1",0x606A],
- ["B6B2",0x606B],
- ["CCF1",0x606C],
- ["B9A7",0x606D],
- ["9077",0x606E],
- ["CFA2",0x606F],
- ["C7A1",0x6070],
- ["9078",0x6071],
- ["9079",0x6072],
- ["BFD2",0x6073],
- ["907A",0x6074],
- ["907B",0x6075],
- ["B6F1",0x6076],
- ["907C",0x6077],
- ["E2FA",0x6078],
- ["E2FB",0x6079],
- ["E2FD",0x607A],
- ["E2FC",0x607B],
- ["C4D5",0x607C],
- ["E3A2",0x607D],
- ["907D",0x607E],
- ["D3C1",0x607F],
- ["907E",0x6080],
- ["9080",0x6081],
- ["9081",0x6082],
- ["E3A7",0x6083],
- ["C7C4",0x6084],
- ["9082",0x6085],
- ["9083",0x6086],
- ["9084",0x6087],
- ["9085",0x6088],
- ["CFA4",0x6089],
- ["9086",0x608A],
- ["9087",0x608B],
- ["E3A9",0x608C],
- ["BAB7",0x608D],
- ["9088",0x608E],
- ["9089",0x608F],
- ["908A",0x6090],
- ["908B",0x6091],
- ["E3A8",0x6092],
- ["908C",0x6093],
- ["BBDA",0x6094],
- ["908D",0x6095],
- ["E3A3",0x6096],
- ["908E",0x6097],
- ["908F",0x6098],
- ["9090",0x6099],
- ["E3A4",0x609A],
- ["E3AA",0x609B],
- ["9091",0x609C],
- ["E3A6",0x609D],
- ["9092",0x609E],
- ["CEF2",0x609F],
- ["D3C6",0x60A0],
- ["9093",0x60A1],
- ["9094",0x60A2],
- ["BBBC",0x60A3],
- ["9095",0x60A4],
- ["9096",0x60A5],
- ["D4C3",0x60A6],
- ["9097",0x60A7],
- ["C4FA",0x60A8],
- ["9098",0x60A9],
- ["9099",0x60AA],
- ["EDA8",0x60AB],
- ["D0FC",0x60AC],
- ["E3A5",0x60AD],
- ["909A",0x60AE],
- ["C3F5",0x60AF],
- ["909B",0x60B0],
- ["E3AD",0x60B1],
- ["B1AF",0x60B2],
- ["909C",0x60B3],
- ["E3B2",0x60B4],
- ["909D",0x60B5],
- ["909E",0x60B6],
- ["909F",0x60B7],
- ["BCC2",0x60B8],
- ["90A0",0x60B9],
- ["90A1",0x60BA],
- ["E3AC",0x60BB],
- ["B5BF",0x60BC],
- ["90A2",0x60BD],
- ["90A3",0x60BE],
- ["90A4",0x60BF],
- ["90A5",0x60C0],
- ["90A6",0x60C1],
- ["90A7",0x60C2],
- ["90A8",0x60C3],
- ["90A9",0x60C4],
- ["C7E9",0x60C5],
- ["E3B0",0x60C6],
- ["90AA",0x60C7],
- ["90AB",0x60C8],
- ["90AC",0x60C9],
- ["BEAA",0x60CA],
- ["CDEF",0x60CB],
- ["90AD",0x60CC],
- ["90AE",0x60CD],
- ["90AF",0x60CE],
- ["90B0",0x60CF],
- ["90B1",0x60D0],
- ["BBF3",0x60D1],
- ["90B2",0x60D2],
- ["90B3",0x60D3],
- ["90B4",0x60D4],
- ["CCE8",0x60D5],
- ["90B5",0x60D6],
- ["90B6",0x60D7],
- ["E3AF",0x60D8],
- ["90B7",0x60D9],
- ["E3B1",0x60DA],
- ["90B8",0x60DB],
- ["CFA7",0x60DC],
- ["E3AE",0x60DD],
- ["90B9",0x60DE],
- ["CEA9",0x60DF],
- ["BBDD",0x60E0],
- ["90BA",0x60E1],
- ["90BB",0x60E2],
- ["90BC",0x60E3],
- ["90BD",0x60E4],
- ["90BE",0x60E5],
- ["B5EB",0x60E6],
- ["BEE5",0x60E7],
- ["B2D2",0x60E8],
- ["B3CD",0x60E9],
- ["90BF",0x60EA],
- ["B1B9",0x60EB],
- ["E3AB",0x60EC],
- ["B2D1",0x60ED],
- ["B5AC",0x60EE],
- ["B9DF",0x60EF],
- ["B6E8",0x60F0],
- ["90C0",0x60F1],
- ["90C1",0x60F2],
- ["CFEB",0x60F3],
- ["E3B7",0x60F4],
- ["90C2",0x60F5],
- ["BBCC",0x60F6],
- ["90C3",0x60F7],
- ["90C4",0x60F8],
- ["C8C7",0x60F9],
- ["D0CA",0x60FA],
- ["90C5",0x60FB],
- ["90C6",0x60FC],
- ["90C7",0x60FD],
- ["90C8",0x60FE],
- ["90C9",0x60FF],
- ["E3B8",0x6100],
- ["B3EE",0x6101],
- ["90CA",0x6102],
- ["90CB",0x6103],
- ["90CC",0x6104],
- ["90CD",0x6105],
- ["EDA9",0x6106],
- ["90CE",0x6107],
- ["D3FA",0x6108],
- ["D3E4",0x6109],
- ["90CF",0x610A],
- ["90D0",0x610B],
- ["90D1",0x610C],
- ["EDAA",0x610D],
- ["E3B9",0x610E],
- ["D2E2",0x610F],
- ["90D2",0x6110],
- ["90D3",0x6111],
- ["90D4",0x6112],
- ["90D5",0x6113],
- ["90D6",0x6114],
- ["E3B5",0x6115],
- ["90D7",0x6116],
- ["90D8",0x6117],
- ["90D9",0x6118],
- ["90DA",0x6119],
- ["D3DE",0x611A],
- ["90DB",0x611B],
- ["90DC",0x611C],
- ["90DD",0x611D],
- ["90DE",0x611E],
- ["B8D0",0x611F],
- ["E3B3",0x6120],
- ["90DF",0x6121],
- ["90E0",0x6122],
- ["E3B6",0x6123],
- ["B7DF",0x6124],
- ["90E1",0x6125],
- ["E3B4",0x6126],
- ["C0A2",0x6127],
- ["90E2",0x6128],
- ["90E3",0x6129],
- ["90E4",0x612A],
- ["E3BA",0x612B],
- ["90E5",0x612C],
- ["90E6",0x612D],
- ["90E7",0x612E],
- ["90E8",0x612F],
- ["90E9",0x6130],
- ["90EA",0x6131],
- ["90EB",0x6132],
- ["90EC",0x6133],
- ["90ED",0x6134],
- ["90EE",0x6135],
- ["90EF",0x6136],
- ["90F0",0x6137],
- ["90F1",0x6138],
- ["90F2",0x6139],
- ["90F3",0x613A],
- ["90F4",0x613B],
- ["90F5",0x613C],
- ["90F6",0x613D],
- ["90F7",0x613E],
- ["D4B8",0x613F],
- ["90F8",0x6140],
- ["90F9",0x6141],
- ["90FA",0x6142],
- ["90FB",0x6143],
- ["90FC",0x6144],
- ["90FD",0x6145],
- ["90FE",0x6146],
- ["9140",0x6147],
- ["B4C8",0x6148],
- ["9141",0x6149],
- ["E3BB",0x614A],
- ["9142",0x614B],
- ["BBC5",0x614C],
- ["9143",0x614D],
- ["C9F7",0x614E],
- ["9144",0x614F],
- ["9145",0x6150],
- ["C9E5",0x6151],
- ["9146",0x6152],
- ["9147",0x6153],
- ["9148",0x6154],
- ["C4BD",0x6155],
- ["9149",0x6156],
- ["914A",0x6157],
- ["914B",0x6158],
- ["914C",0x6159],
- ["914D",0x615A],
- ["914E",0x615B],
- ["914F",0x615C],
- ["EDAB",0x615D],
- ["9150",0x615E],
- ["9151",0x615F],
- ["9152",0x6160],
- ["9153",0x6161],
- ["C2FD",0x6162],
- ["9154",0x6163],
- ["9155",0x6164],
- ["9156",0x6165],
- ["9157",0x6166],
- ["BBDB",0x6167],
- ["BFAE",0x6168],
- ["9158",0x6169],
- ["9159",0x616A],
- ["915A",0x616B],
- ["915B",0x616C],
- ["915C",0x616D],
- ["915D",0x616E],
- ["915E",0x616F],
- ["CEBF",0x6170],
- ["915F",0x6171],
- ["9160",0x6172],
- ["9161",0x6173],
- ["9162",0x6174],
- ["E3BC",0x6175],
- ["9163",0x6176],
- ["BFB6",0x6177],
- ["9164",0x6178],
- ["9165",0x6179],
- ["9166",0x617A],
- ["9167",0x617B],
- ["9168",0x617C],
- ["9169",0x617D],
- ["916A",0x617E],
- ["916B",0x617F],
- ["916C",0x6180],
- ["916D",0x6181],
- ["916E",0x6182],
- ["916F",0x6183],
- ["9170",0x6184],
- ["9171",0x6185],
- ["9172",0x6186],
- ["9173",0x6187],
- ["9174",0x6188],
- ["9175",0x6189],
- ["9176",0x618A],
- ["B1EF",0x618B],
- ["9177",0x618C],
- ["9178",0x618D],
- ["D4F7",0x618E],
- ["9179",0x618F],
- ["917A",0x6190],
- ["917B",0x6191],
- ["917C",0x6192],
- ["917D",0x6193],
- ["E3BE",0x6194],
- ["917E",0x6195],
- ["9180",0x6196],
- ["9181",0x6197],
- ["9182",0x6198],
- ["9183",0x6199],
- ["9184",0x619A],
- ["9185",0x619B],
- ["9186",0x619C],
- ["EDAD",0x619D],
- ["9187",0x619E],
- ["9188",0x619F],
- ["9189",0x61A0],
- ["918A",0x61A1],
- ["918B",0x61A2],
- ["918C",0x61A3],
- ["918D",0x61A4],
- ["918E",0x61A5],
- ["918F",0x61A6],
- ["E3BF",0x61A7],
- ["BAA9",0x61A8],
- ["EDAC",0x61A9],
- ["9190",0x61AA],
- ["9191",0x61AB],
- ["E3BD",0x61AC],
- ["9192",0x61AD],
- ["9193",0x61AE],
- ["9194",0x61AF],
- ["9195",0x61B0],
- ["9196",0x61B1],
- ["9197",0x61B2],
- ["9198",0x61B3],
- ["9199",0x61B4],
- ["919A",0x61B5],
- ["919B",0x61B6],
- ["E3C0",0x61B7],
- ["919C",0x61B8],
- ["919D",0x61B9],
- ["919E",0x61BA],
- ["919F",0x61BB],
- ["91A0",0x61BC],
- ["91A1",0x61BD],
- ["BAB6",0x61BE],
- ["91A2",0x61BF],
- ["91A3",0x61C0],
- ["91A4",0x61C1],
- ["B6AE",0x61C2],
- ["91A5",0x61C3],
- ["91A6",0x61C4],
- ["91A7",0x61C5],
- ["91A8",0x61C6],
- ["91A9",0x61C7],
- ["D0B8",0x61C8],
- ["91AA",0x61C9],
- ["B0C3",0x61CA],
- ["EDAE",0x61CB],
- ["91AB",0x61CC],
- ["91AC",0x61CD],
- ["91AD",0x61CE],
- ["91AE",0x61CF],
- ["91AF",0x61D0],
- ["EDAF",0x61D1],
- ["C0C1",0x61D2],
- ["91B0",0x61D3],
- ["E3C1",0x61D4],
- ["91B1",0x61D5],
- ["91B2",0x61D6],
- ["91B3",0x61D7],
- ["91B4",0x61D8],
- ["91B5",0x61D9],
- ["91B6",0x61DA],
- ["91B7",0x61DB],
- ["91B8",0x61DC],
- ["91B9",0x61DD],
- ["91BA",0x61DE],
- ["91BB",0x61DF],
- ["91BC",0x61E0],
- ["91BD",0x61E1],
- ["91BE",0x61E2],
- ["91BF",0x61E3],
- ["91C0",0x61E4],
- ["91C1",0x61E5],
- ["C5B3",0x61E6],
- ["91C2",0x61E7],
- ["91C3",0x61E8],
- ["91C4",0x61E9],
- ["91C5",0x61EA],
- ["91C6",0x61EB],
- ["91C7",0x61EC],
- ["91C8",0x61ED],
- ["91C9",0x61EE],
- ["91CA",0x61EF],
- ["91CB",0x61F0],
- ["91CC",0x61F1],
- ["91CD",0x61F2],
- ["91CE",0x61F3],
- ["91CF",0x61F4],
- ["E3C2",0x61F5],
- ["91D0",0x61F6],
- ["91D1",0x61F7],
- ["91D2",0x61F8],
- ["91D3",0x61F9],
- ["91D4",0x61FA],
- ["91D5",0x61FB],
- ["91D6",0x61FC],
- ["91D7",0x61FD],
- ["91D8",0x61FE],
- ["DCB2",0x61FF],
- ["91D9",0x6200],
- ["91DA",0x6201],
- ["91DB",0x6202],
- ["91DC",0x6203],
- ["91DD",0x6204],
- ["91DE",0x6205],
- ["EDB0",0x6206],
- ["91DF",0x6207],
- ["B8EA",0x6208],
- ["91E0",0x6209],
- ["CEEC",0x620A],
- ["EAA7",0x620B],
- ["D0E7",0x620C],
- ["CAF9",0x620D],
- ["C8D6",0x620E],
- ["CFB7",0x620F],
- ["B3C9",0x6210],
- ["CED2",0x6211],
- ["BDE4",0x6212],
- ["91E1",0x6213],
- ["91E2",0x6214],
- ["E3DE",0x6215],
- ["BBF2",0x6216],
- ["EAA8",0x6217],
- ["D5BD",0x6218],
- ["91E3",0x6219],
- ["C6DD",0x621A],
- ["EAA9",0x621B],
- ["91E4",0x621C],
- ["91E5",0x621D],
- ["91E6",0x621E],
- ["EAAA",0x621F],
- ["91E7",0x6220],
- ["EAAC",0x6221],
- ["EAAB",0x6222],
- ["91E8",0x6223],
- ["EAAE",0x6224],
- ["EAAD",0x6225],
- ["91E9",0x6226],
- ["91EA",0x6227],
- ["91EB",0x6228],
- ["91EC",0x6229],
- ["BDD8",0x622A],
- ["91ED",0x622B],
- ["EAAF",0x622C],
- ["91EE",0x622D],
- ["C2BE",0x622E],
- ["91EF",0x622F],
- ["91F0",0x6230],
- ["91F1",0x6231],
- ["91F2",0x6232],
- ["B4C1",0x6233],
- ["B4F7",0x6234],
- ["91F3",0x6235],
- ["91F4",0x6236],
- ["BBA7",0x6237],
- ["91F5",0x6238],
- ["91F6",0x6239],
- ["91F7",0x623A],
- ["91F8",0x623B],
- ["91F9",0x623C],
- ["ECE6",0x623D],
- ["ECE5",0x623E],
- ["B7BF",0x623F],
- ["CBF9",0x6240],
- ["B1E2",0x6241],
- ["91FA",0x6242],
- ["ECE7",0x6243],
- ["91FB",0x6244],
- ["91FC",0x6245],
- ["91FD",0x6246],
- ["C9C8",0x6247],
- ["ECE8",0x6248],
- ["ECE9",0x6249],
- ["91FE",0x624A],
- ["CAD6",0x624B],
- ["DED0",0x624C],
- ["B2C5",0x624D],
- ["D4FA",0x624E],
- ["9240",0x624F],
- ["9241",0x6250],
- ["C6CB",0x6251],
- ["B0C7",0x6252],
- ["B4F2",0x6253],
- ["C8D3",0x6254],
- ["9242",0x6255],
- ["9243",0x6256],
- ["9244",0x6257],
- ["CDD0",0x6258],
- ["9245",0x6259],
- ["9246",0x625A],
- ["BFB8",0x625B],
- ["9247",0x625C],
- ["9248",0x625D],
- ["9249",0x625E],
- ["924A",0x625F],
- ["924B",0x6260],
- ["924C",0x6261],
- ["924D",0x6262],
- ["BFDB",0x6263],
- ["924E",0x6264],
- ["924F",0x6265],
- ["C7A4",0x6266],
- ["D6B4",0x6267],
- ["9250",0x6268],
- ["C0A9",0x6269],
- ["DED1",0x626A],
- ["C9A8",0x626B],
- ["D1EF",0x626C],
- ["C5A4",0x626D],
- ["B0E7",0x626E],
- ["B3B6",0x626F],
- ["C8C5",0x6270],
- ["9251",0x6271],
- ["9252",0x6272],
- ["B0E2",0x6273],
- ["9253",0x6274],
- ["9254",0x6275],
- ["B7F6",0x6276],
- ["9255",0x6277],
- ["9256",0x6278],
- ["C5FA",0x6279],
- ["9257",0x627A],
- ["9258",0x627B],
- ["B6F3",0x627C],
- ["9259",0x627D],
- ["D5D2",0x627E],
- ["B3D0",0x627F],
- ["BCBC",0x6280],
- ["925A",0x6281],
- ["925B",0x6282],
- ["925C",0x6283],
- ["B3AD",0x6284],
- ["925D",0x6285],
- ["925E",0x6286],
- ["925F",0x6287],
- ["9260",0x6288],
- ["BEF1",0x6289],
- ["B0D1",0x628A],
- ["9261",0x628B],
- ["9262",0x628C],
- ["9263",0x628D],
- ["9264",0x628E],
- ["9265",0x628F],
- ["9266",0x6290],
- ["D2D6",0x6291],
- ["CAE3",0x6292],
- ["D7A5",0x6293],
- ["9267",0x6294],
- ["CDB6",0x6295],
- ["B6B6",0x6296],
- ["BFB9",0x6297],
- ["D5DB",0x6298],
- ["9268",0x6299],
- ["B8A7",0x629A],
- ["C5D7",0x629B],
- ["9269",0x629C],
- ["926A",0x629D],
- ["926B",0x629E],
- ["DED2",0x629F],
- ["BFD9",0x62A0],
- ["C2D5",0x62A1],
- ["C7C0",0x62A2],
- ["926C",0x62A3],
- ["BBA4",0x62A4],
- ["B1A8",0x62A5],
- ["926D",0x62A6],
- ["926E",0x62A7],
- ["C5EA",0x62A8],
- ["926F",0x62A9],
- ["9270",0x62AA],
- ["C5FB",0x62AB],
- ["CCA7",0x62AC],
- ["9271",0x62AD],
- ["9272",0x62AE],
- ["9273",0x62AF],
- ["9274",0x62B0],
- ["B1A7",0x62B1],
- ["9275",0x62B2],
- ["9276",0x62B3],
- ["9277",0x62B4],
- ["B5D6",0x62B5],
- ["9278",0x62B6],
- ["9279",0x62B7],
- ["927A",0x62B8],
- ["C4A8",0x62B9],
- ["927B",0x62BA],
- ["DED3",0x62BB],
- ["D1BA",0x62BC],
- ["B3E9",0x62BD],
- ["927C",0x62BE],
- ["C3F2",0x62BF],
- ["927D",0x62C0],
- ["927E",0x62C1],
- ["B7F7",0x62C2],
- ["9280",0x62C3],
- ["D6F4",0x62C4],
- ["B5A3",0x62C5],
- ["B2F0",0x62C6],
- ["C4B4",0x62C7],
- ["C4E9",0x62C8],
- ["C0AD",0x62C9],
- ["DED4",0x62CA],
- ["9281",0x62CB],
- ["B0E8",0x62CC],
- ["C5C4",0x62CD],
- ["C1E0",0x62CE],
- ["9282",0x62CF],
- ["B9D5",0x62D0],
- ["9283",0x62D1],
- ["BEDC",0x62D2],
- ["CDD8",0x62D3],
- ["B0CE",0x62D4],
- ["9284",0x62D5],
- ["CDCF",0x62D6],
- ["DED6",0x62D7],
- ["BED0",0x62D8],
- ["D7BE",0x62D9],
- ["DED5",0x62DA],
- ["D5D0",0x62DB],
- ["B0DD",0x62DC],
- ["9285",0x62DD],
- ["9286",0x62DE],
- ["C4E2",0x62DF],
- ["9287",0x62E0],
- ["9288",0x62E1],
- ["C2A3",0x62E2],
- ["BCF0",0x62E3],
- ["9289",0x62E4],
- ["D3B5",0x62E5],
- ["C0B9",0x62E6],
- ["C5A1",0x62E7],
- ["B2A6",0x62E8],
- ["D4F1",0x62E9],
- ["928A",0x62EA],
- ["928B",0x62EB],
- ["C0A8",0x62EC],
- ["CAC3",0x62ED],
- ["DED7",0x62EE],
- ["D5FC",0x62EF],
- ["928C",0x62F0],
- ["B9B0",0x62F1],
- ["928D",0x62F2],
- ["C8AD",0x62F3],
- ["CBA9",0x62F4],
- ["928E",0x62F5],
- ["DED9",0x62F6],
- ["BFBD",0x62F7],
- ["928F",0x62F8],
- ["9290",0x62F9],
- ["9291",0x62FA],
- ["9292",0x62FB],
- ["C6B4",0x62FC],
- ["D7A7",0x62FD],
- ["CAB0",0x62FE],
- ["C4C3",0x62FF],
- ["9293",0x6300],
- ["B3D6",0x6301],
- ["B9D2",0x6302],
- ["9294",0x6303],
- ["9295",0x6304],
- ["9296",0x6305],
- ["9297",0x6306],
- ["D6B8",0x6307],
- ["EAFC",0x6308],
- ["B0B4",0x6309],
- ["9298",0x630A],
- ["9299",0x630B],
- ["929A",0x630C],
- ["929B",0x630D],
- ["BFE6",0x630E],
- ["929C",0x630F],
- ["929D",0x6310],
- ["CCF4",0x6311],
- ["929E",0x6312],
- ["929F",0x6313],
- ["92A0",0x6314],
- ["92A1",0x6315],
- ["CDDA",0x6316],
- ["92A2",0x6317],
- ["92A3",0x6318],
- ["92A4",0x6319],
- ["D6BF",0x631A],
- ["C2CE",0x631B],
- ["92A5",0x631C],
- ["CECE",0x631D],
- ["CCA2",0x631E],
- ["D0AE",0x631F],
- ["C4D3",0x6320],
- ["B5B2",0x6321],
- ["DED8",0x6322],
- ["D5F5",0x6323],
- ["BCB7",0x6324],
- ["BBD3",0x6325],
- ["92A6",0x6326],
- ["92A7",0x6327],
- ["B0A4",0x6328],
- ["92A8",0x6329],
- ["C5B2",0x632A],
- ["B4EC",0x632B],
- ["92A9",0x632C],
- ["92AA",0x632D],
- ["92AB",0x632E],
- ["D5F1",0x632F],
- ["92AC",0x6330],
- ["92AD",0x6331],
- ["EAFD",0x6332],
- ["92AE",0x6333],
- ["92AF",0x6334],
- ["92B0",0x6335],
- ["92B1",0x6336],
- ["92B2",0x6337],
- ["92B3",0x6338],
- ["DEDA",0x6339],
- ["CDA6",0x633A],
- ["92B4",0x633B],
- ["92B5",0x633C],
- ["CDEC",0x633D],
- ["92B6",0x633E],
- ["92B7",0x633F],
- ["92B8",0x6340],
- ["92B9",0x6341],
- ["CEE6",0x6342],
- ["DEDC",0x6343],
- ["92BA",0x6344],
- ["CDB1",0x6345],
- ["C0A6",0x6346],
- ["92BB",0x6347],
- ["92BC",0x6348],
- ["D7BD",0x6349],
- ["92BD",0x634A],
- ["DEDB",0x634B],
- ["B0C6",0x634C],
- ["BAB4",0x634D],
- ["C9D3",0x634E],
- ["C4F3",0x634F],
- ["BEE8",0x6350],
- ["92BE",0x6351],
- ["92BF",0x6352],
- ["92C0",0x6353],
- ["92C1",0x6354],
- ["B2B6",0x6355],
- ["92C2",0x6356],
- ["92C3",0x6357],
- ["92C4",0x6358],
- ["92C5",0x6359],
- ["92C6",0x635A],
- ["92C7",0x635B],
- ["92C8",0x635C],
- ["92C9",0x635D],
- ["C0CC",0x635E],
- ["CBF0",0x635F],
- ["92CA",0x6360],
- ["BCF1",0x6361],
- ["BBBB",0x6362],
- ["B5B7",0x6363],
- ["92CB",0x6364],
- ["92CC",0x6365],
- ["92CD",0x6366],
- ["C5F5",0x6367],
- ["92CE",0x6368],
- ["DEE6",0x6369],
- ["92CF",0x636A],
- ["92D0",0x636B],
- ["92D1",0x636C],
- ["DEE3",0x636D],
- ["BEDD",0x636E],
- ["92D2",0x636F],
- ["92D3",0x6370],
- ["DEDF",0x6371],
- ["92D4",0x6372],
- ["92D5",0x6373],
- ["92D6",0x6374],
- ["92D7",0x6375],
- ["B4B7",0x6376],
- ["BDDD",0x6377],
- ["92D8",0x6378],
- ["92D9",0x6379],
- ["DEE0",0x637A],
- ["C4ED",0x637B],
- ["92DA",0x637C],
- ["92DB",0x637D],
- ["92DC",0x637E],
- ["92DD",0x637F],
- ["CFC6",0x6380],
- ["92DE",0x6381],
- ["B5E0",0x6382],
- ["92DF",0x6383],
- ["92E0",0x6384],
- ["92E1",0x6385],
- ["92E2",0x6386],
- ["B6DE",0x6387],
- ["CADA",0x6388],
- ["B5F4",0x6389],
- ["DEE5",0x638A],
- ["92E3",0x638B],
- ["D5C6",0x638C],
- ["92E4",0x638D],
- ["DEE1",0x638E],
- ["CCCD",0x638F],
- ["C6FE",0x6390],
- ["92E5",0x6391],
- ["C5C5",0x6392],
- ["92E6",0x6393],
- ["92E7",0x6394],
- ["92E8",0x6395],
- ["D2B4",0x6396],
- ["92E9",0x6397],
- ["BEF2",0x6398],
- ["92EA",0x6399],
- ["92EB",0x639A],
- ["92EC",0x639B],
- ["92ED",0x639C],
- ["92EE",0x639D],
- ["92EF",0x639E],
- ["92F0",0x639F],
- ["C2D3",0x63A0],
- ["92F1",0x63A1],
- ["CCBD",0x63A2],
- ["B3B8",0x63A3],
- ["92F2",0x63A4],
- ["BDD3",0x63A5],
- ["92F3",0x63A6],
- ["BFD8",0x63A7],
- ["CDC6",0x63A8],
- ["D1DA",0x63A9],
- ["B4EB",0x63AA],
- ["92F4",0x63AB],
- ["DEE4",0x63AC],
- ["DEDD",0x63AD],
- ["DEE7",0x63AE],
- ["92F5",0x63AF],
- ["EAFE",0x63B0],
- ["92F6",0x63B1],
- ["92F7",0x63B2],
- ["C2B0",0x63B3],
- ["DEE2",0x63B4],
- ["92F8",0x63B5],
- ["92F9",0x63B6],
- ["D6C0",0x63B7],
- ["B5A7",0x63B8],
- ["92FA",0x63B9],
- ["B2F4",0x63BA],
- ["92FB",0x63BB],
- ["DEE8",0x63BC],
- ["92FC",0x63BD],
- ["DEF2",0x63BE],
- ["92FD",0x63BF],
- ["92FE",0x63C0],
- ["9340",0x63C1],
- ["9341",0x63C2],
- ["9342",0x63C3],
- ["DEED",0x63C4],
- ["9343",0x63C5],
- ["DEF1",0x63C6],
- ["9344",0x63C7],
- ["9345",0x63C8],
- ["C8E0",0x63C9],
- ["9346",0x63CA],
- ["9347",0x63CB],
- ["9348",0x63CC],
- ["D7E1",0x63CD],
- ["DEEF",0x63CE],
- ["C3E8",0x63CF],
- ["CCE1",0x63D0],
- ["9349",0x63D1],
- ["B2E5",0x63D2],
- ["934A",0x63D3],
- ["934B",0x63D4],
- ["934C",0x63D5],
- ["D2BE",0x63D6],
- ["934D",0x63D7],
- ["934E",0x63D8],
- ["934F",0x63D9],
- ["9350",0x63DA],
- ["9351",0x63DB],
- ["9352",0x63DC],
- ["9353",0x63DD],
- ["DEEE",0x63DE],
- ["9354",0x63DF],
- ["DEEB",0x63E0],
- ["CED5",0x63E1],
- ["9355",0x63E2],
- ["B4A7",0x63E3],
- ["9356",0x63E4],
- ["9357",0x63E5],
- ["9358",0x63E6],
- ["9359",0x63E7],
- ["935A",0x63E8],
- ["BFAB",0x63E9],
- ["BEBE",0x63EA],
- ["935B",0x63EB],
- ["935C",0x63EC],
- ["BDD2",0x63ED],
- ["935D",0x63EE],
- ["935E",0x63EF],
- ["935F",0x63F0],
- ["9360",0x63F1],
- ["DEE9",0x63F2],
- ["9361",0x63F3],
- ["D4AE",0x63F4],
- ["9362",0x63F5],
- ["DEDE",0x63F6],
- ["9363",0x63F7],
- ["DEEA",0x63F8],
- ["9364",0x63F9],
- ["9365",0x63FA],
- ["9366",0x63FB],
- ["9367",0x63FC],
- ["C0BF",0x63FD],
- ["9368",0x63FE],
- ["DEEC",0x63FF],
- ["B2F3",0x6400],
- ["B8E9",0x6401],
- ["C2A7",0x6402],
- ["9369",0x6403],
- ["936A",0x6404],
- ["BDC1",0x6405],
- ["936B",0x6406],
- ["936C",0x6407],
- ["936D",0x6408],
- ["936E",0x6409],
- ["936F",0x640A],
- ["DEF5",0x640B],
- ["DEF8",0x640C],
- ["9370",0x640D],
- ["9371",0x640E],
- ["B2AB",0x640F],
- ["B4A4",0x6410],
- ["9372",0x6411],
- ["9373",0x6412],
- ["B4EA",0x6413],
- ["C9A6",0x6414],
- ["9374",0x6415],
- ["9375",0x6416],
- ["9376",0x6417],
- ["9377",0x6418],
- ["9378",0x6419],
- ["9379",0x641A],
- ["DEF6",0x641B],
- ["CBD1",0x641C],
- ["937A",0x641D],
- ["B8E3",0x641E],
- ["937B",0x641F],
- ["DEF7",0x6420],
- ["DEFA",0x6421],
- ["937C",0x6422],
- ["937D",0x6423],
- ["937E",0x6424],
- ["9380",0x6425],
- ["DEF9",0x6426],
- ["9381",0x6427],
- ["9382",0x6428],
- ["9383",0x6429],
- ["CCC2",0x642A],
- ["9384",0x642B],
- ["B0E1",0x642C],
- ["B4EE",0x642D],
- ["9385",0x642E],
- ["9386",0x642F],
- ["9387",0x6430],
- ["9388",0x6431],
- ["9389",0x6432],
- ["938A",0x6433],
- ["E5BA",0x6434],
- ["938B",0x6435],
- ["938C",0x6436],
- ["938D",0x6437],
- ["938E",0x6438],
- ["938F",0x6439],
- ["D0AF",0x643A],
- ["9390",0x643B],
- ["9391",0x643C],
- ["B2EB",0x643D],
- ["9392",0x643E],
- ["EBA1",0x643F],
- ["9393",0x6440],
- ["DEF4",0x6441],
- ["9394",0x6442],
- ["9395",0x6443],
- ["C9E3",0x6444],
- ["DEF3",0x6445],
- ["B0DA",0x6446],
- ["D2A1",0x6447],
- ["B1F7",0x6448],
- ["9396",0x6449],
- ["CCAF",0x644A],
- ["9397",0x644B],
- ["9398",0x644C],
- ["9399",0x644D],
- ["939A",0x644E],
- ["939B",0x644F],
- ["939C",0x6450],
- ["939D",0x6451],
- ["DEF0",0x6452],
- ["939E",0x6453],
- ["CBA4",0x6454],
- ["939F",0x6455],
- ["93A0",0x6456],
- ["93A1",0x6457],
- ["D5AA",0x6458],
- ["93A2",0x6459],
- ["93A3",0x645A],
- ["93A4",0x645B],
- ["93A5",0x645C],
- ["93A6",0x645D],
- ["DEFB",0x645E],
- ["93A7",0x645F],
- ["93A8",0x6460],
- ["93A9",0x6461],
- ["93AA",0x6462],
- ["93AB",0x6463],
- ["93AC",0x6464],
- ["93AD",0x6465],
- ["93AE",0x6466],
- ["B4DD",0x6467],
- ["93AF",0x6468],
- ["C4A6",0x6469],
- ["93B0",0x646A],
- ["93B1",0x646B],
- ["93B2",0x646C],
- ["DEFD",0x646D],
- ["93B3",0x646E],
- ["93B4",0x646F],
- ["93B5",0x6470],
- ["93B6",0x6471],
- ["93B7",0x6472],
- ["93B8",0x6473],
- ["93B9",0x6474],
- ["93BA",0x6475],
- ["93BB",0x6476],
- ["93BC",0x6477],
- ["C3FE",0x6478],
- ["C4A1",0x6479],
- ["DFA1",0x647A],
- ["93BD",0x647B],
- ["93BE",0x647C],
- ["93BF",0x647D],
- ["93C0",0x647E],
- ["93C1",0x647F],
- ["93C2",0x6480],
- ["93C3",0x6481],
- ["C1CC",0x6482],
- ["93C4",0x6483],
- ["DEFC",0x6484],
- ["BEEF",0x6485],
- ["93C5",0x6486],
- ["C6B2",0x6487],
- ["93C6",0x6488],
- ["93C7",0x6489],
- ["93C8",0x648A],
- ["93C9",0x648B],
- ["93CA",0x648C],
- ["93CB",0x648D],
- ["93CC",0x648E],
- ["93CD",0x648F],
- ["93CE",0x6490],
- ["B3C5",0x6491],
- ["C8F6",0x6492],
- ["93CF",0x6493],
- ["93D0",0x6494],
- ["CBBA",0x6495],
- ["DEFE",0x6496],
- ["93D1",0x6497],
- ["93D2",0x6498],
- ["DFA4",0x6499],
- ["93D3",0x649A],
- ["93D4",0x649B],
- ["93D5",0x649C],
- ["93D6",0x649D],
- ["D7B2",0x649E],
- ["93D7",0x649F],
- ["93D8",0x64A0],
- ["93D9",0x64A1],
- ["93DA",0x64A2],
- ["93DB",0x64A3],
- ["B3B7",0x64A4],
- ["93DC",0x64A5],
- ["93DD",0x64A6],
- ["93DE",0x64A7],
- ["93DF",0x64A8],
- ["C1C3",0x64A9],
- ["93E0",0x64AA],
- ["93E1",0x64AB],
- ["C7CB",0x64AC],
- ["B2A5",0x64AD],
- ["B4E9",0x64AE],
- ["93E2",0x64AF],
- ["D7AB",0x64B0],
- ["93E3",0x64B1],
- ["93E4",0x64B2],
- ["93E5",0x64B3],
- ["93E6",0x64B4],
- ["C4EC",0x64B5],
- ["93E7",0x64B6],
- ["DFA2",0x64B7],
- ["DFA3",0x64B8],
- ["93E8",0x64B9],
- ["DFA5",0x64BA],
- ["93E9",0x64BB],
- ["BAB3",0x64BC],
- ["93EA",0x64BD],
- ["93EB",0x64BE],
- ["93EC",0x64BF],
- ["DFA6",0x64C0],
- ["93ED",0x64C1],
- ["C0DE",0x64C2],
- ["93EE",0x64C3],
- ["93EF",0x64C4],
- ["C9C3",0x64C5],
- ["93F0",0x64C6],
- ["93F1",0x64C7],
- ["93F2",0x64C8],
- ["93F3",0x64C9],
- ["93F4",0x64CA],
- ["93F5",0x64CB],
- ["93F6",0x64CC],
- ["B2D9",0x64CD],
- ["C7E6",0x64CE],
- ["93F7",0x64CF],
- ["DFA7",0x64D0],
- ["93F8",0x64D1],
- ["C7DC",0x64D2],
- ["93F9",0x64D3],
- ["93FA",0x64D4],
- ["93FB",0x64D5],
- ["93FC",0x64D6],
- ["DFA8",0x64D7],
- ["EBA2",0x64D8],
- ["93FD",0x64D9],
- ["93FE",0x64DA],
- ["9440",0x64DB],
- ["9441",0x64DC],
- ["9442",0x64DD],
- ["CBD3",0x64DE],
- ["9443",0x64DF],
- ["9444",0x64E0],
- ["9445",0x64E1],
- ["DFAA",0x64E2],
- ["9446",0x64E3],
- ["DFA9",0x64E4],
- ["9447",0x64E5],
- ["B2C1",0x64E6],
- ["9448",0x64E7],
- ["9449",0x64E8],
- ["944A",0x64E9],
- ["944B",0x64EA],
- ["944C",0x64EB],
- ["944D",0x64EC],
- ["944E",0x64ED],
- ["944F",0x64EE],
- ["9450",0x64EF],
- ["9451",0x64F0],
- ["9452",0x64F1],
- ["9453",0x64F2],
- ["9454",0x64F3],
- ["9455",0x64F4],
- ["9456",0x64F5],
- ["9457",0x64F6],
- ["9458",0x64F7],
- ["9459",0x64F8],
- ["945A",0x64F9],
- ["945B",0x64FA],
- ["945C",0x64FB],
- ["945D",0x64FC],
- ["945E",0x64FD],
- ["945F",0x64FE],
- ["9460",0x64FF],
- ["C5CA",0x6500],
- ["9461",0x6501],
- ["9462",0x6502],
- ["9463",0x6503],
- ["9464",0x6504],
- ["9465",0x6505],
- ["9466",0x6506],
- ["9467",0x6507],
- ["9468",0x6508],
- ["DFAB",0x6509],
- ["9469",0x650A],
- ["946A",0x650B],
- ["946B",0x650C],
- ["946C",0x650D],
- ["946D",0x650E],
- ["946E",0x650F],
- ["946F",0x6510],
- ["9470",0x6511],
- ["D4DC",0x6512],
- ["9471",0x6513],
- ["9472",0x6514],
- ["9473",0x6515],
- ["9474",0x6516],
- ["9475",0x6517],
- ["C8C1",0x6518],
- ["9476",0x6519],
- ["9477",0x651A],
- ["9478",0x651B],
- ["9479",0x651C],
- ["947A",0x651D],
- ["947B",0x651E],
- ["947C",0x651F],
- ["947D",0x6520],
- ["947E",0x6521],
- ["9480",0x6522],
- ["9481",0x6523],
- ["9482",0x6524],
- ["DFAC",0x6525],
- ["9483",0x6526],
- ["9484",0x6527],
- ["9485",0x6528],
- ["9486",0x6529],
- ["9487",0x652A],
- ["BEF0",0x652B],
- ["9488",0x652C],
- ["9489",0x652D],
- ["DFAD",0x652E],
- ["D6A7",0x652F],
- ["948A",0x6530],
- ["948B",0x6531],
- ["948C",0x6532],
- ["948D",0x6533],
- ["EAB7",0x6534],
- ["EBB6",0x6535],
- ["CAD5",0x6536],
- ["948E",0x6537],
- ["D8FC",0x6538],
- ["B8C4",0x6539],
- ["948F",0x653A],
- ["B9A5",0x653B],
- ["9490",0x653C],
- ["9491",0x653D],
- ["B7C5",0x653E],
- ["D5FE",0x653F],
- ["9492",0x6540],
- ["9493",0x6541],
- ["9494",0x6542],
- ["9495",0x6543],
- ["9496",0x6544],
- ["B9CA",0x6545],
- ["9497",0x6546],
- ["9498",0x6547],
- ["D0A7",0x6548],
- ["F4CD",0x6549],
- ["9499",0x654A],
- ["949A",0x654B],
- ["B5D0",0x654C],
- ["949B",0x654D],
- ["949C",0x654E],
- ["C3F4",0x654F],
- ["949D",0x6550],
- ["BEC8",0x6551],
- ["949E",0x6552],
- ["949F",0x6553],
- ["94A0",0x6554],
- ["EBB7",0x6555],
- ["B0BD",0x6556],
- ["94A1",0x6557],
- ["94A2",0x6558],
- ["BDCC",0x6559],
- ["94A3",0x655A],
- ["C1B2",0x655B],
- ["94A4",0x655C],
- ["B1D6",0x655D],
- ["B3A8",0x655E],
- ["94A5",0x655F],
- ["94A6",0x6560],
- ["94A7",0x6561],
- ["B8D2",0x6562],
- ["C9A2",0x6563],
- ["94A8",0x6564],
- ["94A9",0x6565],
- ["B6D8",0x6566],
- ["94AA",0x6567],
- ["94AB",0x6568],
- ["94AC",0x6569],
- ["94AD",0x656A],
- ["EBB8",0x656B],
- ["BEB4",0x656C],
- ["94AE",0x656D],
- ["94AF",0x656E],
- ["94B0",0x656F],
- ["CAFD",0x6570],
- ["94B1",0x6571],
- ["C7C3",0x6572],
- ["94B2",0x6573],
- ["D5FB",0x6574],
- ["94B3",0x6575],
- ["94B4",0x6576],
- ["B7F3",0x6577],
- ["94B5",0x6578],
- ["94B6",0x6579],
- ["94B7",0x657A],
- ["94B8",0x657B],
- ["94B9",0x657C],
- ["94BA",0x657D],
- ["94BB",0x657E],
- ["94BC",0x657F],
- ["94BD",0x6580],
- ["94BE",0x6581],
- ["94BF",0x6582],
- ["94C0",0x6583],
- ["94C1",0x6584],
- ["94C2",0x6585],
- ["94C3",0x6586],
- ["CEC4",0x6587],
- ["94C4",0x6588],
- ["94C5",0x6589],
- ["94C6",0x658A],
- ["D5AB",0x658B],
- ["B1F3",0x658C],
- ["94C7",0x658D],
- ["94C8",0x658E],
- ["94C9",0x658F],
- ["ECB3",0x6590],
- ["B0DF",0x6591],
- ["94CA",0x6592],
- ["ECB5",0x6593],
- ["94CB",0x6594],
- ["94CC",0x6595],
- ["94CD",0x6596],
- ["B6B7",0x6597],
- ["94CE",0x6598],
- ["C1CF",0x6599],
- ["94CF",0x659A],
- ["F5FA",0x659B],
- ["D0B1",0x659C],
- ["94D0",0x659D],
- ["94D1",0x659E],
- ["D5E5",0x659F],
- ["94D2",0x65A0],
- ["CED3",0x65A1],
- ["94D3",0x65A2],
- ["94D4",0x65A3],
- ["BDEF",0x65A4],
- ["B3E2",0x65A5],
- ["94D5",0x65A6],
- ["B8AB",0x65A7],
- ["94D6",0x65A8],
- ["D5B6",0x65A9],
- ["94D7",0x65AA],
- ["EDBD",0x65AB],
- ["94D8",0x65AC],
- ["B6CF",0x65AD],
- ["94D9",0x65AE],
- ["CBB9",0x65AF],
- ["D0C2",0x65B0],
- ["94DA",0x65B1],
- ["94DB",0x65B2],
- ["94DC",0x65B3],
- ["94DD",0x65B4],
- ["94DE",0x65B5],
- ["94DF",0x65B6],
- ["94E0",0x65B7],
- ["94E1",0x65B8],
- ["B7BD",0x65B9],
- ["94E2",0x65BA],
- ["94E3",0x65BB],
- ["ECB6",0x65BC],
- ["CAA9",0x65BD],
- ["94E4",0x65BE],
- ["94E5",0x65BF],
- ["94E6",0x65C0],
- ["C5D4",0x65C1],
- ["94E7",0x65C2],
- ["ECB9",0x65C3],
- ["ECB8",0x65C4],
- ["C2C3",0x65C5],
- ["ECB7",0x65C6],
- ["94E8",0x65C7],
- ["94E9",0x65C8],
- ["94EA",0x65C9],
- ["94EB",0x65CA],
- ["D0FD",0x65CB],
- ["ECBA",0x65CC],
- ["94EC",0x65CD],
- ["ECBB",0x65CE],
- ["D7E5",0x65CF],
- ["94ED",0x65D0],
- ["94EE",0x65D1],
- ["ECBC",0x65D2],
- ["94EF",0x65D3],
- ["94F0",0x65D4],
- ["94F1",0x65D5],
- ["ECBD",0x65D6],
- ["C6EC",0x65D7],
- ["94F2",0x65D8],
- ["94F3",0x65D9],
- ["94F4",0x65DA],
- ["94F5",0x65DB],
- ["94F6",0x65DC],
- ["94F7",0x65DD],
- ["94F8",0x65DE],
- ["94F9",0x65DF],
- ["CEDE",0x65E0],
- ["94FA",0x65E1],
- ["BCC8",0x65E2],
- ["94FB",0x65E3],
- ["94FC",0x65E4],
- ["C8D5",0x65E5],
- ["B5A9",0x65E6],
- ["BEC9",0x65E7],
- ["D6BC",0x65E8],
- ["D4E7",0x65E9],
- ["94FD",0x65EA],
- ["94FE",0x65EB],
- ["D1AE",0x65EC],
- ["D0F1",0x65ED],
- ["EAB8",0x65EE],
- ["EAB9",0x65EF],
- ["EABA",0x65F0],
- ["BAB5",0x65F1],
- ["9540",0x65F2],
- ["9541",0x65F3],
- ["9542",0x65F4],
- ["9543",0x65F5],
- ["CAB1",0x65F6],
- ["BFF5",0x65F7],
- ["9544",0x65F8],
- ["9545",0x65F9],
- ["CDFA",0x65FA],
- ["9546",0x65FB],
- ["9547",0x65FC],
- ["9548",0x65FD],
- ["9549",0x65FE],
- ["954A",0x65FF],
- ["EAC0",0x6600],
- ["954B",0x6601],
- ["B0BA",0x6602],
- ["EABE",0x6603],
- ["954C",0x6604],
- ["954D",0x6605],
- ["C0A5",0x6606],
- ["954E",0x6607],
- ["954F",0x6608],
- ["9550",0x6609],
- ["EABB",0x660A],
- ["9551",0x660B],
- ["B2FD",0x660C],
- ["9552",0x660D],
- ["C3F7",0x660E],
- ["BBE8",0x660F],
- ["9553",0x6610],
- ["9554",0x6611],
- ["9555",0x6612],
- ["D2D7",0x6613],
- ["CEF4",0x6614],
- ["EABF",0x6615],
- ["9556",0x6616],
- ["9557",0x6617],
- ["9558",0x6618],
- ["EABC",0x6619],
- ["9559",0x661A],
- ["955A",0x661B],
- ["955B",0x661C],
- ["EAC3",0x661D],
- ["955C",0x661E],
- ["D0C7",0x661F],
- ["D3B3",0x6620],
- ["955D",0x6621],
- ["955E",0x6622],
- ["955F",0x6623],
- ["9560",0x6624],
- ["B4BA",0x6625],
- ["9561",0x6626],
- ["C3C1",0x6627],
- ["D7F2",0x6628],
- ["9562",0x6629],
- ["9563",0x662A],
- ["9564",0x662B],
- ["9565",0x662C],
- ["D5D1",0x662D],
- ["9566",0x662E],
- ["CAC7",0x662F],
- ["9567",0x6630],
- ["EAC5",0x6631],
- ["9568",0x6632],
- ["9569",0x6633],
- ["EAC4",0x6634],
- ["EAC7",0x6635],
- ["EAC6",0x6636],
- ["956A",0x6637],
- ["956B",0x6638],
- ["956C",0x6639],
- ["956D",0x663A],
- ["956E",0x663B],
- ["D6E7",0x663C],
- ["956F",0x663D],
- ["CFD4",0x663E],
- ["9570",0x663F],
- ["9571",0x6640],
- ["EACB",0x6641],
- ["9572",0x6642],
- ["BBCE",0x6643],
- ["9573",0x6644],
- ["9574",0x6645],
- ["9575",0x6646],
- ["9576",0x6647],
- ["9577",0x6648],
- ["9578",0x6649],
- ["9579",0x664A],
- ["BDFA",0x664B],
- ["C9CE",0x664C],
- ["957A",0x664D],
- ["957B",0x664E],
- ["EACC",0x664F],
- ["957C",0x6650],
- ["957D",0x6651],
- ["C9B9",0x6652],
- ["CFFE",0x6653],
- ["EACA",0x6654],
- ["D4CE",0x6655],
- ["EACD",0x6656],
- ["EACF",0x6657],
- ["957E",0x6658],
- ["9580",0x6659],
- ["CDED",0x665A],
- ["9581",0x665B],
- ["9582",0x665C],
- ["9583",0x665D],
- ["9584",0x665E],
- ["EAC9",0x665F],
- ["9585",0x6660],
- ["EACE",0x6661],
- ["9586",0x6662],
- ["9587",0x6663],
- ["CEEE",0x6664],
- ["9588",0x6665],
- ["BBDE",0x6666],
- ["9589",0x6667],
- ["B3BF",0x6668],
- ["958A",0x6669],
- ["958B",0x666A],
- ["958C",0x666B],
- ["958D",0x666C],
- ["958E",0x666D],
- ["C6D5",0x666E],
- ["BEB0",0x666F],
- ["CEFA",0x6670],
- ["958F",0x6671],
- ["9590",0x6672],
- ["9591",0x6673],
- ["C7E7",0x6674],
- ["9592",0x6675],
- ["BEA7",0x6676],
- ["EAD0",0x6677],
- ["9593",0x6678],
- ["9594",0x6679],
- ["D6C7",0x667A],
- ["9595",0x667B],
- ["9596",0x667C],
- ["9597",0x667D],
- ["C1C0",0x667E],
- ["9598",0x667F],
- ["9599",0x6680],
- ["959A",0x6681],
- ["D4DD",0x6682],
- ["959B",0x6683],
- ["EAD1",0x6684],
- ["959C",0x6685],
- ["959D",0x6686],
- ["CFBE",0x6687],
- ["959E",0x6688],
- ["959F",0x6689],
- ["95A0",0x668A],
- ["95A1",0x668B],
- ["EAD2",0x668C],
- ["95A2",0x668D],
- ["95A3",0x668E],
- ["95A4",0x668F],
- ["95A5",0x6690],
- ["CAEE",0x6691],
- ["95A6",0x6692],
- ["95A7",0x6693],
- ["95A8",0x6694],
- ["95A9",0x6695],
- ["C5AF",0x6696],
- ["B0B5",0x6697],
- ["95AA",0x6698],
- ["95AB",0x6699],
- ["95AC",0x669A],
- ["95AD",0x669B],
- ["95AE",0x669C],
- ["EAD4",0x669D],
- ["95AF",0x669E],
- ["95B0",0x669F],
- ["95B1",0x66A0],
- ["95B2",0x66A1],
- ["95B3",0x66A2],
- ["95B4",0x66A3],
- ["95B5",0x66A4],
- ["95B6",0x66A5],
- ["95B7",0x66A6],
- ["EAD3",0x66A7],
- ["F4DF",0x66A8],
- ["95B8",0x66A9],
- ["95B9",0x66AA],
- ["95BA",0x66AB],
- ["95BB",0x66AC],
- ["95BC",0x66AD],
- ["C4BA",0x66AE],
- ["95BD",0x66AF],
- ["95BE",0x66B0],
- ["95BF",0x66B1],
- ["95C0",0x66B2],
- ["95C1",0x66B3],
- ["B1A9",0x66B4],
- ["95C2",0x66B5],
- ["95C3",0x66B6],
- ["95C4",0x66B7],
- ["95C5",0x66B8],
- ["E5DF",0x66B9],
- ["95C6",0x66BA],
- ["95C7",0x66BB],
- ["95C8",0x66BC],
- ["95C9",0x66BD],
- ["EAD5",0x66BE],
- ["95CA",0x66BF],
- ["95CB",0x66C0],
- ["95CC",0x66C1],
- ["95CD",0x66C2],
- ["95CE",0x66C3],
- ["95CF",0x66C4],
- ["95D0",0x66C5],
- ["95D1",0x66C6],
- ["95D2",0x66C7],
- ["95D3",0x66C8],
- ["95D4",0x66C9],
- ["95D5",0x66CA],
- ["95D6",0x66CB],
- ["95D7",0x66CC],
- ["95D8",0x66CD],
- ["95D9",0x66CE],
- ["95DA",0x66CF],
- ["95DB",0x66D0],
- ["95DC",0x66D1],
- ["95DD",0x66D2],
- ["95DE",0x66D3],
- ["95DF",0x66D4],
- ["95E0",0x66D5],
- ["95E1",0x66D6],
- ["95E2",0x66D7],
- ["95E3",0x66D8],
- ["CAEF",0x66D9],
- ["95E4",0x66DA],
- ["EAD6",0x66DB],
- ["EAD7",0x66DC],
- ["C6D8",0x66DD],
- ["95E5",0x66DE],
- ["95E6",0x66DF],
- ["95E7",0x66E0],
- ["95E8",0x66E1],
- ["95E9",0x66E2],
- ["95EA",0x66E3],
- ["95EB",0x66E4],
- ["95EC",0x66E5],
- ["EAD8",0x66E6],
- ["95ED",0x66E7],
- ["95EE",0x66E8],
- ["EAD9",0x66E9],
- ["95EF",0x66EA],
- ["95F0",0x66EB],
- ["95F1",0x66EC],
- ["95F2",0x66ED],
- ["95F3",0x66EE],
- ["95F4",0x66EF],
- ["D4BB",0x66F0],
- ["95F5",0x66F1],
- ["C7FA",0x66F2],
- ["D2B7",0x66F3],
- ["B8FC",0x66F4],
- ["95F6",0x66F5],
- ["95F7",0x66F6],
- ["EAC2",0x66F7],
- ["95F8",0x66F8],
- ["B2DC",0x66F9],
- ["95F9",0x66FA],
- ["95FA",0x66FB],
- ["C2FC",0x66FC],
- ["95FB",0x66FD],
- ["D4F8",0x66FE],
- ["CCE6",0x66FF],
- ["D7EE",0x6700],
- ["95FC",0x6701],
- ["95FD",0x6702],
- ["95FE",0x6703],
- ["9640",0x6704],
- ["9641",0x6705],
- ["9642",0x6706],
- ["9643",0x6707],
- ["D4C2",0x6708],
- ["D3D0",0x6709],
- ["EBC3",0x670A],
- ["C5F3",0x670B],
- ["9644",0x670C],
- ["B7FE",0x670D],
- ["9645",0x670E],
- ["9646",0x670F],
- ["EBD4",0x6710],
- ["9647",0x6711],
- ["9648",0x6712],
- ["9649",0x6713],
- ["CBB7",0x6714],
- ["EBDE",0x6715],
- ["964A",0x6716],
- ["C0CA",0x6717],
- ["964B",0x6718],
- ["964C",0x6719],
- ["964D",0x671A],
- ["CDFB",0x671B],
- ["964E",0x671C],
- ["B3AF",0x671D],
- ["964F",0x671E],
- ["C6DA",0x671F],
- ["9650",0x6720],
- ["9651",0x6721],
- ["9652",0x6722],
- ["9653",0x6723],
- ["9654",0x6724],
- ["9655",0x6725],
- ["EBFC",0x6726],
- ["9656",0x6727],
- ["C4BE",0x6728],
- ["9657",0x6729],
- ["CEB4",0x672A],
- ["C4A9",0x672B],
- ["B1BE",0x672C],
- ["D4FD",0x672D],
- ["9658",0x672E],
- ["CAF5",0x672F],
- ["9659",0x6730],
- ["D6EC",0x6731],
- ["965A",0x6732],
- ["965B",0x6733],
- ["C6D3",0x6734],
- ["B6E4",0x6735],
- ["965C",0x6736],
- ["965D",0x6737],
- ["965E",0x6738],
- ["965F",0x6739],
- ["BBFA",0x673A],
- ["9660",0x673B],
- ["9661",0x673C],
- ["D0E0",0x673D],
- ["9662",0x673E],
- ["9663",0x673F],
- ["C9B1",0x6740],
- ["9664",0x6741],
- ["D4D3",0x6742],
- ["C8A8",0x6743],
- ["9665",0x6744],
- ["9666",0x6745],
- ["B8CB",0x6746],
- ["9667",0x6747],
- ["E8BE",0x6748],
- ["C9BC",0x6749],
- ["9668",0x674A],
- ["9669",0x674B],
- ["E8BB",0x674C],
- ["966A",0x674D],
- ["C0EE",0x674E],
- ["D0D3",0x674F],
- ["B2C4",0x6750],
- ["B4E5",0x6751],
- ["966B",0x6752],
- ["E8BC",0x6753],
- ["966C",0x6754],
- ["966D",0x6755],
- ["D5C8",0x6756],
- ["966E",0x6757],
- ["966F",0x6758],
- ["9670",0x6759],
- ["9671",0x675A],
- ["9672",0x675B],
- ["B6C5",0x675C],
- ["9673",0x675D],
- ["E8BD",0x675E],
- ["CAF8",0x675F],
- ["B8DC",0x6760],
- ["CCF5",0x6761],
- ["9674",0x6762],
- ["9675",0x6763],
- ["9676",0x6764],
- ["C0B4",0x6765],
- ["9677",0x6766],
- ["9678",0x6767],
- ["D1EE",0x6768],
- ["E8BF",0x6769],
- ["E8C2",0x676A],
- ["9679",0x676B],
- ["967A",0x676C],
- ["BABC",0x676D],
- ["967B",0x676E],
- ["B1AD",0x676F],
- ["BDDC",0x6770],
- ["967C",0x6771],
- ["EABD",0x6772],
- ["E8C3",0x6773],
- ["967D",0x6774],
- ["E8C6",0x6775],
- ["967E",0x6776],
- ["E8CB",0x6777],
- ["9680",0x6778],
- ["9681",0x6779],
- ["9682",0x677A],
- ["9683",0x677B],
- ["E8CC",0x677C],
- ["9684",0x677D],
- ["CBC9",0x677E],
- ["B0E5",0x677F],
- ["9685",0x6780],
- ["BCAB",0x6781],
- ["9686",0x6782],
- ["9687",0x6783],
- ["B9B9",0x6784],
- ["9688",0x6785],
- ["9689",0x6786],
- ["E8C1",0x6787],
- ["968A",0x6788],
- ["CDF7",0x6789],
- ["968B",0x678A],
- ["E8CA",0x678B],
- ["968C",0x678C],
- ["968D",0x678D],
- ["968E",0x678E],
- ["968F",0x678F],
- ["CEF6",0x6790],
- ["9690",0x6791],
- ["9691",0x6792],
- ["9692",0x6793],
- ["9693",0x6794],
- ["D5ED",0x6795],
- ["9694",0x6796],
- ["C1D6",0x6797],
- ["E8C4",0x6798],
- ["9695",0x6799],
- ["C3B6",0x679A],
- ["9696",0x679B],
- ["B9FB",0x679C],
- ["D6A6",0x679D],
- ["E8C8",0x679E],
- ["9697",0x679F],
- ["9698",0x67A0],
- ["9699",0x67A1],
- ["CAE0",0x67A2],
- ["D4E6",0x67A3],
- ["969A",0x67A4],
- ["E8C0",0x67A5],
- ["969B",0x67A6],
- ["E8C5",0x67A7],
- ["E8C7",0x67A8],
- ["969C",0x67A9],
- ["C7B9",0x67AA],
- ["B7E3",0x67AB],
- ["969D",0x67AC],
- ["E8C9",0x67AD],
- ["969E",0x67AE],
- ["BFDD",0x67AF],
- ["E8D2",0x67B0],
- ["969F",0x67B1],
- ["96A0",0x67B2],
- ["E8D7",0x67B3],
- ["96A1",0x67B4],
- ["E8D5",0x67B5],
- ["BCDC",0x67B6],
- ["BCCF",0x67B7],
- ["E8DB",0x67B8],
- ["96A2",0x67B9],
- ["96A3",0x67BA],
- ["96A4",0x67BB],
- ["96A5",0x67BC],
- ["96A6",0x67BD],
- ["96A7",0x67BE],
- ["96A8",0x67BF],
- ["96A9",0x67C0],
- ["E8DE",0x67C1],
- ["96AA",0x67C2],
- ["E8DA",0x67C3],
- ["B1FA",0x67C4],
- ["96AB",0x67C5],
- ["96AC",0x67C6],
- ["96AD",0x67C7],
- ["96AE",0x67C8],
- ["96AF",0x67C9],
- ["96B0",0x67CA],
- ["96B1",0x67CB],
- ["96B2",0x67CC],
- ["96B3",0x67CD],
- ["96B4",0x67CE],
- ["B0D8",0x67CF],
- ["C4B3",0x67D0],
- ["B8CC",0x67D1],
- ["C6E2",0x67D2],
- ["C8BE",0x67D3],
- ["C8E1",0x67D4],
- ["96B5",0x67D5],
- ["96B6",0x67D6],
- ["96B7",0x67D7],
- ["E8CF",0x67D8],
- ["E8D4",0x67D9],
- ["E8D6",0x67DA],
- ["96B8",0x67DB],
- ["B9F1",0x67DC],
- ["E8D8",0x67DD],
- ["D7F5",0x67DE],
- ["96B9",0x67DF],
- ["C4FB",0x67E0],
- ["96BA",0x67E1],
- ["E8DC",0x67E2],
- ["96BB",0x67E3],
- ["96BC",0x67E4],
- ["B2E9",0x67E5],
- ["96BD",0x67E6],
- ["96BE",0x67E7],
- ["96BF",0x67E8],
- ["E8D1",0x67E9],
- ["96C0",0x67EA],
- ["96C1",0x67EB],
- ["BCED",0x67EC],
- ["96C2",0x67ED],
- ["96C3",0x67EE],
- ["BFC2",0x67EF],
- ["E8CD",0x67F0],
- ["D6F9",0x67F1],
- ["96C4",0x67F2],
- ["C1F8",0x67F3],
- ["B2F1",0x67F4],
- ["96C5",0x67F5],
- ["96C6",0x67F6],
- ["96C7",0x67F7],
- ["96C8",0x67F8],
- ["96C9",0x67F9],
- ["96CA",0x67FA],
- ["96CB",0x67FB],
- ["96CC",0x67FC],
- ["E8DF",0x67FD],
- ["96CD",0x67FE],
- ["CAC1",0x67FF],
- ["E8D9",0x6800],
- ["96CE",0x6801],
- ["96CF",0x6802],
- ["96D0",0x6803],
- ["96D1",0x6804],
- ["D5A4",0x6805],
- ["96D2",0x6806],
- ["B1EA",0x6807],
- ["D5BB",0x6808],
- ["E8CE",0x6809],
- ["E8D0",0x680A],
- ["B6B0",0x680B],
- ["E8D3",0x680C],
- ["96D3",0x680D],
- ["E8DD",0x680E],
- ["C0B8",0x680F],
- ["96D4",0x6810],
- ["CAF7",0x6811],
- ["96D5",0x6812],
- ["CBA8",0x6813],
- ["96D6",0x6814],
- ["96D7",0x6815],
- ["C6DC",0x6816],
- ["C0F5",0x6817],
- ["96D8",0x6818],
- ["96D9",0x6819],
- ["96DA",0x681A],
- ["96DB",0x681B],
- ["96DC",0x681C],
- ["E8E9",0x681D],
- ["96DD",0x681E],
- ["96DE",0x681F],
- ["96DF",0x6820],
- ["D0A3",0x6821],
- ["96E0",0x6822],
- ["96E1",0x6823],
- ["96E2",0x6824],
- ["96E3",0x6825],
- ["96E4",0x6826],
- ["96E5",0x6827],
- ["96E6",0x6828],
- ["E8F2",0x6829],
- ["D6EA",0x682A],
- ["96E7",0x682B],
- ["96E8",0x682C],
- ["96E9",0x682D],
- ["96EA",0x682E],
- ["96EB",0x682F],
- ["96EC",0x6830],
- ["96ED",0x6831],
- ["E8E0",0x6832],
- ["E8E1",0x6833],
- ["96EE",0x6834],
- ["96EF",0x6835],
- ["96F0",0x6836],
- ["D1F9",0x6837],
- ["BACB",0x6838],
- ["B8F9",0x6839],
- ["96F1",0x683A],
- ["96F2",0x683B],
- ["B8F1",0x683C],
- ["D4D4",0x683D],
- ["E8EF",0x683E],
- ["96F3",0x683F],
- ["E8EE",0x6840],
- ["E8EC",0x6841],
- ["B9F0",0x6842],
- ["CCD2",0x6843],
- ["E8E6",0x6844],
- ["CEA6",0x6845],
- ["BFF2",0x6846],
- ["96F4",0x6847],
- ["B0B8",0x6848],
- ["E8F1",0x6849],
- ["E8F0",0x684A],
- ["96F5",0x684B],
- ["D7C0",0x684C],
- ["96F6",0x684D],
- ["E8E4",0x684E],
- ["96F7",0x684F],
- ["CDA9",0x6850],
- ["C9A3",0x6851],
- ["96F8",0x6852],
- ["BBB8",0x6853],
- ["BDDB",0x6854],
- ["E8EA",0x6855],
- ["96F9",0x6856],
- ["96FA",0x6857],
- ["96FB",0x6858],
- ["96FC",0x6859],
- ["96FD",0x685A],
- ["96FE",0x685B],
- ["9740",0x685C],
- ["9741",0x685D],
- ["9742",0x685E],
- ["9743",0x685F],
- ["E8E2",0x6860],
- ["E8E3",0x6861],
- ["E8E5",0x6862],
- ["B5B5",0x6863],
- ["E8E7",0x6864],
- ["C7C5",0x6865],
- ["E8EB",0x6866],
- ["E8ED",0x6867],
- ["BDB0",0x6868],
- ["D7AE",0x6869],
- ["9744",0x686A],
- ["E8F8",0x686B],
- ["9745",0x686C],
- ["9746",0x686D],
- ["9747",0x686E],
- ["9748",0x686F],
- ["9749",0x6870],
- ["974A",0x6871],
- ["974B",0x6872],
- ["974C",0x6873],
- ["E8F5",0x6874],
- ["974D",0x6875],
- ["CDB0",0x6876],
- ["E8F6",0x6877],
- ["974E",0x6878],
- ["974F",0x6879],
- ["9750",0x687A],
- ["9751",0x687B],
- ["9752",0x687C],
- ["9753",0x687D],
- ["9754",0x687E],
- ["9755",0x687F],
- ["9756",0x6880],
- ["C1BA",0x6881],
- ["9757",0x6882],
- ["E8E8",0x6883],
- ["9758",0x6884],
- ["C3B7",0x6885],
- ["B0F0",0x6886],
- ["9759",0x6887],
- ["975A",0x6888],
- ["975B",0x6889],
- ["975C",0x688A],
- ["975D",0x688B],
- ["975E",0x688C],
- ["975F",0x688D],
- ["9760",0x688E],
- ["E8F4",0x688F],
- ["9761",0x6890],
- ["9762",0x6891],
- ["9763",0x6892],
- ["E8F7",0x6893],
- ["9764",0x6894],
- ["9765",0x6895],
- ["9766",0x6896],
- ["B9A3",0x6897],
- ["9767",0x6898],
- ["9768",0x6899],
- ["9769",0x689A],
- ["976A",0x689B],
- ["976B",0x689C],
- ["976C",0x689D],
- ["976D",0x689E],
- ["976E",0x689F],
- ["976F",0x68A0],
- ["9770",0x68A1],
- ["C9D2",0x68A2],
- ["9771",0x68A3],
- ["9772",0x68A4],
- ["9773",0x68A5],
- ["C3CE",0x68A6],
- ["CEE0",0x68A7],
- ["C0E6",0x68A8],
- ["9774",0x68A9],
- ["9775",0x68AA],
- ["9776",0x68AB],
- ["9777",0x68AC],
- ["CBF3",0x68AD],
- ["9778",0x68AE],
- ["CCDD",0x68AF],
- ["D0B5",0x68B0],
- ["9779",0x68B1],
- ["977A",0x68B2],
- ["CAE1",0x68B3],
- ["977B",0x68B4],
- ["E8F3",0x68B5],
- ["977C",0x68B6],
- ["977D",0x68B7],
- ["977E",0x68B8],
- ["9780",0x68B9],
- ["9781",0x68BA],
- ["9782",0x68BB],
- ["9783",0x68BC],
- ["9784",0x68BD],
- ["9785",0x68BE],
- ["9786",0x68BF],
- ["BCEC",0x68C0],
- ["9787",0x68C1],
- ["E8F9",0x68C2],
- ["9788",0x68C3],
- ["9789",0x68C4],
- ["978A",0x68C5],
- ["978B",0x68C6],
- ["978C",0x68C7],
- ["978D",0x68C8],
- ["C3DE",0x68C9],
- ["978E",0x68CA],
- ["C6E5",0x68CB],
- ["978F",0x68CC],
- ["B9F7",0x68CD],
- ["9790",0x68CE],
- ["9791",0x68CF],
- ["9792",0x68D0],
- ["9793",0x68D1],
- ["B0F4",0x68D2],
- ["9794",0x68D3],
- ["9795",0x68D4],
- ["D7D8",0x68D5],
- ["9796",0x68D6],
- ["9797",0x68D7],
- ["BCAC",0x68D8],
- ["9798",0x68D9],
- ["C5EF",0x68DA],
- ["9799",0x68DB],
- ["979A",0x68DC],
- ["979B",0x68DD],
- ["979C",0x68DE],
- ["979D",0x68DF],
- ["CCC4",0x68E0],
- ["979E",0x68E1],
- ["979F",0x68E2],
- ["E9A6",0x68E3],
- ["97A0",0x68E4],
- ["97A1",0x68E5],
- ["97A2",0x68E6],
- ["97A3",0x68E7],
- ["97A4",0x68E8],
- ["97A5",0x68E9],
- ["97A6",0x68EA],
- ["97A7",0x68EB],
- ["97A8",0x68EC],
- ["97A9",0x68ED],
- ["C9AD",0x68EE],
- ["97AA",0x68EF],
- ["E9A2",0x68F0],
- ["C0E2",0x68F1],
- ["97AB",0x68F2],
- ["97AC",0x68F3],
- ["97AD",0x68F4],
- ["BFC3",0x68F5],
- ["97AE",0x68F6],
- ["97AF",0x68F7],
- ["97B0",0x68F8],
- ["E8FE",0x68F9],
- ["B9D7",0x68FA],
- ["97B1",0x68FB],
- ["E8FB",0x68FC],
- ["97B2",0x68FD],
- ["97B3",0x68FE],
- ["97B4",0x68FF],
- ["97B5",0x6900],
- ["E9A4",0x6901],
- ["97B6",0x6902],
- ["97B7",0x6903],
- ["97B8",0x6904],
- ["D2CE",0x6905],
- ["97B9",0x6906],
- ["97BA",0x6907],
- ["97BB",0x6908],
- ["97BC",0x6909],
- ["97BD",0x690A],
- ["E9A3",0x690B],
- ["97BE",0x690C],
- ["D6B2",0x690D],
- ["D7B5",0x690E],
- ["97BF",0x690F],
- ["E9A7",0x6910],
- ["97C0",0x6911],
- ["BDB7",0x6912],
- ["97C1",0x6913],
- ["97C2",0x6914],
- ["97C3",0x6915],
- ["97C4",0x6916],
- ["97C5",0x6917],
- ["97C6",0x6918],
- ["97C7",0x6919],
- ["97C8",0x691A],
- ["97C9",0x691B],
- ["97CA",0x691C],
- ["97CB",0x691D],
- ["97CC",0x691E],
- ["E8FC",0x691F],
- ["E8FD",0x6920],
- ["97CD",0x6921],
- ["97CE",0x6922],
- ["97CF",0x6923],
- ["E9A1",0x6924],
- ["97D0",0x6925],
- ["97D1",0x6926],
- ["97D2",0x6927],
- ["97D3",0x6928],
- ["97D4",0x6929],
- ["97D5",0x692A],
- ["97D6",0x692B],
- ["97D7",0x692C],
- ["CDD6",0x692D],
- ["97D8",0x692E],
- ["97D9",0x692F],
- ["D2AC",0x6930],
- ["97DA",0x6931],
- ["97DB",0x6932],
- ["97DC",0x6933],
- ["E9B2",0x6934],
- ["97DD",0x6935],
- ["97DE",0x6936],
- ["97DF",0x6937],
- ["97E0",0x6938],
- ["E9A9",0x6939],
- ["97E1",0x693A],
- ["97E2",0x693B],
- ["97E3",0x693C],
- ["B4AA",0x693D],
- ["97E4",0x693E],
- ["B4BB",0x693F],
- ["97E5",0x6940],
- ["97E6",0x6941],
- ["E9AB",0x6942],
- ["97E7",0x6943],
- ["97E8",0x6944],
- ["97E9",0x6945],
- ["97EA",0x6946],
- ["97EB",0x6947],
- ["97EC",0x6948],
- ["97ED",0x6949],
- ["97EE",0x694A],
- ["97EF",0x694B],
- ["97F0",0x694C],
- ["97F1",0x694D],
- ["97F2",0x694E],
- ["97F3",0x694F],
- ["97F4",0x6950],
- ["97F5",0x6951],
- ["97F6",0x6952],
- ["97F7",0x6953],
- ["D0A8",0x6954],
- ["97F8",0x6955],
- ["97F9",0x6956],
- ["E9A5",0x6957],
- ["97FA",0x6958],
- ["97FB",0x6959],
- ["B3FE",0x695A],
- ["97FC",0x695B],
- ["97FD",0x695C],
- ["E9AC",0x695D],
- ["C0E3",0x695E],
- ["97FE",0x695F],
- ["E9AA",0x6960],
- ["9840",0x6961],
- ["9841",0x6962],
- ["E9B9",0x6963],
- ["9842",0x6964],
- ["9843",0x6965],
- ["E9B8",0x6966],
- ["9844",0x6967],
- ["9845",0x6968],
- ["9846",0x6969],
- ["9847",0x696A],
- ["E9AE",0x696B],
- ["9848",0x696C],
- ["9849",0x696D],
- ["E8FA",0x696E],
- ["984A",0x696F],
- ["984B",0x6970],
- ["E9A8",0x6971],
- ["984C",0x6972],
- ["984D",0x6973],
- ["984E",0x6974],
- ["984F",0x6975],
- ["9850",0x6976],
- ["BFAC",0x6977],
- ["E9B1",0x6978],
- ["E9BA",0x6979],
- ["9851",0x697A],
- ["9852",0x697B],
- ["C2A5",0x697C],
- ["9853",0x697D],
- ["9854",0x697E],
- ["9855",0x697F],
- ["E9AF",0x6980],
- ["9856",0x6981],
- ["B8C5",0x6982],
- ["9857",0x6983],
- ["E9AD",0x6984],
- ["9858",0x6985],
- ["D3DC",0x6986],
- ["E9B4",0x6987],
- ["E9B5",0x6988],
- ["E9B7",0x6989],
- ["9859",0x698A],
- ["985A",0x698B],
- ["985B",0x698C],
- ["E9C7",0x698D],
- ["985C",0x698E],
- ["985D",0x698F],
- ["985E",0x6990],
- ["985F",0x6991],
- ["9860",0x6992],
- ["9861",0x6993],
- ["C0C6",0x6994],
- ["E9C5",0x6995],
- ["9862",0x6996],
- ["9863",0x6997],
- ["E9B0",0x6998],
- ["9864",0x6999],
- ["9865",0x699A],
- ["E9BB",0x699B],
- ["B0F1",0x699C],
- ["9866",0x699D],
- ["9867",0x699E],
- ["9868",0x699F],
- ["9869",0x69A0],
- ["986A",0x69A1],
- ["986B",0x69A2],
- ["986C",0x69A3],
- ["986D",0x69A4],
- ["986E",0x69A5],
- ["986F",0x69A6],
- ["E9BC",0x69A7],
- ["D5A5",0x69A8],
- ["9870",0x69A9],
- ["9871",0x69AA],
- ["E9BE",0x69AB],
- ["9872",0x69AC],
- ["E9BF",0x69AD],
- ["9873",0x69AE],
- ["9874",0x69AF],
- ["9875",0x69B0],
- ["E9C1",0x69B1],
- ["9876",0x69B2],
- ["9877",0x69B3],
- ["C1F1",0x69B4],
- ["9878",0x69B5],
- ["9879",0x69B6],
- ["C8B6",0x69B7],
- ["987A",0x69B8],
- ["987B",0x69B9],
- ["987C",0x69BA],
- ["E9BD",0x69BB],
- ["987D",0x69BC],
- ["987E",0x69BD],
- ["9880",0x69BE],
- ["9881",0x69BF],
- ["9882",0x69C0],
- ["E9C2",0x69C1],
- ["9883",0x69C2],
- ["9884",0x69C3],
- ["9885",0x69C4],
- ["9886",0x69C5],
- ["9887",0x69C6],
- ["9888",0x69C7],
- ["9889",0x69C8],
- ["988A",0x69C9],
- ["E9C3",0x69CA],
- ["988B",0x69CB],
- ["E9B3",0x69CC],
- ["988C",0x69CD],
- ["E9B6",0x69CE],
- ["988D",0x69CF],
- ["BBB1",0x69D0],
- ["988E",0x69D1],
- ["988F",0x69D2],
- ["9890",0x69D3],
- ["E9C0",0x69D4],
- ["9891",0x69D5],
- ["9892",0x69D6],
- ["9893",0x69D7],
- ["9894",0x69D8],
- ["9895",0x69D9],
- ["9896",0x69DA],
- ["BCF7",0x69DB],
- ["9897",0x69DC],
- ["9898",0x69DD],
- ["9899",0x69DE],
- ["E9C4",0x69DF],
- ["E9C6",0x69E0],
- ["989A",0x69E1],
- ["989B",0x69E2],
- ["989C",0x69E3],
- ["989D",0x69E4],
- ["989E",0x69E5],
- ["989F",0x69E6],
- ["98A0",0x69E7],
- ["98A1",0x69E8],
- ["98A2",0x69E9],
- ["98A3",0x69EA],
- ["98A4",0x69EB],
- ["98A5",0x69EC],
- ["E9CA",0x69ED],
- ["98A6",0x69EE],
- ["98A7",0x69EF],
- ["98A8",0x69F0],
- ["98A9",0x69F1],
- ["E9CE",0x69F2],
- ["98AA",0x69F3],
- ["98AB",0x69F4],
- ["98AC",0x69F5],
- ["98AD",0x69F6],
- ["98AE",0x69F7],
- ["98AF",0x69F8],
- ["98B0",0x69F9],
- ["98B1",0x69FA],
- ["98B2",0x69FB],
- ["98B3",0x69FC],
- ["B2DB",0x69FD],
- ["98B4",0x69FE],
- ["E9C8",0x69FF],
- ["98B5",0x6A00],
- ["98B6",0x6A01],
- ["98B7",0x6A02],
- ["98B8",0x6A03],
- ["98B9",0x6A04],
- ["98BA",0x6A05],
- ["98BB",0x6A06],
- ["98BC",0x6A07],
- ["98BD",0x6A08],
- ["98BE",0x6A09],
- ["B7AE",0x6A0A],
- ["98BF",0x6A0B],
- ["98C0",0x6A0C],
- ["98C1",0x6A0D],
- ["98C2",0x6A0E],
- ["98C3",0x6A0F],
- ["98C4",0x6A10],
- ["98C5",0x6A11],
- ["98C6",0x6A12],
- ["98C7",0x6A13],
- ["98C8",0x6A14],
- ["98C9",0x6A15],
- ["98CA",0x6A16],
- ["E9CB",0x6A17],
- ["E9CC",0x6A18],
- ["98CB",0x6A19],
- ["98CC",0x6A1A],
- ["98CD",0x6A1B],
- ["98CE",0x6A1C],
- ["98CF",0x6A1D],
- ["98D0",0x6A1E],
- ["D5C1",0x6A1F],
- ["98D1",0x6A20],
- ["C4A3",0x6A21],
- ["98D2",0x6A22],
- ["98D3",0x6A23],
- ["98D4",0x6A24],
- ["98D5",0x6A25],
- ["98D6",0x6A26],
- ["98D7",0x6A27],
- ["E9D8",0x6A28],
- ["98D8",0x6A29],
- ["BAE1",0x6A2A],
- ["98D9",0x6A2B],
- ["98DA",0x6A2C],
- ["98DB",0x6A2D],
- ["98DC",0x6A2E],
- ["E9C9",0x6A2F],
- ["98DD",0x6A30],
- ["D3A3",0x6A31],
- ["98DE",0x6A32],
- ["98DF",0x6A33],
- ["98E0",0x6A34],
- ["E9D4",0x6A35],
- ["98E1",0x6A36],
- ["98E2",0x6A37],
- ["98E3",0x6A38],
- ["98E4",0x6A39],
- ["98E5",0x6A3A],
- ["98E6",0x6A3B],
- ["98E7",0x6A3C],
- ["E9D7",0x6A3D],
- ["E9D0",0x6A3E],
- ["98E8",0x6A3F],
- ["98E9",0x6A40],
- ["98EA",0x6A41],
- ["98EB",0x6A42],
- ["98EC",0x6A43],
- ["E9CF",0x6A44],
- ["98ED",0x6A45],
- ["98EE",0x6A46],
- ["C7C1",0x6A47],
- ["98EF",0x6A48],
- ["98F0",0x6A49],
- ["98F1",0x6A4A],
- ["98F2",0x6A4B],
- ["98F3",0x6A4C],
- ["98F4",0x6A4D],
- ["98F5",0x6A4E],
- ["98F6",0x6A4F],
- ["E9D2",0x6A50],
- ["98F7",0x6A51],
- ["98F8",0x6A52],
- ["98F9",0x6A53],
- ["98FA",0x6A54],
- ["98FB",0x6A55],
- ["98FC",0x6A56],
- ["98FD",0x6A57],
- ["E9D9",0x6A58],
- ["B3C8",0x6A59],
- ["98FE",0x6A5A],
- ["E9D3",0x6A5B],
- ["9940",0x6A5C],
- ["9941",0x6A5D],
- ["9942",0x6A5E],
- ["9943",0x6A5F],
- ["9944",0x6A60],
- ["CFF0",0x6A61],
- ["9945",0x6A62],
- ["9946",0x6A63],
- ["9947",0x6A64],
- ["E9CD",0x6A65],
- ["9948",0x6A66],
- ["9949",0x6A67],
- ["994A",0x6A68],
- ["994B",0x6A69],
- ["994C",0x6A6A],
- ["994D",0x6A6B],
- ["994E",0x6A6C],
- ["994F",0x6A6D],
- ["9950",0x6A6E],
- ["9951",0x6A6F],
- ["9952",0x6A70],
- ["B3F7",0x6A71],
- ["9953",0x6A72],
- ["9954",0x6A73],
- ["9955",0x6A74],
- ["9956",0x6A75],
- ["9957",0x6A76],
- ["9958",0x6A77],
- ["9959",0x6A78],
- ["E9D6",0x6A79],
- ["995A",0x6A7A],
- ["995B",0x6A7B],
- ["E9DA",0x6A7C],
- ["995C",0x6A7D],
- ["995D",0x6A7E],
- ["995E",0x6A7F],
- ["CCB4",0x6A80],
- ["995F",0x6A81],
- ["9960",0x6A82],
- ["9961",0x6A83],
- ["CFAD",0x6A84],
- ["9962",0x6A85],
- ["9963",0x6A86],
- ["9964",0x6A87],
- ["9965",0x6A88],
- ["9966",0x6A89],
- ["9967",0x6A8A],
- ["9968",0x6A8B],
- ["9969",0x6A8C],
- ["996A",0x6A8D],
- ["E9D5",0x6A8E],
- ["996B",0x6A8F],
- ["E9DC",0x6A90],
- ["E9DB",0x6A91],
- ["996C",0x6A92],
- ["996D",0x6A93],
- ["996E",0x6A94],
- ["996F",0x6A95],
- ["9970",0x6A96],
- ["E9DE",0x6A97],
- ["9971",0x6A98],
- ["9972",0x6A99],
- ["9973",0x6A9A],
- ["9974",0x6A9B],
- ["9975",0x6A9C],
- ["9976",0x6A9D],
- ["9977",0x6A9E],
- ["9978",0x6A9F],
- ["E9D1",0x6AA0],
- ["9979",0x6AA1],
- ["997A",0x6AA2],
- ["997B",0x6AA3],
- ["997C",0x6AA4],
- ["997D",0x6AA5],
- ["997E",0x6AA6],
- ["9980",0x6AA7],
- ["9981",0x6AA8],
- ["E9DD",0x6AA9],
- ["9982",0x6AAA],
- ["E9DF",0x6AAB],
- ["C3CA",0x6AAC],
- ["9983",0x6AAD],
- ["9984",0x6AAE],
- ["9985",0x6AAF],
- ["9986",0x6AB0],
- ["9987",0x6AB1],
- ["9988",0x6AB2],
- ["9989",0x6AB3],
- ["998A",0x6AB4],
- ["998B",0x6AB5],
- ["998C",0x6AB6],
- ["998D",0x6AB7],
- ["998E",0x6AB8],
- ["998F",0x6AB9],
- ["9990",0x6ABA],
- ["9991",0x6ABB],
- ["9992",0x6ABC],
- ["9993",0x6ABD],
- ["9994",0x6ABE],
- ["9995",0x6ABF],
- ["9996",0x6AC0],
- ["9997",0x6AC1],
- ["9998",0x6AC2],
- ["9999",0x6AC3],
- ["999A",0x6AC4],
- ["999B",0x6AC5],
- ["999C",0x6AC6],
- ["999D",0x6AC7],
- ["999E",0x6AC8],
- ["999F",0x6AC9],
- ["99A0",0x6ACA],
- ["99A1",0x6ACB],
- ["99A2",0x6ACC],
- ["99A3",0x6ACD],
- ["99A4",0x6ACE],
- ["99A5",0x6ACF],
- ["99A6",0x6AD0],
- ["99A7",0x6AD1],
- ["99A8",0x6AD2],
- ["99A9",0x6AD3],
- ["99AA",0x6AD4],
- ["99AB",0x6AD5],
- ["99AC",0x6AD6],
- ["99AD",0x6AD7],
- ["99AE",0x6AD8],
- ["99AF",0x6AD9],
- ["99B0",0x6ADA],
- ["99B1",0x6ADB],
- ["99B2",0x6ADC],
- ["99B3",0x6ADD],
- ["99B4",0x6ADE],
- ["99B5",0x6ADF],
- ["99B6",0x6AE0],
- ["99B7",0x6AE1],
- ["99B8",0x6AE2],
- ["99B9",0x6AE3],
- ["99BA",0x6AE4],
- ["99BB",0x6AE5],
- ["99BC",0x6AE6],
- ["99BD",0x6AE7],
- ["99BE",0x6AE8],
- ["99BF",0x6AE9],
- ["99C0",0x6AEA],
- ["99C1",0x6AEB],
- ["99C2",0x6AEC],
- ["99C3",0x6AED],
- ["99C4",0x6AEE],
- ["99C5",0x6AEF],
- ["99C6",0x6AF0],
- ["99C7",0x6AF1],
- ["99C8",0x6AF2],
- ["99C9",0x6AF3],
- ["99CA",0x6AF4],
- ["99CB",0x6AF5],
- ["99CC",0x6AF6],
- ["99CD",0x6AF7],
- ["99CE",0x6AF8],
- ["99CF",0x6AF9],
- ["99D0",0x6AFA],
- ["99D1",0x6AFB],
- ["99D2",0x6AFC],
- ["99D3",0x6AFD],
- ["99D4",0x6AFE],
- ["99D5",0x6AFF],
- ["99D6",0x6B00],
- ["99D7",0x6B01],
- ["99D8",0x6B02],
- ["99D9",0x6B03],
- ["99DA",0x6B04],
- ["99DB",0x6B05],
- ["99DC",0x6B06],
- ["99DD",0x6B07],
- ["99DE",0x6B08],
- ["99DF",0x6B09],
- ["99E0",0x6B0A],
- ["99E1",0x6B0B],
- ["99E2",0x6B0C],
- ["99E3",0x6B0D],
- ["99E4",0x6B0E],
- ["99E5",0x6B0F],
- ["99E6",0x6B10],
- ["99E7",0x6B11],
- ["99E8",0x6B12],
- ["99E9",0x6B13],
- ["99EA",0x6B14],
- ["99EB",0x6B15],
- ["99EC",0x6B16],
- ["99ED",0x6B17],
- ["99EE",0x6B18],
- ["99EF",0x6B19],
- ["99F0",0x6B1A],
- ["99F1",0x6B1B],
- ["99F2",0x6B1C],
- ["99F3",0x6B1D],
- ["99F4",0x6B1E],
- ["99F5",0x6B1F],
- ["C7B7",0x6B20],
- ["B4CE",0x6B21],
- ["BBB6",0x6B22],
- ["D0C0",0x6B23],
- ["ECA3",0x6B24],
- ["99F6",0x6B25],
- ["99F7",0x6B26],
- ["C5B7",0x6B27],
- ["99F8",0x6B28],
- ["99F9",0x6B29],
- ["99FA",0x6B2A],
- ["99FB",0x6B2B],
- ["99FC",0x6B2C],
- ["99FD",0x6B2D],
- ["99FE",0x6B2E],
- ["9A40",0x6B2F],
- ["9A41",0x6B30],
- ["9A42",0x6B31],
- ["D3FB",0x6B32],
- ["9A43",0x6B33],
- ["9A44",0x6B34],
- ["9A45",0x6B35],
- ["9A46",0x6B36],
- ["ECA4",0x6B37],
- ["9A47",0x6B38],
- ["ECA5",0x6B39],
- ["C6DB",0x6B3A],
- ["9A48",0x6B3B],
- ["9A49",0x6B3C],
- ["9A4A",0x6B3D],
- ["BFEE",0x6B3E],
- ["9A4B",0x6B3F],
- ["9A4C",0x6B40],
- ["9A4D",0x6B41],
- ["9A4E",0x6B42],
- ["ECA6",0x6B43],
- ["9A4F",0x6B44],
- ["9A50",0x6B45],
- ["ECA7",0x6B46],
- ["D0AA",0x6B47],
- ["9A51",0x6B48],
- ["C7B8",0x6B49],
- ["9A52",0x6B4A],
- ["9A53",0x6B4B],
- ["B8E8",0x6B4C],
- ["9A54",0x6B4D],
- ["9A55",0x6B4E],
- ["9A56",0x6B4F],
- ["9A57",0x6B50],
- ["9A58",0x6B51],
- ["9A59",0x6B52],
- ["9A5A",0x6B53],
- ["9A5B",0x6B54],
- ["9A5C",0x6B55],
- ["9A5D",0x6B56],
- ["9A5E",0x6B57],
- ["9A5F",0x6B58],
- ["ECA8",0x6B59],
- ["9A60",0x6B5A],
- ["9A61",0x6B5B],
- ["9A62",0x6B5C],
- ["9A63",0x6B5D],
- ["9A64",0x6B5E],
- ["9A65",0x6B5F],
- ["9A66",0x6B60],
- ["9A67",0x6B61],
- ["D6B9",0x6B62],
- ["D5FD",0x6B63],
- ["B4CB",0x6B64],
- ["B2BD",0x6B65],
- ["CEE4",0x6B66],
- ["C6E7",0x6B67],
- ["9A68",0x6B68],
- ["9A69",0x6B69],
- ["CDE1",0x6B6A],
- ["9A6A",0x6B6B],
- ["9A6B",0x6B6C],
- ["9A6C",0x6B6D],
- ["9A6D",0x6B6E],
- ["9A6E",0x6B6F],
- ["9A6F",0x6B70],
- ["9A70",0x6B71],
- ["9A71",0x6B72],
- ["9A72",0x6B73],
- ["9A73",0x6B74],
- ["9A74",0x6B75],
- ["9A75",0x6B76],
- ["9A76",0x6B77],
- ["9A77",0x6B78],
- ["B4F5",0x6B79],
- ["9A78",0x6B7A],
- ["CBC0",0x6B7B],
- ["BCDF",0x6B7C],
- ["9A79",0x6B7D],
- ["9A7A",0x6B7E],
- ["9A7B",0x6B7F],
- ["9A7C",0x6B80],
- ["E9E2",0x6B81],
- ["E9E3",0x6B82],
- ["D1EA",0x6B83],
- ["E9E5",0x6B84],
- ["9A7D",0x6B85],
- ["B4F9",0x6B86],
- ["E9E4",0x6B87],
- ["9A7E",0x6B88],
- ["D1B3",0x6B89],
- ["CAE2",0x6B8A],
- ["B2D0",0x6B8B],
- ["9A80",0x6B8C],
- ["E9E8",0x6B8D],
- ["9A81",0x6B8E],
- ["9A82",0x6B8F],
- ["9A83",0x6B90],
- ["9A84",0x6B91],
- ["E9E6",0x6B92],
- ["E9E7",0x6B93],
- ["9A85",0x6B94],
- ["9A86",0x6B95],
- ["D6B3",0x6B96],
- ["9A87",0x6B97],
- ["9A88",0x6B98],
- ["9A89",0x6B99],
- ["E9E9",0x6B9A],
- ["E9EA",0x6B9B],
- ["9A8A",0x6B9C],
- ["9A8B",0x6B9D],
- ["9A8C",0x6B9E],
- ["9A8D",0x6B9F],
- ["9A8E",0x6BA0],
- ["E9EB",0x6BA1],
- ["9A8F",0x6BA2],
- ["9A90",0x6BA3],
- ["9A91",0x6BA4],
- ["9A92",0x6BA5],
- ["9A93",0x6BA6],
- ["9A94",0x6BA7],
- ["9A95",0x6BA8],
- ["9A96",0x6BA9],
- ["E9EC",0x6BAA],
- ["9A97",0x6BAB],
- ["9A98",0x6BAC],
- ["9A99",0x6BAD],
- ["9A9A",0x6BAE],
- ["9A9B",0x6BAF],
- ["9A9C",0x6BB0],
- ["9A9D",0x6BB1],
- ["9A9E",0x6BB2],
- ["ECAF",0x6BB3],
- ["C5B9",0x6BB4],
- ["B6CE",0x6BB5],
- ["9A9F",0x6BB6],
- ["D2F3",0x6BB7],
- ["9AA0",0x6BB8],
- ["9AA1",0x6BB9],
- ["9AA2",0x6BBA],
- ["9AA3",0x6BBB],
- ["9AA4",0x6BBC],
- ["9AA5",0x6BBD],
- ["9AA6",0x6BBE],
- ["B5EE",0x6BBF],
- ["9AA7",0x6BC0],
- ["BBD9",0x6BC1],
- ["ECB1",0x6BC2],
- ["9AA8",0x6BC3],
- ["9AA9",0x6BC4],
- ["D2E3",0x6BC5],
- ["9AAA",0x6BC6],
- ["9AAB",0x6BC7],
- ["9AAC",0x6BC8],
- ["9AAD",0x6BC9],
- ["9AAE",0x6BCA],
- ["CEE3",0x6BCB],
- ["9AAF",0x6BCC],
- ["C4B8",0x6BCD],
- ["9AB0",0x6BCE],
- ["C3BF",0x6BCF],
- ["9AB1",0x6BD0],
- ["9AB2",0x6BD1],
- ["B6BE",0x6BD2],
- ["D8B9",0x6BD3],
- ["B1C8",0x6BD4],
- ["B1CF",0x6BD5],
- ["B1D1",0x6BD6],
- ["C5FE",0x6BD7],
- ["9AB3",0x6BD8],
- ["B1D0",0x6BD9],
- ["9AB4",0x6BDA],
- ["C3AB",0x6BDB],
- ["9AB5",0x6BDC],
- ["9AB6",0x6BDD],
- ["9AB7",0x6BDE],
- ["9AB8",0x6BDF],
- ["9AB9",0x6BE0],
- ["D5B1",0x6BE1],
- ["9ABA",0x6BE2],
- ["9ABB",0x6BE3],
- ["9ABC",0x6BE4],
- ["9ABD",0x6BE5],
- ["9ABE",0x6BE6],
- ["9ABF",0x6BE7],
- ["9AC0",0x6BE8],
- ["9AC1",0x6BE9],
- ["EBA4",0x6BEA],
- ["BAC1",0x6BEB],
- ["9AC2",0x6BEC],
- ["9AC3",0x6BED],
- ["9AC4",0x6BEE],
- ["CCBA",0x6BEF],
- ["9AC5",0x6BF0],
- ["9AC6",0x6BF1],
- ["9AC7",0x6BF2],
- ["EBA5",0x6BF3],
- ["9AC8",0x6BF4],
- ["EBA7",0x6BF5],
- ["9AC9",0x6BF6],
- ["9ACA",0x6BF7],
- ["9ACB",0x6BF8],
- ["EBA8",0x6BF9],
- ["9ACC",0x6BFA],
- ["9ACD",0x6BFB],
- ["9ACE",0x6BFC],
- ["EBA6",0x6BFD],
- ["9ACF",0x6BFE],
- ["9AD0",0x6BFF],
- ["9AD1",0x6C00],
- ["9AD2",0x6C01],
- ["9AD3",0x6C02],
- ["9AD4",0x6C03],
- ["9AD5",0x6C04],
- ["EBA9",0x6C05],
- ["EBAB",0x6C06],
- ["EBAA",0x6C07],
- ["9AD6",0x6C08],
- ["9AD7",0x6C09],
- ["9AD8",0x6C0A],
- ["9AD9",0x6C0B],
- ["9ADA",0x6C0C],
- ["EBAC",0x6C0D],
- ["9ADB",0x6C0E],
- ["CACF",0x6C0F],
- ["D8B5",0x6C10],
- ["C3F1",0x6C11],
- ["9ADC",0x6C12],
- ["C3A5",0x6C13],
- ["C6F8",0x6C14],
- ["EBAD",0x6C15],
- ["C4CA",0x6C16],
- ["9ADD",0x6C17],
- ["EBAE",0x6C18],
- ["EBAF",0x6C19],
- ["EBB0",0x6C1A],
- ["B7D5",0x6C1B],
- ["9ADE",0x6C1C],
- ["9ADF",0x6C1D],
- ["9AE0",0x6C1E],
- ["B7FA",0x6C1F],
- ["9AE1",0x6C20],
- ["EBB1",0x6C21],
- ["C7E2",0x6C22],
- ["9AE2",0x6C23],
- ["EBB3",0x6C24],
- ["9AE3",0x6C25],
- ["BAA4",0x6C26],
- ["D1F5",0x6C27],
- ["B0B1",0x6C28],
- ["EBB2",0x6C29],
- ["EBB4",0x6C2A],
- ["9AE4",0x6C2B],
- ["9AE5",0x6C2C],
- ["9AE6",0x6C2D],
- ["B5AA",0x6C2E],
- ["C2C8",0x6C2F],
- ["C7E8",0x6C30],
- ["9AE7",0x6C31],
- ["EBB5",0x6C32],
- ["9AE8",0x6C33],
- ["CBAE",0x6C34],
- ["E3DF",0x6C35],
- ["9AE9",0x6C36],
- ["9AEA",0x6C37],
- ["D3C0",0x6C38],
- ["9AEB",0x6C39],
- ["9AEC",0x6C3A],
- ["9AED",0x6C3B],
- ["9AEE",0x6C3C],
- ["D9DB",0x6C3D],
- ["9AEF",0x6C3E],
- ["9AF0",0x6C3F],
- ["CDA1",0x6C40],
- ["D6AD",0x6C41],
- ["C7F3",0x6C42],
- ["9AF1",0x6C43],
- ["9AF2",0x6C44],
- ["9AF3",0x6C45],
- ["D9E0",0x6C46],
- ["BBE3",0x6C47],
- ["9AF4",0x6C48],
- ["BABA",0x6C49],
- ["E3E2",0x6C4A],
- ["9AF5",0x6C4B],
- ["9AF6",0x6C4C],
- ["9AF7",0x6C4D],
- ["9AF8",0x6C4E],
- ["9AF9",0x6C4F],
- ["CFAB",0x6C50],
- ["9AFA",0x6C51],
- ["9AFB",0x6C52],
- ["9AFC",0x6C53],
- ["E3E0",0x6C54],
- ["C9C7",0x6C55],
- ["9AFD",0x6C56],
- ["BAB9",0x6C57],
- ["9AFE",0x6C58],
- ["9B40",0x6C59],
- ["9B41",0x6C5A],
- ["D1B4",0x6C5B],
- ["E3E1",0x6C5C],
- ["C8EA",0x6C5D],
- ["B9AF",0x6C5E],
- ["BDAD",0x6C5F],
- ["B3D8",0x6C60],
- ["CEDB",0x6C61],
- ["9B42",0x6C62],
- ["9B43",0x6C63],
- ["CCC0",0x6C64],
- ["9B44",0x6C65],
- ["9B45",0x6C66],
- ["9B46",0x6C67],
- ["E3E8",0x6C68],
- ["E3E9",0x6C69],
- ["CDF4",0x6C6A],
- ["9B47",0x6C6B],
- ["9B48",0x6C6C],
- ["9B49",0x6C6D],
- ["9B4A",0x6C6E],
- ["9B4B",0x6C6F],
- ["CCAD",0x6C70],
- ["9B4C",0x6C71],
- ["BCB3",0x6C72],
- ["9B4D",0x6C73],
- ["E3EA",0x6C74],
- ["9B4E",0x6C75],
- ["E3EB",0x6C76],
- ["9B4F",0x6C77],
- ["9B50",0x6C78],
- ["D0DA",0x6C79],
- ["9B51",0x6C7A],
- ["9B52",0x6C7B],
- ["9B53",0x6C7C],
- ["C6FB",0x6C7D],
- ["B7DA",0x6C7E],
- ["9B54",0x6C7F],
- ["9B55",0x6C80],
- ["C7DF",0x6C81],
- ["D2CA",0x6C82],
- ["CED6",0x6C83],
- ["9B56",0x6C84],
- ["E3E4",0x6C85],
- ["E3EC",0x6C86],
- ["9B57",0x6C87],
- ["C9F2",0x6C88],
- ["B3C1",0x6C89],
- ["9B58",0x6C8A],
- ["9B59",0x6C8B],
- ["E3E7",0x6C8C],
- ["9B5A",0x6C8D],
- ["9B5B",0x6C8E],
- ["C6E3",0x6C8F],
- ["E3E5",0x6C90],
- ["9B5C",0x6C91],
- ["9B5D",0x6C92],
- ["EDB3",0x6C93],
- ["E3E6",0x6C94],
- ["9B5E",0x6C95],
- ["9B5F",0x6C96],
- ["9B60",0x6C97],
- ["9B61",0x6C98],
- ["C9B3",0x6C99],
- ["9B62",0x6C9A],
- ["C5E6",0x6C9B],
- ["9B63",0x6C9C],
- ["9B64",0x6C9D],
- ["9B65",0x6C9E],
- ["B9B5",0x6C9F],
- ["9B66",0x6CA0],
- ["C3BB",0x6CA1],
- ["9B67",0x6CA2],
- ["E3E3",0x6CA3],
- ["C5BD",0x6CA4],
- ["C1A4",0x6CA5],
- ["C2D9",0x6CA6],
- ["B2D7",0x6CA7],
- ["9B68",0x6CA8],
- ["E3ED",0x6CA9],
- ["BBA6",0x6CAA],
- ["C4AD",0x6CAB],
- ["9B69",0x6CAC],
- ["E3F0",0x6CAD],
- ["BEDA",0x6CAE],
- ["9B6A",0x6CAF],
- ["9B6B",0x6CB0],
- ["E3FB",0x6CB1],
- ["E3F5",0x6CB2],
- ["BAD3",0x6CB3],
- ["9B6C",0x6CB4],
- ["9B6D",0x6CB5],
- ["9B6E",0x6CB6],
- ["9B6F",0x6CB7],
- ["B7D0",0x6CB8],
- ["D3CD",0x6CB9],
- ["9B70",0x6CBA],
- ["D6CE",0x6CBB],
- ["D5D3",0x6CBC],
- ["B9C1",0x6CBD],
- ["D5B4",0x6CBE],
- ["D1D8",0x6CBF],
- ["9B71",0x6CC0],
- ["9B72",0x6CC1],
- ["9B73",0x6CC2],
- ["9B74",0x6CC3],
- ["D0B9",0x6CC4],
- ["C7F6",0x6CC5],
- ["9B75",0x6CC6],
- ["9B76",0x6CC7],
- ["9B77",0x6CC8],
- ["C8AA",0x6CC9],
- ["B2B4",0x6CCA],
- ["9B78",0x6CCB],
- ["C3DA",0x6CCC],
- ["9B79",0x6CCD],
- ["9B7A",0x6CCE],
- ["9B7B",0x6CCF],
- ["E3EE",0x6CD0],
- ["9B7C",0x6CD1],
- ["9B7D",0x6CD2],
- ["E3FC",0x6CD3],
- ["E3EF",0x6CD4],
- ["B7A8",0x6CD5],
- ["E3F7",0x6CD6],
- ["E3F4",0x6CD7],
- ["9B7E",0x6CD8],
- ["9B80",0x6CD9],
- ["9B81",0x6CDA],
- ["B7BA",0x6CDB],
- ["9B82",0x6CDC],
- ["9B83",0x6CDD],
- ["C5A2",0x6CDE],
- ["9B84",0x6CDF],
- ["E3F6",0x6CE0],
- ["C5DD",0x6CE1],
- ["B2A8",0x6CE2],
- ["C6FC",0x6CE3],
- ["9B85",0x6CE4],
- ["C4E0",0x6CE5],
- ["9B86",0x6CE6],
- ["9B87",0x6CE7],
- ["D7A2",0x6CE8],
- ["9B88",0x6CE9],
- ["C0E1",0x6CEA],
- ["E3F9",0x6CEB],
- ["9B89",0x6CEC],
- ["9B8A",0x6CED],
- ["E3FA",0x6CEE],
- ["E3FD",0x6CEF],
- ["CCA9",0x6CF0],
- ["E3F3",0x6CF1],
- ["9B8B",0x6CF2],
- ["D3BE",0x6CF3],
- ["9B8C",0x6CF4],
- ["B1C3",0x6CF5],
- ["EDB4",0x6CF6],
- ["E3F1",0x6CF7],
- ["E3F2",0x6CF8],
- ["9B8D",0x6CF9],
- ["E3F8",0x6CFA],
- ["D0BA",0x6CFB],
- ["C6C3",0x6CFC],
- ["D4F3",0x6CFD],
- ["E3FE",0x6CFE],
- ["9B8E",0x6CFF],
- ["9B8F",0x6D00],
- ["BDE0",0x6D01],
- ["9B90",0x6D02],
- ["9B91",0x6D03],
- ["E4A7",0x6D04],
- ["9B92",0x6D05],
- ["9B93",0x6D06],
- ["E4A6",0x6D07],
- ["9B94",0x6D08],
- ["9B95",0x6D09],
- ["9B96",0x6D0A],
- ["D1F3",0x6D0B],
- ["E4A3",0x6D0C],
- ["9B97",0x6D0D],
- ["E4A9",0x6D0E],
- ["9B98",0x6D0F],
- ["9B99",0x6D10],
- ["9B9A",0x6D11],
- ["C8F7",0x6D12],
- ["9B9B",0x6D13],
- ["9B9C",0x6D14],
- ["9B9D",0x6D15],
- ["9B9E",0x6D16],
- ["CFB4",0x6D17],
- ["9B9F",0x6D18],
- ["E4A8",0x6D19],
- ["E4AE",0x6D1A],
- ["C2E5",0x6D1B],
- ["9BA0",0x6D1C],
- ["9BA1",0x6D1D],
- ["B6B4",0x6D1E],
- ["9BA2",0x6D1F],
- ["9BA3",0x6D20],
- ["9BA4",0x6D21],
- ["9BA5",0x6D22],
- ["9BA6",0x6D23],
- ["9BA7",0x6D24],
- ["BDF2",0x6D25],
- ["9BA8",0x6D26],
- ["E4A2",0x6D27],
- ["9BA9",0x6D28],
- ["9BAA",0x6D29],
- ["BAE9",0x6D2A],
- ["E4AA",0x6D2B],
- ["9BAB",0x6D2C],
- ["9BAC",0x6D2D],
- ["E4AC",0x6D2E],
- ["9BAD",0x6D2F],
- ["9BAE",0x6D30],
- ["B6FD",0x6D31],
- ["D6DE",0x6D32],
- ["E4B2",0x6D33],
- ["9BAF",0x6D34],
- ["E4AD",0x6D35],
- ["9BB0",0x6D36],
- ["9BB1",0x6D37],
- ["9BB2",0x6D38],
- ["E4A1",0x6D39],
- ["9BB3",0x6D3A],
- ["BBEE",0x6D3B],
- ["CDDD",0x6D3C],
- ["C7A2",0x6D3D],
- ["C5C9",0x6D3E],
- ["9BB4",0x6D3F],
- ["9BB5",0x6D40],
- ["C1F7",0x6D41],
- ["9BB6",0x6D42],
- ["E4A4",0x6D43],
- ["9BB7",0x6D44],
- ["C7B3",0x6D45],
- ["BDAC",0x6D46],
- ["BDBD",0x6D47],
- ["E4A5",0x6D48],
- ["9BB8",0x6D49],
- ["D7C7",0x6D4A],
- ["B2E2",0x6D4B],
- ["9BB9",0x6D4C],
- ["E4AB",0x6D4D],
- ["BCC3",0x6D4E],
- ["E4AF",0x6D4F],
- ["9BBA",0x6D50],
- ["BBEB",0x6D51],
- ["E4B0",0x6D52],
- ["C5A8",0x6D53],
- ["E4B1",0x6D54],
- ["9BBB",0x6D55],
- ["9BBC",0x6D56],
- ["9BBD",0x6D57],
- ["9BBE",0x6D58],
- ["D5E3",0x6D59],
- ["BFA3",0x6D5A],
- ["9BBF",0x6D5B],
- ["E4BA",0x6D5C],
- ["9BC0",0x6D5D],
- ["E4B7",0x6D5E],
- ["9BC1",0x6D5F],
- ["E4BB",0x6D60],
- ["9BC2",0x6D61],
- ["9BC3",0x6D62],
- ["E4BD",0x6D63],
- ["9BC4",0x6D64],
- ["9BC5",0x6D65],
- ["C6D6",0x6D66],
- ["9BC6",0x6D67],
- ["9BC7",0x6D68],
- ["BAC6",0x6D69],
- ["C0CB",0x6D6A],
- ["9BC8",0x6D6B],
- ["9BC9",0x6D6C],
- ["9BCA",0x6D6D],
- ["B8A1",0x6D6E],
- ["E4B4",0x6D6F],
- ["9BCB",0x6D70],
- ["9BCC",0x6D71],
- ["9BCD",0x6D72],
- ["9BCE",0x6D73],
- ["D4A1",0x6D74],
- ["9BCF",0x6D75],
- ["9BD0",0x6D76],
- ["BAA3",0x6D77],
- ["BDFE",0x6D78],
- ["9BD1",0x6D79],
- ["9BD2",0x6D7A],
- ["9BD3",0x6D7B],
- ["E4BC",0x6D7C],
- ["9BD4",0x6D7D],
- ["9BD5",0x6D7E],
- ["9BD6",0x6D7F],
- ["9BD7",0x6D80],
- ["9BD8",0x6D81],
- ["CDBF",0x6D82],
- ["9BD9",0x6D83],
- ["9BDA",0x6D84],
- ["C4F9",0x6D85],
- ["9BDB",0x6D86],
- ["9BDC",0x6D87],
- ["CFFB",0x6D88],
- ["C9E6",0x6D89],
- ["9BDD",0x6D8A],
- ["9BDE",0x6D8B],
- ["D3BF",0x6D8C],
- ["9BDF",0x6D8D],
- ["CFD1",0x6D8E],
- ["9BE0",0x6D8F],
- ["9BE1",0x6D90],
- ["E4B3",0x6D91],
- ["9BE2",0x6D92],
- ["E4B8",0x6D93],
- ["E4B9",0x6D94],
- ["CCE9",0x6D95],
- ["9BE3",0x6D96],
- ["9BE4",0x6D97],
- ["9BE5",0x6D98],
- ["9BE6",0x6D99],
- ["9BE7",0x6D9A],
- ["CCCE",0x6D9B],
- ["9BE8",0x6D9C],
- ["C0D4",0x6D9D],
- ["E4B5",0x6D9E],
- ["C1B0",0x6D9F],
- ["E4B6",0x6DA0],
- ["CED0",0x6DA1],
- ["9BE9",0x6DA2],
- ["BBC1",0x6DA3],
- ["B5D3",0x6DA4],
- ["9BEA",0x6DA5],
- ["C8F3",0x6DA6],
- ["BDA7",0x6DA7],
- ["D5C7",0x6DA8],
- ["C9AC",0x6DA9],
- ["B8A2",0x6DAA],
- ["E4CA",0x6DAB],
- ["9BEB",0x6DAC],
- ["9BEC",0x6DAD],
- ["E4CC",0x6DAE],
- ["D1C4",0x6DAF],
- ["9BED",0x6DB0],
- ["9BEE",0x6DB1],
- ["D2BA",0x6DB2],
- ["9BEF",0x6DB3],
- ["9BF0",0x6DB4],
- ["BAAD",0x6DB5],
- ["9BF1",0x6DB6],
- ["9BF2",0x6DB7],
- ["BAD4",0x6DB8],
- ["9BF3",0x6DB9],
- ["9BF4",0x6DBA],
- ["9BF5",0x6DBB],
- ["9BF6",0x6DBC],
- ["9BF7",0x6DBD],
- ["9BF8",0x6DBE],
- ["E4C3",0x6DBF],
- ["B5ED",0x6DC0],
- ["9BF9",0x6DC1],
- ["9BFA",0x6DC2],
- ["9BFB",0x6DC3],
- ["D7CD",0x6DC4],
- ["E4C0",0x6DC5],
- ["CFFD",0x6DC6],
- ["E4BF",0x6DC7],
- ["9BFC",0x6DC8],
- ["9BFD",0x6DC9],
- ["9BFE",0x6DCA],
- ["C1DC",0x6DCB],
- ["CCCA",0x6DCC],
- ["9C40",0x6DCD],
- ["9C41",0x6DCE],
- ["9C42",0x6DCF],
- ["9C43",0x6DD0],
- ["CAE7",0x6DD1],
- ["9C44",0x6DD2],
- ["9C45",0x6DD3],
- ["9C46",0x6DD4],
- ["9C47",0x6DD5],
- ["C4D7",0x6DD6],
- ["9C48",0x6DD7],
- ["CCD4",0x6DD8],
- ["E4C8",0x6DD9],
- ["9C49",0x6DDA],
- ["9C4A",0x6DDB],
- ["9C4B",0x6DDC],
- ["E4C7",0x6DDD],
- ["E4C1",0x6DDE],
- ["9C4C",0x6DDF],
- ["E4C4",0x6DE0],
- ["B5AD",0x6DE1],
- ["9C4D",0x6DE2],
- ["9C4E",0x6DE3],
- ["D3D9",0x6DE4],
- ["9C4F",0x6DE5],
- ["E4C6",0x6DE6],
- ["9C50",0x6DE7],
- ["9C51",0x6DE8],
- ["9C52",0x6DE9],
- ["9C53",0x6DEA],
- ["D2F9",0x6DEB],
- ["B4E3",0x6DEC],
- ["9C54",0x6DED],
- ["BBB4",0x6DEE],
- ["9C55",0x6DEF],
- ["9C56",0x6DF0],
- ["C9EE",0x6DF1],
- ["9C57",0x6DF2],
- ["B4BE",0x6DF3],
- ["9C58",0x6DF4],
- ["9C59",0x6DF5],
- ["9C5A",0x6DF6],
- ["BBEC",0x6DF7],
- ["9C5B",0x6DF8],
- ["D1CD",0x6DF9],
- ["9C5C",0x6DFA],
- ["CCED",0x6DFB],
- ["EDB5",0x6DFC],
- ["9C5D",0x6DFD],
- ["9C5E",0x6DFE],
- ["9C5F",0x6DFF],
- ["9C60",0x6E00],
- ["9C61",0x6E01],
- ["9C62",0x6E02],
- ["9C63",0x6E03],
- ["9C64",0x6E04],
- ["C7E5",0x6E05],
- ["9C65",0x6E06],
- ["9C66",0x6E07],
- ["9C67",0x6E08],
- ["9C68",0x6E09],
- ["D4A8",0x6E0A],
- ["9C69",0x6E0B],
- ["E4CB",0x6E0C],
- ["D7D5",0x6E0D],
- ["E4C2",0x6E0E],
- ["9C6A",0x6E0F],
- ["BDA5",0x6E10],
- ["E4C5",0x6E11],
- ["9C6B",0x6E12],
- ["9C6C",0x6E13],
- ["D3E6",0x6E14],
- ["9C6D",0x6E15],
- ["E4C9",0x6E16],
- ["C9F8",0x6E17],
- ["9C6E",0x6E18],
- ["9C6F",0x6E19],
- ["E4BE",0x6E1A],
- ["9C70",0x6E1B],
- ["9C71",0x6E1C],
- ["D3E5",0x6E1D],
- ["9C72",0x6E1E],
- ["9C73",0x6E1F],
- ["C7FE",0x6E20],
- ["B6C9",0x6E21],
- ["9C74",0x6E22],
- ["D4FC",0x6E23],
- ["B2B3",0x6E24],
- ["E4D7",0x6E25],
- ["9C75",0x6E26],
- ["9C76",0x6E27],
- ["9C77",0x6E28],
- ["CEC2",0x6E29],
- ["9C78",0x6E2A],
- ["E4CD",0x6E2B],
- ["9C79",0x6E2C],
- ["CEBC",0x6E2D],
- ["9C7A",0x6E2E],
- ["B8DB",0x6E2F],
- ["9C7B",0x6E30],
- ["9C7C",0x6E31],
- ["E4D6",0x6E32],
- ["9C7D",0x6E33],
- ["BFCA",0x6E34],
- ["9C7E",0x6E35],
- ["9C80",0x6E36],
- ["9C81",0x6E37],
- ["D3CE",0x6E38],
- ["9C82",0x6E39],
- ["C3EC",0x6E3A],
- ["9C83",0x6E3B],
- ["9C84",0x6E3C],
- ["9C85",0x6E3D],
- ["9C86",0x6E3E],
- ["9C87",0x6E3F],
- ["9C88",0x6E40],
- ["9C89",0x6E41],
- ["9C8A",0x6E42],
- ["C5C8",0x6E43],
- ["E4D8",0x6E44],
- ["9C8B",0x6E45],
- ["9C8C",0x6E46],
- ["9C8D",0x6E47],
- ["9C8E",0x6E48],
- ["9C8F",0x6E49],
- ["9C90",0x6E4A],
- ["9C91",0x6E4B],
- ["9C92",0x6E4C],
- ["CDC4",0x6E4D],
- ["E4CF",0x6E4E],
- ["9C93",0x6E4F],
- ["9C94",0x6E50],
- ["9C95",0x6E51],
- ["9C96",0x6E52],
- ["E4D4",0x6E53],
- ["E4D5",0x6E54],
- ["9C97",0x6E55],
- ["BAFE",0x6E56],
- ["9C98",0x6E57],
- ["CFE6",0x6E58],
- ["9C99",0x6E59],
- ["9C9A",0x6E5A],
- ["D5BF",0x6E5B],
- ["9C9B",0x6E5C],
- ["9C9C",0x6E5D],
- ["9C9D",0x6E5E],
- ["E4D2",0x6E5F],
- ["9C9E",0x6E60],
- ["9C9F",0x6E61],
- ["9CA0",0x6E62],
- ["9CA1",0x6E63],
- ["9CA2",0x6E64],
- ["9CA3",0x6E65],
- ["9CA4",0x6E66],
- ["9CA5",0x6E67],
- ["9CA6",0x6E68],
- ["9CA7",0x6E69],
- ["9CA8",0x6E6A],
- ["E4D0",0x6E6B],
- ["9CA9",0x6E6C],
- ["9CAA",0x6E6D],
- ["E4CE",0x6E6E],
- ["9CAB",0x6E6F],
- ["9CAC",0x6E70],
- ["9CAD",0x6E71],
- ["9CAE",0x6E72],
- ["9CAF",0x6E73],
- ["9CB0",0x6E74],
- ["9CB1",0x6E75],
- ["9CB2",0x6E76],
- ["9CB3",0x6E77],
- ["9CB4",0x6E78],
- ["9CB5",0x6E79],
- ["9CB6",0x6E7A],
- ["9CB7",0x6E7B],
- ["9CB8",0x6E7C],
- ["9CB9",0x6E7D],
- ["CDE5",0x6E7E],
- ["CAAA",0x6E7F],
- ["9CBA",0x6E80],
- ["9CBB",0x6E81],
- ["9CBC",0x6E82],
- ["C0A3",0x6E83],
- ["9CBD",0x6E84],
- ["BDA6",0x6E85],
- ["E4D3",0x6E86],
- ["9CBE",0x6E87],
- ["9CBF",0x6E88],
- ["B8C8",0x6E89],
- ["9CC0",0x6E8A],
- ["9CC1",0x6E8B],
- ["9CC2",0x6E8C],
- ["9CC3",0x6E8D],
- ["9CC4",0x6E8E],
- ["E4E7",0x6E8F],
- ["D4B4",0x6E90],
- ["9CC5",0x6E91],
- ["9CC6",0x6E92],
- ["9CC7",0x6E93],
- ["9CC8",0x6E94],
- ["9CC9",0x6E95],
- ["9CCA",0x6E96],
- ["9CCB",0x6E97],
- ["E4DB",0x6E98],
- ["9CCC",0x6E99],
- ["9CCD",0x6E9A],
- ["9CCE",0x6E9B],
- ["C1EF",0x6E9C],
- ["9CCF",0x6E9D],
- ["9CD0",0x6E9E],
- ["E4E9",0x6E9F],
- ["9CD1",0x6EA0],
- ["9CD2",0x6EA1],
- ["D2E7",0x6EA2],
- ["9CD3",0x6EA3],
- ["9CD4",0x6EA4],
- ["E4DF",0x6EA5],
- ["9CD5",0x6EA6],
- ["E4E0",0x6EA7],
- ["9CD6",0x6EA8],
- ["9CD7",0x6EA9],
- ["CFAA",0x6EAA],
- ["9CD8",0x6EAB],
- ["9CD9",0x6EAC],
- ["9CDA",0x6EAD],
- ["9CDB",0x6EAE],
- ["CBDD",0x6EAF],
- ["9CDC",0x6EB0],
- ["E4DA",0x6EB1],
- ["E4D1",0x6EB2],
- ["9CDD",0x6EB3],
- ["E4E5",0x6EB4],
- ["9CDE",0x6EB5],
- ["C8DC",0x6EB6],
- ["E4E3",0x6EB7],
- ["9CDF",0x6EB8],
- ["9CE0",0x6EB9],
- ["C4E7",0x6EBA],
- ["E4E2",0x6EBB],
- ["9CE1",0x6EBC],
- ["E4E1",0x6EBD],
- ["9CE2",0x6EBE],
- ["9CE3",0x6EBF],
- ["9CE4",0x6EC0],
- ["B3FC",0x6EC1],
- ["E4E8",0x6EC2],
- ["9CE5",0x6EC3],
- ["9CE6",0x6EC4],
- ["9CE7",0x6EC5],
- ["9CE8",0x6EC6],
- ["B5E1",0x6EC7],
- ["9CE9",0x6EC8],
- ["9CEA",0x6EC9],
- ["9CEB",0x6ECA],
- ["D7CC",0x6ECB],
- ["9CEC",0x6ECC],
- ["9CED",0x6ECD],
- ["9CEE",0x6ECE],
- ["E4E6",0x6ECF],
- ["9CEF",0x6ED0],
- ["BBAC",0x6ED1],
- ["9CF0",0x6ED2],
- ["D7D2",0x6ED3],
- ["CCCF",0x6ED4],
- ["EBF8",0x6ED5],
- ["9CF1",0x6ED6],
- ["E4E4",0x6ED7],
- ["9CF2",0x6ED8],
- ["9CF3",0x6ED9],
- ["B9F6",0x6EDA],
- ["9CF4",0x6EDB],
- ["9CF5",0x6EDC],
- ["9CF6",0x6EDD],
- ["D6CD",0x6EDE],
- ["E4D9",0x6EDF],
- ["E4DC",0x6EE0],
- ["C2FA",0x6EE1],
- ["E4DE",0x6EE2],
- ["9CF7",0x6EE3],
- ["C2CB",0x6EE4],
- ["C0C4",0x6EE5],
- ["C2D0",0x6EE6],
- ["9CF8",0x6EE7],
- ["B1F5",0x6EE8],
- ["CCB2",0x6EE9],
- ["9CF9",0x6EEA],
- ["9CFA",0x6EEB],
- ["9CFB",0x6EEC],
- ["9CFC",0x6EED],
- ["9CFD",0x6EEE],
- ["9CFE",0x6EEF],
- ["9D40",0x6EF0],
- ["9D41",0x6EF1],
- ["9D42",0x6EF2],
- ["9D43",0x6EF3],
- ["B5CE",0x6EF4],
- ["9D44",0x6EF5],
- ["9D45",0x6EF6],
- ["9D46",0x6EF7],
- ["9D47",0x6EF8],
- ["E4EF",0x6EF9],
- ["9D48",0x6EFA],
- ["9D49",0x6EFB],
- ["9D4A",0x6EFC],
- ["9D4B",0x6EFD],
- ["9D4C",0x6EFE],
- ["9D4D",0x6EFF],
- ["9D4E",0x6F00],
- ["9D4F",0x6F01],
- ["C6AF",0x6F02],
- ["9D50",0x6F03],
- ["9D51",0x6F04],
- ["9D52",0x6F05],
- ["C6E1",0x6F06],
- ["9D53",0x6F07],
- ["9D54",0x6F08],
- ["E4F5",0x6F09],
- ["9D55",0x6F0A],
- ["9D56",0x6F0B],
- ["9D57",0x6F0C],
- ["9D58",0x6F0D],
- ["9D59",0x6F0E],
- ["C2A9",0x6F0F],
- ["9D5A",0x6F10],
- ["9D5B",0x6F11],
- ["9D5C",0x6F12],
- ["C0EC",0x6F13],
- ["D1DD",0x6F14],
- ["E4EE",0x6F15],
- ["9D5D",0x6F16],
- ["9D5E",0x6F17],
- ["9D5F",0x6F18],
- ["9D60",0x6F19],
- ["9D61",0x6F1A],
- ["9D62",0x6F1B],
- ["9D63",0x6F1C],
- ["9D64",0x6F1D],
- ["9D65",0x6F1E],
- ["9D66",0x6F1F],
- ["C4AE",0x6F20],
- ["9D67",0x6F21],
- ["9D68",0x6F22],
- ["9D69",0x6F23],
- ["E4ED",0x6F24],
- ["9D6A",0x6F25],
- ["9D6B",0x6F26],
- ["9D6C",0x6F27],
- ["9D6D",0x6F28],
- ["E4F6",0x6F29],
- ["E4F4",0x6F2A],
- ["C2FE",0x6F2B],
- ["9D6E",0x6F2C],
- ["E4DD",0x6F2D],
- ["9D6F",0x6F2E],
- ["E4F0",0x6F2F],
- ["9D70",0x6F30],
- ["CAFE",0x6F31],
- ["9D71",0x6F32],
- ["D5C4",0x6F33],
- ["9D72",0x6F34],
- ["9D73",0x6F35],
- ["E4F1",0x6F36],
- ["9D74",0x6F37],
- ["9D75",0x6F38],
- ["9D76",0x6F39],
- ["9D77",0x6F3A],
- ["9D78",0x6F3B],
- ["9D79",0x6F3C],
- ["9D7A",0x6F3D],
- ["D1FA",0x6F3E],
- ["9D7B",0x6F3F],
- ["9D7C",0x6F40],
- ["9D7D",0x6F41],
- ["9D7E",0x6F42],
- ["9D80",0x6F43],
- ["9D81",0x6F44],
- ["9D82",0x6F45],
- ["E4EB",0x6F46],
- ["E4EC",0x6F47],
- ["9D83",0x6F48],
- ["9D84",0x6F49],
- ["9D85",0x6F4A],
- ["E4F2",0x6F4B],
- ["9D86",0x6F4C],
- ["CEAB",0x6F4D],
- ["9D87",0x6F4E],
- ["9D88",0x6F4F],
- ["9D89",0x6F50],
- ["9D8A",0x6F51],
- ["9D8B",0x6F52],
- ["9D8C",0x6F53],
- ["9D8D",0x6F54],
- ["9D8E",0x6F55],
- ["9D8F",0x6F56],
- ["9D90",0x6F57],
- ["C5CB",0x6F58],
- ["9D91",0x6F59],
- ["9D92",0x6F5A],
- ["9D93",0x6F5B],
- ["C7B1",0x6F5C],
- ["9D94",0x6F5D],
- ["C2BA",0x6F5E],
- ["9D95",0x6F5F],
- ["9D96",0x6F60],
- ["9D97",0x6F61],
- ["E4EA",0x6F62],
- ["9D98",0x6F63],
- ["9D99",0x6F64],
- ["9D9A",0x6F65],
- ["C1CA",0x6F66],
- ["9D9B",0x6F67],
- ["9D9C",0x6F68],
- ["9D9D",0x6F69],
- ["9D9E",0x6F6A],
- ["9D9F",0x6F6B],
- ["9DA0",0x6F6C],
- ["CCB6",0x6F6D],
- ["B3B1",0x6F6E],
- ["9DA1",0x6F6F],
- ["9DA2",0x6F70],
- ["9DA3",0x6F71],
- ["E4FB",0x6F72],
- ["9DA4",0x6F73],
- ["E4F3",0x6F74],
- ["9DA5",0x6F75],
- ["9DA6",0x6F76],
- ["9DA7",0x6F77],
- ["E4FA",0x6F78],
- ["9DA8",0x6F79],
- ["E4FD",0x6F7A],
- ["9DA9",0x6F7B],
- ["E4FC",0x6F7C],
- ["9DAA",0x6F7D],
- ["9DAB",0x6F7E],
- ["9DAC",0x6F7F],
- ["9DAD",0x6F80],
- ["9DAE",0x6F81],
- ["9DAF",0x6F82],
- ["9DB0",0x6F83],
- ["B3CE",0x6F84],
- ["9DB1",0x6F85],
- ["9DB2",0x6F86],
- ["9DB3",0x6F87],
- ["B3BA",0x6F88],
- ["E4F7",0x6F89],
- ["9DB4",0x6F8A],
- ["9DB5",0x6F8B],
- ["E4F9",0x6F8C],
- ["E4F8",0x6F8D],
- ["C5EC",0x6F8E],
- ["9DB6",0x6F8F],
- ["9DB7",0x6F90],
- ["9DB8",0x6F91],
- ["9DB9",0x6F92],
- ["9DBA",0x6F93],
- ["9DBB",0x6F94],
- ["9DBC",0x6F95],
- ["9DBD",0x6F96],
- ["9DBE",0x6F97],
- ["9DBF",0x6F98],
- ["9DC0",0x6F99],
- ["9DC1",0x6F9A],
- ["9DC2",0x6F9B],
- ["C0BD",0x6F9C],
- ["9DC3",0x6F9D],
- ["9DC4",0x6F9E],
- ["9DC5",0x6F9F],
- ["9DC6",0x6FA0],
- ["D4E8",0x6FA1],
- ["9DC7",0x6FA2],
- ["9DC8",0x6FA3],
- ["9DC9",0x6FA4],
- ["9DCA",0x6FA5],
- ["9DCB",0x6FA6],
- ["E5A2",0x6FA7],
- ["9DCC",0x6FA8],
- ["9DCD",0x6FA9],
- ["9DCE",0x6FAA],
- ["9DCF",0x6FAB],
- ["9DD0",0x6FAC],
- ["9DD1",0x6FAD],
- ["9DD2",0x6FAE],
- ["9DD3",0x6FAF],
- ["9DD4",0x6FB0],
- ["9DD5",0x6FB1],
- ["9DD6",0x6FB2],
- ["B0C4",0x6FB3],
- ["9DD7",0x6FB4],
- ["9DD8",0x6FB5],
- ["E5A4",0x6FB6],
- ["9DD9",0x6FB7],
- ["9DDA",0x6FB8],
- ["E5A3",0x6FB9],
- ["9DDB",0x6FBA],
- ["9DDC",0x6FBB],
- ["9DDD",0x6FBC],
- ["9DDE",0x6FBD],
- ["9DDF",0x6FBE],
- ["9DE0",0x6FBF],
- ["BCA4",0x6FC0],
- ["9DE1",0x6FC1],
- ["E5A5",0x6FC2],
- ["9DE2",0x6FC3],
- ["9DE3",0x6FC4],
- ["9DE4",0x6FC5],
- ["9DE5",0x6FC6],
- ["9DE6",0x6FC7],
- ["9DE7",0x6FC8],
- ["E5A1",0x6FC9],
- ["9DE8",0x6FCA],
- ["9DE9",0x6FCB],
- ["9DEA",0x6FCC],
- ["9DEB",0x6FCD],
- ["9DEC",0x6FCE],
- ["9DED",0x6FCF],
- ["9DEE",0x6FD0],
- ["E4FE",0x6FD1],
- ["B1F4",0x6FD2],
- ["9DEF",0x6FD3],
- ["9DF0",0x6FD4],
- ["9DF1",0x6FD5],
- ["9DF2",0x6FD6],
- ["9DF3",0x6FD7],
- ["9DF4",0x6FD8],
- ["9DF5",0x6FD9],
- ["9DF6",0x6FDA],
- ["9DF7",0x6FDB],
- ["9DF8",0x6FDC],
- ["9DF9",0x6FDD],
- ["E5A8",0x6FDE],
- ["9DFA",0x6FDF],
- ["E5A9",0x6FE0],
- ["E5A6",0x6FE1],
- ["9DFB",0x6FE2],
- ["9DFC",0x6FE3],
- ["9DFD",0x6FE4],
- ["9DFE",0x6FE5],
- ["9E40",0x6FE6],
- ["9E41",0x6FE7],
- ["9E42",0x6FE8],
- ["9E43",0x6FE9],
- ["9E44",0x6FEA],
- ["9E45",0x6FEB],
- ["9E46",0x6FEC],
- ["9E47",0x6FED],
- ["E5A7",0x6FEE],
- ["E5AA",0x6FEF],
- ["9E48",0x6FF0],
- ["9E49",0x6FF1],
- ["9E4A",0x6FF2],
- ["9E4B",0x6FF3],
- ["9E4C",0x6FF4],
- ["9E4D",0x6FF5],
- ["9E4E",0x6FF6],
- ["9E4F",0x6FF7],
- ["9E50",0x6FF8],
- ["9E51",0x6FF9],
- ["9E52",0x6FFA],
- ["9E53",0x6FFB],
- ["9E54",0x6FFC],
- ["9E55",0x6FFD],
- ["9E56",0x6FFE],
- ["9E57",0x6FFF],
- ["9E58",0x7000],
- ["9E59",0x7001],
- ["9E5A",0x7002],
- ["9E5B",0x7003],
- ["9E5C",0x7004],
- ["9E5D",0x7005],
- ["9E5E",0x7006],
- ["9E5F",0x7007],
- ["9E60",0x7008],
- ["9E61",0x7009],
- ["9E62",0x700A],
- ["9E63",0x700B],
- ["9E64",0x700C],
- ["9E65",0x700D],
- ["9E66",0x700E],
- ["9E67",0x700F],
- ["9E68",0x7010],
- ["C6D9",0x7011],
- ["9E69",0x7012],
- ["9E6A",0x7013],
- ["9E6B",0x7014],
- ["9E6C",0x7015],
- ["9E6D",0x7016],
- ["9E6E",0x7017],
- ["9E6F",0x7018],
- ["9E70",0x7019],
- ["E5AB",0x701A],
- ["E5AD",0x701B],
- ["9E71",0x701C],
- ["9E72",0x701D],
- ["9E73",0x701E],
- ["9E74",0x701F],
- ["9E75",0x7020],
- ["9E76",0x7021],
- ["9E77",0x7022],
- ["E5AC",0x7023],
- ["9E78",0x7024],
- ["9E79",0x7025],
- ["9E7A",0x7026],
- ["9E7B",0x7027],
- ["9E7C",0x7028],
- ["9E7D",0x7029],
- ["9E7E",0x702A],
- ["9E80",0x702B],
- ["9E81",0x702C],
- ["9E82",0x702D],
- ["9E83",0x702E],
- ["9E84",0x702F],
- ["9E85",0x7030],
- ["9E86",0x7031],
- ["9E87",0x7032],
- ["9E88",0x7033],
- ["9E89",0x7034],
- ["E5AF",0x7035],
- ["9E8A",0x7036],
- ["9E8B",0x7037],
- ["9E8C",0x7038],
- ["E5AE",0x7039],
- ["9E8D",0x703A],
- ["9E8E",0x703B],
- ["9E8F",0x703C],
- ["9E90",0x703D],
- ["9E91",0x703E],
- ["9E92",0x703F],
- ["9E93",0x7040],
- ["9E94",0x7041],
- ["9E95",0x7042],
- ["9E96",0x7043],
- ["9E97",0x7044],
- ["9E98",0x7045],
- ["9E99",0x7046],
- ["9E9A",0x7047],
- ["9E9B",0x7048],
- ["9E9C",0x7049],
- ["9E9D",0x704A],
- ["9E9E",0x704B],
- ["B9E0",0x704C],
- ["9E9F",0x704D],
- ["9EA0",0x704E],
- ["E5B0",0x704F],
- ["9EA1",0x7050],
- ["9EA2",0x7051],
- ["9EA3",0x7052],
- ["9EA4",0x7053],
- ["9EA5",0x7054],
- ["9EA6",0x7055],
- ["9EA7",0x7056],
- ["9EA8",0x7057],
- ["9EA9",0x7058],
- ["9EAA",0x7059],
- ["9EAB",0x705A],
- ["9EAC",0x705B],
- ["9EAD",0x705C],
- ["9EAE",0x705D],
- ["E5B1",0x705E],
- ["9EAF",0x705F],
- ["9EB0",0x7060],
- ["9EB1",0x7061],
- ["9EB2",0x7062],
- ["9EB3",0x7063],
- ["9EB4",0x7064],
- ["9EB5",0x7065],
- ["9EB6",0x7066],
- ["9EB7",0x7067],
- ["9EB8",0x7068],
- ["9EB9",0x7069],
- ["9EBA",0x706A],
- ["BBF0",0x706B],
- ["ECE1",0x706C],
- ["C3F0",0x706D],
- ["9EBB",0x706E],
- ["B5C6",0x706F],
- ["BBD2",0x7070],
- ["9EBC",0x7071],
- ["9EBD",0x7072],
- ["9EBE",0x7073],
- ["9EBF",0x7074],
- ["C1E9",0x7075],
- ["D4EE",0x7076],
- ["9EC0",0x7077],
- ["BEC4",0x7078],
- ["9EC1",0x7079],
- ["9EC2",0x707A],
- ["9EC3",0x707B],
- ["D7C6",0x707C],
- ["9EC4",0x707D],
- ["D4D6",0x707E],
- ["B2D3",0x707F],
- ["ECBE",0x7080],
- ["9EC5",0x7081],
- ["9EC6",0x7082],
- ["9EC7",0x7083],
- ["9EC8",0x7084],
- ["EAC1",0x7085],
- ["9EC9",0x7086],
- ["9ECA",0x7087],
- ["9ECB",0x7088],
- ["C2AF",0x7089],
- ["B4B6",0x708A],
- ["9ECC",0x708B],
- ["9ECD",0x708C],
- ["9ECE",0x708D],
- ["D1D7",0x708E],
- ["9ECF",0x708F],
- ["9ED0",0x7090],
- ["9ED1",0x7091],
- ["B3B4",0x7092],
- ["9ED2",0x7093],
- ["C8B2",0x7094],
- ["BFBB",0x7095],
- ["ECC0",0x7096],
- ["9ED3",0x7097],
- ["9ED4",0x7098],
- ["D6CB",0x7099],
- ["9ED5",0x709A],
- ["9ED6",0x709B],
- ["ECBF",0x709C],
- ["ECC1",0x709D],
- ["9ED7",0x709E],
- ["9ED8",0x709F],
- ["9ED9",0x70A0],
- ["9EDA",0x70A1],
- ["9EDB",0x70A2],
- ["9EDC",0x70A3],
- ["9EDD",0x70A4],
- ["9EDE",0x70A5],
- ["9EDF",0x70A6],
- ["9EE0",0x70A7],
- ["9EE1",0x70A8],
- ["9EE2",0x70A9],
- ["9EE3",0x70AA],
- ["ECC5",0x70AB],
- ["BEE6",0x70AC],
- ["CCBF",0x70AD],
- ["C5DA",0x70AE],
- ["BEBC",0x70AF],
- ["9EE4",0x70B0],
- ["ECC6",0x70B1],
- ["9EE5",0x70B2],
- ["B1FE",0x70B3],
- ["9EE6",0x70B4],
- ["9EE7",0x70B5],
- ["9EE8",0x70B6],
- ["ECC4",0x70B7],
- ["D5A8",0x70B8],
- ["B5E3",0x70B9],
- ["9EE9",0x70BA],
- ["ECC2",0x70BB],
- ["C1B6",0x70BC],
- ["B3E3",0x70BD],
- ["9EEA",0x70BE],
- ["9EEB",0x70BF],
- ["ECC3",0x70C0],
- ["CBB8",0x70C1],
- ["C0C3",0x70C2],
- ["CCFE",0x70C3],
- ["9EEC",0x70C4],
- ["9EED",0x70C5],
- ["9EEE",0x70C6],
- ["9EEF",0x70C7],
- ["C1D2",0x70C8],
- ["9EF0",0x70C9],
- ["ECC8",0x70CA],
- ["9EF1",0x70CB],
- ["9EF2",0x70CC],
- ["9EF3",0x70CD],
- ["9EF4",0x70CE],
- ["9EF5",0x70CF],
- ["9EF6",0x70D0],
- ["9EF7",0x70D1],
- ["9EF8",0x70D2],
- ["9EF9",0x70D3],
- ["9EFA",0x70D4],
- ["9EFB",0x70D5],
- ["9EFC",0x70D6],
- ["9EFD",0x70D7],
- ["BAE6",0x70D8],
- ["C0D3",0x70D9],
- ["9EFE",0x70DA],
- ["D6F2",0x70DB],
- ["9F40",0x70DC],
- ["9F41",0x70DD],
- ["9F42",0x70DE],
- ["D1CC",0x70DF],
- ["9F43",0x70E0],
- ["9F44",0x70E1],
- ["9F45",0x70E2],
- ["9F46",0x70E3],
- ["BFBE",0x70E4],
- ["9F47",0x70E5],
- ["B7B3",0x70E6],
- ["C9D5",0x70E7],
- ["ECC7",0x70E8],
- ["BBE2",0x70E9],
- ["9F48",0x70EA],
- ["CCCC",0x70EB],
- ["BDFD",0x70EC],
- ["C8C8",0x70ED],
- ["9F49",0x70EE],
- ["CFA9",0x70EF],
- ["9F4A",0x70F0],
- ["9F4B",0x70F1],
- ["9F4C",0x70F2],
- ["9F4D",0x70F3],
- ["9F4E",0x70F4],
- ["9F4F",0x70F5],
- ["9F50",0x70F6],
- ["CDE9",0x70F7],
- ["9F51",0x70F8],
- ["C5EB",0x70F9],
- ["9F52",0x70FA],
- ["9F53",0x70FB],
- ["9F54",0x70FC],
- ["B7E9",0x70FD],
- ["9F55",0x70FE],
- ["9F56",0x70FF],
- ["9F57",0x7100],
- ["9F58",0x7101],
- ["9F59",0x7102],
- ["9F5A",0x7103],
- ["9F5B",0x7104],
- ["9F5C",0x7105],
- ["9F5D",0x7106],
- ["9F5E",0x7107],
- ["9F5F",0x7108],
- ["D1C9",0x7109],
- ["BAB8",0x710A],
- ["9F60",0x710B],
- ["9F61",0x710C],
- ["9F62",0x710D],
- ["9F63",0x710E],
- ["9F64",0x710F],
- ["ECC9",0x7110],
- ["9F65",0x7111],
- ["9F66",0x7112],
- ["ECCA",0x7113],
- ["9F67",0x7114],
- ["BBC0",0x7115],
- ["ECCB",0x7116],
- ["9F68",0x7117],
- ["ECE2",0x7118],
- ["B1BA",0x7119],
- ["B7D9",0x711A],
- ["9F69",0x711B],
- ["9F6A",0x711C],
- ["9F6B",0x711D],
- ["9F6C",0x711E],
- ["9F6D",0x711F],
- ["9F6E",0x7120],
- ["9F6F",0x7121],
- ["9F70",0x7122],
- ["9F71",0x7123],
- ["9F72",0x7124],
- ["9F73",0x7125],
- ["BDB9",0x7126],
- ["9F74",0x7127],
- ["9F75",0x7128],
- ["9F76",0x7129],
- ["9F77",0x712A],
- ["9F78",0x712B],
- ["9F79",0x712C],
- ["9F7A",0x712D],
- ["9F7B",0x712E],
- ["ECCC",0x712F],
- ["D1E6",0x7130],
- ["ECCD",0x7131],
- ["9F7C",0x7132],
- ["9F7D",0x7133],
- ["9F7E",0x7134],
- ["9F80",0x7135],
- ["C8BB",0x7136],
- ["9F81",0x7137],
- ["9F82",0x7138],
- ["9F83",0x7139],
- ["9F84",0x713A],
- ["9F85",0x713B],
- ["9F86",0x713C],
- ["9F87",0x713D],
- ["9F88",0x713E],
- ["9F89",0x713F],
- ["9F8A",0x7140],
- ["9F8B",0x7141],
- ["9F8C",0x7142],
- ["9F8D",0x7143],
- ["9F8E",0x7144],
- ["ECD1",0x7145],
- ["9F8F",0x7146],
- ["9F90",0x7147],
- ["9F91",0x7148],
- ["9F92",0x7149],
- ["ECD3",0x714A],
- ["9F93",0x714B],
- ["BBCD",0x714C],
- ["9F94",0x714D],
- ["BCE5",0x714E],
- ["9F95",0x714F],
- ["9F96",0x7150],
- ["9F97",0x7151],
- ["9F98",0x7152],
- ["9F99",0x7153],
- ["9F9A",0x7154],
- ["9F9B",0x7155],
- ["9F9C",0x7156],
- ["9F9D",0x7157],
- ["9F9E",0x7158],
- ["9F9F",0x7159],
- ["9FA0",0x715A],
- ["9FA1",0x715B],
- ["ECCF",0x715C],
- ["9FA2",0x715D],
- ["C9B7",0x715E],
- ["9FA3",0x715F],
- ["9FA4",0x7160],
- ["9FA5",0x7161],
- ["9FA6",0x7162],
- ["9FA7",0x7163],
- ["C3BA",0x7164],
- ["9FA8",0x7165],
- ["ECE3",0x7166],
- ["D5D5",0x7167],
- ["ECD0",0x7168],
- ["9FA9",0x7169],
- ["9FAA",0x716A],
- ["9FAB",0x716B],
- ["9FAC",0x716C],
- ["9FAD",0x716D],
- ["D6F3",0x716E],
- ["9FAE",0x716F],
- ["9FAF",0x7170],
- ["9FB0",0x7171],
- ["ECD2",0x7172],
- ["ECCE",0x7173],
- ["9FB1",0x7174],
- ["9FB2",0x7175],
- ["9FB3",0x7176],
- ["9FB4",0x7177],
- ["ECD4",0x7178],
- ["9FB5",0x7179],
- ["ECD5",0x717A],
- ["9FB6",0x717B],
- ["9FB7",0x717C],
- ["C9BF",0x717D],
- ["9FB8",0x717E],
- ["9FB9",0x717F],
- ["9FBA",0x7180],
- ["9FBB",0x7181],
- ["9FBC",0x7182],
- ["9FBD",0x7183],
- ["CFA8",0x7184],
- ["9FBE",0x7185],
- ["9FBF",0x7186],
- ["9FC0",0x7187],
- ["9FC1",0x7188],
- ["9FC2",0x7189],
- ["D0DC",0x718A],
- ["9FC3",0x718B],
- ["9FC4",0x718C],
- ["9FC5",0x718D],
- ["9FC6",0x718E],
- ["D1AC",0x718F],
- ["9FC7",0x7190],
- ["9FC8",0x7191],
- ["9FC9",0x7192],
- ["9FCA",0x7193],
- ["C8DB",0x7194],
- ["9FCB",0x7195],
- ["9FCC",0x7196],
- ["9FCD",0x7197],
- ["ECD6",0x7198],
- ["CEF5",0x7199],
- ["9FCE",0x719A],
- ["9FCF",0x719B],
- ["9FD0",0x719C],
- ["9FD1",0x719D],
- ["9FD2",0x719E],
- ["CAEC",0x719F],
- ["ECDA",0x71A0],
- ["9FD3",0x71A1],
- ["9FD4",0x71A2],
- ["9FD5",0x71A3],
- ["9FD6",0x71A4],
- ["9FD7",0x71A5],
- ["9FD8",0x71A6],
- ["9FD9",0x71A7],
- ["ECD9",0x71A8],
- ["9FDA",0x71A9],
- ["9FDB",0x71AA],
- ["9FDC",0x71AB],
- ["B0BE",0x71AC],
- ["9FDD",0x71AD],
- ["9FDE",0x71AE],
- ["9FDF",0x71AF],
- ["9FE0",0x71B0],
- ["9FE1",0x71B1],
- ["9FE2",0x71B2],
- ["ECD7",0x71B3],
- ["9FE3",0x71B4],
- ["ECD8",0x71B5],
- ["9FE4",0x71B6],
- ["9FE5",0x71B7],
- ["9FE6",0x71B8],
- ["ECE4",0x71B9],
- ["9FE7",0x71BA],
- ["9FE8",0x71BB],
- ["9FE9",0x71BC],
- ["9FEA",0x71BD],
- ["9FEB",0x71BE],
- ["9FEC",0x71BF],
- ["9FED",0x71C0],
- ["9FEE",0x71C1],
- ["9FEF",0x71C2],
- ["C8BC",0x71C3],
- ["9FF0",0x71C4],
- ["9FF1",0x71C5],
- ["9FF2",0x71C6],
- ["9FF3",0x71C7],
- ["9FF4",0x71C8],
- ["9FF5",0x71C9],
- ["9FF6",0x71CA],
- ["9FF7",0x71CB],
- ["9FF8",0x71CC],
- ["9FF9",0x71CD],
- ["C1C7",0x71CE],
- ["9FFA",0x71CF],
- ["9FFB",0x71D0],
- ["9FFC",0x71D1],
- ["9FFD",0x71D2],
- ["9FFE",0x71D3],
- ["ECDC",0x71D4],
- ["D1E0",0x71D5],
- ["A040",0x71D6],
- ["A041",0x71D7],
- ["A042",0x71D8],
- ["A043",0x71D9],
- ["A044",0x71DA],
- ["A045",0x71DB],
- ["A046",0x71DC],
- ["A047",0x71DD],
- ["A048",0x71DE],
- ["A049",0x71DF],
- ["ECDB",0x71E0],
- ["A04A",0x71E1],
- ["A04B",0x71E2],
- ["A04C",0x71E3],
- ["A04D",0x71E4],
- ["D4EF",0x71E5],
- ["A04E",0x71E6],
- ["ECDD",0x71E7],
- ["A04F",0x71E8],
- ["A050",0x71E9],
- ["A051",0x71EA],
- ["A052",0x71EB],
- ["A053",0x71EC],
- ["A054",0x71ED],
- ["DBC6",0x71EE],
- ["A055",0x71EF],
- ["A056",0x71F0],
- ["A057",0x71F1],
- ["A058",0x71F2],
- ["A059",0x71F3],
- ["A05A",0x71F4],
- ["A05B",0x71F5],
- ["A05C",0x71F6],
- ["A05D",0x71F7],
- ["A05E",0x71F8],
- ["ECDE",0x71F9],
- ["A05F",0x71FA],
- ["A060",0x71FB],
- ["A061",0x71FC],
- ["A062",0x71FD],
- ["A063",0x71FE],
- ["A064",0x71FF],
- ["A065",0x7200],
- ["A066",0x7201],
- ["A067",0x7202],
- ["A068",0x7203],
- ["A069",0x7204],
- ["A06A",0x7205],
- ["B1AC",0x7206],
- ["A06B",0x7207],
- ["A06C",0x7208],
- ["A06D",0x7209],
- ["A06E",0x720A],
- ["A06F",0x720B],
- ["A070",0x720C],
- ["A071",0x720D],
- ["A072",0x720E],
- ["A073",0x720F],
- ["A074",0x7210],
- ["A075",0x7211],
- ["A076",0x7212],
- ["A077",0x7213],
- ["A078",0x7214],
- ["A079",0x7215],
- ["A07A",0x7216],
- ["A07B",0x7217],
- ["A07C",0x7218],
- ["A07D",0x7219],
- ["A07E",0x721A],
- ["A080",0x721B],
- ["A081",0x721C],
- ["ECDF",0x721D],
- ["A082",0x721E],
- ["A083",0x721F],
- ["A084",0x7220],
- ["A085",0x7221],
- ["A086",0x7222],
- ["A087",0x7223],
- ["A088",0x7224],
- ["A089",0x7225],
- ["A08A",0x7226],
- ["A08B",0x7227],
- ["ECE0",0x7228],
- ["A08C",0x7229],
- ["D7A6",0x722A],
- ["A08D",0x722B],
- ["C5C0",0x722C],
- ["A08E",0x722D],
- ["A08F",0x722E],
- ["A090",0x722F],
- ["EBBC",0x7230],
- ["B0AE",0x7231],
- ["A091",0x7232],
- ["A092",0x7233],
- ["A093",0x7234],
- ["BEF4",0x7235],
- ["B8B8",0x7236],
- ["D2AF",0x7237],
- ["B0D6",0x7238],
- ["B5F9",0x7239],
- ["A094",0x723A],
- ["D8B3",0x723B],
- ["A095",0x723C],
- ["CBAC",0x723D],
- ["A096",0x723E],
- ["E3DD",0x723F],
- ["A097",0x7240],
- ["A098",0x7241],
- ["A099",0x7242],
- ["A09A",0x7243],
- ["A09B",0x7244],
- ["A09C",0x7245],
- ["A09D",0x7246],
- ["C6AC",0x7247],
- ["B0E6",0x7248],
- ["A09E",0x7249],
- ["A09F",0x724A],
- ["A0A0",0x724B],
- ["C5C6",0x724C],
- ["EBB9",0x724D],
- ["A0A1",0x724E],
- ["A0A2",0x724F],
- ["A0A3",0x7250],
- ["A0A4",0x7251],
- ["EBBA",0x7252],
- ["A0A5",0x7253],
- ["A0A6",0x7254],
- ["A0A7",0x7255],
- ["EBBB",0x7256],
- ["A0A8",0x7257],
- ["A0A9",0x7258],
- ["D1C0",0x7259],
- ["A0AA",0x725A],
- ["C5A3",0x725B],
- ["A0AB",0x725C],
- ["EAF2",0x725D],
- ["A0AC",0x725E],
- ["C4B2",0x725F],
- ["A0AD",0x7260],
- ["C4B5",0x7261],
- ["C0CE",0x7262],
- ["A0AE",0x7263],
- ["A0AF",0x7264],
- ["A0B0",0x7265],
- ["EAF3",0x7266],
- ["C4C1",0x7267],
- ["A0B1",0x7268],
- ["CEEF",0x7269],
- ["A0B2",0x726A],
- ["A0B3",0x726B],
- ["A0B4",0x726C],
- ["A0B5",0x726D],
- ["EAF0",0x726E],
- ["EAF4",0x726F],
- ["A0B6",0x7270],
- ["A0B7",0x7271],
- ["C9FC",0x7272],
- ["A0B8",0x7273],
- ["A0B9",0x7274],
- ["C7A3",0x7275],
- ["A0BA",0x7276],
- ["A0BB",0x7277],
- ["A0BC",0x7278],
- ["CCD8",0x7279],
- ["CEFE",0x727A],
- ["A0BD",0x727B],
- ["A0BE",0x727C],
- ["A0BF",0x727D],
- ["EAF5",0x727E],
- ["EAF6",0x727F],
- ["CFAC",0x7280],
- ["C0E7",0x7281],
- ["A0C0",0x7282],
- ["A0C1",0x7283],
- ["EAF7",0x7284],
- ["A0C2",0x7285],
- ["A0C3",0x7286],
- ["A0C4",0x7287],
- ["A0C5",0x7288],
- ["A0C6",0x7289],
- ["B6BF",0x728A],
- ["EAF8",0x728B],
- ["A0C7",0x728C],
- ["EAF9",0x728D],
- ["A0C8",0x728E],
- ["EAFA",0x728F],
- ["A0C9",0x7290],
- ["A0CA",0x7291],
- ["EAFB",0x7292],
- ["A0CB",0x7293],
- ["A0CC",0x7294],
- ["A0CD",0x7295],
- ["A0CE",0x7296],
- ["A0CF",0x7297],
- ["A0D0",0x7298],
- ["A0D1",0x7299],
- ["A0D2",0x729A],
- ["A0D3",0x729B],
- ["A0D4",0x729C],
- ["A0D5",0x729D],
- ["A0D6",0x729E],
- ["EAF1",0x729F],
- ["A0D7",0x72A0],
- ["A0D8",0x72A1],
- ["A0D9",0x72A2],
- ["A0DA",0x72A3],
- ["A0DB",0x72A4],
- ["A0DC",0x72A5],
- ["A0DD",0x72A6],
- ["A0DE",0x72A7],
- ["A0DF",0x72A8],
- ["A0E0",0x72A9],
- ["A0E1",0x72AA],
- ["A0E2",0x72AB],
- ["C8AE",0x72AC],
- ["E1EB",0x72AD],
- ["A0E3",0x72AE],
- ["B7B8",0x72AF],
- ["E1EC",0x72B0],
- ["A0E4",0x72B1],
- ["A0E5",0x72B2],
- ["A0E6",0x72B3],
- ["E1ED",0x72B4],
- ["A0E7",0x72B5],
- ["D7B4",0x72B6],
- ["E1EE",0x72B7],
- ["E1EF",0x72B8],
- ["D3CC",0x72B9],
- ["A0E8",0x72BA],
- ["A0E9",0x72BB],
- ["A0EA",0x72BC],
- ["A0EB",0x72BD],
- ["A0EC",0x72BE],
- ["A0ED",0x72BF],
- ["A0EE",0x72C0],
- ["E1F1",0x72C1],
- ["BFF1",0x72C2],
- ["E1F0",0x72C3],
- ["B5D2",0x72C4],
- ["A0EF",0x72C5],
- ["A0F0",0x72C6],
- ["A0F1",0x72C7],
- ["B1B7",0x72C8],
- ["A0F2",0x72C9],
- ["A0F3",0x72CA],
- ["A0F4",0x72CB],
- ["A0F5",0x72CC],
- ["E1F3",0x72CD],
- ["E1F2",0x72CE],
- ["A0F6",0x72CF],
- ["BAFC",0x72D0],
- ["A0F7",0x72D1],
- ["E1F4",0x72D2],
- ["A0F8",0x72D3],
- ["A0F9",0x72D4],
- ["A0FA",0x72D5],
- ["A0FB",0x72D6],
- ["B9B7",0x72D7],
- ["A0FC",0x72D8],
- ["BED1",0x72D9],
- ["A0FD",0x72DA],
- ["A0FE",0x72DB],
- ["AA40",0x72DC],
- ["AA41",0x72DD],
- ["C4FC",0x72DE],
- ["AA42",0x72DF],
- ["BADD",0x72E0],
- ["BDC6",0x72E1],
- ["AA43",0x72E2],
- ["AA44",0x72E3],
- ["AA45",0x72E4],
- ["AA46",0x72E5],
- ["AA47",0x72E6],
- ["AA48",0x72E7],
- ["E1F5",0x72E8],
- ["E1F7",0x72E9],
- ["AA49",0x72EA],
- ["AA4A",0x72EB],
- ["B6C0",0x72EC],
- ["CFC1",0x72ED],
- ["CAA8",0x72EE],
- ["E1F6",0x72EF],
- ["D5F8",0x72F0],
- ["D3FC",0x72F1],
- ["E1F8",0x72F2],
- ["E1FC",0x72F3],
- ["E1F9",0x72F4],
- ["AA4B",0x72F5],
- ["AA4C",0x72F6],
- ["E1FA",0x72F7],
- ["C0EA",0x72F8],
- ["AA4D",0x72F9],
- ["E1FE",0x72FA],
- ["E2A1",0x72FB],
- ["C0C7",0x72FC],
- ["AA4E",0x72FD],
- ["AA4F",0x72FE],
- ["AA50",0x72FF],
- ["AA51",0x7300],
- ["E1FB",0x7301],
- ["AA52",0x7302],
- ["E1FD",0x7303],
- ["AA53",0x7304],
- ["AA54",0x7305],
- ["AA55",0x7306],
- ["AA56",0x7307],
- ["AA57",0x7308],
- ["AA58",0x7309],
- ["E2A5",0x730A],
- ["AA59",0x730B],
- ["AA5A",0x730C],
- ["AA5B",0x730D],
- ["C1D4",0x730E],
- ["AA5C",0x730F],
- ["AA5D",0x7310],
- ["AA5E",0x7311],
- ["AA5F",0x7312],
- ["E2A3",0x7313],
- ["AA60",0x7314],
- ["E2A8",0x7315],
- ["B2FE",0x7316],
- ["E2A2",0x7317],
- ["AA61",0x7318],
- ["AA62",0x7319],
- ["AA63",0x731A],
- ["C3CD",0x731B],
- ["B2C2",0x731C],
- ["E2A7",0x731D],
- ["E2A6",0x731E],
- ["AA64",0x731F],
- ["AA65",0x7320],
- ["E2A4",0x7321],
- ["E2A9",0x7322],
- ["AA66",0x7323],
- ["AA67",0x7324],
- ["E2AB",0x7325],
- ["AA68",0x7326],
- ["AA69",0x7327],
- ["AA6A",0x7328],
- ["D0C9",0x7329],
- ["D6ED",0x732A],
- ["C3A8",0x732B],
- ["E2AC",0x732C],
- ["AA6B",0x732D],
- ["CFD7",0x732E],
- ["AA6C",0x732F],
- ["AA6D",0x7330],
- ["E2AE",0x7331],
- ["AA6E",0x7332],
- ["AA6F",0x7333],
- ["BAEF",0x7334],
- ["AA70",0x7335],
- ["AA71",0x7336],
- ["E9E0",0x7337],
- ["E2AD",0x7338],
- ["E2AA",0x7339],
- ["AA72",0x733A],
- ["AA73",0x733B],
- ["AA74",0x733C],
- ["AA75",0x733D],
- ["BBAB",0x733E],
- ["D4B3",0x733F],
- ["AA76",0x7340],
- ["AA77",0x7341],
- ["AA78",0x7342],
- ["AA79",0x7343],
- ["AA7A",0x7344],
- ["AA7B",0x7345],
- ["AA7C",0x7346],
- ["AA7D",0x7347],
- ["AA7E",0x7348],
- ["AA80",0x7349],
- ["AA81",0x734A],
- ["AA82",0x734B],
- ["AA83",0x734C],
- ["E2B0",0x734D],
- ["AA84",0x734E],
- ["AA85",0x734F],
- ["E2AF",0x7350],
- ["AA86",0x7351],
- ["E9E1",0x7352],
- ["AA87",0x7353],
- ["AA88",0x7354],
- ["AA89",0x7355],
- ["AA8A",0x7356],
- ["E2B1",0x7357],
- ["AA8B",0x7358],
- ["AA8C",0x7359],
- ["AA8D",0x735A],
- ["AA8E",0x735B],
- ["AA8F",0x735C],
- ["AA90",0x735D],
- ["AA91",0x735E],
- ["AA92",0x735F],
- ["E2B2",0x7360],
- ["AA93",0x7361],
- ["AA94",0x7362],
- ["AA95",0x7363],
- ["AA96",0x7364],
- ["AA97",0x7365],
- ["AA98",0x7366],
- ["AA99",0x7367],
- ["AA9A",0x7368],
- ["AA9B",0x7369],
- ["AA9C",0x736A],
- ["AA9D",0x736B],
- ["E2B3",0x736C],
- ["CCA1",0x736D],
- ["AA9E",0x736E],
- ["E2B4",0x736F],
- ["AA9F",0x7370],
- ["AAA0",0x7371],
- ["AB40",0x7372],
- ["AB41",0x7373],
- ["AB42",0x7374],
- ["AB43",0x7375],
- ["AB44",0x7376],
- ["AB45",0x7377],
- ["AB46",0x7378],
- ["AB47",0x7379],
- ["AB48",0x737A],
- ["AB49",0x737B],
- ["AB4A",0x737C],
- ["AB4B",0x737D],
- ["E2B5",0x737E],
- ["AB4C",0x737F],
- ["AB4D",0x7380],
- ["AB4E",0x7381],
- ["AB4F",0x7382],
- ["AB50",0x7383],
- ["D0FE",0x7384],
- ["AB51",0x7385],
- ["AB52",0x7386],
- ["C2CA",0x7387],
- ["AB53",0x7388],
- ["D3F1",0x7389],
- ["AB54",0x738A],
- ["CDF5",0x738B],
- ["AB55",0x738C],
- ["AB56",0x738D],
- ["E7E0",0x738E],
- ["AB57",0x738F],
- ["AB58",0x7390],
- ["E7E1",0x7391],
- ["AB59",0x7392],
- ["AB5A",0x7393],
- ["AB5B",0x7394],
- ["AB5C",0x7395],
- ["BEC1",0x7396],
- ["AB5D",0x7397],
- ["AB5E",0x7398],
- ["AB5F",0x7399],
- ["AB60",0x739A],
- ["C2EA",0x739B],
- ["AB61",0x739C],
- ["AB62",0x739D],
- ["AB63",0x739E],
- ["E7E4",0x739F],
- ["AB64",0x73A0],
- ["AB65",0x73A1],
- ["E7E3",0x73A2],
- ["AB66",0x73A3],
- ["AB67",0x73A4],
- ["AB68",0x73A5],
- ["AB69",0x73A6],
- ["AB6A",0x73A7],
- ["AB6B",0x73A8],
- ["CDE6",0x73A9],
- ["AB6C",0x73AA],
- ["C3B5",0x73AB],
- ["AB6D",0x73AC],
- ["AB6E",0x73AD],
- ["E7E2",0x73AE],
- ["BBB7",0x73AF],
- ["CFD6",0x73B0],
- ["AB6F",0x73B1],
- ["C1E1",0x73B2],
- ["E7E9",0x73B3],
- ["AB70",0x73B4],
- ["AB71",0x73B5],
- ["AB72",0x73B6],
- ["E7E8",0x73B7],
- ["AB73",0x73B8],
- ["AB74",0x73B9],
- ["E7F4",0x73BA],
- ["B2A3",0x73BB],
- ["AB75",0x73BC],
- ["AB76",0x73BD],
- ["AB77",0x73BE],
- ["AB78",0x73BF],
- ["E7EA",0x73C0],
- ["AB79",0x73C1],
- ["E7E6",0x73C2],
- ["AB7A",0x73C3],
- ["AB7B",0x73C4],
- ["AB7C",0x73C5],
- ["AB7D",0x73C6],
- ["AB7E",0x73C7],
- ["E7EC",0x73C8],
- ["E7EB",0x73C9],
- ["C9BA",0x73CA],
- ["AB80",0x73CB],
- ["AB81",0x73CC],
- ["D5E4",0x73CD],
- ["AB82",0x73CE],
- ["E7E5",0x73CF],
- ["B7A9",0x73D0],
- ["E7E7",0x73D1],
- ["AB83",0x73D2],
- ["AB84",0x73D3],
- ["AB85",0x73D4],
- ["AB86",0x73D5],
- ["AB87",0x73D6],
- ["AB88",0x73D7],
- ["AB89",0x73D8],
- ["E7EE",0x73D9],
- ["AB8A",0x73DA],
- ["AB8B",0x73DB],
- ["AB8C",0x73DC],
- ["AB8D",0x73DD],
- ["E7F3",0x73DE],
- ["AB8E",0x73DF],
- ["D6E9",0x73E0],
- ["AB8F",0x73E1],
- ["AB90",0x73E2],
- ["AB91",0x73E3],
- ["AB92",0x73E4],
- ["E7ED",0x73E5],
- ["AB93",0x73E6],
- ["E7F2",0x73E7],
- ["AB94",0x73E8],
- ["E7F1",0x73E9],
- ["AB95",0x73EA],
- ["AB96",0x73EB],
- ["AB97",0x73EC],
- ["B0E0",0x73ED],
- ["AB98",0x73EE],
- ["AB99",0x73EF],
- ["AB9A",0x73F0],
- ["AB9B",0x73F1],
- ["E7F5",0x73F2],
- ["AB9C",0x73F3],
- ["AB9D",0x73F4],
- ["AB9E",0x73F5],
- ["AB9F",0x73F6],
- ["ABA0",0x73F7],
- ["AC40",0x73F8],
- ["AC41",0x73F9],
- ["AC42",0x73FA],
- ["AC43",0x73FB],
- ["AC44",0x73FC],
- ["AC45",0x73FD],
- ["AC46",0x73FE],
- ["AC47",0x73FF],
- ["AC48",0x7400],
- ["AC49",0x7401],
- ["AC4A",0x7402],
- ["C7F2",0x7403],
- ["AC4B",0x7404],
- ["C0C5",0x7405],
- ["C0ED",0x7406],
- ["AC4C",0x7407],
- ["AC4D",0x7408],
- ["C1F0",0x7409],
- ["E7F0",0x740A],
- ["AC4E",0x740B],
- ["AC4F",0x740C],
- ["AC50",0x740D],
- ["AC51",0x740E],
- ["E7F6",0x740F],
- ["CBF6",0x7410],
- ["AC52",0x7411],
- ["AC53",0x7412],
- ["AC54",0x7413],
- ["AC55",0x7414],
- ["AC56",0x7415],
- ["AC57",0x7416],
- ["AC58",0x7417],
- ["AC59",0x7418],
- ["AC5A",0x7419],
- ["E8A2",0x741A],
- ["E8A1",0x741B],
- ["AC5B",0x741C],
- ["AC5C",0x741D],
- ["AC5D",0x741E],
- ["AC5E",0x741F],
- ["AC5F",0x7420],
- ["AC60",0x7421],
- ["D7C1",0x7422],
- ["AC61",0x7423],
- ["AC62",0x7424],
- ["E7FA",0x7425],
- ["E7F9",0x7426],
- ["AC63",0x7427],
- ["E7FB",0x7428],
- ["AC64",0x7429],
- ["E7F7",0x742A],
- ["AC65",0x742B],
- ["E7FE",0x742C],
- ["AC66",0x742D],
- ["E7FD",0x742E],
- ["AC67",0x742F],
- ["E7FC",0x7430],
- ["AC68",0x7431],
- ["AC69",0x7432],
- ["C1D5",0x7433],
- ["C7D9",0x7434],
- ["C5FD",0x7435],
- ["C5C3",0x7436],
- ["AC6A",0x7437],
- ["AC6B",0x7438],
- ["AC6C",0x7439],
- ["AC6D",0x743A],
- ["AC6E",0x743B],
- ["C7ED",0x743C],
- ["AC6F",0x743D],
- ["AC70",0x743E],
- ["AC71",0x743F],
- ["AC72",0x7440],
- ["E8A3",0x7441],
- ["AC73",0x7442],
- ["AC74",0x7443],
- ["AC75",0x7444],
- ["AC76",0x7445],
- ["AC77",0x7446],
- ["AC78",0x7447],
- ["AC79",0x7448],
- ["AC7A",0x7449],
- ["AC7B",0x744A],
- ["AC7C",0x744B],
- ["AC7D",0x744C],
- ["AC7E",0x744D],
- ["AC80",0x744E],
- ["AC81",0x744F],
- ["AC82",0x7450],
- ["AC83",0x7451],
- ["AC84",0x7452],
- ["AC85",0x7453],
- ["AC86",0x7454],
- ["E8A6",0x7455],
- ["AC87",0x7456],
- ["E8A5",0x7457],
- ["AC88",0x7458],
- ["E8A7",0x7459],
- ["BAF7",0x745A],
- ["E7F8",0x745B],
- ["E8A4",0x745C],
- ["AC89",0x745D],
- ["C8F0",0x745E],
- ["C9AA",0x745F],
- ["AC8A",0x7460],
- ["AC8B",0x7461],
- ["AC8C",0x7462],
- ["AC8D",0x7463],
- ["AC8E",0x7464],
- ["AC8F",0x7465],
- ["AC90",0x7466],
- ["AC91",0x7467],
- ["AC92",0x7468],
- ["AC93",0x7469],
- ["AC94",0x746A],
- ["AC95",0x746B],
- ["AC96",0x746C],
- ["E8A9",0x746D],
- ["AC97",0x746E],
- ["AC98",0x746F],
- ["B9E5",0x7470],
- ["AC99",0x7471],
- ["AC9A",0x7472],
- ["AC9B",0x7473],
- ["AC9C",0x7474],
- ["AC9D",0x7475],
- ["D1FE",0x7476],
- ["E8A8",0x7477],
- ["AC9E",0x7478],
- ["AC9F",0x7479],
- ["ACA0",0x747A],
- ["AD40",0x747B],
- ["AD41",0x747C],
- ["AD42",0x747D],
- ["E8AA",0x747E],
- ["AD43",0x747F],
- ["E8AD",0x7480],
- ["E8AE",0x7481],
- ["AD44",0x7482],
- ["C1A7",0x7483],
- ["AD45",0x7484],
- ["AD46",0x7485],
- ["AD47",0x7486],
- ["E8AF",0x7487],
- ["AD48",0x7488],
- ["AD49",0x7489],
- ["AD4A",0x748A],
- ["E8B0",0x748B],
- ["AD4B",0x748C],
- ["AD4C",0x748D],
- ["E8AC",0x748E],
- ["AD4D",0x748F],
- ["E8B4",0x7490],
- ["AD4E",0x7491],
- ["AD4F",0x7492],
- ["AD50",0x7493],
- ["AD51",0x7494],
- ["AD52",0x7495],
- ["AD53",0x7496],
- ["AD54",0x7497],
- ["AD55",0x7498],
- ["AD56",0x7499],
- ["AD57",0x749A],
- ["AD58",0x749B],
- ["E8AB",0x749C],
- ["AD59",0x749D],
- ["E8B1",0x749E],
- ["AD5A",0x749F],
- ["AD5B",0x74A0],
- ["AD5C",0x74A1],
- ["AD5D",0x74A2],
- ["AD5E",0x74A3],
- ["AD5F",0x74A4],
- ["AD60",0x74A5],
- ["AD61",0x74A6],
- ["E8B5",0x74A7],
- ["E8B2",0x74A8],
- ["E8B3",0x74A9],
- ["AD62",0x74AA],
- ["AD63",0x74AB],
- ["AD64",0x74AC],
- ["AD65",0x74AD],
- ["AD66",0x74AE],
- ["AD67",0x74AF],
- ["AD68",0x74B0],
- ["AD69",0x74B1],
- ["AD6A",0x74B2],
- ["AD6B",0x74B3],
- ["AD6C",0x74B4],
- ["AD6D",0x74B5],
- ["AD6E",0x74B6],
- ["AD6F",0x74B7],
- ["AD70",0x74B8],
- ["AD71",0x74B9],
- ["E8B7",0x74BA],
- ["AD72",0x74BB],
- ["AD73",0x74BC],
- ["AD74",0x74BD],
- ["AD75",0x74BE],
- ["AD76",0x74BF],
- ["AD77",0x74C0],
- ["AD78",0x74C1],
- ["AD79",0x74C2],
- ["AD7A",0x74C3],
- ["AD7B",0x74C4],
- ["AD7C",0x74C5],
- ["AD7D",0x74C6],
- ["AD7E",0x74C7],
- ["AD80",0x74C8],
- ["AD81",0x74C9],
- ["AD82",0x74CA],
- ["AD83",0x74CB],
- ["AD84",0x74CC],
- ["AD85",0x74CD],
- ["AD86",0x74CE],
- ["AD87",0x74CF],
- ["AD88",0x74D0],
- ["AD89",0x74D1],
- ["E8B6",0x74D2],
- ["AD8A",0x74D3],
- ["AD8B",0x74D4],
- ["AD8C",0x74D5],
- ["AD8D",0x74D6],
- ["AD8E",0x74D7],
- ["AD8F",0x74D8],
- ["AD90",0x74D9],
- ["AD91",0x74DA],
- ["AD92",0x74DB],
- ["B9CF",0x74DC],
- ["AD93",0x74DD],
- ["F0AC",0x74DE],
- ["AD94",0x74DF],
- ["F0AD",0x74E0],
- ["AD95",0x74E1],
- ["C6B0",0x74E2],
- ["B0EA",0x74E3],
- ["C8BF",0x74E4],
- ["AD96",0x74E5],
- ["CDDF",0x74E6],
- ["AD97",0x74E7],
- ["AD98",0x74E8],
- ["AD99",0x74E9],
- ["AD9A",0x74EA],
- ["AD9B",0x74EB],
- ["AD9C",0x74EC],
- ["AD9D",0x74ED],
- ["CECD",0x74EE],
- ["EAB1",0x74EF],
- ["AD9E",0x74F0],
- ["AD9F",0x74F1],
- ["ADA0",0x74F2],
- ["AE40",0x74F3],
- ["EAB2",0x74F4],
- ["AE41",0x74F5],
- ["C6BF",0x74F6],
- ["B4C9",0x74F7],
- ["AE42",0x74F8],
- ["AE43",0x74F9],
- ["AE44",0x74FA],
- ["AE45",0x74FB],
- ["AE46",0x74FC],
- ["AE47",0x74FD],
- ["AE48",0x74FE],
- ["EAB3",0x74FF],
- ["AE49",0x7500],
- ["AE4A",0x7501],
- ["AE4B",0x7502],
- ["AE4C",0x7503],
- ["D5E7",0x7504],
- ["AE4D",0x7505],
- ["AE4E",0x7506],
- ["AE4F",0x7507],
- ["AE50",0x7508],
- ["AE51",0x7509],
- ["AE52",0x750A],
- ["AE53",0x750B],
- ["AE54",0x750C],
- ["DDF9",0x750D],
- ["AE55",0x750E],
- ["EAB4",0x750F],
- ["AE56",0x7510],
- ["EAB5",0x7511],
- ["AE57",0x7512],
- ["EAB6",0x7513],
- ["AE58",0x7514],
- ["AE59",0x7515],
- ["AE5A",0x7516],
- ["AE5B",0x7517],
- ["B8CA",0x7518],
- ["DFB0",0x7519],
- ["C9F5",0x751A],
- ["AE5C",0x751B],
- ["CCF0",0x751C],
- ["AE5D",0x751D],
- ["AE5E",0x751E],
- ["C9FA",0x751F],
- ["AE5F",0x7520],
- ["AE60",0x7521],
- ["AE61",0x7522],
- ["AE62",0x7523],
- ["AE63",0x7524],
- ["C9FB",0x7525],
- ["AE64",0x7526],
- ["AE65",0x7527],
- ["D3C3",0x7528],
- ["CBA6",0x7529],
- ["AE66",0x752A],
- ["B8A6",0x752B],
- ["F0AE",0x752C],
- ["B1C2",0x752D],
- ["AE67",0x752E],
- ["E5B8",0x752F],
- ["CCEF",0x7530],
- ["D3C9",0x7531],
- ["BCD7",0x7532],
- ["C9EA",0x7533],
- ["AE68",0x7534],
- ["B5E7",0x7535],
- ["AE69",0x7536],
- ["C4D0",0x7537],
- ["B5E9",0x7538],
- ["AE6A",0x7539],
- ["EEAE",0x753A],
- ["BBAD",0x753B],
- ["AE6B",0x753C],
- ["AE6C",0x753D],
- ["E7DE",0x753E],
- ["AE6D",0x753F],
- ["EEAF",0x7540],
- ["AE6E",0x7541],
- ["AE6F",0x7542],
- ["AE70",0x7543],
- ["AE71",0x7544],
- ["B3A9",0x7545],
- ["AE72",0x7546],
- ["AE73",0x7547],
- ["EEB2",0x7548],
- ["AE74",0x7549],
- ["AE75",0x754A],
- ["EEB1",0x754B],
- ["BDE7",0x754C],
- ["AE76",0x754D],
- ["EEB0",0x754E],
- ["CEB7",0x754F],
- ["AE77",0x7550],
- ["AE78",0x7551],
- ["AE79",0x7552],
- ["AE7A",0x7553],
- ["C5CF",0x7554],
- ["AE7B",0x7555],
- ["AE7C",0x7556],
- ["AE7D",0x7557],
- ["AE7E",0x7558],
- ["C1F4",0x7559],
- ["DBCE",0x755A],
- ["EEB3",0x755B],
- ["D0F3",0x755C],
- ["AE80",0x755D],
- ["AE81",0x755E],
- ["AE82",0x755F],
- ["AE83",0x7560],
- ["AE84",0x7561],
- ["AE85",0x7562],
- ["AE86",0x7563],
- ["AE87",0x7564],
- ["C2D4",0x7565],
- ["C6E8",0x7566],
- ["AE88",0x7567],
- ["AE89",0x7568],
- ["AE8A",0x7569],
- ["B7AC",0x756A],
- ["AE8B",0x756B],
- ["AE8C",0x756C],
- ["AE8D",0x756D],
- ["AE8E",0x756E],
- ["AE8F",0x756F],
- ["AE90",0x7570],
- ["AE91",0x7571],
- ["EEB4",0x7572],
- ["AE92",0x7573],
- ["B3EB",0x7574],
- ["AE93",0x7575],
- ["AE94",0x7576],
- ["AE95",0x7577],
- ["BBFB",0x7578],
- ["EEB5",0x7579],
- ["AE96",0x757A],
- ["AE97",0x757B],
- ["AE98",0x757C],
- ["AE99",0x757D],
- ["AE9A",0x757E],
- ["E7DC",0x757F],
- ["AE9B",0x7580],
- ["AE9C",0x7581],
- ["AE9D",0x7582],
- ["EEB6",0x7583],
- ["AE9E",0x7584],
- ["AE9F",0x7585],
- ["BDAE",0x7586],
- ["AEA0",0x7587],
- ["AF40",0x7588],
- ["AF41",0x7589],
- ["AF42",0x758A],
- ["F1E2",0x758B],
- ["AF43",0x758C],
- ["AF44",0x758D],
- ["AF45",0x758E],
- ["CAE8",0x758F],
- ["AF46",0x7590],
- ["D2C9",0x7591],
- ["F0DA",0x7592],
- ["AF47",0x7593],
- ["F0DB",0x7594],
- ["AF48",0x7595],
- ["F0DC",0x7596],
- ["C1C6",0x7597],
- ["AF49",0x7598],
- ["B8ED",0x7599],
- ["BECE",0x759A],
- ["AF4A",0x759B],
- ["AF4B",0x759C],
- ["F0DE",0x759D],
- ["AF4C",0x759E],
- ["C5B1",0x759F],
- ["F0DD",0x75A0],
- ["D1F1",0x75A1],
- ["AF4D",0x75A2],
- ["F0E0",0x75A3],
- ["B0CC",0x75A4],
- ["BDEA",0x75A5],
- ["AF4E",0x75A6],
- ["AF4F",0x75A7],
- ["AF50",0x75A8],
- ["AF51",0x75A9],
- ["AF52",0x75AA],
- ["D2DF",0x75AB],
- ["F0DF",0x75AC],
- ["AF53",0x75AD],
- ["B4AF",0x75AE],
- ["B7E8",0x75AF],
- ["F0E6",0x75B0],
- ["F0E5",0x75B1],
- ["C6A3",0x75B2],
- ["F0E1",0x75B3],
- ["F0E2",0x75B4],
- ["B4C3",0x75B5],
- ["AF54",0x75B6],
- ["AF55",0x75B7],
- ["F0E3",0x75B8],
- ["D5EE",0x75B9],
- ["AF56",0x75BA],
- ["AF57",0x75BB],
- ["CCDB",0x75BC],
- ["BED2",0x75BD],
- ["BCB2",0x75BE],
- ["AF58",0x75BF],
- ["AF59",0x75C0],
- ["AF5A",0x75C1],
- ["F0E8",0x75C2],
- ["F0E7",0x75C3],
- ["F0E4",0x75C4],
- ["B2A1",0x75C5],
- ["AF5B",0x75C6],
- ["D6A2",0x75C7],
- ["D3B8",0x75C8],
- ["BEB7",0x75C9],
- ["C8AC",0x75CA],
- ["AF5C",0x75CB],
- ["AF5D",0x75CC],
- ["F0EA",0x75CD],
- ["AF5E",0x75CE],
- ["AF5F",0x75CF],
- ["AF60",0x75D0],
- ["AF61",0x75D1],
- ["D1F7",0x75D2],
- ["AF62",0x75D3],
- ["D6CC",0x75D4],
- ["BADB",0x75D5],
- ["F0E9",0x75D6],
- ["AF63",0x75D7],
- ["B6BB",0x75D8],
- ["AF64",0x75D9],
- ["AF65",0x75DA],
- ["CDB4",0x75DB],
- ["AF66",0x75DC],
- ["AF67",0x75DD],
- ["C6A6",0x75DE],
- ["AF68",0x75DF],
- ["AF69",0x75E0],
- ["AF6A",0x75E1],
- ["C1A1",0x75E2],
- ["F0EB",0x75E3],
- ["F0EE",0x75E4],
- ["AF6B",0x75E5],
- ["F0ED",0x75E6],
- ["F0F0",0x75E7],
- ["F0EC",0x75E8],
- ["AF6C",0x75E9],
- ["BBBE",0x75EA],
- ["F0EF",0x75EB],
- ["AF6D",0x75EC],
- ["AF6E",0x75ED],
- ["AF6F",0x75EE],
- ["AF70",0x75EF],
- ["CCB5",0x75F0],
- ["F0F2",0x75F1],
- ["AF71",0x75F2],
- ["AF72",0x75F3],
- ["B3D5",0x75F4],
- ["AF73",0x75F5],
- ["AF74",0x75F6],
- ["AF75",0x75F7],
- ["AF76",0x75F8],
- ["B1D4",0x75F9],
- ["AF77",0x75FA],
- ["AF78",0x75FB],
- ["F0F3",0x75FC],
- ["AF79",0x75FD],
- ["AF7A",0x75FE],
- ["F0F4",0x75FF],
- ["F0F6",0x7600],
- ["B4E1",0x7601],
- ["AF7B",0x7602],
- ["F0F1",0x7603],
- ["AF7C",0x7604],
- ["F0F7",0x7605],
- ["AF7D",0x7606],
- ["AF7E",0x7607],
- ["AF80",0x7608],
- ["AF81",0x7609],
- ["F0FA",0x760A],
- ["AF82",0x760B],
- ["F0F8",0x760C],
- ["AF83",0x760D],
- ["AF84",0x760E],
- ["AF85",0x760F],
- ["F0F5",0x7610],
- ["AF86",0x7611],
- ["AF87",0x7612],
- ["AF88",0x7613],
- ["AF89",0x7614],
- ["F0FD",0x7615],
- ["AF8A",0x7616],
- ["F0F9",0x7617],
- ["F0FC",0x7618],
- ["F0FE",0x7619],
- ["AF8B",0x761A],
- ["F1A1",0x761B],
- ["AF8C",0x761C],
- ["AF8D",0x761D],
- ["AF8E",0x761E],
- ["CEC1",0x761F],
- ["F1A4",0x7620],
- ["AF8F",0x7621],
- ["F1A3",0x7622],
- ["AF90",0x7623],
- ["C1F6",0x7624],
- ["F0FB",0x7625],
- ["CADD",0x7626],
- ["AF91",0x7627],
- ["AF92",0x7628],
- ["B4F1",0x7629],
- ["B1F1",0x762A],
- ["CCB1",0x762B],
- ["AF93",0x762C],
- ["F1A6",0x762D],
- ["AF94",0x762E],
- ["AF95",0x762F],
- ["F1A7",0x7630],
- ["AF96",0x7631],
- ["AF97",0x7632],
- ["F1AC",0x7633],
- ["D5CE",0x7634],
- ["F1A9",0x7635],
- ["AF98",0x7636],
- ["AF99",0x7637],
- ["C8B3",0x7638],
- ["AF9A",0x7639],
- ["AF9B",0x763A],
- ["AF9C",0x763B],
- ["F1A2",0x763C],
- ["AF9D",0x763D],
- ["F1AB",0x763E],
- ["F1A8",0x763F],
- ["F1A5",0x7640],
- ["AF9E",0x7641],
- ["AF9F",0x7642],
- ["F1AA",0x7643],
- ["AFA0",0x7644],
- ["B040",0x7645],
- ["B041",0x7646],
- ["B042",0x7647],
- ["B043",0x7648],
- ["B044",0x7649],
- ["B045",0x764A],
- ["B046",0x764B],
- ["B0A9",0x764C],
- ["F1AD",0x764D],
- ["B047",0x764E],
- ["B048",0x764F],
- ["B049",0x7650],
- ["B04A",0x7651],
- ["B04B",0x7652],
- ["B04C",0x7653],
- ["F1AF",0x7654],
- ["B04D",0x7655],
- ["F1B1",0x7656],
- ["B04E",0x7657],
- ["B04F",0x7658],
- ["B050",0x7659],
- ["B051",0x765A],
- ["B052",0x765B],
- ["F1B0",0x765C],
- ["B053",0x765D],
- ["F1AE",0x765E],
- ["B054",0x765F],
- ["B055",0x7660],
- ["B056",0x7661],
- ["B057",0x7662],
- ["D1A2",0x7663],
- ["B058",0x7664],
- ["B059",0x7665],
- ["B05A",0x7666],
- ["B05B",0x7667],
- ["B05C",0x7668],
- ["B05D",0x7669],
- ["B05E",0x766A],
- ["F1B2",0x766B],
- ["B05F",0x766C],
- ["B060",0x766D],
- ["B061",0x766E],
- ["F1B3",0x766F],
- ["B062",0x7670],
- ["B063",0x7671],
- ["B064",0x7672],
- ["B065",0x7673],
- ["B066",0x7674],
- ["B067",0x7675],
- ["B068",0x7676],
- ["B069",0x7677],
- ["B9EF",0x7678],
- ["B06A",0x7679],
- ["B06B",0x767A],
- ["B5C7",0x767B],
- ["B06C",0x767C],
- ["B0D7",0x767D],
- ["B0D9",0x767E],
- ["B06D",0x767F],
- ["B06E",0x7680],
- ["B06F",0x7681],
- ["D4ED",0x7682],
- ["B070",0x7683],
- ["B5C4",0x7684],
- ["B071",0x7685],
- ["BDD4",0x7686],
- ["BBCA",0x7687],
- ["F0A7",0x7688],
- ["B072",0x7689],
- ["B073",0x768A],
- ["B8DE",0x768B],
- ["B074",0x768C],
- ["B075",0x768D],
- ["F0A8",0x768E],
- ["B076",0x768F],
- ["B077",0x7690],
- ["B0A8",0x7691],
- ["B078",0x7692],
- ["F0A9",0x7693],
- ["B079",0x7694],
- ["B07A",0x7695],
- ["CDEE",0x7696],
- ["B07B",0x7697],
- ["B07C",0x7698],
- ["F0AA",0x7699],
- ["B07D",0x769A],
- ["B07E",0x769B],
- ["B080",0x769C],
- ["B081",0x769D],
- ["B082",0x769E],
- ["B083",0x769F],
- ["B084",0x76A0],
- ["B085",0x76A1],
- ["B086",0x76A2],
- ["B087",0x76A3],
- ["F0AB",0x76A4],
- ["B088",0x76A5],
- ["B089",0x76A6],
- ["B08A",0x76A7],
- ["B08B",0x76A8],
- ["B08C",0x76A9],
- ["B08D",0x76AA],
- ["B08E",0x76AB],
- ["B08F",0x76AC],
- ["B090",0x76AD],
- ["C6A4",0x76AE],
- ["B091",0x76AF],
- ["B092",0x76B0],
- ["D6E5",0x76B1],
- ["F1E4",0x76B2],
- ["B093",0x76B3],
- ["F1E5",0x76B4],
- ["B094",0x76B5],
- ["B095",0x76B6],
- ["B096",0x76B7],
- ["B097",0x76B8],
- ["B098",0x76B9],
- ["B099",0x76BA],
- ["B09A",0x76BB],
- ["B09B",0x76BC],
- ["B09C",0x76BD],
- ["B09D",0x76BE],
- ["C3F3",0x76BF],
- ["B09E",0x76C0],
- ["B09F",0x76C1],
- ["D3DB",0x76C2],
- ["B0A0",0x76C3],
- ["B140",0x76C4],
- ["D6D1",0x76C5],
- ["C5E8",0x76C6],
- ["B141",0x76C7],
- ["D3AF",0x76C8],
- ["B142",0x76C9],
- ["D2E6",0x76CA],
- ["B143",0x76CB],
- ["B144",0x76CC],
- ["EEC1",0x76CD],
- ["B0BB",0x76CE],
- ["D5B5",0x76CF],
- ["D1CE",0x76D0],
- ["BCE0",0x76D1],
- ["BAD0",0x76D2],
- ["B145",0x76D3],
- ["BFF8",0x76D4],
- ["B146",0x76D5],
- ["B8C7",0x76D6],
- ["B5C1",0x76D7],
- ["C5CC",0x76D8],
- ["B147",0x76D9],
- ["B148",0x76DA],
- ["CAA2",0x76DB],
- ["B149",0x76DC],
- ["B14A",0x76DD],
- ["B14B",0x76DE],
- ["C3CB",0x76DF],
- ["B14C",0x76E0],
- ["B14D",0x76E1],
- ["B14E",0x76E2],
- ["B14F",0x76E3],
- ["B150",0x76E4],
- ["EEC2",0x76E5],
- ["B151",0x76E6],
- ["B152",0x76E7],
- ["B153",0x76E8],
- ["B154",0x76E9],
- ["B155",0x76EA],
- ["B156",0x76EB],
- ["B157",0x76EC],
- ["B158",0x76ED],
- ["C4BF",0x76EE],
- ["B6A2",0x76EF],
- ["B159",0x76F0],
- ["EDEC",0x76F1],
- ["C3A4",0x76F2],
- ["B15A",0x76F3],
- ["D6B1",0x76F4],
- ["B15B",0x76F5],
- ["B15C",0x76F6],
- ["B15D",0x76F7],
- ["CFE0",0x76F8],
- ["EDEF",0x76F9],
- ["B15E",0x76FA],
- ["B15F",0x76FB],
- ["C5CE",0x76FC],
- ["B160",0x76FD],
- ["B6DC",0x76FE],
- ["B161",0x76FF],
- ["B162",0x7700],
- ["CAA1",0x7701],
- ["B163",0x7702],
- ["B164",0x7703],
- ["EDED",0x7704],
- ["B165",0x7705],
- ["B166",0x7706],
- ["EDF0",0x7707],
- ["EDF1",0x7708],
- ["C3BC",0x7709],
- ["B167",0x770A],
- ["BFB4",0x770B],
- ["B168",0x770C],
- ["EDEE",0x770D],
- ["B169",0x770E],
- ["B16A",0x770F],
- ["B16B",0x7710],
- ["B16C",0x7711],
- ["B16D",0x7712],
- ["B16E",0x7713],
- ["B16F",0x7714],
- ["B170",0x7715],
- ["B171",0x7716],
- ["B172",0x7717],
- ["B173",0x7718],
- ["EDF4",0x7719],
- ["EDF2",0x771A],
- ["B174",0x771B],
- ["B175",0x771C],
- ["B176",0x771D],
- ["B177",0x771E],
- ["D5E6",0x771F],
- ["C3DF",0x7720],
- ["B178",0x7721],
- ["EDF3",0x7722],
- ["B179",0x7723],
- ["B17A",0x7724],
- ["B17B",0x7725],
- ["EDF6",0x7726],
- ["B17C",0x7727],
- ["D5A3",0x7728],
- ["D1A3",0x7729],
- ["B17D",0x772A],
- ["B17E",0x772B],
- ["B180",0x772C],
- ["EDF5",0x772D],
- ["B181",0x772E],
- ["C3D0",0x772F],
- ["B182",0x7730],
- ["B183",0x7731],
- ["B184",0x7732],
- ["B185",0x7733],
- ["B186",0x7734],
- ["EDF7",0x7735],
- ["BFF4",0x7736],
- ["BEEC",0x7737],
- ["EDF8",0x7738],
- ["B187",0x7739],
- ["CCF7",0x773A],
- ["B188",0x773B],
- ["D1DB",0x773C],
- ["B189",0x773D],
- ["B18A",0x773E],
- ["B18B",0x773F],
- ["D7C5",0x7740],
- ["D5F6",0x7741],
- ["B18C",0x7742],
- ["EDFC",0x7743],
- ["B18D",0x7744],
- ["B18E",0x7745],
- ["B18F",0x7746],
- ["EDFB",0x7747],
- ["B190",0x7748],
- ["B191",0x7749],
- ["B192",0x774A],
- ["B193",0x774B],
- ["B194",0x774C],
- ["B195",0x774D],
- ["B196",0x774E],
- ["B197",0x774F],
- ["EDF9",0x7750],
- ["EDFA",0x7751],
- ["B198",0x7752],
- ["B199",0x7753],
- ["B19A",0x7754],
- ["B19B",0x7755],
- ["B19C",0x7756],
- ["B19D",0x7757],
- ["B19E",0x7758],
- ["B19F",0x7759],
- ["EDFD",0x775A],
- ["BEA6",0x775B],
- ["B1A0",0x775C],
- ["B240",0x775D],
- ["B241",0x775E],
- ["B242",0x775F],
- ["B243",0x7760],
- ["CBAF",0x7761],
- ["EEA1",0x7762],
- ["B6BD",0x7763],
- ["B244",0x7764],
- ["EEA2",0x7765],
- ["C4C0",0x7766],
- ["B245",0x7767],
- ["EDFE",0x7768],
- ["B246",0x7769],
- ["B247",0x776A],
- ["BDDE",0x776B],
- ["B2C7",0x776C],
- ["B248",0x776D],
- ["B249",0x776E],
- ["B24A",0x776F],
- ["B24B",0x7770],
- ["B24C",0x7771],
- ["B24D",0x7772],
- ["B24E",0x7773],
- ["B24F",0x7774],
- ["B250",0x7775],
- ["B251",0x7776],
- ["B252",0x7777],
- ["B253",0x7778],
- ["B6C3",0x7779],
- ["B254",0x777A],
- ["B255",0x777B],
- ["B256",0x777C],
- ["EEA5",0x777D],
- ["D8BA",0x777E],
- ["EEA3",0x777F],
- ["EEA6",0x7780],
- ["B257",0x7781],
- ["B258",0x7782],
- ["B259",0x7783],
- ["C3E9",0x7784],
- ["B3F2",0x7785],
- ["B25A",0x7786],
- ["B25B",0x7787],
- ["B25C",0x7788],
- ["B25D",0x7789],
- ["B25E",0x778A],
- ["B25F",0x778B],
- ["EEA7",0x778C],
- ["EEA4",0x778D],
- ["CFB9",0x778E],
- ["B260",0x778F],
- ["B261",0x7790],
- ["EEA8",0x7791],
- ["C2F7",0x7792],
- ["B262",0x7793],
- ["B263",0x7794],
- ["B264",0x7795],
- ["B265",0x7796],
- ["B266",0x7797],
- ["B267",0x7798],
- ["B268",0x7799],
- ["B269",0x779A],
- ["B26A",0x779B],
- ["B26B",0x779C],
- ["B26C",0x779D],
- ["B26D",0x779E],
- ["EEA9",0x779F],
- ["EEAA",0x77A0],
- ["B26E",0x77A1],
- ["DEAB",0x77A2],
- ["B26F",0x77A3],
- ["B270",0x77A4],
- ["C6B3",0x77A5],
- ["B271",0x77A6],
- ["C7C6",0x77A7],
- ["B272",0x77A8],
- ["D6F5",0x77A9],
- ["B5C9",0x77AA],
- ["B273",0x77AB],
- ["CBB2",0x77AC],
- ["B274",0x77AD],
- ["B275",0x77AE],
- ["B276",0x77AF],
- ["EEAB",0x77B0],
- ["B277",0x77B1],
- ["B278",0x77B2],
- ["CDAB",0x77B3],
- ["B279",0x77B4],
- ["EEAC",0x77B5],
- ["B27A",0x77B6],
- ["B27B",0x77B7],
- ["B27C",0x77B8],
- ["B27D",0x77B9],
- ["B27E",0x77BA],
- ["D5B0",0x77BB],
- ["B280",0x77BC],
- ["EEAD",0x77BD],
- ["B281",0x77BE],
- ["F6C4",0x77BF],
- ["B282",0x77C0],
- ["B283",0x77C1],
- ["B284",0x77C2],
- ["B285",0x77C3],
- ["B286",0x77C4],
- ["B287",0x77C5],
- ["B288",0x77C6],
- ["B289",0x77C7],
- ["B28A",0x77C8],
- ["B28B",0x77C9],
- ["B28C",0x77CA],
- ["B28D",0x77CB],
- ["B28E",0x77CC],
- ["DBC7",0x77CD],
- ["B28F",0x77CE],
- ["B290",0x77CF],
- ["B291",0x77D0],
- ["B292",0x77D1],
- ["B293",0x77D2],
- ["B294",0x77D3],
- ["B295",0x77D4],
- ["B296",0x77D5],
- ["B297",0x77D6],
- ["B4A3",0x77D7],
- ["B298",0x77D8],
- ["B299",0x77D9],
- ["B29A",0x77DA],
- ["C3AC",0x77DB],
- ["F1E6",0x77DC],
- ["B29B",0x77DD],
- ["B29C",0x77DE],
- ["B29D",0x77DF],
- ["B29E",0x77E0],
- ["B29F",0x77E1],
- ["CAB8",0x77E2],
- ["D2D3",0x77E3],
- ["B2A0",0x77E4],
- ["D6AA",0x77E5],
- ["B340",0x77E6],
- ["EFF2",0x77E7],
- ["B341",0x77E8],
- ["BED8",0x77E9],
- ["B342",0x77EA],
- ["BDC3",0x77EB],
- ["EFF3",0x77EC],
- ["B6CC",0x77ED],
- ["B0AB",0x77EE],
- ["B343",0x77EF],
- ["B344",0x77F0],
- ["B345",0x77F1],
- ["B346",0x77F2],
- ["CAAF",0x77F3],
- ["B347",0x77F4],
- ["B348",0x77F5],
- ["EDB6",0x77F6],
- ["B349",0x77F7],
- ["EDB7",0x77F8],
- ["B34A",0x77F9],
- ["B34B",0x77FA],
- ["B34C",0x77FB],
- ["B34D",0x77FC],
- ["CEF9",0x77FD],
- ["B7AF",0x77FE],
- ["BFF3",0x77FF],
- ["EDB8",0x7800],
- ["C2EB",0x7801],
- ["C9B0",0x7802],
- ["B34E",0x7803],
- ["B34F",0x7804],
- ["B350",0x7805],
- ["B351",0x7806],
- ["B352",0x7807],
- ["B353",0x7808],
- ["EDB9",0x7809],
- ["B354",0x780A],
- ["B355",0x780B],
- ["C6F6",0x780C],
- ["BFB3",0x780D],
- ["B356",0x780E],
- ["B357",0x780F],
- ["B358",0x7810],
- ["EDBC",0x7811],
- ["C5F8",0x7812],
- ["B359",0x7813],
- ["D1D0",0x7814],
- ["B35A",0x7815],
- ["D7A9",0x7816],
- ["EDBA",0x7817],
- ["EDBB",0x7818],
- ["B35B",0x7819],
- ["D1E2",0x781A],
- ["B35C",0x781B],
- ["EDBF",0x781C],
- ["EDC0",0x781D],
- ["B35D",0x781E],
- ["EDC4",0x781F],
- ["B35E",0x7820],
- ["B35F",0x7821],
- ["B360",0x7822],
- ["EDC8",0x7823],
- ["B361",0x7824],
- ["EDC6",0x7825],
- ["EDCE",0x7826],
- ["D5E8",0x7827],
- ["B362",0x7828],
- ["EDC9",0x7829],
- ["B363",0x782A],
- ["B364",0x782B],
- ["EDC7",0x782C],
- ["EDBE",0x782D],
- ["B365",0x782E],
- ["B366",0x782F],
- ["C5E9",0x7830],
- ["B367",0x7831],
- ["B368",0x7832],
- ["B369",0x7833],
- ["C6C6",0x7834],
- ["B36A",0x7835],
- ["B36B",0x7836],
- ["C9E9",0x7837],
- ["D4D2",0x7838],
- ["EDC1",0x7839],
- ["EDC2",0x783A],
- ["EDC3",0x783B],
- ["EDC5",0x783C],
- ["B36C",0x783D],
- ["C0F9",0x783E],
- ["B36D",0x783F],
- ["B4A1",0x7840],
- ["B36E",0x7841],
- ["B36F",0x7842],
- ["B370",0x7843],
- ["B371",0x7844],
- ["B9E8",0x7845],
- ["B372",0x7846],
- ["EDD0",0x7847],
- ["B373",0x7848],
- ["B374",0x7849],
- ["B375",0x784A],
- ["B376",0x784B],
- ["EDD1",0x784C],
- ["B377",0x784D],
- ["EDCA",0x784E],
- ["B378",0x784F],
- ["EDCF",0x7850],
- ["B379",0x7851],
- ["CEF8",0x7852],
- ["B37A",0x7853],
- ["B37B",0x7854],
- ["CBB6",0x7855],
- ["EDCC",0x7856],
- ["EDCD",0x7857],
- ["B37C",0x7858],
- ["B37D",0x7859],
- ["B37E",0x785A],
- ["B380",0x785B],
- ["B381",0x785C],
- ["CFF5",0x785D],
- ["B382",0x785E],
- ["B383",0x785F],
- ["B384",0x7860],
- ["B385",0x7861],
- ["B386",0x7862],
- ["B387",0x7863],
- ["B388",0x7864],
- ["B389",0x7865],
- ["B38A",0x7866],
- ["B38B",0x7867],
- ["B38C",0x7868],
- ["B38D",0x7869],
- ["EDD2",0x786A],
- ["C1F2",0x786B],
- ["D3B2",0x786C],
- ["EDCB",0x786D],
- ["C8B7",0x786E],
- ["B38E",0x786F],
- ["B38F",0x7870],
- ["B390",0x7871],
- ["B391",0x7872],
- ["B392",0x7873],
- ["B393",0x7874],
- ["B394",0x7875],
- ["B395",0x7876],
- ["BCEF",0x7877],
- ["B396",0x7878],
- ["B397",0x7879],
- ["B398",0x787A],
- ["B399",0x787B],
- ["C5F0",0x787C],
- ["B39A",0x787D],
- ["B39B",0x787E],
- ["B39C",0x787F],
- ["B39D",0x7880],
- ["B39E",0x7881],
- ["B39F",0x7882],
- ["B3A0",0x7883],
- ["B440",0x7884],
- ["B441",0x7885],
- ["B442",0x7886],
- ["EDD6",0x7887],
- ["B443",0x7888],
- ["B5EF",0x7889],
- ["B444",0x788A],
- ["B445",0x788B],
- ["C2B5",0x788C],
- ["B0AD",0x788D],
- ["CBE9",0x788E],
- ["B446",0x788F],
- ["B447",0x7890],
- ["B1AE",0x7891],
- ["B448",0x7892],
- ["EDD4",0x7893],
- ["B449",0x7894],
- ["B44A",0x7895],
- ["B44B",0x7896],
- ["CDEB",0x7897],
- ["B5E2",0x7898],
- ["B44C",0x7899],
- ["EDD5",0x789A],
- ["EDD3",0x789B],
- ["EDD7",0x789C],
- ["B44D",0x789D],
- ["B44E",0x789E],
- ["B5FA",0x789F],
- ["B44F",0x78A0],
- ["EDD8",0x78A1],
- ["B450",0x78A2],
- ["EDD9",0x78A3],
- ["B451",0x78A4],
- ["EDDC",0x78A5],
- ["B452",0x78A6],
- ["B1CC",0x78A7],
- ["B453",0x78A8],
- ["B454",0x78A9],
- ["B455",0x78AA],
- ["B456",0x78AB],
- ["B457",0x78AC],
- ["B458",0x78AD],
- ["B459",0x78AE],
- ["B45A",0x78AF],
- ["C5F6",0x78B0],
- ["BCEE",0x78B1],
- ["EDDA",0x78B2],
- ["CCBC",0x78B3],
- ["B2EA",0x78B4],
- ["B45B",0x78B5],
- ["B45C",0x78B6],
- ["B45D",0x78B7],
- ["B45E",0x78B8],
- ["EDDB",0x78B9],
- ["B45F",0x78BA],
- ["B460",0x78BB],
- ["B461",0x78BC],
- ["B462",0x78BD],
- ["C4EB",0x78BE],
- ["B463",0x78BF],
- ["B464",0x78C0],
- ["B4C5",0x78C1],
- ["B465",0x78C2],
- ["B466",0x78C3],
- ["B467",0x78C4],
- ["B0F5",0x78C5],
- ["B468",0x78C6],
- ["B469",0x78C7],
- ["B46A",0x78C8],
- ["EDDF",0x78C9],
- ["C0DA",0x78CA],
- ["B4E8",0x78CB],
- ["B46B",0x78CC],
- ["B46C",0x78CD],
- ["B46D",0x78CE],
- ["B46E",0x78CF],
- ["C5CD",0x78D0],
- ["B46F",0x78D1],
- ["B470",0x78D2],
- ["B471",0x78D3],
- ["EDDD",0x78D4],
- ["BFC4",0x78D5],
- ["B472",0x78D6],
- ["B473",0x78D7],
- ["B474",0x78D8],
- ["EDDE",0x78D9],
- ["B475",0x78DA],
- ["B476",0x78DB],
- ["B477",0x78DC],
- ["B478",0x78DD],
- ["B479",0x78DE],
- ["B47A",0x78DF],
- ["B47B",0x78E0],
- ["B47C",0x78E1],
- ["B47D",0x78E2],
- ["B47E",0x78E3],
- ["B480",0x78E4],
- ["B481",0x78E5],
- ["B482",0x78E6],
- ["B483",0x78E7],
- ["C4A5",0x78E8],
- ["B484",0x78E9],
- ["B485",0x78EA],
- ["B486",0x78EB],
- ["EDE0",0x78EC],
- ["B487",0x78ED],
- ["B488",0x78EE],
- ["B489",0x78EF],
- ["B48A",0x78F0],
- ["B48B",0x78F1],
- ["EDE1",0x78F2],
- ["B48C",0x78F3],
- ["EDE3",0x78F4],
- ["B48D",0x78F5],
- ["B48E",0x78F6],
- ["C1D7",0x78F7],
- ["B48F",0x78F8],
- ["B490",0x78F9],
- ["BBC7",0x78FA],
- ["B491",0x78FB],
- ["B492",0x78FC],
- ["B493",0x78FD],
- ["B494",0x78FE],
- ["B495",0x78FF],
- ["B496",0x7900],
- ["BDB8",0x7901],
- ["B497",0x7902],
- ["B498",0x7903],
- ["B499",0x7904],
- ["EDE2",0x7905],
- ["B49A",0x7906],
- ["B49B",0x7907],
- ["B49C",0x7908],
- ["B49D",0x7909],
- ["B49E",0x790A],
- ["B49F",0x790B],
- ["B4A0",0x790C],
- ["B540",0x790D],
- ["B541",0x790E],
- ["B542",0x790F],
- ["B543",0x7910],
- ["B544",0x7911],
- ["B545",0x7912],
- ["EDE4",0x7913],
- ["B546",0x7914],
- ["B547",0x7915],
- ["B548",0x7916],
- ["B549",0x7917],
- ["B54A",0x7918],
- ["B54B",0x7919],
- ["B54C",0x791A],
- ["B54D",0x791B],
- ["B54E",0x791C],
- ["B54F",0x791D],
- ["EDE6",0x791E],
- ["B550",0x791F],
- ["B551",0x7920],
- ["B552",0x7921],
- ["B553",0x7922],
- ["B554",0x7923],
- ["EDE5",0x7924],
- ["B555",0x7925],
- ["B556",0x7926],
- ["B557",0x7927],
- ["B558",0x7928],
- ["B559",0x7929],
- ["B55A",0x792A],
- ["B55B",0x792B],
- ["B55C",0x792C],
- ["B55D",0x792D],
- ["B55E",0x792E],
- ["B55F",0x792F],
- ["B560",0x7930],
- ["B561",0x7931],
- ["B562",0x7932],
- ["B563",0x7933],
- ["EDE7",0x7934],
- ["B564",0x7935],
- ["B565",0x7936],
- ["B566",0x7937],
- ["B567",0x7938],
- ["B568",0x7939],
- ["CABE",0x793A],
- ["ECEA",0x793B],
- ["C0F1",0x793C],
- ["B569",0x793D],
- ["C9E7",0x793E],
- ["B56A",0x793F],
- ["ECEB",0x7940],
- ["C6EE",0x7941],
- ["B56B",0x7942],
- ["B56C",0x7943],
- ["B56D",0x7944],
- ["B56E",0x7945],
- ["ECEC",0x7946],
- ["B56F",0x7947],
- ["C6ED",0x7948],
- ["ECED",0x7949],
- ["B570",0x794A],
- ["B571",0x794B],
- ["B572",0x794C],
- ["B573",0x794D],
- ["B574",0x794E],
- ["B575",0x794F],
- ["B576",0x7950],
- ["B577",0x7951],
- ["B578",0x7952],
- ["ECF0",0x7953],
- ["B579",0x7954],
- ["B57A",0x7955],
- ["D7E6",0x7956],
- ["ECF3",0x7957],
- ["B57B",0x7958],
- ["B57C",0x7959],
- ["ECF1",0x795A],
- ["ECEE",0x795B],
- ["ECEF",0x795C],
- ["D7A3",0x795D],
- ["C9F1",0x795E],
- ["CBEE",0x795F],
- ["ECF4",0x7960],
- ["B57D",0x7961],
- ["ECF2",0x7962],
- ["B57E",0x7963],
- ["B580",0x7964],
- ["CFE9",0x7965],
- ["B581",0x7966],
- ["ECF6",0x7967],
- ["C6B1",0x7968],
- ["B582",0x7969],
- ["B583",0x796A],
- ["B584",0x796B],
- ["B585",0x796C],
- ["BCC0",0x796D],
- ["B586",0x796E],
- ["ECF5",0x796F],
- ["B587",0x7970],
- ["B588",0x7971],
- ["B589",0x7972],
- ["B58A",0x7973],
- ["B58B",0x7974],
- ["B58C",0x7975],
- ["B58D",0x7976],
- ["B5BB",0x7977],
- ["BBF6",0x7978],
- ["B58E",0x7979],
- ["ECF7",0x797A],
- ["B58F",0x797B],
- ["B590",0x797C],
- ["B591",0x797D],
- ["B592",0x797E],
- ["B593",0x797F],
- ["D9F7",0x7980],
- ["BDFB",0x7981],
- ["B594",0x7982],
- ["B595",0x7983],
- ["C2BB",0x7984],
- ["ECF8",0x7985],
- ["B596",0x7986],
- ["B597",0x7987],
- ["B598",0x7988],
- ["B599",0x7989],
- ["ECF9",0x798A],
- ["B59A",0x798B],
- ["B59B",0x798C],
- ["B59C",0x798D],
- ["B59D",0x798E],
- ["B8A3",0x798F],
- ["B59E",0x7990],
- ["B59F",0x7991],
- ["B5A0",0x7992],
- ["B640",0x7993],
- ["B641",0x7994],
- ["B642",0x7995],
- ["B643",0x7996],
- ["B644",0x7997],
- ["B645",0x7998],
- ["B646",0x7999],
- ["ECFA",0x799A],
- ["B647",0x799B],
- ["B648",0x799C],
- ["B649",0x799D],
- ["B64A",0x799E],
- ["B64B",0x799F],
- ["B64C",0x79A0],
- ["B64D",0x79A1],
- ["B64E",0x79A2],
- ["B64F",0x79A3],
- ["B650",0x79A4],
- ["B651",0x79A5],
- ["B652",0x79A6],
- ["ECFB",0x79A7],
- ["B653",0x79A8],
- ["B654",0x79A9],
- ["B655",0x79AA],
- ["B656",0x79AB],
- ["B657",0x79AC],
- ["B658",0x79AD],
- ["B659",0x79AE],
- ["B65A",0x79AF],
- ["B65B",0x79B0],
- ["B65C",0x79B1],
- ["B65D",0x79B2],
- ["ECFC",0x79B3],
- ["B65E",0x79B4],
- ["B65F",0x79B5],
- ["B660",0x79B6],
- ["B661",0x79B7],
- ["B662",0x79B8],
- ["D3ED",0x79B9],
- ["D8AE",0x79BA],
- ["C0EB",0x79BB],
- ["B663",0x79BC],
- ["C7DD",0x79BD],
- ["BACC",0x79BE],
- ["B664",0x79BF],
- ["D0E3",0x79C0],
- ["CBBD",0x79C1],
- ["B665",0x79C2],
- ["CDBA",0x79C3],
- ["B666",0x79C4],
- ["B667",0x79C5],
- ["B8D1",0x79C6],
- ["B668",0x79C7],
- ["B669",0x79C8],
- ["B1FC",0x79C9],
- ["B66A",0x79CA],
- ["C7EF",0x79CB],
- ["B66B",0x79CC],
- ["D6D6",0x79CD],
- ["B66C",0x79CE],
- ["B66D",0x79CF],
- ["B66E",0x79D0],
- ["BFC6",0x79D1],
- ["C3EB",0x79D2],
- ["B66F",0x79D3],
- ["B670",0x79D4],
- ["EFF5",0x79D5],
- ["B671",0x79D6],
- ["B672",0x79D7],
- ["C3D8",0x79D8],
- ["B673",0x79D9],
- ["B674",0x79DA],
- ["B675",0x79DB],
- ["B676",0x79DC],
- ["B677",0x79DD],
- ["B678",0x79DE],
- ["D7E2",0x79DF],
- ["B679",0x79E0],
- ["B67A",0x79E1],
- ["B67B",0x79E2],
- ["EFF7",0x79E3],
- ["B3D3",0x79E4],
- ["B67C",0x79E5],
- ["C7D8",0x79E6],
- ["D1ED",0x79E7],
- ["B67D",0x79E8],
- ["D6C8",0x79E9],
- ["B67E",0x79EA],
- ["EFF8",0x79EB],
- ["B680",0x79EC],
- ["EFF6",0x79ED],
- ["B681",0x79EE],
- ["BBFD",0x79EF],
- ["B3C6",0x79F0],
- ["B682",0x79F1],
- ["B683",0x79F2],
- ["B684",0x79F3],
- ["B685",0x79F4],
- ["B686",0x79F5],
- ["B687",0x79F6],
- ["B688",0x79F7],
- ["BDD5",0x79F8],
- ["B689",0x79F9],
- ["B68A",0x79FA],
- ["D2C6",0x79FB],
- ["B68B",0x79FC],
- ["BBE0",0x79FD],
- ["B68C",0x79FE],
- ["B68D",0x79FF],
- ["CFA1",0x7A00],
- ["B68E",0x7A01],
- ["EFFC",0x7A02],
- ["EFFB",0x7A03],
- ["B68F",0x7A04],
- ["B690",0x7A05],
- ["EFF9",0x7A06],
- ["B691",0x7A07],
- ["B692",0x7A08],
- ["B693",0x7A09],
- ["B694",0x7A0A],
- ["B3CC",0x7A0B],
- ["B695",0x7A0C],
- ["C9D4",0x7A0D],
- ["CBB0",0x7A0E],
- ["B696",0x7A0F],
- ["B697",0x7A10],
- ["B698",0x7A11],
- ["B699",0x7A12],
- ["B69A",0x7A13],
- ["EFFE",0x7A14],
- ["B69B",0x7A15],
- ["B69C",0x7A16],
- ["B0DE",0x7A17],
- ["B69D",0x7A18],
- ["B69E",0x7A19],
- ["D6C9",0x7A1A],
- ["B69F",0x7A1B],
- ["B6A0",0x7A1C],
- ["B740",0x7A1D],
- ["EFFD",0x7A1E],
- ["B741",0x7A1F],
- ["B3ED",0x7A20],
- ["B742",0x7A21],
- ["B743",0x7A22],
- ["F6D5",0x7A23],
- ["B744",0x7A24],
- ["B745",0x7A25],
- ["B746",0x7A26],
- ["B747",0x7A27],
- ["B748",0x7A28],
- ["B749",0x7A29],
- ["B74A",0x7A2A],
- ["B74B",0x7A2B],
- ["B74C",0x7A2C],
- ["B74D",0x7A2D],
- ["B74E",0x7A2E],
- ["B74F",0x7A2F],
- ["B750",0x7A30],
- ["B751",0x7A31],
- ["B752",0x7A32],
- ["CEC8",0x7A33],
- ["B753",0x7A34],
- ["B754",0x7A35],
- ["B755",0x7A36],
- ["F0A2",0x7A37],
- ["B756",0x7A38],
- ["F0A1",0x7A39],
- ["B757",0x7A3A],
- ["B5BE",0x7A3B],
- ["BCDA",0x7A3C],
- ["BBFC",0x7A3D],
- ["B758",0x7A3E],
- ["B8E5",0x7A3F],
- ["B759",0x7A40],
- ["B75A",0x7A41],
- ["B75B",0x7A42],
- ["B75C",0x7A43],
- ["B75D",0x7A44],
- ["B75E",0x7A45],
- ["C4C2",0x7A46],
- ["B75F",0x7A47],
- ["B760",0x7A48],
- ["B761",0x7A49],
- ["B762",0x7A4A],
- ["B763",0x7A4B],
- ["B764",0x7A4C],
- ["B765",0x7A4D],
- ["B766",0x7A4E],
- ["B767",0x7A4F],
- ["B768",0x7A50],
- ["F0A3",0x7A51],
- ["B769",0x7A52],
- ["B76A",0x7A53],
- ["B76B",0x7A54],
- ["B76C",0x7A55],
- ["B76D",0x7A56],
- ["CBEB",0x7A57],
- ["B76E",0x7A58],
- ["B76F",0x7A59],
- ["B770",0x7A5A],
- ["B771",0x7A5B],
- ["B772",0x7A5C],
- ["B773",0x7A5D],
- ["B774",0x7A5E],
- ["B775",0x7A5F],
- ["B776",0x7A60],
- ["B777",0x7A61],
- ["B778",0x7A62],
- ["B779",0x7A63],
- ["B77A",0x7A64],
- ["B77B",0x7A65],
- ["B77C",0x7A66],
- ["B77D",0x7A67],
- ["B77E",0x7A68],
- ["B780",0x7A69],
- ["B781",0x7A6A],
- ["B782",0x7A6B],
- ["B783",0x7A6C],
- ["B784",0x7A6D],
- ["B785",0x7A6E],
- ["B786",0x7A6F],
- ["F0A6",0x7A70],
- ["B787",0x7A71],
- ["B788",0x7A72],
- ["B789",0x7A73],
- ["D1A8",0x7A74],
- ["B78A",0x7A75],
- ["BEBF",0x7A76],
- ["C7EE",0x7A77],
- ["F1B6",0x7A78],
- ["F1B7",0x7A79],
- ["BFD5",0x7A7A],
- ["B78B",0x7A7B],
- ["B78C",0x7A7C],
- ["B78D",0x7A7D],
- ["B78E",0x7A7E],
- ["B4A9",0x7A7F],
- ["F1B8",0x7A80],
- ["CDBB",0x7A81],
- ["B78F",0x7A82],
- ["C7D4",0x7A83],
- ["D5AD",0x7A84],
- ["B790",0x7A85],
- ["F1B9",0x7A86],
- ["B791",0x7A87],
- ["F1BA",0x7A88],
- ["B792",0x7A89],
- ["B793",0x7A8A],
- ["B794",0x7A8B],
- ["B795",0x7A8C],
- ["C7CF",0x7A8D],
- ["B796",0x7A8E],
- ["B797",0x7A8F],
- ["B798",0x7A90],
- ["D2A4",0x7A91],
- ["D6CF",0x7A92],
- ["B799",0x7A93],
- ["B79A",0x7A94],
- ["F1BB",0x7A95],
- ["BDD1",0x7A96],
- ["B4B0",0x7A97],
- ["BEBD",0x7A98],
- ["B79B",0x7A99],
- ["B79C",0x7A9A],
- ["B79D",0x7A9B],
- ["B4DC",0x7A9C],
- ["CED1",0x7A9D],
- ["B79E",0x7A9E],
- ["BFDF",0x7A9F],
- ["F1BD",0x7AA0],
- ["B79F",0x7AA1],
- ["B7A0",0x7AA2],
- ["B840",0x7AA3],
- ["B841",0x7AA4],
- ["BFFA",0x7AA5],
- ["F1BC",0x7AA6],
- ["B842",0x7AA7],
- ["F1BF",0x7AA8],
- ["B843",0x7AA9],
- ["B844",0x7AAA],
- ["B845",0x7AAB],
- ["F1BE",0x7AAC],
- ["F1C0",0x7AAD],
- ["B846",0x7AAE],
- ["B847",0x7AAF],
- ["B848",0x7AB0],
- ["B849",0x7AB1],
- ["B84A",0x7AB2],
- ["F1C1",0x7AB3],
- ["B84B",0x7AB4],
- ["B84C",0x7AB5],
- ["B84D",0x7AB6],
- ["B84E",0x7AB7],
- ["B84F",0x7AB8],
- ["B850",0x7AB9],
- ["B851",0x7ABA],
- ["B852",0x7ABB],
- ["B853",0x7ABC],
- ["B854",0x7ABD],
- ["B855",0x7ABE],
- ["C1FE",0x7ABF],
- ["B856",0x7AC0],
- ["B857",0x7AC1],
- ["B858",0x7AC2],
- ["B859",0x7AC3],
- ["B85A",0x7AC4],
- ["B85B",0x7AC5],
- ["B85C",0x7AC6],
- ["B85D",0x7AC7],
- ["B85E",0x7AC8],
- ["B85F",0x7AC9],
- ["B860",0x7ACA],
- ["C1A2",0x7ACB],
- ["B861",0x7ACC],
- ["B862",0x7ACD],
- ["B863",0x7ACE],
- ["B864",0x7ACF],
- ["B865",0x7AD0],
- ["B866",0x7AD1],
- ["B867",0x7AD2],
- ["B868",0x7AD3],
- ["B869",0x7AD4],
- ["B86A",0x7AD5],
- ["CAFA",0x7AD6],
- ["B86B",0x7AD7],
- ["B86C",0x7AD8],
- ["D5BE",0x7AD9],
- ["B86D",0x7ADA],
- ["B86E",0x7ADB],
- ["B86F",0x7ADC],
- ["B870",0x7ADD],
- ["BEBA",0x7ADE],
- ["BEB9",0x7ADF],
- ["D5C2",0x7AE0],
- ["B871",0x7AE1],
- ["B872",0x7AE2],
- ["BFA2",0x7AE3],
- ["B873",0x7AE4],
- ["CDAF",0x7AE5],
- ["F1B5",0x7AE6],
- ["B874",0x7AE7],
- ["B875",0x7AE8],
- ["B876",0x7AE9],
- ["B877",0x7AEA],
- ["B878",0x7AEB],
- ["B879",0x7AEC],
- ["BDDF",0x7AED],
- ["B87A",0x7AEE],
- ["B6CB",0x7AEF],
- ["B87B",0x7AF0],
- ["B87C",0x7AF1],
- ["B87D",0x7AF2],
- ["B87E",0x7AF3],
- ["B880",0x7AF4],
- ["B881",0x7AF5],
- ["B882",0x7AF6],
- ["B883",0x7AF7],
- ["B884",0x7AF8],
- ["D6F1",0x7AF9],
- ["F3C3",0x7AFA],
- ["B885",0x7AFB],
- ["B886",0x7AFC],
- ["F3C4",0x7AFD],
- ["B887",0x7AFE],
- ["B8CD",0x7AFF],
- ["B888",0x7B00],
- ["B889",0x7B01],
- ["B88A",0x7B02],
- ["F3C6",0x7B03],
- ["F3C7",0x7B04],
- ["B88B",0x7B05],
- ["B0CA",0x7B06],
- ["B88C",0x7B07],
- ["F3C5",0x7B08],
- ["B88D",0x7B09],
- ["F3C9",0x7B0A],
- ["CBF1",0x7B0B],
- ["B88E",0x7B0C],
- ["B88F",0x7B0D],
- ["B890",0x7B0E],
- ["F3CB",0x7B0F],
- ["B891",0x7B10],
- ["D0A6",0x7B11],
- ["B892",0x7B12],
- ["B893",0x7B13],
- ["B1CA",0x7B14],
- ["F3C8",0x7B15],
- ["B894",0x7B16],
- ["B895",0x7B17],
- ["B896",0x7B18],
- ["F3CF",0x7B19],
- ["B897",0x7B1A],
- ["B5D1",0x7B1B],
- ["B898",0x7B1C],
- ["B899",0x7B1D],
- ["F3D7",0x7B1E],
- ["B89A",0x7B1F],
- ["F3D2",0x7B20],
- ["B89B",0x7B21],
- ["B89C",0x7B22],
- ["B89D",0x7B23],
- ["F3D4",0x7B24],
- ["F3D3",0x7B25],
- ["B7FB",0x7B26],
- ["B89E",0x7B27],
- ["B1BF",0x7B28],
- ["B89F",0x7B29],
- ["F3CE",0x7B2A],
- ["F3CA",0x7B2B],
- ["B5DA",0x7B2C],
- ["B8A0",0x7B2D],
- ["F3D0",0x7B2E],
- ["B940",0x7B2F],
- ["B941",0x7B30],
- ["F3D1",0x7B31],
- ["B942",0x7B32],
- ["F3D5",0x7B33],
- ["B943",0x7B34],
- ["B944",0x7B35],
- ["B945",0x7B36],
- ["B946",0x7B37],
- ["F3CD",0x7B38],
- ["B947",0x7B39],
- ["BCE3",0x7B3A],
- ["B948",0x7B3B],
- ["C1FD",0x7B3C],
- ["B949",0x7B3D],
- ["F3D6",0x7B3E],
- ["B94A",0x7B3F],
- ["B94B",0x7B40],
- ["B94C",0x7B41],
- ["B94D",0x7B42],
- ["B94E",0x7B43],
- ["B94F",0x7B44],
- ["F3DA",0x7B45],
- ["B950",0x7B46],
- ["F3CC",0x7B47],
- ["B951",0x7B48],
- ["B5C8",0x7B49],
- ["B952",0x7B4A],
- ["BDEE",0x7B4B],
- ["F3DC",0x7B4C],
- ["B953",0x7B4D],
- ["B954",0x7B4E],
- ["B7A4",0x7B4F],
- ["BFF0",0x7B50],
- ["D6FE",0x7B51],
- ["CDB2",0x7B52],
- ["B955",0x7B53],
- ["B4F0",0x7B54],
- ["B956",0x7B55],
- ["B2DF",0x7B56],
- ["B957",0x7B57],
- ["F3D8",0x7B58],
- ["B958",0x7B59],
- ["F3D9",0x7B5A],
- ["C9B8",0x7B5B],
- ["B959",0x7B5C],
- ["F3DD",0x7B5D],
- ["B95A",0x7B5E],
- ["B95B",0x7B5F],
- ["F3DE",0x7B60],
- ["B95C",0x7B61],
- ["F3E1",0x7B62],
- ["B95D",0x7B63],
- ["B95E",0x7B64],
- ["B95F",0x7B65],
- ["B960",0x7B66],
- ["B961",0x7B67],
- ["B962",0x7B68],
- ["B963",0x7B69],
- ["B964",0x7B6A],
- ["B965",0x7B6B],
- ["B966",0x7B6C],
- ["B967",0x7B6D],
- ["F3DF",0x7B6E],
- ["B968",0x7B6F],
- ["B969",0x7B70],
- ["F3E3",0x7B71],
- ["F3E2",0x7B72],
- ["B96A",0x7B73],
- ["B96B",0x7B74],
- ["F3DB",0x7B75],
- ["B96C",0x7B76],
- ["BFEA",0x7B77],
- ["B96D",0x7B78],
- ["B3EF",0x7B79],
- ["B96E",0x7B7A],
- ["F3E0",0x7B7B],
- ["B96F",0x7B7C],
- ["B970",0x7B7D],
- ["C7A9",0x7B7E],
- ["B971",0x7B7F],
- ["BCF2",0x7B80],
- ["B972",0x7B81],
- ["B973",0x7B82],
- ["B974",0x7B83],
- ["B975",0x7B84],
- ["F3EB",0x7B85],
- ["B976",0x7B86],
- ["B977",0x7B87],
- ["B978",0x7B88],
- ["B979",0x7B89],
- ["B97A",0x7B8A],
- ["B97B",0x7B8B],
- ["B97C",0x7B8C],
- ["B9BF",0x7B8D],
- ["B97D",0x7B8E],
- ["B97E",0x7B8F],
- ["F3E4",0x7B90],
- ["B980",0x7B91],
- ["B981",0x7B92],
- ["B982",0x7B93],
- ["B2AD",0x7B94],
- ["BBFE",0x7B95],
- ["B983",0x7B96],
- ["CBE3",0x7B97],
- ["B984",0x7B98],
- ["B985",0x7B99],
- ["B986",0x7B9A],
- ["B987",0x7B9B],
- ["F3ED",0x7B9C],
- ["F3E9",0x7B9D],
- ["B988",0x7B9E],
- ["B989",0x7B9F],
- ["B98A",0x7BA0],
- ["B9DC",0x7BA1],
- ["F3EE",0x7BA2],
- ["B98B",0x7BA3],
- ["B98C",0x7BA4],
- ["B98D",0x7BA5],
- ["F3E5",0x7BA6],
- ["F3E6",0x7BA7],
- ["F3EA",0x7BA8],
- ["C2E1",0x7BA9],
- ["F3EC",0x7BAA],
- ["F3EF",0x7BAB],
- ["F3E8",0x7BAC],
- ["BCFD",0x7BAD],
- ["B98E",0x7BAE],
- ["B98F",0x7BAF],
- ["B990",0x7BB0],
- ["CFE4",0x7BB1],
- ["B991",0x7BB2],
- ["B992",0x7BB3],
- ["F3F0",0x7BB4],
- ["B993",0x7BB5],
- ["B994",0x7BB6],
- ["B995",0x7BB7],
- ["F3E7",0x7BB8],
- ["B996",0x7BB9],
- ["B997",0x7BBA],
- ["B998",0x7BBB],
- ["B999",0x7BBC],
- ["B99A",0x7BBD],
- ["B99B",0x7BBE],
- ["B99C",0x7BBF],
- ["B99D",0x7BC0],
- ["F3F2",0x7BC1],
- ["B99E",0x7BC2],
- ["B99F",0x7BC3],
- ["B9A0",0x7BC4],
- ["BA40",0x7BC5],
- ["D7AD",0x7BC6],
- ["C6AA",0x7BC7],
- ["BA41",0x7BC8],
- ["BA42",0x7BC9],
- ["BA43",0x7BCA],
- ["BA44",0x7BCB],
- ["F3F3",0x7BCC],
- ["BA45",0x7BCD],
- ["BA46",0x7BCE],
- ["BA47",0x7BCF],
- ["BA48",0x7BD0],
- ["F3F1",0x7BD1],
- ["BA49",0x7BD2],
- ["C2A8",0x7BD3],
- ["BA4A",0x7BD4],
- ["BA4B",0x7BD5],
- ["BA4C",0x7BD6],
- ["BA4D",0x7BD7],
- ["BA4E",0x7BD8],
- ["B8DD",0x7BD9],
- ["F3F5",0x7BDA],
- ["BA4F",0x7BDB],
- ["BA50",0x7BDC],
- ["F3F4",0x7BDD],
- ["BA51",0x7BDE],
- ["BA52",0x7BDF],
- ["BA53",0x7BE0],
- ["B4DB",0x7BE1],
- ["BA54",0x7BE2],
- ["BA55",0x7BE3],
- ["BA56",0x7BE4],
- ["F3F6",0x7BE5],
- ["F3F7",0x7BE6],
- ["BA57",0x7BE7],
- ["BA58",0x7BE8],
- ["BA59",0x7BE9],
- ["F3F8",0x7BEA],
- ["BA5A",0x7BEB],
- ["BA5B",0x7BEC],
- ["BA5C",0x7BED],
- ["C0BA",0x7BEE],
- ["BA5D",0x7BEF],
- ["BA5E",0x7BF0],
- ["C0E9",0x7BF1],
- ["BA5F",0x7BF2],
- ["BA60",0x7BF3],
- ["BA61",0x7BF4],
- ["BA62",0x7BF5],
- ["BA63",0x7BF6],
- ["C5F1",0x7BF7],
- ["BA64",0x7BF8],
- ["BA65",0x7BF9],
- ["BA66",0x7BFA],
- ["BA67",0x7BFB],
- ["F3FB",0x7BFC],
- ["BA68",0x7BFD],
- ["F3FA",0x7BFE],
- ["BA69",0x7BFF],
- ["BA6A",0x7C00],
- ["BA6B",0x7C01],
- ["BA6C",0x7C02],
- ["BA6D",0x7C03],
- ["BA6E",0x7C04],
- ["BA6F",0x7C05],
- ["BA70",0x7C06],
- ["B4D8",0x7C07],
- ["BA71",0x7C08],
- ["BA72",0x7C09],
- ["BA73",0x7C0A],
- ["F3FE",0x7C0B],
- ["F3F9",0x7C0C],
- ["BA74",0x7C0D],
- ["BA75",0x7C0E],
- ["F3FC",0x7C0F],
- ["BA76",0x7C10],
- ["BA77",0x7C11],
- ["BA78",0x7C12],
- ["BA79",0x7C13],
- ["BA7A",0x7C14],
- ["BA7B",0x7C15],
- ["F3FD",0x7C16],
- ["BA7C",0x7C17],
- ["BA7D",0x7C18],
- ["BA7E",0x7C19],
- ["BA80",0x7C1A],
- ["BA81",0x7C1B],
- ["BA82",0x7C1C],
- ["BA83",0x7C1D],
- ["BA84",0x7C1E],
- ["F4A1",0x7C1F],
- ["BA85",0x7C20],
- ["BA86",0x7C21],
- ["BA87",0x7C22],
- ["BA88",0x7C23],
- ["BA89",0x7C24],
- ["BA8A",0x7C25],
- ["F4A3",0x7C26],
- ["BBC9",0x7C27],
- ["BA8B",0x7C28],
- ["BA8C",0x7C29],
- ["F4A2",0x7C2A],
- ["BA8D",0x7C2B],
- ["BA8E",0x7C2C],
- ["BA8F",0x7C2D],
- ["BA90",0x7C2E],
- ["BA91",0x7C2F],
- ["BA92",0x7C30],
- ["BA93",0x7C31],
- ["BA94",0x7C32],
- ["BA95",0x7C33],
- ["BA96",0x7C34],
- ["BA97",0x7C35],
- ["BA98",0x7C36],
- ["BA99",0x7C37],
- ["F4A4",0x7C38],
- ["BA9A",0x7C39],
- ["BA9B",0x7C3A],
- ["BA9C",0x7C3B],
- ["BA9D",0x7C3C],
- ["BA9E",0x7C3D],
- ["BA9F",0x7C3E],
- ["B2BE",0x7C3F],
- ["F4A6",0x7C40],
- ["F4A5",0x7C41],
- ["BAA0",0x7C42],
- ["BB40",0x7C43],
- ["BB41",0x7C44],
- ["BB42",0x7C45],
- ["BB43",0x7C46],
- ["BB44",0x7C47],
- ["BB45",0x7C48],
- ["BB46",0x7C49],
- ["BB47",0x7C4A],
- ["BB48",0x7C4B],
- ["BB49",0x7C4C],
- ["BCAE",0x7C4D],
- ["BB4A",0x7C4E],
- ["BB4B",0x7C4F],
- ["BB4C",0x7C50],
- ["BB4D",0x7C51],
- ["BB4E",0x7C52],
- ["BB4F",0x7C53],
- ["BB50",0x7C54],
- ["BB51",0x7C55],
- ["BB52",0x7C56],
- ["BB53",0x7C57],
- ["BB54",0x7C58],
- ["BB55",0x7C59],
- ["BB56",0x7C5A],
- ["BB57",0x7C5B],
- ["BB58",0x7C5C],
- ["BB59",0x7C5D],
- ["BB5A",0x7C5E],
- ["BB5B",0x7C5F],
- ["BB5C",0x7C60],
- ["BB5D",0x7C61],
- ["BB5E",0x7C62],
- ["BB5F",0x7C63],
- ["BB60",0x7C64],
- ["BB61",0x7C65],
- ["BB62",0x7C66],
- ["BB63",0x7C67],
- ["BB64",0x7C68],
- ["BB65",0x7C69],
- ["BB66",0x7C6A],
- ["BB67",0x7C6B],
- ["BB68",0x7C6C],
- ["BB69",0x7C6D],
- ["BB6A",0x7C6E],
- ["BB6B",0x7C6F],
- ["BB6C",0x7C70],
- ["BB6D",0x7C71],
- ["BB6E",0x7C72],
- ["C3D7",0x7C73],
- ["D9E1",0x7C74],
- ["BB6F",0x7C75],
- ["BB70",0x7C76],
- ["BB71",0x7C77],
- ["BB72",0x7C78],
- ["BB73",0x7C79],
- ["BB74",0x7C7A],
- ["C0E0",0x7C7B],
- ["F4CC",0x7C7C],
- ["D7D1",0x7C7D],
- ["BB75",0x7C7E],
- ["BB76",0x7C7F],
- ["BB77",0x7C80],
- ["BB78",0x7C81],
- ["BB79",0x7C82],
- ["BB7A",0x7C83],
- ["BB7B",0x7C84],
- ["BB7C",0x7C85],
- ["BB7D",0x7C86],
- ["BB7E",0x7C87],
- ["BB80",0x7C88],
- ["B7DB",0x7C89],
- ["BB81",0x7C8A],
- ["BB82",0x7C8B],
- ["BB83",0x7C8C],
- ["BB84",0x7C8D],
- ["BB85",0x7C8E],
- ["BB86",0x7C8F],
- ["BB87",0x7C90],
- ["F4CE",0x7C91],
- ["C1A3",0x7C92],
- ["BB88",0x7C93],
- ["BB89",0x7C94],
- ["C6C9",0x7C95],
- ["BB8A",0x7C96],
- ["B4D6",0x7C97],
- ["D5B3",0x7C98],
- ["BB8B",0x7C99],
- ["BB8C",0x7C9A],
- ["BB8D",0x7C9B],
- ["F4D0",0x7C9C],
- ["F4CF",0x7C9D],
- ["F4D1",0x7C9E],
- ["CBDA",0x7C9F],
- ["BB8E",0x7CA0],
- ["BB8F",0x7CA1],
- ["F4D2",0x7CA2],
- ["BB90",0x7CA3],
- ["D4C1",0x7CA4],
- ["D6E0",0x7CA5],
- ["BB91",0x7CA6],
- ["BB92",0x7CA7],
- ["BB93",0x7CA8],
- ["BB94",0x7CA9],
- ["B7E0",0x7CAA],
- ["BB95",0x7CAB],
- ["BB96",0x7CAC],
- ["BB97",0x7CAD],
- ["C1B8",0x7CAE],
- ["BB98",0x7CAF],
- ["BB99",0x7CB0],
- ["C1BB",0x7CB1],
- ["F4D3",0x7CB2],
- ["BEAC",0x7CB3],
- ["BB9A",0x7CB4],
- ["BB9B",0x7CB5],
- ["BB9C",0x7CB6],
- ["BB9D",0x7CB7],
- ["BB9E",0x7CB8],
- ["B4E2",0x7CB9],
- ["BB9F",0x7CBA],
- ["BBA0",0x7CBB],
- ["F4D4",0x7CBC],
- ["F4D5",0x7CBD],
- ["BEAB",0x7CBE],
- ["BC40",0x7CBF],
- ["BC41",0x7CC0],
- ["F4D6",0x7CC1],
- ["BC42",0x7CC2],
- ["BC43",0x7CC3],
- ["BC44",0x7CC4],
- ["F4DB",0x7CC5],
- ["BC45",0x7CC6],
- ["F4D7",0x7CC7],
- ["F4DA",0x7CC8],
- ["BC46",0x7CC9],
- ["BAFD",0x7CCA],
- ["BC47",0x7CCB],
- ["F4D8",0x7CCC],
- ["F4D9",0x7CCD],
- ["BC48",0x7CCE],
- ["BC49",0x7CCF],
- ["BC4A",0x7CD0],
- ["BC4B",0x7CD1],
- ["BC4C",0x7CD2],
- ["BC4D",0x7CD3],
- ["BC4E",0x7CD4],
- ["B8E2",0x7CD5],
- ["CCC7",0x7CD6],
- ["F4DC",0x7CD7],
- ["BC4F",0x7CD8],
- ["B2DA",0x7CD9],
- ["BC50",0x7CDA],
- ["BC51",0x7CDB],
- ["C3D3",0x7CDC],
- ["BC52",0x7CDD],
- ["BC53",0x7CDE],
- ["D4E3",0x7CDF],
- ["BFB7",0x7CE0],
- ["BC54",0x7CE1],
- ["BC55",0x7CE2],
- ["BC56",0x7CE3],
- ["BC57",0x7CE4],
- ["BC58",0x7CE5],
- ["BC59",0x7CE6],
- ["BC5A",0x7CE7],
- ["F4DD",0x7CE8],
- ["BC5B",0x7CE9],
- ["BC5C",0x7CEA],
- ["BC5D",0x7CEB],
- ["BC5E",0x7CEC],
- ["BC5F",0x7CED],
- ["BC60",0x7CEE],
- ["C5B4",0x7CEF],
- ["BC61",0x7CF0],
- ["BC62",0x7CF1],
- ["BC63",0x7CF2],
- ["BC64",0x7CF3],
- ["BC65",0x7CF4],
- ["BC66",0x7CF5],
- ["BC67",0x7CF6],
- ["BC68",0x7CF7],
- ["F4E9",0x7CF8],
- ["BC69",0x7CF9],
- ["BC6A",0x7CFA],
- ["CFB5",0x7CFB],
- ["BC6B",0x7CFC],
- ["BC6C",0x7CFD],
- ["BC6D",0x7CFE],
- ["BC6E",0x7CFF],
- ["BC6F",0x7D00],
- ["BC70",0x7D01],
- ["BC71",0x7D02],
- ["BC72",0x7D03],
- ["BC73",0x7D04],
- ["BC74",0x7D05],
- ["BC75",0x7D06],
- ["BC76",0x7D07],
- ["BC77",0x7D08],
- ["BC78",0x7D09],
- ["CEC9",0x7D0A],
- ["BC79",0x7D0B],
- ["BC7A",0x7D0C],
- ["BC7B",0x7D0D],
- ["BC7C",0x7D0E],
- ["BC7D",0x7D0F],
- ["BC7E",0x7D10],
- ["BC80",0x7D11],
- ["BC81",0x7D12],
- ["BC82",0x7D13],
- ["BC83",0x7D14],
- ["BC84",0x7D15],
- ["BC85",0x7D16],
- ["BC86",0x7D17],
- ["BC87",0x7D18],
- ["BC88",0x7D19],
- ["BC89",0x7D1A],
- ["BC8A",0x7D1B],
- ["BC8B",0x7D1C],
- ["BC8C",0x7D1D],
- ["BC8D",0x7D1E],
- ["BC8E",0x7D1F],
- ["CBD8",0x7D20],
- ["BC8F",0x7D21],
- ["CBF7",0x7D22],
- ["BC90",0x7D23],
- ["BC91",0x7D24],
- ["BC92",0x7D25],
- ["BC93",0x7D26],
- ["BDF4",0x7D27],
- ["BC94",0x7D28],
- ["BC95",0x7D29],
- ["BC96",0x7D2A],
- ["D7CF",0x7D2B],
- ["BC97",0x7D2C],
- ["BC98",0x7D2D],
- ["BC99",0x7D2E],
- ["C0DB",0x7D2F],
- ["BC9A",0x7D30],
- ["BC9B",0x7D31],
- ["BC9C",0x7D32],
- ["BC9D",0x7D33],
- ["BC9E",0x7D34],
- ["BC9F",0x7D35],
- ["BCA0",0x7D36],
- ["BD40",0x7D37],
- ["BD41",0x7D38],
- ["BD42",0x7D39],
- ["BD43",0x7D3A],
- ["BD44",0x7D3B],
- ["BD45",0x7D3C],
- ["BD46",0x7D3D],
- ["BD47",0x7D3E],
- ["BD48",0x7D3F],
- ["BD49",0x7D40],
- ["BD4A",0x7D41],
- ["BD4B",0x7D42],
- ["BD4C",0x7D43],
- ["BD4D",0x7D44],
- ["BD4E",0x7D45],
- ["BD4F",0x7D46],
- ["BD50",0x7D47],
- ["BD51",0x7D48],
- ["BD52",0x7D49],
- ["BD53",0x7D4A],
- ["BD54",0x7D4B],
- ["BD55",0x7D4C],
- ["BD56",0x7D4D],
- ["BD57",0x7D4E],
- ["BD58",0x7D4F],
- ["BD59",0x7D50],
- ["BD5A",0x7D51],
- ["BD5B",0x7D52],
- ["BD5C",0x7D53],
- ["BD5D",0x7D54],
- ["BD5E",0x7D55],
- ["BD5F",0x7D56],
- ["BD60",0x7D57],
- ["BD61",0x7D58],
- ["BD62",0x7D59],
- ["BD63",0x7D5A],
- ["BD64",0x7D5B],
- ["BD65",0x7D5C],
- ["BD66",0x7D5D],
- ["BD67",0x7D5E],
- ["BD68",0x7D5F],
- ["BD69",0x7D60],
- ["BD6A",0x7D61],
- ["BD6B",0x7D62],
- ["BD6C",0x7D63],
- ["BD6D",0x7D64],
- ["BD6E",0x7D65],
- ["BD6F",0x7D66],
- ["BD70",0x7D67],
- ["BD71",0x7D68],
- ["BD72",0x7D69],
- ["BD73",0x7D6A],
- ["BD74",0x7D6B],
- ["BD75",0x7D6C],
- ["BD76",0x7D6D],
- ["D0F5",0x7D6E],
- ["BD77",0x7D6F],
- ["BD78",0x7D70],
- ["BD79",0x7D71],
- ["BD7A",0x7D72],
- ["BD7B",0x7D73],
- ["BD7C",0x7D74],
- ["BD7D",0x7D75],
- ["BD7E",0x7D76],
- ["F4EA",0x7D77],
- ["BD80",0x7D78],
- ["BD81",0x7D79],
- ["BD82",0x7D7A],
- ["BD83",0x7D7B],
- ["BD84",0x7D7C],
- ["BD85",0x7D7D],
- ["BD86",0x7D7E],
- ["BD87",0x7D7F],
- ["BD88",0x7D80],
- ["BD89",0x7D81],
- ["BD8A",0x7D82],
- ["BD8B",0x7D83],
- ["BD8C",0x7D84],
- ["BD8D",0x7D85],
- ["BD8E",0x7D86],
- ["BD8F",0x7D87],
- ["BD90",0x7D88],
- ["BD91",0x7D89],
- ["BD92",0x7D8A],
- ["BD93",0x7D8B],
- ["BD94",0x7D8C],
- ["BD95",0x7D8D],
- ["BD96",0x7D8E],
- ["BD97",0x7D8F],
- ["BD98",0x7D90],
- ["BD99",0x7D91],
- ["BD9A",0x7D92],
- ["BD9B",0x7D93],
- ["BD9C",0x7D94],
- ["BD9D",0x7D95],
- ["BD9E",0x7D96],
- ["BD9F",0x7D97],
- ["BDA0",0x7D98],
- ["BE40",0x7D99],
- ["BE41",0x7D9A],
- ["BE42",0x7D9B],
- ["BE43",0x7D9C],
- ["BE44",0x7D9D],
- ["BE45",0x7D9E],
- ["BE46",0x7D9F],
- ["BE47",0x7DA0],
- ["BE48",0x7DA1],
- ["BE49",0x7DA2],
- ["BE4A",0x7DA3],
- ["BE4B",0x7DA4],
- ["BE4C",0x7DA5],
- ["F4EB",0x7DA6],
- ["BE4D",0x7DA7],
- ["BE4E",0x7DA8],
- ["BE4F",0x7DA9],
- ["BE50",0x7DAA],
- ["BE51",0x7DAB],
- ["BE52",0x7DAC],
- ["BE53",0x7DAD],
- ["F4EC",0x7DAE],
- ["BE54",0x7DAF],
- ["BE55",0x7DB0],
- ["BE56",0x7DB1],
- ["BE57",0x7DB2],
- ["BE58",0x7DB3],
- ["BE59",0x7DB4],
- ["BE5A",0x7DB5],
- ["BE5B",0x7DB6],
- ["BE5C",0x7DB7],
- ["BE5D",0x7DB8],
- ["BE5E",0x7DB9],
- ["BE5F",0x7DBA],
- ["BE60",0x7DBB],
- ["BE61",0x7DBC],
- ["BE62",0x7DBD],
- ["BE63",0x7DBE],
- ["BE64",0x7DBF],
- ["BE65",0x7DC0],
- ["BE66",0x7DC1],
- ["BE67",0x7DC2],
- ["BE68",0x7DC3],
- ["BE69",0x7DC4],
- ["BE6A",0x7DC5],
- ["BE6B",0x7DC6],
- ["BE6C",0x7DC7],
- ["BE6D",0x7DC8],
- ["BE6E",0x7DC9],
- ["BE6F",0x7DCA],
- ["BE70",0x7DCB],
- ["BE71",0x7DCC],
- ["BE72",0x7DCD],
- ["BE73",0x7DCE],
- ["BE74",0x7DCF],
- ["BE75",0x7DD0],
- ["BE76",0x7DD1],
- ["BE77",0x7DD2],
- ["BE78",0x7DD3],
- ["BE79",0x7DD4],
- ["BE7A",0x7DD5],
- ["BE7B",0x7DD6],
- ["BE7C",0x7DD7],
- ["BE7D",0x7DD8],
- ["BE7E",0x7DD9],
- ["BE80",0x7DDA],
- ["BE81",0x7DDB],
- ["BE82",0x7DDC],
- ["BE83",0x7DDD],
- ["BE84",0x7DDE],
- ["BE85",0x7DDF],
- ["BE86",0x7DE0],
- ["BE87",0x7DE1],
- ["BE88",0x7DE2],
- ["BE89",0x7DE3],
- ["BE8A",0x7DE4],
- ["BE8B",0x7DE5],
- ["BE8C",0x7DE6],
- ["BE8D",0x7DE7],
- ["BE8E",0x7DE8],
- ["BE8F",0x7DE9],
- ["BE90",0x7DEA],
- ["BE91",0x7DEB],
- ["BE92",0x7DEC],
- ["BE93",0x7DED],
- ["BE94",0x7DEE],
- ["BE95",0x7DEF],
- ["BE96",0x7DF0],
- ["BE97",0x7DF1],
- ["BE98",0x7DF2],
- ["BE99",0x7DF3],
- ["BE9A",0x7DF4],
- ["BE9B",0x7DF5],
- ["BE9C",0x7DF6],
- ["BE9D",0x7DF7],
- ["BE9E",0x7DF8],
- ["BE9F",0x7DF9],
- ["BEA0",0x7DFA],
- ["BF40",0x7DFB],
- ["BF41",0x7DFC],
- ["BF42",0x7DFD],
- ["BF43",0x7DFE],
- ["BF44",0x7DFF],
- ["BF45",0x7E00],
- ["BF46",0x7E01],
- ["BF47",0x7E02],
- ["BF48",0x7E03],
- ["BF49",0x7E04],
- ["BF4A",0x7E05],
- ["BF4B",0x7E06],
- ["BF4C",0x7E07],
- ["BF4D",0x7E08],
- ["BF4E",0x7E09],
- ["BF4F",0x7E0A],
- ["BF50",0x7E0B],
- ["BF51",0x7E0C],
- ["BF52",0x7E0D],
- ["BF53",0x7E0E],
- ["BF54",0x7E0F],
- ["BF55",0x7E10],
- ["BF56",0x7E11],
- ["BF57",0x7E12],
- ["BF58",0x7E13],
- ["BF59",0x7E14],
- ["BF5A",0x7E15],
- ["BF5B",0x7E16],
- ["BF5C",0x7E17],
- ["BF5D",0x7E18],
- ["BF5E",0x7E19],
- ["BF5F",0x7E1A],
- ["BF60",0x7E1B],
- ["BF61",0x7E1C],
- ["BF62",0x7E1D],
- ["BF63",0x7E1E],
- ["BF64",0x7E1F],
- ["BF65",0x7E20],
- ["BF66",0x7E21],
- ["BF67",0x7E22],
- ["BF68",0x7E23],
- ["BF69",0x7E24],
- ["BF6A",0x7E25],
- ["BF6B",0x7E26],
- ["BF6C",0x7E27],
- ["BF6D",0x7E28],
- ["BF6E",0x7E29],
- ["BF6F",0x7E2A],
- ["BF70",0x7E2B],
- ["BF71",0x7E2C],
- ["BF72",0x7E2D],
- ["BF73",0x7E2E],
- ["BF74",0x7E2F],
- ["BF75",0x7E30],
- ["BF76",0x7E31],
- ["BF77",0x7E32],
- ["BF78",0x7E33],
- ["BF79",0x7E34],
- ["BF7A",0x7E35],
- ["BF7B",0x7E36],
- ["BF7C",0x7E37],
- ["BF7D",0x7E38],
- ["BF7E",0x7E39],
- ["BF80",0x7E3A],
- ["F7E3",0x7E3B],
- ["BF81",0x7E3C],
- ["BF82",0x7E3D],
- ["BF83",0x7E3E],
- ["BF84",0x7E3F],
- ["BF85",0x7E40],
- ["B7B1",0x7E41],
- ["BF86",0x7E42],
- ["BF87",0x7E43],
- ["BF88",0x7E44],
- ["BF89",0x7E45],
- ["BF8A",0x7E46],
- ["F4ED",0x7E47],
- ["BF8B",0x7E48],
- ["BF8C",0x7E49],
- ["BF8D",0x7E4A],
- ["BF8E",0x7E4B],
- ["BF8F",0x7E4C],
- ["BF90",0x7E4D],
- ["BF91",0x7E4E],
- ["BF92",0x7E4F],
- ["BF93",0x7E50],
- ["BF94",0x7E51],
- ["BF95",0x7E52],
- ["BF96",0x7E53],
- ["BF97",0x7E54],
- ["BF98",0x7E55],
- ["BF99",0x7E56],
- ["BF9A",0x7E57],
- ["BF9B",0x7E58],
- ["BF9C",0x7E59],
- ["BF9D",0x7E5A],
- ["BF9E",0x7E5B],
- ["BF9F",0x7E5C],
- ["BFA0",0x7E5D],
- ["C040",0x7E5E],
- ["C041",0x7E5F],
- ["C042",0x7E60],
- ["C043",0x7E61],
- ["C044",0x7E62],
- ["C045",0x7E63],
- ["C046",0x7E64],
- ["C047",0x7E65],
- ["C048",0x7E66],
- ["C049",0x7E67],
- ["C04A",0x7E68],
- ["C04B",0x7E69],
- ["C04C",0x7E6A],
- ["C04D",0x7E6B],
- ["C04E",0x7E6C],
- ["C04F",0x7E6D],
- ["C050",0x7E6E],
- ["C051",0x7E6F],
- ["C052",0x7E70],
- ["C053",0x7E71],
- ["C054",0x7E72],
- ["C055",0x7E73],
- ["C056",0x7E74],
- ["C057",0x7E75],
- ["C058",0x7E76],
- ["C059",0x7E77],
- ["C05A",0x7E78],
- ["C05B",0x7E79],
- ["C05C",0x7E7A],
- ["C05D",0x7E7B],
- ["C05E",0x7E7C],
- ["C05F",0x7E7D],
- ["C060",0x7E7E],
- ["C061",0x7E7F],
- ["C062",0x7E80],
- ["C063",0x7E81],
- ["D7EB",0x7E82],
- ["C064",0x7E83],
- ["C065",0x7E84],
- ["C066",0x7E85],
- ["C067",0x7E86],
- ["C068",0x7E87],
- ["C069",0x7E88],
- ["C06A",0x7E89],
- ["C06B",0x7E8A],
- ["C06C",0x7E8B],
- ["C06D",0x7E8C],
- ["C06E",0x7E8D],
- ["C06F",0x7E8E],
- ["C070",0x7E8F],
- ["C071",0x7E90],
- ["C072",0x7E91],
- ["C073",0x7E92],
- ["C074",0x7E93],
- ["C075",0x7E94],
- ["C076",0x7E95],
- ["C077",0x7E96],
- ["C078",0x7E97],
- ["C079",0x7E98],
- ["C07A",0x7E99],
- ["C07B",0x7E9A],
- ["F4EE",0x7E9B],
- ["C07C",0x7E9C],
- ["C07D",0x7E9D],
- ["C07E",0x7E9E],
- ["E6F9",0x7E9F],
- ["BEC0",0x7EA0],
- ["E6FA",0x7EA1],
- ["BAEC",0x7EA2],
- ["E6FB",0x7EA3],
- ["CFCB",0x7EA4],
- ["E6FC",0x7EA5],
- ["D4BC",0x7EA6],
- ["BCB6",0x7EA7],
- ["E6FD",0x7EA8],
- ["E6FE",0x7EA9],
- ["BCCD",0x7EAA],
- ["C8D2",0x7EAB],
- ["CEB3",0x7EAC],
- ["E7A1",0x7EAD],
- ["C080",0x7EAE],
- ["B4BF",0x7EAF],
- ["E7A2",0x7EB0],
- ["C9B4",0x7EB1],
- ["B8D9",0x7EB2],
- ["C4C9",0x7EB3],
- ["C081",0x7EB4],
- ["D7DD",0x7EB5],
- ["C2DA",0x7EB6],
- ["B7D7",0x7EB7],
- ["D6BD",0x7EB8],
- ["CEC6",0x7EB9],
- ["B7C4",0x7EBA],
- ["C082",0x7EBB],
- ["C083",0x7EBC],
- ["C5A6",0x7EBD],
- ["E7A3",0x7EBE],
- ["CFDF",0x7EBF],
- ["E7A4",0x7EC0],
- ["E7A5",0x7EC1],
- ["E7A6",0x7EC2],
- ["C1B7",0x7EC3],
- ["D7E9",0x7EC4],
- ["C9F0",0x7EC5],
- ["CFB8",0x7EC6],
- ["D6AF",0x7EC7],
- ["D6D5",0x7EC8],
- ["E7A7",0x7EC9],
- ["B0ED",0x7ECA],
- ["E7A8",0x7ECB],
- ["E7A9",0x7ECC],
- ["C9DC",0x7ECD],
- ["D2EF",0x7ECE],
- ["BEAD",0x7ECF],
- ["E7AA",0x7ED0],
- ["B0F3",0x7ED1],
- ["C8DE",0x7ED2],
- ["BDE1",0x7ED3],
- ["E7AB",0x7ED4],
- ["C8C6",0x7ED5],
- ["C084",0x7ED6],
- ["E7AC",0x7ED7],
- ["BBE6",0x7ED8],
- ["B8F8",0x7ED9],
- ["D1A4",0x7EDA],
- ["E7AD",0x7EDB],
- ["C2E7",0x7EDC],
- ["BEF8",0x7EDD],
- ["BDCA",0x7EDE],
- ["CDB3",0x7EDF],
- ["E7AE",0x7EE0],
- ["E7AF",0x7EE1],
- ["BEEE",0x7EE2],
- ["D0E5",0x7EE3],
- ["C085",0x7EE4],
- ["CBE7",0x7EE5],
- ["CCD0",0x7EE6],
- ["BCCC",0x7EE7],
- ["E7B0",0x7EE8],
- ["BCA8",0x7EE9],
- ["D0F7",0x7EEA],
- ["E7B1",0x7EEB],
- ["C086",0x7EEC],
- ["D0F8",0x7EED],
- ["E7B2",0x7EEE],
- ["E7B3",0x7EEF],
- ["B4C2",0x7EF0],
- ["E7B4",0x7EF1],
- ["E7B5",0x7EF2],
- ["C9FE",0x7EF3],
- ["CEAC",0x7EF4],
- ["C3E0",0x7EF5],
- ["E7B7",0x7EF6],
- ["B1C1",0x7EF7],
- ["B3F1",0x7EF8],
- ["C087",0x7EF9],
- ["E7B8",0x7EFA],
- ["E7B9",0x7EFB],
- ["D7DB",0x7EFC],
- ["D5C0",0x7EFD],
- ["E7BA",0x7EFE],
- ["C2CC",0x7EFF],
- ["D7BA",0x7F00],
- ["E7BB",0x7F01],
- ["E7BC",0x7F02],
- ["E7BD",0x7F03],
- ["BCEA",0x7F04],
- ["C3E5",0x7F05],
- ["C0C2",0x7F06],
- ["E7BE",0x7F07],
- ["E7BF",0x7F08],
- ["BCA9",0x7F09],
- ["C088",0x7F0A],
- ["E7C0",0x7F0B],
- ["E7C1",0x7F0C],
- ["E7B6",0x7F0D],
- ["B6D0",0x7F0E],
- ["E7C2",0x7F0F],
- ["C089",0x7F10],
- ["E7C3",0x7F11],
- ["E7C4",0x7F12],
- ["BBBA",0x7F13],
- ["B5DE",0x7F14],
- ["C2C6",0x7F15],
- ["B1E0",0x7F16],
- ["E7C5",0x7F17],
- ["D4B5",0x7F18],
- ["E7C6",0x7F19],
- ["B8BF",0x7F1A],
- ["E7C8",0x7F1B],
- ["E7C7",0x7F1C],
- ["B7EC",0x7F1D],
- ["C08A",0x7F1E],
- ["E7C9",0x7F1F],
- ["B2F8",0x7F20],
- ["E7CA",0x7F21],
- ["E7CB",0x7F22],
- ["E7CC",0x7F23],
- ["E7CD",0x7F24],
- ["E7CE",0x7F25],
- ["E7CF",0x7F26],
- ["E7D0",0x7F27],
- ["D3A7",0x7F28],
- ["CBF5",0x7F29],
- ["E7D1",0x7F2A],
- ["E7D2",0x7F2B],
- ["E7D3",0x7F2C],
- ["E7D4",0x7F2D],
- ["C9C9",0x7F2E],
- ["E7D5",0x7F2F],
- ["E7D6",0x7F30],
- ["E7D7",0x7F31],
- ["E7D8",0x7F32],
- ["E7D9",0x7F33],
- ["BDC9",0x7F34],
- ["E7DA",0x7F35],
- ["F3BE",0x7F36],
- ["C08B",0x7F37],
- ["B8D7",0x7F38],
- ["C08C",0x7F39],
- ["C8B1",0x7F3A],
- ["C08D",0x7F3B],
- ["C08E",0x7F3C],
- ["C08F",0x7F3D],
- ["C090",0x7F3E],
- ["C091",0x7F3F],
- ["C092",0x7F40],
- ["C093",0x7F41],
- ["F3BF",0x7F42],
- ["C094",0x7F43],
- ["F3C0",0x7F44],
- ["F3C1",0x7F45],
- ["C095",0x7F46],
- ["C096",0x7F47],
- ["C097",0x7F48],
- ["C098",0x7F49],
- ["C099",0x7F4A],
- ["C09A",0x7F4B],
- ["C09B",0x7F4C],
- ["C09C",0x7F4D],
- ["C09D",0x7F4E],
- ["C09E",0x7F4F],
- ["B9DE",0x7F50],
- ["CDF8",0x7F51],
- ["C09F",0x7F52],
- ["C0A0",0x7F53],
- ["D8E8",0x7F54],
- ["BAB1",0x7F55],
- ["C140",0x7F56],
- ["C2DE",0x7F57],
- ["EEB7",0x7F58],
- ["C141",0x7F59],
- ["B7A3",0x7F5A],
- ["C142",0x7F5B],
- ["C143",0x7F5C],
- ["C144",0x7F5D],
- ["C145",0x7F5E],
- ["EEB9",0x7F5F],
- ["C146",0x7F60],
- ["EEB8",0x7F61],
- ["B0D5",0x7F62],
- ["C147",0x7F63],
- ["C148",0x7F64],
- ["C149",0x7F65],
- ["C14A",0x7F66],
- ["C14B",0x7F67],
- ["EEBB",0x7F68],
- ["D5D6",0x7F69],
- ["D7EF",0x7F6A],
- ["C14C",0x7F6B],
- ["C14D",0x7F6C],
- ["C14E",0x7F6D],
- ["D6C3",0x7F6E],
- ["C14F",0x7F6F],
- ["C150",0x7F70],
- ["EEBD",0x7F71],
- ["CAF0",0x7F72],
- ["C151",0x7F73],
- ["EEBC",0x7F74],
- ["C152",0x7F75],
- ["C153",0x7F76],
- ["C154",0x7F77],
- ["C155",0x7F78],
- ["EEBE",0x7F79],
- ["C156",0x7F7A],
- ["C157",0x7F7B],
- ["C158",0x7F7C],
- ["C159",0x7F7D],
- ["EEC0",0x7F7E],
- ["C15A",0x7F7F],
- ["C15B",0x7F80],
- ["EEBF",0x7F81],
- ["C15C",0x7F82],
- ["C15D",0x7F83],
- ["C15E",0x7F84],
- ["C15F",0x7F85],
- ["C160",0x7F86],
- ["C161",0x7F87],
- ["C162",0x7F88],
- ["C163",0x7F89],
- ["D1F2",0x7F8A],
- ["C164",0x7F8B],
- ["C7BC",0x7F8C],
- ["C165",0x7F8D],
- ["C3C0",0x7F8E],
- ["C166",0x7F8F],
- ["C167",0x7F90],
- ["C168",0x7F91],
- ["C169",0x7F92],
- ["C16A",0x7F93],
- ["B8E1",0x7F94],
- ["C16B",0x7F95],
- ["C16C",0x7F96],
- ["C16D",0x7F97],
- ["C16E",0x7F98],
- ["C16F",0x7F99],
- ["C1E7",0x7F9A],
- ["C170",0x7F9B],
- ["C171",0x7F9C],
- ["F4C6",0x7F9D],
- ["D0DF",0x7F9E],
- ["F4C7",0x7F9F],
- ["C172",0x7FA0],
- ["CFDB",0x7FA1],
- ["C173",0x7FA2],
- ["C174",0x7FA3],
- ["C8BA",0x7FA4],
- ["C175",0x7FA5],
- ["C176",0x7FA6],
- ["F4C8",0x7FA7],
- ["C177",0x7FA8],
- ["C178",0x7FA9],
- ["C179",0x7FAA],
- ["C17A",0x7FAB],
- ["C17B",0x7FAC],
- ["C17C",0x7FAD],
- ["C17D",0x7FAE],
- ["F4C9",0x7FAF],
- ["F4CA",0x7FB0],
- ["C17E",0x7FB1],
- ["F4CB",0x7FB2],
- ["C180",0x7FB3],
- ["C181",0x7FB4],
- ["C182",0x7FB5],
- ["C183",0x7FB6],
- ["C184",0x7FB7],
- ["D9FA",0x7FB8],
- ["B8FE",0x7FB9],
- ["C185",0x7FBA],
- ["C186",0x7FBB],
- ["E5F1",0x7FBC],
- ["D3F0",0x7FBD],
- ["C187",0x7FBE],
- ["F4E0",0x7FBF],
- ["C188",0x7FC0],
- ["CECC",0x7FC1],
- ["C189",0x7FC2],
- ["C18A",0x7FC3],
- ["C18B",0x7FC4],
- ["B3E1",0x7FC5],
- ["C18C",0x7FC6],
- ["C18D",0x7FC7],
- ["C18E",0x7FC8],
- ["C18F",0x7FC9],
- ["F1B4",0x7FCA],
- ["C190",0x7FCB],
- ["D2EE",0x7FCC],
- ["C191",0x7FCD],
- ["F4E1",0x7FCE],
- ["C192",0x7FCF],
- ["C193",0x7FD0],
- ["C194",0x7FD1],
- ["C195",0x7FD2],
- ["C196",0x7FD3],
- ["CFE8",0x7FD4],
- ["F4E2",0x7FD5],
- ["C197",0x7FD6],
- ["C198",0x7FD7],
- ["C7CC",0x7FD8],
- ["C199",0x7FD9],
- ["C19A",0x7FDA],
- ["C19B",0x7FDB],
- ["C19C",0x7FDC],
- ["C19D",0x7FDD],
- ["C19E",0x7FDE],
- ["B5D4",0x7FDF],
- ["B4E4",0x7FE0],
- ["F4E4",0x7FE1],
- ["C19F",0x7FE2],
- ["C1A0",0x7FE3],
- ["C240",0x7FE4],
- ["F4E3",0x7FE5],
- ["F4E5",0x7FE6],
- ["C241",0x7FE7],
- ["C242",0x7FE8],
- ["F4E6",0x7FE9],
- ["C243",0x7FEA],
- ["C244",0x7FEB],
- ["C245",0x7FEC],
- ["C246",0x7FED],
- ["F4E7",0x7FEE],
- ["C247",0x7FEF],
- ["BAB2",0x7FF0],
- ["B0BF",0x7FF1],
- ["C248",0x7FF2],
- ["F4E8",0x7FF3],
- ["C249",0x7FF4],
- ["C24A",0x7FF5],
- ["C24B",0x7FF6],
- ["C24C",0x7FF7],
- ["C24D",0x7FF8],
- ["C24E",0x7FF9],
- ["C24F",0x7FFA],
- ["B7AD",0x7FFB],
- ["D2ED",0x7FFC],
- ["C250",0x7FFD],
- ["C251",0x7FFE],
- ["C252",0x7FFF],
- ["D2AB",0x8000],
- ["C0CF",0x8001],
- ["C253",0x8002],
- ["BFBC",0x8003],
- ["EBA3",0x8004],
- ["D5DF",0x8005],
- ["EAC8",0x8006],
- ["C254",0x8007],
- ["C255",0x8008],
- ["C256",0x8009],
- ["C257",0x800A],
- ["F1F3",0x800B],
- ["B6F8",0x800C],
- ["CBA3",0x800D],
- ["C258",0x800E],
- ["C259",0x800F],
- ["C4CD",0x8010],
- ["C25A",0x8011],
- ["F1E7",0x8012],
- ["C25B",0x8013],
- ["F1E8",0x8014],
- ["B8FB",0x8015],
- ["F1E9",0x8016],
- ["BAC4",0x8017],
- ["D4C5",0x8018],
- ["B0D2",0x8019],
- ["C25C",0x801A],
- ["C25D",0x801B],
- ["F1EA",0x801C],
- ["C25E",0x801D],
- ["C25F",0x801E],
- ["C260",0x801F],
- ["F1EB",0x8020],
- ["C261",0x8021],
- ["F1EC",0x8022],
- ["C262",0x8023],
- ["C263",0x8024],
- ["F1ED",0x8025],
- ["F1EE",0x8026],
- ["F1EF",0x8027],
- ["F1F1",0x8028],
- ["F1F0",0x8029],
- ["C5D5",0x802A],
- ["C264",0x802B],
- ["C265",0x802C],
- ["C266",0x802D],
- ["C267",0x802E],
- ["C268",0x802F],
- ["C269",0x8030],
- ["F1F2",0x8031],
- ["C26A",0x8032],
- ["B6FA",0x8033],
- ["C26B",0x8034],
- ["F1F4",0x8035],
- ["D2AE",0x8036],
- ["DEC7",0x8037],
- ["CBCA",0x8038],
- ["C26C",0x8039],
- ["C26D",0x803A],
- ["B3DC",0x803B],
- ["C26E",0x803C],
- ["B5A2",0x803D],
- ["C26F",0x803E],
- ["B9A2",0x803F],
- ["C270",0x8040],
- ["C271",0x8041],
- ["C4F4",0x8042],
- ["F1F5",0x8043],
- ["C272",0x8044],
- ["C273",0x8045],
- ["F1F6",0x8046],
- ["C274",0x8047],
- ["C275",0x8048],
- ["C276",0x8049],
- ["C1C4",0x804A],
- ["C1FB",0x804B],
- ["D6B0",0x804C],
- ["F1F7",0x804D],
- ["C277",0x804E],
- ["C278",0x804F],
- ["C279",0x8050],
- ["C27A",0x8051],
- ["F1F8",0x8052],
- ["C27B",0x8053],
- ["C1AA",0x8054],
- ["C27C",0x8055],
- ["C27D",0x8056],
- ["C27E",0x8057],
- ["C6B8",0x8058],
- ["C280",0x8059],
- ["BEDB",0x805A],
- ["C281",0x805B],
- ["C282",0x805C],
- ["C283",0x805D],
- ["C284",0x805E],
- ["C285",0x805F],
- ["C286",0x8060],
- ["C287",0x8061],
- ["C288",0x8062],
- ["C289",0x8063],
- ["C28A",0x8064],
- ["C28B",0x8065],
- ["C28C",0x8066],
- ["C28D",0x8067],
- ["C28E",0x8068],
- ["F1F9",0x8069],
- ["B4CF",0x806A],
- ["C28F",0x806B],
- ["C290",0x806C],
- ["C291",0x806D],
- ["C292",0x806E],
- ["C293",0x806F],
- ["C294",0x8070],
- ["F1FA",0x8071],
- ["C295",0x8072],
- ["C296",0x8073],
- ["C297",0x8074],
- ["C298",0x8075],
- ["C299",0x8076],
- ["C29A",0x8077],
- ["C29B",0x8078],
- ["C29C",0x8079],
- ["C29D",0x807A],
- ["C29E",0x807B],
- ["C29F",0x807C],
- ["C2A0",0x807D],
- ["C340",0x807E],
- ["EDB2",0x807F],
- ["EDB1",0x8080],
- ["C341",0x8081],
- ["C342",0x8082],
- ["CBE0",0x8083],
- ["D2DE",0x8084],
- ["C343",0x8085],
- ["CBC1",0x8086],
- ["D5D8",0x8087],
- ["C344",0x8088],
- ["C8E2",0x8089],
- ["C345",0x808A],
- ["C0DF",0x808B],
- ["BCA1",0x808C],
- ["C346",0x808D],
- ["C347",0x808E],
- ["C348",0x808F],
- ["C349",0x8090],
- ["C34A",0x8091],
- ["C34B",0x8092],
- ["EBC1",0x8093],
- ["C34C",0x8094],
- ["C34D",0x8095],
- ["D0A4",0x8096],
- ["C34E",0x8097],
- ["D6E2",0x8098],
- ["C34F",0x8099],
- ["B6C7",0x809A],
- ["B8D8",0x809B],
- ["EBC0",0x809C],
- ["B8CE",0x809D],
- ["C350",0x809E],
- ["EBBF",0x809F],
- ["B3A6",0x80A0],
- ["B9C9",0x80A1],
- ["D6AB",0x80A2],
- ["C351",0x80A3],
- ["B7F4",0x80A4],
- ["B7CA",0x80A5],
- ["C352",0x80A6],
- ["C353",0x80A7],
- ["C354",0x80A8],
- ["BCE7",0x80A9],
- ["B7BE",0x80AA],
- ["EBC6",0x80AB],
- ["C355",0x80AC],
- ["EBC7",0x80AD],
- ["B0B9",0x80AE],
- ["BFCF",0x80AF],
- ["C356",0x80B0],
- ["EBC5",0x80B1],
- ["D3FD",0x80B2],
- ["C357",0x80B3],
- ["EBC8",0x80B4],
- ["C358",0x80B5],
- ["C359",0x80B6],
- ["EBC9",0x80B7],
- ["C35A",0x80B8],
- ["C35B",0x80B9],
- ["B7CE",0x80BA],
- ["C35C",0x80BB],
- ["EBC2",0x80BC],
- ["EBC4",0x80BD],
- ["C9F6",0x80BE],
- ["D6D7",0x80BF],
- ["D5CD",0x80C0],
- ["D0B2",0x80C1],
- ["EBCF",0x80C2],
- ["CEB8",0x80C3],
- ["EBD0",0x80C4],
- ["C35D",0x80C5],
- ["B5A8",0x80C6],
- ["C35E",0x80C7],
- ["C35F",0x80C8],
- ["C360",0x80C9],
- ["C361",0x80CA],
- ["C362",0x80CB],
- ["B1B3",0x80CC],
- ["EBD2",0x80CD],
- ["CCA5",0x80CE],
- ["C363",0x80CF],
- ["C364",0x80D0],
- ["C365",0x80D1],
- ["C366",0x80D2],
- ["C367",0x80D3],
- ["C368",0x80D4],
- ["C369",0x80D5],
- ["C5D6",0x80D6],
- ["EBD3",0x80D7],
- ["C36A",0x80D8],
- ["EBD1",0x80D9],
- ["C5DF",0x80DA],
- ["EBCE",0x80DB],
- ["CAA4",0x80DC],
- ["EBD5",0x80DD],
- ["B0FB",0x80DE],
- ["C36B",0x80DF],
- ["C36C",0x80E0],
- ["BAFA",0x80E1],
- ["C36D",0x80E2],
- ["C36E",0x80E3],
- ["D8B7",0x80E4],
- ["F1E3",0x80E5],
- ["C36F",0x80E6],
- ["EBCA",0x80E7],
- ["EBCB",0x80E8],
- ["EBCC",0x80E9],
- ["EBCD",0x80EA],
- ["EBD6",0x80EB],
- ["E6C0",0x80EC],
- ["EBD9",0x80ED],
- ["C370",0x80EE],
- ["BFE8",0x80EF],
- ["D2C8",0x80F0],
- ["EBD7",0x80F1],
- ["EBDC",0x80F2],
- ["B8EC",0x80F3],
- ["EBD8",0x80F4],
- ["C371",0x80F5],
- ["BDBA",0x80F6],
- ["C372",0x80F7],
- ["D0D8",0x80F8],
- ["C373",0x80F9],
- ["B0B7",0x80FA],
- ["C374",0x80FB],
- ["EBDD",0x80FC],
- ["C4DC",0x80FD],
- ["C375",0x80FE],
- ["C376",0x80FF],
- ["C377",0x8100],
- ["C378",0x8101],
- ["D6AC",0x8102],
- ["C379",0x8103],
- ["C37A",0x8104],
- ["C37B",0x8105],
- ["B4E0",0x8106],
- ["C37C",0x8107],
- ["C37D",0x8108],
- ["C2F6",0x8109],
- ["BCB9",0x810A],
- ["C37E",0x810B],
- ["C380",0x810C],
- ["EBDA",0x810D],
- ["EBDB",0x810E],
- ["D4E0",0x810F],
- ["C6EA",0x8110],
- ["C4D4",0x8111],
- ["EBDF",0x8112],
- ["C5A7",0x8113],
- ["D9F5",0x8114],
- ["C381",0x8115],
- ["B2B1",0x8116],
- ["C382",0x8117],
- ["EBE4",0x8118],
- ["C383",0x8119],
- ["BDC5",0x811A],
- ["C384",0x811B],
- ["C385",0x811C],
- ["C386",0x811D],
- ["EBE2",0x811E],
- ["C387",0x811F],
- ["C388",0x8120],
- ["C389",0x8121],
- ["C38A",0x8122],
- ["C38B",0x8123],
- ["C38C",0x8124],
- ["C38D",0x8125],
- ["C38E",0x8126],
- ["C38F",0x8127],
- ["C390",0x8128],
- ["C391",0x8129],
- ["C392",0x812A],
- ["C393",0x812B],
- ["EBE3",0x812C],
- ["C394",0x812D],
- ["C395",0x812E],
- ["B8AC",0x812F],
- ["C396",0x8130],
- ["CDD1",0x8131],
- ["EBE5",0x8132],
- ["C397",0x8133],
- ["C398",0x8134],
- ["C399",0x8135],
- ["EBE1",0x8136],
- ["C39A",0x8137],
- ["C1B3",0x8138],
- ["C39B",0x8139],
- ["C39C",0x813A],
- ["C39D",0x813B],
- ["C39E",0x813C],
- ["C39F",0x813D],
- ["C6A2",0x813E],
- ["C3A0",0x813F],
- ["C440",0x8140],
- ["C441",0x8141],
- ["C442",0x8142],
- ["C443",0x8143],
- ["C444",0x8144],
- ["C445",0x8145],
- ["CCF3",0x8146],
- ["C446",0x8147],
- ["EBE6",0x8148],
- ["C447",0x8149],
- ["C0B0",0x814A],
- ["D2B8",0x814B],
- ["EBE7",0x814C],
- ["C448",0x814D],
- ["C449",0x814E],
- ["C44A",0x814F],
- ["B8AF",0x8150],
- ["B8AD",0x8151],
- ["C44B",0x8152],
- ["EBE8",0x8153],
- ["C7BB",0x8154],
- ["CDF3",0x8155],
- ["C44C",0x8156],
- ["C44D",0x8157],
- ["C44E",0x8158],
- ["EBEA",0x8159],
- ["EBEB",0x815A],
- ["C44F",0x815B],
- ["C450",0x815C],
- ["C451",0x815D],
- ["C452",0x815E],
- ["C453",0x815F],
- ["EBED",0x8160],
- ["C454",0x8161],
- ["C455",0x8162],
- ["C456",0x8163],
- ["C457",0x8164],
- ["D0C8",0x8165],
- ["C458",0x8166],
- ["EBF2",0x8167],
- ["C459",0x8168],
- ["EBEE",0x8169],
- ["C45A",0x816A],
- ["C45B",0x816B],
- ["C45C",0x816C],
- ["EBF1",0x816D],
- ["C8F9",0x816E],
- ["C45D",0x816F],
- ["D1FC",0x8170],
- ["EBEC",0x8171],
- ["C45E",0x8172],
- ["C45F",0x8173],
- ["EBE9",0x8174],
- ["C460",0x8175],
- ["C461",0x8176],
- ["C462",0x8177],
- ["C463",0x8178],
- ["B8B9",0x8179],
- ["CFD9",0x817A],
- ["C4E5",0x817B],
- ["EBEF",0x817C],
- ["EBF0",0x817D],
- ["CCDA",0x817E],
- ["CDC8",0x817F],
- ["B0F2",0x8180],
- ["C464",0x8181],
- ["EBF6",0x8182],
- ["C465",0x8183],
- ["C466",0x8184],
- ["C467",0x8185],
- ["C468",0x8186],
- ["C469",0x8187],
- ["EBF5",0x8188],
- ["C46A",0x8189],
- ["B2B2",0x818A],
- ["C46B",0x818B],
- ["C46C",0x818C],
- ["C46D",0x818D],
- ["C46E",0x818E],
- ["B8E0",0x818F],
- ["C46F",0x8190],
- ["EBF7",0x8191],
- ["C470",0x8192],
- ["C471",0x8193],
- ["C472",0x8194],
- ["C473",0x8195],
- ["C474",0x8196],
- ["C475",0x8197],
- ["B1EC",0x8198],
- ["C476",0x8199],
- ["C477",0x819A],
- ["CCC5",0x819B],
- ["C4A4",0x819C],
- ["CFA5",0x819D],
- ["C478",0x819E],
- ["C479",0x819F],
- ["C47A",0x81A0],
- ["C47B",0x81A1],
- ["C47C",0x81A2],
- ["EBF9",0x81A3],
- ["C47D",0x81A4],
- ["C47E",0x81A5],
- ["ECA2",0x81A6],
- ["C480",0x81A7],
- ["C5F2",0x81A8],
- ["C481",0x81A9],
- ["EBFA",0x81AA],
- ["C482",0x81AB],
- ["C483",0x81AC],
- ["C484",0x81AD],
- ["C485",0x81AE],
- ["C486",0x81AF],
- ["C487",0x81B0],
- ["C488",0x81B1],
- ["C489",0x81B2],
- ["C9C5",0x81B3],
- ["C48A",0x81B4],
- ["C48B",0x81B5],
- ["C48C",0x81B6],
- ["C48D",0x81B7],
- ["C48E",0x81B8],
- ["C48F",0x81B9],
- ["E2DF",0x81BA],
- ["EBFE",0x81BB],
- ["C490",0x81BC],
- ["C491",0x81BD],
- ["C492",0x81BE],
- ["C493",0x81BF],
- ["CDCE",0x81C0],
- ["ECA1",0x81C1],
- ["B1DB",0x81C2],
- ["D3B7",0x81C3],
- ["C494",0x81C4],
- ["C495",0x81C5],
- ["D2DC",0x81C6],
- ["C496",0x81C7],
- ["C497",0x81C8],
- ["C498",0x81C9],
- ["EBFD",0x81CA],
- ["C499",0x81CB],
- ["EBFB",0x81CC],
- ["C49A",0x81CD],
- ["C49B",0x81CE],
- ["C49C",0x81CF],
- ["C49D",0x81D0],
- ["C49E",0x81D1],
- ["C49F",0x81D2],
- ["C4A0",0x81D3],
- ["C540",0x81D4],
- ["C541",0x81D5],
- ["C542",0x81D6],
- ["C543",0x81D7],
- ["C544",0x81D8],
- ["C545",0x81D9],
- ["C546",0x81DA],
- ["C547",0x81DB],
- ["C548",0x81DC],
- ["C549",0x81DD],
- ["C54A",0x81DE],
- ["C54B",0x81DF],
- ["C54C",0x81E0],
- ["C54D",0x81E1],
- ["C54E",0x81E2],
- ["B3BC",0x81E3],
- ["C54F",0x81E4],
- ["C550",0x81E5],
- ["C551",0x81E6],
- ["EAB0",0x81E7],
- ["C552",0x81E8],
- ["C553",0x81E9],
- ["D7D4",0x81EA],
- ["C554",0x81EB],
- ["F4AB",0x81EC],
- ["B3F4",0x81ED],
- ["C555",0x81EE],
- ["C556",0x81EF],
- ["C557",0x81F0],
- ["C558",0x81F1],
- ["C559",0x81F2],
- ["D6C1",0x81F3],
- ["D6C2",0x81F4],
- ["C55A",0x81F5],
- ["C55B",0x81F6],
- ["C55C",0x81F7],
- ["C55D",0x81F8],
- ["C55E",0x81F9],
- ["C55F",0x81FA],
- ["D5E9",0x81FB],
- ["BECA",0x81FC],
- ["C560",0x81FD],
- ["F4A7",0x81FE],
- ["C561",0x81FF],
- ["D2A8",0x8200],
- ["F4A8",0x8201],
- ["F4A9",0x8202],
- ["C562",0x8203],
- ["F4AA",0x8204],
- ["BECB",0x8205],
- ["D3DF",0x8206],
- ["C563",0x8207],
- ["C564",0x8208],
- ["C565",0x8209],
- ["C566",0x820A],
- ["C567",0x820B],
- ["C9E0",0x820C],
- ["C9E1",0x820D],
- ["C568",0x820E],
- ["C569",0x820F],
- ["F3C2",0x8210],
- ["C56A",0x8211],
- ["CAE6",0x8212],
- ["C56B",0x8213],
- ["CCF2",0x8214],
- ["C56C",0x8215],
- ["C56D",0x8216],
- ["C56E",0x8217],
- ["C56F",0x8218],
- ["C570",0x8219],
- ["C571",0x821A],
- ["E2B6",0x821B],
- ["CBB4",0x821C],
- ["C572",0x821D],
- ["CEE8",0x821E],
- ["D6DB",0x821F],
- ["C573",0x8220],
- ["F4AD",0x8221],
- ["F4AE",0x8222],
- ["F4AF",0x8223],
- ["C574",0x8224],
- ["C575",0x8225],
- ["C576",0x8226],
- ["C577",0x8227],
- ["F4B2",0x8228],
- ["C578",0x8229],
- ["BABD",0x822A],
- ["F4B3",0x822B],
- ["B0E3",0x822C],
- ["F4B0",0x822D],
- ["C579",0x822E],
- ["F4B1",0x822F],
- ["BDA2",0x8230],
- ["B2D5",0x8231],
- ["C57A",0x8232],
- ["F4B6",0x8233],
- ["F4B7",0x8234],
- ["B6E6",0x8235],
- ["B2B0",0x8236],
- ["CFCF",0x8237],
- ["F4B4",0x8238],
- ["B4AC",0x8239],
- ["C57B",0x823A],
- ["F4B5",0x823B],
- ["C57C",0x823C],
- ["C57D",0x823D],
- ["F4B8",0x823E],
- ["C57E",0x823F],
- ["C580",0x8240],
- ["C581",0x8241],
- ["C582",0x8242],
- ["C583",0x8243],
- ["F4B9",0x8244],
- ["C584",0x8245],
- ["C585",0x8246],
- ["CDA7",0x8247],
- ["C586",0x8248],
- ["F4BA",0x8249],
- ["C587",0x824A],
- ["F4BB",0x824B],
- ["C588",0x824C],
- ["C589",0x824D],
- ["C58A",0x824E],
- ["F4BC",0x824F],
- ["C58B",0x8250],
- ["C58C",0x8251],
- ["C58D",0x8252],
- ["C58E",0x8253],
- ["C58F",0x8254],
- ["C590",0x8255],
- ["C591",0x8256],
- ["C592",0x8257],
- ["CBD2",0x8258],
- ["C593",0x8259],
- ["F4BD",0x825A],
- ["C594",0x825B],
- ["C595",0x825C],
- ["C596",0x825D],
- ["C597",0x825E],
- ["F4BE",0x825F],
- ["C598",0x8260],
- ["C599",0x8261],
- ["C59A",0x8262],
- ["C59B",0x8263],
- ["C59C",0x8264],
- ["C59D",0x8265],
- ["C59E",0x8266],
- ["C59F",0x8267],
- ["F4BF",0x8268],
- ["C5A0",0x8269],
- ["C640",0x826A],
- ["C641",0x826B],
- ["C642",0x826C],
- ["C643",0x826D],
- ["F4DE",0x826E],
- ["C1BC",0x826F],
- ["BCE8",0x8270],
- ["C644",0x8271],
- ["C9AB",0x8272],
- ["D1DE",0x8273],
- ["E5F5",0x8274],
- ["C645",0x8275],
- ["C646",0x8276],
- ["C647",0x8277],
- ["C648",0x8278],
- ["DCB3",0x8279],
- ["D2D5",0x827A],
- ["C649",0x827B],
- ["C64A",0x827C],
- ["DCB4",0x827D],
- ["B0AC",0x827E],
- ["DCB5",0x827F],
- ["C64B",0x8280],
- ["C64C",0x8281],
- ["BDDA",0x8282],
- ["C64D",0x8283],
- ["DCB9",0x8284],
- ["C64E",0x8285],
- ["C64F",0x8286],
- ["C650",0x8287],
- ["D8C2",0x8288],
- ["C651",0x8289],
- ["DCB7",0x828A],
- ["D3F3",0x828B],
- ["C652",0x828C],
- ["C9D6",0x828D],
- ["DCBA",0x828E],
- ["DCB6",0x828F],
- ["C653",0x8290],
- ["DCBB",0x8291],
- ["C3A2",0x8292],
- ["C654",0x8293],
- ["C655",0x8294],
- ["C656",0x8295],
- ["C657",0x8296],
- ["DCBC",0x8297],
- ["DCC5",0x8298],
- ["DCBD",0x8299],
- ["C658",0x829A],
- ["C659",0x829B],
- ["CEDF",0x829C],
- ["D6A5",0x829D],
- ["C65A",0x829E],
- ["DCCF",0x829F],
- ["C65B",0x82A0],
- ["DCCD",0x82A1],
- ["C65C",0x82A2],
- ["C65D",0x82A3],
- ["DCD2",0x82A4],
- ["BDE6",0x82A5],
- ["C2AB",0x82A6],
- ["C65E",0x82A7],
- ["DCB8",0x82A8],
- ["DCCB",0x82A9],
- ["DCCE",0x82AA],
- ["DCBE",0x82AB],
- ["B7D2",0x82AC],
- ["B0C5",0x82AD],
- ["DCC7",0x82AE],
- ["D0BE",0x82AF],
- ["DCC1",0x82B0],
- ["BBA8",0x82B1],
- ["C65F",0x82B2],
- ["B7BC",0x82B3],
- ["DCCC",0x82B4],
- ["C660",0x82B5],
- ["C661",0x82B6],
- ["DCC6",0x82B7],
- ["DCBF",0x82B8],
- ["C7DB",0x82B9],
- ["C662",0x82BA],
- ["C663",0x82BB],
- ["C664",0x82BC],
- ["D1BF",0x82BD],
- ["DCC0",0x82BE],
- ["C665",0x82BF],
- ["C666",0x82C0],
- ["DCCA",0x82C1],
- ["C667",0x82C2],
- ["C668",0x82C3],
- ["DCD0",0x82C4],
- ["C669",0x82C5],
- ["C66A",0x82C6],
- ["CEAD",0x82C7],
- ["DCC2",0x82C8],
- ["C66B",0x82C9],
- ["DCC3",0x82CA],
- ["DCC8",0x82CB],
- ["DCC9",0x82CC],
- ["B2D4",0x82CD],
- ["DCD1",0x82CE],
- ["CBD5",0x82CF],
- ["C66C",0x82D0],
- ["D4B7",0x82D1],
- ["DCDB",0x82D2],
- ["DCDF",0x82D3],
- ["CCA6",0x82D4],
- ["DCE6",0x82D5],
- ["C66D",0x82D6],
- ["C3E7",0x82D7],
- ["DCDC",0x82D8],
- ["C66E",0x82D9],
- ["C66F",0x82DA],
- ["BFC1",0x82DB],
- ["DCD9",0x82DC],
- ["C670",0x82DD],
- ["B0FA",0x82DE],
- ["B9B6",0x82DF],
- ["DCE5",0x82E0],
- ["DCD3",0x82E1],
- ["C671",0x82E2],
- ["DCC4",0x82E3],
- ["DCD6",0x82E4],
- ["C8F4",0x82E5],
- ["BFE0",0x82E6],
- ["C672",0x82E7],
- ["C673",0x82E8],
- ["C674",0x82E9],
- ["C675",0x82EA],
- ["C9BB",0x82EB],
- ["C676",0x82EC],
- ["C677",0x82ED],
- ["C678",0x82EE],
- ["B1BD",0x82EF],
- ["C679",0x82F0],
- ["D3A2",0x82F1],
- ["C67A",0x82F2],
- ["C67B",0x82F3],
- ["DCDA",0x82F4],
- ["C67C",0x82F5],
- ["C67D",0x82F6],
- ["DCD5",0x82F7],
- ["C67E",0x82F8],
- ["C6BB",0x82F9],
- ["C680",0x82FA],
- ["DCDE",0x82FB],
- ["C681",0x82FC],
- ["C682",0x82FD],
- ["C683",0x82FE],
- ["C684",0x82FF],
- ["C685",0x8300],
- ["D7C2",0x8301],
- ["C3AF",0x8302],
- ["B7B6",0x8303],
- ["C7D1",0x8304],
- ["C3A9",0x8305],
- ["DCE2",0x8306],
- ["DCD8",0x8307],
- ["DCEB",0x8308],
- ["DCD4",0x8309],
- ["C686",0x830A],
- ["C687",0x830B],
- ["DCDD",0x830C],
- ["C688",0x830D],
- ["BEA5",0x830E],
- ["DCD7",0x830F],
- ["C689",0x8310],
- ["DCE0",0x8311],
- ["C68A",0x8312],
- ["C68B",0x8313],
- ["DCE3",0x8314],
- ["DCE4",0x8315],
- ["C68C",0x8316],
- ["DCF8",0x8317],
- ["C68D",0x8318],
- ["C68E",0x8319],
- ["DCE1",0x831A],
- ["DDA2",0x831B],
- ["DCE7",0x831C],
- ["C68F",0x831D],
- ["C690",0x831E],
- ["C691",0x831F],
- ["C692",0x8320],
- ["C693",0x8321],
- ["C694",0x8322],
- ["C695",0x8323],
- ["C696",0x8324],
- ["C697",0x8325],
- ["C698",0x8326],
- ["BCEB",0x8327],
- ["B4C4",0x8328],
- ["C699",0x8329],
- ["C69A",0x832A],
- ["C3A3",0x832B],
- ["B2E7",0x832C],
- ["DCFA",0x832D],
- ["C69B",0x832E],
- ["DCF2",0x832F],
- ["C69C",0x8330],
- ["DCEF",0x8331],
- ["C69D",0x8332],
- ["DCFC",0x8333],
- ["DCEE",0x8334],
- ["D2F0",0x8335],
- ["B2E8",0x8336],
- ["C69E",0x8337],
- ["C8D7",0x8338],
- ["C8E3",0x8339],
- ["DCFB",0x833A],
- ["C69F",0x833B],
- ["DCED",0x833C],
- ["C6A0",0x833D],
- ["C740",0x833E],
- ["C741",0x833F],
- ["DCF7",0x8340],
- ["C742",0x8341],
- ["C743",0x8342],
- ["DCF5",0x8343],
- ["C744",0x8344],
- ["C745",0x8345],
- ["BEA3",0x8346],
- ["DCF4",0x8347],
- ["C746",0x8348],
- ["B2DD",0x8349],
- ["C747",0x834A],
- ["C748",0x834B],
- ["C749",0x834C],
- ["C74A",0x834D],
- ["C74B",0x834E],
- ["DCF3",0x834F],
- ["BCF6",0x8350],
- ["DCE8",0x8351],
- ["BBC4",0x8352],
- ["C74C",0x8353],
- ["C0F3",0x8354],
- ["C74D",0x8355],
- ["C74E",0x8356],
- ["C74F",0x8357],
- ["C750",0x8358],
- ["C751",0x8359],
- ["BCD4",0x835A],
- ["DCE9",0x835B],
- ["DCEA",0x835C],
- ["C752",0x835D],
- ["DCF1",0x835E],
- ["DCF6",0x835F],
- ["DCF9",0x8360],
- ["B5B4",0x8361],
- ["C753",0x8362],
- ["C8D9",0x8363],
- ["BBE7",0x8364],
- ["DCFE",0x8365],
- ["DCFD",0x8366],
- ["D3AB",0x8367],
- ["DDA1",0x8368],
- ["DDA3",0x8369],
- ["DDA5",0x836A],
- ["D2F1",0x836B],
- ["DDA4",0x836C],
- ["DDA6",0x836D],
- ["DDA7",0x836E],
- ["D2A9",0x836F],
- ["C754",0x8370],
- ["C755",0x8371],
- ["C756",0x8372],
- ["C757",0x8373],
- ["C758",0x8374],
- ["C759",0x8375],
- ["C75A",0x8376],
- ["BAC9",0x8377],
- ["DDA9",0x8378],
- ["C75B",0x8379],
- ["C75C",0x837A],
- ["DDB6",0x837B],
- ["DDB1",0x837C],
- ["DDB4",0x837D],
- ["C75D",0x837E],
- ["C75E",0x837F],
- ["C75F",0x8380],
- ["C760",0x8381],
- ["C761",0x8382],
- ["C762",0x8383],
- ["C763",0x8384],
- ["DDB0",0x8385],
- ["C6CE",0x8386],
- ["C764",0x8387],
- ["C765",0x8388],
- ["C0F2",0x8389],
- ["C766",0x838A],
- ["C767",0x838B],
- ["C768",0x838C],
- ["C769",0x838D],
- ["C9AF",0x838E],
- ["C76A",0x838F],
- ["C76B",0x8390],
- ["C76C",0x8391],
- ["DCEC",0x8392],
- ["DDAE",0x8393],
- ["C76D",0x8394],
- ["C76E",0x8395],
- ["C76F",0x8396],
- ["C770",0x8397],
- ["DDB7",0x8398],
- ["C771",0x8399],
- ["C772",0x839A],
- ["DCF0",0x839B],
- ["DDAF",0x839C],
- ["C773",0x839D],
- ["DDB8",0x839E],
- ["C774",0x839F],
- ["DDAC",0x83A0],
- ["C775",0x83A1],
- ["C776",0x83A2],
- ["C777",0x83A3],
- ["C778",0x83A4],
- ["C779",0x83A5],
- ["C77A",0x83A6],
- ["C77B",0x83A7],
- ["DDB9",0x83A8],
- ["DDB3",0x83A9],
- ["DDAD",0x83AA],
- ["C4AA",0x83AB],
- ["C77C",0x83AC],
- ["C77D",0x83AD],
- ["C77E",0x83AE],
- ["C780",0x83AF],
- ["DDA8",0x83B0],
- ["C0B3",0x83B1],
- ["C1AB",0x83B2],
- ["DDAA",0x83B3],
- ["DDAB",0x83B4],
- ["C781",0x83B5],
- ["DDB2",0x83B6],
- ["BBF1",0x83B7],
- ["DDB5",0x83B8],
- ["D3A8",0x83B9],
- ["DDBA",0x83BA],
- ["C782",0x83BB],
- ["DDBB",0x83BC],
- ["C3A7",0x83BD],
- ["C783",0x83BE],
- ["C784",0x83BF],
- ["DDD2",0x83C0],
- ["DDBC",0x83C1],
- ["C785",0x83C2],
- ["C786",0x83C3],
- ["C787",0x83C4],
- ["DDD1",0x83C5],
- ["C788",0x83C6],
- ["B9BD",0x83C7],
- ["C789",0x83C8],
- ["C78A",0x83C9],
- ["BED5",0x83CA],
- ["C78B",0x83CB],
- ["BEFA",0x83CC],
- ["C78C",0x83CD],
- ["C78D",0x83CE],
- ["BACA",0x83CF],
- ["C78E",0x83D0],
- ["C78F",0x83D1],
- ["C790",0x83D2],
- ["C791",0x83D3],
- ["DDCA",0x83D4],
- ["C792",0x83D5],
- ["DDC5",0x83D6],
- ["C793",0x83D7],
- ["DDBF",0x83D8],
- ["C794",0x83D9],
- ["C795",0x83DA],
- ["C796",0x83DB],
- ["B2CB",0x83DC],
- ["DDC3",0x83DD],
- ["C797",0x83DE],
- ["DDCB",0x83DF],
- ["B2A4",0x83E0],
- ["DDD5",0x83E1],
- ["C798",0x83E2],
- ["C799",0x83E3],
- ["C79A",0x83E4],
- ["DDBE",0x83E5],
- ["C79B",0x83E6],
- ["C79C",0x83E7],
- ["C79D",0x83E8],
- ["C6D0",0x83E9],
- ["DDD0",0x83EA],
- ["C79E",0x83EB],
- ["C79F",0x83EC],
- ["C7A0",0x83ED],
- ["C840",0x83EE],
- ["C841",0x83EF],
- ["DDD4",0x83F0],
- ["C1E2",0x83F1],
- ["B7C6",0x83F2],
- ["C842",0x83F3],
- ["C843",0x83F4],
- ["C844",0x83F5],
- ["C845",0x83F6],
- ["C846",0x83F7],
- ["DDCE",0x83F8],
- ["DDCF",0x83F9],
- ["C847",0x83FA],
- ["C848",0x83FB],
- ["C849",0x83FC],
- ["DDC4",0x83FD],
- ["C84A",0x83FE],
- ["C84B",0x83FF],
- ["C84C",0x8400],
- ["DDBD",0x8401],
- ["C84D",0x8402],
- ["DDCD",0x8403],
- ["CCD1",0x8404],
- ["C84E",0x8405],
- ["DDC9",0x8406],
- ["C84F",0x8407],
- ["C850",0x8408],
- ["C851",0x8409],
- ["C852",0x840A],
- ["DDC2",0x840B],
- ["C3C8",0x840C],
- ["C6BC",0x840D],
- ["CEAE",0x840E],
- ["DDCC",0x840F],
- ["C853",0x8410],
- ["DDC8",0x8411],
- ["C854",0x8412],
- ["C855",0x8413],
- ["C856",0x8414],
- ["C857",0x8415],
- ["C858",0x8416],
- ["C859",0x8417],
- ["DDC1",0x8418],
- ["C85A",0x8419],
- ["C85B",0x841A],
- ["C85C",0x841B],
- ["DDC6",0x841C],
- ["C2DC",0x841D],
- ["C85D",0x841E],
- ["C85E",0x841F],
- ["C85F",0x8420],
- ["C860",0x8421],
- ["C861",0x8422],
- ["C862",0x8423],
- ["D3A9",0x8424],
- ["D3AA",0x8425],
- ["DDD3",0x8426],
- ["CFF4",0x8427],
- ["C8F8",0x8428],
- ["C863",0x8429],
- ["C864",0x842A],
- ["C865",0x842B],
- ["C866",0x842C],
- ["C867",0x842D],
- ["C868",0x842E],
- ["C869",0x842F],
- ["C86A",0x8430],
- ["DDE6",0x8431],
- ["C86B",0x8432],
- ["C86C",0x8433],
- ["C86D",0x8434],
- ["C86E",0x8435],
- ["C86F",0x8436],
- ["C870",0x8437],
- ["DDC7",0x8438],
- ["C871",0x8439],
- ["C872",0x843A],
- ["C873",0x843B],
- ["DDE0",0x843C],
- ["C2E4",0x843D],
- ["C874",0x843E],
- ["C875",0x843F],
- ["C876",0x8440],
- ["C877",0x8441],
- ["C878",0x8442],
- ["C879",0x8443],
- ["C87A",0x8444],
- ["C87B",0x8445],
- ["DDE1",0x8446],
- ["C87C",0x8447],
- ["C87D",0x8448],
- ["C87E",0x8449],
- ["C880",0x844A],
- ["C881",0x844B],
- ["C882",0x844C],
- ["C883",0x844D],
- ["C884",0x844E],
- ["C885",0x844F],
- ["C886",0x8450],
- ["DDD7",0x8451],
- ["C887",0x8452],
- ["C888",0x8453],
- ["C889",0x8454],
- ["C88A",0x8455],
- ["C88B",0x8456],
- ["D6F8",0x8457],
- ["C88C",0x8458],
- ["DDD9",0x8459],
- ["DDD8",0x845A],
- ["B8F0",0x845B],
- ["DDD6",0x845C],
- ["C88D",0x845D],
- ["C88E",0x845E],
- ["C88F",0x845F],
- ["C890",0x8460],
- ["C6CF",0x8461],
- ["C891",0x8462],
- ["B6AD",0x8463],
- ["C892",0x8464],
- ["C893",0x8465],
- ["C894",0x8466],
- ["C895",0x8467],
- ["C896",0x8468],
- ["DDE2",0x8469],
- ["C897",0x846A],
- ["BAF9",0x846B],
- ["D4E1",0x846C],
- ["DDE7",0x846D],
- ["C898",0x846E],
- ["C899",0x846F],
- ["C89A",0x8470],
- ["B4D0",0x8471],
- ["C89B",0x8472],
- ["DDDA",0x8473],
- ["C89C",0x8474],
- ["BFFB",0x8475],
- ["DDE3",0x8476],
- ["C89D",0x8477],
- ["DDDF",0x8478],
- ["C89E",0x8479],
- ["DDDD",0x847A],
- ["C89F",0x847B],
- ["C8A0",0x847C],
- ["C940",0x847D],
- ["C941",0x847E],
- ["C942",0x847F],
- ["C943",0x8480],
- ["C944",0x8481],
- ["B5D9",0x8482],
- ["C945",0x8483],
- ["C946",0x8484],
- ["C947",0x8485],
- ["C948",0x8486],
- ["DDDB",0x8487],
- ["DDDC",0x8488],
- ["DDDE",0x8489],
- ["C949",0x848A],
- ["BDAF",0x848B],
- ["DDE4",0x848C],
- ["C94A",0x848D],
- ["DDE5",0x848E],
- ["C94B",0x848F],
- ["C94C",0x8490],
- ["C94D",0x8491],
- ["C94E",0x8492],
- ["C94F",0x8493],
- ["C950",0x8494],
- ["C951",0x8495],
- ["C952",0x8496],
- ["DDF5",0x8497],
- ["C953",0x8498],
- ["C3C9",0x8499],
- ["C954",0x849A],
- ["C955",0x849B],
- ["CBE2",0x849C],
- ["C956",0x849D],
- ["C957",0x849E],
- ["C958",0x849F],
- ["C959",0x84A0],
- ["DDF2",0x84A1],
- ["C95A",0x84A2],
- ["C95B",0x84A3],
- ["C95C",0x84A4],
- ["C95D",0x84A5],
- ["C95E",0x84A6],
- ["C95F",0x84A7],
- ["C960",0x84A8],
- ["C961",0x84A9],
- ["C962",0x84AA],
- ["C963",0x84AB],
- ["C964",0x84AC],
- ["C965",0x84AD],
- ["C966",0x84AE],
- ["D8E1",0x84AF],
- ["C967",0x84B0],
- ["C968",0x84B1],
- ["C6D1",0x84B2],
- ["C969",0x84B3],
- ["DDF4",0x84B4],
- ["C96A",0x84B5],
- ["C96B",0x84B6],
- ["C96C",0x84B7],
- ["D5F4",0x84B8],
- ["DDF3",0x84B9],
- ["DDF0",0x84BA],
- ["C96D",0x84BB],
- ["C96E",0x84BC],
- ["DDEC",0x84BD],
- ["C96F",0x84BE],
- ["DDEF",0x84BF],
- ["C970",0x84C0],
- ["DDE8",0x84C1],
- ["C971",0x84C2],
- ["C972",0x84C3],
- ["D0EE",0x84C4],
- ["C973",0x84C5],
- ["C974",0x84C6],
- ["C975",0x84C7],
- ["C976",0x84C8],
- ["C8D8",0x84C9],
- ["DDEE",0x84CA],
- ["C977",0x84CB],
- ["C978",0x84CC],
- ["DDE9",0x84CD],
- ["C979",0x84CE],
- ["C97A",0x84CF],
- ["DDEA",0x84D0],
- ["CBF2",0x84D1],
- ["C97B",0x84D2],
- ["DDED",0x84D3],
- ["C97C",0x84D4],
- ["C97D",0x84D5],
- ["B1CD",0x84D6],
- ["C97E",0x84D7],
- ["C980",0x84D8],
- ["C981",0x84D9],
- ["C982",0x84DA],
- ["C983",0x84DB],
- ["C984",0x84DC],
- ["C0B6",0x84DD],
- ["C985",0x84DE],
- ["BCBB",0x84DF],
- ["DDF1",0x84E0],
- ["C986",0x84E1],
- ["C987",0x84E2],
- ["DDF7",0x84E3],
- ["C988",0x84E4],
- ["DDF6",0x84E5],
- ["DDEB",0x84E6],
- ["C989",0x84E7],
- ["C98A",0x84E8],
- ["C98B",0x84E9],
- ["C98C",0x84EA],
- ["C98D",0x84EB],
- ["C5EE",0x84EC],
- ["C98E",0x84ED],
- ["C98F",0x84EE],
- ["C990",0x84EF],
- ["DDFB",0x84F0],
- ["C991",0x84F1],
- ["C992",0x84F2],
- ["C993",0x84F3],
- ["C994",0x84F4],
- ["C995",0x84F5],
- ["C996",0x84F6],
- ["C997",0x84F7],
- ["C998",0x84F8],
- ["C999",0x84F9],
- ["C99A",0x84FA],
- ["C99B",0x84FB],
- ["DEA4",0x84FC],
- ["C99C",0x84FD],
- ["C99D",0x84FE],
- ["DEA3",0x84FF],
- ["C99E",0x8500],
- ["C99F",0x8501],
- ["C9A0",0x8502],
- ["CA40",0x8503],
- ["CA41",0x8504],
- ["CA42",0x8505],
- ["CA43",0x8506],
- ["CA44",0x8507],
- ["CA45",0x8508],
- ["CA46",0x8509],
- ["CA47",0x850A],
- ["CA48",0x850B],
- ["DDF8",0x850C],
- ["CA49",0x850D],
- ["CA4A",0x850E],
- ["CA4B",0x850F],
- ["CA4C",0x8510],
- ["C3EF",0x8511],
- ["CA4D",0x8512],
- ["C2FB",0x8513],
- ["CA4E",0x8514],
- ["CA4F",0x8515],
- ["CA50",0x8516],
- ["D5E1",0x8517],
- ["CA51",0x8518],
- ["CA52",0x8519],
- ["CEB5",0x851A],
- ["CA53",0x851B],
- ["CA54",0x851C],
- ["CA55",0x851D],
- ["CA56",0x851E],
- ["DDFD",0x851F],
- ["CA57",0x8520],
- ["B2CC",0x8521],
- ["CA58",0x8522],
- ["CA59",0x8523],
- ["CA5A",0x8524],
- ["CA5B",0x8525],
- ["CA5C",0x8526],
- ["CA5D",0x8527],
- ["CA5E",0x8528],
- ["CA5F",0x8529],
- ["CA60",0x852A],
- ["C4E8",0x852B],
- ["CADF",0x852C],
- ["CA61",0x852D],
- ["CA62",0x852E],
- ["CA63",0x852F],
- ["CA64",0x8530],
- ["CA65",0x8531],
- ["CA66",0x8532],
- ["CA67",0x8533],
- ["CA68",0x8534],
- ["CA69",0x8535],
- ["CA6A",0x8536],
- ["C7BE",0x8537],
- ["DDFA",0x8538],
- ["DDFC",0x8539],
- ["DDFE",0x853A],
- ["DEA2",0x853B],
- ["B0AA",0x853C],
- ["B1CE",0x853D],
- ["CA6B",0x853E],
- ["CA6C",0x853F],
- ["CA6D",0x8540],
- ["CA6E",0x8541],
- ["CA6F",0x8542],
- ["DEAC",0x8543],
- ["CA70",0x8544],
- ["CA71",0x8545],
- ["CA72",0x8546],
- ["CA73",0x8547],
- ["DEA6",0x8548],
- ["BDB6",0x8549],
- ["C8EF",0x854A],
- ["CA74",0x854B],
- ["CA75",0x854C],
- ["CA76",0x854D],
- ["CA77",0x854E],
- ["CA78",0x854F],
- ["CA79",0x8550],
- ["CA7A",0x8551],
- ["CA7B",0x8552],
- ["CA7C",0x8553],
- ["CA7D",0x8554],
- ["CA7E",0x8555],
- ["DEA1",0x8556],
- ["CA80",0x8557],
- ["CA81",0x8558],
- ["DEA5",0x8559],
- ["CA82",0x855A],
- ["CA83",0x855B],
- ["CA84",0x855C],
- ["CA85",0x855D],
- ["DEA9",0x855E],
- ["CA86",0x855F],
- ["CA87",0x8560],
- ["CA88",0x8561],
- ["CA89",0x8562],
- ["CA8A",0x8563],
- ["DEA8",0x8564],
- ["CA8B",0x8565],
- ["CA8C",0x8566],
- ["CA8D",0x8567],
- ["DEA7",0x8568],
- ["CA8E",0x8569],
- ["CA8F",0x856A],
- ["CA90",0x856B],
- ["CA91",0x856C],
- ["CA92",0x856D],
- ["CA93",0x856E],
- ["CA94",0x856F],
- ["CA95",0x8570],
- ["CA96",0x8571],
- ["DEAD",0x8572],
- ["CA97",0x8573],
- ["D4CC",0x8574],
- ["CA98",0x8575],
- ["CA99",0x8576],
- ["CA9A",0x8577],
- ["CA9B",0x8578],
- ["DEB3",0x8579],
- ["DEAA",0x857A],
- ["DEAE",0x857B],
- ["CA9C",0x857C],
- ["CA9D",0x857D],
- ["C0D9",0x857E],
- ["CA9E",0x857F],
- ["CA9F",0x8580],
- ["CAA0",0x8581],
- ["CB40",0x8582],
- ["CB41",0x8583],
- ["B1A1",0x8584],
- ["DEB6",0x8585],
- ["CB42",0x8586],
- ["DEB1",0x8587],
- ["CB43",0x8588],
- ["CB44",0x8589],
- ["CB45",0x858A],
- ["CB46",0x858B],
- ["CB47",0x858C],
- ["CB48",0x858D],
- ["CB49",0x858E],
- ["DEB2",0x858F],
- ["CB4A",0x8590],
- ["CB4B",0x8591],
- ["CB4C",0x8592],
- ["CB4D",0x8593],
- ["CB4E",0x8594],
- ["CB4F",0x8595],
- ["CB50",0x8596],
- ["CB51",0x8597],
- ["CB52",0x8598],
- ["CB53",0x8599],
- ["CB54",0x859A],
- ["D1A6",0x859B],
- ["DEB5",0x859C],
- ["CB55",0x859D],
- ["CB56",0x859E],
- ["CB57",0x859F],
- ["CB58",0x85A0],
- ["CB59",0x85A1],
- ["CB5A",0x85A2],
- ["CB5B",0x85A3],
- ["DEAF",0x85A4],
- ["CB5C",0x85A5],
- ["CB5D",0x85A6],
- ["CB5E",0x85A7],
- ["DEB0",0x85A8],
- ["CB5F",0x85A9],
- ["D0BD",0x85AA],
- ["CB60",0x85AB],
- ["CB61",0x85AC],
- ["CB62",0x85AD],
- ["DEB4",0x85AE],
- ["CAED",0x85AF],
- ["DEB9",0x85B0],
- ["CB63",0x85B1],
- ["CB64",0x85B2],
- ["CB65",0x85B3],
- ["CB66",0x85B4],
- ["CB67",0x85B5],
- ["CB68",0x85B6],
- ["DEB8",0x85B7],
- ["CB69",0x85B8],
- ["DEB7",0x85B9],
- ["CB6A",0x85BA],
- ["CB6B",0x85BB],
- ["CB6C",0x85BC],
- ["CB6D",0x85BD],
- ["CB6E",0x85BE],
- ["CB6F",0x85BF],
- ["CB70",0x85C0],
- ["DEBB",0x85C1],
- ["CB71",0x85C2],
- ["CB72",0x85C3],
- ["CB73",0x85C4],
- ["CB74",0x85C5],
- ["CB75",0x85C6],
- ["CB76",0x85C7],
- ["CB77",0x85C8],
- ["BDE5",0x85C9],
- ["CB78",0x85CA],
- ["CB79",0x85CB],
- ["CB7A",0x85CC],
- ["CB7B",0x85CD],
- ["CB7C",0x85CE],
- ["B2D8",0x85CF],
- ["C3EA",0x85D0],
- ["CB7D",0x85D1],
- ["CB7E",0x85D2],
- ["DEBA",0x85D3],
- ["CB80",0x85D4],
- ["C5BA",0x85D5],
- ["CB81",0x85D6],
- ["CB82",0x85D7],
- ["CB83",0x85D8],
- ["CB84",0x85D9],
- ["CB85",0x85DA],
- ["CB86",0x85DB],
- ["DEBC",0x85DC],
- ["CB87",0x85DD],
- ["CB88",0x85DE],
- ["CB89",0x85DF],
- ["CB8A",0x85E0],
- ["CB8B",0x85E1],
- ["CB8C",0x85E2],
- ["CB8D",0x85E3],
- ["CCD9",0x85E4],
- ["CB8E",0x85E5],
- ["CB8F",0x85E6],
- ["CB90",0x85E7],
- ["CB91",0x85E8],
- ["B7AA",0x85E9],
- ["CB92",0x85EA],
- ["CB93",0x85EB],
- ["CB94",0x85EC],
- ["CB95",0x85ED],
- ["CB96",0x85EE],
- ["CB97",0x85EF],
- ["CB98",0x85F0],
- ["CB99",0x85F1],
- ["CB9A",0x85F2],
- ["CB9B",0x85F3],
- ["CB9C",0x85F4],
- ["CB9D",0x85F5],
- ["CB9E",0x85F6],
- ["CB9F",0x85F7],
- ["CBA0",0x85F8],
- ["CC40",0x85F9],
- ["CC41",0x85FA],
- ["D4E5",0x85FB],
- ["CC42",0x85FC],
- ["CC43",0x85FD],
- ["CC44",0x85FE],
- ["DEBD",0x85FF],
- ["CC45",0x8600],
- ["CC46",0x8601],
- ["CC47",0x8602],
- ["CC48",0x8603],
- ["CC49",0x8604],
- ["DEBF",0x8605],
- ["CC4A",0x8606],
- ["CC4B",0x8607],
- ["CC4C",0x8608],
- ["CC4D",0x8609],
- ["CC4E",0x860A],
- ["CC4F",0x860B],
- ["CC50",0x860C],
- ["CC51",0x860D],
- ["CC52",0x860E],
- ["CC53",0x860F],
- ["CC54",0x8610],
- ["C4A2",0x8611],
- ["CC55",0x8612],
- ["CC56",0x8613],
- ["CC57",0x8614],
- ["CC58",0x8615],
- ["DEC1",0x8616],
- ["CC59",0x8617],
- ["CC5A",0x8618],
- ["CC5B",0x8619],
- ["CC5C",0x861A],
- ["CC5D",0x861B],
- ["CC5E",0x861C],
- ["CC5F",0x861D],
- ["CC60",0x861E],
- ["CC61",0x861F],
- ["CC62",0x8620],
- ["CC63",0x8621],
- ["CC64",0x8622],
- ["CC65",0x8623],
- ["CC66",0x8624],
- ["CC67",0x8625],
- ["CC68",0x8626],
- ["DEBE",0x8627],
- ["CC69",0x8628],
- ["DEC0",0x8629],
- ["CC6A",0x862A],
- ["CC6B",0x862B],
- ["CC6C",0x862C],
- ["CC6D",0x862D],
- ["CC6E",0x862E],
- ["CC6F",0x862F],
- ["CC70",0x8630],
- ["CC71",0x8631],
- ["CC72",0x8632],
- ["CC73",0x8633],
- ["CC74",0x8634],
- ["CC75",0x8635],
- ["CC76",0x8636],
- ["CC77",0x8637],
- ["D5BA",0x8638],
- ["CC78",0x8639],
- ["CC79",0x863A],
- ["CC7A",0x863B],
- ["DEC2",0x863C],
- ["CC7B",0x863D],
- ["CC7C",0x863E],
- ["CC7D",0x863F],
- ["CC7E",0x8640],
- ["CC80",0x8641],
- ["CC81",0x8642],
- ["CC82",0x8643],
- ["CC83",0x8644],
- ["CC84",0x8645],
- ["CC85",0x8646],
- ["CC86",0x8647],
- ["CC87",0x8648],
- ["CC88",0x8649],
- ["CC89",0x864A],
- ["CC8A",0x864B],
- ["CC8B",0x864C],
- ["F2AE",0x864D],
- ["BBA2",0x864E],
- ["C2B2",0x864F],
- ["C5B0",0x8650],
- ["C2C7",0x8651],
- ["CC8C",0x8652],
- ["CC8D",0x8653],
- ["F2AF",0x8654],
- ["CC8E",0x8655],
- ["CC8F",0x8656],
- ["CC90",0x8657],
- ["CC91",0x8658],
- ["CC92",0x8659],
- ["D0E9",0x865A],
- ["CC93",0x865B],
- ["CC94",0x865C],
- ["CC95",0x865D],
- ["D3DD",0x865E],
- ["CC96",0x865F],
- ["CC97",0x8660],
- ["CC98",0x8661],
- ["EBBD",0x8662],
- ["CC99",0x8663],
- ["CC9A",0x8664],
- ["CC9B",0x8665],
- ["CC9C",0x8666],
- ["CC9D",0x8667],
- ["CC9E",0x8668],
- ["CC9F",0x8669],
- ["CCA0",0x866A],
- ["B3E6",0x866B],
- ["F2B0",0x866C],
- ["CD40",0x866D],
- ["F2B1",0x866E],
- ["CD41",0x866F],
- ["CD42",0x8670],
- ["CAAD",0x8671],
- ["CD43",0x8672],
- ["CD44",0x8673],
- ["CD45",0x8674],
- ["CD46",0x8675],
- ["CD47",0x8676],
- ["CD48",0x8677],
- ["CD49",0x8678],
- ["BAE7",0x8679],
- ["F2B3",0x867A],
- ["F2B5",0x867B],
- ["F2B4",0x867C],
- ["CBE4",0x867D],
- ["CFBA",0x867E],
- ["F2B2",0x867F],
- ["CAB4",0x8680],
- ["D2CF",0x8681],
- ["C2EC",0x8682],
- ["CD4A",0x8683],
- ["CD4B",0x8684],
- ["CD4C",0x8685],
- ["CD4D",0x8686],
- ["CD4E",0x8687],
- ["CD4F",0x8688],
- ["CD50",0x8689],
- ["CEC3",0x868A],
- ["F2B8",0x868B],
- ["B0F6",0x868C],
- ["F2B7",0x868D],
- ["CD51",0x868E],
- ["CD52",0x868F],
- ["CD53",0x8690],
- ["CD54",0x8691],
- ["CD55",0x8692],
- ["F2BE",0x8693],
- ["CD56",0x8694],
- ["B2CF",0x8695],
- ["CD57",0x8696],
- ["CD58",0x8697],
- ["CD59",0x8698],
- ["CD5A",0x8699],
- ["CD5B",0x869A],
- ["CD5C",0x869B],
- ["D1C1",0x869C],
- ["F2BA",0x869D],
- ["CD5D",0x869E],
- ["CD5E",0x869F],
- ["CD5F",0x86A0],
- ["CD60",0x86A1],
- ["CD61",0x86A2],
- ["F2BC",0x86A3],
- ["D4E9",0x86A4],
- ["CD62",0x86A5],
- ["CD63",0x86A6],
- ["F2BB",0x86A7],
- ["F2B6",0x86A8],
- ["F2BF",0x86A9],
- ["F2BD",0x86AA],
- ["CD64",0x86AB],
- ["F2B9",0x86AC],
- ["CD65",0x86AD],
- ["CD66",0x86AE],
- ["F2C7",0x86AF],
- ["F2C4",0x86B0],
- ["F2C6",0x86B1],
- ["CD67",0x86B2],
- ["CD68",0x86B3],
- ["F2CA",0x86B4],
- ["F2C2",0x86B5],
- ["F2C0",0x86B6],
- ["CD69",0x86B7],
- ["CD6A",0x86B8],
- ["CD6B",0x86B9],
- ["F2C5",0x86BA],
- ["CD6C",0x86BB],
- ["CD6D",0x86BC],
- ["CD6E",0x86BD],
- ["CD6F",0x86BE],
- ["CD70",0x86BF],
- ["D6FB",0x86C0],
- ["CD71",0x86C1],
- ["CD72",0x86C2],
- ["CD73",0x86C3],
- ["F2C1",0x86C4],
- ["CD74",0x86C5],
- ["C7F9",0x86C6],
- ["C9DF",0x86C7],
- ["CD75",0x86C8],
- ["F2C8",0x86C9],
- ["B9C6",0x86CA],
- ["B5B0",0x86CB],
- ["CD76",0x86CC],
- ["CD77",0x86CD],
- ["F2C3",0x86CE],
- ["F2C9",0x86CF],
- ["F2D0",0x86D0],
- ["F2D6",0x86D1],
- ["CD78",0x86D2],
- ["CD79",0x86D3],
- ["BBD7",0x86D4],
- ["CD7A",0x86D5],
- ["CD7B",0x86D6],
- ["CD7C",0x86D7],
- ["F2D5",0x86D8],
- ["CDDC",0x86D9],
- ["CD7D",0x86DA],
- ["D6EB",0x86DB],
- ["CD7E",0x86DC],
- ["CD80",0x86DD],
- ["F2D2",0x86DE],
- ["F2D4",0x86DF],
- ["CD81",0x86E0],
- ["CD82",0x86E1],
- ["CD83",0x86E2],
- ["CD84",0x86E3],
- ["B8F2",0x86E4],
- ["CD85",0x86E5],
- ["CD86",0x86E6],
- ["CD87",0x86E7],
- ["CD88",0x86E8],
- ["F2CB",0x86E9],
- ["CD89",0x86EA],
- ["CD8A",0x86EB],
- ["CD8B",0x86EC],
- ["F2CE",0x86ED],
- ["C2F9",0x86EE],
- ["CD8C",0x86EF],
- ["D5DD",0x86F0],
- ["F2CC",0x86F1],
- ["F2CD",0x86F2],
- ["F2CF",0x86F3],
- ["F2D3",0x86F4],
- ["CD8D",0x86F5],
- ["CD8E",0x86F6],
- ["CD8F",0x86F7],
- ["F2D9",0x86F8],
- ["D3BC",0x86F9],
- ["CD90",0x86FA],
- ["CD91",0x86FB],
- ["CD92",0x86FC],
- ["CD93",0x86FD],
- ["B6EA",0x86FE],
- ["CD94",0x86FF],
- ["CAF1",0x8700],
- ["CD95",0x8701],
- ["B7E4",0x8702],
- ["F2D7",0x8703],
- ["CD96",0x8704],
- ["CD97",0x8705],
- ["CD98",0x8706],
- ["F2D8",0x8707],
- ["F2DA",0x8708],
- ["F2DD",0x8709],
- ["F2DB",0x870A],
- ["CD99",0x870B],
- ["CD9A",0x870C],
- ["F2DC",0x870D],
- ["CD9B",0x870E],
- ["CD9C",0x870F],
- ["CD9D",0x8710],
- ["CD9E",0x8711],
- ["D1D1",0x8712],
- ["F2D1",0x8713],
- ["CD9F",0x8714],
- ["CDC9",0x8715],
- ["CDA0",0x8716],
- ["CECF",0x8717],
- ["D6A9",0x8718],
- ["CE40",0x8719],
- ["F2E3",0x871A],
- ["CE41",0x871B],
- ["C3DB",0x871C],
- ["CE42",0x871D],
- ["F2E0",0x871E],
- ["CE43",0x871F],
- ["CE44",0x8720],
- ["C0AF",0x8721],
- ["F2EC",0x8722],
- ["F2DE",0x8723],
- ["CE45",0x8724],
- ["F2E1",0x8725],
- ["CE46",0x8726],
- ["CE47",0x8727],
- ["CE48",0x8728],
- ["F2E8",0x8729],
- ["CE49",0x872A],
- ["CE4A",0x872B],
- ["CE4B",0x872C],
- ["CE4C",0x872D],
- ["F2E2",0x872E],
- ["CE4D",0x872F],
- ["CE4E",0x8730],
- ["F2E7",0x8731],
- ["CE4F",0x8732],
- ["CE50",0x8733],
- ["F2E6",0x8734],
- ["CE51",0x8735],
- ["CE52",0x8736],
- ["F2E9",0x8737],
- ["CE53",0x8738],
- ["CE54",0x8739],
- ["CE55",0x873A],
- ["F2DF",0x873B],
- ["CE56",0x873C],
- ["CE57",0x873D],
- ["F2E4",0x873E],
- ["F2EA",0x873F],
- ["CE58",0x8740],
- ["CE59",0x8741],
- ["CE5A",0x8742],
- ["CE5B",0x8743],
- ["CE5C",0x8744],
- ["CE5D",0x8745],
- ["CE5E",0x8746],
- ["D3AC",0x8747],
- ["F2E5",0x8748],
- ["B2F5",0x8749],
- ["CE5F",0x874A],
- ["CE60",0x874B],
- ["F2F2",0x874C],
- ["CE61",0x874D],
- ["D0AB",0x874E],
- ["CE62",0x874F],
- ["CE63",0x8750],
- ["CE64",0x8751],
- ["CE65",0x8752],
- ["F2F5",0x8753],
- ["CE66",0x8754],
- ["CE67",0x8755],
- ["CE68",0x8756],
- ["BBC8",0x8757],
- ["CE69",0x8758],
- ["F2F9",0x8759],
- ["CE6A",0x875A],
- ["CE6B",0x875B],
- ["CE6C",0x875C],
- ["CE6D",0x875D],
- ["CE6E",0x875E],
- ["CE6F",0x875F],
- ["F2F0",0x8760],
- ["CE70",0x8761],
- ["CE71",0x8762],
- ["F2F6",0x8763],
- ["F2F8",0x8764],
- ["F2FA",0x8765],
- ["CE72",0x8766],
- ["CE73",0x8767],
- ["CE74",0x8768],
- ["CE75",0x8769],
- ["CE76",0x876A],
- ["CE77",0x876B],
- ["CE78",0x876C],
- ["CE79",0x876D],
- ["F2F3",0x876E],
- ["CE7A",0x876F],
- ["F2F1",0x8770],
- ["CE7B",0x8771],
- ["CE7C",0x8772],
- ["CE7D",0x8773],
- ["BAFB",0x8774],
- ["CE7E",0x8775],
- ["B5FB",0x8776],
- ["CE80",0x8777],
- ["CE81",0x8778],
- ["CE82",0x8779],
- ["CE83",0x877A],
- ["F2EF",0x877B],
- ["F2F7",0x877C],
- ["F2ED",0x877D],
- ["F2EE",0x877E],
- ["CE84",0x877F],
- ["CE85",0x8780],
- ["CE86",0x8781],
- ["F2EB",0x8782],
- ["F3A6",0x8783],
- ["CE87",0x8784],
- ["F3A3",0x8785],
- ["CE88",0x8786],
- ["CE89",0x8787],
- ["F3A2",0x8788],
- ["CE8A",0x8789],
- ["CE8B",0x878A],
- ["F2F4",0x878B],
- ["CE8C",0x878C],
- ["C8DA",0x878D],
- ["CE8D",0x878E],
- ["CE8E",0x878F],
- ["CE8F",0x8790],
- ["CE90",0x8791],
- ["CE91",0x8792],
- ["F2FB",0x8793],
- ["CE92",0x8794],
- ["CE93",0x8795],
- ["CE94",0x8796],
- ["F3A5",0x8797],
- ["CE95",0x8798],
- ["CE96",0x8799],
- ["CE97",0x879A],
- ["CE98",0x879B],
- ["CE99",0x879C],
- ["CE9A",0x879D],
- ["CE9B",0x879E],
- ["C3F8",0x879F],
- ["CE9C",0x87A0],
- ["CE9D",0x87A1],
- ["CE9E",0x87A2],
- ["CE9F",0x87A3],
- ["CEA0",0x87A4],
- ["CF40",0x87A5],
- ["CF41",0x87A6],
- ["CF42",0x87A7],
- ["F2FD",0x87A8],
- ["CF43",0x87A9],
- ["CF44",0x87AA],
- ["F3A7",0x87AB],
- ["F3A9",0x87AC],
- ["F3A4",0x87AD],
- ["CF45",0x87AE],
- ["F2FC",0x87AF],
- ["CF46",0x87B0],
- ["CF47",0x87B1],
- ["CF48",0x87B2],
- ["F3AB",0x87B3],
- ["CF49",0x87B4],
- ["F3AA",0x87B5],
- ["CF4A",0x87B6],
- ["CF4B",0x87B7],
- ["CF4C",0x87B8],
- ["CF4D",0x87B9],
- ["C2DD",0x87BA],
- ["CF4E",0x87BB],
- ["CF4F",0x87BC],
- ["F3AE",0x87BD],
- ["CF50",0x87BE],
- ["CF51",0x87BF],
- ["F3B0",0x87C0],
- ["CF52",0x87C1],
- ["CF53",0x87C2],
- ["CF54",0x87C3],
- ["CF55",0x87C4],
- ["CF56",0x87C5],
- ["F3A1",0x87C6],
- ["CF57",0x87C7],
- ["CF58",0x87C8],
- ["CF59",0x87C9],
- ["F3B1",0x87CA],
- ["F3AC",0x87CB],
- ["CF5A",0x87CC],
- ["CF5B",0x87CD],
- ["CF5C",0x87CE],
- ["CF5D",0x87CF],
- ["CF5E",0x87D0],
- ["F3AF",0x87D1],
- ["F2FE",0x87D2],
- ["F3AD",0x87D3],
- ["CF5F",0x87D4],
- ["CF60",0x87D5],
- ["CF61",0x87D6],
- ["CF62",0x87D7],
- ["CF63",0x87D8],
- ["CF64",0x87D9],
- ["CF65",0x87DA],
- ["F3B2",0x87DB],
- ["CF66",0x87DC],
- ["CF67",0x87DD],
- ["CF68",0x87DE],
- ["CF69",0x87DF],
- ["F3B4",0x87E0],
- ["CF6A",0x87E1],
- ["CF6B",0x87E2],
- ["CF6C",0x87E3],
- ["CF6D",0x87E4],
- ["F3A8",0x87E5],
- ["CF6E",0x87E6],
- ["CF6F",0x87E7],
- ["CF70",0x87E8],
- ["CF71",0x87E9],
- ["F3B3",0x87EA],
- ["CF72",0x87EB],
- ["CF73",0x87EC],
- ["CF74",0x87ED],
- ["F3B5",0x87EE],
- ["CF75",0x87EF],
- ["CF76",0x87F0],
- ["CF77",0x87F1],
- ["CF78",0x87F2],
- ["CF79",0x87F3],
- ["CF7A",0x87F4],
- ["CF7B",0x87F5],
- ["CF7C",0x87F6],
- ["CF7D",0x87F7],
- ["CF7E",0x87F8],
- ["D0B7",0x87F9],
- ["CF80",0x87FA],
- ["CF81",0x87FB],
- ["CF82",0x87FC],
- ["CF83",0x87FD],
- ["F3B8",0x87FE],
- ["CF84",0x87FF],
- ["CF85",0x8800],
- ["CF86",0x8801],
- ["CF87",0x8802],
- ["D9F9",0x8803],
- ["CF88",0x8804],
- ["CF89",0x8805],
- ["CF8A",0x8806],
- ["CF8B",0x8807],
- ["CF8C",0x8808],
- ["CF8D",0x8809],
- ["F3B9",0x880A],
- ["CF8E",0x880B],
- ["CF8F",0x880C],
- ["CF90",0x880D],
- ["CF91",0x880E],
- ["CF92",0x880F],
- ["CF93",0x8810],
- ["CF94",0x8811],
- ["CF95",0x8812],
- ["F3B7",0x8813],
- ["CF96",0x8814],
- ["C8E4",0x8815],
- ["F3B6",0x8816],
- ["CF97",0x8817],
- ["CF98",0x8818],
- ["CF99",0x8819],
- ["CF9A",0x881A],
- ["F3BA",0x881B],
- ["CF9B",0x881C],
- ["CF9C",0x881D],
- ["CF9D",0x881E],
- ["CF9E",0x881F],
- ["CF9F",0x8820],
- ["F3BB",0x8821],
- ["B4C0",0x8822],
- ["CFA0",0x8823],
- ["D040",0x8824],
- ["D041",0x8825],
- ["D042",0x8826],
- ["D043",0x8827],
- ["D044",0x8828],
- ["D045",0x8829],
- ["D046",0x882A],
- ["D047",0x882B],
- ["D048",0x882C],
- ["D049",0x882D],
- ["D04A",0x882E],
- ["D04B",0x882F],
- ["D04C",0x8830],
- ["D04D",0x8831],
- ["EEC3",0x8832],
- ["D04E",0x8833],
- ["D04F",0x8834],
- ["D050",0x8835],
- ["D051",0x8836],
- ["D052",0x8837],
- ["D053",0x8838],
- ["F3BC",0x8839],
- ["D054",0x883A],
- ["D055",0x883B],
- ["F3BD",0x883C],
- ["D056",0x883D],
- ["D057",0x883E],
- ["D058",0x883F],
- ["D1AA",0x8840],
- ["D059",0x8841],
- ["D05A",0x8842],
- ["D05B",0x8843],
- ["F4AC",0x8844],
- ["D0C6",0x8845],
- ["D05C",0x8846],
- ["D05D",0x8847],
- ["D05E",0x8848],
- ["D05F",0x8849],
- ["D060",0x884A],
- ["D061",0x884B],
- ["D0D0",0x884C],
- ["D1DC",0x884D],
- ["D062",0x884E],
- ["D063",0x884F],
- ["D064",0x8850],
- ["D065",0x8851],
- ["D066",0x8852],
- ["D067",0x8853],
- ["CFCE",0x8854],
- ["D068",0x8855],
- ["D069",0x8856],
- ["BDD6",0x8857],
- ["D06A",0x8858],
- ["D1C3",0x8859],
- ["D06B",0x885A],
- ["D06C",0x885B],
- ["D06D",0x885C],
- ["D06E",0x885D],
- ["D06F",0x885E],
- ["D070",0x885F],
- ["D071",0x8860],
- ["BAE2",0x8861],
- ["E1E9",0x8862],
- ["D2C2",0x8863],
- ["F1C2",0x8864],
- ["B2B9",0x8865],
- ["D072",0x8866],
- ["D073",0x8867],
- ["B1ED",0x8868],
- ["F1C3",0x8869],
- ["D074",0x886A],
- ["C9C0",0x886B],
- ["B3C4",0x886C],
- ["D075",0x886D],
- ["D9F2",0x886E],
- ["D076",0x886F],
- ["CBA5",0x8870],
- ["D077",0x8871],
- ["F1C4",0x8872],
- ["D078",0x8873],
- ["D079",0x8874],
- ["D07A",0x8875],
- ["D07B",0x8876],
- ["D6D4",0x8877],
- ["D07C",0x8878],
- ["D07D",0x8879],
- ["D07E",0x887A],
- ["D080",0x887B],
- ["D081",0x887C],
- ["F1C5",0x887D],
- ["F4C0",0x887E],
- ["F1C6",0x887F],
- ["D082",0x8880],
- ["D4AC",0x8881],
- ["F1C7",0x8882],
- ["D083",0x8883],
- ["B0C0",0x8884],
- ["F4C1",0x8885],
- ["D084",0x8886],
- ["D085",0x8887],
- ["F4C2",0x8888],
- ["D086",0x8889],
- ["D087",0x888A],
- ["B4FC",0x888B],
- ["D088",0x888C],
- ["C5DB",0x888D],
- ["D089",0x888E],
- ["D08A",0x888F],
- ["D08B",0x8890],
- ["D08C",0x8891],
- ["CCBB",0x8892],
- ["D08D",0x8893],
- ["D08E",0x8894],
- ["D08F",0x8895],
- ["D0E4",0x8896],
- ["D090",0x8897],
- ["D091",0x8898],
- ["D092",0x8899],
- ["D093",0x889A],
- ["D094",0x889B],
- ["CDE0",0x889C],
- ["D095",0x889D],
- ["D096",0x889E],
- ["D097",0x889F],
- ["D098",0x88A0],
- ["D099",0x88A1],
- ["F1C8",0x88A2],
- ["D09A",0x88A3],
- ["D9F3",0x88A4],
- ["D09B",0x88A5],
- ["D09C",0x88A6],
- ["D09D",0x88A7],
- ["D09E",0x88A8],
- ["D09F",0x88A9],
- ["D0A0",0x88AA],
- ["B1BB",0x88AB],
- ["D140",0x88AC],
- ["CFAE",0x88AD],
- ["D141",0x88AE],
- ["D142",0x88AF],
- ["D143",0x88B0],
- ["B8A4",0x88B1],
- ["D144",0x88B2],
- ["D145",0x88B3],
- ["D146",0x88B4],
- ["D147",0x88B5],
- ["D148",0x88B6],
- ["F1CA",0x88B7],
- ["D149",0x88B8],
- ["D14A",0x88B9],
- ["D14B",0x88BA],
- ["D14C",0x88BB],
- ["F1CB",0x88BC],
- ["D14D",0x88BD],
- ["D14E",0x88BE],
- ["D14F",0x88BF],
- ["D150",0x88C0],
- ["B2C3",0x88C1],
- ["C1D1",0x88C2],
- ["D151",0x88C3],
- ["D152",0x88C4],
- ["D7B0",0x88C5],
- ["F1C9",0x88C6],
- ["D153",0x88C7],
- ["D154",0x88C8],
- ["F1CC",0x88C9],
- ["D155",0x88CA],
- ["D156",0x88CB],
- ["D157",0x88CC],
- ["D158",0x88CD],
- ["F1CE",0x88CE],
- ["D159",0x88CF],
- ["D15A",0x88D0],
- ["D15B",0x88D1],
- ["D9F6",0x88D2],
- ["D15C",0x88D3],
- ["D2E1",0x88D4],
- ["D4A3",0x88D5],
- ["D15D",0x88D6],
- ["D15E",0x88D7],
- ["F4C3",0x88D8],
- ["C8B9",0x88D9],
- ["D15F",0x88DA],
- ["D160",0x88DB],
- ["D161",0x88DC],
- ["D162",0x88DD],
- ["D163",0x88DE],
- ["F4C4",0x88DF],
- ["D164",0x88E0],
- ["D165",0x88E1],
- ["F1CD",0x88E2],
- ["F1CF",0x88E3],
- ["BFE3",0x88E4],
- ["F1D0",0x88E5],
- ["D166",0x88E6],
- ["D167",0x88E7],
- ["F1D4",0x88E8],
- ["D168",0x88E9],
- ["D169",0x88EA],
- ["D16A",0x88EB],
- ["D16B",0x88EC],
- ["D16C",0x88ED],
- ["D16D",0x88EE],
- ["D16E",0x88EF],
- ["F1D6",0x88F0],
- ["F1D1",0x88F1],
- ["D16F",0x88F2],
- ["C9D1",0x88F3],
- ["C5E1",0x88F4],
- ["D170",0x88F5],
- ["D171",0x88F6],
- ["D172",0x88F7],
- ["C2E3",0x88F8],
- ["B9FC",0x88F9],
- ["D173",0x88FA],
- ["D174",0x88FB],
- ["F1D3",0x88FC],
- ["D175",0x88FD],
- ["F1D5",0x88FE],
- ["D176",0x88FF],
- ["D177",0x8900],
- ["D178",0x8901],
- ["B9D3",0x8902],
- ["D179",0x8903],
- ["D17A",0x8904],
- ["D17B",0x8905],
- ["D17C",0x8906],
- ["D17D",0x8907],
- ["D17E",0x8908],
- ["D180",0x8909],
- ["F1DB",0x890A],
- ["D181",0x890B],
- ["D182",0x890C],
- ["D183",0x890D],
- ["D184",0x890E],
- ["D185",0x890F],
- ["BAD6",0x8910],
- ["D186",0x8911],
- ["B0FD",0x8912],
- ["F1D9",0x8913],
- ["D187",0x8914],
- ["D188",0x8915],
- ["D189",0x8916],
- ["D18A",0x8917],
- ["D18B",0x8918],
- ["F1D8",0x8919],
- ["F1D2",0x891A],
- ["F1DA",0x891B],
- ["D18C",0x891C],
- ["D18D",0x891D],
- ["D18E",0x891E],
- ["D18F",0x891F],
- ["D190",0x8920],
- ["F1D7",0x8921],
- ["D191",0x8922],
- ["D192",0x8923],
- ["D193",0x8924],
- ["C8EC",0x8925],
- ["D194",0x8926],
- ["D195",0x8927],
- ["D196",0x8928],
- ["D197",0x8929],
- ["CDCA",0x892A],
- ["F1DD",0x892B],
- ["D198",0x892C],
- ["D199",0x892D],
- ["D19A",0x892E],
- ["D19B",0x892F],
- ["E5BD",0x8930],
- ["D19C",0x8931],
- ["D19D",0x8932],
- ["D19E",0x8933],
- ["F1DC",0x8934],
- ["D19F",0x8935],
- ["F1DE",0x8936],
- ["D1A0",0x8937],
- ["D240",0x8938],
- ["D241",0x8939],
- ["D242",0x893A],
- ["D243",0x893B],
- ["D244",0x893C],
- ["D245",0x893D],
- ["D246",0x893E],
- ["D247",0x893F],
- ["D248",0x8940],
- ["F1DF",0x8941],
- ["D249",0x8942],
- ["D24A",0x8943],
- ["CFE5",0x8944],
- ["D24B",0x8945],
- ["D24C",0x8946],
- ["D24D",0x8947],
- ["D24E",0x8948],
- ["D24F",0x8949],
- ["D250",0x894A],
- ["D251",0x894B],
- ["D252",0x894C],
- ["D253",0x894D],
- ["D254",0x894E],
- ["D255",0x894F],
- ["D256",0x8950],
- ["D257",0x8951],
- ["D258",0x8952],
- ["D259",0x8953],
- ["D25A",0x8954],
- ["D25B",0x8955],
- ["D25C",0x8956],
- ["D25D",0x8957],
- ["D25E",0x8958],
- ["D25F",0x8959],
- ["D260",0x895A],
- ["D261",0x895B],
- ["D262",0x895C],
- ["D263",0x895D],
- ["F4C5",0x895E],
- ["BDF3",0x895F],
- ["D264",0x8960],
- ["D265",0x8961],
- ["D266",0x8962],
- ["D267",0x8963],
- ["D268",0x8964],
- ["D269",0x8965],
- ["F1E0",0x8966],
- ["D26A",0x8967],
- ["D26B",0x8968],
- ["D26C",0x8969],
- ["D26D",0x896A],
- ["D26E",0x896B],
- ["D26F",0x896C],
- ["D270",0x896D],
- ["D271",0x896E],
- ["D272",0x896F],
- ["D273",0x8970],
- ["D274",0x8971],
- ["D275",0x8972],
- ["D276",0x8973],
- ["D277",0x8974],
- ["D278",0x8975],
- ["D279",0x8976],
- ["D27A",0x8977],
- ["D27B",0x8978],
- ["D27C",0x8979],
- ["D27D",0x897A],
- ["F1E1",0x897B],
- ["D27E",0x897C],
- ["D280",0x897D],
- ["D281",0x897E],
- ["CEF7",0x897F],
- ["D282",0x8980],
- ["D2AA",0x8981],
- ["D283",0x8982],
- ["F1FB",0x8983],
- ["D284",0x8984],
- ["D285",0x8985],
- ["B8B2",0x8986],
- ["D286",0x8987],
- ["D287",0x8988],
- ["D288",0x8989],
- ["D289",0x898A],
- ["D28A",0x898B],
- ["D28B",0x898C],
- ["D28C",0x898D],
- ["D28D",0x898E],
- ["D28E",0x898F],
- ["D28F",0x8990],
- ["D290",0x8991],
- ["D291",0x8992],
- ["D292",0x8993],
- ["D293",0x8994],
- ["D294",0x8995],
- ["D295",0x8996],
- ["D296",0x8997],
- ["D297",0x8998],
- ["D298",0x8999],
- ["D299",0x899A],
- ["D29A",0x899B],
- ["D29B",0x899C],
- ["D29C",0x899D],
- ["D29D",0x899E],
- ["D29E",0x899F],
- ["D29F",0x89A0],
- ["D2A0",0x89A1],
- ["D340",0x89A2],
- ["D341",0x89A3],
- ["D342",0x89A4],
- ["D343",0x89A5],
- ["D344",0x89A6],
- ["D345",0x89A7],
- ["D346",0x89A8],
- ["D347",0x89A9],
- ["D348",0x89AA],
- ["D349",0x89AB],
- ["D34A",0x89AC],
- ["D34B",0x89AD],
- ["D34C",0x89AE],
- ["D34D",0x89AF],
- ["D34E",0x89B0],
- ["D34F",0x89B1],
- ["D350",0x89B2],
- ["D351",0x89B3],
- ["D352",0x89B4],
- ["D353",0x89B5],
- ["D354",0x89B6],
- ["D355",0x89B7],
- ["D356",0x89B8],
- ["D357",0x89B9],
- ["D358",0x89BA],
- ["D359",0x89BB],
- ["D35A",0x89BC],
- ["D35B",0x89BD],
- ["D35C",0x89BE],
- ["D35D",0x89BF],
- ["D35E",0x89C0],
- ["BCFB",0x89C1],
- ["B9DB",0x89C2],
- ["D35F",0x89C3],
- ["B9E6",0x89C4],
- ["C3D9",0x89C5],
- ["CAD3",0x89C6],
- ["EAE8",0x89C7],
- ["C0C0",0x89C8],
- ["BEF5",0x89C9],
- ["EAE9",0x89CA],
- ["EAEA",0x89CB],
- ["EAEB",0x89CC],
- ["D360",0x89CD],
- ["EAEC",0x89CE],
- ["EAED",0x89CF],
- ["EAEE",0x89D0],
- ["EAEF",0x89D1],
- ["BDC7",0x89D2],
- ["D361",0x89D3],
- ["D362",0x89D4],
- ["D363",0x89D5],
- ["F5FB",0x89D6],
- ["D364",0x89D7],
- ["D365",0x89D8],
- ["D366",0x89D9],
- ["F5FD",0x89DA],
- ["D367",0x89DB],
- ["F5FE",0x89DC],
- ["D368",0x89DD],
- ["F5FC",0x89DE],
- ["D369",0x89DF],
- ["D36A",0x89E0],
- ["D36B",0x89E1],
- ["D36C",0x89E2],
- ["BDE2",0x89E3],
- ["D36D",0x89E4],
- ["F6A1",0x89E5],
- ["B4A5",0x89E6],
- ["D36E",0x89E7],
- ["D36F",0x89E8],
- ["D370",0x89E9],
- ["D371",0x89EA],
- ["F6A2",0x89EB],
- ["D372",0x89EC],
- ["D373",0x89ED],
- ["D374",0x89EE],
- ["F6A3",0x89EF],
- ["D375",0x89F0],
- ["D376",0x89F1],
- ["D377",0x89F2],
- ["ECB2",0x89F3],
- ["D378",0x89F4],
- ["D379",0x89F5],
- ["D37A",0x89F6],
- ["D37B",0x89F7],
- ["D37C",0x89F8],
- ["D37D",0x89F9],
- ["D37E",0x89FA],
- ["D380",0x89FB],
- ["D381",0x89FC],
- ["D382",0x89FD],
- ["D383",0x89FE],
- ["D384",0x89FF],
- ["D1D4",0x8A00],
- ["D385",0x8A01],
- ["D386",0x8A02],
- ["D387",0x8A03],
- ["D388",0x8A04],
- ["D389",0x8A05],
- ["D38A",0x8A06],
- ["D9EA",0x8A07],
- ["D38B",0x8A08],
- ["D38C",0x8A09],
- ["D38D",0x8A0A],
- ["D38E",0x8A0B],
- ["D38F",0x8A0C],
- ["D390",0x8A0D],
- ["D391",0x8A0E],
- ["D392",0x8A0F],
- ["D393",0x8A10],
- ["D394",0x8A11],
- ["D395",0x8A12],
- ["D396",0x8A13],
- ["D397",0x8A14],
- ["D398",0x8A15],
- ["D399",0x8A16],
- ["D39A",0x8A17],
- ["D39B",0x8A18],
- ["D39C",0x8A19],
- ["D39D",0x8A1A],
- ["D39E",0x8A1B],
- ["D39F",0x8A1C],
- ["D3A0",0x8A1D],
- ["D440",0x8A1E],
- ["D441",0x8A1F],
- ["D442",0x8A20],
- ["D443",0x8A21],
- ["D444",0x8A22],
- ["D445",0x8A23],
- ["D446",0x8A24],
- ["D447",0x8A25],
- ["D448",0x8A26],
- ["D449",0x8A27],
- ["D44A",0x8A28],
- ["D44B",0x8A29],
- ["D44C",0x8A2A],
- ["D44D",0x8A2B],
- ["D44E",0x8A2C],
- ["D44F",0x8A2D],
- ["D450",0x8A2E],
- ["D451",0x8A2F],
- ["D452",0x8A30],
- ["D453",0x8A31],
- ["D454",0x8A32],
- ["D455",0x8A33],
- ["D456",0x8A34],
- ["D457",0x8A35],
- ["D458",0x8A36],
- ["D459",0x8A37],
- ["D45A",0x8A38],
- ["D45B",0x8A39],
- ["D45C",0x8A3A],
- ["D45D",0x8A3B],
- ["D45E",0x8A3C],
- ["D45F",0x8A3D],
- ["F6A4",0x8A3E],
- ["D460",0x8A3F],
- ["D461",0x8A40],
- ["D462",0x8A41],
- ["D463",0x8A42],
- ["D464",0x8A43],
- ["D465",0x8A44],
- ["D466",0x8A45],
- ["D467",0x8A46],
- ["D468",0x8A47],
- ["EEBA",0x8A48],
- ["D469",0x8A49],
- ["D46A",0x8A4A],
- ["D46B",0x8A4B],
- ["D46C",0x8A4C],
- ["D46D",0x8A4D],
- ["D46E",0x8A4E],
- ["D46F",0x8A4F],
- ["D470",0x8A50],
- ["D471",0x8A51],
- ["D472",0x8A52],
- ["D473",0x8A53],
- ["D474",0x8A54],
- ["D475",0x8A55],
- ["D476",0x8A56],
- ["D477",0x8A57],
- ["D478",0x8A58],
- ["D479",0x8A59],
- ["D47A",0x8A5A],
- ["D47B",0x8A5B],
- ["D47C",0x8A5C],
- ["D47D",0x8A5D],
- ["D47E",0x8A5E],
- ["D480",0x8A5F],
- ["D481",0x8A60],
- ["D482",0x8A61],
- ["D483",0x8A62],
- ["D484",0x8A63],
- ["D485",0x8A64],
- ["D486",0x8A65],
- ["D487",0x8A66],
- ["D488",0x8A67],
- ["D489",0x8A68],
- ["D48A",0x8A69],
- ["D48B",0x8A6A],
- ["D48C",0x8A6B],
- ["D48D",0x8A6C],
- ["D48E",0x8A6D],
- ["D48F",0x8A6E],
- ["D490",0x8A6F],
- ["D491",0x8A70],
- ["D492",0x8A71],
- ["D493",0x8A72],
- ["D494",0x8A73],
- ["D495",0x8A74],
- ["D496",0x8A75],
- ["D497",0x8A76],
- ["D498",0x8A77],
- ["D499",0x8A78],
- ["D5B2",0x8A79],
- ["D49A",0x8A7A],
- ["D49B",0x8A7B],
- ["D49C",0x8A7C],
- ["D49D",0x8A7D],
- ["D49E",0x8A7E],
- ["D49F",0x8A7F],
- ["D4A0",0x8A80],
- ["D540",0x8A81],
- ["D541",0x8A82],
- ["D542",0x8A83],
- ["D543",0x8A84],
- ["D544",0x8A85],
- ["D545",0x8A86],
- ["D546",0x8A87],
- ["D547",0x8A88],
- ["D3FE",0x8A89],
- ["CCDC",0x8A8A],
- ["D548",0x8A8B],
- ["D549",0x8A8C],
- ["D54A",0x8A8D],
- ["D54B",0x8A8E],
- ["D54C",0x8A8F],
- ["D54D",0x8A90],
- ["D54E",0x8A91],
- ["D54F",0x8A92],
- ["CAC4",0x8A93],
- ["D550",0x8A94],
- ["D551",0x8A95],
- ["D552",0x8A96],
- ["D553",0x8A97],
- ["D554",0x8A98],
- ["D555",0x8A99],
- ["D556",0x8A9A],
- ["D557",0x8A9B],
- ["D558",0x8A9C],
- ["D559",0x8A9D],
- ["D55A",0x8A9E],
- ["D55B",0x8A9F],
- ["D55C",0x8AA0],
- ["D55D",0x8AA1],
- ["D55E",0x8AA2],
- ["D55F",0x8AA3],
- ["D560",0x8AA4],
- ["D561",0x8AA5],
- ["D562",0x8AA6],
- ["D563",0x8AA7],
- ["D564",0x8AA8],
- ["D565",0x8AA9],
- ["D566",0x8AAA],
- ["D567",0x8AAB],
- ["D568",0x8AAC],
- ["D569",0x8AAD],
- ["D56A",0x8AAE],
- ["D56B",0x8AAF],
- ["D56C",0x8AB0],
- ["D56D",0x8AB1],
- ["D56E",0x8AB2],
- ["D56F",0x8AB3],
- ["D570",0x8AB4],
- ["D571",0x8AB5],
- ["D572",0x8AB6],
- ["D573",0x8AB7],
- ["D574",0x8AB8],
- ["D575",0x8AB9],
- ["D576",0x8ABA],
- ["D577",0x8ABB],
- ["D578",0x8ABC],
- ["D579",0x8ABD],
- ["D57A",0x8ABE],
- ["D57B",0x8ABF],
- ["D57C",0x8AC0],
- ["D57D",0x8AC1],
- ["D57E",0x8AC2],
- ["D580",0x8AC3],
- ["D581",0x8AC4],
- ["D582",0x8AC5],
- ["D583",0x8AC6],
- ["D584",0x8AC7],
- ["D585",0x8AC8],
- ["D586",0x8AC9],
- ["D587",0x8ACA],
- ["D588",0x8ACB],
- ["D589",0x8ACC],
- ["D58A",0x8ACD],
- ["D58B",0x8ACE],
- ["D58C",0x8ACF],
- ["D58D",0x8AD0],
- ["D58E",0x8AD1],
- ["D58F",0x8AD2],
- ["D590",0x8AD3],
- ["D591",0x8AD4],
- ["D592",0x8AD5],
- ["D593",0x8AD6],
- ["D594",0x8AD7],
- ["D595",0x8AD8],
- ["D596",0x8AD9],
- ["D597",0x8ADA],
- ["D598",0x8ADB],
- ["D599",0x8ADC],
- ["D59A",0x8ADD],
- ["D59B",0x8ADE],
- ["D59C",0x8ADF],
- ["D59D",0x8AE0],
- ["D59E",0x8AE1],
- ["D59F",0x8AE2],
- ["D5A0",0x8AE3],
- ["D640",0x8AE4],
- ["D641",0x8AE5],
- ["D642",0x8AE6],
- ["D643",0x8AE7],
- ["D644",0x8AE8],
- ["D645",0x8AE9],
- ["D646",0x8AEA],
- ["D647",0x8AEB],
- ["D648",0x8AEC],
- ["D649",0x8AED],
- ["D64A",0x8AEE],
- ["D64B",0x8AEF],
- ["D64C",0x8AF0],
- ["D64D",0x8AF1],
- ["D64E",0x8AF2],
- ["D64F",0x8AF3],
- ["D650",0x8AF4],
- ["D651",0x8AF5],
- ["D652",0x8AF6],
- ["D653",0x8AF7],
- ["D654",0x8AF8],
- ["D655",0x8AF9],
- ["D656",0x8AFA],
- ["D657",0x8AFB],
- ["D658",0x8AFC],
- ["D659",0x8AFD],
- ["D65A",0x8AFE],
- ["D65B",0x8AFF],
- ["D65C",0x8B00],
- ["D65D",0x8B01],
- ["D65E",0x8B02],
- ["D65F",0x8B03],
- ["D660",0x8B04],
- ["D661",0x8B05],
- ["D662",0x8B06],
- ["E5C0",0x8B07],
- ["D663",0x8B08],
- ["D664",0x8B09],
- ["D665",0x8B0A],
- ["D666",0x8B0B],
- ["D667",0x8B0C],
- ["D668",0x8B0D],
- ["D669",0x8B0E],
- ["D66A",0x8B0F],
- ["D66B",0x8B10],
- ["D66C",0x8B11],
- ["D66D",0x8B12],
- ["D66E",0x8B13],
- ["D66F",0x8B14],
- ["D670",0x8B15],
- ["D671",0x8B16],
- ["D672",0x8B17],
- ["D673",0x8B18],
- ["D674",0x8B19],
- ["D675",0x8B1A],
- ["D676",0x8B1B],
- ["D677",0x8B1C],
- ["D678",0x8B1D],
- ["D679",0x8B1E],
- ["D67A",0x8B1F],
- ["D67B",0x8B20],
- ["D67C",0x8B21],
- ["D67D",0x8B22],
- ["D67E",0x8B23],
- ["D680",0x8B24],
- ["D681",0x8B25],
- ["F6A5",0x8B26],
- ["D682",0x8B27],
- ["D683",0x8B28],
- ["D684",0x8B29],
- ["D685",0x8B2A],
- ["D686",0x8B2B],
- ["D687",0x8B2C],
- ["D688",0x8B2D],
- ["D689",0x8B2E],
- ["D68A",0x8B2F],
- ["D68B",0x8B30],
- ["D68C",0x8B31],
- ["D68D",0x8B32],
- ["D68E",0x8B33],
- ["D68F",0x8B34],
- ["D690",0x8B35],
- ["D691",0x8B36],
- ["D692",0x8B37],
- ["D693",0x8B38],
- ["D694",0x8B39],
- ["D695",0x8B3A],
- ["D696",0x8B3B],
- ["D697",0x8B3C],
- ["D698",0x8B3D],
- ["D699",0x8B3E],
- ["D69A",0x8B3F],
- ["D69B",0x8B40],
- ["D69C",0x8B41],
- ["D69D",0x8B42],
- ["D69E",0x8B43],
- ["D69F",0x8B44],
- ["D6A0",0x8B45],
- ["D740",0x8B46],
- ["D741",0x8B47],
- ["D742",0x8B48],
- ["D743",0x8B49],
- ["D744",0x8B4A],
- ["D745",0x8B4B],
- ["D746",0x8B4C],
- ["D747",0x8B4D],
- ["D748",0x8B4E],
- ["D749",0x8B4F],
- ["D74A",0x8B50],
- ["D74B",0x8B51],
- ["D74C",0x8B52],
- ["D74D",0x8B53],
- ["D74E",0x8B54],
- ["D74F",0x8B55],
- ["D750",0x8B56],
- ["D751",0x8B57],
- ["D752",0x8B58],
- ["D753",0x8B59],
- ["D754",0x8B5A],
- ["D755",0x8B5B],
- ["D756",0x8B5C],
- ["D757",0x8B5D],
- ["D758",0x8B5E],
- ["D759",0x8B5F],
- ["D75A",0x8B60],
- ["D75B",0x8B61],
- ["D75C",0x8B62],
- ["D75D",0x8B63],
- ["D75E",0x8B64],
- ["D75F",0x8B65],
- ["BEAF",0x8B66],
- ["D760",0x8B67],
- ["D761",0x8B68],
- ["D762",0x8B69],
- ["D763",0x8B6A],
- ["D764",0x8B6B],
- ["C6A9",0x8B6C],
- ["D765",0x8B6D],
- ["D766",0x8B6E],
- ["D767",0x8B6F],
- ["D768",0x8B70],
- ["D769",0x8B71],
- ["D76A",0x8B72],
- ["D76B",0x8B73],
- ["D76C",0x8B74],
- ["D76D",0x8B75],
- ["D76E",0x8B76],
- ["D76F",0x8B77],
- ["D770",0x8B78],
- ["D771",0x8B79],
- ["D772",0x8B7A],
- ["D773",0x8B7B],
- ["D774",0x8B7C],
- ["D775",0x8B7D],
- ["D776",0x8B7E],
- ["D777",0x8B7F],
- ["D778",0x8B80],
- ["D779",0x8B81],
- ["D77A",0x8B82],
- ["D77B",0x8B83],
- ["D77C",0x8B84],
- ["D77D",0x8B85],
- ["D77E",0x8B86],
- ["D780",0x8B87],
- ["D781",0x8B88],
- ["D782",0x8B89],
- ["D783",0x8B8A],
- ["D784",0x8B8B],
- ["D785",0x8B8C],
- ["D786",0x8B8D],
- ["D787",0x8B8E],
- ["D788",0x8B8F],
- ["D789",0x8B90],
- ["D78A",0x8B91],
- ["D78B",0x8B92],
- ["D78C",0x8B93],
- ["D78D",0x8B94],
- ["D78E",0x8B95],
- ["D78F",0x8B96],
- ["D790",0x8B97],
- ["D791",0x8B98],
- ["D792",0x8B99],
- ["D793",0x8B9A],
- ["D794",0x8B9B],
- ["D795",0x8B9C],
- ["D796",0x8B9D],
- ["D797",0x8B9E],
- ["D798",0x8B9F],
- ["DAA5",0x8BA0],
- ["BCC6",0x8BA1],
- ["B6A9",0x8BA2],
- ["B8BC",0x8BA3],
- ["C8CF",0x8BA4],
- ["BCA5",0x8BA5],
- ["DAA6",0x8BA6],
- ["DAA7",0x8BA7],
- ["CCD6",0x8BA8],
- ["C8C3",0x8BA9],
- ["DAA8",0x8BAA],
- ["C6FD",0x8BAB],
- ["D799",0x8BAC],
- ["D1B5",0x8BAD],
- ["D2E9",0x8BAE],
- ["D1B6",0x8BAF],
- ["BCC7",0x8BB0],
- ["D79A",0x8BB1],
- ["BDB2",0x8BB2],
- ["BBE4",0x8BB3],
- ["DAA9",0x8BB4],
- ["DAAA",0x8BB5],
- ["D1C8",0x8BB6],
- ["DAAB",0x8BB7],
- ["D0ED",0x8BB8],
- ["B6EF",0x8BB9],
- ["C2DB",0x8BBA],
- ["D79B",0x8BBB],
- ["CBCF",0x8BBC],
- ["B7ED",0x8BBD],
- ["C9E8",0x8BBE],
- ["B7C3",0x8BBF],
- ["BEF7",0x8BC0],
- ["D6A4",0x8BC1],
- ["DAAC",0x8BC2],
- ["DAAD",0x8BC3],
- ["C6C0",0x8BC4],
- ["D7E7",0x8BC5],
- ["CAB6",0x8BC6],
- ["D79C",0x8BC7],
- ["D5A9",0x8BC8],
- ["CBDF",0x8BC9],
- ["D5EF",0x8BCA],
- ["DAAE",0x8BCB],
- ["D6DF",0x8BCC],
- ["B4CA",0x8BCD],
- ["DAB0",0x8BCE],
- ["DAAF",0x8BCF],
- ["D79D",0x8BD0],
- ["D2EB",0x8BD1],
- ["DAB1",0x8BD2],
- ["DAB2",0x8BD3],
- ["DAB3",0x8BD4],
- ["CAD4",0x8BD5],
- ["DAB4",0x8BD6],
- ["CAAB",0x8BD7],
- ["DAB5",0x8BD8],
- ["DAB6",0x8BD9],
- ["B3CF",0x8BDA],
- ["D6EF",0x8BDB],
- ["DAB7",0x8BDC],
- ["BBB0",0x8BDD],
- ["B5AE",0x8BDE],
- ["DAB8",0x8BDF],
- ["DAB9",0x8BE0],
- ["B9EE",0x8BE1],
- ["D1AF",0x8BE2],
- ["D2E8",0x8BE3],
- ["DABA",0x8BE4],
- ["B8C3",0x8BE5],
- ["CFEA",0x8BE6],
- ["B2EF",0x8BE7],
- ["DABB",0x8BE8],
- ["DABC",0x8BE9],
- ["D79E",0x8BEA],
- ["BDEB",0x8BEB],
- ["CEDC",0x8BEC],
- ["D3EF",0x8BED],
- ["DABD",0x8BEE],
- ["CEF3",0x8BEF],
- ["DABE",0x8BF0],
- ["D3D5",0x8BF1],
- ["BBE5",0x8BF2],
- ["DABF",0x8BF3],
- ["CBB5",0x8BF4],
- ["CBD0",0x8BF5],
- ["DAC0",0x8BF6],
- ["C7EB",0x8BF7],
- ["D6EE",0x8BF8],
- ["DAC1",0x8BF9],
- ["C5B5",0x8BFA],
- ["B6C1",0x8BFB],
- ["DAC2",0x8BFC],
- ["B7CC",0x8BFD],
- ["BFCE",0x8BFE],
- ["DAC3",0x8BFF],
- ["DAC4",0x8C00],
- ["CBAD",0x8C01],
- ["DAC5",0x8C02],
- ["B5F7",0x8C03],
- ["DAC6",0x8C04],
- ["C1C2",0x8C05],
- ["D7BB",0x8C06],
- ["DAC7",0x8C07],
- ["CCB8",0x8C08],
- ["D79F",0x8C09],
- ["D2EA",0x8C0A],
- ["C4B1",0x8C0B],
- ["DAC8",0x8C0C],
- ["B5FD",0x8C0D],
- ["BBD1",0x8C0E],
- ["DAC9",0x8C0F],
- ["D0B3",0x8C10],
- ["DACA",0x8C11],
- ["DACB",0x8C12],
- ["CEBD",0x8C13],
- ["DACC",0x8C14],
- ["DACD",0x8C15],
- ["DACE",0x8C16],
- ["B2F7",0x8C17],
- ["DAD1",0x8C18],
- ["DACF",0x8C19],
- ["D1E8",0x8C1A],
- ["DAD0",0x8C1B],
- ["C3D5",0x8C1C],
- ["DAD2",0x8C1D],
- ["D7A0",0x8C1E],
- ["DAD3",0x8C1F],
- ["DAD4",0x8C20],
- ["DAD5",0x8C21],
- ["D0BB",0x8C22],
- ["D2A5",0x8C23],
- ["B0F9",0x8C24],
- ["DAD6",0x8C25],
- ["C7AB",0x8C26],
- ["DAD7",0x8C27],
- ["BDF7",0x8C28],
- ["C3A1",0x8C29],
- ["DAD8",0x8C2A],
- ["DAD9",0x8C2B],
- ["C3FD",0x8C2C],
- ["CCB7",0x8C2D],
- ["DADA",0x8C2E],
- ["DADB",0x8C2F],
- ["C0BE",0x8C30],
- ["C6D7",0x8C31],
- ["DADC",0x8C32],
- ["DADD",0x8C33],
- ["C7B4",0x8C34],
- ["DADE",0x8C35],
- ["DADF",0x8C36],
- ["B9C8",0x8C37],
- ["D840",0x8C38],
- ["D841",0x8C39],
- ["D842",0x8C3A],
- ["D843",0x8C3B],
- ["D844",0x8C3C],
- ["D845",0x8C3D],
- ["D846",0x8C3E],
- ["D847",0x8C3F],
- ["D848",0x8C40],
- ["BBED",0x8C41],
- ["D849",0x8C42],
- ["D84A",0x8C43],
- ["D84B",0x8C44],
- ["D84C",0x8C45],
- ["B6B9",0x8C46],
- ["F4F8",0x8C47],
- ["D84D",0x8C48],
- ["F4F9",0x8C49],
- ["D84E",0x8C4A],
- ["D84F",0x8C4B],
- ["CDE3",0x8C4C],
- ["D850",0x8C4D],
- ["D851",0x8C4E],
- ["D852",0x8C4F],
- ["D853",0x8C50],
- ["D854",0x8C51],
- ["D855",0x8C52],
- ["D856",0x8C53],
- ["D857",0x8C54],
- ["F5B9",0x8C55],
- ["D858",0x8C56],
- ["D859",0x8C57],
- ["D85A",0x8C58],
- ["D85B",0x8C59],
- ["EBE0",0x8C5A],
- ["D85C",0x8C5B],
- ["D85D",0x8C5C],
- ["D85E",0x8C5D],
- ["D85F",0x8C5E],
- ["D860",0x8C5F],
- ["D861",0x8C60],
- ["CFF3",0x8C61],
- ["BBBF",0x8C62],
- ["D862",0x8C63],
- ["D863",0x8C64],
- ["D864",0x8C65],
- ["D865",0x8C66],
- ["D866",0x8C67],
- ["D867",0x8C68],
- ["D868",0x8C69],
- ["BAC0",0x8C6A],
- ["D4A5",0x8C6B],
- ["D869",0x8C6C],
- ["D86A",0x8C6D],
- ["D86B",0x8C6E],
- ["D86C",0x8C6F],
- ["D86D",0x8C70],
- ["D86E",0x8C71],
- ["D86F",0x8C72],
- ["E1D9",0x8C73],
- ["D870",0x8C74],
- ["D871",0x8C75],
- ["D872",0x8C76],
- ["D873",0x8C77],
- ["F5F4",0x8C78],
- ["B1AA",0x8C79],
- ["B2F2",0x8C7A],
- ["D874",0x8C7B],
- ["D875",0x8C7C],
- ["D876",0x8C7D],
- ["D877",0x8C7E],
- ["D878",0x8C7F],
- ["D879",0x8C80],
- ["D87A",0x8C81],
- ["F5F5",0x8C82],
- ["D87B",0x8C83],
- ["D87C",0x8C84],
- ["F5F7",0x8C85],
- ["D87D",0x8C86],
- ["D87E",0x8C87],
- ["D880",0x8C88],
- ["BAD1",0x8C89],
- ["F5F6",0x8C8A],
- ["D881",0x8C8B],
- ["C3B2",0x8C8C],
- ["D882",0x8C8D],
- ["D883",0x8C8E],
- ["D884",0x8C8F],
- ["D885",0x8C90],
- ["D886",0x8C91],
- ["D887",0x8C92],
- ["D888",0x8C93],
- ["F5F9",0x8C94],
- ["D889",0x8C95],
- ["D88A",0x8C96],
- ["D88B",0x8C97],
- ["F5F8",0x8C98],
- ["D88C",0x8C99],
- ["D88D",0x8C9A],
- ["D88E",0x8C9B],
- ["D88F",0x8C9C],
- ["D890",0x8C9D],
- ["D891",0x8C9E],
- ["D892",0x8C9F],
- ["D893",0x8CA0],
- ["D894",0x8CA1],
- ["D895",0x8CA2],
- ["D896",0x8CA3],
- ["D897",0x8CA4],
- ["D898",0x8CA5],
- ["D899",0x8CA6],
- ["D89A",0x8CA7],
- ["D89B",0x8CA8],
- ["D89C",0x8CA9],
- ["D89D",0x8CAA],
- ["D89E",0x8CAB],
- ["D89F",0x8CAC],
- ["D8A0",0x8CAD],
- ["D940",0x8CAE],
- ["D941",0x8CAF],
- ["D942",0x8CB0],
- ["D943",0x8CB1],
- ["D944",0x8CB2],
- ["D945",0x8CB3],
- ["D946",0x8CB4],
- ["D947",0x8CB5],
- ["D948",0x8CB6],
- ["D949",0x8CB7],
- ["D94A",0x8CB8],
- ["D94B",0x8CB9],
- ["D94C",0x8CBA],
- ["D94D",0x8CBB],
- ["D94E",0x8CBC],
- ["D94F",0x8CBD],
- ["D950",0x8CBE],
- ["D951",0x8CBF],
- ["D952",0x8CC0],
- ["D953",0x8CC1],
- ["D954",0x8CC2],
- ["D955",0x8CC3],
- ["D956",0x8CC4],
- ["D957",0x8CC5],
- ["D958",0x8CC6],
- ["D959",0x8CC7],
- ["D95A",0x8CC8],
- ["D95B",0x8CC9],
- ["D95C",0x8CCA],
- ["D95D",0x8CCB],
- ["D95E",0x8CCC],
- ["D95F",0x8CCD],
- ["D960",0x8CCE],
- ["D961",0x8CCF],
- ["D962",0x8CD0],
- ["D963",0x8CD1],
- ["D964",0x8CD2],
- ["D965",0x8CD3],
- ["D966",0x8CD4],
- ["D967",0x8CD5],
- ["D968",0x8CD6],
- ["D969",0x8CD7],
- ["D96A",0x8CD8],
- ["D96B",0x8CD9],
- ["D96C",0x8CDA],
- ["D96D",0x8CDB],
- ["D96E",0x8CDC],
- ["D96F",0x8CDD],
- ["D970",0x8CDE],
- ["D971",0x8CDF],
- ["D972",0x8CE0],
- ["D973",0x8CE1],
- ["D974",0x8CE2],
- ["D975",0x8CE3],
- ["D976",0x8CE4],
- ["D977",0x8CE5],
- ["D978",0x8CE6],
- ["D979",0x8CE7],
- ["D97A",0x8CE8],
- ["D97B",0x8CE9],
- ["D97C",0x8CEA],
- ["D97D",0x8CEB],
- ["D97E",0x8CEC],
- ["D980",0x8CED],
- ["D981",0x8CEE],
- ["D982",0x8CEF],
- ["D983",0x8CF0],
- ["D984",0x8CF1],
- ["D985",0x8CF2],
- ["D986",0x8CF3],
- ["D987",0x8CF4],
- ["D988",0x8CF5],
- ["D989",0x8CF6],
- ["D98A",0x8CF7],
- ["D98B",0x8CF8],
- ["D98C",0x8CF9],
- ["D98D",0x8CFA],
- ["D98E",0x8CFB],
- ["D98F",0x8CFC],
- ["D990",0x8CFD],
- ["D991",0x8CFE],
- ["D992",0x8CFF],
- ["D993",0x8D00],
- ["D994",0x8D01],
- ["D995",0x8D02],
- ["D996",0x8D03],
- ["D997",0x8D04],
- ["D998",0x8D05],
- ["D999",0x8D06],
- ["D99A",0x8D07],
- ["D99B",0x8D08],
- ["D99C",0x8D09],
- ["D99D",0x8D0A],
- ["D99E",0x8D0B],
- ["D99F",0x8D0C],
- ["D9A0",0x8D0D],
- ["DA40",0x8D0E],
- ["DA41",0x8D0F],
- ["DA42",0x8D10],
- ["DA43",0x8D11],
- ["DA44",0x8D12],
- ["DA45",0x8D13],
- ["DA46",0x8D14],
- ["DA47",0x8D15],
- ["DA48",0x8D16],
- ["DA49",0x8D17],
- ["DA4A",0x8D18],
- ["DA4B",0x8D19],
- ["DA4C",0x8D1A],
- ["DA4D",0x8D1B],
- ["DA4E",0x8D1C],
- ["B1B4",0x8D1D],
- ["D5EA",0x8D1E],
- ["B8BA",0x8D1F],
- ["DA4F",0x8D20],
- ["B9B1",0x8D21],
- ["B2C6",0x8D22],
- ["D4F0",0x8D23],
- ["CFCD",0x8D24],
- ["B0DC",0x8D25],
- ["D5CB",0x8D26],
- ["BBF5",0x8D27],
- ["D6CA",0x8D28],
- ["B7B7",0x8D29],
- ["CCB0",0x8D2A],
- ["C6B6",0x8D2B],
- ["B1E1",0x8D2C],
- ["B9BA",0x8D2D],
- ["D6FC",0x8D2E],
- ["B9E1",0x8D2F],
- ["B7A1",0x8D30],
- ["BCFA",0x8D31],
- ["EADA",0x8D32],
- ["EADB",0x8D33],
- ["CCF9",0x8D34],
- ["B9F3",0x8D35],
- ["EADC",0x8D36],
- ["B4FB",0x8D37],
- ["C3B3",0x8D38],
- ["B7D1",0x8D39],
- ["BAD8",0x8D3A],
- ["EADD",0x8D3B],
- ["D4F4",0x8D3C],
- ["EADE",0x8D3D],
- ["BCD6",0x8D3E],
- ["BBDF",0x8D3F],
- ["EADF",0x8D40],
- ["C1DE",0x8D41],
- ["C2B8",0x8D42],
- ["D4DF",0x8D43],
- ["D7CA",0x8D44],
- ["EAE0",0x8D45],
- ["EAE1",0x8D46],
- ["EAE4",0x8D47],
- ["EAE2",0x8D48],
- ["EAE3",0x8D49],
- ["C9DE",0x8D4A],
- ["B8B3",0x8D4B],
- ["B6C4",0x8D4C],
- ["EAE5",0x8D4D],
- ["CAEA",0x8D4E],
- ["C9CD",0x8D4F],
- ["B4CD",0x8D50],
- ["DA50",0x8D51],
- ["DA51",0x8D52],
- ["E2D9",0x8D53],
- ["C5E2",0x8D54],
- ["EAE6",0x8D55],
- ["C0B5",0x8D56],
- ["DA52",0x8D57],
- ["D7B8",0x8D58],
- ["EAE7",0x8D59],
- ["D7AC",0x8D5A],
- ["C8FC",0x8D5B],
- ["D8D3",0x8D5C],
- ["D8CD",0x8D5D],
- ["D4DE",0x8D5E],
- ["DA53",0x8D5F],
- ["D4F9",0x8D60],
- ["C9C4",0x8D61],
- ["D3AE",0x8D62],
- ["B8D3",0x8D63],
- ["B3E0",0x8D64],
- ["DA54",0x8D65],
- ["C9E2",0x8D66],
- ["F4F6",0x8D67],
- ["DA55",0x8D68],
- ["DA56",0x8D69],
- ["DA57",0x8D6A],
- ["BAD5",0x8D6B],
- ["DA58",0x8D6C],
- ["F4F7",0x8D6D],
- ["DA59",0x8D6E],
- ["DA5A",0x8D6F],
- ["D7DF",0x8D70],
- ["DA5B",0x8D71],
- ["DA5C",0x8D72],
- ["F4F1",0x8D73],
- ["B8B0",0x8D74],
- ["D5D4",0x8D75],
- ["B8CF",0x8D76],
- ["C6F0",0x8D77],
- ["DA5D",0x8D78],
- ["DA5E",0x8D79],
- ["DA5F",0x8D7A],
- ["DA60",0x8D7B],
- ["DA61",0x8D7C],
- ["DA62",0x8D7D],
- ["DA63",0x8D7E],
- ["DA64",0x8D7F],
- ["DA65",0x8D80],
- ["B3C3",0x8D81],
- ["DA66",0x8D82],
- ["DA67",0x8D83],
- ["F4F2",0x8D84],
- ["B3AC",0x8D85],
- ["DA68",0x8D86],
- ["DA69",0x8D87],
- ["DA6A",0x8D88],
- ["DA6B",0x8D89],
- ["D4BD",0x8D8A],
- ["C7F7",0x8D8B],
- ["DA6C",0x8D8C],
- ["DA6D",0x8D8D],
- ["DA6E",0x8D8E],
- ["DA6F",0x8D8F],
- ["DA70",0x8D90],
- ["F4F4",0x8D91],
- ["DA71",0x8D92],
- ["DA72",0x8D93],
- ["F4F3",0x8D94],
- ["DA73",0x8D95],
- ["DA74",0x8D96],
- ["DA75",0x8D97],
- ["DA76",0x8D98],
- ["DA77",0x8D99],
- ["DA78",0x8D9A],
- ["DA79",0x8D9B],
- ["DA7A",0x8D9C],
- ["DA7B",0x8D9D],
- ["DA7C",0x8D9E],
- ["CCCB",0x8D9F],
- ["DA7D",0x8DA0],
- ["DA7E",0x8DA1],
- ["DA80",0x8DA2],
- ["C8A4",0x8DA3],
- ["DA81",0x8DA4],
- ["DA82",0x8DA5],
- ["DA83",0x8DA6],
- ["DA84",0x8DA7],
- ["DA85",0x8DA8],
- ["DA86",0x8DA9],
- ["DA87",0x8DAA],
- ["DA88",0x8DAB],
- ["DA89",0x8DAC],
- ["DA8A",0x8DAD],
- ["DA8B",0x8DAE],
- ["DA8C",0x8DAF],
- ["DA8D",0x8DB0],
- ["F4F5",0x8DB1],
- ["DA8E",0x8DB2],
- ["D7E3",0x8DB3],
- ["C5BF",0x8DB4],
- ["F5C0",0x8DB5],
- ["DA8F",0x8DB6],
- ["DA90",0x8DB7],
- ["F5BB",0x8DB8],
- ["DA91",0x8DB9],
- ["F5C3",0x8DBA],
- ["DA92",0x8DBB],
- ["F5C2",0x8DBC],
- ["DA93",0x8DBD],
- ["D6BA",0x8DBE],
- ["F5C1",0x8DBF],
- ["DA94",0x8DC0],
- ["DA95",0x8DC1],
- ["DA96",0x8DC2],
- ["D4BE",0x8DC3],
- ["F5C4",0x8DC4],
- ["DA97",0x8DC5],
- ["F5CC",0x8DC6],
- ["DA98",0x8DC7],
- ["DA99",0x8DC8],
- ["DA9A",0x8DC9],
- ["DA9B",0x8DCA],
- ["B0CF",0x8DCB],
- ["B5F8",0x8DCC],
- ["DA9C",0x8DCD],
- ["F5C9",0x8DCE],
- ["F5CA",0x8DCF],
- ["DA9D",0x8DD0],
- ["C5DC",0x8DD1],
- ["DA9E",0x8DD2],
- ["DA9F",0x8DD3],
- ["DAA0",0x8DD4],
- ["DB40",0x8DD5],
- ["F5C5",0x8DD6],
- ["F5C6",0x8DD7],
- ["DB41",0x8DD8],
- ["DB42",0x8DD9],
- ["F5C7",0x8DDA],
- ["F5CB",0x8DDB],
- ["DB43",0x8DDC],
- ["BEE0",0x8DDD],
- ["F5C8",0x8DDE],
- ["B8FA",0x8DDF],
- ["DB44",0x8DE0],
- ["DB45",0x8DE1],
- ["DB46",0x8DE2],
- ["F5D0",0x8DE3],
- ["F5D3",0x8DE4],
- ["DB47",0x8DE5],
- ["DB48",0x8DE6],
- ["DB49",0x8DE7],
- ["BFE7",0x8DE8],
- ["DB4A",0x8DE9],
- ["B9F2",0x8DEA],
- ["F5BC",0x8DEB],
- ["F5CD",0x8DEC],
- ["DB4B",0x8DED],
- ["DB4C",0x8DEE],
- ["C2B7",0x8DEF],
- ["DB4D",0x8DF0],
- ["DB4E",0x8DF1],
- ["DB4F",0x8DF2],
- ["CCF8",0x8DF3],
- ["DB50",0x8DF4],
- ["BCF9",0x8DF5],
- ["DB51",0x8DF6],
- ["F5CE",0x8DF7],
- ["F5CF",0x8DF8],
- ["F5D1",0x8DF9],
- ["B6E5",0x8DFA],
- ["F5D2",0x8DFB],
- ["DB52",0x8DFC],
- ["F5D5",0x8DFD],
- ["DB53",0x8DFE],
- ["DB54",0x8DFF],
- ["DB55",0x8E00],
- ["DB56",0x8E01],
- ["DB57",0x8E02],
- ["DB58",0x8E03],
- ["DB59",0x8E04],
- ["F5BD",0x8E05],
- ["DB5A",0x8E06],
- ["DB5B",0x8E07],
- ["DB5C",0x8E08],
- ["F5D4",0x8E09],
- ["D3BB",0x8E0A],
- ["DB5D",0x8E0B],
- ["B3EC",0x8E0C],
- ["DB5E",0x8E0D],
- ["DB5F",0x8E0E],
- ["CCA4",0x8E0F],
- ["DB60",0x8E10],
- ["DB61",0x8E11],
- ["DB62",0x8E12],
- ["DB63",0x8E13],
- ["F5D6",0x8E14],
- ["DB64",0x8E15],
- ["DB65",0x8E16],
- ["DB66",0x8E17],
- ["DB67",0x8E18],
- ["DB68",0x8E19],
- ["DB69",0x8E1A],
- ["DB6A",0x8E1B],
- ["DB6B",0x8E1C],
- ["F5D7",0x8E1D],
- ["BEE1",0x8E1E],
- ["F5D8",0x8E1F],
- ["DB6C",0x8E20],
- ["DB6D",0x8E21],
- ["CCDF",0x8E22],
- ["F5DB",0x8E23],
- ["DB6E",0x8E24],
- ["DB6F",0x8E25],
- ["DB70",0x8E26],
- ["DB71",0x8E27],
- ["DB72",0x8E28],
- ["B2C8",0x8E29],
- ["D7D9",0x8E2A],
- ["DB73",0x8E2B],
- ["F5D9",0x8E2C],
- ["DB74",0x8E2D],
- ["F5DA",0x8E2E],
- ["F5DC",0x8E2F],
- ["DB75",0x8E30],
- ["F5E2",0x8E31],
- ["DB76",0x8E32],
- ["DB77",0x8E33],
- ["DB78",0x8E34],
- ["F5E0",0x8E35],
- ["DB79",0x8E36],
- ["DB7A",0x8E37],
- ["DB7B",0x8E38],
- ["F5DF",0x8E39],
- ["F5DD",0x8E3A],
- ["DB7C",0x8E3B],
- ["DB7D",0x8E3C],
- ["F5E1",0x8E3D],
- ["DB7E",0x8E3E],
- ["DB80",0x8E3F],
- ["F5DE",0x8E40],
- ["F5E4",0x8E41],
- ["F5E5",0x8E42],
- ["DB81",0x8E43],
- ["CCE3",0x8E44],
- ["DB82",0x8E45],
- ["DB83",0x8E46],
- ["E5BF",0x8E47],
- ["B5B8",0x8E48],
- ["F5E3",0x8E49],
- ["F5E8",0x8E4A],
- ["CCA3",0x8E4B],
- ["DB84",0x8E4C],
- ["DB85",0x8E4D],
- ["DB86",0x8E4E],
- ["DB87",0x8E4F],
- ["DB88",0x8E50],
- ["F5E6",0x8E51],
- ["F5E7",0x8E52],
- ["DB89",0x8E53],
- ["DB8A",0x8E54],
- ["DB8B",0x8E55],
- ["DB8C",0x8E56],
- ["DB8D",0x8E57],
- ["DB8E",0x8E58],
- ["F5BE",0x8E59],
- ["DB8F",0x8E5A],
- ["DB90",0x8E5B],
- ["DB91",0x8E5C],
- ["DB92",0x8E5D],
- ["DB93",0x8E5E],
- ["DB94",0x8E5F],
- ["DB95",0x8E60],
- ["DB96",0x8E61],
- ["DB97",0x8E62],
- ["DB98",0x8E63],
- ["DB99",0x8E64],
- ["DB9A",0x8E65],
- ["B1C4",0x8E66],
- ["DB9B",0x8E67],
- ["DB9C",0x8E68],
- ["F5BF",0x8E69],
- ["DB9D",0x8E6A],
- ["DB9E",0x8E6B],
- ["B5C5",0x8E6C],
- ["B2E4",0x8E6D],
- ["DB9F",0x8E6E],
- ["F5EC",0x8E6F],
- ["F5E9",0x8E70],
- ["DBA0",0x8E71],
- ["B6D7",0x8E72],
- ["DC40",0x8E73],
- ["F5ED",0x8E74],
- ["DC41",0x8E75],
- ["F5EA",0x8E76],
- ["DC42",0x8E77],
- ["DC43",0x8E78],
- ["DC44",0x8E79],
- ["DC45",0x8E7A],
- ["DC46",0x8E7B],
- ["F5EB",0x8E7C],
- ["DC47",0x8E7D],
- ["DC48",0x8E7E],
- ["B4DA",0x8E7F],
- ["DC49",0x8E80],
- ["D4EA",0x8E81],
- ["DC4A",0x8E82],
- ["DC4B",0x8E83],
- ["DC4C",0x8E84],
- ["F5EE",0x8E85],
- ["DC4D",0x8E86],
- ["B3F9",0x8E87],
- ["DC4E",0x8E88],
- ["DC4F",0x8E89],
- ["DC50",0x8E8A],
- ["DC51",0x8E8B],
- ["DC52",0x8E8C],
- ["DC53",0x8E8D],
- ["DC54",0x8E8E],
- ["F5EF",0x8E8F],
- ["F5F1",0x8E90],
- ["DC55",0x8E91],
- ["DC56",0x8E92],
- ["DC57",0x8E93],
- ["F5F0",0x8E94],
- ["DC58",0x8E95],
- ["DC59",0x8E96],
- ["DC5A",0x8E97],
- ["DC5B",0x8E98],
- ["DC5C",0x8E99],
- ["DC5D",0x8E9A],
- ["DC5E",0x8E9B],
- ["F5F2",0x8E9C],
- ["DC5F",0x8E9D],
- ["F5F3",0x8E9E],
- ["DC60",0x8E9F],
- ["DC61",0x8EA0],
- ["DC62",0x8EA1],
- ["DC63",0x8EA2],
- ["DC64",0x8EA3],
- ["DC65",0x8EA4],
- ["DC66",0x8EA5],
- ["DC67",0x8EA6],
- ["DC68",0x8EA7],
- ["DC69",0x8EA8],
- ["DC6A",0x8EA9],
- ["DC6B",0x8EAA],
- ["C9ED",0x8EAB],
- ["B9AA",0x8EAC],
- ["DC6C",0x8EAD],
- ["DC6D",0x8EAE],
- ["C7FB",0x8EAF],
- ["DC6E",0x8EB0],
- ["DC6F",0x8EB1],
- ["B6E3",0x8EB2],
- ["DC70",0x8EB3],
- ["DC71",0x8EB4],
- ["DC72",0x8EB5],
- ["DC73",0x8EB6],
- ["DC74",0x8EB7],
- ["DC75",0x8EB8],
- ["DC76",0x8EB9],
- ["CCC9",0x8EBA],
- ["DC77",0x8EBB],
- ["DC78",0x8EBC],
- ["DC79",0x8EBD],
- ["DC7A",0x8EBE],
- ["DC7B",0x8EBF],
- ["DC7C",0x8EC0],
- ["DC7D",0x8EC1],
- ["DC7E",0x8EC2],
- ["DC80",0x8EC3],
- ["DC81",0x8EC4],
- ["DC82",0x8EC5],
- ["DC83",0x8EC6],
- ["DC84",0x8EC7],
- ["DC85",0x8EC8],
- ["DC86",0x8EC9],
- ["DC87",0x8ECA],
- ["DC88",0x8ECB],
- ["DC89",0x8ECC],
- ["DC8A",0x8ECD],
- ["EAA6",0x8ECE],
- ["DC8B",0x8ECF],
- ["DC8C",0x8ED0],
- ["DC8D",0x8ED1],
- ["DC8E",0x8ED2],
- ["DC8F",0x8ED3],
- ["DC90",0x8ED4],
- ["DC91",0x8ED5],
- ["DC92",0x8ED6],
- ["DC93",0x8ED7],
- ["DC94",0x8ED8],
- ["DC95",0x8ED9],
- ["DC96",0x8EDA],
- ["DC97",0x8EDB],
- ["DC98",0x8EDC],
- ["DC99",0x8EDD],
- ["DC9A",0x8EDE],
- ["DC9B",0x8EDF],
- ["DC9C",0x8EE0],
- ["DC9D",0x8EE1],
- ["DC9E",0x8EE2],
- ["DC9F",0x8EE3],
- ["DCA0",0x8EE4],
- ["DD40",0x8EE5],
- ["DD41",0x8EE6],
- ["DD42",0x8EE7],
- ["DD43",0x8EE8],
- ["DD44",0x8EE9],
- ["DD45",0x8EEA],
- ["DD46",0x8EEB],
- ["DD47",0x8EEC],
- ["DD48",0x8EED],
- ["DD49",0x8EEE],
- ["DD4A",0x8EEF],
- ["DD4B",0x8EF0],
- ["DD4C",0x8EF1],
- ["DD4D",0x8EF2],
- ["DD4E",0x8EF3],
- ["DD4F",0x8EF4],
- ["DD50",0x8EF5],
- ["DD51",0x8EF6],
- ["DD52",0x8EF7],
- ["DD53",0x8EF8],
- ["DD54",0x8EF9],
- ["DD55",0x8EFA],
- ["DD56",0x8EFB],
- ["DD57",0x8EFC],
- ["DD58",0x8EFD],
- ["DD59",0x8EFE],
- ["DD5A",0x8EFF],
- ["DD5B",0x8F00],
- ["DD5C",0x8F01],
- ["DD5D",0x8F02],
- ["DD5E",0x8F03],
- ["DD5F",0x8F04],
- ["DD60",0x8F05],
- ["DD61",0x8F06],
- ["DD62",0x8F07],
- ["DD63",0x8F08],
- ["DD64",0x8F09],
- ["DD65",0x8F0A],
- ["DD66",0x8F0B],
- ["DD67",0x8F0C],
- ["DD68",0x8F0D],
- ["DD69",0x8F0E],
- ["DD6A",0x8F0F],
- ["DD6B",0x8F10],
- ["DD6C",0x8F11],
- ["DD6D",0x8F12],
- ["DD6E",0x8F13],
- ["DD6F",0x8F14],
- ["DD70",0x8F15],
- ["DD71",0x8F16],
- ["DD72",0x8F17],
- ["DD73",0x8F18],
- ["DD74",0x8F19],
- ["DD75",0x8F1A],
- ["DD76",0x8F1B],
- ["DD77",0x8F1C],
- ["DD78",0x8F1D],
- ["DD79",0x8F1E],
- ["DD7A",0x8F1F],
- ["DD7B",0x8F20],
- ["DD7C",0x8F21],
- ["DD7D",0x8F22],
- ["DD7E",0x8F23],
- ["DD80",0x8F24],
- ["DD81",0x8F25],
- ["DD82",0x8F26],
- ["DD83",0x8F27],
- ["DD84",0x8F28],
- ["DD85",0x8F29],
- ["DD86",0x8F2A],
- ["DD87",0x8F2B],
- ["DD88",0x8F2C],
- ["DD89",0x8F2D],
- ["DD8A",0x8F2E],
- ["DD8B",0x8F2F],
- ["DD8C",0x8F30],
- ["DD8D",0x8F31],
- ["DD8E",0x8F32],
- ["DD8F",0x8F33],
- ["DD90",0x8F34],
- ["DD91",0x8F35],
- ["DD92",0x8F36],
- ["DD93",0x8F37],
- ["DD94",0x8F38],
- ["DD95",0x8F39],
- ["DD96",0x8F3A],
- ["DD97",0x8F3B],
- ["DD98",0x8F3C],
- ["DD99",0x8F3D],
- ["DD9A",0x8F3E],
- ["DD9B",0x8F3F],
- ["DD9C",0x8F40],
- ["DD9D",0x8F41],
- ["DD9E",0x8F42],
- ["DD9F",0x8F43],
- ["DDA0",0x8F44],
- ["DE40",0x8F45],
- ["DE41",0x8F46],
- ["DE42",0x8F47],
- ["DE43",0x8F48],
- ["DE44",0x8F49],
- ["DE45",0x8F4A],
- ["DE46",0x8F4B],
- ["DE47",0x8F4C],
- ["DE48",0x8F4D],
- ["DE49",0x8F4E],
- ["DE4A",0x8F4F],
- ["DE4B",0x8F50],
- ["DE4C",0x8F51],
- ["DE4D",0x8F52],
- ["DE4E",0x8F53],
- ["DE4F",0x8F54],
- ["DE50",0x8F55],
- ["DE51",0x8F56],
- ["DE52",0x8F57],
- ["DE53",0x8F58],
- ["DE54",0x8F59],
- ["DE55",0x8F5A],
- ["DE56",0x8F5B],
- ["DE57",0x8F5C],
- ["DE58",0x8F5D],
- ["DE59",0x8F5E],
- ["DE5A",0x8F5F],
- ["DE5B",0x8F60],
- ["DE5C",0x8F61],
- ["DE5D",0x8F62],
- ["DE5E",0x8F63],
- ["DE5F",0x8F64],
- ["DE60",0x8F65],
- ["B3B5",0x8F66],
- ["D4FE",0x8F67],
- ["B9EC",0x8F68],
- ["D0F9",0x8F69],
- ["DE61",0x8F6A],
- ["E9ED",0x8F6B],
- ["D7AA",0x8F6C],
- ["E9EE",0x8F6D],
- ["C2D6",0x8F6E],
- ["C8ED",0x8F6F],
- ["BAE4",0x8F70],
- ["E9EF",0x8F71],
- ["E9F0",0x8F72],
- ["E9F1",0x8F73],
- ["D6E1",0x8F74],
- ["E9F2",0x8F75],
- ["E9F3",0x8F76],
- ["E9F5",0x8F77],
- ["E9F4",0x8F78],
- ["E9F6",0x8F79],
- ["E9F7",0x8F7A],
- ["C7E1",0x8F7B],
- ["E9F8",0x8F7C],
- ["D4D8",0x8F7D],
- ["E9F9",0x8F7E],
- ["BDCE",0x8F7F],
- ["DE62",0x8F80],
- ["E9FA",0x8F81],
- ["E9FB",0x8F82],
- ["BDCF",0x8F83],
- ["E9FC",0x8F84],
- ["B8A8",0x8F85],
- ["C1BE",0x8F86],
- ["E9FD",0x8F87],
- ["B1B2",0x8F88],
- ["BBD4",0x8F89],
- ["B9F5",0x8F8A],
- ["E9FE",0x8F8B],
- ["DE63",0x8F8C],
- ["EAA1",0x8F8D],
- ["EAA2",0x8F8E],
- ["EAA3",0x8F8F],
- ["B7F8",0x8F90],
- ["BCAD",0x8F91],
- ["DE64",0x8F92],
- ["CAE4",0x8F93],
- ["E0CE",0x8F94],
- ["D4AF",0x8F95],
- ["CFBD",0x8F96],
- ["D5B7",0x8F97],
- ["EAA4",0x8F98],
- ["D5DE",0x8F99],
- ["EAA5",0x8F9A],
- ["D0C1",0x8F9B],
- ["B9BC",0x8F9C],
- ["DE65",0x8F9D],
- ["B4C7",0x8F9E],
- ["B1D9",0x8F9F],
- ["DE66",0x8FA0],
- ["DE67",0x8FA1],
- ["DE68",0x8FA2],
- ["C0B1",0x8FA3],
- ["DE69",0x8FA4],
- ["DE6A",0x8FA5],
- ["DE6B",0x8FA6],
- ["DE6C",0x8FA7],
- ["B1E6",0x8FA8],
- ["B1E7",0x8FA9],
- ["DE6D",0x8FAA],
- ["B1E8",0x8FAB],
- ["DE6E",0x8FAC],
- ["DE6F",0x8FAD],
- ["DE70",0x8FAE],
- ["DE71",0x8FAF],
- ["B3BD",0x8FB0],
- ["C8E8",0x8FB1],
- ["DE72",0x8FB2],
- ["DE73",0x8FB3],
- ["DE74",0x8FB4],
- ["DE75",0x8FB5],
- ["E5C1",0x8FB6],
- ["DE76",0x8FB7],
- ["DE77",0x8FB8],
- ["B1DF",0x8FB9],
- ["DE78",0x8FBA],
- ["DE79",0x8FBB],
- ["DE7A",0x8FBC],
- ["C1C9",0x8FBD],
- ["B4EF",0x8FBE],
- ["DE7B",0x8FBF],
- ["DE7C",0x8FC0],
- ["C7A8",0x8FC1],
- ["D3D8",0x8FC2],
- ["DE7D",0x8FC3],
- ["C6F9",0x8FC4],
- ["D1B8",0x8FC5],
- ["DE7E",0x8FC6],
- ["B9FD",0x8FC7],
- ["C2F5",0x8FC8],
- ["DE80",0x8FC9],
- ["DE81",0x8FCA],
- ["DE82",0x8FCB],
- ["DE83",0x8FCC],
- ["DE84",0x8FCD],
- ["D3AD",0x8FCE],
- ["DE85",0x8FCF],
- ["D4CB",0x8FD0],
- ["BDFC",0x8FD1],
- ["DE86",0x8FD2],
- ["E5C2",0x8FD3],
- ["B7B5",0x8FD4],
- ["E5C3",0x8FD5],
- ["DE87",0x8FD6],
- ["DE88",0x8FD7],
- ["BBB9",0x8FD8],
- ["D5E2",0x8FD9],
- ["DE89",0x8FDA],
- ["BDF8",0x8FDB],
- ["D4B6",0x8FDC],
- ["CEA5",0x8FDD],
- ["C1AC",0x8FDE],
- ["B3D9",0x8FDF],
- ["DE8A",0x8FE0],
- ["DE8B",0x8FE1],
- ["CCF6",0x8FE2],
- ["DE8C",0x8FE3],
- ["E5C6",0x8FE4],
- ["E5C4",0x8FE5],
- ["E5C8",0x8FE6],
- ["DE8D",0x8FE7],
- ["E5CA",0x8FE8],
- ["E5C7",0x8FE9],
- ["B5CF",0x8FEA],
- ["C6C8",0x8FEB],
- ["DE8E",0x8FEC],
- ["B5FC",0x8FED],
- ["E5C5",0x8FEE],
- ["DE8F",0x8FEF],
- ["CAF6",0x8FF0],
- ["DE90",0x8FF1],
- ["DE91",0x8FF2],
- ["E5C9",0x8FF3],
- ["DE92",0x8FF4],
- ["DE93",0x8FF5],
- ["DE94",0x8FF6],
- ["C3D4",0x8FF7],
- ["B1C5",0x8FF8],
- ["BCA3",0x8FF9],
- ["DE95",0x8FFA],
- ["DE96",0x8FFB],
- ["DE97",0x8FFC],
- ["D7B7",0x8FFD],
- ["DE98",0x8FFE],
- ["DE99",0x8FFF],
- ["CDCB",0x9000],
- ["CBCD",0x9001],
- ["CACA",0x9002],
- ["CCD3",0x9003],
- ["E5CC",0x9004],
- ["E5CB",0x9005],
- ["C4E6",0x9006],
- ["DE9A",0x9007],
- ["DE9B",0x9008],
- ["D1A1",0x9009],
- ["D1B7",0x900A],
- ["E5CD",0x900B],
- ["DE9C",0x900C],
- ["E5D0",0x900D],
- ["DE9D",0x900E],
- ["CDB8",0x900F],
- ["D6F0",0x9010],
- ["E5CF",0x9011],
- ["B5DD",0x9012],
- ["DE9E",0x9013],
- ["CDBE",0x9014],
- ["DE9F",0x9015],
- ["E5D1",0x9016],
- ["B6BA",0x9017],
- ["DEA0",0x9018],
- ["DF40",0x9019],
- ["CDA8",0x901A],
- ["B9E4",0x901B],
- ["DF41",0x901C],
- ["CAC5",0x901D],
- ["B3D1",0x901E],
- ["CBD9",0x901F],
- ["D4EC",0x9020],
- ["E5D2",0x9021],
- ["B7EA",0x9022],
- ["DF42",0x9023],
- ["DF43",0x9024],
- ["DF44",0x9025],
- ["E5CE",0x9026],
- ["DF45",0x9027],
- ["DF46",0x9028],
- ["DF47",0x9029],
- ["DF48",0x902A],
- ["DF49",0x902B],
- ["DF4A",0x902C],
- ["E5D5",0x902D],
- ["B4FE",0x902E],
- ["E5D6",0x902F],
- ["DF4B",0x9030],
- ["DF4C",0x9031],
- ["DF4D",0x9032],
- ["DF4E",0x9033],
- ["DF4F",0x9034],
- ["E5D3",0x9035],
- ["E5D4",0x9036],
- ["DF50",0x9037],
- ["D2DD",0x9038],
- ["DF51",0x9039],
- ["DF52",0x903A],
- ["C2DF",0x903B],
- ["B1C6",0x903C],
- ["DF53",0x903D],
- ["D3E2",0x903E],
- ["DF54",0x903F],
- ["DF55",0x9040],
- ["B6DD",0x9041],
- ["CBEC",0x9042],
- ["DF56",0x9043],
- ["E5D7",0x9044],
- ["DF57",0x9045],
- ["DF58",0x9046],
- ["D3F6",0x9047],
- ["DF59",0x9048],
- ["DF5A",0x9049],
- ["DF5B",0x904A],
- ["DF5C",0x904B],
- ["DF5D",0x904C],
- ["B1E9",0x904D],
- ["DF5E",0x904E],
- ["B6F4",0x904F],
- ["E5DA",0x9050],
- ["E5D8",0x9051],
- ["E5D9",0x9052],
- ["B5C0",0x9053],
- ["DF5F",0x9054],
- ["DF60",0x9055],
- ["DF61",0x9056],
- ["D2C5",0x9057],
- ["E5DC",0x9058],
- ["DF62",0x9059],
- ["DF63",0x905A],
- ["E5DE",0x905B],
- ["DF64",0x905C],
- ["DF65",0x905D],
- ["DF66",0x905E],
- ["DF67",0x905F],
- ["DF68",0x9060],
- ["DF69",0x9061],
- ["E5DD",0x9062],
- ["C7B2",0x9063],
- ["DF6A",0x9064],
- ["D2A3",0x9065],
- ["DF6B",0x9066],
- ["DF6C",0x9067],
- ["E5DB",0x9068],
- ["DF6D",0x9069],
- ["DF6E",0x906A],
- ["DF6F",0x906B],
- ["DF70",0x906C],
- ["D4E2",0x906D],
- ["D5DA",0x906E],
- ["DF71",0x906F],
- ["DF72",0x9070],
- ["DF73",0x9071],
- ["DF74",0x9072],
- ["DF75",0x9073],
- ["E5E0",0x9074],
- ["D7F1",0x9075],
- ["DF76",0x9076],
- ["DF77",0x9077],
- ["DF78",0x9078],
- ["DF79",0x9079],
- ["DF7A",0x907A],
- ["DF7B",0x907B],
- ["DF7C",0x907C],
- ["E5E1",0x907D],
- ["DF7D",0x907E],
- ["B1DC",0x907F],
- ["D1FB",0x9080],
- ["DF7E",0x9081],
- ["E5E2",0x9082],
- ["E5E4",0x9083],
- ["DF80",0x9084],
- ["DF81",0x9085],
- ["DF82",0x9086],
- ["DF83",0x9087],
- ["E5E3",0x9088],
- ["DF84",0x9089],
- ["DF85",0x908A],
- ["E5E5",0x908B],
- ["DF86",0x908C],
- ["DF87",0x908D],
- ["DF88",0x908E],
- ["DF89",0x908F],
- ["DF8A",0x9090],
- ["D2D8",0x9091],
- ["DF8B",0x9092],
- ["B5CB",0x9093],
- ["DF8C",0x9094],
- ["E7DF",0x9095],
- ["DF8D",0x9096],
- ["DAF5",0x9097],
- ["DF8E",0x9098],
- ["DAF8",0x9099],
- ["DF8F",0x909A],
- ["DAF6",0x909B],
- ["DF90",0x909C],
- ["DAF7",0x909D],
- ["DF91",0x909E],
- ["DF92",0x909F],
- ["DF93",0x90A0],
- ["DAFA",0x90A1],
- ["D0CF",0x90A2],
- ["C4C7",0x90A3],
- ["DF94",0x90A4],
- ["DF95",0x90A5],
- ["B0EE",0x90A6],
- ["DF96",0x90A7],
- ["DF97",0x90A8],
- ["DF98",0x90A9],
- ["D0B0",0x90AA],
- ["DF99",0x90AB],
- ["DAF9",0x90AC],
- ["DF9A",0x90AD],
- ["D3CA",0x90AE],
- ["BAAA",0x90AF],
- ["DBA2",0x90B0],
- ["C7F1",0x90B1],
- ["DF9B",0x90B2],
- ["DAFC",0x90B3],
- ["DAFB",0x90B4],
- ["C9DB",0x90B5],
- ["DAFD",0x90B6],
- ["DF9C",0x90B7],
- ["DBA1",0x90B8],
- ["D7DE",0x90B9],
- ["DAFE",0x90BA],
- ["C1DA",0x90BB],
- ["DF9D",0x90BC],
- ["DF9E",0x90BD],
- ["DBA5",0x90BE],
- ["DF9F",0x90BF],
- ["DFA0",0x90C0],
- ["D3F4",0x90C1],
- ["E040",0x90C2],
- ["E041",0x90C3],
- ["DBA7",0x90C4],
- ["DBA4",0x90C5],
- ["E042",0x90C6],
- ["DBA8",0x90C7],
- ["E043",0x90C8],
- ["E044",0x90C9],
- ["BDBC",0x90CA],
- ["E045",0x90CB],
- ["E046",0x90CC],
- ["E047",0x90CD],
- ["C0C9",0x90CE],
- ["DBA3",0x90CF],
- ["DBA6",0x90D0],
- ["D6A3",0x90D1],
- ["E048",0x90D2],
- ["DBA9",0x90D3],
- ["E049",0x90D4],
- ["E04A",0x90D5],
- ["E04B",0x90D6],
- ["DBAD",0x90D7],
- ["E04C",0x90D8],
- ["E04D",0x90D9],
- ["E04E",0x90DA],
- ["DBAE",0x90DB],
- ["DBAC",0x90DC],
- ["BAC2",0x90DD],
- ["E04F",0x90DE],
- ["E050",0x90DF],
- ["E051",0x90E0],
- ["BFA4",0x90E1],
- ["DBAB",0x90E2],
- ["E052",0x90E3],
- ["E053",0x90E4],
- ["E054",0x90E5],
- ["DBAA",0x90E6],
- ["D4C7",0x90E7],
- ["B2BF",0x90E8],
- ["E055",0x90E9],
- ["E056",0x90EA],
- ["DBAF",0x90EB],
- ["E057",0x90EC],
- ["B9F9",0x90ED],
- ["E058",0x90EE],
- ["DBB0",0x90EF],
- ["E059",0x90F0],
- ["E05A",0x90F1],
- ["E05B",0x90F2],
- ["E05C",0x90F3],
- ["B3BB",0x90F4],
- ["E05D",0x90F5],
- ["E05E",0x90F6],
- ["E05F",0x90F7],
- ["B5A6",0x90F8],
- ["E060",0x90F9],
- ["E061",0x90FA],
- ["E062",0x90FB],
- ["E063",0x90FC],
- ["B6BC",0x90FD],
- ["DBB1",0x90FE],
- ["E064",0x90FF],
- ["E065",0x9100],
- ["E066",0x9101],
- ["B6F5",0x9102],
- ["E067",0x9103],
- ["DBB2",0x9104],
- ["E068",0x9105],
- ["E069",0x9106],
- ["E06A",0x9107],
- ["E06B",0x9108],
- ["E06C",0x9109],
- ["E06D",0x910A],
- ["E06E",0x910B],
- ["E06F",0x910C],
- ["E070",0x910D],
- ["E071",0x910E],
- ["E072",0x910F],
- ["E073",0x9110],
- ["E074",0x9111],
- ["E075",0x9112],
- ["E076",0x9113],
- ["E077",0x9114],
- ["E078",0x9115],
- ["E079",0x9116],
- ["E07A",0x9117],
- ["E07B",0x9118],
- ["B1C9",0x9119],
- ["E07C",0x911A],
- ["E07D",0x911B],
- ["E07E",0x911C],
- ["E080",0x911D],
- ["DBB4",0x911E],
- ["E081",0x911F],
- ["E082",0x9120],
- ["E083",0x9121],
- ["DBB3",0x9122],
- ["DBB5",0x9123],
- ["E084",0x9124],
- ["E085",0x9125],
- ["E086",0x9126],
- ["E087",0x9127],
- ["E088",0x9128],
- ["E089",0x9129],
- ["E08A",0x912A],
- ["E08B",0x912B],
- ["E08C",0x912C],
- ["E08D",0x912D],
- ["E08E",0x912E],
- ["DBB7",0x912F],
- ["E08F",0x9130],
- ["DBB6",0x9131],
- ["E090",0x9132],
- ["E091",0x9133],
- ["E092",0x9134],
- ["E093",0x9135],
- ["E094",0x9136],
- ["E095",0x9137],
- ["E096",0x9138],
- ["DBB8",0x9139],
- ["E097",0x913A],
- ["E098",0x913B],
- ["E099",0x913C],
- ["E09A",0x913D],
- ["E09B",0x913E],
- ["E09C",0x913F],
- ["E09D",0x9140],
- ["E09E",0x9141],
- ["E09F",0x9142],
- ["DBB9",0x9143],
- ["E0A0",0x9144],
- ["E140",0x9145],
- ["DBBA",0x9146],
- ["E141",0x9147],
- ["E142",0x9148],
- ["D3CF",0x9149],
- ["F4FA",0x914A],
- ["C7F5",0x914B],
- ["D7C3",0x914C],
- ["C5E4",0x914D],
- ["F4FC",0x914E],
- ["F4FD",0x914F],
- ["F4FB",0x9150],
- ["E143",0x9151],
- ["BEC6",0x9152],
- ["E144",0x9153],
- ["E145",0x9154],
- ["E146",0x9155],
- ["E147",0x9156],
- ["D0EF",0x9157],
- ["E148",0x9158],
- ["E149",0x9159],
- ["B7D3",0x915A],
- ["E14A",0x915B],
- ["E14B",0x915C],
- ["D4CD",0x915D],
- ["CCAA",0x915E],
- ["E14C",0x915F],
- ["E14D",0x9160],
- ["F5A2",0x9161],
- ["F5A1",0x9162],
- ["BAA8",0x9163],
- ["F4FE",0x9164],
- ["CBD6",0x9165],
- ["E14E",0x9166],
- ["E14F",0x9167],
- ["E150",0x9168],
- ["F5A4",0x9169],
- ["C0D2",0x916A],
- ["E151",0x916B],
- ["B3EA",0x916C],
- ["E152",0x916D],
- ["CDAA",0x916E],
- ["F5A5",0x916F],
- ["F5A3",0x9170],
- ["BDB4",0x9171],
- ["F5A8",0x9172],
- ["E153",0x9173],
- ["F5A9",0x9174],
- ["BDCD",0x9175],
- ["C3B8",0x9176],
- ["BFE1",0x9177],
- ["CBE1",0x9178],
- ["F5AA",0x9179],
- ["E154",0x917A],
- ["E155",0x917B],
- ["E156",0x917C],
- ["F5A6",0x917D],
- ["F5A7",0x917E],
- ["C4F0",0x917F],
- ["E157",0x9180],
- ["E158",0x9181],
- ["E159",0x9182],
- ["E15A",0x9183],
- ["E15B",0x9184],
- ["F5AC",0x9185],
- ["E15C",0x9186],
- ["B4BC",0x9187],
- ["E15D",0x9188],
- ["D7ED",0x9189],
- ["E15E",0x918A],
- ["B4D7",0x918B],
- ["F5AB",0x918C],
- ["F5AE",0x918D],
- ["E15F",0x918E],
- ["E160",0x918F],
- ["F5AD",0x9190],
- ["F5AF",0x9191],
- ["D0D1",0x9192],
- ["E161",0x9193],
- ["E162",0x9194],
- ["E163",0x9195],
- ["E164",0x9196],
- ["E165",0x9197],
- ["E166",0x9198],
- ["E167",0x9199],
- ["C3D1",0x919A],
- ["C8A9",0x919B],
- ["E168",0x919C],
- ["E169",0x919D],
- ["E16A",0x919E],
- ["E16B",0x919F],
- ["E16C",0x91A0],
- ["E16D",0x91A1],
- ["F5B0",0x91A2],
- ["F5B1",0x91A3],
- ["E16E",0x91A4],
- ["E16F",0x91A5],
- ["E170",0x91A6],
- ["E171",0x91A7],
- ["E172",0x91A8],
- ["E173",0x91A9],
- ["F5B2",0x91AA],
- ["E174",0x91AB],
- ["E175",0x91AC],
- ["F5B3",0x91AD],
- ["F5B4",0x91AE],
- ["F5B5",0x91AF],
- ["E176",0x91B0],
- ["E177",0x91B1],
- ["E178",0x91B2],
- ["E179",0x91B3],
- ["F5B7",0x91B4],
- ["F5B6",0x91B5],
- ["E17A",0x91B6],
- ["E17B",0x91B7],
- ["E17C",0x91B8],
- ["E17D",0x91B9],
- ["F5B8",0x91BA],
- ["E17E",0x91BB],
- ["E180",0x91BC],
- ["E181",0x91BD],
- ["E182",0x91BE],
- ["E183",0x91BF],
- ["E184",0x91C0],
- ["E185",0x91C1],
- ["E186",0x91C2],
- ["E187",0x91C3],
- ["E188",0x91C4],
- ["E189",0x91C5],
- ["E18A",0x91C6],
- ["B2C9",0x91C7],
- ["E18B",0x91C8],
- ["D3D4",0x91C9],
- ["CACD",0x91CA],
- ["E18C",0x91CB],
- ["C0EF",0x91CC],
- ["D6D8",0x91CD],
- ["D2B0",0x91CE],
- ["C1BF",0x91CF],
- ["E18D",0x91D0],
- ["BDF0",0x91D1],
- ["E18E",0x91D2],
- ["E18F",0x91D3],
- ["E190",0x91D4],
- ["E191",0x91D5],
- ["E192",0x91D6],
- ["E193",0x91D7],
- ["E194",0x91D8],
- ["E195",0x91D9],
- ["E196",0x91DA],
- ["E197",0x91DB],
- ["B8AA",0x91DC],
- ["E198",0x91DD],
- ["E199",0x91DE],
- ["E19A",0x91DF],
- ["E19B",0x91E0],
- ["E19C",0x91E1],
- ["E19D",0x91E2],
- ["E19E",0x91E3],
- ["E19F",0x91E4],
- ["E1A0",0x91E5],
- ["E240",0x91E6],
- ["E241",0x91E7],
- ["E242",0x91E8],
- ["E243",0x91E9],
- ["E244",0x91EA],
- ["E245",0x91EB],
- ["E246",0x91EC],
- ["E247",0x91ED],
- ["E248",0x91EE],
- ["E249",0x91EF],
- ["E24A",0x91F0],
- ["E24B",0x91F1],
- ["E24C",0x91F2],
- ["E24D",0x91F3],
- ["E24E",0x91F4],
- ["E24F",0x91F5],
- ["E250",0x91F6],
- ["E251",0x91F7],
- ["E252",0x91F8],
- ["E253",0x91F9],
- ["E254",0x91FA],
- ["E255",0x91FB],
- ["E256",0x91FC],
- ["E257",0x91FD],
- ["E258",0x91FE],
- ["E259",0x91FF],
- ["E25A",0x9200],
- ["E25B",0x9201],
- ["E25C",0x9202],
- ["E25D",0x9203],
- ["E25E",0x9204],
- ["E25F",0x9205],
- ["E260",0x9206],
- ["E261",0x9207],
- ["E262",0x9208],
- ["E263",0x9209],
- ["E264",0x920A],
- ["E265",0x920B],
- ["E266",0x920C],
- ["E267",0x920D],
- ["E268",0x920E],
- ["E269",0x920F],
- ["E26A",0x9210],
- ["E26B",0x9211],
- ["E26C",0x9212],
- ["E26D",0x9213],
- ["E26E",0x9214],
- ["E26F",0x9215],
- ["E270",0x9216],
- ["E271",0x9217],
- ["E272",0x9218],
- ["E273",0x9219],
- ["E274",0x921A],
- ["E275",0x921B],
- ["E276",0x921C],
- ["E277",0x921D],
- ["E278",0x921E],
- ["E279",0x921F],
- ["E27A",0x9220],
- ["E27B",0x9221],
- ["E27C",0x9222],
- ["E27D",0x9223],
- ["E27E",0x9224],
- ["E280",0x9225],
- ["E281",0x9226],
- ["E282",0x9227],
- ["E283",0x9228],
- ["E284",0x9229],
- ["E285",0x922A],
- ["E286",0x922B],
- ["E287",0x922C],
- ["E288",0x922D],
- ["E289",0x922E],
- ["E28A",0x922F],
- ["E28B",0x9230],
- ["E28C",0x9231],
- ["E28D",0x9232],
- ["E28E",0x9233],
- ["E28F",0x9234],
- ["E290",0x9235],
- ["E291",0x9236],
- ["E292",0x9237],
- ["E293",0x9238],
- ["E294",0x9239],
- ["E295",0x923A],
- ["E296",0x923B],
- ["E297",0x923C],
- ["E298",0x923D],
- ["E299",0x923E],
- ["E29A",0x923F],
- ["E29B",0x9240],
- ["E29C",0x9241],
- ["E29D",0x9242],
- ["E29E",0x9243],
- ["E29F",0x9244],
- ["E2A0",0x9245],
- ["E340",0x9246],
- ["E341",0x9247],
- ["E342",0x9248],
- ["E343",0x9249],
- ["E344",0x924A],
- ["E345",0x924B],
- ["E346",0x924C],
- ["E347",0x924D],
- ["E348",0x924E],
- ["E349",0x924F],
- ["E34A",0x9250],
- ["E34B",0x9251],
- ["E34C",0x9252],
- ["E34D",0x9253],
- ["E34E",0x9254],
- ["E34F",0x9255],
- ["E350",0x9256],
- ["E351",0x9257],
- ["E352",0x9258],
- ["E353",0x9259],
- ["E354",0x925A],
- ["E355",0x925B],
- ["E356",0x925C],
- ["E357",0x925D],
- ["E358",0x925E],
- ["E359",0x925F],
- ["E35A",0x9260],
- ["E35B",0x9261],
- ["E35C",0x9262],
- ["E35D",0x9263],
- ["E35E",0x9264],
- ["E35F",0x9265],
- ["E360",0x9266],
- ["E361",0x9267],
- ["E362",0x9268],
- ["E363",0x9269],
- ["E364",0x926A],
- ["E365",0x926B],
- ["E366",0x926C],
- ["E367",0x926D],
- ["E368",0x926E],
- ["E369",0x926F],
- ["E36A",0x9270],
- ["E36B",0x9271],
- ["E36C",0x9272],
- ["E36D",0x9273],
- ["BCF8",0x9274],
- ["E36E",0x9275],
- ["E36F",0x9276],
- ["E370",0x9277],
- ["E371",0x9278],
- ["E372",0x9279],
- ["E373",0x927A],
- ["E374",0x927B],
- ["E375",0x927C],
- ["E376",0x927D],
- ["E377",0x927E],
- ["E378",0x927F],
- ["E379",0x9280],
- ["E37A",0x9281],
- ["E37B",0x9282],
- ["E37C",0x9283],
- ["E37D",0x9284],
- ["E37E",0x9285],
- ["E380",0x9286],
- ["E381",0x9287],
- ["E382",0x9288],
- ["E383",0x9289],
- ["E384",0x928A],
- ["E385",0x928B],
- ["E386",0x928C],
- ["E387",0x928D],
- ["F6C6",0x928E],
- ["E388",0x928F],
- ["E389",0x9290],
- ["E38A",0x9291],
- ["E38B",0x9292],
- ["E38C",0x9293],
- ["E38D",0x9294],
- ["E38E",0x9295],
- ["E38F",0x9296],
- ["E390",0x9297],
- ["E391",0x9298],
- ["E392",0x9299],
- ["E393",0x929A],
- ["E394",0x929B],
- ["E395",0x929C],
- ["E396",0x929D],
- ["E397",0x929E],
- ["E398",0x929F],
- ["E399",0x92A0],
- ["E39A",0x92A1],
- ["E39B",0x92A2],
- ["E39C",0x92A3],
- ["E39D",0x92A4],
- ["E39E",0x92A5],
- ["E39F",0x92A6],
- ["E3A0",0x92A7],
- ["E440",0x92A8],
- ["E441",0x92A9],
- ["E442",0x92AA],
- ["E443",0x92AB],
- ["E444",0x92AC],
- ["E445",0x92AD],
- ["F6C7",0x92AE],
- ["E446",0x92AF],
- ["E447",0x92B0],
- ["E448",0x92B1],
- ["E449",0x92B2],
- ["E44A",0x92B3],
- ["E44B",0x92B4],
- ["E44C",0x92B5],
- ["E44D",0x92B6],
- ["E44E",0x92B7],
- ["E44F",0x92B8],
- ["E450",0x92B9],
- ["E451",0x92BA],
- ["E452",0x92BB],
- ["E453",0x92BC],
- ["E454",0x92BD],
- ["E455",0x92BE],
- ["E456",0x92BF],
- ["E457",0x92C0],
- ["E458",0x92C1],
- ["E459",0x92C2],
- ["E45A",0x92C3],
- ["E45B",0x92C4],
- ["E45C",0x92C5],
- ["E45D",0x92C6],
- ["E45E",0x92C7],
- ["F6C8",0x92C8],
- ["E45F",0x92C9],
- ["E460",0x92CA],
- ["E461",0x92CB],
- ["E462",0x92CC],
- ["E463",0x92CD],
- ["E464",0x92CE],
- ["E465",0x92CF],
- ["E466",0x92D0],
- ["E467",0x92D1],
- ["E468",0x92D2],
- ["E469",0x92D3],
- ["E46A",0x92D4],
- ["E46B",0x92D5],
- ["E46C",0x92D6],
- ["E46D",0x92D7],
- ["E46E",0x92D8],
- ["E46F",0x92D9],
- ["E470",0x92DA],
- ["E471",0x92DB],
- ["E472",0x92DC],
- ["E473",0x92DD],
- ["E474",0x92DE],
- ["E475",0x92DF],
- ["E476",0x92E0],
- ["E477",0x92E1],
- ["E478",0x92E2],
- ["E479",0x92E3],
- ["E47A",0x92E4],
- ["E47B",0x92E5],
- ["E47C",0x92E6],
- ["E47D",0x92E7],
- ["E47E",0x92E8],
- ["E480",0x92E9],
- ["E481",0x92EA],
- ["E482",0x92EB],
- ["E483",0x92EC],
- ["E484",0x92ED],
- ["E485",0x92EE],
- ["E486",0x92EF],
- ["E487",0x92F0],
- ["E488",0x92F1],
- ["E489",0x92F2],
- ["E48A",0x92F3],
- ["E48B",0x92F4],
- ["E48C",0x92F5],
- ["E48D",0x92F6],
- ["E48E",0x92F7],
- ["E48F",0x92F8],
- ["E490",0x92F9],
- ["E491",0x92FA],
- ["E492",0x92FB],
- ["E493",0x92FC],
- ["E494",0x92FD],
- ["E495",0x92FE],
- ["E496",0x92FF],
- ["E497",0x9300],
- ["E498",0x9301],
- ["E499",0x9302],
- ["E49A",0x9303],
- ["E49B",0x9304],
- ["E49C",0x9305],
- ["E49D",0x9306],
- ["E49E",0x9307],
- ["E49F",0x9308],
- ["E4A0",0x9309],
- ["E540",0x930A],
- ["E541",0x930B],
- ["E542",0x930C],
- ["E543",0x930D],
- ["E544",0x930E],
- ["E545",0x930F],
- ["E546",0x9310],
- ["E547",0x9311],
- ["E548",0x9312],
- ["E549",0x9313],
- ["E54A",0x9314],
- ["E54B",0x9315],
- ["E54C",0x9316],
- ["E54D",0x9317],
- ["E54E",0x9318],
- ["E54F",0x9319],
- ["E550",0x931A],
- ["E551",0x931B],
- ["E552",0x931C],
- ["E553",0x931D],
- ["E554",0x931E],
- ["E555",0x931F],
- ["E556",0x9320],
- ["E557",0x9321],
- ["E558",0x9322],
- ["E559",0x9323],
- ["E55A",0x9324],
- ["E55B",0x9325],
- ["E55C",0x9326],
- ["E55D",0x9327],
- ["E55E",0x9328],
- ["E55F",0x9329],
- ["E560",0x932A],
- ["E561",0x932B],
- ["E562",0x932C],
- ["E563",0x932D],
- ["E564",0x932E],
- ["E565",0x932F],
- ["E566",0x9330],
- ["E567",0x9331],
- ["E568",0x9332],
- ["E569",0x9333],
- ["E56A",0x9334],
- ["E56B",0x9335],
- ["E56C",0x9336],
- ["E56D",0x9337],
- ["E56E",0x9338],
- ["E56F",0x9339],
- ["E570",0x933A],
- ["E571",0x933B],
- ["E572",0x933C],
- ["E573",0x933D],
- ["F6C9",0x933E],
- ["E574",0x933F],
- ["E575",0x9340],
- ["E576",0x9341],
- ["E577",0x9342],
- ["E578",0x9343],
- ["E579",0x9344],
- ["E57A",0x9345],
- ["E57B",0x9346],
- ["E57C",0x9347],
- ["E57D",0x9348],
- ["E57E",0x9349],
- ["E580",0x934A],
- ["E581",0x934B],
- ["E582",0x934C],
- ["E583",0x934D],
- ["E584",0x934E],
- ["E585",0x934F],
- ["E586",0x9350],
- ["E587",0x9351],
- ["E588",0x9352],
- ["E589",0x9353],
- ["E58A",0x9354],
- ["E58B",0x9355],
- ["E58C",0x9356],
- ["E58D",0x9357],
- ["E58E",0x9358],
- ["E58F",0x9359],
- ["E590",0x935A],
- ["E591",0x935B],
- ["E592",0x935C],
- ["E593",0x935D],
- ["E594",0x935E],
- ["E595",0x935F],
- ["E596",0x9360],
- ["E597",0x9361],
- ["E598",0x9362],
- ["E599",0x9363],
- ["E59A",0x9364],
- ["E59B",0x9365],
- ["E59C",0x9366],
- ["E59D",0x9367],
- ["E59E",0x9368],
- ["E59F",0x9369],
- ["F6CA",0x936A],
- ["E5A0",0x936B],
- ["E640",0x936C],
- ["E641",0x936D],
- ["E642",0x936E],
- ["E643",0x936F],
- ["E644",0x9370],
- ["E645",0x9371],
- ["E646",0x9372],
- ["E647",0x9373],
- ["E648",0x9374],
- ["E649",0x9375],
- ["E64A",0x9376],
- ["E64B",0x9377],
- ["E64C",0x9378],
- ["E64D",0x9379],
- ["E64E",0x937A],
- ["E64F",0x937B],
- ["E650",0x937C],
- ["E651",0x937D],
- ["E652",0x937E],
- ["E653",0x937F],
- ["E654",0x9380],
- ["E655",0x9381],
- ["E656",0x9382],
- ["E657",0x9383],
- ["E658",0x9384],
- ["E659",0x9385],
- ["E65A",0x9386],
- ["E65B",0x9387],
- ["E65C",0x9388],
- ["E65D",0x9389],
- ["E65E",0x938A],
- ["E65F",0x938B],
- ["E660",0x938C],
- ["E661",0x938D],
- ["E662",0x938E],
- ["F6CC",0x938F],
- ["E663",0x9390],
- ["E664",0x9391],
- ["E665",0x9392],
- ["E666",0x9393],
- ["E667",0x9394],
- ["E668",0x9395],
- ["E669",0x9396],
- ["E66A",0x9397],
- ["E66B",0x9398],
- ["E66C",0x9399],
- ["E66D",0x939A],
- ["E66E",0x939B],
- ["E66F",0x939C],
- ["E670",0x939D],
- ["E671",0x939E],
- ["E672",0x939F],
- ["E673",0x93A0],
- ["E674",0x93A1],
- ["E675",0x93A2],
- ["E676",0x93A3],
- ["E677",0x93A4],
- ["E678",0x93A5],
- ["E679",0x93A6],
- ["E67A",0x93A7],
- ["E67B",0x93A8],
- ["E67C",0x93A9],
- ["E67D",0x93AA],
- ["E67E",0x93AB],
- ["E680",0x93AC],
- ["E681",0x93AD],
- ["E682",0x93AE],
- ["E683",0x93AF],
- ["E684",0x93B0],
- ["E685",0x93B1],
- ["E686",0x93B2],
- ["E687",0x93B3],
- ["E688",0x93B4],
- ["E689",0x93B5],
- ["E68A",0x93B6],
- ["E68B",0x93B7],
- ["E68C",0x93B8],
- ["E68D",0x93B9],
- ["E68E",0x93BA],
- ["E68F",0x93BB],
- ["E690",0x93BC],
- ["E691",0x93BD],
- ["E692",0x93BE],
- ["E693",0x93BF],
- ["E694",0x93C0],
- ["E695",0x93C1],
- ["E696",0x93C2],
- ["E697",0x93C3],
- ["E698",0x93C4],
- ["E699",0x93C5],
- ["E69A",0x93C6],
- ["E69B",0x93C7],
- ["E69C",0x93C8],
- ["E69D",0x93C9],
- ["F6CB",0x93CA],
- ["E69E",0x93CB],
- ["E69F",0x93CC],
- ["E6A0",0x93CD],
- ["E740",0x93CE],
- ["E741",0x93CF],
- ["E742",0x93D0],
- ["E743",0x93D1],
- ["E744",0x93D2],
- ["E745",0x93D3],
- ["E746",0x93D4],
- ["E747",0x93D5],
- ["F7E9",0x93D6],
- ["E748",0x93D7],
- ["E749",0x93D8],
- ["E74A",0x93D9],
- ["E74B",0x93DA],
- ["E74C",0x93DB],
- ["E74D",0x93DC],
- ["E74E",0x93DD],
- ["E74F",0x93DE],
- ["E750",0x93DF],
- ["E751",0x93E0],
- ["E752",0x93E1],
- ["E753",0x93E2],
- ["E754",0x93E3],
- ["E755",0x93E4],
- ["E756",0x93E5],
- ["E757",0x93E6],
- ["E758",0x93E7],
- ["E759",0x93E8],
- ["E75A",0x93E9],
- ["E75B",0x93EA],
- ["E75C",0x93EB],
- ["E75D",0x93EC],
- ["E75E",0x93ED],
- ["E75F",0x93EE],
- ["E760",0x93EF],
- ["E761",0x93F0],
- ["E762",0x93F1],
- ["E763",0x93F2],
- ["E764",0x93F3],
- ["E765",0x93F4],
- ["E766",0x93F5],
- ["E767",0x93F6],
- ["E768",0x93F7],
- ["E769",0x93F8],
- ["E76A",0x93F9],
- ["E76B",0x93FA],
- ["E76C",0x93FB],
- ["E76D",0x93FC],
- ["E76E",0x93FD],
- ["E76F",0x93FE],
- ["E770",0x93FF],
- ["E771",0x9400],
- ["E772",0x9401],
- ["E773",0x9402],
- ["E774",0x9403],
- ["E775",0x9404],
- ["E776",0x9405],
- ["E777",0x9406],
- ["E778",0x9407],
- ["E779",0x9408],
- ["E77A",0x9409],
- ["E77B",0x940A],
- ["E77C",0x940B],
- ["E77D",0x940C],
- ["E77E",0x940D],
- ["E780",0x940E],
- ["E781",0x940F],
- ["E782",0x9410],
- ["E783",0x9411],
- ["E784",0x9412],
- ["E785",0x9413],
- ["E786",0x9414],
- ["E787",0x9415],
- ["E788",0x9416],
- ["E789",0x9417],
- ["E78A",0x9418],
- ["E78B",0x9419],
- ["E78C",0x941A],
- ["E78D",0x941B],
- ["E78E",0x941C],
- ["E78F",0x941D],
- ["E790",0x941E],
- ["E791",0x941F],
- ["E792",0x9420],
- ["E793",0x9421],
- ["E794",0x9422],
- ["E795",0x9423],
- ["E796",0x9424],
- ["E797",0x9425],
- ["E798",0x9426],
- ["E799",0x9427],
- ["E79A",0x9428],
- ["E79B",0x9429],
- ["E79C",0x942A],
- ["E79D",0x942B],
- ["E79E",0x942C],
- ["E79F",0x942D],
- ["E7A0",0x942E],
- ["E840",0x942F],
- ["E841",0x9430],
- ["E842",0x9431],
- ["E843",0x9432],
- ["E844",0x9433],
- ["E845",0x9434],
- ["E846",0x9435],
- ["E847",0x9436],
- ["E848",0x9437],
- ["E849",0x9438],
- ["E84A",0x9439],
- ["E84B",0x943A],
- ["E84C",0x943B],
- ["E84D",0x943C],
- ["E84E",0x943D],
- ["F6CD",0x943E],
- ["E84F",0x943F],
- ["E850",0x9440],
- ["E851",0x9441],
- ["E852",0x9442],
- ["E853",0x9443],
- ["E854",0x9444],
- ["E855",0x9445],
- ["E856",0x9446],
- ["E857",0x9447],
- ["E858",0x9448],
- ["E859",0x9449],
- ["E85A",0x944A],
- ["E85B",0x944B],
- ["E85C",0x944C],
- ["E85D",0x944D],
- ["E85E",0x944E],
- ["E85F",0x944F],
- ["E860",0x9450],
- ["E861",0x9451],
- ["E862",0x9452],
- ["E863",0x9453],
- ["E864",0x9454],
- ["E865",0x9455],
- ["E866",0x9456],
- ["E867",0x9457],
- ["E868",0x9458],
- ["E869",0x9459],
- ["E86A",0x945A],
- ["E86B",0x945B],
- ["E86C",0x945C],
- ["E86D",0x945D],
- ["E86E",0x945E],
- ["E86F",0x945F],
- ["E870",0x9460],
- ["E871",0x9461],
- ["E872",0x9462],
- ["E873",0x9463],
- ["E874",0x9464],
- ["E875",0x9465],
- ["E876",0x9466],
- ["E877",0x9467],
- ["E878",0x9468],
- ["E879",0x9469],
- ["E87A",0x946A],
- ["F6CE",0x946B],
- ["E87B",0x946C],
- ["E87C",0x946D],
- ["E87D",0x946E],
- ["E87E",0x946F],
- ["E880",0x9470],
- ["E881",0x9471],
- ["E882",0x9472],
- ["E883",0x9473],
- ["E884",0x9474],
- ["E885",0x9475],
- ["E886",0x9476],
- ["E887",0x9477],
- ["E888",0x9478],
- ["E889",0x9479],
- ["E88A",0x947A],
- ["E88B",0x947B],
- ["E88C",0x947C],
- ["E88D",0x947D],
- ["E88E",0x947E],
- ["E88F",0x947F],
- ["E890",0x9480],
- ["E891",0x9481],
- ["E892",0x9482],
- ["E893",0x9483],
- ["E894",0x9484],
- ["EEC4",0x9485],
- ["EEC5",0x9486],
- ["EEC6",0x9487],
- ["D5EB",0x9488],
- ["B6A4",0x9489],
- ["EEC8",0x948A],
- ["EEC7",0x948B],
- ["EEC9",0x948C],
- ["EECA",0x948D],
- ["C7A5",0x948E],
- ["EECB",0x948F],
- ["EECC",0x9490],
- ["E895",0x9491],
- ["B7B0",0x9492],
- ["B5F6",0x9493],
- ["EECD",0x9494],
- ["EECF",0x9495],
- ["E896",0x9496],
- ["EECE",0x9497],
- ["E897",0x9498],
- ["B8C6",0x9499],
- ["EED0",0x949A],
- ["EED1",0x949B],
- ["EED2",0x949C],
- ["B6DB",0x949D],
- ["B3AE",0x949E],
- ["D6D3",0x949F],
- ["C4C6",0x94A0],
- ["B1B5",0x94A1],
- ["B8D6",0x94A2],
- ["EED3",0x94A3],
- ["EED4",0x94A4],
- ["D4BF",0x94A5],
- ["C7D5",0x94A6],
- ["BEFB",0x94A7],
- ["CED9",0x94A8],
- ["B9B3",0x94A9],
- ["EED6",0x94AA],
- ["EED5",0x94AB],
- ["EED8",0x94AC],
- ["EED7",0x94AD],
- ["C5A5",0x94AE],
- ["EED9",0x94AF],
- ["EEDA",0x94B0],
- ["C7AE",0x94B1],
- ["EEDB",0x94B2],
- ["C7AF",0x94B3],
- ["EEDC",0x94B4],
- ["B2A7",0x94B5],
- ["EEDD",0x94B6],
- ["EEDE",0x94B7],
- ["EEDF",0x94B8],
- ["EEE0",0x94B9],
- ["EEE1",0x94BA],
- ["D7EA",0x94BB],
- ["EEE2",0x94BC],
- ["EEE3",0x94BD],
- ["BCD8",0x94BE],
- ["EEE4",0x94BF],
- ["D3CB",0x94C0],
- ["CCFA",0x94C1],
- ["B2AC",0x94C2],
- ["C1E5",0x94C3],
- ["EEE5",0x94C4],
- ["C7A6",0x94C5],
- ["C3AD",0x94C6],
- ["E898",0x94C7],
- ["EEE6",0x94C8],
- ["EEE7",0x94C9],
- ["EEE8",0x94CA],
- ["EEE9",0x94CB],
- ["EEEA",0x94CC],
- ["EEEB",0x94CD],
- ["EEEC",0x94CE],
- ["E899",0x94CF],
- ["EEED",0x94D0],
- ["EEEE",0x94D1],
- ["EEEF",0x94D2],
- ["E89A",0x94D3],
- ["E89B",0x94D4],
- ["EEF0",0x94D5],
- ["EEF1",0x94D6],
- ["EEF2",0x94D7],
- ["EEF4",0x94D8],
- ["EEF3",0x94D9],
- ["E89C",0x94DA],
- ["EEF5",0x94DB],
- ["CDAD",0x94DC],
- ["C2C1",0x94DD],
- ["EEF6",0x94DE],
- ["EEF7",0x94DF],
- ["EEF8",0x94E0],
- ["D5A1",0x94E1],
- ["EEF9",0x94E2],
- ["CFB3",0x94E3],
- ["EEFA",0x94E4],
- ["EEFB",0x94E5],
- ["E89D",0x94E6],
- ["EEFC",0x94E7],
- ["EEFD",0x94E8],
- ["EFA1",0x94E9],
- ["EEFE",0x94EA],
- ["EFA2",0x94EB],
- ["B8F5",0x94EC],
- ["C3FA",0x94ED],
- ["EFA3",0x94EE],
- ["EFA4",0x94EF],
- ["BDC2",0x94F0],
- ["D2BF",0x94F1],
- ["B2F9",0x94F2],
- ["EFA5",0x94F3],
- ["EFA6",0x94F4],
- ["EFA7",0x94F5],
- ["D2F8",0x94F6],
- ["EFA8",0x94F7],
- ["D6FD",0x94F8],
- ["EFA9",0x94F9],
- ["C6CC",0x94FA],
- ["E89E",0x94FB],
- ["EFAA",0x94FC],
- ["EFAB",0x94FD],
- ["C1B4",0x94FE],
- ["EFAC",0x94FF],
- ["CFFA",0x9500],
- ["CBF8",0x9501],
- ["EFAE",0x9502],
- ["EFAD",0x9503],
- ["B3FA",0x9504],
- ["B9F8",0x9505],
- ["EFAF",0x9506],
- ["EFB0",0x9507],
- ["D0E2",0x9508],
- ["EFB1",0x9509],
- ["EFB2",0x950A],
- ["B7E6",0x950B],
- ["D0BF",0x950C],
- ["EFB3",0x950D],
- ["EFB4",0x950E],
- ["EFB5",0x950F],
- ["C8F1",0x9510],
- ["CCE0",0x9511],
- ["EFB6",0x9512],
- ["EFB7",0x9513],
- ["EFB8",0x9514],
- ["EFB9",0x9515],
- ["EFBA",0x9516],
- ["D5E0",0x9517],
- ["EFBB",0x9518],
- ["B4ED",0x9519],
- ["C3AA",0x951A],
- ["EFBC",0x951B],
- ["E89F",0x951C],
- ["EFBD",0x951D],
- ["EFBE",0x951E],
- ["EFBF",0x951F],
- ["E8A0",0x9520],
- ["CEFD",0x9521],
- ["EFC0",0x9522],
- ["C2E0",0x9523],
- ["B4B8",0x9524],
- ["D7B6",0x9525],
- ["BDF5",0x9526],
- ["E940",0x9527],
- ["CFC7",0x9528],
- ["EFC3",0x9529],
- ["EFC1",0x952A],
- ["EFC2",0x952B],
- ["EFC4",0x952C],
- ["B6A7",0x952D],
- ["BCFC",0x952E],
- ["BEE2",0x952F],
- ["C3CC",0x9530],
- ["EFC5",0x9531],
- ["EFC6",0x9532],
- ["E941",0x9533],
- ["EFC7",0x9534],
- ["EFCF",0x9535],
- ["EFC8",0x9536],
- ["EFC9",0x9537],
- ["EFCA",0x9538],
- ["C7C2",0x9539],
- ["EFF1",0x953A],
- ["B6CD",0x953B],
- ["EFCB",0x953C],
- ["E942",0x953D],
- ["EFCC",0x953E],
- ["EFCD",0x953F],
- ["B6C6",0x9540],
- ["C3BE",0x9541],
- ["EFCE",0x9542],
- ["E943",0x9543],
- ["EFD0",0x9544],
- ["EFD1",0x9545],
- ["EFD2",0x9546],
- ["D5F2",0x9547],
- ["E944",0x9548],
- ["EFD3",0x9549],
- ["C4F7",0x954A],
- ["E945",0x954B],
- ["EFD4",0x954C],
- ["C4F8",0x954D],
- ["EFD5",0x954E],
- ["EFD6",0x954F],
- ["B8E4",0x9550],
- ["B0F7",0x9551],
- ["EFD7",0x9552],
- ["EFD8",0x9553],
- ["EFD9",0x9554],
- ["E946",0x9555],
- ["EFDA",0x9556],
- ["EFDB",0x9557],
- ["EFDC",0x9558],
- ["EFDD",0x9559],
- ["E947",0x955A],
- ["EFDE",0x955B],
- ["BEB5",0x955C],
- ["EFE1",0x955D],
- ["EFDF",0x955E],
- ["EFE0",0x955F],
- ["E948",0x9560],
- ["EFE2",0x9561],
- ["EFE3",0x9562],
- ["C1CD",0x9563],
- ["EFE4",0x9564],
- ["EFE5",0x9565],
- ["EFE6",0x9566],
- ["EFE7",0x9567],
- ["EFE8",0x9568],
- ["EFE9",0x9569],
- ["EFEA",0x956A],
- ["EFEB",0x956B],
- ["EFEC",0x956C],
- ["C0D8",0x956D],
- ["E949",0x956E],
- ["EFED",0x956F],
- ["C1AD",0x9570],
- ["EFEE",0x9571],
- ["EFEF",0x9572],
- ["EFF0",0x9573],
- ["E94A",0x9574],
- ["E94B",0x9575],
- ["CFE2",0x9576],
- ["E94C",0x9577],
- ["E94D",0x9578],
- ["E94E",0x9579],
- ["E94F",0x957A],
- ["E950",0x957B],
- ["E951",0x957C],
- ["E952",0x957D],
- ["E953",0x957E],
- ["B3A4",0x957F],
- ["E954",0x9580],
- ["E955",0x9581],
- ["E956",0x9582],
- ["E957",0x9583],
- ["E958",0x9584],
- ["E959",0x9585],
- ["E95A",0x9586],
- ["E95B",0x9587],
- ["E95C",0x9588],
- ["E95D",0x9589],
- ["E95E",0x958A],
- ["E95F",0x958B],
- ["E960",0x958C],
- ["E961",0x958D],
- ["E962",0x958E],
- ["E963",0x958F],
- ["E964",0x9590],
- ["E965",0x9591],
- ["E966",0x9592],
- ["E967",0x9593],
- ["E968",0x9594],
- ["E969",0x9595],
- ["E96A",0x9596],
- ["E96B",0x9597],
- ["E96C",0x9598],
- ["E96D",0x9599],
- ["E96E",0x959A],
- ["E96F",0x959B],
- ["E970",0x959C],
- ["E971",0x959D],
- ["E972",0x959E],
- ["E973",0x959F],
- ["E974",0x95A0],
- ["E975",0x95A1],
- ["E976",0x95A2],
- ["E977",0x95A3],
- ["E978",0x95A4],
- ["E979",0x95A5],
- ["E97A",0x95A6],
- ["E97B",0x95A7],
- ["E97C",0x95A8],
- ["E97D",0x95A9],
- ["E97E",0x95AA],
- ["E980",0x95AB],
- ["E981",0x95AC],
- ["E982",0x95AD],
- ["E983",0x95AE],
- ["E984",0x95AF],
- ["E985",0x95B0],
- ["E986",0x95B1],
- ["E987",0x95B2],
- ["E988",0x95B3],
- ["E989",0x95B4],
- ["E98A",0x95B5],
- ["E98B",0x95B6],
- ["E98C",0x95B7],
- ["E98D",0x95B8],
- ["E98E",0x95B9],
- ["E98F",0x95BA],
- ["E990",0x95BB],
- ["E991",0x95BC],
- ["E992",0x95BD],
- ["E993",0x95BE],
- ["E994",0x95BF],
- ["E995",0x95C0],
- ["E996",0x95C1],
- ["E997",0x95C2],
- ["E998",0x95C3],
- ["E999",0x95C4],
- ["E99A",0x95C5],
- ["E99B",0x95C6],
- ["E99C",0x95C7],
- ["E99D",0x95C8],
- ["E99E",0x95C9],
- ["E99F",0x95CA],
- ["E9A0",0x95CB],
- ["EA40",0x95CC],
- ["EA41",0x95CD],
- ["EA42",0x95CE],
- ["EA43",0x95CF],
- ["EA44",0x95D0],
- ["EA45",0x95D1],
- ["EA46",0x95D2],
- ["EA47",0x95D3],
- ["EA48",0x95D4],
- ["EA49",0x95D5],
- ["EA4A",0x95D6],
- ["EA4B",0x95D7],
- ["EA4C",0x95D8],
- ["EA4D",0x95D9],
- ["EA4E",0x95DA],
- ["EA4F",0x95DB],
- ["EA50",0x95DC],
- ["EA51",0x95DD],
- ["EA52",0x95DE],
- ["EA53",0x95DF],
- ["EA54",0x95E0],
- ["EA55",0x95E1],
- ["EA56",0x95E2],
- ["EA57",0x95E3],
- ["EA58",0x95E4],
- ["EA59",0x95E5],
- ["EA5A",0x95E6],
- ["EA5B",0x95E7],
- ["C3C5",0x95E8],
- ["E3C5",0x95E9],
- ["C9C1",0x95EA],
- ["E3C6",0x95EB],
- ["EA5C",0x95EC],
- ["B1D5",0x95ED],
- ["CECA",0x95EE],
- ["B4B3",0x95EF],
- ["C8F2",0x95F0],
- ["E3C7",0x95F1],
- ["CFD0",0x95F2],
- ["E3C8",0x95F3],
- ["BCE4",0x95F4],
- ["E3C9",0x95F5],
- ["E3CA",0x95F6],
- ["C3C6",0x95F7],
- ["D5A2",0x95F8],
- ["C4D6",0x95F9],
- ["B9EB",0x95FA],
- ["CEC5",0x95FB],
- ["E3CB",0x95FC],
- ["C3F6",0x95FD],
- ["E3CC",0x95FE],
- ["EA5D",0x95FF],
- ["B7A7",0x9600],
- ["B8F3",0x9601],
- ["BAD2",0x9602],
- ["E3CD",0x9603],
- ["E3CE",0x9604],
- ["D4C4",0x9605],
- ["E3CF",0x9606],
- ["EA5E",0x9607],
- ["E3D0",0x9608],
- ["D1CB",0x9609],
- ["E3D1",0x960A],
- ["E3D2",0x960B],
- ["E3D3",0x960C],
- ["E3D4",0x960D],
- ["D1D6",0x960E],
- ["E3D5",0x960F],
- ["B2FB",0x9610],
- ["C0BB",0x9611],
- ["E3D6",0x9612],
- ["EA5F",0x9613],
- ["C0AB",0x9614],
- ["E3D7",0x9615],
- ["E3D8",0x9616],
- ["E3D9",0x9617],
- ["EA60",0x9618],
- ["E3DA",0x9619],
- ["E3DB",0x961A],
- ["EA61",0x961B],
- ["B8B7",0x961C],
- ["DAE2",0x961D],
- ["EA62",0x961E],
- ["B6D3",0x961F],
- ["EA63",0x9620],
- ["DAE4",0x9621],
- ["DAE3",0x9622],
- ["EA64",0x9623],
- ["EA65",0x9624],
- ["EA66",0x9625],
- ["EA67",0x9626],
- ["EA68",0x9627],
- ["EA69",0x9628],
- ["EA6A",0x9629],
- ["DAE6",0x962A],
- ["EA6B",0x962B],
- ["EA6C",0x962C],
- ["EA6D",0x962D],
- ["C8EE",0x962E],
- ["EA6E",0x962F],
- ["EA6F",0x9630],
- ["DAE5",0x9631],
- ["B7C0",0x9632],
- ["D1F4",0x9633],
- ["D2F5",0x9634],
- ["D5F3",0x9635],
- ["BDD7",0x9636],
- ["EA70",0x9637],
- ["EA71",0x9638],
- ["EA72",0x9639],
- ["EA73",0x963A],
- ["D7E8",0x963B],
- ["DAE8",0x963C],
- ["DAE7",0x963D],
- ["EA74",0x963E],
- ["B0A2",0x963F],
- ["CDD3",0x9640],
- ["EA75",0x9641],
- ["DAE9",0x9642],
- ["EA76",0x9643],
- ["B8BD",0x9644],
- ["BCCA",0x9645],
- ["C2BD",0x9646],
- ["C2A4",0x9647],
- ["B3C2",0x9648],
- ["DAEA",0x9649],
- ["EA77",0x964A],
- ["C2AA",0x964B],
- ["C4B0",0x964C],
- ["BDB5",0x964D],
- ["EA78",0x964E],
- ["EA79",0x964F],
- ["CFDE",0x9650],
- ["EA7A",0x9651],
- ["EA7B",0x9652],
- ["EA7C",0x9653],
- ["DAEB",0x9654],
- ["C9C2",0x9655],
- ["EA7D",0x9656],
- ["EA7E",0x9657],
- ["EA80",0x9658],
- ["EA81",0x9659],
- ["EA82",0x965A],
- ["B1DD",0x965B],
- ["EA83",0x965C],
- ["EA84",0x965D],
- ["EA85",0x965E],
- ["DAEC",0x965F],
- ["EA86",0x9660],
- ["B6B8",0x9661],
- ["D4BA",0x9662],
- ["EA87",0x9663],
- ["B3FD",0x9664],
- ["EA88",0x9665],
- ["EA89",0x9666],
- ["DAED",0x9667],
- ["D4C9",0x9668],
- ["CFD5",0x9669],
- ["C5E3",0x966A],
- ["EA8A",0x966B],
- ["DAEE",0x966C],
- ["EA8B",0x966D],
- ["EA8C",0x966E],
- ["EA8D",0x966F],
- ["EA8E",0x9670],
- ["EA8F",0x9671],
- ["DAEF",0x9672],
- ["EA90",0x9673],
- ["DAF0",0x9674],
- ["C1EA",0x9675],
- ["CCD5",0x9676],
- ["CFDD",0x9677],
- ["EA91",0x9678],
- ["EA92",0x9679],
- ["EA93",0x967A],
- ["EA94",0x967B],
- ["EA95",0x967C],
- ["EA96",0x967D],
- ["EA97",0x967E],
- ["EA98",0x967F],
- ["EA99",0x9680],
- ["EA9A",0x9681],
- ["EA9B",0x9682],
- ["EA9C",0x9683],
- ["EA9D",0x9684],
- ["D3E7",0x9685],
- ["C2A1",0x9686],
- ["EA9E",0x9687],
- ["DAF1",0x9688],
- ["EA9F",0x9689],
- ["EAA0",0x968A],
- ["CBE5",0x968B],
- ["EB40",0x968C],
- ["DAF2",0x968D],
- ["EB41",0x968E],
- ["CBE6",0x968F],
- ["D2FE",0x9690],
- ["EB42",0x9691],
- ["EB43",0x9692],
- ["EB44",0x9693],
- ["B8F4",0x9694],
- ["EB45",0x9695],
- ["EB46",0x9696],
- ["DAF3",0x9697],
- ["B0AF",0x9698],
- ["CFB6",0x9699],
- ["EB47",0x969A],
- ["EB48",0x969B],
- ["D5CF",0x969C],
- ["EB49",0x969D],
- ["EB4A",0x969E],
- ["EB4B",0x969F],
- ["EB4C",0x96A0],
- ["EB4D",0x96A1],
- ["EB4E",0x96A2],
- ["EB4F",0x96A3],
- ["EB50",0x96A4],
- ["EB51",0x96A5],
- ["EB52",0x96A6],
- ["CBED",0x96A7],
- ["EB53",0x96A8],
- ["EB54",0x96A9],
- ["EB55",0x96AA],
- ["EB56",0x96AB],
- ["EB57",0x96AC],
- ["EB58",0x96AD],
- ["EB59",0x96AE],
- ["EB5A",0x96AF],
- ["DAF4",0x96B0],
- ["EB5B",0x96B1],
- ["EB5C",0x96B2],
- ["E3C4",0x96B3],
- ["EB5D",0x96B4],
- ["EB5E",0x96B5],
- ["C1A5",0x96B6],
- ["EB5F",0x96B7],
- ["EB60",0x96B8],
- ["F6BF",0x96B9],
- ["EB61",0x96BA],
- ["EB62",0x96BB],
- ["F6C0",0x96BC],
- ["F6C1",0x96BD],
- ["C4D1",0x96BE],
- ["EB63",0x96BF],
- ["C8B8",0x96C0],
- ["D1E3",0x96C1],
- ["EB64",0x96C2],
- ["EB65",0x96C3],
- ["D0DB",0x96C4],
- ["D1C5",0x96C5],
- ["BCAF",0x96C6],
- ["B9CD",0x96C7],
- ["EB66",0x96C8],
- ["EFF4",0x96C9],
- ["EB67",0x96CA],
- ["EB68",0x96CB],
- ["B4C6",0x96CC],
- ["D3BA",0x96CD],
- ["F6C2",0x96CE],
- ["B3FB",0x96CF],
- ["EB69",0x96D0],
- ["EB6A",0x96D1],
- ["F6C3",0x96D2],
- ["EB6B",0x96D3],
- ["EB6C",0x96D4],
- ["B5F1",0x96D5],
- ["EB6D",0x96D6],
- ["EB6E",0x96D7],
- ["EB6F",0x96D8],
- ["EB70",0x96D9],
- ["EB71",0x96DA],
- ["EB72",0x96DB],
- ["EB73",0x96DC],
- ["EB74",0x96DD],
- ["EB75",0x96DE],
- ["EB76",0x96DF],
- ["F6C5",0x96E0],
- ["EB77",0x96E1],
- ["EB78",0x96E2],
- ["EB79",0x96E3],
- ["EB7A",0x96E4],
- ["EB7B",0x96E5],
- ["EB7C",0x96E6],
- ["EB7D",0x96E7],
- ["D3EA",0x96E8],
- ["F6A7",0x96E9],
- ["D1A9",0x96EA],
- ["EB7E",0x96EB],
- ["EB80",0x96EC],
- ["EB81",0x96ED],
- ["EB82",0x96EE],
- ["F6A9",0x96EF],
- ["EB83",0x96F0],
- ["EB84",0x96F1],
- ["EB85",0x96F2],
- ["F6A8",0x96F3],
- ["EB86",0x96F4],
- ["EB87",0x96F5],
- ["C1E3",0x96F6],
- ["C0D7",0x96F7],
- ["EB88",0x96F8],
- ["B1A2",0x96F9],
- ["EB89",0x96FA],
- ["EB8A",0x96FB],
- ["EB8B",0x96FC],
- ["EB8C",0x96FD],
- ["CEED",0x96FE],
- ["EB8D",0x96FF],
- ["D0E8",0x9700],
- ["F6AB",0x9701],
- ["EB8E",0x9702],
- ["EB8F",0x9703],
- ["CFF6",0x9704],
- ["EB90",0x9705],
- ["F6AA",0x9706],
- ["D5F0",0x9707],
- ["F6AC",0x9708],
- ["C3B9",0x9709],
- ["EB91",0x970A],
- ["EB92",0x970B],
- ["EB93",0x970C],
- ["BBF4",0x970D],
- ["F6AE",0x970E],
- ["F6AD",0x970F],
- ["EB94",0x9710],
- ["EB95",0x9711],
- ["EB96",0x9712],
- ["C4DE",0x9713],
- ["EB97",0x9714],
- ["EB98",0x9715],
- ["C1D8",0x9716],
- ["EB99",0x9717],
- ["EB9A",0x9718],
- ["EB9B",0x9719],
- ["EB9C",0x971A],
- ["EB9D",0x971B],
- ["CBAA",0x971C],
- ["EB9E",0x971D],
- ["CFBC",0x971E],
- ["EB9F",0x971F],
- ["EBA0",0x9720],
- ["EC40",0x9721],
- ["EC41",0x9722],
- ["EC42",0x9723],
- ["EC43",0x9724],
- ["EC44",0x9725],
- ["EC45",0x9726],
- ["EC46",0x9727],
- ["EC47",0x9728],
- ["EC48",0x9729],
- ["F6AF",0x972A],
- ["EC49",0x972B],
- ["EC4A",0x972C],
- ["F6B0",0x972D],
- ["EC4B",0x972E],
- ["EC4C",0x972F],
- ["F6B1",0x9730],
- ["EC4D",0x9731],
- ["C2B6",0x9732],
- ["EC4E",0x9733],
- ["EC4F",0x9734],
- ["EC50",0x9735],
- ["EC51",0x9736],
- ["EC52",0x9737],
- ["B0D4",0x9738],
- ["C5F9",0x9739],
- ["EC53",0x973A],
- ["EC54",0x973B],
- ["EC55",0x973C],
- ["EC56",0x973D],
- ["F6B2",0x973E],
- ["EC57",0x973F],
- ["EC58",0x9740],
- ["EC59",0x9741],
- ["EC5A",0x9742],
- ["EC5B",0x9743],
- ["EC5C",0x9744],
- ["EC5D",0x9745],
- ["EC5E",0x9746],
- ["EC5F",0x9747],
- ["EC60",0x9748],
- ["EC61",0x9749],
- ["EC62",0x974A],
- ["EC63",0x974B],
- ["EC64",0x974C],
- ["EC65",0x974D],
- ["EC66",0x974E],
- ["EC67",0x974F],
- ["EC68",0x9750],
- ["EC69",0x9751],
- ["C7E0",0x9752],
- ["F6A6",0x9753],
- ["EC6A",0x9754],
- ["EC6B",0x9755],
- ["BEB8",0x9756],
- ["EC6C",0x9757],
- ["EC6D",0x9758],
- ["BEB2",0x9759],
- ["EC6E",0x975A],
- ["B5E5",0x975B],
- ["EC6F",0x975C],
- ["EC70",0x975D],
- ["B7C7",0x975E],
- ["EC71",0x975F],
- ["BFBF",0x9760],
- ["C3D2",0x9761],
- ["C3E6",0x9762],
- ["EC72",0x9763],
- ["EC73",0x9764],
- ["D8CC",0x9765],
- ["EC74",0x9766],
- ["EC75",0x9767],
- ["EC76",0x9768],
- ["B8EF",0x9769],
- ["EC77",0x976A],
- ["EC78",0x976B],
- ["EC79",0x976C],
- ["EC7A",0x976D],
- ["EC7B",0x976E],
- ["EC7C",0x976F],
- ["EC7D",0x9770],
- ["EC7E",0x9771],
- ["EC80",0x9772],
- ["BDF9",0x9773],
- ["D1A5",0x9774],
- ["EC81",0x9775],
- ["B0D0",0x9776],
- ["EC82",0x9777],
- ["EC83",0x9778],
- ["EC84",0x9779],
- ["EC85",0x977A],
- ["EC86",0x977B],
- ["F7B0",0x977C],
- ["EC87",0x977D],
- ["EC88",0x977E],
- ["EC89",0x977F],
- ["EC8A",0x9780],
- ["EC8B",0x9781],
- ["EC8C",0x9782],
- ["EC8D",0x9783],
- ["EC8E",0x9784],
- ["F7B1",0x9785],
- ["EC8F",0x9786],
- ["EC90",0x9787],
- ["EC91",0x9788],
- ["EC92",0x9789],
- ["EC93",0x978A],
- ["D0AC",0x978B],
- ["EC94",0x978C],
- ["B0B0",0x978D],
- ["EC95",0x978E],
- ["EC96",0x978F],
- ["EC97",0x9790],
- ["F7B2",0x9791],
- ["F7B3",0x9792],
- ["EC98",0x9793],
- ["F7B4",0x9794],
- ["EC99",0x9795],
- ["EC9A",0x9796],
- ["EC9B",0x9797],
- ["C7CA",0x9798],
- ["EC9C",0x9799],
- ["EC9D",0x979A],
- ["EC9E",0x979B],
- ["EC9F",0x979C],
- ["ECA0",0x979D],
- ["ED40",0x979E],
- ["ED41",0x979F],
- ["BECF",0x97A0],
- ["ED42",0x97A1],
- ["ED43",0x97A2],
- ["F7B7",0x97A3],
- ["ED44",0x97A4],
- ["ED45",0x97A5],
- ["ED46",0x97A6],
- ["ED47",0x97A7],
- ["ED48",0x97A8],
- ["ED49",0x97A9],
- ["ED4A",0x97AA],
- ["F7B6",0x97AB],
- ["ED4B",0x97AC],
- ["B1DE",0x97AD],
- ["ED4C",0x97AE],
- ["F7B5",0x97AF],
- ["ED4D",0x97B0],
- ["ED4E",0x97B1],
- ["F7B8",0x97B2],
- ["ED4F",0x97B3],
- ["F7B9",0x97B4],
- ["ED50",0x97B5],
- ["ED51",0x97B6],
- ["ED52",0x97B7],
- ["ED53",0x97B8],
- ["ED54",0x97B9],
- ["ED55",0x97BA],
- ["ED56",0x97BB],
- ["ED57",0x97BC],
- ["ED58",0x97BD],
- ["ED59",0x97BE],
- ["ED5A",0x97BF],
- ["ED5B",0x97C0],
- ["ED5C",0x97C1],
- ["ED5D",0x97C2],
- ["ED5E",0x97C3],
- ["ED5F",0x97C4],
- ["ED60",0x97C5],
- ["ED61",0x97C6],
- ["ED62",0x97C7],
- ["ED63",0x97C8],
- ["ED64",0x97C9],
- ["ED65",0x97CA],
- ["ED66",0x97CB],
- ["ED67",0x97CC],
- ["ED68",0x97CD],
- ["ED69",0x97CE],
- ["ED6A",0x97CF],
- ["ED6B",0x97D0],
- ["ED6C",0x97D1],
- ["ED6D",0x97D2],
- ["ED6E",0x97D3],
- ["ED6F",0x97D4],
- ["ED70",0x97D5],
- ["ED71",0x97D6],
- ["ED72",0x97D7],
- ["ED73",0x97D8],
- ["ED74",0x97D9],
- ["ED75",0x97DA],
- ["ED76",0x97DB],
- ["ED77",0x97DC],
- ["ED78",0x97DD],
- ["ED79",0x97DE],
- ["ED7A",0x97DF],
- ["ED7B",0x97E0],
- ["ED7C",0x97E1],
- ["ED7D",0x97E2],
- ["ED7E",0x97E3],
- ["ED80",0x97E4],
- ["ED81",0x97E5],
- ["CEA4",0x97E6],
- ["C8CD",0x97E7],
- ["ED82",0x97E8],
- ["BAAB",0x97E9],
- ["E8B8",0x97EA],
- ["E8B9",0x97EB],
- ["E8BA",0x97EC],
- ["BEC2",0x97ED],
- ["ED83",0x97EE],
- ["ED84",0x97EF],
- ["ED85",0x97F0],
- ["ED86",0x97F1],
- ["ED87",0x97F2],
- ["D2F4",0x97F3],
- ["ED88",0x97F4],
- ["D4CF",0x97F5],
- ["C9D8",0x97F6],
- ["ED89",0x97F7],
- ["ED8A",0x97F8],
- ["ED8B",0x97F9],
- ["ED8C",0x97FA],
- ["ED8D",0x97FB],
- ["ED8E",0x97FC],
- ["ED8F",0x97FD],
- ["ED90",0x97FE],
- ["ED91",0x97FF],
- ["ED92",0x9800],
- ["ED93",0x9801],
- ["ED94",0x9802],
- ["ED95",0x9803],
- ["ED96",0x9804],
- ["ED97",0x9805],
- ["ED98",0x9806],
- ["ED99",0x9807],
- ["ED9A",0x9808],
- ["ED9B",0x9809],
- ["ED9C",0x980A],
- ["ED9D",0x980B],
- ["ED9E",0x980C],
- ["ED9F",0x980D],
- ["EDA0",0x980E],
- ["EE40",0x980F],
- ["EE41",0x9810],
- ["EE42",0x9811],
- ["EE43",0x9812],
- ["EE44",0x9813],
- ["EE45",0x9814],
- ["EE46",0x9815],
- ["EE47",0x9816],
- ["EE48",0x9817],
- ["EE49",0x9818],
- ["EE4A",0x9819],
- ["EE4B",0x981A],
- ["EE4C",0x981B],
- ["EE4D",0x981C],
- ["EE4E",0x981D],
- ["EE4F",0x981E],
- ["EE50",0x981F],
- ["EE51",0x9820],
- ["EE52",0x9821],
- ["EE53",0x9822],
- ["EE54",0x9823],
- ["EE55",0x9824],
- ["EE56",0x9825],
- ["EE57",0x9826],
- ["EE58",0x9827],
- ["EE59",0x9828],
- ["EE5A",0x9829],
- ["EE5B",0x982A],
- ["EE5C",0x982B],
- ["EE5D",0x982C],
- ["EE5E",0x982D],
- ["EE5F",0x982E],
- ["EE60",0x982F],
- ["EE61",0x9830],
- ["EE62",0x9831],
- ["EE63",0x9832],
- ["EE64",0x9833],
- ["EE65",0x9834],
- ["EE66",0x9835],
- ["EE67",0x9836],
- ["EE68",0x9837],
- ["EE69",0x9838],
- ["EE6A",0x9839],
- ["EE6B",0x983A],
- ["EE6C",0x983B],
- ["EE6D",0x983C],
- ["EE6E",0x983D],
- ["EE6F",0x983E],
- ["EE70",0x983F],
- ["EE71",0x9840],
- ["EE72",0x9841],
- ["EE73",0x9842],
- ["EE74",0x9843],
- ["EE75",0x9844],
- ["EE76",0x9845],
- ["EE77",0x9846],
- ["EE78",0x9847],
- ["EE79",0x9848],
- ["EE7A",0x9849],
- ["EE7B",0x984A],
- ["EE7C",0x984B],
- ["EE7D",0x984C],
- ["EE7E",0x984D],
- ["EE80",0x984E],
- ["EE81",0x984F],
- ["EE82",0x9850],
- ["EE83",0x9851],
- ["EE84",0x9852],
- ["EE85",0x9853],
- ["EE86",0x9854],
- ["EE87",0x9855],
- ["EE88",0x9856],
- ["EE89",0x9857],
- ["EE8A",0x9858],
- ["EE8B",0x9859],
- ["EE8C",0x985A],
- ["EE8D",0x985B],
- ["EE8E",0x985C],
- ["EE8F",0x985D],
- ["EE90",0x985E],
- ["EE91",0x985F],
- ["EE92",0x9860],
- ["EE93",0x9861],
- ["EE94",0x9862],
- ["EE95",0x9863],
- ["EE96",0x9864],
- ["EE97",0x9865],
- ["EE98",0x9866],
- ["EE99",0x9867],
- ["EE9A",0x9868],
- ["EE9B",0x9869],
- ["EE9C",0x986A],
- ["EE9D",0x986B],
- ["EE9E",0x986C],
- ["EE9F",0x986D],
- ["EEA0",0x986E],
- ["EF40",0x986F],
- ["EF41",0x9870],
- ["EF42",0x9871],
- ["EF43",0x9872],
- ["EF44",0x9873],
- ["EF45",0x9874],
- ["D2B3",0x9875],
- ["B6A5",0x9876],
- ["C7EA",0x9877],
- ["F1FC",0x9878],
- ["CFEE",0x9879],
- ["CBB3",0x987A],
- ["D0EB",0x987B],
- ["E7EF",0x987C],
- ["CDE7",0x987D],
- ["B9CB",0x987E],
- ["B6D9",0x987F],
- ["F1FD",0x9880],
- ["B0E4",0x9881],
- ["CBCC",0x9882],
- ["F1FE",0x9883],
- ["D4A4",0x9884],
- ["C2AD",0x9885],
- ["C1EC",0x9886],
- ["C6C4",0x9887],
- ["BEB1",0x9888],
- ["F2A1",0x9889],
- ["BCD5",0x988A],
- ["EF46",0x988B],
- ["F2A2",0x988C],
- ["F2A3",0x988D],
- ["EF47",0x988E],
- ["F2A4",0x988F],
- ["D2C3",0x9890],
- ["C6B5",0x9891],
- ["EF48",0x9892],
- ["CDC7",0x9893],
- ["F2A5",0x9894],
- ["EF49",0x9895],
- ["D3B1",0x9896],
- ["BFC5",0x9897],
- ["CCE2",0x9898],
- ["EF4A",0x9899],
- ["F2A6",0x989A],
- ["F2A7",0x989B],
- ["D1D5",0x989C],
- ["B6EE",0x989D],
- ["F2A8",0x989E],
- ["F2A9",0x989F],
- ["B5DF",0x98A0],
- ["F2AA",0x98A1],
- ["F2AB",0x98A2],
- ["EF4B",0x98A3],
- ["B2FC",0x98A4],
- ["F2AC",0x98A5],
- ["F2AD",0x98A6],
- ["C8A7",0x98A7],
- ["EF4C",0x98A8],
- ["EF4D",0x98A9],
- ["EF4E",0x98AA],
- ["EF4F",0x98AB],
- ["EF50",0x98AC],
- ["EF51",0x98AD],
- ["EF52",0x98AE],
- ["EF53",0x98AF],
- ["EF54",0x98B0],
- ["EF55",0x98B1],
- ["EF56",0x98B2],
- ["EF57",0x98B3],
- ["EF58",0x98B4],
- ["EF59",0x98B5],
- ["EF5A",0x98B6],
- ["EF5B",0x98B7],
- ["EF5C",0x98B8],
- ["EF5D",0x98B9],
- ["EF5E",0x98BA],
- ["EF5F",0x98BB],
- ["EF60",0x98BC],
- ["EF61",0x98BD],
- ["EF62",0x98BE],
- ["EF63",0x98BF],
- ["EF64",0x98C0],
- ["EF65",0x98C1],
- ["EF66",0x98C2],
- ["EF67",0x98C3],
- ["EF68",0x98C4],
- ["EF69",0x98C5],
- ["EF6A",0x98C6],
- ["EF6B",0x98C7],
- ["EF6C",0x98C8],
- ["EF6D",0x98C9],
- ["EF6E",0x98CA],
- ["EF6F",0x98CB],
- ["EF70",0x98CC],
- ["EF71",0x98CD],
- ["B7E7",0x98CE],
- ["EF72",0x98CF],
- ["EF73",0x98D0],
- ["ECA9",0x98D1],
- ["ECAA",0x98D2],
- ["ECAB",0x98D3],
- ["EF74",0x98D4],
- ["ECAC",0x98D5],
- ["EF75",0x98D6],
- ["EF76",0x98D7],
- ["C6AE",0x98D8],
- ["ECAD",0x98D9],
- ["ECAE",0x98DA],
- ["EF77",0x98DB],
- ["EF78",0x98DC],
- ["EF79",0x98DD],
- ["B7C9",0x98DE],
- ["CAB3",0x98DF],
- ["EF7A",0x98E0],
- ["EF7B",0x98E1],
- ["EF7C",0x98E2],
- ["EF7D",0x98E3],
- ["EF7E",0x98E4],
- ["EF80",0x98E5],
- ["EF81",0x98E6],
- ["E2B8",0x98E7],
- ["F7CF",0x98E8],
- ["EF82",0x98E9],
- ["EF83",0x98EA],
- ["EF84",0x98EB],
- ["EF85",0x98EC],
- ["EF86",0x98ED],
- ["EF87",0x98EE],
- ["EF88",0x98EF],
- ["EF89",0x98F0],
- ["EF8A",0x98F1],
- ["EF8B",0x98F2],
- ["EF8C",0x98F3],
- ["EF8D",0x98F4],
- ["EF8E",0x98F5],
- ["EF8F",0x98F6],
- ["EF90",0x98F7],
- ["EF91",0x98F8],
- ["EF92",0x98F9],
- ["EF93",0x98FA],
- ["EF94",0x98FB],
- ["EF95",0x98FC],
- ["EF96",0x98FD],
- ["EF97",0x98FE],
- ["EF98",0x98FF],
- ["EF99",0x9900],
- ["EF9A",0x9901],
- ["EF9B",0x9902],
- ["EF9C",0x9903],
- ["EF9D",0x9904],
- ["EF9E",0x9905],
- ["EF9F",0x9906],
- ["EFA0",0x9907],
- ["F040",0x9908],
- ["F041",0x9909],
- ["F042",0x990A],
- ["F043",0x990B],
- ["F044",0x990C],
- ["F7D0",0x990D],
- ["F045",0x990E],
- ["F046",0x990F],
- ["B2CD",0x9910],
- ["F047",0x9911],
- ["F048",0x9912],
- ["F049",0x9913],
- ["F04A",0x9914],
- ["F04B",0x9915],
- ["F04C",0x9916],
- ["F04D",0x9917],
- ["F04E",0x9918],
- ["F04F",0x9919],
- ["F050",0x991A],
- ["F051",0x991B],
- ["F052",0x991C],
- ["F053",0x991D],
- ["F054",0x991E],
- ["F055",0x991F],
- ["F056",0x9920],
- ["F057",0x9921],
- ["F058",0x9922],
- ["F059",0x9923],
- ["F05A",0x9924],
- ["F05B",0x9925],
- ["F05C",0x9926],
- ["F05D",0x9927],
- ["F05E",0x9928],
- ["F05F",0x9929],
- ["F060",0x992A],
- ["F061",0x992B],
- ["F062",0x992C],
- ["F063",0x992D],
- ["F7D1",0x992E],
- ["F064",0x992F],
- ["F065",0x9930],
- ["F066",0x9931],
- ["F067",0x9932],
- ["F068",0x9933],
- ["F069",0x9934],
- ["F06A",0x9935],
- ["F06B",0x9936],
- ["F06C",0x9937],
- ["F06D",0x9938],
- ["F06E",0x9939],
- ["F06F",0x993A],
- ["F070",0x993B],
- ["F071",0x993C],
- ["F072",0x993D],
- ["F073",0x993E],
- ["F074",0x993F],
- ["F075",0x9940],
- ["F076",0x9941],
- ["F077",0x9942],
- ["F078",0x9943],
- ["F079",0x9944],
- ["F07A",0x9945],
- ["F07B",0x9946],
- ["F07C",0x9947],
- ["F07D",0x9948],
- ["F07E",0x9949],
- ["F080",0x994A],
- ["F081",0x994B],
- ["F082",0x994C],
- ["F083",0x994D],
- ["F084",0x994E],
- ["F085",0x994F],
- ["F086",0x9950],
- ["F087",0x9951],
- ["F088",0x9952],
- ["F089",0x9953],
- ["F7D3",0x9954],
- ["F7D2",0x9955],
- ["F08A",0x9956],
- ["F08B",0x9957],
- ["F08C",0x9958],
- ["F08D",0x9959],
- ["F08E",0x995A],
- ["F08F",0x995B],
- ["F090",0x995C],
- ["F091",0x995D],
- ["F092",0x995E],
- ["F093",0x995F],
- ["F094",0x9960],
- ["F095",0x9961],
- ["F096",0x9962],
- ["E2BB",0x9963],
- ["F097",0x9964],
- ["BCA2",0x9965],
- ["F098",0x9966],
- ["E2BC",0x9967],
- ["E2BD",0x9968],
- ["E2BE",0x9969],
- ["E2BF",0x996A],
- ["E2C0",0x996B],
- ["E2C1",0x996C],
- ["B7B9",0x996D],
- ["D2FB",0x996E],
- ["BDA4",0x996F],
- ["CACE",0x9970],
- ["B1A5",0x9971],
- ["CBC7",0x9972],
- ["F099",0x9973],
- ["E2C2",0x9974],
- ["B6FC",0x9975],
- ["C8C4",0x9976],
- ["E2C3",0x9977],
- ["F09A",0x9978],
- ["F09B",0x9979],
- ["BDC8",0x997A],
- ["F09C",0x997B],
- ["B1FD",0x997C],
- ["E2C4",0x997D],
- ["F09D",0x997E],
- ["B6F6",0x997F],
- ["E2C5",0x9980],
- ["C4D9",0x9981],
- ["F09E",0x9982],
- ["F09F",0x9983],
- ["E2C6",0x9984],
- ["CFDA",0x9985],
- ["B9DD",0x9986],
- ["E2C7",0x9987],
- ["C0A1",0x9988],
- ["F0A0",0x9989],
- ["E2C8",0x998A],
- ["B2F6",0x998B],
- ["F140",0x998C],
- ["E2C9",0x998D],
- ["F141",0x998E],
- ["C1F3",0x998F],
- ["E2CA",0x9990],
- ["E2CB",0x9991],
- ["C2F8",0x9992],
- ["E2CC",0x9993],
- ["E2CD",0x9994],
- ["E2CE",0x9995],
- ["CAD7",0x9996],
- ["D8B8",0x9997],
- ["D9E5",0x9998],
- ["CFE3",0x9999],
- ["F142",0x999A],
- ["F143",0x999B],
- ["F144",0x999C],
- ["F145",0x999D],
- ["F146",0x999E],
- ["F147",0x999F],
- ["F148",0x99A0],
- ["F149",0x99A1],
- ["F14A",0x99A2],
- ["F14B",0x99A3],
- ["F14C",0x99A4],
- ["F0A5",0x99A5],
- ["F14D",0x99A6],
- ["F14E",0x99A7],
- ["DCB0",0x99A8],
- ["F14F",0x99A9],
- ["F150",0x99AA],
- ["F151",0x99AB],
- ["F152",0x99AC],
- ["F153",0x99AD],
- ["F154",0x99AE],
- ["F155",0x99AF],
- ["F156",0x99B0],
- ["F157",0x99B1],
- ["F158",0x99B2],
- ["F159",0x99B3],
- ["F15A",0x99B4],
- ["F15B",0x99B5],
- ["F15C",0x99B6],
- ["F15D",0x99B7],
- ["F15E",0x99B8],
- ["F15F",0x99B9],
- ["F160",0x99BA],
- ["F161",0x99BB],
- ["F162",0x99BC],
- ["F163",0x99BD],
- ["F164",0x99BE],
- ["F165",0x99BF],
- ["F166",0x99C0],
- ["F167",0x99C1],
- ["F168",0x99C2],
- ["F169",0x99C3],
- ["F16A",0x99C4],
- ["F16B",0x99C5],
- ["F16C",0x99C6],
- ["F16D",0x99C7],
- ["F16E",0x99C8],
- ["F16F",0x99C9],
- ["F170",0x99CA],
- ["F171",0x99CB],
- ["F172",0x99CC],
- ["F173",0x99CD],
- ["F174",0x99CE],
- ["F175",0x99CF],
- ["F176",0x99D0],
- ["F177",0x99D1],
- ["F178",0x99D2],
- ["F179",0x99D3],
- ["F17A",0x99D4],
- ["F17B",0x99D5],
- ["F17C",0x99D6],
- ["F17D",0x99D7],
- ["F17E",0x99D8],
- ["F180",0x99D9],
- ["F181",0x99DA],
- ["F182",0x99DB],
- ["F183",0x99DC],
- ["F184",0x99DD],
- ["F185",0x99DE],
- ["F186",0x99DF],
- ["F187",0x99E0],
- ["F188",0x99E1],
- ["F189",0x99E2],
- ["F18A",0x99E3],
- ["F18B",0x99E4],
- ["F18C",0x99E5],
- ["F18D",0x99E6],
- ["F18E",0x99E7],
- ["F18F",0x99E8],
- ["F190",0x99E9],
- ["F191",0x99EA],
- ["F192",0x99EB],
- ["F193",0x99EC],
- ["F194",0x99ED],
- ["F195",0x99EE],
- ["F196",0x99EF],
- ["F197",0x99F0],
- ["F198",0x99F1],
- ["F199",0x99F2],
- ["F19A",0x99F3],
- ["F19B",0x99F4],
- ["F19C",0x99F5],
- ["F19D",0x99F6],
- ["F19E",0x99F7],
- ["F19F",0x99F8],
- ["F1A0",0x99F9],
- ["F240",0x99FA],
- ["F241",0x99FB],
- ["F242",0x99FC],
- ["F243",0x99FD],
- ["F244",0x99FE],
- ["F245",0x99FF],
- ["F246",0x9A00],
- ["F247",0x9A01],
- ["F248",0x9A02],
- ["F249",0x9A03],
- ["F24A",0x9A04],
- ["F24B",0x9A05],
- ["F24C",0x9A06],
- ["F24D",0x9A07],
- ["F24E",0x9A08],
- ["F24F",0x9A09],
- ["F250",0x9A0A],
- ["F251",0x9A0B],
- ["F252",0x9A0C],
- ["F253",0x9A0D],
- ["F254",0x9A0E],
- ["F255",0x9A0F],
- ["F256",0x9A10],
- ["F257",0x9A11],
- ["F258",0x9A12],
- ["F259",0x9A13],
- ["F25A",0x9A14],
- ["F25B",0x9A15],
- ["F25C",0x9A16],
- ["F25D",0x9A17],
- ["F25E",0x9A18],
- ["F25F",0x9A19],
- ["F260",0x9A1A],
- ["F261",0x9A1B],
- ["F262",0x9A1C],
- ["F263",0x9A1D],
- ["F264",0x9A1E],
- ["F265",0x9A1F],
- ["F266",0x9A20],
- ["F267",0x9A21],
- ["F268",0x9A22],
- ["F269",0x9A23],
- ["F26A",0x9A24],
- ["F26B",0x9A25],
- ["F26C",0x9A26],
- ["F26D",0x9A27],
- ["F26E",0x9A28],
- ["F26F",0x9A29],
- ["F270",0x9A2A],
- ["F271",0x9A2B],
- ["F272",0x9A2C],
- ["F273",0x9A2D],
- ["F274",0x9A2E],
- ["F275",0x9A2F],
- ["F276",0x9A30],
- ["F277",0x9A31],
- ["F278",0x9A32],
- ["F279",0x9A33],
- ["F27A",0x9A34],
- ["F27B",0x9A35],
- ["F27C",0x9A36],
- ["F27D",0x9A37],
- ["F27E",0x9A38],
- ["F280",0x9A39],
- ["F281",0x9A3A],
- ["F282",0x9A3B],
- ["F283",0x9A3C],
- ["F284",0x9A3D],
- ["F285",0x9A3E],
- ["F286",0x9A3F],
- ["F287",0x9A40],
- ["F288",0x9A41],
- ["F289",0x9A42],
- ["F28A",0x9A43],
- ["F28B",0x9A44],
- ["F28C",0x9A45],
- ["F28D",0x9A46],
- ["F28E",0x9A47],
- ["F28F",0x9A48],
- ["F290",0x9A49],
- ["F291",0x9A4A],
- ["F292",0x9A4B],
- ["F293",0x9A4C],
- ["F294",0x9A4D],
- ["F295",0x9A4E],
- ["F296",0x9A4F],
- ["F297",0x9A50],
- ["F298",0x9A51],
- ["F299",0x9A52],
- ["F29A",0x9A53],
- ["F29B",0x9A54],
- ["F29C",0x9A55],
- ["F29D",0x9A56],
- ["F29E",0x9A57],
- ["F29F",0x9A58],
- ["F2A0",0x9A59],
- ["F340",0x9A5A],
- ["F341",0x9A5B],
- ["F342",0x9A5C],
- ["F343",0x9A5D],
- ["F344",0x9A5E],
- ["F345",0x9A5F],
- ["F346",0x9A60],
- ["F347",0x9A61],
- ["F348",0x9A62],
- ["F349",0x9A63],
- ["F34A",0x9A64],
- ["F34B",0x9A65],
- ["F34C",0x9A66],
- ["F34D",0x9A67],
- ["F34E",0x9A68],
- ["F34F",0x9A69],
- ["F350",0x9A6A],
- ["F351",0x9A6B],
- ["C2ED",0x9A6C],
- ["D4A6",0x9A6D],
- ["CDD4",0x9A6E],
- ["D1B1",0x9A6F],
- ["B3DB",0x9A70],
- ["C7FD",0x9A71],
- ["F352",0x9A72],
- ["B2B5",0x9A73],
- ["C2BF",0x9A74],
- ["E6E0",0x9A75],
- ["CABB",0x9A76],
- ["E6E1",0x9A77],
- ["E6E2",0x9A78],
- ["BED4",0x9A79],
- ["E6E3",0x9A7A],
- ["D7A4",0x9A7B],
- ["CDD5",0x9A7C],
- ["E6E5",0x9A7D],
- ["BCDD",0x9A7E],
- ["E6E4",0x9A7F],
- ["E6E6",0x9A80],
- ["E6E7",0x9A81],
- ["C2EE",0x9A82],
- ["F353",0x9A83],
- ["BDBE",0x9A84],
- ["E6E8",0x9A85],
- ["C2E6",0x9A86],
- ["BAA7",0x9A87],
- ["E6E9",0x9A88],
- ["F354",0x9A89],
- ["E6EA",0x9A8A],
- ["B3D2",0x9A8B],
- ["D1E9",0x9A8C],
- ["F355",0x9A8D],
- ["F356",0x9A8E],
- ["BFA5",0x9A8F],
- ["E6EB",0x9A90],
- ["C6EF",0x9A91],
- ["E6EC",0x9A92],
- ["E6ED",0x9A93],
- ["F357",0x9A94],
- ["F358",0x9A95],
- ["E6EE",0x9A96],
- ["C6AD",0x9A97],
- ["E6EF",0x9A98],
- ["F359",0x9A99],
- ["C9A7",0x9A9A],
- ["E6F0",0x9A9B],
- ["E6F1",0x9A9C],
- ["E6F2",0x9A9D],
- ["E5B9",0x9A9E],
- ["E6F3",0x9A9F],
- ["E6F4",0x9AA0],
- ["C2E2",0x9AA1],
- ["E6F5",0x9AA2],
- ["E6F6",0x9AA3],
- ["D6E8",0x9AA4],
- ["E6F7",0x9AA5],
- ["F35A",0x9AA6],
- ["E6F8",0x9AA7],
- ["B9C7",0x9AA8],
- ["F35B",0x9AA9],
- ["F35C",0x9AAA],
- ["F35D",0x9AAB],
- ["F35E",0x9AAC],
- ["F35F",0x9AAD],
- ["F360",0x9AAE],
- ["F361",0x9AAF],
- ["F7BB",0x9AB0],
- ["F7BA",0x9AB1],
- ["F362",0x9AB2],
- ["F363",0x9AB3],
- ["F364",0x9AB4],
- ["F365",0x9AB5],
- ["F7BE",0x9AB6],
- ["F7BC",0x9AB7],
- ["BAA1",0x9AB8],
- ["F366",0x9AB9],
- ["F7BF",0x9ABA],
- ["F367",0x9ABB],
- ["F7C0",0x9ABC],
- ["F368",0x9ABD],
- ["F369",0x9ABE],
- ["F36A",0x9ABF],
- ["F7C2",0x9AC0],
- ["F7C1",0x9AC1],
- ["F7C4",0x9AC2],
- ["F36B",0x9AC3],
- ["F36C",0x9AC4],
- ["F7C3",0x9AC5],
- ["F36D",0x9AC6],
- ["F36E",0x9AC7],
- ["F36F",0x9AC8],
- ["F370",0x9AC9],
- ["F371",0x9ACA],
- ["F7C5",0x9ACB],
- ["F7C6",0x9ACC],
- ["F372",0x9ACD],
- ["F373",0x9ACE],
- ["F374",0x9ACF],
- ["F375",0x9AD0],
- ["F7C7",0x9AD1],
- ["F376",0x9AD2],
- ["CBE8",0x9AD3],
- ["F377",0x9AD4],
- ["F378",0x9AD5],
- ["F379",0x9AD6],
- ["F37A",0x9AD7],
- ["B8DF",0x9AD8],
- ["F37B",0x9AD9],
- ["F37C",0x9ADA],
- ["F37D",0x9ADB],
- ["F37E",0x9ADC],
- ["F380",0x9ADD],
- ["F381",0x9ADE],
- ["F7D4",0x9ADF],
- ["F382",0x9AE0],
- ["F7D5",0x9AE1],
- ["F383",0x9AE2],
- ["F384",0x9AE3],
- ["F385",0x9AE4],
- ["F386",0x9AE5],
- ["F7D6",0x9AE6],
- ["F387",0x9AE7],
- ["F388",0x9AE8],
- ["F389",0x9AE9],
- ["F38A",0x9AEA],
- ["F7D8",0x9AEB],
- ["F38B",0x9AEC],
- ["F7DA",0x9AED],
- ["F38C",0x9AEE],
- ["F7D7",0x9AEF],
- ["F38D",0x9AF0],
- ["F38E",0x9AF1],
- ["F38F",0x9AF2],
- ["F390",0x9AF3],
- ["F391",0x9AF4],
- ["F392",0x9AF5],
- ["F393",0x9AF6],
- ["F394",0x9AF7],
- ["F395",0x9AF8],
- ["F7DB",0x9AF9],
- ["F396",0x9AFA],
- ["F7D9",0x9AFB],
- ["F397",0x9AFC],
- ["F398",0x9AFD],
- ["F399",0x9AFE],
- ["F39A",0x9AFF],
- ["F39B",0x9B00],
- ["F39C",0x9B01],
- ["F39D",0x9B02],
- ["D7D7",0x9B03],
- ["F39E",0x9B04],
- ["F39F",0x9B05],
- ["F3A0",0x9B06],
- ["F440",0x9B07],
- ["F7DC",0x9B08],
- ["F441",0x9B09],
- ["F442",0x9B0A],
- ["F443",0x9B0B],
- ["F444",0x9B0C],
- ["F445",0x9B0D],
- ["F446",0x9B0E],
- ["F7DD",0x9B0F],
- ["F447",0x9B10],
- ["F448",0x9B11],
- ["F449",0x9B12],
- ["F7DE",0x9B13],
- ["F44A",0x9B14],
- ["F44B",0x9B15],
- ["F44C",0x9B16],
- ["F44D",0x9B17],
- ["F44E",0x9B18],
- ["F44F",0x9B19],
- ["F450",0x9B1A],
- ["F451",0x9B1B],
- ["F452",0x9B1C],
- ["F453",0x9B1D],
- ["F454",0x9B1E],
- ["F7DF",0x9B1F],
- ["F455",0x9B20],
- ["F456",0x9B21],
- ["F457",0x9B22],
- ["F7E0",0x9B23],
- ["F458",0x9B24],
- ["F459",0x9B25],
- ["F45A",0x9B26],
- ["F45B",0x9B27],
- ["F45C",0x9B28],
- ["F45D",0x9B29],
- ["F45E",0x9B2A],
- ["F45F",0x9B2B],
- ["F460",0x9B2C],
- ["F461",0x9B2D],
- ["F462",0x9B2E],
- ["DBCB",0x9B2F],
- ["F463",0x9B30],
- ["F464",0x9B31],
- ["D8AA",0x9B32],
- ["F465",0x9B33],
- ["F466",0x9B34],
- ["F467",0x9B35],
- ["F468",0x9B36],
- ["F469",0x9B37],
- ["F46A",0x9B38],
- ["F46B",0x9B39],
- ["F46C",0x9B3A],
- ["E5F7",0x9B3B],
- ["B9ED",0x9B3C],
- ["F46D",0x9B3D],
- ["F46E",0x9B3E],
- ["F46F",0x9B3F],
- ["F470",0x9B40],
- ["BFFD",0x9B41],
- ["BBEA",0x9B42],
- ["F7C9",0x9B43],
- ["C6C7",0x9B44],
- ["F7C8",0x9B45],
- ["F471",0x9B46],
- ["F7CA",0x9B47],
- ["F7CC",0x9B48],
- ["F7CB",0x9B49],
- ["F472",0x9B4A],
- ["F473",0x9B4B],
- ["F474",0x9B4C],
- ["F7CD",0x9B4D],
- ["F475",0x9B4E],
- ["CEBA",0x9B4F],
- ["F476",0x9B50],
- ["F7CE",0x9B51],
- ["F477",0x9B52],
- ["F478",0x9B53],
- ["C4A7",0x9B54],
- ["F479",0x9B55],
- ["F47A",0x9B56],
- ["F47B",0x9B57],
- ["F47C",0x9B58],
- ["F47D",0x9B59],
- ["F47E",0x9B5A],
- ["F480",0x9B5B],
- ["F481",0x9B5C],
- ["F482",0x9B5D],
- ["F483",0x9B5E],
- ["F484",0x9B5F],
- ["F485",0x9B60],
- ["F486",0x9B61],
- ["F487",0x9B62],
- ["F488",0x9B63],
- ["F489",0x9B64],
- ["F48A",0x9B65],
- ["F48B",0x9B66],
- ["F48C",0x9B67],
- ["F48D",0x9B68],
- ["F48E",0x9B69],
- ["F48F",0x9B6A],
- ["F490",0x9B6B],
- ["F491",0x9B6C],
- ["F492",0x9B6D],
- ["F493",0x9B6E],
- ["F494",0x9B6F],
- ["F495",0x9B70],
- ["F496",0x9B71],
- ["F497",0x9B72],
- ["F498",0x9B73],
- ["F499",0x9B74],
- ["F49A",0x9B75],
- ["F49B",0x9B76],
- ["F49C",0x9B77],
- ["F49D",0x9B78],
- ["F49E",0x9B79],
- ["F49F",0x9B7A],
- ["F4A0",0x9B7B],
- ["F540",0x9B7C],
- ["F541",0x9B7D],
- ["F542",0x9B7E],
- ["F543",0x9B7F],
- ["F544",0x9B80],
- ["F545",0x9B81],
- ["F546",0x9B82],
- ["F547",0x9B83],
- ["F548",0x9B84],
- ["F549",0x9B85],
- ["F54A",0x9B86],
- ["F54B",0x9B87],
- ["F54C",0x9B88],
- ["F54D",0x9B89],
- ["F54E",0x9B8A],
- ["F54F",0x9B8B],
- ["F550",0x9B8C],
- ["F551",0x9B8D],
- ["F552",0x9B8E],
- ["F553",0x9B8F],
- ["F554",0x9B90],
- ["F555",0x9B91],
- ["F556",0x9B92],
- ["F557",0x9B93],
- ["F558",0x9B94],
- ["F559",0x9B95],
- ["F55A",0x9B96],
- ["F55B",0x9B97],
- ["F55C",0x9B98],
- ["F55D",0x9B99],
- ["F55E",0x9B9A],
- ["F55F",0x9B9B],
- ["F560",0x9B9C],
- ["F561",0x9B9D],
- ["F562",0x9B9E],
- ["F563",0x9B9F],
- ["F564",0x9BA0],
- ["F565",0x9BA1],
- ["F566",0x9BA2],
- ["F567",0x9BA3],
- ["F568",0x9BA4],
- ["F569",0x9BA5],
- ["F56A",0x9BA6],
- ["F56B",0x9BA7],
- ["F56C",0x9BA8],
- ["F56D",0x9BA9],
- ["F56E",0x9BAA],
- ["F56F",0x9BAB],
- ["F570",0x9BAC],
- ["F571",0x9BAD],
- ["F572",0x9BAE],
- ["F573",0x9BAF],
- ["F574",0x9BB0],
- ["F575",0x9BB1],
- ["F576",0x9BB2],
- ["F577",0x9BB3],
- ["F578",0x9BB4],
- ["F579",0x9BB5],
- ["F57A",0x9BB6],
- ["F57B",0x9BB7],
- ["F57C",0x9BB8],
- ["F57D",0x9BB9],
- ["F57E",0x9BBA],
- ["F580",0x9BBB],
- ["F581",0x9BBC],
- ["F582",0x9BBD],
- ["F583",0x9BBE],
- ["F584",0x9BBF],
- ["F585",0x9BC0],
- ["F586",0x9BC1],
- ["F587",0x9BC2],
- ["F588",0x9BC3],
- ["F589",0x9BC4],
- ["F58A",0x9BC5],
- ["F58B",0x9BC6],
- ["F58C",0x9BC7],
- ["F58D",0x9BC8],
- ["F58E",0x9BC9],
- ["F58F",0x9BCA],
- ["F590",0x9BCB],
- ["F591",0x9BCC],
- ["F592",0x9BCD],
- ["F593",0x9BCE],
- ["F594",0x9BCF],
- ["F595",0x9BD0],
- ["F596",0x9BD1],
- ["F597",0x9BD2],
- ["F598",0x9BD3],
- ["F599",0x9BD4],
- ["F59A",0x9BD5],
- ["F59B",0x9BD6],
- ["F59C",0x9BD7],
- ["F59D",0x9BD8],
- ["F59E",0x9BD9],
- ["F59F",0x9BDA],
- ["F5A0",0x9BDB],
- ["F640",0x9BDC],
- ["F641",0x9BDD],
- ["F642",0x9BDE],
- ["F643",0x9BDF],
- ["F644",0x9BE0],
- ["F645",0x9BE1],
- ["F646",0x9BE2],
- ["F647",0x9BE3],
- ["F648",0x9BE4],
- ["F649",0x9BE5],
- ["F64A",0x9BE6],
- ["F64B",0x9BE7],
- ["F64C",0x9BE8],
- ["F64D",0x9BE9],
- ["F64E",0x9BEA],
- ["F64F",0x9BEB],
- ["F650",0x9BEC],
- ["F651",0x9BED],
- ["F652",0x9BEE],
- ["F653",0x9BEF],
- ["F654",0x9BF0],
- ["F655",0x9BF1],
- ["F656",0x9BF2],
- ["F657",0x9BF3],
- ["F658",0x9BF4],
- ["F659",0x9BF5],
- ["F65A",0x9BF6],
- ["F65B",0x9BF7],
- ["F65C",0x9BF8],
- ["F65D",0x9BF9],
- ["F65E",0x9BFA],
- ["F65F",0x9BFB],
- ["F660",0x9BFC],
- ["F661",0x9BFD],
- ["F662",0x9BFE],
- ["F663",0x9BFF],
- ["F664",0x9C00],
- ["F665",0x9C01],
- ["F666",0x9C02],
- ["F667",0x9C03],
- ["F668",0x9C04],
- ["F669",0x9C05],
- ["F66A",0x9C06],
- ["F66B",0x9C07],
- ["F66C",0x9C08],
- ["F66D",0x9C09],
- ["F66E",0x9C0A],
- ["F66F",0x9C0B],
- ["F670",0x9C0C],
- ["F671",0x9C0D],
- ["F672",0x9C0E],
- ["F673",0x9C0F],
- ["F674",0x9C10],
- ["F675",0x9C11],
- ["F676",0x9C12],
- ["F677",0x9C13],
- ["F678",0x9C14],
- ["F679",0x9C15],
- ["F67A",0x9C16],
- ["F67B",0x9C17],
- ["F67C",0x9C18],
- ["F67D",0x9C19],
- ["F67E",0x9C1A],
- ["F680",0x9C1B],
- ["F681",0x9C1C],
- ["F682",0x9C1D],
- ["F683",0x9C1E],
- ["F684",0x9C1F],
- ["F685",0x9C20],
- ["F686",0x9C21],
- ["F687",0x9C22],
- ["F688",0x9C23],
- ["F689",0x9C24],
- ["F68A",0x9C25],
- ["F68B",0x9C26],
- ["F68C",0x9C27],
- ["F68D",0x9C28],
- ["F68E",0x9C29],
- ["F68F",0x9C2A],
- ["F690",0x9C2B],
- ["F691",0x9C2C],
- ["F692",0x9C2D],
- ["F693",0x9C2E],
- ["F694",0x9C2F],
- ["F695",0x9C30],
- ["F696",0x9C31],
- ["F697",0x9C32],
- ["F698",0x9C33],
- ["F699",0x9C34],
- ["F69A",0x9C35],
- ["F69B",0x9C36],
- ["F69C",0x9C37],
- ["F69D",0x9C38],
- ["F69E",0x9C39],
- ["F69F",0x9C3A],
- ["F6A0",0x9C3B],
- ["F740",0x9C3C],
- ["F741",0x9C3D],
- ["F742",0x9C3E],
- ["F743",0x9C3F],
- ["F744",0x9C40],
- ["F745",0x9C41],
- ["F746",0x9C42],
- ["F747",0x9C43],
- ["F748",0x9C44],
- ["F749",0x9C45],
- ["F74A",0x9C46],
- ["F74B",0x9C47],
- ["F74C",0x9C48],
- ["F74D",0x9C49],
- ["F74E",0x9C4A],
- ["F74F",0x9C4B],
- ["F750",0x9C4C],
- ["F751",0x9C4D],
- ["F752",0x9C4E],
- ["F753",0x9C4F],
- ["F754",0x9C50],
- ["F755",0x9C51],
- ["F756",0x9C52],
- ["F757",0x9C53],
- ["F758",0x9C54],
- ["F759",0x9C55],
- ["F75A",0x9C56],
- ["F75B",0x9C57],
- ["F75C",0x9C58],
- ["F75D",0x9C59],
- ["F75E",0x9C5A],
- ["F75F",0x9C5B],
- ["F760",0x9C5C],
- ["F761",0x9C5D],
- ["F762",0x9C5E],
- ["F763",0x9C5F],
- ["F764",0x9C60],
- ["F765",0x9C61],
- ["F766",0x9C62],
- ["F767",0x9C63],
- ["F768",0x9C64],
- ["F769",0x9C65],
- ["F76A",0x9C66],
- ["F76B",0x9C67],
- ["F76C",0x9C68],
- ["F76D",0x9C69],
- ["F76E",0x9C6A],
- ["F76F",0x9C6B],
- ["F770",0x9C6C],
- ["F771",0x9C6D],
- ["F772",0x9C6E],
- ["F773",0x9C6F],
- ["F774",0x9C70],
- ["F775",0x9C71],
- ["F776",0x9C72],
- ["F777",0x9C73],
- ["F778",0x9C74],
- ["F779",0x9C75],
- ["F77A",0x9C76],
- ["F77B",0x9C77],
- ["F77C",0x9C78],
- ["F77D",0x9C79],
- ["F77E",0x9C7A],
- ["F780",0x9C7B],
- ["D3E3",0x9C7C],
- ["F781",0x9C7D],
- ["F782",0x9C7E],
- ["F6CF",0x9C7F],
- ["F783",0x9C80],
- ["C2B3",0x9C81],
- ["F6D0",0x9C82],
- ["F784",0x9C83],
- ["F785",0x9C84],
- ["F6D1",0x9C85],
- ["F6D2",0x9C86],
- ["F6D3",0x9C87],
- ["F6D4",0x9C88],
- ["F786",0x9C89],
- ["F787",0x9C8A],
- ["F6D6",0x9C8B],
- ["F788",0x9C8C],
- ["B1AB",0x9C8D],
- ["F6D7",0x9C8E],
- ["F789",0x9C8F],
- ["F6D8",0x9C90],
- ["F6D9",0x9C91],
- ["F6DA",0x9C92],
- ["F78A",0x9C93],
- ["F6DB",0x9C94],
- ["F6DC",0x9C95],
- ["F78B",0x9C96],
- ["F78C",0x9C97],
- ["F78D",0x9C98],
- ["F78E",0x9C99],
- ["F6DD",0x9C9A],
- ["F6DE",0x9C9B],
- ["CFCA",0x9C9C],
- ["F78F",0x9C9D],
- ["F6DF",0x9C9E],
- ["F6E0",0x9C9F],
- ["F6E1",0x9CA0],
- ["F6E2",0x9CA1],
- ["F6E3",0x9CA2],
- ["F6E4",0x9CA3],
- ["C0F0",0x9CA4],
- ["F6E5",0x9CA5],
- ["F6E6",0x9CA6],
- ["F6E7",0x9CA7],
- ["F6E8",0x9CA8],
- ["F6E9",0x9CA9],
- ["F790",0x9CAA],
- ["F6EA",0x9CAB],
- ["F791",0x9CAC],
- ["F6EB",0x9CAD],
- ["F6EC",0x9CAE],
- ["F792",0x9CAF],
- ["F6ED",0x9CB0],
- ["F6EE",0x9CB1],
- ["F6EF",0x9CB2],
- ["F6F0",0x9CB3],
- ["F6F1",0x9CB4],
- ["F6F2",0x9CB5],
- ["F6F3",0x9CB6],
- ["F6F4",0x9CB7],
- ["BEA8",0x9CB8],
- ["F793",0x9CB9],
- ["F6F5",0x9CBA],
- ["F6F6",0x9CBB],
- ["F6F7",0x9CBC],
- ["F6F8",0x9CBD],
- ["F794",0x9CBE],
- ["F795",0x9CBF],
- ["F796",0x9CC0],
- ["F797",0x9CC1],
- ["F798",0x9CC2],
- ["C8FA",0x9CC3],
- ["F6F9",0x9CC4],
- ["F6FA",0x9CC5],
- ["F6FB",0x9CC6],
- ["F6FC",0x9CC7],
- ["F799",0x9CC8],
- ["F79A",0x9CC9],
- ["F6FD",0x9CCA],
- ["F6FE",0x9CCB],
- ["F7A1",0x9CCC],
- ["F7A2",0x9CCD],
- ["F7A3",0x9CCE],
- ["F7A4",0x9CCF],
- ["F7A5",0x9CD0],
- ["F79B",0x9CD1],
- ["F79C",0x9CD2],
- ["F7A6",0x9CD3],
- ["F7A7",0x9CD4],
- ["F7A8",0x9CD5],
- ["B1EE",0x9CD6],
- ["F7A9",0x9CD7],
- ["F7AA",0x9CD8],
- ["F7AB",0x9CD9],
- ["F79D",0x9CDA],
- ["F79E",0x9CDB],
- ["F7AC",0x9CDC],
- ["F7AD",0x9CDD],
- ["C1DB",0x9CDE],
- ["F7AE",0x9CDF],
- ["F79F",0x9CE0],
- ["F7A0",0x9CE1],
- ["F7AF",0x9CE2],
- ["F840",0x9CE3],
- ["F841",0x9CE4],
- ["F842",0x9CE5],
- ["F843",0x9CE6],
- ["F844",0x9CE7],
- ["F845",0x9CE8],
- ["F846",0x9CE9],
- ["F847",0x9CEA],
- ["F848",0x9CEB],
- ["F849",0x9CEC],
- ["F84A",0x9CED],
- ["F84B",0x9CEE],
- ["F84C",0x9CEF],
- ["F84D",0x9CF0],
- ["F84E",0x9CF1],
- ["F84F",0x9CF2],
- ["F850",0x9CF3],
- ["F851",0x9CF4],
- ["F852",0x9CF5],
- ["F853",0x9CF6],
- ["F854",0x9CF7],
- ["F855",0x9CF8],
- ["F856",0x9CF9],
- ["F857",0x9CFA],
- ["F858",0x9CFB],
- ["F859",0x9CFC],
- ["F85A",0x9CFD],
- ["F85B",0x9CFE],
- ["F85C",0x9CFF],
- ["F85D",0x9D00],
- ["F85E",0x9D01],
- ["F85F",0x9D02],
- ["F860",0x9D03],
- ["F861",0x9D04],
- ["F862",0x9D05],
- ["F863",0x9D06],
- ["F864",0x9D07],
- ["F865",0x9D08],
- ["F866",0x9D09],
- ["F867",0x9D0A],
- ["F868",0x9D0B],
- ["F869",0x9D0C],
- ["F86A",0x9D0D],
- ["F86B",0x9D0E],
- ["F86C",0x9D0F],
- ["F86D",0x9D10],
- ["F86E",0x9D11],
- ["F86F",0x9D12],
- ["F870",0x9D13],
- ["F871",0x9D14],
- ["F872",0x9D15],
- ["F873",0x9D16],
- ["F874",0x9D17],
- ["F875",0x9D18],
- ["F876",0x9D19],
- ["F877",0x9D1A],
- ["F878",0x9D1B],
- ["F879",0x9D1C],
- ["F87A",0x9D1D],
- ["F87B",0x9D1E],
- ["F87C",0x9D1F],
- ["F87D",0x9D20],
- ["F87E",0x9D21],
- ["F880",0x9D22],
- ["F881",0x9D23],
- ["F882",0x9D24],
- ["F883",0x9D25],
- ["F884",0x9D26],
- ["F885",0x9D27],
- ["F886",0x9D28],
- ["F887",0x9D29],
- ["F888",0x9D2A],
- ["F889",0x9D2B],
- ["F88A",0x9D2C],
- ["F88B",0x9D2D],
- ["F88C",0x9D2E],
- ["F88D",0x9D2F],
- ["F88E",0x9D30],
- ["F88F",0x9D31],
- ["F890",0x9D32],
- ["F891",0x9D33],
- ["F892",0x9D34],
- ["F893",0x9D35],
- ["F894",0x9D36],
- ["F895",0x9D37],
- ["F896",0x9D38],
- ["F897",0x9D39],
- ["F898",0x9D3A],
- ["F899",0x9D3B],
- ["F89A",0x9D3C],
- ["F89B",0x9D3D],
- ["F89C",0x9D3E],
- ["F89D",0x9D3F],
- ["F89E",0x9D40],
- ["F89F",0x9D41],
- ["F8A0",0x9D42],
- ["F940",0x9D43],
- ["F941",0x9D44],
- ["F942",0x9D45],
- ["F943",0x9D46],
- ["F944",0x9D47],
- ["F945",0x9D48],
- ["F946",0x9D49],
- ["F947",0x9D4A],
- ["F948",0x9D4B],
- ["F949",0x9D4C],
- ["F94A",0x9D4D],
- ["F94B",0x9D4E],
- ["F94C",0x9D4F],
- ["F94D",0x9D50],
- ["F94E",0x9D51],
- ["F94F",0x9D52],
- ["F950",0x9D53],
- ["F951",0x9D54],
- ["F952",0x9D55],
- ["F953",0x9D56],
- ["F954",0x9D57],
- ["F955",0x9D58],
- ["F956",0x9D59],
- ["F957",0x9D5A],
- ["F958",0x9D5B],
- ["F959",0x9D5C],
- ["F95A",0x9D5D],
- ["F95B",0x9D5E],
- ["F95C",0x9D5F],
- ["F95D",0x9D60],
- ["F95E",0x9D61],
- ["F95F",0x9D62],
- ["F960",0x9D63],
- ["F961",0x9D64],
- ["F962",0x9D65],
- ["F963",0x9D66],
- ["F964",0x9D67],
- ["F965",0x9D68],
- ["F966",0x9D69],
- ["F967",0x9D6A],
- ["F968",0x9D6B],
- ["F969",0x9D6C],
- ["F96A",0x9D6D],
- ["F96B",0x9D6E],
- ["F96C",0x9D6F],
- ["F96D",0x9D70],
- ["F96E",0x9D71],
- ["F96F",0x9D72],
- ["F970",0x9D73],
- ["F971",0x9D74],
- ["F972",0x9D75],
- ["F973",0x9D76],
- ["F974",0x9D77],
- ["F975",0x9D78],
- ["F976",0x9D79],
- ["F977",0x9D7A],
- ["F978",0x9D7B],
- ["F979",0x9D7C],
- ["F97A",0x9D7D],
- ["F97B",0x9D7E],
- ["F97C",0x9D7F],
- ["F97D",0x9D80],
- ["F97E",0x9D81],
- ["F980",0x9D82],
- ["F981",0x9D83],
- ["F982",0x9D84],
- ["F983",0x9D85],
- ["F984",0x9D86],
- ["F985",0x9D87],
- ["F986",0x9D88],
- ["F987",0x9D89],
- ["F988",0x9D8A],
- ["F989",0x9D8B],
- ["F98A",0x9D8C],
- ["F98B",0x9D8D],
- ["F98C",0x9D8E],
- ["F98D",0x9D8F],
- ["F98E",0x9D90],
- ["F98F",0x9D91],
- ["F990",0x9D92],
- ["F991",0x9D93],
- ["F992",0x9D94],
- ["F993",0x9D95],
- ["F994",0x9D96],
- ["F995",0x9D97],
- ["F996",0x9D98],
- ["F997",0x9D99],
- ["F998",0x9D9A],
- ["F999",0x9D9B],
- ["F99A",0x9D9C],
- ["F99B",0x9D9D],
- ["F99C",0x9D9E],
- ["F99D",0x9D9F],
- ["F99E",0x9DA0],
- ["F99F",0x9DA1],
- ["F9A0",0x9DA2],
- ["FA40",0x9DA3],
- ["FA41",0x9DA4],
- ["FA42",0x9DA5],
- ["FA43",0x9DA6],
- ["FA44",0x9DA7],
- ["FA45",0x9DA8],
- ["FA46",0x9DA9],
- ["FA47",0x9DAA],
- ["FA48",0x9DAB],
- ["FA49",0x9DAC],
- ["FA4A",0x9DAD],
- ["FA4B",0x9DAE],
- ["FA4C",0x9DAF],
- ["FA4D",0x9DB0],
- ["FA4E",0x9DB1],
- ["FA4F",0x9DB2],
- ["FA50",0x9DB3],
- ["FA51",0x9DB4],
- ["FA52",0x9DB5],
- ["FA53",0x9DB6],
- ["FA54",0x9DB7],
- ["FA55",0x9DB8],
- ["FA56",0x9DB9],
- ["FA57",0x9DBA],
- ["FA58",0x9DBB],
- ["FA59",0x9DBC],
- ["FA5A",0x9DBD],
- ["FA5B",0x9DBE],
- ["FA5C",0x9DBF],
- ["FA5D",0x9DC0],
- ["FA5E",0x9DC1],
- ["FA5F",0x9DC2],
- ["FA60",0x9DC3],
- ["FA61",0x9DC4],
- ["FA62",0x9DC5],
- ["FA63",0x9DC6],
- ["FA64",0x9DC7],
- ["FA65",0x9DC8],
- ["FA66",0x9DC9],
- ["FA67",0x9DCA],
- ["FA68",0x9DCB],
- ["FA69",0x9DCC],
- ["FA6A",0x9DCD],
- ["FA6B",0x9DCE],
- ["FA6C",0x9DCF],
- ["FA6D",0x9DD0],
- ["FA6E",0x9DD1],
- ["FA6F",0x9DD2],
- ["FA70",0x9DD3],
- ["FA71",0x9DD4],
- ["FA72",0x9DD5],
- ["FA73",0x9DD6],
- ["FA74",0x9DD7],
- ["FA75",0x9DD8],
- ["FA76",0x9DD9],
- ["FA77",0x9DDA],
- ["FA78",0x9DDB],
- ["FA79",0x9DDC],
- ["FA7A",0x9DDD],
- ["FA7B",0x9DDE],
- ["FA7C",0x9DDF],
- ["FA7D",0x9DE0],
- ["FA7E",0x9DE1],
- ["FA80",0x9DE2],
- ["FA81",0x9DE3],
- ["FA82",0x9DE4],
- ["FA83",0x9DE5],
- ["FA84",0x9DE6],
- ["FA85",0x9DE7],
- ["FA86",0x9DE8],
- ["FA87",0x9DE9],
- ["FA88",0x9DEA],
- ["FA89",0x9DEB],
- ["FA8A",0x9DEC],
- ["FA8B",0x9DED],
- ["FA8C",0x9DEE],
- ["FA8D",0x9DEF],
- ["FA8E",0x9DF0],
- ["FA8F",0x9DF1],
- ["FA90",0x9DF2],
- ["FA91",0x9DF3],
- ["FA92",0x9DF4],
- ["FA93",0x9DF5],
- ["FA94",0x9DF6],
- ["FA95",0x9DF7],
- ["FA96",0x9DF8],
- ["FA97",0x9DF9],
- ["FA98",0x9DFA],
- ["FA99",0x9DFB],
- ["FA9A",0x9DFC],
- ["FA9B",0x9DFD],
- ["FA9C",0x9DFE],
- ["FA9D",0x9DFF],
- ["FA9E",0x9E00],
- ["FA9F",0x9E01],
- ["FAA0",0x9E02],
- ["FB40",0x9E03],
- ["FB41",0x9E04],
- ["FB42",0x9E05],
- ["FB43",0x9E06],
- ["FB44",0x9E07],
- ["FB45",0x9E08],
- ["FB46",0x9E09],
- ["FB47",0x9E0A],
- ["FB48",0x9E0B],
- ["FB49",0x9E0C],
- ["FB4A",0x9E0D],
- ["FB4B",0x9E0E],
- ["FB4C",0x9E0F],
- ["FB4D",0x9E10],
- ["FB4E",0x9E11],
- ["FB4F",0x9E12],
- ["FB50",0x9E13],
- ["FB51",0x9E14],
- ["FB52",0x9E15],
- ["FB53",0x9E16],
- ["FB54",0x9E17],
- ["FB55",0x9E18],
- ["FB56",0x9E19],
- ["FB57",0x9E1A],
- ["FB58",0x9E1B],
- ["FB59",0x9E1C],
- ["FB5A",0x9E1D],
- ["FB5B",0x9E1E],
- ["C4F1",0x9E1F],
- ["F0AF",0x9E20],
- ["BCA6",0x9E21],
- ["F0B0",0x9E22],
- ["C3F9",0x9E23],
- ["FB5C",0x9E24],
- ["C5B8",0x9E25],
- ["D1BB",0x9E26],
- ["FB5D",0x9E27],
- ["F0B1",0x9E28],
- ["F0B2",0x9E29],
- ["F0B3",0x9E2A],
- ["F0B4",0x9E2B],
- ["F0B5",0x9E2C],
- ["D1BC",0x9E2D],
- ["FB5E",0x9E2E],
- ["D1EC",0x9E2F],
- ["FB5F",0x9E30],
- ["F0B7",0x9E31],
- ["F0B6",0x9E32],
- ["D4A7",0x9E33],
- ["FB60",0x9E34],
- ["CDD2",0x9E35],
- ["F0B8",0x9E36],
- ["F0BA",0x9E37],
- ["F0B9",0x9E38],
- ["F0BB",0x9E39],
- ["F0BC",0x9E3A],
- ["FB61",0x9E3B],
- ["FB62",0x9E3C],
- ["B8EB",0x9E3D],
- ["F0BD",0x9E3E],
- ["BAE8",0x9E3F],
- ["FB63",0x9E40],
- ["F0BE",0x9E41],
- ["F0BF",0x9E42],
- ["BEE9",0x9E43],
- ["F0C0",0x9E44],
- ["B6EC",0x9E45],
- ["F0C1",0x9E46],
- ["F0C2",0x9E47],
- ["F0C3",0x9E48],
- ["F0C4",0x9E49],
- ["C8B5",0x9E4A],
- ["F0C5",0x9E4B],
- ["F0C6",0x9E4C],
- ["FB64",0x9E4D],
- ["F0C7",0x9E4E],
- ["C5F4",0x9E4F],
- ["FB65",0x9E50],
- ["F0C8",0x9E51],
- ["FB66",0x9E52],
- ["FB67",0x9E53],
- ["FB68",0x9E54],
- ["F0C9",0x9E55],
- ["FB69",0x9E56],
- ["F0CA",0x9E57],
- ["F7BD",0x9E58],
- ["FB6A",0x9E59],
- ["F0CB",0x9E5A],
- ["F0CC",0x9E5B],
- ["F0CD",0x9E5C],
- ["FB6B",0x9E5D],
- ["F0CE",0x9E5E],
- ["FB6C",0x9E5F],
- ["FB6D",0x9E60],
- ["FB6E",0x9E61],
- ["FB6F",0x9E62],
- ["F0CF",0x9E63],
- ["BAD7",0x9E64],
- ["FB70",0x9E65],
- ["F0D0",0x9E66],
- ["F0D1",0x9E67],
- ["F0D2",0x9E68],
- ["F0D3",0x9E69],
- ["F0D4",0x9E6A],
- ["F0D5",0x9E6B],
- ["F0D6",0x9E6C],
- ["F0D8",0x9E6D],
- ["FB71",0x9E6E],
- ["FB72",0x9E6F],
- ["D3A5",0x9E70],
- ["F0D7",0x9E71],
- ["FB73",0x9E72],
- ["F0D9",0x9E73],
- ["FB74",0x9E74],
- ["FB75",0x9E75],
- ["FB76",0x9E76],
- ["FB77",0x9E77],
- ["FB78",0x9E78],
- ["FB79",0x9E79],
- ["FB7A",0x9E7A],
- ["FB7B",0x9E7B],
- ["FB7C",0x9E7C],
- ["FB7D",0x9E7D],
- ["F5BA",0x9E7E],
- ["C2B9",0x9E7F],
- ["FB7E",0x9E80],
- ["FB80",0x9E81],
- ["F7E4",0x9E82],
- ["FB81",0x9E83],
- ["FB82",0x9E84],
- ["FB83",0x9E85],
- ["FB84",0x9E86],
- ["F7E5",0x9E87],
- ["F7E6",0x9E88],
- ["FB85",0x9E89],
- ["FB86",0x9E8A],
- ["F7E7",0x9E8B],
- ["FB87",0x9E8C],
- ["FB88",0x9E8D],
- ["FB89",0x9E8E],
- ["FB8A",0x9E8F],
- ["FB8B",0x9E90],
- ["FB8C",0x9E91],
- ["F7E8",0x9E92],
- ["C2B4",0x9E93],
- ["FB8D",0x9E94],
- ["FB8E",0x9E95],
- ["FB8F",0x9E96],
- ["FB90",0x9E97],
- ["FB91",0x9E98],
- ["FB92",0x9E99],
- ["FB93",0x9E9A],
- ["FB94",0x9E9B],
- ["FB95",0x9E9C],
- ["F7EA",0x9E9D],
- ["FB96",0x9E9E],
- ["F7EB",0x9E9F],
- ["FB97",0x9EA0],
- ["FB98",0x9EA1],
- ["FB99",0x9EA2],
- ["FB9A",0x9EA3],
- ["FB9B",0x9EA4],
- ["FB9C",0x9EA5],
- ["C2F3",0x9EA6],
- ["FB9D",0x9EA7],
- ["FB9E",0x9EA8],
- ["FB9F",0x9EA9],
- ["FBA0",0x9EAA],
- ["FC40",0x9EAB],
- ["FC41",0x9EAC],
- ["FC42",0x9EAD],
- ["FC43",0x9EAE],
- ["FC44",0x9EAF],
- ["FC45",0x9EB0],
- ["FC46",0x9EB1],
- ["FC47",0x9EB2],
- ["FC48",0x9EB3],
- ["F4F0",0x9EB4],
- ["FC49",0x9EB5],
- ["FC4A",0x9EB6],
- ["FC4B",0x9EB7],
- ["F4EF",0x9EB8],
- ["FC4C",0x9EB9],
- ["FC4D",0x9EBA],
- ["C2E9",0x9EBB],
- ["FC4E",0x9EBC],
- ["F7E1",0x9EBD],
- ["F7E2",0x9EBE],
- ["FC4F",0x9EBF],
- ["FC50",0x9EC0],
- ["FC51",0x9EC1],
- ["FC52",0x9EC2],
- ["FC53",0x9EC3],
- ["BBC6",0x9EC4],
- ["FC54",0x9EC5],
- ["FC55",0x9EC6],
- ["FC56",0x9EC7],
- ["FC57",0x9EC8],
- ["D9E4",0x9EC9],
- ["FC58",0x9ECA],
- ["FC59",0x9ECB],
- ["FC5A",0x9ECC],
- ["CAF2",0x9ECD],
- ["C0E8",0x9ECE],
- ["F0A4",0x9ECF],
- ["FC5B",0x9ED0],
- ["BADA",0x9ED1],
- ["FC5C",0x9ED2],
- ["FC5D",0x9ED3],
- ["C7AD",0x9ED4],
- ["FC5E",0x9ED5],
- ["FC5F",0x9ED6],
- ["FC60",0x9ED7],
- ["C4AC",0x9ED8],
- ["FC61",0x9ED9],
- ["FC62",0x9EDA],
- ["F7EC",0x9EDB],
- ["F7ED",0x9EDC],
- ["F7EE",0x9EDD],
- ["FC63",0x9EDE],
- ["F7F0",0x9EDF],
- ["F7EF",0x9EE0],
- ["FC64",0x9EE1],
- ["F7F1",0x9EE2],
- ["FC65",0x9EE3],
- ["FC66",0x9EE4],
- ["F7F4",0x9EE5],
- ["FC67",0x9EE6],
- ["F7F3",0x9EE7],
- ["FC68",0x9EE8],
- ["F7F2",0x9EE9],
- ["F7F5",0x9EEA],
- ["FC69",0x9EEB],
- ["FC6A",0x9EEC],
- ["FC6B",0x9EED],
- ["FC6C",0x9EEE],
- ["F7F6",0x9EEF],
- ["FC6D",0x9EF0],
- ["FC6E",0x9EF1],
- ["FC6F",0x9EF2],
- ["FC70",0x9EF3],
- ["FC71",0x9EF4],
- ["FC72",0x9EF5],
- ["FC73",0x9EF6],
- ["FC74",0x9EF7],
- ["FC75",0x9EF8],
- ["EDE9",0x9EF9],
- ["FC76",0x9EFA],
- ["EDEA",0x9EFB],
- ["EDEB",0x9EFC],
- ["FC77",0x9EFD],
- ["F6BC",0x9EFE],
- ["FC78",0x9EFF],
- ["FC79",0x9F00],
- ["FC7A",0x9F01],
- ["FC7B",0x9F02],
- ["FC7C",0x9F03],
- ["FC7D",0x9F04],
- ["FC7E",0x9F05],
- ["FC80",0x9F06],
- ["FC81",0x9F07],
- ["FC82",0x9F08],
- ["FC83",0x9F09],
- ["FC84",0x9F0A],
- ["F6BD",0x9F0B],
- ["FC85",0x9F0C],
- ["F6BE",0x9F0D],
- ["B6A6",0x9F0E],
- ["FC86",0x9F0F],
- ["D8BE",0x9F10],
- ["FC87",0x9F11],
- ["FC88",0x9F12],
- ["B9C4",0x9F13],
- ["FC89",0x9F14],
- ["FC8A",0x9F15],
- ["FC8B",0x9F16],
- ["D8BB",0x9F17],
- ["FC8C",0x9F18],
- ["DCB1",0x9F19],
- ["FC8D",0x9F1A],
- ["FC8E",0x9F1B],
- ["FC8F",0x9F1C],
- ["FC90",0x9F1D],
- ["FC91",0x9F1E],
- ["FC92",0x9F1F],
- ["CAF3",0x9F20],
- ["FC93",0x9F21],
- ["F7F7",0x9F22],
- ["FC94",0x9F23],
- ["FC95",0x9F24],
- ["FC96",0x9F25],
- ["FC97",0x9F26],
- ["FC98",0x9F27],
- ["FC99",0x9F28],
- ["FC9A",0x9F29],
- ["FC9B",0x9F2A],
- ["FC9C",0x9F2B],
- ["F7F8",0x9F2C],
- ["FC9D",0x9F2D],
- ["FC9E",0x9F2E],
- ["F7F9",0x9F2F],
- ["FC9F",0x9F30],
- ["FCA0",0x9F31],
- ["FD40",0x9F32],
- ["FD41",0x9F33],
- ["FD42",0x9F34],
- ["FD43",0x9F35],
- ["FD44",0x9F36],
- ["F7FB",0x9F37],
- ["FD45",0x9F38],
- ["F7FA",0x9F39],
- ["FD46",0x9F3A],
- ["B1C7",0x9F3B],
- ["FD47",0x9F3C],
- ["F7FC",0x9F3D],
- ["F7FD",0x9F3E],
- ["FD48",0x9F3F],
- ["FD49",0x9F40],
- ["FD4A",0x9F41],
- ["FD4B",0x9F42],
- ["FD4C",0x9F43],
- ["F7FE",0x9F44],
- ["FD4D",0x9F45],
- ["FD4E",0x9F46],
- ["FD4F",0x9F47],
- ["FD50",0x9F48],
- ["FD51",0x9F49],
- ["FD52",0x9F4A],
- ["FD53",0x9F4B],
- ["FD54",0x9F4C],
- ["FD55",0x9F4D],
- ["FD56",0x9F4E],
- ["FD57",0x9F4F],
- ["C6EB",0x9F50],
- ["ECB4",0x9F51],
- ["FD58",0x9F52],
- ["FD59",0x9F53],
- ["FD5A",0x9F54],
- ["FD5B",0x9F55],
- ["FD5C",0x9F56],
- ["FD5D",0x9F57],
- ["FD5E",0x9F58],
- ["FD5F",0x9F59],
- ["FD60",0x9F5A],
- ["FD61",0x9F5B],
- ["FD62",0x9F5C],
- ["FD63",0x9F5D],
- ["FD64",0x9F5E],
- ["FD65",0x9F5F],
- ["FD66",0x9F60],
- ["FD67",0x9F61],
- ["FD68",0x9F62],
- ["FD69",0x9F63],
- ["FD6A",0x9F64],
- ["FD6B",0x9F65],
- ["FD6C",0x9F66],
- ["FD6D",0x9F67],
- ["FD6E",0x9F68],
- ["FD6F",0x9F69],
- ["FD70",0x9F6A],
- ["FD71",0x9F6B],
- ["FD72",0x9F6C],
- ["FD73",0x9F6D],
- ["FD74",0x9F6E],
- ["FD75",0x9F6F],
- ["FD76",0x9F70],
- ["FD77",0x9F71],
- ["FD78",0x9F72],
- ["FD79",0x9F73],
- ["FD7A",0x9F74],
- ["FD7B",0x9F75],
- ["FD7C",0x9F76],
- ["FD7D",0x9F77],
- ["FD7E",0x9F78],
- ["FD80",0x9F79],
- ["FD81",0x9F7A],
- ["FD82",0x9F7B],
- ["FD83",0x9F7C],
- ["FD84",0x9F7D],
- ["FD85",0x9F7E],
- ["B3DD",0x9F7F],
- ["F6B3",0x9F80],
- ["FD86",0x9F81],
- ["FD87",0x9F82],
- ["F6B4",0x9F83],
- ["C1E4",0x9F84],
- ["F6B5",0x9F85],
- ["F6B6",0x9F86],
- ["F6B7",0x9F87],
- ["F6B8",0x9F88],
- ["F6B9",0x9F89],
- ["F6BA",0x9F8A],
- ["C8A3",0x9F8B],
- ["F6BB",0x9F8C],
- ["FD88",0x9F8D],
- ["FD89",0x9F8E],
- ["FD8A",0x9F8F],
- ["FD8B",0x9F90],
- ["FD8C",0x9F91],
- ["FD8D",0x9F92],
- ["FD8E",0x9F93],
- ["FD8F",0x9F94],
- ["FD90",0x9F95],
- ["FD91",0x9F96],
- ["FD92",0x9F97],
- ["FD93",0x9F98],
- ["C1FA",0x9F99],
- ["B9A8",0x9F9A],
- ["EDE8",0x9F9B],
- ["FD94",0x9F9C],
- ["FD95",0x9F9D],
- ["FD96",0x9F9E],
- ["B9EA",0x9F9F],
- ["D9DF",0x9FA0],
- ["FD97",0x9FA1],
- ["FD98",0x9FA2],
- ["FD99",0x9FA3],
- ["FD9A",0x9FA4],
- ["FD9B",0x9FA5],
- ["FD9C",0xF92C],
- ["FD9D",0xF979],
- ["FD9E",0xF995],
- ["FD9F",0xF9E7],
- ["FDA0",0xF9F1],
- ["FE40",0xFA0C],
- ["FE41",0xFA0D],
- ["FE42",0xFA0E],
- ["FE43",0xFA0F],
- ["FE44",0xFA11],
- ["FE45",0xFA13],
- ["FE46",0xFA14],
- ["FE47",0xFA18],
- ["FE48",0xFA1F],
- ["FE49",0xFA20],
- ["FE4A",0xFA21],
- ["FE4B",0xFA23],
- ["FE4C",0xFA24],
- ["FE4D",0xFA27],
- ["FE4E",0xFA28],
- ["FE4F",0xFA29],
- ["A955",0xFE30],
- ["A6F2",0xFE31],
- ["A6F4",0xFE33],
- ["A6F5",0xFE34],
- ["A6E0",0xFE35],
- ["A6E1",0xFE36],
- ["A6F0",0xFE37],
- ["A6F1",0xFE38],
- ["A6E2",0xFE39],
- ["A6E3",0xFE3A],
- ["A6EE",0xFE3B],
- ["A6EF",0xFE3C],
- ["A6E6",0xFE3D],
- ["A6E7",0xFE3E],
- ["A6E4",0xFE3F],
- ["A6E5",0xFE40],
- ["A6E8",0xFE41],
- ["A6E9",0xFE42],
- ["A6EA",0xFE43],
- ["A6EB",0xFE44],
- ["A968",0xFE49],
- ["A969",0xFE4A],
- ["A96A",0xFE4B],
- ["A96B",0xFE4C],
- ["A96C",0xFE4D],
- ["A96D",0xFE4E],
- ["A96E",0xFE4F],
- ["A96F",0xFE50],
- ["A970",0xFE51],
- ["A971",0xFE52],
- ["A972",0xFE54],
- ["A973",0xFE55],
- ["A974",0xFE56],
- ["A975",0xFE57],
- ["A976",0xFE59],
- ["A977",0xFE5A],
- ["A978",0xFE5B],
- ["A979",0xFE5C],
- ["A97A",0xFE5D],
- ["A97B",0xFE5E],
- ["A97C",0xFE5F],
- ["A97D",0xFE60],
- ["A97E",0xFE61],
- ["A980",0xFE62],
- ["A981",0xFE63],
- ["A982",0xFE64],
- ["A983",0xFE65],
- ["A984",0xFE66],
- ["A985",0xFE68],
- ["A986",0xFE69],
- ["A987",0xFE6A],
- ["A988",0xFE6B],
- ["A3A1",0xFF01],
- ["A3A2",0xFF02],
- ["A3A3",0xFF03],
- ["A1E7",0xFF04],
- ["A3A5",0xFF05],
- ["A3A6",0xFF06],
- ["A3A7",0xFF07],
- ["A3A8",0xFF08],
- ["A3A9",0xFF09],
- ["A3AA",0xFF0A],
- ["A3AB",0xFF0B],
- ["A3AC",0xFF0C],
- ["A3AD",0xFF0D],
- ["A3AE",0xFF0E],
- ["A3AF",0xFF0F],
- ["A3B0",0xFF10],
- ["A3B1",0xFF11],
- ["A3B2",0xFF12],
- ["A3B3",0xFF13],
- ["A3B4",0xFF14],
- ["A3B5",0xFF15],
- ["A3B6",0xFF16],
- ["A3B7",0xFF17],
- ["A3B8",0xFF18],
- ["A3B9",0xFF19],
- ["A3BA",0xFF1A],
- ["A3BB",0xFF1B],
- ["A3BC",0xFF1C],
- ["A3BD",0xFF1D],
- ["A3BE",0xFF1E],
- ["A3BF",0xFF1F],
- ["A3C0",0xFF20],
- ["A3C1",0xFF21],
- ["A3C2",0xFF22],
- ["A3C3",0xFF23],
- ["A3C4",0xFF24],
- ["A3C5",0xFF25],
- ["A3C6",0xFF26],
- ["A3C7",0xFF27],
- ["A3C8",0xFF28],
- ["A3C9",0xFF29],
- ["A3CA",0xFF2A],
- ["A3CB",0xFF2B],
- ["A3CC",0xFF2C],
- ["A3CD",0xFF2D],
- ["A3CE",0xFF2E],
- ["A3CF",0xFF2F],
- ["A3D0",0xFF30],
- ["A3D1",0xFF31],
- ["A3D2",0xFF32],
- ["A3D3",0xFF33],
- ["A3D4",0xFF34],
- ["A3D5",0xFF35],
- ["A3D6",0xFF36],
- ["A3D7",0xFF37],
- ["A3D8",0xFF38],
- ["A3D9",0xFF39],
- ["A3DA",0xFF3A],
- ["A3DB",0xFF3B],
- ["A3DC",0xFF3C],
- ["A3DD",0xFF3D],
- ["A3DE",0xFF3E],
- ["A3DF",0xFF3F],
- ["A3E0",0xFF40],
- ["A3E1",0xFF41],
- ["A3E2",0xFF42],
- ["A3E3",0xFF43],
- ["A3E4",0xFF44],
- ["A3E5",0xFF45],
- ["A3E6",0xFF46],
- ["A3E7",0xFF47],
- ["A3E8",0xFF48],
- ["A3E9",0xFF49],
- ["A3EA",0xFF4A],
- ["A3EB",0xFF4B],
- ["A3EC",0xFF4C],
- ["A3ED",0xFF4D],
- ["A3EE",0xFF4E],
- ["A3EF",0xFF4F],
- ["A3F0",0xFF50],
- ["A3F1",0xFF51],
- ["A3F2",0xFF52],
- ["A3F3",0xFF53],
- ["A3F4",0xFF54],
- ["A3F5",0xFF55],
- ["A3F6",0xFF56],
- ["A3F7",0xFF57],
- ["A3F8",0xFF58],
- ["A3F9",0xFF59],
- ["A3FA",0xFF5A],
- ["A3FB",0xFF5B],
- ["A3FC",0xFF5C],
- ["A3FD",0xFF5D],
- ["A1AB",0xFF5E],
- ["A1E9",0xFFE0],
- ["A1EA",0xFFE1],
- ["A956",0xFFE2],
- ["A3FE",0xFFE3],
- ["A957",0xFFE4],
- ["A3A4",0xFFE5],
-] \ No newline at end of file
diff --git a/enc/trans/gbk.trans b/enc/trans/gbk.trans
deleted file mode 100644
index 0df148198e..0000000000
--- a/enc/trans/gbk.trans
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "transcode_data.h"
-
-<%
- require "gbk-tbl"
-
- transcode_tblgen "GBK", "UTF-8", [["{00-7f}", :nomap], *GBK_TO_UCS_TBL]
- transcode_tblgen "UTF-8", "GBK", [["{00-7f}", :nomap], *GBK_TO_UCS_TBL.map {|a,b| [b,a] }]
-%>
-
-<%= transcode_generated_code %>
-
-void
-Init_gbk(void)
-{
-<%= transcode_register_code %>
-}
diff --git a/enc/trans/ibm437-tbl.rb b/enc/trans/ibm437-tbl.rb
deleted file mode 100644
index 5ae64d621e..0000000000
--- a/enc/trans/ibm437-tbl.rb
+++ /dev/null
@@ -1,130 +0,0 @@
-IBM437_TO_UCS_TBL = [
- ["FF",0xA0],
- ["AD",0xA1],
- ["9B",0xA2],
- ["9C",0xA3],
- ["9D",0xA5],
- ["A6",0xAA],
- ["AE",0xAB],
- ["AA",0xAC],
- ["F8",0xB0],
- ["F1",0xB1],
- ["FD",0xB2],
- ["E6",0xB5],
- ["FA",0xB7],
- ["A7",0xBA],
- ["AF",0xBB],
- ["AC",0xBC],
- ["AB",0xBD],
- ["A8",0xBF],
- ["8E",0xC4],
- ["8F",0xC5],
- ["92",0xC6],
- ["80",0xC7],
- ["90",0xC9],
- ["A5",0xD1],
- ["99",0xD6],
- ["9A",0xDC],
- ["E1",0xDF],
- ["85",0xE0],
- ["A0",0xE1],
- ["83",0xE2],
- ["84",0xE4],
- ["86",0xE5],
- ["91",0xE6],
- ["87",0xE7],
- ["8A",0xE8],
- ["82",0xE9],
- ["88",0xEA],
- ["89",0xEB],
- ["8D",0xEC],
- ["A1",0xED],
- ["8C",0xEE],
- ["8B",0xEF],
- ["A4",0xF1],
- ["95",0xF2],
- ["A2",0xF3],
- ["93",0xF4],
- ["94",0xF6],
- ["F6",0xF7],
- ["97",0xF9],
- ["A3",0xFA],
- ["96",0xFB],
- ["81",0xFC],
- ["98",0xFF],
- ["9F",0x192],
- ["E2",0x393],
- ["E9",0x398],
- ["E4",0x3A3],
- ["E8",0x3A6],
- ["EA",0x3A9],
- ["E0",0x3B1],
- ["EB",0x3B4],
- ["EE",0x3B5],
- ["E3",0x3C0],
- ["E5",0x3C3],
- ["E7",0x3C4],
- ["ED",0x3C6],
- ["FC",0x207F],
- ["9E",0x20A7],
- ["F9",0x2219],
- ["FB",0x221A],
- ["EC",0x221E],
- ["EF",0x2229],
- ["F7",0x2248],
- ["F0",0x2261],
- ["F3",0x2264],
- ["F2",0x2265],
- ["A9",0x2310],
- ["F4",0x2320],
- ["F5",0x2321],
- ["C4",0x2500],
- ["B3",0x2502],
- ["DA",0x250C],
- ["BF",0x2510],
- ["C0",0x2514],
- ["D9",0x2518],
- ["C3",0x251C],
- ["B4",0x2524],
- ["C2",0x252C],
- ["C1",0x2534],
- ["C5",0x253C],
- ["CD",0x2550],
- ["BA",0x2551],
- ["D5",0x2552],
- ["D6",0x2553],
- ["C9",0x2554],
- ["B8",0x2555],
- ["B7",0x2556],
- ["BB",0x2557],
- ["D4",0x2558],
- ["D3",0x2559],
- ["C8",0x255A],
- ["BE",0x255B],
- ["BD",0x255C],
- ["BC",0x255D],
- ["C6",0x255E],
- ["C7",0x255F],
- ["CC",0x2560],
- ["B5",0x2561],
- ["B6",0x2562],
- ["B9",0x2563],
- ["D1",0x2564],
- ["D2",0x2565],
- ["CB",0x2566],
- ["CF",0x2567],
- ["D0",0x2568],
- ["CA",0x2569],
- ["D8",0x256A],
- ["D7",0x256B],
- ["CE",0x256C],
- ["DF",0x2580],
- ["DC",0x2584],
- ["DB",0x2588],
- ["DD",0x258C],
- ["DE",0x2590],
- ["B0",0x2591],
- ["B1",0x2592],
- ["B2",0x2593],
- ["FE",0x25A0],
-] \ No newline at end of file
diff --git a/enc/trans/ibm775-tbl.rb b/enc/trans/ibm775-tbl.rb
deleted file mode 100644
index f55679f409..0000000000
--- a/enc/trans/ibm775-tbl.rb
+++ /dev/null
@@ -1,130 +0,0 @@
-IBM775_TO_UCS_TBL = [
- ["FF",0xA0],
- ["96",0xA2],
- ["9C",0xA3],
- ["9F",0xA4],
- ["A7",0xA6],
- ["F5",0xA7],
- ["A8",0xA9],
- ["AE",0xAB],
- ["AA",0xAC],
- ["F0",0xAD],
- ["A9",0xAE],
- ["F8",0xB0],
- ["F1",0xB1],
- ["FD",0xB2],
- ["FC",0xB3],
- ["E6",0xB5],
- ["F4",0xB6],
- ["FA",0xB7],
- ["FB",0xB9],
- ["AF",0xBB],
- ["AC",0xBC],
- ["AB",0xBD],
- ["F3",0xBE],
- ["8E",0xC4],
- ["8F",0xC5],
- ["92",0xC6],
- ["90",0xC9],
- ["E0",0xD3],
- ["E5",0xD5],
- ["99",0xD6],
- ["9E",0xD7],
- ["9D",0xD8],
- ["9A",0xDC],
- ["E1",0xDF],
- ["84",0xE4],
- ["86",0xE5],
- ["91",0xE6],
- ["82",0xE9],
- ["A2",0xF3],
- ["E4",0xF5],
- ["94",0xF6],
- ["F6",0xF7],
- ["9B",0xF8],
- ["81",0xFC],
- ["A0",0x100],
- ["83",0x101],
- ["B5",0x104],
- ["D0",0x105],
- ["80",0x106],
- ["87",0x107],
- ["B6",0x10C],
- ["D1",0x10D],
- ["ED",0x112],
- ["89",0x113],
- ["B8",0x116],
- ["D3",0x117],
- ["B7",0x118],
- ["D2",0x119],
- ["95",0x122],
- ["85",0x123],
- ["A1",0x12A],
- ["8C",0x12B],
- ["BD",0x12E],
- ["D4",0x12F],
- ["E8",0x136],
- ["E9",0x137],
- ["EA",0x13B],
- ["EB",0x13C],
- ["AD",0x141],
- ["88",0x142],
- ["E3",0x143],
- ["E7",0x144],
- ["EE",0x145],
- ["EC",0x146],
- ["E2",0x14C],
- ["93",0x14D],
- ["8A",0x156],
- ["8B",0x157],
- ["97",0x15A],
- ["98",0x15B],
- ["BE",0x160],
- ["D5",0x161],
- ["C7",0x16A],
- ["D7",0x16B],
- ["C6",0x172],
- ["D6",0x173],
- ["8D",0x179],
- ["A5",0x17A],
- ["A3",0x17B],
- ["A4",0x17C],
- ["CF",0x17D],
- ["D8",0x17E],
- ["EF",0x2019],
- ["F2",0x201C],
- ["A6",0x201D],
- ["F7",0x201E],
- ["F9",0x2219],
- ["C4",0x2500],
- ["B3",0x2502],
- ["DA",0x250C],
- ["BF",0x2510],
- ["C0",0x2514],
- ["D9",0x2518],
- ["C3",0x251C],
- ["B4",0x2524],
- ["C2",0x252C],
- ["C1",0x2534],
- ["C5",0x253C],
- ["CD",0x2550],
- ["BA",0x2551],
- ["C9",0x2554],
- ["BB",0x2557],
- ["C8",0x255A],
- ["BC",0x255D],
- ["CC",0x2560],
- ["B9",0x2563],
- ["CB",0x2566],
- ["CA",0x2569],
- ["CE",0x256C],
- ["DF",0x2580],
- ["DC",0x2584],
- ["DB",0x2588],
- ["DD",0x258C],
- ["DE",0x2590],
- ["B0",0x2591],
- ["B1",0x2592],
- ["B2",0x2593],
- ["FE",0x25A0],
-] \ No newline at end of file
diff --git a/enc/trans/ibm852-tbl.rb b/enc/trans/ibm852-tbl.rb
deleted file mode 100644
index 6cec51cf80..0000000000
--- a/enc/trans/ibm852-tbl.rb
+++ /dev/null
@@ -1,130 +0,0 @@
-IBM852_TO_UCS_TBL = [
- ["FF",0xA0],
- ["CF",0xA4],
- ["F5",0xA7],
- ["F9",0xA8],
- ["AE",0xAB],
- ["AA",0xAC],
- ["F0",0xAD],
- ["F8",0xB0],
- ["EF",0xB4],
- ["F7",0xB8],
- ["AF",0xBB],
- ["B5",0xC1],
- ["B6",0xC2],
- ["8E",0xC4],
- ["80",0xC7],
- ["90",0xC9],
- ["D3",0xCB],
- ["D6",0xCD],
- ["D7",0xCE],
- ["E0",0xD3],
- ["E2",0xD4],
- ["99",0xD6],
- ["9E",0xD7],
- ["E9",0xDA],
- ["9A",0xDC],
- ["ED",0xDD],
- ["E1",0xDF],
- ["A0",0xE1],
- ["83",0xE2],
- ["84",0xE4],
- ["87",0xE7],
- ["82",0xE9],
- ["89",0xEB],
- ["A1",0xED],
- ["8C",0xEE],
- ["A2",0xF3],
- ["93",0xF4],
- ["94",0xF6],
- ["F6",0xF7],
- ["A3",0xFA],
- ["81",0xFC],
- ["EC",0xFD],
- ["C6",0x102],
- ["C7",0x103],
- ["A4",0x104],
- ["A5",0x105],
- ["8F",0x106],
- ["86",0x107],
- ["AC",0x10C],
- ["9F",0x10D],
- ["D2",0x10E],
- ["D4",0x10F],
- ["D1",0x110],
- ["D0",0x111],
- ["A8",0x118],
- ["A9",0x119],
- ["B7",0x11A],
- ["D8",0x11B],
- ["91",0x139],
- ["92",0x13A],
- ["95",0x13D],
- ["96",0x13E],
- ["9D",0x141],
- ["88",0x142],
- ["E3",0x143],
- ["E4",0x144],
- ["D5",0x147],
- ["E5",0x148],
- ["8A",0x150],
- ["8B",0x151],
- ["E8",0x154],
- ["EA",0x155],
- ["FC",0x158],
- ["FD",0x159],
- ["97",0x15A],
- ["98",0x15B],
- ["B8",0x15E],
- ["AD",0x15F],
- ["E6",0x160],
- ["E7",0x161],
- ["DD",0x162],
- ["EE",0x163],
- ["9B",0x164],
- ["9C",0x165],
- ["DE",0x16E],
- ["85",0x16F],
- ["EB",0x170],
- ["FB",0x171],
- ["8D",0x179],
- ["AB",0x17A],
- ["BD",0x17B],
- ["BE",0x17C],
- ["A6",0x17D],
- ["A7",0x17E],
- ["F3",0x2C7],
- ["F4",0x2D8],
- ["FA",0x2D9],
- ["F2",0x2DB],
- ["F1",0x2DD],
- ["C4",0x2500],
- ["B3",0x2502],
- ["DA",0x250C],
- ["BF",0x2510],
- ["C0",0x2514],
- ["D9",0x2518],
- ["C3",0x251C],
- ["B4",0x2524],
- ["C2",0x252C],
- ["C1",0x2534],
- ["C5",0x253C],
- ["CD",0x2550],
- ["BA",0x2551],
- ["C9",0x2554],
- ["BB",0x2557],
- ["C8",0x255A],
- ["BC",0x255D],
- ["CC",0x2560],
- ["B9",0x2563],
- ["CB",0x2566],
- ["CA",0x2569],
- ["CE",0x256C],
- ["DF",0x2580],
- ["DC",0x2584],
- ["DB",0x2588],
- ["B0",0x2591],
- ["B1",0x2592],
- ["B2",0x2593],
- ["FE",0x25A0],
-] \ No newline at end of file
diff --git a/enc/trans/ibm855-tbl.rb b/enc/trans/ibm855-tbl.rb
deleted file mode 100644
index 7e0cc5014f..0000000000
--- a/enc/trans/ibm855-tbl.rb
+++ /dev/null
@@ -1,130 +0,0 @@
-IBM855_TO_UCS_TBL = [
- ["FF",0xA0],
- ["CF",0xA4],
- ["FD",0xA7],
- ["AE",0xAB],
- ["F0",0xAD],
- ["AF",0xBB],
- ["85",0x401],
- ["81",0x402],
- ["83",0x403],
- ["87",0x404],
- ["89",0x405],
- ["8B",0x406],
- ["8D",0x407],
- ["8F",0x408],
- ["91",0x409],
- ["93",0x40A],
- ["95",0x40B],
- ["97",0x40C],
- ["99",0x40E],
- ["9B",0x40F],
- ["A1",0x410],
- ["A3",0x411],
- ["EC",0x412],
- ["AD",0x413],
- ["A7",0x414],
- ["A9",0x415],
- ["EA",0x416],
- ["F4",0x417],
- ["B8",0x418],
- ["BE",0x419],
- ["C7",0x41A],
- ["D1",0x41B],
- ["D3",0x41C],
- ["D5",0x41D],
- ["D7",0x41E],
- ["DD",0x41F],
- ["E2",0x420],
- ["E4",0x421],
- ["E6",0x422],
- ["E8",0x423],
- ["AB",0x424],
- ["B6",0x425],
- ["A5",0x426],
- ["FC",0x427],
- ["F6",0x428],
- ["FA",0x429],
- ["9F",0x42A],
- ["F2",0x42B],
- ["EE",0x42C],
- ["F8",0x42D],
- ["9D",0x42E],
- ["E0",0x42F],
- ["A0",0x430],
- ["A2",0x431],
- ["EB",0x432],
- ["AC",0x433],
- ["A6",0x434],
- ["A8",0x435],
- ["E9",0x436],
- ["F3",0x437],
- ["B7",0x438],
- ["BD",0x439],
- ["C6",0x43A],
- ["D0",0x43B],
- ["D2",0x43C],
- ["D4",0x43D],
- ["D6",0x43E],
- ["D8",0x43F],
- ["E1",0x440],
- ["E3",0x441],
- ["E5",0x442],
- ["E7",0x443],
- ["AA",0x444],
- ["B5",0x445],
- ["A4",0x446],
- ["FB",0x447],
- ["F5",0x448],
- ["F9",0x449],
- ["9E",0x44A],
- ["F1",0x44B],
- ["ED",0x44C],
- ["F7",0x44D],
- ["9C",0x44E],
- ["DE",0x44F],
- ["84",0x451],
- ["80",0x452],
- ["82",0x453],
- ["86",0x454],
- ["88",0x455],
- ["8A",0x456],
- ["8C",0x457],
- ["8E",0x458],
- ["90",0x459],
- ["92",0x45A],
- ["94",0x45B],
- ["96",0x45C],
- ["98",0x45E],
- ["9A",0x45F],
- ["EF",0x2116],
- ["C4",0x2500],
- ["B3",0x2502],
- ["DA",0x250C],
- ["BF",0x2510],
- ["C0",0x2514],
- ["D9",0x2518],
- ["C3",0x251C],
- ["B4",0x2524],
- ["C2",0x252C],
- ["C1",0x2534],
- ["C5",0x253C],
- ["CD",0x2550],
- ["BA",0x2551],
- ["C9",0x2554],
- ["BB",0x2557],
- ["C8",0x255A],
- ["BC",0x255D],
- ["CC",0x2560],
- ["B9",0x2563],
- ["CB",0x2566],
- ["CA",0x2569],
- ["CE",0x256C],
- ["DF",0x2580],
- ["DC",0x2584],
- ["DB",0x2588],
- ["B0",0x2591],
- ["B1",0x2592],
- ["B2",0x2593],
- ["FE",0x25A0],
-] \ No newline at end of file
diff --git a/enc/trans/ibm857-tbl.rb b/enc/trans/ibm857-tbl.rb
deleted file mode 100644
index 5b20d389d3..0000000000
--- a/enc/trans/ibm857-tbl.rb
+++ /dev/null
@@ -1,127 +0,0 @@
-IBM857_TO_UCS_TBL = [
- ["FF",0xA0],
- ["AD",0xA1],
- ["BD",0xA2],
- ["9C",0xA3],
- ["CF",0xA4],
- ["BE",0xA5],
- ["DD",0xA6],
- ["F5",0xA7],
- ["F9",0xA8],
- ["B8",0xA9],
- ["D1",0xAA],
- ["AE",0xAB],
- ["AA",0xAC],
- ["F0",0xAD],
- ["A9",0xAE],
- ["EE",0xAF],
- ["F8",0xB0],
- ["F1",0xB1],
- ["FD",0xB2],
- ["FC",0xB3],
- ["EF",0xB4],
- ["E6",0xB5],
- ["F4",0xB6],
- ["FA",0xB7],
- ["F7",0xB8],
- ["FB",0xB9],
- ["D0",0xBA],
- ["AF",0xBB],
- ["AC",0xBC],
- ["AB",0xBD],
- ["F3",0xBE],
- ["A8",0xBF],
- ["B7",0xC0],
- ["B5",0xC1],
- ["B6",0xC2],
- ["C7",0xC3],
- ["8E",0xC4],
- ["8F",0xC5],
- ["92",0xC6],
- ["80",0xC7],
- ["D4",0xC8],
- ["90",0xC9],
- ["D2",0xCA],
- ["D3",0xCB],
- ["DE",0xCC],
- ["D6",0xCD],
- ["D7",0xCE],
- ["D8",0xCF],
- ["A5",0xD1],
- ["E3",0xD2],
- ["E0",0xD3],
- ["E2",0xD4],
- ["E5",0xD5],
- ["99",0xD6],
- ["E8",0xD7],
- ["9D",0xD8],
- ["EB",0xD9],
- ["E9",0xDA],
- ["EA",0xDB],
- ["9A",0xDC],
- ["E1",0xDF],
- ["85",0xE0],
- ["A0",0xE1],
- ["83",0xE2],
- ["C6",0xE3],
- ["84",0xE4],
- ["86",0xE5],
- ["91",0xE6],
- ["87",0xE7],
- ["8A",0xE8],
- ["82",0xE9],
- ["88",0xEA],
- ["89",0xEB],
- ["EC",0xEC],
- ["A1",0xED],
- ["8C",0xEE],
- ["8B",0xEF],
- ["A4",0xF1],
- ["95",0xF2],
- ["A2",0xF3],
- ["93",0xF4],
- ["E4",0xF5],
- ["94",0xF6],
- ["F6",0xF7],
- ["9B",0xF8],
- ["97",0xF9],
- ["A3",0xFA],
- ["96",0xFB],
- ["81",0xFC],
- ["ED",0xFF],
- ["A6",0x11E],
- ["A7",0x11F],
- ["98",0x130],
- ["8D",0x131],
- ["9E",0x15E],
- ["9F",0x15F],
- ["C4",0x2500],
- ["B3",0x2502],
- ["DA",0x250C],
- ["BF",0x2510],
- ["C0",0x2514],
- ["D9",0x2518],
- ["C3",0x251C],
- ["B4",0x2524],
- ["C2",0x252C],
- ["C1",0x2534],
- ["C5",0x253C],
- ["CD",0x2550],
- ["BA",0x2551],
- ["C9",0x2554],
- ["BB",0x2557],
- ["C8",0x255A],
- ["BC",0x255D],
- ["CC",0x2560],
- ["B9",0x2563],
- ["CB",0x2566],
- ["CA",0x2569],
- ["CE",0x256C],
- ["DF",0x2580],
- ["DC",0x2584],
- ["DB",0x2588],
- ["B0",0x2591],
- ["B1",0x2592],
- ["B2",0x2593],
- ["FE",0x25A0],
-] \ No newline at end of file
diff --git a/enc/trans/ibm860-tbl.rb b/enc/trans/ibm860-tbl.rb
deleted file mode 100644
index ae218a129f..0000000000
--- a/enc/trans/ibm860-tbl.rb
+++ /dev/null
@@ -1,130 +0,0 @@
-IBM860_TO_UCS_TBL = [
- ["FF",0xA0],
- ["AD",0xA1],
- ["9B",0xA2],
- ["9C",0xA3],
- ["A6",0xAA],
- ["AE",0xAB],
- ["AA",0xAC],
- ["F8",0xB0],
- ["F1",0xB1],
- ["FD",0xB2],
- ["E6",0xB5],
- ["FA",0xB7],
- ["A7",0xBA],
- ["AF",0xBB],
- ["AC",0xBC],
- ["AB",0xBD],
- ["A8",0xBF],
- ["91",0xC0],
- ["86",0xC1],
- ["8F",0xC2],
- ["8E",0xC3],
- ["80",0xC7],
- ["92",0xC8],
- ["90",0xC9],
- ["89",0xCA],
- ["98",0xCC],
- ["8B",0xCD],
- ["A5",0xD1],
- ["A9",0xD2],
- ["9F",0xD3],
- ["8C",0xD4],
- ["99",0xD5],
- ["9D",0xD9],
- ["96",0xDA],
- ["9A",0xDC],
- ["E1",0xDF],
- ["85",0xE0],
- ["A0",0xE1],
- ["83",0xE2],
- ["84",0xE3],
- ["87",0xE7],
- ["8A",0xE8],
- ["82",0xE9],
- ["88",0xEA],
- ["8D",0xEC],
- ["A1",0xED],
- ["A4",0xF1],
- ["95",0xF2],
- ["A2",0xF3],
- ["93",0xF4],
- ["94",0xF5],
- ["F6",0xF7],
- ["97",0xF9],
- ["A3",0xFA],
- ["81",0xFC],
- ["E2",0x393],
- ["E9",0x398],
- ["E4",0x3A3],
- ["E8",0x3A6],
- ["EA",0x3A9],
- ["E0",0x3B1],
- ["EB",0x3B4],
- ["EE",0x3B5],
- ["E3",0x3C0],
- ["E5",0x3C3],
- ["E7",0x3C4],
- ["ED",0x3C6],
- ["FC",0x207F],
- ["9E",0x20A7],
- ["F9",0x2219],
- ["FB",0x221A],
- ["EC",0x221E],
- ["EF",0x2229],
- ["F7",0x2248],
- ["F0",0x2261],
- ["F3",0x2264],
- ["F2",0x2265],
- ["F4",0x2320],
- ["F5",0x2321],
- ["C4",0x2500],
- ["B3",0x2502],
- ["DA",0x250C],
- ["BF",0x2510],
- ["C0",0x2514],
- ["D9",0x2518],
- ["C3",0x251C],
- ["B4",0x2524],
- ["C2",0x252C],
- ["C1",0x2534],
- ["C5",0x253C],
- ["CD",0x2550],
- ["BA",0x2551],
- ["D5",0x2552],
- ["D6",0x2553],
- ["C9",0x2554],
- ["B8",0x2555],
- ["B7",0x2556],
- ["BB",0x2557],
- ["D4",0x2558],
- ["D3",0x2559],
- ["C8",0x255A],
- ["BE",0x255B],
- ["BD",0x255C],
- ["BC",0x255D],
- ["C6",0x255E],
- ["C7",0x255F],
- ["CC",0x2560],
- ["B5",0x2561],
- ["B6",0x2562],
- ["B9",0x2563],
- ["D1",0x2564],
- ["D2",0x2565],
- ["CB",0x2566],
- ["CF",0x2567],
- ["D0",0x2568],
- ["CA",0x2569],
- ["D8",0x256A],
- ["D7",0x256B],
- ["CE",0x256C],
- ["DF",0x2580],
- ["DC",0x2584],
- ["DB",0x2588],
- ["DD",0x258C],
- ["DE",0x2590],
- ["B0",0x2591],
- ["B1",0x2592],
- ["B2",0x2593],
- ["FE",0x25A0],
-] \ No newline at end of file
diff --git a/enc/trans/ibm861-tbl.rb b/enc/trans/ibm861-tbl.rb
deleted file mode 100644
index c24042a76c..0000000000
--- a/enc/trans/ibm861-tbl.rb
+++ /dev/null
@@ -1,130 +0,0 @@
-IBM861_TO_UCS_TBL = [
- ["FF",0xA0],
- ["AD",0xA1],
- ["9C",0xA3],
- ["AE",0xAB],
- ["AA",0xAC],
- ["F8",0xB0],
- ["F1",0xB1],
- ["FD",0xB2],
- ["E6",0xB5],
- ["FA",0xB7],
- ["AF",0xBB],
- ["AC",0xBC],
- ["AB",0xBD],
- ["A8",0xBF],
- ["A4",0xC1],
- ["8E",0xC4],
- ["8F",0xC5],
- ["92",0xC6],
- ["80",0xC7],
- ["90",0xC9],
- ["A5",0xCD],
- ["8B",0xD0],
- ["A6",0xD3],
- ["99",0xD6],
- ["9D",0xD8],
- ["A7",0xDA],
- ["9A",0xDC],
- ["97",0xDD],
- ["8D",0xDE],
- ["E1",0xDF],
- ["85",0xE0],
- ["A0",0xE1],
- ["83",0xE2],
- ["84",0xE4],
- ["86",0xE5],
- ["91",0xE6],
- ["87",0xE7],
- ["8A",0xE8],
- ["82",0xE9],
- ["88",0xEA],
- ["89",0xEB],
- ["A1",0xED],
- ["8C",0xF0],
- ["A2",0xF3],
- ["93",0xF4],
- ["94",0xF6],
- ["F6",0xF7],
- ["9B",0xF8],
- ["A3",0xFA],
- ["96",0xFB],
- ["81",0xFC],
- ["98",0xFD],
- ["95",0xFE],
- ["9F",0x192],
- ["E2",0x393],
- ["E9",0x398],
- ["E4",0x3A3],
- ["E8",0x3A6],
- ["EA",0x3A9],
- ["E0",0x3B1],
- ["EB",0x3B4],
- ["EE",0x3B5],
- ["E3",0x3C0],
- ["E5",0x3C3],
- ["E7",0x3C4],
- ["ED",0x3C6],
- ["FC",0x207F],
- ["9E",0x20A7],
- ["F9",0x2219],
- ["FB",0x221A],
- ["EC",0x221E],
- ["EF",0x2229],
- ["F7",0x2248],
- ["F0",0x2261],
- ["F3",0x2264],
- ["F2",0x2265],
- ["A9",0x2310],
- ["F4",0x2320],
- ["F5",0x2321],
- ["C4",0x2500],
- ["B3",0x2502],
- ["DA",0x250C],
- ["BF",0x2510],
- ["C0",0x2514],
- ["D9",0x2518],
- ["C3",0x251C],
- ["B4",0x2524],
- ["C2",0x252C],
- ["C1",0x2534],
- ["C5",0x253C],
- ["CD",0x2550],
- ["BA",0x2551],
- ["D5",0x2552],
- ["D6",0x2553],
- ["C9",0x2554],
- ["B8",0x2555],
- ["B7",0x2556],
- ["BB",0x2557],
- ["D4",0x2558],
- ["D3",0x2559],
- ["C8",0x255A],
- ["BE",0x255B],
- ["BD",0x255C],
- ["BC",0x255D],
- ["C6",0x255E],
- ["C7",0x255F],
- ["CC",0x2560],
- ["B5",0x2561],
- ["B6",0x2562],
- ["B9",0x2563],
- ["D1",0x2564],
- ["D2",0x2565],
- ["CB",0x2566],
- ["CF",0x2567],
- ["D0",0x2568],
- ["CA",0x2569],
- ["D8",0x256A],
- ["D7",0x256B],
- ["CE",0x256C],
- ["DF",0x2580],
- ["DC",0x2584],
- ["DB",0x2588],
- ["DD",0x258C],
- ["DE",0x2590],
- ["B0",0x2591],
- ["B1",0x2592],
- ["B2",0x2593],
- ["FE",0x25A0],
-] \ No newline at end of file
diff --git a/enc/trans/ibm862-tbl.rb b/enc/trans/ibm862-tbl.rb
deleted file mode 100644
index 31d6fb0243..0000000000
--- a/enc/trans/ibm862-tbl.rb
+++ /dev/null
@@ -1,130 +0,0 @@
-IBM862_TO_UCS_TBL = [
- ["FF",0xA0],
- ["AD",0xA1],
- ["9B",0xA2],
- ["9C",0xA3],
- ["9D",0xA5],
- ["A6",0xAA],
- ["AE",0xAB],
- ["AA",0xAC],
- ["F8",0xB0],
- ["F1",0xB1],
- ["FD",0xB2],
- ["E6",0xB5],
- ["FA",0xB7],
- ["A7",0xBA],
- ["AF",0xBB],
- ["AC",0xBC],
- ["AB",0xBD],
- ["A8",0xBF],
- ["A5",0xD1],
- ["E1",0xDF],
- ["A0",0xE1],
- ["A1",0xED],
- ["A4",0xF1],
- ["A2",0xF3],
- ["F6",0xF7],
- ["A3",0xFA],
- ["9F",0x192],
- ["E2",0x393],
- ["E9",0x398],
- ["E4",0x3A3],
- ["E8",0x3A6],
- ["EA",0x3A9],
- ["E0",0x3B1],
- ["EB",0x3B4],
- ["EE",0x3B5],
- ["E3",0x3C0],
- ["E5",0x3C3],
- ["E7",0x3C4],
- ["ED",0x3C6],
- ["80",0x5D0],
- ["81",0x5D1],
- ["82",0x5D2],
- ["83",0x5D3],
- ["84",0x5D4],
- ["85",0x5D5],
- ["86",0x5D6],
- ["87",0x5D7],
- ["88",0x5D8],
- ["89",0x5D9],
- ["8A",0x5DA],
- ["8B",0x5DB],
- ["8C",0x5DC],
- ["8D",0x5DD],
- ["8E",0x5DE],
- ["8F",0x5DF],
- ["90",0x5E0],
- ["91",0x5E1],
- ["92",0x5E2],
- ["93",0x5E3],
- ["94",0x5E4],
- ["95",0x5E5],
- ["96",0x5E6],
- ["97",0x5E7],
- ["98",0x5E8],
- ["99",0x5E9],
- ["9A",0x5EA],
- ["FC",0x207F],
- ["9E",0x20A7],
- ["F9",0x2219],
- ["FB",0x221A],
- ["EC",0x221E],
- ["EF",0x2229],
- ["F7",0x2248],
- ["F0",0x2261],
- ["F3",0x2264],
- ["F2",0x2265],
- ["A9",0x2310],
- ["F4",0x2320],
- ["F5",0x2321],
- ["C4",0x2500],
- ["B3",0x2502],
- ["DA",0x250C],
- ["BF",0x2510],
- ["C0",0x2514],
- ["D9",0x2518],
- ["C3",0x251C],
- ["B4",0x2524],
- ["C2",0x252C],
- ["C1",0x2534],
- ["C5",0x253C],
- ["CD",0x2550],
- ["BA",0x2551],
- ["D5",0x2552],
- ["D6",0x2553],
- ["C9",0x2554],
- ["B8",0x2555],
- ["B7",0x2556],
- ["BB",0x2557],
- ["D4",0x2558],
- ["D3",0x2559],
- ["C8",0x255A],
- ["BE",0x255B],
- ["BD",0x255C],
- ["BC",0x255D],
- ["C6",0x255E],
- ["C7",0x255F],
- ["CC",0x2560],
- ["B5",0x2561],
- ["B6",0x2562],
- ["B9",0x2563],
- ["D1",0x2564],
- ["D2",0x2565],
- ["CB",0x2566],
- ["CF",0x2567],
- ["D0",0x2568],
- ["CA",0x2569],
- ["D8",0x256A],
- ["D7",0x256B],
- ["CE",0x256C],
- ["DF",0x2580],
- ["DC",0x2584],
- ["DB",0x2588],
- ["DD",0x258C],
- ["DE",0x2590],
- ["B0",0x2591],
- ["B1",0x2592],
- ["B2",0x2593],
- ["FE",0x25A0],
-] \ No newline at end of file
diff --git a/enc/trans/ibm863-tbl.rb b/enc/trans/ibm863-tbl.rb
deleted file mode 100644
index db110cf38c..0000000000
--- a/enc/trans/ibm863-tbl.rb
+++ /dev/null
@@ -1,130 +0,0 @@
-IBM863_TO_UCS_TBL = [
- ["FF",0xA0],
- ["9B",0xA2],
- ["9C",0xA3],
- ["98",0xA4],
- ["A0",0xA6],
- ["8F",0xA7],
- ["A4",0xA8],
- ["AE",0xAB],
- ["AA",0xAC],
- ["A7",0xAF],
- ["F8",0xB0],
- ["F1",0xB1],
- ["FD",0xB2],
- ["A6",0xB3],
- ["A1",0xB4],
- ["E6",0xB5],
- ["86",0xB6],
- ["FA",0xB7],
- ["A5",0xB8],
- ["AF",0xBB],
- ["AC",0xBC],
- ["AB",0xBD],
- ["AD",0xBE],
- ["8E",0xC0],
- ["84",0xC2],
- ["80",0xC7],
- ["91",0xC8],
- ["90",0xC9],
- ["92",0xCA],
- ["94",0xCB],
- ["A8",0xCE],
- ["95",0xCF],
- ["99",0xD4],
- ["9D",0xD9],
- ["9E",0xDB],
- ["9A",0xDC],
- ["E1",0xDF],
- ["85",0xE0],
- ["83",0xE2],
- ["87",0xE7],
- ["8A",0xE8],
- ["82",0xE9],
- ["88",0xEA],
- ["89",0xEB],
- ["8C",0xEE],
- ["8B",0xEF],
- ["A2",0xF3],
- ["93",0xF4],
- ["F6",0xF7],
- ["97",0xF9],
- ["A3",0xFA],
- ["96",0xFB],
- ["81",0xFC],
- ["9F",0x192],
- ["E2",0x393],
- ["E9",0x398],
- ["E4",0x3A3],
- ["E8",0x3A6],
- ["EA",0x3A9],
- ["E0",0x3B1],
- ["EB",0x3B4],
- ["EE",0x3B5],
- ["E3",0x3C0],
- ["E5",0x3C3],
- ["E7",0x3C4],
- ["ED",0x3C6],
- ["8D",0x2017],
- ["FC",0x207F],
- ["F9",0x2219],
- ["FB",0x221A],
- ["EC",0x221E],
- ["EF",0x2229],
- ["F7",0x2248],
- ["F0",0x2261],
- ["F3",0x2264],
- ["F2",0x2265],
- ["A9",0x2310],
- ["F4",0x2320],
- ["F5",0x2321],
- ["C4",0x2500],
- ["B3",0x2502],
- ["DA",0x250C],
- ["BF",0x2510],
- ["C0",0x2514],
- ["D9",0x2518],
- ["C3",0x251C],
- ["B4",0x2524],
- ["C2",0x252C],
- ["C1",0x2534],
- ["C5",0x253C],
- ["CD",0x2550],
- ["BA",0x2551],
- ["D5",0x2552],
- ["D6",0x2553],
- ["C9",0x2554],
- ["B8",0x2555],
- ["B7",0x2556],
- ["BB",0x2557],
- ["D4",0x2558],
- ["D3",0x2559],
- ["C8",0x255A],
- ["BE",0x255B],
- ["BD",0x255C],
- ["BC",0x255D],
- ["C6",0x255E],
- ["C7",0x255F],
- ["CC",0x2560],
- ["B5",0x2561],
- ["B6",0x2562],
- ["B9",0x2563],
- ["D1",0x2564],
- ["D2",0x2565],
- ["CB",0x2566],
- ["CF",0x2567],
- ["D0",0x2568],
- ["CA",0x2569],
- ["D8",0x256A],
- ["D7",0x256B],
- ["CE",0x256C],
- ["DF",0x2580],
- ["DC",0x2584],
- ["DB",0x2588],
- ["DD",0x258C],
- ["DE",0x2590],
- ["B0",0x2591],
- ["B1",0x2592],
- ["B2",0x2593],
- ["FE",0x25A0],
-] \ No newline at end of file
diff --git a/enc/trans/ibm865-tbl.rb b/enc/trans/ibm865-tbl.rb
deleted file mode 100644
index 22e322fb31..0000000000
--- a/enc/trans/ibm865-tbl.rb
+++ /dev/null
@@ -1,130 +0,0 @@
-IBM865_TO_UCS_TBL = [
- ["FF",0xA0],
- ["AD",0xA1],
- ["9C",0xA3],
- ["AF",0xA4],
- ["A6",0xAA],
- ["AE",0xAB],
- ["AA",0xAC],
- ["F8",0xB0],
- ["F1",0xB1],
- ["FD",0xB2],
- ["E6",0xB5],
- ["FA",0xB7],
- ["A7",0xBA],
- ["AC",0xBC],
- ["AB",0xBD],
- ["A8",0xBF],
- ["8E",0xC4],
- ["8F",0xC5],
- ["92",0xC6],
- ["80",0xC7],
- ["90",0xC9],
- ["A5",0xD1],
- ["99",0xD6],
- ["9D",0xD8],
- ["9A",0xDC],
- ["E1",0xDF],
- ["85",0xE0],
- ["A0",0xE1],
- ["83",0xE2],
- ["84",0xE4],
- ["86",0xE5],
- ["91",0xE6],
- ["87",0xE7],
- ["8A",0xE8],
- ["82",0xE9],
- ["88",0xEA],
- ["89",0xEB],
- ["8D",0xEC],
- ["A1",0xED],
- ["8C",0xEE],
- ["8B",0xEF],
- ["A4",0xF1],
- ["95",0xF2],
- ["A2",0xF3],
- ["93",0xF4],
- ["94",0xF6],
- ["F6",0xF7],
- ["9B",0xF8],
- ["97",0xF9],
- ["A3",0xFA],
- ["96",0xFB],
- ["81",0xFC],
- ["98",0xFF],
- ["9F",0x192],
- ["E2",0x393],
- ["E9",0x398],
- ["E4",0x3A3],
- ["E8",0x3A6],
- ["EA",0x3A9],
- ["E0",0x3B1],
- ["EB",0x3B4],
- ["EE",0x3B5],
- ["E3",0x3C0],
- ["E5",0x3C3],
- ["E7",0x3C4],
- ["ED",0x3C6],
- ["FC",0x207F],
- ["9E",0x20A7],
- ["F9",0x2219],
- ["FB",0x221A],
- ["EC",0x221E],
- ["EF",0x2229],
- ["F7",0x2248],
- ["F0",0x2261],
- ["F3",0x2264],
- ["F2",0x2265],
- ["A9",0x2310],
- ["F4",0x2320],
- ["F5",0x2321],
- ["C4",0x2500],
- ["B3",0x2502],
- ["DA",0x250C],
- ["BF",0x2510],
- ["C0",0x2514],
- ["D9",0x2518],
- ["C3",0x251C],
- ["B4",0x2524],
- ["C2",0x252C],
- ["C1",0x2534],
- ["C5",0x253C],
- ["CD",0x2550],
- ["BA",0x2551],
- ["D5",0x2552],
- ["D6",0x2553],
- ["C9",0x2554],
- ["B8",0x2555],
- ["B7",0x2556],
- ["BB",0x2557],
- ["D4",0x2558],
- ["D3",0x2559],
- ["C8",0x255A],
- ["BE",0x255B],
- ["BD",0x255C],
- ["BC",0x255D],
- ["C6",0x255E],
- ["C7",0x255F],
- ["CC",0x2560],
- ["B5",0x2561],
- ["B6",0x2562],
- ["B9",0x2563],
- ["D1",0x2564],
- ["D2",0x2565],
- ["CB",0x2566],
- ["CF",0x2567],
- ["D0",0x2568],
- ["CA",0x2569],
- ["D8",0x256A],
- ["D7",0x256B],
- ["CE",0x256C],
- ["DF",0x2580],
- ["DC",0x2584],
- ["DB",0x2588],
- ["DD",0x258C],
- ["DE",0x2590],
- ["B0",0x2591],
- ["B1",0x2592],
- ["B2",0x2593],
- ["FE",0x25A0],
-] \ No newline at end of file
diff --git a/enc/trans/ibm866-tbl.rb b/enc/trans/ibm866-tbl.rb
deleted file mode 100644
index 95b9ee7534..0000000000
--- a/enc/trans/ibm866-tbl.rb
+++ /dev/null
@@ -1,130 +0,0 @@
-IBM866_TO_UCS_TBL = [
- ["FF",0xA0],
- ["FD",0xA4],
- ["F8",0xB0],
- ["FA",0xB7],
- ["F0",0x401],
- ["F2",0x404],
- ["F4",0x407],
- ["F6",0x40E],
- ["80",0x410],
- ["81",0x411],
- ["82",0x412],
- ["83",0x413],
- ["84",0x414],
- ["85",0x415],
- ["86",0x416],
- ["87",0x417],
- ["88",0x418],
- ["89",0x419],
- ["8A",0x41A],
- ["8B",0x41B],
- ["8C",0x41C],
- ["8D",0x41D],
- ["8E",0x41E],
- ["8F",0x41F],
- ["90",0x420],
- ["91",0x421],
- ["92",0x422],
- ["93",0x423],
- ["94",0x424],
- ["95",0x425],
- ["96",0x426],
- ["97",0x427],
- ["98",0x428],
- ["99",0x429],
- ["9A",0x42A],
- ["9B",0x42B],
- ["9C",0x42C],
- ["9D",0x42D],
- ["9E",0x42E],
- ["9F",0x42F],
- ["A0",0x430],
- ["A1",0x431],
- ["A2",0x432],
- ["A3",0x433],
- ["A4",0x434],
- ["A5",0x435],
- ["A6",0x436],
- ["A7",0x437],
- ["A8",0x438],
- ["A9",0x439],
- ["AA",0x43A],
- ["AB",0x43B],
- ["AC",0x43C],
- ["AD",0x43D],
- ["AE",0x43E],
- ["AF",0x43F],
- ["E0",0x440],
- ["E1",0x441],
- ["E2",0x442],
- ["E3",0x443],
- ["E4",0x444],
- ["E5",0x445],
- ["E6",0x446],
- ["E7",0x447],
- ["E8",0x448],
- ["E9",0x449],
- ["EA",0x44A],
- ["EB",0x44B],
- ["EC",0x44C],
- ["ED",0x44D],
- ["EE",0x44E],
- ["EF",0x44F],
- ["F1",0x451],
- ["F3",0x454],
- ["F5",0x457],
- ["F7",0x45E],
- ["FC",0x2116],
- ["F9",0x2219],
- ["FB",0x221A],
- ["C4",0x2500],
- ["B3",0x2502],
- ["DA",0x250C],
- ["BF",0x2510],
- ["C0",0x2514],
- ["D9",0x2518],
- ["C3",0x251C],
- ["B4",0x2524],
- ["C2",0x252C],
- ["C1",0x2534],
- ["C5",0x253C],
- ["CD",0x2550],
- ["BA",0x2551],
- ["D5",0x2552],
- ["D6",0x2553],
- ["C9",0x2554],
- ["B8",0x2555],
- ["B7",0x2556],
- ["BB",0x2557],
- ["D4",0x2558],
- ["D3",0x2559],
- ["C8",0x255A],
- ["BE",0x255B],
- ["BD",0x255C],
- ["BC",0x255D],
- ["C6",0x255E],
- ["C7",0x255F],
- ["CC",0x2560],
- ["B5",0x2561],
- ["B6",0x2562],
- ["B9",0x2563],
- ["D1",0x2564],
- ["D2",0x2565],
- ["CB",0x2566],
- ["CF",0x2567],
- ["D0",0x2568],
- ["CA",0x2569],
- ["D8",0x256A],
- ["D7",0x256B],
- ["CE",0x256C],
- ["DF",0x2580],
- ["DC",0x2584],
- ["DB",0x2588],
- ["DD",0x258C],
- ["DE",0x2590],
- ["B0",0x2591],
- ["B1",0x2592],
- ["B2",0x2593],
- ["FE",0x25A0],
-] \ No newline at end of file
diff --git a/enc/trans/ibm869-tbl.rb b/enc/trans/ibm869-tbl.rb
deleted file mode 100644
index 437e41ad98..0000000000
--- a/enc/trans/ibm869-tbl.rb
+++ /dev/null
@@ -1,121 +0,0 @@
-IBM869_TO_UCS_TBL = [
- ["FF",0xA0],
- ["9C",0xA3],
- ["8A",0xA6],
- ["F5",0xA7],
- ["F9",0xA8],
- ["97",0xA9],
- ["AE",0xAB],
- ["89",0xAC],
- ["F0",0xAD],
- ["F8",0xB0],
- ["F1",0xB1],
- ["99",0xB2],
- ["9A",0xB3],
- ["88",0xB7],
- ["AF",0xBB],
- ["AB",0xBD],
- ["EF",0x384],
- ["F7",0x385],
- ["86",0x386],
- ["8D",0x388],
- ["8F",0x389],
- ["90",0x38A],
- ["92",0x38C],
- ["95",0x38E],
- ["98",0x38F],
- ["A1",0x390],
- ["A4",0x391],
- ["A5",0x392],
- ["A6",0x393],
- ["A7",0x394],
- ["A8",0x395],
- ["A9",0x396],
- ["AA",0x397],
- ["AC",0x398],
- ["AD",0x399],
- ["B5",0x39A],
- ["B6",0x39B],
- ["B7",0x39C],
- ["B8",0x39D],
- ["BD",0x39E],
- ["BE",0x39F],
- ["C6",0x3A0],
- ["C7",0x3A1],
- ["CF",0x3A3],
- ["D0",0x3A4],
- ["D1",0x3A5],
- ["D2",0x3A6],
- ["D3",0x3A7],
- ["D4",0x3A8],
- ["D5",0x3A9],
- ["91",0x3AA],
- ["96",0x3AB],
- ["9B",0x3AC],
- ["9D",0x3AD],
- ["9E",0x3AE],
- ["9F",0x3AF],
- ["FC",0x3B0],
- ["D6",0x3B1],
- ["D7",0x3B2],
- ["D8",0x3B3],
- ["DD",0x3B4],
- ["DE",0x3B5],
- ["E0",0x3B6],
- ["E1",0x3B7],
- ["E2",0x3B8],
- ["E3",0x3B9],
- ["E4",0x3BA],
- ["E5",0x3BB],
- ["E6",0x3BC],
- ["E7",0x3BD],
- ["E8",0x3BE],
- ["E9",0x3BF],
- ["EA",0x3C0],
- ["EB",0x3C1],
- ["ED",0x3C2],
- ["EC",0x3C3],
- ["EE",0x3C4],
- ["F2",0x3C5],
- ["F3",0x3C6],
- ["F4",0x3C7],
- ["F6",0x3C8],
- ["FA",0x3C9],
- ["A0",0x3CA],
- ["FB",0x3CB],
- ["A2",0x3CC],
- ["A3",0x3CD],
- ["FD",0x3CE],
- ["8E",0x2015],
- ["8B",0x2018],
- ["8C",0x2019],
- ["C4",0x2500],
- ["B3",0x2502],
- ["DA",0x250C],
- ["BF",0x2510],
- ["C0",0x2514],
- ["D9",0x2518],
- ["C3",0x251C],
- ["B4",0x2524],
- ["C2",0x252C],
- ["C1",0x2534],
- ["C5",0x253C],
- ["CD",0x2550],
- ["BA",0x2551],
- ["C9",0x2554],
- ["BB",0x2557],
- ["C8",0x255A],
- ["BC",0x255D],
- ["CC",0x2560],
- ["B9",0x2563],
- ["CB",0x2566],
- ["CA",0x2569],
- ["CE",0x256C],
- ["DF",0x2580],
- ["DC",0x2584],
- ["DB",0x2588],
- ["B0",0x2591],
- ["B1",0x2592],
- ["B2",0x2593],
- ["FE",0x25A0],
-] \ No newline at end of file
diff --git a/enc/trans/iso-8859-1-tbl.rb b/enc/trans/iso-8859-1-tbl.rb
deleted file mode 100644
index 05397e6417..0000000000
--- a/enc/trans/iso-8859-1-tbl.rb
+++ /dev/null
@@ -1,98 +0,0 @@
-ISO_8859_1_TO_UCS_TBL = [
- ["A0",0xA0],
- ["A1",0xA1],
- ["A2",0xA2],
- ["A3",0xA3],
- ["A4",0xA4],
- ["A5",0xA5],
- ["A6",0xA6],
- ["A7",0xA7],
- ["A8",0xA8],
- ["A9",0xA9],
- ["AA",0xAA],
- ["AB",0xAB],
- ["AC",0xAC],
- ["AD",0xAD],
- ["AE",0xAE],
- ["AF",0xAF],
- ["B0",0xB0],
- ["B1",0xB1],
- ["B2",0xB2],
- ["B3",0xB3],
- ["B4",0xB4],
- ["B5",0xB5],
- ["B6",0xB6],
- ["B7",0xB7],
- ["B8",0xB8],
- ["B9",0xB9],
- ["BA",0xBA],
- ["BB",0xBB],
- ["BC",0xBC],
- ["BD",0xBD],
- ["BE",0xBE],
- ["BF",0xBF],
- ["C0",0xC0],
- ["C1",0xC1],
- ["C2",0xC2],
- ["C3",0xC3],
- ["C4",0xC4],
- ["C5",0xC5],
- ["C6",0xC6],
- ["C7",0xC7],
- ["C8",0xC8],
- ["C9",0xC9],
- ["CA",0xCA],
- ["CB",0xCB],
- ["CC",0xCC],
- ["CD",0xCD],
- ["CE",0xCE],
- ["CF",0xCF],
- ["D0",0xD0],
- ["D1",0xD1],
- ["D2",0xD2],
- ["D3",0xD3],
- ["D4",0xD4],
- ["D5",0xD5],
- ["D6",0xD6],
- ["D7",0xD7],
- ["D8",0xD8],
- ["D9",0xD9],
- ["DA",0xDA],
- ["DB",0xDB],
- ["DC",0xDC],
- ["DD",0xDD],
- ["DE",0xDE],
- ["DF",0xDF],
- ["E0",0xE0],
- ["E1",0xE1],
- ["E2",0xE2],
- ["E3",0xE3],
- ["E4",0xE4],
- ["E5",0xE5],
- ["E6",0xE6],
- ["E7",0xE7],
- ["E8",0xE8],
- ["E9",0xE9],
- ["EA",0xEA],
- ["EB",0xEB],
- ["EC",0xEC],
- ["ED",0xED],
- ["EE",0xEE],
- ["EF",0xEF],
- ["F0",0xF0],
- ["F1",0xF1],
- ["F2",0xF2],
- ["F3",0xF3],
- ["F4",0xF4],
- ["F5",0xF5],
- ["F6",0xF6],
- ["F7",0xF7],
- ["F8",0xF8],
- ["F9",0xF9],
- ["FA",0xFA],
- ["FB",0xFB],
- ["FC",0xFC],
- ["FD",0xFD],
- ["FE",0xFE],
- ["FF",0xFF],
-]
diff --git a/enc/trans/iso-8859-10-tbl.rb b/enc/trans/iso-8859-10-tbl.rb
deleted file mode 100644
index 8104f526cc..0000000000
--- a/enc/trans/iso-8859-10-tbl.rb
+++ /dev/null
@@ -1,98 +0,0 @@
-ISO_8859_10_TO_UCS_TBL = [
- ["A0",0xA0],
- ["A1",0x104],
- ["A2",0x112],
- ["A3",0x122],
- ["A4",0x12A],
- ["A5",0x128],
- ["A6",0x136],
- ["A7",0xA7],
- ["A8",0x13B],
- ["A9",0x110],
- ["AA",0x160],
- ["AB",0x166],
- ["AC",0x17D],
- ["AD",0xAD],
- ["AE",0x16A],
- ["AF",0x14A],
- ["B0",0xB0],
- ["B1",0x105],
- ["B2",0x113],
- ["B3",0x123],
- ["B4",0x12B],
- ["B5",0x129],
- ["B6",0x137],
- ["B7",0xB7],
- ["B8",0x13C],
- ["B9",0x111],
- ["BA",0x161],
- ["BB",0x167],
- ["BC",0x17E],
- ["BD",0x2015],
- ["BE",0x16B],
- ["BF",0x14B],
- ["C0",0x100],
- ["C1",0xC1],
- ["C2",0xC2],
- ["C3",0xC3],
- ["C4",0xC4],
- ["C5",0xC5],
- ["C6",0xC6],
- ["C7",0x12E],
- ["C8",0x10C],
- ["C9",0xC9],
- ["CA",0x118],
- ["CB",0xCB],
- ["CC",0x116],
- ["CD",0xCD],
- ["CE",0xCE],
- ["CF",0xCF],
- ["D0",0xD0],
- ["D1",0x145],
- ["D2",0x14C],
- ["D3",0xD3],
- ["D4",0xD4],
- ["D5",0xD5],
- ["D6",0xD6],
- ["D7",0x168],
- ["D8",0xD8],
- ["D9",0x172],
- ["DA",0xDA],
- ["DB",0xDB],
- ["DC",0xDC],
- ["DD",0xDD],
- ["DE",0xDE],
- ["DF",0xDF],
- ["E0",0x101],
- ["E1",0xE1],
- ["E2",0xE2],
- ["E3",0xE3],
- ["E4",0xE4],
- ["E5",0xE5],
- ["E6",0xE6],
- ["E7",0x12F],
- ["E8",0x10D],
- ["E9",0xE9],
- ["EA",0x119],
- ["EB",0xEB],
- ["EC",0x117],
- ["ED",0xED],
- ["EE",0xEE],
- ["EF",0xEF],
- ["F0",0xF0],
- ["F1",0x146],
- ["F2",0x14D],
- ["F3",0xF3],
- ["F4",0xF4],
- ["F5",0xF5],
- ["F6",0xF6],
- ["F7",0x169],
- ["F8",0xF8],
- ["F9",0x173],
- ["FA",0xFA],
- ["FB",0xFB],
- ["FC",0xFC],
- ["FD",0xFD],
- ["FE",0xFE],
- ["FF",0x138],
-]
diff --git a/enc/trans/iso-8859-11-tbl.rb b/enc/trans/iso-8859-11-tbl.rb
deleted file mode 100644
index 686631c294..0000000000
--- a/enc/trans/iso-8859-11-tbl.rb
+++ /dev/null
@@ -1,90 +0,0 @@
-ISO_8859_11_TO_UCS_TBL = [
- ["A0",0xA0],
- ["A1",0xE01],
- ["A2",0xE02],
- ["A3",0xE03],
- ["A4",0xE04],
- ["A5",0xE05],
- ["A6",0xE06],
- ["A7",0xE07],
- ["A8",0xE08],
- ["A9",0xE09],
- ["AA",0xE0A],
- ["AB",0xE0B],
- ["AC",0xE0C],
- ["AD",0xE0D],
- ["AE",0xE0E],
- ["AF",0xE0F],
- ["B0",0xE10],
- ["B1",0xE11],
- ["B2",0xE12],
- ["B3",0xE13],
- ["B4",0xE14],
- ["B5",0xE15],
- ["B6",0xE16],
- ["B7",0xE17],
- ["B8",0xE18],
- ["B9",0xE19],
- ["BA",0xE1A],
- ["BB",0xE1B],
- ["BC",0xE1C],
- ["BD",0xE1D],
- ["BE",0xE1E],
- ["BF",0xE1F],
- ["C0",0xE20],
- ["C1",0xE21],
- ["C2",0xE22],
- ["C3",0xE23],
- ["C4",0xE24],
- ["C5",0xE25],
- ["C6",0xE26],
- ["C7",0xE27],
- ["C8",0xE28],
- ["C9",0xE29],
- ["CA",0xE2A],
- ["CB",0xE2B],
- ["CC",0xE2C],
- ["CD",0xE2D],
- ["CE",0xE2E],
- ["CF",0xE2F],
- ["D0",0xE30],
- ["D1",0xE31],
- ["D2",0xE32],
- ["D3",0xE33],
- ["D4",0xE34],
- ["D5",0xE35],
- ["D6",0xE36],
- ["D7",0xE37],
- ["D8",0xE38],
- ["D9",0xE39],
- ["DA",0xE3A],
- ["DF",0xE3F],
- ["E0",0xE40],
- ["E1",0xE41],
- ["E2",0xE42],
- ["E3",0xE43],
- ["E4",0xE44],
- ["E5",0xE45],
- ["E6",0xE46],
- ["E7",0xE47],
- ["E8",0xE48],
- ["E9",0xE49],
- ["EA",0xE4A],
- ["EB",0xE4B],
- ["EC",0xE4C],
- ["ED",0xE4D],
- ["EE",0xE4E],
- ["EF",0xE4F],
- ["F0",0xE50],
- ["F1",0xE51],
- ["F2",0xE52],
- ["F3",0xE53],
- ["F4",0xE54],
- ["F5",0xE55],
- ["F6",0xE56],
- ["F7",0xE57],
- ["F8",0xE58],
- ["F9",0xE59],
- ["FA",0xE5A],
- ["FB",0xE5B],
-]
diff --git a/enc/trans/iso-8859-13-tbl.rb b/enc/trans/iso-8859-13-tbl.rb
deleted file mode 100644
index 832d012c96..0000000000
--- a/enc/trans/iso-8859-13-tbl.rb
+++ /dev/null
@@ -1,98 +0,0 @@
-ISO_8859_13_TO_UCS_TBL = [
- ["A0",0xA0],
- ["A1",0x201D],
- ["A2",0xA2],
- ["A3",0xA3],
- ["A4",0xA4],
- ["A5",0x201E],
- ["A6",0xA6],
- ["A7",0xA7],
- ["A8",0xD8],
- ["A9",0xA9],
- ["AA",0x156],
- ["AB",0xAB],
- ["AC",0xAC],
- ["AD",0xAD],
- ["AE",0xAE],
- ["AF",0xC6],
- ["B0",0xB0],
- ["B1",0xB1],
- ["B2",0xB2],
- ["B3",0xB3],
- ["B4",0x201C],
- ["B5",0xB5],
- ["B6",0xB6],
- ["B7",0xB7],
- ["B8",0xF8],
- ["B9",0xB9],
- ["BA",0x157],
- ["BB",0xBB],
- ["BC",0xBC],
- ["BD",0xBD],
- ["BE",0xBE],
- ["BF",0xE6],
- ["C0",0x104],
- ["C1",0x12E],
- ["C2",0x100],
- ["C3",0x106],
- ["C4",0xC4],
- ["C5",0xC5],
- ["C6",0x118],
- ["C7",0x112],
- ["C8",0x10C],
- ["C9",0xC9],
- ["CA",0x179],
- ["CB",0x116],
- ["CC",0x122],
- ["CD",0x136],
- ["CE",0x12A],
- ["CF",0x13B],
- ["D0",0x160],
- ["D1",0x143],
- ["D2",0x145],
- ["D3",0xD3],
- ["D4",0x14C],
- ["D5",0xD5],
- ["D6",0xD6],
- ["D7",0xD7],
- ["D8",0x172],
- ["D9",0x141],
- ["DA",0x15A],
- ["DB",0x16A],
- ["DC",0xDC],
- ["DD",0x17B],
- ["DE",0x17D],
- ["DF",0xDF],
- ["E0",0x105],
- ["E1",0x12F],
- ["E2",0x101],
- ["E3",0x107],
- ["E4",0xE4],
- ["E5",0xE5],
- ["E6",0x119],
- ["E7",0x113],
- ["E8",0x10D],
- ["E9",0xE9],
- ["EA",0x17A],
- ["EB",0x117],
- ["EC",0x123],
- ["ED",0x137],
- ["EE",0x12B],
- ["EF",0x13C],
- ["F0",0x161],
- ["F1",0x144],
- ["F2",0x146],
- ["F3",0xF3],
- ["F4",0x14D],
- ["F5",0xF5],
- ["F6",0xF6],
- ["F7",0xF7],
- ["F8",0x173],
- ["F9",0x142],
- ["FA",0x15B],
- ["FB",0x16B],
- ["FC",0xFC],
- ["FD",0x17C],
- ["FE",0x17E],
- ["FF",0x2019],
-]
diff --git a/enc/trans/iso-8859-14-tbl.rb b/enc/trans/iso-8859-14-tbl.rb
deleted file mode 100644
index db5c13996a..0000000000
--- a/enc/trans/iso-8859-14-tbl.rb
+++ /dev/null
@@ -1,98 +0,0 @@
-ISO_8859_14_TO_UCS_TBL = [
- ["A0",0xA0],
- ["A1",0x1E02],
- ["A2",0x1E03],
- ["A3",0xA3],
- ["A4",0x10A],
- ["A5",0x10B],
- ["A6",0x1E0A],
- ["A7",0xA7],
- ["A8",0x1E80],
- ["A9",0xA9],
- ["AA",0x1E82],
- ["AB",0x1E0B],
- ["AC",0x1EF2],
- ["AD",0xAD],
- ["AE",0xAE],
- ["AF",0x178],
- ["B0",0x1E1E],
- ["B1",0x1E1F],
- ["B2",0x120],
- ["B3",0x121],
- ["B4",0x1E40],
- ["B5",0x1E41],
- ["B6",0xB6],
- ["B7",0x1E56],
- ["B8",0x1E81],
- ["B9",0x1E57],
- ["BA",0x1E83],
- ["BB",0x1E60],
- ["BC",0x1EF3],
- ["BD",0x1E84],
- ["BE",0x1E85],
- ["BF",0x1E61],
- ["C0",0xC0],
- ["C1",0xC1],
- ["C2",0xC2],
- ["C3",0xC3],
- ["C4",0xC4],
- ["C5",0xC5],
- ["C6",0xC6],
- ["C7",0xC7],
- ["C8",0xC8],
- ["C9",0xC9],
- ["CA",0xCA],
- ["CB",0xCB],
- ["CC",0xCC],
- ["CD",0xCD],
- ["CE",0xCE],
- ["CF",0xCF],
- ["D0",0x174],
- ["D1",0xD1],
- ["D2",0xD2],
- ["D3",0xD3],
- ["D4",0xD4],
- ["D5",0xD5],
- ["D6",0xD6],
- ["D7",0x1E6A],
- ["D8",0xD8],
- ["D9",0xD9],
- ["DA",0xDA],
- ["DB",0xDB],
- ["DC",0xDC],
- ["DD",0xDD],
- ["DE",0x176],
- ["DF",0xDF],
- ["E0",0xE0],
- ["E1",0xE1],
- ["E2",0xE2],
- ["E3",0xE3],
- ["E4",0xE4],
- ["E5",0xE5],
- ["E6",0xE6],
- ["E7",0xE7],
- ["E8",0xE8],
- ["E9",0xE9],
- ["EA",0xEA],
- ["EB",0xEB],
- ["EC",0xEC],
- ["ED",0xED],
- ["EE",0xEE],
- ["EF",0xEF],
- ["F0",0x175],
- ["F1",0xF1],
- ["F2",0xF2],
- ["F3",0xF3],
- ["F4",0xF4],
- ["F5",0xF5],
- ["F6",0xF6],
- ["F7",0x1E6B],
- ["F8",0xF8],
- ["F9",0xF9],
- ["FA",0xFA],
- ["FB",0xFB],
- ["FC",0xFC],
- ["FD",0xFD],
- ["FE",0x177],
- ["FF",0xFF],
-]
diff --git a/enc/trans/iso-8859-15-tbl.rb b/enc/trans/iso-8859-15-tbl.rb
deleted file mode 100644
index 54d952a25f..0000000000
--- a/enc/trans/iso-8859-15-tbl.rb
+++ /dev/null
@@ -1,98 +0,0 @@
-ISO_8859_15_TO_UCS_TBL = [
- ["A0",0xA0],
- ["A1",0xA1],
- ["A2",0xA2],
- ["A3",0xA3],
- ["A4",0x20AC],
- ["A5",0xA5],
- ["A6",0x160],
- ["A7",0xA7],
- ["A8",0x161],
- ["A9",0xA9],
- ["AA",0xAA],
- ["AB",0xAB],
- ["AC",0xAC],
- ["AD",0xAD],
- ["AE",0xAE],
- ["AF",0xAF],
- ["B0",0xB0],
- ["B1",0xB1],
- ["B2",0xB2],
- ["B3",0xB3],
- ["B4",0x17D],
- ["B5",0xB5],
- ["B6",0xB6],
- ["B7",0xB7],
- ["B8",0x17E],
- ["B9",0xB9],
- ["BA",0xBA],
- ["BB",0xBB],
- ["BC",0x152],
- ["BD",0x153],
- ["BE",0x178],
- ["BF",0xBF],
- ["C0",0xC0],
- ["C1",0xC1],
- ["C2",0xC2],
- ["C3",0xC3],
- ["C4",0xC4],
- ["C5",0xC5],
- ["C6",0xC6],
- ["C7",0xC7],
- ["C8",0xC8],
- ["C9",0xC9],
- ["CA",0xCA],
- ["CB",0xCB],
- ["CC",0xCC],
- ["CD",0xCD],
- ["CE",0xCE],
- ["CF",0xCF],
- ["D0",0xD0],
- ["D1",0xD1],
- ["D2",0xD2],
- ["D3",0xD3],
- ["D4",0xD4],
- ["D5",0xD5],
- ["D6",0xD6],
- ["D7",0xD7],
- ["D8",0xD8],
- ["D9",0xD9],
- ["DA",0xDA],
- ["DB",0xDB],
- ["DC",0xDC],
- ["DD",0xDD],
- ["DE",0xDE],
- ["DF",0xDF],
- ["E0",0xE0],
- ["E1",0xE1],
- ["E2",0xE2],
- ["E3",0xE3],
- ["E4",0xE4],
- ["E5",0xE5],
- ["E6",0xE6],
- ["E7",0xE7],
- ["E8",0xE8],
- ["E9",0xE9],
- ["EA",0xEA],
- ["EB",0xEB],
- ["EC",0xEC],
- ["ED",0xED],
- ["EE",0xEE],
- ["EF",0xEF],
- ["F0",0xF0],
- ["F1",0xF1],
- ["F2",0xF2],
- ["F3",0xF3],
- ["F4",0xF4],
- ["F5",0xF5],
- ["F6",0xF6],
- ["F7",0xF7],
- ["F8",0xF8],
- ["F9",0xF9],
- ["FA",0xFA],
- ["FB",0xFB],
- ["FC",0xFC],
- ["FD",0xFD],
- ["FE",0xFE],
- ["FF",0xFF],
-]
diff --git a/enc/trans/iso-8859-2-tbl.rb b/enc/trans/iso-8859-2-tbl.rb
deleted file mode 100644
index adf2bb1182..0000000000
--- a/enc/trans/iso-8859-2-tbl.rb
+++ /dev/null
@@ -1,98 +0,0 @@
-ISO_8859_2_TO_UCS_TBL = [
- ["A0",0xA0],
- ["A1",0x104],
- ["A2",0x2D8],
- ["A3",0x141],
- ["A4",0xA4],
- ["A5",0x13D],
- ["A6",0x15A],
- ["A7",0xA7],
- ["A8",0xA8],
- ["A9",0x160],
- ["AA",0x15E],
- ["AB",0x164],
- ["AC",0x179],
- ["AD",0xAD],
- ["AE",0x17D],
- ["AF",0x17B],
- ["B0",0xB0],
- ["B1",0x105],
- ["B2",0x2DB],
- ["B3",0x142],
- ["B4",0xB4],
- ["B5",0x13E],
- ["B6",0x15B],
- ["B7",0x2C7],
- ["B8",0xB8],
- ["B9",0x161],
- ["BA",0x15F],
- ["BB",0x165],
- ["BC",0x17A],
- ["BD",0x2DD],
- ["BE",0x17E],
- ["BF",0x17C],
- ["C0",0x154],
- ["C1",0xC1],
- ["C2",0xC2],
- ["C3",0x102],
- ["C4",0xC4],
- ["C5",0x139],
- ["C6",0x106],
- ["C7",0xC7],
- ["C8",0x10C],
- ["C9",0xC9],
- ["CA",0x118],
- ["CB",0xCB],
- ["CC",0x11A],
- ["CD",0xCD],
- ["CE",0xCE],
- ["CF",0x10E],
- ["D0",0x110],
- ["D1",0x143],
- ["D2",0x147],
- ["D3",0xD3],
- ["D4",0xD4],
- ["D5",0x150],
- ["D6",0xD6],
- ["D7",0xD7],
- ["D8",0x158],
- ["D9",0x16E],
- ["DA",0xDA],
- ["DB",0x170],
- ["DC",0xDC],
- ["DD",0xDD],
- ["DE",0x162],
- ["DF",0xDF],
- ["E0",0x155],
- ["E1",0xE1],
- ["E2",0xE2],
- ["E3",0x103],
- ["E4",0xE4],
- ["E5",0x13A],
- ["E6",0x107],
- ["E7",0xE7],
- ["E8",0x10D],
- ["E9",0xE9],
- ["EA",0x119],
- ["EB",0xEB],
- ["EC",0x11B],
- ["ED",0xED],
- ["EE",0xEE],
- ["EF",0x10F],
- ["F0",0x111],
- ["F1",0x144],
- ["F2",0x148],
- ["F3",0xF3],
- ["F4",0xF4],
- ["F5",0x151],
- ["F6",0xF6],
- ["F7",0xF7],
- ["F8",0x159],
- ["F9",0x16F],
- ["FA",0xFA],
- ["FB",0x171],
- ["FC",0xFC],
- ["FD",0xFD],
- ["FE",0x163],
- ["FF",0x2D9],
-]
diff --git a/enc/trans/iso-8859-3-tbl.rb b/enc/trans/iso-8859-3-tbl.rb
deleted file mode 100644
index 4751ee0c0a..0000000000
--- a/enc/trans/iso-8859-3-tbl.rb
+++ /dev/null
@@ -1,91 +0,0 @@
-ISO_8859_3_TO_UCS_TBL = [
- ["A0",0xA0],
- ["A1",0x126],
- ["A2",0x2D8],
- ["A3",0xA3],
- ["A4",0xA4],
- ["A6",0x124],
- ["A7",0xA7],
- ["A8",0xA8],
- ["A9",0x130],
- ["AA",0x15E],
- ["AB",0x11E],
- ["AC",0x134],
- ["AD",0xAD],
- ["AF",0x17B],
- ["B0",0xB0],
- ["B1",0x127],
- ["B2",0xB2],
- ["B3",0xB3],
- ["B4",0xB4],
- ["B5",0xB5],
- ["B6",0x125],
- ["B7",0xB7],
- ["B8",0xB8],
- ["B9",0x131],
- ["BA",0x15F],
- ["BB",0x11F],
- ["BC",0x135],
- ["BD",0xBD],
- ["BF",0x17C],
- ["C0",0xC0],
- ["C1",0xC1],
- ["C2",0xC2],
- ["C4",0xC4],
- ["C5",0x10A],
- ["C6",0x108],
- ["C7",0xC7],
- ["C8",0xC8],
- ["C9",0xC9],
- ["CA",0xCA],
- ["CB",0xCB],
- ["CC",0xCC],
- ["CD",0xCD],
- ["CE",0xCE],
- ["CF",0xCF],
- ["D1",0xD1],
- ["D2",0xD2],
- ["D3",0xD3],
- ["D4",0xD4],
- ["D5",0x120],
- ["D6",0xD6],
- ["D7",0xD7],
- ["D8",0x11C],
- ["D9",0xD9],
- ["DA",0xDA],
- ["DB",0xDB],
- ["DC",0xDC],
- ["DD",0x16C],
- ["DE",0x15C],
- ["DF",0xDF],
- ["E0",0xE0],
- ["E1",0xE1],
- ["E2",0xE2],
- ["E4",0xE4],
- ["E5",0x10B],
- ["E6",0x109],
- ["E7",0xE7],
- ["E8",0xE8],
- ["E9",0xE9],
- ["EA",0xEA],
- ["EB",0xEB],
- ["EC",0xEC],
- ["ED",0xED],
- ["EE",0xEE],
- ["EF",0xEF],
- ["F1",0xF1],
- ["F2",0xF2],
- ["F3",0xF3],
- ["F4",0xF4],
- ["F5",0x121],
- ["F6",0xF6],
- ["F7",0xF7],
- ["F8",0x11D],
- ["F9",0xF9],
- ["FA",0xFA],
- ["FB",0xFB],
- ["FC",0xFC],
- ["FD",0x16D],
- ["FE",0x15D],
- ["FF",0x2D9],
-]
diff --git a/enc/trans/iso-8859-4-tbl.rb b/enc/trans/iso-8859-4-tbl.rb
deleted file mode 100644
index ff13883321..0000000000
--- a/enc/trans/iso-8859-4-tbl.rb
+++ /dev/null
@@ -1,98 +0,0 @@
-ISO_8859_4_TO_UCS_TBL = [
- ["A0",0xA0],
- ["A1",0x104],
- ["A2",0x138],
- ["A3",0x156],
- ["A4",0xA4],
- ["A5",0x128],
- ["A6",0x13B],
- ["A7",0xA7],
- ["A8",0xA8],
- ["A9",0x160],
- ["AA",0x112],
- ["AB",0x122],
- ["AC",0x166],
- ["AD",0xAD],
- ["AE",0x17D],
- ["AF",0xAF],
- ["B0",0xB0],
- ["B1",0x105],
- ["B2",0x2DB],
- ["B3",0x157],
- ["B4",0xB4],
- ["B5",0x129],
- ["B6",0x13C],
- ["B7",0x2C7],
- ["B8",0xB8],
- ["B9",0x161],
- ["BA",0x113],
- ["BB",0x123],
- ["BC",0x167],
- ["BD",0x14A],
- ["BE",0x17E],
- ["BF",0x14B],
- ["C0",0x100],
- ["C1",0xC1],
- ["C2",0xC2],
- ["C3",0xC3],
- ["C4",0xC4],
- ["C5",0xC5],
- ["C6",0xC6],
- ["C7",0x12E],
- ["C8",0x10C],
- ["C9",0xC9],
- ["CA",0x118],
- ["CB",0xCB],
- ["CC",0x116],
- ["CD",0xCD],
- ["CE",0xCE],
- ["CF",0x12A],
- ["D0",0x110],
- ["D1",0x145],
- ["D2",0x14C],
- ["D3",0x136],
- ["D4",0xD4],
- ["D5",0xD5],
- ["D6",0xD6],
- ["D7",0xD7],
- ["D8",0xD8],
- ["D9",0x172],
- ["DA",0xDA],
- ["DB",0xDB],
- ["DC",0xDC],
- ["DD",0x168],
- ["DE",0x16A],
- ["DF",0xDF],
- ["E0",0x101],
- ["E1",0xE1],
- ["E2",0xE2],
- ["E3",0xE3],
- ["E4",0xE4],
- ["E5",0xE5],
- ["E6",0xE6],
- ["E7",0x12F],
- ["E8",0x10D],
- ["E9",0xE9],
- ["EA",0x119],
- ["EB",0xEB],
- ["EC",0x117],
- ["ED",0xED],
- ["EE",0xEE],
- ["EF",0x12B],
- ["F0",0x111],
- ["F1",0x146],
- ["F2",0x14D],
- ["F3",0x137],
- ["F4",0xF4],
- ["F5",0xF5],
- ["F6",0xF6],
- ["F7",0xF7],
- ["F8",0xF8],
- ["F9",0x173],
- ["FA",0xFA],
- ["FB",0xFB],
- ["FC",0xFC],
- ["FD",0x169],
- ["FE",0x16B],
- ["FF",0x2D9],
-]
diff --git a/enc/trans/iso-8859-5-tbl.rb b/enc/trans/iso-8859-5-tbl.rb
deleted file mode 100644
index b0ef366a27..0000000000
--- a/enc/trans/iso-8859-5-tbl.rb
+++ /dev/null
@@ -1,98 +0,0 @@
-ISO_8859_5_TO_UCS_TBL = [
- ["A0",0xA0],
- ["A1",0x401],
- ["A2",0x402],
- ["A3",0x403],
- ["A4",0x404],
- ["A5",0x405],
- ["A6",0x406],
- ["A7",0x407],
- ["A8",0x408],
- ["A9",0x409],
- ["AA",0x40A],
- ["AB",0x40B],
- ["AC",0x40C],
- ["AD",0xAD],
- ["AE",0x40E],
- ["AF",0x40F],
- ["B0",0x410],
- ["B1",0x411],
- ["B2",0x412],
- ["B3",0x413],
- ["B4",0x414],
- ["B5",0x415],
- ["B6",0x416],
- ["B7",0x417],
- ["B8",0x418],
- ["B9",0x419],
- ["BA",0x41A],
- ["BB",0x41B],
- ["BC",0x41C],
- ["BD",0x41D],
- ["BE",0x41E],
- ["BF",0x41F],
- ["C0",0x420],
- ["C1",0x421],
- ["C2",0x422],
- ["C3",0x423],
- ["C4",0x424],
- ["C5",0x425],
- ["C6",0x426],
- ["C7",0x427],
- ["C8",0x428],
- ["C9",0x429],
- ["CA",0x42A],
- ["CB",0x42B],
- ["CC",0x42C],
- ["CD",0x42D],
- ["CE",0x42E],
- ["CF",0x42F],
- ["D0",0x430],
- ["D1",0x431],
- ["D2",0x432],
- ["D3",0x433],
- ["D4",0x434],
- ["D5",0x435],
- ["D6",0x436],
- ["D7",0x437],
- ["D8",0x438],
- ["D9",0x439],
- ["DA",0x43A],
- ["DB",0x43B],
- ["DC",0x43C],
- ["DD",0x43D],
- ["DE",0x43E],
- ["DF",0x43F],
- ["E0",0x440],
- ["E1",0x441],
- ["E2",0x442],
- ["E3",0x443],
- ["E4",0x444],
- ["E5",0x445],
- ["E6",0x446],
- ["E7",0x447],
- ["E8",0x448],
- ["E9",0x449],
- ["EA",0x44A],
- ["EB",0x44B],
- ["EC",0x44C],
- ["ED",0x44D],
- ["EE",0x44E],
- ["EF",0x44F],
- ["F0",0x2116],
- ["F1",0x451],
- ["F2",0x452],
- ["F3",0x453],
- ["F4",0x454],
- ["F5",0x455],
- ["F6",0x456],
- ["F7",0x457],
- ["F8",0x458],
- ["F9",0x459],
- ["FA",0x45A],
- ["FB",0x45B],
- ["FC",0x45C],
- ["FD",0xA7],
- ["FE",0x45E],
- ["FF",0x45F],
-]
diff --git a/enc/trans/iso-8859-6-tbl.rb b/enc/trans/iso-8859-6-tbl.rb
deleted file mode 100644
index d387372b98..0000000000
--- a/enc/trans/iso-8859-6-tbl.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-ISO_8859_6_TO_UCS_TBL = [
- ["A0",0xA0],
- ["A4",0xA4],
- ["AC",0x60C],
- ["AD",0xAD],
- ["BB",0x61B],
- ["BF",0x61F],
- ["C1",0x621],
- ["C2",0x622],
- ["C3",0x623],
- ["C4",0x624],
- ["C5",0x625],
- ["C6",0x626],
- ["C7",0x627],
- ["C8",0x628],
- ["C9",0x629],
- ["CA",0x62A],
- ["CB",0x62B],
- ["CC",0x62C],
- ["CD",0x62D],
- ["CE",0x62E],
- ["CF",0x62F],
- ["D0",0x630],
- ["D1",0x631],
- ["D2",0x632],
- ["D3",0x633],
- ["D4",0x634],
- ["D5",0x635],
- ["D6",0x636],
- ["D7",0x637],
- ["D8",0x638],
- ["D9",0x639],
- ["DA",0x63A],
- ["E0",0x640],
- ["E1",0x641],
- ["E2",0x642],
- ["E3",0x643],
- ["E4",0x644],
- ["E5",0x645],
- ["E6",0x646],
- ["E7",0x647],
- ["E8",0x648],
- ["E9",0x649],
- ["EA",0x64A],
- ["EB",0x64B],
- ["EC",0x64C],
- ["ED",0x64D],
- ["EE",0x64E],
- ["EF",0x64F],
- ["F0",0x650],
- ["F1",0x651],
- ["F2",0x652],
-]
diff --git a/enc/trans/iso-8859-7-tbl.rb b/enc/trans/iso-8859-7-tbl.rb
deleted file mode 100644
index 4ebce5c1f1..0000000000
--- a/enc/trans/iso-8859-7-tbl.rb
+++ /dev/null
@@ -1,95 +0,0 @@
-ISO_8859_7_TO_UCS_TBL = [
- ["A0",0xA0],
- ["A1",0x2018],
- ["A2",0x2019],
- ["A3",0xA3],
- ["A4",0x20AC],
- ["A5",0x20AF],
- ["A6",0xA6],
- ["A7",0xA7],
- ["A8",0xA8],
- ["A9",0xA9],
- ["AA",0x37A],
- ["AB",0xAB],
- ["AC",0xAC],
- ["AD",0xAD],
- ["AF",0x2015],
- ["B0",0xB0],
- ["B1",0xB1],
- ["B2",0xB2],
- ["B3",0xB3],
- ["B4",0x384],
- ["B5",0x385],
- ["B6",0x386],
- ["B7",0xB7],
- ["B8",0x388],
- ["B9",0x389],
- ["BA",0x38A],
- ["BB",0xBB],
- ["BC",0x38C],
- ["BD",0xBD],
- ["BE",0x38E],
- ["BF",0x38F],
- ["C0",0x390],
- ["C1",0x391],
- ["C2",0x392],
- ["C3",0x393],
- ["C4",0x394],
- ["C5",0x395],
- ["C6",0x396],
- ["C7",0x397],
- ["C8",0x398],
- ["C9",0x399],
- ["CA",0x39A],
- ["CB",0x39B],
- ["CC",0x39C],
- ["CD",0x39D],
- ["CE",0x39E],
- ["CF",0x39F],
- ["D0",0x3A0],
- ["D1",0x3A1],
- ["D3",0x3A3],
- ["D4",0x3A4],
- ["D5",0x3A5],
- ["D6",0x3A6],
- ["D7",0x3A7],
- ["D8",0x3A8],
- ["D9",0x3A9],
- ["DA",0x3AA],
- ["DB",0x3AB],
- ["DC",0x3AC],
- ["DD",0x3AD],
- ["DE",0x3AE],
- ["DF",0x3AF],
- ["E0",0x3B0],
- ["E1",0x3B1],
- ["E2",0x3B2],
- ["E3",0x3B3],
- ["E4",0x3B4],
- ["E5",0x3B5],
- ["E6",0x3B6],
- ["E7",0x3B7],
- ["E8",0x3B8],
- ["E9",0x3B9],
- ["EA",0x3BA],
- ["EB",0x3BB],
- ["EC",0x3BC],
- ["ED",0x3BD],
- ["EE",0x3BE],
- ["EF",0x3BF],
- ["F0",0x3C0],
- ["F1",0x3C1],
- ["F2",0x3C2],
- ["F3",0x3C3],
- ["F4",0x3C4],
- ["F5",0x3C5],
- ["F6",0x3C6],
- ["F7",0x3C7],
- ["F8",0x3C8],
- ["F9",0x3C9],
- ["FA",0x3CA],
- ["FB",0x3CB],
- ["FC",0x3CC],
- ["FD",0x3CD],
- ["FE",0x3CE],
-]
diff --git a/enc/trans/iso-8859-8-tbl.rb b/enc/trans/iso-8859-8-tbl.rb
deleted file mode 100644
index d0806f4524..0000000000
--- a/enc/trans/iso-8859-8-tbl.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-ISO_8859_8_TO_UCS_TBL = [
- ["A0",0xA0],
- ["A2",0xA2],
- ["A3",0xA3],
- ["A4",0xA4],
- ["A5",0xA5],
- ["A6",0xA6],
- ["A7",0xA7],
- ["A8",0xA8],
- ["A9",0xA9],
- ["AA",0xD7],
- ["AB",0xAB],
- ["AC",0xAC],
- ["AD",0xAD],
- ["AE",0xAE],
- ["AF",0xAF],
- ["B0",0xB0],
- ["B1",0xB1],
- ["B2",0xB2],
- ["B3",0xB3],
- ["B4",0xB4],
- ["B5",0xB5],
- ["B6",0xB6],
- ["B7",0xB7],
- ["B8",0xB8],
- ["B9",0xB9],
- ["BA",0xF7],
- ["BB",0xBB],
- ["BC",0xBC],
- ["BD",0xBD],
- ["BE",0xBE],
- ["DF",0x2017],
- ["E0",0x5D0],
- ["E1",0x5D1],
- ["E2",0x5D2],
- ["E3",0x5D3],
- ["E4",0x5D4],
- ["E5",0x5D5],
- ["E6",0x5D6],
- ["E7",0x5D7],
- ["E8",0x5D8],
- ["E9",0x5D9],
- ["EA",0x5DA],
- ["EB",0x5DB],
- ["EC",0x5DC],
- ["ED",0x5DD],
- ["EE",0x5DE],
- ["EF",0x5DF],
- ["F0",0x5E0],
- ["F1",0x5E1],
- ["F2",0x5E2],
- ["F3",0x5E3],
- ["F4",0x5E4],
- ["F5",0x5E5],
- ["F6",0x5E6],
- ["F7",0x5E7],
- ["F8",0x5E8],
- ["F9",0x5E9],
- ["FA",0x5EA],
- ["FD",0x200E],
- ["FE",0x200F],
-]
diff --git a/enc/trans/iso-8859-9-tbl.rb b/enc/trans/iso-8859-9-tbl.rb
deleted file mode 100644
index 0cd92d61e9..0000000000
--- a/enc/trans/iso-8859-9-tbl.rb
+++ /dev/null
@@ -1,98 +0,0 @@
-ISO_8859_9_TO_UCS_TBL = [
- ["A0",0xA0],
- ["A1",0xA1],
- ["A2",0xA2],
- ["A3",0xA3],
- ["A4",0xA4],
- ["A5",0xA5],
- ["A6",0xA6],
- ["A7",0xA7],
- ["A8",0xA8],
- ["A9",0xA9],
- ["AA",0xAA],
- ["AB",0xAB],
- ["AC",0xAC],
- ["AD",0xAD],
- ["AE",0xAE],
- ["AF",0xAF],
- ["B0",0xB0],
- ["B1",0xB1],
- ["B2",0xB2],
- ["B3",0xB3],
- ["B4",0xB4],
- ["B5",0xB5],
- ["B6",0xB6],
- ["B7",0xB7],
- ["B8",0xB8],
- ["B9",0xB9],
- ["BA",0xBA],
- ["BB",0xBB],
- ["BC",0xBC],
- ["BD",0xBD],
- ["BE",0xBE],
- ["BF",0xBF],
- ["C0",0xC0],
- ["C1",0xC1],
- ["C2",0xC2],
- ["C3",0xC3],
- ["C4",0xC4],
- ["C5",0xC5],
- ["C6",0xC6],
- ["C7",0xC7],
- ["C8",0xC8],
- ["C9",0xC9],
- ["CA",0xCA],
- ["CB",0xCB],
- ["CC",0xCC],
- ["CD",0xCD],
- ["CE",0xCE],
- ["CF",0xCF],
- ["D0",0x11E],
- ["D1",0xD1],
- ["D2",0xD2],
- ["D3",0xD3],
- ["D4",0xD4],
- ["D5",0xD5],
- ["D6",0xD6],
- ["D7",0xD7],
- ["D8",0xD8],
- ["D9",0xD9],
- ["DA",0xDA],
- ["DB",0xDB],
- ["DC",0xDC],
- ["DD",0x130],
- ["DE",0x15E],
- ["DF",0xDF],
- ["E0",0xE0],
- ["E1",0xE1],
- ["E2",0xE2],
- ["E3",0xE3],
- ["E4",0xE4],
- ["E5",0xE5],
- ["E6",0xE6],
- ["E7",0xE7],
- ["E8",0xE8],
- ["E9",0xE9],
- ["EA",0xEA],
- ["EB",0xEB],
- ["EC",0xEC],
- ["ED",0xED],
- ["EE",0xEE],
- ["EF",0xEF],
- ["F0",0x11F],
- ["F1",0xF1],
- ["F2",0xF2],
- ["F3",0xF3],
- ["F4",0xF4],
- ["F5",0xF5],
- ["F6",0xF6],
- ["F7",0xF7],
- ["F8",0xF8],
- ["F9",0xF9],
- ["FA",0xFA],
- ["FB",0xFB],
- ["FC",0xFC],
- ["FD",0x131],
- ["FE",0x15F],
- ["FF",0xFF],
-]
diff --git a/enc/trans/iso2022.trans b/enc/trans/iso2022.trans
deleted file mode 100644
index a93f211f62..0000000000
--- a/enc/trans/iso2022.trans
+++ /dev/null
@@ -1,438 +0,0 @@
-#include "transcode_data.h"
-
-<%
- map = {
- "1b2842" => :func_so, # designate US-ASCII to G0. "ESC ( B"
- "1b284a" => :func_so, # designate JIS X 0201 latin to G0. "ESC ( J"
- "1b2440" => :func_so, # designate JIS X 0208 1978 to G0. "ESC $ @"
- "1b2442" => :func_so, # designate JIS X 0208 1983 to G0. "ESC $ B"
- "{00-0d,10-1a,1c-7f}" => :func_si,
- }
- transcode_generate_node(ActionMap.parse(map), "iso2022jp_decoder")
-
- map_jisx0208_rest = {
- "{21-7e}" => :func_so
- }
- transcode_generate_node(ActionMap.parse(map_jisx0208_rest), "iso2022jp_decoder_jisx0208_rest")
-
- map = {
- "{00-0d,10-1a,1c-7f}" => :func_so,
- "90{a1-fe}{a1-fe}" => :func_so,
- "92{a1-fe}{a1-fe}" => :func_so,
- }
- transcode_generate_node(ActionMap.parse(map), "iso2022jp_encoder")
-
- map = {
- "{00-0d,10-1a,1c-7f}" => :nomap,
- "90{a1-fe}{a1-fe}" => :func_so,
- "92{a1-fe}{a1-fe}" => :func_so,
- }
- transcode_generate_node(ActionMap.parse(map), "stateless_iso2022jp_to_eucjp")
-
- map = {
- "{0e,0f,1b}" => :undef,
- "{00-0d,10-1a,1c-7f}" => :nomap,
- "{a1-fe}{a1-fe}" => :func_so,
- "8e{a1-fe}" => :undef,
- "8f{a1-fe}{a1-fe}" => :undef,
- }
- transcode_generate_node(ActionMap.parse(map), "eucjp_to_stateless_iso2022jp")
-
- map = {
- "1b2842" => :func_so, # designate US-ASCII to G0. "ESC ( B"
- "1b2849" => :func_so, # designate JIS X 0201 katakana to G0. "ESC ( I"
- "1b284a" => :func_so, # designate JIS X 0201 latin to G0. "ESC ( J"
- "1b2440" => :func_so, # designate JIS X 0208 1978 to G0. "ESC $ @"
- "1b2442" => :func_so, # designate JIS X 0208 1983 to G0. "ESC $ B"
- "0e" => :func_so, # designate JIS X 0201 katakana to G0. "SO"
- "0f" => :func_so, # designate US-ASCII to G0. "SI"
- "{00-0d,10-1a,1c-92}" => :func_si,
- }
- transcode_generate_node(ActionMap.parse(map), "cp50221_decoder")
-
- map = {
- "{0e,0f,1b}" => :undef,
- "{00-0d,10-1a,1c-7f}" => :func_so,
- "{a1-fe}{a1-fe}" => :func_so,
- "8e{a1-fe}" => :func_so,
- }
- transcode_generate_node(ActionMap.parse(map), "cp50221_encoder")
-
-%>
-
-<%= transcode_generated_code %>
-
-#define G0_ASCII 0
-/* ignore JIS X 0201 latin */
-#define G0_JISX0208_1978 1
-#define G0_JISX0208_1983 2
-#define G0_JISX0201_KATAKANA 3
-
-#define EMACS_MULE_LEADING_CODE_JISX0208_1978 0220
-#define EMACS_MULE_LEADING_CODE_JISX0208_1983 0222
-
-static int
-iso2022jp_init(void *statep)
-{
- unsigned char *sp = statep;
- *sp = G0_ASCII;
- return 0;
-}
-
-static VALUE
-fun_si_iso2022jp_decoder(void *statep, const unsigned char *s, size_t l)
-{
- unsigned char *sp = statep;
- if (*sp == G0_ASCII)
- return (VALUE)NOMAP;
- else if (0x21 <= s[0] && s[0] <= 0x7e)
- return (VALUE)iso2022jp_decoder_jisx0208_rest;
- else
- return (VALUE)INVALID;
-}
-
-static ssize_t
-fun_so_iso2022jp_decoder(void *statep, const unsigned char *s, size_t l, unsigned char* o, size_t osize)
-{
- unsigned char *sp = statep;
- if (s[0] == 0x1b) {
- if (s[1] == '(') {
- switch (s[l-1]) {
- case 'B':
- case 'J':
- *sp = G0_ASCII;
- break;
- }
- }
- else {
- switch (s[l-1]) {
- case '@':
- *sp = G0_JISX0208_1978;
- break;
-
- case 'B':
- *sp = G0_JISX0208_1983;
- break;
- }
- }
- return 0;
- }
- else {
- if (*sp == G0_JISX0208_1978)
- o[0] = EMACS_MULE_LEADING_CODE_JISX0208_1978;
- else
- o[0] = EMACS_MULE_LEADING_CODE_JISX0208_1983;
- o[1] = s[0] | 0x80;
- o[2] = s[1] | 0x80;
- return 3;
- }
-}
-
-static const rb_transcoder
-rb_iso2022jp_decoder = {
- "ISO-2022-JP", "stateless-ISO-2022-JP", iso2022jp_decoder,
- TRANSCODE_TABLE_INFO,
- 1, /* input_unit_length */
- 3, /* max_input */
- 3, /* max_output */
- asciicompat_decoder, /* asciicompat_type */
- 1, iso2022jp_init, iso2022jp_init, /* state_size, state_init, state_fini */
- NULL, fun_si_iso2022jp_decoder, NULL, fun_so_iso2022jp_decoder
-};
-
-static ssize_t
-fun_so_iso2022jp_encoder(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
-{
- unsigned char *sp = statep;
- unsigned char *output0 = o;
- int newstate;
-
- if (l == 1)
- newstate = G0_ASCII;
- else if (s[0] == EMACS_MULE_LEADING_CODE_JISX0208_1978)
- newstate = G0_JISX0208_1978;
- else
- newstate = G0_JISX0208_1983;
-
- if (*sp != newstate) {
- if (newstate == G0_ASCII) {
- *o++ = 0x1b;
- *o++ = '(';
- *o++ = 'B';
- }
- else if (newstate == G0_JISX0208_1978) {
- *o++ = 0x1b;
- *o++ = '$';
- *o++ = '@';
- }
- else {
- *o++ = 0x1b;
- *o++ = '$';
- *o++ = 'B';
- }
- *sp = newstate;
- }
-
- if (l == 1) {
- *o++ = s[0] & 0x7f;
- }
- else {
- *o++ = s[1] & 0x7f;
- *o++ = s[2] & 0x7f;
- }
-
- return o - output0;
-}
-
-static ssize_t
-iso2022jp_encoder_reset_sequence_size(void *statep)
-{
- unsigned char *sp = statep;
- if (*sp != G0_ASCII)
- return 3;
- return 0;
-}
-
-static ssize_t
-finish_iso2022jp_encoder(void *statep, unsigned char *o, size_t osize)
-{
- unsigned char *sp = statep;
- unsigned char *output0 = o;
-
- if (*sp == G0_ASCII)
- return 0;
-
- *o++ = 0x1b;
- *o++ = '(';
- *o++ = 'B';
- *sp = G0_ASCII;
-
- return o - output0;
-}
-
-static const rb_transcoder
-rb_iso2022jp_encoder = {
- "stateless-ISO-2022-JP", "ISO-2022-JP", iso2022jp_encoder,
- TRANSCODE_TABLE_INFO,
- 1, /* input_unit_length */
- 3, /* max_input */
- 5, /* max_output */
- asciicompat_encoder, /* asciicompat_type */
- 1, iso2022jp_init, iso2022jp_init, /* state_size, state_init, state_fini */
- NULL, NULL, NULL, fun_so_iso2022jp_encoder,
- finish_iso2022jp_encoder,
- iso2022jp_encoder_reset_sequence_size, finish_iso2022jp_encoder
-};
-
-static ssize_t
-fun_so_stateless_iso2022jp_to_eucjp(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
-{
- o[0] = s[1];
- o[1] = s[2];
- return 2;
-}
-
-static const rb_transcoder
-rb_stateless_iso2022jp_to_eucjp = {
- "stateless-ISO-2022-JP", "EUC-JP", stateless_iso2022jp_to_eucjp,
- TRANSCODE_TABLE_INFO,
- 1, /* input_unit_length */
- 3, /* max_input */
- 2, /* max_output */
- asciicompat_converter, /* asciicompat_type */
- 0, NULL, NULL, /* state_size, state_init, state_fini */
- NULL, NULL, NULL, fun_so_stateless_iso2022jp_to_eucjp,
-};
-
-static ssize_t
-fun_so_eucjp_to_stateless_iso2022jp(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
-{
- o[0] = EMACS_MULE_LEADING_CODE_JISX0208_1983;
- o[1] = s[0];
- o[2] = s[1];
- return 3;
-}
-
-static const rb_transcoder
-rb_eucjp_to_stateless_iso2022jp = {
- "EUC-JP", "stateless-ISO-2022-JP", eucjp_to_stateless_iso2022jp,
- TRANSCODE_TABLE_INFO,
- 1, /* input_unit_length */
- 3, /* max_input */
- 3, /* max_output */
- asciicompat_converter, /* asciicompat_type */
- 0, NULL, NULL, /* state_size, state_init, state_fini */
- NULL, NULL, NULL, fun_so_eucjp_to_stateless_iso2022jp,
-};
-
-static VALUE
-fun_si_cp50221_decoder(void *statep, const unsigned char *s, size_t l)
-{
- unsigned char *sp = statep;
- switch (*sp) {
- case G0_ASCII:
- return (VALUE)NOMAP;
- case G0_JISX0201_KATAKANA:
- if (0x21 <= s[0] && s[0] <= 0x5f)
- return (VALUE)FUNso;
- break;
- case G0_JISX0208_1978:
- if (0x21 <= s[0] && s[0] <= 0x28 || 0x30 <= s[0] && s[0] <= 0x74)
- return (VALUE)iso2022jp_decoder_jisx0208_rest;
- break;
- case G0_JISX0208_1983:
- if (0x21 <= s[0] && s[0] <= 0x28 ||
- s[0] == 0x2D ||
- 0x30 <= s[0] && s[0] <= 0x74 ||
- 0x79 <= s[0] && s[0] <= 0x7C)
- /* 0x7F <= s[0] && s[0] <= 0x92) */
- return (VALUE)iso2022jp_decoder_jisx0208_rest;
- break;
- }
- return (VALUE)INVALID;
-}
-
-static ssize_t
-fun_so_cp50221_decoder(void *statep, const unsigned char *s, size_t l, unsigned char* o, size_t osize)
-{
- unsigned char *sp = statep;
- switch (s[0]) {
- case 0x1b:
- if (s[1] == '(') {
- switch (s[l-1]) {
- case 'B':
- case 'J':
- *sp = G0_ASCII;
- break;
- case 'I':
- *sp = G0_JISX0201_KATAKANA;
- break;
- }
- }
- else {
- switch (s[l-1]) {
- case '@':
- *sp = G0_JISX0208_1978;
- break;
- case 'B':
- *sp = G0_JISX0208_1983;
- break;
- }
- }
- return 0;
- case 0x0E:
- *sp = G0_JISX0201_KATAKANA;
- return 0;
- case 0x0F:
- *sp = G0_ASCII;
- return 0;
- default:
- if (*sp == G0_JISX0201_KATAKANA) {
- o[0] = 0x8E;
- o[1] = s[0] | 0x80;
- }
- /* else if (0x7F == s[0] && s[0] <= 0x88) { */
- /* User Defined Characters */
- /* o[n++] = s[0] | 0xE0; */
- /* o[n++] = s[1] | 0x80; */
- /* else if (0x89 <= s[0] && s[0] <= 0x92) { */
- /* User Defined Characters 2 */
- /* o[n++] = 0x8f; */
- /* o[n++] = s[0] + 0x6C; */
- /* o[n++] = s[1] | 0x80; */
- /* } */
- else {
- /* JIS X 0208 */
- /* NEC Special Characters */
- /* NEC-selected IBM extended Characters */
- o[0] = s[0] | 0x80;
- o[1] = s[1] | 0x80;
- }
- return 2;
- }
-}
-
-static const rb_transcoder
-rb_cp50221_decoder = {
- "CP50221", "cp51932", cp50221_decoder,
- TRANSCODE_TABLE_INFO,
- 1, /* input_unit_length */
- 3, /* max_input */
- 3, /* max_output */
- asciicompat_decoder, /* asciicompat_type */
- 1, iso2022jp_init, iso2022jp_init, /* state_size, state_init, state_fini */
- NULL, fun_si_cp50221_decoder, NULL, fun_so_cp50221_decoder
-};
-
-static ssize_t
-fun_so_cp50221_encoder(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
-{
- unsigned char *sp = statep;
- unsigned char *output0 = o;
- int newstate;
-
- if (l == 1)
- newstate = G0_ASCII;
- else if (s[0] == 0x8E) {
- s++;
- l = 1;
- newstate = G0_JISX0201_KATAKANA;
- }
- else
- newstate = G0_JISX0208_1983;
-
- if (*sp != newstate) {
- if (newstate == G0_ASCII) {
- *o++ = 0x1b;
- *o++ = '(';
- *o++ = 'B';
- }
- else if (newstate == G0_JISX0201_KATAKANA) {
- *o++ = 0x1b;
- *o++ = '(';
- *o++ = 'I';
- }
- else {
- *o++ = 0x1b;
- *o++ = '$';
- *o++ = 'B';
- }
- *sp = newstate;
- }
-
- if (l == 1) {
- *o++ = s[0] & 0x7f;
- }
- else {
- *o++ = s[0] & 0x7f;
- *o++ = s[1] & 0x7f;
- }
-
- return o - output0;
-}
-
-static const rb_transcoder
-rb_cp50221_encoder = {
- "CP51932", "CP50221", cp50221_encoder,
- TRANSCODE_TABLE_INFO,
- 1, /* input_unit_length */
- 3, /* max_input */
- 5, /* max_output */
- asciicompat_encoder, /* asciicompat_type */
- 1, iso2022jp_init, iso2022jp_init, /* state_size, state_init, state_fini */
- NULL, NULL, NULL, fun_so_cp50221_encoder,
- finish_iso2022jp_encoder,
- iso2022jp_encoder_reset_sequence_size, finish_iso2022jp_encoder
-};
-
-void
-Init_iso2022(void)
-{
- rb_register_transcoder(&rb_iso2022jp_decoder);
- rb_register_transcoder(&rb_iso2022jp_encoder);
- rb_register_transcoder(&rb_stateless_iso2022jp_to_eucjp);
- rb_register_transcoder(&rb_eucjp_to_stateless_iso2022jp);
- rb_register_transcoder(&rb_cp50221_decoder);
- rb_register_transcoder(&rb_cp50221_encoder);
-}
-
diff --git a/enc/trans/japanese.trans b/enc/trans/japanese.trans
deleted file mode 100644
index ce5d0bb70f..0000000000
--- a/enc/trans/japanese.trans
+++ /dev/null
@@ -1,98 +0,0 @@
-#include "transcode_data.h"
-
-<%
- map = {}
- map["{00-7f}"] = :nomap
- map["{a1-fe}{a1-fe}"] = :func_so
- map["8e{a1-df}"] = :func_so
- map["8e{e0-fe}"] = :undef
- map["8f{a1-fe}{a1-fe}"] = :undef
- transcode_generate_node(ActionMap.parse(map), "eucjp2sjis")
-
- map = {}
- map["{00-7f}"] = :nomap
- map["{81-9f,e0-ef}{40-7e,80-fc}"] = :func_so
- map["{f0-fc}{40-7e,80-fc}"] = :undef
- map["{a1-df}"] = :func_so
- transcode_generate_node(ActionMap.parse(map), "sjis2eucjp")
-%>
-
-<%= transcode_generated_code %>
-
-static ssize_t
-fun_so_eucjp2sjis(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
-{
- if (s[0] == 0x8e) {
- o[0] = s[1];
- return 1;
- }
- else {
- int h, m, l;
- m = s[0] & 1;
- h = (s[0]+m) >> 1;
- h += s[0] < 0xdf ? 0x30 : 0x70;
- l = s[1] - m * 94 - 3;
- if (0x7f <= l)
- l++;
- o[0] = h;
- o[1] = l;
- return 2;
- }
-}
-
-static ssize_t
-fun_so_sjis2eucjp(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
-{
- if (l == 1) {
- o[0] = '\x8e';
- o[1] = s[0];
- return 2;
- }
- else {
- int h, l;
- h = s[0];
- l = s[1];
- if (0xe0 <= h)
- h -= 64;
- l += l < 0x80 ? 0x61 : 0x60;
- h = h * 2 - 0x61;
- if (0xfe < l) {
- l -= 94;
- h += 1;
- }
- o[0] = h;
- o[1] = l;
- return 2;
- }
-}
-
-static const rb_transcoder
-rb_eucjp2sjis = {
- "EUC-JP", "Shift_JIS", eucjp2sjis,
- TRANSCODE_TABLE_INFO,
- 1, /* input_unit_length */
- 3, /* max_input */
- 2, /* max_output */
- asciicompat_converter, /* asciicompat_type */
- 0, NULL, NULL, /* state_size, state_init, state_fini */
- NULL, NULL, NULL, fun_so_eucjp2sjis
-};
-
-static const rb_transcoder
-rb_sjis2eucjp = {
- "Shift_JIS", "EUC-JP", sjis2eucjp,
- TRANSCODE_TABLE_INFO,
- 1, /* input_unit_length */
- 2, /* max_input */
- 2, /* max_output */
- asciicompat_converter, /* asciicompat_type */
- 0, NULL, NULL, /* state_size, state_init, state_fini */
- NULL, NULL, NULL, fun_so_sjis2eucjp
-};
-
-void
-Init_japanese(void)
-{
- rb_register_transcoder(&rb_eucjp2sjis);
- rb_register_transcoder(&rb_sjis2eucjp);
-}
diff --git a/enc/trans/japanese_euc.trans b/enc/trans/japanese_euc.trans
deleted file mode 100644
index a976fe57d3..0000000000
--- a/enc/trans/japanese_euc.trans
+++ /dev/null
@@ -1,46 +0,0 @@
-#include "transcode_data.h"
-
-<%
- transcode_tblgen "EUC-JP", "UTF-8",
- [["{00-7f}", :nomap]] +
- citrus_decode_mapsrc("euc", 0x8080, "JISX0208:1990/UCS") +
- citrus_decode_mapsrc("euc", 0x0080, "JISX0201-KANA/UCS") +
- citrus_decode_mapsrc("euc", 0x8000, "JISX0212/UCS")
-
- transcode_tblgen "eucJP-ms", "UTF-8",
- [["{00-7f}", :nomap]] +
- citrus_decode_mapsrc("euc", 0x8080, "JISX0208VDC:NEC/UCS,JISX0208UDC/UCS,JISX0208:MS/UCS") +
- citrus_decode_mapsrc("euc", 0x0080, "JISX0201-KANA/UCS") +
- citrus_decode_mapsrc("euc", 0x8000, "JISX0212VDC:IBM/UCS,JISX0212UDC/UCS,JISX0212:MS/UCS")
-
- transcode_tblgen "CP51932", "UTF-8",
- [["{00-7f}", :nomap]] +
- citrus_decode_mapsrc("euc", 0x8080, "JISX0208VDC:NEC/UCS,CP932VDC:NEC_IBM/UCS,JISX0208:MS/UCS") +
- citrus_decode_mapsrc("euc", 0x0080, "JISX0201-KANA/UCS")
-
-
- transcode_tblgen "UTF-8", "EUC-JP",
- [["{00-7f}", :nomap]] +
- citrus_decode_mapsrc("euc", 0x8080, "UCS/JISX0208:1990") +
- citrus_decode_mapsrc("euc", 0x0080, "UCS/JISX0201-KANA") +
- citrus_decode_mapsrc("euc", 0x8000, "UCS/JISX0212")
-
- transcode_tblgen "UTF-8", "eucJP-ms",
- [["{00-7f}", :nomap]] +
- citrus_decode_mapsrc("euc", 0x8080, "UCS/JISX0208:MS,UCS/JISX0208VDC:NEC,UCS/JISX0208UDC") +
- citrus_decode_mapsrc("euc", 0x0080, "UCS/JISX0201-KANA") +
- citrus_decode_mapsrc("euc", 0x8000, "UCS/JISX0212VDC:IBM,UCS/JISX0212UDC,UCS/JISX0212:MS")
-
- transcode_tblgen "UTF-8", "CP51932",
- [["{00-7f}", :nomap]] +
- citrus_decode_mapsrc("euc", 0x8080, "UCS/JISX0208:MS,UCS/JISX0208VDC:NEC,UCS/CP932VDC:NEC_IBM") +
- citrus_decode_mapsrc("euc", 0x0080, "UCS/JISX0201-KANA")
-%>
-
-<%= transcode_generated_code %>
-
-void
-Init_japanese_euc(void)
-{
-<%= transcode_register_code %>
-}
diff --git a/enc/trans/japanese_sjis.trans b/enc/trans/japanese_sjis.trans
deleted file mode 100644
index 00eace27a3..0000000000
--- a/enc/trans/japanese_sjis.trans
+++ /dev/null
@@ -1,34 +0,0 @@
-#include "transcode_data.h"
-
-<%
- transcode_tblgen "Shift_JIS", "UTF-8",
- [["{00-7f}", :nomap]] +
- citrus_decode_mapsrc("mskanji", 1, "JISX0201-KANA/UCS") +
- citrus_decode_mapsrc("mskanji", 2, "JISX0208:1990/UCS")
-
- transcode_tblgen "Windows-31J", "UTF-8",
- [["{00-7f}", :nomap]] +
- citrus_decode_mapsrc("mskanji", 1, "JISX0201-KANA/UCS") +
- citrus_decode_mapsrc("mskanji", 2,
- "JISX0208VDC:NEC/UCS,CP932VDC:NEC_IBM/UCS,CP932VDC:IBM/UCS,CP932UDA/UCS,JISX0208:MS/UCS")
-
-
- transcode_tblgen "UTF-8", "Shift_JIS",
- [["{00-7f}", :nomap]] +
- citrus_decode_mapsrc("mskanji", 1, "UCS/JISX0201-KANA") +
- citrus_decode_mapsrc("mskanji", 2, "UCS/JISX0208:1990")
-
- transcode_tblgen "UTF-8", "Windows-31J",
- [["{00-7f}", :nomap]] +
- citrus_decode_mapsrc("mskanji", 1, "UCS/JISX0201-KANA") +
- citrus_decode_mapsrc("mskanji", 2,
- "UCS/JISX0208:MS,UCS/JISX0208VDC:NEC,UCS/CP932VDC:IBM,UCS/CP932VDC:NEC_IBM,UCS/CP932UDA")
-%>
-
-<%= transcode_generated_code %>
-
-void
-Init_japanese_sjis(void)
-{
-<%= transcode_register_code %>
-}
diff --git a/enc/trans/koi8-r-tbl.rb b/enc/trans/koi8-r-tbl.rb
deleted file mode 100644
index a1f55ff2e3..0000000000
--- a/enc/trans/koi8-r-tbl.rb
+++ /dev/null
@@ -1,130 +0,0 @@
-KOI8_R_TO_UCS_TBL = [
- ["9A",0xA0],
- ["BF",0xA9],
- ["9C",0xB0],
- ["9D",0xB2],
- ["9E",0xB7],
- ["9F",0xF7],
- ["B3",0x401],
- ["E1",0x410],
- ["E2",0x411],
- ["F7",0x412],
- ["E7",0x413],
- ["E4",0x414],
- ["E5",0x415],
- ["F6",0x416],
- ["FA",0x417],
- ["E9",0x418],
- ["EA",0x419],
- ["EB",0x41A],
- ["EC",0x41B],
- ["ED",0x41C],
- ["EE",0x41D],
- ["EF",0x41E],
- ["F0",0x41F],
- ["F2",0x420],
- ["F3",0x421],
- ["F4",0x422],
- ["F5",0x423],
- ["E6",0x424],
- ["E8",0x425],
- ["E3",0x426],
- ["FE",0x427],
- ["FB",0x428],
- ["FD",0x429],
- ["FF",0x42A],
- ["F9",0x42B],
- ["F8",0x42C],
- ["FC",0x42D],
- ["E0",0x42E],
- ["F1",0x42F],
- ["C1",0x430],
- ["C2",0x431],
- ["D7",0x432],
- ["C7",0x433],
- ["C4",0x434],
- ["C5",0x435],
- ["D6",0x436],
- ["DA",0x437],
- ["C9",0x438],
- ["CA",0x439],
- ["CB",0x43A],
- ["CC",0x43B],
- ["CD",0x43C],
- ["CE",0x43D],
- ["CF",0x43E],
- ["D0",0x43F],
- ["D2",0x440],
- ["D3",0x441],
- ["D4",0x442],
- ["D5",0x443],
- ["C6",0x444],
- ["C8",0x445],
- ["C3",0x446],
- ["DE",0x447],
- ["DB",0x448],
- ["DD",0x449],
- ["DF",0x44A],
- ["D9",0x44B],
- ["D8",0x44C],
- ["DC",0x44D],
- ["C0",0x44E],
- ["D1",0x44F],
- ["A3",0x451],
- ["95",0x2219],
- ["96",0x221A],
- ["97",0x2248],
- ["98",0x2264],
- ["99",0x2265],
- ["93",0x2320],
- ["9B",0x2321],
- ["80",0x2500],
- ["81",0x2502],
- ["82",0x250C],
- ["83",0x2510],
- ["84",0x2514],
- ["85",0x2518],
- ["86",0x251C],
- ["87",0x2524],
- ["88",0x252C],
- ["89",0x2534],
- ["8A",0x253C],
- ["A0",0x2550],
- ["A1",0x2551],
- ["A2",0x2552],
- ["A4",0x2553],
- ["A5",0x2554],
- ["A6",0x2555],
- ["A7",0x2556],
- ["A8",0x2557],
- ["A9",0x2558],
- ["AA",0x2559],
- ["AB",0x255A],
- ["AC",0x255B],
- ["AD",0x255C],
- ["AE",0x255D],
- ["AF",0x255E],
- ["B0",0x255F],
- ["B1",0x2560],
- ["B2",0x2561],
- ["B4",0x2562],
- ["B5",0x2563],
- ["B6",0x2564],
- ["B7",0x2565],
- ["B8",0x2566],
- ["B9",0x2567],
- ["BA",0x2568],
- ["BB",0x2569],
- ["BC",0x256A],
- ["BD",0x256B],
- ["BE",0x256C],
- ["8B",0x2580],
- ["8C",0x2584],
- ["8D",0x2588],
- ["8E",0x258C],
- ["8F",0x2590],
- ["90",0x2591],
- ["91",0x2592],
- ["92",0x2593],
- ["94",0x25A0],
-] \ No newline at end of file
diff --git a/enc/trans/koi8-u-tbl.rb b/enc/trans/koi8-u-tbl.rb
deleted file mode 100644
index e87aa1aa3f..0000000000
--- a/enc/trans/koi8-u-tbl.rb
+++ /dev/null
@@ -1,130 +0,0 @@
-KOI8_U_TO_UCS_TBL = [
- ["9A",0xA0],
- ["BF",0xA9],
- ["9C",0xB0],
- ["9D",0xB2],
- ["9E",0xB7],
- ["9F",0xF7],
- ["B3",0x401],
- ["B4",0x404],
- ["B6",0x406],
- ["B7",0x407],
- ["E1",0x410],
- ["E2",0x411],
- ["F7",0x412],
- ["E7",0x413],
- ["E4",0x414],
- ["E5",0x415],
- ["F6",0x416],
- ["FA",0x417],
- ["E9",0x418],
- ["EA",0x419],
- ["EB",0x41A],
- ["EC",0x41B],
- ["ED",0x41C],
- ["EE",0x41D],
- ["EF",0x41E],
- ["F0",0x41F],
- ["F2",0x420],
- ["F3",0x421],
- ["F4",0x422],
- ["F5",0x423],
- ["E6",0x424],
- ["E8",0x425],
- ["E3",0x426],
- ["FE",0x427],
- ["FB",0x428],
- ["FD",0x429],
- ["FF",0x42A],
- ["F9",0x42B],
- ["F8",0x42C],
- ["FC",0x42D],
- ["E0",0x42E],
- ["F1",0x42F],
- ["C1",0x430],
- ["C2",0x431],
- ["D7",0x432],
- ["C7",0x433],
- ["C4",0x434],
- ["C5",0x435],
- ["D6",0x436],
- ["DA",0x437],
- ["C9",0x438],
- ["CA",0x439],
- ["CB",0x43A],
- ["CC",0x43B],
- ["CD",0x43C],
- ["CE",0x43D],
- ["CF",0x43E],
- ["D0",0x43F],
- ["D2",0x440],
- ["D3",0x441],
- ["D4",0x442],
- ["D5",0x443],
- ["C6",0x444],
- ["C8",0x445],
- ["C3",0x446],
- ["DE",0x447],
- ["DB",0x448],
- ["DD",0x449],
- ["DF",0x44A],
- ["D9",0x44B],
- ["D8",0x44C],
- ["DC",0x44D],
- ["C0",0x44E],
- ["D1",0x44F],
- ["A3",0x451],
- ["A4",0x454],
- ["A6",0x456],
- ["A7",0x457],
- ["BD",0x490],
- ["AD",0x491],
- ["95",0x2219],
- ["96",0x221A],
- ["97",0x2248],
- ["98",0x2264],
- ["99",0x2265],
- ["93",0x2320],
- ["9B",0x2321],
- ["80",0x2500],
- ["81",0x2502],
- ["82",0x250C],
- ["83",0x2510],
- ["84",0x2514],
- ["85",0x2518],
- ["86",0x251C],
- ["87",0x2524],
- ["88",0x252C],
- ["89",0x2534],
- ["8A",0x253C],
- ["A0",0x2550],
- ["A1",0x2551],
- ["A2",0x2552],
- ["A5",0x2554],
- ["A8",0x2557],
- ["A9",0x2558],
- ["AA",0x2559],
- ["AB",0x255A],
- ["AC",0x255B],
- ["AE",0x255D],
- ["AF",0x255E],
- ["B0",0x255F],
- ["B1",0x2560],
- ["B2",0x2561],
- ["B5",0x2563],
- ["B8",0x2566],
- ["B9",0x2567],
- ["BA",0x2568],
- ["BB",0x2569],
- ["BC",0x256A],
- ["BE",0x256C],
- ["8B",0x2580],
- ["8C",0x2584],
- ["8D",0x2588],
- ["8E",0x258C],
- ["8F",0x2590],
- ["90",0x2591],
- ["91",0x2592],
- ["92",0x2593],
- ["94",0x25A0],
-] \ No newline at end of file
diff --git a/enc/trans/korean.trans b/enc/trans/korean.trans
deleted file mode 100644
index ef1cdfcb8e..0000000000
--- a/enc/trans/korean.trans
+++ /dev/null
@@ -1,19 +0,0 @@
-#include "transcode_data.h"
-
-<%
- require "euckr-tbl"
- require "cp949-tbl"
-
- transcode_tblgen "UTF-8", "EUC-KR", [["{00-7f}", :nomap], *UCS_TO_EUCKR_TBL]
- transcode_tblgen "EUC-KR", "UTF-8", [["{00-7f}", :nomap], *EUCKR_TO_UCS_TBL]
- transcode_tblgen "UTF-8", "CP949", [["{00-7f}", :nomap], *UCS_TO_CP949_TBL]
- transcode_tblgen "CP949", "UTF-8", [["{00-7f}", :nomap], *CP949_TO_UCS_TBL]
-%>
-
-<%= transcode_generated_code %>
-
-void
-Init_korean(void)
-{
-<%= transcode_register_code %>
-}
diff --git a/enc/trans/maccroatian-tbl.rb b/enc/trans/maccroatian-tbl.rb
deleted file mode 100644
index 359878ec1f..0000000000
--- a/enc/trans/maccroatian-tbl.rb
+++ /dev/null
@@ -1,129 +0,0 @@
-MACCROATIAN_TO_UCS_TBL = [
- ["CA",0xA0],
- ["C1",0xA1],
- ["A2",0xA2],
- ["A3",0xA3],
- ["DB",0xA4],
- ["A4",0xA7],
- ["AC",0xA8],
- ["D9",0xA9],
- ["BB",0xAA],
- ["C7",0xAB],
- ["C2",0xAC],
- ["A8",0xAE],
- ["F8",0xAF],
- ["A1",0xB0],
- ["B1",0xB1],
- ["AB",0xB4],
- ["B5",0xB5],
- ["A6",0xB6],
- ["E1",0xB7],
- ["FC",0xB8],
- ["BC",0xBA],
- ["DF",0xBB],
- ["C0",0xBF],
- ["CB",0xC0],
- ["E7",0xC1],
- ["E5",0xC2],
- ["CC",0xC3],
- ["80",0xC4],
- ["81",0xC5],
- ["DE",0xC6],
- ["82",0xC7],
- ["E9",0xC8],
- ["83",0xC9],
- ["FD",0xCA],
- ["FA",0xCB],
- ["ED",0xCC],
- ["EA",0xCD],
- ["EB",0xCE],
- ["EC",0xCF],
- ["84",0xD1],
- ["F1",0xD2],
- ["EE",0xD3],
- ["EF",0xD4],
- ["CD",0xD5],
- ["85",0xD6],
- ["AF",0xD8],
- ["F4",0xD9],
- ["F2",0xDA],
- ["F3",0xDB],
- ["86",0xDC],
- ["A7",0xDF],
- ["88",0xE0],
- ["87",0xE1],
- ["89",0xE2],
- ["8B",0xE3],
- ["8A",0xE4],
- ["8C",0xE5],
- ["FE",0xE6],
- ["8D",0xE7],
- ["8F",0xE8],
- ["8E",0xE9],
- ["90",0xEA],
- ["91",0xEB],
- ["93",0xEC],
- ["92",0xED],
- ["94",0xEE],
- ["95",0xEF],
- ["96",0xF1],
- ["98",0xF2],
- ["97",0xF3],
- ["99",0xF4],
- ["9B",0xF5],
- ["9A",0xF6],
- ["D6",0xF7],
- ["BF",0xF8],
- ["9D",0xF9],
- ["9C",0xFA],
- ["9E",0xFB],
- ["9F",0xFC],
- ["C6",0x106],
- ["E6",0x107],
- ["C8",0x10C],
- ["E8",0x10D],
- ["D0",0x110],
- ["F0",0x111],
- ["F5",0x131],
- ["CE",0x152],
- ["CF",0x153],
- ["A9",0x160],
- ["B9",0x161],
- ["AE",0x17D],
- ["BE",0x17E],
- ["C4",0x192],
- ["F6",0x2C6],
- ["FF",0x2C7],
- ["FB",0x2DA],
- ["F7",0x2DC],
- ["F9",0x3C0],
- ["E0",0x2013],
- ["D1",0x2014],
- ["D4",0x2018],
- ["D5",0x2019],
- ["E2",0x201A],
- ["D2",0x201C],
- ["D3",0x201D],
- ["E3",0x201E],
- ["A0",0x2020],
- ["A5",0x2022],
- ["C9",0x2026],
- ["E4",0x2030],
- ["DC",0x2039],
- ["DD",0x203A],
- ["DA",0x2044],
- ["AA",0x2122],
- ["BD",0x2126],
- ["B6",0x2202],
- ["B4",0x2206],
- ["B8",0x220F],
- ["B7",0x2211],
- ["C3",0x221A],
- ["B0",0x221E],
- ["BA",0x222B],
- ["C5",0x2248],
- ["AD",0x2260],
- ["B2",0x2264],
- ["B3",0x2265],
- ["D7",0x25CA],
-] \ No newline at end of file
diff --git a/enc/trans/maccyrillic-tbl.rb b/enc/trans/maccyrillic-tbl.rb
deleted file mode 100644
index 378aa8c3bc..0000000000
--- a/enc/trans/maccyrillic-tbl.rb
+++ /dev/null
@@ -1,130 +0,0 @@
-MACCYRILLIC_TO_UCS_TBL = [
- ["CA",0xA0],
- ["A2",0xA2],
- ["A3",0xA3],
- ["FF",0xA4],
- ["A4",0xA7],
- ["A9",0xA9],
- ["C7",0xAB],
- ["C2",0xAC],
- ["A8",0xAE],
- ["A1",0xB0],
- ["B1",0xB1],
- ["B5",0xB5],
- ["A6",0xB6],
- ["C8",0xBB],
- ["D6",0xF7],
- ["C4",0x192],
- ["DD",0x401],
- ["AB",0x402],
- ["AE",0x403],
- ["B8",0x404],
- ["C1",0x405],
- ["A7",0x406],
- ["BA",0x407],
- ["B7",0x408],
- ["BC",0x409],
- ["BE",0x40A],
- ["CB",0x40B],
- ["CD",0x40C],
- ["D8",0x40E],
- ["DA",0x40F],
- ["80",0x410],
- ["81",0x411],
- ["82",0x412],
- ["83",0x413],
- ["84",0x414],
- ["85",0x415],
- ["86",0x416],
- ["87",0x417],
- ["88",0x418],
- ["89",0x419],
- ["8A",0x41A],
- ["8B",0x41B],
- ["8C",0x41C],
- ["8D",0x41D],
- ["8E",0x41E],
- ["8F",0x41F],
- ["90",0x420],
- ["91",0x421],
- ["92",0x422],
- ["93",0x423],
- ["94",0x424],
- ["95",0x425],
- ["96",0x426],
- ["97",0x427],
- ["98",0x428],
- ["99",0x429],
- ["9A",0x42A],
- ["9B",0x42B],
- ["9C",0x42C],
- ["9D",0x42D],
- ["9E",0x42E],
- ["9F",0x42F],
- ["E0",0x430],
- ["E1",0x431],
- ["E2",0x432],
- ["E3",0x433],
- ["E4",0x434],
- ["E5",0x435],
- ["E6",0x436],
- ["E7",0x437],
- ["E8",0x438],
- ["E9",0x439],
- ["EA",0x43A],
- ["EB",0x43B],
- ["EC",0x43C],
- ["ED",0x43D],
- ["EE",0x43E],
- ["EF",0x43F],
- ["F0",0x440],
- ["F1",0x441],
- ["F2",0x442],
- ["F3",0x443],
- ["F4",0x444],
- ["F5",0x445],
- ["F6",0x446],
- ["F7",0x447],
- ["F8",0x448],
- ["F9",0x449],
- ["FA",0x44A],
- ["FB",0x44B],
- ["FC",0x44C],
- ["FD",0x44D],
- ["FE",0x44E],
- ["DF",0x44F],
- ["DE",0x451],
- ["AC",0x452],
- ["AF",0x453],
- ["B9",0x454],
- ["CF",0x455],
- ["B4",0x456],
- ["BB",0x457],
- ["C0",0x458],
- ["BD",0x459],
- ["BF",0x45A],
- ["CC",0x45B],
- ["CE",0x45C],
- ["D9",0x45E],
- ["DB",0x45F],
- ["D0",0x2013],
- ["D1",0x2014],
- ["D4",0x2018],
- ["D5",0x2019],
- ["D2",0x201C],
- ["D3",0x201D],
- ["D7",0x201E],
- ["A0",0x2020],
- ["A5",0x2022],
- ["C9",0x2026],
- ["DC",0x2116],
- ["AA",0x2122],
- ["B6",0x2202],
- ["C6",0x2206],
- ["C3",0x221A],
- ["B0",0x221E],
- ["C5",0x2248],
- ["AD",0x2260],
- ["B2",0x2264],
- ["B3",0x2265],
-] \ No newline at end of file
diff --git a/enc/trans/macgreek-tbl.rb b/enc/trans/macgreek-tbl.rb
deleted file mode 100644
index 7f75fde6d2..0000000000
--- a/enc/trans/macgreek-tbl.rb
+++ /dev/null
@@ -1,129 +0,0 @@
-MACGREEK_TO_UCS_TBL = [
- ["CA",0xA0],
- ["92",0xA3],
- ["B4",0xA5],
- ["9B",0xA6],
- ["AC",0xA7],
- ["8C",0xA8],
- ["A9",0xA9],
- ["C7",0xAB],
- ["C2",0xAC],
- ["9C",0xAD],
- ["A8",0xAE],
- ["AE",0xB0],
- ["B1",0xB1],
- ["82",0xB2],
- ["84",0xB3],
- ["81",0xB9],
- ["C8",0xBB],
- ["97",0xBD],
- ["80",0xC4],
- ["83",0xC9],
- ["85",0xD6],
- ["86",0xDC],
- ["A7",0xDF],
- ["88",0xE0],
- ["89",0xE2],
- ["8A",0xE4],
- ["8D",0xE7],
- ["8F",0xE8],
- ["8E",0xE9],
- ["90",0xEA],
- ["91",0xEB],
- ["94",0xEE],
- ["95",0xEF],
- ["99",0xF4],
- ["9A",0xF6],
- ["D6",0xF7],
- ["9D",0xF9],
- ["9E",0xFB],
- ["9F",0xFC],
- ["CF",0x153],
- ["8B",0x384],
- ["87",0x385],
- ["CD",0x386],
- ["AF",0x387],
- ["CE",0x388],
- ["D7",0x389],
- ["D8",0x38A],
- ["D9",0x38C],
- ["DA",0x38E],
- ["DF",0x38F],
- ["FD",0x390],
- ["B0",0x391],
- ["B5",0x392],
- ["A1",0x393],
- ["A2",0x394],
- ["B6",0x395],
- ["B7",0x396],
- ["B8",0x397],
- ["A3",0x398],
- ["B9",0x399],
- ["BA",0x39A],
- ["A4",0x39B],
- ["BB",0x39C],
- ["C1",0x39D],
- ["A5",0x39E],
- ["C3",0x39F],
- ["A6",0x3A0],
- ["C4",0x3A1],
- ["AA",0x3A3],
- ["C6",0x3A4],
- ["CB",0x3A5],
- ["BC",0x3A6],
- ["CC",0x3A7],
- ["BE",0x3A8],
- ["BF",0x3A9],
- ["AB",0x3AA],
- ["BD",0x3AB],
- ["C0",0x3AC],
- ["DB",0x3AD],
- ["DC",0x3AE],
- ["DD",0x3AF],
- ["FE",0x3B0],
- ["E1",0x3B1],
- ["E2",0x3B2],
- ["E7",0x3B3],
- ["E4",0x3B4],
- ["E5",0x3B5],
- ["FA",0x3B6],
- ["E8",0x3B7],
- ["F5",0x3B8],
- ["E9",0x3B9],
- ["EB",0x3BA],
- ["EC",0x3BB],
- ["ED",0x3BC],
- ["EE",0x3BD],
- ["EA",0x3BE],
- ["EF",0x3BF],
- ["F0",0x3C0],
- ["F2",0x3C1],
- ["F7",0x3C2],
- ["F3",0x3C3],
- ["F4",0x3C4],
- ["F9",0x3C5],
- ["E6",0x3C6],
- ["F8",0x3C7],
- ["E3",0x3C8],
- ["F6",0x3C9],
- ["FB",0x3CA],
- ["FC",0x3CB],
- ["DE",0x3CC],
- ["E0",0x3CD],
- ["F1",0x3CE],
- ["D0",0x2013],
- ["D1",0x2015],
- ["D4",0x2018],
- ["D5",0x2019],
- ["D2",0x201C],
- ["D3",0x201D],
- ["A0",0x2020],
- ["96",0x2022],
- ["C9",0x2026],
- ["98",0x2030],
- ["93",0x2122],
- ["C5",0x2248],
- ["AD",0x2260],
- ["B2",0x2264],
- ["B3",0x2265],
-] \ No newline at end of file
diff --git a/enc/trans/maciceland-tbl.rb b/enc/trans/maciceland-tbl.rb
deleted file mode 100644
index 818d992274..0000000000
--- a/enc/trans/maciceland-tbl.rb
+++ /dev/null
@@ -1,129 +0,0 @@
-MACICELAND_TO_UCS_TBL = [
- ["CA",0xA0],
- ["C1",0xA1],
- ["A2",0xA2],
- ["A3",0xA3],
- ["DB",0xA4],
- ["B4",0xA5],
- ["A4",0xA7],
- ["AC",0xA8],
- ["A9",0xA9],
- ["BB",0xAA],
- ["C7",0xAB],
- ["C2",0xAC],
- ["A8",0xAE],
- ["F8",0xAF],
- ["A1",0xB0],
- ["B1",0xB1],
- ["AB",0xB4],
- ["B5",0xB5],
- ["A6",0xB6],
- ["E1",0xB7],
- ["FC",0xB8],
- ["BC",0xBA],
- ["C8",0xBB],
- ["C0",0xBF],
- ["CB",0xC0],
- ["E7",0xC1],
- ["E5",0xC2],
- ["CC",0xC3],
- ["80",0xC4],
- ["81",0xC5],
- ["AE",0xC6],
- ["82",0xC7],
- ["E9",0xC8],
- ["83",0xC9],
- ["E6",0xCA],
- ["E8",0xCB],
- ["ED",0xCC],
- ["EA",0xCD],
- ["EB",0xCE],
- ["EC",0xCF],
- ["DC",0xD0],
- ["84",0xD1],
- ["F1",0xD2],
- ["EE",0xD3],
- ["EF",0xD4],
- ["CD",0xD5],
- ["85",0xD6],
- ["AF",0xD8],
- ["F4",0xD9],
- ["F2",0xDA],
- ["F3",0xDB],
- ["86",0xDC],
- ["A0",0xDD],
- ["DE",0xDE],
- ["A7",0xDF],
- ["88",0xE0],
- ["87",0xE1],
- ["89",0xE2],
- ["8B",0xE3],
- ["8A",0xE4],
- ["8C",0xE5],
- ["BE",0xE6],
- ["8D",0xE7],
- ["8F",0xE8],
- ["8E",0xE9],
- ["90",0xEA],
- ["91",0xEB],
- ["93",0xEC],
- ["92",0xED],
- ["94",0xEE],
- ["95",0xEF],
- ["DD",0xF0],
- ["96",0xF1],
- ["98",0xF2],
- ["97",0xF3],
- ["99",0xF4],
- ["9B",0xF5],
- ["9A",0xF6],
- ["D6",0xF7],
- ["BF",0xF8],
- ["9D",0xF9],
- ["9C",0xFA],
- ["9E",0xFB],
- ["9F",0xFC],
- ["E0",0xFD],
- ["DF",0xFE],
- ["D8",0xFF],
- ["F5",0x131],
- ["CE",0x152],
- ["CF",0x153],
- ["D9",0x178],
- ["C4",0x192],
- ["F6",0x2C6],
- ["FF",0x2C7],
- ["F9",0x2D8],
- ["FA",0x2D9],
- ["FB",0x2DA],
- ["FE",0x2DB],
- ["F7",0x2DC],
- ["FD",0x2DD],
- ["B9",0x3C0],
- ["D0",0x2013],
- ["D1",0x2014],
- ["D4",0x2018],
- ["D5",0x2019],
- ["E2",0x201A],
- ["D2",0x201C],
- ["D3",0x201D],
- ["E3",0x201E],
- ["A5",0x2022],
- ["C9",0x2026],
- ["E4",0x2030],
- ["DA",0x2044],
- ["AA",0x2122],
- ["BD",0x2126],
- ["B6",0x2202],
- ["C6",0x2206],
- ["B8",0x220F],
- ["B7",0x2211],
- ["C3",0x221A],
- ["B0",0x221E],
- ["BA",0x222B],
- ["C5",0x2248],
- ["AD",0x2260],
- ["B2",0x2264],
- ["B3",0x2265],
- ["D7",0x25CA],
-] \ No newline at end of file
diff --git a/enc/trans/macroman-tbl.rb b/enc/trans/macroman-tbl.rb
deleted file mode 100644
index 8f74eea27f..0000000000
--- a/enc/trans/macroman-tbl.rb
+++ /dev/null
@@ -1,129 +0,0 @@
-MACROMAN_TO_UCS_TBL = [
- ["CA",0xA0],
- ["C1",0xA1],
- ["A2",0xA2],
- ["A3",0xA3],
- ["DB",0xA4],
- ["B4",0xA5],
- ["A4",0xA7],
- ["AC",0xA8],
- ["A9",0xA9],
- ["BB",0xAA],
- ["C7",0xAB],
- ["C2",0xAC],
- ["A8",0xAE],
- ["F8",0xAF],
- ["A1",0xB0],
- ["B1",0xB1],
- ["AB",0xB4],
- ["B5",0xB5],
- ["A6",0xB6],
- ["E1",0xB7],
- ["FC",0xB8],
- ["BC",0xBA],
- ["C8",0xBB],
- ["C0",0xBF],
- ["CB",0xC0],
- ["E7",0xC1],
- ["E5",0xC2],
- ["CC",0xC3],
- ["80",0xC4],
- ["81",0xC5],
- ["AE",0xC6],
- ["82",0xC7],
- ["E9",0xC8],
- ["83",0xC9],
- ["E6",0xCA],
- ["E8",0xCB],
- ["ED",0xCC],
- ["EA",0xCD],
- ["EB",0xCE],
- ["EC",0xCF],
- ["84",0xD1],
- ["F1",0xD2],
- ["EE",0xD3],
- ["EF",0xD4],
- ["CD",0xD5],
- ["85",0xD6],
- ["AF",0xD8],
- ["F4",0xD9],
- ["F2",0xDA],
- ["F3",0xDB],
- ["86",0xDC],
- ["A7",0xDF],
- ["88",0xE0],
- ["87",0xE1],
- ["89",0xE2],
- ["8B",0xE3],
- ["8A",0xE4],
- ["8C",0xE5],
- ["BE",0xE6],
- ["8D",0xE7],
- ["8F",0xE8],
- ["8E",0xE9],
- ["90",0xEA],
- ["91",0xEB],
- ["93",0xEC],
- ["92",0xED],
- ["94",0xEE],
- ["95",0xEF],
- ["96",0xF1],
- ["98",0xF2],
- ["97",0xF3],
- ["99",0xF4],
- ["9B",0xF5],
- ["9A",0xF6],
- ["D6",0xF7],
- ["BF",0xF8],
- ["9D",0xF9],
- ["9C",0xFA],
- ["9E",0xFB],
- ["9F",0xFC],
- ["D8",0xFF],
- ["F5",0x131],
- ["CE",0x152],
- ["CF",0x153],
- ["D9",0x178],
- ["C4",0x192],
- ["F6",0x2C6],
- ["FF",0x2C7],
- ["F9",0x2D8],
- ["FA",0x2D9],
- ["FB",0x2DA],
- ["FE",0x2DB],
- ["F7",0x2DC],
- ["FD",0x2DD],
- ["B9",0x3C0],
- ["D0",0x2013],
- ["D1",0x2014],
- ["D4",0x2018],
- ["D5",0x2019],
- ["E2",0x201A],
- ["D2",0x201C],
- ["D3",0x201D],
- ["E3",0x201E],
- ["A0",0x2020],
- ["E0",0x2021],
- ["A5",0x2022],
- ["C9",0x2026],
- ["E4",0x2030],
- ["DC",0x2039],
- ["DD",0x203A],
- ["DA",0x2044],
- ["AA",0x2122],
- ["BD",0x2126],
- ["B6",0x2202],
- ["C6",0x2206],
- ["B8",0x220F],
- ["B7",0x2211],
- ["C3",0x221A],
- ["B0",0x221E],
- ["BA",0x222B],
- ["C5",0x2248],
- ["AD",0x2260],
- ["B2",0x2264],
- ["B3",0x2265],
- ["D7",0x25CA],
- ["DE",0xFB01],
- ["DF",0xFB02],
-] \ No newline at end of file
diff --git a/enc/trans/macromania-tbl.rb b/enc/trans/macromania-tbl.rb
deleted file mode 100644
index ff95c5e957..0000000000
--- a/enc/trans/macromania-tbl.rb
+++ /dev/null
@@ -1,129 +0,0 @@
-MACROMANIA_TO_UCS_TBL = [
- ["CA",0xA0],
- ["C1",0xA1],
- ["A2",0xA2],
- ["A3",0xA3],
- ["DB",0xA4],
- ["B4",0xA5],
- ["A4",0xA7],
- ["AC",0xA8],
- ["A9",0xA9],
- ["BB",0xAA],
- ["C7",0xAB],
- ["C2",0xAC],
- ["A8",0xAE],
- ["F8",0xAF],
- ["A1",0xB0],
- ["B1",0xB1],
- ["AB",0xB4],
- ["B5",0xB5],
- ["A6",0xB6],
- ["E1",0xB7],
- ["FC",0xB8],
- ["BC",0xBA],
- ["C8",0xBB],
- ["C0",0xBF],
- ["CB",0xC0],
- ["E7",0xC1],
- ["E5",0xC2],
- ["CC",0xC3],
- ["80",0xC4],
- ["81",0xC5],
- ["82",0xC7],
- ["E9",0xC8],
- ["83",0xC9],
- ["E6",0xCA],
- ["E8",0xCB],
- ["ED",0xCC],
- ["EA",0xCD],
- ["EB",0xCE],
- ["EC",0xCF],
- ["84",0xD1],
- ["F1",0xD2],
- ["EE",0xD3],
- ["EF",0xD4],
- ["CD",0xD5],
- ["85",0xD6],
- ["F4",0xD9],
- ["F2",0xDA],
- ["F3",0xDB],
- ["86",0xDC],
- ["A7",0xDF],
- ["88",0xE0],
- ["87",0xE1],
- ["89",0xE2],
- ["8B",0xE3],
- ["8A",0xE4],
- ["8C",0xE5],
- ["8D",0xE7],
- ["8F",0xE8],
- ["8E",0xE9],
- ["90",0xEA],
- ["91",0xEB],
- ["93",0xEC],
- ["92",0xED],
- ["94",0xEE],
- ["95",0xEF],
- ["96",0xF1],
- ["98",0xF2],
- ["97",0xF3],
- ["99",0xF4],
- ["9B",0xF5],
- ["9A",0xF6],
- ["D6",0xF7],
- ["9D",0xF9],
- ["9C",0xFA],
- ["9E",0xFB],
- ["9F",0xFC],
- ["D8",0xFF],
- ["AE",0x102],
- ["BE",0x103],
- ["F5",0x131],
- ["CE",0x152],
- ["CF",0x153],
- ["AF",0x15E],
- ["BF",0x15F],
- ["DE",0x162],
- ["DF",0x163],
- ["D9",0x178],
- ["C4",0x192],
- ["F6",0x2C6],
- ["FF",0x2C7],
- ["F9",0x2D8],
- ["FA",0x2D9],
- ["FB",0x2DA],
- ["FE",0x2DB],
- ["F7",0x2DC],
- ["FD",0x2DD],
- ["B9",0x3C0],
- ["D0",0x2013],
- ["D1",0x2014],
- ["D4",0x2018],
- ["D5",0x2019],
- ["E2",0x201A],
- ["D2",0x201C],
- ["D3",0x201D],
- ["E3",0x201E],
- ["A0",0x2020],
- ["E0",0x2021],
- ["A5",0x2022],
- ["C9",0x2026],
- ["E4",0x2030],
- ["DC",0x2039],
- ["DD",0x203A],
- ["DA",0x2044],
- ["AA",0x2122],
- ["BD",0x2126],
- ["B6",0x2202],
- ["C6",0x2206],
- ["B8",0x220F],
- ["B7",0x2211],
- ["C3",0x221A],
- ["B0",0x221E],
- ["BA",0x222B],
- ["C5",0x2248],
- ["AD",0x2260],
- ["B2",0x2264],
- ["B3",0x2265],
- ["D7",0x25CA],
-] \ No newline at end of file
diff --git a/enc/trans/macturkish-tbl.rb b/enc/trans/macturkish-tbl.rb
deleted file mode 100644
index 2358672ed6..0000000000
--- a/enc/trans/macturkish-tbl.rb
+++ /dev/null
@@ -1,128 +0,0 @@
-MACTURKISH_TO_UCS_TBL = [
- ["CA",0xA0],
- ["C1",0xA1],
- ["A2",0xA2],
- ["A3",0xA3],
- ["B4",0xA5],
- ["A4",0xA7],
- ["AC",0xA8],
- ["A9",0xA9],
- ["BB",0xAA],
- ["C7",0xAB],
- ["C2",0xAC],
- ["A8",0xAE],
- ["F8",0xAF],
- ["A1",0xB0],
- ["B1",0xB1],
- ["AB",0xB4],
- ["B5",0xB5],
- ["A6",0xB6],
- ["E1",0xB7],
- ["FC",0xB8],
- ["BC",0xBA],
- ["C8",0xBB],
- ["C0",0xBF],
- ["CB",0xC0],
- ["E7",0xC1],
- ["E5",0xC2],
- ["CC",0xC3],
- ["80",0xC4],
- ["81",0xC5],
- ["AE",0xC6],
- ["82",0xC7],
- ["E9",0xC8],
- ["83",0xC9],
- ["E6",0xCA],
- ["E8",0xCB],
- ["ED",0xCC],
- ["EA",0xCD],
- ["EB",0xCE],
- ["EC",0xCF],
- ["84",0xD1],
- ["F1",0xD2],
- ["EE",0xD3],
- ["EF",0xD4],
- ["CD",0xD5],
- ["85",0xD6],
- ["AF",0xD8],
- ["F4",0xD9],
- ["F2",0xDA],
- ["F3",0xDB],
- ["86",0xDC],
- ["A7",0xDF],
- ["88",0xE0],
- ["87",0xE1],
- ["89",0xE2],
- ["8B",0xE3],
- ["8A",0xE4],
- ["8C",0xE5],
- ["BE",0xE6],
- ["8D",0xE7],
- ["8F",0xE8],
- ["8E",0xE9],
- ["90",0xEA],
- ["91",0xEB],
- ["93",0xEC],
- ["92",0xED],
- ["94",0xEE],
- ["95",0xEF],
- ["96",0xF1],
- ["98",0xF2],
- ["97",0xF3],
- ["99",0xF4],
- ["9B",0xF5],
- ["9A",0xF6],
- ["D6",0xF7],
- ["BF",0xF8],
- ["9D",0xF9],
- ["9C",0xFA],
- ["9E",0xFB],
- ["9F",0xFC],
- ["D8",0xFF],
- ["DA",0x11E],
- ["DB",0x11F],
- ["DC",0x130],
- ["DD",0x131],
- ["CE",0x152],
- ["CF",0x153],
- ["DE",0x15E],
- ["DF",0x15F],
- ["D9",0x178],
- ["C4",0x192],
- ["F6",0x2C6],
- ["FF",0x2C7],
- ["F9",0x2D8],
- ["FA",0x2D9],
- ["FB",0x2DA],
- ["FE",0x2DB],
- ["F7",0x2DC],
- ["FD",0x2DD],
- ["B9",0x3C0],
- ["D0",0x2013],
- ["D1",0x2014],
- ["D4",0x2018],
- ["D5",0x2019],
- ["E2",0x201A],
- ["D2",0x201C],
- ["D3",0x201D],
- ["E3",0x201E],
- ["A0",0x2020],
- ["E0",0x2021],
- ["A5",0x2022],
- ["C9",0x2026],
- ["E4",0x2030],
- ["AA",0x2122],
- ["BD",0x2126],
- ["B6",0x2202],
- ["C6",0x2206],
- ["B8",0x220F],
- ["B7",0x2211],
- ["C3",0x221A],
- ["B0",0x221E],
- ["BA",0x222B],
- ["C5",0x2248],
- ["AD",0x2260],
- ["B2",0x2264],
- ["B3",0x2265],
- ["D7",0x25CA],
-] \ No newline at end of file
diff --git a/enc/trans/macukraine-tbl.rb b/enc/trans/macukraine-tbl.rb
deleted file mode 100644
index 6941af654d..0000000000
--- a/enc/trans/macukraine-tbl.rb
+++ /dev/null
@@ -1,130 +0,0 @@
-MACUKRAINE_TO_UCS_TBL = [
- ["CA",0xA0],
- ["A3",0xA3],
- ["FF",0xA4],
- ["A4",0xA7],
- ["A9",0xA9],
- ["C7",0xAB],
- ["C2",0xAC],
- ["A8",0xAE],
- ["A1",0xB0],
- ["B1",0xB1],
- ["B5",0xB5],
- ["A6",0xB6],
- ["C8",0xBB],
- ["D6",0xF7],
- ["C4",0x192],
- ["DD",0x401],
- ["AB",0x402],
- ["AE",0x403],
- ["B8",0x404],
- ["C1",0x405],
- ["A7",0x406],
- ["BA",0x407],
- ["B7",0x408],
- ["BC",0x409],
- ["BE",0x40A],
- ["CB",0x40B],
- ["CD",0x40C],
- ["D8",0x40E],
- ["DA",0x40F],
- ["80",0x410],
- ["81",0x411],
- ["82",0x412],
- ["83",0x413],
- ["84",0x414],
- ["85",0x415],
- ["86",0x416],
- ["87",0x417],
- ["88",0x418],
- ["89",0x419],
- ["8A",0x41A],
- ["8B",0x41B],
- ["8C",0x41C],
- ["8D",0x41D],
- ["8E",0x41E],
- ["8F",0x41F],
- ["90",0x420],
- ["91",0x421],
- ["92",0x422],
- ["93",0x423],
- ["94",0x424],
- ["95",0x425],
- ["96",0x426],
- ["97",0x427],
- ["98",0x428],
- ["99",0x429],
- ["9A",0x42A],
- ["9B",0x42B],
- ["9C",0x42C],
- ["9D",0x42D],
- ["9E",0x42E],
- ["9F",0x42F],
- ["E0",0x430],
- ["E1",0x431],
- ["E2",0x432],
- ["E3",0x433],
- ["E4",0x434],
- ["E5",0x435],
- ["E6",0x436],
- ["E7",0x437],
- ["E8",0x438],
- ["E9",0x439],
- ["EA",0x43A],
- ["EB",0x43B],
- ["EC",0x43C],
- ["ED",0x43D],
- ["EE",0x43E],
- ["EF",0x43F],
- ["F0",0x440],
- ["F1",0x441],
- ["F2",0x442],
- ["F3",0x443],
- ["F4",0x444],
- ["F5",0x445],
- ["F6",0x446],
- ["F7",0x447],
- ["F8",0x448],
- ["F9",0x449],
- ["FA",0x44A],
- ["FB",0x44B],
- ["FC",0x44C],
- ["FD",0x44D],
- ["FE",0x44E],
- ["DF",0x44F],
- ["DE",0x451],
- ["AC",0x452],
- ["AF",0x453],
- ["B9",0x454],
- ["CF",0x455],
- ["B4",0x456],
- ["BB",0x457],
- ["C0",0x458],
- ["BD",0x459],
- ["BF",0x45A],
- ["CC",0x45B],
- ["CE",0x45C],
- ["D9",0x45E],
- ["DB",0x45F],
- ["A2",0x490],
- ["B6",0x491],
- ["D0",0x2013],
- ["D1",0x2014],
- ["D4",0x2018],
- ["D5",0x2019],
- ["D2",0x201C],
- ["D3",0x201D],
- ["D7",0x201E],
- ["A0",0x2020],
- ["A5",0x2022],
- ["C9",0x2026],
- ["DC",0x2116],
- ["AA",0x2122],
- ["C6",0x2206],
- ["C3",0x221A],
- ["B0",0x221E],
- ["C5",0x2248],
- ["AD",0x2260],
- ["B2",0x2264],
- ["B3",0x2265],
-] \ No newline at end of file
diff --git a/enc/trans/newline.trans b/enc/trans/newline.trans
deleted file mode 100644
index d62034aa49..0000000000
--- a/enc/trans/newline.trans
+++ /dev/null
@@ -1,131 +0,0 @@
-#include "transcode_data.h"
-
-<%
- map_normalize = {}
- map_normalize["{00-ff}"] = :func_so
-
- transcode_generate_node(ActionMap.parse(map_normalize), "universal_newline")
-
- map_crlf = {}
- map_crlf["{00-09,0b-ff}"] = :nomap
- map_crlf["0a"] = "0d0a"
-
- transcode_generate_node(ActionMap.parse(map_crlf), "crlf_newline")
-
- map_cr = {}
- map_cr["{00-09,0b-ff}"] = :nomap
- map_cr["0a"] = "0d"
-
- transcode_generate_node(ActionMap.parse(map_cr), "cr_newline")
-%>
-
-<%= transcode_generated_code %>
-
-#define STATE (sp[0])
-#define NORMAL 0
-#define JUST_AFTER_CR 1
-
-/* no way to access this information, yet. */
-#define NEWLINES_MET (sp[1])
-#define MET_LF 0x01
-#define MET_CRLF 0x02
-#define MET_CR 0x04
-
-static int
-universal_newline_init(void *statep)
-{
- unsigned char *sp = statep;
- STATE = NORMAL;
- NEWLINES_MET = 0;
- return 0;
-}
-
-static ssize_t
-fun_so_universal_newline(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
-{
- unsigned char *sp = statep;
- int len;
- if (s[0] == '\n') {
- if (STATE == NORMAL) {
- NEWLINES_MET |= MET_LF;
- o[0] = '\n';
- len = 1;
- }
- else { /* JUST_AFTER_CR */
- NEWLINES_MET |= MET_CRLF;
- len = 0;
- }
- STATE = NORMAL;
- }
- else {
- if (STATE == JUST_AFTER_CR)
- NEWLINES_MET |= MET_CR;
- if (s[0] == '\r') {
- o[0] = '\n';
- len = 1;
- STATE = JUST_AFTER_CR;
- }
- else {
- o[0] = s[0];
- len = 1;
- STATE = NORMAL;
- }
- }
-
- return len;
-}
-
-static ssize_t
-universal_newline_finish(void *statep, unsigned char *o, size_t osize)
-{
- unsigned char *sp = statep;
- if (STATE == JUST_AFTER_CR)
- NEWLINES_MET |= MET_CR;
- STATE = NORMAL;
- return 0;
-}
-
-static const rb_transcoder
-rb_universal_newline = {
- "", "universal_newline", universal_newline,
- TRANSCODE_TABLE_INFO,
- 1, /* input_unit_length */
- 1, /* max_input */
- 1, /* max_output */
- asciicompat_converter, /* asciicompat_type */
- 2, universal_newline_init, universal_newline_init, /* state_size, state_init, state_fini */
- NULL, NULL, NULL, fun_so_universal_newline,
- universal_newline_finish
-};
-
-static const rb_transcoder
-rb_crlf_newline = {
- "", "crlf_newline", crlf_newline,
- TRANSCODE_TABLE_INFO,
- 1, /* input_unit_length */
- 1, /* max_input */
- 2, /* max_output */
- asciicompat_converter, /* asciicompat_type */
- 0, NULL, NULL, /* state_size, state_init, state_fini */
- NULL, NULL, NULL, NULL
-};
-
-static const rb_transcoder
-rb_cr_newline = {
- "", "cr_newline", cr_newline,
- TRANSCODE_TABLE_INFO,
- 1, /* input_unit_length */
- 1, /* max_input */
- 1, /* max_output */
- asciicompat_converter, /* asciicompat_type */
- 0, NULL, NULL, /* state_size, state_init, state_fini */
- NULL, NULL, NULL, NULL
-};
-
-void
-Init_newline(void)
-{
- rb_register_transcoder(&rb_universal_newline);
- rb_register_transcoder(&rb_crlf_newline);
- rb_register_transcoder(&rb_cr_newline);
-}
diff --git a/enc/trans/single_byte.trans b/enc/trans/single_byte.trans
deleted file mode 100644
index 0d42740d30..0000000000
--- a/enc/trans/single_byte.trans
+++ /dev/null
@@ -1,91 +0,0 @@
-#include "transcode_data.h"
-
-<%
- us_ascii_map = [["{00-7f}", :nomap]]
-
- transcode_tblgen "US-ASCII", "UTF-8", us_ascii_map
- transcode_tblgen "UTF-8", "US-ASCII", us_ascii_map
- transcode_tblgen "ASCII-8BIT", "UTF-8", us_ascii_map
- transcode_tblgen "UTF-8", "ASCII-8BIT", us_ascii_map
-
- CONTROL1_TO_UCS_TBL = (0x80..0x9f).map {|c| ["%02X" % c, c] }
-
- # Generate transcoding tables for single byte encoding from
- # encoding name using table file.
- #
- # Conventions:
- # name: encoding name as string, UPPER case, hyphens (e.g. 'ISO-8859-3')
- # file name: lower case, hyphens, -tbl.rb suffix (e.g. iso-8859-3-tbl.rb)
- # variable name: UPPER case, underscores, _TO_UCS_TBL suffix (e.g. ISO_8859_3_TO_UCS_TBL)
- # If the name starts with "ISO-8859", the C1 control code area is added automatically.
- def transcode_tblgen_singlebyte (name)
- require(name.downcase + "-tbl")
- control1_if_needed = (name =~ /^ISO-8859/) ? CONTROL1_TO_UCS_TBL : []
- tbl_to_ucs = control1_if_needed + eval(name.gsub(/-/, '_') + "_TO_UCS_TBL")
- set_valid_byte_pattern(name, '1byte')
- code = ''
- code << transcode_tblgen(name, "UTF-8", [["{00-7f}", :nomap], *tbl_to_ucs])
- code << "\n"
- code << transcode_tblgen("UTF-8", name, [["{00-7f}", :nomap], *tbl_to_ucs.map {|a,b| [b,a] }])
- code
- end
-
- transcode_tblgen_singlebyte "ISO-8859-1"
- transcode_tblgen_singlebyte "ISO-8859-2"
- transcode_tblgen_singlebyte "ISO-8859-3"
- transcode_tblgen_singlebyte "ISO-8859-4"
- transcode_tblgen_singlebyte "ISO-8859-5"
- transcode_tblgen_singlebyte "ISO-8859-6"
- transcode_tblgen_singlebyte "ISO-8859-7"
- transcode_tblgen_singlebyte "ISO-8859-8"
- transcode_tblgen_singlebyte "ISO-8859-9"
- transcode_tblgen_singlebyte "ISO-8859-10"
- transcode_tblgen_singlebyte "ISO-8859-11"
- transcode_tblgen_singlebyte "ISO-8859-13"
- transcode_tblgen_singlebyte "ISO-8859-14"
- transcode_tblgen_singlebyte "ISO-8859-15"
- transcode_tblgen_singlebyte "WINDOWS-874"
- transcode_tblgen_singlebyte "WINDOWS-1250"
- transcode_tblgen_singlebyte "WINDOWS-1251"
- transcode_tblgen_singlebyte "WINDOWS-1252"
- transcode_tblgen_singlebyte "WINDOWS-1253"
- transcode_tblgen_singlebyte "WINDOWS-1254"
- transcode_tblgen_singlebyte "WINDOWS-1255"
- transcode_tblgen_singlebyte "WINDOWS-1256"
- transcode_tblgen_singlebyte "WINDOWS-1257"
- transcode_tblgen_singlebyte "IBM437"
- transcode_tblgen_singlebyte "IBM775"
- transcode_tblgen_singlebyte "IBM852"
- transcode_tblgen_singlebyte "IBM855"
- transcode_tblgen_singlebyte "IBM857"
- transcode_tblgen_singlebyte "IBM860"
- transcode_tblgen_singlebyte "IBM861"
- transcode_tblgen_singlebyte "IBM862"
- transcode_tblgen_singlebyte "IBM863"
- transcode_tblgen_singlebyte "IBM865"
- transcode_tblgen_singlebyte "IBM866"
- transcode_tblgen_singlebyte "IBM869"
- transcode_tblgen_singlebyte "MACCROATIAN"
- transcode_tblgen_singlebyte "MACCYRILLIC"
- transcode_tblgen_singlebyte "MACGREEK"
- transcode_tblgen_singlebyte "MACICELAND"
- transcode_tblgen_singlebyte "MACROMAN"
- transcode_tblgen_singlebyte "MACROMANIA"
- transcode_tblgen_singlebyte "MACTURKISH"
- transcode_tblgen_singlebyte "MACUKRAINE"
- transcode_tblgen_singlebyte "KOI8-U"
- transcode_tblgen_singlebyte "KOI8-R"
- transcode_tblgen_singlebyte "TIS-620"
- transcode_tblgen_singlebyte "CP850"
- transcode_tblgen_singlebyte "CP852"
- transcode_tblgen_singlebyte "CP855"
-%>
-
-<%= transcode_generated_code %>
-
-void
-Init_single_byte(void)
-{
-<%= transcode_register_code %>
-}
-
diff --git a/enc/trans/tis-620-tbl.rb b/enc/trans/tis-620-tbl.rb
deleted file mode 100644
index a2f605730a..0000000000
--- a/enc/trans/tis-620-tbl.rb
+++ /dev/null
@@ -1,89 +0,0 @@
-TIS_620_TO_UCS_TBL = [
- ["A1",0xE01],
- ["A2",0xE02],
- ["A3",0xE03],
- ["A4",0xE04],
- ["A5",0xE05],
- ["A6",0xE06],
- ["A7",0xE07],
- ["A8",0xE08],
- ["A9",0xE09],
- ["AA",0xE0A],
- ["AB",0xE0B],
- ["AC",0xE0C],
- ["AD",0xE0D],
- ["AE",0xE0E],
- ["AF",0xE0F],
- ["B0",0xE10],
- ["B1",0xE11],
- ["B2",0xE12],
- ["B3",0xE13],
- ["B4",0xE14],
- ["B5",0xE15],
- ["B6",0xE16],
- ["B7",0xE17],
- ["B8",0xE18],
- ["B9",0xE19],
- ["BA",0xE1A],
- ["BB",0xE1B],
- ["BC",0xE1C],
- ["BD",0xE1D],
- ["BE",0xE1E],
- ["BF",0xE1F],
- ["C0",0xE20],
- ["C1",0xE21],
- ["C2",0xE22],
- ["C3",0xE23],
- ["C4",0xE24],
- ["C5",0xE25],
- ["C6",0xE26],
- ["C7",0xE27],
- ["C8",0xE28],
- ["C9",0xE29],
- ["CA",0xE2A],
- ["CB",0xE2B],
- ["CC",0xE2C],
- ["CD",0xE2D],
- ["CE",0xE2E],
- ["CF",0xE2F],
- ["D0",0xE30],
- ["D1",0xE31],
- ["D2",0xE32],
- ["D3",0xE33],
- ["D4",0xE34],
- ["D5",0xE35],
- ["D6",0xE36],
- ["D7",0xE37],
- ["D8",0xE38],
- ["D9",0xE39],
- ["DA",0xE3A],
- ["DF",0xE3F],
- ["E0",0xE40],
- ["E1",0xE41],
- ["E2",0xE42],
- ["E3",0xE43],
- ["E4",0xE44],
- ["E5",0xE45],
- ["E6",0xE46],
- ["E7",0xE47],
- ["E8",0xE48],
- ["E9",0xE49],
- ["EA",0xE4A],
- ["EB",0xE4B],
- ["EC",0xE4C],
- ["ED",0xE4D],
- ["EE",0xE4E],
- ["EF",0xE4F],
- ["F0",0xE50],
- ["F1",0xE51],
- ["F2",0xE52],
- ["F3",0xE53],
- ["F4",0xE54],
- ["F5",0xE55],
- ["F6",0xE56],
- ["F7",0xE57],
- ["F8",0xE58],
- ["F9",0xE59],
- ["FA",0xE5A],
- ["FB",0xE5B],
-]
diff --git a/enc/trans/transdb.c b/enc/trans/transdb.c
deleted file mode 100644
index d6ac41e967..0000000000
--- a/enc/trans/transdb.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/**********************************************************************
-
- enc/trans/transdb.c -
-
- $Author$
- created at: Mon Apr 7 15:51:31 2008
-
- Copyright (C) 2008 Yukihiro Matsumoto
-
-**********************************************************************/
-
-void rb_declare_transcoder(const char *enc1, const char *enc2, const char *lib);
-
-void
-Init_transdb(void)
-{
-#include "transdb.h"
-}
diff --git a/enc/trans/utf8_mac-tbl.rb b/enc/trans/utf8_mac-tbl.rb
deleted file mode 100644
index f43478bd3e..0000000000
--- a/enc/trans/utf8_mac-tbl.rb
+++ /dev/null
@@ -1,945 +0,0 @@
-# http://developer.apple.com/technotes/tn/tn1150table.html
-MAC_DECOMPOSE_TBL = [
- ["c380", "41cc80"],
- ["c381", "41cc81"],
- ["c382", "41cc82"],
- ["c383", "41cc83"],
- ["c384", "41cc88"],
- ["c385", "41cc8a"],
- ["c387", "43cca7"],
- ["c388", "45cc80"],
- ["c389", "45cc81"],
- ["c38a", "45cc82"],
- ["c38b", "45cc88"],
- ["c38c", "49cc80"],
- ["c38d", "49cc81"],
- ["c38e", "49cc82"],
- ["c38f", "49cc88"],
- ["c391", "4ecc83"],
- ["c392", "4fcc80"],
- ["c393", "4fcc81"],
- ["c394", "4fcc82"],
- ["c395", "4fcc83"],
- ["c396", "4fcc88"],
- ["c399", "55cc80"],
- ["c39a", "55cc81"],
- ["c39b", "55cc82"],
- ["c39c", "55cc88"],
- ["c39d", "59cc81"],
- ["c3a0", "61cc80"],
- ["c3a1", "61cc81"],
- ["c3a2", "61cc82"],
- ["c3a3", "61cc83"],
- ["c3a4", "61cc88"],
- ["c3a5", "61cc8a"],
- ["c3a7", "63cca7"],
- ["c3a8", "65cc80"],
- ["c3a9", "65cc81"],
- ["c3aa", "65cc82"],
- ["c3ab", "65cc88"],
- ["c3ac", "69cc80"],
- ["c3ad", "69cc81"],
- ["c3ae", "69cc82"],
- ["c3af", "69cc88"],
- ["c3b1", "6ecc83"],
- ["c3b2", "6fcc80"],
- ["c3b3", "6fcc81"],
- ["c3b4", "6fcc82"],
- ["c3b5", "6fcc83"],
- ["c3b6", "6fcc88"],
- ["c3b9", "75cc80"],
- ["c3ba", "75cc81"],
- ["c3bb", "75cc82"],
- ["c3bc", "75cc88"],
- ["c3bd", "79cc81"],
- ["c3bf", "79cc88"],
- ["c480", "41cc84"],
- ["c481", "61cc84"],
- ["c482", "41cc86"],
- ["c483", "61cc86"],
- ["c484", "41cca8"],
- ["c485", "61cca8"],
- ["c486", "43cc81"],
- ["c487", "63cc81"],
- ["c488", "43cc82"],
- ["c489", "63cc82"],
- ["c48a", "43cc87"],
- ["c48b", "63cc87"],
- ["c48c", "43cc8c"],
- ["c48d", "63cc8c"],
- ["c48e", "44cc8c"],
- ["c48f", "64cc8c"],
- ["c492", "45cc84"],
- ["c493", "65cc84"],
- ["c494", "45cc86"],
- ["c495", "65cc86"],
- ["c496", "45cc87"],
- ["c497", "65cc87"],
- ["c498", "45cca8"],
- ["c499", "65cca8"],
- ["c49a", "45cc8c"],
- ["c49b", "65cc8c"],
- ["c49c", "47cc82"],
- ["c49d", "67cc82"],
- ["c49e", "47cc86"],
- ["c49f", "67cc86"],
- ["c4a0", "47cc87"],
- ["c4a1", "67cc87"],
- ["c4a2", "47cca7"],
- ["c4a3", "67cca7"],
- ["c4a4", "48cc82"],
- ["c4a5", "68cc82"],
- ["c4a8", "49cc83"],
- ["c4a9", "69cc83"],
- ["c4aa", "49cc84"],
- ["c4ab", "69cc84"],
- ["c4ac", "49cc86"],
- ["c4ad", "69cc86"],
- ["c4ae", "49cca8"],
- ["c4af", "69cca8"],
- ["c4b0", "49cc87"],
- ["c4b4", "4acc82"],
- ["c4b5", "6acc82"],
- ["c4b6", "4bcca7"],
- ["c4b7", "6bcca7"],
- ["c4b9", "4ccc81"],
- ["c4ba", "6ccc81"],
- ["c4bb", "4ccca7"],
- ["c4bc", "6ccca7"],
- ["c4bd", "4ccc8c"],
- ["c4be", "6ccc8c"],
- ["c583", "4ecc81"],
- ["c584", "6ecc81"],
- ["c585", "4ecca7"],
- ["c586", "6ecca7"],
- ["c587", "4ecc8c"],
- ["c588", "6ecc8c"],
- ["c58c", "4fcc84"],
- ["c58d", "6fcc84"],
- ["c58e", "4fcc86"],
- ["c58f", "6fcc86"],
- ["c590", "4fcc8b"],
- ["c591", "6fcc8b"],
- ["c594", "52cc81"],
- ["c595", "72cc81"],
- ["c596", "52cca7"],
- ["c597", "72cca7"],
- ["c598", "52cc8c"],
- ["c599", "72cc8c"],
- ["c59a", "53cc81"],
- ["c59b", "73cc81"],
- ["c59c", "53cc82"],
- ["c59d", "73cc82"],
- ["c59e", "53cca7"],
- ["c59f", "73cca7"],
- ["c5a0", "53cc8c"],
- ["c5a1", "73cc8c"],
- ["c5a2", "54cca7"],
- ["c5a3", "74cca7"],
- ["c5a4", "54cc8c"],
- ["c5a5", "74cc8c"],
- ["c5a8", "55cc83"],
- ["c5a9", "75cc83"],
- ["c5aa", "55cc84"],
- ["c5ab", "75cc84"],
- ["c5ac", "55cc86"],
- ["c5ad", "75cc86"],
- ["c5ae", "55cc8a"],
- ["c5af", "75cc8a"],
- ["c5b0", "55cc8b"],
- ["c5b1", "75cc8b"],
- ["c5b2", "55cca8"],
- ["c5b3", "75cca8"],
- ["c5b4", "57cc82"],
- ["c5b5", "77cc82"],
- ["c5b6", "59cc82"],
- ["c5b7", "79cc82"],
- ["c5b8", "59cc88"],
- ["c5b9", "5acc81"],
- ["c5ba", "7acc81"],
- ["c5bb", "5acc87"],
- ["c5bc", "7acc87"],
- ["c5bd", "5acc8c"],
- ["c5be", "7acc8c"],
- ["c6a0", "4fcc9b"],
- ["c6a1", "6fcc9b"],
- ["c6af", "55cc9b"],
- ["c6b0", "75cc9b"],
- ["c78d", "41cc8c"],
- ["c78e", "61cc8c"],
- ["c78f", "49cc8c"],
- ["c790", "69cc8c"],
- ["c791", "4fcc8c"],
- ["c792", "6fcc8c"],
- ["c793", "55cc8c"],
- ["c794", "75cc8c"],
- ["c795", "55cc88cc84"],
- ["c796", "75cc88cc84"],
- ["c797", "55cc88cc81"],
- ["c798", "75cc88cc81"],
- ["c799", "55cc88cc8c"],
- ["c79a", "75cc88cc8c"],
- ["c79b", "55cc88cc80"],
- ["c79c", "75cc88cc80"],
- ["c79e", "41cc88cc84"],
- ["c79f", "61cc88cc84"],
- ["c7a0", "41cc87cc84"],
- ["c7a1", "61cc87cc84"],
- ["c7a2", "c386cc84"],
- ["c7a3", "c3a6cc84"],
- ["c7a6", "47cc8c"],
- ["c7a7", "67cc8c"],
- ["c7a8", "4bcc8c"],
- ["c7a9", "6bcc8c"],
- ["c7aa", "4fcca8"],
- ["c7ab", "6fcca8"],
- ["c7ac", "4fcca8cc84"],
- ["c7ad", "6fcca8cc84"],
- ["c7ae", "c6b7cc8c"],
- ["c7af", "ca92cc8c"],
- ["c7b0", "6acc8c"],
- ["c7b4", "47cc81"],
- ["c7b5", "67cc81"],
- ["c7ba", "41cc8acc81"],
- ["c7bb", "61cc8acc81"],
- ["c7bc", "c386cc81"],
- ["c7bd", "c3a6cc81"],
- ["c7be", "c398cc81"],
- ["c7bf", "c3b8cc81"],
- ["c880", "41cc8f"],
- ["c881", "61cc8f"],
- ["c882", "41cc91"],
- ["c883", "61cc91"],
- ["c884", "45cc8f"],
- ["c885", "65cc8f"],
- ["c886", "45cc91"],
- ["c887", "65cc91"],
- ["c888", "49cc8f"],
- ["c889", "69cc8f"],
- ["c88a", "49cc91"],
- ["c88b", "69cc91"],
- ["c88c", "4fcc8f"],
- ["c88d", "6fcc8f"],
- ["c88e", "4fcc91"],
- ["c88f", "6fcc91"],
- ["c890", "52cc8f"],
- ["c891", "72cc8f"],
- ["c892", "52cc91"],
- ["c893", "72cc91"],
- ["c894", "55cc8f"],
- ["c895", "75cc8f"],
- ["c896", "55cc91"],
- ["c897", "75cc91"],
- ["cc90", "cc86cc87"],
- ["cd80", "cc80"],
- ["cd81", "cc81"],
- ["cd83", "cc93"],
- ["cd84", "cc88cc8d"],
- ["cdb4", "cab9"],
- ["cdbe", "3b"],
- ["ce85", "c2a8cc8d"],
- ["ce86", "ce91cc8d"],
- ["ce87", "c2b7"],
- ["ce88", "ce95cc8d"],
- ["ce89", "ce97cc8d"],
- ["ce8a", "ce99cc8d"],
- ["ce8c", "ce9fcc8d"],
- ["ce8e", "cea5cc8d"],
- ["ce8f", "cea9cc8d"],
- ["ce90", "ceb9cc88cc8d"],
- ["ceaa", "ce99cc88"],
- ["ceab", "cea5cc88"],
- ["ceac", "ceb1cc8d"],
- ["cead", "ceb5cc8d"],
- ["ceae", "ceb7cc8d"],
- ["ceaf", "ceb9cc8d"],
- ["ceb0", "cf85cc88cc8d"],
- ["cf8a", "ceb9cc88"],
- ["cf8b", "cf85cc88"],
- ["cf8c", "cebfcc8d"],
- ["cf8d", "cf85cc8d"],
- ["cf8e", "cf89cc8d"],
- ["cf93", "cf92cc8d"],
- ["cf94", "cf92cc88"],
- ["d081", "d095cc88"],
- ["d083", "d093cc81"],
- ["d087", "d086cc88"],
- ["d08c", "d09acc81"],
- ["d08e", "d0a3cc86"],
- ["d099", "d098cc86"],
- ["d0b9", "d0b8cc86"],
- ["d191", "d0b5cc88"],
- ["d193", "d0b3cc81"],
- ["d197", "d196cc88"],
- ["d19c", "d0bacc81"],
- ["d19e", "d183cc86"],
- ["d1b6", "d1b4cc8f"],
- ["d1b7", "d1b5cc8f"],
- ["d381", "d096cc86"],
- ["d382", "d0b6cc86"],
- ["d390", "d090cc86"],
- ["d391", "d0b0cc86"],
- ["d392", "d090cc88"],
- ["d393", "d0b0cc88"],
- ["d394", "c386"],
- ["d395", "c3a6"],
- ["d396", "d095cc86"],
- ["d397", "d0b5cc86"],
- ["d398", "c68f"],
- ["d399", "c999"],
- ["d39a", "c68fcc88"],
- ["d39b", "c999cc88"],
- ["d39c", "d096cc88"],
- ["d39d", "d0b6cc88"],
- ["d39e", "d097cc88"],
- ["d39f", "d0b7cc88"],
- ["d3a0", "c6b7"],
- ["d3a1", "ca92"],
- ["d3a2", "d098cc84"],
- ["d3a3", "d0b8cc84"],
- ["d3a4", "d098cc88"],
- ["d3a5", "d0b8cc88"],
- ["d3a6", "d09ecc88"],
- ["d3a7", "d0becc88"],
- ["d3a8", "c69f"],
- ["d3a9", "c9b5"],
- ["d3aa", "c69fcc88"],
- ["d3ab", "c9b5cc88"],
- ["d3ae", "d0a3cc84"],
- ["d3af", "d183cc84"],
- ["d3b0", "d0a3cc88"],
- ["d3b1", "d183cc88"],
- ["d3b2", "d0a3cc8b"],
- ["d3b3", "d183cc8b"],
- ["d3b4", "d0a7cc88"],
- ["d3b5", "d187cc88"],
- ["d3b8", "d0abcc88"],
- ["d3b9", "d18bcc88"],
- ["e0a4a9", "e0a4a8e0a4bc"],
- ["e0a4b1", "e0a4b0e0a4bc"],
- ["e0a4b4", "e0a4b3e0a4bc"],
- ["e0a598", "e0a495e0a4bc"],
- ["e0a599", "e0a496e0a4bc"],
- ["e0a59a", "e0a497e0a4bc"],
- ["e0a59b", "e0a49ce0a4bc"],
- ["e0a59c", "e0a4a1e0a4bc"],
- ["e0a59d", "e0a4a2e0a4bc"],
- ["e0a59e", "e0a4abe0a4bc"],
- ["e0a59f", "e0a4afe0a4bc"],
- ["e0a6b0", "e0a6ace0a6bc"],
- ["e0a78b", "e0a787e0a6be"],
- ["e0a78c", "e0a787e0a797"],
- ["e0a79c", "e0a6a1e0a6bc"],
- ["e0a79d", "e0a6a2e0a6bc"],
- ["e0a79f", "e0a6afe0a6bc"],
- ["e0a999", "e0a896e0a8bc"],
- ["e0a99a", "e0a897e0a8bc"],
- ["e0a99b", "e0a89ce0a8bc"],
- ["e0a99c", "e0a8a1e0a8bc"],
- ["e0a99e", "e0a8abe0a8bc"],
- ["e0ad88", "e0ad87e0ad96"],
- ["e0ad8b", "e0ad87e0acbe"],
- ["e0ad8c", "e0ad87e0ad97"],
- ["e0ad9c", "e0aca1e0acbc"],
- ["e0ad9d", "e0aca2e0acbc"],
- ["e0ad9f", "e0acafe0acbc"],
- ["e0ae94", "e0ae92e0af97"],
- ["e0af8a", "e0af86e0aebe"],
- ["e0af8b", "e0af87e0aebe"],
- ["e0af8c", "e0af86e0af97"],
- ["e0b188", "e0b186e0b196"],
- ["e0b380", "e0b2bfe0b395"],
- ["e0b387", "e0b386e0b395"],
- ["e0b388", "e0b386e0b396"],
- ["e0b38a", "e0b386e0b382"],
- ["e0b38b", "e0b386e0b382e0b395"],
- ["e0b58a", "e0b586e0b4be"],
- ["e0b58b", "e0b587e0b4be"],
- ["e0b58c", "e0b586e0b597"],
- ["e0b8b3", "e0b98de0b8b2"],
- ["e0bab3", "e0bb8de0bab2"],
- ["e0bd83", "e0bd82e0beb7"],
- ["e0bd8d", "e0bd8ce0beb7"],
- ["e0bd92", "e0bd91e0beb7"],
- ["e0bd97", "e0bd96e0beb7"],
- ["e0bd9c", "e0bd9be0beb7"],
- ["e0bda9", "e0bd80e0beb5"],
- ["e0bdb3", "e0bdb2e0bdb1"],
- ["e0bdb5", "e0bdb4e0bdb1"],
- ["e0bdb6", "e0beb2e0be80"],
- ["e0bdb7", "e0beb2e0be80e0bdb1"],
- ["e0bdb8", "e0beb3e0be80"],
- ["e0bdb9", "e0beb3e0be80e0bdb1"],
- ["e0be81", "e0be80e0bdb1"],
- ["e0be93", "e0be92e0beb7"],
- ["e0be9d", "e0be9ce0beb7"],
- ["e0bea2", "e0bea1e0beb7"],
- ["e0bea7", "e0bea6e0beb7"],
- ["e0beac", "e0beabe0beb7"],
- ["e0beb9", "e0be90e0beb5"],
- ["e1b880", "41cca5"],
- ["e1b881", "61cca5"],
- ["e1b882", "42cc87"],
- ["e1b883", "62cc87"],
- ["e1b884", "42cca3"],
- ["e1b885", "62cca3"],
- ["e1b886", "42ccb1"],
- ["e1b887", "62ccb1"],
- ["e1b888", "43cca7cc81"],
- ["e1b889", "63cca7cc81"],
- ["e1b88a", "44cc87"],
- ["e1b88b", "64cc87"],
- ["e1b88c", "44cca3"],
- ["e1b88d", "64cca3"],
- ["e1b88e", "44ccb1"],
- ["e1b88f", "64ccb1"],
- ["e1b890", "44cca7"],
- ["e1b891", "64cca7"],
- ["e1b892", "44ccad"],
- ["e1b893", "64ccad"],
- ["e1b894", "45cc84cc80"],
- ["e1b895", "65cc84cc80"],
- ["e1b896", "45cc84cc81"],
- ["e1b897", "65cc84cc81"],
- ["e1b898", "45ccad"],
- ["e1b899", "65ccad"],
- ["e1b89a", "45ccb0"],
- ["e1b89b", "65ccb0"],
- ["e1b89c", "45cca7cc86"],
- ["e1b89d", "65cca7cc86"],
- ["e1b89e", "46cc87"],
- ["e1b89f", "66cc87"],
- ["e1b8a0", "47cc84"],
- ["e1b8a1", "67cc84"],
- ["e1b8a2", "48cc87"],
- ["e1b8a3", "68cc87"],
- ["e1b8a4", "48cca3"],
- ["e1b8a5", "68cca3"],
- ["e1b8a6", "48cc88"],
- ["e1b8a7", "68cc88"],
- ["e1b8a8", "48cca7"],
- ["e1b8a9", "68cca7"],
- ["e1b8aa", "48ccae"],
- ["e1b8ab", "68ccae"],
- ["e1b8ac", "49ccb0"],
- ["e1b8ad", "69ccb0"],
- ["e1b8ae", "49cc88cc81"],
- ["e1b8af", "69cc88cc81"],
- ["e1b8b0", "4bcc81"],
- ["e1b8b1", "6bcc81"],
- ["e1b8b2", "4bcca3"],
- ["e1b8b3", "6bcca3"],
- ["e1b8b4", "4bccb1"],
- ["e1b8b5", "6bccb1"],
- ["e1b8b6", "4ccca3"],
- ["e1b8b7", "6ccca3"],
- ["e1b8b8", "4ccca3cc84"],
- ["e1b8b9", "6ccca3cc84"],
- ["e1b8ba", "4cccb1"],
- ["e1b8bb", "6cccb1"],
- ["e1b8bc", "4cccad"],
- ["e1b8bd", "6cccad"],
- ["e1b8be", "4dcc81"],
- ["e1b8bf", "6dcc81"],
- ["e1b980", "4dcc87"],
- ["e1b981", "6dcc87"],
- ["e1b982", "4dcca3"],
- ["e1b983", "6dcca3"],
- ["e1b984", "4ecc87"],
- ["e1b985", "6ecc87"],
- ["e1b986", "4ecca3"],
- ["e1b987", "6ecca3"],
- ["e1b988", "4eccb1"],
- ["e1b989", "6eccb1"],
- ["e1b98a", "4eccad"],
- ["e1b98b", "6eccad"],
- ["e1b98c", "4fcc83cc81"],
- ["e1b98d", "6fcc83cc81"],
- ["e1b98e", "4fcc83cc88"],
- ["e1b98f", "6fcc83cc88"],
- ["e1b990", "4fcc84cc80"],
- ["e1b991", "6fcc84cc80"],
- ["e1b992", "4fcc84cc81"],
- ["e1b993", "6fcc84cc81"],
- ["e1b994", "50cc81"],
- ["e1b995", "70cc81"],
- ["e1b996", "50cc87"],
- ["e1b997", "70cc87"],
- ["e1b998", "52cc87"],
- ["e1b999", "72cc87"],
- ["e1b99a", "52cca3"],
- ["e1b99b", "72cca3"],
- ["e1b99c", "52cca3cc84"],
- ["e1b99d", "72cca3cc84"],
- ["e1b99e", "52ccb1"],
- ["e1b99f", "72ccb1"],
- ["e1b9a0", "53cc87"],
- ["e1b9a1", "73cc87"],
- ["e1b9a2", "53cca3"],
- ["e1b9a3", "73cca3"],
- ["e1b9a4", "53cc81cc87"],
- ["e1b9a5", "73cc81cc87"],
- ["e1b9a6", "53cc8ccc87"],
- ["e1b9a7", "73cc8ccc87"],
- ["e1b9a8", "53cca3cc87"],
- ["e1b9a9", "73cca3cc87"],
- ["e1b9aa", "54cc87"],
- ["e1b9ab", "74cc87"],
- ["e1b9ac", "54cca3"],
- ["e1b9ad", "74cca3"],
- ["e1b9ae", "54ccb1"],
- ["e1b9af", "74ccb1"],
- ["e1b9b0", "54ccad"],
- ["e1b9b1", "74ccad"],
- ["e1b9b2", "55cca4"],
- ["e1b9b3", "75cca4"],
- ["e1b9b4", "55ccb0"],
- ["e1b9b5", "75ccb0"],
- ["e1b9b6", "55ccad"],
- ["e1b9b7", "75ccad"],
- ["e1b9b8", "55cc83cc81"],
- ["e1b9b9", "75cc83cc81"],
- ["e1b9ba", "55cc84cc88"],
- ["e1b9bb", "75cc84cc88"],
- ["e1b9bc", "56cc83"],
- ["e1b9bd", "76cc83"],
- ["e1b9be", "56cca3"],
- ["e1b9bf", "76cca3"],
- ["e1ba80", "57cc80"],
- ["e1ba81", "77cc80"],
- ["e1ba82", "57cc81"],
- ["e1ba83", "77cc81"],
- ["e1ba84", "57cc88"],
- ["e1ba85", "77cc88"],
- ["e1ba86", "57cc87"],
- ["e1ba87", "77cc87"],
- ["e1ba88", "57cca3"],
- ["e1ba89", "77cca3"],
- ["e1ba8a", "58cc87"],
- ["e1ba8b", "78cc87"],
- ["e1ba8c", "58cc88"],
- ["e1ba8d", "78cc88"],
- ["e1ba8e", "59cc87"],
- ["e1ba8f", "79cc87"],
- ["e1ba90", "5acc82"],
- ["e1ba91", "7acc82"],
- ["e1ba92", "5acca3"],
- ["e1ba93", "7acca3"],
- ["e1ba94", "5accb1"],
- ["e1ba95", "7accb1"],
- ["e1ba96", "68ccb1"],
- ["e1ba97", "74cc88"],
- ["e1ba98", "77cc8a"],
- ["e1ba99", "79cc8a"],
- ["e1ba9b", "c5bfcc87"],
- ["e1baa0", "41cca3"],
- ["e1baa1", "61cca3"],
- ["e1baa2", "41cc89"],
- ["e1baa3", "61cc89"],
- ["e1baa4", "41cc82cc81"],
- ["e1baa5", "61cc82cc81"],
- ["e1baa6", "41cc82cc80"],
- ["e1baa7", "61cc82cc80"],
- ["e1baa8", "41cc82cc89"],
- ["e1baa9", "61cc82cc89"],
- ["e1baaa", "41cc82cc83"],
- ["e1baab", "61cc82cc83"],
- ["e1baac", "41cca3cc82"],
- ["e1baad", "61cca3cc82"],
- ["e1baae", "41cc86cc81"],
- ["e1baaf", "61cc86cc81"],
- ["e1bab0", "41cc86cc80"],
- ["e1bab1", "61cc86cc80"],
- ["e1bab2", "41cc86cc89"],
- ["e1bab3", "61cc86cc89"],
- ["e1bab4", "41cc86cc83"],
- ["e1bab5", "61cc86cc83"],
- ["e1bab6", "41cca3cc86"],
- ["e1bab7", "61cca3cc86"],
- ["e1bab8", "45cca3"],
- ["e1bab9", "65cca3"],
- ["e1baba", "45cc89"],
- ["e1babb", "65cc89"],
- ["e1babc", "45cc83"],
- ["e1babd", "65cc83"],
- ["e1babe", "45cc82cc81"],
- ["e1babf", "65cc82cc81"],
- ["e1bb80", "45cc82cc80"],
- ["e1bb81", "65cc82cc80"],
- ["e1bb82", "45cc82cc89"],
- ["e1bb83", "65cc82cc89"],
- ["e1bb84", "45cc82cc83"],
- ["e1bb85", "65cc82cc83"],
- ["e1bb86", "45cca3cc82"],
- ["e1bb87", "65cca3cc82"],
- ["e1bb88", "49cc89"],
- ["e1bb89", "69cc89"],
- ["e1bb8a", "49cca3"],
- ["e1bb8b", "69cca3"],
- ["e1bb8c", "4fcca3"],
- ["e1bb8d", "6fcca3"],
- ["e1bb8e", "4fcc89"],
- ["e1bb8f", "6fcc89"],
- ["e1bb90", "4fcc82cc81"],
- ["e1bb91", "6fcc82cc81"],
- ["e1bb92", "4fcc82cc80"],
- ["e1bb93", "6fcc82cc80"],
- ["e1bb94", "4fcc82cc89"],
- ["e1bb95", "6fcc82cc89"],
- ["e1bb96", "4fcc82cc83"],
- ["e1bb97", "6fcc82cc83"],
- ["e1bb98", "4fcca3cc82"],
- ["e1bb99", "6fcca3cc82"],
- ["e1bb9a", "4fcc9bcc81"],
- ["e1bb9b", "6fcc9bcc81"],
- ["e1bb9c", "4fcc9bcc80"],
- ["e1bb9d", "6fcc9bcc80"],
- ["e1bb9e", "4fcc9bcc89"],
- ["e1bb9f", "6fcc9bcc89"],
- ["e1bba0", "4fcc9bcc83"],
- ["e1bba1", "6fcc9bcc83"],
- ["e1bba2", "4fcc9bcca3"],
- ["e1bba3", "6fcc9bcca3"],
- ["e1bba4", "55cca3"],
- ["e1bba5", "75cca3"],
- ["e1bba6", "55cc89"],
- ["e1bba7", "75cc89"],
- ["e1bba8", "55cc9bcc81"],
- ["e1bba9", "75cc9bcc81"],
- ["e1bbaa", "55cc9bcc80"],
- ["e1bbab", "75cc9bcc80"],
- ["e1bbac", "55cc9bcc89"],
- ["e1bbad", "75cc9bcc89"],
- ["e1bbae", "55cc9bcc83"],
- ["e1bbaf", "75cc9bcc83"],
- ["e1bbb0", "55cc9bcca3"],
- ["e1bbb1", "75cc9bcca3"],
- ["e1bbb2", "59cc80"],
- ["e1bbb3", "79cc80"],
- ["e1bbb4", "59cca3"],
- ["e1bbb5", "79cca3"],
- ["e1bbb6", "59cc89"],
- ["e1bbb7", "79cc89"],
- ["e1bbb8", "59cc83"],
- ["e1bbb9", "79cc83"],
- ["e1bc80", "ceb1cc93"],
- ["e1bc81", "ceb1cc94"],
- ["e1bc82", "ceb1cc93cc80"],
- ["e1bc83", "ceb1cc94cc80"],
- ["e1bc84", "ceb1cc93cc81"],
- ["e1bc85", "ceb1cc94cc81"],
- ["e1bc86", "ceb1cc93cd82"],
- ["e1bc87", "ceb1cc94cd82"],
- ["e1bc88", "ce91cc93"],
- ["e1bc89", "ce91cc94"],
- ["e1bc8a", "ce91cc93cc80"],
- ["e1bc8b", "ce91cc94cc80"],
- ["e1bc8c", "ce91cc93cc81"],
- ["e1bc8d", "ce91cc94cc81"],
- ["e1bc8e", "ce91cc93cd82"],
- ["e1bc8f", "ce91cc94cd82"],
- ["e1bc90", "ceb5cc93"],
- ["e1bc91", "ceb5cc94"],
- ["e1bc92", "ceb5cc93cc80"],
- ["e1bc93", "ceb5cc94cc80"],
- ["e1bc94", "ceb5cc93cc81"],
- ["e1bc95", "ceb5cc94cc81"],
- ["e1bc98", "ce95cc93"],
- ["e1bc99", "ce95cc94"],
- ["e1bc9a", "ce95cc93cc80"],
- ["e1bc9b", "ce95cc94cc80"],
- ["e1bc9c", "ce95cc93cc81"],
- ["e1bc9d", "ce95cc94cc81"],
- ["e1bca0", "ceb7cc93"],
- ["e1bca1", "ceb7cc94"],
- ["e1bca2", "ceb7cc93cc80"],
- ["e1bca3", "ceb7cc94cc80"],
- ["e1bca4", "ceb7cc93cc81"],
- ["e1bca5", "ceb7cc94cc81"],
- ["e1bca6", "ceb7cc93cd82"],
- ["e1bca7", "ceb7cc94cd82"],
- ["e1bca8", "ce97cc93"],
- ["e1bca9", "ce97cc94"],
- ["e1bcaa", "ce97cc93cc80"],
- ["e1bcab", "ce97cc94cc80"],
- ["e1bcac", "ce97cc93cc81"],
- ["e1bcad", "ce97cc94cc81"],
- ["e1bcae", "ce97cc93cd82"],
- ["e1bcaf", "ce97cc94cd82"],
- ["e1bcb0", "ceb9cc93"],
- ["e1bcb1", "ceb9cc94"],
- ["e1bcb2", "ceb9cc93cc80"],
- ["e1bcb3", "ceb9cc94cc80"],
- ["e1bcb4", "ceb9cc93cc81"],
- ["e1bcb5", "ceb9cc94cc81"],
- ["e1bcb6", "ceb9cc93cd82"],
- ["e1bcb7", "ceb9cc94cd82"],
- ["e1bcb8", "ce99cc93"],
- ["e1bcb9", "ce99cc94"],
- ["e1bcba", "ce99cc93cc80"],
- ["e1bcbb", "ce99cc94cc80"],
- ["e1bcbc", "ce99cc93cc81"],
- ["e1bcbd", "ce99cc94cc81"],
- ["e1bcbe", "ce99cc93cd82"],
- ["e1bcbf", "ce99cc94cd82"],
- ["e1bd80", "cebfcc93"],
- ["e1bd81", "cebfcc94"],
- ["e1bd82", "cebfcc93cc80"],
- ["e1bd83", "cebfcc94cc80"],
- ["e1bd84", "cebfcc93cc81"],
- ["e1bd85", "cebfcc94cc81"],
- ["e1bd88", "ce9fcc93"],
- ["e1bd89", "ce9fcc94"],
- ["e1bd8a", "ce9fcc93cc80"],
- ["e1bd8b", "ce9fcc94cc80"],
- ["e1bd8c", "ce9fcc93cc81"],
- ["e1bd8d", "ce9fcc94cc81"],
- ["e1bd90", "cf85cc93"],
- ["e1bd91", "cf85cc94"],
- ["e1bd92", "cf85cc93cc80"],
- ["e1bd93", "cf85cc94cc80"],
- ["e1bd94", "cf85cc93cc81"],
- ["e1bd95", "cf85cc94cc81"],
- ["e1bd96", "cf85cc93cd82"],
- ["e1bd97", "cf85cc94cd82"],
- ["e1bd99", "cea5cc94"],
- ["e1bd9b", "cea5cc94cc80"],
- ["e1bd9d", "cea5cc94cc81"],
- ["e1bd9f", "cea5cc94cd82"],
- ["e1bda0", "cf89cc93"],
- ["e1bda1", "cf89cc94"],
- ["e1bda2", "cf89cc93cc80"],
- ["e1bda3", "cf89cc94cc80"],
- ["e1bda4", "cf89cc93cc81"],
- ["e1bda5", "cf89cc94cc81"],
- ["e1bda6", "cf89cc93cd82"],
- ["e1bda7", "cf89cc94cd82"],
- ["e1bda8", "cea9cc93"],
- ["e1bda9", "cea9cc94"],
- ["e1bdaa", "cea9cc93cc80"],
- ["e1bdab", "cea9cc94cc80"],
- ["e1bdac", "cea9cc93cc81"],
- ["e1bdad", "cea9cc94cc81"],
- ["e1bdae", "cea9cc93cd82"],
- ["e1bdaf", "cea9cc94cd82"],
- ["e1bdb0", "ceb1cc80"],
- ["e1bdb1", "ceb1cc81"],
- ["e1bdb2", "ceb5cc80"],
- ["e1bdb3", "ceb5cc81"],
- ["e1bdb4", "ceb7cc80"],
- ["e1bdb5", "ceb7cc81"],
- ["e1bdb6", "ceb9cc80"],
- ["e1bdb7", "ceb9cc81"],
- ["e1bdb8", "cebfcc80"],
- ["e1bdb9", "cebfcc81"],
- ["e1bdba", "cf85cc80"],
- ["e1bdbb", "cf85cc81"],
- ["e1bdbc", "cf89cc80"],
- ["e1bdbd", "cf89cc81"],
- ["e1be80", "ceb1cd85cc93"],
- ["e1be81", "ceb1cd85cc94"],
- ["e1be82", "ceb1cd85cc93cc80"],
- ["e1be83", "ceb1cd85cc94cc80"],
- ["e1be84", "ceb1cd85cc93cc81"],
- ["e1be85", "ceb1cd85cc94cc81"],
- ["e1be86", "ceb1cd85cc93cd82"],
- ["e1be87", "ceb1cd85cc94cd82"],
- ["e1be88", "ce91cd85cc93"],
- ["e1be89", "ce91cd85cc94"],
- ["e1be8a", "ce91cd85cc93cc80"],
- ["e1be8b", "ce91cd85cc94cc80"],
- ["e1be8c", "ce91cd85cc93cc81"],
- ["e1be8d", "ce91cd85cc94cc81"],
- ["e1be8e", "ce91cd85cc93cd82"],
- ["e1be8f", "ce91cd85cc94cd82"],
- ["e1be90", "ceb7cd85cc93"],
- ["e1be91", "ceb7cd85cc94"],
- ["e1be92", "ceb7cd85cc93cc80"],
- ["e1be93", "ceb7cd85cc94cc80"],
- ["e1be94", "ceb7cd85cc93cc81"],
- ["e1be95", "ceb7cd85cc94cc81"],
- ["e1be96", "ceb7cd85cc93cd82"],
- ["e1be97", "ceb7cd85cc94cd82"],
- ["e1be98", "ce97cd85cc93"],
- ["e1be99", "ce97cd85cc94"],
- ["e1be9a", "ce97cd85cc93cc80"],
- ["e1be9b", "ce97cd85cc94cc80"],
- ["e1be9c", "ce97cd85cc93cc81"],
- ["e1be9d", "ce97cd85cc94cc81"],
- ["e1be9e", "ce97cd85cc93cd82"],
- ["e1be9f", "ce97cd85cc94cd82"],
- ["e1bea0", "cf89cd85cc93"],
- ["e1bea1", "cf89cd85cc94"],
- ["e1bea2", "cf89cd85cc93cc80"],
- ["e1bea3", "cf89cd85cc94cc80"],
- ["e1bea4", "cf89cd85cc93cc81"],
- ["e1bea5", "cf89cd85cc94cc81"],
- ["e1bea6", "cf89cd85cc93cd82"],
- ["e1bea7", "cf89cd85cc94cd82"],
- ["e1bea8", "cea9cd85cc93"],
- ["e1bea9", "cea9cd85cc94"],
- ["e1beaa", "cea9cd85cc93cc80"],
- ["e1beab", "cea9cd85cc94cc80"],
- ["e1beac", "cea9cd85cc93cc81"],
- ["e1bead", "cea9cd85cc94cc81"],
- ["e1beae", "cea9cd85cc93cd82"],
- ["e1beaf", "cea9cd85cc94cd82"],
- ["e1beb0", "ceb1cc86"],
- ["e1beb1", "ceb1cc84"],
- ["e1beb2", "ceb1cd85cc80"],
- ["e1beb3", "ceb1cd85"],
- ["e1beb4", "ceb1cd85cc81"],
- ["e1beb6", "ceb1cd82"],
- ["e1beb7", "ceb1cd85cd82"],
- ["e1beb8", "ce91cc86"],
- ["e1beb9", "ce91cc84"],
- ["e1beba", "ce91cc80"],
- ["e1bebb", "ce91cc81"],
- ["e1bebc", "ce91cd85"],
- ["e1bebe", "ceb9"],
- ["e1bf81", "c2a8cd82"],
- ["e1bf82", "ceb7cd85cc80"],
- ["e1bf83", "ceb7cd85"],
- ["e1bf84", "ceb7cd85cc81"],
- ["e1bf86", "ceb7cd82"],
- ["e1bf87", "ceb7cd85cd82"],
- ["e1bf88", "ce95cc80"],
- ["e1bf89", "ce95cc81"],
- ["e1bf8a", "ce97cc80"],
- ["e1bf8b", "ce97cc81"],
- ["e1bf8c", "ce97cd85"],
- ["e1bf8d", "e1bebfcc80"],
- ["e1bf8e", "e1bebfcc81"],
- ["e1bf8f", "e1bebfcd82"],
- ["e1bf90", "ceb9cc86"],
- ["e1bf91", "ceb9cc84"],
- ["e1bf92", "ceb9cc88cc80"],
- ["e1bf93", "ceb9cc88cc81"],
- ["e1bf96", "ceb9cd82"],
- ["e1bf97", "ceb9cc88cd82"],
- ["e1bf98", "ce99cc86"],
- ["e1bf99", "ce99cc84"],
- ["e1bf9a", "ce99cc80"],
- ["e1bf9b", "ce99cc81"],
- ["e1bf9d", "e1bfbecc80"],
- ["e1bf9e", "e1bfbecc81"],
- ["e1bf9f", "e1bfbecd82"],
- ["e1bfa0", "cf85cc86"],
- ["e1bfa1", "cf85cc84"],
- ["e1bfa2", "cf85cc88cc80"],
- ["e1bfa3", "cf85cc88cc81"],
- ["e1bfa4", "cf81cc93"],
- ["e1bfa5", "cf81cc94"],
- ["e1bfa6", "cf85cd82"],
- ["e1bfa7", "cf85cc88cd82"],
- ["e1bfa8", "cea5cc86"],
- ["e1bfa9", "cea5cc84"],
- ["e1bfaa", "cea5cc80"],
- ["e1bfab", "cea5cc81"],
- ["e1bfac", "cea1cc94"],
- ["e1bfad", "c2a8cc80"],
- ["e1bfae", "c2a8cc81"],
- ["e1bfaf", "60"],
- ["e1bfb2", "cf89cd85cc80"],
- ["e1bfb3", "cf89cd85"],
- ["e1bfb4", "cebfcd85cc81"],
- ["e1bfb6", "cf89cd82"],
- ["e1bfb7", "cf89cd85cd82"],
- ["e1bfb8", "ce9fcc80"],
- ["e1bfb9", "ce9fcc81"],
- ["e1bfba", "cea9cc80"],
- ["e1bfbb", "cea9cc81"],
- ["e1bfbc", "cea9cd85"],
- ["e1bfbd", "c2b4"],
- ["e3818c", "e3818be38299"],
- ["e3818e", "e3818de38299"],
- ["e38190", "e3818fe38299"],
- ["e38192", "e38191e38299"],
- ["e38194", "e38193e38299"],
- ["e38196", "e38195e38299"],
- ["e38198", "e38197e38299"],
- ["e3819a", "e38199e38299"],
- ["e3819c", "e3819be38299"],
- ["e3819e", "e3819de38299"],
- ["e381a0", "e3819fe38299"],
- ["e381a2", "e381a1e38299"],
- ["e381a5", "e381a4e38299"],
- ["e381a7", "e381a6e38299"],
- ["e381a9", "e381a8e38299"],
- ["e381b0", "e381afe38299"],
- ["e381b1", "e381afe3829a"],
- ["e381b3", "e381b2e38299"],
- ["e381b4", "e381b2e3829a"],
- ["e381b6", "e381b5e38299"],
- ["e381b7", "e381b5e3829a"],
- ["e381b9", "e381b8e38299"],
- ["e381ba", "e381b8e3829a"],
- ["e381bc", "e381bbe38299"],
- ["e381bd", "e381bbe3829a"],
- ["e38294", "e38186e38299"],
- ["e3829e", "e3829de38299"],
- ["e382ac", "e382abe38299"],
- ["e382ae", "e382ade38299"],
- ["e382b0", "e382afe38299"],
- ["e382b2", "e382b1e38299"],
- ["e382b4", "e382b3e38299"],
- ["e382b6", "e382b5e38299"],
- ["e382b8", "e382b7e38299"],
- ["e382ba", "e382b9e38299"],
- ["e382bc", "e382bbe38299"],
- ["e382be", "e382bde38299"],
- ["e38380", "e382bfe38299"],
- ["e38382", "e38381e38299"],
- ["e38385", "e38384e38299"],
- ["e38387", "e38386e38299"],
- ["e38389", "e38388e38299"],
- ["e38390", "e3838fe38299"],
- ["e38391", "e3838fe3829a"],
- ["e38393", "e38392e38299"],
- ["e38394", "e38392e3829a"],
- ["e38396", "e38395e38299"],
- ["e38397", "e38395e3829a"],
- ["e38399", "e38398e38299"],
- ["e3839a", "e38398e3829a"],
- ["e3839c", "e3839be38299"],
- ["e3839d", "e3839be3829a"],
- ["e383b4", "e382a6e38299"],
- ["e383b7", "e383afe38299"],
- ["e383b8", "e383b0e38299"],
- ["e383b9", "e383b1e38299"],
- ["e383ba", "e383b2e38299"],
- ["e383be", "e383bde38299"],
- ["efac9f", "d7b2d6b7"],
- ["efacaa", "d7a9d781"],
- ["efacab", "d7a9d782"],
- ["efacac", "d7a9d6bcd781"],
- ["efacad", "d7a9d6bcd782"],
- ["efacae", "d790d6b7"],
- ["efacaf", "d790d6b8"],
- ["efacb0", "d790d6bc"],
- ["efacb1", "d791d6bc"],
- ["efacb2", "d792d6bc"],
- ["efacb3", "d793d6bc"],
- ["efacb4", "d794d6bc"],
- ["efacb5", "d795d6bc"],
- ["efacb6", "d796d6bc"],
- ["efacb8", "d798d6bc"],
- ["efacb9", "d799d6bc"],
- ["efacba", "d79ad6bc"],
- ["efacbb", "d79bd6bc"],
- ["efacbc", "d79cd6bc"],
- ["efacbe", "d79ed6bc"],
- ["efad80", "d7a0d6bc"],
- ["efad81", "d7a1d6bc"],
- ["efad83", "d7a3d6bc"],
- ["efad84", "d7a4d6bc"],
- ["efad86", "d7a6d6bc"],
- ["efad87", "d7a7d6bc"],
- ["efad88", "d7a8d6bc"],
- ["efad89", "d7a9d6bc"],
- ["efad8a", "d7aad6bc"],
- ["efad8b", "d795d6b9"],
- ["efad8c", "d791d6bf"],
- ["efad8d", "d79bd6bf"],
- ["efad8e", "d7a4d6bf"],
-]
diff --git a/enc/trans/utf8_mac.trans b/enc/trans/utf8_mac.trans
deleted file mode 100644
index 7569c34ac0..0000000000
--- a/enc/trans/utf8_mac.trans
+++ /dev/null
@@ -1,242 +0,0 @@
-#include "transcode_data.h"
-
-<%
- require 'utf8_mac-tbl'
-
- transcode_tblgen("UTF-8", "UTF8-MAC",
- MAC_DECOMPOSE_TBL + [
- ["{00-7F}", :nomap],
- ["{c2-df}{80-bf}", :nomap0],
- ["e0{a0-bf}{80-bf}", :nomap0],
- ["{e1-ec}{80-bf}{80-bf}", :nomap0],
- ["ed{80-9f}{80-bf}", :nomap0],
- ["{ee-ef}{80-bf}{80-bf}", :nomap0],
- ["f0{90-bf}{80-bf}{80-bf}", :nomap0],
- ["{f1-f3}{80-bf}{80-bf}{80-bf}", :nomap0],
- ])
-
- map = {}
- map["{00-7f}"] = :func_so
- map["{c2-df}{80-bf}"] = :func_so
- map["e0{a0-bf}{80-bf}"] = :func_so
- map["{e1-ec}{80-bf}{80-bf}"] = :func_so
- map["ed{80-9f}{80-bf}"] = :func_so
- map["{ee-ef}{80-bf}{80-bf}"] = :func_so
- map["f0{90-bf}{80-bf}{80-bf}"] = :func_so
- map["{f1-f3}{80-bf}{80-bf}{80-bf}"] = :func_so
- map["f4{80-8f}{80-bf}{80-bf}"] = :func_so
- transcode_generate_node(ActionMap.parse(map), "from_UTF8_MAC")
-
- ary = MAC_DECOMPOSE_TBL.select{|k,v|v.scan(/[0-7C-F].(?:[89AB].)*/i).length == 3}
- transcode_generate_node(ActionMap.parse(ary.map{|k,v|[v,k]}), "from_utf8_mac_nfc3")
-
- ary = MAC_DECOMPOSE_TBL.select{|k,v|v.scan(/[0-7C-F].(?:[89AB].)*/i).length == 2}
- transcode_generate_node(ActionMap.parse(ary.map{|k,v|[v,k]}), "from_utf8_mac_nfc2")
-%>
-
-<%= transcode_generated_code %>
-
-#define BYTE_ADDR(index) (<%= OUTPUT_PREFIX %>byte_array + (index))
-#define WORD_ADDR(index) (<%= OUTPUT_PREFIX %>word_array + INFO2WORDINDEX(index))
-#define BL_BASE BYTE_ADDR(BYTE_LOOKUP_BASE(WORD_ADDR(next_info)))
-#define BL_INFO WORD_ADDR(BYTE_LOOKUP_INFO(WORD_ADDR(next_info)))
-#define BL_MIN_BYTE (BL_BASE[0])
-#define BL_MAX_BYTE (BL_BASE[1])
-#define BL_OFFSET(byte) (BL_BASE[2+(byte)-BL_MIN_BYTE])
-#define BL_ACTION(byte) (BL_INFO[BL_OFFSET((byte))])
-
-#define STATUS_BUF_SIZE 16
-struct from_utf8_mac_status {
- unsigned char buf[STATUS_BUF_SIZE];
- int beg;
- int end;
- int len;
-};
-#define buf_length(sp) (sp->len)
-
-int
-buf_bytesize(struct from_utf8_mac_status *sp)
-{
- int size = sp->end - sp->beg + STATUS_BUF_SIZE;
- size %= STATUS_BUF_SIZE;
- return size;
-}
-
-void
-buf_push(struct from_utf8_mac_status *sp, const unsigned char *p, ssize_t l)
-{
- const unsigned char *pend = p + l;
- while (p < pend) {
- sp->buf[sp->end++] = *p++;
- sp->end %= STATUS_BUF_SIZE;
- }
- sp->len++;
-}
-
-unsigned char
-buf_shift(struct from_utf8_mac_status *sp)
-{
- unsigned char c = sp->buf[sp->beg++];
- sp->beg %= STATUS_BUF_SIZE;
- if ((c & 0xC0) != 0x80) sp->len--;
- return c;
-}
-
-void
-buf_shift_char(struct from_utf8_mac_status *sp)
-{
- while (sp->beg != sp->end) {
- buf_shift(sp);
- if ((sp->buf[sp->beg] & 0xC0) != 0x80) break;
- }
-}
-
-void
-buf_clear(struct from_utf8_mac_status *sp)
-{
- sp->beg = sp->end = sp->len = 0;
-}
-
-unsigned char
-buf_at(struct from_utf8_mac_status *sp, int pos)
-{
- pos += sp->beg;
- pos %= STATUS_BUF_SIZE;
- return sp->buf[pos];
-}
-
-int
-buf_output_char(struct from_utf8_mac_status *sp, unsigned char *o)
-{
- int n = 0;
- while (sp->beg != sp->end) {
- o[n++] = buf_shift(sp);
- if ((sp->buf[sp->beg] & 0xC0) != 0x80) break;
- }
- return n;
-}
-
-int
-buf_output_all(struct from_utf8_mac_status *sp, unsigned char *o)
-{
- int n = 0;
- while (sp->beg != sp->end) {
- o[n++] = buf_shift(sp);
- }
- return n;
-}
-
-VALUE
-get_info(VALUE next_info, struct from_utf8_mac_status *sp) {
- int pos = 0;
- while (pos < buf_bytesize(sp)) {
- unsigned char next_byte = buf_at(sp, pos++);
- if (next_byte < BL_MIN_BYTE || BL_MAX_BYTE < next_byte)
- next_info = INVALID;
- else {
- next_info = (VALUE)BL_ACTION(next_byte);
- }
- if ((next_info & 3) == 0) continue;
- break;
- }
- return next_info;
-}
-
-int
-buf_apply(int mode, struct from_utf8_mac_status *sp, unsigned char *o)
-{
- int n = 0;
- VALUE next_info = mode == 3 ? from_utf8_mac_nfc3 : from_utf8_mac_nfc2;
- next_info = get_info(next_info, sp);
- switch (next_info & 0x1F) {
- case THREEbt:
- o[n++] = getBT1(next_info);
- case TWObt:
- o[n++] = getBT2(next_info);
- o[n++] = getBT3(next_info);
- if (mode == 3) {
- buf_clear(sp);
- }
- else {
- buf_shift_char(sp);
- buf_shift_char(sp);
- }
- break;
- default:
- return 0;
- }
- return n;
-}
-
-static int
-from_utf8_mac_init(void *statep)
-{
- struct from_utf8_mac_status *sp = statep;
- buf_clear(sp);
- return 0;
-}
-
-static ssize_t
-from_utf8_mac_finish(void *statep,
- unsigned char *o, size_t osize)
-{
- struct from_utf8_mac_status *sp = statep;
- int n;
- if (buf_length(sp) == 0) return 0;
- n = buf_apply(2, sp, o) + buf_output_all(sp, o);
- return n;
-}
-
-static ssize_t
-fun_so_from_utf8_mac(void *statep,
- const unsigned char *s, size_t l,
- unsigned char *o, size_t osize)
-{
- struct from_utf8_mac_status *sp = statep;
- int n = 0;
-
- switch (l) {
- case 1:
- n = from_utf8_mac_finish(sp, o, osize);
- break;
- case 4:
- n = from_utf8_mac_finish(sp, o, osize);
- o[n++] = *s++;
- o[n++] = *s++;
- o[n++] = *s++;
- o[n++] = *s++;
- return n;
- }
-
- buf_push(sp, s, l);
- if (buf_length(sp) < 3) return n;
-
- n = buf_apply(3, sp, o);
- if (n > 0) return n;
-
- n = buf_apply(2, sp, o);
- if (n > 0) return n;
-
- return buf_output_char(sp, o);
-}
-
-static const rb_transcoder
-rb_from_UTF8_MAC = {
- "UTF8-MAC", "UTF-8", from_UTF8_MAC,
- TRANSCODE_TABLE_INFO,
- 1, /* input_unit_length */
- 4, /* max_input */
- 10, /* max_output */
- asciicompat_encoder, /* asciicompat_type */
- sizeof(struct from_utf8_mac_status), from_utf8_mac_init, from_utf8_mac_init,
- NULL, NULL, NULL, fun_so_from_utf8_mac,
- from_utf8_mac_finish
-};
-
-void
-Init_utf8_mac(void)
-{
-<%= transcode_register_code %>
- rb_register_transcoder(&rb_from_UTF8_MAC);
-}
-
diff --git a/enc/trans/utf_16_32.trans b/enc/trans/utf_16_32.trans
deleted file mode 100644
index 1bf6ed0975..0000000000
--- a/enc/trans/utf_16_32.trans
+++ /dev/null
@@ -1,369 +0,0 @@
-#include "transcode_data.h"
-
-<%
- map = {}
- map["{00-ff}{00-d7,e0-ff}"] = :func_so
- map["{00-ff}{d8-db}{00-ff}{dc-df}"] = :func_so
- transcode_generate_node(ActionMap.parse(map), "from_UTF_16LE")
-
- map = {}
- map["{00-ff}{00-d7,e0-ff}0000"] = :func_so
- map["{00-ff}{00-ff}{01-10}00"] = :func_so
- transcode_generate_node(ActionMap.parse(map), "from_UTF_32LE")
-
- map = {}
- map["{00-d7,e0-ff}{00-ff}"] = :func_so
- map["{d8-db}{00-ff}{dc-df}{00-ff}"] = :func_so
- transcode_generate_node(ActionMap.parse(map), "from_UTF_16BE")
-
- map = {}
- map["0000{00-d7,e0-ff}{00-ff}"] = :func_so
- map["00{01-10}{00-ff}{00-ff}"] = :func_so
- transcode_generate_node(ActionMap.parse(map), "from_UTF_32BE")
-
- map = {}
- map["{00-7f}"] = :func_so
- map["{c2-df}{80-bf}"] = :func_so
- map["e0{a0-bf}{80-bf}"] = :func_so
- map["{e1-ec}{80-bf}{80-bf}"] = :func_so
- map["ed{80-9f}{80-bf}"] = :func_so
- map["{ee-ef}{80-bf}{80-bf}"] = :func_so
- map["f0{90-bf}{80-bf}{80-bf}"] = :func_so
- map["{f1-f3}{80-bf}{80-bf}{80-bf}"] = :func_so
- map["f4{80-8f}{80-bf}{80-bf}"] = :func_so
- am = ActionMap.parse(map)
- transcode_generate_node(am, "from_UTF_8")
-%>
-
-<%= transcode_generated_code %>
-
-static ssize_t
-fun_so_from_utf_16be(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
-{
- if (!s[0] && s[1]<0x80) {
- o[0] = s[1];
- return 1;
- }
- else if (s[0]<0x08) {
- o[0] = 0xC0 | (s[0]<<2) | (s[1]>>6);
- o[1] = 0x80 | (s[1]&0x3F);
- return 2;
- }
- else if ((s[0]&0xF8)!=0xD8) {
- o[0] = 0xE0 | (s[0]>>4);
- o[1] = 0x80 | ((s[0]&0x0F)<<2) | (s[1]>>6);
- o[2] = 0x80 | (s[1]&0x3F);
- return 3;
- }
- else {
- unsigned int u = (((s[0]&0x03)<<2)|(s[1]>>6)) + 1;
- o[0] = 0xF0 | (u>>2);
- o[1] = 0x80 | ((u&0x03)<<4) | ((s[1]>>2)&0x0F);
- o[2] = 0x80 | ((s[1]&0x03)<<4) | ((s[2]&0x03)<<2) | (s[3]>>6);
- o[3] = 0x80 | (s[3]&0x3F);
- return 4;
- }
-}
-
-static ssize_t
-fun_so_to_utf_16be(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
-{
- if (!(s[0]&0x80)) {
- o[0] = 0x00;
- o[1] = s[0];
- return 2;
- }
- else if ((s[0]&0xE0)==0xC0) {
- o[0] = (s[0]>>2)&0x07;
- o[1] = ((s[0]&0x03)<<6) | (s[1]&0x3F);
- return 2;
- }
- else if ((s[0]&0xF0)==0xE0) {
- o[0] = (s[0]<<4) | ((s[1]>>2)^0x20);
- o[1] = (s[1]<<6) | (s[2]^0x80);
- return 2;
- }
- else {
- int w = (((s[0]&0x07)<<2) | ((s[1]>>4)&0x03)) - 1;
- o[0] = 0xD8 | (w>>2);
- o[1] = (w<<6) | ((s[1]&0x0F)<<2) | ((s[2]>>4)-8);
- o[2] = 0xDC | ((s[2]>>2)&0x03);
- o[3] = (s[2]<<6) | (s[3]&~0x80);
- return 4;
- }
-}
-
-static ssize_t
-fun_so_from_utf_16le(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
-{
- if (!s[1] && s[0]<0x80) {
- o[0] = s[0];
- return 1;
- }
- else if (s[1]<0x08) {
- o[0] = 0xC0 | (s[1]<<2) | (s[0]>>6);
- o[1] = 0x80 | (s[0]&0x3F);
- return 2;
- }
- else if ((s[1]&0xF8)!=0xD8) {
- o[0] = 0xE0 | (s[1]>>4);
- o[1] = 0x80 | ((s[1]&0x0F)<<2) | (s[0]>>6);
- o[2] = 0x80 | (s[0]&0x3F);
- return 3;
- }
- else {
- unsigned int u = (((s[1]&0x03)<<2)|(s[0]>>6)) + 1;
- o[0] = 0xF0 | u>>2;
- o[1] = 0x80 | ((u&0x03)<<4) | ((s[0]>>2)&0x0F);
- o[2] = 0x80 | ((s[0]&0x03)<<4) | ((s[3]&0x03)<<2) | (s[2]>>6);
- o[3] = 0x80 | (s[2]&0x3F);
- return 4;
- }
-}
-
-static ssize_t
-fun_so_to_utf_16le(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
-{
- if (!(s[0]&0x80)) {
- o[1] = 0x00;
- o[0] = s[0];
- return 2;
- }
- else if ((s[0]&0xE0)==0xC0) {
- o[1] = (s[0]>>2)&0x07;
- o[0] = ((s[0]&0x03)<<6) | (s[1]&0x3F);
- return 2;
- }
- else if ((s[0]&0xF0)==0xE0) {
- o[1] = (s[0]<<4) | ((s[1]>>2)^0x20);
- o[0] = (s[1]<<6) | (s[2]^0x80);
- return 2;
- }
- else {
- int w = (((s[0]&0x07)<<2) | ((s[1]>>4)&0x03)) - 1;
- o[1] = 0xD8 | (w>>2);
- o[0] = (w<<6) | ((s[1]&0x0F)<<2) | ((s[2]>>4)-8);
- o[3] = 0xDC | ((s[2]>>2)&0x03);
- o[2] = (s[2]<<6) | (s[3]&~0x80);
- return 4;
- }
-}
-
-static ssize_t
-fun_so_from_utf_32be(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
-{
- if (!s[1]) {
- if (s[2]==0 && s[3]<0x80) {
- o[0] = s[3];
- return 1;
- }
- else if (s[2]<0x08) {
- o[0] = 0xC0 | (s[2]<<2) | (s[3]>>6);
- o[1] = 0x80 | (s[3]&0x3F);
- return 2;
- }
- else {
- o[0] = 0xE0 | (s[2]>>4);
- o[1] = 0x80 | ((s[2]&0x0F)<<2) | (s[3]>>6);
- o[2] = 0x80 | (s[3]&0x3F);
- return 3;
- }
- }
- else {
- o[0] = 0xF0 | (s[1]>>2);
- o[1] = 0x80 | ((s[1]&0x03)<<4) | (s[2]>>4);
- o[2] = 0x80 | ((s[2]&0x0F)<<2) | (s[3]>>6);
- o[3] = 0x80 | (s[3]&0x3F);
- return 4;
- }
-}
-
-static ssize_t
-fun_so_to_utf_32be(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
-{
- o[0] = 0;
- if (!(s[0]&0x80)) {
- o[1] = o[2] = 0x00;
- o[3] = s[0];
- }
- else if ((s[0]&0xE0)==0xC0) {
- o[1] = 0x00;
- o[2] = (s[0]>>2)&0x07;
- o[3] = ((s[0]&0x03)<<6) | (s[1]&0x3F);
- }
- else if ((s[0]&0xF0)==0xE0) {
- o[1] = 0x00;
- o[2] = (s[0]<<4) | ((s[1]>>2)^0x20);
- o[3] = (s[1]<<6) | (s[2]^0x80);
- }
- else {
- o[1] = ((s[0]&0x07)<<2) | ((s[1]>>4)&0x03);
- o[2] = ((s[1]&0x0F)<<4) | ((s[2]>>2)&0x0F);
- o[3] = ((s[2]&0x03)<<6) | (s[3]&0x3F);
- }
- return 4;
-}
-
-static ssize_t
-fun_so_from_utf_32le(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
-{
- if (!s[2]) {
- if (s[1]==0 && s[0]<0x80) {
- o[0] = s[0];
- return 1;
- }
- else if (s[1]<0x08) {
- o[0] = 0xC0 | (s[1]<<2) | (s[0]>>6);
- o[1] = 0x80 | (s[0]&0x3F);
- return 2;
- }
- else {
- o[0] = 0xE0 | (s[1]>>4);
- o[1] = 0x80 | ((s[1]&0x0F)<<2) | (s[0]>>6);
- o[2] = 0x80 | (s[0]&0x3F);
- return 3;
- }
- }
- else {
- o[0] = 0xF0 | (s[2]>>2);
- o[1] = 0x80 | ((s[2]&0x03)<<4) | (s[1]>>4);
- o[2] = 0x80 | ((s[1]&0x0F)<<2) | (s[0]>>6);
- o[3] = 0x80 | (s[0]&0x3F);
- return 4;
- }
-}
-
-static ssize_t
-fun_so_to_utf_32le(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
-{
- o[3] = 0;
- if (!(s[0]&0x80)) {
- o[2] = o[1] = 0x00;
- o[0] = s[0];
- }
- else if ((s[0]&0xE0)==0xC0) {
- o[2] = 0x00;
- o[1] = (s[0]>>2)&0x07;
- o[0] = ((s[0]&0x03)<<6) | (s[1]&0x3F);
- }
- else if ((s[0]&0xF0)==0xE0) {
- o[2] = 0x00;
- o[1] = (s[0]<<4) | ((s[1]>>2)^0x20);
- o[0] = (s[1]<<6) | (s[2]^0x80);
- }
- else {
- o[2] = ((s[0]&0x07)<<2) | ((s[1]>>4)&0x03);
- o[1] = ((s[1]&0x0F)<<4) | ((s[2]>>2)&0x0F);
- o[0] = ((s[2]&0x03)<<6) | (s[3]&0x3F);
- }
- return 4;
-}
-
-static const rb_transcoder
-rb_from_UTF_16BE = {
- "UTF-16BE", "UTF-8", from_UTF_16BE,
- TRANSCODE_TABLE_INFO,
- 2, /* input_unit_length */
- 4, /* max_input */
- 4, /* max_output */
- asciicompat_decoder, /* asciicompat_type */
- 0, NULL, NULL, /* state_size, state_init, state_fini */
- NULL, NULL, NULL, fun_so_from_utf_16be
-};
-
-static const rb_transcoder
-rb_to_UTF_16BE = {
- "UTF-8", "UTF-16BE", from_UTF_8,
- TRANSCODE_TABLE_INFO,
- 1, /* input_unit_length */
- 4, /* max_input */
- 4, /* max_output */
- asciicompat_encoder, /* asciicompat_type */
- 0, NULL, NULL, /* state_size, state_init, state_fini */
- NULL, NULL, NULL, fun_so_to_utf_16be
-};
-
-static const rb_transcoder
-rb_from_UTF_16LE = {
- "UTF-16LE", "UTF-8", from_UTF_16LE,
- TRANSCODE_TABLE_INFO,
- 2, /* input_unit_length */
- 4, /* max_input */
- 4, /* max_output */
- asciicompat_decoder, /* asciicompat_type */
- 0, NULL, NULL, /* state_size, state_init, state_fini */
- NULL, NULL, NULL, fun_so_from_utf_16le
-};
-
-static const rb_transcoder
-rb_to_UTF_16LE = {
- "UTF-8", "UTF-16LE", from_UTF_8,
- TRANSCODE_TABLE_INFO,
- 1, /* input_unit_length */
- 4, /* max_input */
- 4, /* max_output */
- asciicompat_encoder, /* asciicompat_type */
- 0, NULL, NULL, /* state_size, state_init, state_fini */
- NULL, NULL, NULL, fun_so_to_utf_16le
-};
-
-static const rb_transcoder
-rb_from_UTF_32BE = {
- "UTF-32BE", "UTF-8", from_UTF_32BE,
- TRANSCODE_TABLE_INFO,
- 4, /* input_unit_length */
- 4, /* max_input */
- 4, /* max_output */
- asciicompat_decoder, /* asciicompat_type */
- 0, NULL, NULL, /* state_size, state_init, state_fini */
- NULL, NULL, NULL, fun_so_from_utf_32be
-};
-
-static const rb_transcoder
-rb_to_UTF_32BE = {
- "UTF-8", "UTF-32BE", from_UTF_8,
- TRANSCODE_TABLE_INFO,
- 1, /* input_unit_length */
- 4, /* max_input */
- 4, /* max_output */
- asciicompat_encoder, /* asciicompat_type */
- 0, NULL, NULL, /* state_size, state_init, state_fini */
- NULL, NULL, NULL, fun_so_to_utf_32be
-};
-
-static const rb_transcoder
-rb_from_UTF_32LE = {
- "UTF-32LE", "UTF-8", from_UTF_32LE,
- TRANSCODE_TABLE_INFO,
- 4, /* input_unit_length */
- 4, /* max_input */
- 4, /* max_output */
- asciicompat_decoder, /* asciicompat_type */
- 0, NULL, NULL, /* state_size, state_init, state_fini */
- NULL, NULL, NULL, fun_so_from_utf_32le
-};
-
-static const rb_transcoder
-rb_to_UTF_32LE = {
- "UTF-8", "UTF-32LE", from_UTF_8,
- TRANSCODE_TABLE_INFO,
- 1, /* input_unit_length */
- 4, /* max_input */
- 4, /* max_output */
- asciicompat_encoder, /* asciicompat_type */
- 0, NULL, NULL, /* state_size, state_init, state_fini */
- NULL, NULL, NULL, fun_so_to_utf_32le
-};
-
-void
-Init_utf_16_32(void)
-{
- rb_register_transcoder(&rb_from_UTF_16BE);
- rb_register_transcoder(&rb_to_UTF_16BE);
- rb_register_transcoder(&rb_from_UTF_16LE);
- rb_register_transcoder(&rb_to_UTF_16LE);
- rb_register_transcoder(&rb_from_UTF_32BE);
- rb_register_transcoder(&rb_to_UTF_32BE);
- rb_register_transcoder(&rb_from_UTF_32LE);
- rb_register_transcoder(&rb_to_UTF_32LE);
-}
diff --git a/enc/trans/windows-1250-tbl.rb b/enc/trans/windows-1250-tbl.rb
deleted file mode 100644
index 52063e17b1..0000000000
--- a/enc/trans/windows-1250-tbl.rb
+++ /dev/null
@@ -1,125 +0,0 @@
-WINDOWS_1250_TO_UCS_TBL = [
- ["A0",0xA0],
- ["A4",0xA4],
- ["A6",0xA6],
- ["A7",0xA7],
- ["A8",0xA8],
- ["A9",0xA9],
- ["AB",0xAB],
- ["AC",0xAC],
- ["AD",0xAD],
- ["AE",0xAE],
- ["B0",0xB0],
- ["B1",0xB1],
- ["B4",0xB4],
- ["B5",0xB5],
- ["B6",0xB6],
- ["B7",0xB7],
- ["B8",0xB8],
- ["BB",0xBB],
- ["C1",0xC1],
- ["C2",0xC2],
- ["C4",0xC4],
- ["C7",0xC7],
- ["C9",0xC9],
- ["CB",0xCB],
- ["CD",0xCD],
- ["CE",0xCE],
- ["D3",0xD3],
- ["D4",0xD4],
- ["D6",0xD6],
- ["D7",0xD7],
- ["DA",0xDA],
- ["DC",0xDC],
- ["DD",0xDD],
- ["DF",0xDF],
- ["E1",0xE1],
- ["E2",0xE2],
- ["E4",0xE4],
- ["E7",0xE7],
- ["E9",0xE9],
- ["EB",0xEB],
- ["ED",0xED],
- ["EE",0xEE],
- ["F3",0xF3],
- ["F4",0xF4],
- ["F6",0xF6],
- ["F7",0xF7],
- ["FA",0xFA],
- ["FC",0xFC],
- ["FD",0xFD],
- ["C3",0x102],
- ["E3",0x103],
- ["A5",0x104],
- ["B9",0x105],
- ["C6",0x106],
- ["E6",0x107],
- ["C8",0x10C],
- ["E8",0x10D],
- ["CF",0x10E],
- ["EF",0x10F],
- ["D0",0x110],
- ["F0",0x111],
- ["CA",0x118],
- ["EA",0x119],
- ["CC",0x11A],
- ["EC",0x11B],
- ["C5",0x139],
- ["E5",0x13A],
- ["BC",0x13D],
- ["BE",0x13E],
- ["A3",0x141],
- ["B3",0x142],
- ["D1",0x143],
- ["F1",0x144],
- ["D2",0x147],
- ["F2",0x148],
- ["D5",0x150],
- ["F5",0x151],
- ["C0",0x154],
- ["E0",0x155],
- ["D8",0x158],
- ["F8",0x159],
- ["8C",0x15A],
- ["9C",0x15B],
- ["AA",0x15E],
- ["BA",0x15F],
- ["8A",0x160],
- ["9A",0x161],
- ["DE",0x162],
- ["FE",0x163],
- ["8D",0x164],
- ["9D",0x165],
- ["D9",0x16E],
- ["F9",0x16F],
- ["DB",0x170],
- ["FB",0x171],
- ["8F",0x179],
- ["9F",0x17A],
- ["AF",0x17B],
- ["BF",0x17C],
- ["8E",0x17D],
- ["9E",0x17E],
- ["A1",0x2C7],
- ["A2",0x2D8],
- ["FF",0x2D9],
- ["B2",0x2DB],
- ["BD",0x2DD],
- ["96",0x2013],
- ["97",0x2014],
- ["91",0x2018],
- ["92",0x2019],
- ["82",0x201A],
- ["93",0x201C],
- ["94",0x201D],
- ["84",0x201E],
- ["86",0x2020],
- ["87",0x2021],
- ["95",0x2022],
- ["85",0x2026],
- ["89",0x2030],
- ["8B",0x2039],
- ["9B",0x203A],
- ["80",0x20AC],
- ["99",0x2122],
-] \ No newline at end of file
diff --git a/enc/trans/windows-1251-tbl.rb b/enc/trans/windows-1251-tbl.rb
deleted file mode 100644
index 870c718b72..0000000000
--- a/enc/trans/windows-1251-tbl.rb
+++ /dev/null
@@ -1,129 +0,0 @@
-WINDOWS_1251_TO_UCS_TBL = [
- ["A0",0xA0],
- ["A4",0xA4],
- ["A6",0xA6],
- ["A7",0xA7],
- ["A9",0xA9],
- ["AB",0xAB],
- ["AC",0xAC],
- ["AD",0xAD],
- ["AE",0xAE],
- ["B0",0xB0],
- ["B1",0xB1],
- ["B5",0xB5],
- ["B6",0xB6],
- ["B7",0xB7],
- ["BB",0xBB],
- ["A8",0x401],
- ["80",0x402],
- ["81",0x403],
- ["AA",0x404],
- ["BD",0x405],
- ["B2",0x406],
- ["AF",0x407],
- ["A3",0x408],
- ["8A",0x409],
- ["8C",0x40A],
- ["8E",0x40B],
- ["8D",0x40C],
- ["A1",0x40E],
- ["8F",0x40F],
- ["C0",0x410],
- ["C1",0x411],
- ["C2",0x412],
- ["C3",0x413],
- ["C4",0x414],
- ["C5",0x415],
- ["C6",0x416],
- ["C7",0x417],
- ["C8",0x418],
- ["C9",0x419],
- ["CA",0x41A],
- ["CB",0x41B],
- ["CC",0x41C],
- ["CD",0x41D],
- ["CE",0x41E],
- ["CF",0x41F],
- ["D0",0x420],
- ["D1",0x421],
- ["D2",0x422],
- ["D3",0x423],
- ["D4",0x424],
- ["D5",0x425],
- ["D6",0x426],
- ["D7",0x427],
- ["D8",0x428],
- ["D9",0x429],
- ["DA",0x42A],
- ["DB",0x42B],
- ["DC",0x42C],
- ["DD",0x42D],
- ["DE",0x42E],
- ["DF",0x42F],
- ["E0",0x430],
- ["E1",0x431],
- ["E2",0x432],
- ["E3",0x433],
- ["E4",0x434],
- ["E5",0x435],
- ["E6",0x436],
- ["E7",0x437],
- ["E8",0x438],
- ["E9",0x439],
- ["EA",0x43A],
- ["EB",0x43B],
- ["EC",0x43C],
- ["ED",0x43D],
- ["EE",0x43E],
- ["EF",0x43F],
- ["F0",0x440],
- ["F1",0x441],
- ["F2",0x442],
- ["F3",0x443],
- ["F4",0x444],
- ["F5",0x445],
- ["F6",0x446],
- ["F7",0x447],
- ["F8",0x448],
- ["F9",0x449],
- ["FA",0x44A],
- ["FB",0x44B],
- ["FC",0x44C],
- ["FD",0x44D],
- ["FE",0x44E],
- ["FF",0x44F],
- ["B8",0x451],
- ["90",0x452],
- ["83",0x453],
- ["BA",0x454],
- ["BE",0x455],
- ["B3",0x456],
- ["BF",0x457],
- ["BC",0x458],
- ["9A",0x459],
- ["9C",0x45A],
- ["9E",0x45B],
- ["9D",0x45C],
- ["A2",0x45E],
- ["9F",0x45F],
- ["A5",0x490],
- ["B4",0x491],
- ["96",0x2013],
- ["97",0x2014],
- ["91",0x2018],
- ["92",0x2019],
- ["82",0x201A],
- ["93",0x201C],
- ["94",0x201D],
- ["84",0x201E],
- ["86",0x2020],
- ["87",0x2021],
- ["95",0x2022],
- ["85",0x2026],
- ["89",0x2030],
- ["8B",0x2039],
- ["9B",0x203A],
- ["88",0x20AC],
- ["B9",0x2116],
- ["99",0x2122],
-] \ No newline at end of file
diff --git a/enc/trans/windows-1252-tbl.rb b/enc/trans/windows-1252-tbl.rb
deleted file mode 100644
index cefc72dff2..0000000000
--- a/enc/trans/windows-1252-tbl.rb
+++ /dev/null
@@ -1,125 +0,0 @@
-WINDOWS_1252_TO_UCS_TBL = [
- ["A0",0xA0],
- ["A1",0xA1],
- ["A2",0xA2],
- ["A3",0xA3],
- ["A4",0xA4],
- ["A5",0xA5],
- ["A6",0xA6],
- ["A7",0xA7],
- ["A8",0xA8],
- ["A9",0xA9],
- ["AA",0xAA],
- ["AB",0xAB],
- ["AC",0xAC],
- ["AD",0xAD],
- ["AE",0xAE],
- ["AF",0xAF],
- ["B0",0xB0],
- ["B1",0xB1],
- ["B2",0xB2],
- ["B3",0xB3],
- ["B4",0xB4],
- ["B5",0xB5],
- ["B6",0xB6],
- ["B7",0xB7],
- ["B8",0xB8],
- ["B9",0xB9],
- ["BA",0xBA],
- ["BB",0xBB],
- ["BC",0xBC],
- ["BD",0xBD],
- ["BE",0xBE],
- ["BF",0xBF],
- ["C0",0xC0],
- ["C1",0xC1],
- ["C2",0xC2],
- ["C3",0xC3],
- ["C4",0xC4],
- ["C5",0xC5],
- ["C6",0xC6],
- ["C7",0xC7],
- ["C8",0xC8],
- ["C9",0xC9],
- ["CA",0xCA],
- ["CB",0xCB],
- ["CC",0xCC],
- ["CD",0xCD],
- ["CE",0xCE],
- ["CF",0xCF],
- ["D0",0xD0],
- ["D1",0xD1],
- ["D2",0xD2],
- ["D3",0xD3],
- ["D4",0xD4],
- ["D5",0xD5],
- ["D6",0xD6],
- ["D7",0xD7],
- ["D8",0xD8],
- ["D9",0xD9],
- ["DA",0xDA],
- ["DB",0xDB],
- ["DC",0xDC],
- ["DD",0xDD],
- ["DE",0xDE],
- ["DF",0xDF],
- ["E0",0xE0],
- ["E1",0xE1],
- ["E2",0xE2],
- ["E3",0xE3],
- ["E4",0xE4],
- ["E5",0xE5],
- ["E6",0xE6],
- ["E7",0xE7],
- ["E8",0xE8],
- ["E9",0xE9],
- ["EA",0xEA],
- ["EB",0xEB],
- ["EC",0xEC],
- ["ED",0xED],
- ["EE",0xEE],
- ["EF",0xEF],
- ["F0",0xF0],
- ["F1",0xF1],
- ["F2",0xF2],
- ["F3",0xF3],
- ["F4",0xF4],
- ["F5",0xF5],
- ["F6",0xF6],
- ["F7",0xF7],
- ["F8",0xF8],
- ["F9",0xF9],
- ["FA",0xFA],
- ["FB",0xFB],
- ["FC",0xFC],
- ["FD",0xFD],
- ["FE",0xFE],
- ["FF",0xFF],
- ["8C",0x152],
- ["9C",0x153],
- ["8A",0x160],
- ["9A",0x161],
- ["9F",0x178],
- ["8E",0x17D],
- ["9E",0x17E],
- ["83",0x192],
- ["88",0x2C6],
- ["98",0x2DC],
- ["96",0x2013],
- ["97",0x2014],
- ["91",0x2018],
- ["92",0x2019],
- ["82",0x201A],
- ["93",0x201C],
- ["94",0x201D],
- ["84",0x201E],
- ["86",0x2020],
- ["87",0x2021],
- ["95",0x2022],
- ["85",0x2026],
- ["89",0x2030],
- ["8B",0x2039],
- ["9B",0x203A],
- ["80",0x20AC],
- ["99",0x2122],
-] \ No newline at end of file
diff --git a/enc/trans/windows-1253-tbl.rb b/enc/trans/windows-1253-tbl.rb
deleted file mode 100644
index 132edb60ba..0000000000
--- a/enc/trans/windows-1253-tbl.rb
+++ /dev/null
@@ -1,113 +0,0 @@
-WINDOWS_1253_TO_UCS_TBL = [
- ["A0",0xA0],
- ["A3",0xA3],
- ["A4",0xA4],
- ["A5",0xA5],
- ["A6",0xA6],
- ["A7",0xA7],
- ["A8",0xA8],
- ["A9",0xA9],
- ["AB",0xAB],
- ["AC",0xAC],
- ["AD",0xAD],
- ["AE",0xAE],
- ["B0",0xB0],
- ["B1",0xB1],
- ["B2",0xB2],
- ["B3",0xB3],
- ["B5",0xB5],
- ["B6",0xB6],
- ["B7",0xB7],
- ["BB",0xBB],
- ["BD",0xBD],
- ["83",0x192],
- ["B4",0x384],
- ["A1",0x385],
- ["A2",0x386],
- ["B8",0x388],
- ["B9",0x389],
- ["BA",0x38A],
- ["BC",0x38C],
- ["BE",0x38E],
- ["BF",0x38F],
- ["C0",0x390],
- ["C1",0x391],
- ["C2",0x392],
- ["C3",0x393],
- ["C4",0x394],
- ["C5",0x395],
- ["C6",0x396],
- ["C7",0x397],
- ["C8",0x398],
- ["C9",0x399],
- ["CA",0x39A],
- ["CB",0x39B],
- ["CC",0x39C],
- ["CD",0x39D],
- ["CE",0x39E],
- ["CF",0x39F],
- ["D0",0x3A0],
- ["D1",0x3A1],
- ["D3",0x3A3],
- ["D4",0x3A4],
- ["D5",0x3A5],
- ["D6",0x3A6],
- ["D7",0x3A7],
- ["D8",0x3A8],
- ["D9",0x3A9],
- ["DA",0x3AA],
- ["DB",0x3AB],
- ["DC",0x3AC],
- ["DD",0x3AD],
- ["DE",0x3AE],
- ["DF",0x3AF],
- ["E0",0x3B0],
- ["E1",0x3B1],
- ["E2",0x3B2],
- ["E3",0x3B3],
- ["E4",0x3B4],
- ["E5",0x3B5],
- ["E6",0x3B6],
- ["E7",0x3B7],
- ["E8",0x3B8],
- ["E9",0x3B9],
- ["EA",0x3BA],
- ["EB",0x3BB],
- ["EC",0x3BC],
- ["ED",0x3BD],
- ["EE",0x3BE],
- ["EF",0x3BF],
- ["F0",0x3C0],
- ["F1",0x3C1],
- ["F2",0x3C2],
- ["F3",0x3C3],
- ["F4",0x3C4],
- ["F5",0x3C5],
- ["F6",0x3C6],
- ["F7",0x3C7],
- ["F8",0x3C8],
- ["F9",0x3C9],
- ["FA",0x3CA],
- ["FB",0x3CB],
- ["FC",0x3CC],
- ["FD",0x3CD],
- ["FE",0x3CE],
- ["96",0x2013],
- ["97",0x2014],
- ["AF",0x2015],
- ["91",0x2018],
- ["92",0x2019],
- ["82",0x201A],
- ["93",0x201C],
- ["94",0x201D],
- ["84",0x201E],
- ["86",0x2020],
- ["87",0x2021],
- ["95",0x2022],
- ["85",0x2026],
- ["89",0x2030],
- ["8B",0x2039],
- ["9B",0x203A],
- ["80",0x20AC],
- ["99",0x2122],
-] \ No newline at end of file
diff --git a/enc/trans/windows-1254-tbl.rb b/enc/trans/windows-1254-tbl.rb
deleted file mode 100644
index 81a747afaa..0000000000
--- a/enc/trans/windows-1254-tbl.rb
+++ /dev/null
@@ -1,123 +0,0 @@
-WINDOWS_1254_TO_UCS_TBL = [
- ["A0",0xA0],
- ["A1",0xA1],
- ["A2",0xA2],
- ["A3",0xA3],
- ["A4",0xA4],
- ["A5",0xA5],
- ["A6",0xA6],
- ["A7",0xA7],
- ["A8",0xA8],
- ["A9",0xA9],
- ["AA",0xAA],
- ["AB",0xAB],
- ["AC",0xAC],
- ["AD",0xAD],
- ["AE",0xAE],
- ["AF",0xAF],
- ["B0",0xB0],
- ["B1",0xB1],
- ["B2",0xB2],
- ["B3",0xB3],
- ["B4",0xB4],
- ["B5",0xB5],
- ["B6",0xB6],
- ["B7",0xB7],
- ["B8",0xB8],
- ["B9",0xB9],
- ["BA",0xBA],
- ["BB",0xBB],
- ["BC",0xBC],
- ["BD",0xBD],
- ["BE",0xBE],
- ["BF",0xBF],
- ["C0",0xC0],
- ["C1",0xC1],
- ["C2",0xC2],
- ["C3",0xC3],
- ["C4",0xC4],
- ["C5",0xC5],
- ["C6",0xC6],
- ["C7",0xC7],
- ["C8",0xC8],
- ["C9",0xC9],
- ["CA",0xCA],
- ["CB",0xCB],
- ["CC",0xCC],
- ["CD",0xCD],
- ["CE",0xCE],
- ["CF",0xCF],
- ["D1",0xD1],
- ["D2",0xD2],
- ["D3",0xD3],
- ["D4",0xD4],
- ["D5",0xD5],
- ["D6",0xD6],
- ["D7",0xD7],
- ["D8",0xD8],
- ["D9",0xD9],
- ["DA",0xDA],
- ["DB",0xDB],
- ["DC",0xDC],
- ["DF",0xDF],
- ["E0",0xE0],
- ["E1",0xE1],
- ["E2",0xE2],
- ["E3",0xE3],
- ["E4",0xE4],
- ["E5",0xE5],
- ["E6",0xE6],
- ["E7",0xE7],
- ["E8",0xE8],
- ["E9",0xE9],
- ["EA",0xEA],
- ["EB",0xEB],
- ["EC",0xEC],
- ["ED",0xED],
- ["EE",0xEE],
- ["EF",0xEF],
- ["F1",0xF1],
- ["F2",0xF2],
- ["F3",0xF3],
- ["F4",0xF4],
- ["F5",0xF5],
- ["F6",0xF6],
- ["F7",0xF7],
- ["F8",0xF8],
- ["F9",0xF9],
- ["FA",0xFA],
- ["FB",0xFB],
- ["FC",0xFC],
- ["FF",0xFF],
- ["D0",0x11E],
- ["F0",0x11F],
- ["DD",0x130],
- ["FD",0x131],
- ["8C",0x152],
- ["9C",0x153],
- ["DE",0x15E],
- ["FE",0x15F],
- ["8A",0x160],
- ["9A",0x161],
- ["9F",0x178],
- ["83",0x192],
- ["88",0x2C6],
- ["98",0x2DC],
- ["96",0x2013],
- ["97",0x2014],
- ["91",0x2018],
- ["92",0x2019],
- ["82",0x201A],
- ["93",0x201C],
- ["94",0x201D],
- ["84",0x201E],
- ["86",0x2020],
- ["87",0x2021],
- ["95",0x2022],
- ["85",0x2026],
- ["89",0x2030],
- ["8B",0x2039],
- ["9B",0x203A],
- ["80",0x20AC],
- ["99",0x2122],
-] \ No newline at end of file
diff --git a/enc/trans/windows-1255-tbl.rb b/enc/trans/windows-1255-tbl.rb
deleted file mode 100644
index 9084a56a10..0000000000
--- a/enc/trans/windows-1255-tbl.rb
+++ /dev/null
@@ -1,141 +0,0 @@
-WINDOWS_1255_TO_UCS_TBL = [
- ["A0",0xA0],
- ["A1",0xA1],
- ["A2",0xA2],
- ["A3",0xA3],
- ["A5",0xA5],
- ["A6",0xA6],
- ["A7",0xA7],
- ["A8",0xA8],
- ["A9",0xA9],
- ["AB",0xAB],
- ["AC",0xAC],
- ["AD",0xAD],
- ["AE",0xAE],
- ["AF",0xAF],
- ["B0",0xB0],
- ["B1",0xB1],
- ["B2",0xB2],
- ["B3",0xB3],
- ["B4",0xB4],
- ["B5",0xB5],
- ["B6",0xB6],
- ["B7",0xB7],
- ["B8",0xB8],
- ["B9",0xB9],
- ["BB",0xBB],
- ["BC",0xBC],
- ["BD",0xBD],
- ["BE",0xBE],
- ["BF",0xBF],
- ["AA",0xD7],
- ["BA",0xF7],
- ["83",0x192],
- ["88",0x2C6],
- ["98",0x2DC],
- ["C0",0x5B0],
- ["C1",0x5B1],
- ["C2",0x5B2],
- ["C3",0x5B3],
- ["C4",0x5B4],
- ["C5",0x5B5],
- ["C6",0x5B6],
- ["C7",0x5B7],
- ["C8",0x5B8],
- ["C9",0x5B9],
- ["CB",0x5BB],
- ["CC",0x5BC],
- ["CD",0x5BD],
- ["CE",0x5BE],
- ["CF",0x5BF],
- ["D0",0x5C0],
- ["D1",0x5C1],
- ["D2",0x5C2],
- ["D3",0x5C3],
- ["E0",0x5D0],
- ["E1",0x5D1],
- ["E2",0x5D2],
- ["E3",0x5D3],
- ["E4",0x5D4],
- ["E5",0x5D5],
- ["E6",0x5D6],
- ["E7",0x5D7],
- ["E8",0x5D8],
- ["E9",0x5D9],
- ["EA",0x5DA],
- ["EB",0x5DB],
- ["EC",0x5DC],
- ["ED",0x5DD],
- ["EE",0x5DE],
- ["EF",0x5DF],
- ["F0",0x5E0],
- ["F1",0x5E1],
- ["F2",0x5E2],
- ["F3",0x5E3],
- ["F4",0x5E4],
- ["F5",0x5E5],
- ["F6",0x5E6],
- ["F7",0x5E7],
- ["F8",0x5E8],
- ["F9",0x5E9],
- ["FA",0x5EA],
- ["D4",0x5F0],
- ["D5",0x5F1],
- ["D6",0x5F2],
- ["D7",0x5F3],
- ["D8",0x5F4],
- ["FD",0x200E],
- ["FE",0x200F],
- ["96",0x2013],
- ["97",0x2014],
- ["91",0x2018],
- ["92",0x2019],
- ["82",0x201A],
- ["93",0x201C],
- ["94",0x201D],
- ["84",0x201E],
- ["86",0x2020],
- ["87",0x2021],
- ["95",0x2022],
- ["85",0x2026],
- ["89",0x2030],
- ["8B",0x2039],
- ["9B",0x203A],
- ["A4",0x20AA],
- ["80",0x20AC],
- ["99",0x2122],
- ["E9C4",0xFB1D],
- ["D6C7",0xFB1F],
- ["F9D1",0xFB2A],
- ["F9D2",0xFB2B],
- ["F9CCD1",0xFB2C],
- ["F9CCD2",0xFB2D],
- ["E0C7",0xFB2E],
- ["E0C8",0xFB2F],
- ["E0CC",0xFB30],
- ["E1CC",0xFB31],
- ["E2CC",0xFB32],
- ["E3CC",0xFB33],
- ["E4CC",0xFB34],
- ["E5CC",0xFB35],
- ["E6CC",0xFB36],
- ["E8CC",0xFB38],
- ["E9CC",0xFB39],
- ["EACC",0xFB3A],
- ["EBCC",0xFB3B],
- ["ECCC",0xFB3C],
- ["EECC",0xFB3E],
- ["F0CC",0xFB40],
- ["F1CC",0xFB41],
- ["F3CC",0xFB43],
- ["F4CC",0xFB44],
- ["F6CC",0xFB46],
- ["F7CC",0xFB47],
- ["F8CC",0xFB48],
- ["F9CC",0xFB49],
- ["FACC",0xFB4A],
- ["E5C9",0xFB4B],
- ["E1CF",0xFB4C],
- ["EBCF",0xFB4D],
- ["F4CF",0xFB4E],
-] \ No newline at end of file
diff --git a/enc/trans/windows-1256-tbl.rb b/enc/trans/windows-1256-tbl.rb
deleted file mode 100644
index 25c5874fb0..0000000000
--- a/enc/trans/windows-1256-tbl.rb
+++ /dev/null
@@ -1,130 +0,0 @@
-WINDOWS_1256_TO_UCS_TBL = [
- ["A0",0xA0],
- ["A2",0xA2],
- ["A3",0xA3],
- ["A4",0xA4],
- ["A5",0xA5],
- ["A6",0xA6],
- ["A7",0xA7],
- ["A8",0xA8],
- ["A9",0xA9],
- ["AB",0xAB],
- ["AC",0xAC],
- ["AD",0xAD],
- ["AE",0xAE],
- ["AF",0xAF],
- ["B0",0xB0],
- ["B1",0xB1],
- ["B2",0xB2],
- ["B3",0xB3],
- ["B4",0xB4],
- ["B5",0xB5],
- ["B6",0xB6],
- ["B7",0xB7],
- ["B8",0xB8],
- ["B9",0xB9],
- ["BB",0xBB],
- ["BC",0xBC],
- ["BD",0xBD],
- ["BE",0xBE],
- ["D7",0xD7],
- ["E0",0xE0],
- ["E2",0xE2],
- ["E7",0xE7],
- ["E8",0xE8],
- ["E9",0xE9],
- ["EA",0xEA],
- ["EB",0xEB],
- ["EE",0xEE],
- ["EF",0xEF],
- ["F4",0xF4],
- ["F7",0xF7],
- ["F9",0xF9],
- ["FB",0xFB],
- ["FC",0xFC],
- ["8C",0x152],
- ["9C",0x153],
- ["83",0x192],
- ["88",0x2C6],
- ["A1",0x60C],
- ["BA",0x61B],
- ["BF",0x61F],
- ["C1",0x621],
- ["C2",0x622],
- ["C3",0x623],
- ["C4",0x624],
- ["C5",0x625],
- ["C6",0x626],
- ["C7",0x627],
- ["C8",0x628],
- ["C9",0x629],
- ["CA",0x62A],
- ["CB",0x62B],
- ["CC",0x62C],
- ["CD",0x62D],
- ["CE",0x62E],
- ["CF",0x62F],
- ["D0",0x630],
- ["D1",0x631],
- ["D2",0x632],
- ["D3",0x633],
- ["D4",0x634],
- ["D5",0x635],
- ["D6",0x636],
- ["D8",0x637],
- ["D9",0x638],
- ["DA",0x639],
- ["DB",0x63A],
- ["DC",0x640],
- ["DD",0x641],
- ["DE",0x642],
- ["DF",0x643],
- ["E1",0x644],
- ["E3",0x645],
- ["E4",0x646],
- ["E5",0x647],
- ["E6",0x648],
- ["EC",0x649],
- ["ED",0x64A],
- ["F0",0x64B],
- ["F1",0x64C],
- ["F2",0x64D],
- ["F3",0x64E],
- ["F5",0x64F],
- ["F6",0x650],
- ["F8",0x651],
- ["FA",0x652],
- ["8A",0x679],
- ["81",0x67E],
- ["8D",0x686],
- ["8F",0x688],
- ["9A",0x691],
- ["8E",0x698],
- ["98",0x6A9],
- ["90",0x6AF],
- ["9F",0x6BA],
- ["AA",0x6BE],
- ["C0",0x6C1],
- ["FF",0x6D2],
- ["9D",0x200C],
- ["9E",0x200D],
- ["FD",0x200E],
- ["FE",0x200F],
- ["96",0x2013],
- ["97",0x2014],
- ["91",0x2018],
- ["92",0x2019],
- ["82",0x201A],
- ["93",0x201C],
- ["94",0x201D],
- ["84",0x201E],
- ["86",0x2020],
- ["87",0x2021],
- ["95",0x2022],
- ["85",0x2026],
- ["89",0x2030],
- ["8B",0x2039],
- ["9B",0x203A],
- ["80",0x20AC],
- ["99",0x2122],
-] \ No newline at end of file
diff --git a/enc/trans/windows-1257-tbl.rb b/enc/trans/windows-1257-tbl.rb
deleted file mode 100644
index 9e89b2b0b5..0000000000
--- a/enc/trans/windows-1257-tbl.rb
+++ /dev/null
@@ -1,118 +0,0 @@
-WINDOWS_1257_TO_UCS_TBL = [
- ["A0",0xA0],
- ["A2",0xA2],
- ["A3",0xA3],
- ["A4",0xA4],
- ["A6",0xA6],
- ["A7",0xA7],
- ["8D",0xA8],
- ["A9",0xA9],
- ["AB",0xAB],
- ["AC",0xAC],
- ["AD",0xAD],
- ["AE",0xAE],
- ["9D",0xAF],
- ["B0",0xB0],
- ["B1",0xB1],
- ["B2",0xB2],
- ["B3",0xB3],
- ["B4",0xB4],
- ["B5",0xB5],
- ["B6",0xB6],
- ["B7",0xB7],
- ["8F",0xB8],
- ["B9",0xB9],
- ["BB",0xBB],
- ["BC",0xBC],
- ["BD",0xBD],
- ["BE",0xBE],
- ["C4",0xC4],
- ["C5",0xC5],
- ["AF",0xC6],
- ["C9",0xC9],
- ["D3",0xD3],
- ["D5",0xD5],
- ["D6",0xD6],
- ["D7",0xD7],
- ["A8",0xD8],
- ["DC",0xDC],
- ["DF",0xDF],
- ["E4",0xE4],
- ["E5",0xE5],
- ["BF",0xE6],
- ["E9",0xE9],
- ["F3",0xF3],
- ["F5",0xF5],
- ["F6",0xF6],
- ["F7",0xF7],
- ["B8",0xF8],
- ["FC",0xFC],
- ["C2",0x100],
- ["E2",0x101],
- ["C0",0x104],
- ["E0",0x105],
- ["C3",0x106],
- ["E3",0x107],
- ["C8",0x10C],
- ["E8",0x10D],
- ["C7",0x112],
- ["E7",0x113],
- ["CB",0x116],
- ["EB",0x117],
- ["C6",0x118],
- ["E6",0x119],
- ["CC",0x122],
- ["EC",0x123],
- ["CE",0x12A],
- ["EE",0x12B],
- ["C1",0x12E],
- ["E1",0x12F],
- ["CD",0x136],
- ["ED",0x137],
- ["CF",0x13B],
- ["EF",0x13C],
- ["D9",0x141],
- ["F9",0x142],
- ["D1",0x143],
- ["F1",0x144],
- ["D2",0x145],
- ["F2",0x146],
- ["D4",0x14C],
- ["F4",0x14D],
- ["AA",0x156],
- ["BA",0x157],
- ["DA",0x15A],
- ["FA",0x15B],
- ["D0",0x160],
- ["F0",0x161],
- ["DB",0x16A],
- ["FB",0x16B],
- ["D8",0x172],
- ["F8",0x173],
- ["CA",0x179],
- ["EA",0x17A],
- ["DD",0x17B],
- ["FD",0x17C],
- ["DE",0x17D],
- ["FE",0x17E],
- ["8E",0x2C7],
- ["FF",0x2D9],
- ["9E",0x2DB],
- ["96",0x2013],
- ["97",0x2014],
- ["91",0x2018],
- ["92",0x2019],
- ["82",0x201A],
- ["93",0x201C],
- ["94",0x201D],
- ["84",0x201E],
- ["86",0x2020],
- ["87",0x2021],
- ["95",0x2022],
- ["85",0x2026],
- ["89",0x2030],
- ["8B",0x2039],
- ["9B",0x203A],
- ["80",0x20AC],
- ["99",0x2122],
-] \ No newline at end of file
diff --git a/enc/trans/windows-874-tbl.rb b/enc/trans/windows-874-tbl.rb
deleted file mode 100644
index 0552df3d28..0000000000
--- a/enc/trans/windows-874-tbl.rb
+++ /dev/null
@@ -1,99 +0,0 @@
-WINDOWS_874_TO_UCS_TBL = [
- ["A0",0xA0],
- ["A1",0xE01],
- ["A2",0xE02],
- ["A3",0xE03],
- ["A4",0xE04],
- ["A5",0xE05],
- ["A6",0xE06],
- ["A7",0xE07],
- ["A8",0xE08],
- ["A9",0xE09],
- ["AA",0xE0A],
- ["AB",0xE0B],
- ["AC",0xE0C],
- ["AD",0xE0D],
- ["AE",0xE0E],
- ["AF",0xE0F],
- ["B0",0xE10],
- ["B1",0xE11],
- ["B2",0xE12],
- ["B3",0xE13],
- ["B4",0xE14],
- ["B5",0xE15],
- ["B6",0xE16],
- ["B7",0xE17],
- ["B8",0xE18],
- ["B9",0xE19],
- ["BA",0xE1A],
- ["BB",0xE1B],
- ["BC",0xE1C],
- ["BD",0xE1D],
- ["BE",0xE1E],
- ["BF",0xE1F],
- ["C0",0xE20],
- ["C1",0xE21],
- ["C2",0xE22],
- ["C3",0xE23],
- ["C4",0xE24],
- ["C5",0xE25],
- ["C6",0xE26],
- ["C7",0xE27],
- ["C8",0xE28],
- ["C9",0xE29],
- ["CA",0xE2A],
- ["CB",0xE2B],
- ["CC",0xE2C],
- ["CD",0xE2D],
- ["CE",0xE2E],
- ["CF",0xE2F],
- ["D0",0xE30],
- ["D1",0xE31],
- ["D2",0xE32],
- ["D3",0xE33],
- ["D4",0xE34],
- ["D5",0xE35],
- ["D6",0xE36],
- ["D7",0xE37],
- ["D8",0xE38],
- ["D9",0xE39],
- ["DA",0xE3A],
- ["DF",0xE3F],
- ["E0",0xE40],
- ["E1",0xE41],
- ["E2",0xE42],
- ["E3",0xE43],
- ["E4",0xE44],
- ["E5",0xE45],
- ["E6",0xE46],
- ["E7",0xE47],
- ["E8",0xE48],
- ["E9",0xE49],
- ["EA",0xE4A],
- ["EB",0xE4B],
- ["EC",0xE4C],
- ["ED",0xE4D],
- ["EE",0xE4E],
- ["EF",0xE4F],
- ["F0",0xE50],
- ["F1",0xE51],
- ["F2",0xE52],
- ["F3",0xE53],
- ["F4",0xE54],
- ["F5",0xE55],
- ["F6",0xE56],
- ["F7",0xE57],
- ["F8",0xE58],
- ["F9",0xE59],
- ["FA",0xE5A],
- ["FB",0xE5B],
- ["96",0x2013],
- ["97",0x2014],
- ["91",0x2018],
- ["92",0x2019],
- ["93",0x201C],
- ["94",0x201D],
- ["95",0x2022],
- ["85",0x2026],
- ["80",0x20AC],
-] \ No newline at end of file
diff --git a/enc/unicode.c b/enc/unicode.c
deleted file mode 100644
index bf9984bebd..0000000000
--- a/enc/unicode.c
+++ /dev/null
@@ -1,2610 +0,0 @@
-/**********************************************************************
- unicode.c - Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2007 K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regint.h"
-
-#define ONIGENC_IS_UNICODE_ISO_8859_1_CTYPE(code,ctype) \
- ((EncUNICODE_ISO_8859_1_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
-#if 0
-#define ONIGENC_IS_UNICODE_ISO_8859_1_BIT_CTYPE(code,cbit) \
- ((EncUNICODE_ISO_8859_1_CtypeTable[code] & (cbit)) != 0)
-#endif
-
-static const unsigned short EncUNICODE_ISO_8859_1_CtypeTable[256] = {
- 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
- 0x4008, 0x428c, 0x4289, 0x4288, 0x4288, 0x4288, 0x4008, 0x4008,
- 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
- 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
- 0x4284, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
- 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
- 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0,
- 0x78b0, 0x78b0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
- 0x41a0, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x74a2,
- 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
- 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
- 0x74a2, 0x74a2, 0x74a2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x51a0,
- 0x41a0, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x70e2,
- 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
- 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
- 0x70e2, 0x70e2, 0x70e2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x4008,
- 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0288, 0x0008, 0x0008,
- 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
- 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
- 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
- 0x0284, 0x01a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0,
- 0x00a0, 0x00a0, 0x30e2, 0x01a0, 0x00a0, 0x00a8, 0x00a0, 0x00a0,
- 0x00a0, 0x00a0, 0x10a0, 0x10a0, 0x00a0, 0x30e2, 0x00a0, 0x01a0,
- 0x00a0, 0x10a0, 0x30e2, 0x01a0, 0x10a0, 0x10a0, 0x10a0, 0x01a0,
- 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
- 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
- 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x00a0,
- 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x30e2,
- 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
- 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
- 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x00a0,
- 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2
-};
-
-#include "enc/unicode/name2ctype.h"
-
-typedef struct {
- int n;
- OnigCodePoint code[3];
-} CodePointList3;
-
-typedef struct {
- OnigCodePoint from;
- CodePointList3 to;
-} CaseFold_11_Type;
-
-typedef struct {
- OnigCodePoint from;
- CodePointList3 to;
-} CaseUnfold_11_Type;
-
-typedef struct {
- int n;
- OnigCodePoint code[2];
-} CodePointList2;
-
-typedef struct {
- OnigCodePoint from[2];
- CodePointList2 to;
-} CaseUnfold_12_Type;
-
-typedef struct {
- OnigCodePoint from[3];
- CodePointList2 to;
-} CaseUnfold_13_Type;
-
-static const CaseFold_11_Type CaseFold[] = {
- { 0x0041, {1, {0x0061}}},
- { 0x0042, {1, {0x0062}}},
- { 0x0043, {1, {0x0063}}},
- { 0x0044, {1, {0x0064}}},
- { 0x0045, {1, {0x0065}}},
- { 0x0046, {1, {0x0066}}},
- { 0x0047, {1, {0x0067}}},
- { 0x0048, {1, {0x0068}}},
- { 0x004a, {1, {0x006a}}},
- { 0x004b, {1, {0x006b}}},
- { 0x004c, {1, {0x006c}}},
- { 0x004d, {1, {0x006d}}},
- { 0x004e, {1, {0x006e}}},
- { 0x004f, {1, {0x006f}}},
- { 0x0050, {1, {0x0070}}},
- { 0x0051, {1, {0x0071}}},
- { 0x0052, {1, {0x0072}}},
- { 0x0053, {1, {0x0073}}},
- { 0x0054, {1, {0x0074}}},
- { 0x0055, {1, {0x0075}}},
- { 0x0056, {1, {0x0076}}},
- { 0x0057, {1, {0x0077}}},
- { 0x0058, {1, {0x0078}}},
- { 0x0059, {1, {0x0079}}},
- { 0x005a, {1, {0x007a}}},
- { 0x00b5, {1, {0x03bc}}},
- { 0x00c0, {1, {0x00e0}}},
- { 0x00c1, {1, {0x00e1}}},
- { 0x00c2, {1, {0x00e2}}},
- { 0x00c3, {1, {0x00e3}}},
- { 0x00c4, {1, {0x00e4}}},
- { 0x00c5, {1, {0x00e5}}},
- { 0x00c6, {1, {0x00e6}}},
- { 0x00c7, {1, {0x00e7}}},
- { 0x00c8, {1, {0x00e8}}},
- { 0x00c9, {1, {0x00e9}}},
- { 0x00ca, {1, {0x00ea}}},
- { 0x00cb, {1, {0x00eb}}},
- { 0x00cc, {1, {0x00ec}}},
- { 0x00cd, {1, {0x00ed}}},
- { 0x00ce, {1, {0x00ee}}},
- { 0x00cf, {1, {0x00ef}}},
- { 0x00d0, {1, {0x00f0}}},
- { 0x00d1, {1, {0x00f1}}},
- { 0x00d2, {1, {0x00f2}}},
- { 0x00d3, {1, {0x00f3}}},
- { 0x00d4, {1, {0x00f4}}},
- { 0x00d5, {1, {0x00f5}}},
- { 0x00d6, {1, {0x00f6}}},
- { 0x00d8, {1, {0x00f8}}},
- { 0x00d9, {1, {0x00f9}}},
- { 0x00da, {1, {0x00fa}}},
- { 0x00db, {1, {0x00fb}}},
- { 0x00dc, {1, {0x00fc}}},
- { 0x00dd, {1, {0x00fd}}},
- { 0x00de, {1, {0x00fe}}},
- { 0x00df, {2, {0x0073, 0x0073}}},
- { 0x0100, {1, {0x0101}}},
- { 0x0102, {1, {0x0103}}},
- { 0x0104, {1, {0x0105}}},
- { 0x0106, {1, {0x0107}}},
- { 0x0108, {1, {0x0109}}},
- { 0x010a, {1, {0x010b}}},
- { 0x010c, {1, {0x010d}}},
- { 0x010e, {1, {0x010f}}},
- { 0x0110, {1, {0x0111}}},
- { 0x0112, {1, {0x0113}}},
- { 0x0114, {1, {0x0115}}},
- { 0x0116, {1, {0x0117}}},
- { 0x0118, {1, {0x0119}}},
- { 0x011a, {1, {0x011b}}},
- { 0x011c, {1, {0x011d}}},
- { 0x011e, {1, {0x011f}}},
- { 0x0120, {1, {0x0121}}},
- { 0x0122, {1, {0x0123}}},
- { 0x0124, {1, {0x0125}}},
- { 0x0126, {1, {0x0127}}},
- { 0x0128, {1, {0x0129}}},
- { 0x012a, {1, {0x012b}}},
- { 0x012c, {1, {0x012d}}},
- { 0x012e, {1, {0x012f}}},
- { 0x0132, {1, {0x0133}}},
- { 0x0134, {1, {0x0135}}},
- { 0x0136, {1, {0x0137}}},
- { 0x0139, {1, {0x013a}}},
- { 0x013b, {1, {0x013c}}},
- { 0x013d, {1, {0x013e}}},
- { 0x013f, {1, {0x0140}}},
- { 0x0141, {1, {0x0142}}},
- { 0x0143, {1, {0x0144}}},
- { 0x0145, {1, {0x0146}}},
- { 0x0147, {1, {0x0148}}},
- { 0x0149, {2, {0x02bc, 0x006e}}},
- { 0x014a, {1, {0x014b}}},
- { 0x014c, {1, {0x014d}}},
- { 0x014e, {1, {0x014f}}},
- { 0x0150, {1, {0x0151}}},
- { 0x0152, {1, {0x0153}}},
- { 0x0154, {1, {0x0155}}},
- { 0x0156, {1, {0x0157}}},
- { 0x0158, {1, {0x0159}}},
- { 0x015a, {1, {0x015b}}},
- { 0x015c, {1, {0x015d}}},
- { 0x015e, {1, {0x015f}}},
- { 0x0160, {1, {0x0161}}},
- { 0x0162, {1, {0x0163}}},
- { 0x0164, {1, {0x0165}}},
- { 0x0166, {1, {0x0167}}},
- { 0x0168, {1, {0x0169}}},
- { 0x016a, {1, {0x016b}}},
- { 0x016c, {1, {0x016d}}},
- { 0x016e, {1, {0x016f}}},
- { 0x0170, {1, {0x0171}}},
- { 0x0172, {1, {0x0173}}},
- { 0x0174, {1, {0x0175}}},
- { 0x0176, {1, {0x0177}}},
- { 0x0178, {1, {0x00ff}}},
- { 0x0179, {1, {0x017a}}},
- { 0x017b, {1, {0x017c}}},
- { 0x017d, {1, {0x017e}}},
- { 0x017f, {1, {0x0073}}},
- { 0x0181, {1, {0x0253}}},
- { 0x0182, {1, {0x0183}}},
- { 0x0184, {1, {0x0185}}},
- { 0x0186, {1, {0x0254}}},
- { 0x0187, {1, {0x0188}}},
- { 0x0189, {1, {0x0256}}},
- { 0x018a, {1, {0x0257}}},
- { 0x018b, {1, {0x018c}}},
- { 0x018e, {1, {0x01dd}}},
- { 0x018f, {1, {0x0259}}},
- { 0x0190, {1, {0x025b}}},
- { 0x0191, {1, {0x0192}}},
- { 0x0193, {1, {0x0260}}},
- { 0x0194, {1, {0x0263}}},
- { 0x0196, {1, {0x0269}}},
- { 0x0197, {1, {0x0268}}},
- { 0x0198, {1, {0x0199}}},
- { 0x019c, {1, {0x026f}}},
- { 0x019d, {1, {0x0272}}},
- { 0x019f, {1, {0x0275}}},
- { 0x01a0, {1, {0x01a1}}},
- { 0x01a2, {1, {0x01a3}}},
- { 0x01a4, {1, {0x01a5}}},
- { 0x01a6, {1, {0x0280}}},
- { 0x01a7, {1, {0x01a8}}},
- { 0x01a9, {1, {0x0283}}},
- { 0x01ac, {1, {0x01ad}}},
- { 0x01ae, {1, {0x0288}}},
- { 0x01af, {1, {0x01b0}}},
- { 0x01b1, {1, {0x028a}}},
- { 0x01b2, {1, {0x028b}}},
- { 0x01b3, {1, {0x01b4}}},
- { 0x01b5, {1, {0x01b6}}},
- { 0x01b7, {1, {0x0292}}},
- { 0x01b8, {1, {0x01b9}}},
- { 0x01bc, {1, {0x01bd}}},
- { 0x01c4, {1, {0x01c6}}},
- { 0x01c5, {1, {0x01c6}}},
- { 0x01c7, {1, {0x01c9}}},
- { 0x01c8, {1, {0x01c9}}},
- { 0x01ca, {1, {0x01cc}}},
- { 0x01cb, {1, {0x01cc}}},
- { 0x01cd, {1, {0x01ce}}},
- { 0x01cf, {1, {0x01d0}}},
- { 0x01d1, {1, {0x01d2}}},
- { 0x01d3, {1, {0x01d4}}},
- { 0x01d5, {1, {0x01d6}}},
- { 0x01d7, {1, {0x01d8}}},
- { 0x01d9, {1, {0x01da}}},
- { 0x01db, {1, {0x01dc}}},
- { 0x01de, {1, {0x01df}}},
- { 0x01e0, {1, {0x01e1}}},
- { 0x01e2, {1, {0x01e3}}},
- { 0x01e4, {1, {0x01e5}}},
- { 0x01e6, {1, {0x01e7}}},
- { 0x01e8, {1, {0x01e9}}},
- { 0x01ea, {1, {0x01eb}}},
- { 0x01ec, {1, {0x01ed}}},
- { 0x01ee, {1, {0x01ef}}},
- { 0x01f0, {2, {0x006a, 0x030c}}},
- { 0x01f1, {1, {0x01f3}}},
- { 0x01f2, {1, {0x01f3}}},
- { 0x01f4, {1, {0x01f5}}},
- { 0x01f6, {1, {0x0195}}},
- { 0x01f7, {1, {0x01bf}}},
- { 0x01f8, {1, {0x01f9}}},
- { 0x01fa, {1, {0x01fb}}},
- { 0x01fc, {1, {0x01fd}}},
- { 0x01fe, {1, {0x01ff}}},
- { 0x0200, {1, {0x0201}}},
- { 0x0202, {1, {0x0203}}},
- { 0x0204, {1, {0x0205}}},
- { 0x0206, {1, {0x0207}}},
- { 0x0208, {1, {0x0209}}},
- { 0x020a, {1, {0x020b}}},
- { 0x020c, {1, {0x020d}}},
- { 0x020e, {1, {0x020f}}},
- { 0x0210, {1, {0x0211}}},
- { 0x0212, {1, {0x0213}}},
- { 0x0214, {1, {0x0215}}},
- { 0x0216, {1, {0x0217}}},
- { 0x0218, {1, {0x0219}}},
- { 0x021a, {1, {0x021b}}},
- { 0x021c, {1, {0x021d}}},
- { 0x021e, {1, {0x021f}}},
- { 0x0220, {1, {0x019e}}},
- { 0x0222, {1, {0x0223}}},
- { 0x0224, {1, {0x0225}}},
- { 0x0226, {1, {0x0227}}},
- { 0x0228, {1, {0x0229}}},
- { 0x022a, {1, {0x022b}}},
- { 0x022c, {1, {0x022d}}},
- { 0x022e, {1, {0x022f}}},
- { 0x0230, {1, {0x0231}}},
- { 0x0232, {1, {0x0233}}},
- { 0x023b, {1, {0x023c}}},
- { 0x023d, {1, {0x019a}}},
- { 0x0241, {1, {0x0294}}},
- { 0x0345, {1, {0x03b9}}},
- { 0x0386, {1, {0x03ac}}},
- { 0x0388, {1, {0x03ad}}},
- { 0x0389, {1, {0x03ae}}},
- { 0x038a, {1, {0x03af}}},
- { 0x038c, {1, {0x03cc}}},
- { 0x038e, {1, {0x03cd}}},
- { 0x038f, {1, {0x03ce}}},
- { 0x0390, {3, {0x03b9, 0x0308, 0x0301}}},
- { 0x0391, {1, {0x03b1}}},
- { 0x0392, {1, {0x03b2}}},
- { 0x0393, {1, {0x03b3}}},
- { 0x0394, {1, {0x03b4}}},
- { 0x0395, {1, {0x03b5}}},
- { 0x0396, {1, {0x03b6}}},
- { 0x0397, {1, {0x03b7}}},
- { 0x0398, {1, {0x03b8}}},
- { 0x0399, {1, {0x03b9}}},
- { 0x039a, {1, {0x03ba}}},
- { 0x039b, {1, {0x03bb}}},
- { 0x039c, {1, {0x03bc}}},
- { 0x039d, {1, {0x03bd}}},
- { 0x039e, {1, {0x03be}}},
- { 0x039f, {1, {0x03bf}}},
- { 0x03a0, {1, {0x03c0}}},
- { 0x03a1, {1, {0x03c1}}},
- { 0x03a3, {1, {0x03c3}}},
- { 0x03a4, {1, {0x03c4}}},
- { 0x03a5, {1, {0x03c5}}},
- { 0x03a6, {1, {0x03c6}}},
- { 0x03a7, {1, {0x03c7}}},
- { 0x03a8, {1, {0x03c8}}},
- { 0x03a9, {1, {0x03c9}}},
- { 0x03aa, {1, {0x03ca}}},
- { 0x03ab, {1, {0x03cb}}},
- { 0x03b0, {3, {0x03c5, 0x0308, 0x0301}}},
- { 0x03c2, {1, {0x03c3}}},
- { 0x03d0, {1, {0x03b2}}},
- { 0x03d1, {1, {0x03b8}}},
- { 0x03d5, {1, {0x03c6}}},
- { 0x03d6, {1, {0x03c0}}},
- { 0x03d8, {1, {0x03d9}}},
- { 0x03da, {1, {0x03db}}},
- { 0x03dc, {1, {0x03dd}}},
- { 0x03de, {1, {0x03df}}},
- { 0x03e0, {1, {0x03e1}}},
- { 0x03e2, {1, {0x03e3}}},
- { 0x03e4, {1, {0x03e5}}},
- { 0x03e6, {1, {0x03e7}}},
- { 0x03e8, {1, {0x03e9}}},
- { 0x03ea, {1, {0x03eb}}},
- { 0x03ec, {1, {0x03ed}}},
- { 0x03ee, {1, {0x03ef}}},
- { 0x03f0, {1, {0x03ba}}},
- { 0x03f1, {1, {0x03c1}}},
- { 0x03f4, {1, {0x03b8}}},
- { 0x03f5, {1, {0x03b5}}},
- { 0x03f7, {1, {0x03f8}}},
- { 0x03f9, {1, {0x03f2}}},
- { 0x03fa, {1, {0x03fb}}},
- { 0x0400, {1, {0x0450}}},
- { 0x0401, {1, {0x0451}}},
- { 0x0402, {1, {0x0452}}},
- { 0x0403, {1, {0x0453}}},
- { 0x0404, {1, {0x0454}}},
- { 0x0405, {1, {0x0455}}},
- { 0x0406, {1, {0x0456}}},
- { 0x0407, {1, {0x0457}}},
- { 0x0408, {1, {0x0458}}},
- { 0x0409, {1, {0x0459}}},
- { 0x040a, {1, {0x045a}}},
- { 0x040b, {1, {0x045b}}},
- { 0x040c, {1, {0x045c}}},
- { 0x040d, {1, {0x045d}}},
- { 0x040e, {1, {0x045e}}},
- { 0x040f, {1, {0x045f}}},
- { 0x0410, {1, {0x0430}}},
- { 0x0411, {1, {0x0431}}},
- { 0x0412, {1, {0x0432}}},
- { 0x0413, {1, {0x0433}}},
- { 0x0414, {1, {0x0434}}},
- { 0x0415, {1, {0x0435}}},
- { 0x0416, {1, {0x0436}}},
- { 0x0417, {1, {0x0437}}},
- { 0x0418, {1, {0x0438}}},
- { 0x0419, {1, {0x0439}}},
- { 0x041a, {1, {0x043a}}},
- { 0x041b, {1, {0x043b}}},
- { 0x041c, {1, {0x043c}}},
- { 0x041d, {1, {0x043d}}},
- { 0x041e, {1, {0x043e}}},
- { 0x041f, {1, {0x043f}}},
- { 0x0420, {1, {0x0440}}},
- { 0x0421, {1, {0x0441}}},
- { 0x0422, {1, {0x0442}}},
- { 0x0423, {1, {0x0443}}},
- { 0x0424, {1, {0x0444}}},
- { 0x0425, {1, {0x0445}}},
- { 0x0426, {1, {0x0446}}},
- { 0x0427, {1, {0x0447}}},
- { 0x0428, {1, {0x0448}}},
- { 0x0429, {1, {0x0449}}},
- { 0x042a, {1, {0x044a}}},
- { 0x042b, {1, {0x044b}}},
- { 0x042c, {1, {0x044c}}},
- { 0x042d, {1, {0x044d}}},
- { 0x042e, {1, {0x044e}}},
- { 0x042f, {1, {0x044f}}},
- { 0x0460, {1, {0x0461}}},
- { 0x0462, {1, {0x0463}}},
- { 0x0464, {1, {0x0465}}},
- { 0x0466, {1, {0x0467}}},
- { 0x0468, {1, {0x0469}}},
- { 0x046a, {1, {0x046b}}},
- { 0x046c, {1, {0x046d}}},
- { 0x046e, {1, {0x046f}}},
- { 0x0470, {1, {0x0471}}},
- { 0x0472, {1, {0x0473}}},
- { 0x0474, {1, {0x0475}}},
- { 0x0476, {1, {0x0477}}},
- { 0x0478, {1, {0x0479}}},
- { 0x047a, {1, {0x047b}}},
- { 0x047c, {1, {0x047d}}},
- { 0x047e, {1, {0x047f}}},
- { 0x0480, {1, {0x0481}}},
- { 0x048a, {1, {0x048b}}},
- { 0x048c, {1, {0x048d}}},
- { 0x048e, {1, {0x048f}}},
- { 0x0490, {1, {0x0491}}},
- { 0x0492, {1, {0x0493}}},
- { 0x0494, {1, {0x0495}}},
- { 0x0496, {1, {0x0497}}},
- { 0x0498, {1, {0x0499}}},
- { 0x049a, {1, {0x049b}}},
- { 0x049c, {1, {0x049d}}},
- { 0x049e, {1, {0x049f}}},
- { 0x04a0, {1, {0x04a1}}},
- { 0x04a2, {1, {0x04a3}}},
- { 0x04a4, {1, {0x04a5}}},
- { 0x04a6, {1, {0x04a7}}},
- { 0x04a8, {1, {0x04a9}}},
- { 0x04aa, {1, {0x04ab}}},
- { 0x04ac, {1, {0x04ad}}},
- { 0x04ae, {1, {0x04af}}},
- { 0x04b0, {1, {0x04b1}}},
- { 0x04b2, {1, {0x04b3}}},
- { 0x04b4, {1, {0x04b5}}},
- { 0x04b6, {1, {0x04b7}}},
- { 0x04b8, {1, {0x04b9}}},
- { 0x04ba, {1, {0x04bb}}},
- { 0x04bc, {1, {0x04bd}}},
- { 0x04be, {1, {0x04bf}}},
- { 0x04c1, {1, {0x04c2}}},
- { 0x04c3, {1, {0x04c4}}},
- { 0x04c5, {1, {0x04c6}}},
- { 0x04c7, {1, {0x04c8}}},
- { 0x04c9, {1, {0x04ca}}},
- { 0x04cb, {1, {0x04cc}}},
- { 0x04cd, {1, {0x04ce}}},
- { 0x04d0, {1, {0x04d1}}},
- { 0x04d2, {1, {0x04d3}}},
- { 0x04d4, {1, {0x04d5}}},
- { 0x04d6, {1, {0x04d7}}},
- { 0x04d8, {1, {0x04d9}}},
- { 0x04da, {1, {0x04db}}},
- { 0x04dc, {1, {0x04dd}}},
- { 0x04de, {1, {0x04df}}},
- { 0x04e0, {1, {0x04e1}}},
- { 0x04e2, {1, {0x04e3}}},
- { 0x04e4, {1, {0x04e5}}},
- { 0x04e6, {1, {0x04e7}}},
- { 0x04e8, {1, {0x04e9}}},
- { 0x04ea, {1, {0x04eb}}},
- { 0x04ec, {1, {0x04ed}}},
- { 0x04ee, {1, {0x04ef}}},
- { 0x04f0, {1, {0x04f1}}},
- { 0x04f2, {1, {0x04f3}}},
- { 0x04f4, {1, {0x04f5}}},
- { 0x04f6, {1, {0x04f7}}},
- { 0x04f8, {1, {0x04f9}}},
- { 0x0500, {1, {0x0501}}},
- { 0x0502, {1, {0x0503}}},
- { 0x0504, {1, {0x0505}}},
- { 0x0506, {1, {0x0507}}},
- { 0x0508, {1, {0x0509}}},
- { 0x050a, {1, {0x050b}}},
- { 0x050c, {1, {0x050d}}},
- { 0x050e, {1, {0x050f}}},
- { 0x0531, {1, {0x0561}}},
- { 0x0532, {1, {0x0562}}},
- { 0x0533, {1, {0x0563}}},
- { 0x0534, {1, {0x0564}}},
- { 0x0535, {1, {0x0565}}},
- { 0x0536, {1, {0x0566}}},
- { 0x0537, {1, {0x0567}}},
- { 0x0538, {1, {0x0568}}},
- { 0x0539, {1, {0x0569}}},
- { 0x053a, {1, {0x056a}}},
- { 0x053b, {1, {0x056b}}},
- { 0x053c, {1, {0x056c}}},
- { 0x053d, {1, {0x056d}}},
- { 0x053e, {1, {0x056e}}},
- { 0x053f, {1, {0x056f}}},
- { 0x0540, {1, {0x0570}}},
- { 0x0541, {1, {0x0571}}},
- { 0x0542, {1, {0x0572}}},
- { 0x0543, {1, {0x0573}}},
- { 0x0544, {1, {0x0574}}},
- { 0x0545, {1, {0x0575}}},
- { 0x0546, {1, {0x0576}}},
- { 0x0547, {1, {0x0577}}},
- { 0x0548, {1, {0x0578}}},
- { 0x0549, {1, {0x0579}}},
- { 0x054a, {1, {0x057a}}},
- { 0x054b, {1, {0x057b}}},
- { 0x054c, {1, {0x057c}}},
- { 0x054d, {1, {0x057d}}},
- { 0x054e, {1, {0x057e}}},
- { 0x054f, {1, {0x057f}}},
- { 0x0550, {1, {0x0580}}},
- { 0x0551, {1, {0x0581}}},
- { 0x0552, {1, {0x0582}}},
- { 0x0553, {1, {0x0583}}},
- { 0x0554, {1, {0x0584}}},
- { 0x0555, {1, {0x0585}}},
- { 0x0556, {1, {0x0586}}},
- { 0x0587, {2, {0x0565, 0x0582}}},
- { 0x10a0, {1, {0x2d00}}},
- { 0x10a1, {1, {0x2d01}}},
- { 0x10a2, {1, {0x2d02}}},
- { 0x10a3, {1, {0x2d03}}},
- { 0x10a4, {1, {0x2d04}}},
- { 0x10a5, {1, {0x2d05}}},
- { 0x10a6, {1, {0x2d06}}},
- { 0x10a7, {1, {0x2d07}}},
- { 0x10a8, {1, {0x2d08}}},
- { 0x10a9, {1, {0x2d09}}},
- { 0x10aa, {1, {0x2d0a}}},
- { 0x10ab, {1, {0x2d0b}}},
- { 0x10ac, {1, {0x2d0c}}},
- { 0x10ad, {1, {0x2d0d}}},
- { 0x10ae, {1, {0x2d0e}}},
- { 0x10af, {1, {0x2d0f}}},
- { 0x10b0, {1, {0x2d10}}},
- { 0x10b1, {1, {0x2d11}}},
- { 0x10b2, {1, {0x2d12}}},
- { 0x10b3, {1, {0x2d13}}},
- { 0x10b4, {1, {0x2d14}}},
- { 0x10b5, {1, {0x2d15}}},
- { 0x10b6, {1, {0x2d16}}},
- { 0x10b7, {1, {0x2d17}}},
- { 0x10b8, {1, {0x2d18}}},
- { 0x10b9, {1, {0x2d19}}},
- { 0x10ba, {1, {0x2d1a}}},
- { 0x10bb, {1, {0x2d1b}}},
- { 0x10bc, {1, {0x2d1c}}},
- { 0x10bd, {1, {0x2d1d}}},
- { 0x10be, {1, {0x2d1e}}},
- { 0x10bf, {1, {0x2d1f}}},
- { 0x10c0, {1, {0x2d20}}},
- { 0x10c1, {1, {0x2d21}}},
- { 0x10c2, {1, {0x2d22}}},
- { 0x10c3, {1, {0x2d23}}},
- { 0x10c4, {1, {0x2d24}}},
- { 0x10c5, {1, {0x2d25}}},
- { 0x1e00, {1, {0x1e01}}},
- { 0x1e02, {1, {0x1e03}}},
- { 0x1e04, {1, {0x1e05}}},
- { 0x1e06, {1, {0x1e07}}},
- { 0x1e08, {1, {0x1e09}}},
- { 0x1e0a, {1, {0x1e0b}}},
- { 0x1e0c, {1, {0x1e0d}}},
- { 0x1e0e, {1, {0x1e0f}}},
- { 0x1e10, {1, {0x1e11}}},
- { 0x1e12, {1, {0x1e13}}},
- { 0x1e14, {1, {0x1e15}}},
- { 0x1e16, {1, {0x1e17}}},
- { 0x1e18, {1, {0x1e19}}},
- { 0x1e1a, {1, {0x1e1b}}},
- { 0x1e1c, {1, {0x1e1d}}},
- { 0x1e1e, {1, {0x1e1f}}},
- { 0x1e20, {1, {0x1e21}}},
- { 0x1e22, {1, {0x1e23}}},
- { 0x1e24, {1, {0x1e25}}},
- { 0x1e26, {1, {0x1e27}}},
- { 0x1e28, {1, {0x1e29}}},
- { 0x1e2a, {1, {0x1e2b}}},
- { 0x1e2c, {1, {0x1e2d}}},
- { 0x1e2e, {1, {0x1e2f}}},
- { 0x1e30, {1, {0x1e31}}},
- { 0x1e32, {1, {0x1e33}}},
- { 0x1e34, {1, {0x1e35}}},
- { 0x1e36, {1, {0x1e37}}},
- { 0x1e38, {1, {0x1e39}}},
- { 0x1e3a, {1, {0x1e3b}}},
- { 0x1e3c, {1, {0x1e3d}}},
- { 0x1e3e, {1, {0x1e3f}}},
- { 0x1e40, {1, {0x1e41}}},
- { 0x1e42, {1, {0x1e43}}},
- { 0x1e44, {1, {0x1e45}}},
- { 0x1e46, {1, {0x1e47}}},
- { 0x1e48, {1, {0x1e49}}},
- { 0x1e4a, {1, {0x1e4b}}},
- { 0x1e4c, {1, {0x1e4d}}},
- { 0x1e4e, {1, {0x1e4f}}},
- { 0x1e50, {1, {0x1e51}}},
- { 0x1e52, {1, {0x1e53}}},
- { 0x1e54, {1, {0x1e55}}},
- { 0x1e56, {1, {0x1e57}}},
- { 0x1e58, {1, {0x1e59}}},
- { 0x1e5a, {1, {0x1e5b}}},
- { 0x1e5c, {1, {0x1e5d}}},
- { 0x1e5e, {1, {0x1e5f}}},
- { 0x1e60, {1, {0x1e61}}},
- { 0x1e62, {1, {0x1e63}}},
- { 0x1e64, {1, {0x1e65}}},
- { 0x1e66, {1, {0x1e67}}},
- { 0x1e68, {1, {0x1e69}}},
- { 0x1e6a, {1, {0x1e6b}}},
- { 0x1e6c, {1, {0x1e6d}}},
- { 0x1e6e, {1, {0x1e6f}}},
- { 0x1e70, {1, {0x1e71}}},
- { 0x1e72, {1, {0x1e73}}},
- { 0x1e74, {1, {0x1e75}}},
- { 0x1e76, {1, {0x1e77}}},
- { 0x1e78, {1, {0x1e79}}},
- { 0x1e7a, {1, {0x1e7b}}},
- { 0x1e7c, {1, {0x1e7d}}},
- { 0x1e7e, {1, {0x1e7f}}},
- { 0x1e80, {1, {0x1e81}}},
- { 0x1e82, {1, {0x1e83}}},
- { 0x1e84, {1, {0x1e85}}},
- { 0x1e86, {1, {0x1e87}}},
- { 0x1e88, {1, {0x1e89}}},
- { 0x1e8a, {1, {0x1e8b}}},
- { 0x1e8c, {1, {0x1e8d}}},
- { 0x1e8e, {1, {0x1e8f}}},
- { 0x1e90, {1, {0x1e91}}},
- { 0x1e92, {1, {0x1e93}}},
- { 0x1e94, {1, {0x1e95}}},
- { 0x1e96, {2, {0x0068, 0x0331}}},
- { 0x1e97, {2, {0x0074, 0x0308}}},
- { 0x1e98, {2, {0x0077, 0x030a}}},
- { 0x1e99, {2, {0x0079, 0x030a}}},
- { 0x1e9a, {2, {0x0061, 0x02be}}},
- { 0x1e9b, {1, {0x1e61}}},
- { 0x1ea0, {1, {0x1ea1}}},
- { 0x1ea2, {1, {0x1ea3}}},
- { 0x1ea4, {1, {0x1ea5}}},
- { 0x1ea6, {1, {0x1ea7}}},
- { 0x1ea8, {1, {0x1ea9}}},
- { 0x1eaa, {1, {0x1eab}}},
- { 0x1eac, {1, {0x1ead}}},
- { 0x1eae, {1, {0x1eaf}}},
- { 0x1eb0, {1, {0x1eb1}}},
- { 0x1eb2, {1, {0x1eb3}}},
- { 0x1eb4, {1, {0x1eb5}}},
- { 0x1eb6, {1, {0x1eb7}}},
- { 0x1eb8, {1, {0x1eb9}}},
- { 0x1eba, {1, {0x1ebb}}},
- { 0x1ebc, {1, {0x1ebd}}},
- { 0x1ebe, {1, {0x1ebf}}},
- { 0x1ec0, {1, {0x1ec1}}},
- { 0x1ec2, {1, {0x1ec3}}},
- { 0x1ec4, {1, {0x1ec5}}},
- { 0x1ec6, {1, {0x1ec7}}},
- { 0x1ec8, {1, {0x1ec9}}},
- { 0x1eca, {1, {0x1ecb}}},
- { 0x1ecc, {1, {0x1ecd}}},
- { 0x1ece, {1, {0x1ecf}}},
- { 0x1ed0, {1, {0x1ed1}}},
- { 0x1ed2, {1, {0x1ed3}}},
- { 0x1ed4, {1, {0x1ed5}}},
- { 0x1ed6, {1, {0x1ed7}}},
- { 0x1ed8, {1, {0x1ed9}}},
- { 0x1eda, {1, {0x1edb}}},
- { 0x1edc, {1, {0x1edd}}},
- { 0x1ede, {1, {0x1edf}}},
- { 0x1ee0, {1, {0x1ee1}}},
- { 0x1ee2, {1, {0x1ee3}}},
- { 0x1ee4, {1, {0x1ee5}}},
- { 0x1ee6, {1, {0x1ee7}}},
- { 0x1ee8, {1, {0x1ee9}}},
- { 0x1eea, {1, {0x1eeb}}},
- { 0x1eec, {1, {0x1eed}}},
- { 0x1eee, {1, {0x1eef}}},
- { 0x1ef0, {1, {0x1ef1}}},
- { 0x1ef2, {1, {0x1ef3}}},
- { 0x1ef4, {1, {0x1ef5}}},
- { 0x1ef6, {1, {0x1ef7}}},
- { 0x1ef8, {1, {0x1ef9}}},
- { 0x1f08, {1, {0x1f00}}},
- { 0x1f09, {1, {0x1f01}}},
- { 0x1f0a, {1, {0x1f02}}},
- { 0x1f0b, {1, {0x1f03}}},
- { 0x1f0c, {1, {0x1f04}}},
- { 0x1f0d, {1, {0x1f05}}},
- { 0x1f0e, {1, {0x1f06}}},
- { 0x1f0f, {1, {0x1f07}}},
- { 0x1f18, {1, {0x1f10}}},
- { 0x1f19, {1, {0x1f11}}},
- { 0x1f1a, {1, {0x1f12}}},
- { 0x1f1b, {1, {0x1f13}}},
- { 0x1f1c, {1, {0x1f14}}},
- { 0x1f1d, {1, {0x1f15}}},
- { 0x1f28, {1, {0x1f20}}},
- { 0x1f29, {1, {0x1f21}}},
- { 0x1f2a, {1, {0x1f22}}},
- { 0x1f2b, {1, {0x1f23}}},
- { 0x1f2c, {1, {0x1f24}}},
- { 0x1f2d, {1, {0x1f25}}},
- { 0x1f2e, {1, {0x1f26}}},
- { 0x1f2f, {1, {0x1f27}}},
- { 0x1f38, {1, {0x1f30}}},
- { 0x1f39, {1, {0x1f31}}},
- { 0x1f3a, {1, {0x1f32}}},
- { 0x1f3b, {1, {0x1f33}}},
- { 0x1f3c, {1, {0x1f34}}},
- { 0x1f3d, {1, {0x1f35}}},
- { 0x1f3e, {1, {0x1f36}}},
- { 0x1f3f, {1, {0x1f37}}},
- { 0x1f48, {1, {0x1f40}}},
- { 0x1f49, {1, {0x1f41}}},
- { 0x1f4a, {1, {0x1f42}}},
- { 0x1f4b, {1, {0x1f43}}},
- { 0x1f4c, {1, {0x1f44}}},
- { 0x1f4d, {1, {0x1f45}}},
- { 0x1f50, {2, {0x03c5, 0x0313}}},
- { 0x1f52, {3, {0x03c5, 0x0313, 0x0300}}},
- { 0x1f54, {3, {0x03c5, 0x0313, 0x0301}}},
- { 0x1f56, {3, {0x03c5, 0x0313, 0x0342}}},
- { 0x1f59, {1, {0x1f51}}},
- { 0x1f5b, {1, {0x1f53}}},
- { 0x1f5d, {1, {0x1f55}}},
- { 0x1f5f, {1, {0x1f57}}},
- { 0x1f68, {1, {0x1f60}}},
- { 0x1f69, {1, {0x1f61}}},
- { 0x1f6a, {1, {0x1f62}}},
- { 0x1f6b, {1, {0x1f63}}},
- { 0x1f6c, {1, {0x1f64}}},
- { 0x1f6d, {1, {0x1f65}}},
- { 0x1f6e, {1, {0x1f66}}},
- { 0x1f6f, {1, {0x1f67}}},
- { 0x1f80, {2, {0x1f00, 0x03b9}}},
- { 0x1f81, {2, {0x1f01, 0x03b9}}},
- { 0x1f82, {2, {0x1f02, 0x03b9}}},
- { 0x1f83, {2, {0x1f03, 0x03b9}}},
- { 0x1f84, {2, {0x1f04, 0x03b9}}},
- { 0x1f85, {2, {0x1f05, 0x03b9}}},
- { 0x1f86, {2, {0x1f06, 0x03b9}}},
- { 0x1f87, {2, {0x1f07, 0x03b9}}},
- { 0x1f88, {2, {0x1f00, 0x03b9}}},
- { 0x1f89, {2, {0x1f01, 0x03b9}}},
- { 0x1f8a, {2, {0x1f02, 0x03b9}}},
- { 0x1f8b, {2, {0x1f03, 0x03b9}}},
- { 0x1f8c, {2, {0x1f04, 0x03b9}}},
- { 0x1f8d, {2, {0x1f05, 0x03b9}}},
- { 0x1f8e, {2, {0x1f06, 0x03b9}}},
- { 0x1f8f, {2, {0x1f07, 0x03b9}}},
- { 0x1f90, {2, {0x1f20, 0x03b9}}},
- { 0x1f91, {2, {0x1f21, 0x03b9}}},
- { 0x1f92, {2, {0x1f22, 0x03b9}}},
- { 0x1f93, {2, {0x1f23, 0x03b9}}},
- { 0x1f94, {2, {0x1f24, 0x03b9}}},
- { 0x1f95, {2, {0x1f25, 0x03b9}}},
- { 0x1f96, {2, {0x1f26, 0x03b9}}},
- { 0x1f97, {2, {0x1f27, 0x03b9}}},
- { 0x1f98, {2, {0x1f20, 0x03b9}}},
- { 0x1f99, {2, {0x1f21, 0x03b9}}},
- { 0x1f9a, {2, {0x1f22, 0x03b9}}},
- { 0x1f9b, {2, {0x1f23, 0x03b9}}},
- { 0x1f9c, {2, {0x1f24, 0x03b9}}},
- { 0x1f9d, {2, {0x1f25, 0x03b9}}},
- { 0x1f9e, {2, {0x1f26, 0x03b9}}},
- { 0x1f9f, {2, {0x1f27, 0x03b9}}},
- { 0x1fa0, {2, {0x1f60, 0x03b9}}},
- { 0x1fa1, {2, {0x1f61, 0x03b9}}},
- { 0x1fa2, {2, {0x1f62, 0x03b9}}},
- { 0x1fa3, {2, {0x1f63, 0x03b9}}},
- { 0x1fa4, {2, {0x1f64, 0x03b9}}},
- { 0x1fa5, {2, {0x1f65, 0x03b9}}},
- { 0x1fa6, {2, {0x1f66, 0x03b9}}},
- { 0x1fa7, {2, {0x1f67, 0x03b9}}},
- { 0x1fa8, {2, {0x1f60, 0x03b9}}},
- { 0x1fa9, {2, {0x1f61, 0x03b9}}},
- { 0x1faa, {2, {0x1f62, 0x03b9}}},
- { 0x1fab, {2, {0x1f63, 0x03b9}}},
- { 0x1fac, {2, {0x1f64, 0x03b9}}},
- { 0x1fad, {2, {0x1f65, 0x03b9}}},
- { 0x1fae, {2, {0x1f66, 0x03b9}}},
- { 0x1faf, {2, {0x1f67, 0x03b9}}},
- { 0x1fb2, {2, {0x1f70, 0x03b9}}},
- { 0x1fb3, {2, {0x03b1, 0x03b9}}},
- { 0x1fb4, {2, {0x03ac, 0x03b9}}},
- { 0x1fb6, {2, {0x03b1, 0x0342}}},
- { 0x1fb7, {3, {0x03b1, 0x0342, 0x03b9}}},
- { 0x1fb8, {1, {0x1fb0}}},
- { 0x1fb9, {1, {0x1fb1}}},
- { 0x1fba, {1, {0x1f70}}},
- { 0x1fbb, {1, {0x1f71}}},
- { 0x1fbc, {2, {0x03b1, 0x03b9}}},
- { 0x1fbe, {1, {0x03b9}}},
- { 0x1fc2, {2, {0x1f74, 0x03b9}}},
- { 0x1fc3, {2, {0x03b7, 0x03b9}}},
- { 0x1fc4, {2, {0x03ae, 0x03b9}}},
- { 0x1fc6, {2, {0x03b7, 0x0342}}},
- { 0x1fc7, {3, {0x03b7, 0x0342, 0x03b9}}},
- { 0x1fc8, {1, {0x1f72}}},
- { 0x1fc9, {1, {0x1f73}}},
- { 0x1fca, {1, {0x1f74}}},
- { 0x1fcb, {1, {0x1f75}}},
- { 0x1fcc, {2, {0x03b7, 0x03b9}}},
- { 0x1fd2, {3, {0x03b9, 0x0308, 0x0300}}},
- { 0x1fd3, {3, {0x03b9, 0x0308, 0x0301}}},
- { 0x1fd6, {2, {0x03b9, 0x0342}}},
- { 0x1fd7, {3, {0x03b9, 0x0308, 0x0342}}},
- { 0x1fd8, {1, {0x1fd0}}},
- { 0x1fd9, {1, {0x1fd1}}},
- { 0x1fda, {1, {0x1f76}}},
- { 0x1fdb, {1, {0x1f77}}},
- { 0x1fe2, {3, {0x03c5, 0x0308, 0x0300}}},
- { 0x1fe3, {3, {0x03c5, 0x0308, 0x0301}}},
- { 0x1fe4, {2, {0x03c1, 0x0313}}},
- { 0x1fe6, {2, {0x03c5, 0x0342}}},
- { 0x1fe7, {3, {0x03c5, 0x0308, 0x0342}}},
- { 0x1fe8, {1, {0x1fe0}}},
- { 0x1fe9, {1, {0x1fe1}}},
- { 0x1fea, {1, {0x1f7a}}},
- { 0x1feb, {1, {0x1f7b}}},
- { 0x1fec, {1, {0x1fe5}}},
- { 0x1ff2, {2, {0x1f7c, 0x03b9}}},
- { 0x1ff3, {2, {0x03c9, 0x03b9}}},
- { 0x1ff4, {2, {0x03ce, 0x03b9}}},
- { 0x1ff6, {2, {0x03c9, 0x0342}}},
- { 0x1ff7, {3, {0x03c9, 0x0342, 0x03b9}}},
- { 0x1ff8, {1, {0x1f78}}},
- { 0x1ff9, {1, {0x1f79}}},
- { 0x1ffa, {1, {0x1f7c}}},
- { 0x1ffb, {1, {0x1f7d}}},
- { 0x1ffc, {2, {0x03c9, 0x03b9}}},
- { 0x2126, {1, {0x03c9}}},
- { 0x212a, {1, {0x006b}}},
- { 0x212b, {1, {0x00e5}}},
- { 0x2160, {1, {0x2170}}},
- { 0x2161, {1, {0x2171}}},
- { 0x2162, {1, {0x2172}}},
- { 0x2163, {1, {0x2173}}},
- { 0x2164, {1, {0x2174}}},
- { 0x2165, {1, {0x2175}}},
- { 0x2166, {1, {0x2176}}},
- { 0x2167, {1, {0x2177}}},
- { 0x2168, {1, {0x2178}}},
- { 0x2169, {1, {0x2179}}},
- { 0x216a, {1, {0x217a}}},
- { 0x216b, {1, {0x217b}}},
- { 0x216c, {1, {0x217c}}},
- { 0x216d, {1, {0x217d}}},
- { 0x216e, {1, {0x217e}}},
- { 0x216f, {1, {0x217f}}},
- { 0x24b6, {1, {0x24d0}}},
- { 0x24b7, {1, {0x24d1}}},
- { 0x24b8, {1, {0x24d2}}},
- { 0x24b9, {1, {0x24d3}}},
- { 0x24ba, {1, {0x24d4}}},
- { 0x24bb, {1, {0x24d5}}},
- { 0x24bc, {1, {0x24d6}}},
- { 0x24bd, {1, {0x24d7}}},
- { 0x24be, {1, {0x24d8}}},
- { 0x24bf, {1, {0x24d9}}},
- { 0x24c0, {1, {0x24da}}},
- { 0x24c1, {1, {0x24db}}},
- { 0x24c2, {1, {0x24dc}}},
- { 0x24c3, {1, {0x24dd}}},
- { 0x24c4, {1, {0x24de}}},
- { 0x24c5, {1, {0x24df}}},
- { 0x24c6, {1, {0x24e0}}},
- { 0x24c7, {1, {0x24e1}}},
- { 0x24c8, {1, {0x24e2}}},
- { 0x24c9, {1, {0x24e3}}},
- { 0x24ca, {1, {0x24e4}}},
- { 0x24cb, {1, {0x24e5}}},
- { 0x24cc, {1, {0x24e6}}},
- { 0x24cd, {1, {0x24e7}}},
- { 0x24ce, {1, {0x24e8}}},
- { 0x24cf, {1, {0x24e9}}},
- { 0x2c00, {1, {0x2c30}}},
- { 0x2c01, {1, {0x2c31}}},
- { 0x2c02, {1, {0x2c32}}},
- { 0x2c03, {1, {0x2c33}}},
- { 0x2c04, {1, {0x2c34}}},
- { 0x2c05, {1, {0x2c35}}},
- { 0x2c06, {1, {0x2c36}}},
- { 0x2c07, {1, {0x2c37}}},
- { 0x2c08, {1, {0x2c38}}},
- { 0x2c09, {1, {0x2c39}}},
- { 0x2c0a, {1, {0x2c3a}}},
- { 0x2c0b, {1, {0x2c3b}}},
- { 0x2c0c, {1, {0x2c3c}}},
- { 0x2c0d, {1, {0x2c3d}}},
- { 0x2c0e, {1, {0x2c3e}}},
- { 0x2c0f, {1, {0x2c3f}}},
- { 0x2c10, {1, {0x2c40}}},
- { 0x2c11, {1, {0x2c41}}},
- { 0x2c12, {1, {0x2c42}}},
- { 0x2c13, {1, {0x2c43}}},
- { 0x2c14, {1, {0x2c44}}},
- { 0x2c15, {1, {0x2c45}}},
- { 0x2c16, {1, {0x2c46}}},
- { 0x2c17, {1, {0x2c47}}},
- { 0x2c18, {1, {0x2c48}}},
- { 0x2c19, {1, {0x2c49}}},
- { 0x2c1a, {1, {0x2c4a}}},
- { 0x2c1b, {1, {0x2c4b}}},
- { 0x2c1c, {1, {0x2c4c}}},
- { 0x2c1d, {1, {0x2c4d}}},
- { 0x2c1e, {1, {0x2c4e}}},
- { 0x2c1f, {1, {0x2c4f}}},
- { 0x2c20, {1, {0x2c50}}},
- { 0x2c21, {1, {0x2c51}}},
- { 0x2c22, {1, {0x2c52}}},
- { 0x2c23, {1, {0x2c53}}},
- { 0x2c24, {1, {0x2c54}}},
- { 0x2c25, {1, {0x2c55}}},
- { 0x2c26, {1, {0x2c56}}},
- { 0x2c27, {1, {0x2c57}}},
- { 0x2c28, {1, {0x2c58}}},
- { 0x2c29, {1, {0x2c59}}},
- { 0x2c2a, {1, {0x2c5a}}},
- { 0x2c2b, {1, {0x2c5b}}},
- { 0x2c2c, {1, {0x2c5c}}},
- { 0x2c2d, {1, {0x2c5d}}},
- { 0x2c2e, {1, {0x2c5e}}},
- { 0x2c80, {1, {0x2c81}}},
- { 0x2c82, {1, {0x2c83}}},
- { 0x2c84, {1, {0x2c85}}},
- { 0x2c86, {1, {0x2c87}}},
- { 0x2c88, {1, {0x2c89}}},
- { 0x2c8a, {1, {0x2c8b}}},
- { 0x2c8c, {1, {0x2c8d}}},
- { 0x2c8e, {1, {0x2c8f}}},
- { 0x2c90, {1, {0x2c91}}},
- { 0x2c92, {1, {0x2c93}}},
- { 0x2c94, {1, {0x2c95}}},
- { 0x2c96, {1, {0x2c97}}},
- { 0x2c98, {1, {0x2c99}}},
- { 0x2c9a, {1, {0x2c9b}}},
- { 0x2c9c, {1, {0x2c9d}}},
- { 0x2c9e, {1, {0x2c9f}}},
- { 0x2ca0, {1, {0x2ca1}}},
- { 0x2ca2, {1, {0x2ca3}}},
- { 0x2ca4, {1, {0x2ca5}}},
- { 0x2ca6, {1, {0x2ca7}}},
- { 0x2ca8, {1, {0x2ca9}}},
- { 0x2caa, {1, {0x2cab}}},
- { 0x2cac, {1, {0x2cad}}},
- { 0x2cae, {1, {0x2caf}}},
- { 0x2cb0, {1, {0x2cb1}}},
- { 0x2cb2, {1, {0x2cb3}}},
- { 0x2cb4, {1, {0x2cb5}}},
- { 0x2cb6, {1, {0x2cb7}}},
- { 0x2cb8, {1, {0x2cb9}}},
- { 0x2cba, {1, {0x2cbb}}},
- { 0x2cbc, {1, {0x2cbd}}},
- { 0x2cbe, {1, {0x2cbf}}},
- { 0x2cc0, {1, {0x2cc1}}},
- { 0x2cc2, {1, {0x2cc3}}},
- { 0x2cc4, {1, {0x2cc5}}},
- { 0x2cc6, {1, {0x2cc7}}},
- { 0x2cc8, {1, {0x2cc9}}},
- { 0x2cca, {1, {0x2ccb}}},
- { 0x2ccc, {1, {0x2ccd}}},
- { 0x2cce, {1, {0x2ccf}}},
- { 0x2cd0, {1, {0x2cd1}}},
- { 0x2cd2, {1, {0x2cd3}}},
- { 0x2cd4, {1, {0x2cd5}}},
- { 0x2cd6, {1, {0x2cd7}}},
- { 0x2cd8, {1, {0x2cd9}}},
- { 0x2cda, {1, {0x2cdb}}},
- { 0x2cdc, {1, {0x2cdd}}},
- { 0x2cde, {1, {0x2cdf}}},
- { 0x2ce0, {1, {0x2ce1}}},
- { 0x2ce2, {1, {0x2ce3}}},
- { 0xfb00, {2, {0x0066, 0x0066}}},
- { 0xfb01, {2, {0x0066, 0x0069}}},
- { 0xfb02, {2, {0x0066, 0x006c}}},
- { 0xfb03, {3, {0x0066, 0x0066, 0x0069}}},
- { 0xfb04, {3, {0x0066, 0x0066, 0x006c}}},
- { 0xfb05, {2, {0x0073, 0x0074}}},
- { 0xfb06, {2, {0x0073, 0x0074}}},
- { 0xfb13, {2, {0x0574, 0x0576}}},
- { 0xfb14, {2, {0x0574, 0x0565}}},
- { 0xfb15, {2, {0x0574, 0x056b}}},
- { 0xfb16, {2, {0x057e, 0x0576}}},
- { 0xfb17, {2, {0x0574, 0x056d}}},
- { 0xff21, {1, {0xff41}}},
- { 0xff22, {1, {0xff42}}},
- { 0xff23, {1, {0xff43}}},
- { 0xff24, {1, {0xff44}}},
- { 0xff25, {1, {0xff45}}},
- { 0xff26, {1, {0xff46}}},
- { 0xff27, {1, {0xff47}}},
- { 0xff28, {1, {0xff48}}},
- { 0xff29, {1, {0xff49}}},
- { 0xff2a, {1, {0xff4a}}},
- { 0xff2b, {1, {0xff4b}}},
- { 0xff2c, {1, {0xff4c}}},
- { 0xff2d, {1, {0xff4d}}},
- { 0xff2e, {1, {0xff4e}}},
- { 0xff2f, {1, {0xff4f}}},
- { 0xff30, {1, {0xff50}}},
- { 0xff31, {1, {0xff51}}},
- { 0xff32, {1, {0xff52}}},
- { 0xff33, {1, {0xff53}}},
- { 0xff34, {1, {0xff54}}},
- { 0xff35, {1, {0xff55}}},
- { 0xff36, {1, {0xff56}}},
- { 0xff37, {1, {0xff57}}},
- { 0xff38, {1, {0xff58}}},
- { 0xff39, {1, {0xff59}}},
- { 0xff3a, {1, {0xff5a}}},
- { 0x10400, {1, {0x10428}}},
- { 0x10401, {1, {0x10429}}},
- { 0x10402, {1, {0x1042a}}},
- { 0x10403, {1, {0x1042b}}},
- { 0x10404, {1, {0x1042c}}},
- { 0x10405, {1, {0x1042d}}},
- { 0x10406, {1, {0x1042e}}},
- { 0x10407, {1, {0x1042f}}},
- { 0x10408, {1, {0x10430}}},
- { 0x10409, {1, {0x10431}}},
- { 0x1040a, {1, {0x10432}}},
- { 0x1040b, {1, {0x10433}}},
- { 0x1040c, {1, {0x10434}}},
- { 0x1040d, {1, {0x10435}}},
- { 0x1040e, {1, {0x10436}}},
- { 0x1040f, {1, {0x10437}}},
- { 0x10410, {1, {0x10438}}},
- { 0x10411, {1, {0x10439}}},
- { 0x10412, {1, {0x1043a}}},
- { 0x10413, {1, {0x1043b}}},
- { 0x10414, {1, {0x1043c}}},
- { 0x10415, {1, {0x1043d}}},
- { 0x10416, {1, {0x1043e}}},
- { 0x10417, {1, {0x1043f}}},
- { 0x10418, {1, {0x10440}}},
- { 0x10419, {1, {0x10441}}},
- { 0x1041a, {1, {0x10442}}},
- { 0x1041b, {1, {0x10443}}},
- { 0x1041c, {1, {0x10444}}},
- { 0x1041d, {1, {0x10445}}},
- { 0x1041e, {1, {0x10446}}},
- { 0x1041f, {1, {0x10447}}},
- { 0x10420, {1, {0x10448}}},
- { 0x10421, {1, {0x10449}}},
- { 0x10422, {1, {0x1044a}}},
- { 0x10423, {1, {0x1044b}}},
- { 0x10424, {1, {0x1044c}}},
- { 0x10425, {1, {0x1044d}}},
- { 0x10426, {1, {0x1044e}}},
- { 0x10427, {1, {0x1044f}}}
-};
-
-static const CaseFold_11_Type CaseFold_Locale[] = {
- { 0x0049, {1, {0x0069}}},
- { 0x0130, {2, {0x0069, 0x0307}}}
-};
-
-static const CaseUnfold_11_Type CaseUnfold_11[] = {
- { 0x0061, {1, {0x0041 }}},
- { 0x0062, {1, {0x0042 }}},
- { 0x0063, {1, {0x0043 }}},
- { 0x0064, {1, {0x0044 }}},
- { 0x0065, {1, {0x0045 }}},
- { 0x0066, {1, {0x0046 }}},
- { 0x0067, {1, {0x0047 }}},
- { 0x0068, {1, {0x0048 }}},
- { 0x006a, {1, {0x004a }}},
- { 0x006b, {2, {0x212a, 0x004b }}},
- { 0x006c, {1, {0x004c }}},
- { 0x006d, {1, {0x004d }}},
- { 0x006e, {1, {0x004e }}},
- { 0x006f, {1, {0x004f }}},
- { 0x0070, {1, {0x0050 }}},
- { 0x0071, {1, {0x0051 }}},
- { 0x0072, {1, {0x0052 }}},
- { 0x0073, {2, {0x0053, 0x017f }}},
- { 0x0074, {1, {0x0054 }}},
- { 0x0075, {1, {0x0055 }}},
- { 0x0076, {1, {0x0056 }}},
- { 0x0077, {1, {0x0057 }}},
- { 0x0078, {1, {0x0058 }}},
- { 0x0079, {1, {0x0059 }}},
- { 0x007a, {1, {0x005a }}},
- { 0x00e0, {1, {0x00c0 }}},
- { 0x00e1, {1, {0x00c1 }}},
- { 0x00e2, {1, {0x00c2 }}},
- { 0x00e3, {1, {0x00c3 }}},
- { 0x00e4, {1, {0x00c4 }}},
- { 0x00e5, {2, {0x212b, 0x00c5 }}},
- { 0x00e6, {1, {0x00c6 }}},
- { 0x00e7, {1, {0x00c7 }}},
- { 0x00e8, {1, {0x00c8 }}},
- { 0x00e9, {1, {0x00c9 }}},
- { 0x00ea, {1, {0x00ca }}},
- { 0x00eb, {1, {0x00cb }}},
- { 0x00ec, {1, {0x00cc }}},
- { 0x00ed, {1, {0x00cd }}},
- { 0x00ee, {1, {0x00ce }}},
- { 0x00ef, {1, {0x00cf }}},
- { 0x00f0, {1, {0x00d0 }}},
- { 0x00f1, {1, {0x00d1 }}},
- { 0x00f2, {1, {0x00d2 }}},
- { 0x00f3, {1, {0x00d3 }}},
- { 0x00f4, {1, {0x00d4 }}},
- { 0x00f5, {1, {0x00d5 }}},
- { 0x00f6, {1, {0x00d6 }}},
- { 0x00f8, {1, {0x00d8 }}},
- { 0x00f9, {1, {0x00d9 }}},
- { 0x00fa, {1, {0x00da }}},
- { 0x00fb, {1, {0x00db }}},
- { 0x00fc, {1, {0x00dc }}},
- { 0x00fd, {1, {0x00dd }}},
- { 0x00fe, {1, {0x00de }}},
- { 0x00ff, {1, {0x0178 }}},
- { 0x0101, {1, {0x0100 }}},
- { 0x0103, {1, {0x0102 }}},
- { 0x0105, {1, {0x0104 }}},
- { 0x0107, {1, {0x0106 }}},
- { 0x0109, {1, {0x0108 }}},
- { 0x010b, {1, {0x010a }}},
- { 0x010d, {1, {0x010c }}},
- { 0x010f, {1, {0x010e }}},
- { 0x0111, {1, {0x0110 }}},
- { 0x0113, {1, {0x0112 }}},
- { 0x0115, {1, {0x0114 }}},
- { 0x0117, {1, {0x0116 }}},
- { 0x0119, {1, {0x0118 }}},
- { 0x011b, {1, {0x011a }}},
- { 0x011d, {1, {0x011c }}},
- { 0x011f, {1, {0x011e }}},
- { 0x0121, {1, {0x0120 }}},
- { 0x0123, {1, {0x0122 }}},
- { 0x0125, {1, {0x0124 }}},
- { 0x0127, {1, {0x0126 }}},
- { 0x0129, {1, {0x0128 }}},
- { 0x012b, {1, {0x012a }}},
- { 0x012d, {1, {0x012c }}},
- { 0x012f, {1, {0x012e }}},
- { 0x0133, {1, {0x0132 }}},
- { 0x0135, {1, {0x0134 }}},
- { 0x0137, {1, {0x0136 }}},
- { 0x013a, {1, {0x0139 }}},
- { 0x013c, {1, {0x013b }}},
- { 0x013e, {1, {0x013d }}},
- { 0x0140, {1, {0x013f }}},
- { 0x0142, {1, {0x0141 }}},
- { 0x0144, {1, {0x0143 }}},
- { 0x0146, {1, {0x0145 }}},
- { 0x0148, {1, {0x0147 }}},
- { 0x014b, {1, {0x014a }}},
- { 0x014d, {1, {0x014c }}},
- { 0x014f, {1, {0x014e }}},
- { 0x0151, {1, {0x0150 }}},
- { 0x0153, {1, {0x0152 }}},
- { 0x0155, {1, {0x0154 }}},
- { 0x0157, {1, {0x0156 }}},
- { 0x0159, {1, {0x0158 }}},
- { 0x015b, {1, {0x015a }}},
- { 0x015d, {1, {0x015c }}},
- { 0x015f, {1, {0x015e }}},
- { 0x0161, {1, {0x0160 }}},
- { 0x0163, {1, {0x0162 }}},
- { 0x0165, {1, {0x0164 }}},
- { 0x0167, {1, {0x0166 }}},
- { 0x0169, {1, {0x0168 }}},
- { 0x016b, {1, {0x016a }}},
- { 0x016d, {1, {0x016c }}},
- { 0x016f, {1, {0x016e }}},
- { 0x0171, {1, {0x0170 }}},
- { 0x0173, {1, {0x0172 }}},
- { 0x0175, {1, {0x0174 }}},
- { 0x0177, {1, {0x0176 }}},
- { 0x017a, {1, {0x0179 }}},
- { 0x017c, {1, {0x017b }}},
- { 0x017e, {1, {0x017d }}},
- { 0x0183, {1, {0x0182 }}},
- { 0x0185, {1, {0x0184 }}},
- { 0x0188, {1, {0x0187 }}},
- { 0x018c, {1, {0x018b }}},
- { 0x0192, {1, {0x0191 }}},
- { 0x0195, {1, {0x01f6 }}},
- { 0x0199, {1, {0x0198 }}},
- { 0x019a, {1, {0x023d }}},
- { 0x019e, {1, {0x0220 }}},
- { 0x01a1, {1, {0x01a0 }}},
- { 0x01a3, {1, {0x01a2 }}},
- { 0x01a5, {1, {0x01a4 }}},
- { 0x01a8, {1, {0x01a7 }}},
- { 0x01ad, {1, {0x01ac }}},
- { 0x01b0, {1, {0x01af }}},
- { 0x01b4, {1, {0x01b3 }}},
- { 0x01b6, {1, {0x01b5 }}},
- { 0x01b9, {1, {0x01b8 }}},
- { 0x01bd, {1, {0x01bc }}},
- { 0x01bf, {1, {0x01f7 }}},
- { 0x01c6, {2, {0x01c4, 0x01c5 }}},
- { 0x01c9, {2, {0x01c7, 0x01c8 }}},
- { 0x01cc, {2, {0x01ca, 0x01cb }}},
- { 0x01ce, {1, {0x01cd }}},
- { 0x01d0, {1, {0x01cf }}},
- { 0x01d2, {1, {0x01d1 }}},
- { 0x01d4, {1, {0x01d3 }}},
- { 0x01d6, {1, {0x01d5 }}},
- { 0x01d8, {1, {0x01d7 }}},
- { 0x01da, {1, {0x01d9 }}},
- { 0x01dc, {1, {0x01db }}},
- { 0x01dd, {1, {0x018e }}},
- { 0x01df, {1, {0x01de }}},
- { 0x01e1, {1, {0x01e0 }}},
- { 0x01e3, {1, {0x01e2 }}},
- { 0x01e5, {1, {0x01e4 }}},
- { 0x01e7, {1, {0x01e6 }}},
- { 0x01e9, {1, {0x01e8 }}},
- { 0x01eb, {1, {0x01ea }}},
- { 0x01ed, {1, {0x01ec }}},
- { 0x01ef, {1, {0x01ee }}},
- { 0x01f3, {2, {0x01f1, 0x01f2 }}},
- { 0x01f5, {1, {0x01f4 }}},
- { 0x01f9, {1, {0x01f8 }}},
- { 0x01fb, {1, {0x01fa }}},
- { 0x01fd, {1, {0x01fc }}},
- { 0x01ff, {1, {0x01fe }}},
- { 0x0201, {1, {0x0200 }}},
- { 0x0203, {1, {0x0202 }}},
- { 0x0205, {1, {0x0204 }}},
- { 0x0207, {1, {0x0206 }}},
- { 0x0209, {1, {0x0208 }}},
- { 0x020b, {1, {0x020a }}},
- { 0x020d, {1, {0x020c }}},
- { 0x020f, {1, {0x020e }}},
- { 0x0211, {1, {0x0210 }}},
- { 0x0213, {1, {0x0212 }}},
- { 0x0215, {1, {0x0214 }}},
- { 0x0217, {1, {0x0216 }}},
- { 0x0219, {1, {0x0218 }}},
- { 0x021b, {1, {0x021a }}},
- { 0x021d, {1, {0x021c }}},
- { 0x021f, {1, {0x021e }}},
- { 0x0223, {1, {0x0222 }}},
- { 0x0225, {1, {0x0224 }}},
- { 0x0227, {1, {0x0226 }}},
- { 0x0229, {1, {0x0228 }}},
- { 0x022b, {1, {0x022a }}},
- { 0x022d, {1, {0x022c }}},
- { 0x022f, {1, {0x022e }}},
- { 0x0231, {1, {0x0230 }}},
- { 0x0233, {1, {0x0232 }}},
- { 0x023c, {1, {0x023b }}},
- { 0x0253, {1, {0x0181 }}},
- { 0x0254, {1, {0x0186 }}},
- { 0x0256, {1, {0x0189 }}},
- { 0x0257, {1, {0x018a }}},
- { 0x0259, {1, {0x018f }}},
- { 0x025b, {1, {0x0190 }}},
- { 0x0260, {1, {0x0193 }}},
- { 0x0263, {1, {0x0194 }}},
- { 0x0268, {1, {0x0197 }}},
- { 0x0269, {1, {0x0196 }}},
- { 0x026f, {1, {0x019c }}},
- { 0x0272, {1, {0x019d }}},
- { 0x0275, {1, {0x019f }}},
- { 0x0280, {1, {0x01a6 }}},
- { 0x0283, {1, {0x01a9 }}},
- { 0x0288, {1, {0x01ae }}},
- { 0x028a, {1, {0x01b1 }}},
- { 0x028b, {1, {0x01b2 }}},
- { 0x0292, {1, {0x01b7 }}},
- { 0x0294, {1, {0x0241 }}},
- { 0x03ac, {1, {0x0386 }}},
- { 0x03ad, {1, {0x0388 }}},
- { 0x03ae, {1, {0x0389 }}},
- { 0x03af, {1, {0x038a }}},
- { 0x03b1, {1, {0x0391 }}},
- { 0x03b2, {2, {0x0392, 0x03d0 }}},
- { 0x03b3, {1, {0x0393 }}},
- { 0x03b4, {1, {0x0394 }}},
- { 0x03b5, {2, {0x03f5, 0x0395 }}},
- { 0x03b6, {1, {0x0396 }}},
- { 0x03b7, {1, {0x0397 }}},
- { 0x03b8, {3, {0x03f4, 0x0398, 0x03d1 }}},
- { 0x03b9, {3, {0x1fbe, 0x0399, 0x0345 }}},
- { 0x03ba, {2, {0x03f0, 0x039a }}},
- { 0x03bb, {1, {0x039b }}},
- { 0x03bc, {2, {0x00b5, 0x039c }}},
- { 0x03bd, {1, {0x039d }}},
- { 0x03be, {1, {0x039e }}},
- { 0x03bf, {1, {0x039f }}},
- { 0x03c0, {2, {0x03a0, 0x03d6 }}},
- { 0x03c1, {2, {0x03f1, 0x03a1 }}},
- { 0x03c3, {2, {0x03a3, 0x03c2 }}},
- { 0x03c4, {1, {0x03a4 }}},
- { 0x03c5, {1, {0x03a5 }}},
- { 0x03c6, {2, {0x03a6, 0x03d5 }}},
- { 0x03c7, {1, {0x03a7 }}},
- { 0x03c8, {1, {0x03a8 }}},
- { 0x03c9, {2, {0x03a9, 0x2126 }}},
- { 0x03ca, {1, {0x03aa }}},
- { 0x03cb, {1, {0x03ab }}},
- { 0x03cc, {1, {0x038c }}},
- { 0x03cd, {1, {0x038e }}},
- { 0x03ce, {1, {0x038f }}},
- { 0x03d9, {1, {0x03d8 }}},
- { 0x03db, {1, {0x03da }}},
- { 0x03dd, {1, {0x03dc }}},
- { 0x03df, {1, {0x03de }}},
- { 0x03e1, {1, {0x03e0 }}},
- { 0x03e3, {1, {0x03e2 }}},
- { 0x03e5, {1, {0x03e4 }}},
- { 0x03e7, {1, {0x03e6 }}},
- { 0x03e9, {1, {0x03e8 }}},
- { 0x03eb, {1, {0x03ea }}},
- { 0x03ed, {1, {0x03ec }}},
- { 0x03ef, {1, {0x03ee }}},
- { 0x03f2, {1, {0x03f9 }}},
- { 0x03f8, {1, {0x03f7 }}},
- { 0x03fb, {1, {0x03fa }}},
- { 0x0430, {1, {0x0410 }}},
- { 0x0431, {1, {0x0411 }}},
- { 0x0432, {1, {0x0412 }}},
- { 0x0433, {1, {0x0413 }}},
- { 0x0434, {1, {0x0414 }}},
- { 0x0435, {1, {0x0415 }}},
- { 0x0436, {1, {0x0416 }}},
- { 0x0437, {1, {0x0417 }}},
- { 0x0438, {1, {0x0418 }}},
- { 0x0439, {1, {0x0419 }}},
- { 0x043a, {1, {0x041a }}},
- { 0x043b, {1, {0x041b }}},
- { 0x043c, {1, {0x041c }}},
- { 0x043d, {1, {0x041d }}},
- { 0x043e, {1, {0x041e }}},
- { 0x043f, {1, {0x041f }}},
- { 0x0440, {1, {0x0420 }}},
- { 0x0441, {1, {0x0421 }}},
- { 0x0442, {1, {0x0422 }}},
- { 0x0443, {1, {0x0423 }}},
- { 0x0444, {1, {0x0424 }}},
- { 0x0445, {1, {0x0425 }}},
- { 0x0446, {1, {0x0426 }}},
- { 0x0447, {1, {0x0427 }}},
- { 0x0448, {1, {0x0428 }}},
- { 0x0449, {1, {0x0429 }}},
- { 0x044a, {1, {0x042a }}},
- { 0x044b, {1, {0x042b }}},
- { 0x044c, {1, {0x042c }}},
- { 0x044d, {1, {0x042d }}},
- { 0x044e, {1, {0x042e }}},
- { 0x044f, {1, {0x042f }}},
- { 0x0450, {1, {0x0400 }}},
- { 0x0451, {1, {0x0401 }}},
- { 0x0452, {1, {0x0402 }}},
- { 0x0453, {1, {0x0403 }}},
- { 0x0454, {1, {0x0404 }}},
- { 0x0455, {1, {0x0405 }}},
- { 0x0456, {1, {0x0406 }}},
- { 0x0457, {1, {0x0407 }}},
- { 0x0458, {1, {0x0408 }}},
- { 0x0459, {1, {0x0409 }}},
- { 0x045a, {1, {0x040a }}},
- { 0x045b, {1, {0x040b }}},
- { 0x045c, {1, {0x040c }}},
- { 0x045d, {1, {0x040d }}},
- { 0x045e, {1, {0x040e }}},
- { 0x045f, {1, {0x040f }}},
- { 0x0461, {1, {0x0460 }}},
- { 0x0463, {1, {0x0462 }}},
- { 0x0465, {1, {0x0464 }}},
- { 0x0467, {1, {0x0466 }}},
- { 0x0469, {1, {0x0468 }}},
- { 0x046b, {1, {0x046a }}},
- { 0x046d, {1, {0x046c }}},
- { 0x046f, {1, {0x046e }}},
- { 0x0471, {1, {0x0470 }}},
- { 0x0473, {1, {0x0472 }}},
- { 0x0475, {1, {0x0474 }}},
- { 0x0477, {1, {0x0476 }}},
- { 0x0479, {1, {0x0478 }}},
- { 0x047b, {1, {0x047a }}},
- { 0x047d, {1, {0x047c }}},
- { 0x047f, {1, {0x047e }}},
- { 0x0481, {1, {0x0480 }}},
- { 0x048b, {1, {0x048a }}},
- { 0x048d, {1, {0x048c }}},
- { 0x048f, {1, {0x048e }}},
- { 0x0491, {1, {0x0490 }}},
- { 0x0493, {1, {0x0492 }}},
- { 0x0495, {1, {0x0494 }}},
- { 0x0497, {1, {0x0496 }}},
- { 0x0499, {1, {0x0498 }}},
- { 0x049b, {1, {0x049a }}},
- { 0x049d, {1, {0x049c }}},
- { 0x049f, {1, {0x049e }}},
- { 0x04a1, {1, {0x04a0 }}},
- { 0x04a3, {1, {0x04a2 }}},
- { 0x04a5, {1, {0x04a4 }}},
- { 0x04a7, {1, {0x04a6 }}},
- { 0x04a9, {1, {0x04a8 }}},
- { 0x04ab, {1, {0x04aa }}},
- { 0x04ad, {1, {0x04ac }}},
- { 0x04af, {1, {0x04ae }}},
- { 0x04b1, {1, {0x04b0 }}},
- { 0x04b3, {1, {0x04b2 }}},
- { 0x04b5, {1, {0x04b4 }}},
- { 0x04b7, {1, {0x04b6 }}},
- { 0x04b9, {1, {0x04b8 }}},
- { 0x04bb, {1, {0x04ba }}},
- { 0x04bd, {1, {0x04bc }}},
- { 0x04bf, {1, {0x04be }}},
- { 0x04c2, {1, {0x04c1 }}},
- { 0x04c4, {1, {0x04c3 }}},
- { 0x04c6, {1, {0x04c5 }}},
- { 0x04c8, {1, {0x04c7 }}},
- { 0x04ca, {1, {0x04c9 }}},
- { 0x04cc, {1, {0x04cb }}},
- { 0x04ce, {1, {0x04cd }}},
- { 0x04d1, {1, {0x04d0 }}},
- { 0x04d3, {1, {0x04d2 }}},
- { 0x04d5, {1, {0x04d4 }}},
- { 0x04d7, {1, {0x04d6 }}},
- { 0x04d9, {1, {0x04d8 }}},
- { 0x04db, {1, {0x04da }}},
- { 0x04dd, {1, {0x04dc }}},
- { 0x04df, {1, {0x04de }}},
- { 0x04e1, {1, {0x04e0 }}},
- { 0x04e3, {1, {0x04e2 }}},
- { 0x04e5, {1, {0x04e4 }}},
- { 0x04e7, {1, {0x04e6 }}},
- { 0x04e9, {1, {0x04e8 }}},
- { 0x04eb, {1, {0x04ea }}},
- { 0x04ed, {1, {0x04ec }}},
- { 0x04ef, {1, {0x04ee }}},
- { 0x04f1, {1, {0x04f0 }}},
- { 0x04f3, {1, {0x04f2 }}},
- { 0x04f5, {1, {0x04f4 }}},
- { 0x04f7, {1, {0x04f6 }}},
- { 0x04f9, {1, {0x04f8 }}},
- { 0x0501, {1, {0x0500 }}},
- { 0x0503, {1, {0x0502 }}},
- { 0x0505, {1, {0x0504 }}},
- { 0x0507, {1, {0x0506 }}},
- { 0x0509, {1, {0x0508 }}},
- { 0x050b, {1, {0x050a }}},
- { 0x050d, {1, {0x050c }}},
- { 0x050f, {1, {0x050e }}},
- { 0x0561, {1, {0x0531 }}},
- { 0x0562, {1, {0x0532 }}},
- { 0x0563, {1, {0x0533 }}},
- { 0x0564, {1, {0x0534 }}},
- { 0x0565, {1, {0x0535 }}},
- { 0x0566, {1, {0x0536 }}},
- { 0x0567, {1, {0x0537 }}},
- { 0x0568, {1, {0x0538 }}},
- { 0x0569, {1, {0x0539 }}},
- { 0x056a, {1, {0x053a }}},
- { 0x056b, {1, {0x053b }}},
- { 0x056c, {1, {0x053c }}},
- { 0x056d, {1, {0x053d }}},
- { 0x056e, {1, {0x053e }}},
- { 0x056f, {1, {0x053f }}},
- { 0x0570, {1, {0x0540 }}},
- { 0x0571, {1, {0x0541 }}},
- { 0x0572, {1, {0x0542 }}},
- { 0x0573, {1, {0x0543 }}},
- { 0x0574, {1, {0x0544 }}},
- { 0x0575, {1, {0x0545 }}},
- { 0x0576, {1, {0x0546 }}},
- { 0x0577, {1, {0x0547 }}},
- { 0x0578, {1, {0x0548 }}},
- { 0x0579, {1, {0x0549 }}},
- { 0x057a, {1, {0x054a }}},
- { 0x057b, {1, {0x054b }}},
- { 0x057c, {1, {0x054c }}},
- { 0x057d, {1, {0x054d }}},
- { 0x057e, {1, {0x054e }}},
- { 0x057f, {1, {0x054f }}},
- { 0x0580, {1, {0x0550 }}},
- { 0x0581, {1, {0x0551 }}},
- { 0x0582, {1, {0x0552 }}},
- { 0x0583, {1, {0x0553 }}},
- { 0x0584, {1, {0x0554 }}},
- { 0x0585, {1, {0x0555 }}},
- { 0x0586, {1, {0x0556 }}},
- { 0x1e01, {1, {0x1e00 }}},
- { 0x1e03, {1, {0x1e02 }}},
- { 0x1e05, {1, {0x1e04 }}},
- { 0x1e07, {1, {0x1e06 }}},
- { 0x1e09, {1, {0x1e08 }}},
- { 0x1e0b, {1, {0x1e0a }}},
- { 0x1e0d, {1, {0x1e0c }}},
- { 0x1e0f, {1, {0x1e0e }}},
- { 0x1e11, {1, {0x1e10 }}},
- { 0x1e13, {1, {0x1e12 }}},
- { 0x1e15, {1, {0x1e14 }}},
- { 0x1e17, {1, {0x1e16 }}},
- { 0x1e19, {1, {0x1e18 }}},
- { 0x1e1b, {1, {0x1e1a }}},
- { 0x1e1d, {1, {0x1e1c }}},
- { 0x1e1f, {1, {0x1e1e }}},
- { 0x1e21, {1, {0x1e20 }}},
- { 0x1e23, {1, {0x1e22 }}},
- { 0x1e25, {1, {0x1e24 }}},
- { 0x1e27, {1, {0x1e26 }}},
- { 0x1e29, {1, {0x1e28 }}},
- { 0x1e2b, {1, {0x1e2a }}},
- { 0x1e2d, {1, {0x1e2c }}},
- { 0x1e2f, {1, {0x1e2e }}},
- { 0x1e31, {1, {0x1e30 }}},
- { 0x1e33, {1, {0x1e32 }}},
- { 0x1e35, {1, {0x1e34 }}},
- { 0x1e37, {1, {0x1e36 }}},
- { 0x1e39, {1, {0x1e38 }}},
- { 0x1e3b, {1, {0x1e3a }}},
- { 0x1e3d, {1, {0x1e3c }}},
- { 0x1e3f, {1, {0x1e3e }}},
- { 0x1e41, {1, {0x1e40 }}},
- { 0x1e43, {1, {0x1e42 }}},
- { 0x1e45, {1, {0x1e44 }}},
- { 0x1e47, {1, {0x1e46 }}},
- { 0x1e49, {1, {0x1e48 }}},
- { 0x1e4b, {1, {0x1e4a }}},
- { 0x1e4d, {1, {0x1e4c }}},
- { 0x1e4f, {1, {0x1e4e }}},
- { 0x1e51, {1, {0x1e50 }}},
- { 0x1e53, {1, {0x1e52 }}},
- { 0x1e55, {1, {0x1e54 }}},
- { 0x1e57, {1, {0x1e56 }}},
- { 0x1e59, {1, {0x1e58 }}},
- { 0x1e5b, {1, {0x1e5a }}},
- { 0x1e5d, {1, {0x1e5c }}},
- { 0x1e5f, {1, {0x1e5e }}},
- { 0x1e61, {2, {0x1e9b, 0x1e60 }}},
- { 0x1e63, {1, {0x1e62 }}},
- { 0x1e65, {1, {0x1e64 }}},
- { 0x1e67, {1, {0x1e66 }}},
- { 0x1e69, {1, {0x1e68 }}},
- { 0x1e6b, {1, {0x1e6a }}},
- { 0x1e6d, {1, {0x1e6c }}},
- { 0x1e6f, {1, {0x1e6e }}},
- { 0x1e71, {1, {0x1e70 }}},
- { 0x1e73, {1, {0x1e72 }}},
- { 0x1e75, {1, {0x1e74 }}},
- { 0x1e77, {1, {0x1e76 }}},
- { 0x1e79, {1, {0x1e78 }}},
- { 0x1e7b, {1, {0x1e7a }}},
- { 0x1e7d, {1, {0x1e7c }}},
- { 0x1e7f, {1, {0x1e7e }}},
- { 0x1e81, {1, {0x1e80 }}},
- { 0x1e83, {1, {0x1e82 }}},
- { 0x1e85, {1, {0x1e84 }}},
- { 0x1e87, {1, {0x1e86 }}},
- { 0x1e89, {1, {0x1e88 }}},
- { 0x1e8b, {1, {0x1e8a }}},
- { 0x1e8d, {1, {0x1e8c }}},
- { 0x1e8f, {1, {0x1e8e }}},
- { 0x1e91, {1, {0x1e90 }}},
- { 0x1e93, {1, {0x1e92 }}},
- { 0x1e95, {1, {0x1e94 }}},
- { 0x1ea1, {1, {0x1ea0 }}},
- { 0x1ea3, {1, {0x1ea2 }}},
- { 0x1ea5, {1, {0x1ea4 }}},
- { 0x1ea7, {1, {0x1ea6 }}},
- { 0x1ea9, {1, {0x1ea8 }}},
- { 0x1eab, {1, {0x1eaa }}},
- { 0x1ead, {1, {0x1eac }}},
- { 0x1eaf, {1, {0x1eae }}},
- { 0x1eb1, {1, {0x1eb0 }}},
- { 0x1eb3, {1, {0x1eb2 }}},
- { 0x1eb5, {1, {0x1eb4 }}},
- { 0x1eb7, {1, {0x1eb6 }}},
- { 0x1eb9, {1, {0x1eb8 }}},
- { 0x1ebb, {1, {0x1eba }}},
- { 0x1ebd, {1, {0x1ebc }}},
- { 0x1ebf, {1, {0x1ebe }}},
- { 0x1ec1, {1, {0x1ec0 }}},
- { 0x1ec3, {1, {0x1ec2 }}},
- { 0x1ec5, {1, {0x1ec4 }}},
- { 0x1ec7, {1, {0x1ec6 }}},
- { 0x1ec9, {1, {0x1ec8 }}},
- { 0x1ecb, {1, {0x1eca }}},
- { 0x1ecd, {1, {0x1ecc }}},
- { 0x1ecf, {1, {0x1ece }}},
- { 0x1ed1, {1, {0x1ed0 }}},
- { 0x1ed3, {1, {0x1ed2 }}},
- { 0x1ed5, {1, {0x1ed4 }}},
- { 0x1ed7, {1, {0x1ed6 }}},
- { 0x1ed9, {1, {0x1ed8 }}},
- { 0x1edb, {1, {0x1eda }}},
- { 0x1edd, {1, {0x1edc }}},
- { 0x1edf, {1, {0x1ede }}},
- { 0x1ee1, {1, {0x1ee0 }}},
- { 0x1ee3, {1, {0x1ee2 }}},
- { 0x1ee5, {1, {0x1ee4 }}},
- { 0x1ee7, {1, {0x1ee6 }}},
- { 0x1ee9, {1, {0x1ee8 }}},
- { 0x1eeb, {1, {0x1eea }}},
- { 0x1eed, {1, {0x1eec }}},
- { 0x1eef, {1, {0x1eee }}},
- { 0x1ef1, {1, {0x1ef0 }}},
- { 0x1ef3, {1, {0x1ef2 }}},
- { 0x1ef5, {1, {0x1ef4 }}},
- { 0x1ef7, {1, {0x1ef6 }}},
- { 0x1ef9, {1, {0x1ef8 }}},
- { 0x1f00, {1, {0x1f08 }}},
- { 0x1f01, {1, {0x1f09 }}},
- { 0x1f02, {1, {0x1f0a }}},
- { 0x1f03, {1, {0x1f0b }}},
- { 0x1f04, {1, {0x1f0c }}},
- { 0x1f05, {1, {0x1f0d }}},
- { 0x1f06, {1, {0x1f0e }}},
- { 0x1f07, {1, {0x1f0f }}},
- { 0x1f10, {1, {0x1f18 }}},
- { 0x1f11, {1, {0x1f19 }}},
- { 0x1f12, {1, {0x1f1a }}},
- { 0x1f13, {1, {0x1f1b }}},
- { 0x1f14, {1, {0x1f1c }}},
- { 0x1f15, {1, {0x1f1d }}},
- { 0x1f20, {1, {0x1f28 }}},
- { 0x1f21, {1, {0x1f29 }}},
- { 0x1f22, {1, {0x1f2a }}},
- { 0x1f23, {1, {0x1f2b }}},
- { 0x1f24, {1, {0x1f2c }}},
- { 0x1f25, {1, {0x1f2d }}},
- { 0x1f26, {1, {0x1f2e }}},
- { 0x1f27, {1, {0x1f2f }}},
- { 0x1f30, {1, {0x1f38 }}},
- { 0x1f31, {1, {0x1f39 }}},
- { 0x1f32, {1, {0x1f3a }}},
- { 0x1f33, {1, {0x1f3b }}},
- { 0x1f34, {1, {0x1f3c }}},
- { 0x1f35, {1, {0x1f3d }}},
- { 0x1f36, {1, {0x1f3e }}},
- { 0x1f37, {1, {0x1f3f }}},
- { 0x1f40, {1, {0x1f48 }}},
- { 0x1f41, {1, {0x1f49 }}},
- { 0x1f42, {1, {0x1f4a }}},
- { 0x1f43, {1, {0x1f4b }}},
- { 0x1f44, {1, {0x1f4c }}},
- { 0x1f45, {1, {0x1f4d }}},
- { 0x1f51, {1, {0x1f59 }}},
- { 0x1f53, {1, {0x1f5b }}},
- { 0x1f55, {1, {0x1f5d }}},
- { 0x1f57, {1, {0x1f5f }}},
- { 0x1f60, {1, {0x1f68 }}},
- { 0x1f61, {1, {0x1f69 }}},
- { 0x1f62, {1, {0x1f6a }}},
- { 0x1f63, {1, {0x1f6b }}},
- { 0x1f64, {1, {0x1f6c }}},
- { 0x1f65, {1, {0x1f6d }}},
- { 0x1f66, {1, {0x1f6e }}},
- { 0x1f67, {1, {0x1f6f }}},
- { 0x1f70, {1, {0x1fba }}},
- { 0x1f71, {1, {0x1fbb }}},
- { 0x1f72, {1, {0x1fc8 }}},
- { 0x1f73, {1, {0x1fc9 }}},
- { 0x1f74, {1, {0x1fca }}},
- { 0x1f75, {1, {0x1fcb }}},
- { 0x1f76, {1, {0x1fda }}},
- { 0x1f77, {1, {0x1fdb }}},
- { 0x1f78, {1, {0x1ff8 }}},
- { 0x1f79, {1, {0x1ff9 }}},
- { 0x1f7a, {1, {0x1fea }}},
- { 0x1f7b, {1, {0x1feb }}},
- { 0x1f7c, {1, {0x1ffa }}},
- { 0x1f7d, {1, {0x1ffb }}},
- { 0x1fb0, {1, {0x1fb8 }}},
- { 0x1fb1, {1, {0x1fb9 }}},
- { 0x1fd0, {1, {0x1fd8 }}},
- { 0x1fd1, {1, {0x1fd9 }}},
- { 0x1fe0, {1, {0x1fe8 }}},
- { 0x1fe1, {1, {0x1fe9 }}},
- { 0x1fe5, {1, {0x1fec }}},
- { 0x2170, {1, {0x2160 }}},
- { 0x2171, {1, {0x2161 }}},
- { 0x2172, {1, {0x2162 }}},
- { 0x2173, {1, {0x2163 }}},
- { 0x2174, {1, {0x2164 }}},
- { 0x2175, {1, {0x2165 }}},
- { 0x2176, {1, {0x2166 }}},
- { 0x2177, {1, {0x2167 }}},
- { 0x2178, {1, {0x2168 }}},
- { 0x2179, {1, {0x2169 }}},
- { 0x217a, {1, {0x216a }}},
- { 0x217b, {1, {0x216b }}},
- { 0x217c, {1, {0x216c }}},
- { 0x217d, {1, {0x216d }}},
- { 0x217e, {1, {0x216e }}},
- { 0x217f, {1, {0x216f }}},
- { 0x24d0, {1, {0x24b6 }}},
- { 0x24d1, {1, {0x24b7 }}},
- { 0x24d2, {1, {0x24b8 }}},
- { 0x24d3, {1, {0x24b9 }}},
- { 0x24d4, {1, {0x24ba }}},
- { 0x24d5, {1, {0x24bb }}},
- { 0x24d6, {1, {0x24bc }}},
- { 0x24d7, {1, {0x24bd }}},
- { 0x24d8, {1, {0x24be }}},
- { 0x24d9, {1, {0x24bf }}},
- { 0x24da, {1, {0x24c0 }}},
- { 0x24db, {1, {0x24c1 }}},
- { 0x24dc, {1, {0x24c2 }}},
- { 0x24dd, {1, {0x24c3 }}},
- { 0x24de, {1, {0x24c4 }}},
- { 0x24df, {1, {0x24c5 }}},
- { 0x24e0, {1, {0x24c6 }}},
- { 0x24e1, {1, {0x24c7 }}},
- { 0x24e2, {1, {0x24c8 }}},
- { 0x24e3, {1, {0x24c9 }}},
- { 0x24e4, {1, {0x24ca }}},
- { 0x24e5, {1, {0x24cb }}},
- { 0x24e6, {1, {0x24cc }}},
- { 0x24e7, {1, {0x24cd }}},
- { 0x24e8, {1, {0x24ce }}},
- { 0x24e9, {1, {0x24cf }}},
- { 0x2c30, {1, {0x2c00 }}},
- { 0x2c31, {1, {0x2c01 }}},
- { 0x2c32, {1, {0x2c02 }}},
- { 0x2c33, {1, {0x2c03 }}},
- { 0x2c34, {1, {0x2c04 }}},
- { 0x2c35, {1, {0x2c05 }}},
- { 0x2c36, {1, {0x2c06 }}},
- { 0x2c37, {1, {0x2c07 }}},
- { 0x2c38, {1, {0x2c08 }}},
- { 0x2c39, {1, {0x2c09 }}},
- { 0x2c3a, {1, {0x2c0a }}},
- { 0x2c3b, {1, {0x2c0b }}},
- { 0x2c3c, {1, {0x2c0c }}},
- { 0x2c3d, {1, {0x2c0d }}},
- { 0x2c3e, {1, {0x2c0e }}},
- { 0x2c3f, {1, {0x2c0f }}},
- { 0x2c40, {1, {0x2c10 }}},
- { 0x2c41, {1, {0x2c11 }}},
- { 0x2c42, {1, {0x2c12 }}},
- { 0x2c43, {1, {0x2c13 }}},
- { 0x2c44, {1, {0x2c14 }}},
- { 0x2c45, {1, {0x2c15 }}},
- { 0x2c46, {1, {0x2c16 }}},
- { 0x2c47, {1, {0x2c17 }}},
- { 0x2c48, {1, {0x2c18 }}},
- { 0x2c49, {1, {0x2c19 }}},
- { 0x2c4a, {1, {0x2c1a }}},
- { 0x2c4b, {1, {0x2c1b }}},
- { 0x2c4c, {1, {0x2c1c }}},
- { 0x2c4d, {1, {0x2c1d }}},
- { 0x2c4e, {1, {0x2c1e }}},
- { 0x2c4f, {1, {0x2c1f }}},
- { 0x2c50, {1, {0x2c20 }}},
- { 0x2c51, {1, {0x2c21 }}},
- { 0x2c52, {1, {0x2c22 }}},
- { 0x2c53, {1, {0x2c23 }}},
- { 0x2c54, {1, {0x2c24 }}},
- { 0x2c55, {1, {0x2c25 }}},
- { 0x2c56, {1, {0x2c26 }}},
- { 0x2c57, {1, {0x2c27 }}},
- { 0x2c58, {1, {0x2c28 }}},
- { 0x2c59, {1, {0x2c29 }}},
- { 0x2c5a, {1, {0x2c2a }}},
- { 0x2c5b, {1, {0x2c2b }}},
- { 0x2c5c, {1, {0x2c2c }}},
- { 0x2c5d, {1, {0x2c2d }}},
- { 0x2c5e, {1, {0x2c2e }}},
- { 0x2c81, {1, {0x2c80 }}},
- { 0x2c83, {1, {0x2c82 }}},
- { 0x2c85, {1, {0x2c84 }}},
- { 0x2c87, {1, {0x2c86 }}},
- { 0x2c89, {1, {0x2c88 }}},
- { 0x2c8b, {1, {0x2c8a }}},
- { 0x2c8d, {1, {0x2c8c }}},
- { 0x2c8f, {1, {0x2c8e }}},
- { 0x2c91, {1, {0x2c90 }}},
- { 0x2c93, {1, {0x2c92 }}},
- { 0x2c95, {1, {0x2c94 }}},
- { 0x2c97, {1, {0x2c96 }}},
- { 0x2c99, {1, {0x2c98 }}},
- { 0x2c9b, {1, {0x2c9a }}},
- { 0x2c9d, {1, {0x2c9c }}},
- { 0x2c9f, {1, {0x2c9e }}},
- { 0x2ca1, {1, {0x2ca0 }}},
- { 0x2ca3, {1, {0x2ca2 }}},
- { 0x2ca5, {1, {0x2ca4 }}},
- { 0x2ca7, {1, {0x2ca6 }}},
- { 0x2ca9, {1, {0x2ca8 }}},
- { 0x2cab, {1, {0x2caa }}},
- { 0x2cad, {1, {0x2cac }}},
- { 0x2caf, {1, {0x2cae }}},
- { 0x2cb1, {1, {0x2cb0 }}},
- { 0x2cb3, {1, {0x2cb2 }}},
- { 0x2cb5, {1, {0x2cb4 }}},
- { 0x2cb7, {1, {0x2cb6 }}},
- { 0x2cb9, {1, {0x2cb8 }}},
- { 0x2cbb, {1, {0x2cba }}},
- { 0x2cbd, {1, {0x2cbc }}},
- { 0x2cbf, {1, {0x2cbe }}},
- { 0x2cc1, {1, {0x2cc0 }}},
- { 0x2cc3, {1, {0x2cc2 }}},
- { 0x2cc5, {1, {0x2cc4 }}},
- { 0x2cc7, {1, {0x2cc6 }}},
- { 0x2cc9, {1, {0x2cc8 }}},
- { 0x2ccb, {1, {0x2cca }}},
- { 0x2ccd, {1, {0x2ccc }}},
- { 0x2ccf, {1, {0x2cce }}},
- { 0x2cd1, {1, {0x2cd0 }}},
- { 0x2cd3, {1, {0x2cd2 }}},
- { 0x2cd5, {1, {0x2cd4 }}},
- { 0x2cd7, {1, {0x2cd6 }}},
- { 0x2cd9, {1, {0x2cd8 }}},
- { 0x2cdb, {1, {0x2cda }}},
- { 0x2cdd, {1, {0x2cdc }}},
- { 0x2cdf, {1, {0x2cde }}},
- { 0x2ce1, {1, {0x2ce0 }}},
- { 0x2ce3, {1, {0x2ce2 }}},
- { 0x2d00, {1, {0x10a0 }}},
- { 0x2d01, {1, {0x10a1 }}},
- { 0x2d02, {1, {0x10a2 }}},
- { 0x2d03, {1, {0x10a3 }}},
- { 0x2d04, {1, {0x10a4 }}},
- { 0x2d05, {1, {0x10a5 }}},
- { 0x2d06, {1, {0x10a6 }}},
- { 0x2d07, {1, {0x10a7 }}},
- { 0x2d08, {1, {0x10a8 }}},
- { 0x2d09, {1, {0x10a9 }}},
- { 0x2d0a, {1, {0x10aa }}},
- { 0x2d0b, {1, {0x10ab }}},
- { 0x2d0c, {1, {0x10ac }}},
- { 0x2d0d, {1, {0x10ad }}},
- { 0x2d0e, {1, {0x10ae }}},
- { 0x2d0f, {1, {0x10af }}},
- { 0x2d10, {1, {0x10b0 }}},
- { 0x2d11, {1, {0x10b1 }}},
- { 0x2d12, {1, {0x10b2 }}},
- { 0x2d13, {1, {0x10b3 }}},
- { 0x2d14, {1, {0x10b4 }}},
- { 0x2d15, {1, {0x10b5 }}},
- { 0x2d16, {1, {0x10b6 }}},
- { 0x2d17, {1, {0x10b7 }}},
- { 0x2d18, {1, {0x10b8 }}},
- { 0x2d19, {1, {0x10b9 }}},
- { 0x2d1a, {1, {0x10ba }}},
- { 0x2d1b, {1, {0x10bb }}},
- { 0x2d1c, {1, {0x10bc }}},
- { 0x2d1d, {1, {0x10bd }}},
- { 0x2d1e, {1, {0x10be }}},
- { 0x2d1f, {1, {0x10bf }}},
- { 0x2d20, {1, {0x10c0 }}},
- { 0x2d21, {1, {0x10c1 }}},
- { 0x2d22, {1, {0x10c2 }}},
- { 0x2d23, {1, {0x10c3 }}},
- { 0x2d24, {1, {0x10c4 }}},
- { 0x2d25, {1, {0x10c5 }}},
- { 0xff41, {1, {0xff21 }}},
- { 0xff42, {1, {0xff22 }}},
- { 0xff43, {1, {0xff23 }}},
- { 0xff44, {1, {0xff24 }}},
- { 0xff45, {1, {0xff25 }}},
- { 0xff46, {1, {0xff26 }}},
- { 0xff47, {1, {0xff27 }}},
- { 0xff48, {1, {0xff28 }}},
- { 0xff49, {1, {0xff29 }}},
- { 0xff4a, {1, {0xff2a }}},
- { 0xff4b, {1, {0xff2b }}},
- { 0xff4c, {1, {0xff2c }}},
- { 0xff4d, {1, {0xff2d }}},
- { 0xff4e, {1, {0xff2e }}},
- { 0xff4f, {1, {0xff2f }}},
- { 0xff50, {1, {0xff30 }}},
- { 0xff51, {1, {0xff31 }}},
- { 0xff52, {1, {0xff32 }}},
- { 0xff53, {1, {0xff33 }}},
- { 0xff54, {1, {0xff34 }}},
- { 0xff55, {1, {0xff35 }}},
- { 0xff56, {1, {0xff36 }}},
- { 0xff57, {1, {0xff37 }}},
- { 0xff58, {1, {0xff38 }}},
- { 0xff59, {1, {0xff39 }}},
- { 0xff5a, {1, {0xff3a }}},
- { 0x10428, {1, {0x10400 }}},
- { 0x10429, {1, {0x10401 }}},
- { 0x1042a, {1, {0x10402 }}},
- { 0x1042b, {1, {0x10403 }}},
- { 0x1042c, {1, {0x10404 }}},
- { 0x1042d, {1, {0x10405 }}},
- { 0x1042e, {1, {0x10406 }}},
- { 0x1042f, {1, {0x10407 }}},
- { 0x10430, {1, {0x10408 }}},
- { 0x10431, {1, {0x10409 }}},
- { 0x10432, {1, {0x1040a }}},
- { 0x10433, {1, {0x1040b }}},
- { 0x10434, {1, {0x1040c }}},
- { 0x10435, {1, {0x1040d }}},
- { 0x10436, {1, {0x1040e }}},
- { 0x10437, {1, {0x1040f }}},
- { 0x10438, {1, {0x10410 }}},
- { 0x10439, {1, {0x10411 }}},
- { 0x1043a, {1, {0x10412 }}},
- { 0x1043b, {1, {0x10413 }}},
- { 0x1043c, {1, {0x10414 }}},
- { 0x1043d, {1, {0x10415 }}},
- { 0x1043e, {1, {0x10416 }}},
- { 0x1043f, {1, {0x10417 }}},
- { 0x10440, {1, {0x10418 }}},
- { 0x10441, {1, {0x10419 }}},
- { 0x10442, {1, {0x1041a }}},
- { 0x10443, {1, {0x1041b }}},
- { 0x10444, {1, {0x1041c }}},
- { 0x10445, {1, {0x1041d }}},
- { 0x10446, {1, {0x1041e }}},
- { 0x10447, {1, {0x1041f }}},
- { 0x10448, {1, {0x10420 }}},
- { 0x10449, {1, {0x10421 }}},
- { 0x1044a, {1, {0x10422 }}},
- { 0x1044b, {1, {0x10423 }}},
- { 0x1044c, {1, {0x10424 }}},
- { 0x1044d, {1, {0x10425 }}},
- { 0x1044e, {1, {0x10426 }}},
- { 0x1044f, {1, {0x10427 }}}
-};
-
-static const CaseUnfold_11_Type CaseUnfold_11_Locale[] = {
- { 0x0069, {1, {0x0049 }}}
-};
-
-static const CaseUnfold_12_Type CaseUnfold_12[] = {
- { {0x0061, 0x02be}, {1, {0x1e9a }}},
- { {0x0066, 0x0066}, {1, {0xfb00 }}},
- { {0x0066, 0x0069}, {1, {0xfb01 }}},
- { {0x0066, 0x006c}, {1, {0xfb02 }}},
- { {0x0068, 0x0331}, {1, {0x1e96 }}},
- { {0x006a, 0x030c}, {1, {0x01f0 }}},
- { {0x0073, 0x0073}, {1, {0x00df }}},
- { {0x0073, 0x0074}, {2, {0xfb05, 0xfb06 }}},
- { {0x0074, 0x0308}, {1, {0x1e97 }}},
- { {0x0077, 0x030a}, {1, {0x1e98 }}},
- { {0x0079, 0x030a}, {1, {0x1e99 }}},
- { {0x02bc, 0x006e}, {1, {0x0149 }}},
- { {0x03ac, 0x03b9}, {1, {0x1fb4 }}},
- { {0x03ae, 0x03b9}, {1, {0x1fc4 }}},
- { {0x03b1, 0x0342}, {1, {0x1fb6 }}},
- { {0x03b1, 0x03b9}, {2, {0x1fb3, 0x1fbc }}},
- { {0x03b7, 0x0342}, {1, {0x1fc6 }}},
- { {0x03b7, 0x03b9}, {2, {0x1fc3, 0x1fcc }}},
- { {0x03b9, 0x0342}, {1, {0x1fd6 }}},
- { {0x03c1, 0x0313}, {1, {0x1fe4 }}},
- { {0x03c5, 0x0313}, {1, {0x1f50 }}},
- { {0x03c5, 0x0342}, {1, {0x1fe6 }}},
- { {0x03c9, 0x0342}, {1, {0x1ff6 }}},
- { {0x03c9, 0x03b9}, {2, {0x1ff3, 0x1ffc }}},
- { {0x03ce, 0x03b9}, {1, {0x1ff4 }}},
- { {0x0565, 0x0582}, {1, {0x0587 }}},
- { {0x0574, 0x0565}, {1, {0xfb14 }}},
- { {0x0574, 0x056b}, {1, {0xfb15 }}},
- { {0x0574, 0x056d}, {1, {0xfb17 }}},
- { {0x0574, 0x0576}, {1, {0xfb13 }}},
- { {0x057e, 0x0576}, {1, {0xfb16 }}},
- { {0x1f00, 0x03b9}, {2, {0x1f88, 0x1f80 }}},
- { {0x1f01, 0x03b9}, {2, {0x1f81, 0x1f89 }}},
- { {0x1f02, 0x03b9}, {2, {0x1f82, 0x1f8a }}},
- { {0x1f03, 0x03b9}, {2, {0x1f83, 0x1f8b }}},
- { {0x1f04, 0x03b9}, {2, {0x1f84, 0x1f8c }}},
- { {0x1f05, 0x03b9}, {2, {0x1f85, 0x1f8d }}},
- { {0x1f06, 0x03b9}, {2, {0x1f86, 0x1f8e }}},
- { {0x1f07, 0x03b9}, {2, {0x1f87, 0x1f8f }}},
- { {0x1f20, 0x03b9}, {2, {0x1f90, 0x1f98 }}},
- { {0x1f21, 0x03b9}, {2, {0x1f91, 0x1f99 }}},
- { {0x1f22, 0x03b9}, {2, {0x1f92, 0x1f9a }}},
- { {0x1f23, 0x03b9}, {2, {0x1f93, 0x1f9b }}},
- { {0x1f24, 0x03b9}, {2, {0x1f94, 0x1f9c }}},
- { {0x1f25, 0x03b9}, {2, {0x1f95, 0x1f9d }}},
- { {0x1f26, 0x03b9}, {2, {0x1f96, 0x1f9e }}},
- { {0x1f27, 0x03b9}, {2, {0x1f97, 0x1f9f }}},
- { {0x1f60, 0x03b9}, {2, {0x1fa0, 0x1fa8 }}},
- { {0x1f61, 0x03b9}, {2, {0x1fa1, 0x1fa9 }}},
- { {0x1f62, 0x03b9}, {2, {0x1fa2, 0x1faa }}},
- { {0x1f63, 0x03b9}, {2, {0x1fa3, 0x1fab }}},
- { {0x1f64, 0x03b9}, {2, {0x1fa4, 0x1fac }}},
- { {0x1f65, 0x03b9}, {2, {0x1fa5, 0x1fad }}},
- { {0x1f66, 0x03b9}, {2, {0x1fa6, 0x1fae }}},
- { {0x1f67, 0x03b9}, {2, {0x1fa7, 0x1faf }}},
- { {0x1f70, 0x03b9}, {1, {0x1fb2 }}},
- { {0x1f74, 0x03b9}, {1, {0x1fc2 }}},
- { {0x1f7c, 0x03b9}, {1, {0x1ff2 }}}
-};
-
-static const CaseUnfold_12_Type CaseUnfold_12_Locale[] = {
- { {0x0069, 0x0307}, {1, {0x0130 }}}
-};
-
-static const CaseUnfold_13_Type CaseUnfold_13[] = {
- { {0x0066, 0x0066, 0x0069}, {1, {0xfb03 }}},
- { {0x0066, 0x0066, 0x006c}, {1, {0xfb04 }}},
- { {0x03b1, 0x0342, 0x03b9}, {1, {0x1fb7 }}},
- { {0x03b7, 0x0342, 0x03b9}, {1, {0x1fc7 }}},
- { {0x03b9, 0x0308, 0x0300}, {1, {0x1fd2 }}},
- { {0x03b9, 0x0308, 0x0301}, {2, {0x0390, 0x1fd3 }}},
- { {0x03b9, 0x0308, 0x0342}, {1, {0x1fd7 }}},
- { {0x03c5, 0x0308, 0x0300}, {1, {0x1fe2 }}},
- { {0x03c5, 0x0308, 0x0301}, {2, {0x03b0, 0x1fe3 }}},
- { {0x03c5, 0x0308, 0x0342}, {1, {0x1fe7 }}},
- { {0x03c5, 0x0313, 0x0300}, {1, {0x1f52 }}},
- { {0x03c5, 0x0313, 0x0301}, {1, {0x1f54 }}},
- { {0x03c5, 0x0313, 0x0342}, {1, {0x1f56 }}},
- { {0x03c9, 0x0342, 0x03b9}, {1, {0x1ff7 }}}
-};
-
-#define numberof(array) (int)(sizeof(array) / sizeof((array)[0]))
-#define CODE_RANGES_NUM numberof(CodeRanges)
-
-extern int
-onigenc_unicode_is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSED)
-{
- if (
-#ifdef USE_UNICODE_PROPERTIES
- ctype <= ONIGENC_MAX_STD_CTYPE &&
-#endif
- code < 256) {
- return ONIGENC_IS_UNICODE_ISO_8859_1_CTYPE(code, ctype);
- }
-
- if (ctype >= CODE_RANGES_NUM) {
- return ONIGERR_TYPE_BUG;
- }
-
- return onig_is_in_code_range((UChar* )CodeRanges[ctype], code);
-}
-
-
-extern int
-onigenc_unicode_ctype_code_range(int ctype, const OnigCodePoint* ranges[])
-{
- if (ctype >= CODE_RANGES_NUM) {
- return ONIGERR_TYPE_BUG;
- }
-
- *ranges = CodeRanges[ctype];
-
- return 0;
-}
-
-extern int
-onigenc_utf16_32_get_ctype_code_range(OnigCtype ctype, OnigCodePoint* sb_out,
- const OnigCodePoint* ranges[],
- struct OnigEncodingTypeST* enc ARG_UNUSED)
-{
- *sb_out = 0x00;
- return onigenc_unicode_ctype_code_range(ctype, ranges);
-}
-
-#include "ruby/st.h"
-
-#define PROPERTY_NAME_MAX_SIZE MAX_WORD_LENGTH
-
-extern int
-onigenc_unicode_property_name_to_ctype(OnigEncoding enc, UChar* name, UChar* end)
-{
- int len;
- int ctype;
- UChar buf[PROPERTY_NAME_MAX_SIZE];
- UChar *p;
- OnigCodePoint code;
-
- p = name;
- len = 0;
- while (p < end) {
- code = ONIGENC_MBC_TO_CODE(enc, p, end);
- if (code >= 0x80)
- return ONIGERR_INVALID_CHAR_PROPERTY_NAME;
-
- buf[len++] = (UChar )code;
- if (len >= PROPERTY_NAME_MAX_SIZE)
- return ONIGERR_INVALID_CHAR_PROPERTY_NAME;
-
- p += enclen(enc, p, end);
- }
-
- buf[len] = 0;
-
- if ((ctype = uniname2ctype(buf, len)) < 0) {
- return ONIGERR_INVALID_CHAR_PROPERTY_NAME;
- }
-
- return ctype;
-}
-
-
-static int
-code2_cmp(OnigCodePoint* x, OnigCodePoint* y)
-{
- if (x[0] == y[0] && x[1] == y[1]) return 0;
- return 1;
-}
-
-static int
-code2_hash(OnigCodePoint* x)
-{
- return (int )(x[0] + x[1]);
-}
-
-static const struct st_hash_type type_code2_hash = {
- code2_cmp,
- code2_hash,
-};
-
-static int
-code3_cmp(OnigCodePoint* x, OnigCodePoint* y)
-{
- if (x[0] == y[0] && x[1] == y[1] && x[2] == y[2]) return 0;
- return 1;
-}
-
-static int
-code3_hash(OnigCodePoint* x)
-{
- return (int )(x[0] + x[1] + x[2]);
-}
-
-static const struct st_hash_type type_code3_hash = {
- code3_cmp,
- code3_hash,
-};
-
-
-static st_table* FoldTable; /* fold-1, fold-2, fold-3 */
-static st_table* Unfold1Table;
-static st_table* Unfold2Table;
-static st_table* Unfold3Table;
-static int CaseFoldInited = 0;
-
-static int init_case_fold_table(void)
-{
- const CaseFold_11_Type *p;
- const CaseUnfold_11_Type *p1;
- const CaseUnfold_12_Type *p2;
- const CaseUnfold_13_Type *p3;
- int i;
-
- THREAD_ATOMIC_START;
-
- FoldTable = st_init_numtable_with_size(1200);
- if (ONIG_IS_NULL(FoldTable)) return ONIGERR_MEMORY;
- for (i = 0; i < numberof(CaseFold); i++) {
- p = &CaseFold[i];
- st_add_direct(FoldTable, (st_data_t )p->from, (st_data_t )&(p->to));
- }
- for (i = 0; i < numberof(CaseFold_Locale); i++) {
- p = &CaseFold_Locale[i];
- st_add_direct(FoldTable, (st_data_t )p->from, (st_data_t )&(p->to));
- }
-
- Unfold1Table = st_init_numtable_with_size(1000);
- if (ONIG_IS_NULL(Unfold1Table)) return ONIGERR_MEMORY;
-
- for (i = 0; i < numberof(CaseUnfold_11); i++) {
- p1 = &CaseUnfold_11[i];
- st_add_direct(Unfold1Table, (st_data_t )p1->from, (st_data_t )&(p1->to));
- }
- for (i = 0; i < numberof(CaseUnfold_11_Locale); i++) {
- p1 = &CaseUnfold_11_Locale[i];
- st_add_direct(Unfold1Table, (st_data_t )p1->from, (st_data_t )&(p1->to));
- }
-
- Unfold2Table = st_init_table_with_size(&type_code2_hash, 200);
- if (ONIG_IS_NULL(Unfold2Table)) return ONIGERR_MEMORY;
-
- for (i = 0; i < numberof(CaseUnfold_12); i++) {
- p2 = &CaseUnfold_12[i];
- st_add_direct(Unfold2Table, (st_data_t )p2->from, (st_data_t )(&p2->to));
- }
- for (i = 0; i < numberof(CaseUnfold_12_Locale); i++) {
- p2 = &CaseUnfold_12_Locale[i];
- st_add_direct(Unfold2Table, (st_data_t )p2->from, (st_data_t )(&p2->to));
- }
-
- Unfold3Table = st_init_table_with_size(&type_code3_hash, 30);
- if (ONIG_IS_NULL(Unfold3Table)) return ONIGERR_MEMORY;
-
- for (i = 0; i < numberof(CaseUnfold_13); i++) {
- p3 = &CaseUnfold_13[i];
- st_add_direct(Unfold3Table, (st_data_t )p3->from, (st_data_t )(&p3->to));
- }
-
- CaseFoldInited = 1;
- THREAD_ATOMIC_END;
- return 0;
-}
-
-extern int
-onigenc_unicode_mbc_case_fold(OnigEncoding enc,
- OnigCaseFoldType flag ARG_UNUSED, const UChar** pp, const UChar* end,
- UChar* fold)
-{
- CodePointList3 *to;
- OnigCodePoint code;
- int i, len, rlen;
- const UChar *p = *pp;
-
- if (CaseFoldInited == 0) init_case_fold_table();
-
- code = ONIGENC_MBC_TO_CODE(enc, p, end);
- len = enclen(enc, p, end);
- *pp += len;
-
-#ifdef USE_UNICODE_CASE_FOLD_TURKISH_AZERI
- if ((flag & ONIGENC_CASE_FOLD_TURKISH_AZERI) != 0) {
- if (code == 0x0049) {
- return ONIGENC_CODE_TO_MBC(enc, 0x0131, fold);
- }
- else if (code == 0x0130) {
- return ONIGENC_CODE_TO_MBC(enc, 0x0069, fold);
- }
- }
-#endif
-
- if (onig_st_lookup(FoldTable, (st_data_t )code, (void* )&to) != 0) {
- if (to->n == 1) {
- return ONIGENC_CODE_TO_MBC(enc, to->code[0], fold);
- }
-#if 0
- /* NO NEEDS TO CHECK */
- else if ((flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0)
-#else
- else
-#endif
- {
- rlen = 0;
- for (i = 0; i < to->n; i++) {
- len = ONIGENC_CODE_TO_MBC(enc, to->code[i], fold);
- fold += len;
- rlen += len;
- }
- return rlen;
- }
- }
-
- for (i = 0; i < len; i++) {
- *fold++ = *p++;
- }
- return len;
-}
-
-extern int
-onigenc_unicode_apply_all_case_fold(OnigCaseFoldType flag,
- OnigApplyAllCaseFoldFunc f, void* arg,
- OnigEncoding enc ARG_UNUSED)
-{
- const CaseUnfold_11_Type* p11;
- OnigCodePoint code;
- int i, j, k, r;
-
- /* if (CaseFoldInited == 0) init_case_fold_table(); */
-
- for (i = 0; i < numberof(CaseUnfold_11); i++) {
- p11 = &CaseUnfold_11[i];
- for (j = 0; j < p11->to.n; j++) {
- code = p11->from;
- r = (*f)(p11->to.code[j], &code, 1, arg);
- if (r != 0) return r;
-
- code = p11->to.code[j];
- r = (*f)(p11->from, &code, 1, arg);
- if (r != 0) return r;
-
- for (k = 0; k < j; k++) {
- r = (*f)(p11->to.code[j], (OnigCodePoint* )(&p11->to.code[k]), 1, arg);
- if (r != 0) return r;
-
- r = (*f)(p11->to.code[k], (OnigCodePoint* )(&p11->to.code[j]), 1, arg);
- if (r != 0) return r;
- }
- }
- }
-
-#ifdef USE_UNICODE_CASE_FOLD_TURKISH_AZERI
- if ((flag & ONIGENC_CASE_FOLD_TURKISH_AZERI) != 0) {
- code = 0x0131;
- r = (*f)(0x0049, &code, 1, arg);
- if (r != 0) return r;
- code = 0x0049;
- r = (*f)(0x0131, &code, 1, arg);
- if (r != 0) return r;
-
- code = 0x0130;
- r = (*f)(0x0069, &code, 1, arg);
- if (r != 0) return r;
- code = 0x0069;
- r = (*f)(0x0130, &code, 1, arg);
- if (r != 0) return r;
- }
- else {
-#endif
- for (i = 0; i < numberof(CaseUnfold_11_Locale); i++) {
- p11 = &CaseUnfold_11_Locale[i];
- for (j = 0; j < p11->to.n; j++) {
- code = p11->from;
- r = (*f)(p11->to.code[j], &code, 1, arg);
- if (r != 0) return r;
-
- code = p11->to.code[j];
- r = (*f)(p11->from, &code, 1, arg);
- if (r != 0) return r;
-
- for (k = 0; k < j; k++) {
- r = (*f)(p11->to.code[j], (OnigCodePoint* )(&p11->to.code[k]),
- 1, arg);
- if (r != 0) return r;
-
- r = (*f)(p11->to.code[k], (OnigCodePoint* )(&p11->to.code[j]),
- 1, arg);
- if (r != 0) return r;
- }
- }
- }
-#ifdef USE_UNICODE_CASE_FOLD_TURKISH_AZERI
- }
-#endif
-
- if ((flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
- for (i = 0; i < numberof(CaseUnfold_12); i++) {
- for (j = 0; j < CaseUnfold_12[i].to.n; j++) {
- r = (*f)(CaseUnfold_12[i].to.code[j],
- (OnigCodePoint* )CaseUnfold_12[i].from, 2, arg);
- if (r != 0) return r;
-
- for (k = 0; k < CaseUnfold_12[i].to.n; k++) {
- if (k == j) continue;
-
- r = (*f)(CaseUnfold_12[i].to.code[j],
- (OnigCodePoint* )(&CaseUnfold_12[i].to.code[k]), 1, arg);
- if (r != 0) return r;
- }
- }
- }
-
-#ifdef USE_UNICODE_CASE_FOLD_TURKISH_AZERI
- if ((flag & ONIGENC_CASE_FOLD_TURKISH_AZERI) == 0) {
-#endif
- for (i = 0; i < numberof(CaseUnfold_12_Locale); i++) {
- for (j = 0; j < CaseUnfold_12_Locale[i].to.n; j++) {
- r = (*f)(CaseUnfold_12_Locale[i].to.code[j],
- (OnigCodePoint* )CaseUnfold_12_Locale[i].from, 2, arg);
- if (r != 0) return r;
-
- for (k = 0; k < CaseUnfold_12_Locale[i].to.n; k++) {
- if (k == j) continue;
-
- r = (*f)(CaseUnfold_12_Locale[i].to.code[j],
- (OnigCodePoint* )(&CaseUnfold_12_Locale[i].to.code[k]),
- 1, arg);
- if (r != 0) return r;
- }
- }
- }
-#ifdef USE_UNICODE_CASE_FOLD_TURKISH_AZERI
- }
-#endif
-
- for (i = 0; i < numberof(CaseUnfold_13); i++) {
- for (j = 0; j < CaseUnfold_13[i].to.n; j++) {
- r = (*f)(CaseUnfold_13[i].to.code[j],
- (OnigCodePoint* )CaseUnfold_13[i].from, 3, arg);
- if (r != 0) return r;
-
- for (k = 0; k < CaseUnfold_13[i].to.n; k++) {
- if (k == j) continue;
-
- r = (*f)(CaseUnfold_13[i].to.code[j],
- (OnigCodePoint* )(&CaseUnfold_13[i].to.code[k]), 1, arg);
- if (r != 0) return r;
- }
- }
- }
- }
-
- return 0;
-}
-
-extern int
-onigenc_unicode_get_case_fold_codes_by_str(OnigEncoding enc,
- OnigCaseFoldType flag, const OnigUChar* p, const OnigUChar* end,
- OnigCaseFoldCodeItem items[])
-{
- int n, i, j, k, len;
- OnigCodePoint code, codes[3];
- CodePointList3 *to, *z3;
- CodePointList2 *z2;
-
- if (CaseFoldInited == 0) init_case_fold_table();
-
- n = 0;
-
- code = ONIGENC_MBC_TO_CODE(enc, p, end);
- len = enclen(enc, p, end);
-
-#ifdef USE_UNICODE_CASE_FOLD_TURKISH_AZERI
- if ((flag & ONIGENC_CASE_FOLD_TURKISH_AZERI) != 0) {
- if (code == 0x0049) {
- items[0].byte_len = len;
- items[0].code_len = 1;
- items[0].code[0] = 0x0131;
- return 1;
- }
- else if (code == 0x0130) {
- items[0].byte_len = len;
- items[0].code_len = 1;
- items[0].code[0] = 0x0069;
- return 1;
- }
- else if (code == 0x0131) {
- items[0].byte_len = len;
- items[0].code_len = 1;
- items[0].code[0] = 0x0049;
- return 1;
- }
- else if (code == 0x0069) {
- items[0].byte_len = len;
- items[0].code_len = 1;
- items[0].code[0] = 0x0130;
- return 1;
- }
- }
-#endif
-
- if (onig_st_lookup(FoldTable, (st_data_t )code, (void* )&to) != 0) {
- if (to->n == 1) {
- OnigCodePoint orig_code = code;
-
- items[0].byte_len = len;
- items[0].code_len = 1;
- items[0].code[0] = to->code[0];
- n++;
-
- code = to->code[0];
- if (onig_st_lookup(Unfold1Table, (st_data_t )code, (void* )&to) != 0) {
- for (i = 0; i < to->n; i++) {
- if (to->code[i] != orig_code) {
- items[n].byte_len = len;
- items[n].code_len = 1;
- items[n].code[0] = to->code[i];
- n++;
- }
- }
- }
- }
- else if ((flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
- OnigCodePoint cs[3][4];
- int fn, ncs[3];
-
- for (fn = 0; fn < to->n; fn++) {
- cs[fn][0] = to->code[fn];
- if (onig_st_lookup(Unfold1Table, (st_data_t )cs[fn][0],
- (void* )&z3) != 0) {
- for (i = 0; i < z3->n; i++) {
- cs[fn][i+1] = z3->code[i];
- }
- ncs[fn] = z3->n + 1;
- }
- else
- ncs[fn] = 1;
- }
-
- if (fn == 2) {
- for (i = 0; i < ncs[0]; i++) {
- for (j = 0; j < ncs[1]; j++) {
- items[n].byte_len = len;
- items[n].code_len = 2;
- items[n].code[0] = cs[0][i];
- items[n].code[1] = cs[1][j];
- n++;
- }
- }
-
- if (onig_st_lookup(Unfold2Table, (st_data_t )to->code,
- (void* )&z2) != 0) {
- for (i = 0; i < z2->n; i++) {
- if (z2->code[i] == code) continue;
-
- items[n].byte_len = len;
- items[n].code_len = 1;
- items[n].code[0] = z2->code[i];
- n++;
- }
- }
- }
- else {
- for (i = 0; i < ncs[0]; i++) {
- for (j = 0; j < ncs[1]; j++) {
- for (k = 0; k < ncs[2]; k++) {
- items[n].byte_len = len;
- items[n].code_len = 3;
- items[n].code[0] = cs[0][i];
- items[n].code[1] = cs[1][j];
- items[n].code[2] = cs[2][k];
- n++;
- }
- }
- }
-
- if (onig_st_lookup(Unfold3Table, (st_data_t )to->code,
- (void* )&z2) != 0) {
- for (i = 0; i < z2->n; i++) {
- if (z2->code[i] == code) continue;
-
- items[n].byte_len = len;
- items[n].code_len = 1;
- items[n].code[0] = z2->code[i];
- n++;
- }
- }
- }
-
- /* multi char folded code is not head of another folded multi char */
- flag = 0; /* DISABLE_CASE_FOLD_MULTI_CHAR(flag); */
- }
- }
- else {
- if (onig_st_lookup(Unfold1Table, (st_data_t )code, (void* )&to) != 0) {
- for (i = 0; i < to->n; i++) {
- items[n].byte_len = len;
- items[n].code_len = 1;
- items[n].code[0] = to->code[i];
- n++;
- }
- }
- }
-
-
- if ((flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
- p += len;
- if (p < end) {
- int clen;
-
- codes[0] = code;
- code = ONIGENC_MBC_TO_CODE(enc, p, end);
- if (onig_st_lookup(FoldTable, (st_data_t )code, (void* )&to) != 0
- && to->n == 1) {
- codes[1] = to->code[0];
- }
- else
- codes[1] = code;
-
- clen = enclen(enc, p, end);
- len += clen;
- if (onig_st_lookup(Unfold2Table, (st_data_t )codes, (void* )&z2) != 0) {
- for (i = 0; i < z2->n; i++) {
- items[n].byte_len = len;
- items[n].code_len = 1;
- items[n].code[0] = z2->code[i];
- n++;
- }
- }
-
- p += clen;
- if (p < end) {
- code = ONIGENC_MBC_TO_CODE(enc, p, end);
- if (onig_st_lookup(FoldTable, (st_data_t )code, (void* )&to) != 0
- && to->n == 1) {
- codes[2] = to->code[0];
- }
- else
- codes[2] = code;
-
- clen = enclen(enc, p, end);
- len += clen;
- if (onig_st_lookup(Unfold3Table, (st_data_t )codes,
- (void* )&z2) != 0) {
- for (i = 0; i < z2->n; i++) {
- items[n].byte_len = len;
- items[n].code_len = 1;
- items[n].code[0] = z2->code[i];
- n++;
- }
- }
- }
- }
- }
-
- return n;
-}
diff --git a/enc/unicode/Scripts.txt b/enc/unicode/Scripts.txt
deleted file mode 100644
index 7065486d3a..0000000000
--- a/enc/unicode/Scripts.txt
+++ /dev/null
@@ -1,1747 +0,0 @@
-# Scripts-5.1.0.txt
-# Date: 2008-03-20, 17:55:33 GMT [MD]
-#
-# Unicode Character Database
-# Copyright (c) 1991-2008 Unicode, Inc.
-# For terms of use, see http://www.unicode.org/terms_of_use.html
-# For documentation, see UCD.html
-
-# ================================================
-
-# Property: Script
-
-# All code points not explicitly listed for Script
-# have the value Unknown (Zzzz).
-
-# @missing: 0000..10FFFF; Unknown
-
-# ================================================
-
-0000..001F ; Common # Cc [32] <control-0000>..<control-001F>
-0020 ; Common # Zs SPACE
-0021..0023 ; Common # Po [3] EXCLAMATION MARK..NUMBER SIGN
-0024 ; Common # Sc DOLLAR SIGN
-0025..0027 ; Common # Po [3] PERCENT SIGN..APOSTROPHE
-0028 ; Common # Ps LEFT PARENTHESIS
-0029 ; Common # Pe RIGHT PARENTHESIS
-002A ; Common # Po ASTERISK
-002B ; Common # Sm PLUS SIGN
-002C ; Common # Po COMMA
-002D ; Common # Pd HYPHEN-MINUS
-002E..002F ; Common # Po [2] FULL STOP..SOLIDUS
-0030..0039 ; Common # Nd [10] DIGIT ZERO..DIGIT NINE
-003A..003B ; Common # Po [2] COLON..SEMICOLON
-003C..003E ; Common # Sm [3] LESS-THAN SIGN..GREATER-THAN SIGN
-003F..0040 ; Common # Po [2] QUESTION MARK..COMMERCIAL AT
-005B ; Common # Ps LEFT SQUARE BRACKET
-005C ; Common # Po REVERSE SOLIDUS
-005D ; Common # Pe RIGHT SQUARE BRACKET
-005E ; Common # Sk CIRCUMFLEX ACCENT
-005F ; Common # Pc LOW LINE
-0060 ; Common # Sk GRAVE ACCENT
-007B ; Common # Ps LEFT CURLY BRACKET
-007C ; Common # Sm VERTICAL LINE
-007D ; Common # Pe RIGHT CURLY BRACKET
-007E ; Common # Sm TILDE
-007F..009F ; Common # Cc [33] <control-007F>..<control-009F>
-00A0 ; Common # Zs NO-BREAK SPACE
-00A1 ; Common # Po INVERTED EXCLAMATION MARK
-00A2..00A5 ; Common # Sc [4] CENT SIGN..YEN SIGN
-00A6..00A7 ; Common # So [2] BROKEN BAR..SECTION SIGN
-00A8 ; Common # Sk DIAERESIS
-00A9 ; Common # So COPYRIGHT SIGN
-00AB ; Common # Pi LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
-00AC ; Common # Sm NOT SIGN
-00AD ; Common # Cf SOFT HYPHEN
-00AE ; Common # So REGISTERED SIGN
-00AF ; Common # Sk MACRON
-00B0 ; Common # So DEGREE SIGN
-00B1 ; Common # Sm PLUS-MINUS SIGN
-00B2..00B3 ; Common # No [2] SUPERSCRIPT TWO..SUPERSCRIPT THREE
-00B4 ; Common # Sk ACUTE ACCENT
-00B5 ; Common # L& MICRO SIGN
-00B6 ; Common # So PILCROW SIGN
-00B7 ; Common # Po MIDDLE DOT
-00B8 ; Common # Sk CEDILLA
-00B9 ; Common # No SUPERSCRIPT ONE
-00BB ; Common # Pf RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
-00BC..00BE ; Common # No [3] VULGAR FRACTION ONE QUARTER..VULGAR FRACTION THREE QUARTERS
-00BF ; Common # Po INVERTED QUESTION MARK
-00D7 ; Common # Sm MULTIPLICATION SIGN
-00F7 ; Common # Sm DIVISION SIGN
-02B9..02C1 ; Common # Lm [9] MODIFIER LETTER PRIME..MODIFIER LETTER REVERSED GLOTTAL STOP
-02C2..02C5 ; Common # Sk [4] MODIFIER LETTER LEFT ARROWHEAD..MODIFIER LETTER DOWN ARROWHEAD
-02C6..02D1 ; Common # Lm [12] MODIFIER LETTER CIRCUMFLEX ACCENT..MODIFIER LETTER HALF TRIANGULAR COLON
-02D2..02DF ; Common # Sk [14] MODIFIER LETTER CENTRED RIGHT HALF RING..MODIFIER LETTER CROSS ACCENT
-02E5..02EB ; Common # Sk [7] MODIFIER LETTER EXTRA-HIGH TONE BAR..MODIFIER LETTER YANG DEPARTING TONE MARK
-02EC ; Common # Lm MODIFIER LETTER VOICING
-02ED ; Common # Sk MODIFIER LETTER UNASPIRATED
-02EE ; Common # Lm MODIFIER LETTER DOUBLE APOSTROPHE
-02EF..02FF ; Common # Sk [17] MODIFIER LETTER LOW DOWN ARROWHEAD..MODIFIER LETTER LOW LEFT ARROW
-0374 ; Common # Lm GREEK NUMERAL SIGN
-037E ; Common # Po GREEK QUESTION MARK
-0385 ; Common # Sk GREEK DIALYTIKA TONOS
-0387 ; Common # Po GREEK ANO TELEIA
-0589 ; Common # Po ARMENIAN FULL STOP
-0600..0603 ; Common # Cf [4] ARABIC NUMBER SIGN..ARABIC SIGN SAFHA
-060C ; Common # Po ARABIC COMMA
-061B ; Common # Po ARABIC SEMICOLON
-061F ; Common # Po ARABIC QUESTION MARK
-0640 ; Common # Lm ARABIC TATWEEL
-0660..0669 ; Common # Nd [10] ARABIC-INDIC DIGIT ZERO..ARABIC-INDIC DIGIT NINE
-06DD ; Common # Cf ARABIC END OF AYAH
-0964..0965 ; Common # Po [2] DEVANAGARI DANDA..DEVANAGARI DOUBLE DANDA
-0970 ; Common # Po DEVANAGARI ABBREVIATION SIGN
-0CF1..0CF2 ; Common # So [2] KANNADA SIGN JIHVAMULIYA..KANNADA SIGN UPADHMANIYA
-0E3F ; Common # Sc THAI CURRENCY SYMBOL BAHT
-10FB ; Common # Po GEORGIAN PARAGRAPH SEPARATOR
-16EB..16ED ; Common # Po [3] RUNIC SINGLE PUNCTUATION..RUNIC CROSS PUNCTUATION
-1735..1736 ; Common # Po [2] PHILIPPINE SINGLE PUNCTUATION..PHILIPPINE DOUBLE PUNCTUATION
-1802..1803 ; Common # Po [2] MONGOLIAN COMMA..MONGOLIAN FULL STOP
-1805 ; Common # Po MONGOLIAN FOUR DOTS
-2000..200A ; Common # Zs [11] EN QUAD..HAIR SPACE
-200B ; Common # Cf ZERO WIDTH SPACE
-200E..200F ; Common # Cf [2] LEFT-TO-RIGHT MARK..RIGHT-TO-LEFT MARK
-2010..2015 ; Common # Pd [6] HYPHEN..HORIZONTAL BAR
-2016..2017 ; Common # Po [2] DOUBLE VERTICAL LINE..DOUBLE LOW LINE
-2018 ; Common # Pi LEFT SINGLE QUOTATION MARK
-2019 ; Common # Pf RIGHT SINGLE QUOTATION MARK
-201A ; Common # Ps SINGLE LOW-9 QUOTATION MARK
-201B..201C ; Common # Pi [2] SINGLE HIGH-REVERSED-9 QUOTATION MARK..LEFT DOUBLE QUOTATION MARK
-201D ; Common # Pf RIGHT DOUBLE QUOTATION MARK
-201E ; Common # Ps DOUBLE LOW-9 QUOTATION MARK
-201F ; Common # Pi DOUBLE HIGH-REVERSED-9 QUOTATION MARK
-2020..2027 ; Common # Po [8] DAGGER..HYPHENATION POINT
-2028 ; Common # Zl LINE SEPARATOR
-2029 ; Common # Zp PARAGRAPH SEPARATOR
-202A..202E ; Common # Cf [5] LEFT-TO-RIGHT EMBEDDING..RIGHT-TO-LEFT OVERRIDE
-202F ; Common # Zs NARROW NO-BREAK SPACE
-2030..2038 ; Common # Po [9] PER MILLE SIGN..CARET
-2039 ; Common # Pi SINGLE LEFT-POINTING ANGLE QUOTATION MARK
-203A ; Common # Pf SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
-203B..203E ; Common # Po [4] REFERENCE MARK..OVERLINE
-203F..2040 ; Common # Pc [2] UNDERTIE..CHARACTER TIE
-2041..2043 ; Common # Po [3] CARET INSERTION POINT..HYPHEN BULLET
-2044 ; Common # Sm FRACTION SLASH
-2045 ; Common # Ps LEFT SQUARE BRACKET WITH QUILL
-2046 ; Common # Pe RIGHT SQUARE BRACKET WITH QUILL
-2047..2051 ; Common # Po [11] DOUBLE QUESTION MARK..TWO ASTERISKS ALIGNED VERTICALLY
-2052 ; Common # Sm COMMERCIAL MINUS SIGN
-2053 ; Common # Po SWUNG DASH
-2054 ; Common # Pc INVERTED UNDERTIE
-2055..205E ; Common # Po [10] FLOWER PUNCTUATION MARK..VERTICAL FOUR DOTS
-205F ; Common # Zs MEDIUM MATHEMATICAL SPACE
-2060..2064 ; Common # Cf [5] WORD JOINER..INVISIBLE PLUS
-206A..206F ; Common # Cf [6] INHIBIT SYMMETRIC SWAPPING..NOMINAL DIGIT SHAPES
-2070 ; Common # No SUPERSCRIPT ZERO
-2074..2079 ; Common # No [6] SUPERSCRIPT FOUR..SUPERSCRIPT NINE
-207A..207C ; Common # Sm [3] SUPERSCRIPT PLUS SIGN..SUPERSCRIPT EQUALS SIGN
-207D ; Common # Ps SUPERSCRIPT LEFT PARENTHESIS
-207E ; Common # Pe SUPERSCRIPT RIGHT PARENTHESIS
-2080..2089 ; Common # No [10] SUBSCRIPT ZERO..SUBSCRIPT NINE
-208A..208C ; Common # Sm [3] SUBSCRIPT PLUS SIGN..SUBSCRIPT EQUALS SIGN
-208D ; Common # Ps SUBSCRIPT LEFT PARENTHESIS
-208E ; Common # Pe SUBSCRIPT RIGHT PARENTHESIS
-20A0..20B5 ; Common # Sc [22] EURO-CURRENCY SIGN..CEDI SIGN
-2100..2101 ; Common # So [2] ACCOUNT OF..ADDRESSED TO THE SUBJECT
-2102 ; Common # L& DOUBLE-STRUCK CAPITAL C
-2103..2106 ; Common # So [4] DEGREE CELSIUS..CADA UNA
-2107 ; Common # L& EULER CONSTANT
-2108..2109 ; Common # So [2] SCRUPLE..DEGREE FAHRENHEIT
-210A..2113 ; Common # L& [10] SCRIPT SMALL G..SCRIPT SMALL L
-2114 ; Common # So L B BAR SYMBOL
-2115 ; Common # L& DOUBLE-STRUCK CAPITAL N
-2116..2118 ; Common # So [3] NUMERO SIGN..SCRIPT CAPITAL P
-2119..211D ; Common # L& [5] DOUBLE-STRUCK CAPITAL P..DOUBLE-STRUCK CAPITAL R
-211E..2123 ; Common # So [6] PRESCRIPTION TAKE..VERSICLE
-2124 ; Common # L& DOUBLE-STRUCK CAPITAL Z
-2125 ; Common # So OUNCE SIGN
-2127 ; Common # So INVERTED OHM SIGN
-2128 ; Common # L& BLACK-LETTER CAPITAL Z
-2129 ; Common # So TURNED GREEK SMALL LETTER IOTA
-212C..212D ; Common # L& [2] SCRIPT CAPITAL B..BLACK-LETTER CAPITAL C
-212E ; Common # So ESTIMATED SYMBOL
-212F..2131 ; Common # L& [3] SCRIPT SMALL E..SCRIPT CAPITAL F
-2133..2134 ; Common # L& [2] SCRIPT CAPITAL M..SCRIPT SMALL O
-2135..2138 ; Common # Lo [4] ALEF SYMBOL..DALET SYMBOL
-2139 ; Common # L& INFORMATION SOURCE
-213A..213B ; Common # So [2] ROTATED CAPITAL Q..FACSIMILE SIGN
-213C..213F ; Common # L& [4] DOUBLE-STRUCK SMALL PI..DOUBLE-STRUCK CAPITAL PI
-2140..2144 ; Common # Sm [5] DOUBLE-STRUCK N-ARY SUMMATION..TURNED SANS-SERIF CAPITAL Y
-2145..2149 ; Common # L& [5] DOUBLE-STRUCK ITALIC CAPITAL D..DOUBLE-STRUCK ITALIC SMALL J
-214A ; Common # So PROPERTY LINE
-214B ; Common # Sm TURNED AMPERSAND
-214C..214D ; Common # So [2] PER SIGN..AKTIESELSKAB
-214F ; Common # So SYMBOL FOR SAMARITAN SOURCE
-2153..215F ; Common # No [13] VULGAR FRACTION ONE THIRD..FRACTION NUMERATOR ONE
-2190..2194 ; Common # Sm [5] LEFTWARDS ARROW..LEFT RIGHT ARROW
-2195..2199 ; Common # So [5] UP DOWN ARROW..SOUTH WEST ARROW
-219A..219B ; Common # Sm [2] LEFTWARDS ARROW WITH STROKE..RIGHTWARDS ARROW WITH STROKE
-219C..219F ; Common # So [4] LEFTWARDS WAVE ARROW..UPWARDS TWO HEADED ARROW
-21A0 ; Common # Sm RIGHTWARDS TWO HEADED ARROW
-21A1..21A2 ; Common # So [2] DOWNWARDS TWO HEADED ARROW..LEFTWARDS ARROW WITH TAIL
-21A3 ; Common # Sm RIGHTWARDS ARROW WITH TAIL
-21A4..21A5 ; Common # So [2] LEFTWARDS ARROW FROM BAR..UPWARDS ARROW FROM BAR
-21A6 ; Common # Sm RIGHTWARDS ARROW FROM BAR
-21A7..21AD ; Common # So [7] DOWNWARDS ARROW FROM BAR..LEFT RIGHT WAVE ARROW
-21AE ; Common # Sm LEFT RIGHT ARROW WITH STROKE
-21AF..21CD ; Common # So [31] DOWNWARDS ZIGZAG ARROW..LEFTWARDS DOUBLE ARROW WITH STROKE
-21CE..21CF ; Common # Sm [2] LEFT RIGHT DOUBLE ARROW WITH STROKE..RIGHTWARDS DOUBLE ARROW WITH STROKE
-21D0..21D1 ; Common # So [2] LEFTWARDS DOUBLE ARROW..UPWARDS DOUBLE ARROW
-21D2 ; Common # Sm RIGHTWARDS DOUBLE ARROW
-21D3 ; Common # So DOWNWARDS DOUBLE ARROW
-21D4 ; Common # Sm LEFT RIGHT DOUBLE ARROW
-21D5..21F3 ; Common # So [31] UP DOWN DOUBLE ARROW..UP DOWN WHITE ARROW
-21F4..22FF ; Common # Sm [268] RIGHT ARROW WITH SMALL CIRCLE..Z NOTATION BAG MEMBERSHIP
-2300..2307 ; Common # So [8] DIAMETER SIGN..WAVY LINE
-2308..230B ; Common # Sm [4] LEFT CEILING..RIGHT FLOOR
-230C..231F ; Common # So [20] BOTTOM RIGHT CROP..BOTTOM RIGHT CORNER
-2320..2321 ; Common # Sm [2] TOP HALF INTEGRAL..BOTTOM HALF INTEGRAL
-2322..2328 ; Common # So [7] FROWN..KEYBOARD
-2329 ; Common # Ps LEFT-POINTING ANGLE BRACKET
-232A ; Common # Pe RIGHT-POINTING ANGLE BRACKET
-232B..237B ; Common # So [81] ERASE TO THE LEFT..NOT CHECK MARK
-237C ; Common # Sm RIGHT ANGLE WITH DOWNWARDS ZIGZAG ARROW
-237D..239A ; Common # So [30] SHOULDERED OPEN BOX..CLEAR SCREEN SYMBOL
-239B..23B3 ; Common # Sm [25] LEFT PARENTHESIS UPPER HOOK..SUMMATION BOTTOM
-23B4..23DB ; Common # So [40] TOP SQUARE BRACKET..FUSE
-23DC..23E1 ; Common # Sm [6] TOP PARENTHESIS..BOTTOM TORTOISE SHELL BRACKET
-23E2..23E7 ; Common # So [6] WHITE TRAPEZIUM..ELECTRICAL INTERSECTION
-2400..2426 ; Common # So [39] SYMBOL FOR NULL..SYMBOL FOR SUBSTITUTE FORM TWO
-2440..244A ; Common # So [11] OCR HOOK..OCR DOUBLE BACKSLASH
-2460..249B ; Common # No [60] CIRCLED DIGIT ONE..NUMBER TWENTY FULL STOP
-249C..24E9 ; Common # So [78] PARENTHESIZED LATIN SMALL LETTER A..CIRCLED LATIN SMALL LETTER Z
-24EA..24FF ; Common # No [22] CIRCLED DIGIT ZERO..NEGATIVE CIRCLED DIGIT ZERO
-2500..25B6 ; Common # So [183] BOX DRAWINGS LIGHT HORIZONTAL..BLACK RIGHT-POINTING TRIANGLE
-25B7 ; Common # Sm WHITE RIGHT-POINTING TRIANGLE
-25B8..25C0 ; Common # So [9] BLACK RIGHT-POINTING SMALL TRIANGLE..BLACK LEFT-POINTING TRIANGLE
-25C1 ; Common # Sm WHITE LEFT-POINTING TRIANGLE
-25C2..25F7 ; Common # So [54] BLACK LEFT-POINTING SMALL TRIANGLE..WHITE CIRCLE WITH UPPER RIGHT QUADRANT
-25F8..25FF ; Common # Sm [8] UPPER LEFT TRIANGLE..LOWER RIGHT TRIANGLE
-2600..266E ; Common # So [111] BLACK SUN WITH RAYS..MUSIC NATURAL SIGN
-266F ; Common # Sm MUSIC SHARP SIGN
-2670..269D ; Common # So [46] WEST SYRIAC CROSS..OUTLINED WHITE STAR
-26A0..26BC ; Common # So [29] WARNING SIGN..SESQUIQUADRATE
-26C0..26C3 ; Common # So [4] WHITE DRAUGHTS MAN..BLACK DRAUGHTS KING
-2701..2704 ; Common # So [4] UPPER BLADE SCISSORS..WHITE SCISSORS
-2706..2709 ; Common # So [4] TELEPHONE LOCATION SIGN..ENVELOPE
-270C..2727 ; Common # So [28] VICTORY HAND..WHITE FOUR POINTED STAR
-2729..274B ; Common # So [35] STRESS OUTLINED WHITE STAR..HEAVY EIGHT TEARDROP-SPOKED PROPELLER ASTERISK
-274D ; Common # So SHADOWED WHITE CIRCLE
-274F..2752 ; Common # So [4] LOWER RIGHT DROP-SHADOWED WHITE SQUARE..UPPER RIGHT SHADOWED WHITE SQUARE
-2756 ; Common # So BLACK DIAMOND MINUS WHITE X
-2758..275E ; Common # So [7] LIGHT VERTICAL BAR..HEAVY DOUBLE COMMA QUOTATION MARK ORNAMENT
-2761..2767 ; Common # So [7] CURVED STEM PARAGRAPH SIGN ORNAMENT..ROTATED FLORAL HEART BULLET
-2768 ; Common # Ps MEDIUM LEFT PARENTHESIS ORNAMENT
-2769 ; Common # Pe MEDIUM RIGHT PARENTHESIS ORNAMENT
-276A ; Common # Ps MEDIUM FLATTENED LEFT PARENTHESIS ORNAMENT
-276B ; Common # Pe MEDIUM FLATTENED RIGHT PARENTHESIS ORNAMENT
-276C ; Common # Ps MEDIUM LEFT-POINTING ANGLE BRACKET ORNAMENT
-276D ; Common # Pe MEDIUM RIGHT-POINTING ANGLE BRACKET ORNAMENT
-276E ; Common # Ps HEAVY LEFT-POINTING ANGLE QUOTATION MARK ORNAMENT
-276F ; Common # Pe HEAVY RIGHT-POINTING ANGLE QUOTATION MARK ORNAMENT
-2770 ; Common # Ps HEAVY LEFT-POINTING ANGLE BRACKET ORNAMENT
-2771 ; Common # Pe HEAVY RIGHT-POINTING ANGLE BRACKET ORNAMENT
-2772 ; Common # Ps LIGHT LEFT TORTOISE SHELL BRACKET ORNAMENT
-2773 ; Common # Pe LIGHT RIGHT TORTOISE SHELL BRACKET ORNAMENT
-2774 ; Common # Ps MEDIUM LEFT CURLY BRACKET ORNAMENT
-2775 ; Common # Pe MEDIUM RIGHT CURLY BRACKET ORNAMENT
-2776..2793 ; Common # No [30] DINGBAT NEGATIVE CIRCLED DIGIT ONE..DINGBAT NEGATIVE CIRCLED SANS-SERIF NUMBER TEN
-2794 ; Common # So HEAVY WIDE-HEADED RIGHTWARDS ARROW
-2798..27AF ; Common # So [24] HEAVY SOUTH EAST ARROW..NOTCHED LOWER RIGHT-SHADOWED WHITE RIGHTWARDS ARROW
-27B1..27BE ; Common # So [14] NOTCHED UPPER RIGHT-SHADOWED WHITE RIGHTWARDS ARROW..OPEN-OUTLINED RIGHTWARDS ARROW
-27C0..27C4 ; Common # Sm [5] THREE DIMENSIONAL ANGLE..OPEN SUPERSET
-27C5 ; Common # Ps LEFT S-SHAPED BAG DELIMITER
-27C6 ; Common # Pe RIGHT S-SHAPED BAG DELIMITER
-27C7..27CA ; Common # Sm [4] OR WITH DOT INSIDE..VERTICAL BAR WITH HORIZONTAL STROKE
-27CC ; Common # Sm LONG DIVISION
-27D0..27E5 ; Common # Sm [22] WHITE DIAMOND WITH CENTRED DOT..WHITE SQUARE WITH RIGHTWARDS TICK
-27E6 ; Common # Ps MATHEMATICAL LEFT WHITE SQUARE BRACKET
-27E7 ; Common # Pe MATHEMATICAL RIGHT WHITE SQUARE BRACKET
-27E8 ; Common # Ps MATHEMATICAL LEFT ANGLE BRACKET
-27E9 ; Common # Pe MATHEMATICAL RIGHT ANGLE BRACKET
-27EA ; Common # Ps MATHEMATICAL LEFT DOUBLE ANGLE BRACKET
-27EB ; Common # Pe MATHEMATICAL RIGHT DOUBLE ANGLE BRACKET
-27EC ; Common # Ps MATHEMATICAL LEFT WHITE TORTOISE SHELL BRACKET
-27ED ; Common # Pe MATHEMATICAL RIGHT WHITE TORTOISE SHELL BRACKET
-27EE ; Common # Ps MATHEMATICAL LEFT FLATTENED PARENTHESIS
-27EF ; Common # Pe MATHEMATICAL RIGHT FLATTENED PARENTHESIS
-27F0..27FF ; Common # Sm [16] UPWARDS QUADRUPLE ARROW..LONG RIGHTWARDS SQUIGGLE ARROW
-2900..2982 ; Common # Sm [131] RIGHTWARDS TWO-HEADED ARROW WITH VERTICAL STROKE..Z NOTATION TYPE COLON
-2983 ; Common # Ps LEFT WHITE CURLY BRACKET
-2984 ; Common # Pe RIGHT WHITE CURLY BRACKET
-2985 ; Common # Ps LEFT WHITE PARENTHESIS
-2986 ; Common # Pe RIGHT WHITE PARENTHESIS
-2987 ; Common # Ps Z NOTATION LEFT IMAGE BRACKET
-2988 ; Common # Pe Z NOTATION RIGHT IMAGE BRACKET
-2989 ; Common # Ps Z NOTATION LEFT BINDING BRACKET
-298A ; Common # Pe Z NOTATION RIGHT BINDING BRACKET
-298B ; Common # Ps LEFT SQUARE BRACKET WITH UNDERBAR
-298C ; Common # Pe RIGHT SQUARE BRACKET WITH UNDERBAR
-298D ; Common # Ps LEFT SQUARE BRACKET WITH TICK IN TOP CORNER
-298E ; Common # Pe RIGHT SQUARE BRACKET WITH TICK IN BOTTOM CORNER
-298F ; Common # Ps LEFT SQUARE BRACKET WITH TICK IN BOTTOM CORNER
-2990 ; Common # Pe RIGHT SQUARE BRACKET WITH TICK IN TOP CORNER
-2991 ; Common # Ps LEFT ANGLE BRACKET WITH DOT
-2992 ; Common # Pe RIGHT ANGLE BRACKET WITH DOT
-2993 ; Common # Ps LEFT ARC LESS-THAN BRACKET
-2994 ; Common # Pe RIGHT ARC GREATER-THAN BRACKET
-2995 ; Common # Ps DOUBLE LEFT ARC GREATER-THAN BRACKET
-2996 ; Common # Pe DOUBLE RIGHT ARC LESS-THAN BRACKET
-2997 ; Common # Ps LEFT BLACK TORTOISE SHELL BRACKET
-2998 ; Common # Pe RIGHT BLACK TORTOISE SHELL BRACKET
-2999..29D7 ; Common # Sm [63] DOTTED FENCE..BLACK HOURGLASS
-29D8 ; Common # Ps LEFT WIGGLY FENCE
-29D9 ; Common # Pe RIGHT WIGGLY FENCE
-29DA ; Common # Ps LEFT DOUBLE WIGGLY FENCE
-29DB ; Common # Pe RIGHT DOUBLE WIGGLY FENCE
-29DC..29FB ; Common # Sm [32] INCOMPLETE INFINITY..TRIPLE PLUS
-29FC ; Common # Ps LEFT-POINTING CURVED ANGLE BRACKET
-29FD ; Common # Pe RIGHT-POINTING CURVED ANGLE BRACKET
-29FE..2AFF ; Common # Sm [258] TINY..N-ARY WHITE VERTICAL BAR
-2B00..2B2F ; Common # So [48] NORTH EAST WHITE ARROW..WHITE VERTICAL ELLIPSE
-2B30..2B44 ; Common # Sm [21] LEFT ARROW WITH SMALL CIRCLE..RIGHTWARDS ARROW THROUGH SUPERSET
-2B45..2B46 ; Common # So [2] LEFTWARDS QUADRUPLE ARROW..RIGHTWARDS QUADRUPLE ARROW
-2B47..2B4C ; Common # Sm [6] REVERSE TILDE OPERATOR ABOVE RIGHTWARDS ARROW..RIGHTWARDS ARROW ABOVE REVERSE TILDE OPERATOR
-2B50..2B54 ; Common # So [5] WHITE MEDIUM STAR..WHITE RIGHT-POINTING PENTAGON
-2E00..2E01 ; Common # Po [2] RIGHT ANGLE SUBSTITUTION MARKER..RIGHT ANGLE DOTTED SUBSTITUTION MARKER
-2E02 ; Common # Pi LEFT SUBSTITUTION BRACKET
-2E03 ; Common # Pf RIGHT SUBSTITUTION BRACKET
-2E04 ; Common # Pi LEFT DOTTED SUBSTITUTION BRACKET
-2E05 ; Common # Pf RIGHT DOTTED SUBSTITUTION BRACKET
-2E06..2E08 ; Common # Po [3] RAISED INTERPOLATION MARKER..DOTTED TRANSPOSITION MARKER
-2E09 ; Common # Pi LEFT TRANSPOSITION BRACKET
-2E0A ; Common # Pf RIGHT TRANSPOSITION BRACKET
-2E0B ; Common # Po RAISED SQUARE
-2E0C ; Common # Pi LEFT RAISED OMISSION BRACKET
-2E0D ; Common # Pf RIGHT RAISED OMISSION BRACKET
-2E0E..2E16 ; Common # Po [9] EDITORIAL CORONIS..DOTTED RIGHT-POINTING ANGLE
-2E17 ; Common # Pd DOUBLE OBLIQUE HYPHEN
-2E18..2E19 ; Common # Po [2] INVERTED INTERROBANG..PALM BRANCH
-2E1A ; Common # Pd HYPHEN WITH DIAERESIS
-2E1B ; Common # Po TILDE WITH RING ABOVE
-2E1C ; Common # Pi LEFT LOW PARAPHRASE BRACKET
-2E1D ; Common # Pf RIGHT LOW PARAPHRASE BRACKET
-2E1E..2E1F ; Common # Po [2] TILDE WITH DOT ABOVE..TILDE WITH DOT BELOW
-2E20 ; Common # Pi LEFT VERTICAL BAR WITH QUILL
-2E21 ; Common # Pf RIGHT VERTICAL BAR WITH QUILL
-2E22 ; Common # Ps TOP LEFT HALF BRACKET
-2E23 ; Common # Pe TOP RIGHT HALF BRACKET
-2E24 ; Common # Ps BOTTOM LEFT HALF BRACKET
-2E25 ; Common # Pe BOTTOM RIGHT HALF BRACKET
-2E26 ; Common # Ps LEFT SIDEWAYS U BRACKET
-2E27 ; Common # Pe RIGHT SIDEWAYS U BRACKET
-2E28 ; Common # Ps LEFT DOUBLE PARENTHESIS
-2E29 ; Common # Pe RIGHT DOUBLE PARENTHESIS
-2E2A..2E2E ; Common # Po [5] TWO DOTS OVER ONE DOT PUNCTUATION..REVERSED QUESTION MARK
-2E2F ; Common # Lm VERTICAL TILDE
-2E30 ; Common # Po RING POINT
-2FF0..2FFB ; Common # So [12] IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT..IDEOGRAPHIC DESCRIPTION CHARACTER OVERLAID
-3000 ; Common # Zs IDEOGRAPHIC SPACE
-3001..3003 ; Common # Po [3] IDEOGRAPHIC COMMA..DITTO MARK
-3004 ; Common # So JAPANESE INDUSTRIAL STANDARD SYMBOL
-3006 ; Common # Lo IDEOGRAPHIC CLOSING MARK
-3008 ; Common # Ps LEFT ANGLE BRACKET
-3009 ; Common # Pe RIGHT ANGLE BRACKET
-300A ; Common # Ps LEFT DOUBLE ANGLE BRACKET
-300B ; Common # Pe RIGHT DOUBLE ANGLE BRACKET
-300C ; Common # Ps LEFT CORNER BRACKET
-300D ; Common # Pe RIGHT CORNER BRACKET
-300E ; Common # Ps LEFT WHITE CORNER BRACKET
-300F ; Common # Pe RIGHT WHITE CORNER BRACKET
-3010 ; Common # Ps LEFT BLACK LENTICULAR BRACKET
-3011 ; Common # Pe RIGHT BLACK LENTICULAR BRACKET
-3012..3013 ; Common # So [2] POSTAL MARK..GETA MARK
-3014 ; Common # Ps LEFT TORTOISE SHELL BRACKET
-3015 ; Common # Pe RIGHT TORTOISE SHELL BRACKET
-3016 ; Common # Ps LEFT WHITE LENTICULAR BRACKET
-3017 ; Common # Pe RIGHT WHITE LENTICULAR BRACKET
-3018 ; Common # Ps LEFT WHITE TORTOISE SHELL BRACKET
-3019 ; Common # Pe RIGHT WHITE TORTOISE SHELL BRACKET
-301A ; Common # Ps LEFT WHITE SQUARE BRACKET
-301B ; Common # Pe RIGHT WHITE SQUARE BRACKET
-301C ; Common # Pd WAVE DASH
-301D ; Common # Ps REVERSED DOUBLE PRIME QUOTATION MARK
-301E..301F ; Common # Pe [2] DOUBLE PRIME QUOTATION MARK..LOW DOUBLE PRIME QUOTATION MARK
-3020 ; Common # So POSTAL MARK FACE
-3030 ; Common # Pd WAVY DASH
-3031..3035 ; Common # Lm [5] VERTICAL KANA REPEAT MARK..VERTICAL KANA REPEAT MARK LOWER HALF
-3036..3037 ; Common # So [2] CIRCLED POSTAL MARK..IDEOGRAPHIC TELEGRAPH LINE FEED SEPARATOR SYMBOL
-303C ; Common # Lo MASU MARK
-303D ; Common # Po PART ALTERNATION MARK
-303E..303F ; Common # So [2] IDEOGRAPHIC VARIATION INDICATOR..IDEOGRAPHIC HALF FILL SPACE
-309B..309C ; Common # Sk [2] KATAKANA-HIRAGANA VOICED SOUND MARK..KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
-30A0 ; Common # Pd KATAKANA-HIRAGANA DOUBLE HYPHEN
-30FB ; Common # Po KATAKANA MIDDLE DOT
-30FC ; Common # Lm KATAKANA-HIRAGANA PROLONGED SOUND MARK
-3190..3191 ; Common # So [2] IDEOGRAPHIC ANNOTATION LINKING MARK..IDEOGRAPHIC ANNOTATION REVERSE MARK
-3192..3195 ; Common # No [4] IDEOGRAPHIC ANNOTATION ONE MARK..IDEOGRAPHIC ANNOTATION FOUR MARK
-3196..319F ; Common # So [10] IDEOGRAPHIC ANNOTATION TOP MARK..IDEOGRAPHIC ANNOTATION MAN MARK
-31C0..31E3 ; Common # So [36] CJK STROKE T..CJK STROKE Q
-3220..3229 ; Common # No [10] PARENTHESIZED IDEOGRAPH ONE..PARENTHESIZED IDEOGRAPH TEN
-322A..3243 ; Common # So [26] PARENTHESIZED IDEOGRAPH MOON..PARENTHESIZED IDEOGRAPH REACH
-3250 ; Common # So PARTNERSHIP SIGN
-3251..325F ; Common # No [15] CIRCLED NUMBER TWENTY ONE..CIRCLED NUMBER THIRTY FIVE
-327F ; Common # So KOREAN STANDARD SYMBOL
-3280..3289 ; Common # No [10] CIRCLED IDEOGRAPH ONE..CIRCLED IDEOGRAPH TEN
-328A..32B0 ; Common # So [39] CIRCLED IDEOGRAPH MOON..CIRCLED IDEOGRAPH NIGHT
-32B1..32BF ; Common # No [15] CIRCLED NUMBER THIRTY SIX..CIRCLED NUMBER FIFTY
-32C0..32CF ; Common # So [16] IDEOGRAPHIC TELEGRAPH SYMBOL FOR JANUARY..LIMITED LIABILITY SIGN
-3358..33FF ; Common # So [168] IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR ZERO..SQUARE GAL
-4DC0..4DFF ; Common # So [64] HEXAGRAM FOR THE CREATIVE HEAVEN..HEXAGRAM FOR BEFORE COMPLETION
-A700..A716 ; Common # Sk [23] MODIFIER LETTER CHINESE TONE YIN PING..MODIFIER LETTER EXTRA-LOW LEFT-STEM TONE BAR
-A717..A71F ; Common # Lm [9] MODIFIER LETTER DOT VERTICAL BAR..MODIFIER LETTER LOW INVERTED EXCLAMATION MARK
-A720..A721 ; Common # Sk [2] MODIFIER LETTER STRESS AND HIGH TONE..MODIFIER LETTER STRESS AND LOW TONE
-A788 ; Common # Lm MODIFIER LETTER LOW CIRCUMFLEX ACCENT
-A789..A78A ; Common # Sk [2] MODIFIER LETTER COLON..MODIFIER LETTER SHORT EQUALS SIGN
-FD3E ; Common # Ps ORNATE LEFT PARENTHESIS
-FD3F ; Common # Pe ORNATE RIGHT PARENTHESIS
-FDFD ; Common # So ARABIC LIGATURE BISMILLAH AR-RAHMAN AR-RAHEEM
-FE10..FE16 ; Common # Po [7] PRESENTATION FORM FOR VERTICAL COMMA..PRESENTATION FORM FOR VERTICAL QUESTION MARK
-FE17 ; Common # Ps PRESENTATION FORM FOR VERTICAL LEFT WHITE LENTICULAR BRACKET
-FE18 ; Common # Pe PRESENTATION FORM FOR VERTICAL RIGHT WHITE LENTICULAR BRAKCET
-FE19 ; Common # Po PRESENTATION FORM FOR VERTICAL HORIZONTAL ELLIPSIS
-FE30 ; Common # Po PRESENTATION FORM FOR VERTICAL TWO DOT LEADER
-FE31..FE32 ; Common # Pd [2] PRESENTATION FORM FOR VERTICAL EM DASH..PRESENTATION FORM FOR VERTICAL EN DASH
-FE33..FE34 ; Common # Pc [2] PRESENTATION FORM FOR VERTICAL LOW LINE..PRESENTATION FORM FOR VERTICAL WAVY LOW LINE
-FE35 ; Common # Ps PRESENTATION FORM FOR VERTICAL LEFT PARENTHESIS
-FE36 ; Common # Pe PRESENTATION FORM FOR VERTICAL RIGHT PARENTHESIS
-FE37 ; Common # Ps PRESENTATION FORM FOR VERTICAL LEFT CURLY BRACKET
-FE38 ; Common # Pe PRESENTATION FORM FOR VERTICAL RIGHT CURLY BRACKET
-FE39 ; Common # Ps PRESENTATION FORM FOR VERTICAL LEFT TORTOISE SHELL BRACKET
-FE3A ; Common # Pe PRESENTATION FORM FOR VERTICAL RIGHT TORTOISE SHELL BRACKET
-FE3B ; Common # Ps PRESENTATION FORM FOR VERTICAL LEFT BLACK LENTICULAR BRACKET
-FE3C ; Common # Pe PRESENTATION FORM FOR VERTICAL RIGHT BLACK LENTICULAR BRACKET
-FE3D ; Common # Ps PRESENTATION FORM FOR VERTICAL LEFT DOUBLE ANGLE BRACKET
-FE3E ; Common # Pe PRESENTATION FORM FOR VERTICAL RIGHT DOUBLE ANGLE BRACKET
-FE3F ; Common # Ps PRESENTATION FORM FOR VERTICAL LEFT ANGLE BRACKET
-FE40 ; Common # Pe PRESENTATION FORM FOR VERTICAL RIGHT ANGLE BRACKET
-FE41 ; Common # Ps PRESENTATION FORM FOR VERTICAL LEFT CORNER BRACKET
-FE42 ; Common # Pe PRESENTATION FORM FOR VERTICAL RIGHT CORNER BRACKET
-FE43 ; Common # Ps PRESENTATION FORM FOR VERTICAL LEFT WHITE CORNER BRACKET
-FE44 ; Common # Pe PRESENTATION FORM FOR VERTICAL RIGHT WHITE CORNER BRACKET
-FE45..FE46 ; Common # Po [2] SESAME DOT..WHITE SESAME DOT
-FE47 ; Common # Ps PRESENTATION FORM FOR VERTICAL LEFT SQUARE BRACKET
-FE48 ; Common # Pe PRESENTATION FORM FOR VERTICAL RIGHT SQUARE BRACKET
-FE49..FE4C ; Common # Po [4] DASHED OVERLINE..DOUBLE WAVY OVERLINE
-FE4D..FE4F ; Common # Pc [3] DASHED LOW LINE..WAVY LOW LINE
-FE50..FE52 ; Common # Po [3] SMALL COMMA..SMALL FULL STOP
-FE54..FE57 ; Common # Po [4] SMALL SEMICOLON..SMALL EXCLAMATION MARK
-FE58 ; Common # Pd SMALL EM DASH
-FE59 ; Common # Ps SMALL LEFT PARENTHESIS
-FE5A ; Common # Pe SMALL RIGHT PARENTHESIS
-FE5B ; Common # Ps SMALL LEFT CURLY BRACKET
-FE5C ; Common # Pe SMALL RIGHT CURLY BRACKET
-FE5D ; Common # Ps SMALL LEFT TORTOISE SHELL BRACKET
-FE5E ; Common # Pe SMALL RIGHT TORTOISE SHELL BRACKET
-FE5F..FE61 ; Common # Po [3] SMALL NUMBER SIGN..SMALL ASTERISK
-FE62 ; Common # Sm SMALL PLUS SIGN
-FE63 ; Common # Pd SMALL HYPHEN-MINUS
-FE64..FE66 ; Common # Sm [3] SMALL LESS-THAN SIGN..SMALL EQUALS SIGN
-FE68 ; Common # Po SMALL REVERSE SOLIDUS
-FE69 ; Common # Sc SMALL DOLLAR SIGN
-FE6A..FE6B ; Common # Po [2] SMALL PERCENT SIGN..SMALL COMMERCIAL AT
-FEFF ; Common # Cf ZERO WIDTH NO-BREAK SPACE
-FF01..FF03 ; Common # Po [3] FULLWIDTH EXCLAMATION MARK..FULLWIDTH NUMBER SIGN
-FF04 ; Common # Sc FULLWIDTH DOLLAR SIGN
-FF05..FF07 ; Common # Po [3] FULLWIDTH PERCENT SIGN..FULLWIDTH APOSTROPHE
-FF08 ; Common # Ps FULLWIDTH LEFT PARENTHESIS
-FF09 ; Common # Pe FULLWIDTH RIGHT PARENTHESIS
-FF0A ; Common # Po FULLWIDTH ASTERISK
-FF0B ; Common # Sm FULLWIDTH PLUS SIGN
-FF0C ; Common # Po FULLWIDTH COMMA
-FF0D ; Common # Pd FULLWIDTH HYPHEN-MINUS
-FF0E..FF0F ; Common # Po [2] FULLWIDTH FULL STOP..FULLWIDTH SOLIDUS
-FF10..FF19 ; Common # Nd [10] FULLWIDTH DIGIT ZERO..FULLWIDTH DIGIT NINE
-FF1A..FF1B ; Common # Po [2] FULLWIDTH COLON..FULLWIDTH SEMICOLON
-FF1C..FF1E ; Common # Sm [3] FULLWIDTH LESS-THAN SIGN..FULLWIDTH GREATER-THAN SIGN
-FF1F..FF20 ; Common # Po [2] FULLWIDTH QUESTION MARK..FULLWIDTH COMMERCIAL AT
-FF3B ; Common # Ps FULLWIDTH LEFT SQUARE BRACKET
-FF3C ; Common # Po FULLWIDTH REVERSE SOLIDUS
-FF3D ; Common # Pe FULLWIDTH RIGHT SQUARE BRACKET
-FF3E ; Common # Sk FULLWIDTH CIRCUMFLEX ACCENT
-FF3F ; Common # Pc FULLWIDTH LOW LINE
-FF40 ; Common # Sk FULLWIDTH GRAVE ACCENT
-FF5B ; Common # Ps FULLWIDTH LEFT CURLY BRACKET
-FF5C ; Common # Sm FULLWIDTH VERTICAL LINE
-FF5D ; Common # Pe FULLWIDTH RIGHT CURLY BRACKET
-FF5E ; Common # Sm FULLWIDTH TILDE
-FF5F ; Common # Ps FULLWIDTH LEFT WHITE PARENTHESIS
-FF60 ; Common # Pe FULLWIDTH RIGHT WHITE PARENTHESIS
-FF61 ; Common # Po HALFWIDTH IDEOGRAPHIC FULL STOP
-FF62 ; Common # Ps HALFWIDTH LEFT CORNER BRACKET
-FF63 ; Common # Pe HALFWIDTH RIGHT CORNER BRACKET
-FF64..FF65 ; Common # Po [2] HALFWIDTH IDEOGRAPHIC COMMA..HALFWIDTH KATAKANA MIDDLE DOT
-FF70 ; Common # Lm HALFWIDTH KATAKANA-HIRAGANA PROLONGED SOUND MARK
-FF9E..FF9F ; Common # Lm [2] HALFWIDTH KATAKANA VOICED SOUND MARK..HALFWIDTH KATAKANA SEMI-VOICED SOUND MARK
-FFE0..FFE1 ; Common # Sc [2] FULLWIDTH CENT SIGN..FULLWIDTH POUND SIGN
-FFE2 ; Common # Sm FULLWIDTH NOT SIGN
-FFE3 ; Common # Sk FULLWIDTH MACRON
-FFE4 ; Common # So FULLWIDTH BROKEN BAR
-FFE5..FFE6 ; Common # Sc [2] FULLWIDTH YEN SIGN..FULLWIDTH WON SIGN
-FFE8 ; Common # So HALFWIDTH FORMS LIGHT VERTICAL
-FFE9..FFEC ; Common # Sm [4] HALFWIDTH LEFTWARDS ARROW..HALFWIDTH DOWNWARDS ARROW
-FFED..FFEE ; Common # So [2] HALFWIDTH BLACK SQUARE..HALFWIDTH WHITE CIRCLE
-FFF9..FFFB ; Common # Cf [3] INTERLINEAR ANNOTATION ANCHOR..INTERLINEAR ANNOTATION TERMINATOR
-FFFC..FFFD ; Common # So [2] OBJECT REPLACEMENT CHARACTER..REPLACEMENT CHARACTER
-10100..10101 ; Common # Po [2] AEGEAN WORD SEPARATOR LINE..AEGEAN WORD SEPARATOR DOT
-10102 ; Common # So AEGEAN CHECK MARK
-10107..10133 ; Common # No [45] AEGEAN NUMBER ONE..AEGEAN NUMBER NINETY THOUSAND
-10137..1013F ; Common # So [9] AEGEAN WEIGHT BASE UNIT..AEGEAN MEASURE THIRD SUBUNIT
-10190..1019B ; Common # So [12] ROMAN SEXTANS SIGN..ROMAN CENTURIAL SIGN
-101D0..101FC ; Common # So [45] PHAISTOS DISC SIGN PEDESTRIAN..PHAISTOS DISC SIGN WAVY BAND
-1D000..1D0F5 ; Common # So [246] BYZANTINE MUSICAL SYMBOL PSILI..BYZANTINE MUSICAL SYMBOL GORGON NEO KATO
-1D100..1D126 ; Common # So [39] MUSICAL SYMBOL SINGLE BARLINE..MUSICAL SYMBOL DRUM CLEF-2
-1D129..1D164 ; Common # So [60] MUSICAL SYMBOL MULTIPLE MEASURE REST..MUSICAL SYMBOL ONE HUNDRED TWENTY-EIGHTH NOTE
-1D165..1D166 ; Common # Mc [2] MUSICAL SYMBOL COMBINING STEM..MUSICAL SYMBOL COMBINING SPRECHGESANG STEM
-1D16A..1D16C ; Common # So [3] MUSICAL SYMBOL FINGERED TREMOLO-1..MUSICAL SYMBOL FINGERED TREMOLO-3
-1D16D..1D172 ; Common # Mc [6] MUSICAL SYMBOL COMBINING AUGMENTATION DOT..MUSICAL SYMBOL COMBINING FLAG-5
-1D173..1D17A ; Common # Cf [8] MUSICAL SYMBOL BEGIN BEAM..MUSICAL SYMBOL END PHRASE
-1D183..1D184 ; Common # So [2] MUSICAL SYMBOL ARPEGGIATO UP..MUSICAL SYMBOL ARPEGGIATO DOWN
-1D18C..1D1A9 ; Common # So [30] MUSICAL SYMBOL RINFORZANDO..MUSICAL SYMBOL DEGREE SLASH
-1D1AE..1D1DD ; Common # So [48] MUSICAL SYMBOL PEDAL MARK..MUSICAL SYMBOL PES SUBPUNCTIS
-1D300..1D356 ; Common # So [87] MONOGRAM FOR EARTH..TETRAGRAM FOR FOSTERING
-1D360..1D371 ; Common # No [18] COUNTING ROD UNIT DIGIT ONE..COUNTING ROD TENS DIGIT NINE
-1D400..1D454 ; Common # L& [85] MATHEMATICAL BOLD CAPITAL A..MATHEMATICAL ITALIC SMALL G
-1D456..1D49C ; Common # L& [71] MATHEMATICAL ITALIC SMALL I..MATHEMATICAL SCRIPT CAPITAL A
-1D49E..1D49F ; Common # L& [2] MATHEMATICAL SCRIPT CAPITAL C..MATHEMATICAL SCRIPT CAPITAL D
-1D4A2 ; Common # L& MATHEMATICAL SCRIPT CAPITAL G
-1D4A5..1D4A6 ; Common # L& [2] MATHEMATICAL SCRIPT CAPITAL J..MATHEMATICAL SCRIPT CAPITAL K
-1D4A9..1D4AC ; Common # L& [4] MATHEMATICAL SCRIPT CAPITAL N..MATHEMATICAL SCRIPT CAPITAL Q
-1D4AE..1D4B9 ; Common # L& [12] MATHEMATICAL SCRIPT CAPITAL S..MATHEMATICAL SCRIPT SMALL D
-1D4BB ; Common # L& MATHEMATICAL SCRIPT SMALL F
-1D4BD..1D4C3 ; Common # L& [7] MATHEMATICAL SCRIPT SMALL H..MATHEMATICAL SCRIPT SMALL N
-1D4C5..1D505 ; Common # L& [65] MATHEMATICAL SCRIPT SMALL P..MATHEMATICAL FRAKTUR CAPITAL B
-1D507..1D50A ; Common # L& [4] MATHEMATICAL FRAKTUR CAPITAL D..MATHEMATICAL FRAKTUR CAPITAL G
-1D50D..1D514 ; Common # L& [8] MATHEMATICAL FRAKTUR CAPITAL J..MATHEMATICAL FRAKTUR CAPITAL Q
-1D516..1D51C ; Common # L& [7] MATHEMATICAL FRAKTUR CAPITAL S..MATHEMATICAL FRAKTUR CAPITAL Y
-1D51E..1D539 ; Common # L& [28] MATHEMATICAL FRAKTUR SMALL A..MATHEMATICAL DOUBLE-STRUCK CAPITAL B
-1D53B..1D53E ; Common # L& [4] MATHEMATICAL DOUBLE-STRUCK CAPITAL D..MATHEMATICAL DOUBLE-STRUCK CAPITAL G
-1D540..1D544 ; Common # L& [5] MATHEMATICAL DOUBLE-STRUCK CAPITAL I..MATHEMATICAL DOUBLE-STRUCK CAPITAL M
-1D546 ; Common # L& MATHEMATICAL DOUBLE-STRUCK CAPITAL O
-1D54A..1D550 ; Common # L& [7] MATHEMATICAL DOUBLE-STRUCK CAPITAL S..MATHEMATICAL DOUBLE-STRUCK CAPITAL Y
-1D552..1D6A5 ; Common # L& [340] MATHEMATICAL DOUBLE-STRUCK SMALL A..MATHEMATICAL ITALIC SMALL DOTLESS J
-1D6A8..1D6C0 ; Common # L& [25] MATHEMATICAL BOLD CAPITAL ALPHA..MATHEMATICAL BOLD CAPITAL OMEGA
-1D6C1 ; Common # Sm MATHEMATICAL BOLD NABLA
-1D6C2..1D6DA ; Common # L& [25] MATHEMATICAL BOLD SMALL ALPHA..MATHEMATICAL BOLD SMALL OMEGA
-1D6DB ; Common # Sm MATHEMATICAL BOLD PARTIAL DIFFERENTIAL
-1D6DC..1D6FA ; Common # L& [31] MATHEMATICAL BOLD EPSILON SYMBOL..MATHEMATICAL ITALIC CAPITAL OMEGA
-1D6FB ; Common # Sm MATHEMATICAL ITALIC NABLA
-1D6FC..1D714 ; Common # L& [25] MATHEMATICAL ITALIC SMALL ALPHA..MATHEMATICAL ITALIC SMALL OMEGA
-1D715 ; Common # Sm MATHEMATICAL ITALIC PARTIAL DIFFERENTIAL
-1D716..1D734 ; Common # L& [31] MATHEMATICAL ITALIC EPSILON SYMBOL..MATHEMATICAL BOLD ITALIC CAPITAL OMEGA
-1D735 ; Common # Sm MATHEMATICAL BOLD ITALIC NABLA
-1D736..1D74E ; Common # L& [25] MATHEMATICAL BOLD ITALIC SMALL ALPHA..MATHEMATICAL BOLD ITALIC SMALL OMEGA
-1D74F ; Common # Sm MATHEMATICAL BOLD ITALIC PARTIAL DIFFERENTIAL
-1D750..1D76E ; Common # L& [31] MATHEMATICAL BOLD ITALIC EPSILON SYMBOL..MATHEMATICAL SANS-SERIF BOLD CAPITAL OMEGA
-1D76F ; Common # Sm MATHEMATICAL SANS-SERIF BOLD NABLA
-1D770..1D788 ; Common # L& [25] MATHEMATICAL SANS-SERIF BOLD SMALL ALPHA..MATHEMATICAL SANS-SERIF BOLD SMALL OMEGA
-1D789 ; Common # Sm MATHEMATICAL SANS-SERIF BOLD PARTIAL DIFFERENTIAL
-1D78A..1D7A8 ; Common # L& [31] MATHEMATICAL SANS-SERIF BOLD EPSILON SYMBOL..MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL OMEGA
-1D7A9 ; Common # Sm MATHEMATICAL SANS-SERIF BOLD ITALIC NABLA
-1D7AA..1D7C2 ; Common # L& [25] MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL ALPHA..MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL OMEGA
-1D7C3 ; Common # Sm MATHEMATICAL SANS-SERIF BOLD ITALIC PARTIAL DIFFERENTIAL
-1D7C4..1D7CB ; Common # L& [8] MATHEMATICAL SANS-SERIF BOLD ITALIC EPSILON SYMBOL..MATHEMATICAL BOLD SMALL DIGAMMA
-1D7CE..1D7FF ; Common # Nd [50] MATHEMATICAL BOLD DIGIT ZERO..MATHEMATICAL MONOSPACE DIGIT NINE
-1F000..1F02B ; Common # So [44] MAHJONG TILE EAST WIND..MAHJONG TILE BACK
-1F030..1F093 ; Common # So [100] DOMINO TILE HORIZONTAL BACK..DOMINO TILE VERTICAL-06-06
-E0001 ; Common # Cf LANGUAGE TAG
-E0020..E007F ; Common # Cf [96] TAG SPACE..CANCEL TAG
-
-# Total code points: 5178
-
-# ================================================
-
-0041..005A ; Latin # L& [26] LATIN CAPITAL LETTER A..LATIN CAPITAL LETTER Z
-0061..007A ; Latin # L& [26] LATIN SMALL LETTER A..LATIN SMALL LETTER Z
-00AA ; Latin # L& FEMININE ORDINAL INDICATOR
-00BA ; Latin # L& MASCULINE ORDINAL INDICATOR
-00C0..00D6 ; Latin # L& [23] LATIN CAPITAL LETTER A WITH GRAVE..LATIN CAPITAL LETTER O WITH DIAERESIS
-00D8..00F6 ; Latin # L& [31] LATIN CAPITAL LETTER O WITH STROKE..LATIN SMALL LETTER O WITH DIAERESIS
-00F8..01BA ; Latin # L& [195] LATIN SMALL LETTER O WITH STROKE..LATIN SMALL LETTER EZH WITH TAIL
-01BB ; Latin # Lo LATIN LETTER TWO WITH STROKE
-01BC..01BF ; Latin # L& [4] LATIN CAPITAL LETTER TONE FIVE..LATIN LETTER WYNN
-01C0..01C3 ; Latin # Lo [4] LATIN LETTER DENTAL CLICK..LATIN LETTER RETROFLEX CLICK
-01C4..0293 ; Latin # L& [208] LATIN CAPITAL LETTER DZ WITH CARON..LATIN SMALL LETTER EZH WITH CURL
-0294 ; Latin # Lo LATIN LETTER GLOTTAL STOP
-0295..02AF ; Latin # L& [27] LATIN LETTER PHARYNGEAL VOICED FRICATIVE..LATIN SMALL LETTER TURNED H WITH FISHHOOK AND TAIL
-02B0..02B8 ; Latin # Lm [9] MODIFIER LETTER SMALL H..MODIFIER LETTER SMALL Y
-02E0..02E4 ; Latin # Lm [5] MODIFIER LETTER SMALL GAMMA..MODIFIER LETTER SMALL REVERSED GLOTTAL STOP
-1D00..1D25 ; Latin # L& [38] LATIN LETTER SMALL CAPITAL A..LATIN LETTER AIN
-1D2C..1D5C ; Latin # Lm [49] MODIFIER LETTER CAPITAL A..MODIFIER LETTER SMALL AIN
-1D62..1D65 ; Latin # L& [4] LATIN SUBSCRIPT SMALL LETTER I..LATIN SUBSCRIPT SMALL LETTER V
-1D6B..1D77 ; Latin # L& [13] LATIN SMALL LETTER UE..LATIN SMALL LETTER TURNED G
-1D79..1D9A ; Latin # L& [34] LATIN SMALL LETTER INSULAR G..LATIN SMALL LETTER EZH WITH RETROFLEX HOOK
-1D9B..1DBE ; Latin # Lm [36] MODIFIER LETTER SMALL TURNED ALPHA..MODIFIER LETTER SMALL EZH
-1E00..1EFF ; Latin # L& [256] LATIN CAPITAL LETTER A WITH RING BELOW..LATIN SMALL LETTER Y WITH LOOP
-2071 ; Latin # L& SUPERSCRIPT LATIN SMALL LETTER I
-207F ; Latin # L& SUPERSCRIPT LATIN SMALL LETTER N
-2090..2094 ; Latin # Lm [5] LATIN SUBSCRIPT SMALL LETTER A..LATIN SUBSCRIPT SMALL LETTER SCHWA
-212A..212B ; Latin # L& [2] KELVIN SIGN..ANGSTROM SIGN
-2132 ; Latin # L& TURNED CAPITAL F
-214E ; Latin # L& TURNED SMALL F
-2160..2182 ; Latin # Nl [35] ROMAN NUMERAL ONE..ROMAN NUMERAL TEN THOUSAND
-2183..2184 ; Latin # L& [2] ROMAN NUMERAL REVERSED ONE HUNDRED..LATIN SMALL LETTER REVERSED C
-2185..2188 ; Latin # Nl [4] ROMAN NUMERAL SIX LATE FORM..ROMAN NUMERAL ONE HUNDRED THOUSAND
-2C60..2C6F ; Latin # L& [16] LATIN CAPITAL LETTER L WITH DOUBLE BAR..LATIN CAPITAL LETTER TURNED A
-2C71..2C7C ; Latin # L& [12] LATIN SMALL LETTER V WITH RIGHT HOOK..LATIN SUBSCRIPT SMALL LETTER J
-2C7D ; Latin # Lm MODIFIER LETTER CAPITAL V
-A722..A76F ; Latin # L& [78] LATIN CAPITAL LETTER EGYPTOLOGICAL ALEF..LATIN SMALL LETTER CON
-A770 ; Latin # Lm MODIFIER LETTER US
-A771..A787 ; Latin # L& [23] LATIN SMALL LETTER DUM..LATIN SMALL LETTER INSULAR T
-A78B..A78C ; Latin # L& [2] LATIN CAPITAL LETTER SALTILLO..LATIN SMALL LETTER SALTILLO
-A7FB..A7FF ; Latin # Lo [5] LATIN EPIGRAPHIC LETTER REVERSED F..LATIN EPIGRAPHIC LETTER ARCHAIC M
-FB00..FB06 ; Latin # L& [7] LATIN SMALL LIGATURE FF..LATIN SMALL LIGATURE ST
-FF21..FF3A ; Latin # L& [26] FULLWIDTH LATIN CAPITAL LETTER A..FULLWIDTH LATIN CAPITAL LETTER Z
-FF41..FF5A ; Latin # L& [26] FULLWIDTH LATIN SMALL LETTER A..FULLWIDTH LATIN SMALL LETTER Z
-
-# Total code points: 1241
-
-# ================================================
-
-0370..0373 ; Greek # L& [4] GREEK CAPITAL LETTER HETA..GREEK SMALL LETTER ARCHAIC SAMPI
-0375 ; Greek # Sk GREEK LOWER NUMERAL SIGN
-0376..0377 ; Greek # L& [2] GREEK CAPITAL LETTER PAMPHYLIAN DIGAMMA..GREEK SMALL LETTER PAMPHYLIAN DIGAMMA
-037A ; Greek # Lm GREEK YPOGEGRAMMENI
-037B..037D ; Greek # L& [3] GREEK SMALL REVERSED LUNATE SIGMA SYMBOL..GREEK SMALL REVERSED DOTTED LUNATE SIGMA SYMBOL
-0384 ; Greek # Sk GREEK TONOS
-0386 ; Greek # L& GREEK CAPITAL LETTER ALPHA WITH TONOS
-0388..038A ; Greek # L& [3] GREEK CAPITAL LETTER EPSILON WITH TONOS..GREEK CAPITAL LETTER IOTA WITH TONOS
-038C ; Greek # L& GREEK CAPITAL LETTER OMICRON WITH TONOS
-038E..03A1 ; Greek # L& [20] GREEK CAPITAL LETTER UPSILON WITH TONOS..GREEK CAPITAL LETTER RHO
-03A3..03E1 ; Greek # L& [63] GREEK CAPITAL LETTER SIGMA..GREEK SMALL LETTER SAMPI
-03F0..03F5 ; Greek # L& [6] GREEK KAPPA SYMBOL..GREEK LUNATE EPSILON SYMBOL
-03F6 ; Greek # Sm GREEK REVERSED LUNATE EPSILON SYMBOL
-03F7..03FF ; Greek # L& [9] GREEK CAPITAL LETTER SHO..GREEK CAPITAL REVERSED DOTTED LUNATE SIGMA SYMBOL
-1D26..1D2A ; Greek # L& [5] GREEK LETTER SMALL CAPITAL GAMMA..GREEK LETTER SMALL CAPITAL PSI
-1D5D..1D61 ; Greek # Lm [5] MODIFIER LETTER SMALL BETA..MODIFIER LETTER SMALL CHI
-1D66..1D6A ; Greek # L& [5] GREEK SUBSCRIPT SMALL LETTER BETA..GREEK SUBSCRIPT SMALL LETTER CHI
-1DBF ; Greek # Lm MODIFIER LETTER SMALL THETA
-1F00..1F15 ; Greek # L& [22] GREEK SMALL LETTER ALPHA WITH PSILI..GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA
-1F18..1F1D ; Greek # L& [6] GREEK CAPITAL LETTER EPSILON WITH PSILI..GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA
-1F20..1F45 ; Greek # L& [38] GREEK SMALL LETTER ETA WITH PSILI..GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA
-1F48..1F4D ; Greek # L& [6] GREEK CAPITAL LETTER OMICRON WITH PSILI..GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA
-1F50..1F57 ; Greek # L& [8] GREEK SMALL LETTER UPSILON WITH PSILI..GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI
-1F59 ; Greek # L& GREEK CAPITAL LETTER UPSILON WITH DASIA
-1F5B ; Greek # L& GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA
-1F5D ; Greek # L& GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA
-1F5F..1F7D ; Greek # L& [31] GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI..GREEK SMALL LETTER OMEGA WITH OXIA
-1F80..1FB4 ; Greek # L& [53] GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI..GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI
-1FB6..1FBC ; Greek # L& [7] GREEK SMALL LETTER ALPHA WITH PERISPOMENI..GREEK CAPITAL LETTER ALPHA WITH PROSGEGRAMMENI
-1FBD ; Greek # Sk GREEK KORONIS
-1FBE ; Greek # L& GREEK PROSGEGRAMMENI
-1FBF..1FC1 ; Greek # Sk [3] GREEK PSILI..GREEK DIALYTIKA AND PERISPOMENI
-1FC2..1FC4 ; Greek # L& [3] GREEK SMALL LETTER ETA WITH VARIA AND YPOGEGRAMMENI..GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI
-1FC6..1FCC ; Greek # L& [7] GREEK SMALL LETTER ETA WITH PERISPOMENI..GREEK CAPITAL LETTER ETA WITH PROSGEGRAMMENI
-1FCD..1FCF ; Greek # Sk [3] GREEK PSILI AND VARIA..GREEK PSILI AND PERISPOMENI
-1FD0..1FD3 ; Greek # L& [4] GREEK SMALL LETTER IOTA WITH VRACHY..GREEK SMALL LETTER IOTA WITH DIALYTIKA AND OXIA
-1FD6..1FDB ; Greek # L& [6] GREEK SMALL LETTER IOTA WITH PERISPOMENI..GREEK CAPITAL LETTER IOTA WITH OXIA
-1FDD..1FDF ; Greek # Sk [3] GREEK DASIA AND VARIA..GREEK DASIA AND PERISPOMENI
-1FE0..1FEC ; Greek # L& [13] GREEK SMALL LETTER UPSILON WITH VRACHY..GREEK CAPITAL LETTER RHO WITH DASIA
-1FED..1FEF ; Greek # Sk [3] GREEK DIALYTIKA AND VARIA..GREEK VARIA
-1FF2..1FF4 ; Greek # L& [3] GREEK SMALL LETTER OMEGA WITH VARIA AND YPOGEGRAMMENI..GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI
-1FF6..1FFC ; Greek # L& [7] GREEK SMALL LETTER OMEGA WITH PERISPOMENI..GREEK CAPITAL LETTER OMEGA WITH PROSGEGRAMMENI
-1FFD..1FFE ; Greek # Sk [2] GREEK OXIA..GREEK DASIA
-2126 ; Greek # L& OHM SIGN
-10140..10174 ; Greek # Nl [53] GREEK ACROPHONIC ATTIC ONE QUARTER..GREEK ACROPHONIC STRATIAN FIFTY MNAS
-10175..10178 ; Greek # No [4] GREEK ONE HALF SIGN..GREEK THREE QUARTERS SIGN
-10179..10189 ; Greek # So [17] GREEK YEAR SIGN..GREEK TRYBLION BASE SIGN
-1018A ; Greek # No GREEK ZERO SIGN
-1D200..1D241 ; Greek # So [66] GREEK VOCAL NOTATION SYMBOL-1..GREEK INSTRUMENTAL NOTATION SYMBOL-54
-1D242..1D244 ; Greek # Mn [3] COMBINING GREEK MUSICAL TRISEME..COMBINING GREEK MUSICAL PENTASEME
-1D245 ; Greek # So GREEK MUSICAL LEIMMA
-
-# Total code points: 511
-
-# ================================================
-
-0400..0481 ; Cyrillic # L& [130] CYRILLIC CAPITAL LETTER IE WITH GRAVE..CYRILLIC SMALL LETTER KOPPA
-0482 ; Cyrillic # So CYRILLIC THOUSANDS SIGN
-0483..0487 ; Cyrillic # Mn [5] COMBINING CYRILLIC TITLO..COMBINING CYRILLIC POKRYTIE
-0488..0489 ; Cyrillic # Me [2] COMBINING CYRILLIC HUNDRED THOUSANDS SIGN..COMBINING CYRILLIC MILLIONS SIGN
-048A..0523 ; Cyrillic # L& [154] CYRILLIC CAPITAL LETTER SHORT I WITH TAIL..CYRILLIC SMALL LETTER EN WITH MIDDLE HOOK
-1D2B ; Cyrillic # L& CYRILLIC LETTER SMALL CAPITAL EL
-1D78 ; Cyrillic # Lm MODIFIER LETTER CYRILLIC EN
-2DE0..2DFF ; Cyrillic # Mn [32] COMBINING CYRILLIC LETTER BE..COMBINING CYRILLIC LETTER IOTIFIED BIG YUS
-A640..A65F ; Cyrillic # L& [32] CYRILLIC CAPITAL LETTER ZEMLYA..CYRILLIC SMALL LETTER YN
-A662..A66D ; Cyrillic # L& [12] CYRILLIC CAPITAL LETTER SOFT DE..CYRILLIC SMALL LETTER DOUBLE MONOCULAR O
-A66E ; Cyrillic # Lo CYRILLIC LETTER MULTIOCULAR O
-A66F ; Cyrillic # Mn COMBINING CYRILLIC VZMET
-A670..A672 ; Cyrillic # Me [3] COMBINING CYRILLIC TEN MILLIONS SIGN..COMBINING CYRILLIC THOUSAND MILLIONS SIGN
-A673 ; Cyrillic # Po SLAVONIC ASTERISK
-A67C..A67D ; Cyrillic # Mn [2] COMBINING CYRILLIC KAVYKA..COMBINING CYRILLIC PAYEROK
-A67E ; Cyrillic # Po CYRILLIC KAVYKA
-A67F ; Cyrillic # Lm CYRILLIC PAYEROK
-A680..A697 ; Cyrillic # L& [24] CYRILLIC CAPITAL LETTER DWE..CYRILLIC SMALL LETTER SHWE
-
-# Total code points: 404
-
-# ================================================
-
-0531..0556 ; Armenian # L& [38] ARMENIAN CAPITAL LETTER AYB..ARMENIAN CAPITAL LETTER FEH
-0559 ; Armenian # Lm ARMENIAN MODIFIER LETTER LEFT HALF RING
-055A..055F ; Armenian # Po [6] ARMENIAN APOSTROPHE..ARMENIAN ABBREVIATION MARK
-0561..0587 ; Armenian # L& [39] ARMENIAN SMALL LETTER AYB..ARMENIAN SMALL LIGATURE ECH YIWN
-058A ; Armenian # Pd ARMENIAN HYPHEN
-FB13..FB17 ; Armenian # L& [5] ARMENIAN SMALL LIGATURE MEN NOW..ARMENIAN SMALL LIGATURE MEN XEH
-
-# Total code points: 90
-
-# ================================================
-
-0591..05BD ; Hebrew # Mn [45] HEBREW ACCENT ETNAHTA..HEBREW POINT METEG
-05BE ; Hebrew # Pd HEBREW PUNCTUATION MAQAF
-05BF ; Hebrew # Mn HEBREW POINT RAFE
-05C0 ; Hebrew # Po HEBREW PUNCTUATION PASEQ
-05C1..05C2 ; Hebrew # Mn [2] HEBREW POINT SHIN DOT..HEBREW POINT SIN DOT
-05C3 ; Hebrew # Po HEBREW PUNCTUATION SOF PASUQ
-05C4..05C5 ; Hebrew # Mn [2] HEBREW MARK UPPER DOT..HEBREW MARK LOWER DOT
-05C6 ; Hebrew # Po HEBREW PUNCTUATION NUN HAFUKHA
-05C7 ; Hebrew # Mn HEBREW POINT QAMATS QATAN
-05D0..05EA ; Hebrew # Lo [27] HEBREW LETTER ALEF..HEBREW LETTER TAV
-05F0..05F2 ; Hebrew # Lo [3] HEBREW LIGATURE YIDDISH DOUBLE VAV..HEBREW LIGATURE YIDDISH DOUBLE YOD
-05F3..05F4 ; Hebrew # Po [2] HEBREW PUNCTUATION GERESH..HEBREW PUNCTUATION GERSHAYIM
-FB1D ; Hebrew # Lo HEBREW LETTER YOD WITH HIRIQ
-FB1E ; Hebrew # Mn HEBREW POINT JUDEO-SPANISH VARIKA
-FB1F..FB28 ; Hebrew # Lo [10] HEBREW LIGATURE YIDDISH YOD YOD PATAH..HEBREW LETTER WIDE TAV
-FB29 ; Hebrew # Sm HEBREW LETTER ALTERNATIVE PLUS SIGN
-FB2A..FB36 ; Hebrew # Lo [13] HEBREW LETTER SHIN WITH SHIN DOT..HEBREW LETTER ZAYIN WITH DAGESH
-FB38..FB3C ; Hebrew # Lo [5] HEBREW LETTER TET WITH DAGESH..HEBREW LETTER LAMED WITH DAGESH
-FB3E ; Hebrew # Lo HEBREW LETTER MEM WITH DAGESH
-FB40..FB41 ; Hebrew # Lo [2] HEBREW LETTER NUN WITH DAGESH..HEBREW LETTER SAMEKH WITH DAGESH
-FB43..FB44 ; Hebrew # Lo [2] HEBREW LETTER FINAL PE WITH DAGESH..HEBREW LETTER PE WITH DAGESH
-FB46..FB4F ; Hebrew # Lo [10] HEBREW LETTER TSADI WITH DAGESH..HEBREW LIGATURE ALEF LAMED
-
-# Total code points: 133
-
-# ================================================
-
-0606..0608 ; Arabic # Sm [3] ARABIC-INDIC CUBE ROOT..ARABIC RAY
-0609..060A ; Arabic # Po [2] ARABIC-INDIC PER MILLE SIGN..ARABIC-INDIC PER TEN THOUSAND SIGN
-060B ; Arabic # Sc AFGHANI SIGN
-060D ; Arabic # Po ARABIC DATE SEPARATOR
-060E..060F ; Arabic # So [2] ARABIC POETIC VERSE SIGN..ARABIC SIGN MISRA
-0610..061A ; Arabic # Mn [11] ARABIC SIGN SALLALLAHOU ALAYHE WASSALLAM..ARABIC SMALL KASRA
-061E ; Arabic # Po ARABIC TRIPLE DOT PUNCTUATION MARK
-0621..063F ; Arabic # Lo [31] ARABIC LETTER HAMZA..ARABIC LETTER FARSI YEH WITH THREE DOTS ABOVE
-0641..064A ; Arabic # Lo [10] ARABIC LETTER FEH..ARABIC LETTER YEH
-0656..065E ; Arabic # Mn [9] ARABIC SUBSCRIPT ALEF..ARABIC FATHA WITH TWO DOTS
-066A..066D ; Arabic # Po [4] ARABIC PERCENT SIGN..ARABIC FIVE POINTED STAR
-066E..066F ; Arabic # Lo [2] ARABIC LETTER DOTLESS BEH..ARABIC LETTER DOTLESS QAF
-0671..06D3 ; Arabic # Lo [99] ARABIC LETTER ALEF WASLA..ARABIC LETTER YEH BARREE WITH HAMZA ABOVE
-06D4 ; Arabic # Po ARABIC FULL STOP
-06D5 ; Arabic # Lo ARABIC LETTER AE
-06D6..06DC ; Arabic # Mn [7] ARABIC SMALL HIGH LIGATURE SAD WITH LAM WITH ALEF MAKSURA..ARABIC SMALL HIGH SEEN
-06DE ; Arabic # Me ARABIC START OF RUB EL HIZB
-06DF..06E4 ; Arabic # Mn [6] ARABIC SMALL HIGH ROUNDED ZERO..ARABIC SMALL HIGH MADDA
-06E5..06E6 ; Arabic # Lm [2] ARABIC SMALL WAW..ARABIC SMALL YEH
-06E7..06E8 ; Arabic # Mn [2] ARABIC SMALL HIGH YEH..ARABIC SMALL HIGH NOON
-06E9 ; Arabic # So ARABIC PLACE OF SAJDAH
-06EA..06ED ; Arabic # Mn [4] ARABIC EMPTY CENTRE LOW STOP..ARABIC SMALL LOW MEEM
-06EE..06EF ; Arabic # Lo [2] ARABIC LETTER DAL WITH INVERTED V..ARABIC LETTER REH WITH INVERTED V
-06F0..06F9 ; Arabic # Nd [10] EXTENDED ARABIC-INDIC DIGIT ZERO..EXTENDED ARABIC-INDIC DIGIT NINE
-06FA..06FC ; Arabic # Lo [3] ARABIC LETTER SHEEN WITH DOT BELOW..ARABIC LETTER GHAIN WITH DOT BELOW
-06FD..06FE ; Arabic # So [2] ARABIC SIGN SINDHI AMPERSAND..ARABIC SIGN SINDHI POSTPOSITION MEN
-06FF ; Arabic # Lo ARABIC LETTER HEH WITH INVERTED V
-0750..077F ; Arabic # Lo [48] ARABIC LETTER BEH WITH THREE DOTS HORIZONTALLY BELOW..ARABIC LETTER KAF WITH TWO DOTS ABOVE
-FB50..FBB1 ; Arabic # Lo [98] ARABIC LETTER ALEF WASLA ISOLATED FORM..ARABIC LETTER YEH BARREE WITH HAMZA ABOVE FINAL FORM
-FBD3..FD3D ; Arabic # Lo [363] ARABIC LETTER NG ISOLATED FORM..ARABIC LIGATURE ALEF WITH FATHATAN ISOLATED FORM
-FD50..FD8F ; Arabic # Lo [64] ARABIC LIGATURE TEH WITH JEEM WITH MEEM INITIAL FORM..ARABIC LIGATURE MEEM WITH KHAH WITH MEEM INITIAL FORM
-FD92..FDC7 ; Arabic # Lo [54] ARABIC LIGATURE MEEM WITH JEEM WITH KHAH INITIAL FORM..ARABIC LIGATURE NOON WITH JEEM WITH YEH FINAL FORM
-FDF0..FDFB ; Arabic # Lo [12] ARABIC LIGATURE SALLA USED AS KORANIC STOP SIGN ISOLATED FORM..ARABIC LIGATURE JALLAJALALOUHOU
-FDFC ; Arabic # Sc RIAL SIGN
-FE70..FE74 ; Arabic # Lo [5] ARABIC FATHATAN ISOLATED FORM..ARABIC KASRATAN ISOLATED FORM
-FE76..FEFC ; Arabic # Lo [135] ARABIC FATHA ISOLATED FORM..ARABIC LIGATURE LAM WITH ALEF FINAL FORM
-
-# Total code points: 999
-
-# ================================================
-
-0700..070D ; Syriac # Po [14] SYRIAC END OF PARAGRAPH..SYRIAC HARKLEAN ASTERISCUS
-070F ; Syriac # Cf SYRIAC ABBREVIATION MARK
-0710 ; Syriac # Lo SYRIAC LETTER ALAPH
-0711 ; Syriac # Mn SYRIAC LETTER SUPERSCRIPT ALAPH
-0712..072F ; Syriac # Lo [30] SYRIAC LETTER BETH..SYRIAC LETTER PERSIAN DHALATH
-0730..074A ; Syriac # Mn [27] SYRIAC PTHAHA ABOVE..SYRIAC BARREKH
-074D..074F ; Syriac # Lo [3] SYRIAC LETTER SOGDIAN ZHAIN..SYRIAC LETTER SOGDIAN FE
-
-# Total code points: 77
-
-# ================================================
-
-0780..07A5 ; Thaana # Lo [38] THAANA LETTER HAA..THAANA LETTER WAAVU
-07A6..07B0 ; Thaana # Mn [11] THAANA ABAFILI..THAANA SUKUN
-07B1 ; Thaana # Lo THAANA LETTER NAA
-
-# Total code points: 50
-
-# ================================================
-
-0901..0902 ; Devanagari # Mn [2] DEVANAGARI SIGN CANDRABINDU..DEVANAGARI SIGN ANUSVARA
-0903 ; Devanagari # Mc DEVANAGARI SIGN VISARGA
-0904..0939 ; Devanagari # Lo [54] DEVANAGARI LETTER SHORT A..DEVANAGARI LETTER HA
-093C ; Devanagari # Mn DEVANAGARI SIGN NUKTA
-093D ; Devanagari # Lo DEVANAGARI SIGN AVAGRAHA
-093E..0940 ; Devanagari # Mc [3] DEVANAGARI VOWEL SIGN AA..DEVANAGARI VOWEL SIGN II
-0941..0948 ; Devanagari # Mn [8] DEVANAGARI VOWEL SIGN U..DEVANAGARI VOWEL SIGN AI
-0949..094C ; Devanagari # Mc [4] DEVANAGARI VOWEL SIGN CANDRA O..DEVANAGARI VOWEL SIGN AU
-094D ; Devanagari # Mn DEVANAGARI SIGN VIRAMA
-0950 ; Devanagari # Lo DEVANAGARI OM
-0953..0954 ; Devanagari # Mn [2] DEVANAGARI GRAVE ACCENT..DEVANAGARI ACUTE ACCENT
-0958..0961 ; Devanagari # Lo [10] DEVANAGARI LETTER QA..DEVANAGARI LETTER VOCALIC LL
-0962..0963 ; Devanagari # Mn [2] DEVANAGARI VOWEL SIGN VOCALIC L..DEVANAGARI VOWEL SIGN VOCALIC LL
-0966..096F ; Devanagari # Nd [10] DEVANAGARI DIGIT ZERO..DEVANAGARI DIGIT NINE
-0971 ; Devanagari # Lm DEVANAGARI SIGN HIGH SPACING DOT
-0972 ; Devanagari # Lo DEVANAGARI LETTER CANDRA A
-097B..097F ; Devanagari # Lo [5] DEVANAGARI LETTER GGA..DEVANAGARI LETTER BBA
-
-# Total code points: 107
-
-# ================================================
-
-0981 ; Bengali # Mn BENGALI SIGN CANDRABINDU
-0982..0983 ; Bengali # Mc [2] BENGALI SIGN ANUSVARA..BENGALI SIGN VISARGA
-0985..098C ; Bengali # Lo [8] BENGALI LETTER A..BENGALI LETTER VOCALIC L
-098F..0990 ; Bengali # Lo [2] BENGALI LETTER E..BENGALI LETTER AI
-0993..09A8 ; Bengali # Lo [22] BENGALI LETTER O..BENGALI LETTER NA
-09AA..09B0 ; Bengali # Lo [7] BENGALI LETTER PA..BENGALI LETTER RA
-09B2 ; Bengali # Lo BENGALI LETTER LA
-09B6..09B9 ; Bengali # Lo [4] BENGALI LETTER SHA..BENGALI LETTER HA
-09BC ; Bengali # Mn BENGALI SIGN NUKTA
-09BD ; Bengali # Lo BENGALI SIGN AVAGRAHA
-09BE..09C0 ; Bengali # Mc [3] BENGALI VOWEL SIGN AA..BENGALI VOWEL SIGN II
-09C1..09C4 ; Bengali # Mn [4] BENGALI VOWEL SIGN U..BENGALI VOWEL SIGN VOCALIC RR
-09C7..09C8 ; Bengali # Mc [2] BENGALI VOWEL SIGN E..BENGALI VOWEL SIGN AI
-09CB..09CC ; Bengali # Mc [2] BENGALI VOWEL SIGN O..BENGALI VOWEL SIGN AU
-09CD ; Bengali # Mn BENGALI SIGN VIRAMA
-09CE ; Bengali # Lo BENGALI LETTER KHANDA TA
-09D7 ; Bengali # Mc BENGALI AU LENGTH MARK
-09DC..09DD ; Bengali # Lo [2] BENGALI LETTER RRA..BENGALI LETTER RHA
-09DF..09E1 ; Bengali # Lo [3] BENGALI LETTER YYA..BENGALI LETTER VOCALIC LL
-09E2..09E3 ; Bengali # Mn [2] BENGALI VOWEL SIGN VOCALIC L..BENGALI VOWEL SIGN VOCALIC LL
-09E6..09EF ; Bengali # Nd [10] BENGALI DIGIT ZERO..BENGALI DIGIT NINE
-09F0..09F1 ; Bengali # Lo [2] BENGALI LETTER RA WITH MIDDLE DIAGONAL..BENGALI LETTER RA WITH LOWER DIAGONAL
-09F2..09F3 ; Bengali # Sc [2] BENGALI RUPEE MARK..BENGALI RUPEE SIGN
-09F4..09F9 ; Bengali # No [6] BENGALI CURRENCY NUMERATOR ONE..BENGALI CURRENCY DENOMINATOR SIXTEEN
-09FA ; Bengali # So BENGALI ISSHAR
-
-# Total code points: 91
-
-# ================================================
-
-0A01..0A02 ; Gurmukhi # Mn [2] GURMUKHI SIGN ADAK BINDI..GURMUKHI SIGN BINDI
-0A03 ; Gurmukhi # Mc GURMUKHI SIGN VISARGA
-0A05..0A0A ; Gurmukhi # Lo [6] GURMUKHI LETTER A..GURMUKHI LETTER UU
-0A0F..0A10 ; Gurmukhi # Lo [2] GURMUKHI LETTER EE..GURMUKHI LETTER AI
-0A13..0A28 ; Gurmukhi # Lo [22] GURMUKHI LETTER OO..GURMUKHI LETTER NA
-0A2A..0A30 ; Gurmukhi # Lo [7] GURMUKHI LETTER PA..GURMUKHI LETTER RA
-0A32..0A33 ; Gurmukhi # Lo [2] GURMUKHI LETTER LA..GURMUKHI LETTER LLA
-0A35..0A36 ; Gurmukhi # Lo [2] GURMUKHI LETTER VA..GURMUKHI LETTER SHA
-0A38..0A39 ; Gurmukhi # Lo [2] GURMUKHI LETTER SA..GURMUKHI LETTER HA
-0A3C ; Gurmukhi # Mn GURMUKHI SIGN NUKTA
-0A3E..0A40 ; Gurmukhi # Mc [3] GURMUKHI VOWEL SIGN AA..GURMUKHI VOWEL SIGN II
-0A41..0A42 ; Gurmukhi # Mn [2] GURMUKHI VOWEL SIGN U..GURMUKHI VOWEL SIGN UU
-0A47..0A48 ; Gurmukhi # Mn [2] GURMUKHI VOWEL SIGN EE..GURMUKHI VOWEL SIGN AI
-0A4B..0A4D ; Gurmukhi # Mn [3] GURMUKHI VOWEL SIGN OO..GURMUKHI SIGN VIRAMA
-0A51 ; Gurmukhi # Mn GURMUKHI SIGN UDAAT
-0A59..0A5C ; Gurmukhi # Lo [4] GURMUKHI LETTER KHHA..GURMUKHI LETTER RRA
-0A5E ; Gurmukhi # Lo GURMUKHI LETTER FA
-0A66..0A6F ; Gurmukhi # Nd [10] GURMUKHI DIGIT ZERO..GURMUKHI DIGIT NINE
-0A70..0A71 ; Gurmukhi # Mn [2] GURMUKHI TIPPI..GURMUKHI ADDAK
-0A72..0A74 ; Gurmukhi # Lo [3] GURMUKHI IRI..GURMUKHI EK ONKAR
-0A75 ; Gurmukhi # Mn GURMUKHI SIGN YAKASH
-
-# Total code points: 79
-
-# ================================================
-
-0A81..0A82 ; Gujarati # Mn [2] GUJARATI SIGN CANDRABINDU..GUJARATI SIGN ANUSVARA
-0A83 ; Gujarati # Mc GUJARATI SIGN VISARGA
-0A85..0A8D ; Gujarati # Lo [9] GUJARATI LETTER A..GUJARATI VOWEL CANDRA E
-0A8F..0A91 ; Gujarati # Lo [3] GUJARATI LETTER E..GUJARATI VOWEL CANDRA O
-0A93..0AA8 ; Gujarati # Lo [22] GUJARATI LETTER O..GUJARATI LETTER NA
-0AAA..0AB0 ; Gujarati # Lo [7] GUJARATI LETTER PA..GUJARATI LETTER RA
-0AB2..0AB3 ; Gujarati # Lo [2] GUJARATI LETTER LA..GUJARATI LETTER LLA
-0AB5..0AB9 ; Gujarati # Lo [5] GUJARATI LETTER VA..GUJARATI LETTER HA
-0ABC ; Gujarati # Mn GUJARATI SIGN NUKTA
-0ABD ; Gujarati # Lo GUJARATI SIGN AVAGRAHA
-0ABE..0AC0 ; Gujarati # Mc [3] GUJARATI VOWEL SIGN AA..GUJARATI VOWEL SIGN II
-0AC1..0AC5 ; Gujarati # Mn [5] GUJARATI VOWEL SIGN U..GUJARATI VOWEL SIGN CANDRA E
-0AC7..0AC8 ; Gujarati # Mn [2] GUJARATI VOWEL SIGN E..GUJARATI VOWEL SIGN AI
-0AC9 ; Gujarati # Mc GUJARATI VOWEL SIGN CANDRA O
-0ACB..0ACC ; Gujarati # Mc [2] GUJARATI VOWEL SIGN O..GUJARATI VOWEL SIGN AU
-0ACD ; Gujarati # Mn GUJARATI SIGN VIRAMA
-0AD0 ; Gujarati # Lo GUJARATI OM
-0AE0..0AE1 ; Gujarati # Lo [2] GUJARATI LETTER VOCALIC RR..GUJARATI LETTER VOCALIC LL
-0AE2..0AE3 ; Gujarati # Mn [2] GUJARATI VOWEL SIGN VOCALIC L..GUJARATI VOWEL SIGN VOCALIC LL
-0AE6..0AEF ; Gujarati # Nd [10] GUJARATI DIGIT ZERO..GUJARATI DIGIT NINE
-0AF1 ; Gujarati # Sc GUJARATI RUPEE SIGN
-
-# Total code points: 83
-
-# ================================================
-
-0B01 ; Oriya # Mn ORIYA SIGN CANDRABINDU
-0B02..0B03 ; Oriya # Mc [2] ORIYA SIGN ANUSVARA..ORIYA SIGN VISARGA
-0B05..0B0C ; Oriya # Lo [8] ORIYA LETTER A..ORIYA LETTER VOCALIC L
-0B0F..0B10 ; Oriya # Lo [2] ORIYA LETTER E..ORIYA LETTER AI
-0B13..0B28 ; Oriya # Lo [22] ORIYA LETTER O..ORIYA LETTER NA
-0B2A..0B30 ; Oriya # Lo [7] ORIYA LETTER PA..ORIYA LETTER RA
-0B32..0B33 ; Oriya # Lo [2] ORIYA LETTER LA..ORIYA LETTER LLA
-0B35..0B39 ; Oriya # Lo [5] ORIYA LETTER VA..ORIYA LETTER HA
-0B3C ; Oriya # Mn ORIYA SIGN NUKTA
-0B3D ; Oriya # Lo ORIYA SIGN AVAGRAHA
-0B3E ; Oriya # Mc ORIYA VOWEL SIGN AA
-0B3F ; Oriya # Mn ORIYA VOWEL SIGN I
-0B40 ; Oriya # Mc ORIYA VOWEL SIGN II
-0B41..0B44 ; Oriya # Mn [4] ORIYA VOWEL SIGN U..ORIYA VOWEL SIGN VOCALIC RR
-0B47..0B48 ; Oriya # Mc [2] ORIYA VOWEL SIGN E..ORIYA VOWEL SIGN AI
-0B4B..0B4C ; Oriya # Mc [2] ORIYA VOWEL SIGN O..ORIYA VOWEL SIGN AU
-0B4D ; Oriya # Mn ORIYA SIGN VIRAMA
-0B56 ; Oriya # Mn ORIYA AI LENGTH MARK
-0B57 ; Oriya # Mc ORIYA AU LENGTH MARK
-0B5C..0B5D ; Oriya # Lo [2] ORIYA LETTER RRA..ORIYA LETTER RHA
-0B5F..0B61 ; Oriya # Lo [3] ORIYA LETTER YYA..ORIYA LETTER VOCALIC LL
-0B62..0B63 ; Oriya # Mn [2] ORIYA VOWEL SIGN VOCALIC L..ORIYA VOWEL SIGN VOCALIC LL
-0B66..0B6F ; Oriya # Nd [10] ORIYA DIGIT ZERO..ORIYA DIGIT NINE
-0B70 ; Oriya # So ORIYA ISSHAR
-0B71 ; Oriya # Lo ORIYA LETTER WA
-
-# Total code points: 84
-
-# ================================================
-
-0B82 ; Tamil # Mn TAMIL SIGN ANUSVARA
-0B83 ; Tamil # Lo TAMIL SIGN VISARGA
-0B85..0B8A ; Tamil # Lo [6] TAMIL LETTER A..TAMIL LETTER UU
-0B8E..0B90 ; Tamil # Lo [3] TAMIL LETTER E..TAMIL LETTER AI
-0B92..0B95 ; Tamil # Lo [4] TAMIL LETTER O..TAMIL LETTER KA
-0B99..0B9A ; Tamil # Lo [2] TAMIL LETTER NGA..TAMIL LETTER CA
-0B9C ; Tamil # Lo TAMIL LETTER JA
-0B9E..0B9F ; Tamil # Lo [2] TAMIL LETTER NYA..TAMIL LETTER TTA
-0BA3..0BA4 ; Tamil # Lo [2] TAMIL LETTER NNA..TAMIL LETTER TA
-0BA8..0BAA ; Tamil # Lo [3] TAMIL LETTER NA..TAMIL LETTER PA
-0BAE..0BB9 ; Tamil # Lo [12] TAMIL LETTER MA..TAMIL LETTER HA
-0BBE..0BBF ; Tamil # Mc [2] TAMIL VOWEL SIGN AA..TAMIL VOWEL SIGN I
-0BC0 ; Tamil # Mn TAMIL VOWEL SIGN II
-0BC1..0BC2 ; Tamil # Mc [2] TAMIL VOWEL SIGN U..TAMIL VOWEL SIGN UU
-0BC6..0BC8 ; Tamil # Mc [3] TAMIL VOWEL SIGN E..TAMIL VOWEL SIGN AI
-0BCA..0BCC ; Tamil # Mc [3] TAMIL VOWEL SIGN O..TAMIL VOWEL SIGN AU
-0BCD ; Tamil # Mn TAMIL SIGN VIRAMA
-0BD0 ; Tamil # Lo TAMIL OM
-0BD7 ; Tamil # Mc TAMIL AU LENGTH MARK
-0BE6..0BEF ; Tamil # Nd [10] TAMIL DIGIT ZERO..TAMIL DIGIT NINE
-0BF0..0BF2 ; Tamil # No [3] TAMIL NUMBER TEN..TAMIL NUMBER ONE THOUSAND
-0BF3..0BF8 ; Tamil # So [6] TAMIL DAY SIGN..TAMIL AS ABOVE SIGN
-0BF9 ; Tamil # Sc TAMIL RUPEE SIGN
-0BFA ; Tamil # So TAMIL NUMBER SIGN
-
-# Total code points: 72
-
-# ================================================
-
-0C01..0C03 ; Telugu # Mc [3] TELUGU SIGN CANDRABINDU..TELUGU SIGN VISARGA
-0C05..0C0C ; Telugu # Lo [8] TELUGU LETTER A..TELUGU LETTER VOCALIC L
-0C0E..0C10 ; Telugu # Lo [3] TELUGU LETTER E..TELUGU LETTER AI
-0C12..0C28 ; Telugu # Lo [23] TELUGU LETTER O..TELUGU LETTER NA
-0C2A..0C33 ; Telugu # Lo [10] TELUGU LETTER PA..TELUGU LETTER LLA
-0C35..0C39 ; Telugu # Lo [5] TELUGU LETTER VA..TELUGU LETTER HA
-0C3D ; Telugu # Lo TELUGU SIGN AVAGRAHA
-0C3E..0C40 ; Telugu # Mn [3] TELUGU VOWEL SIGN AA..TELUGU VOWEL SIGN II
-0C41..0C44 ; Telugu # Mc [4] TELUGU VOWEL SIGN U..TELUGU VOWEL SIGN VOCALIC RR
-0C46..0C48 ; Telugu # Mn [3] TELUGU VOWEL SIGN E..TELUGU VOWEL SIGN AI
-0C4A..0C4D ; Telugu # Mn [4] TELUGU VOWEL SIGN O..TELUGU SIGN VIRAMA
-0C55..0C56 ; Telugu # Mn [2] TELUGU LENGTH MARK..TELUGU AI LENGTH MARK
-0C58..0C59 ; Telugu # Lo [2] TELUGU LETTER TSA..TELUGU LETTER DZA
-0C60..0C61 ; Telugu # Lo [2] TELUGU LETTER VOCALIC RR..TELUGU LETTER VOCALIC LL
-0C62..0C63 ; Telugu # Mn [2] TELUGU VOWEL SIGN VOCALIC L..TELUGU VOWEL SIGN VOCALIC LL
-0C66..0C6F ; Telugu # Nd [10] TELUGU DIGIT ZERO..TELUGU DIGIT NINE
-0C78..0C7E ; Telugu # No [7] TELUGU FRACTION DIGIT ZERO FOR ODD POWERS OF FOUR..TELUGU FRACTION DIGIT THREE FOR EVEN POWERS OF FOUR
-0C7F ; Telugu # So TELUGU SIGN TUUMU
-
-# Total code points: 93
-
-# ================================================
-
-0C82..0C83 ; Kannada # Mc [2] KANNADA SIGN ANUSVARA..KANNADA SIGN VISARGA
-0C85..0C8C ; Kannada # Lo [8] KANNADA LETTER A..KANNADA LETTER VOCALIC L
-0C8E..0C90 ; Kannada # Lo [3] KANNADA LETTER E..KANNADA LETTER AI
-0C92..0CA8 ; Kannada # Lo [23] KANNADA LETTER O..KANNADA LETTER NA
-0CAA..0CB3 ; Kannada # Lo [10] KANNADA LETTER PA..KANNADA LETTER LLA
-0CB5..0CB9 ; Kannada # Lo [5] KANNADA LETTER VA..KANNADA LETTER HA
-0CBC ; Kannada # Mn KANNADA SIGN NUKTA
-0CBD ; Kannada # Lo KANNADA SIGN AVAGRAHA
-0CBE ; Kannada # Mc KANNADA VOWEL SIGN AA
-0CBF ; Kannada # Mn KANNADA VOWEL SIGN I
-0CC0..0CC4 ; Kannada # Mc [5] KANNADA VOWEL SIGN II..KANNADA VOWEL SIGN VOCALIC RR
-0CC6 ; Kannada # Mn KANNADA VOWEL SIGN E
-0CC7..0CC8 ; Kannada # Mc [2] KANNADA VOWEL SIGN EE..KANNADA VOWEL SIGN AI
-0CCA..0CCB ; Kannada # Mc [2] KANNADA VOWEL SIGN O..KANNADA VOWEL SIGN OO
-0CCC..0CCD ; Kannada # Mn [2] KANNADA VOWEL SIGN AU..KANNADA SIGN VIRAMA
-0CD5..0CD6 ; Kannada # Mc [2] KANNADA LENGTH MARK..KANNADA AI LENGTH MARK
-0CDE ; Kannada # Lo KANNADA LETTER FA
-0CE0..0CE1 ; Kannada # Lo [2] KANNADA LETTER VOCALIC RR..KANNADA LETTER VOCALIC LL
-0CE2..0CE3 ; Kannada # Mn [2] KANNADA VOWEL SIGN VOCALIC L..KANNADA VOWEL SIGN VOCALIC LL
-0CE6..0CEF ; Kannada # Nd [10] KANNADA DIGIT ZERO..KANNADA DIGIT NINE
-
-# Total code points: 84
-
-# ================================================
-
-0D02..0D03 ; Malayalam # Mc [2] MALAYALAM SIGN ANUSVARA..MALAYALAM SIGN VISARGA
-0D05..0D0C ; Malayalam # Lo [8] MALAYALAM LETTER A..MALAYALAM LETTER VOCALIC L
-0D0E..0D10 ; Malayalam # Lo [3] MALAYALAM LETTER E..MALAYALAM LETTER AI
-0D12..0D28 ; Malayalam # Lo [23] MALAYALAM LETTER O..MALAYALAM LETTER NA
-0D2A..0D39 ; Malayalam # Lo [16] MALAYALAM LETTER PA..MALAYALAM LETTER HA
-0D3D ; Malayalam # Lo MALAYALAM SIGN AVAGRAHA
-0D3E..0D40 ; Malayalam # Mc [3] MALAYALAM VOWEL SIGN AA..MALAYALAM VOWEL SIGN II
-0D41..0D44 ; Malayalam # Mn [4] MALAYALAM VOWEL SIGN U..MALAYALAM VOWEL SIGN VOCALIC RR
-0D46..0D48 ; Malayalam # Mc [3] MALAYALAM VOWEL SIGN E..MALAYALAM VOWEL SIGN AI
-0D4A..0D4C ; Malayalam # Mc [3] MALAYALAM VOWEL SIGN O..MALAYALAM VOWEL SIGN AU
-0D4D ; Malayalam # Mn MALAYALAM SIGN VIRAMA
-0D57 ; Malayalam # Mc MALAYALAM AU LENGTH MARK
-0D60..0D61 ; Malayalam # Lo [2] MALAYALAM LETTER VOCALIC RR..MALAYALAM LETTER VOCALIC LL
-0D62..0D63 ; Malayalam # Mn [2] MALAYALAM VOWEL SIGN VOCALIC L..MALAYALAM VOWEL SIGN VOCALIC LL
-0D66..0D6F ; Malayalam # Nd [10] MALAYALAM DIGIT ZERO..MALAYALAM DIGIT NINE
-0D70..0D75 ; Malayalam # No [6] MALAYALAM NUMBER TEN..MALAYALAM FRACTION THREE QUARTERS
-0D79 ; Malayalam # So MALAYALAM DATE MARK
-0D7A..0D7F ; Malayalam # Lo [6] MALAYALAM LETTER CHILLU NN..MALAYALAM LETTER CHILLU K
-
-# Total code points: 95
-
-# ================================================
-
-0D82..0D83 ; Sinhala # Mc [2] SINHALA SIGN ANUSVARAYA..SINHALA SIGN VISARGAYA
-0D85..0D96 ; Sinhala # Lo [18] SINHALA LETTER AYANNA..SINHALA LETTER AUYANNA
-0D9A..0DB1 ; Sinhala # Lo [24] SINHALA LETTER ALPAPRAANA KAYANNA..SINHALA LETTER DANTAJA NAYANNA
-0DB3..0DBB ; Sinhala # Lo [9] SINHALA LETTER SANYAKA DAYANNA..SINHALA LETTER RAYANNA
-0DBD ; Sinhala # Lo SINHALA LETTER DANTAJA LAYANNA
-0DC0..0DC6 ; Sinhala # Lo [7] SINHALA LETTER VAYANNA..SINHALA LETTER FAYANNA
-0DCA ; Sinhala # Mn SINHALA SIGN AL-LAKUNA
-0DCF..0DD1 ; Sinhala # Mc [3] SINHALA VOWEL SIGN AELA-PILLA..SINHALA VOWEL SIGN DIGA AEDA-PILLA
-0DD2..0DD4 ; Sinhala # Mn [3] SINHALA VOWEL SIGN KETTI IS-PILLA..SINHALA VOWEL SIGN KETTI PAA-PILLA
-0DD6 ; Sinhala # Mn SINHALA VOWEL SIGN DIGA PAA-PILLA
-0DD8..0DDF ; Sinhala # Mc [8] SINHALA VOWEL SIGN GAETTA-PILLA..SINHALA VOWEL SIGN GAYANUKITTA
-0DF2..0DF3 ; Sinhala # Mc [2] SINHALA VOWEL SIGN DIGA GAETTA-PILLA..SINHALA VOWEL SIGN DIGA GAYANUKITTA
-0DF4 ; Sinhala # Po SINHALA PUNCTUATION KUNDDALIYA
-
-# Total code points: 80
-
-# ================================================
-
-0E01..0E30 ; Thai # Lo [48] THAI CHARACTER KO KAI..THAI CHARACTER SARA A
-0E31 ; Thai # Mn THAI CHARACTER MAI HAN-AKAT
-0E32..0E33 ; Thai # Lo [2] THAI CHARACTER SARA AA..THAI CHARACTER SARA AM
-0E34..0E3A ; Thai # Mn [7] THAI CHARACTER SARA I..THAI CHARACTER PHINTHU
-0E40..0E45 ; Thai # Lo [6] THAI CHARACTER SARA E..THAI CHARACTER LAKKHANGYAO
-0E46 ; Thai # Lm THAI CHARACTER MAIYAMOK
-0E47..0E4E ; Thai # Mn [8] THAI CHARACTER MAITAIKHU..THAI CHARACTER YAMAKKAN
-0E4F ; Thai # Po THAI CHARACTER FONGMAN
-0E50..0E59 ; Thai # Nd [10] THAI DIGIT ZERO..THAI DIGIT NINE
-0E5A..0E5B ; Thai # Po [2] THAI CHARACTER ANGKHANKHU..THAI CHARACTER KHOMUT
-
-# Total code points: 86
-
-# ================================================
-
-0E81..0E82 ; Lao # Lo [2] LAO LETTER KO..LAO LETTER KHO SUNG
-0E84 ; Lao # Lo LAO LETTER KHO TAM
-0E87..0E88 ; Lao # Lo [2] LAO LETTER NGO..LAO LETTER CO
-0E8A ; Lao # Lo LAO LETTER SO TAM
-0E8D ; Lao # Lo LAO LETTER NYO
-0E94..0E97 ; Lao # Lo [4] LAO LETTER DO..LAO LETTER THO TAM
-0E99..0E9F ; Lao # Lo [7] LAO LETTER NO..LAO LETTER FO SUNG
-0EA1..0EA3 ; Lao # Lo [3] LAO LETTER MO..LAO LETTER LO LING
-0EA5 ; Lao # Lo LAO LETTER LO LOOT
-0EA7 ; Lao # Lo LAO LETTER WO
-0EAA..0EAB ; Lao # Lo [2] LAO LETTER SO SUNG..LAO LETTER HO SUNG
-0EAD..0EB0 ; Lao # Lo [4] LAO LETTER O..LAO VOWEL SIGN A
-0EB1 ; Lao # Mn LAO VOWEL SIGN MAI KAN
-0EB2..0EB3 ; Lao # Lo [2] LAO VOWEL SIGN AA..LAO VOWEL SIGN AM
-0EB4..0EB9 ; Lao # Mn [6] LAO VOWEL SIGN I..LAO VOWEL SIGN UU
-0EBB..0EBC ; Lao # Mn [2] LAO VOWEL SIGN MAI KON..LAO SEMIVOWEL SIGN LO
-0EBD ; Lao # Lo LAO SEMIVOWEL SIGN NYO
-0EC0..0EC4 ; Lao # Lo [5] LAO VOWEL SIGN E..LAO VOWEL SIGN AI
-0EC6 ; Lao # Lm LAO KO LA
-0EC8..0ECD ; Lao # Mn [6] LAO TONE MAI EK..LAO NIGGAHITA
-0ED0..0ED9 ; Lao # Nd [10] LAO DIGIT ZERO..LAO DIGIT NINE
-0EDC..0EDD ; Lao # Lo [2] LAO HO NO..LAO HO MO
-
-# Total code points: 65
-
-# ================================================
-
-0F00 ; Tibetan # Lo TIBETAN SYLLABLE OM
-0F01..0F03 ; Tibetan # So [3] TIBETAN MARK GTER YIG MGO TRUNCATED A..TIBETAN MARK GTER YIG MGO -UM GTER TSHEG MA
-0F04..0F12 ; Tibetan # Po [15] TIBETAN MARK INITIAL YIG MGO MDUN MA..TIBETAN MARK RGYA GRAM SHAD
-0F13..0F17 ; Tibetan # So [5] TIBETAN MARK CARET -DZUD RTAGS ME LONG CAN..TIBETAN ASTROLOGICAL SIGN SGRA GCAN -CHAR RTAGS
-0F18..0F19 ; Tibetan # Mn [2] TIBETAN ASTROLOGICAL SIGN -KHYUD PA..TIBETAN ASTROLOGICAL SIGN SDONG TSHUGS
-0F1A..0F1F ; Tibetan # So [6] TIBETAN SIGN RDEL DKAR GCIG..TIBETAN SIGN RDEL DKAR RDEL NAG
-0F20..0F29 ; Tibetan # Nd [10] TIBETAN DIGIT ZERO..TIBETAN DIGIT NINE
-0F2A..0F33 ; Tibetan # No [10] TIBETAN DIGIT HALF ONE..TIBETAN DIGIT HALF ZERO
-0F34 ; Tibetan # So TIBETAN MARK BSDUS RTAGS
-0F35 ; Tibetan # Mn TIBETAN MARK NGAS BZUNG NYI ZLA
-0F36 ; Tibetan # So TIBETAN MARK CARET -DZUD RTAGS BZHI MIG CAN
-0F37 ; Tibetan # Mn TIBETAN MARK NGAS BZUNG SGOR RTAGS
-0F38 ; Tibetan # So TIBETAN MARK CHE MGO
-0F39 ; Tibetan # Mn TIBETAN MARK TSA -PHRU
-0F3A ; Tibetan # Ps TIBETAN MARK GUG RTAGS GYON
-0F3B ; Tibetan # Pe TIBETAN MARK GUG RTAGS GYAS
-0F3C ; Tibetan # Ps TIBETAN MARK ANG KHANG GYON
-0F3D ; Tibetan # Pe TIBETAN MARK ANG KHANG GYAS
-0F3E..0F3F ; Tibetan # Mc [2] TIBETAN SIGN YAR TSHES..TIBETAN SIGN MAR TSHES
-0F40..0F47 ; Tibetan # Lo [8] TIBETAN LETTER KA..TIBETAN LETTER JA
-0F49..0F6C ; Tibetan # Lo [36] TIBETAN LETTER NYA..TIBETAN LETTER RRA
-0F71..0F7E ; Tibetan # Mn [14] TIBETAN VOWEL SIGN AA..TIBETAN SIGN RJES SU NGA RO
-0F7F ; Tibetan # Mc TIBETAN SIGN RNAM BCAD
-0F80..0F84 ; Tibetan # Mn [5] TIBETAN VOWEL SIGN REVERSED I..TIBETAN MARK HALANTA
-0F85 ; Tibetan # Po TIBETAN MARK PALUTA
-0F86..0F87 ; Tibetan # Mn [2] TIBETAN SIGN LCI RTAGS..TIBETAN SIGN YANG RTAGS
-0F88..0F8B ; Tibetan # Lo [4] TIBETAN SIGN LCE TSA CAN..TIBETAN SIGN GRU MED RGYINGS
-0F90..0F97 ; Tibetan # Mn [8] TIBETAN SUBJOINED LETTER KA..TIBETAN SUBJOINED LETTER JA
-0F99..0FBC ; Tibetan # Mn [36] TIBETAN SUBJOINED LETTER NYA..TIBETAN SUBJOINED LETTER FIXED-FORM RA
-0FBE..0FC5 ; Tibetan # So [8] TIBETAN KU RU KHA..TIBETAN SYMBOL RDO RJE
-0FC6 ; Tibetan # Mn TIBETAN SYMBOL PADMA GDAN
-0FC7..0FCC ; Tibetan # So [6] TIBETAN SYMBOL RDO RJE RGYA GRAM..TIBETAN SYMBOL NOR BU BZHI -KHYIL
-0FCE..0FCF ; Tibetan # So [2] TIBETAN SIGN RDEL NAG RDEL DKAR..TIBETAN SIGN RDEL NAG GSUM
-0FD0..0FD4 ; Tibetan # Po [5] TIBETAN MARK BSKA- SHOG GI MGO RGYAN..TIBETAN MARK CLOSING BRDA RNYING YIG MGO SGAB MA
-
-# Total code points: 201
-
-# ================================================
-
-1000..102A ; Myanmar # Lo [43] MYANMAR LETTER KA..MYANMAR LETTER AU
-102B..102C ; Myanmar # Mc [2] MYANMAR VOWEL SIGN TALL AA..MYANMAR VOWEL SIGN AA
-102D..1030 ; Myanmar # Mn [4] MYANMAR VOWEL SIGN I..MYANMAR VOWEL SIGN UU
-1031 ; Myanmar # Mc MYANMAR VOWEL SIGN E
-1032..1037 ; Myanmar # Mn [6] MYANMAR VOWEL SIGN AI..MYANMAR SIGN DOT BELOW
-1038 ; Myanmar # Mc MYANMAR SIGN VISARGA
-1039..103A ; Myanmar # Mn [2] MYANMAR SIGN VIRAMA..MYANMAR SIGN ASAT
-103B..103C ; Myanmar # Mc [2] MYANMAR CONSONANT SIGN MEDIAL YA..MYANMAR CONSONANT SIGN MEDIAL RA
-103D..103E ; Myanmar # Mn [2] MYANMAR CONSONANT SIGN MEDIAL WA..MYANMAR CONSONANT SIGN MEDIAL HA
-103F ; Myanmar # Lo MYANMAR LETTER GREAT SA
-1040..1049 ; Myanmar # Nd [10] MYANMAR DIGIT ZERO..MYANMAR DIGIT NINE
-104A..104F ; Myanmar # Po [6] MYANMAR SIGN LITTLE SECTION..MYANMAR SYMBOL GENITIVE
-1050..1055 ; Myanmar # Lo [6] MYANMAR LETTER SHA..MYANMAR LETTER VOCALIC LL
-1056..1057 ; Myanmar # Mc [2] MYANMAR VOWEL SIGN VOCALIC R..MYANMAR VOWEL SIGN VOCALIC RR
-1058..1059 ; Myanmar # Mn [2] MYANMAR VOWEL SIGN VOCALIC L..MYANMAR VOWEL SIGN VOCALIC LL
-105A..105D ; Myanmar # Lo [4] MYANMAR LETTER MON NGA..MYANMAR LETTER MON BBE
-105E..1060 ; Myanmar # Mn [3] MYANMAR CONSONANT SIGN MON MEDIAL NA..MYANMAR CONSONANT SIGN MON MEDIAL LA
-1061 ; Myanmar # Lo MYANMAR LETTER SGAW KAREN SHA
-1062..1064 ; Myanmar # Mc [3] MYANMAR VOWEL SIGN SGAW KAREN EU..MYANMAR TONE MARK SGAW KAREN KE PHO
-1065..1066 ; Myanmar # Lo [2] MYANMAR LETTER WESTERN PWO KAREN THA..MYANMAR LETTER WESTERN PWO KAREN PWA
-1067..106D ; Myanmar # Mc [7] MYANMAR VOWEL SIGN WESTERN PWO KAREN EU..MYANMAR SIGN WESTERN PWO KAREN TONE-5
-106E..1070 ; Myanmar # Lo [3] MYANMAR LETTER EASTERN PWO KAREN NNA..MYANMAR LETTER EASTERN PWO KAREN GHWA
-1071..1074 ; Myanmar # Mn [4] MYANMAR VOWEL SIGN GEBA KAREN I..MYANMAR VOWEL SIGN KAYAH EE
-1075..1081 ; Myanmar # Lo [13] MYANMAR LETTER SHAN KA..MYANMAR LETTER SHAN HA
-1082 ; Myanmar # Mn MYANMAR CONSONANT SIGN SHAN MEDIAL WA
-1083..1084 ; Myanmar # Mc [2] MYANMAR VOWEL SIGN SHAN AA..MYANMAR VOWEL SIGN SHAN E
-1085..1086 ; Myanmar # Mn [2] MYANMAR VOWEL SIGN SHAN E ABOVE..MYANMAR VOWEL SIGN SHAN FINAL Y
-1087..108C ; Myanmar # Mc [6] MYANMAR SIGN SHAN TONE-2..MYANMAR SIGN SHAN COUNCIL TONE-3
-108D ; Myanmar # Mn MYANMAR SIGN SHAN COUNCIL EMPHATIC TONE
-108E ; Myanmar # Lo MYANMAR LETTER RUMAI PALAUNG FA
-108F ; Myanmar # Mc MYANMAR SIGN RUMAI PALAUNG TONE-5
-1090..1099 ; Myanmar # Nd [10] MYANMAR SHAN DIGIT ZERO..MYANMAR SHAN DIGIT NINE
-109E..109F ; Myanmar # So [2] MYANMAR SYMBOL SHAN ONE..MYANMAR SYMBOL SHAN EXCLAMATION
-
-# Total code points: 156
-
-# ================================================
-
-10A0..10C5 ; Georgian # L& [38] GEORGIAN CAPITAL LETTER AN..GEORGIAN CAPITAL LETTER HOE
-10D0..10FA ; Georgian # Lo [43] GEORGIAN LETTER AN..GEORGIAN LETTER AIN
-10FC ; Georgian # Lm MODIFIER LETTER GEORGIAN NAR
-2D00..2D25 ; Georgian # L& [38] GEORGIAN SMALL LETTER AN..GEORGIAN SMALL LETTER HOE
-
-# Total code points: 120
-
-# ================================================
-
-1100..1159 ; Hangul # Lo [90] HANGUL CHOSEONG KIYEOK..HANGUL CHOSEONG YEORINHIEUH
-115F..11A2 ; Hangul # Lo [68] HANGUL CHOSEONG FILLER..HANGUL JUNGSEONG SSANGARAEA
-11A8..11F9 ; Hangul # Lo [82] HANGUL JONGSEONG KIYEOK..HANGUL JONGSEONG YEORINHIEUH
-3131..318E ; Hangul # Lo [94] HANGUL LETTER KIYEOK..HANGUL LETTER ARAEAE
-3200..321E ; Hangul # So [31] PARENTHESIZED HANGUL KIYEOK..PARENTHESIZED KOREAN CHARACTER O HU
-3260..327E ; Hangul # So [31] CIRCLED HANGUL KIYEOK..CIRCLED HANGUL IEUNG U
-AC00..D7A3 ; Hangul # Lo [11172] HANGUL SYLLABLE GA..HANGUL SYLLABLE HIH
-FFA0..FFBE ; Hangul # Lo [31] HALFWIDTH HANGUL FILLER..HALFWIDTH HANGUL LETTER HIEUH
-FFC2..FFC7 ; Hangul # Lo [6] HALFWIDTH HANGUL LETTER A..HALFWIDTH HANGUL LETTER E
-FFCA..FFCF ; Hangul # Lo [6] HALFWIDTH HANGUL LETTER YEO..HALFWIDTH HANGUL LETTER OE
-FFD2..FFD7 ; Hangul # Lo [6] HALFWIDTH HANGUL LETTER YO..HALFWIDTH HANGUL LETTER YU
-FFDA..FFDC ; Hangul # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL LETTER I
-
-# Total code points: 11620
-
-# ================================================
-
-1200..1248 ; Ethiopic # Lo [73] ETHIOPIC SYLLABLE HA..ETHIOPIC SYLLABLE QWA
-124A..124D ; Ethiopic # Lo [4] ETHIOPIC SYLLABLE QWI..ETHIOPIC SYLLABLE QWE
-1250..1256 ; Ethiopic # Lo [7] ETHIOPIC SYLLABLE QHA..ETHIOPIC SYLLABLE QHO
-1258 ; Ethiopic # Lo ETHIOPIC SYLLABLE QHWA
-125A..125D ; Ethiopic # Lo [4] ETHIOPIC SYLLABLE QHWI..ETHIOPIC SYLLABLE QHWE
-1260..1288 ; Ethiopic # Lo [41] ETHIOPIC SYLLABLE BA..ETHIOPIC SYLLABLE XWA
-128A..128D ; Ethiopic # Lo [4] ETHIOPIC SYLLABLE XWI..ETHIOPIC SYLLABLE XWE
-1290..12B0 ; Ethiopic # Lo [33] ETHIOPIC SYLLABLE NA..ETHIOPIC SYLLABLE KWA
-12B2..12B5 ; Ethiopic # Lo [4] ETHIOPIC SYLLABLE KWI..ETHIOPIC SYLLABLE KWE
-12B8..12BE ; Ethiopic # Lo [7] ETHIOPIC SYLLABLE KXA..ETHIOPIC SYLLABLE KXO
-12C0 ; Ethiopic # Lo ETHIOPIC SYLLABLE KXWA
-12C2..12C5 ; Ethiopic # Lo [4] ETHIOPIC SYLLABLE KXWI..ETHIOPIC SYLLABLE KXWE
-12C8..12D6 ; Ethiopic # Lo [15] ETHIOPIC SYLLABLE WA..ETHIOPIC SYLLABLE PHARYNGEAL O
-12D8..1310 ; Ethiopic # Lo [57] ETHIOPIC SYLLABLE ZA..ETHIOPIC SYLLABLE GWA
-1312..1315 ; Ethiopic # Lo [4] ETHIOPIC SYLLABLE GWI..ETHIOPIC SYLLABLE GWE
-1318..135A ; Ethiopic # Lo [67] ETHIOPIC SYLLABLE GGA..ETHIOPIC SYLLABLE FYA
-135F ; Ethiopic # Mn ETHIOPIC COMBINING GEMINATION MARK
-1360 ; Ethiopic # So ETHIOPIC SECTION MARK
-1361..1368 ; Ethiopic # Po [8] ETHIOPIC WORDSPACE..ETHIOPIC PARAGRAPH SEPARATOR
-1369..137C ; Ethiopic # No [20] ETHIOPIC DIGIT ONE..ETHIOPIC NUMBER TEN THOUSAND
-1380..138F ; Ethiopic # Lo [16] ETHIOPIC SYLLABLE SEBATBEIT MWA..ETHIOPIC SYLLABLE PWE
-1390..1399 ; Ethiopic # So [10] ETHIOPIC TONAL MARK YIZET..ETHIOPIC TONAL MARK KURT
-2D80..2D96 ; Ethiopic # Lo [23] ETHIOPIC SYLLABLE LOA..ETHIOPIC SYLLABLE GGWE
-2DA0..2DA6 ; Ethiopic # Lo [7] ETHIOPIC SYLLABLE SSA..ETHIOPIC SYLLABLE SSO
-2DA8..2DAE ; Ethiopic # Lo [7] ETHIOPIC SYLLABLE CCA..ETHIOPIC SYLLABLE CCO
-2DB0..2DB6 ; Ethiopic # Lo [7] ETHIOPIC SYLLABLE ZZA..ETHIOPIC SYLLABLE ZZO
-2DB8..2DBE ; Ethiopic # Lo [7] ETHIOPIC SYLLABLE CCHA..ETHIOPIC SYLLABLE CCHO
-2DC0..2DC6 ; Ethiopic # Lo [7] ETHIOPIC SYLLABLE QYA..ETHIOPIC SYLLABLE QYO
-2DC8..2DCE ; Ethiopic # Lo [7] ETHIOPIC SYLLABLE KYA..ETHIOPIC SYLLABLE KYO
-2DD0..2DD6 ; Ethiopic # Lo [7] ETHIOPIC SYLLABLE XYA..ETHIOPIC SYLLABLE XYO
-2DD8..2DDE ; Ethiopic # Lo [7] ETHIOPIC SYLLABLE GYA..ETHIOPIC SYLLABLE GYO
-
-# Total code points: 461
-
-# ================================================
-
-13A0..13F4 ; Cherokee # Lo [85] CHEROKEE LETTER A..CHEROKEE LETTER YV
-
-# Total code points: 85
-
-# ================================================
-
-1401..166C ; Canadian_Aboriginal # Lo [620] CANADIAN SYLLABICS E..CANADIAN SYLLABICS CARRIER TTSA
-166D..166E ; Canadian_Aboriginal # Po [2] CANADIAN SYLLABICS CHI SIGN..CANADIAN SYLLABICS FULL STOP
-166F..1676 ; Canadian_Aboriginal # Lo [8] CANADIAN SYLLABICS QAI..CANADIAN SYLLABICS NNGAA
-
-# Total code points: 630
-
-# ================================================
-
-1680 ; Ogham # Zs OGHAM SPACE MARK
-1681..169A ; Ogham # Lo [26] OGHAM LETTER BEITH..OGHAM LETTER PEITH
-169B ; Ogham # Ps OGHAM FEATHER MARK
-169C ; Ogham # Pe OGHAM REVERSED FEATHER MARK
-
-# Total code points: 29
-
-# ================================================
-
-16A0..16EA ; Runic # Lo [75] RUNIC LETTER FEHU FEOH FE F..RUNIC LETTER X
-16EE..16F0 ; Runic # Nl [3] RUNIC ARLAUG SYMBOL..RUNIC BELGTHOR SYMBOL
-
-# Total code points: 78
-
-# ================================================
-
-1780..17B3 ; Khmer # Lo [52] KHMER LETTER KA..KHMER INDEPENDENT VOWEL QAU
-17B4..17B5 ; Khmer # Cf [2] KHMER VOWEL INHERENT AQ..KHMER VOWEL INHERENT AA
-17B6 ; Khmer # Mc KHMER VOWEL SIGN AA
-17B7..17BD ; Khmer # Mn [7] KHMER VOWEL SIGN I..KHMER VOWEL SIGN UA
-17BE..17C5 ; Khmer # Mc [8] KHMER VOWEL SIGN OE..KHMER VOWEL SIGN AU
-17C6 ; Khmer # Mn KHMER SIGN NIKAHIT
-17C7..17C8 ; Khmer # Mc [2] KHMER SIGN REAHMUK..KHMER SIGN YUUKALEAPINTU
-17C9..17D3 ; Khmer # Mn [11] KHMER SIGN MUUSIKATOAN..KHMER SIGN BATHAMASAT
-17D4..17D6 ; Khmer # Po [3] KHMER SIGN KHAN..KHMER SIGN CAMNUC PII KUUH
-17D7 ; Khmer # Lm KHMER SIGN LEK TOO
-17D8..17DA ; Khmer # Po [3] KHMER SIGN BEYYAL..KHMER SIGN KOOMUUT
-17DB ; Khmer # Sc KHMER CURRENCY SYMBOL RIEL
-17DC ; Khmer # Lo KHMER SIGN AVAKRAHASANYA
-17DD ; Khmer # Mn KHMER SIGN ATTHACAN
-17E0..17E9 ; Khmer # Nd [10] KHMER DIGIT ZERO..KHMER DIGIT NINE
-17F0..17F9 ; Khmer # No [10] KHMER SYMBOL LEK ATTAK SON..KHMER SYMBOL LEK ATTAK PRAM-BUON
-19E0..19FF ; Khmer # So [32] KHMER SYMBOL PATHAMASAT..KHMER SYMBOL DAP-PRAM ROC
-
-# Total code points: 146
-
-# ================================================
-
-1800..1801 ; Mongolian # Po [2] MONGOLIAN BIRGA..MONGOLIAN ELLIPSIS
-1804 ; Mongolian # Po MONGOLIAN COLON
-1806 ; Mongolian # Pd MONGOLIAN TODO SOFT HYPHEN
-1807..180A ; Mongolian # Po [4] MONGOLIAN SIBE SYLLABLE BOUNDARY MARKER..MONGOLIAN NIRUGU
-180B..180D ; Mongolian # Mn [3] MONGOLIAN FREE VARIATION SELECTOR ONE..MONGOLIAN FREE VARIATION SELECTOR THREE
-180E ; Mongolian # Zs MONGOLIAN VOWEL SEPARATOR
-1810..1819 ; Mongolian # Nd [10] MONGOLIAN DIGIT ZERO..MONGOLIAN DIGIT NINE
-1820..1842 ; Mongolian # Lo [35] MONGOLIAN LETTER A..MONGOLIAN LETTER CHI
-1843 ; Mongolian # Lm MONGOLIAN LETTER TODO LONG VOWEL SIGN
-1844..1877 ; Mongolian # Lo [52] MONGOLIAN LETTER TODO E..MONGOLIAN LETTER MANCHU ZHA
-1880..18A8 ; Mongolian # Lo [41] MONGOLIAN LETTER ALI GALI ANUSVARA ONE..MONGOLIAN LETTER MANCHU ALI GALI BHA
-18A9 ; Mongolian # Mn MONGOLIAN LETTER ALI GALI DAGALGA
-18AA ; Mongolian # Lo MONGOLIAN LETTER MANCHU ALI GALI LHA
-
-# Total code points: 153
-
-# ================================================
-
-3041..3096 ; Hiragana # Lo [86] HIRAGANA LETTER SMALL A..HIRAGANA LETTER SMALL KE
-309D..309E ; Hiragana # Lm [2] HIRAGANA ITERATION MARK..HIRAGANA VOICED ITERATION MARK
-309F ; Hiragana # Lo HIRAGANA DIGRAPH YORI
-
-# Total code points: 89
-
-# ================================================
-
-30A1..30FA ; Katakana # Lo [90] KATAKANA LETTER SMALL A..KATAKANA LETTER VO
-30FD..30FE ; Katakana # Lm [2] KATAKANA ITERATION MARK..KATAKANA VOICED ITERATION MARK
-30FF ; Katakana # Lo KATAKANA DIGRAPH KOTO
-31F0..31FF ; Katakana # Lo [16] KATAKANA LETTER SMALL KU..KATAKANA LETTER SMALL RO
-32D0..32FE ; Katakana # So [47] CIRCLED KATAKANA A..CIRCLED KATAKANA WO
-3300..3357 ; Katakana # So [88] SQUARE APAATO..SQUARE WATTO
-FF66..FF6F ; Katakana # Lo [10] HALFWIDTH KATAKANA LETTER WO..HALFWIDTH KATAKANA LETTER SMALL TU
-FF71..FF9D ; Katakana # Lo [45] HALFWIDTH KATAKANA LETTER A..HALFWIDTH KATAKANA LETTER N
-
-# Total code points: 299
-
-# ================================================
-
-3105..312D ; Bopomofo # Lo [41] BOPOMOFO LETTER B..BOPOMOFO LETTER IH
-31A0..31B7 ; Bopomofo # Lo [24] BOPOMOFO LETTER BU..BOPOMOFO FINAL LETTER H
-
-# Total code points: 65
-
-# ================================================
-
-2E80..2E99 ; Han # So [26] CJK RADICAL REPEAT..CJK RADICAL RAP
-2E9B..2EF3 ; Han # So [89] CJK RADICAL CHOKE..CJK RADICAL C-SIMPLIFIED TURTLE
-2F00..2FD5 ; Han # So [214] KANGXI RADICAL ONE..KANGXI RADICAL FLUTE
-3005 ; Han # Lm IDEOGRAPHIC ITERATION MARK
-3007 ; Han # Nl IDEOGRAPHIC NUMBER ZERO
-3021..3029 ; Han # Nl [9] HANGZHOU NUMERAL ONE..HANGZHOU NUMERAL NINE
-3038..303A ; Han # Nl [3] HANGZHOU NUMERAL TEN..HANGZHOU NUMERAL THIRTY
-303B ; Han # Lm VERTICAL IDEOGRAPHIC ITERATION MARK
-3400..4DB5 ; Han # Lo [6582] CJK UNIFIED IDEOGRAPH-3400..CJK UNIFIED IDEOGRAPH-4DB5
-4E00..9FC3 ; Han # Lo [20932] CJK UNIFIED IDEOGRAPH-4E00..CJK UNIFIED IDEOGRAPH-9FC3
-F900..FA2D ; Han # Lo [302] CJK COMPATIBILITY IDEOGRAPH-F900..CJK COMPATIBILITY IDEOGRAPH-FA2D
-FA30..FA6A ; Han # Lo [59] CJK COMPATIBILITY IDEOGRAPH-FA30..CJK COMPATIBILITY IDEOGRAPH-FA6A
-FA70..FAD9 ; Han # Lo [106] CJK COMPATIBILITY IDEOGRAPH-FA70..CJK COMPATIBILITY IDEOGRAPH-FAD9
-20000..2A6D6 ; Han # Lo [42711] CJK UNIFIED IDEOGRAPH-20000..CJK UNIFIED IDEOGRAPH-2A6D6
-2F800..2FA1D ; Han # Lo [542] CJK COMPATIBILITY IDEOGRAPH-2F800..CJK COMPATIBILITY IDEOGRAPH-2FA1D
-
-# Total code points: 71578
-
-# ================================================
-
-A000..A014 ; Yi # Lo [21] YI SYLLABLE IT..YI SYLLABLE E
-A015 ; Yi # Lm YI SYLLABLE WU
-A016..A48C ; Yi # Lo [1143] YI SYLLABLE BIT..YI SYLLABLE YYR
-A490..A4C6 ; Yi # So [55] YI RADICAL QOT..YI RADICAL KE
-
-# Total code points: 1220
-
-# ================================================
-
-10300..1031E ; Old_Italic # Lo [31] OLD ITALIC LETTER A..OLD ITALIC LETTER UU
-10320..10323 ; Old_Italic # No [4] OLD ITALIC NUMERAL ONE..OLD ITALIC NUMERAL FIFTY
-
-# Total code points: 35
-
-# ================================================
-
-10330..10340 ; Gothic # Lo [17] GOTHIC LETTER AHSA..GOTHIC LETTER PAIRTHRA
-10341 ; Gothic # Nl GOTHIC LETTER NINETY
-10342..10349 ; Gothic # Lo [8] GOTHIC LETTER RAIDA..GOTHIC LETTER OTHAL
-1034A ; Gothic # Nl GOTHIC LETTER NINE HUNDRED
-
-# Total code points: 27
-
-# ================================================
-
-10400..1044F ; Deseret # L& [80] DESERET CAPITAL LETTER LONG I..DESERET SMALL LETTER EW
-
-# Total code points: 80
-
-# ================================================
-
-0300..036F ; Inherited # Mn [112] COMBINING GRAVE ACCENT..COMBINING LATIN SMALL LETTER X
-064B..0655 ; Inherited # Mn [11] ARABIC FATHATAN..ARABIC HAMZA BELOW
-0670 ; Inherited # Mn ARABIC LETTER SUPERSCRIPT ALEF
-0951..0952 ; Inherited # Mn [2] DEVANAGARI STRESS SIGN UDATTA..DEVANAGARI STRESS SIGN ANUDATTA
-1DC0..1DE6 ; Inherited # Mn [39] COMBINING DOTTED GRAVE ACCENT..COMBINING LATIN SMALL LETTER Z
-1DFE..1DFF ; Inherited # Mn [2] COMBINING LEFT ARROWHEAD ABOVE..COMBINING RIGHT ARROWHEAD AND DOWN ARROWHEAD BELOW
-200C..200D ; Inherited # Cf [2] ZERO WIDTH NON-JOINER..ZERO WIDTH JOINER
-20D0..20DC ; Inherited # Mn [13] COMBINING LEFT HARPOON ABOVE..COMBINING FOUR DOTS ABOVE
-20DD..20E0 ; Inherited # Me [4] COMBINING ENCLOSING CIRCLE..COMBINING ENCLOSING CIRCLE BACKSLASH
-20E1 ; Inherited # Mn COMBINING LEFT RIGHT ARROW ABOVE
-20E2..20E4 ; Inherited # Me [3] COMBINING ENCLOSING SCREEN..COMBINING ENCLOSING UPWARD POINTING TRIANGLE
-20E5..20F0 ; Inherited # Mn [12] COMBINING REVERSE SOLIDUS OVERLAY..COMBINING ASTERISK ABOVE
-302A..302F ; Inherited # Mn [6] IDEOGRAPHIC LEVEL TONE MARK..HANGUL DOUBLE DOT TONE MARK
-3099..309A ; Inherited # Mn [2] COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK..COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
-FE00..FE0F ; Inherited # Mn [16] VARIATION SELECTOR-1..VARIATION SELECTOR-16
-FE20..FE26 ; Inherited # Mn [7] COMBINING LIGATURE LEFT HALF..COMBINING CONJOINING MACRON
-101FD ; Inherited # Mn PHAISTOS DISC SIGN COMBINING OBLIQUE STROKE
-1D167..1D169 ; Inherited # Mn [3] MUSICAL SYMBOL COMBINING TREMOLO-1..MUSICAL SYMBOL COMBINING TREMOLO-3
-1D17B..1D182 ; Inherited # Mn [8] MUSICAL SYMBOL COMBINING ACCENT..MUSICAL SYMBOL COMBINING LOURE
-1D185..1D18B ; Inherited # Mn [7] MUSICAL SYMBOL COMBINING DOIT..MUSICAL SYMBOL COMBINING TRIPLE TONGUE
-1D1AA..1D1AD ; Inherited # Mn [4] MUSICAL SYMBOL COMBINING DOWN BOW..MUSICAL SYMBOL COMBINING SNAP PIZZICATO
-E0100..E01EF ; Inherited # Mn [240] VARIATION SELECTOR-17..VARIATION SELECTOR-256
-
-# Total code points: 496
-
-# ================================================
-
-1700..170C ; Tagalog # Lo [13] TAGALOG LETTER A..TAGALOG LETTER YA
-170E..1711 ; Tagalog # Lo [4] TAGALOG LETTER LA..TAGALOG LETTER HA
-1712..1714 ; Tagalog # Mn [3] TAGALOG VOWEL SIGN I..TAGALOG SIGN VIRAMA
-
-# Total code points: 20
-
-# ================================================
-
-1720..1731 ; Hanunoo # Lo [18] HANUNOO LETTER A..HANUNOO LETTER HA
-1732..1734 ; Hanunoo # Mn [3] HANUNOO VOWEL SIGN I..HANUNOO SIGN PAMUDPOD
-
-# Total code points: 21
-
-# ================================================
-
-1740..1751 ; Buhid # Lo [18] BUHID LETTER A..BUHID LETTER HA
-1752..1753 ; Buhid # Mn [2] BUHID VOWEL SIGN I..BUHID VOWEL SIGN U
-
-# Total code points: 20
-
-# ================================================
-
-1760..176C ; Tagbanwa # Lo [13] TAGBANWA LETTER A..TAGBANWA LETTER YA
-176E..1770 ; Tagbanwa # Lo [3] TAGBANWA LETTER LA..TAGBANWA LETTER SA
-1772..1773 ; Tagbanwa # Mn [2] TAGBANWA VOWEL SIGN I..TAGBANWA VOWEL SIGN U
-
-# Total code points: 18
-
-# ================================================
-
-1900..191C ; Limbu # Lo [29] LIMBU VOWEL-CARRIER LETTER..LIMBU LETTER HA
-1920..1922 ; Limbu # Mn [3] LIMBU VOWEL SIGN A..LIMBU VOWEL SIGN U
-1923..1926 ; Limbu # Mc [4] LIMBU VOWEL SIGN EE..LIMBU VOWEL SIGN AU
-1927..1928 ; Limbu # Mn [2] LIMBU VOWEL SIGN E..LIMBU VOWEL SIGN O
-1929..192B ; Limbu # Mc [3] LIMBU SUBJOINED LETTER YA..LIMBU SUBJOINED LETTER WA
-1930..1931 ; Limbu # Mc [2] LIMBU SMALL LETTER KA..LIMBU SMALL LETTER NGA
-1932 ; Limbu # Mn LIMBU SMALL LETTER ANUSVARA
-1933..1938 ; Limbu # Mc [6] LIMBU SMALL LETTER TA..LIMBU SMALL LETTER LA
-1939..193B ; Limbu # Mn [3] LIMBU SIGN MUKPHRENG..LIMBU SIGN SA-I
-1940 ; Limbu # So LIMBU SIGN LOO
-1944..1945 ; Limbu # Po [2] LIMBU EXCLAMATION MARK..LIMBU QUESTION MARK
-1946..194F ; Limbu # Nd [10] LIMBU DIGIT ZERO..LIMBU DIGIT NINE
-
-# Total code points: 66
-
-# ================================================
-
-1950..196D ; Tai_Le # Lo [30] TAI LE LETTER KA..TAI LE LETTER AI
-1970..1974 ; Tai_Le # Lo [5] TAI LE LETTER TONE-2..TAI LE LETTER TONE-6
-
-# Total code points: 35
-
-# ================================================
-
-10000..1000B ; Linear_B # Lo [12] LINEAR B SYLLABLE B008 A..LINEAR B SYLLABLE B046 JE
-1000D..10026 ; Linear_B # Lo [26] LINEAR B SYLLABLE B036 JO..LINEAR B SYLLABLE B032 QO
-10028..1003A ; Linear_B # Lo [19] LINEAR B SYLLABLE B060 RA..LINEAR B SYLLABLE B042 WO
-1003C..1003D ; Linear_B # Lo [2] LINEAR B SYLLABLE B017 ZA..LINEAR B SYLLABLE B074 ZE
-1003F..1004D ; Linear_B # Lo [15] LINEAR B SYLLABLE B020 ZO..LINEAR B SYLLABLE B091 TWO
-10050..1005D ; Linear_B # Lo [14] LINEAR B SYMBOL B018..LINEAR B SYMBOL B089
-10080..100FA ; Linear_B # Lo [123] LINEAR B IDEOGRAM B100 MAN..LINEAR B IDEOGRAM VESSEL B305
-
-# Total code points: 211
-
-# ================================================
-
-10380..1039D ; Ugaritic # Lo [30] UGARITIC LETTER ALPA..UGARITIC LETTER SSU
-1039F ; Ugaritic # Po UGARITIC WORD DIVIDER
-
-# Total code points: 31
-
-# ================================================
-
-10450..1047F ; Shavian # Lo [48] SHAVIAN LETTER PEEP..SHAVIAN LETTER YEW
-
-# Total code points: 48
-
-# ================================================
-
-10480..1049D ; Osmanya # Lo [30] OSMANYA LETTER ALEF..OSMANYA LETTER OO
-104A0..104A9 ; Osmanya # Nd [10] OSMANYA DIGIT ZERO..OSMANYA DIGIT NINE
-
-# Total code points: 40
-
-# ================================================
-
-10800..10805 ; Cypriot # Lo [6] CYPRIOT SYLLABLE A..CYPRIOT SYLLABLE JA
-10808 ; Cypriot # Lo CYPRIOT SYLLABLE JO
-1080A..10835 ; Cypriot # Lo [44] CYPRIOT SYLLABLE KA..CYPRIOT SYLLABLE WO
-10837..10838 ; Cypriot # Lo [2] CYPRIOT SYLLABLE XA..CYPRIOT SYLLABLE XE
-1083C ; Cypriot # Lo CYPRIOT SYLLABLE ZA
-1083F ; Cypriot # Lo CYPRIOT SYLLABLE ZO
-
-# Total code points: 55
-
-# ================================================
-
-2800..28FF ; Braille # So [256] BRAILLE PATTERN BLANK..BRAILLE PATTERN DOTS-12345678
-
-# Total code points: 256
-
-# ================================================
-
-1A00..1A16 ; Buginese # Lo [23] BUGINESE LETTER KA..BUGINESE LETTER HA
-1A17..1A18 ; Buginese # Mn [2] BUGINESE VOWEL SIGN I..BUGINESE VOWEL SIGN U
-1A19..1A1B ; Buginese # Mc [3] BUGINESE VOWEL SIGN E..BUGINESE VOWEL SIGN AE
-1A1E..1A1F ; Buginese # Po [2] BUGINESE PALLAWA..BUGINESE END OF SECTION
-
-# Total code points: 30
-
-# ================================================
-
-03E2..03EF ; Coptic # L& [14] COPTIC CAPITAL LETTER SHEI..COPTIC SMALL LETTER DEI
-2C80..2CE4 ; Coptic # L& [101] COPTIC CAPITAL LETTER ALFA..COPTIC SYMBOL KAI
-2CE5..2CEA ; Coptic # So [6] COPTIC SYMBOL MI RO..COPTIC SYMBOL SHIMA SIMA
-2CF9..2CFC ; Coptic # Po [4] COPTIC OLD NUBIAN FULL STOP..COPTIC OLD NUBIAN VERSE DIVIDER
-2CFD ; Coptic # No COPTIC FRACTION ONE HALF
-2CFE..2CFF ; Coptic # Po [2] COPTIC FULL STOP..COPTIC MORPHOLOGICAL DIVIDER
-
-# Total code points: 128
-
-# ================================================
-
-1980..19A9 ; New_Tai_Lue # Lo [42] NEW TAI LUE LETTER HIGH QA..NEW TAI LUE LETTER LOW XVA
-19B0..19C0 ; New_Tai_Lue # Mc [17] NEW TAI LUE VOWEL SIGN VOWEL SHORTENER..NEW TAI LUE VOWEL SIGN IY
-19C1..19C7 ; New_Tai_Lue # Lo [7] NEW TAI LUE LETTER FINAL V..NEW TAI LUE LETTER FINAL B
-19C8..19C9 ; New_Tai_Lue # Mc [2] NEW TAI LUE TONE MARK-1..NEW TAI LUE TONE MARK-2
-19D0..19D9 ; New_Tai_Lue # Nd [10] NEW TAI LUE DIGIT ZERO..NEW TAI LUE DIGIT NINE
-19DE..19DF ; New_Tai_Lue # Po [2] NEW TAI LUE SIGN LAE..NEW TAI LUE SIGN LAEV
-
-# Total code points: 80
-
-# ================================================
-
-2C00..2C2E ; Glagolitic # L& [47] GLAGOLITIC CAPITAL LETTER AZU..GLAGOLITIC CAPITAL LETTER LATINATE MYSLITE
-2C30..2C5E ; Glagolitic # L& [47] GLAGOLITIC SMALL LETTER AZU..GLAGOLITIC SMALL LETTER LATINATE MYSLITE
-
-# Total code points: 94
-
-# ================================================
-
-2D30..2D65 ; Tifinagh # Lo [54] TIFINAGH LETTER YA..TIFINAGH LETTER YAZZ
-2D6F ; Tifinagh # Lm TIFINAGH MODIFIER LETTER LABIALIZATION MARK
-
-# Total code points: 55
-
-# ================================================
-
-A800..A801 ; Syloti_Nagri # Lo [2] SYLOTI NAGRI LETTER A..SYLOTI NAGRI LETTER I
-A802 ; Syloti_Nagri # Mn SYLOTI NAGRI SIGN DVISVARA
-A803..A805 ; Syloti_Nagri # Lo [3] SYLOTI NAGRI LETTER U..SYLOTI NAGRI LETTER O
-A806 ; Syloti_Nagri # Mn SYLOTI NAGRI SIGN HASANTA
-A807..A80A ; Syloti_Nagri # Lo [4] SYLOTI NAGRI LETTER KO..SYLOTI NAGRI LETTER GHO
-A80B ; Syloti_Nagri # Mn SYLOTI NAGRI SIGN ANUSVARA
-A80C..A822 ; Syloti_Nagri # Lo [23] SYLOTI NAGRI LETTER CO..SYLOTI NAGRI LETTER HO
-A823..A824 ; Syloti_Nagri # Mc [2] SYLOTI NAGRI VOWEL SIGN A..SYLOTI NAGRI VOWEL SIGN I
-A825..A826 ; Syloti_Nagri # Mn [2] SYLOTI NAGRI VOWEL SIGN U..SYLOTI NAGRI VOWEL SIGN E
-A827 ; Syloti_Nagri # Mc SYLOTI NAGRI VOWEL SIGN OO
-A828..A82B ; Syloti_Nagri # So [4] SYLOTI NAGRI POETRY MARK-1..SYLOTI NAGRI POETRY MARK-4
-
-# Total code points: 44
-
-# ================================================
-
-103A0..103C3 ; Old_Persian # Lo [36] OLD PERSIAN SIGN A..OLD PERSIAN SIGN HA
-103C8..103CF ; Old_Persian # Lo [8] OLD PERSIAN SIGN AURAMAZDAA..OLD PERSIAN SIGN BUUMISH
-103D0 ; Old_Persian # Po OLD PERSIAN WORD DIVIDER
-103D1..103D5 ; Old_Persian # Nl [5] OLD PERSIAN NUMBER ONE..OLD PERSIAN NUMBER HUNDRED
-
-# Total code points: 50
-
-# ================================================
-
-10A00 ; Kharoshthi # Lo KHAROSHTHI LETTER A
-10A01..10A03 ; Kharoshthi # Mn [3] KHAROSHTHI VOWEL SIGN I..KHAROSHTHI VOWEL SIGN VOCALIC R
-10A05..10A06 ; Kharoshthi # Mn [2] KHAROSHTHI VOWEL SIGN E..KHAROSHTHI VOWEL SIGN O
-10A0C..10A0F ; Kharoshthi # Mn [4] KHAROSHTHI VOWEL LENGTH MARK..KHAROSHTHI SIGN VISARGA
-10A10..10A13 ; Kharoshthi # Lo [4] KHAROSHTHI LETTER KA..KHAROSHTHI LETTER GHA
-10A15..10A17 ; Kharoshthi # Lo [3] KHAROSHTHI LETTER CA..KHAROSHTHI LETTER JA
-10A19..10A33 ; Kharoshthi # Lo [27] KHAROSHTHI LETTER NYA..KHAROSHTHI LETTER TTTHA
-10A38..10A3A ; Kharoshthi # Mn [3] KHAROSHTHI SIGN BAR ABOVE..KHAROSHTHI SIGN DOT BELOW
-10A3F ; Kharoshthi # Mn KHAROSHTHI VIRAMA
-10A40..10A47 ; Kharoshthi # No [8] KHAROSHTHI DIGIT ONE..KHAROSHTHI NUMBER ONE THOUSAND
-10A50..10A58 ; Kharoshthi # Po [9] KHAROSHTHI PUNCTUATION DOT..KHAROSHTHI PUNCTUATION LINES
-
-# Total code points: 65
-
-# ================================================
-
-1B00..1B03 ; Balinese # Mn [4] BALINESE SIGN ULU RICEM..BALINESE SIGN SURANG
-1B04 ; Balinese # Mc BALINESE SIGN BISAH
-1B05..1B33 ; Balinese # Lo [47] BALINESE LETTER AKARA..BALINESE LETTER HA
-1B34 ; Balinese # Mn BALINESE SIGN REREKAN
-1B35 ; Balinese # Mc BALINESE VOWEL SIGN TEDUNG
-1B36..1B3A ; Balinese # Mn [5] BALINESE VOWEL SIGN ULU..BALINESE VOWEL SIGN RA REPA
-1B3B ; Balinese # Mc BALINESE VOWEL SIGN RA REPA TEDUNG
-1B3C ; Balinese # Mn BALINESE VOWEL SIGN LA LENGA
-1B3D..1B41 ; Balinese # Mc [5] BALINESE VOWEL SIGN LA LENGA TEDUNG..BALINESE VOWEL SIGN TALING REPA TEDUNG
-1B42 ; Balinese # Mn BALINESE VOWEL SIGN PEPET
-1B43..1B44 ; Balinese # Mc [2] BALINESE VOWEL SIGN PEPET TEDUNG..BALINESE ADEG ADEG
-1B45..1B4B ; Balinese # Lo [7] BALINESE LETTER KAF SASAK..BALINESE LETTER ASYURA SASAK
-1B50..1B59 ; Balinese # Nd [10] BALINESE DIGIT ZERO..BALINESE DIGIT NINE
-1B5A..1B60 ; Balinese # Po [7] BALINESE PANTI..BALINESE PAMENENG
-1B61..1B6A ; Balinese # So [10] BALINESE MUSICAL SYMBOL DONG..BALINESE MUSICAL SYMBOL DANG GEDE
-1B6B..1B73 ; Balinese # Mn [9] BALINESE MUSICAL SYMBOL COMBINING TEGEH..BALINESE MUSICAL SYMBOL COMBINING GONG
-1B74..1B7C ; Balinese # So [9] BALINESE MUSICAL SYMBOL RIGHT-HAND OPEN DUG..BALINESE MUSICAL SYMBOL LEFT-HAND OPEN PING
-
-# Total code points: 121
-
-# ================================================
-
-12000..1236E ; Cuneiform # Lo [879] CUNEIFORM SIGN A..CUNEIFORM SIGN ZUM
-12400..12462 ; Cuneiform # Nl [99] CUNEIFORM NUMERIC SIGN TWO ASH..CUNEIFORM NUMERIC SIGN OLD ASSYRIAN ONE QUARTER
-12470..12473 ; Cuneiform # Po [4] CUNEIFORM PUNCTUATION SIGN OLD ASSYRIAN WORD DIVIDER..CUNEIFORM PUNCTUATION SIGN DIAGONAL TRICOLON
-
-# Total code points: 982
-
-# ================================================
-
-10900..10915 ; Phoenician # Lo [22] PHOENICIAN LETTER ALF..PHOENICIAN LETTER TAU
-10916..10919 ; Phoenician # No [4] PHOENICIAN NUMBER ONE..PHOENICIAN NUMBER ONE HUNDRED
-1091F ; Phoenician # Po PHOENICIAN WORD SEPARATOR
-
-# Total code points: 27
-
-# ================================================
-
-A840..A873 ; Phags_Pa # Lo [52] PHAGS-PA LETTER KA..PHAGS-PA LETTER CANDRABINDU
-A874..A877 ; Phags_Pa # Po [4] PHAGS-PA SINGLE HEAD MARK..PHAGS-PA MARK DOUBLE SHAD
-
-# Total code points: 56
-
-# ================================================
-
-07C0..07C9 ; Nko # Nd [10] NKO DIGIT ZERO..NKO DIGIT NINE
-07CA..07EA ; Nko # Lo [33] NKO LETTER A..NKO LETTER JONA RA
-07EB..07F3 ; Nko # Mn [9] NKO COMBINING SHORT HIGH TONE..NKO COMBINING DOUBLE DOT ABOVE
-07F4..07F5 ; Nko # Lm [2] NKO HIGH TONE APOSTROPHE..NKO LOW TONE APOSTROPHE
-07F6 ; Nko # So NKO SYMBOL OO DENNEN
-07F7..07F9 ; Nko # Po [3] NKO SYMBOL GBAKURUNEN..NKO EXCLAMATION MARK
-07FA ; Nko # Lm NKO LAJANYALAN
-
-# Total code points: 59
-
-# ================================================
-
-1B80..1B81 ; Sundanese # Mn [2] SUNDANESE SIGN PANYECEK..SUNDANESE SIGN PANGLAYAR
-1B82 ; Sundanese # Mc SUNDANESE SIGN PANGWISAD
-1B83..1BA0 ; Sundanese # Lo [30] SUNDANESE LETTER A..SUNDANESE LETTER HA
-1BA1 ; Sundanese # Mc SUNDANESE CONSONANT SIGN PAMINGKAL
-1BA2..1BA5 ; Sundanese # Mn [4] SUNDANESE CONSONANT SIGN PANYAKRA..SUNDANESE VOWEL SIGN PANYUKU
-1BA6..1BA7 ; Sundanese # Mc [2] SUNDANESE VOWEL SIGN PANAELAENG..SUNDANESE VOWEL SIGN PANOLONG
-1BA8..1BA9 ; Sundanese # Mn [2] SUNDANESE VOWEL SIGN PAMEPET..SUNDANESE VOWEL SIGN PANEULEUNG
-1BAA ; Sundanese # Mc SUNDANESE SIGN PAMAAEH
-1BAE..1BAF ; Sundanese # Lo [2] SUNDANESE LETTER KHA..SUNDANESE LETTER SYA
-1BB0..1BB9 ; Sundanese # Nd [10] SUNDANESE DIGIT ZERO..SUNDANESE DIGIT NINE
-
-# Total code points: 55
-
-# ================================================
-
-1C00..1C23 ; Lepcha # Lo [36] LEPCHA LETTER KA..LEPCHA LETTER A
-1C24..1C2B ; Lepcha # Mc [8] LEPCHA SUBJOINED LETTER YA..LEPCHA VOWEL SIGN UU
-1C2C..1C33 ; Lepcha # Mn [8] LEPCHA VOWEL SIGN E..LEPCHA CONSONANT SIGN T
-1C34..1C35 ; Lepcha # Mc [2] LEPCHA CONSONANT SIGN NYIN-DO..LEPCHA CONSONANT SIGN KANG
-1C36..1C37 ; Lepcha # Mn [2] LEPCHA SIGN RAN..LEPCHA SIGN NUKTA
-1C3B..1C3F ; Lepcha # Po [5] LEPCHA PUNCTUATION TA-ROL..LEPCHA PUNCTUATION TSHOOK
-1C40..1C49 ; Lepcha # Nd [10] LEPCHA DIGIT ZERO..LEPCHA DIGIT NINE
-1C4D..1C4F ; Lepcha # Lo [3] LEPCHA LETTER TTA..LEPCHA LETTER DDA
-
-# Total code points: 74
-
-# ================================================
-
-1C50..1C59 ; Ol_Chiki # Nd [10] OL CHIKI DIGIT ZERO..OL CHIKI DIGIT NINE
-1C5A..1C77 ; Ol_Chiki # Lo [30] OL CHIKI LETTER LA..OL CHIKI LETTER OH
-1C78..1C7D ; Ol_Chiki # Lm [6] OL CHIKI MU TTUDDAG..OL CHIKI AHAD
-1C7E..1C7F ; Ol_Chiki # Po [2] OL CHIKI PUNCTUATION MUCAAD..OL CHIKI PUNCTUATION DOUBLE MUCAAD
-
-# Total code points: 48
-
-# ================================================
-
-A500..A60B ; Vai # Lo [268] VAI SYLLABLE EE..VAI SYLLABLE NG
-A60C ; Vai # Lm VAI SYLLABLE LENGTHENER
-A60D..A60F ; Vai # Po [3] VAI COMMA..VAI QUESTION MARK
-A610..A61F ; Vai # Lo [16] VAI SYLLABLE NDOLE FA..VAI SYMBOL JONG
-A620..A629 ; Vai # Nd [10] VAI DIGIT ZERO..VAI DIGIT NINE
-A62A..A62B ; Vai # Lo [2] VAI SYLLABLE NDOLE MA..VAI SYLLABLE NDOLE DO
-
-# Total code points: 300
-
-# ================================================
-
-A880..A881 ; Saurashtra # Mc [2] SAURASHTRA SIGN ANUSVARA..SAURASHTRA SIGN VISARGA
-A882..A8B3 ; Saurashtra # Lo [50] SAURASHTRA LETTER A..SAURASHTRA LETTER LLA
-A8B4..A8C3 ; Saurashtra # Mc [16] SAURASHTRA CONSONANT SIGN HAARU..SAURASHTRA VOWEL SIGN AU
-A8C4 ; Saurashtra # Mn SAURASHTRA SIGN VIRAMA
-A8CE..A8CF ; Saurashtra # Po [2] SAURASHTRA DANDA..SAURASHTRA DOUBLE DANDA
-A8D0..A8D9 ; Saurashtra # Nd [10] SAURASHTRA DIGIT ZERO..SAURASHTRA DIGIT NINE
-
-# Total code points: 81
-
-# ================================================
-
-A900..A909 ; Kayah_Li # Nd [10] KAYAH LI DIGIT ZERO..KAYAH LI DIGIT NINE
-A90A..A925 ; Kayah_Li # Lo [28] KAYAH LI LETTER KA..KAYAH LI LETTER OO
-A926..A92D ; Kayah_Li # Mn [8] KAYAH LI VOWEL UE..KAYAH LI TONE CALYA PLOPHU
-A92E..A92F ; Kayah_Li # Po [2] KAYAH LI SIGN CWI..KAYAH LI SIGN SHYA
-
-# Total code points: 48
-
-# ================================================
-
-A930..A946 ; Rejang # Lo [23] REJANG LETTER KA..REJANG LETTER A
-A947..A951 ; Rejang # Mn [11] REJANG VOWEL SIGN I..REJANG CONSONANT SIGN R
-A952..A953 ; Rejang # Mc [2] REJANG CONSONANT SIGN H..REJANG VIRAMA
-A95F ; Rejang # Po REJANG SECTION MARK
-
-# Total code points: 37
-
-# ================================================
-
-10280..1029C ; Lycian # Lo [29] LYCIAN LETTER A..LYCIAN LETTER X
-
-# Total code points: 29
-
-# ================================================
-
-102A0..102D0 ; Carian # Lo [49] CARIAN LETTER A..CARIAN LETTER UUU3
-
-# Total code points: 49
-
-# ================================================
-
-10920..10939 ; Lydian # Lo [26] LYDIAN LETTER A..LYDIAN LETTER C
-1093F ; Lydian # Po LYDIAN TRIANGULAR MARK
-
-# Total code points: 27
-
-# ================================================
-
-AA00..AA28 ; Cham # Lo [41] CHAM LETTER A..CHAM LETTER HA
-AA29..AA2E ; Cham # Mn [6] CHAM VOWEL SIGN AA..CHAM VOWEL SIGN OE
-AA2F..AA30 ; Cham # Mc [2] CHAM VOWEL SIGN O..CHAM VOWEL SIGN AI
-AA31..AA32 ; Cham # Mn [2] CHAM VOWEL SIGN AU..CHAM VOWEL SIGN UE
-AA33..AA34 ; Cham # Mc [2] CHAM CONSONANT SIGN YA..CHAM CONSONANT SIGN RA
-AA35..AA36 ; Cham # Mn [2] CHAM CONSONANT SIGN LA..CHAM CONSONANT SIGN WA
-AA40..AA42 ; Cham # Lo [3] CHAM LETTER FINAL K..CHAM LETTER FINAL NG
-AA43 ; Cham # Mn CHAM CONSONANT SIGN FINAL NG
-AA44..AA4B ; Cham # Lo [8] CHAM LETTER FINAL CH..CHAM LETTER FINAL SS
-AA4C ; Cham # Mn CHAM CONSONANT SIGN FINAL M
-AA4D ; Cham # Mc CHAM CONSONANT SIGN FINAL H
-AA50..AA59 ; Cham # Nd [10] CHAM DIGIT ZERO..CHAM DIGIT NINE
-AA5C..AA5F ; Cham # Po [4] CHAM PUNCTUATION SPIRAL..CHAM PUNCTUATION TRIPLE DANDA
-
-# Total code points: 83
-
-# EOF
diff --git a/enc/unicode/UnicodeData.txt b/enc/unicode/UnicodeData.txt
deleted file mode 100644
index 77db788cf2..0000000000
--- a/enc/unicode/UnicodeData.txt
+++ /dev/null
@@ -1,19336 +0,0 @@
-0000;<control>;Cc;0;BN;;;;;N;NULL;;;;
-0001;<control>;Cc;0;BN;;;;;N;START OF HEADING;;;;
-0002;<control>;Cc;0;BN;;;;;N;START OF TEXT;;;;
-0003;<control>;Cc;0;BN;;;;;N;END OF TEXT;;;;
-0004;<control>;Cc;0;BN;;;;;N;END OF TRANSMISSION;;;;
-0005;<control>;Cc;0;BN;;;;;N;ENQUIRY;;;;
-0006;<control>;Cc;0;BN;;;;;N;ACKNOWLEDGE;;;;
-0007;<control>;Cc;0;BN;;;;;N;BELL;;;;
-0008;<control>;Cc;0;BN;;;;;N;BACKSPACE;;;;
-0009;<control>;Cc;0;S;;;;;N;CHARACTER TABULATION;;;;
-000A;<control>;Cc;0;B;;;;;N;LINE FEED (LF);;;;
-000B;<control>;Cc;0;S;;;;;N;LINE TABULATION;;;;
-000C;<control>;Cc;0;WS;;;;;N;FORM FEED (FF);;;;
-000D;<control>;Cc;0;B;;;;;N;CARRIAGE RETURN (CR);;;;
-000E;<control>;Cc;0;BN;;;;;N;SHIFT OUT;;;;
-000F;<control>;Cc;0;BN;;;;;N;SHIFT IN;;;;
-0010;<control>;Cc;0;BN;;;;;N;DATA LINK ESCAPE;;;;
-0011;<control>;Cc;0;BN;;;;;N;DEVICE CONTROL ONE;;;;
-0012;<control>;Cc;0;BN;;;;;N;DEVICE CONTROL TWO;;;;
-0013;<control>;Cc;0;BN;;;;;N;DEVICE CONTROL THREE;;;;
-0014;<control>;Cc;0;BN;;;;;N;DEVICE CONTROL FOUR;;;;
-0015;<control>;Cc;0;BN;;;;;N;NEGATIVE ACKNOWLEDGE;;;;
-0016;<control>;Cc;0;BN;;;;;N;SYNCHRONOUS IDLE;;;;
-0017;<control>;Cc;0;BN;;;;;N;END OF TRANSMISSION BLOCK;;;;
-0018;<control>;Cc;0;BN;;;;;N;CANCEL;;;;
-0019;<control>;Cc;0;BN;;;;;N;END OF MEDIUM;;;;
-001A;<control>;Cc;0;BN;;;;;N;SUBSTITUTE;;;;
-001B;<control>;Cc;0;BN;;;;;N;ESCAPE;;;;
-001C;<control>;Cc;0;B;;;;;N;INFORMATION SEPARATOR FOUR;;;;
-001D;<control>;Cc;0;B;;;;;N;INFORMATION SEPARATOR THREE;;;;
-001E;<control>;Cc;0;B;;;;;N;INFORMATION SEPARATOR TWO;;;;
-001F;<control>;Cc;0;S;;;;;N;INFORMATION SEPARATOR ONE;;;;
-0020;SPACE;Zs;0;WS;;;;;N;;;;;
-0021;EXCLAMATION MARK;Po;0;ON;;;;;N;;;;;
-0022;QUOTATION MARK;Po;0;ON;;;;;N;;;;;
-0023;NUMBER SIGN;Po;0;ET;;;;;N;;;;;
-0024;DOLLAR SIGN;Sc;0;ET;;;;;N;;;;;
-0025;PERCENT SIGN;Po;0;ET;;;;;N;;;;;
-0026;AMPERSAND;Po;0;ON;;;;;N;;;;;
-0027;APOSTROPHE;Po;0;ON;;;;;N;APOSTROPHE-QUOTE;;;;
-0028;LEFT PARENTHESIS;Ps;0;ON;;;;;Y;OPENING PARENTHESIS;;;;
-0029;RIGHT PARENTHESIS;Pe;0;ON;;;;;Y;CLOSING PARENTHESIS;;;;
-002A;ASTERISK;Po;0;ON;;;;;N;;;;;
-002B;PLUS SIGN;Sm;0;ES;;;;;N;;;;;
-002C;COMMA;Po;0;CS;;;;;N;;;;;
-002D;HYPHEN-MINUS;Pd;0;ES;;;;;N;;;;;
-002E;FULL STOP;Po;0;CS;;;;;N;PERIOD;;;;
-002F;SOLIDUS;Po;0;CS;;;;;N;SLASH;;;;
-0030;DIGIT ZERO;Nd;0;EN;;0;0;0;N;;;;;
-0031;DIGIT ONE;Nd;0;EN;;1;1;1;N;;;;;
-0032;DIGIT TWO;Nd;0;EN;;2;2;2;N;;;;;
-0033;DIGIT THREE;Nd;0;EN;;3;3;3;N;;;;;
-0034;DIGIT FOUR;Nd;0;EN;;4;4;4;N;;;;;
-0035;DIGIT FIVE;Nd;0;EN;;5;5;5;N;;;;;
-0036;DIGIT SIX;Nd;0;EN;;6;6;6;N;;;;;
-0037;DIGIT SEVEN;Nd;0;EN;;7;7;7;N;;;;;
-0038;DIGIT EIGHT;Nd;0;EN;;8;8;8;N;;;;;
-0039;DIGIT NINE;Nd;0;EN;;9;9;9;N;;;;;
-003A;COLON;Po;0;CS;;;;;N;;;;;
-003B;SEMICOLON;Po;0;ON;;;;;N;;;;;
-003C;LESS-THAN SIGN;Sm;0;ON;;;;;Y;;;;;
-003D;EQUALS SIGN;Sm;0;ON;;;;;N;;;;;
-003E;GREATER-THAN SIGN;Sm;0;ON;;;;;Y;;;;;
-003F;QUESTION MARK;Po;0;ON;;;;;N;;;;;
-0040;COMMERCIAL AT;Po;0;ON;;;;;N;;;;;
-0041;LATIN CAPITAL LETTER A;Lu;0;L;;;;;N;;;;0061;
-0042;LATIN CAPITAL LETTER B;Lu;0;L;;;;;N;;;;0062;
-0043;LATIN CAPITAL LETTER C;Lu;0;L;;;;;N;;;;0063;
-0044;LATIN CAPITAL LETTER D;Lu;0;L;;;;;N;;;;0064;
-0045;LATIN CAPITAL LETTER E;Lu;0;L;;;;;N;;;;0065;
-0046;LATIN CAPITAL LETTER F;Lu;0;L;;;;;N;;;;0066;
-0047;LATIN CAPITAL LETTER G;Lu;0;L;;;;;N;;;;0067;
-0048;LATIN CAPITAL LETTER H;Lu;0;L;;;;;N;;;;0068;
-0049;LATIN CAPITAL LETTER I;Lu;0;L;;;;;N;;;;0069;
-004A;LATIN CAPITAL LETTER J;Lu;0;L;;;;;N;;;;006A;
-004B;LATIN CAPITAL LETTER K;Lu;0;L;;;;;N;;;;006B;
-004C;LATIN CAPITAL LETTER L;Lu;0;L;;;;;N;;;;006C;
-004D;LATIN CAPITAL LETTER M;Lu;0;L;;;;;N;;;;006D;
-004E;LATIN CAPITAL LETTER N;Lu;0;L;;;;;N;;;;006E;
-004F;LATIN CAPITAL LETTER O;Lu;0;L;;;;;N;;;;006F;
-0050;LATIN CAPITAL LETTER P;Lu;0;L;;;;;N;;;;0070;
-0051;LATIN CAPITAL LETTER Q;Lu;0;L;;;;;N;;;;0071;
-0052;LATIN CAPITAL LETTER R;Lu;0;L;;;;;N;;;;0072;
-0053;LATIN CAPITAL LETTER S;Lu;0;L;;;;;N;;;;0073;
-0054;LATIN CAPITAL LETTER T;Lu;0;L;;;;;N;;;;0074;
-0055;LATIN CAPITAL LETTER U;Lu;0;L;;;;;N;;;;0075;
-0056;LATIN CAPITAL LETTER V;Lu;0;L;;;;;N;;;;0076;
-0057;LATIN CAPITAL LETTER W;Lu;0;L;;;;;N;;;;0077;
-0058;LATIN CAPITAL LETTER X;Lu;0;L;;;;;N;;;;0078;
-0059;LATIN CAPITAL LETTER Y;Lu;0;L;;;;;N;;;;0079;
-005A;LATIN CAPITAL LETTER Z;Lu;0;L;;;;;N;;;;007A;
-005B;LEFT SQUARE BRACKET;Ps;0;ON;;;;;Y;OPENING SQUARE BRACKET;;;;
-005C;REVERSE SOLIDUS;Po;0;ON;;;;;N;BACKSLASH;;;;
-005D;RIGHT SQUARE BRACKET;Pe;0;ON;;;;;Y;CLOSING SQUARE BRACKET;;;;
-005E;CIRCUMFLEX ACCENT;Sk;0;ON;;;;;N;SPACING CIRCUMFLEX;;;;
-005F;LOW LINE;Pc;0;ON;;;;;N;SPACING UNDERSCORE;;;;
-0060;GRAVE ACCENT;Sk;0;ON;;;;;N;SPACING GRAVE;;;;
-0061;LATIN SMALL LETTER A;Ll;0;L;;;;;N;;;0041;;0041
-0062;LATIN SMALL LETTER B;Ll;0;L;;;;;N;;;0042;;0042
-0063;LATIN SMALL LETTER C;Ll;0;L;;;;;N;;;0043;;0043
-0064;LATIN SMALL LETTER D;Ll;0;L;;;;;N;;;0044;;0044
-0065;LATIN SMALL LETTER E;Ll;0;L;;;;;N;;;0045;;0045
-0066;LATIN SMALL LETTER F;Ll;0;L;;;;;N;;;0046;;0046
-0067;LATIN SMALL LETTER G;Ll;0;L;;;;;N;;;0047;;0047
-0068;LATIN SMALL LETTER H;Ll;0;L;;;;;N;;;0048;;0048
-0069;LATIN SMALL LETTER I;Ll;0;L;;;;;N;;;0049;;0049
-006A;LATIN SMALL LETTER J;Ll;0;L;;;;;N;;;004A;;004A
-006B;LATIN SMALL LETTER K;Ll;0;L;;;;;N;;;004B;;004B
-006C;LATIN SMALL LETTER L;Ll;0;L;;;;;N;;;004C;;004C
-006D;LATIN SMALL LETTER M;Ll;0;L;;;;;N;;;004D;;004D
-006E;LATIN SMALL LETTER N;Ll;0;L;;;;;N;;;004E;;004E
-006F;LATIN SMALL LETTER O;Ll;0;L;;;;;N;;;004F;;004F
-0070;LATIN SMALL LETTER P;Ll;0;L;;;;;N;;;0050;;0050
-0071;LATIN SMALL LETTER Q;Ll;0;L;;;;;N;;;0051;;0051
-0072;LATIN SMALL LETTER R;Ll;0;L;;;;;N;;;0052;;0052
-0073;LATIN SMALL LETTER S;Ll;0;L;;;;;N;;;0053;;0053
-0074;LATIN SMALL LETTER T;Ll;0;L;;;;;N;;;0054;;0054
-0075;LATIN SMALL LETTER U;Ll;0;L;;;;;N;;;0055;;0055
-0076;LATIN SMALL LETTER V;Ll;0;L;;;;;N;;;0056;;0056
-0077;LATIN SMALL LETTER W;Ll;0;L;;;;;N;;;0057;;0057
-0078;LATIN SMALL LETTER X;Ll;0;L;;;;;N;;;0058;;0058
-0079;LATIN SMALL LETTER Y;Ll;0;L;;;;;N;;;0059;;0059
-007A;LATIN SMALL LETTER Z;Ll;0;L;;;;;N;;;005A;;005A
-007B;LEFT CURLY BRACKET;Ps;0;ON;;;;;Y;OPENING CURLY BRACKET;;;;
-007C;VERTICAL LINE;Sm;0;ON;;;;;N;VERTICAL BAR;;;;
-007D;RIGHT CURLY BRACKET;Pe;0;ON;;;;;Y;CLOSING CURLY BRACKET;;;;
-007E;TILDE;Sm;0;ON;;;;;N;;;;;
-007F;<control>;Cc;0;BN;;;;;N;DELETE;;;;
-0080;<control>;Cc;0;BN;;;;;N;;;;;
-0081;<control>;Cc;0;BN;;;;;N;;;;;
-0082;<control>;Cc;0;BN;;;;;N;BREAK PERMITTED HERE;;;;
-0083;<control>;Cc;0;BN;;;;;N;NO BREAK HERE;;;;
-0084;<control>;Cc;0;BN;;;;;N;;;;;
-0085;<control>;Cc;0;B;;;;;N;NEXT LINE (NEL);;;;
-0086;<control>;Cc;0;BN;;;;;N;START OF SELECTED AREA;;;;
-0087;<control>;Cc;0;BN;;;;;N;END OF SELECTED AREA;;;;
-0088;<control>;Cc;0;BN;;;;;N;CHARACTER TABULATION SET;;;;
-0089;<control>;Cc;0;BN;;;;;N;CHARACTER TABULATION WITH JUSTIFICATION;;;;
-008A;<control>;Cc;0;BN;;;;;N;LINE TABULATION SET;;;;
-008B;<control>;Cc;0;BN;;;;;N;PARTIAL LINE FORWARD;;;;
-008C;<control>;Cc;0;BN;;;;;N;PARTIAL LINE BACKWARD;;;;
-008D;<control>;Cc;0;BN;;;;;N;REVERSE LINE FEED;;;;
-008E;<control>;Cc;0;BN;;;;;N;SINGLE SHIFT TWO;;;;
-008F;<control>;Cc;0;BN;;;;;N;SINGLE SHIFT THREE;;;;
-0090;<control>;Cc;0;BN;;;;;N;DEVICE CONTROL STRING;;;;
-0091;<control>;Cc;0;BN;;;;;N;PRIVATE USE ONE;;;;
-0092;<control>;Cc;0;BN;;;;;N;PRIVATE USE TWO;;;;
-0093;<control>;Cc;0;BN;;;;;N;SET TRANSMIT STATE;;;;
-0094;<control>;Cc;0;BN;;;;;N;CANCEL CHARACTER;;;;
-0095;<control>;Cc;0;BN;;;;;N;MESSAGE WAITING;;;;
-0096;<control>;Cc;0;BN;;;;;N;START OF GUARDED AREA;;;;
-0097;<control>;Cc;0;BN;;;;;N;END OF GUARDED AREA;;;;
-0098;<control>;Cc;0;BN;;;;;N;START OF STRING;;;;
-0099;<control>;Cc;0;BN;;;;;N;;;;;
-009A;<control>;Cc;0;BN;;;;;N;SINGLE CHARACTER INTRODUCER;;;;
-009B;<control>;Cc;0;BN;;;;;N;CONTROL SEQUENCE INTRODUCER;;;;
-009C;<control>;Cc;0;BN;;;;;N;STRING TERMINATOR;;;;
-009D;<control>;Cc;0;BN;;;;;N;OPERATING SYSTEM COMMAND;;;;
-009E;<control>;Cc;0;BN;;;;;N;PRIVACY MESSAGE;;;;
-009F;<control>;Cc;0;BN;;;;;N;APPLICATION PROGRAM COMMAND;;;;
-00A0;NO-BREAK SPACE;Zs;0;CS;<noBreak> 0020;;;;N;NON-BREAKING SPACE;;;;
-00A1;INVERTED EXCLAMATION MARK;Po;0;ON;;;;;N;;;;;
-00A2;CENT SIGN;Sc;0;ET;;;;;N;;;;;
-00A3;POUND SIGN;Sc;0;ET;;;;;N;;;;;
-00A4;CURRENCY SIGN;Sc;0;ET;;;;;N;;;;;
-00A5;YEN SIGN;Sc;0;ET;;;;;N;;;;;
-00A6;BROKEN BAR;So;0;ON;;;;;N;BROKEN VERTICAL BAR;;;;
-00A7;SECTION SIGN;So;0;ON;;;;;N;;;;;
-00A8;DIAERESIS;Sk;0;ON;<compat> 0020 0308;;;;N;SPACING DIAERESIS;;;;
-00A9;COPYRIGHT SIGN;So;0;ON;;;;;N;;;;;
-00AA;FEMININE ORDINAL INDICATOR;Ll;0;L;<super> 0061;;;;N;;;;;
-00AB;LEFT-POINTING DOUBLE ANGLE QUOTATION MARK;Pi;0;ON;;;;;Y;LEFT POINTING GUILLEMET;*;;;
-00AC;NOT SIGN;Sm;0;ON;;;;;N;;;;;
-00AD;SOFT HYPHEN;Cf;0;BN;;;;;N;;;;;
-00AE;REGISTERED SIGN;So;0;ON;;;;;N;REGISTERED TRADE MARK SIGN;;;;
-00AF;MACRON;Sk;0;ON;<compat> 0020 0304;;;;N;SPACING MACRON;;;;
-00B0;DEGREE SIGN;So;0;ET;;;;;N;;;;;
-00B1;PLUS-MINUS SIGN;Sm;0;ET;;;;;N;PLUS-OR-MINUS SIGN;;;;
-00B2;SUPERSCRIPT TWO;No;0;EN;<super> 0032;;2;2;N;SUPERSCRIPT DIGIT TWO;;;;
-00B3;SUPERSCRIPT THREE;No;0;EN;<super> 0033;;3;3;N;SUPERSCRIPT DIGIT THREE;;;;
-00B4;ACUTE ACCENT;Sk;0;ON;<compat> 0020 0301;;;;N;SPACING ACUTE;;;;
-00B5;MICRO SIGN;Ll;0;L;<compat> 03BC;;;;N;;;039C;;039C
-00B6;PILCROW SIGN;So;0;ON;;;;;N;PARAGRAPH SIGN;;;;
-00B7;MIDDLE DOT;Po;0;ON;;;;;N;;;;;
-00B8;CEDILLA;Sk;0;ON;<compat> 0020 0327;;;;N;SPACING CEDILLA;;;;
-00B9;SUPERSCRIPT ONE;No;0;EN;<super> 0031;;1;1;N;SUPERSCRIPT DIGIT ONE;;;;
-00BA;MASCULINE ORDINAL INDICATOR;Ll;0;L;<super> 006F;;;;N;;;;;
-00BB;RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK;Pf;0;ON;;;;;Y;RIGHT POINTING GUILLEMET;*;;;
-00BC;VULGAR FRACTION ONE QUARTER;No;0;ON;<fraction> 0031 2044 0034;;;1/4;N;FRACTION ONE QUARTER;;;;
-00BD;VULGAR FRACTION ONE HALF;No;0;ON;<fraction> 0031 2044 0032;;;1/2;N;FRACTION ONE HALF;;;;
-00BE;VULGAR FRACTION THREE QUARTERS;No;0;ON;<fraction> 0033 2044 0034;;;3/4;N;FRACTION THREE QUARTERS;;;;
-00BF;INVERTED QUESTION MARK;Po;0;ON;;;;;N;;;;;
-00C0;LATIN CAPITAL LETTER A WITH GRAVE;Lu;0;L;0041 0300;;;;N;LATIN CAPITAL LETTER A GRAVE;;;00E0;
-00C1;LATIN CAPITAL LETTER A WITH ACUTE;Lu;0;L;0041 0301;;;;N;LATIN CAPITAL LETTER A ACUTE;;;00E1;
-00C2;LATIN CAPITAL LETTER A WITH CIRCUMFLEX;Lu;0;L;0041 0302;;;;N;LATIN CAPITAL LETTER A CIRCUMFLEX;;;00E2;
-00C3;LATIN CAPITAL LETTER A WITH TILDE;Lu;0;L;0041 0303;;;;N;LATIN CAPITAL LETTER A TILDE;;;00E3;
-00C4;LATIN CAPITAL LETTER A WITH DIAERESIS;Lu;0;L;0041 0308;;;;N;LATIN CAPITAL LETTER A DIAERESIS;;;00E4;
-00C5;LATIN CAPITAL LETTER A WITH RING ABOVE;Lu;0;L;0041 030A;;;;N;LATIN CAPITAL LETTER A RING;;;00E5;
-00C6;LATIN CAPITAL LETTER AE;Lu;0;L;;;;;N;LATIN CAPITAL LETTER A E;ash *;;00E6;
-00C7;LATIN CAPITAL LETTER C WITH CEDILLA;Lu;0;L;0043 0327;;;;N;LATIN CAPITAL LETTER C CEDILLA;;;00E7;
-00C8;LATIN CAPITAL LETTER E WITH GRAVE;Lu;0;L;0045 0300;;;;N;LATIN CAPITAL LETTER E GRAVE;;;00E8;
-00C9;LATIN CAPITAL LETTER E WITH ACUTE;Lu;0;L;0045 0301;;;;N;LATIN CAPITAL LETTER E ACUTE;;;00E9;
-00CA;LATIN CAPITAL LETTER E WITH CIRCUMFLEX;Lu;0;L;0045 0302;;;;N;LATIN CAPITAL LETTER E CIRCUMFLEX;;;00EA;
-00CB;LATIN CAPITAL LETTER E WITH DIAERESIS;Lu;0;L;0045 0308;;;;N;LATIN CAPITAL LETTER E DIAERESIS;;;00EB;
-00CC;LATIN CAPITAL LETTER I WITH GRAVE;Lu;0;L;0049 0300;;;;N;LATIN CAPITAL LETTER I GRAVE;;;00EC;
-00CD;LATIN CAPITAL LETTER I WITH ACUTE;Lu;0;L;0049 0301;;;;N;LATIN CAPITAL LETTER I ACUTE;;;00ED;
-00CE;LATIN CAPITAL LETTER I WITH CIRCUMFLEX;Lu;0;L;0049 0302;;;;N;LATIN CAPITAL LETTER I CIRCUMFLEX;;;00EE;
-00CF;LATIN CAPITAL LETTER I WITH DIAERESIS;Lu;0;L;0049 0308;;;;N;LATIN CAPITAL LETTER I DIAERESIS;;;00EF;
-00D0;LATIN CAPITAL LETTER ETH;Lu;0;L;;;;;N;;Icelandic;;00F0;
-00D1;LATIN CAPITAL LETTER N WITH TILDE;Lu;0;L;004E 0303;;;;N;LATIN CAPITAL LETTER N TILDE;;;00F1;
-00D2;LATIN CAPITAL LETTER O WITH GRAVE;Lu;0;L;004F 0300;;;;N;LATIN CAPITAL LETTER O GRAVE;;;00F2;
-00D3;LATIN CAPITAL LETTER O WITH ACUTE;Lu;0;L;004F 0301;;;;N;LATIN CAPITAL LETTER O ACUTE;;;00F3;
-00D4;LATIN CAPITAL LETTER O WITH CIRCUMFLEX;Lu;0;L;004F 0302;;;;N;LATIN CAPITAL LETTER O CIRCUMFLEX;;;00F4;
-00D5;LATIN CAPITAL LETTER O WITH TILDE;Lu;0;L;004F 0303;;;;N;LATIN CAPITAL LETTER O TILDE;;;00F5;
-00D6;LATIN CAPITAL LETTER O WITH DIAERESIS;Lu;0;L;004F 0308;;;;N;LATIN CAPITAL LETTER O DIAERESIS;;;00F6;
-00D7;MULTIPLICATION SIGN;Sm;0;ON;;;;;N;;;;;
-00D8;LATIN CAPITAL LETTER O WITH STROKE;Lu;0;L;;;;;N;LATIN CAPITAL LETTER O SLASH;;;00F8;
-00D9;LATIN CAPITAL LETTER U WITH GRAVE;Lu;0;L;0055 0300;;;;N;LATIN CAPITAL LETTER U GRAVE;;;00F9;
-00DA;LATIN CAPITAL LETTER U WITH ACUTE;Lu;0;L;0055 0301;;;;N;LATIN CAPITAL LETTER U ACUTE;;;00FA;
-00DB;LATIN CAPITAL LETTER U WITH CIRCUMFLEX;Lu;0;L;0055 0302;;;;N;LATIN CAPITAL LETTER U CIRCUMFLEX;;;00FB;
-00DC;LATIN CAPITAL LETTER U WITH DIAERESIS;Lu;0;L;0055 0308;;;;N;LATIN CAPITAL LETTER U DIAERESIS;;;00FC;
-00DD;LATIN CAPITAL LETTER Y WITH ACUTE;Lu;0;L;0059 0301;;;;N;LATIN CAPITAL LETTER Y ACUTE;;;00FD;
-00DE;LATIN CAPITAL LETTER THORN;Lu;0;L;;;;;N;;Icelandic;;00FE;
-00DF;LATIN SMALL LETTER SHARP S;Ll;0;L;;;;;N;;German;;;
-00E0;LATIN SMALL LETTER A WITH GRAVE;Ll;0;L;0061 0300;;;;N;LATIN SMALL LETTER A GRAVE;;00C0;;00C0
-00E1;LATIN SMALL LETTER A WITH ACUTE;Ll;0;L;0061 0301;;;;N;LATIN SMALL LETTER A ACUTE;;00C1;;00C1
-00E2;LATIN SMALL LETTER A WITH CIRCUMFLEX;Ll;0;L;0061 0302;;;;N;LATIN SMALL LETTER A CIRCUMFLEX;;00C2;;00C2
-00E3;LATIN SMALL LETTER A WITH TILDE;Ll;0;L;0061 0303;;;;N;LATIN SMALL LETTER A TILDE;;00C3;;00C3
-00E4;LATIN SMALL LETTER A WITH DIAERESIS;Ll;0;L;0061 0308;;;;N;LATIN SMALL LETTER A DIAERESIS;;00C4;;00C4
-00E5;LATIN SMALL LETTER A WITH RING ABOVE;Ll;0;L;0061 030A;;;;N;LATIN SMALL LETTER A RING;;00C5;;00C5
-00E6;LATIN SMALL LETTER AE;Ll;0;L;;;;;N;LATIN SMALL LETTER A E;ash *;00C6;;00C6
-00E7;LATIN SMALL LETTER C WITH CEDILLA;Ll;0;L;0063 0327;;;;N;LATIN SMALL LETTER C CEDILLA;;00C7;;00C7
-00E8;LATIN SMALL LETTER E WITH GRAVE;Ll;0;L;0065 0300;;;;N;LATIN SMALL LETTER E GRAVE;;00C8;;00C8
-00E9;LATIN SMALL LETTER E WITH ACUTE;Ll;0;L;0065 0301;;;;N;LATIN SMALL LETTER E ACUTE;;00C9;;00C9
-00EA;LATIN SMALL LETTER E WITH CIRCUMFLEX;Ll;0;L;0065 0302;;;;N;LATIN SMALL LETTER E CIRCUMFLEX;;00CA;;00CA
-00EB;LATIN SMALL LETTER E WITH DIAERESIS;Ll;0;L;0065 0308;;;;N;LATIN SMALL LETTER E DIAERESIS;;00CB;;00CB
-00EC;LATIN SMALL LETTER I WITH GRAVE;Ll;0;L;0069 0300;;;;N;LATIN SMALL LETTER I GRAVE;;00CC;;00CC
-00ED;LATIN SMALL LETTER I WITH ACUTE;Ll;0;L;0069 0301;;;;N;LATIN SMALL LETTER I ACUTE;;00CD;;00CD
-00EE;LATIN SMALL LETTER I WITH CIRCUMFLEX;Ll;0;L;0069 0302;;;;N;LATIN SMALL LETTER I CIRCUMFLEX;;00CE;;00CE
-00EF;LATIN SMALL LETTER I WITH DIAERESIS;Ll;0;L;0069 0308;;;;N;LATIN SMALL LETTER I DIAERESIS;;00CF;;00CF
-00F0;LATIN SMALL LETTER ETH;Ll;0;L;;;;;N;;Icelandic;00D0;;00D0
-00F1;LATIN SMALL LETTER N WITH TILDE;Ll;0;L;006E 0303;;;;N;LATIN SMALL LETTER N TILDE;;00D1;;00D1
-00F2;LATIN SMALL LETTER O WITH GRAVE;Ll;0;L;006F 0300;;;;N;LATIN SMALL LETTER O GRAVE;;00D2;;00D2
-00F3;LATIN SMALL LETTER O WITH ACUTE;Ll;0;L;006F 0301;;;;N;LATIN SMALL LETTER O ACUTE;;00D3;;00D3
-00F4;LATIN SMALL LETTER O WITH CIRCUMFLEX;Ll;0;L;006F 0302;;;;N;LATIN SMALL LETTER O CIRCUMFLEX;;00D4;;00D4
-00F5;LATIN SMALL LETTER O WITH TILDE;Ll;0;L;006F 0303;;;;N;LATIN SMALL LETTER O TILDE;;00D5;;00D5
-00F6;LATIN SMALL LETTER O WITH DIAERESIS;Ll;0;L;006F 0308;;;;N;LATIN SMALL LETTER O DIAERESIS;;00D6;;00D6
-00F7;DIVISION SIGN;Sm;0;ON;;;;;N;;;;;
-00F8;LATIN SMALL LETTER O WITH STROKE;Ll;0;L;;;;;N;LATIN SMALL LETTER O SLASH;;00D8;;00D8
-00F9;LATIN SMALL LETTER U WITH GRAVE;Ll;0;L;0075 0300;;;;N;LATIN SMALL LETTER U GRAVE;;00D9;;00D9
-00FA;LATIN SMALL LETTER U WITH ACUTE;Ll;0;L;0075 0301;;;;N;LATIN SMALL LETTER U ACUTE;;00DA;;00DA
-00FB;LATIN SMALL LETTER U WITH CIRCUMFLEX;Ll;0;L;0075 0302;;;;N;LATIN SMALL LETTER U CIRCUMFLEX;;00DB;;00DB
-00FC;LATIN SMALL LETTER U WITH DIAERESIS;Ll;0;L;0075 0308;;;;N;LATIN SMALL LETTER U DIAERESIS;;00DC;;00DC
-00FD;LATIN SMALL LETTER Y WITH ACUTE;Ll;0;L;0079 0301;;;;N;LATIN SMALL LETTER Y ACUTE;;00DD;;00DD
-00FE;LATIN SMALL LETTER THORN;Ll;0;L;;;;;N;;Icelandic;00DE;;00DE
-00FF;LATIN SMALL LETTER Y WITH DIAERESIS;Ll;0;L;0079 0308;;;;N;LATIN SMALL LETTER Y DIAERESIS;;0178;;0178
-0100;LATIN CAPITAL LETTER A WITH MACRON;Lu;0;L;0041 0304;;;;N;LATIN CAPITAL LETTER A MACRON;;;0101;
-0101;LATIN SMALL LETTER A WITH MACRON;Ll;0;L;0061 0304;;;;N;LATIN SMALL LETTER A MACRON;;0100;;0100
-0102;LATIN CAPITAL LETTER A WITH BREVE;Lu;0;L;0041 0306;;;;N;LATIN CAPITAL LETTER A BREVE;;;0103;
-0103;LATIN SMALL LETTER A WITH BREVE;Ll;0;L;0061 0306;;;;N;LATIN SMALL LETTER A BREVE;;0102;;0102
-0104;LATIN CAPITAL LETTER A WITH OGONEK;Lu;0;L;0041 0328;;;;N;LATIN CAPITAL LETTER A OGONEK;;;0105;
-0105;LATIN SMALL LETTER A WITH OGONEK;Ll;0;L;0061 0328;;;;N;LATIN SMALL LETTER A OGONEK;;0104;;0104
-0106;LATIN CAPITAL LETTER C WITH ACUTE;Lu;0;L;0043 0301;;;;N;LATIN CAPITAL LETTER C ACUTE;;;0107;
-0107;LATIN SMALL LETTER C WITH ACUTE;Ll;0;L;0063 0301;;;;N;LATIN SMALL LETTER C ACUTE;;0106;;0106
-0108;LATIN CAPITAL LETTER C WITH CIRCUMFLEX;Lu;0;L;0043 0302;;;;N;LATIN CAPITAL LETTER C CIRCUMFLEX;;;0109;
-0109;LATIN SMALL LETTER C WITH CIRCUMFLEX;Ll;0;L;0063 0302;;;;N;LATIN SMALL LETTER C CIRCUMFLEX;;0108;;0108
-010A;LATIN CAPITAL LETTER C WITH DOT ABOVE;Lu;0;L;0043 0307;;;;N;LATIN CAPITAL LETTER C DOT;;;010B;
-010B;LATIN SMALL LETTER C WITH DOT ABOVE;Ll;0;L;0063 0307;;;;N;LATIN SMALL LETTER C DOT;;010A;;010A
-010C;LATIN CAPITAL LETTER C WITH CARON;Lu;0;L;0043 030C;;;;N;LATIN CAPITAL LETTER C HACEK;;;010D;
-010D;LATIN SMALL LETTER C WITH CARON;Ll;0;L;0063 030C;;;;N;LATIN SMALL LETTER C HACEK;;010C;;010C
-010E;LATIN CAPITAL LETTER D WITH CARON;Lu;0;L;0044 030C;;;;N;LATIN CAPITAL LETTER D HACEK;;;010F;
-010F;LATIN SMALL LETTER D WITH CARON;Ll;0;L;0064 030C;;;;N;LATIN SMALL LETTER D HACEK;;010E;;010E
-0110;LATIN CAPITAL LETTER D WITH STROKE;Lu;0;L;;;;;N;LATIN CAPITAL LETTER D BAR;;;0111;
-0111;LATIN SMALL LETTER D WITH STROKE;Ll;0;L;;;;;N;LATIN SMALL LETTER D BAR;;0110;;0110
-0112;LATIN CAPITAL LETTER E WITH MACRON;Lu;0;L;0045 0304;;;;N;LATIN CAPITAL LETTER E MACRON;;;0113;
-0113;LATIN SMALL LETTER E WITH MACRON;Ll;0;L;0065 0304;;;;N;LATIN SMALL LETTER E MACRON;;0112;;0112
-0114;LATIN CAPITAL LETTER E WITH BREVE;Lu;0;L;0045 0306;;;;N;LATIN CAPITAL LETTER E BREVE;;;0115;
-0115;LATIN SMALL LETTER E WITH BREVE;Ll;0;L;0065 0306;;;;N;LATIN SMALL LETTER E BREVE;;0114;;0114
-0116;LATIN CAPITAL LETTER E WITH DOT ABOVE;Lu;0;L;0045 0307;;;;N;LATIN CAPITAL LETTER E DOT;;;0117;
-0117;LATIN SMALL LETTER E WITH DOT ABOVE;Ll;0;L;0065 0307;;;;N;LATIN SMALL LETTER E DOT;;0116;;0116
-0118;LATIN CAPITAL LETTER E WITH OGONEK;Lu;0;L;0045 0328;;;;N;LATIN CAPITAL LETTER E OGONEK;;;0119;
-0119;LATIN SMALL LETTER E WITH OGONEK;Ll;0;L;0065 0328;;;;N;LATIN SMALL LETTER E OGONEK;;0118;;0118
-011A;LATIN CAPITAL LETTER E WITH CARON;Lu;0;L;0045 030C;;;;N;LATIN CAPITAL LETTER E HACEK;;;011B;
-011B;LATIN SMALL LETTER E WITH CARON;Ll;0;L;0065 030C;;;;N;LATIN SMALL LETTER E HACEK;;011A;;011A
-011C;LATIN CAPITAL LETTER G WITH CIRCUMFLEX;Lu;0;L;0047 0302;;;;N;LATIN CAPITAL LETTER G CIRCUMFLEX;;;011D;
-011D;LATIN SMALL LETTER G WITH CIRCUMFLEX;Ll;0;L;0067 0302;;;;N;LATIN SMALL LETTER G CIRCUMFLEX;;011C;;011C
-011E;LATIN CAPITAL LETTER G WITH BREVE;Lu;0;L;0047 0306;;;;N;LATIN CAPITAL LETTER G BREVE;;;011F;
-011F;LATIN SMALL LETTER G WITH BREVE;Ll;0;L;0067 0306;;;;N;LATIN SMALL LETTER G BREVE;;011E;;011E
-0120;LATIN CAPITAL LETTER G WITH DOT ABOVE;Lu;0;L;0047 0307;;;;N;LATIN CAPITAL LETTER G DOT;;;0121;
-0121;LATIN SMALL LETTER G WITH DOT ABOVE;Ll;0;L;0067 0307;;;;N;LATIN SMALL LETTER G DOT;;0120;;0120
-0122;LATIN CAPITAL LETTER G WITH CEDILLA;Lu;0;L;0047 0327;;;;N;LATIN CAPITAL LETTER G CEDILLA;;;0123;
-0123;LATIN SMALL LETTER G WITH CEDILLA;Ll;0;L;0067 0327;;;;N;LATIN SMALL LETTER G CEDILLA;;0122;;0122
-0124;LATIN CAPITAL LETTER H WITH CIRCUMFLEX;Lu;0;L;0048 0302;;;;N;LATIN CAPITAL LETTER H CIRCUMFLEX;;;0125;
-0125;LATIN SMALL LETTER H WITH CIRCUMFLEX;Ll;0;L;0068 0302;;;;N;LATIN SMALL LETTER H CIRCUMFLEX;;0124;;0124
-0126;LATIN CAPITAL LETTER H WITH STROKE;Lu;0;L;;;;;N;LATIN CAPITAL LETTER H BAR;;;0127;
-0127;LATIN SMALL LETTER H WITH STROKE;Ll;0;L;;;;;N;LATIN SMALL LETTER H BAR;;0126;;0126
-0128;LATIN CAPITAL LETTER I WITH TILDE;Lu;0;L;0049 0303;;;;N;LATIN CAPITAL LETTER I TILDE;;;0129;
-0129;LATIN SMALL LETTER I WITH TILDE;Ll;0;L;0069 0303;;;;N;LATIN SMALL LETTER I TILDE;;0128;;0128
-012A;LATIN CAPITAL LETTER I WITH MACRON;Lu;0;L;0049 0304;;;;N;LATIN CAPITAL LETTER I MACRON;;;012B;
-012B;LATIN SMALL LETTER I WITH MACRON;Ll;0;L;0069 0304;;;;N;LATIN SMALL LETTER I MACRON;;012A;;012A
-012C;LATIN CAPITAL LETTER I WITH BREVE;Lu;0;L;0049 0306;;;;N;LATIN CAPITAL LETTER I BREVE;;;012D;
-012D;LATIN SMALL LETTER I WITH BREVE;Ll;0;L;0069 0306;;;;N;LATIN SMALL LETTER I BREVE;;012C;;012C
-012E;LATIN CAPITAL LETTER I WITH OGONEK;Lu;0;L;0049 0328;;;;N;LATIN CAPITAL LETTER I OGONEK;;;012F;
-012F;LATIN SMALL LETTER I WITH OGONEK;Ll;0;L;0069 0328;;;;N;LATIN SMALL LETTER I OGONEK;;012E;;012E
-0130;LATIN CAPITAL LETTER I WITH DOT ABOVE;Lu;0;L;0049 0307;;;;N;LATIN CAPITAL LETTER I DOT;;;0069;
-0131;LATIN SMALL LETTER DOTLESS I;Ll;0;L;;;;;N;;;0049;;0049
-0132;LATIN CAPITAL LIGATURE IJ;Lu;0;L;<compat> 0049 004A;;;;N;LATIN CAPITAL LETTER I J;;;0133;
-0133;LATIN SMALL LIGATURE IJ;Ll;0;L;<compat> 0069 006A;;;;N;LATIN SMALL LETTER I J;;0132;;0132
-0134;LATIN CAPITAL LETTER J WITH CIRCUMFLEX;Lu;0;L;004A 0302;;;;N;LATIN CAPITAL LETTER J CIRCUMFLEX;;;0135;
-0135;LATIN SMALL LETTER J WITH CIRCUMFLEX;Ll;0;L;006A 0302;;;;N;LATIN SMALL LETTER J CIRCUMFLEX;;0134;;0134
-0136;LATIN CAPITAL LETTER K WITH CEDILLA;Lu;0;L;004B 0327;;;;N;LATIN CAPITAL LETTER K CEDILLA;;;0137;
-0137;LATIN SMALL LETTER K WITH CEDILLA;Ll;0;L;006B 0327;;;;N;LATIN SMALL LETTER K CEDILLA;;0136;;0136
-0138;LATIN SMALL LETTER KRA;Ll;0;L;;;;;N;;Greenlandic;;;
-0139;LATIN CAPITAL LETTER L WITH ACUTE;Lu;0;L;004C 0301;;;;N;LATIN CAPITAL LETTER L ACUTE;;;013A;
-013A;LATIN SMALL LETTER L WITH ACUTE;Ll;0;L;006C 0301;;;;N;LATIN SMALL LETTER L ACUTE;;0139;;0139
-013B;LATIN CAPITAL LETTER L WITH CEDILLA;Lu;0;L;004C 0327;;;;N;LATIN CAPITAL LETTER L CEDILLA;;;013C;
-013C;LATIN SMALL LETTER L WITH CEDILLA;Ll;0;L;006C 0327;;;;N;LATIN SMALL LETTER L CEDILLA;;013B;;013B
-013D;LATIN CAPITAL LETTER L WITH CARON;Lu;0;L;004C 030C;;;;N;LATIN CAPITAL LETTER L HACEK;;;013E;
-013E;LATIN SMALL LETTER L WITH CARON;Ll;0;L;006C 030C;;;;N;LATIN SMALL LETTER L HACEK;;013D;;013D
-013F;LATIN CAPITAL LETTER L WITH MIDDLE DOT;Lu;0;L;<compat> 004C 00B7;;;;N;;;;0140;
-0140;LATIN SMALL LETTER L WITH MIDDLE DOT;Ll;0;L;<compat> 006C 00B7;;;;N;;;013F;;013F
-0141;LATIN CAPITAL LETTER L WITH STROKE;Lu;0;L;;;;;N;LATIN CAPITAL LETTER L SLASH;;;0142;
-0142;LATIN SMALL LETTER L WITH STROKE;Ll;0;L;;;;;N;LATIN SMALL LETTER L SLASH;;0141;;0141
-0143;LATIN CAPITAL LETTER N WITH ACUTE;Lu;0;L;004E 0301;;;;N;LATIN CAPITAL LETTER N ACUTE;;;0144;
-0144;LATIN SMALL LETTER N WITH ACUTE;Ll;0;L;006E 0301;;;;N;LATIN SMALL LETTER N ACUTE;;0143;;0143
-0145;LATIN CAPITAL LETTER N WITH CEDILLA;Lu;0;L;004E 0327;;;;N;LATIN CAPITAL LETTER N CEDILLA;;;0146;
-0146;LATIN SMALL LETTER N WITH CEDILLA;Ll;0;L;006E 0327;;;;N;LATIN SMALL LETTER N CEDILLA;;0145;;0145
-0147;LATIN CAPITAL LETTER N WITH CARON;Lu;0;L;004E 030C;;;;N;LATIN CAPITAL LETTER N HACEK;;;0148;
-0148;LATIN SMALL LETTER N WITH CARON;Ll;0;L;006E 030C;;;;N;LATIN SMALL LETTER N HACEK;;0147;;0147
-0149;LATIN SMALL LETTER N PRECEDED BY APOSTROPHE;Ll;0;L;<compat> 02BC 006E;;;;N;LATIN SMALL LETTER APOSTROPHE N;;;;
-014A;LATIN CAPITAL LETTER ENG;Lu;0;L;;;;;N;;Sami;;014B;
-014B;LATIN SMALL LETTER ENG;Ll;0;L;;;;;N;;Sami;014A;;014A
-014C;LATIN CAPITAL LETTER O WITH MACRON;Lu;0;L;004F 0304;;;;N;LATIN CAPITAL LETTER O MACRON;;;014D;
-014D;LATIN SMALL LETTER O WITH MACRON;Ll;0;L;006F 0304;;;;N;LATIN SMALL LETTER O MACRON;;014C;;014C
-014E;LATIN CAPITAL LETTER O WITH BREVE;Lu;0;L;004F 0306;;;;N;LATIN CAPITAL LETTER O BREVE;;;014F;
-014F;LATIN SMALL LETTER O WITH BREVE;Ll;0;L;006F 0306;;;;N;LATIN SMALL LETTER O BREVE;;014E;;014E
-0150;LATIN CAPITAL LETTER O WITH DOUBLE ACUTE;Lu;0;L;004F 030B;;;;N;LATIN CAPITAL LETTER O DOUBLE ACUTE;;;0151;
-0151;LATIN SMALL LETTER O WITH DOUBLE ACUTE;Ll;0;L;006F 030B;;;;N;LATIN SMALL LETTER O DOUBLE ACUTE;;0150;;0150
-0152;LATIN CAPITAL LIGATURE OE;Lu;0;L;;;;;N;LATIN CAPITAL LETTER O E;;;0153;
-0153;LATIN SMALL LIGATURE OE;Ll;0;L;;;;;N;LATIN SMALL LETTER O E;;0152;;0152
-0154;LATIN CAPITAL LETTER R WITH ACUTE;Lu;0;L;0052 0301;;;;N;LATIN CAPITAL LETTER R ACUTE;;;0155;
-0155;LATIN SMALL LETTER R WITH ACUTE;Ll;0;L;0072 0301;;;;N;LATIN SMALL LETTER R ACUTE;;0154;;0154
-0156;LATIN CAPITAL LETTER R WITH CEDILLA;Lu;0;L;0052 0327;;;;N;LATIN CAPITAL LETTER R CEDILLA;;;0157;
-0157;LATIN SMALL LETTER R WITH CEDILLA;Ll;0;L;0072 0327;;;;N;LATIN SMALL LETTER R CEDILLA;;0156;;0156
-0158;LATIN CAPITAL LETTER R WITH CARON;Lu;0;L;0052 030C;;;;N;LATIN CAPITAL LETTER R HACEK;;;0159;
-0159;LATIN SMALL LETTER R WITH CARON;Ll;0;L;0072 030C;;;;N;LATIN SMALL LETTER R HACEK;;0158;;0158
-015A;LATIN CAPITAL LETTER S WITH ACUTE;Lu;0;L;0053 0301;;;;N;LATIN CAPITAL LETTER S ACUTE;;;015B;
-015B;LATIN SMALL LETTER S WITH ACUTE;Ll;0;L;0073 0301;;;;N;LATIN SMALL LETTER S ACUTE;;015A;;015A
-015C;LATIN CAPITAL LETTER S WITH CIRCUMFLEX;Lu;0;L;0053 0302;;;;N;LATIN CAPITAL LETTER S CIRCUMFLEX;;;015D;
-015D;LATIN SMALL LETTER S WITH CIRCUMFLEX;Ll;0;L;0073 0302;;;;N;LATIN SMALL LETTER S CIRCUMFLEX;;015C;;015C
-015E;LATIN CAPITAL LETTER S WITH CEDILLA;Lu;0;L;0053 0327;;;;N;LATIN CAPITAL LETTER S CEDILLA;*;;015F;
-015F;LATIN SMALL LETTER S WITH CEDILLA;Ll;0;L;0073 0327;;;;N;LATIN SMALL LETTER S CEDILLA;*;015E;;015E
-0160;LATIN CAPITAL LETTER S WITH CARON;Lu;0;L;0053 030C;;;;N;LATIN CAPITAL LETTER S HACEK;;;0161;
-0161;LATIN SMALL LETTER S WITH CARON;Ll;0;L;0073 030C;;;;N;LATIN SMALL LETTER S HACEK;;0160;;0160
-0162;LATIN CAPITAL LETTER T WITH CEDILLA;Lu;0;L;0054 0327;;;;N;LATIN CAPITAL LETTER T CEDILLA;*;;0163;
-0163;LATIN SMALL LETTER T WITH CEDILLA;Ll;0;L;0074 0327;;;;N;LATIN SMALL LETTER T CEDILLA;*;0162;;0162
-0164;LATIN CAPITAL LETTER T WITH CARON;Lu;0;L;0054 030C;;;;N;LATIN CAPITAL LETTER T HACEK;;;0165;
-0165;LATIN SMALL LETTER T WITH CARON;Ll;0;L;0074 030C;;;;N;LATIN SMALL LETTER T HACEK;;0164;;0164
-0166;LATIN CAPITAL LETTER T WITH STROKE;Lu;0;L;;;;;N;LATIN CAPITAL LETTER T BAR;;;0167;
-0167;LATIN SMALL LETTER T WITH STROKE;Ll;0;L;;;;;N;LATIN SMALL LETTER T BAR;;0166;;0166
-0168;LATIN CAPITAL LETTER U WITH TILDE;Lu;0;L;0055 0303;;;;N;LATIN CAPITAL LETTER U TILDE;;;0169;
-0169;LATIN SMALL LETTER U WITH TILDE;Ll;0;L;0075 0303;;;;N;LATIN SMALL LETTER U TILDE;;0168;;0168
-016A;LATIN CAPITAL LETTER U WITH MACRON;Lu;0;L;0055 0304;;;;N;LATIN CAPITAL LETTER U MACRON;;;016B;
-016B;LATIN SMALL LETTER U WITH MACRON;Ll;0;L;0075 0304;;;;N;LATIN SMALL LETTER U MACRON;;016A;;016A
-016C;LATIN CAPITAL LETTER U WITH BREVE;Lu;0;L;0055 0306;;;;N;LATIN CAPITAL LETTER U BREVE;;;016D;
-016D;LATIN SMALL LETTER U WITH BREVE;Ll;0;L;0075 0306;;;;N;LATIN SMALL LETTER U BREVE;;016C;;016C
-016E;LATIN CAPITAL LETTER U WITH RING ABOVE;Lu;0;L;0055 030A;;;;N;LATIN CAPITAL LETTER U RING;;;016F;
-016F;LATIN SMALL LETTER U WITH RING ABOVE;Ll;0;L;0075 030A;;;;N;LATIN SMALL LETTER U RING;;016E;;016E
-0170;LATIN CAPITAL LETTER U WITH DOUBLE ACUTE;Lu;0;L;0055 030B;;;;N;LATIN CAPITAL LETTER U DOUBLE ACUTE;;;0171;
-0171;LATIN SMALL LETTER U WITH DOUBLE ACUTE;Ll;0;L;0075 030B;;;;N;LATIN SMALL LETTER U DOUBLE ACUTE;;0170;;0170
-0172;LATIN CAPITAL LETTER U WITH OGONEK;Lu;0;L;0055 0328;;;;N;LATIN CAPITAL LETTER U OGONEK;;;0173;
-0173;LATIN SMALL LETTER U WITH OGONEK;Ll;0;L;0075 0328;;;;N;LATIN SMALL LETTER U OGONEK;;0172;;0172
-0174;LATIN CAPITAL LETTER W WITH CIRCUMFLEX;Lu;0;L;0057 0302;;;;N;LATIN CAPITAL LETTER W CIRCUMFLEX;;;0175;
-0175;LATIN SMALL LETTER W WITH CIRCUMFLEX;Ll;0;L;0077 0302;;;;N;LATIN SMALL LETTER W CIRCUMFLEX;;0174;;0174
-0176;LATIN CAPITAL LETTER Y WITH CIRCUMFLEX;Lu;0;L;0059 0302;;;;N;LATIN CAPITAL LETTER Y CIRCUMFLEX;;;0177;
-0177;LATIN SMALL LETTER Y WITH CIRCUMFLEX;Ll;0;L;0079 0302;;;;N;LATIN SMALL LETTER Y CIRCUMFLEX;;0176;;0176
-0178;LATIN CAPITAL LETTER Y WITH DIAERESIS;Lu;0;L;0059 0308;;;;N;LATIN CAPITAL LETTER Y DIAERESIS;;;00FF;
-0179;LATIN CAPITAL LETTER Z WITH ACUTE;Lu;0;L;005A 0301;;;;N;LATIN CAPITAL LETTER Z ACUTE;;;017A;
-017A;LATIN SMALL LETTER Z WITH ACUTE;Ll;0;L;007A 0301;;;;N;LATIN SMALL LETTER Z ACUTE;;0179;;0179
-017B;LATIN CAPITAL LETTER Z WITH DOT ABOVE;Lu;0;L;005A 0307;;;;N;LATIN CAPITAL LETTER Z DOT;;;017C;
-017C;LATIN SMALL LETTER Z WITH DOT ABOVE;Ll;0;L;007A 0307;;;;N;LATIN SMALL LETTER Z DOT;;017B;;017B
-017D;LATIN CAPITAL LETTER Z WITH CARON;Lu;0;L;005A 030C;;;;N;LATIN CAPITAL LETTER Z HACEK;;;017E;
-017E;LATIN SMALL LETTER Z WITH CARON;Ll;0;L;007A 030C;;;;N;LATIN SMALL LETTER Z HACEK;;017D;;017D
-017F;LATIN SMALL LETTER LONG S;Ll;0;L;<compat> 0073;;;;N;;;0053;;0053
-0180;LATIN SMALL LETTER B WITH STROKE;Ll;0;L;;;;;N;LATIN SMALL LETTER B BAR;;0243;;0243
-0181;LATIN CAPITAL LETTER B WITH HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER B HOOK;;;0253;
-0182;LATIN CAPITAL LETTER B WITH TOPBAR;Lu;0;L;;;;;N;LATIN CAPITAL LETTER B TOPBAR;;;0183;
-0183;LATIN SMALL LETTER B WITH TOPBAR;Ll;0;L;;;;;N;LATIN SMALL LETTER B TOPBAR;;0182;;0182
-0184;LATIN CAPITAL LETTER TONE SIX;Lu;0;L;;;;;N;;;;0185;
-0185;LATIN SMALL LETTER TONE SIX;Ll;0;L;;;;;N;;;0184;;0184
-0186;LATIN CAPITAL LETTER OPEN O;Lu;0;L;;;;;N;;;;0254;
-0187;LATIN CAPITAL LETTER C WITH HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER C HOOK;;;0188;
-0188;LATIN SMALL LETTER C WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER C HOOK;;0187;;0187
-0189;LATIN CAPITAL LETTER AFRICAN D;Lu;0;L;;;;;N;;*;;0256;
-018A;LATIN CAPITAL LETTER D WITH HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER D HOOK;;;0257;
-018B;LATIN CAPITAL LETTER D WITH TOPBAR;Lu;0;L;;;;;N;LATIN CAPITAL LETTER D TOPBAR;;;018C;
-018C;LATIN SMALL LETTER D WITH TOPBAR;Ll;0;L;;;;;N;LATIN SMALL LETTER D TOPBAR;;018B;;018B
-018D;LATIN SMALL LETTER TURNED DELTA;Ll;0;L;;;;;N;;;;;
-018E;LATIN CAPITAL LETTER REVERSED E;Lu;0;L;;;;;N;LATIN CAPITAL LETTER TURNED E;;;01DD;
-018F;LATIN CAPITAL LETTER SCHWA;Lu;0;L;;;;;N;;;;0259;
-0190;LATIN CAPITAL LETTER OPEN E;Lu;0;L;;;;;N;LATIN CAPITAL LETTER EPSILON;;;025B;
-0191;LATIN CAPITAL LETTER F WITH HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER F HOOK;;;0192;
-0192;LATIN SMALL LETTER F WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER SCRIPT F;;0191;;0191
-0193;LATIN CAPITAL LETTER G WITH HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER G HOOK;;;0260;
-0194;LATIN CAPITAL LETTER GAMMA;Lu;0;L;;;;;N;;;;0263;
-0195;LATIN SMALL LETTER HV;Ll;0;L;;;;;N;LATIN SMALL LETTER H V;hwair;01F6;;01F6
-0196;LATIN CAPITAL LETTER IOTA;Lu;0;L;;;;;N;;;;0269;
-0197;LATIN CAPITAL LETTER I WITH STROKE;Lu;0;L;;;;;N;LATIN CAPITAL LETTER BARRED I;;;0268;
-0198;LATIN CAPITAL LETTER K WITH HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER K HOOK;;;0199;
-0199;LATIN SMALL LETTER K WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER K HOOK;;0198;;0198
-019A;LATIN SMALL LETTER L WITH BAR;Ll;0;L;;;;;N;LATIN SMALL LETTER BARRED L;;023D;;023D
-019B;LATIN SMALL LETTER LAMBDA WITH STROKE;Ll;0;L;;;;;N;LATIN SMALL LETTER BARRED LAMBDA;;;;
-019C;LATIN CAPITAL LETTER TURNED M;Lu;0;L;;;;;N;;;;026F;
-019D;LATIN CAPITAL LETTER N WITH LEFT HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER N HOOK;;;0272;
-019E;LATIN SMALL LETTER N WITH LONG RIGHT LEG;Ll;0;L;;;;;N;;;0220;;0220
-019F;LATIN CAPITAL LETTER O WITH MIDDLE TILDE;Lu;0;L;;;;;N;LATIN CAPITAL LETTER BARRED O;*;;0275;
-01A0;LATIN CAPITAL LETTER O WITH HORN;Lu;0;L;004F 031B;;;;N;LATIN CAPITAL LETTER O HORN;;;01A1;
-01A1;LATIN SMALL LETTER O WITH HORN;Ll;0;L;006F 031B;;;;N;LATIN SMALL LETTER O HORN;;01A0;;01A0
-01A2;LATIN CAPITAL LETTER OI;Lu;0;L;;;;;N;LATIN CAPITAL LETTER O I;gha;;01A3;
-01A3;LATIN SMALL LETTER OI;Ll;0;L;;;;;N;LATIN SMALL LETTER O I;gha;01A2;;01A2
-01A4;LATIN CAPITAL LETTER P WITH HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER P HOOK;;;01A5;
-01A5;LATIN SMALL LETTER P WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER P HOOK;;01A4;;01A4
-01A6;LATIN LETTER YR;Lu;0;L;;;;;N;LATIN LETTER Y R;*;;0280;
-01A7;LATIN CAPITAL LETTER TONE TWO;Lu;0;L;;;;;N;;;;01A8;
-01A8;LATIN SMALL LETTER TONE TWO;Ll;0;L;;;;;N;;;01A7;;01A7
-01A9;LATIN CAPITAL LETTER ESH;Lu;0;L;;;;;N;;;;0283;
-01AA;LATIN LETTER REVERSED ESH LOOP;Ll;0;L;;;;;N;;;;;
-01AB;LATIN SMALL LETTER T WITH PALATAL HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER T PALATAL HOOK;;;;
-01AC;LATIN CAPITAL LETTER T WITH HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER T HOOK;;;01AD;
-01AD;LATIN SMALL LETTER T WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER T HOOK;;01AC;;01AC
-01AE;LATIN CAPITAL LETTER T WITH RETROFLEX HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER T RETROFLEX HOOK;;;0288;
-01AF;LATIN CAPITAL LETTER U WITH HORN;Lu;0;L;0055 031B;;;;N;LATIN CAPITAL LETTER U HORN;;;01B0;
-01B0;LATIN SMALL LETTER U WITH HORN;Ll;0;L;0075 031B;;;;N;LATIN SMALL LETTER U HORN;;01AF;;01AF
-01B1;LATIN CAPITAL LETTER UPSILON;Lu;0;L;;;;;N;;;;028A;
-01B2;LATIN CAPITAL LETTER V WITH HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER SCRIPT V;;;028B;
-01B3;LATIN CAPITAL LETTER Y WITH HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER Y HOOK;;;01B4;
-01B4;LATIN SMALL LETTER Y WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER Y HOOK;;01B3;;01B3
-01B5;LATIN CAPITAL LETTER Z WITH STROKE;Lu;0;L;;;;;N;LATIN CAPITAL LETTER Z BAR;;;01B6;
-01B6;LATIN SMALL LETTER Z WITH STROKE;Ll;0;L;;;;;N;LATIN SMALL LETTER Z BAR;;01B5;;01B5
-01B7;LATIN CAPITAL LETTER EZH;Lu;0;L;;;;;N;LATIN CAPITAL LETTER YOGH;;;0292;
-01B8;LATIN CAPITAL LETTER EZH REVERSED;Lu;0;L;;;;;N;LATIN CAPITAL LETTER REVERSED YOGH;;;01B9;
-01B9;LATIN SMALL LETTER EZH REVERSED;Ll;0;L;;;;;N;LATIN SMALL LETTER REVERSED YOGH;;01B8;;01B8
-01BA;LATIN SMALL LETTER EZH WITH TAIL;Ll;0;L;;;;;N;LATIN SMALL LETTER YOGH WITH TAIL;;;;
-01BB;LATIN LETTER TWO WITH STROKE;Lo;0;L;;;;;N;LATIN LETTER TWO BAR;;;;
-01BC;LATIN CAPITAL LETTER TONE FIVE;Lu;0;L;;;;;N;;;;01BD;
-01BD;LATIN SMALL LETTER TONE FIVE;Ll;0;L;;;;;N;;;01BC;;01BC
-01BE;LATIN LETTER INVERTED GLOTTAL STOP WITH STROKE;Ll;0;L;;;;;N;LATIN LETTER INVERTED GLOTTAL STOP BAR;;;;
-01BF;LATIN LETTER WYNN;Ll;0;L;;;;;N;;;01F7;;01F7
-01C0;LATIN LETTER DENTAL CLICK;Lo;0;L;;;;;N;LATIN LETTER PIPE;;;;
-01C1;LATIN LETTER LATERAL CLICK;Lo;0;L;;;;;N;LATIN LETTER DOUBLE PIPE;;;;
-01C2;LATIN LETTER ALVEOLAR CLICK;Lo;0;L;;;;;N;LATIN LETTER PIPE DOUBLE BAR;;;;
-01C3;LATIN LETTER RETROFLEX CLICK;Lo;0;L;;;;;N;LATIN LETTER EXCLAMATION MARK;;;;
-01C4;LATIN CAPITAL LETTER DZ WITH CARON;Lu;0;L;<compat> 0044 017D;;;;N;LATIN CAPITAL LETTER D Z HACEK;;;01C6;01C5
-01C5;LATIN CAPITAL LETTER D WITH SMALL LETTER Z WITH CARON;Lt;0;L;<compat> 0044 017E;;;;N;LATIN LETTER CAPITAL D SMALL Z HACEK;;01C4;01C6;01C5
-01C6;LATIN SMALL LETTER DZ WITH CARON;Ll;0;L;<compat> 0064 017E;;;;N;LATIN SMALL LETTER D Z HACEK;;01C4;;01C5
-01C7;LATIN CAPITAL LETTER LJ;Lu;0;L;<compat> 004C 004A;;;;N;LATIN CAPITAL LETTER L J;;;01C9;01C8
-01C8;LATIN CAPITAL LETTER L WITH SMALL LETTER J;Lt;0;L;<compat> 004C 006A;;;;N;LATIN LETTER CAPITAL L SMALL J;;01C7;01C9;01C8
-01C9;LATIN SMALL LETTER LJ;Ll;0;L;<compat> 006C 006A;;;;N;LATIN SMALL LETTER L J;;01C7;;01C8
-01CA;LATIN CAPITAL LETTER NJ;Lu;0;L;<compat> 004E 004A;;;;N;LATIN CAPITAL LETTER N J;;;01CC;01CB
-01CB;LATIN CAPITAL LETTER N WITH SMALL LETTER J;Lt;0;L;<compat> 004E 006A;;;;N;LATIN LETTER CAPITAL N SMALL J;;01CA;01CC;01CB
-01CC;LATIN SMALL LETTER NJ;Ll;0;L;<compat> 006E 006A;;;;N;LATIN SMALL LETTER N J;;01CA;;01CB
-01CD;LATIN CAPITAL LETTER A WITH CARON;Lu;0;L;0041 030C;;;;N;LATIN CAPITAL LETTER A HACEK;;;01CE;
-01CE;LATIN SMALL LETTER A WITH CARON;Ll;0;L;0061 030C;;;;N;LATIN SMALL LETTER A HACEK;;01CD;;01CD
-01CF;LATIN CAPITAL LETTER I WITH CARON;Lu;0;L;0049 030C;;;;N;LATIN CAPITAL LETTER I HACEK;;;01D0;
-01D0;LATIN SMALL LETTER I WITH CARON;Ll;0;L;0069 030C;;;;N;LATIN SMALL LETTER I HACEK;;01CF;;01CF
-01D1;LATIN CAPITAL LETTER O WITH CARON;Lu;0;L;004F 030C;;;;N;LATIN CAPITAL LETTER O HACEK;;;01D2;
-01D2;LATIN SMALL LETTER O WITH CARON;Ll;0;L;006F 030C;;;;N;LATIN SMALL LETTER O HACEK;;01D1;;01D1
-01D3;LATIN CAPITAL LETTER U WITH CARON;Lu;0;L;0055 030C;;;;N;LATIN CAPITAL LETTER U HACEK;;;01D4;
-01D4;LATIN SMALL LETTER U WITH CARON;Ll;0;L;0075 030C;;;;N;LATIN SMALL LETTER U HACEK;;01D3;;01D3
-01D5;LATIN CAPITAL LETTER U WITH DIAERESIS AND MACRON;Lu;0;L;00DC 0304;;;;N;LATIN CAPITAL LETTER U DIAERESIS MACRON;;;01D6;
-01D6;LATIN SMALL LETTER U WITH DIAERESIS AND MACRON;Ll;0;L;00FC 0304;;;;N;LATIN SMALL LETTER U DIAERESIS MACRON;;01D5;;01D5
-01D7;LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE;Lu;0;L;00DC 0301;;;;N;LATIN CAPITAL LETTER U DIAERESIS ACUTE;;;01D8;
-01D8;LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE;Ll;0;L;00FC 0301;;;;N;LATIN SMALL LETTER U DIAERESIS ACUTE;;01D7;;01D7
-01D9;LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON;Lu;0;L;00DC 030C;;;;N;LATIN CAPITAL LETTER U DIAERESIS HACEK;;;01DA;
-01DA;LATIN SMALL LETTER U WITH DIAERESIS AND CARON;Ll;0;L;00FC 030C;;;;N;LATIN SMALL LETTER U DIAERESIS HACEK;;01D9;;01D9
-01DB;LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE;Lu;0;L;00DC 0300;;;;N;LATIN CAPITAL LETTER U DIAERESIS GRAVE;;;01DC;
-01DC;LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE;Ll;0;L;00FC 0300;;;;N;LATIN SMALL LETTER U DIAERESIS GRAVE;;01DB;;01DB
-01DD;LATIN SMALL LETTER TURNED E;Ll;0;L;;;;;N;;;018E;;018E
-01DE;LATIN CAPITAL LETTER A WITH DIAERESIS AND MACRON;Lu;0;L;00C4 0304;;;;N;LATIN CAPITAL LETTER A DIAERESIS MACRON;;;01DF;
-01DF;LATIN SMALL LETTER A WITH DIAERESIS AND MACRON;Ll;0;L;00E4 0304;;;;N;LATIN SMALL LETTER A DIAERESIS MACRON;;01DE;;01DE
-01E0;LATIN CAPITAL LETTER A WITH DOT ABOVE AND MACRON;Lu;0;L;0226 0304;;;;N;LATIN CAPITAL LETTER A DOT MACRON;;;01E1;
-01E1;LATIN SMALL LETTER A WITH DOT ABOVE AND MACRON;Ll;0;L;0227 0304;;;;N;LATIN SMALL LETTER A DOT MACRON;;01E0;;01E0
-01E2;LATIN CAPITAL LETTER AE WITH MACRON;Lu;0;L;00C6 0304;;;;N;LATIN CAPITAL LETTER A E MACRON;ash *;;01E3;
-01E3;LATIN SMALL LETTER AE WITH MACRON;Ll;0;L;00E6 0304;;;;N;LATIN SMALL LETTER A E MACRON;ash *;01E2;;01E2
-01E4;LATIN CAPITAL LETTER G WITH STROKE;Lu;0;L;;;;;N;LATIN CAPITAL LETTER G BAR;;;01E5;
-01E5;LATIN SMALL LETTER G WITH STROKE;Ll;0;L;;;;;N;LATIN SMALL LETTER G BAR;;01E4;;01E4
-01E6;LATIN CAPITAL LETTER G WITH CARON;Lu;0;L;0047 030C;;;;N;LATIN CAPITAL LETTER G HACEK;;;01E7;
-01E7;LATIN SMALL LETTER G WITH CARON;Ll;0;L;0067 030C;;;;N;LATIN SMALL LETTER G HACEK;;01E6;;01E6
-01E8;LATIN CAPITAL LETTER K WITH CARON;Lu;0;L;004B 030C;;;;N;LATIN CAPITAL LETTER K HACEK;;;01E9;
-01E9;LATIN SMALL LETTER K WITH CARON;Ll;0;L;006B 030C;;;;N;LATIN SMALL LETTER K HACEK;;01E8;;01E8
-01EA;LATIN CAPITAL LETTER O WITH OGONEK;Lu;0;L;004F 0328;;;;N;LATIN CAPITAL LETTER O OGONEK;;;01EB;
-01EB;LATIN SMALL LETTER O WITH OGONEK;Ll;0;L;006F 0328;;;;N;LATIN SMALL LETTER O OGONEK;;01EA;;01EA
-01EC;LATIN CAPITAL LETTER O WITH OGONEK AND MACRON;Lu;0;L;01EA 0304;;;;N;LATIN CAPITAL LETTER O OGONEK MACRON;;;01ED;
-01ED;LATIN SMALL LETTER O WITH OGONEK AND MACRON;Ll;0;L;01EB 0304;;;;N;LATIN SMALL LETTER O OGONEK MACRON;;01EC;;01EC
-01EE;LATIN CAPITAL LETTER EZH WITH CARON;Lu;0;L;01B7 030C;;;;N;LATIN CAPITAL LETTER YOGH HACEK;;;01EF;
-01EF;LATIN SMALL LETTER EZH WITH CARON;Ll;0;L;0292 030C;;;;N;LATIN SMALL LETTER YOGH HACEK;;01EE;;01EE
-01F0;LATIN SMALL LETTER J WITH CARON;Ll;0;L;006A 030C;;;;N;LATIN SMALL LETTER J HACEK;;;;
-01F1;LATIN CAPITAL LETTER DZ;Lu;0;L;<compat> 0044 005A;;;;N;;;;01F3;01F2
-01F2;LATIN CAPITAL LETTER D WITH SMALL LETTER Z;Lt;0;L;<compat> 0044 007A;;;;N;;;01F1;01F3;01F2
-01F3;LATIN SMALL LETTER DZ;Ll;0;L;<compat> 0064 007A;;;;N;;;01F1;;01F2
-01F4;LATIN CAPITAL LETTER G WITH ACUTE;Lu;0;L;0047 0301;;;;N;;;;01F5;
-01F5;LATIN SMALL LETTER G WITH ACUTE;Ll;0;L;0067 0301;;;;N;;;01F4;;01F4
-01F6;LATIN CAPITAL LETTER HWAIR;Lu;0;L;;;;;N;;;;0195;
-01F7;LATIN CAPITAL LETTER WYNN;Lu;0;L;;;;;N;;;;01BF;
-01F8;LATIN CAPITAL LETTER N WITH GRAVE;Lu;0;L;004E 0300;;;;N;;;;01F9;
-01F9;LATIN SMALL LETTER N WITH GRAVE;Ll;0;L;006E 0300;;;;N;;;01F8;;01F8
-01FA;LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE;Lu;0;L;00C5 0301;;;;N;;;;01FB;
-01FB;LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE;Ll;0;L;00E5 0301;;;;N;;;01FA;;01FA
-01FC;LATIN CAPITAL LETTER AE WITH ACUTE;Lu;0;L;00C6 0301;;;;N;;ash *;;01FD;
-01FD;LATIN SMALL LETTER AE WITH ACUTE;Ll;0;L;00E6 0301;;;;N;;ash *;01FC;;01FC
-01FE;LATIN CAPITAL LETTER O WITH STROKE AND ACUTE;Lu;0;L;00D8 0301;;;;N;;;;01FF;
-01FF;LATIN SMALL LETTER O WITH STROKE AND ACUTE;Ll;0;L;00F8 0301;;;;N;;;01FE;;01FE
-0200;LATIN CAPITAL LETTER A WITH DOUBLE GRAVE;Lu;0;L;0041 030F;;;;N;;;;0201;
-0201;LATIN SMALL LETTER A WITH DOUBLE GRAVE;Ll;0;L;0061 030F;;;;N;;;0200;;0200
-0202;LATIN CAPITAL LETTER A WITH INVERTED BREVE;Lu;0;L;0041 0311;;;;N;;;;0203;
-0203;LATIN SMALL LETTER A WITH INVERTED BREVE;Ll;0;L;0061 0311;;;;N;;;0202;;0202
-0204;LATIN CAPITAL LETTER E WITH DOUBLE GRAVE;Lu;0;L;0045 030F;;;;N;;;;0205;
-0205;LATIN SMALL LETTER E WITH DOUBLE GRAVE;Ll;0;L;0065 030F;;;;N;;;0204;;0204
-0206;LATIN CAPITAL LETTER E WITH INVERTED BREVE;Lu;0;L;0045 0311;;;;N;;;;0207;
-0207;LATIN SMALL LETTER E WITH INVERTED BREVE;Ll;0;L;0065 0311;;;;N;;;0206;;0206
-0208;LATIN CAPITAL LETTER I WITH DOUBLE GRAVE;Lu;0;L;0049 030F;;;;N;;;;0209;
-0209;LATIN SMALL LETTER I WITH DOUBLE GRAVE;Ll;0;L;0069 030F;;;;N;;;0208;;0208
-020A;LATIN CAPITAL LETTER I WITH INVERTED BREVE;Lu;0;L;0049 0311;;;;N;;;;020B;
-020B;LATIN SMALL LETTER I WITH INVERTED BREVE;Ll;0;L;0069 0311;;;;N;;;020A;;020A
-020C;LATIN CAPITAL LETTER O WITH DOUBLE GRAVE;Lu;0;L;004F 030F;;;;N;;;;020D;
-020D;LATIN SMALL LETTER O WITH DOUBLE GRAVE;Ll;0;L;006F 030F;;;;N;;;020C;;020C
-020E;LATIN CAPITAL LETTER O WITH INVERTED BREVE;Lu;0;L;004F 0311;;;;N;;;;020F;
-020F;LATIN SMALL LETTER O WITH INVERTED BREVE;Ll;0;L;006F 0311;;;;N;;;020E;;020E
-0210;LATIN CAPITAL LETTER R WITH DOUBLE GRAVE;Lu;0;L;0052 030F;;;;N;;;;0211;
-0211;LATIN SMALL LETTER R WITH DOUBLE GRAVE;Ll;0;L;0072 030F;;;;N;;;0210;;0210
-0212;LATIN CAPITAL LETTER R WITH INVERTED BREVE;Lu;0;L;0052 0311;;;;N;;;;0213;
-0213;LATIN SMALL LETTER R WITH INVERTED BREVE;Ll;0;L;0072 0311;;;;N;;;0212;;0212
-0214;LATIN CAPITAL LETTER U WITH DOUBLE GRAVE;Lu;0;L;0055 030F;;;;N;;;;0215;
-0215;LATIN SMALL LETTER U WITH DOUBLE GRAVE;Ll;0;L;0075 030F;;;;N;;;0214;;0214
-0216;LATIN CAPITAL LETTER U WITH INVERTED BREVE;Lu;0;L;0055 0311;;;;N;;;;0217;
-0217;LATIN SMALL LETTER U WITH INVERTED BREVE;Ll;0;L;0075 0311;;;;N;;;0216;;0216
-0218;LATIN CAPITAL LETTER S WITH COMMA BELOW;Lu;0;L;0053 0326;;;;N;;*;;0219;
-0219;LATIN SMALL LETTER S WITH COMMA BELOW;Ll;0;L;0073 0326;;;;N;;*;0218;;0218
-021A;LATIN CAPITAL LETTER T WITH COMMA BELOW;Lu;0;L;0054 0326;;;;N;;*;;021B;
-021B;LATIN SMALL LETTER T WITH COMMA BELOW;Ll;0;L;0074 0326;;;;N;;*;021A;;021A
-021C;LATIN CAPITAL LETTER YOGH;Lu;0;L;;;;;N;;;;021D;
-021D;LATIN SMALL LETTER YOGH;Ll;0;L;;;;;N;;;021C;;021C
-021E;LATIN CAPITAL LETTER H WITH CARON;Lu;0;L;0048 030C;;;;N;;;;021F;
-021F;LATIN SMALL LETTER H WITH CARON;Ll;0;L;0068 030C;;;;N;;;021E;;021E
-0220;LATIN CAPITAL LETTER N WITH LONG RIGHT LEG;Lu;0;L;;;;;N;;;;019E;
-0221;LATIN SMALL LETTER D WITH CURL;Ll;0;L;;;;;N;;;;;
-0222;LATIN CAPITAL LETTER OU;Lu;0;L;;;;;N;;;;0223;
-0223;LATIN SMALL LETTER OU;Ll;0;L;;;;;N;;;0222;;0222
-0224;LATIN CAPITAL LETTER Z WITH HOOK;Lu;0;L;;;;;N;;;;0225;
-0225;LATIN SMALL LETTER Z WITH HOOK;Ll;0;L;;;;;N;;;0224;;0224
-0226;LATIN CAPITAL LETTER A WITH DOT ABOVE;Lu;0;L;0041 0307;;;;N;;;;0227;
-0227;LATIN SMALL LETTER A WITH DOT ABOVE;Ll;0;L;0061 0307;;;;N;;;0226;;0226
-0228;LATIN CAPITAL LETTER E WITH CEDILLA;Lu;0;L;0045 0327;;;;N;;;;0229;
-0229;LATIN SMALL LETTER E WITH CEDILLA;Ll;0;L;0065 0327;;;;N;;;0228;;0228
-022A;LATIN CAPITAL LETTER O WITH DIAERESIS AND MACRON;Lu;0;L;00D6 0304;;;;N;;;;022B;
-022B;LATIN SMALL LETTER O WITH DIAERESIS AND MACRON;Ll;0;L;00F6 0304;;;;N;;;022A;;022A
-022C;LATIN CAPITAL LETTER O WITH TILDE AND MACRON;Lu;0;L;00D5 0304;;;;N;;;;022D;
-022D;LATIN SMALL LETTER O WITH TILDE AND MACRON;Ll;0;L;00F5 0304;;;;N;;;022C;;022C
-022E;LATIN CAPITAL LETTER O WITH DOT ABOVE;Lu;0;L;004F 0307;;;;N;;;;022F;
-022F;LATIN SMALL LETTER O WITH DOT ABOVE;Ll;0;L;006F 0307;;;;N;;;022E;;022E
-0230;LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON;Lu;0;L;022E 0304;;;;N;;;;0231;
-0231;LATIN SMALL LETTER O WITH DOT ABOVE AND MACRON;Ll;0;L;022F 0304;;;;N;;;0230;;0230
-0232;LATIN CAPITAL LETTER Y WITH MACRON;Lu;0;L;0059 0304;;;;N;;;;0233;
-0233;LATIN SMALL LETTER Y WITH MACRON;Ll;0;L;0079 0304;;;;N;;;0232;;0232
-0234;LATIN SMALL LETTER L WITH CURL;Ll;0;L;;;;;N;;;;;
-0235;LATIN SMALL LETTER N WITH CURL;Ll;0;L;;;;;N;;;;;
-0236;LATIN SMALL LETTER T WITH CURL;Ll;0;L;;;;;N;;;;;
-0237;LATIN SMALL LETTER DOTLESS J;Ll;0;L;;;;;N;;;;;
-0238;LATIN SMALL LETTER DB DIGRAPH;Ll;0;L;;;;;N;;;;;
-0239;LATIN SMALL LETTER QP DIGRAPH;Ll;0;L;;;;;N;;;;;
-023A;LATIN CAPITAL LETTER A WITH STROKE;Lu;0;L;;;;;N;;;;2C65;
-023B;LATIN CAPITAL LETTER C WITH STROKE;Lu;0;L;;;;;N;;;;023C;
-023C;LATIN SMALL LETTER C WITH STROKE;Ll;0;L;;;;;N;;;023B;;023B
-023D;LATIN CAPITAL LETTER L WITH BAR;Lu;0;L;;;;;N;;;;019A;
-023E;LATIN CAPITAL LETTER T WITH DIAGONAL STROKE;Lu;0;L;;;;;N;;;;2C66;
-023F;LATIN SMALL LETTER S WITH SWASH TAIL;Ll;0;L;;;;;N;;;;;
-0240;LATIN SMALL LETTER Z WITH SWASH TAIL;Ll;0;L;;;;;N;;;;;
-0241;LATIN CAPITAL LETTER GLOTTAL STOP;Lu;0;L;;;;;N;;;;0242;
-0242;LATIN SMALL LETTER GLOTTAL STOP;Ll;0;L;;;;;N;;;0241;;0241
-0243;LATIN CAPITAL LETTER B WITH STROKE;Lu;0;L;;;;;N;;;;0180;
-0244;LATIN CAPITAL LETTER U BAR;Lu;0;L;;;;;N;;;;0289;
-0245;LATIN CAPITAL LETTER TURNED V;Lu;0;L;;;;;N;;;;028C;
-0246;LATIN CAPITAL LETTER E WITH STROKE;Lu;0;L;;;;;N;;;;0247;
-0247;LATIN SMALL LETTER E WITH STROKE;Ll;0;L;;;;;N;;;0246;;0246
-0248;LATIN CAPITAL LETTER J WITH STROKE;Lu;0;L;;;;;N;;;;0249;
-0249;LATIN SMALL LETTER J WITH STROKE;Ll;0;L;;;;;N;;;0248;;0248
-024A;LATIN CAPITAL LETTER SMALL Q WITH HOOK TAIL;Lu;0;L;;;;;N;;;;024B;
-024B;LATIN SMALL LETTER Q WITH HOOK TAIL;Ll;0;L;;;;;N;;;024A;;024A
-024C;LATIN CAPITAL LETTER R WITH STROKE;Lu;0;L;;;;;N;;;;024D;
-024D;LATIN SMALL LETTER R WITH STROKE;Ll;0;L;;;;;N;;;024C;;024C
-024E;LATIN CAPITAL LETTER Y WITH STROKE;Lu;0;L;;;;;N;;;;024F;
-024F;LATIN SMALL LETTER Y WITH STROKE;Ll;0;L;;;;;N;;;024E;;024E
-0250;LATIN SMALL LETTER TURNED A;Ll;0;L;;;;;N;;;2C6F;;2C6F
-0251;LATIN SMALL LETTER ALPHA;Ll;0;L;;;;;N;LATIN SMALL LETTER SCRIPT A;;2C6D;;2C6D
-0252;LATIN SMALL LETTER TURNED ALPHA;Ll;0;L;;;;;N;LATIN SMALL LETTER TURNED SCRIPT A;;;;
-0253;LATIN SMALL LETTER B WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER B HOOK;;0181;;0181
-0254;LATIN SMALL LETTER OPEN O;Ll;0;L;;;;;N;;;0186;;0186
-0255;LATIN SMALL LETTER C WITH CURL;Ll;0;L;;;;;N;LATIN SMALL LETTER C CURL;;;;
-0256;LATIN SMALL LETTER D WITH TAIL;Ll;0;L;;;;;N;LATIN SMALL LETTER D RETROFLEX HOOK;;0189;;0189
-0257;LATIN SMALL LETTER D WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER D HOOK;;018A;;018A
-0258;LATIN SMALL LETTER REVERSED E;Ll;0;L;;;;;N;;;;;
-0259;LATIN SMALL LETTER SCHWA;Ll;0;L;;;;;N;;;018F;;018F
-025A;LATIN SMALL LETTER SCHWA WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER SCHWA HOOK;;;;
-025B;LATIN SMALL LETTER OPEN E;Ll;0;L;;;;;N;LATIN SMALL LETTER EPSILON;;0190;;0190
-025C;LATIN SMALL LETTER REVERSED OPEN E;Ll;0;L;;;;;N;LATIN SMALL LETTER REVERSED EPSILON;;;;
-025D;LATIN SMALL LETTER REVERSED OPEN E WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER REVERSED EPSILON HOOK;;;;
-025E;LATIN SMALL LETTER CLOSED REVERSED OPEN E;Ll;0;L;;;;;N;LATIN SMALL LETTER CLOSED REVERSED EPSILON;;;;
-025F;LATIN SMALL LETTER DOTLESS J WITH STROKE;Ll;0;L;;;;;N;LATIN SMALL LETTER DOTLESS J BAR;;;;
-0260;LATIN SMALL LETTER G WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER G HOOK;;0193;;0193
-0261;LATIN SMALL LETTER SCRIPT G;Ll;0;L;;;;;N;;;;;
-0262;LATIN LETTER SMALL CAPITAL G;Ll;0;L;;;;;N;;;;;
-0263;LATIN SMALL LETTER GAMMA;Ll;0;L;;;;;N;;;0194;;0194
-0264;LATIN SMALL LETTER RAMS HORN;Ll;0;L;;;;;N;LATIN SMALL LETTER BABY GAMMA;;;;
-0265;LATIN SMALL LETTER TURNED H;Ll;0;L;;;;;N;;;;;
-0266;LATIN SMALL LETTER H WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER H HOOK;;;;
-0267;LATIN SMALL LETTER HENG WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER HENG HOOK;;;;
-0268;LATIN SMALL LETTER I WITH STROKE;Ll;0;L;;;;;N;LATIN SMALL LETTER BARRED I;;0197;;0197
-0269;LATIN SMALL LETTER IOTA;Ll;0;L;;;;;N;;;0196;;0196
-026A;LATIN LETTER SMALL CAPITAL I;Ll;0;L;;;;;N;;;;;
-026B;LATIN SMALL LETTER L WITH MIDDLE TILDE;Ll;0;L;;;;;N;;;2C62;;2C62
-026C;LATIN SMALL LETTER L WITH BELT;Ll;0;L;;;;;N;LATIN SMALL LETTER L BELT;;;;
-026D;LATIN SMALL LETTER L WITH RETROFLEX HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER L RETROFLEX HOOK;;;;
-026E;LATIN SMALL LETTER LEZH;Ll;0;L;;;;;N;LATIN SMALL LETTER L YOGH;;;;
-026F;LATIN SMALL LETTER TURNED M;Ll;0;L;;;;;N;;;019C;;019C
-0270;LATIN SMALL LETTER TURNED M WITH LONG LEG;Ll;0;L;;;;;N;;;;;
-0271;LATIN SMALL LETTER M WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER M HOOK;;2C6E;;2C6E
-0272;LATIN SMALL LETTER N WITH LEFT HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER N HOOK;;019D;;019D
-0273;LATIN SMALL LETTER N WITH RETROFLEX HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER N RETROFLEX HOOK;;;;
-0274;LATIN LETTER SMALL CAPITAL N;Ll;0;L;;;;;N;;;;;
-0275;LATIN SMALL LETTER BARRED O;Ll;0;L;;;;;N;;;019F;;019F
-0276;LATIN LETTER SMALL CAPITAL OE;Ll;0;L;;;;;N;LATIN LETTER SMALL CAPITAL O E;;;;
-0277;LATIN SMALL LETTER CLOSED OMEGA;Ll;0;L;;;;;N;;;;;
-0278;LATIN SMALL LETTER PHI;Ll;0;L;;;;;N;;;;;
-0279;LATIN SMALL LETTER TURNED R;Ll;0;L;;;;;N;;;;;
-027A;LATIN SMALL LETTER TURNED R WITH LONG LEG;Ll;0;L;;;;;N;;;;;
-027B;LATIN SMALL LETTER TURNED R WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER TURNED R HOOK;;;;
-027C;LATIN SMALL LETTER R WITH LONG LEG;Ll;0;L;;;;;N;;;;;
-027D;LATIN SMALL LETTER R WITH TAIL;Ll;0;L;;;;;N;LATIN SMALL LETTER R HOOK;;2C64;;2C64
-027E;LATIN SMALL LETTER R WITH FISHHOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER FISHHOOK R;;;;
-027F;LATIN SMALL LETTER REVERSED R WITH FISHHOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER REVERSED FISHHOOK R;;;;
-0280;LATIN LETTER SMALL CAPITAL R;Ll;0;L;;;;;N;;*;01A6;;01A6
-0281;LATIN LETTER SMALL CAPITAL INVERTED R;Ll;0;L;;;;;N;;;;;
-0282;LATIN SMALL LETTER S WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER S HOOK;;;;
-0283;LATIN SMALL LETTER ESH;Ll;0;L;;;;;N;;;01A9;;01A9
-0284;LATIN SMALL LETTER DOTLESS J WITH STROKE AND HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER DOTLESS J BAR HOOK;;;;
-0285;LATIN SMALL LETTER SQUAT REVERSED ESH;Ll;0;L;;;;;N;;;;;
-0286;LATIN SMALL LETTER ESH WITH CURL;Ll;0;L;;;;;N;LATIN SMALL LETTER ESH CURL;;;;
-0287;LATIN SMALL LETTER TURNED T;Ll;0;L;;;;;N;;;;;
-0288;LATIN SMALL LETTER T WITH RETROFLEX HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER T RETROFLEX HOOK;;01AE;;01AE
-0289;LATIN SMALL LETTER U BAR;Ll;0;L;;;;;N;;;0244;;0244
-028A;LATIN SMALL LETTER UPSILON;Ll;0;L;;;;;N;;;01B1;;01B1
-028B;LATIN SMALL LETTER V WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER SCRIPT V;;01B2;;01B2
-028C;LATIN SMALL LETTER TURNED V;Ll;0;L;;;;;N;;;0245;;0245
-028D;LATIN SMALL LETTER TURNED W;Ll;0;L;;;;;N;;;;;
-028E;LATIN SMALL LETTER TURNED Y;Ll;0;L;;;;;N;;;;;
-028F;LATIN LETTER SMALL CAPITAL Y;Ll;0;L;;;;;N;;;;;
-0290;LATIN SMALL LETTER Z WITH RETROFLEX HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER Z RETROFLEX HOOK;;;;
-0291;LATIN SMALL LETTER Z WITH CURL;Ll;0;L;;;;;N;LATIN SMALL LETTER Z CURL;;;;
-0292;LATIN SMALL LETTER EZH;Ll;0;L;;;;;N;LATIN SMALL LETTER YOGH;;01B7;;01B7
-0293;LATIN SMALL LETTER EZH WITH CURL;Ll;0;L;;;;;N;LATIN SMALL LETTER YOGH CURL;;;;
-0294;LATIN LETTER GLOTTAL STOP;Lo;0;L;;;;;N;;;;;
-0295;LATIN LETTER PHARYNGEAL VOICED FRICATIVE;Ll;0;L;;;;;N;LATIN LETTER REVERSED GLOTTAL STOP;;;;
-0296;LATIN LETTER INVERTED GLOTTAL STOP;Ll;0;L;;;;;N;;;;;
-0297;LATIN LETTER STRETCHED C;Ll;0;L;;;;;N;;;;;
-0298;LATIN LETTER BILABIAL CLICK;Ll;0;L;;;;;N;LATIN LETTER BULLSEYE;;;;
-0299;LATIN LETTER SMALL CAPITAL B;Ll;0;L;;;;;N;;;;;
-029A;LATIN SMALL LETTER CLOSED OPEN E;Ll;0;L;;;;;N;LATIN SMALL LETTER CLOSED EPSILON;;;;
-029B;LATIN LETTER SMALL CAPITAL G WITH HOOK;Ll;0;L;;;;;N;LATIN LETTER SMALL CAPITAL G HOOK;;;;
-029C;LATIN LETTER SMALL CAPITAL H;Ll;0;L;;;;;N;;;;;
-029D;LATIN SMALL LETTER J WITH CROSSED-TAIL;Ll;0;L;;;;;N;LATIN SMALL LETTER CROSSED-TAIL J;;;;
-029E;LATIN SMALL LETTER TURNED K;Ll;0;L;;;;;N;;;;;
-029F;LATIN LETTER SMALL CAPITAL L;Ll;0;L;;;;;N;;;;;
-02A0;LATIN SMALL LETTER Q WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER Q HOOK;;;;
-02A1;LATIN LETTER GLOTTAL STOP WITH STROKE;Ll;0;L;;;;;N;LATIN LETTER GLOTTAL STOP BAR;;;;
-02A2;LATIN LETTER REVERSED GLOTTAL STOP WITH STROKE;Ll;0;L;;;;;N;LATIN LETTER REVERSED GLOTTAL STOP BAR;;;;
-02A3;LATIN SMALL LETTER DZ DIGRAPH;Ll;0;L;;;;;N;LATIN SMALL LETTER D Z;;;;
-02A4;LATIN SMALL LETTER DEZH DIGRAPH;Ll;0;L;;;;;N;LATIN SMALL LETTER D YOGH;;;;
-02A5;LATIN SMALL LETTER DZ DIGRAPH WITH CURL;Ll;0;L;;;;;N;LATIN SMALL LETTER D Z CURL;;;;
-02A6;LATIN SMALL LETTER TS DIGRAPH;Ll;0;L;;;;;N;LATIN SMALL LETTER T S;;;;
-02A7;LATIN SMALL LETTER TESH DIGRAPH;Ll;0;L;;;;;N;LATIN SMALL LETTER T ESH;;;;
-02A8;LATIN SMALL LETTER TC DIGRAPH WITH CURL;Ll;0;L;;;;;N;LATIN SMALL LETTER T C CURL;;;;
-02A9;LATIN SMALL LETTER FENG DIGRAPH;Ll;0;L;;;;;N;;;;;
-02AA;LATIN SMALL LETTER LS DIGRAPH;Ll;0;L;;;;;N;;;;;
-02AB;LATIN SMALL LETTER LZ DIGRAPH;Ll;0;L;;;;;N;;;;;
-02AC;LATIN LETTER BILABIAL PERCUSSIVE;Ll;0;L;;;;;N;;;;;
-02AD;LATIN LETTER BIDENTAL PERCUSSIVE;Ll;0;L;;;;;N;;;;;
-02AE;LATIN SMALL LETTER TURNED H WITH FISHHOOK;Ll;0;L;;;;;N;;;;;
-02AF;LATIN SMALL LETTER TURNED H WITH FISHHOOK AND TAIL;Ll;0;L;;;;;N;;;;;
-02B0;MODIFIER LETTER SMALL H;Lm;0;L;<super> 0068;;;;N;;;;;
-02B1;MODIFIER LETTER SMALL H WITH HOOK;Lm;0;L;<super> 0266;;;;N;MODIFIER LETTER SMALL H HOOK;;;;
-02B2;MODIFIER LETTER SMALL J;Lm;0;L;<super> 006A;;;;N;;;;;
-02B3;MODIFIER LETTER SMALL R;Lm;0;L;<super> 0072;;;;N;;;;;
-02B4;MODIFIER LETTER SMALL TURNED R;Lm;0;L;<super> 0279;;;;N;;;;;
-02B5;MODIFIER LETTER SMALL TURNED R WITH HOOK;Lm;0;L;<super> 027B;;;;N;MODIFIER LETTER SMALL TURNED R HOOK;;;;
-02B6;MODIFIER LETTER SMALL CAPITAL INVERTED R;Lm;0;L;<super> 0281;;;;N;;;;;
-02B7;MODIFIER LETTER SMALL W;Lm;0;L;<super> 0077;;;;N;;;;;
-02B8;MODIFIER LETTER SMALL Y;Lm;0;L;<super> 0079;;;;N;;;;;
-02B9;MODIFIER LETTER PRIME;Lm;0;ON;;;;;N;;;;;
-02BA;MODIFIER LETTER DOUBLE PRIME;Lm;0;ON;;;;;N;;;;;
-02BB;MODIFIER LETTER TURNED COMMA;Lm;0;L;;;;;N;;;;;
-02BC;MODIFIER LETTER APOSTROPHE;Lm;0;L;;;;;N;;;;;
-02BD;MODIFIER LETTER REVERSED COMMA;Lm;0;L;;;;;N;;;;;
-02BE;MODIFIER LETTER RIGHT HALF RING;Lm;0;L;;;;;N;;;;;
-02BF;MODIFIER LETTER LEFT HALF RING;Lm;0;L;;;;;N;;;;;
-02C0;MODIFIER LETTER GLOTTAL STOP;Lm;0;L;;;;;N;;;;;
-02C1;MODIFIER LETTER REVERSED GLOTTAL STOP;Lm;0;L;;;;;N;;;;;
-02C2;MODIFIER LETTER LEFT ARROWHEAD;Sk;0;ON;;;;;N;;;;;
-02C3;MODIFIER LETTER RIGHT ARROWHEAD;Sk;0;ON;;;;;N;;;;;
-02C4;MODIFIER LETTER UP ARROWHEAD;Sk;0;ON;;;;;N;;;;;
-02C5;MODIFIER LETTER DOWN ARROWHEAD;Sk;0;ON;;;;;N;;;;;
-02C6;MODIFIER LETTER CIRCUMFLEX ACCENT;Lm;0;ON;;;;;N;MODIFIER LETTER CIRCUMFLEX;;;;
-02C7;CARON;Lm;0;ON;;;;;N;MODIFIER LETTER HACEK;Mandarin Chinese third tone;;;
-02C8;MODIFIER LETTER VERTICAL LINE;Lm;0;ON;;;;;N;;;;;
-02C9;MODIFIER LETTER MACRON;Lm;0;ON;;;;;N;;Mandarin Chinese first tone;;;
-02CA;MODIFIER LETTER ACUTE ACCENT;Lm;0;ON;;;;;N;MODIFIER LETTER ACUTE;Mandarin Chinese second tone;;;
-02CB;MODIFIER LETTER GRAVE ACCENT;Lm;0;ON;;;;;N;MODIFIER LETTER GRAVE;Mandarin Chinese fourth tone;;;
-02CC;MODIFIER LETTER LOW VERTICAL LINE;Lm;0;ON;;;;;N;;;;;
-02CD;MODIFIER LETTER LOW MACRON;Lm;0;ON;;;;;N;;;;;
-02CE;MODIFIER LETTER LOW GRAVE ACCENT;Lm;0;ON;;;;;N;MODIFIER LETTER LOW GRAVE;;;;
-02CF;MODIFIER LETTER LOW ACUTE ACCENT;Lm;0;ON;;;;;N;MODIFIER LETTER LOW ACUTE;;;;
-02D0;MODIFIER LETTER TRIANGULAR COLON;Lm;0;L;;;;;N;;;;;
-02D1;MODIFIER LETTER HALF TRIANGULAR COLON;Lm;0;L;;;;;N;;;;;
-02D2;MODIFIER LETTER CENTRED RIGHT HALF RING;Sk;0;ON;;;;;N;MODIFIER LETTER CENTERED RIGHT HALF RING;;;;
-02D3;MODIFIER LETTER CENTRED LEFT HALF RING;Sk;0;ON;;;;;N;MODIFIER LETTER CENTERED LEFT HALF RING;;;;
-02D4;MODIFIER LETTER UP TACK;Sk;0;ON;;;;;N;;;;;
-02D5;MODIFIER LETTER DOWN TACK;Sk;0;ON;;;;;N;;;;;
-02D6;MODIFIER LETTER PLUS SIGN;Sk;0;ON;;;;;N;;;;;
-02D7;MODIFIER LETTER MINUS SIGN;Sk;0;ON;;;;;N;;;;;
-02D8;BREVE;Sk;0;ON;<compat> 0020 0306;;;;N;SPACING BREVE;;;;
-02D9;DOT ABOVE;Sk;0;ON;<compat> 0020 0307;;;;N;SPACING DOT ABOVE;Mandarin Chinese light tone;;;
-02DA;RING ABOVE;Sk;0;ON;<compat> 0020 030A;;;;N;SPACING RING ABOVE;;;;
-02DB;OGONEK;Sk;0;ON;<compat> 0020 0328;;;;N;SPACING OGONEK;;;;
-02DC;SMALL TILDE;Sk;0;ON;<compat> 0020 0303;;;;N;SPACING TILDE;;;;
-02DD;DOUBLE ACUTE ACCENT;Sk;0;ON;<compat> 0020 030B;;;;N;SPACING DOUBLE ACUTE;;;;
-02DE;MODIFIER LETTER RHOTIC HOOK;Sk;0;ON;;;;;N;;;;;
-02DF;MODIFIER LETTER CROSS ACCENT;Sk;0;ON;;;;;N;;;;;
-02E0;MODIFIER LETTER SMALL GAMMA;Lm;0;L;<super> 0263;;;;N;;;;;
-02E1;MODIFIER LETTER SMALL L;Lm;0;L;<super> 006C;;;;N;;;;;
-02E2;MODIFIER LETTER SMALL S;Lm;0;L;<super> 0073;;;;N;;;;;
-02E3;MODIFIER LETTER SMALL X;Lm;0;L;<super> 0078;;;;N;;;;;
-02E4;MODIFIER LETTER SMALL REVERSED GLOTTAL STOP;Lm;0;L;<super> 0295;;;;N;;;;;
-02E5;MODIFIER LETTER EXTRA-HIGH TONE BAR;Sk;0;ON;;;;;N;;;;;
-02E6;MODIFIER LETTER HIGH TONE BAR;Sk;0;ON;;;;;N;;;;;
-02E7;MODIFIER LETTER MID TONE BAR;Sk;0;ON;;;;;N;;;;;
-02E8;MODIFIER LETTER LOW TONE BAR;Sk;0;ON;;;;;N;;;;;
-02E9;MODIFIER LETTER EXTRA-LOW TONE BAR;Sk;0;ON;;;;;N;;;;;
-02EA;MODIFIER LETTER YIN DEPARTING TONE MARK;Sk;0;ON;;;;;N;;;;;
-02EB;MODIFIER LETTER YANG DEPARTING TONE MARK;Sk;0;ON;;;;;N;;;;;
-02EC;MODIFIER LETTER VOICING;Lm;0;ON;;;;;N;;;;;
-02ED;MODIFIER LETTER UNASPIRATED;Sk;0;ON;;;;;N;;;;;
-02EE;MODIFIER LETTER DOUBLE APOSTROPHE;Lm;0;L;;;;;N;;;;;
-02EF;MODIFIER LETTER LOW DOWN ARROWHEAD;Sk;0;ON;;;;;N;;;;;
-02F0;MODIFIER LETTER LOW UP ARROWHEAD;Sk;0;ON;;;;;N;;;;;
-02F1;MODIFIER LETTER LOW LEFT ARROWHEAD;Sk;0;ON;;;;;N;;;;;
-02F2;MODIFIER LETTER LOW RIGHT ARROWHEAD;Sk;0;ON;;;;;N;;;;;
-02F3;MODIFIER LETTER LOW RING;Sk;0;ON;;;;;N;;;;;
-02F4;MODIFIER LETTER MIDDLE GRAVE ACCENT;Sk;0;ON;;;;;N;;;;;
-02F5;MODIFIER LETTER MIDDLE DOUBLE GRAVE ACCENT;Sk;0;ON;;;;;N;;;;;
-02F6;MODIFIER LETTER MIDDLE DOUBLE ACUTE ACCENT;Sk;0;ON;;;;;N;;;;;
-02F7;MODIFIER LETTER LOW TILDE;Sk;0;ON;;;;;N;;;;;
-02F8;MODIFIER LETTER RAISED COLON;Sk;0;ON;;;;;N;;;;;
-02F9;MODIFIER LETTER BEGIN HIGH TONE;Sk;0;ON;;;;;N;;;;;
-02FA;MODIFIER LETTER END HIGH TONE;Sk;0;ON;;;;;N;;;;;
-02FB;MODIFIER LETTER BEGIN LOW TONE;Sk;0;ON;;;;;N;;;;;
-02FC;MODIFIER LETTER END LOW TONE;Sk;0;ON;;;;;N;;;;;
-02FD;MODIFIER LETTER SHELF;Sk;0;ON;;;;;N;;;;;
-02FE;MODIFIER LETTER OPEN SHELF;Sk;0;ON;;;;;N;;;;;
-02FF;MODIFIER LETTER LOW LEFT ARROW;Sk;0;ON;;;;;N;;;;;
-0300;COMBINING GRAVE ACCENT;Mn;230;NSM;;;;;N;NON-SPACING GRAVE;Varia;;;
-0301;COMBINING ACUTE ACCENT;Mn;230;NSM;;;;;N;NON-SPACING ACUTE;Oxia, Tonos;;;
-0302;COMBINING CIRCUMFLEX ACCENT;Mn;230;NSM;;;;;N;NON-SPACING CIRCUMFLEX;;;;
-0303;COMBINING TILDE;Mn;230;NSM;;;;;N;NON-SPACING TILDE;;;;
-0304;COMBINING MACRON;Mn;230;NSM;;;;;N;NON-SPACING MACRON;;;;
-0305;COMBINING OVERLINE;Mn;230;NSM;;;;;N;NON-SPACING OVERSCORE;;;;
-0306;COMBINING BREVE;Mn;230;NSM;;;;;N;NON-SPACING BREVE;Vrachy;;;
-0307;COMBINING DOT ABOVE;Mn;230;NSM;;;;;N;NON-SPACING DOT ABOVE;;;;
-0308;COMBINING DIAERESIS;Mn;230;NSM;;;;;N;NON-SPACING DIAERESIS;Dialytika;;;
-0309;COMBINING HOOK ABOVE;Mn;230;NSM;;;;;N;NON-SPACING HOOK ABOVE;;;;
-030A;COMBINING RING ABOVE;Mn;230;NSM;;;;;N;NON-SPACING RING ABOVE;;;;
-030B;COMBINING DOUBLE ACUTE ACCENT;Mn;230;NSM;;;;;N;NON-SPACING DOUBLE ACUTE;;;;
-030C;COMBINING CARON;Mn;230;NSM;;;;;N;NON-SPACING HACEK;;;;
-030D;COMBINING VERTICAL LINE ABOVE;Mn;230;NSM;;;;;N;NON-SPACING VERTICAL LINE ABOVE;;;;
-030E;COMBINING DOUBLE VERTICAL LINE ABOVE;Mn;230;NSM;;;;;N;NON-SPACING DOUBLE VERTICAL LINE ABOVE;;;;
-030F;COMBINING DOUBLE GRAVE ACCENT;Mn;230;NSM;;;;;N;NON-SPACING DOUBLE GRAVE;;;;
-0310;COMBINING CANDRABINDU;Mn;230;NSM;;;;;N;NON-SPACING CANDRABINDU;;;;
-0311;COMBINING INVERTED BREVE;Mn;230;NSM;;;;;N;NON-SPACING INVERTED BREVE;;;;
-0312;COMBINING TURNED COMMA ABOVE;Mn;230;NSM;;;;;N;NON-SPACING TURNED COMMA ABOVE;;;;
-0313;COMBINING COMMA ABOVE;Mn;230;NSM;;;;;N;NON-SPACING COMMA ABOVE;Psili;;;
-0314;COMBINING REVERSED COMMA ABOVE;Mn;230;NSM;;;;;N;NON-SPACING REVERSED COMMA ABOVE;Dasia;;;
-0315;COMBINING COMMA ABOVE RIGHT;Mn;232;NSM;;;;;N;NON-SPACING COMMA ABOVE RIGHT;;;;
-0316;COMBINING GRAVE ACCENT BELOW;Mn;220;NSM;;;;;N;NON-SPACING GRAVE BELOW;;;;
-0317;COMBINING ACUTE ACCENT BELOW;Mn;220;NSM;;;;;N;NON-SPACING ACUTE BELOW;;;;
-0318;COMBINING LEFT TACK BELOW;Mn;220;NSM;;;;;N;NON-SPACING LEFT TACK BELOW;;;;
-0319;COMBINING RIGHT TACK BELOW;Mn;220;NSM;;;;;N;NON-SPACING RIGHT TACK BELOW;;;;
-031A;COMBINING LEFT ANGLE ABOVE;Mn;232;NSM;;;;;N;NON-SPACING LEFT ANGLE ABOVE;;;;
-031B;COMBINING HORN;Mn;216;NSM;;;;;N;NON-SPACING HORN;;;;
-031C;COMBINING LEFT HALF RING BELOW;Mn;220;NSM;;;;;N;NON-SPACING LEFT HALF RING BELOW;;;;
-031D;COMBINING UP TACK BELOW;Mn;220;NSM;;;;;N;NON-SPACING UP TACK BELOW;;;;
-031E;COMBINING DOWN TACK BELOW;Mn;220;NSM;;;;;N;NON-SPACING DOWN TACK BELOW;;;;
-031F;COMBINING PLUS SIGN BELOW;Mn;220;NSM;;;;;N;NON-SPACING PLUS SIGN BELOW;;;;
-0320;COMBINING MINUS SIGN BELOW;Mn;220;NSM;;;;;N;NON-SPACING MINUS SIGN BELOW;;;;
-0321;COMBINING PALATALIZED HOOK BELOW;Mn;202;NSM;;;;;N;NON-SPACING PALATALIZED HOOK BELOW;;;;
-0322;COMBINING RETROFLEX HOOK BELOW;Mn;202;NSM;;;;;N;NON-SPACING RETROFLEX HOOK BELOW;;;;
-0323;COMBINING DOT BELOW;Mn;220;NSM;;;;;N;NON-SPACING DOT BELOW;;;;
-0324;COMBINING DIAERESIS BELOW;Mn;220;NSM;;;;;N;NON-SPACING DOUBLE DOT BELOW;;;;
-0325;COMBINING RING BELOW;Mn;220;NSM;;;;;N;NON-SPACING RING BELOW;;;;
-0326;COMBINING COMMA BELOW;Mn;220;NSM;;;;;N;NON-SPACING COMMA BELOW;;;;
-0327;COMBINING CEDILLA;Mn;202;NSM;;;;;N;NON-SPACING CEDILLA;;;;
-0328;COMBINING OGONEK;Mn;202;NSM;;;;;N;NON-SPACING OGONEK;;;;
-0329;COMBINING VERTICAL LINE BELOW;Mn;220;NSM;;;;;N;NON-SPACING VERTICAL LINE BELOW;;;;
-032A;COMBINING BRIDGE BELOW;Mn;220;NSM;;;;;N;NON-SPACING BRIDGE BELOW;;;;
-032B;COMBINING INVERTED DOUBLE ARCH BELOW;Mn;220;NSM;;;;;N;NON-SPACING INVERTED DOUBLE ARCH BELOW;;;;
-032C;COMBINING CARON BELOW;Mn;220;NSM;;;;;N;NON-SPACING HACEK BELOW;;;;
-032D;COMBINING CIRCUMFLEX ACCENT BELOW;Mn;220;NSM;;;;;N;NON-SPACING CIRCUMFLEX BELOW;;;;
-032E;COMBINING BREVE BELOW;Mn;220;NSM;;;;;N;NON-SPACING BREVE BELOW;;;;
-032F;COMBINING INVERTED BREVE BELOW;Mn;220;NSM;;;;;N;NON-SPACING INVERTED BREVE BELOW;;;;
-0330;COMBINING TILDE BELOW;Mn;220;NSM;;;;;N;NON-SPACING TILDE BELOW;;;;
-0331;COMBINING MACRON BELOW;Mn;220;NSM;;;;;N;NON-SPACING MACRON BELOW;;;;
-0332;COMBINING LOW LINE;Mn;220;NSM;;;;;N;NON-SPACING UNDERSCORE;;;;
-0333;COMBINING DOUBLE LOW LINE;Mn;220;NSM;;;;;N;NON-SPACING DOUBLE UNDERSCORE;;;;
-0334;COMBINING TILDE OVERLAY;Mn;1;NSM;;;;;N;NON-SPACING TILDE OVERLAY;;;;
-0335;COMBINING SHORT STROKE OVERLAY;Mn;1;NSM;;;;;N;NON-SPACING SHORT BAR OVERLAY;;;;
-0336;COMBINING LONG STROKE OVERLAY;Mn;1;NSM;;;;;N;NON-SPACING LONG BAR OVERLAY;;;;
-0337;COMBINING SHORT SOLIDUS OVERLAY;Mn;1;NSM;;;;;N;NON-SPACING SHORT SLASH OVERLAY;;;;
-0338;COMBINING LONG SOLIDUS OVERLAY;Mn;1;NSM;;;;;N;NON-SPACING LONG SLASH OVERLAY;;;;
-0339;COMBINING RIGHT HALF RING BELOW;Mn;220;NSM;;;;;N;NON-SPACING RIGHT HALF RING BELOW;;;;
-033A;COMBINING INVERTED BRIDGE BELOW;Mn;220;NSM;;;;;N;NON-SPACING INVERTED BRIDGE BELOW;;;;
-033B;COMBINING SQUARE BELOW;Mn;220;NSM;;;;;N;NON-SPACING SQUARE BELOW;;;;
-033C;COMBINING SEAGULL BELOW;Mn;220;NSM;;;;;N;NON-SPACING SEAGULL BELOW;;;;
-033D;COMBINING X ABOVE;Mn;230;NSM;;;;;N;NON-SPACING X ABOVE;;;;
-033E;COMBINING VERTICAL TILDE;Mn;230;NSM;;;;;N;NON-SPACING VERTICAL TILDE;;;;
-033F;COMBINING DOUBLE OVERLINE;Mn;230;NSM;;;;;N;NON-SPACING DOUBLE OVERSCORE;;;;
-0340;COMBINING GRAVE TONE MARK;Mn;230;NSM;0300;;;;N;NON-SPACING GRAVE TONE MARK;Vietnamese;;;
-0341;COMBINING ACUTE TONE MARK;Mn;230;NSM;0301;;;;N;NON-SPACING ACUTE TONE MARK;Vietnamese;;;
-0342;COMBINING GREEK PERISPOMENI;Mn;230;NSM;;;;;N;;;;;
-0343;COMBINING GREEK KORONIS;Mn;230;NSM;0313;;;;N;;;;;
-0344;COMBINING GREEK DIALYTIKA TONOS;Mn;230;NSM;0308 0301;;;;N;GREEK NON-SPACING DIAERESIS TONOS;;;;
-0345;COMBINING GREEK YPOGEGRAMMENI;Mn;240;NSM;;;;;N;GREEK NON-SPACING IOTA BELOW;;0399;;0399
-0346;COMBINING BRIDGE ABOVE;Mn;230;NSM;;;;;N;;;;;
-0347;COMBINING EQUALS SIGN BELOW;Mn;220;NSM;;;;;N;;;;;
-0348;COMBINING DOUBLE VERTICAL LINE BELOW;Mn;220;NSM;;;;;N;;;;;
-0349;COMBINING LEFT ANGLE BELOW;Mn;220;NSM;;;;;N;;;;;
-034A;COMBINING NOT TILDE ABOVE;Mn;230;NSM;;;;;N;;;;;
-034B;COMBINING HOMOTHETIC ABOVE;Mn;230;NSM;;;;;N;;;;;
-034C;COMBINING ALMOST EQUAL TO ABOVE;Mn;230;NSM;;;;;N;;;;;
-034D;COMBINING LEFT RIGHT ARROW BELOW;Mn;220;NSM;;;;;N;;;;;
-034E;COMBINING UPWARDS ARROW BELOW;Mn;220;NSM;;;;;N;;;;;
-034F;COMBINING GRAPHEME JOINER;Mn;0;NSM;;;;;N;;;;;
-0350;COMBINING RIGHT ARROWHEAD ABOVE;Mn;230;NSM;;;;;N;;;;;
-0351;COMBINING LEFT HALF RING ABOVE;Mn;230;NSM;;;;;N;;;;;
-0352;COMBINING FERMATA;Mn;230;NSM;;;;;N;;;;;
-0353;COMBINING X BELOW;Mn;220;NSM;;;;;N;;;;;
-0354;COMBINING LEFT ARROWHEAD BELOW;Mn;220;NSM;;;;;N;;;;;
-0355;COMBINING RIGHT ARROWHEAD BELOW;Mn;220;NSM;;;;;N;;;;;
-0356;COMBINING RIGHT ARROWHEAD AND UP ARROWHEAD BELOW;Mn;220;NSM;;;;;N;;;;;
-0357;COMBINING RIGHT HALF RING ABOVE;Mn;230;NSM;;;;;N;;;;;
-0358;COMBINING DOT ABOVE RIGHT;Mn;232;NSM;;;;;N;;;;;
-0359;COMBINING ASTERISK BELOW;Mn;220;NSM;;;;;N;;;;;
-035A;COMBINING DOUBLE RING BELOW;Mn;220;NSM;;;;;N;;;;;
-035B;COMBINING ZIGZAG ABOVE;Mn;230;NSM;;;;;N;;;;;
-035C;COMBINING DOUBLE BREVE BELOW;Mn;233;NSM;;;;;N;;;;;
-035D;COMBINING DOUBLE BREVE;Mn;234;NSM;;;;;N;;;;;
-035E;COMBINING DOUBLE MACRON;Mn;234;NSM;;;;;N;;;;;
-035F;COMBINING DOUBLE MACRON BELOW;Mn;233;NSM;;;;;N;;;;;
-0360;COMBINING DOUBLE TILDE;Mn;234;NSM;;;;;N;;;;;
-0361;COMBINING DOUBLE INVERTED BREVE;Mn;234;NSM;;;;;N;;;;;
-0362;COMBINING DOUBLE RIGHTWARDS ARROW BELOW;Mn;233;NSM;;;;;N;;;;;
-0363;COMBINING LATIN SMALL LETTER A;Mn;230;NSM;;;;;N;;;;;
-0364;COMBINING LATIN SMALL LETTER E;Mn;230;NSM;;;;;N;;;;;
-0365;COMBINING LATIN SMALL LETTER I;Mn;230;NSM;;;;;N;;;;;
-0366;COMBINING LATIN SMALL LETTER O;Mn;230;NSM;;;;;N;;;;;
-0367;COMBINING LATIN SMALL LETTER U;Mn;230;NSM;;;;;N;;;;;
-0368;COMBINING LATIN SMALL LETTER C;Mn;230;NSM;;;;;N;;;;;
-0369;COMBINING LATIN SMALL LETTER D;Mn;230;NSM;;;;;N;;;;;
-036A;COMBINING LATIN SMALL LETTER H;Mn;230;NSM;;;;;N;;;;;
-036B;COMBINING LATIN SMALL LETTER M;Mn;230;NSM;;;;;N;;;;;
-036C;COMBINING LATIN SMALL LETTER R;Mn;230;NSM;;;;;N;;;;;
-036D;COMBINING LATIN SMALL LETTER T;Mn;230;NSM;;;;;N;;;;;
-036E;COMBINING LATIN SMALL LETTER V;Mn;230;NSM;;;;;N;;;;;
-036F;COMBINING LATIN SMALL LETTER X;Mn;230;NSM;;;;;N;;;;;
-0370;GREEK CAPITAL LETTER HETA;Lu;0;L;;;;;N;;;;0371;
-0371;GREEK SMALL LETTER HETA;Ll;0;L;;;;;N;;;0370;;0370
-0372;GREEK CAPITAL LETTER ARCHAIC SAMPI;Lu;0;L;;;;;N;;;;0373;
-0373;GREEK SMALL LETTER ARCHAIC SAMPI;Ll;0;L;;;;;N;;;0372;;0372
-0374;GREEK NUMERAL SIGN;Lm;0;ON;02B9;;;;N;GREEK UPPER NUMERAL SIGN;Dexia keraia;;;
-0375;GREEK LOWER NUMERAL SIGN;Sk;0;ON;;;;;N;;Aristeri keraia;;;
-0376;GREEK CAPITAL LETTER PAMPHYLIAN DIGAMMA;Lu;0;L;;;;;N;;;;0377;
-0377;GREEK SMALL LETTER PAMPHYLIAN DIGAMMA;Ll;0;L;;;;;N;;;0376;;0376
-037A;GREEK YPOGEGRAMMENI;Lm;0;L;<compat> 0020 0345;;;;N;GREEK SPACING IOTA BELOW;;;;
-037B;GREEK SMALL REVERSED LUNATE SIGMA SYMBOL;Ll;0;L;;;;;N;;;03FD;;03FD
-037C;GREEK SMALL DOTTED LUNATE SIGMA SYMBOL;Ll;0;L;;;;;N;;;03FE;;03FE
-037D;GREEK SMALL REVERSED DOTTED LUNATE SIGMA SYMBOL;Ll;0;L;;;;;N;;;03FF;;03FF
-037E;GREEK QUESTION MARK;Po;0;ON;003B;;;;N;;Erotimatiko;;;
-0384;GREEK TONOS;Sk;0;ON;<compat> 0020 0301;;;;N;GREEK SPACING TONOS;;;;
-0385;GREEK DIALYTIKA TONOS;Sk;0;ON;00A8 0301;;;;N;GREEK SPACING DIAERESIS TONOS;;;;
-0386;GREEK CAPITAL LETTER ALPHA WITH TONOS;Lu;0;L;0391 0301;;;;N;GREEK CAPITAL LETTER ALPHA TONOS;;;03AC;
-0387;GREEK ANO TELEIA;Po;0;ON;00B7;;;;N;;;;;
-0388;GREEK CAPITAL LETTER EPSILON WITH TONOS;Lu;0;L;0395 0301;;;;N;GREEK CAPITAL LETTER EPSILON TONOS;;;03AD;
-0389;GREEK CAPITAL LETTER ETA WITH TONOS;Lu;0;L;0397 0301;;;;N;GREEK CAPITAL LETTER ETA TONOS;;;03AE;
-038A;GREEK CAPITAL LETTER IOTA WITH TONOS;Lu;0;L;0399 0301;;;;N;GREEK CAPITAL LETTER IOTA TONOS;;;03AF;
-038C;GREEK CAPITAL LETTER OMICRON WITH TONOS;Lu;0;L;039F 0301;;;;N;GREEK CAPITAL LETTER OMICRON TONOS;;;03CC;
-038E;GREEK CAPITAL LETTER UPSILON WITH TONOS;Lu;0;L;03A5 0301;;;;N;GREEK CAPITAL LETTER UPSILON TONOS;;;03CD;
-038F;GREEK CAPITAL LETTER OMEGA WITH TONOS;Lu;0;L;03A9 0301;;;;N;GREEK CAPITAL LETTER OMEGA TONOS;;;03CE;
-0390;GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS;Ll;0;L;03CA 0301;;;;N;GREEK SMALL LETTER IOTA DIAERESIS TONOS;;;;
-0391;GREEK CAPITAL LETTER ALPHA;Lu;0;L;;;;;N;;;;03B1;
-0392;GREEK CAPITAL LETTER BETA;Lu;0;L;;;;;N;;;;03B2;
-0393;GREEK CAPITAL LETTER GAMMA;Lu;0;L;;;;;N;;;;03B3;
-0394;GREEK CAPITAL LETTER DELTA;Lu;0;L;;;;;N;;;;03B4;
-0395;GREEK CAPITAL LETTER EPSILON;Lu;0;L;;;;;N;;;;03B5;
-0396;GREEK CAPITAL LETTER ZETA;Lu;0;L;;;;;N;;;;03B6;
-0397;GREEK CAPITAL LETTER ETA;Lu;0;L;;;;;N;;;;03B7;
-0398;GREEK CAPITAL LETTER THETA;Lu;0;L;;;;;N;;;;03B8;
-0399;GREEK CAPITAL LETTER IOTA;Lu;0;L;;;;;N;;;;03B9;
-039A;GREEK CAPITAL LETTER KAPPA;Lu;0;L;;;;;N;;;;03BA;
-039B;GREEK CAPITAL LETTER LAMDA;Lu;0;L;;;;;N;GREEK CAPITAL LETTER LAMBDA;;;03BB;
-039C;GREEK CAPITAL LETTER MU;Lu;0;L;;;;;N;;;;03BC;
-039D;GREEK CAPITAL LETTER NU;Lu;0;L;;;;;N;;;;03BD;
-039E;GREEK CAPITAL LETTER XI;Lu;0;L;;;;;N;;;;03BE;
-039F;GREEK CAPITAL LETTER OMICRON;Lu;0;L;;;;;N;;;;03BF;
-03A0;GREEK CAPITAL LETTER PI;Lu;0;L;;;;;N;;;;03C0;
-03A1;GREEK CAPITAL LETTER RHO;Lu;0;L;;;;;N;;;;03C1;
-03A3;GREEK CAPITAL LETTER SIGMA;Lu;0;L;;;;;N;;;;03C3;
-03A4;GREEK CAPITAL LETTER TAU;Lu;0;L;;;;;N;;;;03C4;
-03A5;GREEK CAPITAL LETTER UPSILON;Lu;0;L;;;;;N;;;;03C5;
-03A6;GREEK CAPITAL LETTER PHI;Lu;0;L;;;;;N;;;;03C6;
-03A7;GREEK CAPITAL LETTER CHI;Lu;0;L;;;;;N;;;;03C7;
-03A8;GREEK CAPITAL LETTER PSI;Lu;0;L;;;;;N;;;;03C8;
-03A9;GREEK CAPITAL LETTER OMEGA;Lu;0;L;;;;;N;;;;03C9;
-03AA;GREEK CAPITAL LETTER IOTA WITH DIALYTIKA;Lu;0;L;0399 0308;;;;N;GREEK CAPITAL LETTER IOTA DIAERESIS;;;03CA;
-03AB;GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA;Lu;0;L;03A5 0308;;;;N;GREEK CAPITAL LETTER UPSILON DIAERESIS;;;03CB;
-03AC;GREEK SMALL LETTER ALPHA WITH TONOS;Ll;0;L;03B1 0301;;;;N;GREEK SMALL LETTER ALPHA TONOS;;0386;;0386
-03AD;GREEK SMALL LETTER EPSILON WITH TONOS;Ll;0;L;03B5 0301;;;;N;GREEK SMALL LETTER EPSILON TONOS;;0388;;0388
-03AE;GREEK SMALL LETTER ETA WITH TONOS;Ll;0;L;03B7 0301;;;;N;GREEK SMALL LETTER ETA TONOS;;0389;;0389
-03AF;GREEK SMALL LETTER IOTA WITH TONOS;Ll;0;L;03B9 0301;;;;N;GREEK SMALL LETTER IOTA TONOS;;038A;;038A
-03B0;GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS;Ll;0;L;03CB 0301;;;;N;GREEK SMALL LETTER UPSILON DIAERESIS TONOS;;;;
-03B1;GREEK SMALL LETTER ALPHA;Ll;0;L;;;;;N;;;0391;;0391
-03B2;GREEK SMALL LETTER BETA;Ll;0;L;;;;;N;;;0392;;0392
-03B3;GREEK SMALL LETTER GAMMA;Ll;0;L;;;;;N;;;0393;;0393
-03B4;GREEK SMALL LETTER DELTA;Ll;0;L;;;;;N;;;0394;;0394
-03B5;GREEK SMALL LETTER EPSILON;Ll;0;L;;;;;N;;;0395;;0395
-03B6;GREEK SMALL LETTER ZETA;Ll;0;L;;;;;N;;;0396;;0396
-03B7;GREEK SMALL LETTER ETA;Ll;0;L;;;;;N;;;0397;;0397
-03B8;GREEK SMALL LETTER THETA;Ll;0;L;;;;;N;;;0398;;0398
-03B9;GREEK SMALL LETTER IOTA;Ll;0;L;;;;;N;;;0399;;0399
-03BA;GREEK SMALL LETTER KAPPA;Ll;0;L;;;;;N;;;039A;;039A
-03BB;GREEK SMALL LETTER LAMDA;Ll;0;L;;;;;N;GREEK SMALL LETTER LAMBDA;;039B;;039B
-03BC;GREEK SMALL LETTER MU;Ll;0;L;;;;;N;;;039C;;039C
-03BD;GREEK SMALL LETTER NU;Ll;0;L;;;;;N;;;039D;;039D
-03BE;GREEK SMALL LETTER XI;Ll;0;L;;;;;N;;;039E;;039E
-03BF;GREEK SMALL LETTER OMICRON;Ll;0;L;;;;;N;;;039F;;039F
-03C0;GREEK SMALL LETTER PI;Ll;0;L;;;;;N;;;03A0;;03A0
-03C1;GREEK SMALL LETTER RHO;Ll;0;L;;;;;N;;;03A1;;03A1
-03C2;GREEK SMALL LETTER FINAL SIGMA;Ll;0;L;;;;;N;;;03A3;;03A3
-03C3;GREEK SMALL LETTER SIGMA;Ll;0;L;;;;;N;;;03A3;;03A3
-03C4;GREEK SMALL LETTER TAU;Ll;0;L;;;;;N;;;03A4;;03A4
-03C5;GREEK SMALL LETTER UPSILON;Ll;0;L;;;;;N;;;03A5;;03A5
-03C6;GREEK SMALL LETTER PHI;Ll;0;L;;;;;N;;;03A6;;03A6
-03C7;GREEK SMALL LETTER CHI;Ll;0;L;;;;;N;;;03A7;;03A7
-03C8;GREEK SMALL LETTER PSI;Ll;0;L;;;;;N;;;03A8;;03A8
-03C9;GREEK SMALL LETTER OMEGA;Ll;0;L;;;;;N;;;03A9;;03A9
-03CA;GREEK SMALL LETTER IOTA WITH DIALYTIKA;Ll;0;L;03B9 0308;;;;N;GREEK SMALL LETTER IOTA DIAERESIS;;03AA;;03AA
-03CB;GREEK SMALL LETTER UPSILON WITH DIALYTIKA;Ll;0;L;03C5 0308;;;;N;GREEK SMALL LETTER UPSILON DIAERESIS;;03AB;;03AB
-03CC;GREEK SMALL LETTER OMICRON WITH TONOS;Ll;0;L;03BF 0301;;;;N;GREEK SMALL LETTER OMICRON TONOS;;038C;;038C
-03CD;GREEK SMALL LETTER UPSILON WITH TONOS;Ll;0;L;03C5 0301;;;;N;GREEK SMALL LETTER UPSILON TONOS;;038E;;038E
-03CE;GREEK SMALL LETTER OMEGA WITH TONOS;Ll;0;L;03C9 0301;;;;N;GREEK SMALL LETTER OMEGA TONOS;;038F;;038F
-03CF;GREEK CAPITAL KAI SYMBOL;Lu;0;L;;;;;N;;;;03D7;
-03D0;GREEK BETA SYMBOL;Ll;0;L;<compat> 03B2;;;;N;GREEK SMALL LETTER CURLED BETA;;0392;;0392
-03D1;GREEK THETA SYMBOL;Ll;0;L;<compat> 03B8;;;;N;GREEK SMALL LETTER SCRIPT THETA;;0398;;0398
-03D2;GREEK UPSILON WITH HOOK SYMBOL;Lu;0;L;<compat> 03A5;;;;N;GREEK CAPITAL LETTER UPSILON HOOK;;;;
-03D3;GREEK UPSILON WITH ACUTE AND HOOK SYMBOL;Lu;0;L;03D2 0301;;;;N;GREEK CAPITAL LETTER UPSILON HOOK TONOS;;;;
-03D4;GREEK UPSILON WITH DIAERESIS AND HOOK SYMBOL;Lu;0;L;03D2 0308;;;;N;GREEK CAPITAL LETTER UPSILON HOOK DIAERESIS;;;;
-03D5;GREEK PHI SYMBOL;Ll;0;L;<compat> 03C6;;;;N;GREEK SMALL LETTER SCRIPT PHI;;03A6;;03A6
-03D6;GREEK PI SYMBOL;Ll;0;L;<compat> 03C0;;;;N;GREEK SMALL LETTER OMEGA PI;;03A0;;03A0
-03D7;GREEK KAI SYMBOL;Ll;0;L;;;;;N;;;03CF;;03CF
-03D8;GREEK LETTER ARCHAIC KOPPA;Lu;0;L;;;;;N;;*;;03D9;
-03D9;GREEK SMALL LETTER ARCHAIC KOPPA;Ll;0;L;;;;;N;;*;03D8;;03D8
-03DA;GREEK LETTER STIGMA;Lu;0;L;;;;;N;GREEK CAPITAL LETTER STIGMA;;;03DB;
-03DB;GREEK SMALL LETTER STIGMA;Ll;0;L;;;;;N;;;03DA;;03DA
-03DC;GREEK LETTER DIGAMMA;Lu;0;L;;;;;N;GREEK CAPITAL LETTER DIGAMMA;;;03DD;
-03DD;GREEK SMALL LETTER DIGAMMA;Ll;0;L;;;;;N;;;03DC;;03DC
-03DE;GREEK LETTER KOPPA;Lu;0;L;;;;;N;GREEK CAPITAL LETTER KOPPA;;;03DF;
-03DF;GREEK SMALL LETTER KOPPA;Ll;0;L;;;;;N;;;03DE;;03DE
-03E0;GREEK LETTER SAMPI;Lu;0;L;;;;;N;GREEK CAPITAL LETTER SAMPI;;;03E1;
-03E1;GREEK SMALL LETTER SAMPI;Ll;0;L;;;;;N;;;03E0;;03E0
-03E2;COPTIC CAPITAL LETTER SHEI;Lu;0;L;;;;;N;GREEK CAPITAL LETTER SHEI;;;03E3;
-03E3;COPTIC SMALL LETTER SHEI;Ll;0;L;;;;;N;GREEK SMALL LETTER SHEI;;03E2;;03E2
-03E4;COPTIC CAPITAL LETTER FEI;Lu;0;L;;;;;N;GREEK CAPITAL LETTER FEI;;;03E5;
-03E5;COPTIC SMALL LETTER FEI;Ll;0;L;;;;;N;GREEK SMALL LETTER FEI;;03E4;;03E4
-03E6;COPTIC CAPITAL LETTER KHEI;Lu;0;L;;;;;N;GREEK CAPITAL LETTER KHEI;;;03E7;
-03E7;COPTIC SMALL LETTER KHEI;Ll;0;L;;;;;N;GREEK SMALL LETTER KHEI;;03E6;;03E6
-03E8;COPTIC CAPITAL LETTER HORI;Lu;0;L;;;;;N;GREEK CAPITAL LETTER HORI;;;03E9;
-03E9;COPTIC SMALL LETTER HORI;Ll;0;L;;;;;N;GREEK SMALL LETTER HORI;;03E8;;03E8
-03EA;COPTIC CAPITAL LETTER GANGIA;Lu;0;L;;;;;N;GREEK CAPITAL LETTER GANGIA;;;03EB;
-03EB;COPTIC SMALL LETTER GANGIA;Ll;0;L;;;;;N;GREEK SMALL LETTER GANGIA;;03EA;;03EA
-03EC;COPTIC CAPITAL LETTER SHIMA;Lu;0;L;;;;;N;GREEK CAPITAL LETTER SHIMA;;;03ED;
-03ED;COPTIC SMALL LETTER SHIMA;Ll;0;L;;;;;N;GREEK SMALL LETTER SHIMA;;03EC;;03EC
-03EE;COPTIC CAPITAL LETTER DEI;Lu;0;L;;;;;N;GREEK CAPITAL LETTER DEI;;;03EF;
-03EF;COPTIC SMALL LETTER DEI;Ll;0;L;;;;;N;GREEK SMALL LETTER DEI;;03EE;;03EE
-03F0;GREEK KAPPA SYMBOL;Ll;0;L;<compat> 03BA;;;;N;GREEK SMALL LETTER SCRIPT KAPPA;;039A;;039A
-03F1;GREEK RHO SYMBOL;Ll;0;L;<compat> 03C1;;;;N;GREEK SMALL LETTER TAILED RHO;;03A1;;03A1
-03F2;GREEK LUNATE SIGMA SYMBOL;Ll;0;L;<compat> 03C2;;;;N;GREEK SMALL LETTER LUNATE SIGMA;;03F9;;03F9
-03F3;GREEK LETTER YOT;Ll;0;L;;;;;N;;;;;
-03F4;GREEK CAPITAL THETA SYMBOL;Lu;0;L;<compat> 0398;;;;N;;;;03B8;
-03F5;GREEK LUNATE EPSILON SYMBOL;Ll;0;L;<compat> 03B5;;;;N;;;0395;;0395
-03F6;GREEK REVERSED LUNATE EPSILON SYMBOL;Sm;0;ON;;;;;N;;;;;
-03F7;GREEK CAPITAL LETTER SHO;Lu;0;L;;;;;N;;;;03F8;
-03F8;GREEK SMALL LETTER SHO;Ll;0;L;;;;;N;;;03F7;;03F7
-03F9;GREEK CAPITAL LUNATE SIGMA SYMBOL;Lu;0;L;<compat> 03A3;;;;N;;;;03F2;
-03FA;GREEK CAPITAL LETTER SAN;Lu;0;L;;;;;N;;;;03FB;
-03FB;GREEK SMALL LETTER SAN;Ll;0;L;;;;;N;;;03FA;;03FA
-03FC;GREEK RHO WITH STROKE SYMBOL;Ll;0;L;;;;;N;;;;;
-03FD;GREEK CAPITAL REVERSED LUNATE SIGMA SYMBOL;Lu;0;L;;;;;N;;;;037B;
-03FE;GREEK CAPITAL DOTTED LUNATE SIGMA SYMBOL;Lu;0;L;;;;;N;;;;037C;
-03FF;GREEK CAPITAL REVERSED DOTTED LUNATE SIGMA SYMBOL;Lu;0;L;;;;;N;;;;037D;
-0400;CYRILLIC CAPITAL LETTER IE WITH GRAVE;Lu;0;L;0415 0300;;;;N;;;;0450;
-0401;CYRILLIC CAPITAL LETTER IO;Lu;0;L;0415 0308;;;;N;;;;0451;
-0402;CYRILLIC CAPITAL LETTER DJE;Lu;0;L;;;;;N;;Serbocroatian;;0452;
-0403;CYRILLIC CAPITAL LETTER GJE;Lu;0;L;0413 0301;;;;N;;;;0453;
-0404;CYRILLIC CAPITAL LETTER UKRAINIAN IE;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER E;;;0454;
-0405;CYRILLIC CAPITAL LETTER DZE;Lu;0;L;;;;;N;;;;0455;
-0406;CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER I;;;0456;
-0407;CYRILLIC CAPITAL LETTER YI;Lu;0;L;0406 0308;;;;N;;Ukrainian;;0457;
-0408;CYRILLIC CAPITAL LETTER JE;Lu;0;L;;;;;N;;;;0458;
-0409;CYRILLIC CAPITAL LETTER LJE;Lu;0;L;;;;;N;;;;0459;
-040A;CYRILLIC CAPITAL LETTER NJE;Lu;0;L;;;;;N;;;;045A;
-040B;CYRILLIC CAPITAL LETTER TSHE;Lu;0;L;;;;;N;;Serbocroatian;;045B;
-040C;CYRILLIC CAPITAL LETTER KJE;Lu;0;L;041A 0301;;;;N;;;;045C;
-040D;CYRILLIC CAPITAL LETTER I WITH GRAVE;Lu;0;L;0418 0300;;;;N;;;;045D;
-040E;CYRILLIC CAPITAL LETTER SHORT U;Lu;0;L;0423 0306;;;;N;;Byelorussian;;045E;
-040F;CYRILLIC CAPITAL LETTER DZHE;Lu;0;L;;;;;N;;;;045F;
-0410;CYRILLIC CAPITAL LETTER A;Lu;0;L;;;;;N;;;;0430;
-0411;CYRILLIC CAPITAL LETTER BE;Lu;0;L;;;;;N;;;;0431;
-0412;CYRILLIC CAPITAL LETTER VE;Lu;0;L;;;;;N;;;;0432;
-0413;CYRILLIC CAPITAL LETTER GHE;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER GE;;;0433;
-0414;CYRILLIC CAPITAL LETTER DE;Lu;0;L;;;;;N;;;;0434;
-0415;CYRILLIC CAPITAL LETTER IE;Lu;0;L;;;;;N;;;;0435;
-0416;CYRILLIC CAPITAL LETTER ZHE;Lu;0;L;;;;;N;;;;0436;
-0417;CYRILLIC CAPITAL LETTER ZE;Lu;0;L;;;;;N;;;;0437;
-0418;CYRILLIC CAPITAL LETTER I;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER II;;;0438;
-0419;CYRILLIC CAPITAL LETTER SHORT I;Lu;0;L;0418 0306;;;;N;CYRILLIC CAPITAL LETTER SHORT II;;;0439;
-041A;CYRILLIC CAPITAL LETTER KA;Lu;0;L;;;;;N;;;;043A;
-041B;CYRILLIC CAPITAL LETTER EL;Lu;0;L;;;;;N;;;;043B;
-041C;CYRILLIC CAPITAL LETTER EM;Lu;0;L;;;;;N;;;;043C;
-041D;CYRILLIC CAPITAL LETTER EN;Lu;0;L;;;;;N;;;;043D;
-041E;CYRILLIC CAPITAL LETTER O;Lu;0;L;;;;;N;;;;043E;
-041F;CYRILLIC CAPITAL LETTER PE;Lu;0;L;;;;;N;;;;043F;
-0420;CYRILLIC CAPITAL LETTER ER;Lu;0;L;;;;;N;;;;0440;
-0421;CYRILLIC CAPITAL LETTER ES;Lu;0;L;;;;;N;;;;0441;
-0422;CYRILLIC CAPITAL LETTER TE;Lu;0;L;;;;;N;;;;0442;
-0423;CYRILLIC CAPITAL LETTER U;Lu;0;L;;;;;N;;;;0443;
-0424;CYRILLIC CAPITAL LETTER EF;Lu;0;L;;;;;N;;;;0444;
-0425;CYRILLIC CAPITAL LETTER HA;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER KHA;;;0445;
-0426;CYRILLIC CAPITAL LETTER TSE;Lu;0;L;;;;;N;;;;0446;
-0427;CYRILLIC CAPITAL LETTER CHE;Lu;0;L;;;;;N;;;;0447;
-0428;CYRILLIC CAPITAL LETTER SHA;Lu;0;L;;;;;N;;;;0448;
-0429;CYRILLIC CAPITAL LETTER SHCHA;Lu;0;L;;;;;N;;;;0449;
-042A;CYRILLIC CAPITAL LETTER HARD SIGN;Lu;0;L;;;;;N;;;;044A;
-042B;CYRILLIC CAPITAL LETTER YERU;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER YERI;;;044B;
-042C;CYRILLIC CAPITAL LETTER SOFT SIGN;Lu;0;L;;;;;N;;;;044C;
-042D;CYRILLIC CAPITAL LETTER E;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER REVERSED E;;;044D;
-042E;CYRILLIC CAPITAL LETTER YU;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER IU;;;044E;
-042F;CYRILLIC CAPITAL LETTER YA;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER IA;;;044F;
-0430;CYRILLIC SMALL LETTER A;Ll;0;L;;;;;N;;;0410;;0410
-0431;CYRILLIC SMALL LETTER BE;Ll;0;L;;;;;N;;;0411;;0411
-0432;CYRILLIC SMALL LETTER VE;Ll;0;L;;;;;N;;;0412;;0412
-0433;CYRILLIC SMALL LETTER GHE;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER GE;;0413;;0413
-0434;CYRILLIC SMALL LETTER DE;Ll;0;L;;;;;N;;;0414;;0414
-0435;CYRILLIC SMALL LETTER IE;Ll;0;L;;;;;N;;;0415;;0415
-0436;CYRILLIC SMALL LETTER ZHE;Ll;0;L;;;;;N;;;0416;;0416
-0437;CYRILLIC SMALL LETTER ZE;Ll;0;L;;;;;N;;;0417;;0417
-0438;CYRILLIC SMALL LETTER I;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER II;;0418;;0418
-0439;CYRILLIC SMALL LETTER SHORT I;Ll;0;L;0438 0306;;;;N;CYRILLIC SMALL LETTER SHORT II;;0419;;0419
-043A;CYRILLIC SMALL LETTER KA;Ll;0;L;;;;;N;;;041A;;041A
-043B;CYRILLIC SMALL LETTER EL;Ll;0;L;;;;;N;;;041B;;041B
-043C;CYRILLIC SMALL LETTER EM;Ll;0;L;;;;;N;;;041C;;041C
-043D;CYRILLIC SMALL LETTER EN;Ll;0;L;;;;;N;;;041D;;041D
-043E;CYRILLIC SMALL LETTER O;Ll;0;L;;;;;N;;;041E;;041E
-043F;CYRILLIC SMALL LETTER PE;Ll;0;L;;;;;N;;;041F;;041F
-0440;CYRILLIC SMALL LETTER ER;Ll;0;L;;;;;N;;;0420;;0420
-0441;CYRILLIC SMALL LETTER ES;Ll;0;L;;;;;N;;;0421;;0421
-0442;CYRILLIC SMALL LETTER TE;Ll;0;L;;;;;N;;;0422;;0422
-0443;CYRILLIC SMALL LETTER U;Ll;0;L;;;;;N;;;0423;;0423
-0444;CYRILLIC SMALL LETTER EF;Ll;0;L;;;;;N;;;0424;;0424
-0445;CYRILLIC SMALL LETTER HA;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER KHA;;0425;;0425
-0446;CYRILLIC SMALL LETTER TSE;Ll;0;L;;;;;N;;;0426;;0426
-0447;CYRILLIC SMALL LETTER CHE;Ll;0;L;;;;;N;;;0427;;0427
-0448;CYRILLIC SMALL LETTER SHA;Ll;0;L;;;;;N;;;0428;;0428
-0449;CYRILLIC SMALL LETTER SHCHA;Ll;0;L;;;;;N;;;0429;;0429
-044A;CYRILLIC SMALL LETTER HARD SIGN;Ll;0;L;;;;;N;;;042A;;042A
-044B;CYRILLIC SMALL LETTER YERU;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER YERI;;042B;;042B
-044C;CYRILLIC SMALL LETTER SOFT SIGN;Ll;0;L;;;;;N;;;042C;;042C
-044D;CYRILLIC SMALL LETTER E;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER REVERSED E;;042D;;042D
-044E;CYRILLIC SMALL LETTER YU;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER IU;;042E;;042E
-044F;CYRILLIC SMALL LETTER YA;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER IA;;042F;;042F
-0450;CYRILLIC SMALL LETTER IE WITH GRAVE;Ll;0;L;0435 0300;;;;N;;;0400;;0400
-0451;CYRILLIC SMALL LETTER IO;Ll;0;L;0435 0308;;;;N;;;0401;;0401
-0452;CYRILLIC SMALL LETTER DJE;Ll;0;L;;;;;N;;Serbocroatian;0402;;0402
-0453;CYRILLIC SMALL LETTER GJE;Ll;0;L;0433 0301;;;;N;;;0403;;0403
-0454;CYRILLIC SMALL LETTER UKRAINIAN IE;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER E;;0404;;0404
-0455;CYRILLIC SMALL LETTER DZE;Ll;0;L;;;;;N;;;0405;;0405
-0456;CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER I;;0406;;0406
-0457;CYRILLIC SMALL LETTER YI;Ll;0;L;0456 0308;;;;N;;Ukrainian;0407;;0407
-0458;CYRILLIC SMALL LETTER JE;Ll;0;L;;;;;N;;;0408;;0408
-0459;CYRILLIC SMALL LETTER LJE;Ll;0;L;;;;;N;;;0409;;0409
-045A;CYRILLIC SMALL LETTER NJE;Ll;0;L;;;;;N;;;040A;;040A
-045B;CYRILLIC SMALL LETTER TSHE;Ll;0;L;;;;;N;;Serbocroatian;040B;;040B
-045C;CYRILLIC SMALL LETTER KJE;Ll;0;L;043A 0301;;;;N;;;040C;;040C
-045D;CYRILLIC SMALL LETTER I WITH GRAVE;Ll;0;L;0438 0300;;;;N;;;040D;;040D
-045E;CYRILLIC SMALL LETTER SHORT U;Ll;0;L;0443 0306;;;;N;;Byelorussian;040E;;040E
-045F;CYRILLIC SMALL LETTER DZHE;Ll;0;L;;;;;N;;;040F;;040F
-0460;CYRILLIC CAPITAL LETTER OMEGA;Lu;0;L;;;;;N;;;;0461;
-0461;CYRILLIC SMALL LETTER OMEGA;Ll;0;L;;;;;N;;;0460;;0460
-0462;CYRILLIC CAPITAL LETTER YAT;Lu;0;L;;;;;N;;;;0463;
-0463;CYRILLIC SMALL LETTER YAT;Ll;0;L;;;;;N;;;0462;;0462
-0464;CYRILLIC CAPITAL LETTER IOTIFIED E;Lu;0;L;;;;;N;;;;0465;
-0465;CYRILLIC SMALL LETTER IOTIFIED E;Ll;0;L;;;;;N;;;0464;;0464
-0466;CYRILLIC CAPITAL LETTER LITTLE YUS;Lu;0;L;;;;;N;;;;0467;
-0467;CYRILLIC SMALL LETTER LITTLE YUS;Ll;0;L;;;;;N;;;0466;;0466
-0468;CYRILLIC CAPITAL LETTER IOTIFIED LITTLE YUS;Lu;0;L;;;;;N;;;;0469;
-0469;CYRILLIC SMALL LETTER IOTIFIED LITTLE YUS;Ll;0;L;;;;;N;;;0468;;0468
-046A;CYRILLIC CAPITAL LETTER BIG YUS;Lu;0;L;;;;;N;;;;046B;
-046B;CYRILLIC SMALL LETTER BIG YUS;Ll;0;L;;;;;N;;;046A;;046A
-046C;CYRILLIC CAPITAL LETTER IOTIFIED BIG YUS;Lu;0;L;;;;;N;;;;046D;
-046D;CYRILLIC SMALL LETTER IOTIFIED BIG YUS;Ll;0;L;;;;;N;;;046C;;046C
-046E;CYRILLIC CAPITAL LETTER KSI;Lu;0;L;;;;;N;;;;046F;
-046F;CYRILLIC SMALL LETTER KSI;Ll;0;L;;;;;N;;;046E;;046E
-0470;CYRILLIC CAPITAL LETTER PSI;Lu;0;L;;;;;N;;;;0471;
-0471;CYRILLIC SMALL LETTER PSI;Ll;0;L;;;;;N;;;0470;;0470
-0472;CYRILLIC CAPITAL LETTER FITA;Lu;0;L;;;;;N;;;;0473;
-0473;CYRILLIC SMALL LETTER FITA;Ll;0;L;;;;;N;;;0472;;0472
-0474;CYRILLIC CAPITAL LETTER IZHITSA;Lu;0;L;;;;;N;;;;0475;
-0475;CYRILLIC SMALL LETTER IZHITSA;Ll;0;L;;;;;N;;;0474;;0474
-0476;CYRILLIC CAPITAL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT;Lu;0;L;0474 030F;;;;N;CYRILLIC CAPITAL LETTER IZHITSA DOUBLE GRAVE;;;0477;
-0477;CYRILLIC SMALL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT;Ll;0;L;0475 030F;;;;N;CYRILLIC SMALL LETTER IZHITSA DOUBLE GRAVE;;0476;;0476
-0478;CYRILLIC CAPITAL LETTER UK;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER UK DIGRAPH;;;0479;
-0479;CYRILLIC SMALL LETTER UK;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER UK DIGRAPH;;0478;;0478
-047A;CYRILLIC CAPITAL LETTER ROUND OMEGA;Lu;0;L;;;;;N;;;;047B;
-047B;CYRILLIC SMALL LETTER ROUND OMEGA;Ll;0;L;;;;;N;;;047A;;047A
-047C;CYRILLIC CAPITAL LETTER OMEGA WITH TITLO;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER OMEGA TITLO;;;047D;
-047D;CYRILLIC SMALL LETTER OMEGA WITH TITLO;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER OMEGA TITLO;;047C;;047C
-047E;CYRILLIC CAPITAL LETTER OT;Lu;0;L;;;;;N;;;;047F;
-047F;CYRILLIC SMALL LETTER OT;Ll;0;L;;;;;N;;;047E;;047E
-0480;CYRILLIC CAPITAL LETTER KOPPA;Lu;0;L;;;;;N;;;;0481;
-0481;CYRILLIC SMALL LETTER KOPPA;Ll;0;L;;;;;N;;;0480;;0480
-0482;CYRILLIC THOUSANDS SIGN;So;0;L;;;;;N;;;;;
-0483;COMBINING CYRILLIC TITLO;Mn;230;NSM;;;;;N;CYRILLIC NON-SPACING TITLO;;;;
-0484;COMBINING CYRILLIC PALATALIZATION;Mn;230;NSM;;;;;N;CYRILLIC NON-SPACING PALATALIZATION;;;;
-0485;COMBINING CYRILLIC DASIA PNEUMATA;Mn;230;NSM;;;;;N;CYRILLIC NON-SPACING DASIA PNEUMATA;;;;
-0486;COMBINING CYRILLIC PSILI PNEUMATA;Mn;230;NSM;;;;;N;CYRILLIC NON-SPACING PSILI PNEUMATA;;;;
-0487;COMBINING CYRILLIC POKRYTIE;Mn;230;NSM;;;;;N;;;;;
-0488;COMBINING CYRILLIC HUNDRED THOUSANDS SIGN;Me;0;NSM;;;;;N;;;;;
-0489;COMBINING CYRILLIC MILLIONS SIGN;Me;0;NSM;;;;;N;;;;;
-048A;CYRILLIC CAPITAL LETTER SHORT I WITH TAIL;Lu;0;L;;;;;N;;;;048B;
-048B;CYRILLIC SMALL LETTER SHORT I WITH TAIL;Ll;0;L;;;;;N;;;048A;;048A
-048C;CYRILLIC CAPITAL LETTER SEMISOFT SIGN;Lu;0;L;;;;;N;;;;048D;
-048D;CYRILLIC SMALL LETTER SEMISOFT SIGN;Ll;0;L;;;;;N;;;048C;;048C
-048E;CYRILLIC CAPITAL LETTER ER WITH TICK;Lu;0;L;;;;;N;;;;048F;
-048F;CYRILLIC SMALL LETTER ER WITH TICK;Ll;0;L;;;;;N;;;048E;;048E
-0490;CYRILLIC CAPITAL LETTER GHE WITH UPTURN;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER GE WITH UPTURN;;;0491;
-0491;CYRILLIC SMALL LETTER GHE WITH UPTURN;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER GE WITH UPTURN;;0490;;0490
-0492;CYRILLIC CAPITAL LETTER GHE WITH STROKE;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER GE BAR;;;0493;
-0493;CYRILLIC SMALL LETTER GHE WITH STROKE;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER GE BAR;;0492;;0492
-0494;CYRILLIC CAPITAL LETTER GHE WITH MIDDLE HOOK;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER GE HOOK;;;0495;
-0495;CYRILLIC SMALL LETTER GHE WITH MIDDLE HOOK;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER GE HOOK;;0494;;0494
-0496;CYRILLIC CAPITAL LETTER ZHE WITH DESCENDER;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER ZHE WITH RIGHT DESCENDER;;;0497;
-0497;CYRILLIC SMALL LETTER ZHE WITH DESCENDER;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER ZHE WITH RIGHT DESCENDER;;0496;;0496
-0498;CYRILLIC CAPITAL LETTER ZE WITH DESCENDER;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER ZE CEDILLA;;;0499;
-0499;CYRILLIC SMALL LETTER ZE WITH DESCENDER;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER ZE CEDILLA;;0498;;0498
-049A;CYRILLIC CAPITAL LETTER KA WITH DESCENDER;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER KA WITH RIGHT DESCENDER;;;049B;
-049B;CYRILLIC SMALL LETTER KA WITH DESCENDER;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER KA WITH RIGHT DESCENDER;;049A;;049A
-049C;CYRILLIC CAPITAL LETTER KA WITH VERTICAL STROKE;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER KA VERTICAL BAR;;;049D;
-049D;CYRILLIC SMALL LETTER KA WITH VERTICAL STROKE;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER KA VERTICAL BAR;;049C;;049C
-049E;CYRILLIC CAPITAL LETTER KA WITH STROKE;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER KA BAR;;;049F;
-049F;CYRILLIC SMALL LETTER KA WITH STROKE;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER KA BAR;;049E;;049E
-04A0;CYRILLIC CAPITAL LETTER BASHKIR KA;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER REVERSED GE KA;;;04A1;
-04A1;CYRILLIC SMALL LETTER BASHKIR KA;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER REVERSED GE KA;;04A0;;04A0
-04A2;CYRILLIC CAPITAL LETTER EN WITH DESCENDER;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER EN WITH RIGHT DESCENDER;;;04A3;
-04A3;CYRILLIC SMALL LETTER EN WITH DESCENDER;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER EN WITH RIGHT DESCENDER;;04A2;;04A2
-04A4;CYRILLIC CAPITAL LIGATURE EN GHE;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER EN GE;;;04A5;
-04A5;CYRILLIC SMALL LIGATURE EN GHE;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER EN GE;;04A4;;04A4
-04A6;CYRILLIC CAPITAL LETTER PE WITH MIDDLE HOOK;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER PE HOOK;Abkhasian;;04A7;
-04A7;CYRILLIC SMALL LETTER PE WITH MIDDLE HOOK;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER PE HOOK;Abkhasian;04A6;;04A6
-04A8;CYRILLIC CAPITAL LETTER ABKHASIAN HA;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER O HOOK;;;04A9;
-04A9;CYRILLIC SMALL LETTER ABKHASIAN HA;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER O HOOK;;04A8;;04A8
-04AA;CYRILLIC CAPITAL LETTER ES WITH DESCENDER;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER ES CEDILLA;;;04AB;
-04AB;CYRILLIC SMALL LETTER ES WITH DESCENDER;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER ES CEDILLA;;04AA;;04AA
-04AC;CYRILLIC CAPITAL LETTER TE WITH DESCENDER;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER TE WITH RIGHT DESCENDER;;;04AD;
-04AD;CYRILLIC SMALL LETTER TE WITH DESCENDER;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER TE WITH RIGHT DESCENDER;;04AC;;04AC
-04AE;CYRILLIC CAPITAL LETTER STRAIGHT U;Lu;0;L;;;;;N;;;;04AF;
-04AF;CYRILLIC SMALL LETTER STRAIGHT U;Ll;0;L;;;;;N;;;04AE;;04AE
-04B0;CYRILLIC CAPITAL LETTER STRAIGHT U WITH STROKE;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER STRAIGHT U BAR;;;04B1;
-04B1;CYRILLIC SMALL LETTER STRAIGHT U WITH STROKE;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER STRAIGHT U BAR;;04B0;;04B0
-04B2;CYRILLIC CAPITAL LETTER HA WITH DESCENDER;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER KHA WITH RIGHT DESCENDER;;;04B3;
-04B3;CYRILLIC SMALL LETTER HA WITH DESCENDER;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER KHA WITH RIGHT DESCENDER;;04B2;;04B2
-04B4;CYRILLIC CAPITAL LIGATURE TE TSE;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER TE TSE;Abkhasian;;04B5;
-04B5;CYRILLIC SMALL LIGATURE TE TSE;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER TE TSE;Abkhasian;04B4;;04B4
-04B6;CYRILLIC CAPITAL LETTER CHE WITH DESCENDER;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER CHE WITH RIGHT DESCENDER;;;04B7;
-04B7;CYRILLIC SMALL LETTER CHE WITH DESCENDER;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER CHE WITH RIGHT DESCENDER;;04B6;;04B6
-04B8;CYRILLIC CAPITAL LETTER CHE WITH VERTICAL STROKE;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER CHE VERTICAL BAR;;;04B9;
-04B9;CYRILLIC SMALL LETTER CHE WITH VERTICAL STROKE;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER CHE VERTICAL BAR;;04B8;;04B8
-04BA;CYRILLIC CAPITAL LETTER SHHA;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER H;;;04BB;
-04BB;CYRILLIC SMALL LETTER SHHA;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER H;;04BA;;04BA
-04BC;CYRILLIC CAPITAL LETTER ABKHASIAN CHE;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER IE HOOK;;;04BD;
-04BD;CYRILLIC SMALL LETTER ABKHASIAN CHE;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER IE HOOK;;04BC;;04BC
-04BE;CYRILLIC CAPITAL LETTER ABKHASIAN CHE WITH DESCENDER;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER IE HOOK OGONEK;;;04BF;
-04BF;CYRILLIC SMALL LETTER ABKHASIAN CHE WITH DESCENDER;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER IE HOOK OGONEK;;04BE;;04BE
-04C0;CYRILLIC LETTER PALOCHKA;Lu;0;L;;;;;N;CYRILLIC LETTER I;;;04CF;
-04C1;CYRILLIC CAPITAL LETTER ZHE WITH BREVE;Lu;0;L;0416 0306;;;;N;CYRILLIC CAPITAL LETTER SHORT ZHE;;;04C2;
-04C2;CYRILLIC SMALL LETTER ZHE WITH BREVE;Ll;0;L;0436 0306;;;;N;CYRILLIC SMALL LETTER SHORT ZHE;;04C1;;04C1
-04C3;CYRILLIC CAPITAL LETTER KA WITH HOOK;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER KA HOOK;;;04C4;
-04C4;CYRILLIC SMALL LETTER KA WITH HOOK;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER KA HOOK;;04C3;;04C3
-04C5;CYRILLIC CAPITAL LETTER EL WITH TAIL;Lu;0;L;;;;;N;;;;04C6;
-04C6;CYRILLIC SMALL LETTER EL WITH TAIL;Ll;0;L;;;;;N;;;04C5;;04C5
-04C7;CYRILLIC CAPITAL LETTER EN WITH HOOK;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER EN HOOK;;;04C8;
-04C8;CYRILLIC SMALL LETTER EN WITH HOOK;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER EN HOOK;;04C7;;04C7
-04C9;CYRILLIC CAPITAL LETTER EN WITH TAIL;Lu;0;L;;;;;N;;;;04CA;
-04CA;CYRILLIC SMALL LETTER EN WITH TAIL;Ll;0;L;;;;;N;;;04C9;;04C9
-04CB;CYRILLIC CAPITAL LETTER KHAKASSIAN CHE;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER CHE WITH LEFT DESCENDER;;;04CC;
-04CC;CYRILLIC SMALL LETTER KHAKASSIAN CHE;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER CHE WITH LEFT DESCENDER;;04CB;;04CB
-04CD;CYRILLIC CAPITAL LETTER EM WITH TAIL;Lu;0;L;;;;;N;;;;04CE;
-04CE;CYRILLIC SMALL LETTER EM WITH TAIL;Ll;0;L;;;;;N;;;04CD;;04CD
-04CF;CYRILLIC SMALL LETTER PALOCHKA;Ll;0;L;;;;;N;;;04C0;;04C0
-04D0;CYRILLIC CAPITAL LETTER A WITH BREVE;Lu;0;L;0410 0306;;;;N;;;;04D1;
-04D1;CYRILLIC SMALL LETTER A WITH BREVE;Ll;0;L;0430 0306;;;;N;;;04D0;;04D0
-04D2;CYRILLIC CAPITAL LETTER A WITH DIAERESIS;Lu;0;L;0410 0308;;;;N;;;;04D3;
-04D3;CYRILLIC SMALL LETTER A WITH DIAERESIS;Ll;0;L;0430 0308;;;;N;;;04D2;;04D2
-04D4;CYRILLIC CAPITAL LIGATURE A IE;Lu;0;L;;;;;N;;;;04D5;
-04D5;CYRILLIC SMALL LIGATURE A IE;Ll;0;L;;;;;N;;;04D4;;04D4
-04D6;CYRILLIC CAPITAL LETTER IE WITH BREVE;Lu;0;L;0415 0306;;;;N;;;;04D7;
-04D7;CYRILLIC SMALL LETTER IE WITH BREVE;Ll;0;L;0435 0306;;;;N;;;04D6;;04D6
-04D8;CYRILLIC CAPITAL LETTER SCHWA;Lu;0;L;;;;;N;;;;04D9;
-04D9;CYRILLIC SMALL LETTER SCHWA;Ll;0;L;;;;;N;;;04D8;;04D8
-04DA;CYRILLIC CAPITAL LETTER SCHWA WITH DIAERESIS;Lu;0;L;04D8 0308;;;;N;;;;04DB;
-04DB;CYRILLIC SMALL LETTER SCHWA WITH DIAERESIS;Ll;0;L;04D9 0308;;;;N;;;04DA;;04DA
-04DC;CYRILLIC CAPITAL LETTER ZHE WITH DIAERESIS;Lu;0;L;0416 0308;;;;N;;;;04DD;
-04DD;CYRILLIC SMALL LETTER ZHE WITH DIAERESIS;Ll;0;L;0436 0308;;;;N;;;04DC;;04DC
-04DE;CYRILLIC CAPITAL LETTER ZE WITH DIAERESIS;Lu;0;L;0417 0308;;;;N;;;;04DF;
-04DF;CYRILLIC SMALL LETTER ZE WITH DIAERESIS;Ll;0;L;0437 0308;;;;N;;;04DE;;04DE
-04E0;CYRILLIC CAPITAL LETTER ABKHASIAN DZE;Lu;0;L;;;;;N;;;;04E1;
-04E1;CYRILLIC SMALL LETTER ABKHASIAN DZE;Ll;0;L;;;;;N;;;04E0;;04E0
-04E2;CYRILLIC CAPITAL LETTER I WITH MACRON;Lu;0;L;0418 0304;;;;N;;;;04E3;
-04E3;CYRILLIC SMALL LETTER I WITH MACRON;Ll;0;L;0438 0304;;;;N;;;04E2;;04E2
-04E4;CYRILLIC CAPITAL LETTER I WITH DIAERESIS;Lu;0;L;0418 0308;;;;N;;;;04E5;
-04E5;CYRILLIC SMALL LETTER I WITH DIAERESIS;Ll;0;L;0438 0308;;;;N;;;04E4;;04E4
-04E6;CYRILLIC CAPITAL LETTER O WITH DIAERESIS;Lu;0;L;041E 0308;;;;N;;;;04E7;
-04E7;CYRILLIC SMALL LETTER O WITH DIAERESIS;Ll;0;L;043E 0308;;;;N;;;04E6;;04E6
-04E8;CYRILLIC CAPITAL LETTER BARRED O;Lu;0;L;;;;;N;;;;04E9;
-04E9;CYRILLIC SMALL LETTER BARRED O;Ll;0;L;;;;;N;;;04E8;;04E8
-04EA;CYRILLIC CAPITAL LETTER BARRED O WITH DIAERESIS;Lu;0;L;04E8 0308;;;;N;;;;04EB;
-04EB;CYRILLIC SMALL LETTER BARRED O WITH DIAERESIS;Ll;0;L;04E9 0308;;;;N;;;04EA;;04EA
-04EC;CYRILLIC CAPITAL LETTER E WITH DIAERESIS;Lu;0;L;042D 0308;;;;N;;;;04ED;
-04ED;CYRILLIC SMALL LETTER E WITH DIAERESIS;Ll;0;L;044D 0308;;;;N;;;04EC;;04EC
-04EE;CYRILLIC CAPITAL LETTER U WITH MACRON;Lu;0;L;0423 0304;;;;N;;;;04EF;
-04EF;CYRILLIC SMALL LETTER U WITH MACRON;Ll;0;L;0443 0304;;;;N;;;04EE;;04EE
-04F0;CYRILLIC CAPITAL LETTER U WITH DIAERESIS;Lu;0;L;0423 0308;;;;N;;;;04F1;
-04F1;CYRILLIC SMALL LETTER U WITH DIAERESIS;Ll;0;L;0443 0308;;;;N;;;04F0;;04F0
-04F2;CYRILLIC CAPITAL LETTER U WITH DOUBLE ACUTE;Lu;0;L;0423 030B;;;;N;;;;04F3;
-04F3;CYRILLIC SMALL LETTER U WITH DOUBLE ACUTE;Ll;0;L;0443 030B;;;;N;;;04F2;;04F2
-04F4;CYRILLIC CAPITAL LETTER CHE WITH DIAERESIS;Lu;0;L;0427 0308;;;;N;;;;04F5;
-04F5;CYRILLIC SMALL LETTER CHE WITH DIAERESIS;Ll;0;L;0447 0308;;;;N;;;04F4;;04F4
-04F6;CYRILLIC CAPITAL LETTER GHE WITH DESCENDER;Lu;0;L;;;;;N;;;;04F7;
-04F7;CYRILLIC SMALL LETTER GHE WITH DESCENDER;Ll;0;L;;;;;N;;;04F6;;04F6
-04F8;CYRILLIC CAPITAL LETTER YERU WITH DIAERESIS;Lu;0;L;042B 0308;;;;N;;;;04F9;
-04F9;CYRILLIC SMALL LETTER YERU WITH DIAERESIS;Ll;0;L;044B 0308;;;;N;;;04F8;;04F8
-04FA;CYRILLIC CAPITAL LETTER GHE WITH STROKE AND HOOK;Lu;0;L;;;;;N;;;;04FB;
-04FB;CYRILLIC SMALL LETTER GHE WITH STROKE AND HOOK;Ll;0;L;;;;;N;;;04FA;;04FA
-04FC;CYRILLIC CAPITAL LETTER HA WITH HOOK;Lu;0;L;;;;;N;;;;04FD;
-04FD;CYRILLIC SMALL LETTER HA WITH HOOK;Ll;0;L;;;;;N;;;04FC;;04FC
-04FE;CYRILLIC CAPITAL LETTER HA WITH STROKE;Lu;0;L;;;;;N;;;;04FF;
-04FF;CYRILLIC SMALL LETTER HA WITH STROKE;Ll;0;L;;;;;N;;;04FE;;04FE
-0500;CYRILLIC CAPITAL LETTER KOMI DE;Lu;0;L;;;;;N;;;;0501;
-0501;CYRILLIC SMALL LETTER KOMI DE;Ll;0;L;;;;;N;;;0500;;0500
-0502;CYRILLIC CAPITAL LETTER KOMI DJE;Lu;0;L;;;;;N;;;;0503;
-0503;CYRILLIC SMALL LETTER KOMI DJE;Ll;0;L;;;;;N;;;0502;;0502
-0504;CYRILLIC CAPITAL LETTER KOMI ZJE;Lu;0;L;;;;;N;;;;0505;
-0505;CYRILLIC SMALL LETTER KOMI ZJE;Ll;0;L;;;;;N;;;0504;;0504
-0506;CYRILLIC CAPITAL LETTER KOMI DZJE;Lu;0;L;;;;;N;;;;0507;
-0507;CYRILLIC SMALL LETTER KOMI DZJE;Ll;0;L;;;;;N;;;0506;;0506
-0508;CYRILLIC CAPITAL LETTER KOMI LJE;Lu;0;L;;;;;N;;;;0509;
-0509;CYRILLIC SMALL LETTER KOMI LJE;Ll;0;L;;;;;N;;;0508;;0508
-050A;CYRILLIC CAPITAL LETTER KOMI NJE;Lu;0;L;;;;;N;;;;050B;
-050B;CYRILLIC SMALL LETTER KOMI NJE;Ll;0;L;;;;;N;;;050A;;050A
-050C;CYRILLIC CAPITAL LETTER KOMI SJE;Lu;0;L;;;;;N;;;;050D;
-050D;CYRILLIC SMALL LETTER KOMI SJE;Ll;0;L;;;;;N;;;050C;;050C
-050E;CYRILLIC CAPITAL LETTER KOMI TJE;Lu;0;L;;;;;N;;;;050F;
-050F;CYRILLIC SMALL LETTER KOMI TJE;Ll;0;L;;;;;N;;;050E;;050E
-0510;CYRILLIC CAPITAL LETTER REVERSED ZE;Lu;0;L;;;;;N;;;;0511;
-0511;CYRILLIC SMALL LETTER REVERSED ZE;Ll;0;L;;;;;N;;;0510;;0510
-0512;CYRILLIC CAPITAL LETTER EL WITH HOOK;Lu;0;L;;;;;N;;;;0513;
-0513;CYRILLIC SMALL LETTER EL WITH HOOK;Ll;0;L;;;;;N;;;0512;;0512
-0514;CYRILLIC CAPITAL LETTER LHA;Lu;0;L;;;;;N;;;;0515;
-0515;CYRILLIC SMALL LETTER LHA;Ll;0;L;;;;;N;;;0514;;0514
-0516;CYRILLIC CAPITAL LETTER RHA;Lu;0;L;;;;;N;;;;0517;
-0517;CYRILLIC SMALL LETTER RHA;Ll;0;L;;;;;N;;;0516;;0516
-0518;CYRILLIC CAPITAL LETTER YAE;Lu;0;L;;;;;N;;;;0519;
-0519;CYRILLIC SMALL LETTER YAE;Ll;0;L;;;;;N;;;0518;;0518
-051A;CYRILLIC CAPITAL LETTER QA;Lu;0;L;;;;;N;;;;051B;
-051B;CYRILLIC SMALL LETTER QA;Ll;0;L;;;;;N;;;051A;;051A
-051C;CYRILLIC CAPITAL LETTER WE;Lu;0;L;;;;;N;;;;051D;
-051D;CYRILLIC SMALL LETTER WE;Ll;0;L;;;;;N;;;051C;;051C
-051E;CYRILLIC CAPITAL LETTER ALEUT KA;Lu;0;L;;;;;N;;;;051F;
-051F;CYRILLIC SMALL LETTER ALEUT KA;Ll;0;L;;;;;N;;;051E;;051E
-0520;CYRILLIC CAPITAL LETTER EL WITH MIDDLE HOOK;Lu;0;L;;;;;N;;;;0521;
-0521;CYRILLIC SMALL LETTER EL WITH MIDDLE HOOK;Ll;0;L;;;;;N;;;0520;;0520
-0522;CYRILLIC CAPITAL LETTER EN WITH MIDDLE HOOK;Lu;0;L;;;;;N;;;;0523;
-0523;CYRILLIC SMALL LETTER EN WITH MIDDLE HOOK;Ll;0;L;;;;;N;;;0522;;0522
-0531;ARMENIAN CAPITAL LETTER AYB;Lu;0;L;;;;;N;;;;0561;
-0532;ARMENIAN CAPITAL LETTER BEN;Lu;0;L;;;;;N;;;;0562;
-0533;ARMENIAN CAPITAL LETTER GIM;Lu;0;L;;;;;N;;;;0563;
-0534;ARMENIAN CAPITAL LETTER DA;Lu;0;L;;;;;N;;;;0564;
-0535;ARMENIAN CAPITAL LETTER ECH;Lu;0;L;;;;;N;;;;0565;
-0536;ARMENIAN CAPITAL LETTER ZA;Lu;0;L;;;;;N;;;;0566;
-0537;ARMENIAN CAPITAL LETTER EH;Lu;0;L;;;;;N;;;;0567;
-0538;ARMENIAN CAPITAL LETTER ET;Lu;0;L;;;;;N;;;;0568;
-0539;ARMENIAN CAPITAL LETTER TO;Lu;0;L;;;;;N;;;;0569;
-053A;ARMENIAN CAPITAL LETTER ZHE;Lu;0;L;;;;;N;;;;056A;
-053B;ARMENIAN CAPITAL LETTER INI;Lu;0;L;;;;;N;;;;056B;
-053C;ARMENIAN CAPITAL LETTER LIWN;Lu;0;L;;;;;N;;;;056C;
-053D;ARMENIAN CAPITAL LETTER XEH;Lu;0;L;;;;;N;;;;056D;
-053E;ARMENIAN CAPITAL LETTER CA;Lu;0;L;;;;;N;;;;056E;
-053F;ARMENIAN CAPITAL LETTER KEN;Lu;0;L;;;;;N;;;;056F;
-0540;ARMENIAN CAPITAL LETTER HO;Lu;0;L;;;;;N;;;;0570;
-0541;ARMENIAN CAPITAL LETTER JA;Lu;0;L;;;;;N;;;;0571;
-0542;ARMENIAN CAPITAL LETTER GHAD;Lu;0;L;;;;;N;ARMENIAN CAPITAL LETTER LAD;;;0572;
-0543;ARMENIAN CAPITAL LETTER CHEH;Lu;0;L;;;;;N;;;;0573;
-0544;ARMENIAN CAPITAL LETTER MEN;Lu;0;L;;;;;N;;;;0574;
-0545;ARMENIAN CAPITAL LETTER YI;Lu;0;L;;;;;N;;;;0575;
-0546;ARMENIAN CAPITAL LETTER NOW;Lu;0;L;;;;;N;;;;0576;
-0547;ARMENIAN CAPITAL LETTER SHA;Lu;0;L;;;;;N;;;;0577;
-0548;ARMENIAN CAPITAL LETTER VO;Lu;0;L;;;;;N;;;;0578;
-0549;ARMENIAN CAPITAL LETTER CHA;Lu;0;L;;;;;N;;;;0579;
-054A;ARMENIAN CAPITAL LETTER PEH;Lu;0;L;;;;;N;;;;057A;
-054B;ARMENIAN CAPITAL LETTER JHEH;Lu;0;L;;;;;N;;;;057B;
-054C;ARMENIAN CAPITAL LETTER RA;Lu;0;L;;;;;N;;;;057C;
-054D;ARMENIAN CAPITAL LETTER SEH;Lu;0;L;;;;;N;;;;057D;
-054E;ARMENIAN CAPITAL LETTER VEW;Lu;0;L;;;;;N;;;;057E;
-054F;ARMENIAN CAPITAL LETTER TIWN;Lu;0;L;;;;;N;;;;057F;
-0550;ARMENIAN CAPITAL LETTER REH;Lu;0;L;;;;;N;;;;0580;
-0551;ARMENIAN CAPITAL LETTER CO;Lu;0;L;;;;;N;;;;0581;
-0552;ARMENIAN CAPITAL LETTER YIWN;Lu;0;L;;;;;N;;;;0582;
-0553;ARMENIAN CAPITAL LETTER PIWR;Lu;0;L;;;;;N;;;;0583;
-0554;ARMENIAN CAPITAL LETTER KEH;Lu;0;L;;;;;N;;;;0584;
-0555;ARMENIAN CAPITAL LETTER OH;Lu;0;L;;;;;N;;;;0585;
-0556;ARMENIAN CAPITAL LETTER FEH;Lu;0;L;;;;;N;;;;0586;
-0559;ARMENIAN MODIFIER LETTER LEFT HALF RING;Lm;0;L;;;;;N;;;;;
-055A;ARMENIAN APOSTROPHE;Po;0;L;;;;;N;ARMENIAN MODIFIER LETTER RIGHT HALF RING;;;;
-055B;ARMENIAN EMPHASIS MARK;Po;0;L;;;;;N;;;;;
-055C;ARMENIAN EXCLAMATION MARK;Po;0;L;;;;;N;;;;;
-055D;ARMENIAN COMMA;Po;0;L;;;;;N;;;;;
-055E;ARMENIAN QUESTION MARK;Po;0;L;;;;;N;;;;;
-055F;ARMENIAN ABBREVIATION MARK;Po;0;L;;;;;N;;;;;
-0561;ARMENIAN SMALL LETTER AYB;Ll;0;L;;;;;N;;;0531;;0531
-0562;ARMENIAN SMALL LETTER BEN;Ll;0;L;;;;;N;;;0532;;0532
-0563;ARMENIAN SMALL LETTER GIM;Ll;0;L;;;;;N;;;0533;;0533
-0564;ARMENIAN SMALL LETTER DA;Ll;0;L;;;;;N;;;0534;;0534
-0565;ARMENIAN SMALL LETTER ECH;Ll;0;L;;;;;N;;;0535;;0535
-0566;ARMENIAN SMALL LETTER ZA;Ll;0;L;;;;;N;;;0536;;0536
-0567;ARMENIAN SMALL LETTER EH;Ll;0;L;;;;;N;;;0537;;0537
-0568;ARMENIAN SMALL LETTER ET;Ll;0;L;;;;;N;;;0538;;0538
-0569;ARMENIAN SMALL LETTER TO;Ll;0;L;;;;;N;;;0539;;0539
-056A;ARMENIAN SMALL LETTER ZHE;Ll;0;L;;;;;N;;;053A;;053A
-056B;ARMENIAN SMALL LETTER INI;Ll;0;L;;;;;N;;;053B;;053B
-056C;ARMENIAN SMALL LETTER LIWN;Ll;0;L;;;;;N;;;053C;;053C
-056D;ARMENIAN SMALL LETTER XEH;Ll;0;L;;;;;N;;;053D;;053D
-056E;ARMENIAN SMALL LETTER CA;Ll;0;L;;;;;N;;;053E;;053E
-056F;ARMENIAN SMALL LETTER KEN;Ll;0;L;;;;;N;;;053F;;053F
-0570;ARMENIAN SMALL LETTER HO;Ll;0;L;;;;;N;;;0540;;0540
-0571;ARMENIAN SMALL LETTER JA;Ll;0;L;;;;;N;;;0541;;0541
-0572;ARMENIAN SMALL LETTER GHAD;Ll;0;L;;;;;N;ARMENIAN SMALL LETTER LAD;;0542;;0542
-0573;ARMENIAN SMALL LETTER CHEH;Ll;0;L;;;;;N;;;0543;;0543
-0574;ARMENIAN SMALL LETTER MEN;Ll;0;L;;;;;N;;;0544;;0544
-0575;ARMENIAN SMALL LETTER YI;Ll;0;L;;;;;N;;;0545;;0545
-0576;ARMENIAN SMALL LETTER NOW;Ll;0;L;;;;;N;;;0546;;0546
-0577;ARMENIAN SMALL LETTER SHA;Ll;0;L;;;;;N;;;0547;;0547
-0578;ARMENIAN SMALL LETTER VO;Ll;0;L;;;;;N;;;0548;;0548
-0579;ARMENIAN SMALL LETTER CHA;Ll;0;L;;;;;N;;;0549;;0549
-057A;ARMENIAN SMALL LETTER PEH;Ll;0;L;;;;;N;;;054A;;054A
-057B;ARMENIAN SMALL LETTER JHEH;Ll;0;L;;;;;N;;;054B;;054B
-057C;ARMENIAN SMALL LETTER RA;Ll;0;L;;;;;N;;;054C;;054C
-057D;ARMENIAN SMALL LETTER SEH;Ll;0;L;;;;;N;;;054D;;054D
-057E;ARMENIAN SMALL LETTER VEW;Ll;0;L;;;;;N;;;054E;;054E
-057F;ARMENIAN SMALL LETTER TIWN;Ll;0;L;;;;;N;;;054F;;054F
-0580;ARMENIAN SMALL LETTER REH;Ll;0;L;;;;;N;;;0550;;0550
-0581;ARMENIAN SMALL LETTER CO;Ll;0;L;;;;;N;;;0551;;0551
-0582;ARMENIAN SMALL LETTER YIWN;Ll;0;L;;;;;N;;;0552;;0552
-0583;ARMENIAN SMALL LETTER PIWR;Ll;0;L;;;;;N;;;0553;;0553
-0584;ARMENIAN SMALL LETTER KEH;Ll;0;L;;;;;N;;;0554;;0554
-0585;ARMENIAN SMALL LETTER OH;Ll;0;L;;;;;N;;;0555;;0555
-0586;ARMENIAN SMALL LETTER FEH;Ll;0;L;;;;;N;;;0556;;0556
-0587;ARMENIAN SMALL LIGATURE ECH YIWN;Ll;0;L;<compat> 0565 0582;;;;N;;;;;
-0589;ARMENIAN FULL STOP;Po;0;L;;;;;N;ARMENIAN PERIOD;;;;
-058A;ARMENIAN HYPHEN;Pd;0;ON;;;;;N;;;;;
-0591;HEBREW ACCENT ETNAHTA;Mn;220;NSM;;;;;N;;;;;
-0592;HEBREW ACCENT SEGOL;Mn;230;NSM;;;;;N;;;;;
-0593;HEBREW ACCENT SHALSHELET;Mn;230;NSM;;;;;N;;;;;
-0594;HEBREW ACCENT ZAQEF QATAN;Mn;230;NSM;;;;;N;;;;;
-0595;HEBREW ACCENT ZAQEF GADOL;Mn;230;NSM;;;;;N;;;;;
-0596;HEBREW ACCENT TIPEHA;Mn;220;NSM;;;;;N;;*;;;
-0597;HEBREW ACCENT REVIA;Mn;230;NSM;;;;;N;;;;;
-0598;HEBREW ACCENT ZARQA;Mn;230;NSM;;;;;N;;*;;;
-0599;HEBREW ACCENT PASHTA;Mn;230;NSM;;;;;N;;;;;
-059A;HEBREW ACCENT YETIV;Mn;222;NSM;;;;;N;;;;;
-059B;HEBREW ACCENT TEVIR;Mn;220;NSM;;;;;N;;;;;
-059C;HEBREW ACCENT GERESH;Mn;230;NSM;;;;;N;;;;;
-059D;HEBREW ACCENT GERESH MUQDAM;Mn;230;NSM;;;;;N;;;;;
-059E;HEBREW ACCENT GERSHAYIM;Mn;230;NSM;;;;;N;;;;;
-059F;HEBREW ACCENT QARNEY PARA;Mn;230;NSM;;;;;N;;;;;
-05A0;HEBREW ACCENT TELISHA GEDOLA;Mn;230;NSM;;;;;N;;;;;
-05A1;HEBREW ACCENT PAZER;Mn;230;NSM;;;;;N;;;;;
-05A2;HEBREW ACCENT ATNAH HAFUKH;Mn;220;NSM;;;;;N;;;;;
-05A3;HEBREW ACCENT MUNAH;Mn;220;NSM;;;;;N;;;;;
-05A4;HEBREW ACCENT MAHAPAKH;Mn;220;NSM;;;;;N;;;;;
-05A5;HEBREW ACCENT MERKHA;Mn;220;NSM;;;;;N;;*;;;
-05A6;HEBREW ACCENT MERKHA KEFULA;Mn;220;NSM;;;;;N;;;;;
-05A7;HEBREW ACCENT DARGA;Mn;220;NSM;;;;;N;;;;;
-05A8;HEBREW ACCENT QADMA;Mn;230;NSM;;;;;N;;*;;;
-05A9;HEBREW ACCENT TELISHA QETANA;Mn;230;NSM;;;;;N;;;;;
-05AA;HEBREW ACCENT YERAH BEN YOMO;Mn;220;NSM;;;;;N;;*;;;
-05AB;HEBREW ACCENT OLE;Mn;230;NSM;;;;;N;;;;;
-05AC;HEBREW ACCENT ILUY;Mn;230;NSM;;;;;N;;;;;
-05AD;HEBREW ACCENT DEHI;Mn;222;NSM;;;;;N;;;;;
-05AE;HEBREW ACCENT ZINOR;Mn;228;NSM;;;;;N;;;;;
-05AF;HEBREW MARK MASORA CIRCLE;Mn;230;NSM;;;;;N;;;;;
-05B0;HEBREW POINT SHEVA;Mn;10;NSM;;;;;N;;;;;
-05B1;HEBREW POINT HATAF SEGOL;Mn;11;NSM;;;;;N;;;;;
-05B2;HEBREW POINT HATAF PATAH;Mn;12;NSM;;;;;N;;;;;
-05B3;HEBREW POINT HATAF QAMATS;Mn;13;NSM;;;;;N;;;;;
-05B4;HEBREW POINT HIRIQ;Mn;14;NSM;;;;;N;;;;;
-05B5;HEBREW POINT TSERE;Mn;15;NSM;;;;;N;;;;;
-05B6;HEBREW POINT SEGOL;Mn;16;NSM;;;;;N;;;;;
-05B7;HEBREW POINT PATAH;Mn;17;NSM;;;;;N;;;;;
-05B8;HEBREW POINT QAMATS;Mn;18;NSM;;;;;N;;;;;
-05B9;HEBREW POINT HOLAM;Mn;19;NSM;;;;;N;;;;;
-05BA;HEBREW POINT HOLAM HASER FOR VAV;Mn;19;NSM;;;;;N;;;;;
-05BB;HEBREW POINT QUBUTS;Mn;20;NSM;;;;;N;;;;;
-05BC;HEBREW POINT DAGESH OR MAPIQ;Mn;21;NSM;;;;;N;HEBREW POINT DAGESH;or shuruq;;;
-05BD;HEBREW POINT METEG;Mn;22;NSM;;;;;N;;*;;;
-05BE;HEBREW PUNCTUATION MAQAF;Pd;0;R;;;;;N;;;;;
-05BF;HEBREW POINT RAFE;Mn;23;NSM;;;;;N;;;;;
-05C0;HEBREW PUNCTUATION PASEQ;Po;0;R;;;;;N;HEBREW POINT PASEQ;*;;;
-05C1;HEBREW POINT SHIN DOT;Mn;24;NSM;;;;;N;;;;;
-05C2;HEBREW POINT SIN DOT;Mn;25;NSM;;;;;N;;;;;
-05C3;HEBREW PUNCTUATION SOF PASUQ;Po;0;R;;;;;N;;*;;;
-05C4;HEBREW MARK UPPER DOT;Mn;230;NSM;;;;;N;;;;;
-05C5;HEBREW MARK LOWER DOT;Mn;220;NSM;;;;;N;;;;;
-05C6;HEBREW PUNCTUATION NUN HAFUKHA;Po;0;R;;;;;N;;;;;
-05C7;HEBREW POINT QAMATS QATAN;Mn;18;NSM;;;;;N;;;;;
-05D0;HEBREW LETTER ALEF;Lo;0;R;;;;;N;;;;;
-05D1;HEBREW LETTER BET;Lo;0;R;;;;;N;;;;;
-05D2;HEBREW LETTER GIMEL;Lo;0;R;;;;;N;;;;;
-05D3;HEBREW LETTER DALET;Lo;0;R;;;;;N;;;;;
-05D4;HEBREW LETTER HE;Lo;0;R;;;;;N;;;;;
-05D5;HEBREW LETTER VAV;Lo;0;R;;;;;N;;;;;
-05D6;HEBREW LETTER ZAYIN;Lo;0;R;;;;;N;;;;;
-05D7;HEBREW LETTER HET;Lo;0;R;;;;;N;;;;;
-05D8;HEBREW LETTER TET;Lo;0;R;;;;;N;;;;;
-05D9;HEBREW LETTER YOD;Lo;0;R;;;;;N;;;;;
-05DA;HEBREW LETTER FINAL KAF;Lo;0;R;;;;;N;;;;;
-05DB;HEBREW LETTER KAF;Lo;0;R;;;;;N;;;;;
-05DC;HEBREW LETTER LAMED;Lo;0;R;;;;;N;;;;;
-05DD;HEBREW LETTER FINAL MEM;Lo;0;R;;;;;N;;;;;
-05DE;HEBREW LETTER MEM;Lo;0;R;;;;;N;;;;;
-05DF;HEBREW LETTER FINAL NUN;Lo;0;R;;;;;N;;;;;
-05E0;HEBREW LETTER NUN;Lo;0;R;;;;;N;;;;;
-05E1;HEBREW LETTER SAMEKH;Lo;0;R;;;;;N;;;;;
-05E2;HEBREW LETTER AYIN;Lo;0;R;;;;;N;;;;;
-05E3;HEBREW LETTER FINAL PE;Lo;0;R;;;;;N;;;;;
-05E4;HEBREW LETTER PE;Lo;0;R;;;;;N;;;;;
-05E5;HEBREW LETTER FINAL TSADI;Lo;0;R;;;;;N;;;;;
-05E6;HEBREW LETTER TSADI;Lo;0;R;;;;;N;;;;;
-05E7;HEBREW LETTER QOF;Lo;0;R;;;;;N;;;;;
-05E8;HEBREW LETTER RESH;Lo;0;R;;;;;N;;;;;
-05E9;HEBREW LETTER SHIN;Lo;0;R;;;;;N;;;;;
-05EA;HEBREW LETTER TAV;Lo;0;R;;;;;N;;;;;
-05F0;HEBREW LIGATURE YIDDISH DOUBLE VAV;Lo;0;R;;;;;N;HEBREW LETTER DOUBLE VAV;;;;
-05F1;HEBREW LIGATURE YIDDISH VAV YOD;Lo;0;R;;;;;N;HEBREW LETTER VAV YOD;;;;
-05F2;HEBREW LIGATURE YIDDISH DOUBLE YOD;Lo;0;R;;;;;N;HEBREW LETTER DOUBLE YOD;;;;
-05F3;HEBREW PUNCTUATION GERESH;Po;0;R;;;;;N;;;;;
-05F4;HEBREW PUNCTUATION GERSHAYIM;Po;0;R;;;;;N;;;;;
-0600;ARABIC NUMBER SIGN;Cf;0;AN;;;;;N;;;;;
-0601;ARABIC SIGN SANAH;Cf;0;AN;;;;;N;;;;;
-0602;ARABIC FOOTNOTE MARKER;Cf;0;AN;;;;;N;;;;;
-0603;ARABIC SIGN SAFHA;Cf;0;AN;;;;;N;;;;;
-0606;ARABIC-INDIC CUBE ROOT;Sm;0;ON;;;;;N;;;;;
-0607;ARABIC-INDIC FOURTH ROOT;Sm;0;ON;;;;;N;;;;;
-0608;ARABIC RAY;Sm;0;AL;;;;;N;;;;;
-0609;ARABIC-INDIC PER MILLE SIGN;Po;0;ET;;;;;N;;;;;
-060A;ARABIC-INDIC PER TEN THOUSAND SIGN;Po;0;ET;;;;;N;;;;;
-060B;AFGHANI SIGN;Sc;0;AL;;;;;N;;;;;
-060C;ARABIC COMMA;Po;0;CS;;;;;N;;;;;
-060D;ARABIC DATE SEPARATOR;Po;0;AL;;;;;N;;;;;
-060E;ARABIC POETIC VERSE SIGN;So;0;ON;;;;;N;;;;;
-060F;ARABIC SIGN MISRA;So;0;ON;;;;;N;;;;;
-0610;ARABIC SIGN SALLALLAHOU ALAYHE WASSALLAM;Mn;230;NSM;;;;;N;;;;;
-0611;ARABIC SIGN ALAYHE ASSALLAM;Mn;230;NSM;;;;;N;;;;;
-0612;ARABIC SIGN RAHMATULLAH ALAYHE;Mn;230;NSM;;;;;N;;;;;
-0613;ARABIC SIGN RADI ALLAHOU ANHU;Mn;230;NSM;;;;;N;;;;;
-0614;ARABIC SIGN TAKHALLUS;Mn;230;NSM;;;;;N;;;;;
-0615;ARABIC SMALL HIGH TAH;Mn;230;NSM;;;;;N;;;;;
-0616;ARABIC SMALL HIGH LIGATURE ALEF WITH LAM WITH YEH;Mn;230;NSM;;;;;N;;;;;
-0617;ARABIC SMALL HIGH ZAIN;Mn;230;NSM;;;;;N;;;;;
-0618;ARABIC SMALL FATHA;Mn;30;NSM;;;;;N;;;;;
-0619;ARABIC SMALL DAMMA;Mn;31;NSM;;;;;N;;;;;
-061A;ARABIC SMALL KASRA;Mn;32;NSM;;;;;N;;;;;
-061B;ARABIC SEMICOLON;Po;0;AL;;;;;N;;;;;
-061E;ARABIC TRIPLE DOT PUNCTUATION MARK;Po;0;AL;;;;;N;;;;;
-061F;ARABIC QUESTION MARK;Po;0;AL;;;;;N;;;;;
-0621;ARABIC LETTER HAMZA;Lo;0;AL;;;;;N;ARABIC LETTER HAMZAH;;;;
-0622;ARABIC LETTER ALEF WITH MADDA ABOVE;Lo;0;AL;0627 0653;;;;N;ARABIC LETTER MADDAH ON ALEF;;;;
-0623;ARABIC LETTER ALEF WITH HAMZA ABOVE;Lo;0;AL;0627 0654;;;;N;ARABIC LETTER HAMZAH ON ALEF;;;;
-0624;ARABIC LETTER WAW WITH HAMZA ABOVE;Lo;0;AL;0648 0654;;;;N;ARABIC LETTER HAMZAH ON WAW;;;;
-0625;ARABIC LETTER ALEF WITH HAMZA BELOW;Lo;0;AL;0627 0655;;;;N;ARABIC LETTER HAMZAH UNDER ALEF;;;;
-0626;ARABIC LETTER YEH WITH HAMZA ABOVE;Lo;0;AL;064A 0654;;;;N;ARABIC LETTER HAMZAH ON YA;;;;
-0627;ARABIC LETTER ALEF;Lo;0;AL;;;;;N;;;;;
-0628;ARABIC LETTER BEH;Lo;0;AL;;;;;N;ARABIC LETTER BAA;;;;
-0629;ARABIC LETTER TEH MARBUTA;Lo;0;AL;;;;;N;ARABIC LETTER TAA MARBUTAH;;;;
-062A;ARABIC LETTER TEH;Lo;0;AL;;;;;N;ARABIC LETTER TAA;;;;
-062B;ARABIC LETTER THEH;Lo;0;AL;;;;;N;ARABIC LETTER THAA;;;;
-062C;ARABIC LETTER JEEM;Lo;0;AL;;;;;N;;;;;
-062D;ARABIC LETTER HAH;Lo;0;AL;;;;;N;ARABIC LETTER HAA;;;;
-062E;ARABIC LETTER KHAH;Lo;0;AL;;;;;N;ARABIC LETTER KHAA;;;;
-062F;ARABIC LETTER DAL;Lo;0;AL;;;;;N;;;;;
-0630;ARABIC LETTER THAL;Lo;0;AL;;;;;N;;;;;
-0631;ARABIC LETTER REH;Lo;0;AL;;;;;N;ARABIC LETTER RA;;;;
-0632;ARABIC LETTER ZAIN;Lo;0;AL;;;;;N;;;;;
-0633;ARABIC LETTER SEEN;Lo;0;AL;;;;;N;;;;;
-0634;ARABIC LETTER SHEEN;Lo;0;AL;;;;;N;;;;;
-0635;ARABIC LETTER SAD;Lo;0;AL;;;;;N;;;;;
-0636;ARABIC LETTER DAD;Lo;0;AL;;;;;N;;;;;
-0637;ARABIC LETTER TAH;Lo;0;AL;;;;;N;;;;;
-0638;ARABIC LETTER ZAH;Lo;0;AL;;;;;N;ARABIC LETTER DHAH;;;;
-0639;ARABIC LETTER AIN;Lo;0;AL;;;;;N;;;;;
-063A;ARABIC LETTER GHAIN;Lo;0;AL;;;;;N;;;;;
-063B;ARABIC LETTER KEHEH WITH TWO DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
-063C;ARABIC LETTER KEHEH WITH THREE DOTS BELOW;Lo;0;AL;;;;;N;;;;;
-063D;ARABIC LETTER FARSI YEH WITH INVERTED V;Lo;0;AL;;;;;N;;;;;
-063E;ARABIC LETTER FARSI YEH WITH TWO DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
-063F;ARABIC LETTER FARSI YEH WITH THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
-0640;ARABIC TATWEEL;Lm;0;AL;;;;;N;;;;;
-0641;ARABIC LETTER FEH;Lo;0;AL;;;;;N;ARABIC LETTER FA;;;;
-0642;ARABIC LETTER QAF;Lo;0;AL;;;;;N;;;;;
-0643;ARABIC LETTER KAF;Lo;0;AL;;;;;N;ARABIC LETTER CAF;;;;
-0644;ARABIC LETTER LAM;Lo;0;AL;;;;;N;;;;;
-0645;ARABIC LETTER MEEM;Lo;0;AL;;;;;N;;;;;
-0646;ARABIC LETTER NOON;Lo;0;AL;;;;;N;;;;;
-0647;ARABIC LETTER HEH;Lo;0;AL;;;;;N;ARABIC LETTER HA;;;;
-0648;ARABIC LETTER WAW;Lo;0;AL;;;;;N;;;;;
-0649;ARABIC LETTER ALEF MAKSURA;Lo;0;AL;;;;;N;ARABIC LETTER ALEF MAQSURAH;;;;
-064A;ARABIC LETTER YEH;Lo;0;AL;;;;;N;ARABIC LETTER YA;;;;
-064B;ARABIC FATHATAN;Mn;27;NSM;;;;;N;;;;;
-064C;ARABIC DAMMATAN;Mn;28;NSM;;;;;N;;;;;
-064D;ARABIC KASRATAN;Mn;29;NSM;;;;;N;;;;;
-064E;ARABIC FATHA;Mn;30;NSM;;;;;N;ARABIC FATHAH;;;;
-064F;ARABIC DAMMA;Mn;31;NSM;;;;;N;ARABIC DAMMAH;;;;
-0650;ARABIC KASRA;Mn;32;NSM;;;;;N;ARABIC KASRAH;;;;
-0651;ARABIC SHADDA;Mn;33;NSM;;;;;N;ARABIC SHADDAH;;;;
-0652;ARABIC SUKUN;Mn;34;NSM;;;;;N;;;;;
-0653;ARABIC MADDAH ABOVE;Mn;230;NSM;;;;;N;;;;;
-0654;ARABIC HAMZA ABOVE;Mn;230;NSM;;;;;N;;;;;
-0655;ARABIC HAMZA BELOW;Mn;220;NSM;;;;;N;;;;;
-0656;ARABIC SUBSCRIPT ALEF;Mn;220;NSM;;;;;N;;;;;
-0657;ARABIC INVERTED DAMMA;Mn;230;NSM;;;;;N;;;;;
-0658;ARABIC MARK NOON GHUNNA;Mn;230;NSM;;;;;N;;;;;
-0659;ARABIC ZWARAKAY;Mn;230;NSM;;;;;N;;;;;
-065A;ARABIC VOWEL SIGN SMALL V ABOVE;Mn;230;NSM;;;;;N;;;;;
-065B;ARABIC VOWEL SIGN INVERTED SMALL V ABOVE;Mn;230;NSM;;;;;N;;;;;
-065C;ARABIC VOWEL SIGN DOT BELOW;Mn;220;NSM;;;;;N;;;;;
-065D;ARABIC REVERSED DAMMA;Mn;230;NSM;;;;;N;;;;;
-065E;ARABIC FATHA WITH TWO DOTS;Mn;230;NSM;;;;;N;;;;;
-0660;ARABIC-INDIC DIGIT ZERO;Nd;0;AN;;0;0;0;N;;;;;
-0661;ARABIC-INDIC DIGIT ONE;Nd;0;AN;;1;1;1;N;;;;;
-0662;ARABIC-INDIC DIGIT TWO;Nd;0;AN;;2;2;2;N;;;;;
-0663;ARABIC-INDIC DIGIT THREE;Nd;0;AN;;3;3;3;N;;;;;
-0664;ARABIC-INDIC DIGIT FOUR;Nd;0;AN;;4;4;4;N;;;;;
-0665;ARABIC-INDIC DIGIT FIVE;Nd;0;AN;;5;5;5;N;;;;;
-0666;ARABIC-INDIC DIGIT SIX;Nd;0;AN;;6;6;6;N;;;;;
-0667;ARABIC-INDIC DIGIT SEVEN;Nd;0;AN;;7;7;7;N;;;;;
-0668;ARABIC-INDIC DIGIT EIGHT;Nd;0;AN;;8;8;8;N;;;;;
-0669;ARABIC-INDIC DIGIT NINE;Nd;0;AN;;9;9;9;N;;;;;
-066A;ARABIC PERCENT SIGN;Po;0;ET;;;;;N;;;;;
-066B;ARABIC DECIMAL SEPARATOR;Po;0;AN;;;;;N;;;;;
-066C;ARABIC THOUSANDS SEPARATOR;Po;0;AN;;;;;N;;;;;
-066D;ARABIC FIVE POINTED STAR;Po;0;AL;;;;;N;;;;;
-066E;ARABIC LETTER DOTLESS BEH;Lo;0;AL;;;;;N;;;;;
-066F;ARABIC LETTER DOTLESS QAF;Lo;0;AL;;;;;N;;;;;
-0670;ARABIC LETTER SUPERSCRIPT ALEF;Mn;35;NSM;;;;;N;ARABIC ALEF ABOVE;;;;
-0671;ARABIC LETTER ALEF WASLA;Lo;0;AL;;;;;N;ARABIC LETTER HAMZAT WASL ON ALEF;;;;
-0672;ARABIC LETTER ALEF WITH WAVY HAMZA ABOVE;Lo;0;AL;;;;;N;ARABIC LETTER WAVY HAMZAH ON ALEF;;;;
-0673;ARABIC LETTER ALEF WITH WAVY HAMZA BELOW;Lo;0;AL;;;;;N;ARABIC LETTER WAVY HAMZAH UNDER ALEF;;;;
-0674;ARABIC LETTER HIGH HAMZA;Lo;0;AL;;;;;N;ARABIC LETTER HIGH HAMZAH;;;;
-0675;ARABIC LETTER HIGH HAMZA ALEF;Lo;0;AL;<compat> 0627 0674;;;;N;ARABIC LETTER HIGH HAMZAH ALEF;;;;
-0676;ARABIC LETTER HIGH HAMZA WAW;Lo;0;AL;<compat> 0648 0674;;;;N;ARABIC LETTER HIGH HAMZAH WAW;;;;
-0677;ARABIC LETTER U WITH HAMZA ABOVE;Lo;0;AL;<compat> 06C7 0674;;;;N;ARABIC LETTER HIGH HAMZAH WAW WITH DAMMAH;;;;
-0678;ARABIC LETTER HIGH HAMZA YEH;Lo;0;AL;<compat> 064A 0674;;;;N;ARABIC LETTER HIGH HAMZAH YA;;;;
-0679;ARABIC LETTER TTEH;Lo;0;AL;;;;;N;ARABIC LETTER TAA WITH SMALL TAH;;;;
-067A;ARABIC LETTER TTEHEH;Lo;0;AL;;;;;N;ARABIC LETTER TAA WITH TWO DOTS VERTICAL ABOVE;;;;
-067B;ARABIC LETTER BEEH;Lo;0;AL;;;;;N;ARABIC LETTER BAA WITH TWO DOTS VERTICAL BELOW;;;;
-067C;ARABIC LETTER TEH WITH RING;Lo;0;AL;;;;;N;ARABIC LETTER TAA WITH RING;;;;
-067D;ARABIC LETTER TEH WITH THREE DOTS ABOVE DOWNWARDS;Lo;0;AL;;;;;N;ARABIC LETTER TAA WITH THREE DOTS ABOVE DOWNWARD;;;;
-067E;ARABIC LETTER PEH;Lo;0;AL;;;;;N;ARABIC LETTER TAA WITH THREE DOTS BELOW;;;;
-067F;ARABIC LETTER TEHEH;Lo;0;AL;;;;;N;ARABIC LETTER TAA WITH FOUR DOTS ABOVE;;;;
-0680;ARABIC LETTER BEHEH;Lo;0;AL;;;;;N;ARABIC LETTER BAA WITH FOUR DOTS BELOW;;;;
-0681;ARABIC LETTER HAH WITH HAMZA ABOVE;Lo;0;AL;;;;;N;ARABIC LETTER HAMZAH ON HAA;;;;
-0682;ARABIC LETTER HAH WITH TWO DOTS VERTICAL ABOVE;Lo;0;AL;;;;;N;ARABIC LETTER HAA WITH TWO DOTS VERTICAL ABOVE;;;;
-0683;ARABIC LETTER NYEH;Lo;0;AL;;;;;N;ARABIC LETTER HAA WITH MIDDLE TWO DOTS;;;;
-0684;ARABIC LETTER DYEH;Lo;0;AL;;;;;N;ARABIC LETTER HAA WITH MIDDLE TWO DOTS VERTICAL;;;;
-0685;ARABIC LETTER HAH WITH THREE DOTS ABOVE;Lo;0;AL;;;;;N;ARABIC LETTER HAA WITH THREE DOTS ABOVE;;;;
-0686;ARABIC LETTER TCHEH;Lo;0;AL;;;;;N;ARABIC LETTER HAA WITH MIDDLE THREE DOTS DOWNWARD;;;;
-0687;ARABIC LETTER TCHEHEH;Lo;0;AL;;;;;N;ARABIC LETTER HAA WITH MIDDLE FOUR DOTS;;;;
-0688;ARABIC LETTER DDAL;Lo;0;AL;;;;;N;ARABIC LETTER DAL WITH SMALL TAH;;;;
-0689;ARABIC LETTER DAL WITH RING;Lo;0;AL;;;;;N;;;;;
-068A;ARABIC LETTER DAL WITH DOT BELOW;Lo;0;AL;;;;;N;;;;;
-068B;ARABIC LETTER DAL WITH DOT BELOW AND SMALL TAH;Lo;0;AL;;;;;N;;;;;
-068C;ARABIC LETTER DAHAL;Lo;0;AL;;;;;N;ARABIC LETTER DAL WITH TWO DOTS ABOVE;;;;
-068D;ARABIC LETTER DDAHAL;Lo;0;AL;;;;;N;ARABIC LETTER DAL WITH TWO DOTS BELOW;;;;
-068E;ARABIC LETTER DUL;Lo;0;AL;;;;;N;ARABIC LETTER DAL WITH THREE DOTS ABOVE;;;;
-068F;ARABIC LETTER DAL WITH THREE DOTS ABOVE DOWNWARDS;Lo;0;AL;;;;;N;ARABIC LETTER DAL WITH THREE DOTS ABOVE DOWNWARD;;;;
-0690;ARABIC LETTER DAL WITH FOUR DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
-0691;ARABIC LETTER RREH;Lo;0;AL;;;;;N;ARABIC LETTER RA WITH SMALL TAH;;;;
-0692;ARABIC LETTER REH WITH SMALL V;Lo;0;AL;;;;;N;ARABIC LETTER RA WITH SMALL V;;;;
-0693;ARABIC LETTER REH WITH RING;Lo;0;AL;;;;;N;ARABIC LETTER RA WITH RING;;;;
-0694;ARABIC LETTER REH WITH DOT BELOW;Lo;0;AL;;;;;N;ARABIC LETTER RA WITH DOT BELOW;;;;
-0695;ARABIC LETTER REH WITH SMALL V BELOW;Lo;0;AL;;;;;N;ARABIC LETTER RA WITH SMALL V BELOW;;;;
-0696;ARABIC LETTER REH WITH DOT BELOW AND DOT ABOVE;Lo;0;AL;;;;;N;ARABIC LETTER RA WITH DOT BELOW AND DOT ABOVE;;;;
-0697;ARABIC LETTER REH WITH TWO DOTS ABOVE;Lo;0;AL;;;;;N;ARABIC LETTER RA WITH TWO DOTS ABOVE;;;;
-0698;ARABIC LETTER JEH;Lo;0;AL;;;;;N;ARABIC LETTER RA WITH THREE DOTS ABOVE;;;;
-0699;ARABIC LETTER REH WITH FOUR DOTS ABOVE;Lo;0;AL;;;;;N;ARABIC LETTER RA WITH FOUR DOTS ABOVE;;;;
-069A;ARABIC LETTER SEEN WITH DOT BELOW AND DOT ABOVE;Lo;0;AL;;;;;N;;;;;
-069B;ARABIC LETTER SEEN WITH THREE DOTS BELOW;Lo;0;AL;;;;;N;;;;;
-069C;ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
-069D;ARABIC LETTER SAD WITH TWO DOTS BELOW;Lo;0;AL;;;;;N;;;;;
-069E;ARABIC LETTER SAD WITH THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
-069F;ARABIC LETTER TAH WITH THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
-06A0;ARABIC LETTER AIN WITH THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
-06A1;ARABIC LETTER DOTLESS FEH;Lo;0;AL;;;;;N;ARABIC LETTER DOTLESS FA;;;;
-06A2;ARABIC LETTER FEH WITH DOT MOVED BELOW;Lo;0;AL;;;;;N;ARABIC LETTER FA WITH DOT MOVED BELOW;;;;
-06A3;ARABIC LETTER FEH WITH DOT BELOW;Lo;0;AL;;;;;N;ARABIC LETTER FA WITH DOT BELOW;;;;
-06A4;ARABIC LETTER VEH;Lo;0;AL;;;;;N;ARABIC LETTER FA WITH THREE DOTS ABOVE;;;;
-06A5;ARABIC LETTER FEH WITH THREE DOTS BELOW;Lo;0;AL;;;;;N;ARABIC LETTER FA WITH THREE DOTS BELOW;;;;
-06A6;ARABIC LETTER PEHEH;Lo;0;AL;;;;;N;ARABIC LETTER FA WITH FOUR DOTS ABOVE;;;;
-06A7;ARABIC LETTER QAF WITH DOT ABOVE;Lo;0;AL;;;;;N;;;;;
-06A8;ARABIC LETTER QAF WITH THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
-06A9;ARABIC LETTER KEHEH;Lo;0;AL;;;;;N;ARABIC LETTER OPEN CAF;;;;
-06AA;ARABIC LETTER SWASH KAF;Lo;0;AL;;;;;N;ARABIC LETTER SWASH CAF;;;;
-06AB;ARABIC LETTER KAF WITH RING;Lo;0;AL;;;;;N;ARABIC LETTER CAF WITH RING;;;;
-06AC;ARABIC LETTER KAF WITH DOT ABOVE;Lo;0;AL;;;;;N;ARABIC LETTER CAF WITH DOT ABOVE;;;;
-06AD;ARABIC LETTER NG;Lo;0;AL;;;;;N;ARABIC LETTER CAF WITH THREE DOTS ABOVE;;;;
-06AE;ARABIC LETTER KAF WITH THREE DOTS BELOW;Lo;0;AL;;;;;N;ARABIC LETTER CAF WITH THREE DOTS BELOW;;;;
-06AF;ARABIC LETTER GAF;Lo;0;AL;;;;;N;;*;;;
-06B0;ARABIC LETTER GAF WITH RING;Lo;0;AL;;;;;N;;;;;
-06B1;ARABIC LETTER NGOEH;Lo;0;AL;;;;;N;ARABIC LETTER GAF WITH TWO DOTS ABOVE;;;;
-06B2;ARABIC LETTER GAF WITH TWO DOTS BELOW;Lo;0;AL;;;;;N;;;;;
-06B3;ARABIC LETTER GUEH;Lo;0;AL;;;;;N;ARABIC LETTER GAF WITH TWO DOTS VERTICAL BELOW;;;;
-06B4;ARABIC LETTER GAF WITH THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
-06B5;ARABIC LETTER LAM WITH SMALL V;Lo;0;AL;;;;;N;;;;;
-06B6;ARABIC LETTER LAM WITH DOT ABOVE;Lo;0;AL;;;;;N;;;;;
-06B7;ARABIC LETTER LAM WITH THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
-06B8;ARABIC LETTER LAM WITH THREE DOTS BELOW;Lo;0;AL;;;;;N;;;;;
-06B9;ARABIC LETTER NOON WITH DOT BELOW;Lo;0;AL;;;;;N;;;;;
-06BA;ARABIC LETTER NOON GHUNNA;Lo;0;AL;;;;;N;ARABIC LETTER DOTLESS NOON;;;;
-06BB;ARABIC LETTER RNOON;Lo;0;AL;;;;;N;ARABIC LETTER DOTLESS NOON WITH SMALL TAH;;;;
-06BC;ARABIC LETTER NOON WITH RING;Lo;0;AL;;;;;N;;;;;
-06BD;ARABIC LETTER NOON WITH THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
-06BE;ARABIC LETTER HEH DOACHASHMEE;Lo;0;AL;;;;;N;ARABIC LETTER KNOTTED HA;;;;
-06BF;ARABIC LETTER TCHEH WITH DOT ABOVE;Lo;0;AL;;;;;N;;;;;
-06C0;ARABIC LETTER HEH WITH YEH ABOVE;Lo;0;AL;06D5 0654;;;;N;ARABIC LETTER HAMZAH ON HA;;;;
-06C1;ARABIC LETTER HEH GOAL;Lo;0;AL;;;;;N;ARABIC LETTER HA GOAL;;;;
-06C2;ARABIC LETTER HEH GOAL WITH HAMZA ABOVE;Lo;0;AL;06C1 0654;;;;N;ARABIC LETTER HAMZAH ON HA GOAL;;;;
-06C3;ARABIC LETTER TEH MARBUTA GOAL;Lo;0;AL;;;;;N;ARABIC LETTER TAA MARBUTAH GOAL;;;;
-06C4;ARABIC LETTER WAW WITH RING;Lo;0;AL;;;;;N;;;;;
-06C5;ARABIC LETTER KIRGHIZ OE;Lo;0;AL;;;;;N;ARABIC LETTER WAW WITH BAR;;;;
-06C6;ARABIC LETTER OE;Lo;0;AL;;;;;N;ARABIC LETTER WAW WITH SMALL V;;;;
-06C7;ARABIC LETTER U;Lo;0;AL;;;;;N;ARABIC LETTER WAW WITH DAMMAH;;;;
-06C8;ARABIC LETTER YU;Lo;0;AL;;;;;N;ARABIC LETTER WAW WITH ALEF ABOVE;;;;
-06C9;ARABIC LETTER KIRGHIZ YU;Lo;0;AL;;;;;N;ARABIC LETTER WAW WITH INVERTED SMALL V;;;;
-06CA;ARABIC LETTER WAW WITH TWO DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
-06CB;ARABIC LETTER VE;Lo;0;AL;;;;;N;ARABIC LETTER WAW WITH THREE DOTS ABOVE;;;;
-06CC;ARABIC LETTER FARSI YEH;Lo;0;AL;;;;;N;ARABIC LETTER DOTLESS YA;;;;
-06CD;ARABIC LETTER YEH WITH TAIL;Lo;0;AL;;;;;N;ARABIC LETTER YA WITH TAIL;;;;
-06CE;ARABIC LETTER YEH WITH SMALL V;Lo;0;AL;;;;;N;ARABIC LETTER YA WITH SMALL V;;;;
-06CF;ARABIC LETTER WAW WITH DOT ABOVE;Lo;0;AL;;;;;N;;;;;
-06D0;ARABIC LETTER E;Lo;0;AL;;;;;N;ARABIC LETTER YA WITH TWO DOTS VERTICAL BELOW;*;;;
-06D1;ARABIC LETTER YEH WITH THREE DOTS BELOW;Lo;0;AL;;;;;N;ARABIC LETTER YA WITH THREE DOTS BELOW;;;;
-06D2;ARABIC LETTER YEH BARREE;Lo;0;AL;;;;;N;ARABIC LETTER YA BARREE;;;;
-06D3;ARABIC LETTER YEH BARREE WITH HAMZA ABOVE;Lo;0;AL;06D2 0654;;;;N;ARABIC LETTER HAMZAH ON YA BARREE;;;;
-06D4;ARABIC FULL STOP;Po;0;AL;;;;;N;ARABIC PERIOD;;;;
-06D5;ARABIC LETTER AE;Lo;0;AL;;;;;N;;;;;
-06D6;ARABIC SMALL HIGH LIGATURE SAD WITH LAM WITH ALEF MAKSURA;Mn;230;NSM;;;;;N;;;;;
-06D7;ARABIC SMALL HIGH LIGATURE QAF WITH LAM WITH ALEF MAKSURA;Mn;230;NSM;;;;;N;;;;;
-06D8;ARABIC SMALL HIGH MEEM INITIAL FORM;Mn;230;NSM;;;;;N;;;;;
-06D9;ARABIC SMALL HIGH LAM ALEF;Mn;230;NSM;;;;;N;;;;;
-06DA;ARABIC SMALL HIGH JEEM;Mn;230;NSM;;;;;N;;;;;
-06DB;ARABIC SMALL HIGH THREE DOTS;Mn;230;NSM;;;;;N;;;;;
-06DC;ARABIC SMALL HIGH SEEN;Mn;230;NSM;;;;;N;;;;;
-06DD;ARABIC END OF AYAH;Cf;0;AN;;;;;N;;;;;
-06DE;ARABIC START OF RUB EL HIZB;Me;0;NSM;;;;;N;;;;;
-06DF;ARABIC SMALL HIGH ROUNDED ZERO;Mn;230;NSM;;;;;N;;;;;
-06E0;ARABIC SMALL HIGH UPRIGHT RECTANGULAR ZERO;Mn;230;NSM;;;;;N;;;;;
-06E1;ARABIC SMALL HIGH DOTLESS HEAD OF KHAH;Mn;230;NSM;;;;;N;;;;;
-06E2;ARABIC SMALL HIGH MEEM ISOLATED FORM;Mn;230;NSM;;;;;N;;;;;
-06E3;ARABIC SMALL LOW SEEN;Mn;220;NSM;;;;;N;;;;;
-06E4;ARABIC SMALL HIGH MADDA;Mn;230;NSM;;;;;N;;;;;
-06E5;ARABIC SMALL WAW;Lm;0;AL;;;;;N;;;;;
-06E6;ARABIC SMALL YEH;Lm;0;AL;;;;;N;;;;;
-06E7;ARABIC SMALL HIGH YEH;Mn;230;NSM;;;;;N;;;;;
-06E8;ARABIC SMALL HIGH NOON;Mn;230;NSM;;;;;N;;;;;
-06E9;ARABIC PLACE OF SAJDAH;So;0;ON;;;;;N;;;;;
-06EA;ARABIC EMPTY CENTRE LOW STOP;Mn;220;NSM;;;;;N;;;;;
-06EB;ARABIC EMPTY CENTRE HIGH STOP;Mn;230;NSM;;;;;N;;;;;
-06EC;ARABIC ROUNDED HIGH STOP WITH FILLED CENTRE;Mn;230;NSM;;;;;N;;;;;
-06ED;ARABIC SMALL LOW MEEM;Mn;220;NSM;;;;;N;;;;;
-06EE;ARABIC LETTER DAL WITH INVERTED V;Lo;0;AL;;;;;N;;;;;
-06EF;ARABIC LETTER REH WITH INVERTED V;Lo;0;AL;;;;;N;;;;;
-06F0;EXTENDED ARABIC-INDIC DIGIT ZERO;Nd;0;EN;;0;0;0;N;EASTERN ARABIC-INDIC DIGIT ZERO;;;;
-06F1;EXTENDED ARABIC-INDIC DIGIT ONE;Nd;0;EN;;1;1;1;N;EASTERN ARABIC-INDIC DIGIT ONE;;;;
-06F2;EXTENDED ARABIC-INDIC DIGIT TWO;Nd;0;EN;;2;2;2;N;EASTERN ARABIC-INDIC DIGIT TWO;;;;
-06F3;EXTENDED ARABIC-INDIC DIGIT THREE;Nd;0;EN;;3;3;3;N;EASTERN ARABIC-INDIC DIGIT THREE;;;;
-06F4;EXTENDED ARABIC-INDIC DIGIT FOUR;Nd;0;EN;;4;4;4;N;EASTERN ARABIC-INDIC DIGIT FOUR;;;;
-06F5;EXTENDED ARABIC-INDIC DIGIT FIVE;Nd;0;EN;;5;5;5;N;EASTERN ARABIC-INDIC DIGIT FIVE;;;;
-06F6;EXTENDED ARABIC-INDIC DIGIT SIX;Nd;0;EN;;6;6;6;N;EASTERN ARABIC-INDIC DIGIT SIX;;;;
-06F7;EXTENDED ARABIC-INDIC DIGIT SEVEN;Nd;0;EN;;7;7;7;N;EASTERN ARABIC-INDIC DIGIT SEVEN;;;;
-06F8;EXTENDED ARABIC-INDIC DIGIT EIGHT;Nd;0;EN;;8;8;8;N;EASTERN ARABIC-INDIC DIGIT EIGHT;;;;
-06F9;EXTENDED ARABIC-INDIC DIGIT NINE;Nd;0;EN;;9;9;9;N;EASTERN ARABIC-INDIC DIGIT NINE;;;;
-06FA;ARABIC LETTER SHEEN WITH DOT BELOW;Lo;0;AL;;;;;N;;;;;
-06FB;ARABIC LETTER DAD WITH DOT BELOW;Lo;0;AL;;;;;N;;;;;
-06FC;ARABIC LETTER GHAIN WITH DOT BELOW;Lo;0;AL;;;;;N;;;;;
-06FD;ARABIC SIGN SINDHI AMPERSAND;So;0;AL;;;;;N;;;;;
-06FE;ARABIC SIGN SINDHI POSTPOSITION MEN;So;0;AL;;;;;N;;;;;
-06FF;ARABIC LETTER HEH WITH INVERTED V;Lo;0;AL;;;;;N;;;;;
-0700;SYRIAC END OF PARAGRAPH;Po;0;AL;;;;;N;;;;;
-0701;SYRIAC SUPRALINEAR FULL STOP;Po;0;AL;;;;;N;;;;;
-0702;SYRIAC SUBLINEAR FULL STOP;Po;0;AL;;;;;N;;;;;
-0703;SYRIAC SUPRALINEAR COLON;Po;0;AL;;;;;N;;;;;
-0704;SYRIAC SUBLINEAR COLON;Po;0;AL;;;;;N;;;;;
-0705;SYRIAC HORIZONTAL COLON;Po;0;AL;;;;;N;;;;;
-0706;SYRIAC COLON SKEWED LEFT;Po;0;AL;;;;;N;;;;;
-0707;SYRIAC COLON SKEWED RIGHT;Po;0;AL;;;;;N;;;;;
-0708;SYRIAC SUPRALINEAR COLON SKEWED LEFT;Po;0;AL;;;;;N;;;;;
-0709;SYRIAC SUBLINEAR COLON SKEWED RIGHT;Po;0;AL;;;;;N;;;;;
-070A;SYRIAC CONTRACTION;Po;0;AL;;;;;N;;;;;
-070B;SYRIAC HARKLEAN OBELUS;Po;0;AL;;;;;N;;;;;
-070C;SYRIAC HARKLEAN METOBELUS;Po;0;AL;;;;;N;;;;;
-070D;SYRIAC HARKLEAN ASTERISCUS;Po;0;AL;;;;;N;;;;;
-070F;SYRIAC ABBREVIATION MARK;Cf;0;BN;;;;;N;;;;;
-0710;SYRIAC LETTER ALAPH;Lo;0;AL;;;;;N;;;;;
-0711;SYRIAC LETTER SUPERSCRIPT ALAPH;Mn;36;NSM;;;;;N;;;;;
-0712;SYRIAC LETTER BETH;Lo;0;AL;;;;;N;;;;;
-0713;SYRIAC LETTER GAMAL;Lo;0;AL;;;;;N;;;;;
-0714;SYRIAC LETTER GAMAL GARSHUNI;Lo;0;AL;;;;;N;;;;;
-0715;SYRIAC LETTER DALATH;Lo;0;AL;;;;;N;;;;;
-0716;SYRIAC LETTER DOTLESS DALATH RISH;Lo;0;AL;;;;;N;;;;;
-0717;SYRIAC LETTER HE;Lo;0;AL;;;;;N;;;;;
-0718;SYRIAC LETTER WAW;Lo;0;AL;;;;;N;;;;;
-0719;SYRIAC LETTER ZAIN;Lo;0;AL;;;;;N;;;;;
-071A;SYRIAC LETTER HETH;Lo;0;AL;;;;;N;;;;;
-071B;SYRIAC LETTER TETH;Lo;0;AL;;;;;N;;;;;
-071C;SYRIAC LETTER TETH GARSHUNI;Lo;0;AL;;;;;N;;;;;
-071D;SYRIAC LETTER YUDH;Lo;0;AL;;;;;N;;;;;
-071E;SYRIAC LETTER YUDH HE;Lo;0;AL;;;;;N;;;;;
-071F;SYRIAC LETTER KAPH;Lo;0;AL;;;;;N;;;;;
-0720;SYRIAC LETTER LAMADH;Lo;0;AL;;;;;N;;;;;
-0721;SYRIAC LETTER MIM;Lo;0;AL;;;;;N;;;;;
-0722;SYRIAC LETTER NUN;Lo;0;AL;;;;;N;;;;;
-0723;SYRIAC LETTER SEMKATH;Lo;0;AL;;;;;N;;;;;
-0724;SYRIAC LETTER FINAL SEMKATH;Lo;0;AL;;;;;N;;;;;
-0725;SYRIAC LETTER E;Lo;0;AL;;;;;N;;;;;
-0726;SYRIAC LETTER PE;Lo;0;AL;;;;;N;;;;;
-0727;SYRIAC LETTER REVERSED PE;Lo;0;AL;;;;;N;;;;;
-0728;SYRIAC LETTER SADHE;Lo;0;AL;;;;;N;;;;;
-0729;SYRIAC LETTER QAPH;Lo;0;AL;;;;;N;;;;;
-072A;SYRIAC LETTER RISH;Lo;0;AL;;;;;N;;;;;
-072B;SYRIAC LETTER SHIN;Lo;0;AL;;;;;N;;;;;
-072C;SYRIAC LETTER TAW;Lo;0;AL;;;;;N;;;;;
-072D;SYRIAC LETTER PERSIAN BHETH;Lo;0;AL;;;;;N;;;;;
-072E;SYRIAC LETTER PERSIAN GHAMAL;Lo;0;AL;;;;;N;;;;;
-072F;SYRIAC LETTER PERSIAN DHALATH;Lo;0;AL;;;;;N;;;;;
-0730;SYRIAC PTHAHA ABOVE;Mn;230;NSM;;;;;N;;;;;
-0731;SYRIAC PTHAHA BELOW;Mn;220;NSM;;;;;N;;;;;
-0732;SYRIAC PTHAHA DOTTED;Mn;230;NSM;;;;;N;;;;;
-0733;SYRIAC ZQAPHA ABOVE;Mn;230;NSM;;;;;N;;;;;
-0734;SYRIAC ZQAPHA BELOW;Mn;220;NSM;;;;;N;;;;;
-0735;SYRIAC ZQAPHA DOTTED;Mn;230;NSM;;;;;N;;;;;
-0736;SYRIAC RBASA ABOVE;Mn;230;NSM;;;;;N;;;;;
-0737;SYRIAC RBASA BELOW;Mn;220;NSM;;;;;N;;;;;
-0738;SYRIAC DOTTED ZLAMA HORIZONTAL;Mn;220;NSM;;;;;N;;;;;
-0739;SYRIAC DOTTED ZLAMA ANGULAR;Mn;220;NSM;;;;;N;;;;;
-073A;SYRIAC HBASA ABOVE;Mn;230;NSM;;;;;N;;;;;
-073B;SYRIAC HBASA BELOW;Mn;220;NSM;;;;;N;;;;;
-073C;SYRIAC HBASA-ESASA DOTTED;Mn;220;NSM;;;;;N;;;;;
-073D;SYRIAC ESASA ABOVE;Mn;230;NSM;;;;;N;;;;;
-073E;SYRIAC ESASA BELOW;Mn;220;NSM;;;;;N;;;;;
-073F;SYRIAC RWAHA;Mn;230;NSM;;;;;N;;;;;
-0740;SYRIAC FEMININE DOT;Mn;230;NSM;;;;;N;;;;;
-0741;SYRIAC QUSHSHAYA;Mn;230;NSM;;;;;N;;;;;
-0742;SYRIAC RUKKAKHA;Mn;220;NSM;;;;;N;;;;;
-0743;SYRIAC TWO VERTICAL DOTS ABOVE;Mn;230;NSM;;;;;N;;;;;
-0744;SYRIAC TWO VERTICAL DOTS BELOW;Mn;220;NSM;;;;;N;;;;;
-0745;SYRIAC THREE DOTS ABOVE;Mn;230;NSM;;;;;N;;;;;
-0746;SYRIAC THREE DOTS BELOW;Mn;220;NSM;;;;;N;;;;;
-0747;SYRIAC OBLIQUE LINE ABOVE;Mn;230;NSM;;;;;N;;;;;
-0748;SYRIAC OBLIQUE LINE BELOW;Mn;220;NSM;;;;;N;;;;;
-0749;SYRIAC MUSIC;Mn;230;NSM;;;;;N;;;;;
-074A;SYRIAC BARREKH;Mn;230;NSM;;;;;N;;;;;
-074D;SYRIAC LETTER SOGDIAN ZHAIN;Lo;0;AL;;;;;N;;;;;
-074E;SYRIAC LETTER SOGDIAN KHAPH;Lo;0;AL;;;;;N;;;;;
-074F;SYRIAC LETTER SOGDIAN FE;Lo;0;AL;;;;;N;;;;;
-0750;ARABIC LETTER BEH WITH THREE DOTS HORIZONTALLY BELOW;Lo;0;AL;;;;;N;;;;;
-0751;ARABIC LETTER BEH WITH DOT BELOW AND THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
-0752;ARABIC LETTER BEH WITH THREE DOTS POINTING UPWARDS BELOW;Lo;0;AL;;;;;N;;;;;
-0753;ARABIC LETTER BEH WITH THREE DOTS POINTING UPWARDS BELOW AND TWO DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
-0754;ARABIC LETTER BEH WITH TWO DOTS BELOW AND DOT ABOVE;Lo;0;AL;;;;;N;;;;;
-0755;ARABIC LETTER BEH WITH INVERTED SMALL V BELOW;Lo;0;AL;;;;;N;;;;;
-0756;ARABIC LETTER BEH WITH SMALL V;Lo;0;AL;;;;;N;;;;;
-0757;ARABIC LETTER HAH WITH TWO DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
-0758;ARABIC LETTER HAH WITH THREE DOTS POINTING UPWARDS BELOW;Lo;0;AL;;;;;N;;;;;
-0759;ARABIC LETTER DAL WITH TWO DOTS VERTICALLY BELOW AND SMALL TAH;Lo;0;AL;;;;;N;;;;;
-075A;ARABIC LETTER DAL WITH INVERTED SMALL V BELOW;Lo;0;AL;;;;;N;;;;;
-075B;ARABIC LETTER REH WITH STROKE;Lo;0;AL;;;;;N;;;;;
-075C;ARABIC LETTER SEEN WITH FOUR DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
-075D;ARABIC LETTER AIN WITH TWO DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
-075E;ARABIC LETTER AIN WITH THREE DOTS POINTING DOWNWARDS ABOVE;Lo;0;AL;;;;;N;;;;;
-075F;ARABIC LETTER AIN WITH TWO DOTS VERTICALLY ABOVE;Lo;0;AL;;;;;N;;;;;
-0760;ARABIC LETTER FEH WITH TWO DOTS BELOW;Lo;0;AL;;;;;N;;;;;
-0761;ARABIC LETTER FEH WITH THREE DOTS POINTING UPWARDS BELOW;Lo;0;AL;;;;;N;;;;;
-0762;ARABIC LETTER KEHEH WITH DOT ABOVE;Lo;0;AL;;;;;N;;;;;
-0763;ARABIC LETTER KEHEH WITH THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
-0764;ARABIC LETTER KEHEH WITH THREE DOTS POINTING UPWARDS BELOW;Lo;0;AL;;;;;N;;;;;
-0765;ARABIC LETTER MEEM WITH DOT ABOVE;Lo;0;AL;;;;;N;;;;;
-0766;ARABIC LETTER MEEM WITH DOT BELOW;Lo;0;AL;;;;;N;;;;;
-0767;ARABIC LETTER NOON WITH TWO DOTS BELOW;Lo;0;AL;;;;;N;;;;;
-0768;ARABIC LETTER NOON WITH SMALL TAH;Lo;0;AL;;;;;N;;;;;
-0769;ARABIC LETTER NOON WITH SMALL V;Lo;0;AL;;;;;N;;;;;
-076A;ARABIC LETTER LAM WITH BAR;Lo;0;AL;;;;;N;;;;;
-076B;ARABIC LETTER REH WITH TWO DOTS VERTICALLY ABOVE;Lo;0;AL;;;;;N;;;;;
-076C;ARABIC LETTER REH WITH HAMZA ABOVE;Lo;0;AL;;;;;N;;;;;
-076D;ARABIC LETTER SEEN WITH TWO DOTS VERTICALLY ABOVE;Lo;0;AL;;;;;N;;;;;
-076E;ARABIC LETTER HAH WITH SMALL ARABIC LETTER TAH BELOW;Lo;0;AL;;;;;N;;;;;
-076F;ARABIC LETTER HAH WITH SMALL ARABIC LETTER TAH AND TWO DOTS;Lo;0;AL;;;;;N;;;;;
-0770;ARABIC LETTER SEEN WITH SMALL ARABIC LETTER TAH AND TWO DOTS;Lo;0;AL;;;;;N;;;;;
-0771;ARABIC LETTER REH WITH SMALL ARABIC LETTER TAH AND TWO DOTS;Lo;0;AL;;;;;N;;;;;
-0772;ARABIC LETTER HAH WITH SMALL ARABIC LETTER TAH ABOVE;Lo;0;AL;;;;;N;;;;;
-0773;ARABIC LETTER ALEF WITH EXTENDED ARABIC-INDIC DIGIT TWO ABOVE;Lo;0;AL;;;;;N;;;;;
-0774;ARABIC LETTER ALEF WITH EXTENDED ARABIC-INDIC DIGIT THREE ABOVE;Lo;0;AL;;;;;N;;;;;
-0775;ARABIC LETTER FARSI YEH WITH EXTENDED ARABIC-INDIC DIGIT TWO ABOVE;Lo;0;AL;;;;;N;;;;;
-0776;ARABIC LETTER FARSI YEH WITH EXTENDED ARABIC-INDIC DIGIT THREE ABOVE;Lo;0;AL;;;;;N;;;;;
-0777;ARABIC LETTER FARSI YEH WITH EXTENDED ARABIC-INDIC DIGIT FOUR BELOW;Lo;0;AL;;;;;N;;;;;
-0778;ARABIC LETTER WAW WITH EXTENDED ARABIC-INDIC DIGIT TWO ABOVE;Lo;0;AL;;;;;N;;;;;
-0779;ARABIC LETTER WAW WITH EXTENDED ARABIC-INDIC DIGIT THREE ABOVE;Lo;0;AL;;;;;N;;;;;
-077A;ARABIC LETTER YEH BARREE WITH EXTENDED ARABIC-INDIC DIGIT TWO ABOVE;Lo;0;AL;;;;;N;;;;;
-077B;ARABIC LETTER YEH BARREE WITH EXTENDED ARABIC-INDIC DIGIT THREE ABOVE;Lo;0;AL;;;;;N;;;;;
-077C;ARABIC LETTER HAH WITH EXTENDED ARABIC-INDIC DIGIT FOUR BELOW;Lo;0;AL;;;;;N;;;;;
-077D;ARABIC LETTER SEEN WITH EXTENDED ARABIC-INDIC DIGIT FOUR ABOVE;Lo;0;AL;;;;;N;;;;;
-077E;ARABIC LETTER SEEN WITH INVERTED V;Lo;0;AL;;;;;N;;;;;
-077F;ARABIC LETTER KAF WITH TWO DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
-0780;THAANA LETTER HAA;Lo;0;AL;;;;;N;;;;;
-0781;THAANA LETTER SHAVIYANI;Lo;0;AL;;;;;N;;;;;
-0782;THAANA LETTER NOONU;Lo;0;AL;;;;;N;;;;;
-0783;THAANA LETTER RAA;Lo;0;AL;;;;;N;;;;;
-0784;THAANA LETTER BAA;Lo;0;AL;;;;;N;;;;;
-0785;THAANA LETTER LHAVIYANI;Lo;0;AL;;;;;N;;;;;
-0786;THAANA LETTER KAAFU;Lo;0;AL;;;;;N;;;;;
-0787;THAANA LETTER ALIFU;Lo;0;AL;;;;;N;;;;;
-0788;THAANA LETTER VAAVU;Lo;0;AL;;;;;N;;;;;
-0789;THAANA LETTER MEEMU;Lo;0;AL;;;;;N;;;;;
-078A;THAANA LETTER FAAFU;Lo;0;AL;;;;;N;;;;;
-078B;THAANA LETTER DHAALU;Lo;0;AL;;;;;N;;;;;
-078C;THAANA LETTER THAA;Lo;0;AL;;;;;N;;;;;
-078D;THAANA LETTER LAAMU;Lo;0;AL;;;;;N;;;;;
-078E;THAANA LETTER GAAFU;Lo;0;AL;;;;;N;;;;;
-078F;THAANA LETTER GNAVIYANI;Lo;0;AL;;;;;N;;;;;
-0790;THAANA LETTER SEENU;Lo;0;AL;;;;;N;;;;;
-0791;THAANA LETTER DAVIYANI;Lo;0;AL;;;;;N;;;;;
-0792;THAANA LETTER ZAVIYANI;Lo;0;AL;;;;;N;;;;;
-0793;THAANA LETTER TAVIYANI;Lo;0;AL;;;;;N;;;;;
-0794;THAANA LETTER YAA;Lo;0;AL;;;;;N;;;;;
-0795;THAANA LETTER PAVIYANI;Lo;0;AL;;;;;N;;;;;
-0796;THAANA LETTER JAVIYANI;Lo;0;AL;;;;;N;;;;;
-0797;THAANA LETTER CHAVIYANI;Lo;0;AL;;;;;N;;;;;
-0798;THAANA LETTER TTAA;Lo;0;AL;;;;;N;;;;;
-0799;THAANA LETTER HHAA;Lo;0;AL;;;;;N;;;;;
-079A;THAANA LETTER KHAA;Lo;0;AL;;;;;N;;;;;
-079B;THAANA LETTER THAALU;Lo;0;AL;;;;;N;;;;;
-079C;THAANA LETTER ZAA;Lo;0;AL;;;;;N;;;;;
-079D;THAANA LETTER SHEENU;Lo;0;AL;;;;;N;;;;;
-079E;THAANA LETTER SAADHU;Lo;0;AL;;;;;N;;;;;
-079F;THAANA LETTER DAADHU;Lo;0;AL;;;;;N;;;;;
-07A0;THAANA LETTER TO;Lo;0;AL;;;;;N;;;;;
-07A1;THAANA LETTER ZO;Lo;0;AL;;;;;N;;;;;
-07A2;THAANA LETTER AINU;Lo;0;AL;;;;;N;;;;;
-07A3;THAANA LETTER GHAINU;Lo;0;AL;;;;;N;;;;;
-07A4;THAANA LETTER QAAFU;Lo;0;AL;;;;;N;;;;;
-07A5;THAANA LETTER WAAVU;Lo;0;AL;;;;;N;;;;;
-07A6;THAANA ABAFILI;Mn;0;NSM;;;;;N;;;;;
-07A7;THAANA AABAAFILI;Mn;0;NSM;;;;;N;;;;;
-07A8;THAANA IBIFILI;Mn;0;NSM;;;;;N;;;;;
-07A9;THAANA EEBEEFILI;Mn;0;NSM;;;;;N;;;;;
-07AA;THAANA UBUFILI;Mn;0;NSM;;;;;N;;;;;
-07AB;THAANA OOBOOFILI;Mn;0;NSM;;;;;N;;;;;
-07AC;THAANA EBEFILI;Mn;0;NSM;;;;;N;;;;;
-07AD;THAANA EYBEYFILI;Mn;0;NSM;;;;;N;;;;;
-07AE;THAANA OBOFILI;Mn;0;NSM;;;;;N;;;;;
-07AF;THAANA OABOAFILI;Mn;0;NSM;;;;;N;;;;;
-07B0;THAANA SUKUN;Mn;0;NSM;;;;;N;;;;;
-07B1;THAANA LETTER NAA;Lo;0;AL;;;;;N;;;;;
-07C0;NKO DIGIT ZERO;Nd;0;R;;0;0;0;N;;;;;
-07C1;NKO DIGIT ONE;Nd;0;R;;1;1;1;N;;;;;
-07C2;NKO DIGIT TWO;Nd;0;R;;2;2;2;N;;;;;
-07C3;NKO DIGIT THREE;Nd;0;R;;3;3;3;N;;;;;
-07C4;NKO DIGIT FOUR;Nd;0;R;;4;4;4;N;;;;;
-07C5;NKO DIGIT FIVE;Nd;0;R;;5;5;5;N;;;;;
-07C6;NKO DIGIT SIX;Nd;0;R;;6;6;6;N;;;;;
-07C7;NKO DIGIT SEVEN;Nd;0;R;;7;7;7;N;;;;;
-07C8;NKO DIGIT EIGHT;Nd;0;R;;8;8;8;N;;;;;
-07C9;NKO DIGIT NINE;Nd;0;R;;9;9;9;N;;;;;
-07CA;NKO LETTER A;Lo;0;R;;;;;N;;;;;
-07CB;NKO LETTER EE;Lo;0;R;;;;;N;;;;;
-07CC;NKO LETTER I;Lo;0;R;;;;;N;;;;;
-07CD;NKO LETTER E;Lo;0;R;;;;;N;;;;;
-07CE;NKO LETTER U;Lo;0;R;;;;;N;;;;;
-07CF;NKO LETTER OO;Lo;0;R;;;;;N;;;;;
-07D0;NKO LETTER O;Lo;0;R;;;;;N;;;;;
-07D1;NKO LETTER DAGBASINNA;Lo;0;R;;;;;N;;;;;
-07D2;NKO LETTER N;Lo;0;R;;;;;N;;;;;
-07D3;NKO LETTER BA;Lo;0;R;;;;;N;;;;;
-07D4;NKO LETTER PA;Lo;0;R;;;;;N;;;;;
-07D5;NKO LETTER TA;Lo;0;R;;;;;N;;;;;
-07D6;NKO LETTER JA;Lo;0;R;;;;;N;;;;;
-07D7;NKO LETTER CHA;Lo;0;R;;;;;N;;;;;
-07D8;NKO LETTER DA;Lo;0;R;;;;;N;;;;;
-07D9;NKO LETTER RA;Lo;0;R;;;;;N;;;;;
-07DA;NKO LETTER RRA;Lo;0;R;;;;;N;;;;;
-07DB;NKO LETTER SA;Lo;0;R;;;;;N;;;;;
-07DC;NKO LETTER GBA;Lo;0;R;;;;;N;;;;;
-07DD;NKO LETTER FA;Lo;0;R;;;;;N;;;;;
-07DE;NKO LETTER KA;Lo;0;R;;;;;N;;;;;
-07DF;NKO LETTER LA;Lo;0;R;;;;;N;;;;;
-07E0;NKO LETTER NA WOLOSO;Lo;0;R;;;;;N;;;;;
-07E1;NKO LETTER MA;Lo;0;R;;;;;N;;;;;
-07E2;NKO LETTER NYA;Lo;0;R;;;;;N;;;;;
-07E3;NKO LETTER NA;Lo;0;R;;;;;N;;;;;
-07E4;NKO LETTER HA;Lo;0;R;;;;;N;;;;;
-07E5;NKO LETTER WA;Lo;0;R;;;;;N;;;;;
-07E6;NKO LETTER YA;Lo;0;R;;;;;N;;;;;
-07E7;NKO LETTER NYA WOLOSO;Lo;0;R;;;;;N;;;;;
-07E8;NKO LETTER JONA JA;Lo;0;R;;;;;N;;;;;
-07E9;NKO LETTER JONA CHA;Lo;0;R;;;;;N;;;;;
-07EA;NKO LETTER JONA RA;Lo;0;R;;;;;N;;;;;
-07EB;NKO COMBINING SHORT HIGH TONE;Mn;230;NSM;;;;;N;;;;;
-07EC;NKO COMBINING SHORT LOW TONE;Mn;230;NSM;;;;;N;;;;;
-07ED;NKO COMBINING SHORT RISING TONE;Mn;230;NSM;;;;;N;;;;;
-07EE;NKO COMBINING LONG DESCENDING TONE;Mn;230;NSM;;;;;N;;;;;
-07EF;NKO COMBINING LONG HIGH TONE;Mn;230;NSM;;;;;N;;;;;
-07F0;NKO COMBINING LONG LOW TONE;Mn;230;NSM;;;;;N;;;;;
-07F1;NKO COMBINING LONG RISING TONE;Mn;230;NSM;;;;;N;;;;;
-07F2;NKO COMBINING NASALIZATION MARK;Mn;220;NSM;;;;;N;;;;;
-07F3;NKO COMBINING DOUBLE DOT ABOVE;Mn;230;NSM;;;;;N;;;;;
-07F4;NKO HIGH TONE APOSTROPHE;Lm;0;R;;;;;N;;;;;
-07F5;NKO LOW TONE APOSTROPHE;Lm;0;R;;;;;N;;;;;
-07F6;NKO SYMBOL OO DENNEN;So;0;ON;;;;;N;;;;;
-07F7;NKO SYMBOL GBAKURUNEN;Po;0;ON;;;;;N;;;;;
-07F8;NKO COMMA;Po;0;ON;;;;;N;;;;;
-07F9;NKO EXCLAMATION MARK;Po;0;ON;;;;;N;;;;;
-07FA;NKO LAJANYALAN;Lm;0;R;;;;;N;;;;;
-0901;DEVANAGARI SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
-0902;DEVANAGARI SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
-0903;DEVANAGARI SIGN VISARGA;Mc;0;L;;;;;N;;;;;
-0904;DEVANAGARI LETTER SHORT A;Lo;0;L;;;;;N;;;;;
-0905;DEVANAGARI LETTER A;Lo;0;L;;;;;N;;;;;
-0906;DEVANAGARI LETTER AA;Lo;0;L;;;;;N;;;;;
-0907;DEVANAGARI LETTER I;Lo;0;L;;;;;N;;;;;
-0908;DEVANAGARI LETTER II;Lo;0;L;;;;;N;;;;;
-0909;DEVANAGARI LETTER U;Lo;0;L;;;;;N;;;;;
-090A;DEVANAGARI LETTER UU;Lo;0;L;;;;;N;;;;;
-090B;DEVANAGARI LETTER VOCALIC R;Lo;0;L;;;;;N;;;;;
-090C;DEVANAGARI LETTER VOCALIC L;Lo;0;L;;;;;N;;;;;
-090D;DEVANAGARI LETTER CANDRA E;Lo;0;L;;;;;N;;;;;
-090E;DEVANAGARI LETTER SHORT E;Lo;0;L;;;;;N;;;;;
-090F;DEVANAGARI LETTER E;Lo;0;L;;;;;N;;;;;
-0910;DEVANAGARI LETTER AI;Lo;0;L;;;;;N;;;;;
-0911;DEVANAGARI LETTER CANDRA O;Lo;0;L;;;;;N;;;;;
-0912;DEVANAGARI LETTER SHORT O;Lo;0;L;;;;;N;;;;;
-0913;DEVANAGARI LETTER O;Lo;0;L;;;;;N;;;;;
-0914;DEVANAGARI LETTER AU;Lo;0;L;;;;;N;;;;;
-0915;DEVANAGARI LETTER KA;Lo;0;L;;;;;N;;;;;
-0916;DEVANAGARI LETTER KHA;Lo;0;L;;;;;N;;;;;
-0917;DEVANAGARI LETTER GA;Lo;0;L;;;;;N;;;;;
-0918;DEVANAGARI LETTER GHA;Lo;0;L;;;;;N;;;;;
-0919;DEVANAGARI LETTER NGA;Lo;0;L;;;;;N;;;;;
-091A;DEVANAGARI LETTER CA;Lo;0;L;;;;;N;;;;;
-091B;DEVANAGARI LETTER CHA;Lo;0;L;;;;;N;;;;;
-091C;DEVANAGARI LETTER JA;Lo;0;L;;;;;N;;;;;
-091D;DEVANAGARI LETTER JHA;Lo;0;L;;;;;N;;;;;
-091E;DEVANAGARI LETTER NYA;Lo;0;L;;;;;N;;;;;
-091F;DEVANAGARI LETTER TTA;Lo;0;L;;;;;N;;;;;
-0920;DEVANAGARI LETTER TTHA;Lo;0;L;;;;;N;;;;;
-0921;DEVANAGARI LETTER DDA;Lo;0;L;;;;;N;;;;;
-0922;DEVANAGARI LETTER DDHA;Lo;0;L;;;;;N;;;;;
-0923;DEVANAGARI LETTER NNA;Lo;0;L;;;;;N;;;;;
-0924;DEVANAGARI LETTER TA;Lo;0;L;;;;;N;;;;;
-0925;DEVANAGARI LETTER THA;Lo;0;L;;;;;N;;;;;
-0926;DEVANAGARI LETTER DA;Lo;0;L;;;;;N;;;;;
-0927;DEVANAGARI LETTER DHA;Lo;0;L;;;;;N;;;;;
-0928;DEVANAGARI LETTER NA;Lo;0;L;;;;;N;;;;;
-0929;DEVANAGARI LETTER NNNA;Lo;0;L;0928 093C;;;;N;;;;;
-092A;DEVANAGARI LETTER PA;Lo;0;L;;;;;N;;;;;
-092B;DEVANAGARI LETTER PHA;Lo;0;L;;;;;N;;;;;
-092C;DEVANAGARI LETTER BA;Lo;0;L;;;;;N;;;;;
-092D;DEVANAGARI LETTER BHA;Lo;0;L;;;;;N;;;;;
-092E;DEVANAGARI LETTER MA;Lo;0;L;;;;;N;;;;;
-092F;DEVANAGARI LETTER YA;Lo;0;L;;;;;N;;;;;
-0930;DEVANAGARI LETTER RA;Lo;0;L;;;;;N;;;;;
-0931;DEVANAGARI LETTER RRA;Lo;0;L;0930 093C;;;;N;;;;;
-0932;DEVANAGARI LETTER LA;Lo;0;L;;;;;N;;;;;
-0933;DEVANAGARI LETTER LLA;Lo;0;L;;;;;N;;;;;
-0934;DEVANAGARI LETTER LLLA;Lo;0;L;0933 093C;;;;N;;;;;
-0935;DEVANAGARI LETTER VA;Lo;0;L;;;;;N;;;;;
-0936;DEVANAGARI LETTER SHA;Lo;0;L;;;;;N;;;;;
-0937;DEVANAGARI LETTER SSA;Lo;0;L;;;;;N;;;;;
-0938;DEVANAGARI LETTER SA;Lo;0;L;;;;;N;;;;;
-0939;DEVANAGARI LETTER HA;Lo;0;L;;;;;N;;;;;
-093C;DEVANAGARI SIGN NUKTA;Mn;7;NSM;;;;;N;;;;;
-093D;DEVANAGARI SIGN AVAGRAHA;Lo;0;L;;;;;N;;;;;
-093E;DEVANAGARI VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
-093F;DEVANAGARI VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
-0940;DEVANAGARI VOWEL SIGN II;Mc;0;L;;;;;N;;;;;
-0941;DEVANAGARI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
-0942;DEVANAGARI VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
-0943;DEVANAGARI VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;;
-0944;DEVANAGARI VOWEL SIGN VOCALIC RR;Mn;0;NSM;;;;;N;;;;;
-0945;DEVANAGARI VOWEL SIGN CANDRA E;Mn;0;NSM;;;;;N;;;;;
-0946;DEVANAGARI VOWEL SIGN SHORT E;Mn;0;NSM;;;;;N;;;;;
-0947;DEVANAGARI VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
-0948;DEVANAGARI VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;;
-0949;DEVANAGARI VOWEL SIGN CANDRA O;Mc;0;L;;;;;N;;;;;
-094A;DEVANAGARI VOWEL SIGN SHORT O;Mc;0;L;;;;;N;;;;;
-094B;DEVANAGARI VOWEL SIGN O;Mc;0;L;;;;;N;;;;;
-094C;DEVANAGARI VOWEL SIGN AU;Mc;0;L;;;;;N;;;;;
-094D;DEVANAGARI SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
-0950;DEVANAGARI OM;Lo;0;L;;;;;N;;;;;
-0951;DEVANAGARI STRESS SIGN UDATTA;Mn;230;NSM;;;;;N;;;;;
-0952;DEVANAGARI STRESS SIGN ANUDATTA;Mn;220;NSM;;;;;N;;;;;
-0953;DEVANAGARI GRAVE ACCENT;Mn;230;NSM;;;;;N;;;;;
-0954;DEVANAGARI ACUTE ACCENT;Mn;230;NSM;;;;;N;;;;;
-0958;DEVANAGARI LETTER QA;Lo;0;L;0915 093C;;;;N;;;;;
-0959;DEVANAGARI LETTER KHHA;Lo;0;L;0916 093C;;;;N;;;;;
-095A;DEVANAGARI LETTER GHHA;Lo;0;L;0917 093C;;;;N;;;;;
-095B;DEVANAGARI LETTER ZA;Lo;0;L;091C 093C;;;;N;;;;;
-095C;DEVANAGARI LETTER DDDHA;Lo;0;L;0921 093C;;;;N;;;;;
-095D;DEVANAGARI LETTER RHA;Lo;0;L;0922 093C;;;;N;;;;;
-095E;DEVANAGARI LETTER FA;Lo;0;L;092B 093C;;;;N;;;;;
-095F;DEVANAGARI LETTER YYA;Lo;0;L;092F 093C;;;;N;;;;;
-0960;DEVANAGARI LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;;
-0961;DEVANAGARI LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;;
-0962;DEVANAGARI VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;;
-0963;DEVANAGARI VOWEL SIGN VOCALIC LL;Mn;0;NSM;;;;;N;;;;;
-0964;DEVANAGARI DANDA;Po;0;L;;;;;N;;;;;
-0965;DEVANAGARI DOUBLE DANDA;Po;0;L;;;;;N;;;;;
-0966;DEVANAGARI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
-0967;DEVANAGARI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
-0968;DEVANAGARI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
-0969;DEVANAGARI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
-096A;DEVANAGARI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
-096B;DEVANAGARI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
-096C;DEVANAGARI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
-096D;DEVANAGARI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
-096E;DEVANAGARI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
-096F;DEVANAGARI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
-0970;DEVANAGARI ABBREVIATION SIGN;Po;0;L;;;;;N;;;;;
-0971;DEVANAGARI SIGN HIGH SPACING DOT;Lm;0;L;;;;;N;;;;;
-0972;DEVANAGARI LETTER CANDRA A;Lo;0;L;;;;;N;;;;;
-097B;DEVANAGARI LETTER GGA;Lo;0;L;;;;;N;;;;;
-097C;DEVANAGARI LETTER JJA;Lo;0;L;;;;;N;;;;;
-097D;DEVANAGARI LETTER GLOTTAL STOP;Lo;0;L;;;;;N;;;;;
-097E;DEVANAGARI LETTER DDDA;Lo;0;L;;;;;N;;;;;
-097F;DEVANAGARI LETTER BBA;Lo;0;L;;;;;N;;;;;
-0981;BENGALI SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
-0982;BENGALI SIGN ANUSVARA;Mc;0;L;;;;;N;;;;;
-0983;BENGALI SIGN VISARGA;Mc;0;L;;;;;N;;;;;
-0985;BENGALI LETTER A;Lo;0;L;;;;;N;;;;;
-0986;BENGALI LETTER AA;Lo;0;L;;;;;N;;;;;
-0987;BENGALI LETTER I;Lo;0;L;;;;;N;;;;;
-0988;BENGALI LETTER II;Lo;0;L;;;;;N;;;;;
-0989;BENGALI LETTER U;Lo;0;L;;;;;N;;;;;
-098A;BENGALI LETTER UU;Lo;0;L;;;;;N;;;;;
-098B;BENGALI LETTER VOCALIC R;Lo;0;L;;;;;N;;;;;
-098C;BENGALI LETTER VOCALIC L;Lo;0;L;;;;;N;;;;;
-098F;BENGALI LETTER E;Lo;0;L;;;;;N;;;;;
-0990;BENGALI LETTER AI;Lo;0;L;;;;;N;;;;;
-0993;BENGALI LETTER O;Lo;0;L;;;;;N;;;;;
-0994;BENGALI LETTER AU;Lo;0;L;;;;;N;;;;;
-0995;BENGALI LETTER KA;Lo;0;L;;;;;N;;;;;
-0996;BENGALI LETTER KHA;Lo;0;L;;;;;N;;;;;
-0997;BENGALI LETTER GA;Lo;0;L;;;;;N;;;;;
-0998;BENGALI LETTER GHA;Lo;0;L;;;;;N;;;;;
-0999;BENGALI LETTER NGA;Lo;0;L;;;;;N;;;;;
-099A;BENGALI LETTER CA;Lo;0;L;;;;;N;;;;;
-099B;BENGALI LETTER CHA;Lo;0;L;;;;;N;;;;;
-099C;BENGALI LETTER JA;Lo;0;L;;;;;N;;;;;
-099D;BENGALI LETTER JHA;Lo;0;L;;;;;N;;;;;
-099E;BENGALI LETTER NYA;Lo;0;L;;;;;N;;;;;
-099F;BENGALI LETTER TTA;Lo;0;L;;;;;N;;;;;
-09A0;BENGALI LETTER TTHA;Lo;0;L;;;;;N;;;;;
-09A1;BENGALI LETTER DDA;Lo;0;L;;;;;N;;;;;
-09A2;BENGALI LETTER DDHA;Lo;0;L;;;;;N;;;;;
-09A3;BENGALI LETTER NNA;Lo;0;L;;;;;N;;;;;
-09A4;BENGALI LETTER TA;Lo;0;L;;;;;N;;;;;
-09A5;BENGALI LETTER THA;Lo;0;L;;;;;N;;;;;
-09A6;BENGALI LETTER DA;Lo;0;L;;;;;N;;;;;
-09A7;BENGALI LETTER DHA;Lo;0;L;;;;;N;;;;;
-09A8;BENGALI LETTER NA;Lo;0;L;;;;;N;;;;;
-09AA;BENGALI LETTER PA;Lo;0;L;;;;;N;;;;;
-09AB;BENGALI LETTER PHA;Lo;0;L;;;;;N;;;;;
-09AC;BENGALI LETTER BA;Lo;0;L;;;;;N;;;;;
-09AD;BENGALI LETTER BHA;Lo;0;L;;;;;N;;;;;
-09AE;BENGALI LETTER MA;Lo;0;L;;;;;N;;;;;
-09AF;BENGALI LETTER YA;Lo;0;L;;;;;N;;;;;
-09B0;BENGALI LETTER RA;Lo;0;L;;;;;N;;;;;
-09B2;BENGALI LETTER LA;Lo;0;L;;;;;N;;;;;
-09B6;BENGALI LETTER SHA;Lo;0;L;;;;;N;;;;;
-09B7;BENGALI LETTER SSA;Lo;0;L;;;;;N;;;;;
-09B8;BENGALI LETTER SA;Lo;0;L;;;;;N;;;;;
-09B9;BENGALI LETTER HA;Lo;0;L;;;;;N;;;;;
-09BC;BENGALI SIGN NUKTA;Mn;7;NSM;;;;;N;;;;;
-09BD;BENGALI SIGN AVAGRAHA;Lo;0;L;;;;;N;;;;;
-09BE;BENGALI VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
-09BF;BENGALI VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
-09C0;BENGALI VOWEL SIGN II;Mc;0;L;;;;;N;;;;;
-09C1;BENGALI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
-09C2;BENGALI VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
-09C3;BENGALI VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;;
-09C4;BENGALI VOWEL SIGN VOCALIC RR;Mn;0;NSM;;;;;N;;;;;
-09C7;BENGALI VOWEL SIGN E;Mc;0;L;;;;;N;;;;;
-09C8;BENGALI VOWEL SIGN AI;Mc;0;L;;;;;N;;;;;
-09CB;BENGALI VOWEL SIGN O;Mc;0;L;09C7 09BE;;;;N;;;;;
-09CC;BENGALI VOWEL SIGN AU;Mc;0;L;09C7 09D7;;;;N;;;;;
-09CD;BENGALI SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
-09CE;BENGALI LETTER KHANDA TA;Lo;0;L;;;;;N;;;;;
-09D7;BENGALI AU LENGTH MARK;Mc;0;L;;;;;N;;;;;
-09DC;BENGALI LETTER RRA;Lo;0;L;09A1 09BC;;;;N;;;;;
-09DD;BENGALI LETTER RHA;Lo;0;L;09A2 09BC;;;;N;;;;;
-09DF;BENGALI LETTER YYA;Lo;0;L;09AF 09BC;;;;N;;;;;
-09E0;BENGALI LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;;
-09E1;BENGALI LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;;
-09E2;BENGALI VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;;
-09E3;BENGALI VOWEL SIGN VOCALIC LL;Mn;0;NSM;;;;;N;;;;;
-09E6;BENGALI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
-09E7;BENGALI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
-09E8;BENGALI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
-09E9;BENGALI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
-09EA;BENGALI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
-09EB;BENGALI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
-09EC;BENGALI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
-09ED;BENGALI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
-09EE;BENGALI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
-09EF;BENGALI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
-09F0;BENGALI LETTER RA WITH MIDDLE DIAGONAL;Lo;0;L;;;;;N;;Assamese;;;
-09F1;BENGALI LETTER RA WITH LOWER DIAGONAL;Lo;0;L;;;;;N;BENGALI LETTER VA WITH LOWER DIAGONAL;Assamese;;;
-09F2;BENGALI RUPEE MARK;Sc;0;ET;;;;;N;;;;;
-09F3;BENGALI RUPEE SIGN;Sc;0;ET;;;;;N;;;;;
-09F4;BENGALI CURRENCY NUMERATOR ONE;No;0;L;;;;1;N;;;;;
-09F5;BENGALI CURRENCY NUMERATOR TWO;No;0;L;;;;2;N;;;;;
-09F6;BENGALI CURRENCY NUMERATOR THREE;No;0;L;;;;3;N;;;;;
-09F7;BENGALI CURRENCY NUMERATOR FOUR;No;0;L;;;;4;N;;;;;
-09F8;BENGALI CURRENCY NUMERATOR ONE LESS THAN THE DENOMINATOR;No;0;L;;;;;N;;;;;
-09F9;BENGALI CURRENCY DENOMINATOR SIXTEEN;No;0;L;;;;16;N;;;;;
-09FA;BENGALI ISSHAR;So;0;L;;;;;N;;;;;
-0A01;GURMUKHI SIGN ADAK BINDI;Mn;0;NSM;;;;;N;;;;;
-0A02;GURMUKHI SIGN BINDI;Mn;0;NSM;;;;;N;;;;;
-0A03;GURMUKHI SIGN VISARGA;Mc;0;L;;;;;N;;;;;
-0A05;GURMUKHI LETTER A;Lo;0;L;;;;;N;;;;;
-0A06;GURMUKHI LETTER AA;Lo;0;L;;;;;N;;;;;
-0A07;GURMUKHI LETTER I;Lo;0;L;;;;;N;;;;;
-0A08;GURMUKHI LETTER II;Lo;0;L;;;;;N;;;;;
-0A09;GURMUKHI LETTER U;Lo;0;L;;;;;N;;;;;
-0A0A;GURMUKHI LETTER UU;Lo;0;L;;;;;N;;;;;
-0A0F;GURMUKHI LETTER EE;Lo;0;L;;;;;N;;;;;
-0A10;GURMUKHI LETTER AI;Lo;0;L;;;;;N;;;;;
-0A13;GURMUKHI LETTER OO;Lo;0;L;;;;;N;;;;;
-0A14;GURMUKHI LETTER AU;Lo;0;L;;;;;N;;;;;
-0A15;GURMUKHI LETTER KA;Lo;0;L;;;;;N;;;;;
-0A16;GURMUKHI LETTER KHA;Lo;0;L;;;;;N;;;;;
-0A17;GURMUKHI LETTER GA;Lo;0;L;;;;;N;;;;;
-0A18;GURMUKHI LETTER GHA;Lo;0;L;;;;;N;;;;;
-0A19;GURMUKHI LETTER NGA;Lo;0;L;;;;;N;;;;;
-0A1A;GURMUKHI LETTER CA;Lo;0;L;;;;;N;;;;;
-0A1B;GURMUKHI LETTER CHA;Lo;0;L;;;;;N;;;;;
-0A1C;GURMUKHI LETTER JA;Lo;0;L;;;;;N;;;;;
-0A1D;GURMUKHI LETTER JHA;Lo;0;L;;;;;N;;;;;
-0A1E;GURMUKHI LETTER NYA;Lo;0;L;;;;;N;;;;;
-0A1F;GURMUKHI LETTER TTA;Lo;0;L;;;;;N;;;;;
-0A20;GURMUKHI LETTER TTHA;Lo;0;L;;;;;N;;;;;
-0A21;GURMUKHI LETTER DDA;Lo;0;L;;;;;N;;;;;
-0A22;GURMUKHI LETTER DDHA;Lo;0;L;;;;;N;;;;;
-0A23;GURMUKHI LETTER NNA;Lo;0;L;;;;;N;;;;;
-0A24;GURMUKHI LETTER TA;Lo;0;L;;;;;N;;;;;
-0A25;GURMUKHI LETTER THA;Lo;0;L;;;;;N;;;;;
-0A26;GURMUKHI LETTER DA;Lo;0;L;;;;;N;;;;;
-0A27;GURMUKHI LETTER DHA;Lo;0;L;;;;;N;;;;;
-0A28;GURMUKHI LETTER NA;Lo;0;L;;;;;N;;;;;
-0A2A;GURMUKHI LETTER PA;Lo;0;L;;;;;N;;;;;
-0A2B;GURMUKHI LETTER PHA;Lo;0;L;;;;;N;;;;;
-0A2C;GURMUKHI LETTER BA;Lo;0;L;;;;;N;;;;;
-0A2D;GURMUKHI LETTER BHA;Lo;0;L;;;;;N;;;;;
-0A2E;GURMUKHI LETTER MA;Lo;0;L;;;;;N;;;;;
-0A2F;GURMUKHI LETTER YA;Lo;0;L;;;;;N;;;;;
-0A30;GURMUKHI LETTER RA;Lo;0;L;;;;;N;;;;;
-0A32;GURMUKHI LETTER LA;Lo;0;L;;;;;N;;;;;
-0A33;GURMUKHI LETTER LLA;Lo;0;L;0A32 0A3C;;;;N;;;;;
-0A35;GURMUKHI LETTER VA;Lo;0;L;;;;;N;;;;;
-0A36;GURMUKHI LETTER SHA;Lo;0;L;0A38 0A3C;;;;N;;;;;
-0A38;GURMUKHI LETTER SA;Lo;0;L;;;;;N;;;;;
-0A39;GURMUKHI LETTER HA;Lo;0;L;;;;;N;;;;;
-0A3C;GURMUKHI SIGN NUKTA;Mn;7;NSM;;;;;N;;;;;
-0A3E;GURMUKHI VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
-0A3F;GURMUKHI VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
-0A40;GURMUKHI VOWEL SIGN II;Mc;0;L;;;;;N;;;;;
-0A41;GURMUKHI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
-0A42;GURMUKHI VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
-0A47;GURMUKHI VOWEL SIGN EE;Mn;0;NSM;;;;;N;;;;;
-0A48;GURMUKHI VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;;
-0A4B;GURMUKHI VOWEL SIGN OO;Mn;0;NSM;;;;;N;;;;;
-0A4C;GURMUKHI VOWEL SIGN AU;Mn;0;NSM;;;;;N;;;;;
-0A4D;GURMUKHI SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
-0A51;GURMUKHI SIGN UDAAT;Mn;0;NSM;;;;;N;;;;;
-0A59;GURMUKHI LETTER KHHA;Lo;0;L;0A16 0A3C;;;;N;;;;;
-0A5A;GURMUKHI LETTER GHHA;Lo;0;L;0A17 0A3C;;;;N;;;;;
-0A5B;GURMUKHI LETTER ZA;Lo;0;L;0A1C 0A3C;;;;N;;;;;
-0A5C;GURMUKHI LETTER RRA;Lo;0;L;;;;;N;;;;;
-0A5E;GURMUKHI LETTER FA;Lo;0;L;0A2B 0A3C;;;;N;;;;;
-0A66;GURMUKHI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
-0A67;GURMUKHI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
-0A68;GURMUKHI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
-0A69;GURMUKHI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
-0A6A;GURMUKHI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
-0A6B;GURMUKHI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
-0A6C;GURMUKHI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
-0A6D;GURMUKHI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
-0A6E;GURMUKHI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
-0A6F;GURMUKHI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
-0A70;GURMUKHI TIPPI;Mn;0;NSM;;;;;N;;;;;
-0A71;GURMUKHI ADDAK;Mn;0;NSM;;;;;N;;;;;
-0A72;GURMUKHI IRI;Lo;0;L;;;;;N;;;;;
-0A73;GURMUKHI URA;Lo;0;L;;;;;N;;;;;
-0A74;GURMUKHI EK ONKAR;Lo;0;L;;;;;N;;;;;
-0A75;GURMUKHI SIGN YAKASH;Mn;0;NSM;;;;;N;;;;;
-0A81;GUJARATI SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
-0A82;GUJARATI SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
-0A83;GUJARATI SIGN VISARGA;Mc;0;L;;;;;N;;;;;
-0A85;GUJARATI LETTER A;Lo;0;L;;;;;N;;;;;
-0A86;GUJARATI LETTER AA;Lo;0;L;;;;;N;;;;;
-0A87;GUJARATI LETTER I;Lo;0;L;;;;;N;;;;;
-0A88;GUJARATI LETTER II;Lo;0;L;;;;;N;;;;;
-0A89;GUJARATI LETTER U;Lo;0;L;;;;;N;;;;;
-0A8A;GUJARATI LETTER UU;Lo;0;L;;;;;N;;;;;
-0A8B;GUJARATI LETTER VOCALIC R;Lo;0;L;;;;;N;;;;;
-0A8C;GUJARATI LETTER VOCALIC L;Lo;0;L;;;;;N;;;;;
-0A8D;GUJARATI VOWEL CANDRA E;Lo;0;L;;;;;N;;;;;
-0A8F;GUJARATI LETTER E;Lo;0;L;;;;;N;;;;;
-0A90;GUJARATI LETTER AI;Lo;0;L;;;;;N;;;;;
-0A91;GUJARATI VOWEL CANDRA O;Lo;0;L;;;;;N;;;;;
-0A93;GUJARATI LETTER O;Lo;0;L;;;;;N;;;;;
-0A94;GUJARATI LETTER AU;Lo;0;L;;;;;N;;;;;
-0A95;GUJARATI LETTER KA;Lo;0;L;;;;;N;;;;;
-0A96;GUJARATI LETTER KHA;Lo;0;L;;;;;N;;;;;
-0A97;GUJARATI LETTER GA;Lo;0;L;;;;;N;;;;;
-0A98;GUJARATI LETTER GHA;Lo;0;L;;;;;N;;;;;
-0A99;GUJARATI LETTER NGA;Lo;0;L;;;;;N;;;;;
-0A9A;GUJARATI LETTER CA;Lo;0;L;;;;;N;;;;;
-0A9B;GUJARATI LETTER CHA;Lo;0;L;;;;;N;;;;;
-0A9C;GUJARATI LETTER JA;Lo;0;L;;;;;N;;;;;
-0A9D;GUJARATI LETTER JHA;Lo;0;L;;;;;N;;;;;
-0A9E;GUJARATI LETTER NYA;Lo;0;L;;;;;N;;;;;
-0A9F;GUJARATI LETTER TTA;Lo;0;L;;;;;N;;;;;
-0AA0;GUJARATI LETTER TTHA;Lo;0;L;;;;;N;;;;;
-0AA1;GUJARATI LETTER DDA;Lo;0;L;;;;;N;;;;;
-0AA2;GUJARATI LETTER DDHA;Lo;0;L;;;;;N;;;;;
-0AA3;GUJARATI LETTER NNA;Lo;0;L;;;;;N;;;;;
-0AA4;GUJARATI LETTER TA;Lo;0;L;;;;;N;;;;;
-0AA5;GUJARATI LETTER THA;Lo;0;L;;;;;N;;;;;
-0AA6;GUJARATI LETTER DA;Lo;0;L;;;;;N;;;;;
-0AA7;GUJARATI LETTER DHA;Lo;0;L;;;;;N;;;;;
-0AA8;GUJARATI LETTER NA;Lo;0;L;;;;;N;;;;;
-0AAA;GUJARATI LETTER PA;Lo;0;L;;;;;N;;;;;
-0AAB;GUJARATI LETTER PHA;Lo;0;L;;;;;N;;;;;
-0AAC;GUJARATI LETTER BA;Lo;0;L;;;;;N;;;;;
-0AAD;GUJARATI LETTER BHA;Lo;0;L;;;;;N;;;;;
-0AAE;GUJARATI LETTER MA;Lo;0;L;;;;;N;;;;;
-0AAF;GUJARATI LETTER YA;Lo;0;L;;;;;N;;;;;
-0AB0;GUJARATI LETTER RA;Lo;0;L;;;;;N;;;;;
-0AB2;GUJARATI LETTER LA;Lo;0;L;;;;;N;;;;;
-0AB3;GUJARATI LETTER LLA;Lo;0;L;;;;;N;;;;;
-0AB5;GUJARATI LETTER VA;Lo;0;L;;;;;N;;;;;
-0AB6;GUJARATI LETTER SHA;Lo;0;L;;;;;N;;;;;
-0AB7;GUJARATI LETTER SSA;Lo;0;L;;;;;N;;;;;
-0AB8;GUJARATI LETTER SA;Lo;0;L;;;;;N;;;;;
-0AB9;GUJARATI LETTER HA;Lo;0;L;;;;;N;;;;;
-0ABC;GUJARATI SIGN NUKTA;Mn;7;NSM;;;;;N;;;;;
-0ABD;GUJARATI SIGN AVAGRAHA;Lo;0;L;;;;;N;;;;;
-0ABE;GUJARATI VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
-0ABF;GUJARATI VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
-0AC0;GUJARATI VOWEL SIGN II;Mc;0;L;;;;;N;;;;;
-0AC1;GUJARATI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
-0AC2;GUJARATI VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
-0AC3;GUJARATI VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;;
-0AC4;GUJARATI VOWEL SIGN VOCALIC RR;Mn;0;NSM;;;;;N;;;;;
-0AC5;GUJARATI VOWEL SIGN CANDRA E;Mn;0;NSM;;;;;N;;;;;
-0AC7;GUJARATI VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
-0AC8;GUJARATI VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;;
-0AC9;GUJARATI VOWEL SIGN CANDRA O;Mc;0;L;;;;;N;;;;;
-0ACB;GUJARATI VOWEL SIGN O;Mc;0;L;;;;;N;;;;;
-0ACC;GUJARATI VOWEL SIGN AU;Mc;0;L;;;;;N;;;;;
-0ACD;GUJARATI SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
-0AD0;GUJARATI OM;Lo;0;L;;;;;N;;;;;
-0AE0;GUJARATI LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;;
-0AE1;GUJARATI LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;;
-0AE2;GUJARATI VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;;
-0AE3;GUJARATI VOWEL SIGN VOCALIC LL;Mn;0;NSM;;;;;N;;;;;
-0AE6;GUJARATI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
-0AE7;GUJARATI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
-0AE8;GUJARATI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
-0AE9;GUJARATI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
-0AEA;GUJARATI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
-0AEB;GUJARATI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
-0AEC;GUJARATI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
-0AED;GUJARATI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
-0AEE;GUJARATI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
-0AEF;GUJARATI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
-0AF1;GUJARATI RUPEE SIGN;Sc;0;ET;;;;;N;;;;;
-0B01;ORIYA SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
-0B02;ORIYA SIGN ANUSVARA;Mc;0;L;;;;;N;;;;;
-0B03;ORIYA SIGN VISARGA;Mc;0;L;;;;;N;;;;;
-0B05;ORIYA LETTER A;Lo;0;L;;;;;N;;;;;
-0B06;ORIYA LETTER AA;Lo;0;L;;;;;N;;;;;
-0B07;ORIYA LETTER I;Lo;0;L;;;;;N;;;;;
-0B08;ORIYA LETTER II;Lo;0;L;;;;;N;;;;;
-0B09;ORIYA LETTER U;Lo;0;L;;;;;N;;;;;
-0B0A;ORIYA LETTER UU;Lo;0;L;;;;;N;;;;;
-0B0B;ORIYA LETTER VOCALIC R;Lo;0;L;;;;;N;;;;;
-0B0C;ORIYA LETTER VOCALIC L;Lo;0;L;;;;;N;;;;;
-0B0F;ORIYA LETTER E;Lo;0;L;;;;;N;;;;;
-0B10;ORIYA LETTER AI;Lo;0;L;;;;;N;;;;;
-0B13;ORIYA LETTER O;Lo;0;L;;;;;N;;;;;
-0B14;ORIYA LETTER AU;Lo;0;L;;;;;N;;;;;
-0B15;ORIYA LETTER KA;Lo;0;L;;;;;N;;;;;
-0B16;ORIYA LETTER KHA;Lo;0;L;;;;;N;;;;;
-0B17;ORIYA LETTER GA;Lo;0;L;;;;;N;;;;;
-0B18;ORIYA LETTER GHA;Lo;0;L;;;;;N;;;;;
-0B19;ORIYA LETTER NGA;Lo;0;L;;;;;N;;;;;
-0B1A;ORIYA LETTER CA;Lo;0;L;;;;;N;;;;;
-0B1B;ORIYA LETTER CHA;Lo;0;L;;;;;N;;;;;
-0B1C;ORIYA LETTER JA;Lo;0;L;;;;;N;;;;;
-0B1D;ORIYA LETTER JHA;Lo;0;L;;;;;N;;;;;
-0B1E;ORIYA LETTER NYA;Lo;0;L;;;;;N;;;;;
-0B1F;ORIYA LETTER TTA;Lo;0;L;;;;;N;;;;;
-0B20;ORIYA LETTER TTHA;Lo;0;L;;;;;N;;;;;
-0B21;ORIYA LETTER DDA;Lo;0;L;;;;;N;;;;;
-0B22;ORIYA LETTER DDHA;Lo;0;L;;;;;N;;;;;
-0B23;ORIYA LETTER NNA;Lo;0;L;;;;;N;;;;;
-0B24;ORIYA LETTER TA;Lo;0;L;;;;;N;;;;;
-0B25;ORIYA LETTER THA;Lo;0;L;;;;;N;;;;;
-0B26;ORIYA LETTER DA;Lo;0;L;;;;;N;;;;;
-0B27;ORIYA LETTER DHA;Lo;0;L;;;;;N;;;;;
-0B28;ORIYA LETTER NA;Lo;0;L;;;;;N;;;;;
-0B2A;ORIYA LETTER PA;Lo;0;L;;;;;N;;;;;
-0B2B;ORIYA LETTER PHA;Lo;0;L;;;;;N;;;;;
-0B2C;ORIYA LETTER BA;Lo;0;L;;;;;N;;;;;
-0B2D;ORIYA LETTER BHA;Lo;0;L;;;;;N;;;;;
-0B2E;ORIYA LETTER MA;Lo;0;L;;;;;N;;;;;
-0B2F;ORIYA LETTER YA;Lo;0;L;;;;;N;;;;;
-0B30;ORIYA LETTER RA;Lo;0;L;;;;;N;;;;;
-0B32;ORIYA LETTER LA;Lo;0;L;;;;;N;;;;;
-0B33;ORIYA LETTER LLA;Lo;0;L;;;;;N;;;;;
-0B35;ORIYA LETTER VA;Lo;0;L;;;;;N;;;;;
-0B36;ORIYA LETTER SHA;Lo;0;L;;;;;N;;;;;
-0B37;ORIYA LETTER SSA;Lo;0;L;;;;;N;;;;;
-0B38;ORIYA LETTER SA;Lo;0;L;;;;;N;;;;;
-0B39;ORIYA LETTER HA;Lo;0;L;;;;;N;;;;;
-0B3C;ORIYA SIGN NUKTA;Mn;7;NSM;;;;;N;;;;;
-0B3D;ORIYA SIGN AVAGRAHA;Lo;0;L;;;;;N;;;;;
-0B3E;ORIYA VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
-0B3F;ORIYA VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
-0B40;ORIYA VOWEL SIGN II;Mc;0;L;;;;;N;;;;;
-0B41;ORIYA VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
-0B42;ORIYA VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
-0B43;ORIYA VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;;
-0B44;ORIYA VOWEL SIGN VOCALIC RR;Mn;0;NSM;;;;;N;;;;;
-0B47;ORIYA VOWEL SIGN E;Mc;0;L;;;;;N;;;;;
-0B48;ORIYA VOWEL SIGN AI;Mc;0;L;0B47 0B56;;;;N;;;;;
-0B4B;ORIYA VOWEL SIGN O;Mc;0;L;0B47 0B3E;;;;N;;;;;
-0B4C;ORIYA VOWEL SIGN AU;Mc;0;L;0B47 0B57;;;;N;;;;;
-0B4D;ORIYA SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
-0B56;ORIYA AI LENGTH MARK;Mn;0;NSM;;;;;N;;;;;
-0B57;ORIYA AU LENGTH MARK;Mc;0;L;;;;;N;;;;;
-0B5C;ORIYA LETTER RRA;Lo;0;L;0B21 0B3C;;;;N;;;;;
-0B5D;ORIYA LETTER RHA;Lo;0;L;0B22 0B3C;;;;N;;;;;
-0B5F;ORIYA LETTER YYA;Lo;0;L;;;;;N;;;;;
-0B60;ORIYA LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;;
-0B61;ORIYA LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;;
-0B62;ORIYA VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;;
-0B63;ORIYA VOWEL SIGN VOCALIC LL;Mn;0;NSM;;;;;N;;;;;
-0B66;ORIYA DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
-0B67;ORIYA DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
-0B68;ORIYA DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
-0B69;ORIYA DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
-0B6A;ORIYA DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
-0B6B;ORIYA DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
-0B6C;ORIYA DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
-0B6D;ORIYA DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
-0B6E;ORIYA DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
-0B6F;ORIYA DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
-0B70;ORIYA ISSHAR;So;0;L;;;;;N;;;;;
-0B71;ORIYA LETTER WA;Lo;0;L;;;;;N;;;;;
-0B82;TAMIL SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
-0B83;TAMIL SIGN VISARGA;Lo;0;L;;;;;N;;;;;
-0B85;TAMIL LETTER A;Lo;0;L;;;;;N;;;;;
-0B86;TAMIL LETTER AA;Lo;0;L;;;;;N;;;;;
-0B87;TAMIL LETTER I;Lo;0;L;;;;;N;;;;;
-0B88;TAMIL LETTER II;Lo;0;L;;;;;N;;;;;
-0B89;TAMIL LETTER U;Lo;0;L;;;;;N;;;;;
-0B8A;TAMIL LETTER UU;Lo;0;L;;;;;N;;;;;
-0B8E;TAMIL LETTER E;Lo;0;L;;;;;N;;;;;
-0B8F;TAMIL LETTER EE;Lo;0;L;;;;;N;;;;;
-0B90;TAMIL LETTER AI;Lo;0;L;;;;;N;;;;;
-0B92;TAMIL LETTER O;Lo;0;L;;;;;N;;;;;
-0B93;TAMIL LETTER OO;Lo;0;L;;;;;N;;;;;
-0B94;TAMIL LETTER AU;Lo;0;L;0B92 0BD7;;;;N;;;;;
-0B95;TAMIL LETTER KA;Lo;0;L;;;;;N;;;;;
-0B99;TAMIL LETTER NGA;Lo;0;L;;;;;N;;;;;
-0B9A;TAMIL LETTER CA;Lo;0;L;;;;;N;;;;;
-0B9C;TAMIL LETTER JA;Lo;0;L;;;;;N;;;;;
-0B9E;TAMIL LETTER NYA;Lo;0;L;;;;;N;;;;;
-0B9F;TAMIL LETTER TTA;Lo;0;L;;;;;N;;;;;
-0BA3;TAMIL LETTER NNA;Lo;0;L;;;;;N;;;;;
-0BA4;TAMIL LETTER TA;Lo;0;L;;;;;N;;;;;
-0BA8;TAMIL LETTER NA;Lo;0;L;;;;;N;;;;;
-0BA9;TAMIL LETTER NNNA;Lo;0;L;;;;;N;;;;;
-0BAA;TAMIL LETTER PA;Lo;0;L;;;;;N;;;;;
-0BAE;TAMIL LETTER MA;Lo;0;L;;;;;N;;;;;
-0BAF;TAMIL LETTER YA;Lo;0;L;;;;;N;;;;;
-0BB0;TAMIL LETTER RA;Lo;0;L;;;;;N;;;;;
-0BB1;TAMIL LETTER RRA;Lo;0;L;;;;;N;;;;;
-0BB2;TAMIL LETTER LA;Lo;0;L;;;;;N;;;;;
-0BB3;TAMIL LETTER LLA;Lo;0;L;;;;;N;;;;;
-0BB4;TAMIL LETTER LLLA;Lo;0;L;;;;;N;;;;;
-0BB5;TAMIL LETTER VA;Lo;0;L;;;;;N;;;;;
-0BB6;TAMIL LETTER SHA;Lo;0;L;;;;;N;;;;;
-0BB7;TAMIL LETTER SSA;Lo;0;L;;;;;N;;;;;
-0BB8;TAMIL LETTER SA;Lo;0;L;;;;;N;;;;;
-0BB9;TAMIL LETTER HA;Lo;0;L;;;;;N;;;;;
-0BBE;TAMIL VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
-0BBF;TAMIL VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
-0BC0;TAMIL VOWEL SIGN II;Mn;0;NSM;;;;;N;;;;;
-0BC1;TAMIL VOWEL SIGN U;Mc;0;L;;;;;N;;;;;
-0BC2;TAMIL VOWEL SIGN UU;Mc;0;L;;;;;N;;;;;
-0BC6;TAMIL VOWEL SIGN E;Mc;0;L;;;;;N;;;;;
-0BC7;TAMIL VOWEL SIGN EE;Mc;0;L;;;;;N;;;;;
-0BC8;TAMIL VOWEL SIGN AI;Mc;0;L;;;;;N;;;;;
-0BCA;TAMIL VOWEL SIGN O;Mc;0;L;0BC6 0BBE;;;;N;;;;;
-0BCB;TAMIL VOWEL SIGN OO;Mc;0;L;0BC7 0BBE;;;;N;;;;;
-0BCC;TAMIL VOWEL SIGN AU;Mc;0;L;0BC6 0BD7;;;;N;;;;;
-0BCD;TAMIL SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
-0BD0;TAMIL OM;Lo;0;L;;;;;N;;;;;
-0BD7;TAMIL AU LENGTH MARK;Mc;0;L;;;;;N;;;;;
-0BE6;TAMIL DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
-0BE7;TAMIL DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
-0BE8;TAMIL DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
-0BE9;TAMIL DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
-0BEA;TAMIL DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
-0BEB;TAMIL DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
-0BEC;TAMIL DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
-0BED;TAMIL DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
-0BEE;TAMIL DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
-0BEF;TAMIL DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
-0BF0;TAMIL NUMBER TEN;No;0;L;;;;10;N;;;;;
-0BF1;TAMIL NUMBER ONE HUNDRED;No;0;L;;;;100;N;;;;;
-0BF2;TAMIL NUMBER ONE THOUSAND;No;0;L;;;;1000;N;;;;;
-0BF3;TAMIL DAY SIGN;So;0;ON;;;;;N;;Naal;;;
-0BF4;TAMIL MONTH SIGN;So;0;ON;;;;;N;;Maatham;;;
-0BF5;TAMIL YEAR SIGN;So;0;ON;;;;;N;;Varudam;;;
-0BF6;TAMIL DEBIT SIGN;So;0;ON;;;;;N;;Patru;;;
-0BF7;TAMIL CREDIT SIGN;So;0;ON;;;;;N;;Varavu;;;
-0BF8;TAMIL AS ABOVE SIGN;So;0;ON;;;;;N;;Merpadi;;;
-0BF9;TAMIL RUPEE SIGN;Sc;0;ET;;;;;N;;Rupai;;;
-0BFA;TAMIL NUMBER SIGN;So;0;ON;;;;;N;;Enn;;;
-0C01;TELUGU SIGN CANDRABINDU;Mc;0;L;;;;;N;;;;;
-0C02;TELUGU SIGN ANUSVARA;Mc;0;L;;;;;N;;;;;
-0C03;TELUGU SIGN VISARGA;Mc;0;L;;;;;N;;;;;
-0C05;TELUGU LETTER A;Lo;0;L;;;;;N;;;;;
-0C06;TELUGU LETTER AA;Lo;0;L;;;;;N;;;;;
-0C07;TELUGU LETTER I;Lo;0;L;;;;;N;;;;;
-0C08;TELUGU LETTER II;Lo;0;L;;;;;N;;;;;
-0C09;TELUGU LETTER U;Lo;0;L;;;;;N;;;;;
-0C0A;TELUGU LETTER UU;Lo;0;L;;;;;N;;;;;
-0C0B;TELUGU LETTER VOCALIC R;Lo;0;L;;;;;N;;;;;
-0C0C;TELUGU LETTER VOCALIC L;Lo;0;L;;;;;N;;;;;
-0C0E;TELUGU LETTER E;Lo;0;L;;;;;N;;;;;
-0C0F;TELUGU LETTER EE;Lo;0;L;;;;;N;;;;;
-0C10;TELUGU LETTER AI;Lo;0;L;;;;;N;;;;;
-0C12;TELUGU LETTER O;Lo;0;L;;;;;N;;;;;
-0C13;TELUGU LETTER OO;Lo;0;L;;;;;N;;;;;
-0C14;TELUGU LETTER AU;Lo;0;L;;;;;N;;;;;
-0C15;TELUGU LETTER KA;Lo;0;L;;;;;N;;;;;
-0C16;TELUGU LETTER KHA;Lo;0;L;;;;;N;;;;;
-0C17;TELUGU LETTER GA;Lo;0;L;;;;;N;;;;;
-0C18;TELUGU LETTER GHA;Lo;0;L;;;;;N;;;;;
-0C19;TELUGU LETTER NGA;Lo;0;L;;;;;N;;;;;
-0C1A;TELUGU LETTER CA;Lo;0;L;;;;;N;;;;;
-0C1B;TELUGU LETTER CHA;Lo;0;L;;;;;N;;;;;
-0C1C;TELUGU LETTER JA;Lo;0;L;;;;;N;;;;;
-0C1D;TELUGU LETTER JHA;Lo;0;L;;;;;N;;;;;
-0C1E;TELUGU LETTER NYA;Lo;0;L;;;;;N;;;;;
-0C1F;TELUGU LETTER TTA;Lo;0;L;;;;;N;;;;;
-0C20;TELUGU LETTER TTHA;Lo;0;L;;;;;N;;;;;
-0C21;TELUGU LETTER DDA;Lo;0;L;;;;;N;;;;;
-0C22;TELUGU LETTER DDHA;Lo;0;L;;;;;N;;;;;
-0C23;TELUGU LETTER NNA;Lo;0;L;;;;;N;;;;;
-0C24;TELUGU LETTER TA;Lo;0;L;;;;;N;;;;;
-0C25;TELUGU LETTER THA;Lo;0;L;;;;;N;;;;;
-0C26;TELUGU LETTER DA;Lo;0;L;;;;;N;;;;;
-0C27;TELUGU LETTER DHA;Lo;0;L;;;;;N;;;;;
-0C28;TELUGU LETTER NA;Lo;0;L;;;;;N;;;;;
-0C2A;TELUGU LETTER PA;Lo;0;L;;;;;N;;;;;
-0C2B;TELUGU LETTER PHA;Lo;0;L;;;;;N;;;;;
-0C2C;TELUGU LETTER BA;Lo;0;L;;;;;N;;;;;
-0C2D;TELUGU LETTER BHA;Lo;0;L;;;;;N;;;;;
-0C2E;TELUGU LETTER MA;Lo;0;L;;;;;N;;;;;
-0C2F;TELUGU LETTER YA;Lo;0;L;;;;;N;;;;;
-0C30;TELUGU LETTER RA;Lo;0;L;;;;;N;;;;;
-0C31;TELUGU LETTER RRA;Lo;0;L;;;;;N;;;;;
-0C32;TELUGU LETTER LA;Lo;0;L;;;;;N;;;;;
-0C33;TELUGU LETTER LLA;Lo;0;L;;;;;N;;;;;
-0C35;TELUGU LETTER VA;Lo;0;L;;;;;N;;;;;
-0C36;TELUGU LETTER SHA;Lo;0;L;;;;;N;;;;;
-0C37;TELUGU LETTER SSA;Lo;0;L;;;;;N;;;;;
-0C38;TELUGU LETTER SA;Lo;0;L;;;;;N;;;;;
-0C39;TELUGU LETTER HA;Lo;0;L;;;;;N;;;;;
-0C3D;TELUGU SIGN AVAGRAHA;Lo;0;L;;;;;N;;;;;
-0C3E;TELUGU VOWEL SIGN AA;Mn;0;NSM;;;;;N;;;;;
-0C3F;TELUGU VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
-0C40;TELUGU VOWEL SIGN II;Mn;0;NSM;;;;;N;;;;;
-0C41;TELUGU VOWEL SIGN U;Mc;0;L;;;;;N;;;;;
-0C42;TELUGU VOWEL SIGN UU;Mc;0;L;;;;;N;;;;;
-0C43;TELUGU VOWEL SIGN VOCALIC R;Mc;0;L;;;;;N;;;;;
-0C44;TELUGU VOWEL SIGN VOCALIC RR;Mc;0;L;;;;;N;;;;;
-0C46;TELUGU VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
-0C47;TELUGU VOWEL SIGN EE;Mn;0;NSM;;;;;N;;;;;
-0C48;TELUGU VOWEL SIGN AI;Mn;0;NSM;0C46 0C56;;;;N;;;;;
-0C4A;TELUGU VOWEL SIGN O;Mn;0;NSM;;;;;N;;;;;
-0C4B;TELUGU VOWEL SIGN OO;Mn;0;NSM;;;;;N;;;;;
-0C4C;TELUGU VOWEL SIGN AU;Mn;0;NSM;;;;;N;;;;;
-0C4D;TELUGU SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
-0C55;TELUGU LENGTH MARK;Mn;84;NSM;;;;;N;;;;;
-0C56;TELUGU AI LENGTH MARK;Mn;91;NSM;;;;;N;;;;;
-0C58;TELUGU LETTER TSA;Lo;0;L;;;;;N;;;;;
-0C59;TELUGU LETTER DZA;Lo;0;L;;;;;N;;;;;
-0C60;TELUGU LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;;
-0C61;TELUGU LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;;
-0C62;TELUGU VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;;
-0C63;TELUGU VOWEL SIGN VOCALIC LL;Mn;0;NSM;;;;;N;;;;;
-0C66;TELUGU DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
-0C67;TELUGU DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
-0C68;TELUGU DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
-0C69;TELUGU DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
-0C6A;TELUGU DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
-0C6B;TELUGU DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
-0C6C;TELUGU DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
-0C6D;TELUGU DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
-0C6E;TELUGU DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
-0C6F;TELUGU DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
-0C78;TELUGU FRACTION DIGIT ZERO FOR ODD POWERS OF FOUR;No;0;ON;;;;0;N;;;;;
-0C79;TELUGU FRACTION DIGIT ONE FOR ODD POWERS OF FOUR;No;0;ON;;;;1;N;;;;;
-0C7A;TELUGU FRACTION DIGIT TWO FOR ODD POWERS OF FOUR;No;0;ON;;;;2;N;;;;;
-0C7B;TELUGU FRACTION DIGIT THREE FOR ODD POWERS OF FOUR;No;0;ON;;;;3;N;;;;;
-0C7C;TELUGU FRACTION DIGIT ONE FOR EVEN POWERS OF FOUR;No;0;ON;;;;1;N;;;;;
-0C7D;TELUGU FRACTION DIGIT TWO FOR EVEN POWERS OF FOUR;No;0;ON;;;;2;N;;;;;
-0C7E;TELUGU FRACTION DIGIT THREE FOR EVEN POWERS OF FOUR;No;0;ON;;;;3;N;;;;;
-0C7F;TELUGU SIGN TUUMU;So;0;L;;;;;N;;;;;
-0C82;KANNADA SIGN ANUSVARA;Mc;0;L;;;;;N;;;;;
-0C83;KANNADA SIGN VISARGA;Mc;0;L;;;;;N;;;;;
-0C85;KANNADA LETTER A;Lo;0;L;;;;;N;;;;;
-0C86;KANNADA LETTER AA;Lo;0;L;;;;;N;;;;;
-0C87;KANNADA LETTER I;Lo;0;L;;;;;N;;;;;
-0C88;KANNADA LETTER II;Lo;0;L;;;;;N;;;;;
-0C89;KANNADA LETTER U;Lo;0;L;;;;;N;;;;;
-0C8A;KANNADA LETTER UU;Lo;0;L;;;;;N;;;;;
-0C8B;KANNADA LETTER VOCALIC R;Lo;0;L;;;;;N;;;;;
-0C8C;KANNADA LETTER VOCALIC L;Lo;0;L;;;;;N;;;;;
-0C8E;KANNADA LETTER E;Lo;0;L;;;;;N;;;;;
-0C8F;KANNADA LETTER EE;Lo;0;L;;;;;N;;;;;
-0C90;KANNADA LETTER AI;Lo;0;L;;;;;N;;;;;
-0C92;KANNADA LETTER O;Lo;0;L;;;;;N;;;;;
-0C93;KANNADA LETTER OO;Lo;0;L;;;;;N;;;;;
-0C94;KANNADA LETTER AU;Lo;0;L;;;;;N;;;;;
-0C95;KANNADA LETTER KA;Lo;0;L;;;;;N;;;;;
-0C96;KANNADA LETTER KHA;Lo;0;L;;;;;N;;;;;
-0C97;KANNADA LETTER GA;Lo;0;L;;;;;N;;;;;
-0C98;KANNADA LETTER GHA;Lo;0;L;;;;;N;;;;;
-0C99;KANNADA LETTER NGA;Lo;0;L;;;;;N;;;;;
-0C9A;KANNADA LETTER CA;Lo;0;L;;;;;N;;;;;
-0C9B;KANNADA LETTER CHA;Lo;0;L;;;;;N;;;;;
-0C9C;KANNADA LETTER JA;Lo;0;L;;;;;N;;;;;
-0C9D;KANNADA LETTER JHA;Lo;0;L;;;;;N;;;;;
-0C9E;KANNADA LETTER NYA;Lo;0;L;;;;;N;;;;;
-0C9F;KANNADA LETTER TTA;Lo;0;L;;;;;N;;;;;
-0CA0;KANNADA LETTER TTHA;Lo;0;L;;;;;N;;;;;
-0CA1;KANNADA LETTER DDA;Lo;0;L;;;;;N;;;;;
-0CA2;KANNADA LETTER DDHA;Lo;0;L;;;;;N;;;;;
-0CA3;KANNADA LETTER NNA;Lo;0;L;;;;;N;;;;;
-0CA4;KANNADA LETTER TA;Lo;0;L;;;;;N;;;;;
-0CA5;KANNADA LETTER THA;Lo;0;L;;;;;N;;;;;
-0CA6;KANNADA LETTER DA;Lo;0;L;;;;;N;;;;;
-0CA7;KANNADA LETTER DHA;Lo;0;L;;;;;N;;;;;
-0CA8;KANNADA LETTER NA;Lo;0;L;;;;;N;;;;;
-0CAA;KANNADA LETTER PA;Lo;0;L;;;;;N;;;;;
-0CAB;KANNADA LETTER PHA;Lo;0;L;;;;;N;;;;;
-0CAC;KANNADA LETTER BA;Lo;0;L;;;;;N;;;;;
-0CAD;KANNADA LETTER BHA;Lo;0;L;;;;;N;;;;;
-0CAE;KANNADA LETTER MA;Lo;0;L;;;;;N;;;;;
-0CAF;KANNADA LETTER YA;Lo;0;L;;;;;N;;;;;
-0CB0;KANNADA LETTER RA;Lo;0;L;;;;;N;;;;;
-0CB1;KANNADA LETTER RRA;Lo;0;L;;;;;N;;;;;
-0CB2;KANNADA LETTER LA;Lo;0;L;;;;;N;;;;;
-0CB3;KANNADA LETTER LLA;Lo;0;L;;;;;N;;;;;
-0CB5;KANNADA LETTER VA;Lo;0;L;;;;;N;;;;;
-0CB6;KANNADA LETTER SHA;Lo;0;L;;;;;N;;;;;
-0CB7;KANNADA LETTER SSA;Lo;0;L;;;;;N;;;;;
-0CB8;KANNADA LETTER SA;Lo;0;L;;;;;N;;;;;
-0CB9;KANNADA LETTER HA;Lo;0;L;;;;;N;;;;;
-0CBC;KANNADA SIGN NUKTA;Mn;7;NSM;;;;;N;;;;;
-0CBD;KANNADA SIGN AVAGRAHA;Lo;0;L;;;;;N;;;;;
-0CBE;KANNADA VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
-0CBF;KANNADA VOWEL SIGN I;Mn;0;L;;;;;N;;;;;
-0CC0;KANNADA VOWEL SIGN II;Mc;0;L;0CBF 0CD5;;;;N;;;;;
-0CC1;KANNADA VOWEL SIGN U;Mc;0;L;;;;;N;;;;;
-0CC2;KANNADA VOWEL SIGN UU;Mc;0;L;;;;;N;;;;;
-0CC3;KANNADA VOWEL SIGN VOCALIC R;Mc;0;L;;;;;N;;;;;
-0CC4;KANNADA VOWEL SIGN VOCALIC RR;Mc;0;L;;;;;N;;;;;
-0CC6;KANNADA VOWEL SIGN E;Mn;0;L;;;;;N;;;;;
-0CC7;KANNADA VOWEL SIGN EE;Mc;0;L;0CC6 0CD5;;;;N;;;;;
-0CC8;KANNADA VOWEL SIGN AI;Mc;0;L;0CC6 0CD6;;;;N;;;;;
-0CCA;KANNADA VOWEL SIGN O;Mc;0;L;0CC6 0CC2;;;;N;;;;;
-0CCB;KANNADA VOWEL SIGN OO;Mc;0;L;0CCA 0CD5;;;;N;;;;;
-0CCC;KANNADA VOWEL SIGN AU;Mn;0;NSM;;;;;N;;;;;
-0CCD;KANNADA SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
-0CD5;KANNADA LENGTH MARK;Mc;0;L;;;;;N;;;;;
-0CD6;KANNADA AI LENGTH MARK;Mc;0;L;;;;;N;;;;;
-0CDE;KANNADA LETTER FA;Lo;0;L;;;;;N;;;;;
-0CE0;KANNADA LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;;
-0CE1;KANNADA LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;;
-0CE2;KANNADA VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;;
-0CE3;KANNADA VOWEL SIGN VOCALIC LL;Mn;0;NSM;;;;;N;;;;;
-0CE6;KANNADA DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
-0CE7;KANNADA DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
-0CE8;KANNADA DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
-0CE9;KANNADA DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
-0CEA;KANNADA DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
-0CEB;KANNADA DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
-0CEC;KANNADA DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
-0CED;KANNADA DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
-0CEE;KANNADA DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
-0CEF;KANNADA DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
-0CF1;KANNADA SIGN JIHVAMULIYA;So;0;ON;;;;;N;;;;;
-0CF2;KANNADA SIGN UPADHMANIYA;So;0;ON;;;;;N;;;;;
-0D02;MALAYALAM SIGN ANUSVARA;Mc;0;L;;;;;N;;;;;
-0D03;MALAYALAM SIGN VISARGA;Mc;0;L;;;;;N;;;;;
-0D05;MALAYALAM LETTER A;Lo;0;L;;;;;N;;;;;
-0D06;MALAYALAM LETTER AA;Lo;0;L;;;;;N;;;;;
-0D07;MALAYALAM LETTER I;Lo;0;L;;;;;N;;;;;
-0D08;MALAYALAM LETTER II;Lo;0;L;;;;;N;;;;;
-0D09;MALAYALAM LETTER U;Lo;0;L;;;;;N;;;;;
-0D0A;MALAYALAM LETTER UU;Lo;0;L;;;;;N;;;;;
-0D0B;MALAYALAM LETTER VOCALIC R;Lo;0;L;;;;;N;;;;;
-0D0C;MALAYALAM LETTER VOCALIC L;Lo;0;L;;;;;N;;;;;
-0D0E;MALAYALAM LETTER E;Lo;0;L;;;;;N;;;;;
-0D0F;MALAYALAM LETTER EE;Lo;0;L;;;;;N;;;;;
-0D10;MALAYALAM LETTER AI;Lo;0;L;;;;;N;;;;;
-0D12;MALAYALAM LETTER O;Lo;0;L;;;;;N;;;;;
-0D13;MALAYALAM LETTER OO;Lo;0;L;;;;;N;;;;;
-0D14;MALAYALAM LETTER AU;Lo;0;L;;;;;N;;;;;
-0D15;MALAYALAM LETTER KA;Lo;0;L;;;;;N;;;;;
-0D16;MALAYALAM LETTER KHA;Lo;0;L;;;;;N;;;;;
-0D17;MALAYALAM LETTER GA;Lo;0;L;;;;;N;;;;;
-0D18;MALAYALAM LETTER GHA;Lo;0;L;;;;;N;;;;;
-0D19;MALAYALAM LETTER NGA;Lo;0;L;;;;;N;;;;;
-0D1A;MALAYALAM LETTER CA;Lo;0;L;;;;;N;;;;;
-0D1B;MALAYALAM LETTER CHA;Lo;0;L;;;;;N;;;;;
-0D1C;MALAYALAM LETTER JA;Lo;0;L;;;;;N;;;;;
-0D1D;MALAYALAM LETTER JHA;Lo;0;L;;;;;N;;;;;
-0D1E;MALAYALAM LETTER NYA;Lo;0;L;;;;;N;;;;;
-0D1F;MALAYALAM LETTER TTA;Lo;0;L;;;;;N;;;;;
-0D20;MALAYALAM LETTER TTHA;Lo;0;L;;;;;N;;;;;
-0D21;MALAYALAM LETTER DDA;Lo;0;L;;;;;N;;;;;
-0D22;MALAYALAM LETTER DDHA;Lo;0;L;;;;;N;;;;;
-0D23;MALAYALAM LETTER NNA;Lo;0;L;;;;;N;;;;;
-0D24;MALAYALAM LETTER TA;Lo;0;L;;;;;N;;;;;
-0D25;MALAYALAM LETTER THA;Lo;0;L;;;;;N;;;;;
-0D26;MALAYALAM LETTER DA;Lo;0;L;;;;;N;;;;;
-0D27;MALAYALAM LETTER DHA;Lo;0;L;;;;;N;;;;;
-0D28;MALAYALAM LETTER NA;Lo;0;L;;;;;N;;;;;
-0D2A;MALAYALAM LETTER PA;Lo;0;L;;;;;N;;;;;
-0D2B;MALAYALAM LETTER PHA;Lo;0;L;;;;;N;;;;;
-0D2C;MALAYALAM LETTER BA;Lo;0;L;;;;;N;;;;;
-0D2D;MALAYALAM LETTER BHA;Lo;0;L;;;;;N;;;;;
-0D2E;MALAYALAM LETTER MA;Lo;0;L;;;;;N;;;;;
-0D2F;MALAYALAM LETTER YA;Lo;0;L;;;;;N;;;;;
-0D30;MALAYALAM LETTER RA;Lo;0;L;;;;;N;;;;;
-0D31;MALAYALAM LETTER RRA;Lo;0;L;;;;;N;;;;;
-0D32;MALAYALAM LETTER LA;Lo;0;L;;;;;N;;;;;
-0D33;MALAYALAM LETTER LLA;Lo;0;L;;;;;N;;;;;
-0D34;MALAYALAM LETTER LLLA;Lo;0;L;;;;;N;;;;;
-0D35;MALAYALAM LETTER VA;Lo;0;L;;;;;N;;;;;
-0D36;MALAYALAM LETTER SHA;Lo;0;L;;;;;N;;;;;
-0D37;MALAYALAM LETTER SSA;Lo;0;L;;;;;N;;;;;
-0D38;MALAYALAM LETTER SA;Lo;0;L;;;;;N;;;;;
-0D39;MALAYALAM LETTER HA;Lo;0;L;;;;;N;;;;;
-0D3D;MALAYALAM SIGN AVAGRAHA;Lo;0;L;;;;;N;;;;;
-0D3E;MALAYALAM VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
-0D3F;MALAYALAM VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
-0D40;MALAYALAM VOWEL SIGN II;Mc;0;L;;;;;N;;;;;
-0D41;MALAYALAM VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
-0D42;MALAYALAM VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
-0D43;MALAYALAM VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;;
-0D44;MALAYALAM VOWEL SIGN VOCALIC RR;Mn;0;NSM;;;;;N;;;;;
-0D46;MALAYALAM VOWEL SIGN E;Mc;0;L;;;;;N;;;;;
-0D47;MALAYALAM VOWEL SIGN EE;Mc;0;L;;;;;N;;;;;
-0D48;MALAYALAM VOWEL SIGN AI;Mc;0;L;;;;;N;;;;;
-0D4A;MALAYALAM VOWEL SIGN O;Mc;0;L;0D46 0D3E;;;;N;;;;;
-0D4B;MALAYALAM VOWEL SIGN OO;Mc;0;L;0D47 0D3E;;;;N;;;;;
-0D4C;MALAYALAM VOWEL SIGN AU;Mc;0;L;0D46 0D57;;;;N;;;;;
-0D4D;MALAYALAM SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
-0D57;MALAYALAM AU LENGTH MARK;Mc;0;L;;;;;N;;;;;
-0D60;MALAYALAM LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;;
-0D61;MALAYALAM LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;;
-0D62;MALAYALAM VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;;
-0D63;MALAYALAM VOWEL SIGN VOCALIC LL;Mn;0;NSM;;;;;N;;;;;
-0D66;MALAYALAM DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
-0D67;MALAYALAM DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
-0D68;MALAYALAM DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
-0D69;MALAYALAM DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
-0D6A;MALAYALAM DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
-0D6B;MALAYALAM DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
-0D6C;MALAYALAM DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
-0D6D;MALAYALAM DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
-0D6E;MALAYALAM DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
-0D6F;MALAYALAM DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
-0D70;MALAYALAM NUMBER TEN;No;0;L;;;;10;N;;;;;
-0D71;MALAYALAM NUMBER ONE HUNDRED;No;0;L;;;;100;N;;;;;
-0D72;MALAYALAM NUMBER ONE THOUSAND;No;0;L;;;;1000;N;;;;;
-0D73;MALAYALAM FRACTION ONE QUARTER;No;0;L;;;;1/4;N;;;;;
-0D74;MALAYALAM FRACTION ONE HALF;No;0;L;;;;1/2;N;;;;;
-0D75;MALAYALAM FRACTION THREE QUARTERS;No;0;L;;;;3/4;N;;;;;
-0D79;MALAYALAM DATE MARK;So;0;L;;;;;N;;;;;
-0D7A;MALAYALAM LETTER CHILLU NN;Lo;0;L;;;;;N;;;;;
-0D7B;MALAYALAM LETTER CHILLU N;Lo;0;L;;;;;N;;;;;
-0D7C;MALAYALAM LETTER CHILLU RR;Lo;0;L;;;;;N;;;;;
-0D7D;MALAYALAM LETTER CHILLU L;Lo;0;L;;;;;N;;;;;
-0D7E;MALAYALAM LETTER CHILLU LL;Lo;0;L;;;;;N;;;;;
-0D7F;MALAYALAM LETTER CHILLU K;Lo;0;L;;;;;N;;;;;
-0D82;SINHALA SIGN ANUSVARAYA;Mc;0;L;;;;;N;;;;;
-0D83;SINHALA SIGN VISARGAYA;Mc;0;L;;;;;N;;;;;
-0D85;SINHALA LETTER AYANNA;Lo;0;L;;;;;N;;;;;
-0D86;SINHALA LETTER AAYANNA;Lo;0;L;;;;;N;;;;;
-0D87;SINHALA LETTER AEYANNA;Lo;0;L;;;;;N;;;;;
-0D88;SINHALA LETTER AEEYANNA;Lo;0;L;;;;;N;;;;;
-0D89;SINHALA LETTER IYANNA;Lo;0;L;;;;;N;;;;;
-0D8A;SINHALA LETTER IIYANNA;Lo;0;L;;;;;N;;;;;
-0D8B;SINHALA LETTER UYANNA;Lo;0;L;;;;;N;;;;;
-0D8C;SINHALA LETTER UUYANNA;Lo;0;L;;;;;N;;;;;
-0D8D;SINHALA LETTER IRUYANNA;Lo;0;L;;;;;N;;;;;
-0D8E;SINHALA LETTER IRUUYANNA;Lo;0;L;;;;;N;;;;;
-0D8F;SINHALA LETTER ILUYANNA;Lo;0;L;;;;;N;;;;;
-0D90;SINHALA LETTER ILUUYANNA;Lo;0;L;;;;;N;;;;;
-0D91;SINHALA LETTER EYANNA;Lo;0;L;;;;;N;;;;;
-0D92;SINHALA LETTER EEYANNA;Lo;0;L;;;;;N;;;;;
-0D93;SINHALA LETTER AIYANNA;Lo;0;L;;;;;N;;;;;
-0D94;SINHALA LETTER OYANNA;Lo;0;L;;;;;N;;;;;
-0D95;SINHALA LETTER OOYANNA;Lo;0;L;;;;;N;;;;;
-0D96;SINHALA LETTER AUYANNA;Lo;0;L;;;;;N;;;;;
-0D9A;SINHALA LETTER ALPAPRAANA KAYANNA;Lo;0;L;;;;;N;;;;;
-0D9B;SINHALA LETTER MAHAAPRAANA KAYANNA;Lo;0;L;;;;;N;;;;;
-0D9C;SINHALA LETTER ALPAPRAANA GAYANNA;Lo;0;L;;;;;N;;;;;
-0D9D;SINHALA LETTER MAHAAPRAANA GAYANNA;Lo;0;L;;;;;N;;;;;
-0D9E;SINHALA LETTER KANTAJA NAASIKYAYA;Lo;0;L;;;;;N;;;;;
-0D9F;SINHALA LETTER SANYAKA GAYANNA;Lo;0;L;;;;;N;;;;;
-0DA0;SINHALA LETTER ALPAPRAANA CAYANNA;Lo;0;L;;;;;N;;;;;
-0DA1;SINHALA LETTER MAHAAPRAANA CAYANNA;Lo;0;L;;;;;N;;;;;
-0DA2;SINHALA LETTER ALPAPRAANA JAYANNA;Lo;0;L;;;;;N;;;;;
-0DA3;SINHALA LETTER MAHAAPRAANA JAYANNA;Lo;0;L;;;;;N;;;;;
-0DA4;SINHALA LETTER TAALUJA NAASIKYAYA;Lo;0;L;;;;;N;;;;;
-0DA5;SINHALA LETTER TAALUJA SANYOOGA NAAKSIKYAYA;Lo;0;L;;;;;N;;;;;
-0DA6;SINHALA LETTER SANYAKA JAYANNA;Lo;0;L;;;;;N;;;;;
-0DA7;SINHALA LETTER ALPAPRAANA TTAYANNA;Lo;0;L;;;;;N;;;;;
-0DA8;SINHALA LETTER MAHAAPRAANA TTAYANNA;Lo;0;L;;;;;N;;;;;
-0DA9;SINHALA LETTER ALPAPRAANA DDAYANNA;Lo;0;L;;;;;N;;;;;
-0DAA;SINHALA LETTER MAHAAPRAANA DDAYANNA;Lo;0;L;;;;;N;;;;;
-0DAB;SINHALA LETTER MUURDHAJA NAYANNA;Lo;0;L;;;;;N;;;;;
-0DAC;SINHALA LETTER SANYAKA DDAYANNA;Lo;0;L;;;;;N;;;;;
-0DAD;SINHALA LETTER ALPAPRAANA TAYANNA;Lo;0;L;;;;;N;;;;;
-0DAE;SINHALA LETTER MAHAAPRAANA TAYANNA;Lo;0;L;;;;;N;;;;;
-0DAF;SINHALA LETTER ALPAPRAANA DAYANNA;Lo;0;L;;;;;N;;;;;
-0DB0;SINHALA LETTER MAHAAPRAANA DAYANNA;Lo;0;L;;;;;N;;;;;
-0DB1;SINHALA LETTER DANTAJA NAYANNA;Lo;0;L;;;;;N;;;;;
-0DB3;SINHALA LETTER SANYAKA DAYANNA;Lo;0;L;;;;;N;;;;;
-0DB4;SINHALA LETTER ALPAPRAANA PAYANNA;Lo;0;L;;;;;N;;;;;
-0DB5;SINHALA LETTER MAHAAPRAANA PAYANNA;Lo;0;L;;;;;N;;;;;
-0DB6;SINHALA LETTER ALPAPRAANA BAYANNA;Lo;0;L;;;;;N;;;;;
-0DB7;SINHALA LETTER MAHAAPRAANA BAYANNA;Lo;0;L;;;;;N;;;;;
-0DB8;SINHALA LETTER MAYANNA;Lo;0;L;;;;;N;;;;;
-0DB9;SINHALA LETTER AMBA BAYANNA;Lo;0;L;;;;;N;;;;;
-0DBA;SINHALA LETTER YAYANNA;Lo;0;L;;;;;N;;;;;
-0DBB;SINHALA LETTER RAYANNA;Lo;0;L;;;;;N;;;;;
-0DBD;SINHALA LETTER DANTAJA LAYANNA;Lo;0;L;;;;;N;;;;;
-0DC0;SINHALA LETTER VAYANNA;Lo;0;L;;;;;N;;;;;
-0DC1;SINHALA LETTER TAALUJA SAYANNA;Lo;0;L;;;;;N;;;;;
-0DC2;SINHALA LETTER MUURDHAJA SAYANNA;Lo;0;L;;;;;N;;;;;
-0DC3;SINHALA LETTER DANTAJA SAYANNA;Lo;0;L;;;;;N;;;;;
-0DC4;SINHALA LETTER HAYANNA;Lo;0;L;;;;;N;;;;;
-0DC5;SINHALA LETTER MUURDHAJA LAYANNA;Lo;0;L;;;;;N;;;;;
-0DC6;SINHALA LETTER FAYANNA;Lo;0;L;;;;;N;;;;;
-0DCA;SINHALA SIGN AL-LAKUNA;Mn;9;NSM;;;;;N;;;;;
-0DCF;SINHALA VOWEL SIGN AELA-PILLA;Mc;0;L;;;;;N;;;;;
-0DD0;SINHALA VOWEL SIGN KETTI AEDA-PILLA;Mc;0;L;;;;;N;;;;;
-0DD1;SINHALA VOWEL SIGN DIGA AEDA-PILLA;Mc;0;L;;;;;N;;;;;
-0DD2;SINHALA VOWEL SIGN KETTI IS-PILLA;Mn;0;NSM;;;;;N;;;;;
-0DD3;SINHALA VOWEL SIGN DIGA IS-PILLA;Mn;0;NSM;;;;;N;;;;;
-0DD4;SINHALA VOWEL SIGN KETTI PAA-PILLA;Mn;0;NSM;;;;;N;;;;;
-0DD6;SINHALA VOWEL SIGN DIGA PAA-PILLA;Mn;0;NSM;;;;;N;;;;;
-0DD8;SINHALA VOWEL SIGN GAETTA-PILLA;Mc;0;L;;;;;N;;;;;
-0DD9;SINHALA VOWEL SIGN KOMBUVA;Mc;0;L;;;;;N;;;;;
-0DDA;SINHALA VOWEL SIGN DIGA KOMBUVA;Mc;0;L;0DD9 0DCA;;;;N;;;;;
-0DDB;SINHALA VOWEL SIGN KOMBU DEKA;Mc;0;L;;;;;N;;;;;
-0DDC;SINHALA VOWEL SIGN KOMBUVA HAA AELA-PILLA;Mc;0;L;0DD9 0DCF;;;;N;;;;;
-0DDD;SINHALA VOWEL SIGN KOMBUVA HAA DIGA AELA-PILLA;Mc;0;L;0DDC 0DCA;;;;N;;;;;
-0DDE;SINHALA VOWEL SIGN KOMBUVA HAA GAYANUKITTA;Mc;0;L;0DD9 0DDF;;;;N;;;;;
-0DDF;SINHALA VOWEL SIGN GAYANUKITTA;Mc;0;L;;;;;N;;;;;
-0DF2;SINHALA VOWEL SIGN DIGA GAETTA-PILLA;Mc;0;L;;;;;N;;;;;
-0DF3;SINHALA VOWEL SIGN DIGA GAYANUKITTA;Mc;0;L;;;;;N;;;;;
-0DF4;SINHALA PUNCTUATION KUNDDALIYA;Po;0;L;;;;;N;;;;;
-0E01;THAI CHARACTER KO KAI;Lo;0;L;;;;;N;THAI LETTER KO KAI;;;;
-0E02;THAI CHARACTER KHO KHAI;Lo;0;L;;;;;N;THAI LETTER KHO KHAI;;;;
-0E03;THAI CHARACTER KHO KHUAT;Lo;0;L;;;;;N;THAI LETTER KHO KHUAT;;;;
-0E04;THAI CHARACTER KHO KHWAI;Lo;0;L;;;;;N;THAI LETTER KHO KHWAI;;;;
-0E05;THAI CHARACTER KHO KHON;Lo;0;L;;;;;N;THAI LETTER KHO KHON;;;;
-0E06;THAI CHARACTER KHO RAKHANG;Lo;0;L;;;;;N;THAI LETTER KHO RAKHANG;;;;
-0E07;THAI CHARACTER NGO NGU;Lo;0;L;;;;;N;THAI LETTER NGO NGU;;;;
-0E08;THAI CHARACTER CHO CHAN;Lo;0;L;;;;;N;THAI LETTER CHO CHAN;;;;
-0E09;THAI CHARACTER CHO CHING;Lo;0;L;;;;;N;THAI LETTER CHO CHING;;;;
-0E0A;THAI CHARACTER CHO CHANG;Lo;0;L;;;;;N;THAI LETTER CHO CHANG;;;;
-0E0B;THAI CHARACTER SO SO;Lo;0;L;;;;;N;THAI LETTER SO SO;;;;
-0E0C;THAI CHARACTER CHO CHOE;Lo;0;L;;;;;N;THAI LETTER CHO CHOE;;;;
-0E0D;THAI CHARACTER YO YING;Lo;0;L;;;;;N;THAI LETTER YO YING;;;;
-0E0E;THAI CHARACTER DO CHADA;Lo;0;L;;;;;N;THAI LETTER DO CHADA;;;;
-0E0F;THAI CHARACTER TO PATAK;Lo;0;L;;;;;N;THAI LETTER TO PATAK;;;;
-0E10;THAI CHARACTER THO THAN;Lo;0;L;;;;;N;THAI LETTER THO THAN;;;;
-0E11;THAI CHARACTER THO NANGMONTHO;Lo;0;L;;;;;N;THAI LETTER THO NANGMONTHO;;;;
-0E12;THAI CHARACTER THO PHUTHAO;Lo;0;L;;;;;N;THAI LETTER THO PHUTHAO;;;;
-0E13;THAI CHARACTER NO NEN;Lo;0;L;;;;;N;THAI LETTER NO NEN;;;;
-0E14;THAI CHARACTER DO DEK;Lo;0;L;;;;;N;THAI LETTER DO DEK;;;;
-0E15;THAI CHARACTER TO TAO;Lo;0;L;;;;;N;THAI LETTER TO TAO;;;;
-0E16;THAI CHARACTER THO THUNG;Lo;0;L;;;;;N;THAI LETTER THO THUNG;;;;
-0E17;THAI CHARACTER THO THAHAN;Lo;0;L;;;;;N;THAI LETTER THO THAHAN;;;;
-0E18;THAI CHARACTER THO THONG;Lo;0;L;;;;;N;THAI LETTER THO THONG;;;;
-0E19;THAI CHARACTER NO NU;Lo;0;L;;;;;N;THAI LETTER NO NU;;;;
-0E1A;THAI CHARACTER BO BAIMAI;Lo;0;L;;;;;N;THAI LETTER BO BAIMAI;;;;
-0E1B;THAI CHARACTER PO PLA;Lo;0;L;;;;;N;THAI LETTER PO PLA;;;;
-0E1C;THAI CHARACTER PHO PHUNG;Lo;0;L;;;;;N;THAI LETTER PHO PHUNG;;;;
-0E1D;THAI CHARACTER FO FA;Lo;0;L;;;;;N;THAI LETTER FO FA;;;;
-0E1E;THAI CHARACTER PHO PHAN;Lo;0;L;;;;;N;THAI LETTER PHO PHAN;;;;
-0E1F;THAI CHARACTER FO FAN;Lo;0;L;;;;;N;THAI LETTER FO FAN;;;;
-0E20;THAI CHARACTER PHO SAMPHAO;Lo;0;L;;;;;N;THAI LETTER PHO SAMPHAO;;;;
-0E21;THAI CHARACTER MO MA;Lo;0;L;;;;;N;THAI LETTER MO MA;;;;
-0E22;THAI CHARACTER YO YAK;Lo;0;L;;;;;N;THAI LETTER YO YAK;;;;
-0E23;THAI CHARACTER RO RUA;Lo;0;L;;;;;N;THAI LETTER RO RUA;;;;
-0E24;THAI CHARACTER RU;Lo;0;L;;;;;N;THAI LETTER RU;;;;
-0E25;THAI CHARACTER LO LING;Lo;0;L;;;;;N;THAI LETTER LO LING;;;;
-0E26;THAI CHARACTER LU;Lo;0;L;;;;;N;THAI LETTER LU;;;;
-0E27;THAI CHARACTER WO WAEN;Lo;0;L;;;;;N;THAI LETTER WO WAEN;;;;
-0E28;THAI CHARACTER SO SALA;Lo;0;L;;;;;N;THAI LETTER SO SALA;;;;
-0E29;THAI CHARACTER SO RUSI;Lo;0;L;;;;;N;THAI LETTER SO RUSI;;;;
-0E2A;THAI CHARACTER SO SUA;Lo;0;L;;;;;N;THAI LETTER SO SUA;;;;
-0E2B;THAI CHARACTER HO HIP;Lo;0;L;;;;;N;THAI LETTER HO HIP;;;;
-0E2C;THAI CHARACTER LO CHULA;Lo;0;L;;;;;N;THAI LETTER LO CHULA;;;;
-0E2D;THAI CHARACTER O ANG;Lo;0;L;;;;;N;THAI LETTER O ANG;;;;
-0E2E;THAI CHARACTER HO NOKHUK;Lo;0;L;;;;;N;THAI LETTER HO NOK HUK;;;;
-0E2F;THAI CHARACTER PAIYANNOI;Lo;0;L;;;;;N;THAI PAI YAN NOI;paiyan noi;;;
-0E30;THAI CHARACTER SARA A;Lo;0;L;;;;;N;THAI VOWEL SIGN SARA A;;;;
-0E31;THAI CHARACTER MAI HAN-AKAT;Mn;0;NSM;;;;;N;THAI VOWEL SIGN MAI HAN-AKAT;;;;
-0E32;THAI CHARACTER SARA AA;Lo;0;L;;;;;N;THAI VOWEL SIGN SARA AA;;;;
-0E33;THAI CHARACTER SARA AM;Lo;0;L;<compat> 0E4D 0E32;;;;N;THAI VOWEL SIGN SARA AM;;;;
-0E34;THAI CHARACTER SARA I;Mn;0;NSM;;;;;N;THAI VOWEL SIGN SARA I;;;;
-0E35;THAI CHARACTER SARA II;Mn;0;NSM;;;;;N;THAI VOWEL SIGN SARA II;;;;
-0E36;THAI CHARACTER SARA UE;Mn;0;NSM;;;;;N;THAI VOWEL SIGN SARA UE;;;;
-0E37;THAI CHARACTER SARA UEE;Mn;0;NSM;;;;;N;THAI VOWEL SIGN SARA UEE;sara uue;;;
-0E38;THAI CHARACTER SARA U;Mn;103;NSM;;;;;N;THAI VOWEL SIGN SARA U;;;;
-0E39;THAI CHARACTER SARA UU;Mn;103;NSM;;;;;N;THAI VOWEL SIGN SARA UU;;;;
-0E3A;THAI CHARACTER PHINTHU;Mn;9;NSM;;;;;N;THAI VOWEL SIGN PHINTHU;;;;
-0E3F;THAI CURRENCY SYMBOL BAHT;Sc;0;ET;;;;;N;THAI BAHT SIGN;;;;
-0E40;THAI CHARACTER SARA E;Lo;0;L;;;;;N;THAI VOWEL SIGN SARA E;;;;
-0E41;THAI CHARACTER SARA AE;Lo;0;L;;;;;N;THAI VOWEL SIGN SARA AE;;;;
-0E42;THAI CHARACTER SARA O;Lo;0;L;;;;;N;THAI VOWEL SIGN SARA O;;;;
-0E43;THAI CHARACTER SARA AI MAIMUAN;Lo;0;L;;;;;N;THAI VOWEL SIGN SARA MAI MUAN;sara ai mai muan;;;
-0E44;THAI CHARACTER SARA AI MAIMALAI;Lo;0;L;;;;;N;THAI VOWEL SIGN SARA MAI MALAI;sara ai mai malai;;;
-0E45;THAI CHARACTER LAKKHANGYAO;Lo;0;L;;;;;N;THAI LAK KHANG YAO;lakkhang yao;;;
-0E46;THAI CHARACTER MAIYAMOK;Lm;0;L;;;;;N;THAI MAI YAMOK;mai yamok;;;
-0E47;THAI CHARACTER MAITAIKHU;Mn;0;NSM;;;;;N;THAI VOWEL SIGN MAI TAI KHU;mai taikhu;;;
-0E48;THAI CHARACTER MAI EK;Mn;107;NSM;;;;;N;THAI TONE MAI EK;;;;
-0E49;THAI CHARACTER MAI THO;Mn;107;NSM;;;;;N;THAI TONE MAI THO;;;;
-0E4A;THAI CHARACTER MAI TRI;Mn;107;NSM;;;;;N;THAI TONE MAI TRI;;;;
-0E4B;THAI CHARACTER MAI CHATTAWA;Mn;107;NSM;;;;;N;THAI TONE MAI CHATTAWA;;;;
-0E4C;THAI CHARACTER THANTHAKHAT;Mn;0;NSM;;;;;N;THAI THANTHAKHAT;;;;
-0E4D;THAI CHARACTER NIKHAHIT;Mn;0;NSM;;;;;N;THAI NIKKHAHIT;nikkhahit;;;
-0E4E;THAI CHARACTER YAMAKKAN;Mn;0;NSM;;;;;N;THAI YAMAKKAN;;;;
-0E4F;THAI CHARACTER FONGMAN;Po;0;L;;;;;N;THAI FONGMAN;;;;
-0E50;THAI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
-0E51;THAI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
-0E52;THAI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
-0E53;THAI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
-0E54;THAI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
-0E55;THAI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
-0E56;THAI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
-0E57;THAI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
-0E58;THAI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
-0E59;THAI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
-0E5A;THAI CHARACTER ANGKHANKHU;Po;0;L;;;;;N;THAI ANGKHANKHU;;;;
-0E5B;THAI CHARACTER KHOMUT;Po;0;L;;;;;N;THAI KHOMUT;;;;
-0E81;LAO LETTER KO;Lo;0;L;;;;;N;;;;;
-0E82;LAO LETTER KHO SUNG;Lo;0;L;;;;;N;;;;;
-0E84;LAO LETTER KHO TAM;Lo;0;L;;;;;N;;;;;
-0E87;LAO LETTER NGO;Lo;0;L;;;;;N;;;;;
-0E88;LAO LETTER CO;Lo;0;L;;;;;N;;;;;
-0E8A;LAO LETTER SO TAM;Lo;0;L;;;;;N;;;;;
-0E8D;LAO LETTER NYO;Lo;0;L;;;;;N;;;;;
-0E94;LAO LETTER DO;Lo;0;L;;;;;N;;;;;
-0E95;LAO LETTER TO;Lo;0;L;;;;;N;;;;;
-0E96;LAO LETTER THO SUNG;Lo;0;L;;;;;N;;;;;
-0E97;LAO LETTER THO TAM;Lo;0;L;;;;;N;;;;;
-0E99;LAO LETTER NO;Lo;0;L;;;;;N;;;;;
-0E9A;LAO LETTER BO;Lo;0;L;;;;;N;;;;;
-0E9B;LAO LETTER PO;Lo;0;L;;;;;N;;;;;
-0E9C;LAO LETTER PHO SUNG;Lo;0;L;;;;;N;;;;;
-0E9D;LAO LETTER FO TAM;Lo;0;L;;;;;N;;;;;
-0E9E;LAO LETTER PHO TAM;Lo;0;L;;;;;N;;;;;
-0E9F;LAO LETTER FO SUNG;Lo;0;L;;;;;N;;;;;
-0EA1;LAO LETTER MO;Lo;0;L;;;;;N;;;;;
-0EA2;LAO LETTER YO;Lo;0;L;;;;;N;;;;;
-0EA3;LAO LETTER LO LING;Lo;0;L;;;;;N;;;;;
-0EA5;LAO LETTER LO LOOT;Lo;0;L;;;;;N;;;;;
-0EA7;LAO LETTER WO;Lo;0;L;;;;;N;;;;;
-0EAA;LAO LETTER SO SUNG;Lo;0;L;;;;;N;;;;;
-0EAB;LAO LETTER HO SUNG;Lo;0;L;;;;;N;;;;;
-0EAD;LAO LETTER O;Lo;0;L;;;;;N;;;;;
-0EAE;LAO LETTER HO TAM;Lo;0;L;;;;;N;;;;;
-0EAF;LAO ELLIPSIS;Lo;0;L;;;;;N;;;;;
-0EB0;LAO VOWEL SIGN A;Lo;0;L;;;;;N;;;;;
-0EB1;LAO VOWEL SIGN MAI KAN;Mn;0;NSM;;;;;N;;;;;
-0EB2;LAO VOWEL SIGN AA;Lo;0;L;;;;;N;;;;;
-0EB3;LAO VOWEL SIGN AM;Lo;0;L;<compat> 0ECD 0EB2;;;;N;;;;;
-0EB4;LAO VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
-0EB5;LAO VOWEL SIGN II;Mn;0;NSM;;;;;N;;;;;
-0EB6;LAO VOWEL SIGN Y;Mn;0;NSM;;;;;N;;;;;
-0EB7;LAO VOWEL SIGN YY;Mn;0;NSM;;;;;N;;;;;
-0EB8;LAO VOWEL SIGN U;Mn;118;NSM;;;;;N;;;;;
-0EB9;LAO VOWEL SIGN UU;Mn;118;NSM;;;;;N;;;;;
-0EBB;LAO VOWEL SIGN MAI KON;Mn;0;NSM;;;;;N;;;;;
-0EBC;LAO SEMIVOWEL SIGN LO;Mn;0;NSM;;;;;N;;;;;
-0EBD;LAO SEMIVOWEL SIGN NYO;Lo;0;L;;;;;N;;;;;
-0EC0;LAO VOWEL SIGN E;Lo;0;L;;;;;N;;;;;
-0EC1;LAO VOWEL SIGN EI;Lo;0;L;;;;;N;;;;;
-0EC2;LAO VOWEL SIGN O;Lo;0;L;;;;;N;;;;;
-0EC3;LAO VOWEL SIGN AY;Lo;0;L;;;;;N;;;;;
-0EC4;LAO VOWEL SIGN AI;Lo;0;L;;;;;N;;;;;
-0EC6;LAO KO LA;Lm;0;L;;;;;N;;;;;
-0EC8;LAO TONE MAI EK;Mn;122;NSM;;;;;N;;;;;
-0EC9;LAO TONE MAI THO;Mn;122;NSM;;;;;N;;;;;
-0ECA;LAO TONE MAI TI;Mn;122;NSM;;;;;N;;;;;
-0ECB;LAO TONE MAI CATAWA;Mn;122;NSM;;;;;N;;;;;
-0ECC;LAO CANCELLATION MARK;Mn;0;NSM;;;;;N;;;;;
-0ECD;LAO NIGGAHITA;Mn;0;NSM;;;;;N;;;;;
-0ED0;LAO DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
-0ED1;LAO DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
-0ED2;LAO DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
-0ED3;LAO DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
-0ED4;LAO DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
-0ED5;LAO DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
-0ED6;LAO DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
-0ED7;LAO DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
-0ED8;LAO DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
-0ED9;LAO DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
-0EDC;LAO HO NO;Lo;0;L;<compat> 0EAB 0E99;;;;N;;;;;
-0EDD;LAO HO MO;Lo;0;L;<compat> 0EAB 0EA1;;;;N;;;;;
-0F00;TIBETAN SYLLABLE OM;Lo;0;L;;;;;N;;;;;
-0F01;TIBETAN MARK GTER YIG MGO TRUNCATED A;So;0;L;;;;;N;;ter yik go a thung;;;
-0F02;TIBETAN MARK GTER YIG MGO -UM RNAM BCAD MA;So;0;L;;;;;N;;ter yik go wum nam chey ma;;;
-0F03;TIBETAN MARK GTER YIG MGO -UM GTER TSHEG MA;So;0;L;;;;;N;;ter yik go wum ter tsek ma;;;
-0F04;TIBETAN MARK INITIAL YIG MGO MDUN MA;Po;0;L;;;;;N;TIBETAN SINGLE ORNAMENT;yik go dun ma;;;
-0F05;TIBETAN MARK CLOSING YIG MGO SGAB MA;Po;0;L;;;;;N;;yik go kab ma;;;
-0F06;TIBETAN MARK CARET YIG MGO PHUR SHAD MA;Po;0;L;;;;;N;;yik go pur shey ma;;;
-0F07;TIBETAN MARK YIG MGO TSHEG SHAD MA;Po;0;L;;;;;N;;yik go tsek shey ma;;;
-0F08;TIBETAN MARK SBRUL SHAD;Po;0;L;;;;;N;TIBETAN RGYANSHAD;drul shey;;;
-0F09;TIBETAN MARK BSKUR YIG MGO;Po;0;L;;;;;N;;kur yik go;;;
-0F0A;TIBETAN MARK BKA- SHOG YIG MGO;Po;0;L;;;;;N;;ka sho yik go;;;
-0F0B;TIBETAN MARK INTERSYLLABIC TSHEG;Po;0;L;;;;;N;TIBETAN TSEG;tsek;;;
-0F0C;TIBETAN MARK DELIMITER TSHEG BSTAR;Po;0;L;<noBreak> 0F0B;;;;N;;tsek tar;;;
-0F0D;TIBETAN MARK SHAD;Po;0;L;;;;;N;TIBETAN SHAD;shey;;;
-0F0E;TIBETAN MARK NYIS SHAD;Po;0;L;;;;;N;TIBETAN DOUBLE SHAD;nyi shey;;;
-0F0F;TIBETAN MARK TSHEG SHAD;Po;0;L;;;;;N;;tsek shey;;;
-0F10;TIBETAN MARK NYIS TSHEG SHAD;Po;0;L;;;;;N;;nyi tsek shey;;;
-0F11;TIBETAN MARK RIN CHEN SPUNGS SHAD;Po;0;L;;;;;N;TIBETAN RINCHANPHUNGSHAD;rinchen pung shey;;;
-0F12;TIBETAN MARK RGYA GRAM SHAD;Po;0;L;;;;;N;;gya tram shey;;;
-0F13;TIBETAN MARK CARET -DZUD RTAGS ME LONG CAN;So;0;L;;;;;N;;dzu ta me long chen;;;
-0F14;TIBETAN MARK GTER TSHEG;So;0;L;;;;;N;TIBETAN COMMA;ter tsek;;;
-0F15;TIBETAN LOGOTYPE SIGN CHAD RTAGS;So;0;L;;;;;N;;che ta;;;
-0F16;TIBETAN LOGOTYPE SIGN LHAG RTAGS;So;0;L;;;;;N;;hlak ta;;;
-0F17;TIBETAN ASTROLOGICAL SIGN SGRA GCAN -CHAR RTAGS;So;0;L;;;;;N;;trachen char ta;;;
-0F18;TIBETAN ASTROLOGICAL SIGN -KHYUD PA;Mn;220;NSM;;;;;N;;kyu pa;;;
-0F19;TIBETAN ASTROLOGICAL SIGN SDONG TSHUGS;Mn;220;NSM;;;;;N;;dong tsu;;;
-0F1A;TIBETAN SIGN RDEL DKAR GCIG;So;0;L;;;;;N;;deka chig;;;
-0F1B;TIBETAN SIGN RDEL DKAR GNYIS;So;0;L;;;;;N;;deka nyi;;;
-0F1C;TIBETAN SIGN RDEL DKAR GSUM;So;0;L;;;;;N;;deka sum;;;
-0F1D;TIBETAN SIGN RDEL NAG GCIG;So;0;L;;;;;N;;dena chig;;;
-0F1E;TIBETAN SIGN RDEL NAG GNYIS;So;0;L;;;;;N;;dena nyi;;;
-0F1F;TIBETAN SIGN RDEL DKAR RDEL NAG;So;0;L;;;;;N;;deka dena;;;
-0F20;TIBETAN DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
-0F21;TIBETAN DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
-0F22;TIBETAN DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
-0F23;TIBETAN DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
-0F24;TIBETAN DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
-0F25;TIBETAN DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
-0F26;TIBETAN DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
-0F27;TIBETAN DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
-0F28;TIBETAN DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
-0F29;TIBETAN DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
-0F2A;TIBETAN DIGIT HALF ONE;No;0;L;;;;1/2;N;;;;;
-0F2B;TIBETAN DIGIT HALF TWO;No;0;L;;;;3/2;N;;;;;
-0F2C;TIBETAN DIGIT HALF THREE;No;0;L;;;;5/2;N;;;;;
-0F2D;TIBETAN DIGIT HALF FOUR;No;0;L;;;;7/2;N;;;;;
-0F2E;TIBETAN DIGIT HALF FIVE;No;0;L;;;;9/2;N;;;;;
-0F2F;TIBETAN DIGIT HALF SIX;No;0;L;;;;11/2;N;;;;;
-0F30;TIBETAN DIGIT HALF SEVEN;No;0;L;;;;13/2;N;;;;;
-0F31;TIBETAN DIGIT HALF EIGHT;No;0;L;;;;15/2;N;;;;;
-0F32;TIBETAN DIGIT HALF NINE;No;0;L;;;;17/2;N;;;;;
-0F33;TIBETAN DIGIT HALF ZERO;No;0;L;;;;-1/2;N;;;;;
-0F34;TIBETAN MARK BSDUS RTAGS;So;0;L;;;;;N;;du ta;;;
-0F35;TIBETAN MARK NGAS BZUNG NYI ZLA;Mn;220;NSM;;;;;N;TIBETAN HONORIFIC UNDER RING;nge zung nyi da;;;
-0F36;TIBETAN MARK CARET -DZUD RTAGS BZHI MIG CAN;So;0;L;;;;;N;;dzu ta shi mig chen;;;
-0F37;TIBETAN MARK NGAS BZUNG SGOR RTAGS;Mn;220;NSM;;;;;N;TIBETAN UNDER RING;nge zung gor ta;;;
-0F38;TIBETAN MARK CHE MGO;So;0;L;;;;;N;;che go;;;
-0F39;TIBETAN MARK TSA -PHRU;Mn;216;NSM;;;;;N;TIBETAN LENITION MARK;tsa tru;;;
-0F3A;TIBETAN MARK GUG RTAGS GYON;Ps;0;ON;;;;;Y;;gug ta yun;;;
-0F3B;TIBETAN MARK GUG RTAGS GYAS;Pe;0;ON;;;;;Y;;gug ta ye;;;
-0F3C;TIBETAN MARK ANG KHANG GYON;Ps;0;ON;;;;;Y;TIBETAN LEFT BRACE;ang kang yun;;;
-0F3D;TIBETAN MARK ANG KHANG GYAS;Pe;0;ON;;;;;Y;TIBETAN RIGHT BRACE;ang kang ye;;;
-0F3E;TIBETAN SIGN YAR TSHES;Mc;0;L;;;;;N;;yar tse;;;
-0F3F;TIBETAN SIGN MAR TSHES;Mc;0;L;;;;;N;;mar tse;;;
-0F40;TIBETAN LETTER KA;Lo;0;L;;;;;N;;;;;
-0F41;TIBETAN LETTER KHA;Lo;0;L;;;;;N;;;;;
-0F42;TIBETAN LETTER GA;Lo;0;L;;;;;N;;;;;
-0F43;TIBETAN LETTER GHA;Lo;0;L;0F42 0FB7;;;;N;;;;;
-0F44;TIBETAN LETTER NGA;Lo;0;L;;;;;N;;;;;
-0F45;TIBETAN LETTER CA;Lo;0;L;;;;;N;;;;;
-0F46;TIBETAN LETTER CHA;Lo;0;L;;;;;N;;;;;
-0F47;TIBETAN LETTER JA;Lo;0;L;;;;;N;;;;;
-0F49;TIBETAN LETTER NYA;Lo;0;L;;;;;N;;;;;
-0F4A;TIBETAN LETTER TTA;Lo;0;L;;;;;N;TIBETAN LETTER REVERSED TA;;;;
-0F4B;TIBETAN LETTER TTHA;Lo;0;L;;;;;N;TIBETAN LETTER REVERSED THA;;;;
-0F4C;TIBETAN LETTER DDA;Lo;0;L;;;;;N;TIBETAN LETTER REVERSED DA;;;;
-0F4D;TIBETAN LETTER DDHA;Lo;0;L;0F4C 0FB7;;;;N;;;;;
-0F4E;TIBETAN LETTER NNA;Lo;0;L;;;;;N;TIBETAN LETTER REVERSED NA;;;;
-0F4F;TIBETAN LETTER TA;Lo;0;L;;;;;N;;;;;
-0F50;TIBETAN LETTER THA;Lo;0;L;;;;;N;;;;;
-0F51;TIBETAN LETTER DA;Lo;0;L;;;;;N;;;;;
-0F52;TIBETAN LETTER DHA;Lo;0;L;0F51 0FB7;;;;N;;;;;
-0F53;TIBETAN LETTER NA;Lo;0;L;;;;;N;;;;;
-0F54;TIBETAN LETTER PA;Lo;0;L;;;;;N;;;;;
-0F55;TIBETAN LETTER PHA;Lo;0;L;;;;;N;;;;;
-0F56;TIBETAN LETTER BA;Lo;0;L;;;;;N;;;;;
-0F57;TIBETAN LETTER BHA;Lo;0;L;0F56 0FB7;;;;N;;;;;
-0F58;TIBETAN LETTER MA;Lo;0;L;;;;;N;;;;;
-0F59;TIBETAN LETTER TSA;Lo;0;L;;;;;N;;;;;
-0F5A;TIBETAN LETTER TSHA;Lo;0;L;;;;;N;;;;;
-0F5B;TIBETAN LETTER DZA;Lo;0;L;;;;;N;;;;;
-0F5C;TIBETAN LETTER DZHA;Lo;0;L;0F5B 0FB7;;;;N;;;;;
-0F5D;TIBETAN LETTER WA;Lo;0;L;;;;;N;;;;;
-0F5E;TIBETAN LETTER ZHA;Lo;0;L;;;;;N;;;;;
-0F5F;TIBETAN LETTER ZA;Lo;0;L;;;;;N;;;;;
-0F60;TIBETAN LETTER -A;Lo;0;L;;;;;N;TIBETAN LETTER AA;;;;
-0F61;TIBETAN LETTER YA;Lo;0;L;;;;;N;;;;;
-0F62;TIBETAN LETTER RA;Lo;0;L;;;;;N;;*;;;
-0F63;TIBETAN LETTER LA;Lo;0;L;;;;;N;;;;;
-0F64;TIBETAN LETTER SHA;Lo;0;L;;;;;N;;;;;
-0F65;TIBETAN LETTER SSA;Lo;0;L;;;;;N;TIBETAN LETTER REVERSED SHA;;;;
-0F66;TIBETAN LETTER SA;Lo;0;L;;;;;N;;;;;
-0F67;TIBETAN LETTER HA;Lo;0;L;;;;;N;;;;;
-0F68;TIBETAN LETTER A;Lo;0;L;;;;;N;;;;;
-0F69;TIBETAN LETTER KSSA;Lo;0;L;0F40 0FB5;;;;N;;;;;
-0F6A;TIBETAN LETTER FIXED-FORM RA;Lo;0;L;;;;;N;;*;;;
-0F6B;TIBETAN LETTER KKA;Lo;0;L;;;;;N;;;;;
-0F6C;TIBETAN LETTER RRA;Lo;0;L;;;;;N;;;;;
-0F71;TIBETAN VOWEL SIGN AA;Mn;129;NSM;;;;;N;;;;;
-0F72;TIBETAN VOWEL SIGN I;Mn;130;NSM;;;;;N;;;;;
-0F73;TIBETAN VOWEL SIGN II;Mn;0;NSM;0F71 0F72;;;;N;;;;;
-0F74;TIBETAN VOWEL SIGN U;Mn;132;NSM;;;;;N;;;;;
-0F75;TIBETAN VOWEL SIGN UU;Mn;0;NSM;0F71 0F74;;;;N;;;;;
-0F76;TIBETAN VOWEL SIGN VOCALIC R;Mn;0;NSM;0FB2 0F80;;;;N;;;;;
-0F77;TIBETAN VOWEL SIGN VOCALIC RR;Mn;0;NSM;<compat> 0FB2 0F81;;;;N;;;;;
-0F78;TIBETAN VOWEL SIGN VOCALIC L;Mn;0;NSM;0FB3 0F80;;;;N;;;;;
-0F79;TIBETAN VOWEL SIGN VOCALIC LL;Mn;0;NSM;<compat> 0FB3 0F81;;;;N;;;;;
-0F7A;TIBETAN VOWEL SIGN E;Mn;130;NSM;;;;;N;;;;;
-0F7B;TIBETAN VOWEL SIGN EE;Mn;130;NSM;;;;;N;TIBETAN VOWEL SIGN AI;;;;
-0F7C;TIBETAN VOWEL SIGN O;Mn;130;NSM;;;;;N;;;;;
-0F7D;TIBETAN VOWEL SIGN OO;Mn;130;NSM;;;;;N;TIBETAN VOWEL SIGN AU;;;;
-0F7E;TIBETAN SIGN RJES SU NGA RO;Mn;0;NSM;;;;;N;TIBETAN ANUSVARA;je su nga ro;;;
-0F7F;TIBETAN SIGN RNAM BCAD;Mc;0;L;;;;;N;TIBETAN VISARGA;nam chey;;;
-0F80;TIBETAN VOWEL SIGN REVERSED I;Mn;130;NSM;;;;;N;TIBETAN VOWEL SIGN SHORT I;;;;
-0F81;TIBETAN VOWEL SIGN REVERSED II;Mn;0;NSM;0F71 0F80;;;;N;;;;;
-0F82;TIBETAN SIGN NYI ZLA NAA DA;Mn;230;NSM;;;;;N;TIBETAN CANDRABINDU WITH ORNAMENT;nyi da na da;;;
-0F83;TIBETAN SIGN SNA LDAN;Mn;230;NSM;;;;;N;TIBETAN CANDRABINDU;nan de;;;
-0F84;TIBETAN MARK HALANTA;Mn;9;NSM;;;;;N;TIBETAN VIRAMA;;;;
-0F85;TIBETAN MARK PALUTA;Po;0;L;;;;;N;TIBETAN CHUCHENYIGE;;;;
-0F86;TIBETAN SIGN LCI RTAGS;Mn;230;NSM;;;;;N;;ji ta;;;
-0F87;TIBETAN SIGN YANG RTAGS;Mn;230;NSM;;;;;N;;yang ta;;;
-0F88;TIBETAN SIGN LCE TSA CAN;Lo;0;L;;;;;N;;che tsa chen;;;
-0F89;TIBETAN SIGN MCHU CAN;Lo;0;L;;;;;N;;chu chen;;;
-0F8A;TIBETAN SIGN GRU CAN RGYINGS;Lo;0;L;;;;;N;;tru chen ging;;;
-0F8B;TIBETAN SIGN GRU MED RGYINGS;Lo;0;L;;;;;N;;tru me ging;;;
-0F90;TIBETAN SUBJOINED LETTER KA;Mn;0;NSM;;;;;N;;;;;
-0F91;TIBETAN SUBJOINED LETTER KHA;Mn;0;NSM;;;;;N;;;;;
-0F92;TIBETAN SUBJOINED LETTER GA;Mn;0;NSM;;;;;N;;;;;
-0F93;TIBETAN SUBJOINED LETTER GHA;Mn;0;NSM;0F92 0FB7;;;;N;;;;;
-0F94;TIBETAN SUBJOINED LETTER NGA;Mn;0;NSM;;;;;N;;;;;
-0F95;TIBETAN SUBJOINED LETTER CA;Mn;0;NSM;;;;;N;;;;;
-0F96;TIBETAN SUBJOINED LETTER CHA;Mn;0;NSM;;;;;N;;;;;
-0F97;TIBETAN SUBJOINED LETTER JA;Mn;0;NSM;;;;;N;;;;;
-0F99;TIBETAN SUBJOINED LETTER NYA;Mn;0;NSM;;;;;N;;;;;
-0F9A;TIBETAN SUBJOINED LETTER TTA;Mn;0;NSM;;;;;N;;;;;
-0F9B;TIBETAN SUBJOINED LETTER TTHA;Mn;0;NSM;;;;;N;;;;;
-0F9C;TIBETAN SUBJOINED LETTER DDA;Mn;0;NSM;;;;;N;;;;;
-0F9D;TIBETAN SUBJOINED LETTER DDHA;Mn;0;NSM;0F9C 0FB7;;;;N;;;;;
-0F9E;TIBETAN SUBJOINED LETTER NNA;Mn;0;NSM;;;;;N;;;;;
-0F9F;TIBETAN SUBJOINED LETTER TA;Mn;0;NSM;;;;;N;;;;;
-0FA0;TIBETAN SUBJOINED LETTER THA;Mn;0;NSM;;;;;N;;;;;
-0FA1;TIBETAN SUBJOINED LETTER DA;Mn;0;NSM;;;;;N;;;;;
-0FA2;TIBETAN SUBJOINED LETTER DHA;Mn;0;NSM;0FA1 0FB7;;;;N;;;;;
-0FA3;TIBETAN SUBJOINED LETTER NA;Mn;0;NSM;;;;;N;;;;;
-0FA4;TIBETAN SUBJOINED LETTER PA;Mn;0;NSM;;;;;N;;;;;
-0FA5;TIBETAN SUBJOINED LETTER PHA;Mn;0;NSM;;;;;N;;;;;
-0FA6;TIBETAN SUBJOINED LETTER BA;Mn;0;NSM;;;;;N;;;;;
-0FA7;TIBETAN SUBJOINED LETTER BHA;Mn;0;NSM;0FA6 0FB7;;;;N;;;;;
-0FA8;TIBETAN SUBJOINED LETTER MA;Mn;0;NSM;;;;;N;;;;;
-0FA9;TIBETAN SUBJOINED LETTER TSA;Mn;0;NSM;;;;;N;;;;;
-0FAA;TIBETAN SUBJOINED LETTER TSHA;Mn;0;NSM;;;;;N;;;;;
-0FAB;TIBETAN SUBJOINED LETTER DZA;Mn;0;NSM;;;;;N;;;;;
-0FAC;TIBETAN SUBJOINED LETTER DZHA;Mn;0;NSM;0FAB 0FB7;;;;N;;;;;
-0FAD;TIBETAN SUBJOINED LETTER WA;Mn;0;NSM;;;;;N;;*;;;
-0FAE;TIBETAN SUBJOINED LETTER ZHA;Mn;0;NSM;;;;;N;;;;;
-0FAF;TIBETAN SUBJOINED LETTER ZA;Mn;0;NSM;;;;;N;;;;;
-0FB0;TIBETAN SUBJOINED LETTER -A;Mn;0;NSM;;;;;N;;;;;
-0FB1;TIBETAN SUBJOINED LETTER YA;Mn;0;NSM;;;;;N;;*;;;
-0FB2;TIBETAN SUBJOINED LETTER RA;Mn;0;NSM;;;;;N;;*;;;
-0FB3;TIBETAN SUBJOINED LETTER LA;Mn;0;NSM;;;;;N;;;;;
-0FB4;TIBETAN SUBJOINED LETTER SHA;Mn;0;NSM;;;;;N;;;;;
-0FB5;TIBETAN SUBJOINED LETTER SSA;Mn;0;NSM;;;;;N;;;;;
-0FB6;TIBETAN SUBJOINED LETTER SA;Mn;0;NSM;;;;;N;;;;;
-0FB7;TIBETAN SUBJOINED LETTER HA;Mn;0;NSM;;;;;N;;;;;
-0FB8;TIBETAN SUBJOINED LETTER A;Mn;0;NSM;;;;;N;;;;;
-0FB9;TIBETAN SUBJOINED LETTER KSSA;Mn;0;NSM;0F90 0FB5;;;;N;;;;;
-0FBA;TIBETAN SUBJOINED LETTER FIXED-FORM WA;Mn;0;NSM;;;;;N;;*;;;
-0FBB;TIBETAN SUBJOINED LETTER FIXED-FORM YA;Mn;0;NSM;;;;;N;;*;;;
-0FBC;TIBETAN SUBJOINED LETTER FIXED-FORM RA;Mn;0;NSM;;;;;N;;*;;;
-0FBE;TIBETAN KU RU KHA;So;0;L;;;;;N;;kuruka;;;
-0FBF;TIBETAN KU RU KHA BZHI MIG CAN;So;0;L;;;;;N;;kuruka shi mik chen;;;
-0FC0;TIBETAN CANTILLATION SIGN HEAVY BEAT;So;0;L;;;;;N;;;;;
-0FC1;TIBETAN CANTILLATION SIGN LIGHT BEAT;So;0;L;;;;;N;;;;;
-0FC2;TIBETAN CANTILLATION SIGN CANG TE-U;So;0;L;;;;;N;;chang tyu;;;
-0FC3;TIBETAN CANTILLATION SIGN SBUB -CHAL;So;0;L;;;;;N;;bub chey;;;
-0FC4;TIBETAN SYMBOL DRIL BU;So;0;L;;;;;N;;drilbu;;;
-0FC5;TIBETAN SYMBOL RDO RJE;So;0;L;;;;;N;;dorje;;;
-0FC6;TIBETAN SYMBOL PADMA GDAN;Mn;220;NSM;;;;;N;;pema den;;;
-0FC7;TIBETAN SYMBOL RDO RJE RGYA GRAM;So;0;L;;;;;N;;dorje gya dram;;;
-0FC8;TIBETAN SYMBOL PHUR PA;So;0;L;;;;;N;;phurba;;;
-0FC9;TIBETAN SYMBOL NOR BU;So;0;L;;;;;N;;norbu;;;
-0FCA;TIBETAN SYMBOL NOR BU NYIS -KHYIL;So;0;L;;;;;N;;norbu nyi khyi;;;
-0FCB;TIBETAN SYMBOL NOR BU GSUM -KHYIL;So;0;L;;;;;N;;norbu sum khyi;;;
-0FCC;TIBETAN SYMBOL NOR BU BZHI -KHYIL;So;0;L;;;;;N;;norbu shi khyi;;;
-0FCE;TIBETAN SIGN RDEL NAG RDEL DKAR;So;0;L;;;;;N;;dena deka;;;
-0FCF;TIBETAN SIGN RDEL NAG GSUM;So;0;L;;;;;N;;dena sum;;;
-0FD0;TIBETAN MARK BSKA- SHOG GI MGO RGYAN;Po;0;L;;;;;N;;ka shog gi go gyen;;;
-0FD1;TIBETAN MARK MNYAM YIG GI MGO RGYAN;Po;0;L;;;;;N;;nyam yig gi go gyen;;;
-0FD2;TIBETAN MARK NYIS TSHEG;Po;0;L;;;;;N;;nyi tsek;;;
-0FD3;TIBETAN MARK INITIAL BRDA RNYING YIG MGO MDUN MA;Po;0;L;;;;;N;;da nying yik go dun ma;;;
-0FD4;TIBETAN MARK CLOSING BRDA RNYING YIG MGO SGAB MA;Po;0;L;;;;;N;;da nying yik go kab ma;;;
-1000;MYANMAR LETTER KA;Lo;0;L;;;;;N;;;;;
-1001;MYANMAR LETTER KHA;Lo;0;L;;;;;N;;;;;
-1002;MYANMAR LETTER GA;Lo;0;L;;;;;N;;;;;
-1003;MYANMAR LETTER GHA;Lo;0;L;;;;;N;;;;;
-1004;MYANMAR LETTER NGA;Lo;0;L;;;;;N;;;;;
-1005;MYANMAR LETTER CA;Lo;0;L;;;;;N;;;;;
-1006;MYANMAR LETTER CHA;Lo;0;L;;;;;N;;;;;
-1007;MYANMAR LETTER JA;Lo;0;L;;;;;N;;;;;
-1008;MYANMAR LETTER JHA;Lo;0;L;;;;;N;;;;;
-1009;MYANMAR LETTER NYA;Lo;0;L;;;;;N;;;;;
-100A;MYANMAR LETTER NNYA;Lo;0;L;;;;;N;;;;;
-100B;MYANMAR LETTER TTA;Lo;0;L;;;;;N;;;;;
-100C;MYANMAR LETTER TTHA;Lo;0;L;;;;;N;;;;;
-100D;MYANMAR LETTER DDA;Lo;0;L;;;;;N;;;;;
-100E;MYANMAR LETTER DDHA;Lo;0;L;;;;;N;;;;;
-100F;MYANMAR LETTER NNA;Lo;0;L;;;;;N;;;;;
-1010;MYANMAR LETTER TA;Lo;0;L;;;;;N;;;;;
-1011;MYANMAR LETTER THA;Lo;0;L;;;;;N;;;;;
-1012;MYANMAR LETTER DA;Lo;0;L;;;;;N;;;;;
-1013;MYANMAR LETTER DHA;Lo;0;L;;;;;N;;;;;
-1014;MYANMAR LETTER NA;Lo;0;L;;;;;N;;;;;
-1015;MYANMAR LETTER PA;Lo;0;L;;;;;N;;;;;
-1016;MYANMAR LETTER PHA;Lo;0;L;;;;;N;;;;;
-1017;MYANMAR LETTER BA;Lo;0;L;;;;;N;;;;;
-1018;MYANMAR LETTER BHA;Lo;0;L;;;;;N;;;;;
-1019;MYANMAR LETTER MA;Lo;0;L;;;;;N;;;;;
-101A;MYANMAR LETTER YA;Lo;0;L;;;;;N;;;;;
-101B;MYANMAR LETTER RA;Lo;0;L;;;;;N;;;;;
-101C;MYANMAR LETTER LA;Lo;0;L;;;;;N;;;;;
-101D;MYANMAR LETTER WA;Lo;0;L;;;;;N;;;;;
-101E;MYANMAR LETTER SA;Lo;0;L;;;;;N;;;;;
-101F;MYANMAR LETTER HA;Lo;0;L;;;;;N;;;;;
-1020;MYANMAR LETTER LLA;Lo;0;L;;;;;N;;;;;
-1021;MYANMAR LETTER A;Lo;0;L;;;;;N;;;;;
-1022;MYANMAR LETTER SHAN A;Lo;0;L;;;;;N;;;;;
-1023;MYANMAR LETTER I;Lo;0;L;;;;;N;;;;;
-1024;MYANMAR LETTER II;Lo;0;L;;;;;N;;;;;
-1025;MYANMAR LETTER U;Lo;0;L;;;;;N;;;;;
-1026;MYANMAR LETTER UU;Lo;0;L;1025 102E;;;;N;;;;;
-1027;MYANMAR LETTER E;Lo;0;L;;;;;N;;;;;
-1028;MYANMAR LETTER MON E;Lo;0;L;;;;;N;;;;;
-1029;MYANMAR LETTER O;Lo;0;L;;;;;N;;;;;
-102A;MYANMAR LETTER AU;Lo;0;L;;;;;N;;;;;
-102B;MYANMAR VOWEL SIGN TALL AA;Mc;0;L;;;;;N;;;;;
-102C;MYANMAR VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
-102D;MYANMAR VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
-102E;MYANMAR VOWEL SIGN II;Mn;0;NSM;;;;;N;;;;;
-102F;MYANMAR VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
-1030;MYANMAR VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
-1031;MYANMAR VOWEL SIGN E;Mc;0;L;;;;;N;;;;;
-1032;MYANMAR VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;;
-1033;MYANMAR VOWEL SIGN MON II;Mn;0;NSM;;;;;N;;;;;
-1034;MYANMAR VOWEL SIGN MON O;Mn;0;NSM;;;;;N;;;;;
-1035;MYANMAR VOWEL SIGN E ABOVE;Mn;0;NSM;;;;;N;;;;;
-1036;MYANMAR SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
-1037;MYANMAR SIGN DOT BELOW;Mn;7;NSM;;;;;N;;;;;
-1038;MYANMAR SIGN VISARGA;Mc;0;L;;;;;N;;;;;
-1039;MYANMAR SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
-103A;MYANMAR SIGN ASAT;Mn;9;NSM;;;;;N;;;;;
-103B;MYANMAR CONSONANT SIGN MEDIAL YA;Mc;0;L;;;;;N;;;;;
-103C;MYANMAR CONSONANT SIGN MEDIAL RA;Mc;0;L;;;;;N;;;;;
-103D;MYANMAR CONSONANT SIGN MEDIAL WA;Mn;0;NSM;;;;;N;;;;;
-103E;MYANMAR CONSONANT SIGN MEDIAL HA;Mn;0;NSM;;;;;N;;;;;
-103F;MYANMAR LETTER GREAT SA;Lo;0;L;;;;;N;;;;;
-1040;MYANMAR DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
-1041;MYANMAR DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
-1042;MYANMAR DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
-1043;MYANMAR DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
-1044;MYANMAR DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
-1045;MYANMAR DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
-1046;MYANMAR DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
-1047;MYANMAR DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
-1048;MYANMAR DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
-1049;MYANMAR DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
-104A;MYANMAR SIGN LITTLE SECTION;Po;0;L;;;;;N;;;;;
-104B;MYANMAR SIGN SECTION;Po;0;L;;;;;N;;;;;
-104C;MYANMAR SYMBOL LOCATIVE;Po;0;L;;;;;N;;;;;
-104D;MYANMAR SYMBOL COMPLETED;Po;0;L;;;;;N;;;;;
-104E;MYANMAR SYMBOL AFOREMENTIONED;Po;0;L;;;;;N;;;;;
-104F;MYANMAR SYMBOL GENITIVE;Po;0;L;;;;;N;;;;;
-1050;MYANMAR LETTER SHA;Lo;0;L;;;;;N;;;;;
-1051;MYANMAR LETTER SSA;Lo;0;L;;;;;N;;;;;
-1052;MYANMAR LETTER VOCALIC R;Lo;0;L;;;;;N;;;;;
-1053;MYANMAR LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;;
-1054;MYANMAR LETTER VOCALIC L;Lo;0;L;;;;;N;;;;;
-1055;MYANMAR LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;;
-1056;MYANMAR VOWEL SIGN VOCALIC R;Mc;0;L;;;;;N;;;;;
-1057;MYANMAR VOWEL SIGN VOCALIC RR;Mc;0;L;;;;;N;;;;;
-1058;MYANMAR VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;;
-1059;MYANMAR VOWEL SIGN VOCALIC LL;Mn;0;NSM;;;;;N;;;;;
-105A;MYANMAR LETTER MON NGA;Lo;0;L;;;;;N;;;;;
-105B;MYANMAR LETTER MON JHA;Lo;0;L;;;;;N;;;;;
-105C;MYANMAR LETTER MON BBA;Lo;0;L;;;;;N;;;;;
-105D;MYANMAR LETTER MON BBE;Lo;0;L;;;;;N;;;;;
-105E;MYANMAR CONSONANT SIGN MON MEDIAL NA;Mn;0;NSM;;;;;N;;;;;
-105F;MYANMAR CONSONANT SIGN MON MEDIAL MA;Mn;0;NSM;;;;;N;;;;;
-1060;MYANMAR CONSONANT SIGN MON MEDIAL LA;Mn;0;NSM;;;;;N;;;;;
-1061;MYANMAR LETTER SGAW KAREN SHA;Lo;0;L;;;;;N;;;;;
-1062;MYANMAR VOWEL SIGN SGAW KAREN EU;Mc;0;L;;;;;N;;;;;
-1063;MYANMAR TONE MARK SGAW KAREN HATHI;Mc;0;L;;;;;N;;;;;
-1064;MYANMAR TONE MARK SGAW KAREN KE PHO;Mc;0;L;;;;;N;;;;;
-1065;MYANMAR LETTER WESTERN PWO KAREN THA;Lo;0;L;;;;;N;;;;;
-1066;MYANMAR LETTER WESTERN PWO KAREN PWA;Lo;0;L;;;;;N;;;;;
-1067;MYANMAR VOWEL SIGN WESTERN PWO KAREN EU;Mc;0;L;;;;;N;;;;;
-1068;MYANMAR VOWEL SIGN WESTERN PWO KAREN UE;Mc;0;L;;;;;N;;;;;
-1069;MYANMAR SIGN WESTERN PWO KAREN TONE-1;Mc;0;L;;;;;N;;;;;
-106A;MYANMAR SIGN WESTERN PWO KAREN TONE-2;Mc;0;L;;;;;N;;;;;
-106B;MYANMAR SIGN WESTERN PWO KAREN TONE-3;Mc;0;L;;;;;N;;;;;
-106C;MYANMAR SIGN WESTERN PWO KAREN TONE-4;Mc;0;L;;;;;N;;;;;
-106D;MYANMAR SIGN WESTERN PWO KAREN TONE-5;Mc;0;L;;;;;N;;;;;
-106E;MYANMAR LETTER EASTERN PWO KAREN NNA;Lo;0;L;;;;;N;;;;;
-106F;MYANMAR LETTER EASTERN PWO KAREN YWA;Lo;0;L;;;;;N;;;;;
-1070;MYANMAR LETTER EASTERN PWO KAREN GHWA;Lo;0;L;;;;;N;;;;;
-1071;MYANMAR VOWEL SIGN GEBA KAREN I;Mn;0;NSM;;;;;N;;;;;
-1072;MYANMAR VOWEL SIGN KAYAH OE;Mn;0;NSM;;;;;N;;;;;
-1073;MYANMAR VOWEL SIGN KAYAH U;Mn;0;NSM;;;;;N;;;;;
-1074;MYANMAR VOWEL SIGN KAYAH EE;Mn;0;NSM;;;;;N;;;;;
-1075;MYANMAR LETTER SHAN KA;Lo;0;L;;;;;N;;;;;
-1076;MYANMAR LETTER SHAN KHA;Lo;0;L;;;;;N;;;;;
-1077;MYANMAR LETTER SHAN GA;Lo;0;L;;;;;N;;;;;
-1078;MYANMAR LETTER SHAN CA;Lo;0;L;;;;;N;;;;;
-1079;MYANMAR LETTER SHAN ZA;Lo;0;L;;;;;N;;;;;
-107A;MYANMAR LETTER SHAN NYA;Lo;0;L;;;;;N;;;;;
-107B;MYANMAR LETTER SHAN DA;Lo;0;L;;;;;N;;;;;
-107C;MYANMAR LETTER SHAN NA;Lo;0;L;;;;;N;;;;;
-107D;MYANMAR LETTER SHAN PHA;Lo;0;L;;;;;N;;;;;
-107E;MYANMAR LETTER SHAN FA;Lo;0;L;;;;;N;;;;;
-107F;MYANMAR LETTER SHAN BA;Lo;0;L;;;;;N;;;;;
-1080;MYANMAR LETTER SHAN THA;Lo;0;L;;;;;N;;;;;
-1081;MYANMAR LETTER SHAN HA;Lo;0;L;;;;;N;;;;;
-1082;MYANMAR CONSONANT SIGN SHAN MEDIAL WA;Mn;0;NSM;;;;;N;;;;;
-1083;MYANMAR VOWEL SIGN SHAN AA;Mc;0;L;;;;;N;;;;;
-1084;MYANMAR VOWEL SIGN SHAN E;Mc;0;L;;;;;N;;;;;
-1085;MYANMAR VOWEL SIGN SHAN E ABOVE;Mn;0;NSM;;;;;N;;;;;
-1086;MYANMAR VOWEL SIGN SHAN FINAL Y;Mn;0;NSM;;;;;N;;;;;
-1087;MYANMAR SIGN SHAN TONE-2;Mc;0;L;;;;;N;;;;;
-1088;MYANMAR SIGN SHAN TONE-3;Mc;0;L;;;;;N;;;;;
-1089;MYANMAR SIGN SHAN TONE-5;Mc;0;L;;;;;N;;;;;
-108A;MYANMAR SIGN SHAN TONE-6;Mc;0;L;;;;;N;;;;;
-108B;MYANMAR SIGN SHAN COUNCIL TONE-2;Mc;0;L;;;;;N;;;;;
-108C;MYANMAR SIGN SHAN COUNCIL TONE-3;Mc;0;L;;;;;N;;;;;
-108D;MYANMAR SIGN SHAN COUNCIL EMPHATIC TONE;Mn;220;NSM;;;;;N;;;;;
-108E;MYANMAR LETTER RUMAI PALAUNG FA;Lo;0;L;;;;;N;;;;;
-108F;MYANMAR SIGN RUMAI PALAUNG TONE-5;Mc;0;L;;;;;N;;;;;
-1090;MYANMAR SHAN DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
-1091;MYANMAR SHAN DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
-1092;MYANMAR SHAN DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
-1093;MYANMAR SHAN DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
-1094;MYANMAR SHAN DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
-1095;MYANMAR SHAN DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
-1096;MYANMAR SHAN DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
-1097;MYANMAR SHAN DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
-1098;MYANMAR SHAN DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
-1099;MYANMAR SHAN DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
-109E;MYANMAR SYMBOL SHAN ONE;So;0;L;;;;;N;;;;;
-109F;MYANMAR SYMBOL SHAN EXCLAMATION;So;0;L;;;;;N;;;;;
-10A0;GEORGIAN CAPITAL LETTER AN;Lu;0;L;;;;;N;;Khutsuri;;2D00;
-10A1;GEORGIAN CAPITAL LETTER BAN;Lu;0;L;;;;;N;;Khutsuri;;2D01;
-10A2;GEORGIAN CAPITAL LETTER GAN;Lu;0;L;;;;;N;;Khutsuri;;2D02;
-10A3;GEORGIAN CAPITAL LETTER DON;Lu;0;L;;;;;N;;Khutsuri;;2D03;
-10A4;GEORGIAN CAPITAL LETTER EN;Lu;0;L;;;;;N;;Khutsuri;;2D04;
-10A5;GEORGIAN CAPITAL LETTER VIN;Lu;0;L;;;;;N;;Khutsuri;;2D05;
-10A6;GEORGIAN CAPITAL LETTER ZEN;Lu;0;L;;;;;N;;Khutsuri;;2D06;
-10A7;GEORGIAN CAPITAL LETTER TAN;Lu;0;L;;;;;N;;Khutsuri;;2D07;
-10A8;GEORGIAN CAPITAL LETTER IN;Lu;0;L;;;;;N;;Khutsuri;;2D08;
-10A9;GEORGIAN CAPITAL LETTER KAN;Lu;0;L;;;;;N;;Khutsuri;;2D09;
-10AA;GEORGIAN CAPITAL LETTER LAS;Lu;0;L;;;;;N;;Khutsuri;;2D0A;
-10AB;GEORGIAN CAPITAL LETTER MAN;Lu;0;L;;;;;N;;Khutsuri;;2D0B;
-10AC;GEORGIAN CAPITAL LETTER NAR;Lu;0;L;;;;;N;;Khutsuri;;2D0C;
-10AD;GEORGIAN CAPITAL LETTER ON;Lu;0;L;;;;;N;;Khutsuri;;2D0D;
-10AE;GEORGIAN CAPITAL LETTER PAR;Lu;0;L;;;;;N;;Khutsuri;;2D0E;
-10AF;GEORGIAN CAPITAL LETTER ZHAR;Lu;0;L;;;;;N;;Khutsuri;;2D0F;
-10B0;GEORGIAN CAPITAL LETTER RAE;Lu;0;L;;;;;N;;Khutsuri;;2D10;
-10B1;GEORGIAN CAPITAL LETTER SAN;Lu;0;L;;;;;N;;Khutsuri;;2D11;
-10B2;GEORGIAN CAPITAL LETTER TAR;Lu;0;L;;;;;N;;Khutsuri;;2D12;
-10B3;GEORGIAN CAPITAL LETTER UN;Lu;0;L;;;;;N;;Khutsuri;;2D13;
-10B4;GEORGIAN CAPITAL LETTER PHAR;Lu;0;L;;;;;N;;Khutsuri;;2D14;
-10B5;GEORGIAN CAPITAL LETTER KHAR;Lu;0;L;;;;;N;;Khutsuri;;2D15;
-10B6;GEORGIAN CAPITAL LETTER GHAN;Lu;0;L;;;;;N;;Khutsuri;;2D16;
-10B7;GEORGIAN CAPITAL LETTER QAR;Lu;0;L;;;;;N;;Khutsuri;;2D17;
-10B8;GEORGIAN CAPITAL LETTER SHIN;Lu;0;L;;;;;N;;Khutsuri;;2D18;
-10B9;GEORGIAN CAPITAL LETTER CHIN;Lu;0;L;;;;;N;;Khutsuri;;2D19;
-10BA;GEORGIAN CAPITAL LETTER CAN;Lu;0;L;;;;;N;;Khutsuri;;2D1A;
-10BB;GEORGIAN CAPITAL LETTER JIL;Lu;0;L;;;;;N;;Khutsuri;;2D1B;
-10BC;GEORGIAN CAPITAL LETTER CIL;Lu;0;L;;;;;N;;Khutsuri;;2D1C;
-10BD;GEORGIAN CAPITAL LETTER CHAR;Lu;0;L;;;;;N;;Khutsuri;;2D1D;
-10BE;GEORGIAN CAPITAL LETTER XAN;Lu;0;L;;;;;N;;Khutsuri;;2D1E;
-10BF;GEORGIAN CAPITAL LETTER JHAN;Lu;0;L;;;;;N;;Khutsuri;;2D1F;
-10C0;GEORGIAN CAPITAL LETTER HAE;Lu;0;L;;;;;N;;Khutsuri;;2D20;
-10C1;GEORGIAN CAPITAL LETTER HE;Lu;0;L;;;;;N;;Khutsuri;;2D21;
-10C2;GEORGIAN CAPITAL LETTER HIE;Lu;0;L;;;;;N;;Khutsuri;;2D22;
-10C3;GEORGIAN CAPITAL LETTER WE;Lu;0;L;;;;;N;;Khutsuri;;2D23;
-10C4;GEORGIAN CAPITAL LETTER HAR;Lu;0;L;;;;;N;;Khutsuri;;2D24;
-10C5;GEORGIAN CAPITAL LETTER HOE;Lu;0;L;;;;;N;;Khutsuri;;2D25;
-10D0;GEORGIAN LETTER AN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER AN;;;;
-10D1;GEORGIAN LETTER BAN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER BAN;;;;
-10D2;GEORGIAN LETTER GAN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER GAN;;;;
-10D3;GEORGIAN LETTER DON;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER DON;;;;
-10D4;GEORGIAN LETTER EN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER EN;;;;
-10D5;GEORGIAN LETTER VIN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER VIN;;;;
-10D6;GEORGIAN LETTER ZEN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER ZEN;;;;
-10D7;GEORGIAN LETTER TAN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER TAN;;;;
-10D8;GEORGIAN LETTER IN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER IN;;;;
-10D9;GEORGIAN LETTER KAN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER KAN;;;;
-10DA;GEORGIAN LETTER LAS;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER LAS;;;;
-10DB;GEORGIAN LETTER MAN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER MAN;;;;
-10DC;GEORGIAN LETTER NAR;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER NAR;;;;
-10DD;GEORGIAN LETTER ON;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER ON;;;;
-10DE;GEORGIAN LETTER PAR;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER PAR;;;;
-10DF;GEORGIAN LETTER ZHAR;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER ZHAR;;;;
-10E0;GEORGIAN LETTER RAE;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER RAE;;;;
-10E1;GEORGIAN LETTER SAN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER SAN;;;;
-10E2;GEORGIAN LETTER TAR;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER TAR;;;;
-10E3;GEORGIAN LETTER UN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER UN;;;;
-10E4;GEORGIAN LETTER PHAR;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER PHAR;;;;
-10E5;GEORGIAN LETTER KHAR;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER KHAR;;;;
-10E6;GEORGIAN LETTER GHAN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER GHAN;;;;
-10E7;GEORGIAN LETTER QAR;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER QAR;;;;
-10E8;GEORGIAN LETTER SHIN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER SHIN;;;;
-10E9;GEORGIAN LETTER CHIN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER CHIN;;;;
-10EA;GEORGIAN LETTER CAN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER CAN;;;;
-10EB;GEORGIAN LETTER JIL;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER JIL;;;;
-10EC;GEORGIAN LETTER CIL;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER CIL;;;;
-10ED;GEORGIAN LETTER CHAR;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER CHAR;;;;
-10EE;GEORGIAN LETTER XAN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER XAN;;;;
-10EF;GEORGIAN LETTER JHAN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER JHAN;;;;
-10F0;GEORGIAN LETTER HAE;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER HAE;;;;
-10F1;GEORGIAN LETTER HE;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER HE;;;;
-10F2;GEORGIAN LETTER HIE;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER HIE;;;;
-10F3;GEORGIAN LETTER WE;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER WE;;;;
-10F4;GEORGIAN LETTER HAR;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER HAR;;;;
-10F5;GEORGIAN LETTER HOE;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER HOE;;;;
-10F6;GEORGIAN LETTER FI;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER FI;;;;
-10F7;GEORGIAN LETTER YN;Lo;0;L;;;;;N;;;;;
-10F8;GEORGIAN LETTER ELIFI;Lo;0;L;;;;;N;;;;;
-10F9;GEORGIAN LETTER TURNED GAN;Lo;0;L;;;;;N;;;;;
-10FA;GEORGIAN LETTER AIN;Lo;0;L;;;;;N;;;;;
-10FB;GEORGIAN PARAGRAPH SEPARATOR;Po;0;L;;;;;N;;;;;
-10FC;MODIFIER LETTER GEORGIAN NAR;Lm;0;L;<super> 10DC;;;;N;;;;;
-1100;HANGUL CHOSEONG KIYEOK;Lo;0;L;;;;;N;;g *;;;
-1101;HANGUL CHOSEONG SSANGKIYEOK;Lo;0;L;;;;;N;;gg *;;;
-1102;HANGUL CHOSEONG NIEUN;Lo;0;L;;;;;N;;n *;;;
-1103;HANGUL CHOSEONG TIKEUT;Lo;0;L;;;;;N;;d *;;;
-1104;HANGUL CHOSEONG SSANGTIKEUT;Lo;0;L;;;;;N;;dd *;;;
-1105;HANGUL CHOSEONG RIEUL;Lo;0;L;;;;;N;;r *;;;
-1106;HANGUL CHOSEONG MIEUM;Lo;0;L;;;;;N;;m *;;;
-1107;HANGUL CHOSEONG PIEUP;Lo;0;L;;;;;N;;b *;;;
-1108;HANGUL CHOSEONG SSANGPIEUP;Lo;0;L;;;;;N;;bb *;;;
-1109;HANGUL CHOSEONG SIOS;Lo;0;L;;;;;N;;s *;;;
-110A;HANGUL CHOSEONG SSANGSIOS;Lo;0;L;;;;;N;;ss *;;;
-110B;HANGUL CHOSEONG IEUNG;Lo;0;L;;;;;N;;;;;
-110C;HANGUL CHOSEONG CIEUC;Lo;0;L;;;;;N;;j *;;;
-110D;HANGUL CHOSEONG SSANGCIEUC;Lo;0;L;;;;;N;;jj *;;;
-110E;HANGUL CHOSEONG CHIEUCH;Lo;0;L;;;;;N;;c *;;;
-110F;HANGUL CHOSEONG KHIEUKH;Lo;0;L;;;;;N;;k *;;;
-1110;HANGUL CHOSEONG THIEUTH;Lo;0;L;;;;;N;;t *;;;
-1111;HANGUL CHOSEONG PHIEUPH;Lo;0;L;;;;;N;;p *;;;
-1112;HANGUL CHOSEONG HIEUH;Lo;0;L;;;;;N;;h *;;;
-1113;HANGUL CHOSEONG NIEUN-KIYEOK;Lo;0;L;;;;;N;;;;;
-1114;HANGUL CHOSEONG SSANGNIEUN;Lo;0;L;;;;;N;;;;;
-1115;HANGUL CHOSEONG NIEUN-TIKEUT;Lo;0;L;;;;;N;;;;;
-1116;HANGUL CHOSEONG NIEUN-PIEUP;Lo;0;L;;;;;N;;;;;
-1117;HANGUL CHOSEONG TIKEUT-KIYEOK;Lo;0;L;;;;;N;;;;;
-1118;HANGUL CHOSEONG RIEUL-NIEUN;Lo;0;L;;;;;N;;;;;
-1119;HANGUL CHOSEONG SSANGRIEUL;Lo;0;L;;;;;N;;;;;
-111A;HANGUL CHOSEONG RIEUL-HIEUH;Lo;0;L;;;;;N;;;;;
-111B;HANGUL CHOSEONG KAPYEOUNRIEUL;Lo;0;L;;;;;N;;;;;
-111C;HANGUL CHOSEONG MIEUM-PIEUP;Lo;0;L;;;;;N;;;;;
-111D;HANGUL CHOSEONG KAPYEOUNMIEUM;Lo;0;L;;;;;N;;;;;
-111E;HANGUL CHOSEONG PIEUP-KIYEOK;Lo;0;L;;;;;N;;;;;
-111F;HANGUL CHOSEONG PIEUP-NIEUN;Lo;0;L;;;;;N;;;;;
-1120;HANGUL CHOSEONG PIEUP-TIKEUT;Lo;0;L;;;;;N;;;;;
-1121;HANGUL CHOSEONG PIEUP-SIOS;Lo;0;L;;;;;N;;;;;
-1122;HANGUL CHOSEONG PIEUP-SIOS-KIYEOK;Lo;0;L;;;;;N;;;;;
-1123;HANGUL CHOSEONG PIEUP-SIOS-TIKEUT;Lo;0;L;;;;;N;;;;;
-1124;HANGUL CHOSEONG PIEUP-SIOS-PIEUP;Lo;0;L;;;;;N;;;;;
-1125;HANGUL CHOSEONG PIEUP-SSANGSIOS;Lo;0;L;;;;;N;;;;;
-1126;HANGUL CHOSEONG PIEUP-SIOS-CIEUC;Lo;0;L;;;;;N;;;;;
-1127;HANGUL CHOSEONG PIEUP-CIEUC;Lo;0;L;;;;;N;;;;;
-1128;HANGUL CHOSEONG PIEUP-CHIEUCH;Lo;0;L;;;;;N;;;;;
-1129;HANGUL CHOSEONG PIEUP-THIEUTH;Lo;0;L;;;;;N;;;;;
-112A;HANGUL CHOSEONG PIEUP-PHIEUPH;Lo;0;L;;;;;N;;;;;
-112B;HANGUL CHOSEONG KAPYEOUNPIEUP;Lo;0;L;;;;;N;;;;;
-112C;HANGUL CHOSEONG KAPYEOUNSSANGPIEUP;Lo;0;L;;;;;N;;;;;
-112D;HANGUL CHOSEONG SIOS-KIYEOK;Lo;0;L;;;;;N;;;;;
-112E;HANGUL CHOSEONG SIOS-NIEUN;Lo;0;L;;;;;N;;;;;
-112F;HANGUL CHOSEONG SIOS-TIKEUT;Lo;0;L;;;;;N;;;;;
-1130;HANGUL CHOSEONG SIOS-RIEUL;Lo;0;L;;;;;N;;;;;
-1131;HANGUL CHOSEONG SIOS-MIEUM;Lo;0;L;;;;;N;;;;;
-1132;HANGUL CHOSEONG SIOS-PIEUP;Lo;0;L;;;;;N;;;;;
-1133;HANGUL CHOSEONG SIOS-PIEUP-KIYEOK;Lo;0;L;;;;;N;;;;;
-1134;HANGUL CHOSEONG SIOS-SSANGSIOS;Lo;0;L;;;;;N;;;;;
-1135;HANGUL CHOSEONG SIOS-IEUNG;Lo;0;L;;;;;N;;;;;
-1136;HANGUL CHOSEONG SIOS-CIEUC;Lo;0;L;;;;;N;;;;;
-1137;HANGUL CHOSEONG SIOS-CHIEUCH;Lo;0;L;;;;;N;;;;;
-1138;HANGUL CHOSEONG SIOS-KHIEUKH;Lo;0;L;;;;;N;;;;;
-1139;HANGUL CHOSEONG SIOS-THIEUTH;Lo;0;L;;;;;N;;;;;
-113A;HANGUL CHOSEONG SIOS-PHIEUPH;Lo;0;L;;;;;N;;;;;
-113B;HANGUL CHOSEONG SIOS-HIEUH;Lo;0;L;;;;;N;;;;;
-113C;HANGUL CHOSEONG CHITUEUMSIOS;Lo;0;L;;;;;N;;;;;
-113D;HANGUL CHOSEONG CHITUEUMSSANGSIOS;Lo;0;L;;;;;N;;;;;
-113E;HANGUL CHOSEONG CEONGCHIEUMSIOS;Lo;0;L;;;;;N;;;;;
-113F;HANGUL CHOSEONG CEONGCHIEUMSSANGSIOS;Lo;0;L;;;;;N;;;;;
-1140;HANGUL CHOSEONG PANSIOS;Lo;0;L;;;;;N;;;;;
-1141;HANGUL CHOSEONG IEUNG-KIYEOK;Lo;0;L;;;;;N;;;;;
-1142;HANGUL CHOSEONG IEUNG-TIKEUT;Lo;0;L;;;;;N;;;;;
-1143;HANGUL CHOSEONG IEUNG-MIEUM;Lo;0;L;;;;;N;;;;;
-1144;HANGUL CHOSEONG IEUNG-PIEUP;Lo;0;L;;;;;N;;;;;
-1145;HANGUL CHOSEONG IEUNG-SIOS;Lo;0;L;;;;;N;;;;;
-1146;HANGUL CHOSEONG IEUNG-PANSIOS;Lo;0;L;;;;;N;;;;;
-1147;HANGUL CHOSEONG SSANGIEUNG;Lo;0;L;;;;;N;;;;;
-1148;HANGUL CHOSEONG IEUNG-CIEUC;Lo;0;L;;;;;N;;;;;
-1149;HANGUL CHOSEONG IEUNG-CHIEUCH;Lo;0;L;;;;;N;;;;;
-114A;HANGUL CHOSEONG IEUNG-THIEUTH;Lo;0;L;;;;;N;;;;;
-114B;HANGUL CHOSEONG IEUNG-PHIEUPH;Lo;0;L;;;;;N;;;;;
-114C;HANGUL CHOSEONG YESIEUNG;Lo;0;L;;;;;N;;;;;
-114D;HANGUL CHOSEONG CIEUC-IEUNG;Lo;0;L;;;;;N;;;;;
-114E;HANGUL CHOSEONG CHITUEUMCIEUC;Lo;0;L;;;;;N;;;;;
-114F;HANGUL CHOSEONG CHITUEUMSSANGCIEUC;Lo;0;L;;;;;N;;;;;
-1150;HANGUL CHOSEONG CEONGCHIEUMCIEUC;Lo;0;L;;;;;N;;;;;
-1151;HANGUL CHOSEONG CEONGCHIEUMSSANGCIEUC;Lo;0;L;;;;;N;;;;;
-1152;HANGUL CHOSEONG CHIEUCH-KHIEUKH;Lo;0;L;;;;;N;;;;;
-1153;HANGUL CHOSEONG CHIEUCH-HIEUH;Lo;0;L;;;;;N;;;;;
-1154;HANGUL CHOSEONG CHITUEUMCHIEUCH;Lo;0;L;;;;;N;;;;;
-1155;HANGUL CHOSEONG CEONGCHIEUMCHIEUCH;Lo;0;L;;;;;N;;;;;
-1156;HANGUL CHOSEONG PHIEUPH-PIEUP;Lo;0;L;;;;;N;;;;;
-1157;HANGUL CHOSEONG KAPYEOUNPHIEUPH;Lo;0;L;;;;;N;;;;;
-1158;HANGUL CHOSEONG SSANGHIEUH;Lo;0;L;;;;;N;;;;;
-1159;HANGUL CHOSEONG YEORINHIEUH;Lo;0;L;;;;;N;;;;;
-115F;HANGUL CHOSEONG FILLER;Lo;0;L;;;;;N;;;;;
-1160;HANGUL JUNGSEONG FILLER;Lo;0;L;;;;;N;;;;;
-1161;HANGUL JUNGSEONG A;Lo;0;L;;;;;N;;;;;
-1162;HANGUL JUNGSEONG AE;Lo;0;L;;;;;N;;;;;
-1163;HANGUL JUNGSEONG YA;Lo;0;L;;;;;N;;;;;
-1164;HANGUL JUNGSEONG YAE;Lo;0;L;;;;;N;;;;;
-1165;HANGUL JUNGSEONG EO;Lo;0;L;;;;;N;;;;;
-1166;HANGUL JUNGSEONG E;Lo;0;L;;;;;N;;;;;
-1167;HANGUL JUNGSEONG YEO;Lo;0;L;;;;;N;;;;;
-1168;HANGUL JUNGSEONG YE;Lo;0;L;;;;;N;;;;;
-1169;HANGUL JUNGSEONG O;Lo;0;L;;;;;N;;;;;
-116A;HANGUL JUNGSEONG WA;Lo;0;L;;;;;N;;;;;
-116B;HANGUL JUNGSEONG WAE;Lo;0;L;;;;;N;;;;;
-116C;HANGUL JUNGSEONG OE;Lo;0;L;;;;;N;;;;;
-116D;HANGUL JUNGSEONG YO;Lo;0;L;;;;;N;;;;;
-116E;HANGUL JUNGSEONG U;Lo;0;L;;;;;N;;;;;
-116F;HANGUL JUNGSEONG WEO;Lo;0;L;;;;;N;;;;;
-1170;HANGUL JUNGSEONG WE;Lo;0;L;;;;;N;;;;;
-1171;HANGUL JUNGSEONG WI;Lo;0;L;;;;;N;;;;;
-1172;HANGUL JUNGSEONG YU;Lo;0;L;;;;;N;;;;;
-1173;HANGUL JUNGSEONG EU;Lo;0;L;;;;;N;;;;;
-1174;HANGUL JUNGSEONG YI;Lo;0;L;;;;;N;;;;;
-1175;HANGUL JUNGSEONG I;Lo;0;L;;;;;N;;;;;
-1176;HANGUL JUNGSEONG A-O;Lo;0;L;;;;;N;;;;;
-1177;HANGUL JUNGSEONG A-U;Lo;0;L;;;;;N;;;;;
-1178;HANGUL JUNGSEONG YA-O;Lo;0;L;;;;;N;;;;;
-1179;HANGUL JUNGSEONG YA-YO;Lo;0;L;;;;;N;;;;;
-117A;HANGUL JUNGSEONG EO-O;Lo;0;L;;;;;N;;;;;
-117B;HANGUL JUNGSEONG EO-U;Lo;0;L;;;;;N;;;;;
-117C;HANGUL JUNGSEONG EO-EU;Lo;0;L;;;;;N;;;;;
-117D;HANGUL JUNGSEONG YEO-O;Lo;0;L;;;;;N;;;;;
-117E;HANGUL JUNGSEONG YEO-U;Lo;0;L;;;;;N;;;;;
-117F;HANGUL JUNGSEONG O-EO;Lo;0;L;;;;;N;;;;;
-1180;HANGUL JUNGSEONG O-E;Lo;0;L;;;;;N;;;;;
-1181;HANGUL JUNGSEONG O-YE;Lo;0;L;;;;;N;;;;;
-1182;HANGUL JUNGSEONG O-O;Lo;0;L;;;;;N;;;;;
-1183;HANGUL JUNGSEONG O-U;Lo;0;L;;;;;N;;;;;
-1184;HANGUL JUNGSEONG YO-YA;Lo;0;L;;;;;N;;;;;
-1185;HANGUL JUNGSEONG YO-YAE;Lo;0;L;;;;;N;;;;;
-1186;HANGUL JUNGSEONG YO-YEO;Lo;0;L;;;;;N;;;;;
-1187;HANGUL JUNGSEONG YO-O;Lo;0;L;;;;;N;;;;;
-1188;HANGUL JUNGSEONG YO-I;Lo;0;L;;;;;N;;;;;
-1189;HANGUL JUNGSEONG U-A;Lo;0;L;;;;;N;;;;;
-118A;HANGUL JUNGSEONG U-AE;Lo;0;L;;;;;N;;;;;
-118B;HANGUL JUNGSEONG U-EO-EU;Lo;0;L;;;;;N;;;;;
-118C;HANGUL JUNGSEONG U-YE;Lo;0;L;;;;;N;;;;;
-118D;HANGUL JUNGSEONG U-U;Lo;0;L;;;;;N;;;;;
-118E;HANGUL JUNGSEONG YU-A;Lo;0;L;;;;;N;;;;;
-118F;HANGUL JUNGSEONG YU-EO;Lo;0;L;;;;;N;;;;;
-1190;HANGUL JUNGSEONG YU-E;Lo;0;L;;;;;N;;;;;
-1191;HANGUL JUNGSEONG YU-YEO;Lo;0;L;;;;;N;;;;;
-1192;HANGUL JUNGSEONG YU-YE;Lo;0;L;;;;;N;;;;;
-1193;HANGUL JUNGSEONG YU-U;Lo;0;L;;;;;N;;;;;
-1194;HANGUL JUNGSEONG YU-I;Lo;0;L;;;;;N;;;;;
-1195;HANGUL JUNGSEONG EU-U;Lo;0;L;;;;;N;;;;;
-1196;HANGUL JUNGSEONG EU-EU;Lo;0;L;;;;;N;;;;;
-1197;HANGUL JUNGSEONG YI-U;Lo;0;L;;;;;N;;;;;
-1198;HANGUL JUNGSEONG I-A;Lo;0;L;;;;;N;;;;;
-1199;HANGUL JUNGSEONG I-YA;Lo;0;L;;;;;N;;;;;
-119A;HANGUL JUNGSEONG I-O;Lo;0;L;;;;;N;;;;;
-119B;HANGUL JUNGSEONG I-U;Lo;0;L;;;;;N;;;;;
-119C;HANGUL JUNGSEONG I-EU;Lo;0;L;;;;;N;;;;;
-119D;HANGUL JUNGSEONG I-ARAEA;Lo;0;L;;;;;N;;;;;
-119E;HANGUL JUNGSEONG ARAEA;Lo;0;L;;;;;N;;;;;
-119F;HANGUL JUNGSEONG ARAEA-EO;Lo;0;L;;;;;N;;;;;
-11A0;HANGUL JUNGSEONG ARAEA-U;Lo;0;L;;;;;N;;;;;
-11A1;HANGUL JUNGSEONG ARAEA-I;Lo;0;L;;;;;N;;;;;
-11A2;HANGUL JUNGSEONG SSANGARAEA;Lo;0;L;;;;;N;;;;;
-11A8;HANGUL JONGSEONG KIYEOK;Lo;0;L;;;;;N;;g *;;;
-11A9;HANGUL JONGSEONG SSANGKIYEOK;Lo;0;L;;;;;N;;gg *;;;
-11AA;HANGUL JONGSEONG KIYEOK-SIOS;Lo;0;L;;;;;N;;gs *;;;
-11AB;HANGUL JONGSEONG NIEUN;Lo;0;L;;;;;N;;n *;;;
-11AC;HANGUL JONGSEONG NIEUN-CIEUC;Lo;0;L;;;;;N;;nj *;;;
-11AD;HANGUL JONGSEONG NIEUN-HIEUH;Lo;0;L;;;;;N;;nh *;;;
-11AE;HANGUL JONGSEONG TIKEUT;Lo;0;L;;;;;N;;d *;;;
-11AF;HANGUL JONGSEONG RIEUL;Lo;0;L;;;;;N;;l *;;;
-11B0;HANGUL JONGSEONG RIEUL-KIYEOK;Lo;0;L;;;;;N;;lg *;;;
-11B1;HANGUL JONGSEONG RIEUL-MIEUM;Lo;0;L;;;;;N;;lm *;;;
-11B2;HANGUL JONGSEONG RIEUL-PIEUP;Lo;0;L;;;;;N;;lb *;;;
-11B3;HANGUL JONGSEONG RIEUL-SIOS;Lo;0;L;;;;;N;;ls *;;;
-11B4;HANGUL JONGSEONG RIEUL-THIEUTH;Lo;0;L;;;;;N;;lt *;;;
-11B5;HANGUL JONGSEONG RIEUL-PHIEUPH;Lo;0;L;;;;;N;;lp *;;;
-11B6;HANGUL JONGSEONG RIEUL-HIEUH;Lo;0;L;;;;;N;;lh *;;;
-11B7;HANGUL JONGSEONG MIEUM;Lo;0;L;;;;;N;;m *;;;
-11B8;HANGUL JONGSEONG PIEUP;Lo;0;L;;;;;N;;b *;;;
-11B9;HANGUL JONGSEONG PIEUP-SIOS;Lo;0;L;;;;;N;;bs *;;;
-11BA;HANGUL JONGSEONG SIOS;Lo;0;L;;;;;N;;s *;;;
-11BB;HANGUL JONGSEONG SSANGSIOS;Lo;0;L;;;;;N;;ss *;;;
-11BC;HANGUL JONGSEONG IEUNG;Lo;0;L;;;;;N;;ng *;;;
-11BD;HANGUL JONGSEONG CIEUC;Lo;0;L;;;;;N;;j *;;;
-11BE;HANGUL JONGSEONG CHIEUCH;Lo;0;L;;;;;N;;c *;;;
-11BF;HANGUL JONGSEONG KHIEUKH;Lo;0;L;;;;;N;;k *;;;
-11C0;HANGUL JONGSEONG THIEUTH;Lo;0;L;;;;;N;;t *;;;
-11C1;HANGUL JONGSEONG PHIEUPH;Lo;0;L;;;;;N;;p *;;;
-11C2;HANGUL JONGSEONG HIEUH;Lo;0;L;;;;;N;;h *;;;
-11C3;HANGUL JONGSEONG KIYEOK-RIEUL;Lo;0;L;;;;;N;;;;;
-11C4;HANGUL JONGSEONG KIYEOK-SIOS-KIYEOK;Lo;0;L;;;;;N;;;;;
-11C5;HANGUL JONGSEONG NIEUN-KIYEOK;Lo;0;L;;;;;N;;;;;
-11C6;HANGUL JONGSEONG NIEUN-TIKEUT;Lo;0;L;;;;;N;;;;;
-11C7;HANGUL JONGSEONG NIEUN-SIOS;Lo;0;L;;;;;N;;;;;
-11C8;HANGUL JONGSEONG NIEUN-PANSIOS;Lo;0;L;;;;;N;;;;;
-11C9;HANGUL JONGSEONG NIEUN-THIEUTH;Lo;0;L;;;;;N;;;;;
-11CA;HANGUL JONGSEONG TIKEUT-KIYEOK;Lo;0;L;;;;;N;;;;;
-11CB;HANGUL JONGSEONG TIKEUT-RIEUL;Lo;0;L;;;;;N;;;;;
-11CC;HANGUL JONGSEONG RIEUL-KIYEOK-SIOS;Lo;0;L;;;;;N;;;;;
-11CD;HANGUL JONGSEONG RIEUL-NIEUN;Lo;0;L;;;;;N;;;;;
-11CE;HANGUL JONGSEONG RIEUL-TIKEUT;Lo;0;L;;;;;N;;;;;
-11CF;HANGUL JONGSEONG RIEUL-TIKEUT-HIEUH;Lo;0;L;;;;;N;;;;;
-11D0;HANGUL JONGSEONG SSANGRIEUL;Lo;0;L;;;;;N;;;;;
-11D1;HANGUL JONGSEONG RIEUL-MIEUM-KIYEOK;Lo;0;L;;;;;N;;;;;
-11D2;HANGUL JONGSEONG RIEUL-MIEUM-SIOS;Lo;0;L;;;;;N;;;;;
-11D3;HANGUL JONGSEONG RIEUL-PIEUP-SIOS;Lo;0;L;;;;;N;;;;;
-11D4;HANGUL JONGSEONG RIEUL-PIEUP-HIEUH;Lo;0;L;;;;;N;;;;;
-11D5;HANGUL JONGSEONG RIEUL-KAPYEOUNPIEUP;Lo;0;L;;;;;N;;;;;
-11D6;HANGUL JONGSEONG RIEUL-SSANGSIOS;Lo;0;L;;;;;N;;;;;
-11D7;HANGUL JONGSEONG RIEUL-PANSIOS;Lo;0;L;;;;;N;;;;;
-11D8;HANGUL JONGSEONG RIEUL-KHIEUKH;Lo;0;L;;;;;N;;;;;
-11D9;HANGUL JONGSEONG RIEUL-YEORINHIEUH;Lo;0;L;;;;;N;;;;;
-11DA;HANGUL JONGSEONG MIEUM-KIYEOK;Lo;0;L;;;;;N;;;;;
-11DB;HANGUL JONGSEONG MIEUM-RIEUL;Lo;0;L;;;;;N;;;;;
-11DC;HANGUL JONGSEONG MIEUM-PIEUP;Lo;0;L;;;;;N;;;;;
-11DD;HANGUL JONGSEONG MIEUM-SIOS;Lo;0;L;;;;;N;;;;;
-11DE;HANGUL JONGSEONG MIEUM-SSANGSIOS;Lo;0;L;;;;;N;;;;;
-11DF;HANGUL JONGSEONG MIEUM-PANSIOS;Lo;0;L;;;;;N;;;;;
-11E0;HANGUL JONGSEONG MIEUM-CHIEUCH;Lo;0;L;;;;;N;;;;;
-11E1;HANGUL JONGSEONG MIEUM-HIEUH;Lo;0;L;;;;;N;;;;;
-11E2;HANGUL JONGSEONG KAPYEOUNMIEUM;Lo;0;L;;;;;N;;;;;
-11E3;HANGUL JONGSEONG PIEUP-RIEUL;Lo;0;L;;;;;N;;;;;
-11E4;HANGUL JONGSEONG PIEUP-PHIEUPH;Lo;0;L;;;;;N;;;;;
-11E5;HANGUL JONGSEONG PIEUP-HIEUH;Lo;0;L;;;;;N;;;;;
-11E6;HANGUL JONGSEONG KAPYEOUNPIEUP;Lo;0;L;;;;;N;;;;;
-11E7;HANGUL JONGSEONG SIOS-KIYEOK;Lo;0;L;;;;;N;;;;;
-11E8;HANGUL JONGSEONG SIOS-TIKEUT;Lo;0;L;;;;;N;;;;;
-11E9;HANGUL JONGSEONG SIOS-RIEUL;Lo;0;L;;;;;N;;;;;
-11EA;HANGUL JONGSEONG SIOS-PIEUP;Lo;0;L;;;;;N;;;;;
-11EB;HANGUL JONGSEONG PANSIOS;Lo;0;L;;;;;N;;;;;
-11EC;HANGUL JONGSEONG IEUNG-KIYEOK;Lo;0;L;;;;;N;;;;;
-11ED;HANGUL JONGSEONG IEUNG-SSANGKIYEOK;Lo;0;L;;;;;N;;;;;
-11EE;HANGUL JONGSEONG SSANGIEUNG;Lo;0;L;;;;;N;;;;;
-11EF;HANGUL JONGSEONG IEUNG-KHIEUKH;Lo;0;L;;;;;N;;;;;
-11F0;HANGUL JONGSEONG YESIEUNG;Lo;0;L;;;;;N;;;;;
-11F1;HANGUL JONGSEONG YESIEUNG-SIOS;Lo;0;L;;;;;N;;;;;
-11F2;HANGUL JONGSEONG YESIEUNG-PANSIOS;Lo;0;L;;;;;N;;;;;
-11F3;HANGUL JONGSEONG PHIEUPH-PIEUP;Lo;0;L;;;;;N;;;;;
-11F4;HANGUL JONGSEONG KAPYEOUNPHIEUPH;Lo;0;L;;;;;N;;;;;
-11F5;HANGUL JONGSEONG HIEUH-NIEUN;Lo;0;L;;;;;N;;;;;
-11F6;HANGUL JONGSEONG HIEUH-RIEUL;Lo;0;L;;;;;N;;;;;
-11F7;HANGUL JONGSEONG HIEUH-MIEUM;Lo;0;L;;;;;N;;;;;
-11F8;HANGUL JONGSEONG HIEUH-PIEUP;Lo;0;L;;;;;N;;;;;
-11F9;HANGUL JONGSEONG YEORINHIEUH;Lo;0;L;;;;;N;;;;;
-1200;ETHIOPIC SYLLABLE HA;Lo;0;L;;;;;N;;;;;
-1201;ETHIOPIC SYLLABLE HU;Lo;0;L;;;;;N;;;;;
-1202;ETHIOPIC SYLLABLE HI;Lo;0;L;;;;;N;;;;;
-1203;ETHIOPIC SYLLABLE HAA;Lo;0;L;;;;;N;;;;;
-1204;ETHIOPIC SYLLABLE HEE;Lo;0;L;;;;;N;;;;;
-1205;ETHIOPIC SYLLABLE HE;Lo;0;L;;;;;N;;;;;
-1206;ETHIOPIC SYLLABLE HO;Lo;0;L;;;;;N;;;;;
-1207;ETHIOPIC SYLLABLE HOA;Lo;0;L;;;;;N;;;;;
-1208;ETHIOPIC SYLLABLE LA;Lo;0;L;;;;;N;;;;;
-1209;ETHIOPIC SYLLABLE LU;Lo;0;L;;;;;N;;;;;
-120A;ETHIOPIC SYLLABLE LI;Lo;0;L;;;;;N;;;;;
-120B;ETHIOPIC SYLLABLE LAA;Lo;0;L;;;;;N;;;;;
-120C;ETHIOPIC SYLLABLE LEE;Lo;0;L;;;;;N;;;;;
-120D;ETHIOPIC SYLLABLE LE;Lo;0;L;;;;;N;;;;;
-120E;ETHIOPIC SYLLABLE LO;Lo;0;L;;;;;N;;;;;
-120F;ETHIOPIC SYLLABLE LWA;Lo;0;L;;;;;N;;;;;
-1210;ETHIOPIC SYLLABLE HHA;Lo;0;L;;;;;N;;;;;
-1211;ETHIOPIC SYLLABLE HHU;Lo;0;L;;;;;N;;;;;
-1212;ETHIOPIC SYLLABLE HHI;Lo;0;L;;;;;N;;;;;
-1213;ETHIOPIC SYLLABLE HHAA;Lo;0;L;;;;;N;;;;;
-1214;ETHIOPIC SYLLABLE HHEE;Lo;0;L;;;;;N;;;;;
-1215;ETHIOPIC SYLLABLE HHE;Lo;0;L;;;;;N;;;;;
-1216;ETHIOPIC SYLLABLE HHO;Lo;0;L;;;;;N;;;;;
-1217;ETHIOPIC SYLLABLE HHWA;Lo;0;L;;;;;N;;;;;
-1218;ETHIOPIC SYLLABLE MA;Lo;0;L;;;;;N;;;;;
-1219;ETHIOPIC SYLLABLE MU;Lo;0;L;;;;;N;;;;;
-121A;ETHIOPIC SYLLABLE MI;Lo;0;L;;;;;N;;;;;
-121B;ETHIOPIC SYLLABLE MAA;Lo;0;L;;;;;N;;;;;
-121C;ETHIOPIC SYLLABLE MEE;Lo;0;L;;;;;N;;;;;
-121D;ETHIOPIC SYLLABLE ME;Lo;0;L;;;;;N;;;;;
-121E;ETHIOPIC SYLLABLE MO;Lo;0;L;;;;;N;;;;;
-121F;ETHIOPIC SYLLABLE MWA;Lo;0;L;;;;;N;;;;;
-1220;ETHIOPIC SYLLABLE SZA;Lo;0;L;;;;;N;;;;;
-1221;ETHIOPIC SYLLABLE SZU;Lo;0;L;;;;;N;;;;;
-1222;ETHIOPIC SYLLABLE SZI;Lo;0;L;;;;;N;;;;;
-1223;ETHIOPIC SYLLABLE SZAA;Lo;0;L;;;;;N;;;;;
-1224;ETHIOPIC SYLLABLE SZEE;Lo;0;L;;;;;N;;;;;
-1225;ETHIOPIC SYLLABLE SZE;Lo;0;L;;;;;N;;;;;
-1226;ETHIOPIC SYLLABLE SZO;Lo;0;L;;;;;N;;;;;
-1227;ETHIOPIC SYLLABLE SZWA;Lo;0;L;;;;;N;;;;;
-1228;ETHIOPIC SYLLABLE RA;Lo;0;L;;;;;N;;;;;
-1229;ETHIOPIC SYLLABLE RU;Lo;0;L;;;;;N;;;;;
-122A;ETHIOPIC SYLLABLE RI;Lo;0;L;;;;;N;;;;;
-122B;ETHIOPIC SYLLABLE RAA;Lo;0;L;;;;;N;;;;;
-122C;ETHIOPIC SYLLABLE REE;Lo;0;L;;;;;N;;;;;
-122D;ETHIOPIC SYLLABLE RE;Lo;0;L;;;;;N;;;;;
-122E;ETHIOPIC SYLLABLE RO;Lo;0;L;;;;;N;;;;;
-122F;ETHIOPIC SYLLABLE RWA;Lo;0;L;;;;;N;;;;;
-1230;ETHIOPIC SYLLABLE SA;Lo;0;L;;;;;N;;;;;
-1231;ETHIOPIC SYLLABLE SU;Lo;0;L;;;;;N;;;;;
-1232;ETHIOPIC SYLLABLE SI;Lo;0;L;;;;;N;;;;;
-1233;ETHIOPIC SYLLABLE SAA;Lo;0;L;;;;;N;;;;;
-1234;ETHIOPIC SYLLABLE SEE;Lo;0;L;;;;;N;;;;;
-1235;ETHIOPIC SYLLABLE SE;Lo;0;L;;;;;N;;;;;
-1236;ETHIOPIC SYLLABLE SO;Lo;0;L;;;;;N;;;;;
-1237;ETHIOPIC SYLLABLE SWA;Lo;0;L;;;;;N;;;;;
-1238;ETHIOPIC SYLLABLE SHA;Lo;0;L;;;;;N;;;;;
-1239;ETHIOPIC SYLLABLE SHU;Lo;0;L;;;;;N;;;;;
-123A;ETHIOPIC SYLLABLE SHI;Lo;0;L;;;;;N;;;;;
-123B;ETHIOPIC SYLLABLE SHAA;Lo;0;L;;;;;N;;;;;
-123C;ETHIOPIC SYLLABLE SHEE;Lo;0;L;;;;;N;;;;;
-123D;ETHIOPIC SYLLABLE SHE;Lo;0;L;;;;;N;;;;;
-123E;ETHIOPIC SYLLABLE SHO;Lo;0;L;;;;;N;;;;;
-123F;ETHIOPIC SYLLABLE SHWA;Lo;0;L;;;;;N;;;;;
-1240;ETHIOPIC SYLLABLE QA;Lo;0;L;;;;;N;;;;;
-1241;ETHIOPIC SYLLABLE QU;Lo;0;L;;;;;N;;;;;
-1242;ETHIOPIC SYLLABLE QI;Lo;0;L;;;;;N;;;;;
-1243;ETHIOPIC SYLLABLE QAA;Lo;0;L;;;;;N;;;;;
-1244;ETHIOPIC SYLLABLE QEE;Lo;0;L;;;;;N;;;;;
-1245;ETHIOPIC SYLLABLE QE;Lo;0;L;;;;;N;;;;;
-1246;ETHIOPIC SYLLABLE QO;Lo;0;L;;;;;N;;;;;
-1247;ETHIOPIC SYLLABLE QOA;Lo;0;L;;;;;N;;;;;
-1248;ETHIOPIC SYLLABLE QWA;Lo;0;L;;;;;N;;;;;
-124A;ETHIOPIC SYLLABLE QWI;Lo;0;L;;;;;N;;;;;
-124B;ETHIOPIC SYLLABLE QWAA;Lo;0;L;;;;;N;;;;;
-124C;ETHIOPIC SYLLABLE QWEE;Lo;0;L;;;;;N;;;;;
-124D;ETHIOPIC SYLLABLE QWE;Lo;0;L;;;;;N;;;;;
-1250;ETHIOPIC SYLLABLE QHA;Lo;0;L;;;;;N;;;;;
-1251;ETHIOPIC SYLLABLE QHU;Lo;0;L;;;;;N;;;;;
-1252;ETHIOPIC SYLLABLE QHI;Lo;0;L;;;;;N;;;;;
-1253;ETHIOPIC SYLLABLE QHAA;Lo;0;L;;;;;N;;;;;
-1254;ETHIOPIC SYLLABLE QHEE;Lo;0;L;;;;;N;;;;;
-1255;ETHIOPIC SYLLABLE QHE;Lo;0;L;;;;;N;;;;;
-1256;ETHIOPIC SYLLABLE QHO;Lo;0;L;;;;;N;;;;;
-1258;ETHIOPIC SYLLABLE QHWA;Lo;0;L;;;;;N;;;;;
-125A;ETHIOPIC SYLLABLE QHWI;Lo;0;L;;;;;N;;;;;
-125B;ETHIOPIC SYLLABLE QHWAA;Lo;0;L;;;;;N;;;;;
-125C;ETHIOPIC SYLLABLE QHWEE;Lo;0;L;;;;;N;;;;;
-125D;ETHIOPIC SYLLABLE QHWE;Lo;0;L;;;;;N;;;;;
-1260;ETHIOPIC SYLLABLE BA;Lo;0;L;;;;;N;;;;;
-1261;ETHIOPIC SYLLABLE BU;Lo;0;L;;;;;N;;;;;
-1262;ETHIOPIC SYLLABLE BI;Lo;0;L;;;;;N;;;;;
-1263;ETHIOPIC SYLLABLE BAA;Lo;0;L;;;;;N;;;;;
-1264;ETHIOPIC SYLLABLE BEE;Lo;0;L;;;;;N;;;;;
-1265;ETHIOPIC SYLLABLE BE;Lo;0;L;;;;;N;;;;;
-1266;ETHIOPIC SYLLABLE BO;Lo;0;L;;;;;N;;;;;
-1267;ETHIOPIC SYLLABLE BWA;Lo;0;L;;;;;N;;;;;
-1268;ETHIOPIC SYLLABLE VA;Lo;0;L;;;;;N;;;;;
-1269;ETHIOPIC SYLLABLE VU;Lo;0;L;;;;;N;;;;;
-126A;ETHIOPIC SYLLABLE VI;Lo;0;L;;;;;N;;;;;
-126B;ETHIOPIC SYLLABLE VAA;Lo;0;L;;;;;N;;;;;
-126C;ETHIOPIC SYLLABLE VEE;Lo;0;L;;;;;N;;;;;
-126D;ETHIOPIC SYLLABLE VE;Lo;0;L;;;;;N;;;;;
-126E;ETHIOPIC SYLLABLE VO;Lo;0;L;;;;;N;;;;;
-126F;ETHIOPIC SYLLABLE VWA;Lo;0;L;;;;;N;;;;;
-1270;ETHIOPIC SYLLABLE TA;Lo;0;L;;;;;N;;;;;
-1271;ETHIOPIC SYLLABLE TU;Lo;0;L;;;;;N;;;;;
-1272;ETHIOPIC SYLLABLE TI;Lo;0;L;;;;;N;;;;;
-1273;ETHIOPIC SYLLABLE TAA;Lo;0;L;;;;;N;;;;;
-1274;ETHIOPIC SYLLABLE TEE;Lo;0;L;;;;;N;;;;;
-1275;ETHIOPIC SYLLABLE TE;Lo;0;L;;;;;N;;;;;
-1276;ETHIOPIC SYLLABLE TO;Lo;0;L;;;;;N;;;;;
-1277;ETHIOPIC SYLLABLE TWA;Lo;0;L;;;;;N;;;;;
-1278;ETHIOPIC SYLLABLE CA;Lo;0;L;;;;;N;;;;;
-1279;ETHIOPIC SYLLABLE CU;Lo;0;L;;;;;N;;;;;
-127A;ETHIOPIC SYLLABLE CI;Lo;0;L;;;;;N;;;;;
-127B;ETHIOPIC SYLLABLE CAA;Lo;0;L;;;;;N;;;;;
-127C;ETHIOPIC SYLLABLE CEE;Lo;0;L;;;;;N;;;;;
-127D;ETHIOPIC SYLLABLE CE;Lo;0;L;;;;;N;;;;;
-127E;ETHIOPIC SYLLABLE CO;Lo;0;L;;;;;N;;;;;
-127F;ETHIOPIC SYLLABLE CWA;Lo;0;L;;;;;N;;;;;
-1280;ETHIOPIC SYLLABLE XA;Lo;0;L;;;;;N;;;;;
-1281;ETHIOPIC SYLLABLE XU;Lo;0;L;;;;;N;;;;;
-1282;ETHIOPIC SYLLABLE XI;Lo;0;L;;;;;N;;;;;
-1283;ETHIOPIC SYLLABLE XAA;Lo;0;L;;;;;N;;;;;
-1284;ETHIOPIC SYLLABLE XEE;Lo;0;L;;;;;N;;;;;
-1285;ETHIOPIC SYLLABLE XE;Lo;0;L;;;;;N;;;;;
-1286;ETHIOPIC SYLLABLE XO;Lo;0;L;;;;;N;;;;;
-1287;ETHIOPIC SYLLABLE XOA;Lo;0;L;;;;;N;;;;;
-1288;ETHIOPIC SYLLABLE XWA;Lo;0;L;;;;;N;;;;;
-128A;ETHIOPIC SYLLABLE XWI;Lo;0;L;;;;;N;;;;;
-128B;ETHIOPIC SYLLABLE XWAA;Lo;0;L;;;;;N;;;;;
-128C;ETHIOPIC SYLLABLE XWEE;Lo;0;L;;;;;N;;;;;
-128D;ETHIOPIC SYLLABLE XWE;Lo;0;L;;;;;N;;;;;
-1290;ETHIOPIC SYLLABLE NA;Lo;0;L;;;;;N;;;;;
-1291;ETHIOPIC SYLLABLE NU;Lo;0;L;;;;;N;;;;;
-1292;ETHIOPIC SYLLABLE NI;Lo;0;L;;;;;N;;;;;
-1293;ETHIOPIC SYLLABLE NAA;Lo;0;L;;;;;N;;;;;
-1294;ETHIOPIC SYLLABLE NEE;Lo;0;L;;;;;N;;;;;
-1295;ETHIOPIC SYLLABLE NE;Lo;0;L;;;;;N;;;;;
-1296;ETHIOPIC SYLLABLE NO;Lo;0;L;;;;;N;;;;;
-1297;ETHIOPIC SYLLABLE NWA;Lo;0;L;;;;;N;;;;;
-1298;ETHIOPIC SYLLABLE NYA;Lo;0;L;;;;;N;;;;;
-1299;ETHIOPIC SYLLABLE NYU;Lo;0;L;;;;;N;;;;;
-129A;ETHIOPIC SYLLABLE NYI;Lo;0;L;;;;;N;;;;;
-129B;ETHIOPIC SYLLABLE NYAA;Lo;0;L;;;;;N;;;;;
-129C;ETHIOPIC SYLLABLE NYEE;Lo;0;L;;;;;N;;;;;
-129D;ETHIOPIC SYLLABLE NYE;Lo;0;L;;;;;N;;;;;
-129E;ETHIOPIC SYLLABLE NYO;Lo;0;L;;;;;N;;;;;
-129F;ETHIOPIC SYLLABLE NYWA;Lo;0;L;;;;;N;;;;;
-12A0;ETHIOPIC SYLLABLE GLOTTAL A;Lo;0;L;;;;;N;;;;;
-12A1;ETHIOPIC SYLLABLE GLOTTAL U;Lo;0;L;;;;;N;;;;;
-12A2;ETHIOPIC SYLLABLE GLOTTAL I;Lo;0;L;;;;;N;;;;;
-12A3;ETHIOPIC SYLLABLE GLOTTAL AA;Lo;0;L;;;;;N;;;;;
-12A4;ETHIOPIC SYLLABLE GLOTTAL EE;Lo;0;L;;;;;N;;;;;
-12A5;ETHIOPIC SYLLABLE GLOTTAL E;Lo;0;L;;;;;N;;;;;
-12A6;ETHIOPIC SYLLABLE GLOTTAL O;Lo;0;L;;;;;N;;;;;
-12A7;ETHIOPIC SYLLABLE GLOTTAL WA;Lo;0;L;;;;;N;;;;;
-12A8;ETHIOPIC SYLLABLE KA;Lo;0;L;;;;;N;;;;;
-12A9;ETHIOPIC SYLLABLE KU;Lo;0;L;;;;;N;;;;;
-12AA;ETHIOPIC SYLLABLE KI;Lo;0;L;;;;;N;;;;;
-12AB;ETHIOPIC SYLLABLE KAA;Lo;0;L;;;;;N;;;;;
-12AC;ETHIOPIC SYLLABLE KEE;Lo;0;L;;;;;N;;;;;
-12AD;ETHIOPIC SYLLABLE KE;Lo;0;L;;;;;N;;;;;
-12AE;ETHIOPIC SYLLABLE KO;Lo;0;L;;;;;N;;;;;
-12AF;ETHIOPIC SYLLABLE KOA;Lo;0;L;;;;;N;;;;;
-12B0;ETHIOPIC SYLLABLE KWA;Lo;0;L;;;;;N;;;;;
-12B2;ETHIOPIC SYLLABLE KWI;Lo;0;L;;;;;N;;;;;
-12B3;ETHIOPIC SYLLABLE KWAA;Lo;0;L;;;;;N;;;;;
-12B4;ETHIOPIC SYLLABLE KWEE;Lo;0;L;;;;;N;;;;;
-12B5;ETHIOPIC SYLLABLE KWE;Lo;0;L;;;;;N;;;;;
-12B8;ETHIOPIC SYLLABLE KXA;Lo;0;L;;;;;N;;;;;
-12B9;ETHIOPIC SYLLABLE KXU;Lo;0;L;;;;;N;;;;;
-12BA;ETHIOPIC SYLLABLE KXI;Lo;0;L;;;;;N;;;;;
-12BB;ETHIOPIC SYLLABLE KXAA;Lo;0;L;;;;;N;;;;;
-12BC;ETHIOPIC SYLLABLE KXEE;Lo;0;L;;;;;N;;;;;
-12BD;ETHIOPIC SYLLABLE KXE;Lo;0;L;;;;;N;;;;;
-12BE;ETHIOPIC SYLLABLE KXO;Lo;0;L;;;;;N;;;;;
-12C0;ETHIOPIC SYLLABLE KXWA;Lo;0;L;;;;;N;;;;;
-12C2;ETHIOPIC SYLLABLE KXWI;Lo;0;L;;;;;N;;;;;
-12C3;ETHIOPIC SYLLABLE KXWAA;Lo;0;L;;;;;N;;;;;
-12C4;ETHIOPIC SYLLABLE KXWEE;Lo;0;L;;;;;N;;;;;
-12C5;ETHIOPIC SYLLABLE KXWE;Lo;0;L;;;;;N;;;;;
-12C8;ETHIOPIC SYLLABLE WA;Lo;0;L;;;;;N;;;;;
-12C9;ETHIOPIC SYLLABLE WU;Lo;0;L;;;;;N;;;;;
-12CA;ETHIOPIC SYLLABLE WI;Lo;0;L;;;;;N;;;;;
-12CB;ETHIOPIC SYLLABLE WAA;Lo;0;L;;;;;N;;;;;
-12CC;ETHIOPIC SYLLABLE WEE;Lo;0;L;;;;;N;;;;;
-12CD;ETHIOPIC SYLLABLE WE;Lo;0;L;;;;;N;;;;;
-12CE;ETHIOPIC SYLLABLE WO;Lo;0;L;;;;;N;;;;;
-12CF;ETHIOPIC SYLLABLE WOA;Lo;0;L;;;;;N;;;;;
-12D0;ETHIOPIC SYLLABLE PHARYNGEAL A;Lo;0;L;;;;;N;;;;;
-12D1;ETHIOPIC SYLLABLE PHARYNGEAL U;Lo;0;L;;;;;N;;;;;
-12D2;ETHIOPIC SYLLABLE PHARYNGEAL I;Lo;0;L;;;;;N;;;;;
-12D3;ETHIOPIC SYLLABLE PHARYNGEAL AA;Lo;0;L;;;;;N;;;;;
-12D4;ETHIOPIC SYLLABLE PHARYNGEAL EE;Lo;0;L;;;;;N;;;;;
-12D5;ETHIOPIC SYLLABLE PHARYNGEAL E;Lo;0;L;;;;;N;;;;;
-12D6;ETHIOPIC SYLLABLE PHARYNGEAL O;Lo;0;L;;;;;N;;;;;
-12D8;ETHIOPIC SYLLABLE ZA;Lo;0;L;;;;;N;;;;;
-12D9;ETHIOPIC SYLLABLE ZU;Lo;0;L;;;;;N;;;;;
-12DA;ETHIOPIC SYLLABLE ZI;Lo;0;L;;;;;N;;;;;
-12DB;ETHIOPIC SYLLABLE ZAA;Lo;0;L;;;;;N;;;;;
-12DC;ETHIOPIC SYLLABLE ZEE;Lo;0;L;;;;;N;;;;;
-12DD;ETHIOPIC SYLLABLE ZE;Lo;0;L;;;;;N;;;;;
-12DE;ETHIOPIC SYLLABLE ZO;Lo;0;L;;;;;N;;;;;
-12DF;ETHIOPIC SYLLABLE ZWA;Lo;0;L;;;;;N;;;;;
-12E0;ETHIOPIC SYLLABLE ZHA;Lo;0;L;;;;;N;;;;;
-12E1;ETHIOPIC SYLLABLE ZHU;Lo;0;L;;;;;N;;;;;
-12E2;ETHIOPIC SYLLABLE ZHI;Lo;0;L;;;;;N;;;;;
-12E3;ETHIOPIC SYLLABLE ZHAA;Lo;0;L;;;;;N;;;;;
-12E4;ETHIOPIC SYLLABLE ZHEE;Lo;0;L;;;;;N;;;;;
-12E5;ETHIOPIC SYLLABLE ZHE;Lo;0;L;;;;;N;;;;;
-12E6;ETHIOPIC SYLLABLE ZHO;Lo;0;L;;;;;N;;;;;
-12E7;ETHIOPIC SYLLABLE ZHWA;Lo;0;L;;;;;N;;;;;
-12E8;ETHIOPIC SYLLABLE YA;Lo;0;L;;;;;N;;;;;
-12E9;ETHIOPIC SYLLABLE YU;Lo;0;L;;;;;N;;;;;
-12EA;ETHIOPIC SYLLABLE YI;Lo;0;L;;;;;N;;;;;
-12EB;ETHIOPIC SYLLABLE YAA;Lo;0;L;;;;;N;;;;;
-12EC;ETHIOPIC SYLLABLE YEE;Lo;0;L;;;;;N;;;;;
-12ED;ETHIOPIC SYLLABLE YE;Lo;0;L;;;;;N;;;;;
-12EE;ETHIOPIC SYLLABLE YO;Lo;0;L;;;;;N;;;;;
-12EF;ETHIOPIC SYLLABLE YOA;Lo;0;L;;;;;N;;;;;
-12F0;ETHIOPIC SYLLABLE DA;Lo;0;L;;;;;N;;;;;
-12F1;ETHIOPIC SYLLABLE DU;Lo;0;L;;;;;N;;;;;
-12F2;ETHIOPIC SYLLABLE DI;Lo;0;L;;;;;N;;;;;
-12F3;ETHIOPIC SYLLABLE DAA;Lo;0;L;;;;;N;;;;;
-12F4;ETHIOPIC SYLLABLE DEE;Lo;0;L;;;;;N;;;;;
-12F5;ETHIOPIC SYLLABLE DE;Lo;0;L;;;;;N;;;;;
-12F6;ETHIOPIC SYLLABLE DO;Lo;0;L;;;;;N;;;;;
-12F7;ETHIOPIC SYLLABLE DWA;Lo;0;L;;;;;N;;;;;
-12F8;ETHIOPIC SYLLABLE DDA;Lo;0;L;;;;;N;;;;;
-12F9;ETHIOPIC SYLLABLE DDU;Lo;0;L;;;;;N;;;;;
-12FA;ETHIOPIC SYLLABLE DDI;Lo;0;L;;;;;N;;;;;
-12FB;ETHIOPIC SYLLABLE DDAA;Lo;0;L;;;;;N;;;;;
-12FC;ETHIOPIC SYLLABLE DDEE;Lo;0;L;;;;;N;;;;;
-12FD;ETHIOPIC SYLLABLE DDE;Lo;0;L;;;;;N;;;;;
-12FE;ETHIOPIC SYLLABLE DDO;Lo;0;L;;;;;N;;;;;
-12FF;ETHIOPIC SYLLABLE DDWA;Lo;0;L;;;;;N;;;;;
-1300;ETHIOPIC SYLLABLE JA;Lo;0;L;;;;;N;;;;;
-1301;ETHIOPIC SYLLABLE JU;Lo;0;L;;;;;N;;;;;
-1302;ETHIOPIC SYLLABLE JI;Lo;0;L;;;;;N;;;;;
-1303;ETHIOPIC SYLLABLE JAA;Lo;0;L;;;;;N;;;;;
-1304;ETHIOPIC SYLLABLE JEE;Lo;0;L;;;;;N;;;;;
-1305;ETHIOPIC SYLLABLE JE;Lo;0;L;;;;;N;;;;;
-1306;ETHIOPIC SYLLABLE JO;Lo;0;L;;;;;N;;;;;
-1307;ETHIOPIC SYLLABLE JWA;Lo;0;L;;;;;N;;;;;
-1308;ETHIOPIC SYLLABLE GA;Lo;0;L;;;;;N;;;;;
-1309;ETHIOPIC SYLLABLE GU;Lo;0;L;;;;;N;;;;;
-130A;ETHIOPIC SYLLABLE GI;Lo;0;L;;;;;N;;;;;
-130B;ETHIOPIC SYLLABLE GAA;Lo;0;L;;;;;N;;;;;
-130C;ETHIOPIC SYLLABLE GEE;Lo;0;L;;;;;N;;;;;
-130D;ETHIOPIC SYLLABLE GE;Lo;0;L;;;;;N;;;;;
-130E;ETHIOPIC SYLLABLE GO;Lo;0;L;;;;;N;;;;;
-130F;ETHIOPIC SYLLABLE GOA;Lo;0;L;;;;;N;;;;;
-1310;ETHIOPIC SYLLABLE GWA;Lo;0;L;;;;;N;;;;;
-1312;ETHIOPIC SYLLABLE GWI;Lo;0;L;;;;;N;;;;;
-1313;ETHIOPIC SYLLABLE GWAA;Lo;0;L;;;;;N;;;;;
-1314;ETHIOPIC SYLLABLE GWEE;Lo;0;L;;;;;N;;;;;
-1315;ETHIOPIC SYLLABLE GWE;Lo;0;L;;;;;N;;;;;
-1318;ETHIOPIC SYLLABLE GGA;Lo;0;L;;;;;N;;;;;
-1319;ETHIOPIC SYLLABLE GGU;Lo;0;L;;;;;N;;;;;
-131A;ETHIOPIC SYLLABLE GGI;Lo;0;L;;;;;N;;;;;
-131B;ETHIOPIC SYLLABLE GGAA;Lo;0;L;;;;;N;;;;;
-131C;ETHIOPIC SYLLABLE GGEE;Lo;0;L;;;;;N;;;;;
-131D;ETHIOPIC SYLLABLE GGE;Lo;0;L;;;;;N;;;;;
-131E;ETHIOPIC SYLLABLE GGO;Lo;0;L;;;;;N;;;;;
-131F;ETHIOPIC SYLLABLE GGWAA;Lo;0;L;;;;;N;;;;;
-1320;ETHIOPIC SYLLABLE THA;Lo;0;L;;;;;N;;;;;
-1321;ETHIOPIC SYLLABLE THU;Lo;0;L;;;;;N;;;;;
-1322;ETHIOPIC SYLLABLE THI;Lo;0;L;;;;;N;;;;;
-1323;ETHIOPIC SYLLABLE THAA;Lo;0;L;;;;;N;;;;;
-1324;ETHIOPIC SYLLABLE THEE;Lo;0;L;;;;;N;;;;;
-1325;ETHIOPIC SYLLABLE THE;Lo;0;L;;;;;N;;;;;
-1326;ETHIOPIC SYLLABLE THO;Lo;0;L;;;;;N;;;;;
-1327;ETHIOPIC SYLLABLE THWA;Lo;0;L;;;;;N;;;;;
-1328;ETHIOPIC SYLLABLE CHA;Lo;0;L;;;;;N;;;;;
-1329;ETHIOPIC SYLLABLE CHU;Lo;0;L;;;;;N;;;;;
-132A;ETHIOPIC SYLLABLE CHI;Lo;0;L;;;;;N;;;;;
-132B;ETHIOPIC SYLLABLE CHAA;Lo;0;L;;;;;N;;;;;
-132C;ETHIOPIC SYLLABLE CHEE;Lo;0;L;;;;;N;;;;;
-132D;ETHIOPIC SYLLABLE CHE;Lo;0;L;;;;;N;;;;;
-132E;ETHIOPIC SYLLABLE CHO;Lo;0;L;;;;;N;;;;;
-132F;ETHIOPIC SYLLABLE CHWA;Lo;0;L;;;;;N;;;;;
-1330;ETHIOPIC SYLLABLE PHA;Lo;0;L;;;;;N;;;;;
-1331;ETHIOPIC SYLLABLE PHU;Lo;0;L;;;;;N;;;;;
-1332;ETHIOPIC SYLLABLE PHI;Lo;0;L;;;;;N;;;;;
-1333;ETHIOPIC SYLLABLE PHAA;Lo;0;L;;;;;N;;;;;
-1334;ETHIOPIC SYLLABLE PHEE;Lo;0;L;;;;;N;;;;;
-1335;ETHIOPIC SYLLABLE PHE;Lo;0;L;;;;;N;;;;;
-1336;ETHIOPIC SYLLABLE PHO;Lo;0;L;;;;;N;;;;;
-1337;ETHIOPIC SYLLABLE PHWA;Lo;0;L;;;;;N;;;;;
-1338;ETHIOPIC SYLLABLE TSA;Lo;0;L;;;;;N;;;;;
-1339;ETHIOPIC SYLLABLE TSU;Lo;0;L;;;;;N;;;;;
-133A;ETHIOPIC SYLLABLE TSI;Lo;0;L;;;;;N;;;;;
-133B;ETHIOPIC SYLLABLE TSAA;Lo;0;L;;;;;N;;;;;
-133C;ETHIOPIC SYLLABLE TSEE;Lo;0;L;;;;;N;;;;;
-133D;ETHIOPIC SYLLABLE TSE;Lo;0;L;;;;;N;;;;;
-133E;ETHIOPIC SYLLABLE TSO;Lo;0;L;;;;;N;;;;;
-133F;ETHIOPIC SYLLABLE TSWA;Lo;0;L;;;;;N;;;;;
-1340;ETHIOPIC SYLLABLE TZA;Lo;0;L;;;;;N;;;;;
-1341;ETHIOPIC SYLLABLE TZU;Lo;0;L;;;;;N;;;;;
-1342;ETHIOPIC SYLLABLE TZI;Lo;0;L;;;;;N;;;;;
-1343;ETHIOPIC SYLLABLE TZAA;Lo;0;L;;;;;N;;;;;
-1344;ETHIOPIC SYLLABLE TZEE;Lo;0;L;;;;;N;;;;;
-1345;ETHIOPIC SYLLABLE TZE;Lo;0;L;;;;;N;;;;;
-1346;ETHIOPIC SYLLABLE TZO;Lo;0;L;;;;;N;;;;;
-1347;ETHIOPIC SYLLABLE TZOA;Lo;0;L;;;;;N;;;;;
-1348;ETHIOPIC SYLLABLE FA;Lo;0;L;;;;;N;;;;;
-1349;ETHIOPIC SYLLABLE FU;Lo;0;L;;;;;N;;;;;
-134A;ETHIOPIC SYLLABLE FI;Lo;0;L;;;;;N;;;;;
-134B;ETHIOPIC SYLLABLE FAA;Lo;0;L;;;;;N;;;;;
-134C;ETHIOPIC SYLLABLE FEE;Lo;0;L;;;;;N;;;;;
-134D;ETHIOPIC SYLLABLE FE;Lo;0;L;;;;;N;;;;;
-134E;ETHIOPIC SYLLABLE FO;Lo;0;L;;;;;N;;;;;
-134F;ETHIOPIC SYLLABLE FWA;Lo;0;L;;;;;N;;;;;
-1350;ETHIOPIC SYLLABLE PA;Lo;0;L;;;;;N;;;;;
-1351;ETHIOPIC SYLLABLE PU;Lo;0;L;;;;;N;;;;;
-1352;ETHIOPIC SYLLABLE PI;Lo;0;L;;;;;N;;;;;
-1353;ETHIOPIC SYLLABLE PAA;Lo;0;L;;;;;N;;;;;
-1354;ETHIOPIC SYLLABLE PEE;Lo;0;L;;;;;N;;;;;
-1355;ETHIOPIC SYLLABLE PE;Lo;0;L;;;;;N;;;;;
-1356;ETHIOPIC SYLLABLE PO;Lo;0;L;;;;;N;;;;;
-1357;ETHIOPIC SYLLABLE PWA;Lo;0;L;;;;;N;;;;;
-1358;ETHIOPIC SYLLABLE RYA;Lo;0;L;;;;;N;;;;;
-1359;ETHIOPIC SYLLABLE MYA;Lo;0;L;;;;;N;;;;;
-135A;ETHIOPIC SYLLABLE FYA;Lo;0;L;;;;;N;;;;;
-135F;ETHIOPIC COMBINING GEMINATION MARK;Mn;230;NSM;;;;;N;;;;;
-1360;ETHIOPIC SECTION MARK;So;0;L;;;;;N;;;;;
-1361;ETHIOPIC WORDSPACE;Po;0;L;;;;;N;;;;;
-1362;ETHIOPIC FULL STOP;Po;0;L;;;;;N;;;;;
-1363;ETHIOPIC COMMA;Po;0;L;;;;;N;;;;;
-1364;ETHIOPIC SEMICOLON;Po;0;L;;;;;N;;;;;
-1365;ETHIOPIC COLON;Po;0;L;;;;;N;;;;;
-1366;ETHIOPIC PREFACE COLON;Po;0;L;;;;;N;;;;;
-1367;ETHIOPIC QUESTION MARK;Po;0;L;;;;;N;;;;;
-1368;ETHIOPIC PARAGRAPH SEPARATOR;Po;0;L;;;;;N;;;;;
-1369;ETHIOPIC DIGIT ONE;No;0;L;;;1;1;N;;;;;
-136A;ETHIOPIC DIGIT TWO;No;0;L;;;2;2;N;;;;;
-136B;ETHIOPIC DIGIT THREE;No;0;L;;;3;3;N;;;;;
-136C;ETHIOPIC DIGIT FOUR;No;0;L;;;4;4;N;;;;;
-136D;ETHIOPIC DIGIT FIVE;No;0;L;;;5;5;N;;;;;
-136E;ETHIOPIC DIGIT SIX;No;0;L;;;6;6;N;;;;;
-136F;ETHIOPIC DIGIT SEVEN;No;0;L;;;7;7;N;;;;;
-1370;ETHIOPIC DIGIT EIGHT;No;0;L;;;8;8;N;;;;;
-1371;ETHIOPIC DIGIT NINE;No;0;L;;;9;9;N;;;;;
-1372;ETHIOPIC NUMBER TEN;No;0;L;;;;10;N;;;;;
-1373;ETHIOPIC NUMBER TWENTY;No;0;L;;;;20;N;;;;;
-1374;ETHIOPIC NUMBER THIRTY;No;0;L;;;;30;N;;;;;
-1375;ETHIOPIC NUMBER FORTY;No;0;L;;;;40;N;;;;;
-1376;ETHIOPIC NUMBER FIFTY;No;0;L;;;;50;N;;;;;
-1377;ETHIOPIC NUMBER SIXTY;No;0;L;;;;60;N;;;;;
-1378;ETHIOPIC NUMBER SEVENTY;No;0;L;;;;70;N;;;;;
-1379;ETHIOPIC NUMBER EIGHTY;No;0;L;;;;80;N;;;;;
-137A;ETHIOPIC NUMBER NINETY;No;0;L;;;;90;N;;;;;
-137B;ETHIOPIC NUMBER HUNDRED;No;0;L;;;;100;N;;;;;
-137C;ETHIOPIC NUMBER TEN THOUSAND;No;0;L;;;;10000;N;;;;;
-1380;ETHIOPIC SYLLABLE SEBATBEIT MWA;Lo;0;L;;;;;N;;;;;
-1381;ETHIOPIC SYLLABLE MWI;Lo;0;L;;;;;N;;;;;
-1382;ETHIOPIC SYLLABLE MWEE;Lo;0;L;;;;;N;;;;;
-1383;ETHIOPIC SYLLABLE MWE;Lo;0;L;;;;;N;;;;;
-1384;ETHIOPIC SYLLABLE SEBATBEIT BWA;Lo;0;L;;;;;N;;;;;
-1385;ETHIOPIC SYLLABLE BWI;Lo;0;L;;;;;N;;;;;
-1386;ETHIOPIC SYLLABLE BWEE;Lo;0;L;;;;;N;;;;;
-1387;ETHIOPIC SYLLABLE BWE;Lo;0;L;;;;;N;;;;;
-1388;ETHIOPIC SYLLABLE SEBATBEIT FWA;Lo;0;L;;;;;N;;;;;
-1389;ETHIOPIC SYLLABLE FWI;Lo;0;L;;;;;N;;;;;
-138A;ETHIOPIC SYLLABLE FWEE;Lo;0;L;;;;;N;;;;;
-138B;ETHIOPIC SYLLABLE FWE;Lo;0;L;;;;;N;;;;;
-138C;ETHIOPIC SYLLABLE SEBATBEIT PWA;Lo;0;L;;;;;N;;;;;
-138D;ETHIOPIC SYLLABLE PWI;Lo;0;L;;;;;N;;;;;
-138E;ETHIOPIC SYLLABLE PWEE;Lo;0;L;;;;;N;;;;;
-138F;ETHIOPIC SYLLABLE PWE;Lo;0;L;;;;;N;;;;;
-1390;ETHIOPIC TONAL MARK YIZET;So;0;ON;;;;;N;;;;;
-1391;ETHIOPIC TONAL MARK DERET;So;0;ON;;;;;N;;;;;
-1392;ETHIOPIC TONAL MARK RIKRIK;So;0;ON;;;;;N;;;;;
-1393;ETHIOPIC TONAL MARK SHORT RIKRIK;So;0;ON;;;;;N;;;;;
-1394;ETHIOPIC TONAL MARK DIFAT;So;0;ON;;;;;N;;;;;
-1395;ETHIOPIC TONAL MARK KENAT;So;0;ON;;;;;N;;;;;
-1396;ETHIOPIC TONAL MARK CHIRET;So;0;ON;;;;;N;;;;;
-1397;ETHIOPIC TONAL MARK HIDET;So;0;ON;;;;;N;;;;;
-1398;ETHIOPIC TONAL MARK DERET-HIDET;So;0;ON;;;;;N;;;;;
-1399;ETHIOPIC TONAL MARK KURT;So;0;ON;;;;;N;;;;;
-13A0;CHEROKEE LETTER A;Lo;0;L;;;;;N;;;;;
-13A1;CHEROKEE LETTER E;Lo;0;L;;;;;N;;;;;
-13A2;CHEROKEE LETTER I;Lo;0;L;;;;;N;;;;;
-13A3;CHEROKEE LETTER O;Lo;0;L;;;;;N;;;;;
-13A4;CHEROKEE LETTER U;Lo;0;L;;;;;N;;;;;
-13A5;CHEROKEE LETTER V;Lo;0;L;;;;;N;;;;;
-13A6;CHEROKEE LETTER GA;Lo;0;L;;;;;N;;;;;
-13A7;CHEROKEE LETTER KA;Lo;0;L;;;;;N;;;;;
-13A8;CHEROKEE LETTER GE;Lo;0;L;;;;;N;;;;;
-13A9;CHEROKEE LETTER GI;Lo;0;L;;;;;N;;;;;
-13AA;CHEROKEE LETTER GO;Lo;0;L;;;;;N;;;;;
-13AB;CHEROKEE LETTER GU;Lo;0;L;;;;;N;;;;;
-13AC;CHEROKEE LETTER GV;Lo;0;L;;;;;N;;;;;
-13AD;CHEROKEE LETTER HA;Lo;0;L;;;;;N;;;;;
-13AE;CHEROKEE LETTER HE;Lo;0;L;;;;;N;;;;;
-13AF;CHEROKEE LETTER HI;Lo;0;L;;;;;N;;;;;
-13B0;CHEROKEE LETTER HO;Lo;0;L;;;;;N;;;;;
-13B1;CHEROKEE LETTER HU;Lo;0;L;;;;;N;;;;;
-13B2;CHEROKEE LETTER HV;Lo;0;L;;;;;N;;;;;
-13B3;CHEROKEE LETTER LA;Lo;0;L;;;;;N;;;;;
-13B4;CHEROKEE LETTER LE;Lo;0;L;;;;;N;;;;;
-13B5;CHEROKEE LETTER LI;Lo;0;L;;;;;N;;;;;
-13B6;CHEROKEE LETTER LO;Lo;0;L;;;;;N;;;;;
-13B7;CHEROKEE LETTER LU;Lo;0;L;;;;;N;;;;;
-13B8;CHEROKEE LETTER LV;Lo;0;L;;;;;N;;;;;
-13B9;CHEROKEE LETTER MA;Lo;0;L;;;;;N;;;;;
-13BA;CHEROKEE LETTER ME;Lo;0;L;;;;;N;;;;;
-13BB;CHEROKEE LETTER MI;Lo;0;L;;;;;N;;;;;
-13BC;CHEROKEE LETTER MO;Lo;0;L;;;;;N;;;;;
-13BD;CHEROKEE LETTER MU;Lo;0;L;;;;;N;;;;;
-13BE;CHEROKEE LETTER NA;Lo;0;L;;;;;N;;;;;
-13BF;CHEROKEE LETTER HNA;Lo;0;L;;;;;N;;;;;
-13C0;CHEROKEE LETTER NAH;Lo;0;L;;;;;N;;;;;
-13C1;CHEROKEE LETTER NE;Lo;0;L;;;;;N;;;;;
-13C2;CHEROKEE LETTER NI;Lo;0;L;;;;;N;;;;;
-13C3;CHEROKEE LETTER NO;Lo;0;L;;;;;N;;;;;
-13C4;CHEROKEE LETTER NU;Lo;0;L;;;;;N;;;;;
-13C5;CHEROKEE LETTER NV;Lo;0;L;;;;;N;;;;;
-13C6;CHEROKEE LETTER QUA;Lo;0;L;;;;;N;;;;;
-13C7;CHEROKEE LETTER QUE;Lo;0;L;;;;;N;;;;;
-13C8;CHEROKEE LETTER QUI;Lo;0;L;;;;;N;;;;;
-13C9;CHEROKEE LETTER QUO;Lo;0;L;;;;;N;;;;;
-13CA;CHEROKEE LETTER QUU;Lo;0;L;;;;;N;;;;;
-13CB;CHEROKEE LETTER QUV;Lo;0;L;;;;;N;;;;;
-13CC;CHEROKEE LETTER SA;Lo;0;L;;;;;N;;;;;
-13CD;CHEROKEE LETTER S;Lo;0;L;;;;;N;;;;;
-13CE;CHEROKEE LETTER SE;Lo;0;L;;;;;N;;;;;
-13CF;CHEROKEE LETTER SI;Lo;0;L;;;;;N;;;;;
-13D0;CHEROKEE LETTER SO;Lo;0;L;;;;;N;;;;;
-13D1;CHEROKEE LETTER SU;Lo;0;L;;;;;N;;;;;
-13D2;CHEROKEE LETTER SV;Lo;0;L;;;;;N;;;;;
-13D3;CHEROKEE LETTER DA;Lo;0;L;;;;;N;;;;;
-13D4;CHEROKEE LETTER TA;Lo;0;L;;;;;N;;;;;
-13D5;CHEROKEE LETTER DE;Lo;0;L;;;;;N;;;;;
-13D6;CHEROKEE LETTER TE;Lo;0;L;;;;;N;;;;;
-13D7;CHEROKEE LETTER DI;Lo;0;L;;;;;N;;;;;
-13D8;CHEROKEE LETTER TI;Lo;0;L;;;;;N;;;;;
-13D9;CHEROKEE LETTER DO;Lo;0;L;;;;;N;;;;;
-13DA;CHEROKEE LETTER DU;Lo;0;L;;;;;N;;;;;
-13DB;CHEROKEE LETTER DV;Lo;0;L;;;;;N;;;;;
-13DC;CHEROKEE LETTER DLA;Lo;0;L;;;;;N;;;;;
-13DD;CHEROKEE LETTER TLA;Lo;0;L;;;;;N;;;;;
-13DE;CHEROKEE LETTER TLE;Lo;0;L;;;;;N;;;;;
-13DF;CHEROKEE LETTER TLI;Lo;0;L;;;;;N;;;;;
-13E0;CHEROKEE LETTER TLO;Lo;0;L;;;;;N;;;;;
-13E1;CHEROKEE LETTER TLU;Lo;0;L;;;;;N;;;;;
-13E2;CHEROKEE LETTER TLV;Lo;0;L;;;;;N;;;;;
-13E3;CHEROKEE LETTER TSA;Lo;0;L;;;;;N;;;;;
-13E4;CHEROKEE LETTER TSE;Lo;0;L;;;;;N;;;;;
-13E5;CHEROKEE LETTER TSI;Lo;0;L;;;;;N;;;;;
-13E6;CHEROKEE LETTER TSO;Lo;0;L;;;;;N;;;;;
-13E7;CHEROKEE LETTER TSU;Lo;0;L;;;;;N;;;;;
-13E8;CHEROKEE LETTER TSV;Lo;0;L;;;;;N;;;;;
-13E9;CHEROKEE LETTER WA;Lo;0;L;;;;;N;;;;;
-13EA;CHEROKEE LETTER WE;Lo;0;L;;;;;N;;;;;
-13EB;CHEROKEE LETTER WI;Lo;0;L;;;;;N;;;;;
-13EC;CHEROKEE LETTER WO;Lo;0;L;;;;;N;;;;;
-13ED;CHEROKEE LETTER WU;Lo;0;L;;;;;N;;;;;
-13EE;CHEROKEE LETTER WV;Lo;0;L;;;;;N;;;;;
-13EF;CHEROKEE LETTER YA;Lo;0;L;;;;;N;;;;;
-13F0;CHEROKEE LETTER YE;Lo;0;L;;;;;N;;;;;
-13F1;CHEROKEE LETTER YI;Lo;0;L;;;;;N;;;;;
-13F2;CHEROKEE LETTER YO;Lo;0;L;;;;;N;;;;;
-13F3;CHEROKEE LETTER YU;Lo;0;L;;;;;N;;;;;
-13F4;CHEROKEE LETTER YV;Lo;0;L;;;;;N;;;;;
-1401;CANADIAN SYLLABICS E;Lo;0;L;;;;;N;;;;;
-1402;CANADIAN SYLLABICS AAI;Lo;0;L;;;;;N;;;;;
-1403;CANADIAN SYLLABICS I;Lo;0;L;;;;;N;;;;;
-1404;CANADIAN SYLLABICS II;Lo;0;L;;;;;N;;;;;
-1405;CANADIAN SYLLABICS O;Lo;0;L;;;;;N;;;;;
-1406;CANADIAN SYLLABICS OO;Lo;0;L;;;;;N;;;;;
-1407;CANADIAN SYLLABICS Y-CREE OO;Lo;0;L;;;;;N;;;;;
-1408;CANADIAN SYLLABICS CARRIER EE;Lo;0;L;;;;;N;;;;;
-1409;CANADIAN SYLLABICS CARRIER I;Lo;0;L;;;;;N;;;;;
-140A;CANADIAN SYLLABICS A;Lo;0;L;;;;;N;;;;;
-140B;CANADIAN SYLLABICS AA;Lo;0;L;;;;;N;;;;;
-140C;CANADIAN SYLLABICS WE;Lo;0;L;;;;;N;;;;;
-140D;CANADIAN SYLLABICS WEST-CREE WE;Lo;0;L;;;;;N;;;;;
-140E;CANADIAN SYLLABICS WI;Lo;0;L;;;;;N;;;;;
-140F;CANADIAN SYLLABICS WEST-CREE WI;Lo;0;L;;;;;N;;;;;
-1410;CANADIAN SYLLABICS WII;Lo;0;L;;;;;N;;;;;
-1411;CANADIAN SYLLABICS WEST-CREE WII;Lo;0;L;;;;;N;;;;;
-1412;CANADIAN SYLLABICS WO;Lo;0;L;;;;;N;;;;;
-1413;CANADIAN SYLLABICS WEST-CREE WO;Lo;0;L;;;;;N;;;;;
-1414;CANADIAN SYLLABICS WOO;Lo;0;L;;;;;N;;;;;
-1415;CANADIAN SYLLABICS WEST-CREE WOO;Lo;0;L;;;;;N;;;;;
-1416;CANADIAN SYLLABICS NASKAPI WOO;Lo;0;L;;;;;N;;;;;
-1417;CANADIAN SYLLABICS WA;Lo;0;L;;;;;N;;;;;
-1418;CANADIAN SYLLABICS WEST-CREE WA;Lo;0;L;;;;;N;;;;;
-1419;CANADIAN SYLLABICS WAA;Lo;0;L;;;;;N;;;;;
-141A;CANADIAN SYLLABICS WEST-CREE WAA;Lo;0;L;;;;;N;;;;;
-141B;CANADIAN SYLLABICS NASKAPI WAA;Lo;0;L;;;;;N;;;;;
-141C;CANADIAN SYLLABICS AI;Lo;0;L;;;;;N;;;;;
-141D;CANADIAN SYLLABICS Y-CREE W;Lo;0;L;;;;;N;;;;;
-141E;CANADIAN SYLLABICS GLOTTAL STOP;Lo;0;L;;;;;N;;;;;
-141F;CANADIAN SYLLABICS FINAL ACUTE;Lo;0;L;;;;;N;;;;;
-1420;CANADIAN SYLLABICS FINAL GRAVE;Lo;0;L;;;;;N;;;;;
-1421;CANADIAN SYLLABICS FINAL BOTTOM HALF RING;Lo;0;L;;;;;N;;;;;
-1422;CANADIAN SYLLABICS FINAL TOP HALF RING;Lo;0;L;;;;;N;;;;;
-1423;CANADIAN SYLLABICS FINAL RIGHT HALF RING;Lo;0;L;;;;;N;;;;;
-1424;CANADIAN SYLLABICS FINAL RING;Lo;0;L;;;;;N;;;;;
-1425;CANADIAN SYLLABICS FINAL DOUBLE ACUTE;Lo;0;L;;;;;N;;;;;
-1426;CANADIAN SYLLABICS FINAL DOUBLE SHORT VERTICAL STROKES;Lo;0;L;;;;;N;;;;;
-1427;CANADIAN SYLLABICS FINAL MIDDLE DOT;Lo;0;L;;;;;N;;;;;
-1428;CANADIAN SYLLABICS FINAL SHORT HORIZONTAL STROKE;Lo;0;L;;;;;N;;;;;
-1429;CANADIAN SYLLABICS FINAL PLUS;Lo;0;L;;;;;N;;;;;
-142A;CANADIAN SYLLABICS FINAL DOWN TACK;Lo;0;L;;;;;N;;;;;
-142B;CANADIAN SYLLABICS EN;Lo;0;L;;;;;N;;;;;
-142C;CANADIAN SYLLABICS IN;Lo;0;L;;;;;N;;;;;
-142D;CANADIAN SYLLABICS ON;Lo;0;L;;;;;N;;;;;
-142E;CANADIAN SYLLABICS AN;Lo;0;L;;;;;N;;;;;
-142F;CANADIAN SYLLABICS PE;Lo;0;L;;;;;N;;;;;
-1430;CANADIAN SYLLABICS PAAI;Lo;0;L;;;;;N;;;;;
-1431;CANADIAN SYLLABICS PI;Lo;0;L;;;;;N;;;;;
-1432;CANADIAN SYLLABICS PII;Lo;0;L;;;;;N;;;;;
-1433;CANADIAN SYLLABICS PO;Lo;0;L;;;;;N;;;;;
-1434;CANADIAN SYLLABICS POO;Lo;0;L;;;;;N;;;;;
-1435;CANADIAN SYLLABICS Y-CREE POO;Lo;0;L;;;;;N;;;;;
-1436;CANADIAN SYLLABICS CARRIER HEE;Lo;0;L;;;;;N;;;;;
-1437;CANADIAN SYLLABICS CARRIER HI;Lo;0;L;;;;;N;;;;;
-1438;CANADIAN SYLLABICS PA;Lo;0;L;;;;;N;;;;;
-1439;CANADIAN SYLLABICS PAA;Lo;0;L;;;;;N;;;;;
-143A;CANADIAN SYLLABICS PWE;Lo;0;L;;;;;N;;;;;
-143B;CANADIAN SYLLABICS WEST-CREE PWE;Lo;0;L;;;;;N;;;;;
-143C;CANADIAN SYLLABICS PWI;Lo;0;L;;;;;N;;;;;
-143D;CANADIAN SYLLABICS WEST-CREE PWI;Lo;0;L;;;;;N;;;;;
-143E;CANADIAN SYLLABICS PWII;Lo;0;L;;;;;N;;;;;
-143F;CANADIAN SYLLABICS WEST-CREE PWII;Lo;0;L;;;;;N;;;;;
-1440;CANADIAN SYLLABICS PWO;Lo;0;L;;;;;N;;;;;
-1441;CANADIAN SYLLABICS WEST-CREE PWO;Lo;0;L;;;;;N;;;;;
-1442;CANADIAN SYLLABICS PWOO;Lo;0;L;;;;;N;;;;;
-1443;CANADIAN SYLLABICS WEST-CREE PWOO;Lo;0;L;;;;;N;;;;;
-1444;CANADIAN SYLLABICS PWA;Lo;0;L;;;;;N;;;;;
-1445;CANADIAN SYLLABICS WEST-CREE PWA;Lo;0;L;;;;;N;;;;;
-1446;CANADIAN SYLLABICS PWAA;Lo;0;L;;;;;N;;;;;
-1447;CANADIAN SYLLABICS WEST-CREE PWAA;Lo;0;L;;;;;N;;;;;
-1448;CANADIAN SYLLABICS Y-CREE PWAA;Lo;0;L;;;;;N;;;;;
-1449;CANADIAN SYLLABICS P;Lo;0;L;;;;;N;;;;;
-144A;CANADIAN SYLLABICS WEST-CREE P;Lo;0;L;;;;;N;;;;;
-144B;CANADIAN SYLLABICS CARRIER H;Lo;0;L;;;;;N;;;;;
-144C;CANADIAN SYLLABICS TE;Lo;0;L;;;;;N;;;;;
-144D;CANADIAN SYLLABICS TAAI;Lo;0;L;;;;;N;;;;;
-144E;CANADIAN SYLLABICS TI;Lo;0;L;;;;;N;;;;;
-144F;CANADIAN SYLLABICS TII;Lo;0;L;;;;;N;;;;;
-1450;CANADIAN SYLLABICS TO;Lo;0;L;;;;;N;;;;;
-1451;CANADIAN SYLLABICS TOO;Lo;0;L;;;;;N;;;;;
-1452;CANADIAN SYLLABICS Y-CREE TOO;Lo;0;L;;;;;N;;;;;
-1453;CANADIAN SYLLABICS CARRIER DEE;Lo;0;L;;;;;N;;;;;
-1454;CANADIAN SYLLABICS CARRIER DI;Lo;0;L;;;;;N;;;;;
-1455;CANADIAN SYLLABICS TA;Lo;0;L;;;;;N;;;;;
-1456;CANADIAN SYLLABICS TAA;Lo;0;L;;;;;N;;;;;
-1457;CANADIAN SYLLABICS TWE;Lo;0;L;;;;;N;;;;;
-1458;CANADIAN SYLLABICS WEST-CREE TWE;Lo;0;L;;;;;N;;;;;
-1459;CANADIAN SYLLABICS TWI;Lo;0;L;;;;;N;;;;;
-145A;CANADIAN SYLLABICS WEST-CREE TWI;Lo;0;L;;;;;N;;;;;
-145B;CANADIAN SYLLABICS TWII;Lo;0;L;;;;;N;;;;;
-145C;CANADIAN SYLLABICS WEST-CREE TWII;Lo;0;L;;;;;N;;;;;
-145D;CANADIAN SYLLABICS TWO;Lo;0;L;;;;;N;;;;;
-145E;CANADIAN SYLLABICS WEST-CREE TWO;Lo;0;L;;;;;N;;;;;
-145F;CANADIAN SYLLABICS TWOO;Lo;0;L;;;;;N;;;;;
-1460;CANADIAN SYLLABICS WEST-CREE TWOO;Lo;0;L;;;;;N;;;;;
-1461;CANADIAN SYLLABICS TWA;Lo;0;L;;;;;N;;;;;
-1462;CANADIAN SYLLABICS WEST-CREE TWA;Lo;0;L;;;;;N;;;;;
-1463;CANADIAN SYLLABICS TWAA;Lo;0;L;;;;;N;;;;;
-1464;CANADIAN SYLLABICS WEST-CREE TWAA;Lo;0;L;;;;;N;;;;;
-1465;CANADIAN SYLLABICS NASKAPI TWAA;Lo;0;L;;;;;N;;;;;
-1466;CANADIAN SYLLABICS T;Lo;0;L;;;;;N;;;;;
-1467;CANADIAN SYLLABICS TTE;Lo;0;L;;;;;N;;;;;
-1468;CANADIAN SYLLABICS TTI;Lo;0;L;;;;;N;;;;;
-1469;CANADIAN SYLLABICS TTO;Lo;0;L;;;;;N;;;;;
-146A;CANADIAN SYLLABICS TTA;Lo;0;L;;;;;N;;;;;
-146B;CANADIAN SYLLABICS KE;Lo;0;L;;;;;N;;;;;
-146C;CANADIAN SYLLABICS KAAI;Lo;0;L;;;;;N;;;;;
-146D;CANADIAN SYLLABICS KI;Lo;0;L;;;;;N;;;;;
-146E;CANADIAN SYLLABICS KII;Lo;0;L;;;;;N;;;;;
-146F;CANADIAN SYLLABICS KO;Lo;0;L;;;;;N;;;;;
-1470;CANADIAN SYLLABICS KOO;Lo;0;L;;;;;N;;;;;
-1471;CANADIAN SYLLABICS Y-CREE KOO;Lo;0;L;;;;;N;;;;;
-1472;CANADIAN SYLLABICS KA;Lo;0;L;;;;;N;;;;;
-1473;CANADIAN SYLLABICS KAA;Lo;0;L;;;;;N;;;;;
-1474;CANADIAN SYLLABICS KWE;Lo;0;L;;;;;N;;;;;
-1475;CANADIAN SYLLABICS WEST-CREE KWE;Lo;0;L;;;;;N;;;;;
-1476;CANADIAN SYLLABICS KWI;Lo;0;L;;;;;N;;;;;
-1477;CANADIAN SYLLABICS WEST-CREE KWI;Lo;0;L;;;;;N;;;;;
-1478;CANADIAN SYLLABICS KWII;Lo;0;L;;;;;N;;;;;
-1479;CANADIAN SYLLABICS WEST-CREE KWII;Lo;0;L;;;;;N;;;;;
-147A;CANADIAN SYLLABICS KWO;Lo;0;L;;;;;N;;;;;
-147B;CANADIAN SYLLABICS WEST-CREE KWO;Lo;0;L;;;;;N;;;;;
-147C;CANADIAN SYLLABICS KWOO;Lo;0;L;;;;;N;;;;;
-147D;CANADIAN SYLLABICS WEST-CREE KWOO;Lo;0;L;;;;;N;;;;;
-147E;CANADIAN SYLLABICS KWA;Lo;0;L;;;;;N;;;;;
-147F;CANADIAN SYLLABICS WEST-CREE KWA;Lo;0;L;;;;;N;;;;;
-1480;CANADIAN SYLLABICS KWAA;Lo;0;L;;;;;N;;;;;
-1481;CANADIAN SYLLABICS WEST-CREE KWAA;Lo;0;L;;;;;N;;;;;
-1482;CANADIAN SYLLABICS NASKAPI KWAA;Lo;0;L;;;;;N;;;;;
-1483;CANADIAN SYLLABICS K;Lo;0;L;;;;;N;;;;;
-1484;CANADIAN SYLLABICS KW;Lo;0;L;;;;;N;;;;;
-1485;CANADIAN SYLLABICS SOUTH-SLAVEY KEH;Lo;0;L;;;;;N;;;;;
-1486;CANADIAN SYLLABICS SOUTH-SLAVEY KIH;Lo;0;L;;;;;N;;;;;
-1487;CANADIAN SYLLABICS SOUTH-SLAVEY KOH;Lo;0;L;;;;;N;;;;;
-1488;CANADIAN SYLLABICS SOUTH-SLAVEY KAH;Lo;0;L;;;;;N;;;;;
-1489;CANADIAN SYLLABICS CE;Lo;0;L;;;;;N;;;;;
-148A;CANADIAN SYLLABICS CAAI;Lo;0;L;;;;;N;;;;;
-148B;CANADIAN SYLLABICS CI;Lo;0;L;;;;;N;;;;;
-148C;CANADIAN SYLLABICS CII;Lo;0;L;;;;;N;;;;;
-148D;CANADIAN SYLLABICS CO;Lo;0;L;;;;;N;;;;;
-148E;CANADIAN SYLLABICS COO;Lo;0;L;;;;;N;;;;;
-148F;CANADIAN SYLLABICS Y-CREE COO;Lo;0;L;;;;;N;;;;;
-1490;CANADIAN SYLLABICS CA;Lo;0;L;;;;;N;;;;;
-1491;CANADIAN SYLLABICS CAA;Lo;0;L;;;;;N;;;;;
-1492;CANADIAN SYLLABICS CWE;Lo;0;L;;;;;N;;;;;
-1493;CANADIAN SYLLABICS WEST-CREE CWE;Lo;0;L;;;;;N;;;;;
-1494;CANADIAN SYLLABICS CWI;Lo;0;L;;;;;N;;;;;
-1495;CANADIAN SYLLABICS WEST-CREE CWI;Lo;0;L;;;;;N;;;;;
-1496;CANADIAN SYLLABICS CWII;Lo;0;L;;;;;N;;;;;
-1497;CANADIAN SYLLABICS WEST-CREE CWII;Lo;0;L;;;;;N;;;;;
-1498;CANADIAN SYLLABICS CWO;Lo;0;L;;;;;N;;;;;
-1499;CANADIAN SYLLABICS WEST-CREE CWO;Lo;0;L;;;;;N;;;;;
-149A;CANADIAN SYLLABICS CWOO;Lo;0;L;;;;;N;;;;;
-149B;CANADIAN SYLLABICS WEST-CREE CWOO;Lo;0;L;;;;;N;;;;;
-149C;CANADIAN SYLLABICS CWA;Lo;0;L;;;;;N;;;;;
-149D;CANADIAN SYLLABICS WEST-CREE CWA;Lo;0;L;;;;;N;;;;;
-149E;CANADIAN SYLLABICS CWAA;Lo;0;L;;;;;N;;;;;
-149F;CANADIAN SYLLABICS WEST-CREE CWAA;Lo;0;L;;;;;N;;;;;
-14A0;CANADIAN SYLLABICS NASKAPI CWAA;Lo;0;L;;;;;N;;;;;
-14A1;CANADIAN SYLLABICS C;Lo;0;L;;;;;N;;;;;
-14A2;CANADIAN SYLLABICS SAYISI TH;Lo;0;L;;;;;N;;;;;
-14A3;CANADIAN SYLLABICS ME;Lo;0;L;;;;;N;;;;;
-14A4;CANADIAN SYLLABICS MAAI;Lo;0;L;;;;;N;;;;;
-14A5;CANADIAN SYLLABICS MI;Lo;0;L;;;;;N;;;;;
-14A6;CANADIAN SYLLABICS MII;Lo;0;L;;;;;N;;;;;
-14A7;CANADIAN SYLLABICS MO;Lo;0;L;;;;;N;;;;;
-14A8;CANADIAN SYLLABICS MOO;Lo;0;L;;;;;N;;;;;
-14A9;CANADIAN SYLLABICS Y-CREE MOO;Lo;0;L;;;;;N;;;;;
-14AA;CANADIAN SYLLABICS MA;Lo;0;L;;;;;N;;;;;
-14AB;CANADIAN SYLLABICS MAA;Lo;0;L;;;;;N;;;;;
-14AC;CANADIAN SYLLABICS MWE;Lo;0;L;;;;;N;;;;;
-14AD;CANADIAN SYLLABICS WEST-CREE MWE;Lo;0;L;;;;;N;;;;;
-14AE;CANADIAN SYLLABICS MWI;Lo;0;L;;;;;N;;;;;
-14AF;CANADIAN SYLLABICS WEST-CREE MWI;Lo;0;L;;;;;N;;;;;
-14B0;CANADIAN SYLLABICS MWII;Lo;0;L;;;;;N;;;;;
-14B1;CANADIAN SYLLABICS WEST-CREE MWII;Lo;0;L;;;;;N;;;;;
-14B2;CANADIAN SYLLABICS MWO;Lo;0;L;;;;;N;;;;;
-14B3;CANADIAN SYLLABICS WEST-CREE MWO;Lo;0;L;;;;;N;;;;;
-14B4;CANADIAN SYLLABICS MWOO;Lo;0;L;;;;;N;;;;;
-14B5;CANADIAN SYLLABICS WEST-CREE MWOO;Lo;0;L;;;;;N;;;;;
-14B6;CANADIAN SYLLABICS MWA;Lo;0;L;;;;;N;;;;;
-14B7;CANADIAN SYLLABICS WEST-CREE MWA;Lo;0;L;;;;;N;;;;;
-14B8;CANADIAN SYLLABICS MWAA;Lo;0;L;;;;;N;;;;;
-14B9;CANADIAN SYLLABICS WEST-CREE MWAA;Lo;0;L;;;;;N;;;;;
-14BA;CANADIAN SYLLABICS NASKAPI MWAA;Lo;0;L;;;;;N;;;;;
-14BB;CANADIAN SYLLABICS M;Lo;0;L;;;;;N;;;;;
-14BC;CANADIAN SYLLABICS WEST-CREE M;Lo;0;L;;;;;N;;;;;
-14BD;CANADIAN SYLLABICS MH;Lo;0;L;;;;;N;;;;;
-14BE;CANADIAN SYLLABICS ATHAPASCAN M;Lo;0;L;;;;;N;;;;;
-14BF;CANADIAN SYLLABICS SAYISI M;Lo;0;L;;;;;N;;;;;
-14C0;CANADIAN SYLLABICS NE;Lo;0;L;;;;;N;;;;;
-14C1;CANADIAN SYLLABICS NAAI;Lo;0;L;;;;;N;;;;;
-14C2;CANADIAN SYLLABICS NI;Lo;0;L;;;;;N;;;;;
-14C3;CANADIAN SYLLABICS NII;Lo;0;L;;;;;N;;;;;
-14C4;CANADIAN SYLLABICS NO;Lo;0;L;;;;;N;;;;;
-14C5;CANADIAN SYLLABICS NOO;Lo;0;L;;;;;N;;;;;
-14C6;CANADIAN SYLLABICS Y-CREE NOO;Lo;0;L;;;;;N;;;;;
-14C7;CANADIAN SYLLABICS NA;Lo;0;L;;;;;N;;;;;
-14C8;CANADIAN SYLLABICS NAA;Lo;0;L;;;;;N;;;;;
-14C9;CANADIAN SYLLABICS NWE;Lo;0;L;;;;;N;;;;;
-14CA;CANADIAN SYLLABICS WEST-CREE NWE;Lo;0;L;;;;;N;;;;;
-14CB;CANADIAN SYLLABICS NWA;Lo;0;L;;;;;N;;;;;
-14CC;CANADIAN SYLLABICS WEST-CREE NWA;Lo;0;L;;;;;N;;;;;
-14CD;CANADIAN SYLLABICS NWAA;Lo;0;L;;;;;N;;;;;
-14CE;CANADIAN SYLLABICS WEST-CREE NWAA;Lo;0;L;;;;;N;;;;;
-14CF;CANADIAN SYLLABICS NASKAPI NWAA;Lo;0;L;;;;;N;;;;;
-14D0;CANADIAN SYLLABICS N;Lo;0;L;;;;;N;;;;;
-14D1;CANADIAN SYLLABICS CARRIER NG;Lo;0;L;;;;;N;;;;;
-14D2;CANADIAN SYLLABICS NH;Lo;0;L;;;;;N;;;;;
-14D3;CANADIAN SYLLABICS LE;Lo;0;L;;;;;N;;;;;
-14D4;CANADIAN SYLLABICS LAAI;Lo;0;L;;;;;N;;;;;
-14D5;CANADIAN SYLLABICS LI;Lo;0;L;;;;;N;;;;;
-14D6;CANADIAN SYLLABICS LII;Lo;0;L;;;;;N;;;;;
-14D7;CANADIAN SYLLABICS LO;Lo;0;L;;;;;N;;;;;
-14D8;CANADIAN SYLLABICS LOO;Lo;0;L;;;;;N;;;;;
-14D9;CANADIAN SYLLABICS Y-CREE LOO;Lo;0;L;;;;;N;;;;;
-14DA;CANADIAN SYLLABICS LA;Lo;0;L;;;;;N;;;;;
-14DB;CANADIAN SYLLABICS LAA;Lo;0;L;;;;;N;;;;;
-14DC;CANADIAN SYLLABICS LWE;Lo;0;L;;;;;N;;;;;
-14DD;CANADIAN SYLLABICS WEST-CREE LWE;Lo;0;L;;;;;N;;;;;
-14DE;CANADIAN SYLLABICS LWI;Lo;0;L;;;;;N;;;;;
-14DF;CANADIAN SYLLABICS WEST-CREE LWI;Lo;0;L;;;;;N;;;;;
-14E0;CANADIAN SYLLABICS LWII;Lo;0;L;;;;;N;;;;;
-14E1;CANADIAN SYLLABICS WEST-CREE LWII;Lo;0;L;;;;;N;;;;;
-14E2;CANADIAN SYLLABICS LWO;Lo;0;L;;;;;N;;;;;
-14E3;CANADIAN SYLLABICS WEST-CREE LWO;Lo;0;L;;;;;N;;;;;
-14E4;CANADIAN SYLLABICS LWOO;Lo;0;L;;;;;N;;;;;
-14E5;CANADIAN SYLLABICS WEST-CREE LWOO;Lo;0;L;;;;;N;;;;;
-14E6;CANADIAN SYLLABICS LWA;Lo;0;L;;;;;N;;;;;
-14E7;CANADIAN SYLLABICS WEST-CREE LWA;Lo;0;L;;;;;N;;;;;
-14E8;CANADIAN SYLLABICS LWAA;Lo;0;L;;;;;N;;;;;
-14E9;CANADIAN SYLLABICS WEST-CREE LWAA;Lo;0;L;;;;;N;;;;;
-14EA;CANADIAN SYLLABICS L;Lo;0;L;;;;;N;;;;;
-14EB;CANADIAN SYLLABICS WEST-CREE L;Lo;0;L;;;;;N;;;;;
-14EC;CANADIAN SYLLABICS MEDIAL L;Lo;0;L;;;;;N;;;;;
-14ED;CANADIAN SYLLABICS SE;Lo;0;L;;;;;N;;;;;
-14EE;CANADIAN SYLLABICS SAAI;Lo;0;L;;;;;N;;;;;
-14EF;CANADIAN SYLLABICS SI;Lo;0;L;;;;;N;;;;;
-14F0;CANADIAN SYLLABICS SII;Lo;0;L;;;;;N;;;;;
-14F1;CANADIAN SYLLABICS SO;Lo;0;L;;;;;N;;;;;
-14F2;CANADIAN SYLLABICS SOO;Lo;0;L;;;;;N;;;;;
-14F3;CANADIAN SYLLABICS Y-CREE SOO;Lo;0;L;;;;;N;;;;;
-14F4;CANADIAN SYLLABICS SA;Lo;0;L;;;;;N;;;;;
-14F5;CANADIAN SYLLABICS SAA;Lo;0;L;;;;;N;;;;;
-14F6;CANADIAN SYLLABICS SWE;Lo;0;L;;;;;N;;;;;
-14F7;CANADIAN SYLLABICS WEST-CREE SWE;Lo;0;L;;;;;N;;;;;
-14F8;CANADIAN SYLLABICS SWI;Lo;0;L;;;;;N;;;;;
-14F9;CANADIAN SYLLABICS WEST-CREE SWI;Lo;0;L;;;;;N;;;;;
-14FA;CANADIAN SYLLABICS SWII;Lo;0;L;;;;;N;;;;;
-14FB;CANADIAN SYLLABICS WEST-CREE SWII;Lo;0;L;;;;;N;;;;;
-14FC;CANADIAN SYLLABICS SWO;Lo;0;L;;;;;N;;;;;
-14FD;CANADIAN SYLLABICS WEST-CREE SWO;Lo;0;L;;;;;N;;;;;
-14FE;CANADIAN SYLLABICS SWOO;Lo;0;L;;;;;N;;;;;
-14FF;CANADIAN SYLLABICS WEST-CREE SWOO;Lo;0;L;;;;;N;;;;;
-1500;CANADIAN SYLLABICS SWA;Lo;0;L;;;;;N;;;;;
-1501;CANADIAN SYLLABICS WEST-CREE SWA;Lo;0;L;;;;;N;;;;;
-1502;CANADIAN SYLLABICS SWAA;Lo;0;L;;;;;N;;;;;
-1503;CANADIAN SYLLABICS WEST-CREE SWAA;Lo;0;L;;;;;N;;;;;
-1504;CANADIAN SYLLABICS NASKAPI SWAA;Lo;0;L;;;;;N;;;;;
-1505;CANADIAN SYLLABICS S;Lo;0;L;;;;;N;;;;;
-1506;CANADIAN SYLLABICS ATHAPASCAN S;Lo;0;L;;;;;N;;;;;
-1507;CANADIAN SYLLABICS SW;Lo;0;L;;;;;N;;;;;
-1508;CANADIAN SYLLABICS BLACKFOOT S;Lo;0;L;;;;;N;;;;;
-1509;CANADIAN SYLLABICS MOOSE-CREE SK;Lo;0;L;;;;;N;;;;;
-150A;CANADIAN SYLLABICS NASKAPI SKW;Lo;0;L;;;;;N;;;;;
-150B;CANADIAN SYLLABICS NASKAPI S-W;Lo;0;L;;;;;N;;;;;
-150C;CANADIAN SYLLABICS NASKAPI SPWA;Lo;0;L;;;;;N;;;;;
-150D;CANADIAN SYLLABICS NASKAPI STWA;Lo;0;L;;;;;N;;;;;
-150E;CANADIAN SYLLABICS NASKAPI SKWA;Lo;0;L;;;;;N;;;;;
-150F;CANADIAN SYLLABICS NASKAPI SCWA;Lo;0;L;;;;;N;;;;;
-1510;CANADIAN SYLLABICS SHE;Lo;0;L;;;;;N;;;;;
-1511;CANADIAN SYLLABICS SHI;Lo;0;L;;;;;N;;;;;
-1512;CANADIAN SYLLABICS SHII;Lo;0;L;;;;;N;;;;;
-1513;CANADIAN SYLLABICS SHO;Lo;0;L;;;;;N;;;;;
-1514;CANADIAN SYLLABICS SHOO;Lo;0;L;;;;;N;;;;;
-1515;CANADIAN SYLLABICS SHA;Lo;0;L;;;;;N;;;;;
-1516;CANADIAN SYLLABICS SHAA;Lo;0;L;;;;;N;;;;;
-1517;CANADIAN SYLLABICS SHWE;Lo;0;L;;;;;N;;;;;
-1518;CANADIAN SYLLABICS WEST-CREE SHWE;Lo;0;L;;;;;N;;;;;
-1519;CANADIAN SYLLABICS SHWI;Lo;0;L;;;;;N;;;;;
-151A;CANADIAN SYLLABICS WEST-CREE SHWI;Lo;0;L;;;;;N;;;;;
-151B;CANADIAN SYLLABICS SHWII;Lo;0;L;;;;;N;;;;;
-151C;CANADIAN SYLLABICS WEST-CREE SHWII;Lo;0;L;;;;;N;;;;;
-151D;CANADIAN SYLLABICS SHWO;Lo;0;L;;;;;N;;;;;
-151E;CANADIAN SYLLABICS WEST-CREE SHWO;Lo;0;L;;;;;N;;;;;
-151F;CANADIAN SYLLABICS SHWOO;Lo;0;L;;;;;N;;;;;
-1520;CANADIAN SYLLABICS WEST-CREE SHWOO;Lo;0;L;;;;;N;;;;;
-1521;CANADIAN SYLLABICS SHWA;Lo;0;L;;;;;N;;;;;
-1522;CANADIAN SYLLABICS WEST-CREE SHWA;Lo;0;L;;;;;N;;;;;
-1523;CANADIAN SYLLABICS SHWAA;Lo;0;L;;;;;N;;;;;
-1524;CANADIAN SYLLABICS WEST-CREE SHWAA;Lo;0;L;;;;;N;;;;;
-1525;CANADIAN SYLLABICS SH;Lo;0;L;;;;;N;;;;;
-1526;CANADIAN SYLLABICS YE;Lo;0;L;;;;;N;;;;;
-1527;CANADIAN SYLLABICS YAAI;Lo;0;L;;;;;N;;;;;
-1528;CANADIAN SYLLABICS YI;Lo;0;L;;;;;N;;;;;
-1529;CANADIAN SYLLABICS YII;Lo;0;L;;;;;N;;;;;
-152A;CANADIAN SYLLABICS YO;Lo;0;L;;;;;N;;;;;
-152B;CANADIAN SYLLABICS YOO;Lo;0;L;;;;;N;;;;;
-152C;CANADIAN SYLLABICS Y-CREE YOO;Lo;0;L;;;;;N;;;;;
-152D;CANADIAN SYLLABICS YA;Lo;0;L;;;;;N;;;;;
-152E;CANADIAN SYLLABICS YAA;Lo;0;L;;;;;N;;;;;
-152F;CANADIAN SYLLABICS YWE;Lo;0;L;;;;;N;;;;;
-1530;CANADIAN SYLLABICS WEST-CREE YWE;Lo;0;L;;;;;N;;;;;
-1531;CANADIAN SYLLABICS YWI;Lo;0;L;;;;;N;;;;;
-1532;CANADIAN SYLLABICS WEST-CREE YWI;Lo;0;L;;;;;N;;;;;
-1533;CANADIAN SYLLABICS YWII;Lo;0;L;;;;;N;;;;;
-1534;CANADIAN SYLLABICS WEST-CREE YWII;Lo;0;L;;;;;N;;;;;
-1535;CANADIAN SYLLABICS YWO;Lo;0;L;;;;;N;;;;;
-1536;CANADIAN SYLLABICS WEST-CREE YWO;Lo;0;L;;;;;N;;;;;
-1537;CANADIAN SYLLABICS YWOO;Lo;0;L;;;;;N;;;;;
-1538;CANADIAN SYLLABICS WEST-CREE YWOO;Lo;0;L;;;;;N;;;;;
-1539;CANADIAN SYLLABICS YWA;Lo;0;L;;;;;N;;;;;
-153A;CANADIAN SYLLABICS WEST-CREE YWA;Lo;0;L;;;;;N;;;;;
-153B;CANADIAN SYLLABICS YWAA;Lo;0;L;;;;;N;;;;;
-153C;CANADIAN SYLLABICS WEST-CREE YWAA;Lo;0;L;;;;;N;;;;;
-153D;CANADIAN SYLLABICS NASKAPI YWAA;Lo;0;L;;;;;N;;;;;
-153E;CANADIAN SYLLABICS Y;Lo;0;L;;;;;N;;;;;
-153F;CANADIAN SYLLABICS BIBLE-CREE Y;Lo;0;L;;;;;N;;;;;
-1540;CANADIAN SYLLABICS WEST-CREE Y;Lo;0;L;;;;;N;;;;;
-1541;CANADIAN SYLLABICS SAYISI YI;Lo;0;L;;;;;N;;;;;
-1542;CANADIAN SYLLABICS RE;Lo;0;L;;;;;N;;;;;
-1543;CANADIAN SYLLABICS R-CREE RE;Lo;0;L;;;;;N;;;;;
-1544;CANADIAN SYLLABICS WEST-CREE LE;Lo;0;L;;;;;N;;;;;
-1545;CANADIAN SYLLABICS RAAI;Lo;0;L;;;;;N;;;;;
-1546;CANADIAN SYLLABICS RI;Lo;0;L;;;;;N;;;;;
-1547;CANADIAN SYLLABICS RII;Lo;0;L;;;;;N;;;;;
-1548;CANADIAN SYLLABICS RO;Lo;0;L;;;;;N;;;;;
-1549;CANADIAN SYLLABICS ROO;Lo;0;L;;;;;N;;;;;
-154A;CANADIAN SYLLABICS WEST-CREE LO;Lo;0;L;;;;;N;;;;;
-154B;CANADIAN SYLLABICS RA;Lo;0;L;;;;;N;;;;;
-154C;CANADIAN SYLLABICS RAA;Lo;0;L;;;;;N;;;;;
-154D;CANADIAN SYLLABICS WEST-CREE LA;Lo;0;L;;;;;N;;;;;
-154E;CANADIAN SYLLABICS RWAA;Lo;0;L;;;;;N;;;;;
-154F;CANADIAN SYLLABICS WEST-CREE RWAA;Lo;0;L;;;;;N;;;;;
-1550;CANADIAN SYLLABICS R;Lo;0;L;;;;;N;;;;;
-1551;CANADIAN SYLLABICS WEST-CREE R;Lo;0;L;;;;;N;;;;;
-1552;CANADIAN SYLLABICS MEDIAL R;Lo;0;L;;;;;N;;;;;
-1553;CANADIAN SYLLABICS FE;Lo;0;L;;;;;N;;;;;
-1554;CANADIAN SYLLABICS FAAI;Lo;0;L;;;;;N;;;;;
-1555;CANADIAN SYLLABICS FI;Lo;0;L;;;;;N;;;;;
-1556;CANADIAN SYLLABICS FII;Lo;0;L;;;;;N;;;;;
-1557;CANADIAN SYLLABICS FO;Lo;0;L;;;;;N;;;;;
-1558;CANADIAN SYLLABICS FOO;Lo;0;L;;;;;N;;;;;
-1559;CANADIAN SYLLABICS FA;Lo;0;L;;;;;N;;;;;
-155A;CANADIAN SYLLABICS FAA;Lo;0;L;;;;;N;;;;;
-155B;CANADIAN SYLLABICS FWAA;Lo;0;L;;;;;N;;;;;
-155C;CANADIAN SYLLABICS WEST-CREE FWAA;Lo;0;L;;;;;N;;;;;
-155D;CANADIAN SYLLABICS F;Lo;0;L;;;;;N;;;;;
-155E;CANADIAN SYLLABICS THE;Lo;0;L;;;;;N;;;;;
-155F;CANADIAN SYLLABICS N-CREE THE;Lo;0;L;;;;;N;;;;;
-1560;CANADIAN SYLLABICS THI;Lo;0;L;;;;;N;;;;;
-1561;CANADIAN SYLLABICS N-CREE THI;Lo;0;L;;;;;N;;;;;
-1562;CANADIAN SYLLABICS THII;Lo;0;L;;;;;N;;;;;
-1563;CANADIAN SYLLABICS N-CREE THII;Lo;0;L;;;;;N;;;;;
-1564;CANADIAN SYLLABICS THO;Lo;0;L;;;;;N;;;;;
-1565;CANADIAN SYLLABICS THOO;Lo;0;L;;;;;N;;;;;
-1566;CANADIAN SYLLABICS THA;Lo;0;L;;;;;N;;;;;
-1567;CANADIAN SYLLABICS THAA;Lo;0;L;;;;;N;;;;;
-1568;CANADIAN SYLLABICS THWAA;Lo;0;L;;;;;N;;;;;
-1569;CANADIAN SYLLABICS WEST-CREE THWAA;Lo;0;L;;;;;N;;;;;
-156A;CANADIAN SYLLABICS TH;Lo;0;L;;;;;N;;;;;
-156B;CANADIAN SYLLABICS TTHE;Lo;0;L;;;;;N;;;;;
-156C;CANADIAN SYLLABICS TTHI;Lo;0;L;;;;;N;;;;;
-156D;CANADIAN SYLLABICS TTHO;Lo;0;L;;;;;N;;;;;
-156E;CANADIAN SYLLABICS TTHA;Lo;0;L;;;;;N;;;;;
-156F;CANADIAN SYLLABICS TTH;Lo;0;L;;;;;N;;;;;
-1570;CANADIAN SYLLABICS TYE;Lo;0;L;;;;;N;;;;;
-1571;CANADIAN SYLLABICS TYI;Lo;0;L;;;;;N;;;;;
-1572;CANADIAN SYLLABICS TYO;Lo;0;L;;;;;N;;;;;
-1573;CANADIAN SYLLABICS TYA;Lo;0;L;;;;;N;;;;;
-1574;CANADIAN SYLLABICS NUNAVIK HE;Lo;0;L;;;;;N;;;;;
-1575;CANADIAN SYLLABICS NUNAVIK HI;Lo;0;L;;;;;N;;;;;
-1576;CANADIAN SYLLABICS NUNAVIK HII;Lo;0;L;;;;;N;;;;;
-1577;CANADIAN SYLLABICS NUNAVIK HO;Lo;0;L;;;;;N;;;;;
-1578;CANADIAN SYLLABICS NUNAVIK HOO;Lo;0;L;;;;;N;;;;;
-1579;CANADIAN SYLLABICS NUNAVIK HA;Lo;0;L;;;;;N;;;;;
-157A;CANADIAN SYLLABICS NUNAVIK HAA;Lo;0;L;;;;;N;;;;;
-157B;CANADIAN SYLLABICS NUNAVIK H;Lo;0;L;;;;;N;;;;;
-157C;CANADIAN SYLLABICS NUNAVUT H;Lo;0;L;;;;;N;;;;;
-157D;CANADIAN SYLLABICS HK;Lo;0;L;;;;;N;;;;;
-157E;CANADIAN SYLLABICS QAAI;Lo;0;L;;;;;N;;;;;
-157F;CANADIAN SYLLABICS QI;Lo;0;L;;;;;N;;;;;
-1580;CANADIAN SYLLABICS QII;Lo;0;L;;;;;N;;;;;
-1581;CANADIAN SYLLABICS QO;Lo;0;L;;;;;N;;;;;
-1582;CANADIAN SYLLABICS QOO;Lo;0;L;;;;;N;;;;;
-1583;CANADIAN SYLLABICS QA;Lo;0;L;;;;;N;;;;;
-1584;CANADIAN SYLLABICS QAA;Lo;0;L;;;;;N;;;;;
-1585;CANADIAN SYLLABICS Q;Lo;0;L;;;;;N;;;;;
-1586;CANADIAN SYLLABICS TLHE;Lo;0;L;;;;;N;;;;;
-1587;CANADIAN SYLLABICS TLHI;Lo;0;L;;;;;N;;;;;
-1588;CANADIAN SYLLABICS TLHO;Lo;0;L;;;;;N;;;;;
-1589;CANADIAN SYLLABICS TLHA;Lo;0;L;;;;;N;;;;;
-158A;CANADIAN SYLLABICS WEST-CREE RE;Lo;0;L;;;;;N;;;;;
-158B;CANADIAN SYLLABICS WEST-CREE RI;Lo;0;L;;;;;N;;;;;
-158C;CANADIAN SYLLABICS WEST-CREE RO;Lo;0;L;;;;;N;;;;;
-158D;CANADIAN SYLLABICS WEST-CREE RA;Lo;0;L;;;;;N;;;;;
-158E;CANADIAN SYLLABICS NGAAI;Lo;0;L;;;;;N;;;;;
-158F;CANADIAN SYLLABICS NGI;Lo;0;L;;;;;N;;;;;
-1590;CANADIAN SYLLABICS NGII;Lo;0;L;;;;;N;;;;;
-1591;CANADIAN SYLLABICS NGO;Lo;0;L;;;;;N;;;;;
-1592;CANADIAN SYLLABICS NGOO;Lo;0;L;;;;;N;;;;;
-1593;CANADIAN SYLLABICS NGA;Lo;0;L;;;;;N;;;;;
-1594;CANADIAN SYLLABICS NGAA;Lo;0;L;;;;;N;;;;;
-1595;CANADIAN SYLLABICS NG;Lo;0;L;;;;;N;;;;;
-1596;CANADIAN SYLLABICS NNG;Lo;0;L;;;;;N;;;;;
-1597;CANADIAN SYLLABICS SAYISI SHE;Lo;0;L;;;;;N;;;;;
-1598;CANADIAN SYLLABICS SAYISI SHI;Lo;0;L;;;;;N;;;;;
-1599;CANADIAN SYLLABICS SAYISI SHO;Lo;0;L;;;;;N;;;;;
-159A;CANADIAN SYLLABICS SAYISI SHA;Lo;0;L;;;;;N;;;;;
-159B;CANADIAN SYLLABICS WOODS-CREE THE;Lo;0;L;;;;;N;;;;;
-159C;CANADIAN SYLLABICS WOODS-CREE THI;Lo;0;L;;;;;N;;;;;
-159D;CANADIAN SYLLABICS WOODS-CREE THO;Lo;0;L;;;;;N;;;;;
-159E;CANADIAN SYLLABICS WOODS-CREE THA;Lo;0;L;;;;;N;;;;;
-159F;CANADIAN SYLLABICS WOODS-CREE TH;Lo;0;L;;;;;N;;;;;
-15A0;CANADIAN SYLLABICS LHI;Lo;0;L;;;;;N;;;;;
-15A1;CANADIAN SYLLABICS LHII;Lo;0;L;;;;;N;;;;;
-15A2;CANADIAN SYLLABICS LHO;Lo;0;L;;;;;N;;;;;
-15A3;CANADIAN SYLLABICS LHOO;Lo;0;L;;;;;N;;;;;
-15A4;CANADIAN SYLLABICS LHA;Lo;0;L;;;;;N;;;;;
-15A5;CANADIAN SYLLABICS LHAA;Lo;0;L;;;;;N;;;;;
-15A6;CANADIAN SYLLABICS LH;Lo;0;L;;;;;N;;;;;
-15A7;CANADIAN SYLLABICS TH-CREE THE;Lo;0;L;;;;;N;;;;;
-15A8;CANADIAN SYLLABICS TH-CREE THI;Lo;0;L;;;;;N;;;;;
-15A9;CANADIAN SYLLABICS TH-CREE THII;Lo;0;L;;;;;N;;;;;
-15AA;CANADIAN SYLLABICS TH-CREE THO;Lo;0;L;;;;;N;;;;;
-15AB;CANADIAN SYLLABICS TH-CREE THOO;Lo;0;L;;;;;N;;;;;
-15AC;CANADIAN SYLLABICS TH-CREE THA;Lo;0;L;;;;;N;;;;;
-15AD;CANADIAN SYLLABICS TH-CREE THAA;Lo;0;L;;;;;N;;;;;
-15AE;CANADIAN SYLLABICS TH-CREE TH;Lo;0;L;;;;;N;;;;;
-15AF;CANADIAN SYLLABICS AIVILIK B;Lo;0;L;;;;;N;;;;;
-15B0;CANADIAN SYLLABICS BLACKFOOT E;Lo;0;L;;;;;N;;;;;
-15B1;CANADIAN SYLLABICS BLACKFOOT I;Lo;0;L;;;;;N;;;;;
-15B2;CANADIAN SYLLABICS BLACKFOOT O;Lo;0;L;;;;;N;;;;;
-15B3;CANADIAN SYLLABICS BLACKFOOT A;Lo;0;L;;;;;N;;;;;
-15B4;CANADIAN SYLLABICS BLACKFOOT WE;Lo;0;L;;;;;N;;;;;
-15B5;CANADIAN SYLLABICS BLACKFOOT WI;Lo;0;L;;;;;N;;;;;
-15B6;CANADIAN SYLLABICS BLACKFOOT WO;Lo;0;L;;;;;N;;;;;
-15B7;CANADIAN SYLLABICS BLACKFOOT WA;Lo;0;L;;;;;N;;;;;
-15B8;CANADIAN SYLLABICS BLACKFOOT NE;Lo;0;L;;;;;N;;;;;
-15B9;CANADIAN SYLLABICS BLACKFOOT NI;Lo;0;L;;;;;N;;;;;
-15BA;CANADIAN SYLLABICS BLACKFOOT NO;Lo;0;L;;;;;N;;;;;
-15BB;CANADIAN SYLLABICS BLACKFOOT NA;Lo;0;L;;;;;N;;;;;
-15BC;CANADIAN SYLLABICS BLACKFOOT KE;Lo;0;L;;;;;N;;;;;
-15BD;CANADIAN SYLLABICS BLACKFOOT KI;Lo;0;L;;;;;N;;;;;
-15BE;CANADIAN SYLLABICS BLACKFOOT KO;Lo;0;L;;;;;N;;;;;
-15BF;CANADIAN SYLLABICS BLACKFOOT KA;Lo;0;L;;;;;N;;;;;
-15C0;CANADIAN SYLLABICS SAYISI HE;Lo;0;L;;;;;N;;;;;
-15C1;CANADIAN SYLLABICS SAYISI HI;Lo;0;L;;;;;N;;;;;
-15C2;CANADIAN SYLLABICS SAYISI HO;Lo;0;L;;;;;N;;;;;
-15C3;CANADIAN SYLLABICS SAYISI HA;Lo;0;L;;;;;N;;;;;
-15C4;CANADIAN SYLLABICS CARRIER GHU;Lo;0;L;;;;;N;;;;;
-15C5;CANADIAN SYLLABICS CARRIER GHO;Lo;0;L;;;;;N;;;;;
-15C6;CANADIAN SYLLABICS CARRIER GHE;Lo;0;L;;;;;N;;;;;
-15C7;CANADIAN SYLLABICS CARRIER GHEE;Lo;0;L;;;;;N;;;;;
-15C8;CANADIAN SYLLABICS CARRIER GHI;Lo;0;L;;;;;N;;;;;
-15C9;CANADIAN SYLLABICS CARRIER GHA;Lo;0;L;;;;;N;;;;;
-15CA;CANADIAN SYLLABICS CARRIER RU;Lo;0;L;;;;;N;;;;;
-15CB;CANADIAN SYLLABICS CARRIER RO;Lo;0;L;;;;;N;;;;;
-15CC;CANADIAN SYLLABICS CARRIER RE;Lo;0;L;;;;;N;;;;;
-15CD;CANADIAN SYLLABICS CARRIER REE;Lo;0;L;;;;;N;;;;;
-15CE;CANADIAN SYLLABICS CARRIER RI;Lo;0;L;;;;;N;;;;;
-15CF;CANADIAN SYLLABICS CARRIER RA;Lo;0;L;;;;;N;;;;;
-15D0;CANADIAN SYLLABICS CARRIER WU;Lo;0;L;;;;;N;;;;;
-15D1;CANADIAN SYLLABICS CARRIER WO;Lo;0;L;;;;;N;;;;;
-15D2;CANADIAN SYLLABICS CARRIER WE;Lo;0;L;;;;;N;;;;;
-15D3;CANADIAN SYLLABICS CARRIER WEE;Lo;0;L;;;;;N;;;;;
-15D4;CANADIAN SYLLABICS CARRIER WI;Lo;0;L;;;;;N;;;;;
-15D5;CANADIAN SYLLABICS CARRIER WA;Lo;0;L;;;;;N;;;;;
-15D6;CANADIAN SYLLABICS CARRIER HWU;Lo;0;L;;;;;N;;;;;
-15D7;CANADIAN SYLLABICS CARRIER HWO;Lo;0;L;;;;;N;;;;;
-15D8;CANADIAN SYLLABICS CARRIER HWE;Lo;0;L;;;;;N;;;;;
-15D9;CANADIAN SYLLABICS CARRIER HWEE;Lo;0;L;;;;;N;;;;;
-15DA;CANADIAN SYLLABICS CARRIER HWI;Lo;0;L;;;;;N;;;;;
-15DB;CANADIAN SYLLABICS CARRIER HWA;Lo;0;L;;;;;N;;;;;
-15DC;CANADIAN SYLLABICS CARRIER THU;Lo;0;L;;;;;N;;;;;
-15DD;CANADIAN SYLLABICS CARRIER THO;Lo;0;L;;;;;N;;;;;
-15DE;CANADIAN SYLLABICS CARRIER THE;Lo;0;L;;;;;N;;;;;
-15DF;CANADIAN SYLLABICS CARRIER THEE;Lo;0;L;;;;;N;;;;;
-15E0;CANADIAN SYLLABICS CARRIER THI;Lo;0;L;;;;;N;;;;;
-15E1;CANADIAN SYLLABICS CARRIER THA;Lo;0;L;;;;;N;;;;;
-15E2;CANADIAN SYLLABICS CARRIER TTU;Lo;0;L;;;;;N;;;;;
-15E3;CANADIAN SYLLABICS CARRIER TTO;Lo;0;L;;;;;N;;;;;
-15E4;CANADIAN SYLLABICS CARRIER TTE;Lo;0;L;;;;;N;;;;;
-15E5;CANADIAN SYLLABICS CARRIER TTEE;Lo;0;L;;;;;N;;;;;
-15E6;CANADIAN SYLLABICS CARRIER TTI;Lo;0;L;;;;;N;;;;;
-15E7;CANADIAN SYLLABICS CARRIER TTA;Lo;0;L;;;;;N;;;;;
-15E8;CANADIAN SYLLABICS CARRIER PU;Lo;0;L;;;;;N;;;;;
-15E9;CANADIAN SYLLABICS CARRIER PO;Lo;0;L;;;;;N;;;;;
-15EA;CANADIAN SYLLABICS CARRIER PE;Lo;0;L;;;;;N;;;;;
-15EB;CANADIAN SYLLABICS CARRIER PEE;Lo;0;L;;;;;N;;;;;
-15EC;CANADIAN SYLLABICS CARRIER PI;Lo;0;L;;;;;N;;;;;
-15ED;CANADIAN SYLLABICS CARRIER PA;Lo;0;L;;;;;N;;;;;
-15EE;CANADIAN SYLLABICS CARRIER P;Lo;0;L;;;;;N;;;;;
-15EF;CANADIAN SYLLABICS CARRIER GU;Lo;0;L;;;;;N;;;;;
-15F0;CANADIAN SYLLABICS CARRIER GO;Lo;0;L;;;;;N;;;;;
-15F1;CANADIAN SYLLABICS CARRIER GE;Lo;0;L;;;;;N;;;;;
-15F2;CANADIAN SYLLABICS CARRIER GEE;Lo;0;L;;;;;N;;;;;
-15F3;CANADIAN SYLLABICS CARRIER GI;Lo;0;L;;;;;N;;;;;
-15F4;CANADIAN SYLLABICS CARRIER GA;Lo;0;L;;;;;N;;;;;
-15F5;CANADIAN SYLLABICS CARRIER KHU;Lo;0;L;;;;;N;;;;;
-15F6;CANADIAN SYLLABICS CARRIER KHO;Lo;0;L;;;;;N;;;;;
-15F7;CANADIAN SYLLABICS CARRIER KHE;Lo;0;L;;;;;N;;;;;
-15F8;CANADIAN SYLLABICS CARRIER KHEE;Lo;0;L;;;;;N;;;;;
-15F9;CANADIAN SYLLABICS CARRIER KHI;Lo;0;L;;;;;N;;;;;
-15FA;CANADIAN SYLLABICS CARRIER KHA;Lo;0;L;;;;;N;;;;;
-15FB;CANADIAN SYLLABICS CARRIER KKU;Lo;0;L;;;;;N;;;;;
-15FC;CANADIAN SYLLABICS CARRIER KKO;Lo;0;L;;;;;N;;;;;
-15FD;CANADIAN SYLLABICS CARRIER KKE;Lo;0;L;;;;;N;;;;;
-15FE;CANADIAN SYLLABICS CARRIER KKEE;Lo;0;L;;;;;N;;;;;
-15FF;CANADIAN SYLLABICS CARRIER KKI;Lo;0;L;;;;;N;;;;;
-1600;CANADIAN SYLLABICS CARRIER KKA;Lo;0;L;;;;;N;;;;;
-1601;CANADIAN SYLLABICS CARRIER KK;Lo;0;L;;;;;N;;;;;
-1602;CANADIAN SYLLABICS CARRIER NU;Lo;0;L;;;;;N;;;;;
-1603;CANADIAN SYLLABICS CARRIER NO;Lo;0;L;;;;;N;;;;;
-1604;CANADIAN SYLLABICS CARRIER NE;Lo;0;L;;;;;N;;;;;
-1605;CANADIAN SYLLABICS CARRIER NEE;Lo;0;L;;;;;N;;;;;
-1606;CANADIAN SYLLABICS CARRIER NI;Lo;0;L;;;;;N;;;;;
-1607;CANADIAN SYLLABICS CARRIER NA;Lo;0;L;;;;;N;;;;;
-1608;CANADIAN SYLLABICS CARRIER MU;Lo;0;L;;;;;N;;;;;
-1609;CANADIAN SYLLABICS CARRIER MO;Lo;0;L;;;;;N;;;;;
-160A;CANADIAN SYLLABICS CARRIER ME;Lo;0;L;;;;;N;;;;;
-160B;CANADIAN SYLLABICS CARRIER MEE;Lo;0;L;;;;;N;;;;;
-160C;CANADIAN SYLLABICS CARRIER MI;Lo;0;L;;;;;N;;;;;
-160D;CANADIAN SYLLABICS CARRIER MA;Lo;0;L;;;;;N;;;;;
-160E;CANADIAN SYLLABICS CARRIER YU;Lo;0;L;;;;;N;;;;;
-160F;CANADIAN SYLLABICS CARRIER YO;Lo;0;L;;;;;N;;;;;
-1610;CANADIAN SYLLABICS CARRIER YE;Lo;0;L;;;;;N;;;;;
-1611;CANADIAN SYLLABICS CARRIER YEE;Lo;0;L;;;;;N;;;;;
-1612;CANADIAN SYLLABICS CARRIER YI;Lo;0;L;;;;;N;;;;;
-1613;CANADIAN SYLLABICS CARRIER YA;Lo;0;L;;;;;N;;;;;
-1614;CANADIAN SYLLABICS CARRIER JU;Lo;0;L;;;;;N;;;;;
-1615;CANADIAN SYLLABICS SAYISI JU;Lo;0;L;;;;;N;;;;;
-1616;CANADIAN SYLLABICS CARRIER JO;Lo;0;L;;;;;N;;;;;
-1617;CANADIAN SYLLABICS CARRIER JE;Lo;0;L;;;;;N;;;;;
-1618;CANADIAN SYLLABICS CARRIER JEE;Lo;0;L;;;;;N;;;;;
-1619;CANADIAN SYLLABICS CARRIER JI;Lo;0;L;;;;;N;;;;;
-161A;CANADIAN SYLLABICS SAYISI JI;Lo;0;L;;;;;N;;;;;
-161B;CANADIAN SYLLABICS CARRIER JA;Lo;0;L;;;;;N;;;;;
-161C;CANADIAN SYLLABICS CARRIER JJU;Lo;0;L;;;;;N;;;;;
-161D;CANADIAN SYLLABICS CARRIER JJO;Lo;0;L;;;;;N;;;;;
-161E;CANADIAN SYLLABICS CARRIER JJE;Lo;0;L;;;;;N;;;;;
-161F;CANADIAN SYLLABICS CARRIER JJEE;Lo;0;L;;;;;N;;;;;
-1620;CANADIAN SYLLABICS CARRIER JJI;Lo;0;L;;;;;N;;;;;
-1621;CANADIAN SYLLABICS CARRIER JJA;Lo;0;L;;;;;N;;;;;
-1622;CANADIAN SYLLABICS CARRIER LU;Lo;0;L;;;;;N;;;;;
-1623;CANADIAN SYLLABICS CARRIER LO;Lo;0;L;;;;;N;;;;;
-1624;CANADIAN SYLLABICS CARRIER LE;Lo;0;L;;;;;N;;;;;
-1625;CANADIAN SYLLABICS CARRIER LEE;Lo;0;L;;;;;N;;;;;
-1626;CANADIAN SYLLABICS CARRIER LI;Lo;0;L;;;;;N;;;;;
-1627;CANADIAN SYLLABICS CARRIER LA;Lo;0;L;;;;;N;;;;;
-1628;CANADIAN SYLLABICS CARRIER DLU;Lo;0;L;;;;;N;;;;;
-1629;CANADIAN SYLLABICS CARRIER DLO;Lo;0;L;;;;;N;;;;;
-162A;CANADIAN SYLLABICS CARRIER DLE;Lo;0;L;;;;;N;;;;;
-162B;CANADIAN SYLLABICS CARRIER DLEE;Lo;0;L;;;;;N;;;;;
-162C;CANADIAN SYLLABICS CARRIER DLI;Lo;0;L;;;;;N;;;;;
-162D;CANADIAN SYLLABICS CARRIER DLA;Lo;0;L;;;;;N;;;;;
-162E;CANADIAN SYLLABICS CARRIER LHU;Lo;0;L;;;;;N;;;;;
-162F;CANADIAN SYLLABICS CARRIER LHO;Lo;0;L;;;;;N;;;;;
-1630;CANADIAN SYLLABICS CARRIER LHE;Lo;0;L;;;;;N;;;;;
-1631;CANADIAN SYLLABICS CARRIER LHEE;Lo;0;L;;;;;N;;;;;
-1632;CANADIAN SYLLABICS CARRIER LHI;Lo;0;L;;;;;N;;;;;
-1633;CANADIAN SYLLABICS CARRIER LHA;Lo;0;L;;;;;N;;;;;
-1634;CANADIAN SYLLABICS CARRIER TLHU;Lo;0;L;;;;;N;;;;;
-1635;CANADIAN SYLLABICS CARRIER TLHO;Lo;0;L;;;;;N;;;;;
-1636;CANADIAN SYLLABICS CARRIER TLHE;Lo;0;L;;;;;N;;;;;
-1637;CANADIAN SYLLABICS CARRIER TLHEE;Lo;0;L;;;;;N;;;;;
-1638;CANADIAN SYLLABICS CARRIER TLHI;Lo;0;L;;;;;N;;;;;
-1639;CANADIAN SYLLABICS CARRIER TLHA;Lo;0;L;;;;;N;;;;;
-163A;CANADIAN SYLLABICS CARRIER TLU;Lo;0;L;;;;;N;;;;;
-163B;CANADIAN SYLLABICS CARRIER TLO;Lo;0;L;;;;;N;;;;;
-163C;CANADIAN SYLLABICS CARRIER TLE;Lo;0;L;;;;;N;;;;;
-163D;CANADIAN SYLLABICS CARRIER TLEE;Lo;0;L;;;;;N;;;;;
-163E;CANADIAN SYLLABICS CARRIER TLI;Lo;0;L;;;;;N;;;;;
-163F;CANADIAN SYLLABICS CARRIER TLA;Lo;0;L;;;;;N;;;;;
-1640;CANADIAN SYLLABICS CARRIER ZU;Lo;0;L;;;;;N;;;;;
-1641;CANADIAN SYLLABICS CARRIER ZO;Lo;0;L;;;;;N;;;;;
-1642;CANADIAN SYLLABICS CARRIER ZE;Lo;0;L;;;;;N;;;;;
-1643;CANADIAN SYLLABICS CARRIER ZEE;Lo;0;L;;;;;N;;;;;
-1644;CANADIAN SYLLABICS CARRIER ZI;Lo;0;L;;;;;N;;;;;
-1645;CANADIAN SYLLABICS CARRIER ZA;Lo;0;L;;;;;N;;;;;
-1646;CANADIAN SYLLABICS CARRIER Z;Lo;0;L;;;;;N;;;;;
-1647;CANADIAN SYLLABICS CARRIER INITIAL Z;Lo;0;L;;;;;N;;;;;
-1648;CANADIAN SYLLABICS CARRIER DZU;Lo;0;L;;;;;N;;;;;
-1649;CANADIAN SYLLABICS CARRIER DZO;Lo;0;L;;;;;N;;;;;
-164A;CANADIAN SYLLABICS CARRIER DZE;Lo;0;L;;;;;N;;;;;
-164B;CANADIAN SYLLABICS CARRIER DZEE;Lo;0;L;;;;;N;;;;;
-164C;CANADIAN SYLLABICS CARRIER DZI;Lo;0;L;;;;;N;;;;;
-164D;CANADIAN SYLLABICS CARRIER DZA;Lo;0;L;;;;;N;;;;;
-164E;CANADIAN SYLLABICS CARRIER SU;Lo;0;L;;;;;N;;;;;
-164F;CANADIAN SYLLABICS CARRIER SO;Lo;0;L;;;;;N;;;;;
-1650;CANADIAN SYLLABICS CARRIER SE;Lo;0;L;;;;;N;;;;;
-1651;CANADIAN SYLLABICS CARRIER SEE;Lo;0;L;;;;;N;;;;;
-1652;CANADIAN SYLLABICS CARRIER SI;Lo;0;L;;;;;N;;;;;
-1653;CANADIAN SYLLABICS CARRIER SA;Lo;0;L;;;;;N;;;;;
-1654;CANADIAN SYLLABICS CARRIER SHU;Lo;0;L;;;;;N;;;;;
-1655;CANADIAN SYLLABICS CARRIER SHO;Lo;0;L;;;;;N;;;;;
-1656;CANADIAN SYLLABICS CARRIER SHE;Lo;0;L;;;;;N;;;;;
-1657;CANADIAN SYLLABICS CARRIER SHEE;Lo;0;L;;;;;N;;;;;
-1658;CANADIAN SYLLABICS CARRIER SHI;Lo;0;L;;;;;N;;;;;
-1659;CANADIAN SYLLABICS CARRIER SHA;Lo;0;L;;;;;N;;;;;
-165A;CANADIAN SYLLABICS CARRIER SH;Lo;0;L;;;;;N;;;;;
-165B;CANADIAN SYLLABICS CARRIER TSU;Lo;0;L;;;;;N;;;;;
-165C;CANADIAN SYLLABICS CARRIER TSO;Lo;0;L;;;;;N;;;;;
-165D;CANADIAN SYLLABICS CARRIER TSE;Lo;0;L;;;;;N;;;;;
-165E;CANADIAN SYLLABICS CARRIER TSEE;Lo;0;L;;;;;N;;;;;
-165F;CANADIAN SYLLABICS CARRIER TSI;Lo;0;L;;;;;N;;;;;
-1660;CANADIAN SYLLABICS CARRIER TSA;Lo;0;L;;;;;N;;;;;
-1661;CANADIAN SYLLABICS CARRIER CHU;Lo;0;L;;;;;N;;;;;
-1662;CANADIAN SYLLABICS CARRIER CHO;Lo;0;L;;;;;N;;;;;
-1663;CANADIAN SYLLABICS CARRIER CHE;Lo;0;L;;;;;N;;;;;
-1664;CANADIAN SYLLABICS CARRIER CHEE;Lo;0;L;;;;;N;;;;;
-1665;CANADIAN SYLLABICS CARRIER CHI;Lo;0;L;;;;;N;;;;;
-1666;CANADIAN SYLLABICS CARRIER CHA;Lo;0;L;;;;;N;;;;;
-1667;CANADIAN SYLLABICS CARRIER TTSU;Lo;0;L;;;;;N;;;;;
-1668;CANADIAN SYLLABICS CARRIER TTSO;Lo;0;L;;;;;N;;;;;
-1669;CANADIAN SYLLABICS CARRIER TTSE;Lo;0;L;;;;;N;;;;;
-166A;CANADIAN SYLLABICS CARRIER TTSEE;Lo;0;L;;;;;N;;;;;
-166B;CANADIAN SYLLABICS CARRIER TTSI;Lo;0;L;;;;;N;;;;;
-166C;CANADIAN SYLLABICS CARRIER TTSA;Lo;0;L;;;;;N;;;;;
-166D;CANADIAN SYLLABICS CHI SIGN;Po;0;L;;;;;N;;;;;
-166E;CANADIAN SYLLABICS FULL STOP;Po;0;L;;;;;N;;;;;
-166F;CANADIAN SYLLABICS QAI;Lo;0;L;;;;;N;;;;;
-1670;CANADIAN SYLLABICS NGAI;Lo;0;L;;;;;N;;;;;
-1671;CANADIAN SYLLABICS NNGI;Lo;0;L;;;;;N;;;;;
-1672;CANADIAN SYLLABICS NNGII;Lo;0;L;;;;;N;;;;;
-1673;CANADIAN SYLLABICS NNGO;Lo;0;L;;;;;N;;;;;
-1674;CANADIAN SYLLABICS NNGOO;Lo;0;L;;;;;N;;;;;
-1675;CANADIAN SYLLABICS NNGA;Lo;0;L;;;;;N;;;;;
-1676;CANADIAN SYLLABICS NNGAA;Lo;0;L;;;;;N;;;;;
-1680;OGHAM SPACE MARK;Zs;0;WS;;;;;N;;;;;
-1681;OGHAM LETTER BEITH;Lo;0;L;;;;;N;;;;;
-1682;OGHAM LETTER LUIS;Lo;0;L;;;;;N;;;;;
-1683;OGHAM LETTER FEARN;Lo;0;L;;;;;N;;;;;
-1684;OGHAM LETTER SAIL;Lo;0;L;;;;;N;;;;;
-1685;OGHAM LETTER NION;Lo;0;L;;;;;N;;;;;
-1686;OGHAM LETTER UATH;Lo;0;L;;;;;N;;;;;
-1687;OGHAM LETTER DAIR;Lo;0;L;;;;;N;;;;;
-1688;OGHAM LETTER TINNE;Lo;0;L;;;;;N;;;;;
-1689;OGHAM LETTER COLL;Lo;0;L;;;;;N;;;;;
-168A;OGHAM LETTER CEIRT;Lo;0;L;;;;;N;;;;;
-168B;OGHAM LETTER MUIN;Lo;0;L;;;;;N;;;;;
-168C;OGHAM LETTER GORT;Lo;0;L;;;;;N;;;;;
-168D;OGHAM LETTER NGEADAL;Lo;0;L;;;;;N;;;;;
-168E;OGHAM LETTER STRAIF;Lo;0;L;;;;;N;;;;;
-168F;OGHAM LETTER RUIS;Lo;0;L;;;;;N;;;;;
-1690;OGHAM LETTER AILM;Lo;0;L;;;;;N;;;;;
-1691;OGHAM LETTER ONN;Lo;0;L;;;;;N;;;;;
-1692;OGHAM LETTER UR;Lo;0;L;;;;;N;;;;;
-1693;OGHAM LETTER EADHADH;Lo;0;L;;;;;N;;;;;
-1694;OGHAM LETTER IODHADH;Lo;0;L;;;;;N;;;;;
-1695;OGHAM LETTER EABHADH;Lo;0;L;;;;;N;;;;;
-1696;OGHAM LETTER OR;Lo;0;L;;;;;N;;;;;
-1697;OGHAM LETTER UILLEANN;Lo;0;L;;;;;N;;;;;
-1698;OGHAM LETTER IFIN;Lo;0;L;;;;;N;;;;;
-1699;OGHAM LETTER EAMHANCHOLL;Lo;0;L;;;;;N;;;;;
-169A;OGHAM LETTER PEITH;Lo;0;L;;;;;N;;;;;
-169B;OGHAM FEATHER MARK;Ps;0;ON;;;;;Y;;;;;
-169C;OGHAM REVERSED FEATHER MARK;Pe;0;ON;;;;;Y;;;;;
-16A0;RUNIC LETTER FEHU FEOH FE F;Lo;0;L;;;;;N;;;;;
-16A1;RUNIC LETTER V;Lo;0;L;;;;;N;;;;;
-16A2;RUNIC LETTER URUZ UR U;Lo;0;L;;;;;N;;;;;
-16A3;RUNIC LETTER YR;Lo;0;L;;;;;N;;;;;
-16A4;RUNIC LETTER Y;Lo;0;L;;;;;N;;;;;
-16A5;RUNIC LETTER W;Lo;0;L;;;;;N;;;;;
-16A6;RUNIC LETTER THURISAZ THURS THORN;Lo;0;L;;;;;N;;;;;
-16A7;RUNIC LETTER ETH;Lo;0;L;;;;;N;;;;;
-16A8;RUNIC LETTER ANSUZ A;Lo;0;L;;;;;N;;;;;
-16A9;RUNIC LETTER OS O;Lo;0;L;;;;;N;;;;;
-16AA;RUNIC LETTER AC A;Lo;0;L;;;;;N;;;;;
-16AB;RUNIC LETTER AESC;Lo;0;L;;;;;N;;;;;
-16AC;RUNIC LETTER LONG-BRANCH-OSS O;Lo;0;L;;;;;N;;;;;
-16AD;RUNIC LETTER SHORT-TWIG-OSS O;Lo;0;L;;;;;N;;;;;
-16AE;RUNIC LETTER O;Lo;0;L;;;;;N;;;;;
-16AF;RUNIC LETTER OE;Lo;0;L;;;;;N;;;;;
-16B0;RUNIC LETTER ON;Lo;0;L;;;;;N;;;;;
-16B1;RUNIC LETTER RAIDO RAD REID R;Lo;0;L;;;;;N;;;;;
-16B2;RUNIC LETTER KAUNA;Lo;0;L;;;;;N;;;;;
-16B3;RUNIC LETTER CEN;Lo;0;L;;;;;N;;;;;
-16B4;RUNIC LETTER KAUN K;Lo;0;L;;;;;N;;;;;
-16B5;RUNIC LETTER G;Lo;0;L;;;;;N;;;;;
-16B6;RUNIC LETTER ENG;Lo;0;L;;;;;N;;;;;
-16B7;RUNIC LETTER GEBO GYFU G;Lo;0;L;;;;;N;;;;;
-16B8;RUNIC LETTER GAR;Lo;0;L;;;;;N;;;;;
-16B9;RUNIC LETTER WUNJO WYNN W;Lo;0;L;;;;;N;;;;;
-16BA;RUNIC LETTER HAGLAZ H;Lo;0;L;;;;;N;;;;;
-16BB;RUNIC LETTER HAEGL H;Lo;0;L;;;;;N;;;;;
-16BC;RUNIC LETTER LONG-BRANCH-HAGALL H;Lo;0;L;;;;;N;;;;;
-16BD;RUNIC LETTER SHORT-TWIG-HAGALL H;Lo;0;L;;;;;N;;;;;
-16BE;RUNIC LETTER NAUDIZ NYD NAUD N;Lo;0;L;;;;;N;;;;;
-16BF;RUNIC LETTER SHORT-TWIG-NAUD N;Lo;0;L;;;;;N;;;;;
-16C0;RUNIC LETTER DOTTED-N;Lo;0;L;;;;;N;;;;;
-16C1;RUNIC LETTER ISAZ IS ISS I;Lo;0;L;;;;;N;;;;;
-16C2;RUNIC LETTER E;Lo;0;L;;;;;N;;;;;
-16C3;RUNIC LETTER JERAN J;Lo;0;L;;;;;N;;;;;
-16C4;RUNIC LETTER GER;Lo;0;L;;;;;N;;;;;
-16C5;RUNIC LETTER LONG-BRANCH-AR AE;Lo;0;L;;;;;N;;;;;
-16C6;RUNIC LETTER SHORT-TWIG-AR A;Lo;0;L;;;;;N;;;;;
-16C7;RUNIC LETTER IWAZ EOH;Lo;0;L;;;;;N;;;;;
-16C8;RUNIC LETTER PERTHO PEORTH P;Lo;0;L;;;;;N;;;;;
-16C9;RUNIC LETTER ALGIZ EOLHX;Lo;0;L;;;;;N;;;;;
-16CA;RUNIC LETTER SOWILO S;Lo;0;L;;;;;N;;;;;
-16CB;RUNIC LETTER SIGEL LONG-BRANCH-SOL S;Lo;0;L;;;;;N;;;;;
-16CC;RUNIC LETTER SHORT-TWIG-SOL S;Lo;0;L;;;;;N;;;;;
-16CD;RUNIC LETTER C;Lo;0;L;;;;;N;;;;;
-16CE;RUNIC LETTER Z;Lo;0;L;;;;;N;;;;;
-16CF;RUNIC LETTER TIWAZ TIR TYR T;Lo;0;L;;;;;N;;;;;
-16D0;RUNIC LETTER SHORT-TWIG-TYR T;Lo;0;L;;;;;N;;;;;
-16D1;RUNIC LETTER D;Lo;0;L;;;;;N;;;;;
-16D2;RUNIC LETTER BERKANAN BEORC BJARKAN B;Lo;0;L;;;;;N;;;;;
-16D3;RUNIC LETTER SHORT-TWIG-BJARKAN B;Lo;0;L;;;;;N;;;;;
-16D4;RUNIC LETTER DOTTED-P;Lo;0;L;;;;;N;;;;;
-16D5;RUNIC LETTER OPEN-P;Lo;0;L;;;;;N;;;;;
-16D6;RUNIC LETTER EHWAZ EH E;Lo;0;L;;;;;N;;;;;
-16D7;RUNIC LETTER MANNAZ MAN M;Lo;0;L;;;;;N;;;;;
-16D8;RUNIC LETTER LONG-BRANCH-MADR M;Lo;0;L;;;;;N;;;;;
-16D9;RUNIC LETTER SHORT-TWIG-MADR M;Lo;0;L;;;;;N;;;;;
-16DA;RUNIC LETTER LAUKAZ LAGU LOGR L;Lo;0;L;;;;;N;;;;;
-16DB;RUNIC LETTER DOTTED-L;Lo;0;L;;;;;N;;;;;
-16DC;RUNIC LETTER INGWAZ;Lo;0;L;;;;;N;;;;;
-16DD;RUNIC LETTER ING;Lo;0;L;;;;;N;;;;;
-16DE;RUNIC LETTER DAGAZ DAEG D;Lo;0;L;;;;;N;;;;;
-16DF;RUNIC LETTER OTHALAN ETHEL O;Lo;0;L;;;;;N;;;;;
-16E0;RUNIC LETTER EAR;Lo;0;L;;;;;N;;;;;
-16E1;RUNIC LETTER IOR;Lo;0;L;;;;;N;;;;;
-16E2;RUNIC LETTER CWEORTH;Lo;0;L;;;;;N;;;;;
-16E3;RUNIC LETTER CALC;Lo;0;L;;;;;N;;;;;
-16E4;RUNIC LETTER CEALC;Lo;0;L;;;;;N;;;;;
-16E5;RUNIC LETTER STAN;Lo;0;L;;;;;N;;;;;
-16E6;RUNIC LETTER LONG-BRANCH-YR;Lo;0;L;;;;;N;;;;;
-16E7;RUNIC LETTER SHORT-TWIG-YR;Lo;0;L;;;;;N;;;;;
-16E8;RUNIC LETTER ICELANDIC-YR;Lo;0;L;;;;;N;;;;;
-16E9;RUNIC LETTER Q;Lo;0;L;;;;;N;;;;;
-16EA;RUNIC LETTER X;Lo;0;L;;;;;N;;;;;
-16EB;RUNIC SINGLE PUNCTUATION;Po;0;L;;;;;N;;;;;
-16EC;RUNIC MULTIPLE PUNCTUATION;Po;0;L;;;;;N;;;;;
-16ED;RUNIC CROSS PUNCTUATION;Po;0;L;;;;;N;;;;;
-16EE;RUNIC ARLAUG SYMBOL;Nl;0;L;;;;17;N;;golden number 17;;;
-16EF;RUNIC TVIMADUR SYMBOL;Nl;0;L;;;;18;N;;golden number 18;;;
-16F0;RUNIC BELGTHOR SYMBOL;Nl;0;L;;;;19;N;;golden number 19;;;
-1700;TAGALOG LETTER A;Lo;0;L;;;;;N;;;;;
-1701;TAGALOG LETTER I;Lo;0;L;;;;;N;;;;;
-1702;TAGALOG LETTER U;Lo;0;L;;;;;N;;;;;
-1703;TAGALOG LETTER KA;Lo;0;L;;;;;N;;;;;
-1704;TAGALOG LETTER GA;Lo;0;L;;;;;N;;;;;
-1705;TAGALOG LETTER NGA;Lo;0;L;;;;;N;;;;;
-1706;TAGALOG LETTER TA;Lo;0;L;;;;;N;;;;;
-1707;TAGALOG LETTER DA;Lo;0;L;;;;;N;;;;;
-1708;TAGALOG LETTER NA;Lo;0;L;;;;;N;;;;;
-1709;TAGALOG LETTER PA;Lo;0;L;;;;;N;;;;;
-170A;TAGALOG LETTER BA;Lo;0;L;;;;;N;;;;;
-170B;TAGALOG LETTER MA;Lo;0;L;;;;;N;;;;;
-170C;TAGALOG LETTER YA;Lo;0;L;;;;;N;;;;;
-170E;TAGALOG LETTER LA;Lo;0;L;;;;;N;;;;;
-170F;TAGALOG LETTER WA;Lo;0;L;;;;;N;;;;;
-1710;TAGALOG LETTER SA;Lo;0;L;;;;;N;;;;;
-1711;TAGALOG LETTER HA;Lo;0;L;;;;;N;;;;;
-1712;TAGALOG VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
-1713;TAGALOG VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
-1714;TAGALOG SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
-1720;HANUNOO LETTER A;Lo;0;L;;;;;N;;;;;
-1721;HANUNOO LETTER I;Lo;0;L;;;;;N;;;;;
-1722;HANUNOO LETTER U;Lo;0;L;;;;;N;;;;;
-1723;HANUNOO LETTER KA;Lo;0;L;;;;;N;;;;;
-1724;HANUNOO LETTER GA;Lo;0;L;;;;;N;;;;;
-1725;HANUNOO LETTER NGA;Lo;0;L;;;;;N;;;;;
-1726;HANUNOO LETTER TA;Lo;0;L;;;;;N;;;;;
-1727;HANUNOO LETTER DA;Lo;0;L;;;;;N;;;;;
-1728;HANUNOO LETTER NA;Lo;0;L;;;;;N;;;;;
-1729;HANUNOO LETTER PA;Lo;0;L;;;;;N;;;;;
-172A;HANUNOO LETTER BA;Lo;0;L;;;;;N;;;;;
-172B;HANUNOO LETTER MA;Lo;0;L;;;;;N;;;;;
-172C;HANUNOO LETTER YA;Lo;0;L;;;;;N;;;;;
-172D;HANUNOO LETTER RA;Lo;0;L;;;;;N;;;;;
-172E;HANUNOO LETTER LA;Lo;0;L;;;;;N;;;;;
-172F;HANUNOO LETTER WA;Lo;0;L;;;;;N;;;;;
-1730;HANUNOO LETTER SA;Lo;0;L;;;;;N;;;;;
-1731;HANUNOO LETTER HA;Lo;0;L;;;;;N;;;;;
-1732;HANUNOO VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
-1733;HANUNOO VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
-1734;HANUNOO SIGN PAMUDPOD;Mn;9;NSM;;;;;N;;;;;
-1735;PHILIPPINE SINGLE PUNCTUATION;Po;0;L;;;;;N;;;;;
-1736;PHILIPPINE DOUBLE PUNCTUATION;Po;0;L;;;;;N;;;;;
-1740;BUHID LETTER A;Lo;0;L;;;;;N;;;;;
-1741;BUHID LETTER I;Lo;0;L;;;;;N;;;;;
-1742;BUHID LETTER U;Lo;0;L;;;;;N;;;;;
-1743;BUHID LETTER KA;Lo;0;L;;;;;N;;;;;
-1744;BUHID LETTER GA;Lo;0;L;;;;;N;;;;;
-1745;BUHID LETTER NGA;Lo;0;L;;;;;N;;;;;
-1746;BUHID LETTER TA;Lo;0;L;;;;;N;;;;;
-1747;BUHID LETTER DA;Lo;0;L;;;;;N;;;;;
-1748;BUHID LETTER NA;Lo;0;L;;;;;N;;;;;
-1749;BUHID LETTER PA;Lo;0;L;;;;;N;;;;;
-174A;BUHID LETTER BA;Lo;0;L;;;;;N;;;;;
-174B;BUHID LETTER MA;Lo;0;L;;;;;N;;;;;
-174C;BUHID LETTER YA;Lo;0;L;;;;;N;;;;;
-174D;BUHID LETTER RA;Lo;0;L;;;;;N;;;;;
-174E;BUHID LETTER LA;Lo;0;L;;;;;N;;;;;
-174F;BUHID LETTER WA;Lo;0;L;;;;;N;;;;;
-1750;BUHID LETTER SA;Lo;0;L;;;;;N;;;;;
-1751;BUHID LETTER HA;Lo;0;L;;;;;N;;;;;
-1752;BUHID VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
-1753;BUHID VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
-1760;TAGBANWA LETTER A;Lo;0;L;;;;;N;;;;;
-1761;TAGBANWA LETTER I;Lo;0;L;;;;;N;;;;;
-1762;TAGBANWA LETTER U;Lo;0;L;;;;;N;;;;;
-1763;TAGBANWA LETTER KA;Lo;0;L;;;;;N;;;;;
-1764;TAGBANWA LETTER GA;Lo;0;L;;;;;N;;;;;
-1765;TAGBANWA LETTER NGA;Lo;0;L;;;;;N;;;;;
-1766;TAGBANWA LETTER TA;Lo;0;L;;;;;N;;;;;
-1767;TAGBANWA LETTER DA;Lo;0;L;;;;;N;;;;;
-1768;TAGBANWA LETTER NA;Lo;0;L;;;;;N;;;;;
-1769;TAGBANWA LETTER PA;Lo;0;L;;;;;N;;;;;
-176A;TAGBANWA LETTER BA;Lo;0;L;;;;;N;;;;;
-176B;TAGBANWA LETTER MA;Lo;0;L;;;;;N;;;;;
-176C;TAGBANWA LETTER YA;Lo;0;L;;;;;N;;;;;
-176E;TAGBANWA LETTER LA;Lo;0;L;;;;;N;;;;;
-176F;TAGBANWA LETTER WA;Lo;0;L;;;;;N;;;;;
-1770;TAGBANWA LETTER SA;Lo;0;L;;;;;N;;;;;
-1772;TAGBANWA VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
-1773;TAGBANWA VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
-1780;KHMER LETTER KA;Lo;0;L;;;;;N;;;;;
-1781;KHMER LETTER KHA;Lo;0;L;;;;;N;;;;;
-1782;KHMER LETTER KO;Lo;0;L;;;;;N;;;;;
-1783;KHMER LETTER KHO;Lo;0;L;;;;;N;;;;;
-1784;KHMER LETTER NGO;Lo;0;L;;;;;N;;;;;
-1785;KHMER LETTER CA;Lo;0;L;;;;;N;;;;;
-1786;KHMER LETTER CHA;Lo;0;L;;;;;N;;;;;
-1787;KHMER LETTER CO;Lo;0;L;;;;;N;;;;;
-1788;KHMER LETTER CHO;Lo;0;L;;;;;N;;;;;
-1789;KHMER LETTER NYO;Lo;0;L;;;;;N;;;;;
-178A;KHMER LETTER DA;Lo;0;L;;;;;N;;;;;
-178B;KHMER LETTER TTHA;Lo;0;L;;;;;N;;;;;
-178C;KHMER LETTER DO;Lo;0;L;;;;;N;;;;;
-178D;KHMER LETTER TTHO;Lo;0;L;;;;;N;;;;;
-178E;KHMER LETTER NNO;Lo;0;L;;;;;N;;;;;
-178F;KHMER LETTER TA;Lo;0;L;;;;;N;;;;;
-1790;KHMER LETTER THA;Lo;0;L;;;;;N;;;;;
-1791;KHMER LETTER TO;Lo;0;L;;;;;N;;;;;
-1792;KHMER LETTER THO;Lo;0;L;;;;;N;;;;;
-1793;KHMER LETTER NO;Lo;0;L;;;;;N;;;;;
-1794;KHMER LETTER BA;Lo;0;L;;;;;N;;;;;
-1795;KHMER LETTER PHA;Lo;0;L;;;;;N;;;;;
-1796;KHMER LETTER PO;Lo;0;L;;;;;N;;;;;
-1797;KHMER LETTER PHO;Lo;0;L;;;;;N;;;;;
-1798;KHMER LETTER MO;Lo;0;L;;;;;N;;;;;
-1799;KHMER LETTER YO;Lo;0;L;;;;;N;;;;;
-179A;KHMER LETTER RO;Lo;0;L;;;;;N;;;;;
-179B;KHMER LETTER LO;Lo;0;L;;;;;N;;;;;
-179C;KHMER LETTER VO;Lo;0;L;;;;;N;;;;;
-179D;KHMER LETTER SHA;Lo;0;L;;;;;N;;;;;
-179E;KHMER LETTER SSO;Lo;0;L;;;;;N;;;;;
-179F;KHMER LETTER SA;Lo;0;L;;;;;N;;;;;
-17A0;KHMER LETTER HA;Lo;0;L;;;;;N;;;;;
-17A1;KHMER LETTER LA;Lo;0;L;;;;;N;;;;;
-17A2;KHMER LETTER QA;Lo;0;L;;;;;N;;;;;
-17A3;KHMER INDEPENDENT VOWEL QAQ;Lo;0;L;;;;;N;;*;;;
-17A4;KHMER INDEPENDENT VOWEL QAA;Lo;0;L;;;;;N;;*;;;
-17A5;KHMER INDEPENDENT VOWEL QI;Lo;0;L;;;;;N;;;;;
-17A6;KHMER INDEPENDENT VOWEL QII;Lo;0;L;;;;;N;;;;;
-17A7;KHMER INDEPENDENT VOWEL QU;Lo;0;L;;;;;N;;;;;
-17A8;KHMER INDEPENDENT VOWEL QUK;Lo;0;L;;;;;N;;;;;
-17A9;KHMER INDEPENDENT VOWEL QUU;Lo;0;L;;;;;N;;;;;
-17AA;KHMER INDEPENDENT VOWEL QUUV;Lo;0;L;;;;;N;;;;;
-17AB;KHMER INDEPENDENT VOWEL RY;Lo;0;L;;;;;N;;;;;
-17AC;KHMER INDEPENDENT VOWEL RYY;Lo;0;L;;;;;N;;;;;
-17AD;KHMER INDEPENDENT VOWEL LY;Lo;0;L;;;;;N;;;;;
-17AE;KHMER INDEPENDENT VOWEL LYY;Lo;0;L;;;;;N;;;;;
-17AF;KHMER INDEPENDENT VOWEL QE;Lo;0;L;;;;;N;;;;;
-17B0;KHMER INDEPENDENT VOWEL QAI;Lo;0;L;;;;;N;;;;;
-17B1;KHMER INDEPENDENT VOWEL QOO TYPE ONE;Lo;0;L;;;;;N;;;;;
-17B2;KHMER INDEPENDENT VOWEL QOO TYPE TWO;Lo;0;L;;;;;N;;;;;
-17B3;KHMER INDEPENDENT VOWEL QAU;Lo;0;L;;;;;N;;;;;
-17B4;KHMER VOWEL INHERENT AQ;Cf;0;L;;;;;N;;*;;;
-17B5;KHMER VOWEL INHERENT AA;Cf;0;L;;;;;N;;*;;;
-17B6;KHMER VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
-17B7;KHMER VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
-17B8;KHMER VOWEL SIGN II;Mn;0;NSM;;;;;N;;;;;
-17B9;KHMER VOWEL SIGN Y;Mn;0;NSM;;;;;N;;;;;
-17BA;KHMER VOWEL SIGN YY;Mn;0;NSM;;;;;N;;;;;
-17BB;KHMER VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
-17BC;KHMER VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
-17BD;KHMER VOWEL SIGN UA;Mn;0;NSM;;;;;N;;;;;
-17BE;KHMER VOWEL SIGN OE;Mc;0;L;;;;;N;;;;;
-17BF;KHMER VOWEL SIGN YA;Mc;0;L;;;;;N;;;;;
-17C0;KHMER VOWEL SIGN IE;Mc;0;L;;;;;N;;;;;
-17C1;KHMER VOWEL SIGN E;Mc;0;L;;;;;N;;;;;
-17C2;KHMER VOWEL SIGN AE;Mc;0;L;;;;;N;;;;;
-17C3;KHMER VOWEL SIGN AI;Mc;0;L;;;;;N;;;;;
-17C4;KHMER VOWEL SIGN OO;Mc;0;L;;;;;N;;;;;
-17C5;KHMER VOWEL SIGN AU;Mc;0;L;;;;;N;;;;;
-17C6;KHMER SIGN NIKAHIT;Mn;0;NSM;;;;;N;;;;;
-17C7;KHMER SIGN REAHMUK;Mc;0;L;;;;;N;;;;;
-17C8;KHMER SIGN YUUKALEAPINTU;Mc;0;L;;;;;N;;;;;
-17C9;KHMER SIGN MUUSIKATOAN;Mn;0;NSM;;;;;N;;;;;
-17CA;KHMER SIGN TRIISAP;Mn;0;NSM;;;;;N;;;;;
-17CB;KHMER SIGN BANTOC;Mn;0;NSM;;;;;N;;;;;
-17CC;KHMER SIGN ROBAT;Mn;0;NSM;;;;;N;;;;;
-17CD;KHMER SIGN TOANDAKHIAT;Mn;0;NSM;;;;;N;;;;;
-17CE;KHMER SIGN KAKABAT;Mn;0;NSM;;;;;N;;;;;
-17CF;KHMER SIGN AHSDA;Mn;0;NSM;;;;;N;;;;;
-17D0;KHMER SIGN SAMYOK SANNYA;Mn;0;NSM;;;;;N;;;;;
-17D1;KHMER SIGN VIRIAM;Mn;0;NSM;;;;;N;;;;;
-17D2;KHMER SIGN COENG;Mn;9;NSM;;;;;N;;;;;
-17D3;KHMER SIGN BATHAMASAT;Mn;0;NSM;;;;;N;;*;;;
-17D4;KHMER SIGN KHAN;Po;0;L;;;;;N;;;;;
-17D5;KHMER SIGN BARIYOOSAN;Po;0;L;;;;;N;;;;;
-17D6;KHMER SIGN CAMNUC PII KUUH;Po;0;L;;;;;N;;;;;
-17D7;KHMER SIGN LEK TOO;Lm;0;L;;;;;N;;;;;
-17D8;KHMER SIGN BEYYAL;Po;0;L;;;;;N;;*;;;
-17D9;KHMER SIGN PHNAEK MUAN;Po;0;L;;;;;N;;;;;
-17DA;KHMER SIGN KOOMUUT;Po;0;L;;;;;N;;;;;
-17DB;KHMER CURRENCY SYMBOL RIEL;Sc;0;ET;;;;;N;;;;;
-17DC;KHMER SIGN AVAKRAHASANYA;Lo;0;L;;;;;N;;;;;
-17DD;KHMER SIGN ATTHACAN;Mn;230;NSM;;;;;N;;;;;
-17E0;KHMER DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
-17E1;KHMER DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
-17E2;KHMER DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
-17E3;KHMER DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
-17E4;KHMER DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
-17E5;KHMER DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
-17E6;KHMER DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
-17E7;KHMER DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
-17E8;KHMER DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
-17E9;KHMER DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
-17F0;KHMER SYMBOL LEK ATTAK SON;No;0;ON;;;;0;N;;;;;
-17F1;KHMER SYMBOL LEK ATTAK MUOY;No;0;ON;;;;1;N;;;;;
-17F2;KHMER SYMBOL LEK ATTAK PII;No;0;ON;;;;2;N;;;;;
-17F3;KHMER SYMBOL LEK ATTAK BEI;No;0;ON;;;;3;N;;;;;
-17F4;KHMER SYMBOL LEK ATTAK BUON;No;0;ON;;;;4;N;;;;;
-17F5;KHMER SYMBOL LEK ATTAK PRAM;No;0;ON;;;;5;N;;;;;
-17F6;KHMER SYMBOL LEK ATTAK PRAM-MUOY;No;0;ON;;;;6;N;;;;;
-17F7;KHMER SYMBOL LEK ATTAK PRAM-PII;No;0;ON;;;;7;N;;;;;
-17F8;KHMER SYMBOL LEK ATTAK PRAM-BEI;No;0;ON;;;;8;N;;;;;
-17F9;KHMER SYMBOL LEK ATTAK PRAM-BUON;No;0;ON;;;;9;N;;;;;
-1800;MONGOLIAN BIRGA;Po;0;ON;;;;;N;;;;;
-1801;MONGOLIAN ELLIPSIS;Po;0;ON;;;;;N;;;;;
-1802;MONGOLIAN COMMA;Po;0;ON;;;;;N;;;;;
-1803;MONGOLIAN FULL STOP;Po;0;ON;;;;;N;;;;;
-1804;MONGOLIAN COLON;Po;0;ON;;;;;N;;;;;
-1805;MONGOLIAN FOUR DOTS;Po;0;ON;;;;;N;;;;;
-1806;MONGOLIAN TODO SOFT HYPHEN;Pd;0;ON;;;;;N;;;;;
-1807;MONGOLIAN SIBE SYLLABLE BOUNDARY MARKER;Po;0;ON;;;;;N;;;;;
-1808;MONGOLIAN MANCHU COMMA;Po;0;ON;;;;;N;;;;;
-1809;MONGOLIAN MANCHU FULL STOP;Po;0;ON;;;;;N;;;;;
-180A;MONGOLIAN NIRUGU;Po;0;ON;;;;;N;;;;;
-180B;MONGOLIAN FREE VARIATION SELECTOR ONE;Mn;0;NSM;;;;;N;;;;;
-180C;MONGOLIAN FREE VARIATION SELECTOR TWO;Mn;0;NSM;;;;;N;;;;;
-180D;MONGOLIAN FREE VARIATION SELECTOR THREE;Mn;0;NSM;;;;;N;;;;;
-180E;MONGOLIAN VOWEL SEPARATOR;Zs;0;WS;;;;;N;;;;;
-1810;MONGOLIAN DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
-1811;MONGOLIAN DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
-1812;MONGOLIAN DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
-1813;MONGOLIAN DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
-1814;MONGOLIAN DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
-1815;MONGOLIAN DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
-1816;MONGOLIAN DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
-1817;MONGOLIAN DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
-1818;MONGOLIAN DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
-1819;MONGOLIAN DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
-1820;MONGOLIAN LETTER A;Lo;0;L;;;;;N;;;;;
-1821;MONGOLIAN LETTER E;Lo;0;L;;;;;N;;;;;
-1822;MONGOLIAN LETTER I;Lo;0;L;;;;;N;;;;;
-1823;MONGOLIAN LETTER O;Lo;0;L;;;;;N;;;;;
-1824;MONGOLIAN LETTER U;Lo;0;L;;;;;N;;;;;
-1825;MONGOLIAN LETTER OE;Lo;0;L;;;;;N;;;;;
-1826;MONGOLIAN LETTER UE;Lo;0;L;;;;;N;;;;;
-1827;MONGOLIAN LETTER EE;Lo;0;L;;;;;N;;;;;
-1828;MONGOLIAN LETTER NA;Lo;0;L;;;;;N;;;;;
-1829;MONGOLIAN LETTER ANG;Lo;0;L;;;;;N;;;;;
-182A;MONGOLIAN LETTER BA;Lo;0;L;;;;;N;;;;;
-182B;MONGOLIAN LETTER PA;Lo;0;L;;;;;N;;;;;
-182C;MONGOLIAN LETTER QA;Lo;0;L;;;;;N;;;;;
-182D;MONGOLIAN LETTER GA;Lo;0;L;;;;;N;;;;;
-182E;MONGOLIAN LETTER MA;Lo;0;L;;;;;N;;;;;
-182F;MONGOLIAN LETTER LA;Lo;0;L;;;;;N;;;;;
-1830;MONGOLIAN LETTER SA;Lo;0;L;;;;;N;;;;;
-1831;MONGOLIAN LETTER SHA;Lo;0;L;;;;;N;;;;;
-1832;MONGOLIAN LETTER TA;Lo;0;L;;;;;N;;;;;
-1833;MONGOLIAN LETTER DA;Lo;0;L;;;;;N;;;;;
-1834;MONGOLIAN LETTER CHA;Lo;0;L;;;;;N;;;;;
-1835;MONGOLIAN LETTER JA;Lo;0;L;;;;;N;;;;;
-1836;MONGOLIAN LETTER YA;Lo;0;L;;;;;N;;;;;
-1837;MONGOLIAN LETTER RA;Lo;0;L;;;;;N;;;;;
-1838;MONGOLIAN LETTER WA;Lo;0;L;;;;;N;;;;;
-1839;MONGOLIAN LETTER FA;Lo;0;L;;;;;N;;;;;
-183A;MONGOLIAN LETTER KA;Lo;0;L;;;;;N;;;;;
-183B;MONGOLIAN LETTER KHA;Lo;0;L;;;;;N;;;;;
-183C;MONGOLIAN LETTER TSA;Lo;0;L;;;;;N;;;;;
-183D;MONGOLIAN LETTER ZA;Lo;0;L;;;;;N;;;;;
-183E;MONGOLIAN LETTER HAA;Lo;0;L;;;;;N;;;;;
-183F;MONGOLIAN LETTER ZRA;Lo;0;L;;;;;N;;;;;
-1840;MONGOLIAN LETTER LHA;Lo;0;L;;;;;N;;;;;
-1841;MONGOLIAN LETTER ZHI;Lo;0;L;;;;;N;;;;;
-1842;MONGOLIAN LETTER CHI;Lo;0;L;;;;;N;;;;;
-1843;MONGOLIAN LETTER TODO LONG VOWEL SIGN;Lm;0;L;;;;;N;;;;;
-1844;MONGOLIAN LETTER TODO E;Lo;0;L;;;;;N;;;;;
-1845;MONGOLIAN LETTER TODO I;Lo;0;L;;;;;N;;;;;
-1846;MONGOLIAN LETTER TODO O;Lo;0;L;;;;;N;;;;;
-1847;MONGOLIAN LETTER TODO U;Lo;0;L;;;;;N;;;;;
-1848;MONGOLIAN LETTER TODO OE;Lo;0;L;;;;;N;;;;;
-1849;MONGOLIAN LETTER TODO UE;Lo;0;L;;;;;N;;;;;
-184A;MONGOLIAN LETTER TODO ANG;Lo;0;L;;;;;N;;;;;
-184B;MONGOLIAN LETTER TODO BA;Lo;0;L;;;;;N;;;;;
-184C;MONGOLIAN LETTER TODO PA;Lo;0;L;;;;;N;;;;;
-184D;MONGOLIAN LETTER TODO QA;Lo;0;L;;;;;N;;;;;
-184E;MONGOLIAN LETTER TODO GA;Lo;0;L;;;;;N;;;;;
-184F;MONGOLIAN LETTER TODO MA;Lo;0;L;;;;;N;;;;;
-1850;MONGOLIAN LETTER TODO TA;Lo;0;L;;;;;N;;;;;
-1851;MONGOLIAN LETTER TODO DA;Lo;0;L;;;;;N;;;;;
-1852;MONGOLIAN LETTER TODO CHA;Lo;0;L;;;;;N;;;;;
-1853;MONGOLIAN LETTER TODO JA;Lo;0;L;;;;;N;;;;;
-1854;MONGOLIAN LETTER TODO TSA;Lo;0;L;;;;;N;;;;;
-1855;MONGOLIAN LETTER TODO YA;Lo;0;L;;;;;N;;;;;
-1856;MONGOLIAN LETTER TODO WA;Lo;0;L;;;;;N;;;;;
-1857;MONGOLIAN LETTER TODO KA;Lo;0;L;;;;;N;;;;;
-1858;MONGOLIAN LETTER TODO GAA;Lo;0;L;;;;;N;;;;;
-1859;MONGOLIAN LETTER TODO HAA;Lo;0;L;;;;;N;;;;;
-185A;MONGOLIAN LETTER TODO JIA;Lo;0;L;;;;;N;;;;;
-185B;MONGOLIAN LETTER TODO NIA;Lo;0;L;;;;;N;;;;;
-185C;MONGOLIAN LETTER TODO DZA;Lo;0;L;;;;;N;;;;;
-185D;MONGOLIAN LETTER SIBE E;Lo;0;L;;;;;N;;;;;
-185E;MONGOLIAN LETTER SIBE I;Lo;0;L;;;;;N;;;;;
-185F;MONGOLIAN LETTER SIBE IY;Lo;0;L;;;;;N;;;;;
-1860;MONGOLIAN LETTER SIBE UE;Lo;0;L;;;;;N;;;;;
-1861;MONGOLIAN LETTER SIBE U;Lo;0;L;;;;;N;;;;;
-1862;MONGOLIAN LETTER SIBE ANG;Lo;0;L;;;;;N;;;;;
-1863;MONGOLIAN LETTER SIBE KA;Lo;0;L;;;;;N;;;;;
-1864;MONGOLIAN LETTER SIBE GA;Lo;0;L;;;;;N;;;;;
-1865;MONGOLIAN LETTER SIBE HA;Lo;0;L;;;;;N;;;;;
-1866;MONGOLIAN LETTER SIBE PA;Lo;0;L;;;;;N;;;;;
-1867;MONGOLIAN LETTER SIBE SHA;Lo;0;L;;;;;N;;;;;
-1868;MONGOLIAN LETTER SIBE TA;Lo;0;L;;;;;N;;;;;
-1869;MONGOLIAN LETTER SIBE DA;Lo;0;L;;;;;N;;;;;
-186A;MONGOLIAN LETTER SIBE JA;Lo;0;L;;;;;N;;;;;
-186B;MONGOLIAN LETTER SIBE FA;Lo;0;L;;;;;N;;;;;
-186C;MONGOLIAN LETTER SIBE GAA;Lo;0;L;;;;;N;;;;;
-186D;MONGOLIAN LETTER SIBE HAA;Lo;0;L;;;;;N;;;;;
-186E;MONGOLIAN LETTER SIBE TSA;Lo;0;L;;;;;N;;;;;
-186F;MONGOLIAN LETTER SIBE ZA;Lo;0;L;;;;;N;;;;;
-1870;MONGOLIAN LETTER SIBE RAA;Lo;0;L;;;;;N;;;;;
-1871;MONGOLIAN LETTER SIBE CHA;Lo;0;L;;;;;N;;;;;
-1872;MONGOLIAN LETTER SIBE ZHA;Lo;0;L;;;;;N;;;;;
-1873;MONGOLIAN LETTER MANCHU I;Lo;0;L;;;;;N;;;;;
-1874;MONGOLIAN LETTER MANCHU KA;Lo;0;L;;;;;N;;;;;
-1875;MONGOLIAN LETTER MANCHU RA;Lo;0;L;;;;;N;;;;;
-1876;MONGOLIAN LETTER MANCHU FA;Lo;0;L;;;;;N;;;;;
-1877;MONGOLIAN LETTER MANCHU ZHA;Lo;0;L;;;;;N;;;;;
-1880;MONGOLIAN LETTER ALI GALI ANUSVARA ONE;Lo;0;L;;;;;N;;;;;
-1881;MONGOLIAN LETTER ALI GALI VISARGA ONE;Lo;0;L;;;;;N;;;;;
-1882;MONGOLIAN LETTER ALI GALI DAMARU;Lo;0;L;;;;;N;;;;;
-1883;MONGOLIAN LETTER ALI GALI UBADAMA;Lo;0;L;;;;;N;;;;;
-1884;MONGOLIAN LETTER ALI GALI INVERTED UBADAMA;Lo;0;L;;;;;N;;;;;
-1885;MONGOLIAN LETTER ALI GALI BALUDA;Lo;0;L;;;;;N;;;;;
-1886;MONGOLIAN LETTER ALI GALI THREE BALUDA;Lo;0;L;;;;;N;;;;;
-1887;MONGOLIAN LETTER ALI GALI A;Lo;0;L;;;;;N;;;;;
-1888;MONGOLIAN LETTER ALI GALI I;Lo;0;L;;;;;N;;;;;
-1889;MONGOLIAN LETTER ALI GALI KA;Lo;0;L;;;;;N;;;;;
-188A;MONGOLIAN LETTER ALI GALI NGA;Lo;0;L;;;;;N;;;;;
-188B;MONGOLIAN LETTER ALI GALI CA;Lo;0;L;;;;;N;;;;;
-188C;MONGOLIAN LETTER ALI GALI TTA;Lo;0;L;;;;;N;;;;;
-188D;MONGOLIAN LETTER ALI GALI TTHA;Lo;0;L;;;;;N;;;;;
-188E;MONGOLIAN LETTER ALI GALI DDA;Lo;0;L;;;;;N;;;;;
-188F;MONGOLIAN LETTER ALI GALI NNA;Lo;0;L;;;;;N;;;;;
-1890;MONGOLIAN LETTER ALI GALI TA;Lo;0;L;;;;;N;;;;;
-1891;MONGOLIAN LETTER ALI GALI DA;Lo;0;L;;;;;N;;;;;
-1892;MONGOLIAN LETTER ALI GALI PA;Lo;0;L;;;;;N;;;;;
-1893;MONGOLIAN LETTER ALI GALI PHA;Lo;0;L;;;;;N;;;;;
-1894;MONGOLIAN LETTER ALI GALI SSA;Lo;0;L;;;;;N;;;;;
-1895;MONGOLIAN LETTER ALI GALI ZHA;Lo;0;L;;;;;N;;;;;
-1896;MONGOLIAN LETTER ALI GALI ZA;Lo;0;L;;;;;N;;;;;
-1897;MONGOLIAN LETTER ALI GALI AH;Lo;0;L;;;;;N;;;;;
-1898;MONGOLIAN LETTER TODO ALI GALI TA;Lo;0;L;;;;;N;;;;;
-1899;MONGOLIAN LETTER TODO ALI GALI ZHA;Lo;0;L;;;;;N;;;;;
-189A;MONGOLIAN LETTER MANCHU ALI GALI GHA;Lo;0;L;;;;;N;;;;;
-189B;MONGOLIAN LETTER MANCHU ALI GALI NGA;Lo;0;L;;;;;N;;;;;
-189C;MONGOLIAN LETTER MANCHU ALI GALI CA;Lo;0;L;;;;;N;;;;;
-189D;MONGOLIAN LETTER MANCHU ALI GALI JHA;Lo;0;L;;;;;N;;;;;
-189E;MONGOLIAN LETTER MANCHU ALI GALI TTA;Lo;0;L;;;;;N;;;;;
-189F;MONGOLIAN LETTER MANCHU ALI GALI DDHA;Lo;0;L;;;;;N;;;;;
-18A0;MONGOLIAN LETTER MANCHU ALI GALI TA;Lo;0;L;;;;;N;;;;;
-18A1;MONGOLIAN LETTER MANCHU ALI GALI DHA;Lo;0;L;;;;;N;;;;;
-18A2;MONGOLIAN LETTER MANCHU ALI GALI SSA;Lo;0;L;;;;;N;;;;;
-18A3;MONGOLIAN LETTER MANCHU ALI GALI CYA;Lo;0;L;;;;;N;;;;;
-18A4;MONGOLIAN LETTER MANCHU ALI GALI ZHA;Lo;0;L;;;;;N;;;;;
-18A5;MONGOLIAN LETTER MANCHU ALI GALI ZA;Lo;0;L;;;;;N;;;;;
-18A6;MONGOLIAN LETTER ALI GALI HALF U;Lo;0;L;;;;;N;;;;;
-18A7;MONGOLIAN LETTER ALI GALI HALF YA;Lo;0;L;;;;;N;;;;;
-18A8;MONGOLIAN LETTER MANCHU ALI GALI BHA;Lo;0;L;;;;;N;;;;;
-18A9;MONGOLIAN LETTER ALI GALI DAGALGA;Mn;228;NSM;;;;;N;;;;;
-18AA;MONGOLIAN LETTER MANCHU ALI GALI LHA;Lo;0;L;;;;;N;;;;;
-1900;LIMBU VOWEL-CARRIER LETTER;Lo;0;L;;;;;N;;;;;
-1901;LIMBU LETTER KA;Lo;0;L;;;;;N;;;;;
-1902;LIMBU LETTER KHA;Lo;0;L;;;;;N;;;;;
-1903;LIMBU LETTER GA;Lo;0;L;;;;;N;;;;;
-1904;LIMBU LETTER GHA;Lo;0;L;;;;;N;;;;;
-1905;LIMBU LETTER NGA;Lo;0;L;;;;;N;;;;;
-1906;LIMBU LETTER CA;Lo;0;L;;;;;N;;;;;
-1907;LIMBU LETTER CHA;Lo;0;L;;;;;N;;;;;
-1908;LIMBU LETTER JA;Lo;0;L;;;;;N;;;;;
-1909;LIMBU LETTER JHA;Lo;0;L;;;;;N;;;;;
-190A;LIMBU LETTER YAN;Lo;0;L;;;;;N;;;;;
-190B;LIMBU LETTER TA;Lo;0;L;;;;;N;;;;;
-190C;LIMBU LETTER THA;Lo;0;L;;;;;N;;;;;
-190D;LIMBU LETTER DA;Lo;0;L;;;;;N;;;;;
-190E;LIMBU LETTER DHA;Lo;0;L;;;;;N;;;;;
-190F;LIMBU LETTER NA;Lo;0;L;;;;;N;;;;;
-1910;LIMBU LETTER PA;Lo;0;L;;;;;N;;;;;
-1911;LIMBU LETTER PHA;Lo;0;L;;;;;N;;;;;
-1912;LIMBU LETTER BA;Lo;0;L;;;;;N;;;;;
-1913;LIMBU LETTER BHA;Lo;0;L;;;;;N;;;;;
-1914;LIMBU LETTER MA;Lo;0;L;;;;;N;;;;;
-1915;LIMBU LETTER YA;Lo;0;L;;;;;N;;;;;
-1916;LIMBU LETTER RA;Lo;0;L;;;;;N;;;;;
-1917;LIMBU LETTER LA;Lo;0;L;;;;;N;;;;;
-1918;LIMBU LETTER WA;Lo;0;L;;;;;N;;;;;
-1919;LIMBU LETTER SHA;Lo;0;L;;;;;N;;;;;
-191A;LIMBU LETTER SSA;Lo;0;L;;;;;N;;;;;
-191B;LIMBU LETTER SA;Lo;0;L;;;;;N;;;;;
-191C;LIMBU LETTER HA;Lo;0;L;;;;;N;;;;;
-1920;LIMBU VOWEL SIGN A;Mn;0;NSM;;;;;N;;;;;
-1921;LIMBU VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
-1922;LIMBU VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
-1923;LIMBU VOWEL SIGN EE;Mc;0;L;;;;;N;;;;;
-1924;LIMBU VOWEL SIGN AI;Mc;0;L;;;;;N;;;;;
-1925;LIMBU VOWEL SIGN OO;Mc;0;L;;;;;N;;;;;
-1926;LIMBU VOWEL SIGN AU;Mc;0;L;;;;;N;;;;;
-1927;LIMBU VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
-1928;LIMBU VOWEL SIGN O;Mn;0;NSM;;;;;N;;;;;
-1929;LIMBU SUBJOINED LETTER YA;Mc;0;L;;;;;N;;;;;
-192A;LIMBU SUBJOINED LETTER RA;Mc;0;L;;;;;N;;;;;
-192B;LIMBU SUBJOINED LETTER WA;Mc;0;L;;;;;N;;;;;
-1930;LIMBU SMALL LETTER KA;Mc;0;L;;;;;N;;;;;
-1931;LIMBU SMALL LETTER NGA;Mc;0;L;;;;;N;;;;;
-1932;LIMBU SMALL LETTER ANUSVARA;Mn;0;NSM;;;;;N;;;;;
-1933;LIMBU SMALL LETTER TA;Mc;0;L;;;;;N;;;;;
-1934;LIMBU SMALL LETTER NA;Mc;0;L;;;;;N;;;;;
-1935;LIMBU SMALL LETTER PA;Mc;0;L;;;;;N;;;;;
-1936;LIMBU SMALL LETTER MA;Mc;0;L;;;;;N;;;;;
-1937;LIMBU SMALL LETTER RA;Mc;0;L;;;;;N;;;;;
-1938;LIMBU SMALL LETTER LA;Mc;0;L;;;;;N;;;;;
-1939;LIMBU SIGN MUKPHRENG;Mn;222;NSM;;;;;N;;;;;
-193A;LIMBU SIGN KEMPHRENG;Mn;230;NSM;;;;;N;;;;;
-193B;LIMBU SIGN SA-I;Mn;220;NSM;;;;;N;;;;;
-1940;LIMBU SIGN LOO;So;0;ON;;;;;N;;;;;
-1944;LIMBU EXCLAMATION MARK;Po;0;ON;;;;;N;;;;;
-1945;LIMBU QUESTION MARK;Po;0;ON;;;;;N;;;;;
-1946;LIMBU DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
-1947;LIMBU DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
-1948;LIMBU DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
-1949;LIMBU DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
-194A;LIMBU DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
-194B;LIMBU DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
-194C;LIMBU DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
-194D;LIMBU DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
-194E;LIMBU DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
-194F;LIMBU DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
-1950;TAI LE LETTER KA;Lo;0;L;;;;;N;;;;;
-1951;TAI LE LETTER XA;Lo;0;L;;;;;N;;;;;
-1952;TAI LE LETTER NGA;Lo;0;L;;;;;N;;;;;
-1953;TAI LE LETTER TSA;Lo;0;L;;;;;N;;;;;
-1954;TAI LE LETTER SA;Lo;0;L;;;;;N;;;;;
-1955;TAI LE LETTER YA;Lo;0;L;;;;;N;;;;;
-1956;TAI LE LETTER TA;Lo;0;L;;;;;N;;;;;
-1957;TAI LE LETTER THA;Lo;0;L;;;;;N;;;;;
-1958;TAI LE LETTER LA;Lo;0;L;;;;;N;;;;;
-1959;TAI LE LETTER PA;Lo;0;L;;;;;N;;;;;
-195A;TAI LE LETTER PHA;Lo;0;L;;;;;N;;;;;
-195B;TAI LE LETTER MA;Lo;0;L;;;;;N;;;;;
-195C;TAI LE LETTER FA;Lo;0;L;;;;;N;;;;;
-195D;TAI LE LETTER VA;Lo;0;L;;;;;N;;;;;
-195E;TAI LE LETTER HA;Lo;0;L;;;;;N;;;;;
-195F;TAI LE LETTER QA;Lo;0;L;;;;;N;;;;;
-1960;TAI LE LETTER KHA;Lo;0;L;;;;;N;;;;;
-1961;TAI LE LETTER TSHA;Lo;0;L;;;;;N;;;;;
-1962;TAI LE LETTER NA;Lo;0;L;;;;;N;;;;;
-1963;TAI LE LETTER A;Lo;0;L;;;;;N;;;;;
-1964;TAI LE LETTER I;Lo;0;L;;;;;N;;;;;
-1965;TAI LE LETTER EE;Lo;0;L;;;;;N;;;;;
-1966;TAI LE LETTER EH;Lo;0;L;;;;;N;;;;;
-1967;TAI LE LETTER U;Lo;0;L;;;;;N;;;;;
-1968;TAI LE LETTER OO;Lo;0;L;;;;;N;;;;;
-1969;TAI LE LETTER O;Lo;0;L;;;;;N;;;;;
-196A;TAI LE LETTER UE;Lo;0;L;;;;;N;;;;;
-196B;TAI LE LETTER E;Lo;0;L;;;;;N;;;;;
-196C;TAI LE LETTER AUE;Lo;0;L;;;;;N;;;;;
-196D;TAI LE LETTER AI;Lo;0;L;;;;;N;;;;;
-1970;TAI LE LETTER TONE-2;Lo;0;L;;;;;N;;;;;
-1971;TAI LE LETTER TONE-3;Lo;0;L;;;;;N;;;;;
-1972;TAI LE LETTER TONE-4;Lo;0;L;;;;;N;;;;;
-1973;TAI LE LETTER TONE-5;Lo;0;L;;;;;N;;;;;
-1974;TAI LE LETTER TONE-6;Lo;0;L;;;;;N;;;;;
-1980;NEW TAI LUE LETTER HIGH QA;Lo;0;L;;;;;N;;;;;
-1981;NEW TAI LUE LETTER LOW QA;Lo;0;L;;;;;N;;;;;
-1982;NEW TAI LUE LETTER HIGH KA;Lo;0;L;;;;;N;;;;;
-1983;NEW TAI LUE LETTER HIGH XA;Lo;0;L;;;;;N;;;;;
-1984;NEW TAI LUE LETTER HIGH NGA;Lo;0;L;;;;;N;;;;;
-1985;NEW TAI LUE LETTER LOW KA;Lo;0;L;;;;;N;;;;;
-1986;NEW TAI LUE LETTER LOW XA;Lo;0;L;;;;;N;;;;;
-1987;NEW TAI LUE LETTER LOW NGA;Lo;0;L;;;;;N;;;;;
-1988;NEW TAI LUE LETTER HIGH TSA;Lo;0;L;;;;;N;;;;;
-1989;NEW TAI LUE LETTER HIGH SA;Lo;0;L;;;;;N;;;;;
-198A;NEW TAI LUE LETTER HIGH YA;Lo;0;L;;;;;N;;;;;
-198B;NEW TAI LUE LETTER LOW TSA;Lo;0;L;;;;;N;;;;;
-198C;NEW TAI LUE LETTER LOW SA;Lo;0;L;;;;;N;;;;;
-198D;NEW TAI LUE LETTER LOW YA;Lo;0;L;;;;;N;;;;;
-198E;NEW TAI LUE LETTER HIGH TA;Lo;0;L;;;;;N;;;;;
-198F;NEW TAI LUE LETTER HIGH THA;Lo;0;L;;;;;N;;;;;
-1990;NEW TAI LUE LETTER HIGH NA;Lo;0;L;;;;;N;;;;;
-1991;NEW TAI LUE LETTER LOW TA;Lo;0;L;;;;;N;;;;;
-1992;NEW TAI LUE LETTER LOW THA;Lo;0;L;;;;;N;;;;;
-1993;NEW TAI LUE LETTER LOW NA;Lo;0;L;;;;;N;;;;;
-1994;NEW TAI LUE LETTER HIGH PA;Lo;0;L;;;;;N;;;;;
-1995;NEW TAI LUE LETTER HIGH PHA;Lo;0;L;;;;;N;;;;;
-1996;NEW TAI LUE LETTER HIGH MA;Lo;0;L;;;;;N;;;;;
-1997;NEW TAI LUE LETTER LOW PA;Lo;0;L;;;;;N;;;;;
-1998;NEW TAI LUE LETTER LOW PHA;Lo;0;L;;;;;N;;;;;
-1999;NEW TAI LUE LETTER LOW MA;Lo;0;L;;;;;N;;;;;
-199A;NEW TAI LUE LETTER HIGH FA;Lo;0;L;;;;;N;;;;;
-199B;NEW TAI LUE LETTER HIGH VA;Lo;0;L;;;;;N;;;;;
-199C;NEW TAI LUE LETTER HIGH LA;Lo;0;L;;;;;N;;;;;
-199D;NEW TAI LUE LETTER LOW FA;Lo;0;L;;;;;N;;;;;
-199E;NEW TAI LUE LETTER LOW VA;Lo;0;L;;;;;N;;;;;
-199F;NEW TAI LUE LETTER LOW LA;Lo;0;L;;;;;N;;;;;
-19A0;NEW TAI LUE LETTER HIGH HA;Lo;0;L;;;;;N;;;;;
-19A1;NEW TAI LUE LETTER HIGH DA;Lo;0;L;;;;;N;;;;;
-19A2;NEW TAI LUE LETTER HIGH BA;Lo;0;L;;;;;N;;;;;
-19A3;NEW TAI LUE LETTER LOW HA;Lo;0;L;;;;;N;;;;;
-19A4;NEW TAI LUE LETTER LOW DA;Lo;0;L;;;;;N;;;;;
-19A5;NEW TAI LUE LETTER LOW BA;Lo;0;L;;;;;N;;;;;
-19A6;NEW TAI LUE LETTER HIGH KVA;Lo;0;L;;;;;N;;;;;
-19A7;NEW TAI LUE LETTER HIGH XVA;Lo;0;L;;;;;N;;;;;
-19A8;NEW TAI LUE LETTER LOW KVA;Lo;0;L;;;;;N;;;;;
-19A9;NEW TAI LUE LETTER LOW XVA;Lo;0;L;;;;;N;;;;;
-19B0;NEW TAI LUE VOWEL SIGN VOWEL SHORTENER;Mc;0;L;;;;;N;;;;;
-19B1;NEW TAI LUE VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
-19B2;NEW TAI LUE VOWEL SIGN II;Mc;0;L;;;;;N;;;;;
-19B3;NEW TAI LUE VOWEL SIGN U;Mc;0;L;;;;;N;;;;;
-19B4;NEW TAI LUE VOWEL SIGN UU;Mc;0;L;;;;;N;;;;;
-19B5;NEW TAI LUE VOWEL SIGN E;Mc;0;L;;;;;N;;;;;
-19B6;NEW TAI LUE VOWEL SIGN AE;Mc;0;L;;;;;N;;;;;
-19B7;NEW TAI LUE VOWEL SIGN O;Mc;0;L;;;;;N;;;;;
-19B8;NEW TAI LUE VOWEL SIGN OA;Mc;0;L;;;;;N;;;;;
-19B9;NEW TAI LUE VOWEL SIGN UE;Mc;0;L;;;;;N;;;;;
-19BA;NEW TAI LUE VOWEL SIGN AY;Mc;0;L;;;;;N;;;;;
-19BB;NEW TAI LUE VOWEL SIGN AAY;Mc;0;L;;;;;N;;;;;
-19BC;NEW TAI LUE VOWEL SIGN UY;Mc;0;L;;;;;N;;;;;
-19BD;NEW TAI LUE VOWEL SIGN OY;Mc;0;L;;;;;N;;;;;
-19BE;NEW TAI LUE VOWEL SIGN OAY;Mc;0;L;;;;;N;;;;;
-19BF;NEW TAI LUE VOWEL SIGN UEY;Mc;0;L;;;;;N;;;;;
-19C0;NEW TAI LUE VOWEL SIGN IY;Mc;0;L;;;;;N;;;;;
-19C1;NEW TAI LUE LETTER FINAL V;Lo;0;L;;;;;N;;;;;
-19C2;NEW TAI LUE LETTER FINAL NG;Lo;0;L;;;;;N;;;;;
-19C3;NEW TAI LUE LETTER FINAL N;Lo;0;L;;;;;N;;;;;
-19C4;NEW TAI LUE LETTER FINAL M;Lo;0;L;;;;;N;;;;;
-19C5;NEW TAI LUE LETTER FINAL K;Lo;0;L;;;;;N;;;;;
-19C6;NEW TAI LUE LETTER FINAL D;Lo;0;L;;;;;N;;;;;
-19C7;NEW TAI LUE LETTER FINAL B;Lo;0;L;;;;;N;;;;;
-19C8;NEW TAI LUE TONE MARK-1;Mc;0;L;;;;;N;;;;;
-19C9;NEW TAI LUE TONE MARK-2;Mc;0;L;;;;;N;;;;;
-19D0;NEW TAI LUE DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
-19D1;NEW TAI LUE DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
-19D2;NEW TAI LUE DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
-19D3;NEW TAI LUE DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
-19D4;NEW TAI LUE DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
-19D5;NEW TAI LUE DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
-19D6;NEW TAI LUE DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
-19D7;NEW TAI LUE DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
-19D8;NEW TAI LUE DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
-19D9;NEW TAI LUE DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
-19DE;NEW TAI LUE SIGN LAE;Po;0;ON;;;;;N;;;;;
-19DF;NEW TAI LUE SIGN LAEV;Po;0;ON;;;;;N;;;;;
-19E0;KHMER SYMBOL PATHAMASAT;So;0;ON;;;;;N;;;;;
-19E1;KHMER SYMBOL MUOY KOET;So;0;ON;;;;;N;;;;;
-19E2;KHMER SYMBOL PII KOET;So;0;ON;;;;;N;;;;;
-19E3;KHMER SYMBOL BEI KOET;So;0;ON;;;;;N;;;;;
-19E4;KHMER SYMBOL BUON KOET;So;0;ON;;;;;N;;;;;
-19E5;KHMER SYMBOL PRAM KOET;So;0;ON;;;;;N;;;;;
-19E6;KHMER SYMBOL PRAM-MUOY KOET;So;0;ON;;;;;N;;;;;
-19E7;KHMER SYMBOL PRAM-PII KOET;So;0;ON;;;;;N;;;;;
-19E8;KHMER SYMBOL PRAM-BEI KOET;So;0;ON;;;;;N;;;;;
-19E9;KHMER SYMBOL PRAM-BUON KOET;So;0;ON;;;;;N;;;;;
-19EA;KHMER SYMBOL DAP KOET;So;0;ON;;;;;N;;;;;
-19EB;KHMER SYMBOL DAP-MUOY KOET;So;0;ON;;;;;N;;;;;
-19EC;KHMER SYMBOL DAP-PII KOET;So;0;ON;;;;;N;;;;;
-19ED;KHMER SYMBOL DAP-BEI KOET;So;0;ON;;;;;N;;;;;
-19EE;KHMER SYMBOL DAP-BUON KOET;So;0;ON;;;;;N;;;;;
-19EF;KHMER SYMBOL DAP-PRAM KOET;So;0;ON;;;;;N;;;;;
-19F0;KHMER SYMBOL TUTEYASAT;So;0;ON;;;;;N;;;;;
-19F1;KHMER SYMBOL MUOY ROC;So;0;ON;;;;;N;;;;;
-19F2;KHMER SYMBOL PII ROC;So;0;ON;;;;;N;;;;;
-19F3;KHMER SYMBOL BEI ROC;So;0;ON;;;;;N;;;;;
-19F4;KHMER SYMBOL BUON ROC;So;0;ON;;;;;N;;;;;
-19F5;KHMER SYMBOL PRAM ROC;So;0;ON;;;;;N;;;;;
-19F6;KHMER SYMBOL PRAM-MUOY ROC;So;0;ON;;;;;N;;;;;
-19F7;KHMER SYMBOL PRAM-PII ROC;So;0;ON;;;;;N;;;;;
-19F8;KHMER SYMBOL PRAM-BEI ROC;So;0;ON;;;;;N;;;;;
-19F9;KHMER SYMBOL PRAM-BUON ROC;So;0;ON;;;;;N;;;;;
-19FA;KHMER SYMBOL DAP ROC;So;0;ON;;;;;N;;;;;
-19FB;KHMER SYMBOL DAP-MUOY ROC;So;0;ON;;;;;N;;;;;
-19FC;KHMER SYMBOL DAP-PII ROC;So;0;ON;;;;;N;;;;;
-19FD;KHMER SYMBOL DAP-BEI ROC;So;0;ON;;;;;N;;;;;
-19FE;KHMER SYMBOL DAP-BUON ROC;So;0;ON;;;;;N;;;;;
-19FF;KHMER SYMBOL DAP-PRAM ROC;So;0;ON;;;;;N;;;;;
-1A00;BUGINESE LETTER KA;Lo;0;L;;;;;N;;;;;
-1A01;BUGINESE LETTER GA;Lo;0;L;;;;;N;;;;;
-1A02;BUGINESE LETTER NGA;Lo;0;L;;;;;N;;;;;
-1A03;BUGINESE LETTER NGKA;Lo;0;L;;;;;N;;;;;
-1A04;BUGINESE LETTER PA;Lo;0;L;;;;;N;;;;;
-1A05;BUGINESE LETTER BA;Lo;0;L;;;;;N;;;;;
-1A06;BUGINESE LETTER MA;Lo;0;L;;;;;N;;;;;
-1A07;BUGINESE LETTER MPA;Lo;0;L;;;;;N;;;;;
-1A08;BUGINESE LETTER TA;Lo;0;L;;;;;N;;;;;
-1A09;BUGINESE LETTER DA;Lo;0;L;;;;;N;;;;;
-1A0A;BUGINESE LETTER NA;Lo;0;L;;;;;N;;;;;
-1A0B;BUGINESE LETTER NRA;Lo;0;L;;;;;N;;;;;
-1A0C;BUGINESE LETTER CA;Lo;0;L;;;;;N;;;;;
-1A0D;BUGINESE LETTER JA;Lo;0;L;;;;;N;;;;;
-1A0E;BUGINESE LETTER NYA;Lo;0;L;;;;;N;;;;;
-1A0F;BUGINESE LETTER NYCA;Lo;0;L;;;;;N;;;;;
-1A10;BUGINESE LETTER YA;Lo;0;L;;;;;N;;;;;
-1A11;BUGINESE LETTER RA;Lo;0;L;;;;;N;;;;;
-1A12;BUGINESE LETTER LA;Lo;0;L;;;;;N;;;;;
-1A13;BUGINESE LETTER VA;Lo;0;L;;;;;N;;;;;
-1A14;BUGINESE LETTER SA;Lo;0;L;;;;;N;;;;;
-1A15;BUGINESE LETTER A;Lo;0;L;;;;;N;;;;;
-1A16;BUGINESE LETTER HA;Lo;0;L;;;;;N;;;;;
-1A17;BUGINESE VOWEL SIGN I;Mn;230;NSM;;;;;N;;;;;
-1A18;BUGINESE VOWEL SIGN U;Mn;220;NSM;;;;;N;;;;;
-1A19;BUGINESE VOWEL SIGN E;Mc;0;L;;;;;N;;;;;
-1A1A;BUGINESE VOWEL SIGN O;Mc;0;L;;;;;N;;;;;
-1A1B;BUGINESE VOWEL SIGN AE;Mc;0;L;;;;;N;;;;;
-1A1E;BUGINESE PALLAWA;Po;0;L;;;;;N;;;;;
-1A1F;BUGINESE END OF SECTION;Po;0;L;;;;;N;;;;;
-1B00;BALINESE SIGN ULU RICEM;Mn;0;NSM;;;;;N;;ardhacandra;;;
-1B01;BALINESE SIGN ULU CANDRA;Mn;0;NSM;;;;;N;;candrabindu;;;
-1B02;BALINESE SIGN CECEK;Mn;0;NSM;;;;;N;;anusvara;;;
-1B03;BALINESE SIGN SURANG;Mn;0;NSM;;;;;N;;repha;;;
-1B04;BALINESE SIGN BISAH;Mc;0;L;;;;;N;;visarga;;;
-1B05;BALINESE LETTER AKARA;Lo;0;L;;;;;N;;a;;;
-1B06;BALINESE LETTER AKARA TEDUNG;Lo;0;L;1B05 1B35;;;;N;;aa;;;
-1B07;BALINESE LETTER IKARA;Lo;0;L;;;;;N;;i;;;
-1B08;BALINESE LETTER IKARA TEDUNG;Lo;0;L;1B07 1B35;;;;N;;ii;;;
-1B09;BALINESE LETTER UKARA;Lo;0;L;;;;;N;;u;;;
-1B0A;BALINESE LETTER UKARA TEDUNG;Lo;0;L;1B09 1B35;;;;N;;uu;;;
-1B0B;BALINESE LETTER RA REPA;Lo;0;L;;;;;N;;vocalic r;;;
-1B0C;BALINESE LETTER RA REPA TEDUNG;Lo;0;L;1B0B 1B35;;;;N;;vocalic rr;;;
-1B0D;BALINESE LETTER LA LENGA;Lo;0;L;;;;;N;;vocalic l;;;
-1B0E;BALINESE LETTER LA LENGA TEDUNG;Lo;0;L;1B0D 1B35;;;;N;;vocalic ll;;;
-1B0F;BALINESE LETTER EKARA;Lo;0;L;;;;;N;;e;;;
-1B10;BALINESE LETTER AIKARA;Lo;0;L;;;;;N;;ai;;;
-1B11;BALINESE LETTER OKARA;Lo;0;L;;;;;N;;o;;;
-1B12;BALINESE LETTER OKARA TEDUNG;Lo;0;L;1B11 1B35;;;;N;;au;;;
-1B13;BALINESE LETTER KA;Lo;0;L;;;;;N;;;;;
-1B14;BALINESE LETTER KA MAHAPRANA;Lo;0;L;;;;;N;;kha;;;
-1B15;BALINESE LETTER GA;Lo;0;L;;;;;N;;;;;
-1B16;BALINESE LETTER GA GORA;Lo;0;L;;;;;N;;gha;;;
-1B17;BALINESE LETTER NGA;Lo;0;L;;;;;N;;;;;
-1B18;BALINESE LETTER CA;Lo;0;L;;;;;N;;;;;
-1B19;BALINESE LETTER CA LACA;Lo;0;L;;;;;N;;cha;;;
-1B1A;BALINESE LETTER JA;Lo;0;L;;;;;N;;;;;
-1B1B;BALINESE LETTER JA JERA;Lo;0;L;;;;;N;;jha;;;
-1B1C;BALINESE LETTER NYA;Lo;0;L;;;;;N;;;;;
-1B1D;BALINESE LETTER TA LATIK;Lo;0;L;;;;;N;;tta;;;
-1B1E;BALINESE LETTER TA MURDA MAHAPRANA;Lo;0;L;;;;;N;;ttha;;;
-1B1F;BALINESE LETTER DA MURDA ALPAPRANA;Lo;0;L;;;;;N;;dda;;;
-1B20;BALINESE LETTER DA MURDA MAHAPRANA;Lo;0;L;;;;;N;;ddha;;;
-1B21;BALINESE LETTER NA RAMBAT;Lo;0;L;;;;;N;;nna;;;
-1B22;BALINESE LETTER TA;Lo;0;L;;;;;N;;;;;
-1B23;BALINESE LETTER TA TAWA;Lo;0;L;;;;;N;;tha;;;
-1B24;BALINESE LETTER DA;Lo;0;L;;;;;N;;;;;
-1B25;BALINESE LETTER DA MADU;Lo;0;L;;;;;N;;dha;;;
-1B26;BALINESE LETTER NA;Lo;0;L;;;;;N;;;;;
-1B27;BALINESE LETTER PA;Lo;0;L;;;;;N;;;;;
-1B28;BALINESE LETTER PA KAPAL;Lo;0;L;;;;;N;;pha;;;
-1B29;BALINESE LETTER BA;Lo;0;L;;;;;N;;;;;
-1B2A;BALINESE LETTER BA KEMBANG;Lo;0;L;;;;;N;;bha;;;
-1B2B;BALINESE LETTER MA;Lo;0;L;;;;;N;;;;;
-1B2C;BALINESE LETTER YA;Lo;0;L;;;;;N;;;;;
-1B2D;BALINESE LETTER RA;Lo;0;L;;;;;N;;;;;
-1B2E;BALINESE LETTER LA;Lo;0;L;;;;;N;;;;;
-1B2F;BALINESE LETTER WA;Lo;0;L;;;;;N;;;;;
-1B30;BALINESE LETTER SA SAGA;Lo;0;L;;;;;N;;sha;;;
-1B31;BALINESE LETTER SA SAPA;Lo;0;L;;;;;N;;ssa;;;
-1B32;BALINESE LETTER SA;Lo;0;L;;;;;N;;;;;
-1B33;BALINESE LETTER HA;Lo;0;L;;;;;N;;;;;
-1B34;BALINESE SIGN REREKAN;Mn;7;NSM;;;;;N;;nukta;;;
-1B35;BALINESE VOWEL SIGN TEDUNG;Mc;0;L;;;;;N;;aa;;;
-1B36;BALINESE VOWEL SIGN ULU;Mn;0;NSM;;;;;N;;i;;;
-1B37;BALINESE VOWEL SIGN ULU SARI;Mn;0;NSM;;;;;N;;ii;;;
-1B38;BALINESE VOWEL SIGN SUKU;Mn;0;NSM;;;;;N;;u;;;
-1B39;BALINESE VOWEL SIGN SUKU ILUT;Mn;0;NSM;;;;;N;;uu;;;
-1B3A;BALINESE VOWEL SIGN RA REPA;Mn;0;NSM;;;;;N;;vocalic r;;;
-1B3B;BALINESE VOWEL SIGN RA REPA TEDUNG;Mc;0;L;1B3A 1B35;;;;N;;vocalic rr;;;
-1B3C;BALINESE VOWEL SIGN LA LENGA;Mn;0;NSM;;;;;N;;vocalic l;;;
-1B3D;BALINESE VOWEL SIGN LA LENGA TEDUNG;Mc;0;L;1B3C 1B35;;;;N;;vocalic ll;;;
-1B3E;BALINESE VOWEL SIGN TALING;Mc;0;L;;;;;N;;e;;;
-1B3F;BALINESE VOWEL SIGN TALING REPA;Mc;0;L;;;;;N;;ai;;;
-1B40;BALINESE VOWEL SIGN TALING TEDUNG;Mc;0;L;1B3E 1B35;;;;N;;o;;;
-1B41;BALINESE VOWEL SIGN TALING REPA TEDUNG;Mc;0;L;1B3F 1B35;;;;N;;au;;;
-1B42;BALINESE VOWEL SIGN PEPET;Mn;0;NSM;;;;;N;;ae;;;
-1B43;BALINESE VOWEL SIGN PEPET TEDUNG;Mc;0;L;1B42 1B35;;;;N;;oe;;;
-1B44;BALINESE ADEG ADEG;Mc;9;L;;;;;N;;virama;;;
-1B45;BALINESE LETTER KAF SASAK;Lo;0;L;;;;;N;;;;;
-1B46;BALINESE LETTER KHOT SASAK;Lo;0;L;;;;;N;;;;;
-1B47;BALINESE LETTER TZIR SASAK;Lo;0;L;;;;;N;;;;;
-1B48;BALINESE LETTER EF SASAK;Lo;0;L;;;;;N;;;;;
-1B49;BALINESE LETTER VE SASAK;Lo;0;L;;;;;N;;;;;
-1B4A;BALINESE LETTER ZAL SASAK;Lo;0;L;;;;;N;;;;;
-1B4B;BALINESE LETTER ASYURA SASAK;Lo;0;L;;;;;N;;;;;
-1B50;BALINESE DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
-1B51;BALINESE DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
-1B52;BALINESE DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
-1B53;BALINESE DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
-1B54;BALINESE DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
-1B55;BALINESE DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
-1B56;BALINESE DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
-1B57;BALINESE DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
-1B58;BALINESE DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
-1B59;BALINESE DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
-1B5A;BALINESE PANTI;Po;0;L;;;;;N;;section;;;
-1B5B;BALINESE PAMADA;Po;0;L;;;;;N;;honorific section;;;
-1B5C;BALINESE WINDU;Po;0;L;;;;;N;;punctuation ring;;;
-1B5D;BALINESE CARIK PAMUNGKAH;Po;0;L;;;;;N;;colon;;;
-1B5E;BALINESE CARIK SIKI;Po;0;L;;;;;N;;danda;;;
-1B5F;BALINESE CARIK PAREREN;Po;0;L;;;;;N;;double danda;;;
-1B60;BALINESE PAMENENG;Po;0;L;;;;;N;;line-breaking hyphen;;;
-1B61;BALINESE MUSICAL SYMBOL DONG;So;0;L;;;;;N;;;;;
-1B62;BALINESE MUSICAL SYMBOL DENG;So;0;L;;;;;N;;;;;
-1B63;BALINESE MUSICAL SYMBOL DUNG;So;0;L;;;;;N;;;;;
-1B64;BALINESE MUSICAL SYMBOL DANG;So;0;L;;;;;N;;;;;
-1B65;BALINESE MUSICAL SYMBOL DANG SURANG;So;0;L;;;;;N;;;;;
-1B66;BALINESE MUSICAL SYMBOL DING;So;0;L;;;;;N;;;;;
-1B67;BALINESE MUSICAL SYMBOL DAENG;So;0;L;;;;;N;;;;;
-1B68;BALINESE MUSICAL SYMBOL DEUNG;So;0;L;;;;;N;;;;;
-1B69;BALINESE MUSICAL SYMBOL DAING;So;0;L;;;;;N;;;;;
-1B6A;BALINESE MUSICAL SYMBOL DANG GEDE;So;0;L;;;;;N;;;;;
-1B6B;BALINESE MUSICAL SYMBOL COMBINING TEGEH;Mn;230;NSM;;;;;N;;;;;
-1B6C;BALINESE MUSICAL SYMBOL COMBINING ENDEP;Mn;220;NSM;;;;;N;;;;;
-1B6D;BALINESE MUSICAL SYMBOL COMBINING KEMPUL;Mn;230;NSM;;;;;N;;;;;
-1B6E;BALINESE MUSICAL SYMBOL COMBINING KEMPLI;Mn;230;NSM;;;;;N;;;;;
-1B6F;BALINESE MUSICAL SYMBOL COMBINING JEGOGAN;Mn;230;NSM;;;;;N;;;;;
-1B70;BALINESE MUSICAL SYMBOL COMBINING KEMPUL WITH JEGOGAN;Mn;230;NSM;;;;;N;;;;;
-1B71;BALINESE MUSICAL SYMBOL COMBINING KEMPLI WITH JEGOGAN;Mn;230;NSM;;;;;N;;;;;
-1B72;BALINESE MUSICAL SYMBOL COMBINING BENDE;Mn;230;NSM;;;;;N;;;;;
-1B73;BALINESE MUSICAL SYMBOL COMBINING GONG;Mn;230;NSM;;;;;N;;;;;
-1B74;BALINESE MUSICAL SYMBOL RIGHT-HAND OPEN DUG;So;0;L;;;;;N;;;;;
-1B75;BALINESE MUSICAL SYMBOL RIGHT-HAND OPEN DAG;So;0;L;;;;;N;;;;;
-1B76;BALINESE MUSICAL SYMBOL RIGHT-HAND CLOSED TUK;So;0;L;;;;;N;;;;;
-1B77;BALINESE MUSICAL SYMBOL RIGHT-HAND CLOSED TAK;So;0;L;;;;;N;;;;;
-1B78;BALINESE MUSICAL SYMBOL LEFT-HAND OPEN PANG;So;0;L;;;;;N;;;;;
-1B79;BALINESE MUSICAL SYMBOL LEFT-HAND OPEN PUNG;So;0;L;;;;;N;;;;;
-1B7A;BALINESE MUSICAL SYMBOL LEFT-HAND CLOSED PLAK;So;0;L;;;;;N;;;;;
-1B7B;BALINESE MUSICAL SYMBOL LEFT-HAND CLOSED PLUK;So;0;L;;;;;N;;;;;
-1B7C;BALINESE MUSICAL SYMBOL LEFT-HAND OPEN PING;So;0;L;;;;;N;;;;;
-1B80;SUNDANESE SIGN PANYECEK;Mn;0;NSM;;;;;N;;;;;
-1B81;SUNDANESE SIGN PANGLAYAR;Mn;0;NSM;;;;;N;;;;;
-1B82;SUNDANESE SIGN PANGWISAD;Mc;0;L;;;;;N;;;;;
-1B83;SUNDANESE LETTER A;Lo;0;L;;;;;N;;;;;
-1B84;SUNDANESE LETTER I;Lo;0;L;;;;;N;;;;;
-1B85;SUNDANESE LETTER U;Lo;0;L;;;;;N;;;;;
-1B86;SUNDANESE LETTER AE;Lo;0;L;;;;;N;;;;;
-1B87;SUNDANESE LETTER O;Lo;0;L;;;;;N;;;;;
-1B88;SUNDANESE LETTER E;Lo;0;L;;;;;N;;;;;
-1B89;SUNDANESE LETTER EU;Lo;0;L;;;;;N;;;;;
-1B8A;SUNDANESE LETTER KA;Lo;0;L;;;;;N;;;;;
-1B8B;SUNDANESE LETTER QA;Lo;0;L;;;;;N;;;;;
-1B8C;SUNDANESE LETTER GA;Lo;0;L;;;;;N;;;;;
-1B8D;SUNDANESE LETTER NGA;Lo;0;L;;;;;N;;;;;
-1B8E;SUNDANESE LETTER CA;Lo;0;L;;;;;N;;;;;
-1B8F;SUNDANESE LETTER JA;Lo;0;L;;;;;N;;;;;
-1B90;SUNDANESE LETTER ZA;Lo;0;L;;;;;N;;;;;
-1B91;SUNDANESE LETTER NYA;Lo;0;L;;;;;N;;;;;
-1B92;SUNDANESE LETTER TA;Lo;0;L;;;;;N;;;;;
-1B93;SUNDANESE LETTER DA;Lo;0;L;;;;;N;;;;;
-1B94;SUNDANESE LETTER NA;Lo;0;L;;;;;N;;;;;
-1B95;SUNDANESE LETTER PA;Lo;0;L;;;;;N;;;;;
-1B96;SUNDANESE LETTER FA;Lo;0;L;;;;;N;;;;;
-1B97;SUNDANESE LETTER VA;Lo;0;L;;;;;N;;;;;
-1B98;SUNDANESE LETTER BA;Lo;0;L;;;;;N;;;;;
-1B99;SUNDANESE LETTER MA;Lo;0;L;;;;;N;;;;;
-1B9A;SUNDANESE LETTER YA;Lo;0;L;;;;;N;;;;;
-1B9B;SUNDANESE LETTER RA;Lo;0;L;;;;;N;;;;;
-1B9C;SUNDANESE LETTER LA;Lo;0;L;;;;;N;;;;;
-1B9D;SUNDANESE LETTER WA;Lo;0;L;;;;;N;;;;;
-1B9E;SUNDANESE LETTER SA;Lo;0;L;;;;;N;;;;;
-1B9F;SUNDANESE LETTER XA;Lo;0;L;;;;;N;;;;;
-1BA0;SUNDANESE LETTER HA;Lo;0;L;;;;;N;;;;;
-1BA1;SUNDANESE CONSONANT SIGN PAMINGKAL;Mc;0;L;;;;;N;;;;;
-1BA2;SUNDANESE CONSONANT SIGN PANYAKRA;Mn;0;NSM;;;;;N;;;;;
-1BA3;SUNDANESE CONSONANT SIGN PANYIKU;Mn;0;NSM;;;;;N;;;;;
-1BA4;SUNDANESE VOWEL SIGN PANGHULU;Mn;0;NSM;;;;;N;;;;;
-1BA5;SUNDANESE VOWEL SIGN PANYUKU;Mn;0;NSM;;;;;N;;;;;
-1BA6;SUNDANESE VOWEL SIGN PANAELAENG;Mc;0;L;;;;;N;;;;;
-1BA7;SUNDANESE VOWEL SIGN PANOLONG;Mc;0;L;;;;;N;;;;;
-1BA8;SUNDANESE VOWEL SIGN PAMEPET;Mn;0;NSM;;;;;N;;;;;
-1BA9;SUNDANESE VOWEL SIGN PANEULEUNG;Mn;0;NSM;;;;;N;;;;;
-1BAA;SUNDANESE SIGN PAMAAEH;Mc;9;L;;;;;N;;;;;
-1BAE;SUNDANESE LETTER KHA;Lo;0;L;;;;;N;;;;;
-1BAF;SUNDANESE LETTER SYA;Lo;0;L;;;;;N;;;;;
-1BB0;SUNDANESE DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
-1BB1;SUNDANESE DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
-1BB2;SUNDANESE DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
-1BB3;SUNDANESE DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
-1BB4;SUNDANESE DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
-1BB5;SUNDANESE DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
-1BB6;SUNDANESE DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
-1BB7;SUNDANESE DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
-1BB8;SUNDANESE DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
-1BB9;SUNDANESE DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
-1C00;LEPCHA LETTER KA;Lo;0;L;;;;;N;;;;;
-1C01;LEPCHA LETTER KLA;Lo;0;L;;;;;N;;;;;
-1C02;LEPCHA LETTER KHA;Lo;0;L;;;;;N;;;;;
-1C03;LEPCHA LETTER GA;Lo;0;L;;;;;N;;;;;
-1C04;LEPCHA LETTER GLA;Lo;0;L;;;;;N;;;;;
-1C05;LEPCHA LETTER NGA;Lo;0;L;;;;;N;;;;;
-1C06;LEPCHA LETTER CA;Lo;0;L;;;;;N;;;;;
-1C07;LEPCHA LETTER CHA;Lo;0;L;;;;;N;;;;;
-1C08;LEPCHA LETTER JA;Lo;0;L;;;;;N;;;;;
-1C09;LEPCHA LETTER NYA;Lo;0;L;;;;;N;;;;;
-1C0A;LEPCHA LETTER TA;Lo;0;L;;;;;N;;;;;
-1C0B;LEPCHA LETTER THA;Lo;0;L;;;;;N;;;;;
-1C0C;LEPCHA LETTER DA;Lo;0;L;;;;;N;;;;;
-1C0D;LEPCHA LETTER NA;Lo;0;L;;;;;N;;;;;
-1C0E;LEPCHA LETTER PA;Lo;0;L;;;;;N;;;;;
-1C0F;LEPCHA LETTER PLA;Lo;0;L;;;;;N;;;;;
-1C10;LEPCHA LETTER PHA;Lo;0;L;;;;;N;;;;;
-1C11;LEPCHA LETTER FA;Lo;0;L;;;;;N;;;;;
-1C12;LEPCHA LETTER FLA;Lo;0;L;;;;;N;;;;;
-1C13;LEPCHA LETTER BA;Lo;0;L;;;;;N;;;;;
-1C14;LEPCHA LETTER BLA;Lo;0;L;;;;;N;;;;;
-1C15;LEPCHA LETTER MA;Lo;0;L;;;;;N;;;;;
-1C16;LEPCHA LETTER MLA;Lo;0;L;;;;;N;;;;;
-1C17;LEPCHA LETTER TSA;Lo;0;L;;;;;N;;;;;
-1C18;LEPCHA LETTER TSHA;Lo;0;L;;;;;N;;;;;
-1C19;LEPCHA LETTER DZA;Lo;0;L;;;;;N;;;;;
-1C1A;LEPCHA LETTER YA;Lo;0;L;;;;;N;;;;;
-1C1B;LEPCHA LETTER RA;Lo;0;L;;;;;N;;;;;
-1C1C;LEPCHA LETTER LA;Lo;0;L;;;;;N;;;;;
-1C1D;LEPCHA LETTER HA;Lo;0;L;;;;;N;;;;;
-1C1E;LEPCHA LETTER HLA;Lo;0;L;;;;;N;;;;;
-1C1F;LEPCHA LETTER VA;Lo;0;L;;;;;N;;;;;
-1C20;LEPCHA LETTER SA;Lo;0;L;;;;;N;;;;;
-1C21;LEPCHA LETTER SHA;Lo;0;L;;;;;N;;;;;
-1C22;LEPCHA LETTER WA;Lo;0;L;;;;;N;;;;;
-1C23;LEPCHA LETTER A;Lo;0;L;;;;;N;;;;;
-1C24;LEPCHA SUBJOINED LETTER YA;Mc;0;L;;;;;N;;;;;
-1C25;LEPCHA SUBJOINED LETTER RA;Mc;0;L;;;;;N;;;;;
-1C26;LEPCHA VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
-1C27;LEPCHA VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
-1C28;LEPCHA VOWEL SIGN O;Mc;0;L;;;;;N;;;;;
-1C29;LEPCHA VOWEL SIGN OO;Mc;0;L;;;;;N;;;;;
-1C2A;LEPCHA VOWEL SIGN U;Mc;0;L;;;;;N;;;;;
-1C2B;LEPCHA VOWEL SIGN UU;Mc;0;L;;;;;N;;;;;
-1C2C;LEPCHA VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
-1C2D;LEPCHA CONSONANT SIGN K;Mn;0;NSM;;;;;N;;;;;
-1C2E;LEPCHA CONSONANT SIGN M;Mn;0;NSM;;;;;N;;;;;
-1C2F;LEPCHA CONSONANT SIGN L;Mn;0;NSM;;;;;N;;;;;
-1C30;LEPCHA CONSONANT SIGN N;Mn;0;NSM;;;;;N;;;;;
-1C31;LEPCHA CONSONANT SIGN P;Mn;0;NSM;;;;;N;;;;;
-1C32;LEPCHA CONSONANT SIGN R;Mn;0;NSM;;;;;N;;;;;
-1C33;LEPCHA CONSONANT SIGN T;Mn;0;NSM;;;;;N;;;;;
-1C34;LEPCHA CONSONANT SIGN NYIN-DO;Mc;0;L;;;;;N;;;;;
-1C35;LEPCHA CONSONANT SIGN KANG;Mc;0;L;;;;;N;;;;;
-1C36;LEPCHA SIGN RAN;Mn;0;NSM;;;;;N;;;;;
-1C37;LEPCHA SIGN NUKTA;Mn;7;NSM;;;;;N;;;;;
-1C3B;LEPCHA PUNCTUATION TA-ROL;Po;0;L;;;;;N;;;;;
-1C3C;LEPCHA PUNCTUATION NYET THYOOM TA-ROL;Po;0;L;;;;;N;;;;;
-1C3D;LEPCHA PUNCTUATION CER-WA;Po;0;L;;;;;N;;;;;
-1C3E;LEPCHA PUNCTUATION TSHOOK CER-WA;Po;0;L;;;;;N;;;;;
-1C3F;LEPCHA PUNCTUATION TSHOOK;Po;0;L;;;;;N;;;;;
-1C40;LEPCHA DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
-1C41;LEPCHA DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
-1C42;LEPCHA DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
-1C43;LEPCHA DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
-1C44;LEPCHA DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
-1C45;LEPCHA DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
-1C46;LEPCHA DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
-1C47;LEPCHA DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
-1C48;LEPCHA DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
-1C49;LEPCHA DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
-1C4D;LEPCHA LETTER TTA;Lo;0;L;;;;;N;;;;;
-1C4E;LEPCHA LETTER TTHA;Lo;0;L;;;;;N;;;;;
-1C4F;LEPCHA LETTER DDA;Lo;0;L;;;;;N;;;;;
-1C50;OL CHIKI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
-1C51;OL CHIKI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
-1C52;OL CHIKI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
-1C53;OL CHIKI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
-1C54;OL CHIKI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
-1C55;OL CHIKI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
-1C56;OL CHIKI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
-1C57;OL CHIKI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
-1C58;OL CHIKI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
-1C59;OL CHIKI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
-1C5A;OL CHIKI LETTER LA;Lo;0;L;;;;;N;;;;;
-1C5B;OL CHIKI LETTER AT;Lo;0;L;;;;;N;;;;;
-1C5C;OL CHIKI LETTER AG;Lo;0;L;;;;;N;;;;;
-1C5D;OL CHIKI LETTER ANG;Lo;0;L;;;;;N;;;;;
-1C5E;OL CHIKI LETTER AL;Lo;0;L;;;;;N;;;;;
-1C5F;OL CHIKI LETTER LAA;Lo;0;L;;;;;N;;;;;
-1C60;OL CHIKI LETTER AAK;Lo;0;L;;;;;N;;;;;
-1C61;OL CHIKI LETTER AAJ;Lo;0;L;;;;;N;;;;;
-1C62;OL CHIKI LETTER AAM;Lo;0;L;;;;;N;;;;;
-1C63;OL CHIKI LETTER AAW;Lo;0;L;;;;;N;;;;;
-1C64;OL CHIKI LETTER LI;Lo;0;L;;;;;N;;;;;
-1C65;OL CHIKI LETTER IS;Lo;0;L;;;;;N;;;;;
-1C66;OL CHIKI LETTER IH;Lo;0;L;;;;;N;;;;;
-1C67;OL CHIKI LETTER INY;Lo;0;L;;;;;N;;;;;
-1C68;OL CHIKI LETTER IR;Lo;0;L;;;;;N;;;;;
-1C69;OL CHIKI LETTER LU;Lo;0;L;;;;;N;;;;;
-1C6A;OL CHIKI LETTER UC;Lo;0;L;;;;;N;;;;;
-1C6B;OL CHIKI LETTER UD;Lo;0;L;;;;;N;;;;;
-1C6C;OL CHIKI LETTER UNN;Lo;0;L;;;;;N;;;;;
-1C6D;OL CHIKI LETTER UY;Lo;0;L;;;;;N;;;;;
-1C6E;OL CHIKI LETTER LE;Lo;0;L;;;;;N;;;;;
-1C6F;OL CHIKI LETTER EP;Lo;0;L;;;;;N;;;;;
-1C70;OL CHIKI LETTER EDD;Lo;0;L;;;;;N;;;;;
-1C71;OL CHIKI LETTER EN;Lo;0;L;;;;;N;;;;;
-1C72;OL CHIKI LETTER ERR;Lo;0;L;;;;;N;;;;;
-1C73;OL CHIKI LETTER LO;Lo;0;L;;;;;N;;;;;
-1C74;OL CHIKI LETTER OTT;Lo;0;L;;;;;N;;;;;
-1C75;OL CHIKI LETTER OB;Lo;0;L;;;;;N;;;;;
-1C76;OL CHIKI LETTER OV;Lo;0;L;;;;;N;;;;;
-1C77;OL CHIKI LETTER OH;Lo;0;L;;;;;N;;;;;
-1C78;OL CHIKI MU TTUDDAG;Lm;0;L;;;;;N;;;;;
-1C79;OL CHIKI GAAHLAA TTUDDAAG;Lm;0;L;;;;;N;;;;;
-1C7A;OL CHIKI MU-GAAHLAA TTUDDAAG;Lm;0;L;;;;;N;;;;;
-1C7B;OL CHIKI RELAA;Lm;0;L;;;;;N;;;;;
-1C7C;OL CHIKI PHAARKAA;Lm;0;L;;;;;N;;;;;
-1C7D;OL CHIKI AHAD;Lm;0;L;;;;;N;;;;;
-1C7E;OL CHIKI PUNCTUATION MUCAAD;Po;0;L;;;;;N;;;;;
-1C7F;OL CHIKI PUNCTUATION DOUBLE MUCAAD;Po;0;L;;;;;N;;;;;
-1D00;LATIN LETTER SMALL CAPITAL A;Ll;0;L;;;;;N;;;;;
-1D01;LATIN LETTER SMALL CAPITAL AE;Ll;0;L;;;;;N;;;;;
-1D02;LATIN SMALL LETTER TURNED AE;Ll;0;L;;;;;N;;;;;
-1D03;LATIN LETTER SMALL CAPITAL BARRED B;Ll;0;L;;;;;N;;;;;
-1D04;LATIN LETTER SMALL CAPITAL C;Ll;0;L;;;;;N;;;;;
-1D05;LATIN LETTER SMALL CAPITAL D;Ll;0;L;;;;;N;;;;;
-1D06;LATIN LETTER SMALL CAPITAL ETH;Ll;0;L;;;;;N;;;;;
-1D07;LATIN LETTER SMALL CAPITAL E;Ll;0;L;;;;;N;;;;;
-1D08;LATIN SMALL LETTER TURNED OPEN E;Ll;0;L;;;;;N;;;;;
-1D09;LATIN SMALL LETTER TURNED I;Ll;0;L;;;;;N;;;;;
-1D0A;LATIN LETTER SMALL CAPITAL J;Ll;0;L;;;;;N;;;;;
-1D0B;LATIN LETTER SMALL CAPITAL K;Ll;0;L;;;;;N;;;;;
-1D0C;LATIN LETTER SMALL CAPITAL L WITH STROKE;Ll;0;L;;;;;N;;;;;
-1D0D;LATIN LETTER SMALL CAPITAL M;Ll;0;L;;;;;N;;;;;
-1D0E;LATIN LETTER SMALL CAPITAL REVERSED N;Ll;0;L;;;;;N;;;;;
-1D0F;LATIN LETTER SMALL CAPITAL O;Ll;0;L;;;;;N;;;;;
-1D10;LATIN LETTER SMALL CAPITAL OPEN O;Ll;0;L;;;;;N;;;;;
-1D11;LATIN SMALL LETTER SIDEWAYS O;Ll;0;L;;;;;N;;;;;
-1D12;LATIN SMALL LETTER SIDEWAYS OPEN O;Ll;0;L;;;;;N;;;;;
-1D13;LATIN SMALL LETTER SIDEWAYS O WITH STROKE;Ll;0;L;;;;;N;;;;;
-1D14;LATIN SMALL LETTER TURNED OE;Ll;0;L;;;;;N;;;;;
-1D15;LATIN LETTER SMALL CAPITAL OU;Ll;0;L;;;;;N;;;;;
-1D16;LATIN SMALL LETTER TOP HALF O;Ll;0;L;;;;;N;;;;;
-1D17;LATIN SMALL LETTER BOTTOM HALF O;Ll;0;L;;;;;N;;;;;
-1D18;LATIN LETTER SMALL CAPITAL P;Ll;0;L;;;;;N;;;;;
-1D19;LATIN LETTER SMALL CAPITAL REVERSED R;Ll;0;L;;;;;N;;;;;
-1D1A;LATIN LETTER SMALL CAPITAL TURNED R;Ll;0;L;;;;;N;;;;;
-1D1B;LATIN LETTER SMALL CAPITAL T;Ll;0;L;;;;;N;;;;;
-1D1C;LATIN LETTER SMALL CAPITAL U;Ll;0;L;;;;;N;;;;;
-1D1D;LATIN SMALL LETTER SIDEWAYS U;Ll;0;L;;;;;N;;;;;
-1D1E;LATIN SMALL LETTER SIDEWAYS DIAERESIZED U;Ll;0;L;;;;;N;;;;;
-1D1F;LATIN SMALL LETTER SIDEWAYS TURNED M;Ll;0;L;;;;;N;;;;;
-1D20;LATIN LETTER SMALL CAPITAL V;Ll;0;L;;;;;N;;;;;
-1D21;LATIN LETTER SMALL CAPITAL W;Ll;0;L;;;;;N;;;;;
-1D22;LATIN LETTER SMALL CAPITAL Z;Ll;0;L;;;;;N;;;;;
-1D23;LATIN LETTER SMALL CAPITAL EZH;Ll;0;L;;;;;N;;;;;
-1D24;LATIN LETTER VOICED LARYNGEAL SPIRANT;Ll;0;L;;;;;N;;;;;
-1D25;LATIN LETTER AIN;Ll;0;L;;;;;N;;;;;
-1D26;GREEK LETTER SMALL CAPITAL GAMMA;Ll;0;L;;;;;N;;;;;
-1D27;GREEK LETTER SMALL CAPITAL LAMDA;Ll;0;L;;;;;N;;;;;
-1D28;GREEK LETTER SMALL CAPITAL PI;Ll;0;L;;;;;N;;;;;
-1D29;GREEK LETTER SMALL CAPITAL RHO;Ll;0;L;;;;;N;;;;;
-1D2A;GREEK LETTER SMALL CAPITAL PSI;Ll;0;L;;;;;N;;;;;
-1D2B;CYRILLIC LETTER SMALL CAPITAL EL;Ll;0;L;;;;;N;;;;;
-1D2C;MODIFIER LETTER CAPITAL A;Lm;0;L;<super> 0041;;;;N;;;;;
-1D2D;MODIFIER LETTER CAPITAL AE;Lm;0;L;<super> 00C6;;;;N;;;;;
-1D2E;MODIFIER LETTER CAPITAL B;Lm;0;L;<super> 0042;;;;N;;;;;
-1D2F;MODIFIER LETTER CAPITAL BARRED B;Lm;0;L;;;;;N;;;;;
-1D30;MODIFIER LETTER CAPITAL D;Lm;0;L;<super> 0044;;;;N;;;;;
-1D31;MODIFIER LETTER CAPITAL E;Lm;0;L;<super> 0045;;;;N;;;;;
-1D32;MODIFIER LETTER CAPITAL REVERSED E;Lm;0;L;<super> 018E;;;;N;;;;;
-1D33;MODIFIER LETTER CAPITAL G;Lm;0;L;<super> 0047;;;;N;;;;;
-1D34;MODIFIER LETTER CAPITAL H;Lm;0;L;<super> 0048;;;;N;;;;;
-1D35;MODIFIER LETTER CAPITAL I;Lm;0;L;<super> 0049;;;;N;;;;;
-1D36;MODIFIER LETTER CAPITAL J;Lm;0;L;<super> 004A;;;;N;;;;;
-1D37;MODIFIER LETTER CAPITAL K;Lm;0;L;<super> 004B;;;;N;;;;;
-1D38;MODIFIER LETTER CAPITAL L;Lm;0;L;<super> 004C;;;;N;;;;;
-1D39;MODIFIER LETTER CAPITAL M;Lm;0;L;<super> 004D;;;;N;;;;;
-1D3A;MODIFIER LETTER CAPITAL N;Lm;0;L;<super> 004E;;;;N;;;;;
-1D3B;MODIFIER LETTER CAPITAL REVERSED N;Lm;0;L;;;;;N;;;;;
-1D3C;MODIFIER LETTER CAPITAL O;Lm;0;L;<super> 004F;;;;N;;;;;
-1D3D;MODIFIER LETTER CAPITAL OU;Lm;0;L;<super> 0222;;;;N;;;;;
-1D3E;MODIFIER LETTER CAPITAL P;Lm;0;L;<super> 0050;;;;N;;;;;
-1D3F;MODIFIER LETTER CAPITAL R;Lm;0;L;<super> 0052;;;;N;;;;;
-1D40;MODIFIER LETTER CAPITAL T;Lm;0;L;<super> 0054;;;;N;;;;;
-1D41;MODIFIER LETTER CAPITAL U;Lm;0;L;<super> 0055;;;;N;;;;;
-1D42;MODIFIER LETTER CAPITAL W;Lm;0;L;<super> 0057;;;;N;;;;;
-1D43;MODIFIER LETTER SMALL A;Lm;0;L;<super> 0061;;;;N;;;;;
-1D44;MODIFIER LETTER SMALL TURNED A;Lm;0;L;<super> 0250;;;;N;;;;;
-1D45;MODIFIER LETTER SMALL ALPHA;Lm;0;L;<super> 0251;;;;N;;;;;
-1D46;MODIFIER LETTER SMALL TURNED AE;Lm;0;L;<super> 1D02;;;;N;;;;;
-1D47;MODIFIER LETTER SMALL B;Lm;0;L;<super> 0062;;;;N;;;;;
-1D48;MODIFIER LETTER SMALL D;Lm;0;L;<super> 0064;;;;N;;;;;
-1D49;MODIFIER LETTER SMALL E;Lm;0;L;<super> 0065;;;;N;;;;;
-1D4A;MODIFIER LETTER SMALL SCHWA;Lm;0;L;<super> 0259;;;;N;;;;;
-1D4B;MODIFIER LETTER SMALL OPEN E;Lm;0;L;<super> 025B;;;;N;;;;;
-1D4C;MODIFIER LETTER SMALL TURNED OPEN E;Lm;0;L;<super> 025C;;;;N;;;;;
-1D4D;MODIFIER LETTER SMALL G;Lm;0;L;<super> 0067;;;;N;;;;;
-1D4E;MODIFIER LETTER SMALL TURNED I;Lm;0;L;;;;;N;;;;;
-1D4F;MODIFIER LETTER SMALL K;Lm;0;L;<super> 006B;;;;N;;;;;
-1D50;MODIFIER LETTER SMALL M;Lm;0;L;<super> 006D;;;;N;;;;;
-1D51;MODIFIER LETTER SMALL ENG;Lm;0;L;<super> 014B;;;;N;;;;;
-1D52;MODIFIER LETTER SMALL O;Lm;0;L;<super> 006F;;;;N;;;;;
-1D53;MODIFIER LETTER SMALL OPEN O;Lm;0;L;<super> 0254;;;;N;;;;;
-1D54;MODIFIER LETTER SMALL TOP HALF O;Lm;0;L;<super> 1D16;;;;N;;;;;
-1D55;MODIFIER LETTER SMALL BOTTOM HALF O;Lm;0;L;<super> 1D17;;;;N;;;;;
-1D56;MODIFIER LETTER SMALL P;Lm;0;L;<super> 0070;;;;N;;;;;
-1D57;MODIFIER LETTER SMALL T;Lm;0;L;<super> 0074;;;;N;;;;;
-1D58;MODIFIER LETTER SMALL U;Lm;0;L;<super> 0075;;;;N;;;;;
-1D59;MODIFIER LETTER SMALL SIDEWAYS U;Lm;0;L;<super> 1D1D;;;;N;;;;;
-1D5A;MODIFIER LETTER SMALL TURNED M;Lm;0;L;<super> 026F;;;;N;;;;;
-1D5B;MODIFIER LETTER SMALL V;Lm;0;L;<super> 0076;;;;N;;;;;
-1D5C;MODIFIER LETTER SMALL AIN;Lm;0;L;<super> 1D25;;;;N;;;;;
-1D5D;MODIFIER LETTER SMALL BETA;Lm;0;L;<super> 03B2;;;;N;;;;;
-1D5E;MODIFIER LETTER SMALL GREEK GAMMA;Lm;0;L;<super> 03B3;;;;N;;;;;
-1D5F;MODIFIER LETTER SMALL DELTA;Lm;0;L;<super> 03B4;;;;N;;;;;
-1D60;MODIFIER LETTER SMALL GREEK PHI;Lm;0;L;<super> 03C6;;;;N;;;;;
-1D61;MODIFIER LETTER SMALL CHI;Lm;0;L;<super> 03C7;;;;N;;;;;
-1D62;LATIN SUBSCRIPT SMALL LETTER I;Ll;0;L;<sub> 0069;;;;N;;;;;
-1D63;LATIN SUBSCRIPT SMALL LETTER R;Ll;0;L;<sub> 0072;;;;N;;;;;
-1D64;LATIN SUBSCRIPT SMALL LETTER U;Ll;0;L;<sub> 0075;;;;N;;;;;
-1D65;LATIN SUBSCRIPT SMALL LETTER V;Ll;0;L;<sub> 0076;;;;N;;;;;
-1D66;GREEK SUBSCRIPT SMALL LETTER BETA;Ll;0;L;<sub> 03B2;;;;N;;;;;
-1D67;GREEK SUBSCRIPT SMALL LETTER GAMMA;Ll;0;L;<sub> 03B3;;;;N;;;;;
-1D68;GREEK SUBSCRIPT SMALL LETTER RHO;Ll;0;L;<sub> 03C1;;;;N;;;;;
-1D69;GREEK SUBSCRIPT SMALL LETTER PHI;Ll;0;L;<sub> 03C6;;;;N;;;;;
-1D6A;GREEK SUBSCRIPT SMALL LETTER CHI;Ll;0;L;<sub> 03C7;;;;N;;;;;
-1D6B;LATIN SMALL LETTER UE;Ll;0;L;;;;;N;;;;;
-1D6C;LATIN SMALL LETTER B WITH MIDDLE TILDE;Ll;0;L;;;;;N;;;;;
-1D6D;LATIN SMALL LETTER D WITH MIDDLE TILDE;Ll;0;L;;;;;N;;;;;
-1D6E;LATIN SMALL LETTER F WITH MIDDLE TILDE;Ll;0;L;;;;;N;;;;;
-1D6F;LATIN SMALL LETTER M WITH MIDDLE TILDE;Ll;0;L;;;;;N;;;;;
-1D70;LATIN SMALL LETTER N WITH MIDDLE TILDE;Ll;0;L;;;;;N;;;;;
-1D71;LATIN SMALL LETTER P WITH MIDDLE TILDE;Ll;0;L;;;;;N;;;;;
-1D72;LATIN SMALL LETTER R WITH MIDDLE TILDE;Ll;0;L;;;;;N;;;;;
-1D73;LATIN SMALL LETTER R WITH FISHHOOK AND MIDDLE TILDE;Ll;0;L;;;;;N;;;;;
-1D74;LATIN SMALL LETTER S WITH MIDDLE TILDE;Ll;0;L;;;;;N;;;;;
-1D75;LATIN SMALL LETTER T WITH MIDDLE TILDE;Ll;0;L;;;;;N;;;;;
-1D76;LATIN SMALL LETTER Z WITH MIDDLE TILDE;Ll;0;L;;;;;N;;;;;
-1D77;LATIN SMALL LETTER TURNED G;Ll;0;L;;;;;N;;;;;
-1D78;MODIFIER LETTER CYRILLIC EN;Lm;0;L;<super> 043D;;;;N;;;;;
-1D79;LATIN SMALL LETTER INSULAR G;Ll;0;L;;;;;N;;;A77D;;A77D
-1D7A;LATIN SMALL LETTER TH WITH STRIKETHROUGH;Ll;0;L;;;;;N;;;;;
-1D7B;LATIN SMALL CAPITAL LETTER I WITH STROKE;Ll;0;L;;;;;N;;;;;
-1D7C;LATIN SMALL LETTER IOTA WITH STROKE;Ll;0;L;;;;;N;;;;;
-1D7D;LATIN SMALL LETTER P WITH STROKE;Ll;0;L;;;;;N;;;2C63;;2C63
-1D7E;LATIN SMALL CAPITAL LETTER U WITH STROKE;Ll;0;L;;;;;N;;;;;
-1D7F;LATIN SMALL LETTER UPSILON WITH STROKE;Ll;0;L;;;;;N;;;;;
-1D80;LATIN SMALL LETTER B WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
-1D81;LATIN SMALL LETTER D WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
-1D82;LATIN SMALL LETTER F WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
-1D83;LATIN SMALL LETTER G WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
-1D84;LATIN SMALL LETTER K WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
-1D85;LATIN SMALL LETTER L WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
-1D86;LATIN SMALL LETTER M WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
-1D87;LATIN SMALL LETTER N WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
-1D88;LATIN SMALL LETTER P WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
-1D89;LATIN SMALL LETTER R WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
-1D8A;LATIN SMALL LETTER S WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
-1D8B;LATIN SMALL LETTER ESH WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
-1D8C;LATIN SMALL LETTER V WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
-1D8D;LATIN SMALL LETTER X WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
-1D8E;LATIN SMALL LETTER Z WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
-1D8F;LATIN SMALL LETTER A WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;;
-1D90;LATIN SMALL LETTER ALPHA WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;;
-1D91;LATIN SMALL LETTER D WITH HOOK AND TAIL;Ll;0;L;;;;;N;;;;;
-1D92;LATIN SMALL LETTER E WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;;
-1D93;LATIN SMALL LETTER OPEN E WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;;
-1D94;LATIN SMALL LETTER REVERSED OPEN E WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;;
-1D95;LATIN SMALL LETTER SCHWA WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;;
-1D96;LATIN SMALL LETTER I WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;;
-1D97;LATIN SMALL LETTER OPEN O WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;;
-1D98;LATIN SMALL LETTER ESH WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;;
-1D99;LATIN SMALL LETTER U WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;;
-1D9A;LATIN SMALL LETTER EZH WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;;
-1D9B;MODIFIER LETTER SMALL TURNED ALPHA;Lm;0;L;<super> 0252;;;;N;;;;;
-1D9C;MODIFIER LETTER SMALL C;Lm;0;L;<super> 0063;;;;N;;;;;
-1D9D;MODIFIER LETTER SMALL C WITH CURL;Lm;0;L;<super> 0255;;;;N;;;;;
-1D9E;MODIFIER LETTER SMALL ETH;Lm;0;L;<super> 00F0;;;;N;;;;;
-1D9F;MODIFIER LETTER SMALL REVERSED OPEN E;Lm;0;L;<super> 025C;;;;N;;;;;
-1DA0;MODIFIER LETTER SMALL F;Lm;0;L;<super> 0066;;;;N;;;;;
-1DA1;MODIFIER LETTER SMALL DOTLESS J WITH STROKE;Lm;0;L;<super> 025F;;;;N;;;;;
-1DA2;MODIFIER LETTER SMALL SCRIPT G;Lm;0;L;<super> 0261;;;;N;;;;;
-1DA3;MODIFIER LETTER SMALL TURNED H;Lm;0;L;<super> 0265;;;;N;;;;;
-1DA4;MODIFIER LETTER SMALL I WITH STROKE;Lm;0;L;<super> 0268;;;;N;;;;;
-1DA5;MODIFIER LETTER SMALL IOTA;Lm;0;L;<super> 0269;;;;N;;;;;
-1DA6;MODIFIER LETTER SMALL CAPITAL I;Lm;0;L;<super> 026A;;;;N;;;;;
-1DA7;MODIFIER LETTER SMALL CAPITAL I WITH STROKE;Lm;0;L;<super> 1D7B;;;;N;;;;;
-1DA8;MODIFIER LETTER SMALL J WITH CROSSED-TAIL;Lm;0;L;<super> 029D;;;;N;;;;;
-1DA9;MODIFIER LETTER SMALL L WITH RETROFLEX HOOK;Lm;0;L;<super> 026D;;;;N;;;;;
-1DAA;MODIFIER LETTER SMALL L WITH PALATAL HOOK;Lm;0;L;<super> 1D85;;;;N;;;;;
-1DAB;MODIFIER LETTER SMALL CAPITAL L;Lm;0;L;<super> 029F;;;;N;;;;;
-1DAC;MODIFIER LETTER SMALL M WITH HOOK;Lm;0;L;<super> 0271;;;;N;;;;;
-1DAD;MODIFIER LETTER SMALL TURNED M WITH LONG LEG;Lm;0;L;<super> 0270;;;;N;;;;;
-1DAE;MODIFIER LETTER SMALL N WITH LEFT HOOK;Lm;0;L;<super> 0272;;;;N;;;;;
-1DAF;MODIFIER LETTER SMALL N WITH RETROFLEX HOOK;Lm;0;L;<super> 0273;;;;N;;;;;
-1DB0;MODIFIER LETTER SMALL CAPITAL N;Lm;0;L;<super> 0274;;;;N;;;;;
-1DB1;MODIFIER LETTER SMALL BARRED O;Lm;0;L;<super> 0275;;;;N;;;;;
-1DB2;MODIFIER LETTER SMALL PHI;Lm;0;L;<super> 0278;;;;N;;;;;
-1DB3;MODIFIER LETTER SMALL S WITH HOOK;Lm;0;L;<super> 0282;;;;N;;;;;
-1DB4;MODIFIER LETTER SMALL ESH;Lm;0;L;<super> 0283;;;;N;;;;;
-1DB5;MODIFIER LETTER SMALL T WITH PALATAL HOOK;Lm;0;L;<super> 01AB;;;;N;;;;;
-1DB6;MODIFIER LETTER SMALL U BAR;Lm;0;L;<super> 0289;;;;N;;;;;
-1DB7;MODIFIER LETTER SMALL UPSILON;Lm;0;L;<super> 028A;;;;N;;;;;
-1DB8;MODIFIER LETTER SMALL CAPITAL U;Lm;0;L;<super> 1D1C;;;;N;;;;;
-1DB9;MODIFIER LETTER SMALL V WITH HOOK;Lm;0;L;<super> 028B;;;;N;;;;;
-1DBA;MODIFIER LETTER SMALL TURNED V;Lm;0;L;<super> 028C;;;;N;;;;;
-1DBB;MODIFIER LETTER SMALL Z;Lm;0;L;<super> 007A;;;;N;;;;;
-1DBC;MODIFIER LETTER SMALL Z WITH RETROFLEX HOOK;Lm;0;L;<super> 0290;;;;N;;;;;
-1DBD;MODIFIER LETTER SMALL Z WITH CURL;Lm;0;L;<super> 0291;;;;N;;;;;
-1DBE;MODIFIER LETTER SMALL EZH;Lm;0;L;<super> 0292;;;;N;;;;;
-1DBF;MODIFIER LETTER SMALL THETA;Lm;0;L;<super> 03B8;;;;N;;;;;
-1DC0;COMBINING DOTTED GRAVE ACCENT;Mn;230;NSM;;;;;N;;;;;
-1DC1;COMBINING DOTTED ACUTE ACCENT;Mn;230;NSM;;;;;N;;;;;
-1DC2;COMBINING SNAKE BELOW;Mn;220;NSM;;;;;N;;;;;
-1DC3;COMBINING SUSPENSION MARK;Mn;230;NSM;;;;;N;;;;;
-1DC4;COMBINING MACRON-ACUTE;Mn;230;NSM;;;;;N;;;;;
-1DC5;COMBINING GRAVE-MACRON;Mn;230;NSM;;;;;N;;;;;
-1DC6;COMBINING MACRON-GRAVE;Mn;230;NSM;;;;;N;;;;;
-1DC7;COMBINING ACUTE-MACRON;Mn;230;NSM;;;;;N;;;;;
-1DC8;COMBINING GRAVE-ACUTE-GRAVE;Mn;230;NSM;;;;;N;;;;;
-1DC9;COMBINING ACUTE-GRAVE-ACUTE;Mn;230;NSM;;;;;N;;;;;
-1DCA;COMBINING LATIN SMALL LETTER R BELOW;Mn;220;NSM;;;;;N;;;;;
-1DCB;COMBINING BREVE-MACRON;Mn;230;NSM;;;;;N;;;;;
-1DCC;COMBINING MACRON-BREVE;Mn;230;NSM;;;;;N;;;;;
-1DCD;COMBINING DOUBLE CIRCUMFLEX ABOVE;Mn;234;NSM;;;;;N;;;;;
-1DCE;COMBINING OGONEK ABOVE;Mn;214;NSM;;;;;N;;;;;
-1DCF;COMBINING ZIGZAG BELOW;Mn;220;NSM;;;;;N;;;;;
-1DD0;COMBINING IS BELOW;Mn;202;NSM;;;;;N;;;;;
-1DD1;COMBINING UR ABOVE;Mn;230;NSM;;;;;N;;;;;
-1DD2;COMBINING US ABOVE;Mn;230;NSM;;;;;N;;;;;
-1DD3;COMBINING LATIN SMALL LETTER FLATTENED OPEN A ABOVE;Mn;230;NSM;;;;;N;;;;;
-1DD4;COMBINING LATIN SMALL LETTER AE;Mn;230;NSM;;;;;N;;;;;
-1DD5;COMBINING LATIN SMALL LETTER AO;Mn;230;NSM;;;;;N;;;;;
-1DD6;COMBINING LATIN SMALL LETTER AV;Mn;230;NSM;;;;;N;;;;;
-1DD7;COMBINING LATIN SMALL LETTER C CEDILLA;Mn;230;NSM;;;;;N;;;;;
-1DD8;COMBINING LATIN SMALL LETTER INSULAR D;Mn;230;NSM;;;;;N;;;;;
-1DD9;COMBINING LATIN SMALL LETTER ETH;Mn;230;NSM;;;;;N;;;;;
-1DDA;COMBINING LATIN SMALL LETTER G;Mn;230;NSM;;;;;N;;;;;
-1DDB;COMBINING LATIN LETTER SMALL CAPITAL G;Mn;230;NSM;;;;;N;;;;;
-1DDC;COMBINING LATIN SMALL LETTER K;Mn;230;NSM;;;;;N;;;;;
-1DDD;COMBINING LATIN SMALL LETTER L;Mn;230;NSM;;;;;N;;;;;
-1DDE;COMBINING LATIN LETTER SMALL CAPITAL L;Mn;230;NSM;;;;;N;;;;;
-1DDF;COMBINING LATIN LETTER SMALL CAPITAL M;Mn;230;NSM;;;;;N;;;;;
-1DE0;COMBINING LATIN SMALL LETTER N;Mn;230;NSM;;;;;N;;;;;
-1DE1;COMBINING LATIN LETTER SMALL CAPITAL N;Mn;230;NSM;;;;;N;;;;;
-1DE2;COMBINING LATIN LETTER SMALL CAPITAL R;Mn;230;NSM;;;;;N;;;;;
-1DE3;COMBINING LATIN SMALL LETTER R ROTUNDA;Mn;230;NSM;;;;;N;;;;;
-1DE4;COMBINING LATIN SMALL LETTER S;Mn;230;NSM;;;;;N;;;;;
-1DE5;COMBINING LATIN SMALL LETTER LONG S;Mn;230;NSM;;;;;N;;;;;
-1DE6;COMBINING LATIN SMALL LETTER Z;Mn;230;NSM;;;;;N;;;;;
-1DFE;COMBINING LEFT ARROWHEAD ABOVE;Mn;230;NSM;;;;;N;;;;;
-1DFF;COMBINING RIGHT ARROWHEAD AND DOWN ARROWHEAD BELOW;Mn;220;NSM;;;;;N;;;;;
-1E00;LATIN CAPITAL LETTER A WITH RING BELOW;Lu;0;L;0041 0325;;;;N;;;;1E01;
-1E01;LATIN SMALL LETTER A WITH RING BELOW;Ll;0;L;0061 0325;;;;N;;;1E00;;1E00
-1E02;LATIN CAPITAL LETTER B WITH DOT ABOVE;Lu;0;L;0042 0307;;;;N;;;;1E03;
-1E03;LATIN SMALL LETTER B WITH DOT ABOVE;Ll;0;L;0062 0307;;;;N;;;1E02;;1E02
-1E04;LATIN CAPITAL LETTER B WITH DOT BELOW;Lu;0;L;0042 0323;;;;N;;;;1E05;
-1E05;LATIN SMALL LETTER B WITH DOT BELOW;Ll;0;L;0062 0323;;;;N;;;1E04;;1E04
-1E06;LATIN CAPITAL LETTER B WITH LINE BELOW;Lu;0;L;0042 0331;;;;N;;;;1E07;
-1E07;LATIN SMALL LETTER B WITH LINE BELOW;Ll;0;L;0062 0331;;;;N;;;1E06;;1E06
-1E08;LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE;Lu;0;L;00C7 0301;;;;N;;;;1E09;
-1E09;LATIN SMALL LETTER C WITH CEDILLA AND ACUTE;Ll;0;L;00E7 0301;;;;N;;;1E08;;1E08
-1E0A;LATIN CAPITAL LETTER D WITH DOT ABOVE;Lu;0;L;0044 0307;;;;N;;;;1E0B;
-1E0B;LATIN SMALL LETTER D WITH DOT ABOVE;Ll;0;L;0064 0307;;;;N;;;1E0A;;1E0A
-1E0C;LATIN CAPITAL LETTER D WITH DOT BELOW;Lu;0;L;0044 0323;;;;N;;;;1E0D;
-1E0D;LATIN SMALL LETTER D WITH DOT BELOW;Ll;0;L;0064 0323;;;;N;;;1E0C;;1E0C
-1E0E;LATIN CAPITAL LETTER D WITH LINE BELOW;Lu;0;L;0044 0331;;;;N;;;;1E0F;
-1E0F;LATIN SMALL LETTER D WITH LINE BELOW;Ll;0;L;0064 0331;;;;N;;;1E0E;;1E0E
-1E10;LATIN CAPITAL LETTER D WITH CEDILLA;Lu;0;L;0044 0327;;;;N;;;;1E11;
-1E11;LATIN SMALL LETTER D WITH CEDILLA;Ll;0;L;0064 0327;;;;N;;;1E10;;1E10
-1E12;LATIN CAPITAL LETTER D WITH CIRCUMFLEX BELOW;Lu;0;L;0044 032D;;;;N;;;;1E13;
-1E13;LATIN SMALL LETTER D WITH CIRCUMFLEX BELOW;Ll;0;L;0064 032D;;;;N;;;1E12;;1E12
-1E14;LATIN CAPITAL LETTER E WITH MACRON AND GRAVE;Lu;0;L;0112 0300;;;;N;;;;1E15;
-1E15;LATIN SMALL LETTER E WITH MACRON AND GRAVE;Ll;0;L;0113 0300;;;;N;;;1E14;;1E14
-1E16;LATIN CAPITAL LETTER E WITH MACRON AND ACUTE;Lu;0;L;0112 0301;;;;N;;;;1E17;
-1E17;LATIN SMALL LETTER E WITH MACRON AND ACUTE;Ll;0;L;0113 0301;;;;N;;;1E16;;1E16
-1E18;LATIN CAPITAL LETTER E WITH CIRCUMFLEX BELOW;Lu;0;L;0045 032D;;;;N;;;;1E19;
-1E19;LATIN SMALL LETTER E WITH CIRCUMFLEX BELOW;Ll;0;L;0065 032D;;;;N;;;1E18;;1E18
-1E1A;LATIN CAPITAL LETTER E WITH TILDE BELOW;Lu;0;L;0045 0330;;;;N;;;;1E1B;
-1E1B;LATIN SMALL LETTER E WITH TILDE BELOW;Ll;0;L;0065 0330;;;;N;;;1E1A;;1E1A
-1E1C;LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE;Lu;0;L;0228 0306;;;;N;;;;1E1D;
-1E1D;LATIN SMALL LETTER E WITH CEDILLA AND BREVE;Ll;0;L;0229 0306;;;;N;;;1E1C;;1E1C
-1E1E;LATIN CAPITAL LETTER F WITH DOT ABOVE;Lu;0;L;0046 0307;;;;N;;;;1E1F;
-1E1F;LATIN SMALL LETTER F WITH DOT ABOVE;Ll;0;L;0066 0307;;;;N;;;1E1E;;1E1E
-1E20;LATIN CAPITAL LETTER G WITH MACRON;Lu;0;L;0047 0304;;;;N;;;;1E21;
-1E21;LATIN SMALL LETTER G WITH MACRON;Ll;0;L;0067 0304;;;;N;;;1E20;;1E20
-1E22;LATIN CAPITAL LETTER H WITH DOT ABOVE;Lu;0;L;0048 0307;;;;N;;;;1E23;
-1E23;LATIN SMALL LETTER H WITH DOT ABOVE;Ll;0;L;0068 0307;;;;N;;;1E22;;1E22
-1E24;LATIN CAPITAL LETTER H WITH DOT BELOW;Lu;0;L;0048 0323;;;;N;;;;1E25;
-1E25;LATIN SMALL LETTER H WITH DOT BELOW;Ll;0;L;0068 0323;;;;N;;;1E24;;1E24
-1E26;LATIN CAPITAL LETTER H WITH DIAERESIS;Lu;0;L;0048 0308;;;;N;;;;1E27;
-1E27;LATIN SMALL LETTER H WITH DIAERESIS;Ll;0;L;0068 0308;;;;N;;;1E26;;1E26
-1E28;LATIN CAPITAL LETTER H WITH CEDILLA;Lu;0;L;0048 0327;;;;N;;;;1E29;
-1E29;LATIN SMALL LETTER H WITH CEDILLA;Ll;0;L;0068 0327;;;;N;;;1E28;;1E28
-1E2A;LATIN CAPITAL LETTER H WITH BREVE BELOW;Lu;0;L;0048 032E;;;;N;;;;1E2B;
-1E2B;LATIN SMALL LETTER H WITH BREVE BELOW;Ll;0;L;0068 032E;;;;N;;;1E2A;;1E2A
-1E2C;LATIN CAPITAL LETTER I WITH TILDE BELOW;Lu;0;L;0049 0330;;;;N;;;;1E2D;
-1E2D;LATIN SMALL LETTER I WITH TILDE BELOW;Ll;0;L;0069 0330;;;;N;;;1E2C;;1E2C
-1E2E;LATIN CAPITAL LETTER I WITH DIAERESIS AND ACUTE;Lu;0;L;00CF 0301;;;;N;;;;1E2F;
-1E2F;LATIN SMALL LETTER I WITH DIAERESIS AND ACUTE;Ll;0;L;00EF 0301;;;;N;;;1E2E;;1E2E
-1E30;LATIN CAPITAL LETTER K WITH ACUTE;Lu;0;L;004B 0301;;;;N;;;;1E31;
-1E31;LATIN SMALL LETTER K WITH ACUTE;Ll;0;L;006B 0301;;;;N;;;1E30;;1E30
-1E32;LATIN CAPITAL LETTER K WITH DOT BELOW;Lu;0;L;004B 0323;;;;N;;;;1E33;
-1E33;LATIN SMALL LETTER K WITH DOT BELOW;Ll;0;L;006B 0323;;;;N;;;1E32;;1E32
-1E34;LATIN CAPITAL LETTER K WITH LINE BELOW;Lu;0;L;004B 0331;;;;N;;;;1E35;
-1E35;LATIN SMALL LETTER K WITH LINE BELOW;Ll;0;L;006B 0331;;;;N;;;1E34;;1E34
-1E36;LATIN CAPITAL LETTER L WITH DOT BELOW;Lu;0;L;004C 0323;;;;N;;;;1E37;
-1E37;LATIN SMALL LETTER L WITH DOT BELOW;Ll;0;L;006C 0323;;;;N;;;1E36;;1E36
-1E38;LATIN CAPITAL LETTER L WITH DOT BELOW AND MACRON;Lu;0;L;1E36 0304;;;;N;;;;1E39;
-1E39;LATIN SMALL LETTER L WITH DOT BELOW AND MACRON;Ll;0;L;1E37 0304;;;;N;;;1E38;;1E38
-1E3A;LATIN CAPITAL LETTER L WITH LINE BELOW;Lu;0;L;004C 0331;;;;N;;;;1E3B;
-1E3B;LATIN SMALL LETTER L WITH LINE BELOW;Ll;0;L;006C 0331;;;;N;;;1E3A;;1E3A
-1E3C;LATIN CAPITAL LETTER L WITH CIRCUMFLEX BELOW;Lu;0;L;004C 032D;;;;N;;;;1E3D;
-1E3D;LATIN SMALL LETTER L WITH CIRCUMFLEX BELOW;Ll;0;L;006C 032D;;;;N;;;1E3C;;1E3C
-1E3E;LATIN CAPITAL LETTER M WITH ACUTE;Lu;0;L;004D 0301;;;;N;;;;1E3F;
-1E3F;LATIN SMALL LETTER M WITH ACUTE;Ll;0;L;006D 0301;;;;N;;;1E3E;;1E3E
-1E40;LATIN CAPITAL LETTER M WITH DOT ABOVE;Lu;0;L;004D 0307;;;;N;;;;1E41;
-1E41;LATIN SMALL LETTER M WITH DOT ABOVE;Ll;0;L;006D 0307;;;;N;;;1E40;;1E40
-1E42;LATIN CAPITAL LETTER M WITH DOT BELOW;Lu;0;L;004D 0323;;;;N;;;;1E43;
-1E43;LATIN SMALL LETTER M WITH DOT BELOW;Ll;0;L;006D 0323;;;;N;;;1E42;;1E42
-1E44;LATIN CAPITAL LETTER N WITH DOT ABOVE;Lu;0;L;004E 0307;;;;N;;;;1E45;
-1E45;LATIN SMALL LETTER N WITH DOT ABOVE;Ll;0;L;006E 0307;;;;N;;;1E44;;1E44
-1E46;LATIN CAPITAL LETTER N WITH DOT BELOW;Lu;0;L;004E 0323;;;;N;;;;1E47;
-1E47;LATIN SMALL LETTER N WITH DOT BELOW;Ll;0;L;006E 0323;;;;N;;;1E46;;1E46
-1E48;LATIN CAPITAL LETTER N WITH LINE BELOW;Lu;0;L;004E 0331;;;;N;;;;1E49;
-1E49;LATIN SMALL LETTER N WITH LINE BELOW;Ll;0;L;006E 0331;;;;N;;;1E48;;1E48
-1E4A;LATIN CAPITAL LETTER N WITH CIRCUMFLEX BELOW;Lu;0;L;004E 032D;;;;N;;;;1E4B;
-1E4B;LATIN SMALL LETTER N WITH CIRCUMFLEX BELOW;Ll;0;L;006E 032D;;;;N;;;1E4A;;1E4A
-1E4C;LATIN CAPITAL LETTER O WITH TILDE AND ACUTE;Lu;0;L;00D5 0301;;;;N;;;;1E4D;
-1E4D;LATIN SMALL LETTER O WITH TILDE AND ACUTE;Ll;0;L;00F5 0301;;;;N;;;1E4C;;1E4C
-1E4E;LATIN CAPITAL LETTER O WITH TILDE AND DIAERESIS;Lu;0;L;00D5 0308;;;;N;;;;1E4F;
-1E4F;LATIN SMALL LETTER O WITH TILDE AND DIAERESIS;Ll;0;L;00F5 0308;;;;N;;;1E4E;;1E4E
-1E50;LATIN CAPITAL LETTER O WITH MACRON AND GRAVE;Lu;0;L;014C 0300;;;;N;;;;1E51;
-1E51;LATIN SMALL LETTER O WITH MACRON AND GRAVE;Ll;0;L;014D 0300;;;;N;;;1E50;;1E50
-1E52;LATIN CAPITAL LETTER O WITH MACRON AND ACUTE;Lu;0;L;014C 0301;;;;N;;;;1E53;
-1E53;LATIN SMALL LETTER O WITH MACRON AND ACUTE;Ll;0;L;014D 0301;;;;N;;;1E52;;1E52
-1E54;LATIN CAPITAL LETTER P WITH ACUTE;Lu;0;L;0050 0301;;;;N;;;;1E55;
-1E55;LATIN SMALL LETTER P WITH ACUTE;Ll;0;L;0070 0301;;;;N;;;1E54;;1E54
-1E56;LATIN CAPITAL LETTER P WITH DOT ABOVE;Lu;0;L;0050 0307;;;;N;;;;1E57;
-1E57;LATIN SMALL LETTER P WITH DOT ABOVE;Ll;0;L;0070 0307;;;;N;;;1E56;;1E56
-1E58;LATIN CAPITAL LETTER R WITH DOT ABOVE;Lu;0;L;0052 0307;;;;N;;;;1E59;
-1E59;LATIN SMALL LETTER R WITH DOT ABOVE;Ll;0;L;0072 0307;;;;N;;;1E58;;1E58
-1E5A;LATIN CAPITAL LETTER R WITH DOT BELOW;Lu;0;L;0052 0323;;;;N;;;;1E5B;
-1E5B;LATIN SMALL LETTER R WITH DOT BELOW;Ll;0;L;0072 0323;;;;N;;;1E5A;;1E5A
-1E5C;LATIN CAPITAL LETTER R WITH DOT BELOW AND MACRON;Lu;0;L;1E5A 0304;;;;N;;;;1E5D;
-1E5D;LATIN SMALL LETTER R WITH DOT BELOW AND MACRON;Ll;0;L;1E5B 0304;;;;N;;;1E5C;;1E5C
-1E5E;LATIN CAPITAL LETTER R WITH LINE BELOW;Lu;0;L;0052 0331;;;;N;;;;1E5F;
-1E5F;LATIN SMALL LETTER R WITH LINE BELOW;Ll;0;L;0072 0331;;;;N;;;1E5E;;1E5E
-1E60;LATIN CAPITAL LETTER S WITH DOT ABOVE;Lu;0;L;0053 0307;;;;N;;;;1E61;
-1E61;LATIN SMALL LETTER S WITH DOT ABOVE;Ll;0;L;0073 0307;;;;N;;;1E60;;1E60
-1E62;LATIN CAPITAL LETTER S WITH DOT BELOW;Lu;0;L;0053 0323;;;;N;;;;1E63;
-1E63;LATIN SMALL LETTER S WITH DOT BELOW;Ll;0;L;0073 0323;;;;N;;;1E62;;1E62
-1E64;LATIN CAPITAL LETTER S WITH ACUTE AND DOT ABOVE;Lu;0;L;015A 0307;;;;N;;;;1E65;
-1E65;LATIN SMALL LETTER S WITH ACUTE AND DOT ABOVE;Ll;0;L;015B 0307;;;;N;;;1E64;;1E64
-1E66;LATIN CAPITAL LETTER S WITH CARON AND DOT ABOVE;Lu;0;L;0160 0307;;;;N;;;;1E67;
-1E67;LATIN SMALL LETTER S WITH CARON AND DOT ABOVE;Ll;0;L;0161 0307;;;;N;;;1E66;;1E66
-1E68;LATIN CAPITAL LETTER S WITH DOT BELOW AND DOT ABOVE;Lu;0;L;1E62 0307;;;;N;;;;1E69;
-1E69;LATIN SMALL LETTER S WITH DOT BELOW AND DOT ABOVE;Ll;0;L;1E63 0307;;;;N;;;1E68;;1E68
-1E6A;LATIN CAPITAL LETTER T WITH DOT ABOVE;Lu;0;L;0054 0307;;;;N;;;;1E6B;
-1E6B;LATIN SMALL LETTER T WITH DOT ABOVE;Ll;0;L;0074 0307;;;;N;;;1E6A;;1E6A
-1E6C;LATIN CAPITAL LETTER T WITH DOT BELOW;Lu;0;L;0054 0323;;;;N;;;;1E6D;
-1E6D;LATIN SMALL LETTER T WITH DOT BELOW;Ll;0;L;0074 0323;;;;N;;;1E6C;;1E6C
-1E6E;LATIN CAPITAL LETTER T WITH LINE BELOW;Lu;0;L;0054 0331;;;;N;;;;1E6F;
-1E6F;LATIN SMALL LETTER T WITH LINE BELOW;Ll;0;L;0074 0331;;;;N;;;1E6E;;1E6E
-1E70;LATIN CAPITAL LETTER T WITH CIRCUMFLEX BELOW;Lu;0;L;0054 032D;;;;N;;;;1E71;
-1E71;LATIN SMALL LETTER T WITH CIRCUMFLEX BELOW;Ll;0;L;0074 032D;;;;N;;;1E70;;1E70
-1E72;LATIN CAPITAL LETTER U WITH DIAERESIS BELOW;Lu;0;L;0055 0324;;;;N;;;;1E73;
-1E73;LATIN SMALL LETTER U WITH DIAERESIS BELOW;Ll;0;L;0075 0324;;;;N;;;1E72;;1E72
-1E74;LATIN CAPITAL LETTER U WITH TILDE BELOW;Lu;0;L;0055 0330;;;;N;;;;1E75;
-1E75;LATIN SMALL LETTER U WITH TILDE BELOW;Ll;0;L;0075 0330;;;;N;;;1E74;;1E74
-1E76;LATIN CAPITAL LETTER U WITH CIRCUMFLEX BELOW;Lu;0;L;0055 032D;;;;N;;;;1E77;
-1E77;LATIN SMALL LETTER U WITH CIRCUMFLEX BELOW;Ll;0;L;0075 032D;;;;N;;;1E76;;1E76
-1E78;LATIN CAPITAL LETTER U WITH TILDE AND ACUTE;Lu;0;L;0168 0301;;;;N;;;;1E79;
-1E79;LATIN SMALL LETTER U WITH TILDE AND ACUTE;Ll;0;L;0169 0301;;;;N;;;1E78;;1E78
-1E7A;LATIN CAPITAL LETTER U WITH MACRON AND DIAERESIS;Lu;0;L;016A 0308;;;;N;;;;1E7B;
-1E7B;LATIN SMALL LETTER U WITH MACRON AND DIAERESIS;Ll;0;L;016B 0308;;;;N;;;1E7A;;1E7A
-1E7C;LATIN CAPITAL LETTER V WITH TILDE;Lu;0;L;0056 0303;;;;N;;;;1E7D;
-1E7D;LATIN SMALL LETTER V WITH TILDE;Ll;0;L;0076 0303;;;;N;;;1E7C;;1E7C
-1E7E;LATIN CAPITAL LETTER V WITH DOT BELOW;Lu;0;L;0056 0323;;;;N;;;;1E7F;
-1E7F;LATIN SMALL LETTER V WITH DOT BELOW;Ll;0;L;0076 0323;;;;N;;;1E7E;;1E7E
-1E80;LATIN CAPITAL LETTER W WITH GRAVE;Lu;0;L;0057 0300;;;;N;;;;1E81;
-1E81;LATIN SMALL LETTER W WITH GRAVE;Ll;0;L;0077 0300;;;;N;;;1E80;;1E80
-1E82;LATIN CAPITAL LETTER W WITH ACUTE;Lu;0;L;0057 0301;;;;N;;;;1E83;
-1E83;LATIN SMALL LETTER W WITH ACUTE;Ll;0;L;0077 0301;;;;N;;;1E82;;1E82
-1E84;LATIN CAPITAL LETTER W WITH DIAERESIS;Lu;0;L;0057 0308;;;;N;;;;1E85;
-1E85;LATIN SMALL LETTER W WITH DIAERESIS;Ll;0;L;0077 0308;;;;N;;;1E84;;1E84
-1E86;LATIN CAPITAL LETTER W WITH DOT ABOVE;Lu;0;L;0057 0307;;;;N;;;;1E87;
-1E87;LATIN SMALL LETTER W WITH DOT ABOVE;Ll;0;L;0077 0307;;;;N;;;1E86;;1E86
-1E88;LATIN CAPITAL LETTER W WITH DOT BELOW;Lu;0;L;0057 0323;;;;N;;;;1E89;
-1E89;LATIN SMALL LETTER W WITH DOT BELOW;Ll;0;L;0077 0323;;;;N;;;1E88;;1E88
-1E8A;LATIN CAPITAL LETTER X WITH DOT ABOVE;Lu;0;L;0058 0307;;;;N;;;;1E8B;
-1E8B;LATIN SMALL LETTER X WITH DOT ABOVE;Ll;0;L;0078 0307;;;;N;;;1E8A;;1E8A
-1E8C;LATIN CAPITAL LETTER X WITH DIAERESIS;Lu;0;L;0058 0308;;;;N;;;;1E8D;
-1E8D;LATIN SMALL LETTER X WITH DIAERESIS;Ll;0;L;0078 0308;;;;N;;;1E8C;;1E8C
-1E8E;LATIN CAPITAL LETTER Y WITH DOT ABOVE;Lu;0;L;0059 0307;;;;N;;;;1E8F;
-1E8F;LATIN SMALL LETTER Y WITH DOT ABOVE;Ll;0;L;0079 0307;;;;N;;;1E8E;;1E8E
-1E90;LATIN CAPITAL LETTER Z WITH CIRCUMFLEX;Lu;0;L;005A 0302;;;;N;;;;1E91;
-1E91;LATIN SMALL LETTER Z WITH CIRCUMFLEX;Ll;0;L;007A 0302;;;;N;;;1E90;;1E90
-1E92;LATIN CAPITAL LETTER Z WITH DOT BELOW;Lu;0;L;005A 0323;;;;N;;;;1E93;
-1E93;LATIN SMALL LETTER Z WITH DOT BELOW;Ll;0;L;007A 0323;;;;N;;;1E92;;1E92
-1E94;LATIN CAPITAL LETTER Z WITH LINE BELOW;Lu;0;L;005A 0331;;;;N;;;;1E95;
-1E95;LATIN SMALL LETTER Z WITH LINE BELOW;Ll;0;L;007A 0331;;;;N;;;1E94;;1E94
-1E96;LATIN SMALL LETTER H WITH LINE BELOW;Ll;0;L;0068 0331;;;;N;;;;;
-1E97;LATIN SMALL LETTER T WITH DIAERESIS;Ll;0;L;0074 0308;;;;N;;;;;
-1E98;LATIN SMALL LETTER W WITH RING ABOVE;Ll;0;L;0077 030A;;;;N;;;;;
-1E99;LATIN SMALL LETTER Y WITH RING ABOVE;Ll;0;L;0079 030A;;;;N;;;;;
-1E9A;LATIN SMALL LETTER A WITH RIGHT HALF RING;Ll;0;L;<compat> 0061 02BE;;;;N;;;;;
-1E9B;LATIN SMALL LETTER LONG S WITH DOT ABOVE;Ll;0;L;017F 0307;;;;N;;;1E60;;1E60
-1E9C;LATIN SMALL LETTER LONG S WITH DIAGONAL STROKE;Ll;0;L;;;;;N;;;;;
-1E9D;LATIN SMALL LETTER LONG S WITH HIGH STROKE;Ll;0;L;;;;;N;;;;;
-1E9E;LATIN CAPITAL LETTER SHARP S;Lu;0;L;;;;;N;;;;00DF;
-1E9F;LATIN SMALL LETTER DELTA;Ll;0;L;;;;;N;;;;;
-1EA0;LATIN CAPITAL LETTER A WITH DOT BELOW;Lu;0;L;0041 0323;;;;N;;;;1EA1;
-1EA1;LATIN SMALL LETTER A WITH DOT BELOW;Ll;0;L;0061 0323;;;;N;;;1EA0;;1EA0
-1EA2;LATIN CAPITAL LETTER A WITH HOOK ABOVE;Lu;0;L;0041 0309;;;;N;;;;1EA3;
-1EA3;LATIN SMALL LETTER A WITH HOOK ABOVE;Ll;0;L;0061 0309;;;;N;;;1EA2;;1EA2
-1EA4;LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE;Lu;0;L;00C2 0301;;;;N;;;;1EA5;
-1EA5;LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE;Ll;0;L;00E2 0301;;;;N;;;1EA4;;1EA4
-1EA6;LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE;Lu;0;L;00C2 0300;;;;N;;;;1EA7;
-1EA7;LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE;Ll;0;L;00E2 0300;;;;N;;;1EA6;;1EA6
-1EA8;LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE;Lu;0;L;00C2 0309;;;;N;;;;1EA9;
-1EA9;LATIN SMALL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE;Ll;0;L;00E2 0309;;;;N;;;1EA8;;1EA8
-1EAA;LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE;Lu;0;L;00C2 0303;;;;N;;;;1EAB;
-1EAB;LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE;Ll;0;L;00E2 0303;;;;N;;;1EAA;;1EAA
-1EAC;LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW;Lu;0;L;1EA0 0302;;;;N;;;;1EAD;
-1EAD;LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW;Ll;0;L;1EA1 0302;;;;N;;;1EAC;;1EAC
-1EAE;LATIN CAPITAL LETTER A WITH BREVE AND ACUTE;Lu;0;L;0102 0301;;;;N;;;;1EAF;
-1EAF;LATIN SMALL LETTER A WITH BREVE AND ACUTE;Ll;0;L;0103 0301;;;;N;;;1EAE;;1EAE
-1EB0;LATIN CAPITAL LETTER A WITH BREVE AND GRAVE;Lu;0;L;0102 0300;;;;N;;;;1EB1;
-1EB1;LATIN SMALL LETTER A WITH BREVE AND GRAVE;Ll;0;L;0103 0300;;;;N;;;1EB0;;1EB0
-1EB2;LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE;Lu;0;L;0102 0309;;;;N;;;;1EB3;
-1EB3;LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE;Ll;0;L;0103 0309;;;;N;;;1EB2;;1EB2
-1EB4;LATIN CAPITAL LETTER A WITH BREVE AND TILDE;Lu;0;L;0102 0303;;;;N;;;;1EB5;
-1EB5;LATIN SMALL LETTER A WITH BREVE AND TILDE;Ll;0;L;0103 0303;;;;N;;;1EB4;;1EB4
-1EB6;LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW;Lu;0;L;1EA0 0306;;;;N;;;;1EB7;
-1EB7;LATIN SMALL LETTER A WITH BREVE AND DOT BELOW;Ll;0;L;1EA1 0306;;;;N;;;1EB6;;1EB6
-1EB8;LATIN CAPITAL LETTER E WITH DOT BELOW;Lu;0;L;0045 0323;;;;N;;;;1EB9;
-1EB9;LATIN SMALL LETTER E WITH DOT BELOW;Ll;0;L;0065 0323;;;;N;;;1EB8;;1EB8
-1EBA;LATIN CAPITAL LETTER E WITH HOOK ABOVE;Lu;0;L;0045 0309;;;;N;;;;1EBB;
-1EBB;LATIN SMALL LETTER E WITH HOOK ABOVE;Ll;0;L;0065 0309;;;;N;;;1EBA;;1EBA
-1EBC;LATIN CAPITAL LETTER E WITH TILDE;Lu;0;L;0045 0303;;;;N;;;;1EBD;
-1EBD;LATIN SMALL LETTER E WITH TILDE;Ll;0;L;0065 0303;;;;N;;;1EBC;;1EBC
-1EBE;LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE;Lu;0;L;00CA 0301;;;;N;;;;1EBF;
-1EBF;LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE;Ll;0;L;00EA 0301;;;;N;;;1EBE;;1EBE
-1EC0;LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE;Lu;0;L;00CA 0300;;;;N;;;;1EC1;
-1EC1;LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE;Ll;0;L;00EA 0300;;;;N;;;1EC0;;1EC0
-1EC2;LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE;Lu;0;L;00CA 0309;;;;N;;;;1EC3;
-1EC3;LATIN SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE;Ll;0;L;00EA 0309;;;;N;;;1EC2;;1EC2
-1EC4;LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE;Lu;0;L;00CA 0303;;;;N;;;;1EC5;
-1EC5;LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE;Ll;0;L;00EA 0303;;;;N;;;1EC4;;1EC4
-1EC6;LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW;Lu;0;L;1EB8 0302;;;;N;;;;1EC7;
-1EC7;LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW;Ll;0;L;1EB9 0302;;;;N;;;1EC6;;1EC6
-1EC8;LATIN CAPITAL LETTER I WITH HOOK ABOVE;Lu;0;L;0049 0309;;;;N;;;;1EC9;
-1EC9;LATIN SMALL LETTER I WITH HOOK ABOVE;Ll;0;L;0069 0309;;;;N;;;1EC8;;1EC8
-1ECA;LATIN CAPITAL LETTER I WITH DOT BELOW;Lu;0;L;0049 0323;;;;N;;;;1ECB;
-1ECB;LATIN SMALL LETTER I WITH DOT BELOW;Ll;0;L;0069 0323;;;;N;;;1ECA;;1ECA
-1ECC;LATIN CAPITAL LETTER O WITH DOT BELOW;Lu;0;L;004F 0323;;;;N;;;;1ECD;
-1ECD;LATIN SMALL LETTER O WITH DOT BELOW;Ll;0;L;006F 0323;;;;N;;;1ECC;;1ECC
-1ECE;LATIN CAPITAL LETTER O WITH HOOK ABOVE;Lu;0;L;004F 0309;;;;N;;;;1ECF;
-1ECF;LATIN SMALL LETTER O WITH HOOK ABOVE;Ll;0;L;006F 0309;;;;N;;;1ECE;;1ECE
-1ED0;LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE;Lu;0;L;00D4 0301;;;;N;;;;1ED1;
-1ED1;LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE;Ll;0;L;00F4 0301;;;;N;;;1ED0;;1ED0
-1ED2;LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE;Lu;0;L;00D4 0300;;;;N;;;;1ED3;
-1ED3;LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE;Ll;0;L;00F4 0300;;;;N;;;1ED2;;1ED2
-1ED4;LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE;Lu;0;L;00D4 0309;;;;N;;;;1ED5;
-1ED5;LATIN SMALL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE;Ll;0;L;00F4 0309;;;;N;;;1ED4;;1ED4
-1ED6;LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE;Lu;0;L;00D4 0303;;;;N;;;;1ED7;
-1ED7;LATIN SMALL LETTER O WITH CIRCUMFLEX AND TILDE;Ll;0;L;00F4 0303;;;;N;;;1ED6;;1ED6
-1ED8;LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW;Lu;0;L;1ECC 0302;;;;N;;;;1ED9;
-1ED9;LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW;Ll;0;L;1ECD 0302;;;;N;;;1ED8;;1ED8
-1EDA;LATIN CAPITAL LETTER O WITH HORN AND ACUTE;Lu;0;L;01A0 0301;;;;N;;;;1EDB;
-1EDB;LATIN SMALL LETTER O WITH HORN AND ACUTE;Ll;0;L;01A1 0301;;;;N;;;1EDA;;1EDA
-1EDC;LATIN CAPITAL LETTER O WITH HORN AND GRAVE;Lu;0;L;01A0 0300;;;;N;;;;1EDD;
-1EDD;LATIN SMALL LETTER O WITH HORN AND GRAVE;Ll;0;L;01A1 0300;;;;N;;;1EDC;;1EDC
-1EDE;LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE;Lu;0;L;01A0 0309;;;;N;;;;1EDF;
-1EDF;LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE;Ll;0;L;01A1 0309;;;;N;;;1EDE;;1EDE
-1EE0;LATIN CAPITAL LETTER O WITH HORN AND TILDE;Lu;0;L;01A0 0303;;;;N;;;;1EE1;
-1EE1;LATIN SMALL LETTER O WITH HORN AND TILDE;Ll;0;L;01A1 0303;;;;N;;;1EE0;;1EE0
-1EE2;LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW;Lu;0;L;01A0 0323;;;;N;;;;1EE3;
-1EE3;LATIN SMALL LETTER O WITH HORN AND DOT BELOW;Ll;0;L;01A1 0323;;;;N;;;1EE2;;1EE2
-1EE4;LATIN CAPITAL LETTER U WITH DOT BELOW;Lu;0;L;0055 0323;;;;N;;;;1EE5;
-1EE5;LATIN SMALL LETTER U WITH DOT BELOW;Ll;0;L;0075 0323;;;;N;;;1EE4;;1EE4
-1EE6;LATIN CAPITAL LETTER U WITH HOOK ABOVE;Lu;0;L;0055 0309;;;;N;;;;1EE7;
-1EE7;LATIN SMALL LETTER U WITH HOOK ABOVE;Ll;0;L;0075 0309;;;;N;;;1EE6;;1EE6
-1EE8;LATIN CAPITAL LETTER U WITH HORN AND ACUTE;Lu;0;L;01AF 0301;;;;N;;;;1EE9;
-1EE9;LATIN SMALL LETTER U WITH HORN AND ACUTE;Ll;0;L;01B0 0301;;;;N;;;1EE8;;1EE8
-1EEA;LATIN CAPITAL LETTER U WITH HORN AND GRAVE;Lu;0;L;01AF 0300;;;;N;;;;1EEB;
-1EEB;LATIN SMALL LETTER U WITH HORN AND GRAVE;Ll;0;L;01B0 0300;;;;N;;;1EEA;;1EEA
-1EEC;LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE;Lu;0;L;01AF 0309;;;;N;;;;1EED;
-1EED;LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE;Ll;0;L;01B0 0309;;;;N;;;1EEC;;1EEC
-1EEE;LATIN CAPITAL LETTER U WITH HORN AND TILDE;Lu;0;L;01AF 0303;;;;N;;;;1EEF;
-1EEF;LATIN SMALL LETTER U WITH HORN AND TILDE;Ll;0;L;01B0 0303;;;;N;;;1EEE;;1EEE
-1EF0;LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW;Lu;0;L;01AF 0323;;;;N;;;;1EF1;
-1EF1;LATIN SMALL LETTER U WITH HORN AND DOT BELOW;Ll;0;L;01B0 0323;;;;N;;;1EF0;;1EF0
-1EF2;LATIN CAPITAL LETTER Y WITH GRAVE;Lu;0;L;0059 0300;;;;N;;;;1EF3;
-1EF3;LATIN SMALL LETTER Y WITH GRAVE;Ll;0;L;0079 0300;;;;N;;;1EF2;;1EF2
-1EF4;LATIN CAPITAL LETTER Y WITH DOT BELOW;Lu;0;L;0059 0323;;;;N;;;;1EF5;
-1EF5;LATIN SMALL LETTER Y WITH DOT BELOW;Ll;0;L;0079 0323;;;;N;;;1EF4;;1EF4
-1EF6;LATIN CAPITAL LETTER Y WITH HOOK ABOVE;Lu;0;L;0059 0309;;;;N;;;;1EF7;
-1EF7;LATIN SMALL LETTER Y WITH HOOK ABOVE;Ll;0;L;0079 0309;;;;N;;;1EF6;;1EF6
-1EF8;LATIN CAPITAL LETTER Y WITH TILDE;Lu;0;L;0059 0303;;;;N;;;;1EF9;
-1EF9;LATIN SMALL LETTER Y WITH TILDE;Ll;0;L;0079 0303;;;;N;;;1EF8;;1EF8
-1EFA;LATIN CAPITAL LETTER MIDDLE-WELSH LL;Lu;0;L;;;;;N;;;;1EFB;
-1EFB;LATIN SMALL LETTER MIDDLE-WELSH LL;Ll;0;L;;;;;N;;;1EFA;;1EFA
-1EFC;LATIN CAPITAL LETTER MIDDLE-WELSH V;Lu;0;L;;;;;N;;;;1EFD;
-1EFD;LATIN SMALL LETTER MIDDLE-WELSH V;Ll;0;L;;;;;N;;;1EFC;;1EFC
-1EFE;LATIN CAPITAL LETTER Y WITH LOOP;Lu;0;L;;;;;N;;;;1EFF;
-1EFF;LATIN SMALL LETTER Y WITH LOOP;Ll;0;L;;;;;N;;;1EFE;;1EFE
-1F00;GREEK SMALL LETTER ALPHA WITH PSILI;Ll;0;L;03B1 0313;;;;N;;;1F08;;1F08
-1F01;GREEK SMALL LETTER ALPHA WITH DASIA;Ll;0;L;03B1 0314;;;;N;;;1F09;;1F09
-1F02;GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA;Ll;0;L;1F00 0300;;;;N;;;1F0A;;1F0A
-1F03;GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA;Ll;0;L;1F01 0300;;;;N;;;1F0B;;1F0B
-1F04;GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA;Ll;0;L;1F00 0301;;;;N;;;1F0C;;1F0C
-1F05;GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA;Ll;0;L;1F01 0301;;;;N;;;1F0D;;1F0D
-1F06;GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI;Ll;0;L;1F00 0342;;;;N;;;1F0E;;1F0E
-1F07;GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI;Ll;0;L;1F01 0342;;;;N;;;1F0F;;1F0F
-1F08;GREEK CAPITAL LETTER ALPHA WITH PSILI;Lu;0;L;0391 0313;;;;N;;;;1F00;
-1F09;GREEK CAPITAL LETTER ALPHA WITH DASIA;Lu;0;L;0391 0314;;;;N;;;;1F01;
-1F0A;GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA;Lu;0;L;1F08 0300;;;;N;;;;1F02;
-1F0B;GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA;Lu;0;L;1F09 0300;;;;N;;;;1F03;
-1F0C;GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA;Lu;0;L;1F08 0301;;;;N;;;;1F04;
-1F0D;GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA;Lu;0;L;1F09 0301;;;;N;;;;1F05;
-1F0E;GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI;Lu;0;L;1F08 0342;;;;N;;;;1F06;
-1F0F;GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI;Lu;0;L;1F09 0342;;;;N;;;;1F07;
-1F10;GREEK SMALL LETTER EPSILON WITH PSILI;Ll;0;L;03B5 0313;;;;N;;;1F18;;1F18
-1F11;GREEK SMALL LETTER EPSILON WITH DASIA;Ll;0;L;03B5 0314;;;;N;;;1F19;;1F19
-1F12;GREEK SMALL LETTER EPSILON WITH PSILI AND VARIA;Ll;0;L;1F10 0300;;;;N;;;1F1A;;1F1A
-1F13;GREEK SMALL LETTER EPSILON WITH DASIA AND VARIA;Ll;0;L;1F11 0300;;;;N;;;1F1B;;1F1B
-1F14;GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA;Ll;0;L;1F10 0301;;;;N;;;1F1C;;1F1C
-1F15;GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA;Ll;0;L;1F11 0301;;;;N;;;1F1D;;1F1D
-1F18;GREEK CAPITAL LETTER EPSILON WITH PSILI;Lu;0;L;0395 0313;;;;N;;;;1F10;
-1F19;GREEK CAPITAL LETTER EPSILON WITH DASIA;Lu;0;L;0395 0314;;;;N;;;;1F11;
-1F1A;GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA;Lu;0;L;1F18 0300;;;;N;;;;1F12;
-1F1B;GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA;Lu;0;L;1F19 0300;;;;N;;;;1F13;
-1F1C;GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA;Lu;0;L;1F18 0301;;;;N;;;;1F14;
-1F1D;GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA;Lu;0;L;1F19 0301;;;;N;;;;1F15;
-1F20;GREEK SMALL LETTER ETA WITH PSILI;Ll;0;L;03B7 0313;;;;N;;;1F28;;1F28
-1F21;GREEK SMALL LETTER ETA WITH DASIA;Ll;0;L;03B7 0314;;;;N;;;1F29;;1F29
-1F22;GREEK SMALL LETTER ETA WITH PSILI AND VARIA;Ll;0;L;1F20 0300;;;;N;;;1F2A;;1F2A
-1F23;GREEK SMALL LETTER ETA WITH DASIA AND VARIA;Ll;0;L;1F21 0300;;;;N;;;1F2B;;1F2B
-1F24;GREEK SMALL LETTER ETA WITH PSILI AND OXIA;Ll;0;L;1F20 0301;;;;N;;;1F2C;;1F2C
-1F25;GREEK SMALL LETTER ETA WITH DASIA AND OXIA;Ll;0;L;1F21 0301;;;;N;;;1F2D;;1F2D
-1F26;GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI;Ll;0;L;1F20 0342;;;;N;;;1F2E;;1F2E
-1F27;GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI;Ll;0;L;1F21 0342;;;;N;;;1F2F;;1F2F
-1F28;GREEK CAPITAL LETTER ETA WITH PSILI;Lu;0;L;0397 0313;;;;N;;;;1F20;
-1F29;GREEK CAPITAL LETTER ETA WITH DASIA;Lu;0;L;0397 0314;;;;N;;;;1F21;
-1F2A;GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA;Lu;0;L;1F28 0300;;;;N;;;;1F22;
-1F2B;GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA;Lu;0;L;1F29 0300;;;;N;;;;1F23;
-1F2C;GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA;Lu;0;L;1F28 0301;;;;N;;;;1F24;
-1F2D;GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA;Lu;0;L;1F29 0301;;;;N;;;;1F25;
-1F2E;GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI;Lu;0;L;1F28 0342;;;;N;;;;1F26;
-1F2F;GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI;Lu;0;L;1F29 0342;;;;N;;;;1F27;
-1F30;GREEK SMALL LETTER IOTA WITH PSILI;Ll;0;L;03B9 0313;;;;N;;;1F38;;1F38
-1F31;GREEK SMALL LETTER IOTA WITH DASIA;Ll;0;L;03B9 0314;;;;N;;;1F39;;1F39
-1F32;GREEK SMALL LETTER IOTA WITH PSILI AND VARIA;Ll;0;L;1F30 0300;;;;N;;;1F3A;;1F3A
-1F33;GREEK SMALL LETTER IOTA WITH DASIA AND VARIA;Ll;0;L;1F31 0300;;;;N;;;1F3B;;1F3B
-1F34;GREEK SMALL LETTER IOTA WITH PSILI AND OXIA;Ll;0;L;1F30 0301;;;;N;;;1F3C;;1F3C
-1F35;GREEK SMALL LETTER IOTA WITH DASIA AND OXIA;Ll;0;L;1F31 0301;;;;N;;;1F3D;;1F3D
-1F36;GREEK SMALL LETTER IOTA WITH PSILI AND PERISPOMENI;Ll;0;L;1F30 0342;;;;N;;;1F3E;;1F3E
-1F37;GREEK SMALL LETTER IOTA WITH DASIA AND PERISPOMENI;Ll;0;L;1F31 0342;;;;N;;;1F3F;;1F3F
-1F38;GREEK CAPITAL LETTER IOTA WITH PSILI;Lu;0;L;0399 0313;;;;N;;;;1F30;
-1F39;GREEK CAPITAL LETTER IOTA WITH DASIA;Lu;0;L;0399 0314;;;;N;;;;1F31;
-1F3A;GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA;Lu;0;L;1F38 0300;;;;N;;;;1F32;
-1F3B;GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA;Lu;0;L;1F39 0300;;;;N;;;;1F33;
-1F3C;GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA;Lu;0;L;1F38 0301;;;;N;;;;1F34;
-1F3D;GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA;Lu;0;L;1F39 0301;;;;N;;;;1F35;
-1F3E;GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI;Lu;0;L;1F38 0342;;;;N;;;;1F36;
-1F3F;GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI;Lu;0;L;1F39 0342;;;;N;;;;1F37;
-1F40;GREEK SMALL LETTER OMICRON WITH PSILI;Ll;0;L;03BF 0313;;;;N;;;1F48;;1F48
-1F41;GREEK SMALL LETTER OMICRON WITH DASIA;Ll;0;L;03BF 0314;;;;N;;;1F49;;1F49
-1F42;GREEK SMALL LETTER OMICRON WITH PSILI AND VARIA;Ll;0;L;1F40 0300;;;;N;;;1F4A;;1F4A
-1F43;GREEK SMALL LETTER OMICRON WITH DASIA AND VARIA;Ll;0;L;1F41 0300;;;;N;;;1F4B;;1F4B
-1F44;GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA;Ll;0;L;1F40 0301;;;;N;;;1F4C;;1F4C
-1F45;GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA;Ll;0;L;1F41 0301;;;;N;;;1F4D;;1F4D
-1F48;GREEK CAPITAL LETTER OMICRON WITH PSILI;Lu;0;L;039F 0313;;;;N;;;;1F40;
-1F49;GREEK CAPITAL LETTER OMICRON WITH DASIA;Lu;0;L;039F 0314;;;;N;;;;1F41;
-1F4A;GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA;Lu;0;L;1F48 0300;;;;N;;;;1F42;
-1F4B;GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA;Lu;0;L;1F49 0300;;;;N;;;;1F43;
-1F4C;GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA;Lu;0;L;1F48 0301;;;;N;;;;1F44;
-1F4D;GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA;Lu;0;L;1F49 0301;;;;N;;;;1F45;
-1F50;GREEK SMALL LETTER UPSILON WITH PSILI;Ll;0;L;03C5 0313;;;;N;;;;;
-1F51;GREEK SMALL LETTER UPSILON WITH DASIA;Ll;0;L;03C5 0314;;;;N;;;1F59;;1F59
-1F52;GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA;Ll;0;L;1F50 0300;;;;N;;;;;
-1F53;GREEK SMALL LETTER UPSILON WITH DASIA AND VARIA;Ll;0;L;1F51 0300;;;;N;;;1F5B;;1F5B
-1F54;GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA;Ll;0;L;1F50 0301;;;;N;;;;;
-1F55;GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA;Ll;0;L;1F51 0301;;;;N;;;1F5D;;1F5D
-1F56;GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI;Ll;0;L;1F50 0342;;;;N;;;;;
-1F57;GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI;Ll;0;L;1F51 0342;;;;N;;;1F5F;;1F5F
-1F59;GREEK CAPITAL LETTER UPSILON WITH DASIA;Lu;0;L;03A5 0314;;;;N;;;;1F51;
-1F5B;GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA;Lu;0;L;1F59 0300;;;;N;;;;1F53;
-1F5D;GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA;Lu;0;L;1F59 0301;;;;N;;;;1F55;
-1F5F;GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI;Lu;0;L;1F59 0342;;;;N;;;;1F57;
-1F60;GREEK SMALL LETTER OMEGA WITH PSILI;Ll;0;L;03C9 0313;;;;N;;;1F68;;1F68
-1F61;GREEK SMALL LETTER OMEGA WITH DASIA;Ll;0;L;03C9 0314;;;;N;;;1F69;;1F69
-1F62;GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA;Ll;0;L;1F60 0300;;;;N;;;1F6A;;1F6A
-1F63;GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA;Ll;0;L;1F61 0300;;;;N;;;1F6B;;1F6B
-1F64;GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA;Ll;0;L;1F60 0301;;;;N;;;1F6C;;1F6C
-1F65;GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA;Ll;0;L;1F61 0301;;;;N;;;1F6D;;1F6D
-1F66;GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI;Ll;0;L;1F60 0342;;;;N;;;1F6E;;1F6E
-1F67;GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI;Ll;0;L;1F61 0342;;;;N;;;1F6F;;1F6F
-1F68;GREEK CAPITAL LETTER OMEGA WITH PSILI;Lu;0;L;03A9 0313;;;;N;;;;1F60;
-1F69;GREEK CAPITAL LETTER OMEGA WITH DASIA;Lu;0;L;03A9 0314;;;;N;;;;1F61;
-1F6A;GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA;Lu;0;L;1F68 0300;;;;N;;;;1F62;
-1F6B;GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA;Lu;0;L;1F69 0300;;;;N;;;;1F63;
-1F6C;GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA;Lu;0;L;1F68 0301;;;;N;;;;1F64;
-1F6D;GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA;Lu;0;L;1F69 0301;;;;N;;;;1F65;
-1F6E;GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI;Lu;0;L;1F68 0342;;;;N;;;;1F66;
-1F6F;GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI;Lu;0;L;1F69 0342;;;;N;;;;1F67;
-1F70;GREEK SMALL LETTER ALPHA WITH VARIA;Ll;0;L;03B1 0300;;;;N;;;1FBA;;1FBA
-1F71;GREEK SMALL LETTER ALPHA WITH OXIA;Ll;0;L;03AC;;;;N;;;1FBB;;1FBB
-1F72;GREEK SMALL LETTER EPSILON WITH VARIA;Ll;0;L;03B5 0300;;;;N;;;1FC8;;1FC8
-1F73;GREEK SMALL LETTER EPSILON WITH OXIA;Ll;0;L;03AD;;;;N;;;1FC9;;1FC9
-1F74;GREEK SMALL LETTER ETA WITH VARIA;Ll;0;L;03B7 0300;;;;N;;;1FCA;;1FCA
-1F75;GREEK SMALL LETTER ETA WITH OXIA;Ll;0;L;03AE;;;;N;;;1FCB;;1FCB
-1F76;GREEK SMALL LETTER IOTA WITH VARIA;Ll;0;L;03B9 0300;;;;N;;;1FDA;;1FDA
-1F77;GREEK SMALL LETTER IOTA WITH OXIA;Ll;0;L;03AF;;;;N;;;1FDB;;1FDB
-1F78;GREEK SMALL LETTER OMICRON WITH VARIA;Ll;0;L;03BF 0300;;;;N;;;1FF8;;1FF8
-1F79;GREEK SMALL LETTER OMICRON WITH OXIA;Ll;0;L;03CC;;;;N;;;1FF9;;1FF9
-1F7A;GREEK SMALL LETTER UPSILON WITH VARIA;Ll;0;L;03C5 0300;;;;N;;;1FEA;;1FEA
-1F7B;GREEK SMALL LETTER UPSILON WITH OXIA;Ll;0;L;03CD;;;;N;;;1FEB;;1FEB
-1F7C;GREEK SMALL LETTER OMEGA WITH VARIA;Ll;0;L;03C9 0300;;;;N;;;1FFA;;1FFA
-1F7D;GREEK SMALL LETTER OMEGA WITH OXIA;Ll;0;L;03CE;;;;N;;;1FFB;;1FFB
-1F80;GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI;Ll;0;L;1F00 0345;;;;N;;;1F88;;1F88
-1F81;GREEK SMALL LETTER ALPHA WITH DASIA AND YPOGEGRAMMENI;Ll;0;L;1F01 0345;;;;N;;;1F89;;1F89
-1F82;GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI;Ll;0;L;1F02 0345;;;;N;;;1F8A;;1F8A
-1F83;GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI;Ll;0;L;1F03 0345;;;;N;;;1F8B;;1F8B
-1F84;GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI;Ll;0;L;1F04 0345;;;;N;;;1F8C;;1F8C
-1F85;GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI;Ll;0;L;1F05 0345;;;;N;;;1F8D;;1F8D
-1F86;GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI;Ll;0;L;1F06 0345;;;;N;;;1F8E;;1F8E
-1F87;GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI;Ll;0;L;1F07 0345;;;;N;;;1F8F;;1F8F
-1F88;GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI;Lt;0;L;1F08 0345;;;;N;;;;1F80;
-1F89;GREEK CAPITAL LETTER ALPHA WITH DASIA AND PROSGEGRAMMENI;Lt;0;L;1F09 0345;;;;N;;;;1F81;
-1F8A;GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI;Lt;0;L;1F0A 0345;;;;N;;;;1F82;
-1F8B;GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI;Lt;0;L;1F0B 0345;;;;N;;;;1F83;
-1F8C;GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI;Lt;0;L;1F0C 0345;;;;N;;;;1F84;
-1F8D;GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI;Lt;0;L;1F0D 0345;;;;N;;;;1F85;
-1F8E;GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI;Lt;0;L;1F0E 0345;;;;N;;;;1F86;
-1F8F;GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI;Lt;0;L;1F0F 0345;;;;N;;;;1F87;
-1F90;GREEK SMALL LETTER ETA WITH PSILI AND YPOGEGRAMMENI;Ll;0;L;1F20 0345;;;;N;;;1F98;;1F98
-1F91;GREEK SMALL LETTER ETA WITH DASIA AND YPOGEGRAMMENI;Ll;0;L;1F21 0345;;;;N;;;1F99;;1F99
-1F92;GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI;Ll;0;L;1F22 0345;;;;N;;;1F9A;;1F9A
-1F93;GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI;Ll;0;L;1F23 0345;;;;N;;;1F9B;;1F9B
-1F94;GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI;Ll;0;L;1F24 0345;;;;N;;;1F9C;;1F9C
-1F95;GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI;Ll;0;L;1F25 0345;;;;N;;;1F9D;;1F9D
-1F96;GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI;Ll;0;L;1F26 0345;;;;N;;;1F9E;;1F9E
-1F97;GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI;Ll;0;L;1F27 0345;;;;N;;;1F9F;;1F9F
-1F98;GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI;Lt;0;L;1F28 0345;;;;N;;;;1F90;
-1F99;GREEK CAPITAL LETTER ETA WITH DASIA AND PROSGEGRAMMENI;Lt;0;L;1F29 0345;;;;N;;;;1F91;
-1F9A;GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI;Lt;0;L;1F2A 0345;;;;N;;;;1F92;
-1F9B;GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI;Lt;0;L;1F2B 0345;;;;N;;;;1F93;
-1F9C;GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI;Lt;0;L;1F2C 0345;;;;N;;;;1F94;
-1F9D;GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI;Lt;0;L;1F2D 0345;;;;N;;;;1F95;
-1F9E;GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI;Lt;0;L;1F2E 0345;;;;N;;;;1F96;
-1F9F;GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI;Lt;0;L;1F2F 0345;;;;N;;;;1F97;
-1FA0;GREEK SMALL LETTER OMEGA WITH PSILI AND YPOGEGRAMMENI;Ll;0;L;1F60 0345;;;;N;;;1FA8;;1FA8
-1FA1;GREEK SMALL LETTER OMEGA WITH DASIA AND YPOGEGRAMMENI;Ll;0;L;1F61 0345;;;;N;;;1FA9;;1FA9
-1FA2;GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI;Ll;0;L;1F62 0345;;;;N;;;1FAA;;1FAA
-1FA3;GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI;Ll;0;L;1F63 0345;;;;N;;;1FAB;;1FAB
-1FA4;GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI;Ll;0;L;1F64 0345;;;;N;;;1FAC;;1FAC
-1FA5;GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI;Ll;0;L;1F65 0345;;;;N;;;1FAD;;1FAD
-1FA6;GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI;Ll;0;L;1F66 0345;;;;N;;;1FAE;;1FAE
-1FA7;GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI;Ll;0;L;1F67 0345;;;;N;;;1FAF;;1FAF
-1FA8;GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI;Lt;0;L;1F68 0345;;;;N;;;;1FA0;
-1FA9;GREEK CAPITAL LETTER OMEGA WITH DASIA AND PROSGEGRAMMENI;Lt;0;L;1F69 0345;;;;N;;;;1FA1;
-1FAA;GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI;Lt;0;L;1F6A 0345;;;;N;;;;1FA2;
-1FAB;GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI;Lt;0;L;1F6B 0345;;;;N;;;;1FA3;
-1FAC;GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI;Lt;0;L;1F6C 0345;;;;N;;;;1FA4;
-1FAD;GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI;Lt;0;L;1F6D 0345;;;;N;;;;1FA5;
-1FAE;GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI;Lt;0;L;1F6E 0345;;;;N;;;;1FA6;
-1FAF;GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI;Lt;0;L;1F6F 0345;;;;N;;;;1FA7;
-1FB0;GREEK SMALL LETTER ALPHA WITH VRACHY;Ll;0;L;03B1 0306;;;;N;;;1FB8;;1FB8
-1FB1;GREEK SMALL LETTER ALPHA WITH MACRON;Ll;0;L;03B1 0304;;;;N;;;1FB9;;1FB9
-1FB2;GREEK SMALL LETTER ALPHA WITH VARIA AND YPOGEGRAMMENI;Ll;0;L;1F70 0345;;;;N;;;;;
-1FB3;GREEK SMALL LETTER ALPHA WITH YPOGEGRAMMENI;Ll;0;L;03B1 0345;;;;N;;;1FBC;;1FBC
-1FB4;GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI;Ll;0;L;03AC 0345;;;;N;;;;;
-1FB6;GREEK SMALL LETTER ALPHA WITH PERISPOMENI;Ll;0;L;03B1 0342;;;;N;;;;;
-1FB7;GREEK SMALL LETTER ALPHA WITH PERISPOMENI AND YPOGEGRAMMENI;Ll;0;L;1FB6 0345;;;;N;;;;;
-1FB8;GREEK CAPITAL LETTER ALPHA WITH VRACHY;Lu;0;L;0391 0306;;;;N;;;;1FB0;
-1FB9;GREEK CAPITAL LETTER ALPHA WITH MACRON;Lu;0;L;0391 0304;;;;N;;;;1FB1;
-1FBA;GREEK CAPITAL LETTER ALPHA WITH VARIA;Lu;0;L;0391 0300;;;;N;;;;1F70;
-1FBB;GREEK CAPITAL LETTER ALPHA WITH OXIA;Lu;0;L;0386;;;;N;;;;1F71;
-1FBC;GREEK CAPITAL LETTER ALPHA WITH PROSGEGRAMMENI;Lt;0;L;0391 0345;;;;N;;;;1FB3;
-1FBD;GREEK KORONIS;Sk;0;ON;<compat> 0020 0313;;;;N;;;;;
-1FBE;GREEK PROSGEGRAMMENI;Ll;0;L;03B9;;;;N;;;0399;;0399
-1FBF;GREEK PSILI;Sk;0;ON;<compat> 0020 0313;;;;N;;;;;
-1FC0;GREEK PERISPOMENI;Sk;0;ON;<compat> 0020 0342;;;;N;;;;;
-1FC1;GREEK DIALYTIKA AND PERISPOMENI;Sk;0;ON;00A8 0342;;;;N;;;;;
-1FC2;GREEK SMALL LETTER ETA WITH VARIA AND YPOGEGRAMMENI;Ll;0;L;1F74 0345;;;;N;;;;;
-1FC3;GREEK SMALL LETTER ETA WITH YPOGEGRAMMENI;Ll;0;L;03B7 0345;;;;N;;;1FCC;;1FCC
-1FC4;GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI;Ll;0;L;03AE 0345;;;;N;;;;;
-1FC6;GREEK SMALL LETTER ETA WITH PERISPOMENI;Ll;0;L;03B7 0342;;;;N;;;;;
-1FC7;GREEK SMALL LETTER ETA WITH PERISPOMENI AND YPOGEGRAMMENI;Ll;0;L;1FC6 0345;;;;N;;;;;
-1FC8;GREEK CAPITAL LETTER EPSILON WITH VARIA;Lu;0;L;0395 0300;;;;N;;;;1F72;
-1FC9;GREEK CAPITAL LETTER EPSILON WITH OXIA;Lu;0;L;0388;;;;N;;;;1F73;
-1FCA;GREEK CAPITAL LETTER ETA WITH VARIA;Lu;0;L;0397 0300;;;;N;;;;1F74;
-1FCB;GREEK CAPITAL LETTER ETA WITH OXIA;Lu;0;L;0389;;;;N;;;;1F75;
-1FCC;GREEK CAPITAL LETTER ETA WITH PROSGEGRAMMENI;Lt;0;L;0397 0345;;;;N;;;;1FC3;
-1FCD;GREEK PSILI AND VARIA;Sk;0;ON;1FBF 0300;;;;N;;;;;
-1FCE;GREEK PSILI AND OXIA;Sk;0;ON;1FBF 0301;;;;N;;;;;
-1FCF;GREEK PSILI AND PERISPOMENI;Sk;0;ON;1FBF 0342;;;;N;;;;;
-1FD0;GREEK SMALL LETTER IOTA WITH VRACHY;Ll;0;L;03B9 0306;;;;N;;;1FD8;;1FD8
-1FD1;GREEK SMALL LETTER IOTA WITH MACRON;Ll;0;L;03B9 0304;;;;N;;;1FD9;;1FD9
-1FD2;GREEK SMALL LETTER IOTA WITH DIALYTIKA AND VARIA;Ll;0;L;03CA 0300;;;;N;;;;;
-1FD3;GREEK SMALL LETTER IOTA WITH DIALYTIKA AND OXIA;Ll;0;L;0390;;;;N;;;;;
-1FD6;GREEK SMALL LETTER IOTA WITH PERISPOMENI;Ll;0;L;03B9 0342;;;;N;;;;;
-1FD7;GREEK SMALL LETTER IOTA WITH DIALYTIKA AND PERISPOMENI;Ll;0;L;03CA 0342;;;;N;;;;;
-1FD8;GREEK CAPITAL LETTER IOTA WITH VRACHY;Lu;0;L;0399 0306;;;;N;;;;1FD0;
-1FD9;GREEK CAPITAL LETTER IOTA WITH MACRON;Lu;0;L;0399 0304;;;;N;;;;1FD1;
-1FDA;GREEK CAPITAL LETTER IOTA WITH VARIA;Lu;0;L;0399 0300;;;;N;;;;1F76;
-1FDB;GREEK CAPITAL LETTER IOTA WITH OXIA;Lu;0;L;038A;;;;N;;;;1F77;
-1FDD;GREEK DASIA AND VARIA;Sk;0;ON;1FFE 0300;;;;N;;;;;
-1FDE;GREEK DASIA AND OXIA;Sk;0;ON;1FFE 0301;;;;N;;;;;
-1FDF;GREEK DASIA AND PERISPOMENI;Sk;0;ON;1FFE 0342;;;;N;;;;;
-1FE0;GREEK SMALL LETTER UPSILON WITH VRACHY;Ll;0;L;03C5 0306;;;;N;;;1FE8;;1FE8
-1FE1;GREEK SMALL LETTER UPSILON WITH MACRON;Ll;0;L;03C5 0304;;;;N;;;1FE9;;1FE9
-1FE2;GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND VARIA;Ll;0;L;03CB 0300;;;;N;;;;;
-1FE3;GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND OXIA;Ll;0;L;03B0;;;;N;;;;;
-1FE4;GREEK SMALL LETTER RHO WITH PSILI;Ll;0;L;03C1 0313;;;;N;;;;;
-1FE5;GREEK SMALL LETTER RHO WITH DASIA;Ll;0;L;03C1 0314;;;;N;;;1FEC;;1FEC
-1FE6;GREEK SMALL LETTER UPSILON WITH PERISPOMENI;Ll;0;L;03C5 0342;;;;N;;;;;
-1FE7;GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND PERISPOMENI;Ll;0;L;03CB 0342;;;;N;;;;;
-1FE8;GREEK CAPITAL LETTER UPSILON WITH VRACHY;Lu;0;L;03A5 0306;;;;N;;;;1FE0;
-1FE9;GREEK CAPITAL LETTER UPSILON WITH MACRON;Lu;0;L;03A5 0304;;;;N;;;;1FE1;
-1FEA;GREEK CAPITAL LETTER UPSILON WITH VARIA;Lu;0;L;03A5 0300;;;;N;;;;1F7A;
-1FEB;GREEK CAPITAL LETTER UPSILON WITH OXIA;Lu;0;L;038E;;;;N;;;;1F7B;
-1FEC;GREEK CAPITAL LETTER RHO WITH DASIA;Lu;0;L;03A1 0314;;;;N;;;;1FE5;
-1FED;GREEK DIALYTIKA AND VARIA;Sk;0;ON;00A8 0300;;;;N;;;;;
-1FEE;GREEK DIALYTIKA AND OXIA;Sk;0;ON;0385;;;;N;;;;;
-1FEF;GREEK VARIA;Sk;0;ON;0060;;;;N;;;;;
-1FF2;GREEK SMALL LETTER OMEGA WITH VARIA AND YPOGEGRAMMENI;Ll;0;L;1F7C 0345;;;;N;;;;;
-1FF3;GREEK SMALL LETTER OMEGA WITH YPOGEGRAMMENI;Ll;0;L;03C9 0345;;;;N;;;1FFC;;1FFC
-1FF4;GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI;Ll;0;L;03CE 0345;;;;N;;;;;
-1FF6;GREEK SMALL LETTER OMEGA WITH PERISPOMENI;Ll;0;L;03C9 0342;;;;N;;;;;
-1FF7;GREEK SMALL LETTER OMEGA WITH PERISPOMENI AND YPOGEGRAMMENI;Ll;0;L;1FF6 0345;;;;N;;;;;
-1FF8;GREEK CAPITAL LETTER OMICRON WITH VARIA;Lu;0;L;039F 0300;;;;N;;;;1F78;
-1FF9;GREEK CAPITAL LETTER OMICRON WITH OXIA;Lu;0;L;038C;;;;N;;;;1F79;
-1FFA;GREEK CAPITAL LETTER OMEGA WITH VARIA;Lu;0;L;03A9 0300;;;;N;;;;1F7C;
-1FFB;GREEK CAPITAL LETTER OMEGA WITH OXIA;Lu;0;L;038F;;;;N;;;;1F7D;
-1FFC;GREEK CAPITAL LETTER OMEGA WITH PROSGEGRAMMENI;Lt;0;L;03A9 0345;;;;N;;;;1FF3;
-1FFD;GREEK OXIA;Sk;0;ON;00B4;;;;N;;;;;
-1FFE;GREEK DASIA;Sk;0;ON;<compat> 0020 0314;;;;N;;;;;
-2000;EN QUAD;Zs;0;WS;2002;;;;N;;;;;
-2001;EM QUAD;Zs;0;WS;2003;;;;N;;;;;
-2002;EN SPACE;Zs;0;WS;<compat> 0020;;;;N;;;;;
-2003;EM SPACE;Zs;0;WS;<compat> 0020;;;;N;;;;;
-2004;THREE-PER-EM SPACE;Zs;0;WS;<compat> 0020;;;;N;;;;;
-2005;FOUR-PER-EM SPACE;Zs;0;WS;<compat> 0020;;;;N;;;;;
-2006;SIX-PER-EM SPACE;Zs;0;WS;<compat> 0020;;;;N;;;;;
-2007;FIGURE SPACE;Zs;0;WS;<noBreak> 0020;;;;N;;;;;
-2008;PUNCTUATION SPACE;Zs;0;WS;<compat> 0020;;;;N;;;;;
-2009;THIN SPACE;Zs;0;WS;<compat> 0020;;;;N;;;;;
-200A;HAIR SPACE;Zs;0;WS;<compat> 0020;;;;N;;;;;
-200B;ZERO WIDTH SPACE;Cf;0;BN;;;;;N;;;;;
-200C;ZERO WIDTH NON-JOINER;Cf;0;BN;;;;;N;;;;;
-200D;ZERO WIDTH JOINER;Cf;0;BN;;;;;N;;;;;
-200E;LEFT-TO-RIGHT MARK;Cf;0;L;;;;;N;;;;;
-200F;RIGHT-TO-LEFT MARK;Cf;0;R;;;;;N;;;;;
-2010;HYPHEN;Pd;0;ON;;;;;N;;;;;
-2011;NON-BREAKING HYPHEN;Pd;0;ON;<noBreak> 2010;;;;N;;;;;
-2012;FIGURE DASH;Pd;0;ON;;;;;N;;;;;
-2013;EN DASH;Pd;0;ON;;;;;N;;;;;
-2014;EM DASH;Pd;0;ON;;;;;N;;;;;
-2015;HORIZONTAL BAR;Pd;0;ON;;;;;N;QUOTATION DASH;;;;
-2016;DOUBLE VERTICAL LINE;Po;0;ON;;;;;N;DOUBLE VERTICAL BAR;;;;
-2017;DOUBLE LOW LINE;Po;0;ON;<compat> 0020 0333;;;;N;SPACING DOUBLE UNDERSCORE;;;;
-2018;LEFT SINGLE QUOTATION MARK;Pi;0;ON;;;;;N;SINGLE TURNED COMMA QUOTATION MARK;;;;
-2019;RIGHT SINGLE QUOTATION MARK;Pf;0;ON;;;;;N;SINGLE COMMA QUOTATION MARK;;;;
-201A;SINGLE LOW-9 QUOTATION MARK;Ps;0;ON;;;;;N;LOW SINGLE COMMA QUOTATION MARK;;;;
-201B;SINGLE HIGH-REVERSED-9 QUOTATION MARK;Pi;0;ON;;;;;N;SINGLE REVERSED COMMA QUOTATION MARK;;;;
-201C;LEFT DOUBLE QUOTATION MARK;Pi;0;ON;;;;;N;DOUBLE TURNED COMMA QUOTATION MARK;;;;
-201D;RIGHT DOUBLE QUOTATION MARK;Pf;0;ON;;;;;N;DOUBLE COMMA QUOTATION MARK;;;;
-201E;DOUBLE LOW-9 QUOTATION MARK;Ps;0;ON;;;;;N;LOW DOUBLE COMMA QUOTATION MARK;;;;
-201F;DOUBLE HIGH-REVERSED-9 QUOTATION MARK;Pi;0;ON;;;;;N;DOUBLE REVERSED COMMA QUOTATION MARK;;;;
-2020;DAGGER;Po;0;ON;;;;;N;;;;;
-2021;DOUBLE DAGGER;Po;0;ON;;;;;N;;;;;
-2022;BULLET;Po;0;ON;;;;;N;;;;;
-2023;TRIANGULAR BULLET;Po;0;ON;;;;;N;;;;;
-2024;ONE DOT LEADER;Po;0;ON;<compat> 002E;;;;N;;;;;
-2025;TWO DOT LEADER;Po;0;ON;<compat> 002E 002E;;;;N;;;;;
-2026;HORIZONTAL ELLIPSIS;Po;0;ON;<compat> 002E 002E 002E;;;;N;;;;;
-2027;HYPHENATION POINT;Po;0;ON;;;;;N;;;;;
-2028;LINE SEPARATOR;Zl;0;WS;;;;;N;;;;;
-2029;PARAGRAPH SEPARATOR;Zp;0;B;;;;;N;;;;;
-202A;LEFT-TO-RIGHT EMBEDDING;Cf;0;LRE;;;;;N;;;;;
-202B;RIGHT-TO-LEFT EMBEDDING;Cf;0;RLE;;;;;N;;;;;
-202C;POP DIRECTIONAL FORMATTING;Cf;0;PDF;;;;;N;;;;;
-202D;LEFT-TO-RIGHT OVERRIDE;Cf;0;LRO;;;;;N;;;;;
-202E;RIGHT-TO-LEFT OVERRIDE;Cf;0;RLO;;;;;N;;;;;
-202F;NARROW NO-BREAK SPACE;Zs;0;CS;<noBreak> 0020;;;;N;;;;;
-2030;PER MILLE SIGN;Po;0;ET;;;;;N;;;;;
-2031;PER TEN THOUSAND SIGN;Po;0;ET;;;;;N;;;;;
-2032;PRIME;Po;0;ET;;;;;N;;;;;
-2033;DOUBLE PRIME;Po;0;ET;<compat> 2032 2032;;;;N;;;;;
-2034;TRIPLE PRIME;Po;0;ET;<compat> 2032 2032 2032;;;;N;;;;;
-2035;REVERSED PRIME;Po;0;ON;;;;;N;;;;;
-2036;REVERSED DOUBLE PRIME;Po;0;ON;<compat> 2035 2035;;;;N;;;;;
-2037;REVERSED TRIPLE PRIME;Po;0;ON;<compat> 2035 2035 2035;;;;N;;;;;
-2038;CARET;Po;0;ON;;;;;N;;;;;
-2039;SINGLE LEFT-POINTING ANGLE QUOTATION MARK;Pi;0;ON;;;;;Y;LEFT POINTING SINGLE GUILLEMET;;;;
-203A;SINGLE RIGHT-POINTING ANGLE QUOTATION MARK;Pf;0;ON;;;;;Y;RIGHT POINTING SINGLE GUILLEMET;;;;
-203B;REFERENCE MARK;Po;0;ON;;;;;N;;;;;
-203C;DOUBLE EXCLAMATION MARK;Po;0;ON;<compat> 0021 0021;;;;N;;;;;
-203D;INTERROBANG;Po;0;ON;;;;;N;;;;;
-203E;OVERLINE;Po;0;ON;<compat> 0020 0305;;;;N;SPACING OVERSCORE;;;;
-203F;UNDERTIE;Pc;0;ON;;;;;N;;Enotikon;;;
-2040;CHARACTER TIE;Pc;0;ON;;;;;N;;;;;
-2041;CARET INSERTION POINT;Po;0;ON;;;;;N;;;;;
-2042;ASTERISM;Po;0;ON;;;;;N;;;;;
-2043;HYPHEN BULLET;Po;0;ON;;;;;N;;;;;
-2044;FRACTION SLASH;Sm;0;CS;;;;;N;;;;;
-2045;LEFT SQUARE BRACKET WITH QUILL;Ps;0;ON;;;;;Y;;;;;
-2046;RIGHT SQUARE BRACKET WITH QUILL;Pe;0;ON;;;;;Y;;;;;
-2047;DOUBLE QUESTION MARK;Po;0;ON;<compat> 003F 003F;;;;N;;;;;
-2048;QUESTION EXCLAMATION MARK;Po;0;ON;<compat> 003F 0021;;;;N;;;;;
-2049;EXCLAMATION QUESTION MARK;Po;0;ON;<compat> 0021 003F;;;;N;;;;;
-204A;TIRONIAN SIGN ET;Po;0;ON;;;;;N;;;;;
-204B;REVERSED PILCROW SIGN;Po;0;ON;;;;;N;;;;;
-204C;BLACK LEFTWARDS BULLET;Po;0;ON;;;;;N;;;;;
-204D;BLACK RIGHTWARDS BULLET;Po;0;ON;;;;;N;;;;;
-204E;LOW ASTERISK;Po;0;ON;;;;;N;;;;;
-204F;REVERSED SEMICOLON;Po;0;ON;;;;;N;;;;;
-2050;CLOSE UP;Po;0;ON;;;;;N;;;;;
-2051;TWO ASTERISKS ALIGNED VERTICALLY;Po;0;ON;;;;;N;;;;;
-2052;COMMERCIAL MINUS SIGN;Sm;0;ON;;;;;N;;;;;
-2053;SWUNG DASH;Po;0;ON;;;;;N;;;;;
-2054;INVERTED UNDERTIE;Pc;0;ON;;;;;N;;;;;
-2055;FLOWER PUNCTUATION MARK;Po;0;ON;;;;;N;;;;;
-2056;THREE DOT PUNCTUATION;Po;0;ON;;;;;N;;;;;
-2057;QUADRUPLE PRIME;Po;0;ON;<compat> 2032 2032 2032 2032;;;;N;;;;;
-2058;FOUR DOT PUNCTUATION;Po;0;ON;;;;;N;;;;;
-2059;FIVE DOT PUNCTUATION;Po;0;ON;;;;;N;;;;;
-205A;TWO DOT PUNCTUATION;Po;0;ON;;;;;N;;;;;
-205B;FOUR DOT MARK;Po;0;ON;;;;;N;;;;;
-205C;DOTTED CROSS;Po;0;ON;;;;;N;;;;;
-205D;TRICOLON;Po;0;ON;;;;;N;;;;;
-205E;VERTICAL FOUR DOTS;Po;0;ON;;;;;N;;;;;
-205F;MEDIUM MATHEMATICAL SPACE;Zs;0;WS;<compat> 0020;;;;N;;;;;
-2060;WORD JOINER;Cf;0;BN;;;;;N;;;;;
-2061;FUNCTION APPLICATION;Cf;0;BN;;;;;N;;;;;
-2062;INVISIBLE TIMES;Cf;0;BN;;;;;N;;;;;
-2063;INVISIBLE SEPARATOR;Cf;0;BN;;;;;N;;;;;
-2064;INVISIBLE PLUS;Cf;0;BN;;;;;N;;;;;
-206A;INHIBIT SYMMETRIC SWAPPING;Cf;0;BN;;;;;N;;;;;
-206B;ACTIVATE SYMMETRIC SWAPPING;Cf;0;BN;;;;;N;;;;;
-206C;INHIBIT ARABIC FORM SHAPING;Cf;0;BN;;;;;N;;;;;
-206D;ACTIVATE ARABIC FORM SHAPING;Cf;0;BN;;;;;N;;;;;
-206E;NATIONAL DIGIT SHAPES;Cf;0;BN;;;;;N;;;;;
-206F;NOMINAL DIGIT SHAPES;Cf;0;BN;;;;;N;;;;;
-2070;SUPERSCRIPT ZERO;No;0;EN;<super> 0030;;0;0;N;SUPERSCRIPT DIGIT ZERO;;;;
-2071;SUPERSCRIPT LATIN SMALL LETTER I;Ll;0;L;<super> 0069;;;;N;;;;;
-2074;SUPERSCRIPT FOUR;No;0;EN;<super> 0034;;4;4;N;SUPERSCRIPT DIGIT FOUR;;;;
-2075;SUPERSCRIPT FIVE;No;0;EN;<super> 0035;;5;5;N;SUPERSCRIPT DIGIT FIVE;;;;
-2076;SUPERSCRIPT SIX;No;0;EN;<super> 0036;;6;6;N;SUPERSCRIPT DIGIT SIX;;;;
-2077;SUPERSCRIPT SEVEN;No;0;EN;<super> 0037;;7;7;N;SUPERSCRIPT DIGIT SEVEN;;;;
-2078;SUPERSCRIPT EIGHT;No;0;EN;<super> 0038;;8;8;N;SUPERSCRIPT DIGIT EIGHT;;;;
-2079;SUPERSCRIPT NINE;No;0;EN;<super> 0039;;9;9;N;SUPERSCRIPT DIGIT NINE;;;;
-207A;SUPERSCRIPT PLUS SIGN;Sm;0;ES;<super> 002B;;;;N;;;;;
-207B;SUPERSCRIPT MINUS;Sm;0;ES;<super> 2212;;;;N;SUPERSCRIPT HYPHEN-MINUS;;;;
-207C;SUPERSCRIPT EQUALS SIGN;Sm;0;ON;<super> 003D;;;;N;;;;;
-207D;SUPERSCRIPT LEFT PARENTHESIS;Ps;0;ON;<super> 0028;;;;Y;SUPERSCRIPT OPENING PARENTHESIS;;;;
-207E;SUPERSCRIPT RIGHT PARENTHESIS;Pe;0;ON;<super> 0029;;;;Y;SUPERSCRIPT CLOSING PARENTHESIS;;;;
-207F;SUPERSCRIPT LATIN SMALL LETTER N;Ll;0;L;<super> 006E;;;;N;;;;;
-2080;SUBSCRIPT ZERO;No;0;EN;<sub> 0030;;0;0;N;SUBSCRIPT DIGIT ZERO;;;;
-2081;SUBSCRIPT ONE;No;0;EN;<sub> 0031;;1;1;N;SUBSCRIPT DIGIT ONE;;;;
-2082;SUBSCRIPT TWO;No;0;EN;<sub> 0032;;2;2;N;SUBSCRIPT DIGIT TWO;;;;
-2083;SUBSCRIPT THREE;No;0;EN;<sub> 0033;;3;3;N;SUBSCRIPT DIGIT THREE;;;;
-2084;SUBSCRIPT FOUR;No;0;EN;<sub> 0034;;4;4;N;SUBSCRIPT DIGIT FOUR;;;;
-2085;SUBSCRIPT FIVE;No;0;EN;<sub> 0035;;5;5;N;SUBSCRIPT DIGIT FIVE;;;;
-2086;SUBSCRIPT SIX;No;0;EN;<sub> 0036;;6;6;N;SUBSCRIPT DIGIT SIX;;;;
-2087;SUBSCRIPT SEVEN;No;0;EN;<sub> 0037;;7;7;N;SUBSCRIPT DIGIT SEVEN;;;;
-2088;SUBSCRIPT EIGHT;No;0;EN;<sub> 0038;;8;8;N;SUBSCRIPT DIGIT EIGHT;;;;
-2089;SUBSCRIPT NINE;No;0;EN;<sub> 0039;;9;9;N;SUBSCRIPT DIGIT NINE;;;;
-208A;SUBSCRIPT PLUS SIGN;Sm;0;ES;<sub> 002B;;;;N;;;;;
-208B;SUBSCRIPT MINUS;Sm;0;ES;<sub> 2212;;;;N;SUBSCRIPT HYPHEN-MINUS;;;;
-208C;SUBSCRIPT EQUALS SIGN;Sm;0;ON;<sub> 003D;;;;N;;;;;
-208D;SUBSCRIPT LEFT PARENTHESIS;Ps;0;ON;<sub> 0028;;;;Y;SUBSCRIPT OPENING PARENTHESIS;;;;
-208E;SUBSCRIPT RIGHT PARENTHESIS;Pe;0;ON;<sub> 0029;;;;Y;SUBSCRIPT CLOSING PARENTHESIS;;;;
-2090;LATIN SUBSCRIPT SMALL LETTER A;Lm;0;L;<sub> 0061;;;;N;;;;;
-2091;LATIN SUBSCRIPT SMALL LETTER E;Lm;0;L;<sub> 0065;;;;N;;;;;
-2092;LATIN SUBSCRIPT SMALL LETTER O;Lm;0;L;<sub> 006F;;;;N;;;;;
-2093;LATIN SUBSCRIPT SMALL LETTER X;Lm;0;L;<sub> 0078;;;;N;;;;;
-2094;LATIN SUBSCRIPT SMALL LETTER SCHWA;Lm;0;L;<sub> 0259;;;;N;;;;;
-20A0;EURO-CURRENCY SIGN;Sc;0;ET;;;;;N;;;;;
-20A1;COLON SIGN;Sc;0;ET;;;;;N;;;;;
-20A2;CRUZEIRO SIGN;Sc;0;ET;;;;;N;;;;;
-20A3;FRENCH FRANC SIGN;Sc;0;ET;;;;;N;;;;;
-20A4;LIRA SIGN;Sc;0;ET;;;;;N;;;;;
-20A5;MILL SIGN;Sc;0;ET;;;;;N;;;;;
-20A6;NAIRA SIGN;Sc;0;ET;;;;;N;;;;;
-20A7;PESETA SIGN;Sc;0;ET;;;;;N;;;;;
-20A8;RUPEE SIGN;Sc;0;ET;<compat> 0052 0073;;;;N;;;;;
-20A9;WON SIGN;Sc;0;ET;;;;;N;;;;;
-20AA;NEW SHEQEL SIGN;Sc;0;ET;;;;;N;;;;;
-20AB;DONG SIGN;Sc;0;ET;;;;;N;;;;;
-20AC;EURO SIGN;Sc;0;ET;;;;;N;;;;;
-20AD;KIP SIGN;Sc;0;ET;;;;;N;;;;;
-20AE;TUGRIK SIGN;Sc;0;ET;;;;;N;;;;;
-20AF;DRACHMA SIGN;Sc;0;ET;;;;;N;;;;;
-20B0;GERMAN PENNY SIGN;Sc;0;ET;;;;;N;;;;;
-20B1;PESO SIGN;Sc;0;ET;;;;;N;;;;;
-20B2;GUARANI SIGN;Sc;0;ET;;;;;N;;;;;
-20B3;AUSTRAL SIGN;Sc;0;ET;;;;;N;;;;;
-20B4;HRYVNIA SIGN;Sc;0;ET;;;;;N;;;;;
-20B5;CEDI SIGN;Sc;0;ET;;;;;N;;;;;
-20D0;COMBINING LEFT HARPOON ABOVE;Mn;230;NSM;;;;;N;NON-SPACING LEFT HARPOON ABOVE;;;;
-20D1;COMBINING RIGHT HARPOON ABOVE;Mn;230;NSM;;;;;N;NON-SPACING RIGHT HARPOON ABOVE;;;;
-20D2;COMBINING LONG VERTICAL LINE OVERLAY;Mn;1;NSM;;;;;N;NON-SPACING LONG VERTICAL BAR OVERLAY;;;;
-20D3;COMBINING SHORT VERTICAL LINE OVERLAY;Mn;1;NSM;;;;;N;NON-SPACING SHORT VERTICAL BAR OVERLAY;;;;
-20D4;COMBINING ANTICLOCKWISE ARROW ABOVE;Mn;230;NSM;;;;;N;NON-SPACING ANTICLOCKWISE ARROW ABOVE;;;;
-20D5;COMBINING CLOCKWISE ARROW ABOVE;Mn;230;NSM;;;;;N;NON-SPACING CLOCKWISE ARROW ABOVE;;;;
-20D6;COMBINING LEFT ARROW ABOVE;Mn;230;NSM;;;;;N;NON-SPACING LEFT ARROW ABOVE;;;;
-20D7;COMBINING RIGHT ARROW ABOVE;Mn;230;NSM;;;;;N;NON-SPACING RIGHT ARROW ABOVE;;;;
-20D8;COMBINING RING OVERLAY;Mn;1;NSM;;;;;N;NON-SPACING RING OVERLAY;;;;
-20D9;COMBINING CLOCKWISE RING OVERLAY;Mn;1;NSM;;;;;N;NON-SPACING CLOCKWISE RING OVERLAY;;;;
-20DA;COMBINING ANTICLOCKWISE RING OVERLAY;Mn;1;NSM;;;;;N;NON-SPACING ANTICLOCKWISE RING OVERLAY;;;;
-20DB;COMBINING THREE DOTS ABOVE;Mn;230;NSM;;;;;N;NON-SPACING THREE DOTS ABOVE;;;;
-20DC;COMBINING FOUR DOTS ABOVE;Mn;230;NSM;;;;;N;NON-SPACING FOUR DOTS ABOVE;;;;
-20DD;COMBINING ENCLOSING CIRCLE;Me;0;NSM;;;;;N;ENCLOSING CIRCLE;;;;
-20DE;COMBINING ENCLOSING SQUARE;Me;0;NSM;;;;;N;ENCLOSING SQUARE;;;;
-20DF;COMBINING ENCLOSING DIAMOND;Me;0;NSM;;;;;N;ENCLOSING DIAMOND;;;;
-20E0;COMBINING ENCLOSING CIRCLE BACKSLASH;Me;0;NSM;;;;;N;ENCLOSING CIRCLE SLASH;;;;
-20E1;COMBINING LEFT RIGHT ARROW ABOVE;Mn;230;NSM;;;;;N;NON-SPACING LEFT RIGHT ARROW ABOVE;;;;
-20E2;COMBINING ENCLOSING SCREEN;Me;0;NSM;;;;;N;;;;;
-20E3;COMBINING ENCLOSING KEYCAP;Me;0;NSM;;;;;N;;;;;
-20E4;COMBINING ENCLOSING UPWARD POINTING TRIANGLE;Me;0;NSM;;;;;N;;;;;
-20E5;COMBINING REVERSE SOLIDUS OVERLAY;Mn;1;NSM;;;;;N;;;;;
-20E6;COMBINING DOUBLE VERTICAL STROKE OVERLAY;Mn;1;NSM;;;;;N;;;;;
-20E7;COMBINING ANNUITY SYMBOL;Mn;230;NSM;;;;;N;;;;;
-20E8;COMBINING TRIPLE UNDERDOT;Mn;220;NSM;;;;;N;;;;;
-20E9;COMBINING WIDE BRIDGE ABOVE;Mn;230;NSM;;;;;N;;;;;
-20EA;COMBINING LEFTWARDS ARROW OVERLAY;Mn;1;NSM;;;;;N;;;;;
-20EB;COMBINING LONG DOUBLE SOLIDUS OVERLAY;Mn;1;NSM;;;;;N;;;;;
-20EC;COMBINING RIGHTWARDS HARPOON WITH BARB DOWNWARDS;Mn;220;NSM;;;;;N;;;;;
-20ED;COMBINING LEFTWARDS HARPOON WITH BARB DOWNWARDS;Mn;220;NSM;;;;;N;;;;;
-20EE;COMBINING LEFT ARROW BELOW;Mn;220;NSM;;;;;N;;;;;
-20EF;COMBINING RIGHT ARROW BELOW;Mn;220;NSM;;;;;N;;;;;
-20F0;COMBINING ASTERISK ABOVE;Mn;230;NSM;;;;;N;;;;;
-2100;ACCOUNT OF;So;0;ON;<compat> 0061 002F 0063;;;;N;;;;;
-2101;ADDRESSED TO THE SUBJECT;So;0;ON;<compat> 0061 002F 0073;;;;N;;;;;
-2102;DOUBLE-STRUCK CAPITAL C;Lu;0;L;<font> 0043;;;;N;DOUBLE-STRUCK C;;;;
-2103;DEGREE CELSIUS;So;0;ON;<compat> 00B0 0043;;;;N;DEGREES CENTIGRADE;;;;
-2104;CENTRE LINE SYMBOL;So;0;ON;;;;;N;C L SYMBOL;;;;
-2105;CARE OF;So;0;ON;<compat> 0063 002F 006F;;;;N;;;;;
-2106;CADA UNA;So;0;ON;<compat> 0063 002F 0075;;;;N;;;;;
-2107;EULER CONSTANT;Lu;0;L;<compat> 0190;;;;N;EULERS;;;;
-2108;SCRUPLE;So;0;ON;;;;;N;;;;;
-2109;DEGREE FAHRENHEIT;So;0;ON;<compat> 00B0 0046;;;;N;DEGREES FAHRENHEIT;;;;
-210A;SCRIPT SMALL G;Ll;0;L;<font> 0067;;;;N;;;;;
-210B;SCRIPT CAPITAL H;Lu;0;L;<font> 0048;;;;N;SCRIPT H;;;;
-210C;BLACK-LETTER CAPITAL H;Lu;0;L;<font> 0048;;;;N;BLACK-LETTER H;;;;
-210D;DOUBLE-STRUCK CAPITAL H;Lu;0;L;<font> 0048;;;;N;DOUBLE-STRUCK H;;;;
-210E;PLANCK CONSTANT;Ll;0;L;<font> 0068;;;;N;;;;;
-210F;PLANCK CONSTANT OVER TWO PI;Ll;0;L;<font> 0127;;;;N;PLANCK CONSTANT OVER 2 PI;;;;
-2110;SCRIPT CAPITAL I;Lu;0;L;<font> 0049;;;;N;SCRIPT I;;;;
-2111;BLACK-LETTER CAPITAL I;Lu;0;L;<font> 0049;;;;N;BLACK-LETTER I;;;;
-2112;SCRIPT CAPITAL L;Lu;0;L;<font> 004C;;;;N;SCRIPT L;;;;
-2113;SCRIPT SMALL L;Ll;0;L;<font> 006C;;;;N;;;;;
-2114;L B BAR SYMBOL;So;0;ON;;;;;N;;;;;
-2115;DOUBLE-STRUCK CAPITAL N;Lu;0;L;<font> 004E;;;;N;DOUBLE-STRUCK N;;;;
-2116;NUMERO SIGN;So;0;ON;<compat> 004E 006F;;;;N;NUMERO;;;;
-2117;SOUND RECORDING COPYRIGHT;So;0;ON;;;;;N;;;;;
-2118;SCRIPT CAPITAL P;So;0;ON;;;;;N;SCRIPT P;;;;
-2119;DOUBLE-STRUCK CAPITAL P;Lu;0;L;<font> 0050;;;;N;DOUBLE-STRUCK P;;;;
-211A;DOUBLE-STRUCK CAPITAL Q;Lu;0;L;<font> 0051;;;;N;DOUBLE-STRUCK Q;;;;
-211B;SCRIPT CAPITAL R;Lu;0;L;<font> 0052;;;;N;SCRIPT R;;;;
-211C;BLACK-LETTER CAPITAL R;Lu;0;L;<font> 0052;;;;N;BLACK-LETTER R;;;;
-211D;DOUBLE-STRUCK CAPITAL R;Lu;0;L;<font> 0052;;;;N;DOUBLE-STRUCK R;;;;
-211E;PRESCRIPTION TAKE;So;0;ON;;;;;N;;;;;
-211F;RESPONSE;So;0;ON;;;;;N;;;;;
-2120;SERVICE MARK;So;0;ON;<super> 0053 004D;;;;N;;;;;
-2121;TELEPHONE SIGN;So;0;ON;<compat> 0054 0045 004C;;;;N;T E L SYMBOL;;;;
-2122;TRADE MARK SIGN;So;0;ON;<super> 0054 004D;;;;N;TRADEMARK;;;;
-2123;VERSICLE;So;0;ON;;;;;N;;;;;
-2124;DOUBLE-STRUCK CAPITAL Z;Lu;0;L;<font> 005A;;;;N;DOUBLE-STRUCK Z;;;;
-2125;OUNCE SIGN;So;0;ON;;;;;N;OUNCE;;;;
-2126;OHM SIGN;Lu;0;L;03A9;;;;N;OHM;;;03C9;
-2127;INVERTED OHM SIGN;So;0;ON;;;;;N;MHO;;;;
-2128;BLACK-LETTER CAPITAL Z;Lu;0;L;<font> 005A;;;;N;BLACK-LETTER Z;;;;
-2129;TURNED GREEK SMALL LETTER IOTA;So;0;ON;;;;;N;;;;;
-212A;KELVIN SIGN;Lu;0;L;004B;;;;N;DEGREES KELVIN;;;006B;
-212B;ANGSTROM SIGN;Lu;0;L;00C5;;;;N;ANGSTROM UNIT;;;00E5;
-212C;SCRIPT CAPITAL B;Lu;0;L;<font> 0042;;;;N;SCRIPT B;;;;
-212D;BLACK-LETTER CAPITAL C;Lu;0;L;<font> 0043;;;;N;BLACK-LETTER C;;;;
-212E;ESTIMATED SYMBOL;So;0;ET;;;;;N;;;;;
-212F;SCRIPT SMALL E;Ll;0;L;<font> 0065;;;;N;;;;;
-2130;SCRIPT CAPITAL E;Lu;0;L;<font> 0045;;;;N;SCRIPT E;;;;
-2131;SCRIPT CAPITAL F;Lu;0;L;<font> 0046;;;;N;SCRIPT F;;;;
-2132;TURNED CAPITAL F;Lu;0;L;;;;;N;TURNED F;;;214E;
-2133;SCRIPT CAPITAL M;Lu;0;L;<font> 004D;;;;N;SCRIPT M;;;;
-2134;SCRIPT SMALL O;Ll;0;L;<font> 006F;;;;N;;;;;
-2135;ALEF SYMBOL;Lo;0;L;<compat> 05D0;;;;N;FIRST TRANSFINITE CARDINAL;;;;
-2136;BET SYMBOL;Lo;0;L;<compat> 05D1;;;;N;SECOND TRANSFINITE CARDINAL;;;;
-2137;GIMEL SYMBOL;Lo;0;L;<compat> 05D2;;;;N;THIRD TRANSFINITE CARDINAL;;;;
-2138;DALET SYMBOL;Lo;0;L;<compat> 05D3;;;;N;FOURTH TRANSFINITE CARDINAL;;;;
-2139;INFORMATION SOURCE;Ll;0;L;<font> 0069;;;;N;;;;;
-213A;ROTATED CAPITAL Q;So;0;ON;;;;;N;;;;;
-213B;FACSIMILE SIGN;So;0;ON;<compat> 0046 0041 0058;;;;N;;;;;
-213C;DOUBLE-STRUCK SMALL PI;Ll;0;L;<font> 03C0;;;;N;;;;;
-213D;DOUBLE-STRUCK SMALL GAMMA;Ll;0;L;<font> 03B3;;;;N;;;;;
-213E;DOUBLE-STRUCK CAPITAL GAMMA;Lu;0;L;<font> 0393;;;;N;;;;;
-213F;DOUBLE-STRUCK CAPITAL PI;Lu;0;L;<font> 03A0;;;;N;;;;;
-2140;DOUBLE-STRUCK N-ARY SUMMATION;Sm;0;ON;<font> 2211;;;;Y;;;;;
-2141;TURNED SANS-SERIF CAPITAL G;Sm;0;ON;;;;;N;;;;;
-2142;TURNED SANS-SERIF CAPITAL L;Sm;0;ON;;;;;N;;;;;
-2143;REVERSED SANS-SERIF CAPITAL L;Sm;0;ON;;;;;N;;;;;
-2144;TURNED SANS-SERIF CAPITAL Y;Sm;0;ON;;;;;N;;;;;
-2145;DOUBLE-STRUCK ITALIC CAPITAL D;Lu;0;L;<font> 0044;;;;N;;;;;
-2146;DOUBLE-STRUCK ITALIC SMALL D;Ll;0;L;<font> 0064;;;;N;;;;;
-2147;DOUBLE-STRUCK ITALIC SMALL E;Ll;0;L;<font> 0065;;;;N;;;;;
-2148;DOUBLE-STRUCK ITALIC SMALL I;Ll;0;L;<font> 0069;;;;N;;;;;
-2149;DOUBLE-STRUCK ITALIC SMALL J;Ll;0;L;<font> 006A;;;;N;;;;;
-214A;PROPERTY LINE;So;0;ON;;;;;N;;;;;
-214B;TURNED AMPERSAND;Sm;0;ON;;;;;N;;;;;
-214C;PER SIGN;So;0;ON;;;;;N;;;;;
-214D;AKTIESELSKAB;So;0;ON;;;;;N;;;;;
-214E;TURNED SMALL F;Ll;0;L;;;;;N;;;2132;;2132
-214F;SYMBOL FOR SAMARITAN SOURCE;So;0;L;;;;;N;;;;;
-2153;VULGAR FRACTION ONE THIRD;No;0;ON;<fraction> 0031 2044 0033;;;1/3;N;FRACTION ONE THIRD;;;;
-2154;VULGAR FRACTION TWO THIRDS;No;0;ON;<fraction> 0032 2044 0033;;;2/3;N;FRACTION TWO THIRDS;;;;
-2155;VULGAR FRACTION ONE FIFTH;No;0;ON;<fraction> 0031 2044 0035;;;1/5;N;FRACTION ONE FIFTH;;;;
-2156;VULGAR FRACTION TWO FIFTHS;No;0;ON;<fraction> 0032 2044 0035;;;2/5;N;FRACTION TWO FIFTHS;;;;
-2157;VULGAR FRACTION THREE FIFTHS;No;0;ON;<fraction> 0033 2044 0035;;;3/5;N;FRACTION THREE FIFTHS;;;;
-2158;VULGAR FRACTION FOUR FIFTHS;No;0;ON;<fraction> 0034 2044 0035;;;4/5;N;FRACTION FOUR FIFTHS;;;;
-2159;VULGAR FRACTION ONE SIXTH;No;0;ON;<fraction> 0031 2044 0036;;;1/6;N;FRACTION ONE SIXTH;;;;
-215A;VULGAR FRACTION FIVE SIXTHS;No;0;ON;<fraction> 0035 2044 0036;;;5/6;N;FRACTION FIVE SIXTHS;;;;
-215B;VULGAR FRACTION ONE EIGHTH;No;0;ON;<fraction> 0031 2044 0038;;;1/8;N;FRACTION ONE EIGHTH;;;;
-215C;VULGAR FRACTION THREE EIGHTHS;No;0;ON;<fraction> 0033 2044 0038;;;3/8;N;FRACTION THREE EIGHTHS;;;;
-215D;VULGAR FRACTION FIVE EIGHTHS;No;0;ON;<fraction> 0035 2044 0038;;;5/8;N;FRACTION FIVE EIGHTHS;;;;
-215E;VULGAR FRACTION SEVEN EIGHTHS;No;0;ON;<fraction> 0037 2044 0038;;;7/8;N;FRACTION SEVEN EIGHTHS;;;;
-215F;FRACTION NUMERATOR ONE;No;0;ON;<fraction> 0031 2044;;;1;N;;;;;
-2160;ROMAN NUMERAL ONE;Nl;0;L;<compat> 0049;;;1;N;;;;2170;
-2161;ROMAN NUMERAL TWO;Nl;0;L;<compat> 0049 0049;;;2;N;;;;2171;
-2162;ROMAN NUMERAL THREE;Nl;0;L;<compat> 0049 0049 0049;;;3;N;;;;2172;
-2163;ROMAN NUMERAL FOUR;Nl;0;L;<compat> 0049 0056;;;4;N;;;;2173;
-2164;ROMAN NUMERAL FIVE;Nl;0;L;<compat> 0056;;;5;N;;;;2174;
-2165;ROMAN NUMERAL SIX;Nl;0;L;<compat> 0056 0049;;;6;N;;;;2175;
-2166;ROMAN NUMERAL SEVEN;Nl;0;L;<compat> 0056 0049 0049;;;7;N;;;;2176;
-2167;ROMAN NUMERAL EIGHT;Nl;0;L;<compat> 0056 0049 0049 0049;;;8;N;;;;2177;
-2168;ROMAN NUMERAL NINE;Nl;0;L;<compat> 0049 0058;;;9;N;;;;2178;
-2169;ROMAN NUMERAL TEN;Nl;0;L;<compat> 0058;;;10;N;;;;2179;
-216A;ROMAN NUMERAL ELEVEN;Nl;0;L;<compat> 0058 0049;;;11;N;;;;217A;
-216B;ROMAN NUMERAL TWELVE;Nl;0;L;<compat> 0058 0049 0049;;;12;N;;;;217B;
-216C;ROMAN NUMERAL FIFTY;Nl;0;L;<compat> 004C;;;50;N;;;;217C;
-216D;ROMAN NUMERAL ONE HUNDRED;Nl;0;L;<compat> 0043;;;100;N;;;;217D;
-216E;ROMAN NUMERAL FIVE HUNDRED;Nl;0;L;<compat> 0044;;;500;N;;;;217E;
-216F;ROMAN NUMERAL ONE THOUSAND;Nl;0;L;<compat> 004D;;;1000;N;;;;217F;
-2170;SMALL ROMAN NUMERAL ONE;Nl;0;L;<compat> 0069;;;1;N;;;2160;;2160
-2171;SMALL ROMAN NUMERAL TWO;Nl;0;L;<compat> 0069 0069;;;2;N;;;2161;;2161
-2172;SMALL ROMAN NUMERAL THREE;Nl;0;L;<compat> 0069 0069 0069;;;3;N;;;2162;;2162
-2173;SMALL ROMAN NUMERAL FOUR;Nl;0;L;<compat> 0069 0076;;;4;N;;;2163;;2163
-2174;SMALL ROMAN NUMERAL FIVE;Nl;0;L;<compat> 0076;;;5;N;;;2164;;2164
-2175;SMALL ROMAN NUMERAL SIX;Nl;0;L;<compat> 0076 0069;;;6;N;;;2165;;2165
-2176;SMALL ROMAN NUMERAL SEVEN;Nl;0;L;<compat> 0076 0069 0069;;;7;N;;;2166;;2166
-2177;SMALL ROMAN NUMERAL EIGHT;Nl;0;L;<compat> 0076 0069 0069 0069;;;8;N;;;2167;;2167
-2178;SMALL ROMAN NUMERAL NINE;Nl;0;L;<compat> 0069 0078;;;9;N;;;2168;;2168
-2179;SMALL ROMAN NUMERAL TEN;Nl;0;L;<compat> 0078;;;10;N;;;2169;;2169
-217A;SMALL ROMAN NUMERAL ELEVEN;Nl;0;L;<compat> 0078 0069;;;11;N;;;216A;;216A
-217B;SMALL ROMAN NUMERAL TWELVE;Nl;0;L;<compat> 0078 0069 0069;;;12;N;;;216B;;216B
-217C;SMALL ROMAN NUMERAL FIFTY;Nl;0;L;<compat> 006C;;;50;N;;;216C;;216C
-217D;SMALL ROMAN NUMERAL ONE HUNDRED;Nl;0;L;<compat> 0063;;;100;N;;;216D;;216D
-217E;SMALL ROMAN NUMERAL FIVE HUNDRED;Nl;0;L;<compat> 0064;;;500;N;;;216E;;216E
-217F;SMALL ROMAN NUMERAL ONE THOUSAND;Nl;0;L;<compat> 006D;;;1000;N;;;216F;;216F
-2180;ROMAN NUMERAL ONE THOUSAND C D;Nl;0;L;;;;1000;N;;;;;
-2181;ROMAN NUMERAL FIVE THOUSAND;Nl;0;L;;;;5000;N;;;;;
-2182;ROMAN NUMERAL TEN THOUSAND;Nl;0;L;;;;10000;N;;;;;
-2183;ROMAN NUMERAL REVERSED ONE HUNDRED;Lu;0;L;;;;;N;;;;2184;
-2184;LATIN SMALL LETTER REVERSED C;Ll;0;L;;;;;N;;;2183;;2183
-2185;ROMAN NUMERAL SIX LATE FORM;Nl;0;L;;;;6;N;;;;;
-2186;ROMAN NUMERAL FIFTY EARLY FORM;Nl;0;L;;;;50;N;;;;;
-2187;ROMAN NUMERAL FIFTY THOUSAND;Nl;0;L;;;;50000;N;;;;;
-2188;ROMAN NUMERAL ONE HUNDRED THOUSAND;Nl;0;L;;;;100000;N;;;;;
-2190;LEFTWARDS ARROW;Sm;0;ON;;;;;N;LEFT ARROW;;;;
-2191;UPWARDS ARROW;Sm;0;ON;;;;;N;UP ARROW;;;;
-2192;RIGHTWARDS ARROW;Sm;0;ON;;;;;N;RIGHT ARROW;;;;
-2193;DOWNWARDS ARROW;Sm;0;ON;;;;;N;DOWN ARROW;;;;
-2194;LEFT RIGHT ARROW;Sm;0;ON;;;;;N;;;;;
-2195;UP DOWN ARROW;So;0;ON;;;;;N;;;;;
-2196;NORTH WEST ARROW;So;0;ON;;;;;N;UPPER LEFT ARROW;;;;
-2197;NORTH EAST ARROW;So;0;ON;;;;;N;UPPER RIGHT ARROW;;;;
-2198;SOUTH EAST ARROW;So;0;ON;;;;;N;LOWER RIGHT ARROW;;;;
-2199;SOUTH WEST ARROW;So;0;ON;;;;;N;LOWER LEFT ARROW;;;;
-219A;LEFTWARDS ARROW WITH STROKE;Sm;0;ON;2190 0338;;;;N;LEFT ARROW WITH STROKE;;;;
-219B;RIGHTWARDS ARROW WITH STROKE;Sm;0;ON;2192 0338;;;;N;RIGHT ARROW WITH STROKE;;;;
-219C;LEFTWARDS WAVE ARROW;So;0;ON;;;;;N;LEFT WAVE ARROW;;;;
-219D;RIGHTWARDS WAVE ARROW;So;0;ON;;;;;N;RIGHT WAVE ARROW;;;;
-219E;LEFTWARDS TWO HEADED ARROW;So;0;ON;;;;;N;LEFT TWO HEADED ARROW;;;;
-219F;UPWARDS TWO HEADED ARROW;So;0;ON;;;;;N;UP TWO HEADED ARROW;;;;
-21A0;RIGHTWARDS TWO HEADED ARROW;Sm;0;ON;;;;;N;RIGHT TWO HEADED ARROW;;;;
-21A1;DOWNWARDS TWO HEADED ARROW;So;0;ON;;;;;N;DOWN TWO HEADED ARROW;;;;
-21A2;LEFTWARDS ARROW WITH TAIL;So;0;ON;;;;;N;LEFT ARROW WITH TAIL;;;;
-21A3;RIGHTWARDS ARROW WITH TAIL;Sm;0;ON;;;;;N;RIGHT ARROW WITH TAIL;;;;
-21A4;LEFTWARDS ARROW FROM BAR;So;0;ON;;;;;N;LEFT ARROW FROM BAR;;;;
-21A5;UPWARDS ARROW FROM BAR;So;0;ON;;;;;N;UP ARROW FROM BAR;;;;
-21A6;RIGHTWARDS ARROW FROM BAR;Sm;0;ON;;;;;N;RIGHT ARROW FROM BAR;;;;
-21A7;DOWNWARDS ARROW FROM BAR;So;0;ON;;;;;N;DOWN ARROW FROM BAR;;;;
-21A8;UP DOWN ARROW WITH BASE;So;0;ON;;;;;N;;;;;
-21A9;LEFTWARDS ARROW WITH HOOK;So;0;ON;;;;;N;LEFT ARROW WITH HOOK;;;;
-21AA;RIGHTWARDS ARROW WITH HOOK;So;0;ON;;;;;N;RIGHT ARROW WITH HOOK;;;;
-21AB;LEFTWARDS ARROW WITH LOOP;So;0;ON;;;;;N;LEFT ARROW WITH LOOP;;;;
-21AC;RIGHTWARDS ARROW WITH LOOP;So;0;ON;;;;;N;RIGHT ARROW WITH LOOP;;;;
-21AD;LEFT RIGHT WAVE ARROW;So;0;ON;;;;;N;;;;;
-21AE;LEFT RIGHT ARROW WITH STROKE;Sm;0;ON;2194 0338;;;;N;;;;;
-21AF;DOWNWARDS ZIGZAG ARROW;So;0;ON;;;;;N;DOWN ZIGZAG ARROW;;;;
-21B0;UPWARDS ARROW WITH TIP LEFTWARDS;So;0;ON;;;;;N;UP ARROW WITH TIP LEFT;;;;
-21B1;UPWARDS ARROW WITH TIP RIGHTWARDS;So;0;ON;;;;;N;UP ARROW WITH TIP RIGHT;;;;
-21B2;DOWNWARDS ARROW WITH TIP LEFTWARDS;So;0;ON;;;;;N;DOWN ARROW WITH TIP LEFT;;;;
-21B3;DOWNWARDS ARROW WITH TIP RIGHTWARDS;So;0;ON;;;;;N;DOWN ARROW WITH TIP RIGHT;;;;
-21B4;RIGHTWARDS ARROW WITH CORNER DOWNWARDS;So;0;ON;;;;;N;RIGHT ARROW WITH CORNER DOWN;;;;
-21B5;DOWNWARDS ARROW WITH CORNER LEFTWARDS;So;0;ON;;;;;N;DOWN ARROW WITH CORNER LEFT;;;;
-21B6;ANTICLOCKWISE TOP SEMICIRCLE ARROW;So;0;ON;;;;;N;;;;;
-21B7;CLOCKWISE TOP SEMICIRCLE ARROW;So;0;ON;;;;;N;;;;;
-21B8;NORTH WEST ARROW TO LONG BAR;So;0;ON;;;;;N;UPPER LEFT ARROW TO LONG BAR;;;;
-21B9;LEFTWARDS ARROW TO BAR OVER RIGHTWARDS ARROW TO BAR;So;0;ON;;;;;N;LEFT ARROW TO BAR OVER RIGHT ARROW TO BAR;;;;
-21BA;ANTICLOCKWISE OPEN CIRCLE ARROW;So;0;ON;;;;;N;;;;;
-21BB;CLOCKWISE OPEN CIRCLE ARROW;So;0;ON;;;;;N;;;;;
-21BC;LEFTWARDS HARPOON WITH BARB UPWARDS;So;0;ON;;;;;N;LEFT HARPOON WITH BARB UP;;;;
-21BD;LEFTWARDS HARPOON WITH BARB DOWNWARDS;So;0;ON;;;;;N;LEFT HARPOON WITH BARB DOWN;;;;
-21BE;UPWARDS HARPOON WITH BARB RIGHTWARDS;So;0;ON;;;;;N;UP HARPOON WITH BARB RIGHT;;;;
-21BF;UPWARDS HARPOON WITH BARB LEFTWARDS;So;0;ON;;;;;N;UP HARPOON WITH BARB LEFT;;;;
-21C0;RIGHTWARDS HARPOON WITH BARB UPWARDS;So;0;ON;;;;;N;RIGHT HARPOON WITH BARB UP;;;;
-21C1;RIGHTWARDS HARPOON WITH BARB DOWNWARDS;So;0;ON;;;;;N;RIGHT HARPOON WITH BARB DOWN;;;;
-21C2;DOWNWARDS HARPOON WITH BARB RIGHTWARDS;So;0;ON;;;;;N;DOWN HARPOON WITH BARB RIGHT;;;;
-21C3;DOWNWARDS HARPOON WITH BARB LEFTWARDS;So;0;ON;;;;;N;DOWN HARPOON WITH BARB LEFT;;;;
-21C4;RIGHTWARDS ARROW OVER LEFTWARDS ARROW;So;0;ON;;;;;N;RIGHT ARROW OVER LEFT ARROW;;;;
-21C5;UPWARDS ARROW LEFTWARDS OF DOWNWARDS ARROW;So;0;ON;;;;;N;UP ARROW LEFT OF DOWN ARROW;;;;
-21C6;LEFTWARDS ARROW OVER RIGHTWARDS ARROW;So;0;ON;;;;;N;LEFT ARROW OVER RIGHT ARROW;;;;
-21C7;LEFTWARDS PAIRED ARROWS;So;0;ON;;;;;N;LEFT PAIRED ARROWS;;;;
-21C8;UPWARDS PAIRED ARROWS;So;0;ON;;;;;N;UP PAIRED ARROWS;;;;
-21C9;RIGHTWARDS PAIRED ARROWS;So;0;ON;;;;;N;RIGHT PAIRED ARROWS;;;;
-21CA;DOWNWARDS PAIRED ARROWS;So;0;ON;;;;;N;DOWN PAIRED ARROWS;;;;
-21CB;LEFTWARDS HARPOON OVER RIGHTWARDS HARPOON;So;0;ON;;;;;N;LEFT HARPOON OVER RIGHT HARPOON;;;;
-21CC;RIGHTWARDS HARPOON OVER LEFTWARDS HARPOON;So;0;ON;;;;;N;RIGHT HARPOON OVER LEFT HARPOON;;;;
-21CD;LEFTWARDS DOUBLE ARROW WITH STROKE;So;0;ON;21D0 0338;;;;N;LEFT DOUBLE ARROW WITH STROKE;;;;
-21CE;LEFT RIGHT DOUBLE ARROW WITH STROKE;Sm;0;ON;21D4 0338;;;;N;;;;;
-21CF;RIGHTWARDS DOUBLE ARROW WITH STROKE;Sm;0;ON;21D2 0338;;;;N;RIGHT DOUBLE ARROW WITH STROKE;;;;
-21D0;LEFTWARDS DOUBLE ARROW;So;0;ON;;;;;N;LEFT DOUBLE ARROW;;;;
-21D1;UPWARDS DOUBLE ARROW;So;0;ON;;;;;N;UP DOUBLE ARROW;;;;
-21D2;RIGHTWARDS DOUBLE ARROW;Sm;0;ON;;;;;N;RIGHT DOUBLE ARROW;;;;
-21D3;DOWNWARDS DOUBLE ARROW;So;0;ON;;;;;N;DOWN DOUBLE ARROW;;;;
-21D4;LEFT RIGHT DOUBLE ARROW;Sm;0;ON;;;;;N;;;;;
-21D5;UP DOWN DOUBLE ARROW;So;0;ON;;;;;N;;;;;
-21D6;NORTH WEST DOUBLE ARROW;So;0;ON;;;;;N;UPPER LEFT DOUBLE ARROW;;;;
-21D7;NORTH EAST DOUBLE ARROW;So;0;ON;;;;;N;UPPER RIGHT DOUBLE ARROW;;;;
-21D8;SOUTH EAST DOUBLE ARROW;So;0;ON;;;;;N;LOWER RIGHT DOUBLE ARROW;;;;
-21D9;SOUTH WEST DOUBLE ARROW;So;0;ON;;;;;N;LOWER LEFT DOUBLE ARROW;;;;
-21DA;LEFTWARDS TRIPLE ARROW;So;0;ON;;;;;N;LEFT TRIPLE ARROW;;;;
-21DB;RIGHTWARDS TRIPLE ARROW;So;0;ON;;;;;N;RIGHT TRIPLE ARROW;;;;
-21DC;LEFTWARDS SQUIGGLE ARROW;So;0;ON;;;;;N;LEFT SQUIGGLE ARROW;;;;
-21DD;RIGHTWARDS SQUIGGLE ARROW;So;0;ON;;;;;N;RIGHT SQUIGGLE ARROW;;;;
-21DE;UPWARDS ARROW WITH DOUBLE STROKE;So;0;ON;;;;;N;UP ARROW WITH DOUBLE STROKE;;;;
-21DF;DOWNWARDS ARROW WITH DOUBLE STROKE;So;0;ON;;;;;N;DOWN ARROW WITH DOUBLE STROKE;;;;
-21E0;LEFTWARDS DASHED ARROW;So;0;ON;;;;;N;LEFT DASHED ARROW;;;;
-21E1;UPWARDS DASHED ARROW;So;0;ON;;;;;N;UP DASHED ARROW;;;;
-21E2;RIGHTWARDS DASHED ARROW;So;0;ON;;;;;N;RIGHT DASHED ARROW;;;;
-21E3;DOWNWARDS DASHED ARROW;So;0;ON;;;;;N;DOWN DASHED ARROW;;;;
-21E4;LEFTWARDS ARROW TO BAR;So;0;ON;;;;;N;LEFT ARROW TO BAR;;;;
-21E5;RIGHTWARDS ARROW TO BAR;So;0;ON;;;;;N;RIGHT ARROW TO BAR;;;;
-21E6;LEFTWARDS WHITE ARROW;So;0;ON;;;;;N;WHITE LEFT ARROW;;;;
-21E7;UPWARDS WHITE ARROW;So;0;ON;;;;;N;WHITE UP ARROW;;;;
-21E8;RIGHTWARDS WHITE ARROW;So;0;ON;;;;;N;WHITE RIGHT ARROW;;;;
-21E9;DOWNWARDS WHITE ARROW;So;0;ON;;;;;N;WHITE DOWN ARROW;;;;
-21EA;UPWARDS WHITE ARROW FROM BAR;So;0;ON;;;;;N;WHITE UP ARROW FROM BAR;;;;
-21EB;UPWARDS WHITE ARROW ON PEDESTAL;So;0;ON;;;;;N;;;;;
-21EC;UPWARDS WHITE ARROW ON PEDESTAL WITH HORIZONTAL BAR;So;0;ON;;;;;N;;;;;
-21ED;UPWARDS WHITE ARROW ON PEDESTAL WITH VERTICAL BAR;So;0;ON;;;;;N;;;;;
-21EE;UPWARDS WHITE DOUBLE ARROW;So;0;ON;;;;;N;;;;;
-21EF;UPWARDS WHITE DOUBLE ARROW ON PEDESTAL;So;0;ON;;;;;N;;;;;
-21F0;RIGHTWARDS WHITE ARROW FROM WALL;So;0;ON;;;;;N;;;;;
-21F1;NORTH WEST ARROW TO CORNER;So;0;ON;;;;;N;;;;;
-21F2;SOUTH EAST ARROW TO CORNER;So;0;ON;;;;;N;;;;;
-21F3;UP DOWN WHITE ARROW;So;0;ON;;;;;N;;;;;
-21F4;RIGHT ARROW WITH SMALL CIRCLE;Sm;0;ON;;;;;N;;;;;
-21F5;DOWNWARDS ARROW LEFTWARDS OF UPWARDS ARROW;Sm;0;ON;;;;;N;;;;;
-21F6;THREE RIGHTWARDS ARROWS;Sm;0;ON;;;;;N;;;;;
-21F7;LEFTWARDS ARROW WITH VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
-21F8;RIGHTWARDS ARROW WITH VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
-21F9;LEFT RIGHT ARROW WITH VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
-21FA;LEFTWARDS ARROW WITH DOUBLE VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
-21FB;RIGHTWARDS ARROW WITH DOUBLE VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
-21FC;LEFT RIGHT ARROW WITH DOUBLE VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
-21FD;LEFTWARDS OPEN-HEADED ARROW;Sm;0;ON;;;;;N;;;;;
-21FE;RIGHTWARDS OPEN-HEADED ARROW;Sm;0;ON;;;;;N;;;;;
-21FF;LEFT RIGHT OPEN-HEADED ARROW;Sm;0;ON;;;;;N;;;;;
-2200;FOR ALL;Sm;0;ON;;;;;N;;;;;
-2201;COMPLEMENT;Sm;0;ON;;;;;Y;;;;;
-2202;PARTIAL DIFFERENTIAL;Sm;0;ON;;;;;Y;;;;;
-2203;THERE EXISTS;Sm;0;ON;;;;;Y;;;;;
-2204;THERE DOES NOT EXIST;Sm;0;ON;2203 0338;;;;Y;;;;;
-2205;EMPTY SET;Sm;0;ON;;;;;N;;;;;
-2206;INCREMENT;Sm;0;ON;;;;;N;;;;;
-2207;NABLA;Sm;0;ON;;;;;N;;;;;
-2208;ELEMENT OF;Sm;0;ON;;;;;Y;;;;;
-2209;NOT AN ELEMENT OF;Sm;0;ON;2208 0338;;;;Y;;;;;
-220A;SMALL ELEMENT OF;Sm;0;ON;;;;;Y;;;;;
-220B;CONTAINS AS MEMBER;Sm;0;ON;;;;;Y;;;;;
-220C;DOES NOT CONTAIN AS MEMBER;Sm;0;ON;220B 0338;;;;Y;;;;;
-220D;SMALL CONTAINS AS MEMBER;Sm;0;ON;;;;;Y;;;;;
-220E;END OF PROOF;Sm;0;ON;;;;;N;;;;;
-220F;N-ARY PRODUCT;Sm;0;ON;;;;;N;;;;;
-2210;N-ARY COPRODUCT;Sm;0;ON;;;;;N;;;;;
-2211;N-ARY SUMMATION;Sm;0;ON;;;;;Y;;;;;
-2212;MINUS SIGN;Sm;0;ES;;;;;N;;;;;
-2213;MINUS-OR-PLUS SIGN;Sm;0;ET;;;;;N;;;;;
-2214;DOT PLUS;Sm;0;ON;;;;;N;;;;;
-2215;DIVISION SLASH;Sm;0;ON;;;;;Y;;;;;
-2216;SET MINUS;Sm;0;ON;;;;;Y;;;;;
-2217;ASTERISK OPERATOR;Sm;0;ON;;;;;N;;;;;
-2218;RING OPERATOR;Sm;0;ON;;;;;N;;;;;
-2219;BULLET OPERATOR;Sm;0;ON;;;;;N;;;;;
-221A;SQUARE ROOT;Sm;0;ON;;;;;Y;;;;;
-221B;CUBE ROOT;Sm;0;ON;;;;;Y;;;;;
-221C;FOURTH ROOT;Sm;0;ON;;;;;Y;;;;;
-221D;PROPORTIONAL TO;Sm;0;ON;;;;;Y;;;;;
-221E;INFINITY;Sm;0;ON;;;;;N;;;;;
-221F;RIGHT ANGLE;Sm;0;ON;;;;;Y;;;;;
-2220;ANGLE;Sm;0;ON;;;;;Y;;;;;
-2221;MEASURED ANGLE;Sm;0;ON;;;;;Y;;;;;
-2222;SPHERICAL ANGLE;Sm;0;ON;;;;;Y;;;;;
-2223;DIVIDES;Sm;0;ON;;;;;N;;;;;
-2224;DOES NOT DIVIDE;Sm;0;ON;2223 0338;;;;Y;;;;;
-2225;PARALLEL TO;Sm;0;ON;;;;;N;;;;;
-2226;NOT PARALLEL TO;Sm;0;ON;2225 0338;;;;Y;;;;;
-2227;LOGICAL AND;Sm;0;ON;;;;;N;;;;;
-2228;LOGICAL OR;Sm;0;ON;;;;;N;;;;;
-2229;INTERSECTION;Sm;0;ON;;;;;N;;;;;
-222A;UNION;Sm;0;ON;;;;;N;;;;;
-222B;INTEGRAL;Sm;0;ON;;;;;Y;;;;;
-222C;DOUBLE INTEGRAL;Sm;0;ON;<compat> 222B 222B;;;;Y;;;;;
-222D;TRIPLE INTEGRAL;Sm;0;ON;<compat> 222B 222B 222B;;;;Y;;;;;
-222E;CONTOUR INTEGRAL;Sm;0;ON;;;;;Y;;;;;
-222F;SURFACE INTEGRAL;Sm;0;ON;<compat> 222E 222E;;;;Y;;;;;
-2230;VOLUME INTEGRAL;Sm;0;ON;<compat> 222E 222E 222E;;;;Y;;;;;
-2231;CLOCKWISE INTEGRAL;Sm;0;ON;;;;;Y;;;;;
-2232;CLOCKWISE CONTOUR INTEGRAL;Sm;0;ON;;;;;Y;;;;;
-2233;ANTICLOCKWISE CONTOUR INTEGRAL;Sm;0;ON;;;;;Y;;;;;
-2234;THEREFORE;Sm;0;ON;;;;;N;;;;;
-2235;BECAUSE;Sm;0;ON;;;;;N;;;;;
-2236;RATIO;Sm;0;ON;;;;;N;;;;;
-2237;PROPORTION;Sm;0;ON;;;;;N;;;;;
-2238;DOT MINUS;Sm;0;ON;;;;;N;;;;;
-2239;EXCESS;Sm;0;ON;;;;;Y;;;;;
-223A;GEOMETRIC PROPORTION;Sm;0;ON;;;;;N;;;;;
-223B;HOMOTHETIC;Sm;0;ON;;;;;Y;;;;;
-223C;TILDE OPERATOR;Sm;0;ON;;;;;Y;;;;;
-223D;REVERSED TILDE;Sm;0;ON;;;;;Y;;lazy S;;;
-223E;INVERTED LAZY S;Sm;0;ON;;;;;Y;;;;;
-223F;SINE WAVE;Sm;0;ON;;;;;Y;;;;;
-2240;WREATH PRODUCT;Sm;0;ON;;;;;Y;;;;;
-2241;NOT TILDE;Sm;0;ON;223C 0338;;;;Y;;;;;
-2242;MINUS TILDE;Sm;0;ON;;;;;Y;;;;;
-2243;ASYMPTOTICALLY EQUAL TO;Sm;0;ON;;;;;Y;;;;;
-2244;NOT ASYMPTOTICALLY EQUAL TO;Sm;0;ON;2243 0338;;;;Y;;;;;
-2245;APPROXIMATELY EQUAL TO;Sm;0;ON;;;;;Y;;;;;
-2246;APPROXIMATELY BUT NOT ACTUALLY EQUAL TO;Sm;0;ON;;;;;Y;;;;;
-2247;NEITHER APPROXIMATELY NOR ACTUALLY EQUAL TO;Sm;0;ON;2245 0338;;;;Y;;;;;
-2248;ALMOST EQUAL TO;Sm;0;ON;;;;;Y;;;;;
-2249;NOT ALMOST EQUAL TO;Sm;0;ON;2248 0338;;;;Y;;;;;
-224A;ALMOST EQUAL OR EQUAL TO;Sm;0;ON;;;;;Y;;;;;
-224B;TRIPLE TILDE;Sm;0;ON;;;;;Y;;;;;
-224C;ALL EQUAL TO;Sm;0;ON;;;;;Y;;;;;
-224D;EQUIVALENT TO;Sm;0;ON;;;;;N;;;;;
-224E;GEOMETRICALLY EQUIVALENT TO;Sm;0;ON;;;;;N;;;;;
-224F;DIFFERENCE BETWEEN;Sm;0;ON;;;;;N;;;;;
-2250;APPROACHES THE LIMIT;Sm;0;ON;;;;;N;;;;;
-2251;GEOMETRICALLY EQUAL TO;Sm;0;ON;;;;;N;;;;;
-2252;APPROXIMATELY EQUAL TO OR THE IMAGE OF;Sm;0;ON;;;;;Y;;;;;
-2253;IMAGE OF OR APPROXIMATELY EQUAL TO;Sm;0;ON;;;;;Y;;;;;
-2254;COLON EQUALS;Sm;0;ON;;;;;Y;COLON EQUAL;;;;
-2255;EQUALS COLON;Sm;0;ON;;;;;Y;EQUAL COLON;;;;
-2256;RING IN EQUAL TO;Sm;0;ON;;;;;N;;;;;
-2257;RING EQUAL TO;Sm;0;ON;;;;;N;;;;;
-2258;CORRESPONDS TO;Sm;0;ON;;;;;N;;;;;
-2259;ESTIMATES;Sm;0;ON;;;;;N;;;;;
-225A;EQUIANGULAR TO;Sm;0;ON;;;;;N;;;;;
-225B;STAR EQUALS;Sm;0;ON;;;;;N;;;;;
-225C;DELTA EQUAL TO;Sm;0;ON;;;;;N;;;;;
-225D;EQUAL TO BY DEFINITION;Sm;0;ON;;;;;N;;;;;
-225E;MEASURED BY;Sm;0;ON;;;;;N;;;;;
-225F;QUESTIONED EQUAL TO;Sm;0;ON;;;;;Y;;;;;
-2260;NOT EQUAL TO;Sm;0;ON;003D 0338;;;;Y;;;;;
-2261;IDENTICAL TO;Sm;0;ON;;;;;N;;;;;
-2262;NOT IDENTICAL TO;Sm;0;ON;2261 0338;;;;Y;;;;;
-2263;STRICTLY EQUIVALENT TO;Sm;0;ON;;;;;N;;;;;
-2264;LESS-THAN OR EQUAL TO;Sm;0;ON;;;;;Y;LESS THAN OR EQUAL TO;;;;
-2265;GREATER-THAN OR EQUAL TO;Sm;0;ON;;;;;Y;GREATER THAN OR EQUAL TO;;;;
-2266;LESS-THAN OVER EQUAL TO;Sm;0;ON;;;;;Y;LESS THAN OVER EQUAL TO;;;;
-2267;GREATER-THAN OVER EQUAL TO;Sm;0;ON;;;;;Y;GREATER THAN OVER EQUAL TO;;;;
-2268;LESS-THAN BUT NOT EQUAL TO;Sm;0;ON;;;;;Y;LESS THAN BUT NOT EQUAL TO;;;;
-2269;GREATER-THAN BUT NOT EQUAL TO;Sm;0;ON;;;;;Y;GREATER THAN BUT NOT EQUAL TO;;;;
-226A;MUCH LESS-THAN;Sm;0;ON;;;;;Y;MUCH LESS THAN;;;;
-226B;MUCH GREATER-THAN;Sm;0;ON;;;;;Y;MUCH GREATER THAN;;;;
-226C;BETWEEN;Sm;0;ON;;;;;N;;;;;
-226D;NOT EQUIVALENT TO;Sm;0;ON;224D 0338;;;;N;;;;;
-226E;NOT LESS-THAN;Sm;0;ON;003C 0338;;;;Y;NOT LESS THAN;;;;
-226F;NOT GREATER-THAN;Sm;0;ON;003E 0338;;;;Y;NOT GREATER THAN;;;;
-2270;NEITHER LESS-THAN NOR EQUAL TO;Sm;0;ON;2264 0338;;;;Y;NEITHER LESS THAN NOR EQUAL TO;;;;
-2271;NEITHER GREATER-THAN NOR EQUAL TO;Sm;0;ON;2265 0338;;;;Y;NEITHER GREATER THAN NOR EQUAL TO;;;;
-2272;LESS-THAN OR EQUIVALENT TO;Sm;0;ON;;;;;Y;LESS THAN OR EQUIVALENT TO;;;;
-2273;GREATER-THAN OR EQUIVALENT TO;Sm;0;ON;;;;;Y;GREATER THAN OR EQUIVALENT TO;;;;
-2274;NEITHER LESS-THAN NOR EQUIVALENT TO;Sm;0;ON;2272 0338;;;;Y;NEITHER LESS THAN NOR EQUIVALENT TO;;;;
-2275;NEITHER GREATER-THAN NOR EQUIVALENT TO;Sm;0;ON;2273 0338;;;;Y;NEITHER GREATER THAN NOR EQUIVALENT TO;;;;
-2276;LESS-THAN OR GREATER-THAN;Sm;0;ON;;;;;Y;LESS THAN OR GREATER THAN;;;;
-2277;GREATER-THAN OR LESS-THAN;Sm;0;ON;;;;;Y;GREATER THAN OR LESS THAN;;;;
-2278;NEITHER LESS-THAN NOR GREATER-THAN;Sm;0;ON;2276 0338;;;;Y;NEITHER LESS THAN NOR GREATER THAN;;;;
-2279;NEITHER GREATER-THAN NOR LESS-THAN;Sm;0;ON;2277 0338;;;;Y;NEITHER GREATER THAN NOR LESS THAN;;;;
-227A;PRECEDES;Sm;0;ON;;;;;Y;;;;;
-227B;SUCCEEDS;Sm;0;ON;;;;;Y;;;;;
-227C;PRECEDES OR EQUAL TO;Sm;0;ON;;;;;Y;;;;;
-227D;SUCCEEDS OR EQUAL TO;Sm;0;ON;;;;;Y;;;;;
-227E;PRECEDES OR EQUIVALENT TO;Sm;0;ON;;;;;Y;;;;;
-227F;SUCCEEDS OR EQUIVALENT TO;Sm;0;ON;;;;;Y;;;;;
-2280;DOES NOT PRECEDE;Sm;0;ON;227A 0338;;;;Y;;;;;
-2281;DOES NOT SUCCEED;Sm;0;ON;227B 0338;;;;Y;;;;;
-2282;SUBSET OF;Sm;0;ON;;;;;Y;;;;;
-2283;SUPERSET OF;Sm;0;ON;;;;;Y;;;;;
-2284;NOT A SUBSET OF;Sm;0;ON;2282 0338;;;;Y;;;;;
-2285;NOT A SUPERSET OF;Sm;0;ON;2283 0338;;;;Y;;;;;
-2286;SUBSET OF OR EQUAL TO;Sm;0;ON;;;;;Y;;;;;
-2287;SUPERSET OF OR EQUAL TO;Sm;0;ON;;;;;Y;;;;;
-2288;NEITHER A SUBSET OF NOR EQUAL TO;Sm;0;ON;2286 0338;;;;Y;;;;;
-2289;NEITHER A SUPERSET OF NOR EQUAL TO;Sm;0;ON;2287 0338;;;;Y;;;;;
-228A;SUBSET OF WITH NOT EQUAL TO;Sm;0;ON;;;;;Y;SUBSET OF OR NOT EQUAL TO;;;;
-228B;SUPERSET OF WITH NOT EQUAL TO;Sm;0;ON;;;;;Y;SUPERSET OF OR NOT EQUAL TO;;;;
-228C;MULTISET;Sm;0;ON;;;;;Y;;;;;
-228D;MULTISET MULTIPLICATION;Sm;0;ON;;;;;N;;;;;
-228E;MULTISET UNION;Sm;0;ON;;;;;N;;;;;
-228F;SQUARE IMAGE OF;Sm;0;ON;;;;;Y;;;;;
-2290;SQUARE ORIGINAL OF;Sm;0;ON;;;;;Y;;;;;
-2291;SQUARE IMAGE OF OR EQUAL TO;Sm;0;ON;;;;;Y;;;;;
-2292;SQUARE ORIGINAL OF OR EQUAL TO;Sm;0;ON;;;;;Y;;;;;
-2293;SQUARE CAP;Sm;0;ON;;;;;N;;;;;
-2294;SQUARE CUP;Sm;0;ON;;;;;N;;;;;
-2295;CIRCLED PLUS;Sm;0;ON;;;;;N;;;;;
-2296;CIRCLED MINUS;Sm;0;ON;;;;;N;;;;;
-2297;CIRCLED TIMES;Sm;0;ON;;;;;N;;;;;
-2298;CIRCLED DIVISION SLASH;Sm;0;ON;;;;;Y;;;;;
-2299;CIRCLED DOT OPERATOR;Sm;0;ON;;;;;N;;;;;
-229A;CIRCLED RING OPERATOR;Sm;0;ON;;;;;N;;;;;
-229B;CIRCLED ASTERISK OPERATOR;Sm;0;ON;;;;;N;;;;;
-229C;CIRCLED EQUALS;Sm;0;ON;;;;;N;;;;;
-229D;CIRCLED DASH;Sm;0;ON;;;;;N;;;;;
-229E;SQUARED PLUS;Sm;0;ON;;;;;N;;;;;
-229F;SQUARED MINUS;Sm;0;ON;;;;;N;;;;;
-22A0;SQUARED TIMES;Sm;0;ON;;;;;N;;;;;
-22A1;SQUARED DOT OPERATOR;Sm;0;ON;;;;;N;;;;;
-22A2;RIGHT TACK;Sm;0;ON;;;;;Y;;;;;
-22A3;LEFT TACK;Sm;0;ON;;;;;Y;;;;;
-22A4;DOWN TACK;Sm;0;ON;;;;;N;;;;;
-22A5;UP TACK;Sm;0;ON;;;;;N;;;;;
-22A6;ASSERTION;Sm;0;ON;;;;;Y;;;;;
-22A7;MODELS;Sm;0;ON;;;;;Y;;;;;
-22A8;TRUE;Sm;0;ON;;;;;Y;;;;;
-22A9;FORCES;Sm;0;ON;;;;;Y;;;;;
-22AA;TRIPLE VERTICAL BAR RIGHT TURNSTILE;Sm;0;ON;;;;;Y;;;;;
-22AB;DOUBLE VERTICAL BAR DOUBLE RIGHT TURNSTILE;Sm;0;ON;;;;;Y;;;;;
-22AC;DOES NOT PROVE;Sm;0;ON;22A2 0338;;;;Y;;;;;
-22AD;NOT TRUE;Sm;0;ON;22A8 0338;;;;Y;;;;;
-22AE;DOES NOT FORCE;Sm;0;ON;22A9 0338;;;;Y;;;;;
-22AF;NEGATED DOUBLE VERTICAL BAR DOUBLE RIGHT TURNSTILE;Sm;0;ON;22AB 0338;;;;Y;;;;;
-22B0;PRECEDES UNDER RELATION;Sm;0;ON;;;;;Y;;;;;
-22B1;SUCCEEDS UNDER RELATION;Sm;0;ON;;;;;Y;;;;;
-22B2;NORMAL SUBGROUP OF;Sm;0;ON;;;;;Y;;;;;
-22B3;CONTAINS AS NORMAL SUBGROUP;Sm;0;ON;;;;;Y;;;;;
-22B4;NORMAL SUBGROUP OF OR EQUAL TO;Sm;0;ON;;;;;Y;;;;;
-22B5;CONTAINS AS NORMAL SUBGROUP OR EQUAL TO;Sm;0;ON;;;;;Y;;;;;
-22B6;ORIGINAL OF;Sm;0;ON;;;;;Y;;;;;
-22B7;IMAGE OF;Sm;0;ON;;;;;Y;;;;;
-22B8;MULTIMAP;Sm;0;ON;;;;;Y;;;;;
-22B9;HERMITIAN CONJUGATE MATRIX;Sm;0;ON;;;;;N;;;;;
-22BA;INTERCALATE;Sm;0;ON;;;;;N;;;;;
-22BB;XOR;Sm;0;ON;;;;;N;;;;;
-22BC;NAND;Sm;0;ON;;;;;N;;;;;
-22BD;NOR;Sm;0;ON;;;;;N;;;;;
-22BE;RIGHT ANGLE WITH ARC;Sm;0;ON;;;;;Y;;;;;
-22BF;RIGHT TRIANGLE;Sm;0;ON;;;;;Y;;;;;
-22C0;N-ARY LOGICAL AND;Sm;0;ON;;;;;N;;;;;
-22C1;N-ARY LOGICAL OR;Sm;0;ON;;;;;N;;;;;
-22C2;N-ARY INTERSECTION;Sm;0;ON;;;;;N;;;;;
-22C3;N-ARY UNION;Sm;0;ON;;;;;N;;;;;
-22C4;DIAMOND OPERATOR;Sm;0;ON;;;;;N;;;;;
-22C5;DOT OPERATOR;Sm;0;ON;;;;;N;;;;;
-22C6;STAR OPERATOR;Sm;0;ON;;;;;N;;;;;
-22C7;DIVISION TIMES;Sm;0;ON;;;;;N;;;;;
-22C8;BOWTIE;Sm;0;ON;;;;;N;;;;;
-22C9;LEFT NORMAL FACTOR SEMIDIRECT PRODUCT;Sm;0;ON;;;;;Y;;;;;
-22CA;RIGHT NORMAL FACTOR SEMIDIRECT PRODUCT;Sm;0;ON;;;;;Y;;;;;
-22CB;LEFT SEMIDIRECT PRODUCT;Sm;0;ON;;;;;Y;;;;;
-22CC;RIGHT SEMIDIRECT PRODUCT;Sm;0;ON;;;;;Y;;;;;
-22CD;REVERSED TILDE EQUALS;Sm;0;ON;;;;;Y;;;;;
-22CE;CURLY LOGICAL OR;Sm;0;ON;;;;;N;;;;;
-22CF;CURLY LOGICAL AND;Sm;0;ON;;;;;N;;;;;
-22D0;DOUBLE SUBSET;Sm;0;ON;;;;;Y;;;;;
-22D1;DOUBLE SUPERSET;Sm;0;ON;;;;;Y;;;;;
-22D2;DOUBLE INTERSECTION;Sm;0;ON;;;;;N;;;;;
-22D3;DOUBLE UNION;Sm;0;ON;;;;;N;;;;;
-22D4;PITCHFORK;Sm;0;ON;;;;;N;;;;;
-22D5;EQUAL AND PARALLEL TO;Sm;0;ON;;;;;N;;;;;
-22D6;LESS-THAN WITH DOT;Sm;0;ON;;;;;Y;LESS THAN WITH DOT;;;;
-22D7;GREATER-THAN WITH DOT;Sm;0;ON;;;;;Y;GREATER THAN WITH DOT;;;;
-22D8;VERY MUCH LESS-THAN;Sm;0;ON;;;;;Y;VERY MUCH LESS THAN;;;;
-22D9;VERY MUCH GREATER-THAN;Sm;0;ON;;;;;Y;VERY MUCH GREATER THAN;;;;
-22DA;LESS-THAN EQUAL TO OR GREATER-THAN;Sm;0;ON;;;;;Y;LESS THAN EQUAL TO OR GREATER THAN;;;;
-22DB;GREATER-THAN EQUAL TO OR LESS-THAN;Sm;0;ON;;;;;Y;GREATER THAN EQUAL TO OR LESS THAN;;;;
-22DC;EQUAL TO OR LESS-THAN;Sm;0;ON;;;;;Y;EQUAL TO OR LESS THAN;;;;
-22DD;EQUAL TO OR GREATER-THAN;Sm;0;ON;;;;;Y;EQUAL TO OR GREATER THAN;;;;
-22DE;EQUAL TO OR PRECEDES;Sm;0;ON;;;;;Y;;;;;
-22DF;EQUAL TO OR SUCCEEDS;Sm;0;ON;;;;;Y;;;;;
-22E0;DOES NOT PRECEDE OR EQUAL;Sm;0;ON;227C 0338;;;;Y;;;;;
-22E1;DOES NOT SUCCEED OR EQUAL;Sm;0;ON;227D 0338;;;;Y;;;;;
-22E2;NOT SQUARE IMAGE OF OR EQUAL TO;Sm;0;ON;2291 0338;;;;Y;;;;;
-22E3;NOT SQUARE ORIGINAL OF OR EQUAL TO;Sm;0;ON;2292 0338;;;;Y;;;;;
-22E4;SQUARE IMAGE OF OR NOT EQUAL TO;Sm;0;ON;;;;;Y;;;;;
-22E5;SQUARE ORIGINAL OF OR NOT EQUAL TO;Sm;0;ON;;;;;Y;;;;;
-22E6;LESS-THAN BUT NOT EQUIVALENT TO;Sm;0;ON;;;;;Y;LESS THAN BUT NOT EQUIVALENT TO;;;;
-22E7;GREATER-THAN BUT NOT EQUIVALENT TO;Sm;0;ON;;;;;Y;GREATER THAN BUT NOT EQUIVALENT TO;;;;
-22E8;PRECEDES BUT NOT EQUIVALENT TO;Sm;0;ON;;;;;Y;;;;;
-22E9;SUCCEEDS BUT NOT EQUIVALENT TO;Sm;0;ON;;;;;Y;;;;;
-22EA;NOT NORMAL SUBGROUP OF;Sm;0;ON;22B2 0338;;;;Y;;;;;
-22EB;DOES NOT CONTAIN AS NORMAL SUBGROUP;Sm;0;ON;22B3 0338;;;;Y;;;;;
-22EC;NOT NORMAL SUBGROUP OF OR EQUAL TO;Sm;0;ON;22B4 0338;;;;Y;;;;;
-22ED;DOES NOT CONTAIN AS NORMAL SUBGROUP OR EQUAL;Sm;0;ON;22B5 0338;;;;Y;;;;;
-22EE;VERTICAL ELLIPSIS;Sm;0;ON;;;;;N;;;;;
-22EF;MIDLINE HORIZONTAL ELLIPSIS;Sm;0;ON;;;;;N;;;;;
-22F0;UP RIGHT DIAGONAL ELLIPSIS;Sm;0;ON;;;;;Y;;;;;
-22F1;DOWN RIGHT DIAGONAL ELLIPSIS;Sm;0;ON;;;;;Y;;;;;
-22F2;ELEMENT OF WITH LONG HORIZONTAL STROKE;Sm;0;ON;;;;;Y;;;;;
-22F3;ELEMENT OF WITH VERTICAL BAR AT END OF HORIZONTAL STROKE;Sm;0;ON;;;;;Y;;;;;
-22F4;SMALL ELEMENT OF WITH VERTICAL BAR AT END OF HORIZONTAL STROKE;Sm;0;ON;;;;;Y;;;;;
-22F5;ELEMENT OF WITH DOT ABOVE;Sm;0;ON;;;;;Y;;;;;
-22F6;ELEMENT OF WITH OVERBAR;Sm;0;ON;;;;;Y;;;;;
-22F7;SMALL ELEMENT OF WITH OVERBAR;Sm;0;ON;;;;;Y;;;;;
-22F8;ELEMENT OF WITH UNDERBAR;Sm;0;ON;;;;;Y;;;;;
-22F9;ELEMENT OF WITH TWO HORIZONTAL STROKES;Sm;0;ON;;;;;Y;;;;;
-22FA;CONTAINS WITH LONG HORIZONTAL STROKE;Sm;0;ON;;;;;Y;;;;;
-22FB;CONTAINS WITH VERTICAL BAR AT END OF HORIZONTAL STROKE;Sm;0;ON;;;;;Y;;;;;
-22FC;SMALL CONTAINS WITH VERTICAL BAR AT END OF HORIZONTAL STROKE;Sm;0;ON;;;;;Y;;;;;
-22FD;CONTAINS WITH OVERBAR;Sm;0;ON;;;;;Y;;;;;
-22FE;SMALL CONTAINS WITH OVERBAR;Sm;0;ON;;;;;Y;;;;;
-22FF;Z NOTATION BAG MEMBERSHIP;Sm;0;ON;;;;;Y;;;;;
-2300;DIAMETER SIGN;So;0;ON;;;;;N;;;;;
-2301;ELECTRIC ARROW;So;0;ON;;;;;N;;;;;
-2302;HOUSE;So;0;ON;;;;;N;;;;;
-2303;UP ARROWHEAD;So;0;ON;;;;;N;;;;;
-2304;DOWN ARROWHEAD;So;0;ON;;;;;N;;;;;
-2305;PROJECTIVE;So;0;ON;;;;;N;;;;;
-2306;PERSPECTIVE;So;0;ON;;;;;N;;;;;
-2307;WAVY LINE;So;0;ON;;;;;N;;;;;
-2308;LEFT CEILING;Sm;0;ON;;;;;Y;;;;;
-2309;RIGHT CEILING;Sm;0;ON;;;;;Y;;;;;
-230A;LEFT FLOOR;Sm;0;ON;;;;;Y;;;;;
-230B;RIGHT FLOOR;Sm;0;ON;;;;;Y;;;;;
-230C;BOTTOM RIGHT CROP;So;0;ON;;;;;N;;;;;
-230D;BOTTOM LEFT CROP;So;0;ON;;;;;N;;;;;
-230E;TOP RIGHT CROP;So;0;ON;;;;;N;;;;;
-230F;TOP LEFT CROP;So;0;ON;;;;;N;;;;;
-2310;REVERSED NOT SIGN;So;0;ON;;;;;N;;;;;
-2311;SQUARE LOZENGE;So;0;ON;;;;;N;;;;;
-2312;ARC;So;0;ON;;;;;N;;;;;
-2313;SEGMENT;So;0;ON;;;;;N;;;;;
-2314;SECTOR;So;0;ON;;;;;N;;;;;
-2315;TELEPHONE RECORDER;So;0;ON;;;;;N;;;;;
-2316;POSITION INDICATOR;So;0;ON;;;;;N;;;;;
-2317;VIEWDATA SQUARE;So;0;ON;;;;;N;;;;;
-2318;PLACE OF INTEREST SIGN;So;0;ON;;;;;N;COMMAND KEY;;;;
-2319;TURNED NOT SIGN;So;0;ON;;;;;N;;;;;
-231A;WATCH;So;0;ON;;;;;N;;;;;
-231B;HOURGLASS;So;0;ON;;;;;N;;;;;
-231C;TOP LEFT CORNER;So;0;ON;;;;;N;;;;;
-231D;TOP RIGHT CORNER;So;0;ON;;;;;N;;;;;
-231E;BOTTOM LEFT CORNER;So;0;ON;;;;;N;;;;;
-231F;BOTTOM RIGHT CORNER;So;0;ON;;;;;N;;;;;
-2320;TOP HALF INTEGRAL;Sm;0;ON;;;;;Y;;;;;
-2321;BOTTOM HALF INTEGRAL;Sm;0;ON;;;;;Y;;;;;
-2322;FROWN;So;0;ON;;;;;N;;;;;
-2323;SMILE;So;0;ON;;;;;N;;;;;
-2324;UP ARROWHEAD BETWEEN TWO HORIZONTAL BARS;So;0;ON;;;;;N;ENTER KEY;;;;
-2325;OPTION KEY;So;0;ON;;;;;N;;;;;
-2326;ERASE TO THE RIGHT;So;0;ON;;;;;N;DELETE TO THE RIGHT KEY;;;;
-2327;X IN A RECTANGLE BOX;So;0;ON;;;;;N;CLEAR KEY;;;;
-2328;KEYBOARD;So;0;ON;;;;;N;;;;;
-2329;LEFT-POINTING ANGLE BRACKET;Ps;0;ON;3008;;;;Y;BRA;;;;
-232A;RIGHT-POINTING ANGLE BRACKET;Pe;0;ON;3009;;;;Y;KET;;;;
-232B;ERASE TO THE LEFT;So;0;ON;;;;;N;DELETE TO THE LEFT KEY;;;;
-232C;BENZENE RING;So;0;ON;;;;;N;;;;;
-232D;CYLINDRICITY;So;0;ON;;;;;N;;;;;
-232E;ALL AROUND-PROFILE;So;0;ON;;;;;N;;;;;
-232F;SYMMETRY;So;0;ON;;;;;N;;;;;
-2330;TOTAL RUNOUT;So;0;ON;;;;;N;;;;;
-2331;DIMENSION ORIGIN;So;0;ON;;;;;N;;;;;
-2332;CONICAL TAPER;So;0;ON;;;;;N;;;;;
-2333;SLOPE;So;0;ON;;;;;N;;;;;
-2334;COUNTERBORE;So;0;ON;;;;;N;;;;;
-2335;COUNTERSINK;So;0;ON;;;;;N;;;;;
-2336;APL FUNCTIONAL SYMBOL I-BEAM;So;0;L;;;;;N;;;;;
-2337;APL FUNCTIONAL SYMBOL SQUISH QUAD;So;0;L;;;;;N;;;;;
-2338;APL FUNCTIONAL SYMBOL QUAD EQUAL;So;0;L;;;;;N;;;;;
-2339;APL FUNCTIONAL SYMBOL QUAD DIVIDE;So;0;L;;;;;N;;;;;
-233A;APL FUNCTIONAL SYMBOL QUAD DIAMOND;So;0;L;;;;;N;;;;;
-233B;APL FUNCTIONAL SYMBOL QUAD JOT;So;0;L;;;;;N;;;;;
-233C;APL FUNCTIONAL SYMBOL QUAD CIRCLE;So;0;L;;;;;N;;;;;
-233D;APL FUNCTIONAL SYMBOL CIRCLE STILE;So;0;L;;;;;N;;;;;
-233E;APL FUNCTIONAL SYMBOL CIRCLE JOT;So;0;L;;;;;N;;;;;
-233F;APL FUNCTIONAL SYMBOL SLASH BAR;So;0;L;;;;;N;;;;;
-2340;APL FUNCTIONAL SYMBOL BACKSLASH BAR;So;0;L;;;;;N;;;;;
-2341;APL FUNCTIONAL SYMBOL QUAD SLASH;So;0;L;;;;;N;;;;;
-2342;APL FUNCTIONAL SYMBOL QUAD BACKSLASH;So;0;L;;;;;N;;;;;
-2343;APL FUNCTIONAL SYMBOL QUAD LESS-THAN;So;0;L;;;;;N;;;;;
-2344;APL FUNCTIONAL SYMBOL QUAD GREATER-THAN;So;0;L;;;;;N;;;;;
-2345;APL FUNCTIONAL SYMBOL LEFTWARDS VANE;So;0;L;;;;;N;;;;;
-2346;APL FUNCTIONAL SYMBOL RIGHTWARDS VANE;So;0;L;;;;;N;;;;;
-2347;APL FUNCTIONAL SYMBOL QUAD LEFTWARDS ARROW;So;0;L;;;;;N;;;;;
-2348;APL FUNCTIONAL SYMBOL QUAD RIGHTWARDS ARROW;So;0;L;;;;;N;;;;;
-2349;APL FUNCTIONAL SYMBOL CIRCLE BACKSLASH;So;0;L;;;;;N;;;;;
-234A;APL FUNCTIONAL SYMBOL DOWN TACK UNDERBAR;So;0;L;;;;;N;;*;;;
-234B;APL FUNCTIONAL SYMBOL DELTA STILE;So;0;L;;;;;N;;;;;
-234C;APL FUNCTIONAL SYMBOL QUAD DOWN CARET;So;0;L;;;;;N;;;;;
-234D;APL FUNCTIONAL SYMBOL QUAD DELTA;So;0;L;;;;;N;;;;;
-234E;APL FUNCTIONAL SYMBOL DOWN TACK JOT;So;0;L;;;;;N;;*;;;
-234F;APL FUNCTIONAL SYMBOL UPWARDS VANE;So;0;L;;;;;N;;;;;
-2350;APL FUNCTIONAL SYMBOL QUAD UPWARDS ARROW;So;0;L;;;;;N;;;;;
-2351;APL FUNCTIONAL SYMBOL UP TACK OVERBAR;So;0;L;;;;;N;;*;;;
-2352;APL FUNCTIONAL SYMBOL DEL STILE;So;0;L;;;;;N;;;;;
-2353;APL FUNCTIONAL SYMBOL QUAD UP CARET;So;0;L;;;;;N;;;;;
-2354;APL FUNCTIONAL SYMBOL QUAD DEL;So;0;L;;;;;N;;;;;
-2355;APL FUNCTIONAL SYMBOL UP TACK JOT;So;0;L;;;;;N;;*;;;
-2356;APL FUNCTIONAL SYMBOL DOWNWARDS VANE;So;0;L;;;;;N;;;;;
-2357;APL FUNCTIONAL SYMBOL QUAD DOWNWARDS ARROW;So;0;L;;;;;N;;;;;
-2358;APL FUNCTIONAL SYMBOL QUOTE UNDERBAR;So;0;L;;;;;N;;;;;
-2359;APL FUNCTIONAL SYMBOL DELTA UNDERBAR;So;0;L;;;;;N;;;;;
-235A;APL FUNCTIONAL SYMBOL DIAMOND UNDERBAR;So;0;L;;;;;N;;;;;
-235B;APL FUNCTIONAL SYMBOL JOT UNDERBAR;So;0;L;;;;;N;;;;;
-235C;APL FUNCTIONAL SYMBOL CIRCLE UNDERBAR;So;0;L;;;;;N;;;;;
-235D;APL FUNCTIONAL SYMBOL UP SHOE JOT;So;0;L;;;;;N;;;;;
-235E;APL FUNCTIONAL SYMBOL QUOTE QUAD;So;0;L;;;;;N;;;;;
-235F;APL FUNCTIONAL SYMBOL CIRCLE STAR;So;0;L;;;;;N;;;;;
-2360;APL FUNCTIONAL SYMBOL QUAD COLON;So;0;L;;;;;N;;;;;
-2361;APL FUNCTIONAL SYMBOL UP TACK DIAERESIS;So;0;L;;;;;N;;*;;;
-2362;APL FUNCTIONAL SYMBOL DEL DIAERESIS;So;0;L;;;;;N;;;;;
-2363;APL FUNCTIONAL SYMBOL STAR DIAERESIS;So;0;L;;;;;N;;;;;
-2364;APL FUNCTIONAL SYMBOL JOT DIAERESIS;So;0;L;;;;;N;;;;;
-2365;APL FUNCTIONAL SYMBOL CIRCLE DIAERESIS;So;0;L;;;;;N;;;;;
-2366;APL FUNCTIONAL SYMBOL DOWN SHOE STILE;So;0;L;;;;;N;;;;;
-2367;APL FUNCTIONAL SYMBOL LEFT SHOE STILE;So;0;L;;;;;N;;;;;
-2368;APL FUNCTIONAL SYMBOL TILDE DIAERESIS;So;0;L;;;;;N;;;;;
-2369;APL FUNCTIONAL SYMBOL GREATER-THAN DIAERESIS;So;0;L;;;;;N;;;;;
-236A;APL FUNCTIONAL SYMBOL COMMA BAR;So;0;L;;;;;N;;;;;
-236B;APL FUNCTIONAL SYMBOL DEL TILDE;So;0;L;;;;;N;;;;;
-236C;APL FUNCTIONAL SYMBOL ZILDE;So;0;L;;;;;N;;;;;
-236D;APL FUNCTIONAL SYMBOL STILE TILDE;So;0;L;;;;;N;;;;;
-236E;APL FUNCTIONAL SYMBOL SEMICOLON UNDERBAR;So;0;L;;;;;N;;;;;
-236F;APL FUNCTIONAL SYMBOL QUAD NOT EQUAL;So;0;L;;;;;N;;;;;
-2370;APL FUNCTIONAL SYMBOL QUAD QUESTION;So;0;L;;;;;N;;;;;
-2371;APL FUNCTIONAL SYMBOL DOWN CARET TILDE;So;0;L;;;;;N;;;;;
-2372;APL FUNCTIONAL SYMBOL UP CARET TILDE;So;0;L;;;;;N;;;;;
-2373;APL FUNCTIONAL SYMBOL IOTA;So;0;L;;;;;N;;;;;
-2374;APL FUNCTIONAL SYMBOL RHO;So;0;L;;;;;N;;;;;
-2375;APL FUNCTIONAL SYMBOL OMEGA;So;0;L;;;;;N;;;;;
-2376;APL FUNCTIONAL SYMBOL ALPHA UNDERBAR;So;0;L;;;;;N;;;;;
-2377;APL FUNCTIONAL SYMBOL EPSILON UNDERBAR;So;0;L;;;;;N;;;;;
-2378;APL FUNCTIONAL SYMBOL IOTA UNDERBAR;So;0;L;;;;;N;;;;;
-2379;APL FUNCTIONAL SYMBOL OMEGA UNDERBAR;So;0;L;;;;;N;;;;;
-237A;APL FUNCTIONAL SYMBOL ALPHA;So;0;L;;;;;N;;;;;
-237B;NOT CHECK MARK;So;0;ON;;;;;N;;;;;
-237C;RIGHT ANGLE WITH DOWNWARDS ZIGZAG ARROW;Sm;0;ON;;;;;N;;;;;
-237D;SHOULDERED OPEN BOX;So;0;ON;;;;;N;;;;;
-237E;BELL SYMBOL;So;0;ON;;;;;N;;;;;
-237F;VERTICAL LINE WITH MIDDLE DOT;So;0;ON;;;;;N;;;;;
-2380;INSERTION SYMBOL;So;0;ON;;;;;N;;;;;
-2381;CONTINUOUS UNDERLINE SYMBOL;So;0;ON;;;;;N;;;;;
-2382;DISCONTINUOUS UNDERLINE SYMBOL;So;0;ON;;;;;N;;;;;
-2383;EMPHASIS SYMBOL;So;0;ON;;;;;N;;;;;
-2384;COMPOSITION SYMBOL;So;0;ON;;;;;N;;;;;
-2385;WHITE SQUARE WITH CENTRE VERTICAL LINE;So;0;ON;;;;;N;;;;;
-2386;ENTER SYMBOL;So;0;ON;;;;;N;;;;;
-2387;ALTERNATIVE KEY SYMBOL;So;0;ON;;;;;N;;;;;
-2388;HELM SYMBOL;So;0;ON;;;;;N;;;;;
-2389;CIRCLED HORIZONTAL BAR WITH NOTCH;So;0;ON;;;;;N;;pause;;;
-238A;CIRCLED TRIANGLE DOWN;So;0;ON;;;;;N;;break;;;
-238B;BROKEN CIRCLE WITH NORTHWEST ARROW;So;0;ON;;;;;N;;escape;;;
-238C;UNDO SYMBOL;So;0;ON;;;;;N;;;;;
-238D;MONOSTABLE SYMBOL;So;0;ON;;;;;N;;;;;
-238E;HYSTERESIS SYMBOL;So;0;ON;;;;;N;;;;;
-238F;OPEN-CIRCUIT-OUTPUT H-TYPE SYMBOL;So;0;ON;;;;;N;;;;;
-2390;OPEN-CIRCUIT-OUTPUT L-TYPE SYMBOL;So;0;ON;;;;;N;;;;;
-2391;PASSIVE-PULL-DOWN-OUTPUT SYMBOL;So;0;ON;;;;;N;;;;;
-2392;PASSIVE-PULL-UP-OUTPUT SYMBOL;So;0;ON;;;;;N;;;;;
-2393;DIRECT CURRENT SYMBOL FORM TWO;So;0;ON;;;;;N;;;;;
-2394;SOFTWARE-FUNCTION SYMBOL;So;0;ON;;;;;N;;;;;
-2395;APL FUNCTIONAL SYMBOL QUAD;So;0;L;;;;;N;;;;;
-2396;DECIMAL SEPARATOR KEY SYMBOL;So;0;ON;;;;;N;;;;;
-2397;PREVIOUS PAGE;So;0;ON;;;;;N;;;;;
-2398;NEXT PAGE;So;0;ON;;;;;N;;;;;
-2399;PRINT SCREEN SYMBOL;So;0;ON;;;;;N;;;;;
-239A;CLEAR SCREEN SYMBOL;So;0;ON;;;;;N;;;;;
-239B;LEFT PARENTHESIS UPPER HOOK;Sm;0;ON;;;;;N;;;;;
-239C;LEFT PARENTHESIS EXTENSION;Sm;0;ON;;;;;N;;;;;
-239D;LEFT PARENTHESIS LOWER HOOK;Sm;0;ON;;;;;N;;;;;
-239E;RIGHT PARENTHESIS UPPER HOOK;Sm;0;ON;;;;;N;;;;;
-239F;RIGHT PARENTHESIS EXTENSION;Sm;0;ON;;;;;N;;;;;
-23A0;RIGHT PARENTHESIS LOWER HOOK;Sm;0;ON;;;;;N;;;;;
-23A1;LEFT SQUARE BRACKET UPPER CORNER;Sm;0;ON;;;;;N;;;;;
-23A2;LEFT SQUARE BRACKET EXTENSION;Sm;0;ON;;;;;N;;;;;
-23A3;LEFT SQUARE BRACKET LOWER CORNER;Sm;0;ON;;;;;N;;;;;
-23A4;RIGHT SQUARE BRACKET UPPER CORNER;Sm;0;ON;;;;;N;;;;;
-23A5;RIGHT SQUARE BRACKET EXTENSION;Sm;0;ON;;;;;N;;;;;
-23A6;RIGHT SQUARE BRACKET LOWER CORNER;Sm;0;ON;;;;;N;;;;;
-23A7;LEFT CURLY BRACKET UPPER HOOK;Sm;0;ON;;;;;N;;;;;
-23A8;LEFT CURLY BRACKET MIDDLE PIECE;Sm;0;ON;;;;;N;;;;;
-23A9;LEFT CURLY BRACKET LOWER HOOK;Sm;0;ON;;;;;N;;;;;
-23AA;CURLY BRACKET EXTENSION;Sm;0;ON;;;;;N;;;;;
-23AB;RIGHT CURLY BRACKET UPPER HOOK;Sm;0;ON;;;;;N;;;;;
-23AC;RIGHT CURLY BRACKET MIDDLE PIECE;Sm;0;ON;;;;;N;;;;;
-23AD;RIGHT CURLY BRACKET LOWER HOOK;Sm;0;ON;;;;;N;;;;;
-23AE;INTEGRAL EXTENSION;Sm;0;ON;;;;;N;;;;;
-23AF;HORIZONTAL LINE EXTENSION;Sm;0;ON;;;;;N;;;;;
-23B0;UPPER LEFT OR LOWER RIGHT CURLY BRACKET SECTION;Sm;0;ON;;;;;N;;;;;
-23B1;UPPER RIGHT OR LOWER LEFT CURLY BRACKET SECTION;Sm;0;ON;;;;;N;;;;;
-23B2;SUMMATION TOP;Sm;0;ON;;;;;N;;;;;
-23B3;SUMMATION BOTTOM;Sm;0;ON;;;;;N;;;;;
-23B4;TOP SQUARE BRACKET;So;0;ON;;;;;N;;;;;
-23B5;BOTTOM SQUARE BRACKET;So;0;ON;;;;;N;;;;;
-23B6;BOTTOM SQUARE BRACKET OVER TOP SQUARE BRACKET;So;0;ON;;;;;N;;;;;
-23B7;RADICAL SYMBOL BOTTOM;So;0;ON;;;;;N;;;;;
-23B8;LEFT VERTICAL BOX LINE;So;0;ON;;;;;N;;;;;
-23B9;RIGHT VERTICAL BOX LINE;So;0;ON;;;;;N;;;;;
-23BA;HORIZONTAL SCAN LINE-1;So;0;ON;;;;;N;;;;;
-23BB;HORIZONTAL SCAN LINE-3;So;0;ON;;;;;N;;;;;
-23BC;HORIZONTAL SCAN LINE-7;So;0;ON;;;;;N;;;;;
-23BD;HORIZONTAL SCAN LINE-9;So;0;ON;;;;;N;;;;;
-23BE;DENTISTRY SYMBOL LIGHT VERTICAL AND TOP RIGHT;So;0;ON;;;;;N;;;;;
-23BF;DENTISTRY SYMBOL LIGHT VERTICAL AND BOTTOM RIGHT;So;0;ON;;;;;N;;;;;
-23C0;DENTISTRY SYMBOL LIGHT VERTICAL WITH CIRCLE;So;0;ON;;;;;N;;;;;
-23C1;DENTISTRY SYMBOL LIGHT DOWN AND HORIZONTAL WITH CIRCLE;So;0;ON;;;;;N;;;;;
-23C2;DENTISTRY SYMBOL LIGHT UP AND HORIZONTAL WITH CIRCLE;So;0;ON;;;;;N;;;;;
-23C3;DENTISTRY SYMBOL LIGHT VERTICAL WITH TRIANGLE;So;0;ON;;;;;N;;;;;
-23C4;DENTISTRY SYMBOL LIGHT DOWN AND HORIZONTAL WITH TRIANGLE;So;0;ON;;;;;N;;;;;
-23C5;DENTISTRY SYMBOL LIGHT UP AND HORIZONTAL WITH TRIANGLE;So;0;ON;;;;;N;;;;;
-23C6;DENTISTRY SYMBOL LIGHT VERTICAL AND WAVE;So;0;ON;;;;;N;;;;;
-23C7;DENTISTRY SYMBOL LIGHT DOWN AND HORIZONTAL WITH WAVE;So;0;ON;;;;;N;;;;;
-23C8;DENTISTRY SYMBOL LIGHT UP AND HORIZONTAL WITH WAVE;So;0;ON;;;;;N;;;;;
-23C9;DENTISTRY SYMBOL LIGHT DOWN AND HORIZONTAL;So;0;ON;;;;;N;;;;;
-23CA;DENTISTRY SYMBOL LIGHT UP AND HORIZONTAL;So;0;ON;;;;;N;;;;;
-23CB;DENTISTRY SYMBOL LIGHT VERTICAL AND TOP LEFT;So;0;ON;;;;;N;;;;;
-23CC;DENTISTRY SYMBOL LIGHT VERTICAL AND BOTTOM LEFT;So;0;ON;;;;;N;;;;;
-23CD;SQUARE FOOT;So;0;ON;;;;;N;;;;;
-23CE;RETURN SYMBOL;So;0;ON;;;;;N;;;;;
-23CF;EJECT SYMBOL;So;0;ON;;;;;N;;;;;
-23D0;VERTICAL LINE EXTENSION;So;0;ON;;;;;N;;;;;
-23D1;METRICAL BREVE;So;0;ON;;;;;N;;;;;
-23D2;METRICAL LONG OVER SHORT;So;0;ON;;;;;N;;;;;
-23D3;METRICAL SHORT OVER LONG;So;0;ON;;;;;N;;;;;
-23D4;METRICAL LONG OVER TWO SHORTS;So;0;ON;;;;;N;;;;;
-23D5;METRICAL TWO SHORTS OVER LONG;So;0;ON;;;;;N;;;;;
-23D6;METRICAL TWO SHORTS JOINED;So;0;ON;;;;;N;;;;;
-23D7;METRICAL TRISEME;So;0;ON;;;;;N;;;;;
-23D8;METRICAL TETRASEME;So;0;ON;;;;;N;;;;;
-23D9;METRICAL PENTASEME;So;0;ON;;;;;N;;;;;
-23DA;EARTH GROUND;So;0;ON;;;;;N;;;;;
-23DB;FUSE;So;0;ON;;;;;N;;;;;
-23DC;TOP PARENTHESIS;Sm;0;ON;;;;;N;;mathematical use;;;
-23DD;BOTTOM PARENTHESIS;Sm;0;ON;;;;;N;;mathematical use;;;
-23DE;TOP CURLY BRACKET;Sm;0;ON;;;;;N;;mathematical use;;;
-23DF;BOTTOM CURLY BRACKET;Sm;0;ON;;;;;N;;mathematical use;;;
-23E0;TOP TORTOISE SHELL BRACKET;Sm;0;ON;;;;;N;;mathematical use;;;
-23E1;BOTTOM TORTOISE SHELL BRACKET;Sm;0;ON;;;;;N;;mathematical use;;;
-23E2;WHITE TRAPEZIUM;So;0;ON;;;;;N;;;;;
-23E3;BENZENE RING WITH CIRCLE;So;0;ON;;;;;N;;;;;
-23E4;STRAIGHTNESS;So;0;ON;;;;;N;;;;;
-23E5;FLATNESS;So;0;ON;;;;;N;;;;;
-23E6;AC CURRENT;So;0;ON;;;;;N;;;;;
-23E7;ELECTRICAL INTERSECTION;So;0;ON;;;;;N;;;;;
-2400;SYMBOL FOR NULL;So;0;ON;;;;;N;GRAPHIC FOR NULL;;;;
-2401;SYMBOL FOR START OF HEADING;So;0;ON;;;;;N;GRAPHIC FOR START OF HEADING;;;;
-2402;SYMBOL FOR START OF TEXT;So;0;ON;;;;;N;GRAPHIC FOR START OF TEXT;;;;
-2403;SYMBOL FOR END OF TEXT;So;0;ON;;;;;N;GRAPHIC FOR END OF TEXT;;;;
-2404;SYMBOL FOR END OF TRANSMISSION;So;0;ON;;;;;N;GRAPHIC FOR END OF TRANSMISSION;;;;
-2405;SYMBOL FOR ENQUIRY;So;0;ON;;;;;N;GRAPHIC FOR ENQUIRY;;;;
-2406;SYMBOL FOR ACKNOWLEDGE;So;0;ON;;;;;N;GRAPHIC FOR ACKNOWLEDGE;;;;
-2407;SYMBOL FOR BELL;So;0;ON;;;;;N;GRAPHIC FOR BELL;;;;
-2408;SYMBOL FOR BACKSPACE;So;0;ON;;;;;N;GRAPHIC FOR BACKSPACE;;;;
-2409;SYMBOL FOR HORIZONTAL TABULATION;So;0;ON;;;;;N;GRAPHIC FOR HORIZONTAL TABULATION;;;;
-240A;SYMBOL FOR LINE FEED;So;0;ON;;;;;N;GRAPHIC FOR LINE FEED;;;;
-240B;SYMBOL FOR VERTICAL TABULATION;So;0;ON;;;;;N;GRAPHIC FOR VERTICAL TABULATION;;;;
-240C;SYMBOL FOR FORM FEED;So;0;ON;;;;;N;GRAPHIC FOR FORM FEED;;;;
-240D;SYMBOL FOR CARRIAGE RETURN;So;0;ON;;;;;N;GRAPHIC FOR CARRIAGE RETURN;;;;
-240E;SYMBOL FOR SHIFT OUT;So;0;ON;;;;;N;GRAPHIC FOR SHIFT OUT;;;;
-240F;SYMBOL FOR SHIFT IN;So;0;ON;;;;;N;GRAPHIC FOR SHIFT IN;;;;
-2410;SYMBOL FOR DATA LINK ESCAPE;So;0;ON;;;;;N;GRAPHIC FOR DATA LINK ESCAPE;;;;
-2411;SYMBOL FOR DEVICE CONTROL ONE;So;0;ON;;;;;N;GRAPHIC FOR DEVICE CONTROL ONE;;;;
-2412;SYMBOL FOR DEVICE CONTROL TWO;So;0;ON;;;;;N;GRAPHIC FOR DEVICE CONTROL TWO;;;;
-2413;SYMBOL FOR DEVICE CONTROL THREE;So;0;ON;;;;;N;GRAPHIC FOR DEVICE CONTROL THREE;;;;
-2414;SYMBOL FOR DEVICE CONTROL FOUR;So;0;ON;;;;;N;GRAPHIC FOR DEVICE CONTROL FOUR;;;;
-2415;SYMBOL FOR NEGATIVE ACKNOWLEDGE;So;0;ON;;;;;N;GRAPHIC FOR NEGATIVE ACKNOWLEDGE;;;;
-2416;SYMBOL FOR SYNCHRONOUS IDLE;So;0;ON;;;;;N;GRAPHIC FOR SYNCHRONOUS IDLE;;;;
-2417;SYMBOL FOR END OF TRANSMISSION BLOCK;So;0;ON;;;;;N;GRAPHIC FOR END OF TRANSMISSION BLOCK;;;;
-2418;SYMBOL FOR CANCEL;So;0;ON;;;;;N;GRAPHIC FOR CANCEL;;;;
-2419;SYMBOL FOR END OF MEDIUM;So;0;ON;;;;;N;GRAPHIC FOR END OF MEDIUM;;;;
-241A;SYMBOL FOR SUBSTITUTE;So;0;ON;;;;;N;GRAPHIC FOR SUBSTITUTE;;;;
-241B;SYMBOL FOR ESCAPE;So;0;ON;;;;;N;GRAPHIC FOR ESCAPE;;;;
-241C;SYMBOL FOR FILE SEPARATOR;So;0;ON;;;;;N;GRAPHIC FOR FILE SEPARATOR;;;;
-241D;SYMBOL FOR GROUP SEPARATOR;So;0;ON;;;;;N;GRAPHIC FOR GROUP SEPARATOR;;;;
-241E;SYMBOL FOR RECORD SEPARATOR;So;0;ON;;;;;N;GRAPHIC FOR RECORD SEPARATOR;;;;
-241F;SYMBOL FOR UNIT SEPARATOR;So;0;ON;;;;;N;GRAPHIC FOR UNIT SEPARATOR;;;;
-2420;SYMBOL FOR SPACE;So;0;ON;;;;;N;GRAPHIC FOR SPACE;;;;
-2421;SYMBOL FOR DELETE;So;0;ON;;;;;N;GRAPHIC FOR DELETE;;;;
-2422;BLANK SYMBOL;So;0;ON;;;;;N;BLANK;;;;
-2423;OPEN BOX;So;0;ON;;;;;N;;;;;
-2424;SYMBOL FOR NEWLINE;So;0;ON;;;;;N;GRAPHIC FOR NEWLINE;;;;
-2425;SYMBOL FOR DELETE FORM TWO;So;0;ON;;;;;N;;;;;
-2426;SYMBOL FOR SUBSTITUTE FORM TWO;So;0;ON;;;;;N;;;;;
-2440;OCR HOOK;So;0;ON;;;;;N;;;;;
-2441;OCR CHAIR;So;0;ON;;;;;N;;;;;
-2442;OCR FORK;So;0;ON;;;;;N;;;;;
-2443;OCR INVERTED FORK;So;0;ON;;;;;N;;;;;
-2444;OCR BELT BUCKLE;So;0;ON;;;;;N;;;;;
-2445;OCR BOW TIE;So;0;ON;;;;;N;;;;;
-2446;OCR BRANCH BANK IDENTIFICATION;So;0;ON;;;;;N;;;;;
-2447;OCR AMOUNT OF CHECK;So;0;ON;;;;;N;;;;;
-2448;OCR DASH;So;0;ON;;;;;N;;;;;
-2449;OCR CUSTOMER ACCOUNT NUMBER;So;0;ON;;;;;N;;;;;
-244A;OCR DOUBLE BACKSLASH;So;0;ON;;;;;N;;;;;
-2460;CIRCLED DIGIT ONE;No;0;ON;<circle> 0031;;1;1;N;;;;;
-2461;CIRCLED DIGIT TWO;No;0;ON;<circle> 0032;;2;2;N;;;;;
-2462;CIRCLED DIGIT THREE;No;0;ON;<circle> 0033;;3;3;N;;;;;
-2463;CIRCLED DIGIT FOUR;No;0;ON;<circle> 0034;;4;4;N;;;;;
-2464;CIRCLED DIGIT FIVE;No;0;ON;<circle> 0035;;5;5;N;;;;;
-2465;CIRCLED DIGIT SIX;No;0;ON;<circle> 0036;;6;6;N;;;;;
-2466;CIRCLED DIGIT SEVEN;No;0;ON;<circle> 0037;;7;7;N;;;;;
-2467;CIRCLED DIGIT EIGHT;No;0;ON;<circle> 0038;;8;8;N;;;;;
-2468;CIRCLED DIGIT NINE;No;0;ON;<circle> 0039;;9;9;N;;;;;
-2469;CIRCLED NUMBER TEN;No;0;ON;<circle> 0031 0030;;;10;N;;;;;
-246A;CIRCLED NUMBER ELEVEN;No;0;ON;<circle> 0031 0031;;;11;N;;;;;
-246B;CIRCLED NUMBER TWELVE;No;0;ON;<circle> 0031 0032;;;12;N;;;;;
-246C;CIRCLED NUMBER THIRTEEN;No;0;ON;<circle> 0031 0033;;;13;N;;;;;
-246D;CIRCLED NUMBER FOURTEEN;No;0;ON;<circle> 0031 0034;;;14;N;;;;;
-246E;CIRCLED NUMBER FIFTEEN;No;0;ON;<circle> 0031 0035;;;15;N;;;;;
-246F;CIRCLED NUMBER SIXTEEN;No;0;ON;<circle> 0031 0036;;;16;N;;;;;
-2470;CIRCLED NUMBER SEVENTEEN;No;0;ON;<circle> 0031 0037;;;17;N;;;;;
-2471;CIRCLED NUMBER EIGHTEEN;No;0;ON;<circle> 0031 0038;;;18;N;;;;;
-2472;CIRCLED NUMBER NINETEEN;No;0;ON;<circle> 0031 0039;;;19;N;;;;;
-2473;CIRCLED NUMBER TWENTY;No;0;ON;<circle> 0032 0030;;;20;N;;;;;
-2474;PARENTHESIZED DIGIT ONE;No;0;ON;<compat> 0028 0031 0029;;1;1;N;;;;;
-2475;PARENTHESIZED DIGIT TWO;No;0;ON;<compat> 0028 0032 0029;;2;2;N;;;;;
-2476;PARENTHESIZED DIGIT THREE;No;0;ON;<compat> 0028 0033 0029;;3;3;N;;;;;
-2477;PARENTHESIZED DIGIT FOUR;No;0;ON;<compat> 0028 0034 0029;;4;4;N;;;;;
-2478;PARENTHESIZED DIGIT FIVE;No;0;ON;<compat> 0028 0035 0029;;5;5;N;;;;;
-2479;PARENTHESIZED DIGIT SIX;No;0;ON;<compat> 0028 0036 0029;;6;6;N;;;;;
-247A;PARENTHESIZED DIGIT SEVEN;No;0;ON;<compat> 0028 0037 0029;;7;7;N;;;;;
-247B;PARENTHESIZED DIGIT EIGHT;No;0;ON;<compat> 0028 0038 0029;;8;8;N;;;;;
-247C;PARENTHESIZED DIGIT NINE;No;0;ON;<compat> 0028 0039 0029;;9;9;N;;;;;
-247D;PARENTHESIZED NUMBER TEN;No;0;ON;<compat> 0028 0031 0030 0029;;;10;N;;;;;
-247E;PARENTHESIZED NUMBER ELEVEN;No;0;ON;<compat> 0028 0031 0031 0029;;;11;N;;;;;
-247F;PARENTHESIZED NUMBER TWELVE;No;0;ON;<compat> 0028 0031 0032 0029;;;12;N;;;;;
-2480;PARENTHESIZED NUMBER THIRTEEN;No;0;ON;<compat> 0028 0031 0033 0029;;;13;N;;;;;
-2481;PARENTHESIZED NUMBER FOURTEEN;No;0;ON;<compat> 0028 0031 0034 0029;;;14;N;;;;;
-2482;PARENTHESIZED NUMBER FIFTEEN;No;0;ON;<compat> 0028 0031 0035 0029;;;15;N;;;;;
-2483;PARENTHESIZED NUMBER SIXTEEN;No;0;ON;<compat> 0028 0031 0036 0029;;;16;N;;;;;
-2484;PARENTHESIZED NUMBER SEVENTEEN;No;0;ON;<compat> 0028 0031 0037 0029;;;17;N;;;;;
-2485;PARENTHESIZED NUMBER EIGHTEEN;No;0;ON;<compat> 0028 0031 0038 0029;;;18;N;;;;;
-2486;PARENTHESIZED NUMBER NINETEEN;No;0;ON;<compat> 0028 0031 0039 0029;;;19;N;;;;;
-2487;PARENTHESIZED NUMBER TWENTY;No;0;ON;<compat> 0028 0032 0030 0029;;;20;N;;;;;
-2488;DIGIT ONE FULL STOP;No;0;EN;<compat> 0031 002E;;1;1;N;DIGIT ONE PERIOD;;;;
-2489;DIGIT TWO FULL STOP;No;0;EN;<compat> 0032 002E;;2;2;N;DIGIT TWO PERIOD;;;;
-248A;DIGIT THREE FULL STOP;No;0;EN;<compat> 0033 002E;;3;3;N;DIGIT THREE PERIOD;;;;
-248B;DIGIT FOUR FULL STOP;No;0;EN;<compat> 0034 002E;;4;4;N;DIGIT FOUR PERIOD;;;;
-248C;DIGIT FIVE FULL STOP;No;0;EN;<compat> 0035 002E;;5;5;N;DIGIT FIVE PERIOD;;;;
-248D;DIGIT SIX FULL STOP;No;0;EN;<compat> 0036 002E;;6;6;N;DIGIT SIX PERIOD;;;;
-248E;DIGIT SEVEN FULL STOP;No;0;EN;<compat> 0037 002E;;7;7;N;DIGIT SEVEN PERIOD;;;;
-248F;DIGIT EIGHT FULL STOP;No;0;EN;<compat> 0038 002E;;8;8;N;DIGIT EIGHT PERIOD;;;;
-2490;DIGIT NINE FULL STOP;No;0;EN;<compat> 0039 002E;;9;9;N;DIGIT NINE PERIOD;;;;
-2491;NUMBER TEN FULL STOP;No;0;EN;<compat> 0031 0030 002E;;;10;N;NUMBER TEN PERIOD;;;;
-2492;NUMBER ELEVEN FULL STOP;No;0;EN;<compat> 0031 0031 002E;;;11;N;NUMBER ELEVEN PERIOD;;;;
-2493;NUMBER TWELVE FULL STOP;No;0;EN;<compat> 0031 0032 002E;;;12;N;NUMBER TWELVE PERIOD;;;;
-2494;NUMBER THIRTEEN FULL STOP;No;0;EN;<compat> 0031 0033 002E;;;13;N;NUMBER THIRTEEN PERIOD;;;;
-2495;NUMBER FOURTEEN FULL STOP;No;0;EN;<compat> 0031 0034 002E;;;14;N;NUMBER FOURTEEN PERIOD;;;;
-2496;NUMBER FIFTEEN FULL STOP;No;0;EN;<compat> 0031 0035 002E;;;15;N;NUMBER FIFTEEN PERIOD;;;;
-2497;NUMBER SIXTEEN FULL STOP;No;0;EN;<compat> 0031 0036 002E;;;16;N;NUMBER SIXTEEN PERIOD;;;;
-2498;NUMBER SEVENTEEN FULL STOP;No;0;EN;<compat> 0031 0037 002E;;;17;N;NUMBER SEVENTEEN PERIOD;;;;
-2499;NUMBER EIGHTEEN FULL STOP;No;0;EN;<compat> 0031 0038 002E;;;18;N;NUMBER EIGHTEEN PERIOD;;;;
-249A;NUMBER NINETEEN FULL STOP;No;0;EN;<compat> 0031 0039 002E;;;19;N;NUMBER NINETEEN PERIOD;;;;
-249B;NUMBER TWENTY FULL STOP;No;0;EN;<compat> 0032 0030 002E;;;20;N;NUMBER TWENTY PERIOD;;;;
-249C;PARENTHESIZED LATIN SMALL LETTER A;So;0;L;<compat> 0028 0061 0029;;;;N;;;;;
-249D;PARENTHESIZED LATIN SMALL LETTER B;So;0;L;<compat> 0028 0062 0029;;;;N;;;;;
-249E;PARENTHESIZED LATIN SMALL LETTER C;So;0;L;<compat> 0028 0063 0029;;;;N;;;;;
-249F;PARENTHESIZED LATIN SMALL LETTER D;So;0;L;<compat> 0028 0064 0029;;;;N;;;;;
-24A0;PARENTHESIZED LATIN SMALL LETTER E;So;0;L;<compat> 0028 0065 0029;;;;N;;;;;
-24A1;PARENTHESIZED LATIN SMALL LETTER F;So;0;L;<compat> 0028 0066 0029;;;;N;;;;;
-24A2;PARENTHESIZED LATIN SMALL LETTER G;So;0;L;<compat> 0028 0067 0029;;;;N;;;;;
-24A3;PARENTHESIZED LATIN SMALL LETTER H;So;0;L;<compat> 0028 0068 0029;;;;N;;;;;
-24A4;PARENTHESIZED LATIN SMALL LETTER I;So;0;L;<compat> 0028 0069 0029;;;;N;;;;;
-24A5;PARENTHESIZED LATIN SMALL LETTER J;So;0;L;<compat> 0028 006A 0029;;;;N;;;;;
-24A6;PARENTHESIZED LATIN SMALL LETTER K;So;0;L;<compat> 0028 006B 0029;;;;N;;;;;
-24A7;PARENTHESIZED LATIN SMALL LETTER L;So;0;L;<compat> 0028 006C 0029;;;;N;;;;;
-24A8;PARENTHESIZED LATIN SMALL LETTER M;So;0;L;<compat> 0028 006D 0029;;;;N;;;;;
-24A9;PARENTHESIZED LATIN SMALL LETTER N;So;0;L;<compat> 0028 006E 0029;;;;N;;;;;
-24AA;PARENTHESIZED LATIN SMALL LETTER O;So;0;L;<compat> 0028 006F 0029;;;;N;;;;;
-24AB;PARENTHESIZED LATIN SMALL LETTER P;So;0;L;<compat> 0028 0070 0029;;;;N;;;;;
-24AC;PARENTHESIZED LATIN SMALL LETTER Q;So;0;L;<compat> 0028 0071 0029;;;;N;;;;;
-24AD;PARENTHESIZED LATIN SMALL LETTER R;So;0;L;<compat> 0028 0072 0029;;;;N;;;;;
-24AE;PARENTHESIZED LATIN SMALL LETTER S;So;0;L;<compat> 0028 0073 0029;;;;N;;;;;
-24AF;PARENTHESIZED LATIN SMALL LETTER T;So;0;L;<compat> 0028 0074 0029;;;;N;;;;;
-24B0;PARENTHESIZED LATIN SMALL LETTER U;So;0;L;<compat> 0028 0075 0029;;;;N;;;;;
-24B1;PARENTHESIZED LATIN SMALL LETTER V;So;0;L;<compat> 0028 0076 0029;;;;N;;;;;
-24B2;PARENTHESIZED LATIN SMALL LETTER W;So;0;L;<compat> 0028 0077 0029;;;;N;;;;;
-24B3;PARENTHESIZED LATIN SMALL LETTER X;So;0;L;<compat> 0028 0078 0029;;;;N;;;;;
-24B4;PARENTHESIZED LATIN SMALL LETTER Y;So;0;L;<compat> 0028 0079 0029;;;;N;;;;;
-24B5;PARENTHESIZED LATIN SMALL LETTER Z;So;0;L;<compat> 0028 007A 0029;;;;N;;;;;
-24B6;CIRCLED LATIN CAPITAL LETTER A;So;0;L;<circle> 0041;;;;N;;;;24D0;
-24B7;CIRCLED LATIN CAPITAL LETTER B;So;0;L;<circle> 0042;;;;N;;;;24D1;
-24B8;CIRCLED LATIN CAPITAL LETTER C;So;0;L;<circle> 0043;;;;N;;;;24D2;
-24B9;CIRCLED LATIN CAPITAL LETTER D;So;0;L;<circle> 0044;;;;N;;;;24D3;
-24BA;CIRCLED LATIN CAPITAL LETTER E;So;0;L;<circle> 0045;;;;N;;;;24D4;
-24BB;CIRCLED LATIN CAPITAL LETTER F;So;0;L;<circle> 0046;;;;N;;;;24D5;
-24BC;CIRCLED LATIN CAPITAL LETTER G;So;0;L;<circle> 0047;;;;N;;;;24D6;
-24BD;CIRCLED LATIN CAPITAL LETTER H;So;0;L;<circle> 0048;;;;N;;;;24D7;
-24BE;CIRCLED LATIN CAPITAL LETTER I;So;0;L;<circle> 0049;;;;N;;;;24D8;
-24BF;CIRCLED LATIN CAPITAL LETTER J;So;0;L;<circle> 004A;;;;N;;;;24D9;
-24C0;CIRCLED LATIN CAPITAL LETTER K;So;0;L;<circle> 004B;;;;N;;;;24DA;
-24C1;CIRCLED LATIN CAPITAL LETTER L;So;0;L;<circle> 004C;;;;N;;;;24DB;
-24C2;CIRCLED LATIN CAPITAL LETTER M;So;0;L;<circle> 004D;;;;N;;;;24DC;
-24C3;CIRCLED LATIN CAPITAL LETTER N;So;0;L;<circle> 004E;;;;N;;;;24DD;
-24C4;CIRCLED LATIN CAPITAL LETTER O;So;0;L;<circle> 004F;;;;N;;;;24DE;
-24C5;CIRCLED LATIN CAPITAL LETTER P;So;0;L;<circle> 0050;;;;N;;;;24DF;
-24C6;CIRCLED LATIN CAPITAL LETTER Q;So;0;L;<circle> 0051;;;;N;;;;24E0;
-24C7;CIRCLED LATIN CAPITAL LETTER R;So;0;L;<circle> 0052;;;;N;;;;24E1;
-24C8;CIRCLED LATIN CAPITAL LETTER S;So;0;L;<circle> 0053;;;;N;;;;24E2;
-24C9;CIRCLED LATIN CAPITAL LETTER T;So;0;L;<circle> 0054;;;;N;;;;24E3;
-24CA;CIRCLED LATIN CAPITAL LETTER U;So;0;L;<circle> 0055;;;;N;;;;24E4;
-24CB;CIRCLED LATIN CAPITAL LETTER V;So;0;L;<circle> 0056;;;;N;;;;24E5;
-24CC;CIRCLED LATIN CAPITAL LETTER W;So;0;L;<circle> 0057;;;;N;;;;24E6;
-24CD;CIRCLED LATIN CAPITAL LETTER X;So;0;L;<circle> 0058;;;;N;;;;24E7;
-24CE;CIRCLED LATIN CAPITAL LETTER Y;So;0;L;<circle> 0059;;;;N;;;;24E8;
-24CF;CIRCLED LATIN CAPITAL LETTER Z;So;0;L;<circle> 005A;;;;N;;;;24E9;
-24D0;CIRCLED LATIN SMALL LETTER A;So;0;L;<circle> 0061;;;;N;;;24B6;;24B6
-24D1;CIRCLED LATIN SMALL LETTER B;So;0;L;<circle> 0062;;;;N;;;24B7;;24B7
-24D2;CIRCLED LATIN SMALL LETTER C;So;0;L;<circle> 0063;;;;N;;;24B8;;24B8
-24D3;CIRCLED LATIN SMALL LETTER D;So;0;L;<circle> 0064;;;;N;;;24B9;;24B9
-24D4;CIRCLED LATIN SMALL LETTER E;So;0;L;<circle> 0065;;;;N;;;24BA;;24BA
-24D5;CIRCLED LATIN SMALL LETTER F;So;0;L;<circle> 0066;;;;N;;;24BB;;24BB
-24D6;CIRCLED LATIN SMALL LETTER G;So;0;L;<circle> 0067;;;;N;;;24BC;;24BC
-24D7;CIRCLED LATIN SMALL LETTER H;So;0;L;<circle> 0068;;;;N;;;24BD;;24BD
-24D8;CIRCLED LATIN SMALL LETTER I;So;0;L;<circle> 0069;;;;N;;;24BE;;24BE
-24D9;CIRCLED LATIN SMALL LETTER J;So;0;L;<circle> 006A;;;;N;;;24BF;;24BF
-24DA;CIRCLED LATIN SMALL LETTER K;So;0;L;<circle> 006B;;;;N;;;24C0;;24C0
-24DB;CIRCLED LATIN SMALL LETTER L;So;0;L;<circle> 006C;;;;N;;;24C1;;24C1
-24DC;CIRCLED LATIN SMALL LETTER M;So;0;L;<circle> 006D;;;;N;;;24C2;;24C2
-24DD;CIRCLED LATIN SMALL LETTER N;So;0;L;<circle> 006E;;;;N;;;24C3;;24C3
-24DE;CIRCLED LATIN SMALL LETTER O;So;0;L;<circle> 006F;;;;N;;;24C4;;24C4
-24DF;CIRCLED LATIN SMALL LETTER P;So;0;L;<circle> 0070;;;;N;;;24C5;;24C5
-24E0;CIRCLED LATIN SMALL LETTER Q;So;0;L;<circle> 0071;;;;N;;;24C6;;24C6
-24E1;CIRCLED LATIN SMALL LETTER R;So;0;L;<circle> 0072;;;;N;;;24C7;;24C7
-24E2;CIRCLED LATIN SMALL LETTER S;So;0;L;<circle> 0073;;;;N;;;24C8;;24C8
-24E3;CIRCLED LATIN SMALL LETTER T;So;0;L;<circle> 0074;;;;N;;;24C9;;24C9
-24E4;CIRCLED LATIN SMALL LETTER U;So;0;L;<circle> 0075;;;;N;;;24CA;;24CA
-24E5;CIRCLED LATIN SMALL LETTER V;So;0;L;<circle> 0076;;;;N;;;24CB;;24CB
-24E6;CIRCLED LATIN SMALL LETTER W;So;0;L;<circle> 0077;;;;N;;;24CC;;24CC
-24E7;CIRCLED LATIN SMALL LETTER X;So;0;L;<circle> 0078;;;;N;;;24CD;;24CD
-24E8;CIRCLED LATIN SMALL LETTER Y;So;0;L;<circle> 0079;;;;N;;;24CE;;24CE
-24E9;CIRCLED LATIN SMALL LETTER Z;So;0;L;<circle> 007A;;;;N;;;24CF;;24CF
-24EA;CIRCLED DIGIT ZERO;No;0;ON;<circle> 0030;;0;0;N;;;;;
-24EB;NEGATIVE CIRCLED NUMBER ELEVEN;No;0;ON;;;;11;N;;;;;
-24EC;NEGATIVE CIRCLED NUMBER TWELVE;No;0;ON;;;;12;N;;;;;
-24ED;NEGATIVE CIRCLED NUMBER THIRTEEN;No;0;ON;;;;13;N;;;;;
-24EE;NEGATIVE CIRCLED NUMBER FOURTEEN;No;0;ON;;;;14;N;;;;;
-24EF;NEGATIVE CIRCLED NUMBER FIFTEEN;No;0;ON;;;;15;N;;;;;
-24F0;NEGATIVE CIRCLED NUMBER SIXTEEN;No;0;ON;;;;16;N;;;;;
-24F1;NEGATIVE CIRCLED NUMBER SEVENTEEN;No;0;ON;;;;17;N;;;;;
-24F2;NEGATIVE CIRCLED NUMBER EIGHTEEN;No;0;ON;;;;18;N;;;;;
-24F3;NEGATIVE CIRCLED NUMBER NINETEEN;No;0;ON;;;;19;N;;;;;
-24F4;NEGATIVE CIRCLED NUMBER TWENTY;No;0;ON;;;;20;N;;;;;
-24F5;DOUBLE CIRCLED DIGIT ONE;No;0;ON;;;1;1;N;;;;;
-24F6;DOUBLE CIRCLED DIGIT TWO;No;0;ON;;;2;2;N;;;;;
-24F7;DOUBLE CIRCLED DIGIT THREE;No;0;ON;;;3;3;N;;;;;
-24F8;DOUBLE CIRCLED DIGIT FOUR;No;0;ON;;;4;4;N;;;;;
-24F9;DOUBLE CIRCLED DIGIT FIVE;No;0;ON;;;5;5;N;;;;;
-24FA;DOUBLE CIRCLED DIGIT SIX;No;0;ON;;;6;6;N;;;;;
-24FB;DOUBLE CIRCLED DIGIT SEVEN;No;0;ON;;;7;7;N;;;;;
-24FC;DOUBLE CIRCLED DIGIT EIGHT;No;0;ON;;;8;8;N;;;;;
-24FD;DOUBLE CIRCLED DIGIT NINE;No;0;ON;;;9;9;N;;;;;
-24FE;DOUBLE CIRCLED NUMBER TEN;No;0;ON;;;;10;N;;;;;
-24FF;NEGATIVE CIRCLED DIGIT ZERO;No;0;ON;;;0;0;N;;;;;
-2500;BOX DRAWINGS LIGHT HORIZONTAL;So;0;ON;;;;;N;FORMS LIGHT HORIZONTAL;;;;
-2501;BOX DRAWINGS HEAVY HORIZONTAL;So;0;ON;;;;;N;FORMS HEAVY HORIZONTAL;;;;
-2502;BOX DRAWINGS LIGHT VERTICAL;So;0;ON;;;;;N;FORMS LIGHT VERTICAL;;;;
-2503;BOX DRAWINGS HEAVY VERTICAL;So;0;ON;;;;;N;FORMS HEAVY VERTICAL;;;;
-2504;BOX DRAWINGS LIGHT TRIPLE DASH HORIZONTAL;So;0;ON;;;;;N;FORMS LIGHT TRIPLE DASH HORIZONTAL;;;;
-2505;BOX DRAWINGS HEAVY TRIPLE DASH HORIZONTAL;So;0;ON;;;;;N;FORMS HEAVY TRIPLE DASH HORIZONTAL;;;;
-2506;BOX DRAWINGS LIGHT TRIPLE DASH VERTICAL;So;0;ON;;;;;N;FORMS LIGHT TRIPLE DASH VERTICAL;;;;
-2507;BOX DRAWINGS HEAVY TRIPLE DASH VERTICAL;So;0;ON;;;;;N;FORMS HEAVY TRIPLE DASH VERTICAL;;;;
-2508;BOX DRAWINGS LIGHT QUADRUPLE DASH HORIZONTAL;So;0;ON;;;;;N;FORMS LIGHT QUADRUPLE DASH HORIZONTAL;;;;
-2509;BOX DRAWINGS HEAVY QUADRUPLE DASH HORIZONTAL;So;0;ON;;;;;N;FORMS HEAVY QUADRUPLE DASH HORIZONTAL;;;;
-250A;BOX DRAWINGS LIGHT QUADRUPLE DASH VERTICAL;So;0;ON;;;;;N;FORMS LIGHT QUADRUPLE DASH VERTICAL;;;;
-250B;BOX DRAWINGS HEAVY QUADRUPLE DASH VERTICAL;So;0;ON;;;;;N;FORMS HEAVY QUADRUPLE DASH VERTICAL;;;;
-250C;BOX DRAWINGS LIGHT DOWN AND RIGHT;So;0;ON;;;;;N;FORMS LIGHT DOWN AND RIGHT;;;;
-250D;BOX DRAWINGS DOWN LIGHT AND RIGHT HEAVY;So;0;ON;;;;;N;FORMS DOWN LIGHT AND RIGHT HEAVY;;;;
-250E;BOX DRAWINGS DOWN HEAVY AND RIGHT LIGHT;So;0;ON;;;;;N;FORMS DOWN HEAVY AND RIGHT LIGHT;;;;
-250F;BOX DRAWINGS HEAVY DOWN AND RIGHT;So;0;ON;;;;;N;FORMS HEAVY DOWN AND RIGHT;;;;
-2510;BOX DRAWINGS LIGHT DOWN AND LEFT;So;0;ON;;;;;N;FORMS LIGHT DOWN AND LEFT;;;;
-2511;BOX DRAWINGS DOWN LIGHT AND LEFT HEAVY;So;0;ON;;;;;N;FORMS DOWN LIGHT AND LEFT HEAVY;;;;
-2512;BOX DRAWINGS DOWN HEAVY AND LEFT LIGHT;So;0;ON;;;;;N;FORMS DOWN HEAVY AND LEFT LIGHT;;;;
-2513;BOX DRAWINGS HEAVY DOWN AND LEFT;So;0;ON;;;;;N;FORMS HEAVY DOWN AND LEFT;;;;
-2514;BOX DRAWINGS LIGHT UP AND RIGHT;So;0;ON;;;;;N;FORMS LIGHT UP AND RIGHT;;;;
-2515;BOX DRAWINGS UP LIGHT AND RIGHT HEAVY;So;0;ON;;;;;N;FORMS UP LIGHT AND RIGHT HEAVY;;;;
-2516;BOX DRAWINGS UP HEAVY AND RIGHT LIGHT;So;0;ON;;;;;N;FORMS UP HEAVY AND RIGHT LIGHT;;;;
-2517;BOX DRAWINGS HEAVY UP AND RIGHT;So;0;ON;;;;;N;FORMS HEAVY UP AND RIGHT;;;;
-2518;BOX DRAWINGS LIGHT UP AND LEFT;So;0;ON;;;;;N;FORMS LIGHT UP AND LEFT;;;;
-2519;BOX DRAWINGS UP LIGHT AND LEFT HEAVY;So;0;ON;;;;;N;FORMS UP LIGHT AND LEFT HEAVY;;;;
-251A;BOX DRAWINGS UP HEAVY AND LEFT LIGHT;So;0;ON;;;;;N;FORMS UP HEAVY AND LEFT LIGHT;;;;
-251B;BOX DRAWINGS HEAVY UP AND LEFT;So;0;ON;;;;;N;FORMS HEAVY UP AND LEFT;;;;
-251C;BOX DRAWINGS LIGHT VERTICAL AND RIGHT;So;0;ON;;;;;N;FORMS LIGHT VERTICAL AND RIGHT;;;;
-251D;BOX DRAWINGS VERTICAL LIGHT AND RIGHT HEAVY;So;0;ON;;;;;N;FORMS VERTICAL LIGHT AND RIGHT HEAVY;;;;
-251E;BOX DRAWINGS UP HEAVY AND RIGHT DOWN LIGHT;So;0;ON;;;;;N;FORMS UP HEAVY AND RIGHT DOWN LIGHT;;;;
-251F;BOX DRAWINGS DOWN HEAVY AND RIGHT UP LIGHT;So;0;ON;;;;;N;FORMS DOWN HEAVY AND RIGHT UP LIGHT;;;;
-2520;BOX DRAWINGS VERTICAL HEAVY AND RIGHT LIGHT;So;0;ON;;;;;N;FORMS VERTICAL HEAVY AND RIGHT LIGHT;;;;
-2521;BOX DRAWINGS DOWN LIGHT AND RIGHT UP HEAVY;So;0;ON;;;;;N;FORMS DOWN LIGHT AND RIGHT UP HEAVY;;;;
-2522;BOX DRAWINGS UP LIGHT AND RIGHT DOWN HEAVY;So;0;ON;;;;;N;FORMS UP LIGHT AND RIGHT DOWN HEAVY;;;;
-2523;BOX DRAWINGS HEAVY VERTICAL AND RIGHT;So;0;ON;;;;;N;FORMS HEAVY VERTICAL AND RIGHT;;;;
-2524;BOX DRAWINGS LIGHT VERTICAL AND LEFT;So;0;ON;;;;;N;FORMS LIGHT VERTICAL AND LEFT;;;;
-2525;BOX DRAWINGS VERTICAL LIGHT AND LEFT HEAVY;So;0;ON;;;;;N;FORMS VERTICAL LIGHT AND LEFT HEAVY;;;;
-2526;BOX DRAWINGS UP HEAVY AND LEFT DOWN LIGHT;So;0;ON;;;;;N;FORMS UP HEAVY AND LEFT DOWN LIGHT;;;;
-2527;BOX DRAWINGS DOWN HEAVY AND LEFT UP LIGHT;So;0;ON;;;;;N;FORMS DOWN HEAVY AND LEFT UP LIGHT;;;;
-2528;BOX DRAWINGS VERTICAL HEAVY AND LEFT LIGHT;So;0;ON;;;;;N;FORMS VERTICAL HEAVY AND LEFT LIGHT;;;;
-2529;BOX DRAWINGS DOWN LIGHT AND LEFT UP HEAVY;So;0;ON;;;;;N;FORMS DOWN LIGHT AND LEFT UP HEAVY;;;;
-252A;BOX DRAWINGS UP LIGHT AND LEFT DOWN HEAVY;So;0;ON;;;;;N;FORMS UP LIGHT AND LEFT DOWN HEAVY;;;;
-252B;BOX DRAWINGS HEAVY VERTICAL AND LEFT;So;0;ON;;;;;N;FORMS HEAVY VERTICAL AND LEFT;;;;
-252C;BOX DRAWINGS LIGHT DOWN AND HORIZONTAL;So;0;ON;;;;;N;FORMS LIGHT DOWN AND HORIZONTAL;;;;
-252D;BOX DRAWINGS LEFT HEAVY AND RIGHT DOWN LIGHT;So;0;ON;;;;;N;FORMS LEFT HEAVY AND RIGHT DOWN LIGHT;;;;
-252E;BOX DRAWINGS RIGHT HEAVY AND LEFT DOWN LIGHT;So;0;ON;;;;;N;FORMS RIGHT HEAVY AND LEFT DOWN LIGHT;;;;
-252F;BOX DRAWINGS DOWN LIGHT AND HORIZONTAL HEAVY;So;0;ON;;;;;N;FORMS DOWN LIGHT AND HORIZONTAL HEAVY;;;;
-2530;BOX DRAWINGS DOWN HEAVY AND HORIZONTAL LIGHT;So;0;ON;;;;;N;FORMS DOWN HEAVY AND HORIZONTAL LIGHT;;;;
-2531;BOX DRAWINGS RIGHT LIGHT AND LEFT DOWN HEAVY;So;0;ON;;;;;N;FORMS RIGHT LIGHT AND LEFT DOWN HEAVY;;;;
-2532;BOX DRAWINGS LEFT LIGHT AND RIGHT DOWN HEAVY;So;0;ON;;;;;N;FORMS LEFT LIGHT AND RIGHT DOWN HEAVY;;;;
-2533;BOX DRAWINGS HEAVY DOWN AND HORIZONTAL;So;0;ON;;;;;N;FORMS HEAVY DOWN AND HORIZONTAL;;;;
-2534;BOX DRAWINGS LIGHT UP AND HORIZONTAL;So;0;ON;;;;;N;FORMS LIGHT UP AND HORIZONTAL;;;;
-2535;BOX DRAWINGS LEFT HEAVY AND RIGHT UP LIGHT;So;0;ON;;;;;N;FORMS LEFT HEAVY AND RIGHT UP LIGHT;;;;
-2536;BOX DRAWINGS RIGHT HEAVY AND LEFT UP LIGHT;So;0;ON;;;;;N;FORMS RIGHT HEAVY AND LEFT UP LIGHT;;;;
-2537;BOX DRAWINGS UP LIGHT AND HORIZONTAL HEAVY;So;0;ON;;;;;N;FORMS UP LIGHT AND HORIZONTAL HEAVY;;;;
-2538;BOX DRAWINGS UP HEAVY AND HORIZONTAL LIGHT;So;0;ON;;;;;N;FORMS UP HEAVY AND HORIZONTAL LIGHT;;;;
-2539;BOX DRAWINGS RIGHT LIGHT AND LEFT UP HEAVY;So;0;ON;;;;;N;FORMS RIGHT LIGHT AND LEFT UP HEAVY;;;;
-253A;BOX DRAWINGS LEFT LIGHT AND RIGHT UP HEAVY;So;0;ON;;;;;N;FORMS LEFT LIGHT AND RIGHT UP HEAVY;;;;
-253B;BOX DRAWINGS HEAVY UP AND HORIZONTAL;So;0;ON;;;;;N;FORMS HEAVY UP AND HORIZONTAL;;;;
-253C;BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL;So;0;ON;;;;;N;FORMS LIGHT VERTICAL AND HORIZONTAL;;;;
-253D;BOX DRAWINGS LEFT HEAVY AND RIGHT VERTICAL LIGHT;So;0;ON;;;;;N;FORMS LEFT HEAVY AND RIGHT VERTICAL LIGHT;;;;
-253E;BOX DRAWINGS RIGHT HEAVY AND LEFT VERTICAL LIGHT;So;0;ON;;;;;N;FORMS RIGHT HEAVY AND LEFT VERTICAL LIGHT;;;;
-253F;BOX DRAWINGS VERTICAL LIGHT AND HORIZONTAL HEAVY;So;0;ON;;;;;N;FORMS VERTICAL LIGHT AND HORIZONTAL HEAVY;;;;
-2540;BOX DRAWINGS UP HEAVY AND DOWN HORIZONTAL LIGHT;So;0;ON;;;;;N;FORMS UP HEAVY AND DOWN HORIZONTAL LIGHT;;;;
-2541;BOX DRAWINGS DOWN HEAVY AND UP HORIZONTAL LIGHT;So;0;ON;;;;;N;FORMS DOWN HEAVY AND UP HORIZONTAL LIGHT;;;;
-2542;BOX DRAWINGS VERTICAL HEAVY AND HORIZONTAL LIGHT;So;0;ON;;;;;N;FORMS VERTICAL HEAVY AND HORIZONTAL LIGHT;;;;
-2543;BOX DRAWINGS LEFT UP HEAVY AND RIGHT DOWN LIGHT;So;0;ON;;;;;N;FORMS LEFT UP HEAVY AND RIGHT DOWN LIGHT;;;;
-2544;BOX DRAWINGS RIGHT UP HEAVY AND LEFT DOWN LIGHT;So;0;ON;;;;;N;FORMS RIGHT UP HEAVY AND LEFT DOWN LIGHT;;;;
-2545;BOX DRAWINGS LEFT DOWN HEAVY AND RIGHT UP LIGHT;So;0;ON;;;;;N;FORMS LEFT DOWN HEAVY AND RIGHT UP LIGHT;;;;
-2546;BOX DRAWINGS RIGHT DOWN HEAVY AND LEFT UP LIGHT;So;0;ON;;;;;N;FORMS RIGHT DOWN HEAVY AND LEFT UP LIGHT;;;;
-2547;BOX DRAWINGS DOWN LIGHT AND UP HORIZONTAL HEAVY;So;0;ON;;;;;N;FORMS DOWN LIGHT AND UP HORIZONTAL HEAVY;;;;
-2548;BOX DRAWINGS UP LIGHT AND DOWN HORIZONTAL HEAVY;So;0;ON;;;;;N;FORMS UP LIGHT AND DOWN HORIZONTAL HEAVY;;;;
-2549;BOX DRAWINGS RIGHT LIGHT AND LEFT VERTICAL HEAVY;So;0;ON;;;;;N;FORMS RIGHT LIGHT AND LEFT VERTICAL HEAVY;;;;
-254A;BOX DRAWINGS LEFT LIGHT AND RIGHT VERTICAL HEAVY;So;0;ON;;;;;N;FORMS LEFT LIGHT AND RIGHT VERTICAL HEAVY;;;;
-254B;BOX DRAWINGS HEAVY VERTICAL AND HORIZONTAL;So;0;ON;;;;;N;FORMS HEAVY VERTICAL AND HORIZONTAL;;;;
-254C;BOX DRAWINGS LIGHT DOUBLE DASH HORIZONTAL;So;0;ON;;;;;N;FORMS LIGHT DOUBLE DASH HORIZONTAL;;;;
-254D;BOX DRAWINGS HEAVY DOUBLE DASH HORIZONTAL;So;0;ON;;;;;N;FORMS HEAVY DOUBLE DASH HORIZONTAL;;;;
-254E;BOX DRAWINGS LIGHT DOUBLE DASH VERTICAL;So;0;ON;;;;;N;FORMS LIGHT DOUBLE DASH VERTICAL;;;;
-254F;BOX DRAWINGS HEAVY DOUBLE DASH VERTICAL;So;0;ON;;;;;N;FORMS HEAVY DOUBLE DASH VERTICAL;;;;
-2550;BOX DRAWINGS DOUBLE HORIZONTAL;So;0;ON;;;;;N;FORMS DOUBLE HORIZONTAL;;;;
-2551;BOX DRAWINGS DOUBLE VERTICAL;So;0;ON;;;;;N;FORMS DOUBLE VERTICAL;;;;
-2552;BOX DRAWINGS DOWN SINGLE AND RIGHT DOUBLE;So;0;ON;;;;;N;FORMS DOWN SINGLE AND RIGHT DOUBLE;;;;
-2553;BOX DRAWINGS DOWN DOUBLE AND RIGHT SINGLE;So;0;ON;;;;;N;FORMS DOWN DOUBLE AND RIGHT SINGLE;;;;
-2554;BOX DRAWINGS DOUBLE DOWN AND RIGHT;So;0;ON;;;;;N;FORMS DOUBLE DOWN AND RIGHT;;;;
-2555;BOX DRAWINGS DOWN SINGLE AND LEFT DOUBLE;So;0;ON;;;;;N;FORMS DOWN SINGLE AND LEFT DOUBLE;;;;
-2556;BOX DRAWINGS DOWN DOUBLE AND LEFT SINGLE;So;0;ON;;;;;N;FORMS DOWN DOUBLE AND LEFT SINGLE;;;;
-2557;BOX DRAWINGS DOUBLE DOWN AND LEFT;So;0;ON;;;;;N;FORMS DOUBLE DOWN AND LEFT;;;;
-2558;BOX DRAWINGS UP SINGLE AND RIGHT DOUBLE;So;0;ON;;;;;N;FORMS UP SINGLE AND RIGHT DOUBLE;;;;
-2559;BOX DRAWINGS UP DOUBLE AND RIGHT SINGLE;So;0;ON;;;;;N;FORMS UP DOUBLE AND RIGHT SINGLE;;;;
-255A;BOX DRAWINGS DOUBLE UP AND RIGHT;So;0;ON;;;;;N;FORMS DOUBLE UP AND RIGHT;;;;
-255B;BOX DRAWINGS UP SINGLE AND LEFT DOUBLE;So;0;ON;;;;;N;FORMS UP SINGLE AND LEFT DOUBLE;;;;
-255C;BOX DRAWINGS UP DOUBLE AND LEFT SINGLE;So;0;ON;;;;;N;FORMS UP DOUBLE AND LEFT SINGLE;;;;
-255D;BOX DRAWINGS DOUBLE UP AND LEFT;So;0;ON;;;;;N;FORMS DOUBLE UP AND LEFT;;;;
-255E;BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE;So;0;ON;;;;;N;FORMS VERTICAL SINGLE AND RIGHT DOUBLE;;;;
-255F;BOX DRAWINGS VERTICAL DOUBLE AND RIGHT SINGLE;So;0;ON;;;;;N;FORMS VERTICAL DOUBLE AND RIGHT SINGLE;;;;
-2560;BOX DRAWINGS DOUBLE VERTICAL AND RIGHT;So;0;ON;;;;;N;FORMS DOUBLE VERTICAL AND RIGHT;;;;
-2561;BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE;So;0;ON;;;;;N;FORMS VERTICAL SINGLE AND LEFT DOUBLE;;;;
-2562;BOX DRAWINGS VERTICAL DOUBLE AND LEFT SINGLE;So;0;ON;;;;;N;FORMS VERTICAL DOUBLE AND LEFT SINGLE;;;;
-2563;BOX DRAWINGS DOUBLE VERTICAL AND LEFT;So;0;ON;;;;;N;FORMS DOUBLE VERTICAL AND LEFT;;;;
-2564;BOX DRAWINGS DOWN SINGLE AND HORIZONTAL DOUBLE;So;0;ON;;;;;N;FORMS DOWN SINGLE AND HORIZONTAL DOUBLE;;;;
-2565;BOX DRAWINGS DOWN DOUBLE AND HORIZONTAL SINGLE;So;0;ON;;;;;N;FORMS DOWN DOUBLE AND HORIZONTAL SINGLE;;;;
-2566;BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL;So;0;ON;;;;;N;FORMS DOUBLE DOWN AND HORIZONTAL;;;;
-2567;BOX DRAWINGS UP SINGLE AND HORIZONTAL DOUBLE;So;0;ON;;;;;N;FORMS UP SINGLE AND HORIZONTAL DOUBLE;;;;
-2568;BOX DRAWINGS UP DOUBLE AND HORIZONTAL SINGLE;So;0;ON;;;;;N;FORMS UP DOUBLE AND HORIZONTAL SINGLE;;;;
-2569;BOX DRAWINGS DOUBLE UP AND HORIZONTAL;So;0;ON;;;;;N;FORMS DOUBLE UP AND HORIZONTAL;;;;
-256A;BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DOUBLE;So;0;ON;;;;;N;FORMS VERTICAL SINGLE AND HORIZONTAL DOUBLE;;;;
-256B;BOX DRAWINGS VERTICAL DOUBLE AND HORIZONTAL SINGLE;So;0;ON;;;;;N;FORMS VERTICAL DOUBLE AND HORIZONTAL SINGLE;;;;
-256C;BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL;So;0;ON;;;;;N;FORMS DOUBLE VERTICAL AND HORIZONTAL;;;;
-256D;BOX DRAWINGS LIGHT ARC DOWN AND RIGHT;So;0;ON;;;;;N;FORMS LIGHT ARC DOWN AND RIGHT;;;;
-256E;BOX DRAWINGS LIGHT ARC DOWN AND LEFT;So;0;ON;;;;;N;FORMS LIGHT ARC DOWN AND LEFT;;;;
-256F;BOX DRAWINGS LIGHT ARC UP AND LEFT;So;0;ON;;;;;N;FORMS LIGHT ARC UP AND LEFT;;;;
-2570;BOX DRAWINGS LIGHT ARC UP AND RIGHT;So;0;ON;;;;;N;FORMS LIGHT ARC UP AND RIGHT;;;;
-2571;BOX DRAWINGS LIGHT DIAGONAL UPPER RIGHT TO LOWER LEFT;So;0;ON;;;;;N;FORMS LIGHT DIAGONAL UPPER RIGHT TO LOWER LEFT;;;;
-2572;BOX DRAWINGS LIGHT DIAGONAL UPPER LEFT TO LOWER RIGHT;So;0;ON;;;;;N;FORMS LIGHT DIAGONAL UPPER LEFT TO LOWER RIGHT;;;;
-2573;BOX DRAWINGS LIGHT DIAGONAL CROSS;So;0;ON;;;;;N;FORMS LIGHT DIAGONAL CROSS;;;;
-2574;BOX DRAWINGS LIGHT LEFT;So;0;ON;;;;;N;FORMS LIGHT LEFT;;;;
-2575;BOX DRAWINGS LIGHT UP;So;0;ON;;;;;N;FORMS LIGHT UP;;;;
-2576;BOX DRAWINGS LIGHT RIGHT;So;0;ON;;;;;N;FORMS LIGHT RIGHT;;;;
-2577;BOX DRAWINGS LIGHT DOWN;So;0;ON;;;;;N;FORMS LIGHT DOWN;;;;
-2578;BOX DRAWINGS HEAVY LEFT;So;0;ON;;;;;N;FORMS HEAVY LEFT;;;;
-2579;BOX DRAWINGS HEAVY UP;So;0;ON;;;;;N;FORMS HEAVY UP;;;;
-257A;BOX DRAWINGS HEAVY RIGHT;So;0;ON;;;;;N;FORMS HEAVY RIGHT;;;;
-257B;BOX DRAWINGS HEAVY DOWN;So;0;ON;;;;;N;FORMS HEAVY DOWN;;;;
-257C;BOX DRAWINGS LIGHT LEFT AND HEAVY RIGHT;So;0;ON;;;;;N;FORMS LIGHT LEFT AND HEAVY RIGHT;;;;
-257D;BOX DRAWINGS LIGHT UP AND HEAVY DOWN;So;0;ON;;;;;N;FORMS LIGHT UP AND HEAVY DOWN;;;;
-257E;BOX DRAWINGS HEAVY LEFT AND LIGHT RIGHT;So;0;ON;;;;;N;FORMS HEAVY LEFT AND LIGHT RIGHT;;;;
-257F;BOX DRAWINGS HEAVY UP AND LIGHT DOWN;So;0;ON;;;;;N;FORMS HEAVY UP AND LIGHT DOWN;;;;
-2580;UPPER HALF BLOCK;So;0;ON;;;;;N;;;;;
-2581;LOWER ONE EIGHTH BLOCK;So;0;ON;;;;;N;;;;;
-2582;LOWER ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;;
-2583;LOWER THREE EIGHTHS BLOCK;So;0;ON;;;;;N;;;;;
-2584;LOWER HALF BLOCK;So;0;ON;;;;;N;;;;;
-2585;LOWER FIVE EIGHTHS BLOCK;So;0;ON;;;;;N;;;;;
-2586;LOWER THREE QUARTERS BLOCK;So;0;ON;;;;;N;LOWER THREE QUARTER BLOCK;;;;
-2587;LOWER SEVEN EIGHTHS BLOCK;So;0;ON;;;;;N;;;;;
-2588;FULL BLOCK;So;0;ON;;;;;N;;;;;
-2589;LEFT SEVEN EIGHTHS BLOCK;So;0;ON;;;;;N;;;;;
-258A;LEFT THREE QUARTERS BLOCK;So;0;ON;;;;;N;LEFT THREE QUARTER BLOCK;;;;
-258B;LEFT FIVE EIGHTHS BLOCK;So;0;ON;;;;;N;;;;;
-258C;LEFT HALF BLOCK;So;0;ON;;;;;N;;;;;
-258D;LEFT THREE EIGHTHS BLOCK;So;0;ON;;;;;N;;;;;
-258E;LEFT ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;;
-258F;LEFT ONE EIGHTH BLOCK;So;0;ON;;;;;N;;;;;
-2590;RIGHT HALF BLOCK;So;0;ON;;;;;N;;;;;
-2591;LIGHT SHADE;So;0;ON;;;;;N;;;;;
-2592;MEDIUM SHADE;So;0;ON;;;;;N;;;;;
-2593;DARK SHADE;So;0;ON;;;;;N;;;;;
-2594;UPPER ONE EIGHTH BLOCK;So;0;ON;;;;;N;;;;;
-2595;RIGHT ONE EIGHTH BLOCK;So;0;ON;;;;;N;;;;;
-2596;QUADRANT LOWER LEFT;So;0;ON;;;;;N;;;;;
-2597;QUADRANT LOWER RIGHT;So;0;ON;;;;;N;;;;;
-2598;QUADRANT UPPER LEFT;So;0;ON;;;;;N;;;;;
-2599;QUADRANT UPPER LEFT AND LOWER LEFT AND LOWER RIGHT;So;0;ON;;;;;N;;;;;
-259A;QUADRANT UPPER LEFT AND LOWER RIGHT;So;0;ON;;;;;N;;;;;
-259B;QUADRANT UPPER LEFT AND UPPER RIGHT AND LOWER LEFT;So;0;ON;;;;;N;;;;;
-259C;QUADRANT UPPER LEFT AND UPPER RIGHT AND LOWER RIGHT;So;0;ON;;;;;N;;;;;
-259D;QUADRANT UPPER RIGHT;So;0;ON;;;;;N;;;;;
-259E;QUADRANT UPPER RIGHT AND LOWER LEFT;So;0;ON;;;;;N;;;;;
-259F;QUADRANT UPPER RIGHT AND LOWER LEFT AND LOWER RIGHT;So;0;ON;;;;;N;;;;;
-25A0;BLACK SQUARE;So;0;ON;;;;;N;;;;;
-25A1;WHITE SQUARE;So;0;ON;;;;;N;;;;;
-25A2;WHITE SQUARE WITH ROUNDED CORNERS;So;0;ON;;;;;N;;;;;
-25A3;WHITE SQUARE CONTAINING BLACK SMALL SQUARE;So;0;ON;;;;;N;;;;;
-25A4;SQUARE WITH HORIZONTAL FILL;So;0;ON;;;;;N;;;;;
-25A5;SQUARE WITH VERTICAL FILL;So;0;ON;;;;;N;;;;;
-25A6;SQUARE WITH ORTHOGONAL CROSSHATCH FILL;So;0;ON;;;;;N;;;;;
-25A7;SQUARE WITH UPPER LEFT TO LOWER RIGHT FILL;So;0;ON;;;;;N;;;;;
-25A8;SQUARE WITH UPPER RIGHT TO LOWER LEFT FILL;So;0;ON;;;;;N;;;;;
-25A9;SQUARE WITH DIAGONAL CROSSHATCH FILL;So;0;ON;;;;;N;;;;;
-25AA;BLACK SMALL SQUARE;So;0;ON;;;;;N;;;;;
-25AB;WHITE SMALL SQUARE;So;0;ON;;;;;N;;;;;
-25AC;BLACK RECTANGLE;So;0;ON;;;;;N;;;;;
-25AD;WHITE RECTANGLE;So;0;ON;;;;;N;;;;;
-25AE;BLACK VERTICAL RECTANGLE;So;0;ON;;;;;N;;;;;
-25AF;WHITE VERTICAL RECTANGLE;So;0;ON;;;;;N;;;;;
-25B0;BLACK PARALLELOGRAM;So;0;ON;;;;;N;;;;;
-25B1;WHITE PARALLELOGRAM;So;0;ON;;;;;N;;;;;
-25B2;BLACK UP-POINTING TRIANGLE;So;0;ON;;;;;N;BLACK UP POINTING TRIANGLE;;;;
-25B3;WHITE UP-POINTING TRIANGLE;So;0;ON;;;;;N;WHITE UP POINTING TRIANGLE;;;;
-25B4;BLACK UP-POINTING SMALL TRIANGLE;So;0;ON;;;;;N;BLACK UP POINTING SMALL TRIANGLE;;;;
-25B5;WHITE UP-POINTING SMALL TRIANGLE;So;0;ON;;;;;N;WHITE UP POINTING SMALL TRIANGLE;;;;
-25B6;BLACK RIGHT-POINTING TRIANGLE;So;0;ON;;;;;N;BLACK RIGHT POINTING TRIANGLE;;;;
-25B7;WHITE RIGHT-POINTING TRIANGLE;Sm;0;ON;;;;;N;WHITE RIGHT POINTING TRIANGLE;;;;
-25B8;BLACK RIGHT-POINTING SMALL TRIANGLE;So;0;ON;;;;;N;BLACK RIGHT POINTING SMALL TRIANGLE;;;;
-25B9;WHITE RIGHT-POINTING SMALL TRIANGLE;So;0;ON;;;;;N;WHITE RIGHT POINTING SMALL TRIANGLE;;;;
-25BA;BLACK RIGHT-POINTING POINTER;So;0;ON;;;;;N;BLACK RIGHT POINTING POINTER;;;;
-25BB;WHITE RIGHT-POINTING POINTER;So;0;ON;;;;;N;WHITE RIGHT POINTING POINTER;;;;
-25BC;BLACK DOWN-POINTING TRIANGLE;So;0;ON;;;;;N;BLACK DOWN POINTING TRIANGLE;;;;
-25BD;WHITE DOWN-POINTING TRIANGLE;So;0;ON;;;;;N;WHITE DOWN POINTING TRIANGLE;;;;
-25BE;BLACK DOWN-POINTING SMALL TRIANGLE;So;0;ON;;;;;N;BLACK DOWN POINTING SMALL TRIANGLE;;;;
-25BF;WHITE DOWN-POINTING SMALL TRIANGLE;So;0;ON;;;;;N;WHITE DOWN POINTING SMALL TRIANGLE;;;;
-25C0;BLACK LEFT-POINTING TRIANGLE;So;0;ON;;;;;N;BLACK LEFT POINTING TRIANGLE;;;;
-25C1;WHITE LEFT-POINTING TRIANGLE;Sm;0;ON;;;;;N;WHITE LEFT POINTING TRIANGLE;;;;
-25C2;BLACK LEFT-POINTING SMALL TRIANGLE;So;0;ON;;;;;N;BLACK LEFT POINTING SMALL TRIANGLE;;;;
-25C3;WHITE LEFT-POINTING SMALL TRIANGLE;So;0;ON;;;;;N;WHITE LEFT POINTING SMALL TRIANGLE;;;;
-25C4;BLACK LEFT-POINTING POINTER;So;0;ON;;;;;N;BLACK LEFT POINTING POINTER;;;;
-25C5;WHITE LEFT-POINTING POINTER;So;0;ON;;;;;N;WHITE LEFT POINTING POINTER;;;;
-25C6;BLACK DIAMOND;So;0;ON;;;;;N;;;;;
-25C7;WHITE DIAMOND;So;0;ON;;;;;N;;;;;
-25C8;WHITE DIAMOND CONTAINING BLACK SMALL DIAMOND;So;0;ON;;;;;N;;;;;
-25C9;FISHEYE;So;0;ON;;;;;N;;;;;
-25CA;LOZENGE;So;0;ON;;;;;N;;;;;
-25CB;WHITE CIRCLE;So;0;ON;;;;;N;;;;;
-25CC;DOTTED CIRCLE;So;0;ON;;;;;N;;;;;
-25CD;CIRCLE WITH VERTICAL FILL;So;0;ON;;;;;N;;;;;
-25CE;BULLSEYE;So;0;ON;;;;;N;;;;;
-25CF;BLACK CIRCLE;So;0;ON;;;;;N;;;;;
-25D0;CIRCLE WITH LEFT HALF BLACK;So;0;ON;;;;;N;;;;;
-25D1;CIRCLE WITH RIGHT HALF BLACK;So;0;ON;;;;;N;;;;;
-25D2;CIRCLE WITH LOWER HALF BLACK;So;0;ON;;;;;N;;;;;
-25D3;CIRCLE WITH UPPER HALF BLACK;So;0;ON;;;;;N;;;;;
-25D4;CIRCLE WITH UPPER RIGHT QUADRANT BLACK;So;0;ON;;;;;N;;;;;
-25D5;CIRCLE WITH ALL BUT UPPER LEFT QUADRANT BLACK;So;0;ON;;;;;N;;;;;
-25D6;LEFT HALF BLACK CIRCLE;So;0;ON;;;;;N;;;;;
-25D7;RIGHT HALF BLACK CIRCLE;So;0;ON;;;;;N;;;;;
-25D8;INVERSE BULLET;So;0;ON;;;;;N;;;;;
-25D9;INVERSE WHITE CIRCLE;So;0;ON;;;;;N;;;;;
-25DA;UPPER HALF INVERSE WHITE CIRCLE;So;0;ON;;;;;N;;;;;
-25DB;LOWER HALF INVERSE WHITE CIRCLE;So;0;ON;;;;;N;;;;;
-25DC;UPPER LEFT QUADRANT CIRCULAR ARC;So;0;ON;;;;;N;;;;;
-25DD;UPPER RIGHT QUADRANT CIRCULAR ARC;So;0;ON;;;;;N;;;;;
-25DE;LOWER RIGHT QUADRANT CIRCULAR ARC;So;0;ON;;;;;N;;;;;
-25DF;LOWER LEFT QUADRANT CIRCULAR ARC;So;0;ON;;;;;N;;;;;
-25E0;UPPER HALF CIRCLE;So;0;ON;;;;;N;;;;;
-25E1;LOWER HALF CIRCLE;So;0;ON;;;;;N;;;;;
-25E2;BLACK LOWER RIGHT TRIANGLE;So;0;ON;;;;;N;;;;;
-25E3;BLACK LOWER LEFT TRIANGLE;So;0;ON;;;;;N;;;;;
-25E4;BLACK UPPER LEFT TRIANGLE;So;0;ON;;;;;N;;;;;
-25E5;BLACK UPPER RIGHT TRIANGLE;So;0;ON;;;;;N;;;;;
-25E6;WHITE BULLET;So;0;ON;;;;;N;;;;;
-25E7;SQUARE WITH LEFT HALF BLACK;So;0;ON;;;;;N;;;;;
-25E8;SQUARE WITH RIGHT HALF BLACK;So;0;ON;;;;;N;;;;;
-25E9;SQUARE WITH UPPER LEFT DIAGONAL HALF BLACK;So;0;ON;;;;;N;;;;;
-25EA;SQUARE WITH LOWER RIGHT DIAGONAL HALF BLACK;So;0;ON;;;;;N;;;;;
-25EB;WHITE SQUARE WITH VERTICAL BISECTING LINE;So;0;ON;;;;;N;;;;;
-25EC;WHITE UP-POINTING TRIANGLE WITH DOT;So;0;ON;;;;;N;WHITE UP POINTING TRIANGLE WITH DOT;;;;
-25ED;UP-POINTING TRIANGLE WITH LEFT HALF BLACK;So;0;ON;;;;;N;UP POINTING TRIANGLE WITH LEFT HALF BLACK;;;;
-25EE;UP-POINTING TRIANGLE WITH RIGHT HALF BLACK;So;0;ON;;;;;N;UP POINTING TRIANGLE WITH RIGHT HALF BLACK;;;;
-25EF;LARGE CIRCLE;So;0;ON;;;;;N;;;;;
-25F0;WHITE SQUARE WITH UPPER LEFT QUADRANT;So;0;ON;;;;;N;;;;;
-25F1;WHITE SQUARE WITH LOWER LEFT QUADRANT;So;0;ON;;;;;N;;;;;
-25F2;WHITE SQUARE WITH LOWER RIGHT QUADRANT;So;0;ON;;;;;N;;;;;
-25F3;WHITE SQUARE WITH UPPER RIGHT QUADRANT;So;0;ON;;;;;N;;;;;
-25F4;WHITE CIRCLE WITH UPPER LEFT QUADRANT;So;0;ON;;;;;N;;;;;
-25F5;WHITE CIRCLE WITH LOWER LEFT QUADRANT;So;0;ON;;;;;N;;;;;
-25F6;WHITE CIRCLE WITH LOWER RIGHT QUADRANT;So;0;ON;;;;;N;;;;;
-25F7;WHITE CIRCLE WITH UPPER RIGHT QUADRANT;So;0;ON;;;;;N;;;;;
-25F8;UPPER LEFT TRIANGLE;Sm;0;ON;;;;;N;;;;;
-25F9;UPPER RIGHT TRIANGLE;Sm;0;ON;;;;;N;;;;;
-25FA;LOWER LEFT TRIANGLE;Sm;0;ON;;;;;N;;;;;
-25FB;WHITE MEDIUM SQUARE;Sm;0;ON;;;;;N;;;;;
-25FC;BLACK MEDIUM SQUARE;Sm;0;ON;;;;;N;;;;;
-25FD;WHITE MEDIUM SMALL SQUARE;Sm;0;ON;;;;;N;;;;;
-25FE;BLACK MEDIUM SMALL SQUARE;Sm;0;ON;;;;;N;;;;;
-25FF;LOWER RIGHT TRIANGLE;Sm;0;ON;;;;;N;;;;;
-2600;BLACK SUN WITH RAYS;So;0;ON;;;;;N;;;;;
-2601;CLOUD;So;0;ON;;;;;N;;;;;
-2602;UMBRELLA;So;0;ON;;;;;N;;;;;
-2603;SNOWMAN;So;0;ON;;;;;N;;;;;
-2604;COMET;So;0;ON;;;;;N;;;;;
-2605;BLACK STAR;So;0;ON;;;;;N;;;;;
-2606;WHITE STAR;So;0;ON;;;;;N;;;;;
-2607;LIGHTNING;So;0;ON;;;;;N;;;;;
-2608;THUNDERSTORM;So;0;ON;;;;;N;;;;;
-2609;SUN;So;0;ON;;;;;N;;;;;
-260A;ASCENDING NODE;So;0;ON;;;;;N;;;;;
-260B;DESCENDING NODE;So;0;ON;;;;;N;;;;;
-260C;CONJUNCTION;So;0;ON;;;;;N;;;;;
-260D;OPPOSITION;So;0;ON;;;;;N;;;;;
-260E;BLACK TELEPHONE;So;0;ON;;;;;N;;;;;
-260F;WHITE TELEPHONE;So;0;ON;;;;;N;;;;;
-2610;BALLOT BOX;So;0;ON;;;;;N;;;;;
-2611;BALLOT BOX WITH CHECK;So;0;ON;;;;;N;;;;;
-2612;BALLOT BOX WITH X;So;0;ON;;;;;N;;;;;
-2613;SALTIRE;So;0;ON;;;;;N;;;;;
-2614;UMBRELLA WITH RAIN DROPS;So;0;ON;;;;;N;;;;;
-2615;HOT BEVERAGE;So;0;ON;;;;;N;;;;;
-2616;WHITE SHOGI PIECE;So;0;ON;;;;;N;;;;;
-2617;BLACK SHOGI PIECE;So;0;ON;;;;;N;;;;;
-2618;SHAMROCK;So;0;ON;;;;;N;;;;;
-2619;REVERSED ROTATED FLORAL HEART BULLET;So;0;ON;;;;;N;;;;;
-261A;BLACK LEFT POINTING INDEX;So;0;ON;;;;;N;;;;;
-261B;BLACK RIGHT POINTING INDEX;So;0;ON;;;;;N;;;;;
-261C;WHITE LEFT POINTING INDEX;So;0;ON;;;;;N;;;;;
-261D;WHITE UP POINTING INDEX;So;0;ON;;;;;N;;;;;
-261E;WHITE RIGHT POINTING INDEX;So;0;ON;;;;;N;;;;;
-261F;WHITE DOWN POINTING INDEX;So;0;ON;;;;;N;;;;;
-2620;SKULL AND CROSSBONES;So;0;ON;;;;;N;;;;;
-2621;CAUTION SIGN;So;0;ON;;;;;N;;;;;
-2622;RADIOACTIVE SIGN;So;0;ON;;;;;N;;;;;
-2623;BIOHAZARD SIGN;So;0;ON;;;;;N;;;;;
-2624;CADUCEUS;So;0;ON;;;;;N;;;;;
-2625;ANKH;So;0;ON;;;;;N;;;;;
-2626;ORTHODOX CROSS;So;0;ON;;;;;N;;;;;
-2627;CHI RHO;So;0;ON;;;;;N;;;;;
-2628;CROSS OF LORRAINE;So;0;ON;;;;;N;;;;;
-2629;CROSS OF JERUSALEM;So;0;ON;;;;;N;;;;;
-262A;STAR AND CRESCENT;So;0;ON;;;;;N;;;;;
-262B;FARSI SYMBOL;So;0;ON;;;;;N;SYMBOL OF IRAN;;;;
-262C;ADI SHAKTI;So;0;ON;;;;;N;;;;;
-262D;HAMMER AND SICKLE;So;0;ON;;;;;N;;;;;
-262E;PEACE SYMBOL;So;0;ON;;;;;N;;;;;
-262F;YIN YANG;So;0;ON;;;;;N;;;;;
-2630;TRIGRAM FOR HEAVEN;So;0;ON;;;;;N;;;;;
-2631;TRIGRAM FOR LAKE;So;0;ON;;;;;N;;;;;
-2632;TRIGRAM FOR FIRE;So;0;ON;;;;;N;;;;;
-2633;TRIGRAM FOR THUNDER;So;0;ON;;;;;N;;;;;
-2634;TRIGRAM FOR WIND;So;0;ON;;;;;N;;;;;
-2635;TRIGRAM FOR WATER;So;0;ON;;;;;N;;;;;
-2636;TRIGRAM FOR MOUNTAIN;So;0;ON;;;;;N;;;;;
-2637;TRIGRAM FOR EARTH;So;0;ON;;;;;N;;;;;
-2638;WHEEL OF DHARMA;So;0;ON;;;;;N;;;;;
-2639;WHITE FROWNING FACE;So;0;ON;;;;;N;;;;;
-263A;WHITE SMILING FACE;So;0;ON;;;;;N;;;;;
-263B;BLACK SMILING FACE;So;0;ON;;;;;N;;;;;
-263C;WHITE SUN WITH RAYS;So;0;ON;;;;;N;;;;;
-263D;FIRST QUARTER MOON;So;0;ON;;;;;N;;;;;
-263E;LAST QUARTER MOON;So;0;ON;;;;;N;;;;;
-263F;MERCURY;So;0;ON;;;;;N;;;;;
-2640;FEMALE SIGN;So;0;ON;;;;;N;;;;;
-2641;EARTH;So;0;ON;;;;;N;;;;;
-2642;MALE SIGN;So;0;ON;;;;;N;;;;;
-2643;JUPITER;So;0;ON;;;;;N;;;;;
-2644;SATURN;So;0;ON;;;;;N;;;;;
-2645;URANUS;So;0;ON;;;;;N;;;;;
-2646;NEPTUNE;So;0;ON;;;;;N;;;;;
-2647;PLUTO;So;0;ON;;;;;N;;;;;
-2648;ARIES;So;0;ON;;;;;N;;;;;
-2649;TAURUS;So;0;ON;;;;;N;;;;;
-264A;GEMINI;So;0;ON;;;;;N;;;;;
-264B;CANCER;So;0;ON;;;;;N;;;;;
-264C;LEO;So;0;ON;;;;;N;;;;;
-264D;VIRGO;So;0;ON;;;;;N;;;;;
-264E;LIBRA;So;0;ON;;;;;N;;;;;
-264F;SCORPIUS;So;0;ON;;;;;N;;;;;
-2650;SAGITTARIUS;So;0;ON;;;;;N;;;;;
-2651;CAPRICORN;So;0;ON;;;;;N;;;;;
-2652;AQUARIUS;So;0;ON;;;;;N;;;;;
-2653;PISCES;So;0;ON;;;;;N;;;;;
-2654;WHITE CHESS KING;So;0;ON;;;;;N;;;;;
-2655;WHITE CHESS QUEEN;So;0;ON;;;;;N;;;;;
-2656;WHITE CHESS ROOK;So;0;ON;;;;;N;;;;;
-2657;WHITE CHESS BISHOP;So;0;ON;;;;;N;;;;;
-2658;WHITE CHESS KNIGHT;So;0;ON;;;;;N;;;;;
-2659;WHITE CHESS PAWN;So;0;ON;;;;;N;;;;;
-265A;BLACK CHESS KING;So;0;ON;;;;;N;;;;;
-265B;BLACK CHESS QUEEN;So;0;ON;;;;;N;;;;;
-265C;BLACK CHESS ROOK;So;0;ON;;;;;N;;;;;
-265D;BLACK CHESS BISHOP;So;0;ON;;;;;N;;;;;
-265E;BLACK CHESS KNIGHT;So;0;ON;;;;;N;;;;;
-265F;BLACK CHESS PAWN;So;0;ON;;;;;N;;;;;
-2660;BLACK SPADE SUIT;So;0;ON;;;;;N;;;;;
-2661;WHITE HEART SUIT;So;0;ON;;;;;N;;;;;
-2662;WHITE DIAMOND SUIT;So;0;ON;;;;;N;;;;;
-2663;BLACK CLUB SUIT;So;0;ON;;;;;N;;;;;
-2664;WHITE SPADE SUIT;So;0;ON;;;;;N;;;;;
-2665;BLACK HEART SUIT;So;0;ON;;;;;N;;;;;
-2666;BLACK DIAMOND SUIT;So;0;ON;;;;;N;;;;;
-2667;WHITE CLUB SUIT;So;0;ON;;;;;N;;;;;
-2668;HOT SPRINGS;So;0;ON;;;;;N;;;;;
-2669;QUARTER NOTE;So;0;ON;;;;;N;;;;;
-266A;EIGHTH NOTE;So;0;ON;;;;;N;;;;;
-266B;BEAMED EIGHTH NOTES;So;0;ON;;;;;N;BARRED EIGHTH NOTES;;;;
-266C;BEAMED SIXTEENTH NOTES;So;0;ON;;;;;N;BARRED SIXTEENTH NOTES;;;;
-266D;MUSIC FLAT SIGN;So;0;ON;;;;;N;FLAT;;;;
-266E;MUSIC NATURAL SIGN;So;0;ON;;;;;N;NATURAL;;;;
-266F;MUSIC SHARP SIGN;Sm;0;ON;;;;;N;SHARP;;;;
-2670;WEST SYRIAC CROSS;So;0;ON;;;;;N;;;;;
-2671;EAST SYRIAC CROSS;So;0;ON;;;;;N;;;;;
-2672;UNIVERSAL RECYCLING SYMBOL;So;0;ON;;;;;N;;;;;
-2673;RECYCLING SYMBOL FOR TYPE-1 PLASTICS;So;0;ON;;;;;N;;pete;;;
-2674;RECYCLING SYMBOL FOR TYPE-2 PLASTICS;So;0;ON;;;;;N;;hdpe;;;
-2675;RECYCLING SYMBOL FOR TYPE-3 PLASTICS;So;0;ON;;;;;N;;pvc;;;
-2676;RECYCLING SYMBOL FOR TYPE-4 PLASTICS;So;0;ON;;;;;N;;ldpe;;;
-2677;RECYCLING SYMBOL FOR TYPE-5 PLASTICS;So;0;ON;;;;;N;;pp;;;
-2678;RECYCLING SYMBOL FOR TYPE-6 PLASTICS;So;0;ON;;;;;N;;ps;;;
-2679;RECYCLING SYMBOL FOR TYPE-7 PLASTICS;So;0;ON;;;;;N;;other;;;
-267A;RECYCLING SYMBOL FOR GENERIC MATERIALS;So;0;ON;;;;;N;;;;;
-267B;BLACK UNIVERSAL RECYCLING SYMBOL;So;0;ON;;;;;N;;;;;
-267C;RECYCLED PAPER SYMBOL;So;0;ON;;;;;N;;;;;
-267D;PARTIALLY-RECYCLED PAPER SYMBOL;So;0;ON;;;;;N;;;;;
-267E;PERMANENT PAPER SIGN;So;0;ON;;;;;N;;;;;
-267F;WHEELCHAIR SYMBOL;So;0;ON;;;;;N;;;;;
-2680;DIE FACE-1;So;0;ON;;;;;N;;;;;
-2681;DIE FACE-2;So;0;ON;;;;;N;;;;;
-2682;DIE FACE-3;So;0;ON;;;;;N;;;;;
-2683;DIE FACE-4;So;0;ON;;;;;N;;;;;
-2684;DIE FACE-5;So;0;ON;;;;;N;;;;;
-2685;DIE FACE-6;So;0;ON;;;;;N;;;;;
-2686;WHITE CIRCLE WITH DOT RIGHT;So;0;ON;;;;;N;;;;;
-2687;WHITE CIRCLE WITH TWO DOTS;So;0;ON;;;;;N;;;;;
-2688;BLACK CIRCLE WITH WHITE DOT RIGHT;So;0;ON;;;;;N;;;;;
-2689;BLACK CIRCLE WITH TWO WHITE DOTS;So;0;ON;;;;;N;;;;;
-268A;MONOGRAM FOR YANG;So;0;ON;;;;;N;;;;;
-268B;MONOGRAM FOR YIN;So;0;ON;;;;;N;;;;;
-268C;DIGRAM FOR GREATER YANG;So;0;ON;;;;;N;;;;;
-268D;DIGRAM FOR LESSER YIN;So;0;ON;;;;;N;;;;;
-268E;DIGRAM FOR LESSER YANG;So;0;ON;;;;;N;;;;;
-268F;DIGRAM FOR GREATER YIN;So;0;ON;;;;;N;;;;;
-2690;WHITE FLAG;So;0;ON;;;;;N;;;;;
-2691;BLACK FLAG;So;0;ON;;;;;N;;;;;
-2692;HAMMER AND PICK;So;0;ON;;;;;N;;;;;
-2693;ANCHOR;So;0;ON;;;;;N;;;;;
-2694;CROSSED SWORDS;So;0;ON;;;;;N;;;;;
-2695;STAFF OF AESCULAPIUS;So;0;ON;;;;;N;;;;;
-2696;SCALES;So;0;ON;;;;;N;;;;;
-2697;ALEMBIC;So;0;ON;;;;;N;;;;;
-2698;FLOWER;So;0;ON;;;;;N;;;;;
-2699;GEAR;So;0;ON;;;;;N;;;;;
-269A;STAFF OF HERMES;So;0;ON;;;;;N;;;;;
-269B;ATOM SYMBOL;So;0;ON;;;;;N;;;;;
-269C;FLEUR-DE-LIS;So;0;ON;;;;;N;;;;;
-269D;OUTLINED WHITE STAR;So;0;ON;;;;;N;;;;;
-26A0;WARNING SIGN;So;0;ON;;;;;N;;;;;
-26A1;HIGH VOLTAGE SIGN;So;0;ON;;;;;N;;;;;
-26A2;DOUBLED FEMALE SIGN;So;0;ON;;;;;N;;;;;
-26A3;DOUBLED MALE SIGN;So;0;ON;;;;;N;;;;;
-26A4;INTERLOCKED FEMALE AND MALE SIGN;So;0;ON;;;;;N;;;;;
-26A5;MALE AND FEMALE SIGN;So;0;ON;;;;;N;;;;;
-26A6;MALE WITH STROKE SIGN;So;0;ON;;;;;N;;;;;
-26A7;MALE WITH STROKE AND MALE AND FEMALE SIGN;So;0;ON;;;;;N;;;;;
-26A8;VERTICAL MALE WITH STROKE SIGN;So;0;ON;;;;;N;;;;;
-26A9;HORIZONTAL MALE WITH STROKE SIGN;So;0;ON;;;;;N;;;;;
-26AA;MEDIUM WHITE CIRCLE;So;0;ON;;;;;N;;;;;
-26AB;MEDIUM BLACK CIRCLE;So;0;ON;;;;;N;;;;;
-26AC;MEDIUM SMALL WHITE CIRCLE;So;0;L;;;;;N;;;;;
-26AD;MARRIAGE SYMBOL;So;0;ON;;;;;N;;;;;
-26AE;DIVORCE SYMBOL;So;0;ON;;;;;N;;;;;
-26AF;UNMARRIED PARTNERSHIP SYMBOL;So;0;ON;;;;;N;;;;;
-26B0;COFFIN;So;0;ON;;;;;N;;;;;
-26B1;FUNERAL URN;So;0;ON;;;;;N;;;;;
-26B2;NEUTER;So;0;ON;;;;;N;;;;;
-26B3;CERES;So;0;ON;;;;;N;;;;;
-26B4;PALLAS;So;0;ON;;;;;N;;;;;
-26B5;JUNO;So;0;ON;;;;;N;;;;;
-26B6;VESTA;So;0;ON;;;;;N;;;;;
-26B7;CHIRON;So;0;ON;;;;;N;;;;;
-26B8;BLACK MOON LILITH;So;0;ON;;;;;N;;;;;
-26B9;SEXTILE;So;0;ON;;;;;N;;;;;
-26BA;SEMISEXTILE;So;0;ON;;;;;N;;;;;
-26BB;QUINCUNX;So;0;ON;;;;;N;;;;;
-26BC;SESQUIQUADRATE;So;0;ON;;;;;N;;;;;
-26C0;WHITE DRAUGHTS MAN;So;0;ON;;;;;N;;;;;
-26C1;WHITE DRAUGHTS KING;So;0;ON;;;;;N;;;;;
-26C2;BLACK DRAUGHTS MAN;So;0;ON;;;;;N;;;;;
-26C3;BLACK DRAUGHTS KING;So;0;ON;;;;;N;;;;;
-2701;UPPER BLADE SCISSORS;So;0;ON;;;;;N;;;;;
-2702;BLACK SCISSORS;So;0;ON;;;;;N;;;;;
-2703;LOWER BLADE SCISSORS;So;0;ON;;;;;N;;;;;
-2704;WHITE SCISSORS;So;0;ON;;;;;N;;;;;
-2706;TELEPHONE LOCATION SIGN;So;0;ON;;;;;N;;;;;
-2707;TAPE DRIVE;So;0;ON;;;;;N;;;;;
-2708;AIRPLANE;So;0;ON;;;;;N;;;;;
-2709;ENVELOPE;So;0;ON;;;;;N;;;;;
-270C;VICTORY HAND;So;0;ON;;;;;N;;;;;
-270D;WRITING HAND;So;0;ON;;;;;N;;;;;
-270E;LOWER RIGHT PENCIL;So;0;ON;;;;;N;;;;;
-270F;PENCIL;So;0;ON;;;;;N;;;;;
-2710;UPPER RIGHT PENCIL;So;0;ON;;;;;N;;;;;
-2711;WHITE NIB;So;0;ON;;;;;N;;;;;
-2712;BLACK NIB;So;0;ON;;;;;N;;;;;
-2713;CHECK MARK;So;0;ON;;;;;N;;;;;
-2714;HEAVY CHECK MARK;So;0;ON;;;;;N;;;;;
-2715;MULTIPLICATION X;So;0;ON;;;;;N;;;;;
-2716;HEAVY MULTIPLICATION X;So;0;ON;;;;;N;;;;;
-2717;BALLOT X;So;0;ON;;;;;N;;;;;
-2718;HEAVY BALLOT X;So;0;ON;;;;;N;;;;;
-2719;OUTLINED GREEK CROSS;So;0;ON;;;;;N;;;;;
-271A;HEAVY GREEK CROSS;So;0;ON;;;;;N;;;;;
-271B;OPEN CENTRE CROSS;So;0;ON;;;;;N;OPEN CENTER CROSS;;;;
-271C;HEAVY OPEN CENTRE CROSS;So;0;ON;;;;;N;HEAVY OPEN CENTER CROSS;;;;
-271D;LATIN CROSS;So;0;ON;;;;;N;;;;;
-271E;SHADOWED WHITE LATIN CROSS;So;0;ON;;;;;N;;;;;
-271F;OUTLINED LATIN CROSS;So;0;ON;;;;;N;;;;;
-2720;MALTESE CROSS;So;0;ON;;;;;N;;;;;
-2721;STAR OF DAVID;So;0;ON;;;;;N;;;;;
-2722;FOUR TEARDROP-SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
-2723;FOUR BALLOON-SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
-2724;HEAVY FOUR BALLOON-SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
-2725;FOUR CLUB-SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
-2726;BLACK FOUR POINTED STAR;So;0;ON;;;;;N;;;;;
-2727;WHITE FOUR POINTED STAR;So;0;ON;;;;;N;;;;;
-2729;STRESS OUTLINED WHITE STAR;So;0;ON;;;;;N;;;;;
-272A;CIRCLED WHITE STAR;So;0;ON;;;;;N;;;;;
-272B;OPEN CENTRE BLACK STAR;So;0;ON;;;;;N;OPEN CENTER BLACK STAR;;;;
-272C;BLACK CENTRE WHITE STAR;So;0;ON;;;;;N;BLACK CENTER WHITE STAR;;;;
-272D;OUTLINED BLACK STAR;So;0;ON;;;;;N;;;;;
-272E;HEAVY OUTLINED BLACK STAR;So;0;ON;;;;;N;;;;;
-272F;PINWHEEL STAR;So;0;ON;;;;;N;;;;;
-2730;SHADOWED WHITE STAR;So;0;ON;;;;;N;;;;;
-2731;HEAVY ASTERISK;So;0;ON;;;;;N;;;;;
-2732;OPEN CENTRE ASTERISK;So;0;ON;;;;;N;OPEN CENTER ASTERISK;;;;
-2733;EIGHT SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
-2734;EIGHT POINTED BLACK STAR;So;0;ON;;;;;N;;;;;
-2735;EIGHT POINTED PINWHEEL STAR;So;0;ON;;;;;N;;;;;
-2736;SIX POINTED BLACK STAR;So;0;ON;;;;;N;;;;;
-2737;EIGHT POINTED RECTILINEAR BLACK STAR;So;0;ON;;;;;N;;;;;
-2738;HEAVY EIGHT POINTED RECTILINEAR BLACK STAR;So;0;ON;;;;;N;;;;;
-2739;TWELVE POINTED BLACK STAR;So;0;ON;;;;;N;;;;;
-273A;SIXTEEN POINTED ASTERISK;So;0;ON;;;;;N;;;;;
-273B;TEARDROP-SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
-273C;OPEN CENTRE TEARDROP-SPOKED ASTERISK;So;0;ON;;;;;N;OPEN CENTER TEARDROP-SPOKED ASTERISK;;;;
-273D;HEAVY TEARDROP-SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
-273E;SIX PETALLED BLACK AND WHITE FLORETTE;So;0;ON;;;;;N;;;;;
-273F;BLACK FLORETTE;So;0;ON;;;;;N;;;;;
-2740;WHITE FLORETTE;So;0;ON;;;;;N;;;;;
-2741;EIGHT PETALLED OUTLINED BLACK FLORETTE;So;0;ON;;;;;N;;;;;
-2742;CIRCLED OPEN CENTRE EIGHT POINTED STAR;So;0;ON;;;;;N;CIRCLED OPEN CENTER EIGHT POINTED STAR;;;;
-2743;HEAVY TEARDROP-SPOKED PINWHEEL ASTERISK;So;0;ON;;;;;N;;;;;
-2744;SNOWFLAKE;So;0;ON;;;;;N;;;;;
-2745;TIGHT TRIFOLIATE SNOWFLAKE;So;0;ON;;;;;N;;;;;
-2746;HEAVY CHEVRON SNOWFLAKE;So;0;ON;;;;;N;;;;;
-2747;SPARKLE;So;0;ON;;;;;N;;;;;
-2748;HEAVY SPARKLE;So;0;ON;;;;;N;;;;;
-2749;BALLOON-SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
-274A;EIGHT TEARDROP-SPOKED PROPELLER ASTERISK;So;0;ON;;;;;N;;;;;
-274B;HEAVY EIGHT TEARDROP-SPOKED PROPELLER ASTERISK;So;0;ON;;;;;N;;;;;
-274D;SHADOWED WHITE CIRCLE;So;0;ON;;;;;N;;;;;
-274F;LOWER RIGHT DROP-SHADOWED WHITE SQUARE;So;0;ON;;;;;N;;;;;
-2750;UPPER RIGHT DROP-SHADOWED WHITE SQUARE;So;0;ON;;;;;N;;;;;
-2751;LOWER RIGHT SHADOWED WHITE SQUARE;So;0;ON;;;;;N;;;;;
-2752;UPPER RIGHT SHADOWED WHITE SQUARE;So;0;ON;;;;;N;;;;;
-2756;BLACK DIAMOND MINUS WHITE X;So;0;ON;;;;;N;;;;;
-2758;LIGHT VERTICAL BAR;So;0;ON;;;;;N;;;;;
-2759;MEDIUM VERTICAL BAR;So;0;ON;;;;;N;;;;;
-275A;HEAVY VERTICAL BAR;So;0;ON;;;;;N;;;;;
-275B;HEAVY SINGLE TURNED COMMA QUOTATION MARK ORNAMENT;So;0;ON;;;;;N;;;;;
-275C;HEAVY SINGLE COMMA QUOTATION MARK ORNAMENT;So;0;ON;;;;;N;;;;;
-275D;HEAVY DOUBLE TURNED COMMA QUOTATION MARK ORNAMENT;So;0;ON;;;;;N;;;;;
-275E;HEAVY DOUBLE COMMA QUOTATION MARK ORNAMENT;So;0;ON;;;;;N;;;;;
-2761;CURVED STEM PARAGRAPH SIGN ORNAMENT;So;0;ON;;;;;N;;;;;
-2762;HEAVY EXCLAMATION MARK ORNAMENT;So;0;ON;;;;;N;;;;;
-2763;HEAVY HEART EXCLAMATION MARK ORNAMENT;So;0;ON;;;;;N;;;;;
-2764;HEAVY BLACK HEART;So;0;ON;;;;;N;;;;;
-2765;ROTATED HEAVY BLACK HEART BULLET;So;0;ON;;;;;N;;;;;
-2766;FLORAL HEART;So;0;ON;;;;;N;;;;;
-2767;ROTATED FLORAL HEART BULLET;So;0;ON;;;;;N;;;;;
-2768;MEDIUM LEFT PARENTHESIS ORNAMENT;Ps;0;ON;;;;;Y;;;;;
-2769;MEDIUM RIGHT PARENTHESIS ORNAMENT;Pe;0;ON;;;;;Y;;;;;
-276A;MEDIUM FLATTENED LEFT PARENTHESIS ORNAMENT;Ps;0;ON;;;;;Y;;;;;
-276B;MEDIUM FLATTENED RIGHT PARENTHESIS ORNAMENT;Pe;0;ON;;;;;Y;;;;;
-276C;MEDIUM LEFT-POINTING ANGLE BRACKET ORNAMENT;Ps;0;ON;;;;;Y;;;;;
-276D;MEDIUM RIGHT-POINTING ANGLE BRACKET ORNAMENT;Pe;0;ON;;;;;Y;;;;;
-276E;HEAVY LEFT-POINTING ANGLE QUOTATION MARK ORNAMENT;Ps;0;ON;;;;;Y;;;;;
-276F;HEAVY RIGHT-POINTING ANGLE QUOTATION MARK ORNAMENT;Pe;0;ON;;;;;Y;;;;;
-2770;HEAVY LEFT-POINTING ANGLE BRACKET ORNAMENT;Ps;0;ON;;;;;Y;;;;;
-2771;HEAVY RIGHT-POINTING ANGLE BRACKET ORNAMENT;Pe;0;ON;;;;;Y;;;;;
-2772;LIGHT LEFT TORTOISE SHELL BRACKET ORNAMENT;Ps;0;ON;;;;;Y;;;;;
-2773;LIGHT RIGHT TORTOISE SHELL BRACKET ORNAMENT;Pe;0;ON;;;;;Y;;;;;
-2774;MEDIUM LEFT CURLY BRACKET ORNAMENT;Ps;0;ON;;;;;Y;;;;;
-2775;MEDIUM RIGHT CURLY BRACKET ORNAMENT;Pe;0;ON;;;;;Y;;;;;
-2776;DINGBAT NEGATIVE CIRCLED DIGIT ONE;No;0;ON;;;1;1;N;INVERSE CIRCLED DIGIT ONE;;;;
-2777;DINGBAT NEGATIVE CIRCLED DIGIT TWO;No;0;ON;;;2;2;N;INVERSE CIRCLED DIGIT TWO;;;;
-2778;DINGBAT NEGATIVE CIRCLED DIGIT THREE;No;0;ON;;;3;3;N;INVERSE CIRCLED DIGIT THREE;;;;
-2779;DINGBAT NEGATIVE CIRCLED DIGIT FOUR;No;0;ON;;;4;4;N;INVERSE CIRCLED DIGIT FOUR;;;;
-277A;DINGBAT NEGATIVE CIRCLED DIGIT FIVE;No;0;ON;;;5;5;N;INVERSE CIRCLED DIGIT FIVE;;;;
-277B;DINGBAT NEGATIVE CIRCLED DIGIT SIX;No;0;ON;;;6;6;N;INVERSE CIRCLED DIGIT SIX;;;;
-277C;DINGBAT NEGATIVE CIRCLED DIGIT SEVEN;No;0;ON;;;7;7;N;INVERSE CIRCLED DIGIT SEVEN;;;;
-277D;DINGBAT NEGATIVE CIRCLED DIGIT EIGHT;No;0;ON;;;8;8;N;INVERSE CIRCLED DIGIT EIGHT;;;;
-277E;DINGBAT NEGATIVE CIRCLED DIGIT NINE;No;0;ON;;;9;9;N;INVERSE CIRCLED DIGIT NINE;;;;
-277F;DINGBAT NEGATIVE CIRCLED NUMBER TEN;No;0;ON;;;;10;N;INVERSE CIRCLED NUMBER TEN;;;;
-2780;DINGBAT CIRCLED SANS-SERIF DIGIT ONE;No;0;ON;;;1;1;N;CIRCLED SANS-SERIF DIGIT ONE;;;;
-2781;DINGBAT CIRCLED SANS-SERIF DIGIT TWO;No;0;ON;;;2;2;N;CIRCLED SANS-SERIF DIGIT TWO;;;;
-2782;DINGBAT CIRCLED SANS-SERIF DIGIT THREE;No;0;ON;;;3;3;N;CIRCLED SANS-SERIF DIGIT THREE;;;;
-2783;DINGBAT CIRCLED SANS-SERIF DIGIT FOUR;No;0;ON;;;4;4;N;CIRCLED SANS-SERIF DIGIT FOUR;;;;
-2784;DINGBAT CIRCLED SANS-SERIF DIGIT FIVE;No;0;ON;;;5;5;N;CIRCLED SANS-SERIF DIGIT FIVE;;;;
-2785;DINGBAT CIRCLED SANS-SERIF DIGIT SIX;No;0;ON;;;6;6;N;CIRCLED SANS-SERIF DIGIT SIX;;;;
-2786;DINGBAT CIRCLED SANS-SERIF DIGIT SEVEN;No;0;ON;;;7;7;N;CIRCLED SANS-SERIF DIGIT SEVEN;;;;
-2787;DINGBAT CIRCLED SANS-SERIF DIGIT EIGHT;No;0;ON;;;8;8;N;CIRCLED SANS-SERIF DIGIT EIGHT;;;;
-2788;DINGBAT CIRCLED SANS-SERIF DIGIT NINE;No;0;ON;;;9;9;N;CIRCLED SANS-SERIF DIGIT NINE;;;;
-2789;DINGBAT CIRCLED SANS-SERIF NUMBER TEN;No;0;ON;;;;10;N;CIRCLED SANS-SERIF NUMBER TEN;;;;
-278A;DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT ONE;No;0;ON;;;1;1;N;INVERSE CIRCLED SANS-SERIF DIGIT ONE;;;;
-278B;DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT TWO;No;0;ON;;;2;2;N;INVERSE CIRCLED SANS-SERIF DIGIT TWO;;;;
-278C;DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT THREE;No;0;ON;;;3;3;N;INVERSE CIRCLED SANS-SERIF DIGIT THREE;;;;
-278D;DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT FOUR;No;0;ON;;;4;4;N;INVERSE CIRCLED SANS-SERIF DIGIT FOUR;;;;
-278E;DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT FIVE;No;0;ON;;;5;5;N;INVERSE CIRCLED SANS-SERIF DIGIT FIVE;;;;
-278F;DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT SIX;No;0;ON;;;6;6;N;INVERSE CIRCLED SANS-SERIF DIGIT SIX;;;;
-2790;DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT SEVEN;No;0;ON;;;7;7;N;INVERSE CIRCLED SANS-SERIF DIGIT SEVEN;;;;
-2791;DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT EIGHT;No;0;ON;;;8;8;N;INVERSE CIRCLED SANS-SERIF DIGIT EIGHT;;;;
-2792;DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT NINE;No;0;ON;;;9;9;N;INVERSE CIRCLED SANS-SERIF DIGIT NINE;;;;
-2793;DINGBAT NEGATIVE CIRCLED SANS-SERIF NUMBER TEN;No;0;ON;;;;10;N;INVERSE CIRCLED SANS-SERIF NUMBER TEN;;;;
-2794;HEAVY WIDE-HEADED RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY WIDE-HEADED RIGHT ARROW;;;;
-2798;HEAVY SOUTH EAST ARROW;So;0;ON;;;;;N;HEAVY LOWER RIGHT ARROW;;;;
-2799;HEAVY RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY RIGHT ARROW;;;;
-279A;HEAVY NORTH EAST ARROW;So;0;ON;;;;;N;HEAVY UPPER RIGHT ARROW;;;;
-279B;DRAFTING POINT RIGHTWARDS ARROW;So;0;ON;;;;;N;DRAFTING POINT RIGHT ARROW;;;;
-279C;HEAVY ROUND-TIPPED RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY ROUND-TIPPED RIGHT ARROW;;;;
-279D;TRIANGLE-HEADED RIGHTWARDS ARROW;So;0;ON;;;;;N;TRIANGLE-HEADED RIGHT ARROW;;;;
-279E;HEAVY TRIANGLE-HEADED RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY TRIANGLE-HEADED RIGHT ARROW;;;;
-279F;DASHED TRIANGLE-HEADED RIGHTWARDS ARROW;So;0;ON;;;;;N;DASHED TRIANGLE-HEADED RIGHT ARROW;;;;
-27A0;HEAVY DASHED TRIANGLE-HEADED RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY DASHED TRIANGLE-HEADED RIGHT ARROW;;;;
-27A1;BLACK RIGHTWARDS ARROW;So;0;ON;;;;;N;BLACK RIGHT ARROW;;;;
-27A2;THREE-D TOP-LIGHTED RIGHTWARDS ARROWHEAD;So;0;ON;;;;;N;THREE-D TOP-LIGHTED RIGHT ARROWHEAD;;;;
-27A3;THREE-D BOTTOM-LIGHTED RIGHTWARDS ARROWHEAD;So;0;ON;;;;;N;THREE-D BOTTOM-LIGHTED RIGHT ARROWHEAD;;;;
-27A4;BLACK RIGHTWARDS ARROWHEAD;So;0;ON;;;;;N;BLACK RIGHT ARROWHEAD;;;;
-27A5;HEAVY BLACK CURVED DOWNWARDS AND RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY BLACK CURVED DOWN AND RIGHT ARROW;;;;
-27A6;HEAVY BLACK CURVED UPWARDS AND RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY BLACK CURVED UP AND RIGHT ARROW;;;;
-27A7;SQUAT BLACK RIGHTWARDS ARROW;So;0;ON;;;;;N;SQUAT BLACK RIGHT ARROW;;;;
-27A8;HEAVY CONCAVE-POINTED BLACK RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY CONCAVE-POINTED BLACK RIGHT ARROW;;;;
-27A9;RIGHT-SHADED WHITE RIGHTWARDS ARROW;So;0;ON;;;;;N;RIGHT-SHADED WHITE RIGHT ARROW;;;;
-27AA;LEFT-SHADED WHITE RIGHTWARDS ARROW;So;0;ON;;;;;N;LEFT-SHADED WHITE RIGHT ARROW;;;;
-27AB;BACK-TILTED SHADOWED WHITE RIGHTWARDS ARROW;So;0;ON;;;;;N;BACK-TILTED SHADOWED WHITE RIGHT ARROW;;;;
-27AC;FRONT-TILTED SHADOWED WHITE RIGHTWARDS ARROW;So;0;ON;;;;;N;FRONT-TILTED SHADOWED WHITE RIGHT ARROW;;;;
-27AD;HEAVY LOWER RIGHT-SHADOWED WHITE RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY LOWER RIGHT-SHADOWED WHITE RIGHT ARROW;;;;
-27AE;HEAVY UPPER RIGHT-SHADOWED WHITE RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY UPPER RIGHT-SHADOWED WHITE RIGHT ARROW;;;;
-27AF;NOTCHED LOWER RIGHT-SHADOWED WHITE RIGHTWARDS ARROW;So;0;ON;;;;;N;NOTCHED LOWER RIGHT-SHADOWED WHITE RIGHT ARROW;;;;
-27B1;NOTCHED UPPER RIGHT-SHADOWED WHITE RIGHTWARDS ARROW;So;0;ON;;;;;N;NOTCHED UPPER RIGHT-SHADOWED WHITE RIGHT ARROW;;;;
-27B2;CIRCLED HEAVY WHITE RIGHTWARDS ARROW;So;0;ON;;;;;N;CIRCLED HEAVY WHITE RIGHT ARROW;;;;
-27B3;WHITE-FEATHERED RIGHTWARDS ARROW;So;0;ON;;;;;N;WHITE-FEATHERED RIGHT ARROW;;;;
-27B4;BLACK-FEATHERED SOUTH EAST ARROW;So;0;ON;;;;;N;BLACK-FEATHERED LOWER RIGHT ARROW;;;;
-27B5;BLACK-FEATHERED RIGHTWARDS ARROW;So;0;ON;;;;;N;BLACK-FEATHERED RIGHT ARROW;;;;
-27B6;BLACK-FEATHERED NORTH EAST ARROW;So;0;ON;;;;;N;BLACK-FEATHERED UPPER RIGHT ARROW;;;;
-27B7;HEAVY BLACK-FEATHERED SOUTH EAST ARROW;So;0;ON;;;;;N;HEAVY BLACK-FEATHERED LOWER RIGHT ARROW;;;;
-27B8;HEAVY BLACK-FEATHERED RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY BLACK-FEATHERED RIGHT ARROW;;;;
-27B9;HEAVY BLACK-FEATHERED NORTH EAST ARROW;So;0;ON;;;;;N;HEAVY BLACK-FEATHERED UPPER RIGHT ARROW;;;;
-27BA;TEARDROP-BARBED RIGHTWARDS ARROW;So;0;ON;;;;;N;TEARDROP-BARBED RIGHT ARROW;;;;
-27BB;HEAVY TEARDROP-SHANKED RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY TEARDROP-SHANKED RIGHT ARROW;;;;
-27BC;WEDGE-TAILED RIGHTWARDS ARROW;So;0;ON;;;;;N;WEDGE-TAILED RIGHT ARROW;;;;
-27BD;HEAVY WEDGE-TAILED RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY WEDGE-TAILED RIGHT ARROW;;;;
-27BE;OPEN-OUTLINED RIGHTWARDS ARROW;So;0;ON;;;;;N;OPEN-OUTLINED RIGHT ARROW;;;;
-27C0;THREE DIMENSIONAL ANGLE;Sm;0;ON;;;;;Y;;;;;
-27C1;WHITE TRIANGLE CONTAINING SMALL WHITE TRIANGLE;Sm;0;ON;;;;;N;;;;;
-27C2;PERPENDICULAR;Sm;0;ON;;;;;N;;;;;
-27C3;OPEN SUBSET;Sm;0;ON;;;;;Y;;;;;
-27C4;OPEN SUPERSET;Sm;0;ON;;;;;Y;;;;;
-27C5;LEFT S-SHAPED BAG DELIMITER;Ps;0;ON;;;;;Y;;;;;
-27C6;RIGHT S-SHAPED BAG DELIMITER;Pe;0;ON;;;;;Y;;;;;
-27C7;OR WITH DOT INSIDE;Sm;0;ON;;;;;N;;;;;
-27C8;REVERSE SOLIDUS PRECEDING SUBSET;Sm;0;ON;;;;;Y;;;;;
-27C9;SUPERSET PRECEDING SOLIDUS;Sm;0;ON;;;;;Y;;;;;
-27CA;VERTICAL BAR WITH HORIZONTAL STROKE;Sm;0;ON;;;;;N;;;;;
-27CC;LONG DIVISION;Sm;0;ON;;;;;Y;;;;;
-27D0;WHITE DIAMOND WITH CENTRED DOT;Sm;0;ON;;;;;N;;;;;
-27D1;AND WITH DOT;Sm;0;ON;;;;;N;;;;;
-27D2;ELEMENT OF OPENING UPWARDS;Sm;0;ON;;;;;N;;;;;
-27D3;LOWER RIGHT CORNER WITH DOT;Sm;0;ON;;;;;Y;;;;;
-27D4;UPPER LEFT CORNER WITH DOT;Sm;0;ON;;;;;Y;;;;;
-27D5;LEFT OUTER JOIN;Sm;0;ON;;;;;Y;;;;;
-27D6;RIGHT OUTER JOIN;Sm;0;ON;;;;;Y;;;;;
-27D7;FULL OUTER JOIN;Sm;0;ON;;;;;N;;;;;
-27D8;LARGE UP TACK;Sm;0;ON;;;;;N;;;;;
-27D9;LARGE DOWN TACK;Sm;0;ON;;;;;N;;;;;
-27DA;LEFT AND RIGHT DOUBLE TURNSTILE;Sm;0;ON;;;;;N;;;;;
-27DB;LEFT AND RIGHT TACK;Sm;0;ON;;;;;N;;;;;
-27DC;LEFT MULTIMAP;Sm;0;ON;;;;;Y;;;;;
-27DD;LONG RIGHT TACK;Sm;0;ON;;;;;Y;;;;;
-27DE;LONG LEFT TACK;Sm;0;ON;;;;;Y;;;;;
-27DF;UP TACK WITH CIRCLE ABOVE;Sm;0;ON;;;;;N;;;;;
-27E0;LOZENGE DIVIDED BY HORIZONTAL RULE;Sm;0;ON;;;;;N;;;;;
-27E1;WHITE CONCAVE-SIDED DIAMOND;Sm;0;ON;;;;;N;;;;;
-27E2;WHITE CONCAVE-SIDED DIAMOND WITH LEFTWARDS TICK;Sm;0;ON;;;;;Y;;;;;
-27E3;WHITE CONCAVE-SIDED DIAMOND WITH RIGHTWARDS TICK;Sm;0;ON;;;;;Y;;;;;
-27E4;WHITE SQUARE WITH LEFTWARDS TICK;Sm;0;ON;;;;;Y;;;;;
-27E5;WHITE SQUARE WITH RIGHTWARDS TICK;Sm;0;ON;;;;;Y;;;;;
-27E6;MATHEMATICAL LEFT WHITE SQUARE BRACKET;Ps;0;ON;;;;;Y;;;;;
-27E7;MATHEMATICAL RIGHT WHITE SQUARE BRACKET;Pe;0;ON;;;;;Y;;;;;
-27E8;MATHEMATICAL LEFT ANGLE BRACKET;Ps;0;ON;;;;;Y;;;;;
-27E9;MATHEMATICAL RIGHT ANGLE BRACKET;Pe;0;ON;;;;;Y;;;;;
-27EA;MATHEMATICAL LEFT DOUBLE ANGLE BRACKET;Ps;0;ON;;;;;Y;;;;;
-27EB;MATHEMATICAL RIGHT DOUBLE ANGLE BRACKET;Pe;0;ON;;;;;Y;;;;;
-27EC;MATHEMATICAL LEFT WHITE TORTOISE SHELL BRACKET;Ps;0;ON;;;;;Y;;;;;
-27ED;MATHEMATICAL RIGHT WHITE TORTOISE SHELL BRACKET;Pe;0;ON;;;;;Y;;;;;
-27EE;MATHEMATICAL LEFT FLATTENED PARENTHESIS;Ps;0;ON;;;;;Y;;;;;
-27EF;MATHEMATICAL RIGHT FLATTENED PARENTHESIS;Pe;0;ON;;;;;Y;;;;;
-27F0;UPWARDS QUADRUPLE ARROW;Sm;0;ON;;;;;N;;;;;
-27F1;DOWNWARDS QUADRUPLE ARROW;Sm;0;ON;;;;;N;;;;;
-27F2;ANTICLOCKWISE GAPPED CIRCLE ARROW;Sm;0;ON;;;;;N;;;;;
-27F3;CLOCKWISE GAPPED CIRCLE ARROW;Sm;0;ON;;;;;N;;;;;
-27F4;RIGHT ARROW WITH CIRCLED PLUS;Sm;0;ON;;;;;N;;;;;
-27F5;LONG LEFTWARDS ARROW;Sm;0;ON;;;;;N;;;;;
-27F6;LONG RIGHTWARDS ARROW;Sm;0;ON;;;;;N;;;;;
-27F7;LONG LEFT RIGHT ARROW;Sm;0;ON;;;;;N;;;;;
-27F8;LONG LEFTWARDS DOUBLE ARROW;Sm;0;ON;;;;;N;;;;;
-27F9;LONG RIGHTWARDS DOUBLE ARROW;Sm;0;ON;;;;;N;;;;;
-27FA;LONG LEFT RIGHT DOUBLE ARROW;Sm;0;ON;;;;;N;;;;;
-27FB;LONG LEFTWARDS ARROW FROM BAR;Sm;0;ON;;;;;N;;;;;
-27FC;LONG RIGHTWARDS ARROW FROM BAR;Sm;0;ON;;;;;N;;;;;
-27FD;LONG LEFTWARDS DOUBLE ARROW FROM BAR;Sm;0;ON;;;;;N;;;;;
-27FE;LONG RIGHTWARDS DOUBLE ARROW FROM BAR;Sm;0;ON;;;;;N;;;;;
-27FF;LONG RIGHTWARDS SQUIGGLE ARROW;Sm;0;ON;;;;;N;;;;;
-2800;BRAILLE PATTERN BLANK;So;0;L;;;;;N;;;;;
-2801;BRAILLE PATTERN DOTS-1;So;0;L;;;;;N;;;;;
-2802;BRAILLE PATTERN DOTS-2;So;0;L;;;;;N;;;;;
-2803;BRAILLE PATTERN DOTS-12;So;0;L;;;;;N;;;;;
-2804;BRAILLE PATTERN DOTS-3;So;0;L;;;;;N;;;;;
-2805;BRAILLE PATTERN DOTS-13;So;0;L;;;;;N;;;;;
-2806;BRAILLE PATTERN DOTS-23;So;0;L;;;;;N;;;;;
-2807;BRAILLE PATTERN DOTS-123;So;0;L;;;;;N;;;;;
-2808;BRAILLE PATTERN DOTS-4;So;0;L;;;;;N;;;;;
-2809;BRAILLE PATTERN DOTS-14;So;0;L;;;;;N;;;;;
-280A;BRAILLE PATTERN DOTS-24;So;0;L;;;;;N;;;;;
-280B;BRAILLE PATTERN DOTS-124;So;0;L;;;;;N;;;;;
-280C;BRAILLE PATTERN DOTS-34;So;0;L;;;;;N;;;;;
-280D;BRAILLE PATTERN DOTS-134;So;0;L;;;;;N;;;;;
-280E;BRAILLE PATTERN DOTS-234;So;0;L;;;;;N;;;;;
-280F;BRAILLE PATTERN DOTS-1234;So;0;L;;;;;N;;;;;
-2810;BRAILLE PATTERN DOTS-5;So;0;L;;;;;N;;;;;
-2811;BRAILLE PATTERN DOTS-15;So;0;L;;;;;N;;;;;
-2812;BRAILLE PATTERN DOTS-25;So;0;L;;;;;N;;;;;
-2813;BRAILLE PATTERN DOTS-125;So;0;L;;;;;N;;;;;
-2814;BRAILLE PATTERN DOTS-35;So;0;L;;;;;N;;;;;
-2815;BRAILLE PATTERN DOTS-135;So;0;L;;;;;N;;;;;
-2816;BRAILLE PATTERN DOTS-235;So;0;L;;;;;N;;;;;
-2817;BRAILLE PATTERN DOTS-1235;So;0;L;;;;;N;;;;;
-2818;BRAILLE PATTERN DOTS-45;So;0;L;;;;;N;;;;;
-2819;BRAILLE PATTERN DOTS-145;So;0;L;;;;;N;;;;;
-281A;BRAILLE PATTERN DOTS-245;So;0;L;;;;;N;;;;;
-281B;BRAILLE PATTERN DOTS-1245;So;0;L;;;;;N;;;;;
-281C;BRAILLE PATTERN DOTS-345;So;0;L;;;;;N;;;;;
-281D;BRAILLE PATTERN DOTS-1345;So;0;L;;;;;N;;;;;
-281E;BRAILLE PATTERN DOTS-2345;So;0;L;;;;;N;;;;;
-281F;BRAILLE PATTERN DOTS-12345;So;0;L;;;;;N;;;;;
-2820;BRAILLE PATTERN DOTS-6;So;0;L;;;;;N;;;;;
-2821;BRAILLE PATTERN DOTS-16;So;0;L;;;;;N;;;;;
-2822;BRAILLE PATTERN DOTS-26;So;0;L;;;;;N;;;;;
-2823;BRAILLE PATTERN DOTS-126;So;0;L;;;;;N;;;;;
-2824;BRAILLE PATTERN DOTS-36;So;0;L;;;;;N;;;;;
-2825;BRAILLE PATTERN DOTS-136;So;0;L;;;;;N;;;;;
-2826;BRAILLE PATTERN DOTS-236;So;0;L;;;;;N;;;;;
-2827;BRAILLE PATTERN DOTS-1236;So;0;L;;;;;N;;;;;
-2828;BRAILLE PATTERN DOTS-46;So;0;L;;;;;N;;;;;
-2829;BRAILLE PATTERN DOTS-146;So;0;L;;;;;N;;;;;
-282A;BRAILLE PATTERN DOTS-246;So;0;L;;;;;N;;;;;
-282B;BRAILLE PATTERN DOTS-1246;So;0;L;;;;;N;;;;;
-282C;BRAILLE PATTERN DOTS-346;So;0;L;;;;;N;;;;;
-282D;BRAILLE PATTERN DOTS-1346;So;0;L;;;;;N;;;;;
-282E;BRAILLE PATTERN DOTS-2346;So;0;L;;;;;N;;;;;
-282F;BRAILLE PATTERN DOTS-12346;So;0;L;;;;;N;;;;;
-2830;BRAILLE PATTERN DOTS-56;So;0;L;;;;;N;;;;;
-2831;BRAILLE PATTERN DOTS-156;So;0;L;;;;;N;;;;;
-2832;BRAILLE PATTERN DOTS-256;So;0;L;;;;;N;;;;;
-2833;BRAILLE PATTERN DOTS-1256;So;0;L;;;;;N;;;;;
-2834;BRAILLE PATTERN DOTS-356;So;0;L;;;;;N;;;;;
-2835;BRAILLE PATTERN DOTS-1356;So;0;L;;;;;N;;;;;
-2836;BRAILLE PATTERN DOTS-2356;So;0;L;;;;;N;;;;;
-2837;BRAILLE PATTERN DOTS-12356;So;0;L;;;;;N;;;;;
-2838;BRAILLE PATTERN DOTS-456;So;0;L;;;;;N;;;;;
-2839;BRAILLE PATTERN DOTS-1456;So;0;L;;;;;N;;;;;
-283A;BRAILLE PATTERN DOTS-2456;So;0;L;;;;;N;;;;;
-283B;BRAILLE PATTERN DOTS-12456;So;0;L;;;;;N;;;;;
-283C;BRAILLE PATTERN DOTS-3456;So;0;L;;;;;N;;;;;
-283D;BRAILLE PATTERN DOTS-13456;So;0;L;;;;;N;;;;;
-283E;BRAILLE PATTERN DOTS-23456;So;0;L;;;;;N;;;;;
-283F;BRAILLE PATTERN DOTS-123456;So;0;L;;;;;N;;;;;
-2840;BRAILLE PATTERN DOTS-7;So;0;L;;;;;N;;;;;
-2841;BRAILLE PATTERN DOTS-17;So;0;L;;;;;N;;;;;
-2842;BRAILLE PATTERN DOTS-27;So;0;L;;;;;N;;;;;
-2843;BRAILLE PATTERN DOTS-127;So;0;L;;;;;N;;;;;
-2844;BRAILLE PATTERN DOTS-37;So;0;L;;;;;N;;;;;
-2845;BRAILLE PATTERN DOTS-137;So;0;L;;;;;N;;;;;
-2846;BRAILLE PATTERN DOTS-237;So;0;L;;;;;N;;;;;
-2847;BRAILLE PATTERN DOTS-1237;So;0;L;;;;;N;;;;;
-2848;BRAILLE PATTERN DOTS-47;So;0;L;;;;;N;;;;;
-2849;BRAILLE PATTERN DOTS-147;So;0;L;;;;;N;;;;;
-284A;BRAILLE PATTERN DOTS-247;So;0;L;;;;;N;;;;;
-284B;BRAILLE PATTERN DOTS-1247;So;0;L;;;;;N;;;;;
-284C;BRAILLE PATTERN DOTS-347;So;0;L;;;;;N;;;;;
-284D;BRAILLE PATTERN DOTS-1347;So;0;L;;;;;N;;;;;
-284E;BRAILLE PATTERN DOTS-2347;So;0;L;;;;;N;;;;;
-284F;BRAILLE PATTERN DOTS-12347;So;0;L;;;;;N;;;;;
-2850;BRAILLE PATTERN DOTS-57;So;0;L;;;;;N;;;;;
-2851;BRAILLE PATTERN DOTS-157;So;0;L;;;;;N;;;;;
-2852;BRAILLE PATTERN DOTS-257;So;0;L;;;;;N;;;;;
-2853;BRAILLE PATTERN DOTS-1257;So;0;L;;;;;N;;;;;
-2854;BRAILLE PATTERN DOTS-357;So;0;L;;;;;N;;;;;
-2855;BRAILLE PATTERN DOTS-1357;So;0;L;;;;;N;;;;;
-2856;BRAILLE PATTERN DOTS-2357;So;0;L;;;;;N;;;;;
-2857;BRAILLE PATTERN DOTS-12357;So;0;L;;;;;N;;;;;
-2858;BRAILLE PATTERN DOTS-457;So;0;L;;;;;N;;;;;
-2859;BRAILLE PATTERN DOTS-1457;So;0;L;;;;;N;;;;;
-285A;BRAILLE PATTERN DOTS-2457;So;0;L;;;;;N;;;;;
-285B;BRAILLE PATTERN DOTS-12457;So;0;L;;;;;N;;;;;
-285C;BRAILLE PATTERN DOTS-3457;So;0;L;;;;;N;;;;;
-285D;BRAILLE PATTERN DOTS-13457;So;0;L;;;;;N;;;;;
-285E;BRAILLE PATTERN DOTS-23457;So;0;L;;;;;N;;;;;
-285F;BRAILLE PATTERN DOTS-123457;So;0;L;;;;;N;;;;;
-2860;BRAILLE PATTERN DOTS-67;So;0;L;;;;;N;;;;;
-2861;BRAILLE PATTERN DOTS-167;So;0;L;;;;;N;;;;;
-2862;BRAILLE PATTERN DOTS-267;So;0;L;;;;;N;;;;;
-2863;BRAILLE PATTERN DOTS-1267;So;0;L;;;;;N;;;;;
-2864;BRAILLE PATTERN DOTS-367;So;0;L;;;;;N;;;;;
-2865;BRAILLE PATTERN DOTS-1367;So;0;L;;;;;N;;;;;
-2866;BRAILLE PATTERN DOTS-2367;So;0;L;;;;;N;;;;;
-2867;BRAILLE PATTERN DOTS-12367;So;0;L;;;;;N;;;;;
-2868;BRAILLE PATTERN DOTS-467;So;0;L;;;;;N;;;;;
-2869;BRAILLE PATTERN DOTS-1467;So;0;L;;;;;N;;;;;
-286A;BRAILLE PATTERN DOTS-2467;So;0;L;;;;;N;;;;;
-286B;BRAILLE PATTERN DOTS-12467;So;0;L;;;;;N;;;;;
-286C;BRAILLE PATTERN DOTS-3467;So;0;L;;;;;N;;;;;
-286D;BRAILLE PATTERN DOTS-13467;So;0;L;;;;;N;;;;;
-286E;BRAILLE PATTERN DOTS-23467;So;0;L;;;;;N;;;;;
-286F;BRAILLE PATTERN DOTS-123467;So;0;L;;;;;N;;;;;
-2870;BRAILLE PATTERN DOTS-567;So;0;L;;;;;N;;;;;
-2871;BRAILLE PATTERN DOTS-1567;So;0;L;;;;;N;;;;;
-2872;BRAILLE PATTERN DOTS-2567;So;0;L;;;;;N;;;;;
-2873;BRAILLE PATTERN DOTS-12567;So;0;L;;;;;N;;;;;
-2874;BRAILLE PATTERN DOTS-3567;So;0;L;;;;;N;;;;;
-2875;BRAILLE PATTERN DOTS-13567;So;0;L;;;;;N;;;;;
-2876;BRAILLE PATTERN DOTS-23567;So;0;L;;;;;N;;;;;
-2877;BRAILLE PATTERN DOTS-123567;So;0;L;;;;;N;;;;;
-2878;BRAILLE PATTERN DOTS-4567;So;0;L;;;;;N;;;;;
-2879;BRAILLE PATTERN DOTS-14567;So;0;L;;;;;N;;;;;
-287A;BRAILLE PATTERN DOTS-24567;So;0;L;;;;;N;;;;;
-287B;BRAILLE PATTERN DOTS-124567;So;0;L;;;;;N;;;;;
-287C;BRAILLE PATTERN DOTS-34567;So;0;L;;;;;N;;;;;
-287D;BRAILLE PATTERN DOTS-134567;So;0;L;;;;;N;;;;;
-287E;BRAILLE PATTERN DOTS-234567;So;0;L;;;;;N;;;;;
-287F;BRAILLE PATTERN DOTS-1234567;So;0;L;;;;;N;;;;;
-2880;BRAILLE PATTERN DOTS-8;So;0;L;;;;;N;;;;;
-2881;BRAILLE PATTERN DOTS-18;So;0;L;;;;;N;;;;;
-2882;BRAILLE PATTERN DOTS-28;So;0;L;;;;;N;;;;;
-2883;BRAILLE PATTERN DOTS-128;So;0;L;;;;;N;;;;;
-2884;BRAILLE PATTERN DOTS-38;So;0;L;;;;;N;;;;;
-2885;BRAILLE PATTERN DOTS-138;So;0;L;;;;;N;;;;;
-2886;BRAILLE PATTERN DOTS-238;So;0;L;;;;;N;;;;;
-2887;BRAILLE PATTERN DOTS-1238;So;0;L;;;;;N;;;;;
-2888;BRAILLE PATTERN DOTS-48;So;0;L;;;;;N;;;;;
-2889;BRAILLE PATTERN DOTS-148;So;0;L;;;;;N;;;;;
-288A;BRAILLE PATTERN DOTS-248;So;0;L;;;;;N;;;;;
-288B;BRAILLE PATTERN DOTS-1248;So;0;L;;;;;N;;;;;
-288C;BRAILLE PATTERN DOTS-348;So;0;L;;;;;N;;;;;
-288D;BRAILLE PATTERN DOTS-1348;So;0;L;;;;;N;;;;;
-288E;BRAILLE PATTERN DOTS-2348;So;0;L;;;;;N;;;;;
-288F;BRAILLE PATTERN DOTS-12348;So;0;L;;;;;N;;;;;
-2890;BRAILLE PATTERN DOTS-58;So;0;L;;;;;N;;;;;
-2891;BRAILLE PATTERN DOTS-158;So;0;L;;;;;N;;;;;
-2892;BRAILLE PATTERN DOTS-258;So;0;L;;;;;N;;;;;
-2893;BRAILLE PATTERN DOTS-1258;So;0;L;;;;;N;;;;;
-2894;BRAILLE PATTERN DOTS-358;So;0;L;;;;;N;;;;;
-2895;BRAILLE PATTERN DOTS-1358;So;0;L;;;;;N;;;;;
-2896;BRAILLE PATTERN DOTS-2358;So;0;L;;;;;N;;;;;
-2897;BRAILLE PATTERN DOTS-12358;So;0;L;;;;;N;;;;;
-2898;BRAILLE PATTERN DOTS-458;So;0;L;;;;;N;;;;;
-2899;BRAILLE PATTERN DOTS-1458;So;0;L;;;;;N;;;;;
-289A;BRAILLE PATTERN DOTS-2458;So;0;L;;;;;N;;;;;
-289B;BRAILLE PATTERN DOTS-12458;So;0;L;;;;;N;;;;;
-289C;BRAILLE PATTERN DOTS-3458;So;0;L;;;;;N;;;;;
-289D;BRAILLE PATTERN DOTS-13458;So;0;L;;;;;N;;;;;
-289E;BRAILLE PATTERN DOTS-23458;So;0;L;;;;;N;;;;;
-289F;BRAILLE PATTERN DOTS-123458;So;0;L;;;;;N;;;;;
-28A0;BRAILLE PATTERN DOTS-68;So;0;L;;;;;N;;;;;
-28A1;BRAILLE PATTERN DOTS-168;So;0;L;;;;;N;;;;;
-28A2;BRAILLE PATTERN DOTS-268;So;0;L;;;;;N;;;;;
-28A3;BRAILLE PATTERN DOTS-1268;So;0;L;;;;;N;;;;;
-28A4;BRAILLE PATTERN DOTS-368;So;0;L;;;;;N;;;;;
-28A5;BRAILLE PATTERN DOTS-1368;So;0;L;;;;;N;;;;;
-28A6;BRAILLE PATTERN DOTS-2368;So;0;L;;;;;N;;;;;
-28A7;BRAILLE PATTERN DOTS-12368;So;0;L;;;;;N;;;;;
-28A8;BRAILLE PATTERN DOTS-468;So;0;L;;;;;N;;;;;
-28A9;BRAILLE PATTERN DOTS-1468;So;0;L;;;;;N;;;;;
-28AA;BRAILLE PATTERN DOTS-2468;So;0;L;;;;;N;;;;;
-28AB;BRAILLE PATTERN DOTS-12468;So;0;L;;;;;N;;;;;
-28AC;BRAILLE PATTERN DOTS-3468;So;0;L;;;;;N;;;;;
-28AD;BRAILLE PATTERN DOTS-13468;So;0;L;;;;;N;;;;;
-28AE;BRAILLE PATTERN DOTS-23468;So;0;L;;;;;N;;;;;
-28AF;BRAILLE PATTERN DOTS-123468;So;0;L;;;;;N;;;;;
-28B0;BRAILLE PATTERN DOTS-568;So;0;L;;;;;N;;;;;
-28B1;BRAILLE PATTERN DOTS-1568;So;0;L;;;;;N;;;;;
-28B2;BRAILLE PATTERN DOTS-2568;So;0;L;;;;;N;;;;;
-28B3;BRAILLE PATTERN DOTS-12568;So;0;L;;;;;N;;;;;
-28B4;BRAILLE PATTERN DOTS-3568;So;0;L;;;;;N;;;;;
-28B5;BRAILLE PATTERN DOTS-13568;So;0;L;;;;;N;;;;;
-28B6;BRAILLE PATTERN DOTS-23568;So;0;L;;;;;N;;;;;
-28B7;BRAILLE PATTERN DOTS-123568;So;0;L;;;;;N;;;;;
-28B8;BRAILLE PATTERN DOTS-4568;So;0;L;;;;;N;;;;;
-28B9;BRAILLE PATTERN DOTS-14568;So;0;L;;;;;N;;;;;
-28BA;BRAILLE PATTERN DOTS-24568;So;0;L;;;;;N;;;;;
-28BB;BRAILLE PATTERN DOTS-124568;So;0;L;;;;;N;;;;;
-28BC;BRAILLE PATTERN DOTS-34568;So;0;L;;;;;N;;;;;
-28BD;BRAILLE PATTERN DOTS-134568;So;0;L;;;;;N;;;;;
-28BE;BRAILLE PATTERN DOTS-234568;So;0;L;;;;;N;;;;;
-28BF;BRAILLE PATTERN DOTS-1234568;So;0;L;;;;;N;;;;;
-28C0;BRAILLE PATTERN DOTS-78;So;0;L;;;;;N;;;;;
-28C1;BRAILLE PATTERN DOTS-178;So;0;L;;;;;N;;;;;
-28C2;BRAILLE PATTERN DOTS-278;So;0;L;;;;;N;;;;;
-28C3;BRAILLE PATTERN DOTS-1278;So;0;L;;;;;N;;;;;
-28C4;BRAILLE PATTERN DOTS-378;So;0;L;;;;;N;;;;;
-28C5;BRAILLE PATTERN DOTS-1378;So;0;L;;;;;N;;;;;
-28C6;BRAILLE PATTERN DOTS-2378;So;0;L;;;;;N;;;;;
-28C7;BRAILLE PATTERN DOTS-12378;So;0;L;;;;;N;;;;;
-28C8;BRAILLE PATTERN DOTS-478;So;0;L;;;;;N;;;;;
-28C9;BRAILLE PATTERN DOTS-1478;So;0;L;;;;;N;;;;;
-28CA;BRAILLE PATTERN DOTS-2478;So;0;L;;;;;N;;;;;
-28CB;BRAILLE PATTERN DOTS-12478;So;0;L;;;;;N;;;;;
-28CC;BRAILLE PATTERN DOTS-3478;So;0;L;;;;;N;;;;;
-28CD;BRAILLE PATTERN DOTS-13478;So;0;L;;;;;N;;;;;
-28CE;BRAILLE PATTERN DOTS-23478;So;0;L;;;;;N;;;;;
-28CF;BRAILLE PATTERN DOTS-123478;So;0;L;;;;;N;;;;;
-28D0;BRAILLE PATTERN DOTS-578;So;0;L;;;;;N;;;;;
-28D1;BRAILLE PATTERN DOTS-1578;So;0;L;;;;;N;;;;;
-28D2;BRAILLE PATTERN DOTS-2578;So;0;L;;;;;N;;;;;
-28D3;BRAILLE PATTERN DOTS-12578;So;0;L;;;;;N;;;;;
-28D4;BRAILLE PATTERN DOTS-3578;So;0;L;;;;;N;;;;;
-28D5;BRAILLE PATTERN DOTS-13578;So;0;L;;;;;N;;;;;
-28D6;BRAILLE PATTERN DOTS-23578;So;0;L;;;;;N;;;;;
-28D7;BRAILLE PATTERN DOTS-123578;So;0;L;;;;;N;;;;;
-28D8;BRAILLE PATTERN DOTS-4578;So;0;L;;;;;N;;;;;
-28D9;BRAILLE PATTERN DOTS-14578;So;0;L;;;;;N;;;;;
-28DA;BRAILLE PATTERN DOTS-24578;So;0;L;;;;;N;;;;;
-28DB;BRAILLE PATTERN DOTS-124578;So;0;L;;;;;N;;;;;
-28DC;BRAILLE PATTERN DOTS-34578;So;0;L;;;;;N;;;;;
-28DD;BRAILLE PATTERN DOTS-134578;So;0;L;;;;;N;;;;;
-28DE;BRAILLE PATTERN DOTS-234578;So;0;L;;;;;N;;;;;
-28DF;BRAILLE PATTERN DOTS-1234578;So;0;L;;;;;N;;;;;
-28E0;BRAILLE PATTERN DOTS-678;So;0;L;;;;;N;;;;;
-28E1;BRAILLE PATTERN DOTS-1678;So;0;L;;;;;N;;;;;
-28E2;BRAILLE PATTERN DOTS-2678;So;0;L;;;;;N;;;;;
-28E3;BRAILLE PATTERN DOTS-12678;So;0;L;;;;;N;;;;;
-28E4;BRAILLE PATTERN DOTS-3678;So;0;L;;;;;N;;;;;
-28E5;BRAILLE PATTERN DOTS-13678;So;0;L;;;;;N;;;;;
-28E6;BRAILLE PATTERN DOTS-23678;So;0;L;;;;;N;;;;;
-28E7;BRAILLE PATTERN DOTS-123678;So;0;L;;;;;N;;;;;
-28E8;BRAILLE PATTERN DOTS-4678;So;0;L;;;;;N;;;;;
-28E9;BRAILLE PATTERN DOTS-14678;So;0;L;;;;;N;;;;;
-28EA;BRAILLE PATTERN DOTS-24678;So;0;L;;;;;N;;;;;
-28EB;BRAILLE PATTERN DOTS-124678;So;0;L;;;;;N;;;;;
-28EC;BRAILLE PATTERN DOTS-34678;So;0;L;;;;;N;;;;;
-28ED;BRAILLE PATTERN DOTS-134678;So;0;L;;;;;N;;;;;
-28EE;BRAILLE PATTERN DOTS-234678;So;0;L;;;;;N;;;;;
-28EF;BRAILLE PATTERN DOTS-1234678;So;0;L;;;;;N;;;;;
-28F0;BRAILLE PATTERN DOTS-5678;So;0;L;;;;;N;;;;;
-28F1;BRAILLE PATTERN DOTS-15678;So;0;L;;;;;N;;;;;
-28F2;BRAILLE PATTERN DOTS-25678;So;0;L;;;;;N;;;;;
-28F3;BRAILLE PATTERN DOTS-125678;So;0;L;;;;;N;;;;;
-28F4;BRAILLE PATTERN DOTS-35678;So;0;L;;;;;N;;;;;
-28F5;BRAILLE PATTERN DOTS-135678;So;0;L;;;;;N;;;;;
-28F6;BRAILLE PATTERN DOTS-235678;So;0;L;;;;;N;;;;;
-28F7;BRAILLE PATTERN DOTS-1235678;So;0;L;;;;;N;;;;;
-28F8;BRAILLE PATTERN DOTS-45678;So;0;L;;;;;N;;;;;
-28F9;BRAILLE PATTERN DOTS-145678;So;0;L;;;;;N;;;;;
-28FA;BRAILLE PATTERN DOTS-245678;So;0;L;;;;;N;;;;;
-28FB;BRAILLE PATTERN DOTS-1245678;So;0;L;;;;;N;;;;;
-28FC;BRAILLE PATTERN DOTS-345678;So;0;L;;;;;N;;;;;
-28FD;BRAILLE PATTERN DOTS-1345678;So;0;L;;;;;N;;;;;
-28FE;BRAILLE PATTERN DOTS-2345678;So;0;L;;;;;N;;;;;
-28FF;BRAILLE PATTERN DOTS-12345678;So;0;L;;;;;N;;;;;
-2900;RIGHTWARDS TWO-HEADED ARROW WITH VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
-2901;RIGHTWARDS TWO-HEADED ARROW WITH DOUBLE VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
-2902;LEFTWARDS DOUBLE ARROW WITH VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
-2903;RIGHTWARDS DOUBLE ARROW WITH VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
-2904;LEFT RIGHT DOUBLE ARROW WITH VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
-2905;RIGHTWARDS TWO-HEADED ARROW FROM BAR;Sm;0;ON;;;;;N;;;;;
-2906;LEFTWARDS DOUBLE ARROW FROM BAR;Sm;0;ON;;;;;N;;;;;
-2907;RIGHTWARDS DOUBLE ARROW FROM BAR;Sm;0;ON;;;;;N;;;;;
-2908;DOWNWARDS ARROW WITH HORIZONTAL STROKE;Sm;0;ON;;;;;N;;;;;
-2909;UPWARDS ARROW WITH HORIZONTAL STROKE;Sm;0;ON;;;;;N;;;;;
-290A;UPWARDS TRIPLE ARROW;Sm;0;ON;;;;;N;;;;;
-290B;DOWNWARDS TRIPLE ARROW;Sm;0;ON;;;;;N;;;;;
-290C;LEFTWARDS DOUBLE DASH ARROW;Sm;0;ON;;;;;N;;;;;
-290D;RIGHTWARDS DOUBLE DASH ARROW;Sm;0;ON;;;;;N;;;;;
-290E;LEFTWARDS TRIPLE DASH ARROW;Sm;0;ON;;;;;N;;;;;
-290F;RIGHTWARDS TRIPLE DASH ARROW;Sm;0;ON;;;;;N;;;;;
-2910;RIGHTWARDS TWO-HEADED TRIPLE DASH ARROW;Sm;0;ON;;;;;N;;;;;
-2911;RIGHTWARDS ARROW WITH DOTTED STEM;Sm;0;ON;;;;;N;;;;;
-2912;UPWARDS ARROW TO BAR;Sm;0;ON;;;;;N;;;;;
-2913;DOWNWARDS ARROW TO BAR;Sm;0;ON;;;;;N;;;;;
-2914;RIGHTWARDS ARROW WITH TAIL WITH VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
-2915;RIGHTWARDS ARROW WITH TAIL WITH DOUBLE VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
-2916;RIGHTWARDS TWO-HEADED ARROW WITH TAIL;Sm;0;ON;;;;;N;;;;;
-2917;RIGHTWARDS TWO-HEADED ARROW WITH TAIL WITH VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
-2918;RIGHTWARDS TWO-HEADED ARROW WITH TAIL WITH DOUBLE VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
-2919;LEFTWARDS ARROW-TAIL;Sm;0;ON;;;;;N;;;;;
-291A;RIGHTWARDS ARROW-TAIL;Sm;0;ON;;;;;N;;;;;
-291B;LEFTWARDS DOUBLE ARROW-TAIL;Sm;0;ON;;;;;N;;;;;
-291C;RIGHTWARDS DOUBLE ARROW-TAIL;Sm;0;ON;;;;;N;;;;;
-291D;LEFTWARDS ARROW TO BLACK DIAMOND;Sm;0;ON;;;;;N;;;;;
-291E;RIGHTWARDS ARROW TO BLACK DIAMOND;Sm;0;ON;;;;;N;;;;;
-291F;LEFTWARDS ARROW FROM BAR TO BLACK DIAMOND;Sm;0;ON;;;;;N;;;;;
-2920;RIGHTWARDS ARROW FROM BAR TO BLACK DIAMOND;Sm;0;ON;;;;;N;;;;;
-2921;NORTH WEST AND SOUTH EAST ARROW;Sm;0;ON;;;;;N;;;;;
-2922;NORTH EAST AND SOUTH WEST ARROW;Sm;0;ON;;;;;N;;;;;
-2923;NORTH WEST ARROW WITH HOOK;Sm;0;ON;;;;;N;;;;;
-2924;NORTH EAST ARROW WITH HOOK;Sm;0;ON;;;;;N;;;;;
-2925;SOUTH EAST ARROW WITH HOOK;Sm;0;ON;;;;;N;;;;;
-2926;SOUTH WEST ARROW WITH HOOK;Sm;0;ON;;;;;N;;;;;
-2927;NORTH WEST ARROW AND NORTH EAST ARROW;Sm;0;ON;;;;;N;;;;;
-2928;NORTH EAST ARROW AND SOUTH EAST ARROW;Sm;0;ON;;;;;N;;;;;
-2929;SOUTH EAST ARROW AND SOUTH WEST ARROW;Sm;0;ON;;;;;N;;;;;
-292A;SOUTH WEST ARROW AND NORTH WEST ARROW;Sm;0;ON;;;;;N;;;;;
-292B;RISING DIAGONAL CROSSING FALLING DIAGONAL;Sm;0;ON;;;;;N;;;;;
-292C;FALLING DIAGONAL CROSSING RISING DIAGONAL;Sm;0;ON;;;;;N;;;;;
-292D;SOUTH EAST ARROW CROSSING NORTH EAST ARROW;Sm;0;ON;;;;;N;;;;;
-292E;NORTH EAST ARROW CROSSING SOUTH EAST ARROW;Sm;0;ON;;;;;N;;;;;
-292F;FALLING DIAGONAL CROSSING NORTH EAST ARROW;Sm;0;ON;;;;;N;;;;;
-2930;RISING DIAGONAL CROSSING SOUTH EAST ARROW;Sm;0;ON;;;;;N;;;;;
-2931;NORTH EAST ARROW CROSSING NORTH WEST ARROW;Sm;0;ON;;;;;N;;;;;
-2932;NORTH WEST ARROW CROSSING NORTH EAST ARROW;Sm;0;ON;;;;;N;;;;;
-2933;WAVE ARROW POINTING DIRECTLY RIGHT;Sm;0;ON;;;;;N;;;;;
-2934;ARROW POINTING RIGHTWARDS THEN CURVING UPWARDS;Sm;0;ON;;;;;N;;;;;
-2935;ARROW POINTING RIGHTWARDS THEN CURVING DOWNWARDS;Sm;0;ON;;;;;N;;;;;
-2936;ARROW POINTING DOWNWARDS THEN CURVING LEFTWARDS;Sm;0;ON;;;;;N;;;;;
-2937;ARROW POINTING DOWNWARDS THEN CURVING RIGHTWARDS;Sm;0;ON;;;;;N;;;;;
-2938;RIGHT-SIDE ARC CLOCKWISE ARROW;Sm;0;ON;;;;;N;;;;;
-2939;LEFT-SIDE ARC ANTICLOCKWISE ARROW;Sm;0;ON;;;;;N;;;;;
-293A;TOP ARC ANTICLOCKWISE ARROW;Sm;0;ON;;;;;N;;;;;
-293B;BOTTOM ARC ANTICLOCKWISE ARROW;Sm;0;ON;;;;;N;;;;;
-293C;TOP ARC CLOCKWISE ARROW WITH MINUS;Sm;0;ON;;;;;N;;;;;
-293D;TOP ARC ANTICLOCKWISE ARROW WITH PLUS;Sm;0;ON;;;;;N;;;;;
-293E;LOWER RIGHT SEMICIRCULAR CLOCKWISE ARROW;Sm;0;ON;;;;;N;;;;;
-293F;LOWER LEFT SEMICIRCULAR ANTICLOCKWISE ARROW;Sm;0;ON;;;;;N;;;;;
-2940;ANTICLOCKWISE CLOSED CIRCLE ARROW;Sm;0;ON;;;;;N;;;;;
-2941;CLOCKWISE CLOSED CIRCLE ARROW;Sm;0;ON;;;;;N;;;;;
-2942;RIGHTWARDS ARROW ABOVE SHORT LEFTWARDS ARROW;Sm;0;ON;;;;;N;;;;;
-2943;LEFTWARDS ARROW ABOVE SHORT RIGHTWARDS ARROW;Sm;0;ON;;;;;N;;;;;
-2944;SHORT RIGHTWARDS ARROW ABOVE LEFTWARDS ARROW;Sm;0;ON;;;;;N;;;;;
-2945;RIGHTWARDS ARROW WITH PLUS BELOW;Sm;0;ON;;;;;N;;;;;
-2946;LEFTWARDS ARROW WITH PLUS BELOW;Sm;0;ON;;;;;N;;;;;
-2947;RIGHTWARDS ARROW THROUGH X;Sm;0;ON;;;;;N;;;;;
-2948;LEFT RIGHT ARROW THROUGH SMALL CIRCLE;Sm;0;ON;;;;;N;;;;;
-2949;UPWARDS TWO-HEADED ARROW FROM SMALL CIRCLE;Sm;0;ON;;;;;N;;;;;
-294A;LEFT BARB UP RIGHT BARB DOWN HARPOON;Sm;0;ON;;;;;N;;;;;
-294B;LEFT BARB DOWN RIGHT BARB UP HARPOON;Sm;0;ON;;;;;N;;;;;
-294C;UP BARB RIGHT DOWN BARB LEFT HARPOON;Sm;0;ON;;;;;N;;;;;
-294D;UP BARB LEFT DOWN BARB RIGHT HARPOON;Sm;0;ON;;;;;N;;;;;
-294E;LEFT BARB UP RIGHT BARB UP HARPOON;Sm;0;ON;;;;;N;;;;;
-294F;UP BARB RIGHT DOWN BARB RIGHT HARPOON;Sm;0;ON;;;;;N;;;;;
-2950;LEFT BARB DOWN RIGHT BARB DOWN HARPOON;Sm;0;ON;;;;;N;;;;;
-2951;UP BARB LEFT DOWN BARB LEFT HARPOON;Sm;0;ON;;;;;N;;;;;
-2952;LEFTWARDS HARPOON WITH BARB UP TO BAR;Sm;0;ON;;;;;N;;;;;
-2953;RIGHTWARDS HARPOON WITH BARB UP TO BAR;Sm;0;ON;;;;;N;;;;;
-2954;UPWARDS HARPOON WITH BARB RIGHT TO BAR;Sm;0;ON;;;;;N;;;;;
-2955;DOWNWARDS HARPOON WITH BARB RIGHT TO BAR;Sm;0;ON;;;;;N;;;;;
-2956;LEFTWARDS HARPOON WITH BARB DOWN TO BAR;Sm;0;ON;;;;;N;;;;;
-2957;RIGHTWARDS HARPOON WITH BARB DOWN TO BAR;Sm;0;ON;;;;;N;;;;;
-2958;UPWARDS HARPOON WITH BARB LEFT TO BAR;Sm;0;ON;;;;;N;;;;;
-2959;DOWNWARDS HARPOON WITH BARB LEFT TO BAR;Sm;0;ON;;;;;N;;;;;
-295A;LEFTWARDS HARPOON WITH BARB UP FROM BAR;Sm;0;ON;;;;;N;;;;;
-295B;RIGHTWARDS HARPOON WITH BARB UP FROM BAR;Sm;0;ON;;;;;N;;;;;
-295C;UPWARDS HARPOON WITH BARB RIGHT FROM BAR;Sm;0;ON;;;;;N;;;;;
-295D;DOWNWARDS HARPOON WITH BARB RIGHT FROM BAR;Sm;0;ON;;;;;N;;;;;
-295E;LEFTWARDS HARPOON WITH BARB DOWN FROM BAR;Sm;0;ON;;;;;N;;;;;
-295F;RIGHTWARDS HARPOON WITH BARB DOWN FROM BAR;Sm;0;ON;;;;;N;;;;;
-2960;UPWARDS HARPOON WITH BARB LEFT FROM BAR;Sm;0;ON;;;;;N;;;;;
-2961;DOWNWARDS HARPOON WITH BARB LEFT FROM BAR;Sm;0;ON;;;;;N;;;;;
-2962;LEFTWARDS HARPOON WITH BARB UP ABOVE LEFTWARDS HARPOON WITH BARB DOWN;Sm;0;ON;;;;;N;;;;;
-2963;UPWARDS HARPOON WITH BARB LEFT BESIDE UPWARDS HARPOON WITH BARB RIGHT;Sm;0;ON;;;;;N;;;;;
-2964;RIGHTWARDS HARPOON WITH BARB UP ABOVE RIGHTWARDS HARPOON WITH BARB DOWN;Sm;0;ON;;;;;N;;;;;
-2965;DOWNWARDS HARPOON WITH BARB LEFT BESIDE DOWNWARDS HARPOON WITH BARB RIGHT;Sm;0;ON;;;;;N;;;;;
-2966;LEFTWARDS HARPOON WITH BARB UP ABOVE RIGHTWARDS HARPOON WITH BARB UP;Sm;0;ON;;;;;N;;;;;
-2967;LEFTWARDS HARPOON WITH BARB DOWN ABOVE RIGHTWARDS HARPOON WITH BARB DOWN;Sm;0;ON;;;;;N;;;;;
-2968;RIGHTWARDS HARPOON WITH BARB UP ABOVE LEFTWARDS HARPOON WITH BARB UP;Sm;0;ON;;;;;N;;;;;
-2969;RIGHTWARDS HARPOON WITH BARB DOWN ABOVE LEFTWARDS HARPOON WITH BARB DOWN;Sm;0;ON;;;;;N;;;;;
-296A;LEFTWARDS HARPOON WITH BARB UP ABOVE LONG DASH;Sm;0;ON;;;;;N;;;;;
-296B;LEFTWARDS HARPOON WITH BARB DOWN BELOW LONG DASH;Sm;0;ON;;;;;N;;;;;
-296C;RIGHTWARDS HARPOON WITH BARB UP ABOVE LONG DASH;Sm;0;ON;;;;;N;;;;;
-296D;RIGHTWARDS HARPOON WITH BARB DOWN BELOW LONG DASH;Sm;0;ON;;;;;N;;;;;
-296E;UPWARDS HARPOON WITH BARB LEFT BESIDE DOWNWARDS HARPOON WITH BARB RIGHT;Sm;0;ON;;;;;N;;;;;
-296F;DOWNWARDS HARPOON WITH BARB LEFT BESIDE UPWARDS HARPOON WITH BARB RIGHT;Sm;0;ON;;;;;N;;;;;
-2970;RIGHT DOUBLE ARROW WITH ROUNDED HEAD;Sm;0;ON;;;;;N;;;;;
-2971;EQUALS SIGN ABOVE RIGHTWARDS ARROW;Sm;0;ON;;;;;N;;;;;
-2972;TILDE OPERATOR ABOVE RIGHTWARDS ARROW;Sm;0;ON;;;;;N;;;;;
-2973;LEFTWARDS ARROW ABOVE TILDE OPERATOR;Sm;0;ON;;;;;N;;;;;
-2974;RIGHTWARDS ARROW ABOVE TILDE OPERATOR;Sm;0;ON;;;;;N;;;;;
-2975;RIGHTWARDS ARROW ABOVE ALMOST EQUAL TO;Sm;0;ON;;;;;N;;;;;
-2976;LESS-THAN ABOVE LEFTWARDS ARROW;Sm;0;ON;;;;;N;;;;;
-2977;LEFTWARDS ARROW THROUGH LESS-THAN;Sm;0;ON;;;;;N;;;;;
-2978;GREATER-THAN ABOVE RIGHTWARDS ARROW;Sm;0;ON;;;;;N;;;;;
-2979;SUBSET ABOVE RIGHTWARDS ARROW;Sm;0;ON;;;;;N;;;;;
-297A;LEFTWARDS ARROW THROUGH SUBSET;Sm;0;ON;;;;;N;;;;;
-297B;SUPERSET ABOVE LEFTWARDS ARROW;Sm;0;ON;;;;;N;;;;;
-297C;LEFT FISH TAIL;Sm;0;ON;;;;;N;;;;;
-297D;RIGHT FISH TAIL;Sm;0;ON;;;;;N;;;;;
-297E;UP FISH TAIL;Sm;0;ON;;;;;N;;;;;
-297F;DOWN FISH TAIL;Sm;0;ON;;;;;N;;;;;
-2980;TRIPLE VERTICAL BAR DELIMITER;Sm;0;ON;;;;;N;;;;;
-2981;Z NOTATION SPOT;Sm;0;ON;;;;;N;;;;;
-2982;Z NOTATION TYPE COLON;Sm;0;ON;;;;;N;;;;;
-2983;LEFT WHITE CURLY BRACKET;Ps;0;ON;;;;;Y;;;;;
-2984;RIGHT WHITE CURLY BRACKET;Pe;0;ON;;;;;Y;;;;;
-2985;LEFT WHITE PARENTHESIS;Ps;0;ON;;;;;Y;;;;;
-2986;RIGHT WHITE PARENTHESIS;Pe;0;ON;;;;;Y;;;;;
-2987;Z NOTATION LEFT IMAGE BRACKET;Ps;0;ON;;;;;Y;;;;;
-2988;Z NOTATION RIGHT IMAGE BRACKET;Pe;0;ON;;;;;Y;;;;;
-2989;Z NOTATION LEFT BINDING BRACKET;Ps;0;ON;;;;;Y;;;;;
-298A;Z NOTATION RIGHT BINDING BRACKET;Pe;0;ON;;;;;Y;;;;;
-298B;LEFT SQUARE BRACKET WITH UNDERBAR;Ps;0;ON;;;;;Y;;;;;
-298C;RIGHT SQUARE BRACKET WITH UNDERBAR;Pe;0;ON;;;;;Y;;;;;
-298D;LEFT SQUARE BRACKET WITH TICK IN TOP CORNER;Ps;0;ON;;;;;Y;;;;;
-298E;RIGHT SQUARE BRACKET WITH TICK IN BOTTOM CORNER;Pe;0;ON;;;;;Y;;;;;
-298F;LEFT SQUARE BRACKET WITH TICK IN BOTTOM CORNER;Ps;0;ON;;;;;Y;;;;;
-2990;RIGHT SQUARE BRACKET WITH TICK IN TOP CORNER;Pe;0;ON;;;;;Y;;;;;
-2991;LEFT ANGLE BRACKET WITH DOT;Ps;0;ON;;;;;Y;;;;;
-2992;RIGHT ANGLE BRACKET WITH DOT;Pe;0;ON;;;;;Y;;;;;
-2993;LEFT ARC LESS-THAN BRACKET;Ps;0;ON;;;;;Y;;;;;
-2994;RIGHT ARC GREATER-THAN BRACKET;Pe;0;ON;;;;;Y;;;;;
-2995;DOUBLE LEFT ARC GREATER-THAN BRACKET;Ps;0;ON;;;;;Y;;;;;
-2996;DOUBLE RIGHT ARC LESS-THAN BRACKET;Pe;0;ON;;;;;Y;;;;;
-2997;LEFT BLACK TORTOISE SHELL BRACKET;Ps;0;ON;;;;;Y;;;;;
-2998;RIGHT BLACK TORTOISE SHELL BRACKET;Pe;0;ON;;;;;Y;;;;;
-2999;DOTTED FENCE;Sm;0;ON;;;;;N;;;;;
-299A;VERTICAL ZIGZAG LINE;Sm;0;ON;;;;;N;;;;;
-299B;MEASURED ANGLE OPENING LEFT;Sm;0;ON;;;;;Y;;;;;
-299C;RIGHT ANGLE VARIANT WITH SQUARE;Sm;0;ON;;;;;Y;;;;;
-299D;MEASURED RIGHT ANGLE WITH DOT;Sm;0;ON;;;;;Y;;;;;
-299E;ANGLE WITH S INSIDE;Sm;0;ON;;;;;Y;;;;;
-299F;ACUTE ANGLE;Sm;0;ON;;;;;Y;;;;;
-29A0;SPHERICAL ANGLE OPENING LEFT;Sm;0;ON;;;;;Y;;;;;
-29A1;SPHERICAL ANGLE OPENING UP;Sm;0;ON;;;;;Y;;;;;
-29A2;TURNED ANGLE;Sm;0;ON;;;;;Y;;;;;
-29A3;REVERSED ANGLE;Sm;0;ON;;;;;Y;;;;;
-29A4;ANGLE WITH UNDERBAR;Sm;0;ON;;;;;Y;;;;;
-29A5;REVERSED ANGLE WITH UNDERBAR;Sm;0;ON;;;;;Y;;;;;
-29A6;OBLIQUE ANGLE OPENING UP;Sm;0;ON;;;;;Y;;;;;
-29A7;OBLIQUE ANGLE OPENING DOWN;Sm;0;ON;;;;;Y;;;;;
-29A8;MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING UP AND RIGHT;Sm;0;ON;;;;;Y;;;;;
-29A9;MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING UP AND LEFT;Sm;0;ON;;;;;Y;;;;;
-29AA;MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING DOWN AND RIGHT;Sm;0;ON;;;;;Y;;;;;
-29AB;MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING DOWN AND LEFT;Sm;0;ON;;;;;Y;;;;;
-29AC;MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING RIGHT AND UP;Sm;0;ON;;;;;Y;;;;;
-29AD;MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING LEFT AND UP;Sm;0;ON;;;;;Y;;;;;
-29AE;MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING RIGHT AND DOWN;Sm;0;ON;;;;;Y;;;;;
-29AF;MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING LEFT AND DOWN;Sm;0;ON;;;;;Y;;;;;
-29B0;REVERSED EMPTY SET;Sm;0;ON;;;;;N;;;;;
-29B1;EMPTY SET WITH OVERBAR;Sm;0;ON;;;;;N;;;;;
-29B2;EMPTY SET WITH SMALL CIRCLE ABOVE;Sm;0;ON;;;;;N;;;;;
-29B3;EMPTY SET WITH RIGHT ARROW ABOVE;Sm;0;ON;;;;;N;;;;;
-29B4;EMPTY SET WITH LEFT ARROW ABOVE;Sm;0;ON;;;;;N;;;;;
-29B5;CIRCLE WITH HORIZONTAL BAR;Sm;0;ON;;;;;N;;;;;
-29B6;CIRCLED VERTICAL BAR;Sm;0;ON;;;;;N;;;;;
-29B7;CIRCLED PARALLEL;Sm;0;ON;;;;;N;;;;;
-29B8;CIRCLED REVERSE SOLIDUS;Sm;0;ON;;;;;Y;;;;;
-29B9;CIRCLED PERPENDICULAR;Sm;0;ON;;;;;N;;;;;
-29BA;CIRCLE DIVIDED BY HORIZONTAL BAR AND TOP HALF DIVIDED BY VERTICAL BAR;Sm;0;ON;;;;;N;;;;;
-29BB;CIRCLE WITH SUPERIMPOSED X;Sm;0;ON;;;;;N;;;;;
-29BC;CIRCLED ANTICLOCKWISE-ROTATED DIVISION SIGN;Sm;0;ON;;;;;N;;;;;
-29BD;UP ARROW THROUGH CIRCLE;Sm;0;ON;;;;;N;;;;;
-29BE;CIRCLED WHITE BULLET;Sm;0;ON;;;;;N;;;;;
-29BF;CIRCLED BULLET;Sm;0;ON;;;;;N;;;;;
-29C0;CIRCLED LESS-THAN;Sm;0;ON;;;;;Y;;;;;
-29C1;CIRCLED GREATER-THAN;Sm;0;ON;;;;;Y;;;;;
-29C2;CIRCLE WITH SMALL CIRCLE TO THE RIGHT;Sm;0;ON;;;;;Y;;;;;
-29C3;CIRCLE WITH TWO HORIZONTAL STROKES TO THE RIGHT;Sm;0;ON;;;;;Y;;;;;
-29C4;SQUARED RISING DIAGONAL SLASH;Sm;0;ON;;;;;Y;;;;;
-29C5;SQUARED FALLING DIAGONAL SLASH;Sm;0;ON;;;;;Y;;;;;
-29C6;SQUARED ASTERISK;Sm;0;ON;;;;;N;;;;;
-29C7;SQUARED SMALL CIRCLE;Sm;0;ON;;;;;N;;;;;
-29C8;SQUARED SQUARE;Sm;0;ON;;;;;N;;;;;
-29C9;TWO JOINED SQUARES;Sm;0;ON;;;;;Y;;;;;
-29CA;TRIANGLE WITH DOT ABOVE;Sm;0;ON;;;;;N;;;;;
-29CB;TRIANGLE WITH UNDERBAR;Sm;0;ON;;;;;N;;;;;
-29CC;S IN TRIANGLE;Sm;0;ON;;;;;N;;;;;
-29CD;TRIANGLE WITH SERIFS AT BOTTOM;Sm;0;ON;;;;;N;;;;;
-29CE;RIGHT TRIANGLE ABOVE LEFT TRIANGLE;Sm;0;ON;;;;;Y;;;;;
-29CF;LEFT TRIANGLE BESIDE VERTICAL BAR;Sm;0;ON;;;;;Y;;;;;
-29D0;VERTICAL BAR BESIDE RIGHT TRIANGLE;Sm;0;ON;;;;;Y;;;;;
-29D1;BOWTIE WITH LEFT HALF BLACK;Sm;0;ON;;;;;Y;;;;;
-29D2;BOWTIE WITH RIGHT HALF BLACK;Sm;0;ON;;;;;Y;;;;;
-29D3;BLACK BOWTIE;Sm;0;ON;;;;;N;;;;;
-29D4;TIMES WITH LEFT HALF BLACK;Sm;0;ON;;;;;Y;;;;;
-29D5;TIMES WITH RIGHT HALF BLACK;Sm;0;ON;;;;;Y;;;;;
-29D6;WHITE HOURGLASS;Sm;0;ON;;;;;N;;;;;
-29D7;BLACK HOURGLASS;Sm;0;ON;;;;;N;;;;;
-29D8;LEFT WIGGLY FENCE;Ps;0;ON;;;;;Y;;;;;
-29D9;RIGHT WIGGLY FENCE;Pe;0;ON;;;;;Y;;;;;
-29DA;LEFT DOUBLE WIGGLY FENCE;Ps;0;ON;;;;;Y;;;;;
-29DB;RIGHT DOUBLE WIGGLY FENCE;Pe;0;ON;;;;;Y;;;;;
-29DC;INCOMPLETE INFINITY;Sm;0;ON;;;;;Y;;;;;
-29DD;TIE OVER INFINITY;Sm;0;ON;;;;;N;;;;;
-29DE;INFINITY NEGATED WITH VERTICAL BAR;Sm;0;ON;;;;;N;;;;;
-29DF;DOUBLE-ENDED MULTIMAP;Sm;0;ON;;;;;N;;;;;
-29E0;SQUARE WITH CONTOURED OUTLINE;Sm;0;ON;;;;;N;;;;;
-29E1;INCREASES AS;Sm;0;ON;;;;;Y;;;;;
-29E2;SHUFFLE PRODUCT;Sm;0;ON;;;;;N;;;;;
-29E3;EQUALS SIGN AND SLANTED PARALLEL;Sm;0;ON;;;;;Y;;;;;
-29E4;EQUALS SIGN AND SLANTED PARALLEL WITH TILDE ABOVE;Sm;0;ON;;;;;Y;;;;;
-29E5;IDENTICAL TO AND SLANTED PARALLEL;Sm;0;ON;;;;;Y;;;;;
-29E6;GLEICH STARK;Sm;0;ON;;;;;N;;;;;
-29E7;THERMODYNAMIC;Sm;0;ON;;;;;N;;;;;
-29E8;DOWN-POINTING TRIANGLE WITH LEFT HALF BLACK;Sm;0;ON;;;;;Y;;;;;
-29E9;DOWN-POINTING TRIANGLE WITH RIGHT HALF BLACK;Sm;0;ON;;;;;Y;;;;;
-29EA;BLACK DIAMOND WITH DOWN ARROW;Sm;0;ON;;;;;N;;;;;
-29EB;BLACK LOZENGE;Sm;0;ON;;;;;N;;;;;
-29EC;WHITE CIRCLE WITH DOWN ARROW;Sm;0;ON;;;;;N;;;;;
-29ED;BLACK CIRCLE WITH DOWN ARROW;Sm;0;ON;;;;;N;;;;;
-29EE;ERROR-BARRED WHITE SQUARE;Sm;0;ON;;;;;N;;;;;
-29EF;ERROR-BARRED BLACK SQUARE;Sm;0;ON;;;;;N;;;;;
-29F0;ERROR-BARRED WHITE DIAMOND;Sm;0;ON;;;;;N;;;;;
-29F1;ERROR-BARRED BLACK DIAMOND;Sm;0;ON;;;;;N;;;;;
-29F2;ERROR-BARRED WHITE CIRCLE;Sm;0;ON;;;;;N;;;;;
-29F3;ERROR-BARRED BLACK CIRCLE;Sm;0;ON;;;;;N;;;;;
-29F4;RULE-DELAYED;Sm;0;ON;;;;;Y;;;;;
-29F5;REVERSE SOLIDUS OPERATOR;Sm;0;ON;;;;;Y;;;;;
-29F6;SOLIDUS WITH OVERBAR;Sm;0;ON;;;;;Y;;;;;
-29F7;REVERSE SOLIDUS WITH HORIZONTAL STROKE;Sm;0;ON;;;;;Y;;;;;
-29F8;BIG SOLIDUS;Sm;0;ON;;;;;Y;;;;;
-29F9;BIG REVERSE SOLIDUS;Sm;0;ON;;;;;Y;;;;;
-29FA;DOUBLE PLUS;Sm;0;ON;;;;;N;;;;;
-29FB;TRIPLE PLUS;Sm;0;ON;;;;;N;;;;;
-29FC;LEFT-POINTING CURVED ANGLE BRACKET;Ps;0;ON;;;;;Y;;;;;
-29FD;RIGHT-POINTING CURVED ANGLE BRACKET;Pe;0;ON;;;;;Y;;;;;
-29FE;TINY;Sm;0;ON;;;;;N;;;;;
-29FF;MINY;Sm;0;ON;;;;;N;;;;;
-2A00;N-ARY CIRCLED DOT OPERATOR;Sm;0;ON;;;;;N;;;;;
-2A01;N-ARY CIRCLED PLUS OPERATOR;Sm;0;ON;;;;;N;;;;;
-2A02;N-ARY CIRCLED TIMES OPERATOR;Sm;0;ON;;;;;N;;;;;
-2A03;N-ARY UNION OPERATOR WITH DOT;Sm;0;ON;;;;;N;;;;;
-2A04;N-ARY UNION OPERATOR WITH PLUS;Sm;0;ON;;;;;N;;;;;
-2A05;N-ARY SQUARE INTERSECTION OPERATOR;Sm;0;ON;;;;;N;;;;;
-2A06;N-ARY SQUARE UNION OPERATOR;Sm;0;ON;;;;;N;;;;;
-2A07;TWO LOGICAL AND OPERATOR;Sm;0;ON;;;;;N;;;;;
-2A08;TWO LOGICAL OR OPERATOR;Sm;0;ON;;;;;N;;;;;
-2A09;N-ARY TIMES OPERATOR;Sm;0;ON;;;;;N;;;;;
-2A0A;MODULO TWO SUM;Sm;0;ON;;;;;Y;;;;;
-2A0B;SUMMATION WITH INTEGRAL;Sm;0;ON;;;;;Y;;;;;
-2A0C;QUADRUPLE INTEGRAL OPERATOR;Sm;0;ON;<compat> 222B 222B 222B 222B;;;;Y;;;;;
-2A0D;FINITE PART INTEGRAL;Sm;0;ON;;;;;Y;;;;;
-2A0E;INTEGRAL WITH DOUBLE STROKE;Sm;0;ON;;;;;Y;;;;;
-2A0F;INTEGRAL AVERAGE WITH SLASH;Sm;0;ON;;;;;Y;;;;;
-2A10;CIRCULATION FUNCTION;Sm;0;ON;;;;;Y;;;;;
-2A11;ANTICLOCKWISE INTEGRATION;Sm;0;ON;;;;;Y;;;;;
-2A12;LINE INTEGRATION WITH RECTANGULAR PATH AROUND POLE;Sm;0;ON;;;;;Y;;;;;
-2A13;LINE INTEGRATION WITH SEMICIRCULAR PATH AROUND POLE;Sm;0;ON;;;;;Y;;;;;
-2A14;LINE INTEGRATION NOT INCLUDING THE POLE;Sm;0;ON;;;;;Y;;;;;
-2A15;INTEGRAL AROUND A POINT OPERATOR;Sm;0;ON;;;;;Y;;;;;
-2A16;QUATERNION INTEGRAL OPERATOR;Sm;0;ON;;;;;Y;;;;;
-2A17;INTEGRAL WITH LEFTWARDS ARROW WITH HOOK;Sm;0;ON;;;;;Y;;;;;
-2A18;INTEGRAL WITH TIMES SIGN;Sm;0;ON;;;;;Y;;;;;
-2A19;INTEGRAL WITH INTERSECTION;Sm;0;ON;;;;;Y;;;;;
-2A1A;INTEGRAL WITH UNION;Sm;0;ON;;;;;Y;;;;;
-2A1B;INTEGRAL WITH OVERBAR;Sm;0;ON;;;;;Y;;;;;
-2A1C;INTEGRAL WITH UNDERBAR;Sm;0;ON;;;;;Y;;;;;
-2A1D;JOIN;Sm;0;ON;;;;;N;;;;;
-2A1E;LARGE LEFT TRIANGLE OPERATOR;Sm;0;ON;;;;;Y;;;;;
-2A1F;Z NOTATION SCHEMA COMPOSITION;Sm;0;ON;;;;;Y;;;;;
-2A20;Z NOTATION SCHEMA PIPING;Sm;0;ON;;;;;Y;;;;;
-2A21;Z NOTATION SCHEMA PROJECTION;Sm;0;ON;;;;;Y;;;;;
-2A22;PLUS SIGN WITH SMALL CIRCLE ABOVE;Sm;0;ON;;;;;N;;;;;
-2A23;PLUS SIGN WITH CIRCUMFLEX ACCENT ABOVE;Sm;0;ON;;;;;N;;;;;
-2A24;PLUS SIGN WITH TILDE ABOVE;Sm;0;ON;;;;;Y;;;;;
-2A25;PLUS SIGN WITH DOT BELOW;Sm;0;ON;;;;;N;;;;;
-2A26;PLUS SIGN WITH TILDE BELOW;Sm;0;ON;;;;;Y;;;;;
-2A27;PLUS SIGN WITH SUBSCRIPT TWO;Sm;0;ON;;;;;N;;;;;
-2A28;PLUS SIGN WITH BLACK TRIANGLE;Sm;0;ON;;;;;N;;;;;
-2A29;MINUS SIGN WITH COMMA ABOVE;Sm;0;ON;;;;;Y;;;;;
-2A2A;MINUS SIGN WITH DOT BELOW;Sm;0;ON;;;;;N;;;;;
-2A2B;MINUS SIGN WITH FALLING DOTS;Sm;0;ON;;;;;Y;;;;;
-2A2C;MINUS SIGN WITH RISING DOTS;Sm;0;ON;;;;;Y;;;;;
-2A2D;PLUS SIGN IN LEFT HALF CIRCLE;Sm;0;ON;;;;;Y;;;;;
-2A2E;PLUS SIGN IN RIGHT HALF CIRCLE;Sm;0;ON;;;;;Y;;;;;
-2A2F;VECTOR OR CROSS PRODUCT;Sm;0;ON;;;;;N;;;;;
-2A30;MULTIPLICATION SIGN WITH DOT ABOVE;Sm;0;ON;;;;;N;;;;;
-2A31;MULTIPLICATION SIGN WITH UNDERBAR;Sm;0;ON;;;;;N;;;;;
-2A32;SEMIDIRECT PRODUCT WITH BOTTOM CLOSED;Sm;0;ON;;;;;N;;;;;
-2A33;SMASH PRODUCT;Sm;0;ON;;;;;N;;;;;
-2A34;MULTIPLICATION SIGN IN LEFT HALF CIRCLE;Sm;0;ON;;;;;Y;;;;;
-2A35;MULTIPLICATION SIGN IN RIGHT HALF CIRCLE;Sm;0;ON;;;;;Y;;;;;
-2A36;CIRCLED MULTIPLICATION SIGN WITH CIRCUMFLEX ACCENT;Sm;0;ON;;;;;N;;;;;
-2A37;MULTIPLICATION SIGN IN DOUBLE CIRCLE;Sm;0;ON;;;;;N;;;;;
-2A38;CIRCLED DIVISION SIGN;Sm;0;ON;;;;;N;;;;;
-2A39;PLUS SIGN IN TRIANGLE;Sm;0;ON;;;;;N;;;;;
-2A3A;MINUS SIGN IN TRIANGLE;Sm;0;ON;;;;;N;;;;;
-2A3B;MULTIPLICATION SIGN IN TRIANGLE;Sm;0;ON;;;;;N;;;;;
-2A3C;INTERIOR PRODUCT;Sm;0;ON;;;;;Y;;;;;
-2A3D;RIGHTHAND INTERIOR PRODUCT;Sm;0;ON;;;;;Y;;;;;
-2A3E;Z NOTATION RELATIONAL COMPOSITION;Sm;0;ON;;;;;Y;;;;;
-2A3F;AMALGAMATION OR COPRODUCT;Sm;0;ON;;;;;N;;;;;
-2A40;INTERSECTION WITH DOT;Sm;0;ON;;;;;N;;;;;
-2A41;UNION WITH MINUS SIGN;Sm;0;ON;;;;;N;;;;;
-2A42;UNION WITH OVERBAR;Sm;0;ON;;;;;N;;;;;
-2A43;INTERSECTION WITH OVERBAR;Sm;0;ON;;;;;N;;;;;
-2A44;INTERSECTION WITH LOGICAL AND;Sm;0;ON;;;;;N;;;;;
-2A45;UNION WITH LOGICAL OR;Sm;0;ON;;;;;N;;;;;
-2A46;UNION ABOVE INTERSECTION;Sm;0;ON;;;;;N;;;;;
-2A47;INTERSECTION ABOVE UNION;Sm;0;ON;;;;;N;;;;;
-2A48;UNION ABOVE BAR ABOVE INTERSECTION;Sm;0;ON;;;;;N;;;;;
-2A49;INTERSECTION ABOVE BAR ABOVE UNION;Sm;0;ON;;;;;N;;;;;
-2A4A;UNION BESIDE AND JOINED WITH UNION;Sm;0;ON;;;;;N;;;;;
-2A4B;INTERSECTION BESIDE AND JOINED WITH INTERSECTION;Sm;0;ON;;;;;N;;;;;
-2A4C;CLOSED UNION WITH SERIFS;Sm;0;ON;;;;;N;;;;;
-2A4D;CLOSED INTERSECTION WITH SERIFS;Sm;0;ON;;;;;N;;;;;
-2A4E;DOUBLE SQUARE INTERSECTION;Sm;0;ON;;;;;N;;;;;
-2A4F;DOUBLE SQUARE UNION;Sm;0;ON;;;;;N;;;;;
-2A50;CLOSED UNION WITH SERIFS AND SMASH PRODUCT;Sm;0;ON;;;;;N;;;;;
-2A51;LOGICAL AND WITH DOT ABOVE;Sm;0;ON;;;;;N;;;;;
-2A52;LOGICAL OR WITH DOT ABOVE;Sm;0;ON;;;;;N;;;;;
-2A53;DOUBLE LOGICAL AND;Sm;0;ON;;;;;N;;;;;
-2A54;DOUBLE LOGICAL OR;Sm;0;ON;;;;;N;;;;;
-2A55;TWO INTERSECTING LOGICAL AND;Sm;0;ON;;;;;N;;;;;
-2A56;TWO INTERSECTING LOGICAL OR;Sm;0;ON;;;;;N;;;;;
-2A57;SLOPING LARGE OR;Sm;0;ON;;;;;Y;;;;;
-2A58;SLOPING LARGE AND;Sm;0;ON;;;;;Y;;;;;
-2A59;LOGICAL OR OVERLAPPING LOGICAL AND;Sm;0;ON;;;;;N;;;;;
-2A5A;LOGICAL AND WITH MIDDLE STEM;Sm;0;ON;;;;;N;;;;;
-2A5B;LOGICAL OR WITH MIDDLE STEM;Sm;0;ON;;;;;N;;;;;
-2A5C;LOGICAL AND WITH HORIZONTAL DASH;Sm;0;ON;;;;;N;;;;;
-2A5D;LOGICAL OR WITH HORIZONTAL DASH;Sm;0;ON;;;;;N;;;;;
-2A5E;LOGICAL AND WITH DOUBLE OVERBAR;Sm;0;ON;;;;;N;;;;;
-2A5F;LOGICAL AND WITH UNDERBAR;Sm;0;ON;;;;;N;;;;;
-2A60;LOGICAL AND WITH DOUBLE UNDERBAR;Sm;0;ON;;;;;N;;;;;
-2A61;SMALL VEE WITH UNDERBAR;Sm;0;ON;;;;;N;;;;;
-2A62;LOGICAL OR WITH DOUBLE OVERBAR;Sm;0;ON;;;;;N;;;;;
-2A63;LOGICAL OR WITH DOUBLE UNDERBAR;Sm;0;ON;;;;;N;;;;;
-2A64;Z NOTATION DOMAIN ANTIRESTRICTION;Sm;0;ON;;;;;Y;;;;;
-2A65;Z NOTATION RANGE ANTIRESTRICTION;Sm;0;ON;;;;;Y;;;;;
-2A66;EQUALS SIGN WITH DOT BELOW;Sm;0;ON;;;;;N;;;;;
-2A67;IDENTICAL WITH DOT ABOVE;Sm;0;ON;;;;;N;;;;;
-2A68;TRIPLE HORIZONTAL BAR WITH DOUBLE VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
-2A69;TRIPLE HORIZONTAL BAR WITH TRIPLE VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
-2A6A;TILDE OPERATOR WITH DOT ABOVE;Sm;0;ON;;;;;Y;;;;;
-2A6B;TILDE OPERATOR WITH RISING DOTS;Sm;0;ON;;;;;Y;;;;;
-2A6C;SIMILAR MINUS SIMILAR;Sm;0;ON;;;;;Y;;;;;
-2A6D;CONGRUENT WITH DOT ABOVE;Sm;0;ON;;;;;Y;;;;;
-2A6E;EQUALS WITH ASTERISK;Sm;0;ON;;;;;N;;;;;
-2A6F;ALMOST EQUAL TO WITH CIRCUMFLEX ACCENT;Sm;0;ON;;;;;Y;;;;;
-2A70;APPROXIMATELY EQUAL OR EQUAL TO;Sm;0;ON;;;;;Y;;;;;
-2A71;EQUALS SIGN ABOVE PLUS SIGN;Sm;0;ON;;;;;N;;;;;
-2A72;PLUS SIGN ABOVE EQUALS SIGN;Sm;0;ON;;;;;N;;;;;
-2A73;EQUALS SIGN ABOVE TILDE OPERATOR;Sm;0;ON;;;;;Y;;;;;
-2A74;DOUBLE COLON EQUAL;Sm;0;ON;<compat> 003A 003A 003D;;;;Y;;;;;
-2A75;TWO CONSECUTIVE EQUALS SIGNS;Sm;0;ON;<compat> 003D 003D;;;;N;;;;;
-2A76;THREE CONSECUTIVE EQUALS SIGNS;Sm;0;ON;<compat> 003D 003D 003D;;;;N;;;;;
-2A77;EQUALS SIGN WITH TWO DOTS ABOVE AND TWO DOTS BELOW;Sm;0;ON;;;;;N;;;;;
-2A78;EQUIVALENT WITH FOUR DOTS ABOVE;Sm;0;ON;;;;;N;;;;;
-2A79;LESS-THAN WITH CIRCLE INSIDE;Sm;0;ON;;;;;Y;;;;;
-2A7A;GREATER-THAN WITH CIRCLE INSIDE;Sm;0;ON;;;;;Y;;;;;
-2A7B;LESS-THAN WITH QUESTION MARK ABOVE;Sm;0;ON;;;;;Y;;;;;
-2A7C;GREATER-THAN WITH QUESTION MARK ABOVE;Sm;0;ON;;;;;Y;;;;;
-2A7D;LESS-THAN OR SLANTED EQUAL TO;Sm;0;ON;;;;;Y;;;;;
-2A7E;GREATER-THAN OR SLANTED EQUAL TO;Sm;0;ON;;;;;Y;;;;;
-2A7F;LESS-THAN OR SLANTED EQUAL TO WITH DOT INSIDE;Sm;0;ON;;;;;Y;;;;;
-2A80;GREATER-THAN OR SLANTED EQUAL TO WITH DOT INSIDE;Sm;0;ON;;;;;Y;;;;;
-2A81;LESS-THAN OR SLANTED EQUAL TO WITH DOT ABOVE;Sm;0;ON;;;;;Y;;;;;
-2A82;GREATER-THAN OR SLANTED EQUAL TO WITH DOT ABOVE;Sm;0;ON;;;;;Y;;;;;
-2A83;LESS-THAN OR SLANTED EQUAL TO WITH DOT ABOVE RIGHT;Sm;0;ON;;;;;Y;;;;;
-2A84;GREATER-THAN OR SLANTED EQUAL TO WITH DOT ABOVE LEFT;Sm;0;ON;;;;;Y;;;;;
-2A85;LESS-THAN OR APPROXIMATE;Sm;0;ON;;;;;Y;;;;;
-2A86;GREATER-THAN OR APPROXIMATE;Sm;0;ON;;;;;Y;;;;;
-2A87;LESS-THAN AND SINGLE-LINE NOT EQUAL TO;Sm;0;ON;;;;;Y;;;;;
-2A88;GREATER-THAN AND SINGLE-LINE NOT EQUAL TO;Sm;0;ON;;;;;Y;;;;;
-2A89;LESS-THAN AND NOT APPROXIMATE;Sm;0;ON;;;;;Y;;;;;
-2A8A;GREATER-THAN AND NOT APPROXIMATE;Sm;0;ON;;;;;Y;;;;;
-2A8B;LESS-THAN ABOVE DOUBLE-LINE EQUAL ABOVE GREATER-THAN;Sm;0;ON;;;;;Y;;;;;
-2A8C;GREATER-THAN ABOVE DOUBLE-LINE EQUAL ABOVE LESS-THAN;Sm;0;ON;;;;;Y;;;;;
-2A8D;LESS-THAN ABOVE SIMILAR OR EQUAL;Sm;0;ON;;;;;Y;;;;;
-2A8E;GREATER-THAN ABOVE SIMILAR OR EQUAL;Sm;0;ON;;;;;Y;;;;;
-2A8F;LESS-THAN ABOVE SIMILAR ABOVE GREATER-THAN;Sm;0;ON;;;;;Y;;;;;
-2A90;GREATER-THAN ABOVE SIMILAR ABOVE LESS-THAN;Sm;0;ON;;;;;Y;;;;;
-2A91;LESS-THAN ABOVE GREATER-THAN ABOVE DOUBLE-LINE EQUAL;Sm;0;ON;;;;;Y;;;;;
-2A92;GREATER-THAN ABOVE LESS-THAN ABOVE DOUBLE-LINE EQUAL;Sm;0;ON;;;;;Y;;;;;
-2A93;LESS-THAN ABOVE SLANTED EQUAL ABOVE GREATER-THAN ABOVE SLANTED EQUAL;Sm;0;ON;;;;;Y;;;;;
-2A94;GREATER-THAN ABOVE SLANTED EQUAL ABOVE LESS-THAN ABOVE SLANTED EQUAL;Sm;0;ON;;;;;Y;;;;;
-2A95;SLANTED EQUAL TO OR LESS-THAN;Sm;0;ON;;;;;Y;;;;;
-2A96;SLANTED EQUAL TO OR GREATER-THAN;Sm;0;ON;;;;;Y;;;;;
-2A97;SLANTED EQUAL TO OR LESS-THAN WITH DOT INSIDE;Sm;0;ON;;;;;Y;;;;;
-2A98;SLANTED EQUAL TO OR GREATER-THAN WITH DOT INSIDE;Sm;0;ON;;;;;Y;;;;;
-2A99;DOUBLE-LINE EQUAL TO OR LESS-THAN;Sm;0;ON;;;;;Y;;;;;
-2A9A;DOUBLE-LINE EQUAL TO OR GREATER-THAN;Sm;0;ON;;;;;Y;;;;;
-2A9B;DOUBLE-LINE SLANTED EQUAL TO OR LESS-THAN;Sm;0;ON;;;;;Y;;;;;
-2A9C;DOUBLE-LINE SLANTED EQUAL TO OR GREATER-THAN;Sm;0;ON;;;;;Y;;;;;
-2A9D;SIMILAR OR LESS-THAN;Sm;0;ON;;;;;Y;;;;;
-2A9E;SIMILAR OR GREATER-THAN;Sm;0;ON;;;;;Y;;;;;
-2A9F;SIMILAR ABOVE LESS-THAN ABOVE EQUALS SIGN;Sm;0;ON;;;;;Y;;;;;
-2AA0;SIMILAR ABOVE GREATER-THAN ABOVE EQUALS SIGN;Sm;0;ON;;;;;Y;;;;;
-2AA1;DOUBLE NESTED LESS-THAN;Sm;0;ON;;;;;Y;;;;;
-2AA2;DOUBLE NESTED GREATER-THAN;Sm;0;ON;;;;;Y;;;;;
-2AA3;DOUBLE NESTED LESS-THAN WITH UNDERBAR;Sm;0;ON;;;;;Y;;;;;
-2AA4;GREATER-THAN OVERLAPPING LESS-THAN;Sm;0;ON;;;;;N;;;;;
-2AA5;GREATER-THAN BESIDE LESS-THAN;Sm;0;ON;;;;;N;;;;;
-2AA6;LESS-THAN CLOSED BY CURVE;Sm;0;ON;;;;;Y;;;;;
-2AA7;GREATER-THAN CLOSED BY CURVE;Sm;0;ON;;;;;Y;;;;;
-2AA8;LESS-THAN CLOSED BY CURVE ABOVE SLANTED EQUAL;Sm;0;ON;;;;;Y;;;;;
-2AA9;GREATER-THAN CLOSED BY CURVE ABOVE SLANTED EQUAL;Sm;0;ON;;;;;Y;;;;;
-2AAA;SMALLER THAN;Sm;0;ON;;;;;Y;;;;;
-2AAB;LARGER THAN;Sm;0;ON;;;;;Y;;;;;
-2AAC;SMALLER THAN OR EQUAL TO;Sm;0;ON;;;;;Y;;;;;
-2AAD;LARGER THAN OR EQUAL TO;Sm;0;ON;;;;;Y;;;;;
-2AAE;EQUALS SIGN WITH BUMPY ABOVE;Sm;0;ON;;;;;N;;;;;
-2AAF;PRECEDES ABOVE SINGLE-LINE EQUALS SIGN;Sm;0;ON;;;;;Y;;;;;
-2AB0;SUCCEEDS ABOVE SINGLE-LINE EQUALS SIGN;Sm;0;ON;;;;;Y;;;;;
-2AB1;PRECEDES ABOVE SINGLE-LINE NOT EQUAL TO;Sm;0;ON;;;;;Y;;;;;
-2AB2;SUCCEEDS ABOVE SINGLE-LINE NOT EQUAL TO;Sm;0;ON;;;;;Y;;;;;
-2AB3;PRECEDES ABOVE EQUALS SIGN;Sm;0;ON;;;;;Y;;;;;
-2AB4;SUCCEEDS ABOVE EQUALS SIGN;Sm;0;ON;;;;;Y;;;;;
-2AB5;PRECEDES ABOVE NOT EQUAL TO;Sm;0;ON;;;;;Y;;;;;
-2AB6;SUCCEEDS ABOVE NOT EQUAL TO;Sm;0;ON;;;;;Y;;;;;
-2AB7;PRECEDES ABOVE ALMOST EQUAL TO;Sm;0;ON;;;;;Y;;;;;
-2AB8;SUCCEEDS ABOVE ALMOST EQUAL TO;Sm;0;ON;;;;;Y;;;;;
-2AB9;PRECEDES ABOVE NOT ALMOST EQUAL TO;Sm;0;ON;;;;;Y;;;;;
-2ABA;SUCCEEDS ABOVE NOT ALMOST EQUAL TO;Sm;0;ON;;;;;Y;;;;;
-2ABB;DOUBLE PRECEDES;Sm;0;ON;;;;;Y;;;;;
-2ABC;DOUBLE SUCCEEDS;Sm;0;ON;;;;;Y;;;;;
-2ABD;SUBSET WITH DOT;Sm;0;ON;;;;;Y;;;;;
-2ABE;SUPERSET WITH DOT;Sm;0;ON;;;;;Y;;;;;
-2ABF;SUBSET WITH PLUS SIGN BELOW;Sm;0;ON;;;;;Y;;;;;
-2AC0;SUPERSET WITH PLUS SIGN BELOW;Sm;0;ON;;;;;Y;;;;;
-2AC1;SUBSET WITH MULTIPLICATION SIGN BELOW;Sm;0;ON;;;;;Y;;;;;
-2AC2;SUPERSET WITH MULTIPLICATION SIGN BELOW;Sm;0;ON;;;;;Y;;;;;
-2AC3;SUBSET OF OR EQUAL TO WITH DOT ABOVE;Sm;0;ON;;;;;Y;;;;;
-2AC4;SUPERSET OF OR EQUAL TO WITH DOT ABOVE;Sm;0;ON;;;;;Y;;;;;
-2AC5;SUBSET OF ABOVE EQUALS SIGN;Sm;0;ON;;;;;Y;;;;;
-2AC6;SUPERSET OF ABOVE EQUALS SIGN;Sm;0;ON;;;;;Y;;;;;
-2AC7;SUBSET OF ABOVE TILDE OPERATOR;Sm;0;ON;;;;;Y;;;;;
-2AC8;SUPERSET OF ABOVE TILDE OPERATOR;Sm;0;ON;;;;;Y;;;;;
-2AC9;SUBSET OF ABOVE ALMOST EQUAL TO;Sm;0;ON;;;;;Y;;;;;
-2ACA;SUPERSET OF ABOVE ALMOST EQUAL TO;Sm;0;ON;;;;;Y;;;;;
-2ACB;SUBSET OF ABOVE NOT EQUAL TO;Sm;0;ON;;;;;Y;;;;;
-2ACC;SUPERSET OF ABOVE NOT EQUAL TO;Sm;0;ON;;;;;Y;;;;;
-2ACD;SQUARE LEFT OPEN BOX OPERATOR;Sm;0;ON;;;;;Y;;;;;
-2ACE;SQUARE RIGHT OPEN BOX OPERATOR;Sm;0;ON;;;;;Y;;;;;
-2ACF;CLOSED SUBSET;Sm;0;ON;;;;;Y;;;;;
-2AD0;CLOSED SUPERSET;Sm;0;ON;;;;;Y;;;;;
-2AD1;CLOSED SUBSET OR EQUAL TO;Sm;0;ON;;;;;Y;;;;;
-2AD2;CLOSED SUPERSET OR EQUAL TO;Sm;0;ON;;;;;Y;;;;;
-2AD3;SUBSET ABOVE SUPERSET;Sm;0;ON;;;;;Y;;;;;
-2AD4;SUPERSET ABOVE SUBSET;Sm;0;ON;;;;;Y;;;;;
-2AD5;SUBSET ABOVE SUBSET;Sm;0;ON;;;;;Y;;;;;
-2AD6;SUPERSET ABOVE SUPERSET;Sm;0;ON;;;;;Y;;;;;
-2AD7;SUPERSET BESIDE SUBSET;Sm;0;ON;;;;;N;;;;;
-2AD8;SUPERSET BESIDE AND JOINED BY DASH WITH SUBSET;Sm;0;ON;;;;;N;;;;;
-2AD9;ELEMENT OF OPENING DOWNWARDS;Sm;0;ON;;;;;N;;;;;
-2ADA;PITCHFORK WITH TEE TOP;Sm;0;ON;;;;;N;;;;;
-2ADB;TRANSVERSAL INTERSECTION;Sm;0;ON;;;;;N;;;;;
-2ADC;FORKING;Sm;0;ON;2ADD 0338;;;;Y;;not independent;;;
-2ADD;NONFORKING;Sm;0;ON;;;;;N;;independent;;;
-2ADE;SHORT LEFT TACK;Sm;0;ON;;;;;Y;;;;;
-2ADF;SHORT DOWN TACK;Sm;0;ON;;;;;N;;;;;
-2AE0;SHORT UP TACK;Sm;0;ON;;;;;N;;;;;
-2AE1;PERPENDICULAR WITH S;Sm;0;ON;;;;;N;;;;;
-2AE2;VERTICAL BAR TRIPLE RIGHT TURNSTILE;Sm;0;ON;;;;;Y;;;;;
-2AE3;DOUBLE VERTICAL BAR LEFT TURNSTILE;Sm;0;ON;;;;;Y;;;;;
-2AE4;VERTICAL BAR DOUBLE LEFT TURNSTILE;Sm;0;ON;;;;;Y;;;;;
-2AE5;DOUBLE VERTICAL BAR DOUBLE LEFT TURNSTILE;Sm;0;ON;;;;;Y;;;;;
-2AE6;LONG DASH FROM LEFT MEMBER OF DOUBLE VERTICAL;Sm;0;ON;;;;;Y;;;;;
-2AE7;SHORT DOWN TACK WITH OVERBAR;Sm;0;ON;;;;;N;;;;;
-2AE8;SHORT UP TACK WITH UNDERBAR;Sm;0;ON;;;;;N;;;;;
-2AE9;SHORT UP TACK ABOVE SHORT DOWN TACK;Sm;0;ON;;;;;N;;;;;
-2AEA;DOUBLE DOWN TACK;Sm;0;ON;;;;;N;;;;;
-2AEB;DOUBLE UP TACK;Sm;0;ON;;;;;N;;;;;
-2AEC;DOUBLE STROKE NOT SIGN;Sm;0;ON;;;;;Y;;;;;
-2AED;REVERSED DOUBLE STROKE NOT SIGN;Sm;0;ON;;;;;Y;;;;;
-2AEE;DOES NOT DIVIDE WITH REVERSED NEGATION SLASH;Sm;0;ON;;;;;Y;;;;;
-2AEF;VERTICAL LINE WITH CIRCLE ABOVE;Sm;0;ON;;;;;N;;;;;
-2AF0;VERTICAL LINE WITH CIRCLE BELOW;Sm;0;ON;;;;;N;;;;;
-2AF1;DOWN TACK WITH CIRCLE BELOW;Sm;0;ON;;;;;N;;;;;
-2AF2;PARALLEL WITH HORIZONTAL STROKE;Sm;0;ON;;;;;N;;;;;
-2AF3;PARALLEL WITH TILDE OPERATOR;Sm;0;ON;;;;;Y;;;;;
-2AF4;TRIPLE VERTICAL BAR BINARY RELATION;Sm;0;ON;;;;;N;;;;;
-2AF5;TRIPLE VERTICAL BAR WITH HORIZONTAL STROKE;Sm;0;ON;;;;;N;;;;;
-2AF6;TRIPLE COLON OPERATOR;Sm;0;ON;;;;;N;;;;;
-2AF7;TRIPLE NESTED LESS-THAN;Sm;0;ON;;;;;Y;;;;;
-2AF8;TRIPLE NESTED GREATER-THAN;Sm;0;ON;;;;;Y;;;;;
-2AF9;DOUBLE-LINE SLANTED LESS-THAN OR EQUAL TO;Sm;0;ON;;;;;Y;;;;;
-2AFA;DOUBLE-LINE SLANTED GREATER-THAN OR EQUAL TO;Sm;0;ON;;;;;Y;;;;;
-2AFB;TRIPLE SOLIDUS BINARY RELATION;Sm;0;ON;;;;;Y;;;;;
-2AFC;LARGE TRIPLE VERTICAL BAR OPERATOR;Sm;0;ON;;;;;N;;;;;
-2AFD;DOUBLE SOLIDUS OPERATOR;Sm;0;ON;;;;;Y;;;;;
-2AFE;WHITE VERTICAL BAR;Sm;0;ON;;;;;N;;;;;
-2AFF;N-ARY WHITE VERTICAL BAR;Sm;0;ON;;;;;N;;;;;
-2B00;NORTH EAST WHITE ARROW;So;0;ON;;;;;N;;;;;
-2B01;NORTH WEST WHITE ARROW;So;0;ON;;;;;N;;;;;
-2B02;SOUTH EAST WHITE ARROW;So;0;ON;;;;;N;;;;;
-2B03;SOUTH WEST WHITE ARROW;So;0;ON;;;;;N;;;;;
-2B04;LEFT RIGHT WHITE ARROW;So;0;ON;;;;;N;;;;;
-2B05;LEFTWARDS BLACK ARROW;So;0;ON;;;;;N;;;;;
-2B06;UPWARDS BLACK ARROW;So;0;ON;;;;;N;;;;;
-2B07;DOWNWARDS BLACK ARROW;So;0;ON;;;;;N;;;;;
-2B08;NORTH EAST BLACK ARROW;So;0;ON;;;;;N;;;;;
-2B09;NORTH WEST BLACK ARROW;So;0;ON;;;;;N;;;;;
-2B0A;SOUTH EAST BLACK ARROW;So;0;ON;;;;;N;;;;;
-2B0B;SOUTH WEST BLACK ARROW;So;0;ON;;;;;N;;;;;
-2B0C;LEFT RIGHT BLACK ARROW;So;0;ON;;;;;N;;;;;
-2B0D;UP DOWN BLACK ARROW;So;0;ON;;;;;N;;;;;
-2B0E;RIGHTWARDS ARROW WITH TIP DOWNWARDS;So;0;ON;;;;;N;;;;;
-2B0F;RIGHTWARDS ARROW WITH TIP UPWARDS;So;0;ON;;;;;N;;;;;
-2B10;LEFTWARDS ARROW WITH TIP DOWNWARDS;So;0;ON;;;;;N;;;;;
-2B11;LEFTWARDS ARROW WITH TIP UPWARDS;So;0;ON;;;;;N;;;;;
-2B12;SQUARE WITH TOP HALF BLACK;So;0;ON;;;;;N;;;;;
-2B13;SQUARE WITH BOTTOM HALF BLACK;So;0;ON;;;;;N;;;;;
-2B14;SQUARE WITH UPPER RIGHT DIAGONAL HALF BLACK;So;0;ON;;;;;N;;;;;
-2B15;SQUARE WITH LOWER LEFT DIAGONAL HALF BLACK;So;0;ON;;;;;N;;;;;
-2B16;DIAMOND WITH LEFT HALF BLACK;So;0;ON;;;;;N;;;;;
-2B17;DIAMOND WITH RIGHT HALF BLACK;So;0;ON;;;;;N;;;;;
-2B18;DIAMOND WITH TOP HALF BLACK;So;0;ON;;;;;N;;;;;
-2B19;DIAMOND WITH BOTTOM HALF BLACK;So;0;ON;;;;;N;;;;;
-2B1A;DOTTED SQUARE;So;0;ON;;;;;N;;;;;
-2B1B;BLACK LARGE SQUARE;So;0;ON;;;;;N;;;;;
-2B1C;WHITE LARGE SQUARE;So;0;ON;;;;;N;;;;;
-2B1D;BLACK VERY SMALL SQUARE;So;0;ON;;;;;N;;;;;
-2B1E;WHITE VERY SMALL SQUARE;So;0;ON;;;;;N;;;;;
-2B1F;BLACK PENTAGON;So;0;ON;;;;;N;;;;;
-2B20;WHITE PENTAGON;So;0;ON;;;;;N;;;;;
-2B21;WHITE HEXAGON;So;0;ON;;;;;N;;;;;
-2B22;BLACK HEXAGON;So;0;ON;;;;;N;;;;;
-2B23;HORIZONTAL BLACK HEXAGON;So;0;ON;;;;;N;;;;;
-2B24;BLACK LARGE CIRCLE;So;0;ON;;;;;N;;;;;
-2B25;BLACK MEDIUM DIAMOND;So;0;ON;;;;;N;;;;;
-2B26;WHITE MEDIUM DIAMOND;So;0;ON;;;;;N;;;;;
-2B27;BLACK MEDIUM LOZENGE;So;0;ON;;;;;N;;;;;
-2B28;WHITE MEDIUM LOZENGE;So;0;ON;;;;;N;;;;;
-2B29;BLACK SMALL DIAMOND;So;0;ON;;;;;N;;;;;
-2B2A;BLACK SMALL LOZENGE;So;0;ON;;;;;N;;;;;
-2B2B;WHITE SMALL LOZENGE;So;0;ON;;;;;N;;;;;
-2B2C;BLACK HORIZONTAL ELLIPSE;So;0;ON;;;;;N;;;;;
-2B2D;WHITE HORIZONTAL ELLIPSE;So;0;ON;;;;;N;;;;;
-2B2E;BLACK VERTICAL ELLIPSE;So;0;ON;;;;;N;;;;;
-2B2F;WHITE VERTICAL ELLIPSE;So;0;ON;;;;;N;;;;;
-2B30;LEFT ARROW WITH SMALL CIRCLE;Sm;0;ON;;;;;N;;;;;
-2B31;THREE LEFTWARDS ARROWS;Sm;0;ON;;;;;N;;;;;
-2B32;LEFT ARROW WITH CIRCLED PLUS;Sm;0;ON;;;;;N;;;;;
-2B33;LONG LEFTWARDS SQUIGGLE ARROW;Sm;0;ON;;;;;N;;;;;
-2B34;LEFTWARDS TWO-HEADED ARROW WITH VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
-2B35;LEFTWARDS TWO-HEADED ARROW WITH DOUBLE VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
-2B36;LEFTWARDS TWO-HEADED ARROW FROM BAR;Sm;0;ON;;;;;N;;;;;
-2B37;LEFTWARDS TWO-HEADED TRIPLE DASH ARROW;Sm;0;ON;;;;;N;;;;;
-2B38;LEFTWARDS ARROW WITH DOTTED STEM;Sm;0;ON;;;;;N;;;;;
-2B39;LEFTWARDS ARROW WITH TAIL WITH VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
-2B3A;LEFTWARDS ARROW WITH TAIL WITH DOUBLE VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
-2B3B;LEFTWARDS TWO-HEADED ARROW WITH TAIL;Sm;0;ON;;;;;N;;;;;
-2B3C;LEFTWARDS TWO-HEADED ARROW WITH TAIL WITH VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
-2B3D;LEFTWARDS TWO-HEADED ARROW WITH TAIL WITH DOUBLE VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
-2B3E;LEFTWARDS ARROW THROUGH X;Sm;0;ON;;;;;N;;;;;
-2B3F;WAVE ARROW POINTING DIRECTLY LEFT;Sm;0;ON;;;;;N;;;;;
-2B40;EQUALS SIGN ABOVE LEFTWARDS ARROW;Sm;0;ON;;;;;N;;;;;
-2B41;REVERSE TILDE OPERATOR ABOVE LEFTWARDS ARROW;Sm;0;ON;;;;;N;;;;;
-2B42;LEFTWARDS ARROW ABOVE REVERSE ALMOST EQUAL TO;Sm;0;ON;;;;;N;;;;;
-2B43;RIGHTWARDS ARROW THROUGH GREATER-THAN;Sm;0;ON;;;;;N;;;;;
-2B44;RIGHTWARDS ARROW THROUGH SUPERSET;Sm;0;ON;;;;;N;;;;;
-2B45;LEFTWARDS QUADRUPLE ARROW;So;0;ON;;;;;N;;;;;
-2B46;RIGHTWARDS QUADRUPLE ARROW;So;0;ON;;;;;N;;;;;
-2B47;REVERSE TILDE OPERATOR ABOVE RIGHTWARDS ARROW;Sm;0;ON;;;;;N;;;;;
-2B48;RIGHTWARDS ARROW ABOVE REVERSE ALMOST EQUAL TO;Sm;0;ON;;;;;N;;;;;
-2B49;TILDE OPERATOR ABOVE LEFTWARDS ARROW;Sm;0;ON;;;;;N;;;;;
-2B4A;LEFTWARDS ARROW ABOVE ALMOST EQUAL TO;Sm;0;ON;;;;;N;;;;;
-2B4B;LEFTWARDS ARROW ABOVE REVERSE TILDE OPERATOR;Sm;0;ON;;;;;N;;;;;
-2B4C;RIGHTWARDS ARROW ABOVE REVERSE TILDE OPERATOR;Sm;0;ON;;;;;N;;;;;
-2B50;WHITE MEDIUM STAR;So;0;ON;;;;;N;;;;;
-2B51;BLACK SMALL STAR;So;0;ON;;;;;N;;;;;
-2B52;WHITE SMALL STAR;So;0;ON;;;;;N;;;;;
-2B53;BLACK RIGHT-POINTING PENTAGON;So;0;ON;;;;;N;;;;;
-2B54;WHITE RIGHT-POINTING PENTAGON;So;0;ON;;;;;N;;;;;
-2C00;GLAGOLITIC CAPITAL LETTER AZU;Lu;0;L;;;;;N;;;;2C30;
-2C01;GLAGOLITIC CAPITAL LETTER BUKY;Lu;0;L;;;;;N;;;;2C31;
-2C02;GLAGOLITIC CAPITAL LETTER VEDE;Lu;0;L;;;;;N;;;;2C32;
-2C03;GLAGOLITIC CAPITAL LETTER GLAGOLI;Lu;0;L;;;;;N;;;;2C33;
-2C04;GLAGOLITIC CAPITAL LETTER DOBRO;Lu;0;L;;;;;N;;;;2C34;
-2C05;GLAGOLITIC CAPITAL LETTER YESTU;Lu;0;L;;;;;N;;;;2C35;
-2C06;GLAGOLITIC CAPITAL LETTER ZHIVETE;Lu;0;L;;;;;N;;;;2C36;
-2C07;GLAGOLITIC CAPITAL LETTER DZELO;Lu;0;L;;;;;N;;;;2C37;
-2C08;GLAGOLITIC CAPITAL LETTER ZEMLJA;Lu;0;L;;;;;N;;;;2C38;
-2C09;GLAGOLITIC CAPITAL LETTER IZHE;Lu;0;L;;;;;N;;;;2C39;
-2C0A;GLAGOLITIC CAPITAL LETTER INITIAL IZHE;Lu;0;L;;;;;N;;;;2C3A;
-2C0B;GLAGOLITIC CAPITAL LETTER I;Lu;0;L;;;;;N;;;;2C3B;
-2C0C;GLAGOLITIC CAPITAL LETTER DJERVI;Lu;0;L;;;;;N;;;;2C3C;
-2C0D;GLAGOLITIC CAPITAL LETTER KAKO;Lu;0;L;;;;;N;;;;2C3D;
-2C0E;GLAGOLITIC CAPITAL LETTER LJUDIJE;Lu;0;L;;;;;N;;;;2C3E;
-2C0F;GLAGOLITIC CAPITAL LETTER MYSLITE;Lu;0;L;;;;;N;;;;2C3F;
-2C10;GLAGOLITIC CAPITAL LETTER NASHI;Lu;0;L;;;;;N;;;;2C40;
-2C11;GLAGOLITIC CAPITAL LETTER ONU;Lu;0;L;;;;;N;;;;2C41;
-2C12;GLAGOLITIC CAPITAL LETTER POKOJI;Lu;0;L;;;;;N;;;;2C42;
-2C13;GLAGOLITIC CAPITAL LETTER RITSI;Lu;0;L;;;;;N;;;;2C43;
-2C14;GLAGOLITIC CAPITAL LETTER SLOVO;Lu;0;L;;;;;N;;;;2C44;
-2C15;GLAGOLITIC CAPITAL LETTER TVRIDO;Lu;0;L;;;;;N;;;;2C45;
-2C16;GLAGOLITIC CAPITAL LETTER UKU;Lu;0;L;;;;;N;;;;2C46;
-2C17;GLAGOLITIC CAPITAL LETTER FRITU;Lu;0;L;;;;;N;;;;2C47;
-2C18;GLAGOLITIC CAPITAL LETTER HERU;Lu;0;L;;;;;N;;;;2C48;
-2C19;GLAGOLITIC CAPITAL LETTER OTU;Lu;0;L;;;;;N;;;;2C49;
-2C1A;GLAGOLITIC CAPITAL LETTER PE;Lu;0;L;;;;;N;;;;2C4A;
-2C1B;GLAGOLITIC CAPITAL LETTER SHTA;Lu;0;L;;;;;N;;;;2C4B;
-2C1C;GLAGOLITIC CAPITAL LETTER TSI;Lu;0;L;;;;;N;;;;2C4C;
-2C1D;GLAGOLITIC CAPITAL LETTER CHRIVI;Lu;0;L;;;;;N;;;;2C4D;
-2C1E;GLAGOLITIC CAPITAL LETTER SHA;Lu;0;L;;;;;N;;;;2C4E;
-2C1F;GLAGOLITIC CAPITAL LETTER YERU;Lu;0;L;;;;;N;;;;2C4F;
-2C20;GLAGOLITIC CAPITAL LETTER YERI;Lu;0;L;;;;;N;;;;2C50;
-2C21;GLAGOLITIC CAPITAL LETTER YATI;Lu;0;L;;;;;N;;;;2C51;
-2C22;GLAGOLITIC CAPITAL LETTER SPIDERY HA;Lu;0;L;;;;;N;;;;2C52;
-2C23;GLAGOLITIC CAPITAL LETTER YU;Lu;0;L;;;;;N;;;;2C53;
-2C24;GLAGOLITIC CAPITAL LETTER SMALL YUS;Lu;0;L;;;;;N;;;;2C54;
-2C25;GLAGOLITIC CAPITAL LETTER SMALL YUS WITH TAIL;Lu;0;L;;;;;N;;;;2C55;
-2C26;GLAGOLITIC CAPITAL LETTER YO;Lu;0;L;;;;;N;;;;2C56;
-2C27;GLAGOLITIC CAPITAL LETTER IOTATED SMALL YUS;Lu;0;L;;;;;N;;;;2C57;
-2C28;GLAGOLITIC CAPITAL LETTER BIG YUS;Lu;0;L;;;;;N;;;;2C58;
-2C29;GLAGOLITIC CAPITAL LETTER IOTATED BIG YUS;Lu;0;L;;;;;N;;;;2C59;
-2C2A;GLAGOLITIC CAPITAL LETTER FITA;Lu;0;L;;;;;N;;;;2C5A;
-2C2B;GLAGOLITIC CAPITAL LETTER IZHITSA;Lu;0;L;;;;;N;;;;2C5B;
-2C2C;GLAGOLITIC CAPITAL LETTER SHTAPIC;Lu;0;L;;;;;N;;;;2C5C;
-2C2D;GLAGOLITIC CAPITAL LETTER TROKUTASTI A;Lu;0;L;;;;;N;;;;2C5D;
-2C2E;GLAGOLITIC CAPITAL LETTER LATINATE MYSLITE;Lu;0;L;;;;;N;;;;2C5E;
-2C30;GLAGOLITIC SMALL LETTER AZU;Ll;0;L;;;;;N;;;2C00;;2C00
-2C31;GLAGOLITIC SMALL LETTER BUKY;Ll;0;L;;;;;N;;;2C01;;2C01
-2C32;GLAGOLITIC SMALL LETTER VEDE;Ll;0;L;;;;;N;;;2C02;;2C02
-2C33;GLAGOLITIC SMALL LETTER GLAGOLI;Ll;0;L;;;;;N;;;2C03;;2C03
-2C34;GLAGOLITIC SMALL LETTER DOBRO;Ll;0;L;;;;;N;;;2C04;;2C04
-2C35;GLAGOLITIC SMALL LETTER YESTU;Ll;0;L;;;;;N;;;2C05;;2C05
-2C36;GLAGOLITIC SMALL LETTER ZHIVETE;Ll;0;L;;;;;N;;;2C06;;2C06
-2C37;GLAGOLITIC SMALL LETTER DZELO;Ll;0;L;;;;;N;;;2C07;;2C07
-2C38;GLAGOLITIC SMALL LETTER ZEMLJA;Ll;0;L;;;;;N;;;2C08;;2C08
-2C39;GLAGOLITIC SMALL LETTER IZHE;Ll;0;L;;;;;N;;;2C09;;2C09
-2C3A;GLAGOLITIC SMALL LETTER INITIAL IZHE;Ll;0;L;;;;;N;;;2C0A;;2C0A
-2C3B;GLAGOLITIC SMALL LETTER I;Ll;0;L;;;;;N;;;2C0B;;2C0B
-2C3C;GLAGOLITIC SMALL LETTER DJERVI;Ll;0;L;;;;;N;;;2C0C;;2C0C
-2C3D;GLAGOLITIC SMALL LETTER KAKO;Ll;0;L;;;;;N;;;2C0D;;2C0D
-2C3E;GLAGOLITIC SMALL LETTER LJUDIJE;Ll;0;L;;;;;N;;;2C0E;;2C0E
-2C3F;GLAGOLITIC SMALL LETTER MYSLITE;Ll;0;L;;;;;N;;;2C0F;;2C0F
-2C40;GLAGOLITIC SMALL LETTER NASHI;Ll;0;L;;;;;N;;;2C10;;2C10
-2C41;GLAGOLITIC SMALL LETTER ONU;Ll;0;L;;;;;N;;;2C11;;2C11
-2C42;GLAGOLITIC SMALL LETTER POKOJI;Ll;0;L;;;;;N;;;2C12;;2C12
-2C43;GLAGOLITIC SMALL LETTER RITSI;Ll;0;L;;;;;N;;;2C13;;2C13
-2C44;GLAGOLITIC SMALL LETTER SLOVO;Ll;0;L;;;;;N;;;2C14;;2C14
-2C45;GLAGOLITIC SMALL LETTER TVRIDO;Ll;0;L;;;;;N;;;2C15;;2C15
-2C46;GLAGOLITIC SMALL LETTER UKU;Ll;0;L;;;;;N;;;2C16;;2C16
-2C47;GLAGOLITIC SMALL LETTER FRITU;Ll;0;L;;;;;N;;;2C17;;2C17
-2C48;GLAGOLITIC SMALL LETTER HERU;Ll;0;L;;;;;N;;;2C18;;2C18
-2C49;GLAGOLITIC SMALL LETTER OTU;Ll;0;L;;;;;N;;;2C19;;2C19
-2C4A;GLAGOLITIC SMALL LETTER PE;Ll;0;L;;;;;N;;;2C1A;;2C1A
-2C4B;GLAGOLITIC SMALL LETTER SHTA;Ll;0;L;;;;;N;;;2C1B;;2C1B
-2C4C;GLAGOLITIC SMALL LETTER TSI;Ll;0;L;;;;;N;;;2C1C;;2C1C
-2C4D;GLAGOLITIC SMALL LETTER CHRIVI;Ll;0;L;;;;;N;;;2C1D;;2C1D
-2C4E;GLAGOLITIC SMALL LETTER SHA;Ll;0;L;;;;;N;;;2C1E;;2C1E
-2C4F;GLAGOLITIC SMALL LETTER YERU;Ll;0;L;;;;;N;;;2C1F;;2C1F
-2C50;GLAGOLITIC SMALL LETTER YERI;Ll;0;L;;;;;N;;;2C20;;2C20
-2C51;GLAGOLITIC SMALL LETTER YATI;Ll;0;L;;;;;N;;;2C21;;2C21
-2C52;GLAGOLITIC SMALL LETTER SPIDERY HA;Ll;0;L;;;;;N;;;2C22;;2C22
-2C53;GLAGOLITIC SMALL LETTER YU;Ll;0;L;;;;;N;;;2C23;;2C23
-2C54;GLAGOLITIC SMALL LETTER SMALL YUS;Ll;0;L;;;;;N;;;2C24;;2C24
-2C55;GLAGOLITIC SMALL LETTER SMALL YUS WITH TAIL;Ll;0;L;;;;;N;;;2C25;;2C25
-2C56;GLAGOLITIC SMALL LETTER YO;Ll;0;L;;;;;N;;;2C26;;2C26
-2C57;GLAGOLITIC SMALL LETTER IOTATED SMALL YUS;Ll;0;L;;;;;N;;;2C27;;2C27
-2C58;GLAGOLITIC SMALL LETTER BIG YUS;Ll;0;L;;;;;N;;;2C28;;2C28
-2C59;GLAGOLITIC SMALL LETTER IOTATED BIG YUS;Ll;0;L;;;;;N;;;2C29;;2C29
-2C5A;GLAGOLITIC SMALL LETTER FITA;Ll;0;L;;;;;N;;;2C2A;;2C2A
-2C5B;GLAGOLITIC SMALL LETTER IZHITSA;Ll;0;L;;;;;N;;;2C2B;;2C2B
-2C5C;GLAGOLITIC SMALL LETTER SHTAPIC;Ll;0;L;;;;;N;;;2C2C;;2C2C
-2C5D;GLAGOLITIC SMALL LETTER TROKUTASTI A;Ll;0;L;;;;;N;;;2C2D;;2C2D
-2C5E;GLAGOLITIC SMALL LETTER LATINATE MYSLITE;Ll;0;L;;;;;N;;;2C2E;;2C2E
-2C60;LATIN CAPITAL LETTER L WITH DOUBLE BAR;Lu;0;L;;;;;N;;;;2C61;
-2C61;LATIN SMALL LETTER L WITH DOUBLE BAR;Ll;0;L;;;;;N;;;2C60;;2C60
-2C62;LATIN CAPITAL LETTER L WITH MIDDLE TILDE;Lu;0;L;;;;;N;;;;026B;
-2C63;LATIN CAPITAL LETTER P WITH STROKE;Lu;0;L;;;;;N;;;;1D7D;
-2C64;LATIN CAPITAL LETTER R WITH TAIL;Lu;0;L;;;;;N;;;;027D;
-2C65;LATIN SMALL LETTER A WITH STROKE;Ll;0;L;;;;;N;;;023A;;023A
-2C66;LATIN SMALL LETTER T WITH DIAGONAL STROKE;Ll;0;L;;;;;N;;;023E;;023E
-2C67;LATIN CAPITAL LETTER H WITH DESCENDER;Lu;0;L;;;;;N;;;;2C68;
-2C68;LATIN SMALL LETTER H WITH DESCENDER;Ll;0;L;;;;;N;;;2C67;;2C67
-2C69;LATIN CAPITAL LETTER K WITH DESCENDER;Lu;0;L;;;;;N;;;;2C6A;
-2C6A;LATIN SMALL LETTER K WITH DESCENDER;Ll;0;L;;;;;N;;;2C69;;2C69
-2C6B;LATIN CAPITAL LETTER Z WITH DESCENDER;Lu;0;L;;;;;N;;;;2C6C;
-2C6C;LATIN SMALL LETTER Z WITH DESCENDER;Ll;0;L;;;;;N;;;2C6B;;2C6B
-2C6D;LATIN CAPITAL LETTER ALPHA;Lu;0;L;;;;;N;;;;0251;
-2C6E;LATIN CAPITAL LETTER M WITH HOOK;Lu;0;L;;;;;N;;;;0271;
-2C6F;LATIN CAPITAL LETTER TURNED A;Lu;0;L;;;;;N;;;;0250;
-2C71;LATIN SMALL LETTER V WITH RIGHT HOOK;Ll;0;L;;;;;N;;;;;
-2C72;LATIN CAPITAL LETTER W WITH HOOK;Lu;0;L;;;;;N;;;;2C73;
-2C73;LATIN SMALL LETTER W WITH HOOK;Ll;0;L;;;;;N;;;2C72;;2C72
-2C74;LATIN SMALL LETTER V WITH CURL;Ll;0;L;;;;;N;;;;;
-2C75;LATIN CAPITAL LETTER HALF H;Lu;0;L;;;;;N;;;;2C76;
-2C76;LATIN SMALL LETTER HALF H;Ll;0;L;;;;;N;;;2C75;;2C75
-2C77;LATIN SMALL LETTER TAILLESS PHI;Ll;0;L;;;;;N;;;;;
-2C78;LATIN SMALL LETTER E WITH NOTCH;Ll;0;L;;;;;N;;;;;
-2C79;LATIN SMALL LETTER TURNED R WITH TAIL;Ll;0;L;;;;;N;;;;;
-2C7A;LATIN SMALL LETTER O WITH LOW RING INSIDE;Ll;0;L;;;;;N;;;;;
-2C7B;LATIN LETTER SMALL CAPITAL TURNED E;Ll;0;L;;;;;N;;;;;
-2C7C;LATIN SUBSCRIPT SMALL LETTER J;Ll;0;L;<sub> 006A;;;;N;;;;;
-2C7D;MODIFIER LETTER CAPITAL V;Lm;0;L;<super> 0056;;;;N;;;;;
-2C80;COPTIC CAPITAL LETTER ALFA;Lu;0;L;;;;;N;;;;2C81;
-2C81;COPTIC SMALL LETTER ALFA;Ll;0;L;;;;;N;;;2C80;;2C80
-2C82;COPTIC CAPITAL LETTER VIDA;Lu;0;L;;;;;N;;;;2C83;
-2C83;COPTIC SMALL LETTER VIDA;Ll;0;L;;;;;N;;;2C82;;2C82
-2C84;COPTIC CAPITAL LETTER GAMMA;Lu;0;L;;;;;N;;;;2C85;
-2C85;COPTIC SMALL LETTER GAMMA;Ll;0;L;;;;;N;;;2C84;;2C84
-2C86;COPTIC CAPITAL LETTER DALDA;Lu;0;L;;;;;N;;;;2C87;
-2C87;COPTIC SMALL LETTER DALDA;Ll;0;L;;;;;N;;;2C86;;2C86
-2C88;COPTIC CAPITAL LETTER EIE;Lu;0;L;;;;;N;;;;2C89;
-2C89;COPTIC SMALL LETTER EIE;Ll;0;L;;;;;N;;;2C88;;2C88
-2C8A;COPTIC CAPITAL LETTER SOU;Lu;0;L;;;;;N;;;;2C8B;
-2C8B;COPTIC SMALL LETTER SOU;Ll;0;L;;;;;N;;;2C8A;;2C8A
-2C8C;COPTIC CAPITAL LETTER ZATA;Lu;0;L;;;;;N;;;;2C8D;
-2C8D;COPTIC SMALL LETTER ZATA;Ll;0;L;;;;;N;;;2C8C;;2C8C
-2C8E;COPTIC CAPITAL LETTER HATE;Lu;0;L;;;;;N;;;;2C8F;
-2C8F;COPTIC SMALL LETTER HATE;Ll;0;L;;;;;N;;;2C8E;;2C8E
-2C90;COPTIC CAPITAL LETTER THETHE;Lu;0;L;;;;;N;;;;2C91;
-2C91;COPTIC SMALL LETTER THETHE;Ll;0;L;;;;;N;;;2C90;;2C90
-2C92;COPTIC CAPITAL LETTER IAUDA;Lu;0;L;;;;;N;;;;2C93;
-2C93;COPTIC SMALL LETTER IAUDA;Ll;0;L;;;;;N;;;2C92;;2C92
-2C94;COPTIC CAPITAL LETTER KAPA;Lu;0;L;;;;;N;;;;2C95;
-2C95;COPTIC SMALL LETTER KAPA;Ll;0;L;;;;;N;;;2C94;;2C94
-2C96;COPTIC CAPITAL LETTER LAULA;Lu;0;L;;;;;N;;;;2C97;
-2C97;COPTIC SMALL LETTER LAULA;Ll;0;L;;;;;N;;;2C96;;2C96
-2C98;COPTIC CAPITAL LETTER MI;Lu;0;L;;;;;N;;;;2C99;
-2C99;COPTIC SMALL LETTER MI;Ll;0;L;;;;;N;;;2C98;;2C98
-2C9A;COPTIC CAPITAL LETTER NI;Lu;0;L;;;;;N;;;;2C9B;
-2C9B;COPTIC SMALL LETTER NI;Ll;0;L;;;;;N;;;2C9A;;2C9A
-2C9C;COPTIC CAPITAL LETTER KSI;Lu;0;L;;;;;N;;;;2C9D;
-2C9D;COPTIC SMALL LETTER KSI;Ll;0;L;;;;;N;;;2C9C;;2C9C
-2C9E;COPTIC CAPITAL LETTER O;Lu;0;L;;;;;N;;;;2C9F;
-2C9F;COPTIC SMALL LETTER O;Ll;0;L;;;;;N;;;2C9E;;2C9E
-2CA0;COPTIC CAPITAL LETTER PI;Lu;0;L;;;;;N;;;;2CA1;
-2CA1;COPTIC SMALL LETTER PI;Ll;0;L;;;;;N;;;2CA0;;2CA0
-2CA2;COPTIC CAPITAL LETTER RO;Lu;0;L;;;;;N;;;;2CA3;
-2CA3;COPTIC SMALL LETTER RO;Ll;0;L;;;;;N;;;2CA2;;2CA2
-2CA4;COPTIC CAPITAL LETTER SIMA;Lu;0;L;;;;;N;;;;2CA5;
-2CA5;COPTIC SMALL LETTER SIMA;Ll;0;L;;;;;N;;;2CA4;;2CA4
-2CA6;COPTIC CAPITAL LETTER TAU;Lu;0;L;;;;;N;;;;2CA7;
-2CA7;COPTIC SMALL LETTER TAU;Ll;0;L;;;;;N;;;2CA6;;2CA6
-2CA8;COPTIC CAPITAL LETTER UA;Lu;0;L;;;;;N;;;;2CA9;
-2CA9;COPTIC SMALL LETTER UA;Ll;0;L;;;;;N;;;2CA8;;2CA8
-2CAA;COPTIC CAPITAL LETTER FI;Lu;0;L;;;;;N;;;;2CAB;
-2CAB;COPTIC SMALL LETTER FI;Ll;0;L;;;;;N;;;2CAA;;2CAA
-2CAC;COPTIC CAPITAL LETTER KHI;Lu;0;L;;;;;N;;;;2CAD;
-2CAD;COPTIC SMALL LETTER KHI;Ll;0;L;;;;;N;;;2CAC;;2CAC
-2CAE;COPTIC CAPITAL LETTER PSI;Lu;0;L;;;;;N;;;;2CAF;
-2CAF;COPTIC SMALL LETTER PSI;Ll;0;L;;;;;N;;;2CAE;;2CAE
-2CB0;COPTIC CAPITAL LETTER OOU;Lu;0;L;;;;;N;;;;2CB1;
-2CB1;COPTIC SMALL LETTER OOU;Ll;0;L;;;;;N;;;2CB0;;2CB0
-2CB2;COPTIC CAPITAL LETTER DIALECT-P ALEF;Lu;0;L;;;;;N;;;;2CB3;
-2CB3;COPTIC SMALL LETTER DIALECT-P ALEF;Ll;0;L;;;;;N;;;2CB2;;2CB2
-2CB4;COPTIC CAPITAL LETTER OLD COPTIC AIN;Lu;0;L;;;;;N;;;;2CB5;
-2CB5;COPTIC SMALL LETTER OLD COPTIC AIN;Ll;0;L;;;;;N;;;2CB4;;2CB4
-2CB6;COPTIC CAPITAL LETTER CRYPTOGRAMMIC EIE;Lu;0;L;;;;;N;;;;2CB7;
-2CB7;COPTIC SMALL LETTER CRYPTOGRAMMIC EIE;Ll;0;L;;;;;N;;;2CB6;;2CB6
-2CB8;COPTIC CAPITAL LETTER DIALECT-P KAPA;Lu;0;L;;;;;N;;;;2CB9;
-2CB9;COPTIC SMALL LETTER DIALECT-P KAPA;Ll;0;L;;;;;N;;;2CB8;;2CB8
-2CBA;COPTIC CAPITAL LETTER DIALECT-P NI;Lu;0;L;;;;;N;;;;2CBB;
-2CBB;COPTIC SMALL LETTER DIALECT-P NI;Ll;0;L;;;;;N;;;2CBA;;2CBA
-2CBC;COPTIC CAPITAL LETTER CRYPTOGRAMMIC NI;Lu;0;L;;;;;N;;;;2CBD;
-2CBD;COPTIC SMALL LETTER CRYPTOGRAMMIC NI;Ll;0;L;;;;;N;;;2CBC;;2CBC
-2CBE;COPTIC CAPITAL LETTER OLD COPTIC OOU;Lu;0;L;;;;;N;;;;2CBF;
-2CBF;COPTIC SMALL LETTER OLD COPTIC OOU;Ll;0;L;;;;;N;;;2CBE;;2CBE
-2CC0;COPTIC CAPITAL LETTER SAMPI;Lu;0;L;;;;;N;;;;2CC1;
-2CC1;COPTIC SMALL LETTER SAMPI;Ll;0;L;;;;;N;;;2CC0;;2CC0
-2CC2;COPTIC CAPITAL LETTER CROSSED SHEI;Lu;0;L;;;;;N;;;;2CC3;
-2CC3;COPTIC SMALL LETTER CROSSED SHEI;Ll;0;L;;;;;N;;;2CC2;;2CC2
-2CC4;COPTIC CAPITAL LETTER OLD COPTIC SHEI;Lu;0;L;;;;;N;;;;2CC5;
-2CC5;COPTIC SMALL LETTER OLD COPTIC SHEI;Ll;0;L;;;;;N;;;2CC4;;2CC4
-2CC6;COPTIC CAPITAL LETTER OLD COPTIC ESH;Lu;0;L;;;;;N;;;;2CC7;
-2CC7;COPTIC SMALL LETTER OLD COPTIC ESH;Ll;0;L;;;;;N;;;2CC6;;2CC6
-2CC8;COPTIC CAPITAL LETTER AKHMIMIC KHEI;Lu;0;L;;;;;N;;;;2CC9;
-2CC9;COPTIC SMALL LETTER AKHMIMIC KHEI;Ll;0;L;;;;;N;;;2CC8;;2CC8
-2CCA;COPTIC CAPITAL LETTER DIALECT-P HORI;Lu;0;L;;;;;N;;;;2CCB;
-2CCB;COPTIC SMALL LETTER DIALECT-P HORI;Ll;0;L;;;;;N;;;2CCA;;2CCA
-2CCC;COPTIC CAPITAL LETTER OLD COPTIC HORI;Lu;0;L;;;;;N;;;;2CCD;
-2CCD;COPTIC SMALL LETTER OLD COPTIC HORI;Ll;0;L;;;;;N;;;2CCC;;2CCC
-2CCE;COPTIC CAPITAL LETTER OLD COPTIC HA;Lu;0;L;;;;;N;;;;2CCF;
-2CCF;COPTIC SMALL LETTER OLD COPTIC HA;Ll;0;L;;;;;N;;;2CCE;;2CCE
-2CD0;COPTIC CAPITAL LETTER L-SHAPED HA;Lu;0;L;;;;;N;;;;2CD1;
-2CD1;COPTIC SMALL LETTER L-SHAPED HA;Ll;0;L;;;;;N;;;2CD0;;2CD0
-2CD2;COPTIC CAPITAL LETTER OLD COPTIC HEI;Lu;0;L;;;;;N;;;;2CD3;
-2CD3;COPTIC SMALL LETTER OLD COPTIC HEI;Ll;0;L;;;;;N;;;2CD2;;2CD2
-2CD4;COPTIC CAPITAL LETTER OLD COPTIC HAT;Lu;0;L;;;;;N;;;;2CD5;
-2CD5;COPTIC SMALL LETTER OLD COPTIC HAT;Ll;0;L;;;;;N;;;2CD4;;2CD4
-2CD6;COPTIC CAPITAL LETTER OLD COPTIC GANGIA;Lu;0;L;;;;;N;;;;2CD7;
-2CD7;COPTIC SMALL LETTER OLD COPTIC GANGIA;Ll;0;L;;;;;N;;;2CD6;;2CD6
-2CD8;COPTIC CAPITAL LETTER OLD COPTIC DJA;Lu;0;L;;;;;N;;;;2CD9;
-2CD9;COPTIC SMALL LETTER OLD COPTIC DJA;Ll;0;L;;;;;N;;;2CD8;;2CD8
-2CDA;COPTIC CAPITAL LETTER OLD COPTIC SHIMA;Lu;0;L;;;;;N;;;;2CDB;
-2CDB;COPTIC SMALL LETTER OLD COPTIC SHIMA;Ll;0;L;;;;;N;;;2CDA;;2CDA
-2CDC;COPTIC CAPITAL LETTER OLD NUBIAN SHIMA;Lu;0;L;;;;;N;;;;2CDD;
-2CDD;COPTIC SMALL LETTER OLD NUBIAN SHIMA;Ll;0;L;;;;;N;;;2CDC;;2CDC
-2CDE;COPTIC CAPITAL LETTER OLD NUBIAN NGI;Lu;0;L;;;;;N;;;;2CDF;
-2CDF;COPTIC SMALL LETTER OLD NUBIAN NGI;Ll;0;L;;;;;N;;;2CDE;;2CDE
-2CE0;COPTIC CAPITAL LETTER OLD NUBIAN NYI;Lu;0;L;;;;;N;;;;2CE1;
-2CE1;COPTIC SMALL LETTER OLD NUBIAN NYI;Ll;0;L;;;;;N;;;2CE0;;2CE0
-2CE2;COPTIC CAPITAL LETTER OLD NUBIAN WAU;Lu;0;L;;;;;N;;;;2CE3;
-2CE3;COPTIC SMALL LETTER OLD NUBIAN WAU;Ll;0;L;;;;;N;;;2CE2;;2CE2
-2CE4;COPTIC SYMBOL KAI;Ll;0;L;;;;;N;;;;;
-2CE5;COPTIC SYMBOL MI RO;So;0;ON;;;;;N;;;;;
-2CE6;COPTIC SYMBOL PI RO;So;0;ON;;;;;N;;;;;
-2CE7;COPTIC SYMBOL STAUROS;So;0;ON;;;;;N;;;;;
-2CE8;COPTIC SYMBOL TAU RO;So;0;ON;;;;;N;;;;;
-2CE9;COPTIC SYMBOL KHI RO;So;0;ON;;;;;N;;;;;
-2CEA;COPTIC SYMBOL SHIMA SIMA;So;0;ON;;;;;N;;;;;
-2CF9;COPTIC OLD NUBIAN FULL STOP;Po;0;ON;;;;;N;;;;;
-2CFA;COPTIC OLD NUBIAN DIRECT QUESTION MARK;Po;0;ON;;;;;N;;;;;
-2CFB;COPTIC OLD NUBIAN INDIRECT QUESTION MARK;Po;0;ON;;;;;N;;;;;
-2CFC;COPTIC OLD NUBIAN VERSE DIVIDER;Po;0;ON;;;;;N;;;;;
-2CFD;COPTIC FRACTION ONE HALF;No;0;ON;;;;1/2;N;;;;;
-2CFE;COPTIC FULL STOP;Po;0;ON;;;;;N;;;;;
-2CFF;COPTIC MORPHOLOGICAL DIVIDER;Po;0;ON;;;;;N;;;;;
-2D00;GEORGIAN SMALL LETTER AN;Ll;0;L;;;;;N;;Khutsuri;10A0;;10A0
-2D01;GEORGIAN SMALL LETTER BAN;Ll;0;L;;;;;N;;Khutsuri;10A1;;10A1
-2D02;GEORGIAN SMALL LETTER GAN;Ll;0;L;;;;;N;;Khutsuri;10A2;;10A2
-2D03;GEORGIAN SMALL LETTER DON;Ll;0;L;;;;;N;;Khutsuri;10A3;;10A3
-2D04;GEORGIAN SMALL LETTER EN;Ll;0;L;;;;;N;;Khutsuri;10A4;;10A4
-2D05;GEORGIAN SMALL LETTER VIN;Ll;0;L;;;;;N;;Khutsuri;10A5;;10A5
-2D06;GEORGIAN SMALL LETTER ZEN;Ll;0;L;;;;;N;;Khutsuri;10A6;;10A6
-2D07;GEORGIAN SMALL LETTER TAN;Ll;0;L;;;;;N;;Khutsuri;10A7;;10A7
-2D08;GEORGIAN SMALL LETTER IN;Ll;0;L;;;;;N;;Khutsuri;10A8;;10A8
-2D09;GEORGIAN SMALL LETTER KAN;Ll;0;L;;;;;N;;Khutsuri;10A9;;10A9
-2D0A;GEORGIAN SMALL LETTER LAS;Ll;0;L;;;;;N;;Khutsuri;10AA;;10AA
-2D0B;GEORGIAN SMALL LETTER MAN;Ll;0;L;;;;;N;;Khutsuri;10AB;;10AB
-2D0C;GEORGIAN SMALL LETTER NAR;Ll;0;L;;;;;N;;Khutsuri;10AC;;10AC
-2D0D;GEORGIAN SMALL LETTER ON;Ll;0;L;;;;;N;;Khutsuri;10AD;;10AD
-2D0E;GEORGIAN SMALL LETTER PAR;Ll;0;L;;;;;N;;Khutsuri;10AE;;10AE
-2D0F;GEORGIAN SMALL LETTER ZHAR;Ll;0;L;;;;;N;;Khutsuri;10AF;;10AF
-2D10;GEORGIAN SMALL LETTER RAE;Ll;0;L;;;;;N;;Khutsuri;10B0;;10B0
-2D11;GEORGIAN SMALL LETTER SAN;Ll;0;L;;;;;N;;Khutsuri;10B1;;10B1
-2D12;GEORGIAN SMALL LETTER TAR;Ll;0;L;;;;;N;;Khutsuri;10B2;;10B2
-2D13;GEORGIAN SMALL LETTER UN;Ll;0;L;;;;;N;;Khutsuri;10B3;;10B3
-2D14;GEORGIAN SMALL LETTER PHAR;Ll;0;L;;;;;N;;Khutsuri;10B4;;10B4
-2D15;GEORGIAN SMALL LETTER KHAR;Ll;0;L;;;;;N;;Khutsuri;10B5;;10B5
-2D16;GEORGIAN SMALL LETTER GHAN;Ll;0;L;;;;;N;;Khutsuri;10B6;;10B6
-2D17;GEORGIAN SMALL LETTER QAR;Ll;0;L;;;;;N;;Khutsuri;10B7;;10B7
-2D18;GEORGIAN SMALL LETTER SHIN;Ll;0;L;;;;;N;;Khutsuri;10B8;;10B8
-2D19;GEORGIAN SMALL LETTER CHIN;Ll;0;L;;;;;N;;Khutsuri;10B9;;10B9
-2D1A;GEORGIAN SMALL LETTER CAN;Ll;0;L;;;;;N;;Khutsuri;10BA;;10BA
-2D1B;GEORGIAN SMALL LETTER JIL;Ll;0;L;;;;;N;;Khutsuri;10BB;;10BB
-2D1C;GEORGIAN SMALL LETTER CIL;Ll;0;L;;;;;N;;Khutsuri;10BC;;10BC
-2D1D;GEORGIAN SMALL LETTER CHAR;Ll;0;L;;;;;N;;Khutsuri;10BD;;10BD
-2D1E;GEORGIAN SMALL LETTER XAN;Ll;0;L;;;;;N;;Khutsuri;10BE;;10BE
-2D1F;GEORGIAN SMALL LETTER JHAN;Ll;0;L;;;;;N;;Khutsuri;10BF;;10BF
-2D20;GEORGIAN SMALL LETTER HAE;Ll;0;L;;;;;N;;Khutsuri;10C0;;10C0
-2D21;GEORGIAN SMALL LETTER HE;Ll;0;L;;;;;N;;Khutsuri;10C1;;10C1
-2D22;GEORGIAN SMALL LETTER HIE;Ll;0;L;;;;;N;;Khutsuri;10C2;;10C2
-2D23;GEORGIAN SMALL LETTER WE;Ll;0;L;;;;;N;;Khutsuri;10C3;;10C3
-2D24;GEORGIAN SMALL LETTER HAR;Ll;0;L;;;;;N;;Khutsuri;10C4;;10C4
-2D25;GEORGIAN SMALL LETTER HOE;Ll;0;L;;;;;N;;Khutsuri;10C5;;10C5
-2D30;TIFINAGH LETTER YA;Lo;0;L;;;;;N;;;;;
-2D31;TIFINAGH LETTER YAB;Lo;0;L;;;;;N;;;;;
-2D32;TIFINAGH LETTER YABH;Lo;0;L;;;;;N;;;;;
-2D33;TIFINAGH LETTER YAG;Lo;0;L;;;;;N;;;;;
-2D34;TIFINAGH LETTER YAGHH;Lo;0;L;;;;;N;;;;;
-2D35;TIFINAGH LETTER BERBER ACADEMY YAJ;Lo;0;L;;;;;N;;;;;
-2D36;TIFINAGH LETTER YAJ;Lo;0;L;;;;;N;;;;;
-2D37;TIFINAGH LETTER YAD;Lo;0;L;;;;;N;;;;;
-2D38;TIFINAGH LETTER YADH;Lo;0;L;;;;;N;;;;;
-2D39;TIFINAGH LETTER YADD;Lo;0;L;;;;;N;;;;;
-2D3A;TIFINAGH LETTER YADDH;Lo;0;L;;;;;N;;;;;
-2D3B;TIFINAGH LETTER YEY;Lo;0;L;;;;;N;;;;;
-2D3C;TIFINAGH LETTER YAF;Lo;0;L;;;;;N;;;;;
-2D3D;TIFINAGH LETTER YAK;Lo;0;L;;;;;N;;;;;
-2D3E;TIFINAGH LETTER TUAREG YAK;Lo;0;L;;;;;N;;;;;
-2D3F;TIFINAGH LETTER YAKHH;Lo;0;L;;;;;N;;;;;
-2D40;TIFINAGH LETTER YAH;Lo;0;L;;;;;N;;Tuareg yab;;;
-2D41;TIFINAGH LETTER BERBER ACADEMY YAH;Lo;0;L;;;;;N;;;;;
-2D42;TIFINAGH LETTER TUAREG YAH;Lo;0;L;;;;;N;;;;;
-2D43;TIFINAGH LETTER YAHH;Lo;0;L;;;;;N;;;;;
-2D44;TIFINAGH LETTER YAA;Lo;0;L;;;;;N;;;;;
-2D45;TIFINAGH LETTER YAKH;Lo;0;L;;;;;N;;;;;
-2D46;TIFINAGH LETTER TUAREG YAKH;Lo;0;L;;;;;N;;;;;
-2D47;TIFINAGH LETTER YAQ;Lo;0;L;;;;;N;;;;;
-2D48;TIFINAGH LETTER TUAREG YAQ;Lo;0;L;;;;;N;;;;;
-2D49;TIFINAGH LETTER YI;Lo;0;L;;;;;N;;;;;
-2D4A;TIFINAGH LETTER YAZH;Lo;0;L;;;;;N;;;;;
-2D4B;TIFINAGH LETTER AHAGGAR YAZH;Lo;0;L;;;;;N;;;;;
-2D4C;TIFINAGH LETTER TUAREG YAZH;Lo;0;L;;;;;N;;;;;
-2D4D;TIFINAGH LETTER YAL;Lo;0;L;;;;;N;;;;;
-2D4E;TIFINAGH LETTER YAM;Lo;0;L;;;;;N;;;;;
-2D4F;TIFINAGH LETTER YAN;Lo;0;L;;;;;N;;;;;
-2D50;TIFINAGH LETTER TUAREG YAGN;Lo;0;L;;;;;N;;;;;
-2D51;TIFINAGH LETTER TUAREG YANG;Lo;0;L;;;;;N;;;;;
-2D52;TIFINAGH LETTER YAP;Lo;0;L;;;;;N;;;;;
-2D53;TIFINAGH LETTER YU;Lo;0;L;;;;;N;;Tuareg yaw;;;
-2D54;TIFINAGH LETTER YAR;Lo;0;L;;;;;N;;;;;
-2D55;TIFINAGH LETTER YARR;Lo;0;L;;;;;N;;;;;
-2D56;TIFINAGH LETTER YAGH;Lo;0;L;;;;;N;;;;;
-2D57;TIFINAGH LETTER TUAREG YAGH;Lo;0;L;;;;;N;;;;;
-2D58;TIFINAGH LETTER AYER YAGH;Lo;0;L;;;;;N;;Adrar yaj;;;
-2D59;TIFINAGH LETTER YAS;Lo;0;L;;;;;N;;;;;
-2D5A;TIFINAGH LETTER YASS;Lo;0;L;;;;;N;;;;;
-2D5B;TIFINAGH LETTER YASH;Lo;0;L;;;;;N;;;;;
-2D5C;TIFINAGH LETTER YAT;Lo;0;L;;;;;N;;;;;
-2D5D;TIFINAGH LETTER YATH;Lo;0;L;;;;;N;;;;;
-2D5E;TIFINAGH LETTER YACH;Lo;0;L;;;;;N;;;;;
-2D5F;TIFINAGH LETTER YATT;Lo;0;L;;;;;N;;;;;
-2D60;TIFINAGH LETTER YAV;Lo;0;L;;;;;N;;;;;
-2D61;TIFINAGH LETTER YAW;Lo;0;L;;;;;N;;;;;
-2D62;TIFINAGH LETTER YAY;Lo;0;L;;;;;N;;;;;
-2D63;TIFINAGH LETTER YAZ;Lo;0;L;;;;;N;;;;;
-2D64;TIFINAGH LETTER TAWELLEMET YAZ;Lo;0;L;;;;;N;;harpoon yaz;;;
-2D65;TIFINAGH LETTER YAZZ;Lo;0;L;;;;;N;;;;;
-2D6F;TIFINAGH MODIFIER LETTER LABIALIZATION MARK;Lm;0;L;<super> 2D61;;;;N;;tamatart;;;
-2D80;ETHIOPIC SYLLABLE LOA;Lo;0;L;;;;;N;;;;;
-2D81;ETHIOPIC SYLLABLE MOA;Lo;0;L;;;;;N;;;;;
-2D82;ETHIOPIC SYLLABLE ROA;Lo;0;L;;;;;N;;;;;
-2D83;ETHIOPIC SYLLABLE SOA;Lo;0;L;;;;;N;;;;;
-2D84;ETHIOPIC SYLLABLE SHOA;Lo;0;L;;;;;N;;;;;
-2D85;ETHIOPIC SYLLABLE BOA;Lo;0;L;;;;;N;;;;;
-2D86;ETHIOPIC SYLLABLE TOA;Lo;0;L;;;;;N;;;;;
-2D87;ETHIOPIC SYLLABLE COA;Lo;0;L;;;;;N;;;;;
-2D88;ETHIOPIC SYLLABLE NOA;Lo;0;L;;;;;N;;;;;
-2D89;ETHIOPIC SYLLABLE NYOA;Lo;0;L;;;;;N;;;;;
-2D8A;ETHIOPIC SYLLABLE GLOTTAL OA;Lo;0;L;;;;;N;;;;;
-2D8B;ETHIOPIC SYLLABLE ZOA;Lo;0;L;;;;;N;;;;;
-2D8C;ETHIOPIC SYLLABLE DOA;Lo;0;L;;;;;N;;;;;
-2D8D;ETHIOPIC SYLLABLE DDOA;Lo;0;L;;;;;N;;;;;
-2D8E;ETHIOPIC SYLLABLE JOA;Lo;0;L;;;;;N;;;;;
-2D8F;ETHIOPIC SYLLABLE THOA;Lo;0;L;;;;;N;;;;;
-2D90;ETHIOPIC SYLLABLE CHOA;Lo;0;L;;;;;N;;;;;
-2D91;ETHIOPIC SYLLABLE PHOA;Lo;0;L;;;;;N;;;;;
-2D92;ETHIOPIC SYLLABLE POA;Lo;0;L;;;;;N;;;;;
-2D93;ETHIOPIC SYLLABLE GGWA;Lo;0;L;;;;;N;;;;;
-2D94;ETHIOPIC SYLLABLE GGWI;Lo;0;L;;;;;N;;;;;
-2D95;ETHIOPIC SYLLABLE GGWEE;Lo;0;L;;;;;N;;;;;
-2D96;ETHIOPIC SYLLABLE GGWE;Lo;0;L;;;;;N;;;;;
-2DA0;ETHIOPIC SYLLABLE SSA;Lo;0;L;;;;;N;;;;;
-2DA1;ETHIOPIC SYLLABLE SSU;Lo;0;L;;;;;N;;;;;
-2DA2;ETHIOPIC SYLLABLE SSI;Lo;0;L;;;;;N;;;;;
-2DA3;ETHIOPIC SYLLABLE SSAA;Lo;0;L;;;;;N;;;;;
-2DA4;ETHIOPIC SYLLABLE SSEE;Lo;0;L;;;;;N;;;;;
-2DA5;ETHIOPIC SYLLABLE SSE;Lo;0;L;;;;;N;;;;;
-2DA6;ETHIOPIC SYLLABLE SSO;Lo;0;L;;;;;N;;;;;
-2DA8;ETHIOPIC SYLLABLE CCA;Lo;0;L;;;;;N;;;;;
-2DA9;ETHIOPIC SYLLABLE CCU;Lo;0;L;;;;;N;;;;;
-2DAA;ETHIOPIC SYLLABLE CCI;Lo;0;L;;;;;N;;;;;
-2DAB;ETHIOPIC SYLLABLE CCAA;Lo;0;L;;;;;N;;;;;
-2DAC;ETHIOPIC SYLLABLE CCEE;Lo;0;L;;;;;N;;;;;
-2DAD;ETHIOPIC SYLLABLE CCE;Lo;0;L;;;;;N;;;;;
-2DAE;ETHIOPIC SYLLABLE CCO;Lo;0;L;;;;;N;;;;;
-2DB0;ETHIOPIC SYLLABLE ZZA;Lo;0;L;;;;;N;;;;;
-2DB1;ETHIOPIC SYLLABLE ZZU;Lo;0;L;;;;;N;;;;;
-2DB2;ETHIOPIC SYLLABLE ZZI;Lo;0;L;;;;;N;;;;;
-2DB3;ETHIOPIC SYLLABLE ZZAA;Lo;0;L;;;;;N;;;;;
-2DB4;ETHIOPIC SYLLABLE ZZEE;Lo;0;L;;;;;N;;;;;
-2DB5;ETHIOPIC SYLLABLE ZZE;Lo;0;L;;;;;N;;;;;
-2DB6;ETHIOPIC SYLLABLE ZZO;Lo;0;L;;;;;N;;;;;
-2DB8;ETHIOPIC SYLLABLE CCHA;Lo;0;L;;;;;N;;;;;
-2DB9;ETHIOPIC SYLLABLE CCHU;Lo;0;L;;;;;N;;;;;
-2DBA;ETHIOPIC SYLLABLE CCHI;Lo;0;L;;;;;N;;;;;
-2DBB;ETHIOPIC SYLLABLE CCHAA;Lo;0;L;;;;;N;;;;;
-2DBC;ETHIOPIC SYLLABLE CCHEE;Lo;0;L;;;;;N;;;;;
-2DBD;ETHIOPIC SYLLABLE CCHE;Lo;0;L;;;;;N;;;;;
-2DBE;ETHIOPIC SYLLABLE CCHO;Lo;0;L;;;;;N;;;;;
-2DC0;ETHIOPIC SYLLABLE QYA;Lo;0;L;;;;;N;;;;;
-2DC1;ETHIOPIC SYLLABLE QYU;Lo;0;L;;;;;N;;;;;
-2DC2;ETHIOPIC SYLLABLE QYI;Lo;0;L;;;;;N;;;;;
-2DC3;ETHIOPIC SYLLABLE QYAA;Lo;0;L;;;;;N;;;;;
-2DC4;ETHIOPIC SYLLABLE QYEE;Lo;0;L;;;;;N;;;;;
-2DC5;ETHIOPIC SYLLABLE QYE;Lo;0;L;;;;;N;;;;;
-2DC6;ETHIOPIC SYLLABLE QYO;Lo;0;L;;;;;N;;;;;
-2DC8;ETHIOPIC SYLLABLE KYA;Lo;0;L;;;;;N;;;;;
-2DC9;ETHIOPIC SYLLABLE KYU;Lo;0;L;;;;;N;;;;;
-2DCA;ETHIOPIC SYLLABLE KYI;Lo;0;L;;;;;N;;;;;
-2DCB;ETHIOPIC SYLLABLE KYAA;Lo;0;L;;;;;N;;;;;
-2DCC;ETHIOPIC SYLLABLE KYEE;Lo;0;L;;;;;N;;;;;
-2DCD;ETHIOPIC SYLLABLE KYE;Lo;0;L;;;;;N;;;;;
-2DCE;ETHIOPIC SYLLABLE KYO;Lo;0;L;;;;;N;;;;;
-2DD0;ETHIOPIC SYLLABLE XYA;Lo;0;L;;;;;N;;;;;
-2DD1;ETHIOPIC SYLLABLE XYU;Lo;0;L;;;;;N;;;;;
-2DD2;ETHIOPIC SYLLABLE XYI;Lo;0;L;;;;;N;;;;;
-2DD3;ETHIOPIC SYLLABLE XYAA;Lo;0;L;;;;;N;;;;;
-2DD4;ETHIOPIC SYLLABLE XYEE;Lo;0;L;;;;;N;;;;;
-2DD5;ETHIOPIC SYLLABLE XYE;Lo;0;L;;;;;N;;;;;
-2DD6;ETHIOPIC SYLLABLE XYO;Lo;0;L;;;;;N;;;;;
-2DD8;ETHIOPIC SYLLABLE GYA;Lo;0;L;;;;;N;;;;;
-2DD9;ETHIOPIC SYLLABLE GYU;Lo;0;L;;;;;N;;;;;
-2DDA;ETHIOPIC SYLLABLE GYI;Lo;0;L;;;;;N;;;;;
-2DDB;ETHIOPIC SYLLABLE GYAA;Lo;0;L;;;;;N;;;;;
-2DDC;ETHIOPIC SYLLABLE GYEE;Lo;0;L;;;;;N;;;;;
-2DDD;ETHIOPIC SYLLABLE GYE;Lo;0;L;;;;;N;;;;;
-2DDE;ETHIOPIC SYLLABLE GYO;Lo;0;L;;;;;N;;;;;
-2DE0;COMBINING CYRILLIC LETTER BE;Mn;230;NSM;;;;;N;;;;;
-2DE1;COMBINING CYRILLIC LETTER VE;Mn;230;NSM;;;;;N;;;;;
-2DE2;COMBINING CYRILLIC LETTER GHE;Mn;230;NSM;;;;;N;;;;;
-2DE3;COMBINING CYRILLIC LETTER DE;Mn;230;NSM;;;;;N;;;;;
-2DE4;COMBINING CYRILLIC LETTER ZHE;Mn;230;NSM;;;;;N;;;;;
-2DE5;COMBINING CYRILLIC LETTER ZE;Mn;230;NSM;;;;;N;;;;;
-2DE6;COMBINING CYRILLIC LETTER KA;Mn;230;NSM;;;;;N;;;;;
-2DE7;COMBINING CYRILLIC LETTER EL;Mn;230;NSM;;;;;N;;;;;
-2DE8;COMBINING CYRILLIC LETTER EM;Mn;230;NSM;;;;;N;;;;;
-2DE9;COMBINING CYRILLIC LETTER EN;Mn;230;NSM;;;;;N;;;;;
-2DEA;COMBINING CYRILLIC LETTER O;Mn;230;NSM;;;;;N;;;;;
-2DEB;COMBINING CYRILLIC LETTER PE;Mn;230;NSM;;;;;N;;;;;
-2DEC;COMBINING CYRILLIC LETTER ER;Mn;230;NSM;;;;;N;;;;;
-2DED;COMBINING CYRILLIC LETTER ES;Mn;230;NSM;;;;;N;;;;;
-2DEE;COMBINING CYRILLIC LETTER TE;Mn;230;NSM;;;;;N;;;;;
-2DEF;COMBINING CYRILLIC LETTER HA;Mn;230;NSM;;;;;N;;;;;
-2DF0;COMBINING CYRILLIC LETTER TSE;Mn;230;NSM;;;;;N;;;;;
-2DF1;COMBINING CYRILLIC LETTER CHE;Mn;230;NSM;;;;;N;;;;;
-2DF2;COMBINING CYRILLIC LETTER SHA;Mn;230;NSM;;;;;N;;;;;
-2DF3;COMBINING CYRILLIC LETTER SHCHA;Mn;230;NSM;;;;;N;;;;;
-2DF4;COMBINING CYRILLIC LETTER FITA;Mn;230;NSM;;;;;N;;;;;
-2DF5;COMBINING CYRILLIC LETTER ES-TE;Mn;230;NSM;;;;;N;;;;;
-2DF6;COMBINING CYRILLIC LETTER A;Mn;230;NSM;;;;;N;;;;;
-2DF7;COMBINING CYRILLIC LETTER IE;Mn;230;NSM;;;;;N;;;;;
-2DF8;COMBINING CYRILLIC LETTER DJERV;Mn;230;NSM;;;;;N;;;;;
-2DF9;COMBINING CYRILLIC LETTER MONOGRAPH UK;Mn;230;NSM;;;;;N;;;;;
-2DFA;COMBINING CYRILLIC LETTER YAT;Mn;230;NSM;;;;;N;;;;;
-2DFB;COMBINING CYRILLIC LETTER YU;Mn;230;NSM;;;;;N;;;;;
-2DFC;COMBINING CYRILLIC LETTER IOTIFIED A;Mn;230;NSM;;;;;N;;;;;
-2DFD;COMBINING CYRILLIC LETTER LITTLE YUS;Mn;230;NSM;;;;;N;;;;;
-2DFE;COMBINING CYRILLIC LETTER BIG YUS;Mn;230;NSM;;;;;N;;;;;
-2DFF;COMBINING CYRILLIC LETTER IOTIFIED BIG YUS;Mn;230;NSM;;;;;N;;;;;
-2E00;RIGHT ANGLE SUBSTITUTION MARKER;Po;0;ON;;;;;N;;;;;
-2E01;RIGHT ANGLE DOTTED SUBSTITUTION MARKER;Po;0;ON;;;;;N;;;;;
-2E02;LEFT SUBSTITUTION BRACKET;Pi;0;ON;;;;;Y;;;;;
-2E03;RIGHT SUBSTITUTION BRACKET;Pf;0;ON;;;;;Y;;;;;
-2E04;LEFT DOTTED SUBSTITUTION BRACKET;Pi;0;ON;;;;;Y;;;;;
-2E05;RIGHT DOTTED SUBSTITUTION BRACKET;Pf;0;ON;;;;;Y;;;;;
-2E06;RAISED INTERPOLATION MARKER;Po;0;ON;;;;;N;;;;;
-2E07;RAISED DOTTED INTERPOLATION MARKER;Po;0;ON;;;;;N;;;;;
-2E08;DOTTED TRANSPOSITION MARKER;Po;0;ON;;;;;N;;;;;
-2E09;LEFT TRANSPOSITION BRACKET;Pi;0;ON;;;;;Y;;;;;
-2E0A;RIGHT TRANSPOSITION BRACKET;Pf;0;ON;;;;;Y;;;;;
-2E0B;RAISED SQUARE;Po;0;ON;;;;;N;;;;;
-2E0C;LEFT RAISED OMISSION BRACKET;Pi;0;ON;;;;;Y;;;;;
-2E0D;RIGHT RAISED OMISSION BRACKET;Pf;0;ON;;;;;Y;;;;;
-2E0E;EDITORIAL CORONIS;Po;0;ON;;;;;N;;;;;
-2E0F;PARAGRAPHOS;Po;0;ON;;;;;N;;;;;
-2E10;FORKED PARAGRAPHOS;Po;0;ON;;;;;N;;;;;
-2E11;REVERSED FORKED PARAGRAPHOS;Po;0;ON;;;;;N;;;;;
-2E12;HYPODIASTOLE;Po;0;ON;;;;;N;;;;;
-2E13;DOTTED OBELOS;Po;0;ON;;;;;N;;;;;
-2E14;DOWNWARDS ANCORA;Po;0;ON;;;;;N;;;;;
-2E15;UPWARDS ANCORA;Po;0;ON;;;;;N;;;;;
-2E16;DOTTED RIGHT-POINTING ANGLE;Po;0;ON;;;;;N;;;;;
-2E17;DOUBLE OBLIQUE HYPHEN;Pd;0;ON;;;;;N;;;;;
-2E18;INVERTED INTERROBANG;Po;0;ON;;;;;N;;;;;
-2E19;PALM BRANCH;Po;0;ON;;;;;N;;;;;
-2E1A;HYPHEN WITH DIAERESIS;Pd;0;ON;;;;;N;;;;;
-2E1B;TILDE WITH RING ABOVE;Po;0;ON;;;;;N;;;;;
-2E1C;LEFT LOW PARAPHRASE BRACKET;Pi;0;ON;;;;;Y;;;;;
-2E1D;RIGHT LOW PARAPHRASE BRACKET;Pf;0;ON;;;;;Y;;;;;
-2E1E;TILDE WITH DOT ABOVE;Po;0;ON;;;;;N;;;;;
-2E1F;TILDE WITH DOT BELOW;Po;0;ON;;;;;N;;;;;
-2E20;LEFT VERTICAL BAR WITH QUILL;Pi;0;ON;;;;;Y;;;;;
-2E21;RIGHT VERTICAL BAR WITH QUILL;Pf;0;ON;;;;;Y;;;;;
-2E22;TOP LEFT HALF BRACKET;Ps;0;ON;;;;;Y;;;;;
-2E23;TOP RIGHT HALF BRACKET;Pe;0;ON;;;;;Y;;;;;
-2E24;BOTTOM LEFT HALF BRACKET;Ps;0;ON;;;;;Y;;;;;
-2E25;BOTTOM RIGHT HALF BRACKET;Pe;0;ON;;;;;Y;;;;;
-2E26;LEFT SIDEWAYS U BRACKET;Ps;0;ON;;;;;Y;;;;;
-2E27;RIGHT SIDEWAYS U BRACKET;Pe;0;ON;;;;;Y;;;;;
-2E28;LEFT DOUBLE PARENTHESIS;Ps;0;ON;;;;;Y;;;;;
-2E29;RIGHT DOUBLE PARENTHESIS;Pe;0;ON;;;;;Y;;;;;
-2E2A;TWO DOTS OVER ONE DOT PUNCTUATION;Po;0;ON;;;;;N;;;;;
-2E2B;ONE DOT OVER TWO DOTS PUNCTUATION;Po;0;ON;;;;;N;;;;;
-2E2C;SQUARED FOUR DOT PUNCTUATION;Po;0;ON;;;;;N;;;;;
-2E2D;FIVE DOT MARK;Po;0;ON;;;;;N;;;;;
-2E2E;REVERSED QUESTION MARK;Po;0;ON;;;;;N;;;;;
-2E2F;VERTICAL TILDE;Lm;0;ON;;;;;N;;;;;
-2E30;RING POINT;Po;0;ON;;;;;N;;;;;
-2E80;CJK RADICAL REPEAT;So;0;ON;;;;;N;;;;;
-2E81;CJK RADICAL CLIFF;So;0;ON;;;;;N;;;;;
-2E82;CJK RADICAL SECOND ONE;So;0;ON;;;;;N;;;;;
-2E83;CJK RADICAL SECOND TWO;So;0;ON;;;;;N;;;;;
-2E84;CJK RADICAL SECOND THREE;So;0;ON;;;;;N;;;;;
-2E85;CJK RADICAL PERSON;So;0;ON;;;;;N;;;;;
-2E86;CJK RADICAL BOX;So;0;ON;;;;;N;;;;;
-2E87;CJK RADICAL TABLE;So;0;ON;;;;;N;;;;;
-2E88;CJK RADICAL KNIFE ONE;So;0;ON;;;;;N;;;;;
-2E89;CJK RADICAL KNIFE TWO;So;0;ON;;;;;N;;;;;
-2E8A;CJK RADICAL DIVINATION;So;0;ON;;;;;N;;;;;
-2E8B;CJK RADICAL SEAL;So;0;ON;;;;;N;;;;;
-2E8C;CJK RADICAL SMALL ONE;So;0;ON;;;;;N;;;;;
-2E8D;CJK RADICAL SMALL TWO;So;0;ON;;;;;N;;;;;
-2E8E;CJK RADICAL LAME ONE;So;0;ON;;;;;N;;;;;
-2E8F;CJK RADICAL LAME TWO;So;0;ON;;;;;N;;;;;
-2E90;CJK RADICAL LAME THREE;So;0;ON;;;;;N;;;;;
-2E91;CJK RADICAL LAME FOUR;So;0;ON;;;;;N;;;;;
-2E92;CJK RADICAL SNAKE;So;0;ON;;;;;N;;;;;
-2E93;CJK RADICAL THREAD;So;0;ON;;;;;N;;;;;
-2E94;CJK RADICAL SNOUT ONE;So;0;ON;;;;;N;;;;;
-2E95;CJK RADICAL SNOUT TWO;So;0;ON;;;;;N;;;;;
-2E96;CJK RADICAL HEART ONE;So;0;ON;;;;;N;;;;;
-2E97;CJK RADICAL HEART TWO;So;0;ON;;;;;N;;;;;
-2E98;CJK RADICAL HAND;So;0;ON;;;;;N;;;;;
-2E99;CJK RADICAL RAP;So;0;ON;;;;;N;;;;;
-2E9B;CJK RADICAL CHOKE;So;0;ON;;;;;N;;;;;
-2E9C;CJK RADICAL SUN;So;0;ON;;;;;N;;;;;
-2E9D;CJK RADICAL MOON;So;0;ON;;;;;N;;;;;
-2E9E;CJK RADICAL DEATH;So;0;ON;;;;;N;;;;;
-2E9F;CJK RADICAL MOTHER;So;0;ON;<compat> 6BCD;;;;N;;;;;
-2EA0;CJK RADICAL CIVILIAN;So;0;ON;;;;;N;;;;;
-2EA1;CJK RADICAL WATER ONE;So;0;ON;;;;;N;;;;;
-2EA2;CJK RADICAL WATER TWO;So;0;ON;;;;;N;;;;;
-2EA3;CJK RADICAL FIRE;So;0;ON;;;;;N;;;;;
-2EA4;CJK RADICAL PAW ONE;So;0;ON;;;;;N;;;;;
-2EA5;CJK RADICAL PAW TWO;So;0;ON;;;;;N;;;;;
-2EA6;CJK RADICAL SIMPLIFIED HALF TREE TRUNK;So;0;ON;;;;;N;;;;;
-2EA7;CJK RADICAL COW;So;0;ON;;;;;N;;;;;
-2EA8;CJK RADICAL DOG;So;0;ON;;;;;N;;;;;
-2EA9;CJK RADICAL JADE;So;0;ON;;;;;N;;;;;
-2EAA;CJK RADICAL BOLT OF CLOTH;So;0;ON;;;;;N;;;;;
-2EAB;CJK RADICAL EYE;So;0;ON;;;;;N;;;;;
-2EAC;CJK RADICAL SPIRIT ONE;So;0;ON;;;;;N;;;;;
-2EAD;CJK RADICAL SPIRIT TWO;So;0;ON;;;;;N;;;;;
-2EAE;CJK RADICAL BAMBOO;So;0;ON;;;;;N;;;;;
-2EAF;CJK RADICAL SILK;So;0;ON;;;;;N;;;;;
-2EB0;CJK RADICAL C-SIMPLIFIED SILK;So;0;ON;;;;;N;;;;;
-2EB1;CJK RADICAL NET ONE;So;0;ON;;;;;N;;;;;
-2EB2;CJK RADICAL NET TWO;So;0;ON;;;;;N;;;;;
-2EB3;CJK RADICAL NET THREE;So;0;ON;;;;;N;;;;;
-2EB4;CJK RADICAL NET FOUR;So;0;ON;;;;;N;;;;;
-2EB5;CJK RADICAL MESH;So;0;ON;;;;;N;;;;;
-2EB6;CJK RADICAL SHEEP;So;0;ON;;;;;N;;;;;
-2EB7;CJK RADICAL RAM;So;0;ON;;;;;N;;;;;
-2EB8;CJK RADICAL EWE;So;0;ON;;;;;N;;;;;
-2EB9;CJK RADICAL OLD;So;0;ON;;;;;N;;;;;
-2EBA;CJK RADICAL BRUSH ONE;So;0;ON;;;;;N;;;;;
-2EBB;CJK RADICAL BRUSH TWO;So;0;ON;;;;;N;;;;;
-2EBC;CJK RADICAL MEAT;So;0;ON;;;;;N;;;;;
-2EBD;CJK RADICAL MORTAR;So;0;ON;;;;;N;;;;;
-2EBE;CJK RADICAL GRASS ONE;So;0;ON;;;;;N;;;;;
-2EBF;CJK RADICAL GRASS TWO;So;0;ON;;;;;N;;;;;
-2EC0;CJK RADICAL GRASS THREE;So;0;ON;;;;;N;;;;;
-2EC1;CJK RADICAL TIGER;So;0;ON;;;;;N;;;;;
-2EC2;CJK RADICAL CLOTHES;So;0;ON;;;;;N;;;;;
-2EC3;CJK RADICAL WEST ONE;So;0;ON;;;;;N;;;;;
-2EC4;CJK RADICAL WEST TWO;So;0;ON;;;;;N;;;;;
-2EC5;CJK RADICAL C-SIMPLIFIED SEE;So;0;ON;;;;;N;;;;;
-2EC6;CJK RADICAL SIMPLIFIED HORN;So;0;ON;;;;;N;;;;;
-2EC7;CJK RADICAL HORN;So;0;ON;;;;;N;;;;;
-2EC8;CJK RADICAL C-SIMPLIFIED SPEECH;So;0;ON;;;;;N;;;;;
-2EC9;CJK RADICAL C-SIMPLIFIED SHELL;So;0;ON;;;;;N;;;;;
-2ECA;CJK RADICAL FOOT;So;0;ON;;;;;N;;;;;
-2ECB;CJK RADICAL C-SIMPLIFIED CART;So;0;ON;;;;;N;;;;;
-2ECC;CJK RADICAL SIMPLIFIED WALK;So;0;ON;;;;;N;;;;;
-2ECD;CJK RADICAL WALK ONE;So;0;ON;;;;;N;;;;;
-2ECE;CJK RADICAL WALK TWO;So;0;ON;;;;;N;;;;;
-2ECF;CJK RADICAL CITY;So;0;ON;;;;;N;;;;;
-2ED0;CJK RADICAL C-SIMPLIFIED GOLD;So;0;ON;;;;;N;;;;;
-2ED1;CJK RADICAL LONG ONE;So;0;ON;;;;;N;;;;;
-2ED2;CJK RADICAL LONG TWO;So;0;ON;;;;;N;;;;;
-2ED3;CJK RADICAL C-SIMPLIFIED LONG;So;0;ON;;;;;N;;;;;
-2ED4;CJK RADICAL C-SIMPLIFIED GATE;So;0;ON;;;;;N;;;;;
-2ED5;CJK RADICAL MOUND ONE;So;0;ON;;;;;N;;;;;
-2ED6;CJK RADICAL MOUND TWO;So;0;ON;;;;;N;;;;;
-2ED7;CJK RADICAL RAIN;So;0;ON;;;;;N;;;;;
-2ED8;CJK RADICAL BLUE;So;0;ON;;;;;N;;;;;
-2ED9;CJK RADICAL C-SIMPLIFIED TANNED LEATHER;So;0;ON;;;;;N;;;;;
-2EDA;CJK RADICAL C-SIMPLIFIED LEAF;So;0;ON;;;;;N;;;;;
-2EDB;CJK RADICAL C-SIMPLIFIED WIND;So;0;ON;;;;;N;;;;;
-2EDC;CJK RADICAL C-SIMPLIFIED FLY;So;0;ON;;;;;N;;;;;
-2EDD;CJK RADICAL EAT ONE;So;0;ON;;;;;N;;;;;
-2EDE;CJK RADICAL EAT TWO;So;0;ON;;;;;N;;;;;
-2EDF;CJK RADICAL EAT THREE;So;0;ON;;;;;N;;;;;
-2EE0;CJK RADICAL C-SIMPLIFIED EAT;So;0;ON;;;;;N;;;;;
-2EE1;CJK RADICAL HEAD;So;0;ON;;;;;N;;;;;
-2EE2;CJK RADICAL C-SIMPLIFIED HORSE;So;0;ON;;;;;N;;;;;
-2EE3;CJK RADICAL BONE;So;0;ON;;;;;N;;;;;
-2EE4;CJK RADICAL GHOST;So;0;ON;;;;;N;;;;;
-2EE5;CJK RADICAL C-SIMPLIFIED FISH;So;0;ON;;;;;N;;;;;
-2EE6;CJK RADICAL C-SIMPLIFIED BIRD;So;0;ON;;;;;N;;;;;
-2EE7;CJK RADICAL C-SIMPLIFIED SALT;So;0;ON;;;;;N;;;;;
-2EE8;CJK RADICAL SIMPLIFIED WHEAT;So;0;ON;;;;;N;;;;;
-2EE9;CJK RADICAL SIMPLIFIED YELLOW;So;0;ON;;;;;N;;;;;
-2EEA;CJK RADICAL C-SIMPLIFIED FROG;So;0;ON;;;;;N;;;;;
-2EEB;CJK RADICAL J-SIMPLIFIED EVEN;So;0;ON;;;;;N;;;;;
-2EEC;CJK RADICAL C-SIMPLIFIED EVEN;So;0;ON;;;;;N;;;;;
-2EED;CJK RADICAL J-SIMPLIFIED TOOTH;So;0;ON;;;;;N;;;;;
-2EEE;CJK RADICAL C-SIMPLIFIED TOOTH;So;0;ON;;;;;N;;;;;
-2EEF;CJK RADICAL J-SIMPLIFIED DRAGON;So;0;ON;;;;;N;;;;;
-2EF0;CJK RADICAL C-SIMPLIFIED DRAGON;So;0;ON;;;;;N;;;;;
-2EF1;CJK RADICAL TURTLE;So;0;ON;;;;;N;;;;;
-2EF2;CJK RADICAL J-SIMPLIFIED TURTLE;So;0;ON;;;;;N;;;;;
-2EF3;CJK RADICAL C-SIMPLIFIED TURTLE;So;0;ON;<compat> 9F9F;;;;N;;;;;
-2F00;KANGXI RADICAL ONE;So;0;ON;<compat> 4E00;;;;N;;;;;
-2F01;KANGXI RADICAL LINE;So;0;ON;<compat> 4E28;;;;N;;;;;
-2F02;KANGXI RADICAL DOT;So;0;ON;<compat> 4E36;;;;N;;;;;
-2F03;KANGXI RADICAL SLASH;So;0;ON;<compat> 4E3F;;;;N;;;;;
-2F04;KANGXI RADICAL SECOND;So;0;ON;<compat> 4E59;;;;N;;;;;
-2F05;KANGXI RADICAL HOOK;So;0;ON;<compat> 4E85;;;;N;;;;;
-2F06;KANGXI RADICAL TWO;So;0;ON;<compat> 4E8C;;;;N;;;;;
-2F07;KANGXI RADICAL LID;So;0;ON;<compat> 4EA0;;;;N;;;;;
-2F08;KANGXI RADICAL MAN;So;0;ON;<compat> 4EBA;;;;N;;;;;
-2F09;KANGXI RADICAL LEGS;So;0;ON;<compat> 513F;;;;N;;;;;
-2F0A;KANGXI RADICAL ENTER;So;0;ON;<compat> 5165;;;;N;;;;;
-2F0B;KANGXI RADICAL EIGHT;So;0;ON;<compat> 516B;;;;N;;;;;
-2F0C;KANGXI RADICAL DOWN BOX;So;0;ON;<compat> 5182;;;;N;;;;;
-2F0D;KANGXI RADICAL COVER;So;0;ON;<compat> 5196;;;;N;;;;;
-2F0E;KANGXI RADICAL ICE;So;0;ON;<compat> 51AB;;;;N;;;;;
-2F0F;KANGXI RADICAL TABLE;So;0;ON;<compat> 51E0;;;;N;;;;;
-2F10;KANGXI RADICAL OPEN BOX;So;0;ON;<compat> 51F5;;;;N;;;;;
-2F11;KANGXI RADICAL KNIFE;So;0;ON;<compat> 5200;;;;N;;;;;
-2F12;KANGXI RADICAL POWER;So;0;ON;<compat> 529B;;;;N;;;;;
-2F13;KANGXI RADICAL WRAP;So;0;ON;<compat> 52F9;;;;N;;;;;
-2F14;KANGXI RADICAL SPOON;So;0;ON;<compat> 5315;;;;N;;;;;
-2F15;KANGXI RADICAL RIGHT OPEN BOX;So;0;ON;<compat> 531A;;;;N;;;;;
-2F16;KANGXI RADICAL HIDING ENCLOSURE;So;0;ON;<compat> 5338;;;;N;;;;;
-2F17;KANGXI RADICAL TEN;So;0;ON;<compat> 5341;;;;N;;;;;
-2F18;KANGXI RADICAL DIVINATION;So;0;ON;<compat> 535C;;;;N;;;;;
-2F19;KANGXI RADICAL SEAL;So;0;ON;<compat> 5369;;;;N;;;;;
-2F1A;KANGXI RADICAL CLIFF;So;0;ON;<compat> 5382;;;;N;;;;;
-2F1B;KANGXI RADICAL PRIVATE;So;0;ON;<compat> 53B6;;;;N;;;;;
-2F1C;KANGXI RADICAL AGAIN;So;0;ON;<compat> 53C8;;;;N;;;;;
-2F1D;KANGXI RADICAL MOUTH;So;0;ON;<compat> 53E3;;;;N;;;;;
-2F1E;KANGXI RADICAL ENCLOSURE;So;0;ON;<compat> 56D7;;;;N;;;;;
-2F1F;KANGXI RADICAL EARTH;So;0;ON;<compat> 571F;;;;N;;;;;
-2F20;KANGXI RADICAL SCHOLAR;So;0;ON;<compat> 58EB;;;;N;;;;;
-2F21;KANGXI RADICAL GO;So;0;ON;<compat> 5902;;;;N;;;;;
-2F22;KANGXI RADICAL GO SLOWLY;So;0;ON;<compat> 590A;;;;N;;;;;
-2F23;KANGXI RADICAL EVENING;So;0;ON;<compat> 5915;;;;N;;;;;
-2F24;KANGXI RADICAL BIG;So;0;ON;<compat> 5927;;;;N;;;;;
-2F25;KANGXI RADICAL WOMAN;So;0;ON;<compat> 5973;;;;N;;;;;
-2F26;KANGXI RADICAL CHILD;So;0;ON;<compat> 5B50;;;;N;;;;;
-2F27;KANGXI RADICAL ROOF;So;0;ON;<compat> 5B80;;;;N;;;;;
-2F28;KANGXI RADICAL INCH;So;0;ON;<compat> 5BF8;;;;N;;;;;
-2F29;KANGXI RADICAL SMALL;So;0;ON;<compat> 5C0F;;;;N;;;;;
-2F2A;KANGXI RADICAL LAME;So;0;ON;<compat> 5C22;;;;N;;;;;
-2F2B;KANGXI RADICAL CORPSE;So;0;ON;<compat> 5C38;;;;N;;;;;
-2F2C;KANGXI RADICAL SPROUT;So;0;ON;<compat> 5C6E;;;;N;;;;;
-2F2D;KANGXI RADICAL MOUNTAIN;So;0;ON;<compat> 5C71;;;;N;;;;;
-2F2E;KANGXI RADICAL RIVER;So;0;ON;<compat> 5DDB;;;;N;;;;;
-2F2F;KANGXI RADICAL WORK;So;0;ON;<compat> 5DE5;;;;N;;;;;
-2F30;KANGXI RADICAL ONESELF;So;0;ON;<compat> 5DF1;;;;N;;;;;
-2F31;KANGXI RADICAL TURBAN;So;0;ON;<compat> 5DFE;;;;N;;;;;
-2F32;KANGXI RADICAL DRY;So;0;ON;<compat> 5E72;;;;N;;;;;
-2F33;KANGXI RADICAL SHORT THREAD;So;0;ON;<compat> 5E7A;;;;N;;;;;
-2F34;KANGXI RADICAL DOTTED CLIFF;So;0;ON;<compat> 5E7F;;;;N;;;;;
-2F35;KANGXI RADICAL LONG STRIDE;So;0;ON;<compat> 5EF4;;;;N;;;;;
-2F36;KANGXI RADICAL TWO HANDS;So;0;ON;<compat> 5EFE;;;;N;;;;;
-2F37;KANGXI RADICAL SHOOT;So;0;ON;<compat> 5F0B;;;;N;;;;;
-2F38;KANGXI RADICAL BOW;So;0;ON;<compat> 5F13;;;;N;;;;;
-2F39;KANGXI RADICAL SNOUT;So;0;ON;<compat> 5F50;;;;N;;;;;
-2F3A;KANGXI RADICAL BRISTLE;So;0;ON;<compat> 5F61;;;;N;;;;;
-2F3B;KANGXI RADICAL STEP;So;0;ON;<compat> 5F73;;;;N;;;;;
-2F3C;KANGXI RADICAL HEART;So;0;ON;<compat> 5FC3;;;;N;;;;;
-2F3D;KANGXI RADICAL HALBERD;So;0;ON;<compat> 6208;;;;N;;;;;
-2F3E;KANGXI RADICAL DOOR;So;0;ON;<compat> 6236;;;;N;;;;;
-2F3F;KANGXI RADICAL HAND;So;0;ON;<compat> 624B;;;;N;;;;;
-2F40;KANGXI RADICAL BRANCH;So;0;ON;<compat> 652F;;;;N;;;;;
-2F41;KANGXI RADICAL RAP;So;0;ON;<compat> 6534;;;;N;;;;;
-2F42;KANGXI RADICAL SCRIPT;So;0;ON;<compat> 6587;;;;N;;;;;
-2F43;KANGXI RADICAL DIPPER;So;0;ON;<compat> 6597;;;;N;;;;;
-2F44;KANGXI RADICAL AXE;So;0;ON;<compat> 65A4;;;;N;;;;;
-2F45;KANGXI RADICAL SQUARE;So;0;ON;<compat> 65B9;;;;N;;;;;
-2F46;KANGXI RADICAL NOT;So;0;ON;<compat> 65E0;;;;N;;;;;
-2F47;KANGXI RADICAL SUN;So;0;ON;<compat> 65E5;;;;N;;;;;
-2F48;KANGXI RADICAL SAY;So;0;ON;<compat> 66F0;;;;N;;;;;
-2F49;KANGXI RADICAL MOON;So;0;ON;<compat> 6708;;;;N;;;;;
-2F4A;KANGXI RADICAL TREE;So;0;ON;<compat> 6728;;;;N;;;;;
-2F4B;KANGXI RADICAL LACK;So;0;ON;<compat> 6B20;;;;N;;;;;
-2F4C;KANGXI RADICAL STOP;So;0;ON;<compat> 6B62;;;;N;;;;;
-2F4D;KANGXI RADICAL DEATH;So;0;ON;<compat> 6B79;;;;N;;;;;
-2F4E;KANGXI RADICAL WEAPON;So;0;ON;<compat> 6BB3;;;;N;;;;;
-2F4F;KANGXI RADICAL DO NOT;So;0;ON;<compat> 6BCB;;;;N;;;;;
-2F50;KANGXI RADICAL COMPARE;So;0;ON;<compat> 6BD4;;;;N;;;;;
-2F51;KANGXI RADICAL FUR;So;0;ON;<compat> 6BDB;;;;N;;;;;
-2F52;KANGXI RADICAL CLAN;So;0;ON;<compat> 6C0F;;;;N;;;;;
-2F53;KANGXI RADICAL STEAM;So;0;ON;<compat> 6C14;;;;N;;;;;
-2F54;KANGXI RADICAL WATER;So;0;ON;<compat> 6C34;;;;N;;;;;
-2F55;KANGXI RADICAL FIRE;So;0;ON;<compat> 706B;;;;N;;;;;
-2F56;KANGXI RADICAL CLAW;So;0;ON;<compat> 722A;;;;N;;;;;
-2F57;KANGXI RADICAL FATHER;So;0;ON;<compat> 7236;;;;N;;;;;
-2F58;KANGXI RADICAL DOUBLE X;So;0;ON;<compat> 723B;;;;N;;;;;
-2F59;KANGXI RADICAL HALF TREE TRUNK;So;0;ON;<compat> 723F;;;;N;;;;;
-2F5A;KANGXI RADICAL SLICE;So;0;ON;<compat> 7247;;;;N;;;;;
-2F5B;KANGXI RADICAL FANG;So;0;ON;<compat> 7259;;;;N;;;;;
-2F5C;KANGXI RADICAL COW;So;0;ON;<compat> 725B;;;;N;;;;;
-2F5D;KANGXI RADICAL DOG;So;0;ON;<compat> 72AC;;;;N;;;;;
-2F5E;KANGXI RADICAL PROFOUND;So;0;ON;<compat> 7384;;;;N;;;;;
-2F5F;KANGXI RADICAL JADE;So;0;ON;<compat> 7389;;;;N;;;;;
-2F60;KANGXI RADICAL MELON;So;0;ON;<compat> 74DC;;;;N;;;;;
-2F61;KANGXI RADICAL TILE;So;0;ON;<compat> 74E6;;;;N;;;;;
-2F62;KANGXI RADICAL SWEET;So;0;ON;<compat> 7518;;;;N;;;;;
-2F63;KANGXI RADICAL LIFE;So;0;ON;<compat> 751F;;;;N;;;;;
-2F64;KANGXI RADICAL USE;So;0;ON;<compat> 7528;;;;N;;;;;
-2F65;KANGXI RADICAL FIELD;So;0;ON;<compat> 7530;;;;N;;;;;
-2F66;KANGXI RADICAL BOLT OF CLOTH;So;0;ON;<compat> 758B;;;;N;;;;;
-2F67;KANGXI RADICAL SICKNESS;So;0;ON;<compat> 7592;;;;N;;;;;
-2F68;KANGXI RADICAL DOTTED TENT;So;0;ON;<compat> 7676;;;;N;;;;;
-2F69;KANGXI RADICAL WHITE;So;0;ON;<compat> 767D;;;;N;;;;;
-2F6A;KANGXI RADICAL SKIN;So;0;ON;<compat> 76AE;;;;N;;;;;
-2F6B;KANGXI RADICAL DISH;So;0;ON;<compat> 76BF;;;;N;;;;;
-2F6C;KANGXI RADICAL EYE;So;0;ON;<compat> 76EE;;;;N;;;;;
-2F6D;KANGXI RADICAL SPEAR;So;0;ON;<compat> 77DB;;;;N;;;;;
-2F6E;KANGXI RADICAL ARROW;So;0;ON;<compat> 77E2;;;;N;;;;;
-2F6F;KANGXI RADICAL STONE;So;0;ON;<compat> 77F3;;;;N;;;;;
-2F70;KANGXI RADICAL SPIRIT;So;0;ON;<compat> 793A;;;;N;;;;;
-2F71;KANGXI RADICAL TRACK;So;0;ON;<compat> 79B8;;;;N;;;;;
-2F72;KANGXI RADICAL GRAIN;So;0;ON;<compat> 79BE;;;;N;;;;;
-2F73;KANGXI RADICAL CAVE;So;0;ON;<compat> 7A74;;;;N;;;;;
-2F74;KANGXI RADICAL STAND;So;0;ON;<compat> 7ACB;;;;N;;;;;
-2F75;KANGXI RADICAL BAMBOO;So;0;ON;<compat> 7AF9;;;;N;;;;;
-2F76;KANGXI RADICAL RICE;So;0;ON;<compat> 7C73;;;;N;;;;;
-2F77;KANGXI RADICAL SILK;So;0;ON;<compat> 7CF8;;;;N;;;;;
-2F78;KANGXI RADICAL JAR;So;0;ON;<compat> 7F36;;;;N;;;;;
-2F79;KANGXI RADICAL NET;So;0;ON;<compat> 7F51;;;;N;;;;;
-2F7A;KANGXI RADICAL SHEEP;So;0;ON;<compat> 7F8A;;;;N;;;;;
-2F7B;KANGXI RADICAL FEATHER;So;0;ON;<compat> 7FBD;;;;N;;;;;
-2F7C;KANGXI RADICAL OLD;So;0;ON;<compat> 8001;;;;N;;;;;
-2F7D;KANGXI RADICAL AND;So;0;ON;<compat> 800C;;;;N;;;;;
-2F7E;KANGXI RADICAL PLOW;So;0;ON;<compat> 8012;;;;N;;;;;
-2F7F;KANGXI RADICAL EAR;So;0;ON;<compat> 8033;;;;N;;;;;
-2F80;KANGXI RADICAL BRUSH;So;0;ON;<compat> 807F;;;;N;;;;;
-2F81;KANGXI RADICAL MEAT;So;0;ON;<compat> 8089;;;;N;;;;;
-2F82;KANGXI RADICAL MINISTER;So;0;ON;<compat> 81E3;;;;N;;;;;
-2F83;KANGXI RADICAL SELF;So;0;ON;<compat> 81EA;;;;N;;;;;
-2F84;KANGXI RADICAL ARRIVE;So;0;ON;<compat> 81F3;;;;N;;;;;
-2F85;KANGXI RADICAL MORTAR;So;0;ON;<compat> 81FC;;;;N;;;;;
-2F86;KANGXI RADICAL TONGUE;So;0;ON;<compat> 820C;;;;N;;;;;
-2F87;KANGXI RADICAL OPPOSE;So;0;ON;<compat> 821B;;;;N;;;;;
-2F88;KANGXI RADICAL BOAT;So;0;ON;<compat> 821F;;;;N;;;;;
-2F89;KANGXI RADICAL STOPPING;So;0;ON;<compat> 826E;;;;N;;;;;
-2F8A;KANGXI RADICAL COLOR;So;0;ON;<compat> 8272;;;;N;;;;;
-2F8B;KANGXI RADICAL GRASS;So;0;ON;<compat> 8278;;;;N;;;;;
-2F8C;KANGXI RADICAL TIGER;So;0;ON;<compat> 864D;;;;N;;;;;
-2F8D;KANGXI RADICAL INSECT;So;0;ON;<compat> 866B;;;;N;;;;;
-2F8E;KANGXI RADICAL BLOOD;So;0;ON;<compat> 8840;;;;N;;;;;
-2F8F;KANGXI RADICAL WALK ENCLOSURE;So;0;ON;<compat> 884C;;;;N;;;;;
-2F90;KANGXI RADICAL CLOTHES;So;0;ON;<compat> 8863;;;;N;;;;;
-2F91;KANGXI RADICAL WEST;So;0;ON;<compat> 897E;;;;N;;;;;
-2F92;KANGXI RADICAL SEE;So;0;ON;<compat> 898B;;;;N;;;;;
-2F93;KANGXI RADICAL HORN;So;0;ON;<compat> 89D2;;;;N;;;;;
-2F94;KANGXI RADICAL SPEECH;So;0;ON;<compat> 8A00;;;;N;;;;;
-2F95;KANGXI RADICAL VALLEY;So;0;ON;<compat> 8C37;;;;N;;;;;
-2F96;KANGXI RADICAL BEAN;So;0;ON;<compat> 8C46;;;;N;;;;;
-2F97;KANGXI RADICAL PIG;So;0;ON;<compat> 8C55;;;;N;;;;;
-2F98;KANGXI RADICAL BADGER;So;0;ON;<compat> 8C78;;;;N;;;;;
-2F99;KANGXI RADICAL SHELL;So;0;ON;<compat> 8C9D;;;;N;;;;;
-2F9A;KANGXI RADICAL RED;So;0;ON;<compat> 8D64;;;;N;;;;;
-2F9B;KANGXI RADICAL RUN;So;0;ON;<compat> 8D70;;;;N;;;;;
-2F9C;KANGXI RADICAL FOOT;So;0;ON;<compat> 8DB3;;;;N;;;;;
-2F9D;KANGXI RADICAL BODY;So;0;ON;<compat> 8EAB;;;;N;;;;;
-2F9E;KANGXI RADICAL CART;So;0;ON;<compat> 8ECA;;;;N;;;;;
-2F9F;KANGXI RADICAL BITTER;So;0;ON;<compat> 8F9B;;;;N;;;;;
-2FA0;KANGXI RADICAL MORNING;So;0;ON;<compat> 8FB0;;;;N;;;;;
-2FA1;KANGXI RADICAL WALK;So;0;ON;<compat> 8FB5;;;;N;;;;;
-2FA2;KANGXI RADICAL CITY;So;0;ON;<compat> 9091;;;;N;;;;;
-2FA3;KANGXI RADICAL WINE;So;0;ON;<compat> 9149;;;;N;;;;;
-2FA4;KANGXI RADICAL DISTINGUISH;So;0;ON;<compat> 91C6;;;;N;;;;;
-2FA5;KANGXI RADICAL VILLAGE;So;0;ON;<compat> 91CC;;;;N;;;;;
-2FA6;KANGXI RADICAL GOLD;So;0;ON;<compat> 91D1;;;;N;;;;;
-2FA7;KANGXI RADICAL LONG;So;0;ON;<compat> 9577;;;;N;;;;;
-2FA8;KANGXI RADICAL GATE;So;0;ON;<compat> 9580;;;;N;;;;;
-2FA9;KANGXI RADICAL MOUND;So;0;ON;<compat> 961C;;;;N;;;;;
-2FAA;KANGXI RADICAL SLAVE;So;0;ON;<compat> 96B6;;;;N;;;;;
-2FAB;KANGXI RADICAL SHORT TAILED BIRD;So;0;ON;<compat> 96B9;;;;N;;;;;
-2FAC;KANGXI RADICAL RAIN;So;0;ON;<compat> 96E8;;;;N;;;;;
-2FAD;KANGXI RADICAL BLUE;So;0;ON;<compat> 9751;;;;N;;;;;
-2FAE;KANGXI RADICAL WRONG;So;0;ON;<compat> 975E;;;;N;;;;;
-2FAF;KANGXI RADICAL FACE;So;0;ON;<compat> 9762;;;;N;;;;;
-2FB0;KANGXI RADICAL LEATHER;So;0;ON;<compat> 9769;;;;N;;;;;
-2FB1;KANGXI RADICAL TANNED LEATHER;So;0;ON;<compat> 97CB;;;;N;;;;;
-2FB2;KANGXI RADICAL LEEK;So;0;ON;<compat> 97ED;;;;N;;;;;
-2FB3;KANGXI RADICAL SOUND;So;0;ON;<compat> 97F3;;;;N;;;;;
-2FB4;KANGXI RADICAL LEAF;So;0;ON;<compat> 9801;;;;N;;;;;
-2FB5;KANGXI RADICAL WIND;So;0;ON;<compat> 98A8;;;;N;;;;;
-2FB6;KANGXI RADICAL FLY;So;0;ON;<compat> 98DB;;;;N;;;;;
-2FB7;KANGXI RADICAL EAT;So;0;ON;<compat> 98DF;;;;N;;;;;
-2FB8;KANGXI RADICAL HEAD;So;0;ON;<compat> 9996;;;;N;;;;;
-2FB9;KANGXI RADICAL FRAGRANT;So;0;ON;<compat> 9999;;;;N;;;;;
-2FBA;KANGXI RADICAL HORSE;So;0;ON;<compat> 99AC;;;;N;;;;;
-2FBB;KANGXI RADICAL BONE;So;0;ON;<compat> 9AA8;;;;N;;;;;
-2FBC;KANGXI RADICAL TALL;So;0;ON;<compat> 9AD8;;;;N;;;;;
-2FBD;KANGXI RADICAL HAIR;So;0;ON;<compat> 9ADF;;;;N;;;;;
-2FBE;KANGXI RADICAL FIGHT;So;0;ON;<compat> 9B25;;;;N;;;;;
-2FBF;KANGXI RADICAL SACRIFICIAL WINE;So;0;ON;<compat> 9B2F;;;;N;;;;;
-2FC0;KANGXI RADICAL CAULDRON;So;0;ON;<compat> 9B32;;;;N;;;;;
-2FC1;KANGXI RADICAL GHOST;So;0;ON;<compat> 9B3C;;;;N;;;;;
-2FC2;KANGXI RADICAL FISH;So;0;ON;<compat> 9B5A;;;;N;;;;;
-2FC3;KANGXI RADICAL BIRD;So;0;ON;<compat> 9CE5;;;;N;;;;;
-2FC4;KANGXI RADICAL SALT;So;0;ON;<compat> 9E75;;;;N;;;;;
-2FC5;KANGXI RADICAL DEER;So;0;ON;<compat> 9E7F;;;;N;;;;;
-2FC6;KANGXI RADICAL WHEAT;So;0;ON;<compat> 9EA5;;;;N;;;;;
-2FC7;KANGXI RADICAL HEMP;So;0;ON;<compat> 9EBB;;;;N;;;;;
-2FC8;KANGXI RADICAL YELLOW;So;0;ON;<compat> 9EC3;;;;N;;;;;
-2FC9;KANGXI RADICAL MILLET;So;0;ON;<compat> 9ECD;;;;N;;;;;
-2FCA;KANGXI RADICAL BLACK;So;0;ON;<compat> 9ED1;;;;N;;;;;
-2FCB;KANGXI RADICAL EMBROIDERY;So;0;ON;<compat> 9EF9;;;;N;;;;;
-2FCC;KANGXI RADICAL FROG;So;0;ON;<compat> 9EFD;;;;N;;;;;
-2FCD;KANGXI RADICAL TRIPOD;So;0;ON;<compat> 9F0E;;;;N;;;;;
-2FCE;KANGXI RADICAL DRUM;So;0;ON;<compat> 9F13;;;;N;;;;;
-2FCF;KANGXI RADICAL RAT;So;0;ON;<compat> 9F20;;;;N;;;;;
-2FD0;KANGXI RADICAL NOSE;So;0;ON;<compat> 9F3B;;;;N;;;;;
-2FD1;KANGXI RADICAL EVEN;So;0;ON;<compat> 9F4A;;;;N;;;;;
-2FD2;KANGXI RADICAL TOOTH;So;0;ON;<compat> 9F52;;;;N;;;;;
-2FD3;KANGXI RADICAL DRAGON;So;0;ON;<compat> 9F8D;;;;N;;;;;
-2FD4;KANGXI RADICAL TURTLE;So;0;ON;<compat> 9F9C;;;;N;;;;;
-2FD5;KANGXI RADICAL FLUTE;So;0;ON;<compat> 9FA0;;;;N;;;;;
-2FF0;IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT;So;0;ON;;;;;N;;;;;
-2FF1;IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW;So;0;ON;;;;;N;;;;;
-2FF2;IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO MIDDLE AND RIGHT;So;0;ON;;;;;N;;;;;
-2FF3;IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW;So;0;ON;;;;;N;;;;;
-2FF4;IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND;So;0;ON;;;;;N;;;;;
-2FF5;IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE;So;0;ON;;;;;N;;;;;
-2FF6;IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM BELOW;So;0;ON;;;;;N;;;;;
-2FF7;IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT;So;0;ON;;;;;N;;;;;
-2FF8;IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT;So;0;ON;;;;;N;;;;;
-2FF9;IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT;So;0;ON;;;;;N;;;;;
-2FFA;IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER LEFT;So;0;ON;;;;;N;;;;;
-2FFB;IDEOGRAPHIC DESCRIPTION CHARACTER OVERLAID;So;0;ON;;;;;N;;;;;
-3000;IDEOGRAPHIC SPACE;Zs;0;WS;<wide> 0020;;;;N;;;;;
-3001;IDEOGRAPHIC COMMA;Po;0;ON;;;;;N;;;;;
-3002;IDEOGRAPHIC FULL STOP;Po;0;ON;;;;;N;IDEOGRAPHIC PERIOD;;;;
-3003;DITTO MARK;Po;0;ON;;;;;N;;;;;
-3004;JAPANESE INDUSTRIAL STANDARD SYMBOL;So;0;ON;;;;;N;;;;;
-3005;IDEOGRAPHIC ITERATION MARK;Lm;0;L;;;;;N;;;;;
-3006;IDEOGRAPHIC CLOSING MARK;Lo;0;L;;;;;N;;;;;
-3007;IDEOGRAPHIC NUMBER ZERO;Nl;0;L;;;;0;N;;;;;
-3008;LEFT ANGLE BRACKET;Ps;0;ON;;;;;Y;OPENING ANGLE BRACKET;;;;
-3009;RIGHT ANGLE BRACKET;Pe;0;ON;;;;;Y;CLOSING ANGLE BRACKET;;;;
-300A;LEFT DOUBLE ANGLE BRACKET;Ps;0;ON;;;;;Y;OPENING DOUBLE ANGLE BRACKET;;;;
-300B;RIGHT DOUBLE ANGLE BRACKET;Pe;0;ON;;;;;Y;CLOSING DOUBLE ANGLE BRACKET;;;;
-300C;LEFT CORNER BRACKET;Ps;0;ON;;;;;Y;OPENING CORNER BRACKET;;;;
-300D;RIGHT CORNER BRACKET;Pe;0;ON;;;;;Y;CLOSING CORNER BRACKET;;;;
-300E;LEFT WHITE CORNER BRACKET;Ps;0;ON;;;;;Y;OPENING WHITE CORNER BRACKET;;;;
-300F;RIGHT WHITE CORNER BRACKET;Pe;0;ON;;;;;Y;CLOSING WHITE CORNER BRACKET;;;;
-3010;LEFT BLACK LENTICULAR BRACKET;Ps;0;ON;;;;;Y;OPENING BLACK LENTICULAR BRACKET;;;;
-3011;RIGHT BLACK LENTICULAR BRACKET;Pe;0;ON;;;;;Y;CLOSING BLACK LENTICULAR BRACKET;;;;
-3012;POSTAL MARK;So;0;ON;;;;;N;;;;;
-3013;GETA MARK;So;0;ON;;;;;N;;;;;
-3014;LEFT TORTOISE SHELL BRACKET;Ps;0;ON;;;;;Y;OPENING TORTOISE SHELL BRACKET;;;;
-3015;RIGHT TORTOISE SHELL BRACKET;Pe;0;ON;;;;;Y;CLOSING TORTOISE SHELL BRACKET;;;;
-3016;LEFT WHITE LENTICULAR BRACKET;Ps;0;ON;;;;;Y;OPENING WHITE LENTICULAR BRACKET;;;;
-3017;RIGHT WHITE LENTICULAR BRACKET;Pe;0;ON;;;;;Y;CLOSING WHITE LENTICULAR BRACKET;;;;
-3018;LEFT WHITE TORTOISE SHELL BRACKET;Ps;0;ON;;;;;Y;OPENING WHITE TORTOISE SHELL BRACKET;;;;
-3019;RIGHT WHITE TORTOISE SHELL BRACKET;Pe;0;ON;;;;;Y;CLOSING WHITE TORTOISE SHELL BRACKET;;;;
-301A;LEFT WHITE SQUARE BRACKET;Ps;0;ON;;;;;Y;OPENING WHITE SQUARE BRACKET;;;;
-301B;RIGHT WHITE SQUARE BRACKET;Pe;0;ON;;;;;Y;CLOSING WHITE SQUARE BRACKET;;;;
-301C;WAVE DASH;Pd;0;ON;;;;;N;;;;;
-301D;REVERSED DOUBLE PRIME QUOTATION MARK;Ps;0;ON;;;;;N;;;;;
-301E;DOUBLE PRIME QUOTATION MARK;Pe;0;ON;;;;;N;;;;;
-301F;LOW DOUBLE PRIME QUOTATION MARK;Pe;0;ON;;;;;N;;;;;
-3020;POSTAL MARK FACE;So;0;ON;;;;;N;;;;;
-3021;HANGZHOU NUMERAL ONE;Nl;0;L;;;;1;N;;;;;
-3022;HANGZHOU NUMERAL TWO;Nl;0;L;;;;2;N;;;;;
-3023;HANGZHOU NUMERAL THREE;Nl;0;L;;;;3;N;;;;;
-3024;HANGZHOU NUMERAL FOUR;Nl;0;L;;;;4;N;;;;;
-3025;HANGZHOU NUMERAL FIVE;Nl;0;L;;;;5;N;;;;;
-3026;HANGZHOU NUMERAL SIX;Nl;0;L;;;;6;N;;;;;
-3027;HANGZHOU NUMERAL SEVEN;Nl;0;L;;;;7;N;;;;;
-3028;HANGZHOU NUMERAL EIGHT;Nl;0;L;;;;8;N;;;;;
-3029;HANGZHOU NUMERAL NINE;Nl;0;L;;;;9;N;;;;;
-302A;IDEOGRAPHIC LEVEL TONE MARK;Mn;218;NSM;;;;;N;;;;;
-302B;IDEOGRAPHIC RISING TONE MARK;Mn;228;NSM;;;;;N;;;;;
-302C;IDEOGRAPHIC DEPARTING TONE MARK;Mn;232;NSM;;;;;N;;;;;
-302D;IDEOGRAPHIC ENTERING TONE MARK;Mn;222;NSM;;;;;N;;;;;
-302E;HANGUL SINGLE DOT TONE MARK;Mn;224;NSM;;;;;N;;;;;
-302F;HANGUL DOUBLE DOT TONE MARK;Mn;224;NSM;;;;;N;;;;;
-3030;WAVY DASH;Pd;0;ON;;;;;N;;;;;
-3031;VERTICAL KANA REPEAT MARK;Lm;0;L;;;;;N;;;;;
-3032;VERTICAL KANA REPEAT WITH VOICED SOUND MARK;Lm;0;L;;;;;N;;;;;
-3033;VERTICAL KANA REPEAT MARK UPPER HALF;Lm;0;L;;;;;N;;;;;
-3034;VERTICAL KANA REPEAT WITH VOICED SOUND MARK UPPER HALF;Lm;0;L;;;;;N;;;;;
-3035;VERTICAL KANA REPEAT MARK LOWER HALF;Lm;0;L;;;;;N;;;;;
-3036;CIRCLED POSTAL MARK;So;0;ON;<compat> 3012;;;;N;;;;;
-3037;IDEOGRAPHIC TELEGRAPH LINE FEED SEPARATOR SYMBOL;So;0;ON;;;;;N;;;;;
-3038;HANGZHOU NUMERAL TEN;Nl;0;L;<compat> 5341;;;10;N;;;;;
-3039;HANGZHOU NUMERAL TWENTY;Nl;0;L;<compat> 5344;;;20;N;;;;;
-303A;HANGZHOU NUMERAL THIRTY;Nl;0;L;<compat> 5345;;;30;N;;;;;
-303B;VERTICAL IDEOGRAPHIC ITERATION MARK;Lm;0;L;;;;;N;;;;;
-303C;MASU MARK;Lo;0;L;;;;;N;;;;;
-303D;PART ALTERNATION MARK;Po;0;ON;;;;;N;;;;;
-303E;IDEOGRAPHIC VARIATION INDICATOR;So;0;ON;;;;;N;;;;;
-303F;IDEOGRAPHIC HALF FILL SPACE;So;0;ON;;;;;N;;;;;
-3041;HIRAGANA LETTER SMALL A;Lo;0;L;;;;;N;;;;;
-3042;HIRAGANA LETTER A;Lo;0;L;;;;;N;;;;;
-3043;HIRAGANA LETTER SMALL I;Lo;0;L;;;;;N;;;;;
-3044;HIRAGANA LETTER I;Lo;0;L;;;;;N;;;;;
-3045;HIRAGANA LETTER SMALL U;Lo;0;L;;;;;N;;;;;
-3046;HIRAGANA LETTER U;Lo;0;L;;;;;N;;;;;
-3047;HIRAGANA LETTER SMALL E;Lo;0;L;;;;;N;;;;;
-3048;HIRAGANA LETTER E;Lo;0;L;;;;;N;;;;;
-3049;HIRAGANA LETTER SMALL O;Lo;0;L;;;;;N;;;;;
-304A;HIRAGANA LETTER O;Lo;0;L;;;;;N;;;;;
-304B;HIRAGANA LETTER KA;Lo;0;L;;;;;N;;;;;
-304C;HIRAGANA LETTER GA;Lo;0;L;304B 3099;;;;N;;;;;
-304D;HIRAGANA LETTER KI;Lo;0;L;;;;;N;;;;;
-304E;HIRAGANA LETTER GI;Lo;0;L;304D 3099;;;;N;;;;;
-304F;HIRAGANA LETTER KU;Lo;0;L;;;;;N;;;;;
-3050;HIRAGANA LETTER GU;Lo;0;L;304F 3099;;;;N;;;;;
-3051;HIRAGANA LETTER KE;Lo;0;L;;;;;N;;;;;
-3052;HIRAGANA LETTER GE;Lo;0;L;3051 3099;;;;N;;;;;
-3053;HIRAGANA LETTER KO;Lo;0;L;;;;;N;;;;;
-3054;HIRAGANA LETTER GO;Lo;0;L;3053 3099;;;;N;;;;;
-3055;HIRAGANA LETTER SA;Lo;0;L;;;;;N;;;;;
-3056;HIRAGANA LETTER ZA;Lo;0;L;3055 3099;;;;N;;;;;
-3057;HIRAGANA LETTER SI;Lo;0;L;;;;;N;;;;;
-3058;HIRAGANA LETTER ZI;Lo;0;L;3057 3099;;;;N;;;;;
-3059;HIRAGANA LETTER SU;Lo;0;L;;;;;N;;;;;
-305A;HIRAGANA LETTER ZU;Lo;0;L;3059 3099;;;;N;;;;;
-305B;HIRAGANA LETTER SE;Lo;0;L;;;;;N;;;;;
-305C;HIRAGANA LETTER ZE;Lo;0;L;305B 3099;;;;N;;;;;
-305D;HIRAGANA LETTER SO;Lo;0;L;;;;;N;;;;;
-305E;HIRAGANA LETTER ZO;Lo;0;L;305D 3099;;;;N;;;;;
-305F;HIRAGANA LETTER TA;Lo;0;L;;;;;N;;;;;
-3060;HIRAGANA LETTER DA;Lo;0;L;305F 3099;;;;N;;;;;
-3061;HIRAGANA LETTER TI;Lo;0;L;;;;;N;;;;;
-3062;HIRAGANA LETTER DI;Lo;0;L;3061 3099;;;;N;;;;;
-3063;HIRAGANA LETTER SMALL TU;Lo;0;L;;;;;N;;;;;
-3064;HIRAGANA LETTER TU;Lo;0;L;;;;;N;;;;;
-3065;HIRAGANA LETTER DU;Lo;0;L;3064 3099;;;;N;;;;;
-3066;HIRAGANA LETTER TE;Lo;0;L;;;;;N;;;;;
-3067;HIRAGANA LETTER DE;Lo;0;L;3066 3099;;;;N;;;;;
-3068;HIRAGANA LETTER TO;Lo;0;L;;;;;N;;;;;
-3069;HIRAGANA LETTER DO;Lo;0;L;3068 3099;;;;N;;;;;
-306A;HIRAGANA LETTER NA;Lo;0;L;;;;;N;;;;;
-306B;HIRAGANA LETTER NI;Lo;0;L;;;;;N;;;;;
-306C;HIRAGANA LETTER NU;Lo;0;L;;;;;N;;;;;
-306D;HIRAGANA LETTER NE;Lo;0;L;;;;;N;;;;;
-306E;HIRAGANA LETTER NO;Lo;0;L;;;;;N;;;;;
-306F;HIRAGANA LETTER HA;Lo;0;L;;;;;N;;;;;
-3070;HIRAGANA LETTER BA;Lo;0;L;306F 3099;;;;N;;;;;
-3071;HIRAGANA LETTER PA;Lo;0;L;306F 309A;;;;N;;;;;
-3072;HIRAGANA LETTER HI;Lo;0;L;;;;;N;;;;;
-3073;HIRAGANA LETTER BI;Lo;0;L;3072 3099;;;;N;;;;;
-3074;HIRAGANA LETTER PI;Lo;0;L;3072 309A;;;;N;;;;;
-3075;HIRAGANA LETTER HU;Lo;0;L;;;;;N;;;;;
-3076;HIRAGANA LETTER BU;Lo;0;L;3075 3099;;;;N;;;;;
-3077;HIRAGANA LETTER PU;Lo;0;L;3075 309A;;;;N;;;;;
-3078;HIRAGANA LETTER HE;Lo;0;L;;;;;N;;;;;
-3079;HIRAGANA LETTER BE;Lo;0;L;3078 3099;;;;N;;;;;
-307A;HIRAGANA LETTER PE;Lo;0;L;3078 309A;;;;N;;;;;
-307B;HIRAGANA LETTER HO;Lo;0;L;;;;;N;;;;;
-307C;HIRAGANA LETTER BO;Lo;0;L;307B 3099;;;;N;;;;;
-307D;HIRAGANA LETTER PO;Lo;0;L;307B 309A;;;;N;;;;;
-307E;HIRAGANA LETTER MA;Lo;0;L;;;;;N;;;;;
-307F;HIRAGANA LETTER MI;Lo;0;L;;;;;N;;;;;
-3080;HIRAGANA LETTER MU;Lo;0;L;;;;;N;;;;;
-3081;HIRAGANA LETTER ME;Lo;0;L;;;;;N;;;;;
-3082;HIRAGANA LETTER MO;Lo;0;L;;;;;N;;;;;
-3083;HIRAGANA LETTER SMALL YA;Lo;0;L;;;;;N;;;;;
-3084;HIRAGANA LETTER YA;Lo;0;L;;;;;N;;;;;
-3085;HIRAGANA LETTER SMALL YU;Lo;0;L;;;;;N;;;;;
-3086;HIRAGANA LETTER YU;Lo;0;L;;;;;N;;;;;
-3087;HIRAGANA LETTER SMALL YO;Lo;0;L;;;;;N;;;;;
-3088;HIRAGANA LETTER YO;Lo;0;L;;;;;N;;;;;
-3089;HIRAGANA LETTER RA;Lo;0;L;;;;;N;;;;;
-308A;HIRAGANA LETTER RI;Lo;0;L;;;;;N;;;;;
-308B;HIRAGANA LETTER RU;Lo;0;L;;;;;N;;;;;
-308C;HIRAGANA LETTER RE;Lo;0;L;;;;;N;;;;;
-308D;HIRAGANA LETTER RO;Lo;0;L;;;;;N;;;;;
-308E;HIRAGANA LETTER SMALL WA;Lo;0;L;;;;;N;;;;;
-308F;HIRAGANA LETTER WA;Lo;0;L;;;;;N;;;;;
-3090;HIRAGANA LETTER WI;Lo;0;L;;;;;N;;;;;
-3091;HIRAGANA LETTER WE;Lo;0;L;;;;;N;;;;;
-3092;HIRAGANA LETTER WO;Lo;0;L;;;;;N;;;;;
-3093;HIRAGANA LETTER N;Lo;0;L;;;;;N;;;;;
-3094;HIRAGANA LETTER VU;Lo;0;L;3046 3099;;;;N;;;;;
-3095;HIRAGANA LETTER SMALL KA;Lo;0;L;;;;;N;;;;;
-3096;HIRAGANA LETTER SMALL KE;Lo;0;L;;;;;N;;;;;
-3099;COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK;Mn;8;NSM;;;;;N;NON-SPACING KATAKANA-HIRAGANA VOICED SOUND MARK;;;;
-309A;COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK;Mn;8;NSM;;;;;N;NON-SPACING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK;;;;
-309B;KATAKANA-HIRAGANA VOICED SOUND MARK;Sk;0;ON;<compat> 0020 3099;;;;N;;;;;
-309C;KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK;Sk;0;ON;<compat> 0020 309A;;;;N;;;;;
-309D;HIRAGANA ITERATION MARK;Lm;0;L;;;;;N;;;;;
-309E;HIRAGANA VOICED ITERATION MARK;Lm;0;L;309D 3099;;;;N;;;;;
-309F;HIRAGANA DIGRAPH YORI;Lo;0;L;<vertical> 3088 308A;;;;N;;;;;
-30A0;KATAKANA-HIRAGANA DOUBLE HYPHEN;Pd;0;ON;;;;;N;;;;;
-30A1;KATAKANA LETTER SMALL A;Lo;0;L;;;;;N;;;;;
-30A2;KATAKANA LETTER A;Lo;0;L;;;;;N;;;;;
-30A3;KATAKANA LETTER SMALL I;Lo;0;L;;;;;N;;;;;
-30A4;KATAKANA LETTER I;Lo;0;L;;;;;N;;;;;
-30A5;KATAKANA LETTER SMALL U;Lo;0;L;;;;;N;;;;;
-30A6;KATAKANA LETTER U;Lo;0;L;;;;;N;;;;;
-30A7;KATAKANA LETTER SMALL E;Lo;0;L;;;;;N;;;;;
-30A8;KATAKANA LETTER E;Lo;0;L;;;;;N;;;;;
-30A9;KATAKANA LETTER SMALL O;Lo;0;L;;;;;N;;;;;
-30AA;KATAKANA LETTER O;Lo;0;L;;;;;N;;;;;
-30AB;KATAKANA LETTER KA;Lo;0;L;;;;;N;;;;;
-30AC;KATAKANA LETTER GA;Lo;0;L;30AB 3099;;;;N;;;;;
-30AD;KATAKANA LETTER KI;Lo;0;L;;;;;N;;;;;
-30AE;KATAKANA LETTER GI;Lo;0;L;30AD 3099;;;;N;;;;;
-30AF;KATAKANA LETTER KU;Lo;0;L;;;;;N;;;;;
-30B0;KATAKANA LETTER GU;Lo;0;L;30AF 3099;;;;N;;;;;
-30B1;KATAKANA LETTER KE;Lo;0;L;;;;;N;;;;;
-30B2;KATAKANA LETTER GE;Lo;0;L;30B1 3099;;;;N;;;;;
-30B3;KATAKANA LETTER KO;Lo;0;L;;;;;N;;;;;
-30B4;KATAKANA LETTER GO;Lo;0;L;30B3 3099;;;;N;;;;;
-30B5;KATAKANA LETTER SA;Lo;0;L;;;;;N;;;;;
-30B6;KATAKANA LETTER ZA;Lo;0;L;30B5 3099;;;;N;;;;;
-30B7;KATAKANA LETTER SI;Lo;0;L;;;;;N;;;;;
-30B8;KATAKANA LETTER ZI;Lo;0;L;30B7 3099;;;;N;;;;;
-30B9;KATAKANA LETTER SU;Lo;0;L;;;;;N;;;;;
-30BA;KATAKANA LETTER ZU;Lo;0;L;30B9 3099;;;;N;;;;;
-30BB;KATAKANA LETTER SE;Lo;0;L;;;;;N;;;;;
-30BC;KATAKANA LETTER ZE;Lo;0;L;30BB 3099;;;;N;;;;;
-30BD;KATAKANA LETTER SO;Lo;0;L;;;;;N;;;;;
-30BE;KATAKANA LETTER ZO;Lo;0;L;30BD 3099;;;;N;;;;;
-30BF;KATAKANA LETTER TA;Lo;0;L;;;;;N;;;;;
-30C0;KATAKANA LETTER DA;Lo;0;L;30BF 3099;;;;N;;;;;
-30C1;KATAKANA LETTER TI;Lo;0;L;;;;;N;;;;;
-30C2;KATAKANA LETTER DI;Lo;0;L;30C1 3099;;;;N;;;;;
-30C3;KATAKANA LETTER SMALL TU;Lo;0;L;;;;;N;;;;;
-30C4;KATAKANA LETTER TU;Lo;0;L;;;;;N;;;;;
-30C5;KATAKANA LETTER DU;Lo;0;L;30C4 3099;;;;N;;;;;
-30C6;KATAKANA LETTER TE;Lo;0;L;;;;;N;;;;;
-30C7;KATAKANA LETTER DE;Lo;0;L;30C6 3099;;;;N;;;;;
-30C8;KATAKANA LETTER TO;Lo;0;L;;;;;N;;;;;
-30C9;KATAKANA LETTER DO;Lo;0;L;30C8 3099;;;;N;;;;;
-30CA;KATAKANA LETTER NA;Lo;0;L;;;;;N;;;;;
-30CB;KATAKANA LETTER NI;Lo;0;L;;;;;N;;;;;
-30CC;KATAKANA LETTER NU;Lo;0;L;;;;;N;;;;;
-30CD;KATAKANA LETTER NE;Lo;0;L;;;;;N;;;;;
-30CE;KATAKANA LETTER NO;Lo;0;L;;;;;N;;;;;
-30CF;KATAKANA LETTER HA;Lo;0;L;;;;;N;;;;;
-30D0;KATAKANA LETTER BA;Lo;0;L;30CF 3099;;;;N;;;;;
-30D1;KATAKANA LETTER PA;Lo;0;L;30CF 309A;;;;N;;;;;
-30D2;KATAKANA LETTER HI;Lo;0;L;;;;;N;;;;;
-30D3;KATAKANA LETTER BI;Lo;0;L;30D2 3099;;;;N;;;;;
-30D4;KATAKANA LETTER PI;Lo;0;L;30D2 309A;;;;N;;;;;
-30D5;KATAKANA LETTER HU;Lo;0;L;;;;;N;;;;;
-30D6;KATAKANA LETTER BU;Lo;0;L;30D5 3099;;;;N;;;;;
-30D7;KATAKANA LETTER PU;Lo;0;L;30D5 309A;;;;N;;;;;
-30D8;KATAKANA LETTER HE;Lo;0;L;;;;;N;;;;;
-30D9;KATAKANA LETTER BE;Lo;0;L;30D8 3099;;;;N;;;;;
-30DA;KATAKANA LETTER PE;Lo;0;L;30D8 309A;;;;N;;;;;
-30DB;KATAKANA LETTER HO;Lo;0;L;;;;;N;;;;;
-30DC;KATAKANA LETTER BO;Lo;0;L;30DB 3099;;;;N;;;;;
-30DD;KATAKANA LETTER PO;Lo;0;L;30DB 309A;;;;N;;;;;
-30DE;KATAKANA LETTER MA;Lo;0;L;;;;;N;;;;;
-30DF;KATAKANA LETTER MI;Lo;0;L;;;;;N;;;;;
-30E0;KATAKANA LETTER MU;Lo;0;L;;;;;N;;;;;
-30E1;KATAKANA LETTER ME;Lo;0;L;;;;;N;;;;;
-30E2;KATAKANA LETTER MO;Lo;0;L;;;;;N;;;;;
-30E3;KATAKANA LETTER SMALL YA;Lo;0;L;;;;;N;;;;;
-30E4;KATAKANA LETTER YA;Lo;0;L;;;;;N;;;;;
-30E5;KATAKANA LETTER SMALL YU;Lo;0;L;;;;;N;;;;;
-30E6;KATAKANA LETTER YU;Lo;0;L;;;;;N;;;;;
-30E7;KATAKANA LETTER SMALL YO;Lo;0;L;;;;;N;;;;;
-30E8;KATAKANA LETTER YO;Lo;0;L;;;;;N;;;;;
-30E9;KATAKANA LETTER RA;Lo;0;L;;;;;N;;;;;
-30EA;KATAKANA LETTER RI;Lo;0;L;;;;;N;;;;;
-30EB;KATAKANA LETTER RU;Lo;0;L;;;;;N;;;;;
-30EC;KATAKANA LETTER RE;Lo;0;L;;;;;N;;;;;
-30ED;KATAKANA LETTER RO;Lo;0;L;;;;;N;;;;;
-30EE;KATAKANA LETTER SMALL WA;Lo;0;L;;;;;N;;;;;
-30EF;KATAKANA LETTER WA;Lo;0;L;;;;;N;;;;;
-30F0;KATAKANA LETTER WI;Lo;0;L;;;;;N;;;;;
-30F1;KATAKANA LETTER WE;Lo;0;L;;;;;N;;;;;
-30F2;KATAKANA LETTER WO;Lo;0;L;;;;;N;;;;;
-30F3;KATAKANA LETTER N;Lo;0;L;;;;;N;;;;;
-30F4;KATAKANA LETTER VU;Lo;0;L;30A6 3099;;;;N;;;;;
-30F5;KATAKANA LETTER SMALL KA;Lo;0;L;;;;;N;;;;;
-30F6;KATAKANA LETTER SMALL KE;Lo;0;L;;;;;N;;;;;
-30F7;KATAKANA LETTER VA;Lo;0;L;30EF 3099;;;;N;;;;;
-30F8;KATAKANA LETTER VI;Lo;0;L;30F0 3099;;;;N;;;;;
-30F9;KATAKANA LETTER VE;Lo;0;L;30F1 3099;;;;N;;;;;
-30FA;KATAKANA LETTER VO;Lo;0;L;30F2 3099;;;;N;;;;;
-30FB;KATAKANA MIDDLE DOT;Po;0;ON;;;;;N;;;;;
-30FC;KATAKANA-HIRAGANA PROLONGED SOUND MARK;Lm;0;L;;;;;N;;;;;
-30FD;KATAKANA ITERATION MARK;Lm;0;L;;;;;N;;;;;
-30FE;KATAKANA VOICED ITERATION MARK;Lm;0;L;30FD 3099;;;;N;;;;;
-30FF;KATAKANA DIGRAPH KOTO;Lo;0;L;<vertical> 30B3 30C8;;;;N;;;;;
-3105;BOPOMOFO LETTER B;Lo;0;L;;;;;N;;;;;
-3106;BOPOMOFO LETTER P;Lo;0;L;;;;;N;;;;;
-3107;BOPOMOFO LETTER M;Lo;0;L;;;;;N;;;;;
-3108;BOPOMOFO LETTER F;Lo;0;L;;;;;N;;;;;
-3109;BOPOMOFO LETTER D;Lo;0;L;;;;;N;;;;;
-310A;BOPOMOFO LETTER T;Lo;0;L;;;;;N;;;;;
-310B;BOPOMOFO LETTER N;Lo;0;L;;;;;N;;;;;
-310C;BOPOMOFO LETTER L;Lo;0;L;;;;;N;;;;;
-310D;BOPOMOFO LETTER G;Lo;0;L;;;;;N;;;;;
-310E;BOPOMOFO LETTER K;Lo;0;L;;;;;N;;;;;
-310F;BOPOMOFO LETTER H;Lo;0;L;;;;;N;;;;;
-3110;BOPOMOFO LETTER J;Lo;0;L;;;;;N;;;;;
-3111;BOPOMOFO LETTER Q;Lo;0;L;;;;;N;;;;;
-3112;BOPOMOFO LETTER X;Lo;0;L;;;;;N;;;;;
-3113;BOPOMOFO LETTER ZH;Lo;0;L;;;;;N;;;;;
-3114;BOPOMOFO LETTER CH;Lo;0;L;;;;;N;;;;;
-3115;BOPOMOFO LETTER SH;Lo;0;L;;;;;N;;;;;
-3116;BOPOMOFO LETTER R;Lo;0;L;;;;;N;;;;;
-3117;BOPOMOFO LETTER Z;Lo;0;L;;;;;N;;;;;
-3118;BOPOMOFO LETTER C;Lo;0;L;;;;;N;;;;;
-3119;BOPOMOFO LETTER S;Lo;0;L;;;;;N;;;;;
-311A;BOPOMOFO LETTER A;Lo;0;L;;;;;N;;;;;
-311B;BOPOMOFO LETTER O;Lo;0;L;;;;;N;;;;;
-311C;BOPOMOFO LETTER E;Lo;0;L;;;;;N;;;;;
-311D;BOPOMOFO LETTER EH;Lo;0;L;;;;;N;;;;;
-311E;BOPOMOFO LETTER AI;Lo;0;L;;;;;N;;;;;
-311F;BOPOMOFO LETTER EI;Lo;0;L;;;;;N;;;;;
-3120;BOPOMOFO LETTER AU;Lo;0;L;;;;;N;;;;;
-3121;BOPOMOFO LETTER OU;Lo;0;L;;;;;N;;;;;
-3122;BOPOMOFO LETTER AN;Lo;0;L;;;;;N;;;;;
-3123;BOPOMOFO LETTER EN;Lo;0;L;;;;;N;;;;;
-3124;BOPOMOFO LETTER ANG;Lo;0;L;;;;;N;;;;;
-3125;BOPOMOFO LETTER ENG;Lo;0;L;;;;;N;;;;;
-3126;BOPOMOFO LETTER ER;Lo;0;L;;;;;N;;;;;
-3127;BOPOMOFO LETTER I;Lo;0;L;;;;;N;;;;;
-3128;BOPOMOFO LETTER U;Lo;0;L;;;;;N;;;;;
-3129;BOPOMOFO LETTER IU;Lo;0;L;;;;;N;;;;;
-312A;BOPOMOFO LETTER V;Lo;0;L;;;;;N;;;;;
-312B;BOPOMOFO LETTER NG;Lo;0;L;;;;;N;;;;;
-312C;BOPOMOFO LETTER GN;Lo;0;L;;;;;N;;;;;
-312D;BOPOMOFO LETTER IH;Lo;0;L;;;;;N;;;;;
-3131;HANGUL LETTER KIYEOK;Lo;0;L;<compat> 1100;;;;N;HANGUL LETTER GIYEOG;;;;
-3132;HANGUL LETTER SSANGKIYEOK;Lo;0;L;<compat> 1101;;;;N;HANGUL LETTER SSANG GIYEOG;;;;
-3133;HANGUL LETTER KIYEOK-SIOS;Lo;0;L;<compat> 11AA;;;;N;HANGUL LETTER GIYEOG SIOS;;;;
-3134;HANGUL LETTER NIEUN;Lo;0;L;<compat> 1102;;;;N;;;;;
-3135;HANGUL LETTER NIEUN-CIEUC;Lo;0;L;<compat> 11AC;;;;N;HANGUL LETTER NIEUN JIEUJ;;;;
-3136;HANGUL LETTER NIEUN-HIEUH;Lo;0;L;<compat> 11AD;;;;N;HANGUL LETTER NIEUN HIEUH;;;;
-3137;HANGUL LETTER TIKEUT;Lo;0;L;<compat> 1103;;;;N;HANGUL LETTER DIGEUD;;;;
-3138;HANGUL LETTER SSANGTIKEUT;Lo;0;L;<compat> 1104;;;;N;HANGUL LETTER SSANG DIGEUD;;;;
-3139;HANGUL LETTER RIEUL;Lo;0;L;<compat> 1105;;;;N;HANGUL LETTER LIEUL;;;;
-313A;HANGUL LETTER RIEUL-KIYEOK;Lo;0;L;<compat> 11B0;;;;N;HANGUL LETTER LIEUL GIYEOG;;;;
-313B;HANGUL LETTER RIEUL-MIEUM;Lo;0;L;<compat> 11B1;;;;N;HANGUL LETTER LIEUL MIEUM;;;;
-313C;HANGUL LETTER RIEUL-PIEUP;Lo;0;L;<compat> 11B2;;;;N;HANGUL LETTER LIEUL BIEUB;;;;
-313D;HANGUL LETTER RIEUL-SIOS;Lo;0;L;<compat> 11B3;;;;N;HANGUL LETTER LIEUL SIOS;;;;
-313E;HANGUL LETTER RIEUL-THIEUTH;Lo;0;L;<compat> 11B4;;;;N;HANGUL LETTER LIEUL TIEUT;;;;
-313F;HANGUL LETTER RIEUL-PHIEUPH;Lo;0;L;<compat> 11B5;;;;N;HANGUL LETTER LIEUL PIEUP;;;;
-3140;HANGUL LETTER RIEUL-HIEUH;Lo;0;L;<compat> 111A;;;;N;HANGUL LETTER LIEUL HIEUH;;;;
-3141;HANGUL LETTER MIEUM;Lo;0;L;<compat> 1106;;;;N;;;;;
-3142;HANGUL LETTER PIEUP;Lo;0;L;<compat> 1107;;;;N;HANGUL LETTER BIEUB;;;;
-3143;HANGUL LETTER SSANGPIEUP;Lo;0;L;<compat> 1108;;;;N;HANGUL LETTER SSANG BIEUB;;;;
-3144;HANGUL LETTER PIEUP-SIOS;Lo;0;L;<compat> 1121;;;;N;HANGUL LETTER BIEUB SIOS;;;;
-3145;HANGUL LETTER SIOS;Lo;0;L;<compat> 1109;;;;N;;;;;
-3146;HANGUL LETTER SSANGSIOS;Lo;0;L;<compat> 110A;;;;N;HANGUL LETTER SSANG SIOS;;;;
-3147;HANGUL LETTER IEUNG;Lo;0;L;<compat> 110B;;;;N;;;;;
-3148;HANGUL LETTER CIEUC;Lo;0;L;<compat> 110C;;;;N;HANGUL LETTER JIEUJ;;;;
-3149;HANGUL LETTER SSANGCIEUC;Lo;0;L;<compat> 110D;;;;N;HANGUL LETTER SSANG JIEUJ;;;;
-314A;HANGUL LETTER CHIEUCH;Lo;0;L;<compat> 110E;;;;N;HANGUL LETTER CIEUC;;;;
-314B;HANGUL LETTER KHIEUKH;Lo;0;L;<compat> 110F;;;;N;HANGUL LETTER KIYEOK;;;;
-314C;HANGUL LETTER THIEUTH;Lo;0;L;<compat> 1110;;;;N;HANGUL LETTER TIEUT;;;;
-314D;HANGUL LETTER PHIEUPH;Lo;0;L;<compat> 1111;;;;N;HANGUL LETTER PIEUP;;;;
-314E;HANGUL LETTER HIEUH;Lo;0;L;<compat> 1112;;;;N;;;;;
-314F;HANGUL LETTER A;Lo;0;L;<compat> 1161;;;;N;;;;;
-3150;HANGUL LETTER AE;Lo;0;L;<compat> 1162;;;;N;;;;;
-3151;HANGUL LETTER YA;Lo;0;L;<compat> 1163;;;;N;;;;;
-3152;HANGUL LETTER YAE;Lo;0;L;<compat> 1164;;;;N;;;;;
-3153;HANGUL LETTER EO;Lo;0;L;<compat> 1165;;;;N;;;;;
-3154;HANGUL LETTER E;Lo;0;L;<compat> 1166;;;;N;;;;;
-3155;HANGUL LETTER YEO;Lo;0;L;<compat> 1167;;;;N;;;;;
-3156;HANGUL LETTER YE;Lo;0;L;<compat> 1168;;;;N;;;;;
-3157;HANGUL LETTER O;Lo;0;L;<compat> 1169;;;;N;;;;;
-3158;HANGUL LETTER WA;Lo;0;L;<compat> 116A;;;;N;;;;;
-3159;HANGUL LETTER WAE;Lo;0;L;<compat> 116B;;;;N;;;;;
-315A;HANGUL LETTER OE;Lo;0;L;<compat> 116C;;;;N;;;;;
-315B;HANGUL LETTER YO;Lo;0;L;<compat> 116D;;;;N;;;;;
-315C;HANGUL LETTER U;Lo;0;L;<compat> 116E;;;;N;;;;;
-315D;HANGUL LETTER WEO;Lo;0;L;<compat> 116F;;;;N;;;;;
-315E;HANGUL LETTER WE;Lo;0;L;<compat> 1170;;;;N;;;;;
-315F;HANGUL LETTER WI;Lo;0;L;<compat> 1171;;;;N;;;;;
-3160;HANGUL LETTER YU;Lo;0;L;<compat> 1172;;;;N;;;;;
-3161;HANGUL LETTER EU;Lo;0;L;<compat> 1173;;;;N;;;;;
-3162;HANGUL LETTER YI;Lo;0;L;<compat> 1174;;;;N;;;;;
-3163;HANGUL LETTER I;Lo;0;L;<compat> 1175;;;;N;;;;;
-3164;HANGUL FILLER;Lo;0;L;<compat> 1160;;;;N;HANGUL CAE OM;;;;
-3165;HANGUL LETTER SSANGNIEUN;Lo;0;L;<compat> 1114;;;;N;HANGUL LETTER SSANG NIEUN;;;;
-3166;HANGUL LETTER NIEUN-TIKEUT;Lo;0;L;<compat> 1115;;;;N;HANGUL LETTER NIEUN DIGEUD;;;;
-3167;HANGUL LETTER NIEUN-SIOS;Lo;0;L;<compat> 11C7;;;;N;HANGUL LETTER NIEUN SIOS;;;;
-3168;HANGUL LETTER NIEUN-PANSIOS;Lo;0;L;<compat> 11C8;;;;N;HANGUL LETTER NIEUN BAN CHI EUM;;;;
-3169;HANGUL LETTER RIEUL-KIYEOK-SIOS;Lo;0;L;<compat> 11CC;;;;N;HANGUL LETTER LIEUL GIYEOG SIOS;;;;
-316A;HANGUL LETTER RIEUL-TIKEUT;Lo;0;L;<compat> 11CE;;;;N;HANGUL LETTER LIEUL DIGEUD;;;;
-316B;HANGUL LETTER RIEUL-PIEUP-SIOS;Lo;0;L;<compat> 11D3;;;;N;HANGUL LETTER LIEUL BIEUB SIOS;;;;
-316C;HANGUL LETTER RIEUL-PANSIOS;Lo;0;L;<compat> 11D7;;;;N;HANGUL LETTER LIEUL BAN CHI EUM;;;;
-316D;HANGUL LETTER RIEUL-YEORINHIEUH;Lo;0;L;<compat> 11D9;;;;N;HANGUL LETTER LIEUL YEOLIN HIEUH;;;;
-316E;HANGUL LETTER MIEUM-PIEUP;Lo;0;L;<compat> 111C;;;;N;HANGUL LETTER MIEUM BIEUB;;;;
-316F;HANGUL LETTER MIEUM-SIOS;Lo;0;L;<compat> 11DD;;;;N;HANGUL LETTER MIEUM SIOS;;;;
-3170;HANGUL LETTER MIEUM-PANSIOS;Lo;0;L;<compat> 11DF;;;;N;HANGUL LETTER BIEUB BAN CHI EUM;;;;
-3171;HANGUL LETTER KAPYEOUNMIEUM;Lo;0;L;<compat> 111D;;;;N;HANGUL LETTER MIEUM SUN GYEONG EUM;;;;
-3172;HANGUL LETTER PIEUP-KIYEOK;Lo;0;L;<compat> 111E;;;;N;HANGUL LETTER BIEUB GIYEOG;;;;
-3173;HANGUL LETTER PIEUP-TIKEUT;Lo;0;L;<compat> 1120;;;;N;HANGUL LETTER BIEUB DIGEUD;;;;
-3174;HANGUL LETTER PIEUP-SIOS-KIYEOK;Lo;0;L;<compat> 1122;;;;N;HANGUL LETTER BIEUB SIOS GIYEOG;;;;
-3175;HANGUL LETTER PIEUP-SIOS-TIKEUT;Lo;0;L;<compat> 1123;;;;N;HANGUL LETTER BIEUB SIOS DIGEUD;;;;
-3176;HANGUL LETTER PIEUP-CIEUC;Lo;0;L;<compat> 1127;;;;N;HANGUL LETTER BIEUB JIEUJ;;;;
-3177;HANGUL LETTER PIEUP-THIEUTH;Lo;0;L;<compat> 1129;;;;N;HANGUL LETTER BIEUB TIEUT;;;;
-3178;HANGUL LETTER KAPYEOUNPIEUP;Lo;0;L;<compat> 112B;;;;N;HANGUL LETTER BIEUB SUN GYEONG EUM;;;;
-3179;HANGUL LETTER KAPYEOUNSSANGPIEUP;Lo;0;L;<compat> 112C;;;;N;HANGUL LETTER SSANG BIEUB SUN GYEONG EUM;;;;
-317A;HANGUL LETTER SIOS-KIYEOK;Lo;0;L;<compat> 112D;;;;N;HANGUL LETTER SIOS GIYEOG;;;;
-317B;HANGUL LETTER SIOS-NIEUN;Lo;0;L;<compat> 112E;;;;N;HANGUL LETTER SIOS NIEUN;;;;
-317C;HANGUL LETTER SIOS-TIKEUT;Lo;0;L;<compat> 112F;;;;N;HANGUL LETTER SIOS DIGEUD;;;;
-317D;HANGUL LETTER SIOS-PIEUP;Lo;0;L;<compat> 1132;;;;N;HANGUL LETTER SIOS BIEUB;;;;
-317E;HANGUL LETTER SIOS-CIEUC;Lo;0;L;<compat> 1136;;;;N;HANGUL LETTER SIOS JIEUJ;;;;
-317F;HANGUL LETTER PANSIOS;Lo;0;L;<compat> 1140;;;;N;HANGUL LETTER BAN CHI EUM;;;;
-3180;HANGUL LETTER SSANGIEUNG;Lo;0;L;<compat> 1147;;;;N;HANGUL LETTER SSANG IEUNG;;;;
-3181;HANGUL LETTER YESIEUNG;Lo;0;L;<compat> 114C;;;;N;HANGUL LETTER NGIEUNG;;;;
-3182;HANGUL LETTER YESIEUNG-SIOS;Lo;0;L;<compat> 11F1;;;;N;HANGUL LETTER NGIEUNG SIOS;;;;
-3183;HANGUL LETTER YESIEUNG-PANSIOS;Lo;0;L;<compat> 11F2;;;;N;HANGUL LETTER NGIEUNG BAN CHI EUM;;;;
-3184;HANGUL LETTER KAPYEOUNPHIEUPH;Lo;0;L;<compat> 1157;;;;N;HANGUL LETTER PIEUP SUN GYEONG EUM;;;;
-3185;HANGUL LETTER SSANGHIEUH;Lo;0;L;<compat> 1158;;;;N;HANGUL LETTER SSANG HIEUH;;;;
-3186;HANGUL LETTER YEORINHIEUH;Lo;0;L;<compat> 1159;;;;N;HANGUL LETTER YEOLIN HIEUH;;;;
-3187;HANGUL LETTER YO-YA;Lo;0;L;<compat> 1184;;;;N;HANGUL LETTER YOYA;;;;
-3188;HANGUL LETTER YO-YAE;Lo;0;L;<compat> 1185;;;;N;HANGUL LETTER YOYAE;;;;
-3189;HANGUL LETTER YO-I;Lo;0;L;<compat> 1188;;;;N;HANGUL LETTER YOI;;;;
-318A;HANGUL LETTER YU-YEO;Lo;0;L;<compat> 1191;;;;N;HANGUL LETTER YUYEO;;;;
-318B;HANGUL LETTER YU-YE;Lo;0;L;<compat> 1192;;;;N;HANGUL LETTER YUYE;;;;
-318C;HANGUL LETTER YU-I;Lo;0;L;<compat> 1194;;;;N;HANGUL LETTER YUI;;;;
-318D;HANGUL LETTER ARAEA;Lo;0;L;<compat> 119E;;;;N;HANGUL LETTER ALAE A;;;;
-318E;HANGUL LETTER ARAEAE;Lo;0;L;<compat> 11A1;;;;N;HANGUL LETTER ALAE AE;;;;
-3190;IDEOGRAPHIC ANNOTATION LINKING MARK;So;0;L;;;;;N;KANBUN TATETEN;Kanbun Tateten;;;
-3191;IDEOGRAPHIC ANNOTATION REVERSE MARK;So;0;L;;;;;N;KAERITEN RE;Kaeriten;;;
-3192;IDEOGRAPHIC ANNOTATION ONE MARK;No;0;L;<super> 4E00;;;1;N;KAERITEN ITI;Kaeriten;;;
-3193;IDEOGRAPHIC ANNOTATION TWO MARK;No;0;L;<super> 4E8C;;;2;N;KAERITEN NI;Kaeriten;;;
-3194;IDEOGRAPHIC ANNOTATION THREE MARK;No;0;L;<super> 4E09;;;3;N;KAERITEN SAN;Kaeriten;;;
-3195;IDEOGRAPHIC ANNOTATION FOUR MARK;No;0;L;<super> 56DB;;;4;N;KAERITEN SI;Kaeriten;;;
-3196;IDEOGRAPHIC ANNOTATION TOP MARK;So;0;L;<super> 4E0A;;;;N;KAERITEN ZYOU;Kaeriten;;;
-3197;IDEOGRAPHIC ANNOTATION MIDDLE MARK;So;0;L;<super> 4E2D;;;;N;KAERITEN TYUU;Kaeriten;;;
-3198;IDEOGRAPHIC ANNOTATION BOTTOM MARK;So;0;L;<super> 4E0B;;;;N;KAERITEN GE;Kaeriten;;;
-3199;IDEOGRAPHIC ANNOTATION FIRST MARK;So;0;L;<super> 7532;;;;N;KAERITEN KOU;Kaeriten;;;
-319A;IDEOGRAPHIC ANNOTATION SECOND MARK;So;0;L;<super> 4E59;;;;N;KAERITEN OTU;Kaeriten;;;
-319B;IDEOGRAPHIC ANNOTATION THIRD MARK;So;0;L;<super> 4E19;;;;N;KAERITEN HEI;Kaeriten;;;
-319C;IDEOGRAPHIC ANNOTATION FOURTH MARK;So;0;L;<super> 4E01;;;;N;KAERITEN TEI;Kaeriten;;;
-319D;IDEOGRAPHIC ANNOTATION HEAVEN MARK;So;0;L;<super> 5929;;;;N;KAERITEN TEN;Kaeriten;;;
-319E;IDEOGRAPHIC ANNOTATION EARTH MARK;So;0;L;<super> 5730;;;;N;KAERITEN TI;Kaeriten;;;
-319F;IDEOGRAPHIC ANNOTATION MAN MARK;So;0;L;<super> 4EBA;;;;N;KAERITEN ZIN;Kaeriten;;;
-31A0;BOPOMOFO LETTER BU;Lo;0;L;;;;;N;;;;;
-31A1;BOPOMOFO LETTER ZI;Lo;0;L;;;;;N;;;;;
-31A2;BOPOMOFO LETTER JI;Lo;0;L;;;;;N;;;;;
-31A3;BOPOMOFO LETTER GU;Lo;0;L;;;;;N;;;;;
-31A4;BOPOMOFO LETTER EE;Lo;0;L;;;;;N;;;;;
-31A5;BOPOMOFO LETTER ENN;Lo;0;L;;;;;N;;;;;
-31A6;BOPOMOFO LETTER OO;Lo;0;L;;;;;N;;;;;
-31A7;BOPOMOFO LETTER ONN;Lo;0;L;;;;;N;;;;;
-31A8;BOPOMOFO LETTER IR;Lo;0;L;;;;;N;;;;;
-31A9;BOPOMOFO LETTER ANN;Lo;0;L;;;;;N;;;;;
-31AA;BOPOMOFO LETTER INN;Lo;0;L;;;;;N;;;;;
-31AB;BOPOMOFO LETTER UNN;Lo;0;L;;;;;N;;;;;
-31AC;BOPOMOFO LETTER IM;Lo;0;L;;;;;N;;;;;
-31AD;BOPOMOFO LETTER NGG;Lo;0;L;;;;;N;;;;;
-31AE;BOPOMOFO LETTER AINN;Lo;0;L;;;;;N;;;;;
-31AF;BOPOMOFO LETTER AUNN;Lo;0;L;;;;;N;;;;;
-31B0;BOPOMOFO LETTER AM;Lo;0;L;;;;;N;;;;;
-31B1;BOPOMOFO LETTER OM;Lo;0;L;;;;;N;;;;;
-31B2;BOPOMOFO LETTER ONG;Lo;0;L;;;;;N;;;;;
-31B3;BOPOMOFO LETTER INNN;Lo;0;L;;;;;N;;;;;
-31B4;BOPOMOFO FINAL LETTER P;Lo;0;L;;;;;N;;;;;
-31B5;BOPOMOFO FINAL LETTER T;Lo;0;L;;;;;N;;;;;
-31B6;BOPOMOFO FINAL LETTER K;Lo;0;L;;;;;N;;;;;
-31B7;BOPOMOFO FINAL LETTER H;Lo;0;L;;;;;N;;;;;
-31C0;CJK STROKE T;So;0;ON;;;;;N;;;;;
-31C1;CJK STROKE WG;So;0;ON;;;;;N;;;;;
-31C2;CJK STROKE XG;So;0;ON;;;;;N;;;;;
-31C3;CJK STROKE BXG;So;0;ON;;;;;N;;;;;
-31C4;CJK STROKE SW;So;0;ON;;;;;N;;;;;
-31C5;CJK STROKE HZZ;So;0;ON;;;;;N;;;;;
-31C6;CJK STROKE HZG;So;0;ON;;;;;N;;;;;
-31C7;CJK STROKE HP;So;0;ON;;;;;N;;;;;
-31C8;CJK STROKE HZWG;So;0;ON;;;;;N;;;;;
-31C9;CJK STROKE SZWG;So;0;ON;;;;;N;;;;;
-31CA;CJK STROKE HZT;So;0;ON;;;;;N;;;;;
-31CB;CJK STROKE HZZP;So;0;ON;;;;;N;;;;;
-31CC;CJK STROKE HPWG;So;0;ON;;;;;N;;;;;
-31CD;CJK STROKE HZW;So;0;ON;;;;;N;;;;;
-31CE;CJK STROKE HZZZ;So;0;ON;;;;;N;;;;;
-31CF;CJK STROKE N;So;0;ON;;;;;N;;;;;
-31D0;CJK STROKE H;So;0;ON;;;;;N;;;;;
-31D1;CJK STROKE S;So;0;ON;;;;;N;;;;;
-31D2;CJK STROKE P;So;0;ON;;;;;N;;;;;
-31D3;CJK STROKE SP;So;0;ON;;;;;N;;;;;
-31D4;CJK STROKE D;So;0;ON;;;;;N;;;;;
-31D5;CJK STROKE HZ;So;0;ON;;;;;N;;;;;
-31D6;CJK STROKE HG;So;0;ON;;;;;N;;;;;
-31D7;CJK STROKE SZ;So;0;ON;;;;;N;;;;;
-31D8;CJK STROKE SWZ;So;0;ON;;;;;N;;;;;
-31D9;CJK STROKE ST;So;0;ON;;;;;N;;;;;
-31DA;CJK STROKE SG;So;0;ON;;;;;N;;;;;
-31DB;CJK STROKE PD;So;0;ON;;;;;N;;;;;
-31DC;CJK STROKE PZ;So;0;ON;;;;;N;;;;;
-31DD;CJK STROKE TN;So;0;ON;;;;;N;;;;;
-31DE;CJK STROKE SZZ;So;0;ON;;;;;N;;;;;
-31DF;CJK STROKE SWG;So;0;ON;;;;;N;;;;;
-31E0;CJK STROKE HXWG;So;0;ON;;;;;N;;;;;
-31E1;CJK STROKE HZZZG;So;0;ON;;;;;N;;;;;
-31E2;CJK STROKE PG;So;0;ON;;;;;N;;;;;
-31E3;CJK STROKE Q;So;0;ON;;;;;N;;;;;
-31F0;KATAKANA LETTER SMALL KU;Lo;0;L;;;;;N;;;;;
-31F1;KATAKANA LETTER SMALL SI;Lo;0;L;;;;;N;;;;;
-31F2;KATAKANA LETTER SMALL SU;Lo;0;L;;;;;N;;;;;
-31F3;KATAKANA LETTER SMALL TO;Lo;0;L;;;;;N;;;;;
-31F4;KATAKANA LETTER SMALL NU;Lo;0;L;;;;;N;;;;;
-31F5;KATAKANA LETTER SMALL HA;Lo;0;L;;;;;N;;;;;
-31F6;KATAKANA LETTER SMALL HI;Lo;0;L;;;;;N;;;;;
-31F7;KATAKANA LETTER SMALL HU;Lo;0;L;;;;;N;;;;;
-31F8;KATAKANA LETTER SMALL HE;Lo;0;L;;;;;N;;;;;
-31F9;KATAKANA LETTER SMALL HO;Lo;0;L;;;;;N;;;;;
-31FA;KATAKANA LETTER SMALL MU;Lo;0;L;;;;;N;;;;;
-31FB;KATAKANA LETTER SMALL RA;Lo;0;L;;;;;N;;;;;
-31FC;KATAKANA LETTER SMALL RI;Lo;0;L;;;;;N;;;;;
-31FD;KATAKANA LETTER SMALL RU;Lo;0;L;;;;;N;;;;;
-31FE;KATAKANA LETTER SMALL RE;Lo;0;L;;;;;N;;;;;
-31FF;KATAKANA LETTER SMALL RO;Lo;0;L;;;;;N;;;;;
-3200;PARENTHESIZED HANGUL KIYEOK;So;0;L;<compat> 0028 1100 0029;;;;N;PARENTHESIZED HANGUL GIYEOG;;;;
-3201;PARENTHESIZED HANGUL NIEUN;So;0;L;<compat> 0028 1102 0029;;;;N;;;;;
-3202;PARENTHESIZED HANGUL TIKEUT;So;0;L;<compat> 0028 1103 0029;;;;N;PARENTHESIZED HANGUL DIGEUD;;;;
-3203;PARENTHESIZED HANGUL RIEUL;So;0;L;<compat> 0028 1105 0029;;;;N;PARENTHESIZED HANGUL LIEUL;;;;
-3204;PARENTHESIZED HANGUL MIEUM;So;0;L;<compat> 0028 1106 0029;;;;N;;;;;
-3205;PARENTHESIZED HANGUL PIEUP;So;0;L;<compat> 0028 1107 0029;;;;N;PARENTHESIZED HANGUL BIEUB;;;;
-3206;PARENTHESIZED HANGUL SIOS;So;0;L;<compat> 0028 1109 0029;;;;N;;;;;
-3207;PARENTHESIZED HANGUL IEUNG;So;0;L;<compat> 0028 110B 0029;;;;N;;;;;
-3208;PARENTHESIZED HANGUL CIEUC;So;0;L;<compat> 0028 110C 0029;;;;N;PARENTHESIZED HANGUL JIEUJ;;;;
-3209;PARENTHESIZED HANGUL CHIEUCH;So;0;L;<compat> 0028 110E 0029;;;;N;PARENTHESIZED HANGUL CIEUC;;;;
-320A;PARENTHESIZED HANGUL KHIEUKH;So;0;L;<compat> 0028 110F 0029;;;;N;PARENTHESIZED HANGUL KIYEOK;;;;
-320B;PARENTHESIZED HANGUL THIEUTH;So;0;L;<compat> 0028 1110 0029;;;;N;PARENTHESIZED HANGUL TIEUT;;;;
-320C;PARENTHESIZED HANGUL PHIEUPH;So;0;L;<compat> 0028 1111 0029;;;;N;PARENTHESIZED HANGUL PIEUP;;;;
-320D;PARENTHESIZED HANGUL HIEUH;So;0;L;<compat> 0028 1112 0029;;;;N;;;;;
-320E;PARENTHESIZED HANGUL KIYEOK A;So;0;L;<compat> 0028 1100 1161 0029;;;;N;PARENTHESIZED HANGUL GA;;;;
-320F;PARENTHESIZED HANGUL NIEUN A;So;0;L;<compat> 0028 1102 1161 0029;;;;N;PARENTHESIZED HANGUL NA;;;;
-3210;PARENTHESIZED HANGUL TIKEUT A;So;0;L;<compat> 0028 1103 1161 0029;;;;N;PARENTHESIZED HANGUL DA;;;;
-3211;PARENTHESIZED HANGUL RIEUL A;So;0;L;<compat> 0028 1105 1161 0029;;;;N;PARENTHESIZED HANGUL LA;;;;
-3212;PARENTHESIZED HANGUL MIEUM A;So;0;L;<compat> 0028 1106 1161 0029;;;;N;PARENTHESIZED HANGUL MA;;;;
-3213;PARENTHESIZED HANGUL PIEUP A;So;0;L;<compat> 0028 1107 1161 0029;;;;N;PARENTHESIZED HANGUL BA;;;;
-3214;PARENTHESIZED HANGUL SIOS A;So;0;L;<compat> 0028 1109 1161 0029;;;;N;PARENTHESIZED HANGUL SA;;;;
-3215;PARENTHESIZED HANGUL IEUNG A;So;0;L;<compat> 0028 110B 1161 0029;;;;N;PARENTHESIZED HANGUL A;;;;
-3216;PARENTHESIZED HANGUL CIEUC A;So;0;L;<compat> 0028 110C 1161 0029;;;;N;PARENTHESIZED HANGUL JA;;;;
-3217;PARENTHESIZED HANGUL CHIEUCH A;So;0;L;<compat> 0028 110E 1161 0029;;;;N;PARENTHESIZED HANGUL CA;;;;
-3218;PARENTHESIZED HANGUL KHIEUKH A;So;0;L;<compat> 0028 110F 1161 0029;;;;N;PARENTHESIZED HANGUL KA;;;;
-3219;PARENTHESIZED HANGUL THIEUTH A;So;0;L;<compat> 0028 1110 1161 0029;;;;N;PARENTHESIZED HANGUL TA;;;;
-321A;PARENTHESIZED HANGUL PHIEUPH A;So;0;L;<compat> 0028 1111 1161 0029;;;;N;PARENTHESIZED HANGUL PA;;;;
-321B;PARENTHESIZED HANGUL HIEUH A;So;0;L;<compat> 0028 1112 1161 0029;;;;N;PARENTHESIZED HANGUL HA;;;;
-321C;PARENTHESIZED HANGUL CIEUC U;So;0;L;<compat> 0028 110C 116E 0029;;;;N;PARENTHESIZED HANGUL JU;;;;
-321D;PARENTHESIZED KOREAN CHARACTER OJEON;So;0;ON;<compat> 0028 110B 1169 110C 1165 11AB 0029;;;;N;;;;;
-321E;PARENTHESIZED KOREAN CHARACTER O HU;So;0;ON;<compat> 0028 110B 1169 1112 116E 0029;;;;N;;;;;
-3220;PARENTHESIZED IDEOGRAPH ONE;No;0;L;<compat> 0028 4E00 0029;;;1;N;;;;;
-3221;PARENTHESIZED IDEOGRAPH TWO;No;0;L;<compat> 0028 4E8C 0029;;;2;N;;;;;
-3222;PARENTHESIZED IDEOGRAPH THREE;No;0;L;<compat> 0028 4E09 0029;;;3;N;;;;;
-3223;PARENTHESIZED IDEOGRAPH FOUR;No;0;L;<compat> 0028 56DB 0029;;;4;N;;;;;
-3224;PARENTHESIZED IDEOGRAPH FIVE;No;0;L;<compat> 0028 4E94 0029;;;5;N;;;;;
-3225;PARENTHESIZED IDEOGRAPH SIX;No;0;L;<compat> 0028 516D 0029;;;6;N;;;;;
-3226;PARENTHESIZED IDEOGRAPH SEVEN;No;0;L;<compat> 0028 4E03 0029;;;7;N;;;;;
-3227;PARENTHESIZED IDEOGRAPH EIGHT;No;0;L;<compat> 0028 516B 0029;;;8;N;;;;;
-3228;PARENTHESIZED IDEOGRAPH NINE;No;0;L;<compat> 0028 4E5D 0029;;;9;N;;;;;
-3229;PARENTHESIZED IDEOGRAPH TEN;No;0;L;<compat> 0028 5341 0029;;;10;N;;;;;
-322A;PARENTHESIZED IDEOGRAPH MOON;So;0;L;<compat> 0028 6708 0029;;;;N;;;;;
-322B;PARENTHESIZED IDEOGRAPH FIRE;So;0;L;<compat> 0028 706B 0029;;;;N;;;;;
-322C;PARENTHESIZED IDEOGRAPH WATER;So;0;L;<compat> 0028 6C34 0029;;;;N;;;;;
-322D;PARENTHESIZED IDEOGRAPH WOOD;So;0;L;<compat> 0028 6728 0029;;;;N;;;;;
-322E;PARENTHESIZED IDEOGRAPH METAL;So;0;L;<compat> 0028 91D1 0029;;;;N;;;;;
-322F;PARENTHESIZED IDEOGRAPH EARTH;So;0;L;<compat> 0028 571F 0029;;;;N;;;;;
-3230;PARENTHESIZED IDEOGRAPH SUN;So;0;L;<compat> 0028 65E5 0029;;;;N;;;;;
-3231;PARENTHESIZED IDEOGRAPH STOCK;So;0;L;<compat> 0028 682A 0029;;;;N;;;;;
-3232;PARENTHESIZED IDEOGRAPH HAVE;So;0;L;<compat> 0028 6709 0029;;;;N;;;;;
-3233;PARENTHESIZED IDEOGRAPH SOCIETY;So;0;L;<compat> 0028 793E 0029;;;;N;;;;;
-3234;PARENTHESIZED IDEOGRAPH NAME;So;0;L;<compat> 0028 540D 0029;;;;N;;;;;
-3235;PARENTHESIZED IDEOGRAPH SPECIAL;So;0;L;<compat> 0028 7279 0029;;;;N;;;;;
-3236;PARENTHESIZED IDEOGRAPH FINANCIAL;So;0;L;<compat> 0028 8CA1 0029;;;;N;;;;;
-3237;PARENTHESIZED IDEOGRAPH CONGRATULATION;So;0;L;<compat> 0028 795D 0029;;;;N;;;;;
-3238;PARENTHESIZED IDEOGRAPH LABOR;So;0;L;<compat> 0028 52B4 0029;;;;N;;;;;
-3239;PARENTHESIZED IDEOGRAPH REPRESENT;So;0;L;<compat> 0028 4EE3 0029;;;;N;;;;;
-323A;PARENTHESIZED IDEOGRAPH CALL;So;0;L;<compat> 0028 547C 0029;;;;N;;;;;
-323B;PARENTHESIZED IDEOGRAPH STUDY;So;0;L;<compat> 0028 5B66 0029;;;;N;;;;;
-323C;PARENTHESIZED IDEOGRAPH SUPERVISE;So;0;L;<compat> 0028 76E3 0029;;;;N;;;;;
-323D;PARENTHESIZED IDEOGRAPH ENTERPRISE;So;0;L;<compat> 0028 4F01 0029;;;;N;;;;;
-323E;PARENTHESIZED IDEOGRAPH RESOURCE;So;0;L;<compat> 0028 8CC7 0029;;;;N;;;;;
-323F;PARENTHESIZED IDEOGRAPH ALLIANCE;So;0;L;<compat> 0028 5354 0029;;;;N;;;;;
-3240;PARENTHESIZED IDEOGRAPH FESTIVAL;So;0;L;<compat> 0028 796D 0029;;;;N;;;;;
-3241;PARENTHESIZED IDEOGRAPH REST;So;0;L;<compat> 0028 4F11 0029;;;;N;;;;;
-3242;PARENTHESIZED IDEOGRAPH SELF;So;0;L;<compat> 0028 81EA 0029;;;;N;;;;;
-3243;PARENTHESIZED IDEOGRAPH REACH;So;0;L;<compat> 0028 81F3 0029;;;;N;;;;;
-3250;PARTNERSHIP SIGN;So;0;ON;<square> 0050 0054 0045;;;;N;;;;;
-3251;CIRCLED NUMBER TWENTY ONE;No;0;ON;<circle> 0032 0031;;;21;N;;;;;
-3252;CIRCLED NUMBER TWENTY TWO;No;0;ON;<circle> 0032 0032;;;22;N;;;;;
-3253;CIRCLED NUMBER TWENTY THREE;No;0;ON;<circle> 0032 0033;;;23;N;;;;;
-3254;CIRCLED NUMBER TWENTY FOUR;No;0;ON;<circle> 0032 0034;;;24;N;;;;;
-3255;CIRCLED NUMBER TWENTY FIVE;No;0;ON;<circle> 0032 0035;;;25;N;;;;;
-3256;CIRCLED NUMBER TWENTY SIX;No;0;ON;<circle> 0032 0036;;;26;N;;;;;
-3257;CIRCLED NUMBER TWENTY SEVEN;No;0;ON;<circle> 0032 0037;;;27;N;;;;;
-3258;CIRCLED NUMBER TWENTY EIGHT;No;0;ON;<circle> 0032 0038;;;28;N;;;;;
-3259;CIRCLED NUMBER TWENTY NINE;No;0;ON;<circle> 0032 0039;;;29;N;;;;;
-325A;CIRCLED NUMBER THIRTY;No;0;ON;<circle> 0033 0030;;;30;N;;;;;
-325B;CIRCLED NUMBER THIRTY ONE;No;0;ON;<circle> 0033 0031;;;31;N;;;;;
-325C;CIRCLED NUMBER THIRTY TWO;No;0;ON;<circle> 0033 0032;;;32;N;;;;;
-325D;CIRCLED NUMBER THIRTY THREE;No;0;ON;<circle> 0033 0033;;;33;N;;;;;
-325E;CIRCLED NUMBER THIRTY FOUR;No;0;ON;<circle> 0033 0034;;;34;N;;;;;
-325F;CIRCLED NUMBER THIRTY FIVE;No;0;ON;<circle> 0033 0035;;;35;N;;;;;
-3260;CIRCLED HANGUL KIYEOK;So;0;L;<circle> 1100;;;;N;CIRCLED HANGUL GIYEOG;;;;
-3261;CIRCLED HANGUL NIEUN;So;0;L;<circle> 1102;;;;N;;;;;
-3262;CIRCLED HANGUL TIKEUT;So;0;L;<circle> 1103;;;;N;CIRCLED HANGUL DIGEUD;;;;
-3263;CIRCLED HANGUL RIEUL;So;0;L;<circle> 1105;;;;N;CIRCLED HANGUL LIEUL;;;;
-3264;CIRCLED HANGUL MIEUM;So;0;L;<circle> 1106;;;;N;;;;;
-3265;CIRCLED HANGUL PIEUP;So;0;L;<circle> 1107;;;;N;CIRCLED HANGUL BIEUB;;;;
-3266;CIRCLED HANGUL SIOS;So;0;L;<circle> 1109;;;;N;;;;;
-3267;CIRCLED HANGUL IEUNG;So;0;L;<circle> 110B;;;;N;;;;;
-3268;CIRCLED HANGUL CIEUC;So;0;L;<circle> 110C;;;;N;CIRCLED HANGUL JIEUJ;;;;
-3269;CIRCLED HANGUL CHIEUCH;So;0;L;<circle> 110E;;;;N;CIRCLED HANGUL CIEUC;;;;
-326A;CIRCLED HANGUL KHIEUKH;So;0;L;<circle> 110F;;;;N;CIRCLED HANGUL KIYEOK;;;;
-326B;CIRCLED HANGUL THIEUTH;So;0;L;<circle> 1110;;;;N;CIRCLED HANGUL TIEUT;;;;
-326C;CIRCLED HANGUL PHIEUPH;So;0;L;<circle> 1111;;;;N;CIRCLED HANGUL PIEUP;;;;
-326D;CIRCLED HANGUL HIEUH;So;0;L;<circle> 1112;;;;N;;;;;
-326E;CIRCLED HANGUL KIYEOK A;So;0;L;<circle> 1100 1161;;;;N;CIRCLED HANGUL GA;;;;
-326F;CIRCLED HANGUL NIEUN A;So;0;L;<circle> 1102 1161;;;;N;CIRCLED HANGUL NA;;;;
-3270;CIRCLED HANGUL TIKEUT A;So;0;L;<circle> 1103 1161;;;;N;CIRCLED HANGUL DA;;;;
-3271;CIRCLED HANGUL RIEUL A;So;0;L;<circle> 1105 1161;;;;N;CIRCLED HANGUL LA;;;;
-3272;CIRCLED HANGUL MIEUM A;So;0;L;<circle> 1106 1161;;;;N;CIRCLED HANGUL MA;;;;
-3273;CIRCLED HANGUL PIEUP A;So;0;L;<circle> 1107 1161;;;;N;CIRCLED HANGUL BA;;;;
-3274;CIRCLED HANGUL SIOS A;So;0;L;<circle> 1109 1161;;;;N;CIRCLED HANGUL SA;;;;
-3275;CIRCLED HANGUL IEUNG A;So;0;L;<circle> 110B 1161;;;;N;CIRCLED HANGUL A;;;;
-3276;CIRCLED HANGUL CIEUC A;So;0;L;<circle> 110C 1161;;;;N;CIRCLED HANGUL JA;;;;
-3277;CIRCLED HANGUL CHIEUCH A;So;0;L;<circle> 110E 1161;;;;N;CIRCLED HANGUL CA;;;;
-3278;CIRCLED HANGUL KHIEUKH A;So;0;L;<circle> 110F 1161;;;;N;CIRCLED HANGUL KA;;;;
-3279;CIRCLED HANGUL THIEUTH A;So;0;L;<circle> 1110 1161;;;;N;CIRCLED HANGUL TA;;;;
-327A;CIRCLED HANGUL PHIEUPH A;So;0;L;<circle> 1111 1161;;;;N;CIRCLED HANGUL PA;;;;
-327B;CIRCLED HANGUL HIEUH A;So;0;L;<circle> 1112 1161;;;;N;CIRCLED HANGUL HA;;;;
-327C;CIRCLED KOREAN CHARACTER CHAMKO;So;0;ON;<circle> 110E 1161 11B7 1100 1169;;;;N;;;;;
-327D;CIRCLED KOREAN CHARACTER JUEUI;So;0;ON;<circle> 110C 116E 110B 1174;;;;N;;;;;
-327E;CIRCLED HANGUL IEUNG U;So;0;ON;<circle> 110B 116E;;;;N;;;;;
-327F;KOREAN STANDARD SYMBOL;So;0;L;;;;;N;;;;;
-3280;CIRCLED IDEOGRAPH ONE;No;0;L;<circle> 4E00;;;1;N;;;;;
-3281;CIRCLED IDEOGRAPH TWO;No;0;L;<circle> 4E8C;;;2;N;;;;;
-3282;CIRCLED IDEOGRAPH THREE;No;0;L;<circle> 4E09;;;3;N;;;;;
-3283;CIRCLED IDEOGRAPH FOUR;No;0;L;<circle> 56DB;;;4;N;;;;;
-3284;CIRCLED IDEOGRAPH FIVE;No;0;L;<circle> 4E94;;;5;N;;;;;
-3285;CIRCLED IDEOGRAPH SIX;No;0;L;<circle> 516D;;;6;N;;;;;
-3286;CIRCLED IDEOGRAPH SEVEN;No;0;L;<circle> 4E03;;;7;N;;;;;
-3287;CIRCLED IDEOGRAPH EIGHT;No;0;L;<circle> 516B;;;8;N;;;;;
-3288;CIRCLED IDEOGRAPH NINE;No;0;L;<circle> 4E5D;;;9;N;;;;;
-3289;CIRCLED IDEOGRAPH TEN;No;0;L;<circle> 5341;;;10;N;;;;;
-328A;CIRCLED IDEOGRAPH MOON;So;0;L;<circle> 6708;;;;N;;;;;
-328B;CIRCLED IDEOGRAPH FIRE;So;0;L;<circle> 706B;;;;N;;;;;
-328C;CIRCLED IDEOGRAPH WATER;So;0;L;<circle> 6C34;;;;N;;;;;
-328D;CIRCLED IDEOGRAPH WOOD;So;0;L;<circle> 6728;;;;N;;;;;
-328E;CIRCLED IDEOGRAPH METAL;So;0;L;<circle> 91D1;;;;N;;;;;
-328F;CIRCLED IDEOGRAPH EARTH;So;0;L;<circle> 571F;;;;N;;;;;
-3290;CIRCLED IDEOGRAPH SUN;So;0;L;<circle> 65E5;;;;N;;;;;
-3291;CIRCLED IDEOGRAPH STOCK;So;0;L;<circle> 682A;;;;N;;;;;
-3292;CIRCLED IDEOGRAPH HAVE;So;0;L;<circle> 6709;;;;N;;;;;
-3293;CIRCLED IDEOGRAPH SOCIETY;So;0;L;<circle> 793E;;;;N;;;;;
-3294;CIRCLED IDEOGRAPH NAME;So;0;L;<circle> 540D;;;;N;;;;;
-3295;CIRCLED IDEOGRAPH SPECIAL;So;0;L;<circle> 7279;;;;N;;;;;
-3296;CIRCLED IDEOGRAPH FINANCIAL;So;0;L;<circle> 8CA1;;;;N;;;;;
-3297;CIRCLED IDEOGRAPH CONGRATULATION;So;0;L;<circle> 795D;;;;N;;;;;
-3298;CIRCLED IDEOGRAPH LABOR;So;0;L;<circle> 52B4;;;;N;;;;;
-3299;CIRCLED IDEOGRAPH SECRET;So;0;L;<circle> 79D8;;;;N;;;;;
-329A;CIRCLED IDEOGRAPH MALE;So;0;L;<circle> 7537;;;;N;;;;;
-329B;CIRCLED IDEOGRAPH FEMALE;So;0;L;<circle> 5973;;;;N;;;;;
-329C;CIRCLED IDEOGRAPH SUITABLE;So;0;L;<circle> 9069;;;;N;;;;;
-329D;CIRCLED IDEOGRAPH EXCELLENT;So;0;L;<circle> 512A;;;;N;;;;;
-329E;CIRCLED IDEOGRAPH PRINT;So;0;L;<circle> 5370;;;;N;;;;;
-329F;CIRCLED IDEOGRAPH ATTENTION;So;0;L;<circle> 6CE8;;;;N;;;;;
-32A0;CIRCLED IDEOGRAPH ITEM;So;0;L;<circle> 9805;;;;N;;;;;
-32A1;CIRCLED IDEOGRAPH REST;So;0;L;<circle> 4F11;;;;N;;;;;
-32A2;CIRCLED IDEOGRAPH COPY;So;0;L;<circle> 5199;;;;N;;;;;
-32A3;CIRCLED IDEOGRAPH CORRECT;So;0;L;<circle> 6B63;;;;N;;;;;
-32A4;CIRCLED IDEOGRAPH HIGH;So;0;L;<circle> 4E0A;;;;N;;;;;
-32A5;CIRCLED IDEOGRAPH CENTRE;So;0;L;<circle> 4E2D;;;;N;CIRCLED IDEOGRAPH CENTER;;;;
-32A6;CIRCLED IDEOGRAPH LOW;So;0;L;<circle> 4E0B;;;;N;;;;;
-32A7;CIRCLED IDEOGRAPH LEFT;So;0;L;<circle> 5DE6;;;;N;;;;;
-32A8;CIRCLED IDEOGRAPH RIGHT;So;0;L;<circle> 53F3;;;;N;;;;;
-32A9;CIRCLED IDEOGRAPH MEDICINE;So;0;L;<circle> 533B;;;;N;;;;;
-32AA;CIRCLED IDEOGRAPH RELIGION;So;0;L;<circle> 5B97;;;;N;;;;;
-32AB;CIRCLED IDEOGRAPH STUDY;So;0;L;<circle> 5B66;;;;N;;;;;
-32AC;CIRCLED IDEOGRAPH SUPERVISE;So;0;L;<circle> 76E3;;;;N;;;;;
-32AD;CIRCLED IDEOGRAPH ENTERPRISE;So;0;L;<circle> 4F01;;;;N;;;;;
-32AE;CIRCLED IDEOGRAPH RESOURCE;So;0;L;<circle> 8CC7;;;;N;;;;;
-32AF;CIRCLED IDEOGRAPH ALLIANCE;So;0;L;<circle> 5354;;;;N;;;;;
-32B0;CIRCLED IDEOGRAPH NIGHT;So;0;L;<circle> 591C;;;;N;;;;;
-32B1;CIRCLED NUMBER THIRTY SIX;No;0;ON;<circle> 0033 0036;;;36;N;;;;;
-32B2;CIRCLED NUMBER THIRTY SEVEN;No;0;ON;<circle> 0033 0037;;;37;N;;;;;
-32B3;CIRCLED NUMBER THIRTY EIGHT;No;0;ON;<circle> 0033 0038;;;38;N;;;;;
-32B4;CIRCLED NUMBER THIRTY NINE;No;0;ON;<circle> 0033 0039;;;39;N;;;;;
-32B5;CIRCLED NUMBER FORTY;No;0;ON;<circle> 0034 0030;;;40;N;;;;;
-32B6;CIRCLED NUMBER FORTY ONE;No;0;ON;<circle> 0034 0031;;;41;N;;;;;
-32B7;CIRCLED NUMBER FORTY TWO;No;0;ON;<circle> 0034 0032;;;42;N;;;;;
-32B8;CIRCLED NUMBER FORTY THREE;No;0;ON;<circle> 0034 0033;;;43;N;;;;;
-32B9;CIRCLED NUMBER FORTY FOUR;No;0;ON;<circle> 0034 0034;;;44;N;;;;;
-32BA;CIRCLED NUMBER FORTY FIVE;No;0;ON;<circle> 0034 0035;;;45;N;;;;;
-32BB;CIRCLED NUMBER FORTY SIX;No;0;ON;<circle> 0034 0036;;;46;N;;;;;
-32BC;CIRCLED NUMBER FORTY SEVEN;No;0;ON;<circle> 0034 0037;;;47;N;;;;;
-32BD;CIRCLED NUMBER FORTY EIGHT;No;0;ON;<circle> 0034 0038;;;48;N;;;;;
-32BE;CIRCLED NUMBER FORTY NINE;No;0;ON;<circle> 0034 0039;;;49;N;;;;;
-32BF;CIRCLED NUMBER FIFTY;No;0;ON;<circle> 0035 0030;;;50;N;;;;;
-32C0;IDEOGRAPHIC TELEGRAPH SYMBOL FOR JANUARY;So;0;L;<compat> 0031 6708;;;;N;;;;;
-32C1;IDEOGRAPHIC TELEGRAPH SYMBOL FOR FEBRUARY;So;0;L;<compat> 0032 6708;;;;N;;;;;
-32C2;IDEOGRAPHIC TELEGRAPH SYMBOL FOR MARCH;So;0;L;<compat> 0033 6708;;;;N;;;;;
-32C3;IDEOGRAPHIC TELEGRAPH SYMBOL FOR APRIL;So;0;L;<compat> 0034 6708;;;;N;;;;;
-32C4;IDEOGRAPHIC TELEGRAPH SYMBOL FOR MAY;So;0;L;<compat> 0035 6708;;;;N;;;;;
-32C5;IDEOGRAPHIC TELEGRAPH SYMBOL FOR JUNE;So;0;L;<compat> 0036 6708;;;;N;;;;;
-32C6;IDEOGRAPHIC TELEGRAPH SYMBOL FOR JULY;So;0;L;<compat> 0037 6708;;;;N;;;;;
-32C7;IDEOGRAPHIC TELEGRAPH SYMBOL FOR AUGUST;So;0;L;<compat> 0038 6708;;;;N;;;;;
-32C8;IDEOGRAPHIC TELEGRAPH SYMBOL FOR SEPTEMBER;So;0;L;<compat> 0039 6708;;;;N;;;;;
-32C9;IDEOGRAPHIC TELEGRAPH SYMBOL FOR OCTOBER;So;0;L;<compat> 0031 0030 6708;;;;N;;;;;
-32CA;IDEOGRAPHIC TELEGRAPH SYMBOL FOR NOVEMBER;So;0;L;<compat> 0031 0031 6708;;;;N;;;;;
-32CB;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DECEMBER;So;0;L;<compat> 0031 0032 6708;;;;N;;;;;
-32CC;SQUARE HG;So;0;ON;<square> 0048 0067;;;;N;;;;;
-32CD;SQUARE ERG;So;0;ON;<square> 0065 0072 0067;;;;N;;;;;
-32CE;SQUARE EV;So;0;ON;<square> 0065 0056;;;;N;;;;;
-32CF;LIMITED LIABILITY SIGN;So;0;ON;<square> 004C 0054 0044;;;;N;;;;;
-32D0;CIRCLED KATAKANA A;So;0;L;<circle> 30A2;;;;N;;;;;
-32D1;CIRCLED KATAKANA I;So;0;L;<circle> 30A4;;;;N;;;;;
-32D2;CIRCLED KATAKANA U;So;0;L;<circle> 30A6;;;;N;;;;;
-32D3;CIRCLED KATAKANA E;So;0;L;<circle> 30A8;;;;N;;;;;
-32D4;CIRCLED KATAKANA O;So;0;L;<circle> 30AA;;;;N;;;;;
-32D5;CIRCLED KATAKANA KA;So;0;L;<circle> 30AB;;;;N;;;;;
-32D6;CIRCLED KATAKANA KI;So;0;L;<circle> 30AD;;;;N;;;;;
-32D7;CIRCLED KATAKANA KU;So;0;L;<circle> 30AF;;;;N;;;;;
-32D8;CIRCLED KATAKANA KE;So;0;L;<circle> 30B1;;;;N;;;;;
-32D9;CIRCLED KATAKANA KO;So;0;L;<circle> 30B3;;;;N;;;;;
-32DA;CIRCLED KATAKANA SA;So;0;L;<circle> 30B5;;;;N;;;;;
-32DB;CIRCLED KATAKANA SI;So;0;L;<circle> 30B7;;;;N;;;;;
-32DC;CIRCLED KATAKANA SU;So;0;L;<circle> 30B9;;;;N;;;;;
-32DD;CIRCLED KATAKANA SE;So;0;L;<circle> 30BB;;;;N;;;;;
-32DE;CIRCLED KATAKANA SO;So;0;L;<circle> 30BD;;;;N;;;;;
-32DF;CIRCLED KATAKANA TA;So;0;L;<circle> 30BF;;;;N;;;;;
-32E0;CIRCLED KATAKANA TI;So;0;L;<circle> 30C1;;;;N;;;;;
-32E1;CIRCLED KATAKANA TU;So;0;L;<circle> 30C4;;;;N;;;;;
-32E2;CIRCLED KATAKANA TE;So;0;L;<circle> 30C6;;;;N;;;;;
-32E3;CIRCLED KATAKANA TO;So;0;L;<circle> 30C8;;;;N;;;;;
-32E4;CIRCLED KATAKANA NA;So;0;L;<circle> 30CA;;;;N;;;;;
-32E5;CIRCLED KATAKANA NI;So;0;L;<circle> 30CB;;;;N;;;;;
-32E6;CIRCLED KATAKANA NU;So;0;L;<circle> 30CC;;;;N;;;;;
-32E7;CIRCLED KATAKANA NE;So;0;L;<circle> 30CD;;;;N;;;;;
-32E8;CIRCLED KATAKANA NO;So;0;L;<circle> 30CE;;;;N;;;;;
-32E9;CIRCLED KATAKANA HA;So;0;L;<circle> 30CF;;;;N;;;;;
-32EA;CIRCLED KATAKANA HI;So;0;L;<circle> 30D2;;;;N;;;;;
-32EB;CIRCLED KATAKANA HU;So;0;L;<circle> 30D5;;;;N;;;;;
-32EC;CIRCLED KATAKANA HE;So;0;L;<circle> 30D8;;;;N;;;;;
-32ED;CIRCLED KATAKANA HO;So;0;L;<circle> 30DB;;;;N;;;;;
-32EE;CIRCLED KATAKANA MA;So;0;L;<circle> 30DE;;;;N;;;;;
-32EF;CIRCLED KATAKANA MI;So;0;L;<circle> 30DF;;;;N;;;;;
-32F0;CIRCLED KATAKANA MU;So;0;L;<circle> 30E0;;;;N;;;;;
-32F1;CIRCLED KATAKANA ME;So;0;L;<circle> 30E1;;;;N;;;;;
-32F2;CIRCLED KATAKANA MO;So;0;L;<circle> 30E2;;;;N;;;;;
-32F3;CIRCLED KATAKANA YA;So;0;L;<circle> 30E4;;;;N;;;;;
-32F4;CIRCLED KATAKANA YU;So;0;L;<circle> 30E6;;;;N;;;;;
-32F5;CIRCLED KATAKANA YO;So;0;L;<circle> 30E8;;;;N;;;;;
-32F6;CIRCLED KATAKANA RA;So;0;L;<circle> 30E9;;;;N;;;;;
-32F7;CIRCLED KATAKANA RI;So;0;L;<circle> 30EA;;;;N;;;;;
-32F8;CIRCLED KATAKANA RU;So;0;L;<circle> 30EB;;;;N;;;;;
-32F9;CIRCLED KATAKANA RE;So;0;L;<circle> 30EC;;;;N;;;;;
-32FA;CIRCLED KATAKANA RO;So;0;L;<circle> 30ED;;;;N;;;;;
-32FB;CIRCLED KATAKANA WA;So;0;L;<circle> 30EF;;;;N;;;;;
-32FC;CIRCLED KATAKANA WI;So;0;L;<circle> 30F0;;;;N;;;;;
-32FD;CIRCLED KATAKANA WE;So;0;L;<circle> 30F1;;;;N;;;;;
-32FE;CIRCLED KATAKANA WO;So;0;L;<circle> 30F2;;;;N;;;;;
-3300;SQUARE APAATO;So;0;L;<square> 30A2 30D1 30FC 30C8;;;;N;SQUARED APAATO;;;;
-3301;SQUARE ARUHUA;So;0;L;<square> 30A2 30EB 30D5 30A1;;;;N;SQUARED ARUHUA;;;;
-3302;SQUARE ANPEA;So;0;L;<square> 30A2 30F3 30DA 30A2;;;;N;SQUARED ANPEA;;;;
-3303;SQUARE AARU;So;0;L;<square> 30A2 30FC 30EB;;;;N;SQUARED AARU;;;;
-3304;SQUARE ININGU;So;0;L;<square> 30A4 30CB 30F3 30B0;;;;N;SQUARED ININGU;;;;
-3305;SQUARE INTI;So;0;L;<square> 30A4 30F3 30C1;;;;N;SQUARED INTI;;;;
-3306;SQUARE UON;So;0;L;<square> 30A6 30A9 30F3;;;;N;SQUARED UON;;;;
-3307;SQUARE ESUKUUDO;So;0;L;<square> 30A8 30B9 30AF 30FC 30C9;;;;N;SQUARED ESUKUUDO;;;;
-3308;SQUARE EEKAA;So;0;L;<square> 30A8 30FC 30AB 30FC;;;;N;SQUARED EEKAA;;;;
-3309;SQUARE ONSU;So;0;L;<square> 30AA 30F3 30B9;;;;N;SQUARED ONSU;;;;
-330A;SQUARE OOMU;So;0;L;<square> 30AA 30FC 30E0;;;;N;SQUARED OOMU;;;;
-330B;SQUARE KAIRI;So;0;L;<square> 30AB 30A4 30EA;;;;N;SQUARED KAIRI;;;;
-330C;SQUARE KARATTO;So;0;L;<square> 30AB 30E9 30C3 30C8;;;;N;SQUARED KARATTO;;;;
-330D;SQUARE KARORII;So;0;L;<square> 30AB 30ED 30EA 30FC;;;;N;SQUARED KARORII;;;;
-330E;SQUARE GARON;So;0;L;<square> 30AC 30ED 30F3;;;;N;SQUARED GARON;;;;
-330F;SQUARE GANMA;So;0;L;<square> 30AC 30F3 30DE;;;;N;SQUARED GANMA;;;;
-3310;SQUARE GIGA;So;0;L;<square> 30AE 30AC;;;;N;SQUARED GIGA;;;;
-3311;SQUARE GINII;So;0;L;<square> 30AE 30CB 30FC;;;;N;SQUARED GINII;;;;
-3312;SQUARE KYURII;So;0;L;<square> 30AD 30E5 30EA 30FC;;;;N;SQUARED KYURII;;;;
-3313;SQUARE GIRUDAA;So;0;L;<square> 30AE 30EB 30C0 30FC;;;;N;SQUARED GIRUDAA;;;;
-3314;SQUARE KIRO;So;0;L;<square> 30AD 30ED;;;;N;SQUARED KIRO;;;;
-3315;SQUARE KIROGURAMU;So;0;L;<square> 30AD 30ED 30B0 30E9 30E0;;;;N;SQUARED KIROGURAMU;;;;
-3316;SQUARE KIROMEETORU;So;0;L;<square> 30AD 30ED 30E1 30FC 30C8 30EB;;;;N;SQUARED KIROMEETORU;;;;
-3317;SQUARE KIROWATTO;So;0;L;<square> 30AD 30ED 30EF 30C3 30C8;;;;N;SQUARED KIROWATTO;;;;
-3318;SQUARE GURAMU;So;0;L;<square> 30B0 30E9 30E0;;;;N;SQUARED GURAMU;;;;
-3319;SQUARE GURAMUTON;So;0;L;<square> 30B0 30E9 30E0 30C8 30F3;;;;N;SQUARED GURAMUTON;;;;
-331A;SQUARE KURUZEIRO;So;0;L;<square> 30AF 30EB 30BC 30A4 30ED;;;;N;SQUARED KURUZEIRO;;;;
-331B;SQUARE KUROONE;So;0;L;<square> 30AF 30ED 30FC 30CD;;;;N;SQUARED KUROONE;;;;
-331C;SQUARE KEESU;So;0;L;<square> 30B1 30FC 30B9;;;;N;SQUARED KEESU;;;;
-331D;SQUARE KORUNA;So;0;L;<square> 30B3 30EB 30CA;;;;N;SQUARED KORUNA;;;;
-331E;SQUARE KOOPO;So;0;L;<square> 30B3 30FC 30DD;;;;N;SQUARED KOOPO;;;;
-331F;SQUARE SAIKURU;So;0;L;<square> 30B5 30A4 30AF 30EB;;;;N;SQUARED SAIKURU;;;;
-3320;SQUARE SANTIIMU;So;0;L;<square> 30B5 30F3 30C1 30FC 30E0;;;;N;SQUARED SANTIIMU;;;;
-3321;SQUARE SIRINGU;So;0;L;<square> 30B7 30EA 30F3 30B0;;;;N;SQUARED SIRINGU;;;;
-3322;SQUARE SENTI;So;0;L;<square> 30BB 30F3 30C1;;;;N;SQUARED SENTI;;;;
-3323;SQUARE SENTO;So;0;L;<square> 30BB 30F3 30C8;;;;N;SQUARED SENTO;;;;
-3324;SQUARE DAASU;So;0;L;<square> 30C0 30FC 30B9;;;;N;SQUARED DAASU;;;;
-3325;SQUARE DESI;So;0;L;<square> 30C7 30B7;;;;N;SQUARED DESI;;;;
-3326;SQUARE DORU;So;0;L;<square> 30C9 30EB;;;;N;SQUARED DORU;;;;
-3327;SQUARE TON;So;0;L;<square> 30C8 30F3;;;;N;SQUARED TON;;;;
-3328;SQUARE NANO;So;0;L;<square> 30CA 30CE;;;;N;SQUARED NANO;;;;
-3329;SQUARE NOTTO;So;0;L;<square> 30CE 30C3 30C8;;;;N;SQUARED NOTTO;;;;
-332A;SQUARE HAITU;So;0;L;<square> 30CF 30A4 30C4;;;;N;SQUARED HAITU;;;;
-332B;SQUARE PAASENTO;So;0;L;<square> 30D1 30FC 30BB 30F3 30C8;;;;N;SQUARED PAASENTO;;;;
-332C;SQUARE PAATU;So;0;L;<square> 30D1 30FC 30C4;;;;N;SQUARED PAATU;;;;
-332D;SQUARE BAARERU;So;0;L;<square> 30D0 30FC 30EC 30EB;;;;N;SQUARED BAARERU;;;;
-332E;SQUARE PIASUTORU;So;0;L;<square> 30D4 30A2 30B9 30C8 30EB;;;;N;SQUARED PIASUTORU;;;;
-332F;SQUARE PIKURU;So;0;L;<square> 30D4 30AF 30EB;;;;N;SQUARED PIKURU;;;;
-3330;SQUARE PIKO;So;0;L;<square> 30D4 30B3;;;;N;SQUARED PIKO;;;;
-3331;SQUARE BIRU;So;0;L;<square> 30D3 30EB;;;;N;SQUARED BIRU;;;;
-3332;SQUARE HUARADDO;So;0;L;<square> 30D5 30A1 30E9 30C3 30C9;;;;N;SQUARED HUARADDO;;;;
-3333;SQUARE HUIITO;So;0;L;<square> 30D5 30A3 30FC 30C8;;;;N;SQUARED HUIITO;;;;
-3334;SQUARE BUSSYERU;So;0;L;<square> 30D6 30C3 30B7 30A7 30EB;;;;N;SQUARED BUSSYERU;;;;
-3335;SQUARE HURAN;So;0;L;<square> 30D5 30E9 30F3;;;;N;SQUARED HURAN;;;;
-3336;SQUARE HEKUTAARU;So;0;L;<square> 30D8 30AF 30BF 30FC 30EB;;;;N;SQUARED HEKUTAARU;;;;
-3337;SQUARE PESO;So;0;L;<square> 30DA 30BD;;;;N;SQUARED PESO;;;;
-3338;SQUARE PENIHI;So;0;L;<square> 30DA 30CB 30D2;;;;N;SQUARED PENIHI;;;;
-3339;SQUARE HERUTU;So;0;L;<square> 30D8 30EB 30C4;;;;N;SQUARED HERUTU;;;;
-333A;SQUARE PENSU;So;0;L;<square> 30DA 30F3 30B9;;;;N;SQUARED PENSU;;;;
-333B;SQUARE PEEZI;So;0;L;<square> 30DA 30FC 30B8;;;;N;SQUARED PEEZI;;;;
-333C;SQUARE BEETA;So;0;L;<square> 30D9 30FC 30BF;;;;N;SQUARED BEETA;;;;
-333D;SQUARE POINTO;So;0;L;<square> 30DD 30A4 30F3 30C8;;;;N;SQUARED POINTO;;;;
-333E;SQUARE BORUTO;So;0;L;<square> 30DC 30EB 30C8;;;;N;SQUARED BORUTO;;;;
-333F;SQUARE HON;So;0;L;<square> 30DB 30F3;;;;N;SQUARED HON;;;;
-3340;SQUARE PONDO;So;0;L;<square> 30DD 30F3 30C9;;;;N;SQUARED PONDO;;;;
-3341;SQUARE HOORU;So;0;L;<square> 30DB 30FC 30EB;;;;N;SQUARED HOORU;;;;
-3342;SQUARE HOON;So;0;L;<square> 30DB 30FC 30F3;;;;N;SQUARED HOON;;;;
-3343;SQUARE MAIKURO;So;0;L;<square> 30DE 30A4 30AF 30ED;;;;N;SQUARED MAIKURO;;;;
-3344;SQUARE MAIRU;So;0;L;<square> 30DE 30A4 30EB;;;;N;SQUARED MAIRU;;;;
-3345;SQUARE MAHHA;So;0;L;<square> 30DE 30C3 30CF;;;;N;SQUARED MAHHA;;;;
-3346;SQUARE MARUKU;So;0;L;<square> 30DE 30EB 30AF;;;;N;SQUARED MARUKU;;;;
-3347;SQUARE MANSYON;So;0;L;<square> 30DE 30F3 30B7 30E7 30F3;;;;N;SQUARED MANSYON;;;;
-3348;SQUARE MIKURON;So;0;L;<square> 30DF 30AF 30ED 30F3;;;;N;SQUARED MIKURON;;;;
-3349;SQUARE MIRI;So;0;L;<square> 30DF 30EA;;;;N;SQUARED MIRI;;;;
-334A;SQUARE MIRIBAARU;So;0;L;<square> 30DF 30EA 30D0 30FC 30EB;;;;N;SQUARED MIRIBAARU;;;;
-334B;SQUARE MEGA;So;0;L;<square> 30E1 30AC;;;;N;SQUARED MEGA;;;;
-334C;SQUARE MEGATON;So;0;L;<square> 30E1 30AC 30C8 30F3;;;;N;SQUARED MEGATON;;;;
-334D;SQUARE MEETORU;So;0;L;<square> 30E1 30FC 30C8 30EB;;;;N;SQUARED MEETORU;;;;
-334E;SQUARE YAADO;So;0;L;<square> 30E4 30FC 30C9;;;;N;SQUARED YAADO;;;;
-334F;SQUARE YAARU;So;0;L;<square> 30E4 30FC 30EB;;;;N;SQUARED YAARU;;;;
-3350;SQUARE YUAN;So;0;L;<square> 30E6 30A2 30F3;;;;N;SQUARED YUAN;;;;
-3351;SQUARE RITTORU;So;0;L;<square> 30EA 30C3 30C8 30EB;;;;N;SQUARED RITTORU;;;;
-3352;SQUARE RIRA;So;0;L;<square> 30EA 30E9;;;;N;SQUARED RIRA;;;;
-3353;SQUARE RUPII;So;0;L;<square> 30EB 30D4 30FC;;;;N;SQUARED RUPII;;;;
-3354;SQUARE RUUBURU;So;0;L;<square> 30EB 30FC 30D6 30EB;;;;N;SQUARED RUUBURU;;;;
-3355;SQUARE REMU;So;0;L;<square> 30EC 30E0;;;;N;SQUARED REMU;;;;
-3356;SQUARE RENTOGEN;So;0;L;<square> 30EC 30F3 30C8 30B2 30F3;;;;N;SQUARED RENTOGEN;;;;
-3357;SQUARE WATTO;So;0;L;<square> 30EF 30C3 30C8;;;;N;SQUARED WATTO;;;;
-3358;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR ZERO;So;0;L;<compat> 0030 70B9;;;;N;;;;;
-3359;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR ONE;So;0;L;<compat> 0031 70B9;;;;N;;;;;
-335A;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TWO;So;0;L;<compat> 0032 70B9;;;;N;;;;;
-335B;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR THREE;So;0;L;<compat> 0033 70B9;;;;N;;;;;
-335C;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR FOUR;So;0;L;<compat> 0034 70B9;;;;N;;;;;
-335D;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR FIVE;So;0;L;<compat> 0035 70B9;;;;N;;;;;
-335E;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR SIX;So;0;L;<compat> 0036 70B9;;;;N;;;;;
-335F;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR SEVEN;So;0;L;<compat> 0037 70B9;;;;N;;;;;
-3360;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR EIGHT;So;0;L;<compat> 0038 70B9;;;;N;;;;;
-3361;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR NINE;So;0;L;<compat> 0039 70B9;;;;N;;;;;
-3362;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TEN;So;0;L;<compat> 0031 0030 70B9;;;;N;;;;;
-3363;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR ELEVEN;So;0;L;<compat> 0031 0031 70B9;;;;N;;;;;
-3364;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TWELVE;So;0;L;<compat> 0031 0032 70B9;;;;N;;;;;
-3365;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR THIRTEEN;So;0;L;<compat> 0031 0033 70B9;;;;N;;;;;
-3366;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR FOURTEEN;So;0;L;<compat> 0031 0034 70B9;;;;N;;;;;
-3367;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR FIFTEEN;So;0;L;<compat> 0031 0035 70B9;;;;N;;;;;
-3368;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR SIXTEEN;So;0;L;<compat> 0031 0036 70B9;;;;N;;;;;
-3369;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR SEVENTEEN;So;0;L;<compat> 0031 0037 70B9;;;;N;;;;;
-336A;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR EIGHTEEN;So;0;L;<compat> 0031 0038 70B9;;;;N;;;;;
-336B;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR NINETEEN;So;0;L;<compat> 0031 0039 70B9;;;;N;;;;;
-336C;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TWENTY;So;0;L;<compat> 0032 0030 70B9;;;;N;;;;;
-336D;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TWENTY-ONE;So;0;L;<compat> 0032 0031 70B9;;;;N;;;;;
-336E;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TWENTY-TWO;So;0;L;<compat> 0032 0032 70B9;;;;N;;;;;
-336F;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TWENTY-THREE;So;0;L;<compat> 0032 0033 70B9;;;;N;;;;;
-3370;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TWENTY-FOUR;So;0;L;<compat> 0032 0034 70B9;;;;N;;;;;
-3371;SQUARE HPA;So;0;L;<square> 0068 0050 0061;;;;N;;;;;
-3372;SQUARE DA;So;0;L;<square> 0064 0061;;;;N;;;;;
-3373;SQUARE AU;So;0;L;<square> 0041 0055;;;;N;;;;;
-3374;SQUARE BAR;So;0;L;<square> 0062 0061 0072;;;;N;;;;;
-3375;SQUARE OV;So;0;L;<square> 006F 0056;;;;N;;;;;
-3376;SQUARE PC;So;0;L;<square> 0070 0063;;;;N;;;;;
-3377;SQUARE DM;So;0;ON;<square> 0064 006D;;;;N;;;;;
-3378;SQUARE DM SQUARED;So;0;ON;<square> 0064 006D 00B2;;;;N;;;;;
-3379;SQUARE DM CUBED;So;0;ON;<square> 0064 006D 00B3;;;;N;;;;;
-337A;SQUARE IU;So;0;ON;<square> 0049 0055;;;;N;;;;;
-337B;SQUARE ERA NAME HEISEI;So;0;L;<square> 5E73 6210;;;;N;SQUARED TWO IDEOGRAPHS ERA NAME HEISEI;;;;
-337C;SQUARE ERA NAME SYOUWA;So;0;L;<square> 662D 548C;;;;N;SQUARED TWO IDEOGRAPHS ERA NAME SYOUWA;;;;
-337D;SQUARE ERA NAME TAISYOU;So;0;L;<square> 5927 6B63;;;;N;SQUARED TWO IDEOGRAPHS ERA NAME TAISYOU;;;;
-337E;SQUARE ERA NAME MEIZI;So;0;L;<square> 660E 6CBB;;;;N;SQUARED TWO IDEOGRAPHS ERA NAME MEIZI;;;;
-337F;SQUARE CORPORATION;So;0;L;<square> 682A 5F0F 4F1A 793E;;;;N;SQUARED FOUR IDEOGRAPHS CORPORATION;;;;
-3380;SQUARE PA AMPS;So;0;L;<square> 0070 0041;;;;N;SQUARED PA AMPS;;;;
-3381;SQUARE NA;So;0;L;<square> 006E 0041;;;;N;SQUARED NA;;;;
-3382;SQUARE MU A;So;0;L;<square> 03BC 0041;;;;N;SQUARED MU A;;;;
-3383;SQUARE MA;So;0;L;<square> 006D 0041;;;;N;SQUARED MA;;;;
-3384;SQUARE KA;So;0;L;<square> 006B 0041;;;;N;SQUARED KA;;;;
-3385;SQUARE KB;So;0;L;<square> 004B 0042;;;;N;SQUARED KB;;;;
-3386;SQUARE MB;So;0;L;<square> 004D 0042;;;;N;SQUARED MB;;;;
-3387;SQUARE GB;So;0;L;<square> 0047 0042;;;;N;SQUARED GB;;;;
-3388;SQUARE CAL;So;0;L;<square> 0063 0061 006C;;;;N;SQUARED CAL;;;;
-3389;SQUARE KCAL;So;0;L;<square> 006B 0063 0061 006C;;;;N;SQUARED KCAL;;;;
-338A;SQUARE PF;So;0;L;<square> 0070 0046;;;;N;SQUARED PF;;;;
-338B;SQUARE NF;So;0;L;<square> 006E 0046;;;;N;SQUARED NF;;;;
-338C;SQUARE MU F;So;0;L;<square> 03BC 0046;;;;N;SQUARED MU F;;;;
-338D;SQUARE MU G;So;0;L;<square> 03BC 0067;;;;N;SQUARED MU G;;;;
-338E;SQUARE MG;So;0;L;<square> 006D 0067;;;;N;SQUARED MG;;;;
-338F;SQUARE KG;So;0;L;<square> 006B 0067;;;;N;SQUARED KG;;;;
-3390;SQUARE HZ;So;0;L;<square> 0048 007A;;;;N;SQUARED HZ;;;;
-3391;SQUARE KHZ;So;0;L;<square> 006B 0048 007A;;;;N;SQUARED KHZ;;;;
-3392;SQUARE MHZ;So;0;L;<square> 004D 0048 007A;;;;N;SQUARED MHZ;;;;
-3393;SQUARE GHZ;So;0;L;<square> 0047 0048 007A;;;;N;SQUARED GHZ;;;;
-3394;SQUARE THZ;So;0;L;<square> 0054 0048 007A;;;;N;SQUARED THZ;;;;
-3395;SQUARE MU L;So;0;L;<square> 03BC 2113;;;;N;SQUARED MU L;;;;
-3396;SQUARE ML;So;0;L;<square> 006D 2113;;;;N;SQUARED ML;;;;
-3397;SQUARE DL;So;0;L;<square> 0064 2113;;;;N;SQUARED DL;;;;
-3398;SQUARE KL;So;0;L;<square> 006B 2113;;;;N;SQUARED KL;;;;
-3399;SQUARE FM;So;0;L;<square> 0066 006D;;;;N;SQUARED FM;;;;
-339A;SQUARE NM;So;0;L;<square> 006E 006D;;;;N;SQUARED NM;;;;
-339B;SQUARE MU M;So;0;L;<square> 03BC 006D;;;;N;SQUARED MU M;;;;
-339C;SQUARE MM;So;0;L;<square> 006D 006D;;;;N;SQUARED MM;;;;
-339D;SQUARE CM;So;0;L;<square> 0063 006D;;;;N;SQUARED CM;;;;
-339E;SQUARE KM;So;0;L;<square> 006B 006D;;;;N;SQUARED KM;;;;
-339F;SQUARE MM SQUARED;So;0;L;<square> 006D 006D 00B2;;;;N;SQUARED MM SQUARED;;;;
-33A0;SQUARE CM SQUARED;So;0;L;<square> 0063 006D 00B2;;;;N;SQUARED CM SQUARED;;;;
-33A1;SQUARE M SQUARED;So;0;L;<square> 006D 00B2;;;;N;SQUARED M SQUARED;;;;
-33A2;SQUARE KM SQUARED;So;0;L;<square> 006B 006D 00B2;;;;N;SQUARED KM SQUARED;;;;
-33A3;SQUARE MM CUBED;So;0;L;<square> 006D 006D 00B3;;;;N;SQUARED MM CUBED;;;;
-33A4;SQUARE CM CUBED;So;0;L;<square> 0063 006D 00B3;;;;N;SQUARED CM CUBED;;;;
-33A5;SQUARE M CUBED;So;0;L;<square> 006D 00B3;;;;N;SQUARED M CUBED;;;;
-33A6;SQUARE KM CUBED;So;0;L;<square> 006B 006D 00B3;;;;N;SQUARED KM CUBED;;;;
-33A7;SQUARE M OVER S;So;0;L;<square> 006D 2215 0073;;;;N;SQUARED M OVER S;;;;
-33A8;SQUARE M OVER S SQUARED;So;0;L;<square> 006D 2215 0073 00B2;;;;N;SQUARED M OVER S SQUARED;;;;
-33A9;SQUARE PA;So;0;L;<square> 0050 0061;;;;N;SQUARED PA;;;;
-33AA;SQUARE KPA;So;0;L;<square> 006B 0050 0061;;;;N;SQUARED KPA;;;;
-33AB;SQUARE MPA;So;0;L;<square> 004D 0050 0061;;;;N;SQUARED MPA;;;;
-33AC;SQUARE GPA;So;0;L;<square> 0047 0050 0061;;;;N;SQUARED GPA;;;;
-33AD;SQUARE RAD;So;0;L;<square> 0072 0061 0064;;;;N;SQUARED RAD;;;;
-33AE;SQUARE RAD OVER S;So;0;L;<square> 0072 0061 0064 2215 0073;;;;N;SQUARED RAD OVER S;;;;
-33AF;SQUARE RAD OVER S SQUARED;So;0;L;<square> 0072 0061 0064 2215 0073 00B2;;;;N;SQUARED RAD OVER S SQUARED;;;;
-33B0;SQUARE PS;So;0;L;<square> 0070 0073;;;;N;SQUARED PS;;;;
-33B1;SQUARE NS;So;0;L;<square> 006E 0073;;;;N;SQUARED NS;;;;
-33B2;SQUARE MU S;So;0;L;<square> 03BC 0073;;;;N;SQUARED MU S;;;;
-33B3;SQUARE MS;So;0;L;<square> 006D 0073;;;;N;SQUARED MS;;;;
-33B4;SQUARE PV;So;0;L;<square> 0070 0056;;;;N;SQUARED PV;;;;
-33B5;SQUARE NV;So;0;L;<square> 006E 0056;;;;N;SQUARED NV;;;;
-33B6;SQUARE MU V;So;0;L;<square> 03BC 0056;;;;N;SQUARED MU V;;;;
-33B7;SQUARE MV;So;0;L;<square> 006D 0056;;;;N;SQUARED MV;;;;
-33B8;SQUARE KV;So;0;L;<square> 006B 0056;;;;N;SQUARED KV;;;;
-33B9;SQUARE MV MEGA;So;0;L;<square> 004D 0056;;;;N;SQUARED MV MEGA;;;;
-33BA;SQUARE PW;So;0;L;<square> 0070 0057;;;;N;SQUARED PW;;;;
-33BB;SQUARE NW;So;0;L;<square> 006E 0057;;;;N;SQUARED NW;;;;
-33BC;SQUARE MU W;So;0;L;<square> 03BC 0057;;;;N;SQUARED MU W;;;;
-33BD;SQUARE MW;So;0;L;<square> 006D 0057;;;;N;SQUARED MW;;;;
-33BE;SQUARE KW;So;0;L;<square> 006B 0057;;;;N;SQUARED KW;;;;
-33BF;SQUARE MW MEGA;So;0;L;<square> 004D 0057;;;;N;SQUARED MW MEGA;;;;
-33C0;SQUARE K OHM;So;0;L;<square> 006B 03A9;;;;N;SQUARED K OHM;;;;
-33C1;SQUARE M OHM;So;0;L;<square> 004D 03A9;;;;N;SQUARED M OHM;;;;
-33C2;SQUARE AM;So;0;L;<square> 0061 002E 006D 002E;;;;N;SQUARED AM;;;;
-33C3;SQUARE BQ;So;0;L;<square> 0042 0071;;;;N;SQUARED BQ;;;;
-33C4;SQUARE CC;So;0;L;<square> 0063 0063;;;;N;SQUARED CC;;;;
-33C5;SQUARE CD;So;0;L;<square> 0063 0064;;;;N;SQUARED CD;;;;
-33C6;SQUARE C OVER KG;So;0;L;<square> 0043 2215 006B 0067;;;;N;SQUARED C OVER KG;;;;
-33C7;SQUARE CO;So;0;L;<square> 0043 006F 002E;;;;N;SQUARED CO;;;;
-33C8;SQUARE DB;So;0;L;<square> 0064 0042;;;;N;SQUARED DB;;;;
-33C9;SQUARE GY;So;0;L;<square> 0047 0079;;;;N;SQUARED GY;;;;
-33CA;SQUARE HA;So;0;L;<square> 0068 0061;;;;N;SQUARED HA;;;;
-33CB;SQUARE HP;So;0;L;<square> 0048 0050;;;;N;SQUARED HP;;;;
-33CC;SQUARE IN;So;0;L;<square> 0069 006E;;;;N;SQUARED IN;;;;
-33CD;SQUARE KK;So;0;L;<square> 004B 004B;;;;N;SQUARED KK;;;;
-33CE;SQUARE KM CAPITAL;So;0;L;<square> 004B 004D;;;;N;SQUARED KM CAPITAL;;;;
-33CF;SQUARE KT;So;0;L;<square> 006B 0074;;;;N;SQUARED KT;;;;
-33D0;SQUARE LM;So;0;L;<square> 006C 006D;;;;N;SQUARED LM;;;;
-33D1;SQUARE LN;So;0;L;<square> 006C 006E;;;;N;SQUARED LN;;;;
-33D2;SQUARE LOG;So;0;L;<square> 006C 006F 0067;;;;N;SQUARED LOG;;;;
-33D3;SQUARE LX;So;0;L;<square> 006C 0078;;;;N;SQUARED LX;;;;
-33D4;SQUARE MB SMALL;So;0;L;<square> 006D 0062;;;;N;SQUARED MB SMALL;;;;
-33D5;SQUARE MIL;So;0;L;<square> 006D 0069 006C;;;;N;SQUARED MIL;;;;
-33D6;SQUARE MOL;So;0;L;<square> 006D 006F 006C;;;;N;SQUARED MOL;;;;
-33D7;SQUARE PH;So;0;L;<square> 0050 0048;;;;N;SQUARED PH;;;;
-33D8;SQUARE PM;So;0;L;<square> 0070 002E 006D 002E;;;;N;SQUARED PM;;;;
-33D9;SQUARE PPM;So;0;L;<square> 0050 0050 004D;;;;N;SQUARED PPM;;;;
-33DA;SQUARE PR;So;0;L;<square> 0050 0052;;;;N;SQUARED PR;;;;
-33DB;SQUARE SR;So;0;L;<square> 0073 0072;;;;N;SQUARED SR;;;;
-33DC;SQUARE SV;So;0;L;<square> 0053 0076;;;;N;SQUARED SV;;;;
-33DD;SQUARE WB;So;0;L;<square> 0057 0062;;;;N;SQUARED WB;;;;
-33DE;SQUARE V OVER M;So;0;ON;<square> 0056 2215 006D;;;;N;;;;;
-33DF;SQUARE A OVER M;So;0;ON;<square> 0041 2215 006D;;;;N;;;;;
-33E0;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY ONE;So;0;L;<compat> 0031 65E5;;;;N;;;;;
-33E1;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWO;So;0;L;<compat> 0032 65E5;;;;N;;;;;
-33E2;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY THREE;So;0;L;<compat> 0033 65E5;;;;N;;;;;
-33E3;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY FOUR;So;0;L;<compat> 0034 65E5;;;;N;;;;;
-33E4;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY FIVE;So;0;L;<compat> 0035 65E5;;;;N;;;;;
-33E5;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY SIX;So;0;L;<compat> 0036 65E5;;;;N;;;;;
-33E6;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY SEVEN;So;0;L;<compat> 0037 65E5;;;;N;;;;;
-33E7;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY EIGHT;So;0;L;<compat> 0038 65E5;;;;N;;;;;
-33E8;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY NINE;So;0;L;<compat> 0039 65E5;;;;N;;;;;
-33E9;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TEN;So;0;L;<compat> 0031 0030 65E5;;;;N;;;;;
-33EA;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY ELEVEN;So;0;L;<compat> 0031 0031 65E5;;;;N;;;;;
-33EB;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWELVE;So;0;L;<compat> 0031 0032 65E5;;;;N;;;;;
-33EC;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY THIRTEEN;So;0;L;<compat> 0031 0033 65E5;;;;N;;;;;
-33ED;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY FOURTEEN;So;0;L;<compat> 0031 0034 65E5;;;;N;;;;;
-33EE;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY FIFTEEN;So;0;L;<compat> 0031 0035 65E5;;;;N;;;;;
-33EF;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY SIXTEEN;So;0;L;<compat> 0031 0036 65E5;;;;N;;;;;
-33F0;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY SEVENTEEN;So;0;L;<compat> 0031 0037 65E5;;;;N;;;;;
-33F1;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY EIGHTEEN;So;0;L;<compat> 0031 0038 65E5;;;;N;;;;;
-33F2;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY NINETEEN;So;0;L;<compat> 0031 0039 65E5;;;;N;;;;;
-33F3;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY;So;0;L;<compat> 0032 0030 65E5;;;;N;;;;;
-33F4;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-ONE;So;0;L;<compat> 0032 0031 65E5;;;;N;;;;;
-33F5;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-TWO;So;0;L;<compat> 0032 0032 65E5;;;;N;;;;;
-33F6;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-THREE;So;0;L;<compat> 0032 0033 65E5;;;;N;;;;;
-33F7;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-FOUR;So;0;L;<compat> 0032 0034 65E5;;;;N;;;;;
-33F8;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-FIVE;So;0;L;<compat> 0032 0035 65E5;;;;N;;;;;
-33F9;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-SIX;So;0;L;<compat> 0032 0036 65E5;;;;N;;;;;
-33FA;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-SEVEN;So;0;L;<compat> 0032 0037 65E5;;;;N;;;;;
-33FB;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-EIGHT;So;0;L;<compat> 0032 0038 65E5;;;;N;;;;;
-33FC;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-NINE;So;0;L;<compat> 0032 0039 65E5;;;;N;;;;;
-33FD;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY THIRTY;So;0;L;<compat> 0033 0030 65E5;;;;N;;;;;
-33FE;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY THIRTY-ONE;So;0;L;<compat> 0033 0031 65E5;;;;N;;;;;
-33FF;SQUARE GAL;So;0;ON;<square> 0067 0061 006C;;;;N;;;;;
-3400;<CJK Ideograph Extension A, First>;Lo;0;L;;;;;N;;;;;
-4DB5;<CJK Ideograph Extension A, Last>;Lo;0;L;;;;;N;;;;;
-4DC0;HEXAGRAM FOR THE CREATIVE HEAVEN;So;0;ON;;;;;N;;;;;
-4DC1;HEXAGRAM FOR THE RECEPTIVE EARTH;So;0;ON;;;;;N;;;;;
-4DC2;HEXAGRAM FOR DIFFICULTY AT THE BEGINNING;So;0;ON;;;;;N;;;;;
-4DC3;HEXAGRAM FOR YOUTHFUL FOLLY;So;0;ON;;;;;N;;;;;
-4DC4;HEXAGRAM FOR WAITING;So;0;ON;;;;;N;;;;;
-4DC5;HEXAGRAM FOR CONFLICT;So;0;ON;;;;;N;;;;;
-4DC6;HEXAGRAM FOR THE ARMY;So;0;ON;;;;;N;;;;;
-4DC7;HEXAGRAM FOR HOLDING TOGETHER;So;0;ON;;;;;N;;;;;
-4DC8;HEXAGRAM FOR SMALL TAMING;So;0;ON;;;;;N;;;;;
-4DC9;HEXAGRAM FOR TREADING;So;0;ON;;;;;N;;;;;
-4DCA;HEXAGRAM FOR PEACE;So;0;ON;;;;;N;;;;;
-4DCB;HEXAGRAM FOR STANDSTILL;So;0;ON;;;;;N;;;;;
-4DCC;HEXAGRAM FOR FELLOWSHIP;So;0;ON;;;;;N;;;;;
-4DCD;HEXAGRAM FOR GREAT POSSESSION;So;0;ON;;;;;N;;;;;
-4DCE;HEXAGRAM FOR MODESTY;So;0;ON;;;;;N;;;;;
-4DCF;HEXAGRAM FOR ENTHUSIASM;So;0;ON;;;;;N;;;;;
-4DD0;HEXAGRAM FOR FOLLOWING;So;0;ON;;;;;N;;;;;
-4DD1;HEXAGRAM FOR WORK ON THE DECAYED;So;0;ON;;;;;N;;;;;
-4DD2;HEXAGRAM FOR APPROACH;So;0;ON;;;;;N;;;;;
-4DD3;HEXAGRAM FOR CONTEMPLATION;So;0;ON;;;;;N;;;;;
-4DD4;HEXAGRAM FOR BITING THROUGH;So;0;ON;;;;;N;;;;;
-4DD5;HEXAGRAM FOR GRACE;So;0;ON;;;;;N;;;;;
-4DD6;HEXAGRAM FOR SPLITTING APART;So;0;ON;;;;;N;;;;;
-4DD7;HEXAGRAM FOR RETURN;So;0;ON;;;;;N;;;;;
-4DD8;HEXAGRAM FOR INNOCENCE;So;0;ON;;;;;N;;;;;
-4DD9;HEXAGRAM FOR GREAT TAMING;So;0;ON;;;;;N;;;;;
-4DDA;HEXAGRAM FOR MOUTH CORNERS;So;0;ON;;;;;N;;;;;
-4DDB;HEXAGRAM FOR GREAT PREPONDERANCE;So;0;ON;;;;;N;;;;;
-4DDC;HEXAGRAM FOR THE ABYSMAL WATER;So;0;ON;;;;;N;;;;;
-4DDD;HEXAGRAM FOR THE CLINGING FIRE;So;0;ON;;;;;N;;;;;
-4DDE;HEXAGRAM FOR INFLUENCE;So;0;ON;;;;;N;;;;;
-4DDF;HEXAGRAM FOR DURATION;So;0;ON;;;;;N;;;;;
-4DE0;HEXAGRAM FOR RETREAT;So;0;ON;;;;;N;;;;;
-4DE1;HEXAGRAM FOR GREAT POWER;So;0;ON;;;;;N;;;;;
-4DE2;HEXAGRAM FOR PROGRESS;So;0;ON;;;;;N;;;;;
-4DE3;HEXAGRAM FOR DARKENING OF THE LIGHT;So;0;ON;;;;;N;;;;;
-4DE4;HEXAGRAM FOR THE FAMILY;So;0;ON;;;;;N;;;;;
-4DE5;HEXAGRAM FOR OPPOSITION;So;0;ON;;;;;N;;;;;
-4DE6;HEXAGRAM FOR OBSTRUCTION;So;0;ON;;;;;N;;;;;
-4DE7;HEXAGRAM FOR DELIVERANCE;So;0;ON;;;;;N;;;;;
-4DE8;HEXAGRAM FOR DECREASE;So;0;ON;;;;;N;;;;;
-4DE9;HEXAGRAM FOR INCREASE;So;0;ON;;;;;N;;;;;
-4DEA;HEXAGRAM FOR BREAKTHROUGH;So;0;ON;;;;;N;;;;;
-4DEB;HEXAGRAM FOR COMING TO MEET;So;0;ON;;;;;N;;;;;
-4DEC;HEXAGRAM FOR GATHERING TOGETHER;So;0;ON;;;;;N;;;;;
-4DED;HEXAGRAM FOR PUSHING UPWARD;So;0;ON;;;;;N;;;;;
-4DEE;HEXAGRAM FOR OPPRESSION;So;0;ON;;;;;N;;;;;
-4DEF;HEXAGRAM FOR THE WELL;So;0;ON;;;;;N;;;;;
-4DF0;HEXAGRAM FOR REVOLUTION;So;0;ON;;;;;N;;;;;
-4DF1;HEXAGRAM FOR THE CAULDRON;So;0;ON;;;;;N;;;;;
-4DF2;HEXAGRAM FOR THE AROUSING THUNDER;So;0;ON;;;;;N;;;;;
-4DF3;HEXAGRAM FOR THE KEEPING STILL MOUNTAIN;So;0;ON;;;;;N;;;;;
-4DF4;HEXAGRAM FOR DEVELOPMENT;So;0;ON;;;;;N;;;;;
-4DF5;HEXAGRAM FOR THE MARRYING MAIDEN;So;0;ON;;;;;N;;;;;
-4DF6;HEXAGRAM FOR ABUNDANCE;So;0;ON;;;;;N;;;;;
-4DF7;HEXAGRAM FOR THE WANDERER;So;0;ON;;;;;N;;;;;
-4DF8;HEXAGRAM FOR THE GENTLE WIND;So;0;ON;;;;;N;;;;;
-4DF9;HEXAGRAM FOR THE JOYOUS LAKE;So;0;ON;;;;;N;;;;;
-4DFA;HEXAGRAM FOR DISPERSION;So;0;ON;;;;;N;;;;;
-4DFB;HEXAGRAM FOR LIMITATION;So;0;ON;;;;;N;;;;;
-4DFC;HEXAGRAM FOR INNER TRUTH;So;0;ON;;;;;N;;;;;
-4DFD;HEXAGRAM FOR SMALL PREPONDERANCE;So;0;ON;;;;;N;;;;;
-4DFE;HEXAGRAM FOR AFTER COMPLETION;So;0;ON;;;;;N;;;;;
-4DFF;HEXAGRAM FOR BEFORE COMPLETION;So;0;ON;;;;;N;;;;;
-4E00;<CJK Ideograph, First>;Lo;0;L;;;;;N;;;;;
-9FC3;<CJK Ideograph, Last>;Lo;0;L;;;;;N;;;;;
-A000;YI SYLLABLE IT;Lo;0;L;;;;;N;;;;;
-A001;YI SYLLABLE IX;Lo;0;L;;;;;N;;;;;
-A002;YI SYLLABLE I;Lo;0;L;;;;;N;;;;;
-A003;YI SYLLABLE IP;Lo;0;L;;;;;N;;;;;
-A004;YI SYLLABLE IET;Lo;0;L;;;;;N;;;;;
-A005;YI SYLLABLE IEX;Lo;0;L;;;;;N;;;;;
-A006;YI SYLLABLE IE;Lo;0;L;;;;;N;;;;;
-A007;YI SYLLABLE IEP;Lo;0;L;;;;;N;;;;;
-A008;YI SYLLABLE AT;Lo;0;L;;;;;N;;;;;
-A009;YI SYLLABLE AX;Lo;0;L;;;;;N;;;;;
-A00A;YI SYLLABLE A;Lo;0;L;;;;;N;;;;;
-A00B;YI SYLLABLE AP;Lo;0;L;;;;;N;;;;;
-A00C;YI SYLLABLE UOX;Lo;0;L;;;;;N;;;;;
-A00D;YI SYLLABLE UO;Lo;0;L;;;;;N;;;;;
-A00E;YI SYLLABLE UOP;Lo;0;L;;;;;N;;;;;
-A00F;YI SYLLABLE OT;Lo;0;L;;;;;N;;;;;
-A010;YI SYLLABLE OX;Lo;0;L;;;;;N;;;;;
-A011;YI SYLLABLE O;Lo;0;L;;;;;N;;;;;
-A012;YI SYLLABLE OP;Lo;0;L;;;;;N;;;;;
-A013;YI SYLLABLE EX;Lo;0;L;;;;;N;;;;;
-A014;YI SYLLABLE E;Lo;0;L;;;;;N;;;;;
-A015;YI SYLLABLE WU;Lm;0;L;;;;;N;;;;;
-A016;YI SYLLABLE BIT;Lo;0;L;;;;;N;;;;;
-A017;YI SYLLABLE BIX;Lo;0;L;;;;;N;;;;;
-A018;YI SYLLABLE BI;Lo;0;L;;;;;N;;;;;
-A019;YI SYLLABLE BIP;Lo;0;L;;;;;N;;;;;
-A01A;YI SYLLABLE BIET;Lo;0;L;;;;;N;;;;;
-A01B;YI SYLLABLE BIEX;Lo;0;L;;;;;N;;;;;
-A01C;YI SYLLABLE BIE;Lo;0;L;;;;;N;;;;;
-A01D;YI SYLLABLE BIEP;Lo;0;L;;;;;N;;;;;
-A01E;YI SYLLABLE BAT;Lo;0;L;;;;;N;;;;;
-A01F;YI SYLLABLE BAX;Lo;0;L;;;;;N;;;;;
-A020;YI SYLLABLE BA;Lo;0;L;;;;;N;;;;;
-A021;YI SYLLABLE BAP;Lo;0;L;;;;;N;;;;;
-A022;YI SYLLABLE BUOX;Lo;0;L;;;;;N;;;;;
-A023;YI SYLLABLE BUO;Lo;0;L;;;;;N;;;;;
-A024;YI SYLLABLE BUOP;Lo;0;L;;;;;N;;;;;
-A025;YI SYLLABLE BOT;Lo;0;L;;;;;N;;;;;
-A026;YI SYLLABLE BOX;Lo;0;L;;;;;N;;;;;
-A027;YI SYLLABLE BO;Lo;0;L;;;;;N;;;;;
-A028;YI SYLLABLE BOP;Lo;0;L;;;;;N;;;;;
-A029;YI SYLLABLE BEX;Lo;0;L;;;;;N;;;;;
-A02A;YI SYLLABLE BE;Lo;0;L;;;;;N;;;;;
-A02B;YI SYLLABLE BEP;Lo;0;L;;;;;N;;;;;
-A02C;YI SYLLABLE BUT;Lo;0;L;;;;;N;;;;;
-A02D;YI SYLLABLE BUX;Lo;0;L;;;;;N;;;;;
-A02E;YI SYLLABLE BU;Lo;0;L;;;;;N;;;;;
-A02F;YI SYLLABLE BUP;Lo;0;L;;;;;N;;;;;
-A030;YI SYLLABLE BURX;Lo;0;L;;;;;N;;;;;
-A031;YI SYLLABLE BUR;Lo;0;L;;;;;N;;;;;
-A032;YI SYLLABLE BYT;Lo;0;L;;;;;N;;;;;
-A033;YI SYLLABLE BYX;Lo;0;L;;;;;N;;;;;
-A034;YI SYLLABLE BY;Lo;0;L;;;;;N;;;;;
-A035;YI SYLLABLE BYP;Lo;0;L;;;;;N;;;;;
-A036;YI SYLLABLE BYRX;Lo;0;L;;;;;N;;;;;
-A037;YI SYLLABLE BYR;Lo;0;L;;;;;N;;;;;
-A038;YI SYLLABLE PIT;Lo;0;L;;;;;N;;;;;
-A039;YI SYLLABLE PIX;Lo;0;L;;;;;N;;;;;
-A03A;YI SYLLABLE PI;Lo;0;L;;;;;N;;;;;
-A03B;YI SYLLABLE PIP;Lo;0;L;;;;;N;;;;;
-A03C;YI SYLLABLE PIEX;Lo;0;L;;;;;N;;;;;
-A03D;YI SYLLABLE PIE;Lo;0;L;;;;;N;;;;;
-A03E;YI SYLLABLE PIEP;Lo;0;L;;;;;N;;;;;
-A03F;YI SYLLABLE PAT;Lo;0;L;;;;;N;;;;;
-A040;YI SYLLABLE PAX;Lo;0;L;;;;;N;;;;;
-A041;YI SYLLABLE PA;Lo;0;L;;;;;N;;;;;
-A042;YI SYLLABLE PAP;Lo;0;L;;;;;N;;;;;
-A043;YI SYLLABLE PUOX;Lo;0;L;;;;;N;;;;;
-A044;YI SYLLABLE PUO;Lo;0;L;;;;;N;;;;;
-A045;YI SYLLABLE PUOP;Lo;0;L;;;;;N;;;;;
-A046;YI SYLLABLE POT;Lo;0;L;;;;;N;;;;;
-A047;YI SYLLABLE POX;Lo;0;L;;;;;N;;;;;
-A048;YI SYLLABLE PO;Lo;0;L;;;;;N;;;;;
-A049;YI SYLLABLE POP;Lo;0;L;;;;;N;;;;;
-A04A;YI SYLLABLE PUT;Lo;0;L;;;;;N;;;;;
-A04B;YI SYLLABLE PUX;Lo;0;L;;;;;N;;;;;
-A04C;YI SYLLABLE PU;Lo;0;L;;;;;N;;;;;
-A04D;YI SYLLABLE PUP;Lo;0;L;;;;;N;;;;;
-A04E;YI SYLLABLE PURX;Lo;0;L;;;;;N;;;;;
-A04F;YI SYLLABLE PUR;Lo;0;L;;;;;N;;;;;
-A050;YI SYLLABLE PYT;Lo;0;L;;;;;N;;;;;
-A051;YI SYLLABLE PYX;Lo;0;L;;;;;N;;;;;
-A052;YI SYLLABLE PY;Lo;0;L;;;;;N;;;;;
-A053;YI SYLLABLE PYP;Lo;0;L;;;;;N;;;;;
-A054;YI SYLLABLE PYRX;Lo;0;L;;;;;N;;;;;
-A055;YI SYLLABLE PYR;Lo;0;L;;;;;N;;;;;
-A056;YI SYLLABLE BBIT;Lo;0;L;;;;;N;;;;;
-A057;YI SYLLABLE BBIX;Lo;0;L;;;;;N;;;;;
-A058;YI SYLLABLE BBI;Lo;0;L;;;;;N;;;;;
-A059;YI SYLLABLE BBIP;Lo;0;L;;;;;N;;;;;
-A05A;YI SYLLABLE BBIET;Lo;0;L;;;;;N;;;;;
-A05B;YI SYLLABLE BBIEX;Lo;0;L;;;;;N;;;;;
-A05C;YI SYLLABLE BBIE;Lo;0;L;;;;;N;;;;;
-A05D;YI SYLLABLE BBIEP;Lo;0;L;;;;;N;;;;;
-A05E;YI SYLLABLE BBAT;Lo;0;L;;;;;N;;;;;
-A05F;YI SYLLABLE BBAX;Lo;0;L;;;;;N;;;;;
-A060;YI SYLLABLE BBA;Lo;0;L;;;;;N;;;;;
-A061;YI SYLLABLE BBAP;Lo;0;L;;;;;N;;;;;
-A062;YI SYLLABLE BBUOX;Lo;0;L;;;;;N;;;;;
-A063;YI SYLLABLE BBUO;Lo;0;L;;;;;N;;;;;
-A064;YI SYLLABLE BBUOP;Lo;0;L;;;;;N;;;;;
-A065;YI SYLLABLE BBOT;Lo;0;L;;;;;N;;;;;
-A066;YI SYLLABLE BBOX;Lo;0;L;;;;;N;;;;;
-A067;YI SYLLABLE BBO;Lo;0;L;;;;;N;;;;;
-A068;YI SYLLABLE BBOP;Lo;0;L;;;;;N;;;;;
-A069;YI SYLLABLE BBEX;Lo;0;L;;;;;N;;;;;
-A06A;YI SYLLABLE BBE;Lo;0;L;;;;;N;;;;;
-A06B;YI SYLLABLE BBEP;Lo;0;L;;;;;N;;;;;
-A06C;YI SYLLABLE BBUT;Lo;0;L;;;;;N;;;;;
-A06D;YI SYLLABLE BBUX;Lo;0;L;;;;;N;;;;;
-A06E;YI SYLLABLE BBU;Lo;0;L;;;;;N;;;;;
-A06F;YI SYLLABLE BBUP;Lo;0;L;;;;;N;;;;;
-A070;YI SYLLABLE BBURX;Lo;0;L;;;;;N;;;;;
-A071;YI SYLLABLE BBUR;Lo;0;L;;;;;N;;;;;
-A072;YI SYLLABLE BBYT;Lo;0;L;;;;;N;;;;;
-A073;YI SYLLABLE BBYX;Lo;0;L;;;;;N;;;;;
-A074;YI SYLLABLE BBY;Lo;0;L;;;;;N;;;;;
-A075;YI SYLLABLE BBYP;Lo;0;L;;;;;N;;;;;
-A076;YI SYLLABLE NBIT;Lo;0;L;;;;;N;;;;;
-A077;YI SYLLABLE NBIX;Lo;0;L;;;;;N;;;;;
-A078;YI SYLLABLE NBI;Lo;0;L;;;;;N;;;;;
-A079;YI SYLLABLE NBIP;Lo;0;L;;;;;N;;;;;
-A07A;YI SYLLABLE NBIEX;Lo;0;L;;;;;N;;;;;
-A07B;YI SYLLABLE NBIE;Lo;0;L;;;;;N;;;;;
-A07C;YI SYLLABLE NBIEP;Lo;0;L;;;;;N;;;;;
-A07D;YI SYLLABLE NBAT;Lo;0;L;;;;;N;;;;;
-A07E;YI SYLLABLE NBAX;Lo;0;L;;;;;N;;;;;
-A07F;YI SYLLABLE NBA;Lo;0;L;;;;;N;;;;;
-A080;YI SYLLABLE NBAP;Lo;0;L;;;;;N;;;;;
-A081;YI SYLLABLE NBOT;Lo;0;L;;;;;N;;;;;
-A082;YI SYLLABLE NBOX;Lo;0;L;;;;;N;;;;;
-A083;YI SYLLABLE NBO;Lo;0;L;;;;;N;;;;;
-A084;YI SYLLABLE NBOP;Lo;0;L;;;;;N;;;;;
-A085;YI SYLLABLE NBUT;Lo;0;L;;;;;N;;;;;
-A086;YI SYLLABLE NBUX;Lo;0;L;;;;;N;;;;;
-A087;YI SYLLABLE NBU;Lo;0;L;;;;;N;;;;;
-A088;YI SYLLABLE NBUP;Lo;0;L;;;;;N;;;;;
-A089;YI SYLLABLE NBURX;Lo;0;L;;;;;N;;;;;
-A08A;YI SYLLABLE NBUR;Lo;0;L;;;;;N;;;;;
-A08B;YI SYLLABLE NBYT;Lo;0;L;;;;;N;;;;;
-A08C;YI SYLLABLE NBYX;Lo;0;L;;;;;N;;;;;
-A08D;YI SYLLABLE NBY;Lo;0;L;;;;;N;;;;;
-A08E;YI SYLLABLE NBYP;Lo;0;L;;;;;N;;;;;
-A08F;YI SYLLABLE NBYRX;Lo;0;L;;;;;N;;;;;
-A090;YI SYLLABLE NBYR;Lo;0;L;;;;;N;;;;;
-A091;YI SYLLABLE HMIT;Lo;0;L;;;;;N;;;;;
-A092;YI SYLLABLE HMIX;Lo;0;L;;;;;N;;;;;
-A093;YI SYLLABLE HMI;Lo;0;L;;;;;N;;;;;
-A094;YI SYLLABLE HMIP;Lo;0;L;;;;;N;;;;;
-A095;YI SYLLABLE HMIEX;Lo;0;L;;;;;N;;;;;
-A096;YI SYLLABLE HMIE;Lo;0;L;;;;;N;;;;;
-A097;YI SYLLABLE HMIEP;Lo;0;L;;;;;N;;;;;
-A098;YI SYLLABLE HMAT;Lo;0;L;;;;;N;;;;;
-A099;YI SYLLABLE HMAX;Lo;0;L;;;;;N;;;;;
-A09A;YI SYLLABLE HMA;Lo;0;L;;;;;N;;;;;
-A09B;YI SYLLABLE HMAP;Lo;0;L;;;;;N;;;;;
-A09C;YI SYLLABLE HMUOX;Lo;0;L;;;;;N;;;;;
-A09D;YI SYLLABLE HMUO;Lo;0;L;;;;;N;;;;;
-A09E;YI SYLLABLE HMUOP;Lo;0;L;;;;;N;;;;;
-A09F;YI SYLLABLE HMOT;Lo;0;L;;;;;N;;;;;
-A0A0;YI SYLLABLE HMOX;Lo;0;L;;;;;N;;;;;
-A0A1;YI SYLLABLE HMO;Lo;0;L;;;;;N;;;;;
-A0A2;YI SYLLABLE HMOP;Lo;0;L;;;;;N;;;;;
-A0A3;YI SYLLABLE HMUT;Lo;0;L;;;;;N;;;;;
-A0A4;YI SYLLABLE HMUX;Lo;0;L;;;;;N;;;;;
-A0A5;YI SYLLABLE HMU;Lo;0;L;;;;;N;;;;;
-A0A6;YI SYLLABLE HMUP;Lo;0;L;;;;;N;;;;;
-A0A7;YI SYLLABLE HMURX;Lo;0;L;;;;;N;;;;;
-A0A8;YI SYLLABLE HMUR;Lo;0;L;;;;;N;;;;;
-A0A9;YI SYLLABLE HMYX;Lo;0;L;;;;;N;;;;;
-A0AA;YI SYLLABLE HMY;Lo;0;L;;;;;N;;;;;
-A0AB;YI SYLLABLE HMYP;Lo;0;L;;;;;N;;;;;
-A0AC;YI SYLLABLE HMYRX;Lo;0;L;;;;;N;;;;;
-A0AD;YI SYLLABLE HMYR;Lo;0;L;;;;;N;;;;;
-A0AE;YI SYLLABLE MIT;Lo;0;L;;;;;N;;;;;
-A0AF;YI SYLLABLE MIX;Lo;0;L;;;;;N;;;;;
-A0B0;YI SYLLABLE MI;Lo;0;L;;;;;N;;;;;
-A0B1;YI SYLLABLE MIP;Lo;0;L;;;;;N;;;;;
-A0B2;YI SYLLABLE MIEX;Lo;0;L;;;;;N;;;;;
-A0B3;YI SYLLABLE MIE;Lo;0;L;;;;;N;;;;;
-A0B4;YI SYLLABLE MIEP;Lo;0;L;;;;;N;;;;;
-A0B5;YI SYLLABLE MAT;Lo;0;L;;;;;N;;;;;
-A0B6;YI SYLLABLE MAX;Lo;0;L;;;;;N;;;;;
-A0B7;YI SYLLABLE MA;Lo;0;L;;;;;N;;;;;
-A0B8;YI SYLLABLE MAP;Lo;0;L;;;;;N;;;;;
-A0B9;YI SYLLABLE MUOT;Lo;0;L;;;;;N;;;;;
-A0BA;YI SYLLABLE MUOX;Lo;0;L;;;;;N;;;;;
-A0BB;YI SYLLABLE MUO;Lo;0;L;;;;;N;;;;;
-A0BC;YI SYLLABLE MUOP;Lo;0;L;;;;;N;;;;;
-A0BD;YI SYLLABLE MOT;Lo;0;L;;;;;N;;;;;
-A0BE;YI SYLLABLE MOX;Lo;0;L;;;;;N;;;;;
-A0BF;YI SYLLABLE MO;Lo;0;L;;;;;N;;;;;
-A0C0;YI SYLLABLE MOP;Lo;0;L;;;;;N;;;;;
-A0C1;YI SYLLABLE MEX;Lo;0;L;;;;;N;;;;;
-A0C2;YI SYLLABLE ME;Lo;0;L;;;;;N;;;;;
-A0C3;YI SYLLABLE MUT;Lo;0;L;;;;;N;;;;;
-A0C4;YI SYLLABLE MUX;Lo;0;L;;;;;N;;;;;
-A0C5;YI SYLLABLE MU;Lo;0;L;;;;;N;;;;;
-A0C6;YI SYLLABLE MUP;Lo;0;L;;;;;N;;;;;
-A0C7;YI SYLLABLE MURX;Lo;0;L;;;;;N;;;;;
-A0C8;YI SYLLABLE MUR;Lo;0;L;;;;;N;;;;;
-A0C9;YI SYLLABLE MYT;Lo;0;L;;;;;N;;;;;
-A0CA;YI SYLLABLE MYX;Lo;0;L;;;;;N;;;;;
-A0CB;YI SYLLABLE MY;Lo;0;L;;;;;N;;;;;
-A0CC;YI SYLLABLE MYP;Lo;0;L;;;;;N;;;;;
-A0CD;YI SYLLABLE FIT;Lo;0;L;;;;;N;;;;;
-A0CE;YI SYLLABLE FIX;Lo;0;L;;;;;N;;;;;
-A0CF;YI SYLLABLE FI;Lo;0;L;;;;;N;;;;;
-A0D0;YI SYLLABLE FIP;Lo;0;L;;;;;N;;;;;
-A0D1;YI SYLLABLE FAT;Lo;0;L;;;;;N;;;;;
-A0D2;YI SYLLABLE FAX;Lo;0;L;;;;;N;;;;;
-A0D3;YI SYLLABLE FA;Lo;0;L;;;;;N;;;;;
-A0D4;YI SYLLABLE FAP;Lo;0;L;;;;;N;;;;;
-A0D5;YI SYLLABLE FOX;Lo;0;L;;;;;N;;;;;
-A0D6;YI SYLLABLE FO;Lo;0;L;;;;;N;;;;;
-A0D7;YI SYLLABLE FOP;Lo;0;L;;;;;N;;;;;
-A0D8;YI SYLLABLE FUT;Lo;0;L;;;;;N;;;;;
-A0D9;YI SYLLABLE FUX;Lo;0;L;;;;;N;;;;;
-A0DA;YI SYLLABLE FU;Lo;0;L;;;;;N;;;;;
-A0DB;YI SYLLABLE FUP;Lo;0;L;;;;;N;;;;;
-A0DC;YI SYLLABLE FURX;Lo;0;L;;;;;N;;;;;
-A0DD;YI SYLLABLE FUR;Lo;0;L;;;;;N;;;;;
-A0DE;YI SYLLABLE FYT;Lo;0;L;;;;;N;;;;;
-A0DF;YI SYLLABLE FYX;Lo;0;L;;;;;N;;;;;
-A0E0;YI SYLLABLE FY;Lo;0;L;;;;;N;;;;;
-A0E1;YI SYLLABLE FYP;Lo;0;L;;;;;N;;;;;
-A0E2;YI SYLLABLE VIT;Lo;0;L;;;;;N;;;;;
-A0E3;YI SYLLABLE VIX;Lo;0;L;;;;;N;;;;;
-A0E4;YI SYLLABLE VI;Lo;0;L;;;;;N;;;;;
-A0E5;YI SYLLABLE VIP;Lo;0;L;;;;;N;;;;;
-A0E6;YI SYLLABLE VIET;Lo;0;L;;;;;N;;;;;
-A0E7;YI SYLLABLE VIEX;Lo;0;L;;;;;N;;;;;
-A0E8;YI SYLLABLE VIE;Lo;0;L;;;;;N;;;;;
-A0E9;YI SYLLABLE VIEP;Lo;0;L;;;;;N;;;;;
-A0EA;YI SYLLABLE VAT;Lo;0;L;;;;;N;;;;;
-A0EB;YI SYLLABLE VAX;Lo;0;L;;;;;N;;;;;
-A0EC;YI SYLLABLE VA;Lo;0;L;;;;;N;;;;;
-A0ED;YI SYLLABLE VAP;Lo;0;L;;;;;N;;;;;
-A0EE;YI SYLLABLE VOT;Lo;0;L;;;;;N;;;;;
-A0EF;YI SYLLABLE VOX;Lo;0;L;;;;;N;;;;;
-A0F0;YI SYLLABLE VO;Lo;0;L;;;;;N;;;;;
-A0F1;YI SYLLABLE VOP;Lo;0;L;;;;;N;;;;;
-A0F2;YI SYLLABLE VEX;Lo;0;L;;;;;N;;;;;
-A0F3;YI SYLLABLE VEP;Lo;0;L;;;;;N;;;;;
-A0F4;YI SYLLABLE VUT;Lo;0;L;;;;;N;;;;;
-A0F5;YI SYLLABLE VUX;Lo;0;L;;;;;N;;;;;
-A0F6;YI SYLLABLE VU;Lo;0;L;;;;;N;;;;;
-A0F7;YI SYLLABLE VUP;Lo;0;L;;;;;N;;;;;
-A0F8;YI SYLLABLE VURX;Lo;0;L;;;;;N;;;;;
-A0F9;YI SYLLABLE VUR;Lo;0;L;;;;;N;;;;;
-A0FA;YI SYLLABLE VYT;Lo;0;L;;;;;N;;;;;
-A0FB;YI SYLLABLE VYX;Lo;0;L;;;;;N;;;;;
-A0FC;YI SYLLABLE VY;Lo;0;L;;;;;N;;;;;
-A0FD;YI SYLLABLE VYP;Lo;0;L;;;;;N;;;;;
-A0FE;YI SYLLABLE VYRX;Lo;0;L;;;;;N;;;;;
-A0FF;YI SYLLABLE VYR;Lo;0;L;;;;;N;;;;;
-A100;YI SYLLABLE DIT;Lo;0;L;;;;;N;;;;;
-A101;YI SYLLABLE DIX;Lo;0;L;;;;;N;;;;;
-A102;YI SYLLABLE DI;Lo;0;L;;;;;N;;;;;
-A103;YI SYLLABLE DIP;Lo;0;L;;;;;N;;;;;
-A104;YI SYLLABLE DIEX;Lo;0;L;;;;;N;;;;;
-A105;YI SYLLABLE DIE;Lo;0;L;;;;;N;;;;;
-A106;YI SYLLABLE DIEP;Lo;0;L;;;;;N;;;;;
-A107;YI SYLLABLE DAT;Lo;0;L;;;;;N;;;;;
-A108;YI SYLLABLE DAX;Lo;0;L;;;;;N;;;;;
-A109;YI SYLLABLE DA;Lo;0;L;;;;;N;;;;;
-A10A;YI SYLLABLE DAP;Lo;0;L;;;;;N;;;;;
-A10B;YI SYLLABLE DUOX;Lo;0;L;;;;;N;;;;;
-A10C;YI SYLLABLE DUO;Lo;0;L;;;;;N;;;;;
-A10D;YI SYLLABLE DOT;Lo;0;L;;;;;N;;;;;
-A10E;YI SYLLABLE DOX;Lo;0;L;;;;;N;;;;;
-A10F;YI SYLLABLE DO;Lo;0;L;;;;;N;;;;;
-A110;YI SYLLABLE DOP;Lo;0;L;;;;;N;;;;;
-A111;YI SYLLABLE DEX;Lo;0;L;;;;;N;;;;;
-A112;YI SYLLABLE DE;Lo;0;L;;;;;N;;;;;
-A113;YI SYLLABLE DEP;Lo;0;L;;;;;N;;;;;
-A114;YI SYLLABLE DUT;Lo;0;L;;;;;N;;;;;
-A115;YI SYLLABLE DUX;Lo;0;L;;;;;N;;;;;
-A116;YI SYLLABLE DU;Lo;0;L;;;;;N;;;;;
-A117;YI SYLLABLE DUP;Lo;0;L;;;;;N;;;;;
-A118;YI SYLLABLE DURX;Lo;0;L;;;;;N;;;;;
-A119;YI SYLLABLE DUR;Lo;0;L;;;;;N;;;;;
-A11A;YI SYLLABLE TIT;Lo;0;L;;;;;N;;;;;
-A11B;YI SYLLABLE TIX;Lo;0;L;;;;;N;;;;;
-A11C;YI SYLLABLE TI;Lo;0;L;;;;;N;;;;;
-A11D;YI SYLLABLE TIP;Lo;0;L;;;;;N;;;;;
-A11E;YI SYLLABLE TIEX;Lo;0;L;;;;;N;;;;;
-A11F;YI SYLLABLE TIE;Lo;0;L;;;;;N;;;;;
-A120;YI SYLLABLE TIEP;Lo;0;L;;;;;N;;;;;
-A121;YI SYLLABLE TAT;Lo;0;L;;;;;N;;;;;
-A122;YI SYLLABLE TAX;Lo;0;L;;;;;N;;;;;
-A123;YI SYLLABLE TA;Lo;0;L;;;;;N;;;;;
-A124;YI SYLLABLE TAP;Lo;0;L;;;;;N;;;;;
-A125;YI SYLLABLE TUOT;Lo;0;L;;;;;N;;;;;
-A126;YI SYLLABLE TUOX;Lo;0;L;;;;;N;;;;;
-A127;YI SYLLABLE TUO;Lo;0;L;;;;;N;;;;;
-A128;YI SYLLABLE TUOP;Lo;0;L;;;;;N;;;;;
-A129;YI SYLLABLE TOT;Lo;0;L;;;;;N;;;;;
-A12A;YI SYLLABLE TOX;Lo;0;L;;;;;N;;;;;
-A12B;YI SYLLABLE TO;Lo;0;L;;;;;N;;;;;
-A12C;YI SYLLABLE TOP;Lo;0;L;;;;;N;;;;;
-A12D;YI SYLLABLE TEX;Lo;0;L;;;;;N;;;;;
-A12E;YI SYLLABLE TE;Lo;0;L;;;;;N;;;;;
-A12F;YI SYLLABLE TEP;Lo;0;L;;;;;N;;;;;
-A130;YI SYLLABLE TUT;Lo;0;L;;;;;N;;;;;
-A131;YI SYLLABLE TUX;Lo;0;L;;;;;N;;;;;
-A132;YI SYLLABLE TU;Lo;0;L;;;;;N;;;;;
-A133;YI SYLLABLE TUP;Lo;0;L;;;;;N;;;;;
-A134;YI SYLLABLE TURX;Lo;0;L;;;;;N;;;;;
-A135;YI SYLLABLE TUR;Lo;0;L;;;;;N;;;;;
-A136;YI SYLLABLE DDIT;Lo;0;L;;;;;N;;;;;
-A137;YI SYLLABLE DDIX;Lo;0;L;;;;;N;;;;;
-A138;YI SYLLABLE DDI;Lo;0;L;;;;;N;;;;;
-A139;YI SYLLABLE DDIP;Lo;0;L;;;;;N;;;;;
-A13A;YI SYLLABLE DDIEX;Lo;0;L;;;;;N;;;;;
-A13B;YI SYLLABLE DDIE;Lo;0;L;;;;;N;;;;;
-A13C;YI SYLLABLE DDIEP;Lo;0;L;;;;;N;;;;;
-A13D;YI SYLLABLE DDAT;Lo;0;L;;;;;N;;;;;
-A13E;YI SYLLABLE DDAX;Lo;0;L;;;;;N;;;;;
-A13F;YI SYLLABLE DDA;Lo;0;L;;;;;N;;;;;
-A140;YI SYLLABLE DDAP;Lo;0;L;;;;;N;;;;;
-A141;YI SYLLABLE DDUOX;Lo;0;L;;;;;N;;;;;
-A142;YI SYLLABLE DDUO;Lo;0;L;;;;;N;;;;;
-A143;YI SYLLABLE DDUOP;Lo;0;L;;;;;N;;;;;
-A144;YI SYLLABLE DDOT;Lo;0;L;;;;;N;;;;;
-A145;YI SYLLABLE DDOX;Lo;0;L;;;;;N;;;;;
-A146;YI SYLLABLE DDO;Lo;0;L;;;;;N;;;;;
-A147;YI SYLLABLE DDOP;Lo;0;L;;;;;N;;;;;
-A148;YI SYLLABLE DDEX;Lo;0;L;;;;;N;;;;;
-A149;YI SYLLABLE DDE;Lo;0;L;;;;;N;;;;;
-A14A;YI SYLLABLE DDEP;Lo;0;L;;;;;N;;;;;
-A14B;YI SYLLABLE DDUT;Lo;0;L;;;;;N;;;;;
-A14C;YI SYLLABLE DDUX;Lo;0;L;;;;;N;;;;;
-A14D;YI SYLLABLE DDU;Lo;0;L;;;;;N;;;;;
-A14E;YI SYLLABLE DDUP;Lo;0;L;;;;;N;;;;;
-A14F;YI SYLLABLE DDURX;Lo;0;L;;;;;N;;;;;
-A150;YI SYLLABLE DDUR;Lo;0;L;;;;;N;;;;;
-A151;YI SYLLABLE NDIT;Lo;0;L;;;;;N;;;;;
-A152;YI SYLLABLE NDIX;Lo;0;L;;;;;N;;;;;
-A153;YI SYLLABLE NDI;Lo;0;L;;;;;N;;;;;
-A154;YI SYLLABLE NDIP;Lo;0;L;;;;;N;;;;;
-A155;YI SYLLABLE NDIEX;Lo;0;L;;;;;N;;;;;
-A156;YI SYLLABLE NDIE;Lo;0;L;;;;;N;;;;;
-A157;YI SYLLABLE NDAT;Lo;0;L;;;;;N;;;;;
-A158;YI SYLLABLE NDAX;Lo;0;L;;;;;N;;;;;
-A159;YI SYLLABLE NDA;Lo;0;L;;;;;N;;;;;
-A15A;YI SYLLABLE NDAP;Lo;0;L;;;;;N;;;;;
-A15B;YI SYLLABLE NDOT;Lo;0;L;;;;;N;;;;;
-A15C;YI SYLLABLE NDOX;Lo;0;L;;;;;N;;;;;
-A15D;YI SYLLABLE NDO;Lo;0;L;;;;;N;;;;;
-A15E;YI SYLLABLE NDOP;Lo;0;L;;;;;N;;;;;
-A15F;YI SYLLABLE NDEX;Lo;0;L;;;;;N;;;;;
-A160;YI SYLLABLE NDE;Lo;0;L;;;;;N;;;;;
-A161;YI SYLLABLE NDEP;Lo;0;L;;;;;N;;;;;
-A162;YI SYLLABLE NDUT;Lo;0;L;;;;;N;;;;;
-A163;YI SYLLABLE NDUX;Lo;0;L;;;;;N;;;;;
-A164;YI SYLLABLE NDU;Lo;0;L;;;;;N;;;;;
-A165;YI SYLLABLE NDUP;Lo;0;L;;;;;N;;;;;
-A166;YI SYLLABLE NDURX;Lo;0;L;;;;;N;;;;;
-A167;YI SYLLABLE NDUR;Lo;0;L;;;;;N;;;;;
-A168;YI SYLLABLE HNIT;Lo;0;L;;;;;N;;;;;
-A169;YI SYLLABLE HNIX;Lo;0;L;;;;;N;;;;;
-A16A;YI SYLLABLE HNI;Lo;0;L;;;;;N;;;;;
-A16B;YI SYLLABLE HNIP;Lo;0;L;;;;;N;;;;;
-A16C;YI SYLLABLE HNIET;Lo;0;L;;;;;N;;;;;
-A16D;YI SYLLABLE HNIEX;Lo;0;L;;;;;N;;;;;
-A16E;YI SYLLABLE HNIE;Lo;0;L;;;;;N;;;;;
-A16F;YI SYLLABLE HNIEP;Lo;0;L;;;;;N;;;;;
-A170;YI SYLLABLE HNAT;Lo;0;L;;;;;N;;;;;
-A171;YI SYLLABLE HNAX;Lo;0;L;;;;;N;;;;;
-A172;YI SYLLABLE HNA;Lo;0;L;;;;;N;;;;;
-A173;YI SYLLABLE HNAP;Lo;0;L;;;;;N;;;;;
-A174;YI SYLLABLE HNUOX;Lo;0;L;;;;;N;;;;;
-A175;YI SYLLABLE HNUO;Lo;0;L;;;;;N;;;;;
-A176;YI SYLLABLE HNOT;Lo;0;L;;;;;N;;;;;
-A177;YI SYLLABLE HNOX;Lo;0;L;;;;;N;;;;;
-A178;YI SYLLABLE HNOP;Lo;0;L;;;;;N;;;;;
-A179;YI SYLLABLE HNEX;Lo;0;L;;;;;N;;;;;
-A17A;YI SYLLABLE HNE;Lo;0;L;;;;;N;;;;;
-A17B;YI SYLLABLE HNEP;Lo;0;L;;;;;N;;;;;
-A17C;YI SYLLABLE HNUT;Lo;0;L;;;;;N;;;;;
-A17D;YI SYLLABLE NIT;Lo;0;L;;;;;N;;;;;
-A17E;YI SYLLABLE NIX;Lo;0;L;;;;;N;;;;;
-A17F;YI SYLLABLE NI;Lo;0;L;;;;;N;;;;;
-A180;YI SYLLABLE NIP;Lo;0;L;;;;;N;;;;;
-A181;YI SYLLABLE NIEX;Lo;0;L;;;;;N;;;;;
-A182;YI SYLLABLE NIE;Lo;0;L;;;;;N;;;;;
-A183;YI SYLLABLE NIEP;Lo;0;L;;;;;N;;;;;
-A184;YI SYLLABLE NAX;Lo;0;L;;;;;N;;;;;
-A185;YI SYLLABLE NA;Lo;0;L;;;;;N;;;;;
-A186;YI SYLLABLE NAP;Lo;0;L;;;;;N;;;;;
-A187;YI SYLLABLE NUOX;Lo;0;L;;;;;N;;;;;
-A188;YI SYLLABLE NUO;Lo;0;L;;;;;N;;;;;
-A189;YI SYLLABLE NUOP;Lo;0;L;;;;;N;;;;;
-A18A;YI SYLLABLE NOT;Lo;0;L;;;;;N;;;;;
-A18B;YI SYLLABLE NOX;Lo;0;L;;;;;N;;;;;
-A18C;YI SYLLABLE NO;Lo;0;L;;;;;N;;;;;
-A18D;YI SYLLABLE NOP;Lo;0;L;;;;;N;;;;;
-A18E;YI SYLLABLE NEX;Lo;0;L;;;;;N;;;;;
-A18F;YI SYLLABLE NE;Lo;0;L;;;;;N;;;;;
-A190;YI SYLLABLE NEP;Lo;0;L;;;;;N;;;;;
-A191;YI SYLLABLE NUT;Lo;0;L;;;;;N;;;;;
-A192;YI SYLLABLE NUX;Lo;0;L;;;;;N;;;;;
-A193;YI SYLLABLE NU;Lo;0;L;;;;;N;;;;;
-A194;YI SYLLABLE NUP;Lo;0;L;;;;;N;;;;;
-A195;YI SYLLABLE NURX;Lo;0;L;;;;;N;;;;;
-A196;YI SYLLABLE NUR;Lo;0;L;;;;;N;;;;;
-A197;YI SYLLABLE HLIT;Lo;0;L;;;;;N;;;;;
-A198;YI SYLLABLE HLIX;Lo;0;L;;;;;N;;;;;
-A199;YI SYLLABLE HLI;Lo;0;L;;;;;N;;;;;
-A19A;YI SYLLABLE HLIP;Lo;0;L;;;;;N;;;;;
-A19B;YI SYLLABLE HLIEX;Lo;0;L;;;;;N;;;;;
-A19C;YI SYLLABLE HLIE;Lo;0;L;;;;;N;;;;;
-A19D;YI SYLLABLE HLIEP;Lo;0;L;;;;;N;;;;;
-A19E;YI SYLLABLE HLAT;Lo;0;L;;;;;N;;;;;
-A19F;YI SYLLABLE HLAX;Lo;0;L;;;;;N;;;;;
-A1A0;YI SYLLABLE HLA;Lo;0;L;;;;;N;;;;;
-A1A1;YI SYLLABLE HLAP;Lo;0;L;;;;;N;;;;;
-A1A2;YI SYLLABLE HLUOX;Lo;0;L;;;;;N;;;;;
-A1A3;YI SYLLABLE HLUO;Lo;0;L;;;;;N;;;;;
-A1A4;YI SYLLABLE HLUOP;Lo;0;L;;;;;N;;;;;
-A1A5;YI SYLLABLE HLOX;Lo;0;L;;;;;N;;;;;
-A1A6;YI SYLLABLE HLO;Lo;0;L;;;;;N;;;;;
-A1A7;YI SYLLABLE HLOP;Lo;0;L;;;;;N;;;;;
-A1A8;YI SYLLABLE HLEX;Lo;0;L;;;;;N;;;;;
-A1A9;YI SYLLABLE HLE;Lo;0;L;;;;;N;;;;;
-A1AA;YI SYLLABLE HLEP;Lo;0;L;;;;;N;;;;;
-A1AB;YI SYLLABLE HLUT;Lo;0;L;;;;;N;;;;;
-A1AC;YI SYLLABLE HLUX;Lo;0;L;;;;;N;;;;;
-A1AD;YI SYLLABLE HLU;Lo;0;L;;;;;N;;;;;
-A1AE;YI SYLLABLE HLUP;Lo;0;L;;;;;N;;;;;
-A1AF;YI SYLLABLE HLURX;Lo;0;L;;;;;N;;;;;
-A1B0;YI SYLLABLE HLUR;Lo;0;L;;;;;N;;;;;
-A1B1;YI SYLLABLE HLYT;Lo;0;L;;;;;N;;;;;
-A1B2;YI SYLLABLE HLYX;Lo;0;L;;;;;N;;;;;
-A1B3;YI SYLLABLE HLY;Lo;0;L;;;;;N;;;;;
-A1B4;YI SYLLABLE HLYP;Lo;0;L;;;;;N;;;;;
-A1B5;YI SYLLABLE HLYRX;Lo;0;L;;;;;N;;;;;
-A1B6;YI SYLLABLE HLYR;Lo;0;L;;;;;N;;;;;
-A1B7;YI SYLLABLE LIT;Lo;0;L;;;;;N;;;;;
-A1B8;YI SYLLABLE LIX;Lo;0;L;;;;;N;;;;;
-A1B9;YI SYLLABLE LI;Lo;0;L;;;;;N;;;;;
-A1BA;YI SYLLABLE LIP;Lo;0;L;;;;;N;;;;;
-A1BB;YI SYLLABLE LIET;Lo;0;L;;;;;N;;;;;
-A1BC;YI SYLLABLE LIEX;Lo;0;L;;;;;N;;;;;
-A1BD;YI SYLLABLE LIE;Lo;0;L;;;;;N;;;;;
-A1BE;YI SYLLABLE LIEP;Lo;0;L;;;;;N;;;;;
-A1BF;YI SYLLABLE LAT;Lo;0;L;;;;;N;;;;;
-A1C0;YI SYLLABLE LAX;Lo;0;L;;;;;N;;;;;
-A1C1;YI SYLLABLE LA;Lo;0;L;;;;;N;;;;;
-A1C2;YI SYLLABLE LAP;Lo;0;L;;;;;N;;;;;
-A1C3;YI SYLLABLE LUOT;Lo;0;L;;;;;N;;;;;
-A1C4;YI SYLLABLE LUOX;Lo;0;L;;;;;N;;;;;
-A1C5;YI SYLLABLE LUO;Lo;0;L;;;;;N;;;;;
-A1C6;YI SYLLABLE LUOP;Lo;0;L;;;;;N;;;;;
-A1C7;YI SYLLABLE LOT;Lo;0;L;;;;;N;;;;;
-A1C8;YI SYLLABLE LOX;Lo;0;L;;;;;N;;;;;
-A1C9;YI SYLLABLE LO;Lo;0;L;;;;;N;;;;;
-A1CA;YI SYLLABLE LOP;Lo;0;L;;;;;N;;;;;
-A1CB;YI SYLLABLE LEX;Lo;0;L;;;;;N;;;;;
-A1CC;YI SYLLABLE LE;Lo;0;L;;;;;N;;;;;
-A1CD;YI SYLLABLE LEP;Lo;0;L;;;;;N;;;;;
-A1CE;YI SYLLABLE LUT;Lo;0;L;;;;;N;;;;;
-A1CF;YI SYLLABLE LUX;Lo;0;L;;;;;N;;;;;
-A1D0;YI SYLLABLE LU;Lo;0;L;;;;;N;;;;;
-A1D1;YI SYLLABLE LUP;Lo;0;L;;;;;N;;;;;
-A1D2;YI SYLLABLE LURX;Lo;0;L;;;;;N;;;;;
-A1D3;YI SYLLABLE LUR;Lo;0;L;;;;;N;;;;;
-A1D4;YI SYLLABLE LYT;Lo;0;L;;;;;N;;;;;
-A1D5;YI SYLLABLE LYX;Lo;0;L;;;;;N;;;;;
-A1D6;YI SYLLABLE LY;Lo;0;L;;;;;N;;;;;
-A1D7;YI SYLLABLE LYP;Lo;0;L;;;;;N;;;;;
-A1D8;YI SYLLABLE LYRX;Lo;0;L;;;;;N;;;;;
-A1D9;YI SYLLABLE LYR;Lo;0;L;;;;;N;;;;;
-A1DA;YI SYLLABLE GIT;Lo;0;L;;;;;N;;;;;
-A1DB;YI SYLLABLE GIX;Lo;0;L;;;;;N;;;;;
-A1DC;YI SYLLABLE GI;Lo;0;L;;;;;N;;;;;
-A1DD;YI SYLLABLE GIP;Lo;0;L;;;;;N;;;;;
-A1DE;YI SYLLABLE GIET;Lo;0;L;;;;;N;;;;;
-A1DF;YI SYLLABLE GIEX;Lo;0;L;;;;;N;;;;;
-A1E0;YI SYLLABLE GIE;Lo;0;L;;;;;N;;;;;
-A1E1;YI SYLLABLE GIEP;Lo;0;L;;;;;N;;;;;
-A1E2;YI SYLLABLE GAT;Lo;0;L;;;;;N;;;;;
-A1E3;YI SYLLABLE GAX;Lo;0;L;;;;;N;;;;;
-A1E4;YI SYLLABLE GA;Lo;0;L;;;;;N;;;;;
-A1E5;YI SYLLABLE GAP;Lo;0;L;;;;;N;;;;;
-A1E6;YI SYLLABLE GUOT;Lo;0;L;;;;;N;;;;;
-A1E7;YI SYLLABLE GUOX;Lo;0;L;;;;;N;;;;;
-A1E8;YI SYLLABLE GUO;Lo;0;L;;;;;N;;;;;
-A1E9;YI SYLLABLE GUOP;Lo;0;L;;;;;N;;;;;
-A1EA;YI SYLLABLE GOT;Lo;0;L;;;;;N;;;;;
-A1EB;YI SYLLABLE GOX;Lo;0;L;;;;;N;;;;;
-A1EC;YI SYLLABLE GO;Lo;0;L;;;;;N;;;;;
-A1ED;YI SYLLABLE GOP;Lo;0;L;;;;;N;;;;;
-A1EE;YI SYLLABLE GET;Lo;0;L;;;;;N;;;;;
-A1EF;YI SYLLABLE GEX;Lo;0;L;;;;;N;;;;;
-A1F0;YI SYLLABLE GE;Lo;0;L;;;;;N;;;;;
-A1F1;YI SYLLABLE GEP;Lo;0;L;;;;;N;;;;;
-A1F2;YI SYLLABLE GUT;Lo;0;L;;;;;N;;;;;
-A1F3;YI SYLLABLE GUX;Lo;0;L;;;;;N;;;;;
-A1F4;YI SYLLABLE GU;Lo;0;L;;;;;N;;;;;
-A1F5;YI SYLLABLE GUP;Lo;0;L;;;;;N;;;;;
-A1F6;YI SYLLABLE GURX;Lo;0;L;;;;;N;;;;;
-A1F7;YI SYLLABLE GUR;Lo;0;L;;;;;N;;;;;
-A1F8;YI SYLLABLE KIT;Lo;0;L;;;;;N;;;;;
-A1F9;YI SYLLABLE KIX;Lo;0;L;;;;;N;;;;;
-A1FA;YI SYLLABLE KI;Lo;0;L;;;;;N;;;;;
-A1FB;YI SYLLABLE KIP;Lo;0;L;;;;;N;;;;;
-A1FC;YI SYLLABLE KIEX;Lo;0;L;;;;;N;;;;;
-A1FD;YI SYLLABLE KIE;Lo;0;L;;;;;N;;;;;
-A1FE;YI SYLLABLE KIEP;Lo;0;L;;;;;N;;;;;
-A1FF;YI SYLLABLE KAT;Lo;0;L;;;;;N;;;;;
-A200;YI SYLLABLE KAX;Lo;0;L;;;;;N;;;;;
-A201;YI SYLLABLE KA;Lo;0;L;;;;;N;;;;;
-A202;YI SYLLABLE KAP;Lo;0;L;;;;;N;;;;;
-A203;YI SYLLABLE KUOX;Lo;0;L;;;;;N;;;;;
-A204;YI SYLLABLE KUO;Lo;0;L;;;;;N;;;;;
-A205;YI SYLLABLE KUOP;Lo;0;L;;;;;N;;;;;
-A206;YI SYLLABLE KOT;Lo;0;L;;;;;N;;;;;
-A207;YI SYLLABLE KOX;Lo;0;L;;;;;N;;;;;
-A208;YI SYLLABLE KO;Lo;0;L;;;;;N;;;;;
-A209;YI SYLLABLE KOP;Lo;0;L;;;;;N;;;;;
-A20A;YI SYLLABLE KET;Lo;0;L;;;;;N;;;;;
-A20B;YI SYLLABLE KEX;Lo;0;L;;;;;N;;;;;
-A20C;YI SYLLABLE KE;Lo;0;L;;;;;N;;;;;
-A20D;YI SYLLABLE KEP;Lo;0;L;;;;;N;;;;;
-A20E;YI SYLLABLE KUT;Lo;0;L;;;;;N;;;;;
-A20F;YI SYLLABLE KUX;Lo;0;L;;;;;N;;;;;
-A210;YI SYLLABLE KU;Lo;0;L;;;;;N;;;;;
-A211;YI SYLLABLE KUP;Lo;0;L;;;;;N;;;;;
-A212;YI SYLLABLE KURX;Lo;0;L;;;;;N;;;;;
-A213;YI SYLLABLE KUR;Lo;0;L;;;;;N;;;;;
-A214;YI SYLLABLE GGIT;Lo;0;L;;;;;N;;;;;
-A215;YI SYLLABLE GGIX;Lo;0;L;;;;;N;;;;;
-A216;YI SYLLABLE GGI;Lo;0;L;;;;;N;;;;;
-A217;YI SYLLABLE GGIEX;Lo;0;L;;;;;N;;;;;
-A218;YI SYLLABLE GGIE;Lo;0;L;;;;;N;;;;;
-A219;YI SYLLABLE GGIEP;Lo;0;L;;;;;N;;;;;
-A21A;YI SYLLABLE GGAT;Lo;0;L;;;;;N;;;;;
-A21B;YI SYLLABLE GGAX;Lo;0;L;;;;;N;;;;;
-A21C;YI SYLLABLE GGA;Lo;0;L;;;;;N;;;;;
-A21D;YI SYLLABLE GGAP;Lo;0;L;;;;;N;;;;;
-A21E;YI SYLLABLE GGUOT;Lo;0;L;;;;;N;;;;;
-A21F;YI SYLLABLE GGUOX;Lo;0;L;;;;;N;;;;;
-A220;YI SYLLABLE GGUO;Lo;0;L;;;;;N;;;;;
-A221;YI SYLLABLE GGUOP;Lo;0;L;;;;;N;;;;;
-A222;YI SYLLABLE GGOT;Lo;0;L;;;;;N;;;;;
-A223;YI SYLLABLE GGOX;Lo;0;L;;;;;N;;;;;
-A224;YI SYLLABLE GGO;Lo;0;L;;;;;N;;;;;
-A225;YI SYLLABLE GGOP;Lo;0;L;;;;;N;;;;;
-A226;YI SYLLABLE GGET;Lo;0;L;;;;;N;;;;;
-A227;YI SYLLABLE GGEX;Lo;0;L;;;;;N;;;;;
-A228;YI SYLLABLE GGE;Lo;0;L;;;;;N;;;;;
-A229;YI SYLLABLE GGEP;Lo;0;L;;;;;N;;;;;
-A22A;YI SYLLABLE GGUT;Lo;0;L;;;;;N;;;;;
-A22B;YI SYLLABLE GGUX;Lo;0;L;;;;;N;;;;;
-A22C;YI SYLLABLE GGU;Lo;0;L;;;;;N;;;;;
-A22D;YI SYLLABLE GGUP;Lo;0;L;;;;;N;;;;;
-A22E;YI SYLLABLE GGURX;Lo;0;L;;;;;N;;;;;
-A22F;YI SYLLABLE GGUR;Lo;0;L;;;;;N;;;;;
-A230;YI SYLLABLE MGIEX;Lo;0;L;;;;;N;;;;;
-A231;YI SYLLABLE MGIE;Lo;0;L;;;;;N;;;;;
-A232;YI SYLLABLE MGAT;Lo;0;L;;;;;N;;;;;
-A233;YI SYLLABLE MGAX;Lo;0;L;;;;;N;;;;;
-A234;YI SYLLABLE MGA;Lo;0;L;;;;;N;;;;;
-A235;YI SYLLABLE MGAP;Lo;0;L;;;;;N;;;;;
-A236;YI SYLLABLE MGUOX;Lo;0;L;;;;;N;;;;;
-A237;YI SYLLABLE MGUO;Lo;0;L;;;;;N;;;;;
-A238;YI SYLLABLE MGUOP;Lo;0;L;;;;;N;;;;;
-A239;YI SYLLABLE MGOT;Lo;0;L;;;;;N;;;;;
-A23A;YI SYLLABLE MGOX;Lo;0;L;;;;;N;;;;;
-A23B;YI SYLLABLE MGO;Lo;0;L;;;;;N;;;;;
-A23C;YI SYLLABLE MGOP;Lo;0;L;;;;;N;;;;;
-A23D;YI SYLLABLE MGEX;Lo;0;L;;;;;N;;;;;
-A23E;YI SYLLABLE MGE;Lo;0;L;;;;;N;;;;;
-A23F;YI SYLLABLE MGEP;Lo;0;L;;;;;N;;;;;
-A240;YI SYLLABLE MGUT;Lo;0;L;;;;;N;;;;;
-A241;YI SYLLABLE MGUX;Lo;0;L;;;;;N;;;;;
-A242;YI SYLLABLE MGU;Lo;0;L;;;;;N;;;;;
-A243;YI SYLLABLE MGUP;Lo;0;L;;;;;N;;;;;
-A244;YI SYLLABLE MGURX;Lo;0;L;;;;;N;;;;;
-A245;YI SYLLABLE MGUR;Lo;0;L;;;;;N;;;;;
-A246;YI SYLLABLE HXIT;Lo;0;L;;;;;N;;;;;
-A247;YI SYLLABLE HXIX;Lo;0;L;;;;;N;;;;;
-A248;YI SYLLABLE HXI;Lo;0;L;;;;;N;;;;;
-A249;YI SYLLABLE HXIP;Lo;0;L;;;;;N;;;;;
-A24A;YI SYLLABLE HXIET;Lo;0;L;;;;;N;;;;;
-A24B;YI SYLLABLE HXIEX;Lo;0;L;;;;;N;;;;;
-A24C;YI SYLLABLE HXIE;Lo;0;L;;;;;N;;;;;
-A24D;YI SYLLABLE HXIEP;Lo;0;L;;;;;N;;;;;
-A24E;YI SYLLABLE HXAT;Lo;0;L;;;;;N;;;;;
-A24F;YI SYLLABLE HXAX;Lo;0;L;;;;;N;;;;;
-A250;YI SYLLABLE HXA;Lo;0;L;;;;;N;;;;;
-A251;YI SYLLABLE HXAP;Lo;0;L;;;;;N;;;;;
-A252;YI SYLLABLE HXUOT;Lo;0;L;;;;;N;;;;;
-A253;YI SYLLABLE HXUOX;Lo;0;L;;;;;N;;;;;
-A254;YI SYLLABLE HXUO;Lo;0;L;;;;;N;;;;;
-A255;YI SYLLABLE HXUOP;Lo;0;L;;;;;N;;;;;
-A256;YI SYLLABLE HXOT;Lo;0;L;;;;;N;;;;;
-A257;YI SYLLABLE HXOX;Lo;0;L;;;;;N;;;;;
-A258;YI SYLLABLE HXO;Lo;0;L;;;;;N;;;;;
-A259;YI SYLLABLE HXOP;Lo;0;L;;;;;N;;;;;
-A25A;YI SYLLABLE HXEX;Lo;0;L;;;;;N;;;;;
-A25B;YI SYLLABLE HXE;Lo;0;L;;;;;N;;;;;
-A25C;YI SYLLABLE HXEP;Lo;0;L;;;;;N;;;;;
-A25D;YI SYLLABLE NGIEX;Lo;0;L;;;;;N;;;;;
-A25E;YI SYLLABLE NGIE;Lo;0;L;;;;;N;;;;;
-A25F;YI SYLLABLE NGIEP;Lo;0;L;;;;;N;;;;;
-A260;YI SYLLABLE NGAT;Lo;0;L;;;;;N;;;;;
-A261;YI SYLLABLE NGAX;Lo;0;L;;;;;N;;;;;
-A262;YI SYLLABLE NGA;Lo;0;L;;;;;N;;;;;
-A263;YI SYLLABLE NGAP;Lo;0;L;;;;;N;;;;;
-A264;YI SYLLABLE NGUOT;Lo;0;L;;;;;N;;;;;
-A265;YI SYLLABLE NGUOX;Lo;0;L;;;;;N;;;;;
-A266;YI SYLLABLE NGUO;Lo;0;L;;;;;N;;;;;
-A267;YI SYLLABLE NGOT;Lo;0;L;;;;;N;;;;;
-A268;YI SYLLABLE NGOX;Lo;0;L;;;;;N;;;;;
-A269;YI SYLLABLE NGO;Lo;0;L;;;;;N;;;;;
-A26A;YI SYLLABLE NGOP;Lo;0;L;;;;;N;;;;;
-A26B;YI SYLLABLE NGEX;Lo;0;L;;;;;N;;;;;
-A26C;YI SYLLABLE NGE;Lo;0;L;;;;;N;;;;;
-A26D;YI SYLLABLE NGEP;Lo;0;L;;;;;N;;;;;
-A26E;YI SYLLABLE HIT;Lo;0;L;;;;;N;;;;;
-A26F;YI SYLLABLE HIEX;Lo;0;L;;;;;N;;;;;
-A270;YI SYLLABLE HIE;Lo;0;L;;;;;N;;;;;
-A271;YI SYLLABLE HAT;Lo;0;L;;;;;N;;;;;
-A272;YI SYLLABLE HAX;Lo;0;L;;;;;N;;;;;
-A273;YI SYLLABLE HA;Lo;0;L;;;;;N;;;;;
-A274;YI SYLLABLE HAP;Lo;0;L;;;;;N;;;;;
-A275;YI SYLLABLE HUOT;Lo;0;L;;;;;N;;;;;
-A276;YI SYLLABLE HUOX;Lo;0;L;;;;;N;;;;;
-A277;YI SYLLABLE HUO;Lo;0;L;;;;;N;;;;;
-A278;YI SYLLABLE HUOP;Lo;0;L;;;;;N;;;;;
-A279;YI SYLLABLE HOT;Lo;0;L;;;;;N;;;;;
-A27A;YI SYLLABLE HOX;Lo;0;L;;;;;N;;;;;
-A27B;YI SYLLABLE HO;Lo;0;L;;;;;N;;;;;
-A27C;YI SYLLABLE HOP;Lo;0;L;;;;;N;;;;;
-A27D;YI SYLLABLE HEX;Lo;0;L;;;;;N;;;;;
-A27E;YI SYLLABLE HE;Lo;0;L;;;;;N;;;;;
-A27F;YI SYLLABLE HEP;Lo;0;L;;;;;N;;;;;
-A280;YI SYLLABLE WAT;Lo;0;L;;;;;N;;;;;
-A281;YI SYLLABLE WAX;Lo;0;L;;;;;N;;;;;
-A282;YI SYLLABLE WA;Lo;0;L;;;;;N;;;;;
-A283;YI SYLLABLE WAP;Lo;0;L;;;;;N;;;;;
-A284;YI SYLLABLE WUOX;Lo;0;L;;;;;N;;;;;
-A285;YI SYLLABLE WUO;Lo;0;L;;;;;N;;;;;
-A286;YI SYLLABLE WUOP;Lo;0;L;;;;;N;;;;;
-A287;YI SYLLABLE WOX;Lo;0;L;;;;;N;;;;;
-A288;YI SYLLABLE WO;Lo;0;L;;;;;N;;;;;
-A289;YI SYLLABLE WOP;Lo;0;L;;;;;N;;;;;
-A28A;YI SYLLABLE WEX;Lo;0;L;;;;;N;;;;;
-A28B;YI SYLLABLE WE;Lo;0;L;;;;;N;;;;;
-A28C;YI SYLLABLE WEP;Lo;0;L;;;;;N;;;;;
-A28D;YI SYLLABLE ZIT;Lo;0;L;;;;;N;;;;;
-A28E;YI SYLLABLE ZIX;Lo;0;L;;;;;N;;;;;
-A28F;YI SYLLABLE ZI;Lo;0;L;;;;;N;;;;;
-A290;YI SYLLABLE ZIP;Lo;0;L;;;;;N;;;;;
-A291;YI SYLLABLE ZIEX;Lo;0;L;;;;;N;;;;;
-A292;YI SYLLABLE ZIE;Lo;0;L;;;;;N;;;;;
-A293;YI SYLLABLE ZIEP;Lo;0;L;;;;;N;;;;;
-A294;YI SYLLABLE ZAT;Lo;0;L;;;;;N;;;;;
-A295;YI SYLLABLE ZAX;Lo;0;L;;;;;N;;;;;
-A296;YI SYLLABLE ZA;Lo;0;L;;;;;N;;;;;
-A297;YI SYLLABLE ZAP;Lo;0;L;;;;;N;;;;;
-A298;YI SYLLABLE ZUOX;Lo;0;L;;;;;N;;;;;
-A299;YI SYLLABLE ZUO;Lo;0;L;;;;;N;;;;;
-A29A;YI SYLLABLE ZUOP;Lo;0;L;;;;;N;;;;;
-A29B;YI SYLLABLE ZOT;Lo;0;L;;;;;N;;;;;
-A29C;YI SYLLABLE ZOX;Lo;0;L;;;;;N;;;;;
-A29D;YI SYLLABLE ZO;Lo;0;L;;;;;N;;;;;
-A29E;YI SYLLABLE ZOP;Lo;0;L;;;;;N;;;;;
-A29F;YI SYLLABLE ZEX;Lo;0;L;;;;;N;;;;;
-A2A0;YI SYLLABLE ZE;Lo;0;L;;;;;N;;;;;
-A2A1;YI SYLLABLE ZEP;Lo;0;L;;;;;N;;;;;
-A2A2;YI SYLLABLE ZUT;Lo;0;L;;;;;N;;;;;
-A2A3;YI SYLLABLE ZUX;Lo;0;L;;;;;N;;;;;
-A2A4;YI SYLLABLE ZU;Lo;0;L;;;;;N;;;;;
-A2A5;YI SYLLABLE ZUP;Lo;0;L;;;;;N;;;;;
-A2A6;YI SYLLABLE ZURX;Lo;0;L;;;;;N;;;;;
-A2A7;YI SYLLABLE ZUR;Lo;0;L;;;;;N;;;;;
-A2A8;YI SYLLABLE ZYT;Lo;0;L;;;;;N;;;;;
-A2A9;YI SYLLABLE ZYX;Lo;0;L;;;;;N;;;;;
-A2AA;YI SYLLABLE ZY;Lo;0;L;;;;;N;;;;;
-A2AB;YI SYLLABLE ZYP;Lo;0;L;;;;;N;;;;;
-A2AC;YI SYLLABLE ZYRX;Lo;0;L;;;;;N;;;;;
-A2AD;YI SYLLABLE ZYR;Lo;0;L;;;;;N;;;;;
-A2AE;YI SYLLABLE CIT;Lo;0;L;;;;;N;;;;;
-A2AF;YI SYLLABLE CIX;Lo;0;L;;;;;N;;;;;
-A2B0;YI SYLLABLE CI;Lo;0;L;;;;;N;;;;;
-A2B1;YI SYLLABLE CIP;Lo;0;L;;;;;N;;;;;
-A2B2;YI SYLLABLE CIET;Lo;0;L;;;;;N;;;;;
-A2B3;YI SYLLABLE CIEX;Lo;0;L;;;;;N;;;;;
-A2B4;YI SYLLABLE CIE;Lo;0;L;;;;;N;;;;;
-A2B5;YI SYLLABLE CIEP;Lo;0;L;;;;;N;;;;;
-A2B6;YI SYLLABLE CAT;Lo;0;L;;;;;N;;;;;
-A2B7;YI SYLLABLE CAX;Lo;0;L;;;;;N;;;;;
-A2B8;YI SYLLABLE CA;Lo;0;L;;;;;N;;;;;
-A2B9;YI SYLLABLE CAP;Lo;0;L;;;;;N;;;;;
-A2BA;YI SYLLABLE CUOX;Lo;0;L;;;;;N;;;;;
-A2BB;YI SYLLABLE CUO;Lo;0;L;;;;;N;;;;;
-A2BC;YI SYLLABLE CUOP;Lo;0;L;;;;;N;;;;;
-A2BD;YI SYLLABLE COT;Lo;0;L;;;;;N;;;;;
-A2BE;YI SYLLABLE COX;Lo;0;L;;;;;N;;;;;
-A2BF;YI SYLLABLE CO;Lo;0;L;;;;;N;;;;;
-A2C0;YI SYLLABLE COP;Lo;0;L;;;;;N;;;;;
-A2C1;YI SYLLABLE CEX;Lo;0;L;;;;;N;;;;;
-A2C2;YI SYLLABLE CE;Lo;0;L;;;;;N;;;;;
-A2C3;YI SYLLABLE CEP;Lo;0;L;;;;;N;;;;;
-A2C4;YI SYLLABLE CUT;Lo;0;L;;;;;N;;;;;
-A2C5;YI SYLLABLE CUX;Lo;0;L;;;;;N;;;;;
-A2C6;YI SYLLABLE CU;Lo;0;L;;;;;N;;;;;
-A2C7;YI SYLLABLE CUP;Lo;0;L;;;;;N;;;;;
-A2C8;YI SYLLABLE CURX;Lo;0;L;;;;;N;;;;;
-A2C9;YI SYLLABLE CUR;Lo;0;L;;;;;N;;;;;
-A2CA;YI SYLLABLE CYT;Lo;0;L;;;;;N;;;;;
-A2CB;YI SYLLABLE CYX;Lo;0;L;;;;;N;;;;;
-A2CC;YI SYLLABLE CY;Lo;0;L;;;;;N;;;;;
-A2CD;YI SYLLABLE CYP;Lo;0;L;;;;;N;;;;;
-A2CE;YI SYLLABLE CYRX;Lo;0;L;;;;;N;;;;;
-A2CF;YI SYLLABLE CYR;Lo;0;L;;;;;N;;;;;
-A2D0;YI SYLLABLE ZZIT;Lo;0;L;;;;;N;;;;;
-A2D1;YI SYLLABLE ZZIX;Lo;0;L;;;;;N;;;;;
-A2D2;YI SYLLABLE ZZI;Lo;0;L;;;;;N;;;;;
-A2D3;YI SYLLABLE ZZIP;Lo;0;L;;;;;N;;;;;
-A2D4;YI SYLLABLE ZZIET;Lo;0;L;;;;;N;;;;;
-A2D5;YI SYLLABLE ZZIEX;Lo;0;L;;;;;N;;;;;
-A2D6;YI SYLLABLE ZZIE;Lo;0;L;;;;;N;;;;;
-A2D7;YI SYLLABLE ZZIEP;Lo;0;L;;;;;N;;;;;
-A2D8;YI SYLLABLE ZZAT;Lo;0;L;;;;;N;;;;;
-A2D9;YI SYLLABLE ZZAX;Lo;0;L;;;;;N;;;;;
-A2DA;YI SYLLABLE ZZA;Lo;0;L;;;;;N;;;;;
-A2DB;YI SYLLABLE ZZAP;Lo;0;L;;;;;N;;;;;
-A2DC;YI SYLLABLE ZZOX;Lo;0;L;;;;;N;;;;;
-A2DD;YI SYLLABLE ZZO;Lo;0;L;;;;;N;;;;;
-A2DE;YI SYLLABLE ZZOP;Lo;0;L;;;;;N;;;;;
-A2DF;YI SYLLABLE ZZEX;Lo;0;L;;;;;N;;;;;
-A2E0;YI SYLLABLE ZZE;Lo;0;L;;;;;N;;;;;
-A2E1;YI SYLLABLE ZZEP;Lo;0;L;;;;;N;;;;;
-A2E2;YI SYLLABLE ZZUX;Lo;0;L;;;;;N;;;;;
-A2E3;YI SYLLABLE ZZU;Lo;0;L;;;;;N;;;;;
-A2E4;YI SYLLABLE ZZUP;Lo;0;L;;;;;N;;;;;
-A2E5;YI SYLLABLE ZZURX;Lo;0;L;;;;;N;;;;;
-A2E6;YI SYLLABLE ZZUR;Lo;0;L;;;;;N;;;;;
-A2E7;YI SYLLABLE ZZYT;Lo;0;L;;;;;N;;;;;
-A2E8;YI SYLLABLE ZZYX;Lo;0;L;;;;;N;;;;;
-A2E9;YI SYLLABLE ZZY;Lo;0;L;;;;;N;;;;;
-A2EA;YI SYLLABLE ZZYP;Lo;0;L;;;;;N;;;;;
-A2EB;YI SYLLABLE ZZYRX;Lo;0;L;;;;;N;;;;;
-A2EC;YI SYLLABLE ZZYR;Lo;0;L;;;;;N;;;;;
-A2ED;YI SYLLABLE NZIT;Lo;0;L;;;;;N;;;;;
-A2EE;YI SYLLABLE NZIX;Lo;0;L;;;;;N;;;;;
-A2EF;YI SYLLABLE NZI;Lo;0;L;;;;;N;;;;;
-A2F0;YI SYLLABLE NZIP;Lo;0;L;;;;;N;;;;;
-A2F1;YI SYLLABLE NZIEX;Lo;0;L;;;;;N;;;;;
-A2F2;YI SYLLABLE NZIE;Lo;0;L;;;;;N;;;;;
-A2F3;YI SYLLABLE NZIEP;Lo;0;L;;;;;N;;;;;
-A2F4;YI SYLLABLE NZAT;Lo;0;L;;;;;N;;;;;
-A2F5;YI SYLLABLE NZAX;Lo;0;L;;;;;N;;;;;
-A2F6;YI SYLLABLE NZA;Lo;0;L;;;;;N;;;;;
-A2F7;YI SYLLABLE NZAP;Lo;0;L;;;;;N;;;;;
-A2F8;YI SYLLABLE NZUOX;Lo;0;L;;;;;N;;;;;
-A2F9;YI SYLLABLE NZUO;Lo;0;L;;;;;N;;;;;
-A2FA;YI SYLLABLE NZOX;Lo;0;L;;;;;N;;;;;
-A2FB;YI SYLLABLE NZOP;Lo;0;L;;;;;N;;;;;
-A2FC;YI SYLLABLE NZEX;Lo;0;L;;;;;N;;;;;
-A2FD;YI SYLLABLE NZE;Lo;0;L;;;;;N;;;;;
-A2FE;YI SYLLABLE NZUX;Lo;0;L;;;;;N;;;;;
-A2FF;YI SYLLABLE NZU;Lo;0;L;;;;;N;;;;;
-A300;YI SYLLABLE NZUP;Lo;0;L;;;;;N;;;;;
-A301;YI SYLLABLE NZURX;Lo;0;L;;;;;N;;;;;
-A302;YI SYLLABLE NZUR;Lo;0;L;;;;;N;;;;;
-A303;YI SYLLABLE NZYT;Lo;0;L;;;;;N;;;;;
-A304;YI SYLLABLE NZYX;Lo;0;L;;;;;N;;;;;
-A305;YI SYLLABLE NZY;Lo;0;L;;;;;N;;;;;
-A306;YI SYLLABLE NZYP;Lo;0;L;;;;;N;;;;;
-A307;YI SYLLABLE NZYRX;Lo;0;L;;;;;N;;;;;
-A308;YI SYLLABLE NZYR;Lo;0;L;;;;;N;;;;;
-A309;YI SYLLABLE SIT;Lo;0;L;;;;;N;;;;;
-A30A;YI SYLLABLE SIX;Lo;0;L;;;;;N;;;;;
-A30B;YI SYLLABLE SI;Lo;0;L;;;;;N;;;;;
-A30C;YI SYLLABLE SIP;Lo;0;L;;;;;N;;;;;
-A30D;YI SYLLABLE SIEX;Lo;0;L;;;;;N;;;;;
-A30E;YI SYLLABLE SIE;Lo;0;L;;;;;N;;;;;
-A30F;YI SYLLABLE SIEP;Lo;0;L;;;;;N;;;;;
-A310;YI SYLLABLE SAT;Lo;0;L;;;;;N;;;;;
-A311;YI SYLLABLE SAX;Lo;0;L;;;;;N;;;;;
-A312;YI SYLLABLE SA;Lo;0;L;;;;;N;;;;;
-A313;YI SYLLABLE SAP;Lo;0;L;;;;;N;;;;;
-A314;YI SYLLABLE SUOX;Lo;0;L;;;;;N;;;;;
-A315;YI SYLLABLE SUO;Lo;0;L;;;;;N;;;;;
-A316;YI SYLLABLE SUOP;Lo;0;L;;;;;N;;;;;
-A317;YI SYLLABLE SOT;Lo;0;L;;;;;N;;;;;
-A318;YI SYLLABLE SOX;Lo;0;L;;;;;N;;;;;
-A319;YI SYLLABLE SO;Lo;0;L;;;;;N;;;;;
-A31A;YI SYLLABLE SOP;Lo;0;L;;;;;N;;;;;
-A31B;YI SYLLABLE SEX;Lo;0;L;;;;;N;;;;;
-A31C;YI SYLLABLE SE;Lo;0;L;;;;;N;;;;;
-A31D;YI SYLLABLE SEP;Lo;0;L;;;;;N;;;;;
-A31E;YI SYLLABLE SUT;Lo;0;L;;;;;N;;;;;
-A31F;YI SYLLABLE SUX;Lo;0;L;;;;;N;;;;;
-A320;YI SYLLABLE SU;Lo;0;L;;;;;N;;;;;
-A321;YI SYLLABLE SUP;Lo;0;L;;;;;N;;;;;
-A322;YI SYLLABLE SURX;Lo;0;L;;;;;N;;;;;
-A323;YI SYLLABLE SUR;Lo;0;L;;;;;N;;;;;
-A324;YI SYLLABLE SYT;Lo;0;L;;;;;N;;;;;
-A325;YI SYLLABLE SYX;Lo;0;L;;;;;N;;;;;
-A326;YI SYLLABLE SY;Lo;0;L;;;;;N;;;;;
-A327;YI SYLLABLE SYP;Lo;0;L;;;;;N;;;;;
-A328;YI SYLLABLE SYRX;Lo;0;L;;;;;N;;;;;
-A329;YI SYLLABLE SYR;Lo;0;L;;;;;N;;;;;
-A32A;YI SYLLABLE SSIT;Lo;0;L;;;;;N;;;;;
-A32B;YI SYLLABLE SSIX;Lo;0;L;;;;;N;;;;;
-A32C;YI SYLLABLE SSI;Lo;0;L;;;;;N;;;;;
-A32D;YI SYLLABLE SSIP;Lo;0;L;;;;;N;;;;;
-A32E;YI SYLLABLE SSIEX;Lo;0;L;;;;;N;;;;;
-A32F;YI SYLLABLE SSIE;Lo;0;L;;;;;N;;;;;
-A330;YI SYLLABLE SSIEP;Lo;0;L;;;;;N;;;;;
-A331;YI SYLLABLE SSAT;Lo;0;L;;;;;N;;;;;
-A332;YI SYLLABLE SSAX;Lo;0;L;;;;;N;;;;;
-A333;YI SYLLABLE SSA;Lo;0;L;;;;;N;;;;;
-A334;YI SYLLABLE SSAP;Lo;0;L;;;;;N;;;;;
-A335;YI SYLLABLE SSOT;Lo;0;L;;;;;N;;;;;
-A336;YI SYLLABLE SSOX;Lo;0;L;;;;;N;;;;;
-A337;YI SYLLABLE SSO;Lo;0;L;;;;;N;;;;;
-A338;YI SYLLABLE SSOP;Lo;0;L;;;;;N;;;;;
-A339;YI SYLLABLE SSEX;Lo;0;L;;;;;N;;;;;
-A33A;YI SYLLABLE SSE;Lo;0;L;;;;;N;;;;;
-A33B;YI SYLLABLE SSEP;Lo;0;L;;;;;N;;;;;
-A33C;YI SYLLABLE SSUT;Lo;0;L;;;;;N;;;;;
-A33D;YI SYLLABLE SSUX;Lo;0;L;;;;;N;;;;;
-A33E;YI SYLLABLE SSU;Lo;0;L;;;;;N;;;;;
-A33F;YI SYLLABLE SSUP;Lo;0;L;;;;;N;;;;;
-A340;YI SYLLABLE SSYT;Lo;0;L;;;;;N;;;;;
-A341;YI SYLLABLE SSYX;Lo;0;L;;;;;N;;;;;
-A342;YI SYLLABLE SSY;Lo;0;L;;;;;N;;;;;
-A343;YI SYLLABLE SSYP;Lo;0;L;;;;;N;;;;;
-A344;YI SYLLABLE SSYRX;Lo;0;L;;;;;N;;;;;
-A345;YI SYLLABLE SSYR;Lo;0;L;;;;;N;;;;;
-A346;YI SYLLABLE ZHAT;Lo;0;L;;;;;N;;;;;
-A347;YI SYLLABLE ZHAX;Lo;0;L;;;;;N;;;;;
-A348;YI SYLLABLE ZHA;Lo;0;L;;;;;N;;;;;
-A349;YI SYLLABLE ZHAP;Lo;0;L;;;;;N;;;;;
-A34A;YI SYLLABLE ZHUOX;Lo;0;L;;;;;N;;;;;
-A34B;YI SYLLABLE ZHUO;Lo;0;L;;;;;N;;;;;
-A34C;YI SYLLABLE ZHUOP;Lo;0;L;;;;;N;;;;;
-A34D;YI SYLLABLE ZHOT;Lo;0;L;;;;;N;;;;;
-A34E;YI SYLLABLE ZHOX;Lo;0;L;;;;;N;;;;;
-A34F;YI SYLLABLE ZHO;Lo;0;L;;;;;N;;;;;
-A350;YI SYLLABLE ZHOP;Lo;0;L;;;;;N;;;;;
-A351;YI SYLLABLE ZHET;Lo;0;L;;;;;N;;;;;
-A352;YI SYLLABLE ZHEX;Lo;0;L;;;;;N;;;;;
-A353;YI SYLLABLE ZHE;Lo;0;L;;;;;N;;;;;
-A354;YI SYLLABLE ZHEP;Lo;0;L;;;;;N;;;;;
-A355;YI SYLLABLE ZHUT;Lo;0;L;;;;;N;;;;;
-A356;YI SYLLABLE ZHUX;Lo;0;L;;;;;N;;;;;
-A357;YI SYLLABLE ZHU;Lo;0;L;;;;;N;;;;;
-A358;YI SYLLABLE ZHUP;Lo;0;L;;;;;N;;;;;
-A359;YI SYLLABLE ZHURX;Lo;0;L;;;;;N;;;;;
-A35A;YI SYLLABLE ZHUR;Lo;0;L;;;;;N;;;;;
-A35B;YI SYLLABLE ZHYT;Lo;0;L;;;;;N;;;;;
-A35C;YI SYLLABLE ZHYX;Lo;0;L;;;;;N;;;;;
-A35D;YI SYLLABLE ZHY;Lo;0;L;;;;;N;;;;;
-A35E;YI SYLLABLE ZHYP;Lo;0;L;;;;;N;;;;;
-A35F;YI SYLLABLE ZHYRX;Lo;0;L;;;;;N;;;;;
-A360;YI SYLLABLE ZHYR;Lo;0;L;;;;;N;;;;;
-A361;YI SYLLABLE CHAT;Lo;0;L;;;;;N;;;;;
-A362;YI SYLLABLE CHAX;Lo;0;L;;;;;N;;;;;
-A363;YI SYLLABLE CHA;Lo;0;L;;;;;N;;;;;
-A364;YI SYLLABLE CHAP;Lo;0;L;;;;;N;;;;;
-A365;YI SYLLABLE CHUOT;Lo;0;L;;;;;N;;;;;
-A366;YI SYLLABLE CHUOX;Lo;0;L;;;;;N;;;;;
-A367;YI SYLLABLE CHUO;Lo;0;L;;;;;N;;;;;
-A368;YI SYLLABLE CHUOP;Lo;0;L;;;;;N;;;;;
-A369;YI SYLLABLE CHOT;Lo;0;L;;;;;N;;;;;
-A36A;YI SYLLABLE CHOX;Lo;0;L;;;;;N;;;;;
-A36B;YI SYLLABLE CHO;Lo;0;L;;;;;N;;;;;
-A36C;YI SYLLABLE CHOP;Lo;0;L;;;;;N;;;;;
-A36D;YI SYLLABLE CHET;Lo;0;L;;;;;N;;;;;
-A36E;YI SYLLABLE CHEX;Lo;0;L;;;;;N;;;;;
-A36F;YI SYLLABLE CHE;Lo;0;L;;;;;N;;;;;
-A370;YI SYLLABLE CHEP;Lo;0;L;;;;;N;;;;;
-A371;YI SYLLABLE CHUX;Lo;0;L;;;;;N;;;;;
-A372;YI SYLLABLE CHU;Lo;0;L;;;;;N;;;;;
-A373;YI SYLLABLE CHUP;Lo;0;L;;;;;N;;;;;
-A374;YI SYLLABLE CHURX;Lo;0;L;;;;;N;;;;;
-A375;YI SYLLABLE CHUR;Lo;0;L;;;;;N;;;;;
-A376;YI SYLLABLE CHYT;Lo;0;L;;;;;N;;;;;
-A377;YI SYLLABLE CHYX;Lo;0;L;;;;;N;;;;;
-A378;YI SYLLABLE CHY;Lo;0;L;;;;;N;;;;;
-A379;YI SYLLABLE CHYP;Lo;0;L;;;;;N;;;;;
-A37A;YI SYLLABLE CHYRX;Lo;0;L;;;;;N;;;;;
-A37B;YI SYLLABLE CHYR;Lo;0;L;;;;;N;;;;;
-A37C;YI SYLLABLE RRAX;Lo;0;L;;;;;N;;;;;
-A37D;YI SYLLABLE RRA;Lo;0;L;;;;;N;;;;;
-A37E;YI SYLLABLE RRUOX;Lo;0;L;;;;;N;;;;;
-A37F;YI SYLLABLE RRUO;Lo;0;L;;;;;N;;;;;
-A380;YI SYLLABLE RROT;Lo;0;L;;;;;N;;;;;
-A381;YI SYLLABLE RROX;Lo;0;L;;;;;N;;;;;
-A382;YI SYLLABLE RRO;Lo;0;L;;;;;N;;;;;
-A383;YI SYLLABLE RROP;Lo;0;L;;;;;N;;;;;
-A384;YI SYLLABLE RRET;Lo;0;L;;;;;N;;;;;
-A385;YI SYLLABLE RREX;Lo;0;L;;;;;N;;;;;
-A386;YI SYLLABLE RRE;Lo;0;L;;;;;N;;;;;
-A387;YI SYLLABLE RREP;Lo;0;L;;;;;N;;;;;
-A388;YI SYLLABLE RRUT;Lo;0;L;;;;;N;;;;;
-A389;YI SYLLABLE RRUX;Lo;0;L;;;;;N;;;;;
-A38A;YI SYLLABLE RRU;Lo;0;L;;;;;N;;;;;
-A38B;YI SYLLABLE RRUP;Lo;0;L;;;;;N;;;;;
-A38C;YI SYLLABLE RRURX;Lo;0;L;;;;;N;;;;;
-A38D;YI SYLLABLE RRUR;Lo;0;L;;;;;N;;;;;
-A38E;YI SYLLABLE RRYT;Lo;0;L;;;;;N;;;;;
-A38F;YI SYLLABLE RRYX;Lo;0;L;;;;;N;;;;;
-A390;YI SYLLABLE RRY;Lo;0;L;;;;;N;;;;;
-A391;YI SYLLABLE RRYP;Lo;0;L;;;;;N;;;;;
-A392;YI SYLLABLE RRYRX;Lo;0;L;;;;;N;;;;;
-A393;YI SYLLABLE RRYR;Lo;0;L;;;;;N;;;;;
-A394;YI SYLLABLE NRAT;Lo;0;L;;;;;N;;;;;
-A395;YI SYLLABLE NRAX;Lo;0;L;;;;;N;;;;;
-A396;YI SYLLABLE NRA;Lo;0;L;;;;;N;;;;;
-A397;YI SYLLABLE NRAP;Lo;0;L;;;;;N;;;;;
-A398;YI SYLLABLE NROX;Lo;0;L;;;;;N;;;;;
-A399;YI SYLLABLE NRO;Lo;0;L;;;;;N;;;;;
-A39A;YI SYLLABLE NROP;Lo;0;L;;;;;N;;;;;
-A39B;YI SYLLABLE NRET;Lo;0;L;;;;;N;;;;;
-A39C;YI SYLLABLE NREX;Lo;0;L;;;;;N;;;;;
-A39D;YI SYLLABLE NRE;Lo;0;L;;;;;N;;;;;
-A39E;YI SYLLABLE NREP;Lo;0;L;;;;;N;;;;;
-A39F;YI SYLLABLE NRUT;Lo;0;L;;;;;N;;;;;
-A3A0;YI SYLLABLE NRUX;Lo;0;L;;;;;N;;;;;
-A3A1;YI SYLLABLE NRU;Lo;0;L;;;;;N;;;;;
-A3A2;YI SYLLABLE NRUP;Lo;0;L;;;;;N;;;;;
-A3A3;YI SYLLABLE NRURX;Lo;0;L;;;;;N;;;;;
-A3A4;YI SYLLABLE NRUR;Lo;0;L;;;;;N;;;;;
-A3A5;YI SYLLABLE NRYT;Lo;0;L;;;;;N;;;;;
-A3A6;YI SYLLABLE NRYX;Lo;0;L;;;;;N;;;;;
-A3A7;YI SYLLABLE NRY;Lo;0;L;;;;;N;;;;;
-A3A8;YI SYLLABLE NRYP;Lo;0;L;;;;;N;;;;;
-A3A9;YI SYLLABLE NRYRX;Lo;0;L;;;;;N;;;;;
-A3AA;YI SYLLABLE NRYR;Lo;0;L;;;;;N;;;;;
-A3AB;YI SYLLABLE SHAT;Lo;0;L;;;;;N;;;;;
-A3AC;YI SYLLABLE SHAX;Lo;0;L;;;;;N;;;;;
-A3AD;YI SYLLABLE SHA;Lo;0;L;;;;;N;;;;;
-A3AE;YI SYLLABLE SHAP;Lo;0;L;;;;;N;;;;;
-A3AF;YI SYLLABLE SHUOX;Lo;0;L;;;;;N;;;;;
-A3B0;YI SYLLABLE SHUO;Lo;0;L;;;;;N;;;;;
-A3B1;YI SYLLABLE SHUOP;Lo;0;L;;;;;N;;;;;
-A3B2;YI SYLLABLE SHOT;Lo;0;L;;;;;N;;;;;
-A3B3;YI SYLLABLE SHOX;Lo;0;L;;;;;N;;;;;
-A3B4;YI SYLLABLE SHO;Lo;0;L;;;;;N;;;;;
-A3B5;YI SYLLABLE SHOP;Lo;0;L;;;;;N;;;;;
-A3B6;YI SYLLABLE SHET;Lo;0;L;;;;;N;;;;;
-A3B7;YI SYLLABLE SHEX;Lo;0;L;;;;;N;;;;;
-A3B8;YI SYLLABLE SHE;Lo;0;L;;;;;N;;;;;
-A3B9;YI SYLLABLE SHEP;Lo;0;L;;;;;N;;;;;
-A3BA;YI SYLLABLE SHUT;Lo;0;L;;;;;N;;;;;
-A3BB;YI SYLLABLE SHUX;Lo;0;L;;;;;N;;;;;
-A3BC;YI SYLLABLE SHU;Lo;0;L;;;;;N;;;;;
-A3BD;YI SYLLABLE SHUP;Lo;0;L;;;;;N;;;;;
-A3BE;YI SYLLABLE SHURX;Lo;0;L;;;;;N;;;;;
-A3BF;YI SYLLABLE SHUR;Lo;0;L;;;;;N;;;;;
-A3C0;YI SYLLABLE SHYT;Lo;0;L;;;;;N;;;;;
-A3C1;YI SYLLABLE SHYX;Lo;0;L;;;;;N;;;;;
-A3C2;YI SYLLABLE SHY;Lo;0;L;;;;;N;;;;;
-A3C3;YI SYLLABLE SHYP;Lo;0;L;;;;;N;;;;;
-A3C4;YI SYLLABLE SHYRX;Lo;0;L;;;;;N;;;;;
-A3C5;YI SYLLABLE SHYR;Lo;0;L;;;;;N;;;;;
-A3C6;YI SYLLABLE RAT;Lo;0;L;;;;;N;;;;;
-A3C7;YI SYLLABLE RAX;Lo;0;L;;;;;N;;;;;
-A3C8;YI SYLLABLE RA;Lo;0;L;;;;;N;;;;;
-A3C9;YI SYLLABLE RAP;Lo;0;L;;;;;N;;;;;
-A3CA;YI SYLLABLE RUOX;Lo;0;L;;;;;N;;;;;
-A3CB;YI SYLLABLE RUO;Lo;0;L;;;;;N;;;;;
-A3CC;YI SYLLABLE RUOP;Lo;0;L;;;;;N;;;;;
-A3CD;YI SYLLABLE ROT;Lo;0;L;;;;;N;;;;;
-A3CE;YI SYLLABLE ROX;Lo;0;L;;;;;N;;;;;
-A3CF;YI SYLLABLE RO;Lo;0;L;;;;;N;;;;;
-A3D0;YI SYLLABLE ROP;Lo;0;L;;;;;N;;;;;
-A3D1;YI SYLLABLE REX;Lo;0;L;;;;;N;;;;;
-A3D2;YI SYLLABLE RE;Lo;0;L;;;;;N;;;;;
-A3D3;YI SYLLABLE REP;Lo;0;L;;;;;N;;;;;
-A3D4;YI SYLLABLE RUT;Lo;0;L;;;;;N;;;;;
-A3D5;YI SYLLABLE RUX;Lo;0;L;;;;;N;;;;;
-A3D6;YI SYLLABLE RU;Lo;0;L;;;;;N;;;;;
-A3D7;YI SYLLABLE RUP;Lo;0;L;;;;;N;;;;;
-A3D8;YI SYLLABLE RURX;Lo;0;L;;;;;N;;;;;
-A3D9;YI SYLLABLE RUR;Lo;0;L;;;;;N;;;;;
-A3DA;YI SYLLABLE RYT;Lo;0;L;;;;;N;;;;;
-A3DB;YI SYLLABLE RYX;Lo;0;L;;;;;N;;;;;
-A3DC;YI SYLLABLE RY;Lo;0;L;;;;;N;;;;;
-A3DD;YI SYLLABLE RYP;Lo;0;L;;;;;N;;;;;
-A3DE;YI SYLLABLE RYRX;Lo;0;L;;;;;N;;;;;
-A3DF;YI SYLLABLE RYR;Lo;0;L;;;;;N;;;;;
-A3E0;YI SYLLABLE JIT;Lo;0;L;;;;;N;;;;;
-A3E1;YI SYLLABLE JIX;Lo;0;L;;;;;N;;;;;
-A3E2;YI SYLLABLE JI;Lo;0;L;;;;;N;;;;;
-A3E3;YI SYLLABLE JIP;Lo;0;L;;;;;N;;;;;
-A3E4;YI SYLLABLE JIET;Lo;0;L;;;;;N;;;;;
-A3E5;YI SYLLABLE JIEX;Lo;0;L;;;;;N;;;;;
-A3E6;YI SYLLABLE JIE;Lo;0;L;;;;;N;;;;;
-A3E7;YI SYLLABLE JIEP;Lo;0;L;;;;;N;;;;;
-A3E8;YI SYLLABLE JUOT;Lo;0;L;;;;;N;;;;;
-A3E9;YI SYLLABLE JUOX;Lo;0;L;;;;;N;;;;;
-A3EA;YI SYLLABLE JUO;Lo;0;L;;;;;N;;;;;
-A3EB;YI SYLLABLE JUOP;Lo;0;L;;;;;N;;;;;
-A3EC;YI SYLLABLE JOT;Lo;0;L;;;;;N;;;;;
-A3ED;YI SYLLABLE JOX;Lo;0;L;;;;;N;;;;;
-A3EE;YI SYLLABLE JO;Lo;0;L;;;;;N;;;;;
-A3EF;YI SYLLABLE JOP;Lo;0;L;;;;;N;;;;;
-A3F0;YI SYLLABLE JUT;Lo;0;L;;;;;N;;;;;
-A3F1;YI SYLLABLE JUX;Lo;0;L;;;;;N;;;;;
-A3F2;YI SYLLABLE JU;Lo;0;L;;;;;N;;;;;
-A3F3;YI SYLLABLE JUP;Lo;0;L;;;;;N;;;;;
-A3F4;YI SYLLABLE JURX;Lo;0;L;;;;;N;;;;;
-A3F5;YI SYLLABLE JUR;Lo;0;L;;;;;N;;;;;
-A3F6;YI SYLLABLE JYT;Lo;0;L;;;;;N;;;;;
-A3F7;YI SYLLABLE JYX;Lo;0;L;;;;;N;;;;;
-A3F8;YI SYLLABLE JY;Lo;0;L;;;;;N;;;;;
-A3F9;YI SYLLABLE JYP;Lo;0;L;;;;;N;;;;;
-A3FA;YI SYLLABLE JYRX;Lo;0;L;;;;;N;;;;;
-A3FB;YI SYLLABLE JYR;Lo;0;L;;;;;N;;;;;
-A3FC;YI SYLLABLE QIT;Lo;0;L;;;;;N;;;;;
-A3FD;YI SYLLABLE QIX;Lo;0;L;;;;;N;;;;;
-A3FE;YI SYLLABLE QI;Lo;0;L;;;;;N;;;;;
-A3FF;YI SYLLABLE QIP;Lo;0;L;;;;;N;;;;;
-A400;YI SYLLABLE QIET;Lo;0;L;;;;;N;;;;;
-A401;YI SYLLABLE QIEX;Lo;0;L;;;;;N;;;;;
-A402;YI SYLLABLE QIE;Lo;0;L;;;;;N;;;;;
-A403;YI SYLLABLE QIEP;Lo;0;L;;;;;N;;;;;
-A404;YI SYLLABLE QUOT;Lo;0;L;;;;;N;;;;;
-A405;YI SYLLABLE QUOX;Lo;0;L;;;;;N;;;;;
-A406;YI SYLLABLE QUO;Lo;0;L;;;;;N;;;;;
-A407;YI SYLLABLE QUOP;Lo;0;L;;;;;N;;;;;
-A408;YI SYLLABLE QOT;Lo;0;L;;;;;N;;;;;
-A409;YI SYLLABLE QOX;Lo;0;L;;;;;N;;;;;
-A40A;YI SYLLABLE QO;Lo;0;L;;;;;N;;;;;
-A40B;YI SYLLABLE QOP;Lo;0;L;;;;;N;;;;;
-A40C;YI SYLLABLE QUT;Lo;0;L;;;;;N;;;;;
-A40D;YI SYLLABLE QUX;Lo;0;L;;;;;N;;;;;
-A40E;YI SYLLABLE QU;Lo;0;L;;;;;N;;;;;
-A40F;YI SYLLABLE QUP;Lo;0;L;;;;;N;;;;;
-A410;YI SYLLABLE QURX;Lo;0;L;;;;;N;;;;;
-A411;YI SYLLABLE QUR;Lo;0;L;;;;;N;;;;;
-A412;YI SYLLABLE QYT;Lo;0;L;;;;;N;;;;;
-A413;YI SYLLABLE QYX;Lo;0;L;;;;;N;;;;;
-A414;YI SYLLABLE QY;Lo;0;L;;;;;N;;;;;
-A415;YI SYLLABLE QYP;Lo;0;L;;;;;N;;;;;
-A416;YI SYLLABLE QYRX;Lo;0;L;;;;;N;;;;;
-A417;YI SYLLABLE QYR;Lo;0;L;;;;;N;;;;;
-A418;YI SYLLABLE JJIT;Lo;0;L;;;;;N;;;;;
-A419;YI SYLLABLE JJIX;Lo;0;L;;;;;N;;;;;
-A41A;YI SYLLABLE JJI;Lo;0;L;;;;;N;;;;;
-A41B;YI SYLLABLE JJIP;Lo;0;L;;;;;N;;;;;
-A41C;YI SYLLABLE JJIET;Lo;0;L;;;;;N;;;;;
-A41D;YI SYLLABLE JJIEX;Lo;0;L;;;;;N;;;;;
-A41E;YI SYLLABLE JJIE;Lo;0;L;;;;;N;;;;;
-A41F;YI SYLLABLE JJIEP;Lo;0;L;;;;;N;;;;;
-A420;YI SYLLABLE JJUOX;Lo;0;L;;;;;N;;;;;
-A421;YI SYLLABLE JJUO;Lo;0;L;;;;;N;;;;;
-A422;YI SYLLABLE JJUOP;Lo;0;L;;;;;N;;;;;
-A423;YI SYLLABLE JJOT;Lo;0;L;;;;;N;;;;;
-A424;YI SYLLABLE JJOX;Lo;0;L;;;;;N;;;;;
-A425;YI SYLLABLE JJO;Lo;0;L;;;;;N;;;;;
-A426;YI SYLLABLE JJOP;Lo;0;L;;;;;N;;;;;
-A427;YI SYLLABLE JJUT;Lo;0;L;;;;;N;;;;;
-A428;YI SYLLABLE JJUX;Lo;0;L;;;;;N;;;;;
-A429;YI SYLLABLE JJU;Lo;0;L;;;;;N;;;;;
-A42A;YI SYLLABLE JJUP;Lo;0;L;;;;;N;;;;;
-A42B;YI SYLLABLE JJURX;Lo;0;L;;;;;N;;;;;
-A42C;YI SYLLABLE JJUR;Lo;0;L;;;;;N;;;;;
-A42D;YI SYLLABLE JJYT;Lo;0;L;;;;;N;;;;;
-A42E;YI SYLLABLE JJYX;Lo;0;L;;;;;N;;;;;
-A42F;YI SYLLABLE JJY;Lo;0;L;;;;;N;;;;;
-A430;YI SYLLABLE JJYP;Lo;0;L;;;;;N;;;;;
-A431;YI SYLLABLE NJIT;Lo;0;L;;;;;N;;;;;
-A432;YI SYLLABLE NJIX;Lo;0;L;;;;;N;;;;;
-A433;YI SYLLABLE NJI;Lo;0;L;;;;;N;;;;;
-A434;YI SYLLABLE NJIP;Lo;0;L;;;;;N;;;;;
-A435;YI SYLLABLE NJIET;Lo;0;L;;;;;N;;;;;
-A436;YI SYLLABLE NJIEX;Lo;0;L;;;;;N;;;;;
-A437;YI SYLLABLE NJIE;Lo;0;L;;;;;N;;;;;
-A438;YI SYLLABLE NJIEP;Lo;0;L;;;;;N;;;;;
-A439;YI SYLLABLE NJUOX;Lo;0;L;;;;;N;;;;;
-A43A;YI SYLLABLE NJUO;Lo;0;L;;;;;N;;;;;
-A43B;YI SYLLABLE NJOT;Lo;0;L;;;;;N;;;;;
-A43C;YI SYLLABLE NJOX;Lo;0;L;;;;;N;;;;;
-A43D;YI SYLLABLE NJO;Lo;0;L;;;;;N;;;;;
-A43E;YI SYLLABLE NJOP;Lo;0;L;;;;;N;;;;;
-A43F;YI SYLLABLE NJUX;Lo;0;L;;;;;N;;;;;
-A440;YI SYLLABLE NJU;Lo;0;L;;;;;N;;;;;
-A441;YI SYLLABLE NJUP;Lo;0;L;;;;;N;;;;;
-A442;YI SYLLABLE NJURX;Lo;0;L;;;;;N;;;;;
-A443;YI SYLLABLE NJUR;Lo;0;L;;;;;N;;;;;
-A444;YI SYLLABLE NJYT;Lo;0;L;;;;;N;;;;;
-A445;YI SYLLABLE NJYX;Lo;0;L;;;;;N;;;;;
-A446;YI SYLLABLE NJY;Lo;0;L;;;;;N;;;;;
-A447;YI SYLLABLE NJYP;Lo;0;L;;;;;N;;;;;
-A448;YI SYLLABLE NJYRX;Lo;0;L;;;;;N;;;;;
-A449;YI SYLLABLE NJYR;Lo;0;L;;;;;N;;;;;
-A44A;YI SYLLABLE NYIT;Lo;0;L;;;;;N;;;;;
-A44B;YI SYLLABLE NYIX;Lo;0;L;;;;;N;;;;;
-A44C;YI SYLLABLE NYI;Lo;0;L;;;;;N;;;;;
-A44D;YI SYLLABLE NYIP;Lo;0;L;;;;;N;;;;;
-A44E;YI SYLLABLE NYIET;Lo;0;L;;;;;N;;;;;
-A44F;YI SYLLABLE NYIEX;Lo;0;L;;;;;N;;;;;
-A450;YI SYLLABLE NYIE;Lo;0;L;;;;;N;;;;;
-A451;YI SYLLABLE NYIEP;Lo;0;L;;;;;N;;;;;
-A452;YI SYLLABLE NYUOX;Lo;0;L;;;;;N;;;;;
-A453;YI SYLLABLE NYUO;Lo;0;L;;;;;N;;;;;
-A454;YI SYLLABLE NYUOP;Lo;0;L;;;;;N;;;;;
-A455;YI SYLLABLE NYOT;Lo;0;L;;;;;N;;;;;
-A456;YI SYLLABLE NYOX;Lo;0;L;;;;;N;;;;;
-A457;YI SYLLABLE NYO;Lo;0;L;;;;;N;;;;;
-A458;YI SYLLABLE NYOP;Lo;0;L;;;;;N;;;;;
-A459;YI SYLLABLE NYUT;Lo;0;L;;;;;N;;;;;
-A45A;YI SYLLABLE NYUX;Lo;0;L;;;;;N;;;;;
-A45B;YI SYLLABLE NYU;Lo;0;L;;;;;N;;;;;
-A45C;YI SYLLABLE NYUP;Lo;0;L;;;;;N;;;;;
-A45D;YI SYLLABLE XIT;Lo;0;L;;;;;N;;;;;
-A45E;YI SYLLABLE XIX;Lo;0;L;;;;;N;;;;;
-A45F;YI SYLLABLE XI;Lo;0;L;;;;;N;;;;;
-A460;YI SYLLABLE XIP;Lo;0;L;;;;;N;;;;;
-A461;YI SYLLABLE XIET;Lo;0;L;;;;;N;;;;;
-A462;YI SYLLABLE XIEX;Lo;0;L;;;;;N;;;;;
-A463;YI SYLLABLE XIE;Lo;0;L;;;;;N;;;;;
-A464;YI SYLLABLE XIEP;Lo;0;L;;;;;N;;;;;
-A465;YI SYLLABLE XUOX;Lo;0;L;;;;;N;;;;;
-A466;YI SYLLABLE XUO;Lo;0;L;;;;;N;;;;;
-A467;YI SYLLABLE XOT;Lo;0;L;;;;;N;;;;;
-A468;YI SYLLABLE XOX;Lo;0;L;;;;;N;;;;;
-A469;YI SYLLABLE XO;Lo;0;L;;;;;N;;;;;
-A46A;YI SYLLABLE XOP;Lo;0;L;;;;;N;;;;;
-A46B;YI SYLLABLE XYT;Lo;0;L;;;;;N;;;;;
-A46C;YI SYLLABLE XYX;Lo;0;L;;;;;N;;;;;
-A46D;YI SYLLABLE XY;Lo;0;L;;;;;N;;;;;
-A46E;YI SYLLABLE XYP;Lo;0;L;;;;;N;;;;;
-A46F;YI SYLLABLE XYRX;Lo;0;L;;;;;N;;;;;
-A470;YI SYLLABLE XYR;Lo;0;L;;;;;N;;;;;
-A471;YI SYLLABLE YIT;Lo;0;L;;;;;N;;;;;
-A472;YI SYLLABLE YIX;Lo;0;L;;;;;N;;;;;
-A473;YI SYLLABLE YI;Lo;0;L;;;;;N;;;;;
-A474;YI SYLLABLE YIP;Lo;0;L;;;;;N;;;;;
-A475;YI SYLLABLE YIET;Lo;0;L;;;;;N;;;;;
-A476;YI SYLLABLE YIEX;Lo;0;L;;;;;N;;;;;
-A477;YI SYLLABLE YIE;Lo;0;L;;;;;N;;;;;
-A478;YI SYLLABLE YIEP;Lo;0;L;;;;;N;;;;;
-A479;YI SYLLABLE YUOT;Lo;0;L;;;;;N;;;;;
-A47A;YI SYLLABLE YUOX;Lo;0;L;;;;;N;;;;;
-A47B;YI SYLLABLE YUO;Lo;0;L;;;;;N;;;;;
-A47C;YI SYLLABLE YUOP;Lo;0;L;;;;;N;;;;;
-A47D;YI SYLLABLE YOT;Lo;0;L;;;;;N;;;;;
-A47E;YI SYLLABLE YOX;Lo;0;L;;;;;N;;;;;
-A47F;YI SYLLABLE YO;Lo;0;L;;;;;N;;;;;
-A480;YI SYLLABLE YOP;Lo;0;L;;;;;N;;;;;
-A481;YI SYLLABLE YUT;Lo;0;L;;;;;N;;;;;
-A482;YI SYLLABLE YUX;Lo;0;L;;;;;N;;;;;
-A483;YI SYLLABLE YU;Lo;0;L;;;;;N;;;;;
-A484;YI SYLLABLE YUP;Lo;0;L;;;;;N;;;;;
-A485;YI SYLLABLE YURX;Lo;0;L;;;;;N;;;;;
-A486;YI SYLLABLE YUR;Lo;0;L;;;;;N;;;;;
-A487;YI SYLLABLE YYT;Lo;0;L;;;;;N;;;;;
-A488;YI SYLLABLE YYX;Lo;0;L;;;;;N;;;;;
-A489;YI SYLLABLE YY;Lo;0;L;;;;;N;;;;;
-A48A;YI SYLLABLE YYP;Lo;0;L;;;;;N;;;;;
-A48B;YI SYLLABLE YYRX;Lo;0;L;;;;;N;;;;;
-A48C;YI SYLLABLE YYR;Lo;0;L;;;;;N;;;;;
-A490;YI RADICAL QOT;So;0;ON;;;;;N;;;;;
-A491;YI RADICAL LI;So;0;ON;;;;;N;;;;;
-A492;YI RADICAL KIT;So;0;ON;;;;;N;;;;;
-A493;YI RADICAL NYIP;So;0;ON;;;;;N;;;;;
-A494;YI RADICAL CYP;So;0;ON;;;;;N;;;;;
-A495;YI RADICAL SSI;So;0;ON;;;;;N;;;;;
-A496;YI RADICAL GGOP;So;0;ON;;;;;N;;;;;
-A497;YI RADICAL GEP;So;0;ON;;;;;N;;;;;
-A498;YI RADICAL MI;So;0;ON;;;;;N;;;;;
-A499;YI RADICAL HXIT;So;0;ON;;;;;N;;;;;
-A49A;YI RADICAL LYR;So;0;ON;;;;;N;;;;;
-A49B;YI RADICAL BBUT;So;0;ON;;;;;N;;;;;
-A49C;YI RADICAL MOP;So;0;ON;;;;;N;;;;;
-A49D;YI RADICAL YO;So;0;ON;;;;;N;;;;;
-A49E;YI RADICAL PUT;So;0;ON;;;;;N;;;;;
-A49F;YI RADICAL HXUO;So;0;ON;;;;;N;;;;;
-A4A0;YI RADICAL TAT;So;0;ON;;;;;N;;;;;
-A4A1;YI RADICAL GA;So;0;ON;;;;;N;;;;;
-A4A2;YI RADICAL ZUP;So;0;ON;;;;;N;;;;;
-A4A3;YI RADICAL CYT;So;0;ON;;;;;N;;;;;
-A4A4;YI RADICAL DDUR;So;0;ON;;;;;N;;;;;
-A4A5;YI RADICAL BUR;So;0;ON;;;;;N;;;;;
-A4A6;YI RADICAL GGUO;So;0;ON;;;;;N;;;;;
-A4A7;YI RADICAL NYOP;So;0;ON;;;;;N;;;;;
-A4A8;YI RADICAL TU;So;0;ON;;;;;N;;;;;
-A4A9;YI RADICAL OP;So;0;ON;;;;;N;;;;;
-A4AA;YI RADICAL JJUT;So;0;ON;;;;;N;;;;;
-A4AB;YI RADICAL ZOT;So;0;ON;;;;;N;;;;;
-A4AC;YI RADICAL PYT;So;0;ON;;;;;N;;;;;
-A4AD;YI RADICAL HMO;So;0;ON;;;;;N;;;;;
-A4AE;YI RADICAL YIT;So;0;ON;;;;;N;;;;;
-A4AF;YI RADICAL VUR;So;0;ON;;;;;N;;;;;
-A4B0;YI RADICAL SHY;So;0;ON;;;;;N;;;;;
-A4B1;YI RADICAL VEP;So;0;ON;;;;;N;;;;;
-A4B2;YI RADICAL ZA;So;0;ON;;;;;N;;;;;
-A4B3;YI RADICAL JO;So;0;ON;;;;;N;;;;;
-A4B4;YI RADICAL NZUP;So;0;ON;;;;;N;;;;;
-A4B5;YI RADICAL JJY;So;0;ON;;;;;N;;;;;
-A4B6;YI RADICAL GOT;So;0;ON;;;;;N;;;;;
-A4B7;YI RADICAL JJIE;So;0;ON;;;;;N;;;;;
-A4B8;YI RADICAL WO;So;0;ON;;;;;N;;;;;
-A4B9;YI RADICAL DU;So;0;ON;;;;;N;;;;;
-A4BA;YI RADICAL SHUR;So;0;ON;;;;;N;;;;;
-A4BB;YI RADICAL LIE;So;0;ON;;;;;N;;;;;
-A4BC;YI RADICAL CY;So;0;ON;;;;;N;;;;;
-A4BD;YI RADICAL CUOP;So;0;ON;;;;;N;;;;;
-A4BE;YI RADICAL CIP;So;0;ON;;;;;N;;;;;
-A4BF;YI RADICAL HXOP;So;0;ON;;;;;N;;;;;
-A4C0;YI RADICAL SHAT;So;0;ON;;;;;N;;;;;
-A4C1;YI RADICAL ZUR;So;0;ON;;;;;N;;;;;
-A4C2;YI RADICAL SHOP;So;0;ON;;;;;N;;;;;
-A4C3;YI RADICAL CHE;So;0;ON;;;;;N;;;;;
-A4C4;YI RADICAL ZZIET;So;0;ON;;;;;N;;;;;
-A4C5;YI RADICAL NBIE;So;0;ON;;;;;N;;;;;
-A4C6;YI RADICAL KE;So;0;ON;;;;;N;;;;;
-A500;VAI SYLLABLE EE;Lo;0;L;;;;;N;;;;;
-A501;VAI SYLLABLE EEN;Lo;0;L;;;;;N;;;;;
-A502;VAI SYLLABLE HEE;Lo;0;L;;;;;N;;;;;
-A503;VAI SYLLABLE WEE;Lo;0;L;;;;;N;;;;;
-A504;VAI SYLLABLE WEEN;Lo;0;L;;;;;N;;;;;
-A505;VAI SYLLABLE PEE;Lo;0;L;;;;;N;;;;;
-A506;VAI SYLLABLE BHEE;Lo;0;L;;;;;N;;;;;
-A507;VAI SYLLABLE BEE;Lo;0;L;;;;;N;;;;;
-A508;VAI SYLLABLE MBEE;Lo;0;L;;;;;N;;;;;
-A509;VAI SYLLABLE KPEE;Lo;0;L;;;;;N;;;;;
-A50A;VAI SYLLABLE MGBEE;Lo;0;L;;;;;N;;;;;
-A50B;VAI SYLLABLE GBEE;Lo;0;L;;;;;N;;;;;
-A50C;VAI SYLLABLE FEE;Lo;0;L;;;;;N;;;;;
-A50D;VAI SYLLABLE VEE;Lo;0;L;;;;;N;;;;;
-A50E;VAI SYLLABLE TEE;Lo;0;L;;;;;N;;;;;
-A50F;VAI SYLLABLE THEE;Lo;0;L;;;;;N;;;;;
-A510;VAI SYLLABLE DHEE;Lo;0;L;;;;;N;;;;;
-A511;VAI SYLLABLE DHHEE;Lo;0;L;;;;;N;;;;;
-A512;VAI SYLLABLE LEE;Lo;0;L;;;;;N;;;;;
-A513;VAI SYLLABLE REE;Lo;0;L;;;;;N;;;;;
-A514;VAI SYLLABLE DEE;Lo;0;L;;;;;N;;;;;
-A515;VAI SYLLABLE NDEE;Lo;0;L;;;;;N;;;;;
-A516;VAI SYLLABLE SEE;Lo;0;L;;;;;N;;;;;
-A517;VAI SYLLABLE SHEE;Lo;0;L;;;;;N;;;;;
-A518;VAI SYLLABLE ZEE;Lo;0;L;;;;;N;;;;;
-A519;VAI SYLLABLE ZHEE;Lo;0;L;;;;;N;;;;;
-A51A;VAI SYLLABLE CEE;Lo;0;L;;;;;N;;;;;
-A51B;VAI SYLLABLE JEE;Lo;0;L;;;;;N;;;;;
-A51C;VAI SYLLABLE NJEE;Lo;0;L;;;;;N;;;;;
-A51D;VAI SYLLABLE YEE;Lo;0;L;;;;;N;;;;;
-A51E;VAI SYLLABLE KEE;Lo;0;L;;;;;N;;;;;
-A51F;VAI SYLLABLE NGGEE;Lo;0;L;;;;;N;;;;;
-A520;VAI SYLLABLE GEE;Lo;0;L;;;;;N;;;;;
-A521;VAI SYLLABLE MEE;Lo;0;L;;;;;N;;;;;
-A522;VAI SYLLABLE NEE;Lo;0;L;;;;;N;;;;;
-A523;VAI SYLLABLE NYEE;Lo;0;L;;;;;N;;;;;
-A524;VAI SYLLABLE I;Lo;0;L;;;;;N;;;;;
-A525;VAI SYLLABLE IN;Lo;0;L;;;;;N;;;;;
-A526;VAI SYLLABLE HI;Lo;0;L;;;;;N;;;;;
-A527;VAI SYLLABLE HIN;Lo;0;L;;;;;N;;;;;
-A528;VAI SYLLABLE WI;Lo;0;L;;;;;N;;;;;
-A529;VAI SYLLABLE WIN;Lo;0;L;;;;;N;;;;;
-A52A;VAI SYLLABLE PI;Lo;0;L;;;;;N;;;;;
-A52B;VAI SYLLABLE BHI;Lo;0;L;;;;;N;;;;;
-A52C;VAI SYLLABLE BI;Lo;0;L;;;;;N;;;;;
-A52D;VAI SYLLABLE MBI;Lo;0;L;;;;;N;;;;;
-A52E;VAI SYLLABLE KPI;Lo;0;L;;;;;N;;;;;
-A52F;VAI SYLLABLE MGBI;Lo;0;L;;;;;N;;;;;
-A530;VAI SYLLABLE GBI;Lo;0;L;;;;;N;;;;;
-A531;VAI SYLLABLE FI;Lo;0;L;;;;;N;;;;;
-A532;VAI SYLLABLE VI;Lo;0;L;;;;;N;;;;;
-A533;VAI SYLLABLE TI;Lo;0;L;;;;;N;;;;;
-A534;VAI SYLLABLE THI;Lo;0;L;;;;;N;;;;;
-A535;VAI SYLLABLE DHI;Lo;0;L;;;;;N;;;;;
-A536;VAI SYLLABLE DHHI;Lo;0;L;;;;;N;;;;;
-A537;VAI SYLLABLE LI;Lo;0;L;;;;;N;;;;;
-A538;VAI SYLLABLE RI;Lo;0;L;;;;;N;;;;;
-A539;VAI SYLLABLE DI;Lo;0;L;;;;;N;;;;;
-A53A;VAI SYLLABLE NDI;Lo;0;L;;;;;N;;;;;
-A53B;VAI SYLLABLE SI;Lo;0;L;;;;;N;;;;;
-A53C;VAI SYLLABLE SHI;Lo;0;L;;;;;N;;;;;
-A53D;VAI SYLLABLE ZI;Lo;0;L;;;;;N;;;;;
-A53E;VAI SYLLABLE ZHI;Lo;0;L;;;;;N;;;;;
-A53F;VAI SYLLABLE CI;Lo;0;L;;;;;N;;;;;
-A540;VAI SYLLABLE JI;Lo;0;L;;;;;N;;;;;
-A541;VAI SYLLABLE NJI;Lo;0;L;;;;;N;;;;;
-A542;VAI SYLLABLE YI;Lo;0;L;;;;;N;;;;;
-A543;VAI SYLLABLE KI;Lo;0;L;;;;;N;;;;;
-A544;VAI SYLLABLE NGGI;Lo;0;L;;;;;N;;;;;
-A545;VAI SYLLABLE GI;Lo;0;L;;;;;N;;;;;
-A546;VAI SYLLABLE MI;Lo;0;L;;;;;N;;;;;
-A547;VAI SYLLABLE NI;Lo;0;L;;;;;N;;;;;
-A548;VAI SYLLABLE NYI;Lo;0;L;;;;;N;;;;;
-A549;VAI SYLLABLE A;Lo;0;L;;;;;N;;;;;
-A54A;VAI SYLLABLE AN;Lo;0;L;;;;;N;;;;;
-A54B;VAI SYLLABLE NGAN;Lo;0;L;;;;;N;;;;;
-A54C;VAI SYLLABLE HA;Lo;0;L;;;;;N;;;;;
-A54D;VAI SYLLABLE HAN;Lo;0;L;;;;;N;;;;;
-A54E;VAI SYLLABLE WA;Lo;0;L;;;;;N;;;;;
-A54F;VAI SYLLABLE WAN;Lo;0;L;;;;;N;;;;;
-A550;VAI SYLLABLE PA;Lo;0;L;;;;;N;;;;;
-A551;VAI SYLLABLE BHA;Lo;0;L;;;;;N;;;;;
-A552;VAI SYLLABLE BA;Lo;0;L;;;;;N;;;;;
-A553;VAI SYLLABLE MBA;Lo;0;L;;;;;N;;;;;
-A554;VAI SYLLABLE KPA;Lo;0;L;;;;;N;;;;;
-A555;VAI SYLLABLE KPAN;Lo;0;L;;;;;N;;;;;
-A556;VAI SYLLABLE MGBA;Lo;0;L;;;;;N;;;;;
-A557;VAI SYLLABLE GBA;Lo;0;L;;;;;N;;;;;
-A558;VAI SYLLABLE FA;Lo;0;L;;;;;N;;;;;
-A559;VAI SYLLABLE VA;Lo;0;L;;;;;N;;;;;
-A55A;VAI SYLLABLE TA;Lo;0;L;;;;;N;;;;;
-A55B;VAI SYLLABLE THA;Lo;0;L;;;;;N;;;;;
-A55C;VAI SYLLABLE DHA;Lo;0;L;;;;;N;;;;;
-A55D;VAI SYLLABLE DHHA;Lo;0;L;;;;;N;;;;;
-A55E;VAI SYLLABLE LA;Lo;0;L;;;;;N;;;;;
-A55F;VAI SYLLABLE RA;Lo;0;L;;;;;N;;;;;
-A560;VAI SYLLABLE DA;Lo;0;L;;;;;N;;;;;
-A561;VAI SYLLABLE NDA;Lo;0;L;;;;;N;;;;;
-A562;VAI SYLLABLE SA;Lo;0;L;;;;;N;;;;;
-A563;VAI SYLLABLE SHA;Lo;0;L;;;;;N;;;;;
-A564;VAI SYLLABLE ZA;Lo;0;L;;;;;N;;;;;
-A565;VAI SYLLABLE ZHA;Lo;0;L;;;;;N;;;;;
-A566;VAI SYLLABLE CA;Lo;0;L;;;;;N;;;;;
-A567;VAI SYLLABLE JA;Lo;0;L;;;;;N;;;;;
-A568;VAI SYLLABLE NJA;Lo;0;L;;;;;N;;;;;
-A569;VAI SYLLABLE YA;Lo;0;L;;;;;N;;;;;
-A56A;VAI SYLLABLE KA;Lo;0;L;;;;;N;;;;;
-A56B;VAI SYLLABLE KAN;Lo;0;L;;;;;N;;;;;
-A56C;VAI SYLLABLE NGGA;Lo;0;L;;;;;N;;;;;
-A56D;VAI SYLLABLE GA;Lo;0;L;;;;;N;;;;;
-A56E;VAI SYLLABLE MA;Lo;0;L;;;;;N;;;;;
-A56F;VAI SYLLABLE NA;Lo;0;L;;;;;N;;;;;
-A570;VAI SYLLABLE NYA;Lo;0;L;;;;;N;;;;;
-A571;VAI SYLLABLE OO;Lo;0;L;;;;;N;;;;;
-A572;VAI SYLLABLE OON;Lo;0;L;;;;;N;;;;;
-A573;VAI SYLLABLE HOO;Lo;0;L;;;;;N;;;;;
-A574;VAI SYLLABLE WOO;Lo;0;L;;;;;N;;;;;
-A575;VAI SYLLABLE WOON;Lo;0;L;;;;;N;;;;;
-A576;VAI SYLLABLE POO;Lo;0;L;;;;;N;;;;;
-A577;VAI SYLLABLE BHOO;Lo;0;L;;;;;N;;;;;
-A578;VAI SYLLABLE BOO;Lo;0;L;;;;;N;;;;;
-A579;VAI SYLLABLE MBOO;Lo;0;L;;;;;N;;;;;
-A57A;VAI SYLLABLE KPOO;Lo;0;L;;;;;N;;;;;
-A57B;VAI SYLLABLE MGBOO;Lo;0;L;;;;;N;;;;;
-A57C;VAI SYLLABLE GBOO;Lo;0;L;;;;;N;;;;;
-A57D;VAI SYLLABLE FOO;Lo;0;L;;;;;N;;;;;
-A57E;VAI SYLLABLE VOO;Lo;0;L;;;;;N;;;;;
-A57F;VAI SYLLABLE TOO;Lo;0;L;;;;;N;;;;;
-A580;VAI SYLLABLE THOO;Lo;0;L;;;;;N;;;;;
-A581;VAI SYLLABLE DHOO;Lo;0;L;;;;;N;;;;;
-A582;VAI SYLLABLE DHHOO;Lo;0;L;;;;;N;;;;;
-A583;VAI SYLLABLE LOO;Lo;0;L;;;;;N;;;;;
-A584;VAI SYLLABLE ROO;Lo;0;L;;;;;N;;;;;
-A585;VAI SYLLABLE DOO;Lo;0;L;;;;;N;;;;;
-A586;VAI SYLLABLE NDOO;Lo;0;L;;;;;N;;;;;
-A587;VAI SYLLABLE SOO;Lo;0;L;;;;;N;;;;;
-A588;VAI SYLLABLE SHOO;Lo;0;L;;;;;N;;;;;
-A589;VAI SYLLABLE ZOO;Lo;0;L;;;;;N;;;;;
-A58A;VAI SYLLABLE ZHOO;Lo;0;L;;;;;N;;;;;
-A58B;VAI SYLLABLE COO;Lo;0;L;;;;;N;;;;;
-A58C;VAI SYLLABLE JOO;Lo;0;L;;;;;N;;;;;
-A58D;VAI SYLLABLE NJOO;Lo;0;L;;;;;N;;;;;
-A58E;VAI SYLLABLE YOO;Lo;0;L;;;;;N;;;;;
-A58F;VAI SYLLABLE KOO;Lo;0;L;;;;;N;;;;;
-A590;VAI SYLLABLE NGGOO;Lo;0;L;;;;;N;;;;;
-A591;VAI SYLLABLE GOO;Lo;0;L;;;;;N;;;;;
-A592;VAI SYLLABLE MOO;Lo;0;L;;;;;N;;;;;
-A593;VAI SYLLABLE NOO;Lo;0;L;;;;;N;;;;;
-A594;VAI SYLLABLE NYOO;Lo;0;L;;;;;N;;;;;
-A595;VAI SYLLABLE U;Lo;0;L;;;;;N;;;;;
-A596;VAI SYLLABLE UN;Lo;0;L;;;;;N;;;;;
-A597;VAI SYLLABLE HU;Lo;0;L;;;;;N;;;;;
-A598;VAI SYLLABLE HUN;Lo;0;L;;;;;N;;;;;
-A599;VAI SYLLABLE WU;Lo;0;L;;;;;N;;;;;
-A59A;VAI SYLLABLE WUN;Lo;0;L;;;;;N;;;;;
-A59B;VAI SYLLABLE PU;Lo;0;L;;;;;N;;;;;
-A59C;VAI SYLLABLE BHU;Lo;0;L;;;;;N;;;;;
-A59D;VAI SYLLABLE BU;Lo;0;L;;;;;N;;;;;
-A59E;VAI SYLLABLE MBU;Lo;0;L;;;;;N;;;;;
-A59F;VAI SYLLABLE KPU;Lo;0;L;;;;;N;;;;;
-A5A0;VAI SYLLABLE MGBU;Lo;0;L;;;;;N;;;;;
-A5A1;VAI SYLLABLE GBU;Lo;0;L;;;;;N;;;;;
-A5A2;VAI SYLLABLE FU;Lo;0;L;;;;;N;;;;;
-A5A3;VAI SYLLABLE VU;Lo;0;L;;;;;N;;;;;
-A5A4;VAI SYLLABLE TU;Lo;0;L;;;;;N;;;;;
-A5A5;VAI SYLLABLE THU;Lo;0;L;;;;;N;;;;;
-A5A6;VAI SYLLABLE DHU;Lo;0;L;;;;;N;;;;;
-A5A7;VAI SYLLABLE DHHU;Lo;0;L;;;;;N;;;;;
-A5A8;VAI SYLLABLE LU;Lo;0;L;;;;;N;;;;;
-A5A9;VAI SYLLABLE RU;Lo;0;L;;;;;N;;;;;
-A5AA;VAI SYLLABLE DU;Lo;0;L;;;;;N;;;;;
-A5AB;VAI SYLLABLE NDU;Lo;0;L;;;;;N;;;;;
-A5AC;VAI SYLLABLE SU;Lo;0;L;;;;;N;;;;;
-A5AD;VAI SYLLABLE SHU;Lo;0;L;;;;;N;;;;;
-A5AE;VAI SYLLABLE ZU;Lo;0;L;;;;;N;;;;;
-A5AF;VAI SYLLABLE ZHU;Lo;0;L;;;;;N;;;;;
-A5B0;VAI SYLLABLE CU;Lo;0;L;;;;;N;;;;;
-A5B1;VAI SYLLABLE JU;Lo;0;L;;;;;N;;;;;
-A5B2;VAI SYLLABLE NJU;Lo;0;L;;;;;N;;;;;
-A5B3;VAI SYLLABLE YU;Lo;0;L;;;;;N;;;;;
-A5B4;VAI SYLLABLE KU;Lo;0;L;;;;;N;;;;;
-A5B5;VAI SYLLABLE NGGU;Lo;0;L;;;;;N;;;;;
-A5B6;VAI SYLLABLE GU;Lo;0;L;;;;;N;;;;;
-A5B7;VAI SYLLABLE MU;Lo;0;L;;;;;N;;;;;
-A5B8;VAI SYLLABLE NU;Lo;0;L;;;;;N;;;;;
-A5B9;VAI SYLLABLE NYU;Lo;0;L;;;;;N;;;;;
-A5BA;VAI SYLLABLE O;Lo;0;L;;;;;N;;;;;
-A5BB;VAI SYLLABLE ON;Lo;0;L;;;;;N;;;;;
-A5BC;VAI SYLLABLE NGON;Lo;0;L;;;;;N;;;;;
-A5BD;VAI SYLLABLE HO;Lo;0;L;;;;;N;;;;;
-A5BE;VAI SYLLABLE HON;Lo;0;L;;;;;N;;;;;
-A5BF;VAI SYLLABLE WO;Lo;0;L;;;;;N;;;;;
-A5C0;VAI SYLLABLE WON;Lo;0;L;;;;;N;;;;;
-A5C1;VAI SYLLABLE PO;Lo;0;L;;;;;N;;;;;
-A5C2;VAI SYLLABLE BHO;Lo;0;L;;;;;N;;;;;
-A5C3;VAI SYLLABLE BO;Lo;0;L;;;;;N;;;;;
-A5C4;VAI SYLLABLE MBO;Lo;0;L;;;;;N;;;;;
-A5C5;VAI SYLLABLE KPO;Lo;0;L;;;;;N;;;;;
-A5C6;VAI SYLLABLE MGBO;Lo;0;L;;;;;N;;;;;
-A5C7;VAI SYLLABLE GBO;Lo;0;L;;;;;N;;;;;
-A5C8;VAI SYLLABLE GBON;Lo;0;L;;;;;N;;;;;
-A5C9;VAI SYLLABLE FO;Lo;0;L;;;;;N;;;;;
-A5CA;VAI SYLLABLE VO;Lo;0;L;;;;;N;;;;;
-A5CB;VAI SYLLABLE TO;Lo;0;L;;;;;N;;;;;
-A5CC;VAI SYLLABLE THO;Lo;0;L;;;;;N;;;;;
-A5CD;VAI SYLLABLE DHO;Lo;0;L;;;;;N;;;;;
-A5CE;VAI SYLLABLE DHHO;Lo;0;L;;;;;N;;;;;
-A5CF;VAI SYLLABLE LO;Lo;0;L;;;;;N;;;;;
-A5D0;VAI SYLLABLE RO;Lo;0;L;;;;;N;;;;;
-A5D1;VAI SYLLABLE DO;Lo;0;L;;;;;N;;;;;
-A5D2;VAI SYLLABLE NDO;Lo;0;L;;;;;N;;;;;
-A5D3;VAI SYLLABLE SO;Lo;0;L;;;;;N;;;;;
-A5D4;VAI SYLLABLE SHO;Lo;0;L;;;;;N;;;;;
-A5D5;VAI SYLLABLE ZO;Lo;0;L;;;;;N;;;;;
-A5D6;VAI SYLLABLE ZHO;Lo;0;L;;;;;N;;;;;
-A5D7;VAI SYLLABLE CO;Lo;0;L;;;;;N;;;;;
-A5D8;VAI SYLLABLE JO;Lo;0;L;;;;;N;;;;;
-A5D9;VAI SYLLABLE NJO;Lo;0;L;;;;;N;;;;;
-A5DA;VAI SYLLABLE YO;Lo;0;L;;;;;N;;;;;
-A5DB;VAI SYLLABLE KO;Lo;0;L;;;;;N;;;;;
-A5DC;VAI SYLLABLE NGGO;Lo;0;L;;;;;N;;;;;
-A5DD;VAI SYLLABLE GO;Lo;0;L;;;;;N;;;;;
-A5DE;VAI SYLLABLE MO;Lo;0;L;;;;;N;;;;;
-A5DF;VAI SYLLABLE NO;Lo;0;L;;;;;N;;;;;
-A5E0;VAI SYLLABLE NYO;Lo;0;L;;;;;N;;;;;
-A5E1;VAI SYLLABLE E;Lo;0;L;;;;;N;;;;;
-A5E2;VAI SYLLABLE EN;Lo;0;L;;;;;N;;;;;
-A5E3;VAI SYLLABLE NGEN;Lo;0;L;;;;;N;;;;;
-A5E4;VAI SYLLABLE HE;Lo;0;L;;;;;N;;;;;
-A5E5;VAI SYLLABLE HEN;Lo;0;L;;;;;N;;;;;
-A5E6;VAI SYLLABLE WE;Lo;0;L;;;;;N;;;;;
-A5E7;VAI SYLLABLE WEN;Lo;0;L;;;;;N;;;;;
-A5E8;VAI SYLLABLE PE;Lo;0;L;;;;;N;;;;;
-A5E9;VAI SYLLABLE BHE;Lo;0;L;;;;;N;;;;;
-A5EA;VAI SYLLABLE BE;Lo;0;L;;;;;N;;;;;
-A5EB;VAI SYLLABLE MBE;Lo;0;L;;;;;N;;;;;
-A5EC;VAI SYLLABLE KPE;Lo;0;L;;;;;N;;;;;
-A5ED;VAI SYLLABLE KPEN;Lo;0;L;;;;;N;;;;;
-A5EE;VAI SYLLABLE MGBE;Lo;0;L;;;;;N;;;;;
-A5EF;VAI SYLLABLE GBE;Lo;0;L;;;;;N;;;;;
-A5F0;VAI SYLLABLE GBEN;Lo;0;L;;;;;N;;;;;
-A5F1;VAI SYLLABLE FE;Lo;0;L;;;;;N;;;;;
-A5F2;VAI SYLLABLE VE;Lo;0;L;;;;;N;;;;;
-A5F3;VAI SYLLABLE TE;Lo;0;L;;;;;N;;;;;
-A5F4;VAI SYLLABLE THE;Lo;0;L;;;;;N;;;;;
-A5F5;VAI SYLLABLE DHE;Lo;0;L;;;;;N;;;;;
-A5F6;VAI SYLLABLE DHHE;Lo;0;L;;;;;N;;;;;
-A5F7;VAI SYLLABLE LE;Lo;0;L;;;;;N;;;;;
-A5F8;VAI SYLLABLE RE;Lo;0;L;;;;;N;;;;;
-A5F9;VAI SYLLABLE DE;Lo;0;L;;;;;N;;;;;
-A5FA;VAI SYLLABLE NDE;Lo;0;L;;;;;N;;;;;
-A5FB;VAI SYLLABLE SE;Lo;0;L;;;;;N;;;;;
-A5FC;VAI SYLLABLE SHE;Lo;0;L;;;;;N;;;;;
-A5FD;VAI SYLLABLE ZE;Lo;0;L;;;;;N;;;;;
-A5FE;VAI SYLLABLE ZHE;Lo;0;L;;;;;N;;;;;
-A5FF;VAI SYLLABLE CE;Lo;0;L;;;;;N;;;;;
-A600;VAI SYLLABLE JE;Lo;0;L;;;;;N;;;;;
-A601;VAI SYLLABLE NJE;Lo;0;L;;;;;N;;;;;
-A602;VAI SYLLABLE YE;Lo;0;L;;;;;N;;;;;
-A603;VAI SYLLABLE KE;Lo;0;L;;;;;N;;;;;
-A604;VAI SYLLABLE NGGE;Lo;0;L;;;;;N;;;;;
-A605;VAI SYLLABLE NGGEN;Lo;0;L;;;;;N;;;;;
-A606;VAI SYLLABLE GE;Lo;0;L;;;;;N;;;;;
-A607;VAI SYLLABLE GEN;Lo;0;L;;;;;N;;;;;
-A608;VAI SYLLABLE ME;Lo;0;L;;;;;N;;;;;
-A609;VAI SYLLABLE NE;Lo;0;L;;;;;N;;;;;
-A60A;VAI SYLLABLE NYE;Lo;0;L;;;;;N;;;;;
-A60B;VAI SYLLABLE NG;Lo;0;L;;;;;N;;;;;
-A60C;VAI SYLLABLE LENGTHENER;Lm;0;L;;;;;N;;;;;
-A60D;VAI COMMA;Po;0;ON;;;;;N;;;;;
-A60E;VAI FULL STOP;Po;0;ON;;;;;N;;;;;
-A60F;VAI QUESTION MARK;Po;0;ON;;;;;N;;;;;
-A610;VAI SYLLABLE NDOLE FA;Lo;0;L;;;;;N;;;;;
-A611;VAI SYLLABLE NDOLE KA;Lo;0;L;;;;;N;;;;;
-A612;VAI SYLLABLE NDOLE SOO;Lo;0;L;;;;;N;;;;;
-A613;VAI SYMBOL FEENG;Lo;0;L;;;;;N;;;;;
-A614;VAI SYMBOL KEENG;Lo;0;L;;;;;N;;;;;
-A615;VAI SYMBOL TING;Lo;0;L;;;;;N;;;;;
-A616;VAI SYMBOL NII;Lo;0;L;;;;;N;;;;;
-A617;VAI SYMBOL BANG;Lo;0;L;;;;;N;;;;;
-A618;VAI SYMBOL FAA;Lo;0;L;;;;;N;;;;;
-A619;VAI SYMBOL TAA;Lo;0;L;;;;;N;;;;;
-A61A;VAI SYMBOL DANG;Lo;0;L;;;;;N;;;;;
-A61B;VAI SYMBOL DOONG;Lo;0;L;;;;;N;;;;;
-A61C;VAI SYMBOL KUNG;Lo;0;L;;;;;N;;;;;
-A61D;VAI SYMBOL TONG;Lo;0;L;;;;;N;;;;;
-A61E;VAI SYMBOL DO-O;Lo;0;L;;;;;N;;;;;
-A61F;VAI SYMBOL JONG;Lo;0;L;;;;;N;;;;;
-A620;VAI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
-A621;VAI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
-A622;VAI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
-A623;VAI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
-A624;VAI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
-A625;VAI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
-A626;VAI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
-A627;VAI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
-A628;VAI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
-A629;VAI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
-A62A;VAI SYLLABLE NDOLE MA;Lo;0;L;;;;;N;;;;;
-A62B;VAI SYLLABLE NDOLE DO;Lo;0;L;;;;;N;;;;;
-A640;CYRILLIC CAPITAL LETTER ZEMLYA;Lu;0;L;;;;;N;;;;A641;
-A641;CYRILLIC SMALL LETTER ZEMLYA;Ll;0;L;;;;;N;;;A640;;A640
-A642;CYRILLIC CAPITAL LETTER DZELO;Lu;0;L;;;;;N;;;;A643;
-A643;CYRILLIC SMALL LETTER DZELO;Ll;0;L;;;;;N;;;A642;;A642
-A644;CYRILLIC CAPITAL LETTER REVERSED DZE;Lu;0;L;;;;;N;;;;A645;
-A645;CYRILLIC SMALL LETTER REVERSED DZE;Ll;0;L;;;;;N;;;A644;;A644
-A646;CYRILLIC CAPITAL LETTER IOTA;Lu;0;L;;;;;N;;;;A647;
-A647;CYRILLIC SMALL LETTER IOTA;Ll;0;L;;;;;N;;;A646;;A646
-A648;CYRILLIC CAPITAL LETTER DJERV;Lu;0;L;;;;;N;;;;A649;
-A649;CYRILLIC SMALL LETTER DJERV;Ll;0;L;;;;;N;;;A648;;A648
-A64A;CYRILLIC CAPITAL LETTER MONOGRAPH UK;Lu;0;L;;;;;N;;;;A64B;
-A64B;CYRILLIC SMALL LETTER MONOGRAPH UK;Ll;0;L;;;;;N;;;A64A;;A64A
-A64C;CYRILLIC CAPITAL LETTER BROAD OMEGA;Lu;0;L;;;;;N;;;;A64D;
-A64D;CYRILLIC SMALL LETTER BROAD OMEGA;Ll;0;L;;;;;N;;;A64C;;A64C
-A64E;CYRILLIC CAPITAL LETTER NEUTRAL YER;Lu;0;L;;;;;N;;;;A64F;
-A64F;CYRILLIC SMALL LETTER NEUTRAL YER;Ll;0;L;;;;;N;;;A64E;;A64E
-A650;CYRILLIC CAPITAL LETTER YERU WITH BACK YER;Lu;0;L;;;;;N;;;;A651;
-A651;CYRILLIC SMALL LETTER YERU WITH BACK YER;Ll;0;L;;;;;N;;;A650;;A650
-A652;CYRILLIC CAPITAL LETTER IOTIFIED YAT;Lu;0;L;;;;;N;;;;A653;
-A653;CYRILLIC SMALL LETTER IOTIFIED YAT;Ll;0;L;;;;;N;;;A652;;A652
-A654;CYRILLIC CAPITAL LETTER REVERSED YU;Lu;0;L;;;;;N;;;;A655;
-A655;CYRILLIC SMALL LETTER REVERSED YU;Ll;0;L;;;;;N;;;A654;;A654
-A656;CYRILLIC CAPITAL LETTER IOTIFIED A;Lu;0;L;;;;;N;;;;A657;
-A657;CYRILLIC SMALL LETTER IOTIFIED A;Ll;0;L;;;;;N;;;A656;;A656
-A658;CYRILLIC CAPITAL LETTER CLOSED LITTLE YUS;Lu;0;L;;;;;N;;;;A659;
-A659;CYRILLIC SMALL LETTER CLOSED LITTLE YUS;Ll;0;L;;;;;N;;;A658;;A658
-A65A;CYRILLIC CAPITAL LETTER BLENDED YUS;Lu;0;L;;;;;N;;;;A65B;
-A65B;CYRILLIC SMALL LETTER BLENDED YUS;Ll;0;L;;;;;N;;;A65A;;A65A
-A65C;CYRILLIC CAPITAL LETTER IOTIFIED CLOSED LITTLE YUS;Lu;0;L;;;;;N;;;;A65D;
-A65D;CYRILLIC SMALL LETTER IOTIFIED CLOSED LITTLE YUS;Ll;0;L;;;;;N;;;A65C;;A65C
-A65E;CYRILLIC CAPITAL LETTER YN;Lu;0;L;;;;;N;;;;A65F;
-A65F;CYRILLIC SMALL LETTER YN;Ll;0;L;;;;;N;;;A65E;;A65E
-A662;CYRILLIC CAPITAL LETTER SOFT DE;Lu;0;L;;;;;N;;;;A663;
-A663;CYRILLIC SMALL LETTER SOFT DE;Ll;0;L;;;;;N;;;A662;;A662
-A664;CYRILLIC CAPITAL LETTER SOFT EL;Lu;0;L;;;;;N;;;;A665;
-A665;CYRILLIC SMALL LETTER SOFT EL;Ll;0;L;;;;;N;;;A664;;A664
-A666;CYRILLIC CAPITAL LETTER SOFT EM;Lu;0;L;;;;;N;;;;A667;
-A667;CYRILLIC SMALL LETTER SOFT EM;Ll;0;L;;;;;N;;;A666;;A666
-A668;CYRILLIC CAPITAL LETTER MONOCULAR O;Lu;0;L;;;;;N;;;;A669;
-A669;CYRILLIC SMALL LETTER MONOCULAR O;Ll;0;L;;;;;N;;;A668;;A668
-A66A;CYRILLIC CAPITAL LETTER BINOCULAR O;Lu;0;L;;;;;N;;;;A66B;
-A66B;CYRILLIC SMALL LETTER BINOCULAR O;Ll;0;L;;;;;N;;;A66A;;A66A
-A66C;CYRILLIC CAPITAL LETTER DOUBLE MONOCULAR O;Lu;0;L;;;;;N;;;;A66D;
-A66D;CYRILLIC SMALL LETTER DOUBLE MONOCULAR O;Ll;0;L;;;;;N;;;A66C;;A66C
-A66E;CYRILLIC LETTER MULTIOCULAR O;Lo;0;L;;;;;N;;;;;
-A66F;COMBINING CYRILLIC VZMET;Mn;230;NSM;;;;;N;;;;;
-A670;COMBINING CYRILLIC TEN MILLIONS SIGN;Me;0;NSM;;;;;N;;;;;
-A671;COMBINING CYRILLIC HUNDRED MILLIONS SIGN;Me;0;NSM;;;;;N;;;;;
-A672;COMBINING CYRILLIC THOUSAND MILLIONS SIGN;Me;0;NSM;;;;;N;;;;;
-A673;SLAVONIC ASTERISK;Po;0;ON;;;;;N;;;;;
-A67C;COMBINING CYRILLIC KAVYKA;Mn;230;NSM;;;;;N;;;;;
-A67D;COMBINING CYRILLIC PAYEROK;Mn;230;NSM;;;;;N;;;;;
-A67E;CYRILLIC KAVYKA;Po;0;ON;;;;;N;;;;;
-A67F;CYRILLIC PAYEROK;Lm;0;ON;;;;;N;;;;;
-A680;CYRILLIC CAPITAL LETTER DWE;Lu;0;L;;;;;N;;;;A681;
-A681;CYRILLIC SMALL LETTER DWE;Ll;0;L;;;;;N;;;A680;;A680
-A682;CYRILLIC CAPITAL LETTER DZWE;Lu;0;L;;;;;N;;;;A683;
-A683;CYRILLIC SMALL LETTER DZWE;Ll;0;L;;;;;N;;;A682;;A682
-A684;CYRILLIC CAPITAL LETTER ZHWE;Lu;0;L;;;;;N;;;;A685;
-A685;CYRILLIC SMALL LETTER ZHWE;Ll;0;L;;;;;N;;;A684;;A684
-A686;CYRILLIC CAPITAL LETTER CCHE;Lu;0;L;;;;;N;;;;A687;
-A687;CYRILLIC SMALL LETTER CCHE;Ll;0;L;;;;;N;;;A686;;A686
-A688;CYRILLIC CAPITAL LETTER DZZE;Lu;0;L;;;;;N;;;;A689;
-A689;CYRILLIC SMALL LETTER DZZE;Ll;0;L;;;;;N;;;A688;;A688
-A68A;CYRILLIC CAPITAL LETTER TE WITH MIDDLE HOOK;Lu;0;L;;;;;N;;;;A68B;
-A68B;CYRILLIC SMALL LETTER TE WITH MIDDLE HOOK;Ll;0;L;;;;;N;;;A68A;;A68A
-A68C;CYRILLIC CAPITAL LETTER TWE;Lu;0;L;;;;;N;;;;A68D;
-A68D;CYRILLIC SMALL LETTER TWE;Ll;0;L;;;;;N;;;A68C;;A68C
-A68E;CYRILLIC CAPITAL LETTER TSWE;Lu;0;L;;;;;N;;;;A68F;
-A68F;CYRILLIC SMALL LETTER TSWE;Ll;0;L;;;;;N;;;A68E;;A68E
-A690;CYRILLIC CAPITAL LETTER TSSE;Lu;0;L;;;;;N;;;;A691;
-A691;CYRILLIC SMALL LETTER TSSE;Ll;0;L;;;;;N;;;A690;;A690
-A692;CYRILLIC CAPITAL LETTER TCHE;Lu;0;L;;;;;N;;;;A693;
-A693;CYRILLIC SMALL LETTER TCHE;Ll;0;L;;;;;N;;;A692;;A692
-A694;CYRILLIC CAPITAL LETTER HWE;Lu;0;L;;;;;N;;;;A695;
-A695;CYRILLIC SMALL LETTER HWE;Ll;0;L;;;;;N;;;A694;;A694
-A696;CYRILLIC CAPITAL LETTER SHWE;Lu;0;L;;;;;N;;;;A697;
-A697;CYRILLIC SMALL LETTER SHWE;Ll;0;L;;;;;N;;;A696;;A696
-A700;MODIFIER LETTER CHINESE TONE YIN PING;Sk;0;ON;;;;;N;;;;;
-A701;MODIFIER LETTER CHINESE TONE YANG PING;Sk;0;ON;;;;;N;;;;;
-A702;MODIFIER LETTER CHINESE TONE YIN SHANG;Sk;0;ON;;;;;N;;;;;
-A703;MODIFIER LETTER CHINESE TONE YANG SHANG;Sk;0;ON;;;;;N;;;;;
-A704;MODIFIER LETTER CHINESE TONE YIN QU;Sk;0;ON;;;;;N;;;;;
-A705;MODIFIER LETTER CHINESE TONE YANG QU;Sk;0;ON;;;;;N;;;;;
-A706;MODIFIER LETTER CHINESE TONE YIN RU;Sk;0;ON;;;;;N;;;;;
-A707;MODIFIER LETTER CHINESE TONE YANG RU;Sk;0;ON;;;;;N;;;;;
-A708;MODIFIER LETTER EXTRA-HIGH DOTTED TONE BAR;Sk;0;ON;;;;;N;;;;;
-A709;MODIFIER LETTER HIGH DOTTED TONE BAR;Sk;0;ON;;;;;N;;;;;
-A70A;MODIFIER LETTER MID DOTTED TONE BAR;Sk;0;ON;;;;;N;;;;;
-A70B;MODIFIER LETTER LOW DOTTED TONE BAR;Sk;0;ON;;;;;N;;;;;
-A70C;MODIFIER LETTER EXTRA-LOW DOTTED TONE BAR;Sk;0;ON;;;;;N;;;;;
-A70D;MODIFIER LETTER EXTRA-HIGH DOTTED LEFT-STEM TONE BAR;Sk;0;ON;;;;;N;;;;;
-A70E;MODIFIER LETTER HIGH DOTTED LEFT-STEM TONE BAR;Sk;0;ON;;;;;N;;;;;
-A70F;MODIFIER LETTER MID DOTTED LEFT-STEM TONE BAR;Sk;0;ON;;;;;N;;;;;
-A710;MODIFIER LETTER LOW DOTTED LEFT-STEM TONE BAR;Sk;0;ON;;;;;N;;;;;
-A711;MODIFIER LETTER EXTRA-LOW DOTTED LEFT-STEM TONE BAR;Sk;0;ON;;;;;N;;;;;
-A712;MODIFIER LETTER EXTRA-HIGH LEFT-STEM TONE BAR;Sk;0;ON;;;;;N;;;;;
-A713;MODIFIER LETTER HIGH LEFT-STEM TONE BAR;Sk;0;ON;;;;;N;;;;;
-A714;MODIFIER LETTER MID LEFT-STEM TONE BAR;Sk;0;ON;;;;;N;;;;;
-A715;MODIFIER LETTER LOW LEFT-STEM TONE BAR;Sk;0;ON;;;;;N;;;;;
-A716;MODIFIER LETTER EXTRA-LOW LEFT-STEM TONE BAR;Sk;0;ON;;;;;N;;;;;
-A717;MODIFIER LETTER DOT VERTICAL BAR;Lm;0;ON;;;;;N;;;;;
-A718;MODIFIER LETTER DOT SLASH;Lm;0;ON;;;;;N;;;;;
-A719;MODIFIER LETTER DOT HORIZONTAL BAR;Lm;0;ON;;;;;N;;;;;
-A71A;MODIFIER LETTER LOWER RIGHT CORNER ANGLE;Lm;0;ON;;;;;N;;;;;
-A71B;MODIFIER LETTER RAISED UP ARROW;Lm;0;ON;;;;;N;;;;;
-A71C;MODIFIER LETTER RAISED DOWN ARROW;Lm;0;ON;;;;;N;;;;;
-A71D;MODIFIER LETTER RAISED EXCLAMATION MARK;Lm;0;ON;;;;;N;;;;;
-A71E;MODIFIER LETTER RAISED INVERTED EXCLAMATION MARK;Lm;0;ON;;;;;N;;;;;
-A71F;MODIFIER LETTER LOW INVERTED EXCLAMATION MARK;Lm;0;ON;;;;;N;;;;;
-A720;MODIFIER LETTER STRESS AND HIGH TONE;Sk;0;ON;;;;;N;;;;;
-A721;MODIFIER LETTER STRESS AND LOW TONE;Sk;0;ON;;;;;N;;;;;
-A722;LATIN CAPITAL LETTER EGYPTOLOGICAL ALEF;Lu;0;L;;;;;N;;;;A723;
-A723;LATIN SMALL LETTER EGYPTOLOGICAL ALEF;Ll;0;L;;;;;N;;;A722;;A722
-A724;LATIN CAPITAL LETTER EGYPTOLOGICAL AIN;Lu;0;L;;;;;N;;;;A725;
-A725;LATIN SMALL LETTER EGYPTOLOGICAL AIN;Ll;0;L;;;;;N;;;A724;;A724
-A726;LATIN CAPITAL LETTER HENG;Lu;0;L;;;;;N;;;;A727;
-A727;LATIN SMALL LETTER HENG;Ll;0;L;;;;;N;;;A726;;A726
-A728;LATIN CAPITAL LETTER TZ;Lu;0;L;;;;;N;;;;A729;
-A729;LATIN SMALL LETTER TZ;Ll;0;L;;;;;N;;;A728;;A728
-A72A;LATIN CAPITAL LETTER TRESILLO;Lu;0;L;;;;;N;;;;A72B;
-A72B;LATIN SMALL LETTER TRESILLO;Ll;0;L;;;;;N;;;A72A;;A72A
-A72C;LATIN CAPITAL LETTER CUATRILLO;Lu;0;L;;;;;N;;;;A72D;
-A72D;LATIN SMALL LETTER CUATRILLO;Ll;0;L;;;;;N;;;A72C;;A72C
-A72E;LATIN CAPITAL LETTER CUATRILLO WITH COMMA;Lu;0;L;;;;;N;;;;A72F;
-A72F;LATIN SMALL LETTER CUATRILLO WITH COMMA;Ll;0;L;;;;;N;;;A72E;;A72E
-A730;LATIN LETTER SMALL CAPITAL F;Ll;0;L;;;;;N;;;;;
-A731;LATIN LETTER SMALL CAPITAL S;Ll;0;L;;;;;N;;;;;
-A732;LATIN CAPITAL LETTER AA;Lu;0;L;;;;;N;;;;A733;
-A733;LATIN SMALL LETTER AA;Ll;0;L;;;;;N;;;A732;;A732
-A734;LATIN CAPITAL LETTER AO;Lu;0;L;;;;;N;;;;A735;
-A735;LATIN SMALL LETTER AO;Ll;0;L;;;;;N;;;A734;;A734
-A736;LATIN CAPITAL LETTER AU;Lu;0;L;;;;;N;;;;A737;
-A737;LATIN SMALL LETTER AU;Ll;0;L;;;;;N;;;A736;;A736
-A738;LATIN CAPITAL LETTER AV;Lu;0;L;;;;;N;;;;A739;
-A739;LATIN SMALL LETTER AV;Ll;0;L;;;;;N;;;A738;;A738
-A73A;LATIN CAPITAL LETTER AV WITH HORIZONTAL BAR;Lu;0;L;;;;;N;;;;A73B;
-A73B;LATIN SMALL LETTER AV WITH HORIZONTAL BAR;Ll;0;L;;;;;N;;;A73A;;A73A
-A73C;LATIN CAPITAL LETTER AY;Lu;0;L;;;;;N;;;;A73D;
-A73D;LATIN SMALL LETTER AY;Ll;0;L;;;;;N;;;A73C;;A73C
-A73E;LATIN CAPITAL LETTER REVERSED C WITH DOT;Lu;0;L;;;;;N;;;;A73F;
-A73F;LATIN SMALL LETTER REVERSED C WITH DOT;Ll;0;L;;;;;N;;;A73E;;A73E
-A740;LATIN CAPITAL LETTER K WITH STROKE;Lu;0;L;;;;;N;;;;A741;
-A741;LATIN SMALL LETTER K WITH STROKE;Ll;0;L;;;;;N;;;A740;;A740
-A742;LATIN CAPITAL LETTER K WITH DIAGONAL STROKE;Lu;0;L;;;;;N;;;;A743;
-A743;LATIN SMALL LETTER K WITH DIAGONAL STROKE;Ll;0;L;;;;;N;;;A742;;A742
-A744;LATIN CAPITAL LETTER K WITH STROKE AND DIAGONAL STROKE;Lu;0;L;;;;;N;;;;A745;
-A745;LATIN SMALL LETTER K WITH STROKE AND DIAGONAL STROKE;Ll;0;L;;;;;N;;;A744;;A744
-A746;LATIN CAPITAL LETTER BROKEN L;Lu;0;L;;;;;N;;;;A747;
-A747;LATIN SMALL LETTER BROKEN L;Ll;0;L;;;;;N;;;A746;;A746
-A748;LATIN CAPITAL LETTER L WITH HIGH STROKE;Lu;0;L;;;;;N;;;;A749;
-A749;LATIN SMALL LETTER L WITH HIGH STROKE;Ll;0;L;;;;;N;;;A748;;A748
-A74A;LATIN CAPITAL LETTER O WITH LONG STROKE OVERLAY;Lu;0;L;;;;;N;;;;A74B;
-A74B;LATIN SMALL LETTER O WITH LONG STROKE OVERLAY;Ll;0;L;;;;;N;;;A74A;;A74A
-A74C;LATIN CAPITAL LETTER O WITH LOOP;Lu;0;L;;;;;N;;;;A74D;
-A74D;LATIN SMALL LETTER O WITH LOOP;Ll;0;L;;;;;N;;;A74C;;A74C
-A74E;LATIN CAPITAL LETTER OO;Lu;0;L;;;;;N;;;;A74F;
-A74F;LATIN SMALL LETTER OO;Ll;0;L;;;;;N;;;A74E;;A74E
-A750;LATIN CAPITAL LETTER P WITH STROKE THROUGH DESCENDER;Lu;0;L;;;;;N;;;;A751;
-A751;LATIN SMALL LETTER P WITH STROKE THROUGH DESCENDER;Ll;0;L;;;;;N;;;A750;;A750
-A752;LATIN CAPITAL LETTER P WITH FLOURISH;Lu;0;L;;;;;N;;;;A753;
-A753;LATIN SMALL LETTER P WITH FLOURISH;Ll;0;L;;;;;N;;;A752;;A752
-A754;LATIN CAPITAL LETTER P WITH SQUIRREL TAIL;Lu;0;L;;;;;N;;;;A755;
-A755;LATIN SMALL LETTER P WITH SQUIRREL TAIL;Ll;0;L;;;;;N;;;A754;;A754
-A756;LATIN CAPITAL LETTER Q WITH STROKE THROUGH DESCENDER;Lu;0;L;;;;;N;;;;A757;
-A757;LATIN SMALL LETTER Q WITH STROKE THROUGH DESCENDER;Ll;0;L;;;;;N;;;A756;;A756
-A758;LATIN CAPITAL LETTER Q WITH DIAGONAL STROKE;Lu;0;L;;;;;N;;;;A759;
-A759;LATIN SMALL LETTER Q WITH DIAGONAL STROKE;Ll;0;L;;;;;N;;;A758;;A758
-A75A;LATIN CAPITAL LETTER R ROTUNDA;Lu;0;L;;;;;N;;;;A75B;
-A75B;LATIN SMALL LETTER R ROTUNDA;Ll;0;L;;;;;N;;;A75A;;A75A
-A75C;LATIN CAPITAL LETTER RUM ROTUNDA;Lu;0;L;;;;;N;;;;A75D;
-A75D;LATIN SMALL LETTER RUM ROTUNDA;Ll;0;L;;;;;N;;;A75C;;A75C
-A75E;LATIN CAPITAL LETTER V WITH DIAGONAL STROKE;Lu;0;L;;;;;N;;;;A75F;
-A75F;LATIN SMALL LETTER V WITH DIAGONAL STROKE;Ll;0;L;;;;;N;;;A75E;;A75E
-A760;LATIN CAPITAL LETTER VY;Lu;0;L;;;;;N;;;;A761;
-A761;LATIN SMALL LETTER VY;Ll;0;L;;;;;N;;;A760;;A760
-A762;LATIN CAPITAL LETTER VISIGOTHIC Z;Lu;0;L;;;;;N;;;;A763;
-A763;LATIN SMALL LETTER VISIGOTHIC Z;Ll;0;L;;;;;N;;;A762;;A762
-A764;LATIN CAPITAL LETTER THORN WITH STROKE;Lu;0;L;;;;;N;;;;A765;
-A765;LATIN SMALL LETTER THORN WITH STROKE;Ll;0;L;;;;;N;;;A764;;A764
-A766;LATIN CAPITAL LETTER THORN WITH STROKE THROUGH DESCENDER;Lu;0;L;;;;;N;;;;A767;
-A767;LATIN SMALL LETTER THORN WITH STROKE THROUGH DESCENDER;Ll;0;L;;;;;N;;;A766;;A766
-A768;LATIN CAPITAL LETTER VEND;Lu;0;L;;;;;N;;;;A769;
-A769;LATIN SMALL LETTER VEND;Ll;0;L;;;;;N;;;A768;;A768
-A76A;LATIN CAPITAL LETTER ET;Lu;0;L;;;;;N;;;;A76B;
-A76B;LATIN SMALL LETTER ET;Ll;0;L;;;;;N;;;A76A;;A76A
-A76C;LATIN CAPITAL LETTER IS;Lu;0;L;;;;;N;;;;A76D;
-A76D;LATIN SMALL LETTER IS;Ll;0;L;;;;;N;;;A76C;;A76C
-A76E;LATIN CAPITAL LETTER CON;Lu;0;L;;;;;N;;;;A76F;
-A76F;LATIN SMALL LETTER CON;Ll;0;L;;;;;N;;;A76E;;A76E
-A770;MODIFIER LETTER US;Lm;0;L;<super> A76F;;;;N;;;;;
-A771;LATIN SMALL LETTER DUM;Ll;0;L;;;;;N;;;;;
-A772;LATIN SMALL LETTER LUM;Ll;0;L;;;;;N;;;;;
-A773;LATIN SMALL LETTER MUM;Ll;0;L;;;;;N;;;;;
-A774;LATIN SMALL LETTER NUM;Ll;0;L;;;;;N;;;;;
-A775;LATIN SMALL LETTER RUM;Ll;0;L;;;;;N;;;;;
-A776;LATIN LETTER SMALL CAPITAL RUM;Ll;0;L;;;;;N;;;;;
-A777;LATIN SMALL LETTER TUM;Ll;0;L;;;;;N;;;;;
-A778;LATIN SMALL LETTER UM;Ll;0;L;;;;;N;;;;;
-A779;LATIN CAPITAL LETTER INSULAR D;Lu;0;L;;;;;N;;;;A77A;
-A77A;LATIN SMALL LETTER INSULAR D;Ll;0;L;;;;;N;;;A779;;A779
-A77B;LATIN CAPITAL LETTER INSULAR F;Lu;0;L;;;;;N;;;;A77C;
-A77C;LATIN SMALL LETTER INSULAR F;Ll;0;L;;;;;N;;;A77B;;A77B
-A77D;LATIN CAPITAL LETTER INSULAR G;Lu;0;L;;;;;N;;;;1D79;
-A77E;LATIN CAPITAL LETTER TURNED INSULAR G;Lu;0;L;;;;;N;;;;A77F;
-A77F;LATIN SMALL LETTER TURNED INSULAR G;Ll;0;L;;;;;N;;;A77E;;A77E
-A780;LATIN CAPITAL LETTER TURNED L;Lu;0;L;;;;;N;;;;A781;
-A781;LATIN SMALL LETTER TURNED L;Ll;0;L;;;;;N;;;A780;;A780
-A782;LATIN CAPITAL LETTER INSULAR R;Lu;0;L;;;;;N;;;;A783;
-A783;LATIN SMALL LETTER INSULAR R;Ll;0;L;;;;;N;;;A782;;A782
-A784;LATIN CAPITAL LETTER INSULAR S;Lu;0;L;;;;;N;;;;A785;
-A785;LATIN SMALL LETTER INSULAR S;Ll;0;L;;;;;N;;;A784;;A784
-A786;LATIN CAPITAL LETTER INSULAR T;Lu;0;L;;;;;N;;;;A787;
-A787;LATIN SMALL LETTER INSULAR T;Ll;0;L;;;;;N;;;A786;;A786
-A788;MODIFIER LETTER LOW CIRCUMFLEX ACCENT;Lm;0;ON;;;;;N;;;;;
-A789;MODIFIER LETTER COLON;Sk;0;L;;;;;N;;;;;
-A78A;MODIFIER LETTER SHORT EQUALS SIGN;Sk;0;L;;;;;N;;;;;
-A78B;LATIN CAPITAL LETTER SALTILLO;Lu;0;L;;;;;N;;;;A78C;
-A78C;LATIN SMALL LETTER SALTILLO;Ll;0;L;;;;;N;;;A78B;;A78B
-A7FB;LATIN EPIGRAPHIC LETTER REVERSED F;Lo;0;L;;;;;N;;;;;
-A7FC;LATIN EPIGRAPHIC LETTER REVERSED P;Lo;0;L;;;;;N;;;;;
-A7FD;LATIN EPIGRAPHIC LETTER INVERTED M;Lo;0;L;;;;;N;;;;;
-A7FE;LATIN EPIGRAPHIC LETTER I LONGA;Lo;0;L;;;;;N;;;;;
-A7FF;LATIN EPIGRAPHIC LETTER ARCHAIC M;Lo;0;L;;;;;N;;;;;
-A800;SYLOTI NAGRI LETTER A;Lo;0;L;;;;;N;;;;;
-A801;SYLOTI NAGRI LETTER I;Lo;0;L;;;;;N;;;;;
-A802;SYLOTI NAGRI SIGN DVISVARA;Mn;0;NSM;;;;;N;;;;;
-A803;SYLOTI NAGRI LETTER U;Lo;0;L;;;;;N;;;;;
-A804;SYLOTI NAGRI LETTER E;Lo;0;L;;;;;N;;;;;
-A805;SYLOTI NAGRI LETTER O;Lo;0;L;;;;;N;;;;;
-A806;SYLOTI NAGRI SIGN HASANTA;Mn;9;NSM;;;;;N;;;;;
-A807;SYLOTI NAGRI LETTER KO;Lo;0;L;;;;;N;;;;;
-A808;SYLOTI NAGRI LETTER KHO;Lo;0;L;;;;;N;;;;;
-A809;SYLOTI NAGRI LETTER GO;Lo;0;L;;;;;N;;;;;
-A80A;SYLOTI NAGRI LETTER GHO;Lo;0;L;;;;;N;;;;;
-A80B;SYLOTI NAGRI SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
-A80C;SYLOTI NAGRI LETTER CO;Lo;0;L;;;;;N;;;;;
-A80D;SYLOTI NAGRI LETTER CHO;Lo;0;L;;;;;N;;;;;
-A80E;SYLOTI NAGRI LETTER JO;Lo;0;L;;;;;N;;;;;
-A80F;SYLOTI NAGRI LETTER JHO;Lo;0;L;;;;;N;;;;;
-A810;SYLOTI NAGRI LETTER TTO;Lo;0;L;;;;;N;;;;;
-A811;SYLOTI NAGRI LETTER TTHO;Lo;0;L;;;;;N;;;;;
-A812;SYLOTI NAGRI LETTER DDO;Lo;0;L;;;;;N;;;;;
-A813;SYLOTI NAGRI LETTER DDHO;Lo;0;L;;;;;N;;;;;
-A814;SYLOTI NAGRI LETTER TO;Lo;0;L;;;;;N;;;;;
-A815;SYLOTI NAGRI LETTER THO;Lo;0;L;;;;;N;;;;;
-A816;SYLOTI NAGRI LETTER DO;Lo;0;L;;;;;N;;;;;
-A817;SYLOTI NAGRI LETTER DHO;Lo;0;L;;;;;N;;;;;
-A818;SYLOTI NAGRI LETTER NO;Lo;0;L;;;;;N;;;;;
-A819;SYLOTI NAGRI LETTER PO;Lo;0;L;;;;;N;;;;;
-A81A;SYLOTI NAGRI LETTER PHO;Lo;0;L;;;;;N;;;;;
-A81B;SYLOTI NAGRI LETTER BO;Lo;0;L;;;;;N;;;;;
-A81C;SYLOTI NAGRI LETTER BHO;Lo;0;L;;;;;N;;;;;
-A81D;SYLOTI NAGRI LETTER MO;Lo;0;L;;;;;N;;;;;
-A81E;SYLOTI NAGRI LETTER RO;Lo;0;L;;;;;N;;;;;
-A81F;SYLOTI NAGRI LETTER LO;Lo;0;L;;;;;N;;;;;
-A820;SYLOTI NAGRI LETTER RRO;Lo;0;L;;;;;N;;;;;
-A821;SYLOTI NAGRI LETTER SO;Lo;0;L;;;;;N;;;;;
-A822;SYLOTI NAGRI LETTER HO;Lo;0;L;;;;;N;;;;;
-A823;SYLOTI NAGRI VOWEL SIGN A;Mc;0;L;;;;;N;;;;;
-A824;SYLOTI NAGRI VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
-A825;SYLOTI NAGRI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
-A826;SYLOTI NAGRI VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
-A827;SYLOTI NAGRI VOWEL SIGN OO;Mc;0;L;;;;;N;;;;;
-A828;SYLOTI NAGRI POETRY MARK-1;So;0;ON;;;;;N;;;;;
-A829;SYLOTI NAGRI POETRY MARK-2;So;0;ON;;;;;N;;;;;
-A82A;SYLOTI NAGRI POETRY MARK-3;So;0;ON;;;;;N;;;;;
-A82B;SYLOTI NAGRI POETRY MARK-4;So;0;ON;;;;;N;;;;;
-A840;PHAGS-PA LETTER KA;Lo;0;L;;;;;N;;;;;
-A841;PHAGS-PA LETTER KHA;Lo;0;L;;;;;N;;;;;
-A842;PHAGS-PA LETTER GA;Lo;0;L;;;;;N;;;;;
-A843;PHAGS-PA LETTER NGA;Lo;0;L;;;;;N;;;;;
-A844;PHAGS-PA LETTER CA;Lo;0;L;;;;;N;;;;;
-A845;PHAGS-PA LETTER CHA;Lo;0;L;;;;;N;;;;;
-A846;PHAGS-PA LETTER JA;Lo;0;L;;;;;N;;;;;
-A847;PHAGS-PA LETTER NYA;Lo;0;L;;;;;N;;;;;
-A848;PHAGS-PA LETTER TA;Lo;0;L;;;;;N;;;;;
-A849;PHAGS-PA LETTER THA;Lo;0;L;;;;;N;;;;;
-A84A;PHAGS-PA LETTER DA;Lo;0;L;;;;;N;;;;;
-A84B;PHAGS-PA LETTER NA;Lo;0;L;;;;;N;;;;;
-A84C;PHAGS-PA LETTER PA;Lo;0;L;;;;;N;;;;;
-A84D;PHAGS-PA LETTER PHA;Lo;0;L;;;;;N;;;;;
-A84E;PHAGS-PA LETTER BA;Lo;0;L;;;;;N;;;;;
-A84F;PHAGS-PA LETTER MA;Lo;0;L;;;;;N;;;;;
-A850;PHAGS-PA LETTER TSA;Lo;0;L;;;;;N;;;;;
-A851;PHAGS-PA LETTER TSHA;Lo;0;L;;;;;N;;;;;
-A852;PHAGS-PA LETTER DZA;Lo;0;L;;;;;N;;;;;
-A853;PHAGS-PA LETTER WA;Lo;0;L;;;;;N;;;;;
-A854;PHAGS-PA LETTER ZHA;Lo;0;L;;;;;N;;;;;
-A855;PHAGS-PA LETTER ZA;Lo;0;L;;;;;N;;;;;
-A856;PHAGS-PA LETTER SMALL A;Lo;0;L;;;;;N;;;;;
-A857;PHAGS-PA LETTER YA;Lo;0;L;;;;;N;;;;;
-A858;PHAGS-PA LETTER RA;Lo;0;L;;;;;N;;;;;
-A859;PHAGS-PA LETTER LA;Lo;0;L;;;;;N;;;;;
-A85A;PHAGS-PA LETTER SHA;Lo;0;L;;;;;N;;;;;
-A85B;PHAGS-PA LETTER SA;Lo;0;L;;;;;N;;;;;
-A85C;PHAGS-PA LETTER HA;Lo;0;L;;;;;N;;;;;
-A85D;PHAGS-PA LETTER A;Lo;0;L;;;;;N;;;;;
-A85E;PHAGS-PA LETTER I;Lo;0;L;;;;;N;;;;;
-A85F;PHAGS-PA LETTER U;Lo;0;L;;;;;N;;;;;
-A860;PHAGS-PA LETTER E;Lo;0;L;;;;;N;;;;;
-A861;PHAGS-PA LETTER O;Lo;0;L;;;;;N;;;;;
-A862;PHAGS-PA LETTER QA;Lo;0;L;;;;;N;;;;;
-A863;PHAGS-PA LETTER XA;Lo;0;L;;;;;N;;;;;
-A864;PHAGS-PA LETTER FA;Lo;0;L;;;;;N;;;;;
-A865;PHAGS-PA LETTER GGA;Lo;0;L;;;;;N;;;;;
-A866;PHAGS-PA LETTER EE;Lo;0;L;;;;;N;;;;;
-A867;PHAGS-PA SUBJOINED LETTER WA;Lo;0;L;;;;;N;;;;;
-A868;PHAGS-PA SUBJOINED LETTER YA;Lo;0;L;;;;;N;;;;;
-A869;PHAGS-PA LETTER TTA;Lo;0;L;;;;;N;;;;;
-A86A;PHAGS-PA LETTER TTHA;Lo;0;L;;;;;N;;;;;
-A86B;PHAGS-PA LETTER DDA;Lo;0;L;;;;;N;;;;;
-A86C;PHAGS-PA LETTER NNA;Lo;0;L;;;;;N;;;;;
-A86D;PHAGS-PA LETTER ALTERNATE YA;Lo;0;L;;;;;N;;;;;
-A86E;PHAGS-PA LETTER VOICELESS SHA;Lo;0;L;;;;;N;;;;;
-A86F;PHAGS-PA LETTER VOICED HA;Lo;0;L;;;;;N;;;;;
-A870;PHAGS-PA LETTER ASPIRATED FA;Lo;0;L;;;;;N;;;;;
-A871;PHAGS-PA SUBJOINED LETTER RA;Lo;0;L;;;;;N;;;;;
-A872;PHAGS-PA SUPERFIXED LETTER RA;Lo;0;L;;;;;N;;;;;
-A873;PHAGS-PA LETTER CANDRABINDU;Lo;0;L;;;;;N;;;;;
-A874;PHAGS-PA SINGLE HEAD MARK;Po;0;ON;;;;;N;;;;;
-A875;PHAGS-PA DOUBLE HEAD MARK;Po;0;ON;;;;;N;;;;;
-A876;PHAGS-PA MARK SHAD;Po;0;ON;;;;;N;;;;;
-A877;PHAGS-PA MARK DOUBLE SHAD;Po;0;ON;;;;;N;;;;;
-A880;SAURASHTRA SIGN ANUSVARA;Mc;0;L;;;;;N;;;;;
-A881;SAURASHTRA SIGN VISARGA;Mc;0;L;;;;;N;;;;;
-A882;SAURASHTRA LETTER A;Lo;0;L;;;;;N;;;;;
-A883;SAURASHTRA LETTER AA;Lo;0;L;;;;;N;;;;;
-A884;SAURASHTRA LETTER I;Lo;0;L;;;;;N;;;;;
-A885;SAURASHTRA LETTER II;Lo;0;L;;;;;N;;;;;
-A886;SAURASHTRA LETTER U;Lo;0;L;;;;;N;;;;;
-A887;SAURASHTRA LETTER UU;Lo;0;L;;;;;N;;;;;
-A888;SAURASHTRA LETTER VOCALIC R;Lo;0;L;;;;;N;;;;;
-A889;SAURASHTRA LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;;
-A88A;SAURASHTRA LETTER VOCALIC L;Lo;0;L;;;;;N;;;;;
-A88B;SAURASHTRA LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;;
-A88C;SAURASHTRA LETTER E;Lo;0;L;;;;;N;;;;;
-A88D;SAURASHTRA LETTER EE;Lo;0;L;;;;;N;;;;;
-A88E;SAURASHTRA LETTER AI;Lo;0;L;;;;;N;;;;;
-A88F;SAURASHTRA LETTER O;Lo;0;L;;;;;N;;;;;
-A890;SAURASHTRA LETTER OO;Lo;0;L;;;;;N;;;;;
-A891;SAURASHTRA LETTER AU;Lo;0;L;;;;;N;;;;;
-A892;SAURASHTRA LETTER KA;Lo;0;L;;;;;N;;;;;
-A893;SAURASHTRA LETTER KHA;Lo;0;L;;;;;N;;;;;
-A894;SAURASHTRA LETTER GA;Lo;0;L;;;;;N;;;;;
-A895;SAURASHTRA LETTER GHA;Lo;0;L;;;;;N;;;;;
-A896;SAURASHTRA LETTER NGA;Lo;0;L;;;;;N;;;;;
-A897;SAURASHTRA LETTER CA;Lo;0;L;;;;;N;;;;;
-A898;SAURASHTRA LETTER CHA;Lo;0;L;;;;;N;;;;;
-A899;SAURASHTRA LETTER JA;Lo;0;L;;;;;N;;;;;
-A89A;SAURASHTRA LETTER JHA;Lo;0;L;;;;;N;;;;;
-A89B;SAURASHTRA LETTER NYA;Lo;0;L;;;;;N;;;;;
-A89C;SAURASHTRA LETTER TTA;Lo;0;L;;;;;N;;;;;
-A89D;SAURASHTRA LETTER TTHA;Lo;0;L;;;;;N;;;;;
-A89E;SAURASHTRA LETTER DDA;Lo;0;L;;;;;N;;;;;
-A89F;SAURASHTRA LETTER DDHA;Lo;0;L;;;;;N;;;;;
-A8A0;SAURASHTRA LETTER NNA;Lo;0;L;;;;;N;;;;;
-A8A1;SAURASHTRA LETTER TA;Lo;0;L;;;;;N;;;;;
-A8A2;SAURASHTRA LETTER THA;Lo;0;L;;;;;N;;;;;
-A8A3;SAURASHTRA LETTER DA;Lo;0;L;;;;;N;;;;;
-A8A4;SAURASHTRA LETTER DHA;Lo;0;L;;;;;N;;;;;
-A8A5;SAURASHTRA LETTER NA;Lo;0;L;;;;;N;;;;;
-A8A6;SAURASHTRA LETTER PA;Lo;0;L;;;;;N;;;;;
-A8A7;SAURASHTRA LETTER PHA;Lo;0;L;;;;;N;;;;;
-A8A8;SAURASHTRA LETTER BA;Lo;0;L;;;;;N;;;;;
-A8A9;SAURASHTRA LETTER BHA;Lo;0;L;;;;;N;;;;;
-A8AA;SAURASHTRA LETTER MA;Lo;0;L;;;;;N;;;;;
-A8AB;SAURASHTRA LETTER YA;Lo;0;L;;;;;N;;;;;
-A8AC;SAURASHTRA LETTER RA;Lo;0;L;;;;;N;;;;;
-A8AD;SAURASHTRA LETTER LA;Lo;0;L;;;;;N;;;;;
-A8AE;SAURASHTRA LETTER VA;Lo;0;L;;;;;N;;;;;
-A8AF;SAURASHTRA LETTER SHA;Lo;0;L;;;;;N;;;;;
-A8B0;SAURASHTRA LETTER SSA;Lo;0;L;;;;;N;;;;;
-A8B1;SAURASHTRA LETTER SA;Lo;0;L;;;;;N;;;;;
-A8B2;SAURASHTRA LETTER HA;Lo;0;L;;;;;N;;;;;
-A8B3;SAURASHTRA LETTER LLA;Lo;0;L;;;;;N;;;;;
-A8B4;SAURASHTRA CONSONANT SIGN HAARU;Mc;0;L;;;;;N;;;;;
-A8B5;SAURASHTRA VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
-A8B6;SAURASHTRA VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
-A8B7;SAURASHTRA VOWEL SIGN II;Mc;0;L;;;;;N;;;;;
-A8B8;SAURASHTRA VOWEL SIGN U;Mc;0;L;;;;;N;;;;;
-A8B9;SAURASHTRA VOWEL SIGN UU;Mc;0;L;;;;;N;;;;;
-A8BA;SAURASHTRA VOWEL SIGN VOCALIC R;Mc;0;L;;;;;N;;;;;
-A8BB;SAURASHTRA VOWEL SIGN VOCALIC RR;Mc;0;L;;;;;N;;;;;
-A8BC;SAURASHTRA VOWEL SIGN VOCALIC L;Mc;0;L;;;;;N;;;;;
-A8BD;SAURASHTRA VOWEL SIGN VOCALIC LL;Mc;0;L;;;;;N;;;;;
-A8BE;SAURASHTRA VOWEL SIGN E;Mc;0;L;;;;;N;;;;;
-A8BF;SAURASHTRA VOWEL SIGN EE;Mc;0;L;;;;;N;;;;;
-A8C0;SAURASHTRA VOWEL SIGN AI;Mc;0;L;;;;;N;;;;;
-A8C1;SAURASHTRA VOWEL SIGN O;Mc;0;L;;;;;N;;;;;
-A8C2;SAURASHTRA VOWEL SIGN OO;Mc;0;L;;;;;N;;;;;
-A8C3;SAURASHTRA VOWEL SIGN AU;Mc;0;L;;;;;N;;;;;
-A8C4;SAURASHTRA SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
-A8CE;SAURASHTRA DANDA;Po;0;L;;;;;N;;;;;
-A8CF;SAURASHTRA DOUBLE DANDA;Po;0;L;;;;;N;;;;;
-A8D0;SAURASHTRA DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
-A8D1;SAURASHTRA DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
-A8D2;SAURASHTRA DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
-A8D3;SAURASHTRA DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
-A8D4;SAURASHTRA DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
-A8D5;SAURASHTRA DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
-A8D6;SAURASHTRA DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
-A8D7;SAURASHTRA DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
-A8D8;SAURASHTRA DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
-A8D9;SAURASHTRA DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
-A900;KAYAH LI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
-A901;KAYAH LI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
-A902;KAYAH LI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
-A903;KAYAH LI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
-A904;KAYAH LI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
-A905;KAYAH LI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
-A906;KAYAH LI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
-A907;KAYAH LI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
-A908;KAYAH LI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
-A909;KAYAH LI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
-A90A;KAYAH LI LETTER KA;Lo;0;L;;;;;N;;;;;
-A90B;KAYAH LI LETTER KHA;Lo;0;L;;;;;N;;;;;
-A90C;KAYAH LI LETTER GA;Lo;0;L;;;;;N;;;;;
-A90D;KAYAH LI LETTER NGA;Lo;0;L;;;;;N;;;;;
-A90E;KAYAH LI LETTER SA;Lo;0;L;;;;;N;;;;;
-A90F;KAYAH LI LETTER SHA;Lo;0;L;;;;;N;;;;;
-A910;KAYAH LI LETTER ZA;Lo;0;L;;;;;N;;;;;
-A911;KAYAH LI LETTER NYA;Lo;0;L;;;;;N;;;;;
-A912;KAYAH LI LETTER TA;Lo;0;L;;;;;N;;;;;
-A913;KAYAH LI LETTER HTA;Lo;0;L;;;;;N;;;;;
-A914;KAYAH LI LETTER NA;Lo;0;L;;;;;N;;;;;
-A915;KAYAH LI LETTER PA;Lo;0;L;;;;;N;;;;;
-A916;KAYAH LI LETTER PHA;Lo;0;L;;;;;N;;;;;
-A917;KAYAH LI LETTER MA;Lo;0;L;;;;;N;;;;;
-A918;KAYAH LI LETTER DA;Lo;0;L;;;;;N;;;;;
-A919;KAYAH LI LETTER BA;Lo;0;L;;;;;N;;;;;
-A91A;KAYAH LI LETTER RA;Lo;0;L;;;;;N;;;;;
-A91B;KAYAH LI LETTER YA;Lo;0;L;;;;;N;;;;;
-A91C;KAYAH LI LETTER LA;Lo;0;L;;;;;N;;;;;
-A91D;KAYAH LI LETTER WA;Lo;0;L;;;;;N;;;;;
-A91E;KAYAH LI LETTER THA;Lo;0;L;;;;;N;;;;;
-A91F;KAYAH LI LETTER HA;Lo;0;L;;;;;N;;;;;
-A920;KAYAH LI LETTER VA;Lo;0;L;;;;;N;;;;;
-A921;KAYAH LI LETTER CA;Lo;0;L;;;;;N;;;;;
-A922;KAYAH LI LETTER A;Lo;0;L;;;;;N;;;;;
-A923;KAYAH LI LETTER OE;Lo;0;L;;;;;N;;;;;
-A924;KAYAH LI LETTER I;Lo;0;L;;;;;N;;;;;
-A925;KAYAH LI LETTER OO;Lo;0;L;;;;;N;;;;;
-A926;KAYAH LI VOWEL UE;Mn;0;NSM;;;;;N;;;;;
-A927;KAYAH LI VOWEL E;Mn;0;NSM;;;;;N;;;;;
-A928;KAYAH LI VOWEL U;Mn;0;NSM;;;;;N;;;;;
-A929;KAYAH LI VOWEL EE;Mn;0;NSM;;;;;N;;;;;
-A92A;KAYAH LI VOWEL O;Mn;0;NSM;;;;;N;;;;;
-A92B;KAYAH LI TONE PLOPHU;Mn;220;NSM;;;;;N;;;;;
-A92C;KAYAH LI TONE CALYA;Mn;220;NSM;;;;;N;;;;;
-A92D;KAYAH LI TONE CALYA PLOPHU;Mn;220;NSM;;;;;N;;;;;
-A92E;KAYAH LI SIGN CWI;Po;0;L;;;;;N;;;;;
-A92F;KAYAH LI SIGN SHYA;Po;0;L;;;;;N;;;;;
-A930;REJANG LETTER KA;Lo;0;L;;;;;N;;;;;
-A931;REJANG LETTER GA;Lo;0;L;;;;;N;;;;;
-A932;REJANG LETTER NGA;Lo;0;L;;;;;N;;;;;
-A933;REJANG LETTER TA;Lo;0;L;;;;;N;;;;;
-A934;REJANG LETTER DA;Lo;0;L;;;;;N;;;;;
-A935;REJANG LETTER NA;Lo;0;L;;;;;N;;;;;
-A936;REJANG LETTER PA;Lo;0;L;;;;;N;;;;;
-A937;REJANG LETTER BA;Lo;0;L;;;;;N;;;;;
-A938;REJANG LETTER MA;Lo;0;L;;;;;N;;;;;
-A939;REJANG LETTER CA;Lo;0;L;;;;;N;;;;;
-A93A;REJANG LETTER JA;Lo;0;L;;;;;N;;;;;
-A93B;REJANG LETTER NYA;Lo;0;L;;;;;N;;;;;
-A93C;REJANG LETTER SA;Lo;0;L;;;;;N;;;;;
-A93D;REJANG LETTER RA;Lo;0;L;;;;;N;;;;;
-A93E;REJANG LETTER LA;Lo;0;L;;;;;N;;;;;
-A93F;REJANG LETTER YA;Lo;0;L;;;;;N;;;;;
-A940;REJANG LETTER WA;Lo;0;L;;;;;N;;;;;
-A941;REJANG LETTER HA;Lo;0;L;;;;;N;;;;;
-A942;REJANG LETTER MBA;Lo;0;L;;;;;N;;;;;
-A943;REJANG LETTER NGGA;Lo;0;L;;;;;N;;;;;
-A944;REJANG LETTER NDA;Lo;0;L;;;;;N;;;;;
-A945;REJANG LETTER NYJA;Lo;0;L;;;;;N;;;;;
-A946;REJANG LETTER A;Lo;0;L;;;;;N;;;;;
-A947;REJANG VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
-A948;REJANG VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
-A949;REJANG VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
-A94A;REJANG VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;;
-A94B;REJANG VOWEL SIGN O;Mn;0;NSM;;;;;N;;;;;
-A94C;REJANG VOWEL SIGN AU;Mn;0;NSM;;;;;N;;;;;
-A94D;REJANG VOWEL SIGN EU;Mn;0;NSM;;;;;N;;;;;
-A94E;REJANG VOWEL SIGN EA;Mn;0;NSM;;;;;N;;;;;
-A94F;REJANG CONSONANT SIGN NG;Mn;0;NSM;;;;;N;;;;;
-A950;REJANG CONSONANT SIGN N;Mn;0;NSM;;;;;N;;;;;
-A951;REJANG CONSONANT SIGN R;Mn;0;NSM;;;;;N;;;;;
-A952;REJANG CONSONANT SIGN H;Mc;0;L;;;;;N;;;;;
-A953;REJANG VIRAMA;Mc;9;L;;;;;N;;;;;
-A95F;REJANG SECTION MARK;Po;0;L;;;;;N;;;;;
-AA00;CHAM LETTER A;Lo;0;L;;;;;N;;;;;
-AA01;CHAM LETTER I;Lo;0;L;;;;;N;;;;;
-AA02;CHAM LETTER U;Lo;0;L;;;;;N;;;;;
-AA03;CHAM LETTER E;Lo;0;L;;;;;N;;;;;
-AA04;CHAM LETTER AI;Lo;0;L;;;;;N;;;;;
-AA05;CHAM LETTER O;Lo;0;L;;;;;N;;;;;
-AA06;CHAM LETTER KA;Lo;0;L;;;;;N;;;;;
-AA07;CHAM LETTER KHA;Lo;0;L;;;;;N;;;;;
-AA08;CHAM LETTER GA;Lo;0;L;;;;;N;;;;;
-AA09;CHAM LETTER GHA;Lo;0;L;;;;;N;;;;;
-AA0A;CHAM LETTER NGUE;Lo;0;L;;;;;N;;;;;
-AA0B;CHAM LETTER NGA;Lo;0;L;;;;;N;;;;;
-AA0C;CHAM LETTER CHA;Lo;0;L;;;;;N;;;;;
-AA0D;CHAM LETTER CHHA;Lo;0;L;;;;;N;;;;;
-AA0E;CHAM LETTER JA;Lo;0;L;;;;;N;;;;;
-AA0F;CHAM LETTER JHA;Lo;0;L;;;;;N;;;;;
-AA10;CHAM LETTER NHUE;Lo;0;L;;;;;N;;;;;
-AA11;CHAM LETTER NHA;Lo;0;L;;;;;N;;;;;
-AA12;CHAM LETTER NHJA;Lo;0;L;;;;;N;;;;;
-AA13;CHAM LETTER TA;Lo;0;L;;;;;N;;;;;
-AA14;CHAM LETTER THA;Lo;0;L;;;;;N;;;;;
-AA15;CHAM LETTER DA;Lo;0;L;;;;;N;;;;;
-AA16;CHAM LETTER DHA;Lo;0;L;;;;;N;;;;;
-AA17;CHAM LETTER NUE;Lo;0;L;;;;;N;;;;;
-AA18;CHAM LETTER NA;Lo;0;L;;;;;N;;;;;
-AA19;CHAM LETTER DDA;Lo;0;L;;;;;N;;;;;
-AA1A;CHAM LETTER PA;Lo;0;L;;;;;N;;;;;
-AA1B;CHAM LETTER PPA;Lo;0;L;;;;;N;;;;;
-AA1C;CHAM LETTER PHA;Lo;0;L;;;;;N;;;;;
-AA1D;CHAM LETTER BA;Lo;0;L;;;;;N;;;;;
-AA1E;CHAM LETTER BHA;Lo;0;L;;;;;N;;;;;
-AA1F;CHAM LETTER MUE;Lo;0;L;;;;;N;;;;;
-AA20;CHAM LETTER MA;Lo;0;L;;;;;N;;;;;
-AA21;CHAM LETTER BBA;Lo;0;L;;;;;N;;;;;
-AA22;CHAM LETTER YA;Lo;0;L;;;;;N;;;;;
-AA23;CHAM LETTER RA;Lo;0;L;;;;;N;;;;;
-AA24;CHAM LETTER LA;Lo;0;L;;;;;N;;;;;
-AA25;CHAM LETTER VA;Lo;0;L;;;;;N;;;;;
-AA26;CHAM LETTER SSA;Lo;0;L;;;;;N;;;;;
-AA27;CHAM LETTER SA;Lo;0;L;;;;;N;;;;;
-AA28;CHAM LETTER HA;Lo;0;L;;;;;N;;;;;
-AA29;CHAM VOWEL SIGN AA;Mn;0;NSM;;;;;N;;;;;
-AA2A;CHAM VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
-AA2B;CHAM VOWEL SIGN II;Mn;0;NSM;;;;;N;;;;;
-AA2C;CHAM VOWEL SIGN EI;Mn;0;NSM;;;;;N;;;;;
-AA2D;CHAM VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
-AA2E;CHAM VOWEL SIGN OE;Mn;0;NSM;;;;;N;;;;;
-AA2F;CHAM VOWEL SIGN O;Mc;0;L;;;;;N;;;;;
-AA30;CHAM VOWEL SIGN AI;Mc;0;L;;;;;N;;;;;
-AA31;CHAM VOWEL SIGN AU;Mn;0;NSM;;;;;N;;;;;
-AA32;CHAM VOWEL SIGN UE;Mn;0;NSM;;;;;N;;;;;
-AA33;CHAM CONSONANT SIGN YA;Mc;0;L;;;;;N;;;;;
-AA34;CHAM CONSONANT SIGN RA;Mc;0;L;;;;;N;;;;;
-AA35;CHAM CONSONANT SIGN LA;Mn;0;NSM;;;;;N;;;;;
-AA36;CHAM CONSONANT SIGN WA;Mn;0;NSM;;;;;N;;;;;
-AA40;CHAM LETTER FINAL K;Lo;0;L;;;;;N;;;;;
-AA41;CHAM LETTER FINAL G;Lo;0;L;;;;;N;;;;;
-AA42;CHAM LETTER FINAL NG;Lo;0;L;;;;;N;;;;;
-AA43;CHAM CONSONANT SIGN FINAL NG;Mn;0;NSM;;;;;N;;;;;
-AA44;CHAM LETTER FINAL CH;Lo;0;L;;;;;N;;;;;
-AA45;CHAM LETTER FINAL T;Lo;0;L;;;;;N;;;;;
-AA46;CHAM LETTER FINAL N;Lo;0;L;;;;;N;;;;;
-AA47;CHAM LETTER FINAL P;Lo;0;L;;;;;N;;;;;
-AA48;CHAM LETTER FINAL Y;Lo;0;L;;;;;N;;;;;
-AA49;CHAM LETTER FINAL R;Lo;0;L;;;;;N;;;;;
-AA4A;CHAM LETTER FINAL L;Lo;0;L;;;;;N;;;;;
-AA4B;CHAM LETTER FINAL SS;Lo;0;L;;;;;N;;;;;
-AA4C;CHAM CONSONANT SIGN FINAL M;Mn;0;NSM;;;;;N;;;;;
-AA4D;CHAM CONSONANT SIGN FINAL H;Mc;0;L;;;;;N;;;;;
-AA50;CHAM DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
-AA51;CHAM DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
-AA52;CHAM DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
-AA53;CHAM DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
-AA54;CHAM DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
-AA55;CHAM DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
-AA56;CHAM DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
-AA57;CHAM DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
-AA58;CHAM DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
-AA59;CHAM DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
-AA5C;CHAM PUNCTUATION SPIRAL;Po;0;L;;;;;N;;;;;
-AA5D;CHAM PUNCTUATION DANDA;Po;0;L;;;;;N;;;;;
-AA5E;CHAM PUNCTUATION DOUBLE DANDA;Po;0;L;;;;;N;;;;;
-AA5F;CHAM PUNCTUATION TRIPLE DANDA;Po;0;L;;;;;N;;;;;
-AC00;<Hangul Syllable, First>;Lo;0;L;;;;;N;;;;;
-D7A3;<Hangul Syllable, Last>;Lo;0;L;;;;;N;;;;;
-D800;<Non Private Use High Surrogate, First>;Cs;0;L;;;;;N;;;;;
-DB7F;<Non Private Use High Surrogate, Last>;Cs;0;L;;;;;N;;;;;
-DB80;<Private Use High Surrogate, First>;Cs;0;L;;;;;N;;;;;
-DBFF;<Private Use High Surrogate, Last>;Cs;0;L;;;;;N;;;;;
-DC00;<Low Surrogate, First>;Cs;0;L;;;;;N;;;;;
-DFFF;<Low Surrogate, Last>;Cs;0;L;;;;;N;;;;;
-E000;<Private Use, First>;Co;0;L;;;;;N;;;;;
-F8FF;<Private Use, Last>;Co;0;L;;;;;N;;;;;
-F900;CJK COMPATIBILITY IDEOGRAPH-F900;Lo;0;L;8C48;;;;N;;;;;
-F901;CJK COMPATIBILITY IDEOGRAPH-F901;Lo;0;L;66F4;;;;N;;;;;
-F902;CJK COMPATIBILITY IDEOGRAPH-F902;Lo;0;L;8ECA;;;;N;;;;;
-F903;CJK COMPATIBILITY IDEOGRAPH-F903;Lo;0;L;8CC8;;;;N;;;;;
-F904;CJK COMPATIBILITY IDEOGRAPH-F904;Lo;0;L;6ED1;;;;N;;;;;
-F905;CJK COMPATIBILITY IDEOGRAPH-F905;Lo;0;L;4E32;;;;N;;;;;
-F906;CJK COMPATIBILITY IDEOGRAPH-F906;Lo;0;L;53E5;;;;N;;;;;
-F907;CJK COMPATIBILITY IDEOGRAPH-F907;Lo;0;L;9F9C;;;;N;;;;;
-F908;CJK COMPATIBILITY IDEOGRAPH-F908;Lo;0;L;9F9C;;;;N;;;;;
-F909;CJK COMPATIBILITY IDEOGRAPH-F909;Lo;0;L;5951;;;;N;;;;;
-F90A;CJK COMPATIBILITY IDEOGRAPH-F90A;Lo;0;L;91D1;;;;N;;;;;
-F90B;CJK COMPATIBILITY IDEOGRAPH-F90B;Lo;0;L;5587;;;;N;;;;;
-F90C;CJK COMPATIBILITY IDEOGRAPH-F90C;Lo;0;L;5948;;;;N;;;;;
-F90D;CJK COMPATIBILITY IDEOGRAPH-F90D;Lo;0;L;61F6;;;;N;;;;;
-F90E;CJK COMPATIBILITY IDEOGRAPH-F90E;Lo;0;L;7669;;;;N;;;;;
-F90F;CJK COMPATIBILITY IDEOGRAPH-F90F;Lo;0;L;7F85;;;;N;;;;;
-F910;CJK COMPATIBILITY IDEOGRAPH-F910;Lo;0;L;863F;;;;N;;;;;
-F911;CJK COMPATIBILITY IDEOGRAPH-F911;Lo;0;L;87BA;;;;N;;;;;
-F912;CJK COMPATIBILITY IDEOGRAPH-F912;Lo;0;L;88F8;;;;N;;;;;
-F913;CJK COMPATIBILITY IDEOGRAPH-F913;Lo;0;L;908F;;;;N;;;;;
-F914;CJK COMPATIBILITY IDEOGRAPH-F914;Lo;0;L;6A02;;;;N;;;;;
-F915;CJK COMPATIBILITY IDEOGRAPH-F915;Lo;0;L;6D1B;;;;N;;;;;
-F916;CJK COMPATIBILITY IDEOGRAPH-F916;Lo;0;L;70D9;;;;N;;;;;
-F917;CJK COMPATIBILITY IDEOGRAPH-F917;Lo;0;L;73DE;;;;N;;;;;
-F918;CJK COMPATIBILITY IDEOGRAPH-F918;Lo;0;L;843D;;;;N;;;;;
-F919;CJK COMPATIBILITY IDEOGRAPH-F919;Lo;0;L;916A;;;;N;;;;;
-F91A;CJK COMPATIBILITY IDEOGRAPH-F91A;Lo;0;L;99F1;;;;N;;;;;
-F91B;CJK COMPATIBILITY IDEOGRAPH-F91B;Lo;0;L;4E82;;;;N;;;;;
-F91C;CJK COMPATIBILITY IDEOGRAPH-F91C;Lo;0;L;5375;;;;N;;;;;
-F91D;CJK COMPATIBILITY IDEOGRAPH-F91D;Lo;0;L;6B04;;;;N;;;;;
-F91E;CJK COMPATIBILITY IDEOGRAPH-F91E;Lo;0;L;721B;;;;N;;;;;
-F91F;CJK COMPATIBILITY IDEOGRAPH-F91F;Lo;0;L;862D;;;;N;;;;;
-F920;CJK COMPATIBILITY IDEOGRAPH-F920;Lo;0;L;9E1E;;;;N;;;;;
-F921;CJK COMPATIBILITY IDEOGRAPH-F921;Lo;0;L;5D50;;;;N;;;;;
-F922;CJK COMPATIBILITY IDEOGRAPH-F922;Lo;0;L;6FEB;;;;N;;;;;
-F923;CJK COMPATIBILITY IDEOGRAPH-F923;Lo;0;L;85CD;;;;N;;;;;
-F924;CJK COMPATIBILITY IDEOGRAPH-F924;Lo;0;L;8964;;;;N;;;;;
-F925;CJK COMPATIBILITY IDEOGRAPH-F925;Lo;0;L;62C9;;;;N;;;;;
-F926;CJK COMPATIBILITY IDEOGRAPH-F926;Lo;0;L;81D8;;;;N;;;;;
-F927;CJK COMPATIBILITY IDEOGRAPH-F927;Lo;0;L;881F;;;;N;;;;;
-F928;CJK COMPATIBILITY IDEOGRAPH-F928;Lo;0;L;5ECA;;;;N;;;;;
-F929;CJK COMPATIBILITY IDEOGRAPH-F929;Lo;0;L;6717;;;;N;;;;;
-F92A;CJK COMPATIBILITY IDEOGRAPH-F92A;Lo;0;L;6D6A;;;;N;;;;;
-F92B;CJK COMPATIBILITY IDEOGRAPH-F92B;Lo;0;L;72FC;;;;N;;;;;
-F92C;CJK COMPATIBILITY IDEOGRAPH-F92C;Lo;0;L;90CE;;;;N;;;;;
-F92D;CJK COMPATIBILITY IDEOGRAPH-F92D;Lo;0;L;4F86;;;;N;;;;;
-F92E;CJK COMPATIBILITY IDEOGRAPH-F92E;Lo;0;L;51B7;;;;N;;;;;
-F92F;CJK COMPATIBILITY IDEOGRAPH-F92F;Lo;0;L;52DE;;;;N;;;;;
-F930;CJK COMPATIBILITY IDEOGRAPH-F930;Lo;0;L;64C4;;;;N;;;;;
-F931;CJK COMPATIBILITY IDEOGRAPH-F931;Lo;0;L;6AD3;;;;N;;;;;
-F932;CJK COMPATIBILITY IDEOGRAPH-F932;Lo;0;L;7210;;;;N;;;;;
-F933;CJK COMPATIBILITY IDEOGRAPH-F933;Lo;0;L;76E7;;;;N;;;;;
-F934;CJK COMPATIBILITY IDEOGRAPH-F934;Lo;0;L;8001;;;;N;;;;;
-F935;CJK COMPATIBILITY IDEOGRAPH-F935;Lo;0;L;8606;;;;N;;;;;
-F936;CJK COMPATIBILITY IDEOGRAPH-F936;Lo;0;L;865C;;;;N;;;;;
-F937;CJK COMPATIBILITY IDEOGRAPH-F937;Lo;0;L;8DEF;;;;N;;;;;
-F938;CJK COMPATIBILITY IDEOGRAPH-F938;Lo;0;L;9732;;;;N;;;;;
-F939;CJK COMPATIBILITY IDEOGRAPH-F939;Lo;0;L;9B6F;;;;N;;;;;
-F93A;CJK COMPATIBILITY IDEOGRAPH-F93A;Lo;0;L;9DFA;;;;N;;;;;
-F93B;CJK COMPATIBILITY IDEOGRAPH-F93B;Lo;0;L;788C;;;;N;;;;;
-F93C;CJK COMPATIBILITY IDEOGRAPH-F93C;Lo;0;L;797F;;;;N;;;;;
-F93D;CJK COMPATIBILITY IDEOGRAPH-F93D;Lo;0;L;7DA0;;;;N;;;;;
-F93E;CJK COMPATIBILITY IDEOGRAPH-F93E;Lo;0;L;83C9;;;;N;;;;;
-F93F;CJK COMPATIBILITY IDEOGRAPH-F93F;Lo;0;L;9304;;;;N;;;;;
-F940;CJK COMPATIBILITY IDEOGRAPH-F940;Lo;0;L;9E7F;;;;N;;;;;
-F941;CJK COMPATIBILITY IDEOGRAPH-F941;Lo;0;L;8AD6;;;;N;;;;;
-F942;CJK COMPATIBILITY IDEOGRAPH-F942;Lo;0;L;58DF;;;;N;;;;;
-F943;CJK COMPATIBILITY IDEOGRAPH-F943;Lo;0;L;5F04;;;;N;;;;;
-F944;CJK COMPATIBILITY IDEOGRAPH-F944;Lo;0;L;7C60;;;;N;;;;;
-F945;CJK COMPATIBILITY IDEOGRAPH-F945;Lo;0;L;807E;;;;N;;;;;
-F946;CJK COMPATIBILITY IDEOGRAPH-F946;Lo;0;L;7262;;;;N;;;;;
-F947;CJK COMPATIBILITY IDEOGRAPH-F947;Lo;0;L;78CA;;;;N;;;;;
-F948;CJK COMPATIBILITY IDEOGRAPH-F948;Lo;0;L;8CC2;;;;N;;;;;
-F949;CJK COMPATIBILITY IDEOGRAPH-F949;Lo;0;L;96F7;;;;N;;;;;
-F94A;CJK COMPATIBILITY IDEOGRAPH-F94A;Lo;0;L;58D8;;;;N;;;;;
-F94B;CJK COMPATIBILITY IDEOGRAPH-F94B;Lo;0;L;5C62;;;;N;;;;;
-F94C;CJK COMPATIBILITY IDEOGRAPH-F94C;Lo;0;L;6A13;;;;N;;;;;
-F94D;CJK COMPATIBILITY IDEOGRAPH-F94D;Lo;0;L;6DDA;;;;N;;;;;
-F94E;CJK COMPATIBILITY IDEOGRAPH-F94E;Lo;0;L;6F0F;;;;N;;;;;
-F94F;CJK COMPATIBILITY IDEOGRAPH-F94F;Lo;0;L;7D2F;;;;N;;;;;
-F950;CJK COMPATIBILITY IDEOGRAPH-F950;Lo;0;L;7E37;;;;N;;;;;
-F951;CJK COMPATIBILITY IDEOGRAPH-F951;Lo;0;L;964B;;;;N;;;;;
-F952;CJK COMPATIBILITY IDEOGRAPH-F952;Lo;0;L;52D2;;;;N;;;;;
-F953;CJK COMPATIBILITY IDEOGRAPH-F953;Lo;0;L;808B;;;;N;;;;;
-F954;CJK COMPATIBILITY IDEOGRAPH-F954;Lo;0;L;51DC;;;;N;;;;;
-F955;CJK COMPATIBILITY IDEOGRAPH-F955;Lo;0;L;51CC;;;;N;;;;;
-F956;CJK COMPATIBILITY IDEOGRAPH-F956;Lo;0;L;7A1C;;;;N;;;;;
-F957;CJK COMPATIBILITY IDEOGRAPH-F957;Lo;0;L;7DBE;;;;N;;;;;
-F958;CJK COMPATIBILITY IDEOGRAPH-F958;Lo;0;L;83F1;;;;N;;;;;
-F959;CJK COMPATIBILITY IDEOGRAPH-F959;Lo;0;L;9675;;;;N;;;;;
-F95A;CJK COMPATIBILITY IDEOGRAPH-F95A;Lo;0;L;8B80;;;;N;;;;;
-F95B;CJK COMPATIBILITY IDEOGRAPH-F95B;Lo;0;L;62CF;;;;N;;;;;
-F95C;CJK COMPATIBILITY IDEOGRAPH-F95C;Lo;0;L;6A02;;;;N;;;;;
-F95D;CJK COMPATIBILITY IDEOGRAPH-F95D;Lo;0;L;8AFE;;;;N;;;;;
-F95E;CJK COMPATIBILITY IDEOGRAPH-F95E;Lo;0;L;4E39;;;;N;;;;;
-F95F;CJK COMPATIBILITY IDEOGRAPH-F95F;Lo;0;L;5BE7;;;;N;;;;;
-F960;CJK COMPATIBILITY IDEOGRAPH-F960;Lo;0;L;6012;;;;N;;;;;
-F961;CJK COMPATIBILITY IDEOGRAPH-F961;Lo;0;L;7387;;;;N;;;;;
-F962;CJK COMPATIBILITY IDEOGRAPH-F962;Lo;0;L;7570;;;;N;;;;;
-F963;CJK COMPATIBILITY IDEOGRAPH-F963;Lo;0;L;5317;;;;N;;;;;
-F964;CJK COMPATIBILITY IDEOGRAPH-F964;Lo;0;L;78FB;;;;N;;;;;
-F965;CJK COMPATIBILITY IDEOGRAPH-F965;Lo;0;L;4FBF;;;;N;;;;;
-F966;CJK COMPATIBILITY IDEOGRAPH-F966;Lo;0;L;5FA9;;;;N;;;;;
-F967;CJK COMPATIBILITY IDEOGRAPH-F967;Lo;0;L;4E0D;;;;N;;;;;
-F968;CJK COMPATIBILITY IDEOGRAPH-F968;Lo;0;L;6CCC;;;;N;;;;;
-F969;CJK COMPATIBILITY IDEOGRAPH-F969;Lo;0;L;6578;;;;N;;;;;
-F96A;CJK COMPATIBILITY IDEOGRAPH-F96A;Lo;0;L;7D22;;;;N;;;;;
-F96B;CJK COMPATIBILITY IDEOGRAPH-F96B;Lo;0;L;53C3;;;3;N;;;;;
-F96C;CJK COMPATIBILITY IDEOGRAPH-F96C;Lo;0;L;585E;;;;N;;;;;
-F96D;CJK COMPATIBILITY IDEOGRAPH-F96D;Lo;0;L;7701;;;;N;;;;;
-F96E;CJK COMPATIBILITY IDEOGRAPH-F96E;Lo;0;L;8449;;;;N;;;;;
-F96F;CJK COMPATIBILITY IDEOGRAPH-F96F;Lo;0;L;8AAA;;;;N;;;;;
-F970;CJK COMPATIBILITY IDEOGRAPH-F970;Lo;0;L;6BBA;;;;N;;;;;
-F971;CJK COMPATIBILITY IDEOGRAPH-F971;Lo;0;L;8FB0;;;;N;;;;;
-F972;CJK COMPATIBILITY IDEOGRAPH-F972;Lo;0;L;6C88;;;;N;;;;;
-F973;CJK COMPATIBILITY IDEOGRAPH-F973;Lo;0;L;62FE;;;10;N;;;;;
-F974;CJK COMPATIBILITY IDEOGRAPH-F974;Lo;0;L;82E5;;;;N;;;;;
-F975;CJK COMPATIBILITY IDEOGRAPH-F975;Lo;0;L;63A0;;;;N;;;;;
-F976;CJK COMPATIBILITY IDEOGRAPH-F976;Lo;0;L;7565;;;;N;;;;;
-F977;CJK COMPATIBILITY IDEOGRAPH-F977;Lo;0;L;4EAE;;;;N;;;;;
-F978;CJK COMPATIBILITY IDEOGRAPH-F978;Lo;0;L;5169;;;2;N;;;;;
-F979;CJK COMPATIBILITY IDEOGRAPH-F979;Lo;0;L;51C9;;;;N;;;;;
-F97A;CJK COMPATIBILITY IDEOGRAPH-F97A;Lo;0;L;6881;;;;N;;;;;
-F97B;CJK COMPATIBILITY IDEOGRAPH-F97B;Lo;0;L;7CE7;;;;N;;;;;
-F97C;CJK COMPATIBILITY IDEOGRAPH-F97C;Lo;0;L;826F;;;;N;;;;;
-F97D;CJK COMPATIBILITY IDEOGRAPH-F97D;Lo;0;L;8AD2;;;;N;;;;;
-F97E;CJK COMPATIBILITY IDEOGRAPH-F97E;Lo;0;L;91CF;;;;N;;;;;
-F97F;CJK COMPATIBILITY IDEOGRAPH-F97F;Lo;0;L;52F5;;;;N;;;;;
-F980;CJK COMPATIBILITY IDEOGRAPH-F980;Lo;0;L;5442;;;;N;;;;;
-F981;CJK COMPATIBILITY IDEOGRAPH-F981;Lo;0;L;5973;;;;N;;;;;
-F982;CJK COMPATIBILITY IDEOGRAPH-F982;Lo;0;L;5EEC;;;;N;;;;;
-F983;CJK COMPATIBILITY IDEOGRAPH-F983;Lo;0;L;65C5;;;;N;;;;;
-F984;CJK COMPATIBILITY IDEOGRAPH-F984;Lo;0;L;6FFE;;;;N;;;;;
-F985;CJK COMPATIBILITY IDEOGRAPH-F985;Lo;0;L;792A;;;;N;;;;;
-F986;CJK COMPATIBILITY IDEOGRAPH-F986;Lo;0;L;95AD;;;;N;;;;;
-F987;CJK COMPATIBILITY IDEOGRAPH-F987;Lo;0;L;9A6A;;;;N;;;;;
-F988;CJK COMPATIBILITY IDEOGRAPH-F988;Lo;0;L;9E97;;;;N;;;;;
-F989;CJK COMPATIBILITY IDEOGRAPH-F989;Lo;0;L;9ECE;;;;N;;;;;
-F98A;CJK COMPATIBILITY IDEOGRAPH-F98A;Lo;0;L;529B;;;;N;;;;;
-F98B;CJK COMPATIBILITY IDEOGRAPH-F98B;Lo;0;L;66C6;;;;N;;;;;
-F98C;CJK COMPATIBILITY IDEOGRAPH-F98C;Lo;0;L;6B77;;;;N;;;;;
-F98D;CJK COMPATIBILITY IDEOGRAPH-F98D;Lo;0;L;8F62;;;;N;;;;;
-F98E;CJK COMPATIBILITY IDEOGRAPH-F98E;Lo;0;L;5E74;;;;N;;;;;
-F98F;CJK COMPATIBILITY IDEOGRAPH-F98F;Lo;0;L;6190;;;;N;;;;;
-F990;CJK COMPATIBILITY IDEOGRAPH-F990;Lo;0;L;6200;;;;N;;;;;
-F991;CJK COMPATIBILITY IDEOGRAPH-F991;Lo;0;L;649A;;;;N;;;;;
-F992;CJK COMPATIBILITY IDEOGRAPH-F992;Lo;0;L;6F23;;;;N;;;;;
-F993;CJK COMPATIBILITY IDEOGRAPH-F993;Lo;0;L;7149;;;;N;;;;;
-F994;CJK COMPATIBILITY IDEOGRAPH-F994;Lo;0;L;7489;;;;N;;;;;
-F995;CJK COMPATIBILITY IDEOGRAPH-F995;Lo;0;L;79CA;;;;N;;;;;
-F996;CJK COMPATIBILITY IDEOGRAPH-F996;Lo;0;L;7DF4;;;;N;;;;;
-F997;CJK COMPATIBILITY IDEOGRAPH-F997;Lo;0;L;806F;;;;N;;;;;
-F998;CJK COMPATIBILITY IDEOGRAPH-F998;Lo;0;L;8F26;;;;N;;;;;
-F999;CJK COMPATIBILITY IDEOGRAPH-F999;Lo;0;L;84EE;;;;N;;;;;
-F99A;CJK COMPATIBILITY IDEOGRAPH-F99A;Lo;0;L;9023;;;;N;;;;;
-F99B;CJK COMPATIBILITY IDEOGRAPH-F99B;Lo;0;L;934A;;;;N;;;;;
-F99C;CJK COMPATIBILITY IDEOGRAPH-F99C;Lo;0;L;5217;;;;N;;;;;
-F99D;CJK COMPATIBILITY IDEOGRAPH-F99D;Lo;0;L;52A3;;;;N;;;;;
-F99E;CJK COMPATIBILITY IDEOGRAPH-F99E;Lo;0;L;54BD;;;;N;;;;;
-F99F;CJK COMPATIBILITY IDEOGRAPH-F99F;Lo;0;L;70C8;;;;N;;;;;
-F9A0;CJK COMPATIBILITY IDEOGRAPH-F9A0;Lo;0;L;88C2;;;;N;;;;;
-F9A1;CJK COMPATIBILITY IDEOGRAPH-F9A1;Lo;0;L;8AAA;;;;N;;;;;
-F9A2;CJK COMPATIBILITY IDEOGRAPH-F9A2;Lo;0;L;5EC9;;;;N;;;;;
-F9A3;CJK COMPATIBILITY IDEOGRAPH-F9A3;Lo;0;L;5FF5;;;;N;;;;;
-F9A4;CJK COMPATIBILITY IDEOGRAPH-F9A4;Lo;0;L;637B;;;;N;;;;;
-F9A5;CJK COMPATIBILITY IDEOGRAPH-F9A5;Lo;0;L;6BAE;;;;N;;;;;
-F9A6;CJK COMPATIBILITY IDEOGRAPH-F9A6;Lo;0;L;7C3E;;;;N;;;;;
-F9A7;CJK COMPATIBILITY IDEOGRAPH-F9A7;Lo;0;L;7375;;;;N;;;;;
-F9A8;CJK COMPATIBILITY IDEOGRAPH-F9A8;Lo;0;L;4EE4;;;;N;;;;;
-F9A9;CJK COMPATIBILITY IDEOGRAPH-F9A9;Lo;0;L;56F9;;;;N;;;;;
-F9AA;CJK COMPATIBILITY IDEOGRAPH-F9AA;Lo;0;L;5BE7;;;;N;;;;;
-F9AB;CJK COMPATIBILITY IDEOGRAPH-F9AB;Lo;0;L;5DBA;;;;N;;;;;
-F9AC;CJK COMPATIBILITY IDEOGRAPH-F9AC;Lo;0;L;601C;;;;N;;;;;
-F9AD;CJK COMPATIBILITY IDEOGRAPH-F9AD;Lo;0;L;73B2;;;;N;;;;;
-F9AE;CJK COMPATIBILITY IDEOGRAPH-F9AE;Lo;0;L;7469;;;;N;;;;;
-F9AF;CJK COMPATIBILITY IDEOGRAPH-F9AF;Lo;0;L;7F9A;;;;N;;;;;
-F9B0;CJK COMPATIBILITY IDEOGRAPH-F9B0;Lo;0;L;8046;;;;N;;;;;
-F9B1;CJK COMPATIBILITY IDEOGRAPH-F9B1;Lo;0;L;9234;;;;N;;;;;
-F9B2;CJK COMPATIBILITY IDEOGRAPH-F9B2;Lo;0;L;96F6;;;0;N;;;;;
-F9B3;CJK COMPATIBILITY IDEOGRAPH-F9B3;Lo;0;L;9748;;;;N;;;;;
-F9B4;CJK COMPATIBILITY IDEOGRAPH-F9B4;Lo;0;L;9818;;;;N;;;;;
-F9B5;CJK COMPATIBILITY IDEOGRAPH-F9B5;Lo;0;L;4F8B;;;;N;;;;;
-F9B6;CJK COMPATIBILITY IDEOGRAPH-F9B6;Lo;0;L;79AE;;;;N;;;;;
-F9B7;CJK COMPATIBILITY IDEOGRAPH-F9B7;Lo;0;L;91B4;;;;N;;;;;
-F9B8;CJK COMPATIBILITY IDEOGRAPH-F9B8;Lo;0;L;96B8;;;;N;;;;;
-F9B9;CJK COMPATIBILITY IDEOGRAPH-F9B9;Lo;0;L;60E1;;;;N;;;;;
-F9BA;CJK COMPATIBILITY IDEOGRAPH-F9BA;Lo;0;L;4E86;;;;N;;;;;
-F9BB;CJK COMPATIBILITY IDEOGRAPH-F9BB;Lo;0;L;50DA;;;;N;;;;;
-F9BC;CJK COMPATIBILITY IDEOGRAPH-F9BC;Lo;0;L;5BEE;;;;N;;;;;
-F9BD;CJK COMPATIBILITY IDEOGRAPH-F9BD;Lo;0;L;5C3F;;;;N;;;;;
-F9BE;CJK COMPATIBILITY IDEOGRAPH-F9BE;Lo;0;L;6599;;;;N;;;;;
-F9BF;CJK COMPATIBILITY IDEOGRAPH-F9BF;Lo;0;L;6A02;;;;N;;;;;
-F9C0;CJK COMPATIBILITY IDEOGRAPH-F9C0;Lo;0;L;71CE;;;;N;;;;;
-F9C1;CJK COMPATIBILITY IDEOGRAPH-F9C1;Lo;0;L;7642;;;;N;;;;;
-F9C2;CJK COMPATIBILITY IDEOGRAPH-F9C2;Lo;0;L;84FC;;;;N;;;;;
-F9C3;CJK COMPATIBILITY IDEOGRAPH-F9C3;Lo;0;L;907C;;;;N;;;;;
-F9C4;CJK COMPATIBILITY IDEOGRAPH-F9C4;Lo;0;L;9F8D;;;;N;;;;;
-F9C5;CJK COMPATIBILITY IDEOGRAPH-F9C5;Lo;0;L;6688;;;;N;;;;;
-F9C6;CJK COMPATIBILITY IDEOGRAPH-F9C6;Lo;0;L;962E;;;;N;;;;;
-F9C7;CJK COMPATIBILITY IDEOGRAPH-F9C7;Lo;0;L;5289;;;;N;;;;;
-F9C8;CJK COMPATIBILITY IDEOGRAPH-F9C8;Lo;0;L;677B;;;;N;;;;;
-F9C9;CJK COMPATIBILITY IDEOGRAPH-F9C9;Lo;0;L;67F3;;;;N;;;;;
-F9CA;CJK COMPATIBILITY IDEOGRAPH-F9CA;Lo;0;L;6D41;;;;N;;;;;
-F9CB;CJK COMPATIBILITY IDEOGRAPH-F9CB;Lo;0;L;6E9C;;;;N;;;;;
-F9CC;CJK COMPATIBILITY IDEOGRAPH-F9CC;Lo;0;L;7409;;;;N;;;;;
-F9CD;CJK COMPATIBILITY IDEOGRAPH-F9CD;Lo;0;L;7559;;;;N;;;;;
-F9CE;CJK COMPATIBILITY IDEOGRAPH-F9CE;Lo;0;L;786B;;;;N;;;;;
-F9CF;CJK COMPATIBILITY IDEOGRAPH-F9CF;Lo;0;L;7D10;;;;N;;;;;
-F9D0;CJK COMPATIBILITY IDEOGRAPH-F9D0;Lo;0;L;985E;;;;N;;;;;
-F9D1;CJK COMPATIBILITY IDEOGRAPH-F9D1;Lo;0;L;516D;;;6;N;;;;;
-F9D2;CJK COMPATIBILITY IDEOGRAPH-F9D2;Lo;0;L;622E;;;;N;;;;;
-F9D3;CJK COMPATIBILITY IDEOGRAPH-F9D3;Lo;0;L;9678;;;6;N;;;;;
-F9D4;CJK COMPATIBILITY IDEOGRAPH-F9D4;Lo;0;L;502B;;;;N;;;;;
-F9D5;CJK COMPATIBILITY IDEOGRAPH-F9D5;Lo;0;L;5D19;;;;N;;;;;
-F9D6;CJK COMPATIBILITY IDEOGRAPH-F9D6;Lo;0;L;6DEA;;;;N;;;;;
-F9D7;CJK COMPATIBILITY IDEOGRAPH-F9D7;Lo;0;L;8F2A;;;;N;;;;;
-F9D8;CJK COMPATIBILITY IDEOGRAPH-F9D8;Lo;0;L;5F8B;;;;N;;;;;
-F9D9;CJK COMPATIBILITY IDEOGRAPH-F9D9;Lo;0;L;6144;;;;N;;;;;
-F9DA;CJK COMPATIBILITY IDEOGRAPH-F9DA;Lo;0;L;6817;;;;N;;;;;
-F9DB;CJK COMPATIBILITY IDEOGRAPH-F9DB;Lo;0;L;7387;;;;N;;;;;
-F9DC;CJK COMPATIBILITY IDEOGRAPH-F9DC;Lo;0;L;9686;;;;N;;;;;
-F9DD;CJK COMPATIBILITY IDEOGRAPH-F9DD;Lo;0;L;5229;;;;N;;;;;
-F9DE;CJK COMPATIBILITY IDEOGRAPH-F9DE;Lo;0;L;540F;;;;N;;;;;
-F9DF;CJK COMPATIBILITY IDEOGRAPH-F9DF;Lo;0;L;5C65;;;;N;;;;;
-F9E0;CJK COMPATIBILITY IDEOGRAPH-F9E0;Lo;0;L;6613;;;;N;;;;;
-F9E1;CJK COMPATIBILITY IDEOGRAPH-F9E1;Lo;0;L;674E;;;;N;;;;;
-F9E2;CJK COMPATIBILITY IDEOGRAPH-F9E2;Lo;0;L;68A8;;;;N;;;;;
-F9E3;CJK COMPATIBILITY IDEOGRAPH-F9E3;Lo;0;L;6CE5;;;;N;;;;;
-F9E4;CJK COMPATIBILITY IDEOGRAPH-F9E4;Lo;0;L;7406;;;;N;;;;;
-F9E5;CJK COMPATIBILITY IDEOGRAPH-F9E5;Lo;0;L;75E2;;;;N;;;;;
-F9E6;CJK COMPATIBILITY IDEOGRAPH-F9E6;Lo;0;L;7F79;;;;N;;;;;
-F9E7;CJK COMPATIBILITY IDEOGRAPH-F9E7;Lo;0;L;88CF;;;;N;;;;;
-F9E8;CJK COMPATIBILITY IDEOGRAPH-F9E8;Lo;0;L;88E1;;;;N;;;;;
-F9E9;CJK COMPATIBILITY IDEOGRAPH-F9E9;Lo;0;L;91CC;;;;N;;;;;
-F9EA;CJK COMPATIBILITY IDEOGRAPH-F9EA;Lo;0;L;96E2;;;;N;;;;;
-F9EB;CJK COMPATIBILITY IDEOGRAPH-F9EB;Lo;0;L;533F;;;;N;;;;;
-F9EC;CJK COMPATIBILITY IDEOGRAPH-F9EC;Lo;0;L;6EBA;;;;N;;;;;
-F9ED;CJK COMPATIBILITY IDEOGRAPH-F9ED;Lo;0;L;541D;;;;N;;;;;
-F9EE;CJK COMPATIBILITY IDEOGRAPH-F9EE;Lo;0;L;71D0;;;;N;;;;;
-F9EF;CJK COMPATIBILITY IDEOGRAPH-F9EF;Lo;0;L;7498;;;;N;;;;;
-F9F0;CJK COMPATIBILITY IDEOGRAPH-F9F0;Lo;0;L;85FA;;;;N;;;;;
-F9F1;CJK COMPATIBILITY IDEOGRAPH-F9F1;Lo;0;L;96A3;;;;N;;;;;
-F9F2;CJK COMPATIBILITY IDEOGRAPH-F9F2;Lo;0;L;9C57;;;;N;;;;;
-F9F3;CJK COMPATIBILITY IDEOGRAPH-F9F3;Lo;0;L;9E9F;;;;N;;;;;
-F9F4;CJK COMPATIBILITY IDEOGRAPH-F9F4;Lo;0;L;6797;;;;N;;;;;
-F9F5;CJK COMPATIBILITY IDEOGRAPH-F9F5;Lo;0;L;6DCB;;;;N;;;;;
-F9F6;CJK COMPATIBILITY IDEOGRAPH-F9F6;Lo;0;L;81E8;;;;N;;;;;
-F9F7;CJK COMPATIBILITY IDEOGRAPH-F9F7;Lo;0;L;7ACB;;;;N;;;;;
-F9F8;CJK COMPATIBILITY IDEOGRAPH-F9F8;Lo;0;L;7B20;;;;N;;;;;
-F9F9;CJK COMPATIBILITY IDEOGRAPH-F9F9;Lo;0;L;7C92;;;;N;;;;;
-F9FA;CJK COMPATIBILITY IDEOGRAPH-F9FA;Lo;0;L;72C0;;;;N;;;;;
-F9FB;CJK COMPATIBILITY IDEOGRAPH-F9FB;Lo;0;L;7099;;;;N;;;;;
-F9FC;CJK COMPATIBILITY IDEOGRAPH-F9FC;Lo;0;L;8B58;;;;N;;;;;
-F9FD;CJK COMPATIBILITY IDEOGRAPH-F9FD;Lo;0;L;4EC0;;;10;N;;;;;
-F9FE;CJK COMPATIBILITY IDEOGRAPH-F9FE;Lo;0;L;8336;;;;N;;;;;
-F9FF;CJK COMPATIBILITY IDEOGRAPH-F9FF;Lo;0;L;523A;;;;N;;;;;
-FA00;CJK COMPATIBILITY IDEOGRAPH-FA00;Lo;0;L;5207;;;;N;;;;;
-FA01;CJK COMPATIBILITY IDEOGRAPH-FA01;Lo;0;L;5EA6;;;;N;;;;;
-FA02;CJK COMPATIBILITY IDEOGRAPH-FA02;Lo;0;L;62D3;;;;N;;;;;
-FA03;CJK COMPATIBILITY IDEOGRAPH-FA03;Lo;0;L;7CD6;;;;N;;;;;
-FA04;CJK COMPATIBILITY IDEOGRAPH-FA04;Lo;0;L;5B85;;;;N;;;;;
-FA05;CJK COMPATIBILITY IDEOGRAPH-FA05;Lo;0;L;6D1E;;;;N;;;;;
-FA06;CJK COMPATIBILITY IDEOGRAPH-FA06;Lo;0;L;66B4;;;;N;;;;;
-FA07;CJK COMPATIBILITY IDEOGRAPH-FA07;Lo;0;L;8F3B;;;;N;;;;;
-FA08;CJK COMPATIBILITY IDEOGRAPH-FA08;Lo;0;L;884C;;;;N;;;;;
-FA09;CJK COMPATIBILITY IDEOGRAPH-FA09;Lo;0;L;964D;;;;N;;;;;
-FA0A;CJK COMPATIBILITY IDEOGRAPH-FA0A;Lo;0;L;898B;;;;N;;;;;
-FA0B;CJK COMPATIBILITY IDEOGRAPH-FA0B;Lo;0;L;5ED3;;;;N;;;;;
-FA0C;CJK COMPATIBILITY IDEOGRAPH-FA0C;Lo;0;L;5140;;;;N;;;;;
-FA0D;CJK COMPATIBILITY IDEOGRAPH-FA0D;Lo;0;L;55C0;;;;N;;;;;
-FA0E;CJK COMPATIBILITY IDEOGRAPH-FA0E;Lo;0;L;;;;;N;;;;;
-FA0F;CJK COMPATIBILITY IDEOGRAPH-FA0F;Lo;0;L;;;;;N;;;;;
-FA10;CJK COMPATIBILITY IDEOGRAPH-FA10;Lo;0;L;585A;;;;N;;;;;
-FA11;CJK COMPATIBILITY IDEOGRAPH-FA11;Lo;0;L;;;;;N;;;;;
-FA12;CJK COMPATIBILITY IDEOGRAPH-FA12;Lo;0;L;6674;;;;N;;;;;
-FA13;CJK COMPATIBILITY IDEOGRAPH-FA13;Lo;0;L;;;;;N;;;;;
-FA14;CJK COMPATIBILITY IDEOGRAPH-FA14;Lo;0;L;;;;;N;;;;;
-FA15;CJK COMPATIBILITY IDEOGRAPH-FA15;Lo;0;L;51DE;;;;N;;;;;
-FA16;CJK COMPATIBILITY IDEOGRAPH-FA16;Lo;0;L;732A;;;;N;;;;;
-FA17;CJK COMPATIBILITY IDEOGRAPH-FA17;Lo;0;L;76CA;;;;N;;;;;
-FA18;CJK COMPATIBILITY IDEOGRAPH-FA18;Lo;0;L;793C;;;;N;;;;;
-FA19;CJK COMPATIBILITY IDEOGRAPH-FA19;Lo;0;L;795E;;;;N;;;;;
-FA1A;CJK COMPATIBILITY IDEOGRAPH-FA1A;Lo;0;L;7965;;;;N;;;;;
-FA1B;CJK COMPATIBILITY IDEOGRAPH-FA1B;Lo;0;L;798F;;;;N;;;;;
-FA1C;CJK COMPATIBILITY IDEOGRAPH-FA1C;Lo;0;L;9756;;;;N;;;;;
-FA1D;CJK COMPATIBILITY IDEOGRAPH-FA1D;Lo;0;L;7CBE;;;;N;;;;;
-FA1E;CJK COMPATIBILITY IDEOGRAPH-FA1E;Lo;0;L;7FBD;;;;N;;;;;
-FA1F;CJK COMPATIBILITY IDEOGRAPH-FA1F;Lo;0;L;;;;;N;;*;;;
-FA20;CJK COMPATIBILITY IDEOGRAPH-FA20;Lo;0;L;8612;;;;N;;;;;
-FA21;CJK COMPATIBILITY IDEOGRAPH-FA21;Lo;0;L;;;;;N;;;;;
-FA22;CJK COMPATIBILITY IDEOGRAPH-FA22;Lo;0;L;8AF8;;;;N;;;;;
-FA23;CJK COMPATIBILITY IDEOGRAPH-FA23;Lo;0;L;;;;;N;;*;;;
-FA24;CJK COMPATIBILITY IDEOGRAPH-FA24;Lo;0;L;;;;;N;;;;;
-FA25;CJK COMPATIBILITY IDEOGRAPH-FA25;Lo;0;L;9038;;;;N;;;;;
-FA26;CJK COMPATIBILITY IDEOGRAPH-FA26;Lo;0;L;90FD;;;;N;;;;;
-FA27;CJK COMPATIBILITY IDEOGRAPH-FA27;Lo;0;L;;;;;N;;;;;
-FA28;CJK COMPATIBILITY IDEOGRAPH-FA28;Lo;0;L;;;;;N;;;;;
-FA29;CJK COMPATIBILITY IDEOGRAPH-FA29;Lo;0;L;;;;;N;;;;;
-FA2A;CJK COMPATIBILITY IDEOGRAPH-FA2A;Lo;0;L;98EF;;;;N;;;;;
-FA2B;CJK COMPATIBILITY IDEOGRAPH-FA2B;Lo;0;L;98FC;;;;N;;;;;
-FA2C;CJK COMPATIBILITY IDEOGRAPH-FA2C;Lo;0;L;9928;;;;N;;;;;
-FA2D;CJK COMPATIBILITY IDEOGRAPH-FA2D;Lo;0;L;9DB4;;;;N;;;;;
-FA30;CJK COMPATIBILITY IDEOGRAPH-FA30;Lo;0;L;4FAE;;;;N;;;;;
-FA31;CJK COMPATIBILITY IDEOGRAPH-FA31;Lo;0;L;50E7;;;;N;;;;;
-FA32;CJK COMPATIBILITY IDEOGRAPH-FA32;Lo;0;L;514D;;;;N;;;;;
-FA33;CJK COMPATIBILITY IDEOGRAPH-FA33;Lo;0;L;52C9;;;;N;;;;;
-FA34;CJK COMPATIBILITY IDEOGRAPH-FA34;Lo;0;L;52E4;;;;N;;;;;
-FA35;CJK COMPATIBILITY IDEOGRAPH-FA35;Lo;0;L;5351;;;;N;;;;;
-FA36;CJK COMPATIBILITY IDEOGRAPH-FA36;Lo;0;L;559D;;;;N;;;;;
-FA37;CJK COMPATIBILITY IDEOGRAPH-FA37;Lo;0;L;5606;;;;N;;;;;
-FA38;CJK COMPATIBILITY IDEOGRAPH-FA38;Lo;0;L;5668;;;;N;;;;;
-FA39;CJK COMPATIBILITY IDEOGRAPH-FA39;Lo;0;L;5840;;;;N;;;;;
-FA3A;CJK COMPATIBILITY IDEOGRAPH-FA3A;Lo;0;L;58A8;;;;N;;;;;
-FA3B;CJK COMPATIBILITY IDEOGRAPH-FA3B;Lo;0;L;5C64;;;;N;;;;;
-FA3C;CJK COMPATIBILITY IDEOGRAPH-FA3C;Lo;0;L;5C6E;;;;N;;;;;
-FA3D;CJK COMPATIBILITY IDEOGRAPH-FA3D;Lo;0;L;6094;;;;N;;;;;
-FA3E;CJK COMPATIBILITY IDEOGRAPH-FA3E;Lo;0;L;6168;;;;N;;;;;
-FA3F;CJK COMPATIBILITY IDEOGRAPH-FA3F;Lo;0;L;618E;;;;N;;;;;
-FA40;CJK COMPATIBILITY IDEOGRAPH-FA40;Lo;0;L;61F2;;;;N;;;;;
-FA41;CJK COMPATIBILITY IDEOGRAPH-FA41;Lo;0;L;654F;;;;N;;;;;
-FA42;CJK COMPATIBILITY IDEOGRAPH-FA42;Lo;0;L;65E2;;;;N;;;;;
-FA43;CJK COMPATIBILITY IDEOGRAPH-FA43;Lo;0;L;6691;;;;N;;;;;
-FA44;CJK COMPATIBILITY IDEOGRAPH-FA44;Lo;0;L;6885;;;;N;;;;;
-FA45;CJK COMPATIBILITY IDEOGRAPH-FA45;Lo;0;L;6D77;;;;N;;;;;
-FA46;CJK COMPATIBILITY IDEOGRAPH-FA46;Lo;0;L;6E1A;;;;N;;;;;
-FA47;CJK COMPATIBILITY IDEOGRAPH-FA47;Lo;0;L;6F22;;;;N;;;;;
-FA48;CJK COMPATIBILITY IDEOGRAPH-FA48;Lo;0;L;716E;;;;N;;;;;
-FA49;CJK COMPATIBILITY IDEOGRAPH-FA49;Lo;0;L;722B;;;;N;;;;;
-FA4A;CJK COMPATIBILITY IDEOGRAPH-FA4A;Lo;0;L;7422;;;;N;;;;;
-FA4B;CJK COMPATIBILITY IDEOGRAPH-FA4B;Lo;0;L;7891;;;;N;;;;;
-FA4C;CJK COMPATIBILITY IDEOGRAPH-FA4C;Lo;0;L;793E;;;;N;;;;;
-FA4D;CJK COMPATIBILITY IDEOGRAPH-FA4D;Lo;0;L;7949;;;;N;;;;;
-FA4E;CJK COMPATIBILITY IDEOGRAPH-FA4E;Lo;0;L;7948;;;;N;;;;;
-FA4F;CJK COMPATIBILITY IDEOGRAPH-FA4F;Lo;0;L;7950;;;;N;;;;;
-FA50;CJK COMPATIBILITY IDEOGRAPH-FA50;Lo;0;L;7956;;;;N;;;;;
-FA51;CJK COMPATIBILITY IDEOGRAPH-FA51;Lo;0;L;795D;;;;N;;;;;
-FA52;CJK COMPATIBILITY IDEOGRAPH-FA52;Lo;0;L;798D;;;;N;;;;;
-FA53;CJK COMPATIBILITY IDEOGRAPH-FA53;Lo;0;L;798E;;;;N;;;;;
-FA54;CJK COMPATIBILITY IDEOGRAPH-FA54;Lo;0;L;7A40;;;;N;;;;;
-FA55;CJK COMPATIBILITY IDEOGRAPH-FA55;Lo;0;L;7A81;;;;N;;;;;
-FA56;CJK COMPATIBILITY IDEOGRAPH-FA56;Lo;0;L;7BC0;;;;N;;;;;
-FA57;CJK COMPATIBILITY IDEOGRAPH-FA57;Lo;0;L;7DF4;;;;N;;;;;
-FA58;CJK COMPATIBILITY IDEOGRAPH-FA58;Lo;0;L;7E09;;;;N;;;;;
-FA59;CJK COMPATIBILITY IDEOGRAPH-FA59;Lo;0;L;7E41;;;;N;;;;;
-FA5A;CJK COMPATIBILITY IDEOGRAPH-FA5A;Lo;0;L;7F72;;;;N;;;;;
-FA5B;CJK COMPATIBILITY IDEOGRAPH-FA5B;Lo;0;L;8005;;;;N;;;;;
-FA5C;CJK COMPATIBILITY IDEOGRAPH-FA5C;Lo;0;L;81ED;;;;N;;;;;
-FA5D;CJK COMPATIBILITY IDEOGRAPH-FA5D;Lo;0;L;8279;;;;N;;;;;
-FA5E;CJK COMPATIBILITY IDEOGRAPH-FA5E;Lo;0;L;8279;;;;N;;;;;
-FA5F;CJK COMPATIBILITY IDEOGRAPH-FA5F;Lo;0;L;8457;;;;N;;;;;
-FA60;CJK COMPATIBILITY IDEOGRAPH-FA60;Lo;0;L;8910;;;;N;;;;;
-FA61;CJK COMPATIBILITY IDEOGRAPH-FA61;Lo;0;L;8996;;;;N;;;;;
-FA62;CJK COMPATIBILITY IDEOGRAPH-FA62;Lo;0;L;8B01;;;;N;;;;;
-FA63;CJK COMPATIBILITY IDEOGRAPH-FA63;Lo;0;L;8B39;;;;N;;;;;
-FA64;CJK COMPATIBILITY IDEOGRAPH-FA64;Lo;0;L;8CD3;;;;N;;;;;
-FA65;CJK COMPATIBILITY IDEOGRAPH-FA65;Lo;0;L;8D08;;;;N;;;;;
-FA66;CJK COMPATIBILITY IDEOGRAPH-FA66;Lo;0;L;8FB6;;;;N;;;;;
-FA67;CJK COMPATIBILITY IDEOGRAPH-FA67;Lo;0;L;9038;;;;N;;;;;
-FA68;CJK COMPATIBILITY IDEOGRAPH-FA68;Lo;0;L;96E3;;;;N;;;;;
-FA69;CJK COMPATIBILITY IDEOGRAPH-FA69;Lo;0;L;97FF;;;;N;;;;;
-FA6A;CJK COMPATIBILITY IDEOGRAPH-FA6A;Lo;0;L;983B;;;;N;;;;;
-FA70;CJK COMPATIBILITY IDEOGRAPH-FA70;Lo;0;L;4E26;;;;N;;;;;
-FA71;CJK COMPATIBILITY IDEOGRAPH-FA71;Lo;0;L;51B5;;;;N;;;;;
-FA72;CJK COMPATIBILITY IDEOGRAPH-FA72;Lo;0;L;5168;;;;N;;;;;
-FA73;CJK COMPATIBILITY IDEOGRAPH-FA73;Lo;0;L;4F80;;;;N;;;;;
-FA74;CJK COMPATIBILITY IDEOGRAPH-FA74;Lo;0;L;5145;;;;N;;;;;
-FA75;CJK COMPATIBILITY IDEOGRAPH-FA75;Lo;0;L;5180;;;;N;;;;;
-FA76;CJK COMPATIBILITY IDEOGRAPH-FA76;Lo;0;L;52C7;;;;N;;;;;
-FA77;CJK COMPATIBILITY IDEOGRAPH-FA77;Lo;0;L;52FA;;;;N;;;;;
-FA78;CJK COMPATIBILITY IDEOGRAPH-FA78;Lo;0;L;559D;;;;N;;;;;
-FA79;CJK COMPATIBILITY IDEOGRAPH-FA79;Lo;0;L;5555;;;;N;;;;;
-FA7A;CJK COMPATIBILITY IDEOGRAPH-FA7A;Lo;0;L;5599;;;;N;;;;;
-FA7B;CJK COMPATIBILITY IDEOGRAPH-FA7B;Lo;0;L;55E2;;;;N;;;;;
-FA7C;CJK COMPATIBILITY IDEOGRAPH-FA7C;Lo;0;L;585A;;;;N;;;;;
-FA7D;CJK COMPATIBILITY IDEOGRAPH-FA7D;Lo;0;L;58B3;;;;N;;;;;
-FA7E;CJK COMPATIBILITY IDEOGRAPH-FA7E;Lo;0;L;5944;;;;N;;;;;
-FA7F;CJK COMPATIBILITY IDEOGRAPH-FA7F;Lo;0;L;5954;;;;N;;;;;
-FA80;CJK COMPATIBILITY IDEOGRAPH-FA80;Lo;0;L;5A62;;;;N;;;;;
-FA81;CJK COMPATIBILITY IDEOGRAPH-FA81;Lo;0;L;5B28;;;;N;;;;;
-FA82;CJK COMPATIBILITY IDEOGRAPH-FA82;Lo;0;L;5ED2;;;;N;;;;;
-FA83;CJK COMPATIBILITY IDEOGRAPH-FA83;Lo;0;L;5ED9;;;;N;;;;;
-FA84;CJK COMPATIBILITY IDEOGRAPH-FA84;Lo;0;L;5F69;;;;N;;;;;
-FA85;CJK COMPATIBILITY IDEOGRAPH-FA85;Lo;0;L;5FAD;;;;N;;;;;
-FA86;CJK COMPATIBILITY IDEOGRAPH-FA86;Lo;0;L;60D8;;;;N;;;;;
-FA87;CJK COMPATIBILITY IDEOGRAPH-FA87;Lo;0;L;614E;;;;N;;;;;
-FA88;CJK COMPATIBILITY IDEOGRAPH-FA88;Lo;0;L;6108;;;;N;;;;;
-FA89;CJK COMPATIBILITY IDEOGRAPH-FA89;Lo;0;L;618E;;;;N;;;;;
-FA8A;CJK COMPATIBILITY IDEOGRAPH-FA8A;Lo;0;L;6160;;;;N;;;;;
-FA8B;CJK COMPATIBILITY IDEOGRAPH-FA8B;Lo;0;L;61F2;;;;N;;;;;
-FA8C;CJK COMPATIBILITY IDEOGRAPH-FA8C;Lo;0;L;6234;;;;N;;;;;
-FA8D;CJK COMPATIBILITY IDEOGRAPH-FA8D;Lo;0;L;63C4;;;;N;;;;;
-FA8E;CJK COMPATIBILITY IDEOGRAPH-FA8E;Lo;0;L;641C;;;;N;;;;;
-FA8F;CJK COMPATIBILITY IDEOGRAPH-FA8F;Lo;0;L;6452;;;;N;;;;;
-FA90;CJK COMPATIBILITY IDEOGRAPH-FA90;Lo;0;L;6556;;;;N;;;;;
-FA91;CJK COMPATIBILITY IDEOGRAPH-FA91;Lo;0;L;6674;;;;N;;;;;
-FA92;CJK COMPATIBILITY IDEOGRAPH-FA92;Lo;0;L;6717;;;;N;;;;;
-FA93;CJK COMPATIBILITY IDEOGRAPH-FA93;Lo;0;L;671B;;;;N;;;;;
-FA94;CJK COMPATIBILITY IDEOGRAPH-FA94;Lo;0;L;6756;;;;N;;;;;
-FA95;CJK COMPATIBILITY IDEOGRAPH-FA95;Lo;0;L;6B79;;;;N;;;;;
-FA96;CJK COMPATIBILITY IDEOGRAPH-FA96;Lo;0;L;6BBA;;;;N;;;;;
-FA97;CJK COMPATIBILITY IDEOGRAPH-FA97;Lo;0;L;6D41;;;;N;;;;;
-FA98;CJK COMPATIBILITY IDEOGRAPH-FA98;Lo;0;L;6EDB;;;;N;;;;;
-FA99;CJK COMPATIBILITY IDEOGRAPH-FA99;Lo;0;L;6ECB;;;;N;;;;;
-FA9A;CJK COMPATIBILITY IDEOGRAPH-FA9A;Lo;0;L;6F22;;;;N;;;;;
-FA9B;CJK COMPATIBILITY IDEOGRAPH-FA9B;Lo;0;L;701E;;;;N;;;;;
-FA9C;CJK COMPATIBILITY IDEOGRAPH-FA9C;Lo;0;L;716E;;;;N;;;;;
-FA9D;CJK COMPATIBILITY IDEOGRAPH-FA9D;Lo;0;L;77A7;;;;N;;;;;
-FA9E;CJK COMPATIBILITY IDEOGRAPH-FA9E;Lo;0;L;7235;;;;N;;;;;
-FA9F;CJK COMPATIBILITY IDEOGRAPH-FA9F;Lo;0;L;72AF;;;;N;;;;;
-FAA0;CJK COMPATIBILITY IDEOGRAPH-FAA0;Lo;0;L;732A;;;;N;;;;;
-FAA1;CJK COMPATIBILITY IDEOGRAPH-FAA1;Lo;0;L;7471;;;;N;;;;;
-FAA2;CJK COMPATIBILITY IDEOGRAPH-FAA2;Lo;0;L;7506;;;;N;;;;;
-FAA3;CJK COMPATIBILITY IDEOGRAPH-FAA3;Lo;0;L;753B;;;;N;;;;;
-FAA4;CJK COMPATIBILITY IDEOGRAPH-FAA4;Lo;0;L;761D;;;;N;;;;;
-FAA5;CJK COMPATIBILITY IDEOGRAPH-FAA5;Lo;0;L;761F;;;;N;;;;;
-FAA6;CJK COMPATIBILITY IDEOGRAPH-FAA6;Lo;0;L;76CA;;;;N;;;;;
-FAA7;CJK COMPATIBILITY IDEOGRAPH-FAA7;Lo;0;L;76DB;;;;N;;;;;
-FAA8;CJK COMPATIBILITY IDEOGRAPH-FAA8;Lo;0;L;76F4;;;;N;;;;;
-FAA9;CJK COMPATIBILITY IDEOGRAPH-FAA9;Lo;0;L;774A;;;;N;;;;;
-FAAA;CJK COMPATIBILITY IDEOGRAPH-FAAA;Lo;0;L;7740;;;;N;;;;;
-FAAB;CJK COMPATIBILITY IDEOGRAPH-FAAB;Lo;0;L;78CC;;;;N;;;;;
-FAAC;CJK COMPATIBILITY IDEOGRAPH-FAAC;Lo;0;L;7AB1;;;;N;;;;;
-FAAD;CJK COMPATIBILITY IDEOGRAPH-FAAD;Lo;0;L;7BC0;;;;N;;;;;
-FAAE;CJK COMPATIBILITY IDEOGRAPH-FAAE;Lo;0;L;7C7B;;;;N;;;;;
-FAAF;CJK COMPATIBILITY IDEOGRAPH-FAAF;Lo;0;L;7D5B;;;;N;;;;;
-FAB0;CJK COMPATIBILITY IDEOGRAPH-FAB0;Lo;0;L;7DF4;;;;N;;;;;
-FAB1;CJK COMPATIBILITY IDEOGRAPH-FAB1;Lo;0;L;7F3E;;;;N;;;;;
-FAB2;CJK COMPATIBILITY IDEOGRAPH-FAB2;Lo;0;L;8005;;;;N;;;;;
-FAB3;CJK COMPATIBILITY IDEOGRAPH-FAB3;Lo;0;L;8352;;;;N;;;;;
-FAB4;CJK COMPATIBILITY IDEOGRAPH-FAB4;Lo;0;L;83EF;;;;N;;;;;
-FAB5;CJK COMPATIBILITY IDEOGRAPH-FAB5;Lo;0;L;8779;;;;N;;;;;
-FAB6;CJK COMPATIBILITY IDEOGRAPH-FAB6;Lo;0;L;8941;;;;N;;;;;
-FAB7;CJK COMPATIBILITY IDEOGRAPH-FAB7;Lo;0;L;8986;;;;N;;;;;
-FAB8;CJK COMPATIBILITY IDEOGRAPH-FAB8;Lo;0;L;8996;;;;N;;;;;
-FAB9;CJK COMPATIBILITY IDEOGRAPH-FAB9;Lo;0;L;8ABF;;;;N;;;;;
-FABA;CJK COMPATIBILITY IDEOGRAPH-FABA;Lo;0;L;8AF8;;;;N;;;;;
-FABB;CJK COMPATIBILITY IDEOGRAPH-FABB;Lo;0;L;8ACB;;;;N;;;;;
-FABC;CJK COMPATIBILITY IDEOGRAPH-FABC;Lo;0;L;8B01;;;;N;;;;;
-FABD;CJK COMPATIBILITY IDEOGRAPH-FABD;Lo;0;L;8AFE;;;;N;;;;;
-FABE;CJK COMPATIBILITY IDEOGRAPH-FABE;Lo;0;L;8AED;;;;N;;;;;
-FABF;CJK COMPATIBILITY IDEOGRAPH-FABF;Lo;0;L;8B39;;;;N;;;;;
-FAC0;CJK COMPATIBILITY IDEOGRAPH-FAC0;Lo;0;L;8B8A;;;;N;;;;;
-FAC1;CJK COMPATIBILITY IDEOGRAPH-FAC1;Lo;0;L;8D08;;;;N;;;;;
-FAC2;CJK COMPATIBILITY IDEOGRAPH-FAC2;Lo;0;L;8F38;;;;N;;;;;
-FAC3;CJK COMPATIBILITY IDEOGRAPH-FAC3;Lo;0;L;9072;;;;N;;;;;
-FAC4;CJK COMPATIBILITY IDEOGRAPH-FAC4;Lo;0;L;9199;;;;N;;;;;
-FAC5;CJK COMPATIBILITY IDEOGRAPH-FAC5;Lo;0;L;9276;;;;N;;;;;
-FAC6;CJK COMPATIBILITY IDEOGRAPH-FAC6;Lo;0;L;967C;;;;N;;;;;
-FAC7;CJK COMPATIBILITY IDEOGRAPH-FAC7;Lo;0;L;96E3;;;;N;;;;;
-FAC8;CJK COMPATIBILITY IDEOGRAPH-FAC8;Lo;0;L;9756;;;;N;;;;;
-FAC9;CJK COMPATIBILITY IDEOGRAPH-FAC9;Lo;0;L;97DB;;;;N;;;;;
-FACA;CJK COMPATIBILITY IDEOGRAPH-FACA;Lo;0;L;97FF;;;;N;;;;;
-FACB;CJK COMPATIBILITY IDEOGRAPH-FACB;Lo;0;L;980B;;;;N;;;;;
-FACC;CJK COMPATIBILITY IDEOGRAPH-FACC;Lo;0;L;983B;;;;N;;;;;
-FACD;CJK COMPATIBILITY IDEOGRAPH-FACD;Lo;0;L;9B12;;;;N;;;;;
-FACE;CJK COMPATIBILITY IDEOGRAPH-FACE;Lo;0;L;9F9C;;;;N;;;;;
-FACF;CJK COMPATIBILITY IDEOGRAPH-FACF;Lo;0;L;2284A;;;;N;;;;;
-FAD0;CJK COMPATIBILITY IDEOGRAPH-FAD0;Lo;0;L;22844;;;;N;;;;;
-FAD1;CJK COMPATIBILITY IDEOGRAPH-FAD1;Lo;0;L;233D5;;;;N;;;;;
-FAD2;CJK COMPATIBILITY IDEOGRAPH-FAD2;Lo;0;L;3B9D;;;;N;;;;;
-FAD3;CJK COMPATIBILITY IDEOGRAPH-FAD3;Lo;0;L;4018;;;;N;;;;;
-FAD4;CJK COMPATIBILITY IDEOGRAPH-FAD4;Lo;0;L;4039;;;;N;;;;;
-FAD5;CJK COMPATIBILITY IDEOGRAPH-FAD5;Lo;0;L;25249;;;;N;;;;;
-FAD6;CJK COMPATIBILITY IDEOGRAPH-FAD6;Lo;0;L;25CD0;;;;N;;;;;
-FAD7;CJK COMPATIBILITY IDEOGRAPH-FAD7;Lo;0;L;27ED3;;;;N;;;;;
-FAD8;CJK COMPATIBILITY IDEOGRAPH-FAD8;Lo;0;L;9F43;;;;N;;;;;
-FAD9;CJK COMPATIBILITY IDEOGRAPH-FAD9;Lo;0;L;9F8E;;;;N;;;;;
-FB00;LATIN SMALL LIGATURE FF;Ll;0;L;<compat> 0066 0066;;;;N;;;;;
-FB01;LATIN SMALL LIGATURE FI;Ll;0;L;<compat> 0066 0069;;;;N;;;;;
-FB02;LATIN SMALL LIGATURE FL;Ll;0;L;<compat> 0066 006C;;;;N;;;;;
-FB03;LATIN SMALL LIGATURE FFI;Ll;0;L;<compat> 0066 0066 0069;;;;N;;;;;
-FB04;LATIN SMALL LIGATURE FFL;Ll;0;L;<compat> 0066 0066 006C;;;;N;;;;;
-FB05;LATIN SMALL LIGATURE LONG S T;Ll;0;L;<compat> 017F 0074;;;;N;;;;;
-FB06;LATIN SMALL LIGATURE ST;Ll;0;L;<compat> 0073 0074;;;;N;;;;;
-FB13;ARMENIAN SMALL LIGATURE MEN NOW;Ll;0;L;<compat> 0574 0576;;;;N;;;;;
-FB14;ARMENIAN SMALL LIGATURE MEN ECH;Ll;0;L;<compat> 0574 0565;;;;N;;;;;
-FB15;ARMENIAN SMALL LIGATURE MEN INI;Ll;0;L;<compat> 0574 056B;;;;N;;;;;
-FB16;ARMENIAN SMALL LIGATURE VEW NOW;Ll;0;L;<compat> 057E 0576;;;;N;;;;;
-FB17;ARMENIAN SMALL LIGATURE MEN XEH;Ll;0;L;<compat> 0574 056D;;;;N;;;;;
-FB1D;HEBREW LETTER YOD WITH HIRIQ;Lo;0;R;05D9 05B4;;;;N;;;;;
-FB1E;HEBREW POINT JUDEO-SPANISH VARIKA;Mn;26;NSM;;;;;N;HEBREW POINT VARIKA;;;;
-FB1F;HEBREW LIGATURE YIDDISH YOD YOD PATAH;Lo;0;R;05F2 05B7;;;;N;;;;;
-FB20;HEBREW LETTER ALTERNATIVE AYIN;Lo;0;R;<font> 05E2;;;;N;;;;;
-FB21;HEBREW LETTER WIDE ALEF;Lo;0;R;<font> 05D0;;;;N;;;;;
-FB22;HEBREW LETTER WIDE DALET;Lo;0;R;<font> 05D3;;;;N;;;;;
-FB23;HEBREW LETTER WIDE HE;Lo;0;R;<font> 05D4;;;;N;;;;;
-FB24;HEBREW LETTER WIDE KAF;Lo;0;R;<font> 05DB;;;;N;;;;;
-FB25;HEBREW LETTER WIDE LAMED;Lo;0;R;<font> 05DC;;;;N;;;;;
-FB26;HEBREW LETTER WIDE FINAL MEM;Lo;0;R;<font> 05DD;;;;N;;;;;
-FB27;HEBREW LETTER WIDE RESH;Lo;0;R;<font> 05E8;;;;N;;;;;
-FB28;HEBREW LETTER WIDE TAV;Lo;0;R;<font> 05EA;;;;N;;;;;
-FB29;HEBREW LETTER ALTERNATIVE PLUS SIGN;Sm;0;ES;<font> 002B;;;;N;;;;;
-FB2A;HEBREW LETTER SHIN WITH SHIN DOT;Lo;0;R;05E9 05C1;;;;N;;;;;
-FB2B;HEBREW LETTER SHIN WITH SIN DOT;Lo;0;R;05E9 05C2;;;;N;;;;;
-FB2C;HEBREW LETTER SHIN WITH DAGESH AND SHIN DOT;Lo;0;R;FB49 05C1;;;;N;;;;;
-FB2D;HEBREW LETTER SHIN WITH DAGESH AND SIN DOT;Lo;0;R;FB49 05C2;;;;N;;;;;
-FB2E;HEBREW LETTER ALEF WITH PATAH;Lo;0;R;05D0 05B7;;;;N;;;;;
-FB2F;HEBREW LETTER ALEF WITH QAMATS;Lo;0;R;05D0 05B8;;;;N;;;;;
-FB30;HEBREW LETTER ALEF WITH MAPIQ;Lo;0;R;05D0 05BC;;;;N;;;;;
-FB31;HEBREW LETTER BET WITH DAGESH;Lo;0;R;05D1 05BC;;;;N;;;;;
-FB32;HEBREW LETTER GIMEL WITH DAGESH;Lo;0;R;05D2 05BC;;;;N;;;;;
-FB33;HEBREW LETTER DALET WITH DAGESH;Lo;0;R;05D3 05BC;;;;N;;;;;
-FB34;HEBREW LETTER HE WITH MAPIQ;Lo;0;R;05D4 05BC;;;;N;;;;;
-FB35;HEBREW LETTER VAV WITH DAGESH;Lo;0;R;05D5 05BC;;;;N;;;;;
-FB36;HEBREW LETTER ZAYIN WITH DAGESH;Lo;0;R;05D6 05BC;;;;N;;;;;
-FB38;HEBREW LETTER TET WITH DAGESH;Lo;0;R;05D8 05BC;;;;N;;;;;
-FB39;HEBREW LETTER YOD WITH DAGESH;Lo;0;R;05D9 05BC;;;;N;;;;;
-FB3A;HEBREW LETTER FINAL KAF WITH DAGESH;Lo;0;R;05DA 05BC;;;;N;;;;;
-FB3B;HEBREW LETTER KAF WITH DAGESH;Lo;0;R;05DB 05BC;;;;N;;;;;
-FB3C;HEBREW LETTER LAMED WITH DAGESH;Lo;0;R;05DC 05BC;;;;N;;;;;
-FB3E;HEBREW LETTER MEM WITH DAGESH;Lo;0;R;05DE 05BC;;;;N;;;;;
-FB40;HEBREW LETTER NUN WITH DAGESH;Lo;0;R;05E0 05BC;;;;N;;;;;
-FB41;HEBREW LETTER SAMEKH WITH DAGESH;Lo;0;R;05E1 05BC;;;;N;;;;;
-FB43;HEBREW LETTER FINAL PE WITH DAGESH;Lo;0;R;05E3 05BC;;;;N;;;;;
-FB44;HEBREW LETTER PE WITH DAGESH;Lo;0;R;05E4 05BC;;;;N;;;;;
-FB46;HEBREW LETTER TSADI WITH DAGESH;Lo;0;R;05E6 05BC;;;;N;;;;;
-FB47;HEBREW LETTER QOF WITH DAGESH;Lo;0;R;05E7 05BC;;;;N;;;;;
-FB48;HEBREW LETTER RESH WITH DAGESH;Lo;0;R;05E8 05BC;;;;N;;;;;
-FB49;HEBREW LETTER SHIN WITH DAGESH;Lo;0;R;05E9 05BC;;;;N;;;;;
-FB4A;HEBREW LETTER TAV WITH DAGESH;Lo;0;R;05EA 05BC;;;;N;;;;;
-FB4B;HEBREW LETTER VAV WITH HOLAM;Lo;0;R;05D5 05B9;;;;N;;;;;
-FB4C;HEBREW LETTER BET WITH RAFE;Lo;0;R;05D1 05BF;;;;N;;;;;
-FB4D;HEBREW LETTER KAF WITH RAFE;Lo;0;R;05DB 05BF;;;;N;;;;;
-FB4E;HEBREW LETTER PE WITH RAFE;Lo;0;R;05E4 05BF;;;;N;;;;;
-FB4F;HEBREW LIGATURE ALEF LAMED;Lo;0;R;<compat> 05D0 05DC;;;;N;;;;;
-FB50;ARABIC LETTER ALEF WASLA ISOLATED FORM;Lo;0;AL;<isolated> 0671;;;;N;;;;;
-FB51;ARABIC LETTER ALEF WASLA FINAL FORM;Lo;0;AL;<final> 0671;;;;N;;;;;
-FB52;ARABIC LETTER BEEH ISOLATED FORM;Lo;0;AL;<isolated> 067B;;;;N;;;;;
-FB53;ARABIC LETTER BEEH FINAL FORM;Lo;0;AL;<final> 067B;;;;N;;;;;
-FB54;ARABIC LETTER BEEH INITIAL FORM;Lo;0;AL;<initial> 067B;;;;N;;;;;
-FB55;ARABIC LETTER BEEH MEDIAL FORM;Lo;0;AL;<medial> 067B;;;;N;;;;;
-FB56;ARABIC LETTER PEH ISOLATED FORM;Lo;0;AL;<isolated> 067E;;;;N;;;;;
-FB57;ARABIC LETTER PEH FINAL FORM;Lo;0;AL;<final> 067E;;;;N;;;;;
-FB58;ARABIC LETTER PEH INITIAL FORM;Lo;0;AL;<initial> 067E;;;;N;;;;;
-FB59;ARABIC LETTER PEH MEDIAL FORM;Lo;0;AL;<medial> 067E;;;;N;;;;;
-FB5A;ARABIC LETTER BEHEH ISOLATED FORM;Lo;0;AL;<isolated> 0680;;;;N;;;;;
-FB5B;ARABIC LETTER BEHEH FINAL FORM;Lo;0;AL;<final> 0680;;;;N;;;;;
-FB5C;ARABIC LETTER BEHEH INITIAL FORM;Lo;0;AL;<initial> 0680;;;;N;;;;;
-FB5D;ARABIC LETTER BEHEH MEDIAL FORM;Lo;0;AL;<medial> 0680;;;;N;;;;;
-FB5E;ARABIC LETTER TTEHEH ISOLATED FORM;Lo;0;AL;<isolated> 067A;;;;N;;;;;
-FB5F;ARABIC LETTER TTEHEH FINAL FORM;Lo;0;AL;<final> 067A;;;;N;;;;;
-FB60;ARABIC LETTER TTEHEH INITIAL FORM;Lo;0;AL;<initial> 067A;;;;N;;;;;
-FB61;ARABIC LETTER TTEHEH MEDIAL FORM;Lo;0;AL;<medial> 067A;;;;N;;;;;
-FB62;ARABIC LETTER TEHEH ISOLATED FORM;Lo;0;AL;<isolated> 067F;;;;N;;;;;
-FB63;ARABIC LETTER TEHEH FINAL FORM;Lo;0;AL;<final> 067F;;;;N;;;;;
-FB64;ARABIC LETTER TEHEH INITIAL FORM;Lo;0;AL;<initial> 067F;;;;N;;;;;
-FB65;ARABIC LETTER TEHEH MEDIAL FORM;Lo;0;AL;<medial> 067F;;;;N;;;;;
-FB66;ARABIC LETTER TTEH ISOLATED FORM;Lo;0;AL;<isolated> 0679;;;;N;;;;;
-FB67;ARABIC LETTER TTEH FINAL FORM;Lo;0;AL;<final> 0679;;;;N;;;;;
-FB68;ARABIC LETTER TTEH INITIAL FORM;Lo;0;AL;<initial> 0679;;;;N;;;;;
-FB69;ARABIC LETTER TTEH MEDIAL FORM;Lo;0;AL;<medial> 0679;;;;N;;;;;
-FB6A;ARABIC LETTER VEH ISOLATED FORM;Lo;0;AL;<isolated> 06A4;;;;N;;;;;
-FB6B;ARABIC LETTER VEH FINAL FORM;Lo;0;AL;<final> 06A4;;;;N;;;;;
-FB6C;ARABIC LETTER VEH INITIAL FORM;Lo;0;AL;<initial> 06A4;;;;N;;;;;
-FB6D;ARABIC LETTER VEH MEDIAL FORM;Lo;0;AL;<medial> 06A4;;;;N;;;;;
-FB6E;ARABIC LETTER PEHEH ISOLATED FORM;Lo;0;AL;<isolated> 06A6;;;;N;;;;;
-FB6F;ARABIC LETTER PEHEH FINAL FORM;Lo;0;AL;<final> 06A6;;;;N;;;;;
-FB70;ARABIC LETTER PEHEH INITIAL FORM;Lo;0;AL;<initial> 06A6;;;;N;;;;;
-FB71;ARABIC LETTER PEHEH MEDIAL FORM;Lo;0;AL;<medial> 06A6;;;;N;;;;;
-FB72;ARABIC LETTER DYEH ISOLATED FORM;Lo;0;AL;<isolated> 0684;;;;N;;;;;
-FB73;ARABIC LETTER DYEH FINAL FORM;Lo;0;AL;<final> 0684;;;;N;;;;;
-FB74;ARABIC LETTER DYEH INITIAL FORM;Lo;0;AL;<initial> 0684;;;;N;;;;;
-FB75;ARABIC LETTER DYEH MEDIAL FORM;Lo;0;AL;<medial> 0684;;;;N;;;;;
-FB76;ARABIC LETTER NYEH ISOLATED FORM;Lo;0;AL;<isolated> 0683;;;;N;;;;;
-FB77;ARABIC LETTER NYEH FINAL FORM;Lo;0;AL;<final> 0683;;;;N;;;;;
-FB78;ARABIC LETTER NYEH INITIAL FORM;Lo;0;AL;<initial> 0683;;;;N;;;;;
-FB79;ARABIC LETTER NYEH MEDIAL FORM;Lo;0;AL;<medial> 0683;;;;N;;;;;
-FB7A;ARABIC LETTER TCHEH ISOLATED FORM;Lo;0;AL;<isolated> 0686;;;;N;;;;;
-FB7B;ARABIC LETTER TCHEH FINAL FORM;Lo;0;AL;<final> 0686;;;;N;;;;;
-FB7C;ARABIC LETTER TCHEH INITIAL FORM;Lo;0;AL;<initial> 0686;;;;N;;;;;
-FB7D;ARABIC LETTER TCHEH MEDIAL FORM;Lo;0;AL;<medial> 0686;;;;N;;;;;
-FB7E;ARABIC LETTER TCHEHEH ISOLATED FORM;Lo;0;AL;<isolated> 0687;;;;N;;;;;
-FB7F;ARABIC LETTER TCHEHEH FINAL FORM;Lo;0;AL;<final> 0687;;;;N;;;;;
-FB80;ARABIC LETTER TCHEHEH INITIAL FORM;Lo;0;AL;<initial> 0687;;;;N;;;;;
-FB81;ARABIC LETTER TCHEHEH MEDIAL FORM;Lo;0;AL;<medial> 0687;;;;N;;;;;
-FB82;ARABIC LETTER DDAHAL ISOLATED FORM;Lo;0;AL;<isolated> 068D;;;;N;;;;;
-FB83;ARABIC LETTER DDAHAL FINAL FORM;Lo;0;AL;<final> 068D;;;;N;;;;;
-FB84;ARABIC LETTER DAHAL ISOLATED FORM;Lo;0;AL;<isolated> 068C;;;;N;;;;;
-FB85;ARABIC LETTER DAHAL FINAL FORM;Lo;0;AL;<final> 068C;;;;N;;;;;
-FB86;ARABIC LETTER DUL ISOLATED FORM;Lo;0;AL;<isolated> 068E;;;;N;;;;;
-FB87;ARABIC LETTER DUL FINAL FORM;Lo;0;AL;<final> 068E;;;;N;;;;;
-FB88;ARABIC LETTER DDAL ISOLATED FORM;Lo;0;AL;<isolated> 0688;;;;N;;;;;
-FB89;ARABIC LETTER DDAL FINAL FORM;Lo;0;AL;<final> 0688;;;;N;;;;;
-FB8A;ARABIC LETTER JEH ISOLATED FORM;Lo;0;AL;<isolated> 0698;;;;N;;;;;
-FB8B;ARABIC LETTER JEH FINAL FORM;Lo;0;AL;<final> 0698;;;;N;;;;;
-FB8C;ARABIC LETTER RREH ISOLATED FORM;Lo;0;AL;<isolated> 0691;;;;N;;;;;
-FB8D;ARABIC LETTER RREH FINAL FORM;Lo;0;AL;<final> 0691;;;;N;;;;;
-FB8E;ARABIC LETTER KEHEH ISOLATED FORM;Lo;0;AL;<isolated> 06A9;;;;N;;;;;
-FB8F;ARABIC LETTER KEHEH FINAL FORM;Lo;0;AL;<final> 06A9;;;;N;;;;;
-FB90;ARABIC LETTER KEHEH INITIAL FORM;Lo;0;AL;<initial> 06A9;;;;N;;;;;
-FB91;ARABIC LETTER KEHEH MEDIAL FORM;Lo;0;AL;<medial> 06A9;;;;N;;;;;
-FB92;ARABIC LETTER GAF ISOLATED FORM;Lo;0;AL;<isolated> 06AF;;;;N;;;;;
-FB93;ARABIC LETTER GAF FINAL FORM;Lo;0;AL;<final> 06AF;;;;N;;;;;
-FB94;ARABIC LETTER GAF INITIAL FORM;Lo;0;AL;<initial> 06AF;;;;N;;;;;
-FB95;ARABIC LETTER GAF MEDIAL FORM;Lo;0;AL;<medial> 06AF;;;;N;;;;;
-FB96;ARABIC LETTER GUEH ISOLATED FORM;Lo;0;AL;<isolated> 06B3;;;;N;;;;;
-FB97;ARABIC LETTER GUEH FINAL FORM;Lo;0;AL;<final> 06B3;;;;N;;;;;
-FB98;ARABIC LETTER GUEH INITIAL FORM;Lo;0;AL;<initial> 06B3;;;;N;;;;;
-FB99;ARABIC LETTER GUEH MEDIAL FORM;Lo;0;AL;<medial> 06B3;;;;N;;;;;
-FB9A;ARABIC LETTER NGOEH ISOLATED FORM;Lo;0;AL;<isolated> 06B1;;;;N;;;;;
-FB9B;ARABIC LETTER NGOEH FINAL FORM;Lo;0;AL;<final> 06B1;;;;N;;;;;
-FB9C;ARABIC LETTER NGOEH INITIAL FORM;Lo;0;AL;<initial> 06B1;;;;N;;;;;
-FB9D;ARABIC LETTER NGOEH MEDIAL FORM;Lo;0;AL;<medial> 06B1;;;;N;;;;;
-FB9E;ARABIC LETTER NOON GHUNNA ISOLATED FORM;Lo;0;AL;<isolated> 06BA;;;;N;;;;;
-FB9F;ARABIC LETTER NOON GHUNNA FINAL FORM;Lo;0;AL;<final> 06BA;;;;N;;;;;
-FBA0;ARABIC LETTER RNOON ISOLATED FORM;Lo;0;AL;<isolated> 06BB;;;;N;;;;;
-FBA1;ARABIC LETTER RNOON FINAL FORM;Lo;0;AL;<final> 06BB;;;;N;;;;;
-FBA2;ARABIC LETTER RNOON INITIAL FORM;Lo;0;AL;<initial> 06BB;;;;N;;;;;
-FBA3;ARABIC LETTER RNOON MEDIAL FORM;Lo;0;AL;<medial> 06BB;;;;N;;;;;
-FBA4;ARABIC LETTER HEH WITH YEH ABOVE ISOLATED FORM;Lo;0;AL;<isolated> 06C0;;;;N;;;;;
-FBA5;ARABIC LETTER HEH WITH YEH ABOVE FINAL FORM;Lo;0;AL;<final> 06C0;;;;N;;;;;
-FBA6;ARABIC LETTER HEH GOAL ISOLATED FORM;Lo;0;AL;<isolated> 06C1;;;;N;;;;;
-FBA7;ARABIC LETTER HEH GOAL FINAL FORM;Lo;0;AL;<final> 06C1;;;;N;;;;;
-FBA8;ARABIC LETTER HEH GOAL INITIAL FORM;Lo;0;AL;<initial> 06C1;;;;N;;;;;
-FBA9;ARABIC LETTER HEH GOAL MEDIAL FORM;Lo;0;AL;<medial> 06C1;;;;N;;;;;
-FBAA;ARABIC LETTER HEH DOACHASHMEE ISOLATED FORM;Lo;0;AL;<isolated> 06BE;;;;N;;;;;
-FBAB;ARABIC LETTER HEH DOACHASHMEE FINAL FORM;Lo;0;AL;<final> 06BE;;;;N;;;;;
-FBAC;ARABIC LETTER HEH DOACHASHMEE INITIAL FORM;Lo;0;AL;<initial> 06BE;;;;N;;;;;
-FBAD;ARABIC LETTER HEH DOACHASHMEE MEDIAL FORM;Lo;0;AL;<medial> 06BE;;;;N;;;;;
-FBAE;ARABIC LETTER YEH BARREE ISOLATED FORM;Lo;0;AL;<isolated> 06D2;;;;N;;;;;
-FBAF;ARABIC LETTER YEH BARREE FINAL FORM;Lo;0;AL;<final> 06D2;;;;N;;;;;
-FBB0;ARABIC LETTER YEH BARREE WITH HAMZA ABOVE ISOLATED FORM;Lo;0;AL;<isolated> 06D3;;;;N;;;;;
-FBB1;ARABIC LETTER YEH BARREE WITH HAMZA ABOVE FINAL FORM;Lo;0;AL;<final> 06D3;;;;N;;;;;
-FBD3;ARABIC LETTER NG ISOLATED FORM;Lo;0;AL;<isolated> 06AD;;;;N;;;;;
-FBD4;ARABIC LETTER NG FINAL FORM;Lo;0;AL;<final> 06AD;;;;N;;;;;
-FBD5;ARABIC LETTER NG INITIAL FORM;Lo;0;AL;<initial> 06AD;;;;N;;;;;
-FBD6;ARABIC LETTER NG MEDIAL FORM;Lo;0;AL;<medial> 06AD;;;;N;;;;;
-FBD7;ARABIC LETTER U ISOLATED FORM;Lo;0;AL;<isolated> 06C7;;;;N;;;;;
-FBD8;ARABIC LETTER U FINAL FORM;Lo;0;AL;<final> 06C7;;;;N;;;;;
-FBD9;ARABIC LETTER OE ISOLATED FORM;Lo;0;AL;<isolated> 06C6;;;;N;;;;;
-FBDA;ARABIC LETTER OE FINAL FORM;Lo;0;AL;<final> 06C6;;;;N;;;;;
-FBDB;ARABIC LETTER YU ISOLATED FORM;Lo;0;AL;<isolated> 06C8;;;;N;;;;;
-FBDC;ARABIC LETTER YU FINAL FORM;Lo;0;AL;<final> 06C8;;;;N;;;;;
-FBDD;ARABIC LETTER U WITH HAMZA ABOVE ISOLATED FORM;Lo;0;AL;<isolated> 0677;;;;N;;;;;
-FBDE;ARABIC LETTER VE ISOLATED FORM;Lo;0;AL;<isolated> 06CB;;;;N;;;;;
-FBDF;ARABIC LETTER VE FINAL FORM;Lo;0;AL;<final> 06CB;;;;N;;;;;
-FBE0;ARABIC LETTER KIRGHIZ OE ISOLATED FORM;Lo;0;AL;<isolated> 06C5;;;;N;;;;;
-FBE1;ARABIC LETTER KIRGHIZ OE FINAL FORM;Lo;0;AL;<final> 06C5;;;;N;;;;;
-FBE2;ARABIC LETTER KIRGHIZ YU ISOLATED FORM;Lo;0;AL;<isolated> 06C9;;;;N;;;;;
-FBE3;ARABIC LETTER KIRGHIZ YU FINAL FORM;Lo;0;AL;<final> 06C9;;;;N;;;;;
-FBE4;ARABIC LETTER E ISOLATED FORM;Lo;0;AL;<isolated> 06D0;;;;N;;;;;
-FBE5;ARABIC LETTER E FINAL FORM;Lo;0;AL;<final> 06D0;;;;N;;;;;
-FBE6;ARABIC LETTER E INITIAL FORM;Lo;0;AL;<initial> 06D0;;;;N;;;;;
-FBE7;ARABIC LETTER E MEDIAL FORM;Lo;0;AL;<medial> 06D0;;;;N;;;;;
-FBE8;ARABIC LETTER UIGHUR KAZAKH KIRGHIZ ALEF MAKSURA INITIAL FORM;Lo;0;AL;<initial> 0649;;;;N;;;;;
-FBE9;ARABIC LETTER UIGHUR KAZAKH KIRGHIZ ALEF MAKSURA MEDIAL FORM;Lo;0;AL;<medial> 0649;;;;N;;;;;
-FBEA;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH ALEF ISOLATED FORM;Lo;0;AL;<isolated> 0626 0627;;;;N;;;;;
-FBEB;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH ALEF FINAL FORM;Lo;0;AL;<final> 0626 0627;;;;N;;;;;
-FBEC;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH AE ISOLATED FORM;Lo;0;AL;<isolated> 0626 06D5;;;;N;;;;;
-FBED;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH AE FINAL FORM;Lo;0;AL;<final> 0626 06D5;;;;N;;;;;
-FBEE;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH WAW ISOLATED FORM;Lo;0;AL;<isolated> 0626 0648;;;;N;;;;;
-FBEF;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH WAW FINAL FORM;Lo;0;AL;<final> 0626 0648;;;;N;;;;;
-FBF0;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH U ISOLATED FORM;Lo;0;AL;<isolated> 0626 06C7;;;;N;;;;;
-FBF1;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH U FINAL FORM;Lo;0;AL;<final> 0626 06C7;;;;N;;;;;
-FBF2;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH OE ISOLATED FORM;Lo;0;AL;<isolated> 0626 06C6;;;;N;;;;;
-FBF3;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH OE FINAL FORM;Lo;0;AL;<final> 0626 06C6;;;;N;;;;;
-FBF4;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH YU ISOLATED FORM;Lo;0;AL;<isolated> 0626 06C8;;;;N;;;;;
-FBF5;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH YU FINAL FORM;Lo;0;AL;<final> 0626 06C8;;;;N;;;;;
-FBF6;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH E ISOLATED FORM;Lo;0;AL;<isolated> 0626 06D0;;;;N;;;;;
-FBF7;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH E FINAL FORM;Lo;0;AL;<final> 0626 06D0;;;;N;;;;;
-FBF8;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH E INITIAL FORM;Lo;0;AL;<initial> 0626 06D0;;;;N;;;;;
-FBF9;ARABIC LIGATURE UIGHUR KIRGHIZ YEH WITH HAMZA ABOVE WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0626 0649;;;;N;;;;;
-FBFA;ARABIC LIGATURE UIGHUR KIRGHIZ YEH WITH HAMZA ABOVE WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0626 0649;;;;N;;;;;
-FBFB;ARABIC LIGATURE UIGHUR KIRGHIZ YEH WITH HAMZA ABOVE WITH ALEF MAKSURA INITIAL FORM;Lo;0;AL;<initial> 0626 0649;;;;N;;;;;
-FBFC;ARABIC LETTER FARSI YEH ISOLATED FORM;Lo;0;AL;<isolated> 06CC;;;;N;;;;;
-FBFD;ARABIC LETTER FARSI YEH FINAL FORM;Lo;0;AL;<final> 06CC;;;;N;;;;;
-FBFE;ARABIC LETTER FARSI YEH INITIAL FORM;Lo;0;AL;<initial> 06CC;;;;N;;;;;
-FBFF;ARABIC LETTER FARSI YEH MEDIAL FORM;Lo;0;AL;<medial> 06CC;;;;N;;;;;
-FC00;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 0626 062C;;;;N;;;;;
-FC01;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 0626 062D;;;;N;;;;;
-FC02;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0626 0645;;;;N;;;;;
-FC03;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0626 0649;;;;N;;;;;
-FC04;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 0626 064A;;;;N;;;;;
-FC05;ARABIC LIGATURE BEH WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 0628 062C;;;;N;;;;;
-FC06;ARABIC LIGATURE BEH WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 0628 062D;;;;N;;;;;
-FC07;ARABIC LIGATURE BEH WITH KHAH ISOLATED FORM;Lo;0;AL;<isolated> 0628 062E;;;;N;;;;;
-FC08;ARABIC LIGATURE BEH WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0628 0645;;;;N;;;;;
-FC09;ARABIC LIGATURE BEH WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0628 0649;;;;N;;;;;
-FC0A;ARABIC LIGATURE BEH WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 0628 064A;;;;N;;;;;
-FC0B;ARABIC LIGATURE TEH WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 062A 062C;;;;N;;;;;
-FC0C;ARABIC LIGATURE TEH WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 062A 062D;;;;N;;;;;
-FC0D;ARABIC LIGATURE TEH WITH KHAH ISOLATED FORM;Lo;0;AL;<isolated> 062A 062E;;;;N;;;;;
-FC0E;ARABIC LIGATURE TEH WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 062A 0645;;;;N;;;;;
-FC0F;ARABIC LIGATURE TEH WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 062A 0649;;;;N;;;;;
-FC10;ARABIC LIGATURE TEH WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 062A 064A;;;;N;;;;;
-FC11;ARABIC LIGATURE THEH WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 062B 062C;;;;N;;;;;
-FC12;ARABIC LIGATURE THEH WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 062B 0645;;;;N;;;;;
-FC13;ARABIC LIGATURE THEH WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 062B 0649;;;;N;;;;;
-FC14;ARABIC LIGATURE THEH WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 062B 064A;;;;N;;;;;
-FC15;ARABIC LIGATURE JEEM WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 062C 062D;;;;N;;;;;
-FC16;ARABIC LIGATURE JEEM WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 062C 0645;;;;N;;;;;
-FC17;ARABIC LIGATURE HAH WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 062D 062C;;;;N;;;;;
-FC18;ARABIC LIGATURE HAH WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 062D 0645;;;;N;;;;;
-FC19;ARABIC LIGATURE KHAH WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 062E 062C;;;;N;;;;;
-FC1A;ARABIC LIGATURE KHAH WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 062E 062D;;;;N;;;;;
-FC1B;ARABIC LIGATURE KHAH WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 062E 0645;;;;N;;;;;
-FC1C;ARABIC LIGATURE SEEN WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 0633 062C;;;;N;;;;;
-FC1D;ARABIC LIGATURE SEEN WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 0633 062D;;;;N;;;;;
-FC1E;ARABIC LIGATURE SEEN WITH KHAH ISOLATED FORM;Lo;0;AL;<isolated> 0633 062E;;;;N;;;;;
-FC1F;ARABIC LIGATURE SEEN WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0633 0645;;;;N;;;;;
-FC20;ARABIC LIGATURE SAD WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 0635 062D;;;;N;;;;;
-FC21;ARABIC LIGATURE SAD WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0635 0645;;;;N;;;;;
-FC22;ARABIC LIGATURE DAD WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 0636 062C;;;;N;;;;;
-FC23;ARABIC LIGATURE DAD WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 0636 062D;;;;N;;;;;
-FC24;ARABIC LIGATURE DAD WITH KHAH ISOLATED FORM;Lo;0;AL;<isolated> 0636 062E;;;;N;;;;;
-FC25;ARABIC LIGATURE DAD WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0636 0645;;;;N;;;;;
-FC26;ARABIC LIGATURE TAH WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 0637 062D;;;;N;;;;;
-FC27;ARABIC LIGATURE TAH WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0637 0645;;;;N;;;;;
-FC28;ARABIC LIGATURE ZAH WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0638 0645;;;;N;;;;;
-FC29;ARABIC LIGATURE AIN WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 0639 062C;;;;N;;;;;
-FC2A;ARABIC LIGATURE AIN WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0639 0645;;;;N;;;;;
-FC2B;ARABIC LIGATURE GHAIN WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 063A 062C;;;;N;;;;;
-FC2C;ARABIC LIGATURE GHAIN WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 063A 0645;;;;N;;;;;
-FC2D;ARABIC LIGATURE FEH WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 0641 062C;;;;N;;;;;
-FC2E;ARABIC LIGATURE FEH WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 0641 062D;;;;N;;;;;
-FC2F;ARABIC LIGATURE FEH WITH KHAH ISOLATED FORM;Lo;0;AL;<isolated> 0641 062E;;;;N;;;;;
-FC30;ARABIC LIGATURE FEH WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0641 0645;;;;N;;;;;
-FC31;ARABIC LIGATURE FEH WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0641 0649;;;;N;;;;;
-FC32;ARABIC LIGATURE FEH WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 0641 064A;;;;N;;;;;
-FC33;ARABIC LIGATURE QAF WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 0642 062D;;;;N;;;;;
-FC34;ARABIC LIGATURE QAF WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0642 0645;;;;N;;;;;
-FC35;ARABIC LIGATURE QAF WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0642 0649;;;;N;;;;;
-FC36;ARABIC LIGATURE QAF WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 0642 064A;;;;N;;;;;
-FC37;ARABIC LIGATURE KAF WITH ALEF ISOLATED FORM;Lo;0;AL;<isolated> 0643 0627;;;;N;;;;;
-FC38;ARABIC LIGATURE KAF WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 0643 062C;;;;N;;;;;
-FC39;ARABIC LIGATURE KAF WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 0643 062D;;;;N;;;;;
-FC3A;ARABIC LIGATURE KAF WITH KHAH ISOLATED FORM;Lo;0;AL;<isolated> 0643 062E;;;;N;;;;;
-FC3B;ARABIC LIGATURE KAF WITH LAM ISOLATED FORM;Lo;0;AL;<isolated> 0643 0644;;;;N;;;;;
-FC3C;ARABIC LIGATURE KAF WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0643 0645;;;;N;;;;;
-FC3D;ARABIC LIGATURE KAF WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0643 0649;;;;N;;;;;
-FC3E;ARABIC LIGATURE KAF WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 0643 064A;;;;N;;;;;
-FC3F;ARABIC LIGATURE LAM WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 0644 062C;;;;N;;;;;
-FC40;ARABIC LIGATURE LAM WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 0644 062D;;;;N;;;;;
-FC41;ARABIC LIGATURE LAM WITH KHAH ISOLATED FORM;Lo;0;AL;<isolated> 0644 062E;;;;N;;;;;
-FC42;ARABIC LIGATURE LAM WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0644 0645;;;;N;;;;;
-FC43;ARABIC LIGATURE LAM WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0644 0649;;;;N;;;;;
-FC44;ARABIC LIGATURE LAM WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 0644 064A;;;;N;;;;;
-FC45;ARABIC LIGATURE MEEM WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 0645 062C;;;;N;;;;;
-FC46;ARABIC LIGATURE MEEM WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 0645 062D;;;;N;;;;;
-FC47;ARABIC LIGATURE MEEM WITH KHAH ISOLATED FORM;Lo;0;AL;<isolated> 0645 062E;;;;N;;;;;
-FC48;ARABIC LIGATURE MEEM WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0645 0645;;;;N;;;;;
-FC49;ARABIC LIGATURE MEEM WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0645 0649;;;;N;;;;;
-FC4A;ARABIC LIGATURE MEEM WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 0645 064A;;;;N;;;;;
-FC4B;ARABIC LIGATURE NOON WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 0646 062C;;;;N;;;;;
-FC4C;ARABIC LIGATURE NOON WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 0646 062D;;;;N;;;;;
-FC4D;ARABIC LIGATURE NOON WITH KHAH ISOLATED FORM;Lo;0;AL;<isolated> 0646 062E;;;;N;;;;;
-FC4E;ARABIC LIGATURE NOON WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0646 0645;;;;N;;;;;
-FC4F;ARABIC LIGATURE NOON WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0646 0649;;;;N;;;;;
-FC50;ARABIC LIGATURE NOON WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 0646 064A;;;;N;;;;;
-FC51;ARABIC LIGATURE HEH WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 0647 062C;;;;N;;;;;
-FC52;ARABIC LIGATURE HEH WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0647 0645;;;;N;;;;;
-FC53;ARABIC LIGATURE HEH WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0647 0649;;;;N;;;;;
-FC54;ARABIC LIGATURE HEH WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 0647 064A;;;;N;;;;;
-FC55;ARABIC LIGATURE YEH WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 064A 062C;;;;N;;;;;
-FC56;ARABIC LIGATURE YEH WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 064A 062D;;;;N;;;;;
-FC57;ARABIC LIGATURE YEH WITH KHAH ISOLATED FORM;Lo;0;AL;<isolated> 064A 062E;;;;N;;;;;
-FC58;ARABIC LIGATURE YEH WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 064A 0645;;;;N;;;;;
-FC59;ARABIC LIGATURE YEH WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 064A 0649;;;;N;;;;;
-FC5A;ARABIC LIGATURE YEH WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 064A 064A;;;;N;;;;;
-FC5B;ARABIC LIGATURE THAL WITH SUPERSCRIPT ALEF ISOLATED FORM;Lo;0;AL;<isolated> 0630 0670;;;;N;;;;;
-FC5C;ARABIC LIGATURE REH WITH SUPERSCRIPT ALEF ISOLATED FORM;Lo;0;AL;<isolated> 0631 0670;;;;N;;;;;
-FC5D;ARABIC LIGATURE ALEF MAKSURA WITH SUPERSCRIPT ALEF ISOLATED FORM;Lo;0;AL;<isolated> 0649 0670;;;;N;;;;;
-FC5E;ARABIC LIGATURE SHADDA WITH DAMMATAN ISOLATED FORM;Lo;0;AL;<isolated> 0020 064C 0651;;;;N;;;;;
-FC5F;ARABIC LIGATURE SHADDA WITH KASRATAN ISOLATED FORM;Lo;0;AL;<isolated> 0020 064D 0651;;;;N;;;;;
-FC60;ARABIC LIGATURE SHADDA WITH FATHA ISOLATED FORM;Lo;0;AL;<isolated> 0020 064E 0651;;;;N;;;;;
-FC61;ARABIC LIGATURE SHADDA WITH DAMMA ISOLATED FORM;Lo;0;AL;<isolated> 0020 064F 0651;;;;N;;;;;
-FC62;ARABIC LIGATURE SHADDA WITH KASRA ISOLATED FORM;Lo;0;AL;<isolated> 0020 0650 0651;;;;N;;;;;
-FC63;ARABIC LIGATURE SHADDA WITH SUPERSCRIPT ALEF ISOLATED FORM;Lo;0;AL;<isolated> 0020 0651 0670;;;;N;;;;;
-FC64;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH REH FINAL FORM;Lo;0;AL;<final> 0626 0631;;;;N;;;;;
-FC65;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH ZAIN FINAL FORM;Lo;0;AL;<final> 0626 0632;;;;N;;;;;
-FC66;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH MEEM FINAL FORM;Lo;0;AL;<final> 0626 0645;;;;N;;;;;
-FC67;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH NOON FINAL FORM;Lo;0;AL;<final> 0626 0646;;;;N;;;;;
-FC68;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0626 0649;;;;N;;;;;
-FC69;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH YEH FINAL FORM;Lo;0;AL;<final> 0626 064A;;;;N;;;;;
-FC6A;ARABIC LIGATURE BEH WITH REH FINAL FORM;Lo;0;AL;<final> 0628 0631;;;;N;;;;;
-FC6B;ARABIC LIGATURE BEH WITH ZAIN FINAL FORM;Lo;0;AL;<final> 0628 0632;;;;N;;;;;
-FC6C;ARABIC LIGATURE BEH WITH MEEM FINAL FORM;Lo;0;AL;<final> 0628 0645;;;;N;;;;;
-FC6D;ARABIC LIGATURE BEH WITH NOON FINAL FORM;Lo;0;AL;<final> 0628 0646;;;;N;;;;;
-FC6E;ARABIC LIGATURE BEH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0628 0649;;;;N;;;;;
-FC6F;ARABIC LIGATURE BEH WITH YEH FINAL FORM;Lo;0;AL;<final> 0628 064A;;;;N;;;;;
-FC70;ARABIC LIGATURE TEH WITH REH FINAL FORM;Lo;0;AL;<final> 062A 0631;;;;N;;;;;
-FC71;ARABIC LIGATURE TEH WITH ZAIN FINAL FORM;Lo;0;AL;<final> 062A 0632;;;;N;;;;;
-FC72;ARABIC LIGATURE TEH WITH MEEM FINAL FORM;Lo;0;AL;<final> 062A 0645;;;;N;;;;;
-FC73;ARABIC LIGATURE TEH WITH NOON FINAL FORM;Lo;0;AL;<final> 062A 0646;;;;N;;;;;
-FC74;ARABIC LIGATURE TEH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 062A 0649;;;;N;;;;;
-FC75;ARABIC LIGATURE TEH WITH YEH FINAL FORM;Lo;0;AL;<final> 062A 064A;;;;N;;;;;
-FC76;ARABIC LIGATURE THEH WITH REH FINAL FORM;Lo;0;AL;<final> 062B 0631;;;;N;;;;;
-FC77;ARABIC LIGATURE THEH WITH ZAIN FINAL FORM;Lo;0;AL;<final> 062B 0632;;;;N;;;;;
-FC78;ARABIC LIGATURE THEH WITH MEEM FINAL FORM;Lo;0;AL;<final> 062B 0645;;;;N;;;;;
-FC79;ARABIC LIGATURE THEH WITH NOON FINAL FORM;Lo;0;AL;<final> 062B 0646;;;;N;;;;;
-FC7A;ARABIC LIGATURE THEH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 062B 0649;;;;N;;;;;
-FC7B;ARABIC LIGATURE THEH WITH YEH FINAL FORM;Lo;0;AL;<final> 062B 064A;;;;N;;;;;
-FC7C;ARABIC LIGATURE FEH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0641 0649;;;;N;;;;;
-FC7D;ARABIC LIGATURE FEH WITH YEH FINAL FORM;Lo;0;AL;<final> 0641 064A;;;;N;;;;;
-FC7E;ARABIC LIGATURE QAF WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0642 0649;;;;N;;;;;
-FC7F;ARABIC LIGATURE QAF WITH YEH FINAL FORM;Lo;0;AL;<final> 0642 064A;;;;N;;;;;
-FC80;ARABIC LIGATURE KAF WITH ALEF FINAL FORM;Lo;0;AL;<final> 0643 0627;;;;N;;;;;
-FC81;ARABIC LIGATURE KAF WITH LAM FINAL FORM;Lo;0;AL;<final> 0643 0644;;;;N;;;;;
-FC82;ARABIC LIGATURE KAF WITH MEEM FINAL FORM;Lo;0;AL;<final> 0643 0645;;;;N;;;;;
-FC83;ARABIC LIGATURE KAF WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0643 0649;;;;N;;;;;
-FC84;ARABIC LIGATURE KAF WITH YEH FINAL FORM;Lo;0;AL;<final> 0643 064A;;;;N;;;;;
-FC85;ARABIC LIGATURE LAM WITH MEEM FINAL FORM;Lo;0;AL;<final> 0644 0645;;;;N;;;;;
-FC86;ARABIC LIGATURE LAM WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0644 0649;;;;N;;;;;
-FC87;ARABIC LIGATURE LAM WITH YEH FINAL FORM;Lo;0;AL;<final> 0644 064A;;;;N;;;;;
-FC88;ARABIC LIGATURE MEEM WITH ALEF FINAL FORM;Lo;0;AL;<final> 0645 0627;;;;N;;;;;
-FC89;ARABIC LIGATURE MEEM WITH MEEM FINAL FORM;Lo;0;AL;<final> 0645 0645;;;;N;;;;;
-FC8A;ARABIC LIGATURE NOON WITH REH FINAL FORM;Lo;0;AL;<final> 0646 0631;;;;N;;;;;
-FC8B;ARABIC LIGATURE NOON WITH ZAIN FINAL FORM;Lo;0;AL;<final> 0646 0632;;;;N;;;;;
-FC8C;ARABIC LIGATURE NOON WITH MEEM FINAL FORM;Lo;0;AL;<final> 0646 0645;;;;N;;;;;
-FC8D;ARABIC LIGATURE NOON WITH NOON FINAL FORM;Lo;0;AL;<final> 0646 0646;;;;N;;;;;
-FC8E;ARABIC LIGATURE NOON WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0646 0649;;;;N;;;;;
-FC8F;ARABIC LIGATURE NOON WITH YEH FINAL FORM;Lo;0;AL;<final> 0646 064A;;;;N;;;;;
-FC90;ARABIC LIGATURE ALEF MAKSURA WITH SUPERSCRIPT ALEF FINAL FORM;Lo;0;AL;<final> 0649 0670;;;;N;;;;;
-FC91;ARABIC LIGATURE YEH WITH REH FINAL FORM;Lo;0;AL;<final> 064A 0631;;;;N;;;;;
-FC92;ARABIC LIGATURE YEH WITH ZAIN FINAL FORM;Lo;0;AL;<final> 064A 0632;;;;N;;;;;
-FC93;ARABIC LIGATURE YEH WITH MEEM FINAL FORM;Lo;0;AL;<final> 064A 0645;;;;N;;;;;
-FC94;ARABIC LIGATURE YEH WITH NOON FINAL FORM;Lo;0;AL;<final> 064A 0646;;;;N;;;;;
-FC95;ARABIC LIGATURE YEH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 064A 0649;;;;N;;;;;
-FC96;ARABIC LIGATURE YEH WITH YEH FINAL FORM;Lo;0;AL;<final> 064A 064A;;;;N;;;;;
-FC97;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0626 062C;;;;N;;;;;
-FC98;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0626 062D;;;;N;;;;;
-FC99;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 0626 062E;;;;N;;;;;
-FC9A;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0626 0645;;;;N;;;;;
-FC9B;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH HEH INITIAL FORM;Lo;0;AL;<initial> 0626 0647;;;;N;;;;;
-FC9C;ARABIC LIGATURE BEH WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0628 062C;;;;N;;;;;
-FC9D;ARABIC LIGATURE BEH WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0628 062D;;;;N;;;;;
-FC9E;ARABIC LIGATURE BEH WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 0628 062E;;;;N;;;;;
-FC9F;ARABIC LIGATURE BEH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0628 0645;;;;N;;;;;
-FCA0;ARABIC LIGATURE BEH WITH HEH INITIAL FORM;Lo;0;AL;<initial> 0628 0647;;;;N;;;;;
-FCA1;ARABIC LIGATURE TEH WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 062A 062C;;;;N;;;;;
-FCA2;ARABIC LIGATURE TEH WITH HAH INITIAL FORM;Lo;0;AL;<initial> 062A 062D;;;;N;;;;;
-FCA3;ARABIC LIGATURE TEH WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 062A 062E;;;;N;;;;;
-FCA4;ARABIC LIGATURE TEH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 062A 0645;;;;N;;;;;
-FCA5;ARABIC LIGATURE TEH WITH HEH INITIAL FORM;Lo;0;AL;<initial> 062A 0647;;;;N;;;;;
-FCA6;ARABIC LIGATURE THEH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 062B 0645;;;;N;;;;;
-FCA7;ARABIC LIGATURE JEEM WITH HAH INITIAL FORM;Lo;0;AL;<initial> 062C 062D;;;;N;;;;;
-FCA8;ARABIC LIGATURE JEEM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 062C 0645;;;;N;;;;;
-FCA9;ARABIC LIGATURE HAH WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 062D 062C;;;;N;;;;;
-FCAA;ARABIC LIGATURE HAH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 062D 0645;;;;N;;;;;
-FCAB;ARABIC LIGATURE KHAH WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 062E 062C;;;;N;;;;;
-FCAC;ARABIC LIGATURE KHAH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 062E 0645;;;;N;;;;;
-FCAD;ARABIC LIGATURE SEEN WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0633 062C;;;;N;;;;;
-FCAE;ARABIC LIGATURE SEEN WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0633 062D;;;;N;;;;;
-FCAF;ARABIC LIGATURE SEEN WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 0633 062E;;;;N;;;;;
-FCB0;ARABIC LIGATURE SEEN WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0633 0645;;;;N;;;;;
-FCB1;ARABIC LIGATURE SAD WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0635 062D;;;;N;;;;;
-FCB2;ARABIC LIGATURE SAD WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 0635 062E;;;;N;;;;;
-FCB3;ARABIC LIGATURE SAD WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0635 0645;;;;N;;;;;
-FCB4;ARABIC LIGATURE DAD WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0636 062C;;;;N;;;;;
-FCB5;ARABIC LIGATURE DAD WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0636 062D;;;;N;;;;;
-FCB6;ARABIC LIGATURE DAD WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 0636 062E;;;;N;;;;;
-FCB7;ARABIC LIGATURE DAD WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0636 0645;;;;N;;;;;
-FCB8;ARABIC LIGATURE TAH WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0637 062D;;;;N;;;;;
-FCB9;ARABIC LIGATURE ZAH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0638 0645;;;;N;;;;;
-FCBA;ARABIC LIGATURE AIN WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0639 062C;;;;N;;;;;
-FCBB;ARABIC LIGATURE AIN WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0639 0645;;;;N;;;;;
-FCBC;ARABIC LIGATURE GHAIN WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 063A 062C;;;;N;;;;;
-FCBD;ARABIC LIGATURE GHAIN WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 063A 0645;;;;N;;;;;
-FCBE;ARABIC LIGATURE FEH WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0641 062C;;;;N;;;;;
-FCBF;ARABIC LIGATURE FEH WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0641 062D;;;;N;;;;;
-FCC0;ARABIC LIGATURE FEH WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 0641 062E;;;;N;;;;;
-FCC1;ARABIC LIGATURE FEH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0641 0645;;;;N;;;;;
-FCC2;ARABIC LIGATURE QAF WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0642 062D;;;;N;;;;;
-FCC3;ARABIC LIGATURE QAF WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0642 0645;;;;N;;;;;
-FCC4;ARABIC LIGATURE KAF WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0643 062C;;;;N;;;;;
-FCC5;ARABIC LIGATURE KAF WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0643 062D;;;;N;;;;;
-FCC6;ARABIC LIGATURE KAF WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 0643 062E;;;;N;;;;;
-FCC7;ARABIC LIGATURE KAF WITH LAM INITIAL FORM;Lo;0;AL;<initial> 0643 0644;;;;N;;;;;
-FCC8;ARABIC LIGATURE KAF WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0643 0645;;;;N;;;;;
-FCC9;ARABIC LIGATURE LAM WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0644 062C;;;;N;;;;;
-FCCA;ARABIC LIGATURE LAM WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0644 062D;;;;N;;;;;
-FCCB;ARABIC LIGATURE LAM WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 0644 062E;;;;N;;;;;
-FCCC;ARABIC LIGATURE LAM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0644 0645;;;;N;;;;;
-FCCD;ARABIC LIGATURE LAM WITH HEH INITIAL FORM;Lo;0;AL;<initial> 0644 0647;;;;N;;;;;
-FCCE;ARABIC LIGATURE MEEM WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0645 062C;;;;N;;;;;
-FCCF;ARABIC LIGATURE MEEM WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0645 062D;;;;N;;;;;
-FCD0;ARABIC LIGATURE MEEM WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 0645 062E;;;;N;;;;;
-FCD1;ARABIC LIGATURE MEEM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0645 0645;;;;N;;;;;
-FCD2;ARABIC LIGATURE NOON WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0646 062C;;;;N;;;;;
-FCD3;ARABIC LIGATURE NOON WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0646 062D;;;;N;;;;;
-FCD4;ARABIC LIGATURE NOON WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 0646 062E;;;;N;;;;;
-FCD5;ARABIC LIGATURE NOON WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0646 0645;;;;N;;;;;
-FCD6;ARABIC LIGATURE NOON WITH HEH INITIAL FORM;Lo;0;AL;<initial> 0646 0647;;;;N;;;;;
-FCD7;ARABIC LIGATURE HEH WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0647 062C;;;;N;;;;;
-FCD8;ARABIC LIGATURE HEH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0647 0645;;;;N;;;;;
-FCD9;ARABIC LIGATURE HEH WITH SUPERSCRIPT ALEF INITIAL FORM;Lo;0;AL;<initial> 0647 0670;;;;N;;;;;
-FCDA;ARABIC LIGATURE YEH WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 064A 062C;;;;N;;;;;
-FCDB;ARABIC LIGATURE YEH WITH HAH INITIAL FORM;Lo;0;AL;<initial> 064A 062D;;;;N;;;;;
-FCDC;ARABIC LIGATURE YEH WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 064A 062E;;;;N;;;;;
-FCDD;ARABIC LIGATURE YEH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 064A 0645;;;;N;;;;;
-FCDE;ARABIC LIGATURE YEH WITH HEH INITIAL FORM;Lo;0;AL;<initial> 064A 0647;;;;N;;;;;
-FCDF;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH MEEM MEDIAL FORM;Lo;0;AL;<medial> 0626 0645;;;;N;;;;;
-FCE0;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH HEH MEDIAL FORM;Lo;0;AL;<medial> 0626 0647;;;;N;;;;;
-FCE1;ARABIC LIGATURE BEH WITH MEEM MEDIAL FORM;Lo;0;AL;<medial> 0628 0645;;;;N;;;;;
-FCE2;ARABIC LIGATURE BEH WITH HEH MEDIAL FORM;Lo;0;AL;<medial> 0628 0647;;;;N;;;;;
-FCE3;ARABIC LIGATURE TEH WITH MEEM MEDIAL FORM;Lo;0;AL;<medial> 062A 0645;;;;N;;;;;
-FCE4;ARABIC LIGATURE TEH WITH HEH MEDIAL FORM;Lo;0;AL;<medial> 062A 0647;;;;N;;;;;
-FCE5;ARABIC LIGATURE THEH WITH MEEM MEDIAL FORM;Lo;0;AL;<medial> 062B 0645;;;;N;;;;;
-FCE6;ARABIC LIGATURE THEH WITH HEH MEDIAL FORM;Lo;0;AL;<medial> 062B 0647;;;;N;;;;;
-FCE7;ARABIC LIGATURE SEEN WITH MEEM MEDIAL FORM;Lo;0;AL;<medial> 0633 0645;;;;N;;;;;
-FCE8;ARABIC LIGATURE SEEN WITH HEH MEDIAL FORM;Lo;0;AL;<medial> 0633 0647;;;;N;;;;;
-FCE9;ARABIC LIGATURE SHEEN WITH MEEM MEDIAL FORM;Lo;0;AL;<medial> 0634 0645;;;;N;;;;;
-FCEA;ARABIC LIGATURE SHEEN WITH HEH MEDIAL FORM;Lo;0;AL;<medial> 0634 0647;;;;N;;;;;
-FCEB;ARABIC LIGATURE KAF WITH LAM MEDIAL FORM;Lo;0;AL;<medial> 0643 0644;;;;N;;;;;
-FCEC;ARABIC LIGATURE KAF WITH MEEM MEDIAL FORM;Lo;0;AL;<medial> 0643 0645;;;;N;;;;;
-FCED;ARABIC LIGATURE LAM WITH MEEM MEDIAL FORM;Lo;0;AL;<medial> 0644 0645;;;;N;;;;;
-FCEE;ARABIC LIGATURE NOON WITH MEEM MEDIAL FORM;Lo;0;AL;<medial> 0646 0645;;;;N;;;;;
-FCEF;ARABIC LIGATURE NOON WITH HEH MEDIAL FORM;Lo;0;AL;<medial> 0646 0647;;;;N;;;;;
-FCF0;ARABIC LIGATURE YEH WITH MEEM MEDIAL FORM;Lo;0;AL;<medial> 064A 0645;;;;N;;;;;
-FCF1;ARABIC LIGATURE YEH WITH HEH MEDIAL FORM;Lo;0;AL;<medial> 064A 0647;;;;N;;;;;
-FCF2;ARABIC LIGATURE SHADDA WITH FATHA MEDIAL FORM;Lo;0;AL;<medial> 0640 064E 0651;;;;N;;;;;
-FCF3;ARABIC LIGATURE SHADDA WITH DAMMA MEDIAL FORM;Lo;0;AL;<medial> 0640 064F 0651;;;;N;;;;;
-FCF4;ARABIC LIGATURE SHADDA WITH KASRA MEDIAL FORM;Lo;0;AL;<medial> 0640 0650 0651;;;;N;;;;;
-FCF5;ARABIC LIGATURE TAH WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0637 0649;;;;N;;;;;
-FCF6;ARABIC LIGATURE TAH WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 0637 064A;;;;N;;;;;
-FCF7;ARABIC LIGATURE AIN WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0639 0649;;;;N;;;;;
-FCF8;ARABIC LIGATURE AIN WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 0639 064A;;;;N;;;;;
-FCF9;ARABIC LIGATURE GHAIN WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 063A 0649;;;;N;;;;;
-FCFA;ARABIC LIGATURE GHAIN WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 063A 064A;;;;N;;;;;
-FCFB;ARABIC LIGATURE SEEN WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0633 0649;;;;N;;;;;
-FCFC;ARABIC LIGATURE SEEN WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 0633 064A;;;;N;;;;;
-FCFD;ARABIC LIGATURE SHEEN WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0634 0649;;;;N;;;;;
-FCFE;ARABIC LIGATURE SHEEN WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 0634 064A;;;;N;;;;;
-FCFF;ARABIC LIGATURE HAH WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 062D 0649;;;;N;;;;;
-FD00;ARABIC LIGATURE HAH WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 062D 064A;;;;N;;;;;
-FD01;ARABIC LIGATURE JEEM WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 062C 0649;;;;N;;;;;
-FD02;ARABIC LIGATURE JEEM WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 062C 064A;;;;N;;;;;
-FD03;ARABIC LIGATURE KHAH WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 062E 0649;;;;N;;;;;
-FD04;ARABIC LIGATURE KHAH WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 062E 064A;;;;N;;;;;
-FD05;ARABIC LIGATURE SAD WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0635 0649;;;;N;;;;;
-FD06;ARABIC LIGATURE SAD WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 0635 064A;;;;N;;;;;
-FD07;ARABIC LIGATURE DAD WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0636 0649;;;;N;;;;;
-FD08;ARABIC LIGATURE DAD WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 0636 064A;;;;N;;;;;
-FD09;ARABIC LIGATURE SHEEN WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 0634 062C;;;;N;;;;;
-FD0A;ARABIC LIGATURE SHEEN WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 0634 062D;;;;N;;;;;
-FD0B;ARABIC LIGATURE SHEEN WITH KHAH ISOLATED FORM;Lo;0;AL;<isolated> 0634 062E;;;;N;;;;;
-FD0C;ARABIC LIGATURE SHEEN WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0634 0645;;;;N;;;;;
-FD0D;ARABIC LIGATURE SHEEN WITH REH ISOLATED FORM;Lo;0;AL;<isolated> 0634 0631;;;;N;;;;;
-FD0E;ARABIC LIGATURE SEEN WITH REH ISOLATED FORM;Lo;0;AL;<isolated> 0633 0631;;;;N;;;;;
-FD0F;ARABIC LIGATURE SAD WITH REH ISOLATED FORM;Lo;0;AL;<isolated> 0635 0631;;;;N;;;;;
-FD10;ARABIC LIGATURE DAD WITH REH ISOLATED FORM;Lo;0;AL;<isolated> 0636 0631;;;;N;;;;;
-FD11;ARABIC LIGATURE TAH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0637 0649;;;;N;;;;;
-FD12;ARABIC LIGATURE TAH WITH YEH FINAL FORM;Lo;0;AL;<final> 0637 064A;;;;N;;;;;
-FD13;ARABIC LIGATURE AIN WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0639 0649;;;;N;;;;;
-FD14;ARABIC LIGATURE AIN WITH YEH FINAL FORM;Lo;0;AL;<final> 0639 064A;;;;N;;;;;
-FD15;ARABIC LIGATURE GHAIN WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 063A 0649;;;;N;;;;;
-FD16;ARABIC LIGATURE GHAIN WITH YEH FINAL FORM;Lo;0;AL;<final> 063A 064A;;;;N;;;;;
-FD17;ARABIC LIGATURE SEEN WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0633 0649;;;;N;;;;;
-FD18;ARABIC LIGATURE SEEN WITH YEH FINAL FORM;Lo;0;AL;<final> 0633 064A;;;;N;;;;;
-FD19;ARABIC LIGATURE SHEEN WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0634 0649;;;;N;;;;;
-FD1A;ARABIC LIGATURE SHEEN WITH YEH FINAL FORM;Lo;0;AL;<final> 0634 064A;;;;N;;;;;
-FD1B;ARABIC LIGATURE HAH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 062D 0649;;;;N;;;;;
-FD1C;ARABIC LIGATURE HAH WITH YEH FINAL FORM;Lo;0;AL;<final> 062D 064A;;;;N;;;;;
-FD1D;ARABIC LIGATURE JEEM WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 062C 0649;;;;N;;;;;
-FD1E;ARABIC LIGATURE JEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 062C 064A;;;;N;;;;;
-FD1F;ARABIC LIGATURE KHAH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 062E 0649;;;;N;;;;;
-FD20;ARABIC LIGATURE KHAH WITH YEH FINAL FORM;Lo;0;AL;<final> 062E 064A;;;;N;;;;;
-FD21;ARABIC LIGATURE SAD WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0635 0649;;;;N;;;;;
-FD22;ARABIC LIGATURE SAD WITH YEH FINAL FORM;Lo;0;AL;<final> 0635 064A;;;;N;;;;;
-FD23;ARABIC LIGATURE DAD WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0636 0649;;;;N;;;;;
-FD24;ARABIC LIGATURE DAD WITH YEH FINAL FORM;Lo;0;AL;<final> 0636 064A;;;;N;;;;;
-FD25;ARABIC LIGATURE SHEEN WITH JEEM FINAL FORM;Lo;0;AL;<final> 0634 062C;;;;N;;;;;
-FD26;ARABIC LIGATURE SHEEN WITH HAH FINAL FORM;Lo;0;AL;<final> 0634 062D;;;;N;;;;;
-FD27;ARABIC LIGATURE SHEEN WITH KHAH FINAL FORM;Lo;0;AL;<final> 0634 062E;;;;N;;;;;
-FD28;ARABIC LIGATURE SHEEN WITH MEEM FINAL FORM;Lo;0;AL;<final> 0634 0645;;;;N;;;;;
-FD29;ARABIC LIGATURE SHEEN WITH REH FINAL FORM;Lo;0;AL;<final> 0634 0631;;;;N;;;;;
-FD2A;ARABIC LIGATURE SEEN WITH REH FINAL FORM;Lo;0;AL;<final> 0633 0631;;;;N;;;;;
-FD2B;ARABIC LIGATURE SAD WITH REH FINAL FORM;Lo;0;AL;<final> 0635 0631;;;;N;;;;;
-FD2C;ARABIC LIGATURE DAD WITH REH FINAL FORM;Lo;0;AL;<final> 0636 0631;;;;N;;;;;
-FD2D;ARABIC LIGATURE SHEEN WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0634 062C;;;;N;;;;;
-FD2E;ARABIC LIGATURE SHEEN WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0634 062D;;;;N;;;;;
-FD2F;ARABIC LIGATURE SHEEN WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 0634 062E;;;;N;;;;;
-FD30;ARABIC LIGATURE SHEEN WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0634 0645;;;;N;;;;;
-FD31;ARABIC LIGATURE SEEN WITH HEH INITIAL FORM;Lo;0;AL;<initial> 0633 0647;;;;N;;;;;
-FD32;ARABIC LIGATURE SHEEN WITH HEH INITIAL FORM;Lo;0;AL;<initial> 0634 0647;;;;N;;;;;
-FD33;ARABIC LIGATURE TAH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0637 0645;;;;N;;;;;
-FD34;ARABIC LIGATURE SEEN WITH JEEM MEDIAL FORM;Lo;0;AL;<medial> 0633 062C;;;;N;;;;;
-FD35;ARABIC LIGATURE SEEN WITH HAH MEDIAL FORM;Lo;0;AL;<medial> 0633 062D;;;;N;;;;;
-FD36;ARABIC LIGATURE SEEN WITH KHAH MEDIAL FORM;Lo;0;AL;<medial> 0633 062E;;;;N;;;;;
-FD37;ARABIC LIGATURE SHEEN WITH JEEM MEDIAL FORM;Lo;0;AL;<medial> 0634 062C;;;;N;;;;;
-FD38;ARABIC LIGATURE SHEEN WITH HAH MEDIAL FORM;Lo;0;AL;<medial> 0634 062D;;;;N;;;;;
-FD39;ARABIC LIGATURE SHEEN WITH KHAH MEDIAL FORM;Lo;0;AL;<medial> 0634 062E;;;;N;;;;;
-FD3A;ARABIC LIGATURE TAH WITH MEEM MEDIAL FORM;Lo;0;AL;<medial> 0637 0645;;;;N;;;;;
-FD3B;ARABIC LIGATURE ZAH WITH MEEM MEDIAL FORM;Lo;0;AL;<medial> 0638 0645;;;;N;;;;;
-FD3C;ARABIC LIGATURE ALEF WITH FATHATAN FINAL FORM;Lo;0;AL;<final> 0627 064B;;;;N;;;;;
-FD3D;ARABIC LIGATURE ALEF WITH FATHATAN ISOLATED FORM;Lo;0;AL;<isolated> 0627 064B;;;;N;;;;;
-FD3E;ORNATE LEFT PARENTHESIS;Ps;0;ON;;;;;N;;;;;
-FD3F;ORNATE RIGHT PARENTHESIS;Pe;0;ON;;;;;N;;;;;
-FD50;ARABIC LIGATURE TEH WITH JEEM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 062A 062C 0645;;;;N;;;;;
-FD51;ARABIC LIGATURE TEH WITH HAH WITH JEEM FINAL FORM;Lo;0;AL;<final> 062A 062D 062C;;;;N;;;;;
-FD52;ARABIC LIGATURE TEH WITH HAH WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 062A 062D 062C;;;;N;;;;;
-FD53;ARABIC LIGATURE TEH WITH HAH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 062A 062D 0645;;;;N;;;;;
-FD54;ARABIC LIGATURE TEH WITH KHAH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 062A 062E 0645;;;;N;;;;;
-FD55;ARABIC LIGATURE TEH WITH MEEM WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 062A 0645 062C;;;;N;;;;;
-FD56;ARABIC LIGATURE TEH WITH MEEM WITH HAH INITIAL FORM;Lo;0;AL;<initial> 062A 0645 062D;;;;N;;;;;
-FD57;ARABIC LIGATURE TEH WITH MEEM WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 062A 0645 062E;;;;N;;;;;
-FD58;ARABIC LIGATURE JEEM WITH MEEM WITH HAH FINAL FORM;Lo;0;AL;<final> 062C 0645 062D;;;;N;;;;;
-FD59;ARABIC LIGATURE JEEM WITH MEEM WITH HAH INITIAL FORM;Lo;0;AL;<initial> 062C 0645 062D;;;;N;;;;;
-FD5A;ARABIC LIGATURE HAH WITH MEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 062D 0645 064A;;;;N;;;;;
-FD5B;ARABIC LIGATURE HAH WITH MEEM WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 062D 0645 0649;;;;N;;;;;
-FD5C;ARABIC LIGATURE SEEN WITH HAH WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0633 062D 062C;;;;N;;;;;
-FD5D;ARABIC LIGATURE SEEN WITH JEEM WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0633 062C 062D;;;;N;;;;;
-FD5E;ARABIC LIGATURE SEEN WITH JEEM WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0633 062C 0649;;;;N;;;;;
-FD5F;ARABIC LIGATURE SEEN WITH MEEM WITH HAH FINAL FORM;Lo;0;AL;<final> 0633 0645 062D;;;;N;;;;;
-FD60;ARABIC LIGATURE SEEN WITH MEEM WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0633 0645 062D;;;;N;;;;;
-FD61;ARABIC LIGATURE SEEN WITH MEEM WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0633 0645 062C;;;;N;;;;;
-FD62;ARABIC LIGATURE SEEN WITH MEEM WITH MEEM FINAL FORM;Lo;0;AL;<final> 0633 0645 0645;;;;N;;;;;
-FD63;ARABIC LIGATURE SEEN WITH MEEM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0633 0645 0645;;;;N;;;;;
-FD64;ARABIC LIGATURE SAD WITH HAH WITH HAH FINAL FORM;Lo;0;AL;<final> 0635 062D 062D;;;;N;;;;;
-FD65;ARABIC LIGATURE SAD WITH HAH WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0635 062D 062D;;;;N;;;;;
-FD66;ARABIC LIGATURE SAD WITH MEEM WITH MEEM FINAL FORM;Lo;0;AL;<final> 0635 0645 0645;;;;N;;;;;
-FD67;ARABIC LIGATURE SHEEN WITH HAH WITH MEEM FINAL FORM;Lo;0;AL;<final> 0634 062D 0645;;;;N;;;;;
-FD68;ARABIC LIGATURE SHEEN WITH HAH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0634 062D 0645;;;;N;;;;;
-FD69;ARABIC LIGATURE SHEEN WITH JEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 0634 062C 064A;;;;N;;;;;
-FD6A;ARABIC LIGATURE SHEEN WITH MEEM WITH KHAH FINAL FORM;Lo;0;AL;<final> 0634 0645 062E;;;;N;;;;;
-FD6B;ARABIC LIGATURE SHEEN WITH MEEM WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 0634 0645 062E;;;;N;;;;;
-FD6C;ARABIC LIGATURE SHEEN WITH MEEM WITH MEEM FINAL FORM;Lo;0;AL;<final> 0634 0645 0645;;;;N;;;;;
-FD6D;ARABIC LIGATURE SHEEN WITH MEEM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0634 0645 0645;;;;N;;;;;
-FD6E;ARABIC LIGATURE DAD WITH HAH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0636 062D 0649;;;;N;;;;;
-FD6F;ARABIC LIGATURE DAD WITH KHAH WITH MEEM FINAL FORM;Lo;0;AL;<final> 0636 062E 0645;;;;N;;;;;
-FD70;ARABIC LIGATURE DAD WITH KHAH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0636 062E 0645;;;;N;;;;;
-FD71;ARABIC LIGATURE TAH WITH MEEM WITH HAH FINAL FORM;Lo;0;AL;<final> 0637 0645 062D;;;;N;;;;;
-FD72;ARABIC LIGATURE TAH WITH MEEM WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0637 0645 062D;;;;N;;;;;
-FD73;ARABIC LIGATURE TAH WITH MEEM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0637 0645 0645;;;;N;;;;;
-FD74;ARABIC LIGATURE TAH WITH MEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 0637 0645 064A;;;;N;;;;;
-FD75;ARABIC LIGATURE AIN WITH JEEM WITH MEEM FINAL FORM;Lo;0;AL;<final> 0639 062C 0645;;;;N;;;;;
-FD76;ARABIC LIGATURE AIN WITH MEEM WITH MEEM FINAL FORM;Lo;0;AL;<final> 0639 0645 0645;;;;N;;;;;
-FD77;ARABIC LIGATURE AIN WITH MEEM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0639 0645 0645;;;;N;;;;;
-FD78;ARABIC LIGATURE AIN WITH MEEM WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0639 0645 0649;;;;N;;;;;
-FD79;ARABIC LIGATURE GHAIN WITH MEEM WITH MEEM FINAL FORM;Lo;0;AL;<final> 063A 0645 0645;;;;N;;;;;
-FD7A;ARABIC LIGATURE GHAIN WITH MEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 063A 0645 064A;;;;N;;;;;
-FD7B;ARABIC LIGATURE GHAIN WITH MEEM WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 063A 0645 0649;;;;N;;;;;
-FD7C;ARABIC LIGATURE FEH WITH KHAH WITH MEEM FINAL FORM;Lo;0;AL;<final> 0641 062E 0645;;;;N;;;;;
-FD7D;ARABIC LIGATURE FEH WITH KHAH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0641 062E 0645;;;;N;;;;;
-FD7E;ARABIC LIGATURE QAF WITH MEEM WITH HAH FINAL FORM;Lo;0;AL;<final> 0642 0645 062D;;;;N;;;;;
-FD7F;ARABIC LIGATURE QAF WITH MEEM WITH MEEM FINAL FORM;Lo;0;AL;<final> 0642 0645 0645;;;;N;;;;;
-FD80;ARABIC LIGATURE LAM WITH HAH WITH MEEM FINAL FORM;Lo;0;AL;<final> 0644 062D 0645;;;;N;;;;;
-FD81;ARABIC LIGATURE LAM WITH HAH WITH YEH FINAL FORM;Lo;0;AL;<final> 0644 062D 064A;;;;N;;;;;
-FD82;ARABIC LIGATURE LAM WITH HAH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0644 062D 0649;;;;N;;;;;
-FD83;ARABIC LIGATURE LAM WITH JEEM WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0644 062C 062C;;;;N;;;;;
-FD84;ARABIC LIGATURE LAM WITH JEEM WITH JEEM FINAL FORM;Lo;0;AL;<final> 0644 062C 062C;;;;N;;;;;
-FD85;ARABIC LIGATURE LAM WITH KHAH WITH MEEM FINAL FORM;Lo;0;AL;<final> 0644 062E 0645;;;;N;;;;;
-FD86;ARABIC LIGATURE LAM WITH KHAH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0644 062E 0645;;;;N;;;;;
-FD87;ARABIC LIGATURE LAM WITH MEEM WITH HAH FINAL FORM;Lo;0;AL;<final> 0644 0645 062D;;;;N;;;;;
-FD88;ARABIC LIGATURE LAM WITH MEEM WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0644 0645 062D;;;;N;;;;;
-FD89;ARABIC LIGATURE MEEM WITH HAH WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0645 062D 062C;;;;N;;;;;
-FD8A;ARABIC LIGATURE MEEM WITH HAH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0645 062D 0645;;;;N;;;;;
-FD8B;ARABIC LIGATURE MEEM WITH HAH WITH YEH FINAL FORM;Lo;0;AL;<final> 0645 062D 064A;;;;N;;;;;
-FD8C;ARABIC LIGATURE MEEM WITH JEEM WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0645 062C 062D;;;;N;;;;;
-FD8D;ARABIC LIGATURE MEEM WITH JEEM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0645 062C 0645;;;;N;;;;;
-FD8E;ARABIC LIGATURE MEEM WITH KHAH WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0645 062E 062C;;;;N;;;;;
-FD8F;ARABIC LIGATURE MEEM WITH KHAH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0645 062E 0645;;;;N;;;;;
-FD92;ARABIC LIGATURE MEEM WITH JEEM WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 0645 062C 062E;;;;N;;;;;
-FD93;ARABIC LIGATURE HEH WITH MEEM WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0647 0645 062C;;;;N;;;;;
-FD94;ARABIC LIGATURE HEH WITH MEEM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0647 0645 0645;;;;N;;;;;
-FD95;ARABIC LIGATURE NOON WITH HAH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0646 062D 0645;;;;N;;;;;
-FD96;ARABIC LIGATURE NOON WITH HAH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0646 062D 0649;;;;N;;;;;
-FD97;ARABIC LIGATURE NOON WITH JEEM WITH MEEM FINAL FORM;Lo;0;AL;<final> 0646 062C 0645;;;;N;;;;;
-FD98;ARABIC LIGATURE NOON WITH JEEM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0646 062C 0645;;;;N;;;;;
-FD99;ARABIC LIGATURE NOON WITH JEEM WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0646 062C 0649;;;;N;;;;;
-FD9A;ARABIC LIGATURE NOON WITH MEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 0646 0645 064A;;;;N;;;;;
-FD9B;ARABIC LIGATURE NOON WITH MEEM WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0646 0645 0649;;;;N;;;;;
-FD9C;ARABIC LIGATURE YEH WITH MEEM WITH MEEM FINAL FORM;Lo;0;AL;<final> 064A 0645 0645;;;;N;;;;;
-FD9D;ARABIC LIGATURE YEH WITH MEEM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 064A 0645 0645;;;;N;;;;;
-FD9E;ARABIC LIGATURE BEH WITH KHAH WITH YEH FINAL FORM;Lo;0;AL;<final> 0628 062E 064A;;;;N;;;;;
-FD9F;ARABIC LIGATURE TEH WITH JEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 062A 062C 064A;;;;N;;;;;
-FDA0;ARABIC LIGATURE TEH WITH JEEM WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 062A 062C 0649;;;;N;;;;;
-FDA1;ARABIC LIGATURE TEH WITH KHAH WITH YEH FINAL FORM;Lo;0;AL;<final> 062A 062E 064A;;;;N;;;;;
-FDA2;ARABIC LIGATURE TEH WITH KHAH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 062A 062E 0649;;;;N;;;;;
-FDA3;ARABIC LIGATURE TEH WITH MEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 062A 0645 064A;;;;N;;;;;
-FDA4;ARABIC LIGATURE TEH WITH MEEM WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 062A 0645 0649;;;;N;;;;;
-FDA5;ARABIC LIGATURE JEEM WITH MEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 062C 0645 064A;;;;N;;;;;
-FDA6;ARABIC LIGATURE JEEM WITH HAH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 062C 062D 0649;;;;N;;;;;
-FDA7;ARABIC LIGATURE JEEM WITH MEEM WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 062C 0645 0649;;;;N;;;;;
-FDA8;ARABIC LIGATURE SEEN WITH KHAH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0633 062E 0649;;;;N;;;;;
-FDA9;ARABIC LIGATURE SAD WITH HAH WITH YEH FINAL FORM;Lo;0;AL;<final> 0635 062D 064A;;;;N;;;;;
-FDAA;ARABIC LIGATURE SHEEN WITH HAH WITH YEH FINAL FORM;Lo;0;AL;<final> 0634 062D 064A;;;;N;;;;;
-FDAB;ARABIC LIGATURE DAD WITH HAH WITH YEH FINAL FORM;Lo;0;AL;<final> 0636 062D 064A;;;;N;;;;;
-FDAC;ARABIC LIGATURE LAM WITH JEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 0644 062C 064A;;;;N;;;;;
-FDAD;ARABIC LIGATURE LAM WITH MEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 0644 0645 064A;;;;N;;;;;
-FDAE;ARABIC LIGATURE YEH WITH HAH WITH YEH FINAL FORM;Lo;0;AL;<final> 064A 062D 064A;;;;N;;;;;
-FDAF;ARABIC LIGATURE YEH WITH JEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 064A 062C 064A;;;;N;;;;;
-FDB0;ARABIC LIGATURE YEH WITH MEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 064A 0645 064A;;;;N;;;;;
-FDB1;ARABIC LIGATURE MEEM WITH MEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 0645 0645 064A;;;;N;;;;;
-FDB2;ARABIC LIGATURE QAF WITH MEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 0642 0645 064A;;;;N;;;;;
-FDB3;ARABIC LIGATURE NOON WITH HAH WITH YEH FINAL FORM;Lo;0;AL;<final> 0646 062D 064A;;;;N;;;;;
-FDB4;ARABIC LIGATURE QAF WITH MEEM WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0642 0645 062D;;;;N;;;;;
-FDB5;ARABIC LIGATURE LAM WITH HAH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0644 062D 0645;;;;N;;;;;
-FDB6;ARABIC LIGATURE AIN WITH MEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 0639 0645 064A;;;;N;;;;;
-FDB7;ARABIC LIGATURE KAF WITH MEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 0643 0645 064A;;;;N;;;;;
-FDB8;ARABIC LIGATURE NOON WITH JEEM WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0646 062C 062D;;;;N;;;;;
-FDB9;ARABIC LIGATURE MEEM WITH KHAH WITH YEH FINAL FORM;Lo;0;AL;<final> 0645 062E 064A;;;;N;;;;;
-FDBA;ARABIC LIGATURE LAM WITH JEEM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0644 062C 0645;;;;N;;;;;
-FDBB;ARABIC LIGATURE KAF WITH MEEM WITH MEEM FINAL FORM;Lo;0;AL;<final> 0643 0645 0645;;;;N;;;;;
-FDBC;ARABIC LIGATURE LAM WITH JEEM WITH MEEM FINAL FORM;Lo;0;AL;<final> 0644 062C 0645;;;;N;;;;;
-FDBD;ARABIC LIGATURE NOON WITH JEEM WITH HAH FINAL FORM;Lo;0;AL;<final> 0646 062C 062D;;;;N;;;;;
-FDBE;ARABIC LIGATURE JEEM WITH HAH WITH YEH FINAL FORM;Lo;0;AL;<final> 062C 062D 064A;;;;N;;;;;
-FDBF;ARABIC LIGATURE HAH WITH JEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 062D 062C 064A;;;;N;;;;;
-FDC0;ARABIC LIGATURE MEEM WITH JEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 0645 062C 064A;;;;N;;;;;
-FDC1;ARABIC LIGATURE FEH WITH MEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 0641 0645 064A;;;;N;;;;;
-FDC2;ARABIC LIGATURE BEH WITH HAH WITH YEH FINAL FORM;Lo;0;AL;<final> 0628 062D 064A;;;;N;;;;;
-FDC3;ARABIC LIGATURE KAF WITH MEEM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0643 0645 0645;;;;N;;;;;
-FDC4;ARABIC LIGATURE AIN WITH JEEM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0639 062C 0645;;;;N;;;;;
-FDC5;ARABIC LIGATURE SAD WITH MEEM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0635 0645 0645;;;;N;;;;;
-FDC6;ARABIC LIGATURE SEEN WITH KHAH WITH YEH FINAL FORM;Lo;0;AL;<final> 0633 062E 064A;;;;N;;;;;
-FDC7;ARABIC LIGATURE NOON WITH JEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 0646 062C 064A;;;;N;;;;;
-FDF0;ARABIC LIGATURE SALLA USED AS KORANIC STOP SIGN ISOLATED FORM;Lo;0;AL;<isolated> 0635 0644 06D2;;;;N;;;;;
-FDF1;ARABIC LIGATURE QALA USED AS KORANIC STOP SIGN ISOLATED FORM;Lo;0;AL;<isolated> 0642 0644 06D2;;;;N;;;;;
-FDF2;ARABIC LIGATURE ALLAH ISOLATED FORM;Lo;0;AL;<isolated> 0627 0644 0644 0647;;;;N;;;;;
-FDF3;ARABIC LIGATURE AKBAR ISOLATED FORM;Lo;0;AL;<isolated> 0627 0643 0628 0631;;;;N;;;;;
-FDF4;ARABIC LIGATURE MOHAMMAD ISOLATED FORM;Lo;0;AL;<isolated> 0645 062D 0645 062F;;;;N;;;;;
-FDF5;ARABIC LIGATURE SALAM ISOLATED FORM;Lo;0;AL;<isolated> 0635 0644 0639 0645;;;;N;;;;;
-FDF6;ARABIC LIGATURE RASOUL ISOLATED FORM;Lo;0;AL;<isolated> 0631 0633 0648 0644;;;;N;;;;;
-FDF7;ARABIC LIGATURE ALAYHE ISOLATED FORM;Lo;0;AL;<isolated> 0639 0644 064A 0647;;;;N;;;;;
-FDF8;ARABIC LIGATURE WASALLAM ISOLATED FORM;Lo;0;AL;<isolated> 0648 0633 0644 0645;;;;N;;;;;
-FDF9;ARABIC LIGATURE SALLA ISOLATED FORM;Lo;0;AL;<isolated> 0635 0644 0649;;;;N;;;;;
-FDFA;ARABIC LIGATURE SALLALLAHOU ALAYHE WASALLAM;Lo;0;AL;<isolated> 0635 0644 0649 0020 0627 0644 0644 0647 0020 0639 0644 064A 0647 0020 0648 0633 0644 0645;;;;N;ARABIC LETTER SALLALLAHOU ALAYHE WASALLAM;;;;
-FDFB;ARABIC LIGATURE JALLAJALALOUHOU;Lo;0;AL;<isolated> 062C 0644 0020 062C 0644 0627 0644 0647;;;;N;ARABIC LETTER JALLAJALALOUHOU;;;;
-FDFC;RIAL SIGN;Sc;0;AL;<isolated> 0631 06CC 0627 0644;;;;N;;;;;
-FDFD;ARABIC LIGATURE BISMILLAH AR-RAHMAN AR-RAHEEM;So;0;ON;;;;;N;;;;;
-FE00;VARIATION SELECTOR-1;Mn;0;NSM;;;;;N;;;;;
-FE01;VARIATION SELECTOR-2;Mn;0;NSM;;;;;N;;;;;
-FE02;VARIATION SELECTOR-3;Mn;0;NSM;;;;;N;;;;;
-FE03;VARIATION SELECTOR-4;Mn;0;NSM;;;;;N;;;;;
-FE04;VARIATION SELECTOR-5;Mn;0;NSM;;;;;N;;;;;
-FE05;VARIATION SELECTOR-6;Mn;0;NSM;;;;;N;;;;;
-FE06;VARIATION SELECTOR-7;Mn;0;NSM;;;;;N;;;;;
-FE07;VARIATION SELECTOR-8;Mn;0;NSM;;;;;N;;;;;
-FE08;VARIATION SELECTOR-9;Mn;0;NSM;;;;;N;;;;;
-FE09;VARIATION SELECTOR-10;Mn;0;NSM;;;;;N;;;;;
-FE0A;VARIATION SELECTOR-11;Mn;0;NSM;;;;;N;;;;;
-FE0B;VARIATION SELECTOR-12;Mn;0;NSM;;;;;N;;;;;
-FE0C;VARIATION SELECTOR-13;Mn;0;NSM;;;;;N;;;;;
-FE0D;VARIATION SELECTOR-14;Mn;0;NSM;;;;;N;;;;;
-FE0E;VARIATION SELECTOR-15;Mn;0;NSM;;;;;N;;;;;
-FE0F;VARIATION SELECTOR-16;Mn;0;NSM;;;;;N;;;;;
-FE10;PRESENTATION FORM FOR VERTICAL COMMA;Po;0;ON;<vertical> 002C;;;;N;;;;;
-FE11;PRESENTATION FORM FOR VERTICAL IDEOGRAPHIC COMMA;Po;0;ON;<vertical> 3001;;;;N;;;;;
-FE12;PRESENTATION FORM FOR VERTICAL IDEOGRAPHIC FULL STOP;Po;0;ON;<vertical> 3002;;;;N;;;;;
-FE13;PRESENTATION FORM FOR VERTICAL COLON;Po;0;ON;<vertical> 003A;;;;N;;;;;
-FE14;PRESENTATION FORM FOR VERTICAL SEMICOLON;Po;0;ON;<vertical> 003B;;;;N;;;;;
-FE15;PRESENTATION FORM FOR VERTICAL EXCLAMATION MARK;Po;0;ON;<vertical> 0021;;;;N;;;;;
-FE16;PRESENTATION FORM FOR VERTICAL QUESTION MARK;Po;0;ON;<vertical> 003F;;;;N;;;;;
-FE17;PRESENTATION FORM FOR VERTICAL LEFT WHITE LENTICULAR BRACKET;Ps;0;ON;<vertical> 3016;;;;N;;;;;
-FE18;PRESENTATION FORM FOR VERTICAL RIGHT WHITE LENTICULAR BRAKCET;Pe;0;ON;<vertical> 3017;;;;N;;;;;
-FE19;PRESENTATION FORM FOR VERTICAL HORIZONTAL ELLIPSIS;Po;0;ON;<vertical> 2026;;;;N;;;;;
-FE20;COMBINING LIGATURE LEFT HALF;Mn;230;NSM;;;;;N;;;;;
-FE21;COMBINING LIGATURE RIGHT HALF;Mn;230;NSM;;;;;N;;;;;
-FE22;COMBINING DOUBLE TILDE LEFT HALF;Mn;230;NSM;;;;;N;;;;;
-FE23;COMBINING DOUBLE TILDE RIGHT HALF;Mn;230;NSM;;;;;N;;;;;
-FE24;COMBINING MACRON LEFT HALF;Mn;230;NSM;;;;;N;;;;;
-FE25;COMBINING MACRON RIGHT HALF;Mn;230;NSM;;;;;N;;;;;
-FE26;COMBINING CONJOINING MACRON;Mn;230;NSM;;;;;N;;;;;
-FE30;PRESENTATION FORM FOR VERTICAL TWO DOT LEADER;Po;0;ON;<vertical> 2025;;;;N;GLYPH FOR VERTICAL TWO DOT LEADER;;;;
-FE31;PRESENTATION FORM FOR VERTICAL EM DASH;Pd;0;ON;<vertical> 2014;;;;N;GLYPH FOR VERTICAL EM DASH;;;;
-FE32;PRESENTATION FORM FOR VERTICAL EN DASH;Pd;0;ON;<vertical> 2013;;;;N;GLYPH FOR VERTICAL EN DASH;;;;
-FE33;PRESENTATION FORM FOR VERTICAL LOW LINE;Pc;0;ON;<vertical> 005F;;;;N;GLYPH FOR VERTICAL SPACING UNDERSCORE;;;;
-FE34;PRESENTATION FORM FOR VERTICAL WAVY LOW LINE;Pc;0;ON;<vertical> 005F;;;;N;GLYPH FOR VERTICAL SPACING WAVY UNDERSCORE;;;;
-FE35;PRESENTATION FORM FOR VERTICAL LEFT PARENTHESIS;Ps;0;ON;<vertical> 0028;;;;N;GLYPH FOR VERTICAL OPENING PARENTHESIS;;;;
-FE36;PRESENTATION FORM FOR VERTICAL RIGHT PARENTHESIS;Pe;0;ON;<vertical> 0029;;;;N;GLYPH FOR VERTICAL CLOSING PARENTHESIS;;;;
-FE37;PRESENTATION FORM FOR VERTICAL LEFT CURLY BRACKET;Ps;0;ON;<vertical> 007B;;;;N;GLYPH FOR VERTICAL OPENING CURLY BRACKET;;;;
-FE38;PRESENTATION FORM FOR VERTICAL RIGHT CURLY BRACKET;Pe;0;ON;<vertical> 007D;;;;N;GLYPH FOR VERTICAL CLOSING CURLY BRACKET;;;;
-FE39;PRESENTATION FORM FOR VERTICAL LEFT TORTOISE SHELL BRACKET;Ps;0;ON;<vertical> 3014;;;;N;GLYPH FOR VERTICAL OPENING TORTOISE SHELL BRACKET;;;;
-FE3A;PRESENTATION FORM FOR VERTICAL RIGHT TORTOISE SHELL BRACKET;Pe;0;ON;<vertical> 3015;;;;N;GLYPH FOR VERTICAL CLOSING TORTOISE SHELL BRACKET;;;;
-FE3B;PRESENTATION FORM FOR VERTICAL LEFT BLACK LENTICULAR BRACKET;Ps;0;ON;<vertical> 3010;;;;N;GLYPH FOR VERTICAL OPENING BLACK LENTICULAR BRACKET;;;;
-FE3C;PRESENTATION FORM FOR VERTICAL RIGHT BLACK LENTICULAR BRACKET;Pe;0;ON;<vertical> 3011;;;;N;GLYPH FOR VERTICAL CLOSING BLACK LENTICULAR BRACKET;;;;
-FE3D;PRESENTATION FORM FOR VERTICAL LEFT DOUBLE ANGLE BRACKET;Ps;0;ON;<vertical> 300A;;;;N;GLYPH FOR VERTICAL OPENING DOUBLE ANGLE BRACKET;;;;
-FE3E;PRESENTATION FORM FOR VERTICAL RIGHT DOUBLE ANGLE BRACKET;Pe;0;ON;<vertical> 300B;;;;N;GLYPH FOR VERTICAL CLOSING DOUBLE ANGLE BRACKET;;;;
-FE3F;PRESENTATION FORM FOR VERTICAL LEFT ANGLE BRACKET;Ps;0;ON;<vertical> 3008;;;;N;GLYPH FOR VERTICAL OPENING ANGLE BRACKET;;;;
-FE40;PRESENTATION FORM FOR VERTICAL RIGHT ANGLE BRACKET;Pe;0;ON;<vertical> 3009;;;;N;GLYPH FOR VERTICAL CLOSING ANGLE BRACKET;;;;
-FE41;PRESENTATION FORM FOR VERTICAL LEFT CORNER BRACKET;Ps;0;ON;<vertical> 300C;;;;N;GLYPH FOR VERTICAL OPENING CORNER BRACKET;;;;
-FE42;PRESENTATION FORM FOR VERTICAL RIGHT CORNER BRACKET;Pe;0;ON;<vertical> 300D;;;;N;GLYPH FOR VERTICAL CLOSING CORNER BRACKET;;;;
-FE43;PRESENTATION FORM FOR VERTICAL LEFT WHITE CORNER BRACKET;Ps;0;ON;<vertical> 300E;;;;N;GLYPH FOR VERTICAL OPENING WHITE CORNER BRACKET;;;;
-FE44;PRESENTATION FORM FOR VERTICAL RIGHT WHITE CORNER BRACKET;Pe;0;ON;<vertical> 300F;;;;N;GLYPH FOR VERTICAL CLOSING WHITE CORNER BRACKET;;;;
-FE45;SESAME DOT;Po;0;ON;;;;;N;;;;;
-FE46;WHITE SESAME DOT;Po;0;ON;;;;;N;;;;;
-FE47;PRESENTATION FORM FOR VERTICAL LEFT SQUARE BRACKET;Ps;0;ON;<vertical> 005B;;;;N;;;;;
-FE48;PRESENTATION FORM FOR VERTICAL RIGHT SQUARE BRACKET;Pe;0;ON;<vertical> 005D;;;;N;;;;;
-FE49;DASHED OVERLINE;Po;0;ON;<compat> 203E;;;;N;SPACING DASHED OVERSCORE;;;;
-FE4A;CENTRELINE OVERLINE;Po;0;ON;<compat> 203E;;;;N;SPACING CENTERLINE OVERSCORE;;;;
-FE4B;WAVY OVERLINE;Po;0;ON;<compat> 203E;;;;N;SPACING WAVY OVERSCORE;;;;
-FE4C;DOUBLE WAVY OVERLINE;Po;0;ON;<compat> 203E;;;;N;SPACING DOUBLE WAVY OVERSCORE;;;;
-FE4D;DASHED LOW LINE;Pc;0;ON;<compat> 005F;;;;N;SPACING DASHED UNDERSCORE;;;;
-FE4E;CENTRELINE LOW LINE;Pc;0;ON;<compat> 005F;;;;N;SPACING CENTERLINE UNDERSCORE;;;;
-FE4F;WAVY LOW LINE;Pc;0;ON;<compat> 005F;;;;N;SPACING WAVY UNDERSCORE;;;;
-FE50;SMALL COMMA;Po;0;CS;<small> 002C;;;;N;;;;;
-FE51;SMALL IDEOGRAPHIC COMMA;Po;0;ON;<small> 3001;;;;N;;;;;
-FE52;SMALL FULL STOP;Po;0;CS;<small> 002E;;;;N;SMALL PERIOD;;;;
-FE54;SMALL SEMICOLON;Po;0;ON;<small> 003B;;;;N;;;;;
-FE55;SMALL COLON;Po;0;CS;<small> 003A;;;;N;;;;;
-FE56;SMALL QUESTION MARK;Po;0;ON;<small> 003F;;;;N;;;;;
-FE57;SMALL EXCLAMATION MARK;Po;0;ON;<small> 0021;;;;N;;;;;
-FE58;SMALL EM DASH;Pd;0;ON;<small> 2014;;;;N;;;;;
-FE59;SMALL LEFT PARENTHESIS;Ps;0;ON;<small> 0028;;;;Y;SMALL OPENING PARENTHESIS;;;;
-FE5A;SMALL RIGHT PARENTHESIS;Pe;0;ON;<small> 0029;;;;Y;SMALL CLOSING PARENTHESIS;;;;
-FE5B;SMALL LEFT CURLY BRACKET;Ps;0;ON;<small> 007B;;;;Y;SMALL OPENING CURLY BRACKET;;;;
-FE5C;SMALL RIGHT CURLY BRACKET;Pe;0;ON;<small> 007D;;;;Y;SMALL CLOSING CURLY BRACKET;;;;
-FE5D;SMALL LEFT TORTOISE SHELL BRACKET;Ps;0;ON;<small> 3014;;;;Y;SMALL OPENING TORTOISE SHELL BRACKET;;;;
-FE5E;SMALL RIGHT TORTOISE SHELL BRACKET;Pe;0;ON;<small> 3015;;;;Y;SMALL CLOSING TORTOISE SHELL BRACKET;;;;
-FE5F;SMALL NUMBER SIGN;Po;0;ET;<small> 0023;;;;N;;;;;
-FE60;SMALL AMPERSAND;Po;0;ON;<small> 0026;;;;N;;;;;
-FE61;SMALL ASTERISK;Po;0;ON;<small> 002A;;;;N;;;;;
-FE62;SMALL PLUS SIGN;Sm;0;ES;<small> 002B;;;;N;;;;;
-FE63;SMALL HYPHEN-MINUS;Pd;0;ES;<small> 002D;;;;N;;;;;
-FE64;SMALL LESS-THAN SIGN;Sm;0;ON;<small> 003C;;;;Y;;;;;
-FE65;SMALL GREATER-THAN SIGN;Sm;0;ON;<small> 003E;;;;Y;;;;;
-FE66;SMALL EQUALS SIGN;Sm;0;ON;<small> 003D;;;;N;;;;;
-FE68;SMALL REVERSE SOLIDUS;Po;0;ON;<small> 005C;;;;N;SMALL BACKSLASH;;;;
-FE69;SMALL DOLLAR SIGN;Sc;0;ET;<small> 0024;;;;N;;;;;
-FE6A;SMALL PERCENT SIGN;Po;0;ET;<small> 0025;;;;N;;;;;
-FE6B;SMALL COMMERCIAL AT;Po;0;ON;<small> 0040;;;;N;;;;;
-FE70;ARABIC FATHATAN ISOLATED FORM;Lo;0;AL;<isolated> 0020 064B;;;;N;ARABIC SPACING FATHATAN;;;;
-FE71;ARABIC TATWEEL WITH FATHATAN ABOVE;Lo;0;AL;<medial> 0640 064B;;;;N;ARABIC FATHATAN ON TATWEEL;;;;
-FE72;ARABIC DAMMATAN ISOLATED FORM;Lo;0;AL;<isolated> 0020 064C;;;;N;ARABIC SPACING DAMMATAN;;;;
-FE73;ARABIC TAIL FRAGMENT;Lo;0;AL;;;;;N;;;;;
-FE74;ARABIC KASRATAN ISOLATED FORM;Lo;0;AL;<isolated> 0020 064D;;;;N;ARABIC SPACING KASRATAN;;;;
-FE76;ARABIC FATHA ISOLATED FORM;Lo;0;AL;<isolated> 0020 064E;;;;N;ARABIC SPACING FATHAH;;;;
-FE77;ARABIC FATHA MEDIAL FORM;Lo;0;AL;<medial> 0640 064E;;;;N;ARABIC FATHAH ON TATWEEL;;;;
-FE78;ARABIC DAMMA ISOLATED FORM;Lo;0;AL;<isolated> 0020 064F;;;;N;ARABIC SPACING DAMMAH;;;;
-FE79;ARABIC DAMMA MEDIAL FORM;Lo;0;AL;<medial> 0640 064F;;;;N;ARABIC DAMMAH ON TATWEEL;;;;
-FE7A;ARABIC KASRA ISOLATED FORM;Lo;0;AL;<isolated> 0020 0650;;;;N;ARABIC SPACING KASRAH;;;;
-FE7B;ARABIC KASRA MEDIAL FORM;Lo;0;AL;<medial> 0640 0650;;;;N;ARABIC KASRAH ON TATWEEL;;;;
-FE7C;ARABIC SHADDA ISOLATED FORM;Lo;0;AL;<isolated> 0020 0651;;;;N;ARABIC SPACING SHADDAH;;;;
-FE7D;ARABIC SHADDA MEDIAL FORM;Lo;0;AL;<medial> 0640 0651;;;;N;ARABIC SHADDAH ON TATWEEL;;;;
-FE7E;ARABIC SUKUN ISOLATED FORM;Lo;0;AL;<isolated> 0020 0652;;;;N;ARABIC SPACING SUKUN;;;;
-FE7F;ARABIC SUKUN MEDIAL FORM;Lo;0;AL;<medial> 0640 0652;;;;N;ARABIC SUKUN ON TATWEEL;;;;
-FE80;ARABIC LETTER HAMZA ISOLATED FORM;Lo;0;AL;<isolated> 0621;;;;N;GLYPH FOR ISOLATE ARABIC HAMZAH;;;;
-FE81;ARABIC LETTER ALEF WITH MADDA ABOVE ISOLATED FORM;Lo;0;AL;<isolated> 0622;;;;N;GLYPH FOR ISOLATE ARABIC MADDAH ON ALEF;;;;
-FE82;ARABIC LETTER ALEF WITH MADDA ABOVE FINAL FORM;Lo;0;AL;<final> 0622;;;;N;GLYPH FOR FINAL ARABIC MADDAH ON ALEF;;;;
-FE83;ARABIC LETTER ALEF WITH HAMZA ABOVE ISOLATED FORM;Lo;0;AL;<isolated> 0623;;;;N;GLYPH FOR ISOLATE ARABIC HAMZAH ON ALEF;;;;
-FE84;ARABIC LETTER ALEF WITH HAMZA ABOVE FINAL FORM;Lo;0;AL;<final> 0623;;;;N;GLYPH FOR FINAL ARABIC HAMZAH ON ALEF;;;;
-FE85;ARABIC LETTER WAW WITH HAMZA ABOVE ISOLATED FORM;Lo;0;AL;<isolated> 0624;;;;N;GLYPH FOR ISOLATE ARABIC HAMZAH ON WAW;;;;
-FE86;ARABIC LETTER WAW WITH HAMZA ABOVE FINAL FORM;Lo;0;AL;<final> 0624;;;;N;GLYPH FOR FINAL ARABIC HAMZAH ON WAW;;;;
-FE87;ARABIC LETTER ALEF WITH HAMZA BELOW ISOLATED FORM;Lo;0;AL;<isolated> 0625;;;;N;GLYPH FOR ISOLATE ARABIC HAMZAH UNDER ALEF;;;;
-FE88;ARABIC LETTER ALEF WITH HAMZA BELOW FINAL FORM;Lo;0;AL;<final> 0625;;;;N;GLYPH FOR FINAL ARABIC HAMZAH UNDER ALEF;;;;
-FE89;ARABIC LETTER YEH WITH HAMZA ABOVE ISOLATED FORM;Lo;0;AL;<isolated> 0626;;;;N;GLYPH FOR ISOLATE ARABIC HAMZAH ON YA;;;;
-FE8A;ARABIC LETTER YEH WITH HAMZA ABOVE FINAL FORM;Lo;0;AL;<final> 0626;;;;N;GLYPH FOR FINAL ARABIC HAMZAH ON YA;;;;
-FE8B;ARABIC LETTER YEH WITH HAMZA ABOVE INITIAL FORM;Lo;0;AL;<initial> 0626;;;;N;GLYPH FOR INITIAL ARABIC HAMZAH ON YA;;;;
-FE8C;ARABIC LETTER YEH WITH HAMZA ABOVE MEDIAL FORM;Lo;0;AL;<medial> 0626;;;;N;GLYPH FOR MEDIAL ARABIC HAMZAH ON YA;;;;
-FE8D;ARABIC LETTER ALEF ISOLATED FORM;Lo;0;AL;<isolated> 0627;;;;N;GLYPH FOR ISOLATE ARABIC ALEF;;;;
-FE8E;ARABIC LETTER ALEF FINAL FORM;Lo;0;AL;<final> 0627;;;;N;GLYPH FOR FINAL ARABIC ALEF;;;;
-FE8F;ARABIC LETTER BEH ISOLATED FORM;Lo;0;AL;<isolated> 0628;;;;N;GLYPH FOR ISOLATE ARABIC BAA;;;;
-FE90;ARABIC LETTER BEH FINAL FORM;Lo;0;AL;<final> 0628;;;;N;GLYPH FOR FINAL ARABIC BAA;;;;
-FE91;ARABIC LETTER BEH INITIAL FORM;Lo;0;AL;<initial> 0628;;;;N;GLYPH FOR INITIAL ARABIC BAA;;;;
-FE92;ARABIC LETTER BEH MEDIAL FORM;Lo;0;AL;<medial> 0628;;;;N;GLYPH FOR MEDIAL ARABIC BAA;;;;
-FE93;ARABIC LETTER TEH MARBUTA ISOLATED FORM;Lo;0;AL;<isolated> 0629;;;;N;GLYPH FOR ISOLATE ARABIC TAA MARBUTAH;;;;
-FE94;ARABIC LETTER TEH MARBUTA FINAL FORM;Lo;0;AL;<final> 0629;;;;N;GLYPH FOR FINAL ARABIC TAA MARBUTAH;;;;
-FE95;ARABIC LETTER TEH ISOLATED FORM;Lo;0;AL;<isolated> 062A;;;;N;GLYPH FOR ISOLATE ARABIC TAA;;;;
-FE96;ARABIC LETTER TEH FINAL FORM;Lo;0;AL;<final> 062A;;;;N;GLYPH FOR FINAL ARABIC TAA;;;;
-FE97;ARABIC LETTER TEH INITIAL FORM;Lo;0;AL;<initial> 062A;;;;N;GLYPH FOR INITIAL ARABIC TAA;;;;
-FE98;ARABIC LETTER TEH MEDIAL FORM;Lo;0;AL;<medial> 062A;;;;N;GLYPH FOR MEDIAL ARABIC TAA;;;;
-FE99;ARABIC LETTER THEH ISOLATED FORM;Lo;0;AL;<isolated> 062B;;;;N;GLYPH FOR ISOLATE ARABIC THAA;;;;
-FE9A;ARABIC LETTER THEH FINAL FORM;Lo;0;AL;<final> 062B;;;;N;GLYPH FOR FINAL ARABIC THAA;;;;
-FE9B;ARABIC LETTER THEH INITIAL FORM;Lo;0;AL;<initial> 062B;;;;N;GLYPH FOR INITIAL ARABIC THAA;;;;
-FE9C;ARABIC LETTER THEH MEDIAL FORM;Lo;0;AL;<medial> 062B;;;;N;GLYPH FOR MEDIAL ARABIC THAA;;;;
-FE9D;ARABIC LETTER JEEM ISOLATED FORM;Lo;0;AL;<isolated> 062C;;;;N;GLYPH FOR ISOLATE ARABIC JEEM;;;;
-FE9E;ARABIC LETTER JEEM FINAL FORM;Lo;0;AL;<final> 062C;;;;N;GLYPH FOR FINAL ARABIC JEEM;;;;
-FE9F;ARABIC LETTER JEEM INITIAL FORM;Lo;0;AL;<initial> 062C;;;;N;GLYPH FOR INITIAL ARABIC JEEM;;;;
-FEA0;ARABIC LETTER JEEM MEDIAL FORM;Lo;0;AL;<medial> 062C;;;;N;GLYPH FOR MEDIAL ARABIC JEEM;;;;
-FEA1;ARABIC LETTER HAH ISOLATED FORM;Lo;0;AL;<isolated> 062D;;;;N;GLYPH FOR ISOLATE ARABIC HAA;;;;
-FEA2;ARABIC LETTER HAH FINAL FORM;Lo;0;AL;<final> 062D;;;;N;GLYPH FOR FINAL ARABIC HAA;;;;
-FEA3;ARABIC LETTER HAH INITIAL FORM;Lo;0;AL;<initial> 062D;;;;N;GLYPH FOR INITIAL ARABIC HAA;;;;
-FEA4;ARABIC LETTER HAH MEDIAL FORM;Lo;0;AL;<medial> 062D;;;;N;GLYPH FOR MEDIAL ARABIC HAA;;;;
-FEA5;ARABIC LETTER KHAH ISOLATED FORM;Lo;0;AL;<isolated> 062E;;;;N;GLYPH FOR ISOLATE ARABIC KHAA;;;;
-FEA6;ARABIC LETTER KHAH FINAL FORM;Lo;0;AL;<final> 062E;;;;N;GLYPH FOR FINAL ARABIC KHAA;;;;
-FEA7;ARABIC LETTER KHAH INITIAL FORM;Lo;0;AL;<initial> 062E;;;;N;GLYPH FOR INITIAL ARABIC KHAA;;;;
-FEA8;ARABIC LETTER KHAH MEDIAL FORM;Lo;0;AL;<medial> 062E;;;;N;GLYPH FOR MEDIAL ARABIC KHAA;;;;
-FEA9;ARABIC LETTER DAL ISOLATED FORM;Lo;0;AL;<isolated> 062F;;;;N;GLYPH FOR ISOLATE ARABIC DAL;;;;
-FEAA;ARABIC LETTER DAL FINAL FORM;Lo;0;AL;<final> 062F;;;;N;GLYPH FOR FINAL ARABIC DAL;;;;
-FEAB;ARABIC LETTER THAL ISOLATED FORM;Lo;0;AL;<isolated> 0630;;;;N;GLYPH FOR ISOLATE ARABIC THAL;;;;
-FEAC;ARABIC LETTER THAL FINAL FORM;Lo;0;AL;<final> 0630;;;;N;GLYPH FOR FINAL ARABIC THAL;;;;
-FEAD;ARABIC LETTER REH ISOLATED FORM;Lo;0;AL;<isolated> 0631;;;;N;GLYPH FOR ISOLATE ARABIC RA;;;;
-FEAE;ARABIC LETTER REH FINAL FORM;Lo;0;AL;<final> 0631;;;;N;GLYPH FOR FINAL ARABIC RA;;;;
-FEAF;ARABIC LETTER ZAIN ISOLATED FORM;Lo;0;AL;<isolated> 0632;;;;N;GLYPH FOR ISOLATE ARABIC ZAIN;;;;
-FEB0;ARABIC LETTER ZAIN FINAL FORM;Lo;0;AL;<final> 0632;;;;N;GLYPH FOR FINAL ARABIC ZAIN;;;;
-FEB1;ARABIC LETTER SEEN ISOLATED FORM;Lo;0;AL;<isolated> 0633;;;;N;GLYPH FOR ISOLATE ARABIC SEEN;;;;
-FEB2;ARABIC LETTER SEEN FINAL FORM;Lo;0;AL;<final> 0633;;;;N;GLYPH FOR FINAL ARABIC SEEN;;;;
-FEB3;ARABIC LETTER SEEN INITIAL FORM;Lo;0;AL;<initial> 0633;;;;N;GLYPH FOR INITIAL ARABIC SEEN;;;;
-FEB4;ARABIC LETTER SEEN MEDIAL FORM;Lo;0;AL;<medial> 0633;;;;N;GLYPH FOR MEDIAL ARABIC SEEN;;;;
-FEB5;ARABIC LETTER SHEEN ISOLATED FORM;Lo;0;AL;<isolated> 0634;;;;N;GLYPH FOR ISOLATE ARABIC SHEEN;;;;
-FEB6;ARABIC LETTER SHEEN FINAL FORM;Lo;0;AL;<final> 0634;;;;N;GLYPH FOR FINAL ARABIC SHEEN;;;;
-FEB7;ARABIC LETTER SHEEN INITIAL FORM;Lo;0;AL;<initial> 0634;;;;N;GLYPH FOR INITIAL ARABIC SHEEN;;;;
-FEB8;ARABIC LETTER SHEEN MEDIAL FORM;Lo;0;AL;<medial> 0634;;;;N;GLYPH FOR MEDIAL ARABIC SHEEN;;;;
-FEB9;ARABIC LETTER SAD ISOLATED FORM;Lo;0;AL;<isolated> 0635;;;;N;GLYPH FOR ISOLATE ARABIC SAD;;;;
-FEBA;ARABIC LETTER SAD FINAL FORM;Lo;0;AL;<final> 0635;;;;N;GLYPH FOR FINAL ARABIC SAD;;;;
-FEBB;ARABIC LETTER SAD INITIAL FORM;Lo;0;AL;<initial> 0635;;;;N;GLYPH FOR INITIAL ARABIC SAD;;;;
-FEBC;ARABIC LETTER SAD MEDIAL FORM;Lo;0;AL;<medial> 0635;;;;N;GLYPH FOR MEDIAL ARABIC SAD;;;;
-FEBD;ARABIC LETTER DAD ISOLATED FORM;Lo;0;AL;<isolated> 0636;;;;N;GLYPH FOR ISOLATE ARABIC DAD;;;;
-FEBE;ARABIC LETTER DAD FINAL FORM;Lo;0;AL;<final> 0636;;;;N;GLYPH FOR FINAL ARABIC DAD;;;;
-FEBF;ARABIC LETTER DAD INITIAL FORM;Lo;0;AL;<initial> 0636;;;;N;GLYPH FOR INITIAL ARABIC DAD;;;;
-FEC0;ARABIC LETTER DAD MEDIAL FORM;Lo;0;AL;<medial> 0636;;;;N;GLYPH FOR MEDIAL ARABIC DAD;;;;
-FEC1;ARABIC LETTER TAH ISOLATED FORM;Lo;0;AL;<isolated> 0637;;;;N;GLYPH FOR ISOLATE ARABIC TAH;;;;
-FEC2;ARABIC LETTER TAH FINAL FORM;Lo;0;AL;<final> 0637;;;;N;GLYPH FOR FINAL ARABIC TAH;;;;
-FEC3;ARABIC LETTER TAH INITIAL FORM;Lo;0;AL;<initial> 0637;;;;N;GLYPH FOR INITIAL ARABIC TAH;;;;
-FEC4;ARABIC LETTER TAH MEDIAL FORM;Lo;0;AL;<medial> 0637;;;;N;GLYPH FOR MEDIAL ARABIC TAH;;;;
-FEC5;ARABIC LETTER ZAH ISOLATED FORM;Lo;0;AL;<isolated> 0638;;;;N;GLYPH FOR ISOLATE ARABIC DHAH;;;;
-FEC6;ARABIC LETTER ZAH FINAL FORM;Lo;0;AL;<final> 0638;;;;N;GLYPH FOR FINAL ARABIC DHAH;;;;
-FEC7;ARABIC LETTER ZAH INITIAL FORM;Lo;0;AL;<initial> 0638;;;;N;GLYPH FOR INITIAL ARABIC DHAH;;;;
-FEC8;ARABIC LETTER ZAH MEDIAL FORM;Lo;0;AL;<medial> 0638;;;;N;GLYPH FOR MEDIAL ARABIC DHAH;;;;
-FEC9;ARABIC LETTER AIN ISOLATED FORM;Lo;0;AL;<isolated> 0639;;;;N;GLYPH FOR ISOLATE ARABIC AIN;;;;
-FECA;ARABIC LETTER AIN FINAL FORM;Lo;0;AL;<final> 0639;;;;N;GLYPH FOR FINAL ARABIC AIN;;;;
-FECB;ARABIC LETTER AIN INITIAL FORM;Lo;0;AL;<initial> 0639;;;;N;GLYPH FOR INITIAL ARABIC AIN;;;;
-FECC;ARABIC LETTER AIN MEDIAL FORM;Lo;0;AL;<medial> 0639;;;;N;GLYPH FOR MEDIAL ARABIC AIN;;;;
-FECD;ARABIC LETTER GHAIN ISOLATED FORM;Lo;0;AL;<isolated> 063A;;;;N;GLYPH FOR ISOLATE ARABIC GHAIN;;;;
-FECE;ARABIC LETTER GHAIN FINAL FORM;Lo;0;AL;<final> 063A;;;;N;GLYPH FOR FINAL ARABIC GHAIN;;;;
-FECF;ARABIC LETTER GHAIN INITIAL FORM;Lo;0;AL;<initial> 063A;;;;N;GLYPH FOR INITIAL ARABIC GHAIN;;;;
-FED0;ARABIC LETTER GHAIN MEDIAL FORM;Lo;0;AL;<medial> 063A;;;;N;GLYPH FOR MEDIAL ARABIC GHAIN;;;;
-FED1;ARABIC LETTER FEH ISOLATED FORM;Lo;0;AL;<isolated> 0641;;;;N;GLYPH FOR ISOLATE ARABIC FA;;;;
-FED2;ARABIC LETTER FEH FINAL FORM;Lo;0;AL;<final> 0641;;;;N;GLYPH FOR FINAL ARABIC FA;;;;
-FED3;ARABIC LETTER FEH INITIAL FORM;Lo;0;AL;<initial> 0641;;;;N;GLYPH FOR INITIAL ARABIC FA;;;;
-FED4;ARABIC LETTER FEH MEDIAL FORM;Lo;0;AL;<medial> 0641;;;;N;GLYPH FOR MEDIAL ARABIC FA;;;;
-FED5;ARABIC LETTER QAF ISOLATED FORM;Lo;0;AL;<isolated> 0642;;;;N;GLYPH FOR ISOLATE ARABIC QAF;;;;
-FED6;ARABIC LETTER QAF FINAL FORM;Lo;0;AL;<final> 0642;;;;N;GLYPH FOR FINAL ARABIC QAF;;;;
-FED7;ARABIC LETTER QAF INITIAL FORM;Lo;0;AL;<initial> 0642;;;;N;GLYPH FOR INITIAL ARABIC QAF;;;;
-FED8;ARABIC LETTER QAF MEDIAL FORM;Lo;0;AL;<medial> 0642;;;;N;GLYPH FOR MEDIAL ARABIC QAF;;;;
-FED9;ARABIC LETTER KAF ISOLATED FORM;Lo;0;AL;<isolated> 0643;;;;N;GLYPH FOR ISOLATE ARABIC CAF;;;;
-FEDA;ARABIC LETTER KAF FINAL FORM;Lo;0;AL;<final> 0643;;;;N;GLYPH FOR FINAL ARABIC CAF;;;;
-FEDB;ARABIC LETTER KAF INITIAL FORM;Lo;0;AL;<initial> 0643;;;;N;GLYPH FOR INITIAL ARABIC CAF;;;;
-FEDC;ARABIC LETTER KAF MEDIAL FORM;Lo;0;AL;<medial> 0643;;;;N;GLYPH FOR MEDIAL ARABIC CAF;;;;
-FEDD;ARABIC LETTER LAM ISOLATED FORM;Lo;0;AL;<isolated> 0644;;;;N;GLYPH FOR ISOLATE ARABIC LAM;;;;
-FEDE;ARABIC LETTER LAM FINAL FORM;Lo;0;AL;<final> 0644;;;;N;GLYPH FOR FINAL ARABIC LAM;;;;
-FEDF;ARABIC LETTER LAM INITIAL FORM;Lo;0;AL;<initial> 0644;;;;N;GLYPH FOR INITIAL ARABIC LAM;;;;
-FEE0;ARABIC LETTER LAM MEDIAL FORM;Lo;0;AL;<medial> 0644;;;;N;GLYPH FOR MEDIAL ARABIC LAM;;;;
-FEE1;ARABIC LETTER MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0645;;;;N;GLYPH FOR ISOLATE ARABIC MEEM;;;;
-FEE2;ARABIC LETTER MEEM FINAL FORM;Lo;0;AL;<final> 0645;;;;N;GLYPH FOR FINAL ARABIC MEEM;;;;
-FEE3;ARABIC LETTER MEEM INITIAL FORM;Lo;0;AL;<initial> 0645;;;;N;GLYPH FOR INITIAL ARABIC MEEM;;;;
-FEE4;ARABIC LETTER MEEM MEDIAL FORM;Lo;0;AL;<medial> 0645;;;;N;GLYPH FOR MEDIAL ARABIC MEEM;;;;
-FEE5;ARABIC LETTER NOON ISOLATED FORM;Lo;0;AL;<isolated> 0646;;;;N;GLYPH FOR ISOLATE ARABIC NOON;;;;
-FEE6;ARABIC LETTER NOON FINAL FORM;Lo;0;AL;<final> 0646;;;;N;GLYPH FOR FINAL ARABIC NOON;;;;
-FEE7;ARABIC LETTER NOON INITIAL FORM;Lo;0;AL;<initial> 0646;;;;N;GLYPH FOR INITIAL ARABIC NOON;;;;
-FEE8;ARABIC LETTER NOON MEDIAL FORM;Lo;0;AL;<medial> 0646;;;;N;GLYPH FOR MEDIAL ARABIC NOON;;;;
-FEE9;ARABIC LETTER HEH ISOLATED FORM;Lo;0;AL;<isolated> 0647;;;;N;GLYPH FOR ISOLATE ARABIC HA;;;;
-FEEA;ARABIC LETTER HEH FINAL FORM;Lo;0;AL;<final> 0647;;;;N;GLYPH FOR FINAL ARABIC HA;;;;
-FEEB;ARABIC LETTER HEH INITIAL FORM;Lo;0;AL;<initial> 0647;;;;N;GLYPH FOR INITIAL ARABIC HA;;;;
-FEEC;ARABIC LETTER HEH MEDIAL FORM;Lo;0;AL;<medial> 0647;;;;N;GLYPH FOR MEDIAL ARABIC HA;;;;
-FEED;ARABIC LETTER WAW ISOLATED FORM;Lo;0;AL;<isolated> 0648;;;;N;GLYPH FOR ISOLATE ARABIC WAW;;;;
-FEEE;ARABIC LETTER WAW FINAL FORM;Lo;0;AL;<final> 0648;;;;N;GLYPH FOR FINAL ARABIC WAW;;;;
-FEEF;ARABIC LETTER ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0649;;;;N;GLYPH FOR ISOLATE ARABIC ALEF MAQSURAH;;;;
-FEF0;ARABIC LETTER ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0649;;;;N;GLYPH FOR FINAL ARABIC ALEF MAQSURAH;;;;
-FEF1;ARABIC LETTER YEH ISOLATED FORM;Lo;0;AL;<isolated> 064A;;;;N;GLYPH FOR ISOLATE ARABIC YA;;;;
-FEF2;ARABIC LETTER YEH FINAL FORM;Lo;0;AL;<final> 064A;;;;N;GLYPH FOR FINAL ARABIC YA;;;;
-FEF3;ARABIC LETTER YEH INITIAL FORM;Lo;0;AL;<initial> 064A;;;;N;GLYPH FOR INITIAL ARABIC YA;;;;
-FEF4;ARABIC LETTER YEH MEDIAL FORM;Lo;0;AL;<medial> 064A;;;;N;GLYPH FOR MEDIAL ARABIC YA;;;;
-FEF5;ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE ISOLATED FORM;Lo;0;AL;<isolated> 0644 0622;;;;N;GLYPH FOR ISOLATE ARABIC MADDAH ON LIGATURE LAM ALEF;;;;
-FEF6;ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE FINAL FORM;Lo;0;AL;<final> 0644 0622;;;;N;GLYPH FOR FINAL ARABIC MADDAH ON LIGATURE LAM ALEF;;;;
-FEF7;ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE ISOLATED FORM;Lo;0;AL;<isolated> 0644 0623;;;;N;GLYPH FOR ISOLATE ARABIC HAMZAH ON LIGATURE LAM ALEF;;;;
-FEF8;ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE FINAL FORM;Lo;0;AL;<final> 0644 0623;;;;N;GLYPH FOR FINAL ARABIC HAMZAH ON LIGATURE LAM ALEF;;;;
-FEF9;ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW ISOLATED FORM;Lo;0;AL;<isolated> 0644 0625;;;;N;GLYPH FOR ISOLATE ARABIC HAMZAH UNDER LIGATURE LAM ALEF;;;;
-FEFA;ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW FINAL FORM;Lo;0;AL;<final> 0644 0625;;;;N;GLYPH FOR FINAL ARABIC HAMZAH UNDER LIGATURE LAM ALEF;;;;
-FEFB;ARABIC LIGATURE LAM WITH ALEF ISOLATED FORM;Lo;0;AL;<isolated> 0644 0627;;;;N;GLYPH FOR ISOLATE ARABIC LIGATURE LAM ALEF;;;;
-FEFC;ARABIC LIGATURE LAM WITH ALEF FINAL FORM;Lo;0;AL;<final> 0644 0627;;;;N;GLYPH FOR FINAL ARABIC LIGATURE LAM ALEF;;;;
-FEFF;ZERO WIDTH NO-BREAK SPACE;Cf;0;BN;;;;;N;BYTE ORDER MARK;;;;
-FF01;FULLWIDTH EXCLAMATION MARK;Po;0;ON;<wide> 0021;;;;N;;;;;
-FF02;FULLWIDTH QUOTATION MARK;Po;0;ON;<wide> 0022;;;;N;;;;;
-FF03;FULLWIDTH NUMBER SIGN;Po;0;ET;<wide> 0023;;;;N;;;;;
-FF04;FULLWIDTH DOLLAR SIGN;Sc;0;ET;<wide> 0024;;;;N;;;;;
-FF05;FULLWIDTH PERCENT SIGN;Po;0;ET;<wide> 0025;;;;N;;;;;
-FF06;FULLWIDTH AMPERSAND;Po;0;ON;<wide> 0026;;;;N;;;;;
-FF07;FULLWIDTH APOSTROPHE;Po;0;ON;<wide> 0027;;;;N;;;;;
-FF08;FULLWIDTH LEFT PARENTHESIS;Ps;0;ON;<wide> 0028;;;;Y;FULLWIDTH OPENING PARENTHESIS;;;;
-FF09;FULLWIDTH RIGHT PARENTHESIS;Pe;0;ON;<wide> 0029;;;;Y;FULLWIDTH CLOSING PARENTHESIS;;;;
-FF0A;FULLWIDTH ASTERISK;Po;0;ON;<wide> 002A;;;;N;;;;;
-FF0B;FULLWIDTH PLUS SIGN;Sm;0;ES;<wide> 002B;;;;N;;;;;
-FF0C;FULLWIDTH COMMA;Po;0;CS;<wide> 002C;;;;N;;;;;
-FF0D;FULLWIDTH HYPHEN-MINUS;Pd;0;ES;<wide> 002D;;;;N;;;;;
-FF0E;FULLWIDTH FULL STOP;Po;0;CS;<wide> 002E;;;;N;FULLWIDTH PERIOD;;;;
-FF0F;FULLWIDTH SOLIDUS;Po;0;CS;<wide> 002F;;;;N;FULLWIDTH SLASH;;;;
-FF10;FULLWIDTH DIGIT ZERO;Nd;0;EN;<wide> 0030;0;0;0;N;;;;;
-FF11;FULLWIDTH DIGIT ONE;Nd;0;EN;<wide> 0031;1;1;1;N;;;;;
-FF12;FULLWIDTH DIGIT TWO;Nd;0;EN;<wide> 0032;2;2;2;N;;;;;
-FF13;FULLWIDTH DIGIT THREE;Nd;0;EN;<wide> 0033;3;3;3;N;;;;;
-FF14;FULLWIDTH DIGIT FOUR;Nd;0;EN;<wide> 0034;4;4;4;N;;;;;
-FF15;FULLWIDTH DIGIT FIVE;Nd;0;EN;<wide> 0035;5;5;5;N;;;;;
-FF16;FULLWIDTH DIGIT SIX;Nd;0;EN;<wide> 0036;6;6;6;N;;;;;
-FF17;FULLWIDTH DIGIT SEVEN;Nd;0;EN;<wide> 0037;7;7;7;N;;;;;
-FF18;FULLWIDTH DIGIT EIGHT;Nd;0;EN;<wide> 0038;8;8;8;N;;;;;
-FF19;FULLWIDTH DIGIT NINE;Nd;0;EN;<wide> 0039;9;9;9;N;;;;;
-FF1A;FULLWIDTH COLON;Po;0;CS;<wide> 003A;;;;N;;;;;
-FF1B;FULLWIDTH SEMICOLON;Po;0;ON;<wide> 003B;;;;N;;;;;
-FF1C;FULLWIDTH LESS-THAN SIGN;Sm;0;ON;<wide> 003C;;;;Y;;;;;
-FF1D;FULLWIDTH EQUALS SIGN;Sm;0;ON;<wide> 003D;;;;N;;;;;
-FF1E;FULLWIDTH GREATER-THAN SIGN;Sm;0;ON;<wide> 003E;;;;Y;;;;;
-FF1F;FULLWIDTH QUESTION MARK;Po;0;ON;<wide> 003F;;;;N;;;;;
-FF20;FULLWIDTH COMMERCIAL AT;Po;0;ON;<wide> 0040;;;;N;;;;;
-FF21;FULLWIDTH LATIN CAPITAL LETTER A;Lu;0;L;<wide> 0041;;;;N;;;;FF41;
-FF22;FULLWIDTH LATIN CAPITAL LETTER B;Lu;0;L;<wide> 0042;;;;N;;;;FF42;
-FF23;FULLWIDTH LATIN CAPITAL LETTER C;Lu;0;L;<wide> 0043;;;;N;;;;FF43;
-FF24;FULLWIDTH LATIN CAPITAL LETTER D;Lu;0;L;<wide> 0044;;;;N;;;;FF44;
-FF25;FULLWIDTH LATIN CAPITAL LETTER E;Lu;0;L;<wide> 0045;;;;N;;;;FF45;
-FF26;FULLWIDTH LATIN CAPITAL LETTER F;Lu;0;L;<wide> 0046;;;;N;;;;FF46;
-FF27;FULLWIDTH LATIN CAPITAL LETTER G;Lu;0;L;<wide> 0047;;;;N;;;;FF47;
-FF28;FULLWIDTH LATIN CAPITAL LETTER H;Lu;0;L;<wide> 0048;;;;N;;;;FF48;
-FF29;FULLWIDTH LATIN CAPITAL LETTER I;Lu;0;L;<wide> 0049;;;;N;;;;FF49;
-FF2A;FULLWIDTH LATIN CAPITAL LETTER J;Lu;0;L;<wide> 004A;;;;N;;;;FF4A;
-FF2B;FULLWIDTH LATIN CAPITAL LETTER K;Lu;0;L;<wide> 004B;;;;N;;;;FF4B;
-FF2C;FULLWIDTH LATIN CAPITAL LETTER L;Lu;0;L;<wide> 004C;;;;N;;;;FF4C;
-FF2D;FULLWIDTH LATIN CAPITAL LETTER M;Lu;0;L;<wide> 004D;;;;N;;;;FF4D;
-FF2E;FULLWIDTH LATIN CAPITAL LETTER N;Lu;0;L;<wide> 004E;;;;N;;;;FF4E;
-FF2F;FULLWIDTH LATIN CAPITAL LETTER O;Lu;0;L;<wide> 004F;;;;N;;;;FF4F;
-FF30;FULLWIDTH LATIN CAPITAL LETTER P;Lu;0;L;<wide> 0050;;;;N;;;;FF50;
-FF31;FULLWIDTH LATIN CAPITAL LETTER Q;Lu;0;L;<wide> 0051;;;;N;;;;FF51;
-FF32;FULLWIDTH LATIN CAPITAL LETTER R;Lu;0;L;<wide> 0052;;;;N;;;;FF52;
-FF33;FULLWIDTH LATIN CAPITAL LETTER S;Lu;0;L;<wide> 0053;;;;N;;;;FF53;
-FF34;FULLWIDTH LATIN CAPITAL LETTER T;Lu;0;L;<wide> 0054;;;;N;;;;FF54;
-FF35;FULLWIDTH LATIN CAPITAL LETTER U;Lu;0;L;<wide> 0055;;;;N;;;;FF55;
-FF36;FULLWIDTH LATIN CAPITAL LETTER V;Lu;0;L;<wide> 0056;;;;N;;;;FF56;
-FF37;FULLWIDTH LATIN CAPITAL LETTER W;Lu;0;L;<wide> 0057;;;;N;;;;FF57;
-FF38;FULLWIDTH LATIN CAPITAL LETTER X;Lu;0;L;<wide> 0058;;;;N;;;;FF58;
-FF39;FULLWIDTH LATIN CAPITAL LETTER Y;Lu;0;L;<wide> 0059;;;;N;;;;FF59;
-FF3A;FULLWIDTH LATIN CAPITAL LETTER Z;Lu;0;L;<wide> 005A;;;;N;;;;FF5A;
-FF3B;FULLWIDTH LEFT SQUARE BRACKET;Ps;0;ON;<wide> 005B;;;;Y;FULLWIDTH OPENING SQUARE BRACKET;;;;
-FF3C;FULLWIDTH REVERSE SOLIDUS;Po;0;ON;<wide> 005C;;;;N;FULLWIDTH BACKSLASH;;;;
-FF3D;FULLWIDTH RIGHT SQUARE BRACKET;Pe;0;ON;<wide> 005D;;;;Y;FULLWIDTH CLOSING SQUARE BRACKET;;;;
-FF3E;FULLWIDTH CIRCUMFLEX ACCENT;Sk;0;ON;<wide> 005E;;;;N;FULLWIDTH SPACING CIRCUMFLEX;;;;
-FF3F;FULLWIDTH LOW LINE;Pc;0;ON;<wide> 005F;;;;N;FULLWIDTH SPACING UNDERSCORE;;;;
-FF40;FULLWIDTH GRAVE ACCENT;Sk;0;ON;<wide> 0060;;;;N;FULLWIDTH SPACING GRAVE;;;;
-FF41;FULLWIDTH LATIN SMALL LETTER A;Ll;0;L;<wide> 0061;;;;N;;;FF21;;FF21
-FF42;FULLWIDTH LATIN SMALL LETTER B;Ll;0;L;<wide> 0062;;;;N;;;FF22;;FF22
-FF43;FULLWIDTH LATIN SMALL LETTER C;Ll;0;L;<wide> 0063;;;;N;;;FF23;;FF23
-FF44;FULLWIDTH LATIN SMALL LETTER D;Ll;0;L;<wide> 0064;;;;N;;;FF24;;FF24
-FF45;FULLWIDTH LATIN SMALL LETTER E;Ll;0;L;<wide> 0065;;;;N;;;FF25;;FF25
-FF46;FULLWIDTH LATIN SMALL LETTER F;Ll;0;L;<wide> 0066;;;;N;;;FF26;;FF26
-FF47;FULLWIDTH LATIN SMALL LETTER G;Ll;0;L;<wide> 0067;;;;N;;;FF27;;FF27
-FF48;FULLWIDTH LATIN SMALL LETTER H;Ll;0;L;<wide> 0068;;;;N;;;FF28;;FF28
-FF49;FULLWIDTH LATIN SMALL LETTER I;Ll;0;L;<wide> 0069;;;;N;;;FF29;;FF29
-FF4A;FULLWIDTH LATIN SMALL LETTER J;Ll;0;L;<wide> 006A;;;;N;;;FF2A;;FF2A
-FF4B;FULLWIDTH LATIN SMALL LETTER K;Ll;0;L;<wide> 006B;;;;N;;;FF2B;;FF2B
-FF4C;FULLWIDTH LATIN SMALL LETTER L;Ll;0;L;<wide> 006C;;;;N;;;FF2C;;FF2C
-FF4D;FULLWIDTH LATIN SMALL LETTER M;Ll;0;L;<wide> 006D;;;;N;;;FF2D;;FF2D
-FF4E;FULLWIDTH LATIN SMALL LETTER N;Ll;0;L;<wide> 006E;;;;N;;;FF2E;;FF2E
-FF4F;FULLWIDTH LATIN SMALL LETTER O;Ll;0;L;<wide> 006F;;;;N;;;FF2F;;FF2F
-FF50;FULLWIDTH LATIN SMALL LETTER P;Ll;0;L;<wide> 0070;;;;N;;;FF30;;FF30
-FF51;FULLWIDTH LATIN SMALL LETTER Q;Ll;0;L;<wide> 0071;;;;N;;;FF31;;FF31
-FF52;FULLWIDTH LATIN SMALL LETTER R;Ll;0;L;<wide> 0072;;;;N;;;FF32;;FF32
-FF53;FULLWIDTH LATIN SMALL LETTER S;Ll;0;L;<wide> 0073;;;;N;;;FF33;;FF33
-FF54;FULLWIDTH LATIN SMALL LETTER T;Ll;0;L;<wide> 0074;;;;N;;;FF34;;FF34
-FF55;FULLWIDTH LATIN SMALL LETTER U;Ll;0;L;<wide> 0075;;;;N;;;FF35;;FF35
-FF56;FULLWIDTH LATIN SMALL LETTER V;Ll;0;L;<wide> 0076;;;;N;;;FF36;;FF36
-FF57;FULLWIDTH LATIN SMALL LETTER W;Ll;0;L;<wide> 0077;;;;N;;;FF37;;FF37
-FF58;FULLWIDTH LATIN SMALL LETTER X;Ll;0;L;<wide> 0078;;;;N;;;FF38;;FF38
-FF59;FULLWIDTH LATIN SMALL LETTER Y;Ll;0;L;<wide> 0079;;;;N;;;FF39;;FF39
-FF5A;FULLWIDTH LATIN SMALL LETTER Z;Ll;0;L;<wide> 007A;;;;N;;;FF3A;;FF3A
-FF5B;FULLWIDTH LEFT CURLY BRACKET;Ps;0;ON;<wide> 007B;;;;Y;FULLWIDTH OPENING CURLY BRACKET;;;;
-FF5C;FULLWIDTH VERTICAL LINE;Sm;0;ON;<wide> 007C;;;;N;FULLWIDTH VERTICAL BAR;;;;
-FF5D;FULLWIDTH RIGHT CURLY BRACKET;Pe;0;ON;<wide> 007D;;;;Y;FULLWIDTH CLOSING CURLY BRACKET;;;;
-FF5E;FULLWIDTH TILDE;Sm;0;ON;<wide> 007E;;;;N;FULLWIDTH SPACING TILDE;;;;
-FF5F;FULLWIDTH LEFT WHITE PARENTHESIS;Ps;0;ON;<wide> 2985;;;;Y;;*;;;
-FF60;FULLWIDTH RIGHT WHITE PARENTHESIS;Pe;0;ON;<wide> 2986;;;;Y;;*;;;
-FF61;HALFWIDTH IDEOGRAPHIC FULL STOP;Po;0;ON;<narrow> 3002;;;;N;HALFWIDTH IDEOGRAPHIC PERIOD;;;;
-FF62;HALFWIDTH LEFT CORNER BRACKET;Ps;0;ON;<narrow> 300C;;;;Y;HALFWIDTH OPENING CORNER BRACKET;;;;
-FF63;HALFWIDTH RIGHT CORNER BRACKET;Pe;0;ON;<narrow> 300D;;;;Y;HALFWIDTH CLOSING CORNER BRACKET;;;;
-FF64;HALFWIDTH IDEOGRAPHIC COMMA;Po;0;ON;<narrow> 3001;;;;N;;;;;
-FF65;HALFWIDTH KATAKANA MIDDLE DOT;Po;0;ON;<narrow> 30FB;;;;N;;;;;
-FF66;HALFWIDTH KATAKANA LETTER WO;Lo;0;L;<narrow> 30F2;;;;N;;;;;
-FF67;HALFWIDTH KATAKANA LETTER SMALL A;Lo;0;L;<narrow> 30A1;;;;N;;;;;
-FF68;HALFWIDTH KATAKANA LETTER SMALL I;Lo;0;L;<narrow> 30A3;;;;N;;;;;
-FF69;HALFWIDTH KATAKANA LETTER SMALL U;Lo;0;L;<narrow> 30A5;;;;N;;;;;
-FF6A;HALFWIDTH KATAKANA LETTER SMALL E;Lo;0;L;<narrow> 30A7;;;;N;;;;;
-FF6B;HALFWIDTH KATAKANA LETTER SMALL O;Lo;0;L;<narrow> 30A9;;;;N;;;;;
-FF6C;HALFWIDTH KATAKANA LETTER SMALL YA;Lo;0;L;<narrow> 30E3;;;;N;;;;;
-FF6D;HALFWIDTH KATAKANA LETTER SMALL YU;Lo;0;L;<narrow> 30E5;;;;N;;;;;
-FF6E;HALFWIDTH KATAKANA LETTER SMALL YO;Lo;0;L;<narrow> 30E7;;;;N;;;;;
-FF6F;HALFWIDTH KATAKANA LETTER SMALL TU;Lo;0;L;<narrow> 30C3;;;;N;;;;;
-FF70;HALFWIDTH KATAKANA-HIRAGANA PROLONGED SOUND MARK;Lm;0;L;<narrow> 30FC;;;;N;;;;;
-FF71;HALFWIDTH KATAKANA LETTER A;Lo;0;L;<narrow> 30A2;;;;N;;;;;
-FF72;HALFWIDTH KATAKANA LETTER I;Lo;0;L;<narrow> 30A4;;;;N;;;;;
-FF73;HALFWIDTH KATAKANA LETTER U;Lo;0;L;<narrow> 30A6;;;;N;;;;;
-FF74;HALFWIDTH KATAKANA LETTER E;Lo;0;L;<narrow> 30A8;;;;N;;;;;
-FF75;HALFWIDTH KATAKANA LETTER O;Lo;0;L;<narrow> 30AA;;;;N;;;;;
-FF76;HALFWIDTH KATAKANA LETTER KA;Lo;0;L;<narrow> 30AB;;;;N;;;;;
-FF77;HALFWIDTH KATAKANA LETTER KI;Lo;0;L;<narrow> 30AD;;;;N;;;;;
-FF78;HALFWIDTH KATAKANA LETTER KU;Lo;0;L;<narrow> 30AF;;;;N;;;;;
-FF79;HALFWIDTH KATAKANA LETTER KE;Lo;0;L;<narrow> 30B1;;;;N;;;;;
-FF7A;HALFWIDTH KATAKANA LETTER KO;Lo;0;L;<narrow> 30B3;;;;N;;;;;
-FF7B;HALFWIDTH KATAKANA LETTER SA;Lo;0;L;<narrow> 30B5;;;;N;;;;;
-FF7C;HALFWIDTH KATAKANA LETTER SI;Lo;0;L;<narrow> 30B7;;;;N;;;;;
-FF7D;HALFWIDTH KATAKANA LETTER SU;Lo;0;L;<narrow> 30B9;;;;N;;;;;
-FF7E;HALFWIDTH KATAKANA LETTER SE;Lo;0;L;<narrow> 30BB;;;;N;;;;;
-FF7F;HALFWIDTH KATAKANA LETTER SO;Lo;0;L;<narrow> 30BD;;;;N;;;;;
-FF80;HALFWIDTH KATAKANA LETTER TA;Lo;0;L;<narrow> 30BF;;;;N;;;;;
-FF81;HALFWIDTH KATAKANA LETTER TI;Lo;0;L;<narrow> 30C1;;;;N;;;;;
-FF82;HALFWIDTH KATAKANA LETTER TU;Lo;0;L;<narrow> 30C4;;;;N;;;;;
-FF83;HALFWIDTH KATAKANA LETTER TE;Lo;0;L;<narrow> 30C6;;;;N;;;;;
-FF84;HALFWIDTH KATAKANA LETTER TO;Lo;0;L;<narrow> 30C8;;;;N;;;;;
-FF85;HALFWIDTH KATAKANA LETTER NA;Lo;0;L;<narrow> 30CA;;;;N;;;;;
-FF86;HALFWIDTH KATAKANA LETTER NI;Lo;0;L;<narrow> 30CB;;;;N;;;;;
-FF87;HALFWIDTH KATAKANA LETTER NU;Lo;0;L;<narrow> 30CC;;;;N;;;;;
-FF88;HALFWIDTH KATAKANA LETTER NE;Lo;0;L;<narrow> 30CD;;;;N;;;;;
-FF89;HALFWIDTH KATAKANA LETTER NO;Lo;0;L;<narrow> 30CE;;;;N;;;;;
-FF8A;HALFWIDTH KATAKANA LETTER HA;Lo;0;L;<narrow> 30CF;;;;N;;;;;
-FF8B;HALFWIDTH KATAKANA LETTER HI;Lo;0;L;<narrow> 30D2;;;;N;;;;;
-FF8C;HALFWIDTH KATAKANA LETTER HU;Lo;0;L;<narrow> 30D5;;;;N;;;;;
-FF8D;HALFWIDTH KATAKANA LETTER HE;Lo;0;L;<narrow> 30D8;;;;N;;;;;
-FF8E;HALFWIDTH KATAKANA LETTER HO;Lo;0;L;<narrow> 30DB;;;;N;;;;;
-FF8F;HALFWIDTH KATAKANA LETTER MA;Lo;0;L;<narrow> 30DE;;;;N;;;;;
-FF90;HALFWIDTH KATAKANA LETTER MI;Lo;0;L;<narrow> 30DF;;;;N;;;;;
-FF91;HALFWIDTH KATAKANA LETTER MU;Lo;0;L;<narrow> 30E0;;;;N;;;;;
-FF92;HALFWIDTH KATAKANA LETTER ME;Lo;0;L;<narrow> 30E1;;;;N;;;;;
-FF93;HALFWIDTH KATAKANA LETTER MO;Lo;0;L;<narrow> 30E2;;;;N;;;;;
-FF94;HALFWIDTH KATAKANA LETTER YA;Lo;0;L;<narrow> 30E4;;;;N;;;;;
-FF95;HALFWIDTH KATAKANA LETTER YU;Lo;0;L;<narrow> 30E6;;;;N;;;;;
-FF96;HALFWIDTH KATAKANA LETTER YO;Lo;0;L;<narrow> 30E8;;;;N;;;;;
-FF97;HALFWIDTH KATAKANA LETTER RA;Lo;0;L;<narrow> 30E9;;;;N;;;;;
-FF98;HALFWIDTH KATAKANA LETTER RI;Lo;0;L;<narrow> 30EA;;;;N;;;;;
-FF99;HALFWIDTH KATAKANA LETTER RU;Lo;0;L;<narrow> 30EB;;;;N;;;;;
-FF9A;HALFWIDTH KATAKANA LETTER RE;Lo;0;L;<narrow> 30EC;;;;N;;;;;
-FF9B;HALFWIDTH KATAKANA LETTER RO;Lo;0;L;<narrow> 30ED;;;;N;;;;;
-FF9C;HALFWIDTH KATAKANA LETTER WA;Lo;0;L;<narrow> 30EF;;;;N;;;;;
-FF9D;HALFWIDTH KATAKANA LETTER N;Lo;0;L;<narrow> 30F3;;;;N;;;;;
-FF9E;HALFWIDTH KATAKANA VOICED SOUND MARK;Lm;0;L;<narrow> 3099;;;;N;;halfwidth katakana-hiragana voiced sound mark;;;
-FF9F;HALFWIDTH KATAKANA SEMI-VOICED SOUND MARK;Lm;0;L;<narrow> 309A;;;;N;;halfwidth katakana-hiragana semi-voiced sound mark;;;
-FFA0;HALFWIDTH HANGUL FILLER;Lo;0;L;<narrow> 3164;;;;N;HALFWIDTH HANGUL CAE OM;;;;
-FFA1;HALFWIDTH HANGUL LETTER KIYEOK;Lo;0;L;<narrow> 3131;;;;N;HALFWIDTH HANGUL LETTER GIYEOG;;;;
-FFA2;HALFWIDTH HANGUL LETTER SSANGKIYEOK;Lo;0;L;<narrow> 3132;;;;N;HALFWIDTH HANGUL LETTER SSANG GIYEOG;;;;
-FFA3;HALFWIDTH HANGUL LETTER KIYEOK-SIOS;Lo;0;L;<narrow> 3133;;;;N;HALFWIDTH HANGUL LETTER GIYEOG SIOS;;;;
-FFA4;HALFWIDTH HANGUL LETTER NIEUN;Lo;0;L;<narrow> 3134;;;;N;;;;;
-FFA5;HALFWIDTH HANGUL LETTER NIEUN-CIEUC;Lo;0;L;<narrow> 3135;;;;N;HALFWIDTH HANGUL LETTER NIEUN JIEUJ;;;;
-FFA6;HALFWIDTH HANGUL LETTER NIEUN-HIEUH;Lo;0;L;<narrow> 3136;;;;N;HALFWIDTH HANGUL LETTER NIEUN HIEUH;;;;
-FFA7;HALFWIDTH HANGUL LETTER TIKEUT;Lo;0;L;<narrow> 3137;;;;N;HALFWIDTH HANGUL LETTER DIGEUD;;;;
-FFA8;HALFWIDTH HANGUL LETTER SSANGTIKEUT;Lo;0;L;<narrow> 3138;;;;N;HALFWIDTH HANGUL LETTER SSANG DIGEUD;;;;
-FFA9;HALFWIDTH HANGUL LETTER RIEUL;Lo;0;L;<narrow> 3139;;;;N;HALFWIDTH HANGUL LETTER LIEUL;;;;
-FFAA;HALFWIDTH HANGUL LETTER RIEUL-KIYEOK;Lo;0;L;<narrow> 313A;;;;N;HALFWIDTH HANGUL LETTER LIEUL GIYEOG;;;;
-FFAB;HALFWIDTH HANGUL LETTER RIEUL-MIEUM;Lo;0;L;<narrow> 313B;;;;N;HALFWIDTH HANGUL LETTER LIEUL MIEUM;;;;
-FFAC;HALFWIDTH HANGUL LETTER RIEUL-PIEUP;Lo;0;L;<narrow> 313C;;;;N;HALFWIDTH HANGUL LETTER LIEUL BIEUB;;;;
-FFAD;HALFWIDTH HANGUL LETTER RIEUL-SIOS;Lo;0;L;<narrow> 313D;;;;N;HALFWIDTH HANGUL LETTER LIEUL SIOS;;;;
-FFAE;HALFWIDTH HANGUL LETTER RIEUL-THIEUTH;Lo;0;L;<narrow> 313E;;;;N;HALFWIDTH HANGUL LETTER LIEUL TIEUT;;;;
-FFAF;HALFWIDTH HANGUL LETTER RIEUL-PHIEUPH;Lo;0;L;<narrow> 313F;;;;N;HALFWIDTH HANGUL LETTER LIEUL PIEUP;;;;
-FFB0;HALFWIDTH HANGUL LETTER RIEUL-HIEUH;Lo;0;L;<narrow> 3140;;;;N;HALFWIDTH HANGUL LETTER LIEUL HIEUH;;;;
-FFB1;HALFWIDTH HANGUL LETTER MIEUM;Lo;0;L;<narrow> 3141;;;;N;;;;;
-FFB2;HALFWIDTH HANGUL LETTER PIEUP;Lo;0;L;<narrow> 3142;;;;N;HALFWIDTH HANGUL LETTER BIEUB;;;;
-FFB3;HALFWIDTH HANGUL LETTER SSANGPIEUP;Lo;0;L;<narrow> 3143;;;;N;HALFWIDTH HANGUL LETTER SSANG BIEUB;;;;
-FFB4;HALFWIDTH HANGUL LETTER PIEUP-SIOS;Lo;0;L;<narrow> 3144;;;;N;HALFWIDTH HANGUL LETTER BIEUB SIOS;;;;
-FFB5;HALFWIDTH HANGUL LETTER SIOS;Lo;0;L;<narrow> 3145;;;;N;;;;;
-FFB6;HALFWIDTH HANGUL LETTER SSANGSIOS;Lo;0;L;<narrow> 3146;;;;N;HALFWIDTH HANGUL LETTER SSANG SIOS;;;;
-FFB7;HALFWIDTH HANGUL LETTER IEUNG;Lo;0;L;<narrow> 3147;;;;N;;;;;
-FFB8;HALFWIDTH HANGUL LETTER CIEUC;Lo;0;L;<narrow> 3148;;;;N;HALFWIDTH HANGUL LETTER JIEUJ;;;;
-FFB9;HALFWIDTH HANGUL LETTER SSANGCIEUC;Lo;0;L;<narrow> 3149;;;;N;HALFWIDTH HANGUL LETTER SSANG JIEUJ;;;;
-FFBA;HALFWIDTH HANGUL LETTER CHIEUCH;Lo;0;L;<narrow> 314A;;;;N;HALFWIDTH HANGUL LETTER CIEUC;;;;
-FFBB;HALFWIDTH HANGUL LETTER KHIEUKH;Lo;0;L;<narrow> 314B;;;;N;HALFWIDTH HANGUL LETTER KIYEOK;;;;
-FFBC;HALFWIDTH HANGUL LETTER THIEUTH;Lo;0;L;<narrow> 314C;;;;N;HALFWIDTH HANGUL LETTER TIEUT;;;;
-FFBD;HALFWIDTH HANGUL LETTER PHIEUPH;Lo;0;L;<narrow> 314D;;;;N;HALFWIDTH HANGUL LETTER PIEUP;;;;
-FFBE;HALFWIDTH HANGUL LETTER HIEUH;Lo;0;L;<narrow> 314E;;;;N;;;;;
-FFC2;HALFWIDTH HANGUL LETTER A;Lo;0;L;<narrow> 314F;;;;N;;;;;
-FFC3;HALFWIDTH HANGUL LETTER AE;Lo;0;L;<narrow> 3150;;;;N;;;;;
-FFC4;HALFWIDTH HANGUL LETTER YA;Lo;0;L;<narrow> 3151;;;;N;;;;;
-FFC5;HALFWIDTH HANGUL LETTER YAE;Lo;0;L;<narrow> 3152;;;;N;;;;;
-FFC6;HALFWIDTH HANGUL LETTER EO;Lo;0;L;<narrow> 3153;;;;N;;;;;
-FFC7;HALFWIDTH HANGUL LETTER E;Lo;0;L;<narrow> 3154;;;;N;;;;;
-FFCA;HALFWIDTH HANGUL LETTER YEO;Lo;0;L;<narrow> 3155;;;;N;;;;;
-FFCB;HALFWIDTH HANGUL LETTER YE;Lo;0;L;<narrow> 3156;;;;N;;;;;
-FFCC;HALFWIDTH HANGUL LETTER O;Lo;0;L;<narrow> 3157;;;;N;;;;;
-FFCD;HALFWIDTH HANGUL LETTER WA;Lo;0;L;<narrow> 3158;;;;N;;;;;
-FFCE;HALFWIDTH HANGUL LETTER WAE;Lo;0;L;<narrow> 3159;;;;N;;;;;
-FFCF;HALFWIDTH HANGUL LETTER OE;Lo;0;L;<narrow> 315A;;;;N;;;;;
-FFD2;HALFWIDTH HANGUL LETTER YO;Lo;0;L;<narrow> 315B;;;;N;;;;;
-FFD3;HALFWIDTH HANGUL LETTER U;Lo;0;L;<narrow> 315C;;;;N;;;;;
-FFD4;HALFWIDTH HANGUL LETTER WEO;Lo;0;L;<narrow> 315D;;;;N;;;;;
-FFD5;HALFWIDTH HANGUL LETTER WE;Lo;0;L;<narrow> 315E;;;;N;;;;;
-FFD6;HALFWIDTH HANGUL LETTER WI;Lo;0;L;<narrow> 315F;;;;N;;;;;
-FFD7;HALFWIDTH HANGUL LETTER YU;Lo;0;L;<narrow> 3160;;;;N;;;;;
-FFDA;HALFWIDTH HANGUL LETTER EU;Lo;0;L;<narrow> 3161;;;;N;;;;;
-FFDB;HALFWIDTH HANGUL LETTER YI;Lo;0;L;<narrow> 3162;;;;N;;;;;
-FFDC;HALFWIDTH HANGUL LETTER I;Lo;0;L;<narrow> 3163;;;;N;;;;;
-FFE0;FULLWIDTH CENT SIGN;Sc;0;ET;<wide> 00A2;;;;N;;;;;
-FFE1;FULLWIDTH POUND SIGN;Sc;0;ET;<wide> 00A3;;;;N;;;;;
-FFE2;FULLWIDTH NOT SIGN;Sm;0;ON;<wide> 00AC;;;;N;;;;;
-FFE3;FULLWIDTH MACRON;Sk;0;ON;<wide> 00AF;;;;N;FULLWIDTH SPACING MACRON;*;;;
-FFE4;FULLWIDTH BROKEN BAR;So;0;ON;<wide> 00A6;;;;N;FULLWIDTH BROKEN VERTICAL BAR;;;;
-FFE5;FULLWIDTH YEN SIGN;Sc;0;ET;<wide> 00A5;;;;N;;;;;
-FFE6;FULLWIDTH WON SIGN;Sc;0;ET;<wide> 20A9;;;;N;;;;;
-FFE8;HALFWIDTH FORMS LIGHT VERTICAL;So;0;ON;<narrow> 2502;;;;N;;;;;
-FFE9;HALFWIDTH LEFTWARDS ARROW;Sm;0;ON;<narrow> 2190;;;;N;;;;;
-FFEA;HALFWIDTH UPWARDS ARROW;Sm;0;ON;<narrow> 2191;;;;N;;;;;
-FFEB;HALFWIDTH RIGHTWARDS ARROW;Sm;0;ON;<narrow> 2192;;;;N;;;;;
-FFEC;HALFWIDTH DOWNWARDS ARROW;Sm;0;ON;<narrow> 2193;;;;N;;;;;
-FFED;HALFWIDTH BLACK SQUARE;So;0;ON;<narrow> 25A0;;;;N;;;;;
-FFEE;HALFWIDTH WHITE CIRCLE;So;0;ON;<narrow> 25CB;;;;N;;;;;
-FFF9;INTERLINEAR ANNOTATION ANCHOR;Cf;0;ON;;;;;N;;;;;
-FFFA;INTERLINEAR ANNOTATION SEPARATOR;Cf;0;ON;;;;;N;;;;;
-FFFB;INTERLINEAR ANNOTATION TERMINATOR;Cf;0;ON;;;;;N;;;;;
-FFFC;OBJECT REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
-FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
-10000;LINEAR B SYLLABLE B008 A;Lo;0;L;;;;;N;;;;;
-10001;LINEAR B SYLLABLE B038 E;Lo;0;L;;;;;N;;;;;
-10002;LINEAR B SYLLABLE B028 I;Lo;0;L;;;;;N;;;;;
-10003;LINEAR B SYLLABLE B061 O;Lo;0;L;;;;;N;;;;;
-10004;LINEAR B SYLLABLE B010 U;Lo;0;L;;;;;N;;;;;
-10005;LINEAR B SYLLABLE B001 DA;Lo;0;L;;;;;N;;;;;
-10006;LINEAR B SYLLABLE B045 DE;Lo;0;L;;;;;N;;;;;
-10007;LINEAR B SYLLABLE B007 DI;Lo;0;L;;;;;N;;;;;
-10008;LINEAR B SYLLABLE B014 DO;Lo;0;L;;;;;N;;;;;
-10009;LINEAR B SYLLABLE B051 DU;Lo;0;L;;;;;N;;;;;
-1000A;LINEAR B SYLLABLE B057 JA;Lo;0;L;;;;;N;;;;;
-1000B;LINEAR B SYLLABLE B046 JE;Lo;0;L;;;;;N;;;;;
-1000D;LINEAR B SYLLABLE B036 JO;Lo;0;L;;;;;N;;;;;
-1000E;LINEAR B SYLLABLE B065 JU;Lo;0;L;;;;;N;;;;;
-1000F;LINEAR B SYLLABLE B077 KA;Lo;0;L;;;;;N;;;;;
-10010;LINEAR B SYLLABLE B044 KE;Lo;0;L;;;;;N;;;;;
-10011;LINEAR B SYLLABLE B067 KI;Lo;0;L;;;;;N;;;;;
-10012;LINEAR B SYLLABLE B070 KO;Lo;0;L;;;;;N;;;;;
-10013;LINEAR B SYLLABLE B081 KU;Lo;0;L;;;;;N;;;;;
-10014;LINEAR B SYLLABLE B080 MA;Lo;0;L;;;;;N;;;;;
-10015;LINEAR B SYLLABLE B013 ME;Lo;0;L;;;;;N;;;;;
-10016;LINEAR B SYLLABLE B073 MI;Lo;0;L;;;;;N;;;;;
-10017;LINEAR B SYLLABLE B015 MO;Lo;0;L;;;;;N;;;;;
-10018;LINEAR B SYLLABLE B023 MU;Lo;0;L;;;;;N;;;;;
-10019;LINEAR B SYLLABLE B006 NA;Lo;0;L;;;;;N;;;;;
-1001A;LINEAR B SYLLABLE B024 NE;Lo;0;L;;;;;N;;;;;
-1001B;LINEAR B SYLLABLE B030 NI;Lo;0;L;;;;;N;;;;;
-1001C;LINEAR B SYLLABLE B052 NO;Lo;0;L;;;;;N;;;;;
-1001D;LINEAR B SYLLABLE B055 NU;Lo;0;L;;;;;N;;;;;
-1001E;LINEAR B SYLLABLE B003 PA;Lo;0;L;;;;;N;;;;;
-1001F;LINEAR B SYLLABLE B072 PE;Lo;0;L;;;;;N;;;;;
-10020;LINEAR B SYLLABLE B039 PI;Lo;0;L;;;;;N;;;;;
-10021;LINEAR B SYLLABLE B011 PO;Lo;0;L;;;;;N;;;;;
-10022;LINEAR B SYLLABLE B050 PU;Lo;0;L;;;;;N;;;;;
-10023;LINEAR B SYLLABLE B016 QA;Lo;0;L;;;;;N;;;;;
-10024;LINEAR B SYLLABLE B078 QE;Lo;0;L;;;;;N;;;;;
-10025;LINEAR B SYLLABLE B021 QI;Lo;0;L;;;;;N;;;;;
-10026;LINEAR B SYLLABLE B032 QO;Lo;0;L;;;;;N;;;;;
-10028;LINEAR B SYLLABLE B060 RA;Lo;0;L;;;;;N;;;;;
-10029;LINEAR B SYLLABLE B027 RE;Lo;0;L;;;;;N;;;;;
-1002A;LINEAR B SYLLABLE B053 RI;Lo;0;L;;;;;N;;;;;
-1002B;LINEAR B SYLLABLE B002 RO;Lo;0;L;;;;;N;;;;;
-1002C;LINEAR B SYLLABLE B026 RU;Lo;0;L;;;;;N;;;;;
-1002D;LINEAR B SYLLABLE B031 SA;Lo;0;L;;;;;N;;;;;
-1002E;LINEAR B SYLLABLE B009 SE;Lo;0;L;;;;;N;;;;;
-1002F;LINEAR B SYLLABLE B041 SI;Lo;0;L;;;;;N;;;;;
-10030;LINEAR B SYLLABLE B012 SO;Lo;0;L;;;;;N;;;;;
-10031;LINEAR B SYLLABLE B058 SU;Lo;0;L;;;;;N;;;;;
-10032;LINEAR B SYLLABLE B059 TA;Lo;0;L;;;;;N;;;;;
-10033;LINEAR B SYLLABLE B004 TE;Lo;0;L;;;;;N;;;;;
-10034;LINEAR B SYLLABLE B037 TI;Lo;0;L;;;;;N;;;;;
-10035;LINEAR B SYLLABLE B005 TO;Lo;0;L;;;;;N;;;;;
-10036;LINEAR B SYLLABLE B069 TU;Lo;0;L;;;;;N;;;;;
-10037;LINEAR B SYLLABLE B054 WA;Lo;0;L;;;;;N;;;;;
-10038;LINEAR B SYLLABLE B075 WE;Lo;0;L;;;;;N;;;;;
-10039;LINEAR B SYLLABLE B040 WI;Lo;0;L;;;;;N;;;;;
-1003A;LINEAR B SYLLABLE B042 WO;Lo;0;L;;;;;N;;;;;
-1003C;LINEAR B SYLLABLE B017 ZA;Lo;0;L;;;;;N;;;;;
-1003D;LINEAR B SYLLABLE B074 ZE;Lo;0;L;;;;;N;;;;;
-1003F;LINEAR B SYLLABLE B020 ZO;Lo;0;L;;;;;N;;;;;
-10040;LINEAR B SYLLABLE B025 A2;Lo;0;L;;;;;N;;;;;
-10041;LINEAR B SYLLABLE B043 A3;Lo;0;L;;;;;N;;;;;
-10042;LINEAR B SYLLABLE B085 AU;Lo;0;L;;;;;N;;;;;
-10043;LINEAR B SYLLABLE B071 DWE;Lo;0;L;;;;;N;;;;;
-10044;LINEAR B SYLLABLE B090 DWO;Lo;0;L;;;;;N;;;;;
-10045;LINEAR B SYLLABLE B048 NWA;Lo;0;L;;;;;N;;;;;
-10046;LINEAR B SYLLABLE B029 PU2;Lo;0;L;;;;;N;;;;;
-10047;LINEAR B SYLLABLE B062 PTE;Lo;0;L;;;;;N;;;;;
-10048;LINEAR B SYLLABLE B076 RA2;Lo;0;L;;;;;N;;;;;
-10049;LINEAR B SYLLABLE B033 RA3;Lo;0;L;;;;;N;;;;;
-1004A;LINEAR B SYLLABLE B068 RO2;Lo;0;L;;;;;N;;;;;
-1004B;LINEAR B SYLLABLE B066 TA2;Lo;0;L;;;;;N;;;;;
-1004C;LINEAR B SYLLABLE B087 TWE;Lo;0;L;;;;;N;;;;;
-1004D;LINEAR B SYLLABLE B091 TWO;Lo;0;L;;;;;N;;;;;
-10050;LINEAR B SYMBOL B018;Lo;0;L;;;;;N;;;;;
-10051;LINEAR B SYMBOL B019;Lo;0;L;;;;;N;;;;;
-10052;LINEAR B SYMBOL B022;Lo;0;L;;;;;N;;;;;
-10053;LINEAR B SYMBOL B034;Lo;0;L;;;;;N;;;;;
-10054;LINEAR B SYMBOL B047;Lo;0;L;;;;;N;;;;;
-10055;LINEAR B SYMBOL B049;Lo;0;L;;;;;N;;;;;
-10056;LINEAR B SYMBOL B056;Lo;0;L;;;;;N;;;;;
-10057;LINEAR B SYMBOL B063;Lo;0;L;;;;;N;;;;;
-10058;LINEAR B SYMBOL B064;Lo;0;L;;;;;N;;;;;
-10059;LINEAR B SYMBOL B079;Lo;0;L;;;;;N;;;;;
-1005A;LINEAR B SYMBOL B082;Lo;0;L;;;;;N;;;;;
-1005B;LINEAR B SYMBOL B083;Lo;0;L;;;;;N;;;;;
-1005C;LINEAR B SYMBOL B086;Lo;0;L;;;;;N;;;;;
-1005D;LINEAR B SYMBOL B089;Lo;0;L;;;;;N;;;;;
-10080;LINEAR B IDEOGRAM B100 MAN;Lo;0;L;;;;;N;;;;;
-10081;LINEAR B IDEOGRAM B102 WOMAN;Lo;0;L;;;;;N;;;;;
-10082;LINEAR B IDEOGRAM B104 DEER;Lo;0;L;;;;;N;;;;;
-10083;LINEAR B IDEOGRAM B105 EQUID;Lo;0;L;;;;;N;;;;;
-10084;LINEAR B IDEOGRAM B105F MARE;Lo;0;L;;;;;N;;;;;
-10085;LINEAR B IDEOGRAM B105M STALLION;Lo;0;L;;;;;N;;;;;
-10086;LINEAR B IDEOGRAM B106F EWE;Lo;0;L;;;;;N;;;;;
-10087;LINEAR B IDEOGRAM B106M RAM;Lo;0;L;;;;;N;;;;;
-10088;LINEAR B IDEOGRAM B107F SHE-GOAT;Lo;0;L;;;;;N;;;;;
-10089;LINEAR B IDEOGRAM B107M HE-GOAT;Lo;0;L;;;;;N;;;;;
-1008A;LINEAR B IDEOGRAM B108F SOW;Lo;0;L;;;;;N;;;;;
-1008B;LINEAR B IDEOGRAM B108M BOAR;Lo;0;L;;;;;N;;;;;
-1008C;LINEAR B IDEOGRAM B109F COW;Lo;0;L;;;;;N;;;;;
-1008D;LINEAR B IDEOGRAM B109M BULL;Lo;0;L;;;;;N;;;;;
-1008E;LINEAR B IDEOGRAM B120 WHEAT;Lo;0;L;;;;;N;;;;;
-1008F;LINEAR B IDEOGRAM B121 BARLEY;Lo;0;L;;;;;N;;;;;
-10090;LINEAR B IDEOGRAM B122 OLIVE;Lo;0;L;;;;;N;;;;;
-10091;LINEAR B IDEOGRAM B123 SPICE;Lo;0;L;;;;;N;;;;;
-10092;LINEAR B IDEOGRAM B125 CYPERUS;Lo;0;L;;;;;N;;;;;
-10093;LINEAR B MONOGRAM B127 KAPO;Lo;0;L;;;;;N;;;;;
-10094;LINEAR B MONOGRAM B128 KANAKO;Lo;0;L;;;;;N;;;;;
-10095;LINEAR B IDEOGRAM B130 OIL;Lo;0;L;;;;;N;;;;;
-10096;LINEAR B IDEOGRAM B131 WINE;Lo;0;L;;;;;N;;;;;
-10097;LINEAR B IDEOGRAM B132;Lo;0;L;;;;;N;;;;;
-10098;LINEAR B MONOGRAM B133 AREPA;Lo;0;L;;;;;N;;;;;
-10099;LINEAR B MONOGRAM B135 MERI;Lo;0;L;;;;;N;;;;;
-1009A;LINEAR B IDEOGRAM B140 BRONZE;Lo;0;L;;;;;N;;;;;
-1009B;LINEAR B IDEOGRAM B141 GOLD;Lo;0;L;;;;;N;;;;;
-1009C;LINEAR B IDEOGRAM B142;Lo;0;L;;;;;N;;;;;
-1009D;LINEAR B IDEOGRAM B145 WOOL;Lo;0;L;;;;;N;;;;;
-1009E;LINEAR B IDEOGRAM B146;Lo;0;L;;;;;N;;;;;
-1009F;LINEAR B IDEOGRAM B150;Lo;0;L;;;;;N;;;;;
-100A0;LINEAR B IDEOGRAM B151 HORN;Lo;0;L;;;;;N;;;;;
-100A1;LINEAR B IDEOGRAM B152;Lo;0;L;;;;;N;;;;;
-100A2;LINEAR B IDEOGRAM B153;Lo;0;L;;;;;N;;;;;
-100A3;LINEAR B IDEOGRAM B154;Lo;0;L;;;;;N;;;;;
-100A4;LINEAR B MONOGRAM B156 TURO2;Lo;0;L;;;;;N;;;;;
-100A5;LINEAR B IDEOGRAM B157;Lo;0;L;;;;;N;;;;;
-100A6;LINEAR B IDEOGRAM B158;Lo;0;L;;;;;N;;;;;
-100A7;LINEAR B IDEOGRAM B159 CLOTH;Lo;0;L;;;;;N;;;;;
-100A8;LINEAR B IDEOGRAM B160;Lo;0;L;;;;;N;;;;;
-100A9;LINEAR B IDEOGRAM B161;Lo;0;L;;;;;N;;;;;
-100AA;LINEAR B IDEOGRAM B162 GARMENT;Lo;0;L;;;;;N;;;;;
-100AB;LINEAR B IDEOGRAM B163 ARMOUR;Lo;0;L;;;;;N;;;;;
-100AC;LINEAR B IDEOGRAM B164;Lo;0;L;;;;;N;;;;;
-100AD;LINEAR B IDEOGRAM B165;Lo;0;L;;;;;N;;;;;
-100AE;LINEAR B IDEOGRAM B166;Lo;0;L;;;;;N;;;;;
-100AF;LINEAR B IDEOGRAM B167;Lo;0;L;;;;;N;;;;;
-100B0;LINEAR B IDEOGRAM B168;Lo;0;L;;;;;N;;;;;
-100B1;LINEAR B IDEOGRAM B169;Lo;0;L;;;;;N;;;;;
-100B2;LINEAR B IDEOGRAM B170;Lo;0;L;;;;;N;;;;;
-100B3;LINEAR B IDEOGRAM B171;Lo;0;L;;;;;N;;;;;
-100B4;LINEAR B IDEOGRAM B172;Lo;0;L;;;;;N;;;;;
-100B5;LINEAR B IDEOGRAM B173 MONTH;Lo;0;L;;;;;N;;;;;
-100B6;LINEAR B IDEOGRAM B174;Lo;0;L;;;;;N;;;;;
-100B7;LINEAR B IDEOGRAM B176 TREE;Lo;0;L;;;;;N;;;;;
-100B8;LINEAR B IDEOGRAM B177;Lo;0;L;;;;;N;;;;;
-100B9;LINEAR B IDEOGRAM B178;Lo;0;L;;;;;N;;;;;
-100BA;LINEAR B IDEOGRAM B179;Lo;0;L;;;;;N;;;;;
-100BB;LINEAR B IDEOGRAM B180;Lo;0;L;;;;;N;;;;;
-100BC;LINEAR B IDEOGRAM B181;Lo;0;L;;;;;N;;;;;
-100BD;LINEAR B IDEOGRAM B182;Lo;0;L;;;;;N;;;;;
-100BE;LINEAR B IDEOGRAM B183;Lo;0;L;;;;;N;;;;;
-100BF;LINEAR B IDEOGRAM B184;Lo;0;L;;;;;N;;;;;
-100C0;LINEAR B IDEOGRAM B185;Lo;0;L;;;;;N;;;;;
-100C1;LINEAR B IDEOGRAM B189;Lo;0;L;;;;;N;;;;;
-100C2;LINEAR B IDEOGRAM B190;Lo;0;L;;;;;N;;;;;
-100C3;LINEAR B IDEOGRAM B191 HELMET;Lo;0;L;;;;;N;;;;;
-100C4;LINEAR B IDEOGRAM B220 FOOTSTOOL;Lo;0;L;;;;;N;;;;;
-100C5;LINEAR B IDEOGRAM B225 BATHTUB;Lo;0;L;;;;;N;;;;;
-100C6;LINEAR B IDEOGRAM B230 SPEAR;Lo;0;L;;;;;N;;;;;
-100C7;LINEAR B IDEOGRAM B231 ARROW;Lo;0;L;;;;;N;;;;;
-100C8;LINEAR B IDEOGRAM B232;Lo;0;L;;;;;N;;;;;
-100C9;LINEAR B IDEOGRAM B233 SWORD;Lo;0;L;;;;;N;;pug;;;
-100CA;LINEAR B IDEOGRAM B234;Lo;0;L;;;;;N;;;;;
-100CB;LINEAR B IDEOGRAM B236;Lo;0;L;;;;;N;;gup;;;
-100CC;LINEAR B IDEOGRAM B240 WHEELED CHARIOT;Lo;0;L;;;;;N;;;;;
-100CD;LINEAR B IDEOGRAM B241 CHARIOT;Lo;0;L;;;;;N;;;;;
-100CE;LINEAR B IDEOGRAM B242 CHARIOT FRAME;Lo;0;L;;;;;N;;;;;
-100CF;LINEAR B IDEOGRAM B243 WHEEL;Lo;0;L;;;;;N;;;;;
-100D0;LINEAR B IDEOGRAM B245;Lo;0;L;;;;;N;;;;;
-100D1;LINEAR B IDEOGRAM B246;Lo;0;L;;;;;N;;;;;
-100D2;LINEAR B MONOGRAM B247 DIPTE;Lo;0;L;;;;;N;;;;;
-100D3;LINEAR B IDEOGRAM B248;Lo;0;L;;;;;N;;;;;
-100D4;LINEAR B IDEOGRAM B249;Lo;0;L;;;;;N;;;;;
-100D5;LINEAR B IDEOGRAM B251;Lo;0;L;;;;;N;;;;;
-100D6;LINEAR B IDEOGRAM B252;Lo;0;L;;;;;N;;;;;
-100D7;LINEAR B IDEOGRAM B253;Lo;0;L;;;;;N;;;;;
-100D8;LINEAR B IDEOGRAM B254 DART;Lo;0;L;;;;;N;;;;;
-100D9;LINEAR B IDEOGRAM B255;Lo;0;L;;;;;N;;;;;
-100DA;LINEAR B IDEOGRAM B256;Lo;0;L;;;;;N;;;;;
-100DB;LINEAR B IDEOGRAM B257;Lo;0;L;;;;;N;;;;;
-100DC;LINEAR B IDEOGRAM B258;Lo;0;L;;;;;N;;;;;
-100DD;LINEAR B IDEOGRAM B259;Lo;0;L;;;;;N;;;;;
-100DE;LINEAR B IDEOGRAM VESSEL B155;Lo;0;L;;;;;N;;;;;
-100DF;LINEAR B IDEOGRAM VESSEL B200;Lo;0;L;;;;;N;;;;;
-100E0;LINEAR B IDEOGRAM VESSEL B201;Lo;0;L;;;;;N;;;;;
-100E1;LINEAR B IDEOGRAM VESSEL B202;Lo;0;L;;;;;N;;;;;
-100E2;LINEAR B IDEOGRAM VESSEL B203;Lo;0;L;;;;;N;;;;;
-100E3;LINEAR B IDEOGRAM VESSEL B204;Lo;0;L;;;;;N;;;;;
-100E4;LINEAR B IDEOGRAM VESSEL B205;Lo;0;L;;;;;N;;;;;
-100E5;LINEAR B IDEOGRAM VESSEL B206;Lo;0;L;;;;;N;;;;;
-100E6;LINEAR B IDEOGRAM VESSEL B207;Lo;0;L;;;;;N;;;;;
-100E7;LINEAR B IDEOGRAM VESSEL B208;Lo;0;L;;;;;N;;;;;
-100E8;LINEAR B IDEOGRAM VESSEL B209;Lo;0;L;;;;;N;;;;;
-100E9;LINEAR B IDEOGRAM VESSEL B210;Lo;0;L;;;;;N;;;;;
-100EA;LINEAR B IDEOGRAM VESSEL B211;Lo;0;L;;;;;N;;;;;
-100EB;LINEAR B IDEOGRAM VESSEL B212;Lo;0;L;;;;;N;;;;;
-100EC;LINEAR B IDEOGRAM VESSEL B213;Lo;0;L;;;;;N;;;;;
-100ED;LINEAR B IDEOGRAM VESSEL B214;Lo;0;L;;;;;N;;;;;
-100EE;LINEAR B IDEOGRAM VESSEL B215;Lo;0;L;;;;;N;;;;;
-100EF;LINEAR B IDEOGRAM VESSEL B216;Lo;0;L;;;;;N;;;;;
-100F0;LINEAR B IDEOGRAM VESSEL B217;Lo;0;L;;;;;N;;;;;
-100F1;LINEAR B IDEOGRAM VESSEL B218;Lo;0;L;;;;;N;;;;;
-100F2;LINEAR B IDEOGRAM VESSEL B219;Lo;0;L;;;;;N;;;;;
-100F3;LINEAR B IDEOGRAM VESSEL B221;Lo;0;L;;;;;N;;;;;
-100F4;LINEAR B IDEOGRAM VESSEL B222;Lo;0;L;;;;;N;;;;;
-100F5;LINEAR B IDEOGRAM VESSEL B226;Lo;0;L;;;;;N;;;;;
-100F6;LINEAR B IDEOGRAM VESSEL B227;Lo;0;L;;;;;N;;;;;
-100F7;LINEAR B IDEOGRAM VESSEL B228;Lo;0;L;;;;;N;;;;;
-100F8;LINEAR B IDEOGRAM VESSEL B229;Lo;0;L;;;;;N;;;;;
-100F9;LINEAR B IDEOGRAM VESSEL B250;Lo;0;L;;;;;N;;;;;
-100FA;LINEAR B IDEOGRAM VESSEL B305;Lo;0;L;;;;;N;;;;;
-10100;AEGEAN WORD SEPARATOR LINE;Po;0;L;;;;;N;;;;;
-10101;AEGEAN WORD SEPARATOR DOT;Po;0;ON;;;;;N;;;;;
-10102;AEGEAN CHECK MARK;So;0;L;;;;;N;;;;;
-10107;AEGEAN NUMBER ONE;No;0;L;;;;1;N;;;;;
-10108;AEGEAN NUMBER TWO;No;0;L;;;;2;N;;;;;
-10109;AEGEAN NUMBER THREE;No;0;L;;;;3;N;;;;;
-1010A;AEGEAN NUMBER FOUR;No;0;L;;;;4;N;;;;;
-1010B;AEGEAN NUMBER FIVE;No;0;L;;;;5;N;;;;;
-1010C;AEGEAN NUMBER SIX;No;0;L;;;;6;N;;;;;
-1010D;AEGEAN NUMBER SEVEN;No;0;L;;;;7;N;;;;;
-1010E;AEGEAN NUMBER EIGHT;No;0;L;;;;8;N;;;;;
-1010F;AEGEAN NUMBER NINE;No;0;L;;;;9;N;;;;;
-10110;AEGEAN NUMBER TEN;No;0;L;;;;10;N;;;;;
-10111;AEGEAN NUMBER TWENTY;No;0;L;;;;20;N;;;;;
-10112;AEGEAN NUMBER THIRTY;No;0;L;;;;30;N;;;;;
-10113;AEGEAN NUMBER FORTY;No;0;L;;;;40;N;;;;;
-10114;AEGEAN NUMBER FIFTY;No;0;L;;;;50;N;;;;;
-10115;AEGEAN NUMBER SIXTY;No;0;L;;;;60;N;;;;;
-10116;AEGEAN NUMBER SEVENTY;No;0;L;;;;70;N;;;;;
-10117;AEGEAN NUMBER EIGHTY;No;0;L;;;;80;N;;;;;
-10118;AEGEAN NUMBER NINETY;No;0;L;;;;90;N;;;;;
-10119;AEGEAN NUMBER ONE HUNDRED;No;0;L;;;;100;N;;;;;
-1011A;AEGEAN NUMBER TWO HUNDRED;No;0;L;;;;200;N;;;;;
-1011B;AEGEAN NUMBER THREE HUNDRED;No;0;L;;;;300;N;;;;;
-1011C;AEGEAN NUMBER FOUR HUNDRED;No;0;L;;;;400;N;;;;;
-1011D;AEGEAN NUMBER FIVE HUNDRED;No;0;L;;;;500;N;;;;;
-1011E;AEGEAN NUMBER SIX HUNDRED;No;0;L;;;;600;N;;;;;
-1011F;AEGEAN NUMBER SEVEN HUNDRED;No;0;L;;;;700;N;;;;;
-10120;AEGEAN NUMBER EIGHT HUNDRED;No;0;L;;;;800;N;;;;;
-10121;AEGEAN NUMBER NINE HUNDRED;No;0;L;;;;900;N;;;;;
-10122;AEGEAN NUMBER ONE THOUSAND;No;0;L;;;;1000;N;;;;;
-10123;AEGEAN NUMBER TWO THOUSAND;No;0;L;;;;2000;N;;;;;
-10124;AEGEAN NUMBER THREE THOUSAND;No;0;L;;;;3000;N;;;;;
-10125;AEGEAN NUMBER FOUR THOUSAND;No;0;L;;;;4000;N;;;;;
-10126;AEGEAN NUMBER FIVE THOUSAND;No;0;L;;;;5000;N;;;;;
-10127;AEGEAN NUMBER SIX THOUSAND;No;0;L;;;;6000;N;;;;;
-10128;AEGEAN NUMBER SEVEN THOUSAND;No;0;L;;;;7000;N;;;;;
-10129;AEGEAN NUMBER EIGHT THOUSAND;No;0;L;;;;8000;N;;;;;
-1012A;AEGEAN NUMBER NINE THOUSAND;No;0;L;;;;9000;N;;;;;
-1012B;AEGEAN NUMBER TEN THOUSAND;No;0;L;;;;10000;N;;;;;
-1012C;AEGEAN NUMBER TWENTY THOUSAND;No;0;L;;;;20000;N;;;;;
-1012D;AEGEAN NUMBER THIRTY THOUSAND;No;0;L;;;;30000;N;;;;;
-1012E;AEGEAN NUMBER FORTY THOUSAND;No;0;L;;;;40000;N;;;;;
-1012F;AEGEAN NUMBER FIFTY THOUSAND;No;0;L;;;;50000;N;;;;;
-10130;AEGEAN NUMBER SIXTY THOUSAND;No;0;L;;;;60000;N;;;;;
-10131;AEGEAN NUMBER SEVENTY THOUSAND;No;0;L;;;;70000;N;;;;;
-10132;AEGEAN NUMBER EIGHTY THOUSAND;No;0;L;;;;80000;N;;;;;
-10133;AEGEAN NUMBER NINETY THOUSAND;No;0;L;;;;90000;N;;;;;
-10137;AEGEAN WEIGHT BASE UNIT;So;0;L;;;;;N;;;;;
-10138;AEGEAN WEIGHT FIRST SUBUNIT;So;0;L;;;;;N;;;;;
-10139;AEGEAN WEIGHT SECOND SUBUNIT;So;0;L;;;;;N;;;;;
-1013A;AEGEAN WEIGHT THIRD SUBUNIT;So;0;L;;;;;N;;;;;
-1013B;AEGEAN WEIGHT FOURTH SUBUNIT;So;0;L;;;;;N;;;;;
-1013C;AEGEAN DRY MEASURE FIRST SUBUNIT;So;0;L;;;;;N;;;;;
-1013D;AEGEAN LIQUID MEASURE FIRST SUBUNIT;So;0;L;;;;;N;;;;;
-1013E;AEGEAN MEASURE SECOND SUBUNIT;So;0;L;;;;;N;;;;;
-1013F;AEGEAN MEASURE THIRD SUBUNIT;So;0;L;;;;;N;;;;;
-10140;GREEK ACROPHONIC ATTIC ONE QUARTER;Nl;0;ON;;;;1/4;N;;;;;
-10141;GREEK ACROPHONIC ATTIC ONE HALF;Nl;0;ON;;;;1/2;N;;;;;
-10142;GREEK ACROPHONIC ATTIC ONE DRACHMA;Nl;0;ON;;;;1;N;;;;;
-10143;GREEK ACROPHONIC ATTIC FIVE;Nl;0;ON;;;;5;N;;;;;
-10144;GREEK ACROPHONIC ATTIC FIFTY;Nl;0;ON;;;;50;N;;;;;
-10145;GREEK ACROPHONIC ATTIC FIVE HUNDRED;Nl;0;ON;;;;500;N;;;;;
-10146;GREEK ACROPHONIC ATTIC FIVE THOUSAND;Nl;0;ON;;;;5000;N;;;;;
-10147;GREEK ACROPHONIC ATTIC FIFTY THOUSAND;Nl;0;ON;;;;50000;N;;;;;
-10148;GREEK ACROPHONIC ATTIC FIVE TALENTS;Nl;0;ON;;;;5;N;;;;;
-10149;GREEK ACROPHONIC ATTIC TEN TALENTS;Nl;0;ON;;;;10;N;;;;;
-1014A;GREEK ACROPHONIC ATTIC FIFTY TALENTS;Nl;0;ON;;;;50;N;;;;;
-1014B;GREEK ACROPHONIC ATTIC ONE HUNDRED TALENTS;Nl;0;ON;;;;100;N;;;;;
-1014C;GREEK ACROPHONIC ATTIC FIVE HUNDRED TALENTS;Nl;0;ON;;;;500;N;;;;;
-1014D;GREEK ACROPHONIC ATTIC ONE THOUSAND TALENTS;Nl;0;ON;;;;1000;N;;;;;
-1014E;GREEK ACROPHONIC ATTIC FIVE THOUSAND TALENTS;Nl;0;ON;;;;5000;N;;;;;
-1014F;GREEK ACROPHONIC ATTIC FIVE STATERS;Nl;0;ON;;;;5;N;;;;;
-10150;GREEK ACROPHONIC ATTIC TEN STATERS;Nl;0;ON;;;;10;N;;;;;
-10151;GREEK ACROPHONIC ATTIC FIFTY STATERS;Nl;0;ON;;;;50;N;;;;;
-10152;GREEK ACROPHONIC ATTIC ONE HUNDRED STATERS;Nl;0;ON;;;;100;N;;;;;
-10153;GREEK ACROPHONIC ATTIC FIVE HUNDRED STATERS;Nl;0;ON;;;;500;N;;;;;
-10154;GREEK ACROPHONIC ATTIC ONE THOUSAND STATERS;Nl;0;ON;;;;1000;N;;;;;
-10155;GREEK ACROPHONIC ATTIC TEN THOUSAND STATERS;Nl;0;ON;;;;10000;N;;;;;
-10156;GREEK ACROPHONIC ATTIC FIFTY THOUSAND STATERS;Nl;0;ON;;;;50000;N;;;;;
-10157;GREEK ACROPHONIC ATTIC TEN MNAS;Nl;0;ON;;;;10;N;;;;;
-10158;GREEK ACROPHONIC HERAEUM ONE PLETHRON;Nl;0;ON;;;;1;N;;;;;
-10159;GREEK ACROPHONIC THESPIAN ONE;Nl;0;ON;;;;1;N;;;;;
-1015A;GREEK ACROPHONIC HERMIONIAN ONE;Nl;0;ON;;;;1;N;;;;;
-1015B;GREEK ACROPHONIC EPIDAUREAN TWO;Nl;0;ON;;;;2;N;;;;;
-1015C;GREEK ACROPHONIC THESPIAN TWO;Nl;0;ON;;;;2;N;;;;;
-1015D;GREEK ACROPHONIC CYRENAIC TWO DRACHMAS;Nl;0;ON;;;;2;N;;;;;
-1015E;GREEK ACROPHONIC EPIDAUREAN TWO DRACHMAS;Nl;0;ON;;;;2;N;;;;;
-1015F;GREEK ACROPHONIC TROEZENIAN FIVE;Nl;0;ON;;;;5;N;;;;;
-10160;GREEK ACROPHONIC TROEZENIAN TEN;Nl;0;ON;;;;10;N;;;;;
-10161;GREEK ACROPHONIC TROEZENIAN TEN ALTERNATE FORM;Nl;0;ON;;;;10;N;;;;;
-10162;GREEK ACROPHONIC HERMIONIAN TEN;Nl;0;ON;;;;10;N;;;;;
-10163;GREEK ACROPHONIC MESSENIAN TEN;Nl;0;ON;;;;10;N;;;;;
-10164;GREEK ACROPHONIC THESPIAN TEN;Nl;0;ON;;;;10;N;;;;;
-10165;GREEK ACROPHONIC THESPIAN THIRTY;Nl;0;ON;;;;30;N;;;;;
-10166;GREEK ACROPHONIC TROEZENIAN FIFTY;Nl;0;ON;;;;50;N;;;;;
-10167;GREEK ACROPHONIC TROEZENIAN FIFTY ALTERNATE FORM;Nl;0;ON;;;;50;N;;;;;
-10168;GREEK ACROPHONIC HERMIONIAN FIFTY;Nl;0;ON;;;;50;N;;;;;
-10169;GREEK ACROPHONIC THESPIAN FIFTY;Nl;0;ON;;;;50;N;;;;;
-1016A;GREEK ACROPHONIC THESPIAN ONE HUNDRED;Nl;0;ON;;;;100;N;;;;;
-1016B;GREEK ACROPHONIC THESPIAN THREE HUNDRED;Nl;0;ON;;;;300;N;;;;;
-1016C;GREEK ACROPHONIC EPIDAUREAN FIVE HUNDRED;Nl;0;ON;;;;500;N;;;;;
-1016D;GREEK ACROPHONIC TROEZENIAN FIVE HUNDRED;Nl;0;ON;;;;500;N;;;;;
-1016E;GREEK ACROPHONIC THESPIAN FIVE HUNDRED;Nl;0;ON;;;;500;N;;;;;
-1016F;GREEK ACROPHONIC CARYSTIAN FIVE HUNDRED;Nl;0;ON;;;;500;N;;;;;
-10170;GREEK ACROPHONIC NAXIAN FIVE HUNDRED;Nl;0;ON;;;;500;N;;;;;
-10171;GREEK ACROPHONIC THESPIAN ONE THOUSAND;Nl;0;ON;;;;1000;N;;;;;
-10172;GREEK ACROPHONIC THESPIAN FIVE THOUSAND;Nl;0;ON;;;;5000;N;;;;;
-10173;GREEK ACROPHONIC DELPHIC FIVE MNAS;Nl;0;ON;;;;5;N;;;;;
-10174;GREEK ACROPHONIC STRATIAN FIFTY MNAS;Nl;0;ON;;;;50;N;;;;;
-10175;GREEK ONE HALF SIGN;No;0;ON;;;;1/2;N;;;;;
-10176;GREEK ONE HALF SIGN ALTERNATE FORM;No;0;ON;;;;1/2;N;;;;;
-10177;GREEK TWO THIRDS SIGN;No;0;ON;;;;2/3;N;;;;;
-10178;GREEK THREE QUARTERS SIGN;No;0;ON;;;;3/4;N;;;;;
-10179;GREEK YEAR SIGN;So;0;ON;;;;;N;;;;;
-1017A;GREEK TALENT SIGN;So;0;ON;;;;;N;;;;;
-1017B;GREEK DRACHMA SIGN;So;0;ON;;;;;N;;;;;
-1017C;GREEK OBOL SIGN;So;0;ON;;;;;N;;;;;
-1017D;GREEK TWO OBOLS SIGN;So;0;ON;;;;;N;;;;;
-1017E;GREEK THREE OBOLS SIGN;So;0;ON;;;;;N;;;;;
-1017F;GREEK FOUR OBOLS SIGN;So;0;ON;;;;;N;;;;;
-10180;GREEK FIVE OBOLS SIGN;So;0;ON;;;;;N;;;;;
-10181;GREEK METRETES SIGN;So;0;ON;;;;;N;;;;;
-10182;GREEK KYATHOS BASE SIGN;So;0;ON;;;;;N;;;;;
-10183;GREEK LITRA SIGN;So;0;ON;;;;;N;;;;;
-10184;GREEK OUNKIA SIGN;So;0;ON;;;;;N;;;;;
-10185;GREEK XESTES SIGN;So;0;ON;;;;;N;;;;;
-10186;GREEK ARTABE SIGN;So;0;ON;;;;;N;;;;;
-10187;GREEK AROURA SIGN;So;0;ON;;;;;N;;;;;
-10188;GREEK GRAMMA SIGN;So;0;ON;;;;;N;;;;;
-10189;GREEK TRYBLION BASE SIGN;So;0;ON;;;;;N;;;;;
-1018A;GREEK ZERO SIGN;No;0;ON;;;;0;N;;;;;
-10190;ROMAN SEXTANS SIGN;So;0;ON;;;;;N;;;;;
-10191;ROMAN UNCIA SIGN;So;0;ON;;;;;N;;;;;
-10192;ROMAN SEMUNCIA SIGN;So;0;ON;;;;;N;;;;;
-10193;ROMAN SEXTULA SIGN;So;0;ON;;;;;N;;;;;
-10194;ROMAN DIMIDIA SEXTULA SIGN;So;0;ON;;;;;N;;;;;
-10195;ROMAN SILIQUA SIGN;So;0;ON;;;;;N;;;;;
-10196;ROMAN DENARIUS SIGN;So;0;ON;;;;;N;;;;;
-10197;ROMAN QUINARIUS SIGN;So;0;ON;;;;;N;;;;;
-10198;ROMAN SESTERTIUS SIGN;So;0;ON;;;;;N;;;;;
-10199;ROMAN DUPONDIUS SIGN;So;0;ON;;;;;N;;;;;
-1019A;ROMAN AS SIGN;So;0;ON;;;;;N;;;;;
-1019B;ROMAN CENTURIAL SIGN;So;0;ON;;;;;N;;;;;
-101D0;PHAISTOS DISC SIGN PEDESTRIAN;So;0;L;;;;;N;;;;;
-101D1;PHAISTOS DISC SIGN PLUMED HEAD;So;0;L;;;;;N;;;;;
-101D2;PHAISTOS DISC SIGN TATTOOED HEAD;So;0;L;;;;;N;;;;;
-101D3;PHAISTOS DISC SIGN CAPTIVE;So;0;L;;;;;N;;;;;
-101D4;PHAISTOS DISC SIGN CHILD;So;0;L;;;;;N;;;;;
-101D5;PHAISTOS DISC SIGN WOMAN;So;0;L;;;;;N;;;;;
-101D6;PHAISTOS DISC SIGN HELMET;So;0;L;;;;;N;;;;;
-101D7;PHAISTOS DISC SIGN GAUNTLET;So;0;L;;;;;N;;;;;
-101D8;PHAISTOS DISC SIGN TIARA;So;0;L;;;;;N;;;;;
-101D9;PHAISTOS DISC SIGN ARROW;So;0;L;;;;;N;;;;;
-101DA;PHAISTOS DISC SIGN BOW;So;0;L;;;;;N;;;;;
-101DB;PHAISTOS DISC SIGN SHIELD;So;0;L;;;;;N;;;;;
-101DC;PHAISTOS DISC SIGN CLUB;So;0;L;;;;;N;;;;;
-101DD;PHAISTOS DISC SIGN MANACLES;So;0;L;;;;;N;;;;;
-101DE;PHAISTOS DISC SIGN MATTOCK;So;0;L;;;;;N;;;;;
-101DF;PHAISTOS DISC SIGN SAW;So;0;L;;;;;N;;;;;
-101E0;PHAISTOS DISC SIGN LID;So;0;L;;;;;N;;;;;
-101E1;PHAISTOS DISC SIGN BOOMERANG;So;0;L;;;;;N;;;;;
-101E2;PHAISTOS DISC SIGN CARPENTRY PLANE;So;0;L;;;;;N;;;;;
-101E3;PHAISTOS DISC SIGN DOLIUM;So;0;L;;;;;N;;;;;
-101E4;PHAISTOS DISC SIGN COMB;So;0;L;;;;;N;;;;;
-101E5;PHAISTOS DISC SIGN SLING;So;0;L;;;;;N;;;;;
-101E6;PHAISTOS DISC SIGN COLUMN;So;0;L;;;;;N;;;;;
-101E7;PHAISTOS DISC SIGN BEEHIVE;So;0;L;;;;;N;;;;;
-101E8;PHAISTOS DISC SIGN SHIP;So;0;L;;;;;N;;;;;
-101E9;PHAISTOS DISC SIGN HORN;So;0;L;;;;;N;;;;;
-101EA;PHAISTOS DISC SIGN HIDE;So;0;L;;;;;N;;;;;
-101EB;PHAISTOS DISC SIGN BULLS LEG;So;0;L;;;;;N;;;;;
-101EC;PHAISTOS DISC SIGN CAT;So;0;L;;;;;N;;;;;
-101ED;PHAISTOS DISC SIGN RAM;So;0;L;;;;;N;;;;;
-101EE;PHAISTOS DISC SIGN EAGLE;So;0;L;;;;;N;;;;;
-101EF;PHAISTOS DISC SIGN DOVE;So;0;L;;;;;N;;;;;
-101F0;PHAISTOS DISC SIGN TUNNY;So;0;L;;;;;N;;;;;
-101F1;PHAISTOS DISC SIGN BEE;So;0;L;;;;;N;;;;;
-101F2;PHAISTOS DISC SIGN PLANE TREE;So;0;L;;;;;N;;;;;
-101F3;PHAISTOS DISC SIGN VINE;So;0;L;;;;;N;;;;;
-101F4;PHAISTOS DISC SIGN PAPYRUS;So;0;L;;;;;N;;;;;
-101F5;PHAISTOS DISC SIGN ROSETTE;So;0;L;;;;;N;;;;;
-101F6;PHAISTOS DISC SIGN LILY;So;0;L;;;;;N;;;;;
-101F7;PHAISTOS DISC SIGN OX BACK;So;0;L;;;;;N;;;;;
-101F8;PHAISTOS DISC SIGN FLUTE;So;0;L;;;;;N;;;;;
-101F9;PHAISTOS DISC SIGN GRATER;So;0;L;;;;;N;;;;;
-101FA;PHAISTOS DISC SIGN STRAINER;So;0;L;;;;;N;;;;;
-101FB;PHAISTOS DISC SIGN SMALL AXE;So;0;L;;;;;N;;;;;
-101FC;PHAISTOS DISC SIGN WAVY BAND;So;0;L;;;;;N;;;;;
-101FD;PHAISTOS DISC SIGN COMBINING OBLIQUE STROKE;Mn;220;NSM;;;;;N;;;;;
-10280;LYCIAN LETTER A;Lo;0;L;;;;;N;;;;;
-10281;LYCIAN LETTER E;Lo;0;L;;;;;N;;;;;
-10282;LYCIAN LETTER B;Lo;0;L;;;;;N;;;;;
-10283;LYCIAN LETTER BH;Lo;0;L;;;;;N;;;;;
-10284;LYCIAN LETTER G;Lo;0;L;;;;;N;;;;;
-10285;LYCIAN LETTER D;Lo;0;L;;;;;N;;;;;
-10286;LYCIAN LETTER I;Lo;0;L;;;;;N;;;;;
-10287;LYCIAN LETTER W;Lo;0;L;;;;;N;;;;;
-10288;LYCIAN LETTER Z;Lo;0;L;;;;;N;;;;;
-10289;LYCIAN LETTER TH;Lo;0;L;;;;;N;;;;;
-1028A;LYCIAN LETTER J;Lo;0;L;;;;;N;;;;;
-1028B;LYCIAN LETTER K;Lo;0;L;;;;;N;;;;;
-1028C;LYCIAN LETTER Q;Lo;0;L;;;;;N;;;;;
-1028D;LYCIAN LETTER L;Lo;0;L;;;;;N;;;;;
-1028E;LYCIAN LETTER M;Lo;0;L;;;;;N;;;;;
-1028F;LYCIAN LETTER N;Lo;0;L;;;;;N;;;;;
-10290;LYCIAN LETTER MM;Lo;0;L;;;;;N;;;;;
-10291;LYCIAN LETTER NN;Lo;0;L;;;;;N;;;;;
-10292;LYCIAN LETTER U;Lo;0;L;;;;;N;;;;;
-10293;LYCIAN LETTER P;Lo;0;L;;;;;N;;;;;
-10294;LYCIAN LETTER KK;Lo;0;L;;;;;N;;;;;
-10295;LYCIAN LETTER R;Lo;0;L;;;;;N;;;;;
-10296;LYCIAN LETTER S;Lo;0;L;;;;;N;;;;;
-10297;LYCIAN LETTER T;Lo;0;L;;;;;N;;;;;
-10298;LYCIAN LETTER TT;Lo;0;L;;;;;N;;;;;
-10299;LYCIAN LETTER AN;Lo;0;L;;;;;N;;;;;
-1029A;LYCIAN LETTER EN;Lo;0;L;;;;;N;;;;;
-1029B;LYCIAN LETTER H;Lo;0;L;;;;;N;;;;;
-1029C;LYCIAN LETTER X;Lo;0;L;;;;;N;;;;;
-102A0;CARIAN LETTER A;Lo;0;L;;;;;N;;;;;
-102A1;CARIAN LETTER P2;Lo;0;L;;;;;N;;;;;
-102A2;CARIAN LETTER D;Lo;0;L;;;;;N;;;;;
-102A3;CARIAN LETTER L;Lo;0;L;;;;;N;;;;;
-102A4;CARIAN LETTER UUU;Lo;0;L;;;;;N;;;;;
-102A5;CARIAN LETTER R;Lo;0;L;;;;;N;;;;;
-102A6;CARIAN LETTER LD;Lo;0;L;;;;;N;;;;;
-102A7;CARIAN LETTER A2;Lo;0;L;;;;;N;;;;;
-102A8;CARIAN LETTER Q;Lo;0;L;;;;;N;;;;;
-102A9;CARIAN LETTER B;Lo;0;L;;;;;N;;;;;
-102AA;CARIAN LETTER M;Lo;0;L;;;;;N;;;;;
-102AB;CARIAN LETTER O;Lo;0;L;;;;;N;;;;;
-102AC;CARIAN LETTER D2;Lo;0;L;;;;;N;;;;;
-102AD;CARIAN LETTER T;Lo;0;L;;;;;N;;;;;
-102AE;CARIAN LETTER SH;Lo;0;L;;;;;N;;;;;
-102AF;CARIAN LETTER SH2;Lo;0;L;;;;;N;;;;;
-102B0;CARIAN LETTER S;Lo;0;L;;;;;N;;;;;
-102B1;CARIAN LETTER C-18;Lo;0;L;;;;;N;;;;;
-102B2;CARIAN LETTER U;Lo;0;L;;;;;N;;;;;
-102B3;CARIAN LETTER NN;Lo;0;L;;;;;N;;;;;
-102B4;CARIAN LETTER X;Lo;0;L;;;;;N;;;;;
-102B5;CARIAN LETTER N;Lo;0;L;;;;;N;;;;;
-102B6;CARIAN LETTER TT2;Lo;0;L;;;;;N;;;;;
-102B7;CARIAN LETTER P;Lo;0;L;;;;;N;;;;;
-102B8;CARIAN LETTER SS;Lo;0;L;;;;;N;;;;;
-102B9;CARIAN LETTER I;Lo;0;L;;;;;N;;;;;
-102BA;CARIAN LETTER E;Lo;0;L;;;;;N;;;;;
-102BB;CARIAN LETTER UUUU;Lo;0;L;;;;;N;;;;;
-102BC;CARIAN LETTER K;Lo;0;L;;;;;N;;;;;
-102BD;CARIAN LETTER K2;Lo;0;L;;;;;N;;;;;
-102BE;CARIAN LETTER ND;Lo;0;L;;;;;N;;;;;
-102BF;CARIAN LETTER UU;Lo;0;L;;;;;N;;;;;
-102C0;CARIAN LETTER G;Lo;0;L;;;;;N;;;;;
-102C1;CARIAN LETTER G2;Lo;0;L;;;;;N;;;;;
-102C2;CARIAN LETTER ST;Lo;0;L;;;;;N;;;;;
-102C3;CARIAN LETTER ST2;Lo;0;L;;;;;N;;;;;
-102C4;CARIAN LETTER NG;Lo;0;L;;;;;N;;;;;
-102C5;CARIAN LETTER II;Lo;0;L;;;;;N;;;;;
-102C6;CARIAN LETTER C-39;Lo;0;L;;;;;N;;;;;
-102C7;CARIAN LETTER TT;Lo;0;L;;;;;N;;;;;
-102C8;CARIAN LETTER UUU2;Lo;0;L;;;;;N;;;;;
-102C9;CARIAN LETTER RR;Lo;0;L;;;;;N;;;;;
-102CA;CARIAN LETTER MB;Lo;0;L;;;;;N;;;;;
-102CB;CARIAN LETTER MB2;Lo;0;L;;;;;N;;;;;
-102CC;CARIAN LETTER MB3;Lo;0;L;;;;;N;;;;;
-102CD;CARIAN LETTER MB4;Lo;0;L;;;;;N;;;;;
-102CE;CARIAN LETTER LD2;Lo;0;L;;;;;N;;;;;
-102CF;CARIAN LETTER E2;Lo;0;L;;;;;N;;;;;
-102D0;CARIAN LETTER UUU3;Lo;0;L;;;;;N;;;;;
-10300;OLD ITALIC LETTER A;Lo;0;L;;;;;N;;;;;
-10301;OLD ITALIC LETTER BE;Lo;0;L;;;;;N;;;;;
-10302;OLD ITALIC LETTER KE;Lo;0;L;;;;;N;;;;;
-10303;OLD ITALIC LETTER DE;Lo;0;L;;;;;N;;;;;
-10304;OLD ITALIC LETTER E;Lo;0;L;;;;;N;;;;;
-10305;OLD ITALIC LETTER VE;Lo;0;L;;;;;N;;;;;
-10306;OLD ITALIC LETTER ZE;Lo;0;L;;;;;N;;;;;
-10307;OLD ITALIC LETTER HE;Lo;0;L;;;;;N;;;;;
-10308;OLD ITALIC LETTER THE;Lo;0;L;;;;;N;;;;;
-10309;OLD ITALIC LETTER I;Lo;0;L;;;;;N;;;;;
-1030A;OLD ITALIC LETTER KA;Lo;0;L;;;;;N;;;;;
-1030B;OLD ITALIC LETTER EL;Lo;0;L;;;;;N;;;;;
-1030C;OLD ITALIC LETTER EM;Lo;0;L;;;;;N;;;;;
-1030D;OLD ITALIC LETTER EN;Lo;0;L;;;;;N;;;;;
-1030E;OLD ITALIC LETTER ESH;Lo;0;L;;;;;N;;;;;
-1030F;OLD ITALIC LETTER O;Lo;0;L;;;;;N;;Faliscan;;;
-10310;OLD ITALIC LETTER PE;Lo;0;L;;;;;N;;;;;
-10311;OLD ITALIC LETTER SHE;Lo;0;L;;;;;N;;;;;
-10312;OLD ITALIC LETTER KU;Lo;0;L;;;;;N;;;;;
-10313;OLD ITALIC LETTER ER;Lo;0;L;;;;;N;;;;;
-10314;OLD ITALIC LETTER ES;Lo;0;L;;;;;N;;;;;
-10315;OLD ITALIC LETTER TE;Lo;0;L;;;;;N;;;;;
-10316;OLD ITALIC LETTER U;Lo;0;L;;;;;N;;;;;
-10317;OLD ITALIC LETTER EKS;Lo;0;L;;;;;N;;Faliscan;;;
-10318;OLD ITALIC LETTER PHE;Lo;0;L;;;;;N;;;;;
-10319;OLD ITALIC LETTER KHE;Lo;0;L;;;;;N;;;;;
-1031A;OLD ITALIC LETTER EF;Lo;0;L;;;;;N;;;;;
-1031B;OLD ITALIC LETTER ERS;Lo;0;L;;;;;N;;Umbrian;;;
-1031C;OLD ITALIC LETTER CHE;Lo;0;L;;;;;N;;Umbrian;;;
-1031D;OLD ITALIC LETTER II;Lo;0;L;;;;;N;;Oscan;;;
-1031E;OLD ITALIC LETTER UU;Lo;0;L;;;;;N;;Oscan;;;
-10320;OLD ITALIC NUMERAL ONE;No;0;L;;;;1;N;;;;;
-10321;OLD ITALIC NUMERAL FIVE;No;0;L;;;;5;N;;;;;
-10322;OLD ITALIC NUMERAL TEN;No;0;L;;;;10;N;;;;;
-10323;OLD ITALIC NUMERAL FIFTY;No;0;L;;;;50;N;;;;;
-10330;GOTHIC LETTER AHSA;Lo;0;L;;;;;N;;;;;
-10331;GOTHIC LETTER BAIRKAN;Lo;0;L;;;;;N;;;;;
-10332;GOTHIC LETTER GIBA;Lo;0;L;;;;;N;;;;;
-10333;GOTHIC LETTER DAGS;Lo;0;L;;;;;N;;;;;
-10334;GOTHIC LETTER AIHVUS;Lo;0;L;;;;;N;;;;;
-10335;GOTHIC LETTER QAIRTHRA;Lo;0;L;;;;;N;;;;;
-10336;GOTHIC LETTER IUJA;Lo;0;L;;;;;N;;;;;
-10337;GOTHIC LETTER HAGL;Lo;0;L;;;;;N;;;;;
-10338;GOTHIC LETTER THIUTH;Lo;0;L;;;;;N;;;;;
-10339;GOTHIC LETTER EIS;Lo;0;L;;;;;N;;;;;
-1033A;GOTHIC LETTER KUSMA;Lo;0;L;;;;;N;;;;;
-1033B;GOTHIC LETTER LAGUS;Lo;0;L;;;;;N;;;;;
-1033C;GOTHIC LETTER MANNA;Lo;0;L;;;;;N;;;;;
-1033D;GOTHIC LETTER NAUTHS;Lo;0;L;;;;;N;;;;;
-1033E;GOTHIC LETTER JER;Lo;0;L;;;;;N;;;;;
-1033F;GOTHIC LETTER URUS;Lo;0;L;;;;;N;;;;;
-10340;GOTHIC LETTER PAIRTHRA;Lo;0;L;;;;;N;;;;;
-10341;GOTHIC LETTER NINETY;Nl;0;L;;;;90;N;;;;;
-10342;GOTHIC LETTER RAIDA;Lo;0;L;;;;;N;;;;;
-10343;GOTHIC LETTER SAUIL;Lo;0;L;;;;;N;;;;;
-10344;GOTHIC LETTER TEIWS;Lo;0;L;;;;;N;;;;;
-10345;GOTHIC LETTER WINJA;Lo;0;L;;;;;N;;;;;
-10346;GOTHIC LETTER FAIHU;Lo;0;L;;;;;N;;;;;
-10347;GOTHIC LETTER IGGWS;Lo;0;L;;;;;N;;;;;
-10348;GOTHIC LETTER HWAIR;Lo;0;L;;;;;N;;;;;
-10349;GOTHIC LETTER OTHAL;Lo;0;L;;;;;N;;;;;
-1034A;GOTHIC LETTER NINE HUNDRED;Nl;0;L;;;;900;N;;;;;
-10380;UGARITIC LETTER ALPA;Lo;0;L;;;;;N;;;;;
-10381;UGARITIC LETTER BETA;Lo;0;L;;;;;N;;;;;
-10382;UGARITIC LETTER GAMLA;Lo;0;L;;;;;N;;;;;
-10383;UGARITIC LETTER KHA;Lo;0;L;;;;;N;;;;;
-10384;UGARITIC LETTER DELTA;Lo;0;L;;;;;N;;;;;
-10385;UGARITIC LETTER HO;Lo;0;L;;;;;N;;;;;
-10386;UGARITIC LETTER WO;Lo;0;L;;;;;N;;;;;
-10387;UGARITIC LETTER ZETA;Lo;0;L;;;;;N;;;;;
-10388;UGARITIC LETTER HOTA;Lo;0;L;;;;;N;;;;;
-10389;UGARITIC LETTER TET;Lo;0;L;;;;;N;;;;;
-1038A;UGARITIC LETTER YOD;Lo;0;L;;;;;N;;;;;
-1038B;UGARITIC LETTER KAF;Lo;0;L;;;;;N;;;;;
-1038C;UGARITIC LETTER SHIN;Lo;0;L;;;;;N;;;;;
-1038D;UGARITIC LETTER LAMDA;Lo;0;L;;;;;N;;;;;
-1038E;UGARITIC LETTER MEM;Lo;0;L;;;;;N;;;;;
-1038F;UGARITIC LETTER DHAL;Lo;0;L;;;;;N;;;;;
-10390;UGARITIC LETTER NUN;Lo;0;L;;;;;N;;;;;
-10391;UGARITIC LETTER ZU;Lo;0;L;;;;;N;;;;;
-10392;UGARITIC LETTER SAMKA;Lo;0;L;;;;;N;;;;;
-10393;UGARITIC LETTER AIN;Lo;0;L;;;;;N;;;;;
-10394;UGARITIC LETTER PU;Lo;0;L;;;;;N;;;;;
-10395;UGARITIC LETTER SADE;Lo;0;L;;;;;N;;;;;
-10396;UGARITIC LETTER QOPA;Lo;0;L;;;;;N;;;;;
-10397;UGARITIC LETTER RASHA;Lo;0;L;;;;;N;;;;;
-10398;UGARITIC LETTER THANNA;Lo;0;L;;;;;N;;;;;
-10399;UGARITIC LETTER GHAIN;Lo;0;L;;;;;N;;;;;
-1039A;UGARITIC LETTER TO;Lo;0;L;;;;;N;;;;;
-1039B;UGARITIC LETTER I;Lo;0;L;;;;;N;;;;;
-1039C;UGARITIC LETTER U;Lo;0;L;;;;;N;;;;;
-1039D;UGARITIC LETTER SSU;Lo;0;L;;;;;N;;;;;
-1039F;UGARITIC WORD DIVIDER;Po;0;L;;;;;N;;;;;
-103A0;OLD PERSIAN SIGN A;Lo;0;L;;;;;N;;;;;
-103A1;OLD PERSIAN SIGN I;Lo;0;L;;;;;N;;;;;
-103A2;OLD PERSIAN SIGN U;Lo;0;L;;;;;N;;;;;
-103A3;OLD PERSIAN SIGN KA;Lo;0;L;;;;;N;;;;;
-103A4;OLD PERSIAN SIGN KU;Lo;0;L;;;;;N;;;;;
-103A5;OLD PERSIAN SIGN GA;Lo;0;L;;;;;N;;;;;
-103A6;OLD PERSIAN SIGN GU;Lo;0;L;;;;;N;;;;;
-103A7;OLD PERSIAN SIGN XA;Lo;0;L;;;;;N;;;;;
-103A8;OLD PERSIAN SIGN CA;Lo;0;L;;;;;N;;;;;
-103A9;OLD PERSIAN SIGN JA;Lo;0;L;;;;;N;;;;;
-103AA;OLD PERSIAN SIGN JI;Lo;0;L;;;;;N;;;;;
-103AB;OLD PERSIAN SIGN TA;Lo;0;L;;;;;N;;;;;
-103AC;OLD PERSIAN SIGN TU;Lo;0;L;;;;;N;;;;;
-103AD;OLD PERSIAN SIGN DA;Lo;0;L;;;;;N;;;;;
-103AE;OLD PERSIAN SIGN DI;Lo;0;L;;;;;N;;;;;
-103AF;OLD PERSIAN SIGN DU;Lo;0;L;;;;;N;;;;;
-103B0;OLD PERSIAN SIGN THA;Lo;0;L;;;;;N;;;;;
-103B1;OLD PERSIAN SIGN PA;Lo;0;L;;;;;N;;;;;
-103B2;OLD PERSIAN SIGN BA;Lo;0;L;;;;;N;;;;;
-103B3;OLD PERSIAN SIGN FA;Lo;0;L;;;;;N;;;;;
-103B4;OLD PERSIAN SIGN NA;Lo;0;L;;;;;N;;;;;
-103B5;OLD PERSIAN SIGN NU;Lo;0;L;;;;;N;;;;;
-103B6;OLD PERSIAN SIGN MA;Lo;0;L;;;;;N;;;;;
-103B7;OLD PERSIAN SIGN MI;Lo;0;L;;;;;N;;;;;
-103B8;OLD PERSIAN SIGN MU;Lo;0;L;;;;;N;;;;;
-103B9;OLD PERSIAN SIGN YA;Lo;0;L;;;;;N;;;;;
-103BA;OLD PERSIAN SIGN VA;Lo;0;L;;;;;N;;;;;
-103BB;OLD PERSIAN SIGN VI;Lo;0;L;;;;;N;;;;;
-103BC;OLD PERSIAN SIGN RA;Lo;0;L;;;;;N;;;;;
-103BD;OLD PERSIAN SIGN RU;Lo;0;L;;;;;N;;;;;
-103BE;OLD PERSIAN SIGN LA;Lo;0;L;;;;;N;;;;;
-103BF;OLD PERSIAN SIGN SA;Lo;0;L;;;;;N;;;;;
-103C0;OLD PERSIAN SIGN ZA;Lo;0;L;;;;;N;;;;;
-103C1;OLD PERSIAN SIGN SHA;Lo;0;L;;;;;N;;;;;
-103C2;OLD PERSIAN SIGN SSA;Lo;0;L;;;;;N;;;;;
-103C3;OLD PERSIAN SIGN HA;Lo;0;L;;;;;N;;;;;
-103C8;OLD PERSIAN SIGN AURAMAZDAA;Lo;0;L;;;;;N;;;;;
-103C9;OLD PERSIAN SIGN AURAMAZDAA-2;Lo;0;L;;;;;N;;;;;
-103CA;OLD PERSIAN SIGN AURAMAZDAAHA;Lo;0;L;;;;;N;;;;;
-103CB;OLD PERSIAN SIGN XSHAAYATHIYA;Lo;0;L;;;;;N;;;;;
-103CC;OLD PERSIAN SIGN DAHYAAUSH;Lo;0;L;;;;;N;;;;;
-103CD;OLD PERSIAN SIGN DAHYAAUSH-2;Lo;0;L;;;;;N;;;;;
-103CE;OLD PERSIAN SIGN BAGA;Lo;0;L;;;;;N;;;;;
-103CF;OLD PERSIAN SIGN BUUMISH;Lo;0;L;;;;;N;;;;;
-103D0;OLD PERSIAN WORD DIVIDER;Po;0;L;;;;;N;;;;;
-103D1;OLD PERSIAN NUMBER ONE;Nl;0;L;;;;1;N;;;;;
-103D2;OLD PERSIAN NUMBER TWO;Nl;0;L;;;;2;N;;;;;
-103D3;OLD PERSIAN NUMBER TEN;Nl;0;L;;;;10;N;;;;;
-103D4;OLD PERSIAN NUMBER TWENTY;Nl;0;L;;;;20;N;;;;;
-103D5;OLD PERSIAN NUMBER HUNDRED;Nl;0;L;;;;100;N;;;;;
-10400;DESERET CAPITAL LETTER LONG I;Lu;0;L;;;;;N;;;;10428;
-10401;DESERET CAPITAL LETTER LONG E;Lu;0;L;;;;;N;;;;10429;
-10402;DESERET CAPITAL LETTER LONG A;Lu;0;L;;;;;N;;;;1042A;
-10403;DESERET CAPITAL LETTER LONG AH;Lu;0;L;;;;;N;;;;1042B;
-10404;DESERET CAPITAL LETTER LONG O;Lu;0;L;;;;;N;;;;1042C;
-10405;DESERET CAPITAL LETTER LONG OO;Lu;0;L;;;;;N;;;;1042D;
-10406;DESERET CAPITAL LETTER SHORT I;Lu;0;L;;;;;N;;;;1042E;
-10407;DESERET CAPITAL LETTER SHORT E;Lu;0;L;;;;;N;;;;1042F;
-10408;DESERET CAPITAL LETTER SHORT A;Lu;0;L;;;;;N;;;;10430;
-10409;DESERET CAPITAL LETTER SHORT AH;Lu;0;L;;;;;N;;;;10431;
-1040A;DESERET CAPITAL LETTER SHORT O;Lu;0;L;;;;;N;;;;10432;
-1040B;DESERET CAPITAL LETTER SHORT OO;Lu;0;L;;;;;N;;;;10433;
-1040C;DESERET CAPITAL LETTER AY;Lu;0;L;;;;;N;;;;10434;
-1040D;DESERET CAPITAL LETTER OW;Lu;0;L;;;;;N;;;;10435;
-1040E;DESERET CAPITAL LETTER WU;Lu;0;L;;;;;N;;;;10436;
-1040F;DESERET CAPITAL LETTER YEE;Lu;0;L;;;;;N;;;;10437;
-10410;DESERET CAPITAL LETTER H;Lu;0;L;;;;;N;;;;10438;
-10411;DESERET CAPITAL LETTER PEE;Lu;0;L;;;;;N;;;;10439;
-10412;DESERET CAPITAL LETTER BEE;Lu;0;L;;;;;N;;;;1043A;
-10413;DESERET CAPITAL LETTER TEE;Lu;0;L;;;;;N;;;;1043B;
-10414;DESERET CAPITAL LETTER DEE;Lu;0;L;;;;;N;;;;1043C;
-10415;DESERET CAPITAL LETTER CHEE;Lu;0;L;;;;;N;;;;1043D;
-10416;DESERET CAPITAL LETTER JEE;Lu;0;L;;;;;N;;;;1043E;
-10417;DESERET CAPITAL LETTER KAY;Lu;0;L;;;;;N;;;;1043F;
-10418;DESERET CAPITAL LETTER GAY;Lu;0;L;;;;;N;;;;10440;
-10419;DESERET CAPITAL LETTER EF;Lu;0;L;;;;;N;;;;10441;
-1041A;DESERET CAPITAL LETTER VEE;Lu;0;L;;;;;N;;;;10442;
-1041B;DESERET CAPITAL LETTER ETH;Lu;0;L;;;;;N;;;;10443;
-1041C;DESERET CAPITAL LETTER THEE;Lu;0;L;;;;;N;;;;10444;
-1041D;DESERET CAPITAL LETTER ES;Lu;0;L;;;;;N;;;;10445;
-1041E;DESERET CAPITAL LETTER ZEE;Lu;0;L;;;;;N;;;;10446;
-1041F;DESERET CAPITAL LETTER ESH;Lu;0;L;;;;;N;;;;10447;
-10420;DESERET CAPITAL LETTER ZHEE;Lu;0;L;;;;;N;;;;10448;
-10421;DESERET CAPITAL LETTER ER;Lu;0;L;;;;;N;;;;10449;
-10422;DESERET CAPITAL LETTER EL;Lu;0;L;;;;;N;;;;1044A;
-10423;DESERET CAPITAL LETTER EM;Lu;0;L;;;;;N;;;;1044B;
-10424;DESERET CAPITAL LETTER EN;Lu;0;L;;;;;N;;;;1044C;
-10425;DESERET CAPITAL LETTER ENG;Lu;0;L;;;;;N;;;;1044D;
-10426;DESERET CAPITAL LETTER OI;Lu;0;L;;;;;N;;;;1044E;
-10427;DESERET CAPITAL LETTER EW;Lu;0;L;;;;;N;;;;1044F;
-10428;DESERET SMALL LETTER LONG I;Ll;0;L;;;;;N;;;10400;;10400
-10429;DESERET SMALL LETTER LONG E;Ll;0;L;;;;;N;;;10401;;10401
-1042A;DESERET SMALL LETTER LONG A;Ll;0;L;;;;;N;;;10402;;10402
-1042B;DESERET SMALL LETTER LONG AH;Ll;0;L;;;;;N;;;10403;;10403
-1042C;DESERET SMALL LETTER LONG O;Ll;0;L;;;;;N;;;10404;;10404
-1042D;DESERET SMALL LETTER LONG OO;Ll;0;L;;;;;N;;;10405;;10405
-1042E;DESERET SMALL LETTER SHORT I;Ll;0;L;;;;;N;;;10406;;10406
-1042F;DESERET SMALL LETTER SHORT E;Ll;0;L;;;;;N;;;10407;;10407
-10430;DESERET SMALL LETTER SHORT A;Ll;0;L;;;;;N;;;10408;;10408
-10431;DESERET SMALL LETTER SHORT AH;Ll;0;L;;;;;N;;;10409;;10409
-10432;DESERET SMALL LETTER SHORT O;Ll;0;L;;;;;N;;;1040A;;1040A
-10433;DESERET SMALL LETTER SHORT OO;Ll;0;L;;;;;N;;;1040B;;1040B
-10434;DESERET SMALL LETTER AY;Ll;0;L;;;;;N;;;1040C;;1040C
-10435;DESERET SMALL LETTER OW;Ll;0;L;;;;;N;;;1040D;;1040D
-10436;DESERET SMALL LETTER WU;Ll;0;L;;;;;N;;;1040E;;1040E
-10437;DESERET SMALL LETTER YEE;Ll;0;L;;;;;N;;;1040F;;1040F
-10438;DESERET SMALL LETTER H;Ll;0;L;;;;;N;;;10410;;10410
-10439;DESERET SMALL LETTER PEE;Ll;0;L;;;;;N;;;10411;;10411
-1043A;DESERET SMALL LETTER BEE;Ll;0;L;;;;;N;;;10412;;10412
-1043B;DESERET SMALL LETTER TEE;Ll;0;L;;;;;N;;;10413;;10413
-1043C;DESERET SMALL LETTER DEE;Ll;0;L;;;;;N;;;10414;;10414
-1043D;DESERET SMALL LETTER CHEE;Ll;0;L;;;;;N;;;10415;;10415
-1043E;DESERET SMALL LETTER JEE;Ll;0;L;;;;;N;;;10416;;10416
-1043F;DESERET SMALL LETTER KAY;Ll;0;L;;;;;N;;;10417;;10417
-10440;DESERET SMALL LETTER GAY;Ll;0;L;;;;;N;;;10418;;10418
-10441;DESERET SMALL LETTER EF;Ll;0;L;;;;;N;;;10419;;10419
-10442;DESERET SMALL LETTER VEE;Ll;0;L;;;;;N;;;1041A;;1041A
-10443;DESERET SMALL LETTER ETH;Ll;0;L;;;;;N;;;1041B;;1041B
-10444;DESERET SMALL LETTER THEE;Ll;0;L;;;;;N;;;1041C;;1041C
-10445;DESERET SMALL LETTER ES;Ll;0;L;;;;;N;;;1041D;;1041D
-10446;DESERET SMALL LETTER ZEE;Ll;0;L;;;;;N;;;1041E;;1041E
-10447;DESERET SMALL LETTER ESH;Ll;0;L;;;;;N;;;1041F;;1041F
-10448;DESERET SMALL LETTER ZHEE;Ll;0;L;;;;;N;;;10420;;10420
-10449;DESERET SMALL LETTER ER;Ll;0;L;;;;;N;;;10421;;10421
-1044A;DESERET SMALL LETTER EL;Ll;0;L;;;;;N;;;10422;;10422
-1044B;DESERET SMALL LETTER EM;Ll;0;L;;;;;N;;;10423;;10423
-1044C;DESERET SMALL LETTER EN;Ll;0;L;;;;;N;;;10424;;10424
-1044D;DESERET SMALL LETTER ENG;Ll;0;L;;;;;N;;;10425;;10425
-1044E;DESERET SMALL LETTER OI;Ll;0;L;;;;;N;;;10426;;10426
-1044F;DESERET SMALL LETTER EW;Ll;0;L;;;;;N;;;10427;;10427
-10450;SHAVIAN LETTER PEEP;Lo;0;L;;;;;N;;;;;
-10451;SHAVIAN LETTER TOT;Lo;0;L;;;;;N;;;;;
-10452;SHAVIAN LETTER KICK;Lo;0;L;;;;;N;;;;;
-10453;SHAVIAN LETTER FEE;Lo;0;L;;;;;N;;;;;
-10454;SHAVIAN LETTER THIGH;Lo;0;L;;;;;N;;;;;
-10455;SHAVIAN LETTER SO;Lo;0;L;;;;;N;;;;;
-10456;SHAVIAN LETTER SURE;Lo;0;L;;;;;N;;;;;
-10457;SHAVIAN LETTER CHURCH;Lo;0;L;;;;;N;;;;;
-10458;SHAVIAN LETTER YEA;Lo;0;L;;;;;N;;;;;
-10459;SHAVIAN LETTER HUNG;Lo;0;L;;;;;N;;;;;
-1045A;SHAVIAN LETTER BIB;Lo;0;L;;;;;N;;;;;
-1045B;SHAVIAN LETTER DEAD;Lo;0;L;;;;;N;;;;;
-1045C;SHAVIAN LETTER GAG;Lo;0;L;;;;;N;;;;;
-1045D;SHAVIAN LETTER VOW;Lo;0;L;;;;;N;;;;;
-1045E;SHAVIAN LETTER THEY;Lo;0;L;;;;;N;;;;;
-1045F;SHAVIAN LETTER ZOO;Lo;0;L;;;;;N;;;;;
-10460;SHAVIAN LETTER MEASURE;Lo;0;L;;;;;N;;;;;
-10461;SHAVIAN LETTER JUDGE;Lo;0;L;;;;;N;;;;;
-10462;SHAVIAN LETTER WOE;Lo;0;L;;;;;N;;;;;
-10463;SHAVIAN LETTER HA-HA;Lo;0;L;;;;;N;;;;;
-10464;SHAVIAN LETTER LOLL;Lo;0;L;;;;;N;;;;;
-10465;SHAVIAN LETTER MIME;Lo;0;L;;;;;N;;;;;
-10466;SHAVIAN LETTER IF;Lo;0;L;;;;;N;;;;;
-10467;SHAVIAN LETTER EGG;Lo;0;L;;;;;N;;;;;
-10468;SHAVIAN LETTER ASH;Lo;0;L;;;;;N;;;;;
-10469;SHAVIAN LETTER ADO;Lo;0;L;;;;;N;;;;;
-1046A;SHAVIAN LETTER ON;Lo;0;L;;;;;N;;;;;
-1046B;SHAVIAN LETTER WOOL;Lo;0;L;;;;;N;;;;;
-1046C;SHAVIAN LETTER OUT;Lo;0;L;;;;;N;;;;;
-1046D;SHAVIAN LETTER AH;Lo;0;L;;;;;N;;;;;
-1046E;SHAVIAN LETTER ROAR;Lo;0;L;;;;;N;;;;;
-1046F;SHAVIAN LETTER NUN;Lo;0;L;;;;;N;;;;;
-10470;SHAVIAN LETTER EAT;Lo;0;L;;;;;N;;;;;
-10471;SHAVIAN LETTER AGE;Lo;0;L;;;;;N;;;;;
-10472;SHAVIAN LETTER ICE;Lo;0;L;;;;;N;;;;;
-10473;SHAVIAN LETTER UP;Lo;0;L;;;;;N;;;;;
-10474;SHAVIAN LETTER OAK;Lo;0;L;;;;;N;;;;;
-10475;SHAVIAN LETTER OOZE;Lo;0;L;;;;;N;;;;;
-10476;SHAVIAN LETTER OIL;Lo;0;L;;;;;N;;;;;
-10477;SHAVIAN LETTER AWE;Lo;0;L;;;;;N;;;;;
-10478;SHAVIAN LETTER ARE;Lo;0;L;;;;;N;;;;;
-10479;SHAVIAN LETTER OR;Lo;0;L;;;;;N;;;;;
-1047A;SHAVIAN LETTER AIR;Lo;0;L;;;;;N;;;;;
-1047B;SHAVIAN LETTER ERR;Lo;0;L;;;;;N;;;;;
-1047C;SHAVIAN LETTER ARRAY;Lo;0;L;;;;;N;;;;;
-1047D;SHAVIAN LETTER EAR;Lo;0;L;;;;;N;;;;;
-1047E;SHAVIAN LETTER IAN;Lo;0;L;;;;;N;;;;;
-1047F;SHAVIAN LETTER YEW;Lo;0;L;;;;;N;;;;;
-10480;OSMANYA LETTER ALEF;Lo;0;L;;;;;N;;;;;
-10481;OSMANYA LETTER BA;Lo;0;L;;;;;N;;;;;
-10482;OSMANYA LETTER TA;Lo;0;L;;;;;N;;;;;
-10483;OSMANYA LETTER JA;Lo;0;L;;;;;N;;;;;
-10484;OSMANYA LETTER XA;Lo;0;L;;;;;N;;;;;
-10485;OSMANYA LETTER KHA;Lo;0;L;;;;;N;;;;;
-10486;OSMANYA LETTER DEEL;Lo;0;L;;;;;N;;;;;
-10487;OSMANYA LETTER RA;Lo;0;L;;;;;N;;;;;
-10488;OSMANYA LETTER SA;Lo;0;L;;;;;N;;;;;
-10489;OSMANYA LETTER SHIIN;Lo;0;L;;;;;N;;;;;
-1048A;OSMANYA LETTER DHA;Lo;0;L;;;;;N;;;;;
-1048B;OSMANYA LETTER CAYN;Lo;0;L;;;;;N;;;;;
-1048C;OSMANYA LETTER GA;Lo;0;L;;;;;N;;;;;
-1048D;OSMANYA LETTER FA;Lo;0;L;;;;;N;;;;;
-1048E;OSMANYA LETTER QAAF;Lo;0;L;;;;;N;;;;;
-1048F;OSMANYA LETTER KAAF;Lo;0;L;;;;;N;;;;;
-10490;OSMANYA LETTER LAAN;Lo;0;L;;;;;N;;;;;
-10491;OSMANYA LETTER MIIN;Lo;0;L;;;;;N;;;;;
-10492;OSMANYA LETTER NUUN;Lo;0;L;;;;;N;;;;;
-10493;OSMANYA LETTER WAW;Lo;0;L;;;;;N;;;;;
-10494;OSMANYA LETTER HA;Lo;0;L;;;;;N;;;;;
-10495;OSMANYA LETTER YA;Lo;0;L;;;;;N;;;;;
-10496;OSMANYA LETTER A;Lo;0;L;;;;;N;;;;;
-10497;OSMANYA LETTER E;Lo;0;L;;;;;N;;;;;
-10498;OSMANYA LETTER I;Lo;0;L;;;;;N;;;;;
-10499;OSMANYA LETTER O;Lo;0;L;;;;;N;;;;;
-1049A;OSMANYA LETTER U;Lo;0;L;;;;;N;;;;;
-1049B;OSMANYA LETTER AA;Lo;0;L;;;;;N;;;;;
-1049C;OSMANYA LETTER EE;Lo;0;L;;;;;N;;;;;
-1049D;OSMANYA LETTER OO;Lo;0;L;;;;;N;;;;;
-104A0;OSMANYA DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
-104A1;OSMANYA DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
-104A2;OSMANYA DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
-104A3;OSMANYA DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
-104A4;OSMANYA DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
-104A5;OSMANYA DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
-104A6;OSMANYA DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
-104A7;OSMANYA DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
-104A8;OSMANYA DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
-104A9;OSMANYA DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
-10800;CYPRIOT SYLLABLE A;Lo;0;R;;;;;N;;;;;
-10801;CYPRIOT SYLLABLE E;Lo;0;R;;;;;N;;;;;
-10802;CYPRIOT SYLLABLE I;Lo;0;R;;;;;N;;;;;
-10803;CYPRIOT SYLLABLE O;Lo;0;R;;;;;N;;;;;
-10804;CYPRIOT SYLLABLE U;Lo;0;R;;;;;N;;;;;
-10805;CYPRIOT SYLLABLE JA;Lo;0;R;;;;;N;;;;;
-10808;CYPRIOT SYLLABLE JO;Lo;0;R;;;;;N;;;;;
-1080A;CYPRIOT SYLLABLE KA;Lo;0;R;;;;;N;;;;;
-1080B;CYPRIOT SYLLABLE KE;Lo;0;R;;;;;N;;;;;
-1080C;CYPRIOT SYLLABLE KI;Lo;0;R;;;;;N;;;;;
-1080D;CYPRIOT SYLLABLE KO;Lo;0;R;;;;;N;;;;;
-1080E;CYPRIOT SYLLABLE KU;Lo;0;R;;;;;N;;;;;
-1080F;CYPRIOT SYLLABLE LA;Lo;0;R;;;;;N;;;;;
-10810;CYPRIOT SYLLABLE LE;Lo;0;R;;;;;N;;;;;
-10811;CYPRIOT SYLLABLE LI;Lo;0;R;;;;;N;;;;;
-10812;CYPRIOT SYLLABLE LO;Lo;0;R;;;;;N;;;;;
-10813;CYPRIOT SYLLABLE LU;Lo;0;R;;;;;N;;;;;
-10814;CYPRIOT SYLLABLE MA;Lo;0;R;;;;;N;;;;;
-10815;CYPRIOT SYLLABLE ME;Lo;0;R;;;;;N;;;;;
-10816;CYPRIOT SYLLABLE MI;Lo;0;R;;;;;N;;;;;
-10817;CYPRIOT SYLLABLE MO;Lo;0;R;;;;;N;;;;;
-10818;CYPRIOT SYLLABLE MU;Lo;0;R;;;;;N;;;;;
-10819;CYPRIOT SYLLABLE NA;Lo;0;R;;;;;N;;;;;
-1081A;CYPRIOT SYLLABLE NE;Lo;0;R;;;;;N;;;;;
-1081B;CYPRIOT SYLLABLE NI;Lo;0;R;;;;;N;;;;;
-1081C;CYPRIOT SYLLABLE NO;Lo;0;R;;;;;N;;;;;
-1081D;CYPRIOT SYLLABLE NU;Lo;0;R;;;;;N;;;;;
-1081E;CYPRIOT SYLLABLE PA;Lo;0;R;;;;;N;;;;;
-1081F;CYPRIOT SYLLABLE PE;Lo;0;R;;;;;N;;;;;
-10820;CYPRIOT SYLLABLE PI;Lo;0;R;;;;;N;;;;;
-10821;CYPRIOT SYLLABLE PO;Lo;0;R;;;;;N;;;;;
-10822;CYPRIOT SYLLABLE PU;Lo;0;R;;;;;N;;;;;
-10823;CYPRIOT SYLLABLE RA;Lo;0;R;;;;;N;;;;;
-10824;CYPRIOT SYLLABLE RE;Lo;0;R;;;;;N;;;;;
-10825;CYPRIOT SYLLABLE RI;Lo;0;R;;;;;N;;;;;
-10826;CYPRIOT SYLLABLE RO;Lo;0;R;;;;;N;;;;;
-10827;CYPRIOT SYLLABLE RU;Lo;0;R;;;;;N;;;;;
-10828;CYPRIOT SYLLABLE SA;Lo;0;R;;;;;N;;;;;
-10829;CYPRIOT SYLLABLE SE;Lo;0;R;;;;;N;;;;;
-1082A;CYPRIOT SYLLABLE SI;Lo;0;R;;;;;N;;;;;
-1082B;CYPRIOT SYLLABLE SO;Lo;0;R;;;;;N;;;;;
-1082C;CYPRIOT SYLLABLE SU;Lo;0;R;;;;;N;;;;;
-1082D;CYPRIOT SYLLABLE TA;Lo;0;R;;;;;N;;;;;
-1082E;CYPRIOT SYLLABLE TE;Lo;0;R;;;;;N;;;;;
-1082F;CYPRIOT SYLLABLE TI;Lo;0;R;;;;;N;;;;;
-10830;CYPRIOT SYLLABLE TO;Lo;0;R;;;;;N;;;;;
-10831;CYPRIOT SYLLABLE TU;Lo;0;R;;;;;N;;;;;
-10832;CYPRIOT SYLLABLE WA;Lo;0;R;;;;;N;;;;;
-10833;CYPRIOT SYLLABLE WE;Lo;0;R;;;;;N;;;;;
-10834;CYPRIOT SYLLABLE WI;Lo;0;R;;;;;N;;;;;
-10835;CYPRIOT SYLLABLE WO;Lo;0;R;;;;;N;;;;;
-10837;CYPRIOT SYLLABLE XA;Lo;0;R;;;;;N;;;;;
-10838;CYPRIOT SYLLABLE XE;Lo;0;R;;;;;N;;;;;
-1083C;CYPRIOT SYLLABLE ZA;Lo;0;R;;;;;N;;;;;
-1083F;CYPRIOT SYLLABLE ZO;Lo;0;R;;;;;N;;;;;
-10900;PHOENICIAN LETTER ALF;Lo;0;R;;;;;N;;;;;
-10901;PHOENICIAN LETTER BET;Lo;0;R;;;;;N;;;;;
-10902;PHOENICIAN LETTER GAML;Lo;0;R;;;;;N;;;;;
-10903;PHOENICIAN LETTER DELT;Lo;0;R;;;;;N;;;;;
-10904;PHOENICIAN LETTER HE;Lo;0;R;;;;;N;;;;;
-10905;PHOENICIAN LETTER WAU;Lo;0;R;;;;;N;;;;;
-10906;PHOENICIAN LETTER ZAI;Lo;0;R;;;;;N;;;;;
-10907;PHOENICIAN LETTER HET;Lo;0;R;;;;;N;;;;;
-10908;PHOENICIAN LETTER TET;Lo;0;R;;;;;N;;;;;
-10909;PHOENICIAN LETTER YOD;Lo;0;R;;;;;N;;;;;
-1090A;PHOENICIAN LETTER KAF;Lo;0;R;;;;;N;;;;;
-1090B;PHOENICIAN LETTER LAMD;Lo;0;R;;;;;N;;;;;
-1090C;PHOENICIAN LETTER MEM;Lo;0;R;;;;;N;;;;;
-1090D;PHOENICIAN LETTER NUN;Lo;0;R;;;;;N;;;;;
-1090E;PHOENICIAN LETTER SEMK;Lo;0;R;;;;;N;;;;;
-1090F;PHOENICIAN LETTER AIN;Lo;0;R;;;;;N;;;;;
-10910;PHOENICIAN LETTER PE;Lo;0;R;;;;;N;;;;;
-10911;PHOENICIAN LETTER SADE;Lo;0;R;;;;;N;;;;;
-10912;PHOENICIAN LETTER QOF;Lo;0;R;;;;;N;;;;;
-10913;PHOENICIAN LETTER ROSH;Lo;0;R;;;;;N;;;;;
-10914;PHOENICIAN LETTER SHIN;Lo;0;R;;;;;N;;;;;
-10915;PHOENICIAN LETTER TAU;Lo;0;R;;;;;N;;;;;
-10916;PHOENICIAN NUMBER ONE;No;0;R;;;;1;N;;;;;
-10917;PHOENICIAN NUMBER TEN;No;0;R;;;;10;N;;;;;
-10918;PHOENICIAN NUMBER TWENTY;No;0;R;;;;20;N;;;;;
-10919;PHOENICIAN NUMBER ONE HUNDRED;No;0;R;;;;100;N;;;;;
-1091F;PHOENICIAN WORD SEPARATOR;Po;0;ON;;;;;N;;;;;
-10920;LYDIAN LETTER A;Lo;0;R;;;;;N;;;;;
-10921;LYDIAN LETTER B;Lo;0;R;;;;;N;;;;;
-10922;LYDIAN LETTER G;Lo;0;R;;;;;N;;;;;
-10923;LYDIAN LETTER D;Lo;0;R;;;;;N;;;;;
-10924;LYDIAN LETTER E;Lo;0;R;;;;;N;;;;;
-10925;LYDIAN LETTER V;Lo;0;R;;;;;N;;;;;
-10926;LYDIAN LETTER I;Lo;0;R;;;;;N;;;;;
-10927;LYDIAN LETTER Y;Lo;0;R;;;;;N;;;;;
-10928;LYDIAN LETTER K;Lo;0;R;;;;;N;;;;;
-10929;LYDIAN LETTER L;Lo;0;R;;;;;N;;;;;
-1092A;LYDIAN LETTER M;Lo;0;R;;;;;N;;;;;
-1092B;LYDIAN LETTER N;Lo;0;R;;;;;N;;;;;
-1092C;LYDIAN LETTER O;Lo;0;R;;;;;N;;;;;
-1092D;LYDIAN LETTER R;Lo;0;R;;;;;N;;;;;
-1092E;LYDIAN LETTER SS;Lo;0;R;;;;;N;;;;;
-1092F;LYDIAN LETTER T;Lo;0;R;;;;;N;;;;;
-10930;LYDIAN LETTER U;Lo;0;R;;;;;N;;;;;
-10931;LYDIAN LETTER F;Lo;0;R;;;;;N;;;;;
-10932;LYDIAN LETTER Q;Lo;0;R;;;;;N;;;;;
-10933;LYDIAN LETTER S;Lo;0;R;;;;;N;;;;;
-10934;LYDIAN LETTER TT;Lo;0;R;;;;;N;;;;;
-10935;LYDIAN LETTER AN;Lo;0;R;;;;;N;;;;;
-10936;LYDIAN LETTER EN;Lo;0;R;;;;;N;;;;;
-10937;LYDIAN LETTER LY;Lo;0;R;;;;;N;;;;;
-10938;LYDIAN LETTER NN;Lo;0;R;;;;;N;;;;;
-10939;LYDIAN LETTER C;Lo;0;R;;;;;N;;;;;
-1093F;LYDIAN TRIANGULAR MARK;Po;0;R;;;;;N;;;;;
-10A00;KHAROSHTHI LETTER A;Lo;0;R;;;;;N;;;;;
-10A01;KHAROSHTHI VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
-10A02;KHAROSHTHI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
-10A03;KHAROSHTHI VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;;
-10A05;KHAROSHTHI VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
-10A06;KHAROSHTHI VOWEL SIGN O;Mn;0;NSM;;;;;N;;;;;
-10A0C;KHAROSHTHI VOWEL LENGTH MARK;Mn;0;NSM;;;;;N;;;;;
-10A0D;KHAROSHTHI SIGN DOUBLE RING BELOW;Mn;220;NSM;;;;;N;;;;;
-10A0E;KHAROSHTHI SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
-10A0F;KHAROSHTHI SIGN VISARGA;Mn;230;NSM;;;;;N;;;;;
-10A10;KHAROSHTHI LETTER KA;Lo;0;R;;;;;N;;;;;
-10A11;KHAROSHTHI LETTER KHA;Lo;0;R;;;;;N;;;;;
-10A12;KHAROSHTHI LETTER GA;Lo;0;R;;;;;N;;;;;
-10A13;KHAROSHTHI LETTER GHA;Lo;0;R;;;;;N;;;;;
-10A15;KHAROSHTHI LETTER CA;Lo;0;R;;;;;N;;;;;
-10A16;KHAROSHTHI LETTER CHA;Lo;0;R;;;;;N;;;;;
-10A17;KHAROSHTHI LETTER JA;Lo;0;R;;;;;N;;;;;
-10A19;KHAROSHTHI LETTER NYA;Lo;0;R;;;;;N;;;;;
-10A1A;KHAROSHTHI LETTER TTA;Lo;0;R;;;;;N;;;;;
-10A1B;KHAROSHTHI LETTER TTHA;Lo;0;R;;;;;N;;;;;
-10A1C;KHAROSHTHI LETTER DDA;Lo;0;R;;;;;N;;;;;
-10A1D;KHAROSHTHI LETTER DDHA;Lo;0;R;;;;;N;;;;;
-10A1E;KHAROSHTHI LETTER NNA;Lo;0;R;;;;;N;;;;;
-10A1F;KHAROSHTHI LETTER TA;Lo;0;R;;;;;N;;;;;
-10A20;KHAROSHTHI LETTER THA;Lo;0;R;;;;;N;;;;;
-10A21;KHAROSHTHI LETTER DA;Lo;0;R;;;;;N;;;;;
-10A22;KHAROSHTHI LETTER DHA;Lo;0;R;;;;;N;;;;;
-10A23;KHAROSHTHI LETTER NA;Lo;0;R;;;;;N;;;;;
-10A24;KHAROSHTHI LETTER PA;Lo;0;R;;;;;N;;;;;
-10A25;KHAROSHTHI LETTER PHA;Lo;0;R;;;;;N;;;;;
-10A26;KHAROSHTHI LETTER BA;Lo;0;R;;;;;N;;;;;
-10A27;KHAROSHTHI LETTER BHA;Lo;0;R;;;;;N;;;;;
-10A28;KHAROSHTHI LETTER MA;Lo;0;R;;;;;N;;;;;
-10A29;KHAROSHTHI LETTER YA;Lo;0;R;;;;;N;;;;;
-10A2A;KHAROSHTHI LETTER RA;Lo;0;R;;;;;N;;;;;
-10A2B;KHAROSHTHI LETTER LA;Lo;0;R;;;;;N;;;;;
-10A2C;KHAROSHTHI LETTER VA;Lo;0;R;;;;;N;;;;;
-10A2D;KHAROSHTHI LETTER SHA;Lo;0;R;;;;;N;;;;;
-10A2E;KHAROSHTHI LETTER SSA;Lo;0;R;;;;;N;;;;;
-10A2F;KHAROSHTHI LETTER SA;Lo;0;R;;;;;N;;;;;
-10A30;KHAROSHTHI LETTER ZA;Lo;0;R;;;;;N;;;;;
-10A31;KHAROSHTHI LETTER HA;Lo;0;R;;;;;N;;;;;
-10A32;KHAROSHTHI LETTER KKA;Lo;0;R;;;;;N;;;;;
-10A33;KHAROSHTHI LETTER TTTHA;Lo;0;R;;;;;N;;;;;
-10A38;KHAROSHTHI SIGN BAR ABOVE;Mn;230;NSM;;;;;N;;;;;
-10A39;KHAROSHTHI SIGN CAUDA;Mn;1;NSM;;;;;N;;;;;
-10A3A;KHAROSHTHI SIGN DOT BELOW;Mn;220;NSM;;;;;N;;;;;
-10A3F;KHAROSHTHI VIRAMA;Mn;9;NSM;;;;;N;;;;;
-10A40;KHAROSHTHI DIGIT ONE;No;0;R;;;1;1;N;;;;;
-10A41;KHAROSHTHI DIGIT TWO;No;0;R;;;2;2;N;;;;;
-10A42;KHAROSHTHI DIGIT THREE;No;0;R;;;3;3;N;;;;;
-10A43;KHAROSHTHI DIGIT FOUR;No;0;R;;;4;4;N;;;;;
-10A44;KHAROSHTHI NUMBER TEN;No;0;R;;;;10;N;;;;;
-10A45;KHAROSHTHI NUMBER TWENTY;No;0;R;;;;20;N;;;;;
-10A46;KHAROSHTHI NUMBER ONE HUNDRED;No;0;R;;;;100;N;;;;;
-10A47;KHAROSHTHI NUMBER ONE THOUSAND;No;0;R;;;;1000;N;;;;;
-10A50;KHAROSHTHI PUNCTUATION DOT;Po;0;R;;;;;N;;;;;
-10A51;KHAROSHTHI PUNCTUATION SMALL CIRCLE;Po;0;R;;;;;N;;;;;
-10A52;KHAROSHTHI PUNCTUATION CIRCLE;Po;0;R;;;;;N;;;;;
-10A53;KHAROSHTHI PUNCTUATION CRESCENT BAR;Po;0;R;;;;;N;;;;;
-10A54;KHAROSHTHI PUNCTUATION MANGALAM;Po;0;R;;;;;N;;;;;
-10A55;KHAROSHTHI PUNCTUATION LOTUS;Po;0;R;;;;;N;;;;;
-10A56;KHAROSHTHI PUNCTUATION DANDA;Po;0;R;;;;;N;;;;;
-10A57;KHAROSHTHI PUNCTUATION DOUBLE DANDA;Po;0;R;;;;;N;;;;;
-10A58;KHAROSHTHI PUNCTUATION LINES;Po;0;R;;;;;N;;;;;
-12000;CUNEIFORM SIGN A;Lo;0;L;;;;;N;;;;;
-12001;CUNEIFORM SIGN A TIMES A;Lo;0;L;;;;;N;;;;;
-12002;CUNEIFORM SIGN A TIMES BAD;Lo;0;L;;;;;N;;;;;
-12003;CUNEIFORM SIGN A TIMES GAN2 TENU;Lo;0;L;;;;;N;;;;;
-12004;CUNEIFORM SIGN A TIMES HA;Lo;0;L;;;;;N;;;;;
-12005;CUNEIFORM SIGN A TIMES IGI;Lo;0;L;;;;;N;;;;;
-12006;CUNEIFORM SIGN A TIMES LAGAR GUNU;Lo;0;L;;;;;N;;;;;
-12007;CUNEIFORM SIGN A TIMES MUSH;Lo;0;L;;;;;N;;;;;
-12008;CUNEIFORM SIGN A TIMES SAG;Lo;0;L;;;;;N;;;;;
-12009;CUNEIFORM SIGN A2;Lo;0;L;;;;;N;;;;;
-1200A;CUNEIFORM SIGN AB;Lo;0;L;;;;;N;;;;;
-1200B;CUNEIFORM SIGN AB TIMES ASH2;Lo;0;L;;;;;N;;;;;
-1200C;CUNEIFORM SIGN AB TIMES DUN3 GUNU;Lo;0;L;;;;;N;;;;;
-1200D;CUNEIFORM SIGN AB TIMES GAL;Lo;0;L;;;;;N;;;;;
-1200E;CUNEIFORM SIGN AB TIMES GAN2 TENU;Lo;0;L;;;;;N;;;;;
-1200F;CUNEIFORM SIGN AB TIMES HA;Lo;0;L;;;;;N;;;;;
-12010;CUNEIFORM SIGN AB TIMES IGI GUNU;Lo;0;L;;;;;N;;;;;
-12011;CUNEIFORM SIGN AB TIMES IMIN;Lo;0;L;;;;;N;;;;;
-12012;CUNEIFORM SIGN AB TIMES LAGAB;Lo;0;L;;;;;N;;;;;
-12013;CUNEIFORM SIGN AB TIMES SHESH;Lo;0;L;;;;;N;;;;;
-12014;CUNEIFORM SIGN AB TIMES U PLUS U PLUS U;Lo;0;L;;;;;N;;;;;
-12015;CUNEIFORM SIGN AB GUNU;Lo;0;L;;;;;N;;;;;
-12016;CUNEIFORM SIGN AB2;Lo;0;L;;;;;N;;;;;
-12017;CUNEIFORM SIGN AB2 TIMES BALAG;Lo;0;L;;;;;N;;;;;
-12018;CUNEIFORM SIGN AB2 TIMES GAN2 TENU;Lo;0;L;;;;;N;;;;;
-12019;CUNEIFORM SIGN AB2 TIMES ME PLUS EN;Lo;0;L;;;;;N;;;;;
-1201A;CUNEIFORM SIGN AB2 TIMES SHA3;Lo;0;L;;;;;N;;;;;
-1201B;CUNEIFORM SIGN AB2 TIMES TAK4;Lo;0;L;;;;;N;;;;;
-1201C;CUNEIFORM SIGN AD;Lo;0;L;;;;;N;;;;;
-1201D;CUNEIFORM SIGN AK;Lo;0;L;;;;;N;;;;;
-1201E;CUNEIFORM SIGN AK TIMES ERIN2;Lo;0;L;;;;;N;;;;;
-1201F;CUNEIFORM SIGN AK TIMES SHITA PLUS GISH;Lo;0;L;;;;;N;;;;;
-12020;CUNEIFORM SIGN AL;Lo;0;L;;;;;N;;;;;
-12021;CUNEIFORM SIGN AL TIMES AL;Lo;0;L;;;;;N;;;;;
-12022;CUNEIFORM SIGN AL TIMES DIM2;Lo;0;L;;;;;N;;;;;
-12023;CUNEIFORM SIGN AL TIMES GISH;Lo;0;L;;;;;N;;;;;
-12024;CUNEIFORM SIGN AL TIMES HA;Lo;0;L;;;;;N;;;;;
-12025;CUNEIFORM SIGN AL TIMES KAD3;Lo;0;L;;;;;N;;;;;
-12026;CUNEIFORM SIGN AL TIMES KI;Lo;0;L;;;;;N;;;;;
-12027;CUNEIFORM SIGN AL TIMES SHE;Lo;0;L;;;;;N;;;;;
-12028;CUNEIFORM SIGN AL TIMES USH;Lo;0;L;;;;;N;;;;;
-12029;CUNEIFORM SIGN ALAN;Lo;0;L;;;;;N;;;;;
-1202A;CUNEIFORM SIGN ALEPH;Lo;0;L;;;;;N;;;;;
-1202B;CUNEIFORM SIGN AMAR;Lo;0;L;;;;;N;;;;;
-1202C;CUNEIFORM SIGN AMAR TIMES SHE;Lo;0;L;;;;;N;;;;;
-1202D;CUNEIFORM SIGN AN;Lo;0;L;;;;;N;;;;;
-1202E;CUNEIFORM SIGN AN OVER AN;Lo;0;L;;;;;N;;;;;
-1202F;CUNEIFORM SIGN AN THREE TIMES;Lo;0;L;;;;;N;;;;;
-12030;CUNEIFORM SIGN AN PLUS NAGA OPPOSING AN PLUS NAGA;Lo;0;L;;;;;N;;;;;
-12031;CUNEIFORM SIGN AN PLUS NAGA SQUARED;Lo;0;L;;;;;N;;;;;
-12032;CUNEIFORM SIGN ANSHE;Lo;0;L;;;;;N;;;;;
-12033;CUNEIFORM SIGN APIN;Lo;0;L;;;;;N;;;;;
-12034;CUNEIFORM SIGN ARAD;Lo;0;L;;;;;N;;;;;
-12035;CUNEIFORM SIGN ARAD TIMES KUR;Lo;0;L;;;;;N;;;;;
-12036;CUNEIFORM SIGN ARKAB;Lo;0;L;;;;;N;;;;;
-12037;CUNEIFORM SIGN ASAL2;Lo;0;L;;;;;N;;;;;
-12038;CUNEIFORM SIGN ASH;Lo;0;L;;;;;N;;;;;
-12039;CUNEIFORM SIGN ASH ZIDA TENU;Lo;0;L;;;;;N;;;;;
-1203A;CUNEIFORM SIGN ASH KABA TENU;Lo;0;L;;;;;N;;;;;
-1203B;CUNEIFORM SIGN ASH OVER ASH TUG2 OVER TUG2 TUG2 OVER TUG2 PAP;Lo;0;L;;;;;N;;;;;
-1203C;CUNEIFORM SIGN ASH OVER ASH OVER ASH;Lo;0;L;;;;;N;;;;;
-1203D;CUNEIFORM SIGN ASH OVER ASH OVER ASH CROSSING ASH OVER ASH OVER ASH;Lo;0;L;;;;;N;;;;;
-1203E;CUNEIFORM SIGN ASH2;Lo;0;L;;;;;N;;;;;
-1203F;CUNEIFORM SIGN ASHGAB;Lo;0;L;;;;;N;;;;;
-12040;CUNEIFORM SIGN BA;Lo;0;L;;;;;N;;;;;
-12041;CUNEIFORM SIGN BAD;Lo;0;L;;;;;N;;;;;
-12042;CUNEIFORM SIGN BAG3;Lo;0;L;;;;;N;;;;;
-12043;CUNEIFORM SIGN BAHAR2;Lo;0;L;;;;;N;;;;;
-12044;CUNEIFORM SIGN BAL;Lo;0;L;;;;;N;;;;;
-12045;CUNEIFORM SIGN BAL OVER BAL;Lo;0;L;;;;;N;;;;;
-12046;CUNEIFORM SIGN BALAG;Lo;0;L;;;;;N;;;;;
-12047;CUNEIFORM SIGN BAR;Lo;0;L;;;;;N;;;;;
-12048;CUNEIFORM SIGN BARA2;Lo;0;L;;;;;N;;;;;
-12049;CUNEIFORM SIGN BI;Lo;0;L;;;;;N;;;;;
-1204A;CUNEIFORM SIGN BI TIMES A;Lo;0;L;;;;;N;;;;;
-1204B;CUNEIFORM SIGN BI TIMES GAR;Lo;0;L;;;;;N;;;;;
-1204C;CUNEIFORM SIGN BI TIMES IGI GUNU;Lo;0;L;;;;;N;;;;;
-1204D;CUNEIFORM SIGN BU;Lo;0;L;;;;;N;;;;;
-1204E;CUNEIFORM SIGN BU OVER BU AB;Lo;0;L;;;;;N;;;;;
-1204F;CUNEIFORM SIGN BU OVER BU UN;Lo;0;L;;;;;N;;;;;
-12050;CUNEIFORM SIGN BU CROSSING BU;Lo;0;L;;;;;N;;;;;
-12051;CUNEIFORM SIGN BULUG;Lo;0;L;;;;;N;;;;;
-12052;CUNEIFORM SIGN BULUG OVER BULUG;Lo;0;L;;;;;N;;;;;
-12053;CUNEIFORM SIGN BUR;Lo;0;L;;;;;N;;;;;
-12054;CUNEIFORM SIGN BUR2;Lo;0;L;;;;;N;;;;;
-12055;CUNEIFORM SIGN DA;Lo;0;L;;;;;N;;;;;
-12056;CUNEIFORM SIGN DAG;Lo;0;L;;;;;N;;;;;
-12057;CUNEIFORM SIGN DAG KISIM5 TIMES A PLUS MASH;Lo;0;L;;;;;N;;;;;
-12058;CUNEIFORM SIGN DAG KISIM5 TIMES AMAR;Lo;0;L;;;;;N;;;;;
-12059;CUNEIFORM SIGN DAG KISIM5 TIMES BALAG;Lo;0;L;;;;;N;;;;;
-1205A;CUNEIFORM SIGN DAG KISIM5 TIMES BI;Lo;0;L;;;;;N;;;;;
-1205B;CUNEIFORM SIGN DAG KISIM5 TIMES GA;Lo;0;L;;;;;N;;;;;
-1205C;CUNEIFORM SIGN DAG KISIM5 TIMES GA PLUS MASH;Lo;0;L;;;;;N;;;;;
-1205D;CUNEIFORM SIGN DAG KISIM5 TIMES GI;Lo;0;L;;;;;N;;;;;
-1205E;CUNEIFORM SIGN DAG KISIM5 TIMES GIR2;Lo;0;L;;;;;N;;;;;
-1205F;CUNEIFORM SIGN DAG KISIM5 TIMES GUD;Lo;0;L;;;;;N;;;;;
-12060;CUNEIFORM SIGN DAG KISIM5 TIMES HA;Lo;0;L;;;;;N;;;;;
-12061;CUNEIFORM SIGN DAG KISIM5 TIMES IR;Lo;0;L;;;;;N;;;;;
-12062;CUNEIFORM SIGN DAG KISIM5 TIMES IR PLUS LU;Lo;0;L;;;;;N;;;;;
-12063;CUNEIFORM SIGN DAG KISIM5 TIMES KAK;Lo;0;L;;;;;N;;;;;
-12064;CUNEIFORM SIGN DAG KISIM5 TIMES LA;Lo;0;L;;;;;N;;;;;
-12065;CUNEIFORM SIGN DAG KISIM5 TIMES LU;Lo;0;L;;;;;N;;;;;
-12066;CUNEIFORM SIGN DAG KISIM5 TIMES LU PLUS MASH2;Lo;0;L;;;;;N;;;;;
-12067;CUNEIFORM SIGN DAG KISIM5 TIMES LUM;Lo;0;L;;;;;N;;;;;
-12068;CUNEIFORM SIGN DAG KISIM5 TIMES NE;Lo;0;L;;;;;N;;;;;
-12069;CUNEIFORM SIGN DAG KISIM5 TIMES PAP PLUS PAP;Lo;0;L;;;;;N;;;;;
-1206A;CUNEIFORM SIGN DAG KISIM5 TIMES SI;Lo;0;L;;;;;N;;;;;
-1206B;CUNEIFORM SIGN DAG KISIM5 TIMES TAK4;Lo;0;L;;;;;N;;;;;
-1206C;CUNEIFORM SIGN DAG KISIM5 TIMES U2 PLUS GIR2;Lo;0;L;;;;;N;;;;;
-1206D;CUNEIFORM SIGN DAG KISIM5 TIMES USH;Lo;0;L;;;;;N;;;;;
-1206E;CUNEIFORM SIGN DAM;Lo;0;L;;;;;N;;;;;
-1206F;CUNEIFORM SIGN DAR;Lo;0;L;;;;;N;;;;;
-12070;CUNEIFORM SIGN DARA3;Lo;0;L;;;;;N;;;;;
-12071;CUNEIFORM SIGN DARA4;Lo;0;L;;;;;N;;;;;
-12072;CUNEIFORM SIGN DI;Lo;0;L;;;;;N;;;;;
-12073;CUNEIFORM SIGN DIB;Lo;0;L;;;;;N;;;;;
-12074;CUNEIFORM SIGN DIM;Lo;0;L;;;;;N;;;;;
-12075;CUNEIFORM SIGN DIM TIMES SHE;Lo;0;L;;;;;N;;;;;
-12076;CUNEIFORM SIGN DIM2;Lo;0;L;;;;;N;;;;;
-12077;CUNEIFORM SIGN DIN;Lo;0;L;;;;;N;;;;;
-12078;CUNEIFORM SIGN DIN KASKAL U GUNU DISH;Lo;0;L;;;;;N;;;;;
-12079;CUNEIFORM SIGN DISH;Lo;0;L;;;;;N;;;;;
-1207A;CUNEIFORM SIGN DU;Lo;0;L;;;;;N;;;;;
-1207B;CUNEIFORM SIGN DU OVER DU;Lo;0;L;;;;;N;;;;;
-1207C;CUNEIFORM SIGN DU GUNU;Lo;0;L;;;;;N;;;;;
-1207D;CUNEIFORM SIGN DU SHESHIG;Lo;0;L;;;;;N;;;;;
-1207E;CUNEIFORM SIGN DUB;Lo;0;L;;;;;N;;;;;
-1207F;CUNEIFORM SIGN DUB TIMES ESH2;Lo;0;L;;;;;N;;;;;
-12080;CUNEIFORM SIGN DUB2;Lo;0;L;;;;;N;;;;;
-12081;CUNEIFORM SIGN DUG;Lo;0;L;;;;;N;;;;;
-12082;CUNEIFORM SIGN DUGUD;Lo;0;L;;;;;N;;;;;
-12083;CUNEIFORM SIGN DUH;Lo;0;L;;;;;N;;;;;
-12084;CUNEIFORM SIGN DUN;Lo;0;L;;;;;N;;;;;
-12085;CUNEIFORM SIGN DUN3;Lo;0;L;;;;;N;;;;;
-12086;CUNEIFORM SIGN DUN3 GUNU;Lo;0;L;;;;;N;;;;;
-12087;CUNEIFORM SIGN DUN3 GUNU GUNU;Lo;0;L;;;;;N;;;;;
-12088;CUNEIFORM SIGN DUN4;Lo;0;L;;;;;N;;;;;
-12089;CUNEIFORM SIGN DUR2;Lo;0;L;;;;;N;;;;;
-1208A;CUNEIFORM SIGN E;Lo;0;L;;;;;N;;;;;
-1208B;CUNEIFORM SIGN E TIMES PAP;Lo;0;L;;;;;N;;;;;
-1208C;CUNEIFORM SIGN E OVER E NUN OVER NUN;Lo;0;L;;;;;N;;;;;
-1208D;CUNEIFORM SIGN E2;Lo;0;L;;;;;N;;;;;
-1208E;CUNEIFORM SIGN E2 TIMES A PLUS HA PLUS DA;Lo;0;L;;;;;N;;;;;
-1208F;CUNEIFORM SIGN E2 TIMES GAR;Lo;0;L;;;;;N;;;;;
-12090;CUNEIFORM SIGN E2 TIMES MI;Lo;0;L;;;;;N;;;;;
-12091;CUNEIFORM SIGN E2 TIMES SAL;Lo;0;L;;;;;N;;;;;
-12092;CUNEIFORM SIGN E2 TIMES SHE;Lo;0;L;;;;;N;;;;;
-12093;CUNEIFORM SIGN E2 TIMES U;Lo;0;L;;;;;N;;;;;
-12094;CUNEIFORM SIGN EDIN;Lo;0;L;;;;;N;;;;;
-12095;CUNEIFORM SIGN EGIR;Lo;0;L;;;;;N;;;;;
-12096;CUNEIFORM SIGN EL;Lo;0;L;;;;;N;;;;;
-12097;CUNEIFORM SIGN EN;Lo;0;L;;;;;N;;;;;
-12098;CUNEIFORM SIGN EN TIMES GAN2;Lo;0;L;;;;;N;;;;;
-12099;CUNEIFORM SIGN EN TIMES GAN2 TENU;Lo;0;L;;;;;N;;;;;
-1209A;CUNEIFORM SIGN EN TIMES ME;Lo;0;L;;;;;N;;;;;
-1209B;CUNEIFORM SIGN EN CROSSING EN;Lo;0;L;;;;;N;;;;;
-1209C;CUNEIFORM SIGN EN OPPOSING EN;Lo;0;L;;;;;N;;;;;
-1209D;CUNEIFORM SIGN EN SQUARED;Lo;0;L;;;;;N;;;;;
-1209E;CUNEIFORM SIGN EREN;Lo;0;L;;;;;N;;;;;
-1209F;CUNEIFORM SIGN ERIN2;Lo;0;L;;;;;N;;;;;
-120A0;CUNEIFORM SIGN ESH2;Lo;0;L;;;;;N;;;;;
-120A1;CUNEIFORM SIGN EZEN;Lo;0;L;;;;;N;;;;;
-120A2;CUNEIFORM SIGN EZEN TIMES A;Lo;0;L;;;;;N;;;;;
-120A3;CUNEIFORM SIGN EZEN TIMES A PLUS LAL;Lo;0;L;;;;;N;;;;;
-120A4;CUNEIFORM SIGN EZEN TIMES A PLUS LAL TIMES LAL;Lo;0;L;;;;;N;;;;;
-120A5;CUNEIFORM SIGN EZEN TIMES AN;Lo;0;L;;;;;N;;;;;
-120A6;CUNEIFORM SIGN EZEN TIMES BAD;Lo;0;L;;;;;N;;;;;
-120A7;CUNEIFORM SIGN EZEN TIMES DUN3 GUNU;Lo;0;L;;;;;N;;;;;
-120A8;CUNEIFORM SIGN EZEN TIMES DUN3 GUNU GUNU;Lo;0;L;;;;;N;;;;;
-120A9;CUNEIFORM SIGN EZEN TIMES HA;Lo;0;L;;;;;N;;;;;
-120AA;CUNEIFORM SIGN EZEN TIMES HA GUNU;Lo;0;L;;;;;N;;;;;
-120AB;CUNEIFORM SIGN EZEN TIMES IGI GUNU;Lo;0;L;;;;;N;;;;;
-120AC;CUNEIFORM SIGN EZEN TIMES KASKAL;Lo;0;L;;;;;N;;;;;
-120AD;CUNEIFORM SIGN EZEN TIMES KASKAL SQUARED;Lo;0;L;;;;;N;;;;;
-120AE;CUNEIFORM SIGN EZEN TIMES KU3;Lo;0;L;;;;;N;;;;;
-120AF;CUNEIFORM SIGN EZEN TIMES LA;Lo;0;L;;;;;N;;;;;
-120B0;CUNEIFORM SIGN EZEN TIMES LAL TIMES LAL;Lo;0;L;;;;;N;;;;;
-120B1;CUNEIFORM SIGN EZEN TIMES LI;Lo;0;L;;;;;N;;;;;
-120B2;CUNEIFORM SIGN EZEN TIMES LU;Lo;0;L;;;;;N;;;;;
-120B3;CUNEIFORM SIGN EZEN TIMES U2;Lo;0;L;;;;;N;;;;;
-120B4;CUNEIFORM SIGN EZEN TIMES UD;Lo;0;L;;;;;N;;;;;
-120B5;CUNEIFORM SIGN GA;Lo;0;L;;;;;N;;;;;
-120B6;CUNEIFORM SIGN GA GUNU;Lo;0;L;;;;;N;;;;;
-120B7;CUNEIFORM SIGN GA2;Lo;0;L;;;;;N;;;;;
-120B8;CUNEIFORM SIGN GA2 TIMES A PLUS DA PLUS HA;Lo;0;L;;;;;N;;;;;
-120B9;CUNEIFORM SIGN GA2 TIMES A PLUS HA;Lo;0;L;;;;;N;;;;;
-120BA;CUNEIFORM SIGN GA2 TIMES A PLUS IGI;Lo;0;L;;;;;N;;;;;
-120BB;CUNEIFORM SIGN GA2 TIMES AB2 TENU PLUS TAB;Lo;0;L;;;;;N;;;;;
-120BC;CUNEIFORM SIGN GA2 TIMES AN;Lo;0;L;;;;;N;;;;;
-120BD;CUNEIFORM SIGN GA2 TIMES ASH;Lo;0;L;;;;;N;;;;;
-120BE;CUNEIFORM SIGN GA2 TIMES ASH2 PLUS GAL;Lo;0;L;;;;;N;;;;;
-120BF;CUNEIFORM SIGN GA2 TIMES BAD;Lo;0;L;;;;;N;;;;;
-120C0;CUNEIFORM SIGN GA2 TIMES BAR PLUS RA;Lo;0;L;;;;;N;;;;;
-120C1;CUNEIFORM SIGN GA2 TIMES BUR;Lo;0;L;;;;;N;;;;;
-120C2;CUNEIFORM SIGN GA2 TIMES BUR PLUS RA;Lo;0;L;;;;;N;;;;;
-120C3;CUNEIFORM SIGN GA2 TIMES DA;Lo;0;L;;;;;N;;;;;
-120C4;CUNEIFORM SIGN GA2 TIMES DI;Lo;0;L;;;;;N;;;;;
-120C5;CUNEIFORM SIGN GA2 TIMES DIM TIMES SHE;Lo;0;L;;;;;N;;;;;
-120C6;CUNEIFORM SIGN GA2 TIMES DUB;Lo;0;L;;;;;N;;;;;
-120C7;CUNEIFORM SIGN GA2 TIMES EL;Lo;0;L;;;;;N;;;;;
-120C8;CUNEIFORM SIGN GA2 TIMES EL PLUS LA;Lo;0;L;;;;;N;;;;;
-120C9;CUNEIFORM SIGN GA2 TIMES EN;Lo;0;L;;;;;N;;;;;
-120CA;CUNEIFORM SIGN GA2 TIMES EN TIMES GAN2 TENU;Lo;0;L;;;;;N;;;;;
-120CB;CUNEIFORM SIGN GA2 TIMES GAN2 TENU;Lo;0;L;;;;;N;;;;;
-120CC;CUNEIFORM SIGN GA2 TIMES GAR;Lo;0;L;;;;;N;;;;;
-120CD;CUNEIFORM SIGN GA2 TIMES GI;Lo;0;L;;;;;N;;;;;
-120CE;CUNEIFORM SIGN GA2 TIMES GI4;Lo;0;L;;;;;N;;;;;
-120CF;CUNEIFORM SIGN GA2 TIMES GI4 PLUS A;Lo;0;L;;;;;N;;;;;
-120D0;CUNEIFORM SIGN GA2 TIMES GIR2 PLUS SU;Lo;0;L;;;;;N;;;;;
-120D1;CUNEIFORM SIGN GA2 TIMES HA PLUS LU PLUS ESH2;Lo;0;L;;;;;N;;;;;
-120D2;CUNEIFORM SIGN GA2 TIMES HAL;Lo;0;L;;;;;N;;;;;
-120D3;CUNEIFORM SIGN GA2 TIMES HAL PLUS LA;Lo;0;L;;;;;N;;;;;
-120D4;CUNEIFORM SIGN GA2 TIMES HI PLUS LI;Lo;0;L;;;;;N;;;;;
-120D5;CUNEIFORM SIGN GA2 TIMES HUB2;Lo;0;L;;;;;N;;;;;
-120D6;CUNEIFORM SIGN GA2 TIMES IGI GUNU;Lo;0;L;;;;;N;;;;;
-120D7;CUNEIFORM SIGN GA2 TIMES ISH PLUS HU PLUS ASH;Lo;0;L;;;;;N;;;;;
-120D8;CUNEIFORM SIGN GA2 TIMES KAK;Lo;0;L;;;;;N;;;;;
-120D9;CUNEIFORM SIGN GA2 TIMES KASKAL;Lo;0;L;;;;;N;;;;;
-120DA;CUNEIFORM SIGN GA2 TIMES KID;Lo;0;L;;;;;N;;;;;
-120DB;CUNEIFORM SIGN GA2 TIMES KID PLUS LAL;Lo;0;L;;;;;N;;;;;
-120DC;CUNEIFORM SIGN GA2 TIMES KU3 PLUS AN;Lo;0;L;;;;;N;;;;;
-120DD;CUNEIFORM SIGN GA2 TIMES LA;Lo;0;L;;;;;N;;;;;
-120DE;CUNEIFORM SIGN GA2 TIMES ME PLUS EN;Lo;0;L;;;;;N;;;;;
-120DF;CUNEIFORM SIGN GA2 TIMES MI;Lo;0;L;;;;;N;;;;;
-120E0;CUNEIFORM SIGN GA2 TIMES NUN;Lo;0;L;;;;;N;;;;;
-120E1;CUNEIFORM SIGN GA2 TIMES NUN OVER NUN;Lo;0;L;;;;;N;;;;;
-120E2;CUNEIFORM SIGN GA2 TIMES PA;Lo;0;L;;;;;N;;;;;
-120E3;CUNEIFORM SIGN GA2 TIMES SAL;Lo;0;L;;;;;N;;;;;
-120E4;CUNEIFORM SIGN GA2 TIMES SAR;Lo;0;L;;;;;N;;;;;
-120E5;CUNEIFORM SIGN GA2 TIMES SHE;Lo;0;L;;;;;N;;;;;
-120E6;CUNEIFORM SIGN GA2 TIMES SHE PLUS TUR;Lo;0;L;;;;;N;;;;;
-120E7;CUNEIFORM SIGN GA2 TIMES SHID;Lo;0;L;;;;;N;;;;;
-120E8;CUNEIFORM SIGN GA2 TIMES SUM;Lo;0;L;;;;;N;;;;;
-120E9;CUNEIFORM SIGN GA2 TIMES TAK4;Lo;0;L;;;;;N;;;;;
-120EA;CUNEIFORM SIGN GA2 TIMES U;Lo;0;L;;;;;N;;;;;
-120EB;CUNEIFORM SIGN GA2 TIMES UD;Lo;0;L;;;;;N;;;;;
-120EC;CUNEIFORM SIGN GA2 TIMES UD PLUS DU;Lo;0;L;;;;;N;;;;;
-120ED;CUNEIFORM SIGN GA2 OVER GA2;Lo;0;L;;;;;N;;;;;
-120EE;CUNEIFORM SIGN GABA;Lo;0;L;;;;;N;;;;;
-120EF;CUNEIFORM SIGN GABA CROSSING GABA;Lo;0;L;;;;;N;;;;;
-120F0;CUNEIFORM SIGN GAD;Lo;0;L;;;;;N;;;;;
-120F1;CUNEIFORM SIGN GAD OVER GAD GAR OVER GAR;Lo;0;L;;;;;N;;;;;
-120F2;CUNEIFORM SIGN GAL;Lo;0;L;;;;;N;;;;;
-120F3;CUNEIFORM SIGN GAL GAD OVER GAD GAR OVER GAR;Lo;0;L;;;;;N;;;;;
-120F4;CUNEIFORM SIGN GALAM;Lo;0;L;;;;;N;;;;;
-120F5;CUNEIFORM SIGN GAM;Lo;0;L;;;;;N;;;;;
-120F6;CUNEIFORM SIGN GAN;Lo;0;L;;;;;N;;;;;
-120F7;CUNEIFORM SIGN GAN2;Lo;0;L;;;;;N;;;;;
-120F8;CUNEIFORM SIGN GAN2 TENU;Lo;0;L;;;;;N;;;;;
-120F9;CUNEIFORM SIGN GAN2 OVER GAN2;Lo;0;L;;;;;N;;;;;
-120FA;CUNEIFORM SIGN GAN2 CROSSING GAN2;Lo;0;L;;;;;N;;;;;
-120FB;CUNEIFORM SIGN GAR;Lo;0;L;;;;;N;;;;;
-120FC;CUNEIFORM SIGN GAR3;Lo;0;L;;;;;N;;;;;
-120FD;CUNEIFORM SIGN GASHAN;Lo;0;L;;;;;N;;;;;
-120FE;CUNEIFORM SIGN GESHTIN;Lo;0;L;;;;;N;;;;;
-120FF;CUNEIFORM SIGN GESHTIN TIMES KUR;Lo;0;L;;;;;N;;;;;
-12100;CUNEIFORM SIGN GI;Lo;0;L;;;;;N;;;;;
-12101;CUNEIFORM SIGN GI TIMES E;Lo;0;L;;;;;N;;;;;
-12102;CUNEIFORM SIGN GI TIMES U;Lo;0;L;;;;;N;;;;;
-12103;CUNEIFORM SIGN GI CROSSING GI;Lo;0;L;;;;;N;;;;;
-12104;CUNEIFORM SIGN GI4;Lo;0;L;;;;;N;;;;;
-12105;CUNEIFORM SIGN GI4 OVER GI4;Lo;0;L;;;;;N;;;;;
-12106;CUNEIFORM SIGN GI4 CROSSING GI4;Lo;0;L;;;;;N;;;;;
-12107;CUNEIFORM SIGN GIDIM;Lo;0;L;;;;;N;;;;;
-12108;CUNEIFORM SIGN GIR2;Lo;0;L;;;;;N;;;;;
-12109;CUNEIFORM SIGN GIR2 GUNU;Lo;0;L;;;;;N;;;;;
-1210A;CUNEIFORM SIGN GIR3;Lo;0;L;;;;;N;;;;;
-1210B;CUNEIFORM SIGN GIR3 TIMES A PLUS IGI;Lo;0;L;;;;;N;;;;;
-1210C;CUNEIFORM SIGN GIR3 TIMES GAN2 TENU;Lo;0;L;;;;;N;;;;;
-1210D;CUNEIFORM SIGN GIR3 TIMES IGI;Lo;0;L;;;;;N;;;;;
-1210E;CUNEIFORM SIGN GIR3 TIMES LU PLUS IGI;Lo;0;L;;;;;N;;;;;
-1210F;CUNEIFORM SIGN GIR3 TIMES PA;Lo;0;L;;;;;N;;;;;
-12110;CUNEIFORM SIGN GISAL;Lo;0;L;;;;;N;;;;;
-12111;CUNEIFORM SIGN GISH;Lo;0;L;;;;;N;;;;;
-12112;CUNEIFORM SIGN GISH CROSSING GISH;Lo;0;L;;;;;N;;;;;
-12113;CUNEIFORM SIGN GISH TIMES BAD;Lo;0;L;;;;;N;;;;;
-12114;CUNEIFORM SIGN GISH TIMES TAK4;Lo;0;L;;;;;N;;;;;
-12115;CUNEIFORM SIGN GISH TENU;Lo;0;L;;;;;N;;;;;
-12116;CUNEIFORM SIGN GU;Lo;0;L;;;;;N;;;;;
-12117;CUNEIFORM SIGN GU CROSSING GU;Lo;0;L;;;;;N;;;;;
-12118;CUNEIFORM SIGN GU2;Lo;0;L;;;;;N;;;;;
-12119;CUNEIFORM SIGN GU2 TIMES KAK;Lo;0;L;;;;;N;;;;;
-1211A;CUNEIFORM SIGN GU2 TIMES KAK TIMES IGI GUNU;Lo;0;L;;;;;N;;;;;
-1211B;CUNEIFORM SIGN GU2 TIMES NUN;Lo;0;L;;;;;N;;;;;
-1211C;CUNEIFORM SIGN GU2 TIMES SAL PLUS TUG2;Lo;0;L;;;;;N;;;;;
-1211D;CUNEIFORM SIGN GU2 GUNU;Lo;0;L;;;;;N;;;;;
-1211E;CUNEIFORM SIGN GUD;Lo;0;L;;;;;N;;;;;
-1211F;CUNEIFORM SIGN GUD TIMES A PLUS KUR;Lo;0;L;;;;;N;;;;;
-12120;CUNEIFORM SIGN GUD TIMES KUR;Lo;0;L;;;;;N;;;;;
-12121;CUNEIFORM SIGN GUD OVER GUD LUGAL;Lo;0;L;;;;;N;;;;;
-12122;CUNEIFORM SIGN GUL;Lo;0;L;;;;;N;;;;;
-12123;CUNEIFORM SIGN GUM;Lo;0;L;;;;;N;;;;;
-12124;CUNEIFORM SIGN GUM TIMES SHE;Lo;0;L;;;;;N;;;;;
-12125;CUNEIFORM SIGN GUR;Lo;0;L;;;;;N;;;;;
-12126;CUNEIFORM SIGN GUR7;Lo;0;L;;;;;N;;;;;
-12127;CUNEIFORM SIGN GURUN;Lo;0;L;;;;;N;;;;;
-12128;CUNEIFORM SIGN GURUSH;Lo;0;L;;;;;N;;;;;
-12129;CUNEIFORM SIGN HA;Lo;0;L;;;;;N;;;;;
-1212A;CUNEIFORM SIGN HA TENU;Lo;0;L;;;;;N;;;;;
-1212B;CUNEIFORM SIGN HA GUNU;Lo;0;L;;;;;N;;;;;
-1212C;CUNEIFORM SIGN HAL;Lo;0;L;;;;;N;;;;;
-1212D;CUNEIFORM SIGN HI;Lo;0;L;;;;;N;;;;;
-1212E;CUNEIFORM SIGN HI TIMES ASH;Lo;0;L;;;;;N;;;;;
-1212F;CUNEIFORM SIGN HI TIMES ASH2;Lo;0;L;;;;;N;;;;;
-12130;CUNEIFORM SIGN HI TIMES BAD;Lo;0;L;;;;;N;;;;;
-12131;CUNEIFORM SIGN HI TIMES DISH;Lo;0;L;;;;;N;;;;;
-12132;CUNEIFORM SIGN HI TIMES GAD;Lo;0;L;;;;;N;;;;;
-12133;CUNEIFORM SIGN HI TIMES KIN;Lo;0;L;;;;;N;;;;;
-12134;CUNEIFORM SIGN HI TIMES NUN;Lo;0;L;;;;;N;;;;;
-12135;CUNEIFORM SIGN HI TIMES SHE;Lo;0;L;;;;;N;;;;;
-12136;CUNEIFORM SIGN HI TIMES U;Lo;0;L;;;;;N;;;;;
-12137;CUNEIFORM SIGN HU;Lo;0;L;;;;;N;;;;;
-12138;CUNEIFORM SIGN HUB2;Lo;0;L;;;;;N;;;;;
-12139;CUNEIFORM SIGN HUB2 TIMES AN;Lo;0;L;;;;;N;;;;;
-1213A;CUNEIFORM SIGN HUB2 TIMES HAL;Lo;0;L;;;;;N;;;;;
-1213B;CUNEIFORM SIGN HUB2 TIMES KASKAL;Lo;0;L;;;;;N;;;;;
-1213C;CUNEIFORM SIGN HUB2 TIMES LISH;Lo;0;L;;;;;N;;;;;
-1213D;CUNEIFORM SIGN HUB2 TIMES UD;Lo;0;L;;;;;N;;;;;
-1213E;CUNEIFORM SIGN HUL2;Lo;0;L;;;;;N;;;;;
-1213F;CUNEIFORM SIGN I;Lo;0;L;;;;;N;;;;;
-12140;CUNEIFORM SIGN I A;Lo;0;L;;;;;N;;;;;
-12141;CUNEIFORM SIGN IB;Lo;0;L;;;;;N;;;;;
-12142;CUNEIFORM SIGN IDIM;Lo;0;L;;;;;N;;;;;
-12143;CUNEIFORM SIGN IDIM OVER IDIM BUR;Lo;0;L;;;;;N;;;;;
-12144;CUNEIFORM SIGN IDIM OVER IDIM SQUARED;Lo;0;L;;;;;N;;;;;
-12145;CUNEIFORM SIGN IG;Lo;0;L;;;;;N;;;;;
-12146;CUNEIFORM SIGN IGI;Lo;0;L;;;;;N;;;;;
-12147;CUNEIFORM SIGN IGI DIB;Lo;0;L;;;;;N;;;;;
-12148;CUNEIFORM SIGN IGI RI;Lo;0;L;;;;;N;;;;;
-12149;CUNEIFORM SIGN IGI OVER IGI SHIR OVER SHIR UD OVER UD;Lo;0;L;;;;;N;;;;;
-1214A;CUNEIFORM SIGN IGI GUNU;Lo;0;L;;;;;N;;;;;
-1214B;CUNEIFORM SIGN IL;Lo;0;L;;;;;N;;;;;
-1214C;CUNEIFORM SIGN IL TIMES GAN2 TENU;Lo;0;L;;;;;N;;;;;
-1214D;CUNEIFORM SIGN IL2;Lo;0;L;;;;;N;;;;;
-1214E;CUNEIFORM SIGN IM;Lo;0;L;;;;;N;;;;;
-1214F;CUNEIFORM SIGN IM TIMES TAK4;Lo;0;L;;;;;N;;;;;
-12150;CUNEIFORM SIGN IM CROSSING IM;Lo;0;L;;;;;N;;;;;
-12151;CUNEIFORM SIGN IM OPPOSING IM;Lo;0;L;;;;;N;;;;;
-12152;CUNEIFORM SIGN IM SQUARED;Lo;0;L;;;;;N;;;;;
-12153;CUNEIFORM SIGN IMIN;Lo;0;L;;;;;N;;;;;
-12154;CUNEIFORM SIGN IN;Lo;0;L;;;;;N;;;;;
-12155;CUNEIFORM SIGN IR;Lo;0;L;;;;;N;;;;;
-12156;CUNEIFORM SIGN ISH;Lo;0;L;;;;;N;;;;;
-12157;CUNEIFORM SIGN KA;Lo;0;L;;;;;N;;;;;
-12158;CUNEIFORM SIGN KA TIMES A;Lo;0;L;;;;;N;;;;;
-12159;CUNEIFORM SIGN KA TIMES AD;Lo;0;L;;;;;N;;;;;
-1215A;CUNEIFORM SIGN KA TIMES AD PLUS KU3;Lo;0;L;;;;;N;;;;;
-1215B;CUNEIFORM SIGN KA TIMES ASH2;Lo;0;L;;;;;N;;;;;
-1215C;CUNEIFORM SIGN KA TIMES BAD;Lo;0;L;;;;;N;;;;;
-1215D;CUNEIFORM SIGN KA TIMES BALAG;Lo;0;L;;;;;N;;;;;
-1215E;CUNEIFORM SIGN KA TIMES BAR;Lo;0;L;;;;;N;;;;;
-1215F;CUNEIFORM SIGN KA TIMES BI;Lo;0;L;;;;;N;;;;;
-12160;CUNEIFORM SIGN KA TIMES ERIN2;Lo;0;L;;;;;N;;;;;
-12161;CUNEIFORM SIGN KA TIMES ESH2;Lo;0;L;;;;;N;;;;;
-12162;CUNEIFORM SIGN KA TIMES GA;Lo;0;L;;;;;N;;;;;
-12163;CUNEIFORM SIGN KA TIMES GAL;Lo;0;L;;;;;N;;;;;
-12164;CUNEIFORM SIGN KA TIMES GAN2 TENU;Lo;0;L;;;;;N;;;;;
-12165;CUNEIFORM SIGN KA TIMES GAR;Lo;0;L;;;;;N;;;;;
-12166;CUNEIFORM SIGN KA TIMES GAR PLUS SHA3 PLUS A;Lo;0;L;;;;;N;;;;;
-12167;CUNEIFORM SIGN KA TIMES GI;Lo;0;L;;;;;N;;;;;
-12168;CUNEIFORM SIGN KA TIMES GIR2;Lo;0;L;;;;;N;;;;;
-12169;CUNEIFORM SIGN KA TIMES GISH PLUS SAR;Lo;0;L;;;;;N;;;;;
-1216A;CUNEIFORM SIGN KA TIMES GISH CROSSING GISH;Lo;0;L;;;;;N;;;;;
-1216B;CUNEIFORM SIGN KA TIMES GU;Lo;0;L;;;;;N;;;;;
-1216C;CUNEIFORM SIGN KA TIMES GUR7;Lo;0;L;;;;;N;;;;;
-1216D;CUNEIFORM SIGN KA TIMES IGI;Lo;0;L;;;;;N;;;;;
-1216E;CUNEIFORM SIGN KA TIMES IM;Lo;0;L;;;;;N;;;;;
-1216F;CUNEIFORM SIGN KA TIMES KAK;Lo;0;L;;;;;N;;;;;
-12170;CUNEIFORM SIGN KA TIMES KI;Lo;0;L;;;;;N;;;;;
-12171;CUNEIFORM SIGN KA TIMES KID;Lo;0;L;;;;;N;;;;;
-12172;CUNEIFORM SIGN KA TIMES LI;Lo;0;L;;;;;N;;;;;
-12173;CUNEIFORM SIGN KA TIMES LU;Lo;0;L;;;;;N;;;;;
-12174;CUNEIFORM SIGN KA TIMES ME;Lo;0;L;;;;;N;;;;;
-12175;CUNEIFORM SIGN KA TIMES ME PLUS DU;Lo;0;L;;;;;N;;;;;
-12176;CUNEIFORM SIGN KA TIMES ME PLUS GI;Lo;0;L;;;;;N;;;;;
-12177;CUNEIFORM SIGN KA TIMES ME PLUS TE;Lo;0;L;;;;;N;;;;;
-12178;CUNEIFORM SIGN KA TIMES MI;Lo;0;L;;;;;N;;;;;
-12179;CUNEIFORM SIGN KA TIMES MI PLUS NUNUZ;Lo;0;L;;;;;N;;;;;
-1217A;CUNEIFORM SIGN KA TIMES NE;Lo;0;L;;;;;N;;;;;
-1217B;CUNEIFORM SIGN KA TIMES NUN;Lo;0;L;;;;;N;;;;;
-1217C;CUNEIFORM SIGN KA TIMES PI;Lo;0;L;;;;;N;;;;;
-1217D;CUNEIFORM SIGN KA TIMES RU;Lo;0;L;;;;;N;;;;;
-1217E;CUNEIFORM SIGN KA TIMES SA;Lo;0;L;;;;;N;;;;;
-1217F;CUNEIFORM SIGN KA TIMES SAR;Lo;0;L;;;;;N;;;;;
-12180;CUNEIFORM SIGN KA TIMES SHA;Lo;0;L;;;;;N;;;;;
-12181;CUNEIFORM SIGN KA TIMES SHE;Lo;0;L;;;;;N;;;;;
-12182;CUNEIFORM SIGN KA TIMES SHID;Lo;0;L;;;;;N;;;;;
-12183;CUNEIFORM SIGN KA TIMES SHU;Lo;0;L;;;;;N;;;;;
-12184;CUNEIFORM SIGN KA TIMES SIG;Lo;0;L;;;;;N;;;;;
-12185;CUNEIFORM SIGN KA TIMES SUHUR;Lo;0;L;;;;;N;;;;;
-12186;CUNEIFORM SIGN KA TIMES TAR;Lo;0;L;;;;;N;;;;;
-12187;CUNEIFORM SIGN KA TIMES U;Lo;0;L;;;;;N;;;;;
-12188;CUNEIFORM SIGN KA TIMES U2;Lo;0;L;;;;;N;;;;;
-12189;CUNEIFORM SIGN KA TIMES UD;Lo;0;L;;;;;N;;;;;
-1218A;CUNEIFORM SIGN KA TIMES UMUM TIMES PA;Lo;0;L;;;;;N;;;;;
-1218B;CUNEIFORM SIGN KA TIMES USH;Lo;0;L;;;;;N;;;;;
-1218C;CUNEIFORM SIGN KA TIMES ZI;Lo;0;L;;;;;N;;;;;
-1218D;CUNEIFORM SIGN KA2;Lo;0;L;;;;;N;;;;;
-1218E;CUNEIFORM SIGN KA2 CROSSING KA2;Lo;0;L;;;;;N;;;;;
-1218F;CUNEIFORM SIGN KAB;Lo;0;L;;;;;N;;;;;
-12190;CUNEIFORM SIGN KAD2;Lo;0;L;;;;;N;;;;;
-12191;CUNEIFORM SIGN KAD3;Lo;0;L;;;;;N;;;;;
-12192;CUNEIFORM SIGN KAD4;Lo;0;L;;;;;N;;;;;
-12193;CUNEIFORM SIGN KAD5;Lo;0;L;;;;;N;;;;;
-12194;CUNEIFORM SIGN KAD5 OVER KAD5;Lo;0;L;;;;;N;;;;;
-12195;CUNEIFORM SIGN KAK;Lo;0;L;;;;;N;;;;;
-12196;CUNEIFORM SIGN KAK TIMES IGI GUNU;Lo;0;L;;;;;N;;;;;
-12197;CUNEIFORM SIGN KAL;Lo;0;L;;;;;N;;;;;
-12198;CUNEIFORM SIGN KAL TIMES BAD;Lo;0;L;;;;;N;;;;;
-12199;CUNEIFORM SIGN KAL CROSSING KAL;Lo;0;L;;;;;N;;;;;
-1219A;CUNEIFORM SIGN KAM2;Lo;0;L;;;;;N;;;;;
-1219B;CUNEIFORM SIGN KAM4;Lo;0;L;;;;;N;;;;;
-1219C;CUNEIFORM SIGN KASKAL;Lo;0;L;;;;;N;;;;;
-1219D;CUNEIFORM SIGN KASKAL LAGAB TIMES U OVER LAGAB TIMES U;Lo;0;L;;;;;N;;;;;
-1219E;CUNEIFORM SIGN KASKAL OVER KASKAL LAGAB TIMES U OVER LAGAB TIMES U;Lo;0;L;;;;;N;;;;;
-1219F;CUNEIFORM SIGN KESH2;Lo;0;L;;;;;N;;;;;
-121A0;CUNEIFORM SIGN KI;Lo;0;L;;;;;N;;;;;
-121A1;CUNEIFORM SIGN KI TIMES BAD;Lo;0;L;;;;;N;;;;;
-121A2;CUNEIFORM SIGN KI TIMES U;Lo;0;L;;;;;N;;;;;
-121A3;CUNEIFORM SIGN KI TIMES UD;Lo;0;L;;;;;N;;;;;
-121A4;CUNEIFORM SIGN KID;Lo;0;L;;;;;N;;;;;
-121A5;CUNEIFORM SIGN KIN;Lo;0;L;;;;;N;;;;;
-121A6;CUNEIFORM SIGN KISAL;Lo;0;L;;;;;N;;;;;
-121A7;CUNEIFORM SIGN KISH;Lo;0;L;;;;;N;;;;;
-121A8;CUNEIFORM SIGN KISIM5;Lo;0;L;;;;;N;;;;;
-121A9;CUNEIFORM SIGN KISIM5 OVER KISIM5;Lo;0;L;;;;;N;;;;;
-121AA;CUNEIFORM SIGN KU;Lo;0;L;;;;;N;;;;;
-121AB;CUNEIFORM SIGN KU OVER HI TIMES ASH2 KU OVER HI TIMES ASH2;Lo;0;L;;;;;N;;;;;
-121AC;CUNEIFORM SIGN KU3;Lo;0;L;;;;;N;;;;;
-121AD;CUNEIFORM SIGN KU4;Lo;0;L;;;;;N;;;;;
-121AE;CUNEIFORM SIGN KU4 VARIANT FORM;Lo;0;L;;;;;N;;;;;
-121AF;CUNEIFORM SIGN KU7;Lo;0;L;;;;;N;;;;;
-121B0;CUNEIFORM SIGN KUL;Lo;0;L;;;;;N;;;;;
-121B1;CUNEIFORM SIGN KUL GUNU;Lo;0;L;;;;;N;;;;;
-121B2;CUNEIFORM SIGN KUN;Lo;0;L;;;;;N;;;;;
-121B3;CUNEIFORM SIGN KUR;Lo;0;L;;;;;N;;;;;
-121B4;CUNEIFORM SIGN KUR OPPOSING KUR;Lo;0;L;;;;;N;;;;;
-121B5;CUNEIFORM SIGN KUSHU2;Lo;0;L;;;;;N;;;;;
-121B6;CUNEIFORM SIGN KWU318;Lo;0;L;;;;;N;;;;;
-121B7;CUNEIFORM SIGN LA;Lo;0;L;;;;;N;;;;;
-121B8;CUNEIFORM SIGN LAGAB;Lo;0;L;;;;;N;;;;;
-121B9;CUNEIFORM SIGN LAGAB TIMES A;Lo;0;L;;;;;N;;;;;
-121BA;CUNEIFORM SIGN LAGAB TIMES A PLUS DA PLUS HA;Lo;0;L;;;;;N;;;;;
-121BB;CUNEIFORM SIGN LAGAB TIMES A PLUS GAR;Lo;0;L;;;;;N;;;;;
-121BC;CUNEIFORM SIGN LAGAB TIMES A PLUS LAL;Lo;0;L;;;;;N;;;;;
-121BD;CUNEIFORM SIGN LAGAB TIMES AL;Lo;0;L;;;;;N;;;;;
-121BE;CUNEIFORM SIGN LAGAB TIMES AN;Lo;0;L;;;;;N;;;;;
-121BF;CUNEIFORM SIGN LAGAB TIMES ASH ZIDA TENU;Lo;0;L;;;;;N;;;;;
-121C0;CUNEIFORM SIGN LAGAB TIMES BAD;Lo;0;L;;;;;N;;;;;
-121C1;CUNEIFORM SIGN LAGAB TIMES BI;Lo;0;L;;;;;N;;;;;
-121C2;CUNEIFORM SIGN LAGAB TIMES DAR;Lo;0;L;;;;;N;;;;;
-121C3;CUNEIFORM SIGN LAGAB TIMES EN;Lo;0;L;;;;;N;;;;;
-121C4;CUNEIFORM SIGN LAGAB TIMES GA;Lo;0;L;;;;;N;;;;;
-121C5;CUNEIFORM SIGN LAGAB TIMES GAR;Lo;0;L;;;;;N;;;;;
-121C6;CUNEIFORM SIGN LAGAB TIMES GUD;Lo;0;L;;;;;N;;;;;
-121C7;CUNEIFORM SIGN LAGAB TIMES GUD PLUS GUD;Lo;0;L;;;;;N;;;;;
-121C8;CUNEIFORM SIGN LAGAB TIMES HA;Lo;0;L;;;;;N;;;;;
-121C9;CUNEIFORM SIGN LAGAB TIMES HAL;Lo;0;L;;;;;N;;;;;
-121CA;CUNEIFORM SIGN LAGAB TIMES HI TIMES NUN;Lo;0;L;;;;;N;;;;;
-121CB;CUNEIFORM SIGN LAGAB TIMES IGI GUNU;Lo;0;L;;;;;N;;;;;
-121CC;CUNEIFORM SIGN LAGAB TIMES IM;Lo;0;L;;;;;N;;;;;
-121CD;CUNEIFORM SIGN LAGAB TIMES IM PLUS HA;Lo;0;L;;;;;N;;;;;
-121CE;CUNEIFORM SIGN LAGAB TIMES IM PLUS LU;Lo;0;L;;;;;N;;;;;
-121CF;CUNEIFORM SIGN LAGAB TIMES KI;Lo;0;L;;;;;N;;;;;
-121D0;CUNEIFORM SIGN LAGAB TIMES KIN;Lo;0;L;;;;;N;;;;;
-121D1;CUNEIFORM SIGN LAGAB TIMES KU3;Lo;0;L;;;;;N;;;;;
-121D2;CUNEIFORM SIGN LAGAB TIMES KUL;Lo;0;L;;;;;N;;;;;
-121D3;CUNEIFORM SIGN LAGAB TIMES KUL PLUS HI PLUS A;Lo;0;L;;;;;N;;;;;
-121D4;CUNEIFORM SIGN LAGAB TIMES LAGAB;Lo;0;L;;;;;N;;;;;
-121D5;CUNEIFORM SIGN LAGAB TIMES LISH;Lo;0;L;;;;;N;;;;;
-121D6;CUNEIFORM SIGN LAGAB TIMES LU;Lo;0;L;;;;;N;;;;;
-121D7;CUNEIFORM SIGN LAGAB TIMES LUL;Lo;0;L;;;;;N;;;;;
-121D8;CUNEIFORM SIGN LAGAB TIMES ME;Lo;0;L;;;;;N;;;;;
-121D9;CUNEIFORM SIGN LAGAB TIMES ME PLUS EN;Lo;0;L;;;;;N;;;;;
-121DA;CUNEIFORM SIGN LAGAB TIMES MUSH;Lo;0;L;;;;;N;;;;;
-121DB;CUNEIFORM SIGN LAGAB TIMES NE;Lo;0;L;;;;;N;;;;;
-121DC;CUNEIFORM SIGN LAGAB TIMES SHE PLUS SUM;Lo;0;L;;;;;N;;;;;
-121DD;CUNEIFORM SIGN LAGAB TIMES SHITA PLUS GISH PLUS ERIN2;Lo;0;L;;;;;N;;;;;
-121DE;CUNEIFORM SIGN LAGAB TIMES SHITA PLUS GISH TENU;Lo;0;L;;;;;N;;;;;
-121DF;CUNEIFORM SIGN LAGAB TIMES SHU2;Lo;0;L;;;;;N;;;;;
-121E0;CUNEIFORM SIGN LAGAB TIMES SHU2 PLUS SHU2;Lo;0;L;;;;;N;;;;;
-121E1;CUNEIFORM SIGN LAGAB TIMES SUM;Lo;0;L;;;;;N;;;;;
-121E2;CUNEIFORM SIGN LAGAB TIMES TAG;Lo;0;L;;;;;N;;;;;
-121E3;CUNEIFORM SIGN LAGAB TIMES TAK4;Lo;0;L;;;;;N;;;;;
-121E4;CUNEIFORM SIGN LAGAB TIMES TE PLUS A PLUS SU PLUS NA;Lo;0;L;;;;;N;;;;;
-121E5;CUNEIFORM SIGN LAGAB TIMES U;Lo;0;L;;;;;N;;;;;
-121E6;CUNEIFORM SIGN LAGAB TIMES U PLUS A;Lo;0;L;;;;;N;;;;;
-121E7;CUNEIFORM SIGN LAGAB TIMES U PLUS U PLUS U;Lo;0;L;;;;;N;;;;;
-121E8;CUNEIFORM SIGN LAGAB TIMES U2 PLUS ASH;Lo;0;L;;;;;N;;;;;
-121E9;CUNEIFORM SIGN LAGAB TIMES UD;Lo;0;L;;;;;N;;;;;
-121EA;CUNEIFORM SIGN LAGAB TIMES USH;Lo;0;L;;;;;N;;;;;
-121EB;CUNEIFORM SIGN LAGAB SQUARED;Lo;0;L;;;;;N;;;;;
-121EC;CUNEIFORM SIGN LAGAR;Lo;0;L;;;;;N;;;;;
-121ED;CUNEIFORM SIGN LAGAR TIMES SHE;Lo;0;L;;;;;N;;;;;
-121EE;CUNEIFORM SIGN LAGAR TIMES SHE PLUS SUM;Lo;0;L;;;;;N;;;;;
-121EF;CUNEIFORM SIGN LAGAR GUNU;Lo;0;L;;;;;N;;;;;
-121F0;CUNEIFORM SIGN LAGAR GUNU OVER LAGAR GUNU SHE;Lo;0;L;;;;;N;;;;;
-121F1;CUNEIFORM SIGN LAHSHU;Lo;0;L;;;;;N;;;;;
-121F2;CUNEIFORM SIGN LAL;Lo;0;L;;;;;N;;;;;
-121F3;CUNEIFORM SIGN LAL TIMES LAL;Lo;0;L;;;;;N;;;;;
-121F4;CUNEIFORM SIGN LAM;Lo;0;L;;;;;N;;;;;
-121F5;CUNEIFORM SIGN LAM TIMES KUR;Lo;0;L;;;;;N;;;;;
-121F6;CUNEIFORM SIGN LAM TIMES KUR PLUS RU;Lo;0;L;;;;;N;;;;;
-121F7;CUNEIFORM SIGN LI;Lo;0;L;;;;;N;;;;;
-121F8;CUNEIFORM SIGN LIL;Lo;0;L;;;;;N;;;;;
-121F9;CUNEIFORM SIGN LIMMU2;Lo;0;L;;;;;N;;;;;
-121FA;CUNEIFORM SIGN LISH;Lo;0;L;;;;;N;;;;;
-121FB;CUNEIFORM SIGN LU;Lo;0;L;;;;;N;;;;;
-121FC;CUNEIFORM SIGN LU TIMES BAD;Lo;0;L;;;;;N;;;;;
-121FD;CUNEIFORM SIGN LU2;Lo;0;L;;;;;N;;;;;
-121FE;CUNEIFORM SIGN LU2 TIMES AL;Lo;0;L;;;;;N;;;;;
-121FF;CUNEIFORM SIGN LU2 TIMES BAD;Lo;0;L;;;;;N;;;;;
-12200;CUNEIFORM SIGN LU2 TIMES ESH2;Lo;0;L;;;;;N;;;;;
-12201;CUNEIFORM SIGN LU2 TIMES ESH2 TENU;Lo;0;L;;;;;N;;;;;
-12202;CUNEIFORM SIGN LU2 TIMES GAN2 TENU;Lo;0;L;;;;;N;;;;;
-12203;CUNEIFORM SIGN LU2 TIMES HI TIMES BAD;Lo;0;L;;;;;N;;;;;
-12204;CUNEIFORM SIGN LU2 TIMES IM;Lo;0;L;;;;;N;;;;;
-12205;CUNEIFORM SIGN LU2 TIMES KAD2;Lo;0;L;;;;;N;;;;;
-12206;CUNEIFORM SIGN LU2 TIMES KAD3;Lo;0;L;;;;;N;;;;;
-12207;CUNEIFORM SIGN LU2 TIMES KAD3 PLUS ASH;Lo;0;L;;;;;N;;;;;
-12208;CUNEIFORM SIGN LU2 TIMES KI;Lo;0;L;;;;;N;;;;;
-12209;CUNEIFORM SIGN LU2 TIMES LA PLUS ASH;Lo;0;L;;;;;N;;;;;
-1220A;CUNEIFORM SIGN LU2 TIMES LAGAB;Lo;0;L;;;;;N;;;;;
-1220B;CUNEIFORM SIGN LU2 TIMES ME PLUS EN;Lo;0;L;;;;;N;;;;;
-1220C;CUNEIFORM SIGN LU2 TIMES NE;Lo;0;L;;;;;N;;;;;
-1220D;CUNEIFORM SIGN LU2 TIMES NU;Lo;0;L;;;;;N;;;;;
-1220E;CUNEIFORM SIGN LU2 TIMES SI PLUS ASH;Lo;0;L;;;;;N;;;;;
-1220F;CUNEIFORM SIGN LU2 TIMES SIK2 PLUS BU;Lo;0;L;;;;;N;;;;;
-12210;CUNEIFORM SIGN LU2 TIMES TUG2;Lo;0;L;;;;;N;;;;;
-12211;CUNEIFORM SIGN LU2 TENU;Lo;0;L;;;;;N;;;;;
-12212;CUNEIFORM SIGN LU2 CROSSING LU2;Lo;0;L;;;;;N;;;;;
-12213;CUNEIFORM SIGN LU2 OPPOSING LU2;Lo;0;L;;;;;N;;;;;
-12214;CUNEIFORM SIGN LU2 SQUARED;Lo;0;L;;;;;N;;;;;
-12215;CUNEIFORM SIGN LU2 SHESHIG;Lo;0;L;;;;;N;;;;;
-12216;CUNEIFORM SIGN LU3;Lo;0;L;;;;;N;;;;;
-12217;CUNEIFORM SIGN LUGAL;Lo;0;L;;;;;N;;;;;
-12218;CUNEIFORM SIGN LUGAL OVER LUGAL;Lo;0;L;;;;;N;;;;;
-12219;CUNEIFORM SIGN LUGAL OPPOSING LUGAL;Lo;0;L;;;;;N;;;;;
-1221A;CUNEIFORM SIGN LUGAL SHESHIG;Lo;0;L;;;;;N;;;;;
-1221B;CUNEIFORM SIGN LUH;Lo;0;L;;;;;N;;;;;
-1221C;CUNEIFORM SIGN LUL;Lo;0;L;;;;;N;;;;;
-1221D;CUNEIFORM SIGN LUM;Lo;0;L;;;;;N;;;;;
-1221E;CUNEIFORM SIGN LUM OVER LUM;Lo;0;L;;;;;N;;;;;
-1221F;CUNEIFORM SIGN LUM OVER LUM GAR OVER GAR;Lo;0;L;;;;;N;;;;;
-12220;CUNEIFORM SIGN MA;Lo;0;L;;;;;N;;;;;
-12221;CUNEIFORM SIGN MA TIMES TAK4;Lo;0;L;;;;;N;;;;;
-12222;CUNEIFORM SIGN MA GUNU;Lo;0;L;;;;;N;;;;;
-12223;CUNEIFORM SIGN MA2;Lo;0;L;;;;;N;;;;;
-12224;CUNEIFORM SIGN MAH;Lo;0;L;;;;;N;;;;;
-12225;CUNEIFORM SIGN MAR;Lo;0;L;;;;;N;;;;;
-12226;CUNEIFORM SIGN MASH;Lo;0;L;;;;;N;;;;;
-12227;CUNEIFORM SIGN MASH2;Lo;0;L;;;;;N;;;;;
-12228;CUNEIFORM SIGN ME;Lo;0;L;;;;;N;;;;;
-12229;CUNEIFORM SIGN MES;Lo;0;L;;;;;N;;;;;
-1222A;CUNEIFORM SIGN MI;Lo;0;L;;;;;N;;;;;
-1222B;CUNEIFORM SIGN MIN;Lo;0;L;;;;;N;;;;;
-1222C;CUNEIFORM SIGN MU;Lo;0;L;;;;;N;;;;;
-1222D;CUNEIFORM SIGN MU OVER MU;Lo;0;L;;;;;N;;;;;
-1222E;CUNEIFORM SIGN MUG;Lo;0;L;;;;;N;;;;;
-1222F;CUNEIFORM SIGN MUG GUNU;Lo;0;L;;;;;N;;;;;
-12230;CUNEIFORM SIGN MUNSUB;Lo;0;L;;;;;N;;;;;
-12231;CUNEIFORM SIGN MURGU2;Lo;0;L;;;;;N;;;;;
-12232;CUNEIFORM SIGN MUSH;Lo;0;L;;;;;N;;;;;
-12233;CUNEIFORM SIGN MUSH TIMES A;Lo;0;L;;;;;N;;;;;
-12234;CUNEIFORM SIGN MUSH TIMES KUR;Lo;0;L;;;;;N;;;;;
-12235;CUNEIFORM SIGN MUSH TIMES ZA;Lo;0;L;;;;;N;;;;;
-12236;CUNEIFORM SIGN MUSH OVER MUSH;Lo;0;L;;;;;N;;;;;
-12237;CUNEIFORM SIGN MUSH OVER MUSH TIMES A PLUS NA;Lo;0;L;;;;;N;;;;;
-12238;CUNEIFORM SIGN MUSH CROSSING MUSH;Lo;0;L;;;;;N;;;;;
-12239;CUNEIFORM SIGN MUSH3;Lo;0;L;;;;;N;;;;;
-1223A;CUNEIFORM SIGN MUSH3 TIMES A;Lo;0;L;;;;;N;;;;;
-1223B;CUNEIFORM SIGN MUSH3 TIMES A PLUS DI;Lo;0;L;;;;;N;;;;;
-1223C;CUNEIFORM SIGN MUSH3 TIMES DI;Lo;0;L;;;;;N;;;;;
-1223D;CUNEIFORM SIGN MUSH3 GUNU;Lo;0;L;;;;;N;;;;;
-1223E;CUNEIFORM SIGN NA;Lo;0;L;;;;;N;;;;;
-1223F;CUNEIFORM SIGN NA2;Lo;0;L;;;;;N;;;;;
-12240;CUNEIFORM SIGN NAGA;Lo;0;L;;;;;N;;;;;
-12241;CUNEIFORM SIGN NAGA INVERTED;Lo;0;L;;;;;N;;;;;
-12242;CUNEIFORM SIGN NAGA TIMES SHU TENU;Lo;0;L;;;;;N;;;;;
-12243;CUNEIFORM SIGN NAGA OPPOSING NAGA;Lo;0;L;;;;;N;;;;;
-12244;CUNEIFORM SIGN NAGAR;Lo;0;L;;;;;N;;;;;
-12245;CUNEIFORM SIGN NAM NUTILLU;Lo;0;L;;;;;N;;;;;
-12246;CUNEIFORM SIGN NAM;Lo;0;L;;;;;N;;;;;
-12247;CUNEIFORM SIGN NAM2;Lo;0;L;;;;;N;;;;;
-12248;CUNEIFORM SIGN NE;Lo;0;L;;;;;N;;;;;
-12249;CUNEIFORM SIGN NE TIMES A;Lo;0;L;;;;;N;;;;;
-1224A;CUNEIFORM SIGN NE TIMES UD;Lo;0;L;;;;;N;;;;;
-1224B;CUNEIFORM SIGN NE SHESHIG;Lo;0;L;;;;;N;;;;;
-1224C;CUNEIFORM SIGN NI;Lo;0;L;;;;;N;;;;;
-1224D;CUNEIFORM SIGN NI TIMES E;Lo;0;L;;;;;N;;;;;
-1224E;CUNEIFORM SIGN NI2;Lo;0;L;;;;;N;;;;;
-1224F;CUNEIFORM SIGN NIM;Lo;0;L;;;;;N;;;;;
-12250;CUNEIFORM SIGN NIM TIMES GAN2 TENU;Lo;0;L;;;;;N;;;;;
-12251;CUNEIFORM SIGN NIM TIMES GAR PLUS GAN2 TENU;Lo;0;L;;;;;N;;;;;
-12252;CUNEIFORM SIGN NINDA2;Lo;0;L;;;;;N;;;;;
-12253;CUNEIFORM SIGN NINDA2 TIMES AN;Lo;0;L;;;;;N;;;;;
-12254;CUNEIFORM SIGN NINDA2 TIMES ASH;Lo;0;L;;;;;N;;;;;
-12255;CUNEIFORM SIGN NINDA2 TIMES ASH PLUS ASH;Lo;0;L;;;;;N;;;;;
-12256;CUNEIFORM SIGN NINDA2 TIMES GUD;Lo;0;L;;;;;N;;;;;
-12257;CUNEIFORM SIGN NINDA2 TIMES ME PLUS GAN2 TENU;Lo;0;L;;;;;N;;;;;
-12258;CUNEIFORM SIGN NINDA2 TIMES NE;Lo;0;L;;;;;N;;;;;
-12259;CUNEIFORM SIGN NINDA2 TIMES NUN;Lo;0;L;;;;;N;;;;;
-1225A;CUNEIFORM SIGN NINDA2 TIMES SHE;Lo;0;L;;;;;N;;;;;
-1225B;CUNEIFORM SIGN NINDA2 TIMES SHE PLUS A AN;Lo;0;L;;;;;N;;;;;
-1225C;CUNEIFORM SIGN NINDA2 TIMES SHE PLUS ASH;Lo;0;L;;;;;N;;;;;
-1225D;CUNEIFORM SIGN NINDA2 TIMES SHE PLUS ASH PLUS ASH;Lo;0;L;;;;;N;;;;;
-1225E;CUNEIFORM SIGN NINDA2 TIMES U2 PLUS ASH;Lo;0;L;;;;;N;;;;;
-1225F;CUNEIFORM SIGN NINDA2 TIMES USH;Lo;0;L;;;;;N;;;;;
-12260;CUNEIFORM SIGN NISAG;Lo;0;L;;;;;N;;;;;
-12261;CUNEIFORM SIGN NU;Lo;0;L;;;;;N;;;;;
-12262;CUNEIFORM SIGN NU11;Lo;0;L;;;;;N;;;;;
-12263;CUNEIFORM SIGN NUN;Lo;0;L;;;;;N;;;;;
-12264;CUNEIFORM SIGN NUN LAGAR TIMES GAR;Lo;0;L;;;;;N;;;;;
-12265;CUNEIFORM SIGN NUN LAGAR TIMES MASH;Lo;0;L;;;;;N;;;;;
-12266;CUNEIFORM SIGN NUN LAGAR TIMES SAL;Lo;0;L;;;;;N;;;;;
-12267;CUNEIFORM SIGN NUN LAGAR TIMES SAL OVER NUN LAGAR TIMES SAL;Lo;0;L;;;;;N;;;;;
-12268;CUNEIFORM SIGN NUN LAGAR TIMES USH;Lo;0;L;;;;;N;;;;;
-12269;CUNEIFORM SIGN NUN TENU;Lo;0;L;;;;;N;;;;;
-1226A;CUNEIFORM SIGN NUN OVER NUN;Lo;0;L;;;;;N;;;;;
-1226B;CUNEIFORM SIGN NUN CROSSING NUN;Lo;0;L;;;;;N;;;;;
-1226C;CUNEIFORM SIGN NUN CROSSING NUN LAGAR OVER LAGAR;Lo;0;L;;;;;N;;;;;
-1226D;CUNEIFORM SIGN NUNUZ;Lo;0;L;;;;;N;;;;;
-1226E;CUNEIFORM SIGN NUNUZ AB2 TIMES ASHGAB;Lo;0;L;;;;;N;;;;;
-1226F;CUNEIFORM SIGN NUNUZ AB2 TIMES BI;Lo;0;L;;;;;N;;;;;
-12270;CUNEIFORM SIGN NUNUZ AB2 TIMES DUG;Lo;0;L;;;;;N;;;;;
-12271;CUNEIFORM SIGN NUNUZ AB2 TIMES GUD;Lo;0;L;;;;;N;;;;;
-12272;CUNEIFORM SIGN NUNUZ AB2 TIMES IGI GUNU;Lo;0;L;;;;;N;;;;;
-12273;CUNEIFORM SIGN NUNUZ AB2 TIMES KAD3;Lo;0;L;;;;;N;;;;;
-12274;CUNEIFORM SIGN NUNUZ AB2 TIMES LA;Lo;0;L;;;;;N;;;;;
-12275;CUNEIFORM SIGN NUNUZ AB2 TIMES NE;Lo;0;L;;;;;N;;;;;
-12276;CUNEIFORM SIGN NUNUZ AB2 TIMES SILA3;Lo;0;L;;;;;N;;;;;
-12277;CUNEIFORM SIGN NUNUZ AB2 TIMES U2;Lo;0;L;;;;;N;;;;;
-12278;CUNEIFORM SIGN NUNUZ KISIM5 TIMES BI;Lo;0;L;;;;;N;;;;;
-12279;CUNEIFORM SIGN NUNUZ KISIM5 TIMES BI U;Lo;0;L;;;;;N;;;;;
-1227A;CUNEIFORM SIGN PA;Lo;0;L;;;;;N;;;;;
-1227B;CUNEIFORM SIGN PAD;Lo;0;L;;;;;N;;;;;
-1227C;CUNEIFORM SIGN PAN;Lo;0;L;;;;;N;;;;;
-1227D;CUNEIFORM SIGN PAP;Lo;0;L;;;;;N;;;;;
-1227E;CUNEIFORM SIGN PESH2;Lo;0;L;;;;;N;;;;;
-1227F;CUNEIFORM SIGN PI;Lo;0;L;;;;;N;;;;;
-12280;CUNEIFORM SIGN PI TIMES A;Lo;0;L;;;;;N;;;;;
-12281;CUNEIFORM SIGN PI TIMES AB;Lo;0;L;;;;;N;;;;;
-12282;CUNEIFORM SIGN PI TIMES BI;Lo;0;L;;;;;N;;;;;
-12283;CUNEIFORM SIGN PI TIMES BU;Lo;0;L;;;;;N;;;;;
-12284;CUNEIFORM SIGN PI TIMES E;Lo;0;L;;;;;N;;;;;
-12285;CUNEIFORM SIGN PI TIMES I;Lo;0;L;;;;;N;;;;;
-12286;CUNEIFORM SIGN PI TIMES IB;Lo;0;L;;;;;N;;;;;
-12287;CUNEIFORM SIGN PI TIMES U;Lo;0;L;;;;;N;;;;;
-12288;CUNEIFORM SIGN PI TIMES U2;Lo;0;L;;;;;N;;;;;
-12289;CUNEIFORM SIGN PI CROSSING PI;Lo;0;L;;;;;N;;;;;
-1228A;CUNEIFORM SIGN PIRIG;Lo;0;L;;;;;N;;;;;
-1228B;CUNEIFORM SIGN PIRIG TIMES KAL;Lo;0;L;;;;;N;;;;;
-1228C;CUNEIFORM SIGN PIRIG TIMES UD;Lo;0;L;;;;;N;;;;;
-1228D;CUNEIFORM SIGN PIRIG TIMES ZA;Lo;0;L;;;;;N;;;;;
-1228E;CUNEIFORM SIGN PIRIG OPPOSING PIRIG;Lo;0;L;;;;;N;;;;;
-1228F;CUNEIFORM SIGN RA;Lo;0;L;;;;;N;;;;;
-12290;CUNEIFORM SIGN RAB;Lo;0;L;;;;;N;;;;;
-12291;CUNEIFORM SIGN RI;Lo;0;L;;;;;N;;;;;
-12292;CUNEIFORM SIGN RU;Lo;0;L;;;;;N;;;;;
-12293;CUNEIFORM SIGN SA;Lo;0;L;;;;;N;;;;;
-12294;CUNEIFORM SIGN SAG NUTILLU;Lo;0;L;;;;;N;;;;;
-12295;CUNEIFORM SIGN SAG;Lo;0;L;;;;;N;;;;;
-12296;CUNEIFORM SIGN SAG TIMES A;Lo;0;L;;;;;N;;;;;
-12297;CUNEIFORM SIGN SAG TIMES DU;Lo;0;L;;;;;N;;;;;
-12298;CUNEIFORM SIGN SAG TIMES DUB;Lo;0;L;;;;;N;;;;;
-12299;CUNEIFORM SIGN SAG TIMES HA;Lo;0;L;;;;;N;;;;;
-1229A;CUNEIFORM SIGN SAG TIMES KAK;Lo;0;L;;;;;N;;;;;
-1229B;CUNEIFORM SIGN SAG TIMES KUR;Lo;0;L;;;;;N;;;;;
-1229C;CUNEIFORM SIGN SAG TIMES LUM;Lo;0;L;;;;;N;;;;;
-1229D;CUNEIFORM SIGN SAG TIMES MI;Lo;0;L;;;;;N;;;;;
-1229E;CUNEIFORM SIGN SAG TIMES NUN;Lo;0;L;;;;;N;;;;;
-1229F;CUNEIFORM SIGN SAG TIMES SAL;Lo;0;L;;;;;N;;;;;
-122A0;CUNEIFORM SIGN SAG TIMES SHID;Lo;0;L;;;;;N;;;;;
-122A1;CUNEIFORM SIGN SAG TIMES TAB;Lo;0;L;;;;;N;;;;;
-122A2;CUNEIFORM SIGN SAG TIMES U2;Lo;0;L;;;;;N;;;;;
-122A3;CUNEIFORM SIGN SAG TIMES UB;Lo;0;L;;;;;N;;;;;
-122A4;CUNEIFORM SIGN SAG TIMES UM;Lo;0;L;;;;;N;;;;;
-122A5;CUNEIFORM SIGN SAG TIMES UR;Lo;0;L;;;;;N;;;;;
-122A6;CUNEIFORM SIGN SAG TIMES USH;Lo;0;L;;;;;N;;;;;
-122A7;CUNEIFORM SIGN SAG OVER SAG;Lo;0;L;;;;;N;;;;;
-122A8;CUNEIFORM SIGN SAG GUNU;Lo;0;L;;;;;N;;;;;
-122A9;CUNEIFORM SIGN SAL;Lo;0;L;;;;;N;;;;;
-122AA;CUNEIFORM SIGN SAL LAGAB TIMES ASH2;Lo;0;L;;;;;N;;;;;
-122AB;CUNEIFORM SIGN SANGA2;Lo;0;L;;;;;N;;;;;
-122AC;CUNEIFORM SIGN SAR;Lo;0;L;;;;;N;;;;;
-122AD;CUNEIFORM SIGN SHA;Lo;0;L;;;;;N;;;;;
-122AE;CUNEIFORM SIGN SHA3;Lo;0;L;;;;;N;;;;;
-122AF;CUNEIFORM SIGN SHA3 TIMES A;Lo;0;L;;;;;N;;;;;
-122B0;CUNEIFORM SIGN SHA3 TIMES BAD;Lo;0;L;;;;;N;;;;;
-122B1;CUNEIFORM SIGN SHA3 TIMES GISH;Lo;0;L;;;;;N;;;;;
-122B2;CUNEIFORM SIGN SHA3 TIMES NE;Lo;0;L;;;;;N;;;;;
-122B3;CUNEIFORM SIGN SHA3 TIMES SHU2;Lo;0;L;;;;;N;;;;;
-122B4;CUNEIFORM SIGN SHA3 TIMES TUR;Lo;0;L;;;;;N;;;;;
-122B5;CUNEIFORM SIGN SHA3 TIMES U;Lo;0;L;;;;;N;;;;;
-122B6;CUNEIFORM SIGN SHA3 TIMES U PLUS A;Lo;0;L;;;;;N;;;;;
-122B7;CUNEIFORM SIGN SHA6;Lo;0;L;;;;;N;;;;;
-122B8;CUNEIFORM SIGN SHAB6;Lo;0;L;;;;;N;;;;;
-122B9;CUNEIFORM SIGN SHAR2;Lo;0;L;;;;;N;;;;;
-122BA;CUNEIFORM SIGN SHE;Lo;0;L;;;;;N;;;;;
-122BB;CUNEIFORM SIGN SHE HU;Lo;0;L;;;;;N;;;;;
-122BC;CUNEIFORM SIGN SHE OVER SHE GAD OVER GAD GAR OVER GAR;Lo;0;L;;;;;N;;;;;
-122BD;CUNEIFORM SIGN SHE OVER SHE TAB OVER TAB GAR OVER GAR;Lo;0;L;;;;;N;;;;;
-122BE;CUNEIFORM SIGN SHEG9;Lo;0;L;;;;;N;;;;;
-122BF;CUNEIFORM SIGN SHEN;Lo;0;L;;;;;N;;;;;
-122C0;CUNEIFORM SIGN SHESH;Lo;0;L;;;;;N;;;;;
-122C1;CUNEIFORM SIGN SHESH2;Lo;0;L;;;;;N;;;;;
-122C2;CUNEIFORM SIGN SHESHLAM;Lo;0;L;;;;;N;;;;;
-122C3;CUNEIFORM SIGN SHID;Lo;0;L;;;;;N;;;;;
-122C4;CUNEIFORM SIGN SHID TIMES A;Lo;0;L;;;;;N;;;;;
-122C5;CUNEIFORM SIGN SHID TIMES IM;Lo;0;L;;;;;N;;;;;
-122C6;CUNEIFORM SIGN SHIM;Lo;0;L;;;;;N;;;;;
-122C7;CUNEIFORM SIGN SHIM TIMES A;Lo;0;L;;;;;N;;;;;
-122C8;CUNEIFORM SIGN SHIM TIMES BAL;Lo;0;L;;;;;N;;;;;
-122C9;CUNEIFORM SIGN SHIM TIMES BULUG;Lo;0;L;;;;;N;;;;;
-122CA;CUNEIFORM SIGN SHIM TIMES DIN;Lo;0;L;;;;;N;;;;;
-122CB;CUNEIFORM SIGN SHIM TIMES GAR;Lo;0;L;;;;;N;;;;;
-122CC;CUNEIFORM SIGN SHIM TIMES IGI;Lo;0;L;;;;;N;;;;;
-122CD;CUNEIFORM SIGN SHIM TIMES IGI GUNU;Lo;0;L;;;;;N;;;;;
-122CE;CUNEIFORM SIGN SHIM TIMES KUSHU2;Lo;0;L;;;;;N;;;;;
-122CF;CUNEIFORM SIGN SHIM TIMES LUL;Lo;0;L;;;;;N;;;;;
-122D0;CUNEIFORM SIGN SHIM TIMES MUG;Lo;0;L;;;;;N;;;;;
-122D1;CUNEIFORM SIGN SHIM TIMES SAL;Lo;0;L;;;;;N;;;;;
-122D2;CUNEIFORM SIGN SHINIG;Lo;0;L;;;;;N;;;;;
-122D3;CUNEIFORM SIGN SHIR;Lo;0;L;;;;;N;;;;;
-122D4;CUNEIFORM SIGN SHIR TENU;Lo;0;L;;;;;N;;;;;
-122D5;CUNEIFORM SIGN SHIR OVER SHIR BUR OVER BUR;Lo;0;L;;;;;N;;;;;
-122D6;CUNEIFORM SIGN SHITA;Lo;0;L;;;;;N;;;;;
-122D7;CUNEIFORM SIGN SHU;Lo;0;L;;;;;N;;;;;
-122D8;CUNEIFORM SIGN SHU OVER INVERTED SHU;Lo;0;L;;;;;N;;;;;
-122D9;CUNEIFORM SIGN SHU2;Lo;0;L;;;;;N;;;;;
-122DA;CUNEIFORM SIGN SHUBUR;Lo;0;L;;;;;N;;;;;
-122DB;CUNEIFORM SIGN SI;Lo;0;L;;;;;N;;;;;
-122DC;CUNEIFORM SIGN SI GUNU;Lo;0;L;;;;;N;;;;;
-122DD;CUNEIFORM SIGN SIG;Lo;0;L;;;;;N;;;;;
-122DE;CUNEIFORM SIGN SIG4;Lo;0;L;;;;;N;;;;;
-122DF;CUNEIFORM SIGN SIG4 OVER SIG4 SHU2;Lo;0;L;;;;;N;;;;;
-122E0;CUNEIFORM SIGN SIK2;Lo;0;L;;;;;N;;;;;
-122E1;CUNEIFORM SIGN SILA3;Lo;0;L;;;;;N;;;;;
-122E2;CUNEIFORM SIGN SU;Lo;0;L;;;;;N;;;;;
-122E3;CUNEIFORM SIGN SU OVER SU;Lo;0;L;;;;;N;;;;;
-122E4;CUNEIFORM SIGN SUD;Lo;0;L;;;;;N;;;;;
-122E5;CUNEIFORM SIGN SUD2;Lo;0;L;;;;;N;;;;;
-122E6;CUNEIFORM SIGN SUHUR;Lo;0;L;;;;;N;;;;;
-122E7;CUNEIFORM SIGN SUM;Lo;0;L;;;;;N;;;;;
-122E8;CUNEIFORM SIGN SUMASH;Lo;0;L;;;;;N;;;;;
-122E9;CUNEIFORM SIGN SUR;Lo;0;L;;;;;N;;;;;
-122EA;CUNEIFORM SIGN SUR9;Lo;0;L;;;;;N;;;;;
-122EB;CUNEIFORM SIGN TA;Lo;0;L;;;;;N;;;;;
-122EC;CUNEIFORM SIGN TA ASTERISK;Lo;0;L;;;;;N;;;;;
-122ED;CUNEIFORM SIGN TA TIMES HI;Lo;0;L;;;;;N;;;;;
-122EE;CUNEIFORM SIGN TA TIMES MI;Lo;0;L;;;;;N;;;;;
-122EF;CUNEIFORM SIGN TA GUNU;Lo;0;L;;;;;N;;;;;
-122F0;CUNEIFORM SIGN TAB;Lo;0;L;;;;;N;;;;;
-122F1;CUNEIFORM SIGN TAB OVER TAB NI OVER NI DISH OVER DISH;Lo;0;L;;;;;N;;;;;
-122F2;CUNEIFORM SIGN TAB SQUARED;Lo;0;L;;;;;N;;;;;
-122F3;CUNEIFORM SIGN TAG;Lo;0;L;;;;;N;;;;;
-122F4;CUNEIFORM SIGN TAG TIMES BI;Lo;0;L;;;;;N;;;;;
-122F5;CUNEIFORM SIGN TAG TIMES GUD;Lo;0;L;;;;;N;;;;;
-122F6;CUNEIFORM SIGN TAG TIMES SHE;Lo;0;L;;;;;N;;;;;
-122F7;CUNEIFORM SIGN TAG TIMES SHU;Lo;0;L;;;;;N;;;;;
-122F8;CUNEIFORM SIGN TAG TIMES TUG2;Lo;0;L;;;;;N;;;;;
-122F9;CUNEIFORM SIGN TAG TIMES UD;Lo;0;L;;;;;N;;;;;
-122FA;CUNEIFORM SIGN TAK4;Lo;0;L;;;;;N;;;;;
-122FB;CUNEIFORM SIGN TAR;Lo;0;L;;;;;N;;;;;
-122FC;CUNEIFORM SIGN TE;Lo;0;L;;;;;N;;;;;
-122FD;CUNEIFORM SIGN TE GUNU;Lo;0;L;;;;;N;;;;;
-122FE;CUNEIFORM SIGN TI;Lo;0;L;;;;;N;;;;;
-122FF;CUNEIFORM SIGN TI TENU;Lo;0;L;;;;;N;;;;;
-12300;CUNEIFORM SIGN TIL;Lo;0;L;;;;;N;;;;;
-12301;CUNEIFORM SIGN TIR;Lo;0;L;;;;;N;;;;;
-12302;CUNEIFORM SIGN TIR TIMES TAK4;Lo;0;L;;;;;N;;;;;
-12303;CUNEIFORM SIGN TIR OVER TIR;Lo;0;L;;;;;N;;;;;
-12304;CUNEIFORM SIGN TIR OVER TIR GAD OVER GAD GAR OVER GAR;Lo;0;L;;;;;N;;;;;
-12305;CUNEIFORM SIGN TU;Lo;0;L;;;;;N;;;;;
-12306;CUNEIFORM SIGN TUG2;Lo;0;L;;;;;N;;;;;
-12307;CUNEIFORM SIGN TUK;Lo;0;L;;;;;N;;;;;
-12308;CUNEIFORM SIGN TUM;Lo;0;L;;;;;N;;;;;
-12309;CUNEIFORM SIGN TUR;Lo;0;L;;;;;N;;;;;
-1230A;CUNEIFORM SIGN TUR OVER TUR ZA OVER ZA;Lo;0;L;;;;;N;;;;;
-1230B;CUNEIFORM SIGN U;Lo;0;L;;;;;N;;;;;
-1230C;CUNEIFORM SIGN U GUD;Lo;0;L;;;;;N;;;;;
-1230D;CUNEIFORM SIGN U U U;Lo;0;L;;;;;N;;;;;
-1230E;CUNEIFORM SIGN U OVER U PA OVER PA GAR OVER GAR;Lo;0;L;;;;;N;;;;;
-1230F;CUNEIFORM SIGN U OVER U SUR OVER SUR;Lo;0;L;;;;;N;;;;;
-12310;CUNEIFORM SIGN U OVER U U REVERSED OVER U REVERSED;Lo;0;L;;;;;N;;;;;
-12311;CUNEIFORM SIGN U2;Lo;0;L;;;;;N;;;;;
-12312;CUNEIFORM SIGN UB;Lo;0;L;;;;;N;;;;;
-12313;CUNEIFORM SIGN UD;Lo;0;L;;;;;N;;;;;
-12314;CUNEIFORM SIGN UD KUSHU2;Lo;0;L;;;;;N;;;;;
-12315;CUNEIFORM SIGN UD TIMES BAD;Lo;0;L;;;;;N;;;;;
-12316;CUNEIFORM SIGN UD TIMES MI;Lo;0;L;;;;;N;;;;;
-12317;CUNEIFORM SIGN UD TIMES U PLUS U PLUS U;Lo;0;L;;;;;N;;;;;
-12318;CUNEIFORM SIGN UD TIMES U PLUS U PLUS U GUNU;Lo;0;L;;;;;N;;;;;
-12319;CUNEIFORM SIGN UD GUNU;Lo;0;L;;;;;N;;;;;
-1231A;CUNEIFORM SIGN UD SHESHIG;Lo;0;L;;;;;N;;;;;
-1231B;CUNEIFORM SIGN UD SHESHIG TIMES BAD;Lo;0;L;;;;;N;;;;;
-1231C;CUNEIFORM SIGN UDUG;Lo;0;L;;;;;N;;;;;
-1231D;CUNEIFORM SIGN UM;Lo;0;L;;;;;N;;;;;
-1231E;CUNEIFORM SIGN UM TIMES LAGAB;Lo;0;L;;;;;N;;;;;
-1231F;CUNEIFORM SIGN UM TIMES ME PLUS DA;Lo;0;L;;;;;N;;;;;
-12320;CUNEIFORM SIGN UM TIMES SHA3;Lo;0;L;;;;;N;;;;;
-12321;CUNEIFORM SIGN UM TIMES U;Lo;0;L;;;;;N;;;;;
-12322;CUNEIFORM SIGN UMBIN;Lo;0;L;;;;;N;;;;;
-12323;CUNEIFORM SIGN UMUM;Lo;0;L;;;;;N;;;;;
-12324;CUNEIFORM SIGN UMUM TIMES KASKAL;Lo;0;L;;;;;N;;;;;
-12325;CUNEIFORM SIGN UMUM TIMES PA;Lo;0;L;;;;;N;;;;;
-12326;CUNEIFORM SIGN UN;Lo;0;L;;;;;N;;;;;
-12327;CUNEIFORM SIGN UN GUNU;Lo;0;L;;;;;N;;;;;
-12328;CUNEIFORM SIGN UR;Lo;0;L;;;;;N;;;;;
-12329;CUNEIFORM SIGN UR CROSSING UR;Lo;0;L;;;;;N;;;;;
-1232A;CUNEIFORM SIGN UR SHESHIG;Lo;0;L;;;;;N;;;;;
-1232B;CUNEIFORM SIGN UR2;Lo;0;L;;;;;N;;;;;
-1232C;CUNEIFORM SIGN UR2 TIMES A PLUS HA;Lo;0;L;;;;;N;;;;;
-1232D;CUNEIFORM SIGN UR2 TIMES A PLUS NA;Lo;0;L;;;;;N;;;;;
-1232E;CUNEIFORM SIGN UR2 TIMES AL;Lo;0;L;;;;;N;;;;;
-1232F;CUNEIFORM SIGN UR2 TIMES HA;Lo;0;L;;;;;N;;;;;
-12330;CUNEIFORM SIGN UR2 TIMES NUN;Lo;0;L;;;;;N;;;;;
-12331;CUNEIFORM SIGN UR2 TIMES U2;Lo;0;L;;;;;N;;;;;
-12332;CUNEIFORM SIGN UR2 TIMES U2 PLUS ASH;Lo;0;L;;;;;N;;;;;
-12333;CUNEIFORM SIGN UR2 TIMES U2 PLUS BI;Lo;0;L;;;;;N;;;;;
-12334;CUNEIFORM SIGN UR4;Lo;0;L;;;;;N;;;;;
-12335;CUNEIFORM SIGN URI;Lo;0;L;;;;;N;;;;;
-12336;CUNEIFORM SIGN URI3;Lo;0;L;;;;;N;;;;;
-12337;CUNEIFORM SIGN URU;Lo;0;L;;;;;N;;;;;
-12338;CUNEIFORM SIGN URU TIMES A;Lo;0;L;;;;;N;;;;;
-12339;CUNEIFORM SIGN URU TIMES ASHGAB;Lo;0;L;;;;;N;;;;;
-1233A;CUNEIFORM SIGN URU TIMES BAR;Lo;0;L;;;;;N;;;;;
-1233B;CUNEIFORM SIGN URU TIMES DUN;Lo;0;L;;;;;N;;;;;
-1233C;CUNEIFORM SIGN URU TIMES GA;Lo;0;L;;;;;N;;;;;
-1233D;CUNEIFORM SIGN URU TIMES GAL;Lo;0;L;;;;;N;;;;;
-1233E;CUNEIFORM SIGN URU TIMES GAN2 TENU;Lo;0;L;;;;;N;;;;;
-1233F;CUNEIFORM SIGN URU TIMES GAR;Lo;0;L;;;;;N;;;;;
-12340;CUNEIFORM SIGN URU TIMES GU;Lo;0;L;;;;;N;;;;;
-12341;CUNEIFORM SIGN URU TIMES HA;Lo;0;L;;;;;N;;;;;
-12342;CUNEIFORM SIGN URU TIMES IGI;Lo;0;L;;;;;N;;;;;
-12343;CUNEIFORM SIGN URU TIMES IM;Lo;0;L;;;;;N;;;;;
-12344;CUNEIFORM SIGN URU TIMES ISH;Lo;0;L;;;;;N;;;;;
-12345;CUNEIFORM SIGN URU TIMES KI;Lo;0;L;;;;;N;;;;;
-12346;CUNEIFORM SIGN URU TIMES LUM;Lo;0;L;;;;;N;;;;;
-12347;CUNEIFORM SIGN URU TIMES MIN;Lo;0;L;;;;;N;;;;;
-12348;CUNEIFORM SIGN URU TIMES PA;Lo;0;L;;;;;N;;;;;
-12349;CUNEIFORM SIGN URU TIMES SHE;Lo;0;L;;;;;N;;;;;
-1234A;CUNEIFORM SIGN URU TIMES SIG4;Lo;0;L;;;;;N;;;;;
-1234B;CUNEIFORM SIGN URU TIMES TU;Lo;0;L;;;;;N;;;;;
-1234C;CUNEIFORM SIGN URU TIMES U PLUS GUD;Lo;0;L;;;;;N;;;;;
-1234D;CUNEIFORM SIGN URU TIMES UD;Lo;0;L;;;;;N;;;;;
-1234E;CUNEIFORM SIGN URU TIMES URUDA;Lo;0;L;;;;;N;;;;;
-1234F;CUNEIFORM SIGN URUDA;Lo;0;L;;;;;N;;;;;
-12350;CUNEIFORM SIGN URUDA TIMES U;Lo;0;L;;;;;N;;;;;
-12351;CUNEIFORM SIGN USH;Lo;0;L;;;;;N;;;;;
-12352;CUNEIFORM SIGN USH TIMES A;Lo;0;L;;;;;N;;;;;
-12353;CUNEIFORM SIGN USH TIMES KU;Lo;0;L;;;;;N;;;;;
-12354;CUNEIFORM SIGN USH TIMES KUR;Lo;0;L;;;;;N;;;;;
-12355;CUNEIFORM SIGN USH TIMES TAK4;Lo;0;L;;;;;N;;;;;
-12356;CUNEIFORM SIGN USHX;Lo;0;L;;;;;N;;;;;
-12357;CUNEIFORM SIGN USH2;Lo;0;L;;;;;N;;;;;
-12358;CUNEIFORM SIGN USHUMX;Lo;0;L;;;;;N;;;;;
-12359;CUNEIFORM SIGN UTUKI;Lo;0;L;;;;;N;;;;;
-1235A;CUNEIFORM SIGN UZ3;Lo;0;L;;;;;N;;;;;
-1235B;CUNEIFORM SIGN UZ3 TIMES KASKAL;Lo;0;L;;;;;N;;;;;
-1235C;CUNEIFORM SIGN UZU;Lo;0;L;;;;;N;;;;;
-1235D;CUNEIFORM SIGN ZA;Lo;0;L;;;;;N;;;;;
-1235E;CUNEIFORM SIGN ZA TENU;Lo;0;L;;;;;N;;;;;
-1235F;CUNEIFORM SIGN ZA SQUARED TIMES KUR;Lo;0;L;;;;;N;;;;;
-12360;CUNEIFORM SIGN ZAG;Lo;0;L;;;;;N;;;;;
-12361;CUNEIFORM SIGN ZAMX;Lo;0;L;;;;;N;;;;;
-12362;CUNEIFORM SIGN ZE2;Lo;0;L;;;;;N;;;;;
-12363;CUNEIFORM SIGN ZI;Lo;0;L;;;;;N;;;;;
-12364;CUNEIFORM SIGN ZI OVER ZI;Lo;0;L;;;;;N;;;;;
-12365;CUNEIFORM SIGN ZI3;Lo;0;L;;;;;N;;;;;
-12366;CUNEIFORM SIGN ZIB;Lo;0;L;;;;;N;;;;;
-12367;CUNEIFORM SIGN ZIB KABA TENU;Lo;0;L;;;;;N;;;;;
-12368;CUNEIFORM SIGN ZIG;Lo;0;L;;;;;N;;;;;
-12369;CUNEIFORM SIGN ZIZ2;Lo;0;L;;;;;N;;;;;
-1236A;CUNEIFORM SIGN ZU;Lo;0;L;;;;;N;;;;;
-1236B;CUNEIFORM SIGN ZU5;Lo;0;L;;;;;N;;;;;
-1236C;CUNEIFORM SIGN ZU5 TIMES A;Lo;0;L;;;;;N;;;;;
-1236D;CUNEIFORM SIGN ZUBUR;Lo;0;L;;;;;N;;;;;
-1236E;CUNEIFORM SIGN ZUM;Lo;0;L;;;;;N;;;;;
-12400;CUNEIFORM NUMERIC SIGN TWO ASH;Nl;0;L;;;;2;N;;;;;
-12401;CUNEIFORM NUMERIC SIGN THREE ASH;Nl;0;L;;;;3;N;;;;;
-12402;CUNEIFORM NUMERIC SIGN FOUR ASH;Nl;0;L;;;;4;N;;;;;
-12403;CUNEIFORM NUMERIC SIGN FIVE ASH;Nl;0;L;;;;5;N;;;;;
-12404;CUNEIFORM NUMERIC SIGN SIX ASH;Nl;0;L;;;;6;N;;;;;
-12405;CUNEIFORM NUMERIC SIGN SEVEN ASH;Nl;0;L;;;;7;N;;;;;
-12406;CUNEIFORM NUMERIC SIGN EIGHT ASH;Nl;0;L;;;;8;N;;;;;
-12407;CUNEIFORM NUMERIC SIGN NINE ASH;Nl;0;L;;;;9;N;;;;;
-12408;CUNEIFORM NUMERIC SIGN THREE DISH;Nl;0;L;;;;3;N;;;;;
-12409;CUNEIFORM NUMERIC SIGN FOUR DISH;Nl;0;L;;;;4;N;;;;;
-1240A;CUNEIFORM NUMERIC SIGN FIVE DISH;Nl;0;L;;;;5;N;;;;;
-1240B;CUNEIFORM NUMERIC SIGN SIX DISH;Nl;0;L;;;;6;N;;;;;
-1240C;CUNEIFORM NUMERIC SIGN SEVEN DISH;Nl;0;L;;;;7;N;;;;;
-1240D;CUNEIFORM NUMERIC SIGN EIGHT DISH;Nl;0;L;;;;8;N;;;;;
-1240E;CUNEIFORM NUMERIC SIGN NINE DISH;Nl;0;L;;;;9;N;;;;;
-1240F;CUNEIFORM NUMERIC SIGN FOUR U;Nl;0;L;;;;4;N;;;;;
-12410;CUNEIFORM NUMERIC SIGN FIVE U;Nl;0;L;;;;5;N;;;;;
-12411;CUNEIFORM NUMERIC SIGN SIX U;Nl;0;L;;;;6;N;;;;;
-12412;CUNEIFORM NUMERIC SIGN SEVEN U;Nl;0;L;;;;7;N;;;;;
-12413;CUNEIFORM NUMERIC SIGN EIGHT U;Nl;0;L;;;;8;N;;;;;
-12414;CUNEIFORM NUMERIC SIGN NINE U;Nl;0;L;;;;9;N;;;;;
-12415;CUNEIFORM NUMERIC SIGN ONE GESH2;Nl;0;L;;;;1;N;;;;;
-12416;CUNEIFORM NUMERIC SIGN TWO GESH2;Nl;0;L;;;;2;N;;;;;
-12417;CUNEIFORM NUMERIC SIGN THREE GESH2;Nl;0;L;;;;3;N;;;;;
-12418;CUNEIFORM NUMERIC SIGN FOUR GESH2;Nl;0;L;;;;4;N;;;;;
-12419;CUNEIFORM NUMERIC SIGN FIVE GESH2;Nl;0;L;;;;5;N;;;;;
-1241A;CUNEIFORM NUMERIC SIGN SIX GESH2;Nl;0;L;;;;6;N;;;;;
-1241B;CUNEIFORM NUMERIC SIGN SEVEN GESH2;Nl;0;L;;;;7;N;;;;;
-1241C;CUNEIFORM NUMERIC SIGN EIGHT GESH2;Nl;0;L;;;;8;N;;;;;
-1241D;CUNEIFORM NUMERIC SIGN NINE GESH2;Nl;0;L;;;;9;N;;;;;
-1241E;CUNEIFORM NUMERIC SIGN ONE GESHU;Nl;0;L;;;;1;N;;;;;
-1241F;CUNEIFORM NUMERIC SIGN TWO GESHU;Nl;0;L;;;;2;N;;;;;
-12420;CUNEIFORM NUMERIC SIGN THREE GESHU;Nl;0;L;;;;3;N;;;;;
-12421;CUNEIFORM NUMERIC SIGN FOUR GESHU;Nl;0;L;;;;4;N;;;;;
-12422;CUNEIFORM NUMERIC SIGN FIVE GESHU;Nl;0;L;;;;5;N;;;;;
-12423;CUNEIFORM NUMERIC SIGN TWO SHAR2;Nl;0;L;;;;2;N;;;;;
-12424;CUNEIFORM NUMERIC SIGN THREE SHAR2;Nl;0;L;;;;3;N;;;;;
-12425;CUNEIFORM NUMERIC SIGN THREE SHAR2 VARIANT FORM;Nl;0;L;;;;3;N;;;;;
-12426;CUNEIFORM NUMERIC SIGN FOUR SHAR2;Nl;0;L;;;;4;N;;;;;
-12427;CUNEIFORM NUMERIC SIGN FIVE SHAR2;Nl;0;L;;;;5;N;;;;;
-12428;CUNEIFORM NUMERIC SIGN SIX SHAR2;Nl;0;L;;;;6;N;;;;;
-12429;CUNEIFORM NUMERIC SIGN SEVEN SHAR2;Nl;0;L;;;;7;N;;;;;
-1242A;CUNEIFORM NUMERIC SIGN EIGHT SHAR2;Nl;0;L;;;;8;N;;;;;
-1242B;CUNEIFORM NUMERIC SIGN NINE SHAR2;Nl;0;L;;;;9;N;;;;;
-1242C;CUNEIFORM NUMERIC SIGN ONE SHARU;Nl;0;L;;;;1;N;;;;;
-1242D;CUNEIFORM NUMERIC SIGN TWO SHARU;Nl;0;L;;;;2;N;;;;;
-1242E;CUNEIFORM NUMERIC SIGN THREE SHARU;Nl;0;L;;;;3;N;;;;;
-1242F;CUNEIFORM NUMERIC SIGN THREE SHARU VARIANT FORM;Nl;0;L;;;;3;N;;;;;
-12430;CUNEIFORM NUMERIC SIGN FOUR SHARU;Nl;0;L;;;;4;N;;;;;
-12431;CUNEIFORM NUMERIC SIGN FIVE SHARU;Nl;0;L;;;;5;N;;;;;
-12432;CUNEIFORM NUMERIC SIGN SHAR2 TIMES GAL PLUS DISH;Nl;0;L;;;;;N;;;;;
-12433;CUNEIFORM NUMERIC SIGN SHAR2 TIMES GAL PLUS MIN;Nl;0;L;;;;;N;;;;;
-12434;CUNEIFORM NUMERIC SIGN ONE BURU;Nl;0;L;;;;1;N;;;;;
-12435;CUNEIFORM NUMERIC SIGN TWO BURU;Nl;0;L;;;;2;N;;;;;
-12436;CUNEIFORM NUMERIC SIGN THREE BURU;Nl;0;L;;;;3;N;;;;;
-12437;CUNEIFORM NUMERIC SIGN THREE BURU VARIANT FORM;Nl;0;L;;;;3;N;;;;;
-12438;CUNEIFORM NUMERIC SIGN FOUR BURU;Nl;0;L;;;;4;N;;;;;
-12439;CUNEIFORM NUMERIC SIGN FIVE BURU;Nl;0;L;;;;5;N;;;;;
-1243A;CUNEIFORM NUMERIC SIGN THREE VARIANT FORM ESH16;Nl;0;L;;;;3;N;;;;;
-1243B;CUNEIFORM NUMERIC SIGN THREE VARIANT FORM ESH21;Nl;0;L;;;;3;N;;;;;
-1243C;CUNEIFORM NUMERIC SIGN FOUR VARIANT FORM LIMMU;Nl;0;L;;;;4;N;;;;;
-1243D;CUNEIFORM NUMERIC SIGN FOUR VARIANT FORM LIMMU4;Nl;0;L;;;;4;N;;;;;
-1243E;CUNEIFORM NUMERIC SIGN FOUR VARIANT FORM LIMMU A;Nl;0;L;;;;4;N;;;;;
-1243F;CUNEIFORM NUMERIC SIGN FOUR VARIANT FORM LIMMU B;Nl;0;L;;;;4;N;;;;;
-12440;CUNEIFORM NUMERIC SIGN SIX VARIANT FORM ASH9;Nl;0;L;;;;6;N;;;;;
-12441;CUNEIFORM NUMERIC SIGN SEVEN VARIANT FORM IMIN3;Nl;0;L;;;;7;N;;;;;
-12442;CUNEIFORM NUMERIC SIGN SEVEN VARIANT FORM IMIN A;Nl;0;L;;;;7;N;;;;;
-12443;CUNEIFORM NUMERIC SIGN SEVEN VARIANT FORM IMIN B;Nl;0;L;;;;7;N;;;;;
-12444;CUNEIFORM NUMERIC SIGN EIGHT VARIANT FORM USSU;Nl;0;L;;;;8;N;;;;;
-12445;CUNEIFORM NUMERIC SIGN EIGHT VARIANT FORM USSU3;Nl;0;L;;;;8;N;;;;;
-12446;CUNEIFORM NUMERIC SIGN NINE VARIANT FORM ILIMMU;Nl;0;L;;;;9;N;;;;;
-12447;CUNEIFORM NUMERIC SIGN NINE VARIANT FORM ILIMMU3;Nl;0;L;;;;9;N;;;;;
-12448;CUNEIFORM NUMERIC SIGN NINE VARIANT FORM ILIMMU4;Nl;0;L;;;;9;N;;;;;
-12449;CUNEIFORM NUMERIC SIGN NINE VARIANT FORM ILIMMU A;Nl;0;L;;;;9;N;;;;;
-1244A;CUNEIFORM NUMERIC SIGN TWO ASH TENU;Nl;0;L;;;;2;N;;;;;
-1244B;CUNEIFORM NUMERIC SIGN THREE ASH TENU;Nl;0;L;;;;3;N;;;;;
-1244C;CUNEIFORM NUMERIC SIGN FOUR ASH TENU;Nl;0;L;;;;4;N;;;;;
-1244D;CUNEIFORM NUMERIC SIGN FIVE ASH TENU;Nl;0;L;;;;5;N;;;;;
-1244E;CUNEIFORM NUMERIC SIGN SIX ASH TENU;Nl;0;L;;;;6;N;;;;;
-1244F;CUNEIFORM NUMERIC SIGN ONE BAN2;Nl;0;L;;;;1;N;;;;;
-12450;CUNEIFORM NUMERIC SIGN TWO BAN2;Nl;0;L;;;;2;N;;;;;
-12451;CUNEIFORM NUMERIC SIGN THREE BAN2;Nl;0;L;;;;3;N;;;;;
-12452;CUNEIFORM NUMERIC SIGN FOUR BAN2;Nl;0;L;;;;4;N;;;;;
-12453;CUNEIFORM NUMERIC SIGN FOUR BAN2 VARIANT FORM;Nl;0;L;;;;4;N;;;;;
-12454;CUNEIFORM NUMERIC SIGN FIVE BAN2;Nl;0;L;;;;5;N;;;;;
-12455;CUNEIFORM NUMERIC SIGN FIVE BAN2 VARIANT FORM;Nl;0;L;;;;5;N;;;;;
-12456;CUNEIFORM NUMERIC SIGN NIGIDAMIN;Nl;0;L;;;;;N;;;;;
-12457;CUNEIFORM NUMERIC SIGN NIGIDAESH;Nl;0;L;;;;;N;;;;;
-12458;CUNEIFORM NUMERIC SIGN ONE ESHE3;Nl;0;L;;;;1;N;;;;;
-12459;CUNEIFORM NUMERIC SIGN TWO ESHE3;Nl;0;L;;;;2;N;;;;;
-1245A;CUNEIFORM NUMERIC SIGN ONE THIRD DISH;Nl;0;L;;;;1/3;N;;;;;
-1245B;CUNEIFORM NUMERIC SIGN TWO THIRDS DISH;Nl;0;L;;;;2/3;N;;;;;
-1245C;CUNEIFORM NUMERIC SIGN FIVE SIXTHS DISH;Nl;0;L;;;;5/6;N;;;;;
-1245D;CUNEIFORM NUMERIC SIGN ONE THIRD VARIANT FORM A;Nl;0;L;;;;1/3;N;;;;;
-1245E;CUNEIFORM NUMERIC SIGN TWO THIRDS VARIANT FORM A;Nl;0;L;;;;2/3;N;;;;;
-1245F;CUNEIFORM NUMERIC SIGN ONE EIGHTH ASH;Nl;0;L;;;;1/8;N;;;;;
-12460;CUNEIFORM NUMERIC SIGN ONE QUARTER ASH;Nl;0;L;;;;1/4;N;;;;;
-12461;CUNEIFORM NUMERIC SIGN OLD ASSYRIAN ONE SIXTH;Nl;0;L;;;;1/6;N;;;;;
-12462;CUNEIFORM NUMERIC SIGN OLD ASSYRIAN ONE QUARTER;Nl;0;L;;;;1/4;N;;;;;
-12470;CUNEIFORM PUNCTUATION SIGN OLD ASSYRIAN WORD DIVIDER;Po;0;L;;;;;N;;;;;
-12471;CUNEIFORM PUNCTUATION SIGN VERTICAL COLON;Po;0;L;;;;;N;;;;;
-12472;CUNEIFORM PUNCTUATION SIGN DIAGONAL COLON;Po;0;L;;;;;N;;;;;
-12473;CUNEIFORM PUNCTUATION SIGN DIAGONAL TRICOLON;Po;0;L;;;;;N;;;;;
-1D000;BYZANTINE MUSICAL SYMBOL PSILI;So;0;L;;;;;N;;;;;
-1D001;BYZANTINE MUSICAL SYMBOL DASEIA;So;0;L;;;;;N;;;;;
-1D002;BYZANTINE MUSICAL SYMBOL PERISPOMENI;So;0;L;;;;;N;;;;;
-1D003;BYZANTINE MUSICAL SYMBOL OXEIA EKFONITIKON;So;0;L;;;;;N;;;;;
-1D004;BYZANTINE MUSICAL SYMBOL OXEIA DIPLI;So;0;L;;;;;N;;;;;
-1D005;BYZANTINE MUSICAL SYMBOL VAREIA EKFONITIKON;So;0;L;;;;;N;;;;;
-1D006;BYZANTINE MUSICAL SYMBOL VAREIA DIPLI;So;0;L;;;;;N;;;;;
-1D007;BYZANTINE MUSICAL SYMBOL KATHISTI;So;0;L;;;;;N;;;;;
-1D008;BYZANTINE MUSICAL SYMBOL SYRMATIKI;So;0;L;;;;;N;;;;;
-1D009;BYZANTINE MUSICAL SYMBOL PARAKLITIKI;So;0;L;;;;;N;;;;;
-1D00A;BYZANTINE MUSICAL SYMBOL YPOKRISIS;So;0;L;;;;;N;;;;;
-1D00B;BYZANTINE MUSICAL SYMBOL YPOKRISIS DIPLI;So;0;L;;;;;N;;;;;
-1D00C;BYZANTINE MUSICAL SYMBOL KREMASTI;So;0;L;;;;;N;;;;;
-1D00D;BYZANTINE MUSICAL SYMBOL APESO EKFONITIKON;So;0;L;;;;;N;;;;;
-1D00E;BYZANTINE MUSICAL SYMBOL EXO EKFONITIKON;So;0;L;;;;;N;;;;;
-1D00F;BYZANTINE MUSICAL SYMBOL TELEIA;So;0;L;;;;;N;;;;;
-1D010;BYZANTINE MUSICAL SYMBOL KENTIMATA;So;0;L;;;;;N;;;;;
-1D011;BYZANTINE MUSICAL SYMBOL APOSTROFOS;So;0;L;;;;;N;;;;;
-1D012;BYZANTINE MUSICAL SYMBOL APOSTROFOS DIPLI;So;0;L;;;;;N;;;;;
-1D013;BYZANTINE MUSICAL SYMBOL SYNEVMA;So;0;L;;;;;N;;;;;
-1D014;BYZANTINE MUSICAL SYMBOL THITA;So;0;L;;;;;N;;;;;
-1D015;BYZANTINE MUSICAL SYMBOL OLIGON ARCHAION;So;0;L;;;;;N;;;;;
-1D016;BYZANTINE MUSICAL SYMBOL GORGON ARCHAION;So;0;L;;;;;N;;;;;
-1D017;BYZANTINE MUSICAL SYMBOL PSILON;So;0;L;;;;;N;;;;;
-1D018;BYZANTINE MUSICAL SYMBOL CHAMILON;So;0;L;;;;;N;;;;;
-1D019;BYZANTINE MUSICAL SYMBOL VATHY;So;0;L;;;;;N;;;;;
-1D01A;BYZANTINE MUSICAL SYMBOL ISON ARCHAION;So;0;L;;;;;N;;;;;
-1D01B;BYZANTINE MUSICAL SYMBOL KENTIMA ARCHAION;So;0;L;;;;;N;;;;;
-1D01C;BYZANTINE MUSICAL SYMBOL KENTIMATA ARCHAION;So;0;L;;;;;N;;;;;
-1D01D;BYZANTINE MUSICAL SYMBOL SAXIMATA;So;0;L;;;;;N;;;;;
-1D01E;BYZANTINE MUSICAL SYMBOL PARICHON;So;0;L;;;;;N;;;;;
-1D01F;BYZANTINE MUSICAL SYMBOL STAVROS APODEXIA;So;0;L;;;;;N;;;;;
-1D020;BYZANTINE MUSICAL SYMBOL OXEIAI ARCHAION;So;0;L;;;;;N;;;;;
-1D021;BYZANTINE MUSICAL SYMBOL VAREIAI ARCHAION;So;0;L;;;;;N;;;;;
-1D022;BYZANTINE MUSICAL SYMBOL APODERMA ARCHAION;So;0;L;;;;;N;;;;;
-1D023;BYZANTINE MUSICAL SYMBOL APOTHEMA;So;0;L;;;;;N;;;;;
-1D024;BYZANTINE MUSICAL SYMBOL KLASMA;So;0;L;;;;;N;;;;;
-1D025;BYZANTINE MUSICAL SYMBOL REVMA;So;0;L;;;;;N;;;;;
-1D026;BYZANTINE MUSICAL SYMBOL PIASMA ARCHAION;So;0;L;;;;;N;;;;;
-1D027;BYZANTINE MUSICAL SYMBOL TINAGMA;So;0;L;;;;;N;;;;;
-1D028;BYZANTINE MUSICAL SYMBOL ANATRICHISMA;So;0;L;;;;;N;;;;;
-1D029;BYZANTINE MUSICAL SYMBOL SEISMA;So;0;L;;;;;N;;;;;
-1D02A;BYZANTINE MUSICAL SYMBOL SYNAGMA ARCHAION;So;0;L;;;;;N;;;;;
-1D02B;BYZANTINE MUSICAL SYMBOL SYNAGMA META STAVROU;So;0;L;;;;;N;;;;;
-1D02C;BYZANTINE MUSICAL SYMBOL OYRANISMA ARCHAION;So;0;L;;;;;N;;;;;
-1D02D;BYZANTINE MUSICAL SYMBOL THEMA;So;0;L;;;;;N;;;;;
-1D02E;BYZANTINE MUSICAL SYMBOL LEMOI;So;0;L;;;;;N;;;;;
-1D02F;BYZANTINE MUSICAL SYMBOL DYO;So;0;L;;;;;N;;;;;
-1D030;BYZANTINE MUSICAL SYMBOL TRIA;So;0;L;;;;;N;;;;;
-1D031;BYZANTINE MUSICAL SYMBOL TESSERA;So;0;L;;;;;N;;;;;
-1D032;BYZANTINE MUSICAL SYMBOL KRATIMATA;So;0;L;;;;;N;;;;;
-1D033;BYZANTINE MUSICAL SYMBOL APESO EXO NEO;So;0;L;;;;;N;;;;;
-1D034;BYZANTINE MUSICAL SYMBOL FTHORA ARCHAION;So;0;L;;;;;N;;;;;
-1D035;BYZANTINE MUSICAL SYMBOL IMIFTHORA;So;0;L;;;;;N;;;;;
-1D036;BYZANTINE MUSICAL SYMBOL TROMIKON ARCHAION;So;0;L;;;;;N;;;;;
-1D037;BYZANTINE MUSICAL SYMBOL KATAVA TROMIKON;So;0;L;;;;;N;;;;;
-1D038;BYZANTINE MUSICAL SYMBOL PELASTON;So;0;L;;;;;N;;;;;
-1D039;BYZANTINE MUSICAL SYMBOL PSIFISTON;So;0;L;;;;;N;;;;;
-1D03A;BYZANTINE MUSICAL SYMBOL KONTEVMA;So;0;L;;;;;N;;;;;
-1D03B;BYZANTINE MUSICAL SYMBOL CHOREVMA ARCHAION;So;0;L;;;;;N;;;;;
-1D03C;BYZANTINE MUSICAL SYMBOL RAPISMA;So;0;L;;;;;N;;;;;
-1D03D;BYZANTINE MUSICAL SYMBOL PARAKALESMA ARCHAION;So;0;L;;;;;N;;;;;
-1D03E;BYZANTINE MUSICAL SYMBOL PARAKLITIKI ARCHAION;So;0;L;;;;;N;;;;;
-1D03F;BYZANTINE MUSICAL SYMBOL ICHADIN;So;0;L;;;;;N;;;;;
-1D040;BYZANTINE MUSICAL SYMBOL NANA;So;0;L;;;;;N;;;;;
-1D041;BYZANTINE MUSICAL SYMBOL PETASMA;So;0;L;;;;;N;;;;;
-1D042;BYZANTINE MUSICAL SYMBOL KONTEVMA ALLO;So;0;L;;;;;N;;;;;
-1D043;BYZANTINE MUSICAL SYMBOL TROMIKON ALLO;So;0;L;;;;;N;;;;;
-1D044;BYZANTINE MUSICAL SYMBOL STRAGGISMATA;So;0;L;;;;;N;;;;;
-1D045;BYZANTINE MUSICAL SYMBOL GRONTHISMATA;So;0;L;;;;;N;;;;;
-1D046;BYZANTINE MUSICAL SYMBOL ISON NEO;So;0;L;;;;;N;;;;;
-1D047;BYZANTINE MUSICAL SYMBOL OLIGON NEO;So;0;L;;;;;N;;;;;
-1D048;BYZANTINE MUSICAL SYMBOL OXEIA NEO;So;0;L;;;;;N;;;;;
-1D049;BYZANTINE MUSICAL SYMBOL PETASTI;So;0;L;;;;;N;;;;;
-1D04A;BYZANTINE MUSICAL SYMBOL KOUFISMA;So;0;L;;;;;N;;;;;
-1D04B;BYZANTINE MUSICAL SYMBOL PETASTOKOUFISMA;So;0;L;;;;;N;;;;;
-1D04C;BYZANTINE MUSICAL SYMBOL KRATIMOKOUFISMA;So;0;L;;;;;N;;;;;
-1D04D;BYZANTINE MUSICAL SYMBOL PELASTON NEO;So;0;L;;;;;N;;;;;
-1D04E;BYZANTINE MUSICAL SYMBOL KENTIMATA NEO ANO;So;0;L;;;;;N;;;;;
-1D04F;BYZANTINE MUSICAL SYMBOL KENTIMA NEO ANO;So;0;L;;;;;N;;;;;
-1D050;BYZANTINE MUSICAL SYMBOL YPSILI;So;0;L;;;;;N;;;;;
-1D051;BYZANTINE MUSICAL SYMBOL APOSTROFOS NEO;So;0;L;;;;;N;;;;;
-1D052;BYZANTINE MUSICAL SYMBOL APOSTROFOI SYNDESMOS NEO;So;0;L;;;;;N;;;;;
-1D053;BYZANTINE MUSICAL SYMBOL YPORROI;So;0;L;;;;;N;;;;;
-1D054;BYZANTINE MUSICAL SYMBOL KRATIMOYPORROON;So;0;L;;;;;N;;;;;
-1D055;BYZANTINE MUSICAL SYMBOL ELAFRON;So;0;L;;;;;N;;;;;
-1D056;BYZANTINE MUSICAL SYMBOL CHAMILI;So;0;L;;;;;N;;;;;
-1D057;BYZANTINE MUSICAL SYMBOL MIKRON ISON;So;0;L;;;;;N;;;;;
-1D058;BYZANTINE MUSICAL SYMBOL VAREIA NEO;So;0;L;;;;;N;;;;;
-1D059;BYZANTINE MUSICAL SYMBOL PIASMA NEO;So;0;L;;;;;N;;;;;
-1D05A;BYZANTINE MUSICAL SYMBOL PSIFISTON NEO;So;0;L;;;;;N;;;;;
-1D05B;BYZANTINE MUSICAL SYMBOL OMALON;So;0;L;;;;;N;;;;;
-1D05C;BYZANTINE MUSICAL SYMBOL ANTIKENOMA;So;0;L;;;;;N;;;;;
-1D05D;BYZANTINE MUSICAL SYMBOL LYGISMA;So;0;L;;;;;N;;;;;
-1D05E;BYZANTINE MUSICAL SYMBOL PARAKLITIKI NEO;So;0;L;;;;;N;;;;;
-1D05F;BYZANTINE MUSICAL SYMBOL PARAKALESMA NEO;So;0;L;;;;;N;;;;;
-1D060;BYZANTINE MUSICAL SYMBOL ETERON PARAKALESMA;So;0;L;;;;;N;;;;;
-1D061;BYZANTINE MUSICAL SYMBOL KYLISMA;So;0;L;;;;;N;;;;;
-1D062;BYZANTINE MUSICAL SYMBOL ANTIKENOKYLISMA;So;0;L;;;;;N;;;;;
-1D063;BYZANTINE MUSICAL SYMBOL TROMIKON NEO;So;0;L;;;;;N;;;;;
-1D064;BYZANTINE MUSICAL SYMBOL EKSTREPTON;So;0;L;;;;;N;;;;;
-1D065;BYZANTINE MUSICAL SYMBOL SYNAGMA NEO;So;0;L;;;;;N;;;;;
-1D066;BYZANTINE MUSICAL SYMBOL SYRMA;So;0;L;;;;;N;;;;;
-1D067;BYZANTINE MUSICAL SYMBOL CHOREVMA NEO;So;0;L;;;;;N;;;;;
-1D068;BYZANTINE MUSICAL SYMBOL EPEGERMA;So;0;L;;;;;N;;;;;
-1D069;BYZANTINE MUSICAL SYMBOL SEISMA NEO;So;0;L;;;;;N;;;;;
-1D06A;BYZANTINE MUSICAL SYMBOL XIRON KLASMA;So;0;L;;;;;N;;;;;
-1D06B;BYZANTINE MUSICAL SYMBOL TROMIKOPSIFISTON;So;0;L;;;;;N;;;;;
-1D06C;BYZANTINE MUSICAL SYMBOL PSIFISTOLYGISMA;So;0;L;;;;;N;;;;;
-1D06D;BYZANTINE MUSICAL SYMBOL TROMIKOLYGISMA;So;0;L;;;;;N;;;;;
-1D06E;BYZANTINE MUSICAL SYMBOL TROMIKOPARAKALESMA;So;0;L;;;;;N;;;;;
-1D06F;BYZANTINE MUSICAL SYMBOL PSIFISTOPARAKALESMA;So;0;L;;;;;N;;;;;
-1D070;BYZANTINE MUSICAL SYMBOL TROMIKOSYNAGMA;So;0;L;;;;;N;;;;;
-1D071;BYZANTINE MUSICAL SYMBOL PSIFISTOSYNAGMA;So;0;L;;;;;N;;;;;
-1D072;BYZANTINE MUSICAL SYMBOL GORGOSYNTHETON;So;0;L;;;;;N;;;;;
-1D073;BYZANTINE MUSICAL SYMBOL ARGOSYNTHETON;So;0;L;;;;;N;;;;;
-1D074;BYZANTINE MUSICAL SYMBOL ETERON ARGOSYNTHETON;So;0;L;;;;;N;;;;;
-1D075;BYZANTINE MUSICAL SYMBOL OYRANISMA NEO;So;0;L;;;;;N;;;;;
-1D076;BYZANTINE MUSICAL SYMBOL THEMATISMOS ESO;So;0;L;;;;;N;;;;;
-1D077;BYZANTINE MUSICAL SYMBOL THEMATISMOS EXO;So;0;L;;;;;N;;;;;
-1D078;BYZANTINE MUSICAL SYMBOL THEMA APLOUN;So;0;L;;;;;N;;;;;
-1D079;BYZANTINE MUSICAL SYMBOL THES KAI APOTHES;So;0;L;;;;;N;;;;;
-1D07A;BYZANTINE MUSICAL SYMBOL KATAVASMA;So;0;L;;;;;N;;;;;
-1D07B;BYZANTINE MUSICAL SYMBOL ENDOFONON;So;0;L;;;;;N;;;;;
-1D07C;BYZANTINE MUSICAL SYMBOL YFEN KATO;So;0;L;;;;;N;;;;;
-1D07D;BYZANTINE MUSICAL SYMBOL YFEN ANO;So;0;L;;;;;N;;;;;
-1D07E;BYZANTINE MUSICAL SYMBOL STAVROS;So;0;L;;;;;N;;;;;
-1D07F;BYZANTINE MUSICAL SYMBOL KLASMA ANO;So;0;L;;;;;N;;;;;
-1D080;BYZANTINE MUSICAL SYMBOL DIPLI ARCHAION;So;0;L;;;;;N;;;;;
-1D081;BYZANTINE MUSICAL SYMBOL KRATIMA ARCHAION;So;0;L;;;;;N;;;;;
-1D082;BYZANTINE MUSICAL SYMBOL KRATIMA ALLO;So;0;L;;;;;N;;;;;
-1D083;BYZANTINE MUSICAL SYMBOL KRATIMA NEO;So;0;L;;;;;N;;;;;
-1D084;BYZANTINE MUSICAL SYMBOL APODERMA NEO;So;0;L;;;;;N;;;;;
-1D085;BYZANTINE MUSICAL SYMBOL APLI;So;0;L;;;;;N;;;;;
-1D086;BYZANTINE MUSICAL SYMBOL DIPLI;So;0;L;;;;;N;;;;;
-1D087;BYZANTINE MUSICAL SYMBOL TRIPLI;So;0;L;;;;;N;;;;;
-1D088;BYZANTINE MUSICAL SYMBOL TETRAPLI;So;0;L;;;;;N;;;;;
-1D089;BYZANTINE MUSICAL SYMBOL KORONIS;So;0;L;;;;;N;;;;;
-1D08A;BYZANTINE MUSICAL SYMBOL LEIMMA ENOS CHRONOU;So;0;L;;;;;N;;;;;
-1D08B;BYZANTINE MUSICAL SYMBOL LEIMMA DYO CHRONON;So;0;L;;;;;N;;;;;
-1D08C;BYZANTINE MUSICAL SYMBOL LEIMMA TRION CHRONON;So;0;L;;;;;N;;;;;
-1D08D;BYZANTINE MUSICAL SYMBOL LEIMMA TESSARON CHRONON;So;0;L;;;;;N;;;;;
-1D08E;BYZANTINE MUSICAL SYMBOL LEIMMA IMISEOS CHRONOU;So;0;L;;;;;N;;;;;
-1D08F;BYZANTINE MUSICAL SYMBOL GORGON NEO ANO;So;0;L;;;;;N;;;;;
-1D090;BYZANTINE MUSICAL SYMBOL GORGON PARESTIGMENON ARISTERA;So;0;L;;;;;N;;;;;
-1D091;BYZANTINE MUSICAL SYMBOL GORGON PARESTIGMENON DEXIA;So;0;L;;;;;N;;;;;
-1D092;BYZANTINE MUSICAL SYMBOL DIGORGON;So;0;L;;;;;N;;;;;
-1D093;BYZANTINE MUSICAL SYMBOL DIGORGON PARESTIGMENON ARISTERA KATO;So;0;L;;;;;N;;;;;
-1D094;BYZANTINE MUSICAL SYMBOL DIGORGON PARESTIGMENON ARISTERA ANO;So;0;L;;;;;N;;;;;
-1D095;BYZANTINE MUSICAL SYMBOL DIGORGON PARESTIGMENON DEXIA;So;0;L;;;;;N;;;;;
-1D096;BYZANTINE MUSICAL SYMBOL TRIGORGON;So;0;L;;;;;N;;;;;
-1D097;BYZANTINE MUSICAL SYMBOL ARGON;So;0;L;;;;;N;;;;;
-1D098;BYZANTINE MUSICAL SYMBOL IMIDIARGON;So;0;L;;;;;N;;;;;
-1D099;BYZANTINE MUSICAL SYMBOL DIARGON;So;0;L;;;;;N;;;;;
-1D09A;BYZANTINE MUSICAL SYMBOL AGOGI POLI ARGI;So;0;L;;;;;N;;;;;
-1D09B;BYZANTINE MUSICAL SYMBOL AGOGI ARGOTERI;So;0;L;;;;;N;;;;;
-1D09C;BYZANTINE MUSICAL SYMBOL AGOGI ARGI;So;0;L;;;;;N;;;;;
-1D09D;BYZANTINE MUSICAL SYMBOL AGOGI METRIA;So;0;L;;;;;N;;;;;
-1D09E;BYZANTINE MUSICAL SYMBOL AGOGI MESI;So;0;L;;;;;N;;;;;
-1D09F;BYZANTINE MUSICAL SYMBOL AGOGI GORGI;So;0;L;;;;;N;;;;;
-1D0A0;BYZANTINE MUSICAL SYMBOL AGOGI GORGOTERI;So;0;L;;;;;N;;;;;
-1D0A1;BYZANTINE MUSICAL SYMBOL AGOGI POLI GORGI;So;0;L;;;;;N;;;;;
-1D0A2;BYZANTINE MUSICAL SYMBOL MARTYRIA PROTOS ICHOS;So;0;L;;;;;N;;;;;
-1D0A3;BYZANTINE MUSICAL SYMBOL MARTYRIA ALLI PROTOS ICHOS;So;0;L;;;;;N;;;;;
-1D0A4;BYZANTINE MUSICAL SYMBOL MARTYRIA DEYTEROS ICHOS;So;0;L;;;;;N;;;;;
-1D0A5;BYZANTINE MUSICAL SYMBOL MARTYRIA ALLI DEYTEROS ICHOS;So;0;L;;;;;N;;;;;
-1D0A6;BYZANTINE MUSICAL SYMBOL MARTYRIA TRITOS ICHOS;So;0;L;;;;;N;;;;;
-1D0A7;BYZANTINE MUSICAL SYMBOL MARTYRIA TRIFONIAS;So;0;L;;;;;N;;;;;
-1D0A8;BYZANTINE MUSICAL SYMBOL MARTYRIA TETARTOS ICHOS;So;0;L;;;;;N;;;;;
-1D0A9;BYZANTINE MUSICAL SYMBOL MARTYRIA TETARTOS LEGETOS ICHOS;So;0;L;;;;;N;;;;;
-1D0AA;BYZANTINE MUSICAL SYMBOL MARTYRIA LEGETOS ICHOS;So;0;L;;;;;N;;;;;
-1D0AB;BYZANTINE MUSICAL SYMBOL MARTYRIA PLAGIOS ICHOS;So;0;L;;;;;N;;;;;
-1D0AC;BYZANTINE MUSICAL SYMBOL ISAKIA TELOUS ICHIMATOS;So;0;L;;;;;N;;;;;
-1D0AD;BYZANTINE MUSICAL SYMBOL APOSTROFOI TELOUS ICHIMATOS;So;0;L;;;;;N;;;;;
-1D0AE;BYZANTINE MUSICAL SYMBOL FANEROSIS TETRAFONIAS;So;0;L;;;;;N;;;;;
-1D0AF;BYZANTINE MUSICAL SYMBOL FANEROSIS MONOFONIAS;So;0;L;;;;;N;;;;;
-1D0B0;BYZANTINE MUSICAL SYMBOL FANEROSIS DIFONIAS;So;0;L;;;;;N;;;;;
-1D0B1;BYZANTINE MUSICAL SYMBOL MARTYRIA VARYS ICHOS;So;0;L;;;;;N;;;;;
-1D0B2;BYZANTINE MUSICAL SYMBOL MARTYRIA PROTOVARYS ICHOS;So;0;L;;;;;N;;;;;
-1D0B3;BYZANTINE MUSICAL SYMBOL MARTYRIA PLAGIOS TETARTOS ICHOS;So;0;L;;;;;N;;;;;
-1D0B4;BYZANTINE MUSICAL SYMBOL GORTHMIKON N APLOUN;So;0;L;;;;;N;;;;;
-1D0B5;BYZANTINE MUSICAL SYMBOL GORTHMIKON N DIPLOUN;So;0;L;;;;;N;;;;;
-1D0B6;BYZANTINE MUSICAL SYMBOL ENARXIS KAI FTHORA VOU;So;0;L;;;;;N;;;;;
-1D0B7;BYZANTINE MUSICAL SYMBOL IMIFONON;So;0;L;;;;;N;;;;;
-1D0B8;BYZANTINE MUSICAL SYMBOL IMIFTHORON;So;0;L;;;;;N;;;;;
-1D0B9;BYZANTINE MUSICAL SYMBOL FTHORA ARCHAION DEYTEROU ICHOU;So;0;L;;;;;N;;;;;
-1D0BA;BYZANTINE MUSICAL SYMBOL FTHORA DIATONIKI PA;So;0;L;;;;;N;;;;;
-1D0BB;BYZANTINE MUSICAL SYMBOL FTHORA DIATONIKI NANA;So;0;L;;;;;N;;;;;
-1D0BC;BYZANTINE MUSICAL SYMBOL FTHORA NAOS ICHOS;So;0;L;;;;;N;;;;;
-1D0BD;BYZANTINE MUSICAL SYMBOL FTHORA DIATONIKI DI;So;0;L;;;;;N;;;;;
-1D0BE;BYZANTINE MUSICAL SYMBOL FTHORA SKLIRON DIATONON DI;So;0;L;;;;;N;;;;;
-1D0BF;BYZANTINE MUSICAL SYMBOL FTHORA DIATONIKI KE;So;0;L;;;;;N;;;;;
-1D0C0;BYZANTINE MUSICAL SYMBOL FTHORA DIATONIKI ZO;So;0;L;;;;;N;;;;;
-1D0C1;BYZANTINE MUSICAL SYMBOL FTHORA DIATONIKI NI KATO;So;0;L;;;;;N;;;;;
-1D0C2;BYZANTINE MUSICAL SYMBOL FTHORA DIATONIKI NI ANO;So;0;L;;;;;N;;;;;
-1D0C3;BYZANTINE MUSICAL SYMBOL FTHORA MALAKON CHROMA DIFONIAS;So;0;L;;;;;N;;;;;
-1D0C4;BYZANTINE MUSICAL SYMBOL FTHORA MALAKON CHROMA MONOFONIAS;So;0;L;;;;;N;;;;;
-1D0C5;BYZANTINE MUSICAL SYMBOL FHTORA SKLIRON CHROMA VASIS;So;0;L;;;;;N;;;;;
-1D0C6;BYZANTINE MUSICAL SYMBOL FTHORA SKLIRON CHROMA SYNAFI;So;0;L;;;;;N;;;;;
-1D0C7;BYZANTINE MUSICAL SYMBOL FTHORA NENANO;So;0;L;;;;;N;;;;;
-1D0C8;BYZANTINE MUSICAL SYMBOL CHROA ZYGOS;So;0;L;;;;;N;;;;;
-1D0C9;BYZANTINE MUSICAL SYMBOL CHROA KLITON;So;0;L;;;;;N;;;;;
-1D0CA;BYZANTINE MUSICAL SYMBOL CHROA SPATHI;So;0;L;;;;;N;;;;;
-1D0CB;BYZANTINE MUSICAL SYMBOL FTHORA I YFESIS TETARTIMORION;So;0;L;;;;;N;;;;;
-1D0CC;BYZANTINE MUSICAL SYMBOL FTHORA ENARMONIOS ANTIFONIA;So;0;L;;;;;N;;;;;
-1D0CD;BYZANTINE MUSICAL SYMBOL YFESIS TRITIMORION;So;0;L;;;;;N;;;;;
-1D0CE;BYZANTINE MUSICAL SYMBOL DIESIS TRITIMORION;So;0;L;;;;;N;;;;;
-1D0CF;BYZANTINE MUSICAL SYMBOL DIESIS TETARTIMORION;So;0;L;;;;;N;;;;;
-1D0D0;BYZANTINE MUSICAL SYMBOL DIESIS APLI DYO DODEKATA;So;0;L;;;;;N;;;;;
-1D0D1;BYZANTINE MUSICAL SYMBOL DIESIS MONOGRAMMOS TESSERA DODEKATA;So;0;L;;;;;N;;;;;
-1D0D2;BYZANTINE MUSICAL SYMBOL DIESIS DIGRAMMOS EX DODEKATA;So;0;L;;;;;N;;;;;
-1D0D3;BYZANTINE MUSICAL SYMBOL DIESIS TRIGRAMMOS OKTO DODEKATA;So;0;L;;;;;N;;;;;
-1D0D4;BYZANTINE MUSICAL SYMBOL YFESIS APLI DYO DODEKATA;So;0;L;;;;;N;;;;;
-1D0D5;BYZANTINE MUSICAL SYMBOL YFESIS MONOGRAMMOS TESSERA DODEKATA;So;0;L;;;;;N;;;;;
-1D0D6;BYZANTINE MUSICAL SYMBOL YFESIS DIGRAMMOS EX DODEKATA;So;0;L;;;;;N;;;;;
-1D0D7;BYZANTINE MUSICAL SYMBOL YFESIS TRIGRAMMOS OKTO DODEKATA;So;0;L;;;;;N;;;;;
-1D0D8;BYZANTINE MUSICAL SYMBOL GENIKI DIESIS;So;0;L;;;;;N;;;;;
-1D0D9;BYZANTINE MUSICAL SYMBOL GENIKI YFESIS;So;0;L;;;;;N;;;;;
-1D0DA;BYZANTINE MUSICAL SYMBOL DIASTOLI APLI MIKRI;So;0;L;;;;;N;;;;;
-1D0DB;BYZANTINE MUSICAL SYMBOL DIASTOLI APLI MEGALI;So;0;L;;;;;N;;;;;
-1D0DC;BYZANTINE MUSICAL SYMBOL DIASTOLI DIPLI;So;0;L;;;;;N;;;;;
-1D0DD;BYZANTINE MUSICAL SYMBOL DIASTOLI THESEOS;So;0;L;;;;;N;;;;;
-1D0DE;BYZANTINE MUSICAL SYMBOL SIMANSIS THESEOS;So;0;L;;;;;N;;;;;
-1D0DF;BYZANTINE MUSICAL SYMBOL SIMANSIS THESEOS DISIMOU;So;0;L;;;;;N;;;;;
-1D0E0;BYZANTINE MUSICAL SYMBOL SIMANSIS THESEOS TRISIMOU;So;0;L;;;;;N;;;;;
-1D0E1;BYZANTINE MUSICAL SYMBOL SIMANSIS THESEOS TETRASIMOU;So;0;L;;;;;N;;;;;
-1D0E2;BYZANTINE MUSICAL SYMBOL SIMANSIS ARSEOS;So;0;L;;;;;N;;;;;
-1D0E3;BYZANTINE MUSICAL SYMBOL SIMANSIS ARSEOS DISIMOU;So;0;L;;;;;N;;;;;
-1D0E4;BYZANTINE MUSICAL SYMBOL SIMANSIS ARSEOS TRISIMOU;So;0;L;;;;;N;;;;;
-1D0E5;BYZANTINE MUSICAL SYMBOL SIMANSIS ARSEOS TETRASIMOU;So;0;L;;;;;N;;;;;
-1D0E6;BYZANTINE MUSICAL SYMBOL DIGRAMMA GG;So;0;L;;;;;N;;;;;
-1D0E7;BYZANTINE MUSICAL SYMBOL DIFTOGGOS OU;So;0;L;;;;;N;;;;;
-1D0E8;BYZANTINE MUSICAL SYMBOL STIGMA;So;0;L;;;;;N;;;;;
-1D0E9;BYZANTINE MUSICAL SYMBOL ARKTIKO PA;So;0;L;;;;;N;;;;;
-1D0EA;BYZANTINE MUSICAL SYMBOL ARKTIKO VOU;So;0;L;;;;;N;;;;;
-1D0EB;BYZANTINE MUSICAL SYMBOL ARKTIKO GA;So;0;L;;;;;N;;;;;
-1D0EC;BYZANTINE MUSICAL SYMBOL ARKTIKO DI;So;0;L;;;;;N;;;;;
-1D0ED;BYZANTINE MUSICAL SYMBOL ARKTIKO KE;So;0;L;;;;;N;;;;;
-1D0EE;BYZANTINE MUSICAL SYMBOL ARKTIKO ZO;So;0;L;;;;;N;;;;;
-1D0EF;BYZANTINE MUSICAL SYMBOL ARKTIKO NI;So;0;L;;;;;N;;;;;
-1D0F0;BYZANTINE MUSICAL SYMBOL KENTIMATA NEO MESO;So;0;L;;;;;N;;;;;
-1D0F1;BYZANTINE MUSICAL SYMBOL KENTIMA NEO MESO;So;0;L;;;;;N;;;;;
-1D0F2;BYZANTINE MUSICAL SYMBOL KENTIMATA NEO KATO;So;0;L;;;;;N;;;;;
-1D0F3;BYZANTINE MUSICAL SYMBOL KENTIMA NEO KATO;So;0;L;;;;;N;;;;;
-1D0F4;BYZANTINE MUSICAL SYMBOL KLASMA KATO;So;0;L;;;;;N;;;;;
-1D0F5;BYZANTINE MUSICAL SYMBOL GORGON NEO KATO;So;0;L;;;;;N;;;;;
-1D100;MUSICAL SYMBOL SINGLE BARLINE;So;0;L;;;;;N;;;;;
-1D101;MUSICAL SYMBOL DOUBLE BARLINE;So;0;L;;;;;N;;;;;
-1D102;MUSICAL SYMBOL FINAL BARLINE;So;0;L;;;;;N;;;;;
-1D103;MUSICAL SYMBOL REVERSE FINAL BARLINE;So;0;L;;;;;N;;;;;
-1D104;MUSICAL SYMBOL DASHED BARLINE;So;0;L;;;;;N;;;;;
-1D105;MUSICAL SYMBOL SHORT BARLINE;So;0;L;;;;;N;;;;;
-1D106;MUSICAL SYMBOL LEFT REPEAT SIGN;So;0;L;;;;;N;;;;;
-1D107;MUSICAL SYMBOL RIGHT REPEAT SIGN;So;0;L;;;;;N;;;;;
-1D108;MUSICAL SYMBOL REPEAT DOTS;So;0;L;;;;;N;;;;;
-1D109;MUSICAL SYMBOL DAL SEGNO;So;0;L;;;;;N;;;;;
-1D10A;MUSICAL SYMBOL DA CAPO;So;0;L;;;;;N;;;;;
-1D10B;MUSICAL SYMBOL SEGNO;So;0;L;;;;;N;;;;;
-1D10C;MUSICAL SYMBOL CODA;So;0;L;;;;;N;;;;;
-1D10D;MUSICAL SYMBOL REPEATED FIGURE-1;So;0;L;;;;;N;;;;;
-1D10E;MUSICAL SYMBOL REPEATED FIGURE-2;So;0;L;;;;;N;;;;;
-1D10F;MUSICAL SYMBOL REPEATED FIGURE-3;So;0;L;;;;;N;;;;;
-1D110;MUSICAL SYMBOL FERMATA;So;0;L;;;;;N;;;;;
-1D111;MUSICAL SYMBOL FERMATA BELOW;So;0;L;;;;;N;;;;;
-1D112;MUSICAL SYMBOL BREATH MARK;So;0;L;;;;;N;;;;;
-1D113;MUSICAL SYMBOL CAESURA;So;0;L;;;;;N;;;;;
-1D114;MUSICAL SYMBOL BRACE;So;0;L;;;;;N;;;;;
-1D115;MUSICAL SYMBOL BRACKET;So;0;L;;;;;N;;;;;
-1D116;MUSICAL SYMBOL ONE-LINE STAFF;So;0;L;;;;;N;;;;;
-1D117;MUSICAL SYMBOL TWO-LINE STAFF;So;0;L;;;;;N;;;;;
-1D118;MUSICAL SYMBOL THREE-LINE STAFF;So;0;L;;;;;N;;;;;
-1D119;MUSICAL SYMBOL FOUR-LINE STAFF;So;0;L;;;;;N;;;;;
-1D11A;MUSICAL SYMBOL FIVE-LINE STAFF;So;0;L;;;;;N;;;;;
-1D11B;MUSICAL SYMBOL SIX-LINE STAFF;So;0;L;;;;;N;;;;;
-1D11C;MUSICAL SYMBOL SIX-STRING FRETBOARD;So;0;L;;;;;N;;;;;
-1D11D;MUSICAL SYMBOL FOUR-STRING FRETBOARD;So;0;L;;;;;N;;;;;
-1D11E;MUSICAL SYMBOL G CLEF;So;0;L;;;;;N;;;;;
-1D11F;MUSICAL SYMBOL G CLEF OTTAVA ALTA;So;0;L;;;;;N;;;;;
-1D120;MUSICAL SYMBOL G CLEF OTTAVA BASSA;So;0;L;;;;;N;;;;;
-1D121;MUSICAL SYMBOL C CLEF;So;0;L;;;;;N;;;;;
-1D122;MUSICAL SYMBOL F CLEF;So;0;L;;;;;N;;;;;
-1D123;MUSICAL SYMBOL F CLEF OTTAVA ALTA;So;0;L;;;;;N;;;;;
-1D124;MUSICAL SYMBOL F CLEF OTTAVA BASSA;So;0;L;;;;;N;;;;;
-1D125;MUSICAL SYMBOL DRUM CLEF-1;So;0;L;;;;;N;;;;;
-1D126;MUSICAL SYMBOL DRUM CLEF-2;So;0;L;;;;;N;;;;;
-1D129;MUSICAL SYMBOL MULTIPLE MEASURE REST;So;0;L;;;;;N;;;;;
-1D12A;MUSICAL SYMBOL DOUBLE SHARP;So;0;L;;;;;N;;;;;
-1D12B;MUSICAL SYMBOL DOUBLE FLAT;So;0;L;;;;;N;;;;;
-1D12C;MUSICAL SYMBOL FLAT UP;So;0;L;;;;;N;;;;;
-1D12D;MUSICAL SYMBOL FLAT DOWN;So;0;L;;;;;N;;;;;
-1D12E;MUSICAL SYMBOL NATURAL UP;So;0;L;;;;;N;;;;;
-1D12F;MUSICAL SYMBOL NATURAL DOWN;So;0;L;;;;;N;;;;;
-1D130;MUSICAL SYMBOL SHARP UP;So;0;L;;;;;N;;;;;
-1D131;MUSICAL SYMBOL SHARP DOWN;So;0;L;;;;;N;;;;;
-1D132;MUSICAL SYMBOL QUARTER TONE SHARP;So;0;L;;;;;N;;;;;
-1D133;MUSICAL SYMBOL QUARTER TONE FLAT;So;0;L;;;;;N;;;;;
-1D134;MUSICAL SYMBOL COMMON TIME;So;0;L;;;;;N;;;;;
-1D135;MUSICAL SYMBOL CUT TIME;So;0;L;;;;;N;;;;;
-1D136;MUSICAL SYMBOL OTTAVA ALTA;So;0;L;;;;;N;;;;;
-1D137;MUSICAL SYMBOL OTTAVA BASSA;So;0;L;;;;;N;;;;;
-1D138;MUSICAL SYMBOL QUINDICESIMA ALTA;So;0;L;;;;;N;;;;;
-1D139;MUSICAL SYMBOL QUINDICESIMA BASSA;So;0;L;;;;;N;;;;;
-1D13A;MUSICAL SYMBOL MULTI REST;So;0;L;;;;;N;;;;;
-1D13B;MUSICAL SYMBOL WHOLE REST;So;0;L;;;;;N;;;;;
-1D13C;MUSICAL SYMBOL HALF REST;So;0;L;;;;;N;;;;;
-1D13D;MUSICAL SYMBOL QUARTER REST;So;0;L;;;;;N;;;;;
-1D13E;MUSICAL SYMBOL EIGHTH REST;So;0;L;;;;;N;;;;;
-1D13F;MUSICAL SYMBOL SIXTEENTH REST;So;0;L;;;;;N;;;;;
-1D140;MUSICAL SYMBOL THIRTY-SECOND REST;So;0;L;;;;;N;;;;;
-1D141;MUSICAL SYMBOL SIXTY-FOURTH REST;So;0;L;;;;;N;;;;;
-1D142;MUSICAL SYMBOL ONE HUNDRED TWENTY-EIGHTH REST;So;0;L;;;;;N;;;;;
-1D143;MUSICAL SYMBOL X NOTEHEAD;So;0;L;;;;;N;;;;;
-1D144;MUSICAL SYMBOL PLUS NOTEHEAD;So;0;L;;;;;N;;;;;
-1D145;MUSICAL SYMBOL CIRCLE X NOTEHEAD;So;0;L;;;;;N;;;;;
-1D146;MUSICAL SYMBOL SQUARE NOTEHEAD WHITE;So;0;L;;;;;N;;;;;
-1D147;MUSICAL SYMBOL SQUARE NOTEHEAD BLACK;So;0;L;;;;;N;;;;;
-1D148;MUSICAL SYMBOL TRIANGLE NOTEHEAD UP WHITE;So;0;L;;;;;N;;;;;
-1D149;MUSICAL SYMBOL TRIANGLE NOTEHEAD UP BLACK;So;0;L;;;;;N;;;;;
-1D14A;MUSICAL SYMBOL TRIANGLE NOTEHEAD LEFT WHITE;So;0;L;;;;;N;;;;;
-1D14B;MUSICAL SYMBOL TRIANGLE NOTEHEAD LEFT BLACK;So;0;L;;;;;N;;;;;
-1D14C;MUSICAL SYMBOL TRIANGLE NOTEHEAD RIGHT WHITE;So;0;L;;;;;N;;;;;
-1D14D;MUSICAL SYMBOL TRIANGLE NOTEHEAD RIGHT BLACK;So;0;L;;;;;N;;;;;
-1D14E;MUSICAL SYMBOL TRIANGLE NOTEHEAD DOWN WHITE;So;0;L;;;;;N;;;;;
-1D14F;MUSICAL SYMBOL TRIANGLE NOTEHEAD DOWN BLACK;So;0;L;;;;;N;;;;;
-1D150;MUSICAL SYMBOL TRIANGLE NOTEHEAD UP RIGHT WHITE;So;0;L;;;;;N;;;;;
-1D151;MUSICAL SYMBOL TRIANGLE NOTEHEAD UP RIGHT BLACK;So;0;L;;;;;N;;;;;
-1D152;MUSICAL SYMBOL MOON NOTEHEAD WHITE;So;0;L;;;;;N;;;;;
-1D153;MUSICAL SYMBOL MOON NOTEHEAD BLACK;So;0;L;;;;;N;;;;;
-1D154;MUSICAL SYMBOL TRIANGLE-ROUND NOTEHEAD DOWN WHITE;So;0;L;;;;;N;;;;;
-1D155;MUSICAL SYMBOL TRIANGLE-ROUND NOTEHEAD DOWN BLACK;So;0;L;;;;;N;;;;;
-1D156;MUSICAL SYMBOL PARENTHESIS NOTEHEAD;So;0;L;;;;;N;;;;;
-1D157;MUSICAL SYMBOL VOID NOTEHEAD;So;0;L;;;;;N;;;;;
-1D158;MUSICAL SYMBOL NOTEHEAD BLACK;So;0;L;;;;;N;;;;;
-1D159;MUSICAL SYMBOL NULL NOTEHEAD;So;0;L;;;;;N;;;;;
-1D15A;MUSICAL SYMBOL CLUSTER NOTEHEAD WHITE;So;0;L;;;;;N;;;;;
-1D15B;MUSICAL SYMBOL CLUSTER NOTEHEAD BLACK;So;0;L;;;;;N;;;;;
-1D15C;MUSICAL SYMBOL BREVE;So;0;L;;;;;N;;;;;
-1D15D;MUSICAL SYMBOL WHOLE NOTE;So;0;L;;;;;N;;;;;
-1D15E;MUSICAL SYMBOL HALF NOTE;So;0;L;1D157 1D165;;;;N;;;;;
-1D15F;MUSICAL SYMBOL QUARTER NOTE;So;0;L;1D158 1D165;;;;N;;;;;
-1D160;MUSICAL SYMBOL EIGHTH NOTE;So;0;L;1D15F 1D16E;;;;N;;;;;
-1D161;MUSICAL SYMBOL SIXTEENTH NOTE;So;0;L;1D15F 1D16F;;;;N;;;;;
-1D162;MUSICAL SYMBOL THIRTY-SECOND NOTE;So;0;L;1D15F 1D170;;;;N;;;;;
-1D163;MUSICAL SYMBOL SIXTY-FOURTH NOTE;So;0;L;1D15F 1D171;;;;N;;;;;
-1D164;MUSICAL SYMBOL ONE HUNDRED TWENTY-EIGHTH NOTE;So;0;L;1D15F 1D172;;;;N;;;;;
-1D165;MUSICAL SYMBOL COMBINING STEM;Mc;216;L;;;;;N;;;;;
-1D166;MUSICAL SYMBOL COMBINING SPRECHGESANG STEM;Mc;216;L;;;;;N;;;;;
-1D167;MUSICAL SYMBOL COMBINING TREMOLO-1;Mn;1;NSM;;;;;N;;;;;
-1D168;MUSICAL SYMBOL COMBINING TREMOLO-2;Mn;1;NSM;;;;;N;;;;;
-1D169;MUSICAL SYMBOL COMBINING TREMOLO-3;Mn;1;NSM;;;;;N;;;;;
-1D16A;MUSICAL SYMBOL FINGERED TREMOLO-1;So;0;L;;;;;N;;;;;
-1D16B;MUSICAL SYMBOL FINGERED TREMOLO-2;So;0;L;;;;;N;;;;;
-1D16C;MUSICAL SYMBOL FINGERED TREMOLO-3;So;0;L;;;;;N;;;;;
-1D16D;MUSICAL SYMBOL COMBINING AUGMENTATION DOT;Mc;226;L;;;;;N;;;;;
-1D16E;MUSICAL SYMBOL COMBINING FLAG-1;Mc;216;L;;;;;N;;;;;
-1D16F;MUSICAL SYMBOL COMBINING FLAG-2;Mc;216;L;;;;;N;;;;;
-1D170;MUSICAL SYMBOL COMBINING FLAG-3;Mc;216;L;;;;;N;;;;;
-1D171;MUSICAL SYMBOL COMBINING FLAG-4;Mc;216;L;;;;;N;;;;;
-1D172;MUSICAL SYMBOL COMBINING FLAG-5;Mc;216;L;;;;;N;;;;;
-1D173;MUSICAL SYMBOL BEGIN BEAM;Cf;0;BN;;;;;N;;;;;
-1D174;MUSICAL SYMBOL END BEAM;Cf;0;BN;;;;;N;;;;;
-1D175;MUSICAL SYMBOL BEGIN TIE;Cf;0;BN;;;;;N;;;;;
-1D176;MUSICAL SYMBOL END TIE;Cf;0;BN;;;;;N;;;;;
-1D177;MUSICAL SYMBOL BEGIN SLUR;Cf;0;BN;;;;;N;;;;;
-1D178;MUSICAL SYMBOL END SLUR;Cf;0;BN;;;;;N;;;;;
-1D179;MUSICAL SYMBOL BEGIN PHRASE;Cf;0;BN;;;;;N;;;;;
-1D17A;MUSICAL SYMBOL END PHRASE;Cf;0;BN;;;;;N;;;;;
-1D17B;MUSICAL SYMBOL COMBINING ACCENT;Mn;220;NSM;;;;;N;;;;;
-1D17C;MUSICAL SYMBOL COMBINING STACCATO;Mn;220;NSM;;;;;N;;;;;
-1D17D;MUSICAL SYMBOL COMBINING TENUTO;Mn;220;NSM;;;;;N;;;;;
-1D17E;MUSICAL SYMBOL COMBINING STACCATISSIMO;Mn;220;NSM;;;;;N;;;;;
-1D17F;MUSICAL SYMBOL COMBINING MARCATO;Mn;220;NSM;;;;;N;;;;;
-1D180;MUSICAL SYMBOL COMBINING MARCATO-STACCATO;Mn;220;NSM;;;;;N;;;;;
-1D181;MUSICAL SYMBOL COMBINING ACCENT-STACCATO;Mn;220;NSM;;;;;N;;;;;
-1D182;MUSICAL SYMBOL COMBINING LOURE;Mn;220;NSM;;;;;N;;;;;
-1D183;MUSICAL SYMBOL ARPEGGIATO UP;So;0;L;;;;;N;;;;;
-1D184;MUSICAL SYMBOL ARPEGGIATO DOWN;So;0;L;;;;;N;;;;;
-1D185;MUSICAL SYMBOL COMBINING DOIT;Mn;230;NSM;;;;;N;;;;;
-1D186;MUSICAL SYMBOL COMBINING RIP;Mn;230;NSM;;;;;N;;;;;
-1D187;MUSICAL SYMBOL COMBINING FLIP;Mn;230;NSM;;;;;N;;;;;
-1D188;MUSICAL SYMBOL COMBINING SMEAR;Mn;230;NSM;;;;;N;;;;;
-1D189;MUSICAL SYMBOL COMBINING BEND;Mn;230;NSM;;;;;N;;;;;
-1D18A;MUSICAL SYMBOL COMBINING DOUBLE TONGUE;Mn;220;NSM;;;;;N;;;;;
-1D18B;MUSICAL SYMBOL COMBINING TRIPLE TONGUE;Mn;220;NSM;;;;;N;;;;;
-1D18C;MUSICAL SYMBOL RINFORZANDO;So;0;L;;;;;N;;;;;
-1D18D;MUSICAL SYMBOL SUBITO;So;0;L;;;;;N;;;;;
-1D18E;MUSICAL SYMBOL Z;So;0;L;;;;;N;;;;;
-1D18F;MUSICAL SYMBOL PIANO;So;0;L;;;;;N;;;;;
-1D190;MUSICAL SYMBOL MEZZO;So;0;L;;;;;N;;;;;
-1D191;MUSICAL SYMBOL FORTE;So;0;L;;;;;N;;;;;
-1D192;MUSICAL SYMBOL CRESCENDO;So;0;L;;;;;N;;;;;
-1D193;MUSICAL SYMBOL DECRESCENDO;So;0;L;;;;;N;;;;;
-1D194;MUSICAL SYMBOL GRACE NOTE SLASH;So;0;L;;;;;N;;;;;
-1D195;MUSICAL SYMBOL GRACE NOTE NO SLASH;So;0;L;;;;;N;;;;;
-1D196;MUSICAL SYMBOL TR;So;0;L;;;;;N;;;;;
-1D197;MUSICAL SYMBOL TURN;So;0;L;;;;;N;;;;;
-1D198;MUSICAL SYMBOL INVERTED TURN;So;0;L;;;;;N;;;;;
-1D199;MUSICAL SYMBOL TURN SLASH;So;0;L;;;;;N;;;;;
-1D19A;MUSICAL SYMBOL TURN UP;So;0;L;;;;;N;;;;;
-1D19B;MUSICAL SYMBOL ORNAMENT STROKE-1;So;0;L;;;;;N;;;;;
-1D19C;MUSICAL SYMBOL ORNAMENT STROKE-2;So;0;L;;;;;N;;;;;
-1D19D;MUSICAL SYMBOL ORNAMENT STROKE-3;So;0;L;;;;;N;;;;;
-1D19E;MUSICAL SYMBOL ORNAMENT STROKE-4;So;0;L;;;;;N;;;;;
-1D19F;MUSICAL SYMBOL ORNAMENT STROKE-5;So;0;L;;;;;N;;;;;
-1D1A0;MUSICAL SYMBOL ORNAMENT STROKE-6;So;0;L;;;;;N;;;;;
-1D1A1;MUSICAL SYMBOL ORNAMENT STROKE-7;So;0;L;;;;;N;;;;;
-1D1A2;MUSICAL SYMBOL ORNAMENT STROKE-8;So;0;L;;;;;N;;;;;
-1D1A3;MUSICAL SYMBOL ORNAMENT STROKE-9;So;0;L;;;;;N;;;;;
-1D1A4;MUSICAL SYMBOL ORNAMENT STROKE-10;So;0;L;;;;;N;;;;;
-1D1A5;MUSICAL SYMBOL ORNAMENT STROKE-11;So;0;L;;;;;N;;;;;
-1D1A6;MUSICAL SYMBOL HAUPTSTIMME;So;0;L;;;;;N;;;;;
-1D1A7;MUSICAL SYMBOL NEBENSTIMME;So;0;L;;;;;N;;;;;
-1D1A8;MUSICAL SYMBOL END OF STIMME;So;0;L;;;;;N;;;;;
-1D1A9;MUSICAL SYMBOL DEGREE SLASH;So;0;L;;;;;N;;;;;
-1D1AA;MUSICAL SYMBOL COMBINING DOWN BOW;Mn;230;NSM;;;;;N;;;;;
-1D1AB;MUSICAL SYMBOL COMBINING UP BOW;Mn;230;NSM;;;;;N;;;;;
-1D1AC;MUSICAL SYMBOL COMBINING HARMONIC;Mn;230;NSM;;;;;N;;;;;
-1D1AD;MUSICAL SYMBOL COMBINING SNAP PIZZICATO;Mn;230;NSM;;;;;N;;;;;
-1D1AE;MUSICAL SYMBOL PEDAL MARK;So;0;L;;;;;N;;;;;
-1D1AF;MUSICAL SYMBOL PEDAL UP MARK;So;0;L;;;;;N;;;;;
-1D1B0;MUSICAL SYMBOL HALF PEDAL MARK;So;0;L;;;;;N;;;;;
-1D1B1;MUSICAL SYMBOL GLISSANDO UP;So;0;L;;;;;N;;;;;
-1D1B2;MUSICAL SYMBOL GLISSANDO DOWN;So;0;L;;;;;N;;;;;
-1D1B3;MUSICAL SYMBOL WITH FINGERNAILS;So;0;L;;;;;N;;;;;
-1D1B4;MUSICAL SYMBOL DAMP;So;0;L;;;;;N;;;;;
-1D1B5;MUSICAL SYMBOL DAMP ALL;So;0;L;;;;;N;;;;;
-1D1B6;MUSICAL SYMBOL MAXIMA;So;0;L;;;;;N;;;;;
-1D1B7;MUSICAL SYMBOL LONGA;So;0;L;;;;;N;;;;;
-1D1B8;MUSICAL SYMBOL BREVIS;So;0;L;;;;;N;;;;;
-1D1B9;MUSICAL SYMBOL SEMIBREVIS WHITE;So;0;L;;;;;N;;;;;
-1D1BA;MUSICAL SYMBOL SEMIBREVIS BLACK;So;0;L;;;;;N;;;;;
-1D1BB;MUSICAL SYMBOL MINIMA;So;0;L;1D1B9 1D165;;;;N;;;;;
-1D1BC;MUSICAL SYMBOL MINIMA BLACK;So;0;L;1D1BA 1D165;;;;N;;;;;
-1D1BD;MUSICAL SYMBOL SEMIMINIMA WHITE;So;0;L;1D1BB 1D16E;;;;N;;;;;
-1D1BE;MUSICAL SYMBOL SEMIMINIMA BLACK;So;0;L;1D1BC 1D16E;;;;N;;;;;
-1D1BF;MUSICAL SYMBOL FUSA WHITE;So;0;L;1D1BB 1D16F;;;;N;;;;;
-1D1C0;MUSICAL SYMBOL FUSA BLACK;So;0;L;1D1BC 1D16F;;;;N;;;;;
-1D1C1;MUSICAL SYMBOL LONGA PERFECTA REST;So;0;L;;;;;N;;;;;
-1D1C2;MUSICAL SYMBOL LONGA IMPERFECTA REST;So;0;L;;;;;N;;;;;
-1D1C3;MUSICAL SYMBOL BREVIS REST;So;0;L;;;;;N;;;;;
-1D1C4;MUSICAL SYMBOL SEMIBREVIS REST;So;0;L;;;;;N;;;;;
-1D1C5;MUSICAL SYMBOL MINIMA REST;So;0;L;;;;;N;;;;;
-1D1C6;MUSICAL SYMBOL SEMIMINIMA REST;So;0;L;;;;;N;;;;;
-1D1C7;MUSICAL SYMBOL TEMPUS PERFECTUM CUM PROLATIONE PERFECTA;So;0;L;;;;;N;;;;;
-1D1C8;MUSICAL SYMBOL TEMPUS PERFECTUM CUM PROLATIONE IMPERFECTA;So;0;L;;;;;N;;;;;
-1D1C9;MUSICAL SYMBOL TEMPUS PERFECTUM CUM PROLATIONE PERFECTA DIMINUTION-1;So;0;L;;;;;N;;;;;
-1D1CA;MUSICAL SYMBOL TEMPUS IMPERFECTUM CUM PROLATIONE PERFECTA;So;0;L;;;;;N;;;;;
-1D1CB;MUSICAL SYMBOL TEMPUS IMPERFECTUM CUM PROLATIONE IMPERFECTA;So;0;L;;;;;N;;;;;
-1D1CC;MUSICAL SYMBOL TEMPUS IMPERFECTUM CUM PROLATIONE IMPERFECTA DIMINUTION-1;So;0;L;;;;;N;;;;;
-1D1CD;MUSICAL SYMBOL TEMPUS IMPERFECTUM CUM PROLATIONE IMPERFECTA DIMINUTION-2;So;0;L;;;;;N;;;;;
-1D1CE;MUSICAL SYMBOL TEMPUS IMPERFECTUM CUM PROLATIONE IMPERFECTA DIMINUTION-3;So;0;L;;;;;N;;;;;
-1D1CF;MUSICAL SYMBOL CROIX;So;0;L;;;;;N;;;;;
-1D1D0;MUSICAL SYMBOL GREGORIAN C CLEF;So;0;L;;;;;N;;;;;
-1D1D1;MUSICAL SYMBOL GREGORIAN F CLEF;So;0;L;;;;;N;;;;;
-1D1D2;MUSICAL SYMBOL SQUARE B;So;0;L;;;;;N;;;;;
-1D1D3;MUSICAL SYMBOL VIRGA;So;0;L;;;;;N;;;;;
-1D1D4;MUSICAL SYMBOL PODATUS;So;0;L;;;;;N;;;;;
-1D1D5;MUSICAL SYMBOL CLIVIS;So;0;L;;;;;N;;;;;
-1D1D6;MUSICAL SYMBOL SCANDICUS;So;0;L;;;;;N;;;;;
-1D1D7;MUSICAL SYMBOL CLIMACUS;So;0;L;;;;;N;;;;;
-1D1D8;MUSICAL SYMBOL TORCULUS;So;0;L;;;;;N;;;;;
-1D1D9;MUSICAL SYMBOL PORRECTUS;So;0;L;;;;;N;;;;;
-1D1DA;MUSICAL SYMBOL PORRECTUS FLEXUS;So;0;L;;;;;N;;;;;
-1D1DB;MUSICAL SYMBOL SCANDICUS FLEXUS;So;0;L;;;;;N;;;;;
-1D1DC;MUSICAL SYMBOL TORCULUS RESUPINUS;So;0;L;;;;;N;;;;;
-1D1DD;MUSICAL SYMBOL PES SUBPUNCTIS;So;0;L;;;;;N;;;;;
-1D200;GREEK VOCAL NOTATION SYMBOL-1;So;0;ON;;;;;N;;;;;
-1D201;GREEK VOCAL NOTATION SYMBOL-2;So;0;ON;;;;;N;;;;;
-1D202;GREEK VOCAL NOTATION SYMBOL-3;So;0;ON;;;;;N;;;;;
-1D203;GREEK VOCAL NOTATION SYMBOL-4;So;0;ON;;;;;N;;;;;
-1D204;GREEK VOCAL NOTATION SYMBOL-5;So;0;ON;;;;;N;;;;;
-1D205;GREEK VOCAL NOTATION SYMBOL-6;So;0;ON;;;;;N;;;;;
-1D206;GREEK VOCAL NOTATION SYMBOL-7;So;0;ON;;;;;N;;;;;
-1D207;GREEK VOCAL NOTATION SYMBOL-8;So;0;ON;;;;;N;;;;;
-1D208;GREEK VOCAL NOTATION SYMBOL-9;So;0;ON;;;;;N;;;;;
-1D209;GREEK VOCAL NOTATION SYMBOL-10;So;0;ON;;;;;N;;;;;
-1D20A;GREEK VOCAL NOTATION SYMBOL-11;So;0;ON;;;;;N;;;;;
-1D20B;GREEK VOCAL NOTATION SYMBOL-12;So;0;ON;;;;;N;;;;;
-1D20C;GREEK VOCAL NOTATION SYMBOL-13;So;0;ON;;;;;N;;;;;
-1D20D;GREEK VOCAL NOTATION SYMBOL-14;So;0;ON;;;;;N;;;;;
-1D20E;GREEK VOCAL NOTATION SYMBOL-15;So;0;ON;;;;;N;;;;;
-1D20F;GREEK VOCAL NOTATION SYMBOL-16;So;0;ON;;;;;N;;;;;
-1D210;GREEK VOCAL NOTATION SYMBOL-17;So;0;ON;;;;;N;;;;;
-1D211;GREEK VOCAL NOTATION SYMBOL-18;So;0;ON;;;;;N;;;;;
-1D212;GREEK VOCAL NOTATION SYMBOL-19;So;0;ON;;;;;N;;;;;
-1D213;GREEK VOCAL NOTATION SYMBOL-20;So;0;ON;;;;;N;;;;;
-1D214;GREEK VOCAL NOTATION SYMBOL-21;So;0;ON;;;;;N;;;;;
-1D215;GREEK VOCAL NOTATION SYMBOL-22;So;0;ON;;;;;N;;;;;
-1D216;GREEK VOCAL NOTATION SYMBOL-23;So;0;ON;;;;;N;;;;;
-1D217;GREEK VOCAL NOTATION SYMBOL-24;So;0;ON;;;;;N;;;;;
-1D218;GREEK VOCAL NOTATION SYMBOL-50;So;0;ON;;;;;N;;;;;
-1D219;GREEK VOCAL NOTATION SYMBOL-51;So;0;ON;;;;;N;;;;;
-1D21A;GREEK VOCAL NOTATION SYMBOL-52;So;0;ON;;;;;N;;;;;
-1D21B;GREEK VOCAL NOTATION SYMBOL-53;So;0;ON;;;;;N;;;;;
-1D21C;GREEK VOCAL NOTATION SYMBOL-54;So;0;ON;;;;;N;;;;;
-1D21D;GREEK INSTRUMENTAL NOTATION SYMBOL-1;So;0;ON;;;;;N;;;;;
-1D21E;GREEK INSTRUMENTAL NOTATION SYMBOL-2;So;0;ON;;;;;N;;;;;
-1D21F;GREEK INSTRUMENTAL NOTATION SYMBOL-4;So;0;ON;;;;;N;;;;;
-1D220;GREEK INSTRUMENTAL NOTATION SYMBOL-5;So;0;ON;;;;;N;;;;;
-1D221;GREEK INSTRUMENTAL NOTATION SYMBOL-7;So;0;ON;;;;;N;;;;;
-1D222;GREEK INSTRUMENTAL NOTATION SYMBOL-8;So;0;ON;;;;;N;;;;;
-1D223;GREEK INSTRUMENTAL NOTATION SYMBOL-11;So;0;ON;;;;;N;;;;;
-1D224;GREEK INSTRUMENTAL NOTATION SYMBOL-12;So;0;ON;;;;;N;;;;;
-1D225;GREEK INSTRUMENTAL NOTATION SYMBOL-13;So;0;ON;;;;;N;;;;;
-1D226;GREEK INSTRUMENTAL NOTATION SYMBOL-14;So;0;ON;;;;;N;;;;;
-1D227;GREEK INSTRUMENTAL NOTATION SYMBOL-17;So;0;ON;;;;;N;;;;;
-1D228;GREEK INSTRUMENTAL NOTATION SYMBOL-18;So;0;ON;;;;;N;;;;;
-1D229;GREEK INSTRUMENTAL NOTATION SYMBOL-19;So;0;ON;;;;;N;;;;;
-1D22A;GREEK INSTRUMENTAL NOTATION SYMBOL-23;So;0;ON;;;;;N;;;;;
-1D22B;GREEK INSTRUMENTAL NOTATION SYMBOL-24;So;0;ON;;;;;N;;;;;
-1D22C;GREEK INSTRUMENTAL NOTATION SYMBOL-25;So;0;ON;;;;;N;;;;;
-1D22D;GREEK INSTRUMENTAL NOTATION SYMBOL-26;So;0;ON;;;;;N;;;;;
-1D22E;GREEK INSTRUMENTAL NOTATION SYMBOL-27;So;0;ON;;;;;N;;;;;
-1D22F;GREEK INSTRUMENTAL NOTATION SYMBOL-29;So;0;ON;;;;;N;;;;;
-1D230;GREEK INSTRUMENTAL NOTATION SYMBOL-30;So;0;ON;;;;;N;;;;;
-1D231;GREEK INSTRUMENTAL NOTATION SYMBOL-32;So;0;ON;;;;;N;;;;;
-1D232;GREEK INSTRUMENTAL NOTATION SYMBOL-36;So;0;ON;;;;;N;;;;;
-1D233;GREEK INSTRUMENTAL NOTATION SYMBOL-37;So;0;ON;;;;;N;;;;;
-1D234;GREEK INSTRUMENTAL NOTATION SYMBOL-38;So;0;ON;;;;;N;;;;;
-1D235;GREEK INSTRUMENTAL NOTATION SYMBOL-39;So;0;ON;;;;;N;;;;;
-1D236;GREEK INSTRUMENTAL NOTATION SYMBOL-40;So;0;ON;;;;;N;;;;;
-1D237;GREEK INSTRUMENTAL NOTATION SYMBOL-42;So;0;ON;;;;;N;;;;;
-1D238;GREEK INSTRUMENTAL NOTATION SYMBOL-43;So;0;ON;;;;;N;;;;;
-1D239;GREEK INSTRUMENTAL NOTATION SYMBOL-45;So;0;ON;;;;;N;;;;;
-1D23A;GREEK INSTRUMENTAL NOTATION SYMBOL-47;So;0;ON;;;;;N;;;;;
-1D23B;GREEK INSTRUMENTAL NOTATION SYMBOL-48;So;0;ON;;;;;N;;;;;
-1D23C;GREEK INSTRUMENTAL NOTATION SYMBOL-49;So;0;ON;;;;;N;;;;;
-1D23D;GREEK INSTRUMENTAL NOTATION SYMBOL-50;So;0;ON;;;;;N;;;;;
-1D23E;GREEK INSTRUMENTAL NOTATION SYMBOL-51;So;0;ON;;;;;N;;;;;
-1D23F;GREEK INSTRUMENTAL NOTATION SYMBOL-52;So;0;ON;;;;;N;;;;;
-1D240;GREEK INSTRUMENTAL NOTATION SYMBOL-53;So;0;ON;;;;;N;;;;;
-1D241;GREEK INSTRUMENTAL NOTATION SYMBOL-54;So;0;ON;;;;;N;;;;;
-1D242;COMBINING GREEK MUSICAL TRISEME;Mn;230;NSM;;;;;N;;;;;
-1D243;COMBINING GREEK MUSICAL TETRASEME;Mn;230;NSM;;;;;N;;;;;
-1D244;COMBINING GREEK MUSICAL PENTASEME;Mn;230;NSM;;;;;N;;;;;
-1D245;GREEK MUSICAL LEIMMA;So;0;ON;;;;;N;;;;;
-1D300;MONOGRAM FOR EARTH;So;0;ON;;;;;N;;ren *;;;
-1D301;DIGRAM FOR HEAVENLY EARTH;So;0;ON;;;;;N;;tian ren *;;;
-1D302;DIGRAM FOR HUMAN EARTH;So;0;ON;;;;;N;;di ren *;;;
-1D303;DIGRAM FOR EARTHLY HEAVEN;So;0;ON;;;;;N;;ren tian *;;;
-1D304;DIGRAM FOR EARTHLY HUMAN;So;0;ON;;;;;N;;ren di *;;;
-1D305;DIGRAM FOR EARTH;So;0;ON;;;;;N;;ren ren *;;;
-1D306;TETRAGRAM FOR CENTRE;So;0;ON;;;;;N;;;;;
-1D307;TETRAGRAM FOR FULL CIRCLE;So;0;ON;;;;;N;;;;;
-1D308;TETRAGRAM FOR MIRED;So;0;ON;;;;;N;;;;;
-1D309;TETRAGRAM FOR BARRIER;So;0;ON;;;;;N;;;;;
-1D30A;TETRAGRAM FOR KEEPING SMALL;So;0;ON;;;;;N;;;;;
-1D30B;TETRAGRAM FOR CONTRARIETY;So;0;ON;;;;;N;;;;;
-1D30C;TETRAGRAM FOR ASCENT;So;0;ON;;;;;N;;;;;
-1D30D;TETRAGRAM FOR OPPOSITION;So;0;ON;;;;;N;;;;;
-1D30E;TETRAGRAM FOR BRANCHING OUT;So;0;ON;;;;;N;;;;;
-1D30F;TETRAGRAM FOR DEFECTIVENESS OR DISTORTION;So;0;ON;;;;;N;;;;;
-1D310;TETRAGRAM FOR DIVERGENCE;So;0;ON;;;;;N;;;;;
-1D311;TETRAGRAM FOR YOUTHFULNESS;So;0;ON;;;;;N;;;;;
-1D312;TETRAGRAM FOR INCREASE;So;0;ON;;;;;N;;;;;
-1D313;TETRAGRAM FOR PENETRATION;So;0;ON;;;;;N;;;;;
-1D314;TETRAGRAM FOR REACH;So;0;ON;;;;;N;;;;;
-1D315;TETRAGRAM FOR CONTACT;So;0;ON;;;;;N;;;;;
-1D316;TETRAGRAM FOR HOLDING BACK;So;0;ON;;;;;N;;;;;
-1D317;TETRAGRAM FOR WAITING;So;0;ON;;;;;N;;;;;
-1D318;TETRAGRAM FOR FOLLOWING;So;0;ON;;;;;N;;;;;
-1D319;TETRAGRAM FOR ADVANCE;So;0;ON;;;;;N;;;;;
-1D31A;TETRAGRAM FOR RELEASE;So;0;ON;;;;;N;;;;;
-1D31B;TETRAGRAM FOR RESISTANCE;So;0;ON;;;;;N;;;;;
-1D31C;TETRAGRAM FOR EASE;So;0;ON;;;;;N;;;;;
-1D31D;TETRAGRAM FOR JOY;So;0;ON;;;;;N;;;;;
-1D31E;TETRAGRAM FOR CONTENTION;So;0;ON;;;;;N;;;;;
-1D31F;TETRAGRAM FOR ENDEAVOUR;So;0;ON;;;;;N;;;;;
-1D320;TETRAGRAM FOR DUTIES;So;0;ON;;;;;N;;;;;
-1D321;TETRAGRAM FOR CHANGE;So;0;ON;;;;;N;;;;;
-1D322;TETRAGRAM FOR DECISIVENESS;So;0;ON;;;;;N;;;;;
-1D323;TETRAGRAM FOR BOLD RESOLUTION;So;0;ON;;;;;N;;;;;
-1D324;TETRAGRAM FOR PACKING;So;0;ON;;;;;N;;;;;
-1D325;TETRAGRAM FOR LEGION;So;0;ON;;;;;N;;;;;
-1D326;TETRAGRAM FOR CLOSENESS;So;0;ON;;;;;N;;;;;
-1D327;TETRAGRAM FOR KINSHIP;So;0;ON;;;;;N;;;;;
-1D328;TETRAGRAM FOR GATHERING;So;0;ON;;;;;N;;;;;
-1D329;TETRAGRAM FOR STRENGTH;So;0;ON;;;;;N;;;;;
-1D32A;TETRAGRAM FOR PURITY;So;0;ON;;;;;N;;;;;
-1D32B;TETRAGRAM FOR FULLNESS;So;0;ON;;;;;N;;;;;
-1D32C;TETRAGRAM FOR RESIDENCE;So;0;ON;;;;;N;;;;;
-1D32D;TETRAGRAM FOR LAW OR MODEL;So;0;ON;;;;;N;;;;;
-1D32E;TETRAGRAM FOR RESPONSE;So;0;ON;;;;;N;;;;;
-1D32F;TETRAGRAM FOR GOING TO MEET;So;0;ON;;;;;N;;;;;
-1D330;TETRAGRAM FOR ENCOUNTERS;So;0;ON;;;;;N;;;;;
-1D331;TETRAGRAM FOR STOVE;So;0;ON;;;;;N;;;;;
-1D332;TETRAGRAM FOR GREATNESS;So;0;ON;;;;;N;;;;;
-1D333;TETRAGRAM FOR ENLARGEMENT;So;0;ON;;;;;N;;;;;
-1D334;TETRAGRAM FOR PATTERN;So;0;ON;;;;;N;;;;;
-1D335;TETRAGRAM FOR RITUAL;So;0;ON;;;;;N;;;;;
-1D336;TETRAGRAM FOR FLIGHT;So;0;ON;;;;;N;;;;;
-1D337;TETRAGRAM FOR VASTNESS OR WASTING;So;0;ON;;;;;N;;;;;
-1D338;TETRAGRAM FOR CONSTANCY;So;0;ON;;;;;N;;;;;
-1D339;TETRAGRAM FOR MEASURE;So;0;ON;;;;;N;;;;;
-1D33A;TETRAGRAM FOR ETERNITY;So;0;ON;;;;;N;;;;;
-1D33B;TETRAGRAM FOR UNITY;So;0;ON;;;;;N;;;;;
-1D33C;TETRAGRAM FOR DIMINISHMENT;So;0;ON;;;;;N;;;;;
-1D33D;TETRAGRAM FOR CLOSED MOUTH;So;0;ON;;;;;N;;;;;
-1D33E;TETRAGRAM FOR GUARDEDNESS;So;0;ON;;;;;N;;;;;
-1D33F;TETRAGRAM FOR GATHERING IN;So;0;ON;;;;;N;;;;;
-1D340;TETRAGRAM FOR MASSING;So;0;ON;;;;;N;;;;;
-1D341;TETRAGRAM FOR ACCUMULATION;So;0;ON;;;;;N;;;;;
-1D342;TETRAGRAM FOR EMBELLISHMENT;So;0;ON;;;;;N;;;;;
-1D343;TETRAGRAM FOR DOUBT;So;0;ON;;;;;N;;;;;
-1D344;TETRAGRAM FOR WATCH;So;0;ON;;;;;N;;;;;
-1D345;TETRAGRAM FOR SINKING;So;0;ON;;;;;N;;;;;
-1D346;TETRAGRAM FOR INNER;So;0;ON;;;;;N;;;;;
-1D347;TETRAGRAM FOR DEPARTURE;So;0;ON;;;;;N;;;;;
-1D348;TETRAGRAM FOR DARKENING;So;0;ON;;;;;N;;;;;
-1D349;TETRAGRAM FOR DIMMING;So;0;ON;;;;;N;;;;;
-1D34A;TETRAGRAM FOR EXHAUSTION;So;0;ON;;;;;N;;;;;
-1D34B;TETRAGRAM FOR SEVERANCE;So;0;ON;;;;;N;;;;;
-1D34C;TETRAGRAM FOR STOPPAGE;So;0;ON;;;;;N;;;;;
-1D34D;TETRAGRAM FOR HARDNESS;So;0;ON;;;;;N;;;;;
-1D34E;TETRAGRAM FOR COMPLETION;So;0;ON;;;;;N;;;;;
-1D34F;TETRAGRAM FOR CLOSURE;So;0;ON;;;;;N;;;;;
-1D350;TETRAGRAM FOR FAILURE;So;0;ON;;;;;N;;;;;
-1D351;TETRAGRAM FOR AGGRAVATION;So;0;ON;;;;;N;;;;;
-1D352;TETRAGRAM FOR COMPLIANCE;So;0;ON;;;;;N;;;;;
-1D353;TETRAGRAM FOR ON THE VERGE;So;0;ON;;;;;N;;;;;
-1D354;TETRAGRAM FOR DIFFICULTIES;So;0;ON;;;;;N;;;;;
-1D355;TETRAGRAM FOR LABOURING;So;0;ON;;;;;N;;;;;
-1D356;TETRAGRAM FOR FOSTERING;So;0;ON;;;;;N;;;;;
-1D360;COUNTING ROD UNIT DIGIT ONE;No;0;L;;;;1;N;;;;;
-1D361;COUNTING ROD UNIT DIGIT TWO;No;0;L;;;;2;N;;;;;
-1D362;COUNTING ROD UNIT DIGIT THREE;No;0;L;;;;3;N;;;;;
-1D363;COUNTING ROD UNIT DIGIT FOUR;No;0;L;;;;4;N;;;;;
-1D364;COUNTING ROD UNIT DIGIT FIVE;No;0;L;;;;5;N;;;;;
-1D365;COUNTING ROD UNIT DIGIT SIX;No;0;L;;;;6;N;;;;;
-1D366;COUNTING ROD UNIT DIGIT SEVEN;No;0;L;;;;7;N;;;;;
-1D367;COUNTING ROD UNIT DIGIT EIGHT;No;0;L;;;;8;N;;;;;
-1D368;COUNTING ROD UNIT DIGIT NINE;No;0;L;;;;9;N;;;;;
-1D369;COUNTING ROD TENS DIGIT ONE;No;0;L;;;;10;N;;;;;
-1D36A;COUNTING ROD TENS DIGIT TWO;No;0;L;;;;20;N;;;;;
-1D36B;COUNTING ROD TENS DIGIT THREE;No;0;L;;;;30;N;;;;;
-1D36C;COUNTING ROD TENS DIGIT FOUR;No;0;L;;;;40;N;;;;;
-1D36D;COUNTING ROD TENS DIGIT FIVE;No;0;L;;;;50;N;;;;;
-1D36E;COUNTING ROD TENS DIGIT SIX;No;0;L;;;;60;N;;;;;
-1D36F;COUNTING ROD TENS DIGIT SEVEN;No;0;L;;;;70;N;;;;;
-1D370;COUNTING ROD TENS DIGIT EIGHT;No;0;L;;;;80;N;;;;;
-1D371;COUNTING ROD TENS DIGIT NINE;No;0;L;;;;90;N;;;;;
-1D400;MATHEMATICAL BOLD CAPITAL A;Lu;0;L;<font> 0041;;;;N;;;;;
-1D401;MATHEMATICAL BOLD CAPITAL B;Lu;0;L;<font> 0042;;;;N;;;;;
-1D402;MATHEMATICAL BOLD CAPITAL C;Lu;0;L;<font> 0043;;;;N;;;;;
-1D403;MATHEMATICAL BOLD CAPITAL D;Lu;0;L;<font> 0044;;;;N;;;;;
-1D404;MATHEMATICAL BOLD CAPITAL E;Lu;0;L;<font> 0045;;;;N;;;;;
-1D405;MATHEMATICAL BOLD CAPITAL F;Lu;0;L;<font> 0046;;;;N;;;;;
-1D406;MATHEMATICAL BOLD CAPITAL G;Lu;0;L;<font> 0047;;;;N;;;;;
-1D407;MATHEMATICAL BOLD CAPITAL H;Lu;0;L;<font> 0048;;;;N;;;;;
-1D408;MATHEMATICAL BOLD CAPITAL I;Lu;0;L;<font> 0049;;;;N;;;;;
-1D409;MATHEMATICAL BOLD CAPITAL J;Lu;0;L;<font> 004A;;;;N;;;;;
-1D40A;MATHEMATICAL BOLD CAPITAL K;Lu;0;L;<font> 004B;;;;N;;;;;
-1D40B;MATHEMATICAL BOLD CAPITAL L;Lu;0;L;<font> 004C;;;;N;;;;;
-1D40C;MATHEMATICAL BOLD CAPITAL M;Lu;0;L;<font> 004D;;;;N;;;;;
-1D40D;MATHEMATICAL BOLD CAPITAL N;Lu;0;L;<font> 004E;;;;N;;;;;
-1D40E;MATHEMATICAL BOLD CAPITAL O;Lu;0;L;<font> 004F;;;;N;;;;;
-1D40F;MATHEMATICAL BOLD CAPITAL P;Lu;0;L;<font> 0050;;;;N;;;;;
-1D410;MATHEMATICAL BOLD CAPITAL Q;Lu;0;L;<font> 0051;;;;N;;;;;
-1D411;MATHEMATICAL BOLD CAPITAL R;Lu;0;L;<font> 0052;;;;N;;;;;
-1D412;MATHEMATICAL BOLD CAPITAL S;Lu;0;L;<font> 0053;;;;N;;;;;
-1D413;MATHEMATICAL BOLD CAPITAL T;Lu;0;L;<font> 0054;;;;N;;;;;
-1D414;MATHEMATICAL BOLD CAPITAL U;Lu;0;L;<font> 0055;;;;N;;;;;
-1D415;MATHEMATICAL BOLD CAPITAL V;Lu;0;L;<font> 0056;;;;N;;;;;
-1D416;MATHEMATICAL BOLD CAPITAL W;Lu;0;L;<font> 0057;;;;N;;;;;
-1D417;MATHEMATICAL BOLD CAPITAL X;Lu;0;L;<font> 0058;;;;N;;;;;
-1D418;MATHEMATICAL BOLD CAPITAL Y;Lu;0;L;<font> 0059;;;;N;;;;;
-1D419;MATHEMATICAL BOLD CAPITAL Z;Lu;0;L;<font> 005A;;;;N;;;;;
-1D41A;MATHEMATICAL BOLD SMALL A;Ll;0;L;<font> 0061;;;;N;;;;;
-1D41B;MATHEMATICAL BOLD SMALL B;Ll;0;L;<font> 0062;;;;N;;;;;
-1D41C;MATHEMATICAL BOLD SMALL C;Ll;0;L;<font> 0063;;;;N;;;;;
-1D41D;MATHEMATICAL BOLD SMALL D;Ll;0;L;<font> 0064;;;;N;;;;;
-1D41E;MATHEMATICAL BOLD SMALL E;Ll;0;L;<font> 0065;;;;N;;;;;
-1D41F;MATHEMATICAL BOLD SMALL F;Ll;0;L;<font> 0066;;;;N;;;;;
-1D420;MATHEMATICAL BOLD SMALL G;Ll;0;L;<font> 0067;;;;N;;;;;
-1D421;MATHEMATICAL BOLD SMALL H;Ll;0;L;<font> 0068;;;;N;;;;;
-1D422;MATHEMATICAL BOLD SMALL I;Ll;0;L;<font> 0069;;;;N;;;;;
-1D423;MATHEMATICAL BOLD SMALL J;Ll;0;L;<font> 006A;;;;N;;;;;
-1D424;MATHEMATICAL BOLD SMALL K;Ll;0;L;<font> 006B;;;;N;;;;;
-1D425;MATHEMATICAL BOLD SMALL L;Ll;0;L;<font> 006C;;;;N;;;;;
-1D426;MATHEMATICAL BOLD SMALL M;Ll;0;L;<font> 006D;;;;N;;;;;
-1D427;MATHEMATICAL BOLD SMALL N;Ll;0;L;<font> 006E;;;;N;;;;;
-1D428;MATHEMATICAL BOLD SMALL O;Ll;0;L;<font> 006F;;;;N;;;;;
-1D429;MATHEMATICAL BOLD SMALL P;Ll;0;L;<font> 0070;;;;N;;;;;
-1D42A;MATHEMATICAL BOLD SMALL Q;Ll;0;L;<font> 0071;;;;N;;;;;
-1D42B;MATHEMATICAL BOLD SMALL R;Ll;0;L;<font> 0072;;;;N;;;;;
-1D42C;MATHEMATICAL BOLD SMALL S;Ll;0;L;<font> 0073;;;;N;;;;;
-1D42D;MATHEMATICAL BOLD SMALL T;Ll;0;L;<font> 0074;;;;N;;;;;
-1D42E;MATHEMATICAL BOLD SMALL U;Ll;0;L;<font> 0075;;;;N;;;;;
-1D42F;MATHEMATICAL BOLD SMALL V;Ll;0;L;<font> 0076;;;;N;;;;;
-1D430;MATHEMATICAL BOLD SMALL W;Ll;0;L;<font> 0077;;;;N;;;;;
-1D431;MATHEMATICAL BOLD SMALL X;Ll;0;L;<font> 0078;;;;N;;;;;
-1D432;MATHEMATICAL BOLD SMALL Y;Ll;0;L;<font> 0079;;;;N;;;;;
-1D433;MATHEMATICAL BOLD SMALL Z;Ll;0;L;<font> 007A;;;;N;;;;;
-1D434;MATHEMATICAL ITALIC CAPITAL A;Lu;0;L;<font> 0041;;;;N;;;;;
-1D435;MATHEMATICAL ITALIC CAPITAL B;Lu;0;L;<font> 0042;;;;N;;;;;
-1D436;MATHEMATICAL ITALIC CAPITAL C;Lu;0;L;<font> 0043;;;;N;;;;;
-1D437;MATHEMATICAL ITALIC CAPITAL D;Lu;0;L;<font> 0044;;;;N;;;;;
-1D438;MATHEMATICAL ITALIC CAPITAL E;Lu;0;L;<font> 0045;;;;N;;;;;
-1D439;MATHEMATICAL ITALIC CAPITAL F;Lu;0;L;<font> 0046;;;;N;;;;;
-1D43A;MATHEMATICAL ITALIC CAPITAL G;Lu;0;L;<font> 0047;;;;N;;;;;
-1D43B;MATHEMATICAL ITALIC CAPITAL H;Lu;0;L;<font> 0048;;;;N;;;;;
-1D43C;MATHEMATICAL ITALIC CAPITAL I;Lu;0;L;<font> 0049;;;;N;;;;;
-1D43D;MATHEMATICAL ITALIC CAPITAL J;Lu;0;L;<font> 004A;;;;N;;;;;
-1D43E;MATHEMATICAL ITALIC CAPITAL K;Lu;0;L;<font> 004B;;;;N;;;;;
-1D43F;MATHEMATICAL ITALIC CAPITAL L;Lu;0;L;<font> 004C;;;;N;;;;;
-1D440;MATHEMATICAL ITALIC CAPITAL M;Lu;0;L;<font> 004D;;;;N;;;;;
-1D441;MATHEMATICAL ITALIC CAPITAL N;Lu;0;L;<font> 004E;;;;N;;;;;
-1D442;MATHEMATICAL ITALIC CAPITAL O;Lu;0;L;<font> 004F;;;;N;;;;;
-1D443;MATHEMATICAL ITALIC CAPITAL P;Lu;0;L;<font> 0050;;;;N;;;;;
-1D444;MATHEMATICAL ITALIC CAPITAL Q;Lu;0;L;<font> 0051;;;;N;;;;;
-1D445;MATHEMATICAL ITALIC CAPITAL R;Lu;0;L;<font> 0052;;;;N;;;;;
-1D446;MATHEMATICAL ITALIC CAPITAL S;Lu;0;L;<font> 0053;;;;N;;;;;
-1D447;MATHEMATICAL ITALIC CAPITAL T;Lu;0;L;<font> 0054;;;;N;;;;;
-1D448;MATHEMATICAL ITALIC CAPITAL U;Lu;0;L;<font> 0055;;;;N;;;;;
-1D449;MATHEMATICAL ITALIC CAPITAL V;Lu;0;L;<font> 0056;;;;N;;;;;
-1D44A;MATHEMATICAL ITALIC CAPITAL W;Lu;0;L;<font> 0057;;;;N;;;;;
-1D44B;MATHEMATICAL ITALIC CAPITAL X;Lu;0;L;<font> 0058;;;;N;;;;;
-1D44C;MATHEMATICAL ITALIC CAPITAL Y;Lu;0;L;<font> 0059;;;;N;;;;;
-1D44D;MATHEMATICAL ITALIC CAPITAL Z;Lu;0;L;<font> 005A;;;;N;;;;;
-1D44E;MATHEMATICAL ITALIC SMALL A;Ll;0;L;<font> 0061;;;;N;;;;;
-1D44F;MATHEMATICAL ITALIC SMALL B;Ll;0;L;<font> 0062;;;;N;;;;;
-1D450;MATHEMATICAL ITALIC SMALL C;Ll;0;L;<font> 0063;;;;N;;;;;
-1D451;MATHEMATICAL ITALIC SMALL D;Ll;0;L;<font> 0064;;;;N;;;;;
-1D452;MATHEMATICAL ITALIC SMALL E;Ll;0;L;<font> 0065;;;;N;;;;;
-1D453;MATHEMATICAL ITALIC SMALL F;Ll;0;L;<font> 0066;;;;N;;;;;
-1D454;MATHEMATICAL ITALIC SMALL G;Ll;0;L;<font> 0067;;;;N;;;;;
-1D456;MATHEMATICAL ITALIC SMALL I;Ll;0;L;<font> 0069;;;;N;;;;;
-1D457;MATHEMATICAL ITALIC SMALL J;Ll;0;L;<font> 006A;;;;N;;;;;
-1D458;MATHEMATICAL ITALIC SMALL K;Ll;0;L;<font> 006B;;;;N;;;;;
-1D459;MATHEMATICAL ITALIC SMALL L;Ll;0;L;<font> 006C;;;;N;;;;;
-1D45A;MATHEMATICAL ITALIC SMALL M;Ll;0;L;<font> 006D;;;;N;;;;;
-1D45B;MATHEMATICAL ITALIC SMALL N;Ll;0;L;<font> 006E;;;;N;;;;;
-1D45C;MATHEMATICAL ITALIC SMALL O;Ll;0;L;<font> 006F;;;;N;;;;;
-1D45D;MATHEMATICAL ITALIC SMALL P;Ll;0;L;<font> 0070;;;;N;;;;;
-1D45E;MATHEMATICAL ITALIC SMALL Q;Ll;0;L;<font> 0071;;;;N;;;;;
-1D45F;MATHEMATICAL ITALIC SMALL R;Ll;0;L;<font> 0072;;;;N;;;;;
-1D460;MATHEMATICAL ITALIC SMALL S;Ll;0;L;<font> 0073;;;;N;;;;;
-1D461;MATHEMATICAL ITALIC SMALL T;Ll;0;L;<font> 0074;;;;N;;;;;
-1D462;MATHEMATICAL ITALIC SMALL U;Ll;0;L;<font> 0075;;;;N;;;;;
-1D463;MATHEMATICAL ITALIC SMALL V;Ll;0;L;<font> 0076;;;;N;;;;;
-1D464;MATHEMATICAL ITALIC SMALL W;Ll;0;L;<font> 0077;;;;N;;;;;
-1D465;MATHEMATICAL ITALIC SMALL X;Ll;0;L;<font> 0078;;;;N;;;;;
-1D466;MATHEMATICAL ITALIC SMALL Y;Ll;0;L;<font> 0079;;;;N;;;;;
-1D467;MATHEMATICAL ITALIC SMALL Z;Ll;0;L;<font> 007A;;;;N;;;;;
-1D468;MATHEMATICAL BOLD ITALIC CAPITAL A;Lu;0;L;<font> 0041;;;;N;;;;;
-1D469;MATHEMATICAL BOLD ITALIC CAPITAL B;Lu;0;L;<font> 0042;;;;N;;;;;
-1D46A;MATHEMATICAL BOLD ITALIC CAPITAL C;Lu;0;L;<font> 0043;;;;N;;;;;
-1D46B;MATHEMATICAL BOLD ITALIC CAPITAL D;Lu;0;L;<font> 0044;;;;N;;;;;
-1D46C;MATHEMATICAL BOLD ITALIC CAPITAL E;Lu;0;L;<font> 0045;;;;N;;;;;
-1D46D;MATHEMATICAL BOLD ITALIC CAPITAL F;Lu;0;L;<font> 0046;;;;N;;;;;
-1D46E;MATHEMATICAL BOLD ITALIC CAPITAL G;Lu;0;L;<font> 0047;;;;N;;;;;
-1D46F;MATHEMATICAL BOLD ITALIC CAPITAL H;Lu;0;L;<font> 0048;;;;N;;;;;
-1D470;MATHEMATICAL BOLD ITALIC CAPITAL I;Lu;0;L;<font> 0049;;;;N;;;;;
-1D471;MATHEMATICAL BOLD ITALIC CAPITAL J;Lu;0;L;<font> 004A;;;;N;;;;;
-1D472;MATHEMATICAL BOLD ITALIC CAPITAL K;Lu;0;L;<font> 004B;;;;N;;;;;
-1D473;MATHEMATICAL BOLD ITALIC CAPITAL L;Lu;0;L;<font> 004C;;;;N;;;;;
-1D474;MATHEMATICAL BOLD ITALIC CAPITAL M;Lu;0;L;<font> 004D;;;;N;;;;;
-1D475;MATHEMATICAL BOLD ITALIC CAPITAL N;Lu;0;L;<font> 004E;;;;N;;;;;
-1D476;MATHEMATICAL BOLD ITALIC CAPITAL O;Lu;0;L;<font> 004F;;;;N;;;;;
-1D477;MATHEMATICAL BOLD ITALIC CAPITAL P;Lu;0;L;<font> 0050;;;;N;;;;;
-1D478;MATHEMATICAL BOLD ITALIC CAPITAL Q;Lu;0;L;<font> 0051;;;;N;;;;;
-1D479;MATHEMATICAL BOLD ITALIC CAPITAL R;Lu;0;L;<font> 0052;;;;N;;;;;
-1D47A;MATHEMATICAL BOLD ITALIC CAPITAL S;Lu;0;L;<font> 0053;;;;N;;;;;
-1D47B;MATHEMATICAL BOLD ITALIC CAPITAL T;Lu;0;L;<font> 0054;;;;N;;;;;
-1D47C;MATHEMATICAL BOLD ITALIC CAPITAL U;Lu;0;L;<font> 0055;;;;N;;;;;
-1D47D;MATHEMATICAL BOLD ITALIC CAPITAL V;Lu;0;L;<font> 0056;;;;N;;;;;
-1D47E;MATHEMATICAL BOLD ITALIC CAPITAL W;Lu;0;L;<font> 0057;;;;N;;;;;
-1D47F;MATHEMATICAL BOLD ITALIC CAPITAL X;Lu;0;L;<font> 0058;;;;N;;;;;
-1D480;MATHEMATICAL BOLD ITALIC CAPITAL Y;Lu;0;L;<font> 0059;;;;N;;;;;
-1D481;MATHEMATICAL BOLD ITALIC CAPITAL Z;Lu;0;L;<font> 005A;;;;N;;;;;
-1D482;MATHEMATICAL BOLD ITALIC SMALL A;Ll;0;L;<font> 0061;;;;N;;;;;
-1D483;MATHEMATICAL BOLD ITALIC SMALL B;Ll;0;L;<font> 0062;;;;N;;;;;
-1D484;MATHEMATICAL BOLD ITALIC SMALL C;Ll;0;L;<font> 0063;;;;N;;;;;
-1D485;MATHEMATICAL BOLD ITALIC SMALL D;Ll;0;L;<font> 0064;;;;N;;;;;
-1D486;MATHEMATICAL BOLD ITALIC SMALL E;Ll;0;L;<font> 0065;;;;N;;;;;
-1D487;MATHEMATICAL BOLD ITALIC SMALL F;Ll;0;L;<font> 0066;;;;N;;;;;
-1D488;MATHEMATICAL BOLD ITALIC SMALL G;Ll;0;L;<font> 0067;;;;N;;;;;
-1D489;MATHEMATICAL BOLD ITALIC SMALL H;Ll;0;L;<font> 0068;;;;N;;;;;
-1D48A;MATHEMATICAL BOLD ITALIC SMALL I;Ll;0;L;<font> 0069;;;;N;;;;;
-1D48B;MATHEMATICAL BOLD ITALIC SMALL J;Ll;0;L;<font> 006A;;;;N;;;;;
-1D48C;MATHEMATICAL BOLD ITALIC SMALL K;Ll;0;L;<font> 006B;;;;N;;;;;
-1D48D;MATHEMATICAL BOLD ITALIC SMALL L;Ll;0;L;<font> 006C;;;;N;;;;;
-1D48E;MATHEMATICAL BOLD ITALIC SMALL M;Ll;0;L;<font> 006D;;;;N;;;;;
-1D48F;MATHEMATICAL BOLD ITALIC SMALL N;Ll;0;L;<font> 006E;;;;N;;;;;
-1D490;MATHEMATICAL BOLD ITALIC SMALL O;Ll;0;L;<font> 006F;;;;N;;;;;
-1D491;MATHEMATICAL BOLD ITALIC SMALL P;Ll;0;L;<font> 0070;;;;N;;;;;
-1D492;MATHEMATICAL BOLD ITALIC SMALL Q;Ll;0;L;<font> 0071;;;;N;;;;;
-1D493;MATHEMATICAL BOLD ITALIC SMALL R;Ll;0;L;<font> 0072;;;;N;;;;;
-1D494;MATHEMATICAL BOLD ITALIC SMALL S;Ll;0;L;<font> 0073;;;;N;;;;;
-1D495;MATHEMATICAL BOLD ITALIC SMALL T;Ll;0;L;<font> 0074;;;;N;;;;;
-1D496;MATHEMATICAL BOLD ITALIC SMALL U;Ll;0;L;<font> 0075;;;;N;;;;;
-1D497;MATHEMATICAL BOLD ITALIC SMALL V;Ll;0;L;<font> 0076;;;;N;;;;;
-1D498;MATHEMATICAL BOLD ITALIC SMALL W;Ll;0;L;<font> 0077;;;;N;;;;;
-1D499;MATHEMATICAL BOLD ITALIC SMALL X;Ll;0;L;<font> 0078;;;;N;;;;;
-1D49A;MATHEMATICAL BOLD ITALIC SMALL Y;Ll;0;L;<font> 0079;;;;N;;;;;
-1D49B;MATHEMATICAL BOLD ITALIC SMALL Z;Ll;0;L;<font> 007A;;;;N;;;;;
-1D49C;MATHEMATICAL SCRIPT CAPITAL A;Lu;0;L;<font> 0041;;;;N;;;;;
-1D49E;MATHEMATICAL SCRIPT CAPITAL C;Lu;0;L;<font> 0043;;;;N;;;;;
-1D49F;MATHEMATICAL SCRIPT CAPITAL D;Lu;0;L;<font> 0044;;;;N;;;;;
-1D4A2;MATHEMATICAL SCRIPT CAPITAL G;Lu;0;L;<font> 0047;;;;N;;;;;
-1D4A5;MATHEMATICAL SCRIPT CAPITAL J;Lu;0;L;<font> 004A;;;;N;;;;;
-1D4A6;MATHEMATICAL SCRIPT CAPITAL K;Lu;0;L;<font> 004B;;;;N;;;;;
-1D4A9;MATHEMATICAL SCRIPT CAPITAL N;Lu;0;L;<font> 004E;;;;N;;;;;
-1D4AA;MATHEMATICAL SCRIPT CAPITAL O;Lu;0;L;<font> 004F;;;;N;;;;;
-1D4AB;MATHEMATICAL SCRIPT CAPITAL P;Lu;0;L;<font> 0050;;;;N;;;;;
-1D4AC;MATHEMATICAL SCRIPT CAPITAL Q;Lu;0;L;<font> 0051;;;;N;;;;;
-1D4AE;MATHEMATICAL SCRIPT CAPITAL S;Lu;0;L;<font> 0053;;;;N;;;;;
-1D4AF;MATHEMATICAL SCRIPT CAPITAL T;Lu;0;L;<font> 0054;;;;N;;;;;
-1D4B0;MATHEMATICAL SCRIPT CAPITAL U;Lu;0;L;<font> 0055;;;;N;;;;;
-1D4B1;MATHEMATICAL SCRIPT CAPITAL V;Lu;0;L;<font> 0056;;;;N;;;;;
-1D4B2;MATHEMATICAL SCRIPT CAPITAL W;Lu;0;L;<font> 0057;;;;N;;;;;
-1D4B3;MATHEMATICAL SCRIPT CAPITAL X;Lu;0;L;<font> 0058;;;;N;;;;;
-1D4B4;MATHEMATICAL SCRIPT CAPITAL Y;Lu;0;L;<font> 0059;;;;N;;;;;
-1D4B5;MATHEMATICAL SCRIPT CAPITAL Z;Lu;0;L;<font> 005A;;;;N;;;;;
-1D4B6;MATHEMATICAL SCRIPT SMALL A;Ll;0;L;<font> 0061;;;;N;;;;;
-1D4B7;MATHEMATICAL SCRIPT SMALL B;Ll;0;L;<font> 0062;;;;N;;;;;
-1D4B8;MATHEMATICAL SCRIPT SMALL C;Ll;0;L;<font> 0063;;;;N;;;;;
-1D4B9;MATHEMATICAL SCRIPT SMALL D;Ll;0;L;<font> 0064;;;;N;;;;;
-1D4BB;MATHEMATICAL SCRIPT SMALL F;Ll;0;L;<font> 0066;;;;N;;;;;
-1D4BD;MATHEMATICAL SCRIPT SMALL H;Ll;0;L;<font> 0068;;;;N;;;;;
-1D4BE;MATHEMATICAL SCRIPT SMALL I;Ll;0;L;<font> 0069;;;;N;;;;;
-1D4BF;MATHEMATICAL SCRIPT SMALL J;Ll;0;L;<font> 006A;;;;N;;;;;
-1D4C0;MATHEMATICAL SCRIPT SMALL K;Ll;0;L;<font> 006B;;;;N;;;;;
-1D4C1;MATHEMATICAL SCRIPT SMALL L;Ll;0;L;<font> 006C;;;;N;;;;;
-1D4C2;MATHEMATICAL SCRIPT SMALL M;Ll;0;L;<font> 006D;;;;N;;;;;
-1D4C3;MATHEMATICAL SCRIPT SMALL N;Ll;0;L;<font> 006E;;;;N;;;;;
-1D4C5;MATHEMATICAL SCRIPT SMALL P;Ll;0;L;<font> 0070;;;;N;;;;;
-1D4C6;MATHEMATICAL SCRIPT SMALL Q;Ll;0;L;<font> 0071;;;;N;;;;;
-1D4C7;MATHEMATICAL SCRIPT SMALL R;Ll;0;L;<font> 0072;;;;N;;;;;
-1D4C8;MATHEMATICAL SCRIPT SMALL S;Ll;0;L;<font> 0073;;;;N;;;;;
-1D4C9;MATHEMATICAL SCRIPT SMALL T;Ll;0;L;<font> 0074;;;;N;;;;;
-1D4CA;MATHEMATICAL SCRIPT SMALL U;Ll;0;L;<font> 0075;;;;N;;;;;
-1D4CB;MATHEMATICAL SCRIPT SMALL V;Ll;0;L;<font> 0076;;;;N;;;;;
-1D4CC;MATHEMATICAL SCRIPT SMALL W;Ll;0;L;<font> 0077;;;;N;;;;;
-1D4CD;MATHEMATICAL SCRIPT SMALL X;Ll;0;L;<font> 0078;;;;N;;;;;
-1D4CE;MATHEMATICAL SCRIPT SMALL Y;Ll;0;L;<font> 0079;;;;N;;;;;
-1D4CF;MATHEMATICAL SCRIPT SMALL Z;Ll;0;L;<font> 007A;;;;N;;;;;
-1D4D0;MATHEMATICAL BOLD SCRIPT CAPITAL A;Lu;0;L;<font> 0041;;;;N;;;;;
-1D4D1;MATHEMATICAL BOLD SCRIPT CAPITAL B;Lu;0;L;<font> 0042;;;;N;;;;;
-1D4D2;MATHEMATICAL BOLD SCRIPT CAPITAL C;Lu;0;L;<font> 0043;;;;N;;;;;
-1D4D3;MATHEMATICAL BOLD SCRIPT CAPITAL D;Lu;0;L;<font> 0044;;;;N;;;;;
-1D4D4;MATHEMATICAL BOLD SCRIPT CAPITAL E;Lu;0;L;<font> 0045;;;;N;;;;;
-1D4D5;MATHEMATICAL BOLD SCRIPT CAPITAL F;Lu;0;L;<font> 0046;;;;N;;;;;
-1D4D6;MATHEMATICAL BOLD SCRIPT CAPITAL G;Lu;0;L;<font> 0047;;;;N;;;;;
-1D4D7;MATHEMATICAL BOLD SCRIPT CAPITAL H;Lu;0;L;<font> 0048;;;;N;;;;;
-1D4D8;MATHEMATICAL BOLD SCRIPT CAPITAL I;Lu;0;L;<font> 0049;;;;N;;;;;
-1D4D9;MATHEMATICAL BOLD SCRIPT CAPITAL J;Lu;0;L;<font> 004A;;;;N;;;;;
-1D4DA;MATHEMATICAL BOLD SCRIPT CAPITAL K;Lu;0;L;<font> 004B;;;;N;;;;;
-1D4DB;MATHEMATICAL BOLD SCRIPT CAPITAL L;Lu;0;L;<font> 004C;;;;N;;;;;
-1D4DC;MATHEMATICAL BOLD SCRIPT CAPITAL M;Lu;0;L;<font> 004D;;;;N;;;;;
-1D4DD;MATHEMATICAL BOLD SCRIPT CAPITAL N;Lu;0;L;<font> 004E;;;;N;;;;;
-1D4DE;MATHEMATICAL BOLD SCRIPT CAPITAL O;Lu;0;L;<font> 004F;;;;N;;;;;
-1D4DF;MATHEMATICAL BOLD SCRIPT CAPITAL P;Lu;0;L;<font> 0050;;;;N;;;;;
-1D4E0;MATHEMATICAL BOLD SCRIPT CAPITAL Q;Lu;0;L;<font> 0051;;;;N;;;;;
-1D4E1;MATHEMATICAL BOLD SCRIPT CAPITAL R;Lu;0;L;<font> 0052;;;;N;;;;;
-1D4E2;MATHEMATICAL BOLD SCRIPT CAPITAL S;Lu;0;L;<font> 0053;;;;N;;;;;
-1D4E3;MATHEMATICAL BOLD SCRIPT CAPITAL T;Lu;0;L;<font> 0054;;;;N;;;;;
-1D4E4;MATHEMATICAL BOLD SCRIPT CAPITAL U;Lu;0;L;<font> 0055;;;;N;;;;;
-1D4E5;MATHEMATICAL BOLD SCRIPT CAPITAL V;Lu;0;L;<font> 0056;;;;N;;;;;
-1D4E6;MATHEMATICAL BOLD SCRIPT CAPITAL W;Lu;0;L;<font> 0057;;;;N;;;;;
-1D4E7;MATHEMATICAL BOLD SCRIPT CAPITAL X;Lu;0;L;<font> 0058;;;;N;;;;;
-1D4E8;MATHEMATICAL BOLD SCRIPT CAPITAL Y;Lu;0;L;<font> 0059;;;;N;;;;;
-1D4E9;MATHEMATICAL BOLD SCRIPT CAPITAL Z;Lu;0;L;<font> 005A;;;;N;;;;;
-1D4EA;MATHEMATICAL BOLD SCRIPT SMALL A;Ll;0;L;<font> 0061;;;;N;;;;;
-1D4EB;MATHEMATICAL BOLD SCRIPT SMALL B;Ll;0;L;<font> 0062;;;;N;;;;;
-1D4EC;MATHEMATICAL BOLD SCRIPT SMALL C;Ll;0;L;<font> 0063;;;;N;;;;;
-1D4ED;MATHEMATICAL BOLD SCRIPT SMALL D;Ll;0;L;<font> 0064;;;;N;;;;;
-1D4EE;MATHEMATICAL BOLD SCRIPT SMALL E;Ll;0;L;<font> 0065;;;;N;;;;;
-1D4EF;MATHEMATICAL BOLD SCRIPT SMALL F;Ll;0;L;<font> 0066;;;;N;;;;;
-1D4F0;MATHEMATICAL BOLD SCRIPT SMALL G;Ll;0;L;<font> 0067;;;;N;;;;;
-1D4F1;MATHEMATICAL BOLD SCRIPT SMALL H;Ll;0;L;<font> 0068;;;;N;;;;;
-1D4F2;MATHEMATICAL BOLD SCRIPT SMALL I;Ll;0;L;<font> 0069;;;;N;;;;;
-1D4F3;MATHEMATICAL BOLD SCRIPT SMALL J;Ll;0;L;<font> 006A;;;;N;;;;;
-1D4F4;MATHEMATICAL BOLD SCRIPT SMALL K;Ll;0;L;<font> 006B;;;;N;;;;;
-1D4F5;MATHEMATICAL BOLD SCRIPT SMALL L;Ll;0;L;<font> 006C;;;;N;;;;;
-1D4F6;MATHEMATICAL BOLD SCRIPT SMALL M;Ll;0;L;<font> 006D;;;;N;;;;;
-1D4F7;MATHEMATICAL BOLD SCRIPT SMALL N;Ll;0;L;<font> 006E;;;;N;;;;;
-1D4F8;MATHEMATICAL BOLD SCRIPT SMALL O;Ll;0;L;<font> 006F;;;;N;;;;;
-1D4F9;MATHEMATICAL BOLD SCRIPT SMALL P;Ll;0;L;<font> 0070;;;;N;;;;;
-1D4FA;MATHEMATICAL BOLD SCRIPT SMALL Q;Ll;0;L;<font> 0071;;;;N;;;;;
-1D4FB;MATHEMATICAL BOLD SCRIPT SMALL R;Ll;0;L;<font> 0072;;;;N;;;;;
-1D4FC;MATHEMATICAL BOLD SCRIPT SMALL S;Ll;0;L;<font> 0073;;;;N;;;;;
-1D4FD;MATHEMATICAL BOLD SCRIPT SMALL T;Ll;0;L;<font> 0074;;;;N;;;;;
-1D4FE;MATHEMATICAL BOLD SCRIPT SMALL U;Ll;0;L;<font> 0075;;;;N;;;;;
-1D4FF;MATHEMATICAL BOLD SCRIPT SMALL V;Ll;0;L;<font> 0076;;;;N;;;;;
-1D500;MATHEMATICAL BOLD SCRIPT SMALL W;Ll;0;L;<font> 0077;;;;N;;;;;
-1D501;MATHEMATICAL BOLD SCRIPT SMALL X;Ll;0;L;<font> 0078;;;;N;;;;;
-1D502;MATHEMATICAL BOLD SCRIPT SMALL Y;Ll;0;L;<font> 0079;;;;N;;;;;
-1D503;MATHEMATICAL BOLD SCRIPT SMALL Z;Ll;0;L;<font> 007A;;;;N;;;;;
-1D504;MATHEMATICAL FRAKTUR CAPITAL A;Lu;0;L;<font> 0041;;;;N;;;;;
-1D505;MATHEMATICAL FRAKTUR CAPITAL B;Lu;0;L;<font> 0042;;;;N;;;;;
-1D507;MATHEMATICAL FRAKTUR CAPITAL D;Lu;0;L;<font> 0044;;;;N;;;;;
-1D508;MATHEMATICAL FRAKTUR CAPITAL E;Lu;0;L;<font> 0045;;;;N;;;;;
-1D509;MATHEMATICAL FRAKTUR CAPITAL F;Lu;0;L;<font> 0046;;;;N;;;;;
-1D50A;MATHEMATICAL FRAKTUR CAPITAL G;Lu;0;L;<font> 0047;;;;N;;;;;
-1D50D;MATHEMATICAL FRAKTUR CAPITAL J;Lu;0;L;<font> 004A;;;;N;;;;;
-1D50E;MATHEMATICAL FRAKTUR CAPITAL K;Lu;0;L;<font> 004B;;;;N;;;;;
-1D50F;MATHEMATICAL FRAKTUR CAPITAL L;Lu;0;L;<font> 004C;;;;N;;;;;
-1D510;MATHEMATICAL FRAKTUR CAPITAL M;Lu;0;L;<font> 004D;;;;N;;;;;
-1D511;MATHEMATICAL FRAKTUR CAPITAL N;Lu;0;L;<font> 004E;;;;N;;;;;
-1D512;MATHEMATICAL FRAKTUR CAPITAL O;Lu;0;L;<font> 004F;;;;N;;;;;
-1D513;MATHEMATICAL FRAKTUR CAPITAL P;Lu;0;L;<font> 0050;;;;N;;;;;
-1D514;MATHEMATICAL FRAKTUR CAPITAL Q;Lu;0;L;<font> 0051;;;;N;;;;;
-1D516;MATHEMATICAL FRAKTUR CAPITAL S;Lu;0;L;<font> 0053;;;;N;;;;;
-1D517;MATHEMATICAL FRAKTUR CAPITAL T;Lu;0;L;<font> 0054;;;;N;;;;;
-1D518;MATHEMATICAL FRAKTUR CAPITAL U;Lu;0;L;<font> 0055;;;;N;;;;;
-1D519;MATHEMATICAL FRAKTUR CAPITAL V;Lu;0;L;<font> 0056;;;;N;;;;;
-1D51A;MATHEMATICAL FRAKTUR CAPITAL W;Lu;0;L;<font> 0057;;;;N;;;;;
-1D51B;MATHEMATICAL FRAKTUR CAPITAL X;Lu;0;L;<font> 0058;;;;N;;;;;
-1D51C;MATHEMATICAL FRAKTUR CAPITAL Y;Lu;0;L;<font> 0059;;;;N;;;;;
-1D51E;MATHEMATICAL FRAKTUR SMALL A;Ll;0;L;<font> 0061;;;;N;;;;;
-1D51F;MATHEMATICAL FRAKTUR SMALL B;Ll;0;L;<font> 0062;;;;N;;;;;
-1D520;MATHEMATICAL FRAKTUR SMALL C;Ll;0;L;<font> 0063;;;;N;;;;;
-1D521;MATHEMATICAL FRAKTUR SMALL D;Ll;0;L;<font> 0064;;;;N;;;;;
-1D522;MATHEMATICAL FRAKTUR SMALL E;Ll;0;L;<font> 0065;;;;N;;;;;
-1D523;MATHEMATICAL FRAKTUR SMALL F;Ll;0;L;<font> 0066;;;;N;;;;;
-1D524;MATHEMATICAL FRAKTUR SMALL G;Ll;0;L;<font> 0067;;;;N;;;;;
-1D525;MATHEMATICAL FRAKTUR SMALL H;Ll;0;L;<font> 0068;;;;N;;;;;
-1D526;MATHEMATICAL FRAKTUR SMALL I;Ll;0;L;<font> 0069;;;;N;;;;;
-1D527;MATHEMATICAL FRAKTUR SMALL J;Ll;0;L;<font> 006A;;;;N;;;;;
-1D528;MATHEMATICAL FRAKTUR SMALL K;Ll;0;L;<font> 006B;;;;N;;;;;
-1D529;MATHEMATICAL FRAKTUR SMALL L;Ll;0;L;<font> 006C;;;;N;;;;;
-1D52A;MATHEMATICAL FRAKTUR SMALL M;Ll;0;L;<font> 006D;;;;N;;;;;
-1D52B;MATHEMATICAL FRAKTUR SMALL N;Ll;0;L;<font> 006E;;;;N;;;;;
-1D52C;MATHEMATICAL FRAKTUR SMALL O;Ll;0;L;<font> 006F;;;;N;;;;;
-1D52D;MATHEMATICAL FRAKTUR SMALL P;Ll;0;L;<font> 0070;;;;N;;;;;
-1D52E;MATHEMATICAL FRAKTUR SMALL Q;Ll;0;L;<font> 0071;;;;N;;;;;
-1D52F;MATHEMATICAL FRAKTUR SMALL R;Ll;0;L;<font> 0072;;;;N;;;;;
-1D530;MATHEMATICAL FRAKTUR SMALL S;Ll;0;L;<font> 0073;;;;N;;;;;
-1D531;MATHEMATICAL FRAKTUR SMALL T;Ll;0;L;<font> 0074;;;;N;;;;;
-1D532;MATHEMATICAL FRAKTUR SMALL U;Ll;0;L;<font> 0075;;;;N;;;;;
-1D533;MATHEMATICAL FRAKTUR SMALL V;Ll;0;L;<font> 0076;;;;N;;;;;
-1D534;MATHEMATICAL FRAKTUR SMALL W;Ll;0;L;<font> 0077;;;;N;;;;;
-1D535;MATHEMATICAL FRAKTUR SMALL X;Ll;0;L;<font> 0078;;;;N;;;;;
-1D536;MATHEMATICAL FRAKTUR SMALL Y;Ll;0;L;<font> 0079;;;;N;;;;;
-1D537;MATHEMATICAL FRAKTUR SMALL Z;Ll;0;L;<font> 007A;;;;N;;;;;
-1D538;MATHEMATICAL DOUBLE-STRUCK CAPITAL A;Lu;0;L;<font> 0041;;;;N;;;;;
-1D539;MATHEMATICAL DOUBLE-STRUCK CAPITAL B;Lu;0;L;<font> 0042;;;;N;;;;;
-1D53B;MATHEMATICAL DOUBLE-STRUCK CAPITAL D;Lu;0;L;<font> 0044;;;;N;;;;;
-1D53C;MATHEMATICAL DOUBLE-STRUCK CAPITAL E;Lu;0;L;<font> 0045;;;;N;;;;;
-1D53D;MATHEMATICAL DOUBLE-STRUCK CAPITAL F;Lu;0;L;<font> 0046;;;;N;;;;;
-1D53E;MATHEMATICAL DOUBLE-STRUCK CAPITAL G;Lu;0;L;<font> 0047;;;;N;;;;;
-1D540;MATHEMATICAL DOUBLE-STRUCK CAPITAL I;Lu;0;L;<font> 0049;;;;N;;;;;
-1D541;MATHEMATICAL DOUBLE-STRUCK CAPITAL J;Lu;0;L;<font> 004A;;;;N;;;;;
-1D542;MATHEMATICAL DOUBLE-STRUCK CAPITAL K;Lu;0;L;<font> 004B;;;;N;;;;;
-1D543;MATHEMATICAL DOUBLE-STRUCK CAPITAL L;Lu;0;L;<font> 004C;;;;N;;;;;
-1D544;MATHEMATICAL DOUBLE-STRUCK CAPITAL M;Lu;0;L;<font> 004D;;;;N;;;;;
-1D546;MATHEMATICAL DOUBLE-STRUCK CAPITAL O;Lu;0;L;<font> 004F;;;;N;;;;;
-1D54A;MATHEMATICAL DOUBLE-STRUCK CAPITAL S;Lu;0;L;<font> 0053;;;;N;;;;;
-1D54B;MATHEMATICAL DOUBLE-STRUCK CAPITAL T;Lu;0;L;<font> 0054;;;;N;;;;;
-1D54C;MATHEMATICAL DOUBLE-STRUCK CAPITAL U;Lu;0;L;<font> 0055;;;;N;;;;;
-1D54D;MATHEMATICAL DOUBLE-STRUCK CAPITAL V;Lu;0;L;<font> 0056;;;;N;;;;;
-1D54E;MATHEMATICAL DOUBLE-STRUCK CAPITAL W;Lu;0;L;<font> 0057;;;;N;;;;;
-1D54F;MATHEMATICAL DOUBLE-STRUCK CAPITAL X;Lu;0;L;<font> 0058;;;;N;;;;;
-1D550;MATHEMATICAL DOUBLE-STRUCK CAPITAL Y;Lu;0;L;<font> 0059;;;;N;;;;;
-1D552;MATHEMATICAL DOUBLE-STRUCK SMALL A;Ll;0;L;<font> 0061;;;;N;;;;;
-1D553;MATHEMATICAL DOUBLE-STRUCK SMALL B;Ll;0;L;<font> 0062;;;;N;;;;;
-1D554;MATHEMATICAL DOUBLE-STRUCK SMALL C;Ll;0;L;<font> 0063;;;;N;;;;;
-1D555;MATHEMATICAL DOUBLE-STRUCK SMALL D;Ll;0;L;<font> 0064;;;;N;;;;;
-1D556;MATHEMATICAL DOUBLE-STRUCK SMALL E;Ll;0;L;<font> 0065;;;;N;;;;;
-1D557;MATHEMATICAL DOUBLE-STRUCK SMALL F;Ll;0;L;<font> 0066;;;;N;;;;;
-1D558;MATHEMATICAL DOUBLE-STRUCK SMALL G;Ll;0;L;<font> 0067;;;;N;;;;;
-1D559;MATHEMATICAL DOUBLE-STRUCK SMALL H;Ll;0;L;<font> 0068;;;;N;;;;;
-1D55A;MATHEMATICAL DOUBLE-STRUCK SMALL I;Ll;0;L;<font> 0069;;;;N;;;;;
-1D55B;MATHEMATICAL DOUBLE-STRUCK SMALL J;Ll;0;L;<font> 006A;;;;N;;;;;
-1D55C;MATHEMATICAL DOUBLE-STRUCK SMALL K;Ll;0;L;<font> 006B;;;;N;;;;;
-1D55D;MATHEMATICAL DOUBLE-STRUCK SMALL L;Ll;0;L;<font> 006C;;;;N;;;;;
-1D55E;MATHEMATICAL DOUBLE-STRUCK SMALL M;Ll;0;L;<font> 006D;;;;N;;;;;
-1D55F;MATHEMATICAL DOUBLE-STRUCK SMALL N;Ll;0;L;<font> 006E;;;;N;;;;;
-1D560;MATHEMATICAL DOUBLE-STRUCK SMALL O;Ll;0;L;<font> 006F;;;;N;;;;;
-1D561;MATHEMATICAL DOUBLE-STRUCK SMALL P;Ll;0;L;<font> 0070;;;;N;;;;;
-1D562;MATHEMATICAL DOUBLE-STRUCK SMALL Q;Ll;0;L;<font> 0071;;;;N;;;;;
-1D563;MATHEMATICAL DOUBLE-STRUCK SMALL R;Ll;0;L;<font> 0072;;;;N;;;;;
-1D564;MATHEMATICAL DOUBLE-STRUCK SMALL S;Ll;0;L;<font> 0073;;;;N;;;;;
-1D565;MATHEMATICAL DOUBLE-STRUCK SMALL T;Ll;0;L;<font> 0074;;;;N;;;;;
-1D566;MATHEMATICAL DOUBLE-STRUCK SMALL U;Ll;0;L;<font> 0075;;;;N;;;;;
-1D567;MATHEMATICAL DOUBLE-STRUCK SMALL V;Ll;0;L;<font> 0076;;;;N;;;;;
-1D568;MATHEMATICAL DOUBLE-STRUCK SMALL W;Ll;0;L;<font> 0077;;;;N;;;;;
-1D569;MATHEMATICAL DOUBLE-STRUCK SMALL X;Ll;0;L;<font> 0078;;;;N;;;;;
-1D56A;MATHEMATICAL DOUBLE-STRUCK SMALL Y;Ll;0;L;<font> 0079;;;;N;;;;;
-1D56B;MATHEMATICAL DOUBLE-STRUCK SMALL Z;Ll;0;L;<font> 007A;;;;N;;;;;
-1D56C;MATHEMATICAL BOLD FRAKTUR CAPITAL A;Lu;0;L;<font> 0041;;;;N;;;;;
-1D56D;MATHEMATICAL BOLD FRAKTUR CAPITAL B;Lu;0;L;<font> 0042;;;;N;;;;;
-1D56E;MATHEMATICAL BOLD FRAKTUR CAPITAL C;Lu;0;L;<font> 0043;;;;N;;;;;
-1D56F;MATHEMATICAL BOLD FRAKTUR CAPITAL D;Lu;0;L;<font> 0044;;;;N;;;;;
-1D570;MATHEMATICAL BOLD FRAKTUR CAPITAL E;Lu;0;L;<font> 0045;;;;N;;;;;
-1D571;MATHEMATICAL BOLD FRAKTUR CAPITAL F;Lu;0;L;<font> 0046;;;;N;;;;;
-1D572;MATHEMATICAL BOLD FRAKTUR CAPITAL G;Lu;0;L;<font> 0047;;;;N;;;;;
-1D573;MATHEMATICAL BOLD FRAKTUR CAPITAL H;Lu;0;L;<font> 0048;;;;N;;;;;
-1D574;MATHEMATICAL BOLD FRAKTUR CAPITAL I;Lu;0;L;<font> 0049;;;;N;;;;;
-1D575;MATHEMATICAL BOLD FRAKTUR CAPITAL J;Lu;0;L;<font> 004A;;;;N;;;;;
-1D576;MATHEMATICAL BOLD FRAKTUR CAPITAL K;Lu;0;L;<font> 004B;;;;N;;;;;
-1D577;MATHEMATICAL BOLD FRAKTUR CAPITAL L;Lu;0;L;<font> 004C;;;;N;;;;;
-1D578;MATHEMATICAL BOLD FRAKTUR CAPITAL M;Lu;0;L;<font> 004D;;;;N;;;;;
-1D579;MATHEMATICAL BOLD FRAKTUR CAPITAL N;Lu;0;L;<font> 004E;;;;N;;;;;
-1D57A;MATHEMATICAL BOLD FRAKTUR CAPITAL O;Lu;0;L;<font> 004F;;;;N;;;;;
-1D57B;MATHEMATICAL BOLD FRAKTUR CAPITAL P;Lu;0;L;<font> 0050;;;;N;;;;;
-1D57C;MATHEMATICAL BOLD FRAKTUR CAPITAL Q;Lu;0;L;<font> 0051;;;;N;;;;;
-1D57D;MATHEMATICAL BOLD FRAKTUR CAPITAL R;Lu;0;L;<font> 0052;;;;N;;;;;
-1D57E;MATHEMATICAL BOLD FRAKTUR CAPITAL S;Lu;0;L;<font> 0053;;;;N;;;;;
-1D57F;MATHEMATICAL BOLD FRAKTUR CAPITAL T;Lu;0;L;<font> 0054;;;;N;;;;;
-1D580;MATHEMATICAL BOLD FRAKTUR CAPITAL U;Lu;0;L;<font> 0055;;;;N;;;;;
-1D581;MATHEMATICAL BOLD FRAKTUR CAPITAL V;Lu;0;L;<font> 0056;;;;N;;;;;
-1D582;MATHEMATICAL BOLD FRAKTUR CAPITAL W;Lu;0;L;<font> 0057;;;;N;;;;;
-1D583;MATHEMATICAL BOLD FRAKTUR CAPITAL X;Lu;0;L;<font> 0058;;;;N;;;;;
-1D584;MATHEMATICAL BOLD FRAKTUR CAPITAL Y;Lu;0;L;<font> 0059;;;;N;;;;;
-1D585;MATHEMATICAL BOLD FRAKTUR CAPITAL Z;Lu;0;L;<font> 005A;;;;N;;;;;
-1D586;MATHEMATICAL BOLD FRAKTUR SMALL A;Ll;0;L;<font> 0061;;;;N;;;;;
-1D587;MATHEMATICAL BOLD FRAKTUR SMALL B;Ll;0;L;<font> 0062;;;;N;;;;;
-1D588;MATHEMATICAL BOLD FRAKTUR SMALL C;Ll;0;L;<font> 0063;;;;N;;;;;
-1D589;MATHEMATICAL BOLD FRAKTUR SMALL D;Ll;0;L;<font> 0064;;;;N;;;;;
-1D58A;MATHEMATICAL BOLD FRAKTUR SMALL E;Ll;0;L;<font> 0065;;;;N;;;;;
-1D58B;MATHEMATICAL BOLD FRAKTUR SMALL F;Ll;0;L;<font> 0066;;;;N;;;;;
-1D58C;MATHEMATICAL BOLD FRAKTUR SMALL G;Ll;0;L;<font> 0067;;;;N;;;;;
-1D58D;MATHEMATICAL BOLD FRAKTUR SMALL H;Ll;0;L;<font> 0068;;;;N;;;;;
-1D58E;MATHEMATICAL BOLD FRAKTUR SMALL I;Ll;0;L;<font> 0069;;;;N;;;;;
-1D58F;MATHEMATICAL BOLD FRAKTUR SMALL J;Ll;0;L;<font> 006A;;;;N;;;;;
-1D590;MATHEMATICAL BOLD FRAKTUR SMALL K;Ll;0;L;<font> 006B;;;;N;;;;;
-1D591;MATHEMATICAL BOLD FRAKTUR SMALL L;Ll;0;L;<font> 006C;;;;N;;;;;
-1D592;MATHEMATICAL BOLD FRAKTUR SMALL M;Ll;0;L;<font> 006D;;;;N;;;;;
-1D593;MATHEMATICAL BOLD FRAKTUR SMALL N;Ll;0;L;<font> 006E;;;;N;;;;;
-1D594;MATHEMATICAL BOLD FRAKTUR SMALL O;Ll;0;L;<font> 006F;;;;N;;;;;
-1D595;MATHEMATICAL BOLD FRAKTUR SMALL P;Ll;0;L;<font> 0070;;;;N;;;;;
-1D596;MATHEMATICAL BOLD FRAKTUR SMALL Q;Ll;0;L;<font> 0071;;;;N;;;;;
-1D597;MATHEMATICAL BOLD FRAKTUR SMALL R;Ll;0;L;<font> 0072;;;;N;;;;;
-1D598;MATHEMATICAL BOLD FRAKTUR SMALL S;Ll;0;L;<font> 0073;;;;N;;;;;
-1D599;MATHEMATICAL BOLD FRAKTUR SMALL T;Ll;0;L;<font> 0074;;;;N;;;;;
-1D59A;MATHEMATICAL BOLD FRAKTUR SMALL U;Ll;0;L;<font> 0075;;;;N;;;;;
-1D59B;MATHEMATICAL BOLD FRAKTUR SMALL V;Ll;0;L;<font> 0076;;;;N;;;;;
-1D59C;MATHEMATICAL BOLD FRAKTUR SMALL W;Ll;0;L;<font> 0077;;;;N;;;;;
-1D59D;MATHEMATICAL BOLD FRAKTUR SMALL X;Ll;0;L;<font> 0078;;;;N;;;;;
-1D59E;MATHEMATICAL BOLD FRAKTUR SMALL Y;Ll;0;L;<font> 0079;;;;N;;;;;
-1D59F;MATHEMATICAL BOLD FRAKTUR SMALL Z;Ll;0;L;<font> 007A;;;;N;;;;;
-1D5A0;MATHEMATICAL SANS-SERIF CAPITAL A;Lu;0;L;<font> 0041;;;;N;;;;;
-1D5A1;MATHEMATICAL SANS-SERIF CAPITAL B;Lu;0;L;<font> 0042;;;;N;;;;;
-1D5A2;MATHEMATICAL SANS-SERIF CAPITAL C;Lu;0;L;<font> 0043;;;;N;;;;;
-1D5A3;MATHEMATICAL SANS-SERIF CAPITAL D;Lu;0;L;<font> 0044;;;;N;;;;;
-1D5A4;MATHEMATICAL SANS-SERIF CAPITAL E;Lu;0;L;<font> 0045;;;;N;;;;;
-1D5A5;MATHEMATICAL SANS-SERIF CAPITAL F;Lu;0;L;<font> 0046;;;;N;;;;;
-1D5A6;MATHEMATICAL SANS-SERIF CAPITAL G;Lu;0;L;<font> 0047;;;;N;;;;;
-1D5A7;MATHEMATICAL SANS-SERIF CAPITAL H;Lu;0;L;<font> 0048;;;;N;;;;;
-1D5A8;MATHEMATICAL SANS-SERIF CAPITAL I;Lu;0;L;<font> 0049;;;;N;;;;;
-1D5A9;MATHEMATICAL SANS-SERIF CAPITAL J;Lu;0;L;<font> 004A;;;;N;;;;;
-1D5AA;MATHEMATICAL SANS-SERIF CAPITAL K;Lu;0;L;<font> 004B;;;;N;;;;;
-1D5AB;MATHEMATICAL SANS-SERIF CAPITAL L;Lu;0;L;<font> 004C;;;;N;;;;;
-1D5AC;MATHEMATICAL SANS-SERIF CAPITAL M;Lu;0;L;<font> 004D;;;;N;;;;;
-1D5AD;MATHEMATICAL SANS-SERIF CAPITAL N;Lu;0;L;<font> 004E;;;;N;;;;;
-1D5AE;MATHEMATICAL SANS-SERIF CAPITAL O;Lu;0;L;<font> 004F;;;;N;;;;;
-1D5AF;MATHEMATICAL SANS-SERIF CAPITAL P;Lu;0;L;<font> 0050;;;;N;;;;;
-1D5B0;MATHEMATICAL SANS-SERIF CAPITAL Q;Lu;0;L;<font> 0051;;;;N;;;;;
-1D5B1;MATHEMATICAL SANS-SERIF CAPITAL R;Lu;0;L;<font> 0052;;;;N;;;;;
-1D5B2;MATHEMATICAL SANS-SERIF CAPITAL S;Lu;0;L;<font> 0053;;;;N;;;;;
-1D5B3;MATHEMATICAL SANS-SERIF CAPITAL T;Lu;0;L;<font> 0054;;;;N;;;;;
-1D5B4;MATHEMATICAL SANS-SERIF CAPITAL U;Lu;0;L;<font> 0055;;;;N;;;;;
-1D5B5;MATHEMATICAL SANS-SERIF CAPITAL V;Lu;0;L;<font> 0056;;;;N;;;;;
-1D5B6;MATHEMATICAL SANS-SERIF CAPITAL W;Lu;0;L;<font> 0057;;;;N;;;;;
-1D5B7;MATHEMATICAL SANS-SERIF CAPITAL X;Lu;0;L;<font> 0058;;;;N;;;;;
-1D5B8;MATHEMATICAL SANS-SERIF CAPITAL Y;Lu;0;L;<font> 0059;;;;N;;;;;
-1D5B9;MATHEMATICAL SANS-SERIF CAPITAL Z;Lu;0;L;<font> 005A;;;;N;;;;;
-1D5BA;MATHEMATICAL SANS-SERIF SMALL A;Ll;0;L;<font> 0061;;;;N;;;;;
-1D5BB;MATHEMATICAL SANS-SERIF SMALL B;Ll;0;L;<font> 0062;;;;N;;;;;
-1D5BC;MATHEMATICAL SANS-SERIF SMALL C;Ll;0;L;<font> 0063;;;;N;;;;;
-1D5BD;MATHEMATICAL SANS-SERIF SMALL D;Ll;0;L;<font> 0064;;;;N;;;;;
-1D5BE;MATHEMATICAL SANS-SERIF SMALL E;Ll;0;L;<font> 0065;;;;N;;;;;
-1D5BF;MATHEMATICAL SANS-SERIF SMALL F;Ll;0;L;<font> 0066;;;;N;;;;;
-1D5C0;MATHEMATICAL SANS-SERIF SMALL G;Ll;0;L;<font> 0067;;;;N;;;;;
-1D5C1;MATHEMATICAL SANS-SERIF SMALL H;Ll;0;L;<font> 0068;;;;N;;;;;
-1D5C2;MATHEMATICAL SANS-SERIF SMALL I;Ll;0;L;<font> 0069;;;;N;;;;;
-1D5C3;MATHEMATICAL SANS-SERIF SMALL J;Ll;0;L;<font> 006A;;;;N;;;;;
-1D5C4;MATHEMATICAL SANS-SERIF SMALL K;Ll;0;L;<font> 006B;;;;N;;;;;
-1D5C5;MATHEMATICAL SANS-SERIF SMALL L;Ll;0;L;<font> 006C;;;;N;;;;;
-1D5C6;MATHEMATICAL SANS-SERIF SMALL M;Ll;0;L;<font> 006D;;;;N;;;;;
-1D5C7;MATHEMATICAL SANS-SERIF SMALL N;Ll;0;L;<font> 006E;;;;N;;;;;
-1D5C8;MATHEMATICAL SANS-SERIF SMALL O;Ll;0;L;<font> 006F;;;;N;;;;;
-1D5C9;MATHEMATICAL SANS-SERIF SMALL P;Ll;0;L;<font> 0070;;;;N;;;;;
-1D5CA;MATHEMATICAL SANS-SERIF SMALL Q;Ll;0;L;<font> 0071;;;;N;;;;;
-1D5CB;MATHEMATICAL SANS-SERIF SMALL R;Ll;0;L;<font> 0072;;;;N;;;;;
-1D5CC;MATHEMATICAL SANS-SERIF SMALL S;Ll;0;L;<font> 0073;;;;N;;;;;
-1D5CD;MATHEMATICAL SANS-SERIF SMALL T;Ll;0;L;<font> 0074;;;;N;;;;;
-1D5CE;MATHEMATICAL SANS-SERIF SMALL U;Ll;0;L;<font> 0075;;;;N;;;;;
-1D5CF;MATHEMATICAL SANS-SERIF SMALL V;Ll;0;L;<font> 0076;;;;N;;;;;
-1D5D0;MATHEMATICAL SANS-SERIF SMALL W;Ll;0;L;<font> 0077;;;;N;;;;;
-1D5D1;MATHEMATICAL SANS-SERIF SMALL X;Ll;0;L;<font> 0078;;;;N;;;;;
-1D5D2;MATHEMATICAL SANS-SERIF SMALL Y;Ll;0;L;<font> 0079;;;;N;;;;;
-1D5D3;MATHEMATICAL SANS-SERIF SMALL Z;Ll;0;L;<font> 007A;;;;N;;;;;
-1D5D4;MATHEMATICAL SANS-SERIF BOLD CAPITAL A;Lu;0;L;<font> 0041;;;;N;;;;;
-1D5D5;MATHEMATICAL SANS-SERIF BOLD CAPITAL B;Lu;0;L;<font> 0042;;;;N;;;;;
-1D5D6;MATHEMATICAL SANS-SERIF BOLD CAPITAL C;Lu;0;L;<font> 0043;;;;N;;;;;
-1D5D7;MATHEMATICAL SANS-SERIF BOLD CAPITAL D;Lu;0;L;<font> 0044;;;;N;;;;;
-1D5D8;MATHEMATICAL SANS-SERIF BOLD CAPITAL E;Lu;0;L;<font> 0045;;;;N;;;;;
-1D5D9;MATHEMATICAL SANS-SERIF BOLD CAPITAL F;Lu;0;L;<font> 0046;;;;N;;;;;
-1D5DA;MATHEMATICAL SANS-SERIF BOLD CAPITAL G;Lu;0;L;<font> 0047;;;;N;;;;;
-1D5DB;MATHEMATICAL SANS-SERIF BOLD CAPITAL H;Lu;0;L;<font> 0048;;;;N;;;;;
-1D5DC;MATHEMATICAL SANS-SERIF BOLD CAPITAL I;Lu;0;L;<font> 0049;;;;N;;;;;
-1D5DD;MATHEMATICAL SANS-SERIF BOLD CAPITAL J;Lu;0;L;<font> 004A;;;;N;;;;;
-1D5DE;MATHEMATICAL SANS-SERIF BOLD CAPITAL K;Lu;0;L;<font> 004B;;;;N;;;;;
-1D5DF;MATHEMATICAL SANS-SERIF BOLD CAPITAL L;Lu;0;L;<font> 004C;;;;N;;;;;
-1D5E0;MATHEMATICAL SANS-SERIF BOLD CAPITAL M;Lu;0;L;<font> 004D;;;;N;;;;;
-1D5E1;MATHEMATICAL SANS-SERIF BOLD CAPITAL N;Lu;0;L;<font> 004E;;;;N;;;;;
-1D5E2;MATHEMATICAL SANS-SERIF BOLD CAPITAL O;Lu;0;L;<font> 004F;;;;N;;;;;
-1D5E3;MATHEMATICAL SANS-SERIF BOLD CAPITAL P;Lu;0;L;<font> 0050;;;;N;;;;;
-1D5E4;MATHEMATICAL SANS-SERIF BOLD CAPITAL Q;Lu;0;L;<font> 0051;;;;N;;;;;
-1D5E5;MATHEMATICAL SANS-SERIF BOLD CAPITAL R;Lu;0;L;<font> 0052;;;;N;;;;;
-1D5E6;MATHEMATICAL SANS-SERIF BOLD CAPITAL S;Lu;0;L;<font> 0053;;;;N;;;;;
-1D5E7;MATHEMATICAL SANS-SERIF BOLD CAPITAL T;Lu;0;L;<font> 0054;;;;N;;;;;
-1D5E8;MATHEMATICAL SANS-SERIF BOLD CAPITAL U;Lu;0;L;<font> 0055;;;;N;;;;;
-1D5E9;MATHEMATICAL SANS-SERIF BOLD CAPITAL V;Lu;0;L;<font> 0056;;;;N;;;;;
-1D5EA;MATHEMATICAL SANS-SERIF BOLD CAPITAL W;Lu;0;L;<font> 0057;;;;N;;;;;
-1D5EB;MATHEMATICAL SANS-SERIF BOLD CAPITAL X;Lu;0;L;<font> 0058;;;;N;;;;;
-1D5EC;MATHEMATICAL SANS-SERIF BOLD CAPITAL Y;Lu;0;L;<font> 0059;;;;N;;;;;
-1D5ED;MATHEMATICAL SANS-SERIF BOLD CAPITAL Z;Lu;0;L;<font> 005A;;;;N;;;;;
-1D5EE;MATHEMATICAL SANS-SERIF BOLD SMALL A;Ll;0;L;<font> 0061;;;;N;;;;;
-1D5EF;MATHEMATICAL SANS-SERIF BOLD SMALL B;Ll;0;L;<font> 0062;;;;N;;;;;
-1D5F0;MATHEMATICAL SANS-SERIF BOLD SMALL C;Ll;0;L;<font> 0063;;;;N;;;;;
-1D5F1;MATHEMATICAL SANS-SERIF BOLD SMALL D;Ll;0;L;<font> 0064;;;;N;;;;;
-1D5F2;MATHEMATICAL SANS-SERIF BOLD SMALL E;Ll;0;L;<font> 0065;;;;N;;;;;
-1D5F3;MATHEMATICAL SANS-SERIF BOLD SMALL F;Ll;0;L;<font> 0066;;;;N;;;;;
-1D5F4;MATHEMATICAL SANS-SERIF BOLD SMALL G;Ll;0;L;<font> 0067;;;;N;;;;;
-1D5F5;MATHEMATICAL SANS-SERIF BOLD SMALL H;Ll;0;L;<font> 0068;;;;N;;;;;
-1D5F6;MATHEMATICAL SANS-SERIF BOLD SMALL I;Ll;0;L;<font> 0069;;;;N;;;;;
-1D5F7;MATHEMATICAL SANS-SERIF BOLD SMALL J;Ll;0;L;<font> 006A;;;;N;;;;;
-1D5F8;MATHEMATICAL SANS-SERIF BOLD SMALL K;Ll;0;L;<font> 006B;;;;N;;;;;
-1D5F9;MATHEMATICAL SANS-SERIF BOLD SMALL L;Ll;0;L;<font> 006C;;;;N;;;;;
-1D5FA;MATHEMATICAL SANS-SERIF BOLD SMALL M;Ll;0;L;<font> 006D;;;;N;;;;;
-1D5FB;MATHEMATICAL SANS-SERIF BOLD SMALL N;Ll;0;L;<font> 006E;;;;N;;;;;
-1D5FC;MATHEMATICAL SANS-SERIF BOLD SMALL O;Ll;0;L;<font> 006F;;;;N;;;;;
-1D5FD;MATHEMATICAL SANS-SERIF BOLD SMALL P;Ll;0;L;<font> 0070;;;;N;;;;;
-1D5FE;MATHEMATICAL SANS-SERIF BOLD SMALL Q;Ll;0;L;<font> 0071;;;;N;;;;;
-1D5FF;MATHEMATICAL SANS-SERIF BOLD SMALL R;Ll;0;L;<font> 0072;;;;N;;;;;
-1D600;MATHEMATICAL SANS-SERIF BOLD SMALL S;Ll;0;L;<font> 0073;;;;N;;;;;
-1D601;MATHEMATICAL SANS-SERIF BOLD SMALL T;Ll;0;L;<font> 0074;;;;N;;;;;
-1D602;MATHEMATICAL SANS-SERIF BOLD SMALL U;Ll;0;L;<font> 0075;;;;N;;;;;
-1D603;MATHEMATICAL SANS-SERIF BOLD SMALL V;Ll;0;L;<font> 0076;;;;N;;;;;
-1D604;MATHEMATICAL SANS-SERIF BOLD SMALL W;Ll;0;L;<font> 0077;;;;N;;;;;
-1D605;MATHEMATICAL SANS-SERIF BOLD SMALL X;Ll;0;L;<font> 0078;;;;N;;;;;
-1D606;MATHEMATICAL SANS-SERIF BOLD SMALL Y;Ll;0;L;<font> 0079;;;;N;;;;;
-1D607;MATHEMATICAL SANS-SERIF BOLD SMALL Z;Ll;0;L;<font> 007A;;;;N;;;;;
-1D608;MATHEMATICAL SANS-SERIF ITALIC CAPITAL A;Lu;0;L;<font> 0041;;;;N;;;;;
-1D609;MATHEMATICAL SANS-SERIF ITALIC CAPITAL B;Lu;0;L;<font> 0042;;;;N;;;;;
-1D60A;MATHEMATICAL SANS-SERIF ITALIC CAPITAL C;Lu;0;L;<font> 0043;;;;N;;;;;
-1D60B;MATHEMATICAL SANS-SERIF ITALIC CAPITAL D;Lu;0;L;<font> 0044;;;;N;;;;;
-1D60C;MATHEMATICAL SANS-SERIF ITALIC CAPITAL E;Lu;0;L;<font> 0045;;;;N;;;;;
-1D60D;MATHEMATICAL SANS-SERIF ITALIC CAPITAL F;Lu;0;L;<font> 0046;;;;N;;;;;
-1D60E;MATHEMATICAL SANS-SERIF ITALIC CAPITAL G;Lu;0;L;<font> 0047;;;;N;;;;;
-1D60F;MATHEMATICAL SANS-SERIF ITALIC CAPITAL H;Lu;0;L;<font> 0048;;;;N;;;;;
-1D610;MATHEMATICAL SANS-SERIF ITALIC CAPITAL I;Lu;0;L;<font> 0049;;;;N;;;;;
-1D611;MATHEMATICAL SANS-SERIF ITALIC CAPITAL J;Lu;0;L;<font> 004A;;;;N;;;;;
-1D612;MATHEMATICAL SANS-SERIF ITALIC CAPITAL K;Lu;0;L;<font> 004B;;;;N;;;;;
-1D613;MATHEMATICAL SANS-SERIF ITALIC CAPITAL L;Lu;0;L;<font> 004C;;;;N;;;;;
-1D614;MATHEMATICAL SANS-SERIF ITALIC CAPITAL M;Lu;0;L;<font> 004D;;;;N;;;;;
-1D615;MATHEMATICAL SANS-SERIF ITALIC CAPITAL N;Lu;0;L;<font> 004E;;;;N;;;;;
-1D616;MATHEMATICAL SANS-SERIF ITALIC CAPITAL O;Lu;0;L;<font> 004F;;;;N;;;;;
-1D617;MATHEMATICAL SANS-SERIF ITALIC CAPITAL P;Lu;0;L;<font> 0050;;;;N;;;;;
-1D618;MATHEMATICAL SANS-SERIF ITALIC CAPITAL Q;Lu;0;L;<font> 0051;;;;N;;;;;
-1D619;MATHEMATICAL SANS-SERIF ITALIC CAPITAL R;Lu;0;L;<font> 0052;;;;N;;;;;
-1D61A;MATHEMATICAL SANS-SERIF ITALIC CAPITAL S;Lu;0;L;<font> 0053;;;;N;;;;;
-1D61B;MATHEMATICAL SANS-SERIF ITALIC CAPITAL T;Lu;0;L;<font> 0054;;;;N;;;;;
-1D61C;MATHEMATICAL SANS-SERIF ITALIC CAPITAL U;Lu;0;L;<font> 0055;;;;N;;;;;
-1D61D;MATHEMATICAL SANS-SERIF ITALIC CAPITAL V;Lu;0;L;<font> 0056;;;;N;;;;;
-1D61E;MATHEMATICAL SANS-SERIF ITALIC CAPITAL W;Lu;0;L;<font> 0057;;;;N;;;;;
-1D61F;MATHEMATICAL SANS-SERIF ITALIC CAPITAL X;Lu;0;L;<font> 0058;;;;N;;;;;
-1D620;MATHEMATICAL SANS-SERIF ITALIC CAPITAL Y;Lu;0;L;<font> 0059;;;;N;;;;;
-1D621;MATHEMATICAL SANS-SERIF ITALIC CAPITAL Z;Lu;0;L;<font> 005A;;;;N;;;;;
-1D622;MATHEMATICAL SANS-SERIF ITALIC SMALL A;Ll;0;L;<font> 0061;;;;N;;;;;
-1D623;MATHEMATICAL SANS-SERIF ITALIC SMALL B;Ll;0;L;<font> 0062;;;;N;;;;;
-1D624;MATHEMATICAL SANS-SERIF ITALIC SMALL C;Ll;0;L;<font> 0063;;;;N;;;;;
-1D625;MATHEMATICAL SANS-SERIF ITALIC SMALL D;Ll;0;L;<font> 0064;;;;N;;;;;
-1D626;MATHEMATICAL SANS-SERIF ITALIC SMALL E;Ll;0;L;<font> 0065;;;;N;;;;;
-1D627;MATHEMATICAL SANS-SERIF ITALIC SMALL F;Ll;0;L;<font> 0066;;;;N;;;;;
-1D628;MATHEMATICAL SANS-SERIF ITALIC SMALL G;Ll;0;L;<font> 0067;;;;N;;;;;
-1D629;MATHEMATICAL SANS-SERIF ITALIC SMALL H;Ll;0;L;<font> 0068;;;;N;;;;;
-1D62A;MATHEMATICAL SANS-SERIF ITALIC SMALL I;Ll;0;L;<font> 0069;;;;N;;;;;
-1D62B;MATHEMATICAL SANS-SERIF ITALIC SMALL J;Ll;0;L;<font> 006A;;;;N;;;;;
-1D62C;MATHEMATICAL SANS-SERIF ITALIC SMALL K;Ll;0;L;<font> 006B;;;;N;;;;;
-1D62D;MATHEMATICAL SANS-SERIF ITALIC SMALL L;Ll;0;L;<font> 006C;;;;N;;;;;
-1D62E;MATHEMATICAL SANS-SERIF ITALIC SMALL M;Ll;0;L;<font> 006D;;;;N;;;;;
-1D62F;MATHEMATICAL SANS-SERIF ITALIC SMALL N;Ll;0;L;<font> 006E;;;;N;;;;;
-1D630;MATHEMATICAL SANS-SERIF ITALIC SMALL O;Ll;0;L;<font> 006F;;;;N;;;;;
-1D631;MATHEMATICAL SANS-SERIF ITALIC SMALL P;Ll;0;L;<font> 0070;;;;N;;;;;
-1D632;MATHEMATICAL SANS-SERIF ITALIC SMALL Q;Ll;0;L;<font> 0071;;;;N;;;;;
-1D633;MATHEMATICAL SANS-SERIF ITALIC SMALL R;Ll;0;L;<font> 0072;;;;N;;;;;
-1D634;MATHEMATICAL SANS-SERIF ITALIC SMALL S;Ll;0;L;<font> 0073;;;;N;;;;;
-1D635;MATHEMATICAL SANS-SERIF ITALIC SMALL T;Ll;0;L;<font> 0074;;;;N;;;;;
-1D636;MATHEMATICAL SANS-SERIF ITALIC SMALL U;Ll;0;L;<font> 0075;;;;N;;;;;
-1D637;MATHEMATICAL SANS-SERIF ITALIC SMALL V;Ll;0;L;<font> 0076;;;;N;;;;;
-1D638;MATHEMATICAL SANS-SERIF ITALIC SMALL W;Ll;0;L;<font> 0077;;;;N;;;;;
-1D639;MATHEMATICAL SANS-SERIF ITALIC SMALL X;Ll;0;L;<font> 0078;;;;N;;;;;
-1D63A;MATHEMATICAL SANS-SERIF ITALIC SMALL Y;Ll;0;L;<font> 0079;;;;N;;;;;
-1D63B;MATHEMATICAL SANS-SERIF ITALIC SMALL Z;Ll;0;L;<font> 007A;;;;N;;;;;
-1D63C;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL A;Lu;0;L;<font> 0041;;;;N;;;;;
-1D63D;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL B;Lu;0;L;<font> 0042;;;;N;;;;;
-1D63E;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL C;Lu;0;L;<font> 0043;;;;N;;;;;
-1D63F;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL D;Lu;0;L;<font> 0044;;;;N;;;;;
-1D640;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL E;Lu;0;L;<font> 0045;;;;N;;;;;
-1D641;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL F;Lu;0;L;<font> 0046;;;;N;;;;;
-1D642;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL G;Lu;0;L;<font> 0047;;;;N;;;;;
-1D643;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL H;Lu;0;L;<font> 0048;;;;N;;;;;
-1D644;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL I;Lu;0;L;<font> 0049;;;;N;;;;;
-1D645;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL J;Lu;0;L;<font> 004A;;;;N;;;;;
-1D646;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL K;Lu;0;L;<font> 004B;;;;N;;;;;
-1D647;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL L;Lu;0;L;<font> 004C;;;;N;;;;;
-1D648;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL M;Lu;0;L;<font> 004D;;;;N;;;;;
-1D649;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL N;Lu;0;L;<font> 004E;;;;N;;;;;
-1D64A;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL O;Lu;0;L;<font> 004F;;;;N;;;;;
-1D64B;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL P;Lu;0;L;<font> 0050;;;;N;;;;;
-1D64C;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL Q;Lu;0;L;<font> 0051;;;;N;;;;;
-1D64D;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL R;Lu;0;L;<font> 0052;;;;N;;;;;
-1D64E;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL S;Lu;0;L;<font> 0053;;;;N;;;;;
-1D64F;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL T;Lu;0;L;<font> 0054;;;;N;;;;;
-1D650;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL U;Lu;0;L;<font> 0055;;;;N;;;;;
-1D651;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL V;Lu;0;L;<font> 0056;;;;N;;;;;
-1D652;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL W;Lu;0;L;<font> 0057;;;;N;;;;;
-1D653;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL X;Lu;0;L;<font> 0058;;;;N;;;;;
-1D654;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL Y;Lu;0;L;<font> 0059;;;;N;;;;;
-1D655;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL Z;Lu;0;L;<font> 005A;;;;N;;;;;
-1D656;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL A;Ll;0;L;<font> 0061;;;;N;;;;;
-1D657;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL B;Ll;0;L;<font> 0062;;;;N;;;;;
-1D658;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL C;Ll;0;L;<font> 0063;;;;N;;;;;
-1D659;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL D;Ll;0;L;<font> 0064;;;;N;;;;;
-1D65A;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL E;Ll;0;L;<font> 0065;;;;N;;;;;
-1D65B;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL F;Ll;0;L;<font> 0066;;;;N;;;;;
-1D65C;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL G;Ll;0;L;<font> 0067;;;;N;;;;;
-1D65D;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL H;Ll;0;L;<font> 0068;;;;N;;;;;
-1D65E;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL I;Ll;0;L;<font> 0069;;;;N;;;;;
-1D65F;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL J;Ll;0;L;<font> 006A;;;;N;;;;;
-1D660;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL K;Ll;0;L;<font> 006B;;;;N;;;;;
-1D661;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL L;Ll;0;L;<font> 006C;;;;N;;;;;
-1D662;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL M;Ll;0;L;<font> 006D;;;;N;;;;;
-1D663;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL N;Ll;0;L;<font> 006E;;;;N;;;;;
-1D664;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL O;Ll;0;L;<font> 006F;;;;N;;;;;
-1D665;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL P;Ll;0;L;<font> 0070;;;;N;;;;;
-1D666;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL Q;Ll;0;L;<font> 0071;;;;N;;;;;
-1D667;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL R;Ll;0;L;<font> 0072;;;;N;;;;;
-1D668;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL S;Ll;0;L;<font> 0073;;;;N;;;;;
-1D669;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL T;Ll;0;L;<font> 0074;;;;N;;;;;
-1D66A;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL U;Ll;0;L;<font> 0075;;;;N;;;;;
-1D66B;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL V;Ll;0;L;<font> 0076;;;;N;;;;;
-1D66C;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL W;Ll;0;L;<font> 0077;;;;N;;;;;
-1D66D;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL X;Ll;0;L;<font> 0078;;;;N;;;;;
-1D66E;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL Y;Ll;0;L;<font> 0079;;;;N;;;;;
-1D66F;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL Z;Ll;0;L;<font> 007A;;;;N;;;;;
-1D670;MATHEMATICAL MONOSPACE CAPITAL A;Lu;0;L;<font> 0041;;;;N;;;;;
-1D671;MATHEMATICAL MONOSPACE CAPITAL B;Lu;0;L;<font> 0042;;;;N;;;;;
-1D672;MATHEMATICAL MONOSPACE CAPITAL C;Lu;0;L;<font> 0043;;;;N;;;;;
-1D673;MATHEMATICAL MONOSPACE CAPITAL D;Lu;0;L;<font> 0044;;;;N;;;;;
-1D674;MATHEMATICAL MONOSPACE CAPITAL E;Lu;0;L;<font> 0045;;;;N;;;;;
-1D675;MATHEMATICAL MONOSPACE CAPITAL F;Lu;0;L;<font> 0046;;;;N;;;;;
-1D676;MATHEMATICAL MONOSPACE CAPITAL G;Lu;0;L;<font> 0047;;;;N;;;;;
-1D677;MATHEMATICAL MONOSPACE CAPITAL H;Lu;0;L;<font> 0048;;;;N;;;;;
-1D678;MATHEMATICAL MONOSPACE CAPITAL I;Lu;0;L;<font> 0049;;;;N;;;;;
-1D679;MATHEMATICAL MONOSPACE CAPITAL J;Lu;0;L;<font> 004A;;;;N;;;;;
-1D67A;MATHEMATICAL MONOSPACE CAPITAL K;Lu;0;L;<font> 004B;;;;N;;;;;
-1D67B;MATHEMATICAL MONOSPACE CAPITAL L;Lu;0;L;<font> 004C;;;;N;;;;;
-1D67C;MATHEMATICAL MONOSPACE CAPITAL M;Lu;0;L;<font> 004D;;;;N;;;;;
-1D67D;MATHEMATICAL MONOSPACE CAPITAL N;Lu;0;L;<font> 004E;;;;N;;;;;
-1D67E;MATHEMATICAL MONOSPACE CAPITAL O;Lu;0;L;<font> 004F;;;;N;;;;;
-1D67F;MATHEMATICAL MONOSPACE CAPITAL P;Lu;0;L;<font> 0050;;;;N;;;;;
-1D680;MATHEMATICAL MONOSPACE CAPITAL Q;Lu;0;L;<font> 0051;;;;N;;;;;
-1D681;MATHEMATICAL MONOSPACE CAPITAL R;Lu;0;L;<font> 0052;;;;N;;;;;
-1D682;MATHEMATICAL MONOSPACE CAPITAL S;Lu;0;L;<font> 0053;;;;N;;;;;
-1D683;MATHEMATICAL MONOSPACE CAPITAL T;Lu;0;L;<font> 0054;;;;N;;;;;
-1D684;MATHEMATICAL MONOSPACE CAPITAL U;Lu;0;L;<font> 0055;;;;N;;;;;
-1D685;MATHEMATICAL MONOSPACE CAPITAL V;Lu;0;L;<font> 0056;;;;N;;;;;
-1D686;MATHEMATICAL MONOSPACE CAPITAL W;Lu;0;L;<font> 0057;;;;N;;;;;
-1D687;MATHEMATICAL MONOSPACE CAPITAL X;Lu;0;L;<font> 0058;;;;N;;;;;
-1D688;MATHEMATICAL MONOSPACE CAPITAL Y;Lu;0;L;<font> 0059;;;;N;;;;;
-1D689;MATHEMATICAL MONOSPACE CAPITAL Z;Lu;0;L;<font> 005A;;;;N;;;;;
-1D68A;MATHEMATICAL MONOSPACE SMALL A;Ll;0;L;<font> 0061;;;;N;;;;;
-1D68B;MATHEMATICAL MONOSPACE SMALL B;Ll;0;L;<font> 0062;;;;N;;;;;
-1D68C;MATHEMATICAL MONOSPACE SMALL C;Ll;0;L;<font> 0063;;;;N;;;;;
-1D68D;MATHEMATICAL MONOSPACE SMALL D;Ll;0;L;<font> 0064;;;;N;;;;;
-1D68E;MATHEMATICAL MONOSPACE SMALL E;Ll;0;L;<font> 0065;;;;N;;;;;
-1D68F;MATHEMATICAL MONOSPACE SMALL F;Ll;0;L;<font> 0066;;;;N;;;;;
-1D690;MATHEMATICAL MONOSPACE SMALL G;Ll;0;L;<font> 0067;;;;N;;;;;
-1D691;MATHEMATICAL MONOSPACE SMALL H;Ll;0;L;<font> 0068;;;;N;;;;;
-1D692;MATHEMATICAL MONOSPACE SMALL I;Ll;0;L;<font> 0069;;;;N;;;;;
-1D693;MATHEMATICAL MONOSPACE SMALL J;Ll;0;L;<font> 006A;;;;N;;;;;
-1D694;MATHEMATICAL MONOSPACE SMALL K;Ll;0;L;<font> 006B;;;;N;;;;;
-1D695;MATHEMATICAL MONOSPACE SMALL L;Ll;0;L;<font> 006C;;;;N;;;;;
-1D696;MATHEMATICAL MONOSPACE SMALL M;Ll;0;L;<font> 006D;;;;N;;;;;
-1D697;MATHEMATICAL MONOSPACE SMALL N;Ll;0;L;<font> 006E;;;;N;;;;;
-1D698;MATHEMATICAL MONOSPACE SMALL O;Ll;0;L;<font> 006F;;;;N;;;;;
-1D699;MATHEMATICAL MONOSPACE SMALL P;Ll;0;L;<font> 0070;;;;N;;;;;
-1D69A;MATHEMATICAL MONOSPACE SMALL Q;Ll;0;L;<font> 0071;;;;N;;;;;
-1D69B;MATHEMATICAL MONOSPACE SMALL R;Ll;0;L;<font> 0072;;;;N;;;;;
-1D69C;MATHEMATICAL MONOSPACE SMALL S;Ll;0;L;<font> 0073;;;;N;;;;;
-1D69D;MATHEMATICAL MONOSPACE SMALL T;Ll;0;L;<font> 0074;;;;N;;;;;
-1D69E;MATHEMATICAL MONOSPACE SMALL U;Ll;0;L;<font> 0075;;;;N;;;;;
-1D69F;MATHEMATICAL MONOSPACE SMALL V;Ll;0;L;<font> 0076;;;;N;;;;;
-1D6A0;MATHEMATICAL MONOSPACE SMALL W;Ll;0;L;<font> 0077;;;;N;;;;;
-1D6A1;MATHEMATICAL MONOSPACE SMALL X;Ll;0;L;<font> 0078;;;;N;;;;;
-1D6A2;MATHEMATICAL MONOSPACE SMALL Y;Ll;0;L;<font> 0079;;;;N;;;;;
-1D6A3;MATHEMATICAL MONOSPACE SMALL Z;Ll;0;L;<font> 007A;;;;N;;;;;
-1D6A4;MATHEMATICAL ITALIC SMALL DOTLESS I;Ll;0;L;<font> 0131;;;;N;;;;;
-1D6A5;MATHEMATICAL ITALIC SMALL DOTLESS J;Ll;0;L;<font> 0237;;;;N;;;;;
-1D6A8;MATHEMATICAL BOLD CAPITAL ALPHA;Lu;0;L;<font> 0391;;;;N;;;;;
-1D6A9;MATHEMATICAL BOLD CAPITAL BETA;Lu;0;L;<font> 0392;;;;N;;;;;
-1D6AA;MATHEMATICAL BOLD CAPITAL GAMMA;Lu;0;L;<font> 0393;;;;N;;;;;
-1D6AB;MATHEMATICAL BOLD CAPITAL DELTA;Lu;0;L;<font> 0394;;;;N;;;;;
-1D6AC;MATHEMATICAL BOLD CAPITAL EPSILON;Lu;0;L;<font> 0395;;;;N;;;;;
-1D6AD;MATHEMATICAL BOLD CAPITAL ZETA;Lu;0;L;<font> 0396;;;;N;;;;;
-1D6AE;MATHEMATICAL BOLD CAPITAL ETA;Lu;0;L;<font> 0397;;;;N;;;;;
-1D6AF;MATHEMATICAL BOLD CAPITAL THETA;Lu;0;L;<font> 0398;;;;N;;;;;
-1D6B0;MATHEMATICAL BOLD CAPITAL IOTA;Lu;0;L;<font> 0399;;;;N;;;;;
-1D6B1;MATHEMATICAL BOLD CAPITAL KAPPA;Lu;0;L;<font> 039A;;;;N;;;;;
-1D6B2;MATHEMATICAL BOLD CAPITAL LAMDA;Lu;0;L;<font> 039B;;;;N;;;;;
-1D6B3;MATHEMATICAL BOLD CAPITAL MU;Lu;0;L;<font> 039C;;;;N;;;;;
-1D6B4;MATHEMATICAL BOLD CAPITAL NU;Lu;0;L;<font> 039D;;;;N;;;;;
-1D6B5;MATHEMATICAL BOLD CAPITAL XI;Lu;0;L;<font> 039E;;;;N;;;;;
-1D6B6;MATHEMATICAL BOLD CAPITAL OMICRON;Lu;0;L;<font> 039F;;;;N;;;;;
-1D6B7;MATHEMATICAL BOLD CAPITAL PI;Lu;0;L;<font> 03A0;;;;N;;;;;
-1D6B8;MATHEMATICAL BOLD CAPITAL RHO;Lu;0;L;<font> 03A1;;;;N;;;;;
-1D6B9;MATHEMATICAL BOLD CAPITAL THETA SYMBOL;Lu;0;L;<font> 03F4;;;;N;;;;;
-1D6BA;MATHEMATICAL BOLD CAPITAL SIGMA;Lu;0;L;<font> 03A3;;;;N;;;;;
-1D6BB;MATHEMATICAL BOLD CAPITAL TAU;Lu;0;L;<font> 03A4;;;;N;;;;;
-1D6BC;MATHEMATICAL BOLD CAPITAL UPSILON;Lu;0;L;<font> 03A5;;;;N;;;;;
-1D6BD;MATHEMATICAL BOLD CAPITAL PHI;Lu;0;L;<font> 03A6;;;;N;;;;;
-1D6BE;MATHEMATICAL BOLD CAPITAL CHI;Lu;0;L;<font> 03A7;;;;N;;;;;
-1D6BF;MATHEMATICAL BOLD CAPITAL PSI;Lu;0;L;<font> 03A8;;;;N;;;;;
-1D6C0;MATHEMATICAL BOLD CAPITAL OMEGA;Lu;0;L;<font> 03A9;;;;N;;;;;
-1D6C1;MATHEMATICAL BOLD NABLA;Sm;0;L;<font> 2207;;;;N;;;;;
-1D6C2;MATHEMATICAL BOLD SMALL ALPHA;Ll;0;L;<font> 03B1;;;;N;;;;;
-1D6C3;MATHEMATICAL BOLD SMALL BETA;Ll;0;L;<font> 03B2;;;;N;;;;;
-1D6C4;MATHEMATICAL BOLD SMALL GAMMA;Ll;0;L;<font> 03B3;;;;N;;;;;
-1D6C5;MATHEMATICAL BOLD SMALL DELTA;Ll;0;L;<font> 03B4;;;;N;;;;;
-1D6C6;MATHEMATICAL BOLD SMALL EPSILON;Ll;0;L;<font> 03B5;;;;N;;;;;
-1D6C7;MATHEMATICAL BOLD SMALL ZETA;Ll;0;L;<font> 03B6;;;;N;;;;;
-1D6C8;MATHEMATICAL BOLD SMALL ETA;Ll;0;L;<font> 03B7;;;;N;;;;;
-1D6C9;MATHEMATICAL BOLD SMALL THETA;Ll;0;L;<font> 03B8;;;;N;;;;;
-1D6CA;MATHEMATICAL BOLD SMALL IOTA;Ll;0;L;<font> 03B9;;;;N;;;;;
-1D6CB;MATHEMATICAL BOLD SMALL KAPPA;Ll;0;L;<font> 03BA;;;;N;;;;;
-1D6CC;MATHEMATICAL BOLD SMALL LAMDA;Ll;0;L;<font> 03BB;;;;N;;;;;
-1D6CD;MATHEMATICAL BOLD SMALL MU;Ll;0;L;<font> 03BC;;;;N;;;;;
-1D6CE;MATHEMATICAL BOLD SMALL NU;Ll;0;L;<font> 03BD;;;;N;;;;;
-1D6CF;MATHEMATICAL BOLD SMALL XI;Ll;0;L;<font> 03BE;;;;N;;;;;
-1D6D0;MATHEMATICAL BOLD SMALL OMICRON;Ll;0;L;<font> 03BF;;;;N;;;;;
-1D6D1;MATHEMATICAL BOLD SMALL PI;Ll;0;L;<font> 03C0;;;;N;;;;;
-1D6D2;MATHEMATICAL BOLD SMALL RHO;Ll;0;L;<font> 03C1;;;;N;;;;;
-1D6D3;MATHEMATICAL BOLD SMALL FINAL SIGMA;Ll;0;L;<font> 03C2;;;;N;;;;;
-1D6D4;MATHEMATICAL BOLD SMALL SIGMA;Ll;0;L;<font> 03C3;;;;N;;;;;
-1D6D5;MATHEMATICAL BOLD SMALL TAU;Ll;0;L;<font> 03C4;;;;N;;;;;
-1D6D6;MATHEMATICAL BOLD SMALL UPSILON;Ll;0;L;<font> 03C5;;;;N;;;;;
-1D6D7;MATHEMATICAL BOLD SMALL PHI;Ll;0;L;<font> 03C6;;;;N;;;;;
-1D6D8;MATHEMATICAL BOLD SMALL CHI;Ll;0;L;<font> 03C7;;;;N;;;;;
-1D6D9;MATHEMATICAL BOLD SMALL PSI;Ll;0;L;<font> 03C8;;;;N;;;;;
-1D6DA;MATHEMATICAL BOLD SMALL OMEGA;Ll;0;L;<font> 03C9;;;;N;;;;;
-1D6DB;MATHEMATICAL BOLD PARTIAL DIFFERENTIAL;Sm;0;L;<font> 2202;;;;Y;;;;;
-1D6DC;MATHEMATICAL BOLD EPSILON SYMBOL;Ll;0;L;<font> 03F5;;;;N;;;;;
-1D6DD;MATHEMATICAL BOLD THETA SYMBOL;Ll;0;L;<font> 03D1;;;;N;;;;;
-1D6DE;MATHEMATICAL BOLD KAPPA SYMBOL;Ll;0;L;<font> 03F0;;;;N;;;;;
-1D6DF;MATHEMATICAL BOLD PHI SYMBOL;Ll;0;L;<font> 03D5;;;;N;;;;;
-1D6E0;MATHEMATICAL BOLD RHO SYMBOL;Ll;0;L;<font> 03F1;;;;N;;;;;
-1D6E1;MATHEMATICAL BOLD PI SYMBOL;Ll;0;L;<font> 03D6;;;;N;;;;;
-1D6E2;MATHEMATICAL ITALIC CAPITAL ALPHA;Lu;0;L;<font> 0391;;;;N;;;;;
-1D6E3;MATHEMATICAL ITALIC CAPITAL BETA;Lu;0;L;<font> 0392;;;;N;;;;;
-1D6E4;MATHEMATICAL ITALIC CAPITAL GAMMA;Lu;0;L;<font> 0393;;;;N;;;;;
-1D6E5;MATHEMATICAL ITALIC CAPITAL DELTA;Lu;0;L;<font> 0394;;;;N;;;;;
-1D6E6;MATHEMATICAL ITALIC CAPITAL EPSILON;Lu;0;L;<font> 0395;;;;N;;;;;
-1D6E7;MATHEMATICAL ITALIC CAPITAL ZETA;Lu;0;L;<font> 0396;;;;N;;;;;
-1D6E8;MATHEMATICAL ITALIC CAPITAL ETA;Lu;0;L;<font> 0397;;;;N;;;;;
-1D6E9;MATHEMATICAL ITALIC CAPITAL THETA;Lu;0;L;<font> 0398;;;;N;;;;;
-1D6EA;MATHEMATICAL ITALIC CAPITAL IOTA;Lu;0;L;<font> 0399;;;;N;;;;;
-1D6EB;MATHEMATICAL ITALIC CAPITAL KAPPA;Lu;0;L;<font> 039A;;;;N;;;;;
-1D6EC;MATHEMATICAL ITALIC CAPITAL LAMDA;Lu;0;L;<font> 039B;;;;N;;;;;
-1D6ED;MATHEMATICAL ITALIC CAPITAL MU;Lu;0;L;<font> 039C;;;;N;;;;;
-1D6EE;MATHEMATICAL ITALIC CAPITAL NU;Lu;0;L;<font> 039D;;;;N;;;;;
-1D6EF;MATHEMATICAL ITALIC CAPITAL XI;Lu;0;L;<font> 039E;;;;N;;;;;
-1D6F0;MATHEMATICAL ITALIC CAPITAL OMICRON;Lu;0;L;<font> 039F;;;;N;;;;;
-1D6F1;MATHEMATICAL ITALIC CAPITAL PI;Lu;0;L;<font> 03A0;;;;N;;;;;
-1D6F2;MATHEMATICAL ITALIC CAPITAL RHO;Lu;0;L;<font> 03A1;;;;N;;;;;
-1D6F3;MATHEMATICAL ITALIC CAPITAL THETA SYMBOL;Lu;0;L;<font> 03F4;;;;N;;;;;
-1D6F4;MATHEMATICAL ITALIC CAPITAL SIGMA;Lu;0;L;<font> 03A3;;;;N;;;;;
-1D6F5;MATHEMATICAL ITALIC CAPITAL TAU;Lu;0;L;<font> 03A4;;;;N;;;;;
-1D6F6;MATHEMATICAL ITALIC CAPITAL UPSILON;Lu;0;L;<font> 03A5;;;;N;;;;;
-1D6F7;MATHEMATICAL ITALIC CAPITAL PHI;Lu;0;L;<font> 03A6;;;;N;;;;;
-1D6F8;MATHEMATICAL ITALIC CAPITAL CHI;Lu;0;L;<font> 03A7;;;;N;;;;;
-1D6F9;MATHEMATICAL ITALIC CAPITAL PSI;Lu;0;L;<font> 03A8;;;;N;;;;;
-1D6FA;MATHEMATICAL ITALIC CAPITAL OMEGA;Lu;0;L;<font> 03A9;;;;N;;;;;
-1D6FB;MATHEMATICAL ITALIC NABLA;Sm;0;L;<font> 2207;;;;N;;;;;
-1D6FC;MATHEMATICAL ITALIC SMALL ALPHA;Ll;0;L;<font> 03B1;;;;N;;;;;
-1D6FD;MATHEMATICAL ITALIC SMALL BETA;Ll;0;L;<font> 03B2;;;;N;;;;;
-1D6FE;MATHEMATICAL ITALIC SMALL GAMMA;Ll;0;L;<font> 03B3;;;;N;;;;;
-1D6FF;MATHEMATICAL ITALIC SMALL DELTA;Ll;0;L;<font> 03B4;;;;N;;;;;
-1D700;MATHEMATICAL ITALIC SMALL EPSILON;Ll;0;L;<font> 03B5;;;;N;;;;;
-1D701;MATHEMATICAL ITALIC SMALL ZETA;Ll;0;L;<font> 03B6;;;;N;;;;;
-1D702;MATHEMATICAL ITALIC SMALL ETA;Ll;0;L;<font> 03B7;;;;N;;;;;
-1D703;MATHEMATICAL ITALIC SMALL THETA;Ll;0;L;<font> 03B8;;;;N;;;;;
-1D704;MATHEMATICAL ITALIC SMALL IOTA;Ll;0;L;<font> 03B9;;;;N;;;;;
-1D705;MATHEMATICAL ITALIC SMALL KAPPA;Ll;0;L;<font> 03BA;;;;N;;;;;
-1D706;MATHEMATICAL ITALIC SMALL LAMDA;Ll;0;L;<font> 03BB;;;;N;;;;;
-1D707;MATHEMATICAL ITALIC SMALL MU;Ll;0;L;<font> 03BC;;;;N;;;;;
-1D708;MATHEMATICAL ITALIC SMALL NU;Ll;0;L;<font> 03BD;;;;N;;;;;
-1D709;MATHEMATICAL ITALIC SMALL XI;Ll;0;L;<font> 03BE;;;;N;;;;;
-1D70A;MATHEMATICAL ITALIC SMALL OMICRON;Ll;0;L;<font> 03BF;;;;N;;;;;
-1D70B;MATHEMATICAL ITALIC SMALL PI;Ll;0;L;<font> 03C0;;;;N;;;;;
-1D70C;MATHEMATICAL ITALIC SMALL RHO;Ll;0;L;<font> 03C1;;;;N;;;;;
-1D70D;MATHEMATICAL ITALIC SMALL FINAL SIGMA;Ll;0;L;<font> 03C2;;;;N;;;;;
-1D70E;MATHEMATICAL ITALIC SMALL SIGMA;Ll;0;L;<font> 03C3;;;;N;;;;;
-1D70F;MATHEMATICAL ITALIC SMALL TAU;Ll;0;L;<font> 03C4;;;;N;;;;;
-1D710;MATHEMATICAL ITALIC SMALL UPSILON;Ll;0;L;<font> 03C5;;;;N;;;;;
-1D711;MATHEMATICAL ITALIC SMALL PHI;Ll;0;L;<font> 03C6;;;;N;;;;;
-1D712;MATHEMATICAL ITALIC SMALL CHI;Ll;0;L;<font> 03C7;;;;N;;;;;
-1D713;MATHEMATICAL ITALIC SMALL PSI;Ll;0;L;<font> 03C8;;;;N;;;;;
-1D714;MATHEMATICAL ITALIC SMALL OMEGA;Ll;0;L;<font> 03C9;;;;N;;;;;
-1D715;MATHEMATICAL ITALIC PARTIAL DIFFERENTIAL;Sm;0;L;<font> 2202;;;;Y;;;;;
-1D716;MATHEMATICAL ITALIC EPSILON SYMBOL;Ll;0;L;<font> 03F5;;;;N;;;;;
-1D717;MATHEMATICAL ITALIC THETA SYMBOL;Ll;0;L;<font> 03D1;;;;N;;;;;
-1D718;MATHEMATICAL ITALIC KAPPA SYMBOL;Ll;0;L;<font> 03F0;;;;N;;;;;
-1D719;MATHEMATICAL ITALIC PHI SYMBOL;Ll;0;L;<font> 03D5;;;;N;;;;;
-1D71A;MATHEMATICAL ITALIC RHO SYMBOL;Ll;0;L;<font> 03F1;;;;N;;;;;
-1D71B;MATHEMATICAL ITALIC PI SYMBOL;Ll;0;L;<font> 03D6;;;;N;;;;;
-1D71C;MATHEMATICAL BOLD ITALIC CAPITAL ALPHA;Lu;0;L;<font> 0391;;;;N;;;;;
-1D71D;MATHEMATICAL BOLD ITALIC CAPITAL BETA;Lu;0;L;<font> 0392;;;;N;;;;;
-1D71E;MATHEMATICAL BOLD ITALIC CAPITAL GAMMA;Lu;0;L;<font> 0393;;;;N;;;;;
-1D71F;MATHEMATICAL BOLD ITALIC CAPITAL DELTA;Lu;0;L;<font> 0394;;;;N;;;;;
-1D720;MATHEMATICAL BOLD ITALIC CAPITAL EPSILON;Lu;0;L;<font> 0395;;;;N;;;;;
-1D721;MATHEMATICAL BOLD ITALIC CAPITAL ZETA;Lu;0;L;<font> 0396;;;;N;;;;;
-1D722;MATHEMATICAL BOLD ITALIC CAPITAL ETA;Lu;0;L;<font> 0397;;;;N;;;;;
-1D723;MATHEMATICAL BOLD ITALIC CAPITAL THETA;Lu;0;L;<font> 0398;;;;N;;;;;
-1D724;MATHEMATICAL BOLD ITALIC CAPITAL IOTA;Lu;0;L;<font> 0399;;;;N;;;;;
-1D725;MATHEMATICAL BOLD ITALIC CAPITAL KAPPA;Lu;0;L;<font> 039A;;;;N;;;;;
-1D726;MATHEMATICAL BOLD ITALIC CAPITAL LAMDA;Lu;0;L;<font> 039B;;;;N;;;;;
-1D727;MATHEMATICAL BOLD ITALIC CAPITAL MU;Lu;0;L;<font> 039C;;;;N;;;;;
-1D728;MATHEMATICAL BOLD ITALIC CAPITAL NU;Lu;0;L;<font> 039D;;;;N;;;;;
-1D729;MATHEMATICAL BOLD ITALIC CAPITAL XI;Lu;0;L;<font> 039E;;;;N;;;;;
-1D72A;MATHEMATICAL BOLD ITALIC CAPITAL OMICRON;Lu;0;L;<font> 039F;;;;N;;;;;
-1D72B;MATHEMATICAL BOLD ITALIC CAPITAL PI;Lu;0;L;<font> 03A0;;;;N;;;;;
-1D72C;MATHEMATICAL BOLD ITALIC CAPITAL RHO;Lu;0;L;<font> 03A1;;;;N;;;;;
-1D72D;MATHEMATICAL BOLD ITALIC CAPITAL THETA SYMBOL;Lu;0;L;<font> 03F4;;;;N;;;;;
-1D72E;MATHEMATICAL BOLD ITALIC CAPITAL SIGMA;Lu;0;L;<font> 03A3;;;;N;;;;;
-1D72F;MATHEMATICAL BOLD ITALIC CAPITAL TAU;Lu;0;L;<font> 03A4;;;;N;;;;;
-1D730;MATHEMATICAL BOLD ITALIC CAPITAL UPSILON;Lu;0;L;<font> 03A5;;;;N;;;;;
-1D731;MATHEMATICAL BOLD ITALIC CAPITAL PHI;Lu;0;L;<font> 03A6;;;;N;;;;;
-1D732;MATHEMATICAL BOLD ITALIC CAPITAL CHI;Lu;0;L;<font> 03A7;;;;N;;;;;
-1D733;MATHEMATICAL BOLD ITALIC CAPITAL PSI;Lu;0;L;<font> 03A8;;;;N;;;;;
-1D734;MATHEMATICAL BOLD ITALIC CAPITAL OMEGA;Lu;0;L;<font> 03A9;;;;N;;;;;
-1D735;MATHEMATICAL BOLD ITALIC NABLA;Sm;0;L;<font> 2207;;;;N;;;;;
-1D736;MATHEMATICAL BOLD ITALIC SMALL ALPHA;Ll;0;L;<font> 03B1;;;;N;;;;;
-1D737;MATHEMATICAL BOLD ITALIC SMALL BETA;Ll;0;L;<font> 03B2;;;;N;;;;;
-1D738;MATHEMATICAL BOLD ITALIC SMALL GAMMA;Ll;0;L;<font> 03B3;;;;N;;;;;
-1D739;MATHEMATICAL BOLD ITALIC SMALL DELTA;Ll;0;L;<font> 03B4;;;;N;;;;;
-1D73A;MATHEMATICAL BOLD ITALIC SMALL EPSILON;Ll;0;L;<font> 03B5;;;;N;;;;;
-1D73B;MATHEMATICAL BOLD ITALIC SMALL ZETA;Ll;0;L;<font> 03B6;;;;N;;;;;
-1D73C;MATHEMATICAL BOLD ITALIC SMALL ETA;Ll;0;L;<font> 03B7;;;;N;;;;;
-1D73D;MATHEMATICAL BOLD ITALIC SMALL THETA;Ll;0;L;<font> 03B8;;;;N;;;;;
-1D73E;MATHEMATICAL BOLD ITALIC SMALL IOTA;Ll;0;L;<font> 03B9;;;;N;;;;;
-1D73F;MATHEMATICAL BOLD ITALIC SMALL KAPPA;Ll;0;L;<font> 03BA;;;;N;;;;;
-1D740;MATHEMATICAL BOLD ITALIC SMALL LAMDA;Ll;0;L;<font> 03BB;;;;N;;;;;
-1D741;MATHEMATICAL BOLD ITALIC SMALL MU;Ll;0;L;<font> 03BC;;;;N;;;;;
-1D742;MATHEMATICAL BOLD ITALIC SMALL NU;Ll;0;L;<font> 03BD;;;;N;;;;;
-1D743;MATHEMATICAL BOLD ITALIC SMALL XI;Ll;0;L;<font> 03BE;;;;N;;;;;
-1D744;MATHEMATICAL BOLD ITALIC SMALL OMICRON;Ll;0;L;<font> 03BF;;;;N;;;;;
-1D745;MATHEMATICAL BOLD ITALIC SMALL PI;Ll;0;L;<font> 03C0;;;;N;;;;;
-1D746;MATHEMATICAL BOLD ITALIC SMALL RHO;Ll;0;L;<font> 03C1;;;;N;;;;;
-1D747;MATHEMATICAL BOLD ITALIC SMALL FINAL SIGMA;Ll;0;L;<font> 03C2;;;;N;;;;;
-1D748;MATHEMATICAL BOLD ITALIC SMALL SIGMA;Ll;0;L;<font> 03C3;;;;N;;;;;
-1D749;MATHEMATICAL BOLD ITALIC SMALL TAU;Ll;0;L;<font> 03C4;;;;N;;;;;
-1D74A;MATHEMATICAL BOLD ITALIC SMALL UPSILON;Ll;0;L;<font> 03C5;;;;N;;;;;
-1D74B;MATHEMATICAL BOLD ITALIC SMALL PHI;Ll;0;L;<font> 03C6;;;;N;;;;;
-1D74C;MATHEMATICAL BOLD ITALIC SMALL CHI;Ll;0;L;<font> 03C7;;;;N;;;;;
-1D74D;MATHEMATICAL BOLD ITALIC SMALL PSI;Ll;0;L;<font> 03C8;;;;N;;;;;
-1D74E;MATHEMATICAL BOLD ITALIC SMALL OMEGA;Ll;0;L;<font> 03C9;;;;N;;;;;
-1D74F;MATHEMATICAL BOLD ITALIC PARTIAL DIFFERENTIAL;Sm;0;L;<font> 2202;;;;Y;;;;;
-1D750;MATHEMATICAL BOLD ITALIC EPSILON SYMBOL;Ll;0;L;<font> 03F5;;;;N;;;;;
-1D751;MATHEMATICAL BOLD ITALIC THETA SYMBOL;Ll;0;L;<font> 03D1;;;;N;;;;;
-1D752;MATHEMATICAL BOLD ITALIC KAPPA SYMBOL;Ll;0;L;<font> 03F0;;;;N;;;;;
-1D753;MATHEMATICAL BOLD ITALIC PHI SYMBOL;Ll;0;L;<font> 03D5;;;;N;;;;;
-1D754;MATHEMATICAL BOLD ITALIC RHO SYMBOL;Ll;0;L;<font> 03F1;;;;N;;;;;
-1D755;MATHEMATICAL BOLD ITALIC PI SYMBOL;Ll;0;L;<font> 03D6;;;;N;;;;;
-1D756;MATHEMATICAL SANS-SERIF BOLD CAPITAL ALPHA;Lu;0;L;<font> 0391;;;;N;;;;;
-1D757;MATHEMATICAL SANS-SERIF BOLD CAPITAL BETA;Lu;0;L;<font> 0392;;;;N;;;;;
-1D758;MATHEMATICAL SANS-SERIF BOLD CAPITAL GAMMA;Lu;0;L;<font> 0393;;;;N;;;;;
-1D759;MATHEMATICAL SANS-SERIF BOLD CAPITAL DELTA;Lu;0;L;<font> 0394;;;;N;;;;;
-1D75A;MATHEMATICAL SANS-SERIF BOLD CAPITAL EPSILON;Lu;0;L;<font> 0395;;;;N;;;;;
-1D75B;MATHEMATICAL SANS-SERIF BOLD CAPITAL ZETA;Lu;0;L;<font> 0396;;;;N;;;;;
-1D75C;MATHEMATICAL SANS-SERIF BOLD CAPITAL ETA;Lu;0;L;<font> 0397;;;;N;;;;;
-1D75D;MATHEMATICAL SANS-SERIF BOLD CAPITAL THETA;Lu;0;L;<font> 0398;;;;N;;;;;
-1D75E;MATHEMATICAL SANS-SERIF BOLD CAPITAL IOTA;Lu;0;L;<font> 0399;;;;N;;;;;
-1D75F;MATHEMATICAL SANS-SERIF BOLD CAPITAL KAPPA;Lu;0;L;<font> 039A;;;;N;;;;;
-1D760;MATHEMATICAL SANS-SERIF BOLD CAPITAL LAMDA;Lu;0;L;<font> 039B;;;;N;;;;;
-1D761;MATHEMATICAL SANS-SERIF BOLD CAPITAL MU;Lu;0;L;<font> 039C;;;;N;;;;;
-1D762;MATHEMATICAL SANS-SERIF BOLD CAPITAL NU;Lu;0;L;<font> 039D;;;;N;;;;;
-1D763;MATHEMATICAL SANS-SERIF BOLD CAPITAL XI;Lu;0;L;<font> 039E;;;;N;;;;;
-1D764;MATHEMATICAL SANS-SERIF BOLD CAPITAL OMICRON;Lu;0;L;<font> 039F;;;;N;;;;;
-1D765;MATHEMATICAL SANS-SERIF BOLD CAPITAL PI;Lu;0;L;<font> 03A0;;;;N;;;;;
-1D766;MATHEMATICAL SANS-SERIF BOLD CAPITAL RHO;Lu;0;L;<font> 03A1;;;;N;;;;;
-1D767;MATHEMATICAL SANS-SERIF BOLD CAPITAL THETA SYMBOL;Lu;0;L;<font> 03F4;;;;N;;;;;
-1D768;MATHEMATICAL SANS-SERIF BOLD CAPITAL SIGMA;Lu;0;L;<font> 03A3;;;;N;;;;;
-1D769;MATHEMATICAL SANS-SERIF BOLD CAPITAL TAU;Lu;0;L;<font> 03A4;;;;N;;;;;
-1D76A;MATHEMATICAL SANS-SERIF BOLD CAPITAL UPSILON;Lu;0;L;<font> 03A5;;;;N;;;;;
-1D76B;MATHEMATICAL SANS-SERIF BOLD CAPITAL PHI;Lu;0;L;<font> 03A6;;;;N;;;;;
-1D76C;MATHEMATICAL SANS-SERIF BOLD CAPITAL CHI;Lu;0;L;<font> 03A7;;;;N;;;;;
-1D76D;MATHEMATICAL SANS-SERIF BOLD CAPITAL PSI;Lu;0;L;<font> 03A8;;;;N;;;;;
-1D76E;MATHEMATICAL SANS-SERIF BOLD CAPITAL OMEGA;Lu;0;L;<font> 03A9;;;;N;;;;;
-1D76F;MATHEMATICAL SANS-SERIF BOLD NABLA;Sm;0;L;<font> 2207;;;;N;;;;;
-1D770;MATHEMATICAL SANS-SERIF BOLD SMALL ALPHA;Ll;0;L;<font> 03B1;;;;N;;;;;
-1D771;MATHEMATICAL SANS-SERIF BOLD SMALL BETA;Ll;0;L;<font> 03B2;;;;N;;;;;
-1D772;MATHEMATICAL SANS-SERIF BOLD SMALL GAMMA;Ll;0;L;<font> 03B3;;;;N;;;;;
-1D773;MATHEMATICAL SANS-SERIF BOLD SMALL DELTA;Ll;0;L;<font> 03B4;;;;N;;;;;
-1D774;MATHEMATICAL SANS-SERIF BOLD SMALL EPSILON;Ll;0;L;<font> 03B5;;;;N;;;;;
-1D775;MATHEMATICAL SANS-SERIF BOLD SMALL ZETA;Ll;0;L;<font> 03B6;;;;N;;;;;
-1D776;MATHEMATICAL SANS-SERIF BOLD SMALL ETA;Ll;0;L;<font> 03B7;;;;N;;;;;
-1D777;MATHEMATICAL SANS-SERIF BOLD SMALL THETA;Ll;0;L;<font> 03B8;;;;N;;;;;
-1D778;MATHEMATICAL SANS-SERIF BOLD SMALL IOTA;Ll;0;L;<font> 03B9;;;;N;;;;;
-1D779;MATHEMATICAL SANS-SERIF BOLD SMALL KAPPA;Ll;0;L;<font> 03BA;;;;N;;;;;
-1D77A;MATHEMATICAL SANS-SERIF BOLD SMALL LAMDA;Ll;0;L;<font> 03BB;;;;N;;;;;
-1D77B;MATHEMATICAL SANS-SERIF BOLD SMALL MU;Ll;0;L;<font> 03BC;;;;N;;;;;
-1D77C;MATHEMATICAL SANS-SERIF BOLD SMALL NU;Ll;0;L;<font> 03BD;;;;N;;;;;
-1D77D;MATHEMATICAL SANS-SERIF BOLD SMALL XI;Ll;0;L;<font> 03BE;;;;N;;;;;
-1D77E;MATHEMATICAL SANS-SERIF BOLD SMALL OMICRON;Ll;0;L;<font> 03BF;;;;N;;;;;
-1D77F;MATHEMATICAL SANS-SERIF BOLD SMALL PI;Ll;0;L;<font> 03C0;;;;N;;;;;
-1D780;MATHEMATICAL SANS-SERIF BOLD SMALL RHO;Ll;0;L;<font> 03C1;;;;N;;;;;
-1D781;MATHEMATICAL SANS-SERIF BOLD SMALL FINAL SIGMA;Ll;0;L;<font> 03C2;;;;N;;;;;
-1D782;MATHEMATICAL SANS-SERIF BOLD SMALL SIGMA;Ll;0;L;<font> 03C3;;;;N;;;;;
-1D783;MATHEMATICAL SANS-SERIF BOLD SMALL TAU;Ll;0;L;<font> 03C4;;;;N;;;;;
-1D784;MATHEMATICAL SANS-SERIF BOLD SMALL UPSILON;Ll;0;L;<font> 03C5;;;;N;;;;;
-1D785;MATHEMATICAL SANS-SERIF BOLD SMALL PHI;Ll;0;L;<font> 03C6;;;;N;;;;;
-1D786;MATHEMATICAL SANS-SERIF BOLD SMALL CHI;Ll;0;L;<font> 03C7;;;;N;;;;;
-1D787;MATHEMATICAL SANS-SERIF BOLD SMALL PSI;Ll;0;L;<font> 03C8;;;;N;;;;;
-1D788;MATHEMATICAL SANS-SERIF BOLD SMALL OMEGA;Ll;0;L;<font> 03C9;;;;N;;;;;
-1D789;MATHEMATICAL SANS-SERIF BOLD PARTIAL DIFFERENTIAL;Sm;0;L;<font> 2202;;;;Y;;;;;
-1D78A;MATHEMATICAL SANS-SERIF BOLD EPSILON SYMBOL;Ll;0;L;<font> 03F5;;;;N;;;;;
-1D78B;MATHEMATICAL SANS-SERIF BOLD THETA SYMBOL;Ll;0;L;<font> 03D1;;;;N;;;;;
-1D78C;MATHEMATICAL SANS-SERIF BOLD KAPPA SYMBOL;Ll;0;L;<font> 03F0;;;;N;;;;;
-1D78D;MATHEMATICAL SANS-SERIF BOLD PHI SYMBOL;Ll;0;L;<font> 03D5;;;;N;;;;;
-1D78E;MATHEMATICAL SANS-SERIF BOLD RHO SYMBOL;Ll;0;L;<font> 03F1;;;;N;;;;;
-1D78F;MATHEMATICAL SANS-SERIF BOLD PI SYMBOL;Ll;0;L;<font> 03D6;;;;N;;;;;
-1D790;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL ALPHA;Lu;0;L;<font> 0391;;;;N;;;;;
-1D791;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL BETA;Lu;0;L;<font> 0392;;;;N;;;;;
-1D792;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL GAMMA;Lu;0;L;<font> 0393;;;;N;;;;;
-1D793;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL DELTA;Lu;0;L;<font> 0394;;;;N;;;;;
-1D794;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL EPSILON;Lu;0;L;<font> 0395;;;;N;;;;;
-1D795;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL ZETA;Lu;0;L;<font> 0396;;;;N;;;;;
-1D796;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL ETA;Lu;0;L;<font> 0397;;;;N;;;;;
-1D797;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL THETA;Lu;0;L;<font> 0398;;;;N;;;;;
-1D798;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL IOTA;Lu;0;L;<font> 0399;;;;N;;;;;
-1D799;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL KAPPA;Lu;0;L;<font> 039A;;;;N;;;;;
-1D79A;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL LAMDA;Lu;0;L;<font> 039B;;;;N;;;;;
-1D79B;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL MU;Lu;0;L;<font> 039C;;;;N;;;;;
-1D79C;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL NU;Lu;0;L;<font> 039D;;;;N;;;;;
-1D79D;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL XI;Lu;0;L;<font> 039E;;;;N;;;;;
-1D79E;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL OMICRON;Lu;0;L;<font> 039F;;;;N;;;;;
-1D79F;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL PI;Lu;0;L;<font> 03A0;;;;N;;;;;
-1D7A0;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL RHO;Lu;0;L;<font> 03A1;;;;N;;;;;
-1D7A1;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL THETA SYMBOL;Lu;0;L;<font> 03F4;;;;N;;;;;
-1D7A2;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL SIGMA;Lu;0;L;<font> 03A3;;;;N;;;;;
-1D7A3;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL TAU;Lu;0;L;<font> 03A4;;;;N;;;;;
-1D7A4;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL UPSILON;Lu;0;L;<font> 03A5;;;;N;;;;;
-1D7A5;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL PHI;Lu;0;L;<font> 03A6;;;;N;;;;;
-1D7A6;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL CHI;Lu;0;L;<font> 03A7;;;;N;;;;;
-1D7A7;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL PSI;Lu;0;L;<font> 03A8;;;;N;;;;;
-1D7A8;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL OMEGA;Lu;0;L;<font> 03A9;;;;N;;;;;
-1D7A9;MATHEMATICAL SANS-SERIF BOLD ITALIC NABLA;Sm;0;L;<font> 2207;;;;N;;;;;
-1D7AA;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL ALPHA;Ll;0;L;<font> 03B1;;;;N;;;;;
-1D7AB;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL BETA;Ll;0;L;<font> 03B2;;;;N;;;;;
-1D7AC;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL GAMMA;Ll;0;L;<font> 03B3;;;;N;;;;;
-1D7AD;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL DELTA;Ll;0;L;<font> 03B4;;;;N;;;;;
-1D7AE;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL EPSILON;Ll;0;L;<font> 03B5;;;;N;;;;;
-1D7AF;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL ZETA;Ll;0;L;<font> 03B6;;;;N;;;;;
-1D7B0;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL ETA;Ll;0;L;<font> 03B7;;;;N;;;;;
-1D7B1;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL THETA;Ll;0;L;<font> 03B8;;;;N;;;;;
-1D7B2;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL IOTA;Ll;0;L;<font> 03B9;;;;N;;;;;
-1D7B3;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL KAPPA;Ll;0;L;<font> 03BA;;;;N;;;;;
-1D7B4;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL LAMDA;Ll;0;L;<font> 03BB;;;;N;;;;;
-1D7B5;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL MU;Ll;0;L;<font> 03BC;;;;N;;;;;
-1D7B6;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL NU;Ll;0;L;<font> 03BD;;;;N;;;;;
-1D7B7;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL XI;Ll;0;L;<font> 03BE;;;;N;;;;;
-1D7B8;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL OMICRON;Ll;0;L;<font> 03BF;;;;N;;;;;
-1D7B9;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL PI;Ll;0;L;<font> 03C0;;;;N;;;;;
-1D7BA;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL RHO;Ll;0;L;<font> 03C1;;;;N;;;;;
-1D7BB;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL FINAL SIGMA;Ll;0;L;<font> 03C2;;;;N;;;;;
-1D7BC;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL SIGMA;Ll;0;L;<font> 03C3;;;;N;;;;;
-1D7BD;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL TAU;Ll;0;L;<font> 03C4;;;;N;;;;;
-1D7BE;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL UPSILON;Ll;0;L;<font> 03C5;;;;N;;;;;
-1D7BF;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL PHI;Ll;0;L;<font> 03C6;;;;N;;;;;
-1D7C0;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL CHI;Ll;0;L;<font> 03C7;;;;N;;;;;
-1D7C1;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL PSI;Ll;0;L;<font> 03C8;;;;N;;;;;
-1D7C2;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL OMEGA;Ll;0;L;<font> 03C9;;;;N;;;;;
-1D7C3;MATHEMATICAL SANS-SERIF BOLD ITALIC PARTIAL DIFFERENTIAL;Sm;0;L;<font> 2202;;;;Y;;;;;
-1D7C4;MATHEMATICAL SANS-SERIF BOLD ITALIC EPSILON SYMBOL;Ll;0;L;<font> 03F5;;;;N;;;;;
-1D7C5;MATHEMATICAL SANS-SERIF BOLD ITALIC THETA SYMBOL;Ll;0;L;<font> 03D1;;;;N;;;;;
-1D7C6;MATHEMATICAL SANS-SERIF BOLD ITALIC KAPPA SYMBOL;Ll;0;L;<font> 03F0;;;;N;;;;;
-1D7C7;MATHEMATICAL SANS-SERIF BOLD ITALIC PHI SYMBOL;Ll;0;L;<font> 03D5;;;;N;;;;;
-1D7C8;MATHEMATICAL SANS-SERIF BOLD ITALIC RHO SYMBOL;Ll;0;L;<font> 03F1;;;;N;;;;;
-1D7C9;MATHEMATICAL SANS-SERIF BOLD ITALIC PI SYMBOL;Ll;0;L;<font> 03D6;;;;N;;;;;
-1D7CA;MATHEMATICAL BOLD CAPITAL DIGAMMA;Lu;0;L;<font> 03DC;;;;N;;;;;
-1D7CB;MATHEMATICAL BOLD SMALL DIGAMMA;Ll;0;L;<font> 03DD;;;;N;;;;;
-1D7CE;MATHEMATICAL BOLD DIGIT ZERO;Nd;0;EN;<font> 0030;0;0;0;N;;;;;
-1D7CF;MATHEMATICAL BOLD DIGIT ONE;Nd;0;EN;<font> 0031;1;1;1;N;;;;;
-1D7D0;MATHEMATICAL BOLD DIGIT TWO;Nd;0;EN;<font> 0032;2;2;2;N;;;;;
-1D7D1;MATHEMATICAL BOLD DIGIT THREE;Nd;0;EN;<font> 0033;3;3;3;N;;;;;
-1D7D2;MATHEMATICAL BOLD DIGIT FOUR;Nd;0;EN;<font> 0034;4;4;4;N;;;;;
-1D7D3;MATHEMATICAL BOLD DIGIT FIVE;Nd;0;EN;<font> 0035;5;5;5;N;;;;;
-1D7D4;MATHEMATICAL BOLD DIGIT SIX;Nd;0;EN;<font> 0036;6;6;6;N;;;;;
-1D7D5;MATHEMATICAL BOLD DIGIT SEVEN;Nd;0;EN;<font> 0037;7;7;7;N;;;;;
-1D7D6;MATHEMATICAL BOLD DIGIT EIGHT;Nd;0;EN;<font> 0038;8;8;8;N;;;;;
-1D7D7;MATHEMATICAL BOLD DIGIT NINE;Nd;0;EN;<font> 0039;9;9;9;N;;;;;
-1D7D8;MATHEMATICAL DOUBLE-STRUCK DIGIT ZERO;Nd;0;EN;<font> 0030;0;0;0;N;;;;;
-1D7D9;MATHEMATICAL DOUBLE-STRUCK DIGIT ONE;Nd;0;EN;<font> 0031;1;1;1;N;;;;;
-1D7DA;MATHEMATICAL DOUBLE-STRUCK DIGIT TWO;Nd;0;EN;<font> 0032;2;2;2;N;;;;;
-1D7DB;MATHEMATICAL DOUBLE-STRUCK DIGIT THREE;Nd;0;EN;<font> 0033;3;3;3;N;;;;;
-1D7DC;MATHEMATICAL DOUBLE-STRUCK DIGIT FOUR;Nd;0;EN;<font> 0034;4;4;4;N;;;;;
-1D7DD;MATHEMATICAL DOUBLE-STRUCK DIGIT FIVE;Nd;0;EN;<font> 0035;5;5;5;N;;;;;
-1D7DE;MATHEMATICAL DOUBLE-STRUCK DIGIT SIX;Nd;0;EN;<font> 0036;6;6;6;N;;;;;
-1D7DF;MATHEMATICAL DOUBLE-STRUCK DIGIT SEVEN;Nd;0;EN;<font> 0037;7;7;7;N;;;;;
-1D7E0;MATHEMATICAL DOUBLE-STRUCK DIGIT EIGHT;Nd;0;EN;<font> 0038;8;8;8;N;;;;;
-1D7E1;MATHEMATICAL DOUBLE-STRUCK DIGIT NINE;Nd;0;EN;<font> 0039;9;9;9;N;;;;;
-1D7E2;MATHEMATICAL SANS-SERIF DIGIT ZERO;Nd;0;EN;<font> 0030;0;0;0;N;;;;;
-1D7E3;MATHEMATICAL SANS-SERIF DIGIT ONE;Nd;0;EN;<font> 0031;1;1;1;N;;;;;
-1D7E4;MATHEMATICAL SANS-SERIF DIGIT TWO;Nd;0;EN;<font> 0032;2;2;2;N;;;;;
-1D7E5;MATHEMATICAL SANS-SERIF DIGIT THREE;Nd;0;EN;<font> 0033;3;3;3;N;;;;;
-1D7E6;MATHEMATICAL SANS-SERIF DIGIT FOUR;Nd;0;EN;<font> 0034;4;4;4;N;;;;;
-1D7E7;MATHEMATICAL SANS-SERIF DIGIT FIVE;Nd;0;EN;<font> 0035;5;5;5;N;;;;;
-1D7E8;MATHEMATICAL SANS-SERIF DIGIT SIX;Nd;0;EN;<font> 0036;6;6;6;N;;;;;
-1D7E9;MATHEMATICAL SANS-SERIF DIGIT SEVEN;Nd;0;EN;<font> 0037;7;7;7;N;;;;;
-1D7EA;MATHEMATICAL SANS-SERIF DIGIT EIGHT;Nd;0;EN;<font> 0038;8;8;8;N;;;;;
-1D7EB;MATHEMATICAL SANS-SERIF DIGIT NINE;Nd;0;EN;<font> 0039;9;9;9;N;;;;;
-1D7EC;MATHEMATICAL SANS-SERIF BOLD DIGIT ZERO;Nd;0;EN;<font> 0030;0;0;0;N;;;;;
-1D7ED;MATHEMATICAL SANS-SERIF BOLD DIGIT ONE;Nd;0;EN;<font> 0031;1;1;1;N;;;;;
-1D7EE;MATHEMATICAL SANS-SERIF BOLD DIGIT TWO;Nd;0;EN;<font> 0032;2;2;2;N;;;;;
-1D7EF;MATHEMATICAL SANS-SERIF BOLD DIGIT THREE;Nd;0;EN;<font> 0033;3;3;3;N;;;;;
-1D7F0;MATHEMATICAL SANS-SERIF BOLD DIGIT FOUR;Nd;0;EN;<font> 0034;4;4;4;N;;;;;
-1D7F1;MATHEMATICAL SANS-SERIF BOLD DIGIT FIVE;Nd;0;EN;<font> 0035;5;5;5;N;;;;;
-1D7F2;MATHEMATICAL SANS-SERIF BOLD DIGIT SIX;Nd;0;EN;<font> 0036;6;6;6;N;;;;;
-1D7F3;MATHEMATICAL SANS-SERIF BOLD DIGIT SEVEN;Nd;0;EN;<font> 0037;7;7;7;N;;;;;
-1D7F4;MATHEMATICAL SANS-SERIF BOLD DIGIT EIGHT;Nd;0;EN;<font> 0038;8;8;8;N;;;;;
-1D7F5;MATHEMATICAL SANS-SERIF BOLD DIGIT NINE;Nd;0;EN;<font> 0039;9;9;9;N;;;;;
-1D7F6;MATHEMATICAL MONOSPACE DIGIT ZERO;Nd;0;EN;<font> 0030;0;0;0;N;;;;;
-1D7F7;MATHEMATICAL MONOSPACE DIGIT ONE;Nd;0;EN;<font> 0031;1;1;1;N;;;;;
-1D7F8;MATHEMATICAL MONOSPACE DIGIT TWO;Nd;0;EN;<font> 0032;2;2;2;N;;;;;
-1D7F9;MATHEMATICAL MONOSPACE DIGIT THREE;Nd;0;EN;<font> 0033;3;3;3;N;;;;;
-1D7FA;MATHEMATICAL MONOSPACE DIGIT FOUR;Nd;0;EN;<font> 0034;4;4;4;N;;;;;
-1D7FB;MATHEMATICAL MONOSPACE DIGIT FIVE;Nd;0;EN;<font> 0035;5;5;5;N;;;;;
-1D7FC;MATHEMATICAL MONOSPACE DIGIT SIX;Nd;0;EN;<font> 0036;6;6;6;N;;;;;
-1D7FD;MATHEMATICAL MONOSPACE DIGIT SEVEN;Nd;0;EN;<font> 0037;7;7;7;N;;;;;
-1D7FE;MATHEMATICAL MONOSPACE DIGIT EIGHT;Nd;0;EN;<font> 0038;8;8;8;N;;;;;
-1D7FF;MATHEMATICAL MONOSPACE DIGIT NINE;Nd;0;EN;<font> 0039;9;9;9;N;;;;;
-1F000;MAHJONG TILE EAST WIND;So;0;ON;;;;;N;;;;;
-1F001;MAHJONG TILE SOUTH WIND;So;0;ON;;;;;N;;;;;
-1F002;MAHJONG TILE WEST WIND;So;0;ON;;;;;N;;;;;
-1F003;MAHJONG TILE NORTH WIND;So;0;ON;;;;;N;;;;;
-1F004;MAHJONG TILE RED DRAGON;So;0;ON;;;;;N;;;;;
-1F005;MAHJONG TILE GREEN DRAGON;So;0;ON;;;;;N;;;;;
-1F006;MAHJONG TILE WHITE DRAGON;So;0;ON;;;;;N;;;;;
-1F007;MAHJONG TILE ONE OF CHARACTERS;So;0;ON;;;;;N;;;;;
-1F008;MAHJONG TILE TWO OF CHARACTERS;So;0;ON;;;;;N;;;;;
-1F009;MAHJONG TILE THREE OF CHARACTERS;So;0;ON;;;;;N;;;;;
-1F00A;MAHJONG TILE FOUR OF CHARACTERS;So;0;ON;;;;;N;;;;;
-1F00B;MAHJONG TILE FIVE OF CHARACTERS;So;0;ON;;;;;N;;;;;
-1F00C;MAHJONG TILE SIX OF CHARACTERS;So;0;ON;;;;;N;;;;;
-1F00D;MAHJONG TILE SEVEN OF CHARACTERS;So;0;ON;;;;;N;;;;;
-1F00E;MAHJONG TILE EIGHT OF CHARACTERS;So;0;ON;;;;;N;;;;;
-1F00F;MAHJONG TILE NINE OF CHARACTERS;So;0;ON;;;;;N;;;;;
-1F010;MAHJONG TILE ONE OF BAMBOOS;So;0;ON;;;;;N;;;;;
-1F011;MAHJONG TILE TWO OF BAMBOOS;So;0;ON;;;;;N;;;;;
-1F012;MAHJONG TILE THREE OF BAMBOOS;So;0;ON;;;;;N;;;;;
-1F013;MAHJONG TILE FOUR OF BAMBOOS;So;0;ON;;;;;N;;;;;
-1F014;MAHJONG TILE FIVE OF BAMBOOS;So;0;ON;;;;;N;;;;;
-1F015;MAHJONG TILE SIX OF BAMBOOS;So;0;ON;;;;;N;;;;;
-1F016;MAHJONG TILE SEVEN OF BAMBOOS;So;0;ON;;;;;N;;;;;
-1F017;MAHJONG TILE EIGHT OF BAMBOOS;So;0;ON;;;;;N;;;;;
-1F018;MAHJONG TILE NINE OF BAMBOOS;So;0;ON;;;;;N;;;;;
-1F019;MAHJONG TILE ONE OF CIRCLES;So;0;ON;;;;;N;;;;;
-1F01A;MAHJONG TILE TWO OF CIRCLES;So;0;ON;;;;;N;;;;;
-1F01B;MAHJONG TILE THREE OF CIRCLES;So;0;ON;;;;;N;;;;;
-1F01C;MAHJONG TILE FOUR OF CIRCLES;So;0;ON;;;;;N;;;;;
-1F01D;MAHJONG TILE FIVE OF CIRCLES;So;0;ON;;;;;N;;;;;
-1F01E;MAHJONG TILE SIX OF CIRCLES;So;0;ON;;;;;N;;;;;
-1F01F;MAHJONG TILE SEVEN OF CIRCLES;So;0;ON;;;;;N;;;;;
-1F020;MAHJONG TILE EIGHT OF CIRCLES;So;0;ON;;;;;N;;;;;
-1F021;MAHJONG TILE NINE OF CIRCLES;So;0;ON;;;;;N;;;;;
-1F022;MAHJONG TILE PLUM;So;0;ON;;;;;N;;;;;
-1F023;MAHJONG TILE ORCHID;So;0;ON;;;;;N;;;;;
-1F024;MAHJONG TILE BAMBOO;So;0;ON;;;;;N;;;;;
-1F025;MAHJONG TILE CHRYSANTHEMUM;So;0;ON;;;;;N;;;;;
-1F026;MAHJONG TILE SPRING;So;0;ON;;;;;N;;;;;
-1F027;MAHJONG TILE SUMMER;So;0;ON;;;;;N;;;;;
-1F028;MAHJONG TILE AUTUMN;So;0;ON;;;;;N;;;;;
-1F029;MAHJONG TILE WINTER;So;0;ON;;;;;N;;;;;
-1F02A;MAHJONG TILE JOKER;So;0;ON;;;;;N;;;;;
-1F02B;MAHJONG TILE BACK;So;0;ON;;;;;N;;;;;
-1F030;DOMINO TILE HORIZONTAL BACK;So;0;ON;;;;;N;;;;;
-1F031;DOMINO TILE HORIZONTAL-00-00;So;0;ON;;;;;N;;;;;
-1F032;DOMINO TILE HORIZONTAL-00-01;So;0;ON;;;;;N;;;;;
-1F033;DOMINO TILE HORIZONTAL-00-02;So;0;ON;;;;;N;;;;;
-1F034;DOMINO TILE HORIZONTAL-00-03;So;0;ON;;;;;N;;;;;
-1F035;DOMINO TILE HORIZONTAL-00-04;So;0;ON;;;;;N;;;;;
-1F036;DOMINO TILE HORIZONTAL-00-05;So;0;ON;;;;;N;;;;;
-1F037;DOMINO TILE HORIZONTAL-00-06;So;0;ON;;;;;N;;;;;
-1F038;DOMINO TILE HORIZONTAL-01-00;So;0;ON;;;;;N;;;;;
-1F039;DOMINO TILE HORIZONTAL-01-01;So;0;ON;;;;;N;;;;;
-1F03A;DOMINO TILE HORIZONTAL-01-02;So;0;ON;;;;;N;;;;;
-1F03B;DOMINO TILE HORIZONTAL-01-03;So;0;ON;;;;;N;;;;;
-1F03C;DOMINO TILE HORIZONTAL-01-04;So;0;ON;;;;;N;;;;;
-1F03D;DOMINO TILE HORIZONTAL-01-05;So;0;ON;;;;;N;;;;;
-1F03E;DOMINO TILE HORIZONTAL-01-06;So;0;ON;;;;;N;;;;;
-1F03F;DOMINO TILE HORIZONTAL-02-00;So;0;ON;;;;;N;;;;;
-1F040;DOMINO TILE HORIZONTAL-02-01;So;0;ON;;;;;N;;;;;
-1F041;DOMINO TILE HORIZONTAL-02-02;So;0;ON;;;;;N;;;;;
-1F042;DOMINO TILE HORIZONTAL-02-03;So;0;ON;;;;;N;;;;;
-1F043;DOMINO TILE HORIZONTAL-02-04;So;0;ON;;;;;N;;;;;
-1F044;DOMINO TILE HORIZONTAL-02-05;So;0;ON;;;;;N;;;;;
-1F045;DOMINO TILE HORIZONTAL-02-06;So;0;ON;;;;;N;;;;;
-1F046;DOMINO TILE HORIZONTAL-03-00;So;0;ON;;;;;N;;;;;
-1F047;DOMINO TILE HORIZONTAL-03-01;So;0;ON;;;;;N;;;;;
-1F048;DOMINO TILE HORIZONTAL-03-02;So;0;ON;;;;;N;;;;;
-1F049;DOMINO TILE HORIZONTAL-03-03;So;0;ON;;;;;N;;;;;
-1F04A;DOMINO TILE HORIZONTAL-03-04;So;0;ON;;;;;N;;;;;
-1F04B;DOMINO TILE HORIZONTAL-03-05;So;0;ON;;;;;N;;;;;
-1F04C;DOMINO TILE HORIZONTAL-03-06;So;0;ON;;;;;N;;;;;
-1F04D;DOMINO TILE HORIZONTAL-04-00;So;0;ON;;;;;N;;;;;
-1F04E;DOMINO TILE HORIZONTAL-04-01;So;0;ON;;;;;N;;;;;
-1F04F;DOMINO TILE HORIZONTAL-04-02;So;0;ON;;;;;N;;;;;
-1F050;DOMINO TILE HORIZONTAL-04-03;So;0;ON;;;;;N;;;;;
-1F051;DOMINO TILE HORIZONTAL-04-04;So;0;ON;;;;;N;;;;;
-1F052;DOMINO TILE HORIZONTAL-04-05;So;0;ON;;;;;N;;;;;
-1F053;DOMINO TILE HORIZONTAL-04-06;So;0;ON;;;;;N;;;;;
-1F054;DOMINO TILE HORIZONTAL-05-00;So;0;ON;;;;;N;;;;;
-1F055;DOMINO TILE HORIZONTAL-05-01;So;0;ON;;;;;N;;;;;
-1F056;DOMINO TILE HORIZONTAL-05-02;So;0;ON;;;;;N;;;;;
-1F057;DOMINO TILE HORIZONTAL-05-03;So;0;ON;;;;;N;;;;;
-1F058;DOMINO TILE HORIZONTAL-05-04;So;0;ON;;;;;N;;;;;
-1F059;DOMINO TILE HORIZONTAL-05-05;So;0;ON;;;;;N;;;;;
-1F05A;DOMINO TILE HORIZONTAL-05-06;So;0;ON;;;;;N;;;;;
-1F05B;DOMINO TILE HORIZONTAL-06-00;So;0;ON;;;;;N;;;;;
-1F05C;DOMINO TILE HORIZONTAL-06-01;So;0;ON;;;;;N;;;;;
-1F05D;DOMINO TILE HORIZONTAL-06-02;So;0;ON;;;;;N;;;;;
-1F05E;DOMINO TILE HORIZONTAL-06-03;So;0;ON;;;;;N;;;;;
-1F05F;DOMINO TILE HORIZONTAL-06-04;So;0;ON;;;;;N;;;;;
-1F060;DOMINO TILE HORIZONTAL-06-05;So;0;ON;;;;;N;;;;;
-1F061;DOMINO TILE HORIZONTAL-06-06;So;0;ON;;;;;N;;;;;
-1F062;DOMINO TILE VERTICAL BACK;So;0;ON;;;;;N;;;;;
-1F063;DOMINO TILE VERTICAL-00-00;So;0;ON;;;;;N;;;;;
-1F064;DOMINO TILE VERTICAL-00-01;So;0;ON;;;;;N;;;;;
-1F065;DOMINO TILE VERTICAL-00-02;So;0;ON;;;;;N;;;;;
-1F066;DOMINO TILE VERTICAL-00-03;So;0;ON;;;;;N;;;;;
-1F067;DOMINO TILE VERTICAL-00-04;So;0;ON;;;;;N;;;;;
-1F068;DOMINO TILE VERTICAL-00-05;So;0;ON;;;;;N;;;;;
-1F069;DOMINO TILE VERTICAL-00-06;So;0;ON;;;;;N;;;;;
-1F06A;DOMINO TILE VERTICAL-01-00;So;0;ON;;;;;N;;;;;
-1F06B;DOMINO TILE VERTICAL-01-01;So;0;ON;;;;;N;;;;;
-1F06C;DOMINO TILE VERTICAL-01-02;So;0;ON;;;;;N;;;;;
-1F06D;DOMINO TILE VERTICAL-01-03;So;0;ON;;;;;N;;;;;
-1F06E;DOMINO TILE VERTICAL-01-04;So;0;ON;;;;;N;;;;;
-1F06F;DOMINO TILE VERTICAL-01-05;So;0;ON;;;;;N;;;;;
-1F070;DOMINO TILE VERTICAL-01-06;So;0;ON;;;;;N;;;;;
-1F071;DOMINO TILE VERTICAL-02-00;So;0;ON;;;;;N;;;;;
-1F072;DOMINO TILE VERTICAL-02-01;So;0;ON;;;;;N;;;;;
-1F073;DOMINO TILE VERTICAL-02-02;So;0;ON;;;;;N;;;;;
-1F074;DOMINO TILE VERTICAL-02-03;So;0;ON;;;;;N;;;;;
-1F075;DOMINO TILE VERTICAL-02-04;So;0;ON;;;;;N;;;;;
-1F076;DOMINO TILE VERTICAL-02-05;So;0;ON;;;;;N;;;;;
-1F077;DOMINO TILE VERTICAL-02-06;So;0;ON;;;;;N;;;;;
-1F078;DOMINO TILE VERTICAL-03-00;So;0;ON;;;;;N;;;;;
-1F079;DOMINO TILE VERTICAL-03-01;So;0;ON;;;;;N;;;;;
-1F07A;DOMINO TILE VERTICAL-03-02;So;0;ON;;;;;N;;;;;
-1F07B;DOMINO TILE VERTICAL-03-03;So;0;ON;;;;;N;;;;;
-1F07C;DOMINO TILE VERTICAL-03-04;So;0;ON;;;;;N;;;;;
-1F07D;DOMINO TILE VERTICAL-03-05;So;0;ON;;;;;N;;;;;
-1F07E;DOMINO TILE VERTICAL-03-06;So;0;ON;;;;;N;;;;;
-1F07F;DOMINO TILE VERTICAL-04-00;So;0;ON;;;;;N;;;;;
-1F080;DOMINO TILE VERTICAL-04-01;So;0;ON;;;;;N;;;;;
-1F081;DOMINO TILE VERTICAL-04-02;So;0;ON;;;;;N;;;;;
-1F082;DOMINO TILE VERTICAL-04-03;So;0;ON;;;;;N;;;;;
-1F083;DOMINO TILE VERTICAL-04-04;So;0;ON;;;;;N;;;;;
-1F084;DOMINO TILE VERTICAL-04-05;So;0;ON;;;;;N;;;;;
-1F085;DOMINO TILE VERTICAL-04-06;So;0;ON;;;;;N;;;;;
-1F086;DOMINO TILE VERTICAL-05-00;So;0;ON;;;;;N;;;;;
-1F087;DOMINO TILE VERTICAL-05-01;So;0;ON;;;;;N;;;;;
-1F088;DOMINO TILE VERTICAL-05-02;So;0;ON;;;;;N;;;;;
-1F089;DOMINO TILE VERTICAL-05-03;So;0;ON;;;;;N;;;;;
-1F08A;DOMINO TILE VERTICAL-05-04;So;0;ON;;;;;N;;;;;
-1F08B;DOMINO TILE VERTICAL-05-05;So;0;ON;;;;;N;;;;;
-1F08C;DOMINO TILE VERTICAL-05-06;So;0;ON;;;;;N;;;;;
-1F08D;DOMINO TILE VERTICAL-06-00;So;0;ON;;;;;N;;;;;
-1F08E;DOMINO TILE VERTICAL-06-01;So;0;ON;;;;;N;;;;;
-1F08F;DOMINO TILE VERTICAL-06-02;So;0;ON;;;;;N;;;;;
-1F090;DOMINO TILE VERTICAL-06-03;So;0;ON;;;;;N;;;;;
-1F091;DOMINO TILE VERTICAL-06-04;So;0;ON;;;;;N;;;;;
-1F092;DOMINO TILE VERTICAL-06-05;So;0;ON;;;;;N;;;;;
-1F093;DOMINO TILE VERTICAL-06-06;So;0;ON;;;;;N;;;;;
-20000;<CJK Ideograph Extension B, First>;Lo;0;L;;;;;N;;;;;
-2A6D6;<CJK Ideograph Extension B, Last>;Lo;0;L;;;;;N;;;;;
-2F800;CJK COMPATIBILITY IDEOGRAPH-2F800;Lo;0;L;4E3D;;;;N;;;;;
-2F801;CJK COMPATIBILITY IDEOGRAPH-2F801;Lo;0;L;4E38;;;;N;;;;;
-2F802;CJK COMPATIBILITY IDEOGRAPH-2F802;Lo;0;L;4E41;;;;N;;;;;
-2F803;CJK COMPATIBILITY IDEOGRAPH-2F803;Lo;0;L;20122;;;;N;;;;;
-2F804;CJK COMPATIBILITY IDEOGRAPH-2F804;Lo;0;L;4F60;;;;N;;;;;
-2F805;CJK COMPATIBILITY IDEOGRAPH-2F805;Lo;0;L;4FAE;;;;N;;;;;
-2F806;CJK COMPATIBILITY IDEOGRAPH-2F806;Lo;0;L;4FBB;;;;N;;;;;
-2F807;CJK COMPATIBILITY IDEOGRAPH-2F807;Lo;0;L;5002;;;;N;;;;;
-2F808;CJK COMPATIBILITY IDEOGRAPH-2F808;Lo;0;L;507A;;;;N;;;;;
-2F809;CJK COMPATIBILITY IDEOGRAPH-2F809;Lo;0;L;5099;;;;N;;;;;
-2F80A;CJK COMPATIBILITY IDEOGRAPH-2F80A;Lo;0;L;50E7;;;;N;;;;;
-2F80B;CJK COMPATIBILITY IDEOGRAPH-2F80B;Lo;0;L;50CF;;;;N;;;;;
-2F80C;CJK COMPATIBILITY IDEOGRAPH-2F80C;Lo;0;L;349E;;;;N;;;;;
-2F80D;CJK COMPATIBILITY IDEOGRAPH-2F80D;Lo;0;L;2063A;;;;N;;;;;
-2F80E;CJK COMPATIBILITY IDEOGRAPH-2F80E;Lo;0;L;514D;;;;N;;;;;
-2F80F;CJK COMPATIBILITY IDEOGRAPH-2F80F;Lo;0;L;5154;;;;N;;;;;
-2F810;CJK COMPATIBILITY IDEOGRAPH-2F810;Lo;0;L;5164;;;;N;;;;;
-2F811;CJK COMPATIBILITY IDEOGRAPH-2F811;Lo;0;L;5177;;;;N;;;;;
-2F812;CJK COMPATIBILITY IDEOGRAPH-2F812;Lo;0;L;2051C;;;;N;;;;;
-2F813;CJK COMPATIBILITY IDEOGRAPH-2F813;Lo;0;L;34B9;;;;N;;;;;
-2F814;CJK COMPATIBILITY IDEOGRAPH-2F814;Lo;0;L;5167;;;;N;;;;;
-2F815;CJK COMPATIBILITY IDEOGRAPH-2F815;Lo;0;L;518D;;;;N;;;;;
-2F816;CJK COMPATIBILITY IDEOGRAPH-2F816;Lo;0;L;2054B;;;;N;;;;;
-2F817;CJK COMPATIBILITY IDEOGRAPH-2F817;Lo;0;L;5197;;;;N;;;;;
-2F818;CJK COMPATIBILITY IDEOGRAPH-2F818;Lo;0;L;51A4;;;;N;;;;;
-2F819;CJK COMPATIBILITY IDEOGRAPH-2F819;Lo;0;L;4ECC;;;;N;;;;;
-2F81A;CJK COMPATIBILITY IDEOGRAPH-2F81A;Lo;0;L;51AC;;;;N;;;;;
-2F81B;CJK COMPATIBILITY IDEOGRAPH-2F81B;Lo;0;L;51B5;;;;N;;;;;
-2F81C;CJK COMPATIBILITY IDEOGRAPH-2F81C;Lo;0;L;291DF;;;;N;;;;;
-2F81D;CJK COMPATIBILITY IDEOGRAPH-2F81D;Lo;0;L;51F5;;;;N;;;;;
-2F81E;CJK COMPATIBILITY IDEOGRAPH-2F81E;Lo;0;L;5203;;;;N;;;;;
-2F81F;CJK COMPATIBILITY IDEOGRAPH-2F81F;Lo;0;L;34DF;;;;N;;;;;
-2F820;CJK COMPATIBILITY IDEOGRAPH-2F820;Lo;0;L;523B;;;;N;;;;;
-2F821;CJK COMPATIBILITY IDEOGRAPH-2F821;Lo;0;L;5246;;;;N;;;;;
-2F822;CJK COMPATIBILITY IDEOGRAPH-2F822;Lo;0;L;5272;;;;N;;;;;
-2F823;CJK COMPATIBILITY IDEOGRAPH-2F823;Lo;0;L;5277;;;;N;;;;;
-2F824;CJK COMPATIBILITY IDEOGRAPH-2F824;Lo;0;L;3515;;;;N;;;;;
-2F825;CJK COMPATIBILITY IDEOGRAPH-2F825;Lo;0;L;52C7;;;;N;;;;;
-2F826;CJK COMPATIBILITY IDEOGRAPH-2F826;Lo;0;L;52C9;;;;N;;;;;
-2F827;CJK COMPATIBILITY IDEOGRAPH-2F827;Lo;0;L;52E4;;;;N;;;;;
-2F828;CJK COMPATIBILITY IDEOGRAPH-2F828;Lo;0;L;52FA;;;;N;;;;;
-2F829;CJK COMPATIBILITY IDEOGRAPH-2F829;Lo;0;L;5305;;;;N;;;;;
-2F82A;CJK COMPATIBILITY IDEOGRAPH-2F82A;Lo;0;L;5306;;;;N;;;;;
-2F82B;CJK COMPATIBILITY IDEOGRAPH-2F82B;Lo;0;L;5317;;;;N;;;;;
-2F82C;CJK COMPATIBILITY IDEOGRAPH-2F82C;Lo;0;L;5349;;;;N;;;;;
-2F82D;CJK COMPATIBILITY IDEOGRAPH-2F82D;Lo;0;L;5351;;;;N;;;;;
-2F82E;CJK COMPATIBILITY IDEOGRAPH-2F82E;Lo;0;L;535A;;;;N;;;;;
-2F82F;CJK COMPATIBILITY IDEOGRAPH-2F82F;Lo;0;L;5373;;;;N;;;;;
-2F830;CJK COMPATIBILITY IDEOGRAPH-2F830;Lo;0;L;537D;;;;N;;;;;
-2F831;CJK COMPATIBILITY IDEOGRAPH-2F831;Lo;0;L;537F;;;;N;;;;;
-2F832;CJK COMPATIBILITY IDEOGRAPH-2F832;Lo;0;L;537F;;;;N;;;;;
-2F833;CJK COMPATIBILITY IDEOGRAPH-2F833;Lo;0;L;537F;;;;N;;;;;
-2F834;CJK COMPATIBILITY IDEOGRAPH-2F834;Lo;0;L;20A2C;;;;N;;;;;
-2F835;CJK COMPATIBILITY IDEOGRAPH-2F835;Lo;0;L;7070;;;;N;;;;;
-2F836;CJK COMPATIBILITY IDEOGRAPH-2F836;Lo;0;L;53CA;;;;N;;;;;
-2F837;CJK COMPATIBILITY IDEOGRAPH-2F837;Lo;0;L;53DF;;;;N;;;;;
-2F838;CJK COMPATIBILITY IDEOGRAPH-2F838;Lo;0;L;20B63;;;;N;;;;;
-2F839;CJK COMPATIBILITY IDEOGRAPH-2F839;Lo;0;L;53EB;;;;N;;;;;
-2F83A;CJK COMPATIBILITY IDEOGRAPH-2F83A;Lo;0;L;53F1;;;;N;;;;;
-2F83B;CJK COMPATIBILITY IDEOGRAPH-2F83B;Lo;0;L;5406;;;;N;;;;;
-2F83C;CJK COMPATIBILITY IDEOGRAPH-2F83C;Lo;0;L;549E;;;;N;;;;;
-2F83D;CJK COMPATIBILITY IDEOGRAPH-2F83D;Lo;0;L;5438;;;;N;;;;;
-2F83E;CJK COMPATIBILITY IDEOGRAPH-2F83E;Lo;0;L;5448;;;;N;;;;;
-2F83F;CJK COMPATIBILITY IDEOGRAPH-2F83F;Lo;0;L;5468;;;;N;;;;;
-2F840;CJK COMPATIBILITY IDEOGRAPH-2F840;Lo;0;L;54A2;;;;N;;;;;
-2F841;CJK COMPATIBILITY IDEOGRAPH-2F841;Lo;0;L;54F6;;;;N;;;;;
-2F842;CJK COMPATIBILITY IDEOGRAPH-2F842;Lo;0;L;5510;;;;N;;;;;
-2F843;CJK COMPATIBILITY IDEOGRAPH-2F843;Lo;0;L;5553;;;;N;;;;;
-2F844;CJK COMPATIBILITY IDEOGRAPH-2F844;Lo;0;L;5563;;;;N;;;;;
-2F845;CJK COMPATIBILITY IDEOGRAPH-2F845;Lo;0;L;5584;;;;N;;;;;
-2F846;CJK COMPATIBILITY IDEOGRAPH-2F846;Lo;0;L;5584;;;;N;;;;;
-2F847;CJK COMPATIBILITY IDEOGRAPH-2F847;Lo;0;L;5599;;;;N;;;;;
-2F848;CJK COMPATIBILITY IDEOGRAPH-2F848;Lo;0;L;55AB;;;;N;;;;;
-2F849;CJK COMPATIBILITY IDEOGRAPH-2F849;Lo;0;L;55B3;;;;N;;;;;
-2F84A;CJK COMPATIBILITY IDEOGRAPH-2F84A;Lo;0;L;55C2;;;;N;;;;;
-2F84B;CJK COMPATIBILITY IDEOGRAPH-2F84B;Lo;0;L;5716;;;;N;;;;;
-2F84C;CJK COMPATIBILITY IDEOGRAPH-2F84C;Lo;0;L;5606;;;;N;;;;;
-2F84D;CJK COMPATIBILITY IDEOGRAPH-2F84D;Lo;0;L;5717;;;;N;;;;;
-2F84E;CJK COMPATIBILITY IDEOGRAPH-2F84E;Lo;0;L;5651;;;;N;;;;;
-2F84F;CJK COMPATIBILITY IDEOGRAPH-2F84F;Lo;0;L;5674;;;;N;;;;;
-2F850;CJK COMPATIBILITY IDEOGRAPH-2F850;Lo;0;L;5207;;;;N;;;;;
-2F851;CJK COMPATIBILITY IDEOGRAPH-2F851;Lo;0;L;58EE;;;;N;;;;;
-2F852;CJK COMPATIBILITY IDEOGRAPH-2F852;Lo;0;L;57CE;;;;N;;;;;
-2F853;CJK COMPATIBILITY IDEOGRAPH-2F853;Lo;0;L;57F4;;;;N;;;;;
-2F854;CJK COMPATIBILITY IDEOGRAPH-2F854;Lo;0;L;580D;;;;N;;;;;
-2F855;CJK COMPATIBILITY IDEOGRAPH-2F855;Lo;0;L;578B;;;;N;;;;;
-2F856;CJK COMPATIBILITY IDEOGRAPH-2F856;Lo;0;L;5832;;;;N;;;;;
-2F857;CJK COMPATIBILITY IDEOGRAPH-2F857;Lo;0;L;5831;;;;N;;;;;
-2F858;CJK COMPATIBILITY IDEOGRAPH-2F858;Lo;0;L;58AC;;;;N;;;;;
-2F859;CJK COMPATIBILITY IDEOGRAPH-2F859;Lo;0;L;214E4;;;;N;;;;;
-2F85A;CJK COMPATIBILITY IDEOGRAPH-2F85A;Lo;0;L;58F2;;;;N;;;;;
-2F85B;CJK COMPATIBILITY IDEOGRAPH-2F85B;Lo;0;L;58F7;;;;N;;;;;
-2F85C;CJK COMPATIBILITY IDEOGRAPH-2F85C;Lo;0;L;5906;;;;N;;;;;
-2F85D;CJK COMPATIBILITY IDEOGRAPH-2F85D;Lo;0;L;591A;;;;N;;;;;
-2F85E;CJK COMPATIBILITY IDEOGRAPH-2F85E;Lo;0;L;5922;;;;N;;;;;
-2F85F;CJK COMPATIBILITY IDEOGRAPH-2F85F;Lo;0;L;5962;;;;N;;;;;
-2F860;CJK COMPATIBILITY IDEOGRAPH-2F860;Lo;0;L;216A8;;;;N;;;;;
-2F861;CJK COMPATIBILITY IDEOGRAPH-2F861;Lo;0;L;216EA;;;;N;;;;;
-2F862;CJK COMPATIBILITY IDEOGRAPH-2F862;Lo;0;L;59EC;;;;N;;;;;
-2F863;CJK COMPATIBILITY IDEOGRAPH-2F863;Lo;0;L;5A1B;;;;N;;;;;
-2F864;CJK COMPATIBILITY IDEOGRAPH-2F864;Lo;0;L;5A27;;;;N;;;;;
-2F865;CJK COMPATIBILITY IDEOGRAPH-2F865;Lo;0;L;59D8;;;;N;;;;;
-2F866;CJK COMPATIBILITY IDEOGRAPH-2F866;Lo;0;L;5A66;;;;N;;;;;
-2F867;CJK COMPATIBILITY IDEOGRAPH-2F867;Lo;0;L;36EE;;;;N;;;;;
-2F868;CJK COMPATIBILITY IDEOGRAPH-2F868;Lo;0;L;36FC;;;;N;;;;;
-2F869;CJK COMPATIBILITY IDEOGRAPH-2F869;Lo;0;L;5B08;;;;N;;;;;
-2F86A;CJK COMPATIBILITY IDEOGRAPH-2F86A;Lo;0;L;5B3E;;;;N;;;;;
-2F86B;CJK COMPATIBILITY IDEOGRAPH-2F86B;Lo;0;L;5B3E;;;;N;;;;;
-2F86C;CJK COMPATIBILITY IDEOGRAPH-2F86C;Lo;0;L;219C8;;;;N;;;;;
-2F86D;CJK COMPATIBILITY IDEOGRAPH-2F86D;Lo;0;L;5BC3;;;;N;;;;;
-2F86E;CJK COMPATIBILITY IDEOGRAPH-2F86E;Lo;0;L;5BD8;;;;N;;;;;
-2F86F;CJK COMPATIBILITY IDEOGRAPH-2F86F;Lo;0;L;5BE7;;;;N;;;;;
-2F870;CJK COMPATIBILITY IDEOGRAPH-2F870;Lo;0;L;5BF3;;;;N;;;;;
-2F871;CJK COMPATIBILITY IDEOGRAPH-2F871;Lo;0;L;21B18;;;;N;;;;;
-2F872;CJK COMPATIBILITY IDEOGRAPH-2F872;Lo;0;L;5BFF;;;;N;;;;;
-2F873;CJK COMPATIBILITY IDEOGRAPH-2F873;Lo;0;L;5C06;;;;N;;;;;
-2F874;CJK COMPATIBILITY IDEOGRAPH-2F874;Lo;0;L;5F53;;;;N;;;;;
-2F875;CJK COMPATIBILITY IDEOGRAPH-2F875;Lo;0;L;5C22;;;;N;;;;;
-2F876;CJK COMPATIBILITY IDEOGRAPH-2F876;Lo;0;L;3781;;;;N;;;;;
-2F877;CJK COMPATIBILITY IDEOGRAPH-2F877;Lo;0;L;5C60;;;;N;;;;;
-2F878;CJK COMPATIBILITY IDEOGRAPH-2F878;Lo;0;L;5C6E;;;;N;;;;;
-2F879;CJK COMPATIBILITY IDEOGRAPH-2F879;Lo;0;L;5CC0;;;;N;;;;;
-2F87A;CJK COMPATIBILITY IDEOGRAPH-2F87A;Lo;0;L;5C8D;;;;N;;;;;
-2F87B;CJK COMPATIBILITY IDEOGRAPH-2F87B;Lo;0;L;21DE4;;;;N;;;;;
-2F87C;CJK COMPATIBILITY IDEOGRAPH-2F87C;Lo;0;L;5D43;;;;N;;;;;
-2F87D;CJK COMPATIBILITY IDEOGRAPH-2F87D;Lo;0;L;21DE6;;;;N;;;;;
-2F87E;CJK COMPATIBILITY IDEOGRAPH-2F87E;Lo;0;L;5D6E;;;;N;;;;;
-2F87F;CJK COMPATIBILITY IDEOGRAPH-2F87F;Lo;0;L;5D6B;;;;N;;;;;
-2F880;CJK COMPATIBILITY IDEOGRAPH-2F880;Lo;0;L;5D7C;;;;N;;;;;
-2F881;CJK COMPATIBILITY IDEOGRAPH-2F881;Lo;0;L;5DE1;;;;N;;;;;
-2F882;CJK COMPATIBILITY IDEOGRAPH-2F882;Lo;0;L;5DE2;;;;N;;;;;
-2F883;CJK COMPATIBILITY IDEOGRAPH-2F883;Lo;0;L;382F;;;;N;;;;;
-2F884;CJK COMPATIBILITY IDEOGRAPH-2F884;Lo;0;L;5DFD;;;;N;;;;;
-2F885;CJK COMPATIBILITY IDEOGRAPH-2F885;Lo;0;L;5E28;;;;N;;;;;
-2F886;CJK COMPATIBILITY IDEOGRAPH-2F886;Lo;0;L;5E3D;;;;N;;;;;
-2F887;CJK COMPATIBILITY IDEOGRAPH-2F887;Lo;0;L;5E69;;;;N;;;;;
-2F888;CJK COMPATIBILITY IDEOGRAPH-2F888;Lo;0;L;3862;;;;N;;;;;
-2F889;CJK COMPATIBILITY IDEOGRAPH-2F889;Lo;0;L;22183;;;;N;;;;;
-2F88A;CJK COMPATIBILITY IDEOGRAPH-2F88A;Lo;0;L;387C;;;;N;;;;;
-2F88B;CJK COMPATIBILITY IDEOGRAPH-2F88B;Lo;0;L;5EB0;;;;N;;;;;
-2F88C;CJK COMPATIBILITY IDEOGRAPH-2F88C;Lo;0;L;5EB3;;;;N;;;;;
-2F88D;CJK COMPATIBILITY IDEOGRAPH-2F88D;Lo;0;L;5EB6;;;;N;;;;;
-2F88E;CJK COMPATIBILITY IDEOGRAPH-2F88E;Lo;0;L;5ECA;;;;N;;;;;
-2F88F;CJK COMPATIBILITY IDEOGRAPH-2F88F;Lo;0;L;2A392;;;;N;;;;;
-2F890;CJK COMPATIBILITY IDEOGRAPH-2F890;Lo;0;L;5EFE;;;9;N;;;;;
-2F891;CJK COMPATIBILITY IDEOGRAPH-2F891;Lo;0;L;22331;;;;N;;;;;
-2F892;CJK COMPATIBILITY IDEOGRAPH-2F892;Lo;0;L;22331;;;;N;;;;;
-2F893;CJK COMPATIBILITY IDEOGRAPH-2F893;Lo;0;L;8201;;;;N;;;;;
-2F894;CJK COMPATIBILITY IDEOGRAPH-2F894;Lo;0;L;5F22;;;;N;;;;;
-2F895;CJK COMPATIBILITY IDEOGRAPH-2F895;Lo;0;L;5F22;;;;N;;;;;
-2F896;CJK COMPATIBILITY IDEOGRAPH-2F896;Lo;0;L;38C7;;;;N;;;;;
-2F897;CJK COMPATIBILITY IDEOGRAPH-2F897;Lo;0;L;232B8;;;;N;;;;;
-2F898;CJK COMPATIBILITY IDEOGRAPH-2F898;Lo;0;L;261DA;;;;N;;;;;
-2F899;CJK COMPATIBILITY IDEOGRAPH-2F899;Lo;0;L;5F62;;;;N;;;;;
-2F89A;CJK COMPATIBILITY IDEOGRAPH-2F89A;Lo;0;L;5F6B;;;;N;;;;;
-2F89B;CJK COMPATIBILITY IDEOGRAPH-2F89B;Lo;0;L;38E3;;;;N;;;;;
-2F89C;CJK COMPATIBILITY IDEOGRAPH-2F89C;Lo;0;L;5F9A;;;;N;;;;;
-2F89D;CJK COMPATIBILITY IDEOGRAPH-2F89D;Lo;0;L;5FCD;;;;N;;;;;
-2F89E;CJK COMPATIBILITY IDEOGRAPH-2F89E;Lo;0;L;5FD7;;;;N;;;;;
-2F89F;CJK COMPATIBILITY IDEOGRAPH-2F89F;Lo;0;L;5FF9;;;;N;;;;;
-2F8A0;CJK COMPATIBILITY IDEOGRAPH-2F8A0;Lo;0;L;6081;;;;N;;;;;
-2F8A1;CJK COMPATIBILITY IDEOGRAPH-2F8A1;Lo;0;L;393A;;;;N;;;;;
-2F8A2;CJK COMPATIBILITY IDEOGRAPH-2F8A2;Lo;0;L;391C;;;;N;;;;;
-2F8A3;CJK COMPATIBILITY IDEOGRAPH-2F8A3;Lo;0;L;6094;;;;N;;;;;
-2F8A4;CJK COMPATIBILITY IDEOGRAPH-2F8A4;Lo;0;L;226D4;;;;N;;;;;
-2F8A5;CJK COMPATIBILITY IDEOGRAPH-2F8A5;Lo;0;L;60C7;;;;N;;;;;
-2F8A6;CJK COMPATIBILITY IDEOGRAPH-2F8A6;Lo;0;L;6148;;;;N;;;;;
-2F8A7;CJK COMPATIBILITY IDEOGRAPH-2F8A7;Lo;0;L;614C;;;;N;;;;;
-2F8A8;CJK COMPATIBILITY IDEOGRAPH-2F8A8;Lo;0;L;614E;;;;N;;;;;
-2F8A9;CJK COMPATIBILITY IDEOGRAPH-2F8A9;Lo;0;L;614C;;;;N;;;;;
-2F8AA;CJK COMPATIBILITY IDEOGRAPH-2F8AA;Lo;0;L;617A;;;;N;;;;;
-2F8AB;CJK COMPATIBILITY IDEOGRAPH-2F8AB;Lo;0;L;618E;;;;N;;;;;
-2F8AC;CJK COMPATIBILITY IDEOGRAPH-2F8AC;Lo;0;L;61B2;;;;N;;;;;
-2F8AD;CJK COMPATIBILITY IDEOGRAPH-2F8AD;Lo;0;L;61A4;;;;N;;;;;
-2F8AE;CJK COMPATIBILITY IDEOGRAPH-2F8AE;Lo;0;L;61AF;;;;N;;;;;
-2F8AF;CJK COMPATIBILITY IDEOGRAPH-2F8AF;Lo;0;L;61DE;;;;N;;;;;
-2F8B0;CJK COMPATIBILITY IDEOGRAPH-2F8B0;Lo;0;L;61F2;;;;N;;;;;
-2F8B1;CJK COMPATIBILITY IDEOGRAPH-2F8B1;Lo;0;L;61F6;;;;N;;;;;
-2F8B2;CJK COMPATIBILITY IDEOGRAPH-2F8B2;Lo;0;L;6210;;;;N;;;;;
-2F8B3;CJK COMPATIBILITY IDEOGRAPH-2F8B3;Lo;0;L;621B;;;;N;;;;;
-2F8B4;CJK COMPATIBILITY IDEOGRAPH-2F8B4;Lo;0;L;625D;;;;N;;;;;
-2F8B5;CJK COMPATIBILITY IDEOGRAPH-2F8B5;Lo;0;L;62B1;;;;N;;;;;
-2F8B6;CJK COMPATIBILITY IDEOGRAPH-2F8B6;Lo;0;L;62D4;;;;N;;;;;
-2F8B7;CJK COMPATIBILITY IDEOGRAPH-2F8B7;Lo;0;L;6350;;;;N;;;;;
-2F8B8;CJK COMPATIBILITY IDEOGRAPH-2F8B8;Lo;0;L;22B0C;;;;N;;;;;
-2F8B9;CJK COMPATIBILITY IDEOGRAPH-2F8B9;Lo;0;L;633D;;;;N;;;;;
-2F8BA;CJK COMPATIBILITY IDEOGRAPH-2F8BA;Lo;0;L;62FC;;;;N;;;;;
-2F8BB;CJK COMPATIBILITY IDEOGRAPH-2F8BB;Lo;0;L;6368;;;;N;;;;;
-2F8BC;CJK COMPATIBILITY IDEOGRAPH-2F8BC;Lo;0;L;6383;;;;N;;;;;
-2F8BD;CJK COMPATIBILITY IDEOGRAPH-2F8BD;Lo;0;L;63E4;;;;N;;;;;
-2F8BE;CJK COMPATIBILITY IDEOGRAPH-2F8BE;Lo;0;L;22BF1;;;;N;;;;;
-2F8BF;CJK COMPATIBILITY IDEOGRAPH-2F8BF;Lo;0;L;6422;;;;N;;;;;
-2F8C0;CJK COMPATIBILITY IDEOGRAPH-2F8C0;Lo;0;L;63C5;;;;N;;;;;
-2F8C1;CJK COMPATIBILITY IDEOGRAPH-2F8C1;Lo;0;L;63A9;;;;N;;;;;
-2F8C2;CJK COMPATIBILITY IDEOGRAPH-2F8C2;Lo;0;L;3A2E;;;;N;;;;;
-2F8C3;CJK COMPATIBILITY IDEOGRAPH-2F8C3;Lo;0;L;6469;;;;N;;;;;
-2F8C4;CJK COMPATIBILITY IDEOGRAPH-2F8C4;Lo;0;L;647E;;;;N;;;;;
-2F8C5;CJK COMPATIBILITY IDEOGRAPH-2F8C5;Lo;0;L;649D;;;;N;;;;;
-2F8C6;CJK COMPATIBILITY IDEOGRAPH-2F8C6;Lo;0;L;6477;;;;N;;;;;
-2F8C7;CJK COMPATIBILITY IDEOGRAPH-2F8C7;Lo;0;L;3A6C;;;;N;;;;;
-2F8C8;CJK COMPATIBILITY IDEOGRAPH-2F8C8;Lo;0;L;654F;;;;N;;;;;
-2F8C9;CJK COMPATIBILITY IDEOGRAPH-2F8C9;Lo;0;L;656C;;;;N;;;;;
-2F8CA;CJK COMPATIBILITY IDEOGRAPH-2F8CA;Lo;0;L;2300A;;;;N;;;;;
-2F8CB;CJK COMPATIBILITY IDEOGRAPH-2F8CB;Lo;0;L;65E3;;;;N;;;;;
-2F8CC;CJK COMPATIBILITY IDEOGRAPH-2F8CC;Lo;0;L;66F8;;;;N;;;;;
-2F8CD;CJK COMPATIBILITY IDEOGRAPH-2F8CD;Lo;0;L;6649;;;;N;;;;;
-2F8CE;CJK COMPATIBILITY IDEOGRAPH-2F8CE;Lo;0;L;3B19;;;;N;;;;;
-2F8CF;CJK COMPATIBILITY IDEOGRAPH-2F8CF;Lo;0;L;6691;;;;N;;;;;
-2F8D0;CJK COMPATIBILITY IDEOGRAPH-2F8D0;Lo;0;L;3B08;;;;N;;;;;
-2F8D1;CJK COMPATIBILITY IDEOGRAPH-2F8D1;Lo;0;L;3AE4;;;;N;;;;;
-2F8D2;CJK COMPATIBILITY IDEOGRAPH-2F8D2;Lo;0;L;5192;;;;N;;;;;
-2F8D3;CJK COMPATIBILITY IDEOGRAPH-2F8D3;Lo;0;L;5195;;;;N;;;;;
-2F8D4;CJK COMPATIBILITY IDEOGRAPH-2F8D4;Lo;0;L;6700;;;;N;;;;;
-2F8D5;CJK COMPATIBILITY IDEOGRAPH-2F8D5;Lo;0;L;669C;;;;N;;;;;
-2F8D6;CJK COMPATIBILITY IDEOGRAPH-2F8D6;Lo;0;L;80AD;;;;N;;;;;
-2F8D7;CJK COMPATIBILITY IDEOGRAPH-2F8D7;Lo;0;L;43D9;;;;N;;;;;
-2F8D8;CJK COMPATIBILITY IDEOGRAPH-2F8D8;Lo;0;L;6717;;;;N;;;;;
-2F8D9;CJK COMPATIBILITY IDEOGRAPH-2F8D9;Lo;0;L;671B;;;;N;;;;;
-2F8DA;CJK COMPATIBILITY IDEOGRAPH-2F8DA;Lo;0;L;6721;;;;N;;;;;
-2F8DB;CJK COMPATIBILITY IDEOGRAPH-2F8DB;Lo;0;L;675E;;;;N;;;;;
-2F8DC;CJK COMPATIBILITY IDEOGRAPH-2F8DC;Lo;0;L;6753;;;;N;;;;;
-2F8DD;CJK COMPATIBILITY IDEOGRAPH-2F8DD;Lo;0;L;233C3;;;;N;;;;;
-2F8DE;CJK COMPATIBILITY IDEOGRAPH-2F8DE;Lo;0;L;3B49;;;;N;;;;;
-2F8DF;CJK COMPATIBILITY IDEOGRAPH-2F8DF;Lo;0;L;67FA;;;;N;;;;;
-2F8E0;CJK COMPATIBILITY IDEOGRAPH-2F8E0;Lo;0;L;6785;;;;N;;;;;
-2F8E1;CJK COMPATIBILITY IDEOGRAPH-2F8E1;Lo;0;L;6852;;;;N;;;;;
-2F8E2;CJK COMPATIBILITY IDEOGRAPH-2F8E2;Lo;0;L;6885;;;;N;;;;;
-2F8E3;CJK COMPATIBILITY IDEOGRAPH-2F8E3;Lo;0;L;2346D;;;;N;;;;;
-2F8E4;CJK COMPATIBILITY IDEOGRAPH-2F8E4;Lo;0;L;688E;;;;N;;;;;
-2F8E5;CJK COMPATIBILITY IDEOGRAPH-2F8E5;Lo;0;L;681F;;;;N;;;;;
-2F8E6;CJK COMPATIBILITY IDEOGRAPH-2F8E6;Lo;0;L;6914;;;;N;;;;;
-2F8E7;CJK COMPATIBILITY IDEOGRAPH-2F8E7;Lo;0;L;3B9D;;;;N;;;;;
-2F8E8;CJK COMPATIBILITY IDEOGRAPH-2F8E8;Lo;0;L;6942;;;;N;;;;;
-2F8E9;CJK COMPATIBILITY IDEOGRAPH-2F8E9;Lo;0;L;69A3;;;;N;;;;;
-2F8EA;CJK COMPATIBILITY IDEOGRAPH-2F8EA;Lo;0;L;69EA;;;;N;;;;;
-2F8EB;CJK COMPATIBILITY IDEOGRAPH-2F8EB;Lo;0;L;6AA8;;;;N;;;;;
-2F8EC;CJK COMPATIBILITY IDEOGRAPH-2F8EC;Lo;0;L;236A3;;;;N;;;;;
-2F8ED;CJK COMPATIBILITY IDEOGRAPH-2F8ED;Lo;0;L;6ADB;;;;N;;;;;
-2F8EE;CJK COMPATIBILITY IDEOGRAPH-2F8EE;Lo;0;L;3C18;;;;N;;;;;
-2F8EF;CJK COMPATIBILITY IDEOGRAPH-2F8EF;Lo;0;L;6B21;;;;N;;;;;
-2F8F0;CJK COMPATIBILITY IDEOGRAPH-2F8F0;Lo;0;L;238A7;;;;N;;;;;
-2F8F1;CJK COMPATIBILITY IDEOGRAPH-2F8F1;Lo;0;L;6B54;;;;N;;;;;
-2F8F2;CJK COMPATIBILITY IDEOGRAPH-2F8F2;Lo;0;L;3C4E;;;;N;;;;;
-2F8F3;CJK COMPATIBILITY IDEOGRAPH-2F8F3;Lo;0;L;6B72;;;;N;;;;;
-2F8F4;CJK COMPATIBILITY IDEOGRAPH-2F8F4;Lo;0;L;6B9F;;;;N;;;;;
-2F8F5;CJK COMPATIBILITY IDEOGRAPH-2F8F5;Lo;0;L;6BBA;;;;N;;;;;
-2F8F6;CJK COMPATIBILITY IDEOGRAPH-2F8F6;Lo;0;L;6BBB;;;;N;;;;;
-2F8F7;CJK COMPATIBILITY IDEOGRAPH-2F8F7;Lo;0;L;23A8D;;;;N;;;;;
-2F8F8;CJK COMPATIBILITY IDEOGRAPH-2F8F8;Lo;0;L;21D0B;;;;N;;;;;
-2F8F9;CJK COMPATIBILITY IDEOGRAPH-2F8F9;Lo;0;L;23AFA;;;;N;;;;;
-2F8FA;CJK COMPATIBILITY IDEOGRAPH-2F8FA;Lo;0;L;6C4E;;;;N;;;;;
-2F8FB;CJK COMPATIBILITY IDEOGRAPH-2F8FB;Lo;0;L;23CBC;;;;N;;;;;
-2F8FC;CJK COMPATIBILITY IDEOGRAPH-2F8FC;Lo;0;L;6CBF;;;;N;;;;;
-2F8FD;CJK COMPATIBILITY IDEOGRAPH-2F8FD;Lo;0;L;6CCD;;;;N;;;;;
-2F8FE;CJK COMPATIBILITY IDEOGRAPH-2F8FE;Lo;0;L;6C67;;;;N;;;;;
-2F8FF;CJK COMPATIBILITY IDEOGRAPH-2F8FF;Lo;0;L;6D16;;;;N;;;;;
-2F900;CJK COMPATIBILITY IDEOGRAPH-2F900;Lo;0;L;6D3E;;;;N;;;;;
-2F901;CJK COMPATIBILITY IDEOGRAPH-2F901;Lo;0;L;6D77;;;;N;;;;;
-2F902;CJK COMPATIBILITY IDEOGRAPH-2F902;Lo;0;L;6D41;;;;N;;;;;
-2F903;CJK COMPATIBILITY IDEOGRAPH-2F903;Lo;0;L;6D69;;;;N;;;;;
-2F904;CJK COMPATIBILITY IDEOGRAPH-2F904;Lo;0;L;6D78;;;;N;;;;;
-2F905;CJK COMPATIBILITY IDEOGRAPH-2F905;Lo;0;L;6D85;;;;N;;;;;
-2F906;CJK COMPATIBILITY IDEOGRAPH-2F906;Lo;0;L;23D1E;;;;N;;;;;
-2F907;CJK COMPATIBILITY IDEOGRAPH-2F907;Lo;0;L;6D34;;;;N;;;;;
-2F908;CJK COMPATIBILITY IDEOGRAPH-2F908;Lo;0;L;6E2F;;;;N;;;;;
-2F909;CJK COMPATIBILITY IDEOGRAPH-2F909;Lo;0;L;6E6E;;;;N;;;;;
-2F90A;CJK COMPATIBILITY IDEOGRAPH-2F90A;Lo;0;L;3D33;;;;N;;;;;
-2F90B;CJK COMPATIBILITY IDEOGRAPH-2F90B;Lo;0;L;6ECB;;;;N;;;;;
-2F90C;CJK COMPATIBILITY IDEOGRAPH-2F90C;Lo;0;L;6EC7;;;;N;;;;;
-2F90D;CJK COMPATIBILITY IDEOGRAPH-2F90D;Lo;0;L;23ED1;;;;N;;;;;
-2F90E;CJK COMPATIBILITY IDEOGRAPH-2F90E;Lo;0;L;6DF9;;;;N;;;;;
-2F90F;CJK COMPATIBILITY IDEOGRAPH-2F90F;Lo;0;L;6F6E;;;;N;;;;;
-2F910;CJK COMPATIBILITY IDEOGRAPH-2F910;Lo;0;L;23F5E;;;;N;;;;;
-2F911;CJK COMPATIBILITY IDEOGRAPH-2F911;Lo;0;L;23F8E;;;;N;;;;;
-2F912;CJK COMPATIBILITY IDEOGRAPH-2F912;Lo;0;L;6FC6;;;;N;;;;;
-2F913;CJK COMPATIBILITY IDEOGRAPH-2F913;Lo;0;L;7039;;;;N;;;;;
-2F914;CJK COMPATIBILITY IDEOGRAPH-2F914;Lo;0;L;701E;;;;N;;;;;
-2F915;CJK COMPATIBILITY IDEOGRAPH-2F915;Lo;0;L;701B;;;;N;;;;;
-2F916;CJK COMPATIBILITY IDEOGRAPH-2F916;Lo;0;L;3D96;;;;N;;;;;
-2F917;CJK COMPATIBILITY IDEOGRAPH-2F917;Lo;0;L;704A;;;;N;;;;;
-2F918;CJK COMPATIBILITY IDEOGRAPH-2F918;Lo;0;L;707D;;;;N;;;;;
-2F919;CJK COMPATIBILITY IDEOGRAPH-2F919;Lo;0;L;7077;;;;N;;;;;
-2F91A;CJK COMPATIBILITY IDEOGRAPH-2F91A;Lo;0;L;70AD;;;;N;;;;;
-2F91B;CJK COMPATIBILITY IDEOGRAPH-2F91B;Lo;0;L;20525;;;;N;;;;;
-2F91C;CJK COMPATIBILITY IDEOGRAPH-2F91C;Lo;0;L;7145;;;;N;;;;;
-2F91D;CJK COMPATIBILITY IDEOGRAPH-2F91D;Lo;0;L;24263;;;;N;;;;;
-2F91E;CJK COMPATIBILITY IDEOGRAPH-2F91E;Lo;0;L;719C;;;;N;;;;;
-2F91F;CJK COMPATIBILITY IDEOGRAPH-2F91F;Lo;0;L;243AB;;;;N;;;;;
-2F920;CJK COMPATIBILITY IDEOGRAPH-2F920;Lo;0;L;7228;;;;N;;;;;
-2F921;CJK COMPATIBILITY IDEOGRAPH-2F921;Lo;0;L;7235;;;;N;;;;;
-2F922;CJK COMPATIBILITY IDEOGRAPH-2F922;Lo;0;L;7250;;;;N;;;;;
-2F923;CJK COMPATIBILITY IDEOGRAPH-2F923;Lo;0;L;24608;;;;N;;;;;
-2F924;CJK COMPATIBILITY IDEOGRAPH-2F924;Lo;0;L;7280;;;;N;;;;;
-2F925;CJK COMPATIBILITY IDEOGRAPH-2F925;Lo;0;L;7295;;;;N;;;;;
-2F926;CJK COMPATIBILITY IDEOGRAPH-2F926;Lo;0;L;24735;;;;N;;;;;
-2F927;CJK COMPATIBILITY IDEOGRAPH-2F927;Lo;0;L;24814;;;;N;;;;;
-2F928;CJK COMPATIBILITY IDEOGRAPH-2F928;Lo;0;L;737A;;;;N;;;;;
-2F929;CJK COMPATIBILITY IDEOGRAPH-2F929;Lo;0;L;738B;;;;N;;;;;
-2F92A;CJK COMPATIBILITY IDEOGRAPH-2F92A;Lo;0;L;3EAC;;;;N;;;;;
-2F92B;CJK COMPATIBILITY IDEOGRAPH-2F92B;Lo;0;L;73A5;;;;N;;;;;
-2F92C;CJK COMPATIBILITY IDEOGRAPH-2F92C;Lo;0;L;3EB8;;;;N;;;;;
-2F92D;CJK COMPATIBILITY IDEOGRAPH-2F92D;Lo;0;L;3EB8;;;;N;;;;;
-2F92E;CJK COMPATIBILITY IDEOGRAPH-2F92E;Lo;0;L;7447;;;;N;;;;;
-2F92F;CJK COMPATIBILITY IDEOGRAPH-2F92F;Lo;0;L;745C;;;;N;;;;;
-2F930;CJK COMPATIBILITY IDEOGRAPH-2F930;Lo;0;L;7471;;;;N;;;;;
-2F931;CJK COMPATIBILITY IDEOGRAPH-2F931;Lo;0;L;7485;;;;N;;;;;
-2F932;CJK COMPATIBILITY IDEOGRAPH-2F932;Lo;0;L;74CA;;;;N;;;;;
-2F933;CJK COMPATIBILITY IDEOGRAPH-2F933;Lo;0;L;3F1B;;;;N;;;;;
-2F934;CJK COMPATIBILITY IDEOGRAPH-2F934;Lo;0;L;7524;;;;N;;;;;
-2F935;CJK COMPATIBILITY IDEOGRAPH-2F935;Lo;0;L;24C36;;;;N;;;;;
-2F936;CJK COMPATIBILITY IDEOGRAPH-2F936;Lo;0;L;753E;;;;N;;;;;
-2F937;CJK COMPATIBILITY IDEOGRAPH-2F937;Lo;0;L;24C92;;;;N;;;;;
-2F938;CJK COMPATIBILITY IDEOGRAPH-2F938;Lo;0;L;7570;;;;N;;;;;
-2F939;CJK COMPATIBILITY IDEOGRAPH-2F939;Lo;0;L;2219F;;;;N;;;;;
-2F93A;CJK COMPATIBILITY IDEOGRAPH-2F93A;Lo;0;L;7610;;;;N;;;;;
-2F93B;CJK COMPATIBILITY IDEOGRAPH-2F93B;Lo;0;L;24FA1;;;;N;;;;;
-2F93C;CJK COMPATIBILITY IDEOGRAPH-2F93C;Lo;0;L;24FB8;;;;N;;;;;
-2F93D;CJK COMPATIBILITY IDEOGRAPH-2F93D;Lo;0;L;25044;;;;N;;;;;
-2F93E;CJK COMPATIBILITY IDEOGRAPH-2F93E;Lo;0;L;3FFC;;;;N;;;;;
-2F93F;CJK COMPATIBILITY IDEOGRAPH-2F93F;Lo;0;L;4008;;;;N;;;;;
-2F940;CJK COMPATIBILITY IDEOGRAPH-2F940;Lo;0;L;76F4;;;;N;;;;;
-2F941;CJK COMPATIBILITY IDEOGRAPH-2F941;Lo;0;L;250F3;;;;N;;;;;
-2F942;CJK COMPATIBILITY IDEOGRAPH-2F942;Lo;0;L;250F2;;;;N;;;;;
-2F943;CJK COMPATIBILITY IDEOGRAPH-2F943;Lo;0;L;25119;;;;N;;;;;
-2F944;CJK COMPATIBILITY IDEOGRAPH-2F944;Lo;0;L;25133;;;;N;;;;;
-2F945;CJK COMPATIBILITY IDEOGRAPH-2F945;Lo;0;L;771E;;;;N;;;;;
-2F946;CJK COMPATIBILITY IDEOGRAPH-2F946;Lo;0;L;771F;;;;N;;;;;
-2F947;CJK COMPATIBILITY IDEOGRAPH-2F947;Lo;0;L;771F;;;;N;;;;;
-2F948;CJK COMPATIBILITY IDEOGRAPH-2F948;Lo;0;L;774A;;;;N;;;;;
-2F949;CJK COMPATIBILITY IDEOGRAPH-2F949;Lo;0;L;4039;;;;N;;;;;
-2F94A;CJK COMPATIBILITY IDEOGRAPH-2F94A;Lo;0;L;778B;;;;N;;;;;
-2F94B;CJK COMPATIBILITY IDEOGRAPH-2F94B;Lo;0;L;4046;;;;N;;;;;
-2F94C;CJK COMPATIBILITY IDEOGRAPH-2F94C;Lo;0;L;4096;;;;N;;;;;
-2F94D;CJK COMPATIBILITY IDEOGRAPH-2F94D;Lo;0;L;2541D;;;;N;;;;;
-2F94E;CJK COMPATIBILITY IDEOGRAPH-2F94E;Lo;0;L;784E;;;;N;;;;;
-2F94F;CJK COMPATIBILITY IDEOGRAPH-2F94F;Lo;0;L;788C;;;;N;;;;;
-2F950;CJK COMPATIBILITY IDEOGRAPH-2F950;Lo;0;L;78CC;;;;N;;;;;
-2F951;CJK COMPATIBILITY IDEOGRAPH-2F951;Lo;0;L;40E3;;;;N;;;;;
-2F952;CJK COMPATIBILITY IDEOGRAPH-2F952;Lo;0;L;25626;;;;N;;;;;
-2F953;CJK COMPATIBILITY IDEOGRAPH-2F953;Lo;0;L;7956;;;;N;;;;;
-2F954;CJK COMPATIBILITY IDEOGRAPH-2F954;Lo;0;L;2569A;;;;N;;;;;
-2F955;CJK COMPATIBILITY IDEOGRAPH-2F955;Lo;0;L;256C5;;;;N;;;;;
-2F956;CJK COMPATIBILITY IDEOGRAPH-2F956;Lo;0;L;798F;;;;N;;;;;
-2F957;CJK COMPATIBILITY IDEOGRAPH-2F957;Lo;0;L;79EB;;;;N;;;;;
-2F958;CJK COMPATIBILITY IDEOGRAPH-2F958;Lo;0;L;412F;;;;N;;;;;
-2F959;CJK COMPATIBILITY IDEOGRAPH-2F959;Lo;0;L;7A40;;;;N;;;;;
-2F95A;CJK COMPATIBILITY IDEOGRAPH-2F95A;Lo;0;L;7A4A;;;;N;;;;;
-2F95B;CJK COMPATIBILITY IDEOGRAPH-2F95B;Lo;0;L;7A4F;;;;N;;;;;
-2F95C;CJK COMPATIBILITY IDEOGRAPH-2F95C;Lo;0;L;2597C;;;;N;;;;;
-2F95D;CJK COMPATIBILITY IDEOGRAPH-2F95D;Lo;0;L;25AA7;;;;N;;;;;
-2F95E;CJK COMPATIBILITY IDEOGRAPH-2F95E;Lo;0;L;25AA7;;;;N;;;;;
-2F95F;CJK COMPATIBILITY IDEOGRAPH-2F95F;Lo;0;L;7AEE;;;;N;;;;;
-2F960;CJK COMPATIBILITY IDEOGRAPH-2F960;Lo;0;L;4202;;;;N;;;;;
-2F961;CJK COMPATIBILITY IDEOGRAPH-2F961;Lo;0;L;25BAB;;;;N;;;;;
-2F962;CJK COMPATIBILITY IDEOGRAPH-2F962;Lo;0;L;7BC6;;;;N;;;;;
-2F963;CJK COMPATIBILITY IDEOGRAPH-2F963;Lo;0;L;7BC9;;;;N;;;;;
-2F964;CJK COMPATIBILITY IDEOGRAPH-2F964;Lo;0;L;4227;;;;N;;;;;
-2F965;CJK COMPATIBILITY IDEOGRAPH-2F965;Lo;0;L;25C80;;;;N;;;;;
-2F966;CJK COMPATIBILITY IDEOGRAPH-2F966;Lo;0;L;7CD2;;;;N;;;;;
-2F967;CJK COMPATIBILITY IDEOGRAPH-2F967;Lo;0;L;42A0;;;;N;;;;;
-2F968;CJK COMPATIBILITY IDEOGRAPH-2F968;Lo;0;L;7CE8;;;;N;;;;;
-2F969;CJK COMPATIBILITY IDEOGRAPH-2F969;Lo;0;L;7CE3;;;;N;;;;;
-2F96A;CJK COMPATIBILITY IDEOGRAPH-2F96A;Lo;0;L;7D00;;;;N;;;;;
-2F96B;CJK COMPATIBILITY IDEOGRAPH-2F96B;Lo;0;L;25F86;;;;N;;;;;
-2F96C;CJK COMPATIBILITY IDEOGRAPH-2F96C;Lo;0;L;7D63;;;;N;;;;;
-2F96D;CJK COMPATIBILITY IDEOGRAPH-2F96D;Lo;0;L;4301;;;;N;;;;;
-2F96E;CJK COMPATIBILITY IDEOGRAPH-2F96E;Lo;0;L;7DC7;;;;N;;;;;
-2F96F;CJK COMPATIBILITY IDEOGRAPH-2F96F;Lo;0;L;7E02;;;;N;;;;;
-2F970;CJK COMPATIBILITY IDEOGRAPH-2F970;Lo;0;L;7E45;;;;N;;;;;
-2F971;CJK COMPATIBILITY IDEOGRAPH-2F971;Lo;0;L;4334;;;;N;;;;;
-2F972;CJK COMPATIBILITY IDEOGRAPH-2F972;Lo;0;L;26228;;;;N;;;;;
-2F973;CJK COMPATIBILITY IDEOGRAPH-2F973;Lo;0;L;26247;;;;N;;;;;
-2F974;CJK COMPATIBILITY IDEOGRAPH-2F974;Lo;0;L;4359;;;;N;;;;;
-2F975;CJK COMPATIBILITY IDEOGRAPH-2F975;Lo;0;L;262D9;;;;N;;;;;
-2F976;CJK COMPATIBILITY IDEOGRAPH-2F976;Lo;0;L;7F7A;;;;N;;;;;
-2F977;CJK COMPATIBILITY IDEOGRAPH-2F977;Lo;0;L;2633E;;;;N;;;;;
-2F978;CJK COMPATIBILITY IDEOGRAPH-2F978;Lo;0;L;7F95;;;;N;;;;;
-2F979;CJK COMPATIBILITY IDEOGRAPH-2F979;Lo;0;L;7FFA;;;;N;;;;;
-2F97A;CJK COMPATIBILITY IDEOGRAPH-2F97A;Lo;0;L;8005;;;;N;;;;;
-2F97B;CJK COMPATIBILITY IDEOGRAPH-2F97B;Lo;0;L;264DA;;;;N;;;;;
-2F97C;CJK COMPATIBILITY IDEOGRAPH-2F97C;Lo;0;L;26523;;;;N;;;;;
-2F97D;CJK COMPATIBILITY IDEOGRAPH-2F97D;Lo;0;L;8060;;;;N;;;;;
-2F97E;CJK COMPATIBILITY IDEOGRAPH-2F97E;Lo;0;L;265A8;;;;N;;;;;
-2F97F;CJK COMPATIBILITY IDEOGRAPH-2F97F;Lo;0;L;8070;;;;N;;;;;
-2F980;CJK COMPATIBILITY IDEOGRAPH-2F980;Lo;0;L;2335F;;;;N;;;;;
-2F981;CJK COMPATIBILITY IDEOGRAPH-2F981;Lo;0;L;43D5;;;;N;;;;;
-2F982;CJK COMPATIBILITY IDEOGRAPH-2F982;Lo;0;L;80B2;;;;N;;;;;
-2F983;CJK COMPATIBILITY IDEOGRAPH-2F983;Lo;0;L;8103;;;;N;;;;;
-2F984;CJK COMPATIBILITY IDEOGRAPH-2F984;Lo;0;L;440B;;;;N;;;;;
-2F985;CJK COMPATIBILITY IDEOGRAPH-2F985;Lo;0;L;813E;;;;N;;;;;
-2F986;CJK COMPATIBILITY IDEOGRAPH-2F986;Lo;0;L;5AB5;;;;N;;;;;
-2F987;CJK COMPATIBILITY IDEOGRAPH-2F987;Lo;0;L;267A7;;;;N;;;;;
-2F988;CJK COMPATIBILITY IDEOGRAPH-2F988;Lo;0;L;267B5;;;;N;;;;;
-2F989;CJK COMPATIBILITY IDEOGRAPH-2F989;Lo;0;L;23393;;;;N;;;;;
-2F98A;CJK COMPATIBILITY IDEOGRAPH-2F98A;Lo;0;L;2339C;;;;N;;;;;
-2F98B;CJK COMPATIBILITY IDEOGRAPH-2F98B;Lo;0;L;8201;;;;N;;;;;
-2F98C;CJK COMPATIBILITY IDEOGRAPH-2F98C;Lo;0;L;8204;;;;N;;;;;
-2F98D;CJK COMPATIBILITY IDEOGRAPH-2F98D;Lo;0;L;8F9E;;;;N;;;;;
-2F98E;CJK COMPATIBILITY IDEOGRAPH-2F98E;Lo;0;L;446B;;;;N;;;;;
-2F98F;CJK COMPATIBILITY IDEOGRAPH-2F98F;Lo;0;L;8291;;;;N;;;;;
-2F990;CJK COMPATIBILITY IDEOGRAPH-2F990;Lo;0;L;828B;;;;N;;;;;
-2F991;CJK COMPATIBILITY IDEOGRAPH-2F991;Lo;0;L;829D;;;;N;;;;;
-2F992;CJK COMPATIBILITY IDEOGRAPH-2F992;Lo;0;L;52B3;;;;N;;;;;
-2F993;CJK COMPATIBILITY IDEOGRAPH-2F993;Lo;0;L;82B1;;;;N;;;;;
-2F994;CJK COMPATIBILITY IDEOGRAPH-2F994;Lo;0;L;82B3;;;;N;;;;;
-2F995;CJK COMPATIBILITY IDEOGRAPH-2F995;Lo;0;L;82BD;;;;N;;;;;
-2F996;CJK COMPATIBILITY IDEOGRAPH-2F996;Lo;0;L;82E6;;;;N;;;;;
-2F997;CJK COMPATIBILITY IDEOGRAPH-2F997;Lo;0;L;26B3C;;;;N;;;;;
-2F998;CJK COMPATIBILITY IDEOGRAPH-2F998;Lo;0;L;82E5;;;;N;;;;;
-2F999;CJK COMPATIBILITY IDEOGRAPH-2F999;Lo;0;L;831D;;;;N;;;;;
-2F99A;CJK COMPATIBILITY IDEOGRAPH-2F99A;Lo;0;L;8363;;;;N;;;;;
-2F99B;CJK COMPATIBILITY IDEOGRAPH-2F99B;Lo;0;L;83AD;;;;N;;;;;
-2F99C;CJK COMPATIBILITY IDEOGRAPH-2F99C;Lo;0;L;8323;;;;N;;;;;
-2F99D;CJK COMPATIBILITY IDEOGRAPH-2F99D;Lo;0;L;83BD;;;;N;;;;;
-2F99E;CJK COMPATIBILITY IDEOGRAPH-2F99E;Lo;0;L;83E7;;;;N;;;;;
-2F99F;CJK COMPATIBILITY IDEOGRAPH-2F99F;Lo;0;L;8457;;;;N;;;;;
-2F9A0;CJK COMPATIBILITY IDEOGRAPH-2F9A0;Lo;0;L;8353;;;;N;;;;;
-2F9A1;CJK COMPATIBILITY IDEOGRAPH-2F9A1;Lo;0;L;83CA;;;;N;;;;;
-2F9A2;CJK COMPATIBILITY IDEOGRAPH-2F9A2;Lo;0;L;83CC;;;;N;;;;;
-2F9A3;CJK COMPATIBILITY IDEOGRAPH-2F9A3;Lo;0;L;83DC;;;;N;;;;;
-2F9A4;CJK COMPATIBILITY IDEOGRAPH-2F9A4;Lo;0;L;26C36;;;;N;;;;;
-2F9A5;CJK COMPATIBILITY IDEOGRAPH-2F9A5;Lo;0;L;26D6B;;;;N;;;;;
-2F9A6;CJK COMPATIBILITY IDEOGRAPH-2F9A6;Lo;0;L;26CD5;;;;N;;;;;
-2F9A7;CJK COMPATIBILITY IDEOGRAPH-2F9A7;Lo;0;L;452B;;;;N;;;;;
-2F9A8;CJK COMPATIBILITY IDEOGRAPH-2F9A8;Lo;0;L;84F1;;;;N;;;;;
-2F9A9;CJK COMPATIBILITY IDEOGRAPH-2F9A9;Lo;0;L;84F3;;;;N;;;;;
-2F9AA;CJK COMPATIBILITY IDEOGRAPH-2F9AA;Lo;0;L;8516;;;;N;;;;;
-2F9AB;CJK COMPATIBILITY IDEOGRAPH-2F9AB;Lo;0;L;273CA;;;;N;;;;;
-2F9AC;CJK COMPATIBILITY IDEOGRAPH-2F9AC;Lo;0;L;8564;;;;N;;;;;
-2F9AD;CJK COMPATIBILITY IDEOGRAPH-2F9AD;Lo;0;L;26F2C;;;;N;;;;;
-2F9AE;CJK COMPATIBILITY IDEOGRAPH-2F9AE;Lo;0;L;455D;;;;N;;;;;
-2F9AF;CJK COMPATIBILITY IDEOGRAPH-2F9AF;Lo;0;L;4561;;;;N;;;;;
-2F9B0;CJK COMPATIBILITY IDEOGRAPH-2F9B0;Lo;0;L;26FB1;;;;N;;;;;
-2F9B1;CJK COMPATIBILITY IDEOGRAPH-2F9B1;Lo;0;L;270D2;;;;N;;;;;
-2F9B2;CJK COMPATIBILITY IDEOGRAPH-2F9B2;Lo;0;L;456B;;;;N;;;;;
-2F9B3;CJK COMPATIBILITY IDEOGRAPH-2F9B3;Lo;0;L;8650;;;;N;;;;;
-2F9B4;CJK COMPATIBILITY IDEOGRAPH-2F9B4;Lo;0;L;865C;;;;N;;;;;
-2F9B5;CJK COMPATIBILITY IDEOGRAPH-2F9B5;Lo;0;L;8667;;;;N;;;;;
-2F9B6;CJK COMPATIBILITY IDEOGRAPH-2F9B6;Lo;0;L;8669;;;;N;;;;;
-2F9B7;CJK COMPATIBILITY IDEOGRAPH-2F9B7;Lo;0;L;86A9;;;;N;;;;;
-2F9B8;CJK COMPATIBILITY IDEOGRAPH-2F9B8;Lo;0;L;8688;;;;N;;;;;
-2F9B9;CJK COMPATIBILITY IDEOGRAPH-2F9B9;Lo;0;L;870E;;;;N;;;;;
-2F9BA;CJK COMPATIBILITY IDEOGRAPH-2F9BA;Lo;0;L;86E2;;;;N;;;;;
-2F9BB;CJK COMPATIBILITY IDEOGRAPH-2F9BB;Lo;0;L;8779;;;;N;;;;;
-2F9BC;CJK COMPATIBILITY IDEOGRAPH-2F9BC;Lo;0;L;8728;;;;N;;;;;
-2F9BD;CJK COMPATIBILITY IDEOGRAPH-2F9BD;Lo;0;L;876B;;;;N;;;;;
-2F9BE;CJK COMPATIBILITY IDEOGRAPH-2F9BE;Lo;0;L;8786;;;;N;;;;;
-2F9BF;CJK COMPATIBILITY IDEOGRAPH-2F9BF;Lo;0;L;45D7;;;;N;;;;;
-2F9C0;CJK COMPATIBILITY IDEOGRAPH-2F9C0;Lo;0;L;87E1;;;;N;;;;;
-2F9C1;CJK COMPATIBILITY IDEOGRAPH-2F9C1;Lo;0;L;8801;;;;N;;;;;
-2F9C2;CJK COMPATIBILITY IDEOGRAPH-2F9C2;Lo;0;L;45F9;;;;N;;;;;
-2F9C3;CJK COMPATIBILITY IDEOGRAPH-2F9C3;Lo;0;L;8860;;;;N;;;;;
-2F9C4;CJK COMPATIBILITY IDEOGRAPH-2F9C4;Lo;0;L;8863;;;;N;;;;;
-2F9C5;CJK COMPATIBILITY IDEOGRAPH-2F9C5;Lo;0;L;27667;;;;N;;;;;
-2F9C6;CJK COMPATIBILITY IDEOGRAPH-2F9C6;Lo;0;L;88D7;;;;N;;;;;
-2F9C7;CJK COMPATIBILITY IDEOGRAPH-2F9C7;Lo;0;L;88DE;;;;N;;;;;
-2F9C8;CJK COMPATIBILITY IDEOGRAPH-2F9C8;Lo;0;L;4635;;;;N;;;;;
-2F9C9;CJK COMPATIBILITY IDEOGRAPH-2F9C9;Lo;0;L;88FA;;;;N;;;;;
-2F9CA;CJK COMPATIBILITY IDEOGRAPH-2F9CA;Lo;0;L;34BB;;;;N;;;;;
-2F9CB;CJK COMPATIBILITY IDEOGRAPH-2F9CB;Lo;0;L;278AE;;;;N;;;;;
-2F9CC;CJK COMPATIBILITY IDEOGRAPH-2F9CC;Lo;0;L;27966;;;;N;;;;;
-2F9CD;CJK COMPATIBILITY IDEOGRAPH-2F9CD;Lo;0;L;46BE;;;;N;;;;;
-2F9CE;CJK COMPATIBILITY IDEOGRAPH-2F9CE;Lo;0;L;46C7;;;;N;;;;;
-2F9CF;CJK COMPATIBILITY IDEOGRAPH-2F9CF;Lo;0;L;8AA0;;;;N;;;;;
-2F9D0;CJK COMPATIBILITY IDEOGRAPH-2F9D0;Lo;0;L;8AED;;;;N;;;;;
-2F9D1;CJK COMPATIBILITY IDEOGRAPH-2F9D1;Lo;0;L;8B8A;;;;N;;;;;
-2F9D2;CJK COMPATIBILITY IDEOGRAPH-2F9D2;Lo;0;L;8C55;;;;N;;;;;
-2F9D3;CJK COMPATIBILITY IDEOGRAPH-2F9D3;Lo;0;L;27CA8;;;;N;;;;;
-2F9D4;CJK COMPATIBILITY IDEOGRAPH-2F9D4;Lo;0;L;8CAB;;;;N;;;;;
-2F9D5;CJK COMPATIBILITY IDEOGRAPH-2F9D5;Lo;0;L;8CC1;;;;N;;;;;
-2F9D6;CJK COMPATIBILITY IDEOGRAPH-2F9D6;Lo;0;L;8D1B;;;;N;;;;;
-2F9D7;CJK COMPATIBILITY IDEOGRAPH-2F9D7;Lo;0;L;8D77;;;;N;;;;;
-2F9D8;CJK COMPATIBILITY IDEOGRAPH-2F9D8;Lo;0;L;27F2F;;;;N;;;;;
-2F9D9;CJK COMPATIBILITY IDEOGRAPH-2F9D9;Lo;0;L;20804;;;;N;;;;;
-2F9DA;CJK COMPATIBILITY IDEOGRAPH-2F9DA;Lo;0;L;8DCB;;;;N;;;;;
-2F9DB;CJK COMPATIBILITY IDEOGRAPH-2F9DB;Lo;0;L;8DBC;;;;N;;;;;
-2F9DC;CJK COMPATIBILITY IDEOGRAPH-2F9DC;Lo;0;L;8DF0;;;;N;;;;;
-2F9DD;CJK COMPATIBILITY IDEOGRAPH-2F9DD;Lo;0;L;208DE;;;;N;;;;;
-2F9DE;CJK COMPATIBILITY IDEOGRAPH-2F9DE;Lo;0;L;8ED4;;;;N;;;;;
-2F9DF;CJK COMPATIBILITY IDEOGRAPH-2F9DF;Lo;0;L;8F38;;;;N;;;;;
-2F9E0;CJK COMPATIBILITY IDEOGRAPH-2F9E0;Lo;0;L;285D2;;;;N;;;;;
-2F9E1;CJK COMPATIBILITY IDEOGRAPH-2F9E1;Lo;0;L;285ED;;;;N;;;;;
-2F9E2;CJK COMPATIBILITY IDEOGRAPH-2F9E2;Lo;0;L;9094;;;;N;;;;;
-2F9E3;CJK COMPATIBILITY IDEOGRAPH-2F9E3;Lo;0;L;90F1;;;;N;;;;;
-2F9E4;CJK COMPATIBILITY IDEOGRAPH-2F9E4;Lo;0;L;9111;;;;N;;;;;
-2F9E5;CJK COMPATIBILITY IDEOGRAPH-2F9E5;Lo;0;L;2872E;;;;N;;;;;
-2F9E6;CJK COMPATIBILITY IDEOGRAPH-2F9E6;Lo;0;L;911B;;;;N;;;;;
-2F9E7;CJK COMPATIBILITY IDEOGRAPH-2F9E7;Lo;0;L;9238;;;;N;;;;;
-2F9E8;CJK COMPATIBILITY IDEOGRAPH-2F9E8;Lo;0;L;92D7;;;;N;;;;;
-2F9E9;CJK COMPATIBILITY IDEOGRAPH-2F9E9;Lo;0;L;92D8;;;;N;;;;;
-2F9EA;CJK COMPATIBILITY IDEOGRAPH-2F9EA;Lo;0;L;927C;;;;N;;;;;
-2F9EB;CJK COMPATIBILITY IDEOGRAPH-2F9EB;Lo;0;L;93F9;;;;N;;;;;
-2F9EC;CJK COMPATIBILITY IDEOGRAPH-2F9EC;Lo;0;L;9415;;;;N;;;;;
-2F9ED;CJK COMPATIBILITY IDEOGRAPH-2F9ED;Lo;0;L;28BFA;;;;N;;;;;
-2F9EE;CJK COMPATIBILITY IDEOGRAPH-2F9EE;Lo;0;L;958B;;;;N;;;;;
-2F9EF;CJK COMPATIBILITY IDEOGRAPH-2F9EF;Lo;0;L;4995;;;;N;;;;;
-2F9F0;CJK COMPATIBILITY IDEOGRAPH-2F9F0;Lo;0;L;95B7;;;;N;;;;;
-2F9F1;CJK COMPATIBILITY IDEOGRAPH-2F9F1;Lo;0;L;28D77;;;;N;;;;;
-2F9F2;CJK COMPATIBILITY IDEOGRAPH-2F9F2;Lo;0;L;49E6;;;;N;;;;;
-2F9F3;CJK COMPATIBILITY IDEOGRAPH-2F9F3;Lo;0;L;96C3;;;;N;;;;;
-2F9F4;CJK COMPATIBILITY IDEOGRAPH-2F9F4;Lo;0;L;5DB2;;;;N;;;;;
-2F9F5;CJK COMPATIBILITY IDEOGRAPH-2F9F5;Lo;0;L;9723;;;;N;;;;;
-2F9F6;CJK COMPATIBILITY IDEOGRAPH-2F9F6;Lo;0;L;29145;;;;N;;;;;
-2F9F7;CJK COMPATIBILITY IDEOGRAPH-2F9F7;Lo;0;L;2921A;;;;N;;;;;
-2F9F8;CJK COMPATIBILITY IDEOGRAPH-2F9F8;Lo;0;L;4A6E;;;;N;;;;;
-2F9F9;CJK COMPATIBILITY IDEOGRAPH-2F9F9;Lo;0;L;4A76;;;;N;;;;;
-2F9FA;CJK COMPATIBILITY IDEOGRAPH-2F9FA;Lo;0;L;97E0;;;;N;;;;;
-2F9FB;CJK COMPATIBILITY IDEOGRAPH-2F9FB;Lo;0;L;2940A;;;;N;;;;;
-2F9FC;CJK COMPATIBILITY IDEOGRAPH-2F9FC;Lo;0;L;4AB2;;;;N;;;;;
-2F9FD;CJK COMPATIBILITY IDEOGRAPH-2F9FD;Lo;0;L;29496;;;;N;;;;;
-2F9FE;CJK COMPATIBILITY IDEOGRAPH-2F9FE;Lo;0;L;980B;;;;N;;;;;
-2F9FF;CJK COMPATIBILITY IDEOGRAPH-2F9FF;Lo;0;L;980B;;;;N;;;;;
-2FA00;CJK COMPATIBILITY IDEOGRAPH-2FA00;Lo;0;L;9829;;;;N;;;;;
-2FA01;CJK COMPATIBILITY IDEOGRAPH-2FA01;Lo;0;L;295B6;;;;N;;;;;
-2FA02;CJK COMPATIBILITY IDEOGRAPH-2FA02;Lo;0;L;98E2;;;;N;;;;;
-2FA03;CJK COMPATIBILITY IDEOGRAPH-2FA03;Lo;0;L;4B33;;;;N;;;;;
-2FA04;CJK COMPATIBILITY IDEOGRAPH-2FA04;Lo;0;L;9929;;;;N;;;;;
-2FA05;CJK COMPATIBILITY IDEOGRAPH-2FA05;Lo;0;L;99A7;;;;N;;;;;
-2FA06;CJK COMPATIBILITY IDEOGRAPH-2FA06;Lo;0;L;99C2;;;;N;;;;;
-2FA07;CJK COMPATIBILITY IDEOGRAPH-2FA07;Lo;0;L;99FE;;;;N;;;;;
-2FA08;CJK COMPATIBILITY IDEOGRAPH-2FA08;Lo;0;L;4BCE;;;;N;;;;;
-2FA09;CJK COMPATIBILITY IDEOGRAPH-2FA09;Lo;0;L;29B30;;;;N;;;;;
-2FA0A;CJK COMPATIBILITY IDEOGRAPH-2FA0A;Lo;0;L;9B12;;;;N;;;;;
-2FA0B;CJK COMPATIBILITY IDEOGRAPH-2FA0B;Lo;0;L;9C40;;;;N;;;;;
-2FA0C;CJK COMPATIBILITY IDEOGRAPH-2FA0C;Lo;0;L;9CFD;;;;N;;;;;
-2FA0D;CJK COMPATIBILITY IDEOGRAPH-2FA0D;Lo;0;L;4CCE;;;;N;;;;;
-2FA0E;CJK COMPATIBILITY IDEOGRAPH-2FA0E;Lo;0;L;4CED;;;;N;;;;;
-2FA0F;CJK COMPATIBILITY IDEOGRAPH-2FA0F;Lo;0;L;9D67;;;;N;;;;;
-2FA10;CJK COMPATIBILITY IDEOGRAPH-2FA10;Lo;0;L;2A0CE;;;;N;;;;;
-2FA11;CJK COMPATIBILITY IDEOGRAPH-2FA11;Lo;0;L;4CF8;;;;N;;;;;
-2FA12;CJK COMPATIBILITY IDEOGRAPH-2FA12;Lo;0;L;2A105;;;;N;;;;;
-2FA13;CJK COMPATIBILITY IDEOGRAPH-2FA13;Lo;0;L;2A20E;;;;N;;;;;
-2FA14;CJK COMPATIBILITY IDEOGRAPH-2FA14;Lo;0;L;2A291;;;;N;;;;;
-2FA15;CJK COMPATIBILITY IDEOGRAPH-2FA15;Lo;0;L;9EBB;;;;N;;;;;
-2FA16;CJK COMPATIBILITY IDEOGRAPH-2FA16;Lo;0;L;4D56;;;;N;;;;;
-2FA17;CJK COMPATIBILITY IDEOGRAPH-2FA17;Lo;0;L;9EF9;;;;N;;;;;
-2FA18;CJK COMPATIBILITY IDEOGRAPH-2FA18;Lo;0;L;9EFE;;;;N;;;;;
-2FA19;CJK COMPATIBILITY IDEOGRAPH-2FA19;Lo;0;L;9F05;;;;N;;;;;
-2FA1A;CJK COMPATIBILITY IDEOGRAPH-2FA1A;Lo;0;L;9F0F;;;;N;;;;;
-2FA1B;CJK COMPATIBILITY IDEOGRAPH-2FA1B;Lo;0;L;9F16;;;;N;;;;;
-2FA1C;CJK COMPATIBILITY IDEOGRAPH-2FA1C;Lo;0;L;9F3B;;;;N;;;;;
-2FA1D;CJK COMPATIBILITY IDEOGRAPH-2FA1D;Lo;0;L;2A600;;;;N;;;;;
-E0001;LANGUAGE TAG;Cf;0;BN;;;;;N;;;;;
-E0020;TAG SPACE;Cf;0;BN;;;;;N;;;;;
-E0021;TAG EXCLAMATION MARK;Cf;0;BN;;;;;N;;;;;
-E0022;TAG QUOTATION MARK;Cf;0;BN;;;;;N;;;;;
-E0023;TAG NUMBER SIGN;Cf;0;BN;;;;;N;;;;;
-E0024;TAG DOLLAR SIGN;Cf;0;BN;;;;;N;;;;;
-E0025;TAG PERCENT SIGN;Cf;0;BN;;;;;N;;;;;
-E0026;TAG AMPERSAND;Cf;0;BN;;;;;N;;;;;
-E0027;TAG APOSTROPHE;Cf;0;BN;;;;;N;;;;;
-E0028;TAG LEFT PARENTHESIS;Cf;0;BN;;;;;N;;;;;
-E0029;TAG RIGHT PARENTHESIS;Cf;0;BN;;;;;N;;;;;
-E002A;TAG ASTERISK;Cf;0;BN;;;;;N;;;;;
-E002B;TAG PLUS SIGN;Cf;0;BN;;;;;N;;;;;
-E002C;TAG COMMA;Cf;0;BN;;;;;N;;;;;
-E002D;TAG HYPHEN-MINUS;Cf;0;BN;;;;;N;;;;;
-E002E;TAG FULL STOP;Cf;0;BN;;;;;N;;;;;
-E002F;TAG SOLIDUS;Cf;0;BN;;;;;N;;;;;
-E0030;TAG DIGIT ZERO;Cf;0;BN;;;;;N;;;;;
-E0031;TAG DIGIT ONE;Cf;0;BN;;;;;N;;;;;
-E0032;TAG DIGIT TWO;Cf;0;BN;;;;;N;;;;;
-E0033;TAG DIGIT THREE;Cf;0;BN;;;;;N;;;;;
-E0034;TAG DIGIT FOUR;Cf;0;BN;;;;;N;;;;;
-E0035;TAG DIGIT FIVE;Cf;0;BN;;;;;N;;;;;
-E0036;TAG DIGIT SIX;Cf;0;BN;;;;;N;;;;;
-E0037;TAG DIGIT SEVEN;Cf;0;BN;;;;;N;;;;;
-E0038;TAG DIGIT EIGHT;Cf;0;BN;;;;;N;;;;;
-E0039;TAG DIGIT NINE;Cf;0;BN;;;;;N;;;;;
-E003A;TAG COLON;Cf;0;BN;;;;;N;;;;;
-E003B;TAG SEMICOLON;Cf;0;BN;;;;;N;;;;;
-E003C;TAG LESS-THAN SIGN;Cf;0;BN;;;;;N;;;;;
-E003D;TAG EQUALS SIGN;Cf;0;BN;;;;;N;;;;;
-E003E;TAG GREATER-THAN SIGN;Cf;0;BN;;;;;N;;;;;
-E003F;TAG QUESTION MARK;Cf;0;BN;;;;;N;;;;;
-E0040;TAG COMMERCIAL AT;Cf;0;BN;;;;;N;;;;;
-E0041;TAG LATIN CAPITAL LETTER A;Cf;0;BN;;;;;N;;;;;
-E0042;TAG LATIN CAPITAL LETTER B;Cf;0;BN;;;;;N;;;;;
-E0043;TAG LATIN CAPITAL LETTER C;Cf;0;BN;;;;;N;;;;;
-E0044;TAG LATIN CAPITAL LETTER D;Cf;0;BN;;;;;N;;;;;
-E0045;TAG LATIN CAPITAL LETTER E;Cf;0;BN;;;;;N;;;;;
-E0046;TAG LATIN CAPITAL LETTER F;Cf;0;BN;;;;;N;;;;;
-E0047;TAG LATIN CAPITAL LETTER G;Cf;0;BN;;;;;N;;;;;
-E0048;TAG LATIN CAPITAL LETTER H;Cf;0;BN;;;;;N;;;;;
-E0049;TAG LATIN CAPITAL LETTER I;Cf;0;BN;;;;;N;;;;;
-E004A;TAG LATIN CAPITAL LETTER J;Cf;0;BN;;;;;N;;;;;
-E004B;TAG LATIN CAPITAL LETTER K;Cf;0;BN;;;;;N;;;;;
-E004C;TAG LATIN CAPITAL LETTER L;Cf;0;BN;;;;;N;;;;;
-E004D;TAG LATIN CAPITAL LETTER M;Cf;0;BN;;;;;N;;;;;
-E004E;TAG LATIN CAPITAL LETTER N;Cf;0;BN;;;;;N;;;;;
-E004F;TAG LATIN CAPITAL LETTER O;Cf;0;BN;;;;;N;;;;;
-E0050;TAG LATIN CAPITAL LETTER P;Cf;0;BN;;;;;N;;;;;
-E0051;TAG LATIN CAPITAL LETTER Q;Cf;0;BN;;;;;N;;;;;
-E0052;TAG LATIN CAPITAL LETTER R;Cf;0;BN;;;;;N;;;;;
-E0053;TAG LATIN CAPITAL LETTER S;Cf;0;BN;;;;;N;;;;;
-E0054;TAG LATIN CAPITAL LETTER T;Cf;0;BN;;;;;N;;;;;
-E0055;TAG LATIN CAPITAL LETTER U;Cf;0;BN;;;;;N;;;;;
-E0056;TAG LATIN CAPITAL LETTER V;Cf;0;BN;;;;;N;;;;;
-E0057;TAG LATIN CAPITAL LETTER W;Cf;0;BN;;;;;N;;;;;
-E0058;TAG LATIN CAPITAL LETTER X;Cf;0;BN;;;;;N;;;;;
-E0059;TAG LATIN CAPITAL LETTER Y;Cf;0;BN;;;;;N;;;;;
-E005A;TAG LATIN CAPITAL LETTER Z;Cf;0;BN;;;;;N;;;;;
-E005B;TAG LEFT SQUARE BRACKET;Cf;0;BN;;;;;N;;;;;
-E005C;TAG REVERSE SOLIDUS;Cf;0;BN;;;;;N;;;;;
-E005D;TAG RIGHT SQUARE BRACKET;Cf;0;BN;;;;;N;;;;;
-E005E;TAG CIRCUMFLEX ACCENT;Cf;0;BN;;;;;N;;;;;
-E005F;TAG LOW LINE;Cf;0;BN;;;;;N;;;;;
-E0060;TAG GRAVE ACCENT;Cf;0;BN;;;;;N;;;;;
-E0061;TAG LATIN SMALL LETTER A;Cf;0;BN;;;;;N;;;;;
-E0062;TAG LATIN SMALL LETTER B;Cf;0;BN;;;;;N;;;;;
-E0063;TAG LATIN SMALL LETTER C;Cf;0;BN;;;;;N;;;;;
-E0064;TAG LATIN SMALL LETTER D;Cf;0;BN;;;;;N;;;;;
-E0065;TAG LATIN SMALL LETTER E;Cf;0;BN;;;;;N;;;;;
-E0066;TAG LATIN SMALL LETTER F;Cf;0;BN;;;;;N;;;;;
-E0067;TAG LATIN SMALL LETTER G;Cf;0;BN;;;;;N;;;;;
-E0068;TAG LATIN SMALL LETTER H;Cf;0;BN;;;;;N;;;;;
-E0069;TAG LATIN SMALL LETTER I;Cf;0;BN;;;;;N;;;;;
-E006A;TAG LATIN SMALL LETTER J;Cf;0;BN;;;;;N;;;;;
-E006B;TAG LATIN SMALL LETTER K;Cf;0;BN;;;;;N;;;;;
-E006C;TAG LATIN SMALL LETTER L;Cf;0;BN;;;;;N;;;;;
-E006D;TAG LATIN SMALL LETTER M;Cf;0;BN;;;;;N;;;;;
-E006E;TAG LATIN SMALL LETTER N;Cf;0;BN;;;;;N;;;;;
-E006F;TAG LATIN SMALL LETTER O;Cf;0;BN;;;;;N;;;;;
-E0070;TAG LATIN SMALL LETTER P;Cf;0;BN;;;;;N;;;;;
-E0071;TAG LATIN SMALL LETTER Q;Cf;0;BN;;;;;N;;;;;
-E0072;TAG LATIN SMALL LETTER R;Cf;0;BN;;;;;N;;;;;
-E0073;TAG LATIN SMALL LETTER S;Cf;0;BN;;;;;N;;;;;
-E0074;TAG LATIN SMALL LETTER T;Cf;0;BN;;;;;N;;;;;
-E0075;TAG LATIN SMALL LETTER U;Cf;0;BN;;;;;N;;;;;
-E0076;TAG LATIN SMALL LETTER V;Cf;0;BN;;;;;N;;;;;
-E0077;TAG LATIN SMALL LETTER W;Cf;0;BN;;;;;N;;;;;
-E0078;TAG LATIN SMALL LETTER X;Cf;0;BN;;;;;N;;;;;
-E0079;TAG LATIN SMALL LETTER Y;Cf;0;BN;;;;;N;;;;;
-E007A;TAG LATIN SMALL LETTER Z;Cf;0;BN;;;;;N;;;;;
-E007B;TAG LEFT CURLY BRACKET;Cf;0;BN;;;;;N;;;;;
-E007C;TAG VERTICAL LINE;Cf;0;BN;;;;;N;;;;;
-E007D;TAG RIGHT CURLY BRACKET;Cf;0;BN;;;;;N;;;;;
-E007E;TAG TILDE;Cf;0;BN;;;;;N;;;;;
-E007F;CANCEL TAG;Cf;0;BN;;;;;N;;;;;
-E0100;VARIATION SELECTOR-17;Mn;0;NSM;;;;;N;;;;;
-E0101;VARIATION SELECTOR-18;Mn;0;NSM;;;;;N;;;;;
-E0102;VARIATION SELECTOR-19;Mn;0;NSM;;;;;N;;;;;
-E0103;VARIATION SELECTOR-20;Mn;0;NSM;;;;;N;;;;;
-E0104;VARIATION SELECTOR-21;Mn;0;NSM;;;;;N;;;;;
-E0105;VARIATION SELECTOR-22;Mn;0;NSM;;;;;N;;;;;
-E0106;VARIATION SELECTOR-23;Mn;0;NSM;;;;;N;;;;;
-E0107;VARIATION SELECTOR-24;Mn;0;NSM;;;;;N;;;;;
-E0108;VARIATION SELECTOR-25;Mn;0;NSM;;;;;N;;;;;
-E0109;VARIATION SELECTOR-26;Mn;0;NSM;;;;;N;;;;;
-E010A;VARIATION SELECTOR-27;Mn;0;NSM;;;;;N;;;;;
-E010B;VARIATION SELECTOR-28;Mn;0;NSM;;;;;N;;;;;
-E010C;VARIATION SELECTOR-29;Mn;0;NSM;;;;;N;;;;;
-E010D;VARIATION SELECTOR-30;Mn;0;NSM;;;;;N;;;;;
-E010E;VARIATION SELECTOR-31;Mn;0;NSM;;;;;N;;;;;
-E010F;VARIATION SELECTOR-32;Mn;0;NSM;;;;;N;;;;;
-E0110;VARIATION SELECTOR-33;Mn;0;NSM;;;;;N;;;;;
-E0111;VARIATION SELECTOR-34;Mn;0;NSM;;;;;N;;;;;
-E0112;VARIATION SELECTOR-35;Mn;0;NSM;;;;;N;;;;;
-E0113;VARIATION SELECTOR-36;Mn;0;NSM;;;;;N;;;;;
-E0114;VARIATION SELECTOR-37;Mn;0;NSM;;;;;N;;;;;
-E0115;VARIATION SELECTOR-38;Mn;0;NSM;;;;;N;;;;;
-E0116;VARIATION SELECTOR-39;Mn;0;NSM;;;;;N;;;;;
-E0117;VARIATION SELECTOR-40;Mn;0;NSM;;;;;N;;;;;
-E0118;VARIATION SELECTOR-41;Mn;0;NSM;;;;;N;;;;;
-E0119;VARIATION SELECTOR-42;Mn;0;NSM;;;;;N;;;;;
-E011A;VARIATION SELECTOR-43;Mn;0;NSM;;;;;N;;;;;
-E011B;VARIATION SELECTOR-44;Mn;0;NSM;;;;;N;;;;;
-E011C;VARIATION SELECTOR-45;Mn;0;NSM;;;;;N;;;;;
-E011D;VARIATION SELECTOR-46;Mn;0;NSM;;;;;N;;;;;
-E011E;VARIATION SELECTOR-47;Mn;0;NSM;;;;;N;;;;;
-E011F;VARIATION SELECTOR-48;Mn;0;NSM;;;;;N;;;;;
-E0120;VARIATION SELECTOR-49;Mn;0;NSM;;;;;N;;;;;
-E0121;VARIATION SELECTOR-50;Mn;0;NSM;;;;;N;;;;;
-E0122;VARIATION SELECTOR-51;Mn;0;NSM;;;;;N;;;;;
-E0123;VARIATION SELECTOR-52;Mn;0;NSM;;;;;N;;;;;
-E0124;VARIATION SELECTOR-53;Mn;0;NSM;;;;;N;;;;;
-E0125;VARIATION SELECTOR-54;Mn;0;NSM;;;;;N;;;;;
-E0126;VARIATION SELECTOR-55;Mn;0;NSM;;;;;N;;;;;
-E0127;VARIATION SELECTOR-56;Mn;0;NSM;;;;;N;;;;;
-E0128;VARIATION SELECTOR-57;Mn;0;NSM;;;;;N;;;;;
-E0129;VARIATION SELECTOR-58;Mn;0;NSM;;;;;N;;;;;
-E012A;VARIATION SELECTOR-59;Mn;0;NSM;;;;;N;;;;;
-E012B;VARIATION SELECTOR-60;Mn;0;NSM;;;;;N;;;;;
-E012C;VARIATION SELECTOR-61;Mn;0;NSM;;;;;N;;;;;
-E012D;VARIATION SELECTOR-62;Mn;0;NSM;;;;;N;;;;;
-E012E;VARIATION SELECTOR-63;Mn;0;NSM;;;;;N;;;;;
-E012F;VARIATION SELECTOR-64;Mn;0;NSM;;;;;N;;;;;
-E0130;VARIATION SELECTOR-65;Mn;0;NSM;;;;;N;;;;;
-E0131;VARIATION SELECTOR-66;Mn;0;NSM;;;;;N;;;;;
-E0132;VARIATION SELECTOR-67;Mn;0;NSM;;;;;N;;;;;
-E0133;VARIATION SELECTOR-68;Mn;0;NSM;;;;;N;;;;;
-E0134;VARIATION SELECTOR-69;Mn;0;NSM;;;;;N;;;;;
-E0135;VARIATION SELECTOR-70;Mn;0;NSM;;;;;N;;;;;
-E0136;VARIATION SELECTOR-71;Mn;0;NSM;;;;;N;;;;;
-E0137;VARIATION SELECTOR-72;Mn;0;NSM;;;;;N;;;;;
-E0138;VARIATION SELECTOR-73;Mn;0;NSM;;;;;N;;;;;
-E0139;VARIATION SELECTOR-74;Mn;0;NSM;;;;;N;;;;;
-E013A;VARIATION SELECTOR-75;Mn;0;NSM;;;;;N;;;;;
-E013B;VARIATION SELECTOR-76;Mn;0;NSM;;;;;N;;;;;
-E013C;VARIATION SELECTOR-77;Mn;0;NSM;;;;;N;;;;;
-E013D;VARIATION SELECTOR-78;Mn;0;NSM;;;;;N;;;;;
-E013E;VARIATION SELECTOR-79;Mn;0;NSM;;;;;N;;;;;
-E013F;VARIATION SELECTOR-80;Mn;0;NSM;;;;;N;;;;;
-E0140;VARIATION SELECTOR-81;Mn;0;NSM;;;;;N;;;;;
-E0141;VARIATION SELECTOR-82;Mn;0;NSM;;;;;N;;;;;
-E0142;VARIATION SELECTOR-83;Mn;0;NSM;;;;;N;;;;;
-E0143;VARIATION SELECTOR-84;Mn;0;NSM;;;;;N;;;;;
-E0144;VARIATION SELECTOR-85;Mn;0;NSM;;;;;N;;;;;
-E0145;VARIATION SELECTOR-86;Mn;0;NSM;;;;;N;;;;;
-E0146;VARIATION SELECTOR-87;Mn;0;NSM;;;;;N;;;;;
-E0147;VARIATION SELECTOR-88;Mn;0;NSM;;;;;N;;;;;
-E0148;VARIATION SELECTOR-89;Mn;0;NSM;;;;;N;;;;;
-E0149;VARIATION SELECTOR-90;Mn;0;NSM;;;;;N;;;;;
-E014A;VARIATION SELECTOR-91;Mn;0;NSM;;;;;N;;;;;
-E014B;VARIATION SELECTOR-92;Mn;0;NSM;;;;;N;;;;;
-E014C;VARIATION SELECTOR-93;Mn;0;NSM;;;;;N;;;;;
-E014D;VARIATION SELECTOR-94;Mn;0;NSM;;;;;N;;;;;
-E014E;VARIATION SELECTOR-95;Mn;0;NSM;;;;;N;;;;;
-E014F;VARIATION SELECTOR-96;Mn;0;NSM;;;;;N;;;;;
-E0150;VARIATION SELECTOR-97;Mn;0;NSM;;;;;N;;;;;
-E0151;VARIATION SELECTOR-98;Mn;0;NSM;;;;;N;;;;;
-E0152;VARIATION SELECTOR-99;Mn;0;NSM;;;;;N;;;;;
-E0153;VARIATION SELECTOR-100;Mn;0;NSM;;;;;N;;;;;
-E0154;VARIATION SELECTOR-101;Mn;0;NSM;;;;;N;;;;;
-E0155;VARIATION SELECTOR-102;Mn;0;NSM;;;;;N;;;;;
-E0156;VARIATION SELECTOR-103;Mn;0;NSM;;;;;N;;;;;
-E0157;VARIATION SELECTOR-104;Mn;0;NSM;;;;;N;;;;;
-E0158;VARIATION SELECTOR-105;Mn;0;NSM;;;;;N;;;;;
-E0159;VARIATION SELECTOR-106;Mn;0;NSM;;;;;N;;;;;
-E015A;VARIATION SELECTOR-107;Mn;0;NSM;;;;;N;;;;;
-E015B;VARIATION SELECTOR-108;Mn;0;NSM;;;;;N;;;;;
-E015C;VARIATION SELECTOR-109;Mn;0;NSM;;;;;N;;;;;
-E015D;VARIATION SELECTOR-110;Mn;0;NSM;;;;;N;;;;;
-E015E;VARIATION SELECTOR-111;Mn;0;NSM;;;;;N;;;;;
-E015F;VARIATION SELECTOR-112;Mn;0;NSM;;;;;N;;;;;
-E0160;VARIATION SELECTOR-113;Mn;0;NSM;;;;;N;;;;;
-E0161;VARIATION SELECTOR-114;Mn;0;NSM;;;;;N;;;;;
-E0162;VARIATION SELECTOR-115;Mn;0;NSM;;;;;N;;;;;
-E0163;VARIATION SELECTOR-116;Mn;0;NSM;;;;;N;;;;;
-E0164;VARIATION SELECTOR-117;Mn;0;NSM;;;;;N;;;;;
-E0165;VARIATION SELECTOR-118;Mn;0;NSM;;;;;N;;;;;
-E0166;VARIATION SELECTOR-119;Mn;0;NSM;;;;;N;;;;;
-E0167;VARIATION SELECTOR-120;Mn;0;NSM;;;;;N;;;;;
-E0168;VARIATION SELECTOR-121;Mn;0;NSM;;;;;N;;;;;
-E0169;VARIATION SELECTOR-122;Mn;0;NSM;;;;;N;;;;;
-E016A;VARIATION SELECTOR-123;Mn;0;NSM;;;;;N;;;;;
-E016B;VARIATION SELECTOR-124;Mn;0;NSM;;;;;N;;;;;
-E016C;VARIATION SELECTOR-125;Mn;0;NSM;;;;;N;;;;;
-E016D;VARIATION SELECTOR-126;Mn;0;NSM;;;;;N;;;;;
-E016E;VARIATION SELECTOR-127;Mn;0;NSM;;;;;N;;;;;
-E016F;VARIATION SELECTOR-128;Mn;0;NSM;;;;;N;;;;;
-E0170;VARIATION SELECTOR-129;Mn;0;NSM;;;;;N;;;;;
-E0171;VARIATION SELECTOR-130;Mn;0;NSM;;;;;N;;;;;
-E0172;VARIATION SELECTOR-131;Mn;0;NSM;;;;;N;;;;;
-E0173;VARIATION SELECTOR-132;Mn;0;NSM;;;;;N;;;;;
-E0174;VARIATION SELECTOR-133;Mn;0;NSM;;;;;N;;;;;
-E0175;VARIATION SELECTOR-134;Mn;0;NSM;;;;;N;;;;;
-E0176;VARIATION SELECTOR-135;Mn;0;NSM;;;;;N;;;;;
-E0177;VARIATION SELECTOR-136;Mn;0;NSM;;;;;N;;;;;
-E0178;VARIATION SELECTOR-137;Mn;0;NSM;;;;;N;;;;;
-E0179;VARIATION SELECTOR-138;Mn;0;NSM;;;;;N;;;;;
-E017A;VARIATION SELECTOR-139;Mn;0;NSM;;;;;N;;;;;
-E017B;VARIATION SELECTOR-140;Mn;0;NSM;;;;;N;;;;;
-E017C;VARIATION SELECTOR-141;Mn;0;NSM;;;;;N;;;;;
-E017D;VARIATION SELECTOR-142;Mn;0;NSM;;;;;N;;;;;
-E017E;VARIATION SELECTOR-143;Mn;0;NSM;;;;;N;;;;;
-E017F;VARIATION SELECTOR-144;Mn;0;NSM;;;;;N;;;;;
-E0180;VARIATION SELECTOR-145;Mn;0;NSM;;;;;N;;;;;
-E0181;VARIATION SELECTOR-146;Mn;0;NSM;;;;;N;;;;;
-E0182;VARIATION SELECTOR-147;Mn;0;NSM;;;;;N;;;;;
-E0183;VARIATION SELECTOR-148;Mn;0;NSM;;;;;N;;;;;
-E0184;VARIATION SELECTOR-149;Mn;0;NSM;;;;;N;;;;;
-E0185;VARIATION SELECTOR-150;Mn;0;NSM;;;;;N;;;;;
-E0186;VARIATION SELECTOR-151;Mn;0;NSM;;;;;N;;;;;
-E0187;VARIATION SELECTOR-152;Mn;0;NSM;;;;;N;;;;;
-E0188;VARIATION SELECTOR-153;Mn;0;NSM;;;;;N;;;;;
-E0189;VARIATION SELECTOR-154;Mn;0;NSM;;;;;N;;;;;
-E018A;VARIATION SELECTOR-155;Mn;0;NSM;;;;;N;;;;;
-E018B;VARIATION SELECTOR-156;Mn;0;NSM;;;;;N;;;;;
-E018C;VARIATION SELECTOR-157;Mn;0;NSM;;;;;N;;;;;
-E018D;VARIATION SELECTOR-158;Mn;0;NSM;;;;;N;;;;;
-E018E;VARIATION SELECTOR-159;Mn;0;NSM;;;;;N;;;;;
-E018F;VARIATION SELECTOR-160;Mn;0;NSM;;;;;N;;;;;
-E0190;VARIATION SELECTOR-161;Mn;0;NSM;;;;;N;;;;;
-E0191;VARIATION SELECTOR-162;Mn;0;NSM;;;;;N;;;;;
-E0192;VARIATION SELECTOR-163;Mn;0;NSM;;;;;N;;;;;
-E0193;VARIATION SELECTOR-164;Mn;0;NSM;;;;;N;;;;;
-E0194;VARIATION SELECTOR-165;Mn;0;NSM;;;;;N;;;;;
-E0195;VARIATION SELECTOR-166;Mn;0;NSM;;;;;N;;;;;
-E0196;VARIATION SELECTOR-167;Mn;0;NSM;;;;;N;;;;;
-E0197;VARIATION SELECTOR-168;Mn;0;NSM;;;;;N;;;;;
-E0198;VARIATION SELECTOR-169;Mn;0;NSM;;;;;N;;;;;
-E0199;VARIATION SELECTOR-170;Mn;0;NSM;;;;;N;;;;;
-E019A;VARIATION SELECTOR-171;Mn;0;NSM;;;;;N;;;;;
-E019B;VARIATION SELECTOR-172;Mn;0;NSM;;;;;N;;;;;
-E019C;VARIATION SELECTOR-173;Mn;0;NSM;;;;;N;;;;;
-E019D;VARIATION SELECTOR-174;Mn;0;NSM;;;;;N;;;;;
-E019E;VARIATION SELECTOR-175;Mn;0;NSM;;;;;N;;;;;
-E019F;VARIATION SELECTOR-176;Mn;0;NSM;;;;;N;;;;;
-E01A0;VARIATION SELECTOR-177;Mn;0;NSM;;;;;N;;;;;
-E01A1;VARIATION SELECTOR-178;Mn;0;NSM;;;;;N;;;;;
-E01A2;VARIATION SELECTOR-179;Mn;0;NSM;;;;;N;;;;;
-E01A3;VARIATION SELECTOR-180;Mn;0;NSM;;;;;N;;;;;
-E01A4;VARIATION SELECTOR-181;Mn;0;NSM;;;;;N;;;;;
-E01A5;VARIATION SELECTOR-182;Mn;0;NSM;;;;;N;;;;;
-E01A6;VARIATION SELECTOR-183;Mn;0;NSM;;;;;N;;;;;
-E01A7;VARIATION SELECTOR-184;Mn;0;NSM;;;;;N;;;;;
-E01A8;VARIATION SELECTOR-185;Mn;0;NSM;;;;;N;;;;;
-E01A9;VARIATION SELECTOR-186;Mn;0;NSM;;;;;N;;;;;
-E01AA;VARIATION SELECTOR-187;Mn;0;NSM;;;;;N;;;;;
-E01AB;VARIATION SELECTOR-188;Mn;0;NSM;;;;;N;;;;;
-E01AC;VARIATION SELECTOR-189;Mn;0;NSM;;;;;N;;;;;
-E01AD;VARIATION SELECTOR-190;Mn;0;NSM;;;;;N;;;;;
-E01AE;VARIATION SELECTOR-191;Mn;0;NSM;;;;;N;;;;;
-E01AF;VARIATION SELECTOR-192;Mn;0;NSM;;;;;N;;;;;
-E01B0;VARIATION SELECTOR-193;Mn;0;NSM;;;;;N;;;;;
-E01B1;VARIATION SELECTOR-194;Mn;0;NSM;;;;;N;;;;;
-E01B2;VARIATION SELECTOR-195;Mn;0;NSM;;;;;N;;;;;
-E01B3;VARIATION SELECTOR-196;Mn;0;NSM;;;;;N;;;;;
-E01B4;VARIATION SELECTOR-197;Mn;0;NSM;;;;;N;;;;;
-E01B5;VARIATION SELECTOR-198;Mn;0;NSM;;;;;N;;;;;
-E01B6;VARIATION SELECTOR-199;Mn;0;NSM;;;;;N;;;;;
-E01B7;VARIATION SELECTOR-200;Mn;0;NSM;;;;;N;;;;;
-E01B8;VARIATION SELECTOR-201;Mn;0;NSM;;;;;N;;;;;
-E01B9;VARIATION SELECTOR-202;Mn;0;NSM;;;;;N;;;;;
-E01BA;VARIATION SELECTOR-203;Mn;0;NSM;;;;;N;;;;;
-E01BB;VARIATION SELECTOR-204;Mn;0;NSM;;;;;N;;;;;
-E01BC;VARIATION SELECTOR-205;Mn;0;NSM;;;;;N;;;;;
-E01BD;VARIATION SELECTOR-206;Mn;0;NSM;;;;;N;;;;;
-E01BE;VARIATION SELECTOR-207;Mn;0;NSM;;;;;N;;;;;
-E01BF;VARIATION SELECTOR-208;Mn;0;NSM;;;;;N;;;;;
-E01C0;VARIATION SELECTOR-209;Mn;0;NSM;;;;;N;;;;;
-E01C1;VARIATION SELECTOR-210;Mn;0;NSM;;;;;N;;;;;
-E01C2;VARIATION SELECTOR-211;Mn;0;NSM;;;;;N;;;;;
-E01C3;VARIATION SELECTOR-212;Mn;0;NSM;;;;;N;;;;;
-E01C4;VARIATION SELECTOR-213;Mn;0;NSM;;;;;N;;;;;
-E01C5;VARIATION SELECTOR-214;Mn;0;NSM;;;;;N;;;;;
-E01C6;VARIATION SELECTOR-215;Mn;0;NSM;;;;;N;;;;;
-E01C7;VARIATION SELECTOR-216;Mn;0;NSM;;;;;N;;;;;
-E01C8;VARIATION SELECTOR-217;Mn;0;NSM;;;;;N;;;;;
-E01C9;VARIATION SELECTOR-218;Mn;0;NSM;;;;;N;;;;;
-E01CA;VARIATION SELECTOR-219;Mn;0;NSM;;;;;N;;;;;
-E01CB;VARIATION SELECTOR-220;Mn;0;NSM;;;;;N;;;;;
-E01CC;VARIATION SELECTOR-221;Mn;0;NSM;;;;;N;;;;;
-E01CD;VARIATION SELECTOR-222;Mn;0;NSM;;;;;N;;;;;
-E01CE;VARIATION SELECTOR-223;Mn;0;NSM;;;;;N;;;;;
-E01CF;VARIATION SELECTOR-224;Mn;0;NSM;;;;;N;;;;;
-E01D0;VARIATION SELECTOR-225;Mn;0;NSM;;;;;N;;;;;
-E01D1;VARIATION SELECTOR-226;Mn;0;NSM;;;;;N;;;;;
-E01D2;VARIATION SELECTOR-227;Mn;0;NSM;;;;;N;;;;;
-E01D3;VARIATION SELECTOR-228;Mn;0;NSM;;;;;N;;;;;
-E01D4;VARIATION SELECTOR-229;Mn;0;NSM;;;;;N;;;;;
-E01D5;VARIATION SELECTOR-230;Mn;0;NSM;;;;;N;;;;;
-E01D6;VARIATION SELECTOR-231;Mn;0;NSM;;;;;N;;;;;
-E01D7;VARIATION SELECTOR-232;Mn;0;NSM;;;;;N;;;;;
-E01D8;VARIATION SELECTOR-233;Mn;0;NSM;;;;;N;;;;;
-E01D9;VARIATION SELECTOR-234;Mn;0;NSM;;;;;N;;;;;
-E01DA;VARIATION SELECTOR-235;Mn;0;NSM;;;;;N;;;;;
-E01DB;VARIATION SELECTOR-236;Mn;0;NSM;;;;;N;;;;;
-E01DC;VARIATION SELECTOR-237;Mn;0;NSM;;;;;N;;;;;
-E01DD;VARIATION SELECTOR-238;Mn;0;NSM;;;;;N;;;;;
-E01DE;VARIATION SELECTOR-239;Mn;0;NSM;;;;;N;;;;;
-E01DF;VARIATION SELECTOR-240;Mn;0;NSM;;;;;N;;;;;
-E01E0;VARIATION SELECTOR-241;Mn;0;NSM;;;;;N;;;;;
-E01E1;VARIATION SELECTOR-242;Mn;0;NSM;;;;;N;;;;;
-E01E2;VARIATION SELECTOR-243;Mn;0;NSM;;;;;N;;;;;
-E01E3;VARIATION SELECTOR-244;Mn;0;NSM;;;;;N;;;;;
-E01E4;VARIATION SELECTOR-245;Mn;0;NSM;;;;;N;;;;;
-E01E5;VARIATION SELECTOR-246;Mn;0;NSM;;;;;N;;;;;
-E01E6;VARIATION SELECTOR-247;Mn;0;NSM;;;;;N;;;;;
-E01E7;VARIATION SELECTOR-248;Mn;0;NSM;;;;;N;;;;;
-E01E8;VARIATION SELECTOR-249;Mn;0;NSM;;;;;N;;;;;
-E01E9;VARIATION SELECTOR-250;Mn;0;NSM;;;;;N;;;;;
-E01EA;VARIATION SELECTOR-251;Mn;0;NSM;;;;;N;;;;;
-E01EB;VARIATION SELECTOR-252;Mn;0;NSM;;;;;N;;;;;
-E01EC;VARIATION SELECTOR-253;Mn;0;NSM;;;;;N;;;;;
-E01ED;VARIATION SELECTOR-254;Mn;0;NSM;;;;;N;;;;;
-E01EE;VARIATION SELECTOR-255;Mn;0;NSM;;;;;N;;;;;
-E01EF;VARIATION SELECTOR-256;Mn;0;NSM;;;;;N;;;;;
-F0000;<Plane 15 Private Use, First>;Co;0;L;;;;;N;;;;;
-FFFFD;<Plane 15 Private Use, Last>;Co;0;L;;;;;N;;;;;
-100000;<Plane 16 Private Use, First>;Co;0;L;;;;;N;;;;;
-10FFFD;<Plane 16 Private Use, Last>;Co;0;L;;;;;N;;;;;
diff --git a/enc/unicode/name2ctype.h b/enc/unicode/name2ctype.h
deleted file mode 100644
index 84ea4f4246..0000000000
--- a/enc/unicode/name2ctype.h
+++ /dev/null
@@ -1,9967 +0,0 @@
-/* C code produced by gperf version 3.0.3 */
-/* Command-line: gperf -7 -c -j1 -i1 -t -C -P -T -H uniname2ctype_hash -Q uniname2ctype_pool -N uniname2ctype_p */
-#ifndef USE_UNICODE_PROPERTIES
-/* Computed positions: -k'1,3' */
-#else /* USE_UNICODE_PROPERTIES */
-/* Computed positions: -k'1-3' */
-#endif /* USE_UNICODE_PROPERTIES */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
- && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
- && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
- && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
- && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
- && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
- && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
- && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
- && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
- && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
- && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
- && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
- && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
- && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
- && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
- && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
- && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
- && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
- && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
- && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
- && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
- && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
- && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646. */
-error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-
-
-/* 'NEWLINE': [[:NEWLINE:]] */
-static const OnigCodePoint CR_NEWLINE[] = {
- 1,
- 0x000a, 0x000a,
-}; /* CR_NEWLINE */
-
-/* 'Alpha': [[:Alpha:]] */
-static const OnigCodePoint CR_Alpha[] = {
- 452,
- 0x0041, 0x005a,
- 0x0061, 0x007a,
- 0x00aa, 0x00aa,
- 0x00b5, 0x00b5,
- 0x00ba, 0x00ba,
- 0x00c0, 0x00d6,
- 0x00d8, 0x00f6,
- 0x00f8, 0x02c1,
- 0x02c6, 0x02d1,
- 0x02e0, 0x02e4,
- 0x02ec, 0x02ec,
- 0x02ee, 0x02ee,
- 0x0300, 0x0374,
- 0x0376, 0x0377,
- 0x037a, 0x037d,
- 0x0386, 0x0386,
- 0x0388, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03f5,
- 0x03f7, 0x0481,
- 0x0483, 0x0523,
- 0x0531, 0x0556,
- 0x0559, 0x0559,
- 0x0561, 0x0587,
- 0x0591, 0x05bd,
- 0x05bf, 0x05bf,
- 0x05c1, 0x05c2,
- 0x05c4, 0x05c5,
- 0x05c7, 0x05c7,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f2,
- 0x0610, 0x061a,
- 0x0621, 0x065e,
- 0x066e, 0x06d3,
- 0x06d5, 0x06dc,
- 0x06de, 0x06e8,
- 0x06ea, 0x06ef,
- 0x06fa, 0x06fc,
- 0x06ff, 0x06ff,
- 0x0710, 0x074a,
- 0x074d, 0x07b1,
- 0x07ca, 0x07f5,
- 0x07fa, 0x07fa,
- 0x0901, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0954,
- 0x0958, 0x0963,
- 0x0971, 0x0972,
- 0x097b, 0x097f,
- 0x0981, 0x0983,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bc, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09ce,
- 0x09d7, 0x09d7,
- 0x09dc, 0x09dd,
- 0x09df, 0x09e3,
- 0x09f0, 0x09f1,
- 0x0a01, 0x0a03,
- 0x0a05, 0x0a0a,
- 0x0a0f, 0x0a10,
- 0x0a13, 0x0a28,
- 0x0a2a, 0x0a30,
- 0x0a32, 0x0a33,
- 0x0a35, 0x0a36,
- 0x0a38, 0x0a39,
- 0x0a3c, 0x0a3c,
- 0x0a3e, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4d,
- 0x0a51, 0x0a51,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a70, 0x0a75,
- 0x0a81, 0x0a83,
- 0x0a85, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abc, 0x0ac5,
- 0x0ac7, 0x0ac9,
- 0x0acb, 0x0acd,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae3,
- 0x0b01, 0x0b03,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b35, 0x0b39,
- 0x0b3c, 0x0b44,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b63,
- 0x0b71, 0x0b71,
- 0x0b82, 0x0b83,
- 0x0b85, 0x0b8a,
- 0x0b8e, 0x0b90,
- 0x0b92, 0x0b95,
- 0x0b99, 0x0b9a,
- 0x0b9c, 0x0b9c,
- 0x0b9e, 0x0b9f,
- 0x0ba3, 0x0ba4,
- 0x0ba8, 0x0baa,
- 0x0bae, 0x0bb9,
- 0x0bbe, 0x0bc2,
- 0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcd,
- 0x0bd0, 0x0bd0,
- 0x0bd7, 0x0bd7,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3d, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c58, 0x0c59,
- 0x0c60, 0x0c63,
- 0x0c82, 0x0c83,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbc, 0x0cc4,
- 0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccd,
- 0x0cd5, 0x0cd6,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce3,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3d, 0x0d44,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d63,
- 0x0d7a, 0x0d7f,
- 0x0d82, 0x0d83,
- 0x0d85, 0x0d96,
- 0x0d9a, 0x0db1,
- 0x0db3, 0x0dbb,
- 0x0dbd, 0x0dbd,
- 0x0dc0, 0x0dc6,
- 0x0dca, 0x0dca,
- 0x0dcf, 0x0dd4,
- 0x0dd6, 0x0dd6,
- 0x0dd8, 0x0ddf,
- 0x0df2, 0x0df3,
- 0x0e01, 0x0e3a,
- 0x0e40, 0x0e4e,
- 0x0e81, 0x0e82,
- 0x0e84, 0x0e84,
- 0x0e87, 0x0e88,
- 0x0e8a, 0x0e8a,
- 0x0e8d, 0x0e8d,
- 0x0e94, 0x0e97,
- 0x0e99, 0x0e9f,
- 0x0ea1, 0x0ea3,
- 0x0ea5, 0x0ea5,
- 0x0ea7, 0x0ea7,
- 0x0eaa, 0x0eab,
- 0x0ead, 0x0eb9,
- 0x0ebb, 0x0ebd,
- 0x0ec0, 0x0ec4,
- 0x0ec6, 0x0ec6,
- 0x0ec8, 0x0ecd,
- 0x0edc, 0x0edd,
- 0x0f00, 0x0f00,
- 0x0f18, 0x0f19,
- 0x0f35, 0x0f35,
- 0x0f37, 0x0f37,
- 0x0f39, 0x0f39,
- 0x0f3e, 0x0f47,
- 0x0f49, 0x0f6c,
- 0x0f71, 0x0f84,
- 0x0f86, 0x0f8b,
- 0x0f90, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fc6, 0x0fc6,
- 0x1000, 0x103f,
- 0x1050, 0x108f,
- 0x10a0, 0x10c5,
- 0x10d0, 0x10fa,
- 0x10fc, 0x10fc,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x1200, 0x1248,
- 0x124a, 0x124d,
- 0x1250, 0x1256,
- 0x1258, 0x1258,
- 0x125a, 0x125d,
- 0x1260, 0x1288,
- 0x128a, 0x128d,
- 0x1290, 0x12b0,
- 0x12b2, 0x12b5,
- 0x12b8, 0x12be,
- 0x12c0, 0x12c0,
- 0x12c2, 0x12c5,
- 0x12c8, 0x12d6,
- 0x12d8, 0x1310,
- 0x1312, 0x1315,
- 0x1318, 0x135a,
- 0x135f, 0x135f,
- 0x1380, 0x138f,
- 0x13a0, 0x13f4,
- 0x1401, 0x166c,
- 0x166f, 0x1676,
- 0x1681, 0x169a,
- 0x16a0, 0x16ea,
- 0x1700, 0x170c,
- 0x170e, 0x1714,
- 0x1720, 0x1734,
- 0x1740, 0x1753,
- 0x1760, 0x176c,
- 0x176e, 0x1770,
- 0x1772, 0x1773,
- 0x1780, 0x17b3,
- 0x17b6, 0x17d3,
- 0x17d7, 0x17d7,
- 0x17dc, 0x17dd,
- 0x180b, 0x180d,
- 0x1820, 0x1877,
- 0x1880, 0x18aa,
- 0x1900, 0x191c,
- 0x1920, 0x192b,
- 0x1930, 0x193b,
- 0x1950, 0x196d,
- 0x1970, 0x1974,
- 0x1980, 0x19a9,
- 0x19b0, 0x19c9,
- 0x1a00, 0x1a1b,
- 0x1b00, 0x1b4b,
- 0x1b6b, 0x1b73,
- 0x1b80, 0x1baa,
- 0x1bae, 0x1baf,
- 0x1c00, 0x1c37,
- 0x1c4d, 0x1c4f,
- 0x1c5a, 0x1c7d,
- 0x1d00, 0x1de6,
- 0x1dfe, 0x1f15,
- 0x1f18, 0x1f1d,
- 0x1f20, 0x1f45,
- 0x1f48, 0x1f4d,
- 0x1f50, 0x1f57,
- 0x1f59, 0x1f59,
- 0x1f5b, 0x1f5b,
- 0x1f5d, 0x1f5d,
- 0x1f5f, 0x1f7d,
- 0x1f80, 0x1fb4,
- 0x1fb6, 0x1fbc,
- 0x1fbe, 0x1fbe,
- 0x1fc2, 0x1fc4,
- 0x1fc6, 0x1fcc,
- 0x1fd0, 0x1fd3,
- 0x1fd6, 0x1fdb,
- 0x1fe0, 0x1fec,
- 0x1ff2, 0x1ff4,
- 0x1ff6, 0x1ffc,
- 0x2071, 0x2071,
- 0x207f, 0x207f,
- 0x2090, 0x2094,
- 0x20d0, 0x20f0,
- 0x2102, 0x2102,
- 0x2107, 0x2107,
- 0x210a, 0x2113,
- 0x2115, 0x2115,
- 0x2119, 0x211d,
- 0x2124, 0x2124,
- 0x2126, 0x2126,
- 0x2128, 0x2128,
- 0x212a, 0x212d,
- 0x212f, 0x2139,
- 0x213c, 0x213f,
- 0x2145, 0x2149,
- 0x214e, 0x214e,
- 0x2183, 0x2184,
- 0x2c00, 0x2c2e,
- 0x2c30, 0x2c5e,
- 0x2c60, 0x2c6f,
- 0x2c71, 0x2c7d,
- 0x2c80, 0x2ce4,
- 0x2d00, 0x2d25,
- 0x2d30, 0x2d65,
- 0x2d6f, 0x2d6f,
- 0x2d80, 0x2d96,
- 0x2da0, 0x2da6,
- 0x2da8, 0x2dae,
- 0x2db0, 0x2db6,
- 0x2db8, 0x2dbe,
- 0x2dc0, 0x2dc6,
- 0x2dc8, 0x2dce,
- 0x2dd0, 0x2dd6,
- 0x2dd8, 0x2dde,
- 0x2de0, 0x2dff,
- 0x2e2f, 0x2e2f,
- 0x3005, 0x3006,
- 0x302a, 0x302f,
- 0x3031, 0x3035,
- 0x303b, 0x303c,
- 0x3041, 0x3096,
- 0x3099, 0x309a,
- 0x309d, 0x309f,
- 0x30a1, 0x30fa,
- 0x30fc, 0x30ff,
- 0x3105, 0x312d,
- 0x3131, 0x318e,
- 0x31a0, 0x31b7,
- 0x31f0, 0x31ff,
- 0x3400, 0x3400,
- 0x4db5, 0x4db5,
- 0x4e00, 0x4e00,
- 0x9fc3, 0x9fc3,
- 0xa000, 0xa48c,
- 0xa500, 0xa60c,
- 0xa610, 0xa61f,
- 0xa62a, 0xa62b,
- 0xa640, 0xa65f,
- 0xa662, 0xa672,
- 0xa67c, 0xa67d,
- 0xa67f, 0xa697,
- 0xa717, 0xa71f,
- 0xa722, 0xa788,
- 0xa78b, 0xa78c,
- 0xa7fb, 0xa827,
- 0xa840, 0xa873,
- 0xa880, 0xa8c4,
- 0xa90a, 0xa92d,
- 0xa930, 0xa953,
- 0xaa00, 0xaa36,
- 0xaa40, 0xaa4d,
- 0xac00, 0xac00,
- 0xd7a3, 0xd7a3,
- 0xf900, 0xfa2d,
- 0xfa30, 0xfa6a,
- 0xfa70, 0xfad9,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xfb1d, 0xfb28,
- 0xfb2a, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbb1,
- 0xfbd3, 0xfd3d,
- 0xfd50, 0xfd8f,
- 0xfd92, 0xfdc7,
- 0xfdf0, 0xfdfb,
- 0xfe00, 0xfe0f,
- 0xfe20, 0xfe26,
- 0xfe70, 0xfe74,
- 0xfe76, 0xfefc,
- 0xff21, 0xff3a,
- 0xff41, 0xff5a,
- 0xff66, 0xffbe,
- 0xffc2, 0xffc7,
- 0xffca, 0xffcf,
- 0xffd2, 0xffd7,
- 0xffda, 0xffdc,
- 0x10000, 0x1000b,
- 0x1000d, 0x10026,
- 0x10028, 0x1003a,
- 0x1003c, 0x1003d,
- 0x1003f, 0x1004d,
- 0x10050, 0x1005d,
- 0x10080, 0x100fa,
- 0x101fd, 0x101fd,
- 0x10280, 0x1029c,
- 0x102a0, 0x102d0,
- 0x10300, 0x1031e,
- 0x10330, 0x10340,
- 0x10342, 0x10349,
- 0x10380, 0x1039d,
- 0x103a0, 0x103c3,
- 0x103c8, 0x103cf,
- 0x10400, 0x1049d,
- 0x10800, 0x10805,
- 0x10808, 0x10808,
- 0x1080a, 0x10835,
- 0x10837, 0x10838,
- 0x1083c, 0x1083c,
- 0x1083f, 0x1083f,
- 0x10900, 0x10915,
- 0x10920, 0x10939,
- 0x10a00, 0x10a03,
- 0x10a05, 0x10a06,
- 0x10a0c, 0x10a13,
- 0x10a15, 0x10a17,
- 0x10a19, 0x10a33,
- 0x10a38, 0x10a3a,
- 0x10a3f, 0x10a3f,
- 0x12000, 0x1236e,
- 0x1d165, 0x1d169,
- 0x1d16d, 0x1d172,
- 0x1d17b, 0x1d182,
- 0x1d185, 0x1d18b,
- 0x1d1aa, 0x1d1ad,
- 0x1d242, 0x1d244,
- 0x1d400, 0x1d454,
- 0x1d456, 0x1d49c,
- 0x1d49e, 0x1d49f,
- 0x1d4a2, 0x1d4a2,
- 0x1d4a5, 0x1d4a6,
- 0x1d4a9, 0x1d4ac,
- 0x1d4ae, 0x1d4b9,
- 0x1d4bb, 0x1d4bb,
- 0x1d4bd, 0x1d4c3,
- 0x1d4c5, 0x1d505,
- 0x1d507, 0x1d50a,
- 0x1d50d, 0x1d514,
- 0x1d516, 0x1d51c,
- 0x1d51e, 0x1d539,
- 0x1d53b, 0x1d53e,
- 0x1d540, 0x1d544,
- 0x1d546, 0x1d546,
- 0x1d54a, 0x1d550,
- 0x1d552, 0x1d6a5,
- 0x1d6a8, 0x1d6c0,
- 0x1d6c2, 0x1d6da,
- 0x1d6dc, 0x1d6fa,
- 0x1d6fc, 0x1d714,
- 0x1d716, 0x1d734,
- 0x1d736, 0x1d74e,
- 0x1d750, 0x1d76e,
- 0x1d770, 0x1d788,
- 0x1d78a, 0x1d7a8,
- 0x1d7aa, 0x1d7c2,
- 0x1d7c4, 0x1d7cb,
- 0x20000, 0x20000,
- 0x2a6d6, 0x2a6d6,
- 0x2f800, 0x2fa1d,
- 0xe0100, 0xe01ef,
-}; /* CR_Alpha */
-
-/* 'Blank': [[:Blank:]] */
-static const OnigCodePoint CR_Blank[] = {
- 9,
- 0x0009, 0x0009,
- 0x0020, 0x0020,
- 0x00a0, 0x00a0,
- 0x1680, 0x1680,
- 0x180e, 0x180e,
- 0x2000, 0x200a,
- 0x202f, 0x202f,
- 0x205f, 0x205f,
- 0x3000, 0x3000,
-}; /* CR_Blank */
-
-/* 'Cntrl': [[:Cntrl:]] */
-static const OnigCodePoint CR_Cntrl[] = {
- 2,
- 0x0000, 0x001f,
- 0x007f, 0x009f,
-}; /* CR_Cntrl */
-
-/* 'Digit': [[:Digit:]] */
-static const OnigCodePoint CR_Digit[] = {
- 33,
- 0x0030, 0x0039,
- 0x0660, 0x0669,
- 0x06f0, 0x06f9,
- 0x07c0, 0x07c9,
- 0x0966, 0x096f,
- 0x09e6, 0x09ef,
- 0x0a66, 0x0a6f,
- 0x0ae6, 0x0aef,
- 0x0b66, 0x0b6f,
- 0x0be6, 0x0bef,
- 0x0c66, 0x0c6f,
- 0x0ce6, 0x0cef,
- 0x0d66, 0x0d6f,
- 0x0e50, 0x0e59,
- 0x0ed0, 0x0ed9,
- 0x0f20, 0x0f29,
- 0x1040, 0x1049,
- 0x1090, 0x1099,
- 0x17e0, 0x17e9,
- 0x1810, 0x1819,
- 0x1946, 0x194f,
- 0x19d0, 0x19d9,
- 0x1b50, 0x1b59,
- 0x1bb0, 0x1bb9,
- 0x1c40, 0x1c49,
- 0x1c50, 0x1c59,
- 0xa620, 0xa629,
- 0xa8d0, 0xa8d9,
- 0xa900, 0xa909,
- 0xaa50, 0xaa59,
- 0xff10, 0xff19,
- 0x104a0, 0x104a9,
- 0x1d7ce, 0x1d7ff,
-}; /* CR_Digit */
-
-/* 'Graph': [[:Graph:]] */
-static const OnigCodePoint CR_Graph[] = {
- 449,
- 0x0021, 0x007e,
- 0x00a1, 0x00ac,
- 0x00ae, 0x0377,
- 0x037a, 0x037e,
- 0x0384, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x0523,
- 0x0531, 0x0556,
- 0x0559, 0x055f,
- 0x0561, 0x0587,
- 0x0589, 0x058a,
- 0x0591, 0x05c7,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0x0606, 0x061b,
- 0x061e, 0x061f,
- 0x0621, 0x065e,
- 0x0660, 0x06dc,
- 0x06de, 0x070d,
- 0x0710, 0x074a,
- 0x074d, 0x07b1,
- 0x07c0, 0x07fa,
- 0x0901, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0954,
- 0x0958, 0x0972,
- 0x097b, 0x097f,
- 0x0981, 0x0983,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bc, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09ce,
- 0x09d7, 0x09d7,
- 0x09dc, 0x09dd,
- 0x09df, 0x09e3,
- 0x09e6, 0x09fa,
- 0x0a01, 0x0a03,
- 0x0a05, 0x0a0a,
- 0x0a0f, 0x0a10,
- 0x0a13, 0x0a28,
- 0x0a2a, 0x0a30,
- 0x0a32, 0x0a33,
- 0x0a35, 0x0a36,
- 0x0a38, 0x0a39,
- 0x0a3c, 0x0a3c,
- 0x0a3e, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4d,
- 0x0a51, 0x0a51,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a66, 0x0a75,
- 0x0a81, 0x0a83,
- 0x0a85, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abc, 0x0ac5,
- 0x0ac7, 0x0ac9,
- 0x0acb, 0x0acd,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae3,
- 0x0ae6, 0x0aef,
- 0x0af1, 0x0af1,
- 0x0b01, 0x0b03,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b35, 0x0b39,
- 0x0b3c, 0x0b44,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b63,
- 0x0b66, 0x0b71,
- 0x0b82, 0x0b83,
- 0x0b85, 0x0b8a,
- 0x0b8e, 0x0b90,
- 0x0b92, 0x0b95,
- 0x0b99, 0x0b9a,
- 0x0b9c, 0x0b9c,
- 0x0b9e, 0x0b9f,
- 0x0ba3, 0x0ba4,
- 0x0ba8, 0x0baa,
- 0x0bae, 0x0bb9,
- 0x0bbe, 0x0bc2,
- 0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcd,
- 0x0bd0, 0x0bd0,
- 0x0bd7, 0x0bd7,
- 0x0be6, 0x0bfa,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3d, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c58, 0x0c59,
- 0x0c60, 0x0c63,
- 0x0c66, 0x0c6f,
- 0x0c78, 0x0c7f,
- 0x0c82, 0x0c83,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbc, 0x0cc4,
- 0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccd,
- 0x0cd5, 0x0cd6,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce3,
- 0x0ce6, 0x0cef,
- 0x0cf1, 0x0cf2,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3d, 0x0d44,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d63,
- 0x0d66, 0x0d75,
- 0x0d79, 0x0d7f,
- 0x0d82, 0x0d83,
- 0x0d85, 0x0d96,
- 0x0d9a, 0x0db1,
- 0x0db3, 0x0dbb,
- 0x0dbd, 0x0dbd,
- 0x0dc0, 0x0dc6,
- 0x0dca, 0x0dca,
- 0x0dcf, 0x0dd4,
- 0x0dd6, 0x0dd6,
- 0x0dd8, 0x0ddf,
- 0x0df2, 0x0df4,
- 0x0e01, 0x0e3a,
- 0x0e3f, 0x0e5b,
- 0x0e81, 0x0e82,
- 0x0e84, 0x0e84,
- 0x0e87, 0x0e88,
- 0x0e8a, 0x0e8a,
- 0x0e8d, 0x0e8d,
- 0x0e94, 0x0e97,
- 0x0e99, 0x0e9f,
- 0x0ea1, 0x0ea3,
- 0x0ea5, 0x0ea5,
- 0x0ea7, 0x0ea7,
- 0x0eaa, 0x0eab,
- 0x0ead, 0x0eb9,
- 0x0ebb, 0x0ebd,
- 0x0ec0, 0x0ec4,
- 0x0ec6, 0x0ec6,
- 0x0ec8, 0x0ecd,
- 0x0ed0, 0x0ed9,
- 0x0edc, 0x0edd,
- 0x0f00, 0x0f47,
- 0x0f49, 0x0f6c,
- 0x0f71, 0x0f8b,
- 0x0f90, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fbe, 0x0fcc,
- 0x0fce, 0x0fd4,
- 0x1000, 0x1099,
- 0x109e, 0x10c5,
- 0x10d0, 0x10fc,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x1200, 0x1248,
- 0x124a, 0x124d,
- 0x1250, 0x1256,
- 0x1258, 0x1258,
- 0x125a, 0x125d,
- 0x1260, 0x1288,
- 0x128a, 0x128d,
- 0x1290, 0x12b0,
- 0x12b2, 0x12b5,
- 0x12b8, 0x12be,
- 0x12c0, 0x12c0,
- 0x12c2, 0x12c5,
- 0x12c8, 0x12d6,
- 0x12d8, 0x1310,
- 0x1312, 0x1315,
- 0x1318, 0x135a,
- 0x135f, 0x137c,
- 0x1380, 0x1399,
- 0x13a0, 0x13f4,
- 0x1401, 0x1676,
- 0x1681, 0x169c,
- 0x16a0, 0x16f0,
- 0x1700, 0x170c,
- 0x170e, 0x1714,
- 0x1720, 0x1736,
- 0x1740, 0x1753,
- 0x1760, 0x176c,
- 0x176e, 0x1770,
- 0x1772, 0x1773,
- 0x1780, 0x17b3,
- 0x17b6, 0x17dd,
- 0x17e0, 0x17e9,
- 0x17f0, 0x17f9,
- 0x1800, 0x180d,
- 0x1810, 0x1819,
- 0x1820, 0x1877,
- 0x1880, 0x18aa,
- 0x1900, 0x191c,
- 0x1920, 0x192b,
- 0x1930, 0x193b,
- 0x1940, 0x1940,
- 0x1944, 0x196d,
- 0x1970, 0x1974,
- 0x1980, 0x19a9,
- 0x19b0, 0x19c9,
- 0x19d0, 0x19d9,
- 0x19de, 0x1a1b,
- 0x1a1e, 0x1a1f,
- 0x1b00, 0x1b4b,
- 0x1b50, 0x1b7c,
- 0x1b80, 0x1baa,
- 0x1bae, 0x1bb9,
- 0x1c00, 0x1c37,
- 0x1c3b, 0x1c49,
- 0x1c4d, 0x1c7f,
- 0x1d00, 0x1de6,
- 0x1dfe, 0x1f15,
- 0x1f18, 0x1f1d,
- 0x1f20, 0x1f45,
- 0x1f48, 0x1f4d,
- 0x1f50, 0x1f57,
- 0x1f59, 0x1f59,
- 0x1f5b, 0x1f5b,
- 0x1f5d, 0x1f5d,
- 0x1f5f, 0x1f7d,
- 0x1f80, 0x1fb4,
- 0x1fb6, 0x1fc4,
- 0x1fc6, 0x1fd3,
- 0x1fd6, 0x1fdb,
- 0x1fdd, 0x1fef,
- 0x1ff2, 0x1ff4,
- 0x1ff6, 0x1ffe,
- 0x2010, 0x2027,
- 0x2030, 0x205e,
- 0x2070, 0x2071,
- 0x2074, 0x208e,
- 0x2090, 0x2094,
- 0x20a0, 0x20b5,
- 0x20d0, 0x20f0,
- 0x2100, 0x214f,
- 0x2153, 0x2188,
- 0x2190, 0x23e7,
- 0x2400, 0x2426,
- 0x2440, 0x244a,
- 0x2460, 0x269d,
- 0x26a0, 0x26bc,
- 0x26c0, 0x26c3,
- 0x2701, 0x2704,
- 0x2706, 0x2709,
- 0x270c, 0x2727,
- 0x2729, 0x274b,
- 0x274d, 0x274d,
- 0x274f, 0x2752,
- 0x2756, 0x2756,
- 0x2758, 0x275e,
- 0x2761, 0x2794,
- 0x2798, 0x27af,
- 0x27b1, 0x27be,
- 0x27c0, 0x27ca,
- 0x27cc, 0x27cc,
- 0x27d0, 0x2b4c,
- 0x2b50, 0x2b54,
- 0x2c00, 0x2c2e,
- 0x2c30, 0x2c5e,
- 0x2c60, 0x2c6f,
- 0x2c71, 0x2c7d,
- 0x2c80, 0x2cea,
- 0x2cf9, 0x2d25,
- 0x2d30, 0x2d65,
- 0x2d6f, 0x2d6f,
- 0x2d80, 0x2d96,
- 0x2da0, 0x2da6,
- 0x2da8, 0x2dae,
- 0x2db0, 0x2db6,
- 0x2db8, 0x2dbe,
- 0x2dc0, 0x2dc6,
- 0x2dc8, 0x2dce,
- 0x2dd0, 0x2dd6,
- 0x2dd8, 0x2dde,
- 0x2de0, 0x2e30,
- 0x2e80, 0x2e99,
- 0x2e9b, 0x2ef3,
- 0x2f00, 0x2fd5,
- 0x2ff0, 0x2ffb,
- 0x3001, 0x303f,
- 0x3041, 0x3096,
- 0x3099, 0x30ff,
- 0x3105, 0x312d,
- 0x3131, 0x318e,
- 0x3190, 0x31b7,
- 0x31c0, 0x31e3,
- 0x31f0, 0x321e,
- 0x3220, 0x3243,
- 0x3250, 0x32fe,
- 0x3300, 0x3400,
- 0x4db5, 0x4db5,
- 0x4dc0, 0x4e00,
- 0x9fc3, 0x9fc3,
- 0xa000, 0xa48c,
- 0xa490, 0xa4c6,
- 0xa500, 0xa62b,
- 0xa640, 0xa65f,
- 0xa662, 0xa673,
- 0xa67c, 0xa697,
- 0xa700, 0xa78c,
- 0xa7fb, 0xa82b,
- 0xa840, 0xa877,
- 0xa880, 0xa8c4,
- 0xa8ce, 0xa8d9,
- 0xa900, 0xa953,
- 0xa95f, 0xa95f,
- 0xaa00, 0xaa36,
- 0xaa40, 0xaa4d,
- 0xaa50, 0xaa59,
- 0xaa5c, 0xaa5f,
- 0xac00, 0xac00,
- 0xd7a3, 0xd7a3,
- 0xf900, 0xfa2d,
- 0xfa30, 0xfa6a,
- 0xfa70, 0xfad9,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xfb1d, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbb1,
- 0xfbd3, 0xfd3f,
- 0xfd50, 0xfd8f,
- 0xfd92, 0xfdc7,
- 0xfdf0, 0xfdfd,
- 0xfe00, 0xfe19,
- 0xfe20, 0xfe26,
- 0xfe30, 0xfe52,
- 0xfe54, 0xfe66,
- 0xfe68, 0xfe6b,
- 0xfe70, 0xfe74,
- 0xfe76, 0xfefc,
- 0xff01, 0xffbe,
- 0xffc2, 0xffc7,
- 0xffca, 0xffcf,
- 0xffd2, 0xffd7,
- 0xffda, 0xffdc,
- 0xffe0, 0xffe6,
- 0xffe8, 0xffee,
- 0xfffc, 0xfffd,
- 0x10000, 0x1000b,
- 0x1000d, 0x10026,
- 0x10028, 0x1003a,
- 0x1003c, 0x1003d,
- 0x1003f, 0x1004d,
- 0x10050, 0x1005d,
- 0x10080, 0x100fa,
- 0x10100, 0x10102,
- 0x10107, 0x10133,
- 0x10137, 0x1018a,
- 0x10190, 0x1019b,
- 0x101d0, 0x101fd,
- 0x10280, 0x1029c,
- 0x102a0, 0x102d0,
- 0x10300, 0x1031e,
- 0x10320, 0x10323,
- 0x10330, 0x1034a,
- 0x10380, 0x1039d,
- 0x1039f, 0x103c3,
- 0x103c8, 0x103d5,
- 0x10400, 0x1049d,
- 0x104a0, 0x104a9,
- 0x10800, 0x10805,
- 0x10808, 0x10808,
- 0x1080a, 0x10835,
- 0x10837, 0x10838,
- 0x1083c, 0x1083c,
- 0x1083f, 0x1083f,
- 0x10900, 0x10919,
- 0x1091f, 0x10939,
- 0x1093f, 0x1093f,
- 0x10a00, 0x10a03,
- 0x10a05, 0x10a06,
- 0x10a0c, 0x10a13,
- 0x10a15, 0x10a17,
- 0x10a19, 0x10a33,
- 0x10a38, 0x10a3a,
- 0x10a3f, 0x10a47,
- 0x10a50, 0x10a58,
- 0x12000, 0x1236e,
- 0x12400, 0x12462,
- 0x12470, 0x12473,
- 0x1d000, 0x1d0f5,
- 0x1d100, 0x1d126,
- 0x1d129, 0x1d172,
- 0x1d17b, 0x1d1dd,
- 0x1d200, 0x1d245,
- 0x1d300, 0x1d356,
- 0x1d360, 0x1d371,
- 0x1d400, 0x1d454,
- 0x1d456, 0x1d49c,
- 0x1d49e, 0x1d49f,
- 0x1d4a2, 0x1d4a2,
- 0x1d4a5, 0x1d4a6,
- 0x1d4a9, 0x1d4ac,
- 0x1d4ae, 0x1d4b9,
- 0x1d4bb, 0x1d4bb,
- 0x1d4bd, 0x1d4c3,
- 0x1d4c5, 0x1d505,
- 0x1d507, 0x1d50a,
- 0x1d50d, 0x1d514,
- 0x1d516, 0x1d51c,
- 0x1d51e, 0x1d539,
- 0x1d53b, 0x1d53e,
- 0x1d540, 0x1d544,
- 0x1d546, 0x1d546,
- 0x1d54a, 0x1d550,
- 0x1d552, 0x1d6a5,
- 0x1d6a8, 0x1d7cb,
- 0x1d7ce, 0x1d7ff,
- 0x1f000, 0x1f02b,
- 0x1f030, 0x1f093,
- 0x20000, 0x20000,
- 0x2a6d6, 0x2a6d6,
- 0x2f800, 0x2fa1d,
- 0xe0100, 0xe01ef,
-}; /* CR_Graph */
-
-/* 'Lower': [[:Lower:]] */
-static const OnigCodePoint CR_Lower[] = {
- 598,
- 0x0061, 0x007a,
- 0x00aa, 0x00aa,
- 0x00b5, 0x00b5,
- 0x00ba, 0x00ba,
- 0x00df, 0x00f6,
- 0x00f8, 0x00ff,
- 0x0101, 0x0101,
- 0x0103, 0x0103,
- 0x0105, 0x0105,
- 0x0107, 0x0107,
- 0x0109, 0x0109,
- 0x010b, 0x010b,
- 0x010d, 0x010d,
- 0x010f, 0x010f,
- 0x0111, 0x0111,
- 0x0113, 0x0113,
- 0x0115, 0x0115,
- 0x0117, 0x0117,
- 0x0119, 0x0119,
- 0x011b, 0x011b,
- 0x011d, 0x011d,
- 0x011f, 0x011f,
- 0x0121, 0x0121,
- 0x0123, 0x0123,
- 0x0125, 0x0125,
- 0x0127, 0x0127,
- 0x0129, 0x0129,
- 0x012b, 0x012b,
- 0x012d, 0x012d,
- 0x012f, 0x012f,
- 0x0131, 0x0131,
- 0x0133, 0x0133,
- 0x0135, 0x0135,
- 0x0137, 0x0138,
- 0x013a, 0x013a,
- 0x013c, 0x013c,
- 0x013e, 0x013e,
- 0x0140, 0x0140,
- 0x0142, 0x0142,
- 0x0144, 0x0144,
- 0x0146, 0x0146,
- 0x0148, 0x0149,
- 0x014b, 0x014b,
- 0x014d, 0x014d,
- 0x014f, 0x014f,
- 0x0151, 0x0151,
- 0x0153, 0x0153,
- 0x0155, 0x0155,
- 0x0157, 0x0157,
- 0x0159, 0x0159,
- 0x015b, 0x015b,
- 0x015d, 0x015d,
- 0x015f, 0x015f,
- 0x0161, 0x0161,
- 0x0163, 0x0163,
- 0x0165, 0x0165,
- 0x0167, 0x0167,
- 0x0169, 0x0169,
- 0x016b, 0x016b,
- 0x016d, 0x016d,
- 0x016f, 0x016f,
- 0x0171, 0x0171,
- 0x0173, 0x0173,
- 0x0175, 0x0175,
- 0x0177, 0x0177,
- 0x017a, 0x017a,
- 0x017c, 0x017c,
- 0x017e, 0x0180,
- 0x0183, 0x0183,
- 0x0185, 0x0185,
- 0x0188, 0x0188,
- 0x018c, 0x018d,
- 0x0192, 0x0192,
- 0x0195, 0x0195,
- 0x0199, 0x019b,
- 0x019e, 0x019e,
- 0x01a1, 0x01a1,
- 0x01a3, 0x01a3,
- 0x01a5, 0x01a5,
- 0x01a8, 0x01a8,
- 0x01aa, 0x01ab,
- 0x01ad, 0x01ad,
- 0x01b0, 0x01b0,
- 0x01b4, 0x01b4,
- 0x01b6, 0x01b6,
- 0x01b9, 0x01ba,
- 0x01bd, 0x01bf,
- 0x01c6, 0x01c6,
- 0x01c9, 0x01c9,
- 0x01cc, 0x01cc,
- 0x01ce, 0x01ce,
- 0x01d0, 0x01d0,
- 0x01d2, 0x01d2,
- 0x01d4, 0x01d4,
- 0x01d6, 0x01d6,
- 0x01d8, 0x01d8,
- 0x01da, 0x01da,
- 0x01dc, 0x01dd,
- 0x01df, 0x01df,
- 0x01e1, 0x01e1,
- 0x01e3, 0x01e3,
- 0x01e5, 0x01e5,
- 0x01e7, 0x01e7,
- 0x01e9, 0x01e9,
- 0x01eb, 0x01eb,
- 0x01ed, 0x01ed,
- 0x01ef, 0x01f0,
- 0x01f3, 0x01f3,
- 0x01f5, 0x01f5,
- 0x01f9, 0x01f9,
- 0x01fb, 0x01fb,
- 0x01fd, 0x01fd,
- 0x01ff, 0x01ff,
- 0x0201, 0x0201,
- 0x0203, 0x0203,
- 0x0205, 0x0205,
- 0x0207, 0x0207,
- 0x0209, 0x0209,
- 0x020b, 0x020b,
- 0x020d, 0x020d,
- 0x020f, 0x020f,
- 0x0211, 0x0211,
- 0x0213, 0x0213,
- 0x0215, 0x0215,
- 0x0217, 0x0217,
- 0x0219, 0x0219,
- 0x021b, 0x021b,
- 0x021d, 0x021d,
- 0x021f, 0x021f,
- 0x0221, 0x0221,
- 0x0223, 0x0223,
- 0x0225, 0x0225,
- 0x0227, 0x0227,
- 0x0229, 0x0229,
- 0x022b, 0x022b,
- 0x022d, 0x022d,
- 0x022f, 0x022f,
- 0x0231, 0x0231,
- 0x0233, 0x0239,
- 0x023c, 0x023c,
- 0x023f, 0x0240,
- 0x0242, 0x0242,
- 0x0247, 0x0247,
- 0x0249, 0x0249,
- 0x024b, 0x024b,
- 0x024d, 0x024d,
- 0x024f, 0x0293,
- 0x0295, 0x02af,
- 0x0371, 0x0371,
- 0x0373, 0x0373,
- 0x0377, 0x0377,
- 0x037b, 0x037d,
- 0x0390, 0x0390,
- 0x03ac, 0x03ce,
- 0x03d0, 0x03d1,
- 0x03d5, 0x03d7,
- 0x03d9, 0x03d9,
- 0x03db, 0x03db,
- 0x03dd, 0x03dd,
- 0x03df, 0x03df,
- 0x03e1, 0x03e1,
- 0x03e3, 0x03e3,
- 0x03e5, 0x03e5,
- 0x03e7, 0x03e7,
- 0x03e9, 0x03e9,
- 0x03eb, 0x03eb,
- 0x03ed, 0x03ed,
- 0x03ef, 0x03f3,
- 0x03f5, 0x03f5,
- 0x03f8, 0x03f8,
- 0x03fb, 0x03fc,
- 0x0430, 0x045f,
- 0x0461, 0x0461,
- 0x0463, 0x0463,
- 0x0465, 0x0465,
- 0x0467, 0x0467,
- 0x0469, 0x0469,
- 0x046b, 0x046b,
- 0x046d, 0x046d,
- 0x046f, 0x046f,
- 0x0471, 0x0471,
- 0x0473, 0x0473,
- 0x0475, 0x0475,
- 0x0477, 0x0477,
- 0x0479, 0x0479,
- 0x047b, 0x047b,
- 0x047d, 0x047d,
- 0x047f, 0x047f,
- 0x0481, 0x0481,
- 0x048b, 0x048b,
- 0x048d, 0x048d,
- 0x048f, 0x048f,
- 0x0491, 0x0491,
- 0x0493, 0x0493,
- 0x0495, 0x0495,
- 0x0497, 0x0497,
- 0x0499, 0x0499,
- 0x049b, 0x049b,
- 0x049d, 0x049d,
- 0x049f, 0x049f,
- 0x04a1, 0x04a1,
- 0x04a3, 0x04a3,
- 0x04a5, 0x04a5,
- 0x04a7, 0x04a7,
- 0x04a9, 0x04a9,
- 0x04ab, 0x04ab,
- 0x04ad, 0x04ad,
- 0x04af, 0x04af,
- 0x04b1, 0x04b1,
- 0x04b3, 0x04b3,
- 0x04b5, 0x04b5,
- 0x04b7, 0x04b7,
- 0x04b9, 0x04b9,
- 0x04bb, 0x04bb,
- 0x04bd, 0x04bd,
- 0x04bf, 0x04bf,
- 0x04c2, 0x04c2,
- 0x04c4, 0x04c4,
- 0x04c6, 0x04c6,
- 0x04c8, 0x04c8,
- 0x04ca, 0x04ca,
- 0x04cc, 0x04cc,
- 0x04ce, 0x04cf,
- 0x04d1, 0x04d1,
- 0x04d3, 0x04d3,
- 0x04d5, 0x04d5,
- 0x04d7, 0x04d7,
- 0x04d9, 0x04d9,
- 0x04db, 0x04db,
- 0x04dd, 0x04dd,
- 0x04df, 0x04df,
- 0x04e1, 0x04e1,
- 0x04e3, 0x04e3,
- 0x04e5, 0x04e5,
- 0x04e7, 0x04e7,
- 0x04e9, 0x04e9,
- 0x04eb, 0x04eb,
- 0x04ed, 0x04ed,
- 0x04ef, 0x04ef,
- 0x04f1, 0x04f1,
- 0x04f3, 0x04f3,
- 0x04f5, 0x04f5,
- 0x04f7, 0x04f7,
- 0x04f9, 0x04f9,
- 0x04fb, 0x04fb,
- 0x04fd, 0x04fd,
- 0x04ff, 0x04ff,
- 0x0501, 0x0501,
- 0x0503, 0x0503,
- 0x0505, 0x0505,
- 0x0507, 0x0507,
- 0x0509, 0x0509,
- 0x050b, 0x050b,
- 0x050d, 0x050d,
- 0x050f, 0x050f,
- 0x0511, 0x0511,
- 0x0513, 0x0513,
- 0x0515, 0x0515,
- 0x0517, 0x0517,
- 0x0519, 0x0519,
- 0x051b, 0x051b,
- 0x051d, 0x051d,
- 0x051f, 0x051f,
- 0x0521, 0x0521,
- 0x0523, 0x0523,
- 0x0561, 0x0587,
- 0x1d00, 0x1d2b,
- 0x1d62, 0x1d77,
- 0x1d79, 0x1d9a,
- 0x1e01, 0x1e01,
- 0x1e03, 0x1e03,
- 0x1e05, 0x1e05,
- 0x1e07, 0x1e07,
- 0x1e09, 0x1e09,
- 0x1e0b, 0x1e0b,
- 0x1e0d, 0x1e0d,
- 0x1e0f, 0x1e0f,
- 0x1e11, 0x1e11,
- 0x1e13, 0x1e13,
- 0x1e15, 0x1e15,
- 0x1e17, 0x1e17,
- 0x1e19, 0x1e19,
- 0x1e1b, 0x1e1b,
- 0x1e1d, 0x1e1d,
- 0x1e1f, 0x1e1f,
- 0x1e21, 0x1e21,
- 0x1e23, 0x1e23,
- 0x1e25, 0x1e25,
- 0x1e27, 0x1e27,
- 0x1e29, 0x1e29,
- 0x1e2b, 0x1e2b,
- 0x1e2d, 0x1e2d,
- 0x1e2f, 0x1e2f,
- 0x1e31, 0x1e31,
- 0x1e33, 0x1e33,
- 0x1e35, 0x1e35,
- 0x1e37, 0x1e37,
- 0x1e39, 0x1e39,
- 0x1e3b, 0x1e3b,
- 0x1e3d, 0x1e3d,
- 0x1e3f, 0x1e3f,
- 0x1e41, 0x1e41,
- 0x1e43, 0x1e43,
- 0x1e45, 0x1e45,
- 0x1e47, 0x1e47,
- 0x1e49, 0x1e49,
- 0x1e4b, 0x1e4b,
- 0x1e4d, 0x1e4d,
- 0x1e4f, 0x1e4f,
- 0x1e51, 0x1e51,
- 0x1e53, 0x1e53,
- 0x1e55, 0x1e55,
- 0x1e57, 0x1e57,
- 0x1e59, 0x1e59,
- 0x1e5b, 0x1e5b,
- 0x1e5d, 0x1e5d,
- 0x1e5f, 0x1e5f,
- 0x1e61, 0x1e61,
- 0x1e63, 0x1e63,
- 0x1e65, 0x1e65,
- 0x1e67, 0x1e67,
- 0x1e69, 0x1e69,
- 0x1e6b, 0x1e6b,
- 0x1e6d, 0x1e6d,
- 0x1e6f, 0x1e6f,
- 0x1e71, 0x1e71,
- 0x1e73, 0x1e73,
- 0x1e75, 0x1e75,
- 0x1e77, 0x1e77,
- 0x1e79, 0x1e79,
- 0x1e7b, 0x1e7b,
- 0x1e7d, 0x1e7d,
- 0x1e7f, 0x1e7f,
- 0x1e81, 0x1e81,
- 0x1e83, 0x1e83,
- 0x1e85, 0x1e85,
- 0x1e87, 0x1e87,
- 0x1e89, 0x1e89,
- 0x1e8b, 0x1e8b,
- 0x1e8d, 0x1e8d,
- 0x1e8f, 0x1e8f,
- 0x1e91, 0x1e91,
- 0x1e93, 0x1e93,
- 0x1e95, 0x1e9d,
- 0x1e9f, 0x1e9f,
- 0x1ea1, 0x1ea1,
- 0x1ea3, 0x1ea3,
- 0x1ea5, 0x1ea5,
- 0x1ea7, 0x1ea7,
- 0x1ea9, 0x1ea9,
- 0x1eab, 0x1eab,
- 0x1ead, 0x1ead,
- 0x1eaf, 0x1eaf,
- 0x1eb1, 0x1eb1,
- 0x1eb3, 0x1eb3,
- 0x1eb5, 0x1eb5,
- 0x1eb7, 0x1eb7,
- 0x1eb9, 0x1eb9,
- 0x1ebb, 0x1ebb,
- 0x1ebd, 0x1ebd,
- 0x1ebf, 0x1ebf,
- 0x1ec1, 0x1ec1,
- 0x1ec3, 0x1ec3,
- 0x1ec5, 0x1ec5,
- 0x1ec7, 0x1ec7,
- 0x1ec9, 0x1ec9,
- 0x1ecb, 0x1ecb,
- 0x1ecd, 0x1ecd,
- 0x1ecf, 0x1ecf,
- 0x1ed1, 0x1ed1,
- 0x1ed3, 0x1ed3,
- 0x1ed5, 0x1ed5,
- 0x1ed7, 0x1ed7,
- 0x1ed9, 0x1ed9,
- 0x1edb, 0x1edb,
- 0x1edd, 0x1edd,
- 0x1edf, 0x1edf,
- 0x1ee1, 0x1ee1,
- 0x1ee3, 0x1ee3,
- 0x1ee5, 0x1ee5,
- 0x1ee7, 0x1ee7,
- 0x1ee9, 0x1ee9,
- 0x1eeb, 0x1eeb,
- 0x1eed, 0x1eed,
- 0x1eef, 0x1eef,
- 0x1ef1, 0x1ef1,
- 0x1ef3, 0x1ef3,
- 0x1ef5, 0x1ef5,
- 0x1ef7, 0x1ef7,
- 0x1ef9, 0x1ef9,
- 0x1efb, 0x1efb,
- 0x1efd, 0x1efd,
- 0x1eff, 0x1f07,
- 0x1f10, 0x1f15,
- 0x1f20, 0x1f27,
- 0x1f30, 0x1f37,
- 0x1f40, 0x1f45,
- 0x1f50, 0x1f57,
- 0x1f60, 0x1f67,
- 0x1f70, 0x1f7d,
- 0x1f80, 0x1f87,
- 0x1f90, 0x1f97,
- 0x1fa0, 0x1fa7,
- 0x1fb0, 0x1fb4,
- 0x1fb6, 0x1fb7,
- 0x1fbe, 0x1fbe,
- 0x1fc2, 0x1fc4,
- 0x1fc6, 0x1fc7,
- 0x1fd0, 0x1fd3,
- 0x1fd6, 0x1fd7,
- 0x1fe0, 0x1fe7,
- 0x1ff2, 0x1ff4,
- 0x1ff6, 0x1ff7,
- 0x2071, 0x2071,
- 0x207f, 0x207f,
- 0x210a, 0x210a,
- 0x210e, 0x210f,
- 0x2113, 0x2113,
- 0x212f, 0x212f,
- 0x2134, 0x2134,
- 0x2139, 0x2139,
- 0x213c, 0x213d,
- 0x2146, 0x2149,
- 0x214e, 0x214e,
- 0x2184, 0x2184,
- 0x2c30, 0x2c5e,
- 0x2c61, 0x2c61,
- 0x2c65, 0x2c66,
- 0x2c68, 0x2c68,
- 0x2c6a, 0x2c6a,
- 0x2c6c, 0x2c6c,
- 0x2c71, 0x2c71,
- 0x2c73, 0x2c74,
- 0x2c76, 0x2c7c,
- 0x2c81, 0x2c81,
- 0x2c83, 0x2c83,
- 0x2c85, 0x2c85,
- 0x2c87, 0x2c87,
- 0x2c89, 0x2c89,
- 0x2c8b, 0x2c8b,
- 0x2c8d, 0x2c8d,
- 0x2c8f, 0x2c8f,
- 0x2c91, 0x2c91,
- 0x2c93, 0x2c93,
- 0x2c95, 0x2c95,
- 0x2c97, 0x2c97,
- 0x2c99, 0x2c99,
- 0x2c9b, 0x2c9b,
- 0x2c9d, 0x2c9d,
- 0x2c9f, 0x2c9f,
- 0x2ca1, 0x2ca1,
- 0x2ca3, 0x2ca3,
- 0x2ca5, 0x2ca5,
- 0x2ca7, 0x2ca7,
- 0x2ca9, 0x2ca9,
- 0x2cab, 0x2cab,
- 0x2cad, 0x2cad,
- 0x2caf, 0x2caf,
- 0x2cb1, 0x2cb1,
- 0x2cb3, 0x2cb3,
- 0x2cb5, 0x2cb5,
- 0x2cb7, 0x2cb7,
- 0x2cb9, 0x2cb9,
- 0x2cbb, 0x2cbb,
- 0x2cbd, 0x2cbd,
- 0x2cbf, 0x2cbf,
- 0x2cc1, 0x2cc1,
- 0x2cc3, 0x2cc3,
- 0x2cc5, 0x2cc5,
- 0x2cc7, 0x2cc7,
- 0x2cc9, 0x2cc9,
- 0x2ccb, 0x2ccb,
- 0x2ccd, 0x2ccd,
- 0x2ccf, 0x2ccf,
- 0x2cd1, 0x2cd1,
- 0x2cd3, 0x2cd3,
- 0x2cd5, 0x2cd5,
- 0x2cd7, 0x2cd7,
- 0x2cd9, 0x2cd9,
- 0x2cdb, 0x2cdb,
- 0x2cdd, 0x2cdd,
- 0x2cdf, 0x2cdf,
- 0x2ce1, 0x2ce1,
- 0x2ce3, 0x2ce4,
- 0x2d00, 0x2d25,
- 0xa641, 0xa641,
- 0xa643, 0xa643,
- 0xa645, 0xa645,
- 0xa647, 0xa647,
- 0xa649, 0xa649,
- 0xa64b, 0xa64b,
- 0xa64d, 0xa64d,
- 0xa64f, 0xa64f,
- 0xa651, 0xa651,
- 0xa653, 0xa653,
- 0xa655, 0xa655,
- 0xa657, 0xa657,
- 0xa659, 0xa659,
- 0xa65b, 0xa65b,
- 0xa65d, 0xa65d,
- 0xa65f, 0xa65f,
- 0xa663, 0xa663,
- 0xa665, 0xa665,
- 0xa667, 0xa667,
- 0xa669, 0xa669,
- 0xa66b, 0xa66b,
- 0xa66d, 0xa66d,
- 0xa681, 0xa681,
- 0xa683, 0xa683,
- 0xa685, 0xa685,
- 0xa687, 0xa687,
- 0xa689, 0xa689,
- 0xa68b, 0xa68b,
- 0xa68d, 0xa68d,
- 0xa68f, 0xa68f,
- 0xa691, 0xa691,
- 0xa693, 0xa693,
- 0xa695, 0xa695,
- 0xa697, 0xa697,
- 0xa723, 0xa723,
- 0xa725, 0xa725,
- 0xa727, 0xa727,
- 0xa729, 0xa729,
- 0xa72b, 0xa72b,
- 0xa72d, 0xa72d,
- 0xa72f, 0xa731,
- 0xa733, 0xa733,
- 0xa735, 0xa735,
- 0xa737, 0xa737,
- 0xa739, 0xa739,
- 0xa73b, 0xa73b,
- 0xa73d, 0xa73d,
- 0xa73f, 0xa73f,
- 0xa741, 0xa741,
- 0xa743, 0xa743,
- 0xa745, 0xa745,
- 0xa747, 0xa747,
- 0xa749, 0xa749,
- 0xa74b, 0xa74b,
- 0xa74d, 0xa74d,
- 0xa74f, 0xa74f,
- 0xa751, 0xa751,
- 0xa753, 0xa753,
- 0xa755, 0xa755,
- 0xa757, 0xa757,
- 0xa759, 0xa759,
- 0xa75b, 0xa75b,
- 0xa75d, 0xa75d,
- 0xa75f, 0xa75f,
- 0xa761, 0xa761,
- 0xa763, 0xa763,
- 0xa765, 0xa765,
- 0xa767, 0xa767,
- 0xa769, 0xa769,
- 0xa76b, 0xa76b,
- 0xa76d, 0xa76d,
- 0xa76f, 0xa76f,
- 0xa771, 0xa778,
- 0xa77a, 0xa77a,
- 0xa77c, 0xa77c,
- 0xa77f, 0xa77f,
- 0xa781, 0xa781,
- 0xa783, 0xa783,
- 0xa785, 0xa785,
- 0xa787, 0xa787,
- 0xa78c, 0xa78c,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xff41, 0xff5a,
- 0x10428, 0x1044f,
- 0x1d41a, 0x1d433,
- 0x1d44e, 0x1d454,
- 0x1d456, 0x1d467,
- 0x1d482, 0x1d49b,
- 0x1d4b6, 0x1d4b9,
- 0x1d4bb, 0x1d4bb,
- 0x1d4bd, 0x1d4c3,
- 0x1d4c5, 0x1d4cf,
- 0x1d4ea, 0x1d503,
- 0x1d51e, 0x1d537,
- 0x1d552, 0x1d56b,
- 0x1d586, 0x1d59f,
- 0x1d5ba, 0x1d5d3,
- 0x1d5ee, 0x1d607,
- 0x1d622, 0x1d63b,
- 0x1d656, 0x1d66f,
- 0x1d68a, 0x1d6a5,
- 0x1d6c2, 0x1d6da,
- 0x1d6dc, 0x1d6e1,
- 0x1d6fc, 0x1d714,
- 0x1d716, 0x1d71b,
- 0x1d736, 0x1d74e,
- 0x1d750, 0x1d755,
- 0x1d770, 0x1d788,
- 0x1d78a, 0x1d78f,
- 0x1d7aa, 0x1d7c2,
- 0x1d7c4, 0x1d7c9,
- 0x1d7cb, 0x1d7cb,
-}; /* CR_Lower */
-
-/* 'Print': [[:Print:]] */
-static const OnigCodePoint CR_Print[] = {
- 452,
- 0x0009, 0x000d,
- 0x0020, 0x007e,
- 0x0085, 0x0085,
- 0x00a0, 0x00ac,
- 0x00ae, 0x0377,
- 0x037a, 0x037e,
- 0x0384, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x0523,
- 0x0531, 0x0556,
- 0x0559, 0x055f,
- 0x0561, 0x0587,
- 0x0589, 0x058a,
- 0x0591, 0x05c7,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0x0606, 0x061b,
- 0x061e, 0x061f,
- 0x0621, 0x065e,
- 0x0660, 0x06dc,
- 0x06de, 0x070d,
- 0x0710, 0x074a,
- 0x074d, 0x07b1,
- 0x07c0, 0x07fa,
- 0x0901, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0954,
- 0x0958, 0x0972,
- 0x097b, 0x097f,
- 0x0981, 0x0983,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bc, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09ce,
- 0x09d7, 0x09d7,
- 0x09dc, 0x09dd,
- 0x09df, 0x09e3,
- 0x09e6, 0x09fa,
- 0x0a01, 0x0a03,
- 0x0a05, 0x0a0a,
- 0x0a0f, 0x0a10,
- 0x0a13, 0x0a28,
- 0x0a2a, 0x0a30,
- 0x0a32, 0x0a33,
- 0x0a35, 0x0a36,
- 0x0a38, 0x0a39,
- 0x0a3c, 0x0a3c,
- 0x0a3e, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4d,
- 0x0a51, 0x0a51,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a66, 0x0a75,
- 0x0a81, 0x0a83,
- 0x0a85, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abc, 0x0ac5,
- 0x0ac7, 0x0ac9,
- 0x0acb, 0x0acd,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae3,
- 0x0ae6, 0x0aef,
- 0x0af1, 0x0af1,
- 0x0b01, 0x0b03,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b35, 0x0b39,
- 0x0b3c, 0x0b44,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b63,
- 0x0b66, 0x0b71,
- 0x0b82, 0x0b83,
- 0x0b85, 0x0b8a,
- 0x0b8e, 0x0b90,
- 0x0b92, 0x0b95,
- 0x0b99, 0x0b9a,
- 0x0b9c, 0x0b9c,
- 0x0b9e, 0x0b9f,
- 0x0ba3, 0x0ba4,
- 0x0ba8, 0x0baa,
- 0x0bae, 0x0bb9,
- 0x0bbe, 0x0bc2,
- 0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcd,
- 0x0bd0, 0x0bd0,
- 0x0bd7, 0x0bd7,
- 0x0be6, 0x0bfa,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3d, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c58, 0x0c59,
- 0x0c60, 0x0c63,
- 0x0c66, 0x0c6f,
- 0x0c78, 0x0c7f,
- 0x0c82, 0x0c83,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbc, 0x0cc4,
- 0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccd,
- 0x0cd5, 0x0cd6,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce3,
- 0x0ce6, 0x0cef,
- 0x0cf1, 0x0cf2,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3d, 0x0d44,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d63,
- 0x0d66, 0x0d75,
- 0x0d79, 0x0d7f,
- 0x0d82, 0x0d83,
- 0x0d85, 0x0d96,
- 0x0d9a, 0x0db1,
- 0x0db3, 0x0dbb,
- 0x0dbd, 0x0dbd,
- 0x0dc0, 0x0dc6,
- 0x0dca, 0x0dca,
- 0x0dcf, 0x0dd4,
- 0x0dd6, 0x0dd6,
- 0x0dd8, 0x0ddf,
- 0x0df2, 0x0df4,
- 0x0e01, 0x0e3a,
- 0x0e3f, 0x0e5b,
- 0x0e81, 0x0e82,
- 0x0e84, 0x0e84,
- 0x0e87, 0x0e88,
- 0x0e8a, 0x0e8a,
- 0x0e8d, 0x0e8d,
- 0x0e94, 0x0e97,
- 0x0e99, 0x0e9f,
- 0x0ea1, 0x0ea3,
- 0x0ea5, 0x0ea5,
- 0x0ea7, 0x0ea7,
- 0x0eaa, 0x0eab,
- 0x0ead, 0x0eb9,
- 0x0ebb, 0x0ebd,
- 0x0ec0, 0x0ec4,
- 0x0ec6, 0x0ec6,
- 0x0ec8, 0x0ecd,
- 0x0ed0, 0x0ed9,
- 0x0edc, 0x0edd,
- 0x0f00, 0x0f47,
- 0x0f49, 0x0f6c,
- 0x0f71, 0x0f8b,
- 0x0f90, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fbe, 0x0fcc,
- 0x0fce, 0x0fd4,
- 0x1000, 0x1099,
- 0x109e, 0x10c5,
- 0x10d0, 0x10fc,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x1200, 0x1248,
- 0x124a, 0x124d,
- 0x1250, 0x1256,
- 0x1258, 0x1258,
- 0x125a, 0x125d,
- 0x1260, 0x1288,
- 0x128a, 0x128d,
- 0x1290, 0x12b0,
- 0x12b2, 0x12b5,
- 0x12b8, 0x12be,
- 0x12c0, 0x12c0,
- 0x12c2, 0x12c5,
- 0x12c8, 0x12d6,
- 0x12d8, 0x1310,
- 0x1312, 0x1315,
- 0x1318, 0x135a,
- 0x135f, 0x137c,
- 0x1380, 0x1399,
- 0x13a0, 0x13f4,
- 0x1401, 0x1676,
- 0x1680, 0x169c,
- 0x16a0, 0x16f0,
- 0x1700, 0x170c,
- 0x170e, 0x1714,
- 0x1720, 0x1736,
- 0x1740, 0x1753,
- 0x1760, 0x176c,
- 0x176e, 0x1770,
- 0x1772, 0x1773,
- 0x1780, 0x17b3,
- 0x17b6, 0x17dd,
- 0x17e0, 0x17e9,
- 0x17f0, 0x17f9,
- 0x1800, 0x180e,
- 0x1810, 0x1819,
- 0x1820, 0x1877,
- 0x1880, 0x18aa,
- 0x1900, 0x191c,
- 0x1920, 0x192b,
- 0x1930, 0x193b,
- 0x1940, 0x1940,
- 0x1944, 0x196d,
- 0x1970, 0x1974,
- 0x1980, 0x19a9,
- 0x19b0, 0x19c9,
- 0x19d0, 0x19d9,
- 0x19de, 0x1a1b,
- 0x1a1e, 0x1a1f,
- 0x1b00, 0x1b4b,
- 0x1b50, 0x1b7c,
- 0x1b80, 0x1baa,
- 0x1bae, 0x1bb9,
- 0x1c00, 0x1c37,
- 0x1c3b, 0x1c49,
- 0x1c4d, 0x1c7f,
- 0x1d00, 0x1de6,
- 0x1dfe, 0x1f15,
- 0x1f18, 0x1f1d,
- 0x1f20, 0x1f45,
- 0x1f48, 0x1f4d,
- 0x1f50, 0x1f57,
- 0x1f59, 0x1f59,
- 0x1f5b, 0x1f5b,
- 0x1f5d, 0x1f5d,
- 0x1f5f, 0x1f7d,
- 0x1f80, 0x1fb4,
- 0x1fb6, 0x1fc4,
- 0x1fc6, 0x1fd3,
- 0x1fd6, 0x1fdb,
- 0x1fdd, 0x1fef,
- 0x1ff2, 0x1ff4,
- 0x1ff6, 0x1ffe,
- 0x2000, 0x200a,
- 0x2010, 0x2029,
- 0x202f, 0x205f,
- 0x2070, 0x2071,
- 0x2074, 0x208e,
- 0x2090, 0x2094,
- 0x20a0, 0x20b5,
- 0x20d0, 0x20f0,
- 0x2100, 0x214f,
- 0x2153, 0x2188,
- 0x2190, 0x23e7,
- 0x2400, 0x2426,
- 0x2440, 0x244a,
- 0x2460, 0x269d,
- 0x26a0, 0x26bc,
- 0x26c0, 0x26c3,
- 0x2701, 0x2704,
- 0x2706, 0x2709,
- 0x270c, 0x2727,
- 0x2729, 0x274b,
- 0x274d, 0x274d,
- 0x274f, 0x2752,
- 0x2756, 0x2756,
- 0x2758, 0x275e,
- 0x2761, 0x2794,
- 0x2798, 0x27af,
- 0x27b1, 0x27be,
- 0x27c0, 0x27ca,
- 0x27cc, 0x27cc,
- 0x27d0, 0x2b4c,
- 0x2b50, 0x2b54,
- 0x2c00, 0x2c2e,
- 0x2c30, 0x2c5e,
- 0x2c60, 0x2c6f,
- 0x2c71, 0x2c7d,
- 0x2c80, 0x2cea,
- 0x2cf9, 0x2d25,
- 0x2d30, 0x2d65,
- 0x2d6f, 0x2d6f,
- 0x2d80, 0x2d96,
- 0x2da0, 0x2da6,
- 0x2da8, 0x2dae,
- 0x2db0, 0x2db6,
- 0x2db8, 0x2dbe,
- 0x2dc0, 0x2dc6,
- 0x2dc8, 0x2dce,
- 0x2dd0, 0x2dd6,
- 0x2dd8, 0x2dde,
- 0x2de0, 0x2e30,
- 0x2e80, 0x2e99,
- 0x2e9b, 0x2ef3,
- 0x2f00, 0x2fd5,
- 0x2ff0, 0x2ffb,
- 0x3000, 0x303f,
- 0x3041, 0x3096,
- 0x3099, 0x30ff,
- 0x3105, 0x312d,
- 0x3131, 0x318e,
- 0x3190, 0x31b7,
- 0x31c0, 0x31e3,
- 0x31f0, 0x321e,
- 0x3220, 0x3243,
- 0x3250, 0x32fe,
- 0x3300, 0x3400,
- 0x4db5, 0x4db5,
- 0x4dc0, 0x4e00,
- 0x9fc3, 0x9fc3,
- 0xa000, 0xa48c,
- 0xa490, 0xa4c6,
- 0xa500, 0xa62b,
- 0xa640, 0xa65f,
- 0xa662, 0xa673,
- 0xa67c, 0xa697,
- 0xa700, 0xa78c,
- 0xa7fb, 0xa82b,
- 0xa840, 0xa877,
- 0xa880, 0xa8c4,
- 0xa8ce, 0xa8d9,
- 0xa900, 0xa953,
- 0xa95f, 0xa95f,
- 0xaa00, 0xaa36,
- 0xaa40, 0xaa4d,
- 0xaa50, 0xaa59,
- 0xaa5c, 0xaa5f,
- 0xac00, 0xac00,
- 0xd7a3, 0xd7a3,
- 0xf900, 0xfa2d,
- 0xfa30, 0xfa6a,
- 0xfa70, 0xfad9,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xfb1d, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbb1,
- 0xfbd3, 0xfd3f,
- 0xfd50, 0xfd8f,
- 0xfd92, 0xfdc7,
- 0xfdf0, 0xfdfd,
- 0xfe00, 0xfe19,
- 0xfe20, 0xfe26,
- 0xfe30, 0xfe52,
- 0xfe54, 0xfe66,
- 0xfe68, 0xfe6b,
- 0xfe70, 0xfe74,
- 0xfe76, 0xfefc,
- 0xff01, 0xffbe,
- 0xffc2, 0xffc7,
- 0xffca, 0xffcf,
- 0xffd2, 0xffd7,
- 0xffda, 0xffdc,
- 0xffe0, 0xffe6,
- 0xffe8, 0xffee,
- 0xfffc, 0xfffd,
- 0x10000, 0x1000b,
- 0x1000d, 0x10026,
- 0x10028, 0x1003a,
- 0x1003c, 0x1003d,
- 0x1003f, 0x1004d,
- 0x10050, 0x1005d,
- 0x10080, 0x100fa,
- 0x10100, 0x10102,
- 0x10107, 0x10133,
- 0x10137, 0x1018a,
- 0x10190, 0x1019b,
- 0x101d0, 0x101fd,
- 0x10280, 0x1029c,
- 0x102a0, 0x102d0,
- 0x10300, 0x1031e,
- 0x10320, 0x10323,
- 0x10330, 0x1034a,
- 0x10380, 0x1039d,
- 0x1039f, 0x103c3,
- 0x103c8, 0x103d5,
- 0x10400, 0x1049d,
- 0x104a0, 0x104a9,
- 0x10800, 0x10805,
- 0x10808, 0x10808,
- 0x1080a, 0x10835,
- 0x10837, 0x10838,
- 0x1083c, 0x1083c,
- 0x1083f, 0x1083f,
- 0x10900, 0x10919,
- 0x1091f, 0x10939,
- 0x1093f, 0x1093f,
- 0x10a00, 0x10a03,
- 0x10a05, 0x10a06,
- 0x10a0c, 0x10a13,
- 0x10a15, 0x10a17,
- 0x10a19, 0x10a33,
- 0x10a38, 0x10a3a,
- 0x10a3f, 0x10a47,
- 0x10a50, 0x10a58,
- 0x12000, 0x1236e,
- 0x12400, 0x12462,
- 0x12470, 0x12473,
- 0x1d000, 0x1d0f5,
- 0x1d100, 0x1d126,
- 0x1d129, 0x1d172,
- 0x1d17b, 0x1d1dd,
- 0x1d200, 0x1d245,
- 0x1d300, 0x1d356,
- 0x1d360, 0x1d371,
- 0x1d400, 0x1d454,
- 0x1d456, 0x1d49c,
- 0x1d49e, 0x1d49f,
- 0x1d4a2, 0x1d4a2,
- 0x1d4a5, 0x1d4a6,
- 0x1d4a9, 0x1d4ac,
- 0x1d4ae, 0x1d4b9,
- 0x1d4bb, 0x1d4bb,
- 0x1d4bd, 0x1d4c3,
- 0x1d4c5, 0x1d505,
- 0x1d507, 0x1d50a,
- 0x1d50d, 0x1d514,
- 0x1d516, 0x1d51c,
- 0x1d51e, 0x1d539,
- 0x1d53b, 0x1d53e,
- 0x1d540, 0x1d544,
- 0x1d546, 0x1d546,
- 0x1d54a, 0x1d550,
- 0x1d552, 0x1d6a5,
- 0x1d6a8, 0x1d7cb,
- 0x1d7ce, 0x1d7ff,
- 0x1f000, 0x1f02b,
- 0x1f030, 0x1f093,
- 0x20000, 0x20000,
- 0x2a6d6, 0x2a6d6,
- 0x2f800, 0x2fa1d,
- 0xe0100, 0xe01ef,
-}; /* CR_Print */
-
-/* 'Punct': [[:Punct:]] */
-static const OnigCodePoint CR_Punct[] = {
- 112,
- 0x0021, 0x0023,
- 0x0025, 0x002a,
- 0x002c, 0x002f,
- 0x003a, 0x003b,
- 0x003f, 0x0040,
- 0x005b, 0x005d,
- 0x005f, 0x005f,
- 0x007b, 0x007b,
- 0x007d, 0x007d,
- 0x00a1, 0x00a1,
- 0x00ab, 0x00ab,
- 0x00b7, 0x00b7,
- 0x00bb, 0x00bb,
- 0x00bf, 0x00bf,
- 0x037e, 0x037e,
- 0x0387, 0x0387,
- 0x055a, 0x055f,
- 0x0589, 0x058a,
- 0x05be, 0x05be,
- 0x05c0, 0x05c0,
- 0x05c3, 0x05c3,
- 0x05c6, 0x05c6,
- 0x05f3, 0x05f4,
- 0x0609, 0x060a,
- 0x060c, 0x060d,
- 0x061b, 0x061b,
- 0x061e, 0x061f,
- 0x066a, 0x066d,
- 0x06d4, 0x06d4,
- 0x0700, 0x070d,
- 0x07f7, 0x07f9,
- 0x0964, 0x0965,
- 0x0970, 0x0970,
- 0x0df4, 0x0df4,
- 0x0e4f, 0x0e4f,
- 0x0e5a, 0x0e5b,
- 0x0f04, 0x0f12,
- 0x0f3a, 0x0f3d,
- 0x0f85, 0x0f85,
- 0x0fd0, 0x0fd4,
- 0x104a, 0x104f,
- 0x10fb, 0x10fb,
- 0x1361, 0x1368,
- 0x166d, 0x166e,
- 0x169b, 0x169c,
- 0x16eb, 0x16ed,
- 0x1735, 0x1736,
- 0x17d4, 0x17d6,
- 0x17d8, 0x17da,
- 0x1800, 0x180a,
- 0x1944, 0x1945,
- 0x19de, 0x19df,
- 0x1a1e, 0x1a1f,
- 0x1b5a, 0x1b60,
- 0x1c3b, 0x1c3f,
- 0x1c7e, 0x1c7f,
- 0x2010, 0x2027,
- 0x2030, 0x2043,
- 0x2045, 0x2051,
- 0x2053, 0x205e,
- 0x207d, 0x207e,
- 0x208d, 0x208e,
- 0x2329, 0x232a,
- 0x2768, 0x2775,
- 0x27c5, 0x27c6,
- 0x27e6, 0x27ef,
- 0x2983, 0x2998,
- 0x29d8, 0x29db,
- 0x29fc, 0x29fd,
- 0x2cf9, 0x2cfc,
- 0x2cfe, 0x2cff,
- 0x2e00, 0x2e2e,
- 0x2e30, 0x2e30,
- 0x3001, 0x3003,
- 0x3008, 0x3011,
- 0x3014, 0x301f,
- 0x3030, 0x3030,
- 0x303d, 0x303d,
- 0x30a0, 0x30a0,
- 0x30fb, 0x30fb,
- 0xa60d, 0xa60f,
- 0xa673, 0xa673,
- 0xa67e, 0xa67e,
- 0xa874, 0xa877,
- 0xa8ce, 0xa8cf,
- 0xa92e, 0xa92f,
- 0xa95f, 0xa95f,
- 0xaa5c, 0xaa5f,
- 0xfd3e, 0xfd3f,
- 0xfe10, 0xfe19,
- 0xfe30, 0xfe52,
- 0xfe54, 0xfe61,
- 0xfe63, 0xfe63,
- 0xfe68, 0xfe68,
- 0xfe6a, 0xfe6b,
- 0xff01, 0xff03,
- 0xff05, 0xff0a,
- 0xff0c, 0xff0f,
- 0xff1a, 0xff1b,
- 0xff1f, 0xff20,
- 0xff3b, 0xff3d,
- 0xff3f, 0xff3f,
- 0xff5b, 0xff5b,
- 0xff5d, 0xff5d,
- 0xff5f, 0xff65,
- 0x10100, 0x10101,
- 0x1039f, 0x1039f,
- 0x103d0, 0x103d0,
- 0x1091f, 0x1091f,
- 0x1093f, 0x1093f,
- 0x10a50, 0x10a58,
- 0x12470, 0x12473,
-}; /* CR_Punct */
-
-/* 'Space': [[:Space:]] */
-static const OnigCodePoint CR_Space[] = {
- 11,
- 0x0009, 0x000d,
- 0x0020, 0x0020,
- 0x0085, 0x0085,
- 0x00a0, 0x00a0,
- 0x1680, 0x1680,
- 0x180e, 0x180e,
- 0x2000, 0x200a,
- 0x2028, 0x2029,
- 0x202f, 0x202f,
- 0x205f, 0x205f,
- 0x3000, 0x3000,
-}; /* CR_Space */
-
-/* 'Upper': [[:Upper:]] */
-static const OnigCodePoint CR_Upper[] = {
- 591,
- 0x0041, 0x005a,
- 0x00c0, 0x00d6,
- 0x00d8, 0x00de,
- 0x0100, 0x0100,
- 0x0102, 0x0102,
- 0x0104, 0x0104,
- 0x0106, 0x0106,
- 0x0108, 0x0108,
- 0x010a, 0x010a,
- 0x010c, 0x010c,
- 0x010e, 0x010e,
- 0x0110, 0x0110,
- 0x0112, 0x0112,
- 0x0114, 0x0114,
- 0x0116, 0x0116,
- 0x0118, 0x0118,
- 0x011a, 0x011a,
- 0x011c, 0x011c,
- 0x011e, 0x011e,
- 0x0120, 0x0120,
- 0x0122, 0x0122,
- 0x0124, 0x0124,
- 0x0126, 0x0126,
- 0x0128, 0x0128,
- 0x012a, 0x012a,
- 0x012c, 0x012c,
- 0x012e, 0x012e,
- 0x0130, 0x0130,
- 0x0132, 0x0132,
- 0x0134, 0x0134,
- 0x0136, 0x0136,
- 0x0139, 0x0139,
- 0x013b, 0x013b,
- 0x013d, 0x013d,
- 0x013f, 0x013f,
- 0x0141, 0x0141,
- 0x0143, 0x0143,
- 0x0145, 0x0145,
- 0x0147, 0x0147,
- 0x014a, 0x014a,
- 0x014c, 0x014c,
- 0x014e, 0x014e,
- 0x0150, 0x0150,
- 0x0152, 0x0152,
- 0x0154, 0x0154,
- 0x0156, 0x0156,
- 0x0158, 0x0158,
- 0x015a, 0x015a,
- 0x015c, 0x015c,
- 0x015e, 0x015e,
- 0x0160, 0x0160,
- 0x0162, 0x0162,
- 0x0164, 0x0164,
- 0x0166, 0x0166,
- 0x0168, 0x0168,
- 0x016a, 0x016a,
- 0x016c, 0x016c,
- 0x016e, 0x016e,
- 0x0170, 0x0170,
- 0x0172, 0x0172,
- 0x0174, 0x0174,
- 0x0176, 0x0176,
- 0x0178, 0x0179,
- 0x017b, 0x017b,
- 0x017d, 0x017d,
- 0x0181, 0x0182,
- 0x0184, 0x0184,
- 0x0186, 0x0187,
- 0x0189, 0x018b,
- 0x018e, 0x0191,
- 0x0193, 0x0194,
- 0x0196, 0x0198,
- 0x019c, 0x019d,
- 0x019f, 0x01a0,
- 0x01a2, 0x01a2,
- 0x01a4, 0x01a4,
- 0x01a6, 0x01a7,
- 0x01a9, 0x01a9,
- 0x01ac, 0x01ac,
- 0x01ae, 0x01af,
- 0x01b1, 0x01b3,
- 0x01b5, 0x01b5,
- 0x01b7, 0x01b8,
- 0x01bc, 0x01bc,
- 0x01c4, 0x01c4,
- 0x01c7, 0x01c7,
- 0x01ca, 0x01ca,
- 0x01cd, 0x01cd,
- 0x01cf, 0x01cf,
- 0x01d1, 0x01d1,
- 0x01d3, 0x01d3,
- 0x01d5, 0x01d5,
- 0x01d7, 0x01d7,
- 0x01d9, 0x01d9,
- 0x01db, 0x01db,
- 0x01de, 0x01de,
- 0x01e0, 0x01e0,
- 0x01e2, 0x01e2,
- 0x01e4, 0x01e4,
- 0x01e6, 0x01e6,
- 0x01e8, 0x01e8,
- 0x01ea, 0x01ea,
- 0x01ec, 0x01ec,
- 0x01ee, 0x01ee,
- 0x01f1, 0x01f1,
- 0x01f4, 0x01f4,
- 0x01f6, 0x01f8,
- 0x01fa, 0x01fa,
- 0x01fc, 0x01fc,
- 0x01fe, 0x01fe,
- 0x0200, 0x0200,
- 0x0202, 0x0202,
- 0x0204, 0x0204,
- 0x0206, 0x0206,
- 0x0208, 0x0208,
- 0x020a, 0x020a,
- 0x020c, 0x020c,
- 0x020e, 0x020e,
- 0x0210, 0x0210,
- 0x0212, 0x0212,
- 0x0214, 0x0214,
- 0x0216, 0x0216,
- 0x0218, 0x0218,
- 0x021a, 0x021a,
- 0x021c, 0x021c,
- 0x021e, 0x021e,
- 0x0220, 0x0220,
- 0x0222, 0x0222,
- 0x0224, 0x0224,
- 0x0226, 0x0226,
- 0x0228, 0x0228,
- 0x022a, 0x022a,
- 0x022c, 0x022c,
- 0x022e, 0x022e,
- 0x0230, 0x0230,
- 0x0232, 0x0232,
- 0x023a, 0x023b,
- 0x023d, 0x023e,
- 0x0241, 0x0241,
- 0x0243, 0x0246,
- 0x0248, 0x0248,
- 0x024a, 0x024a,
- 0x024c, 0x024c,
- 0x024e, 0x024e,
- 0x0370, 0x0370,
- 0x0372, 0x0372,
- 0x0376, 0x0376,
- 0x0386, 0x0386,
- 0x0388, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x038f,
- 0x0391, 0x03a1,
- 0x03a3, 0x03ab,
- 0x03cf, 0x03cf,
- 0x03d2, 0x03d4,
- 0x03d8, 0x03d8,
- 0x03da, 0x03da,
- 0x03dc, 0x03dc,
- 0x03de, 0x03de,
- 0x03e0, 0x03e0,
- 0x03e2, 0x03e2,
- 0x03e4, 0x03e4,
- 0x03e6, 0x03e6,
- 0x03e8, 0x03e8,
- 0x03ea, 0x03ea,
- 0x03ec, 0x03ec,
- 0x03ee, 0x03ee,
- 0x03f4, 0x03f4,
- 0x03f7, 0x03f7,
- 0x03f9, 0x03fa,
- 0x03fd, 0x042f,
- 0x0460, 0x0460,
- 0x0462, 0x0462,
- 0x0464, 0x0464,
- 0x0466, 0x0466,
- 0x0468, 0x0468,
- 0x046a, 0x046a,
- 0x046c, 0x046c,
- 0x046e, 0x046e,
- 0x0470, 0x0470,
- 0x0472, 0x0472,
- 0x0474, 0x0474,
- 0x0476, 0x0476,
- 0x0478, 0x0478,
- 0x047a, 0x047a,
- 0x047c, 0x047c,
- 0x047e, 0x047e,
- 0x0480, 0x0480,
- 0x048a, 0x048a,
- 0x048c, 0x048c,
- 0x048e, 0x048e,
- 0x0490, 0x0490,
- 0x0492, 0x0492,
- 0x0494, 0x0494,
- 0x0496, 0x0496,
- 0x0498, 0x0498,
- 0x049a, 0x049a,
- 0x049c, 0x049c,
- 0x049e, 0x049e,
- 0x04a0, 0x04a0,
- 0x04a2, 0x04a2,
- 0x04a4, 0x04a4,
- 0x04a6, 0x04a6,
- 0x04a8, 0x04a8,
- 0x04aa, 0x04aa,
- 0x04ac, 0x04ac,
- 0x04ae, 0x04ae,
- 0x04b0, 0x04b0,
- 0x04b2, 0x04b2,
- 0x04b4, 0x04b4,
- 0x04b6, 0x04b6,
- 0x04b8, 0x04b8,
- 0x04ba, 0x04ba,
- 0x04bc, 0x04bc,
- 0x04be, 0x04be,
- 0x04c0, 0x04c1,
- 0x04c3, 0x04c3,
- 0x04c5, 0x04c5,
- 0x04c7, 0x04c7,
- 0x04c9, 0x04c9,
- 0x04cb, 0x04cb,
- 0x04cd, 0x04cd,
- 0x04d0, 0x04d0,
- 0x04d2, 0x04d2,
- 0x04d4, 0x04d4,
- 0x04d6, 0x04d6,
- 0x04d8, 0x04d8,
- 0x04da, 0x04da,
- 0x04dc, 0x04dc,
- 0x04de, 0x04de,
- 0x04e0, 0x04e0,
- 0x04e2, 0x04e2,
- 0x04e4, 0x04e4,
- 0x04e6, 0x04e6,
- 0x04e8, 0x04e8,
- 0x04ea, 0x04ea,
- 0x04ec, 0x04ec,
- 0x04ee, 0x04ee,
- 0x04f0, 0x04f0,
- 0x04f2, 0x04f2,
- 0x04f4, 0x04f4,
- 0x04f6, 0x04f6,
- 0x04f8, 0x04f8,
- 0x04fa, 0x04fa,
- 0x04fc, 0x04fc,
- 0x04fe, 0x04fe,
- 0x0500, 0x0500,
- 0x0502, 0x0502,
- 0x0504, 0x0504,
- 0x0506, 0x0506,
- 0x0508, 0x0508,
- 0x050a, 0x050a,
- 0x050c, 0x050c,
- 0x050e, 0x050e,
- 0x0510, 0x0510,
- 0x0512, 0x0512,
- 0x0514, 0x0514,
- 0x0516, 0x0516,
- 0x0518, 0x0518,
- 0x051a, 0x051a,
- 0x051c, 0x051c,
- 0x051e, 0x051e,
- 0x0520, 0x0520,
- 0x0522, 0x0522,
- 0x0531, 0x0556,
- 0x10a0, 0x10c5,
- 0x1e00, 0x1e00,
- 0x1e02, 0x1e02,
- 0x1e04, 0x1e04,
- 0x1e06, 0x1e06,
- 0x1e08, 0x1e08,
- 0x1e0a, 0x1e0a,
- 0x1e0c, 0x1e0c,
- 0x1e0e, 0x1e0e,
- 0x1e10, 0x1e10,
- 0x1e12, 0x1e12,
- 0x1e14, 0x1e14,
- 0x1e16, 0x1e16,
- 0x1e18, 0x1e18,
- 0x1e1a, 0x1e1a,
- 0x1e1c, 0x1e1c,
- 0x1e1e, 0x1e1e,
- 0x1e20, 0x1e20,
- 0x1e22, 0x1e22,
- 0x1e24, 0x1e24,
- 0x1e26, 0x1e26,
- 0x1e28, 0x1e28,
- 0x1e2a, 0x1e2a,
- 0x1e2c, 0x1e2c,
- 0x1e2e, 0x1e2e,
- 0x1e30, 0x1e30,
- 0x1e32, 0x1e32,
- 0x1e34, 0x1e34,
- 0x1e36, 0x1e36,
- 0x1e38, 0x1e38,
- 0x1e3a, 0x1e3a,
- 0x1e3c, 0x1e3c,
- 0x1e3e, 0x1e3e,
- 0x1e40, 0x1e40,
- 0x1e42, 0x1e42,
- 0x1e44, 0x1e44,
- 0x1e46, 0x1e46,
- 0x1e48, 0x1e48,
- 0x1e4a, 0x1e4a,
- 0x1e4c, 0x1e4c,
- 0x1e4e, 0x1e4e,
- 0x1e50, 0x1e50,
- 0x1e52, 0x1e52,
- 0x1e54, 0x1e54,
- 0x1e56, 0x1e56,
- 0x1e58, 0x1e58,
- 0x1e5a, 0x1e5a,
- 0x1e5c, 0x1e5c,
- 0x1e5e, 0x1e5e,
- 0x1e60, 0x1e60,
- 0x1e62, 0x1e62,
- 0x1e64, 0x1e64,
- 0x1e66, 0x1e66,
- 0x1e68, 0x1e68,
- 0x1e6a, 0x1e6a,
- 0x1e6c, 0x1e6c,
- 0x1e6e, 0x1e6e,
- 0x1e70, 0x1e70,
- 0x1e72, 0x1e72,
- 0x1e74, 0x1e74,
- 0x1e76, 0x1e76,
- 0x1e78, 0x1e78,
- 0x1e7a, 0x1e7a,
- 0x1e7c, 0x1e7c,
- 0x1e7e, 0x1e7e,
- 0x1e80, 0x1e80,
- 0x1e82, 0x1e82,
- 0x1e84, 0x1e84,
- 0x1e86, 0x1e86,
- 0x1e88, 0x1e88,
- 0x1e8a, 0x1e8a,
- 0x1e8c, 0x1e8c,
- 0x1e8e, 0x1e8e,
- 0x1e90, 0x1e90,
- 0x1e92, 0x1e92,
- 0x1e94, 0x1e94,
- 0x1e9e, 0x1e9e,
- 0x1ea0, 0x1ea0,
- 0x1ea2, 0x1ea2,
- 0x1ea4, 0x1ea4,
- 0x1ea6, 0x1ea6,
- 0x1ea8, 0x1ea8,
- 0x1eaa, 0x1eaa,
- 0x1eac, 0x1eac,
- 0x1eae, 0x1eae,
- 0x1eb0, 0x1eb0,
- 0x1eb2, 0x1eb2,
- 0x1eb4, 0x1eb4,
- 0x1eb6, 0x1eb6,
- 0x1eb8, 0x1eb8,
- 0x1eba, 0x1eba,
- 0x1ebc, 0x1ebc,
- 0x1ebe, 0x1ebe,
- 0x1ec0, 0x1ec0,
- 0x1ec2, 0x1ec2,
- 0x1ec4, 0x1ec4,
- 0x1ec6, 0x1ec6,
- 0x1ec8, 0x1ec8,
- 0x1eca, 0x1eca,
- 0x1ecc, 0x1ecc,
- 0x1ece, 0x1ece,
- 0x1ed0, 0x1ed0,
- 0x1ed2, 0x1ed2,
- 0x1ed4, 0x1ed4,
- 0x1ed6, 0x1ed6,
- 0x1ed8, 0x1ed8,
- 0x1eda, 0x1eda,
- 0x1edc, 0x1edc,
- 0x1ede, 0x1ede,
- 0x1ee0, 0x1ee0,
- 0x1ee2, 0x1ee2,
- 0x1ee4, 0x1ee4,
- 0x1ee6, 0x1ee6,
- 0x1ee8, 0x1ee8,
- 0x1eea, 0x1eea,
- 0x1eec, 0x1eec,
- 0x1eee, 0x1eee,
- 0x1ef0, 0x1ef0,
- 0x1ef2, 0x1ef2,
- 0x1ef4, 0x1ef4,
- 0x1ef6, 0x1ef6,
- 0x1ef8, 0x1ef8,
- 0x1efa, 0x1efa,
- 0x1efc, 0x1efc,
- 0x1efe, 0x1efe,
- 0x1f08, 0x1f0f,
- 0x1f18, 0x1f1d,
- 0x1f28, 0x1f2f,
- 0x1f38, 0x1f3f,
- 0x1f48, 0x1f4d,
- 0x1f59, 0x1f59,
- 0x1f5b, 0x1f5b,
- 0x1f5d, 0x1f5d,
- 0x1f5f, 0x1f5f,
- 0x1f68, 0x1f6f,
- 0x1fb8, 0x1fbb,
- 0x1fc8, 0x1fcb,
- 0x1fd8, 0x1fdb,
- 0x1fe8, 0x1fec,
- 0x1ff8, 0x1ffb,
- 0x2102, 0x2102,
- 0x2107, 0x2107,
- 0x210b, 0x210d,
- 0x2110, 0x2112,
- 0x2115, 0x2115,
- 0x2119, 0x211d,
- 0x2124, 0x2124,
- 0x2126, 0x2126,
- 0x2128, 0x2128,
- 0x212a, 0x212d,
- 0x2130, 0x2133,
- 0x213e, 0x213f,
- 0x2145, 0x2145,
- 0x2183, 0x2183,
- 0x2c00, 0x2c2e,
- 0x2c60, 0x2c60,
- 0x2c62, 0x2c64,
- 0x2c67, 0x2c67,
- 0x2c69, 0x2c69,
- 0x2c6b, 0x2c6b,
- 0x2c6d, 0x2c6f,
- 0x2c72, 0x2c72,
- 0x2c75, 0x2c75,
- 0x2c80, 0x2c80,
- 0x2c82, 0x2c82,
- 0x2c84, 0x2c84,
- 0x2c86, 0x2c86,
- 0x2c88, 0x2c88,
- 0x2c8a, 0x2c8a,
- 0x2c8c, 0x2c8c,
- 0x2c8e, 0x2c8e,
- 0x2c90, 0x2c90,
- 0x2c92, 0x2c92,
- 0x2c94, 0x2c94,
- 0x2c96, 0x2c96,
- 0x2c98, 0x2c98,
- 0x2c9a, 0x2c9a,
- 0x2c9c, 0x2c9c,
- 0x2c9e, 0x2c9e,
- 0x2ca0, 0x2ca0,
- 0x2ca2, 0x2ca2,
- 0x2ca4, 0x2ca4,
- 0x2ca6, 0x2ca6,
- 0x2ca8, 0x2ca8,
- 0x2caa, 0x2caa,
- 0x2cac, 0x2cac,
- 0x2cae, 0x2cae,
- 0x2cb0, 0x2cb0,
- 0x2cb2, 0x2cb2,
- 0x2cb4, 0x2cb4,
- 0x2cb6, 0x2cb6,
- 0x2cb8, 0x2cb8,
- 0x2cba, 0x2cba,
- 0x2cbc, 0x2cbc,
- 0x2cbe, 0x2cbe,
- 0x2cc0, 0x2cc0,
- 0x2cc2, 0x2cc2,
- 0x2cc4, 0x2cc4,
- 0x2cc6, 0x2cc6,
- 0x2cc8, 0x2cc8,
- 0x2cca, 0x2cca,
- 0x2ccc, 0x2ccc,
- 0x2cce, 0x2cce,
- 0x2cd0, 0x2cd0,
- 0x2cd2, 0x2cd2,
- 0x2cd4, 0x2cd4,
- 0x2cd6, 0x2cd6,
- 0x2cd8, 0x2cd8,
- 0x2cda, 0x2cda,
- 0x2cdc, 0x2cdc,
- 0x2cde, 0x2cde,
- 0x2ce0, 0x2ce0,
- 0x2ce2, 0x2ce2,
- 0xa640, 0xa640,
- 0xa642, 0xa642,
- 0xa644, 0xa644,
- 0xa646, 0xa646,
- 0xa648, 0xa648,
- 0xa64a, 0xa64a,
- 0xa64c, 0xa64c,
- 0xa64e, 0xa64e,
- 0xa650, 0xa650,
- 0xa652, 0xa652,
- 0xa654, 0xa654,
- 0xa656, 0xa656,
- 0xa658, 0xa658,
- 0xa65a, 0xa65a,
- 0xa65c, 0xa65c,
- 0xa65e, 0xa65e,
- 0xa662, 0xa662,
- 0xa664, 0xa664,
- 0xa666, 0xa666,
- 0xa668, 0xa668,
- 0xa66a, 0xa66a,
- 0xa66c, 0xa66c,
- 0xa680, 0xa680,
- 0xa682, 0xa682,
- 0xa684, 0xa684,
- 0xa686, 0xa686,
- 0xa688, 0xa688,
- 0xa68a, 0xa68a,
- 0xa68c, 0xa68c,
- 0xa68e, 0xa68e,
- 0xa690, 0xa690,
- 0xa692, 0xa692,
- 0xa694, 0xa694,
- 0xa696, 0xa696,
- 0xa722, 0xa722,
- 0xa724, 0xa724,
- 0xa726, 0xa726,
- 0xa728, 0xa728,
- 0xa72a, 0xa72a,
- 0xa72c, 0xa72c,
- 0xa72e, 0xa72e,
- 0xa732, 0xa732,
- 0xa734, 0xa734,
- 0xa736, 0xa736,
- 0xa738, 0xa738,
- 0xa73a, 0xa73a,
- 0xa73c, 0xa73c,
- 0xa73e, 0xa73e,
- 0xa740, 0xa740,
- 0xa742, 0xa742,
- 0xa744, 0xa744,
- 0xa746, 0xa746,
- 0xa748, 0xa748,
- 0xa74a, 0xa74a,
- 0xa74c, 0xa74c,
- 0xa74e, 0xa74e,
- 0xa750, 0xa750,
- 0xa752, 0xa752,
- 0xa754, 0xa754,
- 0xa756, 0xa756,
- 0xa758, 0xa758,
- 0xa75a, 0xa75a,
- 0xa75c, 0xa75c,
- 0xa75e, 0xa75e,
- 0xa760, 0xa760,
- 0xa762, 0xa762,
- 0xa764, 0xa764,
- 0xa766, 0xa766,
- 0xa768, 0xa768,
- 0xa76a, 0xa76a,
- 0xa76c, 0xa76c,
- 0xa76e, 0xa76e,
- 0xa779, 0xa779,
- 0xa77b, 0xa77b,
- 0xa77d, 0xa77e,
- 0xa780, 0xa780,
- 0xa782, 0xa782,
- 0xa784, 0xa784,
- 0xa786, 0xa786,
- 0xa78b, 0xa78b,
- 0xff21, 0xff3a,
- 0x10400, 0x10427,
- 0x1d400, 0x1d419,
- 0x1d434, 0x1d44d,
- 0x1d468, 0x1d481,
- 0x1d49c, 0x1d49c,
- 0x1d49e, 0x1d49f,
- 0x1d4a2, 0x1d4a2,
- 0x1d4a5, 0x1d4a6,
- 0x1d4a9, 0x1d4ac,
- 0x1d4ae, 0x1d4b5,
- 0x1d4d0, 0x1d4e9,
- 0x1d504, 0x1d505,
- 0x1d507, 0x1d50a,
- 0x1d50d, 0x1d514,
- 0x1d516, 0x1d51c,
- 0x1d538, 0x1d539,
- 0x1d53b, 0x1d53e,
- 0x1d540, 0x1d544,
- 0x1d546, 0x1d546,
- 0x1d54a, 0x1d550,
- 0x1d56c, 0x1d585,
- 0x1d5a0, 0x1d5b9,
- 0x1d5d4, 0x1d5ed,
- 0x1d608, 0x1d621,
- 0x1d63c, 0x1d655,
- 0x1d670, 0x1d689,
- 0x1d6a8, 0x1d6c0,
- 0x1d6e2, 0x1d6fa,
- 0x1d71c, 0x1d734,
- 0x1d756, 0x1d76e,
- 0x1d790, 0x1d7a8,
- 0x1d7ca, 0x1d7ca,
-}; /* CR_Upper */
-
-/* 'XDigit': [[:XDigit:]] */
-static const OnigCodePoint CR_XDigit[] = {
- 3,
- 0x0030, 0x0039,
- 0x0041, 0x0046,
- 0x0061, 0x0066,
-}; /* CR_XDigit */
-
-/* 'Word': [[:Word:]] */
-static const OnigCodePoint CR_Word[] = {
- 477,
- 0x0030, 0x0039,
- 0x0041, 0x005a,
- 0x005f, 0x005f,
- 0x0061, 0x007a,
- 0x00aa, 0x00aa,
- 0x00b5, 0x00b5,
- 0x00ba, 0x00ba,
- 0x00c0, 0x00d6,
- 0x00d8, 0x00f6,
- 0x00f8, 0x02c1,
- 0x02c6, 0x02d1,
- 0x02e0, 0x02e4,
- 0x02ec, 0x02ec,
- 0x02ee, 0x02ee,
- 0x0300, 0x0374,
- 0x0376, 0x0377,
- 0x037a, 0x037d,
- 0x0386, 0x0386,
- 0x0388, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03f5,
- 0x03f7, 0x0481,
- 0x0483, 0x0523,
- 0x0531, 0x0556,
- 0x0559, 0x0559,
- 0x0561, 0x0587,
- 0x0591, 0x05bd,
- 0x05bf, 0x05bf,
- 0x05c1, 0x05c2,
- 0x05c4, 0x05c5,
- 0x05c7, 0x05c7,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f2,
- 0x0610, 0x061a,
- 0x0621, 0x065e,
- 0x0660, 0x0669,
- 0x066e, 0x06d3,
- 0x06d5, 0x06dc,
- 0x06de, 0x06e8,
- 0x06ea, 0x06fc,
- 0x06ff, 0x06ff,
- 0x0710, 0x074a,
- 0x074d, 0x07b1,
- 0x07c0, 0x07f5,
- 0x07fa, 0x07fa,
- 0x0901, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0954,
- 0x0958, 0x0963,
- 0x0966, 0x096f,
- 0x0971, 0x0972,
- 0x097b, 0x097f,
- 0x0981, 0x0983,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bc, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09ce,
- 0x09d7, 0x09d7,
- 0x09dc, 0x09dd,
- 0x09df, 0x09e3,
- 0x09e6, 0x09f1,
- 0x0a01, 0x0a03,
- 0x0a05, 0x0a0a,
- 0x0a0f, 0x0a10,
- 0x0a13, 0x0a28,
- 0x0a2a, 0x0a30,
- 0x0a32, 0x0a33,
- 0x0a35, 0x0a36,
- 0x0a38, 0x0a39,
- 0x0a3c, 0x0a3c,
- 0x0a3e, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4d,
- 0x0a51, 0x0a51,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a66, 0x0a75,
- 0x0a81, 0x0a83,
- 0x0a85, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abc, 0x0ac5,
- 0x0ac7, 0x0ac9,
- 0x0acb, 0x0acd,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae3,
- 0x0ae6, 0x0aef,
- 0x0b01, 0x0b03,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b35, 0x0b39,
- 0x0b3c, 0x0b44,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b63,
- 0x0b66, 0x0b6f,
- 0x0b71, 0x0b71,
- 0x0b82, 0x0b83,
- 0x0b85, 0x0b8a,
- 0x0b8e, 0x0b90,
- 0x0b92, 0x0b95,
- 0x0b99, 0x0b9a,
- 0x0b9c, 0x0b9c,
- 0x0b9e, 0x0b9f,
- 0x0ba3, 0x0ba4,
- 0x0ba8, 0x0baa,
- 0x0bae, 0x0bb9,
- 0x0bbe, 0x0bc2,
- 0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcd,
- 0x0bd0, 0x0bd0,
- 0x0bd7, 0x0bd7,
- 0x0be6, 0x0bef,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3d, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c58, 0x0c59,
- 0x0c60, 0x0c63,
- 0x0c66, 0x0c6f,
- 0x0c82, 0x0c83,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbc, 0x0cc4,
- 0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccd,
- 0x0cd5, 0x0cd6,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce3,
- 0x0ce6, 0x0cef,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3d, 0x0d44,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d63,
- 0x0d66, 0x0d6f,
- 0x0d7a, 0x0d7f,
- 0x0d82, 0x0d83,
- 0x0d85, 0x0d96,
- 0x0d9a, 0x0db1,
- 0x0db3, 0x0dbb,
- 0x0dbd, 0x0dbd,
- 0x0dc0, 0x0dc6,
- 0x0dca, 0x0dca,
- 0x0dcf, 0x0dd4,
- 0x0dd6, 0x0dd6,
- 0x0dd8, 0x0ddf,
- 0x0df2, 0x0df3,
- 0x0e01, 0x0e3a,
- 0x0e40, 0x0e4e,
- 0x0e50, 0x0e59,
- 0x0e81, 0x0e82,
- 0x0e84, 0x0e84,
- 0x0e87, 0x0e88,
- 0x0e8a, 0x0e8a,
- 0x0e8d, 0x0e8d,
- 0x0e94, 0x0e97,
- 0x0e99, 0x0e9f,
- 0x0ea1, 0x0ea3,
- 0x0ea5, 0x0ea5,
- 0x0ea7, 0x0ea7,
- 0x0eaa, 0x0eab,
- 0x0ead, 0x0eb9,
- 0x0ebb, 0x0ebd,
- 0x0ec0, 0x0ec4,
- 0x0ec6, 0x0ec6,
- 0x0ec8, 0x0ecd,
- 0x0ed0, 0x0ed9,
- 0x0edc, 0x0edd,
- 0x0f00, 0x0f00,
- 0x0f18, 0x0f19,
- 0x0f20, 0x0f29,
- 0x0f35, 0x0f35,
- 0x0f37, 0x0f37,
- 0x0f39, 0x0f39,
- 0x0f3e, 0x0f47,
- 0x0f49, 0x0f6c,
- 0x0f71, 0x0f84,
- 0x0f86, 0x0f8b,
- 0x0f90, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fc6, 0x0fc6,
- 0x1000, 0x1049,
- 0x1050, 0x1099,
- 0x10a0, 0x10c5,
- 0x10d0, 0x10fa,
- 0x10fc, 0x10fc,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x1200, 0x1248,
- 0x124a, 0x124d,
- 0x1250, 0x1256,
- 0x1258, 0x1258,
- 0x125a, 0x125d,
- 0x1260, 0x1288,
- 0x128a, 0x128d,
- 0x1290, 0x12b0,
- 0x12b2, 0x12b5,
- 0x12b8, 0x12be,
- 0x12c0, 0x12c0,
- 0x12c2, 0x12c5,
- 0x12c8, 0x12d6,
- 0x12d8, 0x1310,
- 0x1312, 0x1315,
- 0x1318, 0x135a,
- 0x135f, 0x135f,
- 0x1380, 0x138f,
- 0x13a0, 0x13f4,
- 0x1401, 0x166c,
- 0x166f, 0x1676,
- 0x1681, 0x169a,
- 0x16a0, 0x16ea,
- 0x1700, 0x170c,
- 0x170e, 0x1714,
- 0x1720, 0x1734,
- 0x1740, 0x1753,
- 0x1760, 0x176c,
- 0x176e, 0x1770,
- 0x1772, 0x1773,
- 0x1780, 0x17b3,
- 0x17b6, 0x17d3,
- 0x17d7, 0x17d7,
- 0x17dc, 0x17dd,
- 0x17e0, 0x17e9,
- 0x180b, 0x180d,
- 0x1810, 0x1819,
- 0x1820, 0x1877,
- 0x1880, 0x18aa,
- 0x1900, 0x191c,
- 0x1920, 0x192b,
- 0x1930, 0x193b,
- 0x1946, 0x196d,
- 0x1970, 0x1974,
- 0x1980, 0x19a9,
- 0x19b0, 0x19c9,
- 0x19d0, 0x19d9,
- 0x1a00, 0x1a1b,
- 0x1b00, 0x1b4b,
- 0x1b50, 0x1b59,
- 0x1b6b, 0x1b73,
- 0x1b80, 0x1baa,
- 0x1bae, 0x1bb9,
- 0x1c00, 0x1c37,
- 0x1c40, 0x1c49,
- 0x1c4d, 0x1c7d,
- 0x1d00, 0x1de6,
- 0x1dfe, 0x1f15,
- 0x1f18, 0x1f1d,
- 0x1f20, 0x1f45,
- 0x1f48, 0x1f4d,
- 0x1f50, 0x1f57,
- 0x1f59, 0x1f59,
- 0x1f5b, 0x1f5b,
- 0x1f5d, 0x1f5d,
- 0x1f5f, 0x1f7d,
- 0x1f80, 0x1fb4,
- 0x1fb6, 0x1fbc,
- 0x1fbe, 0x1fbe,
- 0x1fc2, 0x1fc4,
- 0x1fc6, 0x1fcc,
- 0x1fd0, 0x1fd3,
- 0x1fd6, 0x1fdb,
- 0x1fe0, 0x1fec,
- 0x1ff2, 0x1ff4,
- 0x1ff6, 0x1ffc,
- 0x203f, 0x2040,
- 0x2054, 0x2054,
- 0x2071, 0x2071,
- 0x207f, 0x207f,
- 0x2090, 0x2094,
- 0x20d0, 0x20f0,
- 0x2102, 0x2102,
- 0x2107, 0x2107,
- 0x210a, 0x2113,
- 0x2115, 0x2115,
- 0x2119, 0x211d,
- 0x2124, 0x2124,
- 0x2126, 0x2126,
- 0x2128, 0x2128,
- 0x212a, 0x212d,
- 0x212f, 0x2139,
- 0x213c, 0x213f,
- 0x2145, 0x2149,
- 0x214e, 0x214e,
- 0x2183, 0x2184,
- 0x2c00, 0x2c2e,
- 0x2c30, 0x2c5e,
- 0x2c60, 0x2c6f,
- 0x2c71, 0x2c7d,
- 0x2c80, 0x2ce4,
- 0x2d00, 0x2d25,
- 0x2d30, 0x2d65,
- 0x2d6f, 0x2d6f,
- 0x2d80, 0x2d96,
- 0x2da0, 0x2da6,
- 0x2da8, 0x2dae,
- 0x2db0, 0x2db6,
- 0x2db8, 0x2dbe,
- 0x2dc0, 0x2dc6,
- 0x2dc8, 0x2dce,
- 0x2dd0, 0x2dd6,
- 0x2dd8, 0x2dde,
- 0x2de0, 0x2dff,
- 0x2e2f, 0x2e2f,
- 0x3005, 0x3006,
- 0x302a, 0x302f,
- 0x3031, 0x3035,
- 0x303b, 0x303c,
- 0x3041, 0x3096,
- 0x3099, 0x309a,
- 0x309d, 0x309f,
- 0x30a1, 0x30fa,
- 0x30fc, 0x30ff,
- 0x3105, 0x312d,
- 0x3131, 0x318e,
- 0x31a0, 0x31b7,
- 0x31f0, 0x31ff,
- 0x3400, 0x3400,
- 0x4db5, 0x4db5,
- 0x4e00, 0x4e00,
- 0x9fc3, 0x9fc3,
- 0xa000, 0xa48c,
- 0xa500, 0xa60c,
- 0xa610, 0xa62b,
- 0xa640, 0xa65f,
- 0xa662, 0xa672,
- 0xa67c, 0xa67d,
- 0xa67f, 0xa697,
- 0xa717, 0xa71f,
- 0xa722, 0xa788,
- 0xa78b, 0xa78c,
- 0xa7fb, 0xa827,
- 0xa840, 0xa873,
- 0xa880, 0xa8c4,
- 0xa8d0, 0xa8d9,
- 0xa900, 0xa92d,
- 0xa930, 0xa953,
- 0xaa00, 0xaa36,
- 0xaa40, 0xaa4d,
- 0xaa50, 0xaa59,
- 0xac00, 0xac00,
- 0xd7a3, 0xd7a3,
- 0xf900, 0xfa2d,
- 0xfa30, 0xfa6a,
- 0xfa70, 0xfad9,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xfb1d, 0xfb28,
- 0xfb2a, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbb1,
- 0xfbd3, 0xfd3d,
- 0xfd50, 0xfd8f,
- 0xfd92, 0xfdc7,
- 0xfdf0, 0xfdfb,
- 0xfe00, 0xfe0f,
- 0xfe20, 0xfe26,
- 0xfe33, 0xfe34,
- 0xfe4d, 0xfe4f,
- 0xfe70, 0xfe74,
- 0xfe76, 0xfefc,
- 0xff10, 0xff19,
- 0xff21, 0xff3a,
- 0xff3f, 0xff3f,
- 0xff41, 0xff5a,
- 0xff66, 0xffbe,
- 0xffc2, 0xffc7,
- 0xffca, 0xffcf,
- 0xffd2, 0xffd7,
- 0xffda, 0xffdc,
- 0x10000, 0x1000b,
- 0x1000d, 0x10026,
- 0x10028, 0x1003a,
- 0x1003c, 0x1003d,
- 0x1003f, 0x1004d,
- 0x10050, 0x1005d,
- 0x10080, 0x100fa,
- 0x101fd, 0x101fd,
- 0x10280, 0x1029c,
- 0x102a0, 0x102d0,
- 0x10300, 0x1031e,
- 0x10330, 0x10340,
- 0x10342, 0x10349,
- 0x10380, 0x1039d,
- 0x103a0, 0x103c3,
- 0x103c8, 0x103cf,
- 0x10400, 0x1049d,
- 0x104a0, 0x104a9,
- 0x10800, 0x10805,
- 0x10808, 0x10808,
- 0x1080a, 0x10835,
- 0x10837, 0x10838,
- 0x1083c, 0x1083c,
- 0x1083f, 0x1083f,
- 0x10900, 0x10915,
- 0x10920, 0x10939,
- 0x10a00, 0x10a03,
- 0x10a05, 0x10a06,
- 0x10a0c, 0x10a13,
- 0x10a15, 0x10a17,
- 0x10a19, 0x10a33,
- 0x10a38, 0x10a3a,
- 0x10a3f, 0x10a3f,
- 0x12000, 0x1236e,
- 0x1d165, 0x1d169,
- 0x1d16d, 0x1d172,
- 0x1d17b, 0x1d182,
- 0x1d185, 0x1d18b,
- 0x1d1aa, 0x1d1ad,
- 0x1d242, 0x1d244,
- 0x1d400, 0x1d454,
- 0x1d456, 0x1d49c,
- 0x1d49e, 0x1d49f,
- 0x1d4a2, 0x1d4a2,
- 0x1d4a5, 0x1d4a6,
- 0x1d4a9, 0x1d4ac,
- 0x1d4ae, 0x1d4b9,
- 0x1d4bb, 0x1d4bb,
- 0x1d4bd, 0x1d4c3,
- 0x1d4c5, 0x1d505,
- 0x1d507, 0x1d50a,
- 0x1d50d, 0x1d514,
- 0x1d516, 0x1d51c,
- 0x1d51e, 0x1d539,
- 0x1d53b, 0x1d53e,
- 0x1d540, 0x1d544,
- 0x1d546, 0x1d546,
- 0x1d54a, 0x1d550,
- 0x1d552, 0x1d6a5,
- 0x1d6a8, 0x1d6c0,
- 0x1d6c2, 0x1d6da,
- 0x1d6dc, 0x1d6fa,
- 0x1d6fc, 0x1d714,
- 0x1d716, 0x1d734,
- 0x1d736, 0x1d74e,
- 0x1d750, 0x1d76e,
- 0x1d770, 0x1d788,
- 0x1d78a, 0x1d7a8,
- 0x1d7aa, 0x1d7c2,
- 0x1d7c4, 0x1d7cb,
- 0x1d7ce, 0x1d7ff,
- 0x20000, 0x20000,
- 0x2a6d6, 0x2a6d6,
- 0x2f800, 0x2fa1d,
- 0xe0100, 0xe01ef,
-}; /* CR_Word */
-
-/* 'Alnum': [[:Alnum:]] */
-static const OnigCodePoint CR_Alnum[] = {
- 471,
- 0x0030, 0x0039,
- 0x0041, 0x005a,
- 0x0061, 0x007a,
- 0x00aa, 0x00aa,
- 0x00b5, 0x00b5,
- 0x00ba, 0x00ba,
- 0x00c0, 0x00d6,
- 0x00d8, 0x00f6,
- 0x00f8, 0x02c1,
- 0x02c6, 0x02d1,
- 0x02e0, 0x02e4,
- 0x02ec, 0x02ec,
- 0x02ee, 0x02ee,
- 0x0300, 0x0374,
- 0x0376, 0x0377,
- 0x037a, 0x037d,
- 0x0386, 0x0386,
- 0x0388, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03f5,
- 0x03f7, 0x0481,
- 0x0483, 0x0523,
- 0x0531, 0x0556,
- 0x0559, 0x0559,
- 0x0561, 0x0587,
- 0x0591, 0x05bd,
- 0x05bf, 0x05bf,
- 0x05c1, 0x05c2,
- 0x05c4, 0x05c5,
- 0x05c7, 0x05c7,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f2,
- 0x0610, 0x061a,
- 0x0621, 0x065e,
- 0x0660, 0x0669,
- 0x066e, 0x06d3,
- 0x06d5, 0x06dc,
- 0x06de, 0x06e8,
- 0x06ea, 0x06fc,
- 0x06ff, 0x06ff,
- 0x0710, 0x074a,
- 0x074d, 0x07b1,
- 0x07c0, 0x07f5,
- 0x07fa, 0x07fa,
- 0x0901, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0954,
- 0x0958, 0x0963,
- 0x0966, 0x096f,
- 0x0971, 0x0972,
- 0x097b, 0x097f,
- 0x0981, 0x0983,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bc, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09ce,
- 0x09d7, 0x09d7,
- 0x09dc, 0x09dd,
- 0x09df, 0x09e3,
- 0x09e6, 0x09f1,
- 0x0a01, 0x0a03,
- 0x0a05, 0x0a0a,
- 0x0a0f, 0x0a10,
- 0x0a13, 0x0a28,
- 0x0a2a, 0x0a30,
- 0x0a32, 0x0a33,
- 0x0a35, 0x0a36,
- 0x0a38, 0x0a39,
- 0x0a3c, 0x0a3c,
- 0x0a3e, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4d,
- 0x0a51, 0x0a51,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a66, 0x0a75,
- 0x0a81, 0x0a83,
- 0x0a85, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abc, 0x0ac5,
- 0x0ac7, 0x0ac9,
- 0x0acb, 0x0acd,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae3,
- 0x0ae6, 0x0aef,
- 0x0b01, 0x0b03,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b35, 0x0b39,
- 0x0b3c, 0x0b44,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b63,
- 0x0b66, 0x0b6f,
- 0x0b71, 0x0b71,
- 0x0b82, 0x0b83,
- 0x0b85, 0x0b8a,
- 0x0b8e, 0x0b90,
- 0x0b92, 0x0b95,
- 0x0b99, 0x0b9a,
- 0x0b9c, 0x0b9c,
- 0x0b9e, 0x0b9f,
- 0x0ba3, 0x0ba4,
- 0x0ba8, 0x0baa,
- 0x0bae, 0x0bb9,
- 0x0bbe, 0x0bc2,
- 0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcd,
- 0x0bd0, 0x0bd0,
- 0x0bd7, 0x0bd7,
- 0x0be6, 0x0bef,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3d, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c58, 0x0c59,
- 0x0c60, 0x0c63,
- 0x0c66, 0x0c6f,
- 0x0c82, 0x0c83,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbc, 0x0cc4,
- 0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccd,
- 0x0cd5, 0x0cd6,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce3,
- 0x0ce6, 0x0cef,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3d, 0x0d44,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d63,
- 0x0d66, 0x0d6f,
- 0x0d7a, 0x0d7f,
- 0x0d82, 0x0d83,
- 0x0d85, 0x0d96,
- 0x0d9a, 0x0db1,
- 0x0db3, 0x0dbb,
- 0x0dbd, 0x0dbd,
- 0x0dc0, 0x0dc6,
- 0x0dca, 0x0dca,
- 0x0dcf, 0x0dd4,
- 0x0dd6, 0x0dd6,
- 0x0dd8, 0x0ddf,
- 0x0df2, 0x0df3,
- 0x0e01, 0x0e3a,
- 0x0e40, 0x0e4e,
- 0x0e50, 0x0e59,
- 0x0e81, 0x0e82,
- 0x0e84, 0x0e84,
- 0x0e87, 0x0e88,
- 0x0e8a, 0x0e8a,
- 0x0e8d, 0x0e8d,
- 0x0e94, 0x0e97,
- 0x0e99, 0x0e9f,
- 0x0ea1, 0x0ea3,
- 0x0ea5, 0x0ea5,
- 0x0ea7, 0x0ea7,
- 0x0eaa, 0x0eab,
- 0x0ead, 0x0eb9,
- 0x0ebb, 0x0ebd,
- 0x0ec0, 0x0ec4,
- 0x0ec6, 0x0ec6,
- 0x0ec8, 0x0ecd,
- 0x0ed0, 0x0ed9,
- 0x0edc, 0x0edd,
- 0x0f00, 0x0f00,
- 0x0f18, 0x0f19,
- 0x0f20, 0x0f29,
- 0x0f35, 0x0f35,
- 0x0f37, 0x0f37,
- 0x0f39, 0x0f39,
- 0x0f3e, 0x0f47,
- 0x0f49, 0x0f6c,
- 0x0f71, 0x0f84,
- 0x0f86, 0x0f8b,
- 0x0f90, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fc6, 0x0fc6,
- 0x1000, 0x1049,
- 0x1050, 0x1099,
- 0x10a0, 0x10c5,
- 0x10d0, 0x10fa,
- 0x10fc, 0x10fc,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x1200, 0x1248,
- 0x124a, 0x124d,
- 0x1250, 0x1256,
- 0x1258, 0x1258,
- 0x125a, 0x125d,
- 0x1260, 0x1288,
- 0x128a, 0x128d,
- 0x1290, 0x12b0,
- 0x12b2, 0x12b5,
- 0x12b8, 0x12be,
- 0x12c0, 0x12c0,
- 0x12c2, 0x12c5,
- 0x12c8, 0x12d6,
- 0x12d8, 0x1310,
- 0x1312, 0x1315,
- 0x1318, 0x135a,
- 0x135f, 0x135f,
- 0x1380, 0x138f,
- 0x13a0, 0x13f4,
- 0x1401, 0x166c,
- 0x166f, 0x1676,
- 0x1681, 0x169a,
- 0x16a0, 0x16ea,
- 0x1700, 0x170c,
- 0x170e, 0x1714,
- 0x1720, 0x1734,
- 0x1740, 0x1753,
- 0x1760, 0x176c,
- 0x176e, 0x1770,
- 0x1772, 0x1773,
- 0x1780, 0x17b3,
- 0x17b6, 0x17d3,
- 0x17d7, 0x17d7,
- 0x17dc, 0x17dd,
- 0x17e0, 0x17e9,
- 0x180b, 0x180d,
- 0x1810, 0x1819,
- 0x1820, 0x1877,
- 0x1880, 0x18aa,
- 0x1900, 0x191c,
- 0x1920, 0x192b,
- 0x1930, 0x193b,
- 0x1946, 0x196d,
- 0x1970, 0x1974,
- 0x1980, 0x19a9,
- 0x19b0, 0x19c9,
- 0x19d0, 0x19d9,
- 0x1a00, 0x1a1b,
- 0x1b00, 0x1b4b,
- 0x1b50, 0x1b59,
- 0x1b6b, 0x1b73,
- 0x1b80, 0x1baa,
- 0x1bae, 0x1bb9,
- 0x1c00, 0x1c37,
- 0x1c40, 0x1c49,
- 0x1c4d, 0x1c7d,
- 0x1d00, 0x1de6,
- 0x1dfe, 0x1f15,
- 0x1f18, 0x1f1d,
- 0x1f20, 0x1f45,
- 0x1f48, 0x1f4d,
- 0x1f50, 0x1f57,
- 0x1f59, 0x1f59,
- 0x1f5b, 0x1f5b,
- 0x1f5d, 0x1f5d,
- 0x1f5f, 0x1f7d,
- 0x1f80, 0x1fb4,
- 0x1fb6, 0x1fbc,
- 0x1fbe, 0x1fbe,
- 0x1fc2, 0x1fc4,
- 0x1fc6, 0x1fcc,
- 0x1fd0, 0x1fd3,
- 0x1fd6, 0x1fdb,
- 0x1fe0, 0x1fec,
- 0x1ff2, 0x1ff4,
- 0x1ff6, 0x1ffc,
- 0x2071, 0x2071,
- 0x207f, 0x207f,
- 0x2090, 0x2094,
- 0x20d0, 0x20f0,
- 0x2102, 0x2102,
- 0x2107, 0x2107,
- 0x210a, 0x2113,
- 0x2115, 0x2115,
- 0x2119, 0x211d,
- 0x2124, 0x2124,
- 0x2126, 0x2126,
- 0x2128, 0x2128,
- 0x212a, 0x212d,
- 0x212f, 0x2139,
- 0x213c, 0x213f,
- 0x2145, 0x2149,
- 0x214e, 0x214e,
- 0x2183, 0x2184,
- 0x2c00, 0x2c2e,
- 0x2c30, 0x2c5e,
- 0x2c60, 0x2c6f,
- 0x2c71, 0x2c7d,
- 0x2c80, 0x2ce4,
- 0x2d00, 0x2d25,
- 0x2d30, 0x2d65,
- 0x2d6f, 0x2d6f,
- 0x2d80, 0x2d96,
- 0x2da0, 0x2da6,
- 0x2da8, 0x2dae,
- 0x2db0, 0x2db6,
- 0x2db8, 0x2dbe,
- 0x2dc0, 0x2dc6,
- 0x2dc8, 0x2dce,
- 0x2dd0, 0x2dd6,
- 0x2dd8, 0x2dde,
- 0x2de0, 0x2dff,
- 0x2e2f, 0x2e2f,
- 0x3005, 0x3006,
- 0x302a, 0x302f,
- 0x3031, 0x3035,
- 0x303b, 0x303c,
- 0x3041, 0x3096,
- 0x3099, 0x309a,
- 0x309d, 0x309f,
- 0x30a1, 0x30fa,
- 0x30fc, 0x30ff,
- 0x3105, 0x312d,
- 0x3131, 0x318e,
- 0x31a0, 0x31b7,
- 0x31f0, 0x31ff,
- 0x3400, 0x3400,
- 0x4db5, 0x4db5,
- 0x4e00, 0x4e00,
- 0x9fc3, 0x9fc3,
- 0xa000, 0xa48c,
- 0xa500, 0xa60c,
- 0xa610, 0xa62b,
- 0xa640, 0xa65f,
- 0xa662, 0xa672,
- 0xa67c, 0xa67d,
- 0xa67f, 0xa697,
- 0xa717, 0xa71f,
- 0xa722, 0xa788,
- 0xa78b, 0xa78c,
- 0xa7fb, 0xa827,
- 0xa840, 0xa873,
- 0xa880, 0xa8c4,
- 0xa8d0, 0xa8d9,
- 0xa900, 0xa92d,
- 0xa930, 0xa953,
- 0xaa00, 0xaa36,
- 0xaa40, 0xaa4d,
- 0xaa50, 0xaa59,
- 0xac00, 0xac00,
- 0xd7a3, 0xd7a3,
- 0xf900, 0xfa2d,
- 0xfa30, 0xfa6a,
- 0xfa70, 0xfad9,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xfb1d, 0xfb28,
- 0xfb2a, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbb1,
- 0xfbd3, 0xfd3d,
- 0xfd50, 0xfd8f,
- 0xfd92, 0xfdc7,
- 0xfdf0, 0xfdfb,
- 0xfe00, 0xfe0f,
- 0xfe20, 0xfe26,
- 0xfe70, 0xfe74,
- 0xfe76, 0xfefc,
- 0xff10, 0xff19,
- 0xff21, 0xff3a,
- 0xff41, 0xff5a,
- 0xff66, 0xffbe,
- 0xffc2, 0xffc7,
- 0xffca, 0xffcf,
- 0xffd2, 0xffd7,
- 0xffda, 0xffdc,
- 0x10000, 0x1000b,
- 0x1000d, 0x10026,
- 0x10028, 0x1003a,
- 0x1003c, 0x1003d,
- 0x1003f, 0x1004d,
- 0x10050, 0x1005d,
- 0x10080, 0x100fa,
- 0x101fd, 0x101fd,
- 0x10280, 0x1029c,
- 0x102a0, 0x102d0,
- 0x10300, 0x1031e,
- 0x10330, 0x10340,
- 0x10342, 0x10349,
- 0x10380, 0x1039d,
- 0x103a0, 0x103c3,
- 0x103c8, 0x103cf,
- 0x10400, 0x1049d,
- 0x104a0, 0x104a9,
- 0x10800, 0x10805,
- 0x10808, 0x10808,
- 0x1080a, 0x10835,
- 0x10837, 0x10838,
- 0x1083c, 0x1083c,
- 0x1083f, 0x1083f,
- 0x10900, 0x10915,
- 0x10920, 0x10939,
- 0x10a00, 0x10a03,
- 0x10a05, 0x10a06,
- 0x10a0c, 0x10a13,
- 0x10a15, 0x10a17,
- 0x10a19, 0x10a33,
- 0x10a38, 0x10a3a,
- 0x10a3f, 0x10a3f,
- 0x12000, 0x1236e,
- 0x1d165, 0x1d169,
- 0x1d16d, 0x1d172,
- 0x1d17b, 0x1d182,
- 0x1d185, 0x1d18b,
- 0x1d1aa, 0x1d1ad,
- 0x1d242, 0x1d244,
- 0x1d400, 0x1d454,
- 0x1d456, 0x1d49c,
- 0x1d49e, 0x1d49f,
- 0x1d4a2, 0x1d4a2,
- 0x1d4a5, 0x1d4a6,
- 0x1d4a9, 0x1d4ac,
- 0x1d4ae, 0x1d4b9,
- 0x1d4bb, 0x1d4bb,
- 0x1d4bd, 0x1d4c3,
- 0x1d4c5, 0x1d505,
- 0x1d507, 0x1d50a,
- 0x1d50d, 0x1d514,
- 0x1d516, 0x1d51c,
- 0x1d51e, 0x1d539,
- 0x1d53b, 0x1d53e,
- 0x1d540, 0x1d544,
- 0x1d546, 0x1d546,
- 0x1d54a, 0x1d550,
- 0x1d552, 0x1d6a5,
- 0x1d6a8, 0x1d6c0,
- 0x1d6c2, 0x1d6da,
- 0x1d6dc, 0x1d6fa,
- 0x1d6fc, 0x1d714,
- 0x1d716, 0x1d734,
- 0x1d736, 0x1d74e,
- 0x1d750, 0x1d76e,
- 0x1d770, 0x1d788,
- 0x1d78a, 0x1d7a8,
- 0x1d7aa, 0x1d7c2,
- 0x1d7c4, 0x1d7cb,
- 0x1d7ce, 0x1d7ff,
- 0x20000, 0x20000,
- 0x2a6d6, 0x2a6d6,
- 0x2f800, 0x2fa1d,
- 0xe0100, 0xe01ef,
-}; /* CR_Alnum */
-
-/* 'ASCII': [[:ASCII:]] */
-static const OnigCodePoint CR_ASCII[] = {
- 1,
- 0x0000, 0x007f,
-}; /* CR_ASCII */
-
-#ifdef USE_UNICODE_PROPERTIES
-#ifdef USE_UNICODE_PROPERTIES
-/* 'Any': - */
-static const OnigCodePoint CR_Any[] = {
- 1,
- 0x0000, 0x10ffff,
-}; /* CR_Any */
-
-/* 'Assigned': - */
-static const OnigCodePoint CR_Assigned[] = {
- 454,
- 0x0000, 0x0377,
- 0x037a, 0x037e,
- 0x0384, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x0523,
- 0x0531, 0x0556,
- 0x0559, 0x055f,
- 0x0561, 0x0587,
- 0x0589, 0x058a,
- 0x0591, 0x05c7,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0x0600, 0x0603,
- 0x0606, 0x061b,
- 0x061e, 0x061f,
- 0x0621, 0x065e,
- 0x0660, 0x070d,
- 0x070f, 0x074a,
- 0x074d, 0x07b1,
- 0x07c0, 0x07fa,
- 0x0901, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0954,
- 0x0958, 0x0972,
- 0x097b, 0x097f,
- 0x0981, 0x0983,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bc, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09ce,
- 0x09d7, 0x09d7,
- 0x09dc, 0x09dd,
- 0x09df, 0x09e3,
- 0x09e6, 0x09fa,
- 0x0a01, 0x0a03,
- 0x0a05, 0x0a0a,
- 0x0a0f, 0x0a10,
- 0x0a13, 0x0a28,
- 0x0a2a, 0x0a30,
- 0x0a32, 0x0a33,
- 0x0a35, 0x0a36,
- 0x0a38, 0x0a39,
- 0x0a3c, 0x0a3c,
- 0x0a3e, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4d,
- 0x0a51, 0x0a51,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a66, 0x0a75,
- 0x0a81, 0x0a83,
- 0x0a85, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abc, 0x0ac5,
- 0x0ac7, 0x0ac9,
- 0x0acb, 0x0acd,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae3,
- 0x0ae6, 0x0aef,
- 0x0af1, 0x0af1,
- 0x0b01, 0x0b03,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b35, 0x0b39,
- 0x0b3c, 0x0b44,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b63,
- 0x0b66, 0x0b71,
- 0x0b82, 0x0b83,
- 0x0b85, 0x0b8a,
- 0x0b8e, 0x0b90,
- 0x0b92, 0x0b95,
- 0x0b99, 0x0b9a,
- 0x0b9c, 0x0b9c,
- 0x0b9e, 0x0b9f,
- 0x0ba3, 0x0ba4,
- 0x0ba8, 0x0baa,
- 0x0bae, 0x0bb9,
- 0x0bbe, 0x0bc2,
- 0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcd,
- 0x0bd0, 0x0bd0,
- 0x0bd7, 0x0bd7,
- 0x0be6, 0x0bfa,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3d, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c58, 0x0c59,
- 0x0c60, 0x0c63,
- 0x0c66, 0x0c6f,
- 0x0c78, 0x0c7f,
- 0x0c82, 0x0c83,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbc, 0x0cc4,
- 0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccd,
- 0x0cd5, 0x0cd6,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce3,
- 0x0ce6, 0x0cef,
- 0x0cf1, 0x0cf2,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3d, 0x0d44,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d63,
- 0x0d66, 0x0d75,
- 0x0d79, 0x0d7f,
- 0x0d82, 0x0d83,
- 0x0d85, 0x0d96,
- 0x0d9a, 0x0db1,
- 0x0db3, 0x0dbb,
- 0x0dbd, 0x0dbd,
- 0x0dc0, 0x0dc6,
- 0x0dca, 0x0dca,
- 0x0dcf, 0x0dd4,
- 0x0dd6, 0x0dd6,
- 0x0dd8, 0x0ddf,
- 0x0df2, 0x0df4,
- 0x0e01, 0x0e3a,
- 0x0e3f, 0x0e5b,
- 0x0e81, 0x0e82,
- 0x0e84, 0x0e84,
- 0x0e87, 0x0e88,
- 0x0e8a, 0x0e8a,
- 0x0e8d, 0x0e8d,
- 0x0e94, 0x0e97,
- 0x0e99, 0x0e9f,
- 0x0ea1, 0x0ea3,
- 0x0ea5, 0x0ea5,
- 0x0ea7, 0x0ea7,
- 0x0eaa, 0x0eab,
- 0x0ead, 0x0eb9,
- 0x0ebb, 0x0ebd,
- 0x0ec0, 0x0ec4,
- 0x0ec6, 0x0ec6,
- 0x0ec8, 0x0ecd,
- 0x0ed0, 0x0ed9,
- 0x0edc, 0x0edd,
- 0x0f00, 0x0f47,
- 0x0f49, 0x0f6c,
- 0x0f71, 0x0f8b,
- 0x0f90, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fbe, 0x0fcc,
- 0x0fce, 0x0fd4,
- 0x1000, 0x1099,
- 0x109e, 0x10c5,
- 0x10d0, 0x10fc,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x1200, 0x1248,
- 0x124a, 0x124d,
- 0x1250, 0x1256,
- 0x1258, 0x1258,
- 0x125a, 0x125d,
- 0x1260, 0x1288,
- 0x128a, 0x128d,
- 0x1290, 0x12b0,
- 0x12b2, 0x12b5,
- 0x12b8, 0x12be,
- 0x12c0, 0x12c0,
- 0x12c2, 0x12c5,
- 0x12c8, 0x12d6,
- 0x12d8, 0x1310,
- 0x1312, 0x1315,
- 0x1318, 0x135a,
- 0x135f, 0x137c,
- 0x1380, 0x1399,
- 0x13a0, 0x13f4,
- 0x1401, 0x1676,
- 0x1680, 0x169c,
- 0x16a0, 0x16f0,
- 0x1700, 0x170c,
- 0x170e, 0x1714,
- 0x1720, 0x1736,
- 0x1740, 0x1753,
- 0x1760, 0x176c,
- 0x176e, 0x1770,
- 0x1772, 0x1773,
- 0x1780, 0x17dd,
- 0x17e0, 0x17e9,
- 0x17f0, 0x17f9,
- 0x1800, 0x180e,
- 0x1810, 0x1819,
- 0x1820, 0x1877,
- 0x1880, 0x18aa,
- 0x1900, 0x191c,
- 0x1920, 0x192b,
- 0x1930, 0x193b,
- 0x1940, 0x1940,
- 0x1944, 0x196d,
- 0x1970, 0x1974,
- 0x1980, 0x19a9,
- 0x19b0, 0x19c9,
- 0x19d0, 0x19d9,
- 0x19de, 0x1a1b,
- 0x1a1e, 0x1a1f,
- 0x1b00, 0x1b4b,
- 0x1b50, 0x1b7c,
- 0x1b80, 0x1baa,
- 0x1bae, 0x1bb9,
- 0x1c00, 0x1c37,
- 0x1c3b, 0x1c49,
- 0x1c4d, 0x1c7f,
- 0x1d00, 0x1de6,
- 0x1dfe, 0x1f15,
- 0x1f18, 0x1f1d,
- 0x1f20, 0x1f45,
- 0x1f48, 0x1f4d,
- 0x1f50, 0x1f57,
- 0x1f59, 0x1f59,
- 0x1f5b, 0x1f5b,
- 0x1f5d, 0x1f5d,
- 0x1f5f, 0x1f7d,
- 0x1f80, 0x1fb4,
- 0x1fb6, 0x1fc4,
- 0x1fc6, 0x1fd3,
- 0x1fd6, 0x1fdb,
- 0x1fdd, 0x1fef,
- 0x1ff2, 0x1ff4,
- 0x1ff6, 0x1ffe,
- 0x2000, 0x2064,
- 0x206a, 0x2071,
- 0x2074, 0x208e,
- 0x2090, 0x2094,
- 0x20a0, 0x20b5,
- 0x20d0, 0x20f0,
- 0x2100, 0x214f,
- 0x2153, 0x2188,
- 0x2190, 0x23e7,
- 0x2400, 0x2426,
- 0x2440, 0x244a,
- 0x2460, 0x269d,
- 0x26a0, 0x26bc,
- 0x26c0, 0x26c3,
- 0x2701, 0x2704,
- 0x2706, 0x2709,
- 0x270c, 0x2727,
- 0x2729, 0x274b,
- 0x274d, 0x274d,
- 0x274f, 0x2752,
- 0x2756, 0x2756,
- 0x2758, 0x275e,
- 0x2761, 0x2794,
- 0x2798, 0x27af,
- 0x27b1, 0x27be,
- 0x27c0, 0x27ca,
- 0x27cc, 0x27cc,
- 0x27d0, 0x2b4c,
- 0x2b50, 0x2b54,
- 0x2c00, 0x2c2e,
- 0x2c30, 0x2c5e,
- 0x2c60, 0x2c6f,
- 0x2c71, 0x2c7d,
- 0x2c80, 0x2cea,
- 0x2cf9, 0x2d25,
- 0x2d30, 0x2d65,
- 0x2d6f, 0x2d6f,
- 0x2d80, 0x2d96,
- 0x2da0, 0x2da6,
- 0x2da8, 0x2dae,
- 0x2db0, 0x2db6,
- 0x2db8, 0x2dbe,
- 0x2dc0, 0x2dc6,
- 0x2dc8, 0x2dce,
- 0x2dd0, 0x2dd6,
- 0x2dd8, 0x2dde,
- 0x2de0, 0x2e30,
- 0x2e80, 0x2e99,
- 0x2e9b, 0x2ef3,
- 0x2f00, 0x2fd5,
- 0x2ff0, 0x2ffb,
- 0x3000, 0x303f,
- 0x3041, 0x3096,
- 0x3099, 0x30ff,
- 0x3105, 0x312d,
- 0x3131, 0x318e,
- 0x3190, 0x31b7,
- 0x31c0, 0x31e3,
- 0x31f0, 0x321e,
- 0x3220, 0x3243,
- 0x3250, 0x32fe,
- 0x3300, 0x3400,
- 0x4db5, 0x4db5,
- 0x4dc0, 0x4e00,
- 0x9fc3, 0x9fc3,
- 0xa000, 0xa48c,
- 0xa490, 0xa4c6,
- 0xa500, 0xa62b,
- 0xa640, 0xa65f,
- 0xa662, 0xa673,
- 0xa67c, 0xa697,
- 0xa700, 0xa78c,
- 0xa7fb, 0xa82b,
- 0xa840, 0xa877,
- 0xa880, 0xa8c4,
- 0xa8ce, 0xa8d9,
- 0xa900, 0xa953,
- 0xa95f, 0xa95f,
- 0xaa00, 0xaa36,
- 0xaa40, 0xaa4d,
- 0xaa50, 0xaa59,
- 0xaa5c, 0xaa5f,
- 0xac00, 0xac00,
- 0xd7a3, 0xd7a3,
- 0xd800, 0xd800,
- 0xdb7f, 0xdb80,
- 0xdbff, 0xdc00,
- 0xdfff, 0xe000,
- 0xf8ff, 0xfa2d,
- 0xfa30, 0xfa6a,
- 0xfa70, 0xfad9,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xfb1d, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbb1,
- 0xfbd3, 0xfd3f,
- 0xfd50, 0xfd8f,
- 0xfd92, 0xfdc7,
- 0xfdf0, 0xfdfd,
- 0xfe00, 0xfe19,
- 0xfe20, 0xfe26,
- 0xfe30, 0xfe52,
- 0xfe54, 0xfe66,
- 0xfe68, 0xfe6b,
- 0xfe70, 0xfe74,
- 0xfe76, 0xfefc,
- 0xfeff, 0xfeff,
- 0xff01, 0xffbe,
- 0xffc2, 0xffc7,
- 0xffca, 0xffcf,
- 0xffd2, 0xffd7,
- 0xffda, 0xffdc,
- 0xffe0, 0xffe6,
- 0xffe8, 0xffee,
- 0xfff9, 0xfffd,
- 0x10000, 0x1000b,
- 0x1000d, 0x10026,
- 0x10028, 0x1003a,
- 0x1003c, 0x1003d,
- 0x1003f, 0x1004d,
- 0x10050, 0x1005d,
- 0x10080, 0x100fa,
- 0x10100, 0x10102,
- 0x10107, 0x10133,
- 0x10137, 0x1018a,
- 0x10190, 0x1019b,
- 0x101d0, 0x101fd,
- 0x10280, 0x1029c,
- 0x102a0, 0x102d0,
- 0x10300, 0x1031e,
- 0x10320, 0x10323,
- 0x10330, 0x1034a,
- 0x10380, 0x1039d,
- 0x1039f, 0x103c3,
- 0x103c8, 0x103d5,
- 0x10400, 0x1049d,
- 0x104a0, 0x104a9,
- 0x10800, 0x10805,
- 0x10808, 0x10808,
- 0x1080a, 0x10835,
- 0x10837, 0x10838,
- 0x1083c, 0x1083c,
- 0x1083f, 0x1083f,
- 0x10900, 0x10919,
- 0x1091f, 0x10939,
- 0x1093f, 0x1093f,
- 0x10a00, 0x10a03,
- 0x10a05, 0x10a06,
- 0x10a0c, 0x10a13,
- 0x10a15, 0x10a17,
- 0x10a19, 0x10a33,
- 0x10a38, 0x10a3a,
- 0x10a3f, 0x10a47,
- 0x10a50, 0x10a58,
- 0x12000, 0x1236e,
- 0x12400, 0x12462,
- 0x12470, 0x12473,
- 0x1d000, 0x1d0f5,
- 0x1d100, 0x1d126,
- 0x1d129, 0x1d1dd,
- 0x1d200, 0x1d245,
- 0x1d300, 0x1d356,
- 0x1d360, 0x1d371,
- 0x1d400, 0x1d454,
- 0x1d456, 0x1d49c,
- 0x1d49e, 0x1d49f,
- 0x1d4a2, 0x1d4a2,
- 0x1d4a5, 0x1d4a6,
- 0x1d4a9, 0x1d4ac,
- 0x1d4ae, 0x1d4b9,
- 0x1d4bb, 0x1d4bb,
- 0x1d4bd, 0x1d4c3,
- 0x1d4c5, 0x1d505,
- 0x1d507, 0x1d50a,
- 0x1d50d, 0x1d514,
- 0x1d516, 0x1d51c,
- 0x1d51e, 0x1d539,
- 0x1d53b, 0x1d53e,
- 0x1d540, 0x1d544,
- 0x1d546, 0x1d546,
- 0x1d54a, 0x1d550,
- 0x1d552, 0x1d6a5,
- 0x1d6a8, 0x1d7cb,
- 0x1d7ce, 0x1d7ff,
- 0x1f000, 0x1f02b,
- 0x1f030, 0x1f093,
- 0x20000, 0x20000,
- 0x2a6d6, 0x2a6d6,
- 0x2f800, 0x2fa1d,
- 0xe0001, 0xe0001,
- 0xe0020, 0xe007f,
- 0xe0100, 0xe01ef,
- 0xf0000, 0xf0000,
- 0xffffd, 0xffffd,
- 0x100000, 0x100000,
-}; /* CR_Assigned */
-
-/* 'C': Major Category */
-static const OnigCodePoint CR_C[] = {
- 25,
- 0x0000, 0x001f,
- 0x007f, 0x009f,
- 0x00ad, 0x00ad,
- 0x0600, 0x0603,
- 0x06dd, 0x06dd,
- 0x070f, 0x070f,
- 0x17b4, 0x17b5,
- 0x200b, 0x200f,
- 0x202a, 0x202e,
- 0x2060, 0x2064,
- 0x206a, 0x206f,
- 0xd800, 0xd800,
- 0xdb7f, 0xdb80,
- 0xdbff, 0xdc00,
- 0xdfff, 0xe000,
- 0xf8ff, 0xf8ff,
- 0xfeff, 0xfeff,
- 0xfff9, 0xfffb,
- 0x1d173, 0x1d17a,
- 0xe0001, 0xe0001,
- 0xe0020, 0xe007f,
- 0xf0000, 0xf0000,
- 0xffffd, 0xffffd,
- 0x100000, 0x100000,
- 0x10fffd, 0x10ffff,
-}; /* CR_C */
-
-/* 'Cc': General Category */
-static const OnigCodePoint CR_Cc[] = {
- 2,
- 0x0000, 0x001f,
- 0x007f, 0x009f,
-}; /* CR_Cc */
-
-/* 'Cf': General Category */
-static const OnigCodePoint CR_Cf[] = {
- 14,
- 0x00ad, 0x00ad,
- 0x0600, 0x0603,
- 0x06dd, 0x06dd,
- 0x070f, 0x070f,
- 0x17b4, 0x17b5,
- 0x200b, 0x200f,
- 0x202a, 0x202e,
- 0x2060, 0x2064,
- 0x206a, 0x206f,
- 0xfeff, 0xfeff,
- 0xfff9, 0xfffb,
- 0x1d173, 0x1d17a,
- 0xe0001, 0xe0001,
- 0xe0020, 0xe007f,
-}; /* CR_Cf */
-
-/* 'Cn': General Category */
-static const OnigCodePoint CR_Cn[] = {
- 454,
- 0x0378, 0x0379,
- 0x037f, 0x0383,
- 0x038b, 0x038b,
- 0x038d, 0x038d,
- 0x03a2, 0x03a2,
- 0x0524, 0x0530,
- 0x0557, 0x0558,
- 0x0560, 0x0560,
- 0x0588, 0x0588,
- 0x058b, 0x0590,
- 0x05c8, 0x05cf,
- 0x05eb, 0x05ef,
- 0x05f5, 0x05ff,
- 0x0604, 0x0605,
- 0x061c, 0x061d,
- 0x0620, 0x0620,
- 0x065f, 0x065f,
- 0x070e, 0x070e,
- 0x074b, 0x074c,
- 0x07b2, 0x07bf,
- 0x07fb, 0x0900,
- 0x093a, 0x093b,
- 0x094e, 0x094f,
- 0x0955, 0x0957,
- 0x0973, 0x097a,
- 0x0980, 0x0980,
- 0x0984, 0x0984,
- 0x098d, 0x098e,
- 0x0991, 0x0992,
- 0x09a9, 0x09a9,
- 0x09b1, 0x09b1,
- 0x09b3, 0x09b5,
- 0x09ba, 0x09bb,
- 0x09c5, 0x09c6,
- 0x09c9, 0x09ca,
- 0x09cf, 0x09d6,
- 0x09d8, 0x09db,
- 0x09de, 0x09de,
- 0x09e4, 0x09e5,
- 0x09fb, 0x0a00,
- 0x0a04, 0x0a04,
- 0x0a0b, 0x0a0e,
- 0x0a11, 0x0a12,
- 0x0a29, 0x0a29,
- 0x0a31, 0x0a31,
- 0x0a34, 0x0a34,
- 0x0a37, 0x0a37,
- 0x0a3a, 0x0a3b,
- 0x0a3d, 0x0a3d,
- 0x0a43, 0x0a46,
- 0x0a49, 0x0a4a,
- 0x0a4e, 0x0a50,
- 0x0a52, 0x0a58,
- 0x0a5d, 0x0a5d,
- 0x0a5f, 0x0a65,
- 0x0a76, 0x0a80,
- 0x0a84, 0x0a84,
- 0x0a8e, 0x0a8e,
- 0x0a92, 0x0a92,
- 0x0aa9, 0x0aa9,
- 0x0ab1, 0x0ab1,
- 0x0ab4, 0x0ab4,
- 0x0aba, 0x0abb,
- 0x0ac6, 0x0ac6,
- 0x0aca, 0x0aca,
- 0x0ace, 0x0acf,
- 0x0ad1, 0x0adf,
- 0x0ae4, 0x0ae5,
- 0x0af0, 0x0af0,
- 0x0af2, 0x0b00,
- 0x0b04, 0x0b04,
- 0x0b0d, 0x0b0e,
- 0x0b11, 0x0b12,
- 0x0b29, 0x0b29,
- 0x0b31, 0x0b31,
- 0x0b34, 0x0b34,
- 0x0b3a, 0x0b3b,
- 0x0b45, 0x0b46,
- 0x0b49, 0x0b4a,
- 0x0b4e, 0x0b55,
- 0x0b58, 0x0b5b,
- 0x0b5e, 0x0b5e,
- 0x0b64, 0x0b65,
- 0x0b72, 0x0b81,
- 0x0b84, 0x0b84,
- 0x0b8b, 0x0b8d,
- 0x0b91, 0x0b91,
- 0x0b96, 0x0b98,
- 0x0b9b, 0x0b9b,
- 0x0b9d, 0x0b9d,
- 0x0ba0, 0x0ba2,
- 0x0ba5, 0x0ba7,
- 0x0bab, 0x0bad,
- 0x0bba, 0x0bbd,
- 0x0bc3, 0x0bc5,
- 0x0bc9, 0x0bc9,
- 0x0bce, 0x0bcf,
- 0x0bd1, 0x0bd6,
- 0x0bd8, 0x0be5,
- 0x0bfb, 0x0c00,
- 0x0c04, 0x0c04,
- 0x0c0d, 0x0c0d,
- 0x0c11, 0x0c11,
- 0x0c29, 0x0c29,
- 0x0c34, 0x0c34,
- 0x0c3a, 0x0c3c,
- 0x0c45, 0x0c45,
- 0x0c49, 0x0c49,
- 0x0c4e, 0x0c54,
- 0x0c57, 0x0c57,
- 0x0c5a, 0x0c5f,
- 0x0c64, 0x0c65,
- 0x0c70, 0x0c77,
- 0x0c80, 0x0c81,
- 0x0c84, 0x0c84,
- 0x0c8d, 0x0c8d,
- 0x0c91, 0x0c91,
- 0x0ca9, 0x0ca9,
- 0x0cb4, 0x0cb4,
- 0x0cba, 0x0cbb,
- 0x0cc5, 0x0cc5,
- 0x0cc9, 0x0cc9,
- 0x0cce, 0x0cd4,
- 0x0cd7, 0x0cdd,
- 0x0cdf, 0x0cdf,
- 0x0ce4, 0x0ce5,
- 0x0cf0, 0x0cf0,
- 0x0cf3, 0x0d01,
- 0x0d04, 0x0d04,
- 0x0d0d, 0x0d0d,
- 0x0d11, 0x0d11,
- 0x0d29, 0x0d29,
- 0x0d3a, 0x0d3c,
- 0x0d45, 0x0d45,
- 0x0d49, 0x0d49,
- 0x0d4e, 0x0d56,
- 0x0d58, 0x0d5f,
- 0x0d64, 0x0d65,
- 0x0d76, 0x0d78,
- 0x0d80, 0x0d81,
- 0x0d84, 0x0d84,
- 0x0d97, 0x0d99,
- 0x0db2, 0x0db2,
- 0x0dbc, 0x0dbc,
- 0x0dbe, 0x0dbf,
- 0x0dc7, 0x0dc9,
- 0x0dcb, 0x0dce,
- 0x0dd5, 0x0dd5,
- 0x0dd7, 0x0dd7,
- 0x0de0, 0x0df1,
- 0x0df5, 0x0e00,
- 0x0e3b, 0x0e3e,
- 0x0e5c, 0x0e80,
- 0x0e83, 0x0e83,
- 0x0e85, 0x0e86,
- 0x0e89, 0x0e89,
- 0x0e8b, 0x0e8c,
- 0x0e8e, 0x0e93,
- 0x0e98, 0x0e98,
- 0x0ea0, 0x0ea0,
- 0x0ea4, 0x0ea4,
- 0x0ea6, 0x0ea6,
- 0x0ea8, 0x0ea9,
- 0x0eac, 0x0eac,
- 0x0eba, 0x0eba,
- 0x0ebe, 0x0ebf,
- 0x0ec5, 0x0ec5,
- 0x0ec7, 0x0ec7,
- 0x0ece, 0x0ecf,
- 0x0eda, 0x0edb,
- 0x0ede, 0x0eff,
- 0x0f48, 0x0f48,
- 0x0f6d, 0x0f70,
- 0x0f8c, 0x0f8f,
- 0x0f98, 0x0f98,
- 0x0fbd, 0x0fbd,
- 0x0fcd, 0x0fcd,
- 0x0fd5, 0x0fff,
- 0x109a, 0x109d,
- 0x10c6, 0x10cf,
- 0x10fd, 0x10ff,
- 0x115a, 0x115e,
- 0x11a3, 0x11a7,
- 0x11fa, 0x11ff,
- 0x1249, 0x1249,
- 0x124e, 0x124f,
- 0x1257, 0x1257,
- 0x1259, 0x1259,
- 0x125e, 0x125f,
- 0x1289, 0x1289,
- 0x128e, 0x128f,
- 0x12b1, 0x12b1,
- 0x12b6, 0x12b7,
- 0x12bf, 0x12bf,
- 0x12c1, 0x12c1,
- 0x12c6, 0x12c7,
- 0x12d7, 0x12d7,
- 0x1311, 0x1311,
- 0x1316, 0x1317,
- 0x135b, 0x135e,
- 0x137d, 0x137f,
- 0x139a, 0x139f,
- 0x13f5, 0x1400,
- 0x1677, 0x167f,
- 0x169d, 0x169f,
- 0x16f1, 0x16ff,
- 0x170d, 0x170d,
- 0x1715, 0x171f,
- 0x1737, 0x173f,
- 0x1754, 0x175f,
- 0x176d, 0x176d,
- 0x1771, 0x1771,
- 0x1774, 0x177f,
- 0x17de, 0x17df,
- 0x17ea, 0x17ef,
- 0x17fa, 0x17ff,
- 0x180f, 0x180f,
- 0x181a, 0x181f,
- 0x1878, 0x187f,
- 0x18ab, 0x18ff,
- 0x191d, 0x191f,
- 0x192c, 0x192f,
- 0x193c, 0x193f,
- 0x1941, 0x1943,
- 0x196e, 0x196f,
- 0x1975, 0x197f,
- 0x19aa, 0x19af,
- 0x19ca, 0x19cf,
- 0x19da, 0x19dd,
- 0x1a1c, 0x1a1d,
- 0x1a20, 0x1aff,
- 0x1b4c, 0x1b4f,
- 0x1b7d, 0x1b7f,
- 0x1bab, 0x1bad,
- 0x1bba, 0x1bff,
- 0x1c38, 0x1c3a,
- 0x1c4a, 0x1c4c,
- 0x1c80, 0x1cff,
- 0x1de7, 0x1dfd,
- 0x1f16, 0x1f17,
- 0x1f1e, 0x1f1f,
- 0x1f46, 0x1f47,
- 0x1f4e, 0x1f4f,
- 0x1f58, 0x1f58,
- 0x1f5a, 0x1f5a,
- 0x1f5c, 0x1f5c,
- 0x1f5e, 0x1f5e,
- 0x1f7e, 0x1f7f,
- 0x1fb5, 0x1fb5,
- 0x1fc5, 0x1fc5,
- 0x1fd4, 0x1fd5,
- 0x1fdc, 0x1fdc,
- 0x1ff0, 0x1ff1,
- 0x1ff5, 0x1ff5,
- 0x1fff, 0x1fff,
- 0x2065, 0x2069,
- 0x2072, 0x2073,
- 0x208f, 0x208f,
- 0x2095, 0x209f,
- 0x20b6, 0x20cf,
- 0x20f1, 0x20ff,
- 0x2150, 0x2152,
- 0x2189, 0x218f,
- 0x23e8, 0x23ff,
- 0x2427, 0x243f,
- 0x244b, 0x245f,
- 0x269e, 0x269f,
- 0x26bd, 0x26bf,
- 0x26c4, 0x2700,
- 0x2705, 0x2705,
- 0x270a, 0x270b,
- 0x2728, 0x2728,
- 0x274c, 0x274c,
- 0x274e, 0x274e,
- 0x2753, 0x2755,
- 0x2757, 0x2757,
- 0x275f, 0x2760,
- 0x2795, 0x2797,
- 0x27b0, 0x27b0,
- 0x27bf, 0x27bf,
- 0x27cb, 0x27cb,
- 0x27cd, 0x27cf,
- 0x2b4d, 0x2b4f,
- 0x2b55, 0x2bff,
- 0x2c2f, 0x2c2f,
- 0x2c5f, 0x2c5f,
- 0x2c70, 0x2c70,
- 0x2c7e, 0x2c7f,
- 0x2ceb, 0x2cf8,
- 0x2d26, 0x2d2f,
- 0x2d66, 0x2d6e,
- 0x2d70, 0x2d7f,
- 0x2d97, 0x2d9f,
- 0x2da7, 0x2da7,
- 0x2daf, 0x2daf,
- 0x2db7, 0x2db7,
- 0x2dbf, 0x2dbf,
- 0x2dc7, 0x2dc7,
- 0x2dcf, 0x2dcf,
- 0x2dd7, 0x2dd7,
- 0x2ddf, 0x2ddf,
- 0x2e31, 0x2e7f,
- 0x2e9a, 0x2e9a,
- 0x2ef4, 0x2eff,
- 0x2fd6, 0x2fef,
- 0x2ffc, 0x2fff,
- 0x3040, 0x3040,
- 0x3097, 0x3098,
- 0x3100, 0x3104,
- 0x312e, 0x3130,
- 0x318f, 0x318f,
- 0x31b8, 0x31bf,
- 0x31e4, 0x31ef,
- 0x321f, 0x321f,
- 0x3244, 0x324f,
- 0x32ff, 0x32ff,
- 0x3401, 0x4db4,
- 0x4db6, 0x4dbf,
- 0x4e01, 0x9fc2,
- 0x9fc4, 0x9fff,
- 0xa48d, 0xa48f,
- 0xa4c7, 0xa4ff,
- 0xa62c, 0xa63f,
- 0xa660, 0xa661,
- 0xa674, 0xa67b,
- 0xa698, 0xa6ff,
- 0xa78d, 0xa7fa,
- 0xa82c, 0xa83f,
- 0xa878, 0xa87f,
- 0xa8c5, 0xa8cd,
- 0xa8da, 0xa8ff,
- 0xa954, 0xa95e,
- 0xa960, 0xa9ff,
- 0xaa37, 0xaa3f,
- 0xaa4e, 0xaa4f,
- 0xaa5a, 0xaa5b,
- 0xaa60, 0xabff,
- 0xac01, 0xd7a2,
- 0xd7a4, 0xd7ff,
- 0xd801, 0xdb7e,
- 0xdb81, 0xdbfe,
- 0xdc01, 0xdffe,
- 0xe001, 0xf8fe,
- 0xfa2e, 0xfa2f,
- 0xfa6b, 0xfa6f,
- 0xfada, 0xfaff,
- 0xfb07, 0xfb12,
- 0xfb18, 0xfb1c,
- 0xfb37, 0xfb37,
- 0xfb3d, 0xfb3d,
- 0xfb3f, 0xfb3f,
- 0xfb42, 0xfb42,
- 0xfb45, 0xfb45,
- 0xfbb2, 0xfbd2,
- 0xfd40, 0xfd4f,
- 0xfd90, 0xfd91,
- 0xfdc8, 0xfdef,
- 0xfdfe, 0xfdff,
- 0xfe1a, 0xfe1f,
- 0xfe27, 0xfe2f,
- 0xfe53, 0xfe53,
- 0xfe67, 0xfe67,
- 0xfe6c, 0xfe6f,
- 0xfe75, 0xfe75,
- 0xfefd, 0xfefe,
- 0xff00, 0xff00,
- 0xffbf, 0xffc1,
- 0xffc8, 0xffc9,
- 0xffd0, 0xffd1,
- 0xffd8, 0xffd9,
- 0xffdd, 0xffdf,
- 0xffe7, 0xffe7,
- 0xffef, 0xfff8,
- 0xfffe, 0xffff,
- 0x1000c, 0x1000c,
- 0x10027, 0x10027,
- 0x1003b, 0x1003b,
- 0x1003e, 0x1003e,
- 0x1004e, 0x1004f,
- 0x1005e, 0x1007f,
- 0x100fb, 0x100ff,
- 0x10103, 0x10106,
- 0x10134, 0x10136,
- 0x1018b, 0x1018f,
- 0x1019c, 0x101cf,
- 0x101fe, 0x1027f,
- 0x1029d, 0x1029f,
- 0x102d1, 0x102ff,
- 0x1031f, 0x1031f,
- 0x10324, 0x1032f,
- 0x1034b, 0x1037f,
- 0x1039e, 0x1039e,
- 0x103c4, 0x103c7,
- 0x103d6, 0x103ff,
- 0x1049e, 0x1049f,
- 0x104aa, 0x107ff,
- 0x10806, 0x10807,
- 0x10809, 0x10809,
- 0x10836, 0x10836,
- 0x10839, 0x1083b,
- 0x1083d, 0x1083e,
- 0x10840, 0x108ff,
- 0x1091a, 0x1091e,
- 0x1093a, 0x1093e,
- 0x10940, 0x109ff,
- 0x10a04, 0x10a04,
- 0x10a07, 0x10a0b,
- 0x10a14, 0x10a14,
- 0x10a18, 0x10a18,
- 0x10a34, 0x10a37,
- 0x10a3b, 0x10a3e,
- 0x10a48, 0x10a4f,
- 0x10a59, 0x11fff,
- 0x1236f, 0x123ff,
- 0x12463, 0x1246f,
- 0x12474, 0x1cfff,
- 0x1d0f6, 0x1d0ff,
- 0x1d127, 0x1d128,
- 0x1d1de, 0x1d1ff,
- 0x1d246, 0x1d2ff,
- 0x1d357, 0x1d35f,
- 0x1d372, 0x1d3ff,
- 0x1d455, 0x1d455,
- 0x1d49d, 0x1d49d,
- 0x1d4a0, 0x1d4a1,
- 0x1d4a3, 0x1d4a4,
- 0x1d4a7, 0x1d4a8,
- 0x1d4ad, 0x1d4ad,
- 0x1d4ba, 0x1d4ba,
- 0x1d4bc, 0x1d4bc,
- 0x1d4c4, 0x1d4c4,
- 0x1d506, 0x1d506,
- 0x1d50b, 0x1d50c,
- 0x1d515, 0x1d515,
- 0x1d51d, 0x1d51d,
- 0x1d53a, 0x1d53a,
- 0x1d53f, 0x1d53f,
- 0x1d545, 0x1d545,
- 0x1d547, 0x1d549,
- 0x1d551, 0x1d551,
- 0x1d6a6, 0x1d6a7,
- 0x1d7cc, 0x1d7cd,
- 0x1d800, 0x1efff,
- 0x1f02c, 0x1f02f,
- 0x1f094, 0x1ffff,
- 0x20001, 0x2a6d5,
- 0x2a6d7, 0x2f7ff,
- 0x2fa1e, 0xe0000,
- 0xe0002, 0xe001f,
- 0xe0080, 0xe00ff,
- 0xe01f0, 0xeffff,
- 0xf0001, 0xffffc,
- 0xffffe, 0xfffff,
- 0x100001, 0x10ffff,
-}; /* CR_Cn */
-
-/* 'Co': General Category */
-static const OnigCodePoint CR_Co[] = {
- 6,
- 0xe000, 0xe000,
- 0xf8ff, 0xf8ff,
- 0xf0000, 0xf0000,
- 0xffffd, 0xffffd,
- 0x100000, 0x100000,
- 0x10fffd, 0x10fffd,
-}; /* CR_Co */
-
-/* 'Cs': General Category */
-static const OnigCodePoint CR_Cs[] = {
- 4,
- 0xd800, 0xd800,
- 0xdb7f, 0xdb80,
- 0xdbff, 0xdc00,
- 0xdfff, 0xdfff,
-}; /* CR_Cs */
-
-/* 'L': Major Category */
-static const OnigCodePoint CR_L[] = {
- 394,
- 0x0041, 0x005a,
- 0x0061, 0x007a,
- 0x00aa, 0x00aa,
- 0x00b5, 0x00b5,
- 0x00ba, 0x00ba,
- 0x00c0, 0x00d6,
- 0x00d8, 0x00f6,
- 0x00f8, 0x02c1,
- 0x02c6, 0x02d1,
- 0x02e0, 0x02e4,
- 0x02ec, 0x02ec,
- 0x02ee, 0x02ee,
- 0x0370, 0x0374,
- 0x0376, 0x0377,
- 0x037a, 0x037d,
- 0x0386, 0x0386,
- 0x0388, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03f5,
- 0x03f7, 0x0481,
- 0x048a, 0x0523,
- 0x0531, 0x0556,
- 0x0559, 0x0559,
- 0x0561, 0x0587,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f2,
- 0x0621, 0x064a,
- 0x066e, 0x066f,
- 0x0671, 0x06d3,
- 0x06d5, 0x06d5,
- 0x06e5, 0x06e6,
- 0x06ee, 0x06ef,
- 0x06fa, 0x06fc,
- 0x06ff, 0x06ff,
- 0x0710, 0x0710,
- 0x0712, 0x072f,
- 0x074d, 0x07a5,
- 0x07b1, 0x07b1,
- 0x07ca, 0x07ea,
- 0x07f4, 0x07f5,
- 0x07fa, 0x07fa,
- 0x0904, 0x0939,
- 0x093d, 0x093d,
- 0x0950, 0x0950,
- 0x0958, 0x0961,
- 0x0971, 0x0972,
- 0x097b, 0x097f,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bd, 0x09bd,
- 0x09ce, 0x09ce,
- 0x09dc, 0x09dd,
- 0x09df, 0x09e1,
- 0x09f0, 0x09f1,
- 0x0a05, 0x0a0a,
- 0x0a0f, 0x0a10,
- 0x0a13, 0x0a28,
- 0x0a2a, 0x0a30,
- 0x0a32, 0x0a33,
- 0x0a35, 0x0a36,
- 0x0a38, 0x0a39,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a72, 0x0a74,
- 0x0a85, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abd, 0x0abd,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae1,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b35, 0x0b39,
- 0x0b3d, 0x0b3d,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b61,
- 0x0b71, 0x0b71,
- 0x0b83, 0x0b83,
- 0x0b85, 0x0b8a,
- 0x0b8e, 0x0b90,
- 0x0b92, 0x0b95,
- 0x0b99, 0x0b9a,
- 0x0b9c, 0x0b9c,
- 0x0b9e, 0x0b9f,
- 0x0ba3, 0x0ba4,
- 0x0ba8, 0x0baa,
- 0x0bae, 0x0bb9,
- 0x0bd0, 0x0bd0,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3d, 0x0c3d,
- 0x0c58, 0x0c59,
- 0x0c60, 0x0c61,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbd, 0x0cbd,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce1,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3d, 0x0d3d,
- 0x0d60, 0x0d61,
- 0x0d7a, 0x0d7f,
- 0x0d85, 0x0d96,
- 0x0d9a, 0x0db1,
- 0x0db3, 0x0dbb,
- 0x0dbd, 0x0dbd,
- 0x0dc0, 0x0dc6,
- 0x0e01, 0x0e30,
- 0x0e32, 0x0e33,
- 0x0e40, 0x0e46,
- 0x0e81, 0x0e82,
- 0x0e84, 0x0e84,
- 0x0e87, 0x0e88,
- 0x0e8a, 0x0e8a,
- 0x0e8d, 0x0e8d,
- 0x0e94, 0x0e97,
- 0x0e99, 0x0e9f,
- 0x0ea1, 0x0ea3,
- 0x0ea5, 0x0ea5,
- 0x0ea7, 0x0ea7,
- 0x0eaa, 0x0eab,
- 0x0ead, 0x0eb0,
- 0x0eb2, 0x0eb3,
- 0x0ebd, 0x0ebd,
- 0x0ec0, 0x0ec4,
- 0x0ec6, 0x0ec6,
- 0x0edc, 0x0edd,
- 0x0f00, 0x0f00,
- 0x0f40, 0x0f47,
- 0x0f49, 0x0f6c,
- 0x0f88, 0x0f8b,
- 0x1000, 0x102a,
- 0x103f, 0x103f,
- 0x1050, 0x1055,
- 0x105a, 0x105d,
- 0x1061, 0x1061,
- 0x1065, 0x1066,
- 0x106e, 0x1070,
- 0x1075, 0x1081,
- 0x108e, 0x108e,
- 0x10a0, 0x10c5,
- 0x10d0, 0x10fa,
- 0x10fc, 0x10fc,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x1200, 0x1248,
- 0x124a, 0x124d,
- 0x1250, 0x1256,
- 0x1258, 0x1258,
- 0x125a, 0x125d,
- 0x1260, 0x1288,
- 0x128a, 0x128d,
- 0x1290, 0x12b0,
- 0x12b2, 0x12b5,
- 0x12b8, 0x12be,
- 0x12c0, 0x12c0,
- 0x12c2, 0x12c5,
- 0x12c8, 0x12d6,
- 0x12d8, 0x1310,
- 0x1312, 0x1315,
- 0x1318, 0x135a,
- 0x1380, 0x138f,
- 0x13a0, 0x13f4,
- 0x1401, 0x166c,
- 0x166f, 0x1676,
- 0x1681, 0x169a,
- 0x16a0, 0x16ea,
- 0x1700, 0x170c,
- 0x170e, 0x1711,
- 0x1720, 0x1731,
- 0x1740, 0x1751,
- 0x1760, 0x176c,
- 0x176e, 0x1770,
- 0x1780, 0x17b3,
- 0x17d7, 0x17d7,
- 0x17dc, 0x17dc,
- 0x1820, 0x1877,
- 0x1880, 0x18a8,
- 0x18aa, 0x18aa,
- 0x1900, 0x191c,
- 0x1950, 0x196d,
- 0x1970, 0x1974,
- 0x1980, 0x19a9,
- 0x19c1, 0x19c7,
- 0x1a00, 0x1a16,
- 0x1b05, 0x1b33,
- 0x1b45, 0x1b4b,
- 0x1b83, 0x1ba0,
- 0x1bae, 0x1baf,
- 0x1c00, 0x1c23,
- 0x1c4d, 0x1c4f,
- 0x1c5a, 0x1c7d,
- 0x1d00, 0x1dbf,
- 0x1e00, 0x1f15,
- 0x1f18, 0x1f1d,
- 0x1f20, 0x1f45,
- 0x1f48, 0x1f4d,
- 0x1f50, 0x1f57,
- 0x1f59, 0x1f59,
- 0x1f5b, 0x1f5b,
- 0x1f5d, 0x1f5d,
- 0x1f5f, 0x1f7d,
- 0x1f80, 0x1fb4,
- 0x1fb6, 0x1fbc,
- 0x1fbe, 0x1fbe,
- 0x1fc2, 0x1fc4,
- 0x1fc6, 0x1fcc,
- 0x1fd0, 0x1fd3,
- 0x1fd6, 0x1fdb,
- 0x1fe0, 0x1fec,
- 0x1ff2, 0x1ff4,
- 0x1ff6, 0x1ffc,
- 0x2071, 0x2071,
- 0x207f, 0x207f,
- 0x2090, 0x2094,
- 0x2102, 0x2102,
- 0x2107, 0x2107,
- 0x210a, 0x2113,
- 0x2115, 0x2115,
- 0x2119, 0x211d,
- 0x2124, 0x2124,
- 0x2126, 0x2126,
- 0x2128, 0x2128,
- 0x212a, 0x212d,
- 0x212f, 0x2139,
- 0x213c, 0x213f,
- 0x2145, 0x2149,
- 0x214e, 0x214e,
- 0x2183, 0x2184,
- 0x2c00, 0x2c2e,
- 0x2c30, 0x2c5e,
- 0x2c60, 0x2c6f,
- 0x2c71, 0x2c7d,
- 0x2c80, 0x2ce4,
- 0x2d00, 0x2d25,
- 0x2d30, 0x2d65,
- 0x2d6f, 0x2d6f,
- 0x2d80, 0x2d96,
- 0x2da0, 0x2da6,
- 0x2da8, 0x2dae,
- 0x2db0, 0x2db6,
- 0x2db8, 0x2dbe,
- 0x2dc0, 0x2dc6,
- 0x2dc8, 0x2dce,
- 0x2dd0, 0x2dd6,
- 0x2dd8, 0x2dde,
- 0x2e2f, 0x2e2f,
- 0x3005, 0x3006,
- 0x3031, 0x3035,
- 0x303b, 0x303c,
- 0x3041, 0x3096,
- 0x309d, 0x309f,
- 0x30a1, 0x30fa,
- 0x30fc, 0x30ff,
- 0x3105, 0x312d,
- 0x3131, 0x318e,
- 0x31a0, 0x31b7,
- 0x31f0, 0x31ff,
- 0x3400, 0x3400,
- 0x4db5, 0x4db5,
- 0x4e00, 0x4e00,
- 0x9fc3, 0x9fc3,
- 0xa000, 0xa48c,
- 0xa500, 0xa60c,
- 0xa610, 0xa61f,
- 0xa62a, 0xa62b,
- 0xa640, 0xa65f,
- 0xa662, 0xa66e,
- 0xa67f, 0xa697,
- 0xa717, 0xa71f,
- 0xa722, 0xa788,
- 0xa78b, 0xa78c,
- 0xa7fb, 0xa801,
- 0xa803, 0xa805,
- 0xa807, 0xa80a,
- 0xa80c, 0xa822,
- 0xa840, 0xa873,
- 0xa882, 0xa8b3,
- 0xa90a, 0xa925,
- 0xa930, 0xa946,
- 0xaa00, 0xaa28,
- 0xaa40, 0xaa42,
- 0xaa44, 0xaa4b,
- 0xac00, 0xac00,
- 0xd7a3, 0xd7a3,
- 0xf900, 0xfa2d,
- 0xfa30, 0xfa6a,
- 0xfa70, 0xfad9,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xfb1d, 0xfb1d,
- 0xfb1f, 0xfb28,
- 0xfb2a, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbb1,
- 0xfbd3, 0xfd3d,
- 0xfd50, 0xfd8f,
- 0xfd92, 0xfdc7,
- 0xfdf0, 0xfdfb,
- 0xfe70, 0xfe74,
- 0xfe76, 0xfefc,
- 0xff21, 0xff3a,
- 0xff41, 0xff5a,
- 0xff66, 0xffbe,
- 0xffc2, 0xffc7,
- 0xffca, 0xffcf,
- 0xffd2, 0xffd7,
- 0xffda, 0xffdc,
- 0x10000, 0x1000b,
- 0x1000d, 0x10026,
- 0x10028, 0x1003a,
- 0x1003c, 0x1003d,
- 0x1003f, 0x1004d,
- 0x10050, 0x1005d,
- 0x10080, 0x100fa,
- 0x10280, 0x1029c,
- 0x102a0, 0x102d0,
- 0x10300, 0x1031e,
- 0x10330, 0x10340,
- 0x10342, 0x10349,
- 0x10380, 0x1039d,
- 0x103a0, 0x103c3,
- 0x103c8, 0x103cf,
- 0x10400, 0x1049d,
- 0x10800, 0x10805,
- 0x10808, 0x10808,
- 0x1080a, 0x10835,
- 0x10837, 0x10838,
- 0x1083c, 0x1083c,
- 0x1083f, 0x1083f,
- 0x10900, 0x10915,
- 0x10920, 0x10939,
- 0x10a00, 0x10a00,
- 0x10a10, 0x10a13,
- 0x10a15, 0x10a17,
- 0x10a19, 0x10a33,
- 0x12000, 0x1236e,
- 0x1d400, 0x1d454,
- 0x1d456, 0x1d49c,
- 0x1d49e, 0x1d49f,
- 0x1d4a2, 0x1d4a2,
- 0x1d4a5, 0x1d4a6,
- 0x1d4a9, 0x1d4ac,
- 0x1d4ae, 0x1d4b9,
- 0x1d4bb, 0x1d4bb,
- 0x1d4bd, 0x1d4c3,
- 0x1d4c5, 0x1d505,
- 0x1d507, 0x1d50a,
- 0x1d50d, 0x1d514,
- 0x1d516, 0x1d51c,
- 0x1d51e, 0x1d539,
- 0x1d53b, 0x1d53e,
- 0x1d540, 0x1d544,
- 0x1d546, 0x1d546,
- 0x1d54a, 0x1d550,
- 0x1d552, 0x1d6a5,
- 0x1d6a8, 0x1d6c0,
- 0x1d6c2, 0x1d6da,
- 0x1d6dc, 0x1d6fa,
- 0x1d6fc, 0x1d714,
- 0x1d716, 0x1d734,
- 0x1d736, 0x1d74e,
- 0x1d750, 0x1d76e,
- 0x1d770, 0x1d788,
- 0x1d78a, 0x1d7a8,
- 0x1d7aa, 0x1d7c2,
- 0x1d7c4, 0x1d7cb,
- 0x20000, 0x20000,
- 0x2a6d6, 0x2a6d6,
- 0x2f800, 0x2fa1d,
-}; /* CR_L */
-
-/* 'Ll': General Category */
-static const OnigCodePoint CR_Ll[] = {
- 598,
- 0x0061, 0x007a,
- 0x00aa, 0x00aa,
- 0x00b5, 0x00b5,
- 0x00ba, 0x00ba,
- 0x00df, 0x00f6,
- 0x00f8, 0x00ff,
- 0x0101, 0x0101,
- 0x0103, 0x0103,
- 0x0105, 0x0105,
- 0x0107, 0x0107,
- 0x0109, 0x0109,
- 0x010b, 0x010b,
- 0x010d, 0x010d,
- 0x010f, 0x010f,
- 0x0111, 0x0111,
- 0x0113, 0x0113,
- 0x0115, 0x0115,
- 0x0117, 0x0117,
- 0x0119, 0x0119,
- 0x011b, 0x011b,
- 0x011d, 0x011d,
- 0x011f, 0x011f,
- 0x0121, 0x0121,
- 0x0123, 0x0123,
- 0x0125, 0x0125,
- 0x0127, 0x0127,
- 0x0129, 0x0129,
- 0x012b, 0x012b,
- 0x012d, 0x012d,
- 0x012f, 0x012f,
- 0x0131, 0x0131,
- 0x0133, 0x0133,
- 0x0135, 0x0135,
- 0x0137, 0x0138,
- 0x013a, 0x013a,
- 0x013c, 0x013c,
- 0x013e, 0x013e,
- 0x0140, 0x0140,
- 0x0142, 0x0142,
- 0x0144, 0x0144,
- 0x0146, 0x0146,
- 0x0148, 0x0149,
- 0x014b, 0x014b,
- 0x014d, 0x014d,
- 0x014f, 0x014f,
- 0x0151, 0x0151,
- 0x0153, 0x0153,
- 0x0155, 0x0155,
- 0x0157, 0x0157,
- 0x0159, 0x0159,
- 0x015b, 0x015b,
- 0x015d, 0x015d,
- 0x015f, 0x015f,
- 0x0161, 0x0161,
- 0x0163, 0x0163,
- 0x0165, 0x0165,
- 0x0167, 0x0167,
- 0x0169, 0x0169,
- 0x016b, 0x016b,
- 0x016d, 0x016d,
- 0x016f, 0x016f,
- 0x0171, 0x0171,
- 0x0173, 0x0173,
- 0x0175, 0x0175,
- 0x0177, 0x0177,
- 0x017a, 0x017a,
- 0x017c, 0x017c,
- 0x017e, 0x0180,
- 0x0183, 0x0183,
- 0x0185, 0x0185,
- 0x0188, 0x0188,
- 0x018c, 0x018d,
- 0x0192, 0x0192,
- 0x0195, 0x0195,
- 0x0199, 0x019b,
- 0x019e, 0x019e,
- 0x01a1, 0x01a1,
- 0x01a3, 0x01a3,
- 0x01a5, 0x01a5,
- 0x01a8, 0x01a8,
- 0x01aa, 0x01ab,
- 0x01ad, 0x01ad,
- 0x01b0, 0x01b0,
- 0x01b4, 0x01b4,
- 0x01b6, 0x01b6,
- 0x01b9, 0x01ba,
- 0x01bd, 0x01bf,
- 0x01c6, 0x01c6,
- 0x01c9, 0x01c9,
- 0x01cc, 0x01cc,
- 0x01ce, 0x01ce,
- 0x01d0, 0x01d0,
- 0x01d2, 0x01d2,
- 0x01d4, 0x01d4,
- 0x01d6, 0x01d6,
- 0x01d8, 0x01d8,
- 0x01da, 0x01da,
- 0x01dc, 0x01dd,
- 0x01df, 0x01df,
- 0x01e1, 0x01e1,
- 0x01e3, 0x01e3,
- 0x01e5, 0x01e5,
- 0x01e7, 0x01e7,
- 0x01e9, 0x01e9,
- 0x01eb, 0x01eb,
- 0x01ed, 0x01ed,
- 0x01ef, 0x01f0,
- 0x01f3, 0x01f3,
- 0x01f5, 0x01f5,
- 0x01f9, 0x01f9,
- 0x01fb, 0x01fb,
- 0x01fd, 0x01fd,
- 0x01ff, 0x01ff,
- 0x0201, 0x0201,
- 0x0203, 0x0203,
- 0x0205, 0x0205,
- 0x0207, 0x0207,
- 0x0209, 0x0209,
- 0x020b, 0x020b,
- 0x020d, 0x020d,
- 0x020f, 0x020f,
- 0x0211, 0x0211,
- 0x0213, 0x0213,
- 0x0215, 0x0215,
- 0x0217, 0x0217,
- 0x0219, 0x0219,
- 0x021b, 0x021b,
- 0x021d, 0x021d,
- 0x021f, 0x021f,
- 0x0221, 0x0221,
- 0x0223, 0x0223,
- 0x0225, 0x0225,
- 0x0227, 0x0227,
- 0x0229, 0x0229,
- 0x022b, 0x022b,
- 0x022d, 0x022d,
- 0x022f, 0x022f,
- 0x0231, 0x0231,
- 0x0233, 0x0239,
- 0x023c, 0x023c,
- 0x023f, 0x0240,
- 0x0242, 0x0242,
- 0x0247, 0x0247,
- 0x0249, 0x0249,
- 0x024b, 0x024b,
- 0x024d, 0x024d,
- 0x024f, 0x0293,
- 0x0295, 0x02af,
- 0x0371, 0x0371,
- 0x0373, 0x0373,
- 0x0377, 0x0377,
- 0x037b, 0x037d,
- 0x0390, 0x0390,
- 0x03ac, 0x03ce,
- 0x03d0, 0x03d1,
- 0x03d5, 0x03d7,
- 0x03d9, 0x03d9,
- 0x03db, 0x03db,
- 0x03dd, 0x03dd,
- 0x03df, 0x03df,
- 0x03e1, 0x03e1,
- 0x03e3, 0x03e3,
- 0x03e5, 0x03e5,
- 0x03e7, 0x03e7,
- 0x03e9, 0x03e9,
- 0x03eb, 0x03eb,
- 0x03ed, 0x03ed,
- 0x03ef, 0x03f3,
- 0x03f5, 0x03f5,
- 0x03f8, 0x03f8,
- 0x03fb, 0x03fc,
- 0x0430, 0x045f,
- 0x0461, 0x0461,
- 0x0463, 0x0463,
- 0x0465, 0x0465,
- 0x0467, 0x0467,
- 0x0469, 0x0469,
- 0x046b, 0x046b,
- 0x046d, 0x046d,
- 0x046f, 0x046f,
- 0x0471, 0x0471,
- 0x0473, 0x0473,
- 0x0475, 0x0475,
- 0x0477, 0x0477,
- 0x0479, 0x0479,
- 0x047b, 0x047b,
- 0x047d, 0x047d,
- 0x047f, 0x047f,
- 0x0481, 0x0481,
- 0x048b, 0x048b,
- 0x048d, 0x048d,
- 0x048f, 0x048f,
- 0x0491, 0x0491,
- 0x0493, 0x0493,
- 0x0495, 0x0495,
- 0x0497, 0x0497,
- 0x0499, 0x0499,
- 0x049b, 0x049b,
- 0x049d, 0x049d,
- 0x049f, 0x049f,
- 0x04a1, 0x04a1,
- 0x04a3, 0x04a3,
- 0x04a5, 0x04a5,
- 0x04a7, 0x04a7,
- 0x04a9, 0x04a9,
- 0x04ab, 0x04ab,
- 0x04ad, 0x04ad,
- 0x04af, 0x04af,
- 0x04b1, 0x04b1,
- 0x04b3, 0x04b3,
- 0x04b5, 0x04b5,
- 0x04b7, 0x04b7,
- 0x04b9, 0x04b9,
- 0x04bb, 0x04bb,
- 0x04bd, 0x04bd,
- 0x04bf, 0x04bf,
- 0x04c2, 0x04c2,
- 0x04c4, 0x04c4,
- 0x04c6, 0x04c6,
- 0x04c8, 0x04c8,
- 0x04ca, 0x04ca,
- 0x04cc, 0x04cc,
- 0x04ce, 0x04cf,
- 0x04d1, 0x04d1,
- 0x04d3, 0x04d3,
- 0x04d5, 0x04d5,
- 0x04d7, 0x04d7,
- 0x04d9, 0x04d9,
- 0x04db, 0x04db,
- 0x04dd, 0x04dd,
- 0x04df, 0x04df,
- 0x04e1, 0x04e1,
- 0x04e3, 0x04e3,
- 0x04e5, 0x04e5,
- 0x04e7, 0x04e7,
- 0x04e9, 0x04e9,
- 0x04eb, 0x04eb,
- 0x04ed, 0x04ed,
- 0x04ef, 0x04ef,
- 0x04f1, 0x04f1,
- 0x04f3, 0x04f3,
- 0x04f5, 0x04f5,
- 0x04f7, 0x04f7,
- 0x04f9, 0x04f9,
- 0x04fb, 0x04fb,
- 0x04fd, 0x04fd,
- 0x04ff, 0x04ff,
- 0x0501, 0x0501,
- 0x0503, 0x0503,
- 0x0505, 0x0505,
- 0x0507, 0x0507,
- 0x0509, 0x0509,
- 0x050b, 0x050b,
- 0x050d, 0x050d,
- 0x050f, 0x050f,
- 0x0511, 0x0511,
- 0x0513, 0x0513,
- 0x0515, 0x0515,
- 0x0517, 0x0517,
- 0x0519, 0x0519,
- 0x051b, 0x051b,
- 0x051d, 0x051d,
- 0x051f, 0x051f,
- 0x0521, 0x0521,
- 0x0523, 0x0523,
- 0x0561, 0x0587,
- 0x1d00, 0x1d2b,
- 0x1d62, 0x1d77,
- 0x1d79, 0x1d9a,
- 0x1e01, 0x1e01,
- 0x1e03, 0x1e03,
- 0x1e05, 0x1e05,
- 0x1e07, 0x1e07,
- 0x1e09, 0x1e09,
- 0x1e0b, 0x1e0b,
- 0x1e0d, 0x1e0d,
- 0x1e0f, 0x1e0f,
- 0x1e11, 0x1e11,
- 0x1e13, 0x1e13,
- 0x1e15, 0x1e15,
- 0x1e17, 0x1e17,
- 0x1e19, 0x1e19,
- 0x1e1b, 0x1e1b,
- 0x1e1d, 0x1e1d,
- 0x1e1f, 0x1e1f,
- 0x1e21, 0x1e21,
- 0x1e23, 0x1e23,
- 0x1e25, 0x1e25,
- 0x1e27, 0x1e27,
- 0x1e29, 0x1e29,
- 0x1e2b, 0x1e2b,
- 0x1e2d, 0x1e2d,
- 0x1e2f, 0x1e2f,
- 0x1e31, 0x1e31,
- 0x1e33, 0x1e33,
- 0x1e35, 0x1e35,
- 0x1e37, 0x1e37,
- 0x1e39, 0x1e39,
- 0x1e3b, 0x1e3b,
- 0x1e3d, 0x1e3d,
- 0x1e3f, 0x1e3f,
- 0x1e41, 0x1e41,
- 0x1e43, 0x1e43,
- 0x1e45, 0x1e45,
- 0x1e47, 0x1e47,
- 0x1e49, 0x1e49,
- 0x1e4b, 0x1e4b,
- 0x1e4d, 0x1e4d,
- 0x1e4f, 0x1e4f,
- 0x1e51, 0x1e51,
- 0x1e53, 0x1e53,
- 0x1e55, 0x1e55,
- 0x1e57, 0x1e57,
- 0x1e59, 0x1e59,
- 0x1e5b, 0x1e5b,
- 0x1e5d, 0x1e5d,
- 0x1e5f, 0x1e5f,
- 0x1e61, 0x1e61,
- 0x1e63, 0x1e63,
- 0x1e65, 0x1e65,
- 0x1e67, 0x1e67,
- 0x1e69, 0x1e69,
- 0x1e6b, 0x1e6b,
- 0x1e6d, 0x1e6d,
- 0x1e6f, 0x1e6f,
- 0x1e71, 0x1e71,
- 0x1e73, 0x1e73,
- 0x1e75, 0x1e75,
- 0x1e77, 0x1e77,
- 0x1e79, 0x1e79,
- 0x1e7b, 0x1e7b,
- 0x1e7d, 0x1e7d,
- 0x1e7f, 0x1e7f,
- 0x1e81, 0x1e81,
- 0x1e83, 0x1e83,
- 0x1e85, 0x1e85,
- 0x1e87, 0x1e87,
- 0x1e89, 0x1e89,
- 0x1e8b, 0x1e8b,
- 0x1e8d, 0x1e8d,
- 0x1e8f, 0x1e8f,
- 0x1e91, 0x1e91,
- 0x1e93, 0x1e93,
- 0x1e95, 0x1e9d,
- 0x1e9f, 0x1e9f,
- 0x1ea1, 0x1ea1,
- 0x1ea3, 0x1ea3,
- 0x1ea5, 0x1ea5,
- 0x1ea7, 0x1ea7,
- 0x1ea9, 0x1ea9,
- 0x1eab, 0x1eab,
- 0x1ead, 0x1ead,
- 0x1eaf, 0x1eaf,
- 0x1eb1, 0x1eb1,
- 0x1eb3, 0x1eb3,
- 0x1eb5, 0x1eb5,
- 0x1eb7, 0x1eb7,
- 0x1eb9, 0x1eb9,
- 0x1ebb, 0x1ebb,
- 0x1ebd, 0x1ebd,
- 0x1ebf, 0x1ebf,
- 0x1ec1, 0x1ec1,
- 0x1ec3, 0x1ec3,
- 0x1ec5, 0x1ec5,
- 0x1ec7, 0x1ec7,
- 0x1ec9, 0x1ec9,
- 0x1ecb, 0x1ecb,
- 0x1ecd, 0x1ecd,
- 0x1ecf, 0x1ecf,
- 0x1ed1, 0x1ed1,
- 0x1ed3, 0x1ed3,
- 0x1ed5, 0x1ed5,
- 0x1ed7, 0x1ed7,
- 0x1ed9, 0x1ed9,
- 0x1edb, 0x1edb,
- 0x1edd, 0x1edd,
- 0x1edf, 0x1edf,
- 0x1ee1, 0x1ee1,
- 0x1ee3, 0x1ee3,
- 0x1ee5, 0x1ee5,
- 0x1ee7, 0x1ee7,
- 0x1ee9, 0x1ee9,
- 0x1eeb, 0x1eeb,
- 0x1eed, 0x1eed,
- 0x1eef, 0x1eef,
- 0x1ef1, 0x1ef1,
- 0x1ef3, 0x1ef3,
- 0x1ef5, 0x1ef5,
- 0x1ef7, 0x1ef7,
- 0x1ef9, 0x1ef9,
- 0x1efb, 0x1efb,
- 0x1efd, 0x1efd,
- 0x1eff, 0x1f07,
- 0x1f10, 0x1f15,
- 0x1f20, 0x1f27,
- 0x1f30, 0x1f37,
- 0x1f40, 0x1f45,
- 0x1f50, 0x1f57,
- 0x1f60, 0x1f67,
- 0x1f70, 0x1f7d,
- 0x1f80, 0x1f87,
- 0x1f90, 0x1f97,
- 0x1fa0, 0x1fa7,
- 0x1fb0, 0x1fb4,
- 0x1fb6, 0x1fb7,
- 0x1fbe, 0x1fbe,
- 0x1fc2, 0x1fc4,
- 0x1fc6, 0x1fc7,
- 0x1fd0, 0x1fd3,
- 0x1fd6, 0x1fd7,
- 0x1fe0, 0x1fe7,
- 0x1ff2, 0x1ff4,
- 0x1ff6, 0x1ff7,
- 0x2071, 0x2071,
- 0x207f, 0x207f,
- 0x210a, 0x210a,
- 0x210e, 0x210f,
- 0x2113, 0x2113,
- 0x212f, 0x212f,
- 0x2134, 0x2134,
- 0x2139, 0x2139,
- 0x213c, 0x213d,
- 0x2146, 0x2149,
- 0x214e, 0x214e,
- 0x2184, 0x2184,
- 0x2c30, 0x2c5e,
- 0x2c61, 0x2c61,
- 0x2c65, 0x2c66,
- 0x2c68, 0x2c68,
- 0x2c6a, 0x2c6a,
- 0x2c6c, 0x2c6c,
- 0x2c71, 0x2c71,
- 0x2c73, 0x2c74,
- 0x2c76, 0x2c7c,
- 0x2c81, 0x2c81,
- 0x2c83, 0x2c83,
- 0x2c85, 0x2c85,
- 0x2c87, 0x2c87,
- 0x2c89, 0x2c89,
- 0x2c8b, 0x2c8b,
- 0x2c8d, 0x2c8d,
- 0x2c8f, 0x2c8f,
- 0x2c91, 0x2c91,
- 0x2c93, 0x2c93,
- 0x2c95, 0x2c95,
- 0x2c97, 0x2c97,
- 0x2c99, 0x2c99,
- 0x2c9b, 0x2c9b,
- 0x2c9d, 0x2c9d,
- 0x2c9f, 0x2c9f,
- 0x2ca1, 0x2ca1,
- 0x2ca3, 0x2ca3,
- 0x2ca5, 0x2ca5,
- 0x2ca7, 0x2ca7,
- 0x2ca9, 0x2ca9,
- 0x2cab, 0x2cab,
- 0x2cad, 0x2cad,
- 0x2caf, 0x2caf,
- 0x2cb1, 0x2cb1,
- 0x2cb3, 0x2cb3,
- 0x2cb5, 0x2cb5,
- 0x2cb7, 0x2cb7,
- 0x2cb9, 0x2cb9,
- 0x2cbb, 0x2cbb,
- 0x2cbd, 0x2cbd,
- 0x2cbf, 0x2cbf,
- 0x2cc1, 0x2cc1,
- 0x2cc3, 0x2cc3,
- 0x2cc5, 0x2cc5,
- 0x2cc7, 0x2cc7,
- 0x2cc9, 0x2cc9,
- 0x2ccb, 0x2ccb,
- 0x2ccd, 0x2ccd,
- 0x2ccf, 0x2ccf,
- 0x2cd1, 0x2cd1,
- 0x2cd3, 0x2cd3,
- 0x2cd5, 0x2cd5,
- 0x2cd7, 0x2cd7,
- 0x2cd9, 0x2cd9,
- 0x2cdb, 0x2cdb,
- 0x2cdd, 0x2cdd,
- 0x2cdf, 0x2cdf,
- 0x2ce1, 0x2ce1,
- 0x2ce3, 0x2ce4,
- 0x2d00, 0x2d25,
- 0xa641, 0xa641,
- 0xa643, 0xa643,
- 0xa645, 0xa645,
- 0xa647, 0xa647,
- 0xa649, 0xa649,
- 0xa64b, 0xa64b,
- 0xa64d, 0xa64d,
- 0xa64f, 0xa64f,
- 0xa651, 0xa651,
- 0xa653, 0xa653,
- 0xa655, 0xa655,
- 0xa657, 0xa657,
- 0xa659, 0xa659,
- 0xa65b, 0xa65b,
- 0xa65d, 0xa65d,
- 0xa65f, 0xa65f,
- 0xa663, 0xa663,
- 0xa665, 0xa665,
- 0xa667, 0xa667,
- 0xa669, 0xa669,
- 0xa66b, 0xa66b,
- 0xa66d, 0xa66d,
- 0xa681, 0xa681,
- 0xa683, 0xa683,
- 0xa685, 0xa685,
- 0xa687, 0xa687,
- 0xa689, 0xa689,
- 0xa68b, 0xa68b,
- 0xa68d, 0xa68d,
- 0xa68f, 0xa68f,
- 0xa691, 0xa691,
- 0xa693, 0xa693,
- 0xa695, 0xa695,
- 0xa697, 0xa697,
- 0xa723, 0xa723,
- 0xa725, 0xa725,
- 0xa727, 0xa727,
- 0xa729, 0xa729,
- 0xa72b, 0xa72b,
- 0xa72d, 0xa72d,
- 0xa72f, 0xa731,
- 0xa733, 0xa733,
- 0xa735, 0xa735,
- 0xa737, 0xa737,
- 0xa739, 0xa739,
- 0xa73b, 0xa73b,
- 0xa73d, 0xa73d,
- 0xa73f, 0xa73f,
- 0xa741, 0xa741,
- 0xa743, 0xa743,
- 0xa745, 0xa745,
- 0xa747, 0xa747,
- 0xa749, 0xa749,
- 0xa74b, 0xa74b,
- 0xa74d, 0xa74d,
- 0xa74f, 0xa74f,
- 0xa751, 0xa751,
- 0xa753, 0xa753,
- 0xa755, 0xa755,
- 0xa757, 0xa757,
- 0xa759, 0xa759,
- 0xa75b, 0xa75b,
- 0xa75d, 0xa75d,
- 0xa75f, 0xa75f,
- 0xa761, 0xa761,
- 0xa763, 0xa763,
- 0xa765, 0xa765,
- 0xa767, 0xa767,
- 0xa769, 0xa769,
- 0xa76b, 0xa76b,
- 0xa76d, 0xa76d,
- 0xa76f, 0xa76f,
- 0xa771, 0xa778,
- 0xa77a, 0xa77a,
- 0xa77c, 0xa77c,
- 0xa77f, 0xa77f,
- 0xa781, 0xa781,
- 0xa783, 0xa783,
- 0xa785, 0xa785,
- 0xa787, 0xa787,
- 0xa78c, 0xa78c,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xff41, 0xff5a,
- 0x10428, 0x1044f,
- 0x1d41a, 0x1d433,
- 0x1d44e, 0x1d454,
- 0x1d456, 0x1d467,
- 0x1d482, 0x1d49b,
- 0x1d4b6, 0x1d4b9,
- 0x1d4bb, 0x1d4bb,
- 0x1d4bd, 0x1d4c3,
- 0x1d4c5, 0x1d4cf,
- 0x1d4ea, 0x1d503,
- 0x1d51e, 0x1d537,
- 0x1d552, 0x1d56b,
- 0x1d586, 0x1d59f,
- 0x1d5ba, 0x1d5d3,
- 0x1d5ee, 0x1d607,
- 0x1d622, 0x1d63b,
- 0x1d656, 0x1d66f,
- 0x1d68a, 0x1d6a5,
- 0x1d6c2, 0x1d6da,
- 0x1d6dc, 0x1d6e1,
- 0x1d6fc, 0x1d714,
- 0x1d716, 0x1d71b,
- 0x1d736, 0x1d74e,
- 0x1d750, 0x1d755,
- 0x1d770, 0x1d788,
- 0x1d78a, 0x1d78f,
- 0x1d7aa, 0x1d7c2,
- 0x1d7c4, 0x1d7c9,
- 0x1d7cb, 0x1d7cb,
-}; /* CR_Ll */
-
-/* 'Lm': General Category */
-static const OnigCodePoint CR_Lm[] = {
- 39,
- 0x02b0, 0x02c1,
- 0x02c6, 0x02d1,
- 0x02e0, 0x02e4,
- 0x02ec, 0x02ec,
- 0x02ee, 0x02ee,
- 0x0374, 0x0374,
- 0x037a, 0x037a,
- 0x0559, 0x0559,
- 0x0640, 0x0640,
- 0x06e5, 0x06e6,
- 0x07f4, 0x07f5,
- 0x07fa, 0x07fa,
- 0x0971, 0x0971,
- 0x0e46, 0x0e46,
- 0x0ec6, 0x0ec6,
- 0x10fc, 0x10fc,
- 0x17d7, 0x17d7,
- 0x1843, 0x1843,
- 0x1c78, 0x1c7d,
- 0x1d2c, 0x1d61,
- 0x1d78, 0x1d78,
- 0x1d9b, 0x1dbf,
- 0x2090, 0x2094,
- 0x2c7d, 0x2c7d,
- 0x2d6f, 0x2d6f,
- 0x2e2f, 0x2e2f,
- 0x3005, 0x3005,
- 0x3031, 0x3035,
- 0x303b, 0x303b,
- 0x309d, 0x309e,
- 0x30fc, 0x30fe,
- 0xa015, 0xa015,
- 0xa60c, 0xa60c,
- 0xa67f, 0xa67f,
- 0xa717, 0xa71f,
- 0xa770, 0xa770,
- 0xa788, 0xa788,
- 0xff70, 0xff70,
- 0xff9e, 0xff9f,
-}; /* CR_Lm */
-
-/* 'Lo': General Category */
-static const OnigCodePoint CR_Lo[] = {
- 286,
- 0x01bb, 0x01bb,
- 0x01c0, 0x01c3,
- 0x0294, 0x0294,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f2,
- 0x0621, 0x063f,
- 0x0641, 0x064a,
- 0x066e, 0x066f,
- 0x0671, 0x06d3,
- 0x06d5, 0x06d5,
- 0x06ee, 0x06ef,
- 0x06fa, 0x06fc,
- 0x06ff, 0x06ff,
- 0x0710, 0x0710,
- 0x0712, 0x072f,
- 0x074d, 0x07a5,
- 0x07b1, 0x07b1,
- 0x07ca, 0x07ea,
- 0x0904, 0x0939,
- 0x093d, 0x093d,
- 0x0950, 0x0950,
- 0x0958, 0x0961,
- 0x0972, 0x0972,
- 0x097b, 0x097f,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bd, 0x09bd,
- 0x09ce, 0x09ce,
- 0x09dc, 0x09dd,
- 0x09df, 0x09e1,
- 0x09f0, 0x09f1,
- 0x0a05, 0x0a0a,
- 0x0a0f, 0x0a10,
- 0x0a13, 0x0a28,
- 0x0a2a, 0x0a30,
- 0x0a32, 0x0a33,
- 0x0a35, 0x0a36,
- 0x0a38, 0x0a39,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a72, 0x0a74,
- 0x0a85, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abd, 0x0abd,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae1,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b35, 0x0b39,
- 0x0b3d, 0x0b3d,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b61,
- 0x0b71, 0x0b71,
- 0x0b83, 0x0b83,
- 0x0b85, 0x0b8a,
- 0x0b8e, 0x0b90,
- 0x0b92, 0x0b95,
- 0x0b99, 0x0b9a,
- 0x0b9c, 0x0b9c,
- 0x0b9e, 0x0b9f,
- 0x0ba3, 0x0ba4,
- 0x0ba8, 0x0baa,
- 0x0bae, 0x0bb9,
- 0x0bd0, 0x0bd0,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3d, 0x0c3d,
- 0x0c58, 0x0c59,
- 0x0c60, 0x0c61,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbd, 0x0cbd,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce1,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3d, 0x0d3d,
- 0x0d60, 0x0d61,
- 0x0d7a, 0x0d7f,
- 0x0d85, 0x0d96,
- 0x0d9a, 0x0db1,
- 0x0db3, 0x0dbb,
- 0x0dbd, 0x0dbd,
- 0x0dc0, 0x0dc6,
- 0x0e01, 0x0e30,
- 0x0e32, 0x0e33,
- 0x0e40, 0x0e45,
- 0x0e81, 0x0e82,
- 0x0e84, 0x0e84,
- 0x0e87, 0x0e88,
- 0x0e8a, 0x0e8a,
- 0x0e8d, 0x0e8d,
- 0x0e94, 0x0e97,
- 0x0e99, 0x0e9f,
- 0x0ea1, 0x0ea3,
- 0x0ea5, 0x0ea5,
- 0x0ea7, 0x0ea7,
- 0x0eaa, 0x0eab,
- 0x0ead, 0x0eb0,
- 0x0eb2, 0x0eb3,
- 0x0ebd, 0x0ebd,
- 0x0ec0, 0x0ec4,
- 0x0edc, 0x0edd,
- 0x0f00, 0x0f00,
- 0x0f40, 0x0f47,
- 0x0f49, 0x0f6c,
- 0x0f88, 0x0f8b,
- 0x1000, 0x102a,
- 0x103f, 0x103f,
- 0x1050, 0x1055,
- 0x105a, 0x105d,
- 0x1061, 0x1061,
- 0x1065, 0x1066,
- 0x106e, 0x1070,
- 0x1075, 0x1081,
- 0x108e, 0x108e,
- 0x10d0, 0x10fa,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x1200, 0x1248,
- 0x124a, 0x124d,
- 0x1250, 0x1256,
- 0x1258, 0x1258,
- 0x125a, 0x125d,
- 0x1260, 0x1288,
- 0x128a, 0x128d,
- 0x1290, 0x12b0,
- 0x12b2, 0x12b5,
- 0x12b8, 0x12be,
- 0x12c0, 0x12c0,
- 0x12c2, 0x12c5,
- 0x12c8, 0x12d6,
- 0x12d8, 0x1310,
- 0x1312, 0x1315,
- 0x1318, 0x135a,
- 0x1380, 0x138f,
- 0x13a0, 0x13f4,
- 0x1401, 0x166c,
- 0x166f, 0x1676,
- 0x1681, 0x169a,
- 0x16a0, 0x16ea,
- 0x1700, 0x170c,
- 0x170e, 0x1711,
- 0x1720, 0x1731,
- 0x1740, 0x1751,
- 0x1760, 0x176c,
- 0x176e, 0x1770,
- 0x1780, 0x17b3,
- 0x17dc, 0x17dc,
- 0x1820, 0x1842,
- 0x1844, 0x1877,
- 0x1880, 0x18a8,
- 0x18aa, 0x18aa,
- 0x1900, 0x191c,
- 0x1950, 0x196d,
- 0x1970, 0x1974,
- 0x1980, 0x19a9,
- 0x19c1, 0x19c7,
- 0x1a00, 0x1a16,
- 0x1b05, 0x1b33,
- 0x1b45, 0x1b4b,
- 0x1b83, 0x1ba0,
- 0x1bae, 0x1baf,
- 0x1c00, 0x1c23,
- 0x1c4d, 0x1c4f,
- 0x1c5a, 0x1c77,
- 0x2135, 0x2138,
- 0x2d30, 0x2d65,
- 0x2d80, 0x2d96,
- 0x2da0, 0x2da6,
- 0x2da8, 0x2dae,
- 0x2db0, 0x2db6,
- 0x2db8, 0x2dbe,
- 0x2dc0, 0x2dc6,
- 0x2dc8, 0x2dce,
- 0x2dd0, 0x2dd6,
- 0x2dd8, 0x2dde,
- 0x3006, 0x3006,
- 0x303c, 0x303c,
- 0x3041, 0x3096,
- 0x309f, 0x309f,
- 0x30a1, 0x30fa,
- 0x30ff, 0x30ff,
- 0x3105, 0x312d,
- 0x3131, 0x318e,
- 0x31a0, 0x31b7,
- 0x31f0, 0x31ff,
- 0x3400, 0x3400,
- 0x4db5, 0x4db5,
- 0x4e00, 0x4e00,
- 0x9fc3, 0x9fc3,
- 0xa000, 0xa014,
- 0xa016, 0xa48c,
- 0xa500, 0xa60b,
- 0xa610, 0xa61f,
- 0xa62a, 0xa62b,
- 0xa66e, 0xa66e,
- 0xa7fb, 0xa801,
- 0xa803, 0xa805,
- 0xa807, 0xa80a,
- 0xa80c, 0xa822,
- 0xa840, 0xa873,
- 0xa882, 0xa8b3,
- 0xa90a, 0xa925,
- 0xa930, 0xa946,
- 0xaa00, 0xaa28,
- 0xaa40, 0xaa42,
- 0xaa44, 0xaa4b,
- 0xac00, 0xac00,
- 0xd7a3, 0xd7a3,
- 0xf900, 0xfa2d,
- 0xfa30, 0xfa6a,
- 0xfa70, 0xfad9,
- 0xfb1d, 0xfb1d,
- 0xfb1f, 0xfb28,
- 0xfb2a, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbb1,
- 0xfbd3, 0xfd3d,
- 0xfd50, 0xfd8f,
- 0xfd92, 0xfdc7,
- 0xfdf0, 0xfdfb,
- 0xfe70, 0xfe74,
- 0xfe76, 0xfefc,
- 0xff66, 0xff6f,
- 0xff71, 0xff9d,
- 0xffa0, 0xffbe,
- 0xffc2, 0xffc7,
- 0xffca, 0xffcf,
- 0xffd2, 0xffd7,
- 0xffda, 0xffdc,
- 0x10000, 0x1000b,
- 0x1000d, 0x10026,
- 0x10028, 0x1003a,
- 0x1003c, 0x1003d,
- 0x1003f, 0x1004d,
- 0x10050, 0x1005d,
- 0x10080, 0x100fa,
- 0x10280, 0x1029c,
- 0x102a0, 0x102d0,
- 0x10300, 0x1031e,
- 0x10330, 0x10340,
- 0x10342, 0x10349,
- 0x10380, 0x1039d,
- 0x103a0, 0x103c3,
- 0x103c8, 0x103cf,
- 0x10450, 0x1049d,
- 0x10800, 0x10805,
- 0x10808, 0x10808,
- 0x1080a, 0x10835,
- 0x10837, 0x10838,
- 0x1083c, 0x1083c,
- 0x1083f, 0x1083f,
- 0x10900, 0x10915,
- 0x10920, 0x10939,
- 0x10a00, 0x10a00,
- 0x10a10, 0x10a13,
- 0x10a15, 0x10a17,
- 0x10a19, 0x10a33,
- 0x12000, 0x1236e,
- 0x20000, 0x20000,
- 0x2a6d6, 0x2a6d6,
- 0x2f800, 0x2fa1d,
-}; /* CR_Lo */
-
-/* 'Lt': General Category */
-static const OnigCodePoint CR_Lt[] = {
- 10,
- 0x01c5, 0x01c5,
- 0x01c8, 0x01c8,
- 0x01cb, 0x01cb,
- 0x01f2, 0x01f2,
- 0x1f88, 0x1f8f,
- 0x1f98, 0x1f9f,
- 0x1fa8, 0x1faf,
- 0x1fbc, 0x1fbc,
- 0x1fcc, 0x1fcc,
- 0x1ffc, 0x1ffc,
-}; /* CR_Lt */
-
-/* 'Lu': General Category */
-static const OnigCodePoint CR_Lu[] = {
- 591,
- 0x0041, 0x005a,
- 0x00c0, 0x00d6,
- 0x00d8, 0x00de,
- 0x0100, 0x0100,
- 0x0102, 0x0102,
- 0x0104, 0x0104,
- 0x0106, 0x0106,
- 0x0108, 0x0108,
- 0x010a, 0x010a,
- 0x010c, 0x010c,
- 0x010e, 0x010e,
- 0x0110, 0x0110,
- 0x0112, 0x0112,
- 0x0114, 0x0114,
- 0x0116, 0x0116,
- 0x0118, 0x0118,
- 0x011a, 0x011a,
- 0x011c, 0x011c,
- 0x011e, 0x011e,
- 0x0120, 0x0120,
- 0x0122, 0x0122,
- 0x0124, 0x0124,
- 0x0126, 0x0126,
- 0x0128, 0x0128,
- 0x012a, 0x012a,
- 0x012c, 0x012c,
- 0x012e, 0x012e,
- 0x0130, 0x0130,
- 0x0132, 0x0132,
- 0x0134, 0x0134,
- 0x0136, 0x0136,
- 0x0139, 0x0139,
- 0x013b, 0x013b,
- 0x013d, 0x013d,
- 0x013f, 0x013f,
- 0x0141, 0x0141,
- 0x0143, 0x0143,
- 0x0145, 0x0145,
- 0x0147, 0x0147,
- 0x014a, 0x014a,
- 0x014c, 0x014c,
- 0x014e, 0x014e,
- 0x0150, 0x0150,
- 0x0152, 0x0152,
- 0x0154, 0x0154,
- 0x0156, 0x0156,
- 0x0158, 0x0158,
- 0x015a, 0x015a,
- 0x015c, 0x015c,
- 0x015e, 0x015e,
- 0x0160, 0x0160,
- 0x0162, 0x0162,
- 0x0164, 0x0164,
- 0x0166, 0x0166,
- 0x0168, 0x0168,
- 0x016a, 0x016a,
- 0x016c, 0x016c,
- 0x016e, 0x016e,
- 0x0170, 0x0170,
- 0x0172, 0x0172,
- 0x0174, 0x0174,
- 0x0176, 0x0176,
- 0x0178, 0x0179,
- 0x017b, 0x017b,
- 0x017d, 0x017d,
- 0x0181, 0x0182,
- 0x0184, 0x0184,
- 0x0186, 0x0187,
- 0x0189, 0x018b,
- 0x018e, 0x0191,
- 0x0193, 0x0194,
- 0x0196, 0x0198,
- 0x019c, 0x019d,
- 0x019f, 0x01a0,
- 0x01a2, 0x01a2,
- 0x01a4, 0x01a4,
- 0x01a6, 0x01a7,
- 0x01a9, 0x01a9,
- 0x01ac, 0x01ac,
- 0x01ae, 0x01af,
- 0x01b1, 0x01b3,
- 0x01b5, 0x01b5,
- 0x01b7, 0x01b8,
- 0x01bc, 0x01bc,
- 0x01c4, 0x01c4,
- 0x01c7, 0x01c7,
- 0x01ca, 0x01ca,
- 0x01cd, 0x01cd,
- 0x01cf, 0x01cf,
- 0x01d1, 0x01d1,
- 0x01d3, 0x01d3,
- 0x01d5, 0x01d5,
- 0x01d7, 0x01d7,
- 0x01d9, 0x01d9,
- 0x01db, 0x01db,
- 0x01de, 0x01de,
- 0x01e0, 0x01e0,
- 0x01e2, 0x01e2,
- 0x01e4, 0x01e4,
- 0x01e6, 0x01e6,
- 0x01e8, 0x01e8,
- 0x01ea, 0x01ea,
- 0x01ec, 0x01ec,
- 0x01ee, 0x01ee,
- 0x01f1, 0x01f1,
- 0x01f4, 0x01f4,
- 0x01f6, 0x01f8,
- 0x01fa, 0x01fa,
- 0x01fc, 0x01fc,
- 0x01fe, 0x01fe,
- 0x0200, 0x0200,
- 0x0202, 0x0202,
- 0x0204, 0x0204,
- 0x0206, 0x0206,
- 0x0208, 0x0208,
- 0x020a, 0x020a,
- 0x020c, 0x020c,
- 0x020e, 0x020e,
- 0x0210, 0x0210,
- 0x0212, 0x0212,
- 0x0214, 0x0214,
- 0x0216, 0x0216,
- 0x0218, 0x0218,
- 0x021a, 0x021a,
- 0x021c, 0x021c,
- 0x021e, 0x021e,
- 0x0220, 0x0220,
- 0x0222, 0x0222,
- 0x0224, 0x0224,
- 0x0226, 0x0226,
- 0x0228, 0x0228,
- 0x022a, 0x022a,
- 0x022c, 0x022c,
- 0x022e, 0x022e,
- 0x0230, 0x0230,
- 0x0232, 0x0232,
- 0x023a, 0x023b,
- 0x023d, 0x023e,
- 0x0241, 0x0241,
- 0x0243, 0x0246,
- 0x0248, 0x0248,
- 0x024a, 0x024a,
- 0x024c, 0x024c,
- 0x024e, 0x024e,
- 0x0370, 0x0370,
- 0x0372, 0x0372,
- 0x0376, 0x0376,
- 0x0386, 0x0386,
- 0x0388, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x038f,
- 0x0391, 0x03a1,
- 0x03a3, 0x03ab,
- 0x03cf, 0x03cf,
- 0x03d2, 0x03d4,
- 0x03d8, 0x03d8,
- 0x03da, 0x03da,
- 0x03dc, 0x03dc,
- 0x03de, 0x03de,
- 0x03e0, 0x03e0,
- 0x03e2, 0x03e2,
- 0x03e4, 0x03e4,
- 0x03e6, 0x03e6,
- 0x03e8, 0x03e8,
- 0x03ea, 0x03ea,
- 0x03ec, 0x03ec,
- 0x03ee, 0x03ee,
- 0x03f4, 0x03f4,
- 0x03f7, 0x03f7,
- 0x03f9, 0x03fa,
- 0x03fd, 0x042f,
- 0x0460, 0x0460,
- 0x0462, 0x0462,
- 0x0464, 0x0464,
- 0x0466, 0x0466,
- 0x0468, 0x0468,
- 0x046a, 0x046a,
- 0x046c, 0x046c,
- 0x046e, 0x046e,
- 0x0470, 0x0470,
- 0x0472, 0x0472,
- 0x0474, 0x0474,
- 0x0476, 0x0476,
- 0x0478, 0x0478,
- 0x047a, 0x047a,
- 0x047c, 0x047c,
- 0x047e, 0x047e,
- 0x0480, 0x0480,
- 0x048a, 0x048a,
- 0x048c, 0x048c,
- 0x048e, 0x048e,
- 0x0490, 0x0490,
- 0x0492, 0x0492,
- 0x0494, 0x0494,
- 0x0496, 0x0496,
- 0x0498, 0x0498,
- 0x049a, 0x049a,
- 0x049c, 0x049c,
- 0x049e, 0x049e,
- 0x04a0, 0x04a0,
- 0x04a2, 0x04a2,
- 0x04a4, 0x04a4,
- 0x04a6, 0x04a6,
- 0x04a8, 0x04a8,
- 0x04aa, 0x04aa,
- 0x04ac, 0x04ac,
- 0x04ae, 0x04ae,
- 0x04b0, 0x04b0,
- 0x04b2, 0x04b2,
- 0x04b4, 0x04b4,
- 0x04b6, 0x04b6,
- 0x04b8, 0x04b8,
- 0x04ba, 0x04ba,
- 0x04bc, 0x04bc,
- 0x04be, 0x04be,
- 0x04c0, 0x04c1,
- 0x04c3, 0x04c3,
- 0x04c5, 0x04c5,
- 0x04c7, 0x04c7,
- 0x04c9, 0x04c9,
- 0x04cb, 0x04cb,
- 0x04cd, 0x04cd,
- 0x04d0, 0x04d0,
- 0x04d2, 0x04d2,
- 0x04d4, 0x04d4,
- 0x04d6, 0x04d6,
- 0x04d8, 0x04d8,
- 0x04da, 0x04da,
- 0x04dc, 0x04dc,
- 0x04de, 0x04de,
- 0x04e0, 0x04e0,
- 0x04e2, 0x04e2,
- 0x04e4, 0x04e4,
- 0x04e6, 0x04e6,
- 0x04e8, 0x04e8,
- 0x04ea, 0x04ea,
- 0x04ec, 0x04ec,
- 0x04ee, 0x04ee,
- 0x04f0, 0x04f0,
- 0x04f2, 0x04f2,
- 0x04f4, 0x04f4,
- 0x04f6, 0x04f6,
- 0x04f8, 0x04f8,
- 0x04fa, 0x04fa,
- 0x04fc, 0x04fc,
- 0x04fe, 0x04fe,
- 0x0500, 0x0500,
- 0x0502, 0x0502,
- 0x0504, 0x0504,
- 0x0506, 0x0506,
- 0x0508, 0x0508,
- 0x050a, 0x050a,
- 0x050c, 0x050c,
- 0x050e, 0x050e,
- 0x0510, 0x0510,
- 0x0512, 0x0512,
- 0x0514, 0x0514,
- 0x0516, 0x0516,
- 0x0518, 0x0518,
- 0x051a, 0x051a,
- 0x051c, 0x051c,
- 0x051e, 0x051e,
- 0x0520, 0x0520,
- 0x0522, 0x0522,
- 0x0531, 0x0556,
- 0x10a0, 0x10c5,
- 0x1e00, 0x1e00,
- 0x1e02, 0x1e02,
- 0x1e04, 0x1e04,
- 0x1e06, 0x1e06,
- 0x1e08, 0x1e08,
- 0x1e0a, 0x1e0a,
- 0x1e0c, 0x1e0c,
- 0x1e0e, 0x1e0e,
- 0x1e10, 0x1e10,
- 0x1e12, 0x1e12,
- 0x1e14, 0x1e14,
- 0x1e16, 0x1e16,
- 0x1e18, 0x1e18,
- 0x1e1a, 0x1e1a,
- 0x1e1c, 0x1e1c,
- 0x1e1e, 0x1e1e,
- 0x1e20, 0x1e20,
- 0x1e22, 0x1e22,
- 0x1e24, 0x1e24,
- 0x1e26, 0x1e26,
- 0x1e28, 0x1e28,
- 0x1e2a, 0x1e2a,
- 0x1e2c, 0x1e2c,
- 0x1e2e, 0x1e2e,
- 0x1e30, 0x1e30,
- 0x1e32, 0x1e32,
- 0x1e34, 0x1e34,
- 0x1e36, 0x1e36,
- 0x1e38, 0x1e38,
- 0x1e3a, 0x1e3a,
- 0x1e3c, 0x1e3c,
- 0x1e3e, 0x1e3e,
- 0x1e40, 0x1e40,
- 0x1e42, 0x1e42,
- 0x1e44, 0x1e44,
- 0x1e46, 0x1e46,
- 0x1e48, 0x1e48,
- 0x1e4a, 0x1e4a,
- 0x1e4c, 0x1e4c,
- 0x1e4e, 0x1e4e,
- 0x1e50, 0x1e50,
- 0x1e52, 0x1e52,
- 0x1e54, 0x1e54,
- 0x1e56, 0x1e56,
- 0x1e58, 0x1e58,
- 0x1e5a, 0x1e5a,
- 0x1e5c, 0x1e5c,
- 0x1e5e, 0x1e5e,
- 0x1e60, 0x1e60,
- 0x1e62, 0x1e62,
- 0x1e64, 0x1e64,
- 0x1e66, 0x1e66,
- 0x1e68, 0x1e68,
- 0x1e6a, 0x1e6a,
- 0x1e6c, 0x1e6c,
- 0x1e6e, 0x1e6e,
- 0x1e70, 0x1e70,
- 0x1e72, 0x1e72,
- 0x1e74, 0x1e74,
- 0x1e76, 0x1e76,
- 0x1e78, 0x1e78,
- 0x1e7a, 0x1e7a,
- 0x1e7c, 0x1e7c,
- 0x1e7e, 0x1e7e,
- 0x1e80, 0x1e80,
- 0x1e82, 0x1e82,
- 0x1e84, 0x1e84,
- 0x1e86, 0x1e86,
- 0x1e88, 0x1e88,
- 0x1e8a, 0x1e8a,
- 0x1e8c, 0x1e8c,
- 0x1e8e, 0x1e8e,
- 0x1e90, 0x1e90,
- 0x1e92, 0x1e92,
- 0x1e94, 0x1e94,
- 0x1e9e, 0x1e9e,
- 0x1ea0, 0x1ea0,
- 0x1ea2, 0x1ea2,
- 0x1ea4, 0x1ea4,
- 0x1ea6, 0x1ea6,
- 0x1ea8, 0x1ea8,
- 0x1eaa, 0x1eaa,
- 0x1eac, 0x1eac,
- 0x1eae, 0x1eae,
- 0x1eb0, 0x1eb0,
- 0x1eb2, 0x1eb2,
- 0x1eb4, 0x1eb4,
- 0x1eb6, 0x1eb6,
- 0x1eb8, 0x1eb8,
- 0x1eba, 0x1eba,
- 0x1ebc, 0x1ebc,
- 0x1ebe, 0x1ebe,
- 0x1ec0, 0x1ec0,
- 0x1ec2, 0x1ec2,
- 0x1ec4, 0x1ec4,
- 0x1ec6, 0x1ec6,
- 0x1ec8, 0x1ec8,
- 0x1eca, 0x1eca,
- 0x1ecc, 0x1ecc,
- 0x1ece, 0x1ece,
- 0x1ed0, 0x1ed0,
- 0x1ed2, 0x1ed2,
- 0x1ed4, 0x1ed4,
- 0x1ed6, 0x1ed6,
- 0x1ed8, 0x1ed8,
- 0x1eda, 0x1eda,
- 0x1edc, 0x1edc,
- 0x1ede, 0x1ede,
- 0x1ee0, 0x1ee0,
- 0x1ee2, 0x1ee2,
- 0x1ee4, 0x1ee4,
- 0x1ee6, 0x1ee6,
- 0x1ee8, 0x1ee8,
- 0x1eea, 0x1eea,
- 0x1eec, 0x1eec,
- 0x1eee, 0x1eee,
- 0x1ef0, 0x1ef0,
- 0x1ef2, 0x1ef2,
- 0x1ef4, 0x1ef4,
- 0x1ef6, 0x1ef6,
- 0x1ef8, 0x1ef8,
- 0x1efa, 0x1efa,
- 0x1efc, 0x1efc,
- 0x1efe, 0x1efe,
- 0x1f08, 0x1f0f,
- 0x1f18, 0x1f1d,
- 0x1f28, 0x1f2f,
- 0x1f38, 0x1f3f,
- 0x1f48, 0x1f4d,
- 0x1f59, 0x1f59,
- 0x1f5b, 0x1f5b,
- 0x1f5d, 0x1f5d,
- 0x1f5f, 0x1f5f,
- 0x1f68, 0x1f6f,
- 0x1fb8, 0x1fbb,
- 0x1fc8, 0x1fcb,
- 0x1fd8, 0x1fdb,
- 0x1fe8, 0x1fec,
- 0x1ff8, 0x1ffb,
- 0x2102, 0x2102,
- 0x2107, 0x2107,
- 0x210b, 0x210d,
- 0x2110, 0x2112,
- 0x2115, 0x2115,
- 0x2119, 0x211d,
- 0x2124, 0x2124,
- 0x2126, 0x2126,
- 0x2128, 0x2128,
- 0x212a, 0x212d,
- 0x2130, 0x2133,
- 0x213e, 0x213f,
- 0x2145, 0x2145,
- 0x2183, 0x2183,
- 0x2c00, 0x2c2e,
- 0x2c60, 0x2c60,
- 0x2c62, 0x2c64,
- 0x2c67, 0x2c67,
- 0x2c69, 0x2c69,
- 0x2c6b, 0x2c6b,
- 0x2c6d, 0x2c6f,
- 0x2c72, 0x2c72,
- 0x2c75, 0x2c75,
- 0x2c80, 0x2c80,
- 0x2c82, 0x2c82,
- 0x2c84, 0x2c84,
- 0x2c86, 0x2c86,
- 0x2c88, 0x2c88,
- 0x2c8a, 0x2c8a,
- 0x2c8c, 0x2c8c,
- 0x2c8e, 0x2c8e,
- 0x2c90, 0x2c90,
- 0x2c92, 0x2c92,
- 0x2c94, 0x2c94,
- 0x2c96, 0x2c96,
- 0x2c98, 0x2c98,
- 0x2c9a, 0x2c9a,
- 0x2c9c, 0x2c9c,
- 0x2c9e, 0x2c9e,
- 0x2ca0, 0x2ca0,
- 0x2ca2, 0x2ca2,
- 0x2ca4, 0x2ca4,
- 0x2ca6, 0x2ca6,
- 0x2ca8, 0x2ca8,
- 0x2caa, 0x2caa,
- 0x2cac, 0x2cac,
- 0x2cae, 0x2cae,
- 0x2cb0, 0x2cb0,
- 0x2cb2, 0x2cb2,
- 0x2cb4, 0x2cb4,
- 0x2cb6, 0x2cb6,
- 0x2cb8, 0x2cb8,
- 0x2cba, 0x2cba,
- 0x2cbc, 0x2cbc,
- 0x2cbe, 0x2cbe,
- 0x2cc0, 0x2cc0,
- 0x2cc2, 0x2cc2,
- 0x2cc4, 0x2cc4,
- 0x2cc6, 0x2cc6,
- 0x2cc8, 0x2cc8,
- 0x2cca, 0x2cca,
- 0x2ccc, 0x2ccc,
- 0x2cce, 0x2cce,
- 0x2cd0, 0x2cd0,
- 0x2cd2, 0x2cd2,
- 0x2cd4, 0x2cd4,
- 0x2cd6, 0x2cd6,
- 0x2cd8, 0x2cd8,
- 0x2cda, 0x2cda,
- 0x2cdc, 0x2cdc,
- 0x2cde, 0x2cde,
- 0x2ce0, 0x2ce0,
- 0x2ce2, 0x2ce2,
- 0xa640, 0xa640,
- 0xa642, 0xa642,
- 0xa644, 0xa644,
- 0xa646, 0xa646,
- 0xa648, 0xa648,
- 0xa64a, 0xa64a,
- 0xa64c, 0xa64c,
- 0xa64e, 0xa64e,
- 0xa650, 0xa650,
- 0xa652, 0xa652,
- 0xa654, 0xa654,
- 0xa656, 0xa656,
- 0xa658, 0xa658,
- 0xa65a, 0xa65a,
- 0xa65c, 0xa65c,
- 0xa65e, 0xa65e,
- 0xa662, 0xa662,
- 0xa664, 0xa664,
- 0xa666, 0xa666,
- 0xa668, 0xa668,
- 0xa66a, 0xa66a,
- 0xa66c, 0xa66c,
- 0xa680, 0xa680,
- 0xa682, 0xa682,
- 0xa684, 0xa684,
- 0xa686, 0xa686,
- 0xa688, 0xa688,
- 0xa68a, 0xa68a,
- 0xa68c, 0xa68c,
- 0xa68e, 0xa68e,
- 0xa690, 0xa690,
- 0xa692, 0xa692,
- 0xa694, 0xa694,
- 0xa696, 0xa696,
- 0xa722, 0xa722,
- 0xa724, 0xa724,
- 0xa726, 0xa726,
- 0xa728, 0xa728,
- 0xa72a, 0xa72a,
- 0xa72c, 0xa72c,
- 0xa72e, 0xa72e,
- 0xa732, 0xa732,
- 0xa734, 0xa734,
- 0xa736, 0xa736,
- 0xa738, 0xa738,
- 0xa73a, 0xa73a,
- 0xa73c, 0xa73c,
- 0xa73e, 0xa73e,
- 0xa740, 0xa740,
- 0xa742, 0xa742,
- 0xa744, 0xa744,
- 0xa746, 0xa746,
- 0xa748, 0xa748,
- 0xa74a, 0xa74a,
- 0xa74c, 0xa74c,
- 0xa74e, 0xa74e,
- 0xa750, 0xa750,
- 0xa752, 0xa752,
- 0xa754, 0xa754,
- 0xa756, 0xa756,
- 0xa758, 0xa758,
- 0xa75a, 0xa75a,
- 0xa75c, 0xa75c,
- 0xa75e, 0xa75e,
- 0xa760, 0xa760,
- 0xa762, 0xa762,
- 0xa764, 0xa764,
- 0xa766, 0xa766,
- 0xa768, 0xa768,
- 0xa76a, 0xa76a,
- 0xa76c, 0xa76c,
- 0xa76e, 0xa76e,
- 0xa779, 0xa779,
- 0xa77b, 0xa77b,
- 0xa77d, 0xa77e,
- 0xa780, 0xa780,
- 0xa782, 0xa782,
- 0xa784, 0xa784,
- 0xa786, 0xa786,
- 0xa78b, 0xa78b,
- 0xff21, 0xff3a,
- 0x10400, 0x10427,
- 0x1d400, 0x1d419,
- 0x1d434, 0x1d44d,
- 0x1d468, 0x1d481,
- 0x1d49c, 0x1d49c,
- 0x1d49e, 0x1d49f,
- 0x1d4a2, 0x1d4a2,
- 0x1d4a5, 0x1d4a6,
- 0x1d4a9, 0x1d4ac,
- 0x1d4ae, 0x1d4b5,
- 0x1d4d0, 0x1d4e9,
- 0x1d504, 0x1d505,
- 0x1d507, 0x1d50a,
- 0x1d50d, 0x1d514,
- 0x1d516, 0x1d51c,
- 0x1d538, 0x1d539,
- 0x1d53b, 0x1d53e,
- 0x1d540, 0x1d544,
- 0x1d546, 0x1d546,
- 0x1d54a, 0x1d550,
- 0x1d56c, 0x1d585,
- 0x1d5a0, 0x1d5b9,
- 0x1d5d4, 0x1d5ed,
- 0x1d608, 0x1d621,
- 0x1d63c, 0x1d655,
- 0x1d670, 0x1d689,
- 0x1d6a8, 0x1d6c0,
- 0x1d6e2, 0x1d6fa,
- 0x1d71c, 0x1d734,
- 0x1d756, 0x1d76e,
- 0x1d790, 0x1d7a8,
- 0x1d7ca, 0x1d7ca,
-}; /* CR_Lu */
-
-/* 'M': Major Category */
-static const OnigCodePoint CR_M[] = {
- 161,
- 0x0300, 0x036f,
- 0x0483, 0x0489,
- 0x0591, 0x05bd,
- 0x05bf, 0x05bf,
- 0x05c1, 0x05c2,
- 0x05c4, 0x05c5,
- 0x05c7, 0x05c7,
- 0x0610, 0x061a,
- 0x064b, 0x065e,
- 0x0670, 0x0670,
- 0x06d6, 0x06dc,
- 0x06de, 0x06e4,
- 0x06e7, 0x06e8,
- 0x06ea, 0x06ed,
- 0x0711, 0x0711,
- 0x0730, 0x074a,
- 0x07a6, 0x07b0,
- 0x07eb, 0x07f3,
- 0x0901, 0x0903,
- 0x093c, 0x093c,
- 0x093e, 0x094d,
- 0x0951, 0x0954,
- 0x0962, 0x0963,
- 0x0981, 0x0983,
- 0x09bc, 0x09bc,
- 0x09be, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09cd,
- 0x09d7, 0x09d7,
- 0x09e2, 0x09e3,
- 0x0a01, 0x0a03,
- 0x0a3c, 0x0a3c,
- 0x0a3e, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4d,
- 0x0a51, 0x0a51,
- 0x0a70, 0x0a71,
- 0x0a75, 0x0a75,
- 0x0a81, 0x0a83,
- 0x0abc, 0x0abc,
- 0x0abe, 0x0ac5,
- 0x0ac7, 0x0ac9,
- 0x0acb, 0x0acd,
- 0x0ae2, 0x0ae3,
- 0x0b01, 0x0b03,
- 0x0b3c, 0x0b3c,
- 0x0b3e, 0x0b44,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b62, 0x0b63,
- 0x0b82, 0x0b82,
- 0x0bbe, 0x0bc2,
- 0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcd,
- 0x0bd7, 0x0bd7,
- 0x0c01, 0x0c03,
- 0x0c3e, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c62, 0x0c63,
- 0x0c82, 0x0c83,
- 0x0cbc, 0x0cbc,
- 0x0cbe, 0x0cc4,
- 0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccd,
- 0x0cd5, 0x0cd6,
- 0x0ce2, 0x0ce3,
- 0x0d02, 0x0d03,
- 0x0d3e, 0x0d44,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d62, 0x0d63,
- 0x0d82, 0x0d83,
- 0x0dca, 0x0dca,
- 0x0dcf, 0x0dd4,
- 0x0dd6, 0x0dd6,
- 0x0dd8, 0x0ddf,
- 0x0df2, 0x0df3,
- 0x0e31, 0x0e31,
- 0x0e34, 0x0e3a,
- 0x0e47, 0x0e4e,
- 0x0eb1, 0x0eb1,
- 0x0eb4, 0x0eb9,
- 0x0ebb, 0x0ebc,
- 0x0ec8, 0x0ecd,
- 0x0f18, 0x0f19,
- 0x0f35, 0x0f35,
- 0x0f37, 0x0f37,
- 0x0f39, 0x0f39,
- 0x0f3e, 0x0f3f,
- 0x0f71, 0x0f84,
- 0x0f86, 0x0f87,
- 0x0f90, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fc6, 0x0fc6,
- 0x102b, 0x103e,
- 0x1056, 0x1059,
- 0x105e, 0x1060,
- 0x1062, 0x1064,
- 0x1067, 0x106d,
- 0x1071, 0x1074,
- 0x1082, 0x108d,
- 0x108f, 0x108f,
- 0x135f, 0x135f,
- 0x1712, 0x1714,
- 0x1732, 0x1734,
- 0x1752, 0x1753,
- 0x1772, 0x1773,
- 0x17b6, 0x17d3,
- 0x17dd, 0x17dd,
- 0x180b, 0x180d,
- 0x18a9, 0x18a9,
- 0x1920, 0x192b,
- 0x1930, 0x193b,
- 0x19b0, 0x19c0,
- 0x19c8, 0x19c9,
- 0x1a17, 0x1a1b,
- 0x1b00, 0x1b04,
- 0x1b34, 0x1b44,
- 0x1b6b, 0x1b73,
- 0x1b80, 0x1b82,
- 0x1ba1, 0x1baa,
- 0x1c24, 0x1c37,
- 0x1dc0, 0x1de6,
- 0x1dfe, 0x1dff,
- 0x20d0, 0x20f0,
- 0x2de0, 0x2dff,
- 0x302a, 0x302f,
- 0x3099, 0x309a,
- 0xa66f, 0xa672,
- 0xa67c, 0xa67d,
- 0xa802, 0xa802,
- 0xa806, 0xa806,
- 0xa80b, 0xa80b,
- 0xa823, 0xa827,
- 0xa880, 0xa881,
- 0xa8b4, 0xa8c4,
- 0xa926, 0xa92d,
- 0xa947, 0xa953,
- 0xaa29, 0xaa36,
- 0xaa43, 0xaa43,
- 0xaa4c, 0xaa4d,
- 0xfb1e, 0xfb1e,
- 0xfe00, 0xfe0f,
- 0xfe20, 0xfe26,
- 0x101fd, 0x101fd,
- 0x10a01, 0x10a03,
- 0x10a05, 0x10a06,
- 0x10a0c, 0x10a0f,
- 0x10a38, 0x10a3a,
- 0x10a3f, 0x10a3f,
- 0x1d165, 0x1d169,
- 0x1d16d, 0x1d172,
- 0x1d17b, 0x1d182,
- 0x1d185, 0x1d18b,
- 0x1d1aa, 0x1d1ad,
- 0x1d242, 0x1d244,
- 0xe0100, 0xe01ef,
-}; /* CR_M */
-
-/* 'Mc': General Category */
-static const OnigCodePoint CR_Mc[] = {
- 85,
- 0x0903, 0x0903,
- 0x093e, 0x0940,
- 0x0949, 0x094c,
- 0x0982, 0x0983,
- 0x09be, 0x09c0,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09cc,
- 0x09d7, 0x09d7,
- 0x0a03, 0x0a03,
- 0x0a3e, 0x0a40,
- 0x0a83, 0x0a83,
- 0x0abe, 0x0ac0,
- 0x0ac9, 0x0ac9,
- 0x0acb, 0x0acc,
- 0x0b02, 0x0b03,
- 0x0b3e, 0x0b3e,
- 0x0b40, 0x0b40,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4c,
- 0x0b57, 0x0b57,
- 0x0bbe, 0x0bbf,
- 0x0bc1, 0x0bc2,
- 0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcc,
- 0x0bd7, 0x0bd7,
- 0x0c01, 0x0c03,
- 0x0c41, 0x0c44,
- 0x0c82, 0x0c83,
- 0x0cbe, 0x0cbe,
- 0x0cc0, 0x0cc4,
- 0x0cc7, 0x0cc8,
- 0x0cca, 0x0ccb,
- 0x0cd5, 0x0cd6,
- 0x0d02, 0x0d03,
- 0x0d3e, 0x0d40,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4c,
- 0x0d57, 0x0d57,
- 0x0d82, 0x0d83,
- 0x0dcf, 0x0dd1,
- 0x0dd8, 0x0ddf,
- 0x0df2, 0x0df3,
- 0x0f3e, 0x0f3f,
- 0x0f7f, 0x0f7f,
- 0x102b, 0x102c,
- 0x1031, 0x1031,
- 0x1038, 0x1038,
- 0x103b, 0x103c,
- 0x1056, 0x1057,
- 0x1062, 0x1064,
- 0x1067, 0x106d,
- 0x1083, 0x1084,
- 0x1087, 0x108c,
- 0x108f, 0x108f,
- 0x17b6, 0x17b6,
- 0x17be, 0x17c5,
- 0x17c7, 0x17c8,
- 0x1923, 0x1926,
- 0x1929, 0x192b,
- 0x1930, 0x1931,
- 0x1933, 0x1938,
- 0x19b0, 0x19c0,
- 0x19c8, 0x19c9,
- 0x1a19, 0x1a1b,
- 0x1b04, 0x1b04,
- 0x1b35, 0x1b35,
- 0x1b3b, 0x1b3b,
- 0x1b3d, 0x1b41,
- 0x1b43, 0x1b44,
- 0x1b82, 0x1b82,
- 0x1ba1, 0x1ba1,
- 0x1ba6, 0x1ba7,
- 0x1baa, 0x1baa,
- 0x1c24, 0x1c2b,
- 0x1c34, 0x1c35,
- 0xa823, 0xa824,
- 0xa827, 0xa827,
- 0xa880, 0xa881,
- 0xa8b4, 0xa8c3,
- 0xa952, 0xa953,
- 0xaa2f, 0xaa30,
- 0xaa33, 0xaa34,
- 0xaa4d, 0xaa4d,
- 0x1d165, 0x1d166,
- 0x1d16d, 0x1d172,
-}; /* CR_Mc */
-
-/* 'Me': General Category */
-static const OnigCodePoint CR_Me[] = {
- 5,
- 0x0488, 0x0489,
- 0x06de, 0x06de,
- 0x20dd, 0x20e0,
- 0x20e2, 0x20e4,
- 0xa670, 0xa672,
-}; /* CR_Me */
-
-/* 'Mn': General Category */
-static const OnigCodePoint CR_Mn[] = {
- 160,
- 0x0300, 0x036f,
- 0x0483, 0x0487,
- 0x0591, 0x05bd,
- 0x05bf, 0x05bf,
- 0x05c1, 0x05c2,
- 0x05c4, 0x05c5,
- 0x05c7, 0x05c7,
- 0x0610, 0x061a,
- 0x064b, 0x065e,
- 0x0670, 0x0670,
- 0x06d6, 0x06dc,
- 0x06df, 0x06e4,
- 0x06e7, 0x06e8,
- 0x06ea, 0x06ed,
- 0x0711, 0x0711,
- 0x0730, 0x074a,
- 0x07a6, 0x07b0,
- 0x07eb, 0x07f3,
- 0x0901, 0x0902,
- 0x093c, 0x093c,
- 0x0941, 0x0948,
- 0x094d, 0x094d,
- 0x0951, 0x0954,
- 0x0962, 0x0963,
- 0x0981, 0x0981,
- 0x09bc, 0x09bc,
- 0x09c1, 0x09c4,
- 0x09cd, 0x09cd,
- 0x09e2, 0x09e3,
- 0x0a01, 0x0a02,
- 0x0a3c, 0x0a3c,
- 0x0a41, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4d,
- 0x0a51, 0x0a51,
- 0x0a70, 0x0a71,
- 0x0a75, 0x0a75,
- 0x0a81, 0x0a82,
- 0x0abc, 0x0abc,
- 0x0ac1, 0x0ac5,
- 0x0ac7, 0x0ac8,
- 0x0acd, 0x0acd,
- 0x0ae2, 0x0ae3,
- 0x0b01, 0x0b01,
- 0x0b3c, 0x0b3c,
- 0x0b3f, 0x0b3f,
- 0x0b41, 0x0b44,
- 0x0b4d, 0x0b4d,
- 0x0b56, 0x0b56,
- 0x0b62, 0x0b63,
- 0x0b82, 0x0b82,
- 0x0bc0, 0x0bc0,
- 0x0bcd, 0x0bcd,
- 0x0c3e, 0x0c40,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c62, 0x0c63,
- 0x0cbc, 0x0cbc,
- 0x0cbf, 0x0cbf,
- 0x0cc6, 0x0cc6,
- 0x0ccc, 0x0ccd,
- 0x0ce2, 0x0ce3,
- 0x0d41, 0x0d44,
- 0x0d4d, 0x0d4d,
- 0x0d62, 0x0d63,
- 0x0dca, 0x0dca,
- 0x0dd2, 0x0dd4,
- 0x0dd6, 0x0dd6,
- 0x0e31, 0x0e31,
- 0x0e34, 0x0e3a,
- 0x0e47, 0x0e4e,
- 0x0eb1, 0x0eb1,
- 0x0eb4, 0x0eb9,
- 0x0ebb, 0x0ebc,
- 0x0ec8, 0x0ecd,
- 0x0f18, 0x0f19,
- 0x0f35, 0x0f35,
- 0x0f37, 0x0f37,
- 0x0f39, 0x0f39,
- 0x0f71, 0x0f7e,
- 0x0f80, 0x0f84,
- 0x0f86, 0x0f87,
- 0x0f90, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fc6, 0x0fc6,
- 0x102d, 0x1030,
- 0x1032, 0x1037,
- 0x1039, 0x103a,
- 0x103d, 0x103e,
- 0x1058, 0x1059,
- 0x105e, 0x1060,
- 0x1071, 0x1074,
- 0x1082, 0x1082,
- 0x1085, 0x1086,
- 0x108d, 0x108d,
- 0x135f, 0x135f,
- 0x1712, 0x1714,
- 0x1732, 0x1734,
- 0x1752, 0x1753,
- 0x1772, 0x1773,
- 0x17b7, 0x17bd,
- 0x17c6, 0x17c6,
- 0x17c9, 0x17d3,
- 0x17dd, 0x17dd,
- 0x180b, 0x180d,
- 0x18a9, 0x18a9,
- 0x1920, 0x1922,
- 0x1927, 0x1928,
- 0x1932, 0x1932,
- 0x1939, 0x193b,
- 0x1a17, 0x1a18,
- 0x1b00, 0x1b03,
- 0x1b34, 0x1b34,
- 0x1b36, 0x1b3a,
- 0x1b3c, 0x1b3c,
- 0x1b42, 0x1b42,
- 0x1b6b, 0x1b73,
- 0x1b80, 0x1b81,
- 0x1ba2, 0x1ba5,
- 0x1ba8, 0x1ba9,
- 0x1c2c, 0x1c33,
- 0x1c36, 0x1c37,
- 0x1dc0, 0x1de6,
- 0x1dfe, 0x1dff,
- 0x20d0, 0x20dc,
- 0x20e1, 0x20e1,
- 0x20e5, 0x20f0,
- 0x2de0, 0x2dff,
- 0x302a, 0x302f,
- 0x3099, 0x309a,
- 0xa66f, 0xa66f,
- 0xa67c, 0xa67d,
- 0xa802, 0xa802,
- 0xa806, 0xa806,
- 0xa80b, 0xa80b,
- 0xa825, 0xa826,
- 0xa8c4, 0xa8c4,
- 0xa926, 0xa92d,
- 0xa947, 0xa951,
- 0xaa29, 0xaa2e,
- 0xaa31, 0xaa32,
- 0xaa35, 0xaa36,
- 0xaa43, 0xaa43,
- 0xaa4c, 0xaa4c,
- 0xfb1e, 0xfb1e,
- 0xfe00, 0xfe0f,
- 0xfe20, 0xfe26,
- 0x101fd, 0x101fd,
- 0x10a01, 0x10a03,
- 0x10a05, 0x10a06,
- 0x10a0c, 0x10a0f,
- 0x10a38, 0x10a3a,
- 0x10a3f, 0x10a3f,
- 0x1d167, 0x1d169,
- 0x1d17b, 0x1d182,
- 0x1d185, 0x1d18b,
- 0x1d1aa, 0x1d1ad,
- 0x1d242, 0x1d244,
- 0xe0100, 0xe01ef,
-}; /* CR_Mn */
-
-/* 'N': Major Category */
-static const OnigCodePoint CR_N[] = {
- 69,
- 0x0030, 0x0039,
- 0x00b2, 0x00b3,
- 0x00b9, 0x00b9,
- 0x00bc, 0x00be,
- 0x0660, 0x0669,
- 0x06f0, 0x06f9,
- 0x07c0, 0x07c9,
- 0x0966, 0x096f,
- 0x09e6, 0x09ef,
- 0x09f4, 0x09f9,
- 0x0a66, 0x0a6f,
- 0x0ae6, 0x0aef,
- 0x0b66, 0x0b6f,
- 0x0be6, 0x0bf2,
- 0x0c66, 0x0c6f,
- 0x0c78, 0x0c7e,
- 0x0ce6, 0x0cef,
- 0x0d66, 0x0d75,
- 0x0e50, 0x0e59,
- 0x0ed0, 0x0ed9,
- 0x0f20, 0x0f33,
- 0x1040, 0x1049,
- 0x1090, 0x1099,
- 0x1369, 0x137c,
- 0x16ee, 0x16f0,
- 0x17e0, 0x17e9,
- 0x17f0, 0x17f9,
- 0x1810, 0x1819,
- 0x1946, 0x194f,
- 0x19d0, 0x19d9,
- 0x1b50, 0x1b59,
- 0x1bb0, 0x1bb9,
- 0x1c40, 0x1c49,
- 0x1c50, 0x1c59,
- 0x2070, 0x2070,
- 0x2074, 0x2079,
- 0x2080, 0x2089,
- 0x2153, 0x2182,
- 0x2185, 0x2188,
- 0x2460, 0x249b,
- 0x24ea, 0x24ff,
- 0x2776, 0x2793,
- 0x2cfd, 0x2cfd,
- 0x3007, 0x3007,
- 0x3021, 0x3029,
- 0x3038, 0x303a,
- 0x3192, 0x3195,
- 0x3220, 0x3229,
- 0x3251, 0x325f,
- 0x3280, 0x3289,
- 0x32b1, 0x32bf,
- 0xa620, 0xa629,
- 0xa8d0, 0xa8d9,
- 0xa900, 0xa909,
- 0xaa50, 0xaa59,
- 0xff10, 0xff19,
- 0x10107, 0x10133,
- 0x10140, 0x10178,
- 0x1018a, 0x1018a,
- 0x10320, 0x10323,
- 0x10341, 0x10341,
- 0x1034a, 0x1034a,
- 0x103d1, 0x103d5,
- 0x104a0, 0x104a9,
- 0x10916, 0x10919,
- 0x10a40, 0x10a47,
- 0x12400, 0x12462,
- 0x1d360, 0x1d371,
- 0x1d7ce, 0x1d7ff,
-}; /* CR_N */
-
-/* 'Nd': General Category */
-static const OnigCodePoint CR_Nd[] = {
- 33,
- 0x0030, 0x0039,
- 0x0660, 0x0669,
- 0x06f0, 0x06f9,
- 0x07c0, 0x07c9,
- 0x0966, 0x096f,
- 0x09e6, 0x09ef,
- 0x0a66, 0x0a6f,
- 0x0ae6, 0x0aef,
- 0x0b66, 0x0b6f,
- 0x0be6, 0x0bef,
- 0x0c66, 0x0c6f,
- 0x0ce6, 0x0cef,
- 0x0d66, 0x0d6f,
- 0x0e50, 0x0e59,
- 0x0ed0, 0x0ed9,
- 0x0f20, 0x0f29,
- 0x1040, 0x1049,
- 0x1090, 0x1099,
- 0x17e0, 0x17e9,
- 0x1810, 0x1819,
- 0x1946, 0x194f,
- 0x19d0, 0x19d9,
- 0x1b50, 0x1b59,
- 0x1bb0, 0x1bb9,
- 0x1c40, 0x1c49,
- 0x1c50, 0x1c59,
- 0xa620, 0xa629,
- 0xa8d0, 0xa8d9,
- 0xa900, 0xa909,
- 0xaa50, 0xaa59,
- 0xff10, 0xff19,
- 0x104a0, 0x104a9,
- 0x1d7ce, 0x1d7ff,
-}; /* CR_Nd */
-
-/* 'Nl': General Category */
-static const OnigCodePoint CR_Nl[] = {
- 11,
- 0x16ee, 0x16f0,
- 0x2160, 0x2182,
- 0x2185, 0x2188,
- 0x3007, 0x3007,
- 0x3021, 0x3029,
- 0x3038, 0x303a,
- 0x10140, 0x10174,
- 0x10341, 0x10341,
- 0x1034a, 0x1034a,
- 0x103d1, 0x103d5,
- 0x12400, 0x12462,
-}; /* CR_Nl */
-
-/* 'No': General Category */
-static const OnigCodePoint CR_No[] = {
- 30,
- 0x00b2, 0x00b3,
- 0x00b9, 0x00b9,
- 0x00bc, 0x00be,
- 0x09f4, 0x09f9,
- 0x0bf0, 0x0bf2,
- 0x0c78, 0x0c7e,
- 0x0d70, 0x0d75,
- 0x0f2a, 0x0f33,
- 0x1369, 0x137c,
- 0x17f0, 0x17f9,
- 0x2070, 0x2070,
- 0x2074, 0x2079,
- 0x2080, 0x2089,
- 0x2153, 0x215f,
- 0x2460, 0x249b,
- 0x24ea, 0x24ff,
- 0x2776, 0x2793,
- 0x2cfd, 0x2cfd,
- 0x3192, 0x3195,
- 0x3220, 0x3229,
- 0x3251, 0x325f,
- 0x3280, 0x3289,
- 0x32b1, 0x32bf,
- 0x10107, 0x10133,
- 0x10175, 0x10178,
- 0x1018a, 0x1018a,
- 0x10320, 0x10323,
- 0x10916, 0x10919,
- 0x10a40, 0x10a47,
- 0x1d360, 0x1d371,
-}; /* CR_No */
-
-/* 'P': Major Category */
-static const OnigCodePoint CR_P[] = {
- 112,
- 0x0021, 0x0023,
- 0x0025, 0x002a,
- 0x002c, 0x002f,
- 0x003a, 0x003b,
- 0x003f, 0x0040,
- 0x005b, 0x005d,
- 0x005f, 0x005f,
- 0x007b, 0x007b,
- 0x007d, 0x007d,
- 0x00a1, 0x00a1,
- 0x00ab, 0x00ab,
- 0x00b7, 0x00b7,
- 0x00bb, 0x00bb,
- 0x00bf, 0x00bf,
- 0x037e, 0x037e,
- 0x0387, 0x0387,
- 0x055a, 0x055f,
- 0x0589, 0x058a,
- 0x05be, 0x05be,
- 0x05c0, 0x05c0,
- 0x05c3, 0x05c3,
- 0x05c6, 0x05c6,
- 0x05f3, 0x05f4,
- 0x0609, 0x060a,
- 0x060c, 0x060d,
- 0x061b, 0x061b,
- 0x061e, 0x061f,
- 0x066a, 0x066d,
- 0x06d4, 0x06d4,
- 0x0700, 0x070d,
- 0x07f7, 0x07f9,
- 0x0964, 0x0965,
- 0x0970, 0x0970,
- 0x0df4, 0x0df4,
- 0x0e4f, 0x0e4f,
- 0x0e5a, 0x0e5b,
- 0x0f04, 0x0f12,
- 0x0f3a, 0x0f3d,
- 0x0f85, 0x0f85,
- 0x0fd0, 0x0fd4,
- 0x104a, 0x104f,
- 0x10fb, 0x10fb,
- 0x1361, 0x1368,
- 0x166d, 0x166e,
- 0x169b, 0x169c,
- 0x16eb, 0x16ed,
- 0x1735, 0x1736,
- 0x17d4, 0x17d6,
- 0x17d8, 0x17da,
- 0x1800, 0x180a,
- 0x1944, 0x1945,
- 0x19de, 0x19df,
- 0x1a1e, 0x1a1f,
- 0x1b5a, 0x1b60,
- 0x1c3b, 0x1c3f,
- 0x1c7e, 0x1c7f,
- 0x2010, 0x2027,
- 0x2030, 0x2043,
- 0x2045, 0x2051,
- 0x2053, 0x205e,
- 0x207d, 0x207e,
- 0x208d, 0x208e,
- 0x2329, 0x232a,
- 0x2768, 0x2775,
- 0x27c5, 0x27c6,
- 0x27e6, 0x27ef,
- 0x2983, 0x2998,
- 0x29d8, 0x29db,
- 0x29fc, 0x29fd,
- 0x2cf9, 0x2cfc,
- 0x2cfe, 0x2cff,
- 0x2e00, 0x2e2e,
- 0x2e30, 0x2e30,
- 0x3001, 0x3003,
- 0x3008, 0x3011,
- 0x3014, 0x301f,
- 0x3030, 0x3030,
- 0x303d, 0x303d,
- 0x30a0, 0x30a0,
- 0x30fb, 0x30fb,
- 0xa60d, 0xa60f,
- 0xa673, 0xa673,
- 0xa67e, 0xa67e,
- 0xa874, 0xa877,
- 0xa8ce, 0xa8cf,
- 0xa92e, 0xa92f,
- 0xa95f, 0xa95f,
- 0xaa5c, 0xaa5f,
- 0xfd3e, 0xfd3f,
- 0xfe10, 0xfe19,
- 0xfe30, 0xfe52,
- 0xfe54, 0xfe61,
- 0xfe63, 0xfe63,
- 0xfe68, 0xfe68,
- 0xfe6a, 0xfe6b,
- 0xff01, 0xff03,
- 0xff05, 0xff0a,
- 0xff0c, 0xff0f,
- 0xff1a, 0xff1b,
- 0xff1f, 0xff20,
- 0xff3b, 0xff3d,
- 0xff3f, 0xff3f,
- 0xff5b, 0xff5b,
- 0xff5d, 0xff5d,
- 0xff5f, 0xff65,
- 0x10100, 0x10101,
- 0x1039f, 0x1039f,
- 0x103d0, 0x103d0,
- 0x1091f, 0x1091f,
- 0x1093f, 0x1093f,
- 0x10a50, 0x10a58,
- 0x12470, 0x12473,
-}; /* CR_P */
-
-/* 'Pc': General Category */
-static const OnigCodePoint CR_Pc[] = {
- 6,
- 0x005f, 0x005f,
- 0x203f, 0x2040,
- 0x2054, 0x2054,
- 0xfe33, 0xfe34,
- 0xfe4d, 0xfe4f,
- 0xff3f, 0xff3f,
-}; /* CR_Pc */
-
-/* 'Pd': General Category */
-static const OnigCodePoint CR_Pd[] = {
- 14,
- 0x002d, 0x002d,
- 0x058a, 0x058a,
- 0x05be, 0x05be,
- 0x1806, 0x1806,
- 0x2010, 0x2015,
- 0x2e17, 0x2e17,
- 0x2e1a, 0x2e1a,
- 0x301c, 0x301c,
- 0x3030, 0x3030,
- 0x30a0, 0x30a0,
- 0xfe31, 0xfe32,
- 0xfe58, 0xfe58,
- 0xfe63, 0xfe63,
- 0xff0d, 0xff0d,
-}; /* CR_Pd */
-
-/* 'Pe': General Category */
-static const OnigCodePoint CR_Pe[] = {
- 70,
- 0x0029, 0x0029,
- 0x005d, 0x005d,
- 0x007d, 0x007d,
- 0x0f3b, 0x0f3b,
- 0x0f3d, 0x0f3d,
- 0x169c, 0x169c,
- 0x2046, 0x2046,
- 0x207e, 0x207e,
- 0x208e, 0x208e,
- 0x232a, 0x232a,
- 0x2769, 0x2769,
- 0x276b, 0x276b,
- 0x276d, 0x276d,
- 0x276f, 0x276f,
- 0x2771, 0x2771,
- 0x2773, 0x2773,
- 0x2775, 0x2775,
- 0x27c6, 0x27c6,
- 0x27e7, 0x27e7,
- 0x27e9, 0x27e9,
- 0x27eb, 0x27eb,
- 0x27ed, 0x27ed,
- 0x27ef, 0x27ef,
- 0x2984, 0x2984,
- 0x2986, 0x2986,
- 0x2988, 0x2988,
- 0x298a, 0x298a,
- 0x298c, 0x298c,
- 0x298e, 0x298e,
- 0x2990, 0x2990,
- 0x2992, 0x2992,
- 0x2994, 0x2994,
- 0x2996, 0x2996,
- 0x2998, 0x2998,
- 0x29d9, 0x29d9,
- 0x29db, 0x29db,
- 0x29fd, 0x29fd,
- 0x2e23, 0x2e23,
- 0x2e25, 0x2e25,
- 0x2e27, 0x2e27,
- 0x2e29, 0x2e29,
- 0x3009, 0x3009,
- 0x300b, 0x300b,
- 0x300d, 0x300d,
- 0x300f, 0x300f,
- 0x3011, 0x3011,
- 0x3015, 0x3015,
- 0x3017, 0x3017,
- 0x3019, 0x3019,
- 0x301b, 0x301b,
- 0x301e, 0x301f,
- 0xfd3f, 0xfd3f,
- 0xfe18, 0xfe18,
- 0xfe36, 0xfe36,
- 0xfe38, 0xfe38,
- 0xfe3a, 0xfe3a,
- 0xfe3c, 0xfe3c,
- 0xfe3e, 0xfe3e,
- 0xfe40, 0xfe40,
- 0xfe42, 0xfe42,
- 0xfe44, 0xfe44,
- 0xfe48, 0xfe48,
- 0xfe5a, 0xfe5a,
- 0xfe5c, 0xfe5c,
- 0xfe5e, 0xfe5e,
- 0xff09, 0xff09,
- 0xff3d, 0xff3d,
- 0xff5d, 0xff5d,
- 0xff60, 0xff60,
- 0xff63, 0xff63,
-}; /* CR_Pe */
-
-/* 'Pf': General Category */
-static const OnigCodePoint CR_Pf[] = {
- 10,
- 0x00bb, 0x00bb,
- 0x2019, 0x2019,
- 0x201d, 0x201d,
- 0x203a, 0x203a,
- 0x2e03, 0x2e03,
- 0x2e05, 0x2e05,
- 0x2e0a, 0x2e0a,
- 0x2e0d, 0x2e0d,
- 0x2e1d, 0x2e1d,
- 0x2e21, 0x2e21,
-}; /* CR_Pf */
-
-/* 'Pi': General Category */
-static const OnigCodePoint CR_Pi[] = {
- 11,
- 0x00ab, 0x00ab,
- 0x2018, 0x2018,
- 0x201b, 0x201c,
- 0x201f, 0x201f,
- 0x2039, 0x2039,
- 0x2e02, 0x2e02,
- 0x2e04, 0x2e04,
- 0x2e09, 0x2e09,
- 0x2e0c, 0x2e0c,
- 0x2e1c, 0x2e1c,
- 0x2e20, 0x2e20,
-}; /* CR_Pi */
-
-/* 'Po': General Category */
-static const OnigCodePoint CR_Po[] = {
- 108,
- 0x0021, 0x0023,
- 0x0025, 0x0027,
- 0x002a, 0x002a,
- 0x002c, 0x002c,
- 0x002e, 0x002f,
- 0x003a, 0x003b,
- 0x003f, 0x0040,
- 0x005c, 0x005c,
- 0x00a1, 0x00a1,
- 0x00b7, 0x00b7,
- 0x00bf, 0x00bf,
- 0x037e, 0x037e,
- 0x0387, 0x0387,
- 0x055a, 0x055f,
- 0x0589, 0x0589,
- 0x05c0, 0x05c0,
- 0x05c3, 0x05c3,
- 0x05c6, 0x05c6,
- 0x05f3, 0x05f4,
- 0x0609, 0x060a,
- 0x060c, 0x060d,
- 0x061b, 0x061b,
- 0x061e, 0x061f,
- 0x066a, 0x066d,
- 0x06d4, 0x06d4,
- 0x0700, 0x070d,
- 0x07f7, 0x07f9,
- 0x0964, 0x0965,
- 0x0970, 0x0970,
- 0x0df4, 0x0df4,
- 0x0e4f, 0x0e4f,
- 0x0e5a, 0x0e5b,
- 0x0f04, 0x0f12,
- 0x0f85, 0x0f85,
- 0x0fd0, 0x0fd4,
- 0x104a, 0x104f,
- 0x10fb, 0x10fb,
- 0x1361, 0x1368,
- 0x166d, 0x166e,
- 0x16eb, 0x16ed,
- 0x1735, 0x1736,
- 0x17d4, 0x17d6,
- 0x17d8, 0x17da,
- 0x1800, 0x1805,
- 0x1807, 0x180a,
- 0x1944, 0x1945,
- 0x19de, 0x19df,
- 0x1a1e, 0x1a1f,
- 0x1b5a, 0x1b60,
- 0x1c3b, 0x1c3f,
- 0x1c7e, 0x1c7f,
- 0x2016, 0x2017,
- 0x2020, 0x2027,
- 0x2030, 0x2038,
- 0x203b, 0x203e,
- 0x2041, 0x2043,
- 0x2047, 0x2051,
- 0x2053, 0x2053,
- 0x2055, 0x205e,
- 0x2cf9, 0x2cfc,
- 0x2cfe, 0x2cff,
- 0x2e00, 0x2e01,
- 0x2e06, 0x2e08,
- 0x2e0b, 0x2e0b,
- 0x2e0e, 0x2e16,
- 0x2e18, 0x2e19,
- 0x2e1b, 0x2e1b,
- 0x2e1e, 0x2e1f,
- 0x2e2a, 0x2e2e,
- 0x2e30, 0x2e30,
- 0x3001, 0x3003,
- 0x303d, 0x303d,
- 0x30fb, 0x30fb,
- 0xa60d, 0xa60f,
- 0xa673, 0xa673,
- 0xa67e, 0xa67e,
- 0xa874, 0xa877,
- 0xa8ce, 0xa8cf,
- 0xa92e, 0xa92f,
- 0xa95f, 0xa95f,
- 0xaa5c, 0xaa5f,
- 0xfe10, 0xfe16,
- 0xfe19, 0xfe19,
- 0xfe30, 0xfe30,
- 0xfe45, 0xfe46,
- 0xfe49, 0xfe4c,
- 0xfe50, 0xfe52,
- 0xfe54, 0xfe57,
- 0xfe5f, 0xfe61,
- 0xfe68, 0xfe68,
- 0xfe6a, 0xfe6b,
- 0xff01, 0xff03,
- 0xff05, 0xff07,
- 0xff0a, 0xff0a,
- 0xff0c, 0xff0c,
- 0xff0e, 0xff0f,
- 0xff1a, 0xff1b,
- 0xff1f, 0xff20,
- 0xff3c, 0xff3c,
- 0xff61, 0xff61,
- 0xff64, 0xff65,
- 0x10100, 0x10101,
- 0x1039f, 0x1039f,
- 0x103d0, 0x103d0,
- 0x1091f, 0x1091f,
- 0x1093f, 0x1093f,
- 0x10a50, 0x10a58,
- 0x12470, 0x12473,
-}; /* CR_Po */
-
-/* 'Ps': General Category */
-static const OnigCodePoint CR_Ps[] = {
- 72,
- 0x0028, 0x0028,
- 0x005b, 0x005b,
- 0x007b, 0x007b,
- 0x0f3a, 0x0f3a,
- 0x0f3c, 0x0f3c,
- 0x169b, 0x169b,
- 0x201a, 0x201a,
- 0x201e, 0x201e,
- 0x2045, 0x2045,
- 0x207d, 0x207d,
- 0x208d, 0x208d,
- 0x2329, 0x2329,
- 0x2768, 0x2768,
- 0x276a, 0x276a,
- 0x276c, 0x276c,
- 0x276e, 0x276e,
- 0x2770, 0x2770,
- 0x2772, 0x2772,
- 0x2774, 0x2774,
- 0x27c5, 0x27c5,
- 0x27e6, 0x27e6,
- 0x27e8, 0x27e8,
- 0x27ea, 0x27ea,
- 0x27ec, 0x27ec,
- 0x27ee, 0x27ee,
- 0x2983, 0x2983,
- 0x2985, 0x2985,
- 0x2987, 0x2987,
- 0x2989, 0x2989,
- 0x298b, 0x298b,
- 0x298d, 0x298d,
- 0x298f, 0x298f,
- 0x2991, 0x2991,
- 0x2993, 0x2993,
- 0x2995, 0x2995,
- 0x2997, 0x2997,
- 0x29d8, 0x29d8,
- 0x29da, 0x29da,
- 0x29fc, 0x29fc,
- 0x2e22, 0x2e22,
- 0x2e24, 0x2e24,
- 0x2e26, 0x2e26,
- 0x2e28, 0x2e28,
- 0x3008, 0x3008,
- 0x300a, 0x300a,
- 0x300c, 0x300c,
- 0x300e, 0x300e,
- 0x3010, 0x3010,
- 0x3014, 0x3014,
- 0x3016, 0x3016,
- 0x3018, 0x3018,
- 0x301a, 0x301a,
- 0x301d, 0x301d,
- 0xfd3e, 0xfd3e,
- 0xfe17, 0xfe17,
- 0xfe35, 0xfe35,
- 0xfe37, 0xfe37,
- 0xfe39, 0xfe39,
- 0xfe3b, 0xfe3b,
- 0xfe3d, 0xfe3d,
- 0xfe3f, 0xfe3f,
- 0xfe41, 0xfe41,
- 0xfe43, 0xfe43,
- 0xfe47, 0xfe47,
- 0xfe59, 0xfe59,
- 0xfe5b, 0xfe5b,
- 0xfe5d, 0xfe5d,
- 0xff08, 0xff08,
- 0xff3b, 0xff3b,
- 0xff5b, 0xff5b,
- 0xff5f, 0xff5f,
- 0xff62, 0xff62,
-}; /* CR_Ps */
-
-/* 'S': Major Category */
-static const OnigCodePoint CR_S[] = {
- 179,
- 0x0024, 0x0024,
- 0x002b, 0x002b,
- 0x003c, 0x003e,
- 0x005e, 0x005e,
- 0x0060, 0x0060,
- 0x007c, 0x007c,
- 0x007e, 0x007e,
- 0x00a2, 0x00a9,
- 0x00ac, 0x00ac,
- 0x00ae, 0x00b1,
- 0x00b4, 0x00b4,
- 0x00b6, 0x00b6,
- 0x00b8, 0x00b8,
- 0x00d7, 0x00d7,
- 0x00f7, 0x00f7,
- 0x02c2, 0x02c5,
- 0x02d2, 0x02df,
- 0x02e5, 0x02eb,
- 0x02ed, 0x02ed,
- 0x02ef, 0x02ff,
- 0x0375, 0x0375,
- 0x0384, 0x0385,
- 0x03f6, 0x03f6,
- 0x0482, 0x0482,
- 0x0606, 0x0608,
- 0x060b, 0x060b,
- 0x060e, 0x060f,
- 0x06e9, 0x06e9,
- 0x06fd, 0x06fe,
- 0x07f6, 0x07f6,
- 0x09f2, 0x09f3,
- 0x09fa, 0x09fa,
- 0x0af1, 0x0af1,
- 0x0b70, 0x0b70,
- 0x0bf3, 0x0bfa,
- 0x0c7f, 0x0c7f,
- 0x0cf1, 0x0cf2,
- 0x0d79, 0x0d79,
- 0x0e3f, 0x0e3f,
- 0x0f01, 0x0f03,
- 0x0f13, 0x0f17,
- 0x0f1a, 0x0f1f,
- 0x0f34, 0x0f34,
- 0x0f36, 0x0f36,
- 0x0f38, 0x0f38,
- 0x0fbe, 0x0fc5,
- 0x0fc7, 0x0fcc,
- 0x0fce, 0x0fcf,
- 0x109e, 0x109f,
- 0x1360, 0x1360,
- 0x1390, 0x1399,
- 0x17db, 0x17db,
- 0x1940, 0x1940,
- 0x19e0, 0x19ff,
- 0x1b61, 0x1b6a,
- 0x1b74, 0x1b7c,
- 0x1fbd, 0x1fbd,
- 0x1fbf, 0x1fc1,
- 0x1fcd, 0x1fcf,
- 0x1fdd, 0x1fdf,
- 0x1fed, 0x1fef,
- 0x1ffd, 0x1ffe,
- 0x2044, 0x2044,
- 0x2052, 0x2052,
- 0x207a, 0x207c,
- 0x208a, 0x208c,
- 0x20a0, 0x20b5,
- 0x2100, 0x2101,
- 0x2103, 0x2106,
- 0x2108, 0x2109,
- 0x2114, 0x2114,
- 0x2116, 0x2118,
- 0x211e, 0x2123,
- 0x2125, 0x2125,
- 0x2127, 0x2127,
- 0x2129, 0x2129,
- 0x212e, 0x212e,
- 0x213a, 0x213b,
- 0x2140, 0x2144,
- 0x214a, 0x214d,
- 0x214f, 0x214f,
- 0x2190, 0x2328,
- 0x232b, 0x23e7,
- 0x2400, 0x2426,
- 0x2440, 0x244a,
- 0x249c, 0x24e9,
- 0x2500, 0x269d,
- 0x26a0, 0x26bc,
- 0x26c0, 0x26c3,
- 0x2701, 0x2704,
- 0x2706, 0x2709,
- 0x270c, 0x2727,
- 0x2729, 0x274b,
- 0x274d, 0x274d,
- 0x274f, 0x2752,
- 0x2756, 0x2756,
- 0x2758, 0x275e,
- 0x2761, 0x2767,
- 0x2794, 0x2794,
- 0x2798, 0x27af,
- 0x27b1, 0x27be,
- 0x27c0, 0x27c4,
- 0x27c7, 0x27ca,
- 0x27cc, 0x27cc,
- 0x27d0, 0x27e5,
- 0x27f0, 0x2982,
- 0x2999, 0x29d7,
- 0x29dc, 0x29fb,
- 0x29fe, 0x2b4c,
- 0x2b50, 0x2b54,
- 0x2ce5, 0x2cea,
- 0x2e80, 0x2e99,
- 0x2e9b, 0x2ef3,
- 0x2f00, 0x2fd5,
- 0x2ff0, 0x2ffb,
- 0x3004, 0x3004,
- 0x3012, 0x3013,
- 0x3020, 0x3020,
- 0x3036, 0x3037,
- 0x303e, 0x303f,
- 0x309b, 0x309c,
- 0x3190, 0x3191,
- 0x3196, 0x319f,
- 0x31c0, 0x31e3,
- 0x3200, 0x321e,
- 0x322a, 0x3243,
- 0x3250, 0x3250,
- 0x3260, 0x327f,
- 0x328a, 0x32b0,
- 0x32c0, 0x32fe,
- 0x3300, 0x33ff,
- 0x4dc0, 0x4dff,
- 0xa490, 0xa4c6,
- 0xa700, 0xa716,
- 0xa720, 0xa721,
- 0xa789, 0xa78a,
- 0xa828, 0xa82b,
- 0xfb29, 0xfb29,
- 0xfdfc, 0xfdfd,
- 0xfe62, 0xfe62,
- 0xfe64, 0xfe66,
- 0xfe69, 0xfe69,
- 0xff04, 0xff04,
- 0xff0b, 0xff0b,
- 0xff1c, 0xff1e,
- 0xff3e, 0xff3e,
- 0xff40, 0xff40,
- 0xff5c, 0xff5c,
- 0xff5e, 0xff5e,
- 0xffe0, 0xffe6,
- 0xffe8, 0xffee,
- 0xfffc, 0xfffd,
- 0x10102, 0x10102,
- 0x10137, 0x1013f,
- 0x10179, 0x10189,
- 0x10190, 0x1019b,
- 0x101d0, 0x101fc,
- 0x1d000, 0x1d0f5,
- 0x1d100, 0x1d126,
- 0x1d129, 0x1d164,
- 0x1d16a, 0x1d16c,
- 0x1d183, 0x1d184,
- 0x1d18c, 0x1d1a9,
- 0x1d1ae, 0x1d1dd,
- 0x1d200, 0x1d241,
- 0x1d245, 0x1d245,
- 0x1d300, 0x1d356,
- 0x1d6c1, 0x1d6c1,
- 0x1d6db, 0x1d6db,
- 0x1d6fb, 0x1d6fb,
- 0x1d715, 0x1d715,
- 0x1d735, 0x1d735,
- 0x1d74f, 0x1d74f,
- 0x1d76f, 0x1d76f,
- 0x1d789, 0x1d789,
- 0x1d7a9, 0x1d7a9,
- 0x1d7c3, 0x1d7c3,
- 0x1f000, 0x1f02b,
- 0x1f030, 0x1f093,
-}; /* CR_S */
-
-/* 'Sc': General Category */
-static const OnigCodePoint CR_Sc[] = {
- 14,
- 0x0024, 0x0024,
- 0x00a2, 0x00a5,
- 0x060b, 0x060b,
- 0x09f2, 0x09f3,
- 0x0af1, 0x0af1,
- 0x0bf9, 0x0bf9,
- 0x0e3f, 0x0e3f,
- 0x17db, 0x17db,
- 0x20a0, 0x20b5,
- 0xfdfc, 0xfdfc,
- 0xfe69, 0xfe69,
- 0xff04, 0xff04,
- 0xffe0, 0xffe1,
- 0xffe5, 0xffe6,
-}; /* CR_Sc */
-
-/* 'Sk': General Category */
-static const OnigCodePoint CR_Sk[] = {
- 26,
- 0x005e, 0x005e,
- 0x0060, 0x0060,
- 0x00a8, 0x00a8,
- 0x00af, 0x00af,
- 0x00b4, 0x00b4,
- 0x00b8, 0x00b8,
- 0x02c2, 0x02c5,
- 0x02d2, 0x02df,
- 0x02e5, 0x02eb,
- 0x02ed, 0x02ed,
- 0x02ef, 0x02ff,
- 0x0375, 0x0375,
- 0x0384, 0x0385,
- 0x1fbd, 0x1fbd,
- 0x1fbf, 0x1fc1,
- 0x1fcd, 0x1fcf,
- 0x1fdd, 0x1fdf,
- 0x1fed, 0x1fef,
- 0x1ffd, 0x1ffe,
- 0x309b, 0x309c,
- 0xa700, 0xa716,
- 0xa720, 0xa721,
- 0xa789, 0xa78a,
- 0xff3e, 0xff3e,
- 0xff40, 0xff40,
- 0xffe3, 0xffe3,
-}; /* CR_Sk */
-
-/* 'Sm': General Category */
-static const OnigCodePoint CR_Sm[] = {
- 65,
- 0x002b, 0x002b,
- 0x003c, 0x003e,
- 0x007c, 0x007c,
- 0x007e, 0x007e,
- 0x00ac, 0x00ac,
- 0x00b1, 0x00b1,
- 0x00d7, 0x00d7,
- 0x00f7, 0x00f7,
- 0x03f6, 0x03f6,
- 0x0606, 0x0608,
- 0x2044, 0x2044,
- 0x2052, 0x2052,
- 0x207a, 0x207c,
- 0x208a, 0x208c,
- 0x2140, 0x2144,
- 0x214b, 0x214b,
- 0x2190, 0x2194,
- 0x219a, 0x219b,
- 0x21a0, 0x21a0,
- 0x21a3, 0x21a3,
- 0x21a6, 0x21a6,
- 0x21ae, 0x21ae,
- 0x21ce, 0x21cf,
- 0x21d2, 0x21d2,
- 0x21d4, 0x21d4,
- 0x21f4, 0x22ff,
- 0x2308, 0x230b,
- 0x2320, 0x2321,
- 0x237c, 0x237c,
- 0x239b, 0x23b3,
- 0x23dc, 0x23e1,
- 0x25b7, 0x25b7,
- 0x25c1, 0x25c1,
- 0x25f8, 0x25ff,
- 0x266f, 0x266f,
- 0x27c0, 0x27c4,
- 0x27c7, 0x27ca,
- 0x27cc, 0x27cc,
- 0x27d0, 0x27e5,
- 0x27f0, 0x27ff,
- 0x2900, 0x2982,
- 0x2999, 0x29d7,
- 0x29dc, 0x29fb,
- 0x29fe, 0x2aff,
- 0x2b30, 0x2b44,
- 0x2b47, 0x2b4c,
- 0xfb29, 0xfb29,
- 0xfe62, 0xfe62,
- 0xfe64, 0xfe66,
- 0xff0b, 0xff0b,
- 0xff1c, 0xff1e,
- 0xff5c, 0xff5c,
- 0xff5e, 0xff5e,
- 0xffe2, 0xffe2,
- 0xffe9, 0xffec,
- 0x1d6c1, 0x1d6c1,
- 0x1d6db, 0x1d6db,
- 0x1d6fb, 0x1d6fb,
- 0x1d715, 0x1d715,
- 0x1d735, 0x1d735,
- 0x1d74f, 0x1d74f,
- 0x1d76f, 0x1d76f,
- 0x1d789, 0x1d789,
- 0x1d7a9, 0x1d7a9,
- 0x1d7c3, 0x1d7c3,
-}; /* CR_Sm */
-
-/* 'So': General Category */
-static const OnigCodePoint CR_So[] = {
- 134,
- 0x00a6, 0x00a7,
- 0x00a9, 0x00a9,
- 0x00ae, 0x00ae,
- 0x00b0, 0x00b0,
- 0x00b6, 0x00b6,
- 0x0482, 0x0482,
- 0x060e, 0x060f,
- 0x06e9, 0x06e9,
- 0x06fd, 0x06fe,
- 0x07f6, 0x07f6,
- 0x09fa, 0x09fa,
- 0x0b70, 0x0b70,
- 0x0bf3, 0x0bf8,
- 0x0bfa, 0x0bfa,
- 0x0c7f, 0x0c7f,
- 0x0cf1, 0x0cf2,
- 0x0d79, 0x0d79,
- 0x0f01, 0x0f03,
- 0x0f13, 0x0f17,
- 0x0f1a, 0x0f1f,
- 0x0f34, 0x0f34,
- 0x0f36, 0x0f36,
- 0x0f38, 0x0f38,
- 0x0fbe, 0x0fc5,
- 0x0fc7, 0x0fcc,
- 0x0fce, 0x0fcf,
- 0x109e, 0x109f,
- 0x1360, 0x1360,
- 0x1390, 0x1399,
- 0x1940, 0x1940,
- 0x19e0, 0x19ff,
- 0x1b61, 0x1b6a,
- 0x1b74, 0x1b7c,
- 0x2100, 0x2101,
- 0x2103, 0x2106,
- 0x2108, 0x2109,
- 0x2114, 0x2114,
- 0x2116, 0x2118,
- 0x211e, 0x2123,
- 0x2125, 0x2125,
- 0x2127, 0x2127,
- 0x2129, 0x2129,
- 0x212e, 0x212e,
- 0x213a, 0x213b,
- 0x214a, 0x214a,
- 0x214c, 0x214d,
- 0x214f, 0x214f,
- 0x2195, 0x2199,
- 0x219c, 0x219f,
- 0x21a1, 0x21a2,
- 0x21a4, 0x21a5,
- 0x21a7, 0x21ad,
- 0x21af, 0x21cd,
- 0x21d0, 0x21d1,
- 0x21d3, 0x21d3,
- 0x21d5, 0x21f3,
- 0x2300, 0x2307,
- 0x230c, 0x231f,
- 0x2322, 0x2328,
- 0x232b, 0x237b,
- 0x237d, 0x239a,
- 0x23b4, 0x23db,
- 0x23e2, 0x23e7,
- 0x2400, 0x2426,
- 0x2440, 0x244a,
- 0x249c, 0x24e9,
- 0x2500, 0x25b6,
- 0x25b8, 0x25c0,
- 0x25c2, 0x25f7,
- 0x2600, 0x266e,
- 0x2670, 0x269d,
- 0x26a0, 0x26bc,
- 0x26c0, 0x26c3,
- 0x2701, 0x2704,
- 0x2706, 0x2709,
- 0x270c, 0x2727,
- 0x2729, 0x274b,
- 0x274d, 0x274d,
- 0x274f, 0x2752,
- 0x2756, 0x2756,
- 0x2758, 0x275e,
- 0x2761, 0x2767,
- 0x2794, 0x2794,
- 0x2798, 0x27af,
- 0x27b1, 0x27be,
- 0x2800, 0x28ff,
- 0x2b00, 0x2b2f,
- 0x2b45, 0x2b46,
- 0x2b50, 0x2b54,
- 0x2ce5, 0x2cea,
- 0x2e80, 0x2e99,
- 0x2e9b, 0x2ef3,
- 0x2f00, 0x2fd5,
- 0x2ff0, 0x2ffb,
- 0x3004, 0x3004,
- 0x3012, 0x3013,
- 0x3020, 0x3020,
- 0x3036, 0x3037,
- 0x303e, 0x303f,
- 0x3190, 0x3191,
- 0x3196, 0x319f,
- 0x31c0, 0x31e3,
- 0x3200, 0x321e,
- 0x322a, 0x3243,
- 0x3250, 0x3250,
- 0x3260, 0x327f,
- 0x328a, 0x32b0,
- 0x32c0, 0x32fe,
- 0x3300, 0x33ff,
- 0x4dc0, 0x4dff,
- 0xa490, 0xa4c6,
- 0xa828, 0xa82b,
- 0xfdfd, 0xfdfd,
- 0xffe4, 0xffe4,
- 0xffe8, 0xffe8,
- 0xffed, 0xffee,
- 0xfffc, 0xfffd,
- 0x10102, 0x10102,
- 0x10137, 0x1013f,
- 0x10179, 0x10189,
- 0x10190, 0x1019b,
- 0x101d0, 0x101fc,
- 0x1d000, 0x1d0f5,
- 0x1d100, 0x1d126,
- 0x1d129, 0x1d164,
- 0x1d16a, 0x1d16c,
- 0x1d183, 0x1d184,
- 0x1d18c, 0x1d1a9,
- 0x1d1ae, 0x1d1dd,
- 0x1d200, 0x1d241,
- 0x1d245, 0x1d245,
- 0x1d300, 0x1d356,
- 0x1f000, 0x1f02b,
- 0x1f030, 0x1f093,
-}; /* CR_So */
-
-/* 'Z': Major Category */
-static const OnigCodePoint CR_Z[] = {
- 9,
- 0x0020, 0x0020,
- 0x00a0, 0x00a0,
- 0x1680, 0x1680,
- 0x180e, 0x180e,
- 0x2000, 0x200a,
- 0x2028, 0x2029,
- 0x202f, 0x202f,
- 0x205f, 0x205f,
- 0x3000, 0x3000,
-}; /* CR_Z */
-
-/* 'Zl': General Category */
-static const OnigCodePoint CR_Zl[] = {
- 1,
- 0x2028, 0x2028,
-}; /* CR_Zl */
-
-/* 'Zp': General Category */
-static const OnigCodePoint CR_Zp[] = {
- 1,
- 0x2029, 0x2029,
-}; /* CR_Zp */
-
-/* 'Zs': General Category */
-static const OnigCodePoint CR_Zs[] = {
- 8,
- 0x0020, 0x0020,
- 0x00a0, 0x00a0,
- 0x1680, 0x1680,
- 0x180e, 0x180e,
- 0x2000, 0x200a,
- 0x202f, 0x202f,
- 0x205f, 0x205f,
- 0x3000, 0x3000,
-}; /* CR_Zs */
-
-/* 'Common': Script */
-static const OnigCodePoint CR_Common[] = {
- 137,
- 0x0000, 0x0040,
- 0x005b, 0x0060,
- 0x007b, 0x00a9,
- 0x00ab, 0x00b9,
- 0x00bb, 0x00bf,
- 0x00d7, 0x00d7,
- 0x00f7, 0x00f7,
- 0x02b9, 0x02df,
- 0x02e5, 0x02ff,
- 0x0374, 0x0374,
- 0x037e, 0x037e,
- 0x0385, 0x0385,
- 0x0387, 0x0387,
- 0x0589, 0x0589,
- 0x0600, 0x0603,
- 0x060c, 0x060c,
- 0x061b, 0x061b,
- 0x061f, 0x061f,
- 0x0640, 0x0640,
- 0x0660, 0x0669,
- 0x06dd, 0x06dd,
- 0x0964, 0x0965,
- 0x0970, 0x0970,
- 0x0cf1, 0x0cf2,
- 0x0e3f, 0x0e3f,
- 0x10fb, 0x10fb,
- 0x16eb, 0x16ed,
- 0x1735, 0x1736,
- 0x1802, 0x1803,
- 0x1805, 0x1805,
- 0x2000, 0x200b,
- 0x200e, 0x2064,
- 0x206a, 0x2070,
- 0x2074, 0x207e,
- 0x2080, 0x208e,
- 0x20a0, 0x20b5,
- 0x2100, 0x2125,
- 0x2127, 0x2129,
- 0x212c, 0x2131,
- 0x2133, 0x214d,
- 0x214f, 0x214f,
- 0x2153, 0x215f,
- 0x2190, 0x23e7,
- 0x2400, 0x2426,
- 0x2440, 0x244a,
- 0x2460, 0x269d,
- 0x26a0, 0x26bc,
- 0x26c0, 0x26c3,
- 0x2701, 0x2704,
- 0x2706, 0x2709,
- 0x270c, 0x2727,
- 0x2729, 0x274b,
- 0x274d, 0x274d,
- 0x274f, 0x2752,
- 0x2756, 0x2756,
- 0x2758, 0x275e,
- 0x2761, 0x2794,
- 0x2798, 0x27af,
- 0x27b1, 0x27be,
- 0x27c0, 0x27ca,
- 0x27cc, 0x27cc,
- 0x27d0, 0x27ff,
- 0x2900, 0x2b4c,
- 0x2b50, 0x2b54,
- 0x2e00, 0x2e30,
- 0x2ff0, 0x2ffb,
- 0x3000, 0x3004,
- 0x3006, 0x3006,
- 0x3008, 0x3020,
- 0x3030, 0x3037,
- 0x303c, 0x303f,
- 0x309b, 0x309c,
- 0x30a0, 0x30a0,
- 0x30fb, 0x30fc,
- 0x3190, 0x319f,
- 0x31c0, 0x31e3,
- 0x3220, 0x3243,
- 0x3250, 0x325f,
- 0x327f, 0x32cf,
- 0x3358, 0x33ff,
- 0x4dc0, 0x4dff,
- 0xa700, 0xa721,
- 0xa788, 0xa78a,
- 0xfd3e, 0xfd3f,
- 0xfdfd, 0xfdfd,
- 0xfe10, 0xfe19,
- 0xfe30, 0xfe52,
- 0xfe54, 0xfe66,
- 0xfe68, 0xfe6b,
- 0xfeff, 0xfeff,
- 0xff01, 0xff20,
- 0xff3b, 0xff40,
- 0xff5b, 0xff65,
- 0xff70, 0xff70,
- 0xff9e, 0xff9f,
- 0xffe0, 0xffe6,
- 0xffe8, 0xffee,
- 0xfff9, 0xfffd,
- 0x10100, 0x10102,
- 0x10107, 0x10133,
- 0x10137, 0x1013f,
- 0x10190, 0x1019b,
- 0x101d0, 0x101fc,
- 0x1d000, 0x1d0f5,
- 0x1d100, 0x1d126,
- 0x1d129, 0x1d166,
- 0x1d16a, 0x1d17a,
- 0x1d183, 0x1d184,
- 0x1d18c, 0x1d1a9,
- 0x1d1ae, 0x1d1dd,
- 0x1d300, 0x1d356,
- 0x1d360, 0x1d371,
- 0x1d400, 0x1d454,
- 0x1d456, 0x1d49c,
- 0x1d49e, 0x1d49f,
- 0x1d4a2, 0x1d4a2,
- 0x1d4a5, 0x1d4a6,
- 0x1d4a9, 0x1d4ac,
- 0x1d4ae, 0x1d4b9,
- 0x1d4bb, 0x1d4bb,
- 0x1d4bd, 0x1d4c3,
- 0x1d4c5, 0x1d505,
- 0x1d507, 0x1d50a,
- 0x1d50d, 0x1d514,
- 0x1d516, 0x1d51c,
- 0x1d51e, 0x1d539,
- 0x1d53b, 0x1d53e,
- 0x1d540, 0x1d544,
- 0x1d546, 0x1d546,
- 0x1d54a, 0x1d550,
- 0x1d552, 0x1d6a5,
- 0x1d6a8, 0x1d7cb,
- 0x1d7ce, 0x1d7ff,
- 0x1f000, 0x1f02b,
- 0x1f030, 0x1f093,
- 0xe0001, 0xe0001,
- 0xe0020, 0xe007f,
-}; /* CR_Common */
-
-/* 'Latin': Script */
-static const OnigCodePoint CR_Latin[] = {
- 29,
- 0x0041, 0x005a,
- 0x0061, 0x007a,
- 0x00aa, 0x00aa,
- 0x00ba, 0x00ba,
- 0x00c0, 0x00d6,
- 0x00d8, 0x00f6,
- 0x00f8, 0x02b8,
- 0x02e0, 0x02e4,
- 0x1d00, 0x1d25,
- 0x1d2c, 0x1d5c,
- 0x1d62, 0x1d65,
- 0x1d6b, 0x1d77,
- 0x1d79, 0x1dbe,
- 0x1e00, 0x1eff,
- 0x2071, 0x2071,
- 0x207f, 0x207f,
- 0x2090, 0x2094,
- 0x212a, 0x212b,
- 0x2132, 0x2132,
- 0x214e, 0x214e,
- 0x2160, 0x2188,
- 0x2c60, 0x2c6f,
- 0x2c71, 0x2c7d,
- 0xa722, 0xa787,
- 0xa78b, 0xa78c,
- 0xa7fb, 0xa7ff,
- 0xfb00, 0xfb06,
- 0xff21, 0xff3a,
- 0xff41, 0xff5a,
-}; /* CR_Latin */
-
-/* 'Greek': Script */
-static const OnigCodePoint CR_Greek[] = {
- 33,
- 0x0370, 0x0373,
- 0x0375, 0x0377,
- 0x037a, 0x037d,
- 0x0384, 0x0384,
- 0x0386, 0x0386,
- 0x0388, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03e1,
- 0x03f0, 0x03ff,
- 0x1d26, 0x1d2a,
- 0x1d5d, 0x1d61,
- 0x1d66, 0x1d6a,
- 0x1dbf, 0x1dbf,
- 0x1f00, 0x1f15,
- 0x1f18, 0x1f1d,
- 0x1f20, 0x1f45,
- 0x1f48, 0x1f4d,
- 0x1f50, 0x1f57,
- 0x1f59, 0x1f59,
- 0x1f5b, 0x1f5b,
- 0x1f5d, 0x1f5d,
- 0x1f5f, 0x1f7d,
- 0x1f80, 0x1fb4,
- 0x1fb6, 0x1fc4,
- 0x1fc6, 0x1fd3,
- 0x1fd6, 0x1fdb,
- 0x1fdd, 0x1fef,
- 0x1ff2, 0x1ff4,
- 0x1ff6, 0x1ffe,
- 0x2126, 0x2126,
- 0x10140, 0x1018a,
- 0x1d200, 0x1d245,
-}; /* CR_Greek */
-
-/* 'Cyrillic': Script */
-static const OnigCodePoint CR_Cyrillic[] = {
- 7,
- 0x0400, 0x0523,
- 0x1d2b, 0x1d2b,
- 0x1d78, 0x1d78,
- 0x2de0, 0x2dff,
- 0xa640, 0xa65f,
- 0xa662, 0xa673,
- 0xa67c, 0xa697,
-}; /* CR_Cyrillic */
-
-/* 'Armenian': Script */
-static const OnigCodePoint CR_Armenian[] = {
- 5,
- 0x0531, 0x0556,
- 0x0559, 0x055f,
- 0x0561, 0x0587,
- 0x058a, 0x058a,
- 0xfb13, 0xfb17,
-}; /* CR_Armenian */
-
-/* 'Hebrew': Script */
-static const OnigCodePoint CR_Hebrew[] = {
- 9,
- 0x0591, 0x05c7,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0xfb1d, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfb4f,
-}; /* CR_Hebrew */
-
-/* 'Arabic': Script */
-static const OnigCodePoint CR_Arabic[] = {
- 17,
- 0x0606, 0x060b,
- 0x060d, 0x061a,
- 0x061e, 0x061e,
- 0x0621, 0x063f,
- 0x0641, 0x064a,
- 0x0656, 0x065e,
- 0x066a, 0x066f,
- 0x0671, 0x06dc,
- 0x06de, 0x06ff,
- 0x0750, 0x077f,
- 0xfb50, 0xfbb1,
- 0xfbd3, 0xfd3d,
- 0xfd50, 0xfd8f,
- 0xfd92, 0xfdc7,
- 0xfdf0, 0xfdfc,
- 0xfe70, 0xfe74,
- 0xfe76, 0xfefc,
-}; /* CR_Arabic */
-
-/* 'Syriac': Script */
-static const OnigCodePoint CR_Syriac[] = {
- 3,
- 0x0700, 0x070d,
- 0x070f, 0x074a,
- 0x074d, 0x074f,
-}; /* CR_Syriac */
-
-/* 'Thaana': Script */
-static const OnigCodePoint CR_Thaana[] = {
- 1,
- 0x0780, 0x07b1,
-}; /* CR_Thaana */
-
-/* 'Devanagari': Script */
-static const OnigCodePoint CR_Devanagari[] = {
- 8,
- 0x0901, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0950,
- 0x0953, 0x0954,
- 0x0958, 0x0963,
- 0x0966, 0x096f,
- 0x0971, 0x0972,
- 0x097b, 0x097f,
-}; /* CR_Devanagari */
-
-/* 'Bengali': Script */
-static const OnigCodePoint CR_Bengali[] = {
- 14,
- 0x0981, 0x0983,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bc, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09ce,
- 0x09d7, 0x09d7,
- 0x09dc, 0x09dd,
- 0x09df, 0x09e3,
- 0x09e6, 0x09fa,
-}; /* CR_Bengali */
-
-/* 'Gurmukhi': Script */
-static const OnigCodePoint CR_Gurmukhi[] = {
- 16,
- 0x0a01, 0x0a03,
- 0x0a05, 0x0a0a,
- 0x0a0f, 0x0a10,
- 0x0a13, 0x0a28,
- 0x0a2a, 0x0a30,
- 0x0a32, 0x0a33,
- 0x0a35, 0x0a36,
- 0x0a38, 0x0a39,
- 0x0a3c, 0x0a3c,
- 0x0a3e, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4d,
- 0x0a51, 0x0a51,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a66, 0x0a75,
-}; /* CR_Gurmukhi */
-
-/* 'Gujarati': Script */
-static const OnigCodePoint CR_Gujarati[] = {
- 14,
- 0x0a81, 0x0a83,
- 0x0a85, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abc, 0x0ac5,
- 0x0ac7, 0x0ac9,
- 0x0acb, 0x0acd,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae3,
- 0x0ae6, 0x0aef,
- 0x0af1, 0x0af1,
-}; /* CR_Gujarati */
-
-/* 'Oriya': Script */
-static const OnigCodePoint CR_Oriya[] = {
- 14,
- 0x0b01, 0x0b03,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b35, 0x0b39,
- 0x0b3c, 0x0b44,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b63,
- 0x0b66, 0x0b71,
-}; /* CR_Oriya */
-
-/* 'Tamil': Script */
-static const OnigCodePoint CR_Tamil[] = {
- 16,
- 0x0b82, 0x0b83,
- 0x0b85, 0x0b8a,
- 0x0b8e, 0x0b90,
- 0x0b92, 0x0b95,
- 0x0b99, 0x0b9a,
- 0x0b9c, 0x0b9c,
- 0x0b9e, 0x0b9f,
- 0x0ba3, 0x0ba4,
- 0x0ba8, 0x0baa,
- 0x0bae, 0x0bb9,
- 0x0bbe, 0x0bc2,
- 0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcd,
- 0x0bd0, 0x0bd0,
- 0x0bd7, 0x0bd7,
- 0x0be6, 0x0bfa,
-}; /* CR_Tamil */
-
-/* 'Telugu': Script */
-static const OnigCodePoint CR_Telugu[] = {
- 14,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3d, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c58, 0x0c59,
- 0x0c60, 0x0c63,
- 0x0c66, 0x0c6f,
- 0x0c78, 0x0c7f,
-}; /* CR_Telugu */
-
-/* 'Kannada': Script */
-static const OnigCodePoint CR_Kannada[] = {
- 13,
- 0x0c82, 0x0c83,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbc, 0x0cc4,
- 0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccd,
- 0x0cd5, 0x0cd6,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce3,
- 0x0ce6, 0x0cef,
-}; /* CR_Kannada */
-
-/* 'Malayalam': Script */
-static const OnigCodePoint CR_Malayalam[] = {
- 12,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3d, 0x0d44,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d63,
- 0x0d66, 0x0d75,
- 0x0d79, 0x0d7f,
-}; /* CR_Malayalam */
-
-/* 'Sinhala': Script */
-static const OnigCodePoint CR_Sinhala[] = {
- 11,
- 0x0d82, 0x0d83,
- 0x0d85, 0x0d96,
- 0x0d9a, 0x0db1,
- 0x0db3, 0x0dbb,
- 0x0dbd, 0x0dbd,
- 0x0dc0, 0x0dc6,
- 0x0dca, 0x0dca,
- 0x0dcf, 0x0dd4,
- 0x0dd6, 0x0dd6,
- 0x0dd8, 0x0ddf,
- 0x0df2, 0x0df4,
-}; /* CR_Sinhala */
-
-/* 'Thai': Script */
-static const OnigCodePoint CR_Thai[] = {
- 2,
- 0x0e01, 0x0e3a,
- 0x0e40, 0x0e5b,
-}; /* CR_Thai */
-
-/* 'Lao': Script */
-static const OnigCodePoint CR_Lao[] = {
- 18,
- 0x0e81, 0x0e82,
- 0x0e84, 0x0e84,
- 0x0e87, 0x0e88,
- 0x0e8a, 0x0e8a,
- 0x0e8d, 0x0e8d,
- 0x0e94, 0x0e97,
- 0x0e99, 0x0e9f,
- 0x0ea1, 0x0ea3,
- 0x0ea5, 0x0ea5,
- 0x0ea7, 0x0ea7,
- 0x0eaa, 0x0eab,
- 0x0ead, 0x0eb9,
- 0x0ebb, 0x0ebd,
- 0x0ec0, 0x0ec4,
- 0x0ec6, 0x0ec6,
- 0x0ec8, 0x0ecd,
- 0x0ed0, 0x0ed9,
- 0x0edc, 0x0edd,
-}; /* CR_Lao */
-
-/* 'Tibetan': Script */
-static const OnigCodePoint CR_Tibetan[] = {
- 7,
- 0x0f00, 0x0f47,
- 0x0f49, 0x0f6c,
- 0x0f71, 0x0f8b,
- 0x0f90, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fbe, 0x0fcc,
- 0x0fce, 0x0fd4,
-}; /* CR_Tibetan */
-
-/* 'Myanmar': Script */
-static const OnigCodePoint CR_Myanmar[] = {
- 2,
- 0x1000, 0x1099,
- 0x109e, 0x109f,
-}; /* CR_Myanmar */
-
-/* 'Georgian': Script */
-static const OnigCodePoint CR_Georgian[] = {
- 4,
- 0x10a0, 0x10c5,
- 0x10d0, 0x10fa,
- 0x10fc, 0x10fc,
- 0x2d00, 0x2d25,
-}; /* CR_Georgian */
-
-/* 'Hangul': Script */
-static const OnigCodePoint CR_Hangul[] = {
- 12,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x3131, 0x318e,
- 0x3200, 0x321e,
- 0x3260, 0x327e,
- 0xac00, 0xd7a3,
- 0xffa0, 0xffbe,
- 0xffc2, 0xffc7,
- 0xffca, 0xffcf,
- 0xffd2, 0xffd7,
- 0xffda, 0xffdc,
-}; /* CR_Hangul */
-
-/* 'Ethiopic': Script */
-static const OnigCodePoint CR_Ethiopic[] = {
- 27,
- 0x1200, 0x1248,
- 0x124a, 0x124d,
- 0x1250, 0x1256,
- 0x1258, 0x1258,
- 0x125a, 0x125d,
- 0x1260, 0x1288,
- 0x128a, 0x128d,
- 0x1290, 0x12b0,
- 0x12b2, 0x12b5,
- 0x12b8, 0x12be,
- 0x12c0, 0x12c0,
- 0x12c2, 0x12c5,
- 0x12c8, 0x12d6,
- 0x12d8, 0x1310,
- 0x1312, 0x1315,
- 0x1318, 0x135a,
- 0x135f, 0x137c,
- 0x1380, 0x1399,
- 0x2d80, 0x2d96,
- 0x2da0, 0x2da6,
- 0x2da8, 0x2dae,
- 0x2db0, 0x2db6,
- 0x2db8, 0x2dbe,
- 0x2dc0, 0x2dc6,
- 0x2dc8, 0x2dce,
- 0x2dd0, 0x2dd6,
- 0x2dd8, 0x2dde,
-}; /* CR_Ethiopic */
-
-/* 'Cherokee': Script */
-static const OnigCodePoint CR_Cherokee[] = {
- 1,
- 0x13a0, 0x13f4,
-}; /* CR_Cherokee */
-
-/* 'Canadian_Aboriginal': Script */
-static const OnigCodePoint CR_Canadian_Aboriginal[] = {
- 1,
- 0x1401, 0x1676,
-}; /* CR_Canadian_Aboriginal */
-
-/* 'Ogham': Script */
-static const OnigCodePoint CR_Ogham[] = {
- 1,
- 0x1680, 0x169c,
-}; /* CR_Ogham */
-
-/* 'Runic': Script */
-static const OnigCodePoint CR_Runic[] = {
- 2,
- 0x16a0, 0x16ea,
- 0x16ee, 0x16f0,
-}; /* CR_Runic */
-
-/* 'Khmer': Script */
-static const OnigCodePoint CR_Khmer[] = {
- 4,
- 0x1780, 0x17dd,
- 0x17e0, 0x17e9,
- 0x17f0, 0x17f9,
- 0x19e0, 0x19ff,
-}; /* CR_Khmer */
-
-/* 'Mongolian': Script */
-static const OnigCodePoint CR_Mongolian[] = {
- 6,
- 0x1800, 0x1801,
- 0x1804, 0x1804,
- 0x1806, 0x180e,
- 0x1810, 0x1819,
- 0x1820, 0x1877,
- 0x1880, 0x18aa,
-}; /* CR_Mongolian */
-
-/* 'Hiragana': Script */
-static const OnigCodePoint CR_Hiragana[] = {
- 2,
- 0x3041, 0x3096,
- 0x309d, 0x309f,
-}; /* CR_Hiragana */
-
-/* 'Katakana': Script */
-static const OnigCodePoint CR_Katakana[] = {
- 7,
- 0x30a1, 0x30fa,
- 0x30fd, 0x30ff,
- 0x31f0, 0x31ff,
- 0x32d0, 0x32fe,
- 0x3300, 0x3357,
- 0xff66, 0xff6f,
- 0xff71, 0xff9d,
-}; /* CR_Katakana */
-
-/* 'Bopomofo': Script */
-static const OnigCodePoint CR_Bopomofo[] = {
- 2,
- 0x3105, 0x312d,
- 0x31a0, 0x31b7,
-}; /* CR_Bopomofo */
-
-/* 'Han': Script */
-static const OnigCodePoint CR_Han[] = {
- 14,
- 0x2e80, 0x2e99,
- 0x2e9b, 0x2ef3,
- 0x2f00, 0x2fd5,
- 0x3005, 0x3005,
- 0x3007, 0x3007,
- 0x3021, 0x3029,
- 0x3038, 0x303b,
- 0x3400, 0x4db5,
- 0x4e00, 0x9fc3,
- 0xf900, 0xfa2d,
- 0xfa30, 0xfa6a,
- 0xfa70, 0xfad9,
- 0x20000, 0x2a6d6,
- 0x2f800, 0x2fa1d,
-}; /* CR_Han */
-
-/* 'Yi': Script */
-static const OnigCodePoint CR_Yi[] = {
- 2,
- 0xa000, 0xa48c,
- 0xa490, 0xa4c6,
-}; /* CR_Yi */
-
-/* 'Old_Italic': Script */
-static const OnigCodePoint CR_Old_Italic[] = {
- 2,
- 0x10300, 0x1031e,
- 0x10320, 0x10323,
-}; /* CR_Old_Italic */
-
-/* 'Gothic': Script */
-static const OnigCodePoint CR_Gothic[] = {
- 1,
- 0x10330, 0x1034a,
-}; /* CR_Gothic */
-
-/* 'Deseret': Script */
-static const OnigCodePoint CR_Deseret[] = {
- 1,
- 0x10400, 0x1044f,
-}; /* CR_Deseret */
-
-/* 'Inherited': Script */
-static const OnigCodePoint CR_Inherited[] = {
- 18,
- 0x0300, 0x036f,
- 0x064b, 0x0655,
- 0x0670, 0x0670,
- 0x0951, 0x0952,
- 0x1dc0, 0x1de6,
- 0x1dfe, 0x1dff,
- 0x200c, 0x200d,
- 0x20d0, 0x20f0,
- 0x302a, 0x302f,
- 0x3099, 0x309a,
- 0xfe00, 0xfe0f,
- 0xfe20, 0xfe26,
- 0x101fd, 0x101fd,
- 0x1d167, 0x1d169,
- 0x1d17b, 0x1d182,
- 0x1d185, 0x1d18b,
- 0x1d1aa, 0x1d1ad,
- 0xe0100, 0xe01ef,
-}; /* CR_Inherited */
-
-/* 'Tagalog': Script */
-static const OnigCodePoint CR_Tagalog[] = {
- 2,
- 0x1700, 0x170c,
- 0x170e, 0x1714,
-}; /* CR_Tagalog */
-
-/* 'Hanunoo': Script */
-static const OnigCodePoint CR_Hanunoo[] = {
- 1,
- 0x1720, 0x1734,
-}; /* CR_Hanunoo */
-
-/* 'Buhid': Script */
-static const OnigCodePoint CR_Buhid[] = {
- 1,
- 0x1740, 0x1753,
-}; /* CR_Buhid */
-
-/* 'Tagbanwa': Script */
-static const OnigCodePoint CR_Tagbanwa[] = {
- 3,
- 0x1760, 0x176c,
- 0x176e, 0x1770,
- 0x1772, 0x1773,
-}; /* CR_Tagbanwa */
-
-/* 'Limbu': Script */
-static const OnigCodePoint CR_Limbu[] = {
- 5,
- 0x1900, 0x191c,
- 0x1920, 0x192b,
- 0x1930, 0x193b,
- 0x1940, 0x1940,
- 0x1944, 0x194f,
-}; /* CR_Limbu */
-
-/* 'Tai_Le': Script */
-static const OnigCodePoint CR_Tai_Le[] = {
- 2,
- 0x1950, 0x196d,
- 0x1970, 0x1974,
-}; /* CR_Tai_Le */
-
-/* 'Linear_B': Script */
-static const OnigCodePoint CR_Linear_B[] = {
- 7,
- 0x10000, 0x1000b,
- 0x1000d, 0x10026,
- 0x10028, 0x1003a,
- 0x1003c, 0x1003d,
- 0x1003f, 0x1004d,
- 0x10050, 0x1005d,
- 0x10080, 0x100fa,
-}; /* CR_Linear_B */
-
-/* 'Ugaritic': Script */
-static const OnigCodePoint CR_Ugaritic[] = {
- 2,
- 0x10380, 0x1039d,
- 0x1039f, 0x1039f,
-}; /* CR_Ugaritic */
-
-/* 'Shavian': Script */
-static const OnigCodePoint CR_Shavian[] = {
- 1,
- 0x10450, 0x1047f,
-}; /* CR_Shavian */
-
-/* 'Osmanya': Script */
-static const OnigCodePoint CR_Osmanya[] = {
- 2,
- 0x10480, 0x1049d,
- 0x104a0, 0x104a9,
-}; /* CR_Osmanya */
-
-/* 'Cypriot': Script */
-static const OnigCodePoint CR_Cypriot[] = {
- 6,
- 0x10800, 0x10805,
- 0x10808, 0x10808,
- 0x1080a, 0x10835,
- 0x10837, 0x10838,
- 0x1083c, 0x1083c,
- 0x1083f, 0x1083f,
-}; /* CR_Cypriot */
-
-/* 'Braille': Script */
-static const OnigCodePoint CR_Braille[] = {
- 1,
- 0x2800, 0x28ff,
-}; /* CR_Braille */
-
-/* 'Buginese': Script */
-static const OnigCodePoint CR_Buginese[] = {
- 2,
- 0x1a00, 0x1a1b,
- 0x1a1e, 0x1a1f,
-}; /* CR_Buginese */
-
-/* 'Coptic': Script */
-static const OnigCodePoint CR_Coptic[] = {
- 3,
- 0x03e2, 0x03ef,
- 0x2c80, 0x2cea,
- 0x2cf9, 0x2cff,
-}; /* CR_Coptic */
-
-/* 'New_Tai_Lue': Script */
-static const OnigCodePoint CR_New_Tai_Lue[] = {
- 4,
- 0x1980, 0x19a9,
- 0x19b0, 0x19c9,
- 0x19d0, 0x19d9,
- 0x19de, 0x19df,
-}; /* CR_New_Tai_Lue */
-
-/* 'Glagolitic': Script */
-static const OnigCodePoint CR_Glagolitic[] = {
- 2,
- 0x2c00, 0x2c2e,
- 0x2c30, 0x2c5e,
-}; /* CR_Glagolitic */
-
-/* 'Tifinagh': Script */
-static const OnigCodePoint CR_Tifinagh[] = {
- 2,
- 0x2d30, 0x2d65,
- 0x2d6f, 0x2d6f,
-}; /* CR_Tifinagh */
-
-/* 'Syloti_Nagri': Script */
-static const OnigCodePoint CR_Syloti_Nagri[] = {
- 1,
- 0xa800, 0xa82b,
-}; /* CR_Syloti_Nagri */
-
-/* 'Old_Persian': Script */
-static const OnigCodePoint CR_Old_Persian[] = {
- 2,
- 0x103a0, 0x103c3,
- 0x103c8, 0x103d5,
-}; /* CR_Old_Persian */
-
-/* 'Kharoshthi': Script */
-static const OnigCodePoint CR_Kharoshthi[] = {
- 8,
- 0x10a00, 0x10a03,
- 0x10a05, 0x10a06,
- 0x10a0c, 0x10a13,
- 0x10a15, 0x10a17,
- 0x10a19, 0x10a33,
- 0x10a38, 0x10a3a,
- 0x10a3f, 0x10a47,
- 0x10a50, 0x10a58,
-}; /* CR_Kharoshthi */
-
-/* 'Balinese': Script */
-static const OnigCodePoint CR_Balinese[] = {
- 2,
- 0x1b00, 0x1b4b,
- 0x1b50, 0x1b7c,
-}; /* CR_Balinese */
-
-/* 'Cuneiform': Script */
-static const OnigCodePoint CR_Cuneiform[] = {
- 3,
- 0x12000, 0x1236e,
- 0x12400, 0x12462,
- 0x12470, 0x12473,
-}; /* CR_Cuneiform */
-
-/* 'Phoenician': Script */
-static const OnigCodePoint CR_Phoenician[] = {
- 2,
- 0x10900, 0x10919,
- 0x1091f, 0x1091f,
-}; /* CR_Phoenician */
-
-/* 'Phags_Pa': Script */
-static const OnigCodePoint CR_Phags_Pa[] = {
- 1,
- 0xa840, 0xa877,
-}; /* CR_Phags_Pa */
-
-/* 'Nko': Script */
-static const OnigCodePoint CR_Nko[] = {
- 1,
- 0x07c0, 0x07fa,
-}; /* CR_Nko */
-
-/* 'Sundanese': Script */
-static const OnigCodePoint CR_Sundanese[] = {
- 2,
- 0x1b80, 0x1baa,
- 0x1bae, 0x1bb9,
-}; /* CR_Sundanese */
-
-/* 'Lepcha': Script */
-static const OnigCodePoint CR_Lepcha[] = {
- 3,
- 0x1c00, 0x1c37,
- 0x1c3b, 0x1c49,
- 0x1c4d, 0x1c4f,
-}; /* CR_Lepcha */
-
-/* 'Ol_Chiki': Script */
-static const OnigCodePoint CR_Ol_Chiki[] = {
- 1,
- 0x1c50, 0x1c7f,
-}; /* CR_Ol_Chiki */
-
-/* 'Vai': Script */
-static const OnigCodePoint CR_Vai[] = {
- 1,
- 0xa500, 0xa62b,
-}; /* CR_Vai */
-
-/* 'Saurashtra': Script */
-static const OnigCodePoint CR_Saurashtra[] = {
- 2,
- 0xa880, 0xa8c4,
- 0xa8ce, 0xa8d9,
-}; /* CR_Saurashtra */
-
-/* 'Kayah_Li': Script */
-static const OnigCodePoint CR_Kayah_Li[] = {
- 1,
- 0xa900, 0xa92f,
-}; /* CR_Kayah_Li */
-
-/* 'Rejang': Script */
-static const OnigCodePoint CR_Rejang[] = {
- 2,
- 0xa930, 0xa953,
- 0xa95f, 0xa95f,
-}; /* CR_Rejang */
-
-/* 'Lycian': Script */
-static const OnigCodePoint CR_Lycian[] = {
- 1,
- 0x10280, 0x1029c,
-}; /* CR_Lycian */
-
-/* 'Carian': Script */
-static const OnigCodePoint CR_Carian[] = {
- 1,
- 0x102a0, 0x102d0,
-}; /* CR_Carian */
-
-/* 'Lydian': Script */
-static const OnigCodePoint CR_Lydian[] = {
- 2,
- 0x10920, 0x10939,
- 0x1093f, 0x1093f,
-}; /* CR_Lydian */
-
-/* 'Cham': Script */
-static const OnigCodePoint CR_Cham[] = {
- 4,
- 0xaa00, 0xaa36,
- 0xaa40, 0xaa4d,
- 0xaa50, 0xaa59,
- 0xaa5c, 0xaa5f,
-}; /* CR_Cham */
-#endif /* USE_UNICODE_PROPERTIES */
-#endif /* USE_UNICODE_PROPERTIES */
-
-
-static const OnigCodePoint* const CodeRanges[] = {
- CR_NEWLINE,
- CR_Alpha,
- CR_Blank,
- CR_Cntrl,
- CR_Digit,
- CR_Graph,
- CR_Lower,
- CR_Print,
- CR_Punct,
- CR_Space,
- CR_Upper,
- CR_XDigit,
- CR_Word,
- CR_Alnum,
- CR_ASCII,
-#ifdef USE_UNICODE_PROPERTIES
-#ifdef USE_UNICODE_PROPERTIES
- CR_Any,
- CR_Assigned,
- CR_C,
- CR_Cc,
- CR_Cf,
- CR_Cn,
- CR_Co,
- CR_Cs,
- CR_L,
- CR_Ll,
- CR_Lm,
- CR_Lo,
- CR_Lt,
- CR_Lu,
- CR_M,
- CR_Mc,
- CR_Me,
- CR_Mn,
- CR_N,
- CR_Nd,
- CR_Nl,
- CR_No,
- CR_P,
- CR_Pc,
- CR_Pd,
- CR_Pe,
- CR_Pf,
- CR_Pi,
- CR_Po,
- CR_Ps,
- CR_S,
- CR_Sc,
- CR_Sk,
- CR_Sm,
- CR_So,
- CR_Z,
- CR_Zl,
- CR_Zp,
- CR_Zs,
- CR_Common,
- CR_Latin,
- CR_Greek,
- CR_Cyrillic,
- CR_Armenian,
- CR_Hebrew,
- CR_Arabic,
- CR_Syriac,
- CR_Thaana,
- CR_Devanagari,
- CR_Bengali,
- CR_Gurmukhi,
- CR_Gujarati,
- CR_Oriya,
- CR_Tamil,
- CR_Telugu,
- CR_Kannada,
- CR_Malayalam,
- CR_Sinhala,
- CR_Thai,
- CR_Lao,
- CR_Tibetan,
- CR_Myanmar,
- CR_Georgian,
- CR_Hangul,
- CR_Ethiopic,
- CR_Cherokee,
- CR_Canadian_Aboriginal,
- CR_Ogham,
- CR_Runic,
- CR_Khmer,
- CR_Mongolian,
- CR_Hiragana,
- CR_Katakana,
- CR_Bopomofo,
- CR_Han,
- CR_Yi,
- CR_Old_Italic,
- CR_Gothic,
- CR_Deseret,
- CR_Inherited,
- CR_Tagalog,
- CR_Hanunoo,
- CR_Buhid,
- CR_Tagbanwa,
- CR_Limbu,
- CR_Tai_Le,
- CR_Linear_B,
- CR_Ugaritic,
- CR_Shavian,
- CR_Osmanya,
- CR_Cypriot,
- CR_Braille,
- CR_Buginese,
- CR_Coptic,
- CR_New_Tai_Lue,
- CR_Glagolitic,
- CR_Tifinagh,
- CR_Syloti_Nagri,
- CR_Old_Persian,
- CR_Kharoshthi,
- CR_Balinese,
- CR_Cuneiform,
- CR_Phoenician,
- CR_Phags_Pa,
- CR_Nko,
- CR_Sundanese,
- CR_Lepcha,
- CR_Ol_Chiki,
- CR_Vai,
- CR_Saurashtra,
- CR_Kayah_Li,
- CR_Rejang,
- CR_Lycian,
- CR_Carian,
- CR_Lydian,
- CR_Cham,
-#endif /* USE_UNICODE_PROPERTIES */
-#endif /* USE_UNICODE_PROPERTIES */
-};
-struct uniname2ctype_struct {
- int name, ctype;
-};
-
-static const struct uniname2ctype_struct *uniname2ctype_p(const char *, unsigned int);
-
-#ifndef USE_UNICODE_PROPERTIES
-#define TOTAL_KEYWORDS 15
-#define MIN_WORD_LENGTH 4
-#define MAX_WORD_LENGTH 7
-#define MIN_HASH_VALUE 6
-#define MAX_HASH_VALUE 20
-/* maximum key range = 15, duplicates = 0 */
-#else /* USE_UNICODE_PROPERTIES */
-#define TOTAL_KEYWORDS 131
-#define MIN_WORD_LENGTH 1
-#define MAX_WORD_LENGTH 19
-#define MIN_HASH_VALUE 2
-#define MAX_HASH_VALUE 167
-/* maximum key range = 166, duplicates = 0 */
-#endif /* USE_UNICODE_PROPERTIES */
-
-#ifdef __GNUC__
-__inline
-#else
-#ifdef __cplusplus
-inline
-#endif
-#endif
-static unsigned int
-uniname2ctype_hash (str, len)
- register const char *str;
- register unsigned int len;
-{
- static const unsigned char asso_values[] =
- {
-#ifndef USE_UNICODE_PROPERTIES
- 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
- 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
- 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
- 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
- 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
- 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
- 21, 21, 21, 21, 21, 1, 10, 3, 7, 21,
- 21, 8, 21, 21, 21, 21, 6, 21, 8, 21,
- 4, 21, 21, 5, 21, 8, 21, 1, 4, 21,
- 21, 21, 21, 21, 21, 21, 21, 5, 21, 21,
- 21, 21, 21, 7, 21, 3, 21, 21, 21, 21,
- 2, 21, 1, 21, 1, 21, 2, 21, 21, 6,
- 21, 21, 21, 21, 21, 21, 21, 21
-#else /* USE_UNICODE_PROPERTIES */
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 33, 14, 2, 56, 13,
- 168, 38, 89, 98, 168, 58, 11, 12, 85, 22,
- 1, 168, 78, 3, 38, 24, 62, 12, 7, 64,
- 108, 168, 168, 168, 168, 70, 168, 5, 5, 73,
- 57, 22, 31, 57, 9, 49, 36, 39, 13, 49,
- 4, 2, 18, 168, 20, 6, 60, 1, 24, 14,
- 168, 21, 168, 168, 168, 168, 168, 168
-#endif /* USE_UNICODE_PROPERTIES */
- };
-#ifndef USE_UNICODE_PROPERTIES
- return len + asso_values[(unsigned char)str[2]] + asso_values[(unsigned char)str[0]];
-#else /* USE_UNICODE_PROPERTIES */
- register int hval = len;
-
- switch (hval)
- {
- default:
- hval += asso_values[(unsigned char)str[2]];
- /*FALLTHROUGH*/
- case 2:
- hval += asso_values[(unsigned char)str[1]];
- /*FALLTHROUGH*/
- case 1:
- hval += asso_values[(unsigned char)str[0]];
- break;
- }
- return hval;
-#endif /* USE_UNICODE_PROPERTIES */
-}
-
-struct uniname2ctype_pool_t
- {
-#ifndef USE_UNICODE_PROPERTIES
- char uniname2ctype_pool_str6[sizeof("Word")];
- char uniname2ctype_pool_str7[sizeof("Alpha")];
- char uniname2ctype_pool_str8[sizeof("Alnum")];
- char uniname2ctype_pool_str9[sizeof("ASCII")];
- char uniname2ctype_pool_str10[sizeof("Cntrl")];
-#else /* USE_UNICODE_PROPERTIES */
- char uniname2ctype_pool_str2[sizeof("P")];
- char uniname2ctype_pool_str3[sizeof("C")];
- char uniname2ctype_pool_str4[sizeof("S")];
- char uniname2ctype_pool_str5[sizeof("Po")];
- char uniname2ctype_pool_str6[sizeof("Co")];
- char uniname2ctype_pool_str7[sizeof("So")];
- char uniname2ctype_pool_str8[sizeof("Cn")];
- char uniname2ctype_pool_str9[sizeof("Ps")];
- char uniname2ctype_pool_str10[sizeof("Cs")];
-#endif /* USE_UNICODE_PROPERTIES */
- char uniname2ctype_pool_str11[sizeof("Punct")];
-#ifndef USE_UNICODE_PROPERTIES
- char uniname2ctype_pool_str12[sizeof("Print")];
- char uniname2ctype_pool_str13[sizeof("XDigit")];
- char uniname2ctype_pool_str14[sizeof("Upper")];
- char uniname2ctype_pool_str15[sizeof("Space")];
- char uniname2ctype_pool_str16[sizeof("NEWLINE")];
- char uniname2ctype_pool_str17[sizeof("Lower")];
- char uniname2ctype_pool_str18[sizeof("Graph")];
- char uniname2ctype_pool_str19[sizeof("Digit")];
- char uniname2ctype_pool_str20[sizeof("Blank")];
-#else /* USE_UNICODE_PROPERTIES */
- char uniname2ctype_pool_str12[sizeof("L")];
- char uniname2ctype_pool_str13[sizeof("M")];
- char uniname2ctype_pool_str14[sizeof("Lu")];
- char uniname2ctype_pool_str15[sizeof("Lo")];
- char uniname2ctype_pool_str16[sizeof("Cuneiform")];
- char uniname2ctype_pool_str17[sizeof("Sundanese")];
- char uniname2ctype_pool_str18[sizeof("Mn")];
- char uniname2ctype_pool_str19[sizeof("Saurashtra")];
- char uniname2ctype_pool_str20[sizeof("Cham")];
- char uniname2ctype_pool_str21[sizeof("Lao")];
- char uniname2ctype_pool_str22[sizeof("Phoenician")];
- char uniname2ctype_pool_str23[sizeof("Phags_Pa")];
- char uniname2ctype_pool_str24[sizeof("Shavian")];
- char uniname2ctype_pool_str25[sizeof("Pe")];
- char uniname2ctype_pool_str26[sizeof("Ll")];
- char uniname2ctype_pool_str27[sizeof("Mongolian")];
- char uniname2ctype_pool_str28[sizeof("Coptic")];
- char uniname2ctype_pool_str29[sizeof("Buhid")];
- char uniname2ctype_pool_str30[sizeof("Canadian_Aboriginal")];
- char uniname2ctype_pool_str31[sizeof("Space")];
- char uniname2ctype_pool_str32[sizeof("Lower")];
- char uniname2ctype_pool_str33[sizeof("Carian")];
- char uniname2ctype_pool_str34[sizeof("Pf")];
- char uniname2ctype_pool_str35[sizeof("Cf")];
- char uniname2ctype_pool_str36[sizeof("Me")];
- char uniname2ctype_pool_str37[sizeof("Blank")];
- char uniname2ctype_pool_str38[sizeof("Word")];
- char uniname2ctype_pool_str39[sizeof("Malayalam")];
- char uniname2ctype_pool_str40[sizeof("Balinese")];
- char uniname2ctype_pool_str41[sizeof("Cherokee")];
- char uniname2ctype_pool_str42[sizeof("Bopomofo")];
- char uniname2ctype_pool_str43[sizeof("ASCII")];
- char uniname2ctype_pool_str44[sizeof("Sk")];
- char uniname2ctype_pool_str45[sizeof("Myanmar")];
- char uniname2ctype_pool_str46[sizeof("Braille")];
- char uniname2ctype_pool_str47[sizeof("Bengali")];
- char uniname2ctype_pool_str48[sizeof("Cypriot")];
- char uniname2ctype_pool_str49[sizeof("Syloti_Nagri")];
- char uniname2ctype_pool_str50[sizeof("Syriac")];
- char uniname2ctype_pool_str51[sizeof("Cyrillic")];
- char uniname2ctype_pool_str52[sizeof("Pi")];
- char uniname2ctype_pool_str53[sizeof("Assigned")];
- char uniname2ctype_pool_str54[sizeof("Sm")];
- char uniname2ctype_pool_str55[sizeof("Alnum")];
- char uniname2ctype_pool_str56[sizeof("Thai")];
- char uniname2ctype_pool_str57[sizeof("Lepcha")];
- char uniname2ctype_pool_str58[sizeof("Thaana")];
- char uniname2ctype_pool_str59[sizeof("Common")];
- char uniname2ctype_pool_str60[sizeof("Pd")];
- char uniname2ctype_pool_str61[sizeof("Any")];
- char uniname2ctype_pool_str62[sizeof("Lm")];
- char uniname2ctype_pool_str63[sizeof("Sinhala")];
- char uniname2ctype_pool_str64[sizeof("Arabic")];
- char uniname2ctype_pool_str65[sizeof("Upper")];
- char uniname2ctype_pool_str66[sizeof("Glagolitic")];
- char uniname2ctype_pool_str67[sizeof("Gurmukhi")];
- char uniname2ctype_pool_str68[sizeof("Graph")];
- char uniname2ctype_pool_str69[sizeof("Alpha")];
- char uniname2ctype_pool_str70[sizeof("Georgian")];
- char uniname2ctype_pool_str71[sizeof("Cntrl")];
- char uniname2ctype_pool_str72[sizeof("Linear_B")];
- char uniname2ctype_pool_str73[sizeof("Lt")];
- char uniname2ctype_pool_str74[sizeof("Kannada")];
- char uniname2ctype_pool_str75[sizeof("Print")];
- char uniname2ctype_pool_str76[sizeof("Pc")];
- char uniname2ctype_pool_str77[sizeof("Cc")];
- char uniname2ctype_pool_str78[sizeof("Sc")];
- char uniname2ctype_pool_str79[sizeof("Telugu")];
- char uniname2ctype_pool_str80[sizeof("Buginese")];
- char uniname2ctype_pool_str81[sizeof("Latin")];
- char uniname2ctype_pool_str82[sizeof("Kharoshthi")];
- char uniname2ctype_pool_str83[sizeof("Gujarati")];
- char uniname2ctype_pool_str84[sizeof("Osmanya")];
- char uniname2ctype_pool_str85[sizeof("Greek")];
- char uniname2ctype_pool_str86[sizeof("N")];
- char uniname2ctype_pool_str87[sizeof("Mc")];
- char uniname2ctype_pool_str88[sizeof("Runic")];
- char uniname2ctype_pool_str89[sizeof("No")];
- char uniname2ctype_pool_str90[sizeof("Ethiopic")];
- char uniname2ctype_pool_str91[sizeof("Deseret")];
- char uniname2ctype_pool_str92[sizeof("Kayah_Li")];
- char uniname2ctype_pool_str93[sizeof("Ogham")];
- char uniname2ctype_pool_str94[sizeof("Ugaritic")];
- char uniname2ctype_pool_str95[sizeof("Lydian")];
- char uniname2ctype_pool_str96[sizeof("Oriya")];
- char uniname2ctype_pool_str97[sizeof("Tamil")];
- char uniname2ctype_pool_str98[sizeof("Tai_Le")];
- char uniname2ctype_pool_str99[sizeof("Tibetan")];
- char uniname2ctype_pool_str100[sizeof("Nl")];
- char uniname2ctype_pool_str101[sizeof("Han")];
- char uniname2ctype_pool_str102[sizeof("Old_Italic")];
- char uniname2ctype_pool_str103[sizeof("Old_Persian")];
- char uniname2ctype_pool_str104[sizeof("Hangul")];
- char uniname2ctype_pool_str105[sizeof("Hanunoo")];
- char uniname2ctype_pool_str106[sizeof("Gothic")];
- char uniname2ctype_pool_str107[sizeof("Tagalog")];
- char uniname2ctype_pool_str108[sizeof("Tagbanwa")];
- char uniname2ctype_pool_str109[sizeof("Z")];
- char uniname2ctype_pool_str110[sizeof("Armenian")];
- char uniname2ctype_pool_str111[sizeof("Lycian")];
- char uniname2ctype_pool_str112[sizeof("Devanagari")];
- char uniname2ctype_pool_str113[sizeof("Ol_Chiki")];
- char uniname2ctype_pool_str114[sizeof("Limbu")];
- char uniname2ctype_pool_str115[sizeof("Yi")];
- char uniname2ctype_pool_str116[sizeof("Zs")];
- char uniname2ctype_pool_str117[sizeof("NEWLINE")];
- char uniname2ctype_pool_str118[sizeof("XDigit")];
- char uniname2ctype_pool_str119[sizeof("Vai")];
- char uniname2ctype_pool_str120[sizeof("Inherited")];
- char uniname2ctype_pool_str121[sizeof("Khmer")];
- char uniname2ctype_pool_str122[sizeof("Hebrew")];
- char uniname2ctype_pool_str123[sizeof("Zl")];
- char uniname2ctype_pool_str126[sizeof("Tifinagh")];
- char uniname2ctype_pool_str128[sizeof("Zp")];
- char uniname2ctype_pool_str129[sizeof("Nko")];
- char uniname2ctype_pool_str131[sizeof("Katakana")];
- char uniname2ctype_pool_str132[sizeof("New_Tai_Lue")];
- char uniname2ctype_pool_str142[sizeof("Rejang")];
- char uniname2ctype_pool_str144[sizeof("Nd")];
- char uniname2ctype_pool_str166[sizeof("Hiragana")];
- char uniname2ctype_pool_str167[sizeof("Digit")];
-#endif /* USE_UNICODE_PROPERTIES */
- };
-static const struct uniname2ctype_pool_t uniname2ctype_pool_contents =
- {
-#ifdef USE_UNICODE_PROPERTIES
- "P",
- "C",
- "S",
- "Po",
- "Co",
- "So",
- "Cn",
- "Ps",
- "Cs",
- "Punct",
- "L",
- "M",
- "Lu",
- "Lo",
- "Cuneiform",
- "Sundanese",
- "Mn",
- "Saurashtra",
- "Cham",
- "Lao",
- "Phoenician",
- "Phags_Pa",
- "Shavian",
- "Pe",
- "Ll",
- "Mongolian",
- "Coptic",
- "Buhid",
- "Canadian_Aboriginal",
- "Space",
- "Lower",
- "Carian",
- "Pf",
- "Cf",
- "Me",
- "Blank",
-#endif /* USE_UNICODE_PROPERTIES */
- "Word",
-#ifndef USE_UNICODE_PROPERTIES
- "Alpha",
- "Alnum",
-#else /* USE_UNICODE_PROPERTIES */
- "Malayalam",
- "Balinese",
- "Cherokee",
- "Bopomofo",
-#endif /* USE_UNICODE_PROPERTIES */
- "ASCII",
-#ifdef USE_UNICODE_PROPERTIES
- "Sk",
- "Myanmar",
- "Braille",
- "Bengali",
- "Cypriot",
- "Syloti_Nagri",
- "Syriac",
- "Cyrillic",
- "Pi",
- "Assigned",
- "Sm",
- "Alnum",
- "Thai",
- "Lepcha",
- "Thaana",
- "Common",
- "Pd",
- "Any",
- "Lm",
- "Sinhala",
- "Arabic",
- "Upper",
- "Glagolitic",
- "Gurmukhi",
- "Graph",
- "Alpha",
- "Georgian",
-#endif /* USE_UNICODE_PROPERTIES */
- "Cntrl",
-#ifndef USE_UNICODE_PROPERTIES
- "Punct",
-#else /* USE_UNICODE_PROPERTIES */
- "Linear_B",
- "Lt",
- "Kannada",
-#endif /* USE_UNICODE_PROPERTIES */
- "Print",
-#ifndef USE_UNICODE_PROPERTIES
- "XDigit",
- "Upper",
- "Space",
-#else /* USE_UNICODE_PROPERTIES */
- "Pc",
- "Cc",
- "Sc",
- "Telugu",
- "Buginese",
- "Latin",
- "Kharoshthi",
- "Gujarati",
- "Osmanya",
- "Greek",
- "N",
- "Mc",
- "Runic",
- "No",
- "Ethiopic",
- "Deseret",
- "Kayah_Li",
- "Ogham",
- "Ugaritic",
- "Lydian",
- "Oriya",
- "Tamil",
- "Tai_Le",
- "Tibetan",
- "Nl",
- "Han",
- "Old_Italic",
- "Old_Persian",
- "Hangul",
- "Hanunoo",
- "Gothic",
- "Tagalog",
- "Tagbanwa",
- "Z",
- "Armenian",
- "Lycian",
- "Devanagari",
- "Ol_Chiki",
- "Limbu",
- "Yi",
- "Zs",
-#endif /* USE_UNICODE_PROPERTIES */
- "NEWLINE",
-#ifndef USE_UNICODE_PROPERTIES
- "Lower",
- "Graph",
- "Digit",
- "Blank"
-#else /* USE_UNICODE_PROPERTIES */
- "XDigit",
- "Vai",
- "Inherited",
- "Khmer",
- "Hebrew",
- "Zl",
- "Tifinagh",
- "Zp",
- "Nko",
- "Katakana",
- "New_Tai_Lue",
- "Rejang",
- "Nd",
- "Hiragana",
- "Digit"
-#endif /* USE_UNICODE_PROPERTIES */
- };
-#define uniname2ctype_pool ((const char *) &uniname2ctype_pool_contents)
-#ifdef __GNUC__
-__inline
-#ifdef __GNUC_STDC_INLINE__
-__attribute__ ((__gnu_inline__))
-#endif
-#endif
-const struct uniname2ctype_struct *
-uniname2ctype_p (str, len)
- register const char *str;
- register unsigned int len;
-{
- static const struct uniname2ctype_struct wordlist[] =
- {
-#ifndef USE_UNICODE_PROPERTIES
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str6, 12},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str7, 1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str8, 13},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str9, 14},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str10, 3},
-#else /* USE_UNICODE_PROPERTIES */
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2, 37},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3, 17},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str4, 45},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str5, 43},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str6, 21},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str7, 49},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str8, 20},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str9, 44},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str10, 22},
-#endif /* USE_UNICODE_PROPERTIES */
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str11, 8},
-#ifndef USE_UNICODE_PROPERTIES
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str12, 7},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str13, 11},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str14, 10},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str15, 9},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str16, 0},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str17, 6},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str18, 5},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str19, 4},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str20, 2}
-#else /* USE_UNICODE_PROPERTIES */
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str12, 23},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str13, 29},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str14, 28},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str15, 26},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str16, 116},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str17, 120},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str18, 32},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str19, 124},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str20, 130},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str21, 74},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str22, 117},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str23, 118},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str24, 103},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str25, 40},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str26, 24},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str27, 85},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str28, 108},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str29, 97},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str30, 81},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str31, 9},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str32, 6},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str33, 128},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str34, 41},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str35, 19},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str36, 31},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str37, 2},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str38, 12},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str39, 71},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str40, 115},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str41, 80},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str42, 88},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str43, 14},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str44, 47},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str45, 76},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str46, 106},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str47, 64},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str48, 105},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str49, 112},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str50, 61},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str51, 57},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str52, 42},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str53, 16},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str54, 48},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str55, 13},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str56, 73},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str57, 121},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str58, 62},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str59, 54},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str60, 39},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str61, 15},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str62, 25},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str63, 72},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str64, 60},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str65, 10},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str66, 110},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str67, 65},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str68, 5},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str69, 1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str70, 77},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str71, 3},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str72, 101},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str73, 27},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str74, 70},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str75, 7},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str76, 38},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str77, 18},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str78, 46},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str79, 69},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str80, 107},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str81, 55},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str82, 114},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str83, 66},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str84, 104},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str85, 56},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str86, 33},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str87, 30},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str88, 83},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str89, 36},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str90, 79},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str91, 93},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str92, 125},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str93, 82},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str94, 102},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str95, 129},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str96, 67},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str97, 68},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str98, 100},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str99, 75},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str100, 35},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str101, 89},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str102, 91},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str103, 113},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str104, 78},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str105, 96},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str106, 92},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str107, 95},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str108, 98},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str109, 50},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str110, 58},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str111, 127},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str112, 63},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str113, 122},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str114, 99},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str115, 90},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str116, 53},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str117, 0},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str118, 11},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str119, 123},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str120, 94},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str121, 84},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str122, 59},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str123, 51},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str126, 111},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str128, 52},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str129, 119},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str131, 87},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str132, 109},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str142, 126},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str144, 34},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str166, 86},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str167, 4}
-#endif /* USE_UNICODE_PROPERTIES */
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
- {
- register int key = uniname2ctype_hash (str, len);
-
- if (key <= MAX_HASH_VALUE && key >= 0)
- {
- register int o = wordlist[key].name;
- if (o >= 0)
- {
- register const char *s = o + uniname2ctype_pool;
-
- if (*str == *s && !strncmp (str + 1, s + 1, len - 1) && s[len] == '\0')
- return &wordlist[key];
- }
- }
- }
- return 0;
-}
-
-static int
-uniname2ctype(const UChar *name, unsigned int len)
-{
- const struct uniname2ctype_struct *p = uniname2ctype_p((const char *)name, len);
- if (p) return p->ctype;
- return -1;
-}
diff --git a/enc/unicode/name2ctype.h.blt b/enc/unicode/name2ctype.h.blt
deleted file mode 100644
index 84ea4f4246..0000000000
--- a/enc/unicode/name2ctype.h.blt
+++ /dev/null
@@ -1,9967 +0,0 @@
-/* C code produced by gperf version 3.0.3 */
-/* Command-line: gperf -7 -c -j1 -i1 -t -C -P -T -H uniname2ctype_hash -Q uniname2ctype_pool -N uniname2ctype_p */
-#ifndef USE_UNICODE_PROPERTIES
-/* Computed positions: -k'1,3' */
-#else /* USE_UNICODE_PROPERTIES */
-/* Computed positions: -k'1-3' */
-#endif /* USE_UNICODE_PROPERTIES */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
- && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
- && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
- && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
- && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
- && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
- && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
- && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
- && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
- && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
- && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
- && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
- && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
- && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
- && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
- && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
- && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
- && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
- && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
- && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
- && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
- && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
- && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646. */
-error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-
-
-/* 'NEWLINE': [[:NEWLINE:]] */
-static const OnigCodePoint CR_NEWLINE[] = {
- 1,
- 0x000a, 0x000a,
-}; /* CR_NEWLINE */
-
-/* 'Alpha': [[:Alpha:]] */
-static const OnigCodePoint CR_Alpha[] = {
- 452,
- 0x0041, 0x005a,
- 0x0061, 0x007a,
- 0x00aa, 0x00aa,
- 0x00b5, 0x00b5,
- 0x00ba, 0x00ba,
- 0x00c0, 0x00d6,
- 0x00d8, 0x00f6,
- 0x00f8, 0x02c1,
- 0x02c6, 0x02d1,
- 0x02e0, 0x02e4,
- 0x02ec, 0x02ec,
- 0x02ee, 0x02ee,
- 0x0300, 0x0374,
- 0x0376, 0x0377,
- 0x037a, 0x037d,
- 0x0386, 0x0386,
- 0x0388, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03f5,
- 0x03f7, 0x0481,
- 0x0483, 0x0523,
- 0x0531, 0x0556,
- 0x0559, 0x0559,
- 0x0561, 0x0587,
- 0x0591, 0x05bd,
- 0x05bf, 0x05bf,
- 0x05c1, 0x05c2,
- 0x05c4, 0x05c5,
- 0x05c7, 0x05c7,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f2,
- 0x0610, 0x061a,
- 0x0621, 0x065e,
- 0x066e, 0x06d3,
- 0x06d5, 0x06dc,
- 0x06de, 0x06e8,
- 0x06ea, 0x06ef,
- 0x06fa, 0x06fc,
- 0x06ff, 0x06ff,
- 0x0710, 0x074a,
- 0x074d, 0x07b1,
- 0x07ca, 0x07f5,
- 0x07fa, 0x07fa,
- 0x0901, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0954,
- 0x0958, 0x0963,
- 0x0971, 0x0972,
- 0x097b, 0x097f,
- 0x0981, 0x0983,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bc, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09ce,
- 0x09d7, 0x09d7,
- 0x09dc, 0x09dd,
- 0x09df, 0x09e3,
- 0x09f0, 0x09f1,
- 0x0a01, 0x0a03,
- 0x0a05, 0x0a0a,
- 0x0a0f, 0x0a10,
- 0x0a13, 0x0a28,
- 0x0a2a, 0x0a30,
- 0x0a32, 0x0a33,
- 0x0a35, 0x0a36,
- 0x0a38, 0x0a39,
- 0x0a3c, 0x0a3c,
- 0x0a3e, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4d,
- 0x0a51, 0x0a51,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a70, 0x0a75,
- 0x0a81, 0x0a83,
- 0x0a85, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abc, 0x0ac5,
- 0x0ac7, 0x0ac9,
- 0x0acb, 0x0acd,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae3,
- 0x0b01, 0x0b03,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b35, 0x0b39,
- 0x0b3c, 0x0b44,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b63,
- 0x0b71, 0x0b71,
- 0x0b82, 0x0b83,
- 0x0b85, 0x0b8a,
- 0x0b8e, 0x0b90,
- 0x0b92, 0x0b95,
- 0x0b99, 0x0b9a,
- 0x0b9c, 0x0b9c,
- 0x0b9e, 0x0b9f,
- 0x0ba3, 0x0ba4,
- 0x0ba8, 0x0baa,
- 0x0bae, 0x0bb9,
- 0x0bbe, 0x0bc2,
- 0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcd,
- 0x0bd0, 0x0bd0,
- 0x0bd7, 0x0bd7,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3d, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c58, 0x0c59,
- 0x0c60, 0x0c63,
- 0x0c82, 0x0c83,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbc, 0x0cc4,
- 0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccd,
- 0x0cd5, 0x0cd6,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce3,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3d, 0x0d44,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d63,
- 0x0d7a, 0x0d7f,
- 0x0d82, 0x0d83,
- 0x0d85, 0x0d96,
- 0x0d9a, 0x0db1,
- 0x0db3, 0x0dbb,
- 0x0dbd, 0x0dbd,
- 0x0dc0, 0x0dc6,
- 0x0dca, 0x0dca,
- 0x0dcf, 0x0dd4,
- 0x0dd6, 0x0dd6,
- 0x0dd8, 0x0ddf,
- 0x0df2, 0x0df3,
- 0x0e01, 0x0e3a,
- 0x0e40, 0x0e4e,
- 0x0e81, 0x0e82,
- 0x0e84, 0x0e84,
- 0x0e87, 0x0e88,
- 0x0e8a, 0x0e8a,
- 0x0e8d, 0x0e8d,
- 0x0e94, 0x0e97,
- 0x0e99, 0x0e9f,
- 0x0ea1, 0x0ea3,
- 0x0ea5, 0x0ea5,
- 0x0ea7, 0x0ea7,
- 0x0eaa, 0x0eab,
- 0x0ead, 0x0eb9,
- 0x0ebb, 0x0ebd,
- 0x0ec0, 0x0ec4,
- 0x0ec6, 0x0ec6,
- 0x0ec8, 0x0ecd,
- 0x0edc, 0x0edd,
- 0x0f00, 0x0f00,
- 0x0f18, 0x0f19,
- 0x0f35, 0x0f35,
- 0x0f37, 0x0f37,
- 0x0f39, 0x0f39,
- 0x0f3e, 0x0f47,
- 0x0f49, 0x0f6c,
- 0x0f71, 0x0f84,
- 0x0f86, 0x0f8b,
- 0x0f90, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fc6, 0x0fc6,
- 0x1000, 0x103f,
- 0x1050, 0x108f,
- 0x10a0, 0x10c5,
- 0x10d0, 0x10fa,
- 0x10fc, 0x10fc,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x1200, 0x1248,
- 0x124a, 0x124d,
- 0x1250, 0x1256,
- 0x1258, 0x1258,
- 0x125a, 0x125d,
- 0x1260, 0x1288,
- 0x128a, 0x128d,
- 0x1290, 0x12b0,
- 0x12b2, 0x12b5,
- 0x12b8, 0x12be,
- 0x12c0, 0x12c0,
- 0x12c2, 0x12c5,
- 0x12c8, 0x12d6,
- 0x12d8, 0x1310,
- 0x1312, 0x1315,
- 0x1318, 0x135a,
- 0x135f, 0x135f,
- 0x1380, 0x138f,
- 0x13a0, 0x13f4,
- 0x1401, 0x166c,
- 0x166f, 0x1676,
- 0x1681, 0x169a,
- 0x16a0, 0x16ea,
- 0x1700, 0x170c,
- 0x170e, 0x1714,
- 0x1720, 0x1734,
- 0x1740, 0x1753,
- 0x1760, 0x176c,
- 0x176e, 0x1770,
- 0x1772, 0x1773,
- 0x1780, 0x17b3,
- 0x17b6, 0x17d3,
- 0x17d7, 0x17d7,
- 0x17dc, 0x17dd,
- 0x180b, 0x180d,
- 0x1820, 0x1877,
- 0x1880, 0x18aa,
- 0x1900, 0x191c,
- 0x1920, 0x192b,
- 0x1930, 0x193b,
- 0x1950, 0x196d,
- 0x1970, 0x1974,
- 0x1980, 0x19a9,
- 0x19b0, 0x19c9,
- 0x1a00, 0x1a1b,
- 0x1b00, 0x1b4b,
- 0x1b6b, 0x1b73,
- 0x1b80, 0x1baa,
- 0x1bae, 0x1baf,
- 0x1c00, 0x1c37,
- 0x1c4d, 0x1c4f,
- 0x1c5a, 0x1c7d,
- 0x1d00, 0x1de6,
- 0x1dfe, 0x1f15,
- 0x1f18, 0x1f1d,
- 0x1f20, 0x1f45,
- 0x1f48, 0x1f4d,
- 0x1f50, 0x1f57,
- 0x1f59, 0x1f59,
- 0x1f5b, 0x1f5b,
- 0x1f5d, 0x1f5d,
- 0x1f5f, 0x1f7d,
- 0x1f80, 0x1fb4,
- 0x1fb6, 0x1fbc,
- 0x1fbe, 0x1fbe,
- 0x1fc2, 0x1fc4,
- 0x1fc6, 0x1fcc,
- 0x1fd0, 0x1fd3,
- 0x1fd6, 0x1fdb,
- 0x1fe0, 0x1fec,
- 0x1ff2, 0x1ff4,
- 0x1ff6, 0x1ffc,
- 0x2071, 0x2071,
- 0x207f, 0x207f,
- 0x2090, 0x2094,
- 0x20d0, 0x20f0,
- 0x2102, 0x2102,
- 0x2107, 0x2107,
- 0x210a, 0x2113,
- 0x2115, 0x2115,
- 0x2119, 0x211d,
- 0x2124, 0x2124,
- 0x2126, 0x2126,
- 0x2128, 0x2128,
- 0x212a, 0x212d,
- 0x212f, 0x2139,
- 0x213c, 0x213f,
- 0x2145, 0x2149,
- 0x214e, 0x214e,
- 0x2183, 0x2184,
- 0x2c00, 0x2c2e,
- 0x2c30, 0x2c5e,
- 0x2c60, 0x2c6f,
- 0x2c71, 0x2c7d,
- 0x2c80, 0x2ce4,
- 0x2d00, 0x2d25,
- 0x2d30, 0x2d65,
- 0x2d6f, 0x2d6f,
- 0x2d80, 0x2d96,
- 0x2da0, 0x2da6,
- 0x2da8, 0x2dae,
- 0x2db0, 0x2db6,
- 0x2db8, 0x2dbe,
- 0x2dc0, 0x2dc6,
- 0x2dc8, 0x2dce,
- 0x2dd0, 0x2dd6,
- 0x2dd8, 0x2dde,
- 0x2de0, 0x2dff,
- 0x2e2f, 0x2e2f,
- 0x3005, 0x3006,
- 0x302a, 0x302f,
- 0x3031, 0x3035,
- 0x303b, 0x303c,
- 0x3041, 0x3096,
- 0x3099, 0x309a,
- 0x309d, 0x309f,
- 0x30a1, 0x30fa,
- 0x30fc, 0x30ff,
- 0x3105, 0x312d,
- 0x3131, 0x318e,
- 0x31a0, 0x31b7,
- 0x31f0, 0x31ff,
- 0x3400, 0x3400,
- 0x4db5, 0x4db5,
- 0x4e00, 0x4e00,
- 0x9fc3, 0x9fc3,
- 0xa000, 0xa48c,
- 0xa500, 0xa60c,
- 0xa610, 0xa61f,
- 0xa62a, 0xa62b,
- 0xa640, 0xa65f,
- 0xa662, 0xa672,
- 0xa67c, 0xa67d,
- 0xa67f, 0xa697,
- 0xa717, 0xa71f,
- 0xa722, 0xa788,
- 0xa78b, 0xa78c,
- 0xa7fb, 0xa827,
- 0xa840, 0xa873,
- 0xa880, 0xa8c4,
- 0xa90a, 0xa92d,
- 0xa930, 0xa953,
- 0xaa00, 0xaa36,
- 0xaa40, 0xaa4d,
- 0xac00, 0xac00,
- 0xd7a3, 0xd7a3,
- 0xf900, 0xfa2d,
- 0xfa30, 0xfa6a,
- 0xfa70, 0xfad9,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xfb1d, 0xfb28,
- 0xfb2a, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbb1,
- 0xfbd3, 0xfd3d,
- 0xfd50, 0xfd8f,
- 0xfd92, 0xfdc7,
- 0xfdf0, 0xfdfb,
- 0xfe00, 0xfe0f,
- 0xfe20, 0xfe26,
- 0xfe70, 0xfe74,
- 0xfe76, 0xfefc,
- 0xff21, 0xff3a,
- 0xff41, 0xff5a,
- 0xff66, 0xffbe,
- 0xffc2, 0xffc7,
- 0xffca, 0xffcf,
- 0xffd2, 0xffd7,
- 0xffda, 0xffdc,
- 0x10000, 0x1000b,
- 0x1000d, 0x10026,
- 0x10028, 0x1003a,
- 0x1003c, 0x1003d,
- 0x1003f, 0x1004d,
- 0x10050, 0x1005d,
- 0x10080, 0x100fa,
- 0x101fd, 0x101fd,
- 0x10280, 0x1029c,
- 0x102a0, 0x102d0,
- 0x10300, 0x1031e,
- 0x10330, 0x10340,
- 0x10342, 0x10349,
- 0x10380, 0x1039d,
- 0x103a0, 0x103c3,
- 0x103c8, 0x103cf,
- 0x10400, 0x1049d,
- 0x10800, 0x10805,
- 0x10808, 0x10808,
- 0x1080a, 0x10835,
- 0x10837, 0x10838,
- 0x1083c, 0x1083c,
- 0x1083f, 0x1083f,
- 0x10900, 0x10915,
- 0x10920, 0x10939,
- 0x10a00, 0x10a03,
- 0x10a05, 0x10a06,
- 0x10a0c, 0x10a13,
- 0x10a15, 0x10a17,
- 0x10a19, 0x10a33,
- 0x10a38, 0x10a3a,
- 0x10a3f, 0x10a3f,
- 0x12000, 0x1236e,
- 0x1d165, 0x1d169,
- 0x1d16d, 0x1d172,
- 0x1d17b, 0x1d182,
- 0x1d185, 0x1d18b,
- 0x1d1aa, 0x1d1ad,
- 0x1d242, 0x1d244,
- 0x1d400, 0x1d454,
- 0x1d456, 0x1d49c,
- 0x1d49e, 0x1d49f,
- 0x1d4a2, 0x1d4a2,
- 0x1d4a5, 0x1d4a6,
- 0x1d4a9, 0x1d4ac,
- 0x1d4ae, 0x1d4b9,
- 0x1d4bb, 0x1d4bb,
- 0x1d4bd, 0x1d4c3,
- 0x1d4c5, 0x1d505,
- 0x1d507, 0x1d50a,
- 0x1d50d, 0x1d514,
- 0x1d516, 0x1d51c,
- 0x1d51e, 0x1d539,
- 0x1d53b, 0x1d53e,
- 0x1d540, 0x1d544,
- 0x1d546, 0x1d546,
- 0x1d54a, 0x1d550,
- 0x1d552, 0x1d6a5,
- 0x1d6a8, 0x1d6c0,
- 0x1d6c2, 0x1d6da,
- 0x1d6dc, 0x1d6fa,
- 0x1d6fc, 0x1d714,
- 0x1d716, 0x1d734,
- 0x1d736, 0x1d74e,
- 0x1d750, 0x1d76e,
- 0x1d770, 0x1d788,
- 0x1d78a, 0x1d7a8,
- 0x1d7aa, 0x1d7c2,
- 0x1d7c4, 0x1d7cb,
- 0x20000, 0x20000,
- 0x2a6d6, 0x2a6d6,
- 0x2f800, 0x2fa1d,
- 0xe0100, 0xe01ef,
-}; /* CR_Alpha */
-
-/* 'Blank': [[:Blank:]] */
-static const OnigCodePoint CR_Blank[] = {
- 9,
- 0x0009, 0x0009,
- 0x0020, 0x0020,
- 0x00a0, 0x00a0,
- 0x1680, 0x1680,
- 0x180e, 0x180e,
- 0x2000, 0x200a,
- 0x202f, 0x202f,
- 0x205f, 0x205f,
- 0x3000, 0x3000,
-}; /* CR_Blank */
-
-/* 'Cntrl': [[:Cntrl:]] */
-static const OnigCodePoint CR_Cntrl[] = {
- 2,
- 0x0000, 0x001f,
- 0x007f, 0x009f,
-}; /* CR_Cntrl */
-
-/* 'Digit': [[:Digit:]] */
-static const OnigCodePoint CR_Digit[] = {
- 33,
- 0x0030, 0x0039,
- 0x0660, 0x0669,
- 0x06f0, 0x06f9,
- 0x07c0, 0x07c9,
- 0x0966, 0x096f,
- 0x09e6, 0x09ef,
- 0x0a66, 0x0a6f,
- 0x0ae6, 0x0aef,
- 0x0b66, 0x0b6f,
- 0x0be6, 0x0bef,
- 0x0c66, 0x0c6f,
- 0x0ce6, 0x0cef,
- 0x0d66, 0x0d6f,
- 0x0e50, 0x0e59,
- 0x0ed0, 0x0ed9,
- 0x0f20, 0x0f29,
- 0x1040, 0x1049,
- 0x1090, 0x1099,
- 0x17e0, 0x17e9,
- 0x1810, 0x1819,
- 0x1946, 0x194f,
- 0x19d0, 0x19d9,
- 0x1b50, 0x1b59,
- 0x1bb0, 0x1bb9,
- 0x1c40, 0x1c49,
- 0x1c50, 0x1c59,
- 0xa620, 0xa629,
- 0xa8d0, 0xa8d9,
- 0xa900, 0xa909,
- 0xaa50, 0xaa59,
- 0xff10, 0xff19,
- 0x104a0, 0x104a9,
- 0x1d7ce, 0x1d7ff,
-}; /* CR_Digit */
-
-/* 'Graph': [[:Graph:]] */
-static const OnigCodePoint CR_Graph[] = {
- 449,
- 0x0021, 0x007e,
- 0x00a1, 0x00ac,
- 0x00ae, 0x0377,
- 0x037a, 0x037e,
- 0x0384, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x0523,
- 0x0531, 0x0556,
- 0x0559, 0x055f,
- 0x0561, 0x0587,
- 0x0589, 0x058a,
- 0x0591, 0x05c7,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0x0606, 0x061b,
- 0x061e, 0x061f,
- 0x0621, 0x065e,
- 0x0660, 0x06dc,
- 0x06de, 0x070d,
- 0x0710, 0x074a,
- 0x074d, 0x07b1,
- 0x07c0, 0x07fa,
- 0x0901, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0954,
- 0x0958, 0x0972,
- 0x097b, 0x097f,
- 0x0981, 0x0983,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bc, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09ce,
- 0x09d7, 0x09d7,
- 0x09dc, 0x09dd,
- 0x09df, 0x09e3,
- 0x09e6, 0x09fa,
- 0x0a01, 0x0a03,
- 0x0a05, 0x0a0a,
- 0x0a0f, 0x0a10,
- 0x0a13, 0x0a28,
- 0x0a2a, 0x0a30,
- 0x0a32, 0x0a33,
- 0x0a35, 0x0a36,
- 0x0a38, 0x0a39,
- 0x0a3c, 0x0a3c,
- 0x0a3e, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4d,
- 0x0a51, 0x0a51,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a66, 0x0a75,
- 0x0a81, 0x0a83,
- 0x0a85, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abc, 0x0ac5,
- 0x0ac7, 0x0ac9,
- 0x0acb, 0x0acd,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae3,
- 0x0ae6, 0x0aef,
- 0x0af1, 0x0af1,
- 0x0b01, 0x0b03,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b35, 0x0b39,
- 0x0b3c, 0x0b44,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b63,
- 0x0b66, 0x0b71,
- 0x0b82, 0x0b83,
- 0x0b85, 0x0b8a,
- 0x0b8e, 0x0b90,
- 0x0b92, 0x0b95,
- 0x0b99, 0x0b9a,
- 0x0b9c, 0x0b9c,
- 0x0b9e, 0x0b9f,
- 0x0ba3, 0x0ba4,
- 0x0ba8, 0x0baa,
- 0x0bae, 0x0bb9,
- 0x0bbe, 0x0bc2,
- 0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcd,
- 0x0bd0, 0x0bd0,
- 0x0bd7, 0x0bd7,
- 0x0be6, 0x0bfa,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3d, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c58, 0x0c59,
- 0x0c60, 0x0c63,
- 0x0c66, 0x0c6f,
- 0x0c78, 0x0c7f,
- 0x0c82, 0x0c83,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbc, 0x0cc4,
- 0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccd,
- 0x0cd5, 0x0cd6,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce3,
- 0x0ce6, 0x0cef,
- 0x0cf1, 0x0cf2,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3d, 0x0d44,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d63,
- 0x0d66, 0x0d75,
- 0x0d79, 0x0d7f,
- 0x0d82, 0x0d83,
- 0x0d85, 0x0d96,
- 0x0d9a, 0x0db1,
- 0x0db3, 0x0dbb,
- 0x0dbd, 0x0dbd,
- 0x0dc0, 0x0dc6,
- 0x0dca, 0x0dca,
- 0x0dcf, 0x0dd4,
- 0x0dd6, 0x0dd6,
- 0x0dd8, 0x0ddf,
- 0x0df2, 0x0df4,
- 0x0e01, 0x0e3a,
- 0x0e3f, 0x0e5b,
- 0x0e81, 0x0e82,
- 0x0e84, 0x0e84,
- 0x0e87, 0x0e88,
- 0x0e8a, 0x0e8a,
- 0x0e8d, 0x0e8d,
- 0x0e94, 0x0e97,
- 0x0e99, 0x0e9f,
- 0x0ea1, 0x0ea3,
- 0x0ea5, 0x0ea5,
- 0x0ea7, 0x0ea7,
- 0x0eaa, 0x0eab,
- 0x0ead, 0x0eb9,
- 0x0ebb, 0x0ebd,
- 0x0ec0, 0x0ec4,
- 0x0ec6, 0x0ec6,
- 0x0ec8, 0x0ecd,
- 0x0ed0, 0x0ed9,
- 0x0edc, 0x0edd,
- 0x0f00, 0x0f47,
- 0x0f49, 0x0f6c,
- 0x0f71, 0x0f8b,
- 0x0f90, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fbe, 0x0fcc,
- 0x0fce, 0x0fd4,
- 0x1000, 0x1099,
- 0x109e, 0x10c5,
- 0x10d0, 0x10fc,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x1200, 0x1248,
- 0x124a, 0x124d,
- 0x1250, 0x1256,
- 0x1258, 0x1258,
- 0x125a, 0x125d,
- 0x1260, 0x1288,
- 0x128a, 0x128d,
- 0x1290, 0x12b0,
- 0x12b2, 0x12b5,
- 0x12b8, 0x12be,
- 0x12c0, 0x12c0,
- 0x12c2, 0x12c5,
- 0x12c8, 0x12d6,
- 0x12d8, 0x1310,
- 0x1312, 0x1315,
- 0x1318, 0x135a,
- 0x135f, 0x137c,
- 0x1380, 0x1399,
- 0x13a0, 0x13f4,
- 0x1401, 0x1676,
- 0x1681, 0x169c,
- 0x16a0, 0x16f0,
- 0x1700, 0x170c,
- 0x170e, 0x1714,
- 0x1720, 0x1736,
- 0x1740, 0x1753,
- 0x1760, 0x176c,
- 0x176e, 0x1770,
- 0x1772, 0x1773,
- 0x1780, 0x17b3,
- 0x17b6, 0x17dd,
- 0x17e0, 0x17e9,
- 0x17f0, 0x17f9,
- 0x1800, 0x180d,
- 0x1810, 0x1819,
- 0x1820, 0x1877,
- 0x1880, 0x18aa,
- 0x1900, 0x191c,
- 0x1920, 0x192b,
- 0x1930, 0x193b,
- 0x1940, 0x1940,
- 0x1944, 0x196d,
- 0x1970, 0x1974,
- 0x1980, 0x19a9,
- 0x19b0, 0x19c9,
- 0x19d0, 0x19d9,
- 0x19de, 0x1a1b,
- 0x1a1e, 0x1a1f,
- 0x1b00, 0x1b4b,
- 0x1b50, 0x1b7c,
- 0x1b80, 0x1baa,
- 0x1bae, 0x1bb9,
- 0x1c00, 0x1c37,
- 0x1c3b, 0x1c49,
- 0x1c4d, 0x1c7f,
- 0x1d00, 0x1de6,
- 0x1dfe, 0x1f15,
- 0x1f18, 0x1f1d,
- 0x1f20, 0x1f45,
- 0x1f48, 0x1f4d,
- 0x1f50, 0x1f57,
- 0x1f59, 0x1f59,
- 0x1f5b, 0x1f5b,
- 0x1f5d, 0x1f5d,
- 0x1f5f, 0x1f7d,
- 0x1f80, 0x1fb4,
- 0x1fb6, 0x1fc4,
- 0x1fc6, 0x1fd3,
- 0x1fd6, 0x1fdb,
- 0x1fdd, 0x1fef,
- 0x1ff2, 0x1ff4,
- 0x1ff6, 0x1ffe,
- 0x2010, 0x2027,
- 0x2030, 0x205e,
- 0x2070, 0x2071,
- 0x2074, 0x208e,
- 0x2090, 0x2094,
- 0x20a0, 0x20b5,
- 0x20d0, 0x20f0,
- 0x2100, 0x214f,
- 0x2153, 0x2188,
- 0x2190, 0x23e7,
- 0x2400, 0x2426,
- 0x2440, 0x244a,
- 0x2460, 0x269d,
- 0x26a0, 0x26bc,
- 0x26c0, 0x26c3,
- 0x2701, 0x2704,
- 0x2706, 0x2709,
- 0x270c, 0x2727,
- 0x2729, 0x274b,
- 0x274d, 0x274d,
- 0x274f, 0x2752,
- 0x2756, 0x2756,
- 0x2758, 0x275e,
- 0x2761, 0x2794,
- 0x2798, 0x27af,
- 0x27b1, 0x27be,
- 0x27c0, 0x27ca,
- 0x27cc, 0x27cc,
- 0x27d0, 0x2b4c,
- 0x2b50, 0x2b54,
- 0x2c00, 0x2c2e,
- 0x2c30, 0x2c5e,
- 0x2c60, 0x2c6f,
- 0x2c71, 0x2c7d,
- 0x2c80, 0x2cea,
- 0x2cf9, 0x2d25,
- 0x2d30, 0x2d65,
- 0x2d6f, 0x2d6f,
- 0x2d80, 0x2d96,
- 0x2da0, 0x2da6,
- 0x2da8, 0x2dae,
- 0x2db0, 0x2db6,
- 0x2db8, 0x2dbe,
- 0x2dc0, 0x2dc6,
- 0x2dc8, 0x2dce,
- 0x2dd0, 0x2dd6,
- 0x2dd8, 0x2dde,
- 0x2de0, 0x2e30,
- 0x2e80, 0x2e99,
- 0x2e9b, 0x2ef3,
- 0x2f00, 0x2fd5,
- 0x2ff0, 0x2ffb,
- 0x3001, 0x303f,
- 0x3041, 0x3096,
- 0x3099, 0x30ff,
- 0x3105, 0x312d,
- 0x3131, 0x318e,
- 0x3190, 0x31b7,
- 0x31c0, 0x31e3,
- 0x31f0, 0x321e,
- 0x3220, 0x3243,
- 0x3250, 0x32fe,
- 0x3300, 0x3400,
- 0x4db5, 0x4db5,
- 0x4dc0, 0x4e00,
- 0x9fc3, 0x9fc3,
- 0xa000, 0xa48c,
- 0xa490, 0xa4c6,
- 0xa500, 0xa62b,
- 0xa640, 0xa65f,
- 0xa662, 0xa673,
- 0xa67c, 0xa697,
- 0xa700, 0xa78c,
- 0xa7fb, 0xa82b,
- 0xa840, 0xa877,
- 0xa880, 0xa8c4,
- 0xa8ce, 0xa8d9,
- 0xa900, 0xa953,
- 0xa95f, 0xa95f,
- 0xaa00, 0xaa36,
- 0xaa40, 0xaa4d,
- 0xaa50, 0xaa59,
- 0xaa5c, 0xaa5f,
- 0xac00, 0xac00,
- 0xd7a3, 0xd7a3,
- 0xf900, 0xfa2d,
- 0xfa30, 0xfa6a,
- 0xfa70, 0xfad9,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xfb1d, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbb1,
- 0xfbd3, 0xfd3f,
- 0xfd50, 0xfd8f,
- 0xfd92, 0xfdc7,
- 0xfdf0, 0xfdfd,
- 0xfe00, 0xfe19,
- 0xfe20, 0xfe26,
- 0xfe30, 0xfe52,
- 0xfe54, 0xfe66,
- 0xfe68, 0xfe6b,
- 0xfe70, 0xfe74,
- 0xfe76, 0xfefc,
- 0xff01, 0xffbe,
- 0xffc2, 0xffc7,
- 0xffca, 0xffcf,
- 0xffd2, 0xffd7,
- 0xffda, 0xffdc,
- 0xffe0, 0xffe6,
- 0xffe8, 0xffee,
- 0xfffc, 0xfffd,
- 0x10000, 0x1000b,
- 0x1000d, 0x10026,
- 0x10028, 0x1003a,
- 0x1003c, 0x1003d,
- 0x1003f, 0x1004d,
- 0x10050, 0x1005d,
- 0x10080, 0x100fa,
- 0x10100, 0x10102,
- 0x10107, 0x10133,
- 0x10137, 0x1018a,
- 0x10190, 0x1019b,
- 0x101d0, 0x101fd,
- 0x10280, 0x1029c,
- 0x102a0, 0x102d0,
- 0x10300, 0x1031e,
- 0x10320, 0x10323,
- 0x10330, 0x1034a,
- 0x10380, 0x1039d,
- 0x1039f, 0x103c3,
- 0x103c8, 0x103d5,
- 0x10400, 0x1049d,
- 0x104a0, 0x104a9,
- 0x10800, 0x10805,
- 0x10808, 0x10808,
- 0x1080a, 0x10835,
- 0x10837, 0x10838,
- 0x1083c, 0x1083c,
- 0x1083f, 0x1083f,
- 0x10900, 0x10919,
- 0x1091f, 0x10939,
- 0x1093f, 0x1093f,
- 0x10a00, 0x10a03,
- 0x10a05, 0x10a06,
- 0x10a0c, 0x10a13,
- 0x10a15, 0x10a17,
- 0x10a19, 0x10a33,
- 0x10a38, 0x10a3a,
- 0x10a3f, 0x10a47,
- 0x10a50, 0x10a58,
- 0x12000, 0x1236e,
- 0x12400, 0x12462,
- 0x12470, 0x12473,
- 0x1d000, 0x1d0f5,
- 0x1d100, 0x1d126,
- 0x1d129, 0x1d172,
- 0x1d17b, 0x1d1dd,
- 0x1d200, 0x1d245,
- 0x1d300, 0x1d356,
- 0x1d360, 0x1d371,
- 0x1d400, 0x1d454,
- 0x1d456, 0x1d49c,
- 0x1d49e, 0x1d49f,
- 0x1d4a2, 0x1d4a2,
- 0x1d4a5, 0x1d4a6,
- 0x1d4a9, 0x1d4ac,
- 0x1d4ae, 0x1d4b9,
- 0x1d4bb, 0x1d4bb,
- 0x1d4bd, 0x1d4c3,
- 0x1d4c5, 0x1d505,
- 0x1d507, 0x1d50a,
- 0x1d50d, 0x1d514,
- 0x1d516, 0x1d51c,
- 0x1d51e, 0x1d539,
- 0x1d53b, 0x1d53e,
- 0x1d540, 0x1d544,
- 0x1d546, 0x1d546,
- 0x1d54a, 0x1d550,
- 0x1d552, 0x1d6a5,
- 0x1d6a8, 0x1d7cb,
- 0x1d7ce, 0x1d7ff,
- 0x1f000, 0x1f02b,
- 0x1f030, 0x1f093,
- 0x20000, 0x20000,
- 0x2a6d6, 0x2a6d6,
- 0x2f800, 0x2fa1d,
- 0xe0100, 0xe01ef,
-}; /* CR_Graph */
-
-/* 'Lower': [[:Lower:]] */
-static const OnigCodePoint CR_Lower[] = {
- 598,
- 0x0061, 0x007a,
- 0x00aa, 0x00aa,
- 0x00b5, 0x00b5,
- 0x00ba, 0x00ba,
- 0x00df, 0x00f6,
- 0x00f8, 0x00ff,
- 0x0101, 0x0101,
- 0x0103, 0x0103,
- 0x0105, 0x0105,
- 0x0107, 0x0107,
- 0x0109, 0x0109,
- 0x010b, 0x010b,
- 0x010d, 0x010d,
- 0x010f, 0x010f,
- 0x0111, 0x0111,
- 0x0113, 0x0113,
- 0x0115, 0x0115,
- 0x0117, 0x0117,
- 0x0119, 0x0119,
- 0x011b, 0x011b,
- 0x011d, 0x011d,
- 0x011f, 0x011f,
- 0x0121, 0x0121,
- 0x0123, 0x0123,
- 0x0125, 0x0125,
- 0x0127, 0x0127,
- 0x0129, 0x0129,
- 0x012b, 0x012b,
- 0x012d, 0x012d,
- 0x012f, 0x012f,
- 0x0131, 0x0131,
- 0x0133, 0x0133,
- 0x0135, 0x0135,
- 0x0137, 0x0138,
- 0x013a, 0x013a,
- 0x013c, 0x013c,
- 0x013e, 0x013e,
- 0x0140, 0x0140,
- 0x0142, 0x0142,
- 0x0144, 0x0144,
- 0x0146, 0x0146,
- 0x0148, 0x0149,
- 0x014b, 0x014b,
- 0x014d, 0x014d,
- 0x014f, 0x014f,
- 0x0151, 0x0151,
- 0x0153, 0x0153,
- 0x0155, 0x0155,
- 0x0157, 0x0157,
- 0x0159, 0x0159,
- 0x015b, 0x015b,
- 0x015d, 0x015d,
- 0x015f, 0x015f,
- 0x0161, 0x0161,
- 0x0163, 0x0163,
- 0x0165, 0x0165,
- 0x0167, 0x0167,
- 0x0169, 0x0169,
- 0x016b, 0x016b,
- 0x016d, 0x016d,
- 0x016f, 0x016f,
- 0x0171, 0x0171,
- 0x0173, 0x0173,
- 0x0175, 0x0175,
- 0x0177, 0x0177,
- 0x017a, 0x017a,
- 0x017c, 0x017c,
- 0x017e, 0x0180,
- 0x0183, 0x0183,
- 0x0185, 0x0185,
- 0x0188, 0x0188,
- 0x018c, 0x018d,
- 0x0192, 0x0192,
- 0x0195, 0x0195,
- 0x0199, 0x019b,
- 0x019e, 0x019e,
- 0x01a1, 0x01a1,
- 0x01a3, 0x01a3,
- 0x01a5, 0x01a5,
- 0x01a8, 0x01a8,
- 0x01aa, 0x01ab,
- 0x01ad, 0x01ad,
- 0x01b0, 0x01b0,
- 0x01b4, 0x01b4,
- 0x01b6, 0x01b6,
- 0x01b9, 0x01ba,
- 0x01bd, 0x01bf,
- 0x01c6, 0x01c6,
- 0x01c9, 0x01c9,
- 0x01cc, 0x01cc,
- 0x01ce, 0x01ce,
- 0x01d0, 0x01d0,
- 0x01d2, 0x01d2,
- 0x01d4, 0x01d4,
- 0x01d6, 0x01d6,
- 0x01d8, 0x01d8,
- 0x01da, 0x01da,
- 0x01dc, 0x01dd,
- 0x01df, 0x01df,
- 0x01e1, 0x01e1,
- 0x01e3, 0x01e3,
- 0x01e5, 0x01e5,
- 0x01e7, 0x01e7,
- 0x01e9, 0x01e9,
- 0x01eb, 0x01eb,
- 0x01ed, 0x01ed,
- 0x01ef, 0x01f0,
- 0x01f3, 0x01f3,
- 0x01f5, 0x01f5,
- 0x01f9, 0x01f9,
- 0x01fb, 0x01fb,
- 0x01fd, 0x01fd,
- 0x01ff, 0x01ff,
- 0x0201, 0x0201,
- 0x0203, 0x0203,
- 0x0205, 0x0205,
- 0x0207, 0x0207,
- 0x0209, 0x0209,
- 0x020b, 0x020b,
- 0x020d, 0x020d,
- 0x020f, 0x020f,
- 0x0211, 0x0211,
- 0x0213, 0x0213,
- 0x0215, 0x0215,
- 0x0217, 0x0217,
- 0x0219, 0x0219,
- 0x021b, 0x021b,
- 0x021d, 0x021d,
- 0x021f, 0x021f,
- 0x0221, 0x0221,
- 0x0223, 0x0223,
- 0x0225, 0x0225,
- 0x0227, 0x0227,
- 0x0229, 0x0229,
- 0x022b, 0x022b,
- 0x022d, 0x022d,
- 0x022f, 0x022f,
- 0x0231, 0x0231,
- 0x0233, 0x0239,
- 0x023c, 0x023c,
- 0x023f, 0x0240,
- 0x0242, 0x0242,
- 0x0247, 0x0247,
- 0x0249, 0x0249,
- 0x024b, 0x024b,
- 0x024d, 0x024d,
- 0x024f, 0x0293,
- 0x0295, 0x02af,
- 0x0371, 0x0371,
- 0x0373, 0x0373,
- 0x0377, 0x0377,
- 0x037b, 0x037d,
- 0x0390, 0x0390,
- 0x03ac, 0x03ce,
- 0x03d0, 0x03d1,
- 0x03d5, 0x03d7,
- 0x03d9, 0x03d9,
- 0x03db, 0x03db,
- 0x03dd, 0x03dd,
- 0x03df, 0x03df,
- 0x03e1, 0x03e1,
- 0x03e3, 0x03e3,
- 0x03e5, 0x03e5,
- 0x03e7, 0x03e7,
- 0x03e9, 0x03e9,
- 0x03eb, 0x03eb,
- 0x03ed, 0x03ed,
- 0x03ef, 0x03f3,
- 0x03f5, 0x03f5,
- 0x03f8, 0x03f8,
- 0x03fb, 0x03fc,
- 0x0430, 0x045f,
- 0x0461, 0x0461,
- 0x0463, 0x0463,
- 0x0465, 0x0465,
- 0x0467, 0x0467,
- 0x0469, 0x0469,
- 0x046b, 0x046b,
- 0x046d, 0x046d,
- 0x046f, 0x046f,
- 0x0471, 0x0471,
- 0x0473, 0x0473,
- 0x0475, 0x0475,
- 0x0477, 0x0477,
- 0x0479, 0x0479,
- 0x047b, 0x047b,
- 0x047d, 0x047d,
- 0x047f, 0x047f,
- 0x0481, 0x0481,
- 0x048b, 0x048b,
- 0x048d, 0x048d,
- 0x048f, 0x048f,
- 0x0491, 0x0491,
- 0x0493, 0x0493,
- 0x0495, 0x0495,
- 0x0497, 0x0497,
- 0x0499, 0x0499,
- 0x049b, 0x049b,
- 0x049d, 0x049d,
- 0x049f, 0x049f,
- 0x04a1, 0x04a1,
- 0x04a3, 0x04a3,
- 0x04a5, 0x04a5,
- 0x04a7, 0x04a7,
- 0x04a9, 0x04a9,
- 0x04ab, 0x04ab,
- 0x04ad, 0x04ad,
- 0x04af, 0x04af,
- 0x04b1, 0x04b1,
- 0x04b3, 0x04b3,
- 0x04b5, 0x04b5,
- 0x04b7, 0x04b7,
- 0x04b9, 0x04b9,
- 0x04bb, 0x04bb,
- 0x04bd, 0x04bd,
- 0x04bf, 0x04bf,
- 0x04c2, 0x04c2,
- 0x04c4, 0x04c4,
- 0x04c6, 0x04c6,
- 0x04c8, 0x04c8,
- 0x04ca, 0x04ca,
- 0x04cc, 0x04cc,
- 0x04ce, 0x04cf,
- 0x04d1, 0x04d1,
- 0x04d3, 0x04d3,
- 0x04d5, 0x04d5,
- 0x04d7, 0x04d7,
- 0x04d9, 0x04d9,
- 0x04db, 0x04db,
- 0x04dd, 0x04dd,
- 0x04df, 0x04df,
- 0x04e1, 0x04e1,
- 0x04e3, 0x04e3,
- 0x04e5, 0x04e5,
- 0x04e7, 0x04e7,
- 0x04e9, 0x04e9,
- 0x04eb, 0x04eb,
- 0x04ed, 0x04ed,
- 0x04ef, 0x04ef,
- 0x04f1, 0x04f1,
- 0x04f3, 0x04f3,
- 0x04f5, 0x04f5,
- 0x04f7, 0x04f7,
- 0x04f9, 0x04f9,
- 0x04fb, 0x04fb,
- 0x04fd, 0x04fd,
- 0x04ff, 0x04ff,
- 0x0501, 0x0501,
- 0x0503, 0x0503,
- 0x0505, 0x0505,
- 0x0507, 0x0507,
- 0x0509, 0x0509,
- 0x050b, 0x050b,
- 0x050d, 0x050d,
- 0x050f, 0x050f,
- 0x0511, 0x0511,
- 0x0513, 0x0513,
- 0x0515, 0x0515,
- 0x0517, 0x0517,
- 0x0519, 0x0519,
- 0x051b, 0x051b,
- 0x051d, 0x051d,
- 0x051f, 0x051f,
- 0x0521, 0x0521,
- 0x0523, 0x0523,
- 0x0561, 0x0587,
- 0x1d00, 0x1d2b,
- 0x1d62, 0x1d77,
- 0x1d79, 0x1d9a,
- 0x1e01, 0x1e01,
- 0x1e03, 0x1e03,
- 0x1e05, 0x1e05,
- 0x1e07, 0x1e07,
- 0x1e09, 0x1e09,
- 0x1e0b, 0x1e0b,
- 0x1e0d, 0x1e0d,
- 0x1e0f, 0x1e0f,
- 0x1e11, 0x1e11,
- 0x1e13, 0x1e13,
- 0x1e15, 0x1e15,
- 0x1e17, 0x1e17,
- 0x1e19, 0x1e19,
- 0x1e1b, 0x1e1b,
- 0x1e1d, 0x1e1d,
- 0x1e1f, 0x1e1f,
- 0x1e21, 0x1e21,
- 0x1e23, 0x1e23,
- 0x1e25, 0x1e25,
- 0x1e27, 0x1e27,
- 0x1e29, 0x1e29,
- 0x1e2b, 0x1e2b,
- 0x1e2d, 0x1e2d,
- 0x1e2f, 0x1e2f,
- 0x1e31, 0x1e31,
- 0x1e33, 0x1e33,
- 0x1e35, 0x1e35,
- 0x1e37, 0x1e37,
- 0x1e39, 0x1e39,
- 0x1e3b, 0x1e3b,
- 0x1e3d, 0x1e3d,
- 0x1e3f, 0x1e3f,
- 0x1e41, 0x1e41,
- 0x1e43, 0x1e43,
- 0x1e45, 0x1e45,
- 0x1e47, 0x1e47,
- 0x1e49, 0x1e49,
- 0x1e4b, 0x1e4b,
- 0x1e4d, 0x1e4d,
- 0x1e4f, 0x1e4f,
- 0x1e51, 0x1e51,
- 0x1e53, 0x1e53,
- 0x1e55, 0x1e55,
- 0x1e57, 0x1e57,
- 0x1e59, 0x1e59,
- 0x1e5b, 0x1e5b,
- 0x1e5d, 0x1e5d,
- 0x1e5f, 0x1e5f,
- 0x1e61, 0x1e61,
- 0x1e63, 0x1e63,
- 0x1e65, 0x1e65,
- 0x1e67, 0x1e67,
- 0x1e69, 0x1e69,
- 0x1e6b, 0x1e6b,
- 0x1e6d, 0x1e6d,
- 0x1e6f, 0x1e6f,
- 0x1e71, 0x1e71,
- 0x1e73, 0x1e73,
- 0x1e75, 0x1e75,
- 0x1e77, 0x1e77,
- 0x1e79, 0x1e79,
- 0x1e7b, 0x1e7b,
- 0x1e7d, 0x1e7d,
- 0x1e7f, 0x1e7f,
- 0x1e81, 0x1e81,
- 0x1e83, 0x1e83,
- 0x1e85, 0x1e85,
- 0x1e87, 0x1e87,
- 0x1e89, 0x1e89,
- 0x1e8b, 0x1e8b,
- 0x1e8d, 0x1e8d,
- 0x1e8f, 0x1e8f,
- 0x1e91, 0x1e91,
- 0x1e93, 0x1e93,
- 0x1e95, 0x1e9d,
- 0x1e9f, 0x1e9f,
- 0x1ea1, 0x1ea1,
- 0x1ea3, 0x1ea3,
- 0x1ea5, 0x1ea5,
- 0x1ea7, 0x1ea7,
- 0x1ea9, 0x1ea9,
- 0x1eab, 0x1eab,
- 0x1ead, 0x1ead,
- 0x1eaf, 0x1eaf,
- 0x1eb1, 0x1eb1,
- 0x1eb3, 0x1eb3,
- 0x1eb5, 0x1eb5,
- 0x1eb7, 0x1eb7,
- 0x1eb9, 0x1eb9,
- 0x1ebb, 0x1ebb,
- 0x1ebd, 0x1ebd,
- 0x1ebf, 0x1ebf,
- 0x1ec1, 0x1ec1,
- 0x1ec3, 0x1ec3,
- 0x1ec5, 0x1ec5,
- 0x1ec7, 0x1ec7,
- 0x1ec9, 0x1ec9,
- 0x1ecb, 0x1ecb,
- 0x1ecd, 0x1ecd,
- 0x1ecf, 0x1ecf,
- 0x1ed1, 0x1ed1,
- 0x1ed3, 0x1ed3,
- 0x1ed5, 0x1ed5,
- 0x1ed7, 0x1ed7,
- 0x1ed9, 0x1ed9,
- 0x1edb, 0x1edb,
- 0x1edd, 0x1edd,
- 0x1edf, 0x1edf,
- 0x1ee1, 0x1ee1,
- 0x1ee3, 0x1ee3,
- 0x1ee5, 0x1ee5,
- 0x1ee7, 0x1ee7,
- 0x1ee9, 0x1ee9,
- 0x1eeb, 0x1eeb,
- 0x1eed, 0x1eed,
- 0x1eef, 0x1eef,
- 0x1ef1, 0x1ef1,
- 0x1ef3, 0x1ef3,
- 0x1ef5, 0x1ef5,
- 0x1ef7, 0x1ef7,
- 0x1ef9, 0x1ef9,
- 0x1efb, 0x1efb,
- 0x1efd, 0x1efd,
- 0x1eff, 0x1f07,
- 0x1f10, 0x1f15,
- 0x1f20, 0x1f27,
- 0x1f30, 0x1f37,
- 0x1f40, 0x1f45,
- 0x1f50, 0x1f57,
- 0x1f60, 0x1f67,
- 0x1f70, 0x1f7d,
- 0x1f80, 0x1f87,
- 0x1f90, 0x1f97,
- 0x1fa0, 0x1fa7,
- 0x1fb0, 0x1fb4,
- 0x1fb6, 0x1fb7,
- 0x1fbe, 0x1fbe,
- 0x1fc2, 0x1fc4,
- 0x1fc6, 0x1fc7,
- 0x1fd0, 0x1fd3,
- 0x1fd6, 0x1fd7,
- 0x1fe0, 0x1fe7,
- 0x1ff2, 0x1ff4,
- 0x1ff6, 0x1ff7,
- 0x2071, 0x2071,
- 0x207f, 0x207f,
- 0x210a, 0x210a,
- 0x210e, 0x210f,
- 0x2113, 0x2113,
- 0x212f, 0x212f,
- 0x2134, 0x2134,
- 0x2139, 0x2139,
- 0x213c, 0x213d,
- 0x2146, 0x2149,
- 0x214e, 0x214e,
- 0x2184, 0x2184,
- 0x2c30, 0x2c5e,
- 0x2c61, 0x2c61,
- 0x2c65, 0x2c66,
- 0x2c68, 0x2c68,
- 0x2c6a, 0x2c6a,
- 0x2c6c, 0x2c6c,
- 0x2c71, 0x2c71,
- 0x2c73, 0x2c74,
- 0x2c76, 0x2c7c,
- 0x2c81, 0x2c81,
- 0x2c83, 0x2c83,
- 0x2c85, 0x2c85,
- 0x2c87, 0x2c87,
- 0x2c89, 0x2c89,
- 0x2c8b, 0x2c8b,
- 0x2c8d, 0x2c8d,
- 0x2c8f, 0x2c8f,
- 0x2c91, 0x2c91,
- 0x2c93, 0x2c93,
- 0x2c95, 0x2c95,
- 0x2c97, 0x2c97,
- 0x2c99, 0x2c99,
- 0x2c9b, 0x2c9b,
- 0x2c9d, 0x2c9d,
- 0x2c9f, 0x2c9f,
- 0x2ca1, 0x2ca1,
- 0x2ca3, 0x2ca3,
- 0x2ca5, 0x2ca5,
- 0x2ca7, 0x2ca7,
- 0x2ca9, 0x2ca9,
- 0x2cab, 0x2cab,
- 0x2cad, 0x2cad,
- 0x2caf, 0x2caf,
- 0x2cb1, 0x2cb1,
- 0x2cb3, 0x2cb3,
- 0x2cb5, 0x2cb5,
- 0x2cb7, 0x2cb7,
- 0x2cb9, 0x2cb9,
- 0x2cbb, 0x2cbb,
- 0x2cbd, 0x2cbd,
- 0x2cbf, 0x2cbf,
- 0x2cc1, 0x2cc1,
- 0x2cc3, 0x2cc3,
- 0x2cc5, 0x2cc5,
- 0x2cc7, 0x2cc7,
- 0x2cc9, 0x2cc9,
- 0x2ccb, 0x2ccb,
- 0x2ccd, 0x2ccd,
- 0x2ccf, 0x2ccf,
- 0x2cd1, 0x2cd1,
- 0x2cd3, 0x2cd3,
- 0x2cd5, 0x2cd5,
- 0x2cd7, 0x2cd7,
- 0x2cd9, 0x2cd9,
- 0x2cdb, 0x2cdb,
- 0x2cdd, 0x2cdd,
- 0x2cdf, 0x2cdf,
- 0x2ce1, 0x2ce1,
- 0x2ce3, 0x2ce4,
- 0x2d00, 0x2d25,
- 0xa641, 0xa641,
- 0xa643, 0xa643,
- 0xa645, 0xa645,
- 0xa647, 0xa647,
- 0xa649, 0xa649,
- 0xa64b, 0xa64b,
- 0xa64d, 0xa64d,
- 0xa64f, 0xa64f,
- 0xa651, 0xa651,
- 0xa653, 0xa653,
- 0xa655, 0xa655,
- 0xa657, 0xa657,
- 0xa659, 0xa659,
- 0xa65b, 0xa65b,
- 0xa65d, 0xa65d,
- 0xa65f, 0xa65f,
- 0xa663, 0xa663,
- 0xa665, 0xa665,
- 0xa667, 0xa667,
- 0xa669, 0xa669,
- 0xa66b, 0xa66b,
- 0xa66d, 0xa66d,
- 0xa681, 0xa681,
- 0xa683, 0xa683,
- 0xa685, 0xa685,
- 0xa687, 0xa687,
- 0xa689, 0xa689,
- 0xa68b, 0xa68b,
- 0xa68d, 0xa68d,
- 0xa68f, 0xa68f,
- 0xa691, 0xa691,
- 0xa693, 0xa693,
- 0xa695, 0xa695,
- 0xa697, 0xa697,
- 0xa723, 0xa723,
- 0xa725, 0xa725,
- 0xa727, 0xa727,
- 0xa729, 0xa729,
- 0xa72b, 0xa72b,
- 0xa72d, 0xa72d,
- 0xa72f, 0xa731,
- 0xa733, 0xa733,
- 0xa735, 0xa735,
- 0xa737, 0xa737,
- 0xa739, 0xa739,
- 0xa73b, 0xa73b,
- 0xa73d, 0xa73d,
- 0xa73f, 0xa73f,
- 0xa741, 0xa741,
- 0xa743, 0xa743,
- 0xa745, 0xa745,
- 0xa747, 0xa747,
- 0xa749, 0xa749,
- 0xa74b, 0xa74b,
- 0xa74d, 0xa74d,
- 0xa74f, 0xa74f,
- 0xa751, 0xa751,
- 0xa753, 0xa753,
- 0xa755, 0xa755,
- 0xa757, 0xa757,
- 0xa759, 0xa759,
- 0xa75b, 0xa75b,
- 0xa75d, 0xa75d,
- 0xa75f, 0xa75f,
- 0xa761, 0xa761,
- 0xa763, 0xa763,
- 0xa765, 0xa765,
- 0xa767, 0xa767,
- 0xa769, 0xa769,
- 0xa76b, 0xa76b,
- 0xa76d, 0xa76d,
- 0xa76f, 0xa76f,
- 0xa771, 0xa778,
- 0xa77a, 0xa77a,
- 0xa77c, 0xa77c,
- 0xa77f, 0xa77f,
- 0xa781, 0xa781,
- 0xa783, 0xa783,
- 0xa785, 0xa785,
- 0xa787, 0xa787,
- 0xa78c, 0xa78c,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xff41, 0xff5a,
- 0x10428, 0x1044f,
- 0x1d41a, 0x1d433,
- 0x1d44e, 0x1d454,
- 0x1d456, 0x1d467,
- 0x1d482, 0x1d49b,
- 0x1d4b6, 0x1d4b9,
- 0x1d4bb, 0x1d4bb,
- 0x1d4bd, 0x1d4c3,
- 0x1d4c5, 0x1d4cf,
- 0x1d4ea, 0x1d503,
- 0x1d51e, 0x1d537,
- 0x1d552, 0x1d56b,
- 0x1d586, 0x1d59f,
- 0x1d5ba, 0x1d5d3,
- 0x1d5ee, 0x1d607,
- 0x1d622, 0x1d63b,
- 0x1d656, 0x1d66f,
- 0x1d68a, 0x1d6a5,
- 0x1d6c2, 0x1d6da,
- 0x1d6dc, 0x1d6e1,
- 0x1d6fc, 0x1d714,
- 0x1d716, 0x1d71b,
- 0x1d736, 0x1d74e,
- 0x1d750, 0x1d755,
- 0x1d770, 0x1d788,
- 0x1d78a, 0x1d78f,
- 0x1d7aa, 0x1d7c2,
- 0x1d7c4, 0x1d7c9,
- 0x1d7cb, 0x1d7cb,
-}; /* CR_Lower */
-
-/* 'Print': [[:Print:]] */
-static const OnigCodePoint CR_Print[] = {
- 452,
- 0x0009, 0x000d,
- 0x0020, 0x007e,
- 0x0085, 0x0085,
- 0x00a0, 0x00ac,
- 0x00ae, 0x0377,
- 0x037a, 0x037e,
- 0x0384, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x0523,
- 0x0531, 0x0556,
- 0x0559, 0x055f,
- 0x0561, 0x0587,
- 0x0589, 0x058a,
- 0x0591, 0x05c7,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0x0606, 0x061b,
- 0x061e, 0x061f,
- 0x0621, 0x065e,
- 0x0660, 0x06dc,
- 0x06de, 0x070d,
- 0x0710, 0x074a,
- 0x074d, 0x07b1,
- 0x07c0, 0x07fa,
- 0x0901, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0954,
- 0x0958, 0x0972,
- 0x097b, 0x097f,
- 0x0981, 0x0983,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bc, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09ce,
- 0x09d7, 0x09d7,
- 0x09dc, 0x09dd,
- 0x09df, 0x09e3,
- 0x09e6, 0x09fa,
- 0x0a01, 0x0a03,
- 0x0a05, 0x0a0a,
- 0x0a0f, 0x0a10,
- 0x0a13, 0x0a28,
- 0x0a2a, 0x0a30,
- 0x0a32, 0x0a33,
- 0x0a35, 0x0a36,
- 0x0a38, 0x0a39,
- 0x0a3c, 0x0a3c,
- 0x0a3e, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4d,
- 0x0a51, 0x0a51,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a66, 0x0a75,
- 0x0a81, 0x0a83,
- 0x0a85, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abc, 0x0ac5,
- 0x0ac7, 0x0ac9,
- 0x0acb, 0x0acd,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae3,
- 0x0ae6, 0x0aef,
- 0x0af1, 0x0af1,
- 0x0b01, 0x0b03,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b35, 0x0b39,
- 0x0b3c, 0x0b44,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b63,
- 0x0b66, 0x0b71,
- 0x0b82, 0x0b83,
- 0x0b85, 0x0b8a,
- 0x0b8e, 0x0b90,
- 0x0b92, 0x0b95,
- 0x0b99, 0x0b9a,
- 0x0b9c, 0x0b9c,
- 0x0b9e, 0x0b9f,
- 0x0ba3, 0x0ba4,
- 0x0ba8, 0x0baa,
- 0x0bae, 0x0bb9,
- 0x0bbe, 0x0bc2,
- 0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcd,
- 0x0bd0, 0x0bd0,
- 0x0bd7, 0x0bd7,
- 0x0be6, 0x0bfa,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3d, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c58, 0x0c59,
- 0x0c60, 0x0c63,
- 0x0c66, 0x0c6f,
- 0x0c78, 0x0c7f,
- 0x0c82, 0x0c83,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbc, 0x0cc4,
- 0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccd,
- 0x0cd5, 0x0cd6,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce3,
- 0x0ce6, 0x0cef,
- 0x0cf1, 0x0cf2,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3d, 0x0d44,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d63,
- 0x0d66, 0x0d75,
- 0x0d79, 0x0d7f,
- 0x0d82, 0x0d83,
- 0x0d85, 0x0d96,
- 0x0d9a, 0x0db1,
- 0x0db3, 0x0dbb,
- 0x0dbd, 0x0dbd,
- 0x0dc0, 0x0dc6,
- 0x0dca, 0x0dca,
- 0x0dcf, 0x0dd4,
- 0x0dd6, 0x0dd6,
- 0x0dd8, 0x0ddf,
- 0x0df2, 0x0df4,
- 0x0e01, 0x0e3a,
- 0x0e3f, 0x0e5b,
- 0x0e81, 0x0e82,
- 0x0e84, 0x0e84,
- 0x0e87, 0x0e88,
- 0x0e8a, 0x0e8a,
- 0x0e8d, 0x0e8d,
- 0x0e94, 0x0e97,
- 0x0e99, 0x0e9f,
- 0x0ea1, 0x0ea3,
- 0x0ea5, 0x0ea5,
- 0x0ea7, 0x0ea7,
- 0x0eaa, 0x0eab,
- 0x0ead, 0x0eb9,
- 0x0ebb, 0x0ebd,
- 0x0ec0, 0x0ec4,
- 0x0ec6, 0x0ec6,
- 0x0ec8, 0x0ecd,
- 0x0ed0, 0x0ed9,
- 0x0edc, 0x0edd,
- 0x0f00, 0x0f47,
- 0x0f49, 0x0f6c,
- 0x0f71, 0x0f8b,
- 0x0f90, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fbe, 0x0fcc,
- 0x0fce, 0x0fd4,
- 0x1000, 0x1099,
- 0x109e, 0x10c5,
- 0x10d0, 0x10fc,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x1200, 0x1248,
- 0x124a, 0x124d,
- 0x1250, 0x1256,
- 0x1258, 0x1258,
- 0x125a, 0x125d,
- 0x1260, 0x1288,
- 0x128a, 0x128d,
- 0x1290, 0x12b0,
- 0x12b2, 0x12b5,
- 0x12b8, 0x12be,
- 0x12c0, 0x12c0,
- 0x12c2, 0x12c5,
- 0x12c8, 0x12d6,
- 0x12d8, 0x1310,
- 0x1312, 0x1315,
- 0x1318, 0x135a,
- 0x135f, 0x137c,
- 0x1380, 0x1399,
- 0x13a0, 0x13f4,
- 0x1401, 0x1676,
- 0x1680, 0x169c,
- 0x16a0, 0x16f0,
- 0x1700, 0x170c,
- 0x170e, 0x1714,
- 0x1720, 0x1736,
- 0x1740, 0x1753,
- 0x1760, 0x176c,
- 0x176e, 0x1770,
- 0x1772, 0x1773,
- 0x1780, 0x17b3,
- 0x17b6, 0x17dd,
- 0x17e0, 0x17e9,
- 0x17f0, 0x17f9,
- 0x1800, 0x180e,
- 0x1810, 0x1819,
- 0x1820, 0x1877,
- 0x1880, 0x18aa,
- 0x1900, 0x191c,
- 0x1920, 0x192b,
- 0x1930, 0x193b,
- 0x1940, 0x1940,
- 0x1944, 0x196d,
- 0x1970, 0x1974,
- 0x1980, 0x19a9,
- 0x19b0, 0x19c9,
- 0x19d0, 0x19d9,
- 0x19de, 0x1a1b,
- 0x1a1e, 0x1a1f,
- 0x1b00, 0x1b4b,
- 0x1b50, 0x1b7c,
- 0x1b80, 0x1baa,
- 0x1bae, 0x1bb9,
- 0x1c00, 0x1c37,
- 0x1c3b, 0x1c49,
- 0x1c4d, 0x1c7f,
- 0x1d00, 0x1de6,
- 0x1dfe, 0x1f15,
- 0x1f18, 0x1f1d,
- 0x1f20, 0x1f45,
- 0x1f48, 0x1f4d,
- 0x1f50, 0x1f57,
- 0x1f59, 0x1f59,
- 0x1f5b, 0x1f5b,
- 0x1f5d, 0x1f5d,
- 0x1f5f, 0x1f7d,
- 0x1f80, 0x1fb4,
- 0x1fb6, 0x1fc4,
- 0x1fc6, 0x1fd3,
- 0x1fd6, 0x1fdb,
- 0x1fdd, 0x1fef,
- 0x1ff2, 0x1ff4,
- 0x1ff6, 0x1ffe,
- 0x2000, 0x200a,
- 0x2010, 0x2029,
- 0x202f, 0x205f,
- 0x2070, 0x2071,
- 0x2074, 0x208e,
- 0x2090, 0x2094,
- 0x20a0, 0x20b5,
- 0x20d0, 0x20f0,
- 0x2100, 0x214f,
- 0x2153, 0x2188,
- 0x2190, 0x23e7,
- 0x2400, 0x2426,
- 0x2440, 0x244a,
- 0x2460, 0x269d,
- 0x26a0, 0x26bc,
- 0x26c0, 0x26c3,
- 0x2701, 0x2704,
- 0x2706, 0x2709,
- 0x270c, 0x2727,
- 0x2729, 0x274b,
- 0x274d, 0x274d,
- 0x274f, 0x2752,
- 0x2756, 0x2756,
- 0x2758, 0x275e,
- 0x2761, 0x2794,
- 0x2798, 0x27af,
- 0x27b1, 0x27be,
- 0x27c0, 0x27ca,
- 0x27cc, 0x27cc,
- 0x27d0, 0x2b4c,
- 0x2b50, 0x2b54,
- 0x2c00, 0x2c2e,
- 0x2c30, 0x2c5e,
- 0x2c60, 0x2c6f,
- 0x2c71, 0x2c7d,
- 0x2c80, 0x2cea,
- 0x2cf9, 0x2d25,
- 0x2d30, 0x2d65,
- 0x2d6f, 0x2d6f,
- 0x2d80, 0x2d96,
- 0x2da0, 0x2da6,
- 0x2da8, 0x2dae,
- 0x2db0, 0x2db6,
- 0x2db8, 0x2dbe,
- 0x2dc0, 0x2dc6,
- 0x2dc8, 0x2dce,
- 0x2dd0, 0x2dd6,
- 0x2dd8, 0x2dde,
- 0x2de0, 0x2e30,
- 0x2e80, 0x2e99,
- 0x2e9b, 0x2ef3,
- 0x2f00, 0x2fd5,
- 0x2ff0, 0x2ffb,
- 0x3000, 0x303f,
- 0x3041, 0x3096,
- 0x3099, 0x30ff,
- 0x3105, 0x312d,
- 0x3131, 0x318e,
- 0x3190, 0x31b7,
- 0x31c0, 0x31e3,
- 0x31f0, 0x321e,
- 0x3220, 0x3243,
- 0x3250, 0x32fe,
- 0x3300, 0x3400,
- 0x4db5, 0x4db5,
- 0x4dc0, 0x4e00,
- 0x9fc3, 0x9fc3,
- 0xa000, 0xa48c,
- 0xa490, 0xa4c6,
- 0xa500, 0xa62b,
- 0xa640, 0xa65f,
- 0xa662, 0xa673,
- 0xa67c, 0xa697,
- 0xa700, 0xa78c,
- 0xa7fb, 0xa82b,
- 0xa840, 0xa877,
- 0xa880, 0xa8c4,
- 0xa8ce, 0xa8d9,
- 0xa900, 0xa953,
- 0xa95f, 0xa95f,
- 0xaa00, 0xaa36,
- 0xaa40, 0xaa4d,
- 0xaa50, 0xaa59,
- 0xaa5c, 0xaa5f,
- 0xac00, 0xac00,
- 0xd7a3, 0xd7a3,
- 0xf900, 0xfa2d,
- 0xfa30, 0xfa6a,
- 0xfa70, 0xfad9,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xfb1d, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbb1,
- 0xfbd3, 0xfd3f,
- 0xfd50, 0xfd8f,
- 0xfd92, 0xfdc7,
- 0xfdf0, 0xfdfd,
- 0xfe00, 0xfe19,
- 0xfe20, 0xfe26,
- 0xfe30, 0xfe52,
- 0xfe54, 0xfe66,
- 0xfe68, 0xfe6b,
- 0xfe70, 0xfe74,
- 0xfe76, 0xfefc,
- 0xff01, 0xffbe,
- 0xffc2, 0xffc7,
- 0xffca, 0xffcf,
- 0xffd2, 0xffd7,
- 0xffda, 0xffdc,
- 0xffe0, 0xffe6,
- 0xffe8, 0xffee,
- 0xfffc, 0xfffd,
- 0x10000, 0x1000b,
- 0x1000d, 0x10026,
- 0x10028, 0x1003a,
- 0x1003c, 0x1003d,
- 0x1003f, 0x1004d,
- 0x10050, 0x1005d,
- 0x10080, 0x100fa,
- 0x10100, 0x10102,
- 0x10107, 0x10133,
- 0x10137, 0x1018a,
- 0x10190, 0x1019b,
- 0x101d0, 0x101fd,
- 0x10280, 0x1029c,
- 0x102a0, 0x102d0,
- 0x10300, 0x1031e,
- 0x10320, 0x10323,
- 0x10330, 0x1034a,
- 0x10380, 0x1039d,
- 0x1039f, 0x103c3,
- 0x103c8, 0x103d5,
- 0x10400, 0x1049d,
- 0x104a0, 0x104a9,
- 0x10800, 0x10805,
- 0x10808, 0x10808,
- 0x1080a, 0x10835,
- 0x10837, 0x10838,
- 0x1083c, 0x1083c,
- 0x1083f, 0x1083f,
- 0x10900, 0x10919,
- 0x1091f, 0x10939,
- 0x1093f, 0x1093f,
- 0x10a00, 0x10a03,
- 0x10a05, 0x10a06,
- 0x10a0c, 0x10a13,
- 0x10a15, 0x10a17,
- 0x10a19, 0x10a33,
- 0x10a38, 0x10a3a,
- 0x10a3f, 0x10a47,
- 0x10a50, 0x10a58,
- 0x12000, 0x1236e,
- 0x12400, 0x12462,
- 0x12470, 0x12473,
- 0x1d000, 0x1d0f5,
- 0x1d100, 0x1d126,
- 0x1d129, 0x1d172,
- 0x1d17b, 0x1d1dd,
- 0x1d200, 0x1d245,
- 0x1d300, 0x1d356,
- 0x1d360, 0x1d371,
- 0x1d400, 0x1d454,
- 0x1d456, 0x1d49c,
- 0x1d49e, 0x1d49f,
- 0x1d4a2, 0x1d4a2,
- 0x1d4a5, 0x1d4a6,
- 0x1d4a9, 0x1d4ac,
- 0x1d4ae, 0x1d4b9,
- 0x1d4bb, 0x1d4bb,
- 0x1d4bd, 0x1d4c3,
- 0x1d4c5, 0x1d505,
- 0x1d507, 0x1d50a,
- 0x1d50d, 0x1d514,
- 0x1d516, 0x1d51c,
- 0x1d51e, 0x1d539,
- 0x1d53b, 0x1d53e,
- 0x1d540, 0x1d544,
- 0x1d546, 0x1d546,
- 0x1d54a, 0x1d550,
- 0x1d552, 0x1d6a5,
- 0x1d6a8, 0x1d7cb,
- 0x1d7ce, 0x1d7ff,
- 0x1f000, 0x1f02b,
- 0x1f030, 0x1f093,
- 0x20000, 0x20000,
- 0x2a6d6, 0x2a6d6,
- 0x2f800, 0x2fa1d,
- 0xe0100, 0xe01ef,
-}; /* CR_Print */
-
-/* 'Punct': [[:Punct:]] */
-static const OnigCodePoint CR_Punct[] = {
- 112,
- 0x0021, 0x0023,
- 0x0025, 0x002a,
- 0x002c, 0x002f,
- 0x003a, 0x003b,
- 0x003f, 0x0040,
- 0x005b, 0x005d,
- 0x005f, 0x005f,
- 0x007b, 0x007b,
- 0x007d, 0x007d,
- 0x00a1, 0x00a1,
- 0x00ab, 0x00ab,
- 0x00b7, 0x00b7,
- 0x00bb, 0x00bb,
- 0x00bf, 0x00bf,
- 0x037e, 0x037e,
- 0x0387, 0x0387,
- 0x055a, 0x055f,
- 0x0589, 0x058a,
- 0x05be, 0x05be,
- 0x05c0, 0x05c0,
- 0x05c3, 0x05c3,
- 0x05c6, 0x05c6,
- 0x05f3, 0x05f4,
- 0x0609, 0x060a,
- 0x060c, 0x060d,
- 0x061b, 0x061b,
- 0x061e, 0x061f,
- 0x066a, 0x066d,
- 0x06d4, 0x06d4,
- 0x0700, 0x070d,
- 0x07f7, 0x07f9,
- 0x0964, 0x0965,
- 0x0970, 0x0970,
- 0x0df4, 0x0df4,
- 0x0e4f, 0x0e4f,
- 0x0e5a, 0x0e5b,
- 0x0f04, 0x0f12,
- 0x0f3a, 0x0f3d,
- 0x0f85, 0x0f85,
- 0x0fd0, 0x0fd4,
- 0x104a, 0x104f,
- 0x10fb, 0x10fb,
- 0x1361, 0x1368,
- 0x166d, 0x166e,
- 0x169b, 0x169c,
- 0x16eb, 0x16ed,
- 0x1735, 0x1736,
- 0x17d4, 0x17d6,
- 0x17d8, 0x17da,
- 0x1800, 0x180a,
- 0x1944, 0x1945,
- 0x19de, 0x19df,
- 0x1a1e, 0x1a1f,
- 0x1b5a, 0x1b60,
- 0x1c3b, 0x1c3f,
- 0x1c7e, 0x1c7f,
- 0x2010, 0x2027,
- 0x2030, 0x2043,
- 0x2045, 0x2051,
- 0x2053, 0x205e,
- 0x207d, 0x207e,
- 0x208d, 0x208e,
- 0x2329, 0x232a,
- 0x2768, 0x2775,
- 0x27c5, 0x27c6,
- 0x27e6, 0x27ef,
- 0x2983, 0x2998,
- 0x29d8, 0x29db,
- 0x29fc, 0x29fd,
- 0x2cf9, 0x2cfc,
- 0x2cfe, 0x2cff,
- 0x2e00, 0x2e2e,
- 0x2e30, 0x2e30,
- 0x3001, 0x3003,
- 0x3008, 0x3011,
- 0x3014, 0x301f,
- 0x3030, 0x3030,
- 0x303d, 0x303d,
- 0x30a0, 0x30a0,
- 0x30fb, 0x30fb,
- 0xa60d, 0xa60f,
- 0xa673, 0xa673,
- 0xa67e, 0xa67e,
- 0xa874, 0xa877,
- 0xa8ce, 0xa8cf,
- 0xa92e, 0xa92f,
- 0xa95f, 0xa95f,
- 0xaa5c, 0xaa5f,
- 0xfd3e, 0xfd3f,
- 0xfe10, 0xfe19,
- 0xfe30, 0xfe52,
- 0xfe54, 0xfe61,
- 0xfe63, 0xfe63,
- 0xfe68, 0xfe68,
- 0xfe6a, 0xfe6b,
- 0xff01, 0xff03,
- 0xff05, 0xff0a,
- 0xff0c, 0xff0f,
- 0xff1a, 0xff1b,
- 0xff1f, 0xff20,
- 0xff3b, 0xff3d,
- 0xff3f, 0xff3f,
- 0xff5b, 0xff5b,
- 0xff5d, 0xff5d,
- 0xff5f, 0xff65,
- 0x10100, 0x10101,
- 0x1039f, 0x1039f,
- 0x103d0, 0x103d0,
- 0x1091f, 0x1091f,
- 0x1093f, 0x1093f,
- 0x10a50, 0x10a58,
- 0x12470, 0x12473,
-}; /* CR_Punct */
-
-/* 'Space': [[:Space:]] */
-static const OnigCodePoint CR_Space[] = {
- 11,
- 0x0009, 0x000d,
- 0x0020, 0x0020,
- 0x0085, 0x0085,
- 0x00a0, 0x00a0,
- 0x1680, 0x1680,
- 0x180e, 0x180e,
- 0x2000, 0x200a,
- 0x2028, 0x2029,
- 0x202f, 0x202f,
- 0x205f, 0x205f,
- 0x3000, 0x3000,
-}; /* CR_Space */
-
-/* 'Upper': [[:Upper:]] */
-static const OnigCodePoint CR_Upper[] = {
- 591,
- 0x0041, 0x005a,
- 0x00c0, 0x00d6,
- 0x00d8, 0x00de,
- 0x0100, 0x0100,
- 0x0102, 0x0102,
- 0x0104, 0x0104,
- 0x0106, 0x0106,
- 0x0108, 0x0108,
- 0x010a, 0x010a,
- 0x010c, 0x010c,
- 0x010e, 0x010e,
- 0x0110, 0x0110,
- 0x0112, 0x0112,
- 0x0114, 0x0114,
- 0x0116, 0x0116,
- 0x0118, 0x0118,
- 0x011a, 0x011a,
- 0x011c, 0x011c,
- 0x011e, 0x011e,
- 0x0120, 0x0120,
- 0x0122, 0x0122,
- 0x0124, 0x0124,
- 0x0126, 0x0126,
- 0x0128, 0x0128,
- 0x012a, 0x012a,
- 0x012c, 0x012c,
- 0x012e, 0x012e,
- 0x0130, 0x0130,
- 0x0132, 0x0132,
- 0x0134, 0x0134,
- 0x0136, 0x0136,
- 0x0139, 0x0139,
- 0x013b, 0x013b,
- 0x013d, 0x013d,
- 0x013f, 0x013f,
- 0x0141, 0x0141,
- 0x0143, 0x0143,
- 0x0145, 0x0145,
- 0x0147, 0x0147,
- 0x014a, 0x014a,
- 0x014c, 0x014c,
- 0x014e, 0x014e,
- 0x0150, 0x0150,
- 0x0152, 0x0152,
- 0x0154, 0x0154,
- 0x0156, 0x0156,
- 0x0158, 0x0158,
- 0x015a, 0x015a,
- 0x015c, 0x015c,
- 0x015e, 0x015e,
- 0x0160, 0x0160,
- 0x0162, 0x0162,
- 0x0164, 0x0164,
- 0x0166, 0x0166,
- 0x0168, 0x0168,
- 0x016a, 0x016a,
- 0x016c, 0x016c,
- 0x016e, 0x016e,
- 0x0170, 0x0170,
- 0x0172, 0x0172,
- 0x0174, 0x0174,
- 0x0176, 0x0176,
- 0x0178, 0x0179,
- 0x017b, 0x017b,
- 0x017d, 0x017d,
- 0x0181, 0x0182,
- 0x0184, 0x0184,
- 0x0186, 0x0187,
- 0x0189, 0x018b,
- 0x018e, 0x0191,
- 0x0193, 0x0194,
- 0x0196, 0x0198,
- 0x019c, 0x019d,
- 0x019f, 0x01a0,
- 0x01a2, 0x01a2,
- 0x01a4, 0x01a4,
- 0x01a6, 0x01a7,
- 0x01a9, 0x01a9,
- 0x01ac, 0x01ac,
- 0x01ae, 0x01af,
- 0x01b1, 0x01b3,
- 0x01b5, 0x01b5,
- 0x01b7, 0x01b8,
- 0x01bc, 0x01bc,
- 0x01c4, 0x01c4,
- 0x01c7, 0x01c7,
- 0x01ca, 0x01ca,
- 0x01cd, 0x01cd,
- 0x01cf, 0x01cf,
- 0x01d1, 0x01d1,
- 0x01d3, 0x01d3,
- 0x01d5, 0x01d5,
- 0x01d7, 0x01d7,
- 0x01d9, 0x01d9,
- 0x01db, 0x01db,
- 0x01de, 0x01de,
- 0x01e0, 0x01e0,
- 0x01e2, 0x01e2,
- 0x01e4, 0x01e4,
- 0x01e6, 0x01e6,
- 0x01e8, 0x01e8,
- 0x01ea, 0x01ea,
- 0x01ec, 0x01ec,
- 0x01ee, 0x01ee,
- 0x01f1, 0x01f1,
- 0x01f4, 0x01f4,
- 0x01f6, 0x01f8,
- 0x01fa, 0x01fa,
- 0x01fc, 0x01fc,
- 0x01fe, 0x01fe,
- 0x0200, 0x0200,
- 0x0202, 0x0202,
- 0x0204, 0x0204,
- 0x0206, 0x0206,
- 0x0208, 0x0208,
- 0x020a, 0x020a,
- 0x020c, 0x020c,
- 0x020e, 0x020e,
- 0x0210, 0x0210,
- 0x0212, 0x0212,
- 0x0214, 0x0214,
- 0x0216, 0x0216,
- 0x0218, 0x0218,
- 0x021a, 0x021a,
- 0x021c, 0x021c,
- 0x021e, 0x021e,
- 0x0220, 0x0220,
- 0x0222, 0x0222,
- 0x0224, 0x0224,
- 0x0226, 0x0226,
- 0x0228, 0x0228,
- 0x022a, 0x022a,
- 0x022c, 0x022c,
- 0x022e, 0x022e,
- 0x0230, 0x0230,
- 0x0232, 0x0232,
- 0x023a, 0x023b,
- 0x023d, 0x023e,
- 0x0241, 0x0241,
- 0x0243, 0x0246,
- 0x0248, 0x0248,
- 0x024a, 0x024a,
- 0x024c, 0x024c,
- 0x024e, 0x024e,
- 0x0370, 0x0370,
- 0x0372, 0x0372,
- 0x0376, 0x0376,
- 0x0386, 0x0386,
- 0x0388, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x038f,
- 0x0391, 0x03a1,
- 0x03a3, 0x03ab,
- 0x03cf, 0x03cf,
- 0x03d2, 0x03d4,
- 0x03d8, 0x03d8,
- 0x03da, 0x03da,
- 0x03dc, 0x03dc,
- 0x03de, 0x03de,
- 0x03e0, 0x03e0,
- 0x03e2, 0x03e2,
- 0x03e4, 0x03e4,
- 0x03e6, 0x03e6,
- 0x03e8, 0x03e8,
- 0x03ea, 0x03ea,
- 0x03ec, 0x03ec,
- 0x03ee, 0x03ee,
- 0x03f4, 0x03f4,
- 0x03f7, 0x03f7,
- 0x03f9, 0x03fa,
- 0x03fd, 0x042f,
- 0x0460, 0x0460,
- 0x0462, 0x0462,
- 0x0464, 0x0464,
- 0x0466, 0x0466,
- 0x0468, 0x0468,
- 0x046a, 0x046a,
- 0x046c, 0x046c,
- 0x046e, 0x046e,
- 0x0470, 0x0470,
- 0x0472, 0x0472,
- 0x0474, 0x0474,
- 0x0476, 0x0476,
- 0x0478, 0x0478,
- 0x047a, 0x047a,
- 0x047c, 0x047c,
- 0x047e, 0x047e,
- 0x0480, 0x0480,
- 0x048a, 0x048a,
- 0x048c, 0x048c,
- 0x048e, 0x048e,
- 0x0490, 0x0490,
- 0x0492, 0x0492,
- 0x0494, 0x0494,
- 0x0496, 0x0496,
- 0x0498, 0x0498,
- 0x049a, 0x049a,
- 0x049c, 0x049c,
- 0x049e, 0x049e,
- 0x04a0, 0x04a0,
- 0x04a2, 0x04a2,
- 0x04a4, 0x04a4,
- 0x04a6, 0x04a6,
- 0x04a8, 0x04a8,
- 0x04aa, 0x04aa,
- 0x04ac, 0x04ac,
- 0x04ae, 0x04ae,
- 0x04b0, 0x04b0,
- 0x04b2, 0x04b2,
- 0x04b4, 0x04b4,
- 0x04b6, 0x04b6,
- 0x04b8, 0x04b8,
- 0x04ba, 0x04ba,
- 0x04bc, 0x04bc,
- 0x04be, 0x04be,
- 0x04c0, 0x04c1,
- 0x04c3, 0x04c3,
- 0x04c5, 0x04c5,
- 0x04c7, 0x04c7,
- 0x04c9, 0x04c9,
- 0x04cb, 0x04cb,
- 0x04cd, 0x04cd,
- 0x04d0, 0x04d0,
- 0x04d2, 0x04d2,
- 0x04d4, 0x04d4,
- 0x04d6, 0x04d6,
- 0x04d8, 0x04d8,
- 0x04da, 0x04da,
- 0x04dc, 0x04dc,
- 0x04de, 0x04de,
- 0x04e0, 0x04e0,
- 0x04e2, 0x04e2,
- 0x04e4, 0x04e4,
- 0x04e6, 0x04e6,
- 0x04e8, 0x04e8,
- 0x04ea, 0x04ea,
- 0x04ec, 0x04ec,
- 0x04ee, 0x04ee,
- 0x04f0, 0x04f0,
- 0x04f2, 0x04f2,
- 0x04f4, 0x04f4,
- 0x04f6, 0x04f6,
- 0x04f8, 0x04f8,
- 0x04fa, 0x04fa,
- 0x04fc, 0x04fc,
- 0x04fe, 0x04fe,
- 0x0500, 0x0500,
- 0x0502, 0x0502,
- 0x0504, 0x0504,
- 0x0506, 0x0506,
- 0x0508, 0x0508,
- 0x050a, 0x050a,
- 0x050c, 0x050c,
- 0x050e, 0x050e,
- 0x0510, 0x0510,
- 0x0512, 0x0512,
- 0x0514, 0x0514,
- 0x0516, 0x0516,
- 0x0518, 0x0518,
- 0x051a, 0x051a,
- 0x051c, 0x051c,
- 0x051e, 0x051e,
- 0x0520, 0x0520,
- 0x0522, 0x0522,
- 0x0531, 0x0556,
- 0x10a0, 0x10c5,
- 0x1e00, 0x1e00,
- 0x1e02, 0x1e02,
- 0x1e04, 0x1e04,
- 0x1e06, 0x1e06,
- 0x1e08, 0x1e08,
- 0x1e0a, 0x1e0a,
- 0x1e0c, 0x1e0c,
- 0x1e0e, 0x1e0e,
- 0x1e10, 0x1e10,
- 0x1e12, 0x1e12,
- 0x1e14, 0x1e14,
- 0x1e16, 0x1e16,
- 0x1e18, 0x1e18,
- 0x1e1a, 0x1e1a,
- 0x1e1c, 0x1e1c,
- 0x1e1e, 0x1e1e,
- 0x1e20, 0x1e20,
- 0x1e22, 0x1e22,
- 0x1e24, 0x1e24,
- 0x1e26, 0x1e26,
- 0x1e28, 0x1e28,
- 0x1e2a, 0x1e2a,
- 0x1e2c, 0x1e2c,
- 0x1e2e, 0x1e2e,
- 0x1e30, 0x1e30,
- 0x1e32, 0x1e32,
- 0x1e34, 0x1e34,
- 0x1e36, 0x1e36,
- 0x1e38, 0x1e38,
- 0x1e3a, 0x1e3a,
- 0x1e3c, 0x1e3c,
- 0x1e3e, 0x1e3e,
- 0x1e40, 0x1e40,
- 0x1e42, 0x1e42,
- 0x1e44, 0x1e44,
- 0x1e46, 0x1e46,
- 0x1e48, 0x1e48,
- 0x1e4a, 0x1e4a,
- 0x1e4c, 0x1e4c,
- 0x1e4e, 0x1e4e,
- 0x1e50, 0x1e50,
- 0x1e52, 0x1e52,
- 0x1e54, 0x1e54,
- 0x1e56, 0x1e56,
- 0x1e58, 0x1e58,
- 0x1e5a, 0x1e5a,
- 0x1e5c, 0x1e5c,
- 0x1e5e, 0x1e5e,
- 0x1e60, 0x1e60,
- 0x1e62, 0x1e62,
- 0x1e64, 0x1e64,
- 0x1e66, 0x1e66,
- 0x1e68, 0x1e68,
- 0x1e6a, 0x1e6a,
- 0x1e6c, 0x1e6c,
- 0x1e6e, 0x1e6e,
- 0x1e70, 0x1e70,
- 0x1e72, 0x1e72,
- 0x1e74, 0x1e74,
- 0x1e76, 0x1e76,
- 0x1e78, 0x1e78,
- 0x1e7a, 0x1e7a,
- 0x1e7c, 0x1e7c,
- 0x1e7e, 0x1e7e,
- 0x1e80, 0x1e80,
- 0x1e82, 0x1e82,
- 0x1e84, 0x1e84,
- 0x1e86, 0x1e86,
- 0x1e88, 0x1e88,
- 0x1e8a, 0x1e8a,
- 0x1e8c, 0x1e8c,
- 0x1e8e, 0x1e8e,
- 0x1e90, 0x1e90,
- 0x1e92, 0x1e92,
- 0x1e94, 0x1e94,
- 0x1e9e, 0x1e9e,
- 0x1ea0, 0x1ea0,
- 0x1ea2, 0x1ea2,
- 0x1ea4, 0x1ea4,
- 0x1ea6, 0x1ea6,
- 0x1ea8, 0x1ea8,
- 0x1eaa, 0x1eaa,
- 0x1eac, 0x1eac,
- 0x1eae, 0x1eae,
- 0x1eb0, 0x1eb0,
- 0x1eb2, 0x1eb2,
- 0x1eb4, 0x1eb4,
- 0x1eb6, 0x1eb6,
- 0x1eb8, 0x1eb8,
- 0x1eba, 0x1eba,
- 0x1ebc, 0x1ebc,
- 0x1ebe, 0x1ebe,
- 0x1ec0, 0x1ec0,
- 0x1ec2, 0x1ec2,
- 0x1ec4, 0x1ec4,
- 0x1ec6, 0x1ec6,
- 0x1ec8, 0x1ec8,
- 0x1eca, 0x1eca,
- 0x1ecc, 0x1ecc,
- 0x1ece, 0x1ece,
- 0x1ed0, 0x1ed0,
- 0x1ed2, 0x1ed2,
- 0x1ed4, 0x1ed4,
- 0x1ed6, 0x1ed6,
- 0x1ed8, 0x1ed8,
- 0x1eda, 0x1eda,
- 0x1edc, 0x1edc,
- 0x1ede, 0x1ede,
- 0x1ee0, 0x1ee0,
- 0x1ee2, 0x1ee2,
- 0x1ee4, 0x1ee4,
- 0x1ee6, 0x1ee6,
- 0x1ee8, 0x1ee8,
- 0x1eea, 0x1eea,
- 0x1eec, 0x1eec,
- 0x1eee, 0x1eee,
- 0x1ef0, 0x1ef0,
- 0x1ef2, 0x1ef2,
- 0x1ef4, 0x1ef4,
- 0x1ef6, 0x1ef6,
- 0x1ef8, 0x1ef8,
- 0x1efa, 0x1efa,
- 0x1efc, 0x1efc,
- 0x1efe, 0x1efe,
- 0x1f08, 0x1f0f,
- 0x1f18, 0x1f1d,
- 0x1f28, 0x1f2f,
- 0x1f38, 0x1f3f,
- 0x1f48, 0x1f4d,
- 0x1f59, 0x1f59,
- 0x1f5b, 0x1f5b,
- 0x1f5d, 0x1f5d,
- 0x1f5f, 0x1f5f,
- 0x1f68, 0x1f6f,
- 0x1fb8, 0x1fbb,
- 0x1fc8, 0x1fcb,
- 0x1fd8, 0x1fdb,
- 0x1fe8, 0x1fec,
- 0x1ff8, 0x1ffb,
- 0x2102, 0x2102,
- 0x2107, 0x2107,
- 0x210b, 0x210d,
- 0x2110, 0x2112,
- 0x2115, 0x2115,
- 0x2119, 0x211d,
- 0x2124, 0x2124,
- 0x2126, 0x2126,
- 0x2128, 0x2128,
- 0x212a, 0x212d,
- 0x2130, 0x2133,
- 0x213e, 0x213f,
- 0x2145, 0x2145,
- 0x2183, 0x2183,
- 0x2c00, 0x2c2e,
- 0x2c60, 0x2c60,
- 0x2c62, 0x2c64,
- 0x2c67, 0x2c67,
- 0x2c69, 0x2c69,
- 0x2c6b, 0x2c6b,
- 0x2c6d, 0x2c6f,
- 0x2c72, 0x2c72,
- 0x2c75, 0x2c75,
- 0x2c80, 0x2c80,
- 0x2c82, 0x2c82,
- 0x2c84, 0x2c84,
- 0x2c86, 0x2c86,
- 0x2c88, 0x2c88,
- 0x2c8a, 0x2c8a,
- 0x2c8c, 0x2c8c,
- 0x2c8e, 0x2c8e,
- 0x2c90, 0x2c90,
- 0x2c92, 0x2c92,
- 0x2c94, 0x2c94,
- 0x2c96, 0x2c96,
- 0x2c98, 0x2c98,
- 0x2c9a, 0x2c9a,
- 0x2c9c, 0x2c9c,
- 0x2c9e, 0x2c9e,
- 0x2ca0, 0x2ca0,
- 0x2ca2, 0x2ca2,
- 0x2ca4, 0x2ca4,
- 0x2ca6, 0x2ca6,
- 0x2ca8, 0x2ca8,
- 0x2caa, 0x2caa,
- 0x2cac, 0x2cac,
- 0x2cae, 0x2cae,
- 0x2cb0, 0x2cb0,
- 0x2cb2, 0x2cb2,
- 0x2cb4, 0x2cb4,
- 0x2cb6, 0x2cb6,
- 0x2cb8, 0x2cb8,
- 0x2cba, 0x2cba,
- 0x2cbc, 0x2cbc,
- 0x2cbe, 0x2cbe,
- 0x2cc0, 0x2cc0,
- 0x2cc2, 0x2cc2,
- 0x2cc4, 0x2cc4,
- 0x2cc6, 0x2cc6,
- 0x2cc8, 0x2cc8,
- 0x2cca, 0x2cca,
- 0x2ccc, 0x2ccc,
- 0x2cce, 0x2cce,
- 0x2cd0, 0x2cd0,
- 0x2cd2, 0x2cd2,
- 0x2cd4, 0x2cd4,
- 0x2cd6, 0x2cd6,
- 0x2cd8, 0x2cd8,
- 0x2cda, 0x2cda,
- 0x2cdc, 0x2cdc,
- 0x2cde, 0x2cde,
- 0x2ce0, 0x2ce0,
- 0x2ce2, 0x2ce2,
- 0xa640, 0xa640,
- 0xa642, 0xa642,
- 0xa644, 0xa644,
- 0xa646, 0xa646,
- 0xa648, 0xa648,
- 0xa64a, 0xa64a,
- 0xa64c, 0xa64c,
- 0xa64e, 0xa64e,
- 0xa650, 0xa650,
- 0xa652, 0xa652,
- 0xa654, 0xa654,
- 0xa656, 0xa656,
- 0xa658, 0xa658,
- 0xa65a, 0xa65a,
- 0xa65c, 0xa65c,
- 0xa65e, 0xa65e,
- 0xa662, 0xa662,
- 0xa664, 0xa664,
- 0xa666, 0xa666,
- 0xa668, 0xa668,
- 0xa66a, 0xa66a,
- 0xa66c, 0xa66c,
- 0xa680, 0xa680,
- 0xa682, 0xa682,
- 0xa684, 0xa684,
- 0xa686, 0xa686,
- 0xa688, 0xa688,
- 0xa68a, 0xa68a,
- 0xa68c, 0xa68c,
- 0xa68e, 0xa68e,
- 0xa690, 0xa690,
- 0xa692, 0xa692,
- 0xa694, 0xa694,
- 0xa696, 0xa696,
- 0xa722, 0xa722,
- 0xa724, 0xa724,
- 0xa726, 0xa726,
- 0xa728, 0xa728,
- 0xa72a, 0xa72a,
- 0xa72c, 0xa72c,
- 0xa72e, 0xa72e,
- 0xa732, 0xa732,
- 0xa734, 0xa734,
- 0xa736, 0xa736,
- 0xa738, 0xa738,
- 0xa73a, 0xa73a,
- 0xa73c, 0xa73c,
- 0xa73e, 0xa73e,
- 0xa740, 0xa740,
- 0xa742, 0xa742,
- 0xa744, 0xa744,
- 0xa746, 0xa746,
- 0xa748, 0xa748,
- 0xa74a, 0xa74a,
- 0xa74c, 0xa74c,
- 0xa74e, 0xa74e,
- 0xa750, 0xa750,
- 0xa752, 0xa752,
- 0xa754, 0xa754,
- 0xa756, 0xa756,
- 0xa758, 0xa758,
- 0xa75a, 0xa75a,
- 0xa75c, 0xa75c,
- 0xa75e, 0xa75e,
- 0xa760, 0xa760,
- 0xa762, 0xa762,
- 0xa764, 0xa764,
- 0xa766, 0xa766,
- 0xa768, 0xa768,
- 0xa76a, 0xa76a,
- 0xa76c, 0xa76c,
- 0xa76e, 0xa76e,
- 0xa779, 0xa779,
- 0xa77b, 0xa77b,
- 0xa77d, 0xa77e,
- 0xa780, 0xa780,
- 0xa782, 0xa782,
- 0xa784, 0xa784,
- 0xa786, 0xa786,
- 0xa78b, 0xa78b,
- 0xff21, 0xff3a,
- 0x10400, 0x10427,
- 0x1d400, 0x1d419,
- 0x1d434, 0x1d44d,
- 0x1d468, 0x1d481,
- 0x1d49c, 0x1d49c,
- 0x1d49e, 0x1d49f,
- 0x1d4a2, 0x1d4a2,
- 0x1d4a5, 0x1d4a6,
- 0x1d4a9, 0x1d4ac,
- 0x1d4ae, 0x1d4b5,
- 0x1d4d0, 0x1d4e9,
- 0x1d504, 0x1d505,
- 0x1d507, 0x1d50a,
- 0x1d50d, 0x1d514,
- 0x1d516, 0x1d51c,
- 0x1d538, 0x1d539,
- 0x1d53b, 0x1d53e,
- 0x1d540, 0x1d544,
- 0x1d546, 0x1d546,
- 0x1d54a, 0x1d550,
- 0x1d56c, 0x1d585,
- 0x1d5a0, 0x1d5b9,
- 0x1d5d4, 0x1d5ed,
- 0x1d608, 0x1d621,
- 0x1d63c, 0x1d655,
- 0x1d670, 0x1d689,
- 0x1d6a8, 0x1d6c0,
- 0x1d6e2, 0x1d6fa,
- 0x1d71c, 0x1d734,
- 0x1d756, 0x1d76e,
- 0x1d790, 0x1d7a8,
- 0x1d7ca, 0x1d7ca,
-}; /* CR_Upper */
-
-/* 'XDigit': [[:XDigit:]] */
-static const OnigCodePoint CR_XDigit[] = {
- 3,
- 0x0030, 0x0039,
- 0x0041, 0x0046,
- 0x0061, 0x0066,
-}; /* CR_XDigit */
-
-/* 'Word': [[:Word:]] */
-static const OnigCodePoint CR_Word[] = {
- 477,
- 0x0030, 0x0039,
- 0x0041, 0x005a,
- 0x005f, 0x005f,
- 0x0061, 0x007a,
- 0x00aa, 0x00aa,
- 0x00b5, 0x00b5,
- 0x00ba, 0x00ba,
- 0x00c0, 0x00d6,
- 0x00d8, 0x00f6,
- 0x00f8, 0x02c1,
- 0x02c6, 0x02d1,
- 0x02e0, 0x02e4,
- 0x02ec, 0x02ec,
- 0x02ee, 0x02ee,
- 0x0300, 0x0374,
- 0x0376, 0x0377,
- 0x037a, 0x037d,
- 0x0386, 0x0386,
- 0x0388, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03f5,
- 0x03f7, 0x0481,
- 0x0483, 0x0523,
- 0x0531, 0x0556,
- 0x0559, 0x0559,
- 0x0561, 0x0587,
- 0x0591, 0x05bd,
- 0x05bf, 0x05bf,
- 0x05c1, 0x05c2,
- 0x05c4, 0x05c5,
- 0x05c7, 0x05c7,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f2,
- 0x0610, 0x061a,
- 0x0621, 0x065e,
- 0x0660, 0x0669,
- 0x066e, 0x06d3,
- 0x06d5, 0x06dc,
- 0x06de, 0x06e8,
- 0x06ea, 0x06fc,
- 0x06ff, 0x06ff,
- 0x0710, 0x074a,
- 0x074d, 0x07b1,
- 0x07c0, 0x07f5,
- 0x07fa, 0x07fa,
- 0x0901, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0954,
- 0x0958, 0x0963,
- 0x0966, 0x096f,
- 0x0971, 0x0972,
- 0x097b, 0x097f,
- 0x0981, 0x0983,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bc, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09ce,
- 0x09d7, 0x09d7,
- 0x09dc, 0x09dd,
- 0x09df, 0x09e3,
- 0x09e6, 0x09f1,
- 0x0a01, 0x0a03,
- 0x0a05, 0x0a0a,
- 0x0a0f, 0x0a10,
- 0x0a13, 0x0a28,
- 0x0a2a, 0x0a30,
- 0x0a32, 0x0a33,
- 0x0a35, 0x0a36,
- 0x0a38, 0x0a39,
- 0x0a3c, 0x0a3c,
- 0x0a3e, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4d,
- 0x0a51, 0x0a51,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a66, 0x0a75,
- 0x0a81, 0x0a83,
- 0x0a85, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abc, 0x0ac5,
- 0x0ac7, 0x0ac9,
- 0x0acb, 0x0acd,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae3,
- 0x0ae6, 0x0aef,
- 0x0b01, 0x0b03,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b35, 0x0b39,
- 0x0b3c, 0x0b44,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b63,
- 0x0b66, 0x0b6f,
- 0x0b71, 0x0b71,
- 0x0b82, 0x0b83,
- 0x0b85, 0x0b8a,
- 0x0b8e, 0x0b90,
- 0x0b92, 0x0b95,
- 0x0b99, 0x0b9a,
- 0x0b9c, 0x0b9c,
- 0x0b9e, 0x0b9f,
- 0x0ba3, 0x0ba4,
- 0x0ba8, 0x0baa,
- 0x0bae, 0x0bb9,
- 0x0bbe, 0x0bc2,
- 0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcd,
- 0x0bd0, 0x0bd0,
- 0x0bd7, 0x0bd7,
- 0x0be6, 0x0bef,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3d, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c58, 0x0c59,
- 0x0c60, 0x0c63,
- 0x0c66, 0x0c6f,
- 0x0c82, 0x0c83,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbc, 0x0cc4,
- 0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccd,
- 0x0cd5, 0x0cd6,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce3,
- 0x0ce6, 0x0cef,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3d, 0x0d44,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d63,
- 0x0d66, 0x0d6f,
- 0x0d7a, 0x0d7f,
- 0x0d82, 0x0d83,
- 0x0d85, 0x0d96,
- 0x0d9a, 0x0db1,
- 0x0db3, 0x0dbb,
- 0x0dbd, 0x0dbd,
- 0x0dc0, 0x0dc6,
- 0x0dca, 0x0dca,
- 0x0dcf, 0x0dd4,
- 0x0dd6, 0x0dd6,
- 0x0dd8, 0x0ddf,
- 0x0df2, 0x0df3,
- 0x0e01, 0x0e3a,
- 0x0e40, 0x0e4e,
- 0x0e50, 0x0e59,
- 0x0e81, 0x0e82,
- 0x0e84, 0x0e84,
- 0x0e87, 0x0e88,
- 0x0e8a, 0x0e8a,
- 0x0e8d, 0x0e8d,
- 0x0e94, 0x0e97,
- 0x0e99, 0x0e9f,
- 0x0ea1, 0x0ea3,
- 0x0ea5, 0x0ea5,
- 0x0ea7, 0x0ea7,
- 0x0eaa, 0x0eab,
- 0x0ead, 0x0eb9,
- 0x0ebb, 0x0ebd,
- 0x0ec0, 0x0ec4,
- 0x0ec6, 0x0ec6,
- 0x0ec8, 0x0ecd,
- 0x0ed0, 0x0ed9,
- 0x0edc, 0x0edd,
- 0x0f00, 0x0f00,
- 0x0f18, 0x0f19,
- 0x0f20, 0x0f29,
- 0x0f35, 0x0f35,
- 0x0f37, 0x0f37,
- 0x0f39, 0x0f39,
- 0x0f3e, 0x0f47,
- 0x0f49, 0x0f6c,
- 0x0f71, 0x0f84,
- 0x0f86, 0x0f8b,
- 0x0f90, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fc6, 0x0fc6,
- 0x1000, 0x1049,
- 0x1050, 0x1099,
- 0x10a0, 0x10c5,
- 0x10d0, 0x10fa,
- 0x10fc, 0x10fc,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x1200, 0x1248,
- 0x124a, 0x124d,
- 0x1250, 0x1256,
- 0x1258, 0x1258,
- 0x125a, 0x125d,
- 0x1260, 0x1288,
- 0x128a, 0x128d,
- 0x1290, 0x12b0,
- 0x12b2, 0x12b5,
- 0x12b8, 0x12be,
- 0x12c0, 0x12c0,
- 0x12c2, 0x12c5,
- 0x12c8, 0x12d6,
- 0x12d8, 0x1310,
- 0x1312, 0x1315,
- 0x1318, 0x135a,
- 0x135f, 0x135f,
- 0x1380, 0x138f,
- 0x13a0, 0x13f4,
- 0x1401, 0x166c,
- 0x166f, 0x1676,
- 0x1681, 0x169a,
- 0x16a0, 0x16ea,
- 0x1700, 0x170c,
- 0x170e, 0x1714,
- 0x1720, 0x1734,
- 0x1740, 0x1753,
- 0x1760, 0x176c,
- 0x176e, 0x1770,
- 0x1772, 0x1773,
- 0x1780, 0x17b3,
- 0x17b6, 0x17d3,
- 0x17d7, 0x17d7,
- 0x17dc, 0x17dd,
- 0x17e0, 0x17e9,
- 0x180b, 0x180d,
- 0x1810, 0x1819,
- 0x1820, 0x1877,
- 0x1880, 0x18aa,
- 0x1900, 0x191c,
- 0x1920, 0x192b,
- 0x1930, 0x193b,
- 0x1946, 0x196d,
- 0x1970, 0x1974,
- 0x1980, 0x19a9,
- 0x19b0, 0x19c9,
- 0x19d0, 0x19d9,
- 0x1a00, 0x1a1b,
- 0x1b00, 0x1b4b,
- 0x1b50, 0x1b59,
- 0x1b6b, 0x1b73,
- 0x1b80, 0x1baa,
- 0x1bae, 0x1bb9,
- 0x1c00, 0x1c37,
- 0x1c40, 0x1c49,
- 0x1c4d, 0x1c7d,
- 0x1d00, 0x1de6,
- 0x1dfe, 0x1f15,
- 0x1f18, 0x1f1d,
- 0x1f20, 0x1f45,
- 0x1f48, 0x1f4d,
- 0x1f50, 0x1f57,
- 0x1f59, 0x1f59,
- 0x1f5b, 0x1f5b,
- 0x1f5d, 0x1f5d,
- 0x1f5f, 0x1f7d,
- 0x1f80, 0x1fb4,
- 0x1fb6, 0x1fbc,
- 0x1fbe, 0x1fbe,
- 0x1fc2, 0x1fc4,
- 0x1fc6, 0x1fcc,
- 0x1fd0, 0x1fd3,
- 0x1fd6, 0x1fdb,
- 0x1fe0, 0x1fec,
- 0x1ff2, 0x1ff4,
- 0x1ff6, 0x1ffc,
- 0x203f, 0x2040,
- 0x2054, 0x2054,
- 0x2071, 0x2071,
- 0x207f, 0x207f,
- 0x2090, 0x2094,
- 0x20d0, 0x20f0,
- 0x2102, 0x2102,
- 0x2107, 0x2107,
- 0x210a, 0x2113,
- 0x2115, 0x2115,
- 0x2119, 0x211d,
- 0x2124, 0x2124,
- 0x2126, 0x2126,
- 0x2128, 0x2128,
- 0x212a, 0x212d,
- 0x212f, 0x2139,
- 0x213c, 0x213f,
- 0x2145, 0x2149,
- 0x214e, 0x214e,
- 0x2183, 0x2184,
- 0x2c00, 0x2c2e,
- 0x2c30, 0x2c5e,
- 0x2c60, 0x2c6f,
- 0x2c71, 0x2c7d,
- 0x2c80, 0x2ce4,
- 0x2d00, 0x2d25,
- 0x2d30, 0x2d65,
- 0x2d6f, 0x2d6f,
- 0x2d80, 0x2d96,
- 0x2da0, 0x2da6,
- 0x2da8, 0x2dae,
- 0x2db0, 0x2db6,
- 0x2db8, 0x2dbe,
- 0x2dc0, 0x2dc6,
- 0x2dc8, 0x2dce,
- 0x2dd0, 0x2dd6,
- 0x2dd8, 0x2dde,
- 0x2de0, 0x2dff,
- 0x2e2f, 0x2e2f,
- 0x3005, 0x3006,
- 0x302a, 0x302f,
- 0x3031, 0x3035,
- 0x303b, 0x303c,
- 0x3041, 0x3096,
- 0x3099, 0x309a,
- 0x309d, 0x309f,
- 0x30a1, 0x30fa,
- 0x30fc, 0x30ff,
- 0x3105, 0x312d,
- 0x3131, 0x318e,
- 0x31a0, 0x31b7,
- 0x31f0, 0x31ff,
- 0x3400, 0x3400,
- 0x4db5, 0x4db5,
- 0x4e00, 0x4e00,
- 0x9fc3, 0x9fc3,
- 0xa000, 0xa48c,
- 0xa500, 0xa60c,
- 0xa610, 0xa62b,
- 0xa640, 0xa65f,
- 0xa662, 0xa672,
- 0xa67c, 0xa67d,
- 0xa67f, 0xa697,
- 0xa717, 0xa71f,
- 0xa722, 0xa788,
- 0xa78b, 0xa78c,
- 0xa7fb, 0xa827,
- 0xa840, 0xa873,
- 0xa880, 0xa8c4,
- 0xa8d0, 0xa8d9,
- 0xa900, 0xa92d,
- 0xa930, 0xa953,
- 0xaa00, 0xaa36,
- 0xaa40, 0xaa4d,
- 0xaa50, 0xaa59,
- 0xac00, 0xac00,
- 0xd7a3, 0xd7a3,
- 0xf900, 0xfa2d,
- 0xfa30, 0xfa6a,
- 0xfa70, 0xfad9,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xfb1d, 0xfb28,
- 0xfb2a, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbb1,
- 0xfbd3, 0xfd3d,
- 0xfd50, 0xfd8f,
- 0xfd92, 0xfdc7,
- 0xfdf0, 0xfdfb,
- 0xfe00, 0xfe0f,
- 0xfe20, 0xfe26,
- 0xfe33, 0xfe34,
- 0xfe4d, 0xfe4f,
- 0xfe70, 0xfe74,
- 0xfe76, 0xfefc,
- 0xff10, 0xff19,
- 0xff21, 0xff3a,
- 0xff3f, 0xff3f,
- 0xff41, 0xff5a,
- 0xff66, 0xffbe,
- 0xffc2, 0xffc7,
- 0xffca, 0xffcf,
- 0xffd2, 0xffd7,
- 0xffda, 0xffdc,
- 0x10000, 0x1000b,
- 0x1000d, 0x10026,
- 0x10028, 0x1003a,
- 0x1003c, 0x1003d,
- 0x1003f, 0x1004d,
- 0x10050, 0x1005d,
- 0x10080, 0x100fa,
- 0x101fd, 0x101fd,
- 0x10280, 0x1029c,
- 0x102a0, 0x102d0,
- 0x10300, 0x1031e,
- 0x10330, 0x10340,
- 0x10342, 0x10349,
- 0x10380, 0x1039d,
- 0x103a0, 0x103c3,
- 0x103c8, 0x103cf,
- 0x10400, 0x1049d,
- 0x104a0, 0x104a9,
- 0x10800, 0x10805,
- 0x10808, 0x10808,
- 0x1080a, 0x10835,
- 0x10837, 0x10838,
- 0x1083c, 0x1083c,
- 0x1083f, 0x1083f,
- 0x10900, 0x10915,
- 0x10920, 0x10939,
- 0x10a00, 0x10a03,
- 0x10a05, 0x10a06,
- 0x10a0c, 0x10a13,
- 0x10a15, 0x10a17,
- 0x10a19, 0x10a33,
- 0x10a38, 0x10a3a,
- 0x10a3f, 0x10a3f,
- 0x12000, 0x1236e,
- 0x1d165, 0x1d169,
- 0x1d16d, 0x1d172,
- 0x1d17b, 0x1d182,
- 0x1d185, 0x1d18b,
- 0x1d1aa, 0x1d1ad,
- 0x1d242, 0x1d244,
- 0x1d400, 0x1d454,
- 0x1d456, 0x1d49c,
- 0x1d49e, 0x1d49f,
- 0x1d4a2, 0x1d4a2,
- 0x1d4a5, 0x1d4a6,
- 0x1d4a9, 0x1d4ac,
- 0x1d4ae, 0x1d4b9,
- 0x1d4bb, 0x1d4bb,
- 0x1d4bd, 0x1d4c3,
- 0x1d4c5, 0x1d505,
- 0x1d507, 0x1d50a,
- 0x1d50d, 0x1d514,
- 0x1d516, 0x1d51c,
- 0x1d51e, 0x1d539,
- 0x1d53b, 0x1d53e,
- 0x1d540, 0x1d544,
- 0x1d546, 0x1d546,
- 0x1d54a, 0x1d550,
- 0x1d552, 0x1d6a5,
- 0x1d6a8, 0x1d6c0,
- 0x1d6c2, 0x1d6da,
- 0x1d6dc, 0x1d6fa,
- 0x1d6fc, 0x1d714,
- 0x1d716, 0x1d734,
- 0x1d736, 0x1d74e,
- 0x1d750, 0x1d76e,
- 0x1d770, 0x1d788,
- 0x1d78a, 0x1d7a8,
- 0x1d7aa, 0x1d7c2,
- 0x1d7c4, 0x1d7cb,
- 0x1d7ce, 0x1d7ff,
- 0x20000, 0x20000,
- 0x2a6d6, 0x2a6d6,
- 0x2f800, 0x2fa1d,
- 0xe0100, 0xe01ef,
-}; /* CR_Word */
-
-/* 'Alnum': [[:Alnum:]] */
-static const OnigCodePoint CR_Alnum[] = {
- 471,
- 0x0030, 0x0039,
- 0x0041, 0x005a,
- 0x0061, 0x007a,
- 0x00aa, 0x00aa,
- 0x00b5, 0x00b5,
- 0x00ba, 0x00ba,
- 0x00c0, 0x00d6,
- 0x00d8, 0x00f6,
- 0x00f8, 0x02c1,
- 0x02c6, 0x02d1,
- 0x02e0, 0x02e4,
- 0x02ec, 0x02ec,
- 0x02ee, 0x02ee,
- 0x0300, 0x0374,
- 0x0376, 0x0377,
- 0x037a, 0x037d,
- 0x0386, 0x0386,
- 0x0388, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03f5,
- 0x03f7, 0x0481,
- 0x0483, 0x0523,
- 0x0531, 0x0556,
- 0x0559, 0x0559,
- 0x0561, 0x0587,
- 0x0591, 0x05bd,
- 0x05bf, 0x05bf,
- 0x05c1, 0x05c2,
- 0x05c4, 0x05c5,
- 0x05c7, 0x05c7,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f2,
- 0x0610, 0x061a,
- 0x0621, 0x065e,
- 0x0660, 0x0669,
- 0x066e, 0x06d3,
- 0x06d5, 0x06dc,
- 0x06de, 0x06e8,
- 0x06ea, 0x06fc,
- 0x06ff, 0x06ff,
- 0x0710, 0x074a,
- 0x074d, 0x07b1,
- 0x07c0, 0x07f5,
- 0x07fa, 0x07fa,
- 0x0901, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0954,
- 0x0958, 0x0963,
- 0x0966, 0x096f,
- 0x0971, 0x0972,
- 0x097b, 0x097f,
- 0x0981, 0x0983,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bc, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09ce,
- 0x09d7, 0x09d7,
- 0x09dc, 0x09dd,
- 0x09df, 0x09e3,
- 0x09e6, 0x09f1,
- 0x0a01, 0x0a03,
- 0x0a05, 0x0a0a,
- 0x0a0f, 0x0a10,
- 0x0a13, 0x0a28,
- 0x0a2a, 0x0a30,
- 0x0a32, 0x0a33,
- 0x0a35, 0x0a36,
- 0x0a38, 0x0a39,
- 0x0a3c, 0x0a3c,
- 0x0a3e, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4d,
- 0x0a51, 0x0a51,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a66, 0x0a75,
- 0x0a81, 0x0a83,
- 0x0a85, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abc, 0x0ac5,
- 0x0ac7, 0x0ac9,
- 0x0acb, 0x0acd,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae3,
- 0x0ae6, 0x0aef,
- 0x0b01, 0x0b03,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b35, 0x0b39,
- 0x0b3c, 0x0b44,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b63,
- 0x0b66, 0x0b6f,
- 0x0b71, 0x0b71,
- 0x0b82, 0x0b83,
- 0x0b85, 0x0b8a,
- 0x0b8e, 0x0b90,
- 0x0b92, 0x0b95,
- 0x0b99, 0x0b9a,
- 0x0b9c, 0x0b9c,
- 0x0b9e, 0x0b9f,
- 0x0ba3, 0x0ba4,
- 0x0ba8, 0x0baa,
- 0x0bae, 0x0bb9,
- 0x0bbe, 0x0bc2,
- 0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcd,
- 0x0bd0, 0x0bd0,
- 0x0bd7, 0x0bd7,
- 0x0be6, 0x0bef,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3d, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c58, 0x0c59,
- 0x0c60, 0x0c63,
- 0x0c66, 0x0c6f,
- 0x0c82, 0x0c83,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbc, 0x0cc4,
- 0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccd,
- 0x0cd5, 0x0cd6,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce3,
- 0x0ce6, 0x0cef,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3d, 0x0d44,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d63,
- 0x0d66, 0x0d6f,
- 0x0d7a, 0x0d7f,
- 0x0d82, 0x0d83,
- 0x0d85, 0x0d96,
- 0x0d9a, 0x0db1,
- 0x0db3, 0x0dbb,
- 0x0dbd, 0x0dbd,
- 0x0dc0, 0x0dc6,
- 0x0dca, 0x0dca,
- 0x0dcf, 0x0dd4,
- 0x0dd6, 0x0dd6,
- 0x0dd8, 0x0ddf,
- 0x0df2, 0x0df3,
- 0x0e01, 0x0e3a,
- 0x0e40, 0x0e4e,
- 0x0e50, 0x0e59,
- 0x0e81, 0x0e82,
- 0x0e84, 0x0e84,
- 0x0e87, 0x0e88,
- 0x0e8a, 0x0e8a,
- 0x0e8d, 0x0e8d,
- 0x0e94, 0x0e97,
- 0x0e99, 0x0e9f,
- 0x0ea1, 0x0ea3,
- 0x0ea5, 0x0ea5,
- 0x0ea7, 0x0ea7,
- 0x0eaa, 0x0eab,
- 0x0ead, 0x0eb9,
- 0x0ebb, 0x0ebd,
- 0x0ec0, 0x0ec4,
- 0x0ec6, 0x0ec6,
- 0x0ec8, 0x0ecd,
- 0x0ed0, 0x0ed9,
- 0x0edc, 0x0edd,
- 0x0f00, 0x0f00,
- 0x0f18, 0x0f19,
- 0x0f20, 0x0f29,
- 0x0f35, 0x0f35,
- 0x0f37, 0x0f37,
- 0x0f39, 0x0f39,
- 0x0f3e, 0x0f47,
- 0x0f49, 0x0f6c,
- 0x0f71, 0x0f84,
- 0x0f86, 0x0f8b,
- 0x0f90, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fc6, 0x0fc6,
- 0x1000, 0x1049,
- 0x1050, 0x1099,
- 0x10a0, 0x10c5,
- 0x10d0, 0x10fa,
- 0x10fc, 0x10fc,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x1200, 0x1248,
- 0x124a, 0x124d,
- 0x1250, 0x1256,
- 0x1258, 0x1258,
- 0x125a, 0x125d,
- 0x1260, 0x1288,
- 0x128a, 0x128d,
- 0x1290, 0x12b0,
- 0x12b2, 0x12b5,
- 0x12b8, 0x12be,
- 0x12c0, 0x12c0,
- 0x12c2, 0x12c5,
- 0x12c8, 0x12d6,
- 0x12d8, 0x1310,
- 0x1312, 0x1315,
- 0x1318, 0x135a,
- 0x135f, 0x135f,
- 0x1380, 0x138f,
- 0x13a0, 0x13f4,
- 0x1401, 0x166c,
- 0x166f, 0x1676,
- 0x1681, 0x169a,
- 0x16a0, 0x16ea,
- 0x1700, 0x170c,
- 0x170e, 0x1714,
- 0x1720, 0x1734,
- 0x1740, 0x1753,
- 0x1760, 0x176c,
- 0x176e, 0x1770,
- 0x1772, 0x1773,
- 0x1780, 0x17b3,
- 0x17b6, 0x17d3,
- 0x17d7, 0x17d7,
- 0x17dc, 0x17dd,
- 0x17e0, 0x17e9,
- 0x180b, 0x180d,
- 0x1810, 0x1819,
- 0x1820, 0x1877,
- 0x1880, 0x18aa,
- 0x1900, 0x191c,
- 0x1920, 0x192b,
- 0x1930, 0x193b,
- 0x1946, 0x196d,
- 0x1970, 0x1974,
- 0x1980, 0x19a9,
- 0x19b0, 0x19c9,
- 0x19d0, 0x19d9,
- 0x1a00, 0x1a1b,
- 0x1b00, 0x1b4b,
- 0x1b50, 0x1b59,
- 0x1b6b, 0x1b73,
- 0x1b80, 0x1baa,
- 0x1bae, 0x1bb9,
- 0x1c00, 0x1c37,
- 0x1c40, 0x1c49,
- 0x1c4d, 0x1c7d,
- 0x1d00, 0x1de6,
- 0x1dfe, 0x1f15,
- 0x1f18, 0x1f1d,
- 0x1f20, 0x1f45,
- 0x1f48, 0x1f4d,
- 0x1f50, 0x1f57,
- 0x1f59, 0x1f59,
- 0x1f5b, 0x1f5b,
- 0x1f5d, 0x1f5d,
- 0x1f5f, 0x1f7d,
- 0x1f80, 0x1fb4,
- 0x1fb6, 0x1fbc,
- 0x1fbe, 0x1fbe,
- 0x1fc2, 0x1fc4,
- 0x1fc6, 0x1fcc,
- 0x1fd0, 0x1fd3,
- 0x1fd6, 0x1fdb,
- 0x1fe0, 0x1fec,
- 0x1ff2, 0x1ff4,
- 0x1ff6, 0x1ffc,
- 0x2071, 0x2071,
- 0x207f, 0x207f,
- 0x2090, 0x2094,
- 0x20d0, 0x20f0,
- 0x2102, 0x2102,
- 0x2107, 0x2107,
- 0x210a, 0x2113,
- 0x2115, 0x2115,
- 0x2119, 0x211d,
- 0x2124, 0x2124,
- 0x2126, 0x2126,
- 0x2128, 0x2128,
- 0x212a, 0x212d,
- 0x212f, 0x2139,
- 0x213c, 0x213f,
- 0x2145, 0x2149,
- 0x214e, 0x214e,
- 0x2183, 0x2184,
- 0x2c00, 0x2c2e,
- 0x2c30, 0x2c5e,
- 0x2c60, 0x2c6f,
- 0x2c71, 0x2c7d,
- 0x2c80, 0x2ce4,
- 0x2d00, 0x2d25,
- 0x2d30, 0x2d65,
- 0x2d6f, 0x2d6f,
- 0x2d80, 0x2d96,
- 0x2da0, 0x2da6,
- 0x2da8, 0x2dae,
- 0x2db0, 0x2db6,
- 0x2db8, 0x2dbe,
- 0x2dc0, 0x2dc6,
- 0x2dc8, 0x2dce,
- 0x2dd0, 0x2dd6,
- 0x2dd8, 0x2dde,
- 0x2de0, 0x2dff,
- 0x2e2f, 0x2e2f,
- 0x3005, 0x3006,
- 0x302a, 0x302f,
- 0x3031, 0x3035,
- 0x303b, 0x303c,
- 0x3041, 0x3096,
- 0x3099, 0x309a,
- 0x309d, 0x309f,
- 0x30a1, 0x30fa,
- 0x30fc, 0x30ff,
- 0x3105, 0x312d,
- 0x3131, 0x318e,
- 0x31a0, 0x31b7,
- 0x31f0, 0x31ff,
- 0x3400, 0x3400,
- 0x4db5, 0x4db5,
- 0x4e00, 0x4e00,
- 0x9fc3, 0x9fc3,
- 0xa000, 0xa48c,
- 0xa500, 0xa60c,
- 0xa610, 0xa62b,
- 0xa640, 0xa65f,
- 0xa662, 0xa672,
- 0xa67c, 0xa67d,
- 0xa67f, 0xa697,
- 0xa717, 0xa71f,
- 0xa722, 0xa788,
- 0xa78b, 0xa78c,
- 0xa7fb, 0xa827,
- 0xa840, 0xa873,
- 0xa880, 0xa8c4,
- 0xa8d0, 0xa8d9,
- 0xa900, 0xa92d,
- 0xa930, 0xa953,
- 0xaa00, 0xaa36,
- 0xaa40, 0xaa4d,
- 0xaa50, 0xaa59,
- 0xac00, 0xac00,
- 0xd7a3, 0xd7a3,
- 0xf900, 0xfa2d,
- 0xfa30, 0xfa6a,
- 0xfa70, 0xfad9,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xfb1d, 0xfb28,
- 0xfb2a, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbb1,
- 0xfbd3, 0xfd3d,
- 0xfd50, 0xfd8f,
- 0xfd92, 0xfdc7,
- 0xfdf0, 0xfdfb,
- 0xfe00, 0xfe0f,
- 0xfe20, 0xfe26,
- 0xfe70, 0xfe74,
- 0xfe76, 0xfefc,
- 0xff10, 0xff19,
- 0xff21, 0xff3a,
- 0xff41, 0xff5a,
- 0xff66, 0xffbe,
- 0xffc2, 0xffc7,
- 0xffca, 0xffcf,
- 0xffd2, 0xffd7,
- 0xffda, 0xffdc,
- 0x10000, 0x1000b,
- 0x1000d, 0x10026,
- 0x10028, 0x1003a,
- 0x1003c, 0x1003d,
- 0x1003f, 0x1004d,
- 0x10050, 0x1005d,
- 0x10080, 0x100fa,
- 0x101fd, 0x101fd,
- 0x10280, 0x1029c,
- 0x102a0, 0x102d0,
- 0x10300, 0x1031e,
- 0x10330, 0x10340,
- 0x10342, 0x10349,
- 0x10380, 0x1039d,
- 0x103a0, 0x103c3,
- 0x103c8, 0x103cf,
- 0x10400, 0x1049d,
- 0x104a0, 0x104a9,
- 0x10800, 0x10805,
- 0x10808, 0x10808,
- 0x1080a, 0x10835,
- 0x10837, 0x10838,
- 0x1083c, 0x1083c,
- 0x1083f, 0x1083f,
- 0x10900, 0x10915,
- 0x10920, 0x10939,
- 0x10a00, 0x10a03,
- 0x10a05, 0x10a06,
- 0x10a0c, 0x10a13,
- 0x10a15, 0x10a17,
- 0x10a19, 0x10a33,
- 0x10a38, 0x10a3a,
- 0x10a3f, 0x10a3f,
- 0x12000, 0x1236e,
- 0x1d165, 0x1d169,
- 0x1d16d, 0x1d172,
- 0x1d17b, 0x1d182,
- 0x1d185, 0x1d18b,
- 0x1d1aa, 0x1d1ad,
- 0x1d242, 0x1d244,
- 0x1d400, 0x1d454,
- 0x1d456, 0x1d49c,
- 0x1d49e, 0x1d49f,
- 0x1d4a2, 0x1d4a2,
- 0x1d4a5, 0x1d4a6,
- 0x1d4a9, 0x1d4ac,
- 0x1d4ae, 0x1d4b9,
- 0x1d4bb, 0x1d4bb,
- 0x1d4bd, 0x1d4c3,
- 0x1d4c5, 0x1d505,
- 0x1d507, 0x1d50a,
- 0x1d50d, 0x1d514,
- 0x1d516, 0x1d51c,
- 0x1d51e, 0x1d539,
- 0x1d53b, 0x1d53e,
- 0x1d540, 0x1d544,
- 0x1d546, 0x1d546,
- 0x1d54a, 0x1d550,
- 0x1d552, 0x1d6a5,
- 0x1d6a8, 0x1d6c0,
- 0x1d6c2, 0x1d6da,
- 0x1d6dc, 0x1d6fa,
- 0x1d6fc, 0x1d714,
- 0x1d716, 0x1d734,
- 0x1d736, 0x1d74e,
- 0x1d750, 0x1d76e,
- 0x1d770, 0x1d788,
- 0x1d78a, 0x1d7a8,
- 0x1d7aa, 0x1d7c2,
- 0x1d7c4, 0x1d7cb,
- 0x1d7ce, 0x1d7ff,
- 0x20000, 0x20000,
- 0x2a6d6, 0x2a6d6,
- 0x2f800, 0x2fa1d,
- 0xe0100, 0xe01ef,
-}; /* CR_Alnum */
-
-/* 'ASCII': [[:ASCII:]] */
-static const OnigCodePoint CR_ASCII[] = {
- 1,
- 0x0000, 0x007f,
-}; /* CR_ASCII */
-
-#ifdef USE_UNICODE_PROPERTIES
-#ifdef USE_UNICODE_PROPERTIES
-/* 'Any': - */
-static const OnigCodePoint CR_Any[] = {
- 1,
- 0x0000, 0x10ffff,
-}; /* CR_Any */
-
-/* 'Assigned': - */
-static const OnigCodePoint CR_Assigned[] = {
- 454,
- 0x0000, 0x0377,
- 0x037a, 0x037e,
- 0x0384, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x0523,
- 0x0531, 0x0556,
- 0x0559, 0x055f,
- 0x0561, 0x0587,
- 0x0589, 0x058a,
- 0x0591, 0x05c7,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0x0600, 0x0603,
- 0x0606, 0x061b,
- 0x061e, 0x061f,
- 0x0621, 0x065e,
- 0x0660, 0x070d,
- 0x070f, 0x074a,
- 0x074d, 0x07b1,
- 0x07c0, 0x07fa,
- 0x0901, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0954,
- 0x0958, 0x0972,
- 0x097b, 0x097f,
- 0x0981, 0x0983,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bc, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09ce,
- 0x09d7, 0x09d7,
- 0x09dc, 0x09dd,
- 0x09df, 0x09e3,
- 0x09e6, 0x09fa,
- 0x0a01, 0x0a03,
- 0x0a05, 0x0a0a,
- 0x0a0f, 0x0a10,
- 0x0a13, 0x0a28,
- 0x0a2a, 0x0a30,
- 0x0a32, 0x0a33,
- 0x0a35, 0x0a36,
- 0x0a38, 0x0a39,
- 0x0a3c, 0x0a3c,
- 0x0a3e, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4d,
- 0x0a51, 0x0a51,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a66, 0x0a75,
- 0x0a81, 0x0a83,
- 0x0a85, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abc, 0x0ac5,
- 0x0ac7, 0x0ac9,
- 0x0acb, 0x0acd,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae3,
- 0x0ae6, 0x0aef,
- 0x0af1, 0x0af1,
- 0x0b01, 0x0b03,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b35, 0x0b39,
- 0x0b3c, 0x0b44,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b63,
- 0x0b66, 0x0b71,
- 0x0b82, 0x0b83,
- 0x0b85, 0x0b8a,
- 0x0b8e, 0x0b90,
- 0x0b92, 0x0b95,
- 0x0b99, 0x0b9a,
- 0x0b9c, 0x0b9c,
- 0x0b9e, 0x0b9f,
- 0x0ba3, 0x0ba4,
- 0x0ba8, 0x0baa,
- 0x0bae, 0x0bb9,
- 0x0bbe, 0x0bc2,
- 0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcd,
- 0x0bd0, 0x0bd0,
- 0x0bd7, 0x0bd7,
- 0x0be6, 0x0bfa,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3d, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c58, 0x0c59,
- 0x0c60, 0x0c63,
- 0x0c66, 0x0c6f,
- 0x0c78, 0x0c7f,
- 0x0c82, 0x0c83,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbc, 0x0cc4,
- 0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccd,
- 0x0cd5, 0x0cd6,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce3,
- 0x0ce6, 0x0cef,
- 0x0cf1, 0x0cf2,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3d, 0x0d44,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d63,
- 0x0d66, 0x0d75,
- 0x0d79, 0x0d7f,
- 0x0d82, 0x0d83,
- 0x0d85, 0x0d96,
- 0x0d9a, 0x0db1,
- 0x0db3, 0x0dbb,
- 0x0dbd, 0x0dbd,
- 0x0dc0, 0x0dc6,
- 0x0dca, 0x0dca,
- 0x0dcf, 0x0dd4,
- 0x0dd6, 0x0dd6,
- 0x0dd8, 0x0ddf,
- 0x0df2, 0x0df4,
- 0x0e01, 0x0e3a,
- 0x0e3f, 0x0e5b,
- 0x0e81, 0x0e82,
- 0x0e84, 0x0e84,
- 0x0e87, 0x0e88,
- 0x0e8a, 0x0e8a,
- 0x0e8d, 0x0e8d,
- 0x0e94, 0x0e97,
- 0x0e99, 0x0e9f,
- 0x0ea1, 0x0ea3,
- 0x0ea5, 0x0ea5,
- 0x0ea7, 0x0ea7,
- 0x0eaa, 0x0eab,
- 0x0ead, 0x0eb9,
- 0x0ebb, 0x0ebd,
- 0x0ec0, 0x0ec4,
- 0x0ec6, 0x0ec6,
- 0x0ec8, 0x0ecd,
- 0x0ed0, 0x0ed9,
- 0x0edc, 0x0edd,
- 0x0f00, 0x0f47,
- 0x0f49, 0x0f6c,
- 0x0f71, 0x0f8b,
- 0x0f90, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fbe, 0x0fcc,
- 0x0fce, 0x0fd4,
- 0x1000, 0x1099,
- 0x109e, 0x10c5,
- 0x10d0, 0x10fc,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x1200, 0x1248,
- 0x124a, 0x124d,
- 0x1250, 0x1256,
- 0x1258, 0x1258,
- 0x125a, 0x125d,
- 0x1260, 0x1288,
- 0x128a, 0x128d,
- 0x1290, 0x12b0,
- 0x12b2, 0x12b5,
- 0x12b8, 0x12be,
- 0x12c0, 0x12c0,
- 0x12c2, 0x12c5,
- 0x12c8, 0x12d6,
- 0x12d8, 0x1310,
- 0x1312, 0x1315,
- 0x1318, 0x135a,
- 0x135f, 0x137c,
- 0x1380, 0x1399,
- 0x13a0, 0x13f4,
- 0x1401, 0x1676,
- 0x1680, 0x169c,
- 0x16a0, 0x16f0,
- 0x1700, 0x170c,
- 0x170e, 0x1714,
- 0x1720, 0x1736,
- 0x1740, 0x1753,
- 0x1760, 0x176c,
- 0x176e, 0x1770,
- 0x1772, 0x1773,
- 0x1780, 0x17dd,
- 0x17e0, 0x17e9,
- 0x17f0, 0x17f9,
- 0x1800, 0x180e,
- 0x1810, 0x1819,
- 0x1820, 0x1877,
- 0x1880, 0x18aa,
- 0x1900, 0x191c,
- 0x1920, 0x192b,
- 0x1930, 0x193b,
- 0x1940, 0x1940,
- 0x1944, 0x196d,
- 0x1970, 0x1974,
- 0x1980, 0x19a9,
- 0x19b0, 0x19c9,
- 0x19d0, 0x19d9,
- 0x19de, 0x1a1b,
- 0x1a1e, 0x1a1f,
- 0x1b00, 0x1b4b,
- 0x1b50, 0x1b7c,
- 0x1b80, 0x1baa,
- 0x1bae, 0x1bb9,
- 0x1c00, 0x1c37,
- 0x1c3b, 0x1c49,
- 0x1c4d, 0x1c7f,
- 0x1d00, 0x1de6,
- 0x1dfe, 0x1f15,
- 0x1f18, 0x1f1d,
- 0x1f20, 0x1f45,
- 0x1f48, 0x1f4d,
- 0x1f50, 0x1f57,
- 0x1f59, 0x1f59,
- 0x1f5b, 0x1f5b,
- 0x1f5d, 0x1f5d,
- 0x1f5f, 0x1f7d,
- 0x1f80, 0x1fb4,
- 0x1fb6, 0x1fc4,
- 0x1fc6, 0x1fd3,
- 0x1fd6, 0x1fdb,
- 0x1fdd, 0x1fef,
- 0x1ff2, 0x1ff4,
- 0x1ff6, 0x1ffe,
- 0x2000, 0x2064,
- 0x206a, 0x2071,
- 0x2074, 0x208e,
- 0x2090, 0x2094,
- 0x20a0, 0x20b5,
- 0x20d0, 0x20f0,
- 0x2100, 0x214f,
- 0x2153, 0x2188,
- 0x2190, 0x23e7,
- 0x2400, 0x2426,
- 0x2440, 0x244a,
- 0x2460, 0x269d,
- 0x26a0, 0x26bc,
- 0x26c0, 0x26c3,
- 0x2701, 0x2704,
- 0x2706, 0x2709,
- 0x270c, 0x2727,
- 0x2729, 0x274b,
- 0x274d, 0x274d,
- 0x274f, 0x2752,
- 0x2756, 0x2756,
- 0x2758, 0x275e,
- 0x2761, 0x2794,
- 0x2798, 0x27af,
- 0x27b1, 0x27be,
- 0x27c0, 0x27ca,
- 0x27cc, 0x27cc,
- 0x27d0, 0x2b4c,
- 0x2b50, 0x2b54,
- 0x2c00, 0x2c2e,
- 0x2c30, 0x2c5e,
- 0x2c60, 0x2c6f,
- 0x2c71, 0x2c7d,
- 0x2c80, 0x2cea,
- 0x2cf9, 0x2d25,
- 0x2d30, 0x2d65,
- 0x2d6f, 0x2d6f,
- 0x2d80, 0x2d96,
- 0x2da0, 0x2da6,
- 0x2da8, 0x2dae,
- 0x2db0, 0x2db6,
- 0x2db8, 0x2dbe,
- 0x2dc0, 0x2dc6,
- 0x2dc8, 0x2dce,
- 0x2dd0, 0x2dd6,
- 0x2dd8, 0x2dde,
- 0x2de0, 0x2e30,
- 0x2e80, 0x2e99,
- 0x2e9b, 0x2ef3,
- 0x2f00, 0x2fd5,
- 0x2ff0, 0x2ffb,
- 0x3000, 0x303f,
- 0x3041, 0x3096,
- 0x3099, 0x30ff,
- 0x3105, 0x312d,
- 0x3131, 0x318e,
- 0x3190, 0x31b7,
- 0x31c0, 0x31e3,
- 0x31f0, 0x321e,
- 0x3220, 0x3243,
- 0x3250, 0x32fe,
- 0x3300, 0x3400,
- 0x4db5, 0x4db5,
- 0x4dc0, 0x4e00,
- 0x9fc3, 0x9fc3,
- 0xa000, 0xa48c,
- 0xa490, 0xa4c6,
- 0xa500, 0xa62b,
- 0xa640, 0xa65f,
- 0xa662, 0xa673,
- 0xa67c, 0xa697,
- 0xa700, 0xa78c,
- 0xa7fb, 0xa82b,
- 0xa840, 0xa877,
- 0xa880, 0xa8c4,
- 0xa8ce, 0xa8d9,
- 0xa900, 0xa953,
- 0xa95f, 0xa95f,
- 0xaa00, 0xaa36,
- 0xaa40, 0xaa4d,
- 0xaa50, 0xaa59,
- 0xaa5c, 0xaa5f,
- 0xac00, 0xac00,
- 0xd7a3, 0xd7a3,
- 0xd800, 0xd800,
- 0xdb7f, 0xdb80,
- 0xdbff, 0xdc00,
- 0xdfff, 0xe000,
- 0xf8ff, 0xfa2d,
- 0xfa30, 0xfa6a,
- 0xfa70, 0xfad9,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xfb1d, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbb1,
- 0xfbd3, 0xfd3f,
- 0xfd50, 0xfd8f,
- 0xfd92, 0xfdc7,
- 0xfdf0, 0xfdfd,
- 0xfe00, 0xfe19,
- 0xfe20, 0xfe26,
- 0xfe30, 0xfe52,
- 0xfe54, 0xfe66,
- 0xfe68, 0xfe6b,
- 0xfe70, 0xfe74,
- 0xfe76, 0xfefc,
- 0xfeff, 0xfeff,
- 0xff01, 0xffbe,
- 0xffc2, 0xffc7,
- 0xffca, 0xffcf,
- 0xffd2, 0xffd7,
- 0xffda, 0xffdc,
- 0xffe0, 0xffe6,
- 0xffe8, 0xffee,
- 0xfff9, 0xfffd,
- 0x10000, 0x1000b,
- 0x1000d, 0x10026,
- 0x10028, 0x1003a,
- 0x1003c, 0x1003d,
- 0x1003f, 0x1004d,
- 0x10050, 0x1005d,
- 0x10080, 0x100fa,
- 0x10100, 0x10102,
- 0x10107, 0x10133,
- 0x10137, 0x1018a,
- 0x10190, 0x1019b,
- 0x101d0, 0x101fd,
- 0x10280, 0x1029c,
- 0x102a0, 0x102d0,
- 0x10300, 0x1031e,
- 0x10320, 0x10323,
- 0x10330, 0x1034a,
- 0x10380, 0x1039d,
- 0x1039f, 0x103c3,
- 0x103c8, 0x103d5,
- 0x10400, 0x1049d,
- 0x104a0, 0x104a9,
- 0x10800, 0x10805,
- 0x10808, 0x10808,
- 0x1080a, 0x10835,
- 0x10837, 0x10838,
- 0x1083c, 0x1083c,
- 0x1083f, 0x1083f,
- 0x10900, 0x10919,
- 0x1091f, 0x10939,
- 0x1093f, 0x1093f,
- 0x10a00, 0x10a03,
- 0x10a05, 0x10a06,
- 0x10a0c, 0x10a13,
- 0x10a15, 0x10a17,
- 0x10a19, 0x10a33,
- 0x10a38, 0x10a3a,
- 0x10a3f, 0x10a47,
- 0x10a50, 0x10a58,
- 0x12000, 0x1236e,
- 0x12400, 0x12462,
- 0x12470, 0x12473,
- 0x1d000, 0x1d0f5,
- 0x1d100, 0x1d126,
- 0x1d129, 0x1d1dd,
- 0x1d200, 0x1d245,
- 0x1d300, 0x1d356,
- 0x1d360, 0x1d371,
- 0x1d400, 0x1d454,
- 0x1d456, 0x1d49c,
- 0x1d49e, 0x1d49f,
- 0x1d4a2, 0x1d4a2,
- 0x1d4a5, 0x1d4a6,
- 0x1d4a9, 0x1d4ac,
- 0x1d4ae, 0x1d4b9,
- 0x1d4bb, 0x1d4bb,
- 0x1d4bd, 0x1d4c3,
- 0x1d4c5, 0x1d505,
- 0x1d507, 0x1d50a,
- 0x1d50d, 0x1d514,
- 0x1d516, 0x1d51c,
- 0x1d51e, 0x1d539,
- 0x1d53b, 0x1d53e,
- 0x1d540, 0x1d544,
- 0x1d546, 0x1d546,
- 0x1d54a, 0x1d550,
- 0x1d552, 0x1d6a5,
- 0x1d6a8, 0x1d7cb,
- 0x1d7ce, 0x1d7ff,
- 0x1f000, 0x1f02b,
- 0x1f030, 0x1f093,
- 0x20000, 0x20000,
- 0x2a6d6, 0x2a6d6,
- 0x2f800, 0x2fa1d,
- 0xe0001, 0xe0001,
- 0xe0020, 0xe007f,
- 0xe0100, 0xe01ef,
- 0xf0000, 0xf0000,
- 0xffffd, 0xffffd,
- 0x100000, 0x100000,
-}; /* CR_Assigned */
-
-/* 'C': Major Category */
-static const OnigCodePoint CR_C[] = {
- 25,
- 0x0000, 0x001f,
- 0x007f, 0x009f,
- 0x00ad, 0x00ad,
- 0x0600, 0x0603,
- 0x06dd, 0x06dd,
- 0x070f, 0x070f,
- 0x17b4, 0x17b5,
- 0x200b, 0x200f,
- 0x202a, 0x202e,
- 0x2060, 0x2064,
- 0x206a, 0x206f,
- 0xd800, 0xd800,
- 0xdb7f, 0xdb80,
- 0xdbff, 0xdc00,
- 0xdfff, 0xe000,
- 0xf8ff, 0xf8ff,
- 0xfeff, 0xfeff,
- 0xfff9, 0xfffb,
- 0x1d173, 0x1d17a,
- 0xe0001, 0xe0001,
- 0xe0020, 0xe007f,
- 0xf0000, 0xf0000,
- 0xffffd, 0xffffd,
- 0x100000, 0x100000,
- 0x10fffd, 0x10ffff,
-}; /* CR_C */
-
-/* 'Cc': General Category */
-static const OnigCodePoint CR_Cc[] = {
- 2,
- 0x0000, 0x001f,
- 0x007f, 0x009f,
-}; /* CR_Cc */
-
-/* 'Cf': General Category */
-static const OnigCodePoint CR_Cf[] = {
- 14,
- 0x00ad, 0x00ad,
- 0x0600, 0x0603,
- 0x06dd, 0x06dd,
- 0x070f, 0x070f,
- 0x17b4, 0x17b5,
- 0x200b, 0x200f,
- 0x202a, 0x202e,
- 0x2060, 0x2064,
- 0x206a, 0x206f,
- 0xfeff, 0xfeff,
- 0xfff9, 0xfffb,
- 0x1d173, 0x1d17a,
- 0xe0001, 0xe0001,
- 0xe0020, 0xe007f,
-}; /* CR_Cf */
-
-/* 'Cn': General Category */
-static const OnigCodePoint CR_Cn[] = {
- 454,
- 0x0378, 0x0379,
- 0x037f, 0x0383,
- 0x038b, 0x038b,
- 0x038d, 0x038d,
- 0x03a2, 0x03a2,
- 0x0524, 0x0530,
- 0x0557, 0x0558,
- 0x0560, 0x0560,
- 0x0588, 0x0588,
- 0x058b, 0x0590,
- 0x05c8, 0x05cf,
- 0x05eb, 0x05ef,
- 0x05f5, 0x05ff,
- 0x0604, 0x0605,
- 0x061c, 0x061d,
- 0x0620, 0x0620,
- 0x065f, 0x065f,
- 0x070e, 0x070e,
- 0x074b, 0x074c,
- 0x07b2, 0x07bf,
- 0x07fb, 0x0900,
- 0x093a, 0x093b,
- 0x094e, 0x094f,
- 0x0955, 0x0957,
- 0x0973, 0x097a,
- 0x0980, 0x0980,
- 0x0984, 0x0984,
- 0x098d, 0x098e,
- 0x0991, 0x0992,
- 0x09a9, 0x09a9,
- 0x09b1, 0x09b1,
- 0x09b3, 0x09b5,
- 0x09ba, 0x09bb,
- 0x09c5, 0x09c6,
- 0x09c9, 0x09ca,
- 0x09cf, 0x09d6,
- 0x09d8, 0x09db,
- 0x09de, 0x09de,
- 0x09e4, 0x09e5,
- 0x09fb, 0x0a00,
- 0x0a04, 0x0a04,
- 0x0a0b, 0x0a0e,
- 0x0a11, 0x0a12,
- 0x0a29, 0x0a29,
- 0x0a31, 0x0a31,
- 0x0a34, 0x0a34,
- 0x0a37, 0x0a37,
- 0x0a3a, 0x0a3b,
- 0x0a3d, 0x0a3d,
- 0x0a43, 0x0a46,
- 0x0a49, 0x0a4a,
- 0x0a4e, 0x0a50,
- 0x0a52, 0x0a58,
- 0x0a5d, 0x0a5d,
- 0x0a5f, 0x0a65,
- 0x0a76, 0x0a80,
- 0x0a84, 0x0a84,
- 0x0a8e, 0x0a8e,
- 0x0a92, 0x0a92,
- 0x0aa9, 0x0aa9,
- 0x0ab1, 0x0ab1,
- 0x0ab4, 0x0ab4,
- 0x0aba, 0x0abb,
- 0x0ac6, 0x0ac6,
- 0x0aca, 0x0aca,
- 0x0ace, 0x0acf,
- 0x0ad1, 0x0adf,
- 0x0ae4, 0x0ae5,
- 0x0af0, 0x0af0,
- 0x0af2, 0x0b00,
- 0x0b04, 0x0b04,
- 0x0b0d, 0x0b0e,
- 0x0b11, 0x0b12,
- 0x0b29, 0x0b29,
- 0x0b31, 0x0b31,
- 0x0b34, 0x0b34,
- 0x0b3a, 0x0b3b,
- 0x0b45, 0x0b46,
- 0x0b49, 0x0b4a,
- 0x0b4e, 0x0b55,
- 0x0b58, 0x0b5b,
- 0x0b5e, 0x0b5e,
- 0x0b64, 0x0b65,
- 0x0b72, 0x0b81,
- 0x0b84, 0x0b84,
- 0x0b8b, 0x0b8d,
- 0x0b91, 0x0b91,
- 0x0b96, 0x0b98,
- 0x0b9b, 0x0b9b,
- 0x0b9d, 0x0b9d,
- 0x0ba0, 0x0ba2,
- 0x0ba5, 0x0ba7,
- 0x0bab, 0x0bad,
- 0x0bba, 0x0bbd,
- 0x0bc3, 0x0bc5,
- 0x0bc9, 0x0bc9,
- 0x0bce, 0x0bcf,
- 0x0bd1, 0x0bd6,
- 0x0bd8, 0x0be5,
- 0x0bfb, 0x0c00,
- 0x0c04, 0x0c04,
- 0x0c0d, 0x0c0d,
- 0x0c11, 0x0c11,
- 0x0c29, 0x0c29,
- 0x0c34, 0x0c34,
- 0x0c3a, 0x0c3c,
- 0x0c45, 0x0c45,
- 0x0c49, 0x0c49,
- 0x0c4e, 0x0c54,
- 0x0c57, 0x0c57,
- 0x0c5a, 0x0c5f,
- 0x0c64, 0x0c65,
- 0x0c70, 0x0c77,
- 0x0c80, 0x0c81,
- 0x0c84, 0x0c84,
- 0x0c8d, 0x0c8d,
- 0x0c91, 0x0c91,
- 0x0ca9, 0x0ca9,
- 0x0cb4, 0x0cb4,
- 0x0cba, 0x0cbb,
- 0x0cc5, 0x0cc5,
- 0x0cc9, 0x0cc9,
- 0x0cce, 0x0cd4,
- 0x0cd7, 0x0cdd,
- 0x0cdf, 0x0cdf,
- 0x0ce4, 0x0ce5,
- 0x0cf0, 0x0cf0,
- 0x0cf3, 0x0d01,
- 0x0d04, 0x0d04,
- 0x0d0d, 0x0d0d,
- 0x0d11, 0x0d11,
- 0x0d29, 0x0d29,
- 0x0d3a, 0x0d3c,
- 0x0d45, 0x0d45,
- 0x0d49, 0x0d49,
- 0x0d4e, 0x0d56,
- 0x0d58, 0x0d5f,
- 0x0d64, 0x0d65,
- 0x0d76, 0x0d78,
- 0x0d80, 0x0d81,
- 0x0d84, 0x0d84,
- 0x0d97, 0x0d99,
- 0x0db2, 0x0db2,
- 0x0dbc, 0x0dbc,
- 0x0dbe, 0x0dbf,
- 0x0dc7, 0x0dc9,
- 0x0dcb, 0x0dce,
- 0x0dd5, 0x0dd5,
- 0x0dd7, 0x0dd7,
- 0x0de0, 0x0df1,
- 0x0df5, 0x0e00,
- 0x0e3b, 0x0e3e,
- 0x0e5c, 0x0e80,
- 0x0e83, 0x0e83,
- 0x0e85, 0x0e86,
- 0x0e89, 0x0e89,
- 0x0e8b, 0x0e8c,
- 0x0e8e, 0x0e93,
- 0x0e98, 0x0e98,
- 0x0ea0, 0x0ea0,
- 0x0ea4, 0x0ea4,
- 0x0ea6, 0x0ea6,
- 0x0ea8, 0x0ea9,
- 0x0eac, 0x0eac,
- 0x0eba, 0x0eba,
- 0x0ebe, 0x0ebf,
- 0x0ec5, 0x0ec5,
- 0x0ec7, 0x0ec7,
- 0x0ece, 0x0ecf,
- 0x0eda, 0x0edb,
- 0x0ede, 0x0eff,
- 0x0f48, 0x0f48,
- 0x0f6d, 0x0f70,
- 0x0f8c, 0x0f8f,
- 0x0f98, 0x0f98,
- 0x0fbd, 0x0fbd,
- 0x0fcd, 0x0fcd,
- 0x0fd5, 0x0fff,
- 0x109a, 0x109d,
- 0x10c6, 0x10cf,
- 0x10fd, 0x10ff,
- 0x115a, 0x115e,
- 0x11a3, 0x11a7,
- 0x11fa, 0x11ff,
- 0x1249, 0x1249,
- 0x124e, 0x124f,
- 0x1257, 0x1257,
- 0x1259, 0x1259,
- 0x125e, 0x125f,
- 0x1289, 0x1289,
- 0x128e, 0x128f,
- 0x12b1, 0x12b1,
- 0x12b6, 0x12b7,
- 0x12bf, 0x12bf,
- 0x12c1, 0x12c1,
- 0x12c6, 0x12c7,
- 0x12d7, 0x12d7,
- 0x1311, 0x1311,
- 0x1316, 0x1317,
- 0x135b, 0x135e,
- 0x137d, 0x137f,
- 0x139a, 0x139f,
- 0x13f5, 0x1400,
- 0x1677, 0x167f,
- 0x169d, 0x169f,
- 0x16f1, 0x16ff,
- 0x170d, 0x170d,
- 0x1715, 0x171f,
- 0x1737, 0x173f,
- 0x1754, 0x175f,
- 0x176d, 0x176d,
- 0x1771, 0x1771,
- 0x1774, 0x177f,
- 0x17de, 0x17df,
- 0x17ea, 0x17ef,
- 0x17fa, 0x17ff,
- 0x180f, 0x180f,
- 0x181a, 0x181f,
- 0x1878, 0x187f,
- 0x18ab, 0x18ff,
- 0x191d, 0x191f,
- 0x192c, 0x192f,
- 0x193c, 0x193f,
- 0x1941, 0x1943,
- 0x196e, 0x196f,
- 0x1975, 0x197f,
- 0x19aa, 0x19af,
- 0x19ca, 0x19cf,
- 0x19da, 0x19dd,
- 0x1a1c, 0x1a1d,
- 0x1a20, 0x1aff,
- 0x1b4c, 0x1b4f,
- 0x1b7d, 0x1b7f,
- 0x1bab, 0x1bad,
- 0x1bba, 0x1bff,
- 0x1c38, 0x1c3a,
- 0x1c4a, 0x1c4c,
- 0x1c80, 0x1cff,
- 0x1de7, 0x1dfd,
- 0x1f16, 0x1f17,
- 0x1f1e, 0x1f1f,
- 0x1f46, 0x1f47,
- 0x1f4e, 0x1f4f,
- 0x1f58, 0x1f58,
- 0x1f5a, 0x1f5a,
- 0x1f5c, 0x1f5c,
- 0x1f5e, 0x1f5e,
- 0x1f7e, 0x1f7f,
- 0x1fb5, 0x1fb5,
- 0x1fc5, 0x1fc5,
- 0x1fd4, 0x1fd5,
- 0x1fdc, 0x1fdc,
- 0x1ff0, 0x1ff1,
- 0x1ff5, 0x1ff5,
- 0x1fff, 0x1fff,
- 0x2065, 0x2069,
- 0x2072, 0x2073,
- 0x208f, 0x208f,
- 0x2095, 0x209f,
- 0x20b6, 0x20cf,
- 0x20f1, 0x20ff,
- 0x2150, 0x2152,
- 0x2189, 0x218f,
- 0x23e8, 0x23ff,
- 0x2427, 0x243f,
- 0x244b, 0x245f,
- 0x269e, 0x269f,
- 0x26bd, 0x26bf,
- 0x26c4, 0x2700,
- 0x2705, 0x2705,
- 0x270a, 0x270b,
- 0x2728, 0x2728,
- 0x274c, 0x274c,
- 0x274e, 0x274e,
- 0x2753, 0x2755,
- 0x2757, 0x2757,
- 0x275f, 0x2760,
- 0x2795, 0x2797,
- 0x27b0, 0x27b0,
- 0x27bf, 0x27bf,
- 0x27cb, 0x27cb,
- 0x27cd, 0x27cf,
- 0x2b4d, 0x2b4f,
- 0x2b55, 0x2bff,
- 0x2c2f, 0x2c2f,
- 0x2c5f, 0x2c5f,
- 0x2c70, 0x2c70,
- 0x2c7e, 0x2c7f,
- 0x2ceb, 0x2cf8,
- 0x2d26, 0x2d2f,
- 0x2d66, 0x2d6e,
- 0x2d70, 0x2d7f,
- 0x2d97, 0x2d9f,
- 0x2da7, 0x2da7,
- 0x2daf, 0x2daf,
- 0x2db7, 0x2db7,
- 0x2dbf, 0x2dbf,
- 0x2dc7, 0x2dc7,
- 0x2dcf, 0x2dcf,
- 0x2dd7, 0x2dd7,
- 0x2ddf, 0x2ddf,
- 0x2e31, 0x2e7f,
- 0x2e9a, 0x2e9a,
- 0x2ef4, 0x2eff,
- 0x2fd6, 0x2fef,
- 0x2ffc, 0x2fff,
- 0x3040, 0x3040,
- 0x3097, 0x3098,
- 0x3100, 0x3104,
- 0x312e, 0x3130,
- 0x318f, 0x318f,
- 0x31b8, 0x31bf,
- 0x31e4, 0x31ef,
- 0x321f, 0x321f,
- 0x3244, 0x324f,
- 0x32ff, 0x32ff,
- 0x3401, 0x4db4,
- 0x4db6, 0x4dbf,
- 0x4e01, 0x9fc2,
- 0x9fc4, 0x9fff,
- 0xa48d, 0xa48f,
- 0xa4c7, 0xa4ff,
- 0xa62c, 0xa63f,
- 0xa660, 0xa661,
- 0xa674, 0xa67b,
- 0xa698, 0xa6ff,
- 0xa78d, 0xa7fa,
- 0xa82c, 0xa83f,
- 0xa878, 0xa87f,
- 0xa8c5, 0xa8cd,
- 0xa8da, 0xa8ff,
- 0xa954, 0xa95e,
- 0xa960, 0xa9ff,
- 0xaa37, 0xaa3f,
- 0xaa4e, 0xaa4f,
- 0xaa5a, 0xaa5b,
- 0xaa60, 0xabff,
- 0xac01, 0xd7a2,
- 0xd7a4, 0xd7ff,
- 0xd801, 0xdb7e,
- 0xdb81, 0xdbfe,
- 0xdc01, 0xdffe,
- 0xe001, 0xf8fe,
- 0xfa2e, 0xfa2f,
- 0xfa6b, 0xfa6f,
- 0xfada, 0xfaff,
- 0xfb07, 0xfb12,
- 0xfb18, 0xfb1c,
- 0xfb37, 0xfb37,
- 0xfb3d, 0xfb3d,
- 0xfb3f, 0xfb3f,
- 0xfb42, 0xfb42,
- 0xfb45, 0xfb45,
- 0xfbb2, 0xfbd2,
- 0xfd40, 0xfd4f,
- 0xfd90, 0xfd91,
- 0xfdc8, 0xfdef,
- 0xfdfe, 0xfdff,
- 0xfe1a, 0xfe1f,
- 0xfe27, 0xfe2f,
- 0xfe53, 0xfe53,
- 0xfe67, 0xfe67,
- 0xfe6c, 0xfe6f,
- 0xfe75, 0xfe75,
- 0xfefd, 0xfefe,
- 0xff00, 0xff00,
- 0xffbf, 0xffc1,
- 0xffc8, 0xffc9,
- 0xffd0, 0xffd1,
- 0xffd8, 0xffd9,
- 0xffdd, 0xffdf,
- 0xffe7, 0xffe7,
- 0xffef, 0xfff8,
- 0xfffe, 0xffff,
- 0x1000c, 0x1000c,
- 0x10027, 0x10027,
- 0x1003b, 0x1003b,
- 0x1003e, 0x1003e,
- 0x1004e, 0x1004f,
- 0x1005e, 0x1007f,
- 0x100fb, 0x100ff,
- 0x10103, 0x10106,
- 0x10134, 0x10136,
- 0x1018b, 0x1018f,
- 0x1019c, 0x101cf,
- 0x101fe, 0x1027f,
- 0x1029d, 0x1029f,
- 0x102d1, 0x102ff,
- 0x1031f, 0x1031f,
- 0x10324, 0x1032f,
- 0x1034b, 0x1037f,
- 0x1039e, 0x1039e,
- 0x103c4, 0x103c7,
- 0x103d6, 0x103ff,
- 0x1049e, 0x1049f,
- 0x104aa, 0x107ff,
- 0x10806, 0x10807,
- 0x10809, 0x10809,
- 0x10836, 0x10836,
- 0x10839, 0x1083b,
- 0x1083d, 0x1083e,
- 0x10840, 0x108ff,
- 0x1091a, 0x1091e,
- 0x1093a, 0x1093e,
- 0x10940, 0x109ff,
- 0x10a04, 0x10a04,
- 0x10a07, 0x10a0b,
- 0x10a14, 0x10a14,
- 0x10a18, 0x10a18,
- 0x10a34, 0x10a37,
- 0x10a3b, 0x10a3e,
- 0x10a48, 0x10a4f,
- 0x10a59, 0x11fff,
- 0x1236f, 0x123ff,
- 0x12463, 0x1246f,
- 0x12474, 0x1cfff,
- 0x1d0f6, 0x1d0ff,
- 0x1d127, 0x1d128,
- 0x1d1de, 0x1d1ff,
- 0x1d246, 0x1d2ff,
- 0x1d357, 0x1d35f,
- 0x1d372, 0x1d3ff,
- 0x1d455, 0x1d455,
- 0x1d49d, 0x1d49d,
- 0x1d4a0, 0x1d4a1,
- 0x1d4a3, 0x1d4a4,
- 0x1d4a7, 0x1d4a8,
- 0x1d4ad, 0x1d4ad,
- 0x1d4ba, 0x1d4ba,
- 0x1d4bc, 0x1d4bc,
- 0x1d4c4, 0x1d4c4,
- 0x1d506, 0x1d506,
- 0x1d50b, 0x1d50c,
- 0x1d515, 0x1d515,
- 0x1d51d, 0x1d51d,
- 0x1d53a, 0x1d53a,
- 0x1d53f, 0x1d53f,
- 0x1d545, 0x1d545,
- 0x1d547, 0x1d549,
- 0x1d551, 0x1d551,
- 0x1d6a6, 0x1d6a7,
- 0x1d7cc, 0x1d7cd,
- 0x1d800, 0x1efff,
- 0x1f02c, 0x1f02f,
- 0x1f094, 0x1ffff,
- 0x20001, 0x2a6d5,
- 0x2a6d7, 0x2f7ff,
- 0x2fa1e, 0xe0000,
- 0xe0002, 0xe001f,
- 0xe0080, 0xe00ff,
- 0xe01f0, 0xeffff,
- 0xf0001, 0xffffc,
- 0xffffe, 0xfffff,
- 0x100001, 0x10ffff,
-}; /* CR_Cn */
-
-/* 'Co': General Category */
-static const OnigCodePoint CR_Co[] = {
- 6,
- 0xe000, 0xe000,
- 0xf8ff, 0xf8ff,
- 0xf0000, 0xf0000,
- 0xffffd, 0xffffd,
- 0x100000, 0x100000,
- 0x10fffd, 0x10fffd,
-}; /* CR_Co */
-
-/* 'Cs': General Category */
-static const OnigCodePoint CR_Cs[] = {
- 4,
- 0xd800, 0xd800,
- 0xdb7f, 0xdb80,
- 0xdbff, 0xdc00,
- 0xdfff, 0xdfff,
-}; /* CR_Cs */
-
-/* 'L': Major Category */
-static const OnigCodePoint CR_L[] = {
- 394,
- 0x0041, 0x005a,
- 0x0061, 0x007a,
- 0x00aa, 0x00aa,
- 0x00b5, 0x00b5,
- 0x00ba, 0x00ba,
- 0x00c0, 0x00d6,
- 0x00d8, 0x00f6,
- 0x00f8, 0x02c1,
- 0x02c6, 0x02d1,
- 0x02e0, 0x02e4,
- 0x02ec, 0x02ec,
- 0x02ee, 0x02ee,
- 0x0370, 0x0374,
- 0x0376, 0x0377,
- 0x037a, 0x037d,
- 0x0386, 0x0386,
- 0x0388, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03f5,
- 0x03f7, 0x0481,
- 0x048a, 0x0523,
- 0x0531, 0x0556,
- 0x0559, 0x0559,
- 0x0561, 0x0587,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f2,
- 0x0621, 0x064a,
- 0x066e, 0x066f,
- 0x0671, 0x06d3,
- 0x06d5, 0x06d5,
- 0x06e5, 0x06e6,
- 0x06ee, 0x06ef,
- 0x06fa, 0x06fc,
- 0x06ff, 0x06ff,
- 0x0710, 0x0710,
- 0x0712, 0x072f,
- 0x074d, 0x07a5,
- 0x07b1, 0x07b1,
- 0x07ca, 0x07ea,
- 0x07f4, 0x07f5,
- 0x07fa, 0x07fa,
- 0x0904, 0x0939,
- 0x093d, 0x093d,
- 0x0950, 0x0950,
- 0x0958, 0x0961,
- 0x0971, 0x0972,
- 0x097b, 0x097f,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bd, 0x09bd,
- 0x09ce, 0x09ce,
- 0x09dc, 0x09dd,
- 0x09df, 0x09e1,
- 0x09f0, 0x09f1,
- 0x0a05, 0x0a0a,
- 0x0a0f, 0x0a10,
- 0x0a13, 0x0a28,
- 0x0a2a, 0x0a30,
- 0x0a32, 0x0a33,
- 0x0a35, 0x0a36,
- 0x0a38, 0x0a39,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a72, 0x0a74,
- 0x0a85, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abd, 0x0abd,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae1,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b35, 0x0b39,
- 0x0b3d, 0x0b3d,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b61,
- 0x0b71, 0x0b71,
- 0x0b83, 0x0b83,
- 0x0b85, 0x0b8a,
- 0x0b8e, 0x0b90,
- 0x0b92, 0x0b95,
- 0x0b99, 0x0b9a,
- 0x0b9c, 0x0b9c,
- 0x0b9e, 0x0b9f,
- 0x0ba3, 0x0ba4,
- 0x0ba8, 0x0baa,
- 0x0bae, 0x0bb9,
- 0x0bd0, 0x0bd0,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3d, 0x0c3d,
- 0x0c58, 0x0c59,
- 0x0c60, 0x0c61,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbd, 0x0cbd,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce1,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3d, 0x0d3d,
- 0x0d60, 0x0d61,
- 0x0d7a, 0x0d7f,
- 0x0d85, 0x0d96,
- 0x0d9a, 0x0db1,
- 0x0db3, 0x0dbb,
- 0x0dbd, 0x0dbd,
- 0x0dc0, 0x0dc6,
- 0x0e01, 0x0e30,
- 0x0e32, 0x0e33,
- 0x0e40, 0x0e46,
- 0x0e81, 0x0e82,
- 0x0e84, 0x0e84,
- 0x0e87, 0x0e88,
- 0x0e8a, 0x0e8a,
- 0x0e8d, 0x0e8d,
- 0x0e94, 0x0e97,
- 0x0e99, 0x0e9f,
- 0x0ea1, 0x0ea3,
- 0x0ea5, 0x0ea5,
- 0x0ea7, 0x0ea7,
- 0x0eaa, 0x0eab,
- 0x0ead, 0x0eb0,
- 0x0eb2, 0x0eb3,
- 0x0ebd, 0x0ebd,
- 0x0ec0, 0x0ec4,
- 0x0ec6, 0x0ec6,
- 0x0edc, 0x0edd,
- 0x0f00, 0x0f00,
- 0x0f40, 0x0f47,
- 0x0f49, 0x0f6c,
- 0x0f88, 0x0f8b,
- 0x1000, 0x102a,
- 0x103f, 0x103f,
- 0x1050, 0x1055,
- 0x105a, 0x105d,
- 0x1061, 0x1061,
- 0x1065, 0x1066,
- 0x106e, 0x1070,
- 0x1075, 0x1081,
- 0x108e, 0x108e,
- 0x10a0, 0x10c5,
- 0x10d0, 0x10fa,
- 0x10fc, 0x10fc,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x1200, 0x1248,
- 0x124a, 0x124d,
- 0x1250, 0x1256,
- 0x1258, 0x1258,
- 0x125a, 0x125d,
- 0x1260, 0x1288,
- 0x128a, 0x128d,
- 0x1290, 0x12b0,
- 0x12b2, 0x12b5,
- 0x12b8, 0x12be,
- 0x12c0, 0x12c0,
- 0x12c2, 0x12c5,
- 0x12c8, 0x12d6,
- 0x12d8, 0x1310,
- 0x1312, 0x1315,
- 0x1318, 0x135a,
- 0x1380, 0x138f,
- 0x13a0, 0x13f4,
- 0x1401, 0x166c,
- 0x166f, 0x1676,
- 0x1681, 0x169a,
- 0x16a0, 0x16ea,
- 0x1700, 0x170c,
- 0x170e, 0x1711,
- 0x1720, 0x1731,
- 0x1740, 0x1751,
- 0x1760, 0x176c,
- 0x176e, 0x1770,
- 0x1780, 0x17b3,
- 0x17d7, 0x17d7,
- 0x17dc, 0x17dc,
- 0x1820, 0x1877,
- 0x1880, 0x18a8,
- 0x18aa, 0x18aa,
- 0x1900, 0x191c,
- 0x1950, 0x196d,
- 0x1970, 0x1974,
- 0x1980, 0x19a9,
- 0x19c1, 0x19c7,
- 0x1a00, 0x1a16,
- 0x1b05, 0x1b33,
- 0x1b45, 0x1b4b,
- 0x1b83, 0x1ba0,
- 0x1bae, 0x1baf,
- 0x1c00, 0x1c23,
- 0x1c4d, 0x1c4f,
- 0x1c5a, 0x1c7d,
- 0x1d00, 0x1dbf,
- 0x1e00, 0x1f15,
- 0x1f18, 0x1f1d,
- 0x1f20, 0x1f45,
- 0x1f48, 0x1f4d,
- 0x1f50, 0x1f57,
- 0x1f59, 0x1f59,
- 0x1f5b, 0x1f5b,
- 0x1f5d, 0x1f5d,
- 0x1f5f, 0x1f7d,
- 0x1f80, 0x1fb4,
- 0x1fb6, 0x1fbc,
- 0x1fbe, 0x1fbe,
- 0x1fc2, 0x1fc4,
- 0x1fc6, 0x1fcc,
- 0x1fd0, 0x1fd3,
- 0x1fd6, 0x1fdb,
- 0x1fe0, 0x1fec,
- 0x1ff2, 0x1ff4,
- 0x1ff6, 0x1ffc,
- 0x2071, 0x2071,
- 0x207f, 0x207f,
- 0x2090, 0x2094,
- 0x2102, 0x2102,
- 0x2107, 0x2107,
- 0x210a, 0x2113,
- 0x2115, 0x2115,
- 0x2119, 0x211d,
- 0x2124, 0x2124,
- 0x2126, 0x2126,
- 0x2128, 0x2128,
- 0x212a, 0x212d,
- 0x212f, 0x2139,
- 0x213c, 0x213f,
- 0x2145, 0x2149,
- 0x214e, 0x214e,
- 0x2183, 0x2184,
- 0x2c00, 0x2c2e,
- 0x2c30, 0x2c5e,
- 0x2c60, 0x2c6f,
- 0x2c71, 0x2c7d,
- 0x2c80, 0x2ce4,
- 0x2d00, 0x2d25,
- 0x2d30, 0x2d65,
- 0x2d6f, 0x2d6f,
- 0x2d80, 0x2d96,
- 0x2da0, 0x2da6,
- 0x2da8, 0x2dae,
- 0x2db0, 0x2db6,
- 0x2db8, 0x2dbe,
- 0x2dc0, 0x2dc6,
- 0x2dc8, 0x2dce,
- 0x2dd0, 0x2dd6,
- 0x2dd8, 0x2dde,
- 0x2e2f, 0x2e2f,
- 0x3005, 0x3006,
- 0x3031, 0x3035,
- 0x303b, 0x303c,
- 0x3041, 0x3096,
- 0x309d, 0x309f,
- 0x30a1, 0x30fa,
- 0x30fc, 0x30ff,
- 0x3105, 0x312d,
- 0x3131, 0x318e,
- 0x31a0, 0x31b7,
- 0x31f0, 0x31ff,
- 0x3400, 0x3400,
- 0x4db5, 0x4db5,
- 0x4e00, 0x4e00,
- 0x9fc3, 0x9fc3,
- 0xa000, 0xa48c,
- 0xa500, 0xa60c,
- 0xa610, 0xa61f,
- 0xa62a, 0xa62b,
- 0xa640, 0xa65f,
- 0xa662, 0xa66e,
- 0xa67f, 0xa697,
- 0xa717, 0xa71f,
- 0xa722, 0xa788,
- 0xa78b, 0xa78c,
- 0xa7fb, 0xa801,
- 0xa803, 0xa805,
- 0xa807, 0xa80a,
- 0xa80c, 0xa822,
- 0xa840, 0xa873,
- 0xa882, 0xa8b3,
- 0xa90a, 0xa925,
- 0xa930, 0xa946,
- 0xaa00, 0xaa28,
- 0xaa40, 0xaa42,
- 0xaa44, 0xaa4b,
- 0xac00, 0xac00,
- 0xd7a3, 0xd7a3,
- 0xf900, 0xfa2d,
- 0xfa30, 0xfa6a,
- 0xfa70, 0xfad9,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xfb1d, 0xfb1d,
- 0xfb1f, 0xfb28,
- 0xfb2a, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbb1,
- 0xfbd3, 0xfd3d,
- 0xfd50, 0xfd8f,
- 0xfd92, 0xfdc7,
- 0xfdf0, 0xfdfb,
- 0xfe70, 0xfe74,
- 0xfe76, 0xfefc,
- 0xff21, 0xff3a,
- 0xff41, 0xff5a,
- 0xff66, 0xffbe,
- 0xffc2, 0xffc7,
- 0xffca, 0xffcf,
- 0xffd2, 0xffd7,
- 0xffda, 0xffdc,
- 0x10000, 0x1000b,
- 0x1000d, 0x10026,
- 0x10028, 0x1003a,
- 0x1003c, 0x1003d,
- 0x1003f, 0x1004d,
- 0x10050, 0x1005d,
- 0x10080, 0x100fa,
- 0x10280, 0x1029c,
- 0x102a0, 0x102d0,
- 0x10300, 0x1031e,
- 0x10330, 0x10340,
- 0x10342, 0x10349,
- 0x10380, 0x1039d,
- 0x103a0, 0x103c3,
- 0x103c8, 0x103cf,
- 0x10400, 0x1049d,
- 0x10800, 0x10805,
- 0x10808, 0x10808,
- 0x1080a, 0x10835,
- 0x10837, 0x10838,
- 0x1083c, 0x1083c,
- 0x1083f, 0x1083f,
- 0x10900, 0x10915,
- 0x10920, 0x10939,
- 0x10a00, 0x10a00,
- 0x10a10, 0x10a13,
- 0x10a15, 0x10a17,
- 0x10a19, 0x10a33,
- 0x12000, 0x1236e,
- 0x1d400, 0x1d454,
- 0x1d456, 0x1d49c,
- 0x1d49e, 0x1d49f,
- 0x1d4a2, 0x1d4a2,
- 0x1d4a5, 0x1d4a6,
- 0x1d4a9, 0x1d4ac,
- 0x1d4ae, 0x1d4b9,
- 0x1d4bb, 0x1d4bb,
- 0x1d4bd, 0x1d4c3,
- 0x1d4c5, 0x1d505,
- 0x1d507, 0x1d50a,
- 0x1d50d, 0x1d514,
- 0x1d516, 0x1d51c,
- 0x1d51e, 0x1d539,
- 0x1d53b, 0x1d53e,
- 0x1d540, 0x1d544,
- 0x1d546, 0x1d546,
- 0x1d54a, 0x1d550,
- 0x1d552, 0x1d6a5,
- 0x1d6a8, 0x1d6c0,
- 0x1d6c2, 0x1d6da,
- 0x1d6dc, 0x1d6fa,
- 0x1d6fc, 0x1d714,
- 0x1d716, 0x1d734,
- 0x1d736, 0x1d74e,
- 0x1d750, 0x1d76e,
- 0x1d770, 0x1d788,
- 0x1d78a, 0x1d7a8,
- 0x1d7aa, 0x1d7c2,
- 0x1d7c4, 0x1d7cb,
- 0x20000, 0x20000,
- 0x2a6d6, 0x2a6d6,
- 0x2f800, 0x2fa1d,
-}; /* CR_L */
-
-/* 'Ll': General Category */
-static const OnigCodePoint CR_Ll[] = {
- 598,
- 0x0061, 0x007a,
- 0x00aa, 0x00aa,
- 0x00b5, 0x00b5,
- 0x00ba, 0x00ba,
- 0x00df, 0x00f6,
- 0x00f8, 0x00ff,
- 0x0101, 0x0101,
- 0x0103, 0x0103,
- 0x0105, 0x0105,
- 0x0107, 0x0107,
- 0x0109, 0x0109,
- 0x010b, 0x010b,
- 0x010d, 0x010d,
- 0x010f, 0x010f,
- 0x0111, 0x0111,
- 0x0113, 0x0113,
- 0x0115, 0x0115,
- 0x0117, 0x0117,
- 0x0119, 0x0119,
- 0x011b, 0x011b,
- 0x011d, 0x011d,
- 0x011f, 0x011f,
- 0x0121, 0x0121,
- 0x0123, 0x0123,
- 0x0125, 0x0125,
- 0x0127, 0x0127,
- 0x0129, 0x0129,
- 0x012b, 0x012b,
- 0x012d, 0x012d,
- 0x012f, 0x012f,
- 0x0131, 0x0131,
- 0x0133, 0x0133,
- 0x0135, 0x0135,
- 0x0137, 0x0138,
- 0x013a, 0x013a,
- 0x013c, 0x013c,
- 0x013e, 0x013e,
- 0x0140, 0x0140,
- 0x0142, 0x0142,
- 0x0144, 0x0144,
- 0x0146, 0x0146,
- 0x0148, 0x0149,
- 0x014b, 0x014b,
- 0x014d, 0x014d,
- 0x014f, 0x014f,
- 0x0151, 0x0151,
- 0x0153, 0x0153,
- 0x0155, 0x0155,
- 0x0157, 0x0157,
- 0x0159, 0x0159,
- 0x015b, 0x015b,
- 0x015d, 0x015d,
- 0x015f, 0x015f,
- 0x0161, 0x0161,
- 0x0163, 0x0163,
- 0x0165, 0x0165,
- 0x0167, 0x0167,
- 0x0169, 0x0169,
- 0x016b, 0x016b,
- 0x016d, 0x016d,
- 0x016f, 0x016f,
- 0x0171, 0x0171,
- 0x0173, 0x0173,
- 0x0175, 0x0175,
- 0x0177, 0x0177,
- 0x017a, 0x017a,
- 0x017c, 0x017c,
- 0x017e, 0x0180,
- 0x0183, 0x0183,
- 0x0185, 0x0185,
- 0x0188, 0x0188,
- 0x018c, 0x018d,
- 0x0192, 0x0192,
- 0x0195, 0x0195,
- 0x0199, 0x019b,
- 0x019e, 0x019e,
- 0x01a1, 0x01a1,
- 0x01a3, 0x01a3,
- 0x01a5, 0x01a5,
- 0x01a8, 0x01a8,
- 0x01aa, 0x01ab,
- 0x01ad, 0x01ad,
- 0x01b0, 0x01b0,
- 0x01b4, 0x01b4,
- 0x01b6, 0x01b6,
- 0x01b9, 0x01ba,
- 0x01bd, 0x01bf,
- 0x01c6, 0x01c6,
- 0x01c9, 0x01c9,
- 0x01cc, 0x01cc,
- 0x01ce, 0x01ce,
- 0x01d0, 0x01d0,
- 0x01d2, 0x01d2,
- 0x01d4, 0x01d4,
- 0x01d6, 0x01d6,
- 0x01d8, 0x01d8,
- 0x01da, 0x01da,
- 0x01dc, 0x01dd,
- 0x01df, 0x01df,
- 0x01e1, 0x01e1,
- 0x01e3, 0x01e3,
- 0x01e5, 0x01e5,
- 0x01e7, 0x01e7,
- 0x01e9, 0x01e9,
- 0x01eb, 0x01eb,
- 0x01ed, 0x01ed,
- 0x01ef, 0x01f0,
- 0x01f3, 0x01f3,
- 0x01f5, 0x01f5,
- 0x01f9, 0x01f9,
- 0x01fb, 0x01fb,
- 0x01fd, 0x01fd,
- 0x01ff, 0x01ff,
- 0x0201, 0x0201,
- 0x0203, 0x0203,
- 0x0205, 0x0205,
- 0x0207, 0x0207,
- 0x0209, 0x0209,
- 0x020b, 0x020b,
- 0x020d, 0x020d,
- 0x020f, 0x020f,
- 0x0211, 0x0211,
- 0x0213, 0x0213,
- 0x0215, 0x0215,
- 0x0217, 0x0217,
- 0x0219, 0x0219,
- 0x021b, 0x021b,
- 0x021d, 0x021d,
- 0x021f, 0x021f,
- 0x0221, 0x0221,
- 0x0223, 0x0223,
- 0x0225, 0x0225,
- 0x0227, 0x0227,
- 0x0229, 0x0229,
- 0x022b, 0x022b,
- 0x022d, 0x022d,
- 0x022f, 0x022f,
- 0x0231, 0x0231,
- 0x0233, 0x0239,
- 0x023c, 0x023c,
- 0x023f, 0x0240,
- 0x0242, 0x0242,
- 0x0247, 0x0247,
- 0x0249, 0x0249,
- 0x024b, 0x024b,
- 0x024d, 0x024d,
- 0x024f, 0x0293,
- 0x0295, 0x02af,
- 0x0371, 0x0371,
- 0x0373, 0x0373,
- 0x0377, 0x0377,
- 0x037b, 0x037d,
- 0x0390, 0x0390,
- 0x03ac, 0x03ce,
- 0x03d0, 0x03d1,
- 0x03d5, 0x03d7,
- 0x03d9, 0x03d9,
- 0x03db, 0x03db,
- 0x03dd, 0x03dd,
- 0x03df, 0x03df,
- 0x03e1, 0x03e1,
- 0x03e3, 0x03e3,
- 0x03e5, 0x03e5,
- 0x03e7, 0x03e7,
- 0x03e9, 0x03e9,
- 0x03eb, 0x03eb,
- 0x03ed, 0x03ed,
- 0x03ef, 0x03f3,
- 0x03f5, 0x03f5,
- 0x03f8, 0x03f8,
- 0x03fb, 0x03fc,
- 0x0430, 0x045f,
- 0x0461, 0x0461,
- 0x0463, 0x0463,
- 0x0465, 0x0465,
- 0x0467, 0x0467,
- 0x0469, 0x0469,
- 0x046b, 0x046b,
- 0x046d, 0x046d,
- 0x046f, 0x046f,
- 0x0471, 0x0471,
- 0x0473, 0x0473,
- 0x0475, 0x0475,
- 0x0477, 0x0477,
- 0x0479, 0x0479,
- 0x047b, 0x047b,
- 0x047d, 0x047d,
- 0x047f, 0x047f,
- 0x0481, 0x0481,
- 0x048b, 0x048b,
- 0x048d, 0x048d,
- 0x048f, 0x048f,
- 0x0491, 0x0491,
- 0x0493, 0x0493,
- 0x0495, 0x0495,
- 0x0497, 0x0497,
- 0x0499, 0x0499,
- 0x049b, 0x049b,
- 0x049d, 0x049d,
- 0x049f, 0x049f,
- 0x04a1, 0x04a1,
- 0x04a3, 0x04a3,
- 0x04a5, 0x04a5,
- 0x04a7, 0x04a7,
- 0x04a9, 0x04a9,
- 0x04ab, 0x04ab,
- 0x04ad, 0x04ad,
- 0x04af, 0x04af,
- 0x04b1, 0x04b1,
- 0x04b3, 0x04b3,
- 0x04b5, 0x04b5,
- 0x04b7, 0x04b7,
- 0x04b9, 0x04b9,
- 0x04bb, 0x04bb,
- 0x04bd, 0x04bd,
- 0x04bf, 0x04bf,
- 0x04c2, 0x04c2,
- 0x04c4, 0x04c4,
- 0x04c6, 0x04c6,
- 0x04c8, 0x04c8,
- 0x04ca, 0x04ca,
- 0x04cc, 0x04cc,
- 0x04ce, 0x04cf,
- 0x04d1, 0x04d1,
- 0x04d3, 0x04d3,
- 0x04d5, 0x04d5,
- 0x04d7, 0x04d7,
- 0x04d9, 0x04d9,
- 0x04db, 0x04db,
- 0x04dd, 0x04dd,
- 0x04df, 0x04df,
- 0x04e1, 0x04e1,
- 0x04e3, 0x04e3,
- 0x04e5, 0x04e5,
- 0x04e7, 0x04e7,
- 0x04e9, 0x04e9,
- 0x04eb, 0x04eb,
- 0x04ed, 0x04ed,
- 0x04ef, 0x04ef,
- 0x04f1, 0x04f1,
- 0x04f3, 0x04f3,
- 0x04f5, 0x04f5,
- 0x04f7, 0x04f7,
- 0x04f9, 0x04f9,
- 0x04fb, 0x04fb,
- 0x04fd, 0x04fd,
- 0x04ff, 0x04ff,
- 0x0501, 0x0501,
- 0x0503, 0x0503,
- 0x0505, 0x0505,
- 0x0507, 0x0507,
- 0x0509, 0x0509,
- 0x050b, 0x050b,
- 0x050d, 0x050d,
- 0x050f, 0x050f,
- 0x0511, 0x0511,
- 0x0513, 0x0513,
- 0x0515, 0x0515,
- 0x0517, 0x0517,
- 0x0519, 0x0519,
- 0x051b, 0x051b,
- 0x051d, 0x051d,
- 0x051f, 0x051f,
- 0x0521, 0x0521,
- 0x0523, 0x0523,
- 0x0561, 0x0587,
- 0x1d00, 0x1d2b,
- 0x1d62, 0x1d77,
- 0x1d79, 0x1d9a,
- 0x1e01, 0x1e01,
- 0x1e03, 0x1e03,
- 0x1e05, 0x1e05,
- 0x1e07, 0x1e07,
- 0x1e09, 0x1e09,
- 0x1e0b, 0x1e0b,
- 0x1e0d, 0x1e0d,
- 0x1e0f, 0x1e0f,
- 0x1e11, 0x1e11,
- 0x1e13, 0x1e13,
- 0x1e15, 0x1e15,
- 0x1e17, 0x1e17,
- 0x1e19, 0x1e19,
- 0x1e1b, 0x1e1b,
- 0x1e1d, 0x1e1d,
- 0x1e1f, 0x1e1f,
- 0x1e21, 0x1e21,
- 0x1e23, 0x1e23,
- 0x1e25, 0x1e25,
- 0x1e27, 0x1e27,
- 0x1e29, 0x1e29,
- 0x1e2b, 0x1e2b,
- 0x1e2d, 0x1e2d,
- 0x1e2f, 0x1e2f,
- 0x1e31, 0x1e31,
- 0x1e33, 0x1e33,
- 0x1e35, 0x1e35,
- 0x1e37, 0x1e37,
- 0x1e39, 0x1e39,
- 0x1e3b, 0x1e3b,
- 0x1e3d, 0x1e3d,
- 0x1e3f, 0x1e3f,
- 0x1e41, 0x1e41,
- 0x1e43, 0x1e43,
- 0x1e45, 0x1e45,
- 0x1e47, 0x1e47,
- 0x1e49, 0x1e49,
- 0x1e4b, 0x1e4b,
- 0x1e4d, 0x1e4d,
- 0x1e4f, 0x1e4f,
- 0x1e51, 0x1e51,
- 0x1e53, 0x1e53,
- 0x1e55, 0x1e55,
- 0x1e57, 0x1e57,
- 0x1e59, 0x1e59,
- 0x1e5b, 0x1e5b,
- 0x1e5d, 0x1e5d,
- 0x1e5f, 0x1e5f,
- 0x1e61, 0x1e61,
- 0x1e63, 0x1e63,
- 0x1e65, 0x1e65,
- 0x1e67, 0x1e67,
- 0x1e69, 0x1e69,
- 0x1e6b, 0x1e6b,
- 0x1e6d, 0x1e6d,
- 0x1e6f, 0x1e6f,
- 0x1e71, 0x1e71,
- 0x1e73, 0x1e73,
- 0x1e75, 0x1e75,
- 0x1e77, 0x1e77,
- 0x1e79, 0x1e79,
- 0x1e7b, 0x1e7b,
- 0x1e7d, 0x1e7d,
- 0x1e7f, 0x1e7f,
- 0x1e81, 0x1e81,
- 0x1e83, 0x1e83,
- 0x1e85, 0x1e85,
- 0x1e87, 0x1e87,
- 0x1e89, 0x1e89,
- 0x1e8b, 0x1e8b,
- 0x1e8d, 0x1e8d,
- 0x1e8f, 0x1e8f,
- 0x1e91, 0x1e91,
- 0x1e93, 0x1e93,
- 0x1e95, 0x1e9d,
- 0x1e9f, 0x1e9f,
- 0x1ea1, 0x1ea1,
- 0x1ea3, 0x1ea3,
- 0x1ea5, 0x1ea5,
- 0x1ea7, 0x1ea7,
- 0x1ea9, 0x1ea9,
- 0x1eab, 0x1eab,
- 0x1ead, 0x1ead,
- 0x1eaf, 0x1eaf,
- 0x1eb1, 0x1eb1,
- 0x1eb3, 0x1eb3,
- 0x1eb5, 0x1eb5,
- 0x1eb7, 0x1eb7,
- 0x1eb9, 0x1eb9,
- 0x1ebb, 0x1ebb,
- 0x1ebd, 0x1ebd,
- 0x1ebf, 0x1ebf,
- 0x1ec1, 0x1ec1,
- 0x1ec3, 0x1ec3,
- 0x1ec5, 0x1ec5,
- 0x1ec7, 0x1ec7,
- 0x1ec9, 0x1ec9,
- 0x1ecb, 0x1ecb,
- 0x1ecd, 0x1ecd,
- 0x1ecf, 0x1ecf,
- 0x1ed1, 0x1ed1,
- 0x1ed3, 0x1ed3,
- 0x1ed5, 0x1ed5,
- 0x1ed7, 0x1ed7,
- 0x1ed9, 0x1ed9,
- 0x1edb, 0x1edb,
- 0x1edd, 0x1edd,
- 0x1edf, 0x1edf,
- 0x1ee1, 0x1ee1,
- 0x1ee3, 0x1ee3,
- 0x1ee5, 0x1ee5,
- 0x1ee7, 0x1ee7,
- 0x1ee9, 0x1ee9,
- 0x1eeb, 0x1eeb,
- 0x1eed, 0x1eed,
- 0x1eef, 0x1eef,
- 0x1ef1, 0x1ef1,
- 0x1ef3, 0x1ef3,
- 0x1ef5, 0x1ef5,
- 0x1ef7, 0x1ef7,
- 0x1ef9, 0x1ef9,
- 0x1efb, 0x1efb,
- 0x1efd, 0x1efd,
- 0x1eff, 0x1f07,
- 0x1f10, 0x1f15,
- 0x1f20, 0x1f27,
- 0x1f30, 0x1f37,
- 0x1f40, 0x1f45,
- 0x1f50, 0x1f57,
- 0x1f60, 0x1f67,
- 0x1f70, 0x1f7d,
- 0x1f80, 0x1f87,
- 0x1f90, 0x1f97,
- 0x1fa0, 0x1fa7,
- 0x1fb0, 0x1fb4,
- 0x1fb6, 0x1fb7,
- 0x1fbe, 0x1fbe,
- 0x1fc2, 0x1fc4,
- 0x1fc6, 0x1fc7,
- 0x1fd0, 0x1fd3,
- 0x1fd6, 0x1fd7,
- 0x1fe0, 0x1fe7,
- 0x1ff2, 0x1ff4,
- 0x1ff6, 0x1ff7,
- 0x2071, 0x2071,
- 0x207f, 0x207f,
- 0x210a, 0x210a,
- 0x210e, 0x210f,
- 0x2113, 0x2113,
- 0x212f, 0x212f,
- 0x2134, 0x2134,
- 0x2139, 0x2139,
- 0x213c, 0x213d,
- 0x2146, 0x2149,
- 0x214e, 0x214e,
- 0x2184, 0x2184,
- 0x2c30, 0x2c5e,
- 0x2c61, 0x2c61,
- 0x2c65, 0x2c66,
- 0x2c68, 0x2c68,
- 0x2c6a, 0x2c6a,
- 0x2c6c, 0x2c6c,
- 0x2c71, 0x2c71,
- 0x2c73, 0x2c74,
- 0x2c76, 0x2c7c,
- 0x2c81, 0x2c81,
- 0x2c83, 0x2c83,
- 0x2c85, 0x2c85,
- 0x2c87, 0x2c87,
- 0x2c89, 0x2c89,
- 0x2c8b, 0x2c8b,
- 0x2c8d, 0x2c8d,
- 0x2c8f, 0x2c8f,
- 0x2c91, 0x2c91,
- 0x2c93, 0x2c93,
- 0x2c95, 0x2c95,
- 0x2c97, 0x2c97,
- 0x2c99, 0x2c99,
- 0x2c9b, 0x2c9b,
- 0x2c9d, 0x2c9d,
- 0x2c9f, 0x2c9f,
- 0x2ca1, 0x2ca1,
- 0x2ca3, 0x2ca3,
- 0x2ca5, 0x2ca5,
- 0x2ca7, 0x2ca7,
- 0x2ca9, 0x2ca9,
- 0x2cab, 0x2cab,
- 0x2cad, 0x2cad,
- 0x2caf, 0x2caf,
- 0x2cb1, 0x2cb1,
- 0x2cb3, 0x2cb3,
- 0x2cb5, 0x2cb5,
- 0x2cb7, 0x2cb7,
- 0x2cb9, 0x2cb9,
- 0x2cbb, 0x2cbb,
- 0x2cbd, 0x2cbd,
- 0x2cbf, 0x2cbf,
- 0x2cc1, 0x2cc1,
- 0x2cc3, 0x2cc3,
- 0x2cc5, 0x2cc5,
- 0x2cc7, 0x2cc7,
- 0x2cc9, 0x2cc9,
- 0x2ccb, 0x2ccb,
- 0x2ccd, 0x2ccd,
- 0x2ccf, 0x2ccf,
- 0x2cd1, 0x2cd1,
- 0x2cd3, 0x2cd3,
- 0x2cd5, 0x2cd5,
- 0x2cd7, 0x2cd7,
- 0x2cd9, 0x2cd9,
- 0x2cdb, 0x2cdb,
- 0x2cdd, 0x2cdd,
- 0x2cdf, 0x2cdf,
- 0x2ce1, 0x2ce1,
- 0x2ce3, 0x2ce4,
- 0x2d00, 0x2d25,
- 0xa641, 0xa641,
- 0xa643, 0xa643,
- 0xa645, 0xa645,
- 0xa647, 0xa647,
- 0xa649, 0xa649,
- 0xa64b, 0xa64b,
- 0xa64d, 0xa64d,
- 0xa64f, 0xa64f,
- 0xa651, 0xa651,
- 0xa653, 0xa653,
- 0xa655, 0xa655,
- 0xa657, 0xa657,
- 0xa659, 0xa659,
- 0xa65b, 0xa65b,
- 0xa65d, 0xa65d,
- 0xa65f, 0xa65f,
- 0xa663, 0xa663,
- 0xa665, 0xa665,
- 0xa667, 0xa667,
- 0xa669, 0xa669,
- 0xa66b, 0xa66b,
- 0xa66d, 0xa66d,
- 0xa681, 0xa681,
- 0xa683, 0xa683,
- 0xa685, 0xa685,
- 0xa687, 0xa687,
- 0xa689, 0xa689,
- 0xa68b, 0xa68b,
- 0xa68d, 0xa68d,
- 0xa68f, 0xa68f,
- 0xa691, 0xa691,
- 0xa693, 0xa693,
- 0xa695, 0xa695,
- 0xa697, 0xa697,
- 0xa723, 0xa723,
- 0xa725, 0xa725,
- 0xa727, 0xa727,
- 0xa729, 0xa729,
- 0xa72b, 0xa72b,
- 0xa72d, 0xa72d,
- 0xa72f, 0xa731,
- 0xa733, 0xa733,
- 0xa735, 0xa735,
- 0xa737, 0xa737,
- 0xa739, 0xa739,
- 0xa73b, 0xa73b,
- 0xa73d, 0xa73d,
- 0xa73f, 0xa73f,
- 0xa741, 0xa741,
- 0xa743, 0xa743,
- 0xa745, 0xa745,
- 0xa747, 0xa747,
- 0xa749, 0xa749,
- 0xa74b, 0xa74b,
- 0xa74d, 0xa74d,
- 0xa74f, 0xa74f,
- 0xa751, 0xa751,
- 0xa753, 0xa753,
- 0xa755, 0xa755,
- 0xa757, 0xa757,
- 0xa759, 0xa759,
- 0xa75b, 0xa75b,
- 0xa75d, 0xa75d,
- 0xa75f, 0xa75f,
- 0xa761, 0xa761,
- 0xa763, 0xa763,
- 0xa765, 0xa765,
- 0xa767, 0xa767,
- 0xa769, 0xa769,
- 0xa76b, 0xa76b,
- 0xa76d, 0xa76d,
- 0xa76f, 0xa76f,
- 0xa771, 0xa778,
- 0xa77a, 0xa77a,
- 0xa77c, 0xa77c,
- 0xa77f, 0xa77f,
- 0xa781, 0xa781,
- 0xa783, 0xa783,
- 0xa785, 0xa785,
- 0xa787, 0xa787,
- 0xa78c, 0xa78c,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xff41, 0xff5a,
- 0x10428, 0x1044f,
- 0x1d41a, 0x1d433,
- 0x1d44e, 0x1d454,
- 0x1d456, 0x1d467,
- 0x1d482, 0x1d49b,
- 0x1d4b6, 0x1d4b9,
- 0x1d4bb, 0x1d4bb,
- 0x1d4bd, 0x1d4c3,
- 0x1d4c5, 0x1d4cf,
- 0x1d4ea, 0x1d503,
- 0x1d51e, 0x1d537,
- 0x1d552, 0x1d56b,
- 0x1d586, 0x1d59f,
- 0x1d5ba, 0x1d5d3,
- 0x1d5ee, 0x1d607,
- 0x1d622, 0x1d63b,
- 0x1d656, 0x1d66f,
- 0x1d68a, 0x1d6a5,
- 0x1d6c2, 0x1d6da,
- 0x1d6dc, 0x1d6e1,
- 0x1d6fc, 0x1d714,
- 0x1d716, 0x1d71b,
- 0x1d736, 0x1d74e,
- 0x1d750, 0x1d755,
- 0x1d770, 0x1d788,
- 0x1d78a, 0x1d78f,
- 0x1d7aa, 0x1d7c2,
- 0x1d7c4, 0x1d7c9,
- 0x1d7cb, 0x1d7cb,
-}; /* CR_Ll */
-
-/* 'Lm': General Category */
-static const OnigCodePoint CR_Lm[] = {
- 39,
- 0x02b0, 0x02c1,
- 0x02c6, 0x02d1,
- 0x02e0, 0x02e4,
- 0x02ec, 0x02ec,
- 0x02ee, 0x02ee,
- 0x0374, 0x0374,
- 0x037a, 0x037a,
- 0x0559, 0x0559,
- 0x0640, 0x0640,
- 0x06e5, 0x06e6,
- 0x07f4, 0x07f5,
- 0x07fa, 0x07fa,
- 0x0971, 0x0971,
- 0x0e46, 0x0e46,
- 0x0ec6, 0x0ec6,
- 0x10fc, 0x10fc,
- 0x17d7, 0x17d7,
- 0x1843, 0x1843,
- 0x1c78, 0x1c7d,
- 0x1d2c, 0x1d61,
- 0x1d78, 0x1d78,
- 0x1d9b, 0x1dbf,
- 0x2090, 0x2094,
- 0x2c7d, 0x2c7d,
- 0x2d6f, 0x2d6f,
- 0x2e2f, 0x2e2f,
- 0x3005, 0x3005,
- 0x3031, 0x3035,
- 0x303b, 0x303b,
- 0x309d, 0x309e,
- 0x30fc, 0x30fe,
- 0xa015, 0xa015,
- 0xa60c, 0xa60c,
- 0xa67f, 0xa67f,
- 0xa717, 0xa71f,
- 0xa770, 0xa770,
- 0xa788, 0xa788,
- 0xff70, 0xff70,
- 0xff9e, 0xff9f,
-}; /* CR_Lm */
-
-/* 'Lo': General Category */
-static const OnigCodePoint CR_Lo[] = {
- 286,
- 0x01bb, 0x01bb,
- 0x01c0, 0x01c3,
- 0x0294, 0x0294,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f2,
- 0x0621, 0x063f,
- 0x0641, 0x064a,
- 0x066e, 0x066f,
- 0x0671, 0x06d3,
- 0x06d5, 0x06d5,
- 0x06ee, 0x06ef,
- 0x06fa, 0x06fc,
- 0x06ff, 0x06ff,
- 0x0710, 0x0710,
- 0x0712, 0x072f,
- 0x074d, 0x07a5,
- 0x07b1, 0x07b1,
- 0x07ca, 0x07ea,
- 0x0904, 0x0939,
- 0x093d, 0x093d,
- 0x0950, 0x0950,
- 0x0958, 0x0961,
- 0x0972, 0x0972,
- 0x097b, 0x097f,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bd, 0x09bd,
- 0x09ce, 0x09ce,
- 0x09dc, 0x09dd,
- 0x09df, 0x09e1,
- 0x09f0, 0x09f1,
- 0x0a05, 0x0a0a,
- 0x0a0f, 0x0a10,
- 0x0a13, 0x0a28,
- 0x0a2a, 0x0a30,
- 0x0a32, 0x0a33,
- 0x0a35, 0x0a36,
- 0x0a38, 0x0a39,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a72, 0x0a74,
- 0x0a85, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abd, 0x0abd,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae1,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b35, 0x0b39,
- 0x0b3d, 0x0b3d,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b61,
- 0x0b71, 0x0b71,
- 0x0b83, 0x0b83,
- 0x0b85, 0x0b8a,
- 0x0b8e, 0x0b90,
- 0x0b92, 0x0b95,
- 0x0b99, 0x0b9a,
- 0x0b9c, 0x0b9c,
- 0x0b9e, 0x0b9f,
- 0x0ba3, 0x0ba4,
- 0x0ba8, 0x0baa,
- 0x0bae, 0x0bb9,
- 0x0bd0, 0x0bd0,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3d, 0x0c3d,
- 0x0c58, 0x0c59,
- 0x0c60, 0x0c61,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbd, 0x0cbd,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce1,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3d, 0x0d3d,
- 0x0d60, 0x0d61,
- 0x0d7a, 0x0d7f,
- 0x0d85, 0x0d96,
- 0x0d9a, 0x0db1,
- 0x0db3, 0x0dbb,
- 0x0dbd, 0x0dbd,
- 0x0dc0, 0x0dc6,
- 0x0e01, 0x0e30,
- 0x0e32, 0x0e33,
- 0x0e40, 0x0e45,
- 0x0e81, 0x0e82,
- 0x0e84, 0x0e84,
- 0x0e87, 0x0e88,
- 0x0e8a, 0x0e8a,
- 0x0e8d, 0x0e8d,
- 0x0e94, 0x0e97,
- 0x0e99, 0x0e9f,
- 0x0ea1, 0x0ea3,
- 0x0ea5, 0x0ea5,
- 0x0ea7, 0x0ea7,
- 0x0eaa, 0x0eab,
- 0x0ead, 0x0eb0,
- 0x0eb2, 0x0eb3,
- 0x0ebd, 0x0ebd,
- 0x0ec0, 0x0ec4,
- 0x0edc, 0x0edd,
- 0x0f00, 0x0f00,
- 0x0f40, 0x0f47,
- 0x0f49, 0x0f6c,
- 0x0f88, 0x0f8b,
- 0x1000, 0x102a,
- 0x103f, 0x103f,
- 0x1050, 0x1055,
- 0x105a, 0x105d,
- 0x1061, 0x1061,
- 0x1065, 0x1066,
- 0x106e, 0x1070,
- 0x1075, 0x1081,
- 0x108e, 0x108e,
- 0x10d0, 0x10fa,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x1200, 0x1248,
- 0x124a, 0x124d,
- 0x1250, 0x1256,
- 0x1258, 0x1258,
- 0x125a, 0x125d,
- 0x1260, 0x1288,
- 0x128a, 0x128d,
- 0x1290, 0x12b0,
- 0x12b2, 0x12b5,
- 0x12b8, 0x12be,
- 0x12c0, 0x12c0,
- 0x12c2, 0x12c5,
- 0x12c8, 0x12d6,
- 0x12d8, 0x1310,
- 0x1312, 0x1315,
- 0x1318, 0x135a,
- 0x1380, 0x138f,
- 0x13a0, 0x13f4,
- 0x1401, 0x166c,
- 0x166f, 0x1676,
- 0x1681, 0x169a,
- 0x16a0, 0x16ea,
- 0x1700, 0x170c,
- 0x170e, 0x1711,
- 0x1720, 0x1731,
- 0x1740, 0x1751,
- 0x1760, 0x176c,
- 0x176e, 0x1770,
- 0x1780, 0x17b3,
- 0x17dc, 0x17dc,
- 0x1820, 0x1842,
- 0x1844, 0x1877,
- 0x1880, 0x18a8,
- 0x18aa, 0x18aa,
- 0x1900, 0x191c,
- 0x1950, 0x196d,
- 0x1970, 0x1974,
- 0x1980, 0x19a9,
- 0x19c1, 0x19c7,
- 0x1a00, 0x1a16,
- 0x1b05, 0x1b33,
- 0x1b45, 0x1b4b,
- 0x1b83, 0x1ba0,
- 0x1bae, 0x1baf,
- 0x1c00, 0x1c23,
- 0x1c4d, 0x1c4f,
- 0x1c5a, 0x1c77,
- 0x2135, 0x2138,
- 0x2d30, 0x2d65,
- 0x2d80, 0x2d96,
- 0x2da0, 0x2da6,
- 0x2da8, 0x2dae,
- 0x2db0, 0x2db6,
- 0x2db8, 0x2dbe,
- 0x2dc0, 0x2dc6,
- 0x2dc8, 0x2dce,
- 0x2dd0, 0x2dd6,
- 0x2dd8, 0x2dde,
- 0x3006, 0x3006,
- 0x303c, 0x303c,
- 0x3041, 0x3096,
- 0x309f, 0x309f,
- 0x30a1, 0x30fa,
- 0x30ff, 0x30ff,
- 0x3105, 0x312d,
- 0x3131, 0x318e,
- 0x31a0, 0x31b7,
- 0x31f0, 0x31ff,
- 0x3400, 0x3400,
- 0x4db5, 0x4db5,
- 0x4e00, 0x4e00,
- 0x9fc3, 0x9fc3,
- 0xa000, 0xa014,
- 0xa016, 0xa48c,
- 0xa500, 0xa60b,
- 0xa610, 0xa61f,
- 0xa62a, 0xa62b,
- 0xa66e, 0xa66e,
- 0xa7fb, 0xa801,
- 0xa803, 0xa805,
- 0xa807, 0xa80a,
- 0xa80c, 0xa822,
- 0xa840, 0xa873,
- 0xa882, 0xa8b3,
- 0xa90a, 0xa925,
- 0xa930, 0xa946,
- 0xaa00, 0xaa28,
- 0xaa40, 0xaa42,
- 0xaa44, 0xaa4b,
- 0xac00, 0xac00,
- 0xd7a3, 0xd7a3,
- 0xf900, 0xfa2d,
- 0xfa30, 0xfa6a,
- 0xfa70, 0xfad9,
- 0xfb1d, 0xfb1d,
- 0xfb1f, 0xfb28,
- 0xfb2a, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbb1,
- 0xfbd3, 0xfd3d,
- 0xfd50, 0xfd8f,
- 0xfd92, 0xfdc7,
- 0xfdf0, 0xfdfb,
- 0xfe70, 0xfe74,
- 0xfe76, 0xfefc,
- 0xff66, 0xff6f,
- 0xff71, 0xff9d,
- 0xffa0, 0xffbe,
- 0xffc2, 0xffc7,
- 0xffca, 0xffcf,
- 0xffd2, 0xffd7,
- 0xffda, 0xffdc,
- 0x10000, 0x1000b,
- 0x1000d, 0x10026,
- 0x10028, 0x1003a,
- 0x1003c, 0x1003d,
- 0x1003f, 0x1004d,
- 0x10050, 0x1005d,
- 0x10080, 0x100fa,
- 0x10280, 0x1029c,
- 0x102a0, 0x102d0,
- 0x10300, 0x1031e,
- 0x10330, 0x10340,
- 0x10342, 0x10349,
- 0x10380, 0x1039d,
- 0x103a0, 0x103c3,
- 0x103c8, 0x103cf,
- 0x10450, 0x1049d,
- 0x10800, 0x10805,
- 0x10808, 0x10808,
- 0x1080a, 0x10835,
- 0x10837, 0x10838,
- 0x1083c, 0x1083c,
- 0x1083f, 0x1083f,
- 0x10900, 0x10915,
- 0x10920, 0x10939,
- 0x10a00, 0x10a00,
- 0x10a10, 0x10a13,
- 0x10a15, 0x10a17,
- 0x10a19, 0x10a33,
- 0x12000, 0x1236e,
- 0x20000, 0x20000,
- 0x2a6d6, 0x2a6d6,
- 0x2f800, 0x2fa1d,
-}; /* CR_Lo */
-
-/* 'Lt': General Category */
-static const OnigCodePoint CR_Lt[] = {
- 10,
- 0x01c5, 0x01c5,
- 0x01c8, 0x01c8,
- 0x01cb, 0x01cb,
- 0x01f2, 0x01f2,
- 0x1f88, 0x1f8f,
- 0x1f98, 0x1f9f,
- 0x1fa8, 0x1faf,
- 0x1fbc, 0x1fbc,
- 0x1fcc, 0x1fcc,
- 0x1ffc, 0x1ffc,
-}; /* CR_Lt */
-
-/* 'Lu': General Category */
-static const OnigCodePoint CR_Lu[] = {
- 591,
- 0x0041, 0x005a,
- 0x00c0, 0x00d6,
- 0x00d8, 0x00de,
- 0x0100, 0x0100,
- 0x0102, 0x0102,
- 0x0104, 0x0104,
- 0x0106, 0x0106,
- 0x0108, 0x0108,
- 0x010a, 0x010a,
- 0x010c, 0x010c,
- 0x010e, 0x010e,
- 0x0110, 0x0110,
- 0x0112, 0x0112,
- 0x0114, 0x0114,
- 0x0116, 0x0116,
- 0x0118, 0x0118,
- 0x011a, 0x011a,
- 0x011c, 0x011c,
- 0x011e, 0x011e,
- 0x0120, 0x0120,
- 0x0122, 0x0122,
- 0x0124, 0x0124,
- 0x0126, 0x0126,
- 0x0128, 0x0128,
- 0x012a, 0x012a,
- 0x012c, 0x012c,
- 0x012e, 0x012e,
- 0x0130, 0x0130,
- 0x0132, 0x0132,
- 0x0134, 0x0134,
- 0x0136, 0x0136,
- 0x0139, 0x0139,
- 0x013b, 0x013b,
- 0x013d, 0x013d,
- 0x013f, 0x013f,
- 0x0141, 0x0141,
- 0x0143, 0x0143,
- 0x0145, 0x0145,
- 0x0147, 0x0147,
- 0x014a, 0x014a,
- 0x014c, 0x014c,
- 0x014e, 0x014e,
- 0x0150, 0x0150,
- 0x0152, 0x0152,
- 0x0154, 0x0154,
- 0x0156, 0x0156,
- 0x0158, 0x0158,
- 0x015a, 0x015a,
- 0x015c, 0x015c,
- 0x015e, 0x015e,
- 0x0160, 0x0160,
- 0x0162, 0x0162,
- 0x0164, 0x0164,
- 0x0166, 0x0166,
- 0x0168, 0x0168,
- 0x016a, 0x016a,
- 0x016c, 0x016c,
- 0x016e, 0x016e,
- 0x0170, 0x0170,
- 0x0172, 0x0172,
- 0x0174, 0x0174,
- 0x0176, 0x0176,
- 0x0178, 0x0179,
- 0x017b, 0x017b,
- 0x017d, 0x017d,
- 0x0181, 0x0182,
- 0x0184, 0x0184,
- 0x0186, 0x0187,
- 0x0189, 0x018b,
- 0x018e, 0x0191,
- 0x0193, 0x0194,
- 0x0196, 0x0198,
- 0x019c, 0x019d,
- 0x019f, 0x01a0,
- 0x01a2, 0x01a2,
- 0x01a4, 0x01a4,
- 0x01a6, 0x01a7,
- 0x01a9, 0x01a9,
- 0x01ac, 0x01ac,
- 0x01ae, 0x01af,
- 0x01b1, 0x01b3,
- 0x01b5, 0x01b5,
- 0x01b7, 0x01b8,
- 0x01bc, 0x01bc,
- 0x01c4, 0x01c4,
- 0x01c7, 0x01c7,
- 0x01ca, 0x01ca,
- 0x01cd, 0x01cd,
- 0x01cf, 0x01cf,
- 0x01d1, 0x01d1,
- 0x01d3, 0x01d3,
- 0x01d5, 0x01d5,
- 0x01d7, 0x01d7,
- 0x01d9, 0x01d9,
- 0x01db, 0x01db,
- 0x01de, 0x01de,
- 0x01e0, 0x01e0,
- 0x01e2, 0x01e2,
- 0x01e4, 0x01e4,
- 0x01e6, 0x01e6,
- 0x01e8, 0x01e8,
- 0x01ea, 0x01ea,
- 0x01ec, 0x01ec,
- 0x01ee, 0x01ee,
- 0x01f1, 0x01f1,
- 0x01f4, 0x01f4,
- 0x01f6, 0x01f8,
- 0x01fa, 0x01fa,
- 0x01fc, 0x01fc,
- 0x01fe, 0x01fe,
- 0x0200, 0x0200,
- 0x0202, 0x0202,
- 0x0204, 0x0204,
- 0x0206, 0x0206,
- 0x0208, 0x0208,
- 0x020a, 0x020a,
- 0x020c, 0x020c,
- 0x020e, 0x020e,
- 0x0210, 0x0210,
- 0x0212, 0x0212,
- 0x0214, 0x0214,
- 0x0216, 0x0216,
- 0x0218, 0x0218,
- 0x021a, 0x021a,
- 0x021c, 0x021c,
- 0x021e, 0x021e,
- 0x0220, 0x0220,
- 0x0222, 0x0222,
- 0x0224, 0x0224,
- 0x0226, 0x0226,
- 0x0228, 0x0228,
- 0x022a, 0x022a,
- 0x022c, 0x022c,
- 0x022e, 0x022e,
- 0x0230, 0x0230,
- 0x0232, 0x0232,
- 0x023a, 0x023b,
- 0x023d, 0x023e,
- 0x0241, 0x0241,
- 0x0243, 0x0246,
- 0x0248, 0x0248,
- 0x024a, 0x024a,
- 0x024c, 0x024c,
- 0x024e, 0x024e,
- 0x0370, 0x0370,
- 0x0372, 0x0372,
- 0x0376, 0x0376,
- 0x0386, 0x0386,
- 0x0388, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x038f,
- 0x0391, 0x03a1,
- 0x03a3, 0x03ab,
- 0x03cf, 0x03cf,
- 0x03d2, 0x03d4,
- 0x03d8, 0x03d8,
- 0x03da, 0x03da,
- 0x03dc, 0x03dc,
- 0x03de, 0x03de,
- 0x03e0, 0x03e0,
- 0x03e2, 0x03e2,
- 0x03e4, 0x03e4,
- 0x03e6, 0x03e6,
- 0x03e8, 0x03e8,
- 0x03ea, 0x03ea,
- 0x03ec, 0x03ec,
- 0x03ee, 0x03ee,
- 0x03f4, 0x03f4,
- 0x03f7, 0x03f7,
- 0x03f9, 0x03fa,
- 0x03fd, 0x042f,
- 0x0460, 0x0460,
- 0x0462, 0x0462,
- 0x0464, 0x0464,
- 0x0466, 0x0466,
- 0x0468, 0x0468,
- 0x046a, 0x046a,
- 0x046c, 0x046c,
- 0x046e, 0x046e,
- 0x0470, 0x0470,
- 0x0472, 0x0472,
- 0x0474, 0x0474,
- 0x0476, 0x0476,
- 0x0478, 0x0478,
- 0x047a, 0x047a,
- 0x047c, 0x047c,
- 0x047e, 0x047e,
- 0x0480, 0x0480,
- 0x048a, 0x048a,
- 0x048c, 0x048c,
- 0x048e, 0x048e,
- 0x0490, 0x0490,
- 0x0492, 0x0492,
- 0x0494, 0x0494,
- 0x0496, 0x0496,
- 0x0498, 0x0498,
- 0x049a, 0x049a,
- 0x049c, 0x049c,
- 0x049e, 0x049e,
- 0x04a0, 0x04a0,
- 0x04a2, 0x04a2,
- 0x04a4, 0x04a4,
- 0x04a6, 0x04a6,
- 0x04a8, 0x04a8,
- 0x04aa, 0x04aa,
- 0x04ac, 0x04ac,
- 0x04ae, 0x04ae,
- 0x04b0, 0x04b0,
- 0x04b2, 0x04b2,
- 0x04b4, 0x04b4,
- 0x04b6, 0x04b6,
- 0x04b8, 0x04b8,
- 0x04ba, 0x04ba,
- 0x04bc, 0x04bc,
- 0x04be, 0x04be,
- 0x04c0, 0x04c1,
- 0x04c3, 0x04c3,
- 0x04c5, 0x04c5,
- 0x04c7, 0x04c7,
- 0x04c9, 0x04c9,
- 0x04cb, 0x04cb,
- 0x04cd, 0x04cd,
- 0x04d0, 0x04d0,
- 0x04d2, 0x04d2,
- 0x04d4, 0x04d4,
- 0x04d6, 0x04d6,
- 0x04d8, 0x04d8,
- 0x04da, 0x04da,
- 0x04dc, 0x04dc,
- 0x04de, 0x04de,
- 0x04e0, 0x04e0,
- 0x04e2, 0x04e2,
- 0x04e4, 0x04e4,
- 0x04e6, 0x04e6,
- 0x04e8, 0x04e8,
- 0x04ea, 0x04ea,
- 0x04ec, 0x04ec,
- 0x04ee, 0x04ee,
- 0x04f0, 0x04f0,
- 0x04f2, 0x04f2,
- 0x04f4, 0x04f4,
- 0x04f6, 0x04f6,
- 0x04f8, 0x04f8,
- 0x04fa, 0x04fa,
- 0x04fc, 0x04fc,
- 0x04fe, 0x04fe,
- 0x0500, 0x0500,
- 0x0502, 0x0502,
- 0x0504, 0x0504,
- 0x0506, 0x0506,
- 0x0508, 0x0508,
- 0x050a, 0x050a,
- 0x050c, 0x050c,
- 0x050e, 0x050e,
- 0x0510, 0x0510,
- 0x0512, 0x0512,
- 0x0514, 0x0514,
- 0x0516, 0x0516,
- 0x0518, 0x0518,
- 0x051a, 0x051a,
- 0x051c, 0x051c,
- 0x051e, 0x051e,
- 0x0520, 0x0520,
- 0x0522, 0x0522,
- 0x0531, 0x0556,
- 0x10a0, 0x10c5,
- 0x1e00, 0x1e00,
- 0x1e02, 0x1e02,
- 0x1e04, 0x1e04,
- 0x1e06, 0x1e06,
- 0x1e08, 0x1e08,
- 0x1e0a, 0x1e0a,
- 0x1e0c, 0x1e0c,
- 0x1e0e, 0x1e0e,
- 0x1e10, 0x1e10,
- 0x1e12, 0x1e12,
- 0x1e14, 0x1e14,
- 0x1e16, 0x1e16,
- 0x1e18, 0x1e18,
- 0x1e1a, 0x1e1a,
- 0x1e1c, 0x1e1c,
- 0x1e1e, 0x1e1e,
- 0x1e20, 0x1e20,
- 0x1e22, 0x1e22,
- 0x1e24, 0x1e24,
- 0x1e26, 0x1e26,
- 0x1e28, 0x1e28,
- 0x1e2a, 0x1e2a,
- 0x1e2c, 0x1e2c,
- 0x1e2e, 0x1e2e,
- 0x1e30, 0x1e30,
- 0x1e32, 0x1e32,
- 0x1e34, 0x1e34,
- 0x1e36, 0x1e36,
- 0x1e38, 0x1e38,
- 0x1e3a, 0x1e3a,
- 0x1e3c, 0x1e3c,
- 0x1e3e, 0x1e3e,
- 0x1e40, 0x1e40,
- 0x1e42, 0x1e42,
- 0x1e44, 0x1e44,
- 0x1e46, 0x1e46,
- 0x1e48, 0x1e48,
- 0x1e4a, 0x1e4a,
- 0x1e4c, 0x1e4c,
- 0x1e4e, 0x1e4e,
- 0x1e50, 0x1e50,
- 0x1e52, 0x1e52,
- 0x1e54, 0x1e54,
- 0x1e56, 0x1e56,
- 0x1e58, 0x1e58,
- 0x1e5a, 0x1e5a,
- 0x1e5c, 0x1e5c,
- 0x1e5e, 0x1e5e,
- 0x1e60, 0x1e60,
- 0x1e62, 0x1e62,
- 0x1e64, 0x1e64,
- 0x1e66, 0x1e66,
- 0x1e68, 0x1e68,
- 0x1e6a, 0x1e6a,
- 0x1e6c, 0x1e6c,
- 0x1e6e, 0x1e6e,
- 0x1e70, 0x1e70,
- 0x1e72, 0x1e72,
- 0x1e74, 0x1e74,
- 0x1e76, 0x1e76,
- 0x1e78, 0x1e78,
- 0x1e7a, 0x1e7a,
- 0x1e7c, 0x1e7c,
- 0x1e7e, 0x1e7e,
- 0x1e80, 0x1e80,
- 0x1e82, 0x1e82,
- 0x1e84, 0x1e84,
- 0x1e86, 0x1e86,
- 0x1e88, 0x1e88,
- 0x1e8a, 0x1e8a,
- 0x1e8c, 0x1e8c,
- 0x1e8e, 0x1e8e,
- 0x1e90, 0x1e90,
- 0x1e92, 0x1e92,
- 0x1e94, 0x1e94,
- 0x1e9e, 0x1e9e,
- 0x1ea0, 0x1ea0,
- 0x1ea2, 0x1ea2,
- 0x1ea4, 0x1ea4,
- 0x1ea6, 0x1ea6,
- 0x1ea8, 0x1ea8,
- 0x1eaa, 0x1eaa,
- 0x1eac, 0x1eac,
- 0x1eae, 0x1eae,
- 0x1eb0, 0x1eb0,
- 0x1eb2, 0x1eb2,
- 0x1eb4, 0x1eb4,
- 0x1eb6, 0x1eb6,
- 0x1eb8, 0x1eb8,
- 0x1eba, 0x1eba,
- 0x1ebc, 0x1ebc,
- 0x1ebe, 0x1ebe,
- 0x1ec0, 0x1ec0,
- 0x1ec2, 0x1ec2,
- 0x1ec4, 0x1ec4,
- 0x1ec6, 0x1ec6,
- 0x1ec8, 0x1ec8,
- 0x1eca, 0x1eca,
- 0x1ecc, 0x1ecc,
- 0x1ece, 0x1ece,
- 0x1ed0, 0x1ed0,
- 0x1ed2, 0x1ed2,
- 0x1ed4, 0x1ed4,
- 0x1ed6, 0x1ed6,
- 0x1ed8, 0x1ed8,
- 0x1eda, 0x1eda,
- 0x1edc, 0x1edc,
- 0x1ede, 0x1ede,
- 0x1ee0, 0x1ee0,
- 0x1ee2, 0x1ee2,
- 0x1ee4, 0x1ee4,
- 0x1ee6, 0x1ee6,
- 0x1ee8, 0x1ee8,
- 0x1eea, 0x1eea,
- 0x1eec, 0x1eec,
- 0x1eee, 0x1eee,
- 0x1ef0, 0x1ef0,
- 0x1ef2, 0x1ef2,
- 0x1ef4, 0x1ef4,
- 0x1ef6, 0x1ef6,
- 0x1ef8, 0x1ef8,
- 0x1efa, 0x1efa,
- 0x1efc, 0x1efc,
- 0x1efe, 0x1efe,
- 0x1f08, 0x1f0f,
- 0x1f18, 0x1f1d,
- 0x1f28, 0x1f2f,
- 0x1f38, 0x1f3f,
- 0x1f48, 0x1f4d,
- 0x1f59, 0x1f59,
- 0x1f5b, 0x1f5b,
- 0x1f5d, 0x1f5d,
- 0x1f5f, 0x1f5f,
- 0x1f68, 0x1f6f,
- 0x1fb8, 0x1fbb,
- 0x1fc8, 0x1fcb,
- 0x1fd8, 0x1fdb,
- 0x1fe8, 0x1fec,
- 0x1ff8, 0x1ffb,
- 0x2102, 0x2102,
- 0x2107, 0x2107,
- 0x210b, 0x210d,
- 0x2110, 0x2112,
- 0x2115, 0x2115,
- 0x2119, 0x211d,
- 0x2124, 0x2124,
- 0x2126, 0x2126,
- 0x2128, 0x2128,
- 0x212a, 0x212d,
- 0x2130, 0x2133,
- 0x213e, 0x213f,
- 0x2145, 0x2145,
- 0x2183, 0x2183,
- 0x2c00, 0x2c2e,
- 0x2c60, 0x2c60,
- 0x2c62, 0x2c64,
- 0x2c67, 0x2c67,
- 0x2c69, 0x2c69,
- 0x2c6b, 0x2c6b,
- 0x2c6d, 0x2c6f,
- 0x2c72, 0x2c72,
- 0x2c75, 0x2c75,
- 0x2c80, 0x2c80,
- 0x2c82, 0x2c82,
- 0x2c84, 0x2c84,
- 0x2c86, 0x2c86,
- 0x2c88, 0x2c88,
- 0x2c8a, 0x2c8a,
- 0x2c8c, 0x2c8c,
- 0x2c8e, 0x2c8e,
- 0x2c90, 0x2c90,
- 0x2c92, 0x2c92,
- 0x2c94, 0x2c94,
- 0x2c96, 0x2c96,
- 0x2c98, 0x2c98,
- 0x2c9a, 0x2c9a,
- 0x2c9c, 0x2c9c,
- 0x2c9e, 0x2c9e,
- 0x2ca0, 0x2ca0,
- 0x2ca2, 0x2ca2,
- 0x2ca4, 0x2ca4,
- 0x2ca6, 0x2ca6,
- 0x2ca8, 0x2ca8,
- 0x2caa, 0x2caa,
- 0x2cac, 0x2cac,
- 0x2cae, 0x2cae,
- 0x2cb0, 0x2cb0,
- 0x2cb2, 0x2cb2,
- 0x2cb4, 0x2cb4,
- 0x2cb6, 0x2cb6,
- 0x2cb8, 0x2cb8,
- 0x2cba, 0x2cba,
- 0x2cbc, 0x2cbc,
- 0x2cbe, 0x2cbe,
- 0x2cc0, 0x2cc0,
- 0x2cc2, 0x2cc2,
- 0x2cc4, 0x2cc4,
- 0x2cc6, 0x2cc6,
- 0x2cc8, 0x2cc8,
- 0x2cca, 0x2cca,
- 0x2ccc, 0x2ccc,
- 0x2cce, 0x2cce,
- 0x2cd0, 0x2cd0,
- 0x2cd2, 0x2cd2,
- 0x2cd4, 0x2cd4,
- 0x2cd6, 0x2cd6,
- 0x2cd8, 0x2cd8,
- 0x2cda, 0x2cda,
- 0x2cdc, 0x2cdc,
- 0x2cde, 0x2cde,
- 0x2ce0, 0x2ce0,
- 0x2ce2, 0x2ce2,
- 0xa640, 0xa640,
- 0xa642, 0xa642,
- 0xa644, 0xa644,
- 0xa646, 0xa646,
- 0xa648, 0xa648,
- 0xa64a, 0xa64a,
- 0xa64c, 0xa64c,
- 0xa64e, 0xa64e,
- 0xa650, 0xa650,
- 0xa652, 0xa652,
- 0xa654, 0xa654,
- 0xa656, 0xa656,
- 0xa658, 0xa658,
- 0xa65a, 0xa65a,
- 0xa65c, 0xa65c,
- 0xa65e, 0xa65e,
- 0xa662, 0xa662,
- 0xa664, 0xa664,
- 0xa666, 0xa666,
- 0xa668, 0xa668,
- 0xa66a, 0xa66a,
- 0xa66c, 0xa66c,
- 0xa680, 0xa680,
- 0xa682, 0xa682,
- 0xa684, 0xa684,
- 0xa686, 0xa686,
- 0xa688, 0xa688,
- 0xa68a, 0xa68a,
- 0xa68c, 0xa68c,
- 0xa68e, 0xa68e,
- 0xa690, 0xa690,
- 0xa692, 0xa692,
- 0xa694, 0xa694,
- 0xa696, 0xa696,
- 0xa722, 0xa722,
- 0xa724, 0xa724,
- 0xa726, 0xa726,
- 0xa728, 0xa728,
- 0xa72a, 0xa72a,
- 0xa72c, 0xa72c,
- 0xa72e, 0xa72e,
- 0xa732, 0xa732,
- 0xa734, 0xa734,
- 0xa736, 0xa736,
- 0xa738, 0xa738,
- 0xa73a, 0xa73a,
- 0xa73c, 0xa73c,
- 0xa73e, 0xa73e,
- 0xa740, 0xa740,
- 0xa742, 0xa742,
- 0xa744, 0xa744,
- 0xa746, 0xa746,
- 0xa748, 0xa748,
- 0xa74a, 0xa74a,
- 0xa74c, 0xa74c,
- 0xa74e, 0xa74e,
- 0xa750, 0xa750,
- 0xa752, 0xa752,
- 0xa754, 0xa754,
- 0xa756, 0xa756,
- 0xa758, 0xa758,
- 0xa75a, 0xa75a,
- 0xa75c, 0xa75c,
- 0xa75e, 0xa75e,
- 0xa760, 0xa760,
- 0xa762, 0xa762,
- 0xa764, 0xa764,
- 0xa766, 0xa766,
- 0xa768, 0xa768,
- 0xa76a, 0xa76a,
- 0xa76c, 0xa76c,
- 0xa76e, 0xa76e,
- 0xa779, 0xa779,
- 0xa77b, 0xa77b,
- 0xa77d, 0xa77e,
- 0xa780, 0xa780,
- 0xa782, 0xa782,
- 0xa784, 0xa784,
- 0xa786, 0xa786,
- 0xa78b, 0xa78b,
- 0xff21, 0xff3a,
- 0x10400, 0x10427,
- 0x1d400, 0x1d419,
- 0x1d434, 0x1d44d,
- 0x1d468, 0x1d481,
- 0x1d49c, 0x1d49c,
- 0x1d49e, 0x1d49f,
- 0x1d4a2, 0x1d4a2,
- 0x1d4a5, 0x1d4a6,
- 0x1d4a9, 0x1d4ac,
- 0x1d4ae, 0x1d4b5,
- 0x1d4d0, 0x1d4e9,
- 0x1d504, 0x1d505,
- 0x1d507, 0x1d50a,
- 0x1d50d, 0x1d514,
- 0x1d516, 0x1d51c,
- 0x1d538, 0x1d539,
- 0x1d53b, 0x1d53e,
- 0x1d540, 0x1d544,
- 0x1d546, 0x1d546,
- 0x1d54a, 0x1d550,
- 0x1d56c, 0x1d585,
- 0x1d5a0, 0x1d5b9,
- 0x1d5d4, 0x1d5ed,
- 0x1d608, 0x1d621,
- 0x1d63c, 0x1d655,
- 0x1d670, 0x1d689,
- 0x1d6a8, 0x1d6c0,
- 0x1d6e2, 0x1d6fa,
- 0x1d71c, 0x1d734,
- 0x1d756, 0x1d76e,
- 0x1d790, 0x1d7a8,
- 0x1d7ca, 0x1d7ca,
-}; /* CR_Lu */
-
-/* 'M': Major Category */
-static const OnigCodePoint CR_M[] = {
- 161,
- 0x0300, 0x036f,
- 0x0483, 0x0489,
- 0x0591, 0x05bd,
- 0x05bf, 0x05bf,
- 0x05c1, 0x05c2,
- 0x05c4, 0x05c5,
- 0x05c7, 0x05c7,
- 0x0610, 0x061a,
- 0x064b, 0x065e,
- 0x0670, 0x0670,
- 0x06d6, 0x06dc,
- 0x06de, 0x06e4,
- 0x06e7, 0x06e8,
- 0x06ea, 0x06ed,
- 0x0711, 0x0711,
- 0x0730, 0x074a,
- 0x07a6, 0x07b0,
- 0x07eb, 0x07f3,
- 0x0901, 0x0903,
- 0x093c, 0x093c,
- 0x093e, 0x094d,
- 0x0951, 0x0954,
- 0x0962, 0x0963,
- 0x0981, 0x0983,
- 0x09bc, 0x09bc,
- 0x09be, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09cd,
- 0x09d7, 0x09d7,
- 0x09e2, 0x09e3,
- 0x0a01, 0x0a03,
- 0x0a3c, 0x0a3c,
- 0x0a3e, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4d,
- 0x0a51, 0x0a51,
- 0x0a70, 0x0a71,
- 0x0a75, 0x0a75,
- 0x0a81, 0x0a83,
- 0x0abc, 0x0abc,
- 0x0abe, 0x0ac5,
- 0x0ac7, 0x0ac9,
- 0x0acb, 0x0acd,
- 0x0ae2, 0x0ae3,
- 0x0b01, 0x0b03,
- 0x0b3c, 0x0b3c,
- 0x0b3e, 0x0b44,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b62, 0x0b63,
- 0x0b82, 0x0b82,
- 0x0bbe, 0x0bc2,
- 0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcd,
- 0x0bd7, 0x0bd7,
- 0x0c01, 0x0c03,
- 0x0c3e, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c62, 0x0c63,
- 0x0c82, 0x0c83,
- 0x0cbc, 0x0cbc,
- 0x0cbe, 0x0cc4,
- 0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccd,
- 0x0cd5, 0x0cd6,
- 0x0ce2, 0x0ce3,
- 0x0d02, 0x0d03,
- 0x0d3e, 0x0d44,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d62, 0x0d63,
- 0x0d82, 0x0d83,
- 0x0dca, 0x0dca,
- 0x0dcf, 0x0dd4,
- 0x0dd6, 0x0dd6,
- 0x0dd8, 0x0ddf,
- 0x0df2, 0x0df3,
- 0x0e31, 0x0e31,
- 0x0e34, 0x0e3a,
- 0x0e47, 0x0e4e,
- 0x0eb1, 0x0eb1,
- 0x0eb4, 0x0eb9,
- 0x0ebb, 0x0ebc,
- 0x0ec8, 0x0ecd,
- 0x0f18, 0x0f19,
- 0x0f35, 0x0f35,
- 0x0f37, 0x0f37,
- 0x0f39, 0x0f39,
- 0x0f3e, 0x0f3f,
- 0x0f71, 0x0f84,
- 0x0f86, 0x0f87,
- 0x0f90, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fc6, 0x0fc6,
- 0x102b, 0x103e,
- 0x1056, 0x1059,
- 0x105e, 0x1060,
- 0x1062, 0x1064,
- 0x1067, 0x106d,
- 0x1071, 0x1074,
- 0x1082, 0x108d,
- 0x108f, 0x108f,
- 0x135f, 0x135f,
- 0x1712, 0x1714,
- 0x1732, 0x1734,
- 0x1752, 0x1753,
- 0x1772, 0x1773,
- 0x17b6, 0x17d3,
- 0x17dd, 0x17dd,
- 0x180b, 0x180d,
- 0x18a9, 0x18a9,
- 0x1920, 0x192b,
- 0x1930, 0x193b,
- 0x19b0, 0x19c0,
- 0x19c8, 0x19c9,
- 0x1a17, 0x1a1b,
- 0x1b00, 0x1b04,
- 0x1b34, 0x1b44,
- 0x1b6b, 0x1b73,
- 0x1b80, 0x1b82,
- 0x1ba1, 0x1baa,
- 0x1c24, 0x1c37,
- 0x1dc0, 0x1de6,
- 0x1dfe, 0x1dff,
- 0x20d0, 0x20f0,
- 0x2de0, 0x2dff,
- 0x302a, 0x302f,
- 0x3099, 0x309a,
- 0xa66f, 0xa672,
- 0xa67c, 0xa67d,
- 0xa802, 0xa802,
- 0xa806, 0xa806,
- 0xa80b, 0xa80b,
- 0xa823, 0xa827,
- 0xa880, 0xa881,
- 0xa8b4, 0xa8c4,
- 0xa926, 0xa92d,
- 0xa947, 0xa953,
- 0xaa29, 0xaa36,
- 0xaa43, 0xaa43,
- 0xaa4c, 0xaa4d,
- 0xfb1e, 0xfb1e,
- 0xfe00, 0xfe0f,
- 0xfe20, 0xfe26,
- 0x101fd, 0x101fd,
- 0x10a01, 0x10a03,
- 0x10a05, 0x10a06,
- 0x10a0c, 0x10a0f,
- 0x10a38, 0x10a3a,
- 0x10a3f, 0x10a3f,
- 0x1d165, 0x1d169,
- 0x1d16d, 0x1d172,
- 0x1d17b, 0x1d182,
- 0x1d185, 0x1d18b,
- 0x1d1aa, 0x1d1ad,
- 0x1d242, 0x1d244,
- 0xe0100, 0xe01ef,
-}; /* CR_M */
-
-/* 'Mc': General Category */
-static const OnigCodePoint CR_Mc[] = {
- 85,
- 0x0903, 0x0903,
- 0x093e, 0x0940,
- 0x0949, 0x094c,
- 0x0982, 0x0983,
- 0x09be, 0x09c0,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09cc,
- 0x09d7, 0x09d7,
- 0x0a03, 0x0a03,
- 0x0a3e, 0x0a40,
- 0x0a83, 0x0a83,
- 0x0abe, 0x0ac0,
- 0x0ac9, 0x0ac9,
- 0x0acb, 0x0acc,
- 0x0b02, 0x0b03,
- 0x0b3e, 0x0b3e,
- 0x0b40, 0x0b40,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4c,
- 0x0b57, 0x0b57,
- 0x0bbe, 0x0bbf,
- 0x0bc1, 0x0bc2,
- 0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcc,
- 0x0bd7, 0x0bd7,
- 0x0c01, 0x0c03,
- 0x0c41, 0x0c44,
- 0x0c82, 0x0c83,
- 0x0cbe, 0x0cbe,
- 0x0cc0, 0x0cc4,
- 0x0cc7, 0x0cc8,
- 0x0cca, 0x0ccb,
- 0x0cd5, 0x0cd6,
- 0x0d02, 0x0d03,
- 0x0d3e, 0x0d40,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4c,
- 0x0d57, 0x0d57,
- 0x0d82, 0x0d83,
- 0x0dcf, 0x0dd1,
- 0x0dd8, 0x0ddf,
- 0x0df2, 0x0df3,
- 0x0f3e, 0x0f3f,
- 0x0f7f, 0x0f7f,
- 0x102b, 0x102c,
- 0x1031, 0x1031,
- 0x1038, 0x1038,
- 0x103b, 0x103c,
- 0x1056, 0x1057,
- 0x1062, 0x1064,
- 0x1067, 0x106d,
- 0x1083, 0x1084,
- 0x1087, 0x108c,
- 0x108f, 0x108f,
- 0x17b6, 0x17b6,
- 0x17be, 0x17c5,
- 0x17c7, 0x17c8,
- 0x1923, 0x1926,
- 0x1929, 0x192b,
- 0x1930, 0x1931,
- 0x1933, 0x1938,
- 0x19b0, 0x19c0,
- 0x19c8, 0x19c9,
- 0x1a19, 0x1a1b,
- 0x1b04, 0x1b04,
- 0x1b35, 0x1b35,
- 0x1b3b, 0x1b3b,
- 0x1b3d, 0x1b41,
- 0x1b43, 0x1b44,
- 0x1b82, 0x1b82,
- 0x1ba1, 0x1ba1,
- 0x1ba6, 0x1ba7,
- 0x1baa, 0x1baa,
- 0x1c24, 0x1c2b,
- 0x1c34, 0x1c35,
- 0xa823, 0xa824,
- 0xa827, 0xa827,
- 0xa880, 0xa881,
- 0xa8b4, 0xa8c3,
- 0xa952, 0xa953,
- 0xaa2f, 0xaa30,
- 0xaa33, 0xaa34,
- 0xaa4d, 0xaa4d,
- 0x1d165, 0x1d166,
- 0x1d16d, 0x1d172,
-}; /* CR_Mc */
-
-/* 'Me': General Category */
-static const OnigCodePoint CR_Me[] = {
- 5,
- 0x0488, 0x0489,
- 0x06de, 0x06de,
- 0x20dd, 0x20e0,
- 0x20e2, 0x20e4,
- 0xa670, 0xa672,
-}; /* CR_Me */
-
-/* 'Mn': General Category */
-static const OnigCodePoint CR_Mn[] = {
- 160,
- 0x0300, 0x036f,
- 0x0483, 0x0487,
- 0x0591, 0x05bd,
- 0x05bf, 0x05bf,
- 0x05c1, 0x05c2,
- 0x05c4, 0x05c5,
- 0x05c7, 0x05c7,
- 0x0610, 0x061a,
- 0x064b, 0x065e,
- 0x0670, 0x0670,
- 0x06d6, 0x06dc,
- 0x06df, 0x06e4,
- 0x06e7, 0x06e8,
- 0x06ea, 0x06ed,
- 0x0711, 0x0711,
- 0x0730, 0x074a,
- 0x07a6, 0x07b0,
- 0x07eb, 0x07f3,
- 0x0901, 0x0902,
- 0x093c, 0x093c,
- 0x0941, 0x0948,
- 0x094d, 0x094d,
- 0x0951, 0x0954,
- 0x0962, 0x0963,
- 0x0981, 0x0981,
- 0x09bc, 0x09bc,
- 0x09c1, 0x09c4,
- 0x09cd, 0x09cd,
- 0x09e2, 0x09e3,
- 0x0a01, 0x0a02,
- 0x0a3c, 0x0a3c,
- 0x0a41, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4d,
- 0x0a51, 0x0a51,
- 0x0a70, 0x0a71,
- 0x0a75, 0x0a75,
- 0x0a81, 0x0a82,
- 0x0abc, 0x0abc,
- 0x0ac1, 0x0ac5,
- 0x0ac7, 0x0ac8,
- 0x0acd, 0x0acd,
- 0x0ae2, 0x0ae3,
- 0x0b01, 0x0b01,
- 0x0b3c, 0x0b3c,
- 0x0b3f, 0x0b3f,
- 0x0b41, 0x0b44,
- 0x0b4d, 0x0b4d,
- 0x0b56, 0x0b56,
- 0x0b62, 0x0b63,
- 0x0b82, 0x0b82,
- 0x0bc0, 0x0bc0,
- 0x0bcd, 0x0bcd,
- 0x0c3e, 0x0c40,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c62, 0x0c63,
- 0x0cbc, 0x0cbc,
- 0x0cbf, 0x0cbf,
- 0x0cc6, 0x0cc6,
- 0x0ccc, 0x0ccd,
- 0x0ce2, 0x0ce3,
- 0x0d41, 0x0d44,
- 0x0d4d, 0x0d4d,
- 0x0d62, 0x0d63,
- 0x0dca, 0x0dca,
- 0x0dd2, 0x0dd4,
- 0x0dd6, 0x0dd6,
- 0x0e31, 0x0e31,
- 0x0e34, 0x0e3a,
- 0x0e47, 0x0e4e,
- 0x0eb1, 0x0eb1,
- 0x0eb4, 0x0eb9,
- 0x0ebb, 0x0ebc,
- 0x0ec8, 0x0ecd,
- 0x0f18, 0x0f19,
- 0x0f35, 0x0f35,
- 0x0f37, 0x0f37,
- 0x0f39, 0x0f39,
- 0x0f71, 0x0f7e,
- 0x0f80, 0x0f84,
- 0x0f86, 0x0f87,
- 0x0f90, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fc6, 0x0fc6,
- 0x102d, 0x1030,
- 0x1032, 0x1037,
- 0x1039, 0x103a,
- 0x103d, 0x103e,
- 0x1058, 0x1059,
- 0x105e, 0x1060,
- 0x1071, 0x1074,
- 0x1082, 0x1082,
- 0x1085, 0x1086,
- 0x108d, 0x108d,
- 0x135f, 0x135f,
- 0x1712, 0x1714,
- 0x1732, 0x1734,
- 0x1752, 0x1753,
- 0x1772, 0x1773,
- 0x17b7, 0x17bd,
- 0x17c6, 0x17c6,
- 0x17c9, 0x17d3,
- 0x17dd, 0x17dd,
- 0x180b, 0x180d,
- 0x18a9, 0x18a9,
- 0x1920, 0x1922,
- 0x1927, 0x1928,
- 0x1932, 0x1932,
- 0x1939, 0x193b,
- 0x1a17, 0x1a18,
- 0x1b00, 0x1b03,
- 0x1b34, 0x1b34,
- 0x1b36, 0x1b3a,
- 0x1b3c, 0x1b3c,
- 0x1b42, 0x1b42,
- 0x1b6b, 0x1b73,
- 0x1b80, 0x1b81,
- 0x1ba2, 0x1ba5,
- 0x1ba8, 0x1ba9,
- 0x1c2c, 0x1c33,
- 0x1c36, 0x1c37,
- 0x1dc0, 0x1de6,
- 0x1dfe, 0x1dff,
- 0x20d0, 0x20dc,
- 0x20e1, 0x20e1,
- 0x20e5, 0x20f0,
- 0x2de0, 0x2dff,
- 0x302a, 0x302f,
- 0x3099, 0x309a,
- 0xa66f, 0xa66f,
- 0xa67c, 0xa67d,
- 0xa802, 0xa802,
- 0xa806, 0xa806,
- 0xa80b, 0xa80b,
- 0xa825, 0xa826,
- 0xa8c4, 0xa8c4,
- 0xa926, 0xa92d,
- 0xa947, 0xa951,
- 0xaa29, 0xaa2e,
- 0xaa31, 0xaa32,
- 0xaa35, 0xaa36,
- 0xaa43, 0xaa43,
- 0xaa4c, 0xaa4c,
- 0xfb1e, 0xfb1e,
- 0xfe00, 0xfe0f,
- 0xfe20, 0xfe26,
- 0x101fd, 0x101fd,
- 0x10a01, 0x10a03,
- 0x10a05, 0x10a06,
- 0x10a0c, 0x10a0f,
- 0x10a38, 0x10a3a,
- 0x10a3f, 0x10a3f,
- 0x1d167, 0x1d169,
- 0x1d17b, 0x1d182,
- 0x1d185, 0x1d18b,
- 0x1d1aa, 0x1d1ad,
- 0x1d242, 0x1d244,
- 0xe0100, 0xe01ef,
-}; /* CR_Mn */
-
-/* 'N': Major Category */
-static const OnigCodePoint CR_N[] = {
- 69,
- 0x0030, 0x0039,
- 0x00b2, 0x00b3,
- 0x00b9, 0x00b9,
- 0x00bc, 0x00be,
- 0x0660, 0x0669,
- 0x06f0, 0x06f9,
- 0x07c0, 0x07c9,
- 0x0966, 0x096f,
- 0x09e6, 0x09ef,
- 0x09f4, 0x09f9,
- 0x0a66, 0x0a6f,
- 0x0ae6, 0x0aef,
- 0x0b66, 0x0b6f,
- 0x0be6, 0x0bf2,
- 0x0c66, 0x0c6f,
- 0x0c78, 0x0c7e,
- 0x0ce6, 0x0cef,
- 0x0d66, 0x0d75,
- 0x0e50, 0x0e59,
- 0x0ed0, 0x0ed9,
- 0x0f20, 0x0f33,
- 0x1040, 0x1049,
- 0x1090, 0x1099,
- 0x1369, 0x137c,
- 0x16ee, 0x16f0,
- 0x17e0, 0x17e9,
- 0x17f0, 0x17f9,
- 0x1810, 0x1819,
- 0x1946, 0x194f,
- 0x19d0, 0x19d9,
- 0x1b50, 0x1b59,
- 0x1bb0, 0x1bb9,
- 0x1c40, 0x1c49,
- 0x1c50, 0x1c59,
- 0x2070, 0x2070,
- 0x2074, 0x2079,
- 0x2080, 0x2089,
- 0x2153, 0x2182,
- 0x2185, 0x2188,
- 0x2460, 0x249b,
- 0x24ea, 0x24ff,
- 0x2776, 0x2793,
- 0x2cfd, 0x2cfd,
- 0x3007, 0x3007,
- 0x3021, 0x3029,
- 0x3038, 0x303a,
- 0x3192, 0x3195,
- 0x3220, 0x3229,
- 0x3251, 0x325f,
- 0x3280, 0x3289,
- 0x32b1, 0x32bf,
- 0xa620, 0xa629,
- 0xa8d0, 0xa8d9,
- 0xa900, 0xa909,
- 0xaa50, 0xaa59,
- 0xff10, 0xff19,
- 0x10107, 0x10133,
- 0x10140, 0x10178,
- 0x1018a, 0x1018a,
- 0x10320, 0x10323,
- 0x10341, 0x10341,
- 0x1034a, 0x1034a,
- 0x103d1, 0x103d5,
- 0x104a0, 0x104a9,
- 0x10916, 0x10919,
- 0x10a40, 0x10a47,
- 0x12400, 0x12462,
- 0x1d360, 0x1d371,
- 0x1d7ce, 0x1d7ff,
-}; /* CR_N */
-
-/* 'Nd': General Category */
-static const OnigCodePoint CR_Nd[] = {
- 33,
- 0x0030, 0x0039,
- 0x0660, 0x0669,
- 0x06f0, 0x06f9,
- 0x07c0, 0x07c9,
- 0x0966, 0x096f,
- 0x09e6, 0x09ef,
- 0x0a66, 0x0a6f,
- 0x0ae6, 0x0aef,
- 0x0b66, 0x0b6f,
- 0x0be6, 0x0bef,
- 0x0c66, 0x0c6f,
- 0x0ce6, 0x0cef,
- 0x0d66, 0x0d6f,
- 0x0e50, 0x0e59,
- 0x0ed0, 0x0ed9,
- 0x0f20, 0x0f29,
- 0x1040, 0x1049,
- 0x1090, 0x1099,
- 0x17e0, 0x17e9,
- 0x1810, 0x1819,
- 0x1946, 0x194f,
- 0x19d0, 0x19d9,
- 0x1b50, 0x1b59,
- 0x1bb0, 0x1bb9,
- 0x1c40, 0x1c49,
- 0x1c50, 0x1c59,
- 0xa620, 0xa629,
- 0xa8d0, 0xa8d9,
- 0xa900, 0xa909,
- 0xaa50, 0xaa59,
- 0xff10, 0xff19,
- 0x104a0, 0x104a9,
- 0x1d7ce, 0x1d7ff,
-}; /* CR_Nd */
-
-/* 'Nl': General Category */
-static const OnigCodePoint CR_Nl[] = {
- 11,
- 0x16ee, 0x16f0,
- 0x2160, 0x2182,
- 0x2185, 0x2188,
- 0x3007, 0x3007,
- 0x3021, 0x3029,
- 0x3038, 0x303a,
- 0x10140, 0x10174,
- 0x10341, 0x10341,
- 0x1034a, 0x1034a,
- 0x103d1, 0x103d5,
- 0x12400, 0x12462,
-}; /* CR_Nl */
-
-/* 'No': General Category */
-static const OnigCodePoint CR_No[] = {
- 30,
- 0x00b2, 0x00b3,
- 0x00b9, 0x00b9,
- 0x00bc, 0x00be,
- 0x09f4, 0x09f9,
- 0x0bf0, 0x0bf2,
- 0x0c78, 0x0c7e,
- 0x0d70, 0x0d75,
- 0x0f2a, 0x0f33,
- 0x1369, 0x137c,
- 0x17f0, 0x17f9,
- 0x2070, 0x2070,
- 0x2074, 0x2079,
- 0x2080, 0x2089,
- 0x2153, 0x215f,
- 0x2460, 0x249b,
- 0x24ea, 0x24ff,
- 0x2776, 0x2793,
- 0x2cfd, 0x2cfd,
- 0x3192, 0x3195,
- 0x3220, 0x3229,
- 0x3251, 0x325f,
- 0x3280, 0x3289,
- 0x32b1, 0x32bf,
- 0x10107, 0x10133,
- 0x10175, 0x10178,
- 0x1018a, 0x1018a,
- 0x10320, 0x10323,
- 0x10916, 0x10919,
- 0x10a40, 0x10a47,
- 0x1d360, 0x1d371,
-}; /* CR_No */
-
-/* 'P': Major Category */
-static const OnigCodePoint CR_P[] = {
- 112,
- 0x0021, 0x0023,
- 0x0025, 0x002a,
- 0x002c, 0x002f,
- 0x003a, 0x003b,
- 0x003f, 0x0040,
- 0x005b, 0x005d,
- 0x005f, 0x005f,
- 0x007b, 0x007b,
- 0x007d, 0x007d,
- 0x00a1, 0x00a1,
- 0x00ab, 0x00ab,
- 0x00b7, 0x00b7,
- 0x00bb, 0x00bb,
- 0x00bf, 0x00bf,
- 0x037e, 0x037e,
- 0x0387, 0x0387,
- 0x055a, 0x055f,
- 0x0589, 0x058a,
- 0x05be, 0x05be,
- 0x05c0, 0x05c0,
- 0x05c3, 0x05c3,
- 0x05c6, 0x05c6,
- 0x05f3, 0x05f4,
- 0x0609, 0x060a,
- 0x060c, 0x060d,
- 0x061b, 0x061b,
- 0x061e, 0x061f,
- 0x066a, 0x066d,
- 0x06d4, 0x06d4,
- 0x0700, 0x070d,
- 0x07f7, 0x07f9,
- 0x0964, 0x0965,
- 0x0970, 0x0970,
- 0x0df4, 0x0df4,
- 0x0e4f, 0x0e4f,
- 0x0e5a, 0x0e5b,
- 0x0f04, 0x0f12,
- 0x0f3a, 0x0f3d,
- 0x0f85, 0x0f85,
- 0x0fd0, 0x0fd4,
- 0x104a, 0x104f,
- 0x10fb, 0x10fb,
- 0x1361, 0x1368,
- 0x166d, 0x166e,
- 0x169b, 0x169c,
- 0x16eb, 0x16ed,
- 0x1735, 0x1736,
- 0x17d4, 0x17d6,
- 0x17d8, 0x17da,
- 0x1800, 0x180a,
- 0x1944, 0x1945,
- 0x19de, 0x19df,
- 0x1a1e, 0x1a1f,
- 0x1b5a, 0x1b60,
- 0x1c3b, 0x1c3f,
- 0x1c7e, 0x1c7f,
- 0x2010, 0x2027,
- 0x2030, 0x2043,
- 0x2045, 0x2051,
- 0x2053, 0x205e,
- 0x207d, 0x207e,
- 0x208d, 0x208e,
- 0x2329, 0x232a,
- 0x2768, 0x2775,
- 0x27c5, 0x27c6,
- 0x27e6, 0x27ef,
- 0x2983, 0x2998,
- 0x29d8, 0x29db,
- 0x29fc, 0x29fd,
- 0x2cf9, 0x2cfc,
- 0x2cfe, 0x2cff,
- 0x2e00, 0x2e2e,
- 0x2e30, 0x2e30,
- 0x3001, 0x3003,
- 0x3008, 0x3011,
- 0x3014, 0x301f,
- 0x3030, 0x3030,
- 0x303d, 0x303d,
- 0x30a0, 0x30a0,
- 0x30fb, 0x30fb,
- 0xa60d, 0xa60f,
- 0xa673, 0xa673,
- 0xa67e, 0xa67e,
- 0xa874, 0xa877,
- 0xa8ce, 0xa8cf,
- 0xa92e, 0xa92f,
- 0xa95f, 0xa95f,
- 0xaa5c, 0xaa5f,
- 0xfd3e, 0xfd3f,
- 0xfe10, 0xfe19,
- 0xfe30, 0xfe52,
- 0xfe54, 0xfe61,
- 0xfe63, 0xfe63,
- 0xfe68, 0xfe68,
- 0xfe6a, 0xfe6b,
- 0xff01, 0xff03,
- 0xff05, 0xff0a,
- 0xff0c, 0xff0f,
- 0xff1a, 0xff1b,
- 0xff1f, 0xff20,
- 0xff3b, 0xff3d,
- 0xff3f, 0xff3f,
- 0xff5b, 0xff5b,
- 0xff5d, 0xff5d,
- 0xff5f, 0xff65,
- 0x10100, 0x10101,
- 0x1039f, 0x1039f,
- 0x103d0, 0x103d0,
- 0x1091f, 0x1091f,
- 0x1093f, 0x1093f,
- 0x10a50, 0x10a58,
- 0x12470, 0x12473,
-}; /* CR_P */
-
-/* 'Pc': General Category */
-static const OnigCodePoint CR_Pc[] = {
- 6,
- 0x005f, 0x005f,
- 0x203f, 0x2040,
- 0x2054, 0x2054,
- 0xfe33, 0xfe34,
- 0xfe4d, 0xfe4f,
- 0xff3f, 0xff3f,
-}; /* CR_Pc */
-
-/* 'Pd': General Category */
-static const OnigCodePoint CR_Pd[] = {
- 14,
- 0x002d, 0x002d,
- 0x058a, 0x058a,
- 0x05be, 0x05be,
- 0x1806, 0x1806,
- 0x2010, 0x2015,
- 0x2e17, 0x2e17,
- 0x2e1a, 0x2e1a,
- 0x301c, 0x301c,
- 0x3030, 0x3030,
- 0x30a0, 0x30a0,
- 0xfe31, 0xfe32,
- 0xfe58, 0xfe58,
- 0xfe63, 0xfe63,
- 0xff0d, 0xff0d,
-}; /* CR_Pd */
-
-/* 'Pe': General Category */
-static const OnigCodePoint CR_Pe[] = {
- 70,
- 0x0029, 0x0029,
- 0x005d, 0x005d,
- 0x007d, 0x007d,
- 0x0f3b, 0x0f3b,
- 0x0f3d, 0x0f3d,
- 0x169c, 0x169c,
- 0x2046, 0x2046,
- 0x207e, 0x207e,
- 0x208e, 0x208e,
- 0x232a, 0x232a,
- 0x2769, 0x2769,
- 0x276b, 0x276b,
- 0x276d, 0x276d,
- 0x276f, 0x276f,
- 0x2771, 0x2771,
- 0x2773, 0x2773,
- 0x2775, 0x2775,
- 0x27c6, 0x27c6,
- 0x27e7, 0x27e7,
- 0x27e9, 0x27e9,
- 0x27eb, 0x27eb,
- 0x27ed, 0x27ed,
- 0x27ef, 0x27ef,
- 0x2984, 0x2984,
- 0x2986, 0x2986,
- 0x2988, 0x2988,
- 0x298a, 0x298a,
- 0x298c, 0x298c,
- 0x298e, 0x298e,
- 0x2990, 0x2990,
- 0x2992, 0x2992,
- 0x2994, 0x2994,
- 0x2996, 0x2996,
- 0x2998, 0x2998,
- 0x29d9, 0x29d9,
- 0x29db, 0x29db,
- 0x29fd, 0x29fd,
- 0x2e23, 0x2e23,
- 0x2e25, 0x2e25,
- 0x2e27, 0x2e27,
- 0x2e29, 0x2e29,
- 0x3009, 0x3009,
- 0x300b, 0x300b,
- 0x300d, 0x300d,
- 0x300f, 0x300f,
- 0x3011, 0x3011,
- 0x3015, 0x3015,
- 0x3017, 0x3017,
- 0x3019, 0x3019,
- 0x301b, 0x301b,
- 0x301e, 0x301f,
- 0xfd3f, 0xfd3f,
- 0xfe18, 0xfe18,
- 0xfe36, 0xfe36,
- 0xfe38, 0xfe38,
- 0xfe3a, 0xfe3a,
- 0xfe3c, 0xfe3c,
- 0xfe3e, 0xfe3e,
- 0xfe40, 0xfe40,
- 0xfe42, 0xfe42,
- 0xfe44, 0xfe44,
- 0xfe48, 0xfe48,
- 0xfe5a, 0xfe5a,
- 0xfe5c, 0xfe5c,
- 0xfe5e, 0xfe5e,
- 0xff09, 0xff09,
- 0xff3d, 0xff3d,
- 0xff5d, 0xff5d,
- 0xff60, 0xff60,
- 0xff63, 0xff63,
-}; /* CR_Pe */
-
-/* 'Pf': General Category */
-static const OnigCodePoint CR_Pf[] = {
- 10,
- 0x00bb, 0x00bb,
- 0x2019, 0x2019,
- 0x201d, 0x201d,
- 0x203a, 0x203a,
- 0x2e03, 0x2e03,
- 0x2e05, 0x2e05,
- 0x2e0a, 0x2e0a,
- 0x2e0d, 0x2e0d,
- 0x2e1d, 0x2e1d,
- 0x2e21, 0x2e21,
-}; /* CR_Pf */
-
-/* 'Pi': General Category */
-static const OnigCodePoint CR_Pi[] = {
- 11,
- 0x00ab, 0x00ab,
- 0x2018, 0x2018,
- 0x201b, 0x201c,
- 0x201f, 0x201f,
- 0x2039, 0x2039,
- 0x2e02, 0x2e02,
- 0x2e04, 0x2e04,
- 0x2e09, 0x2e09,
- 0x2e0c, 0x2e0c,
- 0x2e1c, 0x2e1c,
- 0x2e20, 0x2e20,
-}; /* CR_Pi */
-
-/* 'Po': General Category */
-static const OnigCodePoint CR_Po[] = {
- 108,
- 0x0021, 0x0023,
- 0x0025, 0x0027,
- 0x002a, 0x002a,
- 0x002c, 0x002c,
- 0x002e, 0x002f,
- 0x003a, 0x003b,
- 0x003f, 0x0040,
- 0x005c, 0x005c,
- 0x00a1, 0x00a1,
- 0x00b7, 0x00b7,
- 0x00bf, 0x00bf,
- 0x037e, 0x037e,
- 0x0387, 0x0387,
- 0x055a, 0x055f,
- 0x0589, 0x0589,
- 0x05c0, 0x05c0,
- 0x05c3, 0x05c3,
- 0x05c6, 0x05c6,
- 0x05f3, 0x05f4,
- 0x0609, 0x060a,
- 0x060c, 0x060d,
- 0x061b, 0x061b,
- 0x061e, 0x061f,
- 0x066a, 0x066d,
- 0x06d4, 0x06d4,
- 0x0700, 0x070d,
- 0x07f7, 0x07f9,
- 0x0964, 0x0965,
- 0x0970, 0x0970,
- 0x0df4, 0x0df4,
- 0x0e4f, 0x0e4f,
- 0x0e5a, 0x0e5b,
- 0x0f04, 0x0f12,
- 0x0f85, 0x0f85,
- 0x0fd0, 0x0fd4,
- 0x104a, 0x104f,
- 0x10fb, 0x10fb,
- 0x1361, 0x1368,
- 0x166d, 0x166e,
- 0x16eb, 0x16ed,
- 0x1735, 0x1736,
- 0x17d4, 0x17d6,
- 0x17d8, 0x17da,
- 0x1800, 0x1805,
- 0x1807, 0x180a,
- 0x1944, 0x1945,
- 0x19de, 0x19df,
- 0x1a1e, 0x1a1f,
- 0x1b5a, 0x1b60,
- 0x1c3b, 0x1c3f,
- 0x1c7e, 0x1c7f,
- 0x2016, 0x2017,
- 0x2020, 0x2027,
- 0x2030, 0x2038,
- 0x203b, 0x203e,
- 0x2041, 0x2043,
- 0x2047, 0x2051,
- 0x2053, 0x2053,
- 0x2055, 0x205e,
- 0x2cf9, 0x2cfc,
- 0x2cfe, 0x2cff,
- 0x2e00, 0x2e01,
- 0x2e06, 0x2e08,
- 0x2e0b, 0x2e0b,
- 0x2e0e, 0x2e16,
- 0x2e18, 0x2e19,
- 0x2e1b, 0x2e1b,
- 0x2e1e, 0x2e1f,
- 0x2e2a, 0x2e2e,
- 0x2e30, 0x2e30,
- 0x3001, 0x3003,
- 0x303d, 0x303d,
- 0x30fb, 0x30fb,
- 0xa60d, 0xa60f,
- 0xa673, 0xa673,
- 0xa67e, 0xa67e,
- 0xa874, 0xa877,
- 0xa8ce, 0xa8cf,
- 0xa92e, 0xa92f,
- 0xa95f, 0xa95f,
- 0xaa5c, 0xaa5f,
- 0xfe10, 0xfe16,
- 0xfe19, 0xfe19,
- 0xfe30, 0xfe30,
- 0xfe45, 0xfe46,
- 0xfe49, 0xfe4c,
- 0xfe50, 0xfe52,
- 0xfe54, 0xfe57,
- 0xfe5f, 0xfe61,
- 0xfe68, 0xfe68,
- 0xfe6a, 0xfe6b,
- 0xff01, 0xff03,
- 0xff05, 0xff07,
- 0xff0a, 0xff0a,
- 0xff0c, 0xff0c,
- 0xff0e, 0xff0f,
- 0xff1a, 0xff1b,
- 0xff1f, 0xff20,
- 0xff3c, 0xff3c,
- 0xff61, 0xff61,
- 0xff64, 0xff65,
- 0x10100, 0x10101,
- 0x1039f, 0x1039f,
- 0x103d0, 0x103d0,
- 0x1091f, 0x1091f,
- 0x1093f, 0x1093f,
- 0x10a50, 0x10a58,
- 0x12470, 0x12473,
-}; /* CR_Po */
-
-/* 'Ps': General Category */
-static const OnigCodePoint CR_Ps[] = {
- 72,
- 0x0028, 0x0028,
- 0x005b, 0x005b,
- 0x007b, 0x007b,
- 0x0f3a, 0x0f3a,
- 0x0f3c, 0x0f3c,
- 0x169b, 0x169b,
- 0x201a, 0x201a,
- 0x201e, 0x201e,
- 0x2045, 0x2045,
- 0x207d, 0x207d,
- 0x208d, 0x208d,
- 0x2329, 0x2329,
- 0x2768, 0x2768,
- 0x276a, 0x276a,
- 0x276c, 0x276c,
- 0x276e, 0x276e,
- 0x2770, 0x2770,
- 0x2772, 0x2772,
- 0x2774, 0x2774,
- 0x27c5, 0x27c5,
- 0x27e6, 0x27e6,
- 0x27e8, 0x27e8,
- 0x27ea, 0x27ea,
- 0x27ec, 0x27ec,
- 0x27ee, 0x27ee,
- 0x2983, 0x2983,
- 0x2985, 0x2985,
- 0x2987, 0x2987,
- 0x2989, 0x2989,
- 0x298b, 0x298b,
- 0x298d, 0x298d,
- 0x298f, 0x298f,
- 0x2991, 0x2991,
- 0x2993, 0x2993,
- 0x2995, 0x2995,
- 0x2997, 0x2997,
- 0x29d8, 0x29d8,
- 0x29da, 0x29da,
- 0x29fc, 0x29fc,
- 0x2e22, 0x2e22,
- 0x2e24, 0x2e24,
- 0x2e26, 0x2e26,
- 0x2e28, 0x2e28,
- 0x3008, 0x3008,
- 0x300a, 0x300a,
- 0x300c, 0x300c,
- 0x300e, 0x300e,
- 0x3010, 0x3010,
- 0x3014, 0x3014,
- 0x3016, 0x3016,
- 0x3018, 0x3018,
- 0x301a, 0x301a,
- 0x301d, 0x301d,
- 0xfd3e, 0xfd3e,
- 0xfe17, 0xfe17,
- 0xfe35, 0xfe35,
- 0xfe37, 0xfe37,
- 0xfe39, 0xfe39,
- 0xfe3b, 0xfe3b,
- 0xfe3d, 0xfe3d,
- 0xfe3f, 0xfe3f,
- 0xfe41, 0xfe41,
- 0xfe43, 0xfe43,
- 0xfe47, 0xfe47,
- 0xfe59, 0xfe59,
- 0xfe5b, 0xfe5b,
- 0xfe5d, 0xfe5d,
- 0xff08, 0xff08,
- 0xff3b, 0xff3b,
- 0xff5b, 0xff5b,
- 0xff5f, 0xff5f,
- 0xff62, 0xff62,
-}; /* CR_Ps */
-
-/* 'S': Major Category */
-static const OnigCodePoint CR_S[] = {
- 179,
- 0x0024, 0x0024,
- 0x002b, 0x002b,
- 0x003c, 0x003e,
- 0x005e, 0x005e,
- 0x0060, 0x0060,
- 0x007c, 0x007c,
- 0x007e, 0x007e,
- 0x00a2, 0x00a9,
- 0x00ac, 0x00ac,
- 0x00ae, 0x00b1,
- 0x00b4, 0x00b4,
- 0x00b6, 0x00b6,
- 0x00b8, 0x00b8,
- 0x00d7, 0x00d7,
- 0x00f7, 0x00f7,
- 0x02c2, 0x02c5,
- 0x02d2, 0x02df,
- 0x02e5, 0x02eb,
- 0x02ed, 0x02ed,
- 0x02ef, 0x02ff,
- 0x0375, 0x0375,
- 0x0384, 0x0385,
- 0x03f6, 0x03f6,
- 0x0482, 0x0482,
- 0x0606, 0x0608,
- 0x060b, 0x060b,
- 0x060e, 0x060f,
- 0x06e9, 0x06e9,
- 0x06fd, 0x06fe,
- 0x07f6, 0x07f6,
- 0x09f2, 0x09f3,
- 0x09fa, 0x09fa,
- 0x0af1, 0x0af1,
- 0x0b70, 0x0b70,
- 0x0bf3, 0x0bfa,
- 0x0c7f, 0x0c7f,
- 0x0cf1, 0x0cf2,
- 0x0d79, 0x0d79,
- 0x0e3f, 0x0e3f,
- 0x0f01, 0x0f03,
- 0x0f13, 0x0f17,
- 0x0f1a, 0x0f1f,
- 0x0f34, 0x0f34,
- 0x0f36, 0x0f36,
- 0x0f38, 0x0f38,
- 0x0fbe, 0x0fc5,
- 0x0fc7, 0x0fcc,
- 0x0fce, 0x0fcf,
- 0x109e, 0x109f,
- 0x1360, 0x1360,
- 0x1390, 0x1399,
- 0x17db, 0x17db,
- 0x1940, 0x1940,
- 0x19e0, 0x19ff,
- 0x1b61, 0x1b6a,
- 0x1b74, 0x1b7c,
- 0x1fbd, 0x1fbd,
- 0x1fbf, 0x1fc1,
- 0x1fcd, 0x1fcf,
- 0x1fdd, 0x1fdf,
- 0x1fed, 0x1fef,
- 0x1ffd, 0x1ffe,
- 0x2044, 0x2044,
- 0x2052, 0x2052,
- 0x207a, 0x207c,
- 0x208a, 0x208c,
- 0x20a0, 0x20b5,
- 0x2100, 0x2101,
- 0x2103, 0x2106,
- 0x2108, 0x2109,
- 0x2114, 0x2114,
- 0x2116, 0x2118,
- 0x211e, 0x2123,
- 0x2125, 0x2125,
- 0x2127, 0x2127,
- 0x2129, 0x2129,
- 0x212e, 0x212e,
- 0x213a, 0x213b,
- 0x2140, 0x2144,
- 0x214a, 0x214d,
- 0x214f, 0x214f,
- 0x2190, 0x2328,
- 0x232b, 0x23e7,
- 0x2400, 0x2426,
- 0x2440, 0x244a,
- 0x249c, 0x24e9,
- 0x2500, 0x269d,
- 0x26a0, 0x26bc,
- 0x26c0, 0x26c3,
- 0x2701, 0x2704,
- 0x2706, 0x2709,
- 0x270c, 0x2727,
- 0x2729, 0x274b,
- 0x274d, 0x274d,
- 0x274f, 0x2752,
- 0x2756, 0x2756,
- 0x2758, 0x275e,
- 0x2761, 0x2767,
- 0x2794, 0x2794,
- 0x2798, 0x27af,
- 0x27b1, 0x27be,
- 0x27c0, 0x27c4,
- 0x27c7, 0x27ca,
- 0x27cc, 0x27cc,
- 0x27d0, 0x27e5,
- 0x27f0, 0x2982,
- 0x2999, 0x29d7,
- 0x29dc, 0x29fb,
- 0x29fe, 0x2b4c,
- 0x2b50, 0x2b54,
- 0x2ce5, 0x2cea,
- 0x2e80, 0x2e99,
- 0x2e9b, 0x2ef3,
- 0x2f00, 0x2fd5,
- 0x2ff0, 0x2ffb,
- 0x3004, 0x3004,
- 0x3012, 0x3013,
- 0x3020, 0x3020,
- 0x3036, 0x3037,
- 0x303e, 0x303f,
- 0x309b, 0x309c,
- 0x3190, 0x3191,
- 0x3196, 0x319f,
- 0x31c0, 0x31e3,
- 0x3200, 0x321e,
- 0x322a, 0x3243,
- 0x3250, 0x3250,
- 0x3260, 0x327f,
- 0x328a, 0x32b0,
- 0x32c0, 0x32fe,
- 0x3300, 0x33ff,
- 0x4dc0, 0x4dff,
- 0xa490, 0xa4c6,
- 0xa700, 0xa716,
- 0xa720, 0xa721,
- 0xa789, 0xa78a,
- 0xa828, 0xa82b,
- 0xfb29, 0xfb29,
- 0xfdfc, 0xfdfd,
- 0xfe62, 0xfe62,
- 0xfe64, 0xfe66,
- 0xfe69, 0xfe69,
- 0xff04, 0xff04,
- 0xff0b, 0xff0b,
- 0xff1c, 0xff1e,
- 0xff3e, 0xff3e,
- 0xff40, 0xff40,
- 0xff5c, 0xff5c,
- 0xff5e, 0xff5e,
- 0xffe0, 0xffe6,
- 0xffe8, 0xffee,
- 0xfffc, 0xfffd,
- 0x10102, 0x10102,
- 0x10137, 0x1013f,
- 0x10179, 0x10189,
- 0x10190, 0x1019b,
- 0x101d0, 0x101fc,
- 0x1d000, 0x1d0f5,
- 0x1d100, 0x1d126,
- 0x1d129, 0x1d164,
- 0x1d16a, 0x1d16c,
- 0x1d183, 0x1d184,
- 0x1d18c, 0x1d1a9,
- 0x1d1ae, 0x1d1dd,
- 0x1d200, 0x1d241,
- 0x1d245, 0x1d245,
- 0x1d300, 0x1d356,
- 0x1d6c1, 0x1d6c1,
- 0x1d6db, 0x1d6db,
- 0x1d6fb, 0x1d6fb,
- 0x1d715, 0x1d715,
- 0x1d735, 0x1d735,
- 0x1d74f, 0x1d74f,
- 0x1d76f, 0x1d76f,
- 0x1d789, 0x1d789,
- 0x1d7a9, 0x1d7a9,
- 0x1d7c3, 0x1d7c3,
- 0x1f000, 0x1f02b,
- 0x1f030, 0x1f093,
-}; /* CR_S */
-
-/* 'Sc': General Category */
-static const OnigCodePoint CR_Sc[] = {
- 14,
- 0x0024, 0x0024,
- 0x00a2, 0x00a5,
- 0x060b, 0x060b,
- 0x09f2, 0x09f3,
- 0x0af1, 0x0af1,
- 0x0bf9, 0x0bf9,
- 0x0e3f, 0x0e3f,
- 0x17db, 0x17db,
- 0x20a0, 0x20b5,
- 0xfdfc, 0xfdfc,
- 0xfe69, 0xfe69,
- 0xff04, 0xff04,
- 0xffe0, 0xffe1,
- 0xffe5, 0xffe6,
-}; /* CR_Sc */
-
-/* 'Sk': General Category */
-static const OnigCodePoint CR_Sk[] = {
- 26,
- 0x005e, 0x005e,
- 0x0060, 0x0060,
- 0x00a8, 0x00a8,
- 0x00af, 0x00af,
- 0x00b4, 0x00b4,
- 0x00b8, 0x00b8,
- 0x02c2, 0x02c5,
- 0x02d2, 0x02df,
- 0x02e5, 0x02eb,
- 0x02ed, 0x02ed,
- 0x02ef, 0x02ff,
- 0x0375, 0x0375,
- 0x0384, 0x0385,
- 0x1fbd, 0x1fbd,
- 0x1fbf, 0x1fc1,
- 0x1fcd, 0x1fcf,
- 0x1fdd, 0x1fdf,
- 0x1fed, 0x1fef,
- 0x1ffd, 0x1ffe,
- 0x309b, 0x309c,
- 0xa700, 0xa716,
- 0xa720, 0xa721,
- 0xa789, 0xa78a,
- 0xff3e, 0xff3e,
- 0xff40, 0xff40,
- 0xffe3, 0xffe3,
-}; /* CR_Sk */
-
-/* 'Sm': General Category */
-static const OnigCodePoint CR_Sm[] = {
- 65,
- 0x002b, 0x002b,
- 0x003c, 0x003e,
- 0x007c, 0x007c,
- 0x007e, 0x007e,
- 0x00ac, 0x00ac,
- 0x00b1, 0x00b1,
- 0x00d7, 0x00d7,
- 0x00f7, 0x00f7,
- 0x03f6, 0x03f6,
- 0x0606, 0x0608,
- 0x2044, 0x2044,
- 0x2052, 0x2052,
- 0x207a, 0x207c,
- 0x208a, 0x208c,
- 0x2140, 0x2144,
- 0x214b, 0x214b,
- 0x2190, 0x2194,
- 0x219a, 0x219b,
- 0x21a0, 0x21a0,
- 0x21a3, 0x21a3,
- 0x21a6, 0x21a6,
- 0x21ae, 0x21ae,
- 0x21ce, 0x21cf,
- 0x21d2, 0x21d2,
- 0x21d4, 0x21d4,
- 0x21f4, 0x22ff,
- 0x2308, 0x230b,
- 0x2320, 0x2321,
- 0x237c, 0x237c,
- 0x239b, 0x23b3,
- 0x23dc, 0x23e1,
- 0x25b7, 0x25b7,
- 0x25c1, 0x25c1,
- 0x25f8, 0x25ff,
- 0x266f, 0x266f,
- 0x27c0, 0x27c4,
- 0x27c7, 0x27ca,
- 0x27cc, 0x27cc,
- 0x27d0, 0x27e5,
- 0x27f0, 0x27ff,
- 0x2900, 0x2982,
- 0x2999, 0x29d7,
- 0x29dc, 0x29fb,
- 0x29fe, 0x2aff,
- 0x2b30, 0x2b44,
- 0x2b47, 0x2b4c,
- 0xfb29, 0xfb29,
- 0xfe62, 0xfe62,
- 0xfe64, 0xfe66,
- 0xff0b, 0xff0b,
- 0xff1c, 0xff1e,
- 0xff5c, 0xff5c,
- 0xff5e, 0xff5e,
- 0xffe2, 0xffe2,
- 0xffe9, 0xffec,
- 0x1d6c1, 0x1d6c1,
- 0x1d6db, 0x1d6db,
- 0x1d6fb, 0x1d6fb,
- 0x1d715, 0x1d715,
- 0x1d735, 0x1d735,
- 0x1d74f, 0x1d74f,
- 0x1d76f, 0x1d76f,
- 0x1d789, 0x1d789,
- 0x1d7a9, 0x1d7a9,
- 0x1d7c3, 0x1d7c3,
-}; /* CR_Sm */
-
-/* 'So': General Category */
-static const OnigCodePoint CR_So[] = {
- 134,
- 0x00a6, 0x00a7,
- 0x00a9, 0x00a9,
- 0x00ae, 0x00ae,
- 0x00b0, 0x00b0,
- 0x00b6, 0x00b6,
- 0x0482, 0x0482,
- 0x060e, 0x060f,
- 0x06e9, 0x06e9,
- 0x06fd, 0x06fe,
- 0x07f6, 0x07f6,
- 0x09fa, 0x09fa,
- 0x0b70, 0x0b70,
- 0x0bf3, 0x0bf8,
- 0x0bfa, 0x0bfa,
- 0x0c7f, 0x0c7f,
- 0x0cf1, 0x0cf2,
- 0x0d79, 0x0d79,
- 0x0f01, 0x0f03,
- 0x0f13, 0x0f17,
- 0x0f1a, 0x0f1f,
- 0x0f34, 0x0f34,
- 0x0f36, 0x0f36,
- 0x0f38, 0x0f38,
- 0x0fbe, 0x0fc5,
- 0x0fc7, 0x0fcc,
- 0x0fce, 0x0fcf,
- 0x109e, 0x109f,
- 0x1360, 0x1360,
- 0x1390, 0x1399,
- 0x1940, 0x1940,
- 0x19e0, 0x19ff,
- 0x1b61, 0x1b6a,
- 0x1b74, 0x1b7c,
- 0x2100, 0x2101,
- 0x2103, 0x2106,
- 0x2108, 0x2109,
- 0x2114, 0x2114,
- 0x2116, 0x2118,
- 0x211e, 0x2123,
- 0x2125, 0x2125,
- 0x2127, 0x2127,
- 0x2129, 0x2129,
- 0x212e, 0x212e,
- 0x213a, 0x213b,
- 0x214a, 0x214a,
- 0x214c, 0x214d,
- 0x214f, 0x214f,
- 0x2195, 0x2199,
- 0x219c, 0x219f,
- 0x21a1, 0x21a2,
- 0x21a4, 0x21a5,
- 0x21a7, 0x21ad,
- 0x21af, 0x21cd,
- 0x21d0, 0x21d1,
- 0x21d3, 0x21d3,
- 0x21d5, 0x21f3,
- 0x2300, 0x2307,
- 0x230c, 0x231f,
- 0x2322, 0x2328,
- 0x232b, 0x237b,
- 0x237d, 0x239a,
- 0x23b4, 0x23db,
- 0x23e2, 0x23e7,
- 0x2400, 0x2426,
- 0x2440, 0x244a,
- 0x249c, 0x24e9,
- 0x2500, 0x25b6,
- 0x25b8, 0x25c0,
- 0x25c2, 0x25f7,
- 0x2600, 0x266e,
- 0x2670, 0x269d,
- 0x26a0, 0x26bc,
- 0x26c0, 0x26c3,
- 0x2701, 0x2704,
- 0x2706, 0x2709,
- 0x270c, 0x2727,
- 0x2729, 0x274b,
- 0x274d, 0x274d,
- 0x274f, 0x2752,
- 0x2756, 0x2756,
- 0x2758, 0x275e,
- 0x2761, 0x2767,
- 0x2794, 0x2794,
- 0x2798, 0x27af,
- 0x27b1, 0x27be,
- 0x2800, 0x28ff,
- 0x2b00, 0x2b2f,
- 0x2b45, 0x2b46,
- 0x2b50, 0x2b54,
- 0x2ce5, 0x2cea,
- 0x2e80, 0x2e99,
- 0x2e9b, 0x2ef3,
- 0x2f00, 0x2fd5,
- 0x2ff0, 0x2ffb,
- 0x3004, 0x3004,
- 0x3012, 0x3013,
- 0x3020, 0x3020,
- 0x3036, 0x3037,
- 0x303e, 0x303f,
- 0x3190, 0x3191,
- 0x3196, 0x319f,
- 0x31c0, 0x31e3,
- 0x3200, 0x321e,
- 0x322a, 0x3243,
- 0x3250, 0x3250,
- 0x3260, 0x327f,
- 0x328a, 0x32b0,
- 0x32c0, 0x32fe,
- 0x3300, 0x33ff,
- 0x4dc0, 0x4dff,
- 0xa490, 0xa4c6,
- 0xa828, 0xa82b,
- 0xfdfd, 0xfdfd,
- 0xffe4, 0xffe4,
- 0xffe8, 0xffe8,
- 0xffed, 0xffee,
- 0xfffc, 0xfffd,
- 0x10102, 0x10102,
- 0x10137, 0x1013f,
- 0x10179, 0x10189,
- 0x10190, 0x1019b,
- 0x101d0, 0x101fc,
- 0x1d000, 0x1d0f5,
- 0x1d100, 0x1d126,
- 0x1d129, 0x1d164,
- 0x1d16a, 0x1d16c,
- 0x1d183, 0x1d184,
- 0x1d18c, 0x1d1a9,
- 0x1d1ae, 0x1d1dd,
- 0x1d200, 0x1d241,
- 0x1d245, 0x1d245,
- 0x1d300, 0x1d356,
- 0x1f000, 0x1f02b,
- 0x1f030, 0x1f093,
-}; /* CR_So */
-
-/* 'Z': Major Category */
-static const OnigCodePoint CR_Z[] = {
- 9,
- 0x0020, 0x0020,
- 0x00a0, 0x00a0,
- 0x1680, 0x1680,
- 0x180e, 0x180e,
- 0x2000, 0x200a,
- 0x2028, 0x2029,
- 0x202f, 0x202f,
- 0x205f, 0x205f,
- 0x3000, 0x3000,
-}; /* CR_Z */
-
-/* 'Zl': General Category */
-static const OnigCodePoint CR_Zl[] = {
- 1,
- 0x2028, 0x2028,
-}; /* CR_Zl */
-
-/* 'Zp': General Category */
-static const OnigCodePoint CR_Zp[] = {
- 1,
- 0x2029, 0x2029,
-}; /* CR_Zp */
-
-/* 'Zs': General Category */
-static const OnigCodePoint CR_Zs[] = {
- 8,
- 0x0020, 0x0020,
- 0x00a0, 0x00a0,
- 0x1680, 0x1680,
- 0x180e, 0x180e,
- 0x2000, 0x200a,
- 0x202f, 0x202f,
- 0x205f, 0x205f,
- 0x3000, 0x3000,
-}; /* CR_Zs */
-
-/* 'Common': Script */
-static const OnigCodePoint CR_Common[] = {
- 137,
- 0x0000, 0x0040,
- 0x005b, 0x0060,
- 0x007b, 0x00a9,
- 0x00ab, 0x00b9,
- 0x00bb, 0x00bf,
- 0x00d7, 0x00d7,
- 0x00f7, 0x00f7,
- 0x02b9, 0x02df,
- 0x02e5, 0x02ff,
- 0x0374, 0x0374,
- 0x037e, 0x037e,
- 0x0385, 0x0385,
- 0x0387, 0x0387,
- 0x0589, 0x0589,
- 0x0600, 0x0603,
- 0x060c, 0x060c,
- 0x061b, 0x061b,
- 0x061f, 0x061f,
- 0x0640, 0x0640,
- 0x0660, 0x0669,
- 0x06dd, 0x06dd,
- 0x0964, 0x0965,
- 0x0970, 0x0970,
- 0x0cf1, 0x0cf2,
- 0x0e3f, 0x0e3f,
- 0x10fb, 0x10fb,
- 0x16eb, 0x16ed,
- 0x1735, 0x1736,
- 0x1802, 0x1803,
- 0x1805, 0x1805,
- 0x2000, 0x200b,
- 0x200e, 0x2064,
- 0x206a, 0x2070,
- 0x2074, 0x207e,
- 0x2080, 0x208e,
- 0x20a0, 0x20b5,
- 0x2100, 0x2125,
- 0x2127, 0x2129,
- 0x212c, 0x2131,
- 0x2133, 0x214d,
- 0x214f, 0x214f,
- 0x2153, 0x215f,
- 0x2190, 0x23e7,
- 0x2400, 0x2426,
- 0x2440, 0x244a,
- 0x2460, 0x269d,
- 0x26a0, 0x26bc,
- 0x26c0, 0x26c3,
- 0x2701, 0x2704,
- 0x2706, 0x2709,
- 0x270c, 0x2727,
- 0x2729, 0x274b,
- 0x274d, 0x274d,
- 0x274f, 0x2752,
- 0x2756, 0x2756,
- 0x2758, 0x275e,
- 0x2761, 0x2794,
- 0x2798, 0x27af,
- 0x27b1, 0x27be,
- 0x27c0, 0x27ca,
- 0x27cc, 0x27cc,
- 0x27d0, 0x27ff,
- 0x2900, 0x2b4c,
- 0x2b50, 0x2b54,
- 0x2e00, 0x2e30,
- 0x2ff0, 0x2ffb,
- 0x3000, 0x3004,
- 0x3006, 0x3006,
- 0x3008, 0x3020,
- 0x3030, 0x3037,
- 0x303c, 0x303f,
- 0x309b, 0x309c,
- 0x30a0, 0x30a0,
- 0x30fb, 0x30fc,
- 0x3190, 0x319f,
- 0x31c0, 0x31e3,
- 0x3220, 0x3243,
- 0x3250, 0x325f,
- 0x327f, 0x32cf,
- 0x3358, 0x33ff,
- 0x4dc0, 0x4dff,
- 0xa700, 0xa721,
- 0xa788, 0xa78a,
- 0xfd3e, 0xfd3f,
- 0xfdfd, 0xfdfd,
- 0xfe10, 0xfe19,
- 0xfe30, 0xfe52,
- 0xfe54, 0xfe66,
- 0xfe68, 0xfe6b,
- 0xfeff, 0xfeff,
- 0xff01, 0xff20,
- 0xff3b, 0xff40,
- 0xff5b, 0xff65,
- 0xff70, 0xff70,
- 0xff9e, 0xff9f,
- 0xffe0, 0xffe6,
- 0xffe8, 0xffee,
- 0xfff9, 0xfffd,
- 0x10100, 0x10102,
- 0x10107, 0x10133,
- 0x10137, 0x1013f,
- 0x10190, 0x1019b,
- 0x101d0, 0x101fc,
- 0x1d000, 0x1d0f5,
- 0x1d100, 0x1d126,
- 0x1d129, 0x1d166,
- 0x1d16a, 0x1d17a,
- 0x1d183, 0x1d184,
- 0x1d18c, 0x1d1a9,
- 0x1d1ae, 0x1d1dd,
- 0x1d300, 0x1d356,
- 0x1d360, 0x1d371,
- 0x1d400, 0x1d454,
- 0x1d456, 0x1d49c,
- 0x1d49e, 0x1d49f,
- 0x1d4a2, 0x1d4a2,
- 0x1d4a5, 0x1d4a6,
- 0x1d4a9, 0x1d4ac,
- 0x1d4ae, 0x1d4b9,
- 0x1d4bb, 0x1d4bb,
- 0x1d4bd, 0x1d4c3,
- 0x1d4c5, 0x1d505,
- 0x1d507, 0x1d50a,
- 0x1d50d, 0x1d514,
- 0x1d516, 0x1d51c,
- 0x1d51e, 0x1d539,
- 0x1d53b, 0x1d53e,
- 0x1d540, 0x1d544,
- 0x1d546, 0x1d546,
- 0x1d54a, 0x1d550,
- 0x1d552, 0x1d6a5,
- 0x1d6a8, 0x1d7cb,
- 0x1d7ce, 0x1d7ff,
- 0x1f000, 0x1f02b,
- 0x1f030, 0x1f093,
- 0xe0001, 0xe0001,
- 0xe0020, 0xe007f,
-}; /* CR_Common */
-
-/* 'Latin': Script */
-static const OnigCodePoint CR_Latin[] = {
- 29,
- 0x0041, 0x005a,
- 0x0061, 0x007a,
- 0x00aa, 0x00aa,
- 0x00ba, 0x00ba,
- 0x00c0, 0x00d6,
- 0x00d8, 0x00f6,
- 0x00f8, 0x02b8,
- 0x02e0, 0x02e4,
- 0x1d00, 0x1d25,
- 0x1d2c, 0x1d5c,
- 0x1d62, 0x1d65,
- 0x1d6b, 0x1d77,
- 0x1d79, 0x1dbe,
- 0x1e00, 0x1eff,
- 0x2071, 0x2071,
- 0x207f, 0x207f,
- 0x2090, 0x2094,
- 0x212a, 0x212b,
- 0x2132, 0x2132,
- 0x214e, 0x214e,
- 0x2160, 0x2188,
- 0x2c60, 0x2c6f,
- 0x2c71, 0x2c7d,
- 0xa722, 0xa787,
- 0xa78b, 0xa78c,
- 0xa7fb, 0xa7ff,
- 0xfb00, 0xfb06,
- 0xff21, 0xff3a,
- 0xff41, 0xff5a,
-}; /* CR_Latin */
-
-/* 'Greek': Script */
-static const OnigCodePoint CR_Greek[] = {
- 33,
- 0x0370, 0x0373,
- 0x0375, 0x0377,
- 0x037a, 0x037d,
- 0x0384, 0x0384,
- 0x0386, 0x0386,
- 0x0388, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03e1,
- 0x03f0, 0x03ff,
- 0x1d26, 0x1d2a,
- 0x1d5d, 0x1d61,
- 0x1d66, 0x1d6a,
- 0x1dbf, 0x1dbf,
- 0x1f00, 0x1f15,
- 0x1f18, 0x1f1d,
- 0x1f20, 0x1f45,
- 0x1f48, 0x1f4d,
- 0x1f50, 0x1f57,
- 0x1f59, 0x1f59,
- 0x1f5b, 0x1f5b,
- 0x1f5d, 0x1f5d,
- 0x1f5f, 0x1f7d,
- 0x1f80, 0x1fb4,
- 0x1fb6, 0x1fc4,
- 0x1fc6, 0x1fd3,
- 0x1fd6, 0x1fdb,
- 0x1fdd, 0x1fef,
- 0x1ff2, 0x1ff4,
- 0x1ff6, 0x1ffe,
- 0x2126, 0x2126,
- 0x10140, 0x1018a,
- 0x1d200, 0x1d245,
-}; /* CR_Greek */
-
-/* 'Cyrillic': Script */
-static const OnigCodePoint CR_Cyrillic[] = {
- 7,
- 0x0400, 0x0523,
- 0x1d2b, 0x1d2b,
- 0x1d78, 0x1d78,
- 0x2de0, 0x2dff,
- 0xa640, 0xa65f,
- 0xa662, 0xa673,
- 0xa67c, 0xa697,
-}; /* CR_Cyrillic */
-
-/* 'Armenian': Script */
-static const OnigCodePoint CR_Armenian[] = {
- 5,
- 0x0531, 0x0556,
- 0x0559, 0x055f,
- 0x0561, 0x0587,
- 0x058a, 0x058a,
- 0xfb13, 0xfb17,
-}; /* CR_Armenian */
-
-/* 'Hebrew': Script */
-static const OnigCodePoint CR_Hebrew[] = {
- 9,
- 0x0591, 0x05c7,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0xfb1d, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfb4f,
-}; /* CR_Hebrew */
-
-/* 'Arabic': Script */
-static const OnigCodePoint CR_Arabic[] = {
- 17,
- 0x0606, 0x060b,
- 0x060d, 0x061a,
- 0x061e, 0x061e,
- 0x0621, 0x063f,
- 0x0641, 0x064a,
- 0x0656, 0x065e,
- 0x066a, 0x066f,
- 0x0671, 0x06dc,
- 0x06de, 0x06ff,
- 0x0750, 0x077f,
- 0xfb50, 0xfbb1,
- 0xfbd3, 0xfd3d,
- 0xfd50, 0xfd8f,
- 0xfd92, 0xfdc7,
- 0xfdf0, 0xfdfc,
- 0xfe70, 0xfe74,
- 0xfe76, 0xfefc,
-}; /* CR_Arabic */
-
-/* 'Syriac': Script */
-static const OnigCodePoint CR_Syriac[] = {
- 3,
- 0x0700, 0x070d,
- 0x070f, 0x074a,
- 0x074d, 0x074f,
-}; /* CR_Syriac */
-
-/* 'Thaana': Script */
-static const OnigCodePoint CR_Thaana[] = {
- 1,
- 0x0780, 0x07b1,
-}; /* CR_Thaana */
-
-/* 'Devanagari': Script */
-static const OnigCodePoint CR_Devanagari[] = {
- 8,
- 0x0901, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0950,
- 0x0953, 0x0954,
- 0x0958, 0x0963,
- 0x0966, 0x096f,
- 0x0971, 0x0972,
- 0x097b, 0x097f,
-}; /* CR_Devanagari */
-
-/* 'Bengali': Script */
-static const OnigCodePoint CR_Bengali[] = {
- 14,
- 0x0981, 0x0983,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bc, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09ce,
- 0x09d7, 0x09d7,
- 0x09dc, 0x09dd,
- 0x09df, 0x09e3,
- 0x09e6, 0x09fa,
-}; /* CR_Bengali */
-
-/* 'Gurmukhi': Script */
-static const OnigCodePoint CR_Gurmukhi[] = {
- 16,
- 0x0a01, 0x0a03,
- 0x0a05, 0x0a0a,
- 0x0a0f, 0x0a10,
- 0x0a13, 0x0a28,
- 0x0a2a, 0x0a30,
- 0x0a32, 0x0a33,
- 0x0a35, 0x0a36,
- 0x0a38, 0x0a39,
- 0x0a3c, 0x0a3c,
- 0x0a3e, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4d,
- 0x0a51, 0x0a51,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a66, 0x0a75,
-}; /* CR_Gurmukhi */
-
-/* 'Gujarati': Script */
-static const OnigCodePoint CR_Gujarati[] = {
- 14,
- 0x0a81, 0x0a83,
- 0x0a85, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abc, 0x0ac5,
- 0x0ac7, 0x0ac9,
- 0x0acb, 0x0acd,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae3,
- 0x0ae6, 0x0aef,
- 0x0af1, 0x0af1,
-}; /* CR_Gujarati */
-
-/* 'Oriya': Script */
-static const OnigCodePoint CR_Oriya[] = {
- 14,
- 0x0b01, 0x0b03,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b35, 0x0b39,
- 0x0b3c, 0x0b44,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b63,
- 0x0b66, 0x0b71,
-}; /* CR_Oriya */
-
-/* 'Tamil': Script */
-static const OnigCodePoint CR_Tamil[] = {
- 16,
- 0x0b82, 0x0b83,
- 0x0b85, 0x0b8a,
- 0x0b8e, 0x0b90,
- 0x0b92, 0x0b95,
- 0x0b99, 0x0b9a,
- 0x0b9c, 0x0b9c,
- 0x0b9e, 0x0b9f,
- 0x0ba3, 0x0ba4,
- 0x0ba8, 0x0baa,
- 0x0bae, 0x0bb9,
- 0x0bbe, 0x0bc2,
- 0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcd,
- 0x0bd0, 0x0bd0,
- 0x0bd7, 0x0bd7,
- 0x0be6, 0x0bfa,
-}; /* CR_Tamil */
-
-/* 'Telugu': Script */
-static const OnigCodePoint CR_Telugu[] = {
- 14,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3d, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c58, 0x0c59,
- 0x0c60, 0x0c63,
- 0x0c66, 0x0c6f,
- 0x0c78, 0x0c7f,
-}; /* CR_Telugu */
-
-/* 'Kannada': Script */
-static const OnigCodePoint CR_Kannada[] = {
- 13,
- 0x0c82, 0x0c83,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbc, 0x0cc4,
- 0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccd,
- 0x0cd5, 0x0cd6,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce3,
- 0x0ce6, 0x0cef,
-}; /* CR_Kannada */
-
-/* 'Malayalam': Script */
-static const OnigCodePoint CR_Malayalam[] = {
- 12,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3d, 0x0d44,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d63,
- 0x0d66, 0x0d75,
- 0x0d79, 0x0d7f,
-}; /* CR_Malayalam */
-
-/* 'Sinhala': Script */
-static const OnigCodePoint CR_Sinhala[] = {
- 11,
- 0x0d82, 0x0d83,
- 0x0d85, 0x0d96,
- 0x0d9a, 0x0db1,
- 0x0db3, 0x0dbb,
- 0x0dbd, 0x0dbd,
- 0x0dc0, 0x0dc6,
- 0x0dca, 0x0dca,
- 0x0dcf, 0x0dd4,
- 0x0dd6, 0x0dd6,
- 0x0dd8, 0x0ddf,
- 0x0df2, 0x0df4,
-}; /* CR_Sinhala */
-
-/* 'Thai': Script */
-static const OnigCodePoint CR_Thai[] = {
- 2,
- 0x0e01, 0x0e3a,
- 0x0e40, 0x0e5b,
-}; /* CR_Thai */
-
-/* 'Lao': Script */
-static const OnigCodePoint CR_Lao[] = {
- 18,
- 0x0e81, 0x0e82,
- 0x0e84, 0x0e84,
- 0x0e87, 0x0e88,
- 0x0e8a, 0x0e8a,
- 0x0e8d, 0x0e8d,
- 0x0e94, 0x0e97,
- 0x0e99, 0x0e9f,
- 0x0ea1, 0x0ea3,
- 0x0ea5, 0x0ea5,
- 0x0ea7, 0x0ea7,
- 0x0eaa, 0x0eab,
- 0x0ead, 0x0eb9,
- 0x0ebb, 0x0ebd,
- 0x0ec0, 0x0ec4,
- 0x0ec6, 0x0ec6,
- 0x0ec8, 0x0ecd,
- 0x0ed0, 0x0ed9,
- 0x0edc, 0x0edd,
-}; /* CR_Lao */
-
-/* 'Tibetan': Script */
-static const OnigCodePoint CR_Tibetan[] = {
- 7,
- 0x0f00, 0x0f47,
- 0x0f49, 0x0f6c,
- 0x0f71, 0x0f8b,
- 0x0f90, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fbe, 0x0fcc,
- 0x0fce, 0x0fd4,
-}; /* CR_Tibetan */
-
-/* 'Myanmar': Script */
-static const OnigCodePoint CR_Myanmar[] = {
- 2,
- 0x1000, 0x1099,
- 0x109e, 0x109f,
-}; /* CR_Myanmar */
-
-/* 'Georgian': Script */
-static const OnigCodePoint CR_Georgian[] = {
- 4,
- 0x10a0, 0x10c5,
- 0x10d0, 0x10fa,
- 0x10fc, 0x10fc,
- 0x2d00, 0x2d25,
-}; /* CR_Georgian */
-
-/* 'Hangul': Script */
-static const OnigCodePoint CR_Hangul[] = {
- 12,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x3131, 0x318e,
- 0x3200, 0x321e,
- 0x3260, 0x327e,
- 0xac00, 0xd7a3,
- 0xffa0, 0xffbe,
- 0xffc2, 0xffc7,
- 0xffca, 0xffcf,
- 0xffd2, 0xffd7,
- 0xffda, 0xffdc,
-}; /* CR_Hangul */
-
-/* 'Ethiopic': Script */
-static const OnigCodePoint CR_Ethiopic[] = {
- 27,
- 0x1200, 0x1248,
- 0x124a, 0x124d,
- 0x1250, 0x1256,
- 0x1258, 0x1258,
- 0x125a, 0x125d,
- 0x1260, 0x1288,
- 0x128a, 0x128d,
- 0x1290, 0x12b0,
- 0x12b2, 0x12b5,
- 0x12b8, 0x12be,
- 0x12c0, 0x12c0,
- 0x12c2, 0x12c5,
- 0x12c8, 0x12d6,
- 0x12d8, 0x1310,
- 0x1312, 0x1315,
- 0x1318, 0x135a,
- 0x135f, 0x137c,
- 0x1380, 0x1399,
- 0x2d80, 0x2d96,
- 0x2da0, 0x2da6,
- 0x2da8, 0x2dae,
- 0x2db0, 0x2db6,
- 0x2db8, 0x2dbe,
- 0x2dc0, 0x2dc6,
- 0x2dc8, 0x2dce,
- 0x2dd0, 0x2dd6,
- 0x2dd8, 0x2dde,
-}; /* CR_Ethiopic */
-
-/* 'Cherokee': Script */
-static const OnigCodePoint CR_Cherokee[] = {
- 1,
- 0x13a0, 0x13f4,
-}; /* CR_Cherokee */
-
-/* 'Canadian_Aboriginal': Script */
-static const OnigCodePoint CR_Canadian_Aboriginal[] = {
- 1,
- 0x1401, 0x1676,
-}; /* CR_Canadian_Aboriginal */
-
-/* 'Ogham': Script */
-static const OnigCodePoint CR_Ogham[] = {
- 1,
- 0x1680, 0x169c,
-}; /* CR_Ogham */
-
-/* 'Runic': Script */
-static const OnigCodePoint CR_Runic[] = {
- 2,
- 0x16a0, 0x16ea,
- 0x16ee, 0x16f0,
-}; /* CR_Runic */
-
-/* 'Khmer': Script */
-static const OnigCodePoint CR_Khmer[] = {
- 4,
- 0x1780, 0x17dd,
- 0x17e0, 0x17e9,
- 0x17f0, 0x17f9,
- 0x19e0, 0x19ff,
-}; /* CR_Khmer */
-
-/* 'Mongolian': Script */
-static const OnigCodePoint CR_Mongolian[] = {
- 6,
- 0x1800, 0x1801,
- 0x1804, 0x1804,
- 0x1806, 0x180e,
- 0x1810, 0x1819,
- 0x1820, 0x1877,
- 0x1880, 0x18aa,
-}; /* CR_Mongolian */
-
-/* 'Hiragana': Script */
-static const OnigCodePoint CR_Hiragana[] = {
- 2,
- 0x3041, 0x3096,
- 0x309d, 0x309f,
-}; /* CR_Hiragana */
-
-/* 'Katakana': Script */
-static const OnigCodePoint CR_Katakana[] = {
- 7,
- 0x30a1, 0x30fa,
- 0x30fd, 0x30ff,
- 0x31f0, 0x31ff,
- 0x32d0, 0x32fe,
- 0x3300, 0x3357,
- 0xff66, 0xff6f,
- 0xff71, 0xff9d,
-}; /* CR_Katakana */
-
-/* 'Bopomofo': Script */
-static const OnigCodePoint CR_Bopomofo[] = {
- 2,
- 0x3105, 0x312d,
- 0x31a0, 0x31b7,
-}; /* CR_Bopomofo */
-
-/* 'Han': Script */
-static const OnigCodePoint CR_Han[] = {
- 14,
- 0x2e80, 0x2e99,
- 0x2e9b, 0x2ef3,
- 0x2f00, 0x2fd5,
- 0x3005, 0x3005,
- 0x3007, 0x3007,
- 0x3021, 0x3029,
- 0x3038, 0x303b,
- 0x3400, 0x4db5,
- 0x4e00, 0x9fc3,
- 0xf900, 0xfa2d,
- 0xfa30, 0xfa6a,
- 0xfa70, 0xfad9,
- 0x20000, 0x2a6d6,
- 0x2f800, 0x2fa1d,
-}; /* CR_Han */
-
-/* 'Yi': Script */
-static const OnigCodePoint CR_Yi[] = {
- 2,
- 0xa000, 0xa48c,
- 0xa490, 0xa4c6,
-}; /* CR_Yi */
-
-/* 'Old_Italic': Script */
-static const OnigCodePoint CR_Old_Italic[] = {
- 2,
- 0x10300, 0x1031e,
- 0x10320, 0x10323,
-}; /* CR_Old_Italic */
-
-/* 'Gothic': Script */
-static const OnigCodePoint CR_Gothic[] = {
- 1,
- 0x10330, 0x1034a,
-}; /* CR_Gothic */
-
-/* 'Deseret': Script */
-static const OnigCodePoint CR_Deseret[] = {
- 1,
- 0x10400, 0x1044f,
-}; /* CR_Deseret */
-
-/* 'Inherited': Script */
-static const OnigCodePoint CR_Inherited[] = {
- 18,
- 0x0300, 0x036f,
- 0x064b, 0x0655,
- 0x0670, 0x0670,
- 0x0951, 0x0952,
- 0x1dc0, 0x1de6,
- 0x1dfe, 0x1dff,
- 0x200c, 0x200d,
- 0x20d0, 0x20f0,
- 0x302a, 0x302f,
- 0x3099, 0x309a,
- 0xfe00, 0xfe0f,
- 0xfe20, 0xfe26,
- 0x101fd, 0x101fd,
- 0x1d167, 0x1d169,
- 0x1d17b, 0x1d182,
- 0x1d185, 0x1d18b,
- 0x1d1aa, 0x1d1ad,
- 0xe0100, 0xe01ef,
-}; /* CR_Inherited */
-
-/* 'Tagalog': Script */
-static const OnigCodePoint CR_Tagalog[] = {
- 2,
- 0x1700, 0x170c,
- 0x170e, 0x1714,
-}; /* CR_Tagalog */
-
-/* 'Hanunoo': Script */
-static const OnigCodePoint CR_Hanunoo[] = {
- 1,
- 0x1720, 0x1734,
-}; /* CR_Hanunoo */
-
-/* 'Buhid': Script */
-static const OnigCodePoint CR_Buhid[] = {
- 1,
- 0x1740, 0x1753,
-}; /* CR_Buhid */
-
-/* 'Tagbanwa': Script */
-static const OnigCodePoint CR_Tagbanwa[] = {
- 3,
- 0x1760, 0x176c,
- 0x176e, 0x1770,
- 0x1772, 0x1773,
-}; /* CR_Tagbanwa */
-
-/* 'Limbu': Script */
-static const OnigCodePoint CR_Limbu[] = {
- 5,
- 0x1900, 0x191c,
- 0x1920, 0x192b,
- 0x1930, 0x193b,
- 0x1940, 0x1940,
- 0x1944, 0x194f,
-}; /* CR_Limbu */
-
-/* 'Tai_Le': Script */
-static const OnigCodePoint CR_Tai_Le[] = {
- 2,
- 0x1950, 0x196d,
- 0x1970, 0x1974,
-}; /* CR_Tai_Le */
-
-/* 'Linear_B': Script */
-static const OnigCodePoint CR_Linear_B[] = {
- 7,
- 0x10000, 0x1000b,
- 0x1000d, 0x10026,
- 0x10028, 0x1003a,
- 0x1003c, 0x1003d,
- 0x1003f, 0x1004d,
- 0x10050, 0x1005d,
- 0x10080, 0x100fa,
-}; /* CR_Linear_B */
-
-/* 'Ugaritic': Script */
-static const OnigCodePoint CR_Ugaritic[] = {
- 2,
- 0x10380, 0x1039d,
- 0x1039f, 0x1039f,
-}; /* CR_Ugaritic */
-
-/* 'Shavian': Script */
-static const OnigCodePoint CR_Shavian[] = {
- 1,
- 0x10450, 0x1047f,
-}; /* CR_Shavian */
-
-/* 'Osmanya': Script */
-static const OnigCodePoint CR_Osmanya[] = {
- 2,
- 0x10480, 0x1049d,
- 0x104a0, 0x104a9,
-}; /* CR_Osmanya */
-
-/* 'Cypriot': Script */
-static const OnigCodePoint CR_Cypriot[] = {
- 6,
- 0x10800, 0x10805,
- 0x10808, 0x10808,
- 0x1080a, 0x10835,
- 0x10837, 0x10838,
- 0x1083c, 0x1083c,
- 0x1083f, 0x1083f,
-}; /* CR_Cypriot */
-
-/* 'Braille': Script */
-static const OnigCodePoint CR_Braille[] = {
- 1,
- 0x2800, 0x28ff,
-}; /* CR_Braille */
-
-/* 'Buginese': Script */
-static const OnigCodePoint CR_Buginese[] = {
- 2,
- 0x1a00, 0x1a1b,
- 0x1a1e, 0x1a1f,
-}; /* CR_Buginese */
-
-/* 'Coptic': Script */
-static const OnigCodePoint CR_Coptic[] = {
- 3,
- 0x03e2, 0x03ef,
- 0x2c80, 0x2cea,
- 0x2cf9, 0x2cff,
-}; /* CR_Coptic */
-
-/* 'New_Tai_Lue': Script */
-static const OnigCodePoint CR_New_Tai_Lue[] = {
- 4,
- 0x1980, 0x19a9,
- 0x19b0, 0x19c9,
- 0x19d0, 0x19d9,
- 0x19de, 0x19df,
-}; /* CR_New_Tai_Lue */
-
-/* 'Glagolitic': Script */
-static const OnigCodePoint CR_Glagolitic[] = {
- 2,
- 0x2c00, 0x2c2e,
- 0x2c30, 0x2c5e,
-}; /* CR_Glagolitic */
-
-/* 'Tifinagh': Script */
-static const OnigCodePoint CR_Tifinagh[] = {
- 2,
- 0x2d30, 0x2d65,
- 0x2d6f, 0x2d6f,
-}; /* CR_Tifinagh */
-
-/* 'Syloti_Nagri': Script */
-static const OnigCodePoint CR_Syloti_Nagri[] = {
- 1,
- 0xa800, 0xa82b,
-}; /* CR_Syloti_Nagri */
-
-/* 'Old_Persian': Script */
-static const OnigCodePoint CR_Old_Persian[] = {
- 2,
- 0x103a0, 0x103c3,
- 0x103c8, 0x103d5,
-}; /* CR_Old_Persian */
-
-/* 'Kharoshthi': Script */
-static const OnigCodePoint CR_Kharoshthi[] = {
- 8,
- 0x10a00, 0x10a03,
- 0x10a05, 0x10a06,
- 0x10a0c, 0x10a13,
- 0x10a15, 0x10a17,
- 0x10a19, 0x10a33,
- 0x10a38, 0x10a3a,
- 0x10a3f, 0x10a47,
- 0x10a50, 0x10a58,
-}; /* CR_Kharoshthi */
-
-/* 'Balinese': Script */
-static const OnigCodePoint CR_Balinese[] = {
- 2,
- 0x1b00, 0x1b4b,
- 0x1b50, 0x1b7c,
-}; /* CR_Balinese */
-
-/* 'Cuneiform': Script */
-static const OnigCodePoint CR_Cuneiform[] = {
- 3,
- 0x12000, 0x1236e,
- 0x12400, 0x12462,
- 0x12470, 0x12473,
-}; /* CR_Cuneiform */
-
-/* 'Phoenician': Script */
-static const OnigCodePoint CR_Phoenician[] = {
- 2,
- 0x10900, 0x10919,
- 0x1091f, 0x1091f,
-}; /* CR_Phoenician */
-
-/* 'Phags_Pa': Script */
-static const OnigCodePoint CR_Phags_Pa[] = {
- 1,
- 0xa840, 0xa877,
-}; /* CR_Phags_Pa */
-
-/* 'Nko': Script */
-static const OnigCodePoint CR_Nko[] = {
- 1,
- 0x07c0, 0x07fa,
-}; /* CR_Nko */
-
-/* 'Sundanese': Script */
-static const OnigCodePoint CR_Sundanese[] = {
- 2,
- 0x1b80, 0x1baa,
- 0x1bae, 0x1bb9,
-}; /* CR_Sundanese */
-
-/* 'Lepcha': Script */
-static const OnigCodePoint CR_Lepcha[] = {
- 3,
- 0x1c00, 0x1c37,
- 0x1c3b, 0x1c49,
- 0x1c4d, 0x1c4f,
-}; /* CR_Lepcha */
-
-/* 'Ol_Chiki': Script */
-static const OnigCodePoint CR_Ol_Chiki[] = {
- 1,
- 0x1c50, 0x1c7f,
-}; /* CR_Ol_Chiki */
-
-/* 'Vai': Script */
-static const OnigCodePoint CR_Vai[] = {
- 1,
- 0xa500, 0xa62b,
-}; /* CR_Vai */
-
-/* 'Saurashtra': Script */
-static const OnigCodePoint CR_Saurashtra[] = {
- 2,
- 0xa880, 0xa8c4,
- 0xa8ce, 0xa8d9,
-}; /* CR_Saurashtra */
-
-/* 'Kayah_Li': Script */
-static const OnigCodePoint CR_Kayah_Li[] = {
- 1,
- 0xa900, 0xa92f,
-}; /* CR_Kayah_Li */
-
-/* 'Rejang': Script */
-static const OnigCodePoint CR_Rejang[] = {
- 2,
- 0xa930, 0xa953,
- 0xa95f, 0xa95f,
-}; /* CR_Rejang */
-
-/* 'Lycian': Script */
-static const OnigCodePoint CR_Lycian[] = {
- 1,
- 0x10280, 0x1029c,
-}; /* CR_Lycian */
-
-/* 'Carian': Script */
-static const OnigCodePoint CR_Carian[] = {
- 1,
- 0x102a0, 0x102d0,
-}; /* CR_Carian */
-
-/* 'Lydian': Script */
-static const OnigCodePoint CR_Lydian[] = {
- 2,
- 0x10920, 0x10939,
- 0x1093f, 0x1093f,
-}; /* CR_Lydian */
-
-/* 'Cham': Script */
-static const OnigCodePoint CR_Cham[] = {
- 4,
- 0xaa00, 0xaa36,
- 0xaa40, 0xaa4d,
- 0xaa50, 0xaa59,
- 0xaa5c, 0xaa5f,
-}; /* CR_Cham */
-#endif /* USE_UNICODE_PROPERTIES */
-#endif /* USE_UNICODE_PROPERTIES */
-
-
-static const OnigCodePoint* const CodeRanges[] = {
- CR_NEWLINE,
- CR_Alpha,
- CR_Blank,
- CR_Cntrl,
- CR_Digit,
- CR_Graph,
- CR_Lower,
- CR_Print,
- CR_Punct,
- CR_Space,
- CR_Upper,
- CR_XDigit,
- CR_Word,
- CR_Alnum,
- CR_ASCII,
-#ifdef USE_UNICODE_PROPERTIES
-#ifdef USE_UNICODE_PROPERTIES
- CR_Any,
- CR_Assigned,
- CR_C,
- CR_Cc,
- CR_Cf,
- CR_Cn,
- CR_Co,
- CR_Cs,
- CR_L,
- CR_Ll,
- CR_Lm,
- CR_Lo,
- CR_Lt,
- CR_Lu,
- CR_M,
- CR_Mc,
- CR_Me,
- CR_Mn,
- CR_N,
- CR_Nd,
- CR_Nl,
- CR_No,
- CR_P,
- CR_Pc,
- CR_Pd,
- CR_Pe,
- CR_Pf,
- CR_Pi,
- CR_Po,
- CR_Ps,
- CR_S,
- CR_Sc,
- CR_Sk,
- CR_Sm,
- CR_So,
- CR_Z,
- CR_Zl,
- CR_Zp,
- CR_Zs,
- CR_Common,
- CR_Latin,
- CR_Greek,
- CR_Cyrillic,
- CR_Armenian,
- CR_Hebrew,
- CR_Arabic,
- CR_Syriac,
- CR_Thaana,
- CR_Devanagari,
- CR_Bengali,
- CR_Gurmukhi,
- CR_Gujarati,
- CR_Oriya,
- CR_Tamil,
- CR_Telugu,
- CR_Kannada,
- CR_Malayalam,
- CR_Sinhala,
- CR_Thai,
- CR_Lao,
- CR_Tibetan,
- CR_Myanmar,
- CR_Georgian,
- CR_Hangul,
- CR_Ethiopic,
- CR_Cherokee,
- CR_Canadian_Aboriginal,
- CR_Ogham,
- CR_Runic,
- CR_Khmer,
- CR_Mongolian,
- CR_Hiragana,
- CR_Katakana,
- CR_Bopomofo,
- CR_Han,
- CR_Yi,
- CR_Old_Italic,
- CR_Gothic,
- CR_Deseret,
- CR_Inherited,
- CR_Tagalog,
- CR_Hanunoo,
- CR_Buhid,
- CR_Tagbanwa,
- CR_Limbu,
- CR_Tai_Le,
- CR_Linear_B,
- CR_Ugaritic,
- CR_Shavian,
- CR_Osmanya,
- CR_Cypriot,
- CR_Braille,
- CR_Buginese,
- CR_Coptic,
- CR_New_Tai_Lue,
- CR_Glagolitic,
- CR_Tifinagh,
- CR_Syloti_Nagri,
- CR_Old_Persian,
- CR_Kharoshthi,
- CR_Balinese,
- CR_Cuneiform,
- CR_Phoenician,
- CR_Phags_Pa,
- CR_Nko,
- CR_Sundanese,
- CR_Lepcha,
- CR_Ol_Chiki,
- CR_Vai,
- CR_Saurashtra,
- CR_Kayah_Li,
- CR_Rejang,
- CR_Lycian,
- CR_Carian,
- CR_Lydian,
- CR_Cham,
-#endif /* USE_UNICODE_PROPERTIES */
-#endif /* USE_UNICODE_PROPERTIES */
-};
-struct uniname2ctype_struct {
- int name, ctype;
-};
-
-static const struct uniname2ctype_struct *uniname2ctype_p(const char *, unsigned int);
-
-#ifndef USE_UNICODE_PROPERTIES
-#define TOTAL_KEYWORDS 15
-#define MIN_WORD_LENGTH 4
-#define MAX_WORD_LENGTH 7
-#define MIN_HASH_VALUE 6
-#define MAX_HASH_VALUE 20
-/* maximum key range = 15, duplicates = 0 */
-#else /* USE_UNICODE_PROPERTIES */
-#define TOTAL_KEYWORDS 131
-#define MIN_WORD_LENGTH 1
-#define MAX_WORD_LENGTH 19
-#define MIN_HASH_VALUE 2
-#define MAX_HASH_VALUE 167
-/* maximum key range = 166, duplicates = 0 */
-#endif /* USE_UNICODE_PROPERTIES */
-
-#ifdef __GNUC__
-__inline
-#else
-#ifdef __cplusplus
-inline
-#endif
-#endif
-static unsigned int
-uniname2ctype_hash (str, len)
- register const char *str;
- register unsigned int len;
-{
- static const unsigned char asso_values[] =
- {
-#ifndef USE_UNICODE_PROPERTIES
- 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
- 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
- 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
- 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
- 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
- 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
- 21, 21, 21, 21, 21, 1, 10, 3, 7, 21,
- 21, 8, 21, 21, 21, 21, 6, 21, 8, 21,
- 4, 21, 21, 5, 21, 8, 21, 1, 4, 21,
- 21, 21, 21, 21, 21, 21, 21, 5, 21, 21,
- 21, 21, 21, 7, 21, 3, 21, 21, 21, 21,
- 2, 21, 1, 21, 1, 21, 2, 21, 21, 6,
- 21, 21, 21, 21, 21, 21, 21, 21
-#else /* USE_UNICODE_PROPERTIES */
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 33, 14, 2, 56, 13,
- 168, 38, 89, 98, 168, 58, 11, 12, 85, 22,
- 1, 168, 78, 3, 38, 24, 62, 12, 7, 64,
- 108, 168, 168, 168, 168, 70, 168, 5, 5, 73,
- 57, 22, 31, 57, 9, 49, 36, 39, 13, 49,
- 4, 2, 18, 168, 20, 6, 60, 1, 24, 14,
- 168, 21, 168, 168, 168, 168, 168, 168
-#endif /* USE_UNICODE_PROPERTIES */
- };
-#ifndef USE_UNICODE_PROPERTIES
- return len + asso_values[(unsigned char)str[2]] + asso_values[(unsigned char)str[0]];
-#else /* USE_UNICODE_PROPERTIES */
- register int hval = len;
-
- switch (hval)
- {
- default:
- hval += asso_values[(unsigned char)str[2]];
- /*FALLTHROUGH*/
- case 2:
- hval += asso_values[(unsigned char)str[1]];
- /*FALLTHROUGH*/
- case 1:
- hval += asso_values[(unsigned char)str[0]];
- break;
- }
- return hval;
-#endif /* USE_UNICODE_PROPERTIES */
-}
-
-struct uniname2ctype_pool_t
- {
-#ifndef USE_UNICODE_PROPERTIES
- char uniname2ctype_pool_str6[sizeof("Word")];
- char uniname2ctype_pool_str7[sizeof("Alpha")];
- char uniname2ctype_pool_str8[sizeof("Alnum")];
- char uniname2ctype_pool_str9[sizeof("ASCII")];
- char uniname2ctype_pool_str10[sizeof("Cntrl")];
-#else /* USE_UNICODE_PROPERTIES */
- char uniname2ctype_pool_str2[sizeof("P")];
- char uniname2ctype_pool_str3[sizeof("C")];
- char uniname2ctype_pool_str4[sizeof("S")];
- char uniname2ctype_pool_str5[sizeof("Po")];
- char uniname2ctype_pool_str6[sizeof("Co")];
- char uniname2ctype_pool_str7[sizeof("So")];
- char uniname2ctype_pool_str8[sizeof("Cn")];
- char uniname2ctype_pool_str9[sizeof("Ps")];
- char uniname2ctype_pool_str10[sizeof("Cs")];
-#endif /* USE_UNICODE_PROPERTIES */
- char uniname2ctype_pool_str11[sizeof("Punct")];
-#ifndef USE_UNICODE_PROPERTIES
- char uniname2ctype_pool_str12[sizeof("Print")];
- char uniname2ctype_pool_str13[sizeof("XDigit")];
- char uniname2ctype_pool_str14[sizeof("Upper")];
- char uniname2ctype_pool_str15[sizeof("Space")];
- char uniname2ctype_pool_str16[sizeof("NEWLINE")];
- char uniname2ctype_pool_str17[sizeof("Lower")];
- char uniname2ctype_pool_str18[sizeof("Graph")];
- char uniname2ctype_pool_str19[sizeof("Digit")];
- char uniname2ctype_pool_str20[sizeof("Blank")];
-#else /* USE_UNICODE_PROPERTIES */
- char uniname2ctype_pool_str12[sizeof("L")];
- char uniname2ctype_pool_str13[sizeof("M")];
- char uniname2ctype_pool_str14[sizeof("Lu")];
- char uniname2ctype_pool_str15[sizeof("Lo")];
- char uniname2ctype_pool_str16[sizeof("Cuneiform")];
- char uniname2ctype_pool_str17[sizeof("Sundanese")];
- char uniname2ctype_pool_str18[sizeof("Mn")];
- char uniname2ctype_pool_str19[sizeof("Saurashtra")];
- char uniname2ctype_pool_str20[sizeof("Cham")];
- char uniname2ctype_pool_str21[sizeof("Lao")];
- char uniname2ctype_pool_str22[sizeof("Phoenician")];
- char uniname2ctype_pool_str23[sizeof("Phags_Pa")];
- char uniname2ctype_pool_str24[sizeof("Shavian")];
- char uniname2ctype_pool_str25[sizeof("Pe")];
- char uniname2ctype_pool_str26[sizeof("Ll")];
- char uniname2ctype_pool_str27[sizeof("Mongolian")];
- char uniname2ctype_pool_str28[sizeof("Coptic")];
- char uniname2ctype_pool_str29[sizeof("Buhid")];
- char uniname2ctype_pool_str30[sizeof("Canadian_Aboriginal")];
- char uniname2ctype_pool_str31[sizeof("Space")];
- char uniname2ctype_pool_str32[sizeof("Lower")];
- char uniname2ctype_pool_str33[sizeof("Carian")];
- char uniname2ctype_pool_str34[sizeof("Pf")];
- char uniname2ctype_pool_str35[sizeof("Cf")];
- char uniname2ctype_pool_str36[sizeof("Me")];
- char uniname2ctype_pool_str37[sizeof("Blank")];
- char uniname2ctype_pool_str38[sizeof("Word")];
- char uniname2ctype_pool_str39[sizeof("Malayalam")];
- char uniname2ctype_pool_str40[sizeof("Balinese")];
- char uniname2ctype_pool_str41[sizeof("Cherokee")];
- char uniname2ctype_pool_str42[sizeof("Bopomofo")];
- char uniname2ctype_pool_str43[sizeof("ASCII")];
- char uniname2ctype_pool_str44[sizeof("Sk")];
- char uniname2ctype_pool_str45[sizeof("Myanmar")];
- char uniname2ctype_pool_str46[sizeof("Braille")];
- char uniname2ctype_pool_str47[sizeof("Bengali")];
- char uniname2ctype_pool_str48[sizeof("Cypriot")];
- char uniname2ctype_pool_str49[sizeof("Syloti_Nagri")];
- char uniname2ctype_pool_str50[sizeof("Syriac")];
- char uniname2ctype_pool_str51[sizeof("Cyrillic")];
- char uniname2ctype_pool_str52[sizeof("Pi")];
- char uniname2ctype_pool_str53[sizeof("Assigned")];
- char uniname2ctype_pool_str54[sizeof("Sm")];
- char uniname2ctype_pool_str55[sizeof("Alnum")];
- char uniname2ctype_pool_str56[sizeof("Thai")];
- char uniname2ctype_pool_str57[sizeof("Lepcha")];
- char uniname2ctype_pool_str58[sizeof("Thaana")];
- char uniname2ctype_pool_str59[sizeof("Common")];
- char uniname2ctype_pool_str60[sizeof("Pd")];
- char uniname2ctype_pool_str61[sizeof("Any")];
- char uniname2ctype_pool_str62[sizeof("Lm")];
- char uniname2ctype_pool_str63[sizeof("Sinhala")];
- char uniname2ctype_pool_str64[sizeof("Arabic")];
- char uniname2ctype_pool_str65[sizeof("Upper")];
- char uniname2ctype_pool_str66[sizeof("Glagolitic")];
- char uniname2ctype_pool_str67[sizeof("Gurmukhi")];
- char uniname2ctype_pool_str68[sizeof("Graph")];
- char uniname2ctype_pool_str69[sizeof("Alpha")];
- char uniname2ctype_pool_str70[sizeof("Georgian")];
- char uniname2ctype_pool_str71[sizeof("Cntrl")];
- char uniname2ctype_pool_str72[sizeof("Linear_B")];
- char uniname2ctype_pool_str73[sizeof("Lt")];
- char uniname2ctype_pool_str74[sizeof("Kannada")];
- char uniname2ctype_pool_str75[sizeof("Print")];
- char uniname2ctype_pool_str76[sizeof("Pc")];
- char uniname2ctype_pool_str77[sizeof("Cc")];
- char uniname2ctype_pool_str78[sizeof("Sc")];
- char uniname2ctype_pool_str79[sizeof("Telugu")];
- char uniname2ctype_pool_str80[sizeof("Buginese")];
- char uniname2ctype_pool_str81[sizeof("Latin")];
- char uniname2ctype_pool_str82[sizeof("Kharoshthi")];
- char uniname2ctype_pool_str83[sizeof("Gujarati")];
- char uniname2ctype_pool_str84[sizeof("Osmanya")];
- char uniname2ctype_pool_str85[sizeof("Greek")];
- char uniname2ctype_pool_str86[sizeof("N")];
- char uniname2ctype_pool_str87[sizeof("Mc")];
- char uniname2ctype_pool_str88[sizeof("Runic")];
- char uniname2ctype_pool_str89[sizeof("No")];
- char uniname2ctype_pool_str90[sizeof("Ethiopic")];
- char uniname2ctype_pool_str91[sizeof("Deseret")];
- char uniname2ctype_pool_str92[sizeof("Kayah_Li")];
- char uniname2ctype_pool_str93[sizeof("Ogham")];
- char uniname2ctype_pool_str94[sizeof("Ugaritic")];
- char uniname2ctype_pool_str95[sizeof("Lydian")];
- char uniname2ctype_pool_str96[sizeof("Oriya")];
- char uniname2ctype_pool_str97[sizeof("Tamil")];
- char uniname2ctype_pool_str98[sizeof("Tai_Le")];
- char uniname2ctype_pool_str99[sizeof("Tibetan")];
- char uniname2ctype_pool_str100[sizeof("Nl")];
- char uniname2ctype_pool_str101[sizeof("Han")];
- char uniname2ctype_pool_str102[sizeof("Old_Italic")];
- char uniname2ctype_pool_str103[sizeof("Old_Persian")];
- char uniname2ctype_pool_str104[sizeof("Hangul")];
- char uniname2ctype_pool_str105[sizeof("Hanunoo")];
- char uniname2ctype_pool_str106[sizeof("Gothic")];
- char uniname2ctype_pool_str107[sizeof("Tagalog")];
- char uniname2ctype_pool_str108[sizeof("Tagbanwa")];
- char uniname2ctype_pool_str109[sizeof("Z")];
- char uniname2ctype_pool_str110[sizeof("Armenian")];
- char uniname2ctype_pool_str111[sizeof("Lycian")];
- char uniname2ctype_pool_str112[sizeof("Devanagari")];
- char uniname2ctype_pool_str113[sizeof("Ol_Chiki")];
- char uniname2ctype_pool_str114[sizeof("Limbu")];
- char uniname2ctype_pool_str115[sizeof("Yi")];
- char uniname2ctype_pool_str116[sizeof("Zs")];
- char uniname2ctype_pool_str117[sizeof("NEWLINE")];
- char uniname2ctype_pool_str118[sizeof("XDigit")];
- char uniname2ctype_pool_str119[sizeof("Vai")];
- char uniname2ctype_pool_str120[sizeof("Inherited")];
- char uniname2ctype_pool_str121[sizeof("Khmer")];
- char uniname2ctype_pool_str122[sizeof("Hebrew")];
- char uniname2ctype_pool_str123[sizeof("Zl")];
- char uniname2ctype_pool_str126[sizeof("Tifinagh")];
- char uniname2ctype_pool_str128[sizeof("Zp")];
- char uniname2ctype_pool_str129[sizeof("Nko")];
- char uniname2ctype_pool_str131[sizeof("Katakana")];
- char uniname2ctype_pool_str132[sizeof("New_Tai_Lue")];
- char uniname2ctype_pool_str142[sizeof("Rejang")];
- char uniname2ctype_pool_str144[sizeof("Nd")];
- char uniname2ctype_pool_str166[sizeof("Hiragana")];
- char uniname2ctype_pool_str167[sizeof("Digit")];
-#endif /* USE_UNICODE_PROPERTIES */
- };
-static const struct uniname2ctype_pool_t uniname2ctype_pool_contents =
- {
-#ifdef USE_UNICODE_PROPERTIES
- "P",
- "C",
- "S",
- "Po",
- "Co",
- "So",
- "Cn",
- "Ps",
- "Cs",
- "Punct",
- "L",
- "M",
- "Lu",
- "Lo",
- "Cuneiform",
- "Sundanese",
- "Mn",
- "Saurashtra",
- "Cham",
- "Lao",
- "Phoenician",
- "Phags_Pa",
- "Shavian",
- "Pe",
- "Ll",
- "Mongolian",
- "Coptic",
- "Buhid",
- "Canadian_Aboriginal",
- "Space",
- "Lower",
- "Carian",
- "Pf",
- "Cf",
- "Me",
- "Blank",
-#endif /* USE_UNICODE_PROPERTIES */
- "Word",
-#ifndef USE_UNICODE_PROPERTIES
- "Alpha",
- "Alnum",
-#else /* USE_UNICODE_PROPERTIES */
- "Malayalam",
- "Balinese",
- "Cherokee",
- "Bopomofo",
-#endif /* USE_UNICODE_PROPERTIES */
- "ASCII",
-#ifdef USE_UNICODE_PROPERTIES
- "Sk",
- "Myanmar",
- "Braille",
- "Bengali",
- "Cypriot",
- "Syloti_Nagri",
- "Syriac",
- "Cyrillic",
- "Pi",
- "Assigned",
- "Sm",
- "Alnum",
- "Thai",
- "Lepcha",
- "Thaana",
- "Common",
- "Pd",
- "Any",
- "Lm",
- "Sinhala",
- "Arabic",
- "Upper",
- "Glagolitic",
- "Gurmukhi",
- "Graph",
- "Alpha",
- "Georgian",
-#endif /* USE_UNICODE_PROPERTIES */
- "Cntrl",
-#ifndef USE_UNICODE_PROPERTIES
- "Punct",
-#else /* USE_UNICODE_PROPERTIES */
- "Linear_B",
- "Lt",
- "Kannada",
-#endif /* USE_UNICODE_PROPERTIES */
- "Print",
-#ifndef USE_UNICODE_PROPERTIES
- "XDigit",
- "Upper",
- "Space",
-#else /* USE_UNICODE_PROPERTIES */
- "Pc",
- "Cc",
- "Sc",
- "Telugu",
- "Buginese",
- "Latin",
- "Kharoshthi",
- "Gujarati",
- "Osmanya",
- "Greek",
- "N",
- "Mc",
- "Runic",
- "No",
- "Ethiopic",
- "Deseret",
- "Kayah_Li",
- "Ogham",
- "Ugaritic",
- "Lydian",
- "Oriya",
- "Tamil",
- "Tai_Le",
- "Tibetan",
- "Nl",
- "Han",
- "Old_Italic",
- "Old_Persian",
- "Hangul",
- "Hanunoo",
- "Gothic",
- "Tagalog",
- "Tagbanwa",
- "Z",
- "Armenian",
- "Lycian",
- "Devanagari",
- "Ol_Chiki",
- "Limbu",
- "Yi",
- "Zs",
-#endif /* USE_UNICODE_PROPERTIES */
- "NEWLINE",
-#ifndef USE_UNICODE_PROPERTIES
- "Lower",
- "Graph",
- "Digit",
- "Blank"
-#else /* USE_UNICODE_PROPERTIES */
- "XDigit",
- "Vai",
- "Inherited",
- "Khmer",
- "Hebrew",
- "Zl",
- "Tifinagh",
- "Zp",
- "Nko",
- "Katakana",
- "New_Tai_Lue",
- "Rejang",
- "Nd",
- "Hiragana",
- "Digit"
-#endif /* USE_UNICODE_PROPERTIES */
- };
-#define uniname2ctype_pool ((const char *) &uniname2ctype_pool_contents)
-#ifdef __GNUC__
-__inline
-#ifdef __GNUC_STDC_INLINE__
-__attribute__ ((__gnu_inline__))
-#endif
-#endif
-const struct uniname2ctype_struct *
-uniname2ctype_p (str, len)
- register const char *str;
- register unsigned int len;
-{
- static const struct uniname2ctype_struct wordlist[] =
- {
-#ifndef USE_UNICODE_PROPERTIES
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str6, 12},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str7, 1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str8, 13},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str9, 14},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str10, 3},
-#else /* USE_UNICODE_PROPERTIES */
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2, 37},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3, 17},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str4, 45},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str5, 43},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str6, 21},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str7, 49},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str8, 20},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str9, 44},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str10, 22},
-#endif /* USE_UNICODE_PROPERTIES */
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str11, 8},
-#ifndef USE_UNICODE_PROPERTIES
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str12, 7},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str13, 11},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str14, 10},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str15, 9},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str16, 0},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str17, 6},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str18, 5},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str19, 4},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str20, 2}
-#else /* USE_UNICODE_PROPERTIES */
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str12, 23},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str13, 29},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str14, 28},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str15, 26},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str16, 116},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str17, 120},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str18, 32},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str19, 124},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str20, 130},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str21, 74},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str22, 117},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str23, 118},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str24, 103},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str25, 40},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str26, 24},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str27, 85},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str28, 108},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str29, 97},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str30, 81},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str31, 9},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str32, 6},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str33, 128},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str34, 41},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str35, 19},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str36, 31},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str37, 2},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str38, 12},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str39, 71},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str40, 115},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str41, 80},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str42, 88},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str43, 14},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str44, 47},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str45, 76},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str46, 106},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str47, 64},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str48, 105},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str49, 112},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str50, 61},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str51, 57},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str52, 42},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str53, 16},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str54, 48},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str55, 13},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str56, 73},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str57, 121},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str58, 62},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str59, 54},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str60, 39},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str61, 15},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str62, 25},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str63, 72},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str64, 60},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str65, 10},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str66, 110},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str67, 65},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str68, 5},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str69, 1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str70, 77},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str71, 3},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str72, 101},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str73, 27},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str74, 70},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str75, 7},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str76, 38},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str77, 18},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str78, 46},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str79, 69},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str80, 107},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str81, 55},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str82, 114},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str83, 66},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str84, 104},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str85, 56},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str86, 33},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str87, 30},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str88, 83},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str89, 36},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str90, 79},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str91, 93},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str92, 125},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str93, 82},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str94, 102},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str95, 129},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str96, 67},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str97, 68},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str98, 100},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str99, 75},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str100, 35},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str101, 89},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str102, 91},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str103, 113},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str104, 78},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str105, 96},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str106, 92},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str107, 95},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str108, 98},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str109, 50},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str110, 58},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str111, 127},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str112, 63},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str113, 122},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str114, 99},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str115, 90},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str116, 53},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str117, 0},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str118, 11},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str119, 123},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str120, 94},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str121, 84},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str122, 59},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str123, 51},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str126, 111},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str128, 52},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str129, 119},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str131, 87},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str132, 109},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str142, 126},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str144, 34},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str166, 86},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str167, 4}
-#endif /* USE_UNICODE_PROPERTIES */
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
- {
- register int key = uniname2ctype_hash (str, len);
-
- if (key <= MAX_HASH_VALUE && key >= 0)
- {
- register int o = wordlist[key].name;
- if (o >= 0)
- {
- register const char *s = o + uniname2ctype_pool;
-
- if (*str == *s && !strncmp (str + 1, s + 1, len - 1) && s[len] == '\0')
- return &wordlist[key];
- }
- }
- }
- return 0;
-}
-
-static int
-uniname2ctype(const UChar *name, unsigned int len)
-{
- const struct uniname2ctype_struct *p = uniname2ctype_p((const char *)name, len);
- if (p) return p->ctype;
- return -1;
-}
diff --git a/enc/unicode/name2ctype.kwd b/enc/unicode/name2ctype.kwd
deleted file mode 100644
index 529ef355e4..0000000000
--- a/enc/unicode/name2ctype.kwd
+++ /dev/null
@@ -1,9473 +0,0 @@
-%{
-
-/* 'NEWLINE': [[:NEWLINE:]] */
-static const OnigCodePoint CR_NEWLINE[] = {
- 1,
- 0x000a, 0x000a,
-}; /* CR_NEWLINE */
-
-/* 'Alpha': [[:Alpha:]] */
-static const OnigCodePoint CR_Alpha[] = {
- 452,
- 0x0041, 0x005a,
- 0x0061, 0x007a,
- 0x00aa, 0x00aa,
- 0x00b5, 0x00b5,
- 0x00ba, 0x00ba,
- 0x00c0, 0x00d6,
- 0x00d8, 0x00f6,
- 0x00f8, 0x02c1,
- 0x02c6, 0x02d1,
- 0x02e0, 0x02e4,
- 0x02ec, 0x02ec,
- 0x02ee, 0x02ee,
- 0x0300, 0x0374,
- 0x0376, 0x0377,
- 0x037a, 0x037d,
- 0x0386, 0x0386,
- 0x0388, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03f5,
- 0x03f7, 0x0481,
- 0x0483, 0x0523,
- 0x0531, 0x0556,
- 0x0559, 0x0559,
- 0x0561, 0x0587,
- 0x0591, 0x05bd,
- 0x05bf, 0x05bf,
- 0x05c1, 0x05c2,
- 0x05c4, 0x05c5,
- 0x05c7, 0x05c7,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f2,
- 0x0610, 0x061a,
- 0x0621, 0x065e,
- 0x066e, 0x06d3,
- 0x06d5, 0x06dc,
- 0x06de, 0x06e8,
- 0x06ea, 0x06ef,
- 0x06fa, 0x06fc,
- 0x06ff, 0x06ff,
- 0x0710, 0x074a,
- 0x074d, 0x07b1,
- 0x07ca, 0x07f5,
- 0x07fa, 0x07fa,
- 0x0901, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0954,
- 0x0958, 0x0963,
- 0x0971, 0x0972,
- 0x097b, 0x097f,
- 0x0981, 0x0983,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bc, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09ce,
- 0x09d7, 0x09d7,
- 0x09dc, 0x09dd,
- 0x09df, 0x09e3,
- 0x09f0, 0x09f1,
- 0x0a01, 0x0a03,
- 0x0a05, 0x0a0a,
- 0x0a0f, 0x0a10,
- 0x0a13, 0x0a28,
- 0x0a2a, 0x0a30,
- 0x0a32, 0x0a33,
- 0x0a35, 0x0a36,
- 0x0a38, 0x0a39,
- 0x0a3c, 0x0a3c,
- 0x0a3e, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4d,
- 0x0a51, 0x0a51,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a70, 0x0a75,
- 0x0a81, 0x0a83,
- 0x0a85, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abc, 0x0ac5,
- 0x0ac7, 0x0ac9,
- 0x0acb, 0x0acd,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae3,
- 0x0b01, 0x0b03,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b35, 0x0b39,
- 0x0b3c, 0x0b44,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b63,
- 0x0b71, 0x0b71,
- 0x0b82, 0x0b83,
- 0x0b85, 0x0b8a,
- 0x0b8e, 0x0b90,
- 0x0b92, 0x0b95,
- 0x0b99, 0x0b9a,
- 0x0b9c, 0x0b9c,
- 0x0b9e, 0x0b9f,
- 0x0ba3, 0x0ba4,
- 0x0ba8, 0x0baa,
- 0x0bae, 0x0bb9,
- 0x0bbe, 0x0bc2,
- 0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcd,
- 0x0bd0, 0x0bd0,
- 0x0bd7, 0x0bd7,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3d, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c58, 0x0c59,
- 0x0c60, 0x0c63,
- 0x0c82, 0x0c83,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbc, 0x0cc4,
- 0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccd,
- 0x0cd5, 0x0cd6,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce3,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3d, 0x0d44,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d63,
- 0x0d7a, 0x0d7f,
- 0x0d82, 0x0d83,
- 0x0d85, 0x0d96,
- 0x0d9a, 0x0db1,
- 0x0db3, 0x0dbb,
- 0x0dbd, 0x0dbd,
- 0x0dc0, 0x0dc6,
- 0x0dca, 0x0dca,
- 0x0dcf, 0x0dd4,
- 0x0dd6, 0x0dd6,
- 0x0dd8, 0x0ddf,
- 0x0df2, 0x0df3,
- 0x0e01, 0x0e3a,
- 0x0e40, 0x0e4e,
- 0x0e81, 0x0e82,
- 0x0e84, 0x0e84,
- 0x0e87, 0x0e88,
- 0x0e8a, 0x0e8a,
- 0x0e8d, 0x0e8d,
- 0x0e94, 0x0e97,
- 0x0e99, 0x0e9f,
- 0x0ea1, 0x0ea3,
- 0x0ea5, 0x0ea5,
- 0x0ea7, 0x0ea7,
- 0x0eaa, 0x0eab,
- 0x0ead, 0x0eb9,
- 0x0ebb, 0x0ebd,
- 0x0ec0, 0x0ec4,
- 0x0ec6, 0x0ec6,
- 0x0ec8, 0x0ecd,
- 0x0edc, 0x0edd,
- 0x0f00, 0x0f00,
- 0x0f18, 0x0f19,
- 0x0f35, 0x0f35,
- 0x0f37, 0x0f37,
- 0x0f39, 0x0f39,
- 0x0f3e, 0x0f47,
- 0x0f49, 0x0f6c,
- 0x0f71, 0x0f84,
- 0x0f86, 0x0f8b,
- 0x0f90, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fc6, 0x0fc6,
- 0x1000, 0x103f,
- 0x1050, 0x108f,
- 0x10a0, 0x10c5,
- 0x10d0, 0x10fa,
- 0x10fc, 0x10fc,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x1200, 0x1248,
- 0x124a, 0x124d,
- 0x1250, 0x1256,
- 0x1258, 0x1258,
- 0x125a, 0x125d,
- 0x1260, 0x1288,
- 0x128a, 0x128d,
- 0x1290, 0x12b0,
- 0x12b2, 0x12b5,
- 0x12b8, 0x12be,
- 0x12c0, 0x12c0,
- 0x12c2, 0x12c5,
- 0x12c8, 0x12d6,
- 0x12d8, 0x1310,
- 0x1312, 0x1315,
- 0x1318, 0x135a,
- 0x135f, 0x135f,
- 0x1380, 0x138f,
- 0x13a0, 0x13f4,
- 0x1401, 0x166c,
- 0x166f, 0x1676,
- 0x1681, 0x169a,
- 0x16a0, 0x16ea,
- 0x1700, 0x170c,
- 0x170e, 0x1714,
- 0x1720, 0x1734,
- 0x1740, 0x1753,
- 0x1760, 0x176c,
- 0x176e, 0x1770,
- 0x1772, 0x1773,
- 0x1780, 0x17b3,
- 0x17b6, 0x17d3,
- 0x17d7, 0x17d7,
- 0x17dc, 0x17dd,
- 0x180b, 0x180d,
- 0x1820, 0x1877,
- 0x1880, 0x18aa,
- 0x1900, 0x191c,
- 0x1920, 0x192b,
- 0x1930, 0x193b,
- 0x1950, 0x196d,
- 0x1970, 0x1974,
- 0x1980, 0x19a9,
- 0x19b0, 0x19c9,
- 0x1a00, 0x1a1b,
- 0x1b00, 0x1b4b,
- 0x1b6b, 0x1b73,
- 0x1b80, 0x1baa,
- 0x1bae, 0x1baf,
- 0x1c00, 0x1c37,
- 0x1c4d, 0x1c4f,
- 0x1c5a, 0x1c7d,
- 0x1d00, 0x1de6,
- 0x1dfe, 0x1f15,
- 0x1f18, 0x1f1d,
- 0x1f20, 0x1f45,
- 0x1f48, 0x1f4d,
- 0x1f50, 0x1f57,
- 0x1f59, 0x1f59,
- 0x1f5b, 0x1f5b,
- 0x1f5d, 0x1f5d,
- 0x1f5f, 0x1f7d,
- 0x1f80, 0x1fb4,
- 0x1fb6, 0x1fbc,
- 0x1fbe, 0x1fbe,
- 0x1fc2, 0x1fc4,
- 0x1fc6, 0x1fcc,
- 0x1fd0, 0x1fd3,
- 0x1fd6, 0x1fdb,
- 0x1fe0, 0x1fec,
- 0x1ff2, 0x1ff4,
- 0x1ff6, 0x1ffc,
- 0x2071, 0x2071,
- 0x207f, 0x207f,
- 0x2090, 0x2094,
- 0x20d0, 0x20f0,
- 0x2102, 0x2102,
- 0x2107, 0x2107,
- 0x210a, 0x2113,
- 0x2115, 0x2115,
- 0x2119, 0x211d,
- 0x2124, 0x2124,
- 0x2126, 0x2126,
- 0x2128, 0x2128,
- 0x212a, 0x212d,
- 0x212f, 0x2139,
- 0x213c, 0x213f,
- 0x2145, 0x2149,
- 0x214e, 0x214e,
- 0x2183, 0x2184,
- 0x2c00, 0x2c2e,
- 0x2c30, 0x2c5e,
- 0x2c60, 0x2c6f,
- 0x2c71, 0x2c7d,
- 0x2c80, 0x2ce4,
- 0x2d00, 0x2d25,
- 0x2d30, 0x2d65,
- 0x2d6f, 0x2d6f,
- 0x2d80, 0x2d96,
- 0x2da0, 0x2da6,
- 0x2da8, 0x2dae,
- 0x2db0, 0x2db6,
- 0x2db8, 0x2dbe,
- 0x2dc0, 0x2dc6,
- 0x2dc8, 0x2dce,
- 0x2dd0, 0x2dd6,
- 0x2dd8, 0x2dde,
- 0x2de0, 0x2dff,
- 0x2e2f, 0x2e2f,
- 0x3005, 0x3006,
- 0x302a, 0x302f,
- 0x3031, 0x3035,
- 0x303b, 0x303c,
- 0x3041, 0x3096,
- 0x3099, 0x309a,
- 0x309d, 0x309f,
- 0x30a1, 0x30fa,
- 0x30fc, 0x30ff,
- 0x3105, 0x312d,
- 0x3131, 0x318e,
- 0x31a0, 0x31b7,
- 0x31f0, 0x31ff,
- 0x3400, 0x3400,
- 0x4db5, 0x4db5,
- 0x4e00, 0x4e00,
- 0x9fc3, 0x9fc3,
- 0xa000, 0xa48c,
- 0xa500, 0xa60c,
- 0xa610, 0xa61f,
- 0xa62a, 0xa62b,
- 0xa640, 0xa65f,
- 0xa662, 0xa672,
- 0xa67c, 0xa67d,
- 0xa67f, 0xa697,
- 0xa717, 0xa71f,
- 0xa722, 0xa788,
- 0xa78b, 0xa78c,
- 0xa7fb, 0xa827,
- 0xa840, 0xa873,
- 0xa880, 0xa8c4,
- 0xa90a, 0xa92d,
- 0xa930, 0xa953,
- 0xaa00, 0xaa36,
- 0xaa40, 0xaa4d,
- 0xac00, 0xac00,
- 0xd7a3, 0xd7a3,
- 0xf900, 0xfa2d,
- 0xfa30, 0xfa6a,
- 0xfa70, 0xfad9,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xfb1d, 0xfb28,
- 0xfb2a, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbb1,
- 0xfbd3, 0xfd3d,
- 0xfd50, 0xfd8f,
- 0xfd92, 0xfdc7,
- 0xfdf0, 0xfdfb,
- 0xfe00, 0xfe0f,
- 0xfe20, 0xfe26,
- 0xfe70, 0xfe74,
- 0xfe76, 0xfefc,
- 0xff21, 0xff3a,
- 0xff41, 0xff5a,
- 0xff66, 0xffbe,
- 0xffc2, 0xffc7,
- 0xffca, 0xffcf,
- 0xffd2, 0xffd7,
- 0xffda, 0xffdc,
- 0x10000, 0x1000b,
- 0x1000d, 0x10026,
- 0x10028, 0x1003a,
- 0x1003c, 0x1003d,
- 0x1003f, 0x1004d,
- 0x10050, 0x1005d,
- 0x10080, 0x100fa,
- 0x101fd, 0x101fd,
- 0x10280, 0x1029c,
- 0x102a0, 0x102d0,
- 0x10300, 0x1031e,
- 0x10330, 0x10340,
- 0x10342, 0x10349,
- 0x10380, 0x1039d,
- 0x103a0, 0x103c3,
- 0x103c8, 0x103cf,
- 0x10400, 0x1049d,
- 0x10800, 0x10805,
- 0x10808, 0x10808,
- 0x1080a, 0x10835,
- 0x10837, 0x10838,
- 0x1083c, 0x1083c,
- 0x1083f, 0x1083f,
- 0x10900, 0x10915,
- 0x10920, 0x10939,
- 0x10a00, 0x10a03,
- 0x10a05, 0x10a06,
- 0x10a0c, 0x10a13,
- 0x10a15, 0x10a17,
- 0x10a19, 0x10a33,
- 0x10a38, 0x10a3a,
- 0x10a3f, 0x10a3f,
- 0x12000, 0x1236e,
- 0x1d165, 0x1d169,
- 0x1d16d, 0x1d172,
- 0x1d17b, 0x1d182,
- 0x1d185, 0x1d18b,
- 0x1d1aa, 0x1d1ad,
- 0x1d242, 0x1d244,
- 0x1d400, 0x1d454,
- 0x1d456, 0x1d49c,
- 0x1d49e, 0x1d49f,
- 0x1d4a2, 0x1d4a2,
- 0x1d4a5, 0x1d4a6,
- 0x1d4a9, 0x1d4ac,
- 0x1d4ae, 0x1d4b9,
- 0x1d4bb, 0x1d4bb,
- 0x1d4bd, 0x1d4c3,
- 0x1d4c5, 0x1d505,
- 0x1d507, 0x1d50a,
- 0x1d50d, 0x1d514,
- 0x1d516, 0x1d51c,
- 0x1d51e, 0x1d539,
- 0x1d53b, 0x1d53e,
- 0x1d540, 0x1d544,
- 0x1d546, 0x1d546,
- 0x1d54a, 0x1d550,
- 0x1d552, 0x1d6a5,
- 0x1d6a8, 0x1d6c0,
- 0x1d6c2, 0x1d6da,
- 0x1d6dc, 0x1d6fa,
- 0x1d6fc, 0x1d714,
- 0x1d716, 0x1d734,
- 0x1d736, 0x1d74e,
- 0x1d750, 0x1d76e,
- 0x1d770, 0x1d788,
- 0x1d78a, 0x1d7a8,
- 0x1d7aa, 0x1d7c2,
- 0x1d7c4, 0x1d7cb,
- 0x20000, 0x20000,
- 0x2a6d6, 0x2a6d6,
- 0x2f800, 0x2fa1d,
- 0xe0100, 0xe01ef,
-}; /* CR_Alpha */
-
-/* 'Blank': [[:Blank:]] */
-static const OnigCodePoint CR_Blank[] = {
- 9,
- 0x0009, 0x0009,
- 0x0020, 0x0020,
- 0x00a0, 0x00a0,
- 0x1680, 0x1680,
- 0x180e, 0x180e,
- 0x2000, 0x200a,
- 0x202f, 0x202f,
- 0x205f, 0x205f,
- 0x3000, 0x3000,
-}; /* CR_Blank */
-
-/* 'Cntrl': [[:Cntrl:]] */
-static const OnigCodePoint CR_Cntrl[] = {
- 2,
- 0x0000, 0x001f,
- 0x007f, 0x009f,
-}; /* CR_Cntrl */
-
-/* 'Digit': [[:Digit:]] */
-static const OnigCodePoint CR_Digit[] = {
- 33,
- 0x0030, 0x0039,
- 0x0660, 0x0669,
- 0x06f0, 0x06f9,
- 0x07c0, 0x07c9,
- 0x0966, 0x096f,
- 0x09e6, 0x09ef,
- 0x0a66, 0x0a6f,
- 0x0ae6, 0x0aef,
- 0x0b66, 0x0b6f,
- 0x0be6, 0x0bef,
- 0x0c66, 0x0c6f,
- 0x0ce6, 0x0cef,
- 0x0d66, 0x0d6f,
- 0x0e50, 0x0e59,
- 0x0ed0, 0x0ed9,
- 0x0f20, 0x0f29,
- 0x1040, 0x1049,
- 0x1090, 0x1099,
- 0x17e0, 0x17e9,
- 0x1810, 0x1819,
- 0x1946, 0x194f,
- 0x19d0, 0x19d9,
- 0x1b50, 0x1b59,
- 0x1bb0, 0x1bb9,
- 0x1c40, 0x1c49,
- 0x1c50, 0x1c59,
- 0xa620, 0xa629,
- 0xa8d0, 0xa8d9,
- 0xa900, 0xa909,
- 0xaa50, 0xaa59,
- 0xff10, 0xff19,
- 0x104a0, 0x104a9,
- 0x1d7ce, 0x1d7ff,
-}; /* CR_Digit */
-
-/* 'Graph': [[:Graph:]] */
-static const OnigCodePoint CR_Graph[] = {
- 449,
- 0x0021, 0x007e,
- 0x00a1, 0x00ac,
- 0x00ae, 0x0377,
- 0x037a, 0x037e,
- 0x0384, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x0523,
- 0x0531, 0x0556,
- 0x0559, 0x055f,
- 0x0561, 0x0587,
- 0x0589, 0x058a,
- 0x0591, 0x05c7,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0x0606, 0x061b,
- 0x061e, 0x061f,
- 0x0621, 0x065e,
- 0x0660, 0x06dc,
- 0x06de, 0x070d,
- 0x0710, 0x074a,
- 0x074d, 0x07b1,
- 0x07c0, 0x07fa,
- 0x0901, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0954,
- 0x0958, 0x0972,
- 0x097b, 0x097f,
- 0x0981, 0x0983,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bc, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09ce,
- 0x09d7, 0x09d7,
- 0x09dc, 0x09dd,
- 0x09df, 0x09e3,
- 0x09e6, 0x09fa,
- 0x0a01, 0x0a03,
- 0x0a05, 0x0a0a,
- 0x0a0f, 0x0a10,
- 0x0a13, 0x0a28,
- 0x0a2a, 0x0a30,
- 0x0a32, 0x0a33,
- 0x0a35, 0x0a36,
- 0x0a38, 0x0a39,
- 0x0a3c, 0x0a3c,
- 0x0a3e, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4d,
- 0x0a51, 0x0a51,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a66, 0x0a75,
- 0x0a81, 0x0a83,
- 0x0a85, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abc, 0x0ac5,
- 0x0ac7, 0x0ac9,
- 0x0acb, 0x0acd,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae3,
- 0x0ae6, 0x0aef,
- 0x0af1, 0x0af1,
- 0x0b01, 0x0b03,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b35, 0x0b39,
- 0x0b3c, 0x0b44,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b63,
- 0x0b66, 0x0b71,
- 0x0b82, 0x0b83,
- 0x0b85, 0x0b8a,
- 0x0b8e, 0x0b90,
- 0x0b92, 0x0b95,
- 0x0b99, 0x0b9a,
- 0x0b9c, 0x0b9c,
- 0x0b9e, 0x0b9f,
- 0x0ba3, 0x0ba4,
- 0x0ba8, 0x0baa,
- 0x0bae, 0x0bb9,
- 0x0bbe, 0x0bc2,
- 0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcd,
- 0x0bd0, 0x0bd0,
- 0x0bd7, 0x0bd7,
- 0x0be6, 0x0bfa,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3d, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c58, 0x0c59,
- 0x0c60, 0x0c63,
- 0x0c66, 0x0c6f,
- 0x0c78, 0x0c7f,
- 0x0c82, 0x0c83,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbc, 0x0cc4,
- 0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccd,
- 0x0cd5, 0x0cd6,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce3,
- 0x0ce6, 0x0cef,
- 0x0cf1, 0x0cf2,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3d, 0x0d44,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d63,
- 0x0d66, 0x0d75,
- 0x0d79, 0x0d7f,
- 0x0d82, 0x0d83,
- 0x0d85, 0x0d96,
- 0x0d9a, 0x0db1,
- 0x0db3, 0x0dbb,
- 0x0dbd, 0x0dbd,
- 0x0dc0, 0x0dc6,
- 0x0dca, 0x0dca,
- 0x0dcf, 0x0dd4,
- 0x0dd6, 0x0dd6,
- 0x0dd8, 0x0ddf,
- 0x0df2, 0x0df4,
- 0x0e01, 0x0e3a,
- 0x0e3f, 0x0e5b,
- 0x0e81, 0x0e82,
- 0x0e84, 0x0e84,
- 0x0e87, 0x0e88,
- 0x0e8a, 0x0e8a,
- 0x0e8d, 0x0e8d,
- 0x0e94, 0x0e97,
- 0x0e99, 0x0e9f,
- 0x0ea1, 0x0ea3,
- 0x0ea5, 0x0ea5,
- 0x0ea7, 0x0ea7,
- 0x0eaa, 0x0eab,
- 0x0ead, 0x0eb9,
- 0x0ebb, 0x0ebd,
- 0x0ec0, 0x0ec4,
- 0x0ec6, 0x0ec6,
- 0x0ec8, 0x0ecd,
- 0x0ed0, 0x0ed9,
- 0x0edc, 0x0edd,
- 0x0f00, 0x0f47,
- 0x0f49, 0x0f6c,
- 0x0f71, 0x0f8b,
- 0x0f90, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fbe, 0x0fcc,
- 0x0fce, 0x0fd4,
- 0x1000, 0x1099,
- 0x109e, 0x10c5,
- 0x10d0, 0x10fc,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x1200, 0x1248,
- 0x124a, 0x124d,
- 0x1250, 0x1256,
- 0x1258, 0x1258,
- 0x125a, 0x125d,
- 0x1260, 0x1288,
- 0x128a, 0x128d,
- 0x1290, 0x12b0,
- 0x12b2, 0x12b5,
- 0x12b8, 0x12be,
- 0x12c0, 0x12c0,
- 0x12c2, 0x12c5,
- 0x12c8, 0x12d6,
- 0x12d8, 0x1310,
- 0x1312, 0x1315,
- 0x1318, 0x135a,
- 0x135f, 0x137c,
- 0x1380, 0x1399,
- 0x13a0, 0x13f4,
- 0x1401, 0x1676,
- 0x1681, 0x169c,
- 0x16a0, 0x16f0,
- 0x1700, 0x170c,
- 0x170e, 0x1714,
- 0x1720, 0x1736,
- 0x1740, 0x1753,
- 0x1760, 0x176c,
- 0x176e, 0x1770,
- 0x1772, 0x1773,
- 0x1780, 0x17b3,
- 0x17b6, 0x17dd,
- 0x17e0, 0x17e9,
- 0x17f0, 0x17f9,
- 0x1800, 0x180d,
- 0x1810, 0x1819,
- 0x1820, 0x1877,
- 0x1880, 0x18aa,
- 0x1900, 0x191c,
- 0x1920, 0x192b,
- 0x1930, 0x193b,
- 0x1940, 0x1940,
- 0x1944, 0x196d,
- 0x1970, 0x1974,
- 0x1980, 0x19a9,
- 0x19b0, 0x19c9,
- 0x19d0, 0x19d9,
- 0x19de, 0x1a1b,
- 0x1a1e, 0x1a1f,
- 0x1b00, 0x1b4b,
- 0x1b50, 0x1b7c,
- 0x1b80, 0x1baa,
- 0x1bae, 0x1bb9,
- 0x1c00, 0x1c37,
- 0x1c3b, 0x1c49,
- 0x1c4d, 0x1c7f,
- 0x1d00, 0x1de6,
- 0x1dfe, 0x1f15,
- 0x1f18, 0x1f1d,
- 0x1f20, 0x1f45,
- 0x1f48, 0x1f4d,
- 0x1f50, 0x1f57,
- 0x1f59, 0x1f59,
- 0x1f5b, 0x1f5b,
- 0x1f5d, 0x1f5d,
- 0x1f5f, 0x1f7d,
- 0x1f80, 0x1fb4,
- 0x1fb6, 0x1fc4,
- 0x1fc6, 0x1fd3,
- 0x1fd6, 0x1fdb,
- 0x1fdd, 0x1fef,
- 0x1ff2, 0x1ff4,
- 0x1ff6, 0x1ffe,
- 0x2010, 0x2027,
- 0x2030, 0x205e,
- 0x2070, 0x2071,
- 0x2074, 0x208e,
- 0x2090, 0x2094,
- 0x20a0, 0x20b5,
- 0x20d0, 0x20f0,
- 0x2100, 0x214f,
- 0x2153, 0x2188,
- 0x2190, 0x23e7,
- 0x2400, 0x2426,
- 0x2440, 0x244a,
- 0x2460, 0x269d,
- 0x26a0, 0x26bc,
- 0x26c0, 0x26c3,
- 0x2701, 0x2704,
- 0x2706, 0x2709,
- 0x270c, 0x2727,
- 0x2729, 0x274b,
- 0x274d, 0x274d,
- 0x274f, 0x2752,
- 0x2756, 0x2756,
- 0x2758, 0x275e,
- 0x2761, 0x2794,
- 0x2798, 0x27af,
- 0x27b1, 0x27be,
- 0x27c0, 0x27ca,
- 0x27cc, 0x27cc,
- 0x27d0, 0x2b4c,
- 0x2b50, 0x2b54,
- 0x2c00, 0x2c2e,
- 0x2c30, 0x2c5e,
- 0x2c60, 0x2c6f,
- 0x2c71, 0x2c7d,
- 0x2c80, 0x2cea,
- 0x2cf9, 0x2d25,
- 0x2d30, 0x2d65,
- 0x2d6f, 0x2d6f,
- 0x2d80, 0x2d96,
- 0x2da0, 0x2da6,
- 0x2da8, 0x2dae,
- 0x2db0, 0x2db6,
- 0x2db8, 0x2dbe,
- 0x2dc0, 0x2dc6,
- 0x2dc8, 0x2dce,
- 0x2dd0, 0x2dd6,
- 0x2dd8, 0x2dde,
- 0x2de0, 0x2e30,
- 0x2e80, 0x2e99,
- 0x2e9b, 0x2ef3,
- 0x2f00, 0x2fd5,
- 0x2ff0, 0x2ffb,
- 0x3001, 0x303f,
- 0x3041, 0x3096,
- 0x3099, 0x30ff,
- 0x3105, 0x312d,
- 0x3131, 0x318e,
- 0x3190, 0x31b7,
- 0x31c0, 0x31e3,
- 0x31f0, 0x321e,
- 0x3220, 0x3243,
- 0x3250, 0x32fe,
- 0x3300, 0x3400,
- 0x4db5, 0x4db5,
- 0x4dc0, 0x4e00,
- 0x9fc3, 0x9fc3,
- 0xa000, 0xa48c,
- 0xa490, 0xa4c6,
- 0xa500, 0xa62b,
- 0xa640, 0xa65f,
- 0xa662, 0xa673,
- 0xa67c, 0xa697,
- 0xa700, 0xa78c,
- 0xa7fb, 0xa82b,
- 0xa840, 0xa877,
- 0xa880, 0xa8c4,
- 0xa8ce, 0xa8d9,
- 0xa900, 0xa953,
- 0xa95f, 0xa95f,
- 0xaa00, 0xaa36,
- 0xaa40, 0xaa4d,
- 0xaa50, 0xaa59,
- 0xaa5c, 0xaa5f,
- 0xac00, 0xac00,
- 0xd7a3, 0xd7a3,
- 0xf900, 0xfa2d,
- 0xfa30, 0xfa6a,
- 0xfa70, 0xfad9,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xfb1d, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbb1,
- 0xfbd3, 0xfd3f,
- 0xfd50, 0xfd8f,
- 0xfd92, 0xfdc7,
- 0xfdf0, 0xfdfd,
- 0xfe00, 0xfe19,
- 0xfe20, 0xfe26,
- 0xfe30, 0xfe52,
- 0xfe54, 0xfe66,
- 0xfe68, 0xfe6b,
- 0xfe70, 0xfe74,
- 0xfe76, 0xfefc,
- 0xff01, 0xffbe,
- 0xffc2, 0xffc7,
- 0xffca, 0xffcf,
- 0xffd2, 0xffd7,
- 0xffda, 0xffdc,
- 0xffe0, 0xffe6,
- 0xffe8, 0xffee,
- 0xfffc, 0xfffd,
- 0x10000, 0x1000b,
- 0x1000d, 0x10026,
- 0x10028, 0x1003a,
- 0x1003c, 0x1003d,
- 0x1003f, 0x1004d,
- 0x10050, 0x1005d,
- 0x10080, 0x100fa,
- 0x10100, 0x10102,
- 0x10107, 0x10133,
- 0x10137, 0x1018a,
- 0x10190, 0x1019b,
- 0x101d0, 0x101fd,
- 0x10280, 0x1029c,
- 0x102a0, 0x102d0,
- 0x10300, 0x1031e,
- 0x10320, 0x10323,
- 0x10330, 0x1034a,
- 0x10380, 0x1039d,
- 0x1039f, 0x103c3,
- 0x103c8, 0x103d5,
- 0x10400, 0x1049d,
- 0x104a0, 0x104a9,
- 0x10800, 0x10805,
- 0x10808, 0x10808,
- 0x1080a, 0x10835,
- 0x10837, 0x10838,
- 0x1083c, 0x1083c,
- 0x1083f, 0x1083f,
- 0x10900, 0x10919,
- 0x1091f, 0x10939,
- 0x1093f, 0x1093f,
- 0x10a00, 0x10a03,
- 0x10a05, 0x10a06,
- 0x10a0c, 0x10a13,
- 0x10a15, 0x10a17,
- 0x10a19, 0x10a33,
- 0x10a38, 0x10a3a,
- 0x10a3f, 0x10a47,
- 0x10a50, 0x10a58,
- 0x12000, 0x1236e,
- 0x12400, 0x12462,
- 0x12470, 0x12473,
- 0x1d000, 0x1d0f5,
- 0x1d100, 0x1d126,
- 0x1d129, 0x1d172,
- 0x1d17b, 0x1d1dd,
- 0x1d200, 0x1d245,
- 0x1d300, 0x1d356,
- 0x1d360, 0x1d371,
- 0x1d400, 0x1d454,
- 0x1d456, 0x1d49c,
- 0x1d49e, 0x1d49f,
- 0x1d4a2, 0x1d4a2,
- 0x1d4a5, 0x1d4a6,
- 0x1d4a9, 0x1d4ac,
- 0x1d4ae, 0x1d4b9,
- 0x1d4bb, 0x1d4bb,
- 0x1d4bd, 0x1d4c3,
- 0x1d4c5, 0x1d505,
- 0x1d507, 0x1d50a,
- 0x1d50d, 0x1d514,
- 0x1d516, 0x1d51c,
- 0x1d51e, 0x1d539,
- 0x1d53b, 0x1d53e,
- 0x1d540, 0x1d544,
- 0x1d546, 0x1d546,
- 0x1d54a, 0x1d550,
- 0x1d552, 0x1d6a5,
- 0x1d6a8, 0x1d7cb,
- 0x1d7ce, 0x1d7ff,
- 0x1f000, 0x1f02b,
- 0x1f030, 0x1f093,
- 0x20000, 0x20000,
- 0x2a6d6, 0x2a6d6,
- 0x2f800, 0x2fa1d,
- 0xe0100, 0xe01ef,
-}; /* CR_Graph */
-
-/* 'Lower': [[:Lower:]] */
-static const OnigCodePoint CR_Lower[] = {
- 598,
- 0x0061, 0x007a,
- 0x00aa, 0x00aa,
- 0x00b5, 0x00b5,
- 0x00ba, 0x00ba,
- 0x00df, 0x00f6,
- 0x00f8, 0x00ff,
- 0x0101, 0x0101,
- 0x0103, 0x0103,
- 0x0105, 0x0105,
- 0x0107, 0x0107,
- 0x0109, 0x0109,
- 0x010b, 0x010b,
- 0x010d, 0x010d,
- 0x010f, 0x010f,
- 0x0111, 0x0111,
- 0x0113, 0x0113,
- 0x0115, 0x0115,
- 0x0117, 0x0117,
- 0x0119, 0x0119,
- 0x011b, 0x011b,
- 0x011d, 0x011d,
- 0x011f, 0x011f,
- 0x0121, 0x0121,
- 0x0123, 0x0123,
- 0x0125, 0x0125,
- 0x0127, 0x0127,
- 0x0129, 0x0129,
- 0x012b, 0x012b,
- 0x012d, 0x012d,
- 0x012f, 0x012f,
- 0x0131, 0x0131,
- 0x0133, 0x0133,
- 0x0135, 0x0135,
- 0x0137, 0x0138,
- 0x013a, 0x013a,
- 0x013c, 0x013c,
- 0x013e, 0x013e,
- 0x0140, 0x0140,
- 0x0142, 0x0142,
- 0x0144, 0x0144,
- 0x0146, 0x0146,
- 0x0148, 0x0149,
- 0x014b, 0x014b,
- 0x014d, 0x014d,
- 0x014f, 0x014f,
- 0x0151, 0x0151,
- 0x0153, 0x0153,
- 0x0155, 0x0155,
- 0x0157, 0x0157,
- 0x0159, 0x0159,
- 0x015b, 0x015b,
- 0x015d, 0x015d,
- 0x015f, 0x015f,
- 0x0161, 0x0161,
- 0x0163, 0x0163,
- 0x0165, 0x0165,
- 0x0167, 0x0167,
- 0x0169, 0x0169,
- 0x016b, 0x016b,
- 0x016d, 0x016d,
- 0x016f, 0x016f,
- 0x0171, 0x0171,
- 0x0173, 0x0173,
- 0x0175, 0x0175,
- 0x0177, 0x0177,
- 0x017a, 0x017a,
- 0x017c, 0x017c,
- 0x017e, 0x0180,
- 0x0183, 0x0183,
- 0x0185, 0x0185,
- 0x0188, 0x0188,
- 0x018c, 0x018d,
- 0x0192, 0x0192,
- 0x0195, 0x0195,
- 0x0199, 0x019b,
- 0x019e, 0x019e,
- 0x01a1, 0x01a1,
- 0x01a3, 0x01a3,
- 0x01a5, 0x01a5,
- 0x01a8, 0x01a8,
- 0x01aa, 0x01ab,
- 0x01ad, 0x01ad,
- 0x01b0, 0x01b0,
- 0x01b4, 0x01b4,
- 0x01b6, 0x01b6,
- 0x01b9, 0x01ba,
- 0x01bd, 0x01bf,
- 0x01c6, 0x01c6,
- 0x01c9, 0x01c9,
- 0x01cc, 0x01cc,
- 0x01ce, 0x01ce,
- 0x01d0, 0x01d0,
- 0x01d2, 0x01d2,
- 0x01d4, 0x01d4,
- 0x01d6, 0x01d6,
- 0x01d8, 0x01d8,
- 0x01da, 0x01da,
- 0x01dc, 0x01dd,
- 0x01df, 0x01df,
- 0x01e1, 0x01e1,
- 0x01e3, 0x01e3,
- 0x01e5, 0x01e5,
- 0x01e7, 0x01e7,
- 0x01e9, 0x01e9,
- 0x01eb, 0x01eb,
- 0x01ed, 0x01ed,
- 0x01ef, 0x01f0,
- 0x01f3, 0x01f3,
- 0x01f5, 0x01f5,
- 0x01f9, 0x01f9,
- 0x01fb, 0x01fb,
- 0x01fd, 0x01fd,
- 0x01ff, 0x01ff,
- 0x0201, 0x0201,
- 0x0203, 0x0203,
- 0x0205, 0x0205,
- 0x0207, 0x0207,
- 0x0209, 0x0209,
- 0x020b, 0x020b,
- 0x020d, 0x020d,
- 0x020f, 0x020f,
- 0x0211, 0x0211,
- 0x0213, 0x0213,
- 0x0215, 0x0215,
- 0x0217, 0x0217,
- 0x0219, 0x0219,
- 0x021b, 0x021b,
- 0x021d, 0x021d,
- 0x021f, 0x021f,
- 0x0221, 0x0221,
- 0x0223, 0x0223,
- 0x0225, 0x0225,
- 0x0227, 0x0227,
- 0x0229, 0x0229,
- 0x022b, 0x022b,
- 0x022d, 0x022d,
- 0x022f, 0x022f,
- 0x0231, 0x0231,
- 0x0233, 0x0239,
- 0x023c, 0x023c,
- 0x023f, 0x0240,
- 0x0242, 0x0242,
- 0x0247, 0x0247,
- 0x0249, 0x0249,
- 0x024b, 0x024b,
- 0x024d, 0x024d,
- 0x024f, 0x0293,
- 0x0295, 0x02af,
- 0x0371, 0x0371,
- 0x0373, 0x0373,
- 0x0377, 0x0377,
- 0x037b, 0x037d,
- 0x0390, 0x0390,
- 0x03ac, 0x03ce,
- 0x03d0, 0x03d1,
- 0x03d5, 0x03d7,
- 0x03d9, 0x03d9,
- 0x03db, 0x03db,
- 0x03dd, 0x03dd,
- 0x03df, 0x03df,
- 0x03e1, 0x03e1,
- 0x03e3, 0x03e3,
- 0x03e5, 0x03e5,
- 0x03e7, 0x03e7,
- 0x03e9, 0x03e9,
- 0x03eb, 0x03eb,
- 0x03ed, 0x03ed,
- 0x03ef, 0x03f3,
- 0x03f5, 0x03f5,
- 0x03f8, 0x03f8,
- 0x03fb, 0x03fc,
- 0x0430, 0x045f,
- 0x0461, 0x0461,
- 0x0463, 0x0463,
- 0x0465, 0x0465,
- 0x0467, 0x0467,
- 0x0469, 0x0469,
- 0x046b, 0x046b,
- 0x046d, 0x046d,
- 0x046f, 0x046f,
- 0x0471, 0x0471,
- 0x0473, 0x0473,
- 0x0475, 0x0475,
- 0x0477, 0x0477,
- 0x0479, 0x0479,
- 0x047b, 0x047b,
- 0x047d, 0x047d,
- 0x047f, 0x047f,
- 0x0481, 0x0481,
- 0x048b, 0x048b,
- 0x048d, 0x048d,
- 0x048f, 0x048f,
- 0x0491, 0x0491,
- 0x0493, 0x0493,
- 0x0495, 0x0495,
- 0x0497, 0x0497,
- 0x0499, 0x0499,
- 0x049b, 0x049b,
- 0x049d, 0x049d,
- 0x049f, 0x049f,
- 0x04a1, 0x04a1,
- 0x04a3, 0x04a3,
- 0x04a5, 0x04a5,
- 0x04a7, 0x04a7,
- 0x04a9, 0x04a9,
- 0x04ab, 0x04ab,
- 0x04ad, 0x04ad,
- 0x04af, 0x04af,
- 0x04b1, 0x04b1,
- 0x04b3, 0x04b3,
- 0x04b5, 0x04b5,
- 0x04b7, 0x04b7,
- 0x04b9, 0x04b9,
- 0x04bb, 0x04bb,
- 0x04bd, 0x04bd,
- 0x04bf, 0x04bf,
- 0x04c2, 0x04c2,
- 0x04c4, 0x04c4,
- 0x04c6, 0x04c6,
- 0x04c8, 0x04c8,
- 0x04ca, 0x04ca,
- 0x04cc, 0x04cc,
- 0x04ce, 0x04cf,
- 0x04d1, 0x04d1,
- 0x04d3, 0x04d3,
- 0x04d5, 0x04d5,
- 0x04d7, 0x04d7,
- 0x04d9, 0x04d9,
- 0x04db, 0x04db,
- 0x04dd, 0x04dd,
- 0x04df, 0x04df,
- 0x04e1, 0x04e1,
- 0x04e3, 0x04e3,
- 0x04e5, 0x04e5,
- 0x04e7, 0x04e7,
- 0x04e9, 0x04e9,
- 0x04eb, 0x04eb,
- 0x04ed, 0x04ed,
- 0x04ef, 0x04ef,
- 0x04f1, 0x04f1,
- 0x04f3, 0x04f3,
- 0x04f5, 0x04f5,
- 0x04f7, 0x04f7,
- 0x04f9, 0x04f9,
- 0x04fb, 0x04fb,
- 0x04fd, 0x04fd,
- 0x04ff, 0x04ff,
- 0x0501, 0x0501,
- 0x0503, 0x0503,
- 0x0505, 0x0505,
- 0x0507, 0x0507,
- 0x0509, 0x0509,
- 0x050b, 0x050b,
- 0x050d, 0x050d,
- 0x050f, 0x050f,
- 0x0511, 0x0511,
- 0x0513, 0x0513,
- 0x0515, 0x0515,
- 0x0517, 0x0517,
- 0x0519, 0x0519,
- 0x051b, 0x051b,
- 0x051d, 0x051d,
- 0x051f, 0x051f,
- 0x0521, 0x0521,
- 0x0523, 0x0523,
- 0x0561, 0x0587,
- 0x1d00, 0x1d2b,
- 0x1d62, 0x1d77,
- 0x1d79, 0x1d9a,
- 0x1e01, 0x1e01,
- 0x1e03, 0x1e03,
- 0x1e05, 0x1e05,
- 0x1e07, 0x1e07,
- 0x1e09, 0x1e09,
- 0x1e0b, 0x1e0b,
- 0x1e0d, 0x1e0d,
- 0x1e0f, 0x1e0f,
- 0x1e11, 0x1e11,
- 0x1e13, 0x1e13,
- 0x1e15, 0x1e15,
- 0x1e17, 0x1e17,
- 0x1e19, 0x1e19,
- 0x1e1b, 0x1e1b,
- 0x1e1d, 0x1e1d,
- 0x1e1f, 0x1e1f,
- 0x1e21, 0x1e21,
- 0x1e23, 0x1e23,
- 0x1e25, 0x1e25,
- 0x1e27, 0x1e27,
- 0x1e29, 0x1e29,
- 0x1e2b, 0x1e2b,
- 0x1e2d, 0x1e2d,
- 0x1e2f, 0x1e2f,
- 0x1e31, 0x1e31,
- 0x1e33, 0x1e33,
- 0x1e35, 0x1e35,
- 0x1e37, 0x1e37,
- 0x1e39, 0x1e39,
- 0x1e3b, 0x1e3b,
- 0x1e3d, 0x1e3d,
- 0x1e3f, 0x1e3f,
- 0x1e41, 0x1e41,
- 0x1e43, 0x1e43,
- 0x1e45, 0x1e45,
- 0x1e47, 0x1e47,
- 0x1e49, 0x1e49,
- 0x1e4b, 0x1e4b,
- 0x1e4d, 0x1e4d,
- 0x1e4f, 0x1e4f,
- 0x1e51, 0x1e51,
- 0x1e53, 0x1e53,
- 0x1e55, 0x1e55,
- 0x1e57, 0x1e57,
- 0x1e59, 0x1e59,
- 0x1e5b, 0x1e5b,
- 0x1e5d, 0x1e5d,
- 0x1e5f, 0x1e5f,
- 0x1e61, 0x1e61,
- 0x1e63, 0x1e63,
- 0x1e65, 0x1e65,
- 0x1e67, 0x1e67,
- 0x1e69, 0x1e69,
- 0x1e6b, 0x1e6b,
- 0x1e6d, 0x1e6d,
- 0x1e6f, 0x1e6f,
- 0x1e71, 0x1e71,
- 0x1e73, 0x1e73,
- 0x1e75, 0x1e75,
- 0x1e77, 0x1e77,
- 0x1e79, 0x1e79,
- 0x1e7b, 0x1e7b,
- 0x1e7d, 0x1e7d,
- 0x1e7f, 0x1e7f,
- 0x1e81, 0x1e81,
- 0x1e83, 0x1e83,
- 0x1e85, 0x1e85,
- 0x1e87, 0x1e87,
- 0x1e89, 0x1e89,
- 0x1e8b, 0x1e8b,
- 0x1e8d, 0x1e8d,
- 0x1e8f, 0x1e8f,
- 0x1e91, 0x1e91,
- 0x1e93, 0x1e93,
- 0x1e95, 0x1e9d,
- 0x1e9f, 0x1e9f,
- 0x1ea1, 0x1ea1,
- 0x1ea3, 0x1ea3,
- 0x1ea5, 0x1ea5,
- 0x1ea7, 0x1ea7,
- 0x1ea9, 0x1ea9,
- 0x1eab, 0x1eab,
- 0x1ead, 0x1ead,
- 0x1eaf, 0x1eaf,
- 0x1eb1, 0x1eb1,
- 0x1eb3, 0x1eb3,
- 0x1eb5, 0x1eb5,
- 0x1eb7, 0x1eb7,
- 0x1eb9, 0x1eb9,
- 0x1ebb, 0x1ebb,
- 0x1ebd, 0x1ebd,
- 0x1ebf, 0x1ebf,
- 0x1ec1, 0x1ec1,
- 0x1ec3, 0x1ec3,
- 0x1ec5, 0x1ec5,
- 0x1ec7, 0x1ec7,
- 0x1ec9, 0x1ec9,
- 0x1ecb, 0x1ecb,
- 0x1ecd, 0x1ecd,
- 0x1ecf, 0x1ecf,
- 0x1ed1, 0x1ed1,
- 0x1ed3, 0x1ed3,
- 0x1ed5, 0x1ed5,
- 0x1ed7, 0x1ed7,
- 0x1ed9, 0x1ed9,
- 0x1edb, 0x1edb,
- 0x1edd, 0x1edd,
- 0x1edf, 0x1edf,
- 0x1ee1, 0x1ee1,
- 0x1ee3, 0x1ee3,
- 0x1ee5, 0x1ee5,
- 0x1ee7, 0x1ee7,
- 0x1ee9, 0x1ee9,
- 0x1eeb, 0x1eeb,
- 0x1eed, 0x1eed,
- 0x1eef, 0x1eef,
- 0x1ef1, 0x1ef1,
- 0x1ef3, 0x1ef3,
- 0x1ef5, 0x1ef5,
- 0x1ef7, 0x1ef7,
- 0x1ef9, 0x1ef9,
- 0x1efb, 0x1efb,
- 0x1efd, 0x1efd,
- 0x1eff, 0x1f07,
- 0x1f10, 0x1f15,
- 0x1f20, 0x1f27,
- 0x1f30, 0x1f37,
- 0x1f40, 0x1f45,
- 0x1f50, 0x1f57,
- 0x1f60, 0x1f67,
- 0x1f70, 0x1f7d,
- 0x1f80, 0x1f87,
- 0x1f90, 0x1f97,
- 0x1fa0, 0x1fa7,
- 0x1fb0, 0x1fb4,
- 0x1fb6, 0x1fb7,
- 0x1fbe, 0x1fbe,
- 0x1fc2, 0x1fc4,
- 0x1fc6, 0x1fc7,
- 0x1fd0, 0x1fd3,
- 0x1fd6, 0x1fd7,
- 0x1fe0, 0x1fe7,
- 0x1ff2, 0x1ff4,
- 0x1ff6, 0x1ff7,
- 0x2071, 0x2071,
- 0x207f, 0x207f,
- 0x210a, 0x210a,
- 0x210e, 0x210f,
- 0x2113, 0x2113,
- 0x212f, 0x212f,
- 0x2134, 0x2134,
- 0x2139, 0x2139,
- 0x213c, 0x213d,
- 0x2146, 0x2149,
- 0x214e, 0x214e,
- 0x2184, 0x2184,
- 0x2c30, 0x2c5e,
- 0x2c61, 0x2c61,
- 0x2c65, 0x2c66,
- 0x2c68, 0x2c68,
- 0x2c6a, 0x2c6a,
- 0x2c6c, 0x2c6c,
- 0x2c71, 0x2c71,
- 0x2c73, 0x2c74,
- 0x2c76, 0x2c7c,
- 0x2c81, 0x2c81,
- 0x2c83, 0x2c83,
- 0x2c85, 0x2c85,
- 0x2c87, 0x2c87,
- 0x2c89, 0x2c89,
- 0x2c8b, 0x2c8b,
- 0x2c8d, 0x2c8d,
- 0x2c8f, 0x2c8f,
- 0x2c91, 0x2c91,
- 0x2c93, 0x2c93,
- 0x2c95, 0x2c95,
- 0x2c97, 0x2c97,
- 0x2c99, 0x2c99,
- 0x2c9b, 0x2c9b,
- 0x2c9d, 0x2c9d,
- 0x2c9f, 0x2c9f,
- 0x2ca1, 0x2ca1,
- 0x2ca3, 0x2ca3,
- 0x2ca5, 0x2ca5,
- 0x2ca7, 0x2ca7,
- 0x2ca9, 0x2ca9,
- 0x2cab, 0x2cab,
- 0x2cad, 0x2cad,
- 0x2caf, 0x2caf,
- 0x2cb1, 0x2cb1,
- 0x2cb3, 0x2cb3,
- 0x2cb5, 0x2cb5,
- 0x2cb7, 0x2cb7,
- 0x2cb9, 0x2cb9,
- 0x2cbb, 0x2cbb,
- 0x2cbd, 0x2cbd,
- 0x2cbf, 0x2cbf,
- 0x2cc1, 0x2cc1,
- 0x2cc3, 0x2cc3,
- 0x2cc5, 0x2cc5,
- 0x2cc7, 0x2cc7,
- 0x2cc9, 0x2cc9,
- 0x2ccb, 0x2ccb,
- 0x2ccd, 0x2ccd,
- 0x2ccf, 0x2ccf,
- 0x2cd1, 0x2cd1,
- 0x2cd3, 0x2cd3,
- 0x2cd5, 0x2cd5,
- 0x2cd7, 0x2cd7,
- 0x2cd9, 0x2cd9,
- 0x2cdb, 0x2cdb,
- 0x2cdd, 0x2cdd,
- 0x2cdf, 0x2cdf,
- 0x2ce1, 0x2ce1,
- 0x2ce3, 0x2ce4,
- 0x2d00, 0x2d25,
- 0xa641, 0xa641,
- 0xa643, 0xa643,
- 0xa645, 0xa645,
- 0xa647, 0xa647,
- 0xa649, 0xa649,
- 0xa64b, 0xa64b,
- 0xa64d, 0xa64d,
- 0xa64f, 0xa64f,
- 0xa651, 0xa651,
- 0xa653, 0xa653,
- 0xa655, 0xa655,
- 0xa657, 0xa657,
- 0xa659, 0xa659,
- 0xa65b, 0xa65b,
- 0xa65d, 0xa65d,
- 0xa65f, 0xa65f,
- 0xa663, 0xa663,
- 0xa665, 0xa665,
- 0xa667, 0xa667,
- 0xa669, 0xa669,
- 0xa66b, 0xa66b,
- 0xa66d, 0xa66d,
- 0xa681, 0xa681,
- 0xa683, 0xa683,
- 0xa685, 0xa685,
- 0xa687, 0xa687,
- 0xa689, 0xa689,
- 0xa68b, 0xa68b,
- 0xa68d, 0xa68d,
- 0xa68f, 0xa68f,
- 0xa691, 0xa691,
- 0xa693, 0xa693,
- 0xa695, 0xa695,
- 0xa697, 0xa697,
- 0xa723, 0xa723,
- 0xa725, 0xa725,
- 0xa727, 0xa727,
- 0xa729, 0xa729,
- 0xa72b, 0xa72b,
- 0xa72d, 0xa72d,
- 0xa72f, 0xa731,
- 0xa733, 0xa733,
- 0xa735, 0xa735,
- 0xa737, 0xa737,
- 0xa739, 0xa739,
- 0xa73b, 0xa73b,
- 0xa73d, 0xa73d,
- 0xa73f, 0xa73f,
- 0xa741, 0xa741,
- 0xa743, 0xa743,
- 0xa745, 0xa745,
- 0xa747, 0xa747,
- 0xa749, 0xa749,
- 0xa74b, 0xa74b,
- 0xa74d, 0xa74d,
- 0xa74f, 0xa74f,
- 0xa751, 0xa751,
- 0xa753, 0xa753,
- 0xa755, 0xa755,
- 0xa757, 0xa757,
- 0xa759, 0xa759,
- 0xa75b, 0xa75b,
- 0xa75d, 0xa75d,
- 0xa75f, 0xa75f,
- 0xa761, 0xa761,
- 0xa763, 0xa763,
- 0xa765, 0xa765,
- 0xa767, 0xa767,
- 0xa769, 0xa769,
- 0xa76b, 0xa76b,
- 0xa76d, 0xa76d,
- 0xa76f, 0xa76f,
- 0xa771, 0xa778,
- 0xa77a, 0xa77a,
- 0xa77c, 0xa77c,
- 0xa77f, 0xa77f,
- 0xa781, 0xa781,
- 0xa783, 0xa783,
- 0xa785, 0xa785,
- 0xa787, 0xa787,
- 0xa78c, 0xa78c,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xff41, 0xff5a,
- 0x10428, 0x1044f,
- 0x1d41a, 0x1d433,
- 0x1d44e, 0x1d454,
- 0x1d456, 0x1d467,
- 0x1d482, 0x1d49b,
- 0x1d4b6, 0x1d4b9,
- 0x1d4bb, 0x1d4bb,
- 0x1d4bd, 0x1d4c3,
- 0x1d4c5, 0x1d4cf,
- 0x1d4ea, 0x1d503,
- 0x1d51e, 0x1d537,
- 0x1d552, 0x1d56b,
- 0x1d586, 0x1d59f,
- 0x1d5ba, 0x1d5d3,
- 0x1d5ee, 0x1d607,
- 0x1d622, 0x1d63b,
- 0x1d656, 0x1d66f,
- 0x1d68a, 0x1d6a5,
- 0x1d6c2, 0x1d6da,
- 0x1d6dc, 0x1d6e1,
- 0x1d6fc, 0x1d714,
- 0x1d716, 0x1d71b,
- 0x1d736, 0x1d74e,
- 0x1d750, 0x1d755,
- 0x1d770, 0x1d788,
- 0x1d78a, 0x1d78f,
- 0x1d7aa, 0x1d7c2,
- 0x1d7c4, 0x1d7c9,
- 0x1d7cb, 0x1d7cb,
-}; /* CR_Lower */
-
-/* 'Print': [[:Print:]] */
-static const OnigCodePoint CR_Print[] = {
- 452,
- 0x0009, 0x000d,
- 0x0020, 0x007e,
- 0x0085, 0x0085,
- 0x00a0, 0x00ac,
- 0x00ae, 0x0377,
- 0x037a, 0x037e,
- 0x0384, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x0523,
- 0x0531, 0x0556,
- 0x0559, 0x055f,
- 0x0561, 0x0587,
- 0x0589, 0x058a,
- 0x0591, 0x05c7,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0x0606, 0x061b,
- 0x061e, 0x061f,
- 0x0621, 0x065e,
- 0x0660, 0x06dc,
- 0x06de, 0x070d,
- 0x0710, 0x074a,
- 0x074d, 0x07b1,
- 0x07c0, 0x07fa,
- 0x0901, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0954,
- 0x0958, 0x0972,
- 0x097b, 0x097f,
- 0x0981, 0x0983,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bc, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09ce,
- 0x09d7, 0x09d7,
- 0x09dc, 0x09dd,
- 0x09df, 0x09e3,
- 0x09e6, 0x09fa,
- 0x0a01, 0x0a03,
- 0x0a05, 0x0a0a,
- 0x0a0f, 0x0a10,
- 0x0a13, 0x0a28,
- 0x0a2a, 0x0a30,
- 0x0a32, 0x0a33,
- 0x0a35, 0x0a36,
- 0x0a38, 0x0a39,
- 0x0a3c, 0x0a3c,
- 0x0a3e, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4d,
- 0x0a51, 0x0a51,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a66, 0x0a75,
- 0x0a81, 0x0a83,
- 0x0a85, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abc, 0x0ac5,
- 0x0ac7, 0x0ac9,
- 0x0acb, 0x0acd,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae3,
- 0x0ae6, 0x0aef,
- 0x0af1, 0x0af1,
- 0x0b01, 0x0b03,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b35, 0x0b39,
- 0x0b3c, 0x0b44,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b63,
- 0x0b66, 0x0b71,
- 0x0b82, 0x0b83,
- 0x0b85, 0x0b8a,
- 0x0b8e, 0x0b90,
- 0x0b92, 0x0b95,
- 0x0b99, 0x0b9a,
- 0x0b9c, 0x0b9c,
- 0x0b9e, 0x0b9f,
- 0x0ba3, 0x0ba4,
- 0x0ba8, 0x0baa,
- 0x0bae, 0x0bb9,
- 0x0bbe, 0x0bc2,
- 0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcd,
- 0x0bd0, 0x0bd0,
- 0x0bd7, 0x0bd7,
- 0x0be6, 0x0bfa,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3d, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c58, 0x0c59,
- 0x0c60, 0x0c63,
- 0x0c66, 0x0c6f,
- 0x0c78, 0x0c7f,
- 0x0c82, 0x0c83,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbc, 0x0cc4,
- 0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccd,
- 0x0cd5, 0x0cd6,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce3,
- 0x0ce6, 0x0cef,
- 0x0cf1, 0x0cf2,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3d, 0x0d44,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d63,
- 0x0d66, 0x0d75,
- 0x0d79, 0x0d7f,
- 0x0d82, 0x0d83,
- 0x0d85, 0x0d96,
- 0x0d9a, 0x0db1,
- 0x0db3, 0x0dbb,
- 0x0dbd, 0x0dbd,
- 0x0dc0, 0x0dc6,
- 0x0dca, 0x0dca,
- 0x0dcf, 0x0dd4,
- 0x0dd6, 0x0dd6,
- 0x0dd8, 0x0ddf,
- 0x0df2, 0x0df4,
- 0x0e01, 0x0e3a,
- 0x0e3f, 0x0e5b,
- 0x0e81, 0x0e82,
- 0x0e84, 0x0e84,
- 0x0e87, 0x0e88,
- 0x0e8a, 0x0e8a,
- 0x0e8d, 0x0e8d,
- 0x0e94, 0x0e97,
- 0x0e99, 0x0e9f,
- 0x0ea1, 0x0ea3,
- 0x0ea5, 0x0ea5,
- 0x0ea7, 0x0ea7,
- 0x0eaa, 0x0eab,
- 0x0ead, 0x0eb9,
- 0x0ebb, 0x0ebd,
- 0x0ec0, 0x0ec4,
- 0x0ec6, 0x0ec6,
- 0x0ec8, 0x0ecd,
- 0x0ed0, 0x0ed9,
- 0x0edc, 0x0edd,
- 0x0f00, 0x0f47,
- 0x0f49, 0x0f6c,
- 0x0f71, 0x0f8b,
- 0x0f90, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fbe, 0x0fcc,
- 0x0fce, 0x0fd4,
- 0x1000, 0x1099,
- 0x109e, 0x10c5,
- 0x10d0, 0x10fc,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x1200, 0x1248,
- 0x124a, 0x124d,
- 0x1250, 0x1256,
- 0x1258, 0x1258,
- 0x125a, 0x125d,
- 0x1260, 0x1288,
- 0x128a, 0x128d,
- 0x1290, 0x12b0,
- 0x12b2, 0x12b5,
- 0x12b8, 0x12be,
- 0x12c0, 0x12c0,
- 0x12c2, 0x12c5,
- 0x12c8, 0x12d6,
- 0x12d8, 0x1310,
- 0x1312, 0x1315,
- 0x1318, 0x135a,
- 0x135f, 0x137c,
- 0x1380, 0x1399,
- 0x13a0, 0x13f4,
- 0x1401, 0x1676,
- 0x1680, 0x169c,
- 0x16a0, 0x16f0,
- 0x1700, 0x170c,
- 0x170e, 0x1714,
- 0x1720, 0x1736,
- 0x1740, 0x1753,
- 0x1760, 0x176c,
- 0x176e, 0x1770,
- 0x1772, 0x1773,
- 0x1780, 0x17b3,
- 0x17b6, 0x17dd,
- 0x17e0, 0x17e9,
- 0x17f0, 0x17f9,
- 0x1800, 0x180e,
- 0x1810, 0x1819,
- 0x1820, 0x1877,
- 0x1880, 0x18aa,
- 0x1900, 0x191c,
- 0x1920, 0x192b,
- 0x1930, 0x193b,
- 0x1940, 0x1940,
- 0x1944, 0x196d,
- 0x1970, 0x1974,
- 0x1980, 0x19a9,
- 0x19b0, 0x19c9,
- 0x19d0, 0x19d9,
- 0x19de, 0x1a1b,
- 0x1a1e, 0x1a1f,
- 0x1b00, 0x1b4b,
- 0x1b50, 0x1b7c,
- 0x1b80, 0x1baa,
- 0x1bae, 0x1bb9,
- 0x1c00, 0x1c37,
- 0x1c3b, 0x1c49,
- 0x1c4d, 0x1c7f,
- 0x1d00, 0x1de6,
- 0x1dfe, 0x1f15,
- 0x1f18, 0x1f1d,
- 0x1f20, 0x1f45,
- 0x1f48, 0x1f4d,
- 0x1f50, 0x1f57,
- 0x1f59, 0x1f59,
- 0x1f5b, 0x1f5b,
- 0x1f5d, 0x1f5d,
- 0x1f5f, 0x1f7d,
- 0x1f80, 0x1fb4,
- 0x1fb6, 0x1fc4,
- 0x1fc6, 0x1fd3,
- 0x1fd6, 0x1fdb,
- 0x1fdd, 0x1fef,
- 0x1ff2, 0x1ff4,
- 0x1ff6, 0x1ffe,
- 0x2000, 0x200a,
- 0x2010, 0x2029,
- 0x202f, 0x205f,
- 0x2070, 0x2071,
- 0x2074, 0x208e,
- 0x2090, 0x2094,
- 0x20a0, 0x20b5,
- 0x20d0, 0x20f0,
- 0x2100, 0x214f,
- 0x2153, 0x2188,
- 0x2190, 0x23e7,
- 0x2400, 0x2426,
- 0x2440, 0x244a,
- 0x2460, 0x269d,
- 0x26a0, 0x26bc,
- 0x26c0, 0x26c3,
- 0x2701, 0x2704,
- 0x2706, 0x2709,
- 0x270c, 0x2727,
- 0x2729, 0x274b,
- 0x274d, 0x274d,
- 0x274f, 0x2752,
- 0x2756, 0x2756,
- 0x2758, 0x275e,
- 0x2761, 0x2794,
- 0x2798, 0x27af,
- 0x27b1, 0x27be,
- 0x27c0, 0x27ca,
- 0x27cc, 0x27cc,
- 0x27d0, 0x2b4c,
- 0x2b50, 0x2b54,
- 0x2c00, 0x2c2e,
- 0x2c30, 0x2c5e,
- 0x2c60, 0x2c6f,
- 0x2c71, 0x2c7d,
- 0x2c80, 0x2cea,
- 0x2cf9, 0x2d25,
- 0x2d30, 0x2d65,
- 0x2d6f, 0x2d6f,
- 0x2d80, 0x2d96,
- 0x2da0, 0x2da6,
- 0x2da8, 0x2dae,
- 0x2db0, 0x2db6,
- 0x2db8, 0x2dbe,
- 0x2dc0, 0x2dc6,
- 0x2dc8, 0x2dce,
- 0x2dd0, 0x2dd6,
- 0x2dd8, 0x2dde,
- 0x2de0, 0x2e30,
- 0x2e80, 0x2e99,
- 0x2e9b, 0x2ef3,
- 0x2f00, 0x2fd5,
- 0x2ff0, 0x2ffb,
- 0x3000, 0x303f,
- 0x3041, 0x3096,
- 0x3099, 0x30ff,
- 0x3105, 0x312d,
- 0x3131, 0x318e,
- 0x3190, 0x31b7,
- 0x31c0, 0x31e3,
- 0x31f0, 0x321e,
- 0x3220, 0x3243,
- 0x3250, 0x32fe,
- 0x3300, 0x3400,
- 0x4db5, 0x4db5,
- 0x4dc0, 0x4e00,
- 0x9fc3, 0x9fc3,
- 0xa000, 0xa48c,
- 0xa490, 0xa4c6,
- 0xa500, 0xa62b,
- 0xa640, 0xa65f,
- 0xa662, 0xa673,
- 0xa67c, 0xa697,
- 0xa700, 0xa78c,
- 0xa7fb, 0xa82b,
- 0xa840, 0xa877,
- 0xa880, 0xa8c4,
- 0xa8ce, 0xa8d9,
- 0xa900, 0xa953,
- 0xa95f, 0xa95f,
- 0xaa00, 0xaa36,
- 0xaa40, 0xaa4d,
- 0xaa50, 0xaa59,
- 0xaa5c, 0xaa5f,
- 0xac00, 0xac00,
- 0xd7a3, 0xd7a3,
- 0xf900, 0xfa2d,
- 0xfa30, 0xfa6a,
- 0xfa70, 0xfad9,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xfb1d, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbb1,
- 0xfbd3, 0xfd3f,
- 0xfd50, 0xfd8f,
- 0xfd92, 0xfdc7,
- 0xfdf0, 0xfdfd,
- 0xfe00, 0xfe19,
- 0xfe20, 0xfe26,
- 0xfe30, 0xfe52,
- 0xfe54, 0xfe66,
- 0xfe68, 0xfe6b,
- 0xfe70, 0xfe74,
- 0xfe76, 0xfefc,
- 0xff01, 0xffbe,
- 0xffc2, 0xffc7,
- 0xffca, 0xffcf,
- 0xffd2, 0xffd7,
- 0xffda, 0xffdc,
- 0xffe0, 0xffe6,
- 0xffe8, 0xffee,
- 0xfffc, 0xfffd,
- 0x10000, 0x1000b,
- 0x1000d, 0x10026,
- 0x10028, 0x1003a,
- 0x1003c, 0x1003d,
- 0x1003f, 0x1004d,
- 0x10050, 0x1005d,
- 0x10080, 0x100fa,
- 0x10100, 0x10102,
- 0x10107, 0x10133,
- 0x10137, 0x1018a,
- 0x10190, 0x1019b,
- 0x101d0, 0x101fd,
- 0x10280, 0x1029c,
- 0x102a0, 0x102d0,
- 0x10300, 0x1031e,
- 0x10320, 0x10323,
- 0x10330, 0x1034a,
- 0x10380, 0x1039d,
- 0x1039f, 0x103c3,
- 0x103c8, 0x103d5,
- 0x10400, 0x1049d,
- 0x104a0, 0x104a9,
- 0x10800, 0x10805,
- 0x10808, 0x10808,
- 0x1080a, 0x10835,
- 0x10837, 0x10838,
- 0x1083c, 0x1083c,
- 0x1083f, 0x1083f,
- 0x10900, 0x10919,
- 0x1091f, 0x10939,
- 0x1093f, 0x1093f,
- 0x10a00, 0x10a03,
- 0x10a05, 0x10a06,
- 0x10a0c, 0x10a13,
- 0x10a15, 0x10a17,
- 0x10a19, 0x10a33,
- 0x10a38, 0x10a3a,
- 0x10a3f, 0x10a47,
- 0x10a50, 0x10a58,
- 0x12000, 0x1236e,
- 0x12400, 0x12462,
- 0x12470, 0x12473,
- 0x1d000, 0x1d0f5,
- 0x1d100, 0x1d126,
- 0x1d129, 0x1d172,
- 0x1d17b, 0x1d1dd,
- 0x1d200, 0x1d245,
- 0x1d300, 0x1d356,
- 0x1d360, 0x1d371,
- 0x1d400, 0x1d454,
- 0x1d456, 0x1d49c,
- 0x1d49e, 0x1d49f,
- 0x1d4a2, 0x1d4a2,
- 0x1d4a5, 0x1d4a6,
- 0x1d4a9, 0x1d4ac,
- 0x1d4ae, 0x1d4b9,
- 0x1d4bb, 0x1d4bb,
- 0x1d4bd, 0x1d4c3,
- 0x1d4c5, 0x1d505,
- 0x1d507, 0x1d50a,
- 0x1d50d, 0x1d514,
- 0x1d516, 0x1d51c,
- 0x1d51e, 0x1d539,
- 0x1d53b, 0x1d53e,
- 0x1d540, 0x1d544,
- 0x1d546, 0x1d546,
- 0x1d54a, 0x1d550,
- 0x1d552, 0x1d6a5,
- 0x1d6a8, 0x1d7cb,
- 0x1d7ce, 0x1d7ff,
- 0x1f000, 0x1f02b,
- 0x1f030, 0x1f093,
- 0x20000, 0x20000,
- 0x2a6d6, 0x2a6d6,
- 0x2f800, 0x2fa1d,
- 0xe0100, 0xe01ef,
-}; /* CR_Print */
-
-/* 'Punct': [[:Punct:]] */
-static const OnigCodePoint CR_Punct[] = {
- 112,
- 0x0021, 0x0023,
- 0x0025, 0x002a,
- 0x002c, 0x002f,
- 0x003a, 0x003b,
- 0x003f, 0x0040,
- 0x005b, 0x005d,
- 0x005f, 0x005f,
- 0x007b, 0x007b,
- 0x007d, 0x007d,
- 0x00a1, 0x00a1,
- 0x00ab, 0x00ab,
- 0x00b7, 0x00b7,
- 0x00bb, 0x00bb,
- 0x00bf, 0x00bf,
- 0x037e, 0x037e,
- 0x0387, 0x0387,
- 0x055a, 0x055f,
- 0x0589, 0x058a,
- 0x05be, 0x05be,
- 0x05c0, 0x05c0,
- 0x05c3, 0x05c3,
- 0x05c6, 0x05c6,
- 0x05f3, 0x05f4,
- 0x0609, 0x060a,
- 0x060c, 0x060d,
- 0x061b, 0x061b,
- 0x061e, 0x061f,
- 0x066a, 0x066d,
- 0x06d4, 0x06d4,
- 0x0700, 0x070d,
- 0x07f7, 0x07f9,
- 0x0964, 0x0965,
- 0x0970, 0x0970,
- 0x0df4, 0x0df4,
- 0x0e4f, 0x0e4f,
- 0x0e5a, 0x0e5b,
- 0x0f04, 0x0f12,
- 0x0f3a, 0x0f3d,
- 0x0f85, 0x0f85,
- 0x0fd0, 0x0fd4,
- 0x104a, 0x104f,
- 0x10fb, 0x10fb,
- 0x1361, 0x1368,
- 0x166d, 0x166e,
- 0x169b, 0x169c,
- 0x16eb, 0x16ed,
- 0x1735, 0x1736,
- 0x17d4, 0x17d6,
- 0x17d8, 0x17da,
- 0x1800, 0x180a,
- 0x1944, 0x1945,
- 0x19de, 0x19df,
- 0x1a1e, 0x1a1f,
- 0x1b5a, 0x1b60,
- 0x1c3b, 0x1c3f,
- 0x1c7e, 0x1c7f,
- 0x2010, 0x2027,
- 0x2030, 0x2043,
- 0x2045, 0x2051,
- 0x2053, 0x205e,
- 0x207d, 0x207e,
- 0x208d, 0x208e,
- 0x2329, 0x232a,
- 0x2768, 0x2775,
- 0x27c5, 0x27c6,
- 0x27e6, 0x27ef,
- 0x2983, 0x2998,
- 0x29d8, 0x29db,
- 0x29fc, 0x29fd,
- 0x2cf9, 0x2cfc,
- 0x2cfe, 0x2cff,
- 0x2e00, 0x2e2e,
- 0x2e30, 0x2e30,
- 0x3001, 0x3003,
- 0x3008, 0x3011,
- 0x3014, 0x301f,
- 0x3030, 0x3030,
- 0x303d, 0x303d,
- 0x30a0, 0x30a0,
- 0x30fb, 0x30fb,
- 0xa60d, 0xa60f,
- 0xa673, 0xa673,
- 0xa67e, 0xa67e,
- 0xa874, 0xa877,
- 0xa8ce, 0xa8cf,
- 0xa92e, 0xa92f,
- 0xa95f, 0xa95f,
- 0xaa5c, 0xaa5f,
- 0xfd3e, 0xfd3f,
- 0xfe10, 0xfe19,
- 0xfe30, 0xfe52,
- 0xfe54, 0xfe61,
- 0xfe63, 0xfe63,
- 0xfe68, 0xfe68,
- 0xfe6a, 0xfe6b,
- 0xff01, 0xff03,
- 0xff05, 0xff0a,
- 0xff0c, 0xff0f,
- 0xff1a, 0xff1b,
- 0xff1f, 0xff20,
- 0xff3b, 0xff3d,
- 0xff3f, 0xff3f,
- 0xff5b, 0xff5b,
- 0xff5d, 0xff5d,
- 0xff5f, 0xff65,
- 0x10100, 0x10101,
- 0x1039f, 0x1039f,
- 0x103d0, 0x103d0,
- 0x1091f, 0x1091f,
- 0x1093f, 0x1093f,
- 0x10a50, 0x10a58,
- 0x12470, 0x12473,
-}; /* CR_Punct */
-
-/* 'Space': [[:Space:]] */
-static const OnigCodePoint CR_Space[] = {
- 11,
- 0x0009, 0x000d,
- 0x0020, 0x0020,
- 0x0085, 0x0085,
- 0x00a0, 0x00a0,
- 0x1680, 0x1680,
- 0x180e, 0x180e,
- 0x2000, 0x200a,
- 0x2028, 0x2029,
- 0x202f, 0x202f,
- 0x205f, 0x205f,
- 0x3000, 0x3000,
-}; /* CR_Space */
-
-/* 'Upper': [[:Upper:]] */
-static const OnigCodePoint CR_Upper[] = {
- 591,
- 0x0041, 0x005a,
- 0x00c0, 0x00d6,
- 0x00d8, 0x00de,
- 0x0100, 0x0100,
- 0x0102, 0x0102,
- 0x0104, 0x0104,
- 0x0106, 0x0106,
- 0x0108, 0x0108,
- 0x010a, 0x010a,
- 0x010c, 0x010c,
- 0x010e, 0x010e,
- 0x0110, 0x0110,
- 0x0112, 0x0112,
- 0x0114, 0x0114,
- 0x0116, 0x0116,
- 0x0118, 0x0118,
- 0x011a, 0x011a,
- 0x011c, 0x011c,
- 0x011e, 0x011e,
- 0x0120, 0x0120,
- 0x0122, 0x0122,
- 0x0124, 0x0124,
- 0x0126, 0x0126,
- 0x0128, 0x0128,
- 0x012a, 0x012a,
- 0x012c, 0x012c,
- 0x012e, 0x012e,
- 0x0130, 0x0130,
- 0x0132, 0x0132,
- 0x0134, 0x0134,
- 0x0136, 0x0136,
- 0x0139, 0x0139,
- 0x013b, 0x013b,
- 0x013d, 0x013d,
- 0x013f, 0x013f,
- 0x0141, 0x0141,
- 0x0143, 0x0143,
- 0x0145, 0x0145,
- 0x0147, 0x0147,
- 0x014a, 0x014a,
- 0x014c, 0x014c,
- 0x014e, 0x014e,
- 0x0150, 0x0150,
- 0x0152, 0x0152,
- 0x0154, 0x0154,
- 0x0156, 0x0156,
- 0x0158, 0x0158,
- 0x015a, 0x015a,
- 0x015c, 0x015c,
- 0x015e, 0x015e,
- 0x0160, 0x0160,
- 0x0162, 0x0162,
- 0x0164, 0x0164,
- 0x0166, 0x0166,
- 0x0168, 0x0168,
- 0x016a, 0x016a,
- 0x016c, 0x016c,
- 0x016e, 0x016e,
- 0x0170, 0x0170,
- 0x0172, 0x0172,
- 0x0174, 0x0174,
- 0x0176, 0x0176,
- 0x0178, 0x0179,
- 0x017b, 0x017b,
- 0x017d, 0x017d,
- 0x0181, 0x0182,
- 0x0184, 0x0184,
- 0x0186, 0x0187,
- 0x0189, 0x018b,
- 0x018e, 0x0191,
- 0x0193, 0x0194,
- 0x0196, 0x0198,
- 0x019c, 0x019d,
- 0x019f, 0x01a0,
- 0x01a2, 0x01a2,
- 0x01a4, 0x01a4,
- 0x01a6, 0x01a7,
- 0x01a9, 0x01a9,
- 0x01ac, 0x01ac,
- 0x01ae, 0x01af,
- 0x01b1, 0x01b3,
- 0x01b5, 0x01b5,
- 0x01b7, 0x01b8,
- 0x01bc, 0x01bc,
- 0x01c4, 0x01c4,
- 0x01c7, 0x01c7,
- 0x01ca, 0x01ca,
- 0x01cd, 0x01cd,
- 0x01cf, 0x01cf,
- 0x01d1, 0x01d1,
- 0x01d3, 0x01d3,
- 0x01d5, 0x01d5,
- 0x01d7, 0x01d7,
- 0x01d9, 0x01d9,
- 0x01db, 0x01db,
- 0x01de, 0x01de,
- 0x01e0, 0x01e0,
- 0x01e2, 0x01e2,
- 0x01e4, 0x01e4,
- 0x01e6, 0x01e6,
- 0x01e8, 0x01e8,
- 0x01ea, 0x01ea,
- 0x01ec, 0x01ec,
- 0x01ee, 0x01ee,
- 0x01f1, 0x01f1,
- 0x01f4, 0x01f4,
- 0x01f6, 0x01f8,
- 0x01fa, 0x01fa,
- 0x01fc, 0x01fc,
- 0x01fe, 0x01fe,
- 0x0200, 0x0200,
- 0x0202, 0x0202,
- 0x0204, 0x0204,
- 0x0206, 0x0206,
- 0x0208, 0x0208,
- 0x020a, 0x020a,
- 0x020c, 0x020c,
- 0x020e, 0x020e,
- 0x0210, 0x0210,
- 0x0212, 0x0212,
- 0x0214, 0x0214,
- 0x0216, 0x0216,
- 0x0218, 0x0218,
- 0x021a, 0x021a,
- 0x021c, 0x021c,
- 0x021e, 0x021e,
- 0x0220, 0x0220,
- 0x0222, 0x0222,
- 0x0224, 0x0224,
- 0x0226, 0x0226,
- 0x0228, 0x0228,
- 0x022a, 0x022a,
- 0x022c, 0x022c,
- 0x022e, 0x022e,
- 0x0230, 0x0230,
- 0x0232, 0x0232,
- 0x023a, 0x023b,
- 0x023d, 0x023e,
- 0x0241, 0x0241,
- 0x0243, 0x0246,
- 0x0248, 0x0248,
- 0x024a, 0x024a,
- 0x024c, 0x024c,
- 0x024e, 0x024e,
- 0x0370, 0x0370,
- 0x0372, 0x0372,
- 0x0376, 0x0376,
- 0x0386, 0x0386,
- 0x0388, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x038f,
- 0x0391, 0x03a1,
- 0x03a3, 0x03ab,
- 0x03cf, 0x03cf,
- 0x03d2, 0x03d4,
- 0x03d8, 0x03d8,
- 0x03da, 0x03da,
- 0x03dc, 0x03dc,
- 0x03de, 0x03de,
- 0x03e0, 0x03e0,
- 0x03e2, 0x03e2,
- 0x03e4, 0x03e4,
- 0x03e6, 0x03e6,
- 0x03e8, 0x03e8,
- 0x03ea, 0x03ea,
- 0x03ec, 0x03ec,
- 0x03ee, 0x03ee,
- 0x03f4, 0x03f4,
- 0x03f7, 0x03f7,
- 0x03f9, 0x03fa,
- 0x03fd, 0x042f,
- 0x0460, 0x0460,
- 0x0462, 0x0462,
- 0x0464, 0x0464,
- 0x0466, 0x0466,
- 0x0468, 0x0468,
- 0x046a, 0x046a,
- 0x046c, 0x046c,
- 0x046e, 0x046e,
- 0x0470, 0x0470,
- 0x0472, 0x0472,
- 0x0474, 0x0474,
- 0x0476, 0x0476,
- 0x0478, 0x0478,
- 0x047a, 0x047a,
- 0x047c, 0x047c,
- 0x047e, 0x047e,
- 0x0480, 0x0480,
- 0x048a, 0x048a,
- 0x048c, 0x048c,
- 0x048e, 0x048e,
- 0x0490, 0x0490,
- 0x0492, 0x0492,
- 0x0494, 0x0494,
- 0x0496, 0x0496,
- 0x0498, 0x0498,
- 0x049a, 0x049a,
- 0x049c, 0x049c,
- 0x049e, 0x049e,
- 0x04a0, 0x04a0,
- 0x04a2, 0x04a2,
- 0x04a4, 0x04a4,
- 0x04a6, 0x04a6,
- 0x04a8, 0x04a8,
- 0x04aa, 0x04aa,
- 0x04ac, 0x04ac,
- 0x04ae, 0x04ae,
- 0x04b0, 0x04b0,
- 0x04b2, 0x04b2,
- 0x04b4, 0x04b4,
- 0x04b6, 0x04b6,
- 0x04b8, 0x04b8,
- 0x04ba, 0x04ba,
- 0x04bc, 0x04bc,
- 0x04be, 0x04be,
- 0x04c0, 0x04c1,
- 0x04c3, 0x04c3,
- 0x04c5, 0x04c5,
- 0x04c7, 0x04c7,
- 0x04c9, 0x04c9,
- 0x04cb, 0x04cb,
- 0x04cd, 0x04cd,
- 0x04d0, 0x04d0,
- 0x04d2, 0x04d2,
- 0x04d4, 0x04d4,
- 0x04d6, 0x04d6,
- 0x04d8, 0x04d8,
- 0x04da, 0x04da,
- 0x04dc, 0x04dc,
- 0x04de, 0x04de,
- 0x04e0, 0x04e0,
- 0x04e2, 0x04e2,
- 0x04e4, 0x04e4,
- 0x04e6, 0x04e6,
- 0x04e8, 0x04e8,
- 0x04ea, 0x04ea,
- 0x04ec, 0x04ec,
- 0x04ee, 0x04ee,
- 0x04f0, 0x04f0,
- 0x04f2, 0x04f2,
- 0x04f4, 0x04f4,
- 0x04f6, 0x04f6,
- 0x04f8, 0x04f8,
- 0x04fa, 0x04fa,
- 0x04fc, 0x04fc,
- 0x04fe, 0x04fe,
- 0x0500, 0x0500,
- 0x0502, 0x0502,
- 0x0504, 0x0504,
- 0x0506, 0x0506,
- 0x0508, 0x0508,
- 0x050a, 0x050a,
- 0x050c, 0x050c,
- 0x050e, 0x050e,
- 0x0510, 0x0510,
- 0x0512, 0x0512,
- 0x0514, 0x0514,
- 0x0516, 0x0516,
- 0x0518, 0x0518,
- 0x051a, 0x051a,
- 0x051c, 0x051c,
- 0x051e, 0x051e,
- 0x0520, 0x0520,
- 0x0522, 0x0522,
- 0x0531, 0x0556,
- 0x10a0, 0x10c5,
- 0x1e00, 0x1e00,
- 0x1e02, 0x1e02,
- 0x1e04, 0x1e04,
- 0x1e06, 0x1e06,
- 0x1e08, 0x1e08,
- 0x1e0a, 0x1e0a,
- 0x1e0c, 0x1e0c,
- 0x1e0e, 0x1e0e,
- 0x1e10, 0x1e10,
- 0x1e12, 0x1e12,
- 0x1e14, 0x1e14,
- 0x1e16, 0x1e16,
- 0x1e18, 0x1e18,
- 0x1e1a, 0x1e1a,
- 0x1e1c, 0x1e1c,
- 0x1e1e, 0x1e1e,
- 0x1e20, 0x1e20,
- 0x1e22, 0x1e22,
- 0x1e24, 0x1e24,
- 0x1e26, 0x1e26,
- 0x1e28, 0x1e28,
- 0x1e2a, 0x1e2a,
- 0x1e2c, 0x1e2c,
- 0x1e2e, 0x1e2e,
- 0x1e30, 0x1e30,
- 0x1e32, 0x1e32,
- 0x1e34, 0x1e34,
- 0x1e36, 0x1e36,
- 0x1e38, 0x1e38,
- 0x1e3a, 0x1e3a,
- 0x1e3c, 0x1e3c,
- 0x1e3e, 0x1e3e,
- 0x1e40, 0x1e40,
- 0x1e42, 0x1e42,
- 0x1e44, 0x1e44,
- 0x1e46, 0x1e46,
- 0x1e48, 0x1e48,
- 0x1e4a, 0x1e4a,
- 0x1e4c, 0x1e4c,
- 0x1e4e, 0x1e4e,
- 0x1e50, 0x1e50,
- 0x1e52, 0x1e52,
- 0x1e54, 0x1e54,
- 0x1e56, 0x1e56,
- 0x1e58, 0x1e58,
- 0x1e5a, 0x1e5a,
- 0x1e5c, 0x1e5c,
- 0x1e5e, 0x1e5e,
- 0x1e60, 0x1e60,
- 0x1e62, 0x1e62,
- 0x1e64, 0x1e64,
- 0x1e66, 0x1e66,
- 0x1e68, 0x1e68,
- 0x1e6a, 0x1e6a,
- 0x1e6c, 0x1e6c,
- 0x1e6e, 0x1e6e,
- 0x1e70, 0x1e70,
- 0x1e72, 0x1e72,
- 0x1e74, 0x1e74,
- 0x1e76, 0x1e76,
- 0x1e78, 0x1e78,
- 0x1e7a, 0x1e7a,
- 0x1e7c, 0x1e7c,
- 0x1e7e, 0x1e7e,
- 0x1e80, 0x1e80,
- 0x1e82, 0x1e82,
- 0x1e84, 0x1e84,
- 0x1e86, 0x1e86,
- 0x1e88, 0x1e88,
- 0x1e8a, 0x1e8a,
- 0x1e8c, 0x1e8c,
- 0x1e8e, 0x1e8e,
- 0x1e90, 0x1e90,
- 0x1e92, 0x1e92,
- 0x1e94, 0x1e94,
- 0x1e9e, 0x1e9e,
- 0x1ea0, 0x1ea0,
- 0x1ea2, 0x1ea2,
- 0x1ea4, 0x1ea4,
- 0x1ea6, 0x1ea6,
- 0x1ea8, 0x1ea8,
- 0x1eaa, 0x1eaa,
- 0x1eac, 0x1eac,
- 0x1eae, 0x1eae,
- 0x1eb0, 0x1eb0,
- 0x1eb2, 0x1eb2,
- 0x1eb4, 0x1eb4,
- 0x1eb6, 0x1eb6,
- 0x1eb8, 0x1eb8,
- 0x1eba, 0x1eba,
- 0x1ebc, 0x1ebc,
- 0x1ebe, 0x1ebe,
- 0x1ec0, 0x1ec0,
- 0x1ec2, 0x1ec2,
- 0x1ec4, 0x1ec4,
- 0x1ec6, 0x1ec6,
- 0x1ec8, 0x1ec8,
- 0x1eca, 0x1eca,
- 0x1ecc, 0x1ecc,
- 0x1ece, 0x1ece,
- 0x1ed0, 0x1ed0,
- 0x1ed2, 0x1ed2,
- 0x1ed4, 0x1ed4,
- 0x1ed6, 0x1ed6,
- 0x1ed8, 0x1ed8,
- 0x1eda, 0x1eda,
- 0x1edc, 0x1edc,
- 0x1ede, 0x1ede,
- 0x1ee0, 0x1ee0,
- 0x1ee2, 0x1ee2,
- 0x1ee4, 0x1ee4,
- 0x1ee6, 0x1ee6,
- 0x1ee8, 0x1ee8,
- 0x1eea, 0x1eea,
- 0x1eec, 0x1eec,
- 0x1eee, 0x1eee,
- 0x1ef0, 0x1ef0,
- 0x1ef2, 0x1ef2,
- 0x1ef4, 0x1ef4,
- 0x1ef6, 0x1ef6,
- 0x1ef8, 0x1ef8,
- 0x1efa, 0x1efa,
- 0x1efc, 0x1efc,
- 0x1efe, 0x1efe,
- 0x1f08, 0x1f0f,
- 0x1f18, 0x1f1d,
- 0x1f28, 0x1f2f,
- 0x1f38, 0x1f3f,
- 0x1f48, 0x1f4d,
- 0x1f59, 0x1f59,
- 0x1f5b, 0x1f5b,
- 0x1f5d, 0x1f5d,
- 0x1f5f, 0x1f5f,
- 0x1f68, 0x1f6f,
- 0x1fb8, 0x1fbb,
- 0x1fc8, 0x1fcb,
- 0x1fd8, 0x1fdb,
- 0x1fe8, 0x1fec,
- 0x1ff8, 0x1ffb,
- 0x2102, 0x2102,
- 0x2107, 0x2107,
- 0x210b, 0x210d,
- 0x2110, 0x2112,
- 0x2115, 0x2115,
- 0x2119, 0x211d,
- 0x2124, 0x2124,
- 0x2126, 0x2126,
- 0x2128, 0x2128,
- 0x212a, 0x212d,
- 0x2130, 0x2133,
- 0x213e, 0x213f,
- 0x2145, 0x2145,
- 0x2183, 0x2183,
- 0x2c00, 0x2c2e,
- 0x2c60, 0x2c60,
- 0x2c62, 0x2c64,
- 0x2c67, 0x2c67,
- 0x2c69, 0x2c69,
- 0x2c6b, 0x2c6b,
- 0x2c6d, 0x2c6f,
- 0x2c72, 0x2c72,
- 0x2c75, 0x2c75,
- 0x2c80, 0x2c80,
- 0x2c82, 0x2c82,
- 0x2c84, 0x2c84,
- 0x2c86, 0x2c86,
- 0x2c88, 0x2c88,
- 0x2c8a, 0x2c8a,
- 0x2c8c, 0x2c8c,
- 0x2c8e, 0x2c8e,
- 0x2c90, 0x2c90,
- 0x2c92, 0x2c92,
- 0x2c94, 0x2c94,
- 0x2c96, 0x2c96,
- 0x2c98, 0x2c98,
- 0x2c9a, 0x2c9a,
- 0x2c9c, 0x2c9c,
- 0x2c9e, 0x2c9e,
- 0x2ca0, 0x2ca0,
- 0x2ca2, 0x2ca2,
- 0x2ca4, 0x2ca4,
- 0x2ca6, 0x2ca6,
- 0x2ca8, 0x2ca8,
- 0x2caa, 0x2caa,
- 0x2cac, 0x2cac,
- 0x2cae, 0x2cae,
- 0x2cb0, 0x2cb0,
- 0x2cb2, 0x2cb2,
- 0x2cb4, 0x2cb4,
- 0x2cb6, 0x2cb6,
- 0x2cb8, 0x2cb8,
- 0x2cba, 0x2cba,
- 0x2cbc, 0x2cbc,
- 0x2cbe, 0x2cbe,
- 0x2cc0, 0x2cc0,
- 0x2cc2, 0x2cc2,
- 0x2cc4, 0x2cc4,
- 0x2cc6, 0x2cc6,
- 0x2cc8, 0x2cc8,
- 0x2cca, 0x2cca,
- 0x2ccc, 0x2ccc,
- 0x2cce, 0x2cce,
- 0x2cd0, 0x2cd0,
- 0x2cd2, 0x2cd2,
- 0x2cd4, 0x2cd4,
- 0x2cd6, 0x2cd6,
- 0x2cd8, 0x2cd8,
- 0x2cda, 0x2cda,
- 0x2cdc, 0x2cdc,
- 0x2cde, 0x2cde,
- 0x2ce0, 0x2ce0,
- 0x2ce2, 0x2ce2,
- 0xa640, 0xa640,
- 0xa642, 0xa642,
- 0xa644, 0xa644,
- 0xa646, 0xa646,
- 0xa648, 0xa648,
- 0xa64a, 0xa64a,
- 0xa64c, 0xa64c,
- 0xa64e, 0xa64e,
- 0xa650, 0xa650,
- 0xa652, 0xa652,
- 0xa654, 0xa654,
- 0xa656, 0xa656,
- 0xa658, 0xa658,
- 0xa65a, 0xa65a,
- 0xa65c, 0xa65c,
- 0xa65e, 0xa65e,
- 0xa662, 0xa662,
- 0xa664, 0xa664,
- 0xa666, 0xa666,
- 0xa668, 0xa668,
- 0xa66a, 0xa66a,
- 0xa66c, 0xa66c,
- 0xa680, 0xa680,
- 0xa682, 0xa682,
- 0xa684, 0xa684,
- 0xa686, 0xa686,
- 0xa688, 0xa688,
- 0xa68a, 0xa68a,
- 0xa68c, 0xa68c,
- 0xa68e, 0xa68e,
- 0xa690, 0xa690,
- 0xa692, 0xa692,
- 0xa694, 0xa694,
- 0xa696, 0xa696,
- 0xa722, 0xa722,
- 0xa724, 0xa724,
- 0xa726, 0xa726,
- 0xa728, 0xa728,
- 0xa72a, 0xa72a,
- 0xa72c, 0xa72c,
- 0xa72e, 0xa72e,
- 0xa732, 0xa732,
- 0xa734, 0xa734,
- 0xa736, 0xa736,
- 0xa738, 0xa738,
- 0xa73a, 0xa73a,
- 0xa73c, 0xa73c,
- 0xa73e, 0xa73e,
- 0xa740, 0xa740,
- 0xa742, 0xa742,
- 0xa744, 0xa744,
- 0xa746, 0xa746,
- 0xa748, 0xa748,
- 0xa74a, 0xa74a,
- 0xa74c, 0xa74c,
- 0xa74e, 0xa74e,
- 0xa750, 0xa750,
- 0xa752, 0xa752,
- 0xa754, 0xa754,
- 0xa756, 0xa756,
- 0xa758, 0xa758,
- 0xa75a, 0xa75a,
- 0xa75c, 0xa75c,
- 0xa75e, 0xa75e,
- 0xa760, 0xa760,
- 0xa762, 0xa762,
- 0xa764, 0xa764,
- 0xa766, 0xa766,
- 0xa768, 0xa768,
- 0xa76a, 0xa76a,
- 0xa76c, 0xa76c,
- 0xa76e, 0xa76e,
- 0xa779, 0xa779,
- 0xa77b, 0xa77b,
- 0xa77d, 0xa77e,
- 0xa780, 0xa780,
- 0xa782, 0xa782,
- 0xa784, 0xa784,
- 0xa786, 0xa786,
- 0xa78b, 0xa78b,
- 0xff21, 0xff3a,
- 0x10400, 0x10427,
- 0x1d400, 0x1d419,
- 0x1d434, 0x1d44d,
- 0x1d468, 0x1d481,
- 0x1d49c, 0x1d49c,
- 0x1d49e, 0x1d49f,
- 0x1d4a2, 0x1d4a2,
- 0x1d4a5, 0x1d4a6,
- 0x1d4a9, 0x1d4ac,
- 0x1d4ae, 0x1d4b5,
- 0x1d4d0, 0x1d4e9,
- 0x1d504, 0x1d505,
- 0x1d507, 0x1d50a,
- 0x1d50d, 0x1d514,
- 0x1d516, 0x1d51c,
- 0x1d538, 0x1d539,
- 0x1d53b, 0x1d53e,
- 0x1d540, 0x1d544,
- 0x1d546, 0x1d546,
- 0x1d54a, 0x1d550,
- 0x1d56c, 0x1d585,
- 0x1d5a0, 0x1d5b9,
- 0x1d5d4, 0x1d5ed,
- 0x1d608, 0x1d621,
- 0x1d63c, 0x1d655,
- 0x1d670, 0x1d689,
- 0x1d6a8, 0x1d6c0,
- 0x1d6e2, 0x1d6fa,
- 0x1d71c, 0x1d734,
- 0x1d756, 0x1d76e,
- 0x1d790, 0x1d7a8,
- 0x1d7ca, 0x1d7ca,
-}; /* CR_Upper */
-
-/* 'XDigit': [[:XDigit:]] */
-static const OnigCodePoint CR_XDigit[] = {
- 3,
- 0x0030, 0x0039,
- 0x0041, 0x0046,
- 0x0061, 0x0066,
-}; /* CR_XDigit */
-
-/* 'Word': [[:Word:]] */
-static const OnigCodePoint CR_Word[] = {
- 477,
- 0x0030, 0x0039,
- 0x0041, 0x005a,
- 0x005f, 0x005f,
- 0x0061, 0x007a,
- 0x00aa, 0x00aa,
- 0x00b5, 0x00b5,
- 0x00ba, 0x00ba,
- 0x00c0, 0x00d6,
- 0x00d8, 0x00f6,
- 0x00f8, 0x02c1,
- 0x02c6, 0x02d1,
- 0x02e0, 0x02e4,
- 0x02ec, 0x02ec,
- 0x02ee, 0x02ee,
- 0x0300, 0x0374,
- 0x0376, 0x0377,
- 0x037a, 0x037d,
- 0x0386, 0x0386,
- 0x0388, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03f5,
- 0x03f7, 0x0481,
- 0x0483, 0x0523,
- 0x0531, 0x0556,
- 0x0559, 0x0559,
- 0x0561, 0x0587,
- 0x0591, 0x05bd,
- 0x05bf, 0x05bf,
- 0x05c1, 0x05c2,
- 0x05c4, 0x05c5,
- 0x05c7, 0x05c7,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f2,
- 0x0610, 0x061a,
- 0x0621, 0x065e,
- 0x0660, 0x0669,
- 0x066e, 0x06d3,
- 0x06d5, 0x06dc,
- 0x06de, 0x06e8,
- 0x06ea, 0x06fc,
- 0x06ff, 0x06ff,
- 0x0710, 0x074a,
- 0x074d, 0x07b1,
- 0x07c0, 0x07f5,
- 0x07fa, 0x07fa,
- 0x0901, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0954,
- 0x0958, 0x0963,
- 0x0966, 0x096f,
- 0x0971, 0x0972,
- 0x097b, 0x097f,
- 0x0981, 0x0983,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bc, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09ce,
- 0x09d7, 0x09d7,
- 0x09dc, 0x09dd,
- 0x09df, 0x09e3,
- 0x09e6, 0x09f1,
- 0x0a01, 0x0a03,
- 0x0a05, 0x0a0a,
- 0x0a0f, 0x0a10,
- 0x0a13, 0x0a28,
- 0x0a2a, 0x0a30,
- 0x0a32, 0x0a33,
- 0x0a35, 0x0a36,
- 0x0a38, 0x0a39,
- 0x0a3c, 0x0a3c,
- 0x0a3e, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4d,
- 0x0a51, 0x0a51,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a66, 0x0a75,
- 0x0a81, 0x0a83,
- 0x0a85, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abc, 0x0ac5,
- 0x0ac7, 0x0ac9,
- 0x0acb, 0x0acd,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae3,
- 0x0ae6, 0x0aef,
- 0x0b01, 0x0b03,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b35, 0x0b39,
- 0x0b3c, 0x0b44,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b63,
- 0x0b66, 0x0b6f,
- 0x0b71, 0x0b71,
- 0x0b82, 0x0b83,
- 0x0b85, 0x0b8a,
- 0x0b8e, 0x0b90,
- 0x0b92, 0x0b95,
- 0x0b99, 0x0b9a,
- 0x0b9c, 0x0b9c,
- 0x0b9e, 0x0b9f,
- 0x0ba3, 0x0ba4,
- 0x0ba8, 0x0baa,
- 0x0bae, 0x0bb9,
- 0x0bbe, 0x0bc2,
- 0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcd,
- 0x0bd0, 0x0bd0,
- 0x0bd7, 0x0bd7,
- 0x0be6, 0x0bef,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3d, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c58, 0x0c59,
- 0x0c60, 0x0c63,
- 0x0c66, 0x0c6f,
- 0x0c82, 0x0c83,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbc, 0x0cc4,
- 0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccd,
- 0x0cd5, 0x0cd6,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce3,
- 0x0ce6, 0x0cef,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3d, 0x0d44,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d63,
- 0x0d66, 0x0d6f,
- 0x0d7a, 0x0d7f,
- 0x0d82, 0x0d83,
- 0x0d85, 0x0d96,
- 0x0d9a, 0x0db1,
- 0x0db3, 0x0dbb,
- 0x0dbd, 0x0dbd,
- 0x0dc0, 0x0dc6,
- 0x0dca, 0x0dca,
- 0x0dcf, 0x0dd4,
- 0x0dd6, 0x0dd6,
- 0x0dd8, 0x0ddf,
- 0x0df2, 0x0df3,
- 0x0e01, 0x0e3a,
- 0x0e40, 0x0e4e,
- 0x0e50, 0x0e59,
- 0x0e81, 0x0e82,
- 0x0e84, 0x0e84,
- 0x0e87, 0x0e88,
- 0x0e8a, 0x0e8a,
- 0x0e8d, 0x0e8d,
- 0x0e94, 0x0e97,
- 0x0e99, 0x0e9f,
- 0x0ea1, 0x0ea3,
- 0x0ea5, 0x0ea5,
- 0x0ea7, 0x0ea7,
- 0x0eaa, 0x0eab,
- 0x0ead, 0x0eb9,
- 0x0ebb, 0x0ebd,
- 0x0ec0, 0x0ec4,
- 0x0ec6, 0x0ec6,
- 0x0ec8, 0x0ecd,
- 0x0ed0, 0x0ed9,
- 0x0edc, 0x0edd,
- 0x0f00, 0x0f00,
- 0x0f18, 0x0f19,
- 0x0f20, 0x0f29,
- 0x0f35, 0x0f35,
- 0x0f37, 0x0f37,
- 0x0f39, 0x0f39,
- 0x0f3e, 0x0f47,
- 0x0f49, 0x0f6c,
- 0x0f71, 0x0f84,
- 0x0f86, 0x0f8b,
- 0x0f90, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fc6, 0x0fc6,
- 0x1000, 0x1049,
- 0x1050, 0x1099,
- 0x10a0, 0x10c5,
- 0x10d0, 0x10fa,
- 0x10fc, 0x10fc,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x1200, 0x1248,
- 0x124a, 0x124d,
- 0x1250, 0x1256,
- 0x1258, 0x1258,
- 0x125a, 0x125d,
- 0x1260, 0x1288,
- 0x128a, 0x128d,
- 0x1290, 0x12b0,
- 0x12b2, 0x12b5,
- 0x12b8, 0x12be,
- 0x12c0, 0x12c0,
- 0x12c2, 0x12c5,
- 0x12c8, 0x12d6,
- 0x12d8, 0x1310,
- 0x1312, 0x1315,
- 0x1318, 0x135a,
- 0x135f, 0x135f,
- 0x1380, 0x138f,
- 0x13a0, 0x13f4,
- 0x1401, 0x166c,
- 0x166f, 0x1676,
- 0x1681, 0x169a,
- 0x16a0, 0x16ea,
- 0x1700, 0x170c,
- 0x170e, 0x1714,
- 0x1720, 0x1734,
- 0x1740, 0x1753,
- 0x1760, 0x176c,
- 0x176e, 0x1770,
- 0x1772, 0x1773,
- 0x1780, 0x17b3,
- 0x17b6, 0x17d3,
- 0x17d7, 0x17d7,
- 0x17dc, 0x17dd,
- 0x17e0, 0x17e9,
- 0x180b, 0x180d,
- 0x1810, 0x1819,
- 0x1820, 0x1877,
- 0x1880, 0x18aa,
- 0x1900, 0x191c,
- 0x1920, 0x192b,
- 0x1930, 0x193b,
- 0x1946, 0x196d,
- 0x1970, 0x1974,
- 0x1980, 0x19a9,
- 0x19b0, 0x19c9,
- 0x19d0, 0x19d9,
- 0x1a00, 0x1a1b,
- 0x1b00, 0x1b4b,
- 0x1b50, 0x1b59,
- 0x1b6b, 0x1b73,
- 0x1b80, 0x1baa,
- 0x1bae, 0x1bb9,
- 0x1c00, 0x1c37,
- 0x1c40, 0x1c49,
- 0x1c4d, 0x1c7d,
- 0x1d00, 0x1de6,
- 0x1dfe, 0x1f15,
- 0x1f18, 0x1f1d,
- 0x1f20, 0x1f45,
- 0x1f48, 0x1f4d,
- 0x1f50, 0x1f57,
- 0x1f59, 0x1f59,
- 0x1f5b, 0x1f5b,
- 0x1f5d, 0x1f5d,
- 0x1f5f, 0x1f7d,
- 0x1f80, 0x1fb4,
- 0x1fb6, 0x1fbc,
- 0x1fbe, 0x1fbe,
- 0x1fc2, 0x1fc4,
- 0x1fc6, 0x1fcc,
- 0x1fd0, 0x1fd3,
- 0x1fd6, 0x1fdb,
- 0x1fe0, 0x1fec,
- 0x1ff2, 0x1ff4,
- 0x1ff6, 0x1ffc,
- 0x203f, 0x2040,
- 0x2054, 0x2054,
- 0x2071, 0x2071,
- 0x207f, 0x207f,
- 0x2090, 0x2094,
- 0x20d0, 0x20f0,
- 0x2102, 0x2102,
- 0x2107, 0x2107,
- 0x210a, 0x2113,
- 0x2115, 0x2115,
- 0x2119, 0x211d,
- 0x2124, 0x2124,
- 0x2126, 0x2126,
- 0x2128, 0x2128,
- 0x212a, 0x212d,
- 0x212f, 0x2139,
- 0x213c, 0x213f,
- 0x2145, 0x2149,
- 0x214e, 0x214e,
- 0x2183, 0x2184,
- 0x2c00, 0x2c2e,
- 0x2c30, 0x2c5e,
- 0x2c60, 0x2c6f,
- 0x2c71, 0x2c7d,
- 0x2c80, 0x2ce4,
- 0x2d00, 0x2d25,
- 0x2d30, 0x2d65,
- 0x2d6f, 0x2d6f,
- 0x2d80, 0x2d96,
- 0x2da0, 0x2da6,
- 0x2da8, 0x2dae,
- 0x2db0, 0x2db6,
- 0x2db8, 0x2dbe,
- 0x2dc0, 0x2dc6,
- 0x2dc8, 0x2dce,
- 0x2dd0, 0x2dd6,
- 0x2dd8, 0x2dde,
- 0x2de0, 0x2dff,
- 0x2e2f, 0x2e2f,
- 0x3005, 0x3006,
- 0x302a, 0x302f,
- 0x3031, 0x3035,
- 0x303b, 0x303c,
- 0x3041, 0x3096,
- 0x3099, 0x309a,
- 0x309d, 0x309f,
- 0x30a1, 0x30fa,
- 0x30fc, 0x30ff,
- 0x3105, 0x312d,
- 0x3131, 0x318e,
- 0x31a0, 0x31b7,
- 0x31f0, 0x31ff,
- 0x3400, 0x3400,
- 0x4db5, 0x4db5,
- 0x4e00, 0x4e00,
- 0x9fc3, 0x9fc3,
- 0xa000, 0xa48c,
- 0xa500, 0xa60c,
- 0xa610, 0xa62b,
- 0xa640, 0xa65f,
- 0xa662, 0xa672,
- 0xa67c, 0xa67d,
- 0xa67f, 0xa697,
- 0xa717, 0xa71f,
- 0xa722, 0xa788,
- 0xa78b, 0xa78c,
- 0xa7fb, 0xa827,
- 0xa840, 0xa873,
- 0xa880, 0xa8c4,
- 0xa8d0, 0xa8d9,
- 0xa900, 0xa92d,
- 0xa930, 0xa953,
- 0xaa00, 0xaa36,
- 0xaa40, 0xaa4d,
- 0xaa50, 0xaa59,
- 0xac00, 0xac00,
- 0xd7a3, 0xd7a3,
- 0xf900, 0xfa2d,
- 0xfa30, 0xfa6a,
- 0xfa70, 0xfad9,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xfb1d, 0xfb28,
- 0xfb2a, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbb1,
- 0xfbd3, 0xfd3d,
- 0xfd50, 0xfd8f,
- 0xfd92, 0xfdc7,
- 0xfdf0, 0xfdfb,
- 0xfe00, 0xfe0f,
- 0xfe20, 0xfe26,
- 0xfe33, 0xfe34,
- 0xfe4d, 0xfe4f,
- 0xfe70, 0xfe74,
- 0xfe76, 0xfefc,
- 0xff10, 0xff19,
- 0xff21, 0xff3a,
- 0xff3f, 0xff3f,
- 0xff41, 0xff5a,
- 0xff66, 0xffbe,
- 0xffc2, 0xffc7,
- 0xffca, 0xffcf,
- 0xffd2, 0xffd7,
- 0xffda, 0xffdc,
- 0x10000, 0x1000b,
- 0x1000d, 0x10026,
- 0x10028, 0x1003a,
- 0x1003c, 0x1003d,
- 0x1003f, 0x1004d,
- 0x10050, 0x1005d,
- 0x10080, 0x100fa,
- 0x101fd, 0x101fd,
- 0x10280, 0x1029c,
- 0x102a0, 0x102d0,
- 0x10300, 0x1031e,
- 0x10330, 0x10340,
- 0x10342, 0x10349,
- 0x10380, 0x1039d,
- 0x103a0, 0x103c3,
- 0x103c8, 0x103cf,
- 0x10400, 0x1049d,
- 0x104a0, 0x104a9,
- 0x10800, 0x10805,
- 0x10808, 0x10808,
- 0x1080a, 0x10835,
- 0x10837, 0x10838,
- 0x1083c, 0x1083c,
- 0x1083f, 0x1083f,
- 0x10900, 0x10915,
- 0x10920, 0x10939,
- 0x10a00, 0x10a03,
- 0x10a05, 0x10a06,
- 0x10a0c, 0x10a13,
- 0x10a15, 0x10a17,
- 0x10a19, 0x10a33,
- 0x10a38, 0x10a3a,
- 0x10a3f, 0x10a3f,
- 0x12000, 0x1236e,
- 0x1d165, 0x1d169,
- 0x1d16d, 0x1d172,
- 0x1d17b, 0x1d182,
- 0x1d185, 0x1d18b,
- 0x1d1aa, 0x1d1ad,
- 0x1d242, 0x1d244,
- 0x1d400, 0x1d454,
- 0x1d456, 0x1d49c,
- 0x1d49e, 0x1d49f,
- 0x1d4a2, 0x1d4a2,
- 0x1d4a5, 0x1d4a6,
- 0x1d4a9, 0x1d4ac,
- 0x1d4ae, 0x1d4b9,
- 0x1d4bb, 0x1d4bb,
- 0x1d4bd, 0x1d4c3,
- 0x1d4c5, 0x1d505,
- 0x1d507, 0x1d50a,
- 0x1d50d, 0x1d514,
- 0x1d516, 0x1d51c,
- 0x1d51e, 0x1d539,
- 0x1d53b, 0x1d53e,
- 0x1d540, 0x1d544,
- 0x1d546, 0x1d546,
- 0x1d54a, 0x1d550,
- 0x1d552, 0x1d6a5,
- 0x1d6a8, 0x1d6c0,
- 0x1d6c2, 0x1d6da,
- 0x1d6dc, 0x1d6fa,
- 0x1d6fc, 0x1d714,
- 0x1d716, 0x1d734,
- 0x1d736, 0x1d74e,
- 0x1d750, 0x1d76e,
- 0x1d770, 0x1d788,
- 0x1d78a, 0x1d7a8,
- 0x1d7aa, 0x1d7c2,
- 0x1d7c4, 0x1d7cb,
- 0x1d7ce, 0x1d7ff,
- 0x20000, 0x20000,
- 0x2a6d6, 0x2a6d6,
- 0x2f800, 0x2fa1d,
- 0xe0100, 0xe01ef,
-}; /* CR_Word */
-
-/* 'Alnum': [[:Alnum:]] */
-static const OnigCodePoint CR_Alnum[] = {
- 471,
- 0x0030, 0x0039,
- 0x0041, 0x005a,
- 0x0061, 0x007a,
- 0x00aa, 0x00aa,
- 0x00b5, 0x00b5,
- 0x00ba, 0x00ba,
- 0x00c0, 0x00d6,
- 0x00d8, 0x00f6,
- 0x00f8, 0x02c1,
- 0x02c6, 0x02d1,
- 0x02e0, 0x02e4,
- 0x02ec, 0x02ec,
- 0x02ee, 0x02ee,
- 0x0300, 0x0374,
- 0x0376, 0x0377,
- 0x037a, 0x037d,
- 0x0386, 0x0386,
- 0x0388, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03f5,
- 0x03f7, 0x0481,
- 0x0483, 0x0523,
- 0x0531, 0x0556,
- 0x0559, 0x0559,
- 0x0561, 0x0587,
- 0x0591, 0x05bd,
- 0x05bf, 0x05bf,
- 0x05c1, 0x05c2,
- 0x05c4, 0x05c5,
- 0x05c7, 0x05c7,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f2,
- 0x0610, 0x061a,
- 0x0621, 0x065e,
- 0x0660, 0x0669,
- 0x066e, 0x06d3,
- 0x06d5, 0x06dc,
- 0x06de, 0x06e8,
- 0x06ea, 0x06fc,
- 0x06ff, 0x06ff,
- 0x0710, 0x074a,
- 0x074d, 0x07b1,
- 0x07c0, 0x07f5,
- 0x07fa, 0x07fa,
- 0x0901, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0954,
- 0x0958, 0x0963,
- 0x0966, 0x096f,
- 0x0971, 0x0972,
- 0x097b, 0x097f,
- 0x0981, 0x0983,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bc, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09ce,
- 0x09d7, 0x09d7,
- 0x09dc, 0x09dd,
- 0x09df, 0x09e3,
- 0x09e6, 0x09f1,
- 0x0a01, 0x0a03,
- 0x0a05, 0x0a0a,
- 0x0a0f, 0x0a10,
- 0x0a13, 0x0a28,
- 0x0a2a, 0x0a30,
- 0x0a32, 0x0a33,
- 0x0a35, 0x0a36,
- 0x0a38, 0x0a39,
- 0x0a3c, 0x0a3c,
- 0x0a3e, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4d,
- 0x0a51, 0x0a51,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a66, 0x0a75,
- 0x0a81, 0x0a83,
- 0x0a85, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abc, 0x0ac5,
- 0x0ac7, 0x0ac9,
- 0x0acb, 0x0acd,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae3,
- 0x0ae6, 0x0aef,
- 0x0b01, 0x0b03,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b35, 0x0b39,
- 0x0b3c, 0x0b44,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b63,
- 0x0b66, 0x0b6f,
- 0x0b71, 0x0b71,
- 0x0b82, 0x0b83,
- 0x0b85, 0x0b8a,
- 0x0b8e, 0x0b90,
- 0x0b92, 0x0b95,
- 0x0b99, 0x0b9a,
- 0x0b9c, 0x0b9c,
- 0x0b9e, 0x0b9f,
- 0x0ba3, 0x0ba4,
- 0x0ba8, 0x0baa,
- 0x0bae, 0x0bb9,
- 0x0bbe, 0x0bc2,
- 0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcd,
- 0x0bd0, 0x0bd0,
- 0x0bd7, 0x0bd7,
- 0x0be6, 0x0bef,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3d, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c58, 0x0c59,
- 0x0c60, 0x0c63,
- 0x0c66, 0x0c6f,
- 0x0c82, 0x0c83,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbc, 0x0cc4,
- 0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccd,
- 0x0cd5, 0x0cd6,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce3,
- 0x0ce6, 0x0cef,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3d, 0x0d44,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d63,
- 0x0d66, 0x0d6f,
- 0x0d7a, 0x0d7f,
- 0x0d82, 0x0d83,
- 0x0d85, 0x0d96,
- 0x0d9a, 0x0db1,
- 0x0db3, 0x0dbb,
- 0x0dbd, 0x0dbd,
- 0x0dc0, 0x0dc6,
- 0x0dca, 0x0dca,
- 0x0dcf, 0x0dd4,
- 0x0dd6, 0x0dd6,
- 0x0dd8, 0x0ddf,
- 0x0df2, 0x0df3,
- 0x0e01, 0x0e3a,
- 0x0e40, 0x0e4e,
- 0x0e50, 0x0e59,
- 0x0e81, 0x0e82,
- 0x0e84, 0x0e84,
- 0x0e87, 0x0e88,
- 0x0e8a, 0x0e8a,
- 0x0e8d, 0x0e8d,
- 0x0e94, 0x0e97,
- 0x0e99, 0x0e9f,
- 0x0ea1, 0x0ea3,
- 0x0ea5, 0x0ea5,
- 0x0ea7, 0x0ea7,
- 0x0eaa, 0x0eab,
- 0x0ead, 0x0eb9,
- 0x0ebb, 0x0ebd,
- 0x0ec0, 0x0ec4,
- 0x0ec6, 0x0ec6,
- 0x0ec8, 0x0ecd,
- 0x0ed0, 0x0ed9,
- 0x0edc, 0x0edd,
- 0x0f00, 0x0f00,
- 0x0f18, 0x0f19,
- 0x0f20, 0x0f29,
- 0x0f35, 0x0f35,
- 0x0f37, 0x0f37,
- 0x0f39, 0x0f39,
- 0x0f3e, 0x0f47,
- 0x0f49, 0x0f6c,
- 0x0f71, 0x0f84,
- 0x0f86, 0x0f8b,
- 0x0f90, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fc6, 0x0fc6,
- 0x1000, 0x1049,
- 0x1050, 0x1099,
- 0x10a0, 0x10c5,
- 0x10d0, 0x10fa,
- 0x10fc, 0x10fc,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x1200, 0x1248,
- 0x124a, 0x124d,
- 0x1250, 0x1256,
- 0x1258, 0x1258,
- 0x125a, 0x125d,
- 0x1260, 0x1288,
- 0x128a, 0x128d,
- 0x1290, 0x12b0,
- 0x12b2, 0x12b5,
- 0x12b8, 0x12be,
- 0x12c0, 0x12c0,
- 0x12c2, 0x12c5,
- 0x12c8, 0x12d6,
- 0x12d8, 0x1310,
- 0x1312, 0x1315,
- 0x1318, 0x135a,
- 0x135f, 0x135f,
- 0x1380, 0x138f,
- 0x13a0, 0x13f4,
- 0x1401, 0x166c,
- 0x166f, 0x1676,
- 0x1681, 0x169a,
- 0x16a0, 0x16ea,
- 0x1700, 0x170c,
- 0x170e, 0x1714,
- 0x1720, 0x1734,
- 0x1740, 0x1753,
- 0x1760, 0x176c,
- 0x176e, 0x1770,
- 0x1772, 0x1773,
- 0x1780, 0x17b3,
- 0x17b6, 0x17d3,
- 0x17d7, 0x17d7,
- 0x17dc, 0x17dd,
- 0x17e0, 0x17e9,
- 0x180b, 0x180d,
- 0x1810, 0x1819,
- 0x1820, 0x1877,
- 0x1880, 0x18aa,
- 0x1900, 0x191c,
- 0x1920, 0x192b,
- 0x1930, 0x193b,
- 0x1946, 0x196d,
- 0x1970, 0x1974,
- 0x1980, 0x19a9,
- 0x19b0, 0x19c9,
- 0x19d0, 0x19d9,
- 0x1a00, 0x1a1b,
- 0x1b00, 0x1b4b,
- 0x1b50, 0x1b59,
- 0x1b6b, 0x1b73,
- 0x1b80, 0x1baa,
- 0x1bae, 0x1bb9,
- 0x1c00, 0x1c37,
- 0x1c40, 0x1c49,
- 0x1c4d, 0x1c7d,
- 0x1d00, 0x1de6,
- 0x1dfe, 0x1f15,
- 0x1f18, 0x1f1d,
- 0x1f20, 0x1f45,
- 0x1f48, 0x1f4d,
- 0x1f50, 0x1f57,
- 0x1f59, 0x1f59,
- 0x1f5b, 0x1f5b,
- 0x1f5d, 0x1f5d,
- 0x1f5f, 0x1f7d,
- 0x1f80, 0x1fb4,
- 0x1fb6, 0x1fbc,
- 0x1fbe, 0x1fbe,
- 0x1fc2, 0x1fc4,
- 0x1fc6, 0x1fcc,
- 0x1fd0, 0x1fd3,
- 0x1fd6, 0x1fdb,
- 0x1fe0, 0x1fec,
- 0x1ff2, 0x1ff4,
- 0x1ff6, 0x1ffc,
- 0x2071, 0x2071,
- 0x207f, 0x207f,
- 0x2090, 0x2094,
- 0x20d0, 0x20f0,
- 0x2102, 0x2102,
- 0x2107, 0x2107,
- 0x210a, 0x2113,
- 0x2115, 0x2115,
- 0x2119, 0x211d,
- 0x2124, 0x2124,
- 0x2126, 0x2126,
- 0x2128, 0x2128,
- 0x212a, 0x212d,
- 0x212f, 0x2139,
- 0x213c, 0x213f,
- 0x2145, 0x2149,
- 0x214e, 0x214e,
- 0x2183, 0x2184,
- 0x2c00, 0x2c2e,
- 0x2c30, 0x2c5e,
- 0x2c60, 0x2c6f,
- 0x2c71, 0x2c7d,
- 0x2c80, 0x2ce4,
- 0x2d00, 0x2d25,
- 0x2d30, 0x2d65,
- 0x2d6f, 0x2d6f,
- 0x2d80, 0x2d96,
- 0x2da0, 0x2da6,
- 0x2da8, 0x2dae,
- 0x2db0, 0x2db6,
- 0x2db8, 0x2dbe,
- 0x2dc0, 0x2dc6,
- 0x2dc8, 0x2dce,
- 0x2dd0, 0x2dd6,
- 0x2dd8, 0x2dde,
- 0x2de0, 0x2dff,
- 0x2e2f, 0x2e2f,
- 0x3005, 0x3006,
- 0x302a, 0x302f,
- 0x3031, 0x3035,
- 0x303b, 0x303c,
- 0x3041, 0x3096,
- 0x3099, 0x309a,
- 0x309d, 0x309f,
- 0x30a1, 0x30fa,
- 0x30fc, 0x30ff,
- 0x3105, 0x312d,
- 0x3131, 0x318e,
- 0x31a0, 0x31b7,
- 0x31f0, 0x31ff,
- 0x3400, 0x3400,
- 0x4db5, 0x4db5,
- 0x4e00, 0x4e00,
- 0x9fc3, 0x9fc3,
- 0xa000, 0xa48c,
- 0xa500, 0xa60c,
- 0xa610, 0xa62b,
- 0xa640, 0xa65f,
- 0xa662, 0xa672,
- 0xa67c, 0xa67d,
- 0xa67f, 0xa697,
- 0xa717, 0xa71f,
- 0xa722, 0xa788,
- 0xa78b, 0xa78c,
- 0xa7fb, 0xa827,
- 0xa840, 0xa873,
- 0xa880, 0xa8c4,
- 0xa8d0, 0xa8d9,
- 0xa900, 0xa92d,
- 0xa930, 0xa953,
- 0xaa00, 0xaa36,
- 0xaa40, 0xaa4d,
- 0xaa50, 0xaa59,
- 0xac00, 0xac00,
- 0xd7a3, 0xd7a3,
- 0xf900, 0xfa2d,
- 0xfa30, 0xfa6a,
- 0xfa70, 0xfad9,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xfb1d, 0xfb28,
- 0xfb2a, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbb1,
- 0xfbd3, 0xfd3d,
- 0xfd50, 0xfd8f,
- 0xfd92, 0xfdc7,
- 0xfdf0, 0xfdfb,
- 0xfe00, 0xfe0f,
- 0xfe20, 0xfe26,
- 0xfe70, 0xfe74,
- 0xfe76, 0xfefc,
- 0xff10, 0xff19,
- 0xff21, 0xff3a,
- 0xff41, 0xff5a,
- 0xff66, 0xffbe,
- 0xffc2, 0xffc7,
- 0xffca, 0xffcf,
- 0xffd2, 0xffd7,
- 0xffda, 0xffdc,
- 0x10000, 0x1000b,
- 0x1000d, 0x10026,
- 0x10028, 0x1003a,
- 0x1003c, 0x1003d,
- 0x1003f, 0x1004d,
- 0x10050, 0x1005d,
- 0x10080, 0x100fa,
- 0x101fd, 0x101fd,
- 0x10280, 0x1029c,
- 0x102a0, 0x102d0,
- 0x10300, 0x1031e,
- 0x10330, 0x10340,
- 0x10342, 0x10349,
- 0x10380, 0x1039d,
- 0x103a0, 0x103c3,
- 0x103c8, 0x103cf,
- 0x10400, 0x1049d,
- 0x104a0, 0x104a9,
- 0x10800, 0x10805,
- 0x10808, 0x10808,
- 0x1080a, 0x10835,
- 0x10837, 0x10838,
- 0x1083c, 0x1083c,
- 0x1083f, 0x1083f,
- 0x10900, 0x10915,
- 0x10920, 0x10939,
- 0x10a00, 0x10a03,
- 0x10a05, 0x10a06,
- 0x10a0c, 0x10a13,
- 0x10a15, 0x10a17,
- 0x10a19, 0x10a33,
- 0x10a38, 0x10a3a,
- 0x10a3f, 0x10a3f,
- 0x12000, 0x1236e,
- 0x1d165, 0x1d169,
- 0x1d16d, 0x1d172,
- 0x1d17b, 0x1d182,
- 0x1d185, 0x1d18b,
- 0x1d1aa, 0x1d1ad,
- 0x1d242, 0x1d244,
- 0x1d400, 0x1d454,
- 0x1d456, 0x1d49c,
- 0x1d49e, 0x1d49f,
- 0x1d4a2, 0x1d4a2,
- 0x1d4a5, 0x1d4a6,
- 0x1d4a9, 0x1d4ac,
- 0x1d4ae, 0x1d4b9,
- 0x1d4bb, 0x1d4bb,
- 0x1d4bd, 0x1d4c3,
- 0x1d4c5, 0x1d505,
- 0x1d507, 0x1d50a,
- 0x1d50d, 0x1d514,
- 0x1d516, 0x1d51c,
- 0x1d51e, 0x1d539,
- 0x1d53b, 0x1d53e,
- 0x1d540, 0x1d544,
- 0x1d546, 0x1d546,
- 0x1d54a, 0x1d550,
- 0x1d552, 0x1d6a5,
- 0x1d6a8, 0x1d6c0,
- 0x1d6c2, 0x1d6da,
- 0x1d6dc, 0x1d6fa,
- 0x1d6fc, 0x1d714,
- 0x1d716, 0x1d734,
- 0x1d736, 0x1d74e,
- 0x1d750, 0x1d76e,
- 0x1d770, 0x1d788,
- 0x1d78a, 0x1d7a8,
- 0x1d7aa, 0x1d7c2,
- 0x1d7c4, 0x1d7cb,
- 0x1d7ce, 0x1d7ff,
- 0x20000, 0x20000,
- 0x2a6d6, 0x2a6d6,
- 0x2f800, 0x2fa1d,
- 0xe0100, 0xe01ef,
-}; /* CR_Alnum */
-
-/* 'ASCII': [[:ASCII:]] */
-static const OnigCodePoint CR_ASCII[] = {
- 1,
- 0x0000, 0x007f,
-}; /* CR_ASCII */
-
-#ifdef USE_UNICODE_PROPERTIES
-/* 'Any': - */
-static const OnigCodePoint CR_Any[] = {
- 1,
- 0x0000, 0x10ffff,
-}; /* CR_Any */
-
-/* 'Assigned': - */
-static const OnigCodePoint CR_Assigned[] = {
- 454,
- 0x0000, 0x0377,
- 0x037a, 0x037e,
- 0x0384, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x0523,
- 0x0531, 0x0556,
- 0x0559, 0x055f,
- 0x0561, 0x0587,
- 0x0589, 0x058a,
- 0x0591, 0x05c7,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0x0600, 0x0603,
- 0x0606, 0x061b,
- 0x061e, 0x061f,
- 0x0621, 0x065e,
- 0x0660, 0x070d,
- 0x070f, 0x074a,
- 0x074d, 0x07b1,
- 0x07c0, 0x07fa,
- 0x0901, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0954,
- 0x0958, 0x0972,
- 0x097b, 0x097f,
- 0x0981, 0x0983,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bc, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09ce,
- 0x09d7, 0x09d7,
- 0x09dc, 0x09dd,
- 0x09df, 0x09e3,
- 0x09e6, 0x09fa,
- 0x0a01, 0x0a03,
- 0x0a05, 0x0a0a,
- 0x0a0f, 0x0a10,
- 0x0a13, 0x0a28,
- 0x0a2a, 0x0a30,
- 0x0a32, 0x0a33,
- 0x0a35, 0x0a36,
- 0x0a38, 0x0a39,
- 0x0a3c, 0x0a3c,
- 0x0a3e, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4d,
- 0x0a51, 0x0a51,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a66, 0x0a75,
- 0x0a81, 0x0a83,
- 0x0a85, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abc, 0x0ac5,
- 0x0ac7, 0x0ac9,
- 0x0acb, 0x0acd,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae3,
- 0x0ae6, 0x0aef,
- 0x0af1, 0x0af1,
- 0x0b01, 0x0b03,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b35, 0x0b39,
- 0x0b3c, 0x0b44,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b63,
- 0x0b66, 0x0b71,
- 0x0b82, 0x0b83,
- 0x0b85, 0x0b8a,
- 0x0b8e, 0x0b90,
- 0x0b92, 0x0b95,
- 0x0b99, 0x0b9a,
- 0x0b9c, 0x0b9c,
- 0x0b9e, 0x0b9f,
- 0x0ba3, 0x0ba4,
- 0x0ba8, 0x0baa,
- 0x0bae, 0x0bb9,
- 0x0bbe, 0x0bc2,
- 0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcd,
- 0x0bd0, 0x0bd0,
- 0x0bd7, 0x0bd7,
- 0x0be6, 0x0bfa,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3d, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c58, 0x0c59,
- 0x0c60, 0x0c63,
- 0x0c66, 0x0c6f,
- 0x0c78, 0x0c7f,
- 0x0c82, 0x0c83,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbc, 0x0cc4,
- 0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccd,
- 0x0cd5, 0x0cd6,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce3,
- 0x0ce6, 0x0cef,
- 0x0cf1, 0x0cf2,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3d, 0x0d44,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d63,
- 0x0d66, 0x0d75,
- 0x0d79, 0x0d7f,
- 0x0d82, 0x0d83,
- 0x0d85, 0x0d96,
- 0x0d9a, 0x0db1,
- 0x0db3, 0x0dbb,
- 0x0dbd, 0x0dbd,
- 0x0dc0, 0x0dc6,
- 0x0dca, 0x0dca,
- 0x0dcf, 0x0dd4,
- 0x0dd6, 0x0dd6,
- 0x0dd8, 0x0ddf,
- 0x0df2, 0x0df4,
- 0x0e01, 0x0e3a,
- 0x0e3f, 0x0e5b,
- 0x0e81, 0x0e82,
- 0x0e84, 0x0e84,
- 0x0e87, 0x0e88,
- 0x0e8a, 0x0e8a,
- 0x0e8d, 0x0e8d,
- 0x0e94, 0x0e97,
- 0x0e99, 0x0e9f,
- 0x0ea1, 0x0ea3,
- 0x0ea5, 0x0ea5,
- 0x0ea7, 0x0ea7,
- 0x0eaa, 0x0eab,
- 0x0ead, 0x0eb9,
- 0x0ebb, 0x0ebd,
- 0x0ec0, 0x0ec4,
- 0x0ec6, 0x0ec6,
- 0x0ec8, 0x0ecd,
- 0x0ed0, 0x0ed9,
- 0x0edc, 0x0edd,
- 0x0f00, 0x0f47,
- 0x0f49, 0x0f6c,
- 0x0f71, 0x0f8b,
- 0x0f90, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fbe, 0x0fcc,
- 0x0fce, 0x0fd4,
- 0x1000, 0x1099,
- 0x109e, 0x10c5,
- 0x10d0, 0x10fc,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x1200, 0x1248,
- 0x124a, 0x124d,
- 0x1250, 0x1256,
- 0x1258, 0x1258,
- 0x125a, 0x125d,
- 0x1260, 0x1288,
- 0x128a, 0x128d,
- 0x1290, 0x12b0,
- 0x12b2, 0x12b5,
- 0x12b8, 0x12be,
- 0x12c0, 0x12c0,
- 0x12c2, 0x12c5,
- 0x12c8, 0x12d6,
- 0x12d8, 0x1310,
- 0x1312, 0x1315,
- 0x1318, 0x135a,
- 0x135f, 0x137c,
- 0x1380, 0x1399,
- 0x13a0, 0x13f4,
- 0x1401, 0x1676,
- 0x1680, 0x169c,
- 0x16a0, 0x16f0,
- 0x1700, 0x170c,
- 0x170e, 0x1714,
- 0x1720, 0x1736,
- 0x1740, 0x1753,
- 0x1760, 0x176c,
- 0x176e, 0x1770,
- 0x1772, 0x1773,
- 0x1780, 0x17dd,
- 0x17e0, 0x17e9,
- 0x17f0, 0x17f9,
- 0x1800, 0x180e,
- 0x1810, 0x1819,
- 0x1820, 0x1877,
- 0x1880, 0x18aa,
- 0x1900, 0x191c,
- 0x1920, 0x192b,
- 0x1930, 0x193b,
- 0x1940, 0x1940,
- 0x1944, 0x196d,
- 0x1970, 0x1974,
- 0x1980, 0x19a9,
- 0x19b0, 0x19c9,
- 0x19d0, 0x19d9,
- 0x19de, 0x1a1b,
- 0x1a1e, 0x1a1f,
- 0x1b00, 0x1b4b,
- 0x1b50, 0x1b7c,
- 0x1b80, 0x1baa,
- 0x1bae, 0x1bb9,
- 0x1c00, 0x1c37,
- 0x1c3b, 0x1c49,
- 0x1c4d, 0x1c7f,
- 0x1d00, 0x1de6,
- 0x1dfe, 0x1f15,
- 0x1f18, 0x1f1d,
- 0x1f20, 0x1f45,
- 0x1f48, 0x1f4d,
- 0x1f50, 0x1f57,
- 0x1f59, 0x1f59,
- 0x1f5b, 0x1f5b,
- 0x1f5d, 0x1f5d,
- 0x1f5f, 0x1f7d,
- 0x1f80, 0x1fb4,
- 0x1fb6, 0x1fc4,
- 0x1fc6, 0x1fd3,
- 0x1fd6, 0x1fdb,
- 0x1fdd, 0x1fef,
- 0x1ff2, 0x1ff4,
- 0x1ff6, 0x1ffe,
- 0x2000, 0x2064,
- 0x206a, 0x2071,
- 0x2074, 0x208e,
- 0x2090, 0x2094,
- 0x20a0, 0x20b5,
- 0x20d0, 0x20f0,
- 0x2100, 0x214f,
- 0x2153, 0x2188,
- 0x2190, 0x23e7,
- 0x2400, 0x2426,
- 0x2440, 0x244a,
- 0x2460, 0x269d,
- 0x26a0, 0x26bc,
- 0x26c0, 0x26c3,
- 0x2701, 0x2704,
- 0x2706, 0x2709,
- 0x270c, 0x2727,
- 0x2729, 0x274b,
- 0x274d, 0x274d,
- 0x274f, 0x2752,
- 0x2756, 0x2756,
- 0x2758, 0x275e,
- 0x2761, 0x2794,
- 0x2798, 0x27af,
- 0x27b1, 0x27be,
- 0x27c0, 0x27ca,
- 0x27cc, 0x27cc,
- 0x27d0, 0x2b4c,
- 0x2b50, 0x2b54,
- 0x2c00, 0x2c2e,
- 0x2c30, 0x2c5e,
- 0x2c60, 0x2c6f,
- 0x2c71, 0x2c7d,
- 0x2c80, 0x2cea,
- 0x2cf9, 0x2d25,
- 0x2d30, 0x2d65,
- 0x2d6f, 0x2d6f,
- 0x2d80, 0x2d96,
- 0x2da0, 0x2da6,
- 0x2da8, 0x2dae,
- 0x2db0, 0x2db6,
- 0x2db8, 0x2dbe,
- 0x2dc0, 0x2dc6,
- 0x2dc8, 0x2dce,
- 0x2dd0, 0x2dd6,
- 0x2dd8, 0x2dde,
- 0x2de0, 0x2e30,
- 0x2e80, 0x2e99,
- 0x2e9b, 0x2ef3,
- 0x2f00, 0x2fd5,
- 0x2ff0, 0x2ffb,
- 0x3000, 0x303f,
- 0x3041, 0x3096,
- 0x3099, 0x30ff,
- 0x3105, 0x312d,
- 0x3131, 0x318e,
- 0x3190, 0x31b7,
- 0x31c0, 0x31e3,
- 0x31f0, 0x321e,
- 0x3220, 0x3243,
- 0x3250, 0x32fe,
- 0x3300, 0x3400,
- 0x4db5, 0x4db5,
- 0x4dc0, 0x4e00,
- 0x9fc3, 0x9fc3,
- 0xa000, 0xa48c,
- 0xa490, 0xa4c6,
- 0xa500, 0xa62b,
- 0xa640, 0xa65f,
- 0xa662, 0xa673,
- 0xa67c, 0xa697,
- 0xa700, 0xa78c,
- 0xa7fb, 0xa82b,
- 0xa840, 0xa877,
- 0xa880, 0xa8c4,
- 0xa8ce, 0xa8d9,
- 0xa900, 0xa953,
- 0xa95f, 0xa95f,
- 0xaa00, 0xaa36,
- 0xaa40, 0xaa4d,
- 0xaa50, 0xaa59,
- 0xaa5c, 0xaa5f,
- 0xac00, 0xac00,
- 0xd7a3, 0xd7a3,
- 0xd800, 0xd800,
- 0xdb7f, 0xdb80,
- 0xdbff, 0xdc00,
- 0xdfff, 0xe000,
- 0xf8ff, 0xfa2d,
- 0xfa30, 0xfa6a,
- 0xfa70, 0xfad9,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xfb1d, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbb1,
- 0xfbd3, 0xfd3f,
- 0xfd50, 0xfd8f,
- 0xfd92, 0xfdc7,
- 0xfdf0, 0xfdfd,
- 0xfe00, 0xfe19,
- 0xfe20, 0xfe26,
- 0xfe30, 0xfe52,
- 0xfe54, 0xfe66,
- 0xfe68, 0xfe6b,
- 0xfe70, 0xfe74,
- 0xfe76, 0xfefc,
- 0xfeff, 0xfeff,
- 0xff01, 0xffbe,
- 0xffc2, 0xffc7,
- 0xffca, 0xffcf,
- 0xffd2, 0xffd7,
- 0xffda, 0xffdc,
- 0xffe0, 0xffe6,
- 0xffe8, 0xffee,
- 0xfff9, 0xfffd,
- 0x10000, 0x1000b,
- 0x1000d, 0x10026,
- 0x10028, 0x1003a,
- 0x1003c, 0x1003d,
- 0x1003f, 0x1004d,
- 0x10050, 0x1005d,
- 0x10080, 0x100fa,
- 0x10100, 0x10102,
- 0x10107, 0x10133,
- 0x10137, 0x1018a,
- 0x10190, 0x1019b,
- 0x101d0, 0x101fd,
- 0x10280, 0x1029c,
- 0x102a0, 0x102d0,
- 0x10300, 0x1031e,
- 0x10320, 0x10323,
- 0x10330, 0x1034a,
- 0x10380, 0x1039d,
- 0x1039f, 0x103c3,
- 0x103c8, 0x103d5,
- 0x10400, 0x1049d,
- 0x104a0, 0x104a9,
- 0x10800, 0x10805,
- 0x10808, 0x10808,
- 0x1080a, 0x10835,
- 0x10837, 0x10838,
- 0x1083c, 0x1083c,
- 0x1083f, 0x1083f,
- 0x10900, 0x10919,
- 0x1091f, 0x10939,
- 0x1093f, 0x1093f,
- 0x10a00, 0x10a03,
- 0x10a05, 0x10a06,
- 0x10a0c, 0x10a13,
- 0x10a15, 0x10a17,
- 0x10a19, 0x10a33,
- 0x10a38, 0x10a3a,
- 0x10a3f, 0x10a47,
- 0x10a50, 0x10a58,
- 0x12000, 0x1236e,
- 0x12400, 0x12462,
- 0x12470, 0x12473,
- 0x1d000, 0x1d0f5,
- 0x1d100, 0x1d126,
- 0x1d129, 0x1d1dd,
- 0x1d200, 0x1d245,
- 0x1d300, 0x1d356,
- 0x1d360, 0x1d371,
- 0x1d400, 0x1d454,
- 0x1d456, 0x1d49c,
- 0x1d49e, 0x1d49f,
- 0x1d4a2, 0x1d4a2,
- 0x1d4a5, 0x1d4a6,
- 0x1d4a9, 0x1d4ac,
- 0x1d4ae, 0x1d4b9,
- 0x1d4bb, 0x1d4bb,
- 0x1d4bd, 0x1d4c3,
- 0x1d4c5, 0x1d505,
- 0x1d507, 0x1d50a,
- 0x1d50d, 0x1d514,
- 0x1d516, 0x1d51c,
- 0x1d51e, 0x1d539,
- 0x1d53b, 0x1d53e,
- 0x1d540, 0x1d544,
- 0x1d546, 0x1d546,
- 0x1d54a, 0x1d550,
- 0x1d552, 0x1d6a5,
- 0x1d6a8, 0x1d7cb,
- 0x1d7ce, 0x1d7ff,
- 0x1f000, 0x1f02b,
- 0x1f030, 0x1f093,
- 0x20000, 0x20000,
- 0x2a6d6, 0x2a6d6,
- 0x2f800, 0x2fa1d,
- 0xe0001, 0xe0001,
- 0xe0020, 0xe007f,
- 0xe0100, 0xe01ef,
- 0xf0000, 0xf0000,
- 0xffffd, 0xffffd,
- 0x100000, 0x100000,
-}; /* CR_Assigned */
-
-/* 'C': Major Category */
-static const OnigCodePoint CR_C[] = {
- 25,
- 0x0000, 0x001f,
- 0x007f, 0x009f,
- 0x00ad, 0x00ad,
- 0x0600, 0x0603,
- 0x06dd, 0x06dd,
- 0x070f, 0x070f,
- 0x17b4, 0x17b5,
- 0x200b, 0x200f,
- 0x202a, 0x202e,
- 0x2060, 0x2064,
- 0x206a, 0x206f,
- 0xd800, 0xd800,
- 0xdb7f, 0xdb80,
- 0xdbff, 0xdc00,
- 0xdfff, 0xe000,
- 0xf8ff, 0xf8ff,
- 0xfeff, 0xfeff,
- 0xfff9, 0xfffb,
- 0x1d173, 0x1d17a,
- 0xe0001, 0xe0001,
- 0xe0020, 0xe007f,
- 0xf0000, 0xf0000,
- 0xffffd, 0xffffd,
- 0x100000, 0x100000,
- 0x10fffd, 0x10ffff,
-}; /* CR_C */
-
-/* 'Cc': General Category */
-static const OnigCodePoint CR_Cc[] = {
- 2,
- 0x0000, 0x001f,
- 0x007f, 0x009f,
-}; /* CR_Cc */
-
-/* 'Cf': General Category */
-static const OnigCodePoint CR_Cf[] = {
- 14,
- 0x00ad, 0x00ad,
- 0x0600, 0x0603,
- 0x06dd, 0x06dd,
- 0x070f, 0x070f,
- 0x17b4, 0x17b5,
- 0x200b, 0x200f,
- 0x202a, 0x202e,
- 0x2060, 0x2064,
- 0x206a, 0x206f,
- 0xfeff, 0xfeff,
- 0xfff9, 0xfffb,
- 0x1d173, 0x1d17a,
- 0xe0001, 0xe0001,
- 0xe0020, 0xe007f,
-}; /* CR_Cf */
-
-/* 'Cn': General Category */
-static const OnigCodePoint CR_Cn[] = {
- 454,
- 0x0378, 0x0379,
- 0x037f, 0x0383,
- 0x038b, 0x038b,
- 0x038d, 0x038d,
- 0x03a2, 0x03a2,
- 0x0524, 0x0530,
- 0x0557, 0x0558,
- 0x0560, 0x0560,
- 0x0588, 0x0588,
- 0x058b, 0x0590,
- 0x05c8, 0x05cf,
- 0x05eb, 0x05ef,
- 0x05f5, 0x05ff,
- 0x0604, 0x0605,
- 0x061c, 0x061d,
- 0x0620, 0x0620,
- 0x065f, 0x065f,
- 0x070e, 0x070e,
- 0x074b, 0x074c,
- 0x07b2, 0x07bf,
- 0x07fb, 0x0900,
- 0x093a, 0x093b,
- 0x094e, 0x094f,
- 0x0955, 0x0957,
- 0x0973, 0x097a,
- 0x0980, 0x0980,
- 0x0984, 0x0984,
- 0x098d, 0x098e,
- 0x0991, 0x0992,
- 0x09a9, 0x09a9,
- 0x09b1, 0x09b1,
- 0x09b3, 0x09b5,
- 0x09ba, 0x09bb,
- 0x09c5, 0x09c6,
- 0x09c9, 0x09ca,
- 0x09cf, 0x09d6,
- 0x09d8, 0x09db,
- 0x09de, 0x09de,
- 0x09e4, 0x09e5,
- 0x09fb, 0x0a00,
- 0x0a04, 0x0a04,
- 0x0a0b, 0x0a0e,
- 0x0a11, 0x0a12,
- 0x0a29, 0x0a29,
- 0x0a31, 0x0a31,
- 0x0a34, 0x0a34,
- 0x0a37, 0x0a37,
- 0x0a3a, 0x0a3b,
- 0x0a3d, 0x0a3d,
- 0x0a43, 0x0a46,
- 0x0a49, 0x0a4a,
- 0x0a4e, 0x0a50,
- 0x0a52, 0x0a58,
- 0x0a5d, 0x0a5d,
- 0x0a5f, 0x0a65,
- 0x0a76, 0x0a80,
- 0x0a84, 0x0a84,
- 0x0a8e, 0x0a8e,
- 0x0a92, 0x0a92,
- 0x0aa9, 0x0aa9,
- 0x0ab1, 0x0ab1,
- 0x0ab4, 0x0ab4,
- 0x0aba, 0x0abb,
- 0x0ac6, 0x0ac6,
- 0x0aca, 0x0aca,
- 0x0ace, 0x0acf,
- 0x0ad1, 0x0adf,
- 0x0ae4, 0x0ae5,
- 0x0af0, 0x0af0,
- 0x0af2, 0x0b00,
- 0x0b04, 0x0b04,
- 0x0b0d, 0x0b0e,
- 0x0b11, 0x0b12,
- 0x0b29, 0x0b29,
- 0x0b31, 0x0b31,
- 0x0b34, 0x0b34,
- 0x0b3a, 0x0b3b,
- 0x0b45, 0x0b46,
- 0x0b49, 0x0b4a,
- 0x0b4e, 0x0b55,
- 0x0b58, 0x0b5b,
- 0x0b5e, 0x0b5e,
- 0x0b64, 0x0b65,
- 0x0b72, 0x0b81,
- 0x0b84, 0x0b84,
- 0x0b8b, 0x0b8d,
- 0x0b91, 0x0b91,
- 0x0b96, 0x0b98,
- 0x0b9b, 0x0b9b,
- 0x0b9d, 0x0b9d,
- 0x0ba0, 0x0ba2,
- 0x0ba5, 0x0ba7,
- 0x0bab, 0x0bad,
- 0x0bba, 0x0bbd,
- 0x0bc3, 0x0bc5,
- 0x0bc9, 0x0bc9,
- 0x0bce, 0x0bcf,
- 0x0bd1, 0x0bd6,
- 0x0bd8, 0x0be5,
- 0x0bfb, 0x0c00,
- 0x0c04, 0x0c04,
- 0x0c0d, 0x0c0d,
- 0x0c11, 0x0c11,
- 0x0c29, 0x0c29,
- 0x0c34, 0x0c34,
- 0x0c3a, 0x0c3c,
- 0x0c45, 0x0c45,
- 0x0c49, 0x0c49,
- 0x0c4e, 0x0c54,
- 0x0c57, 0x0c57,
- 0x0c5a, 0x0c5f,
- 0x0c64, 0x0c65,
- 0x0c70, 0x0c77,
- 0x0c80, 0x0c81,
- 0x0c84, 0x0c84,
- 0x0c8d, 0x0c8d,
- 0x0c91, 0x0c91,
- 0x0ca9, 0x0ca9,
- 0x0cb4, 0x0cb4,
- 0x0cba, 0x0cbb,
- 0x0cc5, 0x0cc5,
- 0x0cc9, 0x0cc9,
- 0x0cce, 0x0cd4,
- 0x0cd7, 0x0cdd,
- 0x0cdf, 0x0cdf,
- 0x0ce4, 0x0ce5,
- 0x0cf0, 0x0cf0,
- 0x0cf3, 0x0d01,
- 0x0d04, 0x0d04,
- 0x0d0d, 0x0d0d,
- 0x0d11, 0x0d11,
- 0x0d29, 0x0d29,
- 0x0d3a, 0x0d3c,
- 0x0d45, 0x0d45,
- 0x0d49, 0x0d49,
- 0x0d4e, 0x0d56,
- 0x0d58, 0x0d5f,
- 0x0d64, 0x0d65,
- 0x0d76, 0x0d78,
- 0x0d80, 0x0d81,
- 0x0d84, 0x0d84,
- 0x0d97, 0x0d99,
- 0x0db2, 0x0db2,
- 0x0dbc, 0x0dbc,
- 0x0dbe, 0x0dbf,
- 0x0dc7, 0x0dc9,
- 0x0dcb, 0x0dce,
- 0x0dd5, 0x0dd5,
- 0x0dd7, 0x0dd7,
- 0x0de0, 0x0df1,
- 0x0df5, 0x0e00,
- 0x0e3b, 0x0e3e,
- 0x0e5c, 0x0e80,
- 0x0e83, 0x0e83,
- 0x0e85, 0x0e86,
- 0x0e89, 0x0e89,
- 0x0e8b, 0x0e8c,
- 0x0e8e, 0x0e93,
- 0x0e98, 0x0e98,
- 0x0ea0, 0x0ea0,
- 0x0ea4, 0x0ea4,
- 0x0ea6, 0x0ea6,
- 0x0ea8, 0x0ea9,
- 0x0eac, 0x0eac,
- 0x0eba, 0x0eba,
- 0x0ebe, 0x0ebf,
- 0x0ec5, 0x0ec5,
- 0x0ec7, 0x0ec7,
- 0x0ece, 0x0ecf,
- 0x0eda, 0x0edb,
- 0x0ede, 0x0eff,
- 0x0f48, 0x0f48,
- 0x0f6d, 0x0f70,
- 0x0f8c, 0x0f8f,
- 0x0f98, 0x0f98,
- 0x0fbd, 0x0fbd,
- 0x0fcd, 0x0fcd,
- 0x0fd5, 0x0fff,
- 0x109a, 0x109d,
- 0x10c6, 0x10cf,
- 0x10fd, 0x10ff,
- 0x115a, 0x115e,
- 0x11a3, 0x11a7,
- 0x11fa, 0x11ff,
- 0x1249, 0x1249,
- 0x124e, 0x124f,
- 0x1257, 0x1257,
- 0x1259, 0x1259,
- 0x125e, 0x125f,
- 0x1289, 0x1289,
- 0x128e, 0x128f,
- 0x12b1, 0x12b1,
- 0x12b6, 0x12b7,
- 0x12bf, 0x12bf,
- 0x12c1, 0x12c1,
- 0x12c6, 0x12c7,
- 0x12d7, 0x12d7,
- 0x1311, 0x1311,
- 0x1316, 0x1317,
- 0x135b, 0x135e,
- 0x137d, 0x137f,
- 0x139a, 0x139f,
- 0x13f5, 0x1400,
- 0x1677, 0x167f,
- 0x169d, 0x169f,
- 0x16f1, 0x16ff,
- 0x170d, 0x170d,
- 0x1715, 0x171f,
- 0x1737, 0x173f,
- 0x1754, 0x175f,
- 0x176d, 0x176d,
- 0x1771, 0x1771,
- 0x1774, 0x177f,
- 0x17de, 0x17df,
- 0x17ea, 0x17ef,
- 0x17fa, 0x17ff,
- 0x180f, 0x180f,
- 0x181a, 0x181f,
- 0x1878, 0x187f,
- 0x18ab, 0x18ff,
- 0x191d, 0x191f,
- 0x192c, 0x192f,
- 0x193c, 0x193f,
- 0x1941, 0x1943,
- 0x196e, 0x196f,
- 0x1975, 0x197f,
- 0x19aa, 0x19af,
- 0x19ca, 0x19cf,
- 0x19da, 0x19dd,
- 0x1a1c, 0x1a1d,
- 0x1a20, 0x1aff,
- 0x1b4c, 0x1b4f,
- 0x1b7d, 0x1b7f,
- 0x1bab, 0x1bad,
- 0x1bba, 0x1bff,
- 0x1c38, 0x1c3a,
- 0x1c4a, 0x1c4c,
- 0x1c80, 0x1cff,
- 0x1de7, 0x1dfd,
- 0x1f16, 0x1f17,
- 0x1f1e, 0x1f1f,
- 0x1f46, 0x1f47,
- 0x1f4e, 0x1f4f,
- 0x1f58, 0x1f58,
- 0x1f5a, 0x1f5a,
- 0x1f5c, 0x1f5c,
- 0x1f5e, 0x1f5e,
- 0x1f7e, 0x1f7f,
- 0x1fb5, 0x1fb5,
- 0x1fc5, 0x1fc5,
- 0x1fd4, 0x1fd5,
- 0x1fdc, 0x1fdc,
- 0x1ff0, 0x1ff1,
- 0x1ff5, 0x1ff5,
- 0x1fff, 0x1fff,
- 0x2065, 0x2069,
- 0x2072, 0x2073,
- 0x208f, 0x208f,
- 0x2095, 0x209f,
- 0x20b6, 0x20cf,
- 0x20f1, 0x20ff,
- 0x2150, 0x2152,
- 0x2189, 0x218f,
- 0x23e8, 0x23ff,
- 0x2427, 0x243f,
- 0x244b, 0x245f,
- 0x269e, 0x269f,
- 0x26bd, 0x26bf,
- 0x26c4, 0x2700,
- 0x2705, 0x2705,
- 0x270a, 0x270b,
- 0x2728, 0x2728,
- 0x274c, 0x274c,
- 0x274e, 0x274e,
- 0x2753, 0x2755,
- 0x2757, 0x2757,
- 0x275f, 0x2760,
- 0x2795, 0x2797,
- 0x27b0, 0x27b0,
- 0x27bf, 0x27bf,
- 0x27cb, 0x27cb,
- 0x27cd, 0x27cf,
- 0x2b4d, 0x2b4f,
- 0x2b55, 0x2bff,
- 0x2c2f, 0x2c2f,
- 0x2c5f, 0x2c5f,
- 0x2c70, 0x2c70,
- 0x2c7e, 0x2c7f,
- 0x2ceb, 0x2cf8,
- 0x2d26, 0x2d2f,
- 0x2d66, 0x2d6e,
- 0x2d70, 0x2d7f,
- 0x2d97, 0x2d9f,
- 0x2da7, 0x2da7,
- 0x2daf, 0x2daf,
- 0x2db7, 0x2db7,
- 0x2dbf, 0x2dbf,
- 0x2dc7, 0x2dc7,
- 0x2dcf, 0x2dcf,
- 0x2dd7, 0x2dd7,
- 0x2ddf, 0x2ddf,
- 0x2e31, 0x2e7f,
- 0x2e9a, 0x2e9a,
- 0x2ef4, 0x2eff,
- 0x2fd6, 0x2fef,
- 0x2ffc, 0x2fff,
- 0x3040, 0x3040,
- 0x3097, 0x3098,
- 0x3100, 0x3104,
- 0x312e, 0x3130,
- 0x318f, 0x318f,
- 0x31b8, 0x31bf,
- 0x31e4, 0x31ef,
- 0x321f, 0x321f,
- 0x3244, 0x324f,
- 0x32ff, 0x32ff,
- 0x3401, 0x4db4,
- 0x4db6, 0x4dbf,
- 0x4e01, 0x9fc2,
- 0x9fc4, 0x9fff,
- 0xa48d, 0xa48f,
- 0xa4c7, 0xa4ff,
- 0xa62c, 0xa63f,
- 0xa660, 0xa661,
- 0xa674, 0xa67b,
- 0xa698, 0xa6ff,
- 0xa78d, 0xa7fa,
- 0xa82c, 0xa83f,
- 0xa878, 0xa87f,
- 0xa8c5, 0xa8cd,
- 0xa8da, 0xa8ff,
- 0xa954, 0xa95e,
- 0xa960, 0xa9ff,
- 0xaa37, 0xaa3f,
- 0xaa4e, 0xaa4f,
- 0xaa5a, 0xaa5b,
- 0xaa60, 0xabff,
- 0xac01, 0xd7a2,
- 0xd7a4, 0xd7ff,
- 0xd801, 0xdb7e,
- 0xdb81, 0xdbfe,
- 0xdc01, 0xdffe,
- 0xe001, 0xf8fe,
- 0xfa2e, 0xfa2f,
- 0xfa6b, 0xfa6f,
- 0xfada, 0xfaff,
- 0xfb07, 0xfb12,
- 0xfb18, 0xfb1c,
- 0xfb37, 0xfb37,
- 0xfb3d, 0xfb3d,
- 0xfb3f, 0xfb3f,
- 0xfb42, 0xfb42,
- 0xfb45, 0xfb45,
- 0xfbb2, 0xfbd2,
- 0xfd40, 0xfd4f,
- 0xfd90, 0xfd91,
- 0xfdc8, 0xfdef,
- 0xfdfe, 0xfdff,
- 0xfe1a, 0xfe1f,
- 0xfe27, 0xfe2f,
- 0xfe53, 0xfe53,
- 0xfe67, 0xfe67,
- 0xfe6c, 0xfe6f,
- 0xfe75, 0xfe75,
- 0xfefd, 0xfefe,
- 0xff00, 0xff00,
- 0xffbf, 0xffc1,
- 0xffc8, 0xffc9,
- 0xffd0, 0xffd1,
- 0xffd8, 0xffd9,
- 0xffdd, 0xffdf,
- 0xffe7, 0xffe7,
- 0xffef, 0xfff8,
- 0xfffe, 0xffff,
- 0x1000c, 0x1000c,
- 0x10027, 0x10027,
- 0x1003b, 0x1003b,
- 0x1003e, 0x1003e,
- 0x1004e, 0x1004f,
- 0x1005e, 0x1007f,
- 0x100fb, 0x100ff,
- 0x10103, 0x10106,
- 0x10134, 0x10136,
- 0x1018b, 0x1018f,
- 0x1019c, 0x101cf,
- 0x101fe, 0x1027f,
- 0x1029d, 0x1029f,
- 0x102d1, 0x102ff,
- 0x1031f, 0x1031f,
- 0x10324, 0x1032f,
- 0x1034b, 0x1037f,
- 0x1039e, 0x1039e,
- 0x103c4, 0x103c7,
- 0x103d6, 0x103ff,
- 0x1049e, 0x1049f,
- 0x104aa, 0x107ff,
- 0x10806, 0x10807,
- 0x10809, 0x10809,
- 0x10836, 0x10836,
- 0x10839, 0x1083b,
- 0x1083d, 0x1083e,
- 0x10840, 0x108ff,
- 0x1091a, 0x1091e,
- 0x1093a, 0x1093e,
- 0x10940, 0x109ff,
- 0x10a04, 0x10a04,
- 0x10a07, 0x10a0b,
- 0x10a14, 0x10a14,
- 0x10a18, 0x10a18,
- 0x10a34, 0x10a37,
- 0x10a3b, 0x10a3e,
- 0x10a48, 0x10a4f,
- 0x10a59, 0x11fff,
- 0x1236f, 0x123ff,
- 0x12463, 0x1246f,
- 0x12474, 0x1cfff,
- 0x1d0f6, 0x1d0ff,
- 0x1d127, 0x1d128,
- 0x1d1de, 0x1d1ff,
- 0x1d246, 0x1d2ff,
- 0x1d357, 0x1d35f,
- 0x1d372, 0x1d3ff,
- 0x1d455, 0x1d455,
- 0x1d49d, 0x1d49d,
- 0x1d4a0, 0x1d4a1,
- 0x1d4a3, 0x1d4a4,
- 0x1d4a7, 0x1d4a8,
- 0x1d4ad, 0x1d4ad,
- 0x1d4ba, 0x1d4ba,
- 0x1d4bc, 0x1d4bc,
- 0x1d4c4, 0x1d4c4,
- 0x1d506, 0x1d506,
- 0x1d50b, 0x1d50c,
- 0x1d515, 0x1d515,
- 0x1d51d, 0x1d51d,
- 0x1d53a, 0x1d53a,
- 0x1d53f, 0x1d53f,
- 0x1d545, 0x1d545,
- 0x1d547, 0x1d549,
- 0x1d551, 0x1d551,
- 0x1d6a6, 0x1d6a7,
- 0x1d7cc, 0x1d7cd,
- 0x1d800, 0x1efff,
- 0x1f02c, 0x1f02f,
- 0x1f094, 0x1ffff,
- 0x20001, 0x2a6d5,
- 0x2a6d7, 0x2f7ff,
- 0x2fa1e, 0xe0000,
- 0xe0002, 0xe001f,
- 0xe0080, 0xe00ff,
- 0xe01f0, 0xeffff,
- 0xf0001, 0xffffc,
- 0xffffe, 0xfffff,
- 0x100001, 0x10ffff,
-}; /* CR_Cn */
-
-/* 'Co': General Category */
-static const OnigCodePoint CR_Co[] = {
- 6,
- 0xe000, 0xe000,
- 0xf8ff, 0xf8ff,
- 0xf0000, 0xf0000,
- 0xffffd, 0xffffd,
- 0x100000, 0x100000,
- 0x10fffd, 0x10fffd,
-}; /* CR_Co */
-
-/* 'Cs': General Category */
-static const OnigCodePoint CR_Cs[] = {
- 4,
- 0xd800, 0xd800,
- 0xdb7f, 0xdb80,
- 0xdbff, 0xdc00,
- 0xdfff, 0xdfff,
-}; /* CR_Cs */
-
-/* 'L': Major Category */
-static const OnigCodePoint CR_L[] = {
- 394,
- 0x0041, 0x005a,
- 0x0061, 0x007a,
- 0x00aa, 0x00aa,
- 0x00b5, 0x00b5,
- 0x00ba, 0x00ba,
- 0x00c0, 0x00d6,
- 0x00d8, 0x00f6,
- 0x00f8, 0x02c1,
- 0x02c6, 0x02d1,
- 0x02e0, 0x02e4,
- 0x02ec, 0x02ec,
- 0x02ee, 0x02ee,
- 0x0370, 0x0374,
- 0x0376, 0x0377,
- 0x037a, 0x037d,
- 0x0386, 0x0386,
- 0x0388, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03f5,
- 0x03f7, 0x0481,
- 0x048a, 0x0523,
- 0x0531, 0x0556,
- 0x0559, 0x0559,
- 0x0561, 0x0587,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f2,
- 0x0621, 0x064a,
- 0x066e, 0x066f,
- 0x0671, 0x06d3,
- 0x06d5, 0x06d5,
- 0x06e5, 0x06e6,
- 0x06ee, 0x06ef,
- 0x06fa, 0x06fc,
- 0x06ff, 0x06ff,
- 0x0710, 0x0710,
- 0x0712, 0x072f,
- 0x074d, 0x07a5,
- 0x07b1, 0x07b1,
- 0x07ca, 0x07ea,
- 0x07f4, 0x07f5,
- 0x07fa, 0x07fa,
- 0x0904, 0x0939,
- 0x093d, 0x093d,
- 0x0950, 0x0950,
- 0x0958, 0x0961,
- 0x0971, 0x0972,
- 0x097b, 0x097f,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bd, 0x09bd,
- 0x09ce, 0x09ce,
- 0x09dc, 0x09dd,
- 0x09df, 0x09e1,
- 0x09f0, 0x09f1,
- 0x0a05, 0x0a0a,
- 0x0a0f, 0x0a10,
- 0x0a13, 0x0a28,
- 0x0a2a, 0x0a30,
- 0x0a32, 0x0a33,
- 0x0a35, 0x0a36,
- 0x0a38, 0x0a39,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a72, 0x0a74,
- 0x0a85, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abd, 0x0abd,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae1,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b35, 0x0b39,
- 0x0b3d, 0x0b3d,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b61,
- 0x0b71, 0x0b71,
- 0x0b83, 0x0b83,
- 0x0b85, 0x0b8a,
- 0x0b8e, 0x0b90,
- 0x0b92, 0x0b95,
- 0x0b99, 0x0b9a,
- 0x0b9c, 0x0b9c,
- 0x0b9e, 0x0b9f,
- 0x0ba3, 0x0ba4,
- 0x0ba8, 0x0baa,
- 0x0bae, 0x0bb9,
- 0x0bd0, 0x0bd0,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3d, 0x0c3d,
- 0x0c58, 0x0c59,
- 0x0c60, 0x0c61,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbd, 0x0cbd,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce1,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3d, 0x0d3d,
- 0x0d60, 0x0d61,
- 0x0d7a, 0x0d7f,
- 0x0d85, 0x0d96,
- 0x0d9a, 0x0db1,
- 0x0db3, 0x0dbb,
- 0x0dbd, 0x0dbd,
- 0x0dc0, 0x0dc6,
- 0x0e01, 0x0e30,
- 0x0e32, 0x0e33,
- 0x0e40, 0x0e46,
- 0x0e81, 0x0e82,
- 0x0e84, 0x0e84,
- 0x0e87, 0x0e88,
- 0x0e8a, 0x0e8a,
- 0x0e8d, 0x0e8d,
- 0x0e94, 0x0e97,
- 0x0e99, 0x0e9f,
- 0x0ea1, 0x0ea3,
- 0x0ea5, 0x0ea5,
- 0x0ea7, 0x0ea7,
- 0x0eaa, 0x0eab,
- 0x0ead, 0x0eb0,
- 0x0eb2, 0x0eb3,
- 0x0ebd, 0x0ebd,
- 0x0ec0, 0x0ec4,
- 0x0ec6, 0x0ec6,
- 0x0edc, 0x0edd,
- 0x0f00, 0x0f00,
- 0x0f40, 0x0f47,
- 0x0f49, 0x0f6c,
- 0x0f88, 0x0f8b,
- 0x1000, 0x102a,
- 0x103f, 0x103f,
- 0x1050, 0x1055,
- 0x105a, 0x105d,
- 0x1061, 0x1061,
- 0x1065, 0x1066,
- 0x106e, 0x1070,
- 0x1075, 0x1081,
- 0x108e, 0x108e,
- 0x10a0, 0x10c5,
- 0x10d0, 0x10fa,
- 0x10fc, 0x10fc,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x1200, 0x1248,
- 0x124a, 0x124d,
- 0x1250, 0x1256,
- 0x1258, 0x1258,
- 0x125a, 0x125d,
- 0x1260, 0x1288,
- 0x128a, 0x128d,
- 0x1290, 0x12b0,
- 0x12b2, 0x12b5,
- 0x12b8, 0x12be,
- 0x12c0, 0x12c0,
- 0x12c2, 0x12c5,
- 0x12c8, 0x12d6,
- 0x12d8, 0x1310,
- 0x1312, 0x1315,
- 0x1318, 0x135a,
- 0x1380, 0x138f,
- 0x13a0, 0x13f4,
- 0x1401, 0x166c,
- 0x166f, 0x1676,
- 0x1681, 0x169a,
- 0x16a0, 0x16ea,
- 0x1700, 0x170c,
- 0x170e, 0x1711,
- 0x1720, 0x1731,
- 0x1740, 0x1751,
- 0x1760, 0x176c,
- 0x176e, 0x1770,
- 0x1780, 0x17b3,
- 0x17d7, 0x17d7,
- 0x17dc, 0x17dc,
- 0x1820, 0x1877,
- 0x1880, 0x18a8,
- 0x18aa, 0x18aa,
- 0x1900, 0x191c,
- 0x1950, 0x196d,
- 0x1970, 0x1974,
- 0x1980, 0x19a9,
- 0x19c1, 0x19c7,
- 0x1a00, 0x1a16,
- 0x1b05, 0x1b33,
- 0x1b45, 0x1b4b,
- 0x1b83, 0x1ba0,
- 0x1bae, 0x1baf,
- 0x1c00, 0x1c23,
- 0x1c4d, 0x1c4f,
- 0x1c5a, 0x1c7d,
- 0x1d00, 0x1dbf,
- 0x1e00, 0x1f15,
- 0x1f18, 0x1f1d,
- 0x1f20, 0x1f45,
- 0x1f48, 0x1f4d,
- 0x1f50, 0x1f57,
- 0x1f59, 0x1f59,
- 0x1f5b, 0x1f5b,
- 0x1f5d, 0x1f5d,
- 0x1f5f, 0x1f7d,
- 0x1f80, 0x1fb4,
- 0x1fb6, 0x1fbc,
- 0x1fbe, 0x1fbe,
- 0x1fc2, 0x1fc4,
- 0x1fc6, 0x1fcc,
- 0x1fd0, 0x1fd3,
- 0x1fd6, 0x1fdb,
- 0x1fe0, 0x1fec,
- 0x1ff2, 0x1ff4,
- 0x1ff6, 0x1ffc,
- 0x2071, 0x2071,
- 0x207f, 0x207f,
- 0x2090, 0x2094,
- 0x2102, 0x2102,
- 0x2107, 0x2107,
- 0x210a, 0x2113,
- 0x2115, 0x2115,
- 0x2119, 0x211d,
- 0x2124, 0x2124,
- 0x2126, 0x2126,
- 0x2128, 0x2128,
- 0x212a, 0x212d,
- 0x212f, 0x2139,
- 0x213c, 0x213f,
- 0x2145, 0x2149,
- 0x214e, 0x214e,
- 0x2183, 0x2184,
- 0x2c00, 0x2c2e,
- 0x2c30, 0x2c5e,
- 0x2c60, 0x2c6f,
- 0x2c71, 0x2c7d,
- 0x2c80, 0x2ce4,
- 0x2d00, 0x2d25,
- 0x2d30, 0x2d65,
- 0x2d6f, 0x2d6f,
- 0x2d80, 0x2d96,
- 0x2da0, 0x2da6,
- 0x2da8, 0x2dae,
- 0x2db0, 0x2db6,
- 0x2db8, 0x2dbe,
- 0x2dc0, 0x2dc6,
- 0x2dc8, 0x2dce,
- 0x2dd0, 0x2dd6,
- 0x2dd8, 0x2dde,
- 0x2e2f, 0x2e2f,
- 0x3005, 0x3006,
- 0x3031, 0x3035,
- 0x303b, 0x303c,
- 0x3041, 0x3096,
- 0x309d, 0x309f,
- 0x30a1, 0x30fa,
- 0x30fc, 0x30ff,
- 0x3105, 0x312d,
- 0x3131, 0x318e,
- 0x31a0, 0x31b7,
- 0x31f0, 0x31ff,
- 0x3400, 0x3400,
- 0x4db5, 0x4db5,
- 0x4e00, 0x4e00,
- 0x9fc3, 0x9fc3,
- 0xa000, 0xa48c,
- 0xa500, 0xa60c,
- 0xa610, 0xa61f,
- 0xa62a, 0xa62b,
- 0xa640, 0xa65f,
- 0xa662, 0xa66e,
- 0xa67f, 0xa697,
- 0xa717, 0xa71f,
- 0xa722, 0xa788,
- 0xa78b, 0xa78c,
- 0xa7fb, 0xa801,
- 0xa803, 0xa805,
- 0xa807, 0xa80a,
- 0xa80c, 0xa822,
- 0xa840, 0xa873,
- 0xa882, 0xa8b3,
- 0xa90a, 0xa925,
- 0xa930, 0xa946,
- 0xaa00, 0xaa28,
- 0xaa40, 0xaa42,
- 0xaa44, 0xaa4b,
- 0xac00, 0xac00,
- 0xd7a3, 0xd7a3,
- 0xf900, 0xfa2d,
- 0xfa30, 0xfa6a,
- 0xfa70, 0xfad9,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xfb1d, 0xfb1d,
- 0xfb1f, 0xfb28,
- 0xfb2a, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbb1,
- 0xfbd3, 0xfd3d,
- 0xfd50, 0xfd8f,
- 0xfd92, 0xfdc7,
- 0xfdf0, 0xfdfb,
- 0xfe70, 0xfe74,
- 0xfe76, 0xfefc,
- 0xff21, 0xff3a,
- 0xff41, 0xff5a,
- 0xff66, 0xffbe,
- 0xffc2, 0xffc7,
- 0xffca, 0xffcf,
- 0xffd2, 0xffd7,
- 0xffda, 0xffdc,
- 0x10000, 0x1000b,
- 0x1000d, 0x10026,
- 0x10028, 0x1003a,
- 0x1003c, 0x1003d,
- 0x1003f, 0x1004d,
- 0x10050, 0x1005d,
- 0x10080, 0x100fa,
- 0x10280, 0x1029c,
- 0x102a0, 0x102d0,
- 0x10300, 0x1031e,
- 0x10330, 0x10340,
- 0x10342, 0x10349,
- 0x10380, 0x1039d,
- 0x103a0, 0x103c3,
- 0x103c8, 0x103cf,
- 0x10400, 0x1049d,
- 0x10800, 0x10805,
- 0x10808, 0x10808,
- 0x1080a, 0x10835,
- 0x10837, 0x10838,
- 0x1083c, 0x1083c,
- 0x1083f, 0x1083f,
- 0x10900, 0x10915,
- 0x10920, 0x10939,
- 0x10a00, 0x10a00,
- 0x10a10, 0x10a13,
- 0x10a15, 0x10a17,
- 0x10a19, 0x10a33,
- 0x12000, 0x1236e,
- 0x1d400, 0x1d454,
- 0x1d456, 0x1d49c,
- 0x1d49e, 0x1d49f,
- 0x1d4a2, 0x1d4a2,
- 0x1d4a5, 0x1d4a6,
- 0x1d4a9, 0x1d4ac,
- 0x1d4ae, 0x1d4b9,
- 0x1d4bb, 0x1d4bb,
- 0x1d4bd, 0x1d4c3,
- 0x1d4c5, 0x1d505,
- 0x1d507, 0x1d50a,
- 0x1d50d, 0x1d514,
- 0x1d516, 0x1d51c,
- 0x1d51e, 0x1d539,
- 0x1d53b, 0x1d53e,
- 0x1d540, 0x1d544,
- 0x1d546, 0x1d546,
- 0x1d54a, 0x1d550,
- 0x1d552, 0x1d6a5,
- 0x1d6a8, 0x1d6c0,
- 0x1d6c2, 0x1d6da,
- 0x1d6dc, 0x1d6fa,
- 0x1d6fc, 0x1d714,
- 0x1d716, 0x1d734,
- 0x1d736, 0x1d74e,
- 0x1d750, 0x1d76e,
- 0x1d770, 0x1d788,
- 0x1d78a, 0x1d7a8,
- 0x1d7aa, 0x1d7c2,
- 0x1d7c4, 0x1d7cb,
- 0x20000, 0x20000,
- 0x2a6d6, 0x2a6d6,
- 0x2f800, 0x2fa1d,
-}; /* CR_L */
-
-/* 'Ll': General Category */
-static const OnigCodePoint CR_Ll[] = {
- 598,
- 0x0061, 0x007a,
- 0x00aa, 0x00aa,
- 0x00b5, 0x00b5,
- 0x00ba, 0x00ba,
- 0x00df, 0x00f6,
- 0x00f8, 0x00ff,
- 0x0101, 0x0101,
- 0x0103, 0x0103,
- 0x0105, 0x0105,
- 0x0107, 0x0107,
- 0x0109, 0x0109,
- 0x010b, 0x010b,
- 0x010d, 0x010d,
- 0x010f, 0x010f,
- 0x0111, 0x0111,
- 0x0113, 0x0113,
- 0x0115, 0x0115,
- 0x0117, 0x0117,
- 0x0119, 0x0119,
- 0x011b, 0x011b,
- 0x011d, 0x011d,
- 0x011f, 0x011f,
- 0x0121, 0x0121,
- 0x0123, 0x0123,
- 0x0125, 0x0125,
- 0x0127, 0x0127,
- 0x0129, 0x0129,
- 0x012b, 0x012b,
- 0x012d, 0x012d,
- 0x012f, 0x012f,
- 0x0131, 0x0131,
- 0x0133, 0x0133,
- 0x0135, 0x0135,
- 0x0137, 0x0138,
- 0x013a, 0x013a,
- 0x013c, 0x013c,
- 0x013e, 0x013e,
- 0x0140, 0x0140,
- 0x0142, 0x0142,
- 0x0144, 0x0144,
- 0x0146, 0x0146,
- 0x0148, 0x0149,
- 0x014b, 0x014b,
- 0x014d, 0x014d,
- 0x014f, 0x014f,
- 0x0151, 0x0151,
- 0x0153, 0x0153,
- 0x0155, 0x0155,
- 0x0157, 0x0157,
- 0x0159, 0x0159,
- 0x015b, 0x015b,
- 0x015d, 0x015d,
- 0x015f, 0x015f,
- 0x0161, 0x0161,
- 0x0163, 0x0163,
- 0x0165, 0x0165,
- 0x0167, 0x0167,
- 0x0169, 0x0169,
- 0x016b, 0x016b,
- 0x016d, 0x016d,
- 0x016f, 0x016f,
- 0x0171, 0x0171,
- 0x0173, 0x0173,
- 0x0175, 0x0175,
- 0x0177, 0x0177,
- 0x017a, 0x017a,
- 0x017c, 0x017c,
- 0x017e, 0x0180,
- 0x0183, 0x0183,
- 0x0185, 0x0185,
- 0x0188, 0x0188,
- 0x018c, 0x018d,
- 0x0192, 0x0192,
- 0x0195, 0x0195,
- 0x0199, 0x019b,
- 0x019e, 0x019e,
- 0x01a1, 0x01a1,
- 0x01a3, 0x01a3,
- 0x01a5, 0x01a5,
- 0x01a8, 0x01a8,
- 0x01aa, 0x01ab,
- 0x01ad, 0x01ad,
- 0x01b0, 0x01b0,
- 0x01b4, 0x01b4,
- 0x01b6, 0x01b6,
- 0x01b9, 0x01ba,
- 0x01bd, 0x01bf,
- 0x01c6, 0x01c6,
- 0x01c9, 0x01c9,
- 0x01cc, 0x01cc,
- 0x01ce, 0x01ce,
- 0x01d0, 0x01d0,
- 0x01d2, 0x01d2,
- 0x01d4, 0x01d4,
- 0x01d6, 0x01d6,
- 0x01d8, 0x01d8,
- 0x01da, 0x01da,
- 0x01dc, 0x01dd,
- 0x01df, 0x01df,
- 0x01e1, 0x01e1,
- 0x01e3, 0x01e3,
- 0x01e5, 0x01e5,
- 0x01e7, 0x01e7,
- 0x01e9, 0x01e9,
- 0x01eb, 0x01eb,
- 0x01ed, 0x01ed,
- 0x01ef, 0x01f0,
- 0x01f3, 0x01f3,
- 0x01f5, 0x01f5,
- 0x01f9, 0x01f9,
- 0x01fb, 0x01fb,
- 0x01fd, 0x01fd,
- 0x01ff, 0x01ff,
- 0x0201, 0x0201,
- 0x0203, 0x0203,
- 0x0205, 0x0205,
- 0x0207, 0x0207,
- 0x0209, 0x0209,
- 0x020b, 0x020b,
- 0x020d, 0x020d,
- 0x020f, 0x020f,
- 0x0211, 0x0211,
- 0x0213, 0x0213,
- 0x0215, 0x0215,
- 0x0217, 0x0217,
- 0x0219, 0x0219,
- 0x021b, 0x021b,
- 0x021d, 0x021d,
- 0x021f, 0x021f,
- 0x0221, 0x0221,
- 0x0223, 0x0223,
- 0x0225, 0x0225,
- 0x0227, 0x0227,
- 0x0229, 0x0229,
- 0x022b, 0x022b,
- 0x022d, 0x022d,
- 0x022f, 0x022f,
- 0x0231, 0x0231,
- 0x0233, 0x0239,
- 0x023c, 0x023c,
- 0x023f, 0x0240,
- 0x0242, 0x0242,
- 0x0247, 0x0247,
- 0x0249, 0x0249,
- 0x024b, 0x024b,
- 0x024d, 0x024d,
- 0x024f, 0x0293,
- 0x0295, 0x02af,
- 0x0371, 0x0371,
- 0x0373, 0x0373,
- 0x0377, 0x0377,
- 0x037b, 0x037d,
- 0x0390, 0x0390,
- 0x03ac, 0x03ce,
- 0x03d0, 0x03d1,
- 0x03d5, 0x03d7,
- 0x03d9, 0x03d9,
- 0x03db, 0x03db,
- 0x03dd, 0x03dd,
- 0x03df, 0x03df,
- 0x03e1, 0x03e1,
- 0x03e3, 0x03e3,
- 0x03e5, 0x03e5,
- 0x03e7, 0x03e7,
- 0x03e9, 0x03e9,
- 0x03eb, 0x03eb,
- 0x03ed, 0x03ed,
- 0x03ef, 0x03f3,
- 0x03f5, 0x03f5,
- 0x03f8, 0x03f8,
- 0x03fb, 0x03fc,
- 0x0430, 0x045f,
- 0x0461, 0x0461,
- 0x0463, 0x0463,
- 0x0465, 0x0465,
- 0x0467, 0x0467,
- 0x0469, 0x0469,
- 0x046b, 0x046b,
- 0x046d, 0x046d,
- 0x046f, 0x046f,
- 0x0471, 0x0471,
- 0x0473, 0x0473,
- 0x0475, 0x0475,
- 0x0477, 0x0477,
- 0x0479, 0x0479,
- 0x047b, 0x047b,
- 0x047d, 0x047d,
- 0x047f, 0x047f,
- 0x0481, 0x0481,
- 0x048b, 0x048b,
- 0x048d, 0x048d,
- 0x048f, 0x048f,
- 0x0491, 0x0491,
- 0x0493, 0x0493,
- 0x0495, 0x0495,
- 0x0497, 0x0497,
- 0x0499, 0x0499,
- 0x049b, 0x049b,
- 0x049d, 0x049d,
- 0x049f, 0x049f,
- 0x04a1, 0x04a1,
- 0x04a3, 0x04a3,
- 0x04a5, 0x04a5,
- 0x04a7, 0x04a7,
- 0x04a9, 0x04a9,
- 0x04ab, 0x04ab,
- 0x04ad, 0x04ad,
- 0x04af, 0x04af,
- 0x04b1, 0x04b1,
- 0x04b3, 0x04b3,
- 0x04b5, 0x04b5,
- 0x04b7, 0x04b7,
- 0x04b9, 0x04b9,
- 0x04bb, 0x04bb,
- 0x04bd, 0x04bd,
- 0x04bf, 0x04bf,
- 0x04c2, 0x04c2,
- 0x04c4, 0x04c4,
- 0x04c6, 0x04c6,
- 0x04c8, 0x04c8,
- 0x04ca, 0x04ca,
- 0x04cc, 0x04cc,
- 0x04ce, 0x04cf,
- 0x04d1, 0x04d1,
- 0x04d3, 0x04d3,
- 0x04d5, 0x04d5,
- 0x04d7, 0x04d7,
- 0x04d9, 0x04d9,
- 0x04db, 0x04db,
- 0x04dd, 0x04dd,
- 0x04df, 0x04df,
- 0x04e1, 0x04e1,
- 0x04e3, 0x04e3,
- 0x04e5, 0x04e5,
- 0x04e7, 0x04e7,
- 0x04e9, 0x04e9,
- 0x04eb, 0x04eb,
- 0x04ed, 0x04ed,
- 0x04ef, 0x04ef,
- 0x04f1, 0x04f1,
- 0x04f3, 0x04f3,
- 0x04f5, 0x04f5,
- 0x04f7, 0x04f7,
- 0x04f9, 0x04f9,
- 0x04fb, 0x04fb,
- 0x04fd, 0x04fd,
- 0x04ff, 0x04ff,
- 0x0501, 0x0501,
- 0x0503, 0x0503,
- 0x0505, 0x0505,
- 0x0507, 0x0507,
- 0x0509, 0x0509,
- 0x050b, 0x050b,
- 0x050d, 0x050d,
- 0x050f, 0x050f,
- 0x0511, 0x0511,
- 0x0513, 0x0513,
- 0x0515, 0x0515,
- 0x0517, 0x0517,
- 0x0519, 0x0519,
- 0x051b, 0x051b,
- 0x051d, 0x051d,
- 0x051f, 0x051f,
- 0x0521, 0x0521,
- 0x0523, 0x0523,
- 0x0561, 0x0587,
- 0x1d00, 0x1d2b,
- 0x1d62, 0x1d77,
- 0x1d79, 0x1d9a,
- 0x1e01, 0x1e01,
- 0x1e03, 0x1e03,
- 0x1e05, 0x1e05,
- 0x1e07, 0x1e07,
- 0x1e09, 0x1e09,
- 0x1e0b, 0x1e0b,
- 0x1e0d, 0x1e0d,
- 0x1e0f, 0x1e0f,
- 0x1e11, 0x1e11,
- 0x1e13, 0x1e13,
- 0x1e15, 0x1e15,
- 0x1e17, 0x1e17,
- 0x1e19, 0x1e19,
- 0x1e1b, 0x1e1b,
- 0x1e1d, 0x1e1d,
- 0x1e1f, 0x1e1f,
- 0x1e21, 0x1e21,
- 0x1e23, 0x1e23,
- 0x1e25, 0x1e25,
- 0x1e27, 0x1e27,
- 0x1e29, 0x1e29,
- 0x1e2b, 0x1e2b,
- 0x1e2d, 0x1e2d,
- 0x1e2f, 0x1e2f,
- 0x1e31, 0x1e31,
- 0x1e33, 0x1e33,
- 0x1e35, 0x1e35,
- 0x1e37, 0x1e37,
- 0x1e39, 0x1e39,
- 0x1e3b, 0x1e3b,
- 0x1e3d, 0x1e3d,
- 0x1e3f, 0x1e3f,
- 0x1e41, 0x1e41,
- 0x1e43, 0x1e43,
- 0x1e45, 0x1e45,
- 0x1e47, 0x1e47,
- 0x1e49, 0x1e49,
- 0x1e4b, 0x1e4b,
- 0x1e4d, 0x1e4d,
- 0x1e4f, 0x1e4f,
- 0x1e51, 0x1e51,
- 0x1e53, 0x1e53,
- 0x1e55, 0x1e55,
- 0x1e57, 0x1e57,
- 0x1e59, 0x1e59,
- 0x1e5b, 0x1e5b,
- 0x1e5d, 0x1e5d,
- 0x1e5f, 0x1e5f,
- 0x1e61, 0x1e61,
- 0x1e63, 0x1e63,
- 0x1e65, 0x1e65,
- 0x1e67, 0x1e67,
- 0x1e69, 0x1e69,
- 0x1e6b, 0x1e6b,
- 0x1e6d, 0x1e6d,
- 0x1e6f, 0x1e6f,
- 0x1e71, 0x1e71,
- 0x1e73, 0x1e73,
- 0x1e75, 0x1e75,
- 0x1e77, 0x1e77,
- 0x1e79, 0x1e79,
- 0x1e7b, 0x1e7b,
- 0x1e7d, 0x1e7d,
- 0x1e7f, 0x1e7f,
- 0x1e81, 0x1e81,
- 0x1e83, 0x1e83,
- 0x1e85, 0x1e85,
- 0x1e87, 0x1e87,
- 0x1e89, 0x1e89,
- 0x1e8b, 0x1e8b,
- 0x1e8d, 0x1e8d,
- 0x1e8f, 0x1e8f,
- 0x1e91, 0x1e91,
- 0x1e93, 0x1e93,
- 0x1e95, 0x1e9d,
- 0x1e9f, 0x1e9f,
- 0x1ea1, 0x1ea1,
- 0x1ea3, 0x1ea3,
- 0x1ea5, 0x1ea5,
- 0x1ea7, 0x1ea7,
- 0x1ea9, 0x1ea9,
- 0x1eab, 0x1eab,
- 0x1ead, 0x1ead,
- 0x1eaf, 0x1eaf,
- 0x1eb1, 0x1eb1,
- 0x1eb3, 0x1eb3,
- 0x1eb5, 0x1eb5,
- 0x1eb7, 0x1eb7,
- 0x1eb9, 0x1eb9,
- 0x1ebb, 0x1ebb,
- 0x1ebd, 0x1ebd,
- 0x1ebf, 0x1ebf,
- 0x1ec1, 0x1ec1,
- 0x1ec3, 0x1ec3,
- 0x1ec5, 0x1ec5,
- 0x1ec7, 0x1ec7,
- 0x1ec9, 0x1ec9,
- 0x1ecb, 0x1ecb,
- 0x1ecd, 0x1ecd,
- 0x1ecf, 0x1ecf,
- 0x1ed1, 0x1ed1,
- 0x1ed3, 0x1ed3,
- 0x1ed5, 0x1ed5,
- 0x1ed7, 0x1ed7,
- 0x1ed9, 0x1ed9,
- 0x1edb, 0x1edb,
- 0x1edd, 0x1edd,
- 0x1edf, 0x1edf,
- 0x1ee1, 0x1ee1,
- 0x1ee3, 0x1ee3,
- 0x1ee5, 0x1ee5,
- 0x1ee7, 0x1ee7,
- 0x1ee9, 0x1ee9,
- 0x1eeb, 0x1eeb,
- 0x1eed, 0x1eed,
- 0x1eef, 0x1eef,
- 0x1ef1, 0x1ef1,
- 0x1ef3, 0x1ef3,
- 0x1ef5, 0x1ef5,
- 0x1ef7, 0x1ef7,
- 0x1ef9, 0x1ef9,
- 0x1efb, 0x1efb,
- 0x1efd, 0x1efd,
- 0x1eff, 0x1f07,
- 0x1f10, 0x1f15,
- 0x1f20, 0x1f27,
- 0x1f30, 0x1f37,
- 0x1f40, 0x1f45,
- 0x1f50, 0x1f57,
- 0x1f60, 0x1f67,
- 0x1f70, 0x1f7d,
- 0x1f80, 0x1f87,
- 0x1f90, 0x1f97,
- 0x1fa0, 0x1fa7,
- 0x1fb0, 0x1fb4,
- 0x1fb6, 0x1fb7,
- 0x1fbe, 0x1fbe,
- 0x1fc2, 0x1fc4,
- 0x1fc6, 0x1fc7,
- 0x1fd0, 0x1fd3,
- 0x1fd6, 0x1fd7,
- 0x1fe0, 0x1fe7,
- 0x1ff2, 0x1ff4,
- 0x1ff6, 0x1ff7,
- 0x2071, 0x2071,
- 0x207f, 0x207f,
- 0x210a, 0x210a,
- 0x210e, 0x210f,
- 0x2113, 0x2113,
- 0x212f, 0x212f,
- 0x2134, 0x2134,
- 0x2139, 0x2139,
- 0x213c, 0x213d,
- 0x2146, 0x2149,
- 0x214e, 0x214e,
- 0x2184, 0x2184,
- 0x2c30, 0x2c5e,
- 0x2c61, 0x2c61,
- 0x2c65, 0x2c66,
- 0x2c68, 0x2c68,
- 0x2c6a, 0x2c6a,
- 0x2c6c, 0x2c6c,
- 0x2c71, 0x2c71,
- 0x2c73, 0x2c74,
- 0x2c76, 0x2c7c,
- 0x2c81, 0x2c81,
- 0x2c83, 0x2c83,
- 0x2c85, 0x2c85,
- 0x2c87, 0x2c87,
- 0x2c89, 0x2c89,
- 0x2c8b, 0x2c8b,
- 0x2c8d, 0x2c8d,
- 0x2c8f, 0x2c8f,
- 0x2c91, 0x2c91,
- 0x2c93, 0x2c93,
- 0x2c95, 0x2c95,
- 0x2c97, 0x2c97,
- 0x2c99, 0x2c99,
- 0x2c9b, 0x2c9b,
- 0x2c9d, 0x2c9d,
- 0x2c9f, 0x2c9f,
- 0x2ca1, 0x2ca1,
- 0x2ca3, 0x2ca3,
- 0x2ca5, 0x2ca5,
- 0x2ca7, 0x2ca7,
- 0x2ca9, 0x2ca9,
- 0x2cab, 0x2cab,
- 0x2cad, 0x2cad,
- 0x2caf, 0x2caf,
- 0x2cb1, 0x2cb1,
- 0x2cb3, 0x2cb3,
- 0x2cb5, 0x2cb5,
- 0x2cb7, 0x2cb7,
- 0x2cb9, 0x2cb9,
- 0x2cbb, 0x2cbb,
- 0x2cbd, 0x2cbd,
- 0x2cbf, 0x2cbf,
- 0x2cc1, 0x2cc1,
- 0x2cc3, 0x2cc3,
- 0x2cc5, 0x2cc5,
- 0x2cc7, 0x2cc7,
- 0x2cc9, 0x2cc9,
- 0x2ccb, 0x2ccb,
- 0x2ccd, 0x2ccd,
- 0x2ccf, 0x2ccf,
- 0x2cd1, 0x2cd1,
- 0x2cd3, 0x2cd3,
- 0x2cd5, 0x2cd5,
- 0x2cd7, 0x2cd7,
- 0x2cd9, 0x2cd9,
- 0x2cdb, 0x2cdb,
- 0x2cdd, 0x2cdd,
- 0x2cdf, 0x2cdf,
- 0x2ce1, 0x2ce1,
- 0x2ce3, 0x2ce4,
- 0x2d00, 0x2d25,
- 0xa641, 0xa641,
- 0xa643, 0xa643,
- 0xa645, 0xa645,
- 0xa647, 0xa647,
- 0xa649, 0xa649,
- 0xa64b, 0xa64b,
- 0xa64d, 0xa64d,
- 0xa64f, 0xa64f,
- 0xa651, 0xa651,
- 0xa653, 0xa653,
- 0xa655, 0xa655,
- 0xa657, 0xa657,
- 0xa659, 0xa659,
- 0xa65b, 0xa65b,
- 0xa65d, 0xa65d,
- 0xa65f, 0xa65f,
- 0xa663, 0xa663,
- 0xa665, 0xa665,
- 0xa667, 0xa667,
- 0xa669, 0xa669,
- 0xa66b, 0xa66b,
- 0xa66d, 0xa66d,
- 0xa681, 0xa681,
- 0xa683, 0xa683,
- 0xa685, 0xa685,
- 0xa687, 0xa687,
- 0xa689, 0xa689,
- 0xa68b, 0xa68b,
- 0xa68d, 0xa68d,
- 0xa68f, 0xa68f,
- 0xa691, 0xa691,
- 0xa693, 0xa693,
- 0xa695, 0xa695,
- 0xa697, 0xa697,
- 0xa723, 0xa723,
- 0xa725, 0xa725,
- 0xa727, 0xa727,
- 0xa729, 0xa729,
- 0xa72b, 0xa72b,
- 0xa72d, 0xa72d,
- 0xa72f, 0xa731,
- 0xa733, 0xa733,
- 0xa735, 0xa735,
- 0xa737, 0xa737,
- 0xa739, 0xa739,
- 0xa73b, 0xa73b,
- 0xa73d, 0xa73d,
- 0xa73f, 0xa73f,
- 0xa741, 0xa741,
- 0xa743, 0xa743,
- 0xa745, 0xa745,
- 0xa747, 0xa747,
- 0xa749, 0xa749,
- 0xa74b, 0xa74b,
- 0xa74d, 0xa74d,
- 0xa74f, 0xa74f,
- 0xa751, 0xa751,
- 0xa753, 0xa753,
- 0xa755, 0xa755,
- 0xa757, 0xa757,
- 0xa759, 0xa759,
- 0xa75b, 0xa75b,
- 0xa75d, 0xa75d,
- 0xa75f, 0xa75f,
- 0xa761, 0xa761,
- 0xa763, 0xa763,
- 0xa765, 0xa765,
- 0xa767, 0xa767,
- 0xa769, 0xa769,
- 0xa76b, 0xa76b,
- 0xa76d, 0xa76d,
- 0xa76f, 0xa76f,
- 0xa771, 0xa778,
- 0xa77a, 0xa77a,
- 0xa77c, 0xa77c,
- 0xa77f, 0xa77f,
- 0xa781, 0xa781,
- 0xa783, 0xa783,
- 0xa785, 0xa785,
- 0xa787, 0xa787,
- 0xa78c, 0xa78c,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xff41, 0xff5a,
- 0x10428, 0x1044f,
- 0x1d41a, 0x1d433,
- 0x1d44e, 0x1d454,
- 0x1d456, 0x1d467,
- 0x1d482, 0x1d49b,
- 0x1d4b6, 0x1d4b9,
- 0x1d4bb, 0x1d4bb,
- 0x1d4bd, 0x1d4c3,
- 0x1d4c5, 0x1d4cf,
- 0x1d4ea, 0x1d503,
- 0x1d51e, 0x1d537,
- 0x1d552, 0x1d56b,
- 0x1d586, 0x1d59f,
- 0x1d5ba, 0x1d5d3,
- 0x1d5ee, 0x1d607,
- 0x1d622, 0x1d63b,
- 0x1d656, 0x1d66f,
- 0x1d68a, 0x1d6a5,
- 0x1d6c2, 0x1d6da,
- 0x1d6dc, 0x1d6e1,
- 0x1d6fc, 0x1d714,
- 0x1d716, 0x1d71b,
- 0x1d736, 0x1d74e,
- 0x1d750, 0x1d755,
- 0x1d770, 0x1d788,
- 0x1d78a, 0x1d78f,
- 0x1d7aa, 0x1d7c2,
- 0x1d7c4, 0x1d7c9,
- 0x1d7cb, 0x1d7cb,
-}; /* CR_Ll */
-
-/* 'Lm': General Category */
-static const OnigCodePoint CR_Lm[] = {
- 39,
- 0x02b0, 0x02c1,
- 0x02c6, 0x02d1,
- 0x02e0, 0x02e4,
- 0x02ec, 0x02ec,
- 0x02ee, 0x02ee,
- 0x0374, 0x0374,
- 0x037a, 0x037a,
- 0x0559, 0x0559,
- 0x0640, 0x0640,
- 0x06e5, 0x06e6,
- 0x07f4, 0x07f5,
- 0x07fa, 0x07fa,
- 0x0971, 0x0971,
- 0x0e46, 0x0e46,
- 0x0ec6, 0x0ec6,
- 0x10fc, 0x10fc,
- 0x17d7, 0x17d7,
- 0x1843, 0x1843,
- 0x1c78, 0x1c7d,
- 0x1d2c, 0x1d61,
- 0x1d78, 0x1d78,
- 0x1d9b, 0x1dbf,
- 0x2090, 0x2094,
- 0x2c7d, 0x2c7d,
- 0x2d6f, 0x2d6f,
- 0x2e2f, 0x2e2f,
- 0x3005, 0x3005,
- 0x3031, 0x3035,
- 0x303b, 0x303b,
- 0x309d, 0x309e,
- 0x30fc, 0x30fe,
- 0xa015, 0xa015,
- 0xa60c, 0xa60c,
- 0xa67f, 0xa67f,
- 0xa717, 0xa71f,
- 0xa770, 0xa770,
- 0xa788, 0xa788,
- 0xff70, 0xff70,
- 0xff9e, 0xff9f,
-}; /* CR_Lm */
-
-/* 'Lo': General Category */
-static const OnigCodePoint CR_Lo[] = {
- 286,
- 0x01bb, 0x01bb,
- 0x01c0, 0x01c3,
- 0x0294, 0x0294,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f2,
- 0x0621, 0x063f,
- 0x0641, 0x064a,
- 0x066e, 0x066f,
- 0x0671, 0x06d3,
- 0x06d5, 0x06d5,
- 0x06ee, 0x06ef,
- 0x06fa, 0x06fc,
- 0x06ff, 0x06ff,
- 0x0710, 0x0710,
- 0x0712, 0x072f,
- 0x074d, 0x07a5,
- 0x07b1, 0x07b1,
- 0x07ca, 0x07ea,
- 0x0904, 0x0939,
- 0x093d, 0x093d,
- 0x0950, 0x0950,
- 0x0958, 0x0961,
- 0x0972, 0x0972,
- 0x097b, 0x097f,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bd, 0x09bd,
- 0x09ce, 0x09ce,
- 0x09dc, 0x09dd,
- 0x09df, 0x09e1,
- 0x09f0, 0x09f1,
- 0x0a05, 0x0a0a,
- 0x0a0f, 0x0a10,
- 0x0a13, 0x0a28,
- 0x0a2a, 0x0a30,
- 0x0a32, 0x0a33,
- 0x0a35, 0x0a36,
- 0x0a38, 0x0a39,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a72, 0x0a74,
- 0x0a85, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abd, 0x0abd,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae1,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b35, 0x0b39,
- 0x0b3d, 0x0b3d,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b61,
- 0x0b71, 0x0b71,
- 0x0b83, 0x0b83,
- 0x0b85, 0x0b8a,
- 0x0b8e, 0x0b90,
- 0x0b92, 0x0b95,
- 0x0b99, 0x0b9a,
- 0x0b9c, 0x0b9c,
- 0x0b9e, 0x0b9f,
- 0x0ba3, 0x0ba4,
- 0x0ba8, 0x0baa,
- 0x0bae, 0x0bb9,
- 0x0bd0, 0x0bd0,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3d, 0x0c3d,
- 0x0c58, 0x0c59,
- 0x0c60, 0x0c61,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbd, 0x0cbd,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce1,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3d, 0x0d3d,
- 0x0d60, 0x0d61,
- 0x0d7a, 0x0d7f,
- 0x0d85, 0x0d96,
- 0x0d9a, 0x0db1,
- 0x0db3, 0x0dbb,
- 0x0dbd, 0x0dbd,
- 0x0dc0, 0x0dc6,
- 0x0e01, 0x0e30,
- 0x0e32, 0x0e33,
- 0x0e40, 0x0e45,
- 0x0e81, 0x0e82,
- 0x0e84, 0x0e84,
- 0x0e87, 0x0e88,
- 0x0e8a, 0x0e8a,
- 0x0e8d, 0x0e8d,
- 0x0e94, 0x0e97,
- 0x0e99, 0x0e9f,
- 0x0ea1, 0x0ea3,
- 0x0ea5, 0x0ea5,
- 0x0ea7, 0x0ea7,
- 0x0eaa, 0x0eab,
- 0x0ead, 0x0eb0,
- 0x0eb2, 0x0eb3,
- 0x0ebd, 0x0ebd,
- 0x0ec0, 0x0ec4,
- 0x0edc, 0x0edd,
- 0x0f00, 0x0f00,
- 0x0f40, 0x0f47,
- 0x0f49, 0x0f6c,
- 0x0f88, 0x0f8b,
- 0x1000, 0x102a,
- 0x103f, 0x103f,
- 0x1050, 0x1055,
- 0x105a, 0x105d,
- 0x1061, 0x1061,
- 0x1065, 0x1066,
- 0x106e, 0x1070,
- 0x1075, 0x1081,
- 0x108e, 0x108e,
- 0x10d0, 0x10fa,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x1200, 0x1248,
- 0x124a, 0x124d,
- 0x1250, 0x1256,
- 0x1258, 0x1258,
- 0x125a, 0x125d,
- 0x1260, 0x1288,
- 0x128a, 0x128d,
- 0x1290, 0x12b0,
- 0x12b2, 0x12b5,
- 0x12b8, 0x12be,
- 0x12c0, 0x12c0,
- 0x12c2, 0x12c5,
- 0x12c8, 0x12d6,
- 0x12d8, 0x1310,
- 0x1312, 0x1315,
- 0x1318, 0x135a,
- 0x1380, 0x138f,
- 0x13a0, 0x13f4,
- 0x1401, 0x166c,
- 0x166f, 0x1676,
- 0x1681, 0x169a,
- 0x16a0, 0x16ea,
- 0x1700, 0x170c,
- 0x170e, 0x1711,
- 0x1720, 0x1731,
- 0x1740, 0x1751,
- 0x1760, 0x176c,
- 0x176e, 0x1770,
- 0x1780, 0x17b3,
- 0x17dc, 0x17dc,
- 0x1820, 0x1842,
- 0x1844, 0x1877,
- 0x1880, 0x18a8,
- 0x18aa, 0x18aa,
- 0x1900, 0x191c,
- 0x1950, 0x196d,
- 0x1970, 0x1974,
- 0x1980, 0x19a9,
- 0x19c1, 0x19c7,
- 0x1a00, 0x1a16,
- 0x1b05, 0x1b33,
- 0x1b45, 0x1b4b,
- 0x1b83, 0x1ba0,
- 0x1bae, 0x1baf,
- 0x1c00, 0x1c23,
- 0x1c4d, 0x1c4f,
- 0x1c5a, 0x1c77,
- 0x2135, 0x2138,
- 0x2d30, 0x2d65,
- 0x2d80, 0x2d96,
- 0x2da0, 0x2da6,
- 0x2da8, 0x2dae,
- 0x2db0, 0x2db6,
- 0x2db8, 0x2dbe,
- 0x2dc0, 0x2dc6,
- 0x2dc8, 0x2dce,
- 0x2dd0, 0x2dd6,
- 0x2dd8, 0x2dde,
- 0x3006, 0x3006,
- 0x303c, 0x303c,
- 0x3041, 0x3096,
- 0x309f, 0x309f,
- 0x30a1, 0x30fa,
- 0x30ff, 0x30ff,
- 0x3105, 0x312d,
- 0x3131, 0x318e,
- 0x31a0, 0x31b7,
- 0x31f0, 0x31ff,
- 0x3400, 0x3400,
- 0x4db5, 0x4db5,
- 0x4e00, 0x4e00,
- 0x9fc3, 0x9fc3,
- 0xa000, 0xa014,
- 0xa016, 0xa48c,
- 0xa500, 0xa60b,
- 0xa610, 0xa61f,
- 0xa62a, 0xa62b,
- 0xa66e, 0xa66e,
- 0xa7fb, 0xa801,
- 0xa803, 0xa805,
- 0xa807, 0xa80a,
- 0xa80c, 0xa822,
- 0xa840, 0xa873,
- 0xa882, 0xa8b3,
- 0xa90a, 0xa925,
- 0xa930, 0xa946,
- 0xaa00, 0xaa28,
- 0xaa40, 0xaa42,
- 0xaa44, 0xaa4b,
- 0xac00, 0xac00,
- 0xd7a3, 0xd7a3,
- 0xf900, 0xfa2d,
- 0xfa30, 0xfa6a,
- 0xfa70, 0xfad9,
- 0xfb1d, 0xfb1d,
- 0xfb1f, 0xfb28,
- 0xfb2a, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbb1,
- 0xfbd3, 0xfd3d,
- 0xfd50, 0xfd8f,
- 0xfd92, 0xfdc7,
- 0xfdf0, 0xfdfb,
- 0xfe70, 0xfe74,
- 0xfe76, 0xfefc,
- 0xff66, 0xff6f,
- 0xff71, 0xff9d,
- 0xffa0, 0xffbe,
- 0xffc2, 0xffc7,
- 0xffca, 0xffcf,
- 0xffd2, 0xffd7,
- 0xffda, 0xffdc,
- 0x10000, 0x1000b,
- 0x1000d, 0x10026,
- 0x10028, 0x1003a,
- 0x1003c, 0x1003d,
- 0x1003f, 0x1004d,
- 0x10050, 0x1005d,
- 0x10080, 0x100fa,
- 0x10280, 0x1029c,
- 0x102a0, 0x102d0,
- 0x10300, 0x1031e,
- 0x10330, 0x10340,
- 0x10342, 0x10349,
- 0x10380, 0x1039d,
- 0x103a0, 0x103c3,
- 0x103c8, 0x103cf,
- 0x10450, 0x1049d,
- 0x10800, 0x10805,
- 0x10808, 0x10808,
- 0x1080a, 0x10835,
- 0x10837, 0x10838,
- 0x1083c, 0x1083c,
- 0x1083f, 0x1083f,
- 0x10900, 0x10915,
- 0x10920, 0x10939,
- 0x10a00, 0x10a00,
- 0x10a10, 0x10a13,
- 0x10a15, 0x10a17,
- 0x10a19, 0x10a33,
- 0x12000, 0x1236e,
- 0x20000, 0x20000,
- 0x2a6d6, 0x2a6d6,
- 0x2f800, 0x2fa1d,
-}; /* CR_Lo */
-
-/* 'Lt': General Category */
-static const OnigCodePoint CR_Lt[] = {
- 10,
- 0x01c5, 0x01c5,
- 0x01c8, 0x01c8,
- 0x01cb, 0x01cb,
- 0x01f2, 0x01f2,
- 0x1f88, 0x1f8f,
- 0x1f98, 0x1f9f,
- 0x1fa8, 0x1faf,
- 0x1fbc, 0x1fbc,
- 0x1fcc, 0x1fcc,
- 0x1ffc, 0x1ffc,
-}; /* CR_Lt */
-
-/* 'Lu': General Category */
-static const OnigCodePoint CR_Lu[] = {
- 591,
- 0x0041, 0x005a,
- 0x00c0, 0x00d6,
- 0x00d8, 0x00de,
- 0x0100, 0x0100,
- 0x0102, 0x0102,
- 0x0104, 0x0104,
- 0x0106, 0x0106,
- 0x0108, 0x0108,
- 0x010a, 0x010a,
- 0x010c, 0x010c,
- 0x010e, 0x010e,
- 0x0110, 0x0110,
- 0x0112, 0x0112,
- 0x0114, 0x0114,
- 0x0116, 0x0116,
- 0x0118, 0x0118,
- 0x011a, 0x011a,
- 0x011c, 0x011c,
- 0x011e, 0x011e,
- 0x0120, 0x0120,
- 0x0122, 0x0122,
- 0x0124, 0x0124,
- 0x0126, 0x0126,
- 0x0128, 0x0128,
- 0x012a, 0x012a,
- 0x012c, 0x012c,
- 0x012e, 0x012e,
- 0x0130, 0x0130,
- 0x0132, 0x0132,
- 0x0134, 0x0134,
- 0x0136, 0x0136,
- 0x0139, 0x0139,
- 0x013b, 0x013b,
- 0x013d, 0x013d,
- 0x013f, 0x013f,
- 0x0141, 0x0141,
- 0x0143, 0x0143,
- 0x0145, 0x0145,
- 0x0147, 0x0147,
- 0x014a, 0x014a,
- 0x014c, 0x014c,
- 0x014e, 0x014e,
- 0x0150, 0x0150,
- 0x0152, 0x0152,
- 0x0154, 0x0154,
- 0x0156, 0x0156,
- 0x0158, 0x0158,
- 0x015a, 0x015a,
- 0x015c, 0x015c,
- 0x015e, 0x015e,
- 0x0160, 0x0160,
- 0x0162, 0x0162,
- 0x0164, 0x0164,
- 0x0166, 0x0166,
- 0x0168, 0x0168,
- 0x016a, 0x016a,
- 0x016c, 0x016c,
- 0x016e, 0x016e,
- 0x0170, 0x0170,
- 0x0172, 0x0172,
- 0x0174, 0x0174,
- 0x0176, 0x0176,
- 0x0178, 0x0179,
- 0x017b, 0x017b,
- 0x017d, 0x017d,
- 0x0181, 0x0182,
- 0x0184, 0x0184,
- 0x0186, 0x0187,
- 0x0189, 0x018b,
- 0x018e, 0x0191,
- 0x0193, 0x0194,
- 0x0196, 0x0198,
- 0x019c, 0x019d,
- 0x019f, 0x01a0,
- 0x01a2, 0x01a2,
- 0x01a4, 0x01a4,
- 0x01a6, 0x01a7,
- 0x01a9, 0x01a9,
- 0x01ac, 0x01ac,
- 0x01ae, 0x01af,
- 0x01b1, 0x01b3,
- 0x01b5, 0x01b5,
- 0x01b7, 0x01b8,
- 0x01bc, 0x01bc,
- 0x01c4, 0x01c4,
- 0x01c7, 0x01c7,
- 0x01ca, 0x01ca,
- 0x01cd, 0x01cd,
- 0x01cf, 0x01cf,
- 0x01d1, 0x01d1,
- 0x01d3, 0x01d3,
- 0x01d5, 0x01d5,
- 0x01d7, 0x01d7,
- 0x01d9, 0x01d9,
- 0x01db, 0x01db,
- 0x01de, 0x01de,
- 0x01e0, 0x01e0,
- 0x01e2, 0x01e2,
- 0x01e4, 0x01e4,
- 0x01e6, 0x01e6,
- 0x01e8, 0x01e8,
- 0x01ea, 0x01ea,
- 0x01ec, 0x01ec,
- 0x01ee, 0x01ee,
- 0x01f1, 0x01f1,
- 0x01f4, 0x01f4,
- 0x01f6, 0x01f8,
- 0x01fa, 0x01fa,
- 0x01fc, 0x01fc,
- 0x01fe, 0x01fe,
- 0x0200, 0x0200,
- 0x0202, 0x0202,
- 0x0204, 0x0204,
- 0x0206, 0x0206,
- 0x0208, 0x0208,
- 0x020a, 0x020a,
- 0x020c, 0x020c,
- 0x020e, 0x020e,
- 0x0210, 0x0210,
- 0x0212, 0x0212,
- 0x0214, 0x0214,
- 0x0216, 0x0216,
- 0x0218, 0x0218,
- 0x021a, 0x021a,
- 0x021c, 0x021c,
- 0x021e, 0x021e,
- 0x0220, 0x0220,
- 0x0222, 0x0222,
- 0x0224, 0x0224,
- 0x0226, 0x0226,
- 0x0228, 0x0228,
- 0x022a, 0x022a,
- 0x022c, 0x022c,
- 0x022e, 0x022e,
- 0x0230, 0x0230,
- 0x0232, 0x0232,
- 0x023a, 0x023b,
- 0x023d, 0x023e,
- 0x0241, 0x0241,
- 0x0243, 0x0246,
- 0x0248, 0x0248,
- 0x024a, 0x024a,
- 0x024c, 0x024c,
- 0x024e, 0x024e,
- 0x0370, 0x0370,
- 0x0372, 0x0372,
- 0x0376, 0x0376,
- 0x0386, 0x0386,
- 0x0388, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x038f,
- 0x0391, 0x03a1,
- 0x03a3, 0x03ab,
- 0x03cf, 0x03cf,
- 0x03d2, 0x03d4,
- 0x03d8, 0x03d8,
- 0x03da, 0x03da,
- 0x03dc, 0x03dc,
- 0x03de, 0x03de,
- 0x03e0, 0x03e0,
- 0x03e2, 0x03e2,
- 0x03e4, 0x03e4,
- 0x03e6, 0x03e6,
- 0x03e8, 0x03e8,
- 0x03ea, 0x03ea,
- 0x03ec, 0x03ec,
- 0x03ee, 0x03ee,
- 0x03f4, 0x03f4,
- 0x03f7, 0x03f7,
- 0x03f9, 0x03fa,
- 0x03fd, 0x042f,
- 0x0460, 0x0460,
- 0x0462, 0x0462,
- 0x0464, 0x0464,
- 0x0466, 0x0466,
- 0x0468, 0x0468,
- 0x046a, 0x046a,
- 0x046c, 0x046c,
- 0x046e, 0x046e,
- 0x0470, 0x0470,
- 0x0472, 0x0472,
- 0x0474, 0x0474,
- 0x0476, 0x0476,
- 0x0478, 0x0478,
- 0x047a, 0x047a,
- 0x047c, 0x047c,
- 0x047e, 0x047e,
- 0x0480, 0x0480,
- 0x048a, 0x048a,
- 0x048c, 0x048c,
- 0x048e, 0x048e,
- 0x0490, 0x0490,
- 0x0492, 0x0492,
- 0x0494, 0x0494,
- 0x0496, 0x0496,
- 0x0498, 0x0498,
- 0x049a, 0x049a,
- 0x049c, 0x049c,
- 0x049e, 0x049e,
- 0x04a0, 0x04a0,
- 0x04a2, 0x04a2,
- 0x04a4, 0x04a4,
- 0x04a6, 0x04a6,
- 0x04a8, 0x04a8,
- 0x04aa, 0x04aa,
- 0x04ac, 0x04ac,
- 0x04ae, 0x04ae,
- 0x04b0, 0x04b0,
- 0x04b2, 0x04b2,
- 0x04b4, 0x04b4,
- 0x04b6, 0x04b6,
- 0x04b8, 0x04b8,
- 0x04ba, 0x04ba,
- 0x04bc, 0x04bc,
- 0x04be, 0x04be,
- 0x04c0, 0x04c1,
- 0x04c3, 0x04c3,
- 0x04c5, 0x04c5,
- 0x04c7, 0x04c7,
- 0x04c9, 0x04c9,
- 0x04cb, 0x04cb,
- 0x04cd, 0x04cd,
- 0x04d0, 0x04d0,
- 0x04d2, 0x04d2,
- 0x04d4, 0x04d4,
- 0x04d6, 0x04d6,
- 0x04d8, 0x04d8,
- 0x04da, 0x04da,
- 0x04dc, 0x04dc,
- 0x04de, 0x04de,
- 0x04e0, 0x04e0,
- 0x04e2, 0x04e2,
- 0x04e4, 0x04e4,
- 0x04e6, 0x04e6,
- 0x04e8, 0x04e8,
- 0x04ea, 0x04ea,
- 0x04ec, 0x04ec,
- 0x04ee, 0x04ee,
- 0x04f0, 0x04f0,
- 0x04f2, 0x04f2,
- 0x04f4, 0x04f4,
- 0x04f6, 0x04f6,
- 0x04f8, 0x04f8,
- 0x04fa, 0x04fa,
- 0x04fc, 0x04fc,
- 0x04fe, 0x04fe,
- 0x0500, 0x0500,
- 0x0502, 0x0502,
- 0x0504, 0x0504,
- 0x0506, 0x0506,
- 0x0508, 0x0508,
- 0x050a, 0x050a,
- 0x050c, 0x050c,
- 0x050e, 0x050e,
- 0x0510, 0x0510,
- 0x0512, 0x0512,
- 0x0514, 0x0514,
- 0x0516, 0x0516,
- 0x0518, 0x0518,
- 0x051a, 0x051a,
- 0x051c, 0x051c,
- 0x051e, 0x051e,
- 0x0520, 0x0520,
- 0x0522, 0x0522,
- 0x0531, 0x0556,
- 0x10a0, 0x10c5,
- 0x1e00, 0x1e00,
- 0x1e02, 0x1e02,
- 0x1e04, 0x1e04,
- 0x1e06, 0x1e06,
- 0x1e08, 0x1e08,
- 0x1e0a, 0x1e0a,
- 0x1e0c, 0x1e0c,
- 0x1e0e, 0x1e0e,
- 0x1e10, 0x1e10,
- 0x1e12, 0x1e12,
- 0x1e14, 0x1e14,
- 0x1e16, 0x1e16,
- 0x1e18, 0x1e18,
- 0x1e1a, 0x1e1a,
- 0x1e1c, 0x1e1c,
- 0x1e1e, 0x1e1e,
- 0x1e20, 0x1e20,
- 0x1e22, 0x1e22,
- 0x1e24, 0x1e24,
- 0x1e26, 0x1e26,
- 0x1e28, 0x1e28,
- 0x1e2a, 0x1e2a,
- 0x1e2c, 0x1e2c,
- 0x1e2e, 0x1e2e,
- 0x1e30, 0x1e30,
- 0x1e32, 0x1e32,
- 0x1e34, 0x1e34,
- 0x1e36, 0x1e36,
- 0x1e38, 0x1e38,
- 0x1e3a, 0x1e3a,
- 0x1e3c, 0x1e3c,
- 0x1e3e, 0x1e3e,
- 0x1e40, 0x1e40,
- 0x1e42, 0x1e42,
- 0x1e44, 0x1e44,
- 0x1e46, 0x1e46,
- 0x1e48, 0x1e48,
- 0x1e4a, 0x1e4a,
- 0x1e4c, 0x1e4c,
- 0x1e4e, 0x1e4e,
- 0x1e50, 0x1e50,
- 0x1e52, 0x1e52,
- 0x1e54, 0x1e54,
- 0x1e56, 0x1e56,
- 0x1e58, 0x1e58,
- 0x1e5a, 0x1e5a,
- 0x1e5c, 0x1e5c,
- 0x1e5e, 0x1e5e,
- 0x1e60, 0x1e60,
- 0x1e62, 0x1e62,
- 0x1e64, 0x1e64,
- 0x1e66, 0x1e66,
- 0x1e68, 0x1e68,
- 0x1e6a, 0x1e6a,
- 0x1e6c, 0x1e6c,
- 0x1e6e, 0x1e6e,
- 0x1e70, 0x1e70,
- 0x1e72, 0x1e72,
- 0x1e74, 0x1e74,
- 0x1e76, 0x1e76,
- 0x1e78, 0x1e78,
- 0x1e7a, 0x1e7a,
- 0x1e7c, 0x1e7c,
- 0x1e7e, 0x1e7e,
- 0x1e80, 0x1e80,
- 0x1e82, 0x1e82,
- 0x1e84, 0x1e84,
- 0x1e86, 0x1e86,
- 0x1e88, 0x1e88,
- 0x1e8a, 0x1e8a,
- 0x1e8c, 0x1e8c,
- 0x1e8e, 0x1e8e,
- 0x1e90, 0x1e90,
- 0x1e92, 0x1e92,
- 0x1e94, 0x1e94,
- 0x1e9e, 0x1e9e,
- 0x1ea0, 0x1ea0,
- 0x1ea2, 0x1ea2,
- 0x1ea4, 0x1ea4,
- 0x1ea6, 0x1ea6,
- 0x1ea8, 0x1ea8,
- 0x1eaa, 0x1eaa,
- 0x1eac, 0x1eac,
- 0x1eae, 0x1eae,
- 0x1eb0, 0x1eb0,
- 0x1eb2, 0x1eb2,
- 0x1eb4, 0x1eb4,
- 0x1eb6, 0x1eb6,
- 0x1eb8, 0x1eb8,
- 0x1eba, 0x1eba,
- 0x1ebc, 0x1ebc,
- 0x1ebe, 0x1ebe,
- 0x1ec0, 0x1ec0,
- 0x1ec2, 0x1ec2,
- 0x1ec4, 0x1ec4,
- 0x1ec6, 0x1ec6,
- 0x1ec8, 0x1ec8,
- 0x1eca, 0x1eca,
- 0x1ecc, 0x1ecc,
- 0x1ece, 0x1ece,
- 0x1ed0, 0x1ed0,
- 0x1ed2, 0x1ed2,
- 0x1ed4, 0x1ed4,
- 0x1ed6, 0x1ed6,
- 0x1ed8, 0x1ed8,
- 0x1eda, 0x1eda,
- 0x1edc, 0x1edc,
- 0x1ede, 0x1ede,
- 0x1ee0, 0x1ee0,
- 0x1ee2, 0x1ee2,
- 0x1ee4, 0x1ee4,
- 0x1ee6, 0x1ee6,
- 0x1ee8, 0x1ee8,
- 0x1eea, 0x1eea,
- 0x1eec, 0x1eec,
- 0x1eee, 0x1eee,
- 0x1ef0, 0x1ef0,
- 0x1ef2, 0x1ef2,
- 0x1ef4, 0x1ef4,
- 0x1ef6, 0x1ef6,
- 0x1ef8, 0x1ef8,
- 0x1efa, 0x1efa,
- 0x1efc, 0x1efc,
- 0x1efe, 0x1efe,
- 0x1f08, 0x1f0f,
- 0x1f18, 0x1f1d,
- 0x1f28, 0x1f2f,
- 0x1f38, 0x1f3f,
- 0x1f48, 0x1f4d,
- 0x1f59, 0x1f59,
- 0x1f5b, 0x1f5b,
- 0x1f5d, 0x1f5d,
- 0x1f5f, 0x1f5f,
- 0x1f68, 0x1f6f,
- 0x1fb8, 0x1fbb,
- 0x1fc8, 0x1fcb,
- 0x1fd8, 0x1fdb,
- 0x1fe8, 0x1fec,
- 0x1ff8, 0x1ffb,
- 0x2102, 0x2102,
- 0x2107, 0x2107,
- 0x210b, 0x210d,
- 0x2110, 0x2112,
- 0x2115, 0x2115,
- 0x2119, 0x211d,
- 0x2124, 0x2124,
- 0x2126, 0x2126,
- 0x2128, 0x2128,
- 0x212a, 0x212d,
- 0x2130, 0x2133,
- 0x213e, 0x213f,
- 0x2145, 0x2145,
- 0x2183, 0x2183,
- 0x2c00, 0x2c2e,
- 0x2c60, 0x2c60,
- 0x2c62, 0x2c64,
- 0x2c67, 0x2c67,
- 0x2c69, 0x2c69,
- 0x2c6b, 0x2c6b,
- 0x2c6d, 0x2c6f,
- 0x2c72, 0x2c72,
- 0x2c75, 0x2c75,
- 0x2c80, 0x2c80,
- 0x2c82, 0x2c82,
- 0x2c84, 0x2c84,
- 0x2c86, 0x2c86,
- 0x2c88, 0x2c88,
- 0x2c8a, 0x2c8a,
- 0x2c8c, 0x2c8c,
- 0x2c8e, 0x2c8e,
- 0x2c90, 0x2c90,
- 0x2c92, 0x2c92,
- 0x2c94, 0x2c94,
- 0x2c96, 0x2c96,
- 0x2c98, 0x2c98,
- 0x2c9a, 0x2c9a,
- 0x2c9c, 0x2c9c,
- 0x2c9e, 0x2c9e,
- 0x2ca0, 0x2ca0,
- 0x2ca2, 0x2ca2,
- 0x2ca4, 0x2ca4,
- 0x2ca6, 0x2ca6,
- 0x2ca8, 0x2ca8,
- 0x2caa, 0x2caa,
- 0x2cac, 0x2cac,
- 0x2cae, 0x2cae,
- 0x2cb0, 0x2cb0,
- 0x2cb2, 0x2cb2,
- 0x2cb4, 0x2cb4,
- 0x2cb6, 0x2cb6,
- 0x2cb8, 0x2cb8,
- 0x2cba, 0x2cba,
- 0x2cbc, 0x2cbc,
- 0x2cbe, 0x2cbe,
- 0x2cc0, 0x2cc0,
- 0x2cc2, 0x2cc2,
- 0x2cc4, 0x2cc4,
- 0x2cc6, 0x2cc6,
- 0x2cc8, 0x2cc8,
- 0x2cca, 0x2cca,
- 0x2ccc, 0x2ccc,
- 0x2cce, 0x2cce,
- 0x2cd0, 0x2cd0,
- 0x2cd2, 0x2cd2,
- 0x2cd4, 0x2cd4,
- 0x2cd6, 0x2cd6,
- 0x2cd8, 0x2cd8,
- 0x2cda, 0x2cda,
- 0x2cdc, 0x2cdc,
- 0x2cde, 0x2cde,
- 0x2ce0, 0x2ce0,
- 0x2ce2, 0x2ce2,
- 0xa640, 0xa640,
- 0xa642, 0xa642,
- 0xa644, 0xa644,
- 0xa646, 0xa646,
- 0xa648, 0xa648,
- 0xa64a, 0xa64a,
- 0xa64c, 0xa64c,
- 0xa64e, 0xa64e,
- 0xa650, 0xa650,
- 0xa652, 0xa652,
- 0xa654, 0xa654,
- 0xa656, 0xa656,
- 0xa658, 0xa658,
- 0xa65a, 0xa65a,
- 0xa65c, 0xa65c,
- 0xa65e, 0xa65e,
- 0xa662, 0xa662,
- 0xa664, 0xa664,
- 0xa666, 0xa666,
- 0xa668, 0xa668,
- 0xa66a, 0xa66a,
- 0xa66c, 0xa66c,
- 0xa680, 0xa680,
- 0xa682, 0xa682,
- 0xa684, 0xa684,
- 0xa686, 0xa686,
- 0xa688, 0xa688,
- 0xa68a, 0xa68a,
- 0xa68c, 0xa68c,
- 0xa68e, 0xa68e,
- 0xa690, 0xa690,
- 0xa692, 0xa692,
- 0xa694, 0xa694,
- 0xa696, 0xa696,
- 0xa722, 0xa722,
- 0xa724, 0xa724,
- 0xa726, 0xa726,
- 0xa728, 0xa728,
- 0xa72a, 0xa72a,
- 0xa72c, 0xa72c,
- 0xa72e, 0xa72e,
- 0xa732, 0xa732,
- 0xa734, 0xa734,
- 0xa736, 0xa736,
- 0xa738, 0xa738,
- 0xa73a, 0xa73a,
- 0xa73c, 0xa73c,
- 0xa73e, 0xa73e,
- 0xa740, 0xa740,
- 0xa742, 0xa742,
- 0xa744, 0xa744,
- 0xa746, 0xa746,
- 0xa748, 0xa748,
- 0xa74a, 0xa74a,
- 0xa74c, 0xa74c,
- 0xa74e, 0xa74e,
- 0xa750, 0xa750,
- 0xa752, 0xa752,
- 0xa754, 0xa754,
- 0xa756, 0xa756,
- 0xa758, 0xa758,
- 0xa75a, 0xa75a,
- 0xa75c, 0xa75c,
- 0xa75e, 0xa75e,
- 0xa760, 0xa760,
- 0xa762, 0xa762,
- 0xa764, 0xa764,
- 0xa766, 0xa766,
- 0xa768, 0xa768,
- 0xa76a, 0xa76a,
- 0xa76c, 0xa76c,
- 0xa76e, 0xa76e,
- 0xa779, 0xa779,
- 0xa77b, 0xa77b,
- 0xa77d, 0xa77e,
- 0xa780, 0xa780,
- 0xa782, 0xa782,
- 0xa784, 0xa784,
- 0xa786, 0xa786,
- 0xa78b, 0xa78b,
- 0xff21, 0xff3a,
- 0x10400, 0x10427,
- 0x1d400, 0x1d419,
- 0x1d434, 0x1d44d,
- 0x1d468, 0x1d481,
- 0x1d49c, 0x1d49c,
- 0x1d49e, 0x1d49f,
- 0x1d4a2, 0x1d4a2,
- 0x1d4a5, 0x1d4a6,
- 0x1d4a9, 0x1d4ac,
- 0x1d4ae, 0x1d4b5,
- 0x1d4d0, 0x1d4e9,
- 0x1d504, 0x1d505,
- 0x1d507, 0x1d50a,
- 0x1d50d, 0x1d514,
- 0x1d516, 0x1d51c,
- 0x1d538, 0x1d539,
- 0x1d53b, 0x1d53e,
- 0x1d540, 0x1d544,
- 0x1d546, 0x1d546,
- 0x1d54a, 0x1d550,
- 0x1d56c, 0x1d585,
- 0x1d5a0, 0x1d5b9,
- 0x1d5d4, 0x1d5ed,
- 0x1d608, 0x1d621,
- 0x1d63c, 0x1d655,
- 0x1d670, 0x1d689,
- 0x1d6a8, 0x1d6c0,
- 0x1d6e2, 0x1d6fa,
- 0x1d71c, 0x1d734,
- 0x1d756, 0x1d76e,
- 0x1d790, 0x1d7a8,
- 0x1d7ca, 0x1d7ca,
-}; /* CR_Lu */
-
-/* 'M': Major Category */
-static const OnigCodePoint CR_M[] = {
- 161,
- 0x0300, 0x036f,
- 0x0483, 0x0489,
- 0x0591, 0x05bd,
- 0x05bf, 0x05bf,
- 0x05c1, 0x05c2,
- 0x05c4, 0x05c5,
- 0x05c7, 0x05c7,
- 0x0610, 0x061a,
- 0x064b, 0x065e,
- 0x0670, 0x0670,
- 0x06d6, 0x06dc,
- 0x06de, 0x06e4,
- 0x06e7, 0x06e8,
- 0x06ea, 0x06ed,
- 0x0711, 0x0711,
- 0x0730, 0x074a,
- 0x07a6, 0x07b0,
- 0x07eb, 0x07f3,
- 0x0901, 0x0903,
- 0x093c, 0x093c,
- 0x093e, 0x094d,
- 0x0951, 0x0954,
- 0x0962, 0x0963,
- 0x0981, 0x0983,
- 0x09bc, 0x09bc,
- 0x09be, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09cd,
- 0x09d7, 0x09d7,
- 0x09e2, 0x09e3,
- 0x0a01, 0x0a03,
- 0x0a3c, 0x0a3c,
- 0x0a3e, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4d,
- 0x0a51, 0x0a51,
- 0x0a70, 0x0a71,
- 0x0a75, 0x0a75,
- 0x0a81, 0x0a83,
- 0x0abc, 0x0abc,
- 0x0abe, 0x0ac5,
- 0x0ac7, 0x0ac9,
- 0x0acb, 0x0acd,
- 0x0ae2, 0x0ae3,
- 0x0b01, 0x0b03,
- 0x0b3c, 0x0b3c,
- 0x0b3e, 0x0b44,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b62, 0x0b63,
- 0x0b82, 0x0b82,
- 0x0bbe, 0x0bc2,
- 0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcd,
- 0x0bd7, 0x0bd7,
- 0x0c01, 0x0c03,
- 0x0c3e, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c62, 0x0c63,
- 0x0c82, 0x0c83,
- 0x0cbc, 0x0cbc,
- 0x0cbe, 0x0cc4,
- 0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccd,
- 0x0cd5, 0x0cd6,
- 0x0ce2, 0x0ce3,
- 0x0d02, 0x0d03,
- 0x0d3e, 0x0d44,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d62, 0x0d63,
- 0x0d82, 0x0d83,
- 0x0dca, 0x0dca,
- 0x0dcf, 0x0dd4,
- 0x0dd6, 0x0dd6,
- 0x0dd8, 0x0ddf,
- 0x0df2, 0x0df3,
- 0x0e31, 0x0e31,
- 0x0e34, 0x0e3a,
- 0x0e47, 0x0e4e,
- 0x0eb1, 0x0eb1,
- 0x0eb4, 0x0eb9,
- 0x0ebb, 0x0ebc,
- 0x0ec8, 0x0ecd,
- 0x0f18, 0x0f19,
- 0x0f35, 0x0f35,
- 0x0f37, 0x0f37,
- 0x0f39, 0x0f39,
- 0x0f3e, 0x0f3f,
- 0x0f71, 0x0f84,
- 0x0f86, 0x0f87,
- 0x0f90, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fc6, 0x0fc6,
- 0x102b, 0x103e,
- 0x1056, 0x1059,
- 0x105e, 0x1060,
- 0x1062, 0x1064,
- 0x1067, 0x106d,
- 0x1071, 0x1074,
- 0x1082, 0x108d,
- 0x108f, 0x108f,
- 0x135f, 0x135f,
- 0x1712, 0x1714,
- 0x1732, 0x1734,
- 0x1752, 0x1753,
- 0x1772, 0x1773,
- 0x17b6, 0x17d3,
- 0x17dd, 0x17dd,
- 0x180b, 0x180d,
- 0x18a9, 0x18a9,
- 0x1920, 0x192b,
- 0x1930, 0x193b,
- 0x19b0, 0x19c0,
- 0x19c8, 0x19c9,
- 0x1a17, 0x1a1b,
- 0x1b00, 0x1b04,
- 0x1b34, 0x1b44,
- 0x1b6b, 0x1b73,
- 0x1b80, 0x1b82,
- 0x1ba1, 0x1baa,
- 0x1c24, 0x1c37,
- 0x1dc0, 0x1de6,
- 0x1dfe, 0x1dff,
- 0x20d0, 0x20f0,
- 0x2de0, 0x2dff,
- 0x302a, 0x302f,
- 0x3099, 0x309a,
- 0xa66f, 0xa672,
- 0xa67c, 0xa67d,
- 0xa802, 0xa802,
- 0xa806, 0xa806,
- 0xa80b, 0xa80b,
- 0xa823, 0xa827,
- 0xa880, 0xa881,
- 0xa8b4, 0xa8c4,
- 0xa926, 0xa92d,
- 0xa947, 0xa953,
- 0xaa29, 0xaa36,
- 0xaa43, 0xaa43,
- 0xaa4c, 0xaa4d,
- 0xfb1e, 0xfb1e,
- 0xfe00, 0xfe0f,
- 0xfe20, 0xfe26,
- 0x101fd, 0x101fd,
- 0x10a01, 0x10a03,
- 0x10a05, 0x10a06,
- 0x10a0c, 0x10a0f,
- 0x10a38, 0x10a3a,
- 0x10a3f, 0x10a3f,
- 0x1d165, 0x1d169,
- 0x1d16d, 0x1d172,
- 0x1d17b, 0x1d182,
- 0x1d185, 0x1d18b,
- 0x1d1aa, 0x1d1ad,
- 0x1d242, 0x1d244,
- 0xe0100, 0xe01ef,
-}; /* CR_M */
-
-/* 'Mc': General Category */
-static const OnigCodePoint CR_Mc[] = {
- 85,
- 0x0903, 0x0903,
- 0x093e, 0x0940,
- 0x0949, 0x094c,
- 0x0982, 0x0983,
- 0x09be, 0x09c0,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09cc,
- 0x09d7, 0x09d7,
- 0x0a03, 0x0a03,
- 0x0a3e, 0x0a40,
- 0x0a83, 0x0a83,
- 0x0abe, 0x0ac0,
- 0x0ac9, 0x0ac9,
- 0x0acb, 0x0acc,
- 0x0b02, 0x0b03,
- 0x0b3e, 0x0b3e,
- 0x0b40, 0x0b40,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4c,
- 0x0b57, 0x0b57,
- 0x0bbe, 0x0bbf,
- 0x0bc1, 0x0bc2,
- 0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcc,
- 0x0bd7, 0x0bd7,
- 0x0c01, 0x0c03,
- 0x0c41, 0x0c44,
- 0x0c82, 0x0c83,
- 0x0cbe, 0x0cbe,
- 0x0cc0, 0x0cc4,
- 0x0cc7, 0x0cc8,
- 0x0cca, 0x0ccb,
- 0x0cd5, 0x0cd6,
- 0x0d02, 0x0d03,
- 0x0d3e, 0x0d40,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4c,
- 0x0d57, 0x0d57,
- 0x0d82, 0x0d83,
- 0x0dcf, 0x0dd1,
- 0x0dd8, 0x0ddf,
- 0x0df2, 0x0df3,
- 0x0f3e, 0x0f3f,
- 0x0f7f, 0x0f7f,
- 0x102b, 0x102c,
- 0x1031, 0x1031,
- 0x1038, 0x1038,
- 0x103b, 0x103c,
- 0x1056, 0x1057,
- 0x1062, 0x1064,
- 0x1067, 0x106d,
- 0x1083, 0x1084,
- 0x1087, 0x108c,
- 0x108f, 0x108f,
- 0x17b6, 0x17b6,
- 0x17be, 0x17c5,
- 0x17c7, 0x17c8,
- 0x1923, 0x1926,
- 0x1929, 0x192b,
- 0x1930, 0x1931,
- 0x1933, 0x1938,
- 0x19b0, 0x19c0,
- 0x19c8, 0x19c9,
- 0x1a19, 0x1a1b,
- 0x1b04, 0x1b04,
- 0x1b35, 0x1b35,
- 0x1b3b, 0x1b3b,
- 0x1b3d, 0x1b41,
- 0x1b43, 0x1b44,
- 0x1b82, 0x1b82,
- 0x1ba1, 0x1ba1,
- 0x1ba6, 0x1ba7,
- 0x1baa, 0x1baa,
- 0x1c24, 0x1c2b,
- 0x1c34, 0x1c35,
- 0xa823, 0xa824,
- 0xa827, 0xa827,
- 0xa880, 0xa881,
- 0xa8b4, 0xa8c3,
- 0xa952, 0xa953,
- 0xaa2f, 0xaa30,
- 0xaa33, 0xaa34,
- 0xaa4d, 0xaa4d,
- 0x1d165, 0x1d166,
- 0x1d16d, 0x1d172,
-}; /* CR_Mc */
-
-/* 'Me': General Category */
-static const OnigCodePoint CR_Me[] = {
- 5,
- 0x0488, 0x0489,
- 0x06de, 0x06de,
- 0x20dd, 0x20e0,
- 0x20e2, 0x20e4,
- 0xa670, 0xa672,
-}; /* CR_Me */
-
-/* 'Mn': General Category */
-static const OnigCodePoint CR_Mn[] = {
- 160,
- 0x0300, 0x036f,
- 0x0483, 0x0487,
- 0x0591, 0x05bd,
- 0x05bf, 0x05bf,
- 0x05c1, 0x05c2,
- 0x05c4, 0x05c5,
- 0x05c7, 0x05c7,
- 0x0610, 0x061a,
- 0x064b, 0x065e,
- 0x0670, 0x0670,
- 0x06d6, 0x06dc,
- 0x06df, 0x06e4,
- 0x06e7, 0x06e8,
- 0x06ea, 0x06ed,
- 0x0711, 0x0711,
- 0x0730, 0x074a,
- 0x07a6, 0x07b0,
- 0x07eb, 0x07f3,
- 0x0901, 0x0902,
- 0x093c, 0x093c,
- 0x0941, 0x0948,
- 0x094d, 0x094d,
- 0x0951, 0x0954,
- 0x0962, 0x0963,
- 0x0981, 0x0981,
- 0x09bc, 0x09bc,
- 0x09c1, 0x09c4,
- 0x09cd, 0x09cd,
- 0x09e2, 0x09e3,
- 0x0a01, 0x0a02,
- 0x0a3c, 0x0a3c,
- 0x0a41, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4d,
- 0x0a51, 0x0a51,
- 0x0a70, 0x0a71,
- 0x0a75, 0x0a75,
- 0x0a81, 0x0a82,
- 0x0abc, 0x0abc,
- 0x0ac1, 0x0ac5,
- 0x0ac7, 0x0ac8,
- 0x0acd, 0x0acd,
- 0x0ae2, 0x0ae3,
- 0x0b01, 0x0b01,
- 0x0b3c, 0x0b3c,
- 0x0b3f, 0x0b3f,
- 0x0b41, 0x0b44,
- 0x0b4d, 0x0b4d,
- 0x0b56, 0x0b56,
- 0x0b62, 0x0b63,
- 0x0b82, 0x0b82,
- 0x0bc0, 0x0bc0,
- 0x0bcd, 0x0bcd,
- 0x0c3e, 0x0c40,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c62, 0x0c63,
- 0x0cbc, 0x0cbc,
- 0x0cbf, 0x0cbf,
- 0x0cc6, 0x0cc6,
- 0x0ccc, 0x0ccd,
- 0x0ce2, 0x0ce3,
- 0x0d41, 0x0d44,
- 0x0d4d, 0x0d4d,
- 0x0d62, 0x0d63,
- 0x0dca, 0x0dca,
- 0x0dd2, 0x0dd4,
- 0x0dd6, 0x0dd6,
- 0x0e31, 0x0e31,
- 0x0e34, 0x0e3a,
- 0x0e47, 0x0e4e,
- 0x0eb1, 0x0eb1,
- 0x0eb4, 0x0eb9,
- 0x0ebb, 0x0ebc,
- 0x0ec8, 0x0ecd,
- 0x0f18, 0x0f19,
- 0x0f35, 0x0f35,
- 0x0f37, 0x0f37,
- 0x0f39, 0x0f39,
- 0x0f71, 0x0f7e,
- 0x0f80, 0x0f84,
- 0x0f86, 0x0f87,
- 0x0f90, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fc6, 0x0fc6,
- 0x102d, 0x1030,
- 0x1032, 0x1037,
- 0x1039, 0x103a,
- 0x103d, 0x103e,
- 0x1058, 0x1059,
- 0x105e, 0x1060,
- 0x1071, 0x1074,
- 0x1082, 0x1082,
- 0x1085, 0x1086,
- 0x108d, 0x108d,
- 0x135f, 0x135f,
- 0x1712, 0x1714,
- 0x1732, 0x1734,
- 0x1752, 0x1753,
- 0x1772, 0x1773,
- 0x17b7, 0x17bd,
- 0x17c6, 0x17c6,
- 0x17c9, 0x17d3,
- 0x17dd, 0x17dd,
- 0x180b, 0x180d,
- 0x18a9, 0x18a9,
- 0x1920, 0x1922,
- 0x1927, 0x1928,
- 0x1932, 0x1932,
- 0x1939, 0x193b,
- 0x1a17, 0x1a18,
- 0x1b00, 0x1b03,
- 0x1b34, 0x1b34,
- 0x1b36, 0x1b3a,
- 0x1b3c, 0x1b3c,
- 0x1b42, 0x1b42,
- 0x1b6b, 0x1b73,
- 0x1b80, 0x1b81,
- 0x1ba2, 0x1ba5,
- 0x1ba8, 0x1ba9,
- 0x1c2c, 0x1c33,
- 0x1c36, 0x1c37,
- 0x1dc0, 0x1de6,
- 0x1dfe, 0x1dff,
- 0x20d0, 0x20dc,
- 0x20e1, 0x20e1,
- 0x20e5, 0x20f0,
- 0x2de0, 0x2dff,
- 0x302a, 0x302f,
- 0x3099, 0x309a,
- 0xa66f, 0xa66f,
- 0xa67c, 0xa67d,
- 0xa802, 0xa802,
- 0xa806, 0xa806,
- 0xa80b, 0xa80b,
- 0xa825, 0xa826,
- 0xa8c4, 0xa8c4,
- 0xa926, 0xa92d,
- 0xa947, 0xa951,
- 0xaa29, 0xaa2e,
- 0xaa31, 0xaa32,
- 0xaa35, 0xaa36,
- 0xaa43, 0xaa43,
- 0xaa4c, 0xaa4c,
- 0xfb1e, 0xfb1e,
- 0xfe00, 0xfe0f,
- 0xfe20, 0xfe26,
- 0x101fd, 0x101fd,
- 0x10a01, 0x10a03,
- 0x10a05, 0x10a06,
- 0x10a0c, 0x10a0f,
- 0x10a38, 0x10a3a,
- 0x10a3f, 0x10a3f,
- 0x1d167, 0x1d169,
- 0x1d17b, 0x1d182,
- 0x1d185, 0x1d18b,
- 0x1d1aa, 0x1d1ad,
- 0x1d242, 0x1d244,
- 0xe0100, 0xe01ef,
-}; /* CR_Mn */
-
-/* 'N': Major Category */
-static const OnigCodePoint CR_N[] = {
- 69,
- 0x0030, 0x0039,
- 0x00b2, 0x00b3,
- 0x00b9, 0x00b9,
- 0x00bc, 0x00be,
- 0x0660, 0x0669,
- 0x06f0, 0x06f9,
- 0x07c0, 0x07c9,
- 0x0966, 0x096f,
- 0x09e6, 0x09ef,
- 0x09f4, 0x09f9,
- 0x0a66, 0x0a6f,
- 0x0ae6, 0x0aef,
- 0x0b66, 0x0b6f,
- 0x0be6, 0x0bf2,
- 0x0c66, 0x0c6f,
- 0x0c78, 0x0c7e,
- 0x0ce6, 0x0cef,
- 0x0d66, 0x0d75,
- 0x0e50, 0x0e59,
- 0x0ed0, 0x0ed9,
- 0x0f20, 0x0f33,
- 0x1040, 0x1049,
- 0x1090, 0x1099,
- 0x1369, 0x137c,
- 0x16ee, 0x16f0,
- 0x17e0, 0x17e9,
- 0x17f0, 0x17f9,
- 0x1810, 0x1819,
- 0x1946, 0x194f,
- 0x19d0, 0x19d9,
- 0x1b50, 0x1b59,
- 0x1bb0, 0x1bb9,
- 0x1c40, 0x1c49,
- 0x1c50, 0x1c59,
- 0x2070, 0x2070,
- 0x2074, 0x2079,
- 0x2080, 0x2089,
- 0x2153, 0x2182,
- 0x2185, 0x2188,
- 0x2460, 0x249b,
- 0x24ea, 0x24ff,
- 0x2776, 0x2793,
- 0x2cfd, 0x2cfd,
- 0x3007, 0x3007,
- 0x3021, 0x3029,
- 0x3038, 0x303a,
- 0x3192, 0x3195,
- 0x3220, 0x3229,
- 0x3251, 0x325f,
- 0x3280, 0x3289,
- 0x32b1, 0x32bf,
- 0xa620, 0xa629,
- 0xa8d0, 0xa8d9,
- 0xa900, 0xa909,
- 0xaa50, 0xaa59,
- 0xff10, 0xff19,
- 0x10107, 0x10133,
- 0x10140, 0x10178,
- 0x1018a, 0x1018a,
- 0x10320, 0x10323,
- 0x10341, 0x10341,
- 0x1034a, 0x1034a,
- 0x103d1, 0x103d5,
- 0x104a0, 0x104a9,
- 0x10916, 0x10919,
- 0x10a40, 0x10a47,
- 0x12400, 0x12462,
- 0x1d360, 0x1d371,
- 0x1d7ce, 0x1d7ff,
-}; /* CR_N */
-
-/* 'Nd': General Category */
-static const OnigCodePoint CR_Nd[] = {
- 33,
- 0x0030, 0x0039,
- 0x0660, 0x0669,
- 0x06f0, 0x06f9,
- 0x07c0, 0x07c9,
- 0x0966, 0x096f,
- 0x09e6, 0x09ef,
- 0x0a66, 0x0a6f,
- 0x0ae6, 0x0aef,
- 0x0b66, 0x0b6f,
- 0x0be6, 0x0bef,
- 0x0c66, 0x0c6f,
- 0x0ce6, 0x0cef,
- 0x0d66, 0x0d6f,
- 0x0e50, 0x0e59,
- 0x0ed0, 0x0ed9,
- 0x0f20, 0x0f29,
- 0x1040, 0x1049,
- 0x1090, 0x1099,
- 0x17e0, 0x17e9,
- 0x1810, 0x1819,
- 0x1946, 0x194f,
- 0x19d0, 0x19d9,
- 0x1b50, 0x1b59,
- 0x1bb0, 0x1bb9,
- 0x1c40, 0x1c49,
- 0x1c50, 0x1c59,
- 0xa620, 0xa629,
- 0xa8d0, 0xa8d9,
- 0xa900, 0xa909,
- 0xaa50, 0xaa59,
- 0xff10, 0xff19,
- 0x104a0, 0x104a9,
- 0x1d7ce, 0x1d7ff,
-}; /* CR_Nd */
-
-/* 'Nl': General Category */
-static const OnigCodePoint CR_Nl[] = {
- 11,
- 0x16ee, 0x16f0,
- 0x2160, 0x2182,
- 0x2185, 0x2188,
- 0x3007, 0x3007,
- 0x3021, 0x3029,
- 0x3038, 0x303a,
- 0x10140, 0x10174,
- 0x10341, 0x10341,
- 0x1034a, 0x1034a,
- 0x103d1, 0x103d5,
- 0x12400, 0x12462,
-}; /* CR_Nl */
-
-/* 'No': General Category */
-static const OnigCodePoint CR_No[] = {
- 30,
- 0x00b2, 0x00b3,
- 0x00b9, 0x00b9,
- 0x00bc, 0x00be,
- 0x09f4, 0x09f9,
- 0x0bf0, 0x0bf2,
- 0x0c78, 0x0c7e,
- 0x0d70, 0x0d75,
- 0x0f2a, 0x0f33,
- 0x1369, 0x137c,
- 0x17f0, 0x17f9,
- 0x2070, 0x2070,
- 0x2074, 0x2079,
- 0x2080, 0x2089,
- 0x2153, 0x215f,
- 0x2460, 0x249b,
- 0x24ea, 0x24ff,
- 0x2776, 0x2793,
- 0x2cfd, 0x2cfd,
- 0x3192, 0x3195,
- 0x3220, 0x3229,
- 0x3251, 0x325f,
- 0x3280, 0x3289,
- 0x32b1, 0x32bf,
- 0x10107, 0x10133,
- 0x10175, 0x10178,
- 0x1018a, 0x1018a,
- 0x10320, 0x10323,
- 0x10916, 0x10919,
- 0x10a40, 0x10a47,
- 0x1d360, 0x1d371,
-}; /* CR_No */
-
-/* 'P': Major Category */
-static const OnigCodePoint CR_P[] = {
- 112,
- 0x0021, 0x0023,
- 0x0025, 0x002a,
- 0x002c, 0x002f,
- 0x003a, 0x003b,
- 0x003f, 0x0040,
- 0x005b, 0x005d,
- 0x005f, 0x005f,
- 0x007b, 0x007b,
- 0x007d, 0x007d,
- 0x00a1, 0x00a1,
- 0x00ab, 0x00ab,
- 0x00b7, 0x00b7,
- 0x00bb, 0x00bb,
- 0x00bf, 0x00bf,
- 0x037e, 0x037e,
- 0x0387, 0x0387,
- 0x055a, 0x055f,
- 0x0589, 0x058a,
- 0x05be, 0x05be,
- 0x05c0, 0x05c0,
- 0x05c3, 0x05c3,
- 0x05c6, 0x05c6,
- 0x05f3, 0x05f4,
- 0x0609, 0x060a,
- 0x060c, 0x060d,
- 0x061b, 0x061b,
- 0x061e, 0x061f,
- 0x066a, 0x066d,
- 0x06d4, 0x06d4,
- 0x0700, 0x070d,
- 0x07f7, 0x07f9,
- 0x0964, 0x0965,
- 0x0970, 0x0970,
- 0x0df4, 0x0df4,
- 0x0e4f, 0x0e4f,
- 0x0e5a, 0x0e5b,
- 0x0f04, 0x0f12,
- 0x0f3a, 0x0f3d,
- 0x0f85, 0x0f85,
- 0x0fd0, 0x0fd4,
- 0x104a, 0x104f,
- 0x10fb, 0x10fb,
- 0x1361, 0x1368,
- 0x166d, 0x166e,
- 0x169b, 0x169c,
- 0x16eb, 0x16ed,
- 0x1735, 0x1736,
- 0x17d4, 0x17d6,
- 0x17d8, 0x17da,
- 0x1800, 0x180a,
- 0x1944, 0x1945,
- 0x19de, 0x19df,
- 0x1a1e, 0x1a1f,
- 0x1b5a, 0x1b60,
- 0x1c3b, 0x1c3f,
- 0x1c7e, 0x1c7f,
- 0x2010, 0x2027,
- 0x2030, 0x2043,
- 0x2045, 0x2051,
- 0x2053, 0x205e,
- 0x207d, 0x207e,
- 0x208d, 0x208e,
- 0x2329, 0x232a,
- 0x2768, 0x2775,
- 0x27c5, 0x27c6,
- 0x27e6, 0x27ef,
- 0x2983, 0x2998,
- 0x29d8, 0x29db,
- 0x29fc, 0x29fd,
- 0x2cf9, 0x2cfc,
- 0x2cfe, 0x2cff,
- 0x2e00, 0x2e2e,
- 0x2e30, 0x2e30,
- 0x3001, 0x3003,
- 0x3008, 0x3011,
- 0x3014, 0x301f,
- 0x3030, 0x3030,
- 0x303d, 0x303d,
- 0x30a0, 0x30a0,
- 0x30fb, 0x30fb,
- 0xa60d, 0xa60f,
- 0xa673, 0xa673,
- 0xa67e, 0xa67e,
- 0xa874, 0xa877,
- 0xa8ce, 0xa8cf,
- 0xa92e, 0xa92f,
- 0xa95f, 0xa95f,
- 0xaa5c, 0xaa5f,
- 0xfd3e, 0xfd3f,
- 0xfe10, 0xfe19,
- 0xfe30, 0xfe52,
- 0xfe54, 0xfe61,
- 0xfe63, 0xfe63,
- 0xfe68, 0xfe68,
- 0xfe6a, 0xfe6b,
- 0xff01, 0xff03,
- 0xff05, 0xff0a,
- 0xff0c, 0xff0f,
- 0xff1a, 0xff1b,
- 0xff1f, 0xff20,
- 0xff3b, 0xff3d,
- 0xff3f, 0xff3f,
- 0xff5b, 0xff5b,
- 0xff5d, 0xff5d,
- 0xff5f, 0xff65,
- 0x10100, 0x10101,
- 0x1039f, 0x1039f,
- 0x103d0, 0x103d0,
- 0x1091f, 0x1091f,
- 0x1093f, 0x1093f,
- 0x10a50, 0x10a58,
- 0x12470, 0x12473,
-}; /* CR_P */
-
-/* 'Pc': General Category */
-static const OnigCodePoint CR_Pc[] = {
- 6,
- 0x005f, 0x005f,
- 0x203f, 0x2040,
- 0x2054, 0x2054,
- 0xfe33, 0xfe34,
- 0xfe4d, 0xfe4f,
- 0xff3f, 0xff3f,
-}; /* CR_Pc */
-
-/* 'Pd': General Category */
-static const OnigCodePoint CR_Pd[] = {
- 14,
- 0x002d, 0x002d,
- 0x058a, 0x058a,
- 0x05be, 0x05be,
- 0x1806, 0x1806,
- 0x2010, 0x2015,
- 0x2e17, 0x2e17,
- 0x2e1a, 0x2e1a,
- 0x301c, 0x301c,
- 0x3030, 0x3030,
- 0x30a0, 0x30a0,
- 0xfe31, 0xfe32,
- 0xfe58, 0xfe58,
- 0xfe63, 0xfe63,
- 0xff0d, 0xff0d,
-}; /* CR_Pd */
-
-/* 'Pe': General Category */
-static const OnigCodePoint CR_Pe[] = {
- 70,
- 0x0029, 0x0029,
- 0x005d, 0x005d,
- 0x007d, 0x007d,
- 0x0f3b, 0x0f3b,
- 0x0f3d, 0x0f3d,
- 0x169c, 0x169c,
- 0x2046, 0x2046,
- 0x207e, 0x207e,
- 0x208e, 0x208e,
- 0x232a, 0x232a,
- 0x2769, 0x2769,
- 0x276b, 0x276b,
- 0x276d, 0x276d,
- 0x276f, 0x276f,
- 0x2771, 0x2771,
- 0x2773, 0x2773,
- 0x2775, 0x2775,
- 0x27c6, 0x27c6,
- 0x27e7, 0x27e7,
- 0x27e9, 0x27e9,
- 0x27eb, 0x27eb,
- 0x27ed, 0x27ed,
- 0x27ef, 0x27ef,
- 0x2984, 0x2984,
- 0x2986, 0x2986,
- 0x2988, 0x2988,
- 0x298a, 0x298a,
- 0x298c, 0x298c,
- 0x298e, 0x298e,
- 0x2990, 0x2990,
- 0x2992, 0x2992,
- 0x2994, 0x2994,
- 0x2996, 0x2996,
- 0x2998, 0x2998,
- 0x29d9, 0x29d9,
- 0x29db, 0x29db,
- 0x29fd, 0x29fd,
- 0x2e23, 0x2e23,
- 0x2e25, 0x2e25,
- 0x2e27, 0x2e27,
- 0x2e29, 0x2e29,
- 0x3009, 0x3009,
- 0x300b, 0x300b,
- 0x300d, 0x300d,
- 0x300f, 0x300f,
- 0x3011, 0x3011,
- 0x3015, 0x3015,
- 0x3017, 0x3017,
- 0x3019, 0x3019,
- 0x301b, 0x301b,
- 0x301e, 0x301f,
- 0xfd3f, 0xfd3f,
- 0xfe18, 0xfe18,
- 0xfe36, 0xfe36,
- 0xfe38, 0xfe38,
- 0xfe3a, 0xfe3a,
- 0xfe3c, 0xfe3c,
- 0xfe3e, 0xfe3e,
- 0xfe40, 0xfe40,
- 0xfe42, 0xfe42,
- 0xfe44, 0xfe44,
- 0xfe48, 0xfe48,
- 0xfe5a, 0xfe5a,
- 0xfe5c, 0xfe5c,
- 0xfe5e, 0xfe5e,
- 0xff09, 0xff09,
- 0xff3d, 0xff3d,
- 0xff5d, 0xff5d,
- 0xff60, 0xff60,
- 0xff63, 0xff63,
-}; /* CR_Pe */
-
-/* 'Pf': General Category */
-static const OnigCodePoint CR_Pf[] = {
- 10,
- 0x00bb, 0x00bb,
- 0x2019, 0x2019,
- 0x201d, 0x201d,
- 0x203a, 0x203a,
- 0x2e03, 0x2e03,
- 0x2e05, 0x2e05,
- 0x2e0a, 0x2e0a,
- 0x2e0d, 0x2e0d,
- 0x2e1d, 0x2e1d,
- 0x2e21, 0x2e21,
-}; /* CR_Pf */
-
-/* 'Pi': General Category */
-static const OnigCodePoint CR_Pi[] = {
- 11,
- 0x00ab, 0x00ab,
- 0x2018, 0x2018,
- 0x201b, 0x201c,
- 0x201f, 0x201f,
- 0x2039, 0x2039,
- 0x2e02, 0x2e02,
- 0x2e04, 0x2e04,
- 0x2e09, 0x2e09,
- 0x2e0c, 0x2e0c,
- 0x2e1c, 0x2e1c,
- 0x2e20, 0x2e20,
-}; /* CR_Pi */
-
-/* 'Po': General Category */
-static const OnigCodePoint CR_Po[] = {
- 108,
- 0x0021, 0x0023,
- 0x0025, 0x0027,
- 0x002a, 0x002a,
- 0x002c, 0x002c,
- 0x002e, 0x002f,
- 0x003a, 0x003b,
- 0x003f, 0x0040,
- 0x005c, 0x005c,
- 0x00a1, 0x00a1,
- 0x00b7, 0x00b7,
- 0x00bf, 0x00bf,
- 0x037e, 0x037e,
- 0x0387, 0x0387,
- 0x055a, 0x055f,
- 0x0589, 0x0589,
- 0x05c0, 0x05c0,
- 0x05c3, 0x05c3,
- 0x05c6, 0x05c6,
- 0x05f3, 0x05f4,
- 0x0609, 0x060a,
- 0x060c, 0x060d,
- 0x061b, 0x061b,
- 0x061e, 0x061f,
- 0x066a, 0x066d,
- 0x06d4, 0x06d4,
- 0x0700, 0x070d,
- 0x07f7, 0x07f9,
- 0x0964, 0x0965,
- 0x0970, 0x0970,
- 0x0df4, 0x0df4,
- 0x0e4f, 0x0e4f,
- 0x0e5a, 0x0e5b,
- 0x0f04, 0x0f12,
- 0x0f85, 0x0f85,
- 0x0fd0, 0x0fd4,
- 0x104a, 0x104f,
- 0x10fb, 0x10fb,
- 0x1361, 0x1368,
- 0x166d, 0x166e,
- 0x16eb, 0x16ed,
- 0x1735, 0x1736,
- 0x17d4, 0x17d6,
- 0x17d8, 0x17da,
- 0x1800, 0x1805,
- 0x1807, 0x180a,
- 0x1944, 0x1945,
- 0x19de, 0x19df,
- 0x1a1e, 0x1a1f,
- 0x1b5a, 0x1b60,
- 0x1c3b, 0x1c3f,
- 0x1c7e, 0x1c7f,
- 0x2016, 0x2017,
- 0x2020, 0x2027,
- 0x2030, 0x2038,
- 0x203b, 0x203e,
- 0x2041, 0x2043,
- 0x2047, 0x2051,
- 0x2053, 0x2053,
- 0x2055, 0x205e,
- 0x2cf9, 0x2cfc,
- 0x2cfe, 0x2cff,
- 0x2e00, 0x2e01,
- 0x2e06, 0x2e08,
- 0x2e0b, 0x2e0b,
- 0x2e0e, 0x2e16,
- 0x2e18, 0x2e19,
- 0x2e1b, 0x2e1b,
- 0x2e1e, 0x2e1f,
- 0x2e2a, 0x2e2e,
- 0x2e30, 0x2e30,
- 0x3001, 0x3003,
- 0x303d, 0x303d,
- 0x30fb, 0x30fb,
- 0xa60d, 0xa60f,
- 0xa673, 0xa673,
- 0xa67e, 0xa67e,
- 0xa874, 0xa877,
- 0xa8ce, 0xa8cf,
- 0xa92e, 0xa92f,
- 0xa95f, 0xa95f,
- 0xaa5c, 0xaa5f,
- 0xfe10, 0xfe16,
- 0xfe19, 0xfe19,
- 0xfe30, 0xfe30,
- 0xfe45, 0xfe46,
- 0xfe49, 0xfe4c,
- 0xfe50, 0xfe52,
- 0xfe54, 0xfe57,
- 0xfe5f, 0xfe61,
- 0xfe68, 0xfe68,
- 0xfe6a, 0xfe6b,
- 0xff01, 0xff03,
- 0xff05, 0xff07,
- 0xff0a, 0xff0a,
- 0xff0c, 0xff0c,
- 0xff0e, 0xff0f,
- 0xff1a, 0xff1b,
- 0xff1f, 0xff20,
- 0xff3c, 0xff3c,
- 0xff61, 0xff61,
- 0xff64, 0xff65,
- 0x10100, 0x10101,
- 0x1039f, 0x1039f,
- 0x103d0, 0x103d0,
- 0x1091f, 0x1091f,
- 0x1093f, 0x1093f,
- 0x10a50, 0x10a58,
- 0x12470, 0x12473,
-}; /* CR_Po */
-
-/* 'Ps': General Category */
-static const OnigCodePoint CR_Ps[] = {
- 72,
- 0x0028, 0x0028,
- 0x005b, 0x005b,
- 0x007b, 0x007b,
- 0x0f3a, 0x0f3a,
- 0x0f3c, 0x0f3c,
- 0x169b, 0x169b,
- 0x201a, 0x201a,
- 0x201e, 0x201e,
- 0x2045, 0x2045,
- 0x207d, 0x207d,
- 0x208d, 0x208d,
- 0x2329, 0x2329,
- 0x2768, 0x2768,
- 0x276a, 0x276a,
- 0x276c, 0x276c,
- 0x276e, 0x276e,
- 0x2770, 0x2770,
- 0x2772, 0x2772,
- 0x2774, 0x2774,
- 0x27c5, 0x27c5,
- 0x27e6, 0x27e6,
- 0x27e8, 0x27e8,
- 0x27ea, 0x27ea,
- 0x27ec, 0x27ec,
- 0x27ee, 0x27ee,
- 0x2983, 0x2983,
- 0x2985, 0x2985,
- 0x2987, 0x2987,
- 0x2989, 0x2989,
- 0x298b, 0x298b,
- 0x298d, 0x298d,
- 0x298f, 0x298f,
- 0x2991, 0x2991,
- 0x2993, 0x2993,
- 0x2995, 0x2995,
- 0x2997, 0x2997,
- 0x29d8, 0x29d8,
- 0x29da, 0x29da,
- 0x29fc, 0x29fc,
- 0x2e22, 0x2e22,
- 0x2e24, 0x2e24,
- 0x2e26, 0x2e26,
- 0x2e28, 0x2e28,
- 0x3008, 0x3008,
- 0x300a, 0x300a,
- 0x300c, 0x300c,
- 0x300e, 0x300e,
- 0x3010, 0x3010,
- 0x3014, 0x3014,
- 0x3016, 0x3016,
- 0x3018, 0x3018,
- 0x301a, 0x301a,
- 0x301d, 0x301d,
- 0xfd3e, 0xfd3e,
- 0xfe17, 0xfe17,
- 0xfe35, 0xfe35,
- 0xfe37, 0xfe37,
- 0xfe39, 0xfe39,
- 0xfe3b, 0xfe3b,
- 0xfe3d, 0xfe3d,
- 0xfe3f, 0xfe3f,
- 0xfe41, 0xfe41,
- 0xfe43, 0xfe43,
- 0xfe47, 0xfe47,
- 0xfe59, 0xfe59,
- 0xfe5b, 0xfe5b,
- 0xfe5d, 0xfe5d,
- 0xff08, 0xff08,
- 0xff3b, 0xff3b,
- 0xff5b, 0xff5b,
- 0xff5f, 0xff5f,
- 0xff62, 0xff62,
-}; /* CR_Ps */
-
-/* 'S': Major Category */
-static const OnigCodePoint CR_S[] = {
- 179,
- 0x0024, 0x0024,
- 0x002b, 0x002b,
- 0x003c, 0x003e,
- 0x005e, 0x005e,
- 0x0060, 0x0060,
- 0x007c, 0x007c,
- 0x007e, 0x007e,
- 0x00a2, 0x00a9,
- 0x00ac, 0x00ac,
- 0x00ae, 0x00b1,
- 0x00b4, 0x00b4,
- 0x00b6, 0x00b6,
- 0x00b8, 0x00b8,
- 0x00d7, 0x00d7,
- 0x00f7, 0x00f7,
- 0x02c2, 0x02c5,
- 0x02d2, 0x02df,
- 0x02e5, 0x02eb,
- 0x02ed, 0x02ed,
- 0x02ef, 0x02ff,
- 0x0375, 0x0375,
- 0x0384, 0x0385,
- 0x03f6, 0x03f6,
- 0x0482, 0x0482,
- 0x0606, 0x0608,
- 0x060b, 0x060b,
- 0x060e, 0x060f,
- 0x06e9, 0x06e9,
- 0x06fd, 0x06fe,
- 0x07f6, 0x07f6,
- 0x09f2, 0x09f3,
- 0x09fa, 0x09fa,
- 0x0af1, 0x0af1,
- 0x0b70, 0x0b70,
- 0x0bf3, 0x0bfa,
- 0x0c7f, 0x0c7f,
- 0x0cf1, 0x0cf2,
- 0x0d79, 0x0d79,
- 0x0e3f, 0x0e3f,
- 0x0f01, 0x0f03,
- 0x0f13, 0x0f17,
- 0x0f1a, 0x0f1f,
- 0x0f34, 0x0f34,
- 0x0f36, 0x0f36,
- 0x0f38, 0x0f38,
- 0x0fbe, 0x0fc5,
- 0x0fc7, 0x0fcc,
- 0x0fce, 0x0fcf,
- 0x109e, 0x109f,
- 0x1360, 0x1360,
- 0x1390, 0x1399,
- 0x17db, 0x17db,
- 0x1940, 0x1940,
- 0x19e0, 0x19ff,
- 0x1b61, 0x1b6a,
- 0x1b74, 0x1b7c,
- 0x1fbd, 0x1fbd,
- 0x1fbf, 0x1fc1,
- 0x1fcd, 0x1fcf,
- 0x1fdd, 0x1fdf,
- 0x1fed, 0x1fef,
- 0x1ffd, 0x1ffe,
- 0x2044, 0x2044,
- 0x2052, 0x2052,
- 0x207a, 0x207c,
- 0x208a, 0x208c,
- 0x20a0, 0x20b5,
- 0x2100, 0x2101,
- 0x2103, 0x2106,
- 0x2108, 0x2109,
- 0x2114, 0x2114,
- 0x2116, 0x2118,
- 0x211e, 0x2123,
- 0x2125, 0x2125,
- 0x2127, 0x2127,
- 0x2129, 0x2129,
- 0x212e, 0x212e,
- 0x213a, 0x213b,
- 0x2140, 0x2144,
- 0x214a, 0x214d,
- 0x214f, 0x214f,
- 0x2190, 0x2328,
- 0x232b, 0x23e7,
- 0x2400, 0x2426,
- 0x2440, 0x244a,
- 0x249c, 0x24e9,
- 0x2500, 0x269d,
- 0x26a0, 0x26bc,
- 0x26c0, 0x26c3,
- 0x2701, 0x2704,
- 0x2706, 0x2709,
- 0x270c, 0x2727,
- 0x2729, 0x274b,
- 0x274d, 0x274d,
- 0x274f, 0x2752,
- 0x2756, 0x2756,
- 0x2758, 0x275e,
- 0x2761, 0x2767,
- 0x2794, 0x2794,
- 0x2798, 0x27af,
- 0x27b1, 0x27be,
- 0x27c0, 0x27c4,
- 0x27c7, 0x27ca,
- 0x27cc, 0x27cc,
- 0x27d0, 0x27e5,
- 0x27f0, 0x2982,
- 0x2999, 0x29d7,
- 0x29dc, 0x29fb,
- 0x29fe, 0x2b4c,
- 0x2b50, 0x2b54,
- 0x2ce5, 0x2cea,
- 0x2e80, 0x2e99,
- 0x2e9b, 0x2ef3,
- 0x2f00, 0x2fd5,
- 0x2ff0, 0x2ffb,
- 0x3004, 0x3004,
- 0x3012, 0x3013,
- 0x3020, 0x3020,
- 0x3036, 0x3037,
- 0x303e, 0x303f,
- 0x309b, 0x309c,
- 0x3190, 0x3191,
- 0x3196, 0x319f,
- 0x31c0, 0x31e3,
- 0x3200, 0x321e,
- 0x322a, 0x3243,
- 0x3250, 0x3250,
- 0x3260, 0x327f,
- 0x328a, 0x32b0,
- 0x32c0, 0x32fe,
- 0x3300, 0x33ff,
- 0x4dc0, 0x4dff,
- 0xa490, 0xa4c6,
- 0xa700, 0xa716,
- 0xa720, 0xa721,
- 0xa789, 0xa78a,
- 0xa828, 0xa82b,
- 0xfb29, 0xfb29,
- 0xfdfc, 0xfdfd,
- 0xfe62, 0xfe62,
- 0xfe64, 0xfe66,
- 0xfe69, 0xfe69,
- 0xff04, 0xff04,
- 0xff0b, 0xff0b,
- 0xff1c, 0xff1e,
- 0xff3e, 0xff3e,
- 0xff40, 0xff40,
- 0xff5c, 0xff5c,
- 0xff5e, 0xff5e,
- 0xffe0, 0xffe6,
- 0xffe8, 0xffee,
- 0xfffc, 0xfffd,
- 0x10102, 0x10102,
- 0x10137, 0x1013f,
- 0x10179, 0x10189,
- 0x10190, 0x1019b,
- 0x101d0, 0x101fc,
- 0x1d000, 0x1d0f5,
- 0x1d100, 0x1d126,
- 0x1d129, 0x1d164,
- 0x1d16a, 0x1d16c,
- 0x1d183, 0x1d184,
- 0x1d18c, 0x1d1a9,
- 0x1d1ae, 0x1d1dd,
- 0x1d200, 0x1d241,
- 0x1d245, 0x1d245,
- 0x1d300, 0x1d356,
- 0x1d6c1, 0x1d6c1,
- 0x1d6db, 0x1d6db,
- 0x1d6fb, 0x1d6fb,
- 0x1d715, 0x1d715,
- 0x1d735, 0x1d735,
- 0x1d74f, 0x1d74f,
- 0x1d76f, 0x1d76f,
- 0x1d789, 0x1d789,
- 0x1d7a9, 0x1d7a9,
- 0x1d7c3, 0x1d7c3,
- 0x1f000, 0x1f02b,
- 0x1f030, 0x1f093,
-}; /* CR_S */
-
-/* 'Sc': General Category */
-static const OnigCodePoint CR_Sc[] = {
- 14,
- 0x0024, 0x0024,
- 0x00a2, 0x00a5,
- 0x060b, 0x060b,
- 0x09f2, 0x09f3,
- 0x0af1, 0x0af1,
- 0x0bf9, 0x0bf9,
- 0x0e3f, 0x0e3f,
- 0x17db, 0x17db,
- 0x20a0, 0x20b5,
- 0xfdfc, 0xfdfc,
- 0xfe69, 0xfe69,
- 0xff04, 0xff04,
- 0xffe0, 0xffe1,
- 0xffe5, 0xffe6,
-}; /* CR_Sc */
-
-/* 'Sk': General Category */
-static const OnigCodePoint CR_Sk[] = {
- 26,
- 0x005e, 0x005e,
- 0x0060, 0x0060,
- 0x00a8, 0x00a8,
- 0x00af, 0x00af,
- 0x00b4, 0x00b4,
- 0x00b8, 0x00b8,
- 0x02c2, 0x02c5,
- 0x02d2, 0x02df,
- 0x02e5, 0x02eb,
- 0x02ed, 0x02ed,
- 0x02ef, 0x02ff,
- 0x0375, 0x0375,
- 0x0384, 0x0385,
- 0x1fbd, 0x1fbd,
- 0x1fbf, 0x1fc1,
- 0x1fcd, 0x1fcf,
- 0x1fdd, 0x1fdf,
- 0x1fed, 0x1fef,
- 0x1ffd, 0x1ffe,
- 0x309b, 0x309c,
- 0xa700, 0xa716,
- 0xa720, 0xa721,
- 0xa789, 0xa78a,
- 0xff3e, 0xff3e,
- 0xff40, 0xff40,
- 0xffe3, 0xffe3,
-}; /* CR_Sk */
-
-/* 'Sm': General Category */
-static const OnigCodePoint CR_Sm[] = {
- 65,
- 0x002b, 0x002b,
- 0x003c, 0x003e,
- 0x007c, 0x007c,
- 0x007e, 0x007e,
- 0x00ac, 0x00ac,
- 0x00b1, 0x00b1,
- 0x00d7, 0x00d7,
- 0x00f7, 0x00f7,
- 0x03f6, 0x03f6,
- 0x0606, 0x0608,
- 0x2044, 0x2044,
- 0x2052, 0x2052,
- 0x207a, 0x207c,
- 0x208a, 0x208c,
- 0x2140, 0x2144,
- 0x214b, 0x214b,
- 0x2190, 0x2194,
- 0x219a, 0x219b,
- 0x21a0, 0x21a0,
- 0x21a3, 0x21a3,
- 0x21a6, 0x21a6,
- 0x21ae, 0x21ae,
- 0x21ce, 0x21cf,
- 0x21d2, 0x21d2,
- 0x21d4, 0x21d4,
- 0x21f4, 0x22ff,
- 0x2308, 0x230b,
- 0x2320, 0x2321,
- 0x237c, 0x237c,
- 0x239b, 0x23b3,
- 0x23dc, 0x23e1,
- 0x25b7, 0x25b7,
- 0x25c1, 0x25c1,
- 0x25f8, 0x25ff,
- 0x266f, 0x266f,
- 0x27c0, 0x27c4,
- 0x27c7, 0x27ca,
- 0x27cc, 0x27cc,
- 0x27d0, 0x27e5,
- 0x27f0, 0x27ff,
- 0x2900, 0x2982,
- 0x2999, 0x29d7,
- 0x29dc, 0x29fb,
- 0x29fe, 0x2aff,
- 0x2b30, 0x2b44,
- 0x2b47, 0x2b4c,
- 0xfb29, 0xfb29,
- 0xfe62, 0xfe62,
- 0xfe64, 0xfe66,
- 0xff0b, 0xff0b,
- 0xff1c, 0xff1e,
- 0xff5c, 0xff5c,
- 0xff5e, 0xff5e,
- 0xffe2, 0xffe2,
- 0xffe9, 0xffec,
- 0x1d6c1, 0x1d6c1,
- 0x1d6db, 0x1d6db,
- 0x1d6fb, 0x1d6fb,
- 0x1d715, 0x1d715,
- 0x1d735, 0x1d735,
- 0x1d74f, 0x1d74f,
- 0x1d76f, 0x1d76f,
- 0x1d789, 0x1d789,
- 0x1d7a9, 0x1d7a9,
- 0x1d7c3, 0x1d7c3,
-}; /* CR_Sm */
-
-/* 'So': General Category */
-static const OnigCodePoint CR_So[] = {
- 134,
- 0x00a6, 0x00a7,
- 0x00a9, 0x00a9,
- 0x00ae, 0x00ae,
- 0x00b0, 0x00b0,
- 0x00b6, 0x00b6,
- 0x0482, 0x0482,
- 0x060e, 0x060f,
- 0x06e9, 0x06e9,
- 0x06fd, 0x06fe,
- 0x07f6, 0x07f6,
- 0x09fa, 0x09fa,
- 0x0b70, 0x0b70,
- 0x0bf3, 0x0bf8,
- 0x0bfa, 0x0bfa,
- 0x0c7f, 0x0c7f,
- 0x0cf1, 0x0cf2,
- 0x0d79, 0x0d79,
- 0x0f01, 0x0f03,
- 0x0f13, 0x0f17,
- 0x0f1a, 0x0f1f,
- 0x0f34, 0x0f34,
- 0x0f36, 0x0f36,
- 0x0f38, 0x0f38,
- 0x0fbe, 0x0fc5,
- 0x0fc7, 0x0fcc,
- 0x0fce, 0x0fcf,
- 0x109e, 0x109f,
- 0x1360, 0x1360,
- 0x1390, 0x1399,
- 0x1940, 0x1940,
- 0x19e0, 0x19ff,
- 0x1b61, 0x1b6a,
- 0x1b74, 0x1b7c,
- 0x2100, 0x2101,
- 0x2103, 0x2106,
- 0x2108, 0x2109,
- 0x2114, 0x2114,
- 0x2116, 0x2118,
- 0x211e, 0x2123,
- 0x2125, 0x2125,
- 0x2127, 0x2127,
- 0x2129, 0x2129,
- 0x212e, 0x212e,
- 0x213a, 0x213b,
- 0x214a, 0x214a,
- 0x214c, 0x214d,
- 0x214f, 0x214f,
- 0x2195, 0x2199,
- 0x219c, 0x219f,
- 0x21a1, 0x21a2,
- 0x21a4, 0x21a5,
- 0x21a7, 0x21ad,
- 0x21af, 0x21cd,
- 0x21d0, 0x21d1,
- 0x21d3, 0x21d3,
- 0x21d5, 0x21f3,
- 0x2300, 0x2307,
- 0x230c, 0x231f,
- 0x2322, 0x2328,
- 0x232b, 0x237b,
- 0x237d, 0x239a,
- 0x23b4, 0x23db,
- 0x23e2, 0x23e7,
- 0x2400, 0x2426,
- 0x2440, 0x244a,
- 0x249c, 0x24e9,
- 0x2500, 0x25b6,
- 0x25b8, 0x25c0,
- 0x25c2, 0x25f7,
- 0x2600, 0x266e,
- 0x2670, 0x269d,
- 0x26a0, 0x26bc,
- 0x26c0, 0x26c3,
- 0x2701, 0x2704,
- 0x2706, 0x2709,
- 0x270c, 0x2727,
- 0x2729, 0x274b,
- 0x274d, 0x274d,
- 0x274f, 0x2752,
- 0x2756, 0x2756,
- 0x2758, 0x275e,
- 0x2761, 0x2767,
- 0x2794, 0x2794,
- 0x2798, 0x27af,
- 0x27b1, 0x27be,
- 0x2800, 0x28ff,
- 0x2b00, 0x2b2f,
- 0x2b45, 0x2b46,
- 0x2b50, 0x2b54,
- 0x2ce5, 0x2cea,
- 0x2e80, 0x2e99,
- 0x2e9b, 0x2ef3,
- 0x2f00, 0x2fd5,
- 0x2ff0, 0x2ffb,
- 0x3004, 0x3004,
- 0x3012, 0x3013,
- 0x3020, 0x3020,
- 0x3036, 0x3037,
- 0x303e, 0x303f,
- 0x3190, 0x3191,
- 0x3196, 0x319f,
- 0x31c0, 0x31e3,
- 0x3200, 0x321e,
- 0x322a, 0x3243,
- 0x3250, 0x3250,
- 0x3260, 0x327f,
- 0x328a, 0x32b0,
- 0x32c0, 0x32fe,
- 0x3300, 0x33ff,
- 0x4dc0, 0x4dff,
- 0xa490, 0xa4c6,
- 0xa828, 0xa82b,
- 0xfdfd, 0xfdfd,
- 0xffe4, 0xffe4,
- 0xffe8, 0xffe8,
- 0xffed, 0xffee,
- 0xfffc, 0xfffd,
- 0x10102, 0x10102,
- 0x10137, 0x1013f,
- 0x10179, 0x10189,
- 0x10190, 0x1019b,
- 0x101d0, 0x101fc,
- 0x1d000, 0x1d0f5,
- 0x1d100, 0x1d126,
- 0x1d129, 0x1d164,
- 0x1d16a, 0x1d16c,
- 0x1d183, 0x1d184,
- 0x1d18c, 0x1d1a9,
- 0x1d1ae, 0x1d1dd,
- 0x1d200, 0x1d241,
- 0x1d245, 0x1d245,
- 0x1d300, 0x1d356,
- 0x1f000, 0x1f02b,
- 0x1f030, 0x1f093,
-}; /* CR_So */
-
-/* 'Z': Major Category */
-static const OnigCodePoint CR_Z[] = {
- 9,
- 0x0020, 0x0020,
- 0x00a0, 0x00a0,
- 0x1680, 0x1680,
- 0x180e, 0x180e,
- 0x2000, 0x200a,
- 0x2028, 0x2029,
- 0x202f, 0x202f,
- 0x205f, 0x205f,
- 0x3000, 0x3000,
-}; /* CR_Z */
-
-/* 'Zl': General Category */
-static const OnigCodePoint CR_Zl[] = {
- 1,
- 0x2028, 0x2028,
-}; /* CR_Zl */
-
-/* 'Zp': General Category */
-static const OnigCodePoint CR_Zp[] = {
- 1,
- 0x2029, 0x2029,
-}; /* CR_Zp */
-
-/* 'Zs': General Category */
-static const OnigCodePoint CR_Zs[] = {
- 8,
- 0x0020, 0x0020,
- 0x00a0, 0x00a0,
- 0x1680, 0x1680,
- 0x180e, 0x180e,
- 0x2000, 0x200a,
- 0x202f, 0x202f,
- 0x205f, 0x205f,
- 0x3000, 0x3000,
-}; /* CR_Zs */
-
-/* 'Common': Script */
-static const OnigCodePoint CR_Common[] = {
- 137,
- 0x0000, 0x0040,
- 0x005b, 0x0060,
- 0x007b, 0x00a9,
- 0x00ab, 0x00b9,
- 0x00bb, 0x00bf,
- 0x00d7, 0x00d7,
- 0x00f7, 0x00f7,
- 0x02b9, 0x02df,
- 0x02e5, 0x02ff,
- 0x0374, 0x0374,
- 0x037e, 0x037e,
- 0x0385, 0x0385,
- 0x0387, 0x0387,
- 0x0589, 0x0589,
- 0x0600, 0x0603,
- 0x060c, 0x060c,
- 0x061b, 0x061b,
- 0x061f, 0x061f,
- 0x0640, 0x0640,
- 0x0660, 0x0669,
- 0x06dd, 0x06dd,
- 0x0964, 0x0965,
- 0x0970, 0x0970,
- 0x0cf1, 0x0cf2,
- 0x0e3f, 0x0e3f,
- 0x10fb, 0x10fb,
- 0x16eb, 0x16ed,
- 0x1735, 0x1736,
- 0x1802, 0x1803,
- 0x1805, 0x1805,
- 0x2000, 0x200b,
- 0x200e, 0x2064,
- 0x206a, 0x2070,
- 0x2074, 0x207e,
- 0x2080, 0x208e,
- 0x20a0, 0x20b5,
- 0x2100, 0x2125,
- 0x2127, 0x2129,
- 0x212c, 0x2131,
- 0x2133, 0x214d,
- 0x214f, 0x214f,
- 0x2153, 0x215f,
- 0x2190, 0x23e7,
- 0x2400, 0x2426,
- 0x2440, 0x244a,
- 0x2460, 0x269d,
- 0x26a0, 0x26bc,
- 0x26c0, 0x26c3,
- 0x2701, 0x2704,
- 0x2706, 0x2709,
- 0x270c, 0x2727,
- 0x2729, 0x274b,
- 0x274d, 0x274d,
- 0x274f, 0x2752,
- 0x2756, 0x2756,
- 0x2758, 0x275e,
- 0x2761, 0x2794,
- 0x2798, 0x27af,
- 0x27b1, 0x27be,
- 0x27c0, 0x27ca,
- 0x27cc, 0x27cc,
- 0x27d0, 0x27ff,
- 0x2900, 0x2b4c,
- 0x2b50, 0x2b54,
- 0x2e00, 0x2e30,
- 0x2ff0, 0x2ffb,
- 0x3000, 0x3004,
- 0x3006, 0x3006,
- 0x3008, 0x3020,
- 0x3030, 0x3037,
- 0x303c, 0x303f,
- 0x309b, 0x309c,
- 0x30a0, 0x30a0,
- 0x30fb, 0x30fc,
- 0x3190, 0x319f,
- 0x31c0, 0x31e3,
- 0x3220, 0x3243,
- 0x3250, 0x325f,
- 0x327f, 0x32cf,
- 0x3358, 0x33ff,
- 0x4dc0, 0x4dff,
- 0xa700, 0xa721,
- 0xa788, 0xa78a,
- 0xfd3e, 0xfd3f,
- 0xfdfd, 0xfdfd,
- 0xfe10, 0xfe19,
- 0xfe30, 0xfe52,
- 0xfe54, 0xfe66,
- 0xfe68, 0xfe6b,
- 0xfeff, 0xfeff,
- 0xff01, 0xff20,
- 0xff3b, 0xff40,
- 0xff5b, 0xff65,
- 0xff70, 0xff70,
- 0xff9e, 0xff9f,
- 0xffe0, 0xffe6,
- 0xffe8, 0xffee,
- 0xfff9, 0xfffd,
- 0x10100, 0x10102,
- 0x10107, 0x10133,
- 0x10137, 0x1013f,
- 0x10190, 0x1019b,
- 0x101d0, 0x101fc,
- 0x1d000, 0x1d0f5,
- 0x1d100, 0x1d126,
- 0x1d129, 0x1d166,
- 0x1d16a, 0x1d17a,
- 0x1d183, 0x1d184,
- 0x1d18c, 0x1d1a9,
- 0x1d1ae, 0x1d1dd,
- 0x1d300, 0x1d356,
- 0x1d360, 0x1d371,
- 0x1d400, 0x1d454,
- 0x1d456, 0x1d49c,
- 0x1d49e, 0x1d49f,
- 0x1d4a2, 0x1d4a2,
- 0x1d4a5, 0x1d4a6,
- 0x1d4a9, 0x1d4ac,
- 0x1d4ae, 0x1d4b9,
- 0x1d4bb, 0x1d4bb,
- 0x1d4bd, 0x1d4c3,
- 0x1d4c5, 0x1d505,
- 0x1d507, 0x1d50a,
- 0x1d50d, 0x1d514,
- 0x1d516, 0x1d51c,
- 0x1d51e, 0x1d539,
- 0x1d53b, 0x1d53e,
- 0x1d540, 0x1d544,
- 0x1d546, 0x1d546,
- 0x1d54a, 0x1d550,
- 0x1d552, 0x1d6a5,
- 0x1d6a8, 0x1d7cb,
- 0x1d7ce, 0x1d7ff,
- 0x1f000, 0x1f02b,
- 0x1f030, 0x1f093,
- 0xe0001, 0xe0001,
- 0xe0020, 0xe007f,
-}; /* CR_Common */
-
-/* 'Latin': Script */
-static const OnigCodePoint CR_Latin[] = {
- 29,
- 0x0041, 0x005a,
- 0x0061, 0x007a,
- 0x00aa, 0x00aa,
- 0x00ba, 0x00ba,
- 0x00c0, 0x00d6,
- 0x00d8, 0x00f6,
- 0x00f8, 0x02b8,
- 0x02e0, 0x02e4,
- 0x1d00, 0x1d25,
- 0x1d2c, 0x1d5c,
- 0x1d62, 0x1d65,
- 0x1d6b, 0x1d77,
- 0x1d79, 0x1dbe,
- 0x1e00, 0x1eff,
- 0x2071, 0x2071,
- 0x207f, 0x207f,
- 0x2090, 0x2094,
- 0x212a, 0x212b,
- 0x2132, 0x2132,
- 0x214e, 0x214e,
- 0x2160, 0x2188,
- 0x2c60, 0x2c6f,
- 0x2c71, 0x2c7d,
- 0xa722, 0xa787,
- 0xa78b, 0xa78c,
- 0xa7fb, 0xa7ff,
- 0xfb00, 0xfb06,
- 0xff21, 0xff3a,
- 0xff41, 0xff5a,
-}; /* CR_Latin */
-
-/* 'Greek': Script */
-static const OnigCodePoint CR_Greek[] = {
- 33,
- 0x0370, 0x0373,
- 0x0375, 0x0377,
- 0x037a, 0x037d,
- 0x0384, 0x0384,
- 0x0386, 0x0386,
- 0x0388, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03e1,
- 0x03f0, 0x03ff,
- 0x1d26, 0x1d2a,
- 0x1d5d, 0x1d61,
- 0x1d66, 0x1d6a,
- 0x1dbf, 0x1dbf,
- 0x1f00, 0x1f15,
- 0x1f18, 0x1f1d,
- 0x1f20, 0x1f45,
- 0x1f48, 0x1f4d,
- 0x1f50, 0x1f57,
- 0x1f59, 0x1f59,
- 0x1f5b, 0x1f5b,
- 0x1f5d, 0x1f5d,
- 0x1f5f, 0x1f7d,
- 0x1f80, 0x1fb4,
- 0x1fb6, 0x1fc4,
- 0x1fc6, 0x1fd3,
- 0x1fd6, 0x1fdb,
- 0x1fdd, 0x1fef,
- 0x1ff2, 0x1ff4,
- 0x1ff6, 0x1ffe,
- 0x2126, 0x2126,
- 0x10140, 0x1018a,
- 0x1d200, 0x1d245,
-}; /* CR_Greek */
-
-/* 'Cyrillic': Script */
-static const OnigCodePoint CR_Cyrillic[] = {
- 7,
- 0x0400, 0x0523,
- 0x1d2b, 0x1d2b,
- 0x1d78, 0x1d78,
- 0x2de0, 0x2dff,
- 0xa640, 0xa65f,
- 0xa662, 0xa673,
- 0xa67c, 0xa697,
-}; /* CR_Cyrillic */
-
-/* 'Armenian': Script */
-static const OnigCodePoint CR_Armenian[] = {
- 5,
- 0x0531, 0x0556,
- 0x0559, 0x055f,
- 0x0561, 0x0587,
- 0x058a, 0x058a,
- 0xfb13, 0xfb17,
-}; /* CR_Armenian */
-
-/* 'Hebrew': Script */
-static const OnigCodePoint CR_Hebrew[] = {
- 9,
- 0x0591, 0x05c7,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0xfb1d, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfb4f,
-}; /* CR_Hebrew */
-
-/* 'Arabic': Script */
-static const OnigCodePoint CR_Arabic[] = {
- 17,
- 0x0606, 0x060b,
- 0x060d, 0x061a,
- 0x061e, 0x061e,
- 0x0621, 0x063f,
- 0x0641, 0x064a,
- 0x0656, 0x065e,
- 0x066a, 0x066f,
- 0x0671, 0x06dc,
- 0x06de, 0x06ff,
- 0x0750, 0x077f,
- 0xfb50, 0xfbb1,
- 0xfbd3, 0xfd3d,
- 0xfd50, 0xfd8f,
- 0xfd92, 0xfdc7,
- 0xfdf0, 0xfdfc,
- 0xfe70, 0xfe74,
- 0xfe76, 0xfefc,
-}; /* CR_Arabic */
-
-/* 'Syriac': Script */
-static const OnigCodePoint CR_Syriac[] = {
- 3,
- 0x0700, 0x070d,
- 0x070f, 0x074a,
- 0x074d, 0x074f,
-}; /* CR_Syriac */
-
-/* 'Thaana': Script */
-static const OnigCodePoint CR_Thaana[] = {
- 1,
- 0x0780, 0x07b1,
-}; /* CR_Thaana */
-
-/* 'Devanagari': Script */
-static const OnigCodePoint CR_Devanagari[] = {
- 8,
- 0x0901, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0950,
- 0x0953, 0x0954,
- 0x0958, 0x0963,
- 0x0966, 0x096f,
- 0x0971, 0x0972,
- 0x097b, 0x097f,
-}; /* CR_Devanagari */
-
-/* 'Bengali': Script */
-static const OnigCodePoint CR_Bengali[] = {
- 14,
- 0x0981, 0x0983,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bc, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09ce,
- 0x09d7, 0x09d7,
- 0x09dc, 0x09dd,
- 0x09df, 0x09e3,
- 0x09e6, 0x09fa,
-}; /* CR_Bengali */
-
-/* 'Gurmukhi': Script */
-static const OnigCodePoint CR_Gurmukhi[] = {
- 16,
- 0x0a01, 0x0a03,
- 0x0a05, 0x0a0a,
- 0x0a0f, 0x0a10,
- 0x0a13, 0x0a28,
- 0x0a2a, 0x0a30,
- 0x0a32, 0x0a33,
- 0x0a35, 0x0a36,
- 0x0a38, 0x0a39,
- 0x0a3c, 0x0a3c,
- 0x0a3e, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4d,
- 0x0a51, 0x0a51,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a66, 0x0a75,
-}; /* CR_Gurmukhi */
-
-/* 'Gujarati': Script */
-static const OnigCodePoint CR_Gujarati[] = {
- 14,
- 0x0a81, 0x0a83,
- 0x0a85, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abc, 0x0ac5,
- 0x0ac7, 0x0ac9,
- 0x0acb, 0x0acd,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae3,
- 0x0ae6, 0x0aef,
- 0x0af1, 0x0af1,
-}; /* CR_Gujarati */
-
-/* 'Oriya': Script */
-static const OnigCodePoint CR_Oriya[] = {
- 14,
- 0x0b01, 0x0b03,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b35, 0x0b39,
- 0x0b3c, 0x0b44,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b63,
- 0x0b66, 0x0b71,
-}; /* CR_Oriya */
-
-/* 'Tamil': Script */
-static const OnigCodePoint CR_Tamil[] = {
- 16,
- 0x0b82, 0x0b83,
- 0x0b85, 0x0b8a,
- 0x0b8e, 0x0b90,
- 0x0b92, 0x0b95,
- 0x0b99, 0x0b9a,
- 0x0b9c, 0x0b9c,
- 0x0b9e, 0x0b9f,
- 0x0ba3, 0x0ba4,
- 0x0ba8, 0x0baa,
- 0x0bae, 0x0bb9,
- 0x0bbe, 0x0bc2,
- 0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcd,
- 0x0bd0, 0x0bd0,
- 0x0bd7, 0x0bd7,
- 0x0be6, 0x0bfa,
-}; /* CR_Tamil */
-
-/* 'Telugu': Script */
-static const OnigCodePoint CR_Telugu[] = {
- 14,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3d, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c58, 0x0c59,
- 0x0c60, 0x0c63,
- 0x0c66, 0x0c6f,
- 0x0c78, 0x0c7f,
-}; /* CR_Telugu */
-
-/* 'Kannada': Script */
-static const OnigCodePoint CR_Kannada[] = {
- 13,
- 0x0c82, 0x0c83,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbc, 0x0cc4,
- 0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccd,
- 0x0cd5, 0x0cd6,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce3,
- 0x0ce6, 0x0cef,
-}; /* CR_Kannada */
-
-/* 'Malayalam': Script */
-static const OnigCodePoint CR_Malayalam[] = {
- 12,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3d, 0x0d44,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d63,
- 0x0d66, 0x0d75,
- 0x0d79, 0x0d7f,
-}; /* CR_Malayalam */
-
-/* 'Sinhala': Script */
-static const OnigCodePoint CR_Sinhala[] = {
- 11,
- 0x0d82, 0x0d83,
- 0x0d85, 0x0d96,
- 0x0d9a, 0x0db1,
- 0x0db3, 0x0dbb,
- 0x0dbd, 0x0dbd,
- 0x0dc0, 0x0dc6,
- 0x0dca, 0x0dca,
- 0x0dcf, 0x0dd4,
- 0x0dd6, 0x0dd6,
- 0x0dd8, 0x0ddf,
- 0x0df2, 0x0df4,
-}; /* CR_Sinhala */
-
-/* 'Thai': Script */
-static const OnigCodePoint CR_Thai[] = {
- 2,
- 0x0e01, 0x0e3a,
- 0x0e40, 0x0e5b,
-}; /* CR_Thai */
-
-/* 'Lao': Script */
-static const OnigCodePoint CR_Lao[] = {
- 18,
- 0x0e81, 0x0e82,
- 0x0e84, 0x0e84,
- 0x0e87, 0x0e88,
- 0x0e8a, 0x0e8a,
- 0x0e8d, 0x0e8d,
- 0x0e94, 0x0e97,
- 0x0e99, 0x0e9f,
- 0x0ea1, 0x0ea3,
- 0x0ea5, 0x0ea5,
- 0x0ea7, 0x0ea7,
- 0x0eaa, 0x0eab,
- 0x0ead, 0x0eb9,
- 0x0ebb, 0x0ebd,
- 0x0ec0, 0x0ec4,
- 0x0ec6, 0x0ec6,
- 0x0ec8, 0x0ecd,
- 0x0ed0, 0x0ed9,
- 0x0edc, 0x0edd,
-}; /* CR_Lao */
-
-/* 'Tibetan': Script */
-static const OnigCodePoint CR_Tibetan[] = {
- 7,
- 0x0f00, 0x0f47,
- 0x0f49, 0x0f6c,
- 0x0f71, 0x0f8b,
- 0x0f90, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fbe, 0x0fcc,
- 0x0fce, 0x0fd4,
-}; /* CR_Tibetan */
-
-/* 'Myanmar': Script */
-static const OnigCodePoint CR_Myanmar[] = {
- 2,
- 0x1000, 0x1099,
- 0x109e, 0x109f,
-}; /* CR_Myanmar */
-
-/* 'Georgian': Script */
-static const OnigCodePoint CR_Georgian[] = {
- 4,
- 0x10a0, 0x10c5,
- 0x10d0, 0x10fa,
- 0x10fc, 0x10fc,
- 0x2d00, 0x2d25,
-}; /* CR_Georgian */
-
-/* 'Hangul': Script */
-static const OnigCodePoint CR_Hangul[] = {
- 12,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x3131, 0x318e,
- 0x3200, 0x321e,
- 0x3260, 0x327e,
- 0xac00, 0xd7a3,
- 0xffa0, 0xffbe,
- 0xffc2, 0xffc7,
- 0xffca, 0xffcf,
- 0xffd2, 0xffd7,
- 0xffda, 0xffdc,
-}; /* CR_Hangul */
-
-/* 'Ethiopic': Script */
-static const OnigCodePoint CR_Ethiopic[] = {
- 27,
- 0x1200, 0x1248,
- 0x124a, 0x124d,
- 0x1250, 0x1256,
- 0x1258, 0x1258,
- 0x125a, 0x125d,
- 0x1260, 0x1288,
- 0x128a, 0x128d,
- 0x1290, 0x12b0,
- 0x12b2, 0x12b5,
- 0x12b8, 0x12be,
- 0x12c0, 0x12c0,
- 0x12c2, 0x12c5,
- 0x12c8, 0x12d6,
- 0x12d8, 0x1310,
- 0x1312, 0x1315,
- 0x1318, 0x135a,
- 0x135f, 0x137c,
- 0x1380, 0x1399,
- 0x2d80, 0x2d96,
- 0x2da0, 0x2da6,
- 0x2da8, 0x2dae,
- 0x2db0, 0x2db6,
- 0x2db8, 0x2dbe,
- 0x2dc0, 0x2dc6,
- 0x2dc8, 0x2dce,
- 0x2dd0, 0x2dd6,
- 0x2dd8, 0x2dde,
-}; /* CR_Ethiopic */
-
-/* 'Cherokee': Script */
-static const OnigCodePoint CR_Cherokee[] = {
- 1,
- 0x13a0, 0x13f4,
-}; /* CR_Cherokee */
-
-/* 'Canadian_Aboriginal': Script */
-static const OnigCodePoint CR_Canadian_Aboriginal[] = {
- 1,
- 0x1401, 0x1676,
-}; /* CR_Canadian_Aboriginal */
-
-/* 'Ogham': Script */
-static const OnigCodePoint CR_Ogham[] = {
- 1,
- 0x1680, 0x169c,
-}; /* CR_Ogham */
-
-/* 'Runic': Script */
-static const OnigCodePoint CR_Runic[] = {
- 2,
- 0x16a0, 0x16ea,
- 0x16ee, 0x16f0,
-}; /* CR_Runic */
-
-/* 'Khmer': Script */
-static const OnigCodePoint CR_Khmer[] = {
- 4,
- 0x1780, 0x17dd,
- 0x17e0, 0x17e9,
- 0x17f0, 0x17f9,
- 0x19e0, 0x19ff,
-}; /* CR_Khmer */
-
-/* 'Mongolian': Script */
-static const OnigCodePoint CR_Mongolian[] = {
- 6,
- 0x1800, 0x1801,
- 0x1804, 0x1804,
- 0x1806, 0x180e,
- 0x1810, 0x1819,
- 0x1820, 0x1877,
- 0x1880, 0x18aa,
-}; /* CR_Mongolian */
-
-/* 'Hiragana': Script */
-static const OnigCodePoint CR_Hiragana[] = {
- 2,
- 0x3041, 0x3096,
- 0x309d, 0x309f,
-}; /* CR_Hiragana */
-
-/* 'Katakana': Script */
-static const OnigCodePoint CR_Katakana[] = {
- 7,
- 0x30a1, 0x30fa,
- 0x30fd, 0x30ff,
- 0x31f0, 0x31ff,
- 0x32d0, 0x32fe,
- 0x3300, 0x3357,
- 0xff66, 0xff6f,
- 0xff71, 0xff9d,
-}; /* CR_Katakana */
-
-/* 'Bopomofo': Script */
-static const OnigCodePoint CR_Bopomofo[] = {
- 2,
- 0x3105, 0x312d,
- 0x31a0, 0x31b7,
-}; /* CR_Bopomofo */
-
-/* 'Han': Script */
-static const OnigCodePoint CR_Han[] = {
- 14,
- 0x2e80, 0x2e99,
- 0x2e9b, 0x2ef3,
- 0x2f00, 0x2fd5,
- 0x3005, 0x3005,
- 0x3007, 0x3007,
- 0x3021, 0x3029,
- 0x3038, 0x303b,
- 0x3400, 0x4db5,
- 0x4e00, 0x9fc3,
- 0xf900, 0xfa2d,
- 0xfa30, 0xfa6a,
- 0xfa70, 0xfad9,
- 0x20000, 0x2a6d6,
- 0x2f800, 0x2fa1d,
-}; /* CR_Han */
-
-/* 'Yi': Script */
-static const OnigCodePoint CR_Yi[] = {
- 2,
- 0xa000, 0xa48c,
- 0xa490, 0xa4c6,
-}; /* CR_Yi */
-
-/* 'Old_Italic': Script */
-static const OnigCodePoint CR_Old_Italic[] = {
- 2,
- 0x10300, 0x1031e,
- 0x10320, 0x10323,
-}; /* CR_Old_Italic */
-
-/* 'Gothic': Script */
-static const OnigCodePoint CR_Gothic[] = {
- 1,
- 0x10330, 0x1034a,
-}; /* CR_Gothic */
-
-/* 'Deseret': Script */
-static const OnigCodePoint CR_Deseret[] = {
- 1,
- 0x10400, 0x1044f,
-}; /* CR_Deseret */
-
-/* 'Inherited': Script */
-static const OnigCodePoint CR_Inherited[] = {
- 18,
- 0x0300, 0x036f,
- 0x064b, 0x0655,
- 0x0670, 0x0670,
- 0x0951, 0x0952,
- 0x1dc0, 0x1de6,
- 0x1dfe, 0x1dff,
- 0x200c, 0x200d,
- 0x20d0, 0x20f0,
- 0x302a, 0x302f,
- 0x3099, 0x309a,
- 0xfe00, 0xfe0f,
- 0xfe20, 0xfe26,
- 0x101fd, 0x101fd,
- 0x1d167, 0x1d169,
- 0x1d17b, 0x1d182,
- 0x1d185, 0x1d18b,
- 0x1d1aa, 0x1d1ad,
- 0xe0100, 0xe01ef,
-}; /* CR_Inherited */
-
-/* 'Tagalog': Script */
-static const OnigCodePoint CR_Tagalog[] = {
- 2,
- 0x1700, 0x170c,
- 0x170e, 0x1714,
-}; /* CR_Tagalog */
-
-/* 'Hanunoo': Script */
-static const OnigCodePoint CR_Hanunoo[] = {
- 1,
- 0x1720, 0x1734,
-}; /* CR_Hanunoo */
-
-/* 'Buhid': Script */
-static const OnigCodePoint CR_Buhid[] = {
- 1,
- 0x1740, 0x1753,
-}; /* CR_Buhid */
-
-/* 'Tagbanwa': Script */
-static const OnigCodePoint CR_Tagbanwa[] = {
- 3,
- 0x1760, 0x176c,
- 0x176e, 0x1770,
- 0x1772, 0x1773,
-}; /* CR_Tagbanwa */
-
-/* 'Limbu': Script */
-static const OnigCodePoint CR_Limbu[] = {
- 5,
- 0x1900, 0x191c,
- 0x1920, 0x192b,
- 0x1930, 0x193b,
- 0x1940, 0x1940,
- 0x1944, 0x194f,
-}; /* CR_Limbu */
-
-/* 'Tai_Le': Script */
-static const OnigCodePoint CR_Tai_Le[] = {
- 2,
- 0x1950, 0x196d,
- 0x1970, 0x1974,
-}; /* CR_Tai_Le */
-
-/* 'Linear_B': Script */
-static const OnigCodePoint CR_Linear_B[] = {
- 7,
- 0x10000, 0x1000b,
- 0x1000d, 0x10026,
- 0x10028, 0x1003a,
- 0x1003c, 0x1003d,
- 0x1003f, 0x1004d,
- 0x10050, 0x1005d,
- 0x10080, 0x100fa,
-}; /* CR_Linear_B */
-
-/* 'Ugaritic': Script */
-static const OnigCodePoint CR_Ugaritic[] = {
- 2,
- 0x10380, 0x1039d,
- 0x1039f, 0x1039f,
-}; /* CR_Ugaritic */
-
-/* 'Shavian': Script */
-static const OnigCodePoint CR_Shavian[] = {
- 1,
- 0x10450, 0x1047f,
-}; /* CR_Shavian */
-
-/* 'Osmanya': Script */
-static const OnigCodePoint CR_Osmanya[] = {
- 2,
- 0x10480, 0x1049d,
- 0x104a0, 0x104a9,
-}; /* CR_Osmanya */
-
-/* 'Cypriot': Script */
-static const OnigCodePoint CR_Cypriot[] = {
- 6,
- 0x10800, 0x10805,
- 0x10808, 0x10808,
- 0x1080a, 0x10835,
- 0x10837, 0x10838,
- 0x1083c, 0x1083c,
- 0x1083f, 0x1083f,
-}; /* CR_Cypriot */
-
-/* 'Braille': Script */
-static const OnigCodePoint CR_Braille[] = {
- 1,
- 0x2800, 0x28ff,
-}; /* CR_Braille */
-
-/* 'Buginese': Script */
-static const OnigCodePoint CR_Buginese[] = {
- 2,
- 0x1a00, 0x1a1b,
- 0x1a1e, 0x1a1f,
-}; /* CR_Buginese */
-
-/* 'Coptic': Script */
-static const OnigCodePoint CR_Coptic[] = {
- 3,
- 0x03e2, 0x03ef,
- 0x2c80, 0x2cea,
- 0x2cf9, 0x2cff,
-}; /* CR_Coptic */
-
-/* 'New_Tai_Lue': Script */
-static const OnigCodePoint CR_New_Tai_Lue[] = {
- 4,
- 0x1980, 0x19a9,
- 0x19b0, 0x19c9,
- 0x19d0, 0x19d9,
- 0x19de, 0x19df,
-}; /* CR_New_Tai_Lue */
-
-/* 'Glagolitic': Script */
-static const OnigCodePoint CR_Glagolitic[] = {
- 2,
- 0x2c00, 0x2c2e,
- 0x2c30, 0x2c5e,
-}; /* CR_Glagolitic */
-
-/* 'Tifinagh': Script */
-static const OnigCodePoint CR_Tifinagh[] = {
- 2,
- 0x2d30, 0x2d65,
- 0x2d6f, 0x2d6f,
-}; /* CR_Tifinagh */
-
-/* 'Syloti_Nagri': Script */
-static const OnigCodePoint CR_Syloti_Nagri[] = {
- 1,
- 0xa800, 0xa82b,
-}; /* CR_Syloti_Nagri */
-
-/* 'Old_Persian': Script */
-static const OnigCodePoint CR_Old_Persian[] = {
- 2,
- 0x103a0, 0x103c3,
- 0x103c8, 0x103d5,
-}; /* CR_Old_Persian */
-
-/* 'Kharoshthi': Script */
-static const OnigCodePoint CR_Kharoshthi[] = {
- 8,
- 0x10a00, 0x10a03,
- 0x10a05, 0x10a06,
- 0x10a0c, 0x10a13,
- 0x10a15, 0x10a17,
- 0x10a19, 0x10a33,
- 0x10a38, 0x10a3a,
- 0x10a3f, 0x10a47,
- 0x10a50, 0x10a58,
-}; /* CR_Kharoshthi */
-
-/* 'Balinese': Script */
-static const OnigCodePoint CR_Balinese[] = {
- 2,
- 0x1b00, 0x1b4b,
- 0x1b50, 0x1b7c,
-}; /* CR_Balinese */
-
-/* 'Cuneiform': Script */
-static const OnigCodePoint CR_Cuneiform[] = {
- 3,
- 0x12000, 0x1236e,
- 0x12400, 0x12462,
- 0x12470, 0x12473,
-}; /* CR_Cuneiform */
-
-/* 'Phoenician': Script */
-static const OnigCodePoint CR_Phoenician[] = {
- 2,
- 0x10900, 0x10919,
- 0x1091f, 0x1091f,
-}; /* CR_Phoenician */
-
-/* 'Phags_Pa': Script */
-static const OnigCodePoint CR_Phags_Pa[] = {
- 1,
- 0xa840, 0xa877,
-}; /* CR_Phags_Pa */
-
-/* 'Nko': Script */
-static const OnigCodePoint CR_Nko[] = {
- 1,
- 0x07c0, 0x07fa,
-}; /* CR_Nko */
-
-/* 'Sundanese': Script */
-static const OnigCodePoint CR_Sundanese[] = {
- 2,
- 0x1b80, 0x1baa,
- 0x1bae, 0x1bb9,
-}; /* CR_Sundanese */
-
-/* 'Lepcha': Script */
-static const OnigCodePoint CR_Lepcha[] = {
- 3,
- 0x1c00, 0x1c37,
- 0x1c3b, 0x1c49,
- 0x1c4d, 0x1c4f,
-}; /* CR_Lepcha */
-
-/* 'Ol_Chiki': Script */
-static const OnigCodePoint CR_Ol_Chiki[] = {
- 1,
- 0x1c50, 0x1c7f,
-}; /* CR_Ol_Chiki */
-
-/* 'Vai': Script */
-static const OnigCodePoint CR_Vai[] = {
- 1,
- 0xa500, 0xa62b,
-}; /* CR_Vai */
-
-/* 'Saurashtra': Script */
-static const OnigCodePoint CR_Saurashtra[] = {
- 2,
- 0xa880, 0xa8c4,
- 0xa8ce, 0xa8d9,
-}; /* CR_Saurashtra */
-
-/* 'Kayah_Li': Script */
-static const OnigCodePoint CR_Kayah_Li[] = {
- 1,
- 0xa900, 0xa92f,
-}; /* CR_Kayah_Li */
-
-/* 'Rejang': Script */
-static const OnigCodePoint CR_Rejang[] = {
- 2,
- 0xa930, 0xa953,
- 0xa95f, 0xa95f,
-}; /* CR_Rejang */
-
-/* 'Lycian': Script */
-static const OnigCodePoint CR_Lycian[] = {
- 1,
- 0x10280, 0x1029c,
-}; /* CR_Lycian */
-
-/* 'Carian': Script */
-static const OnigCodePoint CR_Carian[] = {
- 1,
- 0x102a0, 0x102d0,
-}; /* CR_Carian */
-
-/* 'Lydian': Script */
-static const OnigCodePoint CR_Lydian[] = {
- 2,
- 0x10920, 0x10939,
- 0x1093f, 0x1093f,
-}; /* CR_Lydian */
-
-/* 'Cham': Script */
-static const OnigCodePoint CR_Cham[] = {
- 4,
- 0xaa00, 0xaa36,
- 0xaa40, 0xaa4d,
- 0xaa50, 0xaa59,
- 0xaa5c, 0xaa5f,
-}; /* CR_Cham */
-#endif /* USE_UNICODE_PROPERTIES */
-
-
-static const OnigCodePoint* const CodeRanges[] = {
- CR_NEWLINE,
- CR_Alpha,
- CR_Blank,
- CR_Cntrl,
- CR_Digit,
- CR_Graph,
- CR_Lower,
- CR_Print,
- CR_Punct,
- CR_Space,
- CR_Upper,
- CR_XDigit,
- CR_Word,
- CR_Alnum,
- CR_ASCII,
-#ifdef USE_UNICODE_PROPERTIES
- CR_Any,
- CR_Assigned,
- CR_C,
- CR_Cc,
- CR_Cf,
- CR_Cn,
- CR_Co,
- CR_Cs,
- CR_L,
- CR_Ll,
- CR_Lm,
- CR_Lo,
- CR_Lt,
- CR_Lu,
- CR_M,
- CR_Mc,
- CR_Me,
- CR_Mn,
- CR_N,
- CR_Nd,
- CR_Nl,
- CR_No,
- CR_P,
- CR_Pc,
- CR_Pd,
- CR_Pe,
- CR_Pf,
- CR_Pi,
- CR_Po,
- CR_Ps,
- CR_S,
- CR_Sc,
- CR_Sk,
- CR_Sm,
- CR_So,
- CR_Z,
- CR_Zl,
- CR_Zp,
- CR_Zs,
- CR_Common,
- CR_Latin,
- CR_Greek,
- CR_Cyrillic,
- CR_Armenian,
- CR_Hebrew,
- CR_Arabic,
- CR_Syriac,
- CR_Thaana,
- CR_Devanagari,
- CR_Bengali,
- CR_Gurmukhi,
- CR_Gujarati,
- CR_Oriya,
- CR_Tamil,
- CR_Telugu,
- CR_Kannada,
- CR_Malayalam,
- CR_Sinhala,
- CR_Thai,
- CR_Lao,
- CR_Tibetan,
- CR_Myanmar,
- CR_Georgian,
- CR_Hangul,
- CR_Ethiopic,
- CR_Cherokee,
- CR_Canadian_Aboriginal,
- CR_Ogham,
- CR_Runic,
- CR_Khmer,
- CR_Mongolian,
- CR_Hiragana,
- CR_Katakana,
- CR_Bopomofo,
- CR_Han,
- CR_Yi,
- CR_Old_Italic,
- CR_Gothic,
- CR_Deseret,
- CR_Inherited,
- CR_Tagalog,
- CR_Hanunoo,
- CR_Buhid,
- CR_Tagbanwa,
- CR_Limbu,
- CR_Tai_Le,
- CR_Linear_B,
- CR_Ugaritic,
- CR_Shavian,
- CR_Osmanya,
- CR_Cypriot,
- CR_Braille,
- CR_Buginese,
- CR_Coptic,
- CR_New_Tai_Lue,
- CR_Glagolitic,
- CR_Tifinagh,
- CR_Syloti_Nagri,
- CR_Old_Persian,
- CR_Kharoshthi,
- CR_Balinese,
- CR_Cuneiform,
- CR_Phoenician,
- CR_Phags_Pa,
- CR_Nko,
- CR_Sundanese,
- CR_Lepcha,
- CR_Ol_Chiki,
- CR_Vai,
- CR_Saurashtra,
- CR_Kayah_Li,
- CR_Rejang,
- CR_Lycian,
- CR_Carian,
- CR_Lydian,
- CR_Cham,
-#endif /* USE_UNICODE_PROPERTIES */
-};
-struct uniname2ctype_struct {
- int name, ctype;
-};
-
-static const struct uniname2ctype_struct *uniname2ctype_p(const char *, unsigned int);
-%}
-struct uniname2ctype_struct;
-%%
-NEWLINE, 0
-Alpha, 1
-Blank, 2
-Cntrl, 3
-Digit, 4
-Graph, 5
-Lower, 6
-Print, 7
-Punct, 8
-Space, 9
-Upper, 10
-XDigit, 11
-Word, 12
-Alnum, 13
-ASCII, 14
-#ifdef USE_UNICODE_PROPERTIES
-Any, 15
-Assigned, 16
-C, 17
-Cc, 18
-Cf, 19
-Cn, 20
-Co, 21
-Cs, 22
-L, 23
-Ll, 24
-Lm, 25
-Lo, 26
-Lt, 27
-Lu, 28
-M, 29
-Mc, 30
-Me, 31
-Mn, 32
-N, 33
-Nd, 34
-Nl, 35
-No, 36
-P, 37
-Pc, 38
-Pd, 39
-Pe, 40
-Pf, 41
-Pi, 42
-Po, 43
-Ps, 44
-S, 45
-Sc, 46
-Sk, 47
-Sm, 48
-So, 49
-Z, 50
-Zl, 51
-Zp, 52
-Zs, 53
-Common, 54
-Latin, 55
-Greek, 56
-Cyrillic, 57
-Armenian, 58
-Hebrew, 59
-Arabic, 60
-Syriac, 61
-Thaana, 62
-Devanagari, 63
-Bengali, 64
-Gurmukhi, 65
-Gujarati, 66
-Oriya, 67
-Tamil, 68
-Telugu, 69
-Kannada, 70
-Malayalam, 71
-Sinhala, 72
-Thai, 73
-Lao, 74
-Tibetan, 75
-Myanmar, 76
-Georgian, 77
-Hangul, 78
-Ethiopic, 79
-Cherokee, 80
-Canadian_Aboriginal, 81
-Ogham, 82
-Runic, 83
-Khmer, 84
-Mongolian, 85
-Hiragana, 86
-Katakana, 87
-Bopomofo, 88
-Han, 89
-Yi, 90
-Old_Italic, 91
-Gothic, 92
-Deseret, 93
-Inherited, 94
-Tagalog, 95
-Hanunoo, 96
-Buhid, 97
-Tagbanwa, 98
-Limbu, 99
-Tai_Le, 100
-Linear_B, 101
-Ugaritic, 102
-Shavian, 103
-Osmanya, 104
-Cypriot, 105
-Braille, 106
-Buginese, 107
-Coptic, 108
-New_Tai_Lue, 109
-Glagolitic, 110
-Tifinagh, 111
-Syloti_Nagri, 112
-Old_Persian, 113
-Kharoshthi, 114
-Balinese, 115
-Cuneiform, 116
-Phoenician, 117
-Phags_Pa, 118
-Nko, 119
-Sundanese, 120
-Lepcha, 121
-Ol_Chiki, 122
-Vai, 123
-Saurashtra, 124
-Kayah_Li, 125
-Rejang, 126
-Lycian, 127
-Carian, 128
-Lydian, 129
-Cham, 130
-#endif /* USE_UNICODE_PROPERTIES */
-%%
-static int
-uniname2ctype(const UChar *name, unsigned int len)
-{
- const struct uniname2ctype_struct *p = uniname2ctype_p((const char *)name, len);
- if (p) return p->ctype;
- return -1;
-}
diff --git a/enc/unicode/name2ctype.src b/enc/unicode/name2ctype.src
deleted file mode 100644
index 529ef355e4..0000000000
--- a/enc/unicode/name2ctype.src
+++ /dev/null
@@ -1,9473 +0,0 @@
-%{
-
-/* 'NEWLINE': [[:NEWLINE:]] */
-static const OnigCodePoint CR_NEWLINE[] = {
- 1,
- 0x000a, 0x000a,
-}; /* CR_NEWLINE */
-
-/* 'Alpha': [[:Alpha:]] */
-static const OnigCodePoint CR_Alpha[] = {
- 452,
- 0x0041, 0x005a,
- 0x0061, 0x007a,
- 0x00aa, 0x00aa,
- 0x00b5, 0x00b5,
- 0x00ba, 0x00ba,
- 0x00c0, 0x00d6,
- 0x00d8, 0x00f6,
- 0x00f8, 0x02c1,
- 0x02c6, 0x02d1,
- 0x02e0, 0x02e4,
- 0x02ec, 0x02ec,
- 0x02ee, 0x02ee,
- 0x0300, 0x0374,
- 0x0376, 0x0377,
- 0x037a, 0x037d,
- 0x0386, 0x0386,
- 0x0388, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03f5,
- 0x03f7, 0x0481,
- 0x0483, 0x0523,
- 0x0531, 0x0556,
- 0x0559, 0x0559,
- 0x0561, 0x0587,
- 0x0591, 0x05bd,
- 0x05bf, 0x05bf,
- 0x05c1, 0x05c2,
- 0x05c4, 0x05c5,
- 0x05c7, 0x05c7,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f2,
- 0x0610, 0x061a,
- 0x0621, 0x065e,
- 0x066e, 0x06d3,
- 0x06d5, 0x06dc,
- 0x06de, 0x06e8,
- 0x06ea, 0x06ef,
- 0x06fa, 0x06fc,
- 0x06ff, 0x06ff,
- 0x0710, 0x074a,
- 0x074d, 0x07b1,
- 0x07ca, 0x07f5,
- 0x07fa, 0x07fa,
- 0x0901, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0954,
- 0x0958, 0x0963,
- 0x0971, 0x0972,
- 0x097b, 0x097f,
- 0x0981, 0x0983,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bc, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09ce,
- 0x09d7, 0x09d7,
- 0x09dc, 0x09dd,
- 0x09df, 0x09e3,
- 0x09f0, 0x09f1,
- 0x0a01, 0x0a03,
- 0x0a05, 0x0a0a,
- 0x0a0f, 0x0a10,
- 0x0a13, 0x0a28,
- 0x0a2a, 0x0a30,
- 0x0a32, 0x0a33,
- 0x0a35, 0x0a36,
- 0x0a38, 0x0a39,
- 0x0a3c, 0x0a3c,
- 0x0a3e, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4d,
- 0x0a51, 0x0a51,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a70, 0x0a75,
- 0x0a81, 0x0a83,
- 0x0a85, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abc, 0x0ac5,
- 0x0ac7, 0x0ac9,
- 0x0acb, 0x0acd,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae3,
- 0x0b01, 0x0b03,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b35, 0x0b39,
- 0x0b3c, 0x0b44,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b63,
- 0x0b71, 0x0b71,
- 0x0b82, 0x0b83,
- 0x0b85, 0x0b8a,
- 0x0b8e, 0x0b90,
- 0x0b92, 0x0b95,
- 0x0b99, 0x0b9a,
- 0x0b9c, 0x0b9c,
- 0x0b9e, 0x0b9f,
- 0x0ba3, 0x0ba4,
- 0x0ba8, 0x0baa,
- 0x0bae, 0x0bb9,
- 0x0bbe, 0x0bc2,
- 0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcd,
- 0x0bd0, 0x0bd0,
- 0x0bd7, 0x0bd7,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3d, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c58, 0x0c59,
- 0x0c60, 0x0c63,
- 0x0c82, 0x0c83,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbc, 0x0cc4,
- 0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccd,
- 0x0cd5, 0x0cd6,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce3,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3d, 0x0d44,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d63,
- 0x0d7a, 0x0d7f,
- 0x0d82, 0x0d83,
- 0x0d85, 0x0d96,
- 0x0d9a, 0x0db1,
- 0x0db3, 0x0dbb,
- 0x0dbd, 0x0dbd,
- 0x0dc0, 0x0dc6,
- 0x0dca, 0x0dca,
- 0x0dcf, 0x0dd4,
- 0x0dd6, 0x0dd6,
- 0x0dd8, 0x0ddf,
- 0x0df2, 0x0df3,
- 0x0e01, 0x0e3a,
- 0x0e40, 0x0e4e,
- 0x0e81, 0x0e82,
- 0x0e84, 0x0e84,
- 0x0e87, 0x0e88,
- 0x0e8a, 0x0e8a,
- 0x0e8d, 0x0e8d,
- 0x0e94, 0x0e97,
- 0x0e99, 0x0e9f,
- 0x0ea1, 0x0ea3,
- 0x0ea5, 0x0ea5,
- 0x0ea7, 0x0ea7,
- 0x0eaa, 0x0eab,
- 0x0ead, 0x0eb9,
- 0x0ebb, 0x0ebd,
- 0x0ec0, 0x0ec4,
- 0x0ec6, 0x0ec6,
- 0x0ec8, 0x0ecd,
- 0x0edc, 0x0edd,
- 0x0f00, 0x0f00,
- 0x0f18, 0x0f19,
- 0x0f35, 0x0f35,
- 0x0f37, 0x0f37,
- 0x0f39, 0x0f39,
- 0x0f3e, 0x0f47,
- 0x0f49, 0x0f6c,
- 0x0f71, 0x0f84,
- 0x0f86, 0x0f8b,
- 0x0f90, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fc6, 0x0fc6,
- 0x1000, 0x103f,
- 0x1050, 0x108f,
- 0x10a0, 0x10c5,
- 0x10d0, 0x10fa,
- 0x10fc, 0x10fc,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x1200, 0x1248,
- 0x124a, 0x124d,
- 0x1250, 0x1256,
- 0x1258, 0x1258,
- 0x125a, 0x125d,
- 0x1260, 0x1288,
- 0x128a, 0x128d,
- 0x1290, 0x12b0,
- 0x12b2, 0x12b5,
- 0x12b8, 0x12be,
- 0x12c0, 0x12c0,
- 0x12c2, 0x12c5,
- 0x12c8, 0x12d6,
- 0x12d8, 0x1310,
- 0x1312, 0x1315,
- 0x1318, 0x135a,
- 0x135f, 0x135f,
- 0x1380, 0x138f,
- 0x13a0, 0x13f4,
- 0x1401, 0x166c,
- 0x166f, 0x1676,
- 0x1681, 0x169a,
- 0x16a0, 0x16ea,
- 0x1700, 0x170c,
- 0x170e, 0x1714,
- 0x1720, 0x1734,
- 0x1740, 0x1753,
- 0x1760, 0x176c,
- 0x176e, 0x1770,
- 0x1772, 0x1773,
- 0x1780, 0x17b3,
- 0x17b6, 0x17d3,
- 0x17d7, 0x17d7,
- 0x17dc, 0x17dd,
- 0x180b, 0x180d,
- 0x1820, 0x1877,
- 0x1880, 0x18aa,
- 0x1900, 0x191c,
- 0x1920, 0x192b,
- 0x1930, 0x193b,
- 0x1950, 0x196d,
- 0x1970, 0x1974,
- 0x1980, 0x19a9,
- 0x19b0, 0x19c9,
- 0x1a00, 0x1a1b,
- 0x1b00, 0x1b4b,
- 0x1b6b, 0x1b73,
- 0x1b80, 0x1baa,
- 0x1bae, 0x1baf,
- 0x1c00, 0x1c37,
- 0x1c4d, 0x1c4f,
- 0x1c5a, 0x1c7d,
- 0x1d00, 0x1de6,
- 0x1dfe, 0x1f15,
- 0x1f18, 0x1f1d,
- 0x1f20, 0x1f45,
- 0x1f48, 0x1f4d,
- 0x1f50, 0x1f57,
- 0x1f59, 0x1f59,
- 0x1f5b, 0x1f5b,
- 0x1f5d, 0x1f5d,
- 0x1f5f, 0x1f7d,
- 0x1f80, 0x1fb4,
- 0x1fb6, 0x1fbc,
- 0x1fbe, 0x1fbe,
- 0x1fc2, 0x1fc4,
- 0x1fc6, 0x1fcc,
- 0x1fd0, 0x1fd3,
- 0x1fd6, 0x1fdb,
- 0x1fe0, 0x1fec,
- 0x1ff2, 0x1ff4,
- 0x1ff6, 0x1ffc,
- 0x2071, 0x2071,
- 0x207f, 0x207f,
- 0x2090, 0x2094,
- 0x20d0, 0x20f0,
- 0x2102, 0x2102,
- 0x2107, 0x2107,
- 0x210a, 0x2113,
- 0x2115, 0x2115,
- 0x2119, 0x211d,
- 0x2124, 0x2124,
- 0x2126, 0x2126,
- 0x2128, 0x2128,
- 0x212a, 0x212d,
- 0x212f, 0x2139,
- 0x213c, 0x213f,
- 0x2145, 0x2149,
- 0x214e, 0x214e,
- 0x2183, 0x2184,
- 0x2c00, 0x2c2e,
- 0x2c30, 0x2c5e,
- 0x2c60, 0x2c6f,
- 0x2c71, 0x2c7d,
- 0x2c80, 0x2ce4,
- 0x2d00, 0x2d25,
- 0x2d30, 0x2d65,
- 0x2d6f, 0x2d6f,
- 0x2d80, 0x2d96,
- 0x2da0, 0x2da6,
- 0x2da8, 0x2dae,
- 0x2db0, 0x2db6,
- 0x2db8, 0x2dbe,
- 0x2dc0, 0x2dc6,
- 0x2dc8, 0x2dce,
- 0x2dd0, 0x2dd6,
- 0x2dd8, 0x2dde,
- 0x2de0, 0x2dff,
- 0x2e2f, 0x2e2f,
- 0x3005, 0x3006,
- 0x302a, 0x302f,
- 0x3031, 0x3035,
- 0x303b, 0x303c,
- 0x3041, 0x3096,
- 0x3099, 0x309a,
- 0x309d, 0x309f,
- 0x30a1, 0x30fa,
- 0x30fc, 0x30ff,
- 0x3105, 0x312d,
- 0x3131, 0x318e,
- 0x31a0, 0x31b7,
- 0x31f0, 0x31ff,
- 0x3400, 0x3400,
- 0x4db5, 0x4db5,
- 0x4e00, 0x4e00,
- 0x9fc3, 0x9fc3,
- 0xa000, 0xa48c,
- 0xa500, 0xa60c,
- 0xa610, 0xa61f,
- 0xa62a, 0xa62b,
- 0xa640, 0xa65f,
- 0xa662, 0xa672,
- 0xa67c, 0xa67d,
- 0xa67f, 0xa697,
- 0xa717, 0xa71f,
- 0xa722, 0xa788,
- 0xa78b, 0xa78c,
- 0xa7fb, 0xa827,
- 0xa840, 0xa873,
- 0xa880, 0xa8c4,
- 0xa90a, 0xa92d,
- 0xa930, 0xa953,
- 0xaa00, 0xaa36,
- 0xaa40, 0xaa4d,
- 0xac00, 0xac00,
- 0xd7a3, 0xd7a3,
- 0xf900, 0xfa2d,
- 0xfa30, 0xfa6a,
- 0xfa70, 0xfad9,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xfb1d, 0xfb28,
- 0xfb2a, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbb1,
- 0xfbd3, 0xfd3d,
- 0xfd50, 0xfd8f,
- 0xfd92, 0xfdc7,
- 0xfdf0, 0xfdfb,
- 0xfe00, 0xfe0f,
- 0xfe20, 0xfe26,
- 0xfe70, 0xfe74,
- 0xfe76, 0xfefc,
- 0xff21, 0xff3a,
- 0xff41, 0xff5a,
- 0xff66, 0xffbe,
- 0xffc2, 0xffc7,
- 0xffca, 0xffcf,
- 0xffd2, 0xffd7,
- 0xffda, 0xffdc,
- 0x10000, 0x1000b,
- 0x1000d, 0x10026,
- 0x10028, 0x1003a,
- 0x1003c, 0x1003d,
- 0x1003f, 0x1004d,
- 0x10050, 0x1005d,
- 0x10080, 0x100fa,
- 0x101fd, 0x101fd,
- 0x10280, 0x1029c,
- 0x102a0, 0x102d0,
- 0x10300, 0x1031e,
- 0x10330, 0x10340,
- 0x10342, 0x10349,
- 0x10380, 0x1039d,
- 0x103a0, 0x103c3,
- 0x103c8, 0x103cf,
- 0x10400, 0x1049d,
- 0x10800, 0x10805,
- 0x10808, 0x10808,
- 0x1080a, 0x10835,
- 0x10837, 0x10838,
- 0x1083c, 0x1083c,
- 0x1083f, 0x1083f,
- 0x10900, 0x10915,
- 0x10920, 0x10939,
- 0x10a00, 0x10a03,
- 0x10a05, 0x10a06,
- 0x10a0c, 0x10a13,
- 0x10a15, 0x10a17,
- 0x10a19, 0x10a33,
- 0x10a38, 0x10a3a,
- 0x10a3f, 0x10a3f,
- 0x12000, 0x1236e,
- 0x1d165, 0x1d169,
- 0x1d16d, 0x1d172,
- 0x1d17b, 0x1d182,
- 0x1d185, 0x1d18b,
- 0x1d1aa, 0x1d1ad,
- 0x1d242, 0x1d244,
- 0x1d400, 0x1d454,
- 0x1d456, 0x1d49c,
- 0x1d49e, 0x1d49f,
- 0x1d4a2, 0x1d4a2,
- 0x1d4a5, 0x1d4a6,
- 0x1d4a9, 0x1d4ac,
- 0x1d4ae, 0x1d4b9,
- 0x1d4bb, 0x1d4bb,
- 0x1d4bd, 0x1d4c3,
- 0x1d4c5, 0x1d505,
- 0x1d507, 0x1d50a,
- 0x1d50d, 0x1d514,
- 0x1d516, 0x1d51c,
- 0x1d51e, 0x1d539,
- 0x1d53b, 0x1d53e,
- 0x1d540, 0x1d544,
- 0x1d546, 0x1d546,
- 0x1d54a, 0x1d550,
- 0x1d552, 0x1d6a5,
- 0x1d6a8, 0x1d6c0,
- 0x1d6c2, 0x1d6da,
- 0x1d6dc, 0x1d6fa,
- 0x1d6fc, 0x1d714,
- 0x1d716, 0x1d734,
- 0x1d736, 0x1d74e,
- 0x1d750, 0x1d76e,
- 0x1d770, 0x1d788,
- 0x1d78a, 0x1d7a8,
- 0x1d7aa, 0x1d7c2,
- 0x1d7c4, 0x1d7cb,
- 0x20000, 0x20000,
- 0x2a6d6, 0x2a6d6,
- 0x2f800, 0x2fa1d,
- 0xe0100, 0xe01ef,
-}; /* CR_Alpha */
-
-/* 'Blank': [[:Blank:]] */
-static const OnigCodePoint CR_Blank[] = {
- 9,
- 0x0009, 0x0009,
- 0x0020, 0x0020,
- 0x00a0, 0x00a0,
- 0x1680, 0x1680,
- 0x180e, 0x180e,
- 0x2000, 0x200a,
- 0x202f, 0x202f,
- 0x205f, 0x205f,
- 0x3000, 0x3000,
-}; /* CR_Blank */
-
-/* 'Cntrl': [[:Cntrl:]] */
-static const OnigCodePoint CR_Cntrl[] = {
- 2,
- 0x0000, 0x001f,
- 0x007f, 0x009f,
-}; /* CR_Cntrl */
-
-/* 'Digit': [[:Digit:]] */
-static const OnigCodePoint CR_Digit[] = {
- 33,
- 0x0030, 0x0039,
- 0x0660, 0x0669,
- 0x06f0, 0x06f9,
- 0x07c0, 0x07c9,
- 0x0966, 0x096f,
- 0x09e6, 0x09ef,
- 0x0a66, 0x0a6f,
- 0x0ae6, 0x0aef,
- 0x0b66, 0x0b6f,
- 0x0be6, 0x0bef,
- 0x0c66, 0x0c6f,
- 0x0ce6, 0x0cef,
- 0x0d66, 0x0d6f,
- 0x0e50, 0x0e59,
- 0x0ed0, 0x0ed9,
- 0x0f20, 0x0f29,
- 0x1040, 0x1049,
- 0x1090, 0x1099,
- 0x17e0, 0x17e9,
- 0x1810, 0x1819,
- 0x1946, 0x194f,
- 0x19d0, 0x19d9,
- 0x1b50, 0x1b59,
- 0x1bb0, 0x1bb9,
- 0x1c40, 0x1c49,
- 0x1c50, 0x1c59,
- 0xa620, 0xa629,
- 0xa8d0, 0xa8d9,
- 0xa900, 0xa909,
- 0xaa50, 0xaa59,
- 0xff10, 0xff19,
- 0x104a0, 0x104a9,
- 0x1d7ce, 0x1d7ff,
-}; /* CR_Digit */
-
-/* 'Graph': [[:Graph:]] */
-static const OnigCodePoint CR_Graph[] = {
- 449,
- 0x0021, 0x007e,
- 0x00a1, 0x00ac,
- 0x00ae, 0x0377,
- 0x037a, 0x037e,
- 0x0384, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x0523,
- 0x0531, 0x0556,
- 0x0559, 0x055f,
- 0x0561, 0x0587,
- 0x0589, 0x058a,
- 0x0591, 0x05c7,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0x0606, 0x061b,
- 0x061e, 0x061f,
- 0x0621, 0x065e,
- 0x0660, 0x06dc,
- 0x06de, 0x070d,
- 0x0710, 0x074a,
- 0x074d, 0x07b1,
- 0x07c0, 0x07fa,
- 0x0901, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0954,
- 0x0958, 0x0972,
- 0x097b, 0x097f,
- 0x0981, 0x0983,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bc, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09ce,
- 0x09d7, 0x09d7,
- 0x09dc, 0x09dd,
- 0x09df, 0x09e3,
- 0x09e6, 0x09fa,
- 0x0a01, 0x0a03,
- 0x0a05, 0x0a0a,
- 0x0a0f, 0x0a10,
- 0x0a13, 0x0a28,
- 0x0a2a, 0x0a30,
- 0x0a32, 0x0a33,
- 0x0a35, 0x0a36,
- 0x0a38, 0x0a39,
- 0x0a3c, 0x0a3c,
- 0x0a3e, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4d,
- 0x0a51, 0x0a51,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a66, 0x0a75,
- 0x0a81, 0x0a83,
- 0x0a85, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abc, 0x0ac5,
- 0x0ac7, 0x0ac9,
- 0x0acb, 0x0acd,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae3,
- 0x0ae6, 0x0aef,
- 0x0af1, 0x0af1,
- 0x0b01, 0x0b03,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b35, 0x0b39,
- 0x0b3c, 0x0b44,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b63,
- 0x0b66, 0x0b71,
- 0x0b82, 0x0b83,
- 0x0b85, 0x0b8a,
- 0x0b8e, 0x0b90,
- 0x0b92, 0x0b95,
- 0x0b99, 0x0b9a,
- 0x0b9c, 0x0b9c,
- 0x0b9e, 0x0b9f,
- 0x0ba3, 0x0ba4,
- 0x0ba8, 0x0baa,
- 0x0bae, 0x0bb9,
- 0x0bbe, 0x0bc2,
- 0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcd,
- 0x0bd0, 0x0bd0,
- 0x0bd7, 0x0bd7,
- 0x0be6, 0x0bfa,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3d, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c58, 0x0c59,
- 0x0c60, 0x0c63,
- 0x0c66, 0x0c6f,
- 0x0c78, 0x0c7f,
- 0x0c82, 0x0c83,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbc, 0x0cc4,
- 0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccd,
- 0x0cd5, 0x0cd6,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce3,
- 0x0ce6, 0x0cef,
- 0x0cf1, 0x0cf2,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3d, 0x0d44,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d63,
- 0x0d66, 0x0d75,
- 0x0d79, 0x0d7f,
- 0x0d82, 0x0d83,
- 0x0d85, 0x0d96,
- 0x0d9a, 0x0db1,
- 0x0db3, 0x0dbb,
- 0x0dbd, 0x0dbd,
- 0x0dc0, 0x0dc6,
- 0x0dca, 0x0dca,
- 0x0dcf, 0x0dd4,
- 0x0dd6, 0x0dd6,
- 0x0dd8, 0x0ddf,
- 0x0df2, 0x0df4,
- 0x0e01, 0x0e3a,
- 0x0e3f, 0x0e5b,
- 0x0e81, 0x0e82,
- 0x0e84, 0x0e84,
- 0x0e87, 0x0e88,
- 0x0e8a, 0x0e8a,
- 0x0e8d, 0x0e8d,
- 0x0e94, 0x0e97,
- 0x0e99, 0x0e9f,
- 0x0ea1, 0x0ea3,
- 0x0ea5, 0x0ea5,
- 0x0ea7, 0x0ea7,
- 0x0eaa, 0x0eab,
- 0x0ead, 0x0eb9,
- 0x0ebb, 0x0ebd,
- 0x0ec0, 0x0ec4,
- 0x0ec6, 0x0ec6,
- 0x0ec8, 0x0ecd,
- 0x0ed0, 0x0ed9,
- 0x0edc, 0x0edd,
- 0x0f00, 0x0f47,
- 0x0f49, 0x0f6c,
- 0x0f71, 0x0f8b,
- 0x0f90, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fbe, 0x0fcc,
- 0x0fce, 0x0fd4,
- 0x1000, 0x1099,
- 0x109e, 0x10c5,
- 0x10d0, 0x10fc,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x1200, 0x1248,
- 0x124a, 0x124d,
- 0x1250, 0x1256,
- 0x1258, 0x1258,
- 0x125a, 0x125d,
- 0x1260, 0x1288,
- 0x128a, 0x128d,
- 0x1290, 0x12b0,
- 0x12b2, 0x12b5,
- 0x12b8, 0x12be,
- 0x12c0, 0x12c0,
- 0x12c2, 0x12c5,
- 0x12c8, 0x12d6,
- 0x12d8, 0x1310,
- 0x1312, 0x1315,
- 0x1318, 0x135a,
- 0x135f, 0x137c,
- 0x1380, 0x1399,
- 0x13a0, 0x13f4,
- 0x1401, 0x1676,
- 0x1681, 0x169c,
- 0x16a0, 0x16f0,
- 0x1700, 0x170c,
- 0x170e, 0x1714,
- 0x1720, 0x1736,
- 0x1740, 0x1753,
- 0x1760, 0x176c,
- 0x176e, 0x1770,
- 0x1772, 0x1773,
- 0x1780, 0x17b3,
- 0x17b6, 0x17dd,
- 0x17e0, 0x17e9,
- 0x17f0, 0x17f9,
- 0x1800, 0x180d,
- 0x1810, 0x1819,
- 0x1820, 0x1877,
- 0x1880, 0x18aa,
- 0x1900, 0x191c,
- 0x1920, 0x192b,
- 0x1930, 0x193b,
- 0x1940, 0x1940,
- 0x1944, 0x196d,
- 0x1970, 0x1974,
- 0x1980, 0x19a9,
- 0x19b0, 0x19c9,
- 0x19d0, 0x19d9,
- 0x19de, 0x1a1b,
- 0x1a1e, 0x1a1f,
- 0x1b00, 0x1b4b,
- 0x1b50, 0x1b7c,
- 0x1b80, 0x1baa,
- 0x1bae, 0x1bb9,
- 0x1c00, 0x1c37,
- 0x1c3b, 0x1c49,
- 0x1c4d, 0x1c7f,
- 0x1d00, 0x1de6,
- 0x1dfe, 0x1f15,
- 0x1f18, 0x1f1d,
- 0x1f20, 0x1f45,
- 0x1f48, 0x1f4d,
- 0x1f50, 0x1f57,
- 0x1f59, 0x1f59,
- 0x1f5b, 0x1f5b,
- 0x1f5d, 0x1f5d,
- 0x1f5f, 0x1f7d,
- 0x1f80, 0x1fb4,
- 0x1fb6, 0x1fc4,
- 0x1fc6, 0x1fd3,
- 0x1fd6, 0x1fdb,
- 0x1fdd, 0x1fef,
- 0x1ff2, 0x1ff4,
- 0x1ff6, 0x1ffe,
- 0x2010, 0x2027,
- 0x2030, 0x205e,
- 0x2070, 0x2071,
- 0x2074, 0x208e,
- 0x2090, 0x2094,
- 0x20a0, 0x20b5,
- 0x20d0, 0x20f0,
- 0x2100, 0x214f,
- 0x2153, 0x2188,
- 0x2190, 0x23e7,
- 0x2400, 0x2426,
- 0x2440, 0x244a,
- 0x2460, 0x269d,
- 0x26a0, 0x26bc,
- 0x26c0, 0x26c3,
- 0x2701, 0x2704,
- 0x2706, 0x2709,
- 0x270c, 0x2727,
- 0x2729, 0x274b,
- 0x274d, 0x274d,
- 0x274f, 0x2752,
- 0x2756, 0x2756,
- 0x2758, 0x275e,
- 0x2761, 0x2794,
- 0x2798, 0x27af,
- 0x27b1, 0x27be,
- 0x27c0, 0x27ca,
- 0x27cc, 0x27cc,
- 0x27d0, 0x2b4c,
- 0x2b50, 0x2b54,
- 0x2c00, 0x2c2e,
- 0x2c30, 0x2c5e,
- 0x2c60, 0x2c6f,
- 0x2c71, 0x2c7d,
- 0x2c80, 0x2cea,
- 0x2cf9, 0x2d25,
- 0x2d30, 0x2d65,
- 0x2d6f, 0x2d6f,
- 0x2d80, 0x2d96,
- 0x2da0, 0x2da6,
- 0x2da8, 0x2dae,
- 0x2db0, 0x2db6,
- 0x2db8, 0x2dbe,
- 0x2dc0, 0x2dc6,
- 0x2dc8, 0x2dce,
- 0x2dd0, 0x2dd6,
- 0x2dd8, 0x2dde,
- 0x2de0, 0x2e30,
- 0x2e80, 0x2e99,
- 0x2e9b, 0x2ef3,
- 0x2f00, 0x2fd5,
- 0x2ff0, 0x2ffb,
- 0x3001, 0x303f,
- 0x3041, 0x3096,
- 0x3099, 0x30ff,
- 0x3105, 0x312d,
- 0x3131, 0x318e,
- 0x3190, 0x31b7,
- 0x31c0, 0x31e3,
- 0x31f0, 0x321e,
- 0x3220, 0x3243,
- 0x3250, 0x32fe,
- 0x3300, 0x3400,
- 0x4db5, 0x4db5,
- 0x4dc0, 0x4e00,
- 0x9fc3, 0x9fc3,
- 0xa000, 0xa48c,
- 0xa490, 0xa4c6,
- 0xa500, 0xa62b,
- 0xa640, 0xa65f,
- 0xa662, 0xa673,
- 0xa67c, 0xa697,
- 0xa700, 0xa78c,
- 0xa7fb, 0xa82b,
- 0xa840, 0xa877,
- 0xa880, 0xa8c4,
- 0xa8ce, 0xa8d9,
- 0xa900, 0xa953,
- 0xa95f, 0xa95f,
- 0xaa00, 0xaa36,
- 0xaa40, 0xaa4d,
- 0xaa50, 0xaa59,
- 0xaa5c, 0xaa5f,
- 0xac00, 0xac00,
- 0xd7a3, 0xd7a3,
- 0xf900, 0xfa2d,
- 0xfa30, 0xfa6a,
- 0xfa70, 0xfad9,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xfb1d, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbb1,
- 0xfbd3, 0xfd3f,
- 0xfd50, 0xfd8f,
- 0xfd92, 0xfdc7,
- 0xfdf0, 0xfdfd,
- 0xfe00, 0xfe19,
- 0xfe20, 0xfe26,
- 0xfe30, 0xfe52,
- 0xfe54, 0xfe66,
- 0xfe68, 0xfe6b,
- 0xfe70, 0xfe74,
- 0xfe76, 0xfefc,
- 0xff01, 0xffbe,
- 0xffc2, 0xffc7,
- 0xffca, 0xffcf,
- 0xffd2, 0xffd7,
- 0xffda, 0xffdc,
- 0xffe0, 0xffe6,
- 0xffe8, 0xffee,
- 0xfffc, 0xfffd,
- 0x10000, 0x1000b,
- 0x1000d, 0x10026,
- 0x10028, 0x1003a,
- 0x1003c, 0x1003d,
- 0x1003f, 0x1004d,
- 0x10050, 0x1005d,
- 0x10080, 0x100fa,
- 0x10100, 0x10102,
- 0x10107, 0x10133,
- 0x10137, 0x1018a,
- 0x10190, 0x1019b,
- 0x101d0, 0x101fd,
- 0x10280, 0x1029c,
- 0x102a0, 0x102d0,
- 0x10300, 0x1031e,
- 0x10320, 0x10323,
- 0x10330, 0x1034a,
- 0x10380, 0x1039d,
- 0x1039f, 0x103c3,
- 0x103c8, 0x103d5,
- 0x10400, 0x1049d,
- 0x104a0, 0x104a9,
- 0x10800, 0x10805,
- 0x10808, 0x10808,
- 0x1080a, 0x10835,
- 0x10837, 0x10838,
- 0x1083c, 0x1083c,
- 0x1083f, 0x1083f,
- 0x10900, 0x10919,
- 0x1091f, 0x10939,
- 0x1093f, 0x1093f,
- 0x10a00, 0x10a03,
- 0x10a05, 0x10a06,
- 0x10a0c, 0x10a13,
- 0x10a15, 0x10a17,
- 0x10a19, 0x10a33,
- 0x10a38, 0x10a3a,
- 0x10a3f, 0x10a47,
- 0x10a50, 0x10a58,
- 0x12000, 0x1236e,
- 0x12400, 0x12462,
- 0x12470, 0x12473,
- 0x1d000, 0x1d0f5,
- 0x1d100, 0x1d126,
- 0x1d129, 0x1d172,
- 0x1d17b, 0x1d1dd,
- 0x1d200, 0x1d245,
- 0x1d300, 0x1d356,
- 0x1d360, 0x1d371,
- 0x1d400, 0x1d454,
- 0x1d456, 0x1d49c,
- 0x1d49e, 0x1d49f,
- 0x1d4a2, 0x1d4a2,
- 0x1d4a5, 0x1d4a6,
- 0x1d4a9, 0x1d4ac,
- 0x1d4ae, 0x1d4b9,
- 0x1d4bb, 0x1d4bb,
- 0x1d4bd, 0x1d4c3,
- 0x1d4c5, 0x1d505,
- 0x1d507, 0x1d50a,
- 0x1d50d, 0x1d514,
- 0x1d516, 0x1d51c,
- 0x1d51e, 0x1d539,
- 0x1d53b, 0x1d53e,
- 0x1d540, 0x1d544,
- 0x1d546, 0x1d546,
- 0x1d54a, 0x1d550,
- 0x1d552, 0x1d6a5,
- 0x1d6a8, 0x1d7cb,
- 0x1d7ce, 0x1d7ff,
- 0x1f000, 0x1f02b,
- 0x1f030, 0x1f093,
- 0x20000, 0x20000,
- 0x2a6d6, 0x2a6d6,
- 0x2f800, 0x2fa1d,
- 0xe0100, 0xe01ef,
-}; /* CR_Graph */
-
-/* 'Lower': [[:Lower:]] */
-static const OnigCodePoint CR_Lower[] = {
- 598,
- 0x0061, 0x007a,
- 0x00aa, 0x00aa,
- 0x00b5, 0x00b5,
- 0x00ba, 0x00ba,
- 0x00df, 0x00f6,
- 0x00f8, 0x00ff,
- 0x0101, 0x0101,
- 0x0103, 0x0103,
- 0x0105, 0x0105,
- 0x0107, 0x0107,
- 0x0109, 0x0109,
- 0x010b, 0x010b,
- 0x010d, 0x010d,
- 0x010f, 0x010f,
- 0x0111, 0x0111,
- 0x0113, 0x0113,
- 0x0115, 0x0115,
- 0x0117, 0x0117,
- 0x0119, 0x0119,
- 0x011b, 0x011b,
- 0x011d, 0x011d,
- 0x011f, 0x011f,
- 0x0121, 0x0121,
- 0x0123, 0x0123,
- 0x0125, 0x0125,
- 0x0127, 0x0127,
- 0x0129, 0x0129,
- 0x012b, 0x012b,
- 0x012d, 0x012d,
- 0x012f, 0x012f,
- 0x0131, 0x0131,
- 0x0133, 0x0133,
- 0x0135, 0x0135,
- 0x0137, 0x0138,
- 0x013a, 0x013a,
- 0x013c, 0x013c,
- 0x013e, 0x013e,
- 0x0140, 0x0140,
- 0x0142, 0x0142,
- 0x0144, 0x0144,
- 0x0146, 0x0146,
- 0x0148, 0x0149,
- 0x014b, 0x014b,
- 0x014d, 0x014d,
- 0x014f, 0x014f,
- 0x0151, 0x0151,
- 0x0153, 0x0153,
- 0x0155, 0x0155,
- 0x0157, 0x0157,
- 0x0159, 0x0159,
- 0x015b, 0x015b,
- 0x015d, 0x015d,
- 0x015f, 0x015f,
- 0x0161, 0x0161,
- 0x0163, 0x0163,
- 0x0165, 0x0165,
- 0x0167, 0x0167,
- 0x0169, 0x0169,
- 0x016b, 0x016b,
- 0x016d, 0x016d,
- 0x016f, 0x016f,
- 0x0171, 0x0171,
- 0x0173, 0x0173,
- 0x0175, 0x0175,
- 0x0177, 0x0177,
- 0x017a, 0x017a,
- 0x017c, 0x017c,
- 0x017e, 0x0180,
- 0x0183, 0x0183,
- 0x0185, 0x0185,
- 0x0188, 0x0188,
- 0x018c, 0x018d,
- 0x0192, 0x0192,
- 0x0195, 0x0195,
- 0x0199, 0x019b,
- 0x019e, 0x019e,
- 0x01a1, 0x01a1,
- 0x01a3, 0x01a3,
- 0x01a5, 0x01a5,
- 0x01a8, 0x01a8,
- 0x01aa, 0x01ab,
- 0x01ad, 0x01ad,
- 0x01b0, 0x01b0,
- 0x01b4, 0x01b4,
- 0x01b6, 0x01b6,
- 0x01b9, 0x01ba,
- 0x01bd, 0x01bf,
- 0x01c6, 0x01c6,
- 0x01c9, 0x01c9,
- 0x01cc, 0x01cc,
- 0x01ce, 0x01ce,
- 0x01d0, 0x01d0,
- 0x01d2, 0x01d2,
- 0x01d4, 0x01d4,
- 0x01d6, 0x01d6,
- 0x01d8, 0x01d8,
- 0x01da, 0x01da,
- 0x01dc, 0x01dd,
- 0x01df, 0x01df,
- 0x01e1, 0x01e1,
- 0x01e3, 0x01e3,
- 0x01e5, 0x01e5,
- 0x01e7, 0x01e7,
- 0x01e9, 0x01e9,
- 0x01eb, 0x01eb,
- 0x01ed, 0x01ed,
- 0x01ef, 0x01f0,
- 0x01f3, 0x01f3,
- 0x01f5, 0x01f5,
- 0x01f9, 0x01f9,
- 0x01fb, 0x01fb,
- 0x01fd, 0x01fd,
- 0x01ff, 0x01ff,
- 0x0201, 0x0201,
- 0x0203, 0x0203,
- 0x0205, 0x0205,
- 0x0207, 0x0207,
- 0x0209, 0x0209,
- 0x020b, 0x020b,
- 0x020d, 0x020d,
- 0x020f, 0x020f,
- 0x0211, 0x0211,
- 0x0213, 0x0213,
- 0x0215, 0x0215,
- 0x0217, 0x0217,
- 0x0219, 0x0219,
- 0x021b, 0x021b,
- 0x021d, 0x021d,
- 0x021f, 0x021f,
- 0x0221, 0x0221,
- 0x0223, 0x0223,
- 0x0225, 0x0225,
- 0x0227, 0x0227,
- 0x0229, 0x0229,
- 0x022b, 0x022b,
- 0x022d, 0x022d,
- 0x022f, 0x022f,
- 0x0231, 0x0231,
- 0x0233, 0x0239,
- 0x023c, 0x023c,
- 0x023f, 0x0240,
- 0x0242, 0x0242,
- 0x0247, 0x0247,
- 0x0249, 0x0249,
- 0x024b, 0x024b,
- 0x024d, 0x024d,
- 0x024f, 0x0293,
- 0x0295, 0x02af,
- 0x0371, 0x0371,
- 0x0373, 0x0373,
- 0x0377, 0x0377,
- 0x037b, 0x037d,
- 0x0390, 0x0390,
- 0x03ac, 0x03ce,
- 0x03d0, 0x03d1,
- 0x03d5, 0x03d7,
- 0x03d9, 0x03d9,
- 0x03db, 0x03db,
- 0x03dd, 0x03dd,
- 0x03df, 0x03df,
- 0x03e1, 0x03e1,
- 0x03e3, 0x03e3,
- 0x03e5, 0x03e5,
- 0x03e7, 0x03e7,
- 0x03e9, 0x03e9,
- 0x03eb, 0x03eb,
- 0x03ed, 0x03ed,
- 0x03ef, 0x03f3,
- 0x03f5, 0x03f5,
- 0x03f8, 0x03f8,
- 0x03fb, 0x03fc,
- 0x0430, 0x045f,
- 0x0461, 0x0461,
- 0x0463, 0x0463,
- 0x0465, 0x0465,
- 0x0467, 0x0467,
- 0x0469, 0x0469,
- 0x046b, 0x046b,
- 0x046d, 0x046d,
- 0x046f, 0x046f,
- 0x0471, 0x0471,
- 0x0473, 0x0473,
- 0x0475, 0x0475,
- 0x0477, 0x0477,
- 0x0479, 0x0479,
- 0x047b, 0x047b,
- 0x047d, 0x047d,
- 0x047f, 0x047f,
- 0x0481, 0x0481,
- 0x048b, 0x048b,
- 0x048d, 0x048d,
- 0x048f, 0x048f,
- 0x0491, 0x0491,
- 0x0493, 0x0493,
- 0x0495, 0x0495,
- 0x0497, 0x0497,
- 0x0499, 0x0499,
- 0x049b, 0x049b,
- 0x049d, 0x049d,
- 0x049f, 0x049f,
- 0x04a1, 0x04a1,
- 0x04a3, 0x04a3,
- 0x04a5, 0x04a5,
- 0x04a7, 0x04a7,
- 0x04a9, 0x04a9,
- 0x04ab, 0x04ab,
- 0x04ad, 0x04ad,
- 0x04af, 0x04af,
- 0x04b1, 0x04b1,
- 0x04b3, 0x04b3,
- 0x04b5, 0x04b5,
- 0x04b7, 0x04b7,
- 0x04b9, 0x04b9,
- 0x04bb, 0x04bb,
- 0x04bd, 0x04bd,
- 0x04bf, 0x04bf,
- 0x04c2, 0x04c2,
- 0x04c4, 0x04c4,
- 0x04c6, 0x04c6,
- 0x04c8, 0x04c8,
- 0x04ca, 0x04ca,
- 0x04cc, 0x04cc,
- 0x04ce, 0x04cf,
- 0x04d1, 0x04d1,
- 0x04d3, 0x04d3,
- 0x04d5, 0x04d5,
- 0x04d7, 0x04d7,
- 0x04d9, 0x04d9,
- 0x04db, 0x04db,
- 0x04dd, 0x04dd,
- 0x04df, 0x04df,
- 0x04e1, 0x04e1,
- 0x04e3, 0x04e3,
- 0x04e5, 0x04e5,
- 0x04e7, 0x04e7,
- 0x04e9, 0x04e9,
- 0x04eb, 0x04eb,
- 0x04ed, 0x04ed,
- 0x04ef, 0x04ef,
- 0x04f1, 0x04f1,
- 0x04f3, 0x04f3,
- 0x04f5, 0x04f5,
- 0x04f7, 0x04f7,
- 0x04f9, 0x04f9,
- 0x04fb, 0x04fb,
- 0x04fd, 0x04fd,
- 0x04ff, 0x04ff,
- 0x0501, 0x0501,
- 0x0503, 0x0503,
- 0x0505, 0x0505,
- 0x0507, 0x0507,
- 0x0509, 0x0509,
- 0x050b, 0x050b,
- 0x050d, 0x050d,
- 0x050f, 0x050f,
- 0x0511, 0x0511,
- 0x0513, 0x0513,
- 0x0515, 0x0515,
- 0x0517, 0x0517,
- 0x0519, 0x0519,
- 0x051b, 0x051b,
- 0x051d, 0x051d,
- 0x051f, 0x051f,
- 0x0521, 0x0521,
- 0x0523, 0x0523,
- 0x0561, 0x0587,
- 0x1d00, 0x1d2b,
- 0x1d62, 0x1d77,
- 0x1d79, 0x1d9a,
- 0x1e01, 0x1e01,
- 0x1e03, 0x1e03,
- 0x1e05, 0x1e05,
- 0x1e07, 0x1e07,
- 0x1e09, 0x1e09,
- 0x1e0b, 0x1e0b,
- 0x1e0d, 0x1e0d,
- 0x1e0f, 0x1e0f,
- 0x1e11, 0x1e11,
- 0x1e13, 0x1e13,
- 0x1e15, 0x1e15,
- 0x1e17, 0x1e17,
- 0x1e19, 0x1e19,
- 0x1e1b, 0x1e1b,
- 0x1e1d, 0x1e1d,
- 0x1e1f, 0x1e1f,
- 0x1e21, 0x1e21,
- 0x1e23, 0x1e23,
- 0x1e25, 0x1e25,
- 0x1e27, 0x1e27,
- 0x1e29, 0x1e29,
- 0x1e2b, 0x1e2b,
- 0x1e2d, 0x1e2d,
- 0x1e2f, 0x1e2f,
- 0x1e31, 0x1e31,
- 0x1e33, 0x1e33,
- 0x1e35, 0x1e35,
- 0x1e37, 0x1e37,
- 0x1e39, 0x1e39,
- 0x1e3b, 0x1e3b,
- 0x1e3d, 0x1e3d,
- 0x1e3f, 0x1e3f,
- 0x1e41, 0x1e41,
- 0x1e43, 0x1e43,
- 0x1e45, 0x1e45,
- 0x1e47, 0x1e47,
- 0x1e49, 0x1e49,
- 0x1e4b, 0x1e4b,
- 0x1e4d, 0x1e4d,
- 0x1e4f, 0x1e4f,
- 0x1e51, 0x1e51,
- 0x1e53, 0x1e53,
- 0x1e55, 0x1e55,
- 0x1e57, 0x1e57,
- 0x1e59, 0x1e59,
- 0x1e5b, 0x1e5b,
- 0x1e5d, 0x1e5d,
- 0x1e5f, 0x1e5f,
- 0x1e61, 0x1e61,
- 0x1e63, 0x1e63,
- 0x1e65, 0x1e65,
- 0x1e67, 0x1e67,
- 0x1e69, 0x1e69,
- 0x1e6b, 0x1e6b,
- 0x1e6d, 0x1e6d,
- 0x1e6f, 0x1e6f,
- 0x1e71, 0x1e71,
- 0x1e73, 0x1e73,
- 0x1e75, 0x1e75,
- 0x1e77, 0x1e77,
- 0x1e79, 0x1e79,
- 0x1e7b, 0x1e7b,
- 0x1e7d, 0x1e7d,
- 0x1e7f, 0x1e7f,
- 0x1e81, 0x1e81,
- 0x1e83, 0x1e83,
- 0x1e85, 0x1e85,
- 0x1e87, 0x1e87,
- 0x1e89, 0x1e89,
- 0x1e8b, 0x1e8b,
- 0x1e8d, 0x1e8d,
- 0x1e8f, 0x1e8f,
- 0x1e91, 0x1e91,
- 0x1e93, 0x1e93,
- 0x1e95, 0x1e9d,
- 0x1e9f, 0x1e9f,
- 0x1ea1, 0x1ea1,
- 0x1ea3, 0x1ea3,
- 0x1ea5, 0x1ea5,
- 0x1ea7, 0x1ea7,
- 0x1ea9, 0x1ea9,
- 0x1eab, 0x1eab,
- 0x1ead, 0x1ead,
- 0x1eaf, 0x1eaf,
- 0x1eb1, 0x1eb1,
- 0x1eb3, 0x1eb3,
- 0x1eb5, 0x1eb5,
- 0x1eb7, 0x1eb7,
- 0x1eb9, 0x1eb9,
- 0x1ebb, 0x1ebb,
- 0x1ebd, 0x1ebd,
- 0x1ebf, 0x1ebf,
- 0x1ec1, 0x1ec1,
- 0x1ec3, 0x1ec3,
- 0x1ec5, 0x1ec5,
- 0x1ec7, 0x1ec7,
- 0x1ec9, 0x1ec9,
- 0x1ecb, 0x1ecb,
- 0x1ecd, 0x1ecd,
- 0x1ecf, 0x1ecf,
- 0x1ed1, 0x1ed1,
- 0x1ed3, 0x1ed3,
- 0x1ed5, 0x1ed5,
- 0x1ed7, 0x1ed7,
- 0x1ed9, 0x1ed9,
- 0x1edb, 0x1edb,
- 0x1edd, 0x1edd,
- 0x1edf, 0x1edf,
- 0x1ee1, 0x1ee1,
- 0x1ee3, 0x1ee3,
- 0x1ee5, 0x1ee5,
- 0x1ee7, 0x1ee7,
- 0x1ee9, 0x1ee9,
- 0x1eeb, 0x1eeb,
- 0x1eed, 0x1eed,
- 0x1eef, 0x1eef,
- 0x1ef1, 0x1ef1,
- 0x1ef3, 0x1ef3,
- 0x1ef5, 0x1ef5,
- 0x1ef7, 0x1ef7,
- 0x1ef9, 0x1ef9,
- 0x1efb, 0x1efb,
- 0x1efd, 0x1efd,
- 0x1eff, 0x1f07,
- 0x1f10, 0x1f15,
- 0x1f20, 0x1f27,
- 0x1f30, 0x1f37,
- 0x1f40, 0x1f45,
- 0x1f50, 0x1f57,
- 0x1f60, 0x1f67,
- 0x1f70, 0x1f7d,
- 0x1f80, 0x1f87,
- 0x1f90, 0x1f97,
- 0x1fa0, 0x1fa7,
- 0x1fb0, 0x1fb4,
- 0x1fb6, 0x1fb7,
- 0x1fbe, 0x1fbe,
- 0x1fc2, 0x1fc4,
- 0x1fc6, 0x1fc7,
- 0x1fd0, 0x1fd3,
- 0x1fd6, 0x1fd7,
- 0x1fe0, 0x1fe7,
- 0x1ff2, 0x1ff4,
- 0x1ff6, 0x1ff7,
- 0x2071, 0x2071,
- 0x207f, 0x207f,
- 0x210a, 0x210a,
- 0x210e, 0x210f,
- 0x2113, 0x2113,
- 0x212f, 0x212f,
- 0x2134, 0x2134,
- 0x2139, 0x2139,
- 0x213c, 0x213d,
- 0x2146, 0x2149,
- 0x214e, 0x214e,
- 0x2184, 0x2184,
- 0x2c30, 0x2c5e,
- 0x2c61, 0x2c61,
- 0x2c65, 0x2c66,
- 0x2c68, 0x2c68,
- 0x2c6a, 0x2c6a,
- 0x2c6c, 0x2c6c,
- 0x2c71, 0x2c71,
- 0x2c73, 0x2c74,
- 0x2c76, 0x2c7c,
- 0x2c81, 0x2c81,
- 0x2c83, 0x2c83,
- 0x2c85, 0x2c85,
- 0x2c87, 0x2c87,
- 0x2c89, 0x2c89,
- 0x2c8b, 0x2c8b,
- 0x2c8d, 0x2c8d,
- 0x2c8f, 0x2c8f,
- 0x2c91, 0x2c91,
- 0x2c93, 0x2c93,
- 0x2c95, 0x2c95,
- 0x2c97, 0x2c97,
- 0x2c99, 0x2c99,
- 0x2c9b, 0x2c9b,
- 0x2c9d, 0x2c9d,
- 0x2c9f, 0x2c9f,
- 0x2ca1, 0x2ca1,
- 0x2ca3, 0x2ca3,
- 0x2ca5, 0x2ca5,
- 0x2ca7, 0x2ca7,
- 0x2ca9, 0x2ca9,
- 0x2cab, 0x2cab,
- 0x2cad, 0x2cad,
- 0x2caf, 0x2caf,
- 0x2cb1, 0x2cb1,
- 0x2cb3, 0x2cb3,
- 0x2cb5, 0x2cb5,
- 0x2cb7, 0x2cb7,
- 0x2cb9, 0x2cb9,
- 0x2cbb, 0x2cbb,
- 0x2cbd, 0x2cbd,
- 0x2cbf, 0x2cbf,
- 0x2cc1, 0x2cc1,
- 0x2cc3, 0x2cc3,
- 0x2cc5, 0x2cc5,
- 0x2cc7, 0x2cc7,
- 0x2cc9, 0x2cc9,
- 0x2ccb, 0x2ccb,
- 0x2ccd, 0x2ccd,
- 0x2ccf, 0x2ccf,
- 0x2cd1, 0x2cd1,
- 0x2cd3, 0x2cd3,
- 0x2cd5, 0x2cd5,
- 0x2cd7, 0x2cd7,
- 0x2cd9, 0x2cd9,
- 0x2cdb, 0x2cdb,
- 0x2cdd, 0x2cdd,
- 0x2cdf, 0x2cdf,
- 0x2ce1, 0x2ce1,
- 0x2ce3, 0x2ce4,
- 0x2d00, 0x2d25,
- 0xa641, 0xa641,
- 0xa643, 0xa643,
- 0xa645, 0xa645,
- 0xa647, 0xa647,
- 0xa649, 0xa649,
- 0xa64b, 0xa64b,
- 0xa64d, 0xa64d,
- 0xa64f, 0xa64f,
- 0xa651, 0xa651,
- 0xa653, 0xa653,
- 0xa655, 0xa655,
- 0xa657, 0xa657,
- 0xa659, 0xa659,
- 0xa65b, 0xa65b,
- 0xa65d, 0xa65d,
- 0xa65f, 0xa65f,
- 0xa663, 0xa663,
- 0xa665, 0xa665,
- 0xa667, 0xa667,
- 0xa669, 0xa669,
- 0xa66b, 0xa66b,
- 0xa66d, 0xa66d,
- 0xa681, 0xa681,
- 0xa683, 0xa683,
- 0xa685, 0xa685,
- 0xa687, 0xa687,
- 0xa689, 0xa689,
- 0xa68b, 0xa68b,
- 0xa68d, 0xa68d,
- 0xa68f, 0xa68f,
- 0xa691, 0xa691,
- 0xa693, 0xa693,
- 0xa695, 0xa695,
- 0xa697, 0xa697,
- 0xa723, 0xa723,
- 0xa725, 0xa725,
- 0xa727, 0xa727,
- 0xa729, 0xa729,
- 0xa72b, 0xa72b,
- 0xa72d, 0xa72d,
- 0xa72f, 0xa731,
- 0xa733, 0xa733,
- 0xa735, 0xa735,
- 0xa737, 0xa737,
- 0xa739, 0xa739,
- 0xa73b, 0xa73b,
- 0xa73d, 0xa73d,
- 0xa73f, 0xa73f,
- 0xa741, 0xa741,
- 0xa743, 0xa743,
- 0xa745, 0xa745,
- 0xa747, 0xa747,
- 0xa749, 0xa749,
- 0xa74b, 0xa74b,
- 0xa74d, 0xa74d,
- 0xa74f, 0xa74f,
- 0xa751, 0xa751,
- 0xa753, 0xa753,
- 0xa755, 0xa755,
- 0xa757, 0xa757,
- 0xa759, 0xa759,
- 0xa75b, 0xa75b,
- 0xa75d, 0xa75d,
- 0xa75f, 0xa75f,
- 0xa761, 0xa761,
- 0xa763, 0xa763,
- 0xa765, 0xa765,
- 0xa767, 0xa767,
- 0xa769, 0xa769,
- 0xa76b, 0xa76b,
- 0xa76d, 0xa76d,
- 0xa76f, 0xa76f,
- 0xa771, 0xa778,
- 0xa77a, 0xa77a,
- 0xa77c, 0xa77c,
- 0xa77f, 0xa77f,
- 0xa781, 0xa781,
- 0xa783, 0xa783,
- 0xa785, 0xa785,
- 0xa787, 0xa787,
- 0xa78c, 0xa78c,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xff41, 0xff5a,
- 0x10428, 0x1044f,
- 0x1d41a, 0x1d433,
- 0x1d44e, 0x1d454,
- 0x1d456, 0x1d467,
- 0x1d482, 0x1d49b,
- 0x1d4b6, 0x1d4b9,
- 0x1d4bb, 0x1d4bb,
- 0x1d4bd, 0x1d4c3,
- 0x1d4c5, 0x1d4cf,
- 0x1d4ea, 0x1d503,
- 0x1d51e, 0x1d537,
- 0x1d552, 0x1d56b,
- 0x1d586, 0x1d59f,
- 0x1d5ba, 0x1d5d3,
- 0x1d5ee, 0x1d607,
- 0x1d622, 0x1d63b,
- 0x1d656, 0x1d66f,
- 0x1d68a, 0x1d6a5,
- 0x1d6c2, 0x1d6da,
- 0x1d6dc, 0x1d6e1,
- 0x1d6fc, 0x1d714,
- 0x1d716, 0x1d71b,
- 0x1d736, 0x1d74e,
- 0x1d750, 0x1d755,
- 0x1d770, 0x1d788,
- 0x1d78a, 0x1d78f,
- 0x1d7aa, 0x1d7c2,
- 0x1d7c4, 0x1d7c9,
- 0x1d7cb, 0x1d7cb,
-}; /* CR_Lower */
-
-/* 'Print': [[:Print:]] */
-static const OnigCodePoint CR_Print[] = {
- 452,
- 0x0009, 0x000d,
- 0x0020, 0x007e,
- 0x0085, 0x0085,
- 0x00a0, 0x00ac,
- 0x00ae, 0x0377,
- 0x037a, 0x037e,
- 0x0384, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x0523,
- 0x0531, 0x0556,
- 0x0559, 0x055f,
- 0x0561, 0x0587,
- 0x0589, 0x058a,
- 0x0591, 0x05c7,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0x0606, 0x061b,
- 0x061e, 0x061f,
- 0x0621, 0x065e,
- 0x0660, 0x06dc,
- 0x06de, 0x070d,
- 0x0710, 0x074a,
- 0x074d, 0x07b1,
- 0x07c0, 0x07fa,
- 0x0901, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0954,
- 0x0958, 0x0972,
- 0x097b, 0x097f,
- 0x0981, 0x0983,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bc, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09ce,
- 0x09d7, 0x09d7,
- 0x09dc, 0x09dd,
- 0x09df, 0x09e3,
- 0x09e6, 0x09fa,
- 0x0a01, 0x0a03,
- 0x0a05, 0x0a0a,
- 0x0a0f, 0x0a10,
- 0x0a13, 0x0a28,
- 0x0a2a, 0x0a30,
- 0x0a32, 0x0a33,
- 0x0a35, 0x0a36,
- 0x0a38, 0x0a39,
- 0x0a3c, 0x0a3c,
- 0x0a3e, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4d,
- 0x0a51, 0x0a51,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a66, 0x0a75,
- 0x0a81, 0x0a83,
- 0x0a85, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abc, 0x0ac5,
- 0x0ac7, 0x0ac9,
- 0x0acb, 0x0acd,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae3,
- 0x0ae6, 0x0aef,
- 0x0af1, 0x0af1,
- 0x0b01, 0x0b03,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b35, 0x0b39,
- 0x0b3c, 0x0b44,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b63,
- 0x0b66, 0x0b71,
- 0x0b82, 0x0b83,
- 0x0b85, 0x0b8a,
- 0x0b8e, 0x0b90,
- 0x0b92, 0x0b95,
- 0x0b99, 0x0b9a,
- 0x0b9c, 0x0b9c,
- 0x0b9e, 0x0b9f,
- 0x0ba3, 0x0ba4,
- 0x0ba8, 0x0baa,
- 0x0bae, 0x0bb9,
- 0x0bbe, 0x0bc2,
- 0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcd,
- 0x0bd0, 0x0bd0,
- 0x0bd7, 0x0bd7,
- 0x0be6, 0x0bfa,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3d, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c58, 0x0c59,
- 0x0c60, 0x0c63,
- 0x0c66, 0x0c6f,
- 0x0c78, 0x0c7f,
- 0x0c82, 0x0c83,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbc, 0x0cc4,
- 0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccd,
- 0x0cd5, 0x0cd6,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce3,
- 0x0ce6, 0x0cef,
- 0x0cf1, 0x0cf2,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3d, 0x0d44,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d63,
- 0x0d66, 0x0d75,
- 0x0d79, 0x0d7f,
- 0x0d82, 0x0d83,
- 0x0d85, 0x0d96,
- 0x0d9a, 0x0db1,
- 0x0db3, 0x0dbb,
- 0x0dbd, 0x0dbd,
- 0x0dc0, 0x0dc6,
- 0x0dca, 0x0dca,
- 0x0dcf, 0x0dd4,
- 0x0dd6, 0x0dd6,
- 0x0dd8, 0x0ddf,
- 0x0df2, 0x0df4,
- 0x0e01, 0x0e3a,
- 0x0e3f, 0x0e5b,
- 0x0e81, 0x0e82,
- 0x0e84, 0x0e84,
- 0x0e87, 0x0e88,
- 0x0e8a, 0x0e8a,
- 0x0e8d, 0x0e8d,
- 0x0e94, 0x0e97,
- 0x0e99, 0x0e9f,
- 0x0ea1, 0x0ea3,
- 0x0ea5, 0x0ea5,
- 0x0ea7, 0x0ea7,
- 0x0eaa, 0x0eab,
- 0x0ead, 0x0eb9,
- 0x0ebb, 0x0ebd,
- 0x0ec0, 0x0ec4,
- 0x0ec6, 0x0ec6,
- 0x0ec8, 0x0ecd,
- 0x0ed0, 0x0ed9,
- 0x0edc, 0x0edd,
- 0x0f00, 0x0f47,
- 0x0f49, 0x0f6c,
- 0x0f71, 0x0f8b,
- 0x0f90, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fbe, 0x0fcc,
- 0x0fce, 0x0fd4,
- 0x1000, 0x1099,
- 0x109e, 0x10c5,
- 0x10d0, 0x10fc,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x1200, 0x1248,
- 0x124a, 0x124d,
- 0x1250, 0x1256,
- 0x1258, 0x1258,
- 0x125a, 0x125d,
- 0x1260, 0x1288,
- 0x128a, 0x128d,
- 0x1290, 0x12b0,
- 0x12b2, 0x12b5,
- 0x12b8, 0x12be,
- 0x12c0, 0x12c0,
- 0x12c2, 0x12c5,
- 0x12c8, 0x12d6,
- 0x12d8, 0x1310,
- 0x1312, 0x1315,
- 0x1318, 0x135a,
- 0x135f, 0x137c,
- 0x1380, 0x1399,
- 0x13a0, 0x13f4,
- 0x1401, 0x1676,
- 0x1680, 0x169c,
- 0x16a0, 0x16f0,
- 0x1700, 0x170c,
- 0x170e, 0x1714,
- 0x1720, 0x1736,
- 0x1740, 0x1753,
- 0x1760, 0x176c,
- 0x176e, 0x1770,
- 0x1772, 0x1773,
- 0x1780, 0x17b3,
- 0x17b6, 0x17dd,
- 0x17e0, 0x17e9,
- 0x17f0, 0x17f9,
- 0x1800, 0x180e,
- 0x1810, 0x1819,
- 0x1820, 0x1877,
- 0x1880, 0x18aa,
- 0x1900, 0x191c,
- 0x1920, 0x192b,
- 0x1930, 0x193b,
- 0x1940, 0x1940,
- 0x1944, 0x196d,
- 0x1970, 0x1974,
- 0x1980, 0x19a9,
- 0x19b0, 0x19c9,
- 0x19d0, 0x19d9,
- 0x19de, 0x1a1b,
- 0x1a1e, 0x1a1f,
- 0x1b00, 0x1b4b,
- 0x1b50, 0x1b7c,
- 0x1b80, 0x1baa,
- 0x1bae, 0x1bb9,
- 0x1c00, 0x1c37,
- 0x1c3b, 0x1c49,
- 0x1c4d, 0x1c7f,
- 0x1d00, 0x1de6,
- 0x1dfe, 0x1f15,
- 0x1f18, 0x1f1d,
- 0x1f20, 0x1f45,
- 0x1f48, 0x1f4d,
- 0x1f50, 0x1f57,
- 0x1f59, 0x1f59,
- 0x1f5b, 0x1f5b,
- 0x1f5d, 0x1f5d,
- 0x1f5f, 0x1f7d,
- 0x1f80, 0x1fb4,
- 0x1fb6, 0x1fc4,
- 0x1fc6, 0x1fd3,
- 0x1fd6, 0x1fdb,
- 0x1fdd, 0x1fef,
- 0x1ff2, 0x1ff4,
- 0x1ff6, 0x1ffe,
- 0x2000, 0x200a,
- 0x2010, 0x2029,
- 0x202f, 0x205f,
- 0x2070, 0x2071,
- 0x2074, 0x208e,
- 0x2090, 0x2094,
- 0x20a0, 0x20b5,
- 0x20d0, 0x20f0,
- 0x2100, 0x214f,
- 0x2153, 0x2188,
- 0x2190, 0x23e7,
- 0x2400, 0x2426,
- 0x2440, 0x244a,
- 0x2460, 0x269d,
- 0x26a0, 0x26bc,
- 0x26c0, 0x26c3,
- 0x2701, 0x2704,
- 0x2706, 0x2709,
- 0x270c, 0x2727,
- 0x2729, 0x274b,
- 0x274d, 0x274d,
- 0x274f, 0x2752,
- 0x2756, 0x2756,
- 0x2758, 0x275e,
- 0x2761, 0x2794,
- 0x2798, 0x27af,
- 0x27b1, 0x27be,
- 0x27c0, 0x27ca,
- 0x27cc, 0x27cc,
- 0x27d0, 0x2b4c,
- 0x2b50, 0x2b54,
- 0x2c00, 0x2c2e,
- 0x2c30, 0x2c5e,
- 0x2c60, 0x2c6f,
- 0x2c71, 0x2c7d,
- 0x2c80, 0x2cea,
- 0x2cf9, 0x2d25,
- 0x2d30, 0x2d65,
- 0x2d6f, 0x2d6f,
- 0x2d80, 0x2d96,
- 0x2da0, 0x2da6,
- 0x2da8, 0x2dae,
- 0x2db0, 0x2db6,
- 0x2db8, 0x2dbe,
- 0x2dc0, 0x2dc6,
- 0x2dc8, 0x2dce,
- 0x2dd0, 0x2dd6,
- 0x2dd8, 0x2dde,
- 0x2de0, 0x2e30,
- 0x2e80, 0x2e99,
- 0x2e9b, 0x2ef3,
- 0x2f00, 0x2fd5,
- 0x2ff0, 0x2ffb,
- 0x3000, 0x303f,
- 0x3041, 0x3096,
- 0x3099, 0x30ff,
- 0x3105, 0x312d,
- 0x3131, 0x318e,
- 0x3190, 0x31b7,
- 0x31c0, 0x31e3,
- 0x31f0, 0x321e,
- 0x3220, 0x3243,
- 0x3250, 0x32fe,
- 0x3300, 0x3400,
- 0x4db5, 0x4db5,
- 0x4dc0, 0x4e00,
- 0x9fc3, 0x9fc3,
- 0xa000, 0xa48c,
- 0xa490, 0xa4c6,
- 0xa500, 0xa62b,
- 0xa640, 0xa65f,
- 0xa662, 0xa673,
- 0xa67c, 0xa697,
- 0xa700, 0xa78c,
- 0xa7fb, 0xa82b,
- 0xa840, 0xa877,
- 0xa880, 0xa8c4,
- 0xa8ce, 0xa8d9,
- 0xa900, 0xa953,
- 0xa95f, 0xa95f,
- 0xaa00, 0xaa36,
- 0xaa40, 0xaa4d,
- 0xaa50, 0xaa59,
- 0xaa5c, 0xaa5f,
- 0xac00, 0xac00,
- 0xd7a3, 0xd7a3,
- 0xf900, 0xfa2d,
- 0xfa30, 0xfa6a,
- 0xfa70, 0xfad9,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xfb1d, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbb1,
- 0xfbd3, 0xfd3f,
- 0xfd50, 0xfd8f,
- 0xfd92, 0xfdc7,
- 0xfdf0, 0xfdfd,
- 0xfe00, 0xfe19,
- 0xfe20, 0xfe26,
- 0xfe30, 0xfe52,
- 0xfe54, 0xfe66,
- 0xfe68, 0xfe6b,
- 0xfe70, 0xfe74,
- 0xfe76, 0xfefc,
- 0xff01, 0xffbe,
- 0xffc2, 0xffc7,
- 0xffca, 0xffcf,
- 0xffd2, 0xffd7,
- 0xffda, 0xffdc,
- 0xffe0, 0xffe6,
- 0xffe8, 0xffee,
- 0xfffc, 0xfffd,
- 0x10000, 0x1000b,
- 0x1000d, 0x10026,
- 0x10028, 0x1003a,
- 0x1003c, 0x1003d,
- 0x1003f, 0x1004d,
- 0x10050, 0x1005d,
- 0x10080, 0x100fa,
- 0x10100, 0x10102,
- 0x10107, 0x10133,
- 0x10137, 0x1018a,
- 0x10190, 0x1019b,
- 0x101d0, 0x101fd,
- 0x10280, 0x1029c,
- 0x102a0, 0x102d0,
- 0x10300, 0x1031e,
- 0x10320, 0x10323,
- 0x10330, 0x1034a,
- 0x10380, 0x1039d,
- 0x1039f, 0x103c3,
- 0x103c8, 0x103d5,
- 0x10400, 0x1049d,
- 0x104a0, 0x104a9,
- 0x10800, 0x10805,
- 0x10808, 0x10808,
- 0x1080a, 0x10835,
- 0x10837, 0x10838,
- 0x1083c, 0x1083c,
- 0x1083f, 0x1083f,
- 0x10900, 0x10919,
- 0x1091f, 0x10939,
- 0x1093f, 0x1093f,
- 0x10a00, 0x10a03,
- 0x10a05, 0x10a06,
- 0x10a0c, 0x10a13,
- 0x10a15, 0x10a17,
- 0x10a19, 0x10a33,
- 0x10a38, 0x10a3a,
- 0x10a3f, 0x10a47,
- 0x10a50, 0x10a58,
- 0x12000, 0x1236e,
- 0x12400, 0x12462,
- 0x12470, 0x12473,
- 0x1d000, 0x1d0f5,
- 0x1d100, 0x1d126,
- 0x1d129, 0x1d172,
- 0x1d17b, 0x1d1dd,
- 0x1d200, 0x1d245,
- 0x1d300, 0x1d356,
- 0x1d360, 0x1d371,
- 0x1d400, 0x1d454,
- 0x1d456, 0x1d49c,
- 0x1d49e, 0x1d49f,
- 0x1d4a2, 0x1d4a2,
- 0x1d4a5, 0x1d4a6,
- 0x1d4a9, 0x1d4ac,
- 0x1d4ae, 0x1d4b9,
- 0x1d4bb, 0x1d4bb,
- 0x1d4bd, 0x1d4c3,
- 0x1d4c5, 0x1d505,
- 0x1d507, 0x1d50a,
- 0x1d50d, 0x1d514,
- 0x1d516, 0x1d51c,
- 0x1d51e, 0x1d539,
- 0x1d53b, 0x1d53e,
- 0x1d540, 0x1d544,
- 0x1d546, 0x1d546,
- 0x1d54a, 0x1d550,
- 0x1d552, 0x1d6a5,
- 0x1d6a8, 0x1d7cb,
- 0x1d7ce, 0x1d7ff,
- 0x1f000, 0x1f02b,
- 0x1f030, 0x1f093,
- 0x20000, 0x20000,
- 0x2a6d6, 0x2a6d6,
- 0x2f800, 0x2fa1d,
- 0xe0100, 0xe01ef,
-}; /* CR_Print */
-
-/* 'Punct': [[:Punct:]] */
-static const OnigCodePoint CR_Punct[] = {
- 112,
- 0x0021, 0x0023,
- 0x0025, 0x002a,
- 0x002c, 0x002f,
- 0x003a, 0x003b,
- 0x003f, 0x0040,
- 0x005b, 0x005d,
- 0x005f, 0x005f,
- 0x007b, 0x007b,
- 0x007d, 0x007d,
- 0x00a1, 0x00a1,
- 0x00ab, 0x00ab,
- 0x00b7, 0x00b7,
- 0x00bb, 0x00bb,
- 0x00bf, 0x00bf,
- 0x037e, 0x037e,
- 0x0387, 0x0387,
- 0x055a, 0x055f,
- 0x0589, 0x058a,
- 0x05be, 0x05be,
- 0x05c0, 0x05c0,
- 0x05c3, 0x05c3,
- 0x05c6, 0x05c6,
- 0x05f3, 0x05f4,
- 0x0609, 0x060a,
- 0x060c, 0x060d,
- 0x061b, 0x061b,
- 0x061e, 0x061f,
- 0x066a, 0x066d,
- 0x06d4, 0x06d4,
- 0x0700, 0x070d,
- 0x07f7, 0x07f9,
- 0x0964, 0x0965,
- 0x0970, 0x0970,
- 0x0df4, 0x0df4,
- 0x0e4f, 0x0e4f,
- 0x0e5a, 0x0e5b,
- 0x0f04, 0x0f12,
- 0x0f3a, 0x0f3d,
- 0x0f85, 0x0f85,
- 0x0fd0, 0x0fd4,
- 0x104a, 0x104f,
- 0x10fb, 0x10fb,
- 0x1361, 0x1368,
- 0x166d, 0x166e,
- 0x169b, 0x169c,
- 0x16eb, 0x16ed,
- 0x1735, 0x1736,
- 0x17d4, 0x17d6,
- 0x17d8, 0x17da,
- 0x1800, 0x180a,
- 0x1944, 0x1945,
- 0x19de, 0x19df,
- 0x1a1e, 0x1a1f,
- 0x1b5a, 0x1b60,
- 0x1c3b, 0x1c3f,
- 0x1c7e, 0x1c7f,
- 0x2010, 0x2027,
- 0x2030, 0x2043,
- 0x2045, 0x2051,
- 0x2053, 0x205e,
- 0x207d, 0x207e,
- 0x208d, 0x208e,
- 0x2329, 0x232a,
- 0x2768, 0x2775,
- 0x27c5, 0x27c6,
- 0x27e6, 0x27ef,
- 0x2983, 0x2998,
- 0x29d8, 0x29db,
- 0x29fc, 0x29fd,
- 0x2cf9, 0x2cfc,
- 0x2cfe, 0x2cff,
- 0x2e00, 0x2e2e,
- 0x2e30, 0x2e30,
- 0x3001, 0x3003,
- 0x3008, 0x3011,
- 0x3014, 0x301f,
- 0x3030, 0x3030,
- 0x303d, 0x303d,
- 0x30a0, 0x30a0,
- 0x30fb, 0x30fb,
- 0xa60d, 0xa60f,
- 0xa673, 0xa673,
- 0xa67e, 0xa67e,
- 0xa874, 0xa877,
- 0xa8ce, 0xa8cf,
- 0xa92e, 0xa92f,
- 0xa95f, 0xa95f,
- 0xaa5c, 0xaa5f,
- 0xfd3e, 0xfd3f,
- 0xfe10, 0xfe19,
- 0xfe30, 0xfe52,
- 0xfe54, 0xfe61,
- 0xfe63, 0xfe63,
- 0xfe68, 0xfe68,
- 0xfe6a, 0xfe6b,
- 0xff01, 0xff03,
- 0xff05, 0xff0a,
- 0xff0c, 0xff0f,
- 0xff1a, 0xff1b,
- 0xff1f, 0xff20,
- 0xff3b, 0xff3d,
- 0xff3f, 0xff3f,
- 0xff5b, 0xff5b,
- 0xff5d, 0xff5d,
- 0xff5f, 0xff65,
- 0x10100, 0x10101,
- 0x1039f, 0x1039f,
- 0x103d0, 0x103d0,
- 0x1091f, 0x1091f,
- 0x1093f, 0x1093f,
- 0x10a50, 0x10a58,
- 0x12470, 0x12473,
-}; /* CR_Punct */
-
-/* 'Space': [[:Space:]] */
-static const OnigCodePoint CR_Space[] = {
- 11,
- 0x0009, 0x000d,
- 0x0020, 0x0020,
- 0x0085, 0x0085,
- 0x00a0, 0x00a0,
- 0x1680, 0x1680,
- 0x180e, 0x180e,
- 0x2000, 0x200a,
- 0x2028, 0x2029,
- 0x202f, 0x202f,
- 0x205f, 0x205f,
- 0x3000, 0x3000,
-}; /* CR_Space */
-
-/* 'Upper': [[:Upper:]] */
-static const OnigCodePoint CR_Upper[] = {
- 591,
- 0x0041, 0x005a,
- 0x00c0, 0x00d6,
- 0x00d8, 0x00de,
- 0x0100, 0x0100,
- 0x0102, 0x0102,
- 0x0104, 0x0104,
- 0x0106, 0x0106,
- 0x0108, 0x0108,
- 0x010a, 0x010a,
- 0x010c, 0x010c,
- 0x010e, 0x010e,
- 0x0110, 0x0110,
- 0x0112, 0x0112,
- 0x0114, 0x0114,
- 0x0116, 0x0116,
- 0x0118, 0x0118,
- 0x011a, 0x011a,
- 0x011c, 0x011c,
- 0x011e, 0x011e,
- 0x0120, 0x0120,
- 0x0122, 0x0122,
- 0x0124, 0x0124,
- 0x0126, 0x0126,
- 0x0128, 0x0128,
- 0x012a, 0x012a,
- 0x012c, 0x012c,
- 0x012e, 0x012e,
- 0x0130, 0x0130,
- 0x0132, 0x0132,
- 0x0134, 0x0134,
- 0x0136, 0x0136,
- 0x0139, 0x0139,
- 0x013b, 0x013b,
- 0x013d, 0x013d,
- 0x013f, 0x013f,
- 0x0141, 0x0141,
- 0x0143, 0x0143,
- 0x0145, 0x0145,
- 0x0147, 0x0147,
- 0x014a, 0x014a,
- 0x014c, 0x014c,
- 0x014e, 0x014e,
- 0x0150, 0x0150,
- 0x0152, 0x0152,
- 0x0154, 0x0154,
- 0x0156, 0x0156,
- 0x0158, 0x0158,
- 0x015a, 0x015a,
- 0x015c, 0x015c,
- 0x015e, 0x015e,
- 0x0160, 0x0160,
- 0x0162, 0x0162,
- 0x0164, 0x0164,
- 0x0166, 0x0166,
- 0x0168, 0x0168,
- 0x016a, 0x016a,
- 0x016c, 0x016c,
- 0x016e, 0x016e,
- 0x0170, 0x0170,
- 0x0172, 0x0172,
- 0x0174, 0x0174,
- 0x0176, 0x0176,
- 0x0178, 0x0179,
- 0x017b, 0x017b,
- 0x017d, 0x017d,
- 0x0181, 0x0182,
- 0x0184, 0x0184,
- 0x0186, 0x0187,
- 0x0189, 0x018b,
- 0x018e, 0x0191,
- 0x0193, 0x0194,
- 0x0196, 0x0198,
- 0x019c, 0x019d,
- 0x019f, 0x01a0,
- 0x01a2, 0x01a2,
- 0x01a4, 0x01a4,
- 0x01a6, 0x01a7,
- 0x01a9, 0x01a9,
- 0x01ac, 0x01ac,
- 0x01ae, 0x01af,
- 0x01b1, 0x01b3,
- 0x01b5, 0x01b5,
- 0x01b7, 0x01b8,
- 0x01bc, 0x01bc,
- 0x01c4, 0x01c4,
- 0x01c7, 0x01c7,
- 0x01ca, 0x01ca,
- 0x01cd, 0x01cd,
- 0x01cf, 0x01cf,
- 0x01d1, 0x01d1,
- 0x01d3, 0x01d3,
- 0x01d5, 0x01d5,
- 0x01d7, 0x01d7,
- 0x01d9, 0x01d9,
- 0x01db, 0x01db,
- 0x01de, 0x01de,
- 0x01e0, 0x01e0,
- 0x01e2, 0x01e2,
- 0x01e4, 0x01e4,
- 0x01e6, 0x01e6,
- 0x01e8, 0x01e8,
- 0x01ea, 0x01ea,
- 0x01ec, 0x01ec,
- 0x01ee, 0x01ee,
- 0x01f1, 0x01f1,
- 0x01f4, 0x01f4,
- 0x01f6, 0x01f8,
- 0x01fa, 0x01fa,
- 0x01fc, 0x01fc,
- 0x01fe, 0x01fe,
- 0x0200, 0x0200,
- 0x0202, 0x0202,
- 0x0204, 0x0204,
- 0x0206, 0x0206,
- 0x0208, 0x0208,
- 0x020a, 0x020a,
- 0x020c, 0x020c,
- 0x020e, 0x020e,
- 0x0210, 0x0210,
- 0x0212, 0x0212,
- 0x0214, 0x0214,
- 0x0216, 0x0216,
- 0x0218, 0x0218,
- 0x021a, 0x021a,
- 0x021c, 0x021c,
- 0x021e, 0x021e,
- 0x0220, 0x0220,
- 0x0222, 0x0222,
- 0x0224, 0x0224,
- 0x0226, 0x0226,
- 0x0228, 0x0228,
- 0x022a, 0x022a,
- 0x022c, 0x022c,
- 0x022e, 0x022e,
- 0x0230, 0x0230,
- 0x0232, 0x0232,
- 0x023a, 0x023b,
- 0x023d, 0x023e,
- 0x0241, 0x0241,
- 0x0243, 0x0246,
- 0x0248, 0x0248,
- 0x024a, 0x024a,
- 0x024c, 0x024c,
- 0x024e, 0x024e,
- 0x0370, 0x0370,
- 0x0372, 0x0372,
- 0x0376, 0x0376,
- 0x0386, 0x0386,
- 0x0388, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x038f,
- 0x0391, 0x03a1,
- 0x03a3, 0x03ab,
- 0x03cf, 0x03cf,
- 0x03d2, 0x03d4,
- 0x03d8, 0x03d8,
- 0x03da, 0x03da,
- 0x03dc, 0x03dc,
- 0x03de, 0x03de,
- 0x03e0, 0x03e0,
- 0x03e2, 0x03e2,
- 0x03e4, 0x03e4,
- 0x03e6, 0x03e6,
- 0x03e8, 0x03e8,
- 0x03ea, 0x03ea,
- 0x03ec, 0x03ec,
- 0x03ee, 0x03ee,
- 0x03f4, 0x03f4,
- 0x03f7, 0x03f7,
- 0x03f9, 0x03fa,
- 0x03fd, 0x042f,
- 0x0460, 0x0460,
- 0x0462, 0x0462,
- 0x0464, 0x0464,
- 0x0466, 0x0466,
- 0x0468, 0x0468,
- 0x046a, 0x046a,
- 0x046c, 0x046c,
- 0x046e, 0x046e,
- 0x0470, 0x0470,
- 0x0472, 0x0472,
- 0x0474, 0x0474,
- 0x0476, 0x0476,
- 0x0478, 0x0478,
- 0x047a, 0x047a,
- 0x047c, 0x047c,
- 0x047e, 0x047e,
- 0x0480, 0x0480,
- 0x048a, 0x048a,
- 0x048c, 0x048c,
- 0x048e, 0x048e,
- 0x0490, 0x0490,
- 0x0492, 0x0492,
- 0x0494, 0x0494,
- 0x0496, 0x0496,
- 0x0498, 0x0498,
- 0x049a, 0x049a,
- 0x049c, 0x049c,
- 0x049e, 0x049e,
- 0x04a0, 0x04a0,
- 0x04a2, 0x04a2,
- 0x04a4, 0x04a4,
- 0x04a6, 0x04a6,
- 0x04a8, 0x04a8,
- 0x04aa, 0x04aa,
- 0x04ac, 0x04ac,
- 0x04ae, 0x04ae,
- 0x04b0, 0x04b0,
- 0x04b2, 0x04b2,
- 0x04b4, 0x04b4,
- 0x04b6, 0x04b6,
- 0x04b8, 0x04b8,
- 0x04ba, 0x04ba,
- 0x04bc, 0x04bc,
- 0x04be, 0x04be,
- 0x04c0, 0x04c1,
- 0x04c3, 0x04c3,
- 0x04c5, 0x04c5,
- 0x04c7, 0x04c7,
- 0x04c9, 0x04c9,
- 0x04cb, 0x04cb,
- 0x04cd, 0x04cd,
- 0x04d0, 0x04d0,
- 0x04d2, 0x04d2,
- 0x04d4, 0x04d4,
- 0x04d6, 0x04d6,
- 0x04d8, 0x04d8,
- 0x04da, 0x04da,
- 0x04dc, 0x04dc,
- 0x04de, 0x04de,
- 0x04e0, 0x04e0,
- 0x04e2, 0x04e2,
- 0x04e4, 0x04e4,
- 0x04e6, 0x04e6,
- 0x04e8, 0x04e8,
- 0x04ea, 0x04ea,
- 0x04ec, 0x04ec,
- 0x04ee, 0x04ee,
- 0x04f0, 0x04f0,
- 0x04f2, 0x04f2,
- 0x04f4, 0x04f4,
- 0x04f6, 0x04f6,
- 0x04f8, 0x04f8,
- 0x04fa, 0x04fa,
- 0x04fc, 0x04fc,
- 0x04fe, 0x04fe,
- 0x0500, 0x0500,
- 0x0502, 0x0502,
- 0x0504, 0x0504,
- 0x0506, 0x0506,
- 0x0508, 0x0508,
- 0x050a, 0x050a,
- 0x050c, 0x050c,
- 0x050e, 0x050e,
- 0x0510, 0x0510,
- 0x0512, 0x0512,
- 0x0514, 0x0514,
- 0x0516, 0x0516,
- 0x0518, 0x0518,
- 0x051a, 0x051a,
- 0x051c, 0x051c,
- 0x051e, 0x051e,
- 0x0520, 0x0520,
- 0x0522, 0x0522,
- 0x0531, 0x0556,
- 0x10a0, 0x10c5,
- 0x1e00, 0x1e00,
- 0x1e02, 0x1e02,
- 0x1e04, 0x1e04,
- 0x1e06, 0x1e06,
- 0x1e08, 0x1e08,
- 0x1e0a, 0x1e0a,
- 0x1e0c, 0x1e0c,
- 0x1e0e, 0x1e0e,
- 0x1e10, 0x1e10,
- 0x1e12, 0x1e12,
- 0x1e14, 0x1e14,
- 0x1e16, 0x1e16,
- 0x1e18, 0x1e18,
- 0x1e1a, 0x1e1a,
- 0x1e1c, 0x1e1c,
- 0x1e1e, 0x1e1e,
- 0x1e20, 0x1e20,
- 0x1e22, 0x1e22,
- 0x1e24, 0x1e24,
- 0x1e26, 0x1e26,
- 0x1e28, 0x1e28,
- 0x1e2a, 0x1e2a,
- 0x1e2c, 0x1e2c,
- 0x1e2e, 0x1e2e,
- 0x1e30, 0x1e30,
- 0x1e32, 0x1e32,
- 0x1e34, 0x1e34,
- 0x1e36, 0x1e36,
- 0x1e38, 0x1e38,
- 0x1e3a, 0x1e3a,
- 0x1e3c, 0x1e3c,
- 0x1e3e, 0x1e3e,
- 0x1e40, 0x1e40,
- 0x1e42, 0x1e42,
- 0x1e44, 0x1e44,
- 0x1e46, 0x1e46,
- 0x1e48, 0x1e48,
- 0x1e4a, 0x1e4a,
- 0x1e4c, 0x1e4c,
- 0x1e4e, 0x1e4e,
- 0x1e50, 0x1e50,
- 0x1e52, 0x1e52,
- 0x1e54, 0x1e54,
- 0x1e56, 0x1e56,
- 0x1e58, 0x1e58,
- 0x1e5a, 0x1e5a,
- 0x1e5c, 0x1e5c,
- 0x1e5e, 0x1e5e,
- 0x1e60, 0x1e60,
- 0x1e62, 0x1e62,
- 0x1e64, 0x1e64,
- 0x1e66, 0x1e66,
- 0x1e68, 0x1e68,
- 0x1e6a, 0x1e6a,
- 0x1e6c, 0x1e6c,
- 0x1e6e, 0x1e6e,
- 0x1e70, 0x1e70,
- 0x1e72, 0x1e72,
- 0x1e74, 0x1e74,
- 0x1e76, 0x1e76,
- 0x1e78, 0x1e78,
- 0x1e7a, 0x1e7a,
- 0x1e7c, 0x1e7c,
- 0x1e7e, 0x1e7e,
- 0x1e80, 0x1e80,
- 0x1e82, 0x1e82,
- 0x1e84, 0x1e84,
- 0x1e86, 0x1e86,
- 0x1e88, 0x1e88,
- 0x1e8a, 0x1e8a,
- 0x1e8c, 0x1e8c,
- 0x1e8e, 0x1e8e,
- 0x1e90, 0x1e90,
- 0x1e92, 0x1e92,
- 0x1e94, 0x1e94,
- 0x1e9e, 0x1e9e,
- 0x1ea0, 0x1ea0,
- 0x1ea2, 0x1ea2,
- 0x1ea4, 0x1ea4,
- 0x1ea6, 0x1ea6,
- 0x1ea8, 0x1ea8,
- 0x1eaa, 0x1eaa,
- 0x1eac, 0x1eac,
- 0x1eae, 0x1eae,
- 0x1eb0, 0x1eb0,
- 0x1eb2, 0x1eb2,
- 0x1eb4, 0x1eb4,
- 0x1eb6, 0x1eb6,
- 0x1eb8, 0x1eb8,
- 0x1eba, 0x1eba,
- 0x1ebc, 0x1ebc,
- 0x1ebe, 0x1ebe,
- 0x1ec0, 0x1ec0,
- 0x1ec2, 0x1ec2,
- 0x1ec4, 0x1ec4,
- 0x1ec6, 0x1ec6,
- 0x1ec8, 0x1ec8,
- 0x1eca, 0x1eca,
- 0x1ecc, 0x1ecc,
- 0x1ece, 0x1ece,
- 0x1ed0, 0x1ed0,
- 0x1ed2, 0x1ed2,
- 0x1ed4, 0x1ed4,
- 0x1ed6, 0x1ed6,
- 0x1ed8, 0x1ed8,
- 0x1eda, 0x1eda,
- 0x1edc, 0x1edc,
- 0x1ede, 0x1ede,
- 0x1ee0, 0x1ee0,
- 0x1ee2, 0x1ee2,
- 0x1ee4, 0x1ee4,
- 0x1ee6, 0x1ee6,
- 0x1ee8, 0x1ee8,
- 0x1eea, 0x1eea,
- 0x1eec, 0x1eec,
- 0x1eee, 0x1eee,
- 0x1ef0, 0x1ef0,
- 0x1ef2, 0x1ef2,
- 0x1ef4, 0x1ef4,
- 0x1ef6, 0x1ef6,
- 0x1ef8, 0x1ef8,
- 0x1efa, 0x1efa,
- 0x1efc, 0x1efc,
- 0x1efe, 0x1efe,
- 0x1f08, 0x1f0f,
- 0x1f18, 0x1f1d,
- 0x1f28, 0x1f2f,
- 0x1f38, 0x1f3f,
- 0x1f48, 0x1f4d,
- 0x1f59, 0x1f59,
- 0x1f5b, 0x1f5b,
- 0x1f5d, 0x1f5d,
- 0x1f5f, 0x1f5f,
- 0x1f68, 0x1f6f,
- 0x1fb8, 0x1fbb,
- 0x1fc8, 0x1fcb,
- 0x1fd8, 0x1fdb,
- 0x1fe8, 0x1fec,
- 0x1ff8, 0x1ffb,
- 0x2102, 0x2102,
- 0x2107, 0x2107,
- 0x210b, 0x210d,
- 0x2110, 0x2112,
- 0x2115, 0x2115,
- 0x2119, 0x211d,
- 0x2124, 0x2124,
- 0x2126, 0x2126,
- 0x2128, 0x2128,
- 0x212a, 0x212d,
- 0x2130, 0x2133,
- 0x213e, 0x213f,
- 0x2145, 0x2145,
- 0x2183, 0x2183,
- 0x2c00, 0x2c2e,
- 0x2c60, 0x2c60,
- 0x2c62, 0x2c64,
- 0x2c67, 0x2c67,
- 0x2c69, 0x2c69,
- 0x2c6b, 0x2c6b,
- 0x2c6d, 0x2c6f,
- 0x2c72, 0x2c72,
- 0x2c75, 0x2c75,
- 0x2c80, 0x2c80,
- 0x2c82, 0x2c82,
- 0x2c84, 0x2c84,
- 0x2c86, 0x2c86,
- 0x2c88, 0x2c88,
- 0x2c8a, 0x2c8a,
- 0x2c8c, 0x2c8c,
- 0x2c8e, 0x2c8e,
- 0x2c90, 0x2c90,
- 0x2c92, 0x2c92,
- 0x2c94, 0x2c94,
- 0x2c96, 0x2c96,
- 0x2c98, 0x2c98,
- 0x2c9a, 0x2c9a,
- 0x2c9c, 0x2c9c,
- 0x2c9e, 0x2c9e,
- 0x2ca0, 0x2ca0,
- 0x2ca2, 0x2ca2,
- 0x2ca4, 0x2ca4,
- 0x2ca6, 0x2ca6,
- 0x2ca8, 0x2ca8,
- 0x2caa, 0x2caa,
- 0x2cac, 0x2cac,
- 0x2cae, 0x2cae,
- 0x2cb0, 0x2cb0,
- 0x2cb2, 0x2cb2,
- 0x2cb4, 0x2cb4,
- 0x2cb6, 0x2cb6,
- 0x2cb8, 0x2cb8,
- 0x2cba, 0x2cba,
- 0x2cbc, 0x2cbc,
- 0x2cbe, 0x2cbe,
- 0x2cc0, 0x2cc0,
- 0x2cc2, 0x2cc2,
- 0x2cc4, 0x2cc4,
- 0x2cc6, 0x2cc6,
- 0x2cc8, 0x2cc8,
- 0x2cca, 0x2cca,
- 0x2ccc, 0x2ccc,
- 0x2cce, 0x2cce,
- 0x2cd0, 0x2cd0,
- 0x2cd2, 0x2cd2,
- 0x2cd4, 0x2cd4,
- 0x2cd6, 0x2cd6,
- 0x2cd8, 0x2cd8,
- 0x2cda, 0x2cda,
- 0x2cdc, 0x2cdc,
- 0x2cde, 0x2cde,
- 0x2ce0, 0x2ce0,
- 0x2ce2, 0x2ce2,
- 0xa640, 0xa640,
- 0xa642, 0xa642,
- 0xa644, 0xa644,
- 0xa646, 0xa646,
- 0xa648, 0xa648,
- 0xa64a, 0xa64a,
- 0xa64c, 0xa64c,
- 0xa64e, 0xa64e,
- 0xa650, 0xa650,
- 0xa652, 0xa652,
- 0xa654, 0xa654,
- 0xa656, 0xa656,
- 0xa658, 0xa658,
- 0xa65a, 0xa65a,
- 0xa65c, 0xa65c,
- 0xa65e, 0xa65e,
- 0xa662, 0xa662,
- 0xa664, 0xa664,
- 0xa666, 0xa666,
- 0xa668, 0xa668,
- 0xa66a, 0xa66a,
- 0xa66c, 0xa66c,
- 0xa680, 0xa680,
- 0xa682, 0xa682,
- 0xa684, 0xa684,
- 0xa686, 0xa686,
- 0xa688, 0xa688,
- 0xa68a, 0xa68a,
- 0xa68c, 0xa68c,
- 0xa68e, 0xa68e,
- 0xa690, 0xa690,
- 0xa692, 0xa692,
- 0xa694, 0xa694,
- 0xa696, 0xa696,
- 0xa722, 0xa722,
- 0xa724, 0xa724,
- 0xa726, 0xa726,
- 0xa728, 0xa728,
- 0xa72a, 0xa72a,
- 0xa72c, 0xa72c,
- 0xa72e, 0xa72e,
- 0xa732, 0xa732,
- 0xa734, 0xa734,
- 0xa736, 0xa736,
- 0xa738, 0xa738,
- 0xa73a, 0xa73a,
- 0xa73c, 0xa73c,
- 0xa73e, 0xa73e,
- 0xa740, 0xa740,
- 0xa742, 0xa742,
- 0xa744, 0xa744,
- 0xa746, 0xa746,
- 0xa748, 0xa748,
- 0xa74a, 0xa74a,
- 0xa74c, 0xa74c,
- 0xa74e, 0xa74e,
- 0xa750, 0xa750,
- 0xa752, 0xa752,
- 0xa754, 0xa754,
- 0xa756, 0xa756,
- 0xa758, 0xa758,
- 0xa75a, 0xa75a,
- 0xa75c, 0xa75c,
- 0xa75e, 0xa75e,
- 0xa760, 0xa760,
- 0xa762, 0xa762,
- 0xa764, 0xa764,
- 0xa766, 0xa766,
- 0xa768, 0xa768,
- 0xa76a, 0xa76a,
- 0xa76c, 0xa76c,
- 0xa76e, 0xa76e,
- 0xa779, 0xa779,
- 0xa77b, 0xa77b,
- 0xa77d, 0xa77e,
- 0xa780, 0xa780,
- 0xa782, 0xa782,
- 0xa784, 0xa784,
- 0xa786, 0xa786,
- 0xa78b, 0xa78b,
- 0xff21, 0xff3a,
- 0x10400, 0x10427,
- 0x1d400, 0x1d419,
- 0x1d434, 0x1d44d,
- 0x1d468, 0x1d481,
- 0x1d49c, 0x1d49c,
- 0x1d49e, 0x1d49f,
- 0x1d4a2, 0x1d4a2,
- 0x1d4a5, 0x1d4a6,
- 0x1d4a9, 0x1d4ac,
- 0x1d4ae, 0x1d4b5,
- 0x1d4d0, 0x1d4e9,
- 0x1d504, 0x1d505,
- 0x1d507, 0x1d50a,
- 0x1d50d, 0x1d514,
- 0x1d516, 0x1d51c,
- 0x1d538, 0x1d539,
- 0x1d53b, 0x1d53e,
- 0x1d540, 0x1d544,
- 0x1d546, 0x1d546,
- 0x1d54a, 0x1d550,
- 0x1d56c, 0x1d585,
- 0x1d5a0, 0x1d5b9,
- 0x1d5d4, 0x1d5ed,
- 0x1d608, 0x1d621,
- 0x1d63c, 0x1d655,
- 0x1d670, 0x1d689,
- 0x1d6a8, 0x1d6c0,
- 0x1d6e2, 0x1d6fa,
- 0x1d71c, 0x1d734,
- 0x1d756, 0x1d76e,
- 0x1d790, 0x1d7a8,
- 0x1d7ca, 0x1d7ca,
-}; /* CR_Upper */
-
-/* 'XDigit': [[:XDigit:]] */
-static const OnigCodePoint CR_XDigit[] = {
- 3,
- 0x0030, 0x0039,
- 0x0041, 0x0046,
- 0x0061, 0x0066,
-}; /* CR_XDigit */
-
-/* 'Word': [[:Word:]] */
-static const OnigCodePoint CR_Word[] = {
- 477,
- 0x0030, 0x0039,
- 0x0041, 0x005a,
- 0x005f, 0x005f,
- 0x0061, 0x007a,
- 0x00aa, 0x00aa,
- 0x00b5, 0x00b5,
- 0x00ba, 0x00ba,
- 0x00c0, 0x00d6,
- 0x00d8, 0x00f6,
- 0x00f8, 0x02c1,
- 0x02c6, 0x02d1,
- 0x02e0, 0x02e4,
- 0x02ec, 0x02ec,
- 0x02ee, 0x02ee,
- 0x0300, 0x0374,
- 0x0376, 0x0377,
- 0x037a, 0x037d,
- 0x0386, 0x0386,
- 0x0388, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03f5,
- 0x03f7, 0x0481,
- 0x0483, 0x0523,
- 0x0531, 0x0556,
- 0x0559, 0x0559,
- 0x0561, 0x0587,
- 0x0591, 0x05bd,
- 0x05bf, 0x05bf,
- 0x05c1, 0x05c2,
- 0x05c4, 0x05c5,
- 0x05c7, 0x05c7,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f2,
- 0x0610, 0x061a,
- 0x0621, 0x065e,
- 0x0660, 0x0669,
- 0x066e, 0x06d3,
- 0x06d5, 0x06dc,
- 0x06de, 0x06e8,
- 0x06ea, 0x06fc,
- 0x06ff, 0x06ff,
- 0x0710, 0x074a,
- 0x074d, 0x07b1,
- 0x07c0, 0x07f5,
- 0x07fa, 0x07fa,
- 0x0901, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0954,
- 0x0958, 0x0963,
- 0x0966, 0x096f,
- 0x0971, 0x0972,
- 0x097b, 0x097f,
- 0x0981, 0x0983,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bc, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09ce,
- 0x09d7, 0x09d7,
- 0x09dc, 0x09dd,
- 0x09df, 0x09e3,
- 0x09e6, 0x09f1,
- 0x0a01, 0x0a03,
- 0x0a05, 0x0a0a,
- 0x0a0f, 0x0a10,
- 0x0a13, 0x0a28,
- 0x0a2a, 0x0a30,
- 0x0a32, 0x0a33,
- 0x0a35, 0x0a36,
- 0x0a38, 0x0a39,
- 0x0a3c, 0x0a3c,
- 0x0a3e, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4d,
- 0x0a51, 0x0a51,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a66, 0x0a75,
- 0x0a81, 0x0a83,
- 0x0a85, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abc, 0x0ac5,
- 0x0ac7, 0x0ac9,
- 0x0acb, 0x0acd,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae3,
- 0x0ae6, 0x0aef,
- 0x0b01, 0x0b03,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b35, 0x0b39,
- 0x0b3c, 0x0b44,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b63,
- 0x0b66, 0x0b6f,
- 0x0b71, 0x0b71,
- 0x0b82, 0x0b83,
- 0x0b85, 0x0b8a,
- 0x0b8e, 0x0b90,
- 0x0b92, 0x0b95,
- 0x0b99, 0x0b9a,
- 0x0b9c, 0x0b9c,
- 0x0b9e, 0x0b9f,
- 0x0ba3, 0x0ba4,
- 0x0ba8, 0x0baa,
- 0x0bae, 0x0bb9,
- 0x0bbe, 0x0bc2,
- 0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcd,
- 0x0bd0, 0x0bd0,
- 0x0bd7, 0x0bd7,
- 0x0be6, 0x0bef,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3d, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c58, 0x0c59,
- 0x0c60, 0x0c63,
- 0x0c66, 0x0c6f,
- 0x0c82, 0x0c83,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbc, 0x0cc4,
- 0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccd,
- 0x0cd5, 0x0cd6,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce3,
- 0x0ce6, 0x0cef,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3d, 0x0d44,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d63,
- 0x0d66, 0x0d6f,
- 0x0d7a, 0x0d7f,
- 0x0d82, 0x0d83,
- 0x0d85, 0x0d96,
- 0x0d9a, 0x0db1,
- 0x0db3, 0x0dbb,
- 0x0dbd, 0x0dbd,
- 0x0dc0, 0x0dc6,
- 0x0dca, 0x0dca,
- 0x0dcf, 0x0dd4,
- 0x0dd6, 0x0dd6,
- 0x0dd8, 0x0ddf,
- 0x0df2, 0x0df3,
- 0x0e01, 0x0e3a,
- 0x0e40, 0x0e4e,
- 0x0e50, 0x0e59,
- 0x0e81, 0x0e82,
- 0x0e84, 0x0e84,
- 0x0e87, 0x0e88,
- 0x0e8a, 0x0e8a,
- 0x0e8d, 0x0e8d,
- 0x0e94, 0x0e97,
- 0x0e99, 0x0e9f,
- 0x0ea1, 0x0ea3,
- 0x0ea5, 0x0ea5,
- 0x0ea7, 0x0ea7,
- 0x0eaa, 0x0eab,
- 0x0ead, 0x0eb9,
- 0x0ebb, 0x0ebd,
- 0x0ec0, 0x0ec4,
- 0x0ec6, 0x0ec6,
- 0x0ec8, 0x0ecd,
- 0x0ed0, 0x0ed9,
- 0x0edc, 0x0edd,
- 0x0f00, 0x0f00,
- 0x0f18, 0x0f19,
- 0x0f20, 0x0f29,
- 0x0f35, 0x0f35,
- 0x0f37, 0x0f37,
- 0x0f39, 0x0f39,
- 0x0f3e, 0x0f47,
- 0x0f49, 0x0f6c,
- 0x0f71, 0x0f84,
- 0x0f86, 0x0f8b,
- 0x0f90, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fc6, 0x0fc6,
- 0x1000, 0x1049,
- 0x1050, 0x1099,
- 0x10a0, 0x10c5,
- 0x10d0, 0x10fa,
- 0x10fc, 0x10fc,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x1200, 0x1248,
- 0x124a, 0x124d,
- 0x1250, 0x1256,
- 0x1258, 0x1258,
- 0x125a, 0x125d,
- 0x1260, 0x1288,
- 0x128a, 0x128d,
- 0x1290, 0x12b0,
- 0x12b2, 0x12b5,
- 0x12b8, 0x12be,
- 0x12c0, 0x12c0,
- 0x12c2, 0x12c5,
- 0x12c8, 0x12d6,
- 0x12d8, 0x1310,
- 0x1312, 0x1315,
- 0x1318, 0x135a,
- 0x135f, 0x135f,
- 0x1380, 0x138f,
- 0x13a0, 0x13f4,
- 0x1401, 0x166c,
- 0x166f, 0x1676,
- 0x1681, 0x169a,
- 0x16a0, 0x16ea,
- 0x1700, 0x170c,
- 0x170e, 0x1714,
- 0x1720, 0x1734,
- 0x1740, 0x1753,
- 0x1760, 0x176c,
- 0x176e, 0x1770,
- 0x1772, 0x1773,
- 0x1780, 0x17b3,
- 0x17b6, 0x17d3,
- 0x17d7, 0x17d7,
- 0x17dc, 0x17dd,
- 0x17e0, 0x17e9,
- 0x180b, 0x180d,
- 0x1810, 0x1819,
- 0x1820, 0x1877,
- 0x1880, 0x18aa,
- 0x1900, 0x191c,
- 0x1920, 0x192b,
- 0x1930, 0x193b,
- 0x1946, 0x196d,
- 0x1970, 0x1974,
- 0x1980, 0x19a9,
- 0x19b0, 0x19c9,
- 0x19d0, 0x19d9,
- 0x1a00, 0x1a1b,
- 0x1b00, 0x1b4b,
- 0x1b50, 0x1b59,
- 0x1b6b, 0x1b73,
- 0x1b80, 0x1baa,
- 0x1bae, 0x1bb9,
- 0x1c00, 0x1c37,
- 0x1c40, 0x1c49,
- 0x1c4d, 0x1c7d,
- 0x1d00, 0x1de6,
- 0x1dfe, 0x1f15,
- 0x1f18, 0x1f1d,
- 0x1f20, 0x1f45,
- 0x1f48, 0x1f4d,
- 0x1f50, 0x1f57,
- 0x1f59, 0x1f59,
- 0x1f5b, 0x1f5b,
- 0x1f5d, 0x1f5d,
- 0x1f5f, 0x1f7d,
- 0x1f80, 0x1fb4,
- 0x1fb6, 0x1fbc,
- 0x1fbe, 0x1fbe,
- 0x1fc2, 0x1fc4,
- 0x1fc6, 0x1fcc,
- 0x1fd0, 0x1fd3,
- 0x1fd6, 0x1fdb,
- 0x1fe0, 0x1fec,
- 0x1ff2, 0x1ff4,
- 0x1ff6, 0x1ffc,
- 0x203f, 0x2040,
- 0x2054, 0x2054,
- 0x2071, 0x2071,
- 0x207f, 0x207f,
- 0x2090, 0x2094,
- 0x20d0, 0x20f0,
- 0x2102, 0x2102,
- 0x2107, 0x2107,
- 0x210a, 0x2113,
- 0x2115, 0x2115,
- 0x2119, 0x211d,
- 0x2124, 0x2124,
- 0x2126, 0x2126,
- 0x2128, 0x2128,
- 0x212a, 0x212d,
- 0x212f, 0x2139,
- 0x213c, 0x213f,
- 0x2145, 0x2149,
- 0x214e, 0x214e,
- 0x2183, 0x2184,
- 0x2c00, 0x2c2e,
- 0x2c30, 0x2c5e,
- 0x2c60, 0x2c6f,
- 0x2c71, 0x2c7d,
- 0x2c80, 0x2ce4,
- 0x2d00, 0x2d25,
- 0x2d30, 0x2d65,
- 0x2d6f, 0x2d6f,
- 0x2d80, 0x2d96,
- 0x2da0, 0x2da6,
- 0x2da8, 0x2dae,
- 0x2db0, 0x2db6,
- 0x2db8, 0x2dbe,
- 0x2dc0, 0x2dc6,
- 0x2dc8, 0x2dce,
- 0x2dd0, 0x2dd6,
- 0x2dd8, 0x2dde,
- 0x2de0, 0x2dff,
- 0x2e2f, 0x2e2f,
- 0x3005, 0x3006,
- 0x302a, 0x302f,
- 0x3031, 0x3035,
- 0x303b, 0x303c,
- 0x3041, 0x3096,
- 0x3099, 0x309a,
- 0x309d, 0x309f,
- 0x30a1, 0x30fa,
- 0x30fc, 0x30ff,
- 0x3105, 0x312d,
- 0x3131, 0x318e,
- 0x31a0, 0x31b7,
- 0x31f0, 0x31ff,
- 0x3400, 0x3400,
- 0x4db5, 0x4db5,
- 0x4e00, 0x4e00,
- 0x9fc3, 0x9fc3,
- 0xa000, 0xa48c,
- 0xa500, 0xa60c,
- 0xa610, 0xa62b,
- 0xa640, 0xa65f,
- 0xa662, 0xa672,
- 0xa67c, 0xa67d,
- 0xa67f, 0xa697,
- 0xa717, 0xa71f,
- 0xa722, 0xa788,
- 0xa78b, 0xa78c,
- 0xa7fb, 0xa827,
- 0xa840, 0xa873,
- 0xa880, 0xa8c4,
- 0xa8d0, 0xa8d9,
- 0xa900, 0xa92d,
- 0xa930, 0xa953,
- 0xaa00, 0xaa36,
- 0xaa40, 0xaa4d,
- 0xaa50, 0xaa59,
- 0xac00, 0xac00,
- 0xd7a3, 0xd7a3,
- 0xf900, 0xfa2d,
- 0xfa30, 0xfa6a,
- 0xfa70, 0xfad9,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xfb1d, 0xfb28,
- 0xfb2a, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbb1,
- 0xfbd3, 0xfd3d,
- 0xfd50, 0xfd8f,
- 0xfd92, 0xfdc7,
- 0xfdf0, 0xfdfb,
- 0xfe00, 0xfe0f,
- 0xfe20, 0xfe26,
- 0xfe33, 0xfe34,
- 0xfe4d, 0xfe4f,
- 0xfe70, 0xfe74,
- 0xfe76, 0xfefc,
- 0xff10, 0xff19,
- 0xff21, 0xff3a,
- 0xff3f, 0xff3f,
- 0xff41, 0xff5a,
- 0xff66, 0xffbe,
- 0xffc2, 0xffc7,
- 0xffca, 0xffcf,
- 0xffd2, 0xffd7,
- 0xffda, 0xffdc,
- 0x10000, 0x1000b,
- 0x1000d, 0x10026,
- 0x10028, 0x1003a,
- 0x1003c, 0x1003d,
- 0x1003f, 0x1004d,
- 0x10050, 0x1005d,
- 0x10080, 0x100fa,
- 0x101fd, 0x101fd,
- 0x10280, 0x1029c,
- 0x102a0, 0x102d0,
- 0x10300, 0x1031e,
- 0x10330, 0x10340,
- 0x10342, 0x10349,
- 0x10380, 0x1039d,
- 0x103a0, 0x103c3,
- 0x103c8, 0x103cf,
- 0x10400, 0x1049d,
- 0x104a0, 0x104a9,
- 0x10800, 0x10805,
- 0x10808, 0x10808,
- 0x1080a, 0x10835,
- 0x10837, 0x10838,
- 0x1083c, 0x1083c,
- 0x1083f, 0x1083f,
- 0x10900, 0x10915,
- 0x10920, 0x10939,
- 0x10a00, 0x10a03,
- 0x10a05, 0x10a06,
- 0x10a0c, 0x10a13,
- 0x10a15, 0x10a17,
- 0x10a19, 0x10a33,
- 0x10a38, 0x10a3a,
- 0x10a3f, 0x10a3f,
- 0x12000, 0x1236e,
- 0x1d165, 0x1d169,
- 0x1d16d, 0x1d172,
- 0x1d17b, 0x1d182,
- 0x1d185, 0x1d18b,
- 0x1d1aa, 0x1d1ad,
- 0x1d242, 0x1d244,
- 0x1d400, 0x1d454,
- 0x1d456, 0x1d49c,
- 0x1d49e, 0x1d49f,
- 0x1d4a2, 0x1d4a2,
- 0x1d4a5, 0x1d4a6,
- 0x1d4a9, 0x1d4ac,
- 0x1d4ae, 0x1d4b9,
- 0x1d4bb, 0x1d4bb,
- 0x1d4bd, 0x1d4c3,
- 0x1d4c5, 0x1d505,
- 0x1d507, 0x1d50a,
- 0x1d50d, 0x1d514,
- 0x1d516, 0x1d51c,
- 0x1d51e, 0x1d539,
- 0x1d53b, 0x1d53e,
- 0x1d540, 0x1d544,
- 0x1d546, 0x1d546,
- 0x1d54a, 0x1d550,
- 0x1d552, 0x1d6a5,
- 0x1d6a8, 0x1d6c0,
- 0x1d6c2, 0x1d6da,
- 0x1d6dc, 0x1d6fa,
- 0x1d6fc, 0x1d714,
- 0x1d716, 0x1d734,
- 0x1d736, 0x1d74e,
- 0x1d750, 0x1d76e,
- 0x1d770, 0x1d788,
- 0x1d78a, 0x1d7a8,
- 0x1d7aa, 0x1d7c2,
- 0x1d7c4, 0x1d7cb,
- 0x1d7ce, 0x1d7ff,
- 0x20000, 0x20000,
- 0x2a6d6, 0x2a6d6,
- 0x2f800, 0x2fa1d,
- 0xe0100, 0xe01ef,
-}; /* CR_Word */
-
-/* 'Alnum': [[:Alnum:]] */
-static const OnigCodePoint CR_Alnum[] = {
- 471,
- 0x0030, 0x0039,
- 0x0041, 0x005a,
- 0x0061, 0x007a,
- 0x00aa, 0x00aa,
- 0x00b5, 0x00b5,
- 0x00ba, 0x00ba,
- 0x00c0, 0x00d6,
- 0x00d8, 0x00f6,
- 0x00f8, 0x02c1,
- 0x02c6, 0x02d1,
- 0x02e0, 0x02e4,
- 0x02ec, 0x02ec,
- 0x02ee, 0x02ee,
- 0x0300, 0x0374,
- 0x0376, 0x0377,
- 0x037a, 0x037d,
- 0x0386, 0x0386,
- 0x0388, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03f5,
- 0x03f7, 0x0481,
- 0x0483, 0x0523,
- 0x0531, 0x0556,
- 0x0559, 0x0559,
- 0x0561, 0x0587,
- 0x0591, 0x05bd,
- 0x05bf, 0x05bf,
- 0x05c1, 0x05c2,
- 0x05c4, 0x05c5,
- 0x05c7, 0x05c7,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f2,
- 0x0610, 0x061a,
- 0x0621, 0x065e,
- 0x0660, 0x0669,
- 0x066e, 0x06d3,
- 0x06d5, 0x06dc,
- 0x06de, 0x06e8,
- 0x06ea, 0x06fc,
- 0x06ff, 0x06ff,
- 0x0710, 0x074a,
- 0x074d, 0x07b1,
- 0x07c0, 0x07f5,
- 0x07fa, 0x07fa,
- 0x0901, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0954,
- 0x0958, 0x0963,
- 0x0966, 0x096f,
- 0x0971, 0x0972,
- 0x097b, 0x097f,
- 0x0981, 0x0983,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bc, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09ce,
- 0x09d7, 0x09d7,
- 0x09dc, 0x09dd,
- 0x09df, 0x09e3,
- 0x09e6, 0x09f1,
- 0x0a01, 0x0a03,
- 0x0a05, 0x0a0a,
- 0x0a0f, 0x0a10,
- 0x0a13, 0x0a28,
- 0x0a2a, 0x0a30,
- 0x0a32, 0x0a33,
- 0x0a35, 0x0a36,
- 0x0a38, 0x0a39,
- 0x0a3c, 0x0a3c,
- 0x0a3e, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4d,
- 0x0a51, 0x0a51,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a66, 0x0a75,
- 0x0a81, 0x0a83,
- 0x0a85, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abc, 0x0ac5,
- 0x0ac7, 0x0ac9,
- 0x0acb, 0x0acd,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae3,
- 0x0ae6, 0x0aef,
- 0x0b01, 0x0b03,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b35, 0x0b39,
- 0x0b3c, 0x0b44,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b63,
- 0x0b66, 0x0b6f,
- 0x0b71, 0x0b71,
- 0x0b82, 0x0b83,
- 0x0b85, 0x0b8a,
- 0x0b8e, 0x0b90,
- 0x0b92, 0x0b95,
- 0x0b99, 0x0b9a,
- 0x0b9c, 0x0b9c,
- 0x0b9e, 0x0b9f,
- 0x0ba3, 0x0ba4,
- 0x0ba8, 0x0baa,
- 0x0bae, 0x0bb9,
- 0x0bbe, 0x0bc2,
- 0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcd,
- 0x0bd0, 0x0bd0,
- 0x0bd7, 0x0bd7,
- 0x0be6, 0x0bef,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3d, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c58, 0x0c59,
- 0x0c60, 0x0c63,
- 0x0c66, 0x0c6f,
- 0x0c82, 0x0c83,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbc, 0x0cc4,
- 0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccd,
- 0x0cd5, 0x0cd6,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce3,
- 0x0ce6, 0x0cef,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3d, 0x0d44,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d63,
- 0x0d66, 0x0d6f,
- 0x0d7a, 0x0d7f,
- 0x0d82, 0x0d83,
- 0x0d85, 0x0d96,
- 0x0d9a, 0x0db1,
- 0x0db3, 0x0dbb,
- 0x0dbd, 0x0dbd,
- 0x0dc0, 0x0dc6,
- 0x0dca, 0x0dca,
- 0x0dcf, 0x0dd4,
- 0x0dd6, 0x0dd6,
- 0x0dd8, 0x0ddf,
- 0x0df2, 0x0df3,
- 0x0e01, 0x0e3a,
- 0x0e40, 0x0e4e,
- 0x0e50, 0x0e59,
- 0x0e81, 0x0e82,
- 0x0e84, 0x0e84,
- 0x0e87, 0x0e88,
- 0x0e8a, 0x0e8a,
- 0x0e8d, 0x0e8d,
- 0x0e94, 0x0e97,
- 0x0e99, 0x0e9f,
- 0x0ea1, 0x0ea3,
- 0x0ea5, 0x0ea5,
- 0x0ea7, 0x0ea7,
- 0x0eaa, 0x0eab,
- 0x0ead, 0x0eb9,
- 0x0ebb, 0x0ebd,
- 0x0ec0, 0x0ec4,
- 0x0ec6, 0x0ec6,
- 0x0ec8, 0x0ecd,
- 0x0ed0, 0x0ed9,
- 0x0edc, 0x0edd,
- 0x0f00, 0x0f00,
- 0x0f18, 0x0f19,
- 0x0f20, 0x0f29,
- 0x0f35, 0x0f35,
- 0x0f37, 0x0f37,
- 0x0f39, 0x0f39,
- 0x0f3e, 0x0f47,
- 0x0f49, 0x0f6c,
- 0x0f71, 0x0f84,
- 0x0f86, 0x0f8b,
- 0x0f90, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fc6, 0x0fc6,
- 0x1000, 0x1049,
- 0x1050, 0x1099,
- 0x10a0, 0x10c5,
- 0x10d0, 0x10fa,
- 0x10fc, 0x10fc,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x1200, 0x1248,
- 0x124a, 0x124d,
- 0x1250, 0x1256,
- 0x1258, 0x1258,
- 0x125a, 0x125d,
- 0x1260, 0x1288,
- 0x128a, 0x128d,
- 0x1290, 0x12b0,
- 0x12b2, 0x12b5,
- 0x12b8, 0x12be,
- 0x12c0, 0x12c0,
- 0x12c2, 0x12c5,
- 0x12c8, 0x12d6,
- 0x12d8, 0x1310,
- 0x1312, 0x1315,
- 0x1318, 0x135a,
- 0x135f, 0x135f,
- 0x1380, 0x138f,
- 0x13a0, 0x13f4,
- 0x1401, 0x166c,
- 0x166f, 0x1676,
- 0x1681, 0x169a,
- 0x16a0, 0x16ea,
- 0x1700, 0x170c,
- 0x170e, 0x1714,
- 0x1720, 0x1734,
- 0x1740, 0x1753,
- 0x1760, 0x176c,
- 0x176e, 0x1770,
- 0x1772, 0x1773,
- 0x1780, 0x17b3,
- 0x17b6, 0x17d3,
- 0x17d7, 0x17d7,
- 0x17dc, 0x17dd,
- 0x17e0, 0x17e9,
- 0x180b, 0x180d,
- 0x1810, 0x1819,
- 0x1820, 0x1877,
- 0x1880, 0x18aa,
- 0x1900, 0x191c,
- 0x1920, 0x192b,
- 0x1930, 0x193b,
- 0x1946, 0x196d,
- 0x1970, 0x1974,
- 0x1980, 0x19a9,
- 0x19b0, 0x19c9,
- 0x19d0, 0x19d9,
- 0x1a00, 0x1a1b,
- 0x1b00, 0x1b4b,
- 0x1b50, 0x1b59,
- 0x1b6b, 0x1b73,
- 0x1b80, 0x1baa,
- 0x1bae, 0x1bb9,
- 0x1c00, 0x1c37,
- 0x1c40, 0x1c49,
- 0x1c4d, 0x1c7d,
- 0x1d00, 0x1de6,
- 0x1dfe, 0x1f15,
- 0x1f18, 0x1f1d,
- 0x1f20, 0x1f45,
- 0x1f48, 0x1f4d,
- 0x1f50, 0x1f57,
- 0x1f59, 0x1f59,
- 0x1f5b, 0x1f5b,
- 0x1f5d, 0x1f5d,
- 0x1f5f, 0x1f7d,
- 0x1f80, 0x1fb4,
- 0x1fb6, 0x1fbc,
- 0x1fbe, 0x1fbe,
- 0x1fc2, 0x1fc4,
- 0x1fc6, 0x1fcc,
- 0x1fd0, 0x1fd3,
- 0x1fd6, 0x1fdb,
- 0x1fe0, 0x1fec,
- 0x1ff2, 0x1ff4,
- 0x1ff6, 0x1ffc,
- 0x2071, 0x2071,
- 0x207f, 0x207f,
- 0x2090, 0x2094,
- 0x20d0, 0x20f0,
- 0x2102, 0x2102,
- 0x2107, 0x2107,
- 0x210a, 0x2113,
- 0x2115, 0x2115,
- 0x2119, 0x211d,
- 0x2124, 0x2124,
- 0x2126, 0x2126,
- 0x2128, 0x2128,
- 0x212a, 0x212d,
- 0x212f, 0x2139,
- 0x213c, 0x213f,
- 0x2145, 0x2149,
- 0x214e, 0x214e,
- 0x2183, 0x2184,
- 0x2c00, 0x2c2e,
- 0x2c30, 0x2c5e,
- 0x2c60, 0x2c6f,
- 0x2c71, 0x2c7d,
- 0x2c80, 0x2ce4,
- 0x2d00, 0x2d25,
- 0x2d30, 0x2d65,
- 0x2d6f, 0x2d6f,
- 0x2d80, 0x2d96,
- 0x2da0, 0x2da6,
- 0x2da8, 0x2dae,
- 0x2db0, 0x2db6,
- 0x2db8, 0x2dbe,
- 0x2dc0, 0x2dc6,
- 0x2dc8, 0x2dce,
- 0x2dd0, 0x2dd6,
- 0x2dd8, 0x2dde,
- 0x2de0, 0x2dff,
- 0x2e2f, 0x2e2f,
- 0x3005, 0x3006,
- 0x302a, 0x302f,
- 0x3031, 0x3035,
- 0x303b, 0x303c,
- 0x3041, 0x3096,
- 0x3099, 0x309a,
- 0x309d, 0x309f,
- 0x30a1, 0x30fa,
- 0x30fc, 0x30ff,
- 0x3105, 0x312d,
- 0x3131, 0x318e,
- 0x31a0, 0x31b7,
- 0x31f0, 0x31ff,
- 0x3400, 0x3400,
- 0x4db5, 0x4db5,
- 0x4e00, 0x4e00,
- 0x9fc3, 0x9fc3,
- 0xa000, 0xa48c,
- 0xa500, 0xa60c,
- 0xa610, 0xa62b,
- 0xa640, 0xa65f,
- 0xa662, 0xa672,
- 0xa67c, 0xa67d,
- 0xa67f, 0xa697,
- 0xa717, 0xa71f,
- 0xa722, 0xa788,
- 0xa78b, 0xa78c,
- 0xa7fb, 0xa827,
- 0xa840, 0xa873,
- 0xa880, 0xa8c4,
- 0xa8d0, 0xa8d9,
- 0xa900, 0xa92d,
- 0xa930, 0xa953,
- 0xaa00, 0xaa36,
- 0xaa40, 0xaa4d,
- 0xaa50, 0xaa59,
- 0xac00, 0xac00,
- 0xd7a3, 0xd7a3,
- 0xf900, 0xfa2d,
- 0xfa30, 0xfa6a,
- 0xfa70, 0xfad9,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xfb1d, 0xfb28,
- 0xfb2a, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbb1,
- 0xfbd3, 0xfd3d,
- 0xfd50, 0xfd8f,
- 0xfd92, 0xfdc7,
- 0xfdf0, 0xfdfb,
- 0xfe00, 0xfe0f,
- 0xfe20, 0xfe26,
- 0xfe70, 0xfe74,
- 0xfe76, 0xfefc,
- 0xff10, 0xff19,
- 0xff21, 0xff3a,
- 0xff41, 0xff5a,
- 0xff66, 0xffbe,
- 0xffc2, 0xffc7,
- 0xffca, 0xffcf,
- 0xffd2, 0xffd7,
- 0xffda, 0xffdc,
- 0x10000, 0x1000b,
- 0x1000d, 0x10026,
- 0x10028, 0x1003a,
- 0x1003c, 0x1003d,
- 0x1003f, 0x1004d,
- 0x10050, 0x1005d,
- 0x10080, 0x100fa,
- 0x101fd, 0x101fd,
- 0x10280, 0x1029c,
- 0x102a0, 0x102d0,
- 0x10300, 0x1031e,
- 0x10330, 0x10340,
- 0x10342, 0x10349,
- 0x10380, 0x1039d,
- 0x103a0, 0x103c3,
- 0x103c8, 0x103cf,
- 0x10400, 0x1049d,
- 0x104a0, 0x104a9,
- 0x10800, 0x10805,
- 0x10808, 0x10808,
- 0x1080a, 0x10835,
- 0x10837, 0x10838,
- 0x1083c, 0x1083c,
- 0x1083f, 0x1083f,
- 0x10900, 0x10915,
- 0x10920, 0x10939,
- 0x10a00, 0x10a03,
- 0x10a05, 0x10a06,
- 0x10a0c, 0x10a13,
- 0x10a15, 0x10a17,
- 0x10a19, 0x10a33,
- 0x10a38, 0x10a3a,
- 0x10a3f, 0x10a3f,
- 0x12000, 0x1236e,
- 0x1d165, 0x1d169,
- 0x1d16d, 0x1d172,
- 0x1d17b, 0x1d182,
- 0x1d185, 0x1d18b,
- 0x1d1aa, 0x1d1ad,
- 0x1d242, 0x1d244,
- 0x1d400, 0x1d454,
- 0x1d456, 0x1d49c,
- 0x1d49e, 0x1d49f,
- 0x1d4a2, 0x1d4a2,
- 0x1d4a5, 0x1d4a6,
- 0x1d4a9, 0x1d4ac,
- 0x1d4ae, 0x1d4b9,
- 0x1d4bb, 0x1d4bb,
- 0x1d4bd, 0x1d4c3,
- 0x1d4c5, 0x1d505,
- 0x1d507, 0x1d50a,
- 0x1d50d, 0x1d514,
- 0x1d516, 0x1d51c,
- 0x1d51e, 0x1d539,
- 0x1d53b, 0x1d53e,
- 0x1d540, 0x1d544,
- 0x1d546, 0x1d546,
- 0x1d54a, 0x1d550,
- 0x1d552, 0x1d6a5,
- 0x1d6a8, 0x1d6c0,
- 0x1d6c2, 0x1d6da,
- 0x1d6dc, 0x1d6fa,
- 0x1d6fc, 0x1d714,
- 0x1d716, 0x1d734,
- 0x1d736, 0x1d74e,
- 0x1d750, 0x1d76e,
- 0x1d770, 0x1d788,
- 0x1d78a, 0x1d7a8,
- 0x1d7aa, 0x1d7c2,
- 0x1d7c4, 0x1d7cb,
- 0x1d7ce, 0x1d7ff,
- 0x20000, 0x20000,
- 0x2a6d6, 0x2a6d6,
- 0x2f800, 0x2fa1d,
- 0xe0100, 0xe01ef,
-}; /* CR_Alnum */
-
-/* 'ASCII': [[:ASCII:]] */
-static const OnigCodePoint CR_ASCII[] = {
- 1,
- 0x0000, 0x007f,
-}; /* CR_ASCII */
-
-#ifdef USE_UNICODE_PROPERTIES
-/* 'Any': - */
-static const OnigCodePoint CR_Any[] = {
- 1,
- 0x0000, 0x10ffff,
-}; /* CR_Any */
-
-/* 'Assigned': - */
-static const OnigCodePoint CR_Assigned[] = {
- 454,
- 0x0000, 0x0377,
- 0x037a, 0x037e,
- 0x0384, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x0523,
- 0x0531, 0x0556,
- 0x0559, 0x055f,
- 0x0561, 0x0587,
- 0x0589, 0x058a,
- 0x0591, 0x05c7,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0x0600, 0x0603,
- 0x0606, 0x061b,
- 0x061e, 0x061f,
- 0x0621, 0x065e,
- 0x0660, 0x070d,
- 0x070f, 0x074a,
- 0x074d, 0x07b1,
- 0x07c0, 0x07fa,
- 0x0901, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0954,
- 0x0958, 0x0972,
- 0x097b, 0x097f,
- 0x0981, 0x0983,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bc, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09ce,
- 0x09d7, 0x09d7,
- 0x09dc, 0x09dd,
- 0x09df, 0x09e3,
- 0x09e6, 0x09fa,
- 0x0a01, 0x0a03,
- 0x0a05, 0x0a0a,
- 0x0a0f, 0x0a10,
- 0x0a13, 0x0a28,
- 0x0a2a, 0x0a30,
- 0x0a32, 0x0a33,
- 0x0a35, 0x0a36,
- 0x0a38, 0x0a39,
- 0x0a3c, 0x0a3c,
- 0x0a3e, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4d,
- 0x0a51, 0x0a51,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a66, 0x0a75,
- 0x0a81, 0x0a83,
- 0x0a85, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abc, 0x0ac5,
- 0x0ac7, 0x0ac9,
- 0x0acb, 0x0acd,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae3,
- 0x0ae6, 0x0aef,
- 0x0af1, 0x0af1,
- 0x0b01, 0x0b03,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b35, 0x0b39,
- 0x0b3c, 0x0b44,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b63,
- 0x0b66, 0x0b71,
- 0x0b82, 0x0b83,
- 0x0b85, 0x0b8a,
- 0x0b8e, 0x0b90,
- 0x0b92, 0x0b95,
- 0x0b99, 0x0b9a,
- 0x0b9c, 0x0b9c,
- 0x0b9e, 0x0b9f,
- 0x0ba3, 0x0ba4,
- 0x0ba8, 0x0baa,
- 0x0bae, 0x0bb9,
- 0x0bbe, 0x0bc2,
- 0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcd,
- 0x0bd0, 0x0bd0,
- 0x0bd7, 0x0bd7,
- 0x0be6, 0x0bfa,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3d, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c58, 0x0c59,
- 0x0c60, 0x0c63,
- 0x0c66, 0x0c6f,
- 0x0c78, 0x0c7f,
- 0x0c82, 0x0c83,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbc, 0x0cc4,
- 0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccd,
- 0x0cd5, 0x0cd6,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce3,
- 0x0ce6, 0x0cef,
- 0x0cf1, 0x0cf2,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3d, 0x0d44,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d63,
- 0x0d66, 0x0d75,
- 0x0d79, 0x0d7f,
- 0x0d82, 0x0d83,
- 0x0d85, 0x0d96,
- 0x0d9a, 0x0db1,
- 0x0db3, 0x0dbb,
- 0x0dbd, 0x0dbd,
- 0x0dc0, 0x0dc6,
- 0x0dca, 0x0dca,
- 0x0dcf, 0x0dd4,
- 0x0dd6, 0x0dd6,
- 0x0dd8, 0x0ddf,
- 0x0df2, 0x0df4,
- 0x0e01, 0x0e3a,
- 0x0e3f, 0x0e5b,
- 0x0e81, 0x0e82,
- 0x0e84, 0x0e84,
- 0x0e87, 0x0e88,
- 0x0e8a, 0x0e8a,
- 0x0e8d, 0x0e8d,
- 0x0e94, 0x0e97,
- 0x0e99, 0x0e9f,
- 0x0ea1, 0x0ea3,
- 0x0ea5, 0x0ea5,
- 0x0ea7, 0x0ea7,
- 0x0eaa, 0x0eab,
- 0x0ead, 0x0eb9,
- 0x0ebb, 0x0ebd,
- 0x0ec0, 0x0ec4,
- 0x0ec6, 0x0ec6,
- 0x0ec8, 0x0ecd,
- 0x0ed0, 0x0ed9,
- 0x0edc, 0x0edd,
- 0x0f00, 0x0f47,
- 0x0f49, 0x0f6c,
- 0x0f71, 0x0f8b,
- 0x0f90, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fbe, 0x0fcc,
- 0x0fce, 0x0fd4,
- 0x1000, 0x1099,
- 0x109e, 0x10c5,
- 0x10d0, 0x10fc,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x1200, 0x1248,
- 0x124a, 0x124d,
- 0x1250, 0x1256,
- 0x1258, 0x1258,
- 0x125a, 0x125d,
- 0x1260, 0x1288,
- 0x128a, 0x128d,
- 0x1290, 0x12b0,
- 0x12b2, 0x12b5,
- 0x12b8, 0x12be,
- 0x12c0, 0x12c0,
- 0x12c2, 0x12c5,
- 0x12c8, 0x12d6,
- 0x12d8, 0x1310,
- 0x1312, 0x1315,
- 0x1318, 0x135a,
- 0x135f, 0x137c,
- 0x1380, 0x1399,
- 0x13a0, 0x13f4,
- 0x1401, 0x1676,
- 0x1680, 0x169c,
- 0x16a0, 0x16f0,
- 0x1700, 0x170c,
- 0x170e, 0x1714,
- 0x1720, 0x1736,
- 0x1740, 0x1753,
- 0x1760, 0x176c,
- 0x176e, 0x1770,
- 0x1772, 0x1773,
- 0x1780, 0x17dd,
- 0x17e0, 0x17e9,
- 0x17f0, 0x17f9,
- 0x1800, 0x180e,
- 0x1810, 0x1819,
- 0x1820, 0x1877,
- 0x1880, 0x18aa,
- 0x1900, 0x191c,
- 0x1920, 0x192b,
- 0x1930, 0x193b,
- 0x1940, 0x1940,
- 0x1944, 0x196d,
- 0x1970, 0x1974,
- 0x1980, 0x19a9,
- 0x19b0, 0x19c9,
- 0x19d0, 0x19d9,
- 0x19de, 0x1a1b,
- 0x1a1e, 0x1a1f,
- 0x1b00, 0x1b4b,
- 0x1b50, 0x1b7c,
- 0x1b80, 0x1baa,
- 0x1bae, 0x1bb9,
- 0x1c00, 0x1c37,
- 0x1c3b, 0x1c49,
- 0x1c4d, 0x1c7f,
- 0x1d00, 0x1de6,
- 0x1dfe, 0x1f15,
- 0x1f18, 0x1f1d,
- 0x1f20, 0x1f45,
- 0x1f48, 0x1f4d,
- 0x1f50, 0x1f57,
- 0x1f59, 0x1f59,
- 0x1f5b, 0x1f5b,
- 0x1f5d, 0x1f5d,
- 0x1f5f, 0x1f7d,
- 0x1f80, 0x1fb4,
- 0x1fb6, 0x1fc4,
- 0x1fc6, 0x1fd3,
- 0x1fd6, 0x1fdb,
- 0x1fdd, 0x1fef,
- 0x1ff2, 0x1ff4,
- 0x1ff6, 0x1ffe,
- 0x2000, 0x2064,
- 0x206a, 0x2071,
- 0x2074, 0x208e,
- 0x2090, 0x2094,
- 0x20a0, 0x20b5,
- 0x20d0, 0x20f0,
- 0x2100, 0x214f,
- 0x2153, 0x2188,
- 0x2190, 0x23e7,
- 0x2400, 0x2426,
- 0x2440, 0x244a,
- 0x2460, 0x269d,
- 0x26a0, 0x26bc,
- 0x26c0, 0x26c3,
- 0x2701, 0x2704,
- 0x2706, 0x2709,
- 0x270c, 0x2727,
- 0x2729, 0x274b,
- 0x274d, 0x274d,
- 0x274f, 0x2752,
- 0x2756, 0x2756,
- 0x2758, 0x275e,
- 0x2761, 0x2794,
- 0x2798, 0x27af,
- 0x27b1, 0x27be,
- 0x27c0, 0x27ca,
- 0x27cc, 0x27cc,
- 0x27d0, 0x2b4c,
- 0x2b50, 0x2b54,
- 0x2c00, 0x2c2e,
- 0x2c30, 0x2c5e,
- 0x2c60, 0x2c6f,
- 0x2c71, 0x2c7d,
- 0x2c80, 0x2cea,
- 0x2cf9, 0x2d25,
- 0x2d30, 0x2d65,
- 0x2d6f, 0x2d6f,
- 0x2d80, 0x2d96,
- 0x2da0, 0x2da6,
- 0x2da8, 0x2dae,
- 0x2db0, 0x2db6,
- 0x2db8, 0x2dbe,
- 0x2dc0, 0x2dc6,
- 0x2dc8, 0x2dce,
- 0x2dd0, 0x2dd6,
- 0x2dd8, 0x2dde,
- 0x2de0, 0x2e30,
- 0x2e80, 0x2e99,
- 0x2e9b, 0x2ef3,
- 0x2f00, 0x2fd5,
- 0x2ff0, 0x2ffb,
- 0x3000, 0x303f,
- 0x3041, 0x3096,
- 0x3099, 0x30ff,
- 0x3105, 0x312d,
- 0x3131, 0x318e,
- 0x3190, 0x31b7,
- 0x31c0, 0x31e3,
- 0x31f0, 0x321e,
- 0x3220, 0x3243,
- 0x3250, 0x32fe,
- 0x3300, 0x3400,
- 0x4db5, 0x4db5,
- 0x4dc0, 0x4e00,
- 0x9fc3, 0x9fc3,
- 0xa000, 0xa48c,
- 0xa490, 0xa4c6,
- 0xa500, 0xa62b,
- 0xa640, 0xa65f,
- 0xa662, 0xa673,
- 0xa67c, 0xa697,
- 0xa700, 0xa78c,
- 0xa7fb, 0xa82b,
- 0xa840, 0xa877,
- 0xa880, 0xa8c4,
- 0xa8ce, 0xa8d9,
- 0xa900, 0xa953,
- 0xa95f, 0xa95f,
- 0xaa00, 0xaa36,
- 0xaa40, 0xaa4d,
- 0xaa50, 0xaa59,
- 0xaa5c, 0xaa5f,
- 0xac00, 0xac00,
- 0xd7a3, 0xd7a3,
- 0xd800, 0xd800,
- 0xdb7f, 0xdb80,
- 0xdbff, 0xdc00,
- 0xdfff, 0xe000,
- 0xf8ff, 0xfa2d,
- 0xfa30, 0xfa6a,
- 0xfa70, 0xfad9,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xfb1d, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbb1,
- 0xfbd3, 0xfd3f,
- 0xfd50, 0xfd8f,
- 0xfd92, 0xfdc7,
- 0xfdf0, 0xfdfd,
- 0xfe00, 0xfe19,
- 0xfe20, 0xfe26,
- 0xfe30, 0xfe52,
- 0xfe54, 0xfe66,
- 0xfe68, 0xfe6b,
- 0xfe70, 0xfe74,
- 0xfe76, 0xfefc,
- 0xfeff, 0xfeff,
- 0xff01, 0xffbe,
- 0xffc2, 0xffc7,
- 0xffca, 0xffcf,
- 0xffd2, 0xffd7,
- 0xffda, 0xffdc,
- 0xffe0, 0xffe6,
- 0xffe8, 0xffee,
- 0xfff9, 0xfffd,
- 0x10000, 0x1000b,
- 0x1000d, 0x10026,
- 0x10028, 0x1003a,
- 0x1003c, 0x1003d,
- 0x1003f, 0x1004d,
- 0x10050, 0x1005d,
- 0x10080, 0x100fa,
- 0x10100, 0x10102,
- 0x10107, 0x10133,
- 0x10137, 0x1018a,
- 0x10190, 0x1019b,
- 0x101d0, 0x101fd,
- 0x10280, 0x1029c,
- 0x102a0, 0x102d0,
- 0x10300, 0x1031e,
- 0x10320, 0x10323,
- 0x10330, 0x1034a,
- 0x10380, 0x1039d,
- 0x1039f, 0x103c3,
- 0x103c8, 0x103d5,
- 0x10400, 0x1049d,
- 0x104a0, 0x104a9,
- 0x10800, 0x10805,
- 0x10808, 0x10808,
- 0x1080a, 0x10835,
- 0x10837, 0x10838,
- 0x1083c, 0x1083c,
- 0x1083f, 0x1083f,
- 0x10900, 0x10919,
- 0x1091f, 0x10939,
- 0x1093f, 0x1093f,
- 0x10a00, 0x10a03,
- 0x10a05, 0x10a06,
- 0x10a0c, 0x10a13,
- 0x10a15, 0x10a17,
- 0x10a19, 0x10a33,
- 0x10a38, 0x10a3a,
- 0x10a3f, 0x10a47,
- 0x10a50, 0x10a58,
- 0x12000, 0x1236e,
- 0x12400, 0x12462,
- 0x12470, 0x12473,
- 0x1d000, 0x1d0f5,
- 0x1d100, 0x1d126,
- 0x1d129, 0x1d1dd,
- 0x1d200, 0x1d245,
- 0x1d300, 0x1d356,
- 0x1d360, 0x1d371,
- 0x1d400, 0x1d454,
- 0x1d456, 0x1d49c,
- 0x1d49e, 0x1d49f,
- 0x1d4a2, 0x1d4a2,
- 0x1d4a5, 0x1d4a6,
- 0x1d4a9, 0x1d4ac,
- 0x1d4ae, 0x1d4b9,
- 0x1d4bb, 0x1d4bb,
- 0x1d4bd, 0x1d4c3,
- 0x1d4c5, 0x1d505,
- 0x1d507, 0x1d50a,
- 0x1d50d, 0x1d514,
- 0x1d516, 0x1d51c,
- 0x1d51e, 0x1d539,
- 0x1d53b, 0x1d53e,
- 0x1d540, 0x1d544,
- 0x1d546, 0x1d546,
- 0x1d54a, 0x1d550,
- 0x1d552, 0x1d6a5,
- 0x1d6a8, 0x1d7cb,
- 0x1d7ce, 0x1d7ff,
- 0x1f000, 0x1f02b,
- 0x1f030, 0x1f093,
- 0x20000, 0x20000,
- 0x2a6d6, 0x2a6d6,
- 0x2f800, 0x2fa1d,
- 0xe0001, 0xe0001,
- 0xe0020, 0xe007f,
- 0xe0100, 0xe01ef,
- 0xf0000, 0xf0000,
- 0xffffd, 0xffffd,
- 0x100000, 0x100000,
-}; /* CR_Assigned */
-
-/* 'C': Major Category */
-static const OnigCodePoint CR_C[] = {
- 25,
- 0x0000, 0x001f,
- 0x007f, 0x009f,
- 0x00ad, 0x00ad,
- 0x0600, 0x0603,
- 0x06dd, 0x06dd,
- 0x070f, 0x070f,
- 0x17b4, 0x17b5,
- 0x200b, 0x200f,
- 0x202a, 0x202e,
- 0x2060, 0x2064,
- 0x206a, 0x206f,
- 0xd800, 0xd800,
- 0xdb7f, 0xdb80,
- 0xdbff, 0xdc00,
- 0xdfff, 0xe000,
- 0xf8ff, 0xf8ff,
- 0xfeff, 0xfeff,
- 0xfff9, 0xfffb,
- 0x1d173, 0x1d17a,
- 0xe0001, 0xe0001,
- 0xe0020, 0xe007f,
- 0xf0000, 0xf0000,
- 0xffffd, 0xffffd,
- 0x100000, 0x100000,
- 0x10fffd, 0x10ffff,
-}; /* CR_C */
-
-/* 'Cc': General Category */
-static const OnigCodePoint CR_Cc[] = {
- 2,
- 0x0000, 0x001f,
- 0x007f, 0x009f,
-}; /* CR_Cc */
-
-/* 'Cf': General Category */
-static const OnigCodePoint CR_Cf[] = {
- 14,
- 0x00ad, 0x00ad,
- 0x0600, 0x0603,
- 0x06dd, 0x06dd,
- 0x070f, 0x070f,
- 0x17b4, 0x17b5,
- 0x200b, 0x200f,
- 0x202a, 0x202e,
- 0x2060, 0x2064,
- 0x206a, 0x206f,
- 0xfeff, 0xfeff,
- 0xfff9, 0xfffb,
- 0x1d173, 0x1d17a,
- 0xe0001, 0xe0001,
- 0xe0020, 0xe007f,
-}; /* CR_Cf */
-
-/* 'Cn': General Category */
-static const OnigCodePoint CR_Cn[] = {
- 454,
- 0x0378, 0x0379,
- 0x037f, 0x0383,
- 0x038b, 0x038b,
- 0x038d, 0x038d,
- 0x03a2, 0x03a2,
- 0x0524, 0x0530,
- 0x0557, 0x0558,
- 0x0560, 0x0560,
- 0x0588, 0x0588,
- 0x058b, 0x0590,
- 0x05c8, 0x05cf,
- 0x05eb, 0x05ef,
- 0x05f5, 0x05ff,
- 0x0604, 0x0605,
- 0x061c, 0x061d,
- 0x0620, 0x0620,
- 0x065f, 0x065f,
- 0x070e, 0x070e,
- 0x074b, 0x074c,
- 0x07b2, 0x07bf,
- 0x07fb, 0x0900,
- 0x093a, 0x093b,
- 0x094e, 0x094f,
- 0x0955, 0x0957,
- 0x0973, 0x097a,
- 0x0980, 0x0980,
- 0x0984, 0x0984,
- 0x098d, 0x098e,
- 0x0991, 0x0992,
- 0x09a9, 0x09a9,
- 0x09b1, 0x09b1,
- 0x09b3, 0x09b5,
- 0x09ba, 0x09bb,
- 0x09c5, 0x09c6,
- 0x09c9, 0x09ca,
- 0x09cf, 0x09d6,
- 0x09d8, 0x09db,
- 0x09de, 0x09de,
- 0x09e4, 0x09e5,
- 0x09fb, 0x0a00,
- 0x0a04, 0x0a04,
- 0x0a0b, 0x0a0e,
- 0x0a11, 0x0a12,
- 0x0a29, 0x0a29,
- 0x0a31, 0x0a31,
- 0x0a34, 0x0a34,
- 0x0a37, 0x0a37,
- 0x0a3a, 0x0a3b,
- 0x0a3d, 0x0a3d,
- 0x0a43, 0x0a46,
- 0x0a49, 0x0a4a,
- 0x0a4e, 0x0a50,
- 0x0a52, 0x0a58,
- 0x0a5d, 0x0a5d,
- 0x0a5f, 0x0a65,
- 0x0a76, 0x0a80,
- 0x0a84, 0x0a84,
- 0x0a8e, 0x0a8e,
- 0x0a92, 0x0a92,
- 0x0aa9, 0x0aa9,
- 0x0ab1, 0x0ab1,
- 0x0ab4, 0x0ab4,
- 0x0aba, 0x0abb,
- 0x0ac6, 0x0ac6,
- 0x0aca, 0x0aca,
- 0x0ace, 0x0acf,
- 0x0ad1, 0x0adf,
- 0x0ae4, 0x0ae5,
- 0x0af0, 0x0af0,
- 0x0af2, 0x0b00,
- 0x0b04, 0x0b04,
- 0x0b0d, 0x0b0e,
- 0x0b11, 0x0b12,
- 0x0b29, 0x0b29,
- 0x0b31, 0x0b31,
- 0x0b34, 0x0b34,
- 0x0b3a, 0x0b3b,
- 0x0b45, 0x0b46,
- 0x0b49, 0x0b4a,
- 0x0b4e, 0x0b55,
- 0x0b58, 0x0b5b,
- 0x0b5e, 0x0b5e,
- 0x0b64, 0x0b65,
- 0x0b72, 0x0b81,
- 0x0b84, 0x0b84,
- 0x0b8b, 0x0b8d,
- 0x0b91, 0x0b91,
- 0x0b96, 0x0b98,
- 0x0b9b, 0x0b9b,
- 0x0b9d, 0x0b9d,
- 0x0ba0, 0x0ba2,
- 0x0ba5, 0x0ba7,
- 0x0bab, 0x0bad,
- 0x0bba, 0x0bbd,
- 0x0bc3, 0x0bc5,
- 0x0bc9, 0x0bc9,
- 0x0bce, 0x0bcf,
- 0x0bd1, 0x0bd6,
- 0x0bd8, 0x0be5,
- 0x0bfb, 0x0c00,
- 0x0c04, 0x0c04,
- 0x0c0d, 0x0c0d,
- 0x0c11, 0x0c11,
- 0x0c29, 0x0c29,
- 0x0c34, 0x0c34,
- 0x0c3a, 0x0c3c,
- 0x0c45, 0x0c45,
- 0x0c49, 0x0c49,
- 0x0c4e, 0x0c54,
- 0x0c57, 0x0c57,
- 0x0c5a, 0x0c5f,
- 0x0c64, 0x0c65,
- 0x0c70, 0x0c77,
- 0x0c80, 0x0c81,
- 0x0c84, 0x0c84,
- 0x0c8d, 0x0c8d,
- 0x0c91, 0x0c91,
- 0x0ca9, 0x0ca9,
- 0x0cb4, 0x0cb4,
- 0x0cba, 0x0cbb,
- 0x0cc5, 0x0cc5,
- 0x0cc9, 0x0cc9,
- 0x0cce, 0x0cd4,
- 0x0cd7, 0x0cdd,
- 0x0cdf, 0x0cdf,
- 0x0ce4, 0x0ce5,
- 0x0cf0, 0x0cf0,
- 0x0cf3, 0x0d01,
- 0x0d04, 0x0d04,
- 0x0d0d, 0x0d0d,
- 0x0d11, 0x0d11,
- 0x0d29, 0x0d29,
- 0x0d3a, 0x0d3c,
- 0x0d45, 0x0d45,
- 0x0d49, 0x0d49,
- 0x0d4e, 0x0d56,
- 0x0d58, 0x0d5f,
- 0x0d64, 0x0d65,
- 0x0d76, 0x0d78,
- 0x0d80, 0x0d81,
- 0x0d84, 0x0d84,
- 0x0d97, 0x0d99,
- 0x0db2, 0x0db2,
- 0x0dbc, 0x0dbc,
- 0x0dbe, 0x0dbf,
- 0x0dc7, 0x0dc9,
- 0x0dcb, 0x0dce,
- 0x0dd5, 0x0dd5,
- 0x0dd7, 0x0dd7,
- 0x0de0, 0x0df1,
- 0x0df5, 0x0e00,
- 0x0e3b, 0x0e3e,
- 0x0e5c, 0x0e80,
- 0x0e83, 0x0e83,
- 0x0e85, 0x0e86,
- 0x0e89, 0x0e89,
- 0x0e8b, 0x0e8c,
- 0x0e8e, 0x0e93,
- 0x0e98, 0x0e98,
- 0x0ea0, 0x0ea0,
- 0x0ea4, 0x0ea4,
- 0x0ea6, 0x0ea6,
- 0x0ea8, 0x0ea9,
- 0x0eac, 0x0eac,
- 0x0eba, 0x0eba,
- 0x0ebe, 0x0ebf,
- 0x0ec5, 0x0ec5,
- 0x0ec7, 0x0ec7,
- 0x0ece, 0x0ecf,
- 0x0eda, 0x0edb,
- 0x0ede, 0x0eff,
- 0x0f48, 0x0f48,
- 0x0f6d, 0x0f70,
- 0x0f8c, 0x0f8f,
- 0x0f98, 0x0f98,
- 0x0fbd, 0x0fbd,
- 0x0fcd, 0x0fcd,
- 0x0fd5, 0x0fff,
- 0x109a, 0x109d,
- 0x10c6, 0x10cf,
- 0x10fd, 0x10ff,
- 0x115a, 0x115e,
- 0x11a3, 0x11a7,
- 0x11fa, 0x11ff,
- 0x1249, 0x1249,
- 0x124e, 0x124f,
- 0x1257, 0x1257,
- 0x1259, 0x1259,
- 0x125e, 0x125f,
- 0x1289, 0x1289,
- 0x128e, 0x128f,
- 0x12b1, 0x12b1,
- 0x12b6, 0x12b7,
- 0x12bf, 0x12bf,
- 0x12c1, 0x12c1,
- 0x12c6, 0x12c7,
- 0x12d7, 0x12d7,
- 0x1311, 0x1311,
- 0x1316, 0x1317,
- 0x135b, 0x135e,
- 0x137d, 0x137f,
- 0x139a, 0x139f,
- 0x13f5, 0x1400,
- 0x1677, 0x167f,
- 0x169d, 0x169f,
- 0x16f1, 0x16ff,
- 0x170d, 0x170d,
- 0x1715, 0x171f,
- 0x1737, 0x173f,
- 0x1754, 0x175f,
- 0x176d, 0x176d,
- 0x1771, 0x1771,
- 0x1774, 0x177f,
- 0x17de, 0x17df,
- 0x17ea, 0x17ef,
- 0x17fa, 0x17ff,
- 0x180f, 0x180f,
- 0x181a, 0x181f,
- 0x1878, 0x187f,
- 0x18ab, 0x18ff,
- 0x191d, 0x191f,
- 0x192c, 0x192f,
- 0x193c, 0x193f,
- 0x1941, 0x1943,
- 0x196e, 0x196f,
- 0x1975, 0x197f,
- 0x19aa, 0x19af,
- 0x19ca, 0x19cf,
- 0x19da, 0x19dd,
- 0x1a1c, 0x1a1d,
- 0x1a20, 0x1aff,
- 0x1b4c, 0x1b4f,
- 0x1b7d, 0x1b7f,
- 0x1bab, 0x1bad,
- 0x1bba, 0x1bff,
- 0x1c38, 0x1c3a,
- 0x1c4a, 0x1c4c,
- 0x1c80, 0x1cff,
- 0x1de7, 0x1dfd,
- 0x1f16, 0x1f17,
- 0x1f1e, 0x1f1f,
- 0x1f46, 0x1f47,
- 0x1f4e, 0x1f4f,
- 0x1f58, 0x1f58,
- 0x1f5a, 0x1f5a,
- 0x1f5c, 0x1f5c,
- 0x1f5e, 0x1f5e,
- 0x1f7e, 0x1f7f,
- 0x1fb5, 0x1fb5,
- 0x1fc5, 0x1fc5,
- 0x1fd4, 0x1fd5,
- 0x1fdc, 0x1fdc,
- 0x1ff0, 0x1ff1,
- 0x1ff5, 0x1ff5,
- 0x1fff, 0x1fff,
- 0x2065, 0x2069,
- 0x2072, 0x2073,
- 0x208f, 0x208f,
- 0x2095, 0x209f,
- 0x20b6, 0x20cf,
- 0x20f1, 0x20ff,
- 0x2150, 0x2152,
- 0x2189, 0x218f,
- 0x23e8, 0x23ff,
- 0x2427, 0x243f,
- 0x244b, 0x245f,
- 0x269e, 0x269f,
- 0x26bd, 0x26bf,
- 0x26c4, 0x2700,
- 0x2705, 0x2705,
- 0x270a, 0x270b,
- 0x2728, 0x2728,
- 0x274c, 0x274c,
- 0x274e, 0x274e,
- 0x2753, 0x2755,
- 0x2757, 0x2757,
- 0x275f, 0x2760,
- 0x2795, 0x2797,
- 0x27b0, 0x27b0,
- 0x27bf, 0x27bf,
- 0x27cb, 0x27cb,
- 0x27cd, 0x27cf,
- 0x2b4d, 0x2b4f,
- 0x2b55, 0x2bff,
- 0x2c2f, 0x2c2f,
- 0x2c5f, 0x2c5f,
- 0x2c70, 0x2c70,
- 0x2c7e, 0x2c7f,
- 0x2ceb, 0x2cf8,
- 0x2d26, 0x2d2f,
- 0x2d66, 0x2d6e,
- 0x2d70, 0x2d7f,
- 0x2d97, 0x2d9f,
- 0x2da7, 0x2da7,
- 0x2daf, 0x2daf,
- 0x2db7, 0x2db7,
- 0x2dbf, 0x2dbf,
- 0x2dc7, 0x2dc7,
- 0x2dcf, 0x2dcf,
- 0x2dd7, 0x2dd7,
- 0x2ddf, 0x2ddf,
- 0x2e31, 0x2e7f,
- 0x2e9a, 0x2e9a,
- 0x2ef4, 0x2eff,
- 0x2fd6, 0x2fef,
- 0x2ffc, 0x2fff,
- 0x3040, 0x3040,
- 0x3097, 0x3098,
- 0x3100, 0x3104,
- 0x312e, 0x3130,
- 0x318f, 0x318f,
- 0x31b8, 0x31bf,
- 0x31e4, 0x31ef,
- 0x321f, 0x321f,
- 0x3244, 0x324f,
- 0x32ff, 0x32ff,
- 0x3401, 0x4db4,
- 0x4db6, 0x4dbf,
- 0x4e01, 0x9fc2,
- 0x9fc4, 0x9fff,
- 0xa48d, 0xa48f,
- 0xa4c7, 0xa4ff,
- 0xa62c, 0xa63f,
- 0xa660, 0xa661,
- 0xa674, 0xa67b,
- 0xa698, 0xa6ff,
- 0xa78d, 0xa7fa,
- 0xa82c, 0xa83f,
- 0xa878, 0xa87f,
- 0xa8c5, 0xa8cd,
- 0xa8da, 0xa8ff,
- 0xa954, 0xa95e,
- 0xa960, 0xa9ff,
- 0xaa37, 0xaa3f,
- 0xaa4e, 0xaa4f,
- 0xaa5a, 0xaa5b,
- 0xaa60, 0xabff,
- 0xac01, 0xd7a2,
- 0xd7a4, 0xd7ff,
- 0xd801, 0xdb7e,
- 0xdb81, 0xdbfe,
- 0xdc01, 0xdffe,
- 0xe001, 0xf8fe,
- 0xfa2e, 0xfa2f,
- 0xfa6b, 0xfa6f,
- 0xfada, 0xfaff,
- 0xfb07, 0xfb12,
- 0xfb18, 0xfb1c,
- 0xfb37, 0xfb37,
- 0xfb3d, 0xfb3d,
- 0xfb3f, 0xfb3f,
- 0xfb42, 0xfb42,
- 0xfb45, 0xfb45,
- 0xfbb2, 0xfbd2,
- 0xfd40, 0xfd4f,
- 0xfd90, 0xfd91,
- 0xfdc8, 0xfdef,
- 0xfdfe, 0xfdff,
- 0xfe1a, 0xfe1f,
- 0xfe27, 0xfe2f,
- 0xfe53, 0xfe53,
- 0xfe67, 0xfe67,
- 0xfe6c, 0xfe6f,
- 0xfe75, 0xfe75,
- 0xfefd, 0xfefe,
- 0xff00, 0xff00,
- 0xffbf, 0xffc1,
- 0xffc8, 0xffc9,
- 0xffd0, 0xffd1,
- 0xffd8, 0xffd9,
- 0xffdd, 0xffdf,
- 0xffe7, 0xffe7,
- 0xffef, 0xfff8,
- 0xfffe, 0xffff,
- 0x1000c, 0x1000c,
- 0x10027, 0x10027,
- 0x1003b, 0x1003b,
- 0x1003e, 0x1003e,
- 0x1004e, 0x1004f,
- 0x1005e, 0x1007f,
- 0x100fb, 0x100ff,
- 0x10103, 0x10106,
- 0x10134, 0x10136,
- 0x1018b, 0x1018f,
- 0x1019c, 0x101cf,
- 0x101fe, 0x1027f,
- 0x1029d, 0x1029f,
- 0x102d1, 0x102ff,
- 0x1031f, 0x1031f,
- 0x10324, 0x1032f,
- 0x1034b, 0x1037f,
- 0x1039e, 0x1039e,
- 0x103c4, 0x103c7,
- 0x103d6, 0x103ff,
- 0x1049e, 0x1049f,
- 0x104aa, 0x107ff,
- 0x10806, 0x10807,
- 0x10809, 0x10809,
- 0x10836, 0x10836,
- 0x10839, 0x1083b,
- 0x1083d, 0x1083e,
- 0x10840, 0x108ff,
- 0x1091a, 0x1091e,
- 0x1093a, 0x1093e,
- 0x10940, 0x109ff,
- 0x10a04, 0x10a04,
- 0x10a07, 0x10a0b,
- 0x10a14, 0x10a14,
- 0x10a18, 0x10a18,
- 0x10a34, 0x10a37,
- 0x10a3b, 0x10a3e,
- 0x10a48, 0x10a4f,
- 0x10a59, 0x11fff,
- 0x1236f, 0x123ff,
- 0x12463, 0x1246f,
- 0x12474, 0x1cfff,
- 0x1d0f6, 0x1d0ff,
- 0x1d127, 0x1d128,
- 0x1d1de, 0x1d1ff,
- 0x1d246, 0x1d2ff,
- 0x1d357, 0x1d35f,
- 0x1d372, 0x1d3ff,
- 0x1d455, 0x1d455,
- 0x1d49d, 0x1d49d,
- 0x1d4a0, 0x1d4a1,
- 0x1d4a3, 0x1d4a4,
- 0x1d4a7, 0x1d4a8,
- 0x1d4ad, 0x1d4ad,
- 0x1d4ba, 0x1d4ba,
- 0x1d4bc, 0x1d4bc,
- 0x1d4c4, 0x1d4c4,
- 0x1d506, 0x1d506,
- 0x1d50b, 0x1d50c,
- 0x1d515, 0x1d515,
- 0x1d51d, 0x1d51d,
- 0x1d53a, 0x1d53a,
- 0x1d53f, 0x1d53f,
- 0x1d545, 0x1d545,
- 0x1d547, 0x1d549,
- 0x1d551, 0x1d551,
- 0x1d6a6, 0x1d6a7,
- 0x1d7cc, 0x1d7cd,
- 0x1d800, 0x1efff,
- 0x1f02c, 0x1f02f,
- 0x1f094, 0x1ffff,
- 0x20001, 0x2a6d5,
- 0x2a6d7, 0x2f7ff,
- 0x2fa1e, 0xe0000,
- 0xe0002, 0xe001f,
- 0xe0080, 0xe00ff,
- 0xe01f0, 0xeffff,
- 0xf0001, 0xffffc,
- 0xffffe, 0xfffff,
- 0x100001, 0x10ffff,
-}; /* CR_Cn */
-
-/* 'Co': General Category */
-static const OnigCodePoint CR_Co[] = {
- 6,
- 0xe000, 0xe000,
- 0xf8ff, 0xf8ff,
- 0xf0000, 0xf0000,
- 0xffffd, 0xffffd,
- 0x100000, 0x100000,
- 0x10fffd, 0x10fffd,
-}; /* CR_Co */
-
-/* 'Cs': General Category */
-static const OnigCodePoint CR_Cs[] = {
- 4,
- 0xd800, 0xd800,
- 0xdb7f, 0xdb80,
- 0xdbff, 0xdc00,
- 0xdfff, 0xdfff,
-}; /* CR_Cs */
-
-/* 'L': Major Category */
-static const OnigCodePoint CR_L[] = {
- 394,
- 0x0041, 0x005a,
- 0x0061, 0x007a,
- 0x00aa, 0x00aa,
- 0x00b5, 0x00b5,
- 0x00ba, 0x00ba,
- 0x00c0, 0x00d6,
- 0x00d8, 0x00f6,
- 0x00f8, 0x02c1,
- 0x02c6, 0x02d1,
- 0x02e0, 0x02e4,
- 0x02ec, 0x02ec,
- 0x02ee, 0x02ee,
- 0x0370, 0x0374,
- 0x0376, 0x0377,
- 0x037a, 0x037d,
- 0x0386, 0x0386,
- 0x0388, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03f5,
- 0x03f7, 0x0481,
- 0x048a, 0x0523,
- 0x0531, 0x0556,
- 0x0559, 0x0559,
- 0x0561, 0x0587,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f2,
- 0x0621, 0x064a,
- 0x066e, 0x066f,
- 0x0671, 0x06d3,
- 0x06d5, 0x06d5,
- 0x06e5, 0x06e6,
- 0x06ee, 0x06ef,
- 0x06fa, 0x06fc,
- 0x06ff, 0x06ff,
- 0x0710, 0x0710,
- 0x0712, 0x072f,
- 0x074d, 0x07a5,
- 0x07b1, 0x07b1,
- 0x07ca, 0x07ea,
- 0x07f4, 0x07f5,
- 0x07fa, 0x07fa,
- 0x0904, 0x0939,
- 0x093d, 0x093d,
- 0x0950, 0x0950,
- 0x0958, 0x0961,
- 0x0971, 0x0972,
- 0x097b, 0x097f,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bd, 0x09bd,
- 0x09ce, 0x09ce,
- 0x09dc, 0x09dd,
- 0x09df, 0x09e1,
- 0x09f0, 0x09f1,
- 0x0a05, 0x0a0a,
- 0x0a0f, 0x0a10,
- 0x0a13, 0x0a28,
- 0x0a2a, 0x0a30,
- 0x0a32, 0x0a33,
- 0x0a35, 0x0a36,
- 0x0a38, 0x0a39,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a72, 0x0a74,
- 0x0a85, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abd, 0x0abd,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae1,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b35, 0x0b39,
- 0x0b3d, 0x0b3d,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b61,
- 0x0b71, 0x0b71,
- 0x0b83, 0x0b83,
- 0x0b85, 0x0b8a,
- 0x0b8e, 0x0b90,
- 0x0b92, 0x0b95,
- 0x0b99, 0x0b9a,
- 0x0b9c, 0x0b9c,
- 0x0b9e, 0x0b9f,
- 0x0ba3, 0x0ba4,
- 0x0ba8, 0x0baa,
- 0x0bae, 0x0bb9,
- 0x0bd0, 0x0bd0,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3d, 0x0c3d,
- 0x0c58, 0x0c59,
- 0x0c60, 0x0c61,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbd, 0x0cbd,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce1,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3d, 0x0d3d,
- 0x0d60, 0x0d61,
- 0x0d7a, 0x0d7f,
- 0x0d85, 0x0d96,
- 0x0d9a, 0x0db1,
- 0x0db3, 0x0dbb,
- 0x0dbd, 0x0dbd,
- 0x0dc0, 0x0dc6,
- 0x0e01, 0x0e30,
- 0x0e32, 0x0e33,
- 0x0e40, 0x0e46,
- 0x0e81, 0x0e82,
- 0x0e84, 0x0e84,
- 0x0e87, 0x0e88,
- 0x0e8a, 0x0e8a,
- 0x0e8d, 0x0e8d,
- 0x0e94, 0x0e97,
- 0x0e99, 0x0e9f,
- 0x0ea1, 0x0ea3,
- 0x0ea5, 0x0ea5,
- 0x0ea7, 0x0ea7,
- 0x0eaa, 0x0eab,
- 0x0ead, 0x0eb0,
- 0x0eb2, 0x0eb3,
- 0x0ebd, 0x0ebd,
- 0x0ec0, 0x0ec4,
- 0x0ec6, 0x0ec6,
- 0x0edc, 0x0edd,
- 0x0f00, 0x0f00,
- 0x0f40, 0x0f47,
- 0x0f49, 0x0f6c,
- 0x0f88, 0x0f8b,
- 0x1000, 0x102a,
- 0x103f, 0x103f,
- 0x1050, 0x1055,
- 0x105a, 0x105d,
- 0x1061, 0x1061,
- 0x1065, 0x1066,
- 0x106e, 0x1070,
- 0x1075, 0x1081,
- 0x108e, 0x108e,
- 0x10a0, 0x10c5,
- 0x10d0, 0x10fa,
- 0x10fc, 0x10fc,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x1200, 0x1248,
- 0x124a, 0x124d,
- 0x1250, 0x1256,
- 0x1258, 0x1258,
- 0x125a, 0x125d,
- 0x1260, 0x1288,
- 0x128a, 0x128d,
- 0x1290, 0x12b0,
- 0x12b2, 0x12b5,
- 0x12b8, 0x12be,
- 0x12c0, 0x12c0,
- 0x12c2, 0x12c5,
- 0x12c8, 0x12d6,
- 0x12d8, 0x1310,
- 0x1312, 0x1315,
- 0x1318, 0x135a,
- 0x1380, 0x138f,
- 0x13a0, 0x13f4,
- 0x1401, 0x166c,
- 0x166f, 0x1676,
- 0x1681, 0x169a,
- 0x16a0, 0x16ea,
- 0x1700, 0x170c,
- 0x170e, 0x1711,
- 0x1720, 0x1731,
- 0x1740, 0x1751,
- 0x1760, 0x176c,
- 0x176e, 0x1770,
- 0x1780, 0x17b3,
- 0x17d7, 0x17d7,
- 0x17dc, 0x17dc,
- 0x1820, 0x1877,
- 0x1880, 0x18a8,
- 0x18aa, 0x18aa,
- 0x1900, 0x191c,
- 0x1950, 0x196d,
- 0x1970, 0x1974,
- 0x1980, 0x19a9,
- 0x19c1, 0x19c7,
- 0x1a00, 0x1a16,
- 0x1b05, 0x1b33,
- 0x1b45, 0x1b4b,
- 0x1b83, 0x1ba0,
- 0x1bae, 0x1baf,
- 0x1c00, 0x1c23,
- 0x1c4d, 0x1c4f,
- 0x1c5a, 0x1c7d,
- 0x1d00, 0x1dbf,
- 0x1e00, 0x1f15,
- 0x1f18, 0x1f1d,
- 0x1f20, 0x1f45,
- 0x1f48, 0x1f4d,
- 0x1f50, 0x1f57,
- 0x1f59, 0x1f59,
- 0x1f5b, 0x1f5b,
- 0x1f5d, 0x1f5d,
- 0x1f5f, 0x1f7d,
- 0x1f80, 0x1fb4,
- 0x1fb6, 0x1fbc,
- 0x1fbe, 0x1fbe,
- 0x1fc2, 0x1fc4,
- 0x1fc6, 0x1fcc,
- 0x1fd0, 0x1fd3,
- 0x1fd6, 0x1fdb,
- 0x1fe0, 0x1fec,
- 0x1ff2, 0x1ff4,
- 0x1ff6, 0x1ffc,
- 0x2071, 0x2071,
- 0x207f, 0x207f,
- 0x2090, 0x2094,
- 0x2102, 0x2102,
- 0x2107, 0x2107,
- 0x210a, 0x2113,
- 0x2115, 0x2115,
- 0x2119, 0x211d,
- 0x2124, 0x2124,
- 0x2126, 0x2126,
- 0x2128, 0x2128,
- 0x212a, 0x212d,
- 0x212f, 0x2139,
- 0x213c, 0x213f,
- 0x2145, 0x2149,
- 0x214e, 0x214e,
- 0x2183, 0x2184,
- 0x2c00, 0x2c2e,
- 0x2c30, 0x2c5e,
- 0x2c60, 0x2c6f,
- 0x2c71, 0x2c7d,
- 0x2c80, 0x2ce4,
- 0x2d00, 0x2d25,
- 0x2d30, 0x2d65,
- 0x2d6f, 0x2d6f,
- 0x2d80, 0x2d96,
- 0x2da0, 0x2da6,
- 0x2da8, 0x2dae,
- 0x2db0, 0x2db6,
- 0x2db8, 0x2dbe,
- 0x2dc0, 0x2dc6,
- 0x2dc8, 0x2dce,
- 0x2dd0, 0x2dd6,
- 0x2dd8, 0x2dde,
- 0x2e2f, 0x2e2f,
- 0x3005, 0x3006,
- 0x3031, 0x3035,
- 0x303b, 0x303c,
- 0x3041, 0x3096,
- 0x309d, 0x309f,
- 0x30a1, 0x30fa,
- 0x30fc, 0x30ff,
- 0x3105, 0x312d,
- 0x3131, 0x318e,
- 0x31a0, 0x31b7,
- 0x31f0, 0x31ff,
- 0x3400, 0x3400,
- 0x4db5, 0x4db5,
- 0x4e00, 0x4e00,
- 0x9fc3, 0x9fc3,
- 0xa000, 0xa48c,
- 0xa500, 0xa60c,
- 0xa610, 0xa61f,
- 0xa62a, 0xa62b,
- 0xa640, 0xa65f,
- 0xa662, 0xa66e,
- 0xa67f, 0xa697,
- 0xa717, 0xa71f,
- 0xa722, 0xa788,
- 0xa78b, 0xa78c,
- 0xa7fb, 0xa801,
- 0xa803, 0xa805,
- 0xa807, 0xa80a,
- 0xa80c, 0xa822,
- 0xa840, 0xa873,
- 0xa882, 0xa8b3,
- 0xa90a, 0xa925,
- 0xa930, 0xa946,
- 0xaa00, 0xaa28,
- 0xaa40, 0xaa42,
- 0xaa44, 0xaa4b,
- 0xac00, 0xac00,
- 0xd7a3, 0xd7a3,
- 0xf900, 0xfa2d,
- 0xfa30, 0xfa6a,
- 0xfa70, 0xfad9,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xfb1d, 0xfb1d,
- 0xfb1f, 0xfb28,
- 0xfb2a, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbb1,
- 0xfbd3, 0xfd3d,
- 0xfd50, 0xfd8f,
- 0xfd92, 0xfdc7,
- 0xfdf0, 0xfdfb,
- 0xfe70, 0xfe74,
- 0xfe76, 0xfefc,
- 0xff21, 0xff3a,
- 0xff41, 0xff5a,
- 0xff66, 0xffbe,
- 0xffc2, 0xffc7,
- 0xffca, 0xffcf,
- 0xffd2, 0xffd7,
- 0xffda, 0xffdc,
- 0x10000, 0x1000b,
- 0x1000d, 0x10026,
- 0x10028, 0x1003a,
- 0x1003c, 0x1003d,
- 0x1003f, 0x1004d,
- 0x10050, 0x1005d,
- 0x10080, 0x100fa,
- 0x10280, 0x1029c,
- 0x102a0, 0x102d0,
- 0x10300, 0x1031e,
- 0x10330, 0x10340,
- 0x10342, 0x10349,
- 0x10380, 0x1039d,
- 0x103a0, 0x103c3,
- 0x103c8, 0x103cf,
- 0x10400, 0x1049d,
- 0x10800, 0x10805,
- 0x10808, 0x10808,
- 0x1080a, 0x10835,
- 0x10837, 0x10838,
- 0x1083c, 0x1083c,
- 0x1083f, 0x1083f,
- 0x10900, 0x10915,
- 0x10920, 0x10939,
- 0x10a00, 0x10a00,
- 0x10a10, 0x10a13,
- 0x10a15, 0x10a17,
- 0x10a19, 0x10a33,
- 0x12000, 0x1236e,
- 0x1d400, 0x1d454,
- 0x1d456, 0x1d49c,
- 0x1d49e, 0x1d49f,
- 0x1d4a2, 0x1d4a2,
- 0x1d4a5, 0x1d4a6,
- 0x1d4a9, 0x1d4ac,
- 0x1d4ae, 0x1d4b9,
- 0x1d4bb, 0x1d4bb,
- 0x1d4bd, 0x1d4c3,
- 0x1d4c5, 0x1d505,
- 0x1d507, 0x1d50a,
- 0x1d50d, 0x1d514,
- 0x1d516, 0x1d51c,
- 0x1d51e, 0x1d539,
- 0x1d53b, 0x1d53e,
- 0x1d540, 0x1d544,
- 0x1d546, 0x1d546,
- 0x1d54a, 0x1d550,
- 0x1d552, 0x1d6a5,
- 0x1d6a8, 0x1d6c0,
- 0x1d6c2, 0x1d6da,
- 0x1d6dc, 0x1d6fa,
- 0x1d6fc, 0x1d714,
- 0x1d716, 0x1d734,
- 0x1d736, 0x1d74e,
- 0x1d750, 0x1d76e,
- 0x1d770, 0x1d788,
- 0x1d78a, 0x1d7a8,
- 0x1d7aa, 0x1d7c2,
- 0x1d7c4, 0x1d7cb,
- 0x20000, 0x20000,
- 0x2a6d6, 0x2a6d6,
- 0x2f800, 0x2fa1d,
-}; /* CR_L */
-
-/* 'Ll': General Category */
-static const OnigCodePoint CR_Ll[] = {
- 598,
- 0x0061, 0x007a,
- 0x00aa, 0x00aa,
- 0x00b5, 0x00b5,
- 0x00ba, 0x00ba,
- 0x00df, 0x00f6,
- 0x00f8, 0x00ff,
- 0x0101, 0x0101,
- 0x0103, 0x0103,
- 0x0105, 0x0105,
- 0x0107, 0x0107,
- 0x0109, 0x0109,
- 0x010b, 0x010b,
- 0x010d, 0x010d,
- 0x010f, 0x010f,
- 0x0111, 0x0111,
- 0x0113, 0x0113,
- 0x0115, 0x0115,
- 0x0117, 0x0117,
- 0x0119, 0x0119,
- 0x011b, 0x011b,
- 0x011d, 0x011d,
- 0x011f, 0x011f,
- 0x0121, 0x0121,
- 0x0123, 0x0123,
- 0x0125, 0x0125,
- 0x0127, 0x0127,
- 0x0129, 0x0129,
- 0x012b, 0x012b,
- 0x012d, 0x012d,
- 0x012f, 0x012f,
- 0x0131, 0x0131,
- 0x0133, 0x0133,
- 0x0135, 0x0135,
- 0x0137, 0x0138,
- 0x013a, 0x013a,
- 0x013c, 0x013c,
- 0x013e, 0x013e,
- 0x0140, 0x0140,
- 0x0142, 0x0142,
- 0x0144, 0x0144,
- 0x0146, 0x0146,
- 0x0148, 0x0149,
- 0x014b, 0x014b,
- 0x014d, 0x014d,
- 0x014f, 0x014f,
- 0x0151, 0x0151,
- 0x0153, 0x0153,
- 0x0155, 0x0155,
- 0x0157, 0x0157,
- 0x0159, 0x0159,
- 0x015b, 0x015b,
- 0x015d, 0x015d,
- 0x015f, 0x015f,
- 0x0161, 0x0161,
- 0x0163, 0x0163,
- 0x0165, 0x0165,
- 0x0167, 0x0167,
- 0x0169, 0x0169,
- 0x016b, 0x016b,
- 0x016d, 0x016d,
- 0x016f, 0x016f,
- 0x0171, 0x0171,
- 0x0173, 0x0173,
- 0x0175, 0x0175,
- 0x0177, 0x0177,
- 0x017a, 0x017a,
- 0x017c, 0x017c,
- 0x017e, 0x0180,
- 0x0183, 0x0183,
- 0x0185, 0x0185,
- 0x0188, 0x0188,
- 0x018c, 0x018d,
- 0x0192, 0x0192,
- 0x0195, 0x0195,
- 0x0199, 0x019b,
- 0x019e, 0x019e,
- 0x01a1, 0x01a1,
- 0x01a3, 0x01a3,
- 0x01a5, 0x01a5,
- 0x01a8, 0x01a8,
- 0x01aa, 0x01ab,
- 0x01ad, 0x01ad,
- 0x01b0, 0x01b0,
- 0x01b4, 0x01b4,
- 0x01b6, 0x01b6,
- 0x01b9, 0x01ba,
- 0x01bd, 0x01bf,
- 0x01c6, 0x01c6,
- 0x01c9, 0x01c9,
- 0x01cc, 0x01cc,
- 0x01ce, 0x01ce,
- 0x01d0, 0x01d0,
- 0x01d2, 0x01d2,
- 0x01d4, 0x01d4,
- 0x01d6, 0x01d6,
- 0x01d8, 0x01d8,
- 0x01da, 0x01da,
- 0x01dc, 0x01dd,
- 0x01df, 0x01df,
- 0x01e1, 0x01e1,
- 0x01e3, 0x01e3,
- 0x01e5, 0x01e5,
- 0x01e7, 0x01e7,
- 0x01e9, 0x01e9,
- 0x01eb, 0x01eb,
- 0x01ed, 0x01ed,
- 0x01ef, 0x01f0,
- 0x01f3, 0x01f3,
- 0x01f5, 0x01f5,
- 0x01f9, 0x01f9,
- 0x01fb, 0x01fb,
- 0x01fd, 0x01fd,
- 0x01ff, 0x01ff,
- 0x0201, 0x0201,
- 0x0203, 0x0203,
- 0x0205, 0x0205,
- 0x0207, 0x0207,
- 0x0209, 0x0209,
- 0x020b, 0x020b,
- 0x020d, 0x020d,
- 0x020f, 0x020f,
- 0x0211, 0x0211,
- 0x0213, 0x0213,
- 0x0215, 0x0215,
- 0x0217, 0x0217,
- 0x0219, 0x0219,
- 0x021b, 0x021b,
- 0x021d, 0x021d,
- 0x021f, 0x021f,
- 0x0221, 0x0221,
- 0x0223, 0x0223,
- 0x0225, 0x0225,
- 0x0227, 0x0227,
- 0x0229, 0x0229,
- 0x022b, 0x022b,
- 0x022d, 0x022d,
- 0x022f, 0x022f,
- 0x0231, 0x0231,
- 0x0233, 0x0239,
- 0x023c, 0x023c,
- 0x023f, 0x0240,
- 0x0242, 0x0242,
- 0x0247, 0x0247,
- 0x0249, 0x0249,
- 0x024b, 0x024b,
- 0x024d, 0x024d,
- 0x024f, 0x0293,
- 0x0295, 0x02af,
- 0x0371, 0x0371,
- 0x0373, 0x0373,
- 0x0377, 0x0377,
- 0x037b, 0x037d,
- 0x0390, 0x0390,
- 0x03ac, 0x03ce,
- 0x03d0, 0x03d1,
- 0x03d5, 0x03d7,
- 0x03d9, 0x03d9,
- 0x03db, 0x03db,
- 0x03dd, 0x03dd,
- 0x03df, 0x03df,
- 0x03e1, 0x03e1,
- 0x03e3, 0x03e3,
- 0x03e5, 0x03e5,
- 0x03e7, 0x03e7,
- 0x03e9, 0x03e9,
- 0x03eb, 0x03eb,
- 0x03ed, 0x03ed,
- 0x03ef, 0x03f3,
- 0x03f5, 0x03f5,
- 0x03f8, 0x03f8,
- 0x03fb, 0x03fc,
- 0x0430, 0x045f,
- 0x0461, 0x0461,
- 0x0463, 0x0463,
- 0x0465, 0x0465,
- 0x0467, 0x0467,
- 0x0469, 0x0469,
- 0x046b, 0x046b,
- 0x046d, 0x046d,
- 0x046f, 0x046f,
- 0x0471, 0x0471,
- 0x0473, 0x0473,
- 0x0475, 0x0475,
- 0x0477, 0x0477,
- 0x0479, 0x0479,
- 0x047b, 0x047b,
- 0x047d, 0x047d,
- 0x047f, 0x047f,
- 0x0481, 0x0481,
- 0x048b, 0x048b,
- 0x048d, 0x048d,
- 0x048f, 0x048f,
- 0x0491, 0x0491,
- 0x0493, 0x0493,
- 0x0495, 0x0495,
- 0x0497, 0x0497,
- 0x0499, 0x0499,
- 0x049b, 0x049b,
- 0x049d, 0x049d,
- 0x049f, 0x049f,
- 0x04a1, 0x04a1,
- 0x04a3, 0x04a3,
- 0x04a5, 0x04a5,
- 0x04a7, 0x04a7,
- 0x04a9, 0x04a9,
- 0x04ab, 0x04ab,
- 0x04ad, 0x04ad,
- 0x04af, 0x04af,
- 0x04b1, 0x04b1,
- 0x04b3, 0x04b3,
- 0x04b5, 0x04b5,
- 0x04b7, 0x04b7,
- 0x04b9, 0x04b9,
- 0x04bb, 0x04bb,
- 0x04bd, 0x04bd,
- 0x04bf, 0x04bf,
- 0x04c2, 0x04c2,
- 0x04c4, 0x04c4,
- 0x04c6, 0x04c6,
- 0x04c8, 0x04c8,
- 0x04ca, 0x04ca,
- 0x04cc, 0x04cc,
- 0x04ce, 0x04cf,
- 0x04d1, 0x04d1,
- 0x04d3, 0x04d3,
- 0x04d5, 0x04d5,
- 0x04d7, 0x04d7,
- 0x04d9, 0x04d9,
- 0x04db, 0x04db,
- 0x04dd, 0x04dd,
- 0x04df, 0x04df,
- 0x04e1, 0x04e1,
- 0x04e3, 0x04e3,
- 0x04e5, 0x04e5,
- 0x04e7, 0x04e7,
- 0x04e9, 0x04e9,
- 0x04eb, 0x04eb,
- 0x04ed, 0x04ed,
- 0x04ef, 0x04ef,
- 0x04f1, 0x04f1,
- 0x04f3, 0x04f3,
- 0x04f5, 0x04f5,
- 0x04f7, 0x04f7,
- 0x04f9, 0x04f9,
- 0x04fb, 0x04fb,
- 0x04fd, 0x04fd,
- 0x04ff, 0x04ff,
- 0x0501, 0x0501,
- 0x0503, 0x0503,
- 0x0505, 0x0505,
- 0x0507, 0x0507,
- 0x0509, 0x0509,
- 0x050b, 0x050b,
- 0x050d, 0x050d,
- 0x050f, 0x050f,
- 0x0511, 0x0511,
- 0x0513, 0x0513,
- 0x0515, 0x0515,
- 0x0517, 0x0517,
- 0x0519, 0x0519,
- 0x051b, 0x051b,
- 0x051d, 0x051d,
- 0x051f, 0x051f,
- 0x0521, 0x0521,
- 0x0523, 0x0523,
- 0x0561, 0x0587,
- 0x1d00, 0x1d2b,
- 0x1d62, 0x1d77,
- 0x1d79, 0x1d9a,
- 0x1e01, 0x1e01,
- 0x1e03, 0x1e03,
- 0x1e05, 0x1e05,
- 0x1e07, 0x1e07,
- 0x1e09, 0x1e09,
- 0x1e0b, 0x1e0b,
- 0x1e0d, 0x1e0d,
- 0x1e0f, 0x1e0f,
- 0x1e11, 0x1e11,
- 0x1e13, 0x1e13,
- 0x1e15, 0x1e15,
- 0x1e17, 0x1e17,
- 0x1e19, 0x1e19,
- 0x1e1b, 0x1e1b,
- 0x1e1d, 0x1e1d,
- 0x1e1f, 0x1e1f,
- 0x1e21, 0x1e21,
- 0x1e23, 0x1e23,
- 0x1e25, 0x1e25,
- 0x1e27, 0x1e27,
- 0x1e29, 0x1e29,
- 0x1e2b, 0x1e2b,
- 0x1e2d, 0x1e2d,
- 0x1e2f, 0x1e2f,
- 0x1e31, 0x1e31,
- 0x1e33, 0x1e33,
- 0x1e35, 0x1e35,
- 0x1e37, 0x1e37,
- 0x1e39, 0x1e39,
- 0x1e3b, 0x1e3b,
- 0x1e3d, 0x1e3d,
- 0x1e3f, 0x1e3f,
- 0x1e41, 0x1e41,
- 0x1e43, 0x1e43,
- 0x1e45, 0x1e45,
- 0x1e47, 0x1e47,
- 0x1e49, 0x1e49,
- 0x1e4b, 0x1e4b,
- 0x1e4d, 0x1e4d,
- 0x1e4f, 0x1e4f,
- 0x1e51, 0x1e51,
- 0x1e53, 0x1e53,
- 0x1e55, 0x1e55,
- 0x1e57, 0x1e57,
- 0x1e59, 0x1e59,
- 0x1e5b, 0x1e5b,
- 0x1e5d, 0x1e5d,
- 0x1e5f, 0x1e5f,
- 0x1e61, 0x1e61,
- 0x1e63, 0x1e63,
- 0x1e65, 0x1e65,
- 0x1e67, 0x1e67,
- 0x1e69, 0x1e69,
- 0x1e6b, 0x1e6b,
- 0x1e6d, 0x1e6d,
- 0x1e6f, 0x1e6f,
- 0x1e71, 0x1e71,
- 0x1e73, 0x1e73,
- 0x1e75, 0x1e75,
- 0x1e77, 0x1e77,
- 0x1e79, 0x1e79,
- 0x1e7b, 0x1e7b,
- 0x1e7d, 0x1e7d,
- 0x1e7f, 0x1e7f,
- 0x1e81, 0x1e81,
- 0x1e83, 0x1e83,
- 0x1e85, 0x1e85,
- 0x1e87, 0x1e87,
- 0x1e89, 0x1e89,
- 0x1e8b, 0x1e8b,
- 0x1e8d, 0x1e8d,
- 0x1e8f, 0x1e8f,
- 0x1e91, 0x1e91,
- 0x1e93, 0x1e93,
- 0x1e95, 0x1e9d,
- 0x1e9f, 0x1e9f,
- 0x1ea1, 0x1ea1,
- 0x1ea3, 0x1ea3,
- 0x1ea5, 0x1ea5,
- 0x1ea7, 0x1ea7,
- 0x1ea9, 0x1ea9,
- 0x1eab, 0x1eab,
- 0x1ead, 0x1ead,
- 0x1eaf, 0x1eaf,
- 0x1eb1, 0x1eb1,
- 0x1eb3, 0x1eb3,
- 0x1eb5, 0x1eb5,
- 0x1eb7, 0x1eb7,
- 0x1eb9, 0x1eb9,
- 0x1ebb, 0x1ebb,
- 0x1ebd, 0x1ebd,
- 0x1ebf, 0x1ebf,
- 0x1ec1, 0x1ec1,
- 0x1ec3, 0x1ec3,
- 0x1ec5, 0x1ec5,
- 0x1ec7, 0x1ec7,
- 0x1ec9, 0x1ec9,
- 0x1ecb, 0x1ecb,
- 0x1ecd, 0x1ecd,
- 0x1ecf, 0x1ecf,
- 0x1ed1, 0x1ed1,
- 0x1ed3, 0x1ed3,
- 0x1ed5, 0x1ed5,
- 0x1ed7, 0x1ed7,
- 0x1ed9, 0x1ed9,
- 0x1edb, 0x1edb,
- 0x1edd, 0x1edd,
- 0x1edf, 0x1edf,
- 0x1ee1, 0x1ee1,
- 0x1ee3, 0x1ee3,
- 0x1ee5, 0x1ee5,
- 0x1ee7, 0x1ee7,
- 0x1ee9, 0x1ee9,
- 0x1eeb, 0x1eeb,
- 0x1eed, 0x1eed,
- 0x1eef, 0x1eef,
- 0x1ef1, 0x1ef1,
- 0x1ef3, 0x1ef3,
- 0x1ef5, 0x1ef5,
- 0x1ef7, 0x1ef7,
- 0x1ef9, 0x1ef9,
- 0x1efb, 0x1efb,
- 0x1efd, 0x1efd,
- 0x1eff, 0x1f07,
- 0x1f10, 0x1f15,
- 0x1f20, 0x1f27,
- 0x1f30, 0x1f37,
- 0x1f40, 0x1f45,
- 0x1f50, 0x1f57,
- 0x1f60, 0x1f67,
- 0x1f70, 0x1f7d,
- 0x1f80, 0x1f87,
- 0x1f90, 0x1f97,
- 0x1fa0, 0x1fa7,
- 0x1fb0, 0x1fb4,
- 0x1fb6, 0x1fb7,
- 0x1fbe, 0x1fbe,
- 0x1fc2, 0x1fc4,
- 0x1fc6, 0x1fc7,
- 0x1fd0, 0x1fd3,
- 0x1fd6, 0x1fd7,
- 0x1fe0, 0x1fe7,
- 0x1ff2, 0x1ff4,
- 0x1ff6, 0x1ff7,
- 0x2071, 0x2071,
- 0x207f, 0x207f,
- 0x210a, 0x210a,
- 0x210e, 0x210f,
- 0x2113, 0x2113,
- 0x212f, 0x212f,
- 0x2134, 0x2134,
- 0x2139, 0x2139,
- 0x213c, 0x213d,
- 0x2146, 0x2149,
- 0x214e, 0x214e,
- 0x2184, 0x2184,
- 0x2c30, 0x2c5e,
- 0x2c61, 0x2c61,
- 0x2c65, 0x2c66,
- 0x2c68, 0x2c68,
- 0x2c6a, 0x2c6a,
- 0x2c6c, 0x2c6c,
- 0x2c71, 0x2c71,
- 0x2c73, 0x2c74,
- 0x2c76, 0x2c7c,
- 0x2c81, 0x2c81,
- 0x2c83, 0x2c83,
- 0x2c85, 0x2c85,
- 0x2c87, 0x2c87,
- 0x2c89, 0x2c89,
- 0x2c8b, 0x2c8b,
- 0x2c8d, 0x2c8d,
- 0x2c8f, 0x2c8f,
- 0x2c91, 0x2c91,
- 0x2c93, 0x2c93,
- 0x2c95, 0x2c95,
- 0x2c97, 0x2c97,
- 0x2c99, 0x2c99,
- 0x2c9b, 0x2c9b,
- 0x2c9d, 0x2c9d,
- 0x2c9f, 0x2c9f,
- 0x2ca1, 0x2ca1,
- 0x2ca3, 0x2ca3,
- 0x2ca5, 0x2ca5,
- 0x2ca7, 0x2ca7,
- 0x2ca9, 0x2ca9,
- 0x2cab, 0x2cab,
- 0x2cad, 0x2cad,
- 0x2caf, 0x2caf,
- 0x2cb1, 0x2cb1,
- 0x2cb3, 0x2cb3,
- 0x2cb5, 0x2cb5,
- 0x2cb7, 0x2cb7,
- 0x2cb9, 0x2cb9,
- 0x2cbb, 0x2cbb,
- 0x2cbd, 0x2cbd,
- 0x2cbf, 0x2cbf,
- 0x2cc1, 0x2cc1,
- 0x2cc3, 0x2cc3,
- 0x2cc5, 0x2cc5,
- 0x2cc7, 0x2cc7,
- 0x2cc9, 0x2cc9,
- 0x2ccb, 0x2ccb,
- 0x2ccd, 0x2ccd,
- 0x2ccf, 0x2ccf,
- 0x2cd1, 0x2cd1,
- 0x2cd3, 0x2cd3,
- 0x2cd5, 0x2cd5,
- 0x2cd7, 0x2cd7,
- 0x2cd9, 0x2cd9,
- 0x2cdb, 0x2cdb,
- 0x2cdd, 0x2cdd,
- 0x2cdf, 0x2cdf,
- 0x2ce1, 0x2ce1,
- 0x2ce3, 0x2ce4,
- 0x2d00, 0x2d25,
- 0xa641, 0xa641,
- 0xa643, 0xa643,
- 0xa645, 0xa645,
- 0xa647, 0xa647,
- 0xa649, 0xa649,
- 0xa64b, 0xa64b,
- 0xa64d, 0xa64d,
- 0xa64f, 0xa64f,
- 0xa651, 0xa651,
- 0xa653, 0xa653,
- 0xa655, 0xa655,
- 0xa657, 0xa657,
- 0xa659, 0xa659,
- 0xa65b, 0xa65b,
- 0xa65d, 0xa65d,
- 0xa65f, 0xa65f,
- 0xa663, 0xa663,
- 0xa665, 0xa665,
- 0xa667, 0xa667,
- 0xa669, 0xa669,
- 0xa66b, 0xa66b,
- 0xa66d, 0xa66d,
- 0xa681, 0xa681,
- 0xa683, 0xa683,
- 0xa685, 0xa685,
- 0xa687, 0xa687,
- 0xa689, 0xa689,
- 0xa68b, 0xa68b,
- 0xa68d, 0xa68d,
- 0xa68f, 0xa68f,
- 0xa691, 0xa691,
- 0xa693, 0xa693,
- 0xa695, 0xa695,
- 0xa697, 0xa697,
- 0xa723, 0xa723,
- 0xa725, 0xa725,
- 0xa727, 0xa727,
- 0xa729, 0xa729,
- 0xa72b, 0xa72b,
- 0xa72d, 0xa72d,
- 0xa72f, 0xa731,
- 0xa733, 0xa733,
- 0xa735, 0xa735,
- 0xa737, 0xa737,
- 0xa739, 0xa739,
- 0xa73b, 0xa73b,
- 0xa73d, 0xa73d,
- 0xa73f, 0xa73f,
- 0xa741, 0xa741,
- 0xa743, 0xa743,
- 0xa745, 0xa745,
- 0xa747, 0xa747,
- 0xa749, 0xa749,
- 0xa74b, 0xa74b,
- 0xa74d, 0xa74d,
- 0xa74f, 0xa74f,
- 0xa751, 0xa751,
- 0xa753, 0xa753,
- 0xa755, 0xa755,
- 0xa757, 0xa757,
- 0xa759, 0xa759,
- 0xa75b, 0xa75b,
- 0xa75d, 0xa75d,
- 0xa75f, 0xa75f,
- 0xa761, 0xa761,
- 0xa763, 0xa763,
- 0xa765, 0xa765,
- 0xa767, 0xa767,
- 0xa769, 0xa769,
- 0xa76b, 0xa76b,
- 0xa76d, 0xa76d,
- 0xa76f, 0xa76f,
- 0xa771, 0xa778,
- 0xa77a, 0xa77a,
- 0xa77c, 0xa77c,
- 0xa77f, 0xa77f,
- 0xa781, 0xa781,
- 0xa783, 0xa783,
- 0xa785, 0xa785,
- 0xa787, 0xa787,
- 0xa78c, 0xa78c,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xff41, 0xff5a,
- 0x10428, 0x1044f,
- 0x1d41a, 0x1d433,
- 0x1d44e, 0x1d454,
- 0x1d456, 0x1d467,
- 0x1d482, 0x1d49b,
- 0x1d4b6, 0x1d4b9,
- 0x1d4bb, 0x1d4bb,
- 0x1d4bd, 0x1d4c3,
- 0x1d4c5, 0x1d4cf,
- 0x1d4ea, 0x1d503,
- 0x1d51e, 0x1d537,
- 0x1d552, 0x1d56b,
- 0x1d586, 0x1d59f,
- 0x1d5ba, 0x1d5d3,
- 0x1d5ee, 0x1d607,
- 0x1d622, 0x1d63b,
- 0x1d656, 0x1d66f,
- 0x1d68a, 0x1d6a5,
- 0x1d6c2, 0x1d6da,
- 0x1d6dc, 0x1d6e1,
- 0x1d6fc, 0x1d714,
- 0x1d716, 0x1d71b,
- 0x1d736, 0x1d74e,
- 0x1d750, 0x1d755,
- 0x1d770, 0x1d788,
- 0x1d78a, 0x1d78f,
- 0x1d7aa, 0x1d7c2,
- 0x1d7c4, 0x1d7c9,
- 0x1d7cb, 0x1d7cb,
-}; /* CR_Ll */
-
-/* 'Lm': General Category */
-static const OnigCodePoint CR_Lm[] = {
- 39,
- 0x02b0, 0x02c1,
- 0x02c6, 0x02d1,
- 0x02e0, 0x02e4,
- 0x02ec, 0x02ec,
- 0x02ee, 0x02ee,
- 0x0374, 0x0374,
- 0x037a, 0x037a,
- 0x0559, 0x0559,
- 0x0640, 0x0640,
- 0x06e5, 0x06e6,
- 0x07f4, 0x07f5,
- 0x07fa, 0x07fa,
- 0x0971, 0x0971,
- 0x0e46, 0x0e46,
- 0x0ec6, 0x0ec6,
- 0x10fc, 0x10fc,
- 0x17d7, 0x17d7,
- 0x1843, 0x1843,
- 0x1c78, 0x1c7d,
- 0x1d2c, 0x1d61,
- 0x1d78, 0x1d78,
- 0x1d9b, 0x1dbf,
- 0x2090, 0x2094,
- 0x2c7d, 0x2c7d,
- 0x2d6f, 0x2d6f,
- 0x2e2f, 0x2e2f,
- 0x3005, 0x3005,
- 0x3031, 0x3035,
- 0x303b, 0x303b,
- 0x309d, 0x309e,
- 0x30fc, 0x30fe,
- 0xa015, 0xa015,
- 0xa60c, 0xa60c,
- 0xa67f, 0xa67f,
- 0xa717, 0xa71f,
- 0xa770, 0xa770,
- 0xa788, 0xa788,
- 0xff70, 0xff70,
- 0xff9e, 0xff9f,
-}; /* CR_Lm */
-
-/* 'Lo': General Category */
-static const OnigCodePoint CR_Lo[] = {
- 286,
- 0x01bb, 0x01bb,
- 0x01c0, 0x01c3,
- 0x0294, 0x0294,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f2,
- 0x0621, 0x063f,
- 0x0641, 0x064a,
- 0x066e, 0x066f,
- 0x0671, 0x06d3,
- 0x06d5, 0x06d5,
- 0x06ee, 0x06ef,
- 0x06fa, 0x06fc,
- 0x06ff, 0x06ff,
- 0x0710, 0x0710,
- 0x0712, 0x072f,
- 0x074d, 0x07a5,
- 0x07b1, 0x07b1,
- 0x07ca, 0x07ea,
- 0x0904, 0x0939,
- 0x093d, 0x093d,
- 0x0950, 0x0950,
- 0x0958, 0x0961,
- 0x0972, 0x0972,
- 0x097b, 0x097f,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bd, 0x09bd,
- 0x09ce, 0x09ce,
- 0x09dc, 0x09dd,
- 0x09df, 0x09e1,
- 0x09f0, 0x09f1,
- 0x0a05, 0x0a0a,
- 0x0a0f, 0x0a10,
- 0x0a13, 0x0a28,
- 0x0a2a, 0x0a30,
- 0x0a32, 0x0a33,
- 0x0a35, 0x0a36,
- 0x0a38, 0x0a39,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a72, 0x0a74,
- 0x0a85, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abd, 0x0abd,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae1,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b35, 0x0b39,
- 0x0b3d, 0x0b3d,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b61,
- 0x0b71, 0x0b71,
- 0x0b83, 0x0b83,
- 0x0b85, 0x0b8a,
- 0x0b8e, 0x0b90,
- 0x0b92, 0x0b95,
- 0x0b99, 0x0b9a,
- 0x0b9c, 0x0b9c,
- 0x0b9e, 0x0b9f,
- 0x0ba3, 0x0ba4,
- 0x0ba8, 0x0baa,
- 0x0bae, 0x0bb9,
- 0x0bd0, 0x0bd0,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3d, 0x0c3d,
- 0x0c58, 0x0c59,
- 0x0c60, 0x0c61,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbd, 0x0cbd,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce1,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3d, 0x0d3d,
- 0x0d60, 0x0d61,
- 0x0d7a, 0x0d7f,
- 0x0d85, 0x0d96,
- 0x0d9a, 0x0db1,
- 0x0db3, 0x0dbb,
- 0x0dbd, 0x0dbd,
- 0x0dc0, 0x0dc6,
- 0x0e01, 0x0e30,
- 0x0e32, 0x0e33,
- 0x0e40, 0x0e45,
- 0x0e81, 0x0e82,
- 0x0e84, 0x0e84,
- 0x0e87, 0x0e88,
- 0x0e8a, 0x0e8a,
- 0x0e8d, 0x0e8d,
- 0x0e94, 0x0e97,
- 0x0e99, 0x0e9f,
- 0x0ea1, 0x0ea3,
- 0x0ea5, 0x0ea5,
- 0x0ea7, 0x0ea7,
- 0x0eaa, 0x0eab,
- 0x0ead, 0x0eb0,
- 0x0eb2, 0x0eb3,
- 0x0ebd, 0x0ebd,
- 0x0ec0, 0x0ec4,
- 0x0edc, 0x0edd,
- 0x0f00, 0x0f00,
- 0x0f40, 0x0f47,
- 0x0f49, 0x0f6c,
- 0x0f88, 0x0f8b,
- 0x1000, 0x102a,
- 0x103f, 0x103f,
- 0x1050, 0x1055,
- 0x105a, 0x105d,
- 0x1061, 0x1061,
- 0x1065, 0x1066,
- 0x106e, 0x1070,
- 0x1075, 0x1081,
- 0x108e, 0x108e,
- 0x10d0, 0x10fa,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x1200, 0x1248,
- 0x124a, 0x124d,
- 0x1250, 0x1256,
- 0x1258, 0x1258,
- 0x125a, 0x125d,
- 0x1260, 0x1288,
- 0x128a, 0x128d,
- 0x1290, 0x12b0,
- 0x12b2, 0x12b5,
- 0x12b8, 0x12be,
- 0x12c0, 0x12c0,
- 0x12c2, 0x12c5,
- 0x12c8, 0x12d6,
- 0x12d8, 0x1310,
- 0x1312, 0x1315,
- 0x1318, 0x135a,
- 0x1380, 0x138f,
- 0x13a0, 0x13f4,
- 0x1401, 0x166c,
- 0x166f, 0x1676,
- 0x1681, 0x169a,
- 0x16a0, 0x16ea,
- 0x1700, 0x170c,
- 0x170e, 0x1711,
- 0x1720, 0x1731,
- 0x1740, 0x1751,
- 0x1760, 0x176c,
- 0x176e, 0x1770,
- 0x1780, 0x17b3,
- 0x17dc, 0x17dc,
- 0x1820, 0x1842,
- 0x1844, 0x1877,
- 0x1880, 0x18a8,
- 0x18aa, 0x18aa,
- 0x1900, 0x191c,
- 0x1950, 0x196d,
- 0x1970, 0x1974,
- 0x1980, 0x19a9,
- 0x19c1, 0x19c7,
- 0x1a00, 0x1a16,
- 0x1b05, 0x1b33,
- 0x1b45, 0x1b4b,
- 0x1b83, 0x1ba0,
- 0x1bae, 0x1baf,
- 0x1c00, 0x1c23,
- 0x1c4d, 0x1c4f,
- 0x1c5a, 0x1c77,
- 0x2135, 0x2138,
- 0x2d30, 0x2d65,
- 0x2d80, 0x2d96,
- 0x2da0, 0x2da6,
- 0x2da8, 0x2dae,
- 0x2db0, 0x2db6,
- 0x2db8, 0x2dbe,
- 0x2dc0, 0x2dc6,
- 0x2dc8, 0x2dce,
- 0x2dd0, 0x2dd6,
- 0x2dd8, 0x2dde,
- 0x3006, 0x3006,
- 0x303c, 0x303c,
- 0x3041, 0x3096,
- 0x309f, 0x309f,
- 0x30a1, 0x30fa,
- 0x30ff, 0x30ff,
- 0x3105, 0x312d,
- 0x3131, 0x318e,
- 0x31a0, 0x31b7,
- 0x31f0, 0x31ff,
- 0x3400, 0x3400,
- 0x4db5, 0x4db5,
- 0x4e00, 0x4e00,
- 0x9fc3, 0x9fc3,
- 0xa000, 0xa014,
- 0xa016, 0xa48c,
- 0xa500, 0xa60b,
- 0xa610, 0xa61f,
- 0xa62a, 0xa62b,
- 0xa66e, 0xa66e,
- 0xa7fb, 0xa801,
- 0xa803, 0xa805,
- 0xa807, 0xa80a,
- 0xa80c, 0xa822,
- 0xa840, 0xa873,
- 0xa882, 0xa8b3,
- 0xa90a, 0xa925,
- 0xa930, 0xa946,
- 0xaa00, 0xaa28,
- 0xaa40, 0xaa42,
- 0xaa44, 0xaa4b,
- 0xac00, 0xac00,
- 0xd7a3, 0xd7a3,
- 0xf900, 0xfa2d,
- 0xfa30, 0xfa6a,
- 0xfa70, 0xfad9,
- 0xfb1d, 0xfb1d,
- 0xfb1f, 0xfb28,
- 0xfb2a, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbb1,
- 0xfbd3, 0xfd3d,
- 0xfd50, 0xfd8f,
- 0xfd92, 0xfdc7,
- 0xfdf0, 0xfdfb,
- 0xfe70, 0xfe74,
- 0xfe76, 0xfefc,
- 0xff66, 0xff6f,
- 0xff71, 0xff9d,
- 0xffa0, 0xffbe,
- 0xffc2, 0xffc7,
- 0xffca, 0xffcf,
- 0xffd2, 0xffd7,
- 0xffda, 0xffdc,
- 0x10000, 0x1000b,
- 0x1000d, 0x10026,
- 0x10028, 0x1003a,
- 0x1003c, 0x1003d,
- 0x1003f, 0x1004d,
- 0x10050, 0x1005d,
- 0x10080, 0x100fa,
- 0x10280, 0x1029c,
- 0x102a0, 0x102d0,
- 0x10300, 0x1031e,
- 0x10330, 0x10340,
- 0x10342, 0x10349,
- 0x10380, 0x1039d,
- 0x103a0, 0x103c3,
- 0x103c8, 0x103cf,
- 0x10450, 0x1049d,
- 0x10800, 0x10805,
- 0x10808, 0x10808,
- 0x1080a, 0x10835,
- 0x10837, 0x10838,
- 0x1083c, 0x1083c,
- 0x1083f, 0x1083f,
- 0x10900, 0x10915,
- 0x10920, 0x10939,
- 0x10a00, 0x10a00,
- 0x10a10, 0x10a13,
- 0x10a15, 0x10a17,
- 0x10a19, 0x10a33,
- 0x12000, 0x1236e,
- 0x20000, 0x20000,
- 0x2a6d6, 0x2a6d6,
- 0x2f800, 0x2fa1d,
-}; /* CR_Lo */
-
-/* 'Lt': General Category */
-static const OnigCodePoint CR_Lt[] = {
- 10,
- 0x01c5, 0x01c5,
- 0x01c8, 0x01c8,
- 0x01cb, 0x01cb,
- 0x01f2, 0x01f2,
- 0x1f88, 0x1f8f,
- 0x1f98, 0x1f9f,
- 0x1fa8, 0x1faf,
- 0x1fbc, 0x1fbc,
- 0x1fcc, 0x1fcc,
- 0x1ffc, 0x1ffc,
-}; /* CR_Lt */
-
-/* 'Lu': General Category */
-static const OnigCodePoint CR_Lu[] = {
- 591,
- 0x0041, 0x005a,
- 0x00c0, 0x00d6,
- 0x00d8, 0x00de,
- 0x0100, 0x0100,
- 0x0102, 0x0102,
- 0x0104, 0x0104,
- 0x0106, 0x0106,
- 0x0108, 0x0108,
- 0x010a, 0x010a,
- 0x010c, 0x010c,
- 0x010e, 0x010e,
- 0x0110, 0x0110,
- 0x0112, 0x0112,
- 0x0114, 0x0114,
- 0x0116, 0x0116,
- 0x0118, 0x0118,
- 0x011a, 0x011a,
- 0x011c, 0x011c,
- 0x011e, 0x011e,
- 0x0120, 0x0120,
- 0x0122, 0x0122,
- 0x0124, 0x0124,
- 0x0126, 0x0126,
- 0x0128, 0x0128,
- 0x012a, 0x012a,
- 0x012c, 0x012c,
- 0x012e, 0x012e,
- 0x0130, 0x0130,
- 0x0132, 0x0132,
- 0x0134, 0x0134,
- 0x0136, 0x0136,
- 0x0139, 0x0139,
- 0x013b, 0x013b,
- 0x013d, 0x013d,
- 0x013f, 0x013f,
- 0x0141, 0x0141,
- 0x0143, 0x0143,
- 0x0145, 0x0145,
- 0x0147, 0x0147,
- 0x014a, 0x014a,
- 0x014c, 0x014c,
- 0x014e, 0x014e,
- 0x0150, 0x0150,
- 0x0152, 0x0152,
- 0x0154, 0x0154,
- 0x0156, 0x0156,
- 0x0158, 0x0158,
- 0x015a, 0x015a,
- 0x015c, 0x015c,
- 0x015e, 0x015e,
- 0x0160, 0x0160,
- 0x0162, 0x0162,
- 0x0164, 0x0164,
- 0x0166, 0x0166,
- 0x0168, 0x0168,
- 0x016a, 0x016a,
- 0x016c, 0x016c,
- 0x016e, 0x016e,
- 0x0170, 0x0170,
- 0x0172, 0x0172,
- 0x0174, 0x0174,
- 0x0176, 0x0176,
- 0x0178, 0x0179,
- 0x017b, 0x017b,
- 0x017d, 0x017d,
- 0x0181, 0x0182,
- 0x0184, 0x0184,
- 0x0186, 0x0187,
- 0x0189, 0x018b,
- 0x018e, 0x0191,
- 0x0193, 0x0194,
- 0x0196, 0x0198,
- 0x019c, 0x019d,
- 0x019f, 0x01a0,
- 0x01a2, 0x01a2,
- 0x01a4, 0x01a4,
- 0x01a6, 0x01a7,
- 0x01a9, 0x01a9,
- 0x01ac, 0x01ac,
- 0x01ae, 0x01af,
- 0x01b1, 0x01b3,
- 0x01b5, 0x01b5,
- 0x01b7, 0x01b8,
- 0x01bc, 0x01bc,
- 0x01c4, 0x01c4,
- 0x01c7, 0x01c7,
- 0x01ca, 0x01ca,
- 0x01cd, 0x01cd,
- 0x01cf, 0x01cf,
- 0x01d1, 0x01d1,
- 0x01d3, 0x01d3,
- 0x01d5, 0x01d5,
- 0x01d7, 0x01d7,
- 0x01d9, 0x01d9,
- 0x01db, 0x01db,
- 0x01de, 0x01de,
- 0x01e0, 0x01e0,
- 0x01e2, 0x01e2,
- 0x01e4, 0x01e4,
- 0x01e6, 0x01e6,
- 0x01e8, 0x01e8,
- 0x01ea, 0x01ea,
- 0x01ec, 0x01ec,
- 0x01ee, 0x01ee,
- 0x01f1, 0x01f1,
- 0x01f4, 0x01f4,
- 0x01f6, 0x01f8,
- 0x01fa, 0x01fa,
- 0x01fc, 0x01fc,
- 0x01fe, 0x01fe,
- 0x0200, 0x0200,
- 0x0202, 0x0202,
- 0x0204, 0x0204,
- 0x0206, 0x0206,
- 0x0208, 0x0208,
- 0x020a, 0x020a,
- 0x020c, 0x020c,
- 0x020e, 0x020e,
- 0x0210, 0x0210,
- 0x0212, 0x0212,
- 0x0214, 0x0214,
- 0x0216, 0x0216,
- 0x0218, 0x0218,
- 0x021a, 0x021a,
- 0x021c, 0x021c,
- 0x021e, 0x021e,
- 0x0220, 0x0220,
- 0x0222, 0x0222,
- 0x0224, 0x0224,
- 0x0226, 0x0226,
- 0x0228, 0x0228,
- 0x022a, 0x022a,
- 0x022c, 0x022c,
- 0x022e, 0x022e,
- 0x0230, 0x0230,
- 0x0232, 0x0232,
- 0x023a, 0x023b,
- 0x023d, 0x023e,
- 0x0241, 0x0241,
- 0x0243, 0x0246,
- 0x0248, 0x0248,
- 0x024a, 0x024a,
- 0x024c, 0x024c,
- 0x024e, 0x024e,
- 0x0370, 0x0370,
- 0x0372, 0x0372,
- 0x0376, 0x0376,
- 0x0386, 0x0386,
- 0x0388, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x038f,
- 0x0391, 0x03a1,
- 0x03a3, 0x03ab,
- 0x03cf, 0x03cf,
- 0x03d2, 0x03d4,
- 0x03d8, 0x03d8,
- 0x03da, 0x03da,
- 0x03dc, 0x03dc,
- 0x03de, 0x03de,
- 0x03e0, 0x03e0,
- 0x03e2, 0x03e2,
- 0x03e4, 0x03e4,
- 0x03e6, 0x03e6,
- 0x03e8, 0x03e8,
- 0x03ea, 0x03ea,
- 0x03ec, 0x03ec,
- 0x03ee, 0x03ee,
- 0x03f4, 0x03f4,
- 0x03f7, 0x03f7,
- 0x03f9, 0x03fa,
- 0x03fd, 0x042f,
- 0x0460, 0x0460,
- 0x0462, 0x0462,
- 0x0464, 0x0464,
- 0x0466, 0x0466,
- 0x0468, 0x0468,
- 0x046a, 0x046a,
- 0x046c, 0x046c,
- 0x046e, 0x046e,
- 0x0470, 0x0470,
- 0x0472, 0x0472,
- 0x0474, 0x0474,
- 0x0476, 0x0476,
- 0x0478, 0x0478,
- 0x047a, 0x047a,
- 0x047c, 0x047c,
- 0x047e, 0x047e,
- 0x0480, 0x0480,
- 0x048a, 0x048a,
- 0x048c, 0x048c,
- 0x048e, 0x048e,
- 0x0490, 0x0490,
- 0x0492, 0x0492,
- 0x0494, 0x0494,
- 0x0496, 0x0496,
- 0x0498, 0x0498,
- 0x049a, 0x049a,
- 0x049c, 0x049c,
- 0x049e, 0x049e,
- 0x04a0, 0x04a0,
- 0x04a2, 0x04a2,
- 0x04a4, 0x04a4,
- 0x04a6, 0x04a6,
- 0x04a8, 0x04a8,
- 0x04aa, 0x04aa,
- 0x04ac, 0x04ac,
- 0x04ae, 0x04ae,
- 0x04b0, 0x04b0,
- 0x04b2, 0x04b2,
- 0x04b4, 0x04b4,
- 0x04b6, 0x04b6,
- 0x04b8, 0x04b8,
- 0x04ba, 0x04ba,
- 0x04bc, 0x04bc,
- 0x04be, 0x04be,
- 0x04c0, 0x04c1,
- 0x04c3, 0x04c3,
- 0x04c5, 0x04c5,
- 0x04c7, 0x04c7,
- 0x04c9, 0x04c9,
- 0x04cb, 0x04cb,
- 0x04cd, 0x04cd,
- 0x04d0, 0x04d0,
- 0x04d2, 0x04d2,
- 0x04d4, 0x04d4,
- 0x04d6, 0x04d6,
- 0x04d8, 0x04d8,
- 0x04da, 0x04da,
- 0x04dc, 0x04dc,
- 0x04de, 0x04de,
- 0x04e0, 0x04e0,
- 0x04e2, 0x04e2,
- 0x04e4, 0x04e4,
- 0x04e6, 0x04e6,
- 0x04e8, 0x04e8,
- 0x04ea, 0x04ea,
- 0x04ec, 0x04ec,
- 0x04ee, 0x04ee,
- 0x04f0, 0x04f0,
- 0x04f2, 0x04f2,
- 0x04f4, 0x04f4,
- 0x04f6, 0x04f6,
- 0x04f8, 0x04f8,
- 0x04fa, 0x04fa,
- 0x04fc, 0x04fc,
- 0x04fe, 0x04fe,
- 0x0500, 0x0500,
- 0x0502, 0x0502,
- 0x0504, 0x0504,
- 0x0506, 0x0506,
- 0x0508, 0x0508,
- 0x050a, 0x050a,
- 0x050c, 0x050c,
- 0x050e, 0x050e,
- 0x0510, 0x0510,
- 0x0512, 0x0512,
- 0x0514, 0x0514,
- 0x0516, 0x0516,
- 0x0518, 0x0518,
- 0x051a, 0x051a,
- 0x051c, 0x051c,
- 0x051e, 0x051e,
- 0x0520, 0x0520,
- 0x0522, 0x0522,
- 0x0531, 0x0556,
- 0x10a0, 0x10c5,
- 0x1e00, 0x1e00,
- 0x1e02, 0x1e02,
- 0x1e04, 0x1e04,
- 0x1e06, 0x1e06,
- 0x1e08, 0x1e08,
- 0x1e0a, 0x1e0a,
- 0x1e0c, 0x1e0c,
- 0x1e0e, 0x1e0e,
- 0x1e10, 0x1e10,
- 0x1e12, 0x1e12,
- 0x1e14, 0x1e14,
- 0x1e16, 0x1e16,
- 0x1e18, 0x1e18,
- 0x1e1a, 0x1e1a,
- 0x1e1c, 0x1e1c,
- 0x1e1e, 0x1e1e,
- 0x1e20, 0x1e20,
- 0x1e22, 0x1e22,
- 0x1e24, 0x1e24,
- 0x1e26, 0x1e26,
- 0x1e28, 0x1e28,
- 0x1e2a, 0x1e2a,
- 0x1e2c, 0x1e2c,
- 0x1e2e, 0x1e2e,
- 0x1e30, 0x1e30,
- 0x1e32, 0x1e32,
- 0x1e34, 0x1e34,
- 0x1e36, 0x1e36,
- 0x1e38, 0x1e38,
- 0x1e3a, 0x1e3a,
- 0x1e3c, 0x1e3c,
- 0x1e3e, 0x1e3e,
- 0x1e40, 0x1e40,
- 0x1e42, 0x1e42,
- 0x1e44, 0x1e44,
- 0x1e46, 0x1e46,
- 0x1e48, 0x1e48,
- 0x1e4a, 0x1e4a,
- 0x1e4c, 0x1e4c,
- 0x1e4e, 0x1e4e,
- 0x1e50, 0x1e50,
- 0x1e52, 0x1e52,
- 0x1e54, 0x1e54,
- 0x1e56, 0x1e56,
- 0x1e58, 0x1e58,
- 0x1e5a, 0x1e5a,
- 0x1e5c, 0x1e5c,
- 0x1e5e, 0x1e5e,
- 0x1e60, 0x1e60,
- 0x1e62, 0x1e62,
- 0x1e64, 0x1e64,
- 0x1e66, 0x1e66,
- 0x1e68, 0x1e68,
- 0x1e6a, 0x1e6a,
- 0x1e6c, 0x1e6c,
- 0x1e6e, 0x1e6e,
- 0x1e70, 0x1e70,
- 0x1e72, 0x1e72,
- 0x1e74, 0x1e74,
- 0x1e76, 0x1e76,
- 0x1e78, 0x1e78,
- 0x1e7a, 0x1e7a,
- 0x1e7c, 0x1e7c,
- 0x1e7e, 0x1e7e,
- 0x1e80, 0x1e80,
- 0x1e82, 0x1e82,
- 0x1e84, 0x1e84,
- 0x1e86, 0x1e86,
- 0x1e88, 0x1e88,
- 0x1e8a, 0x1e8a,
- 0x1e8c, 0x1e8c,
- 0x1e8e, 0x1e8e,
- 0x1e90, 0x1e90,
- 0x1e92, 0x1e92,
- 0x1e94, 0x1e94,
- 0x1e9e, 0x1e9e,
- 0x1ea0, 0x1ea0,
- 0x1ea2, 0x1ea2,
- 0x1ea4, 0x1ea4,
- 0x1ea6, 0x1ea6,
- 0x1ea8, 0x1ea8,
- 0x1eaa, 0x1eaa,
- 0x1eac, 0x1eac,
- 0x1eae, 0x1eae,
- 0x1eb0, 0x1eb0,
- 0x1eb2, 0x1eb2,
- 0x1eb4, 0x1eb4,
- 0x1eb6, 0x1eb6,
- 0x1eb8, 0x1eb8,
- 0x1eba, 0x1eba,
- 0x1ebc, 0x1ebc,
- 0x1ebe, 0x1ebe,
- 0x1ec0, 0x1ec0,
- 0x1ec2, 0x1ec2,
- 0x1ec4, 0x1ec4,
- 0x1ec6, 0x1ec6,
- 0x1ec8, 0x1ec8,
- 0x1eca, 0x1eca,
- 0x1ecc, 0x1ecc,
- 0x1ece, 0x1ece,
- 0x1ed0, 0x1ed0,
- 0x1ed2, 0x1ed2,
- 0x1ed4, 0x1ed4,
- 0x1ed6, 0x1ed6,
- 0x1ed8, 0x1ed8,
- 0x1eda, 0x1eda,
- 0x1edc, 0x1edc,
- 0x1ede, 0x1ede,
- 0x1ee0, 0x1ee0,
- 0x1ee2, 0x1ee2,
- 0x1ee4, 0x1ee4,
- 0x1ee6, 0x1ee6,
- 0x1ee8, 0x1ee8,
- 0x1eea, 0x1eea,
- 0x1eec, 0x1eec,
- 0x1eee, 0x1eee,
- 0x1ef0, 0x1ef0,
- 0x1ef2, 0x1ef2,
- 0x1ef4, 0x1ef4,
- 0x1ef6, 0x1ef6,
- 0x1ef8, 0x1ef8,
- 0x1efa, 0x1efa,
- 0x1efc, 0x1efc,
- 0x1efe, 0x1efe,
- 0x1f08, 0x1f0f,
- 0x1f18, 0x1f1d,
- 0x1f28, 0x1f2f,
- 0x1f38, 0x1f3f,
- 0x1f48, 0x1f4d,
- 0x1f59, 0x1f59,
- 0x1f5b, 0x1f5b,
- 0x1f5d, 0x1f5d,
- 0x1f5f, 0x1f5f,
- 0x1f68, 0x1f6f,
- 0x1fb8, 0x1fbb,
- 0x1fc8, 0x1fcb,
- 0x1fd8, 0x1fdb,
- 0x1fe8, 0x1fec,
- 0x1ff8, 0x1ffb,
- 0x2102, 0x2102,
- 0x2107, 0x2107,
- 0x210b, 0x210d,
- 0x2110, 0x2112,
- 0x2115, 0x2115,
- 0x2119, 0x211d,
- 0x2124, 0x2124,
- 0x2126, 0x2126,
- 0x2128, 0x2128,
- 0x212a, 0x212d,
- 0x2130, 0x2133,
- 0x213e, 0x213f,
- 0x2145, 0x2145,
- 0x2183, 0x2183,
- 0x2c00, 0x2c2e,
- 0x2c60, 0x2c60,
- 0x2c62, 0x2c64,
- 0x2c67, 0x2c67,
- 0x2c69, 0x2c69,
- 0x2c6b, 0x2c6b,
- 0x2c6d, 0x2c6f,
- 0x2c72, 0x2c72,
- 0x2c75, 0x2c75,
- 0x2c80, 0x2c80,
- 0x2c82, 0x2c82,
- 0x2c84, 0x2c84,
- 0x2c86, 0x2c86,
- 0x2c88, 0x2c88,
- 0x2c8a, 0x2c8a,
- 0x2c8c, 0x2c8c,
- 0x2c8e, 0x2c8e,
- 0x2c90, 0x2c90,
- 0x2c92, 0x2c92,
- 0x2c94, 0x2c94,
- 0x2c96, 0x2c96,
- 0x2c98, 0x2c98,
- 0x2c9a, 0x2c9a,
- 0x2c9c, 0x2c9c,
- 0x2c9e, 0x2c9e,
- 0x2ca0, 0x2ca0,
- 0x2ca2, 0x2ca2,
- 0x2ca4, 0x2ca4,
- 0x2ca6, 0x2ca6,
- 0x2ca8, 0x2ca8,
- 0x2caa, 0x2caa,
- 0x2cac, 0x2cac,
- 0x2cae, 0x2cae,
- 0x2cb0, 0x2cb0,
- 0x2cb2, 0x2cb2,
- 0x2cb4, 0x2cb4,
- 0x2cb6, 0x2cb6,
- 0x2cb8, 0x2cb8,
- 0x2cba, 0x2cba,
- 0x2cbc, 0x2cbc,
- 0x2cbe, 0x2cbe,
- 0x2cc0, 0x2cc0,
- 0x2cc2, 0x2cc2,
- 0x2cc4, 0x2cc4,
- 0x2cc6, 0x2cc6,
- 0x2cc8, 0x2cc8,
- 0x2cca, 0x2cca,
- 0x2ccc, 0x2ccc,
- 0x2cce, 0x2cce,
- 0x2cd0, 0x2cd0,
- 0x2cd2, 0x2cd2,
- 0x2cd4, 0x2cd4,
- 0x2cd6, 0x2cd6,
- 0x2cd8, 0x2cd8,
- 0x2cda, 0x2cda,
- 0x2cdc, 0x2cdc,
- 0x2cde, 0x2cde,
- 0x2ce0, 0x2ce0,
- 0x2ce2, 0x2ce2,
- 0xa640, 0xa640,
- 0xa642, 0xa642,
- 0xa644, 0xa644,
- 0xa646, 0xa646,
- 0xa648, 0xa648,
- 0xa64a, 0xa64a,
- 0xa64c, 0xa64c,
- 0xa64e, 0xa64e,
- 0xa650, 0xa650,
- 0xa652, 0xa652,
- 0xa654, 0xa654,
- 0xa656, 0xa656,
- 0xa658, 0xa658,
- 0xa65a, 0xa65a,
- 0xa65c, 0xa65c,
- 0xa65e, 0xa65e,
- 0xa662, 0xa662,
- 0xa664, 0xa664,
- 0xa666, 0xa666,
- 0xa668, 0xa668,
- 0xa66a, 0xa66a,
- 0xa66c, 0xa66c,
- 0xa680, 0xa680,
- 0xa682, 0xa682,
- 0xa684, 0xa684,
- 0xa686, 0xa686,
- 0xa688, 0xa688,
- 0xa68a, 0xa68a,
- 0xa68c, 0xa68c,
- 0xa68e, 0xa68e,
- 0xa690, 0xa690,
- 0xa692, 0xa692,
- 0xa694, 0xa694,
- 0xa696, 0xa696,
- 0xa722, 0xa722,
- 0xa724, 0xa724,
- 0xa726, 0xa726,
- 0xa728, 0xa728,
- 0xa72a, 0xa72a,
- 0xa72c, 0xa72c,
- 0xa72e, 0xa72e,
- 0xa732, 0xa732,
- 0xa734, 0xa734,
- 0xa736, 0xa736,
- 0xa738, 0xa738,
- 0xa73a, 0xa73a,
- 0xa73c, 0xa73c,
- 0xa73e, 0xa73e,
- 0xa740, 0xa740,
- 0xa742, 0xa742,
- 0xa744, 0xa744,
- 0xa746, 0xa746,
- 0xa748, 0xa748,
- 0xa74a, 0xa74a,
- 0xa74c, 0xa74c,
- 0xa74e, 0xa74e,
- 0xa750, 0xa750,
- 0xa752, 0xa752,
- 0xa754, 0xa754,
- 0xa756, 0xa756,
- 0xa758, 0xa758,
- 0xa75a, 0xa75a,
- 0xa75c, 0xa75c,
- 0xa75e, 0xa75e,
- 0xa760, 0xa760,
- 0xa762, 0xa762,
- 0xa764, 0xa764,
- 0xa766, 0xa766,
- 0xa768, 0xa768,
- 0xa76a, 0xa76a,
- 0xa76c, 0xa76c,
- 0xa76e, 0xa76e,
- 0xa779, 0xa779,
- 0xa77b, 0xa77b,
- 0xa77d, 0xa77e,
- 0xa780, 0xa780,
- 0xa782, 0xa782,
- 0xa784, 0xa784,
- 0xa786, 0xa786,
- 0xa78b, 0xa78b,
- 0xff21, 0xff3a,
- 0x10400, 0x10427,
- 0x1d400, 0x1d419,
- 0x1d434, 0x1d44d,
- 0x1d468, 0x1d481,
- 0x1d49c, 0x1d49c,
- 0x1d49e, 0x1d49f,
- 0x1d4a2, 0x1d4a2,
- 0x1d4a5, 0x1d4a6,
- 0x1d4a9, 0x1d4ac,
- 0x1d4ae, 0x1d4b5,
- 0x1d4d0, 0x1d4e9,
- 0x1d504, 0x1d505,
- 0x1d507, 0x1d50a,
- 0x1d50d, 0x1d514,
- 0x1d516, 0x1d51c,
- 0x1d538, 0x1d539,
- 0x1d53b, 0x1d53e,
- 0x1d540, 0x1d544,
- 0x1d546, 0x1d546,
- 0x1d54a, 0x1d550,
- 0x1d56c, 0x1d585,
- 0x1d5a0, 0x1d5b9,
- 0x1d5d4, 0x1d5ed,
- 0x1d608, 0x1d621,
- 0x1d63c, 0x1d655,
- 0x1d670, 0x1d689,
- 0x1d6a8, 0x1d6c0,
- 0x1d6e2, 0x1d6fa,
- 0x1d71c, 0x1d734,
- 0x1d756, 0x1d76e,
- 0x1d790, 0x1d7a8,
- 0x1d7ca, 0x1d7ca,
-}; /* CR_Lu */
-
-/* 'M': Major Category */
-static const OnigCodePoint CR_M[] = {
- 161,
- 0x0300, 0x036f,
- 0x0483, 0x0489,
- 0x0591, 0x05bd,
- 0x05bf, 0x05bf,
- 0x05c1, 0x05c2,
- 0x05c4, 0x05c5,
- 0x05c7, 0x05c7,
- 0x0610, 0x061a,
- 0x064b, 0x065e,
- 0x0670, 0x0670,
- 0x06d6, 0x06dc,
- 0x06de, 0x06e4,
- 0x06e7, 0x06e8,
- 0x06ea, 0x06ed,
- 0x0711, 0x0711,
- 0x0730, 0x074a,
- 0x07a6, 0x07b0,
- 0x07eb, 0x07f3,
- 0x0901, 0x0903,
- 0x093c, 0x093c,
- 0x093e, 0x094d,
- 0x0951, 0x0954,
- 0x0962, 0x0963,
- 0x0981, 0x0983,
- 0x09bc, 0x09bc,
- 0x09be, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09cd,
- 0x09d7, 0x09d7,
- 0x09e2, 0x09e3,
- 0x0a01, 0x0a03,
- 0x0a3c, 0x0a3c,
- 0x0a3e, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4d,
- 0x0a51, 0x0a51,
- 0x0a70, 0x0a71,
- 0x0a75, 0x0a75,
- 0x0a81, 0x0a83,
- 0x0abc, 0x0abc,
- 0x0abe, 0x0ac5,
- 0x0ac7, 0x0ac9,
- 0x0acb, 0x0acd,
- 0x0ae2, 0x0ae3,
- 0x0b01, 0x0b03,
- 0x0b3c, 0x0b3c,
- 0x0b3e, 0x0b44,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b62, 0x0b63,
- 0x0b82, 0x0b82,
- 0x0bbe, 0x0bc2,
- 0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcd,
- 0x0bd7, 0x0bd7,
- 0x0c01, 0x0c03,
- 0x0c3e, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c62, 0x0c63,
- 0x0c82, 0x0c83,
- 0x0cbc, 0x0cbc,
- 0x0cbe, 0x0cc4,
- 0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccd,
- 0x0cd5, 0x0cd6,
- 0x0ce2, 0x0ce3,
- 0x0d02, 0x0d03,
- 0x0d3e, 0x0d44,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d62, 0x0d63,
- 0x0d82, 0x0d83,
- 0x0dca, 0x0dca,
- 0x0dcf, 0x0dd4,
- 0x0dd6, 0x0dd6,
- 0x0dd8, 0x0ddf,
- 0x0df2, 0x0df3,
- 0x0e31, 0x0e31,
- 0x0e34, 0x0e3a,
- 0x0e47, 0x0e4e,
- 0x0eb1, 0x0eb1,
- 0x0eb4, 0x0eb9,
- 0x0ebb, 0x0ebc,
- 0x0ec8, 0x0ecd,
- 0x0f18, 0x0f19,
- 0x0f35, 0x0f35,
- 0x0f37, 0x0f37,
- 0x0f39, 0x0f39,
- 0x0f3e, 0x0f3f,
- 0x0f71, 0x0f84,
- 0x0f86, 0x0f87,
- 0x0f90, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fc6, 0x0fc6,
- 0x102b, 0x103e,
- 0x1056, 0x1059,
- 0x105e, 0x1060,
- 0x1062, 0x1064,
- 0x1067, 0x106d,
- 0x1071, 0x1074,
- 0x1082, 0x108d,
- 0x108f, 0x108f,
- 0x135f, 0x135f,
- 0x1712, 0x1714,
- 0x1732, 0x1734,
- 0x1752, 0x1753,
- 0x1772, 0x1773,
- 0x17b6, 0x17d3,
- 0x17dd, 0x17dd,
- 0x180b, 0x180d,
- 0x18a9, 0x18a9,
- 0x1920, 0x192b,
- 0x1930, 0x193b,
- 0x19b0, 0x19c0,
- 0x19c8, 0x19c9,
- 0x1a17, 0x1a1b,
- 0x1b00, 0x1b04,
- 0x1b34, 0x1b44,
- 0x1b6b, 0x1b73,
- 0x1b80, 0x1b82,
- 0x1ba1, 0x1baa,
- 0x1c24, 0x1c37,
- 0x1dc0, 0x1de6,
- 0x1dfe, 0x1dff,
- 0x20d0, 0x20f0,
- 0x2de0, 0x2dff,
- 0x302a, 0x302f,
- 0x3099, 0x309a,
- 0xa66f, 0xa672,
- 0xa67c, 0xa67d,
- 0xa802, 0xa802,
- 0xa806, 0xa806,
- 0xa80b, 0xa80b,
- 0xa823, 0xa827,
- 0xa880, 0xa881,
- 0xa8b4, 0xa8c4,
- 0xa926, 0xa92d,
- 0xa947, 0xa953,
- 0xaa29, 0xaa36,
- 0xaa43, 0xaa43,
- 0xaa4c, 0xaa4d,
- 0xfb1e, 0xfb1e,
- 0xfe00, 0xfe0f,
- 0xfe20, 0xfe26,
- 0x101fd, 0x101fd,
- 0x10a01, 0x10a03,
- 0x10a05, 0x10a06,
- 0x10a0c, 0x10a0f,
- 0x10a38, 0x10a3a,
- 0x10a3f, 0x10a3f,
- 0x1d165, 0x1d169,
- 0x1d16d, 0x1d172,
- 0x1d17b, 0x1d182,
- 0x1d185, 0x1d18b,
- 0x1d1aa, 0x1d1ad,
- 0x1d242, 0x1d244,
- 0xe0100, 0xe01ef,
-}; /* CR_M */
-
-/* 'Mc': General Category */
-static const OnigCodePoint CR_Mc[] = {
- 85,
- 0x0903, 0x0903,
- 0x093e, 0x0940,
- 0x0949, 0x094c,
- 0x0982, 0x0983,
- 0x09be, 0x09c0,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09cc,
- 0x09d7, 0x09d7,
- 0x0a03, 0x0a03,
- 0x0a3e, 0x0a40,
- 0x0a83, 0x0a83,
- 0x0abe, 0x0ac0,
- 0x0ac9, 0x0ac9,
- 0x0acb, 0x0acc,
- 0x0b02, 0x0b03,
- 0x0b3e, 0x0b3e,
- 0x0b40, 0x0b40,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4c,
- 0x0b57, 0x0b57,
- 0x0bbe, 0x0bbf,
- 0x0bc1, 0x0bc2,
- 0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcc,
- 0x0bd7, 0x0bd7,
- 0x0c01, 0x0c03,
- 0x0c41, 0x0c44,
- 0x0c82, 0x0c83,
- 0x0cbe, 0x0cbe,
- 0x0cc0, 0x0cc4,
- 0x0cc7, 0x0cc8,
- 0x0cca, 0x0ccb,
- 0x0cd5, 0x0cd6,
- 0x0d02, 0x0d03,
- 0x0d3e, 0x0d40,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4c,
- 0x0d57, 0x0d57,
- 0x0d82, 0x0d83,
- 0x0dcf, 0x0dd1,
- 0x0dd8, 0x0ddf,
- 0x0df2, 0x0df3,
- 0x0f3e, 0x0f3f,
- 0x0f7f, 0x0f7f,
- 0x102b, 0x102c,
- 0x1031, 0x1031,
- 0x1038, 0x1038,
- 0x103b, 0x103c,
- 0x1056, 0x1057,
- 0x1062, 0x1064,
- 0x1067, 0x106d,
- 0x1083, 0x1084,
- 0x1087, 0x108c,
- 0x108f, 0x108f,
- 0x17b6, 0x17b6,
- 0x17be, 0x17c5,
- 0x17c7, 0x17c8,
- 0x1923, 0x1926,
- 0x1929, 0x192b,
- 0x1930, 0x1931,
- 0x1933, 0x1938,
- 0x19b0, 0x19c0,
- 0x19c8, 0x19c9,
- 0x1a19, 0x1a1b,
- 0x1b04, 0x1b04,
- 0x1b35, 0x1b35,
- 0x1b3b, 0x1b3b,
- 0x1b3d, 0x1b41,
- 0x1b43, 0x1b44,
- 0x1b82, 0x1b82,
- 0x1ba1, 0x1ba1,
- 0x1ba6, 0x1ba7,
- 0x1baa, 0x1baa,
- 0x1c24, 0x1c2b,
- 0x1c34, 0x1c35,
- 0xa823, 0xa824,
- 0xa827, 0xa827,
- 0xa880, 0xa881,
- 0xa8b4, 0xa8c3,
- 0xa952, 0xa953,
- 0xaa2f, 0xaa30,
- 0xaa33, 0xaa34,
- 0xaa4d, 0xaa4d,
- 0x1d165, 0x1d166,
- 0x1d16d, 0x1d172,
-}; /* CR_Mc */
-
-/* 'Me': General Category */
-static const OnigCodePoint CR_Me[] = {
- 5,
- 0x0488, 0x0489,
- 0x06de, 0x06de,
- 0x20dd, 0x20e0,
- 0x20e2, 0x20e4,
- 0xa670, 0xa672,
-}; /* CR_Me */
-
-/* 'Mn': General Category */
-static const OnigCodePoint CR_Mn[] = {
- 160,
- 0x0300, 0x036f,
- 0x0483, 0x0487,
- 0x0591, 0x05bd,
- 0x05bf, 0x05bf,
- 0x05c1, 0x05c2,
- 0x05c4, 0x05c5,
- 0x05c7, 0x05c7,
- 0x0610, 0x061a,
- 0x064b, 0x065e,
- 0x0670, 0x0670,
- 0x06d6, 0x06dc,
- 0x06df, 0x06e4,
- 0x06e7, 0x06e8,
- 0x06ea, 0x06ed,
- 0x0711, 0x0711,
- 0x0730, 0x074a,
- 0x07a6, 0x07b0,
- 0x07eb, 0x07f3,
- 0x0901, 0x0902,
- 0x093c, 0x093c,
- 0x0941, 0x0948,
- 0x094d, 0x094d,
- 0x0951, 0x0954,
- 0x0962, 0x0963,
- 0x0981, 0x0981,
- 0x09bc, 0x09bc,
- 0x09c1, 0x09c4,
- 0x09cd, 0x09cd,
- 0x09e2, 0x09e3,
- 0x0a01, 0x0a02,
- 0x0a3c, 0x0a3c,
- 0x0a41, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4d,
- 0x0a51, 0x0a51,
- 0x0a70, 0x0a71,
- 0x0a75, 0x0a75,
- 0x0a81, 0x0a82,
- 0x0abc, 0x0abc,
- 0x0ac1, 0x0ac5,
- 0x0ac7, 0x0ac8,
- 0x0acd, 0x0acd,
- 0x0ae2, 0x0ae3,
- 0x0b01, 0x0b01,
- 0x0b3c, 0x0b3c,
- 0x0b3f, 0x0b3f,
- 0x0b41, 0x0b44,
- 0x0b4d, 0x0b4d,
- 0x0b56, 0x0b56,
- 0x0b62, 0x0b63,
- 0x0b82, 0x0b82,
- 0x0bc0, 0x0bc0,
- 0x0bcd, 0x0bcd,
- 0x0c3e, 0x0c40,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c62, 0x0c63,
- 0x0cbc, 0x0cbc,
- 0x0cbf, 0x0cbf,
- 0x0cc6, 0x0cc6,
- 0x0ccc, 0x0ccd,
- 0x0ce2, 0x0ce3,
- 0x0d41, 0x0d44,
- 0x0d4d, 0x0d4d,
- 0x0d62, 0x0d63,
- 0x0dca, 0x0dca,
- 0x0dd2, 0x0dd4,
- 0x0dd6, 0x0dd6,
- 0x0e31, 0x0e31,
- 0x0e34, 0x0e3a,
- 0x0e47, 0x0e4e,
- 0x0eb1, 0x0eb1,
- 0x0eb4, 0x0eb9,
- 0x0ebb, 0x0ebc,
- 0x0ec8, 0x0ecd,
- 0x0f18, 0x0f19,
- 0x0f35, 0x0f35,
- 0x0f37, 0x0f37,
- 0x0f39, 0x0f39,
- 0x0f71, 0x0f7e,
- 0x0f80, 0x0f84,
- 0x0f86, 0x0f87,
- 0x0f90, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fc6, 0x0fc6,
- 0x102d, 0x1030,
- 0x1032, 0x1037,
- 0x1039, 0x103a,
- 0x103d, 0x103e,
- 0x1058, 0x1059,
- 0x105e, 0x1060,
- 0x1071, 0x1074,
- 0x1082, 0x1082,
- 0x1085, 0x1086,
- 0x108d, 0x108d,
- 0x135f, 0x135f,
- 0x1712, 0x1714,
- 0x1732, 0x1734,
- 0x1752, 0x1753,
- 0x1772, 0x1773,
- 0x17b7, 0x17bd,
- 0x17c6, 0x17c6,
- 0x17c9, 0x17d3,
- 0x17dd, 0x17dd,
- 0x180b, 0x180d,
- 0x18a9, 0x18a9,
- 0x1920, 0x1922,
- 0x1927, 0x1928,
- 0x1932, 0x1932,
- 0x1939, 0x193b,
- 0x1a17, 0x1a18,
- 0x1b00, 0x1b03,
- 0x1b34, 0x1b34,
- 0x1b36, 0x1b3a,
- 0x1b3c, 0x1b3c,
- 0x1b42, 0x1b42,
- 0x1b6b, 0x1b73,
- 0x1b80, 0x1b81,
- 0x1ba2, 0x1ba5,
- 0x1ba8, 0x1ba9,
- 0x1c2c, 0x1c33,
- 0x1c36, 0x1c37,
- 0x1dc0, 0x1de6,
- 0x1dfe, 0x1dff,
- 0x20d0, 0x20dc,
- 0x20e1, 0x20e1,
- 0x20e5, 0x20f0,
- 0x2de0, 0x2dff,
- 0x302a, 0x302f,
- 0x3099, 0x309a,
- 0xa66f, 0xa66f,
- 0xa67c, 0xa67d,
- 0xa802, 0xa802,
- 0xa806, 0xa806,
- 0xa80b, 0xa80b,
- 0xa825, 0xa826,
- 0xa8c4, 0xa8c4,
- 0xa926, 0xa92d,
- 0xa947, 0xa951,
- 0xaa29, 0xaa2e,
- 0xaa31, 0xaa32,
- 0xaa35, 0xaa36,
- 0xaa43, 0xaa43,
- 0xaa4c, 0xaa4c,
- 0xfb1e, 0xfb1e,
- 0xfe00, 0xfe0f,
- 0xfe20, 0xfe26,
- 0x101fd, 0x101fd,
- 0x10a01, 0x10a03,
- 0x10a05, 0x10a06,
- 0x10a0c, 0x10a0f,
- 0x10a38, 0x10a3a,
- 0x10a3f, 0x10a3f,
- 0x1d167, 0x1d169,
- 0x1d17b, 0x1d182,
- 0x1d185, 0x1d18b,
- 0x1d1aa, 0x1d1ad,
- 0x1d242, 0x1d244,
- 0xe0100, 0xe01ef,
-}; /* CR_Mn */
-
-/* 'N': Major Category */
-static const OnigCodePoint CR_N[] = {
- 69,
- 0x0030, 0x0039,
- 0x00b2, 0x00b3,
- 0x00b9, 0x00b9,
- 0x00bc, 0x00be,
- 0x0660, 0x0669,
- 0x06f0, 0x06f9,
- 0x07c0, 0x07c9,
- 0x0966, 0x096f,
- 0x09e6, 0x09ef,
- 0x09f4, 0x09f9,
- 0x0a66, 0x0a6f,
- 0x0ae6, 0x0aef,
- 0x0b66, 0x0b6f,
- 0x0be6, 0x0bf2,
- 0x0c66, 0x0c6f,
- 0x0c78, 0x0c7e,
- 0x0ce6, 0x0cef,
- 0x0d66, 0x0d75,
- 0x0e50, 0x0e59,
- 0x0ed0, 0x0ed9,
- 0x0f20, 0x0f33,
- 0x1040, 0x1049,
- 0x1090, 0x1099,
- 0x1369, 0x137c,
- 0x16ee, 0x16f0,
- 0x17e0, 0x17e9,
- 0x17f0, 0x17f9,
- 0x1810, 0x1819,
- 0x1946, 0x194f,
- 0x19d0, 0x19d9,
- 0x1b50, 0x1b59,
- 0x1bb0, 0x1bb9,
- 0x1c40, 0x1c49,
- 0x1c50, 0x1c59,
- 0x2070, 0x2070,
- 0x2074, 0x2079,
- 0x2080, 0x2089,
- 0x2153, 0x2182,
- 0x2185, 0x2188,
- 0x2460, 0x249b,
- 0x24ea, 0x24ff,
- 0x2776, 0x2793,
- 0x2cfd, 0x2cfd,
- 0x3007, 0x3007,
- 0x3021, 0x3029,
- 0x3038, 0x303a,
- 0x3192, 0x3195,
- 0x3220, 0x3229,
- 0x3251, 0x325f,
- 0x3280, 0x3289,
- 0x32b1, 0x32bf,
- 0xa620, 0xa629,
- 0xa8d0, 0xa8d9,
- 0xa900, 0xa909,
- 0xaa50, 0xaa59,
- 0xff10, 0xff19,
- 0x10107, 0x10133,
- 0x10140, 0x10178,
- 0x1018a, 0x1018a,
- 0x10320, 0x10323,
- 0x10341, 0x10341,
- 0x1034a, 0x1034a,
- 0x103d1, 0x103d5,
- 0x104a0, 0x104a9,
- 0x10916, 0x10919,
- 0x10a40, 0x10a47,
- 0x12400, 0x12462,
- 0x1d360, 0x1d371,
- 0x1d7ce, 0x1d7ff,
-}; /* CR_N */
-
-/* 'Nd': General Category */
-static const OnigCodePoint CR_Nd[] = {
- 33,
- 0x0030, 0x0039,
- 0x0660, 0x0669,
- 0x06f0, 0x06f9,
- 0x07c0, 0x07c9,
- 0x0966, 0x096f,
- 0x09e6, 0x09ef,
- 0x0a66, 0x0a6f,
- 0x0ae6, 0x0aef,
- 0x0b66, 0x0b6f,
- 0x0be6, 0x0bef,
- 0x0c66, 0x0c6f,
- 0x0ce6, 0x0cef,
- 0x0d66, 0x0d6f,
- 0x0e50, 0x0e59,
- 0x0ed0, 0x0ed9,
- 0x0f20, 0x0f29,
- 0x1040, 0x1049,
- 0x1090, 0x1099,
- 0x17e0, 0x17e9,
- 0x1810, 0x1819,
- 0x1946, 0x194f,
- 0x19d0, 0x19d9,
- 0x1b50, 0x1b59,
- 0x1bb0, 0x1bb9,
- 0x1c40, 0x1c49,
- 0x1c50, 0x1c59,
- 0xa620, 0xa629,
- 0xa8d0, 0xa8d9,
- 0xa900, 0xa909,
- 0xaa50, 0xaa59,
- 0xff10, 0xff19,
- 0x104a0, 0x104a9,
- 0x1d7ce, 0x1d7ff,
-}; /* CR_Nd */
-
-/* 'Nl': General Category */
-static const OnigCodePoint CR_Nl[] = {
- 11,
- 0x16ee, 0x16f0,
- 0x2160, 0x2182,
- 0x2185, 0x2188,
- 0x3007, 0x3007,
- 0x3021, 0x3029,
- 0x3038, 0x303a,
- 0x10140, 0x10174,
- 0x10341, 0x10341,
- 0x1034a, 0x1034a,
- 0x103d1, 0x103d5,
- 0x12400, 0x12462,
-}; /* CR_Nl */
-
-/* 'No': General Category */
-static const OnigCodePoint CR_No[] = {
- 30,
- 0x00b2, 0x00b3,
- 0x00b9, 0x00b9,
- 0x00bc, 0x00be,
- 0x09f4, 0x09f9,
- 0x0bf0, 0x0bf2,
- 0x0c78, 0x0c7e,
- 0x0d70, 0x0d75,
- 0x0f2a, 0x0f33,
- 0x1369, 0x137c,
- 0x17f0, 0x17f9,
- 0x2070, 0x2070,
- 0x2074, 0x2079,
- 0x2080, 0x2089,
- 0x2153, 0x215f,
- 0x2460, 0x249b,
- 0x24ea, 0x24ff,
- 0x2776, 0x2793,
- 0x2cfd, 0x2cfd,
- 0x3192, 0x3195,
- 0x3220, 0x3229,
- 0x3251, 0x325f,
- 0x3280, 0x3289,
- 0x32b1, 0x32bf,
- 0x10107, 0x10133,
- 0x10175, 0x10178,
- 0x1018a, 0x1018a,
- 0x10320, 0x10323,
- 0x10916, 0x10919,
- 0x10a40, 0x10a47,
- 0x1d360, 0x1d371,
-}; /* CR_No */
-
-/* 'P': Major Category */
-static const OnigCodePoint CR_P[] = {
- 112,
- 0x0021, 0x0023,
- 0x0025, 0x002a,
- 0x002c, 0x002f,
- 0x003a, 0x003b,
- 0x003f, 0x0040,
- 0x005b, 0x005d,
- 0x005f, 0x005f,
- 0x007b, 0x007b,
- 0x007d, 0x007d,
- 0x00a1, 0x00a1,
- 0x00ab, 0x00ab,
- 0x00b7, 0x00b7,
- 0x00bb, 0x00bb,
- 0x00bf, 0x00bf,
- 0x037e, 0x037e,
- 0x0387, 0x0387,
- 0x055a, 0x055f,
- 0x0589, 0x058a,
- 0x05be, 0x05be,
- 0x05c0, 0x05c0,
- 0x05c3, 0x05c3,
- 0x05c6, 0x05c6,
- 0x05f3, 0x05f4,
- 0x0609, 0x060a,
- 0x060c, 0x060d,
- 0x061b, 0x061b,
- 0x061e, 0x061f,
- 0x066a, 0x066d,
- 0x06d4, 0x06d4,
- 0x0700, 0x070d,
- 0x07f7, 0x07f9,
- 0x0964, 0x0965,
- 0x0970, 0x0970,
- 0x0df4, 0x0df4,
- 0x0e4f, 0x0e4f,
- 0x0e5a, 0x0e5b,
- 0x0f04, 0x0f12,
- 0x0f3a, 0x0f3d,
- 0x0f85, 0x0f85,
- 0x0fd0, 0x0fd4,
- 0x104a, 0x104f,
- 0x10fb, 0x10fb,
- 0x1361, 0x1368,
- 0x166d, 0x166e,
- 0x169b, 0x169c,
- 0x16eb, 0x16ed,
- 0x1735, 0x1736,
- 0x17d4, 0x17d6,
- 0x17d8, 0x17da,
- 0x1800, 0x180a,
- 0x1944, 0x1945,
- 0x19de, 0x19df,
- 0x1a1e, 0x1a1f,
- 0x1b5a, 0x1b60,
- 0x1c3b, 0x1c3f,
- 0x1c7e, 0x1c7f,
- 0x2010, 0x2027,
- 0x2030, 0x2043,
- 0x2045, 0x2051,
- 0x2053, 0x205e,
- 0x207d, 0x207e,
- 0x208d, 0x208e,
- 0x2329, 0x232a,
- 0x2768, 0x2775,
- 0x27c5, 0x27c6,
- 0x27e6, 0x27ef,
- 0x2983, 0x2998,
- 0x29d8, 0x29db,
- 0x29fc, 0x29fd,
- 0x2cf9, 0x2cfc,
- 0x2cfe, 0x2cff,
- 0x2e00, 0x2e2e,
- 0x2e30, 0x2e30,
- 0x3001, 0x3003,
- 0x3008, 0x3011,
- 0x3014, 0x301f,
- 0x3030, 0x3030,
- 0x303d, 0x303d,
- 0x30a0, 0x30a0,
- 0x30fb, 0x30fb,
- 0xa60d, 0xa60f,
- 0xa673, 0xa673,
- 0xa67e, 0xa67e,
- 0xa874, 0xa877,
- 0xa8ce, 0xa8cf,
- 0xa92e, 0xa92f,
- 0xa95f, 0xa95f,
- 0xaa5c, 0xaa5f,
- 0xfd3e, 0xfd3f,
- 0xfe10, 0xfe19,
- 0xfe30, 0xfe52,
- 0xfe54, 0xfe61,
- 0xfe63, 0xfe63,
- 0xfe68, 0xfe68,
- 0xfe6a, 0xfe6b,
- 0xff01, 0xff03,
- 0xff05, 0xff0a,
- 0xff0c, 0xff0f,
- 0xff1a, 0xff1b,
- 0xff1f, 0xff20,
- 0xff3b, 0xff3d,
- 0xff3f, 0xff3f,
- 0xff5b, 0xff5b,
- 0xff5d, 0xff5d,
- 0xff5f, 0xff65,
- 0x10100, 0x10101,
- 0x1039f, 0x1039f,
- 0x103d0, 0x103d0,
- 0x1091f, 0x1091f,
- 0x1093f, 0x1093f,
- 0x10a50, 0x10a58,
- 0x12470, 0x12473,
-}; /* CR_P */
-
-/* 'Pc': General Category */
-static const OnigCodePoint CR_Pc[] = {
- 6,
- 0x005f, 0x005f,
- 0x203f, 0x2040,
- 0x2054, 0x2054,
- 0xfe33, 0xfe34,
- 0xfe4d, 0xfe4f,
- 0xff3f, 0xff3f,
-}; /* CR_Pc */
-
-/* 'Pd': General Category */
-static const OnigCodePoint CR_Pd[] = {
- 14,
- 0x002d, 0x002d,
- 0x058a, 0x058a,
- 0x05be, 0x05be,
- 0x1806, 0x1806,
- 0x2010, 0x2015,
- 0x2e17, 0x2e17,
- 0x2e1a, 0x2e1a,
- 0x301c, 0x301c,
- 0x3030, 0x3030,
- 0x30a0, 0x30a0,
- 0xfe31, 0xfe32,
- 0xfe58, 0xfe58,
- 0xfe63, 0xfe63,
- 0xff0d, 0xff0d,
-}; /* CR_Pd */
-
-/* 'Pe': General Category */
-static const OnigCodePoint CR_Pe[] = {
- 70,
- 0x0029, 0x0029,
- 0x005d, 0x005d,
- 0x007d, 0x007d,
- 0x0f3b, 0x0f3b,
- 0x0f3d, 0x0f3d,
- 0x169c, 0x169c,
- 0x2046, 0x2046,
- 0x207e, 0x207e,
- 0x208e, 0x208e,
- 0x232a, 0x232a,
- 0x2769, 0x2769,
- 0x276b, 0x276b,
- 0x276d, 0x276d,
- 0x276f, 0x276f,
- 0x2771, 0x2771,
- 0x2773, 0x2773,
- 0x2775, 0x2775,
- 0x27c6, 0x27c6,
- 0x27e7, 0x27e7,
- 0x27e9, 0x27e9,
- 0x27eb, 0x27eb,
- 0x27ed, 0x27ed,
- 0x27ef, 0x27ef,
- 0x2984, 0x2984,
- 0x2986, 0x2986,
- 0x2988, 0x2988,
- 0x298a, 0x298a,
- 0x298c, 0x298c,
- 0x298e, 0x298e,
- 0x2990, 0x2990,
- 0x2992, 0x2992,
- 0x2994, 0x2994,
- 0x2996, 0x2996,
- 0x2998, 0x2998,
- 0x29d9, 0x29d9,
- 0x29db, 0x29db,
- 0x29fd, 0x29fd,
- 0x2e23, 0x2e23,
- 0x2e25, 0x2e25,
- 0x2e27, 0x2e27,
- 0x2e29, 0x2e29,
- 0x3009, 0x3009,
- 0x300b, 0x300b,
- 0x300d, 0x300d,
- 0x300f, 0x300f,
- 0x3011, 0x3011,
- 0x3015, 0x3015,
- 0x3017, 0x3017,
- 0x3019, 0x3019,
- 0x301b, 0x301b,
- 0x301e, 0x301f,
- 0xfd3f, 0xfd3f,
- 0xfe18, 0xfe18,
- 0xfe36, 0xfe36,
- 0xfe38, 0xfe38,
- 0xfe3a, 0xfe3a,
- 0xfe3c, 0xfe3c,
- 0xfe3e, 0xfe3e,
- 0xfe40, 0xfe40,
- 0xfe42, 0xfe42,
- 0xfe44, 0xfe44,
- 0xfe48, 0xfe48,
- 0xfe5a, 0xfe5a,
- 0xfe5c, 0xfe5c,
- 0xfe5e, 0xfe5e,
- 0xff09, 0xff09,
- 0xff3d, 0xff3d,
- 0xff5d, 0xff5d,
- 0xff60, 0xff60,
- 0xff63, 0xff63,
-}; /* CR_Pe */
-
-/* 'Pf': General Category */
-static const OnigCodePoint CR_Pf[] = {
- 10,
- 0x00bb, 0x00bb,
- 0x2019, 0x2019,
- 0x201d, 0x201d,
- 0x203a, 0x203a,
- 0x2e03, 0x2e03,
- 0x2e05, 0x2e05,
- 0x2e0a, 0x2e0a,
- 0x2e0d, 0x2e0d,
- 0x2e1d, 0x2e1d,
- 0x2e21, 0x2e21,
-}; /* CR_Pf */
-
-/* 'Pi': General Category */
-static const OnigCodePoint CR_Pi[] = {
- 11,
- 0x00ab, 0x00ab,
- 0x2018, 0x2018,
- 0x201b, 0x201c,
- 0x201f, 0x201f,
- 0x2039, 0x2039,
- 0x2e02, 0x2e02,
- 0x2e04, 0x2e04,
- 0x2e09, 0x2e09,
- 0x2e0c, 0x2e0c,
- 0x2e1c, 0x2e1c,
- 0x2e20, 0x2e20,
-}; /* CR_Pi */
-
-/* 'Po': General Category */
-static const OnigCodePoint CR_Po[] = {
- 108,
- 0x0021, 0x0023,
- 0x0025, 0x0027,
- 0x002a, 0x002a,
- 0x002c, 0x002c,
- 0x002e, 0x002f,
- 0x003a, 0x003b,
- 0x003f, 0x0040,
- 0x005c, 0x005c,
- 0x00a1, 0x00a1,
- 0x00b7, 0x00b7,
- 0x00bf, 0x00bf,
- 0x037e, 0x037e,
- 0x0387, 0x0387,
- 0x055a, 0x055f,
- 0x0589, 0x0589,
- 0x05c0, 0x05c0,
- 0x05c3, 0x05c3,
- 0x05c6, 0x05c6,
- 0x05f3, 0x05f4,
- 0x0609, 0x060a,
- 0x060c, 0x060d,
- 0x061b, 0x061b,
- 0x061e, 0x061f,
- 0x066a, 0x066d,
- 0x06d4, 0x06d4,
- 0x0700, 0x070d,
- 0x07f7, 0x07f9,
- 0x0964, 0x0965,
- 0x0970, 0x0970,
- 0x0df4, 0x0df4,
- 0x0e4f, 0x0e4f,
- 0x0e5a, 0x0e5b,
- 0x0f04, 0x0f12,
- 0x0f85, 0x0f85,
- 0x0fd0, 0x0fd4,
- 0x104a, 0x104f,
- 0x10fb, 0x10fb,
- 0x1361, 0x1368,
- 0x166d, 0x166e,
- 0x16eb, 0x16ed,
- 0x1735, 0x1736,
- 0x17d4, 0x17d6,
- 0x17d8, 0x17da,
- 0x1800, 0x1805,
- 0x1807, 0x180a,
- 0x1944, 0x1945,
- 0x19de, 0x19df,
- 0x1a1e, 0x1a1f,
- 0x1b5a, 0x1b60,
- 0x1c3b, 0x1c3f,
- 0x1c7e, 0x1c7f,
- 0x2016, 0x2017,
- 0x2020, 0x2027,
- 0x2030, 0x2038,
- 0x203b, 0x203e,
- 0x2041, 0x2043,
- 0x2047, 0x2051,
- 0x2053, 0x2053,
- 0x2055, 0x205e,
- 0x2cf9, 0x2cfc,
- 0x2cfe, 0x2cff,
- 0x2e00, 0x2e01,
- 0x2e06, 0x2e08,
- 0x2e0b, 0x2e0b,
- 0x2e0e, 0x2e16,
- 0x2e18, 0x2e19,
- 0x2e1b, 0x2e1b,
- 0x2e1e, 0x2e1f,
- 0x2e2a, 0x2e2e,
- 0x2e30, 0x2e30,
- 0x3001, 0x3003,
- 0x303d, 0x303d,
- 0x30fb, 0x30fb,
- 0xa60d, 0xa60f,
- 0xa673, 0xa673,
- 0xa67e, 0xa67e,
- 0xa874, 0xa877,
- 0xa8ce, 0xa8cf,
- 0xa92e, 0xa92f,
- 0xa95f, 0xa95f,
- 0xaa5c, 0xaa5f,
- 0xfe10, 0xfe16,
- 0xfe19, 0xfe19,
- 0xfe30, 0xfe30,
- 0xfe45, 0xfe46,
- 0xfe49, 0xfe4c,
- 0xfe50, 0xfe52,
- 0xfe54, 0xfe57,
- 0xfe5f, 0xfe61,
- 0xfe68, 0xfe68,
- 0xfe6a, 0xfe6b,
- 0xff01, 0xff03,
- 0xff05, 0xff07,
- 0xff0a, 0xff0a,
- 0xff0c, 0xff0c,
- 0xff0e, 0xff0f,
- 0xff1a, 0xff1b,
- 0xff1f, 0xff20,
- 0xff3c, 0xff3c,
- 0xff61, 0xff61,
- 0xff64, 0xff65,
- 0x10100, 0x10101,
- 0x1039f, 0x1039f,
- 0x103d0, 0x103d0,
- 0x1091f, 0x1091f,
- 0x1093f, 0x1093f,
- 0x10a50, 0x10a58,
- 0x12470, 0x12473,
-}; /* CR_Po */
-
-/* 'Ps': General Category */
-static const OnigCodePoint CR_Ps[] = {
- 72,
- 0x0028, 0x0028,
- 0x005b, 0x005b,
- 0x007b, 0x007b,
- 0x0f3a, 0x0f3a,
- 0x0f3c, 0x0f3c,
- 0x169b, 0x169b,
- 0x201a, 0x201a,
- 0x201e, 0x201e,
- 0x2045, 0x2045,
- 0x207d, 0x207d,
- 0x208d, 0x208d,
- 0x2329, 0x2329,
- 0x2768, 0x2768,
- 0x276a, 0x276a,
- 0x276c, 0x276c,
- 0x276e, 0x276e,
- 0x2770, 0x2770,
- 0x2772, 0x2772,
- 0x2774, 0x2774,
- 0x27c5, 0x27c5,
- 0x27e6, 0x27e6,
- 0x27e8, 0x27e8,
- 0x27ea, 0x27ea,
- 0x27ec, 0x27ec,
- 0x27ee, 0x27ee,
- 0x2983, 0x2983,
- 0x2985, 0x2985,
- 0x2987, 0x2987,
- 0x2989, 0x2989,
- 0x298b, 0x298b,
- 0x298d, 0x298d,
- 0x298f, 0x298f,
- 0x2991, 0x2991,
- 0x2993, 0x2993,
- 0x2995, 0x2995,
- 0x2997, 0x2997,
- 0x29d8, 0x29d8,
- 0x29da, 0x29da,
- 0x29fc, 0x29fc,
- 0x2e22, 0x2e22,
- 0x2e24, 0x2e24,
- 0x2e26, 0x2e26,
- 0x2e28, 0x2e28,
- 0x3008, 0x3008,
- 0x300a, 0x300a,
- 0x300c, 0x300c,
- 0x300e, 0x300e,
- 0x3010, 0x3010,
- 0x3014, 0x3014,
- 0x3016, 0x3016,
- 0x3018, 0x3018,
- 0x301a, 0x301a,
- 0x301d, 0x301d,
- 0xfd3e, 0xfd3e,
- 0xfe17, 0xfe17,
- 0xfe35, 0xfe35,
- 0xfe37, 0xfe37,
- 0xfe39, 0xfe39,
- 0xfe3b, 0xfe3b,
- 0xfe3d, 0xfe3d,
- 0xfe3f, 0xfe3f,
- 0xfe41, 0xfe41,
- 0xfe43, 0xfe43,
- 0xfe47, 0xfe47,
- 0xfe59, 0xfe59,
- 0xfe5b, 0xfe5b,
- 0xfe5d, 0xfe5d,
- 0xff08, 0xff08,
- 0xff3b, 0xff3b,
- 0xff5b, 0xff5b,
- 0xff5f, 0xff5f,
- 0xff62, 0xff62,
-}; /* CR_Ps */
-
-/* 'S': Major Category */
-static const OnigCodePoint CR_S[] = {
- 179,
- 0x0024, 0x0024,
- 0x002b, 0x002b,
- 0x003c, 0x003e,
- 0x005e, 0x005e,
- 0x0060, 0x0060,
- 0x007c, 0x007c,
- 0x007e, 0x007e,
- 0x00a2, 0x00a9,
- 0x00ac, 0x00ac,
- 0x00ae, 0x00b1,
- 0x00b4, 0x00b4,
- 0x00b6, 0x00b6,
- 0x00b8, 0x00b8,
- 0x00d7, 0x00d7,
- 0x00f7, 0x00f7,
- 0x02c2, 0x02c5,
- 0x02d2, 0x02df,
- 0x02e5, 0x02eb,
- 0x02ed, 0x02ed,
- 0x02ef, 0x02ff,
- 0x0375, 0x0375,
- 0x0384, 0x0385,
- 0x03f6, 0x03f6,
- 0x0482, 0x0482,
- 0x0606, 0x0608,
- 0x060b, 0x060b,
- 0x060e, 0x060f,
- 0x06e9, 0x06e9,
- 0x06fd, 0x06fe,
- 0x07f6, 0x07f6,
- 0x09f2, 0x09f3,
- 0x09fa, 0x09fa,
- 0x0af1, 0x0af1,
- 0x0b70, 0x0b70,
- 0x0bf3, 0x0bfa,
- 0x0c7f, 0x0c7f,
- 0x0cf1, 0x0cf2,
- 0x0d79, 0x0d79,
- 0x0e3f, 0x0e3f,
- 0x0f01, 0x0f03,
- 0x0f13, 0x0f17,
- 0x0f1a, 0x0f1f,
- 0x0f34, 0x0f34,
- 0x0f36, 0x0f36,
- 0x0f38, 0x0f38,
- 0x0fbe, 0x0fc5,
- 0x0fc7, 0x0fcc,
- 0x0fce, 0x0fcf,
- 0x109e, 0x109f,
- 0x1360, 0x1360,
- 0x1390, 0x1399,
- 0x17db, 0x17db,
- 0x1940, 0x1940,
- 0x19e0, 0x19ff,
- 0x1b61, 0x1b6a,
- 0x1b74, 0x1b7c,
- 0x1fbd, 0x1fbd,
- 0x1fbf, 0x1fc1,
- 0x1fcd, 0x1fcf,
- 0x1fdd, 0x1fdf,
- 0x1fed, 0x1fef,
- 0x1ffd, 0x1ffe,
- 0x2044, 0x2044,
- 0x2052, 0x2052,
- 0x207a, 0x207c,
- 0x208a, 0x208c,
- 0x20a0, 0x20b5,
- 0x2100, 0x2101,
- 0x2103, 0x2106,
- 0x2108, 0x2109,
- 0x2114, 0x2114,
- 0x2116, 0x2118,
- 0x211e, 0x2123,
- 0x2125, 0x2125,
- 0x2127, 0x2127,
- 0x2129, 0x2129,
- 0x212e, 0x212e,
- 0x213a, 0x213b,
- 0x2140, 0x2144,
- 0x214a, 0x214d,
- 0x214f, 0x214f,
- 0x2190, 0x2328,
- 0x232b, 0x23e7,
- 0x2400, 0x2426,
- 0x2440, 0x244a,
- 0x249c, 0x24e9,
- 0x2500, 0x269d,
- 0x26a0, 0x26bc,
- 0x26c0, 0x26c3,
- 0x2701, 0x2704,
- 0x2706, 0x2709,
- 0x270c, 0x2727,
- 0x2729, 0x274b,
- 0x274d, 0x274d,
- 0x274f, 0x2752,
- 0x2756, 0x2756,
- 0x2758, 0x275e,
- 0x2761, 0x2767,
- 0x2794, 0x2794,
- 0x2798, 0x27af,
- 0x27b1, 0x27be,
- 0x27c0, 0x27c4,
- 0x27c7, 0x27ca,
- 0x27cc, 0x27cc,
- 0x27d0, 0x27e5,
- 0x27f0, 0x2982,
- 0x2999, 0x29d7,
- 0x29dc, 0x29fb,
- 0x29fe, 0x2b4c,
- 0x2b50, 0x2b54,
- 0x2ce5, 0x2cea,
- 0x2e80, 0x2e99,
- 0x2e9b, 0x2ef3,
- 0x2f00, 0x2fd5,
- 0x2ff0, 0x2ffb,
- 0x3004, 0x3004,
- 0x3012, 0x3013,
- 0x3020, 0x3020,
- 0x3036, 0x3037,
- 0x303e, 0x303f,
- 0x309b, 0x309c,
- 0x3190, 0x3191,
- 0x3196, 0x319f,
- 0x31c0, 0x31e3,
- 0x3200, 0x321e,
- 0x322a, 0x3243,
- 0x3250, 0x3250,
- 0x3260, 0x327f,
- 0x328a, 0x32b0,
- 0x32c0, 0x32fe,
- 0x3300, 0x33ff,
- 0x4dc0, 0x4dff,
- 0xa490, 0xa4c6,
- 0xa700, 0xa716,
- 0xa720, 0xa721,
- 0xa789, 0xa78a,
- 0xa828, 0xa82b,
- 0xfb29, 0xfb29,
- 0xfdfc, 0xfdfd,
- 0xfe62, 0xfe62,
- 0xfe64, 0xfe66,
- 0xfe69, 0xfe69,
- 0xff04, 0xff04,
- 0xff0b, 0xff0b,
- 0xff1c, 0xff1e,
- 0xff3e, 0xff3e,
- 0xff40, 0xff40,
- 0xff5c, 0xff5c,
- 0xff5e, 0xff5e,
- 0xffe0, 0xffe6,
- 0xffe8, 0xffee,
- 0xfffc, 0xfffd,
- 0x10102, 0x10102,
- 0x10137, 0x1013f,
- 0x10179, 0x10189,
- 0x10190, 0x1019b,
- 0x101d0, 0x101fc,
- 0x1d000, 0x1d0f5,
- 0x1d100, 0x1d126,
- 0x1d129, 0x1d164,
- 0x1d16a, 0x1d16c,
- 0x1d183, 0x1d184,
- 0x1d18c, 0x1d1a9,
- 0x1d1ae, 0x1d1dd,
- 0x1d200, 0x1d241,
- 0x1d245, 0x1d245,
- 0x1d300, 0x1d356,
- 0x1d6c1, 0x1d6c1,
- 0x1d6db, 0x1d6db,
- 0x1d6fb, 0x1d6fb,
- 0x1d715, 0x1d715,
- 0x1d735, 0x1d735,
- 0x1d74f, 0x1d74f,
- 0x1d76f, 0x1d76f,
- 0x1d789, 0x1d789,
- 0x1d7a9, 0x1d7a9,
- 0x1d7c3, 0x1d7c3,
- 0x1f000, 0x1f02b,
- 0x1f030, 0x1f093,
-}; /* CR_S */
-
-/* 'Sc': General Category */
-static const OnigCodePoint CR_Sc[] = {
- 14,
- 0x0024, 0x0024,
- 0x00a2, 0x00a5,
- 0x060b, 0x060b,
- 0x09f2, 0x09f3,
- 0x0af1, 0x0af1,
- 0x0bf9, 0x0bf9,
- 0x0e3f, 0x0e3f,
- 0x17db, 0x17db,
- 0x20a0, 0x20b5,
- 0xfdfc, 0xfdfc,
- 0xfe69, 0xfe69,
- 0xff04, 0xff04,
- 0xffe0, 0xffe1,
- 0xffe5, 0xffe6,
-}; /* CR_Sc */
-
-/* 'Sk': General Category */
-static const OnigCodePoint CR_Sk[] = {
- 26,
- 0x005e, 0x005e,
- 0x0060, 0x0060,
- 0x00a8, 0x00a8,
- 0x00af, 0x00af,
- 0x00b4, 0x00b4,
- 0x00b8, 0x00b8,
- 0x02c2, 0x02c5,
- 0x02d2, 0x02df,
- 0x02e5, 0x02eb,
- 0x02ed, 0x02ed,
- 0x02ef, 0x02ff,
- 0x0375, 0x0375,
- 0x0384, 0x0385,
- 0x1fbd, 0x1fbd,
- 0x1fbf, 0x1fc1,
- 0x1fcd, 0x1fcf,
- 0x1fdd, 0x1fdf,
- 0x1fed, 0x1fef,
- 0x1ffd, 0x1ffe,
- 0x309b, 0x309c,
- 0xa700, 0xa716,
- 0xa720, 0xa721,
- 0xa789, 0xa78a,
- 0xff3e, 0xff3e,
- 0xff40, 0xff40,
- 0xffe3, 0xffe3,
-}; /* CR_Sk */
-
-/* 'Sm': General Category */
-static const OnigCodePoint CR_Sm[] = {
- 65,
- 0x002b, 0x002b,
- 0x003c, 0x003e,
- 0x007c, 0x007c,
- 0x007e, 0x007e,
- 0x00ac, 0x00ac,
- 0x00b1, 0x00b1,
- 0x00d7, 0x00d7,
- 0x00f7, 0x00f7,
- 0x03f6, 0x03f6,
- 0x0606, 0x0608,
- 0x2044, 0x2044,
- 0x2052, 0x2052,
- 0x207a, 0x207c,
- 0x208a, 0x208c,
- 0x2140, 0x2144,
- 0x214b, 0x214b,
- 0x2190, 0x2194,
- 0x219a, 0x219b,
- 0x21a0, 0x21a0,
- 0x21a3, 0x21a3,
- 0x21a6, 0x21a6,
- 0x21ae, 0x21ae,
- 0x21ce, 0x21cf,
- 0x21d2, 0x21d2,
- 0x21d4, 0x21d4,
- 0x21f4, 0x22ff,
- 0x2308, 0x230b,
- 0x2320, 0x2321,
- 0x237c, 0x237c,
- 0x239b, 0x23b3,
- 0x23dc, 0x23e1,
- 0x25b7, 0x25b7,
- 0x25c1, 0x25c1,
- 0x25f8, 0x25ff,
- 0x266f, 0x266f,
- 0x27c0, 0x27c4,
- 0x27c7, 0x27ca,
- 0x27cc, 0x27cc,
- 0x27d0, 0x27e5,
- 0x27f0, 0x27ff,
- 0x2900, 0x2982,
- 0x2999, 0x29d7,
- 0x29dc, 0x29fb,
- 0x29fe, 0x2aff,
- 0x2b30, 0x2b44,
- 0x2b47, 0x2b4c,
- 0xfb29, 0xfb29,
- 0xfe62, 0xfe62,
- 0xfe64, 0xfe66,
- 0xff0b, 0xff0b,
- 0xff1c, 0xff1e,
- 0xff5c, 0xff5c,
- 0xff5e, 0xff5e,
- 0xffe2, 0xffe2,
- 0xffe9, 0xffec,
- 0x1d6c1, 0x1d6c1,
- 0x1d6db, 0x1d6db,
- 0x1d6fb, 0x1d6fb,
- 0x1d715, 0x1d715,
- 0x1d735, 0x1d735,
- 0x1d74f, 0x1d74f,
- 0x1d76f, 0x1d76f,
- 0x1d789, 0x1d789,
- 0x1d7a9, 0x1d7a9,
- 0x1d7c3, 0x1d7c3,
-}; /* CR_Sm */
-
-/* 'So': General Category */
-static const OnigCodePoint CR_So[] = {
- 134,
- 0x00a6, 0x00a7,
- 0x00a9, 0x00a9,
- 0x00ae, 0x00ae,
- 0x00b0, 0x00b0,
- 0x00b6, 0x00b6,
- 0x0482, 0x0482,
- 0x060e, 0x060f,
- 0x06e9, 0x06e9,
- 0x06fd, 0x06fe,
- 0x07f6, 0x07f6,
- 0x09fa, 0x09fa,
- 0x0b70, 0x0b70,
- 0x0bf3, 0x0bf8,
- 0x0bfa, 0x0bfa,
- 0x0c7f, 0x0c7f,
- 0x0cf1, 0x0cf2,
- 0x0d79, 0x0d79,
- 0x0f01, 0x0f03,
- 0x0f13, 0x0f17,
- 0x0f1a, 0x0f1f,
- 0x0f34, 0x0f34,
- 0x0f36, 0x0f36,
- 0x0f38, 0x0f38,
- 0x0fbe, 0x0fc5,
- 0x0fc7, 0x0fcc,
- 0x0fce, 0x0fcf,
- 0x109e, 0x109f,
- 0x1360, 0x1360,
- 0x1390, 0x1399,
- 0x1940, 0x1940,
- 0x19e0, 0x19ff,
- 0x1b61, 0x1b6a,
- 0x1b74, 0x1b7c,
- 0x2100, 0x2101,
- 0x2103, 0x2106,
- 0x2108, 0x2109,
- 0x2114, 0x2114,
- 0x2116, 0x2118,
- 0x211e, 0x2123,
- 0x2125, 0x2125,
- 0x2127, 0x2127,
- 0x2129, 0x2129,
- 0x212e, 0x212e,
- 0x213a, 0x213b,
- 0x214a, 0x214a,
- 0x214c, 0x214d,
- 0x214f, 0x214f,
- 0x2195, 0x2199,
- 0x219c, 0x219f,
- 0x21a1, 0x21a2,
- 0x21a4, 0x21a5,
- 0x21a7, 0x21ad,
- 0x21af, 0x21cd,
- 0x21d0, 0x21d1,
- 0x21d3, 0x21d3,
- 0x21d5, 0x21f3,
- 0x2300, 0x2307,
- 0x230c, 0x231f,
- 0x2322, 0x2328,
- 0x232b, 0x237b,
- 0x237d, 0x239a,
- 0x23b4, 0x23db,
- 0x23e2, 0x23e7,
- 0x2400, 0x2426,
- 0x2440, 0x244a,
- 0x249c, 0x24e9,
- 0x2500, 0x25b6,
- 0x25b8, 0x25c0,
- 0x25c2, 0x25f7,
- 0x2600, 0x266e,
- 0x2670, 0x269d,
- 0x26a0, 0x26bc,
- 0x26c0, 0x26c3,
- 0x2701, 0x2704,
- 0x2706, 0x2709,
- 0x270c, 0x2727,
- 0x2729, 0x274b,
- 0x274d, 0x274d,
- 0x274f, 0x2752,
- 0x2756, 0x2756,
- 0x2758, 0x275e,
- 0x2761, 0x2767,
- 0x2794, 0x2794,
- 0x2798, 0x27af,
- 0x27b1, 0x27be,
- 0x2800, 0x28ff,
- 0x2b00, 0x2b2f,
- 0x2b45, 0x2b46,
- 0x2b50, 0x2b54,
- 0x2ce5, 0x2cea,
- 0x2e80, 0x2e99,
- 0x2e9b, 0x2ef3,
- 0x2f00, 0x2fd5,
- 0x2ff0, 0x2ffb,
- 0x3004, 0x3004,
- 0x3012, 0x3013,
- 0x3020, 0x3020,
- 0x3036, 0x3037,
- 0x303e, 0x303f,
- 0x3190, 0x3191,
- 0x3196, 0x319f,
- 0x31c0, 0x31e3,
- 0x3200, 0x321e,
- 0x322a, 0x3243,
- 0x3250, 0x3250,
- 0x3260, 0x327f,
- 0x328a, 0x32b0,
- 0x32c0, 0x32fe,
- 0x3300, 0x33ff,
- 0x4dc0, 0x4dff,
- 0xa490, 0xa4c6,
- 0xa828, 0xa82b,
- 0xfdfd, 0xfdfd,
- 0xffe4, 0xffe4,
- 0xffe8, 0xffe8,
- 0xffed, 0xffee,
- 0xfffc, 0xfffd,
- 0x10102, 0x10102,
- 0x10137, 0x1013f,
- 0x10179, 0x10189,
- 0x10190, 0x1019b,
- 0x101d0, 0x101fc,
- 0x1d000, 0x1d0f5,
- 0x1d100, 0x1d126,
- 0x1d129, 0x1d164,
- 0x1d16a, 0x1d16c,
- 0x1d183, 0x1d184,
- 0x1d18c, 0x1d1a9,
- 0x1d1ae, 0x1d1dd,
- 0x1d200, 0x1d241,
- 0x1d245, 0x1d245,
- 0x1d300, 0x1d356,
- 0x1f000, 0x1f02b,
- 0x1f030, 0x1f093,
-}; /* CR_So */
-
-/* 'Z': Major Category */
-static const OnigCodePoint CR_Z[] = {
- 9,
- 0x0020, 0x0020,
- 0x00a0, 0x00a0,
- 0x1680, 0x1680,
- 0x180e, 0x180e,
- 0x2000, 0x200a,
- 0x2028, 0x2029,
- 0x202f, 0x202f,
- 0x205f, 0x205f,
- 0x3000, 0x3000,
-}; /* CR_Z */
-
-/* 'Zl': General Category */
-static const OnigCodePoint CR_Zl[] = {
- 1,
- 0x2028, 0x2028,
-}; /* CR_Zl */
-
-/* 'Zp': General Category */
-static const OnigCodePoint CR_Zp[] = {
- 1,
- 0x2029, 0x2029,
-}; /* CR_Zp */
-
-/* 'Zs': General Category */
-static const OnigCodePoint CR_Zs[] = {
- 8,
- 0x0020, 0x0020,
- 0x00a0, 0x00a0,
- 0x1680, 0x1680,
- 0x180e, 0x180e,
- 0x2000, 0x200a,
- 0x202f, 0x202f,
- 0x205f, 0x205f,
- 0x3000, 0x3000,
-}; /* CR_Zs */
-
-/* 'Common': Script */
-static const OnigCodePoint CR_Common[] = {
- 137,
- 0x0000, 0x0040,
- 0x005b, 0x0060,
- 0x007b, 0x00a9,
- 0x00ab, 0x00b9,
- 0x00bb, 0x00bf,
- 0x00d7, 0x00d7,
- 0x00f7, 0x00f7,
- 0x02b9, 0x02df,
- 0x02e5, 0x02ff,
- 0x0374, 0x0374,
- 0x037e, 0x037e,
- 0x0385, 0x0385,
- 0x0387, 0x0387,
- 0x0589, 0x0589,
- 0x0600, 0x0603,
- 0x060c, 0x060c,
- 0x061b, 0x061b,
- 0x061f, 0x061f,
- 0x0640, 0x0640,
- 0x0660, 0x0669,
- 0x06dd, 0x06dd,
- 0x0964, 0x0965,
- 0x0970, 0x0970,
- 0x0cf1, 0x0cf2,
- 0x0e3f, 0x0e3f,
- 0x10fb, 0x10fb,
- 0x16eb, 0x16ed,
- 0x1735, 0x1736,
- 0x1802, 0x1803,
- 0x1805, 0x1805,
- 0x2000, 0x200b,
- 0x200e, 0x2064,
- 0x206a, 0x2070,
- 0x2074, 0x207e,
- 0x2080, 0x208e,
- 0x20a0, 0x20b5,
- 0x2100, 0x2125,
- 0x2127, 0x2129,
- 0x212c, 0x2131,
- 0x2133, 0x214d,
- 0x214f, 0x214f,
- 0x2153, 0x215f,
- 0x2190, 0x23e7,
- 0x2400, 0x2426,
- 0x2440, 0x244a,
- 0x2460, 0x269d,
- 0x26a0, 0x26bc,
- 0x26c0, 0x26c3,
- 0x2701, 0x2704,
- 0x2706, 0x2709,
- 0x270c, 0x2727,
- 0x2729, 0x274b,
- 0x274d, 0x274d,
- 0x274f, 0x2752,
- 0x2756, 0x2756,
- 0x2758, 0x275e,
- 0x2761, 0x2794,
- 0x2798, 0x27af,
- 0x27b1, 0x27be,
- 0x27c0, 0x27ca,
- 0x27cc, 0x27cc,
- 0x27d0, 0x27ff,
- 0x2900, 0x2b4c,
- 0x2b50, 0x2b54,
- 0x2e00, 0x2e30,
- 0x2ff0, 0x2ffb,
- 0x3000, 0x3004,
- 0x3006, 0x3006,
- 0x3008, 0x3020,
- 0x3030, 0x3037,
- 0x303c, 0x303f,
- 0x309b, 0x309c,
- 0x30a0, 0x30a0,
- 0x30fb, 0x30fc,
- 0x3190, 0x319f,
- 0x31c0, 0x31e3,
- 0x3220, 0x3243,
- 0x3250, 0x325f,
- 0x327f, 0x32cf,
- 0x3358, 0x33ff,
- 0x4dc0, 0x4dff,
- 0xa700, 0xa721,
- 0xa788, 0xa78a,
- 0xfd3e, 0xfd3f,
- 0xfdfd, 0xfdfd,
- 0xfe10, 0xfe19,
- 0xfe30, 0xfe52,
- 0xfe54, 0xfe66,
- 0xfe68, 0xfe6b,
- 0xfeff, 0xfeff,
- 0xff01, 0xff20,
- 0xff3b, 0xff40,
- 0xff5b, 0xff65,
- 0xff70, 0xff70,
- 0xff9e, 0xff9f,
- 0xffe0, 0xffe6,
- 0xffe8, 0xffee,
- 0xfff9, 0xfffd,
- 0x10100, 0x10102,
- 0x10107, 0x10133,
- 0x10137, 0x1013f,
- 0x10190, 0x1019b,
- 0x101d0, 0x101fc,
- 0x1d000, 0x1d0f5,
- 0x1d100, 0x1d126,
- 0x1d129, 0x1d166,
- 0x1d16a, 0x1d17a,
- 0x1d183, 0x1d184,
- 0x1d18c, 0x1d1a9,
- 0x1d1ae, 0x1d1dd,
- 0x1d300, 0x1d356,
- 0x1d360, 0x1d371,
- 0x1d400, 0x1d454,
- 0x1d456, 0x1d49c,
- 0x1d49e, 0x1d49f,
- 0x1d4a2, 0x1d4a2,
- 0x1d4a5, 0x1d4a6,
- 0x1d4a9, 0x1d4ac,
- 0x1d4ae, 0x1d4b9,
- 0x1d4bb, 0x1d4bb,
- 0x1d4bd, 0x1d4c3,
- 0x1d4c5, 0x1d505,
- 0x1d507, 0x1d50a,
- 0x1d50d, 0x1d514,
- 0x1d516, 0x1d51c,
- 0x1d51e, 0x1d539,
- 0x1d53b, 0x1d53e,
- 0x1d540, 0x1d544,
- 0x1d546, 0x1d546,
- 0x1d54a, 0x1d550,
- 0x1d552, 0x1d6a5,
- 0x1d6a8, 0x1d7cb,
- 0x1d7ce, 0x1d7ff,
- 0x1f000, 0x1f02b,
- 0x1f030, 0x1f093,
- 0xe0001, 0xe0001,
- 0xe0020, 0xe007f,
-}; /* CR_Common */
-
-/* 'Latin': Script */
-static const OnigCodePoint CR_Latin[] = {
- 29,
- 0x0041, 0x005a,
- 0x0061, 0x007a,
- 0x00aa, 0x00aa,
- 0x00ba, 0x00ba,
- 0x00c0, 0x00d6,
- 0x00d8, 0x00f6,
- 0x00f8, 0x02b8,
- 0x02e0, 0x02e4,
- 0x1d00, 0x1d25,
- 0x1d2c, 0x1d5c,
- 0x1d62, 0x1d65,
- 0x1d6b, 0x1d77,
- 0x1d79, 0x1dbe,
- 0x1e00, 0x1eff,
- 0x2071, 0x2071,
- 0x207f, 0x207f,
- 0x2090, 0x2094,
- 0x212a, 0x212b,
- 0x2132, 0x2132,
- 0x214e, 0x214e,
- 0x2160, 0x2188,
- 0x2c60, 0x2c6f,
- 0x2c71, 0x2c7d,
- 0xa722, 0xa787,
- 0xa78b, 0xa78c,
- 0xa7fb, 0xa7ff,
- 0xfb00, 0xfb06,
- 0xff21, 0xff3a,
- 0xff41, 0xff5a,
-}; /* CR_Latin */
-
-/* 'Greek': Script */
-static const OnigCodePoint CR_Greek[] = {
- 33,
- 0x0370, 0x0373,
- 0x0375, 0x0377,
- 0x037a, 0x037d,
- 0x0384, 0x0384,
- 0x0386, 0x0386,
- 0x0388, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03e1,
- 0x03f0, 0x03ff,
- 0x1d26, 0x1d2a,
- 0x1d5d, 0x1d61,
- 0x1d66, 0x1d6a,
- 0x1dbf, 0x1dbf,
- 0x1f00, 0x1f15,
- 0x1f18, 0x1f1d,
- 0x1f20, 0x1f45,
- 0x1f48, 0x1f4d,
- 0x1f50, 0x1f57,
- 0x1f59, 0x1f59,
- 0x1f5b, 0x1f5b,
- 0x1f5d, 0x1f5d,
- 0x1f5f, 0x1f7d,
- 0x1f80, 0x1fb4,
- 0x1fb6, 0x1fc4,
- 0x1fc6, 0x1fd3,
- 0x1fd6, 0x1fdb,
- 0x1fdd, 0x1fef,
- 0x1ff2, 0x1ff4,
- 0x1ff6, 0x1ffe,
- 0x2126, 0x2126,
- 0x10140, 0x1018a,
- 0x1d200, 0x1d245,
-}; /* CR_Greek */
-
-/* 'Cyrillic': Script */
-static const OnigCodePoint CR_Cyrillic[] = {
- 7,
- 0x0400, 0x0523,
- 0x1d2b, 0x1d2b,
- 0x1d78, 0x1d78,
- 0x2de0, 0x2dff,
- 0xa640, 0xa65f,
- 0xa662, 0xa673,
- 0xa67c, 0xa697,
-}; /* CR_Cyrillic */
-
-/* 'Armenian': Script */
-static const OnigCodePoint CR_Armenian[] = {
- 5,
- 0x0531, 0x0556,
- 0x0559, 0x055f,
- 0x0561, 0x0587,
- 0x058a, 0x058a,
- 0xfb13, 0xfb17,
-}; /* CR_Armenian */
-
-/* 'Hebrew': Script */
-static const OnigCodePoint CR_Hebrew[] = {
- 9,
- 0x0591, 0x05c7,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0xfb1d, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfb4f,
-}; /* CR_Hebrew */
-
-/* 'Arabic': Script */
-static const OnigCodePoint CR_Arabic[] = {
- 17,
- 0x0606, 0x060b,
- 0x060d, 0x061a,
- 0x061e, 0x061e,
- 0x0621, 0x063f,
- 0x0641, 0x064a,
- 0x0656, 0x065e,
- 0x066a, 0x066f,
- 0x0671, 0x06dc,
- 0x06de, 0x06ff,
- 0x0750, 0x077f,
- 0xfb50, 0xfbb1,
- 0xfbd3, 0xfd3d,
- 0xfd50, 0xfd8f,
- 0xfd92, 0xfdc7,
- 0xfdf0, 0xfdfc,
- 0xfe70, 0xfe74,
- 0xfe76, 0xfefc,
-}; /* CR_Arabic */
-
-/* 'Syriac': Script */
-static const OnigCodePoint CR_Syriac[] = {
- 3,
- 0x0700, 0x070d,
- 0x070f, 0x074a,
- 0x074d, 0x074f,
-}; /* CR_Syriac */
-
-/* 'Thaana': Script */
-static const OnigCodePoint CR_Thaana[] = {
- 1,
- 0x0780, 0x07b1,
-}; /* CR_Thaana */
-
-/* 'Devanagari': Script */
-static const OnigCodePoint CR_Devanagari[] = {
- 8,
- 0x0901, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0950,
- 0x0953, 0x0954,
- 0x0958, 0x0963,
- 0x0966, 0x096f,
- 0x0971, 0x0972,
- 0x097b, 0x097f,
-}; /* CR_Devanagari */
-
-/* 'Bengali': Script */
-static const OnigCodePoint CR_Bengali[] = {
- 14,
- 0x0981, 0x0983,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bc, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09ce,
- 0x09d7, 0x09d7,
- 0x09dc, 0x09dd,
- 0x09df, 0x09e3,
- 0x09e6, 0x09fa,
-}; /* CR_Bengali */
-
-/* 'Gurmukhi': Script */
-static const OnigCodePoint CR_Gurmukhi[] = {
- 16,
- 0x0a01, 0x0a03,
- 0x0a05, 0x0a0a,
- 0x0a0f, 0x0a10,
- 0x0a13, 0x0a28,
- 0x0a2a, 0x0a30,
- 0x0a32, 0x0a33,
- 0x0a35, 0x0a36,
- 0x0a38, 0x0a39,
- 0x0a3c, 0x0a3c,
- 0x0a3e, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4d,
- 0x0a51, 0x0a51,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a66, 0x0a75,
-}; /* CR_Gurmukhi */
-
-/* 'Gujarati': Script */
-static const OnigCodePoint CR_Gujarati[] = {
- 14,
- 0x0a81, 0x0a83,
- 0x0a85, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abc, 0x0ac5,
- 0x0ac7, 0x0ac9,
- 0x0acb, 0x0acd,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae3,
- 0x0ae6, 0x0aef,
- 0x0af1, 0x0af1,
-}; /* CR_Gujarati */
-
-/* 'Oriya': Script */
-static const OnigCodePoint CR_Oriya[] = {
- 14,
- 0x0b01, 0x0b03,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b35, 0x0b39,
- 0x0b3c, 0x0b44,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b63,
- 0x0b66, 0x0b71,
-}; /* CR_Oriya */
-
-/* 'Tamil': Script */
-static const OnigCodePoint CR_Tamil[] = {
- 16,
- 0x0b82, 0x0b83,
- 0x0b85, 0x0b8a,
- 0x0b8e, 0x0b90,
- 0x0b92, 0x0b95,
- 0x0b99, 0x0b9a,
- 0x0b9c, 0x0b9c,
- 0x0b9e, 0x0b9f,
- 0x0ba3, 0x0ba4,
- 0x0ba8, 0x0baa,
- 0x0bae, 0x0bb9,
- 0x0bbe, 0x0bc2,
- 0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcd,
- 0x0bd0, 0x0bd0,
- 0x0bd7, 0x0bd7,
- 0x0be6, 0x0bfa,
-}; /* CR_Tamil */
-
-/* 'Telugu': Script */
-static const OnigCodePoint CR_Telugu[] = {
- 14,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3d, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c58, 0x0c59,
- 0x0c60, 0x0c63,
- 0x0c66, 0x0c6f,
- 0x0c78, 0x0c7f,
-}; /* CR_Telugu */
-
-/* 'Kannada': Script */
-static const OnigCodePoint CR_Kannada[] = {
- 13,
- 0x0c82, 0x0c83,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbc, 0x0cc4,
- 0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccd,
- 0x0cd5, 0x0cd6,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce3,
- 0x0ce6, 0x0cef,
-}; /* CR_Kannada */
-
-/* 'Malayalam': Script */
-static const OnigCodePoint CR_Malayalam[] = {
- 12,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3d, 0x0d44,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d63,
- 0x0d66, 0x0d75,
- 0x0d79, 0x0d7f,
-}; /* CR_Malayalam */
-
-/* 'Sinhala': Script */
-static const OnigCodePoint CR_Sinhala[] = {
- 11,
- 0x0d82, 0x0d83,
- 0x0d85, 0x0d96,
- 0x0d9a, 0x0db1,
- 0x0db3, 0x0dbb,
- 0x0dbd, 0x0dbd,
- 0x0dc0, 0x0dc6,
- 0x0dca, 0x0dca,
- 0x0dcf, 0x0dd4,
- 0x0dd6, 0x0dd6,
- 0x0dd8, 0x0ddf,
- 0x0df2, 0x0df4,
-}; /* CR_Sinhala */
-
-/* 'Thai': Script */
-static const OnigCodePoint CR_Thai[] = {
- 2,
- 0x0e01, 0x0e3a,
- 0x0e40, 0x0e5b,
-}; /* CR_Thai */
-
-/* 'Lao': Script */
-static const OnigCodePoint CR_Lao[] = {
- 18,
- 0x0e81, 0x0e82,
- 0x0e84, 0x0e84,
- 0x0e87, 0x0e88,
- 0x0e8a, 0x0e8a,
- 0x0e8d, 0x0e8d,
- 0x0e94, 0x0e97,
- 0x0e99, 0x0e9f,
- 0x0ea1, 0x0ea3,
- 0x0ea5, 0x0ea5,
- 0x0ea7, 0x0ea7,
- 0x0eaa, 0x0eab,
- 0x0ead, 0x0eb9,
- 0x0ebb, 0x0ebd,
- 0x0ec0, 0x0ec4,
- 0x0ec6, 0x0ec6,
- 0x0ec8, 0x0ecd,
- 0x0ed0, 0x0ed9,
- 0x0edc, 0x0edd,
-}; /* CR_Lao */
-
-/* 'Tibetan': Script */
-static const OnigCodePoint CR_Tibetan[] = {
- 7,
- 0x0f00, 0x0f47,
- 0x0f49, 0x0f6c,
- 0x0f71, 0x0f8b,
- 0x0f90, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fbe, 0x0fcc,
- 0x0fce, 0x0fd4,
-}; /* CR_Tibetan */
-
-/* 'Myanmar': Script */
-static const OnigCodePoint CR_Myanmar[] = {
- 2,
- 0x1000, 0x1099,
- 0x109e, 0x109f,
-}; /* CR_Myanmar */
-
-/* 'Georgian': Script */
-static const OnigCodePoint CR_Georgian[] = {
- 4,
- 0x10a0, 0x10c5,
- 0x10d0, 0x10fa,
- 0x10fc, 0x10fc,
- 0x2d00, 0x2d25,
-}; /* CR_Georgian */
-
-/* 'Hangul': Script */
-static const OnigCodePoint CR_Hangul[] = {
- 12,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x3131, 0x318e,
- 0x3200, 0x321e,
- 0x3260, 0x327e,
- 0xac00, 0xd7a3,
- 0xffa0, 0xffbe,
- 0xffc2, 0xffc7,
- 0xffca, 0xffcf,
- 0xffd2, 0xffd7,
- 0xffda, 0xffdc,
-}; /* CR_Hangul */
-
-/* 'Ethiopic': Script */
-static const OnigCodePoint CR_Ethiopic[] = {
- 27,
- 0x1200, 0x1248,
- 0x124a, 0x124d,
- 0x1250, 0x1256,
- 0x1258, 0x1258,
- 0x125a, 0x125d,
- 0x1260, 0x1288,
- 0x128a, 0x128d,
- 0x1290, 0x12b0,
- 0x12b2, 0x12b5,
- 0x12b8, 0x12be,
- 0x12c0, 0x12c0,
- 0x12c2, 0x12c5,
- 0x12c8, 0x12d6,
- 0x12d8, 0x1310,
- 0x1312, 0x1315,
- 0x1318, 0x135a,
- 0x135f, 0x137c,
- 0x1380, 0x1399,
- 0x2d80, 0x2d96,
- 0x2da0, 0x2da6,
- 0x2da8, 0x2dae,
- 0x2db0, 0x2db6,
- 0x2db8, 0x2dbe,
- 0x2dc0, 0x2dc6,
- 0x2dc8, 0x2dce,
- 0x2dd0, 0x2dd6,
- 0x2dd8, 0x2dde,
-}; /* CR_Ethiopic */
-
-/* 'Cherokee': Script */
-static const OnigCodePoint CR_Cherokee[] = {
- 1,
- 0x13a0, 0x13f4,
-}; /* CR_Cherokee */
-
-/* 'Canadian_Aboriginal': Script */
-static const OnigCodePoint CR_Canadian_Aboriginal[] = {
- 1,
- 0x1401, 0x1676,
-}; /* CR_Canadian_Aboriginal */
-
-/* 'Ogham': Script */
-static const OnigCodePoint CR_Ogham[] = {
- 1,
- 0x1680, 0x169c,
-}; /* CR_Ogham */
-
-/* 'Runic': Script */
-static const OnigCodePoint CR_Runic[] = {
- 2,
- 0x16a0, 0x16ea,
- 0x16ee, 0x16f0,
-}; /* CR_Runic */
-
-/* 'Khmer': Script */
-static const OnigCodePoint CR_Khmer[] = {
- 4,
- 0x1780, 0x17dd,
- 0x17e0, 0x17e9,
- 0x17f0, 0x17f9,
- 0x19e0, 0x19ff,
-}; /* CR_Khmer */
-
-/* 'Mongolian': Script */
-static const OnigCodePoint CR_Mongolian[] = {
- 6,
- 0x1800, 0x1801,
- 0x1804, 0x1804,
- 0x1806, 0x180e,
- 0x1810, 0x1819,
- 0x1820, 0x1877,
- 0x1880, 0x18aa,
-}; /* CR_Mongolian */
-
-/* 'Hiragana': Script */
-static const OnigCodePoint CR_Hiragana[] = {
- 2,
- 0x3041, 0x3096,
- 0x309d, 0x309f,
-}; /* CR_Hiragana */
-
-/* 'Katakana': Script */
-static const OnigCodePoint CR_Katakana[] = {
- 7,
- 0x30a1, 0x30fa,
- 0x30fd, 0x30ff,
- 0x31f0, 0x31ff,
- 0x32d0, 0x32fe,
- 0x3300, 0x3357,
- 0xff66, 0xff6f,
- 0xff71, 0xff9d,
-}; /* CR_Katakana */
-
-/* 'Bopomofo': Script */
-static const OnigCodePoint CR_Bopomofo[] = {
- 2,
- 0x3105, 0x312d,
- 0x31a0, 0x31b7,
-}; /* CR_Bopomofo */
-
-/* 'Han': Script */
-static const OnigCodePoint CR_Han[] = {
- 14,
- 0x2e80, 0x2e99,
- 0x2e9b, 0x2ef3,
- 0x2f00, 0x2fd5,
- 0x3005, 0x3005,
- 0x3007, 0x3007,
- 0x3021, 0x3029,
- 0x3038, 0x303b,
- 0x3400, 0x4db5,
- 0x4e00, 0x9fc3,
- 0xf900, 0xfa2d,
- 0xfa30, 0xfa6a,
- 0xfa70, 0xfad9,
- 0x20000, 0x2a6d6,
- 0x2f800, 0x2fa1d,
-}; /* CR_Han */
-
-/* 'Yi': Script */
-static const OnigCodePoint CR_Yi[] = {
- 2,
- 0xa000, 0xa48c,
- 0xa490, 0xa4c6,
-}; /* CR_Yi */
-
-/* 'Old_Italic': Script */
-static const OnigCodePoint CR_Old_Italic[] = {
- 2,
- 0x10300, 0x1031e,
- 0x10320, 0x10323,
-}; /* CR_Old_Italic */
-
-/* 'Gothic': Script */
-static const OnigCodePoint CR_Gothic[] = {
- 1,
- 0x10330, 0x1034a,
-}; /* CR_Gothic */
-
-/* 'Deseret': Script */
-static const OnigCodePoint CR_Deseret[] = {
- 1,
- 0x10400, 0x1044f,
-}; /* CR_Deseret */
-
-/* 'Inherited': Script */
-static const OnigCodePoint CR_Inherited[] = {
- 18,
- 0x0300, 0x036f,
- 0x064b, 0x0655,
- 0x0670, 0x0670,
- 0x0951, 0x0952,
- 0x1dc0, 0x1de6,
- 0x1dfe, 0x1dff,
- 0x200c, 0x200d,
- 0x20d0, 0x20f0,
- 0x302a, 0x302f,
- 0x3099, 0x309a,
- 0xfe00, 0xfe0f,
- 0xfe20, 0xfe26,
- 0x101fd, 0x101fd,
- 0x1d167, 0x1d169,
- 0x1d17b, 0x1d182,
- 0x1d185, 0x1d18b,
- 0x1d1aa, 0x1d1ad,
- 0xe0100, 0xe01ef,
-}; /* CR_Inherited */
-
-/* 'Tagalog': Script */
-static const OnigCodePoint CR_Tagalog[] = {
- 2,
- 0x1700, 0x170c,
- 0x170e, 0x1714,
-}; /* CR_Tagalog */
-
-/* 'Hanunoo': Script */
-static const OnigCodePoint CR_Hanunoo[] = {
- 1,
- 0x1720, 0x1734,
-}; /* CR_Hanunoo */
-
-/* 'Buhid': Script */
-static const OnigCodePoint CR_Buhid[] = {
- 1,
- 0x1740, 0x1753,
-}; /* CR_Buhid */
-
-/* 'Tagbanwa': Script */
-static const OnigCodePoint CR_Tagbanwa[] = {
- 3,
- 0x1760, 0x176c,
- 0x176e, 0x1770,
- 0x1772, 0x1773,
-}; /* CR_Tagbanwa */
-
-/* 'Limbu': Script */
-static const OnigCodePoint CR_Limbu[] = {
- 5,
- 0x1900, 0x191c,
- 0x1920, 0x192b,
- 0x1930, 0x193b,
- 0x1940, 0x1940,
- 0x1944, 0x194f,
-}; /* CR_Limbu */
-
-/* 'Tai_Le': Script */
-static const OnigCodePoint CR_Tai_Le[] = {
- 2,
- 0x1950, 0x196d,
- 0x1970, 0x1974,
-}; /* CR_Tai_Le */
-
-/* 'Linear_B': Script */
-static const OnigCodePoint CR_Linear_B[] = {
- 7,
- 0x10000, 0x1000b,
- 0x1000d, 0x10026,
- 0x10028, 0x1003a,
- 0x1003c, 0x1003d,
- 0x1003f, 0x1004d,
- 0x10050, 0x1005d,
- 0x10080, 0x100fa,
-}; /* CR_Linear_B */
-
-/* 'Ugaritic': Script */
-static const OnigCodePoint CR_Ugaritic[] = {
- 2,
- 0x10380, 0x1039d,
- 0x1039f, 0x1039f,
-}; /* CR_Ugaritic */
-
-/* 'Shavian': Script */
-static const OnigCodePoint CR_Shavian[] = {
- 1,
- 0x10450, 0x1047f,
-}; /* CR_Shavian */
-
-/* 'Osmanya': Script */
-static const OnigCodePoint CR_Osmanya[] = {
- 2,
- 0x10480, 0x1049d,
- 0x104a0, 0x104a9,
-}; /* CR_Osmanya */
-
-/* 'Cypriot': Script */
-static const OnigCodePoint CR_Cypriot[] = {
- 6,
- 0x10800, 0x10805,
- 0x10808, 0x10808,
- 0x1080a, 0x10835,
- 0x10837, 0x10838,
- 0x1083c, 0x1083c,
- 0x1083f, 0x1083f,
-}; /* CR_Cypriot */
-
-/* 'Braille': Script */
-static const OnigCodePoint CR_Braille[] = {
- 1,
- 0x2800, 0x28ff,
-}; /* CR_Braille */
-
-/* 'Buginese': Script */
-static const OnigCodePoint CR_Buginese[] = {
- 2,
- 0x1a00, 0x1a1b,
- 0x1a1e, 0x1a1f,
-}; /* CR_Buginese */
-
-/* 'Coptic': Script */
-static const OnigCodePoint CR_Coptic[] = {
- 3,
- 0x03e2, 0x03ef,
- 0x2c80, 0x2cea,
- 0x2cf9, 0x2cff,
-}; /* CR_Coptic */
-
-/* 'New_Tai_Lue': Script */
-static const OnigCodePoint CR_New_Tai_Lue[] = {
- 4,
- 0x1980, 0x19a9,
- 0x19b0, 0x19c9,
- 0x19d0, 0x19d9,
- 0x19de, 0x19df,
-}; /* CR_New_Tai_Lue */
-
-/* 'Glagolitic': Script */
-static const OnigCodePoint CR_Glagolitic[] = {
- 2,
- 0x2c00, 0x2c2e,
- 0x2c30, 0x2c5e,
-}; /* CR_Glagolitic */
-
-/* 'Tifinagh': Script */
-static const OnigCodePoint CR_Tifinagh[] = {
- 2,
- 0x2d30, 0x2d65,
- 0x2d6f, 0x2d6f,
-}; /* CR_Tifinagh */
-
-/* 'Syloti_Nagri': Script */
-static const OnigCodePoint CR_Syloti_Nagri[] = {
- 1,
- 0xa800, 0xa82b,
-}; /* CR_Syloti_Nagri */
-
-/* 'Old_Persian': Script */
-static const OnigCodePoint CR_Old_Persian[] = {
- 2,
- 0x103a0, 0x103c3,
- 0x103c8, 0x103d5,
-}; /* CR_Old_Persian */
-
-/* 'Kharoshthi': Script */
-static const OnigCodePoint CR_Kharoshthi[] = {
- 8,
- 0x10a00, 0x10a03,
- 0x10a05, 0x10a06,
- 0x10a0c, 0x10a13,
- 0x10a15, 0x10a17,
- 0x10a19, 0x10a33,
- 0x10a38, 0x10a3a,
- 0x10a3f, 0x10a47,
- 0x10a50, 0x10a58,
-}; /* CR_Kharoshthi */
-
-/* 'Balinese': Script */
-static const OnigCodePoint CR_Balinese[] = {
- 2,
- 0x1b00, 0x1b4b,
- 0x1b50, 0x1b7c,
-}; /* CR_Balinese */
-
-/* 'Cuneiform': Script */
-static const OnigCodePoint CR_Cuneiform[] = {
- 3,
- 0x12000, 0x1236e,
- 0x12400, 0x12462,
- 0x12470, 0x12473,
-}; /* CR_Cuneiform */
-
-/* 'Phoenician': Script */
-static const OnigCodePoint CR_Phoenician[] = {
- 2,
- 0x10900, 0x10919,
- 0x1091f, 0x1091f,
-}; /* CR_Phoenician */
-
-/* 'Phags_Pa': Script */
-static const OnigCodePoint CR_Phags_Pa[] = {
- 1,
- 0xa840, 0xa877,
-}; /* CR_Phags_Pa */
-
-/* 'Nko': Script */
-static const OnigCodePoint CR_Nko[] = {
- 1,
- 0x07c0, 0x07fa,
-}; /* CR_Nko */
-
-/* 'Sundanese': Script */
-static const OnigCodePoint CR_Sundanese[] = {
- 2,
- 0x1b80, 0x1baa,
- 0x1bae, 0x1bb9,
-}; /* CR_Sundanese */
-
-/* 'Lepcha': Script */
-static const OnigCodePoint CR_Lepcha[] = {
- 3,
- 0x1c00, 0x1c37,
- 0x1c3b, 0x1c49,
- 0x1c4d, 0x1c4f,
-}; /* CR_Lepcha */
-
-/* 'Ol_Chiki': Script */
-static const OnigCodePoint CR_Ol_Chiki[] = {
- 1,
- 0x1c50, 0x1c7f,
-}; /* CR_Ol_Chiki */
-
-/* 'Vai': Script */
-static const OnigCodePoint CR_Vai[] = {
- 1,
- 0xa500, 0xa62b,
-}; /* CR_Vai */
-
-/* 'Saurashtra': Script */
-static const OnigCodePoint CR_Saurashtra[] = {
- 2,
- 0xa880, 0xa8c4,
- 0xa8ce, 0xa8d9,
-}; /* CR_Saurashtra */
-
-/* 'Kayah_Li': Script */
-static const OnigCodePoint CR_Kayah_Li[] = {
- 1,
- 0xa900, 0xa92f,
-}; /* CR_Kayah_Li */
-
-/* 'Rejang': Script */
-static const OnigCodePoint CR_Rejang[] = {
- 2,
- 0xa930, 0xa953,
- 0xa95f, 0xa95f,
-}; /* CR_Rejang */
-
-/* 'Lycian': Script */
-static const OnigCodePoint CR_Lycian[] = {
- 1,
- 0x10280, 0x1029c,
-}; /* CR_Lycian */
-
-/* 'Carian': Script */
-static const OnigCodePoint CR_Carian[] = {
- 1,
- 0x102a0, 0x102d0,
-}; /* CR_Carian */
-
-/* 'Lydian': Script */
-static const OnigCodePoint CR_Lydian[] = {
- 2,
- 0x10920, 0x10939,
- 0x1093f, 0x1093f,
-}; /* CR_Lydian */
-
-/* 'Cham': Script */
-static const OnigCodePoint CR_Cham[] = {
- 4,
- 0xaa00, 0xaa36,
- 0xaa40, 0xaa4d,
- 0xaa50, 0xaa59,
- 0xaa5c, 0xaa5f,
-}; /* CR_Cham */
-#endif /* USE_UNICODE_PROPERTIES */
-
-
-static const OnigCodePoint* const CodeRanges[] = {
- CR_NEWLINE,
- CR_Alpha,
- CR_Blank,
- CR_Cntrl,
- CR_Digit,
- CR_Graph,
- CR_Lower,
- CR_Print,
- CR_Punct,
- CR_Space,
- CR_Upper,
- CR_XDigit,
- CR_Word,
- CR_Alnum,
- CR_ASCII,
-#ifdef USE_UNICODE_PROPERTIES
- CR_Any,
- CR_Assigned,
- CR_C,
- CR_Cc,
- CR_Cf,
- CR_Cn,
- CR_Co,
- CR_Cs,
- CR_L,
- CR_Ll,
- CR_Lm,
- CR_Lo,
- CR_Lt,
- CR_Lu,
- CR_M,
- CR_Mc,
- CR_Me,
- CR_Mn,
- CR_N,
- CR_Nd,
- CR_Nl,
- CR_No,
- CR_P,
- CR_Pc,
- CR_Pd,
- CR_Pe,
- CR_Pf,
- CR_Pi,
- CR_Po,
- CR_Ps,
- CR_S,
- CR_Sc,
- CR_Sk,
- CR_Sm,
- CR_So,
- CR_Z,
- CR_Zl,
- CR_Zp,
- CR_Zs,
- CR_Common,
- CR_Latin,
- CR_Greek,
- CR_Cyrillic,
- CR_Armenian,
- CR_Hebrew,
- CR_Arabic,
- CR_Syriac,
- CR_Thaana,
- CR_Devanagari,
- CR_Bengali,
- CR_Gurmukhi,
- CR_Gujarati,
- CR_Oriya,
- CR_Tamil,
- CR_Telugu,
- CR_Kannada,
- CR_Malayalam,
- CR_Sinhala,
- CR_Thai,
- CR_Lao,
- CR_Tibetan,
- CR_Myanmar,
- CR_Georgian,
- CR_Hangul,
- CR_Ethiopic,
- CR_Cherokee,
- CR_Canadian_Aboriginal,
- CR_Ogham,
- CR_Runic,
- CR_Khmer,
- CR_Mongolian,
- CR_Hiragana,
- CR_Katakana,
- CR_Bopomofo,
- CR_Han,
- CR_Yi,
- CR_Old_Italic,
- CR_Gothic,
- CR_Deseret,
- CR_Inherited,
- CR_Tagalog,
- CR_Hanunoo,
- CR_Buhid,
- CR_Tagbanwa,
- CR_Limbu,
- CR_Tai_Le,
- CR_Linear_B,
- CR_Ugaritic,
- CR_Shavian,
- CR_Osmanya,
- CR_Cypriot,
- CR_Braille,
- CR_Buginese,
- CR_Coptic,
- CR_New_Tai_Lue,
- CR_Glagolitic,
- CR_Tifinagh,
- CR_Syloti_Nagri,
- CR_Old_Persian,
- CR_Kharoshthi,
- CR_Balinese,
- CR_Cuneiform,
- CR_Phoenician,
- CR_Phags_Pa,
- CR_Nko,
- CR_Sundanese,
- CR_Lepcha,
- CR_Ol_Chiki,
- CR_Vai,
- CR_Saurashtra,
- CR_Kayah_Li,
- CR_Rejang,
- CR_Lycian,
- CR_Carian,
- CR_Lydian,
- CR_Cham,
-#endif /* USE_UNICODE_PROPERTIES */
-};
-struct uniname2ctype_struct {
- int name, ctype;
-};
-
-static const struct uniname2ctype_struct *uniname2ctype_p(const char *, unsigned int);
-%}
-struct uniname2ctype_struct;
-%%
-NEWLINE, 0
-Alpha, 1
-Blank, 2
-Cntrl, 3
-Digit, 4
-Graph, 5
-Lower, 6
-Print, 7
-Punct, 8
-Space, 9
-Upper, 10
-XDigit, 11
-Word, 12
-Alnum, 13
-ASCII, 14
-#ifdef USE_UNICODE_PROPERTIES
-Any, 15
-Assigned, 16
-C, 17
-Cc, 18
-Cf, 19
-Cn, 20
-Co, 21
-Cs, 22
-L, 23
-Ll, 24
-Lm, 25
-Lo, 26
-Lt, 27
-Lu, 28
-M, 29
-Mc, 30
-Me, 31
-Mn, 32
-N, 33
-Nd, 34
-Nl, 35
-No, 36
-P, 37
-Pc, 38
-Pd, 39
-Pe, 40
-Pf, 41
-Pi, 42
-Po, 43
-Ps, 44
-S, 45
-Sc, 46
-Sk, 47
-Sm, 48
-So, 49
-Z, 50
-Zl, 51
-Zp, 52
-Zs, 53
-Common, 54
-Latin, 55
-Greek, 56
-Cyrillic, 57
-Armenian, 58
-Hebrew, 59
-Arabic, 60
-Syriac, 61
-Thaana, 62
-Devanagari, 63
-Bengali, 64
-Gurmukhi, 65
-Gujarati, 66
-Oriya, 67
-Tamil, 68
-Telugu, 69
-Kannada, 70
-Malayalam, 71
-Sinhala, 72
-Thai, 73
-Lao, 74
-Tibetan, 75
-Myanmar, 76
-Georgian, 77
-Hangul, 78
-Ethiopic, 79
-Cherokee, 80
-Canadian_Aboriginal, 81
-Ogham, 82
-Runic, 83
-Khmer, 84
-Mongolian, 85
-Hiragana, 86
-Katakana, 87
-Bopomofo, 88
-Han, 89
-Yi, 90
-Old_Italic, 91
-Gothic, 92
-Deseret, 93
-Inherited, 94
-Tagalog, 95
-Hanunoo, 96
-Buhid, 97
-Tagbanwa, 98
-Limbu, 99
-Tai_Le, 100
-Linear_B, 101
-Ugaritic, 102
-Shavian, 103
-Osmanya, 104
-Cypriot, 105
-Braille, 106
-Buginese, 107
-Coptic, 108
-New_Tai_Lue, 109
-Glagolitic, 110
-Tifinagh, 111
-Syloti_Nagri, 112
-Old_Persian, 113
-Kharoshthi, 114
-Balinese, 115
-Cuneiform, 116
-Phoenician, 117
-Phags_Pa, 118
-Nko, 119
-Sundanese, 120
-Lepcha, 121
-Ol_Chiki, 122
-Vai, 123
-Saurashtra, 124
-Kayah_Li, 125
-Rejang, 126
-Lycian, 127
-Carian, 128
-Lydian, 129
-Cham, 130
-#endif /* USE_UNICODE_PROPERTIES */
-%%
-static int
-uniname2ctype(const UChar *name, unsigned int len)
-{
- const struct uniname2ctype_struct *p = uniname2ctype_p((const char *)name, len);
- if (p) return p->ctype;
- return -1;
-}
diff --git a/enc/us_ascii.c b/enc/us_ascii.c
deleted file mode 100644
index 2e96dd3846..0000000000
--- a/enc/us_ascii.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include "regenc.h"
-
-static int
-us_ascii_mbc_enc_len(const UChar* p, const UChar* e, OnigEncoding enc)
-{
- if (*p & 0x80)
- return ONIGENC_CONSTRUCT_MBCLEN_INVALID();
- return ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(1);
-}
-
-OnigEncodingDefine(us_ascii, US_ASCII) = {
- us_ascii_mbc_enc_len,
- "US-ASCII",/* name */
- 1, /* max byte length */
- 1, /* min byte length */
- onigenc_is_mbc_newline_0x0a,
- onigenc_single_byte_mbc_to_code,
- onigenc_single_byte_code_to_mbclen,
- onigenc_single_byte_code_to_mbc,
- onigenc_ascii_mbc_case_fold,
- onigenc_ascii_apply_all_case_fold,
- onigenc_ascii_get_case_fold_codes_by_str,
- onigenc_minimum_property_name_to_ctype,
- onigenc_ascii_is_code_ctype,
- onigenc_not_support_get_ctype_code_range,
- onigenc_single_byte_left_adjust_char_head,
- onigenc_always_true_is_allowed_reverse_match
-};
-ENC_ALIAS("ASCII", "US-ASCII")
-ENC_ALIAS("ANSI_X3.4-1968", "US-ASCII")
-ENC_ALIAS("646", "US-ASCII")
diff --git a/enc/utf_16be.c b/enc/utf_16be.c
deleted file mode 100644
index 8d7c8e9b11..0000000000
--- a/enc/utf_16be.c
+++ /dev/null
@@ -1,258 +0,0 @@
-/**********************************************************************
- utf_16be.c - Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2007 K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regenc.h"
-
-#define UTF16_IS_SURROGATE_FIRST(c) (((c) & 0xfc) == 0xd8)
-#define UTF16_IS_SURROGATE_SECOND(c) (((c) & 0xfc) == 0xdc)
-#define UTF16_IS_SURROGATE(c) (((c) & 0xf8) == 0xd8)
-
-static const int EncLen_UTF16[] = {
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 4, 4, 4, 4, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2
-};
-
-static int
-utf16be_mbc_enc_len(const UChar* p, const OnigUChar* e ARG_UNUSED,
- OnigEncoding enc ARG_UNUSED)
-{
- int byte = p[0];
- if (!UTF16_IS_SURROGATE(byte)) {
- if (2 <= e-p)
- return ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(2);
- else
- return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(1);
- }
- if (UTF16_IS_SURROGATE_FIRST(byte)) {
- switch (e-p) {
- case 1: return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(3);
- case 2: return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(2);
- case 3:
- if (UTF16_IS_SURROGATE_SECOND(p[2]))
- return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(1);
- break;
- default:
- if (UTF16_IS_SURROGATE_SECOND(p[2]))
- return ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(4);
- break;
- }
- }
- return ONIGENC_CONSTRUCT_MBCLEN_INVALID();
-}
-
-static int
-utf16be_is_mbc_newline(const UChar* p, const UChar* end,
- OnigEncoding enc)
-{
- if (p + 1 < end) {
- if (*(p+1) == 0x0a && *p == 0x00)
- return 1;
-#ifdef USE_UNICODE_ALL_LINE_TERMINATORS
- if ((
-#ifndef USE_CRNL_AS_LINE_TERMINATOR
- *(p+1) == 0x0d ||
-#endif
- *(p+1) == 0x85) && *p == 0x00)
- return 1;
- if (*p == 0x20 && (*(p+1) == 0x29 || *(p+1) == 0x28))
- return 1;
-#endif
- }
- return 0;
-}
-
-static OnigCodePoint
-utf16be_mbc_to_code(const UChar* p, const UChar* end ARG_UNUSED,
- OnigEncoding enc)
-{
- OnigCodePoint code;
-
- if (UTF16_IS_SURROGATE_FIRST(*p)) {
- code = ((((p[0] - 0xd8) << 2) + ((p[1] & 0xc0) >> 6) + 1) << 16)
- + ((((p[1] & 0x3f) << 2) + (p[2] - 0xdc)) << 8)
- + p[3];
- }
- else {
- code = p[0] * 256 + p[1];
- }
- return code;
-}
-
-static int
-utf16be_code_to_mbclen(OnigCodePoint code,
- OnigEncoding enc)
-{
- return (code > 0xffff ? 4 : 2);
-}
-
-static int
-utf16be_code_to_mbc(OnigCodePoint code, UChar *buf,
- OnigEncoding enc)
-{
- UChar* p = buf;
-
- if (code > 0xffff) {
- unsigned int high = (code >> 10) + 0xD7C0;
- unsigned int low = (code & 0x3FF) + 0xDC00;
- *p++ = (high >> 8) & 0xFF;
- *p++ = high & 0xFF;
- *p++ = (low >> 8) & 0xFF;
- *p++ = low & 0xFF;
- return 4;
- }
- else {
- *p++ = (UChar )((code & 0xff00) >> 8);
- *p++ = (UChar )(code & 0xff);
- return 2;
- }
-}
-
-static int
-utf16be_mbc_case_fold(OnigCaseFoldType flag,
- const UChar** pp, const UChar* end, UChar* fold,
- OnigEncoding enc)
-{
- const UChar* p = *pp;
-
- if (ONIGENC_IS_ASCII_CODE(*(p+1)) && *p == 0) {
- p++;
-#ifdef USE_UNICODE_CASE_FOLD_TURKISH_AZERI
- if ((flag & ONIGENC_CASE_FOLD_TURKISH_AZERI) != 0) {
- if (*p == 0x49) {
- *fold++ = 0x01;
- *fold = 0x31;
- (*pp) += 2;
- return 2;
- }
- }
-#endif
-
- *fold++ = 0;
- *fold = ONIGENC_ASCII_CODE_TO_LOWER_CASE(*p);
- *pp += 2;
- return 2;
- }
- else
- return onigenc_unicode_mbc_case_fold(enc, flag,
- pp, end, fold);
-}
-
-#if 0
-static int
-utf16be_is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* end)
-{
- const UChar* p = *pp;
-
- (*pp) += EncLen_UTF16[*p];
-
- if (*p == 0) {
- int c, v;
-
- p++;
- if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
- return TRUE;
- }
-
- c = *p;
- v = ONIGENC_IS_UNICODE_ISO_8859_1_BIT_CTYPE(c,
- (BIT_CTYPE_UPPER | BIT_CTYPE_LOWER));
-
- if ((v | BIT_CTYPE_LOWER) != 0) {
- /* 0xaa, 0xb5, 0xba are lower case letter, but can't convert. */
- if (c >= 0xaa && c <= 0xba)
- return FALSE;
- else
- return TRUE;
- }
- return (v != 0 ? TRUE : FALSE);
- }
-
- return FALSE;
-}
-#endif
-
-static UChar*
-utf16be_left_adjust_char_head(const UChar* start, const UChar* s, const UChar* end,
- OnigEncoding enc ARG_UNUSED)
-{
- if (s <= start) return (UChar* )s;
-
- if ((s - start) % 2 == 1) {
- s--;
- }
-
- if (UTF16_IS_SURROGATE_SECOND(*s) && s > start + 1)
- s -= 2;
-
- return (UChar* )s;
-}
-
-static int
-utf16be_get_case_fold_codes_by_str(OnigCaseFoldType flag,
- const OnigUChar* p, const OnigUChar* end,
- OnigCaseFoldCodeItem items[],
- OnigEncoding enc)
-{
- return onigenc_unicode_get_case_fold_codes_by_str(enc,
- flag, p, end, items);
-}
-
-OnigEncodingDefine(utf_16be, UTF_16BE) = {
- utf16be_mbc_enc_len,
- "UTF-16BE", /* name */
- 4, /* max byte length */
- 2, /* min byte length */
- utf16be_is_mbc_newline,
- utf16be_mbc_to_code,
- utf16be_code_to_mbclen,
- utf16be_code_to_mbc,
- utf16be_mbc_case_fold,
- onigenc_unicode_apply_all_case_fold,
- utf16be_get_case_fold_codes_by_str,
- onigenc_unicode_property_name_to_ctype,
- onigenc_unicode_is_code_ctype,
- onigenc_utf16_32_get_ctype_code_range,
- utf16be_left_adjust_char_head,
- onigenc_always_false_is_allowed_reverse_match
-};
-ENC_ALIAS("UCS-2BE", "UTF-16BE")
diff --git a/enc/utf_16le.c b/enc/utf_16le.c
deleted file mode 100644
index c8a1e7a10a..0000000000
--- a/enc/utf_16le.c
+++ /dev/null
@@ -1,249 +0,0 @@
-/**********************************************************************
- utf_16le.c - Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2007 K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regenc.h"
-
-#define UTF16_IS_SURROGATE_FIRST(c) (((c) & 0xfc) == 0xd8)
-#define UTF16_IS_SURROGATE_SECOND(c) (((c) & 0xfc) == 0xdc)
-#define UTF16_IS_SURROGATE(c) (((c) & 0xf8) == 0xd8)
-
-static const int EncLen_UTF16[] = {
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 4, 4, 4, 4, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2
-};
-
-static int
-utf16le_mbc_enc_len(const UChar* p, const OnigUChar* e,
- OnigEncoding enc ARG_UNUSED)
-{
- int len = e-p, byte;
- if (len < 2)
- return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(1);
- byte = p[1];
- if (!UTF16_IS_SURROGATE(byte)) {
- return ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(2);
- }
- if (UTF16_IS_SURROGATE_FIRST(byte)) {
- if (len < 4)
- return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(4-len);
- if (UTF16_IS_SURROGATE_SECOND(p[3]))
- return ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(4);
- }
- return ONIGENC_CONSTRUCT_MBCLEN_INVALID();
-}
-
-static int
-utf16le_is_mbc_newline(const UChar* p, const UChar* end,
- OnigEncoding enc ARG_UNUSED)
-{
- if (p + 1 < end) {
- if (*p == 0x0a && *(p+1) == 0x00)
- return 1;
-#ifdef USE_UNICODE_ALL_LINE_TERMINATORS
- if ((
-#ifndef USE_CRNL_AS_LINE_TERMINATOR
- *p == 0x0d ||
-#endif
- *p == 0x85) && *(p+1) == 0x00)
- return 1;
- if (*(p+1) == 0x20 && (*p == 0x29 || *p == 0x28))
- return 1;
-#endif
- }
- return 0;
-}
-
-static OnigCodePoint
-utf16le_mbc_to_code(const UChar* p, const UChar* end ARG_UNUSED,
- OnigEncoding enc ARG_UNUSED)
-{
- OnigCodePoint code;
- UChar c0 = *p;
- UChar c1 = *(p+1);
-
- if (UTF16_IS_SURROGATE_FIRST(c1)) {
- code = ((((c1 - 0xd8) << 2) + ((c0 & 0xc0) >> 6) + 1) << 16)
- + ((((c0 & 0x3f) << 2) + (p[3] - 0xdc)) << 8)
- + p[2];
- }
- else {
- code = c1 * 256 + p[0];
- }
- return code;
-}
-
-static int
-utf16le_code_to_mbclen(OnigCodePoint code,
- OnigEncoding enc ARG_UNUSED)
-{
- return (code > 0xffff ? 4 : 2);
-}
-
-static int
-utf16le_code_to_mbc(OnigCodePoint code, UChar *buf,
- OnigEncoding enc ARG_UNUSED)
-{
- UChar* p = buf;
-
- if (code > 0xffff) {
- unsigned int high = (code >> 10) + 0xD7C0;
- unsigned int low = (code & 0x3FF) + 0xDC00;
- *p++ = high & 0xFF;
- *p++ = (high >> 8) & 0xFF;
- *p++ = low & 0xFF;
- *p++ = (low >> 8) & 0xFF;
- return 4;
- }
- else {
- *p++ = (UChar )(code & 0xff);
- *p++ = (UChar )((code & 0xff00) >> 8);
- return 2;
- }
-}
-
-static int
-utf16le_mbc_case_fold(OnigCaseFoldType flag,
- const UChar** pp, const UChar* end, UChar* fold,
- OnigEncoding enc)
-{
- const UChar* p = *pp;
-
- if (ONIGENC_IS_ASCII_CODE(*p) && *(p+1) == 0) {
-#ifdef USE_UNICODE_CASE_FOLD_TURKISH_AZERI
- if ((flag & ONIGENC_CASE_FOLD_TURKISH_AZERI) != 0) {
- if (*p == 0x49) {
- *fold++ = 0x31;
- *fold = 0x01;
- (*pp) += 2;
- return 2;
- }
- }
-#endif
-
- *fold++ = ONIGENC_ASCII_CODE_TO_LOWER_CASE(*p);
- *fold = 0;
- *pp += 2;
- return 2;
- }
- else
- return onigenc_unicode_mbc_case_fold(enc, flag, pp,
- end, fold);
-}
-
-#if 0
-static int
-utf16le_is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp,
- const UChar* end)
-{
- const UChar* p = *pp;
-
- (*pp) += EncLen_UTF16[*(p+1)];
-
- if (*(p+1) == 0) {
- int c, v;
-
- if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
- return TRUE;
- }
-
- c = *p;
- v = ONIGENC_IS_UNICODE_ISO_8859_1_BIT_CTYPE(c,
- (BIT_CTYPE_UPPER | BIT_CTYPE_LOWER));
- if ((v | BIT_CTYPE_LOWER) != 0) {
- /* 0xaa, 0xb5, 0xba are lower case letter, but can't convert. */
- if (c >= 0xaa && c <= 0xba)
- return FALSE;
- else
- return TRUE;
- }
- return (v != 0 ? TRUE : FALSE);
- }
-
- return FALSE;
-}
-#endif
-
-static UChar*
-utf16le_left_adjust_char_head(const UChar* start, const UChar* s, const UChar* end,
- OnigEncoding enc ARG_UNUSED)
-{
- if (s <= start) return (UChar* )s;
-
- if ((s - start) % 2 == 1) {
- s--;
- }
-
- if (UTF16_IS_SURROGATE_SECOND(*(s+1)) && s > start + 1)
- s -= 2;
-
- return (UChar* )s;
-}
-
-static int
-utf16le_get_case_fold_codes_by_str(OnigCaseFoldType flag,
- const OnigUChar* p, const OnigUChar* end,
- OnigCaseFoldCodeItem items[],
- OnigEncoding enc)
-{
- return onigenc_unicode_get_case_fold_codes_by_str(enc,
- flag, p, end, items);
-}
-
-OnigEncodingDefine(utf_16le, UTF_16LE) = {
- utf16le_mbc_enc_len,
- "UTF-16LE", /* name */
- 4, /* max byte length */
- 2, /* min byte length */
- utf16le_is_mbc_newline,
- utf16le_mbc_to_code,
- utf16le_code_to_mbclen,
- utf16le_code_to_mbc,
- utf16le_mbc_case_fold,
- onigenc_unicode_apply_all_case_fold,
- utf16le_get_case_fold_codes_by_str,
- onigenc_unicode_property_name_to_ctype,
- onigenc_unicode_is_code_ctype,
- onigenc_utf16_32_get_ctype_code_range,
- utf16le_left_adjust_char_head,
- onigenc_always_false_is_allowed_reverse_match
-};
diff --git a/enc/utf_32be.c b/enc/utf_32be.c
deleted file mode 100644
index 61e7d0f1b5..0000000000
--- a/enc/utf_32be.c
+++ /dev/null
@@ -1,195 +0,0 @@
-/**********************************************************************
- utf_32be.c - Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2007 K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regenc.h"
-
-static int
-utf32be_mbc_enc_len(const UChar* p ARG_UNUSED, const OnigUChar* e ARG_UNUSED,
- OnigEncoding enc ARG_UNUSED)
-{
- return 4;
-}
-
-static int
-utf32be_is_mbc_newline(const UChar* p, const UChar* end,
- OnigEncoding enc ARG_UNUSED)
-{
- if (p + 3 < end) {
- if (*(p+3) == 0x0a && *(p+2) == 0 && *(p+1) == 0 && *p == 0)
- return 1;
-#ifdef USE_UNICODE_ALL_LINE_TERMINATORS
- if ((
-#ifndef USE_CRNL_AS_LINE_TERMINATOR
- *(p+3) == 0x0d ||
-#endif
- *(p+3) == 0x85)
- && *(p+2) == 0 && *(p+1) == 0 && *p == 0x00)
- return 1;
- if (*(p+2) == 0x20 && (*(p+3) == 0x29 || *(p+3) == 0x28)
- && *(p+1) == 0 && *p == 0)
- return 1;
-#endif
- }
- return 0;
-}
-
-static OnigCodePoint
-utf32be_mbc_to_code(const UChar* p, const UChar* end ARG_UNUSED,
- OnigEncoding enc ARG_UNUSED)
-{
- return (OnigCodePoint )(((p[0] * 256 + p[1]) * 256 + p[2]) * 256 + p[3]);
-}
-
-static int
-utf32be_code_to_mbclen(OnigCodePoint code ARG_UNUSED,
- OnigEncoding enc ARG_UNUSED)
-{
- return 4;
-}
-
-static int
-utf32be_code_to_mbc(OnigCodePoint code, UChar *buf,
- OnigEncoding enc ARG_UNUSED)
-{
- UChar* p = buf;
-
- *p++ = (UChar )((code & 0xff000000) >>24);
- *p++ = (UChar )((code & 0xff0000) >>16);
- *p++ = (UChar )((code & 0xff00) >> 8);
- *p++ = (UChar ) (code & 0xff);
- return 4;
-}
-
-static int
-utf32be_mbc_case_fold(OnigCaseFoldType flag,
- const UChar** pp, const UChar* end, UChar* fold,
- OnigEncoding enc)
-{
- const UChar* p = *pp;
-
- if (ONIGENC_IS_ASCII_CODE(*(p+3)) && *(p+2) == 0 && *(p+1) == 0 && *p == 0) {
- *fold++ = 0;
- *fold++ = 0;
-
-#ifdef USE_UNICODE_CASE_FOLD_TURKISH_AZERI
- if ((flag & ONIGENC_CASE_FOLD_TURKISH_AZERI) != 0) {
- if (*(p+3) == 0x49) {
- *fold++ = 0x01;
- *fold = 0x31;
- (*pp) += 4;
- return 4;
- }
- }
-#endif
-
- *fold++ = 0;
- *fold = ONIGENC_ASCII_CODE_TO_LOWER_CASE(*(p+3));
- *pp += 4;
- return 4;
- }
- else
- return onigenc_unicode_mbc_case_fold(enc, flag, pp,
- end, fold);
-}
-
-#if 0
-static int
-utf32be_is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* end)
-{
- const UChar* p = *pp;
-
- (*pp) += 4;
-
- if (*(p+2) == 0 && *(p+1) == 0 && *p == 0) {
- int c, v;
-
- p += 3;
- if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
- return TRUE;
- }
-
- c = *p;
- v = ONIGENC_IS_UNICODE_ISO_8859_1_BIT_CTYPE(c,
- (BIT_CTYPE_UPPER | BIT_CTYPE_LOWER));
- if ((v | BIT_CTYPE_LOWER) != 0) {
- /* 0xaa, 0xb5, 0xba are lower case letter, but can't convert. */
- if (c >= 0xaa && c <= 0xba)
- return FALSE;
- else
- return TRUE;
- }
- return (v != 0 ? TRUE : FALSE);
- }
-
- return FALSE;
-}
-#endif
-
-static UChar*
-utf32be_left_adjust_char_head(const UChar* start, const UChar* s, const UChar* end,
- OnigEncoding enc ARG_UNUSED)
-{
- int rem;
-
- if (s <= start) return (UChar* )s;
-
- rem = (s - start) % 4;
- return (UChar* )(s - rem);
-}
-
-static int
-utf32be_get_case_fold_codes_by_str(OnigCaseFoldType flag,
- const OnigUChar* p, const OnigUChar* end,
- OnigCaseFoldCodeItem items[],
- OnigEncoding enc)
-{
- return onigenc_unicode_get_case_fold_codes_by_str(enc,
- flag, p, end, items);
-}
-
-OnigEncodingDefine(utf_32be, UTF_32BE) = {
- utf32be_mbc_enc_len,
- "UTF-32BE", /* name */
- 4, /* max byte length */
- 4, /* min byte length */
- utf32be_is_mbc_newline,
- utf32be_mbc_to_code,
- utf32be_code_to_mbclen,
- utf32be_code_to_mbc,
- utf32be_mbc_case_fold,
- onigenc_unicode_apply_all_case_fold,
- utf32be_get_case_fold_codes_by_str,
- onigenc_unicode_property_name_to_ctype,
- onigenc_unicode_is_code_ctype,
- onigenc_utf16_32_get_ctype_code_range,
- utf32be_left_adjust_char_head,
- onigenc_always_false_is_allowed_reverse_match
-};
-ENC_ALIAS("UCS-4BE", "UTF-32BE")
-
diff --git a/enc/utf_32le.c b/enc/utf_32le.c
deleted file mode 100644
index 3a0a41bba7..0000000000
--- a/enc/utf_32le.c
+++ /dev/null
@@ -1,194 +0,0 @@
-/**********************************************************************
- utf_32le.c - Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2007 K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regenc.h"
-
-static int
-utf32le_mbc_enc_len(const UChar* p ARG_UNUSED, const OnigUChar* e ARG_UNUSED,
- OnigEncoding enc ARG_UNUSED)
-{
- return 4;
-}
-
-static int
-utf32le_is_mbc_newline(const UChar* p, const UChar* end,
- OnigEncoding enc ARG_UNUSED)
-{
- if (p + 3 < end) {
- if (*p == 0x0a && *(p+1) == 0 && *(p+2) == 0 && *(p+3) == 0)
- return 1;
-#ifdef USE_UNICODE_ALL_LINE_TERMINATORS
- if ((
-#ifndef USE_CRNL_AS_LINE_TERMINATOR
- *p == 0x0d ||
-#endif
- *p == 0x85)
- && *(p+1) == 0x00 && (p+2) == 0x00 && *(p+3) == 0x00)
- return 1;
- if (*(p+1) == 0x20 && (*p == 0x29 || *p == 0x28)
- && *(p+2) == 0x00 && *(p+3) == 0x00)
- return 1;
-#endif
- }
- return 0;
-}
-
-static OnigCodePoint
-utf32le_mbc_to_code(const UChar* p, const UChar* end ARG_UNUSED,
- OnigEncoding enc ARG_UNUSED)
-{
- return (OnigCodePoint )(((p[3] * 256 + p[2]) * 256 + p[1]) * 256 + p[0]);
-}
-
-static int
-utf32le_code_to_mbclen(OnigCodePoint code ARG_UNUSED,
- OnigEncoding enc ARG_UNUSED)
-{
- return 4;
-}
-
-static int
-utf32le_code_to_mbc(OnigCodePoint code, UChar *buf,
- OnigEncoding enc ARG_UNUSED)
-{
- UChar* p = buf;
-
- *p++ = (UChar ) (code & 0xff);
- *p++ = (UChar )((code & 0xff00) >> 8);
- *p++ = (UChar )((code & 0xff0000) >>16);
- *p++ = (UChar )((code & 0xff000000) >>24);
- return 4;
-}
-
-static int
-utf32le_mbc_case_fold(OnigCaseFoldType flag,
- const UChar** pp, const UChar* end, UChar* fold,
- OnigEncoding enc)
-{
- const UChar* p = *pp;
-
- if (ONIGENC_IS_ASCII_CODE(*p) && *(p+1) == 0 && *(p+2) == 0 && *(p+3) == 0) {
-#ifdef USE_UNICODE_CASE_FOLD_TURKISH_AZERI
- if ((flag & ONIGENC_CASE_FOLD_TURKISH_AZERI) != 0) {
- if (*p == 0x49) {
- *fold++ = 0x31;
- *fold++ = 0x01;
- }
- }
- else {
-#endif
- *fold++ = ONIGENC_ASCII_CODE_TO_LOWER_CASE(*p);
- *fold++ = 0;
-#ifdef USE_UNICODE_CASE_FOLD_TURKISH_AZERI
- }
-#endif
-
- *fold++ = 0;
- *fold = 0;
- *pp += 4;
- return 4;
- }
- else
- return onigenc_unicode_mbc_case_fold(enc, flag, pp,
- end, fold);
-}
-
-#if 0
-static int
-utf32le_is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* end)
-{
- const UChar* p = *pp;
-
- (*pp) += 4;
-
- if (*(p+1) == 0 && *(p+2) == 0 && *(p+3) == 0) {
- int c, v;
-
- if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
- return TRUE;
- }
-
- c = *p;
- v = ONIGENC_IS_UNICODE_ISO_8859_1_BIT_CTYPE(c,
- (BIT_CTYPE_UPPER | BIT_CTYPE_LOWER));
- if ((v | BIT_CTYPE_LOWER) != 0) {
- /* 0xaa, 0xb5, 0xba are lower case letter, but can't convert. */
- if (c >= 0xaa && c <= 0xba)
- return FALSE;
- else
- return TRUE;
- }
- return (v != 0 ? TRUE : FALSE);
- }
-
- return FALSE;
-}
-#endif
-
-static UChar*
-utf32le_left_adjust_char_head(const UChar* start, const UChar* s, const UChar* end,
- OnigEncoding enc ARG_UNUSED)
-{
- int rem;
-
- if (s <= start) return (UChar* )s;
-
- rem = (s - start) % 4;
- return (UChar* )(s - rem);
-}
-
-static int
-utf32le_get_case_fold_codes_by_str(OnigCaseFoldType flag,
- const OnigUChar* p, const OnigUChar* end,
- OnigCaseFoldCodeItem items[],
- OnigEncoding enc)
-{
- return onigenc_unicode_get_case_fold_codes_by_str(enc,
- flag, p, end, items);
-}
-
-OnigEncodingDefine(utf_32le, UTF_32LE) = {
- utf32le_mbc_enc_len,
- "UTF-32LE", /* name */
- 4, /* max byte length */
- 4, /* min byte length */
- utf32le_is_mbc_newline,
- utf32le_mbc_to_code,
- utf32le_code_to_mbclen,
- utf32le_code_to_mbc,
- utf32le_mbc_case_fold,
- onigenc_unicode_apply_all_case_fold,
- utf32le_get_case_fold_codes_by_str,
- onigenc_unicode_property_name_to_ctype,
- onigenc_unicode_is_code_ctype,
- onigenc_utf16_32_get_ctype_code_range,
- utf32le_left_adjust_char_head,
- onigenc_always_false_is_allowed_reverse_match
-};
-ENC_ALIAS("UCS-4LE", "UTF-32LE")
diff --git a/enc/utf_7.h b/enc/utf_7.h
deleted file mode 100644
index fa9f06b1b3..0000000000
--- a/enc/utf_7.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "regenc.h"
-/* dummy for unsupported, statefull encoding */
-ENC_DUMMY("UTF-7");
-ENC_ALIAS("CP65000", "UTF-7");
-
diff --git a/enc/utf_8.c b/enc/utf_8.c
deleted file mode 100644
index f9a97c72dd..0000000000
--- a/enc/utf_8.c
+++ /dev/null
@@ -1,455 +0,0 @@
-/**********************************************************************
- utf_8.c - Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2007 K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regenc.h"
-
-#define USE_INVALID_CODE_SCHEME
-
-#ifdef USE_INVALID_CODE_SCHEME
-/* virtual codepoint values for invalid encoding byte 0xfe and 0xff */
-#define INVALID_CODE_FE 0xfffffffe
-#define INVALID_CODE_FF 0xffffffff
-#define VALID_CODE_LIMIT 0x7fffffff
-#endif
-
-#define utf8_islead(c) ((UChar )((c) & 0xc0) != 0x80)
-
-static const int EncLen_UTF8[] = {
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
- 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
-};
-
-typedef enum {
- FAILURE = -2,
- ACCEPT,
- S0, S1, S2, S3,
- S4, S5, S6, S7
-} state_t;
-#define A ACCEPT
-#define F FAILURE
-static const signed char trans[][0x100] = {
- { /* S0 0 1 2 3 4 5 6 7 8 9 a b c d e f */
- /* 0 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 1 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 2 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 3 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 4 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 5 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 6 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 7 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 8 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 9 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* a */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* b */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* c */ F, F, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* d */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* e */ 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 3, 3,
- /* f */ 5, 6, 6, 6, 7, F, F, F, F, F, F, F, F, F, F, F
- },
- { /* S1 0 1 2 3 4 5 6 7 8 9 a b c d e f */
- /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 4 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 5 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 6 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 7 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 8 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* 9 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* a */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* b */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
- /* c */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* d */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* e */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* f */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F
- },
- { /* S2 0 1 2 3 4 5 6 7 8 9 a b c d e f */
- /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 4 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 5 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 6 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 7 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 8 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 9 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* a */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* b */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* c */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* d */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* e */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* f */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F
- },
- { /* S3 0 1 2 3 4 5 6 7 8 9 a b c d e f */
- /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 4 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 5 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 6 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 7 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 8 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* 9 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* a */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* b */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* c */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* d */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* e */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* f */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F
- },
- { /* S4 0 1 2 3 4 5 6 7 8 9 a b c d e f */
- /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 4 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 5 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 6 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 7 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 8 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* 9 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- /* a */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* b */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* c */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* d */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* e */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* f */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F
- },
- { /* S5 0 1 2 3 4 5 6 7 8 9 a b c d e f */
- /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 4 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 5 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 6 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 7 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 8 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 9 */ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
- /* a */ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
- /* b */ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
- /* c */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* d */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* e */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* f */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F
- },
- { /* S6 0 1 2 3 4 5 6 7 8 9 a b c d e f */
- /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 4 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 5 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 6 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 7 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 8 */ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
- /* 9 */ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
- /* a */ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
- /* b */ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
- /* c */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* d */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* e */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* f */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F
- },
- { /* S7 0 1 2 3 4 5 6 7 8 9 a b c d e f */
- /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 4 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 5 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 6 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 7 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* 8 */ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
- /* 9 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* a */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* b */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* c */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* d */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* e */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
- /* f */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F
- },
-};
-#undef A
-#undef F
-
-static int
-mbc_enc_len(const UChar* p, const UChar* e, OnigEncoding enc ARG_UNUSED)
-{
- int firstbyte = *p++;
- state_t s;
- s = trans[0][firstbyte];
- if (s < 0) return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(1) :
- ONIGENC_CONSTRUCT_MBCLEN_INVALID();
-
- if (p == e) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(EncLen_UTF8[firstbyte]-1);
- s = trans[s][*p++];
- if (s < 0) return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(2) :
- ONIGENC_CONSTRUCT_MBCLEN_INVALID();
-
- if (p == e) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(EncLen_UTF8[firstbyte]-2);
- s = trans[s][*p++];
- if (s < 0) return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(3) :
- ONIGENC_CONSTRUCT_MBCLEN_INVALID();
-
- if (p == e) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(EncLen_UTF8[firstbyte]-3);
- s = trans[s][*p++];
- return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(4) :
- ONIGENC_CONSTRUCT_MBCLEN_INVALID();
-}
-
-static int
-is_mbc_newline(const UChar* p, const UChar* end, OnigEncoding enc)
-{
- if (p < end) {
- if (*p == 0x0a) return 1;
-
-#ifdef USE_UNICODE_ALL_LINE_TERMINATORS
-#ifndef USE_CRNL_AS_LINE_TERMINATOR
- if (*p == 0x0d) return 1;
-#endif
- if (p + 1 < end) {
- if (*(p+1) == 0x85 && *p == 0xc2) /* U+0085 */
- return 1;
- if (p + 2 < end) {
- if ((*(p+2) == 0xa8 || *(p+2) == 0xa9)
- && *(p+1) == 0x80 && *p == 0xe2) /* U+2028, U+2029 */
- return 1;
- }
- }
-#endif
- }
-
- return 0;
-}
-
-static OnigCodePoint
-mbc_to_code(const UChar* p, const UChar* end, OnigEncoding enc)
-{
- int c, len;
- OnigCodePoint n;
-
- len = enclen(enc, p, end);
- c = *p++;
- if (len > 1) {
- len--;
- n = c & ((1 << (6 - len)) - 1);
- while (len--) {
- c = *p++;
- n = (n << 6) | (c & ((1 << 6) - 1));
- }
- return n;
- }
- else {
-#ifdef USE_INVALID_CODE_SCHEME
- if (c > 0xfd) {
- return ((c == 0xfe) ? INVALID_CODE_FE : INVALID_CODE_FF);
- }
-#endif
- return (OnigCodePoint )c;
- }
-}
-
-static int
-code_to_mbclen(OnigCodePoint code, OnigEncoding enc ARG_UNUSED)
-{
- if ((code & 0xffffff80) == 0) return 1;
- else if ((code & 0xfffff800) == 0) return 2;
- else if ((code & 0xffff0000) == 0) return 3;
- else if ((code & 0xffe00000) == 0) return 4;
- else if ((code & 0xfc000000) == 0) return 5;
- else if ((code & 0x80000000) == 0) return 6;
-#ifdef USE_INVALID_CODE_SCHEME
- else if (code == INVALID_CODE_FE) return 1;
- else if (code == INVALID_CODE_FF) return 1;
-#endif
- else
- return ONIGERR_TOO_BIG_WIDE_CHAR_VALUE;
-}
-
-static int
-code_to_mbc(OnigCodePoint code, UChar *buf, OnigEncoding enc ARG_UNUSED)
-{
-#define UTF8_TRAILS(code, shift) (UChar )((((code) >> (shift)) & 0x3f) | 0x80)
-#define UTF8_TRAIL0(code) (UChar )(((code) & 0x3f) | 0x80)
-
- if ((code & 0xffffff80) == 0) {
- *buf = (UChar )code;
- return 1;
- }
- else {
- UChar *p = buf;
-
- if ((code & 0xfffff800) == 0) {
- *p++ = (UChar )(((code>>6)& 0x1f) | 0xc0);
- }
- else if ((code & 0xffff0000) == 0) {
- *p++ = (UChar )(((code>>12) & 0x0f) | 0xe0);
- *p++ = UTF8_TRAILS(code, 6);
- }
- else if ((code & 0xffe00000) == 0) {
- *p++ = (UChar )(((code>>18) & 0x07) | 0xf0);
- *p++ = UTF8_TRAILS(code, 12);
- *p++ = UTF8_TRAILS(code, 6);
- }
- else if ((code & 0xfc000000) == 0) {
- *p++ = (UChar )(((code>>24) & 0x03) | 0xf8);
- *p++ = UTF8_TRAILS(code, 18);
- *p++ = UTF8_TRAILS(code, 12);
- *p++ = UTF8_TRAILS(code, 6);
- }
- else if ((code & 0x80000000) == 0) {
- *p++ = (UChar )(((code>>30) & 0x01) | 0xfc);
- *p++ = UTF8_TRAILS(code, 24);
- *p++ = UTF8_TRAILS(code, 18);
- *p++ = UTF8_TRAILS(code, 12);
- *p++ = UTF8_TRAILS(code, 6);
- }
-#ifdef USE_INVALID_CODE_SCHEME
- else if (code == INVALID_CODE_FE) {
- *p = 0xfe;
- return 1;
- }
- else if (code == INVALID_CODE_FF) {
- *p = 0xff;
- return 1;
- }
-#endif
- else {
- return ONIGERR_TOO_BIG_WIDE_CHAR_VALUE;
- }
-
- *p++ = UTF8_TRAIL0(code);
- return (int)(p - buf);
- }
-}
-
-static int
-mbc_case_fold(OnigCaseFoldType flag, const UChar** pp,
- const UChar* end, UChar* fold, OnigEncoding enc)
-{
- const UChar* p = *pp;
-
- if (ONIGENC_IS_MBC_ASCII(p)) {
-#ifdef USE_UNICODE_CASE_FOLD_TURKISH_AZERI
- if ((flag & ONIGENC_CASE_FOLD_TURKISH_AZERI) != 0) {
- if (*p == 0x49) {
- *fold++ = 0xc4;
- *fold = 0xb1;
- (*pp)++;
- return 2;
- }
- }
-#endif
-
- *fold = ONIGENC_ASCII_CODE_TO_LOWER_CASE(*p);
- (*pp)++;
- return 1; /* return byte length of converted char to lower */
- }
- else {
- return onigenc_unicode_mbc_case_fold(enc, flag, pp, end, fold);
- }
-}
-
-
-static int
-get_ctype_code_range(OnigCtype ctype, OnigCodePoint *sb_out,
- const OnigCodePoint* ranges[], OnigEncoding enc ARG_UNUSED)
-{
- *sb_out = 0x80;
- return onigenc_unicode_ctype_code_range(ctype, ranges);
-}
-
-
-static UChar*
-left_adjust_char_head(const UChar* start, const UChar* s, const UChar* end, OnigEncoding enc ARG_UNUSED)
-{
- const UChar *p;
-
- if (s <= start) return (UChar* )s;
- p = s;
-
- while (!utf8_islead(*p) && p > start) p--;
- return (UChar* )p;
-}
-
-static int
-get_case_fold_codes_by_str(OnigCaseFoldType flag,
- const OnigUChar* p, const OnigUChar* end, OnigCaseFoldCodeItem items[],
- OnigEncoding enc)
-{
- return onigenc_unicode_get_case_fold_codes_by_str(enc, flag, p, end, items);
-}
-
-OnigEncodingDefine(utf_8, UTF_8) = {
- mbc_enc_len,
- "UTF-8", /* name */
- 6, /* max byte length */
- 1, /* min byte length */
- is_mbc_newline,
- mbc_to_code,
- code_to_mbclen,
- code_to_mbc,
- mbc_case_fold,
- onigenc_unicode_apply_all_case_fold,
- get_case_fold_codes_by_str,
- onigenc_unicode_property_name_to_ctype,
- onigenc_unicode_is_code_ctype,
- get_ctype_code_range,
- left_adjust_char_head,
- onigenc_always_true_is_allowed_reverse_match
-};
-ENC_ALIAS("CP65001", "UTF-8")
-
-/*
- * Name: UTF8-MAC
- * Link: http://developer.apple.com/documentation/MacOSX/Conceptual/BPFileSystem/BPFileSystem.html
- * Link: http://developer.apple.com/qa/qa2001/qa1235.html
- * Link: http://developer.apple.com/jp/qa/qa2001/qa1235.html
- */
-ENC_REPLICATE("UTF8-MAC", "UTF-8")
-ENC_ALIAS("UTF-8-MAC", "UTF8-MAC")
-
diff --git a/enc/windows_1251.c b/enc/windows_1251.c
deleted file mode 100644
index 1cb4da4960..0000000000
--- a/enc/windows_1251.c
+++ /dev/null
@@ -1,208 +0,0 @@
-/**********************************************************************
- cp1251.c - Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2006-2007 Byte <byte AT mail DOT kna DOT ru>
- * K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regenc.h"
-
-#define ENC_CP1251_TO_LOWER_CASE(c) EncCP1251_ToLowerCaseTable[c]
-#define ENC_IS_CP1251_CTYPE(code,ctype) \
- ((EncCP1251_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
-
-static const UChar EncCP1251_ToLowerCaseTable[256] = {
- '\000', '\001', '\002', '\003', '\004', '\005', '\006', '\007',
- '\010', '\011', '\012', '\013', '\014', '\015', '\016', '\017',
- '\020', '\021', '\022', '\023', '\024', '\025', '\026', '\027',
- '\030', '\031', '\032', '\033', '\034', '\035', '\036', '\037',
- '\040', '\041', '\042', '\043', '\044', '\045', '\046', '\047',
- '\050', '\051', '\052', '\053', '\054', '\055', '\056', '\057',
- '\060', '\061', '\062', '\063', '\064', '\065', '\066', '\067',
- '\070', '\071', '\072', '\073', '\074', '\075', '\076', '\077',
- '\100', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
- '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
- '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
- '\170', '\171', '\172', '\133', '\134', '\135', '\136', '\137',
- '\140', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
- '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
- '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
- '\170', '\171', '\172', '\173', '\174', '\175', '\176', '\177',
- '\220', '\203', '\202', '\203', '\204', '\205', '\206', '\207',
- '\210', '\211', '\232', '\213', '\234', '\235', '\236', '\237',
- '\220', '\221', '\222', '\223', '\224', '\225', '\226', '\227',
- '\230', '\231', '\232', '\233', '\234', '\235', '\236', '\237',
- '\240', '\242', '\242', '\274', '\244', '\264', '\246', '\247',
- '\270', '\251', '\272', '\253', '\254', '\255', '\256', '\277',
- '\260', '\261', '\263', '\263', '\264', '\265', '\266', '\267',
- '\270', '\271', '\272', '\273', '\274', '\276', '\276', '\277',
- '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
- '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
- '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
- '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\377',
- '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
- '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
- '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
- '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\377'
-};
-
-static const unsigned short EncCP1251_CtypeTable[256] = {
- 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
- 0x4008, 0x428c, 0x4209, 0x4208, 0x4208, 0x4208, 0x4008, 0x4008,
- 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
- 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
- 0x4284, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
- 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
- 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0,
- 0x78b0, 0x78b0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
- 0x41a0, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x74a2,
- 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
- 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
- 0x74a2, 0x74a2, 0x74a2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x51a0,
- 0x41a0, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x70e2,
- 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
- 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
- 0x70e2, 0x70e2, 0x70e2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x4008,
- 0x34a2, 0x34a2, 0x01a0, 0x30e2, 0x01a0, 0x01a0, 0x01a0, 0x01a0,
- 0x0000, 0x01a0, 0x34a2, 0x01a0, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
- 0x30e2, 0x01a0, 0x01a0, 0x01a0, 0x01a0, 0x01a0, 0x01a0, 0x01a0,
- 0x0008, 0x0000, 0x30e2, 0x01a0, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
- 0x0280, 0x34a2, 0x30e2, 0x34a2, 0x01a0, 0x34a2, 0x01a0, 0x01a0,
- 0x34a2, 0x01a0, 0x34a2, 0x01a0, 0x01a0, 0x01a0, 0x01a0, 0x34a2,
- 0x01a0, 0x01a0, 0x34a2, 0x30e2, 0x30e2, 0x31e2, 0x01a0, 0x01a0,
- 0x30e2, 0x0000, 0x30e2, 0x01a0, 0x30e2, 0x34a2, 0x30e2, 0x30e2,
- 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
- 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
- 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
- 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
- 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
- 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
- 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
- 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2
-};
-
-static int
-cp1251_mbc_case_fold(OnigCaseFoldType flag ARG_UNUSED,
- const UChar** pp, const UChar* end ARG_UNUSED, UChar* lower, OnigEncoding enc ARG_UNUSED)
-{
- const UChar* p = *pp;
-
- *lower = ENC_CP1251_TO_LOWER_CASE(*p);
- (*pp)++;
- return 1;
-}
-
-static int
-cp1251_is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSED)
-{
- if (code < 256)
- return ENC_IS_CP1251_CTYPE(code, ctype);
- else
- return FALSE;
-}
-
-static const OnigPairCaseFoldCodes CaseFoldMap[] = {
- { 0xb8, 0xa8 },
-
- { 0xe0, 0xc0 },
- { 0xe1, 0xc1 },
- { 0xe2, 0xc2 },
- { 0xe3, 0xc3 },
- { 0xe4, 0xc4 },
- { 0xe5, 0xc5 },
- { 0xe6, 0xc6 },
- { 0xe7, 0xc7 },
- { 0xe8, 0xc8 },
- { 0xe9, 0xc9 },
- { 0xea, 0xca },
- { 0xeb, 0xcb },
- { 0xec, 0xcc },
- { 0xed, 0xcd },
- { 0xee, 0xce },
- { 0xef, 0xcf },
-
- { 0xf0, 0xd0 },
- { 0xf1, 0xd1 },
- { 0xf2, 0xd2 },
- { 0xf3, 0xd3 },
- { 0xf4, 0xd4 },
- { 0xf5, 0xd5 },
- { 0xf6, 0xd6 },
- { 0xf7, 0xd7 },
- { 0xf8, 0xd8 },
- { 0xf9, 0xd9 },
- { 0xfa, 0xda },
- { 0xfb, 0xdb },
- { 0xfc, 0xdc },
- { 0xfd, 0xdd },
- { 0xfe, 0xde },
- { 0xff, 0xdf }
-};
-
-static int
-cp1251_apply_all_case_fold(OnigCaseFoldType flag,
- OnigApplyAllCaseFoldFunc f, void* arg, OnigEncoding enc ARG_UNUSED)
-{
- return onigenc_apply_all_case_fold_with_map(
- sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0,
- flag, f, arg);
-}
-
-static int
-cp1251_get_case_fold_codes_by_str(OnigCaseFoldType flag,
- const OnigUChar* p, const OnigUChar* end, OnigCaseFoldCodeItem items[], OnigEncoding enc ARG_UNUSED)
-{
- return onigenc_get_case_fold_codes_by_str_with_map(
- sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0,
- flag, p, end, items);
-}
-
-OnigEncodingDefine(windows_1251, Windows_1251) = {
- onigenc_single_byte_mbc_enc_len,
- "Windows-1251", /* name */
- 1, /* max enc length */
- 1, /* min enc length */
- onigenc_is_mbc_newline_0x0a,
- onigenc_single_byte_mbc_to_code,
- onigenc_single_byte_code_to_mbclen,
- onigenc_single_byte_code_to_mbc,
- cp1251_mbc_case_fold,
- cp1251_apply_all_case_fold,
- cp1251_get_case_fold_codes_by_str,
- onigenc_minimum_property_name_to_ctype,
- cp1251_is_code_ctype,
- onigenc_not_support_get_ctype_code_range,
- onigenc_single_byte_left_adjust_char_head,
- onigenc_always_true_is_allowed_reverse_match
-};
-/*
- * Name: windows-1251
- * MIBenum: 2251
- * Link: http://www.iana.org/assignments/character-sets
- * Link: http://www.microsoft.com/globaldev/reference/sbcs/1251.mspx
- * Link: http://en.wikipedia.org/wiki/Windows-1251
- */
-ENC_ALIAS("CP1251", "Windows-1251")
diff --git a/encoding.c b/encoding.c
deleted file mode 100644
index 2118eba3e4..0000000000
--- a/encoding.c
+++ /dev/null
@@ -1,1502 +0,0 @@
-/**********************************************************************
-
- encoding.c -
-
- $Author$
- created at: Thu May 24 17:23:27 JST 2007
-
- Copyright (C) 2007 Yukihiro Matsumoto
-
-**********************************************************************/
-
-#include "ruby/ruby.h"
-#include "ruby/encoding.h"
-#include "regenc.h"
-#include <ctype.h>
-#ifndef NO_LOCALE_CHARMAP
-#ifdef __CYGWIN__
-#include <windows.h>
-#endif
-#ifdef HAVE_LANGINFO_H
-#include <langinfo.h>
-#endif
-#endif
-#include "ruby/util.h"
-
-static ID id_encoding;
-VALUE rb_cEncoding;
-static VALUE rb_encoding_list;
-
-struct rb_encoding_entry {
- const char *name;
- rb_encoding *enc;
- rb_encoding *base;
-};
-
-static struct {
- struct rb_encoding_entry *list;
- int count;
- int size;
- st_table *names;
-} enc_table;
-
-void rb_enc_init(void);
-
-#define ENCODING_COUNT ENCINDEX_BUILTIN_MAX
-#define UNSPECIFIED_ENCODING INT_MAX
-
-#define ENCODING_NAMELEN_MAX 63
-#define valid_encoding_name_p(name) ((name) && strlen(name) <= ENCODING_NAMELEN_MAX)
-
-#define enc_autoload_p(enc) (!rb_enc_mbmaxlen(enc))
-
-static int load_encoding(const char *name);
-
-static size_t
-enc_memsize(void *p)
-{
- return 0;
-}
-
-static const rb_data_type_t encoding_data_type = {
- "encoding", 0, 0, enc_memsize,
-};
-
-#define is_data_encoding(obj) (RTYPEDDATA_P(obj) && RTYPEDDATA_TYPE(obj) == &encoding_data_type)
-
-static VALUE
-enc_new(rb_encoding *encoding)
-{
- return TypedData_Wrap_Struct(rb_cEncoding, &encoding_data_type, encoding);
-}
-
-VALUE
-rb_enc_from_encoding(rb_encoding *encoding)
-{
- VALUE list, enc;
- int idx;
-
- if (!encoding) return Qnil;
- idx = ENC_TO_ENCINDEX(encoding);
- if (!(list = rb_encoding_list)) {
- rb_bug("rb_enc_from_encoding(%d\"%s\"): no rb_encoding_list",
- idx, rb_enc_name(encoding));
- }
- enc = rb_ary_entry(list, idx);
- if (NIL_P(enc)) {
- rb_bug("rb_enc_from_encoding(%d\"%s\"): not created yet",
- idx, rb_enc_name(encoding));
- }
- return enc;
-}
-
-static int enc_autoload(rb_encoding *);
-
-static int
-check_encoding(rb_encoding *enc)
-{
- int index = rb_enc_to_index(enc);
- if (rb_enc_from_index(index) != enc)
- return -1;
- if (enc_autoload_p(enc)) {
- index = enc_autoload(enc);
- }
- return index;
-}
-
-static int
-enc_check_encoding(VALUE obj)
-{
- if (SPECIAL_CONST_P(obj) || !rb_typeddata_is_kind_of(obj, &encoding_data_type)) {
- return -1;
- }
- return check_encoding(RDATA(obj)->data);
-}
-
-static int
-must_encoding(VALUE enc)
-{
- int index = enc_check_encoding(enc);
- if (index < 0) {
- rb_raise(rb_eTypeError, "wrong argument type %s (expected Encoding)",
- rb_obj_classname(enc));
- }
- return index;
-}
-
-int
-rb_to_encoding_index(VALUE enc)
-{
- int idx;
-
- idx = enc_check_encoding(enc);
- if (idx >= 0) {
- return idx;
- }
- else if (NIL_P(enc = rb_check_string_type(enc))) {
- return -1;
- }
- if (!rb_enc_asciicompat(rb_enc_get(enc))) {
- return -1;
- }
- return rb_enc_find_index(StringValueCStr(enc));
-}
-
-static rb_encoding *
-to_encoding(VALUE enc)
-{
- int idx;
-
- StringValue(enc);
- if (!rb_enc_asciicompat(rb_enc_get(enc))) {
- rb_raise(rb_eArgError, "invalid name encoding (non ASCII)");
- }
- idx = rb_enc_find_index(StringValueCStr(enc));
- if (idx < 0) {
- rb_raise(rb_eArgError, "unknown encoding name - %s", RSTRING_PTR(enc));
- }
- return rb_enc_from_index(idx);
-}
-
-rb_encoding *
-rb_to_encoding(VALUE enc)
-{
- if (enc_check_encoding(enc) >= 0) return RDATA(enc)->data;
- return to_encoding(enc);
-}
-
-void
-rb_gc_mark_encodings(void)
-{
-}
-
-static int
-enc_table_expand(int newsize)
-{
- struct rb_encoding_entry *ent;
- int count = newsize;
-
- if (enc_table.size >= newsize) return newsize;
- newsize = (newsize + 7) / 8 * 8;
- ent = realloc(enc_table.list, sizeof(*enc_table.list) * newsize);
- if (!ent) return -1;
- memset(ent + enc_table.size, 0, sizeof(*ent)*(newsize - enc_table.size));
- enc_table.list = ent;
- enc_table.size = newsize;
- return count;
-}
-
-static int
-enc_register_at(int index, const char *name, rb_encoding *encoding)
-{
- struct rb_encoding_entry *ent = &enc_table.list[index];
- VALUE list;
-
- if (!valid_encoding_name_p(name)) return -1;
- if (!ent->name) {
- ent->name = name = strdup(name);
- }
- else if (STRCASECMP(name, ent->name)) {
- return -1;
- }
- if (!ent->enc) {
- ent->enc = xmalloc(sizeof(rb_encoding));
- }
- if (encoding) {
- *ent->enc = *encoding;
- }
- else {
- memset(ent->enc, 0, sizeof(*ent->enc));
- }
- encoding = ent->enc;
- encoding->name = name;
- encoding->ruby_encoding_index = index;
- st_insert(enc_table.names, (st_data_t)name, (st_data_t)index);
- list = rb_encoding_list;
- if (list && NIL_P(rb_ary_entry(list, index))) {
- /* initialize encoding data */
- rb_ary_store(list, index, enc_new(encoding));
- }
- return index;
-}
-
-static int
-enc_register(const char *name, rb_encoding *encoding)
-{
- int index = enc_table.count;
-
- if ((index = enc_table_expand(index + 1)) < 0) return -1;
- enc_table.count = index;
- return enc_register_at(index - 1, name, encoding);
-}
-
-static void set_encoding_const(const char *, rb_encoding *);
-int rb_enc_registered(const char *name);
-
-int
-rb_enc_register(const char *name, rb_encoding *encoding)
-{
- int index = rb_enc_registered(name);
-
- if (index >= 0) {
- rb_encoding *oldenc = rb_enc_from_index(index);
- if (STRCASECMP(name, rb_enc_name(oldenc))) {
- index = enc_register(name, encoding);
- }
- else if (enc_autoload_p(oldenc) || !ENC_DUMMY_P(oldenc)) {
- enc_register_at(index, name, encoding);
- }
- else {
- rb_raise(rb_eArgError, "encoding %s is already registered", name);
- }
- }
- else {
- index = enc_register(name, encoding);
- set_encoding_const(name, rb_enc_from_index(index));
- }
- return index;
-}
-
-void
-rb_encdb_declare(const char *name)
-{
- int idx = rb_enc_registered(name);
- if (idx < 0) {
- idx = enc_register(name, 0);
- }
- set_encoding_const(name, rb_enc_from_index(idx));
-}
-
-static void
-enc_check_duplication(const char *name)
-{
- if (rb_enc_registered(name) >= 0) {
- rb_raise(rb_eArgError, "encoding %s is already registered", name);
- }
-}
-
-static rb_encoding*
-set_base_encoding(int index, rb_encoding *base)
-{
- rb_encoding *enc = enc_table.list[index].enc;
-
- enc_table.list[index].base = base;
- if (rb_enc_dummy_p(base)) ENC_SET_DUMMY(enc);
- return enc;
-}
-
-/* for encdb.h
- * Set base encoding for encodings which are not replicas
- * but not in their own files.
- */
-void
-rb_enc_set_base(const char *name, const char *orig)
-{
- int idx = rb_enc_registered(name);
- int origidx = rb_enc_registered(orig);
- set_base_encoding(idx, rb_enc_from_index(origidx));
-}
-
-int
-rb_enc_replicate(const char *name, rb_encoding *encoding)
-{
- int idx;
-
- enc_check_duplication(name);
- idx = enc_register(name, encoding);
- set_base_encoding(idx, encoding);
- set_encoding_const(name, rb_enc_from_index(idx));
- return idx;
-}
-
-static int
-enc_replicate(int idx, const char *name, rb_encoding *origenc)
-{
- if (idx < 0) {
- idx = enc_register(name, origenc);
- }
- else {
- idx = enc_register_at(idx, name, origenc);
- }
- if (idx >= 0) {
- set_base_encoding(idx, origenc);
- set_encoding_const(name, rb_enc_from_index(idx));
- }
- return idx;
-}
-
-int
-rb_encdb_replicate(const char *name, const char *orig)
-{
- int origidx = rb_enc_registered(orig);
- int idx = rb_enc_registered(name);
-
- if (origidx < 0) {
- origidx = enc_register(orig, 0);
- }
- return enc_replicate(idx, name, rb_enc_from_index(origidx));
-}
-
-int
-rb_define_dummy_encoding(const char *name)
-{
- int index = rb_enc_replicate(name, rb_ascii8bit_encoding());
- rb_encoding *enc = enc_table.list[index].enc;
-
- ENC_SET_DUMMY(enc);
- return index;
-}
-
-int
-rb_encdb_dummy(const char *name)
-{
- int index = enc_replicate(rb_enc_registered(name), name,
- rb_ascii8bit_encoding());
- rb_encoding *enc = enc_table.list[index].enc;
-
- ENC_SET_DUMMY(enc);
- return index;
-}
-
-/*
- * call-seq:
- * enc.dummy? => true or false
- *
- * Returns true for dummy encodings.
- * A dummy encoding is an encoding for which character handling is not properly
- * implemented.
- * It is used for stateful encodings.
- *
- * Encoding::ISO_2022_JP.dummy? #=> true
- * Encoding::UTF_8.dummy? #=> false
- *
- */
-static VALUE
-enc_dummy_p(VALUE enc)
-{
- return ENC_DUMMY_P(enc_table.list[must_encoding(enc)].enc) ? Qtrue : Qfalse;
-}
-
-/*
- * call-seq:
- * enc.ascii_compatible? => true or false
- *
- * Returns whether ASCII-compatible or not.
- *
- * Encoding::UTF_8.ascii_compatible? #=> true
- * Encoding::UTF_16BE.ascii_compatible? #=> false
- *
- */
-static VALUE
-enc_ascii_compatible_p(VALUE enc)
-{
- return rb_enc_asciicompat(enc_table.list[must_encoding(enc)].enc) ? Qtrue : Qfalse;
-}
-
-static const char *
-enc_alias_internal(const char *alias, int idx)
-{
- alias = strdup(alias);
- st_insert(enc_table.names, (st_data_t)alias, (st_data_t)idx);
- return alias;
-}
-
-static int
-enc_alias(const char *alias, int idx)
-{
- if (!valid_encoding_name_p(alias)) return -1;
- alias = enc_alias_internal(alias, idx);
- set_encoding_const(alias, rb_enc_from_index(idx));
- return idx;
-}
-
-int
-rb_enc_alias(const char *alias, const char *orig)
-{
- int idx;
-
- enc_check_duplication(alias);
- if (!enc_table.list) {
- rb_enc_init();
- }
- if ((idx = rb_enc_find_index(orig)) < 0) {
- return -1;
- }
- return enc_alias(alias, idx);
-}
-
-int
-rb_encdb_alias(const char *alias, const char *orig)
-{
- int idx = rb_enc_registered(orig);
-
- if (idx < 0) {
- idx = enc_register(orig, 0);
- }
- return enc_alias(alias, idx);
-}
-
-enum {
- ENCINDEX_ASCII,
- ENCINDEX_UTF_8,
- ENCINDEX_US_ASCII,
- ENCINDEX_BUILTIN_MAX
-};
-
-extern rb_encoding OnigEncodingUTF_8;
-extern rb_encoding OnigEncodingUS_ASCII;
-
-void
-rb_enc_init(void)
-{
- enc_table_expand(ENCODING_COUNT + 1);
- if (!enc_table.names) {
- enc_table.names = st_init_strcasetable();
- }
-#define ENC_REGISTER(enc) enc_register_at(ENCINDEX_##enc, rb_enc_name(&OnigEncoding##enc), &OnigEncoding##enc)
- ENC_REGISTER(ASCII);
- ENC_REGISTER(UTF_8);
- ENC_REGISTER(US_ASCII);
-#undef ENC_REGISTER
- enc_table.count = ENCINDEX_BUILTIN_MAX;
-}
-
-rb_encoding *
-rb_enc_from_index(int index)
-{
- if (!enc_table.list) {
- rb_enc_init();
- }
- if (index < 0 || enc_table.count <= index) {
- return 0;
- }
- return enc_table.list[index].enc;
-}
-
-int
-rb_enc_registered(const char *name)
-{
- st_data_t idx = 0;
-
- if (!name) return -1;
- if (!enc_table.list) return -1;
- if (st_lookup(enc_table.names, (st_data_t)name, &idx)) {
- return (int)idx;
- }
- return -1;
-}
-
-static VALUE
-require_enc(VALUE enclib)
-{
- return rb_require_safe(enclib, rb_safe_level());
-}
-
-static int
-load_encoding(const char *name)
-{
- VALUE enclib = rb_sprintf("enc/%s.so", name);
- VALUE verbose = ruby_verbose;
- VALUE debug = ruby_debug;
- VALUE loaded;
- char *s = RSTRING_PTR(enclib) + 4, *e = RSTRING_END(enclib) - 3;
- int idx;
-
- while (s < e) {
- if (!ISALNUM(*s)) *s = '_';
- else if (ISUPPER(*s)) *s = TOLOWER(*s);
- ++s;
- }
- OBJ_FREEZE(enclib);
- ruby_verbose = Qfalse;
- ruby_debug = Qfalse;
- loaded = rb_protect(require_enc, enclib, 0);
- ruby_verbose = verbose;
- ruby_debug = debug;
- rb_set_errinfo(Qnil);
- if (NIL_P(loaded)) return -1;
- if ((idx = rb_enc_registered(name)) < 0) return -1;
- if (enc_autoload_p(enc_table.list[idx].enc)) return -1;
- return idx;
-}
-
-static int
-enc_autoload(rb_encoding *enc)
-{
- int i;
- rb_encoding *base = enc_table.list[ENC_TO_ENCINDEX(enc)].base;
-
- if (base) {
- i = 0;
- do {
- if (i >= enc_table.count) return -1;
- } while (enc_table.list[i].enc != base && (++i, 1));
- if (enc_autoload_p(base)) {
- if (enc_autoload(base) < 0) return -1;
- }
- i = ENC_TO_ENCINDEX(enc);
- enc_register_at(i, rb_enc_name(enc), base);
- }
- else {
- i = load_encoding(rb_enc_name(enc));
- }
- return i;
-}
-
-int
-rb_enc_find_index(const char *name)
-{
- int i = rb_enc_registered(name);
- rb_encoding *enc;
-
- if (i < 0) {
- i = load_encoding(name);
- }
- else if (!(enc = rb_enc_from_index(i))) {
- if (i != UNSPECIFIED_ENCODING) {
- rb_raise(rb_eArgError, "encoding %s is not registered", name);
- }
- }
- else if (enc_autoload_p(enc)) {
- if (enc_autoload(enc) < 0) {
- rb_warn("failed to load encoding (%s); use ASCII-8BIT instead",
- name);
- return 0;
- }
- }
- return i;
-}
-
-rb_encoding *
-rb_enc_find(const char *name)
-{
- int idx = rb_enc_find_index(name);
- if (idx < 0) idx = 0;
- return rb_enc_from_index(idx);
-}
-
-static inline int
-enc_capable(VALUE obj)
-{
- if (SPECIAL_CONST_P(obj)) return SYMBOL_P(obj);
- switch (BUILTIN_TYPE(obj)) {
- case T_STRING:
- case T_REGEXP:
- case T_FILE:
- return TRUE;
- case T_DATA:
- if (is_data_encoding(obj)) return TRUE;
- default:
- return FALSE;
- }
-}
-
-ID
-rb_id_encoding(void)
-{
- CONST_ID(id_encoding, "encoding");
- return id_encoding;
-}
-
-int
-rb_enc_get_index(VALUE obj)
-{
- int i = -1;
- VALUE tmp;
-
- if (SPECIAL_CONST_P(obj)) {
- if (!SYMBOL_P(obj)) return -1;
- obj = rb_id2str(SYM2ID(obj));
- }
- switch (BUILTIN_TYPE(obj)) {
- as_default:
- default:
- case T_STRING:
- case T_REGEXP:
- i = ENCODING_GET_INLINED(obj);
- if (i == ENCODING_INLINE_MAX) {
- VALUE iv;
-
- iv = rb_ivar_get(obj, rb_id_encoding());
- i = NUM2INT(iv);
- }
- break;
- case T_FILE:
- tmp = rb_funcall(obj, rb_intern("internal_encoding"), 0, 0);
- if (NIL_P(tmp)) obj = rb_funcall(obj, rb_intern("external_encoding"), 0, 0);
- else obj = tmp;
- if (NIL_P(obj)) break;
- case T_DATA:
- if (is_data_encoding(obj)) {
- i = enc_check_encoding(obj);
- }
- else {
- goto as_default;
- }
- break;
- }
- return i;
-}
-
-void
-rb_enc_set_index(VALUE obj, int idx)
-{
- if (idx < ENCODING_INLINE_MAX) {
- ENCODING_SET_INLINED(obj, idx);
- return;
- }
- ENCODING_SET_INLINED(obj, ENCODING_INLINE_MAX);
- rb_ivar_set(obj, rb_id_encoding(), INT2NUM(idx));
- return;
-}
-
-VALUE
-rb_enc_associate_index(VALUE obj, int idx)
-{
-/* enc_check_capable(obj);*/
- if (rb_enc_get_index(obj) == idx)
- return obj;
- if (SPECIAL_CONST_P(obj)) {
- rb_raise(rb_eArgError, "cannot set encoding");
- }
- if (!ENC_CODERANGE_ASCIIONLY(obj) ||
- !rb_enc_asciicompat(rb_enc_from_index(idx))) {
- ENC_CODERANGE_CLEAR(obj);
- }
- rb_enc_set_index(obj, idx);
- return obj;
-}
-
-VALUE
-rb_enc_associate(VALUE obj, rb_encoding *enc)
-{
- return rb_enc_associate_index(obj, rb_enc_to_index(enc));
-}
-
-rb_encoding*
-rb_enc_get(VALUE obj)
-{
- return rb_enc_from_index(rb_enc_get_index(obj));
-}
-
-rb_encoding*
-rb_enc_check(VALUE str1, VALUE str2)
-{
- rb_encoding *enc = rb_enc_compatible(str1, str2);
- if (!enc)
- rb_raise(rb_eEncCompatError, "incompatible character encodings: %s and %s",
- rb_enc_name(rb_enc_get(str1)),
- rb_enc_name(rb_enc_get(str2)));
- return enc;
-}
-
-rb_encoding*
-rb_enc_compatible(VALUE str1, VALUE str2)
-{
- int idx1, idx2;
- rb_encoding *enc1, *enc2;
-
- idx1 = rb_enc_get_index(str1);
- idx2 = rb_enc_get_index(str2);
-
- if (idx1 < 0 || idx2 < 0)
- return 0;
-
- if (idx1 == idx2) {
- return rb_enc_from_index(idx1);
- }
- enc1 = rb_enc_from_index(idx1);
- enc2 = rb_enc_from_index(idx2);
-
- if (TYPE(str2) == T_STRING && RSTRING_LEN(str2) == 0)
- return (idx1 == ENCINDEX_US_ASCII && rb_enc_asciicompat(enc2)) ? enc2 : enc1;
- if (TYPE(str1) == T_STRING && RSTRING_LEN(str1) == 0)
- return (idx2 == ENCINDEX_US_ASCII && rb_enc_asciicompat(enc1)) ? enc1 : enc2;
- if (!rb_enc_asciicompat(enc1) || !rb_enc_asciicompat(enc2)) {
- return 0;
- }
-
- /* objects whose encoding is the same of contents */
- if (BUILTIN_TYPE(str2) != T_STRING && idx2 == ENCINDEX_US_ASCII)
- return enc1;
- if (BUILTIN_TYPE(str1) != T_STRING && idx1 == ENCINDEX_US_ASCII)
- return enc2;
-
- if (BUILTIN_TYPE(str1) != T_STRING) {
- VALUE tmp = str1;
- int idx0 = idx1;
- str1 = str2;
- str2 = tmp;
- idx1 = idx2;
- idx2 = idx0;
- }
- if (BUILTIN_TYPE(str1) == T_STRING) {
- int cr1, cr2;
-
- cr1 = rb_enc_str_coderange(str1);
- if (BUILTIN_TYPE(str2) == T_STRING) {
- cr2 = rb_enc_str_coderange(str2);
- if (cr1 != cr2) {
- /* may need to handle ENC_CODERANGE_BROKEN */
- if (cr1 == ENC_CODERANGE_7BIT) return enc2;
- if (cr2 == ENC_CODERANGE_7BIT) return enc1;
- }
- if (cr2 == ENC_CODERANGE_7BIT) {
- if (idx1 == ENCINDEX_ASCII) return enc2;
- return enc1;
- }
- }
- if (cr1 == ENC_CODERANGE_7BIT)
- return enc2;
- }
- return 0;
-}
-
-void
-rb_enc_copy(VALUE obj1, VALUE obj2)
-{
- rb_enc_associate_index(obj1, rb_enc_get_index(obj2));
-}
-
-
-/*
- * call-seq:
- * obj.encoding => encoding
- *
- * Returns the Encoding object that represents the encoding of obj.
- */
-
-VALUE
-rb_obj_encoding(VALUE obj)
-{
- rb_encoding *enc = rb_enc_get(obj);
- if (!enc) {
- rb_raise(rb_eTypeError, "unknown encoding");
- }
- return rb_enc_from_encoding(enc);
-}
-
-int
-rb_enc_fast_mbclen(const char *p, const char *e, rb_encoding *enc)
-{
- return ONIGENC_MBC_ENC_LEN(enc, (UChar*)p, (UChar*)e);
-}
-
-int
-rb_enc_mbclen(const char *p, const char *e, rb_encoding *enc)
-{
- int n = ONIGENC_PRECISE_MBC_ENC_LEN(enc, (UChar*)p, (UChar*)e);
- if (MBCLEN_CHARFOUND_P(n) && MBCLEN_CHARFOUND_LEN(n) <= e-p)
- return MBCLEN_CHARFOUND_LEN(n);
- else {
- int min = rb_enc_mbminlen(enc);
- return min <= e-p ? min : (int)(e-p);
- }
-}
-
-int
-rb_enc_precise_mbclen(const char *p, const char *e, rb_encoding *enc)
-{
- int n;
- if (e <= p)
- return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(1);
- n = ONIGENC_PRECISE_MBC_ENC_LEN(enc, (UChar*)p, (UChar*)e);
- if (e-p < n)
- return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(n-(int)(e-p));
- return n;
-}
-
-int
-rb_enc_ascget(const char *p, const char *e, int *len, rb_encoding *enc)
-{
- unsigned int c, l;
- if (e <= p)
- return -1;
- if (rb_enc_asciicompat(enc)) {
- c = (unsigned char)*p;
- if (!ISASCII(c))
- return -1;
- if (len) *len = 1;
- return c;
- }
- l = rb_enc_precise_mbclen(p, e, enc);
- if (!MBCLEN_CHARFOUND_P(l))
- return -1;
- c = rb_enc_mbc_to_codepoint(p, e, enc);
- if (!rb_enc_isascii(c, enc))
- return -1;
- if (len) *len = l;
- return c;
-}
-
-unsigned int
-rb_enc_codepoint_len(const char *p, const char *e, int *len_p, rb_encoding *enc)
-{
- int r;
- if (e <= p)
- rb_raise(rb_eArgError, "empty string");
- r = rb_enc_precise_mbclen(p, e, enc);
- if (MBCLEN_CHARFOUND_P(r)) {
- if (len_p) *len_p = MBCLEN_CHARFOUND_LEN(r);
- return rb_enc_mbc_to_codepoint(p, e, enc);
- }
- else
- rb_raise(rb_eArgError, "invalid byte sequence in %s", rb_enc_name(enc));
-}
-
-#undef rb_enc_codepoint
-unsigned int
-rb_enc_codepoint(const char *p, const char *e, rb_encoding *enc)
-{
- return rb_enc_codepoint_len(p, e, 0, enc);
-}
-
-int
-rb_enc_codelen(int c, rb_encoding *enc)
-{
- int n = ONIGENC_CODE_TO_MBCLEN(enc,c);
- if (n == 0) {
- rb_raise(rb_eArgError, "invalid codepoint 0x%x in %s", c, rb_enc_name(enc));
- }
- return n;
-}
-
-int
-rb_enc_toupper(int c, rb_encoding *enc)
-{
- return (ONIGENC_IS_ASCII_CODE(c)?ONIGENC_ASCII_CODE_TO_UPPER_CASE(c):(c));
-}
-
-int
-rb_enc_tolower(int c, rb_encoding *enc)
-{
- return (ONIGENC_IS_ASCII_CODE(c)?ONIGENC_ASCII_CODE_TO_LOWER_CASE(c):(c));
-}
-
-/*
- * call-seq:
- * enc.inspect => string
- *
- * Returns a string which represents the encoding for programmers.
- *
- * Encoding::UTF_8.inspect #=> "#<Encoding:UTF-8>"
- * Encoding::ISO_2022_JP.inspect #=> "#<Encoding:ISO-2022-JP (dummy)>"
- */
-static VALUE
-enc_inspect(VALUE self)
-{
- VALUE str = rb_sprintf("#<%s:%s%s>", rb_obj_classname(self),
- rb_enc_name((rb_encoding*)DATA_PTR(self)),
- (enc_dummy_p(self) ? " (dummy)" : ""));
- ENCODING_CODERANGE_SET(str, rb_usascii_encindex(), ENC_CODERANGE_7BIT);
- return str;
-}
-
-/*
- * call-seq:
- * enc.name => string
- *
- * Returns the name of the encoding.
- *
- * Encoding::UTF_8.name => "UTF-8"
- */
-static VALUE
-enc_name(VALUE self)
-{
- return rb_usascii_str_new2(rb_enc_name((rb_encoding*)DATA_PTR(self)));
-}
-
-static int
-enc_names_i(st_data_t name, st_data_t idx, st_data_t args)
-{
- VALUE *arg = (VALUE *)args;
-
- if ((int)idx == (int)arg[0]) {
- VALUE str = rb_usascii_str_new2((char *)name);
- OBJ_FREEZE(str);
- rb_ary_push(arg[1], str);
- }
- return ST_CONTINUE;
-}
-
-/*
- * call-seq:
- * enc.names => array
- *
- * Returns the list of name and aliases of the encoding.
- *
- * Encoding::WINDOWS_31J.names => ["Windows-31J", "CP932", "csWindows31J"]
- */
-static VALUE
-enc_names(VALUE self)
-{
- VALUE args[2];
-
- args[0] = (VALUE)rb_to_encoding_index(self);
- args[1] = rb_ary_new2(0);
- st_foreach(enc_table.names, enc_names_i, (st_data_t)args);
- return args[1];
-}
-
-/*
- * call-seq:
- * Encoding.list => [enc1, enc2, ...]
- *
- * Returns the list of loaded encodings.
- *
- * Encoding.list
- * => [#<Encoding:ASCII-8BIT>, #<Encoding:UTF-8>,
- * #<Encoding:ISO-2022-JP (dummy)>]
- *
- * Encoding.find("US-ASCII")
- * => #<Encoding:US-ASCII>
- *
- * Encoding.list
- * => [#<Encoding:ASCII-8BIT>, #<Encoding:UTF-8>,
- * #<Encoding:US-ASCII>, #<Encoding:ISO-2022-JP (dummy)>]
- *
- */
-static VALUE
-enc_list(VALUE klass)
-{
- VALUE ary = rb_ary_new2(0);
- rb_ary_replace(ary, rb_encoding_list);
- return ary;
-}
-
-/*
- * call-seq:
- * Encoding.find(string) => enc
- * Encoding.find(symbol) => enc
- *
- * Search the encoding with specified <i>name</i>.
- * <i>name</i> should be a string or symbol.
- *
- * Encoding.find("US-ASCII") => #<Encoding:US-ASCII>
- * Encoding.find(:Shift_JIS) => #<Encoding:Shift_JIS>
- *
- * An ArgumentError is raised when no encoding with <i>name</i>.
- * Only +Encoding.find("internal")+ however returns nil when no encoding named "internal",
- * in other words, when Ruby has no default internal encoding.
- */
-static VALUE
-enc_find(VALUE klass, VALUE enc)
-{
- return rb_enc_from_encoding(to_encoding(enc));
-}
-
-/*
- * call-seq:
- * Encoding.compatible?(str1, str2) => enc or nil
- *
- * Checks the compatibility of two strings.
- * If they are compatible, means concatenatable,
- * returns an encoding which the concatinated string will be.
- * If they are not compatible, nil is returned.
- *
- * Encoding.compatible?("\xa1".force_encoding("iso-8859-1"), "b")
- * => #<Encoding:ISO-8859-1>
- *
- * Encoding.compatible?(
- * "\xa1".force_encoding("iso-8859-1"),
- * "\xa1\xa1".force_encoding("euc-jp"))
- * => nil
- *
- */
-static VALUE
-enc_compatible_p(VALUE klass, VALUE str1, VALUE str2)
-{
- rb_encoding *enc;
-
- if (!enc_capable(str1)) return Qnil;
- if (!enc_capable(str2)) return Qnil;
- enc = rb_enc_compatible(str1, str2);
- if (!enc) return Qnil;
- return rb_enc_from_encoding(enc);
-}
-
-/* :nodoc: */
-static VALUE
-enc_dump(int argc, VALUE *argv, VALUE self)
-{
- rb_scan_args(argc, argv, "01", 0);
- return enc_name(self);
-}
-
-/* :nodoc: */
-static VALUE
-enc_load(VALUE klass, VALUE str)
-{
- return enc_find(klass, str);
-}
-
-rb_encoding *
-rb_ascii8bit_encoding(void)
-{
- if (!enc_table.list) {
- rb_enc_init();
- }
- return enc_table.list[ENCINDEX_ASCII].enc;
-}
-
-int
-rb_ascii8bit_encindex(void)
-{
- return ENCINDEX_ASCII;
-}
-
-rb_encoding *
-rb_utf8_encoding(void)
-{
- if (!enc_table.list) {
- rb_enc_init();
- }
- return enc_table.list[ENCINDEX_UTF_8].enc;
-}
-
-int
-rb_utf8_encindex(void)
-{
- return ENCINDEX_UTF_8;
-}
-
-rb_encoding *
-rb_usascii_encoding(void)
-{
- if (!enc_table.list) {
- rb_enc_init();
- }
- return enc_table.list[ENCINDEX_US_ASCII].enc;
-}
-
-int
-rb_usascii_encindex(void)
-{
- return ENCINDEX_US_ASCII;
-}
-
-rb_encoding *
-rb_locale_encoding(void)
-{
- VALUE charmap = rb_locale_charmap(rb_cEncoding);
- int idx;
-
- if (NIL_P(charmap))
- idx = rb_usascii_encindex();
- else if ((idx = rb_enc_find_index(StringValueCStr(charmap))) < 0)
- idx = rb_ascii8bit_encindex();
-
- if (rb_enc_registered("locale") < 0) enc_alias_internal("locale", idx);
-
- return rb_enc_from_index(idx);
-}
-
-rb_encoding *
-rb_filesystem_encoding(void)
-{
- rb_encoding *enc;
-#if defined NO_LOCALE_CHARMAP
- enc = rb_default_external_encoding();
-#elif defined _WIN32 || defined __CYGWIN__
- char cp[sizeof(int) * 8 / 3 + 4];
- snprintf(cp, sizeof cp, "CP%d", AreFileApisANSI() ? GetACP() : GetOEMCP());
- enc = rb_enc_find(cp);
-#elif defined __APPLE__
- enc = rb_utf8_encoding();
-#else
- enc = rb_default_external_encoding();
-#endif
- return enc;
-}
-
-struct default_encoding {
- int index; /* -2 => not yet set, -1 => nil */
- rb_encoding *enc;
-};
-
-static int
-enc_set_default_encoding(struct default_encoding *def, VALUE encoding, const char *name)
-{
- int overridden = FALSE;
-
- if (def->index != -2)
- /* Already set */
- overridden = TRUE;
-
- if (NIL_P(encoding)) {
- def->index = -1;
- def->enc = 0;
- st_insert(enc_table.names, (st_data_t)strdup(name),
- (st_data_t)UNSPECIFIED_ENCODING);
- }
- else {
- def->index = rb_enc_to_index(rb_to_encoding(encoding));
- def->enc = 0;
- enc_alias_internal(name, def->index);
- }
-
- return overridden;
-}
-
-static struct default_encoding default_external = {0};
-
-rb_encoding *
-rb_default_external_encoding(void)
-{
- if (default_external.enc) return default_external.enc;
-
- if (default_external.index >= 0) {
- default_external.enc = rb_enc_from_index(default_external.index);
- return default_external.enc;
- }
- else {
- return rb_locale_encoding();
- }
-}
-
-VALUE
-rb_enc_default_external(void)
-{
- return rb_enc_from_encoding(rb_default_external_encoding());
-}
-
-/*
- * call-seq:
- * Encoding.default_external => enc
- *
- * Returns default external encoding.
- *
- * It is initialized by the locale or -E option.
- */
-static VALUE
-get_default_external(VALUE klass)
-{
- return rb_enc_default_external();
-}
-
-void
-rb_enc_set_default_external(VALUE encoding)
-{
- if (NIL_P(encoding)) {
- rb_raise(rb_eArgError, "default external can not be nil");
- }
- enc_set_default_encoding(&default_external, encoding,
- "external");
-}
-
-/*
- * call-seq:
- * Encoding.default_external = enc
- *
- * Sets default external encoding.
- */
-static VALUE
-set_default_external(VALUE klass, VALUE encoding)
-{
- rb_warning("setting Encoding.default_external");
- rb_enc_set_default_external(encoding);
- return encoding;
-}
-
-static struct default_encoding default_internal = {-2};
-
-rb_encoding *
-rb_default_internal_encoding(void)
-{
- if (!default_internal.enc && default_internal.index >= 0) {
- default_internal.enc = rb_enc_from_index(default_internal.index);
- }
- return default_internal.enc; /* can be NULL */
-}
-
-VALUE
-rb_enc_default_internal(void)
-{
- /* Note: These functions cope with default_internal not being set */
- return rb_enc_from_encoding(rb_default_internal_encoding());
-}
-
-/*
- * call-seq:
- * Encoding.default_internal => enc
- *
- * Returns default internal encoding.
- *
- * It is initialized by the source internal_encoding or -E option.
- */
-static VALUE
-get_default_internal(VALUE klass)
-{
- return rb_enc_default_internal();
-}
-
-void
-rb_enc_set_default_internal(VALUE encoding)
-{
- enc_set_default_encoding(&default_internal, encoding,
- "internal");
-}
-
-/*
- * call-seq:
- * Encoding.default_internal = enc or nil
- *
- * Sets default internal encoding.
- * Or removes default internal encoding when passed nil.
- */
-static VALUE
-set_default_internal(VALUE klass, VALUE encoding)
-{
- rb_warning("setting Encoding.default_internal");
- rb_enc_set_default_internal(encoding);
- return encoding;
-}
-
-/*
- * call-seq:
- * Encoding.locale_charmap => string
- *
- * Returns the locale charmap name.
- *
- * Debian GNU/Linux
- * LANG=C
- * Encoding.locale_charmap => "ANSI_X3.4-1968"
- * LANG=ja_JP.EUC-JP
- * Encoding.locale_charmap => "EUC-JP"
- *
- * SunOS 5
- * LANG=C
- * Encoding.locale_charmap => "646"
- * LANG=ja
- * Encoding.locale_charmap => "eucJP"
- *
- * The result is higly platform dependent.
- * So Encoding.find(Encoding.locale_charmap) may cause an error.
- * If you need some encoding object even for unknown locale,
- * Encoding.find("locale") can be used.
- *
- */
-VALUE
-rb_locale_charmap(VALUE klass)
-{
-#if defined NO_LOCALE_CHARMAP
- return rb_usascii_str_new2("ASCII-8BIT");
-#elif defined _WIN32 || defined __CYGWIN__
- const char *nl_langinfo_codeset(void);
- const char *codeset = nl_langinfo_codeset();
- char cp[sizeof(int) * 3 + 4];
- if (!codeset) {
- snprintf(cp, sizeof(cp), "CP%d", GetConsoleCP());
- codeset = cp;
- }
- return rb_usascii_str_new2(codeset);
-#elif defined HAVE_LANGINFO_H
- char *codeset;
- codeset = nl_langinfo(CODESET);
- return rb_usascii_str_new2(codeset);
-#else
- return Qnil;
-#endif
-}
-
-static void
-set_encoding_const(const char *name, rb_encoding *enc)
-{
- VALUE encoding = rb_enc_from_encoding(enc);
- char *s = (char *)name;
- int haslower = 0, hasupper = 0, valid = 0;
-
- if (ISDIGIT(*s)) return;
- if (ISUPPER(*s)) {
- hasupper = 1;
- while (*++s && (ISALNUM(*s) || *s == '_')) {
- if (ISLOWER(*s)) haslower = 1;
- }
- }
- if (!*s) {
- if (s - name > ENCODING_NAMELEN_MAX) return;
- valid = 1;
- rb_define_const(rb_cEncoding, name, encoding);
- }
- if (!valid || haslower) {
- size_t len = s - name;
- if (len > ENCODING_NAMELEN_MAX) return;
- if (!haslower || !hasupper) {
- do {
- if (ISLOWER(*s)) haslower = 1;
- if (ISUPPER(*s)) hasupper = 1;
- } while (*++s && (!haslower || !hasupper));
- len = s - name;
- }
- len += strlen(s);
- if (len++ > ENCODING_NAMELEN_MAX) return;
- MEMCPY(s = ALLOCA_N(char, len), name, char, len);
- name = s;
- if (!valid) {
- if (ISLOWER(*s)) *s = ONIGENC_ASCII_CODE_TO_UPPER_CASE((int)*s);
- for (; *s; ++s) {
- if (!ISALNUM(*s)) *s = '_';
- }
- if (hasupper) {
- rb_define_const(rb_cEncoding, name, encoding);
- }
- }
- if (haslower) {
- for (s = (char *)name; *s; ++s) {
- if (ISLOWER(*s)) *s = ONIGENC_ASCII_CODE_TO_UPPER_CASE((int)*s);
- }
- rb_define_const(rb_cEncoding, name, encoding);
- }
- }
-}
-
-static int
-rb_enc_name_list_i(st_data_t name, st_data_t idx, st_data_t arg)
-{
- VALUE ary = (VALUE)arg;
- VALUE str = rb_usascii_str_new2((char *)name);
- OBJ_FREEZE(str);
- rb_ary_push(ary, str);
- return ST_CONTINUE;
-}
-
-/*
- * call-seq:
- * Encoding.name_list => ["enc1", "enc2", ...]
- *
- * Returns the list of available encoding names.
- *
- * Encoding.name_list
- * => ["US-ASCII", "ASCII-8BIT", "UTF-8",
- * "ISO-8859-1", "Shift_JIS", "EUC-JP",
- * "Windows-31J",
- * "BINARY", "CP932", "eucJP"]
- *
- */
-
-static VALUE
-rb_enc_name_list(VALUE klass)
-{
- VALUE ary = rb_ary_new2(enc_table.names->num_entries);
- st_foreach(enc_table.names, rb_enc_name_list_i, (st_data_t)ary);
- return ary;
-}
-
-static int
-rb_enc_aliases_enc_i(st_data_t name, st_data_t orig, st_data_t arg)
-{
- VALUE *p = (VALUE *)arg;
- VALUE aliases = p[0], ary = p[1];
- int idx = (int)orig;
- VALUE key, str = rb_ary_entry(ary, idx);
-
- if (NIL_P(str)) {
- rb_encoding *enc = rb_enc_from_index(idx);
-
- if (!enc) return ST_CONTINUE;
- if (STRCASECMP((char*)name, rb_enc_name(enc)) == 0) {
- return ST_CONTINUE;
- }
- str = rb_usascii_str_new2(rb_enc_name(enc));
- OBJ_FREEZE(str);
- rb_ary_store(ary, idx, str);
- }
- key = rb_usascii_str_new2((char *)name);
- OBJ_FREEZE(key);
- rb_hash_aset(aliases, key, str);
- return ST_CONTINUE;
-}
-
-/*
- * call-seq:
- * Encoding.aliases => {"alias1" => "orig1", "alias2" => "orig2", ...}
- *
- * Returns the hash of available encoding alias and original encoding name.
- *
- * Encoding.aliases
- * => {"BINARY"=>"ASCII-8BIT", "ASCII"=>"US-ASCII", "ANSI_X3.4-1986"=>"US-ASCII",
- * "SJIS"=>"Shift_JIS", "eucJP"=>"EUC-JP", "CP932"=>"Windows-31J"}
- *
- */
-
-static VALUE
-rb_enc_aliases(VALUE klass)
-{
- VALUE aliases[2];
- aliases[0] = rb_hash_new();
- aliases[1] = rb_ary_new();
- st_foreach(enc_table.names, rb_enc_aliases_enc_i, (st_data_t)aliases);
- return aliases[0];
-}
-
-void
-Init_Encoding(void)
-{
-#undef rb_intern
-#define rb_intern(str) rb_intern_const(str)
- VALUE list;
- int i;
-
- rb_cEncoding = rb_define_class("Encoding", rb_cObject);
- rb_undef_alloc_func(rb_cEncoding);
- rb_define_method(rb_cEncoding, "to_s", enc_name, 0);
- rb_define_method(rb_cEncoding, "inspect", enc_inspect, 0);
- rb_define_method(rb_cEncoding, "name", enc_name, 0);
- rb_define_method(rb_cEncoding, "names", enc_names, 0);
- rb_define_method(rb_cEncoding, "dummy?", enc_dummy_p, 0);
- rb_define_method(rb_cEncoding, "ascii_compatible?", enc_ascii_compatible_p, 0);
- rb_define_singleton_method(rb_cEncoding, "list", enc_list, 0);
- rb_define_singleton_method(rb_cEncoding, "name_list", rb_enc_name_list, 0);
- rb_define_singleton_method(rb_cEncoding, "aliases", rb_enc_aliases, 0);
- rb_define_singleton_method(rb_cEncoding, "find", enc_find, 1);
- rb_define_singleton_method(rb_cEncoding, "compatible?", enc_compatible_p, 2);
-
- rb_define_method(rb_cEncoding, "_dump", enc_dump, -1);
- rb_define_singleton_method(rb_cEncoding, "_load", enc_load, 1);
-
- rb_define_singleton_method(rb_cEncoding, "default_external", get_default_external, 0);
- rb_define_singleton_method(rb_cEncoding, "default_external=", set_default_external, 1);
- rb_define_singleton_method(rb_cEncoding, "default_internal", get_default_internal, 0);
- rb_define_singleton_method(rb_cEncoding, "default_internal=", set_default_internal, 1);
- rb_define_singleton_method(rb_cEncoding, "locale_charmap", rb_locale_charmap, 0);
-
- list = rb_ary_new2(enc_table.count);
- RBASIC(list)->klass = 0;
- rb_encoding_list = list;
- rb_gc_register_mark_object(list);
-
- for (i = 0; i < enc_table.count; ++i) {
- rb_ary_push(list, enc_new(enc_table.list[i].enc));
- }
-}
-
-/* locale insensitive functions */
-
-#define ctype_test(c, ctype) \
- (rb_isascii(c) && ONIGENC_IS_ASCII_CODE_CTYPE((c), ctype))
-
-int rb_isalnum(int c) { return ctype_test(c, ONIGENC_CTYPE_ALNUM); }
-int rb_isalpha(int c) { return ctype_test(c, ONIGENC_CTYPE_ALPHA); }
-int rb_isblank(int c) { return ctype_test(c, ONIGENC_CTYPE_BLANK); }
-int rb_iscntrl(int c) { return ctype_test(c, ONIGENC_CTYPE_CNTRL); }
-int rb_isdigit(int c) { return ctype_test(c, ONIGENC_CTYPE_DIGIT); }
-int rb_isgraph(int c) { return ctype_test(c, ONIGENC_CTYPE_GRAPH); }
-int rb_islower(int c) { return ctype_test(c, ONIGENC_CTYPE_LOWER); }
-int rb_isprint(int c) { return ctype_test(c, ONIGENC_CTYPE_PRINT); }
-int rb_ispunct(int c) { return ctype_test(c, ONIGENC_CTYPE_PUNCT); }
-int rb_isspace(int c) { return ctype_test(c, ONIGENC_CTYPE_SPACE); }
-int rb_isupper(int c) { return ctype_test(c, ONIGENC_CTYPE_UPPER); }
-int rb_isxdigit(int c) { return ctype_test(c, ONIGENC_CTYPE_XDIGIT); }
-
-int
-rb_tolower(int c)
-{
- return rb_isascii(c) ? ONIGENC_ASCII_CODE_TO_LOWER_CASE(c) : c;
-}
-
-int
-rb_toupper(int c)
-{
- return rb_isascii(c) ? ONIGENC_ASCII_CODE_TO_UPPER_CASE(c) : c;
-}
-
diff --git a/enum.c b/enum.c
index 715969d060..df35c2fe03 100644
--- a/enum.c
+++ b/enum.c
@@ -3,39 +3,67 @@
enum.c -
$Author$
+ $Date$
created at: Fri Oct 1 15:15:19 JST 1993
- Copyright (C) 1993-2007 Yukihiro Matsumoto
+ Copyright (C) 1993-2003 Yukihiro Matsumoto
**********************************************************************/
-#include "ruby/ruby.h"
-#include "ruby/util.h"
+#include "ruby.h"
#include "node.h"
+#include "util.h"
VALUE rb_mEnumerable;
-static ID id_each, id_eqq, id_cmp, id_next, id_size;
+static ID id_each, id_eqq, id_cmp, id_size;
+struct iter_method_arg {
+ VALUE obj;
+ ID mid;
+ int argc;
+ VALUE *argv;
+};
+
+static VALUE iterate_method _((VALUE obj));
static VALUE
-enum_values_pack(int argc, VALUE *argv)
+iterate_method(obj)
+ VALUE obj;
{
- if (argc == 0) return Qnil;
- if (argc == 1) return argv[0];
- return rb_ary_new4(argc, argv);
+ struct iter_method_arg *arg;
+
+ arg = (struct iter_method_arg *)obj;
+ return rb_funcall2(arg->obj, arg->mid, arg->argc, arg->argv);
}
-#define ENUM_WANT_SVALUE() do { \
- i = enum_values_pack(argc, argv); \
-} while (0)
+VALUE
+rb_block_call(obj, mid, argc, argv, bl_proc, data2)
+ VALUE obj;
+ ID mid;
+ int argc;
+ VALUE *argv;
+ VALUE (*bl_proc) (ANYARGS);
+ VALUE data2;
+{
+ struct iter_method_arg arg;
-#define enum_yield rb_yield_values2
+ arg.obj = obj;
+ arg.mid = mid;
+ arg.argc = argc;
+ arg.argv = argv;
+ return rb_iterate(iterate_method, (VALUE)&arg, bl_proc, data2);
+}
-static VALUE
-grep_i(VALUE i, VALUE args, int argc, VALUE *argv)
+VALUE
+rb_each(obj)
+ VALUE obj;
{
- VALUE *arg = (VALUE *)args;
- ENUM_WANT_SVALUE();
+ return rb_funcall(obj, id_each, 0, 0);
+}
+static VALUE
+grep_i(i, arg)
+ VALUE i, *arg;
+{
if (RTEST(rb_funcall(arg[0], id_eqq, 1, i))) {
rb_ary_push(arg[1], i);
}
@@ -43,11 +71,9 @@ grep_i(VALUE i, VALUE args, int argc, VALUE *argv)
}
static VALUE
-grep_iter_i(VALUE i, VALUE args, int argc, VALUE *argv)
+grep_iter_i(i, arg)
+ VALUE i, *arg;
{
- VALUE *arg = (VALUE *)args;
- ENUM_WANT_SVALUE();
-
if (RTEST(rb_funcall(arg[0], id_eqq, 1, i))) {
rb_ary_push(arg[1], rb_yield(i));
}
@@ -66,14 +92,15 @@ grep_iter_i(VALUE i, VALUE args, int argc, VALUE *argv)
*
* (1..100).grep 38..44 #=> [38, 39, 40, 41, 42, 43, 44]
* c = IO.constants
- * c.grep(/SEEK/) #=> [:SEEK_SET, :SEEK_CUR, :SEEK_END]
+ * c.grep(/SEEK/) #=> ["SEEK_END", "SEEK_SET", "SEEK_CUR"]
* res = c.grep(/SEEK/) {|v| IO.const_get(v) }
- * res #=> [0, 1, 2]
+ * res #=> [2, 0, 1]
*
*/
static VALUE
-enum_grep(VALUE obj, VALUE pat)
+enum_grep(obj, pat)
+ VALUE obj, pat;
{
VALUE ary = rb_ary_new();
VALUE arg[2];
@@ -81,37 +108,41 @@ enum_grep(VALUE obj, VALUE pat)
arg[0] = pat;
arg[1] = ary;
- rb_block_call(obj, id_each, 0, 0, rb_block_given_p() ? grep_iter_i : grep_i, (VALUE)arg);
+ rb_iterate(rb_each, obj, rb_block_given_p() ? grep_iter_i : grep_i, (VALUE)arg);
return ary;
}
+static VALUE count_i _((VALUE, VALUE));
static VALUE
-count_i(VALUE i, VALUE memop, int argc, VALUE *argv)
+count_i(i, memop)
+ VALUE i, memop;
{
VALUE *memo = (VALUE*)memop;
- ENUM_WANT_SVALUE();
-
if (rb_equal(i, memo[1])) {
memo[0]++;
}
return Qnil;
}
+static VALUE count_iter_i _((VALUE, VALUE));
static VALUE
-count_iter_i(VALUE i, VALUE memop, int argc, VALUE *argv)
+count_iter_i(i, memop)
+ VALUE i, memop;
{
VALUE *memo = (VALUE*)memop;
- if (RTEST(enum_yield(argc, argv))) {
+ if (RTEST(rb_yield(i))) {
memo[0]++;
}
return Qnil;
}
+static VALUE count_all_i _((VALUE, VALUE));
static VALUE
-count_all_i(VALUE i, VALUE memop, int argc, VALUE *argv)
+count_all_i(i, memop)
+ VALUE i, memop;
{
VALUE *memo = (VALUE*)memop;
@@ -139,7 +170,10 @@ count_all_i(VALUE i, VALUE memop, int argc, VALUE *argv)
*/
static VALUE
-enum_count(int argc, VALUE *argv, VALUE obj)
+enum_count(argc, argv, obj)
+ int argc;
+ VALUE *argv;
+ VALUE obj;
{
VALUE memo[2]; /* [count, condition value] */
rb_block_call_func *func;
@@ -169,10 +203,10 @@ enum_count(int argc, VALUE *argv, VALUE obj)
}
static VALUE
-find_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
+find_i(i, memo)
+ VALUE i;
+ VALUE *memo;
{
- ENUM_WANT_SVALUE();
-
if (RTEST(rb_yield(i))) {
*memo = i;
rb_iter_break();
@@ -196,14 +230,17 @@ find_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
*/
static VALUE
-enum_find(int argc, VALUE *argv, VALUE obj)
+enum_find(argc, argv, obj)
+ int argc;
+ VALUE* argv;
+ VALUE obj;
{
VALUE memo = Qundef;
VALUE if_none;
rb_scan_args(argc, argv, "01", &if_none);
RETURN_ENUMERATOR(obj, argc, argv);
- rb_block_call(obj, id_each, 0, 0, find_i, (VALUE)&memo);
+ rb_iterate(rb_each, obj, find_i, (VALUE)&memo);
if (memo != Qundef) {
return memo;
}
@@ -213,13 +250,14 @@ enum_find(int argc, VALUE *argv, VALUE obj)
return Qnil;
}
+static VALUE find_index_i _((VALUE, VALUE));
static VALUE
-find_index_i(VALUE i, VALUE memop, int argc, VALUE *argv)
+find_index_i(i, memop)
+ VALUE i;
+ VALUE memop;
{
VALUE *memo = (VALUE*)memop;
- ENUM_WANT_SVALUE();
-
if (rb_equal(i, memo[2])) {
memo[0] = UINT2NUM(memo[1]);
rb_iter_break();
@@ -228,12 +266,15 @@ find_index_i(VALUE i, VALUE memop, int argc, VALUE *argv)
return Qnil;
}
+static VALUE find_index_iter_i _((VALUE, VALUE));
static VALUE
-find_index_iter_i(VALUE i, VALUE memop, int argc, VALUE *argv)
+find_index_iter_i(i, memop)
+ VALUE i;
+ VALUE memop;
{
VALUE *memo = (VALUE*)memop;
- if (RTEST(enum_yield(argc, argv))) {
+ if (RTEST(rb_yield(i))) {
memo[0] = UINT2NUM(memo[1]);
rb_iter_break();
}
@@ -258,7 +299,10 @@ find_index_iter_i(VALUE i, VALUE memop, int argc, VALUE *argv)
*/
static VALUE
-enum_find_index(int argc, VALUE *argv, VALUE obj)
+enum_find_index(argc, argv, obj)
+ int argc;
+ VALUE *argv;
+ VALUE obj;
{
VALUE memo[3]; /* [return value, current index, condition value] */
rb_block_call_func *func;
@@ -282,10 +326,9 @@ enum_find_index(int argc, VALUE *argv, VALUE obj)
}
static VALUE
-find_all_i(VALUE i, VALUE ary, int argc, VALUE *argv)
+find_all_i(i, ary)
+ VALUE i, ary;
{
- ENUM_WANT_SVALUE();
-
if (RTEST(rb_yield(i))) {
rb_ary_push(ary, i);
}
@@ -306,23 +349,21 @@ find_all_i(VALUE i, VALUE ary, int argc, VALUE *argv)
*/
static VALUE
-enum_find_all(VALUE obj)
+enum_find_all(obj)
+ VALUE obj;
{
- VALUE ary;
+ VALUE ary = rb_ary_new();
RETURN_ENUMERATOR(obj, 0, 0);
-
- ary = rb_ary_new();
- rb_block_call(obj, id_each, 0, 0, find_all_i, ary);
+ rb_iterate(rb_each, obj, find_all_i, ary);
return ary;
}
static VALUE
-reject_i(VALUE i, VALUE ary, int argc, VALUE *argv)
+reject_i(i, ary)
+ VALUE i, ary;
{
- ENUM_WANT_SVALUE();
-
if (!RTEST(rb_yield(i))) {
rb_ary_push(ary, i);
}
@@ -341,31 +382,31 @@ reject_i(VALUE i, VALUE ary, int argc, VALUE *argv)
*/
static VALUE
-enum_reject(VALUE obj)
+enum_reject(obj)
+ VALUE obj;
{
- VALUE ary;
+ VALUE ary = rb_ary_new();
RETURN_ENUMERATOR(obj, 0, 0);
-
- ary = rb_ary_new();
- rb_block_call(obj, id_each, 0, 0, reject_i, ary);
+ rb_iterate(rb_each, obj, reject_i, ary);
return ary;
}
static VALUE
-collect_i(VALUE i, VALUE ary, int argc, VALUE *argv)
+collect_i(i, ary)
+ VALUE i, ary;
{
- rb_ary_push(ary, enum_yield(argc, argv));
+ rb_ary_push(ary, rb_yield(i));
return Qnil;
}
static VALUE
-collect_all(VALUE i, VALUE ary, int argc, VALUE *argv)
+collect_all(i, ary)
+ VALUE i, ary;
{
- rb_thread_check_ints();
- rb_ary_push(ary, enum_values_pack(argc, argv));
+ rb_ary_push(ary, i);
return Qnil;
}
@@ -384,14 +425,12 @@ collect_all(VALUE i, VALUE ary, int argc, VALUE *argv)
*/
static VALUE
-enum_collect(VALUE obj)
+enum_collect(obj)
+ VALUE obj;
{
- VALUE ary;
+ VALUE ary = rb_ary_new();
- RETURN_ENUMERATOR(obj, 0, 0);
-
- ary = rb_ary_new();
- rb_block_call(obj, id_each, 0, 0, collect_i, ary);
+ rb_iterate(rb_each, obj, rb_block_given_p() ? collect_i : collect_all, ary);
return ary;
}
@@ -407,23 +446,25 @@ enum_collect(VALUE obj)
* { 'a'=>1, 'b'=>2, 'c'=>3 }.to_a #=> [["a", 1], ["b", 2], ["c", 3]]
*/
static VALUE
-enum_to_a(int argc, VALUE *argv, VALUE obj)
+enum_to_a(argc, argv, obj)
+ int argc;
+ VALUE *argv;
+ VALUE obj;
{
VALUE ary = rb_ary_new();
rb_block_call(obj, id_each, argc, argv, collect_all, ary);
- OBJ_INFECT(ary, obj);
return ary;
}
+static VALUE inject_i _((VALUE, VALUE));
static VALUE
-inject_i(VALUE i, VALUE p, int argc, VALUE *argv)
+inject_i(i, p)
+ VALUE i;
+ VALUE p;
{
VALUE *memo = (VALUE *)p;
-
- ENUM_WANT_SVALUE();
-
if (memo[0] == Qundef) {
memo[0] = i;
}
@@ -433,13 +474,14 @@ inject_i(VALUE i, VALUE p, int argc, VALUE *argv)
return Qnil;
}
+static VALUE inject_op_i _((VALUE, VALUE));
static VALUE
-inject_op_i(VALUE i, VALUE p, int argc, VALUE *argv)
+inject_op_i(i, p)
+ VALUE i;
+ VALUE p;
{
VALUE *memo = (VALUE *)p;
- ENUM_WANT_SVALUE();
-
if (memo[0] == Qundef) {
memo[0] = i;
}
@@ -495,10 +537,13 @@ inject_op_i(VALUE i, VALUE p, int argc, VALUE *argv)
*
*/
static VALUE
-enum_inject(int argc, VALUE *argv, VALUE obj)
+enum_inject(argc, argv, obj)
+ int argc;
+ VALUE *argv;
+ VALUE obj;
{
VALUE memo[2];
- VALUE (*iter)(VALUE, VALUE, int, VALUE*) = inject_i;
+ rb_block_call_func *iter = inject_i;
switch (rb_scan_args(argc, argv, "02", &memo[0], &memo[1])) {
case 0:
@@ -526,10 +571,9 @@ enum_inject(int argc, VALUE *argv, VALUE obj)
}
static VALUE
-partition_i(VALUE i, VALUE *ary, int argc, VALUE *argv)
+partition_i(i, ary)
+ VALUE i, *ary;
{
- ENUM_WANT_SVALUE();
-
if (RTEST(rb_yield(i))) {
rb_ary_push(ary[0], i);
}
@@ -552,7 +596,8 @@ partition_i(VALUE i, VALUE *ary, int argc, VALUE *argv)
*/
static VALUE
-enum_partition(VALUE obj)
+enum_partition(obj)
+ VALUE obj;
{
VALUE ary[2];
@@ -560,20 +605,19 @@ enum_partition(VALUE obj)
ary[0] = rb_ary_new();
ary[1] = rb_ary_new();
- rb_block_call(obj, id_each, 0, 0, partition_i, (VALUE)ary);
+ rb_iterate(rb_each, obj, partition_i, (VALUE)ary);
return rb_assoc_new(ary[0], ary[1]);
}
static VALUE
-group_by_i(VALUE i, VALUE hash, int argc, VALUE *argv)
+group_by_i(i, hash)
+ VALUE i;
+ VALUE hash;
{
- VALUE group;
+ VALUE group = rb_yield(i);
VALUE values;
- ENUM_WANT_SVALUE();
-
- group = rb_yield(i);
values = rb_hash_aref(hash, group);
if (NIL_P(values)) {
values = rb_ary_new3(1, i);
@@ -598,7 +642,8 @@ group_by_i(VALUE i, VALUE hash, int argc, VALUE *argv)
*/
static VALUE
-enum_group_by(VALUE obj)
+enum_group_by(obj)
+ VALUE obj;
{
VALUE hash;
@@ -606,29 +651,28 @@ enum_group_by(VALUE obj)
hash = rb_hash_new();
rb_block_call(obj, id_each, 0, 0, group_by_i, hash);
- OBJ_INFECT(hash, obj);
return hash;
}
static VALUE
-first_i(VALUE i, VALUE *params, int argc, VALUE *argv)
+first_i(i, ary)
+ VALUE i;
+ VALUE *ary;
{
- ENUM_WANT_SVALUE();
-
- if (NIL_P(params[1])) {
- params[1] = i;
+ if (NIL_P(ary[0])) {
+ ary[1] = i;
rb_iter_break();
}
else {
- long n = params[0];
+ long n = NUM2LONG(ary[0]);
- rb_ary_push(params[1], i);
- n--;
if (n <= 0) {
rb_iter_break();
}
- params[0] = n;
+ rb_ary_push(ary[1], i);
+ n--;
+ ary[0] = INT2NUM(n);
}
return Qnil;
}
@@ -645,28 +689,24 @@ first_i(VALUE i, VALUE *params, int argc, VALUE *argv)
*/
static VALUE
-enum_first(int argc, VALUE *argv, VALUE obj)
+enum_first(argc, argv, obj)
+ int argc;
+ VALUE *argv;
+ VALUE obj;
{
- VALUE n, params[2];
+ VALUE n, ary[2];
if (argc == 0) {
- params[0] = params[1] = Qnil;
+ ary[0] = ary[1] = Qnil;
}
else {
- long len;
-
rb_scan_args(argc, argv, "01", &n);
- len = NUM2LONG(n);
- if (len == 0) return rb_ary_new2(0);
- if (len < 0) {
- rb_raise(rb_eArgError, "negative length");
- }
- params[0] = len;
- params[1] = rb_ary_new2(len);
+ ary[0] = n;
+ ary[1] = rb_ary_new2(NUM2LONG(n));
}
- rb_block_call(obj, id_each, 0, 0, first_i, (VALUE)params);
+ rb_block_call(obj, id_each, 0, 0, first_i, (VALUE)ary);
- return params[1];
+ return ary[1];
}
@@ -688,32 +728,35 @@ enum_first(int argc, VALUE *argv, VALUE obj)
*/
static VALUE
-enum_sort(VALUE obj)
+enum_sort(obj)
+ VALUE obj;
{
return rb_ary_sort(enum_to_a(0, 0, obj));
}
static VALUE
-sort_by_i(VALUE i, VALUE ary, int argc, VALUE *argv)
+sort_by_i(i, ary)
+ VALUE i, ary;
{
+ VALUE v;
NODE *memo;
- ENUM_WANT_SVALUE();
-
+ v = rb_yield(i);
if (RBASIC(ary)->klass) {
rb_raise(rb_eRuntimeError, "sort_by reentered");
}
- /* use NODE_DOT2 as memo(v, v, -) */
- memo = rb_node_newnode(NODE_DOT2, rb_yield(i), i, 0);
+ memo = rb_node_newnode(NODE_MEMO, v, i, 0);
rb_ary_push(ary, (VALUE)memo);
return Qnil;
}
static int
-sort_by_cmp(const void *ap, const void *bp, void *data)
+sort_by_cmp(aa, bb, data)
+ NODE **aa, **bb;
+ void *data;
{
- VALUE a = (*(NODE *const *)ap)->u1.value;
- VALUE b = (*(NODE *const *)bp)->u1.value;
+ VALUE a = aa[0]->u1.value;
+ VALUE b = bb[0]->u1.value;
VALUE ary = (VALUE)data;
if (RBASIC(ary)->klass) {
@@ -730,7 +773,7 @@ sort_by_cmp(const void *ap, const void *bp, void *data)
* values in <i>enum</i> through the given block.
*
* %w{ apple pear fig }.sort_by {|word| word.length}
- * #=> ["fig", "pear", "apple"]
+ #=> ["fig", "pear", "apple"]
*
* The current implementation of <code>sort_by</code> generates an
* array of tuples containing the original collection element and the
@@ -792,7 +835,8 @@ sort_by_cmp(const void *ap, const void *bp, void *data)
*/
static VALUE
-enum_sort_by(VALUE obj)
+enum_sort_by(obj)
+ VALUE obj;
{
VALUE ary;
long i;
@@ -800,58 +844,47 @@ enum_sort_by(VALUE obj)
RETURN_ENUMERATOR(obj, 0, 0);
if (TYPE(obj) == T_ARRAY) {
- ary = rb_ary_new2(RARRAY_LEN(obj));
+ ary = rb_ary_new2(RARRAY(obj)->len);
}
else {
ary = rb_ary_new();
}
RBASIC(ary)->klass = 0;
- rb_block_call(obj, id_each, 0, 0, sort_by_i, ary);
- if (RARRAY_LEN(ary) > 1) {
- ruby_qsort(RARRAY_PTR(ary), RARRAY_LEN(ary), sizeof(VALUE),
- sort_by_cmp, (void *)ary);
+ rb_iterate(rb_each, obj, sort_by_i, ary);
+ if (RARRAY(ary)->len > 1) {
+ qsort(RARRAY(ary)->ptr, RARRAY(ary)->len, sizeof(VALUE),
+ sort_by_cmp, (void *)ary);
}
if (RBASIC(ary)->klass) {
rb_raise(rb_eRuntimeError, "sort_by reentered");
}
- for (i=0; i<RARRAY_LEN(ary); i++) {
- RARRAY_PTR(ary)[i] = RNODE(RARRAY_PTR(ary)[i])->u2.value;
+ for (i=0; i<RARRAY(ary)->len; i++) {
+ RARRAY(ary)->ptr[i] = RNODE(RARRAY(ary)->ptr[i])->u2.value;
}
RBASIC(ary)->klass = rb_cArray;
- OBJ_INFECT(ary, obj);
-
return ary;
}
-#define ENUMFUNC(name) rb_block_given_p() ? name##_iter_i : name##_i
-
-#define DEFINE_ENUMFUNCS(name) \
-static VALUE enum_##name##_func(VALUE result, VALUE *memo); \
-\
-static VALUE \
-name##_i(VALUE i, VALUE *memo, int argc, VALUE *argv) \
-{ \
- return enum_##name##_func(enum_values_pack(argc, argv), memo); \
-} \
-\
-static VALUE \
-name##_iter_i(VALUE i, VALUE *memo, int argc, VALUE *argv) \
-{ \
- return enum_##name##_func(enum_yield(argc, argv), memo); \
-} \
-\
-static VALUE \
-enum_##name##_func(VALUE result, VALUE *memo)
-
-DEFINE_ENUMFUNCS(all)
-{
- if (!RTEST(result)) {
+static VALUE
+all_i(i, memo)
+ VALUE i;
+ VALUE *memo;
+{
+ if (!RTEST(i)) {
*memo = Qfalse;
rb_iter_break();
}
return Qnil;
}
+static VALUE
+all_iter_i(i, memo)
+ VALUE i;
+ VALUE *memo;
+{
+ return all_i(rb_yield(i), memo);
+}
+
/*
* call-seq:
* enum.all? [{|obj| block } ] => true or false
@@ -863,30 +896,42 @@ DEFINE_ENUMFUNCS(all)
* <code>all?</code> will return <code>true</code> only if none of the
* collection members are <code>false</code> or <code>nil</code>.)
*
- * %w{ant bear cat}.all? {|word| word.length >= 3} #=> true
- * %w{ant bear cat}.all? {|word| word.length >= 4} #=> false
- * [ nil, true, 99 ].all? #=> false
+ * %w{ ant bear cat}.all? {|word| word.length >= 3} #=> true
+ * %w{ ant bear cat}.all? {|word| word.length >= 4} #=> false
+ * [ nil, true, 99 ].all? #=> false
*
*/
static VALUE
-enum_all(VALUE obj)
+enum_all(obj)
+ VALUE obj;
{
VALUE result = Qtrue;
- rb_block_call(obj, id_each, 0, 0, ENUMFUNC(all), (VALUE)&result);
+ rb_iterate(rb_each, obj, rb_block_given_p() ? all_iter_i : all_i, (VALUE)&result);
return result;
}
-DEFINE_ENUMFUNCS(any)
+static VALUE
+any_i(i, memo)
+ VALUE i;
+ VALUE *memo;
{
- if (RTEST(result)) {
+ if (RTEST(i)) {
*memo = Qtrue;
rb_iter_break();
}
return Qnil;
}
+static VALUE
+any_iter_i(i, memo)
+ VALUE i;
+ VALUE *memo;
+{
+ return any_i(rb_yield(i), memo);
+}
+
/*
* call-seq:
* enum.any? [{|obj| block } ] => true or false
@@ -899,24 +944,28 @@ DEFINE_ENUMFUNCS(any)
* of the collection members is not <code>false</code> or
* <code>nil</code>.
*
- * %w{ant bear cat}.any? {|word| word.length >= 3} #=> true
- * %w{ant bear cat}.any? {|word| word.length >= 4} #=> true
- * [ nil, true, 99 ].any? #=> true
+ * %w{ ant bear cat}.any? {|word| word.length >= 3} #=> true
+ * %w{ ant bear cat}.any? {|word| word.length >= 4} #=> true
+ * [ nil, true, 99 ].any? #=> true
*
*/
static VALUE
-enum_any(VALUE obj)
+enum_any(obj)
+ VALUE obj;
{
VALUE result = Qfalse;
- rb_block_call(obj, id_each, 0, 0, ENUMFUNC(any), (VALUE)&result);
+ rb_iterate(rb_each, obj, rb_block_given_p() ? any_iter_i : any_i, (VALUE)&result);
return result;
}
-DEFINE_ENUMFUNCS(one)
+static VALUE
+one_i(i, memo)
+ VALUE i;
+ VALUE *memo;
{
- if (RTEST(result)) {
+ if (RTEST(i)) {
if (*memo == Qundef) {
*memo = Qtrue;
}
@@ -928,6 +977,14 @@ DEFINE_ENUMFUNCS(one)
return Qnil;
}
+static VALUE
+one_iter_i(i, memo)
+ VALUE i;
+ VALUE *memo;
+{
+ return one_i(rb_yield(i), memo);
+}
+
/*
* call-seq:
* enum.one? [{|obj| block }] => true or false
@@ -947,24 +1004,36 @@ DEFINE_ENUMFUNCS(one)
*/
static VALUE
-enum_one(VALUE obj)
+enum_one(obj)
+ VALUE obj;
{
VALUE result = Qundef;
- rb_block_call(obj, id_each, 0, 0, ENUMFUNC(one), (VALUE)&result);
+ rb_block_call(obj, id_each, 0, 0, rb_block_given_p() ? one_iter_i : one_i, (VALUE)&result);
if (result == Qundef) return Qfalse;
return result;
}
-DEFINE_ENUMFUNCS(none)
+static VALUE
+none_i(i, memo)
+ VALUE i;
+ VALUE *memo;
{
- if (RTEST(result)) {
+ if (RTEST(i)) {
*memo = Qfalse;
rb_iter_break();
}
return Qnil;
}
+static VALUE
+none_iter_i(i, memo)
+ VALUE i;
+ VALUE *memo;
+{
+ return none_i(rb_yield(i), memo);
+}
+
/*
* call-seq:
* enum.none? [{|obj| block }] => true or false
@@ -981,21 +1050,22 @@ DEFINE_ENUMFUNCS(none)
* [nil,false].none? #=> true
*/
static VALUE
-enum_none(VALUE obj)
+enum_none(obj)
+ VALUE obj;
{
VALUE result = Qtrue;
- rb_block_call(obj, id_each, 0, 0, ENUMFUNC(none), (VALUE)&result);
+ rb_block_call(obj, id_each, 0, 0, rb_block_given_p() ? none_iter_i : none_i, (VALUE)&result);
return result;
}
static VALUE
-min_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
+min_i(i, memo)
+ VALUE i;
+ VALUE *memo;
{
VALUE cmp;
- ENUM_WANT_SVALUE();
-
if (*memo == Qundef) {
*memo = i;
}
@@ -1009,20 +1079,17 @@ min_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
}
static VALUE
-min_ii(VALUE i, VALUE *memo, int argc, VALUE *argv)
+min_ii(i, memo)
+ VALUE i;
+ VALUE *memo;
{
VALUE cmp;
- ENUM_WANT_SVALUE();
-
if (*memo == Qundef) {
*memo = i;
}
else {
- VALUE ary = memo[1];
- RARRAY_PTR(ary)[0] = i;
- RARRAY_PTR(ary)[1] = *memo;
- cmp = rb_yield(ary);
+ cmp = rb_yield_values(2, i, *memo);
if (rb_cmpint(cmp, i, *memo) < 0) {
*memo = i;
}
@@ -1046,29 +1113,37 @@ min_ii(VALUE i, VALUE *memo, int argc, VALUE *argv)
*/
static VALUE
-enum_min(VALUE obj)
+enum_min(obj)
+ VALUE obj;
{
- VALUE result[2];
+ VALUE result = Qundef;
- result[0] = Qundef;
- if (rb_block_given_p()) {
- result[1] = rb_ary_new3(2, Qnil, Qnil);
- rb_block_call(obj, id_each, 0, 0, min_ii, (VALUE)result);
- }
- else {
- rb_block_call(obj, id_each, 0, 0, min_i, (VALUE)result);
- }
- if (result[0] == Qundef) return Qnil;
- return result[0];
+ rb_iterate(rb_each, obj, rb_block_given_p() ? min_ii : min_i, (VALUE)&result);
+ if (result == Qundef) return Qnil;
+ return result;
}
+/*
+ * call-seq:
+ * enum.max => obj
+ * enum.max {| a,b | block } => obj
+ *
+ * Returns the object in <i>enum</i> with the maximum value. The
+ * first form assumes all objects implement <code>Comparable</code>;
+ * the second uses the block to return <em>a <=> b</em>.
+ *
+ * a = %w(albatross dog horse)
+ * a.max #=> "horse"
+ * a.max {|a,b| a.length <=> b.length } #=> "albatross"
+ */
+
static VALUE
-max_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
+max_i(i, memo)
+ VALUE i;
+ VALUE *memo;
{
VALUE cmp;
- ENUM_WANT_SVALUE();
-
if (*memo == Qundef) {
*memo = i;
}
@@ -1082,20 +1157,17 @@ max_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
}
static VALUE
-max_ii(VALUE i, VALUE *memo, int argc, VALUE *argv)
+max_ii(i, memo)
+ VALUE i;
+ VALUE *memo;
{
VALUE cmp;
- ENUM_WANT_SVALUE();
-
if (*memo == Qundef) {
*memo = i;
}
else {
- VALUE ary = memo[1];
- RARRAY_PTR(ary)[0] = i;
- RARRAY_PTR(ary)[1] = *memo;
- cmp = rb_yield(ary);
+ cmp = rb_yield_values(2, i, *memo);
if (rb_cmpint(cmp, i, *memo) > 0) {
*memo = i;
}
@@ -1118,29 +1190,23 @@ max_ii(VALUE i, VALUE *memo, int argc, VALUE *argv)
*/
static VALUE
-enum_max(VALUE obj)
+enum_max(obj)
+ VALUE obj;
{
- VALUE result[2];
+ VALUE result = Qundef;
- result[0] = Qundef;
- if (rb_block_given_p()) {
- result[1] = rb_ary_new3(2, Qnil, Qnil);
- rb_block_call(obj, id_each, 0, 0, max_ii, (VALUE)result);
- }
- else {
- rb_block_call(obj, id_each, 0, 0, max_i, (VALUE)result);
- }
- if (result[0] == Qundef) return Qnil;
- return result[0];
+ rb_iterate(rb_each, obj, rb_block_given_p() ? max_ii : max_i, (VALUE)&result);
+ if (result == Qundef) return Qnil;
+ return result;
}
static VALUE
-minmax_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
+minmax_i(i, memo)
+ VALUE i;
+ VALUE *memo;
{
int n;
- ENUM_WANT_SVALUE();
-
if (memo[0] == Qundef) {
memo[0] = i;
memo[1] = i;
@@ -1159,12 +1225,12 @@ minmax_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
}
static VALUE
-minmax_ii(VALUE i, VALUE *memo, int argc, VALUE *argv)
+minmax_ii(i, memo)
+ VALUE i;
+ VALUE *memo;
{
int n;
- ENUM_WANT_SVALUE();
-
if (memo[0] == Qundef) {
memo[0] = i;
memo[1] = i;
@@ -1172,14 +1238,14 @@ minmax_ii(VALUE i, VALUE *memo, int argc, VALUE *argv)
else {
VALUE ary = memo[2];
- RARRAY_PTR(ary)[0] = i;
- RARRAY_PTR(ary)[1] = memo[0];
+ RARRAY(ary)->ptr[0] = i;
+ RARRAY(ary)->ptr[1] = memo[0];
n = rb_cmpint(rb_yield(ary), i, memo[0]);
if (n < 0) {
memo[0] = i;
}
- RARRAY_PTR(ary)[0] = i;
- RARRAY_PTR(ary)[1] = memo[1];
+ RARRAY(ary)->ptr[0] = i;
+ RARRAY(ary)->ptr[1] = memo[1];
n = rb_cmpint(rb_yield(ary), i, memo[1]);
if (n > 0) {
memo[1] = i;
@@ -1204,7 +1270,8 @@ minmax_ii(VALUE i, VALUE *memo, int argc, VALUE *argv)
*/
static VALUE
-enum_minmax(VALUE obj)
+enum_minmax(obj)
+ VALUE obj;
{
VALUE result[3];
VALUE ary = rb_ary_new3(2, Qnil, Qnil);
@@ -1218,19 +1285,19 @@ enum_minmax(VALUE obj)
rb_block_call(obj, id_each, 0, 0, minmax_i, (VALUE)result);
}
if (result[0] != Qundef) {
- RARRAY_PTR(ary)[0] = result[0];
- RARRAY_PTR(ary)[1] = result[1];
+ RARRAY(ary)->ptr[0] = result[0];
+ RARRAY(ary)->ptr[1] = result[1];
}
return ary;
}
static VALUE
-min_by_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
+min_by_i(i, memo)
+ VALUE i;
+ VALUE *memo;
{
VALUE v;
- ENUM_WANT_SVALUE();
-
v = rb_yield(i);
if (memo[0] == Qundef) {
memo[0] = v;
@@ -1255,7 +1322,8 @@ min_by_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
*/
static VALUE
-enum_min_by(VALUE obj)
+enum_min_by(obj)
+ VALUE obj;
{
VALUE memo[2];
@@ -1268,12 +1336,12 @@ enum_min_by(VALUE obj)
}
static VALUE
-max_by_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
+max_by_i(i, memo)
+ VALUE i;
+ VALUE *memo;
{
VALUE v;
- ENUM_WANT_SVALUE();
-
v = rb_yield(i);
if (memo[0] == Qundef) {
memo[0] = v;
@@ -1298,7 +1366,8 @@ max_by_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
*/
static VALUE
-enum_max_by(VALUE obj)
+enum_max_by(obj)
+ VALUE obj;
{
VALUE memo[2];
@@ -1311,12 +1380,12 @@ enum_max_by(VALUE obj)
}
static VALUE
-minmax_by_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
+minmax_by_i(i, memo)
+ VALUE i;
+ VALUE *memo;
{
VALUE v;
- ENUM_WANT_SVALUE();
-
v = rb_yield(i);
if (memo[0] == Qundef) {
memo[0] = v;
@@ -1350,7 +1419,8 @@ minmax_by_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
*/
static VALUE
-enum_minmax_by(VALUE obj)
+enum_minmax_by(obj)
+ VALUE obj;
{
VALUE memo[4];
@@ -1365,9 +1435,11 @@ enum_minmax_by(VALUE obj)
}
static VALUE
-member_i(VALUE iter, VALUE *memo, int argc, VALUE *argv)
+member_i(item, memo)
+ VALUE item;
+ VALUE *memo;
{
- if (rb_equal(enum_values_pack(argc, argv), memo[0])) {
+ if (rb_equal(item, memo[0])) {
memo[1] = Qtrue;
rb_iter_break();
}
@@ -1382,63 +1454,65 @@ member_i(VALUE iter, VALUE *memo, int argc, VALUE *argv)
* Returns <code>true</code> if any member of <i>enum</i> equals
* <i>obj</i>. Equality is tested using <code>==</code>.
*
- * IO.constants.include? :SEEK_SET #=> true
- * IO.constants.include? :SEEK_NO_FURTHER #=> false
+ * IO.constants.include? "SEEK_SET" #=> true
+ * IO.constants.include? "SEEK_NO_FURTHER" #=> false
*
*/
static VALUE
-enum_member(VALUE obj, VALUE val)
+enum_member(obj, val)
+ VALUE obj, val;
{
VALUE memo[2];
memo[0] = val;
memo[1] = Qfalse;
- rb_block_call(obj, id_each, 0, 0, member_i, (VALUE)memo);
+ rb_iterate(rb_each, obj, member_i, (VALUE)memo);
return memo[1];
}
static VALUE
-each_with_index_i(VALUE i, VALUE memo, int argc, VALUE *argv)
+each_with_index_i(val, memo)
+ VALUE val;
+ VALUE *memo;
{
- long n = (*(VALUE *)memo)++;
-
- return rb_yield_values(2, enum_values_pack(argc, argv), INT2NUM(n));
+ rb_yield_values(2, val, INT2FIX(*memo));
+ ++*memo;
+ return Qnil;
}
/*
* call-seq:
* enum.each_with_index {|obj, i| block } -> enum
*
- * Calls <em>block</em> with two arguments, the item and its index,
- * for each item in <i>enum</i>. Given arguments are passed through
- * to #each().
+ * Calls <em>block</em> with two arguments, the item and its index, for
+ * each item in <i>enum</i>.
*
* hash = Hash.new
* %w(cat dog wombat).each_with_index {|item, index|
* hash[item] = index
* }
- * hash #=> {"cat"=>0, "dog"=>1, "wombat"=>2}
+ * hash #=> {"cat"=>0, "wombat"=>2, "dog"=>1}
*
*/
static VALUE
-enum_each_with_index(int argc, VALUE *argv, VALUE obj)
+enum_each_with_index(obj)
+ VALUE obj;
{
- long memo;
+ VALUE memo;
- RETURN_ENUMERATOR(obj, argc, argv);
+ RETURN_ENUMERATOR(obj, 0, 0);
memo = 0;
- rb_block_call(obj, id_each, argc, argv, each_with_index_i, (VALUE)&memo);
+ rb_iterate(rb_each, obj, each_with_index_i, (VALUE)&memo);
return obj;
}
-
/*
* call-seq:
- * enum.reverse_each {|item| block }
- *
+ * enum.reverse_each {|item| block }
+ *
* Traverses <i>enum</i> in reverse order.
*/
@@ -1461,74 +1535,22 @@ enum_reverse_each(int argc, VALUE *argv, VALUE obj)
static VALUE
-zip_ary(VALUE val, NODE *memo, int argc, VALUE *argv)
-{
- volatile VALUE result = memo->u1.value;
- volatile VALUE args = memo->u2.value;
- long n = memo->u3.cnt++;
- volatile VALUE tmp;
- int i;
-
- tmp = rb_ary_new2(RARRAY_LEN(args) + 1);
- rb_ary_store(tmp, 0, enum_values_pack(argc, argv));
- for (i=0; i<RARRAY_LEN(args); i++) {
- VALUE e = RARRAY_PTR(args)[i];
-
- if (RARRAY_LEN(e) <= n) {
- rb_ary_push(tmp, Qnil);
- }
- else {
- rb_ary_push(tmp, RARRAY_PTR(e)[n]);
- }
- }
- if (NIL_P(result)) {
- rb_yield(tmp);
- }
- else {
- rb_ary_push(result, tmp);
- }
- return Qnil;
-}
-
-static VALUE
-call_next(VALUE *v)
-{
- return v[0] = rb_funcall(v[1], id_next, 0, 0);
-}
-
-static VALUE
-call_stop(VALUE *v)
-{
- return v[0] = Qundef;
-}
-
-static VALUE
-zip_i(VALUE val, NODE *memo, int argc, VALUE *argv)
+zip_i(val, memo)
+ VALUE val;
+ VALUE *memo;
{
- volatile VALUE result = memo->u1.value;
- volatile VALUE args = memo->u2.value;
- volatile VALUE tmp;
+ VALUE result = memo[0];
+ VALUE args = memo[1];
+ int idx = memo[2]++;
+ VALUE tmp;
int i;
- tmp = rb_ary_new2(RARRAY_LEN(args) + 1);
- rb_ary_store(tmp, 0, enum_values_pack(argc, argv));
- for (i=0; i<RARRAY_LEN(args); i++) {
- if (NIL_P(RARRAY_PTR(args)[i])) {
- rb_ary_push(tmp, Qnil);
- }
- else {
- VALUE v[2];
-
- v[1] = RARRAY_PTR(args)[i];
- rb_rescue2(call_next, (VALUE)v, call_stop, (VALUE)v, rb_eStopIteration, 0);
- if (v[0] == Qundef) {
- RARRAY_PTR(args)[i] = Qnil;
- v[0] = Qnil;
- }
- rb_ary_push(tmp, v[0]);
- }
+ tmp = rb_ary_new2(RARRAY(args)->len + 1);
+ rb_ary_store(tmp, 0, val);
+ for (i=0; i<RARRAY(args)->len; i++) {
+ rb_ary_push(tmp, rb_ary_entry(RARRAY(args)->ptr[i], idx));
}
- if (NIL_P(result)) {
+ if (rb_block_given_p()) {
rb_yield(tmp);
}
else {
@@ -1539,67 +1561,56 @@ zip_i(VALUE val, NODE *memo, int argc, VALUE *argv)
/*
* call-seq:
- * enum.zip(arg, ...) => enumerator
+ * enum.zip(arg, ...) => array
* enum.zip(arg, ...) {|arr| block } => nil
*
- * Takes one element from <i>enum</i> and merges corresponding
- * elements from each <i>args</i>. This generates a sequence of
- * <em>n</em>-element arrays, where <em>n</em> is one more than the
- * count of arguments. The length of the resulting sequence will be
- * <code>enum#size</code. If the size of any argument is less than
- * <code>enum#size</code>, <code>nil</code> values are supplied. If
- * a block is given, it is invoked for each output array, otherwise
- * an array of arrays is returned.
+ * Converts any arguments to arrays, then merges elements of
+ * <i>enum</i> with corresponding elements from each argument. This
+ * generates a sequence of <code>enum#size</code> <em>n</em>-element
+ * arrays, where <em>n</em> is one more that the count of arguments. If
+ * the size of any argument is less than <code>enum#size</code>,
+ * <code>nil</code> values are supplied. If a block given, it is
+ * invoked for each output array, otherwise an array of arrays is
+ * returned.
*
* a = [ 4, 5, 6 ]
* b = [ 7, 8, 9 ]
*
- * [1,2,3].zip(a, b) #=> [[1, 4, 7], [2, 5, 8], [3, 6, 9]]
- * [1,2].zip(a,b) #=> [[1, 4, 7], [2, 5, 8]]
- * a.zip([1,2],[8]) #=> [[4, 1, 8], [5, 2, nil], [6, nil, nil]]
+ * (1..3).zip(a, b) #=> [[1, 4, 7], [2, 5, 8], [3, 6, 9]]
+ * "cat\ndog".zip([1]) #=> [["cat\n", 1], ["dog", nil]]
+ * (1..3).zip #=> [[1], [2], [3]]
*
*/
static VALUE
-enum_zip(int argc, VALUE *argv, VALUE obj)
+enum_zip(argc, argv, obj)
+ int argc;
+ VALUE *argv;
+ VALUE obj;
{
int i;
- ID conv;
- NODE *memo;
- VALUE result = Qnil;
- VALUE args = rb_ary_new4(argc, argv);
- int allary = TRUE;
+ VALUE result;
+ VALUE memo[3];
- argv = RARRAY_PTR(args);
for (i=0; i<argc; i++) {
- VALUE ary = rb_check_array_type(argv[i]);
- if (NIL_P(ary)) {
- allary = FALSE;
- break;
- }
- argv[i] = ary;
+ argv[i] = rb_convert_type(argv[i], T_ARRAY, "Array", "to_a");
}
- if (!allary) {
- CONST_ID(conv, "to_enum");
- for (i=0; i<argc; i++) {
- argv[i] = rb_funcall(argv[i], conv, 1, ID2SYM(id_each));
- }
- }
- if (!rb_block_given_p()) {
- result = rb_ary_new();
- }
- /* use NODE_DOT2 as memo(v, v, -) */
- memo = rb_node_newnode(NODE_DOT2, result, args, 0);
- rb_block_call(obj, id_each, 0, 0, allary ? zip_ary : zip_i, (VALUE)memo);
+ result = rb_block_given_p() ? Qnil : rb_ary_new();
+ memo[0] = result;
+ memo[1] = rb_ary_new4(argc, argv);
+ memo[2] = 0;
+ rb_iterate(rb_each, obj, zip_i, (VALUE)memo);
return result;
}
static VALUE
-take_i(VALUE i, VALUE *arg, int argc, VALUE *argv)
+take_i(i, arg)
+ VALUE i;
+ VALUE *arg;
{
- rb_ary_push(arg[0], enum_values_pack(argc, argv));
- if (--arg[1] == 0) rb_iter_break();
+ if (arg[1]-- == 0) rb_iter_break();
+ rb_ary_push(arg[0], i);
return Qnil;
}
@@ -1615,7 +1626,9 @@ take_i(VALUE i, VALUE *arg, int argc, VALUE *argv)
*/
static VALUE
-enum_take(VALUE obj, VALUE n)
+enum_take(obj, n)
+ VALUE obj;
+ VALUE n;
{
VALUE args[2];
long len = NUM2LONG(n);
@@ -1624,19 +1637,20 @@ enum_take(VALUE obj, VALUE n)
rb_raise(rb_eArgError, "attempt to take negative size");
}
- if (len == 0) return rb_ary_new2(0);
- args[0] = rb_ary_new();
args[1] = len;
+ args[0] = rb_ary_new();
rb_block_call(obj, id_each, 0, 0, take_i, (VALUE)args);
return args[0];
}
static VALUE
-take_while_i(VALUE i, VALUE *ary, int argc, VALUE *argv)
+take_while_i(i, ary)
+ VALUE i;
+ VALUE *ary;
{
- if (!RTEST(enum_yield(argc, argv))) rb_iter_break();
- rb_ary_push(*ary, enum_values_pack(argc, argv));
+ if (!RTEST(rb_yield(i))) rb_iter_break();
+ rb_ary_push(*ary, i);
return Qnil;
}
@@ -1653,7 +1667,8 @@ take_while_i(VALUE i, VALUE *ary, int argc, VALUE *argv)
*/
static VALUE
-enum_take_while(VALUE obj)
+enum_take_while(obj)
+ VALUE obj;
{
VALUE ary;
@@ -1664,10 +1679,12 @@ enum_take_while(VALUE obj)
}
static VALUE
-drop_i(VALUE i, VALUE *arg, int argc, VALUE *argv)
+drop_i(i, arg)
+ VALUE i;
+ VALUE *arg;
{
if (arg[1] == 0) {
- rb_ary_push(arg[0], enum_values_pack(argc, argv));
+ rb_ary_push(arg[0], i);
}
else {
arg[1]--;
@@ -1688,7 +1705,9 @@ drop_i(VALUE i, VALUE *arg, int argc, VALUE *argv)
*/
static VALUE
-enum_drop(VALUE obj, VALUE n)
+enum_drop(obj, n)
+ VALUE obj;
+ VALUE n;
{
VALUE args[2];
long len = NUM2LONG(n);
@@ -1705,10 +1724,10 @@ enum_drop(VALUE obj, VALUE n)
static VALUE
-drop_while_i(VALUE i, VALUE *args, int argc, VALUE *argv)
+drop_while_i(i, args)
+ VALUE i;
+ VALUE *args;
{
- ENUM_WANT_SVALUE();
-
if (!args[1] && !RTEST(rb_yield(i))) {
args[1] = Qtrue;
}
@@ -1732,7 +1751,8 @@ drop_while_i(VALUE i, VALUE *args, int argc, VALUE *argv)
*/
static VALUE
-enum_drop_while(VALUE obj)
+enum_drop_while(obj)
+ VALUE obj;
{
VALUE args[2];
@@ -1744,10 +1764,10 @@ enum_drop_while(VALUE obj)
}
static VALUE
-cycle_i(VALUE i, VALUE ary, int argc, VALUE *argv)
+cycle_i(i, ary)
+ VALUE i;
+ VALUE ary;
{
- ENUM_WANT_SVALUE();
-
rb_ary_push(ary, i);
rb_yield(i);
return Qnil;
@@ -1773,7 +1793,10 @@ cycle_i(VALUE i, VALUE ary, int argc, VALUE *argv)
*/
static VALUE
-enum_cycle(int argc, VALUE *argv, VALUE obj)
+enum_cycle(argc, argv, obj)
+ int argc;
+ VALUE *argv;
+ VALUE obj;
{
VALUE ary;
VALUE nv = Qnil;
@@ -1792,36 +1815,17 @@ enum_cycle(int argc, VALUE *argv, VALUE obj)
ary = rb_ary_new();
RBASIC(ary)->klass = 0;
rb_block_call(obj, id_each, 0, 0, cycle_i, ary);
- len = RARRAY_LEN(ary);
+ len = RARRAY(ary)->len;
if (len == 0) return Qnil;
while (n < 0 || 0 < --n) {
for (i=0; i<len; i++) {
- rb_yield(RARRAY_PTR(ary)[i]);
+ rb_yield(RARRAY(ary)->ptr[i]);
}
}
return Qnil; /* not reached */
}
/*
- * call-seq:
- * enum.join(sep=$,) -> str
- *
- * Returns a string created by converting each element of the
- * <i>enum</i> to a string, separated by <i>sep</i>.
- */
-
-static VALUE
-enum_join(int argc, VALUE *argv, VALUE obj)
-{
- VALUE sep;
-
- rb_scan_args(argc, argv, "01", &sep);
- if (NIL_P(sep)) sep = rb_output_fs;
-
- return rb_ary_join(enum_to_a(0, 0, obj), sep);
-}
-
-/*
* The <code>Enumerable</code> mixin provides collection classes with
* several traversal and searching methods, and with the ability to
* sort. The class must provide a method <code>each</code>, which
@@ -1833,11 +1837,8 @@ enum_join(int argc, VALUE *argv, VALUE obj)
*/
void
-Init_Enumerable(void)
+Init_Enumerable()
{
-#undef rb_intern
-#define rb_intern(str) rb_intern_const(str)
-
rb_mEnumerable = rb_define_module("Enumerable");
rb_define_method(rb_mEnumerable, "to_a", enum_to_a, -1);
@@ -1872,7 +1873,8 @@ Init_Enumerable(void)
rb_define_method(rb_mEnumerable, "minmax_by", enum_minmax_by, 0);
rb_define_method(rb_mEnumerable, "member?", enum_member, 1);
rb_define_method(rb_mEnumerable, "include?", enum_member, 1);
- rb_define_method(rb_mEnumerable, "each_with_index", enum_each_with_index, -1);
+ rb_define_method(rb_mEnumerable, "each_with_index", enum_each_with_index, 0);
+ rb_define_method(rb_mEnumerable, "enum_with_index", enum_each_with_index, 0);
rb_define_method(rb_mEnumerable, "reverse_each", enum_reverse_each, -1);
rb_define_method(rb_mEnumerable, "zip", enum_zip, -1);
rb_define_method(rb_mEnumerable, "take", enum_take, 1);
@@ -1880,12 +1882,10 @@ Init_Enumerable(void)
rb_define_method(rb_mEnumerable, "drop", enum_drop, 1);
rb_define_method(rb_mEnumerable, "drop_while", enum_drop_while, 0);
rb_define_method(rb_mEnumerable, "cycle", enum_cycle, -1);
- rb_define_method(rb_mEnumerable, "join", enum_join, -1);
id_eqq = rb_intern("===");
id_each = rb_intern("each");
id_cmp = rb_intern("<=>");
- id_next = rb_intern("next");
id_size = rb_intern("size");
}
diff --git a/enumerator.c b/enumerator.c
index ec322ea017..f95d931b62 100644
--- a/enumerator.c
+++ b/enumerator.c
@@ -12,71 +12,15 @@
************************************************/
-#include "ruby/ruby.h"
+#include "ruby.h"
/*
- * Document-class: Enumerator
+ * Document-class: Enumerable::Enumerator
*
* A class which provides a method `each' to be used as an Enumerable
* object.
- *
- * An enumerator can be created by following methods.
- * - Kernel#to_enum
- * - Kernel#enum_for
- * - Enumerator.new
- *
- * Also, most iteration methods without a block returns an enumerator.
- * For example, Array#map returns an enumerator if a block is not given.
- * The enumerator has the with_index method.
- * So ary.map.with_index works as follows.
- *
- * p %w[foo bar baz].map.with_index {|w,i| "#{i}:#{w}" }
- * #=> ["0:foo", "1:bar", "2:baz"]
- *
- * An enumerator object can be used as an external iterator.
- * I.e. Enumerator#next returns the next value of the iterator.
- * Enumerator#next raises StopIteration at end.
- *
- * e = [1,2,3].each # returns an enumerator object.
- * p e.next #=> 1
- * p e.next #=> 2
- * p e.next #=> 3
- * p e.next #raises StopIteration
- *
- * An external iterator can be used to implement an internal iterator as follows.
- *
- * def ext_each(e)
- * while true
- * begin
- * vs = e.next_values
- * rescue StopIteration
- * return $!.result
- * end
- * y = yield(*vs)
- * e.feed y
- * end
- * end
- *
- * o = Object.new
- * def o.each
- * p yield
- * p yield(1)
- * p yield(1, 2)
- * 3
- * end
- *
- * # use o.each as an internal iterator directly.
- * p o.each {|*x| p x; [:b, *x] }
- * #=> [], [:b], [1], [:b, 1], [1, 2], [:b, 1, 2], 3
- *
- * # convert o.each to an external iterator for
- * # implementing an internal iterator.
- * p ext_each(o.to_enum) {|*x| p x; [:b, *x] }
- * #=> [], [:b], [1], [:b, 1], [1, 2], [:b, 1, 2], 3
- *
*/
VALUE rb_cEnumerator;
-static ID id_rewind, id_each;
static VALUE sym_each;
VALUE rb_eStopIteration;
@@ -84,53 +28,32 @@ VALUE rb_eStopIteration;
struct enumerator {
VALUE obj;
ID meth;
- VALUE args;
- VALUE fib;
- VALUE dst;
- VALUE lookahead;
- VALUE feedvalue;
- VALUE stop_exc;
-};
-
-static VALUE rb_cGenerator, rb_cYielder;
-
-struct generator {
- VALUE proc;
-};
-
-struct yielder {
VALUE proc;
+ VALUE args;
+ rb_block_call_func *iter;
};
-static VALUE generator_allocate(VALUE klass);
-static VALUE generator_init(VALUE obj, VALUE proc);
-
-/*
- * Enumerator
- */
+static void enumerator_mark _((void *));
static void
-enumerator_mark(void *p)
+enumerator_mark(p)
+ void *p;
{
struct enumerator *ptr = p;
rb_gc_mark(ptr->obj);
rb_gc_mark(ptr->args);
- rb_gc_mark(ptr->fib);
- rb_gc_mark(ptr->dst);
- rb_gc_mark(ptr->lookahead);
- rb_gc_mark(ptr->feedvalue);
- rb_gc_mark(ptr->stop_exc);
}
static struct enumerator *
-enumerator_ptr(VALUE obj)
+enumerator_ptr(obj)
+ VALUE obj;
{
struct enumerator *ptr;
Data_Get_Struct(obj, struct enumerator, ptr);
if (RDATA(obj)->dmark != enumerator_mark) {
rb_raise(rb_eTypeError,
- "wrong argument type %s (expected %s)",
- rb_obj_classname(obj), rb_class2name(rb_cEnumerator));
+ "wrong argument type %s (expected Enumerable::Enumerator)",
+ rb_obj_classname(obj));
}
if (!ptr || ptr->obj == Qundef) {
rb_raise(rb_eArgError, "uninitialized enumerator");
@@ -143,7 +66,7 @@ enumerator_ptr(VALUE obj)
* obj.to_enum(method = :each, *args)
* obj.enum_for(method = :each, *args)
*
- * Returns Enumerator.new(self, method, *args).
+ * Returns Enumerable::Enumerator.new(self, method, *args).
*
* e.g.:
*
@@ -158,7 +81,10 @@ enumerator_ptr(VALUE obj)
*
*/
static VALUE
-obj_to_enum(int argc, VALUE *argv, VALUE obj)
+obj_to_enum(argc, argv, obj)
+ int argc;
+ VALUE *argv;
+ VALUE obj;
{
VALUE meth = sym_each;
@@ -170,7 +96,9 @@ obj_to_enum(int argc, VALUE *argv, VALUE obj)
}
static VALUE
-each_slice_i(VALUE val, VALUE *memo)
+each_slice_i(val, memo)
+ VALUE val;
+ VALUE *memo;
{
VALUE ary = memo[0];
VALUE v = Qnil;
@@ -204,7 +132,8 @@ each_slice_i(VALUE val, VALUE *memo)
*
*/
static VALUE
-enum_each_slice(VALUE obj, VALUE n)
+enum_each_slice(obj, n)
+ VALUE obj, n;
{
long size = NUM2LONG(n);
VALUE args[2], ary;
@@ -214,7 +143,7 @@ enum_each_slice(VALUE obj, VALUE n)
args[0] = rb_ary_new2(size);
args[1] = (VALUE)size;
- rb_block_call(obj, id_each, 0, 0, each_slice_i, (VALUE)args);
+ rb_block_call(obj, SYM2ID(sym_each), 0, 0, each_slice_i, (VALUE)args);
ary = args[0];
if (RARRAY_LEN(ary) > 0) rb_yield(ary);
@@ -223,7 +152,9 @@ enum_each_slice(VALUE obj, VALUE n)
}
static VALUE
-each_cons_i(VALUE val, VALUE *memo)
+each_cons_i(val, memo)
+ VALUE val;
+ VALUE *memo;
{
VALUE ary = memo[0];
VALUE v = Qnil;
@@ -245,7 +176,7 @@ each_cons_i(VALUE val, VALUE *memo)
* each_cons(n)
*
* Iterates the given block for each array of consecutive <n>
- * elements. If no block is given, returns an enumerator.
+ * elements. If no block is given, returns an enumerator.a
*
* e.g.:
* (1..10).each_cons(3) {|a| p a}
@@ -261,7 +192,8 @@ each_cons_i(VALUE val, VALUE *memo)
*
*/
static VALUE
-enum_each_cons(VALUE obj, VALUE n)
+enum_each_cons(obj, n)
+ VALUE obj, n;
{
long size = NUM2LONG(n);
VALUE args[2];
@@ -271,62 +203,42 @@ enum_each_cons(VALUE obj, VALUE n)
args[0] = rb_ary_new2(size);
args[1] = (VALUE)size;
- rb_block_call(obj, id_each, 0, 0, each_cons_i, (VALUE)args);
+ rb_block_call(obj, SYM2ID(sym_each), 0, 0, each_cons_i, (VALUE)args);
return Qnil;
}
+static VALUE enumerator_allocate _((VALUE));
static VALUE
-each_with_object_i(VALUE val, VALUE memo)
-{
- return rb_yield_values(2, val, memo);
-}
-
-/*
- * call-seq:
- * each_with_object(obj) {|(*args), memo_obj| ... }
- * each_with_object(obj)
- *
- * Iterates the given block for each element with an arbitrary
- * object given, and returns the initially given object.
- *
- * If no block is given, returns an enumerator.
- *
- * e.g.:
- * evens = (1..10).each_with_object([]) {|i, a| a << i*2 }
- * # => [2, 4, 6, 8, 10, 12, 14, 16, 18, 20]
- *
- */
-static VALUE
-enum_each_with_object(VALUE obj, VALUE memo)
-{
- RETURN_ENUMERATOR(obj, 1, &memo);
-
- rb_block_call(obj, id_each, 0, 0, each_with_object_i, memo);
-
- return memo;
-}
-
-static VALUE
-enumerator_allocate(VALUE klass)
+enumerator_allocate(klass)
+ VALUE klass;
{
struct enumerator *ptr;
VALUE enum_obj;
- enum_obj = Data_Make_Struct(klass, struct enumerator, enumerator_mark, -1, ptr);
+ enum_obj = Data_Make_Struct(klass, struct enumerator,
+ enumerator_mark, -1, ptr);
ptr->obj = Qundef;
return enum_obj;
}
+static VALUE enumerator_each_i _((VALUE, VALUE));
static VALUE
-enumerator_each_i(VALUE v, VALUE enum_obj, int argc, VALUE *argv)
+enumerator_each_i(v, enum_obj)
+ VALUE v;
+ VALUE enum_obj;
{
- return rb_yield_values2(argc, argv);
+ return rb_yield(v);
}
static VALUE
-enumerator_init(VALUE enum_obj, VALUE obj, VALUE meth, int argc, VALUE *argv)
+enumerator_init(enum_obj, obj, meth, argc, argv)
+ VALUE enum_obj;
+ VALUE obj;
+ VALUE meth;
+ int argc;
+ VALUE *argv;
{
struct enumerator *ptr;
@@ -338,80 +250,49 @@ enumerator_init(VALUE enum_obj, VALUE obj, VALUE meth, int argc, VALUE *argv)
ptr->obj = obj;
ptr->meth = rb_to_id(meth);
+ ptr->iter = enumerator_each_i;
if (argc) ptr->args = rb_ary_new4(argc, argv);
- ptr->fib = 0;
- ptr->dst = Qnil;
- ptr->lookahead = Qundef;
- ptr->feedvalue = Qundef;
- ptr->stop_exc = Qfalse;
return enum_obj;
}
/*
* call-seq:
- * Enumerator.new(obj, method = :each, *args)
- * Enumerator.new { |y| ... }
- *
- * Creates a new Enumerator object, which is to be used as an
- * Enumerable object iterating in a given way.
- *
- * In the first form, a generated Enumerator iterates over the given
- * object using the given method with the given arguments passed.
- * Use of this form is discouraged. Use Kernel#enum_for(), alias
- * to_enum, instead.
+ * Enumerable::Enumerator.new(obj, method = :each, *args)
*
- * e = Enumerator.new(ObjectSpace, :each_object)
- * #-> ObjectSpace.enum_for(:each_object)
+ * Creates a new Enumerable::Enumerator object, which is to be
+ * used as an Enumerable object using the given object's given
+ * method with the given arguments.
*
- * e.select { |obj| obj.is_a?(Class) } #=> array of all classes
- *
- * In the second form, iteration is defined by the given block, in
- * which a "yielder" object given as block parameter can be used to
- * yield a value by calling the +yield+ method, alias +<<+.
- *
- * fib = Enumerator.new { |y|
- * a = b = 1
- * loop {
- * y << a
- * a, b = b, a + b
- * }
- * }
- *
- * p fib.take(10) #=> [1, 1, 2, 3, 5, 8, 13, 21, 34, 55]
+ * Use of this method is discouraged. Use Kernel#enum_for() instead.
*/
static VALUE
-enumerator_initialize(int argc, VALUE *argv, VALUE obj)
+enumerator_initialize(argc, argv, obj)
+ int argc;
+ VALUE *argv;
+ VALUE obj;
{
VALUE recv, meth = sym_each;
- if (argc == 0) {
- if (!rb_block_given_p())
- rb_raise(rb_eArgError, "wrong number of argument (0 for 1+)");
-
- recv = generator_init(generator_allocate(rb_cGenerator), rb_block_proc());
- } else {
- recv = *argv++;
- if (--argc) {
- meth = *argv++;
- --argc;
- }
+ if (argc == 0)
+ rb_raise(rb_eArgError, "wrong number of argument (0 for 1)");
+ recv = *argv++;
+ if (--argc) {
+ meth = *argv++;
+ --argc;
}
-
return enumerator_init(obj, recv, meth, argc, argv);
}
/* :nodoc: */
static VALUE
-enumerator_init_copy(VALUE obj, VALUE orig)
+enumerator_init_copy(obj, orig)
+ VALUE obj;
+ VALUE orig;
{
struct enumerator *ptr0, *ptr1;
ptr0 = enumerator_ptr(orig);
- if (ptr0->fib) {
- /* Fibers cannot be copied */
- rb_raise(rb_eTypeError, "can't copy execution context");
- }
Data_Get_Struct(obj, struct enumerator, ptr1);
@@ -421,16 +302,18 @@ enumerator_init_copy(VALUE obj, VALUE orig)
ptr1->obj = ptr0->obj;
ptr1->meth = ptr0->meth;
+ ptr1->iter = ptr0->iter;
ptr1->args = ptr0->args;
- ptr1->fib = 0;
- ptr1->lookahead = Qundef;
- ptr1->feedvalue = Qundef;
return obj;
}
VALUE
-rb_enumeratorize(VALUE obj, VALUE meth, int argc, VALUE *argv)
+rb_enumeratorize(obj, meth, argc, argv)
+ VALUE obj;
+ VALUE meth;
+ int argc;
+ VALUE *argv;
{
return enumerator_init(enumerator_allocate(rb_cEnumerator), obj, meth, argc, argv);
}
@@ -444,7 +327,8 @@ rb_enumeratorize(VALUE obj, VALUE meth, int argc, VALUE *argv)
*
*/
static VALUE
-enumerator_each(VALUE obj)
+enumerator_each(obj)
+ VALUE obj;
{
struct enumerator *e;
int argc = 0;
@@ -453,250 +337,47 @@ enumerator_each(VALUE obj)
if (!rb_block_given_p()) return obj;
e = enumerator_ptr(obj);
if (e->args) {
- argc = RARRAY_LENINT(e->args);
+ argc = RARRAY_LEN(e->args);
argv = RARRAY_PTR(e->args);
}
- return rb_block_call(e->obj, e->meth, argc, argv,
- enumerator_each_i, (VALUE)e);
+ return rb_block_call(e->obj, e->meth, argc, argv, e->iter, (VALUE)e);
}
static VALUE
-enumerator_with_index_i(VALUE val, VALUE *memo, int argc, VALUE *argv)
+enumerator_with_index_i(val, memo)
+ VALUE val;
+ VALUE *memo;
{
- VALUE idx;
-
- idx = INT2FIX(*memo);
+ val = rb_yield_values(2, val, INT2FIX(*memo));
++*memo;
-
- if (argc <= 1)
- return rb_yield_values(2, val, idx);
-
- return rb_yield_values(2, rb_ary_new4(argc, argv), idx);
+ return val;
}
/*
* call-seq:
- * e.with_index(offset = 0) {|(*args), idx| ... }
- * e.with_index(offset = 0)
+ * e.with_index {|(*args), idx| ... }
+ * e.with_index
*
- * Iterates the given block for each element with an index, which
- * starts from +offset+. If no block is given, returns an enumerator.
+ * Iterates the given block for each elements with an index, which
+ * start from 0. If no block is given, returns an enumerator.
*
*/
static VALUE
-enumerator_with_index(int argc, VALUE *argv, VALUE obj)
-{
- struct enumerator *e;
- VALUE memo;
-
- rb_scan_args(argc, argv, "01", &memo);
- RETURN_ENUMERATOR(obj, argc, argv);
- memo = NIL_P(memo) ? 0 : (VALUE)NUM2LONG(memo);
- e = enumerator_ptr(obj);
- if (e->args) {
- argc = RARRAY_LENINT(e->args);
- argv = RARRAY_PTR(e->args);
- }
- else {
- argc = 0;
- argv = NULL;
- }
- return rb_block_call(e->obj, e->meth, argc, argv,
- enumerator_with_index_i, (VALUE)&memo);
-}
-
-/*
- * call-seq:
- * e.each_with_index {|(*args), idx| ... }
- * e.each_with_index
- *
- * Same as Enumeartor#with_index, except each_with_index does not
- * receive an offset argument.
- *
- */
-static VALUE
-enumerator_each_with_index(VALUE obj)
-{
- return enumerator_with_index(0, NULL, obj);
-}
-
-static VALUE
-enumerator_with_object_i(VALUE val, VALUE memo, int argc, VALUE *argv)
-{
- if (argc <= 1)
- return rb_yield_values(2, val, memo);
-
- return rb_yield_values(2, rb_ary_new4(argc, argv), memo);
-}
-
-/*
- * call-seq:
- * e.with_object(obj) {|(*args), memo_obj| ... }
- * e.with_object(obj)
- *
- * Iterates the given block for each element with an arbitrary
- * object given, and returns the initially given object.
- *
- * If no block is given, returns an enumerator.
- *
- */
-static VALUE
-enumerator_with_object(VALUE obj, VALUE memo)
+enumerator_with_index(obj)
+ VALUE obj;
{
- struct enumerator *e;
+ struct enumerator *e = enumerator_ptr(obj);
+ VALUE memo = 0;
int argc = 0;
VALUE *argv = 0;
- RETURN_ENUMERATOR(obj, 1, &memo);
- e = enumerator_ptr(obj);
+ RETURN_ENUMERATOR(obj, 0, 0);
if (e->args) {
- argc = RARRAY_LENINT(e->args);
+ argc = RARRAY_LEN(e->args);
argv = RARRAY_PTR(e->args);
}
- rb_block_call(e->obj, e->meth, argc, argv,
- enumerator_with_object_i, memo);
-
- return memo;
-}
-
-static VALUE
-next_ii(VALUE i, VALUE obj, int argc, VALUE *argv)
-{
- struct enumerator *e = enumerator_ptr(obj);
- VALUE feedvalue = Qnil;
- VALUE args = rb_ary_new4(argc, argv);
- rb_fiber_yield(1, &args);
- if (e->feedvalue != Qundef) {
- feedvalue = e->feedvalue;
- e->feedvalue = Qundef;
- }
- return feedvalue;
-}
-
-static VALUE
-next_i(VALUE curr, VALUE obj)
-{
- struct enumerator *e = enumerator_ptr(obj);
- VALUE nil = Qnil;
- VALUE result;
-
- result = rb_block_call(obj, id_each, 0, 0, next_ii, obj);
- e->stop_exc = rb_exc_new2(rb_eStopIteration, "iteration reached an end");
- rb_ivar_set(e->stop_exc, rb_intern("result"), result);
- return rb_fiber_yield(1, &nil);
-}
-
-static void
-next_init(VALUE obj, struct enumerator *e)
-{
- VALUE curr = rb_fiber_current();
- e->dst = curr;
- e->fib = rb_fiber_new(next_i, obj);
- e->lookahead = Qundef;
-}
-
-static VALUE
-get_next_values(VALUE obj, struct enumerator *e)
-{
- VALUE curr, vs;
-
- if (e->stop_exc)
- rb_exc_raise(e->stop_exc);
-
- curr = rb_fiber_current();
-
- if (!e->fib || !rb_fiber_alive_p(e->fib)) {
- next_init(obj, e);
- }
-
- vs = rb_fiber_resume(e->fib, 1, &curr);
- if (e->stop_exc) {
- e->fib = 0;
- e->dst = Qnil;
- e->lookahead = Qundef;
- e->feedvalue = Qundef;
- rb_exc_raise(e->stop_exc);
- }
- return vs;
-}
-
-/*
- * call-seq:
- * e.next_values => array
- *
- * Returns the next object as an array in the enumerator,
- * and move the internal position forward.
- * When the position reached at the end, StopIteration is raised.
- *
- * This method can be used to distinguish <code>yield</code> and <code>yield nil</code>.
- *
- * o = Object.new
- * def o.each
- * yield
- * yield 1
- * yield 1, 2
- * yield nil
- * yield [1, 2]
- * end
- * e = o.to_enum
- * p e.next_values
- * p e.next_values
- * p e.next_values
- * p e.next_values
- * p e.next_values
- * e = o.to_enum
- * p e.next
- * p e.next
- * p e.next
- * p e.next
- * p e.next
- *
- * ## yield args next_values next
- * # yield [] nil
- * # yield 1 [1] 1
- * # yield 1, 2 [1, 2] [1, 2]
- * # yield nil [nil] nil
- * # yield [1, 2] [[1, 2]] [1, 2]
- *
- * Note that enumeration sequence by next_values method does not affect other
- * non-external enumeration methods, unless underlying iteration
- * methods itself has side-effect, e.g. IO#each_line.
- *
- */
-
-static VALUE
-enumerator_next_values(VALUE obj)
-{
- struct enumerator *e = enumerator_ptr(obj);
- VALUE vs;
-
- if (e->lookahead != Qundef) {
- vs = e->lookahead;
- e->lookahead = Qundef;
- return vs;
- }
-
- return get_next_values(obj, e);
-}
-
-static VALUE
-ary2sv(VALUE args, int dup)
-{
- if (TYPE(args) != T_ARRAY)
- return args;
-
- switch (RARRAY_LEN(args)) {
- case 0:
- return Qnil;
-
- case 1:
- return RARRAY_PTR(args)[0];
-
- default:
- if (dup)
- return rb_ary_dup(args);
- return args;
- }
+ return rb_block_call(e->obj, e->meth, argc, argv,
+ enumerator_with_index_i, (VALUE)&memo);
}
/*
@@ -704,146 +385,23 @@ ary2sv(VALUE args, int dup)
* e.next => object
*
* Returns the next object in the enumerator, and move the internal
- * position forward. When the position reached at the end, StopIteration
- * is raised.
- *
- * a = [1,2,3]
- * e = a.to_enum
- * p e.next #=> 1
- * p e.next #=> 2
- * p e.next #=> 3
- * p e.next #raises StopIteration
+ * position forward. When the position reached at the end, internal
+ * position is rewinded then StopIteration is raised.
*
* Note that enumeration sequence by next method does not affect other
* non-external enumeration methods, unless underlying iteration
* methods itself has side-effect, e.g. IO#each_line.
*
+ * Caution: Calling this method causes the "generator" library to be
+ * loaded.
*/
static VALUE
-enumerator_next(VALUE obj)
-{
- VALUE vs = enumerator_next_values(obj);
- return ary2sv(vs, 0);
-}
-
-static VALUE
-enumerator_peek_values(VALUE obj)
-{
- struct enumerator *e = enumerator_ptr(obj);
-
- if (e->lookahead == Qundef) {
- e->lookahead = get_next_values(obj, e);
- }
- return e->lookahead;
-}
-
-/*
- * call-seq:
- * e.peek_values => array
- *
- * Returns the next object as an array in the enumerator,
- * but don't move the internal position forward.
- * When the position reached at the end, StopIteration is raised.
- *
- * o = Object.new
- * def o.each
- * yield
- * yield 1
- * yield 1, 2
- * end
- * e = o.to_enum
- * p e.peek_values #=> []
- * e.next
- * p e.peek_values #=> [1]
- * p e.peek_values #=> [1]
- * e.next
- * p e.peek_values #=> [1, 2]
- * e.next
- * p e.peek_values # raises StopIteration
- *
- */
-
-static VALUE
-enumerator_peek_values_m(VALUE obj)
-{
- return rb_ary_dup(enumerator_peek_values(obj));
-}
-
-/*
- * call-seq:
- * e.peek => object
- *
- * Returns the next object in the enumerator, but don't move the internal
- * position forward. When the position reached at the end, StopIteration
- * is raised.
- *
- * a = [1,2,3]
- * e = a.to_enum
- * p e.next #=> 1
- * p e.peek #=> 2
- * p e.peek #=> 2
- * p e.peek #=> 2
- * p e.next #=> 2
- * p e.next #=> 3
- * p e.next #raises StopIteration
- *
- */
-
-static VALUE
-enumerator_peek(VALUE obj)
-{
- VALUE vs = enumerator_peek_values(obj);
- return ary2sv(vs, 1);
-}
-
-/*
- * call-seq:
- * e.feed obj => nil
- *
- * Set the value for the next yield in the enumerator returns.
- *
- * If the value is not set, the yield returns nil.
- *
- * This value is cleared after used.
- *
- * o = Object.new
- * def o.each
- * # (2)
- * x = yield
- * p x #=> "foo"
- * # (5)
- * x = yield
- * p x #=> nil
- * # (7)
- * x = yield
- * # not reached
- * p x
- * end
- * e = o.to_enum
- * # (1)
- * e.next
- * # (3)
- * e.feed "foo"
- * # (4)
- * e.next
- * # (6)
- * e.next
- * # (8)
- *
- */
-
-static VALUE
-enumerator_feed(VALUE obj, VALUE v)
+enumerator_next(obj)
+ VALUE obj;
{
- struct enumerator *e = enumerator_ptr(obj);
-
- if (e->feedvalue != Qundef) {
- rb_raise(rb_eTypeError, "feed value already set");
- }
- e->feedvalue = v;
-
- return Qnil;
+ rb_require("generator");
+ return rb_funcall(obj, rb_intern("next"), 0, 0);
}
/*
@@ -851,373 +409,42 @@ enumerator_feed(VALUE obj, VALUE v)
* e.rewind => e
*
* Rewinds the enumeration sequence by the next method.
- *
- * If the enclosed object responds to a "rewind" method, it is called.
- */
-
-static VALUE
-enumerator_rewind(VALUE obj)
-{
- struct enumerator *e = enumerator_ptr(obj);
-
- if (rb_respond_to(e->obj, id_rewind))
- rb_funcall(e->obj, id_rewind, 0);
-
- e->fib = 0;
- e->dst = Qnil;
- e->lookahead = Qundef;
- e->feedvalue = Qundef;
- e->stop_exc = Qfalse;
- return obj;
-}
-
-static VALUE
-inspect_enumerator(VALUE obj, VALUE dummy, int recur)
-{
- struct enumerator *e = enumerator_ptr(obj);
- const char *cname = rb_obj_classname(obj);
- VALUE eobj, str;
- int tainted, untrusted;
-
- if (recur) {
- str = rb_sprintf("#<%s: ...>", cname);
- OBJ_TAINT(str);
- return str;
- }
-
- eobj = e->obj;
-
- tainted = OBJ_TAINTED(eobj);
- untrusted = OBJ_UNTRUSTED(eobj);
-
- /* (1..100).each_cons(2) => "#<Enumerator: 1..100:each_cons(2)>" */
- str = rb_sprintf("#<%s: ", cname);
- rb_str_concat(str, rb_inspect(eobj));
- rb_str_buf_cat2(str, ":");
- rb_str_buf_cat2(str, rb_id2name(e->meth));
-
- if (e->args) {
- long argc = RARRAY_LEN(e->args);
- VALUE *argv = RARRAY_PTR(e->args);
-
- rb_str_buf_cat2(str, "(");
-
- while (argc--) {
- VALUE arg = *argv++;
-
- rb_str_concat(str, rb_inspect(arg));
- rb_str_buf_cat2(str, argc > 0 ? ", " : ")");
-
- if (OBJ_TAINTED(arg)) tainted = TRUE;
- if (OBJ_UNTRUSTED(arg)) untrusted = TRUE;
- }
- }
-
- rb_str_buf_cat2(str, ">");
-
- if (tainted) OBJ_TAINT(str);
- if (untrusted) OBJ_UNTRUST(str);
- return str;
-}
-
-/*
- * call-seq:
- * e.inspect => string
- *
- * Create a printable version of <i>e</i>.
- */
-
-static VALUE
-enumerator_inspect(VALUE obj)
-{
- return rb_exec_recursive(inspect_enumerator, obj, 0);
-}
-
-/*
- * Yielder
- */
-static void
-yielder_mark(void *p)
-{
- struct yielder *ptr = p;
- rb_gc_mark(ptr->proc);
-}
-
-static struct yielder *
-yielder_ptr(VALUE obj)
-{
- struct yielder *ptr;
-
- Data_Get_Struct(obj, struct yielder, ptr);
- if (RDATA(obj)->dmark != yielder_mark) {
- rb_raise(rb_eTypeError,
- "wrong argument type %s (expected %s)",
- rb_obj_classname(obj), rb_class2name(rb_cYielder));
- }
- if (!ptr || ptr->proc == Qundef) {
- rb_raise(rb_eArgError, "uninitialized yielder");
- }
- return ptr;
-}
-
-/* :nodoc: */
-static VALUE
-yielder_allocate(VALUE klass)
-{
- struct yielder *ptr;
- VALUE obj;
-
- obj = Data_Make_Struct(klass, struct yielder, yielder_mark, -1, ptr);
- ptr->proc = Qundef;
-
- return obj;
-}
-
-static VALUE
-yielder_init(VALUE obj, VALUE proc)
-{
- struct yielder *ptr;
-
- Data_Get_Struct(obj, struct yielder, ptr);
-
- if (!ptr) {
- rb_raise(rb_eArgError, "unallocated yielder");
- }
-
- ptr->proc = proc;
-
- return obj;
-}
-
-/* :nodoc: */
-static VALUE
-yielder_initialize(VALUE obj)
-{
- rb_need_block();
-
- return yielder_init(obj, rb_block_proc());
-}
-
-/* :nodoc: */
-static VALUE
-yielder_yield(VALUE obj, VALUE args)
-{
- struct yielder *ptr = yielder_ptr(obj);
-
- return rb_proc_call(ptr->proc, args);
-}
-
-static VALUE
-yielder_yield_i(VALUE obj, VALUE memo, int argc, VALUE *argv)
-{
- return rb_yield_values2(argc, argv);
-}
-
-static VALUE
-yielder_new(void)
-{
- return yielder_init(yielder_allocate(rb_cYielder), rb_proc_new(yielder_yield_i, 0));
-}
-
-/*
- * Generator
*/
-static void
-generator_mark(void *p)
-{
- struct generator *ptr = p;
- rb_gc_mark(ptr->proc);
-}
-static struct generator *
-generator_ptr(VALUE obj)
-{
- struct generator *ptr;
-
- Data_Get_Struct(obj, struct generator, ptr);
- if (RDATA(obj)->dmark != generator_mark) {
- rb_raise(rb_eTypeError,
- "wrong argument type %s (expected %s)",
- rb_obj_classname(obj), rb_class2name(rb_cGenerator));
- }
- if (!ptr || ptr->proc == Qundef) {
- rb_raise(rb_eArgError, "uninitialized generator");
- }
- return ptr;
-}
-
-/* :nodoc: */
static VALUE
-generator_allocate(VALUE klass)
-{
- struct generator *ptr;
+enumerator_rewind(obj)
VALUE obj;
-
- obj = Data_Make_Struct(klass, struct generator, generator_mark, -1, ptr);
- ptr->proc = Qundef;
-
- return obj;
-}
-
-static VALUE
-generator_init(VALUE obj, VALUE proc)
{
- struct generator *ptr;
-
- Data_Get_Struct(obj, struct generator, ptr);
-
- if (!ptr) {
- rb_raise(rb_eArgError, "unallocated generator");
- }
-
- ptr->proc = proc;
-
- return obj;
-}
-
-VALUE rb_obj_is_proc(VALUE proc);
-
-/* :nodoc: */
-static VALUE
-generator_initialize(int argc, VALUE *argv, VALUE obj)
-{
- VALUE proc;
-
- if (argc == 0) {
- rb_need_block();
-
- proc = rb_block_proc();
- } else {
- rb_scan_args(argc, argv, "1", &proc);
-
- if (!rb_obj_is_proc(proc))
- rb_raise(rb_eTypeError,
- "wrong argument type %s (expected Proc)",
- rb_obj_classname(proc));
-
- if (rb_block_given_p()) {
- rb_warn("given block not used");
- }
- }
-
- return generator_init(obj, proc);
-}
-
-/* :nodoc: */
-static VALUE
-generator_init_copy(VALUE obj, VALUE orig)
-{
- struct generator *ptr0, *ptr1;
-
- ptr0 = generator_ptr(orig);
-
- Data_Get_Struct(obj, struct generator, ptr1);
-
- if (!ptr1) {
- rb_raise(rb_eArgError, "unallocated generator");
- }
-
- ptr1->proc = ptr0->proc;
-
- return obj;
-}
-
-/* :nodoc: */
-static VALUE
-generator_each(VALUE obj)
-{
- struct generator *ptr = generator_ptr(obj);
- VALUE yielder;
-
- yielder = yielder_new();
-
- return rb_proc_call(ptr->proc, rb_ary_new3(1, yielder));
-}
-
-/*
- * StopIteration
- */
-
-/*
- * call-seq:
- * stopiteration.result => value
- *
- * Returns the return value of the iterator.
- *
- * o = Object.new
- * def o.each
- * yield 1
- * yield 2
- * yield 3
- * 100
- * end
- * e = o.to_enum
- * p e.next #=> 1
- * p e.next #=> 2
- * p e.next #=> 3
- * begin
- * e.next
- * rescue StopIteration
- * p $!.result #=> 100
- * end
- *
- */
-static VALUE
-stop_result(VALUE self)
-{
- return rb_attr_get(self, rb_intern("result"));
+ rb_require("generator");
+ return rb_funcall(obj, rb_intern("rewind"), 0, 0);
}
void
-Init_Enumerator(void)
+Init_Enumerator()
{
rb_define_method(rb_mKernel, "to_enum", obj_to_enum, -1);
rb_define_method(rb_mKernel, "enum_for", obj_to_enum, -1);
rb_define_method(rb_mEnumerable, "each_slice", enum_each_slice, 1);
+ rb_define_method(rb_mEnumerable, "enum_slice", enum_each_slice, 1);
rb_define_method(rb_mEnumerable, "each_cons", enum_each_cons, 1);
- rb_define_method(rb_mEnumerable, "each_with_object", enum_each_with_object, 1);
+ rb_define_method(rb_mEnumerable, "enum_cons", enum_each_cons, 1);
- rb_cEnumerator = rb_define_class("Enumerator", rb_cObject);
+ rb_cEnumerator = rb_define_class_under(rb_mEnumerable, "Enumerator", rb_cObject);
rb_include_module(rb_cEnumerator, rb_mEnumerable);
rb_define_alloc_func(rb_cEnumerator, enumerator_allocate);
rb_define_method(rb_cEnumerator, "initialize", enumerator_initialize, -1);
rb_define_method(rb_cEnumerator, "initialize_copy", enumerator_init_copy, 1);
rb_define_method(rb_cEnumerator, "each", enumerator_each, 0);
- rb_define_method(rb_cEnumerator, "each_with_index", enumerator_each_with_index, 0);
- rb_define_method(rb_cEnumerator, "each_with_object", enumerator_with_object, 1);
- rb_define_method(rb_cEnumerator, "with_index", enumerator_with_index, -1);
- rb_define_method(rb_cEnumerator, "with_object", enumerator_with_object, 1);
- rb_define_method(rb_cEnumerator, "next_values", enumerator_next_values, 0);
- rb_define_method(rb_cEnumerator, "peek_values", enumerator_peek_values_m, 0);
+ rb_define_method(rb_cEnumerator, "each_with_index", enumerator_with_index, 0);
+ rb_define_method(rb_cEnumerator, "with_index", enumerator_with_index, 0);
rb_define_method(rb_cEnumerator, "next", enumerator_next, 0);
- rb_define_method(rb_cEnumerator, "peek", enumerator_peek, 0);
- rb_define_method(rb_cEnumerator, "feed", enumerator_feed, 1);
rb_define_method(rb_cEnumerator, "rewind", enumerator_rewind, 0);
- rb_define_method(rb_cEnumerator, "inspect", enumerator_inspect, 0);
-
- rb_eStopIteration = rb_define_class("StopIteration", rb_eIndexError);
- rb_define_method(rb_eStopIteration, "result", stop_result, 0);
-
- /* Generator */
- rb_cGenerator = rb_define_class_under(rb_cEnumerator, "Generator", rb_cObject);
- rb_include_module(rb_cGenerator, rb_mEnumerable);
- rb_define_alloc_func(rb_cGenerator, generator_allocate);
- rb_define_method(rb_cGenerator, "initialize", generator_initialize, -1);
- rb_define_method(rb_cGenerator, "initialize_copy", generator_init_copy, 1);
- rb_define_method(rb_cGenerator, "each", generator_each, 0);
- /* Yielder */
- rb_cYielder = rb_define_class_under(rb_cEnumerator, "Yielder", rb_cObject);
- rb_define_alloc_func(rb_cYielder, yielder_allocate);
- rb_define_method(rb_cYielder, "initialize", yielder_initialize, 0);
- rb_define_method(rb_cYielder, "yield", yielder_yield, -2);
- rb_define_method(rb_cYielder, "<<", yielder_yield, -2);
+ rb_eStopIteration = rb_define_class("StopIteration", rb_eIndexError);
- id_rewind = rb_intern("rewind");
- id_each = rb_intern("each");
- sym_each = ID2SYM(id_each);
+ sym_each = ID2SYM(rb_intern("each"));
rb_provide("enumerator.so"); /* for backward compatibility */
}
diff --git a/env.h b/env.h
new file mode 100644
index 0000000000..c50103f71e
--- /dev/null
+++ b/env.h
@@ -0,0 +1,60 @@
+/**********************************************************************
+
+ env.h -
+
+ $Author$
+ $Date$
+ created at: Mon Jul 11 11:53:03 JST 1994
+
+ Copyright (C) 1993-2003 Yukihiro Matsumoto
+
+**********************************************************************/
+
+#ifndef ENV_H
+#define ENV_H
+
+extern struct FRAME {
+ VALUE self;
+ int argc;
+ ID last_func;
+ ID orig_func;
+ VALUE last_class;
+ struct FRAME *prev;
+ struct FRAME *tmp;
+ struct RNode *node;
+ int iter;
+ int flags;
+ unsigned long uniq;
+} *ruby_frame;
+
+void rb_gc_mark_frame _((struct FRAME *));
+
+#define FRAME_DMETH 1
+#define FRAME_FUNC 2
+
+extern struct SCOPE {
+ struct RBasic super;
+ ID *local_tbl;
+ VALUE *local_vars;
+ int flags;
+} *ruby_scope;
+
+#define SCOPE_ALLOCA 0
+#define SCOPE_MALLOC 1
+#define SCOPE_NOSTACK 2
+#define SCOPE_DONT_RECYCLE 4
+#define SCOPE_CLONE 8
+
+extern int ruby_in_eval;
+
+extern VALUE ruby_class;
+
+struct RVarmap {
+ struct RBasic super;
+ ID id;
+ VALUE val;
+ struct RVarmap *next;
+};
+extern struct RVarmap *ruby_dyna_vars;
+
+#endif /* ENV_H */
diff --git a/error.c b/error.c
index aab3d66483..c6d7e6e107 100644
--- a/error.c
+++ b/error.c
@@ -3,18 +3,25 @@
error.c -
$Author$
+ $Date$
created at: Mon Aug 9 16:11:34 JST 1993
- Copyright (C) 1993-2007 Yukihiro Matsumoto
+ Copyright (C) 1993-2003 Yukihiro Matsumoto
**********************************************************************/
-#include "ruby/ruby.h"
-#include "ruby/st.h"
-#include "vm_core.h"
+#include "ruby.h"
+#include "env.h"
+#include "st.h"
#include <stdio.h>
+#ifdef HAVE_STDARG_PROTOTYPES
#include <stdarg.h>
+#define va_init_list(a,b) va_start(a,b)
+#else
+#include <varargs.h>
+#define va_init_list(a,b) va_start(a)
+#endif
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
@@ -22,30 +29,33 @@
#define EXIT_SUCCESS 0
#endif
-extern const char ruby_description[];
+extern const char *ruby_description;
+
+int ruby_nerrs;
static int
-err_position_0(char *buf, long len, const char *file, int line)
+err_position(buf, len)
+ char *buf;
+ long len;
{
- if (!file) {
+ ruby_set_current_source();
+ if (!ruby_sourcefile) {
return 0;
}
- else if (line == 0) {
- return snprintf(buf, len, "%s: ", file);
+ else if (ruby_sourceline == 0) {
+ return snprintf(buf, len, "%s: ", ruby_sourcefile);
}
else {
- return snprintf(buf, len, "%s:%d: ", file, line);
+ return snprintf(buf, len, "%s:%d: ", ruby_sourcefile, ruby_sourceline);
}
}
-static int
-err_position(char *buf, long len)
-{
- return err_position_0(buf, len, rb_sourcefile(), rb_sourceline());
-}
-
static void
-err_snprintf(char *buf, long len, const char *fmt, va_list args)
+err_snprintf(buf, len, fmt, args)
+ char *buf;
+ long len;
+ const char *fmt;
+ va_list args;
{
long n;
@@ -55,100 +65,75 @@ err_snprintf(char *buf, long len, const char *fmt, va_list args)
}
}
+static void err_append _((const char*));
static void
-compile_snprintf(char *buf, long len, const char *file, int line, const char *fmt, va_list args)
+err_print(fmt, args)
+ const char *fmt;
+ va_list args;
{
- long n;
+ char buf[BUFSIZ];
- n = err_position_0(buf, len, file, line);
- if (len > n) {
- vsnprintf((char*)buf+n, len-n, fmt, args);
- }
+ err_snprintf(buf, BUFSIZ, fmt, args);
+ err_append(buf);
}
-static void err_append(const char*);
-
void
-rb_compile_error(const char *file, int line, const char *fmt, ...)
+#ifdef HAVE_STDARG_PROTOTYPES
+rb_compile_error(const char *fmt, ...)
+#else
+rb_compile_error(fmt, va_alist)
+ const char *fmt;
+ va_dcl
+#endif
{
va_list args;
- char buf[BUFSIZ];
- va_start(args, fmt);
- compile_snprintf(buf, BUFSIZ, file, line, fmt, args);
+ va_init_list(args, fmt);
+ err_print(fmt, args);
va_end(args);
- err_append(buf);
+ ruby_nerrs++;
}
void
+#ifdef HAVE_STDARG_PROTOTYPES
rb_compile_error_append(const char *fmt, ...)
+#else
+rb_compile_error_append(fmt, va_alist)
+ const char *fmt;
+ va_dcl
+#endif
{
va_list args;
char buf[BUFSIZ];
- va_start(args, fmt);
+ va_init_list(args, fmt);
vsnprintf(buf, BUFSIZ, fmt, args);
va_end(args);
err_append(buf);
}
static void
-compile_warn_print(const char *file, int line, const char *fmt, va_list args)
-{
- char buf[BUFSIZ];
- int len;
-
- compile_snprintf(buf, BUFSIZ, file, line, fmt, args);
- len = (int)strlen(buf);
- buf[len++] = '\n';
- rb_write_error2(buf, len);
-}
-
-void
-rb_compile_warn(const char *file, int line, const char *fmt, ...)
-{
- char buf[BUFSIZ];
+warn_print(fmt, args)
+ const char *fmt;
va_list args;
-
- if (NIL_P(ruby_verbose)) return;
-
- snprintf(buf, BUFSIZ, "warning: %s", fmt);
-
- va_start(args, fmt);
- compile_warn_print(file, line, buf, args);
- va_end(args);
-}
-
-/* rb_compile_warning() reports only in verbose mode */
-void
-rb_compile_warning(const char *file, int line, const char *fmt, ...)
-{
- char buf[BUFSIZ];
- va_list args;
-
- if (!RTEST(ruby_verbose)) return;
-
- snprintf(buf, BUFSIZ, "warning: %s", fmt);
-
- va_start(args, fmt);
- compile_warn_print(file, line, buf, args);
- va_end(args);
-}
-
-static void
-warn_print(const char *fmt, va_list args)
{
char buf[BUFSIZ];
int len;
err_snprintf(buf, BUFSIZ, fmt, args);
- len = (int)strlen(buf);
+ len = strlen(buf);
buf[len++] = '\n';
rb_write_error2(buf, len);
}
void
+#ifdef HAVE_STDARG_PROTOTYPES
rb_warn(const char *fmt, ...)
+#else
+rb_warn(fmt, va_alist)
+ const char *fmt;
+ va_dcl
+#endif
{
char buf[BUFSIZ];
va_list args;
@@ -157,14 +142,20 @@ rb_warn(const char *fmt, ...)
snprintf(buf, BUFSIZ, "warning: %s", fmt);
- va_start(args, fmt);
+ va_init_list(args, fmt);
warn_print(buf, args);
va_end(args);
}
/* rb_warning() reports only in verbose mode */
void
+#ifdef HAVE_STDARG_PROTOTYPES
rb_warning(const char *fmt, ...)
+#else
+rb_warning(fmt, va_alist)
+ const char *fmt;
+ va_dcl
+#endif
{
char buf[BUFSIZ];
va_list args;
@@ -173,7 +164,7 @@ rb_warning(const char *fmt, ...)
snprintf(buf, BUFSIZ, "warning: %s", fmt);
- va_start(args, fmt);
+ va_init_list(args, fmt);
warn_print(buf, args);
va_end(args);
}
@@ -187,7 +178,8 @@ rb_warning(const char *fmt, ...)
*/
static VALUE
-rb_warn_m(VALUE self, VALUE mesg)
+rb_warn_m(self, mesg)
+ VALUE self, mesg;
{
if (!NIL_P(ruby_verbose)) {
rb_io_write(rb_stderr, mesg);
@@ -196,58 +188,32 @@ rb_warn_m(VALUE self, VALUE mesg)
return Qnil;
}
-void rb_vm_bugreport(void);
-
-static void
-report_bug(const char *file, int line, const char *fmt, va_list args)
+void
+#ifdef HAVE_STDARG_PROTOTYPES
+rb_bug(const char *fmt, ...)
+#else
+rb_bug(fmt, va_alist)
+ const char *fmt;
+ va_dcl
+#endif
{
char buf[BUFSIZ];
+ va_list args;
FILE *out = stderr;
- int len = err_position_0(buf, BUFSIZ, file, line);
-
- if ((ssize_t)fwrite(buf, 1, len, out) == (ssize_t)len ||
- (ssize_t)fwrite(buf, 1, len, (out = stdout)) == (ssize_t)len) {
+ int len = err_position(buf, BUFSIZ);
+ if (fwrite(buf, 1, len, out) == len ||
+ fwrite(buf, 1, len, (out = stdout)) == len) {
fputs("[BUG] ", out);
+ va_init_list(args, fmt);
vfprintf(out, fmt, args);
+ va_end(args);
fprintf(out, "\n%s\n\n", ruby_description);
-
- rb_vm_bugreport();
-
- fprintf(out,
- "[NOTE]\n"
- "You may have encountered a bug in the Ruby interpreter"
- " or extension libraries.\n"
- "Bug reports are welcome.\n"
- "For details: http://www.ruby-lang.org/bugreport.html\n\n");
}
-}
-
-void
-rb_bug(const char *fmt, ...)
-{
- va_list args;
-
- va_start(args, fmt);
- report_bug(rb_sourcefile(), rb_sourceline(), fmt, args);
- va_end(args);
-
- abort();
-}
-
-void
-rb_compile_bug(const char *file, int line, const char *fmt, ...)
-{
- va_list args;
-
- va_start(args, fmt);
- report_bug(file, line, fmt, args);
- va_end(args);
-
abort();
}
-static const struct types {
+static struct types {
int type;
const char *name;
} builtin_types[] = {
@@ -265,32 +231,31 @@ static const struct types {
{T_STRUCT, "Struct"},
{T_BIGNUM, "Bignum"},
{T_FILE, "File"},
- {T_RATIONAL,"Rational"},
- {T_COMPLEX, "Complex"},
{T_TRUE, "true"},
{T_FALSE, "false"},
{T_SYMBOL, "Symbol"}, /* :symbol */
{T_DATA, "Data"}, /* internal use: wrapped C pointers */
{T_MATCH, "MatchData"}, /* data of $~ */
+ {T_VARMAP, "Varmap"}, /* internal use: dynamic variables */
+ {T_SCOPE, "Scope"}, /* internal use: variable scope */
{T_NODE, "Node"}, /* internal use: syntax tree node */
{T_UNDEF, "undef"}, /* internal use: #undef; should not happen */
+ {-1, 0}
};
void
-rb_check_type(VALUE x, int t)
+rb_check_type(x, t)
+ VALUE x;
+ int t;
{
- const struct types *type = builtin_types;
- const struct types *const typeend = builtin_types +
- sizeof(builtin_types) / sizeof(builtin_types[0]);
- int xt;
+ struct types *type = builtin_types;
if (x == Qundef) {
rb_bug("undef leaked to the Ruby space");
}
- xt = TYPE(x);
- if (xt != t || (xt == T_DATA && RTYPEDDATA_P(x))) {
- while (type < typeend) {
+ if (TYPE(x) != t) {
+ while (type->type >= 0) {
if (type->type == t) {
const char *etype;
@@ -304,7 +269,7 @@ rb_check_type(VALUE x, int t)
etype = "Symbol";
}
else if (rb_special_const_p(x)) {
- etype = RSTRING_PTR(rb_obj_as_string(x));
+ etype = RSTRING(rb_obj_as_string(x))->ptr;
}
else {
etype = rb_obj_classname(x);
@@ -314,38 +279,8 @@ rb_check_type(VALUE x, int t)
}
type++;
}
- rb_bug("unknown type 0x%x (0x%x given)", t, TYPE(x));
- }
-}
-
-int
-rb_typeddata_is_kind_of(VALUE obj, const rb_data_type_t *data_type)
-{
- if (SPECIAL_CONST_P(obj) || BUILTIN_TYPE(obj) != T_DATA ||
- !RTYPEDDATA_P(obj) || RTYPEDDATA_TYPE(obj) != data_type) {
- return 0;
- }
- return 1;
-}
-
-void *
-rb_check_typeddata(VALUE obj, const rb_data_type_t *data_type)
-{
- const char *etype;
- static const char mesg[] = "wrong argument type %s (expected %s)";
-
- if (SPECIAL_CONST_P(obj) || BUILTIN_TYPE(obj) != T_DATA) {
- Check_Type(obj, T_DATA);
- }
- if (!RTYPEDDATA_P(obj)) {
- etype = rb_obj_classname(obj);
- rb_raise(rb_eTypeError, mesg, etype, data_type->wrap_struct_name);
+ rb_bug("unknown type 0x%x", t);
}
- else if (RTYPEDDATA_TYPE(obj) != data_type) {
- etype = RTYPEDDATA_TYPE(obj)->wrap_struct_name;
- rb_raise(rb_eTypeError, mesg, etype, data_type->wrap_struct_name);
- }
- return DATA_PTR(obj);
}
/* exception classes */
@@ -361,11 +296,8 @@ VALUE rb_eRuntimeError;
VALUE rb_eTypeError;
VALUE rb_eArgError;
VALUE rb_eIndexError;
-VALUE rb_eKeyError;
VALUE rb_eRangeError;
VALUE rb_eNameError;
-VALUE rb_eEncodingError;
-VALUE rb_eEncCompatError;
VALUE rb_eNoMethodError;
VALUE rb_eSecurityError;
VALUE rb_eNotImpError;
@@ -378,39 +310,45 @@ VALUE rb_eLoadError;
VALUE rb_eSystemCallError;
VALUE rb_mErrno;
-static VALUE rb_eNOERROR;
-
-#undef rb_exc_new2
VALUE
-rb_exc_new(VALUE etype, const char *ptr, long len)
+rb_exc_new(etype, ptr, len)
+ VALUE etype;
+ const char *ptr;
+ long len;
{
return rb_funcall(etype, rb_intern("new"), 1, rb_str_new(ptr, len));
}
VALUE
-rb_exc_new2(VALUE etype, const char *s)
+rb_exc_new2(etype, s)
+ VALUE etype;
+ const char *s;
{
return rb_exc_new(etype, s, strlen(s));
}
VALUE
-rb_exc_new3(VALUE etype, VALUE str)
+rb_exc_new3(etype, str)
+ VALUE etype, str;
{
StringValue(str);
- return rb_funcall(etype, rb_intern("new"), 1, str);
+ return rb_exc_new(etype, RSTRING(str)->ptr, RSTRING(str)->len);
}
/*
* call-seq:
* Exception.new(msg = nil) => exception
*
- * Construct a new Exception object, optionally passing in
+ * Construct a new Exception object, optionally passing in
* a message.
*/
static VALUE
-exc_initialize(int argc, VALUE *argv, VALUE exc)
+exc_initialize(argc, argv, exc)
+ int argc;
+ VALUE *argv;
+ VALUE exc;
{
VALUE arg;
@@ -426,16 +364,19 @@ exc_initialize(int argc, VALUE *argv, VALUE exc)
*
* call-seq:
* exc.exception(string) -> an_exception or exc
- *
+ *
* With no argument, or if the argument is the same as the receiver,
* return the receiver. Otherwise, create a new
* exception object of the same class as the receiver, but with a
* message equal to <code>string.to_str</code>.
- *
+ *
*/
static VALUE
-exc_exception(int argc, VALUE *argv, VALUE self)
+exc_exception(argc, argv, self)
+ int argc;
+ VALUE *argv;
+ VALUE self;
{
VALUE exc;
@@ -456,7 +397,8 @@ exc_exception(int argc, VALUE *argv, VALUE self)
*/
static VALUE
-exc_to_s(VALUE exc)
+exc_to_s(exc)
+ VALUE exc;
{
VALUE mesg = rb_attr_get(exc, rb_intern("mesg"));
@@ -468,6 +410,7 @@ exc_to_s(VALUE exc)
/*
* call-seq:
* exception.message => string
+ * exception.to_str => string
*
* Returns the result of invoking <code>exception.to_s</code>.
* Normally this returns the exception's message or name. By
@@ -476,7 +419,8 @@ exc_to_s(VALUE exc)
*/
static VALUE
-exc_message(VALUE exc)
+exc_to_str(exc)
+ VALUE exc;
{
return rb_funcall(exc, rb_intern("to_s"), 0, 0);
}
@@ -489,13 +433,14 @@ exc_message(VALUE exc)
*/
static VALUE
-exc_inspect(VALUE exc)
+exc_inspect(exc)
+ VALUE exc;
{
VALUE str, klass;
klass = CLASS_OF(exc);
exc = rb_obj_as_string(exc);
- if (RSTRING_LEN(exc) == 0) {
+ if (RSTRING(exc)->len == 0) {
return rb_str_dup(rb_class_name(klass));
}
@@ -512,43 +457,45 @@ exc_inspect(VALUE exc)
/*
* call-seq:
* exception.backtrace => array
- *
+ *
* Returns any backtrace associated with the exception. The backtrace
* is an array of strings, each containing either ``filename:lineNo: in
* `method''' or ``filename:lineNo.''
- *
+ *
* def a
* raise "boom"
* end
- *
+ *
* def b
* a()
* end
- *
+ *
* begin
* b()
* rescue => detail
* print detail.backtrace.join("\n")
* end
- *
+ *
* <em>produces:</em>
- *
+ *
* prog.rb:2:in `a'
* prog.rb:6:in `b'
* prog.rb:10
*/
static VALUE
-exc_backtrace(VALUE exc)
+exc_backtrace(exc)
+ VALUE exc;
{
- ID bt;
+ static ID bt;
- CONST_ID(bt, "bt");
+ if (!bt) bt = rb_intern("bt");
return rb_attr_get(exc, bt);
}
VALUE
-rb_check_backtrace(VALUE bt)
+rb_check_backtrace(bt)
+ VALUE bt;
{
long i;
static const char err[] = "backtrace must be Array of String";
@@ -560,8 +507,8 @@ rb_check_backtrace(VALUE bt)
if (t != T_ARRAY) {
rb_raise(rb_eTypeError, err);
}
- for (i=0;i<RARRAY_LEN(bt);i++) {
- if (TYPE(RARRAY_PTR(bt)[i]) != T_STRING) {
+ for (i=0;i<RARRAY(bt)->len;i++) {
+ if (TYPE(RARRAY(bt)->ptr[i]) != T_STRING) {
rb_raise(rb_eTypeError, err);
}
}
@@ -572,63 +519,22 @@ rb_check_backtrace(VALUE bt)
/*
* call-seq:
* exc.set_backtrace(array) => array
- *
+ *
* Sets the backtrace information associated with <i>exc</i>. The
* argument must be an array of <code>String</code> objects in the
* format described in <code>Exception#backtrace</code>.
- *
+ *
*/
static VALUE
-exc_set_backtrace(VALUE exc, VALUE bt)
+exc_set_backtrace(exc, bt)
+ VALUE exc;
+ VALUE bt;
{
return rb_iv_set(exc, "bt", rb_check_backtrace(bt));
}
/*
- * call-seq:
- * exc == obj => true or false
- *
- * Equality---If <i>obj</i> is not an <code>Exception</code>, returns
- * <code>false</code>. Otherwise, returns <code>true</code> if <i>exc</i> and
- * <i>obj</i> share same class, messages, and backtrace.
- */
-
-static VALUE
-exc_equal(VALUE exc, VALUE obj)
-{
- VALUE mesg, backtrace;
- ID id_mesg;
-
- if (exc == obj) return Qtrue;
- CONST_ID(id_mesg, "mesg");
-
- if (rb_obj_class(exc) != rb_obj_class(obj)) {
- ID id_message, id_backtrace;
- CONST_ID(id_message, "message");
- CONST_ID(id_backtrace, "backtrace");
-
- if (rb_respond_to(obj, id_message) && rb_respond_to(obj, id_backtrace)) {
- mesg = rb_funcall(obj, id_message, 0, 0);
- backtrace = rb_funcall(obj, id_backtrace, 0, 0);
- }
- else {
- return Qfalse;
- }
- }
- else {
- mesg = rb_attr_get(obj, id_mesg);
- backtrace = exc_backtrace(obj);
- }
-
- if (!rb_equal(rb_attr_get(exc, id_mesg), mesg))
- return Qfalse;
- if (!rb_equal(exc_backtrace(exc), backtrace))
- return Qfalse;
- return Qtrue;
-}
-
-/*
* call-seq:
* SystemExit.new(status=0) => system_exit
*
@@ -636,7 +542,10 @@ exc_equal(VALUE exc, VALUE obj)
*/
static VALUE
-exit_initialize(int argc, VALUE *argv, VALUE exc)
+exit_initialize(argc, argv, exc)
+ int argc;
+ VALUE *argv;
+ VALUE exc;
{
VALUE status = INT2FIX(EXIT_SUCCESS);
if (argc > 0 && FIXNUM_P(argv[0])) {
@@ -657,7 +566,8 @@ exit_initialize(int argc, VALUE *argv, VALUE exc)
*/
static VALUE
-exit_status(VALUE exc)
+exit_status(exc)
+ VALUE exc;
{
return rb_attr_get(exc, rb_intern("status"));
}
@@ -671,7 +581,8 @@ exit_status(VALUE exc)
*/
static VALUE
-exit_success_p(VALUE exc)
+exit_success_p(exc)
+ VALUE exc;
{
VALUE status = rb_attr_get(exc, rb_intern("status"));
if (NIL_P(status)) return Qtrue;
@@ -680,15 +591,24 @@ exit_success_p(VALUE exc)
}
void
+#ifdef HAVE_STDARG_PROTOTYPES
rb_name_error(ID id, const char *fmt, ...)
+#else
+rb_name_error(id, fmt, va_alist)
+ ID id;
+ const char *fmt;
+ va_dcl
+#endif
{
VALUE exc, argv[2];
va_list args;
+ char buf[BUFSIZ];
- va_start(args, fmt);
- argv[0] = rb_vsprintf(fmt, args);
+ va_init_list(args, fmt);
+ vsnprintf(buf, BUFSIZ, fmt, args);
va_end(args);
+ argv[0] = rb_str_new2(buf);
argv[1] = ID2SYM(id);
exc = rb_class_new_instance(2, argv, rb_eNameError);
rb_exc_raise(exc);
@@ -704,7 +624,10 @@ rb_name_error(ID id, const char *fmt, ...)
*/
static VALUE
-name_err_initialize(int argc, VALUE *argv, VALUE self)
+name_err_initialize(argc, argv, self)
+ int argc;
+ VALUE *argv;
+ VALUE self;
{
VALUE name;
@@ -722,7 +645,8 @@ name_err_initialize(int argc, VALUE *argv, VALUE self)
*/
static VALUE
-name_err_name(VALUE self)
+name_err_name(self)
+ VALUE self;
{
return rb_attr_get(self, rb_intern("name"));
}
@@ -731,14 +655,14 @@ name_err_name(VALUE self)
* call-seq:
* name_error.to_s => string
*
- * Produce a nicely-formatted string representing the +NameError+.
+ * Produce a nicely-formated string representing the +NameError+.
*/
static VALUE
-name_err_to_s(VALUE exc)
+name_err_to_s(exc)
+ VALUE exc;
{
- VALUE mesg = rb_attr_get(exc, rb_intern("mesg"));
- VALUE str = mesg;
+ VALUE mesg = rb_attr_get(exc, rb_intern("mesg")), str = mesg;
if (NIL_P(mesg)) return rb_class_name(CLASS_OF(exc));
StringValue(str);
@@ -760,7 +684,10 @@ name_err_to_s(VALUE exc)
*/
static VALUE
-nometh_err_initialize(int argc, VALUE *argv, VALUE self)
+nometh_err_initialize(argc, argv, self)
+ int argc;
+ VALUE *argv;
+ VALUE self;
{
VALUE args = (argc > 2) ? argv[--argc] : Qnil;
name_err_initialize(argc, argv, self);
@@ -770,14 +697,16 @@ nometh_err_initialize(int argc, VALUE *argv, VALUE self)
/* :nodoc: */
static void
-name_err_mesg_mark(VALUE *ptr)
+name_err_mesg_mark(ptr)
+ VALUE *ptr;
{
rb_gc_mark_locations(ptr, ptr+3);
}
/* :nodoc: */
static VALUE
-name_err_mesg_new(VALUE obj, VALUE mesg, VALUE recv, VALUE method)
+name_err_mesg_new(obj, mesg, recv, method)
+ VALUE obj, mesg, recv, method;
{
VALUE *ptr = ALLOC_N(VALUE, 3);
@@ -789,27 +718,8 @@ name_err_mesg_new(VALUE obj, VALUE mesg, VALUE recv, VALUE method)
/* :nodoc: */
static VALUE
-name_err_mesg_equal(VALUE obj1, VALUE obj2)
-{
- VALUE *ptr1, *ptr2;
- int i;
-
- if (obj1 == obj2) return Qtrue;
- if (rb_obj_class(obj2) != rb_cNameErrorMesg)
- return Qfalse;
-
- Data_Get_Struct(obj1, VALUE, ptr1);
- Data_Get_Struct(obj2, VALUE, ptr2);
- for (i=0; i<3; i++) {
- if (!rb_equal(ptr1[i], ptr2[i]))
- return Qfalse;
- }
- return Qtrue;
-}
-
-/* :nodoc: */
-static VALUE
-name_err_mesg_to_str(VALUE obj)
+name_err_mesg_to_str(obj)
+ VALUE obj;
{
VALUE *ptr, mesg;
Data_Get_Struct(obj, VALUE, ptr);
@@ -833,10 +743,10 @@ name_err_mesg_to_str(VALUE obj)
break;
default:
d = rb_protect(rb_inspect, obj, 0);
- if (NIL_P(d) || RSTRING_LEN(d) > 65) {
+ if (NIL_P(d) || RSTRING(d)->len > 65) {
d = rb_any_to_s(obj);
}
- desc = RSTRING_PTR(d);
+ desc = RSTRING(d)->ptr;
break;
}
if (desc && desc[0] != '#') {
@@ -855,7 +765,8 @@ name_err_mesg_to_str(VALUE obj)
/* :nodoc: */
static VALUE
-name_err_mesg_load(VALUE klass, VALUE str)
+name_err_mesg_load(klass, str)
+ VALUE klass, str;
{
return str;
}
@@ -869,20 +780,22 @@ name_err_mesg_load(VALUE klass, VALUE str)
*/
static VALUE
-nometh_err_args(VALUE self)
+nometh_err_args(self)
+ VALUE self;
{
return rb_attr_get(self, rb_intern("args"));
}
void
-rb_invalid_str(const char *str, const char *type)
+rb_invalid_str(str, type)
+ const char *str, *type;
{
VALUE s = rb_str_inspect(rb_str_new2(str));
- rb_raise(rb_eArgError, "invalid value for %s: %s", type, RSTRING_PTR(s));
+ rb_raise(rb_eArgError, "invalid value for %s: %s", type, RSTRING(s)->ptr);
}
-/*
+/*
* Document-module: Errno
*
* Ruby exception objects are subclasses of <code>Exception</code>.
@@ -892,31 +805,33 @@ rb_invalid_str(const char *str, const char *type)
* number generating its own subclass of <code>SystemCallError</code>.
* As the subclass is created in module <code>Errno</code>, its name
* will start <code>Errno::</code>.
- *
+ *
* The names of the <code>Errno::</code> classes depend on
* the environment in which Ruby runs. On a typical Unix or Windows
* platform, there are <code>Errno</code> classes such as
* <code>Errno::EACCES</code>, <code>Errno::EAGAIN</code>,
* <code>Errno::EINTR</code>, and so on.
- *
+ *
* The integer operating system error number corresponding to a
* particular error is available as the class constant
* <code>Errno::</code><em>error</em><code>::Errno</code>.
- *
+ *
* Errno::EACCES::Errno #=> 13
* Errno::EAGAIN::Errno #=> 11
* Errno::EINTR::Errno #=> 4
- *
+ *
* The full list of operating system errors on your particular platform
* are available as the constants of <code>Errno</code>.
*
- * Errno.constants #=> :E2BIG, :EACCES, :EADDRINUSE, :EADDRNOTAVAIL, ...
+ * Errno.constants #=> E2BIG, EACCES, EADDRINUSE, EADDRNOTAVAIL, ...
*/
static st_table *syserr_tbl;
static VALUE
-set_syserr(int n, const char *name)
+set_syserr(n, name)
+ int n;
+ const char *name;
{
VALUE error;
@@ -932,7 +847,8 @@ set_syserr(int n, const char *name)
}
static VALUE
-get_syserr(int n)
+get_syserr(n)
+ int n;
{
VALUE error;
@@ -957,9 +873,12 @@ get_syserr(int n)
*/
static VALUE
-syserr_initialize(int argc, VALUE *argv, VALUE self)
+syserr_initialize(argc, argv, self)
+ int argc;
+ VALUE *argv;
+ VALUE self;
{
-#if !defined(_WIN32)
+#if !defined(_WIN32) && !defined(__VMS)
char *strerror();
#endif
const char *err;
@@ -983,14 +902,18 @@ syserr_initialize(int argc, VALUE *argv, VALUE self)
rb_scan_args(argc, argv, "01", &mesg);
error = rb_const_get(klass, rb_intern("Errno"));
}
- if (!NIL_P(error)) err = strerror(NUM2INT(error));
+ if (!NIL_P(error)) err = strerror(NUM2LONG(error));
else err = "unknown error";
if (!NIL_P(mesg)) {
VALUE str = mesg;
+ size_t len;
StringValue(str);
- mesg = rb_sprintf("%s - %.*s", err,
- (int)RSTRING_LEN(str), RSTRING_PTR(str));
+ len = strlen(err)+RSTRING(str)->len+3;
+ mesg = rb_str_new(0, len);
+ snprintf(RSTRING(mesg)->ptr, len+1, "%s - %.*s", err,
+ (int)RSTRING(str)->len, RSTRING(str)->ptr);
+ rb_str_resize(mesg, strlen(RSTRING(mesg)->ptr));
}
else {
mesg = rb_str_new2(err);
@@ -1008,7 +931,8 @@ syserr_initialize(int argc, VALUE *argv, VALUE self)
*/
static VALUE
-syserr_errno(VALUE self)
+syserr_errno(self)
+ VALUE self;
{
return rb_attr_get(self, rb_intern("errno"));
}
@@ -1021,20 +945,20 @@ syserr_errno(VALUE self)
* if the error numbers _self_ and _other_ are the same.
*/
+
static VALUE
-syserr_eqq(VALUE self, VALUE exc)
+syserr_eqq(self, exc)
+ VALUE self, exc;
{
VALUE num, e;
- ID en;
-
- CONST_ID(en, "errno");
+ ID en = rb_intern("errno");
if (!rb_obj_is_kind_of(exc, rb_eSystemCallError)) {
if (!rb_respond_to(exc, en)) return Qfalse;
}
else if (self == rb_eSystemCallError) return Qtrue;
- num = rb_attr_get(exc, rb_intern("errno"));
+ num = rb_attr_get(exc, en);
if (NIL_P(num)) {
num = rb_funcall(exc, en, 0, 0);
}
@@ -1045,25 +969,25 @@ syserr_eqq(VALUE self, VALUE exc)
}
/*
- * Descendants of class <code>Exception</code> are used to communicate
+ * Descendents of class <code>Exception</code> are used to communicate
* between <code>raise</code> methods and <code>rescue</code>
* statements in <code>begin/end</code> blocks. <code>Exception</code>
* objects carry information about the exception---its type (the
* exception's class name), an optional descriptive string, and
- * optional traceback information. Programs may subclass
+ * optional traceback information. Programs may subclass
* <code>Exception</code> to add additional information.
*/
void
-Init_Exception(void)
+Init_Exception()
{
rb_eException = rb_define_class("Exception", rb_cObject);
rb_define_singleton_method(rb_eException, "exception", rb_class_new_instance, -1);
rb_define_method(rb_eException, "exception", exc_exception, -1);
rb_define_method(rb_eException, "initialize", exc_initialize, -1);
- rb_define_method(rb_eException, "==", exc_equal, 1);
rb_define_method(rb_eException, "to_s", exc_to_s, 0);
- rb_define_method(rb_eException, "message", exc_message, 0);
+ rb_define_method(rb_eException, "to_str", exc_to_str, 0);
+ rb_define_method(rb_eException, "message", exc_to_str, 0);
rb_define_method(rb_eException, "inspect", exc_inspect, 0);
rb_define_method(rb_eException, "backtrace", exc_backtrace, 0);
rb_define_method(rb_eException, "set_backtrace", exc_set_backtrace, 1);
@@ -1081,21 +1005,13 @@ Init_Exception(void)
rb_eTypeError = rb_define_class("TypeError", rb_eStandardError);
rb_eArgError = rb_define_class("ArgumentError", rb_eStandardError);
rb_eIndexError = rb_define_class("IndexError", rb_eStandardError);
- rb_eKeyError = rb_define_class("KeyError", rb_eIndexError);
rb_eRangeError = rb_define_class("RangeError", rb_eStandardError);
-
- rb_eScriptError = rb_define_class("ScriptError", rb_eException);
- rb_eSyntaxError = rb_define_class("SyntaxError", rb_eScriptError);
- rb_eLoadError = rb_define_class("LoadError", rb_eScriptError);
- rb_eNotImpError = rb_define_class("NotImplementedError", rb_eScriptError);
-
rb_eNameError = rb_define_class("NameError", rb_eStandardError);
rb_define_method(rb_eNameError, "initialize", name_err_initialize, -1);
rb_define_method(rb_eNameError, "name", name_err_name, 0);
rb_define_method(rb_eNameError, "to_s", name_err_to_s, 0);
rb_cNameErrorMesg = rb_define_class_under(rb_eNameError, "message", rb_cData);
rb_define_singleton_method(rb_cNameErrorMesg, "!", name_err_mesg_new, 3);
- rb_define_method(rb_cNameErrorMesg, "==", name_err_mesg_equal, 1);
rb_define_method(rb_cNameErrorMesg, "to_str", name_err_mesg_to_str, 0);
rb_define_method(rb_cNameErrorMesg, "_dump", name_err_mesg_to_str, 1);
rb_define_singleton_method(rb_cNameErrorMesg, "_load", name_err_mesg_load, 1);
@@ -1103,11 +1019,14 @@ Init_Exception(void)
rb_define_method(rb_eNoMethodError, "initialize", nometh_err_initialize, -1);
rb_define_method(rb_eNoMethodError, "args", nometh_err_args, 0);
+ rb_eScriptError = rb_define_class("ScriptError", rb_eException);
+ rb_eSyntaxError = rb_define_class("SyntaxError", rb_eScriptError);
+ rb_eLoadError = rb_define_class("LoadError", rb_eScriptError);
+ rb_eNotImpError = rb_define_class("NotImplementedError", rb_eScriptError);
+
rb_eRuntimeError = rb_define_class("RuntimeError", rb_eStandardError);
- rb_eSecurityError = rb_define_class("SecurityError", rb_eException);
+ rb_eSecurityError = rb_define_class("SecurityError", rb_eStandardError);
rb_eNoMemError = rb_define_class("NoMemoryError", rb_eException);
- rb_eEncodingError = rb_define_class("EncodingError", rb_eStandardError);
- rb_eEncCompatError = rb_define_class_under(rb_cEncoding, "CompatibilityError", rb_eEncodingError);
syserr_tbl = st_init_numtable();
rb_eSystemCallError = rb_define_class("SystemCallError", rb_eStandardError);
@@ -1121,52 +1040,73 @@ Init_Exception(void)
}
void
+#ifdef HAVE_STDARG_PROTOTYPES
rb_raise(VALUE exc, const char *fmt, ...)
+#else
+rb_raise(exc, fmt, va_alist)
+ VALUE exc;
+ const char *fmt;
+ va_dcl
+#endif
{
va_list args;
- VALUE mesg;
+ char buf[BUFSIZ];
- va_start(args, fmt);
- mesg = rb_vsprintf(fmt, args);
+ va_init_list(args,fmt);
+ vsnprintf(buf, BUFSIZ, fmt, args);
va_end(args);
- rb_exc_raise(rb_exc_new3(exc, mesg));
+ rb_exc_raise(rb_exc_new2(exc, buf));
}
void
+#ifdef HAVE_STDARG_PROTOTYPES
rb_loaderror(const char *fmt, ...)
+#else
+rb_loaderror(fmt, va_alist)
+ const char *fmt;
+ va_dcl
+#endif
{
va_list args;
- VALUE mesg;
+ char buf[BUFSIZ];
- va_start(args, fmt);
- mesg = rb_vsprintf(fmt, args);
+ va_init_list(args, fmt);
+ vsnprintf(buf, BUFSIZ, fmt, args);
va_end(args);
- rb_exc_raise(rb_exc_new3(rb_eLoadError, mesg));
+ rb_exc_raise(rb_exc_new2(rb_eLoadError, buf));
}
void
-rb_notimplement(void)
+rb_notimplement()
{
rb_raise(rb_eNotImpError,
"%s() function is unimplemented on this machine",
- rb_id2name(rb_frame_this_func()));
+ rb_id2name(ruby_frame->last_func));
}
void
+#ifdef HAVE_STDARG_PROTOTYPES
rb_fatal(const char *fmt, ...)
+#else
+rb_fatal(fmt, va_alist)
+ const char *fmt;
+ va_dcl
+#endif
{
va_list args;
- VALUE mesg;
+ char buf[BUFSIZ];
- va_start(args, fmt);
- mesg = rb_vsprintf(fmt, args);
+ va_init_list(args, fmt);
+ vsnprintf(buf, BUFSIZ, fmt, args);
va_end(args);
- rb_exc_fatal(rb_exc_new3(rb_eFatal, mesg));
+ ruby_in_eval = 0;
+ rb_exc_fatal(rb_exc_new2(rb_eFatal, buf));
}
-static VALUE
-make_errno_exc(const char *mesg)
+void
+rb_sys_fail(mesg)
+ const char *mesg;
{
int n = errno;
VALUE arg;
@@ -1177,91 +1117,446 @@ make_errno_exc(const char *mesg)
}
arg = mesg ? rb_str_new2(mesg) : Qnil;
- return rb_class_new_instance(1, &arg, get_syserr(n));
-}
-
-void
-rb_sys_fail(const char *mesg)
-{
- rb_exc_raise(make_errno_exc(mesg));
-}
-
-void
-rb_mod_sys_fail(VALUE mod, const char *mesg)
-{
- VALUE exc = make_errno_exc(mesg);
- rb_extend_object(exc, mod);
- rb_exc_raise(exc);
+ rb_exc_raise(rb_class_new_instance(1, &arg, get_syserr(n)));
}
void
+#ifdef HAVE_STDARG_PROTOTYPES
rb_sys_warning(const char *fmt, ...)
+#else
+rb_sys_warning(fmt, va_alist)
+ const char *fmt;
+ va_dcl
+#endif
{
- char buf[BUFSIZ];
- va_list args;
- int errno_save;
-
- errno_save = errno;
-
- if (!RTEST(ruby_verbose)) return;
+ char buf[BUFSIZ];
+ va_list args;
+ int errno_save;
+
+ errno_save = errno;
- snprintf(buf, BUFSIZ, "warning: %s", fmt);
- snprintf(buf+strlen(buf), BUFSIZ-strlen(buf), ": %s", strerror(errno_save));
+ if (!RTEST(ruby_verbose)) return;
- va_start(args, fmt);
- warn_print(buf, args);
- va_end(args);
- errno = errno_save;
+ snprintf(buf, BUFSIZ, "warning: %s", fmt);
+ snprintf(buf+strlen(buf), BUFSIZ-strlen(buf), ": %s", strerror(errno_save));
+
+ va_init_list(args, fmt);
+ warn_print(buf, args);
+ va_end(args);
+ errno = errno_save;
}
void
-rb_load_fail(const char *path)
+rb_load_fail(path)
+ const char *path;
{
rb_loaderror("%s -- %s", strerror(errno), path);
}
void
-rb_error_frozen(const char *what)
+rb_error_frozen(what)
+ const char *what;
{
- rb_raise(rb_eRuntimeError, "can't modify frozen %s", what);
+ rb_raise(rb_eTypeError, "can't modify frozen %s", what);
}
void
-rb_check_frozen(VALUE obj)
+rb_check_frozen(obj)
+ VALUE obj;
{
if (OBJ_FROZEN(obj)) rb_error_frozen(rb_obj_classname(obj));
}
-void Init_syserr(void)
+void
+Init_syserr()
{
- rb_eNOERROR = set_syserr(0, "NOERROR");
-#include "known_errors.inc"
+#ifdef EPERM
+ set_syserr(EPERM, "EPERM");
+#endif
+#ifdef ENOENT
+ set_syserr(ENOENT, "ENOENT");
+#endif
+#ifdef ESRCH
+ set_syserr(ESRCH, "ESRCH");
+#endif
+#ifdef EINTR
+ set_syserr(EINTR, "EINTR");
+#endif
+#ifdef EIO
+ set_syserr(EIO, "EIO");
+#endif
+#ifdef ENXIO
+ set_syserr(ENXIO, "ENXIO");
+#endif
+#ifdef E2BIG
+ set_syserr(E2BIG, "E2BIG");
+#endif
+#ifdef ENOEXEC
+ set_syserr(ENOEXEC, "ENOEXEC");
+#endif
+#ifdef EBADF
+ set_syserr(EBADF, "EBADF");
+#endif
+#ifdef ECHILD
+ set_syserr(ECHILD, "ECHILD");
+#endif
+#ifdef EAGAIN
+ set_syserr(EAGAIN, "EAGAIN");
+#endif
+#ifdef ENOMEM
+ set_syserr(ENOMEM, "ENOMEM");
+#endif
+#ifdef EACCES
+ set_syserr(EACCES, "EACCES");
+#endif
+#ifdef EFAULT
+ set_syserr(EFAULT, "EFAULT");
+#endif
+#ifdef ENOTBLK
+ set_syserr(ENOTBLK, "ENOTBLK");
+#endif
+#ifdef EBUSY
+ set_syserr(EBUSY, "EBUSY");
+#endif
+#ifdef EEXIST
+ set_syserr(EEXIST, "EEXIST");
+#endif
+#ifdef EXDEV
+ set_syserr(EXDEV, "EXDEV");
+#endif
+#ifdef ENODEV
+ set_syserr(ENODEV, "ENODEV");
+#endif
+#ifdef ENOTDIR
+ set_syserr(ENOTDIR, "ENOTDIR");
+#endif
+#ifdef EISDIR
+ set_syserr(EISDIR, "EISDIR");
+#endif
+#ifdef EINVAL
+ set_syserr(EINVAL, "EINVAL");
+#endif
+#ifdef ENFILE
+ set_syserr(ENFILE, "ENFILE");
+#endif
+#ifdef EMFILE
+ set_syserr(EMFILE, "EMFILE");
+#endif
+#ifdef ENOTTY
+ set_syserr(ENOTTY, "ENOTTY");
+#endif
+#ifdef ETXTBSY
+ set_syserr(ETXTBSY, "ETXTBSY");
+#endif
+#ifdef EFBIG
+ set_syserr(EFBIG, "EFBIG");
+#endif
+#ifdef ENOSPC
+ set_syserr(ENOSPC, "ENOSPC");
+#endif
+#ifdef ESPIPE
+ set_syserr(ESPIPE, "ESPIPE");
+#endif
+#ifdef EROFS
+ set_syserr(EROFS, "EROFS");
+#endif
+#ifdef EMLINK
+ set_syserr(EMLINK, "EMLINK");
+#endif
+#ifdef EPIPE
+ set_syserr(EPIPE, "EPIPE");
+#endif
+#ifdef EDOM
+ set_syserr(EDOM, "EDOM");
+#endif
+#ifdef ERANGE
+ set_syserr(ERANGE, "ERANGE");
+#endif
+#ifdef EDEADLK
+ set_syserr(EDEADLK, "EDEADLK");
+#endif
+#ifdef ENAMETOOLONG
+ set_syserr(ENAMETOOLONG, "ENAMETOOLONG");
+#endif
+#ifdef ENOLCK
+ set_syserr(ENOLCK, "ENOLCK");
+#endif
+#ifdef ENOSYS
+ set_syserr(ENOSYS, "ENOSYS");
+#endif
+#ifdef ENOTEMPTY
+ set_syserr(ENOTEMPTY, "ENOTEMPTY");
+#endif
+#ifdef ELOOP
+ set_syserr(ELOOP, "ELOOP");
+#endif
+#ifdef EWOULDBLOCK
+ set_syserr(EWOULDBLOCK, "EWOULDBLOCK");
+#endif
+#ifdef ENOMSG
+ set_syserr(ENOMSG, "ENOMSG");
+#endif
+#ifdef EIDRM
+ set_syserr(EIDRM, "EIDRM");
+#endif
+#ifdef ECHRNG
+ set_syserr(ECHRNG, "ECHRNG");
+#endif
+#ifdef EL2NSYNC
+ set_syserr(EL2NSYNC, "EL2NSYNC");
+#endif
+#ifdef EL3HLT
+ set_syserr(EL3HLT, "EL3HLT");
+#endif
+#ifdef EL3RST
+ set_syserr(EL3RST, "EL3RST");
+#endif
+#ifdef ELNRNG
+ set_syserr(ELNRNG, "ELNRNG");
+#endif
+#ifdef EUNATCH
+ set_syserr(EUNATCH, "EUNATCH");
+#endif
+#ifdef ENOCSI
+ set_syserr(ENOCSI, "ENOCSI");
+#endif
+#ifdef EL2HLT
+ set_syserr(EL2HLT, "EL2HLT");
+#endif
+#ifdef EBADE
+ set_syserr(EBADE, "EBADE");
+#endif
+#ifdef EBADR
+ set_syserr(EBADR, "EBADR");
+#endif
+#ifdef EXFULL
+ set_syserr(EXFULL, "EXFULL");
+#endif
+#ifdef ENOANO
+ set_syserr(ENOANO, "ENOANO");
+#endif
+#ifdef EBADRQC
+ set_syserr(EBADRQC, "EBADRQC");
+#endif
+#ifdef EBADSLT
+ set_syserr(EBADSLT, "EBADSLT");
+#endif
+#ifdef EDEADLOCK
+ set_syserr(EDEADLOCK, "EDEADLOCK");
+#endif
+#ifdef EBFONT
+ set_syserr(EBFONT, "EBFONT");
+#endif
+#ifdef ENOSTR
+ set_syserr(ENOSTR, "ENOSTR");
+#endif
+#ifdef ENODATA
+ set_syserr(ENODATA, "ENODATA");
+#endif
+#ifdef ETIME
+ set_syserr(ETIME, "ETIME");
+#endif
+#ifdef ENOSR
+ set_syserr(ENOSR, "ENOSR");
+#endif
+#ifdef ENONET
+ set_syserr(ENONET, "ENONET");
+#endif
+#ifdef ENOPKG
+ set_syserr(ENOPKG, "ENOPKG");
+#endif
+#ifdef EREMOTE
+ set_syserr(EREMOTE, "EREMOTE");
+#endif
+#ifdef ENOLINK
+ set_syserr(ENOLINK, "ENOLINK");
+#endif
+#ifdef EADV
+ set_syserr(EADV, "EADV");
+#endif
+#ifdef ESRMNT
+ set_syserr(ESRMNT, "ESRMNT");
+#endif
+#ifdef ECOMM
+ set_syserr(ECOMM, "ECOMM");
+#endif
+#ifdef EPROTO
+ set_syserr(EPROTO, "EPROTO");
+#endif
+#ifdef EMULTIHOP
+ set_syserr(EMULTIHOP, "EMULTIHOP");
+#endif
+#ifdef EDOTDOT
+ set_syserr(EDOTDOT, "EDOTDOT");
+#endif
+#ifdef EBADMSG
+ set_syserr(EBADMSG, "EBADMSG");
+#endif
+#ifdef EOVERFLOW
+ set_syserr(EOVERFLOW, "EOVERFLOW");
+#endif
+#ifdef ENOTUNIQ
+ set_syserr(ENOTUNIQ, "ENOTUNIQ");
+#endif
+#ifdef EBADFD
+ set_syserr(EBADFD, "EBADFD");
+#endif
+#ifdef EREMCHG
+ set_syserr(EREMCHG, "EREMCHG");
+#endif
+#ifdef ELIBACC
+ set_syserr(ELIBACC, "ELIBACC");
+#endif
+#ifdef ELIBBAD
+ set_syserr(ELIBBAD, "ELIBBAD");
+#endif
+#ifdef ELIBSCN
+ set_syserr(ELIBSCN, "ELIBSCN");
+#endif
+#ifdef ELIBMAX
+ set_syserr(ELIBMAX, "ELIBMAX");
+#endif
+#ifdef ELIBEXEC
+ set_syserr(ELIBEXEC, "ELIBEXEC");
+#endif
+#ifdef EILSEQ
+ set_syserr(EILSEQ, "EILSEQ");
+#endif
+#ifdef ERESTART
+ set_syserr(ERESTART, "ERESTART");
+#endif
+#ifdef ESTRPIPE
+ set_syserr(ESTRPIPE, "ESTRPIPE");
+#endif
+#ifdef EUSERS
+ set_syserr(EUSERS, "EUSERS");
+#endif
+#ifdef ENOTSOCK
+ set_syserr(ENOTSOCK, "ENOTSOCK");
+#endif
+#ifdef EDESTADDRREQ
+ set_syserr(EDESTADDRREQ, "EDESTADDRREQ");
+#endif
+#ifdef EMSGSIZE
+ set_syserr(EMSGSIZE, "EMSGSIZE");
+#endif
+#ifdef EPROTOTYPE
+ set_syserr(EPROTOTYPE, "EPROTOTYPE");
+#endif
+#ifdef ENOPROTOOPT
+ set_syserr(ENOPROTOOPT, "ENOPROTOOPT");
+#endif
+#ifdef EPROTONOSUPPORT
+ set_syserr(EPROTONOSUPPORT, "EPROTONOSUPPORT");
+#endif
+#ifdef ESOCKTNOSUPPORT
+ set_syserr(ESOCKTNOSUPPORT, "ESOCKTNOSUPPORT");
+#endif
+#ifdef EOPNOTSUPP
+ set_syserr(EOPNOTSUPP, "EOPNOTSUPP");
+#endif
+#ifdef EPFNOSUPPORT
+ set_syserr(EPFNOSUPPORT, "EPFNOSUPPORT");
+#endif
+#ifdef EAFNOSUPPORT
+ set_syserr(EAFNOSUPPORT, "EAFNOSUPPORT");
+#endif
+#ifdef EADDRINUSE
+ set_syserr(EADDRINUSE, "EADDRINUSE");
+#endif
+#ifdef EADDRNOTAVAIL
+ set_syserr(EADDRNOTAVAIL, "EADDRNOTAVAIL");
+#endif
+#ifdef ENETDOWN
+ set_syserr(ENETDOWN, "ENETDOWN");
+#endif
+#ifdef ENETUNREACH
+ set_syserr(ENETUNREACH, "ENETUNREACH");
+#endif
+#ifdef ENETRESET
+ set_syserr(ENETRESET, "ENETRESET");
+#endif
+#ifdef ECONNABORTED
+ set_syserr(ECONNABORTED, "ECONNABORTED");
+#endif
+#ifdef ECONNRESET
+ set_syserr(ECONNRESET, "ECONNRESET");
+#endif
+#ifdef ENOBUFS
+ set_syserr(ENOBUFS, "ENOBUFS");
+#endif
+#ifdef EISCONN
+ set_syserr(EISCONN, "EISCONN");
+#endif
+#ifdef ENOTCONN
+ set_syserr(ENOTCONN, "ENOTCONN");
+#endif
+#ifdef ESHUTDOWN
+ set_syserr(ESHUTDOWN, "ESHUTDOWN");
+#endif
+#ifdef ETOOMANYREFS
+ set_syserr(ETOOMANYREFS, "ETOOMANYREFS");
+#endif
+#ifdef ETIMEDOUT
+ set_syserr(ETIMEDOUT, "ETIMEDOUT");
+#endif
+#ifdef ECONNREFUSED
+ set_syserr(ECONNREFUSED, "ECONNREFUSED");
+#endif
+#ifdef EHOSTDOWN
+ set_syserr(EHOSTDOWN, "EHOSTDOWN");
+#endif
+#ifdef EHOSTUNREACH
+ set_syserr(EHOSTUNREACH, "EHOSTUNREACH");
+#endif
+#ifdef EALREADY
+ set_syserr(EALREADY, "EALREADY");
+#endif
+#ifdef EINPROGRESS
+ set_syserr(EINPROGRESS, "EINPROGRESS");
+#endif
+#ifdef ESTALE
+ set_syserr(ESTALE, "ESTALE");
+#endif
+#ifdef EUCLEAN
+ set_syserr(EUCLEAN, "EUCLEAN");
+#endif
+#ifdef ENOTNAM
+ set_syserr(ENOTNAM, "ENOTNAM");
+#endif
+#ifdef ENAVAIL
+ set_syserr(ENAVAIL, "ENAVAIL");
+#endif
+#ifdef EISNAM
+ set_syserr(EISNAM, "EISNAM");
+#endif
+#ifdef EREMOTEIO
+ set_syserr(EREMOTEIO, "EREMOTEIO");
+#endif
+#ifdef EDQUOT
+ set_syserr(EDQUOT, "EDQUOT");
+#endif
}
static void
-err_append(const char *s)
+err_append(s)
+ const char *s;
{
- rb_thread_t *th = GET_THREAD();
- VALUE err = th->errinfo;
+ extern VALUE ruby_errinfo;
- if (th->mild_compile_error) {
- if (!RTEST(err)) {
- err = rb_exc_new2(rb_eSyntaxError, s);
- th->errinfo = err;
+ if (ruby_in_eval) {
+ if (NIL_P(ruby_errinfo)) {
+ ruby_errinfo = rb_exc_new2(rb_eSyntaxError, s);
}
else {
- VALUE str = rb_obj_as_string(err);
+ VALUE str = rb_obj_as_string(ruby_errinfo);
rb_str_cat2(str, "\n");
rb_str_cat2(str, s);
- th->errinfo = rb_exc_new3(rb_eSyntaxError, str);
+ ruby_errinfo = rb_exc_new3(rb_eSyntaxError, str);
}
}
else {
- if (!RTEST(err)) {
- err = rb_exc_new2(rb_eSyntaxError, "compile error");
- th->errinfo = err;
- }
rb_write_error(s);
rb_write_error("\n");
}
diff --git a/eval.c b/eval.c
index 7ba413bd49..ff163eba6b 100644
--- a/eval.c
+++ b/eval.c
@@ -3,170 +3,1606 @@
eval.c -
$Author$
+ $Date$
created at: Thu Jun 10 14:22:17 JST 1993
- Copyright (C) 1993-2007 Yukihiro Matsumoto
+ Copyright (C) 1993-2003 Yukihiro Matsumoto
Copyright (C) 2000 Network Applied Communication Laboratory, Inc.
Copyright (C) 2000 Information-technology Promotion Agency, Japan
**********************************************************************/
-#include "eval_intern.h"
-#include "iseq.h"
-#include "gc.h"
+#include "ruby.h"
+#include "node.h"
+#include "env.h"
+#include "util.h"
+#include "rubysig.h"
-#define numberof(array) (int)(sizeof(array) / sizeof((array)[0]))
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#ifndef EXIT_SUCCESS
+#define EXIT_SUCCESS 0
+#endif
+#ifndef EXIT_FAILURE
+#define EXIT_FAILURE 1
+#endif
+
+#include <stdio.h>
+
+#include "st.h"
+#include "dln.h"
+
+#ifdef __APPLE__
+#include <crt_externs.h>
+#endif
+
+/* Make alloca work the best possible way. */
+#ifdef __GNUC__
+# ifndef atarist
+# ifndef alloca
+# define alloca __builtin_alloca
+# endif
+# endif /* atarist */
+#else
+# ifdef HAVE_ALLOCA_H
+# include <alloca.h>
+# else
+# ifndef _AIX
+# ifndef alloca /* predefined by HP cc +Olibcalls */
+void *alloca ();
+# endif
+# endif /* AIX */
+# endif /* HAVE_ALLOCA_H */
+#endif /* __GNUC__ */
+
+#ifdef HAVE_STDARG_PROTOTYPES
+#include <stdarg.h>
+#define va_init_list(a,b) va_start(a,b)
+#else
+#include <varargs.h>
+#define va_init_list(a,b) va_start(a)
+#endif
+
+#ifndef HAVE_STRING_H
+char *strrchr _((const char*,const char));
+#endif
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#ifdef __BEOS__
+#include <net/socket.h>
+#endif
+
+#ifdef __MACOS__
+#include "macruby_private.h"
+#endif
-VALUE proc_invoke(VALUE, VALUE, VALUE, VALUE);
-VALUE rb_binding_new(void);
-NORETURN(void rb_raise_jump(VALUE));
+#ifdef __VMS
+#include "vmsruby_private.h"
+#endif
+
+#ifdef USE_CONTEXT
+
+NORETURN(static void rb_jump_context(rb_jmpbuf_t, int));
+static inline void
+rb_jump_context(env, val)
+ rb_jmpbuf_t env;
+ int val;
+{
+ env->status = val;
+ setcontext(&env->context);
+ abort(); /* ensure noreturn */
+}
+/*
+ * PRE_GETCONTEXT and POST_GETCONTEXT is a magic for getcontext, gcc,
+ * IA64 register stack and SPARC register window combination problem.
+ *
+ * Assume following code sequence.
+ *
+ * 1. set a register in the register stack/window such as r32/l0.
+ * 2. call getcontext.
+ * 3. use the register.
+ * 4. update the register for other use.
+ * 5. call setcontext indirectly (or directly).
+ *
+ * This code should be run as 1->2->3->4->5->3->4.
+ * But after second getcontext return (second 3),
+ * the register is broken (updated).
+ * It's because getcontext/setcontext doesn't preserve the content of the
+ * register stack/window.
+ *
+ * setjmp also doesn't preserve the content of the register stack/window.
+ * But it has not the problem because gcc knows setjmp may return twice.
+ * gcc detects setjmp and generates setjmp safe code.
+ *
+ * So setjmp calls before and after the getcontext call makes the code
+ * somewhat safe.
+ * It fix the problem on IA64.
+ * It is not required that setjmp is called at run time, since the problem is
+ * register usage.
+ *
+ * Since the magic setjmp is not enough for SPARC,
+ * inline asm is used to prohibit registers in register windows.
+ *
+ * Since the problem is fixed at gcc 4.0.3, the magic is applied only for
+ * prior versions of gcc.
+ * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=21957
+ * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=22127
+ */
+# define GCC_VERSION_BEFORE(major, minor, patchlevel) \
+ (defined(__GNUC__) && !defined(__INTEL_COMPILER) && \
+ ((__GNUC__ < (major)) || \
+ (__GNUC__ == (major) && __GNUC_MINOR__ < (minor)) || \
+ (__GNUC__ == (major) && __GNUC_MINOR__ == (minor) && __GNUC_PATCHLEVEL__ < (patchlevel))))
+# if GCC_VERSION_BEFORE(4,0,3) && (defined(sparc) || defined(__sparc__))
+# ifdef __pic__
+/*
+ * %l7 is excluded for PIC because it is PIC register.
+ * http://lists.freebsd.org/pipermail/freebsd-sparc64/2006-January/003739.html
+ */
+# define PRE_GETCONTEXT \
+ ({ __asm__ volatile ("" : : : \
+ "%o0", "%o1", "%o2", "%o3", "%o4", "%o5", "%o7", \
+ "%l0", "%l1", "%l2", "%l3", "%l4", "%l5", "%l6", \
+ "%i0", "%i1", "%i2", "%i3", "%i4", "%i5", "%i7"); })
+# else
+# define PRE_GETCONTEXT \
+ ({ __asm__ volatile ("" : : : \
+ "%o0", "%o1", "%o2", "%o3", "%o4", "%o5", "%o7", \
+ "%l0", "%l1", "%l2", "%l3", "%l4", "%l5", "%l6", "%l7", \
+ "%i0", "%i1", "%i2", "%i3", "%i4", "%i5", "%i7"); })
+# endif
+# define POST_GETCONTEXT PRE_GETCONTEXT
+# elif GCC_VERSION_BEFORE(4,0,3) && defined(__ia64)
+static jmp_buf function_call_may_return_twice_jmp_buf;
+int function_call_may_return_twice_false_1 = 0;
+int function_call_may_return_twice_false_2 = 0;
+# define PRE_GETCONTEXT \
+ (function_call_may_return_twice_false_1 ? \
+ setjmp(function_call_may_return_twice_jmp_buf) : \
+ 0)
+# define POST_GETCONTEXT \
+ (function_call_may_return_twice_false_2 ? \
+ setjmp(function_call_may_return_twice_jmp_buf) : \
+ 0)
+# elif defined(__FreeBSD__) && __FreeBSD__ < 7
+/*
+ * workaround for FreeBSD/i386 getcontext/setcontext bug.
+ * clear the carry flag by (0 ? ... : ...).
+ * FreeBSD PR 92110 http://www.freebsd.org/cgi/query-pr.cgi?pr=92110
+ * [ruby-dev:28263]
+ */
+static int volatile freebsd_clear_carry_flag = 0;
+# define PRE_GETCONTEXT \
+ (freebsd_clear_carry_flag ? (freebsd_clear_carry_flag = 0) : 0)
+# endif
+# ifndef PRE_GETCONTEXT
+# define PRE_GETCONTEXT 0
+# endif
+# ifndef POST_GETCONTEXT
+# define POST_GETCONTEXT 0
+# endif
+# define ruby_longjmp(env, val) rb_jump_context(env, val)
+# define ruby_setjmp(just_before_setjmp, j) ((j)->status = 0, \
+ (just_before_setjmp), \
+ PRE_GETCONTEXT, \
+ getcontext(&(j)->context), \
+ POST_GETCONTEXT, \
+ (j)->status)
+#else
+# define ruby_setjmp(just_before_setjmp, env) \
+ ((just_before_setjmp), RUBY_SETJMP(env))
+# define ruby_longjmp(env,val) RUBY_LONGJMP(env,val)
+# ifdef __CYGWIN__
+int _setjmp(), _longjmp();
+# endif
+#endif
+
+#include <sys/types.h>
+#include <signal.h>
+#include <errno.h>
+
+#if defined(__VMS)
+#pragma nostandard
+#endif
+
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
+
+#include <sys/stat.h>
+
+VALUE rb_cProc;
+VALUE rb_cBinding;
+static VALUE proc_invoke _((VALUE,VALUE,VALUE,VALUE));
+static VALUE rb_f_binding _((VALUE));
+static void rb_f_END _((void));
+static VALUE rb_f_block_given_p _((void));
+static VALUE block_pass _((VALUE,NODE*));
+
+VALUE rb_cMethod;
+static VALUE method_call _((int, VALUE*, VALUE));
+VALUE rb_cUnboundMethod;
+static VALUE umethod_bind _((VALUE, VALUE));
+static VALUE rb_mod_define_method _((int, VALUE*, VALUE));
+NORETURN(static void rb_raise_jump _((VALUE)));
+static VALUE rb_make_exception _((int argc, VALUE *argv));
+
+static int scope_vmode;
+#define SCOPE_PUBLIC 0
+#define SCOPE_PRIVATE 1
+#define SCOPE_PROTECTED 2
+#define SCOPE_MODFUNC 5
+#define SCOPE_MASK 7
+#define SCOPE_SET(f) (scope_vmode=(f))
+#define SCOPE_TEST(f) (scope_vmode&(f))
+
+VALUE (*ruby_sandbox_save)_((rb_thread_t));
+VALUE (*ruby_sandbox_restore)_((rb_thread_t));
+NODE* ruby_current_node;
+int ruby_safe_level = 0;
+/* safe-level:
+ 0 - strings from streams/environment/ARGV are tainted (default)
+ 1 - no dangerous operation by tainted value
+ 2 - process/file operations prohibited
+ 3 - all generated objects are tainted
+ 4 - no global (non-tainted) variable modification/no direct output
+*/
+
+static VALUE safe_getter _((void));
+static void safe_setter _((VALUE val));
+
+void
+rb_secure(level)
+ int level;
+{
+ if (level <= ruby_safe_level) {
+ if (ruby_frame->last_func) {
+ rb_raise(rb_eSecurityError, "Insecure operation `%s' at level %d",
+ rb_id2name(ruby_frame->last_func), ruby_safe_level);
+ }
+ else {
+ rb_raise(rb_eSecurityError, "Insecure operation at level %d", ruby_safe_level);
+ }
+ }
+}
+
+void
+rb_secure_update(obj)
+ VALUE obj;
+{
+ if (!OBJ_TAINTED(obj)) rb_secure(4);
+}
+
+void
+rb_check_safe_obj(x)
+ VALUE x;
+{
+ if (ruby_safe_level > 0 && OBJ_TAINTED(x)){
+ if (ruby_frame->last_func) {
+ rb_raise(rb_eSecurityError, "Insecure operation - %s",
+ rb_id2name(ruby_frame->last_func));
+ }
+ else {
+ rb_raise(rb_eSecurityError, "Insecure operation: -r");
+ }
+ }
+ rb_secure(4);
+}
+
+void
+rb_check_safe_str(x)
+ VALUE x;
+{
+ rb_check_safe_obj(x);
+ if (TYPE(x)!= T_STRING) {
+ rb_raise(rb_eTypeError, "wrong argument type %s (expected String)",
+ rb_obj_classname(x));
+ }
+}
+
+NORETURN(static void print_undef _((VALUE, ID)));
+static void
+print_undef(klass, id)
+ VALUE klass;
+ ID id;
+{
+ rb_name_error(id, "undefined method `%s' for %s `%s'",
+ rb_id2name(id),
+ (TYPE(klass) == T_MODULE) ? "module" : "class",
+ rb_class2name(klass));
+}
+
+static ID removed, singleton_removed, undefined, singleton_undefined;
+
+#define CACHE_SIZE 0x800
+#define CACHE_MASK 0x7ff
+#define EXPR1(c,m) ((((c)>>3)^(m))&CACHE_MASK)
+
+struct cache_entry { /* method hash table. */
+ ID mid; /* method's id */
+ ID mid0; /* method's original id */
+ VALUE klass; /* receiver's class */
+ VALUE origin; /* where method defined */
+ NODE *method;
+ int noex;
+};
+
+static struct cache_entry cache[CACHE_SIZE];
+static int ruby_running = 0;
+
+void
+rb_clear_cache()
+{
+ struct cache_entry *ent, *end;
+
+ if (!ruby_running) return;
+ ent = cache; end = ent + CACHE_SIZE;
+ while (ent < end) {
+ ent->mid = 0;
+ ent++;
+ }
+}
+
+static void
+rb_clear_cache_for_undef(klass, id)
+ VALUE klass;
+ ID id;
+{
+ struct cache_entry *ent, *end;
+
+ if (!ruby_running) return;
+ ent = cache; end = ent + CACHE_SIZE;
+ while (ent < end) {
+ if (ent->mid == id &&
+ RCLASS(ent->origin)->m_tbl == RCLASS(klass)->m_tbl) {
+ ent->mid = 0;
+ }
+ ent++;
+ }
+}
+
+static void
+rb_clear_cache_by_id(id)
+ ID id;
+{
+ struct cache_entry *ent, *end;
+
+ if (!ruby_running) return;
+ ent = cache; end = ent + CACHE_SIZE;
+ while (ent < end) {
+ if (ent->mid == id) {
+ ent->mid = 0;
+ }
+ ent++;
+ }
+}
+
+void
+rb_clear_cache_by_class(klass)
+ VALUE klass;
+{
+ struct cache_entry *ent, *end;
+
+ if (!ruby_running) return;
+ ent = cache; end = ent + CACHE_SIZE;
+ while (ent < end) {
+ if (ent->klass == klass || ent->origin == klass) {
+ ent->mid = 0;
+ }
+ ent++;
+ }
+}
+
+static ID init, eqq, each, aref, aset, match, missing;
+static ID added, singleton_added;
+static ID __id__, __send__, respond_to;
+
+#define NOEX_TAINTED 8
+#define NOEX_SAFE(n) ((n) >> 4)
+#define NOEX_WITH(n, v) ((n) | (v) << 4)
+#define NOEX_WITH_SAFE(n) NOEX_WITH(n, ruby_safe_level)
+
+void
+rb_add_method(klass, mid, node, noex)
+ VALUE klass;
+ ID mid;
+ NODE *node;
+ int noex;
+{
+ NODE *body;
+
+ if (NIL_P(klass)) klass = rb_cObject;
+ if (ruby_safe_level >= 4 && (klass == rb_cObject || !OBJ_TAINTED(klass))) {
+ rb_raise(rb_eSecurityError, "Insecure: can't define method");
+ }
+ if (!FL_TEST(klass, FL_SINGLETON) &&
+ node && nd_type(node) != NODE_ZSUPER &&
+ (mid == rb_intern("initialize" )|| mid == rb_intern("initialize_copy"))) {
+ noex = NOEX_PRIVATE | noex;
+ }
+ else if (FL_TEST(klass, FL_SINGLETON) && node && nd_type(node) == NODE_CFUNC &&
+ mid == rb_intern("allocate")) {
+ rb_warn("defining %s.allocate is deprecated; use rb_define_alloc_func()",
+ rb_class2name(rb_iv_get(klass, "__attached__")));
+ mid = ID_ALLOCATOR;
+ }
+ if (OBJ_FROZEN(klass)) rb_error_frozen("class/module");
+ rb_clear_cache_by_id(mid);
+ body = NEW_METHOD(node, NOEX_WITH_SAFE(noex));
+ st_insert(RCLASS(klass)->m_tbl, mid, (st_data_t)body);
+ if (node && mid != ID_ALLOCATOR && ruby_running) {
+ if (FL_TEST(klass, FL_SINGLETON)) {
+ rb_funcall(rb_iv_get(klass, "__attached__"), singleton_added, 1, ID2SYM(mid));
+ }
+ else {
+ rb_funcall(klass, added, 1, ID2SYM(mid));
+ }
+ }
+}
+
+void
+rb_define_alloc_func(klass, func)
+ VALUE klass;
+ VALUE (*func) _((VALUE));
+{
+ Check_Type(klass, T_CLASS);
+ rb_add_method(rb_singleton_class(klass), ID_ALLOCATOR, NEW_CFUNC(func, 0),
+ NOEX_PRIVATE);
+}
+
+void
+rb_undef_alloc_func(klass)
+ VALUE klass;
+{
+ Check_Type(klass, T_CLASS);
+ rb_add_method(rb_singleton_class(klass), ID_ALLOCATOR, 0, NOEX_UNDEF);
+}
+
+static NODE*
+search_method(klass, id, origin)
+ VALUE klass, *origin;
+ ID id;
+{
+ st_data_t body;
+
+ if (!klass) return 0;
+ while (!st_lookup(RCLASS(klass)->m_tbl, id, &body)) {
+ klass = RCLASS(klass)->super;
+ if (!klass) return 0;
+ }
+
+ if (origin) *origin = klass;
+ return (NODE *)body;
+}
+
+static NODE*
+rb_get_method_body(klassp, idp, noexp)
+ VALUE *klassp;
+ ID *idp;
+ int *noexp;
+{
+ ID id = *idp;
+ VALUE klass = *klassp;
+ VALUE origin = 0;
+ NODE * volatile body;
+ struct cache_entry *ent;
+
+ if ((body = search_method(klass, id, &origin)) == 0 || !body->nd_body) {
+ /* store empty info in cache */
+ ent = cache + EXPR1(klass, id);
+ ent->klass = klass;
+ ent->origin = klass;
+ ent->mid = ent->mid0 = id;
+ ent->noex = 0;
+ ent->method = 0;
+
+ return 0;
+ }
+
+ if (ruby_running) {
+ /* store in cache */
+ ent = cache + EXPR1(klass, id);
+ ent->klass = klass;
+ ent->noex = body->nd_noex;
+ if (noexp) *noexp = body->nd_noex;
+ body = body->nd_body;
+ if (nd_type(body) == NODE_FBODY) {
+ ent->mid = id;
+ *klassp = body->nd_orig;
+ ent->origin = body->nd_orig;
+ *idp = ent->mid0 = body->nd_mid;
+ body = ent->method = body->nd_head;
+ }
+ else {
+ *klassp = origin;
+ ent->origin = origin;
+ ent->mid = ent->mid0 = id;
+ ent->method = body;
+ }
+ }
+ else {
+ if (noexp) *noexp = body->nd_noex;
+ body = body->nd_body;
+ if (nd_type(body) == NODE_FBODY) {
+ *klassp = body->nd_orig;
+ *idp = body->nd_mid;
+ body = body->nd_head;
+ }
+ else {
+ *klassp = origin;
+ }
+ }
+
+ return body;
+}
+
+NODE*
+rb_method_node(klass, id)
+ VALUE klass;
+ ID id;
+{
+ int noex;
+
+ return rb_get_method_body(&klass, &id, &noex);
+}
+
+static void
+remove_method(klass, mid)
+ VALUE klass;
+ ID mid;
+{
+ st_data_t data;
+ NODE *body = 0;
+
+ if (klass == rb_cObject) {
+ rb_secure(4);
+ }
+ if (ruby_safe_level >= 4 && !OBJ_TAINTED(klass)) {
+ rb_raise(rb_eSecurityError, "Insecure: can't remove method");
+ }
+ if (OBJ_FROZEN(klass)) rb_error_frozen("class/module");
+ if (mid == __id__ || mid == __send__ || mid == init) {
+ rb_warn("removing `%s' may cause serious problem", rb_id2name(mid));
+ }
+ if (st_lookup(RCLASS(klass)->m_tbl, mid, &data)) {
+ body = (NODE *)data;
+ if (!body || !body->nd_body) body = 0;
+ else {
+ st_delete(RCLASS(klass)->m_tbl, &mid, &data);
+ }
+ }
+ if (!body) {
+ rb_name_error(mid, "method `%s' not defined in %s",
+ rb_id2name(mid), rb_class2name(klass));
+ }
+ rb_clear_cache_for_undef(klass, mid);
+ if (FL_TEST(klass, FL_SINGLETON)) {
+ rb_funcall(rb_iv_get(klass, "__attached__"), singleton_removed, 1, ID2SYM(mid));
+ }
+ else {
+ rb_funcall(klass, removed, 1, ID2SYM(mid));
+ }
+}
+
+void
+rb_remove_method(klass, name)
+ VALUE klass;
+ const char *name;
+{
+ remove_method(klass, rb_intern(name));
+}
+
+/*
+ * call-seq:
+ * remove_method(symbol) => self
+ *
+ * Removes the method identified by _symbol_ from the current
+ * class. For an example, see <code>Module.undef_method</code>.
+ */
+
+static VALUE
+rb_mod_remove_method(argc, argv, mod)
+ int argc;
+ VALUE *argv;
+ VALUE mod;
+{
+ int i;
+
+ for (i=0; i<argc; i++) {
+ remove_method(mod, rb_to_id(argv[i]));
+ }
+ return mod;
+}
+
+#undef rb_disable_super
+#undef rb_enable_super
+
+void
+rb_disable_super(klass, name)
+ VALUE klass;
+ const char *name;
+{
+ /* obsolete - no use */
+}
+
+void
+rb_enable_super(klass, name)
+ VALUE klass;
+ const char *name;
+{
+ rb_warn("rb_enable_super() is obsolete");
+}
+
+static void
+rb_export_method(klass, name, noex)
+ VALUE klass;
+ ID name;
+ ID noex;
+{
+ NODE *body;
+ VALUE origin;
+
+ if (klass == rb_cObject) {
+ rb_secure(4);
+ }
+ body = search_method(klass, name, &origin);
+ if (!body && TYPE(klass) == T_MODULE) {
+ body = search_method(rb_cObject, name, &origin);
+ }
+ if (!body || !body->nd_body) {
+ print_undef(klass, name);
+ }
+ if (body->nd_noex != noex) {
+ if (klass == origin) {
+ body->nd_noex = noex;
+ }
+ else {
+ rb_add_method(klass, name, NEW_ZSUPER(), noex);
+ }
+ }
+}
+
+int
+rb_method_boundp(klass, id, ex)
+ VALUE klass;
+ ID id;
+ int ex;
+{
+ struct cache_entry *ent;
+ int noex;
+
+ /* is it in the method cache? */
+ ent = cache + EXPR1(klass, id);
+ if (ent->mid == id && ent->klass == klass) {
+ if (ex && (ent->noex & NOEX_PRIVATE))
+ return Qfalse;
+ if (!ent->method) return Qfalse;
+ return Qtrue;
+ }
+ if (rb_get_method_body(&klass, &id, &noex)) {
+ if (ex && (noex & NOEX_PRIVATE))
+ return Qfalse;
+ return Qtrue;
+ }
+ return Qfalse;
+}
+
+void
+rb_attr(klass, id, read, write, ex)
+ VALUE klass;
+ ID id;
+ int read, write, ex;
+{
+ const char *name;
+ char *buf;
+ ID attriv;
+ int noex;
+ size_t len;
+
+ if (!ex) noex = NOEX_PUBLIC;
+ else {
+ if (SCOPE_TEST(SCOPE_PRIVATE)) {
+ noex = NOEX_PRIVATE;
+ rb_warning((scope_vmode == SCOPE_MODFUNC) ?
+ "attribute accessor as module_function" :
+ "private attribute?");
+ }
+ else if (SCOPE_TEST(SCOPE_PROTECTED)) {
+ noex = NOEX_PROTECTED;
+ }
+ else {
+ noex = NOEX_PUBLIC;
+ }
+ }
+
+ if (!rb_is_local_id(id) && !rb_is_const_id(id)) {
+ rb_name_error(id, "invalid attribute name `%s'", rb_id2name(id));
+ }
+ name = rb_id2name(id);
+ if (!name) {
+ rb_raise(rb_eArgError, "argument needs to be symbol or string");
+ }
+ len = strlen(name)+2;
+ buf = ALLOCA_N(char,len);
+ snprintf(buf, len, "@%s", name);
+ attriv = rb_intern(buf);
+ if (read) {
+ rb_add_method(klass, id, NEW_IVAR(attriv), noex);
+ }
+ if (write) {
+ rb_add_method(klass, rb_id_attrset(id), NEW_ATTRSET(attriv), noex);
+ }
+}
+
+extern int ruby_in_compile;
+
+VALUE ruby_errinfo = Qnil;
+extern NODE *ruby_eval_tree_begin;
+extern NODE *ruby_eval_tree;
+extern int ruby_nerrs;
-ID rb_frame_callee(void);
VALUE rb_eLocalJumpError;
VALUE rb_eSysStackError;
-#define exception_error GET_VM()->special_exceptions[ruby_error_reenter]
+extern VALUE ruby_top_self;
+
+struct FRAME *ruby_frame;
+struct SCOPE *ruby_scope;
+static struct FRAME *top_frame;
+static struct SCOPE *top_scope;
+
+static unsigned long frame_unique = 0;
+
+#define PUSH_FRAME() do { \
+ volatile struct FRAME _frame; \
+ _frame.prev = ruby_frame; \
+ _frame.tmp = 0; \
+ _frame.node = ruby_current_node; \
+ _frame.iter = ruby_iter->iter; \
+ _frame.argc = 0; \
+ _frame.flags = 0; \
+ _frame.uniq = frame_unique++; \
+ ruby_frame = &_frame
+
+#define POP_FRAME() \
+ ruby_current_node = _frame.node; \
+ ruby_frame = _frame.prev; \
+} while (0)
+
+struct BLOCK {
+ NODE *var;
+ NODE *body;
+ VALUE self;
+ struct FRAME frame;
+ struct SCOPE *scope;
+ VALUE klass;
+ NODE *cref;
+ int iter;
+ int vmode;
+ int flags;
+ int uniq;
+ struct RVarmap *dyna_vars;
+ VALUE orig_thread;
+ VALUE wrapper;
+ VALUE block_obj;
+ struct BLOCK *outer;
+ struct BLOCK *prev;
+};
+
+#define BLOCK_D_SCOPE 1
+#define BLOCK_LAMBDA 2
+
+static struct BLOCK *ruby_block;
+static unsigned long block_unique = 1;
+
+#define PUSH_BLOCK(v,b) do { \
+ struct BLOCK _block; \
+ _block.var = (v); \
+ _block.body = (b); \
+ _block.self = self; \
+ _block.frame = *ruby_frame; \
+ _block.klass = ruby_class; \
+ _block.cref = ruby_cref; \
+ _block.frame.node = ruby_current_node;\
+ _block.scope = ruby_scope; \
+ _block.prev = ruby_block; \
+ _block.outer = ruby_block; \
+ _block.iter = ruby_iter->iter; \
+ _block.vmode = scope_vmode; \
+ _block.flags = BLOCK_D_SCOPE; \
+ _block.dyna_vars = ruby_dyna_vars; \
+ _block.wrapper = ruby_wrapper; \
+ _block.block_obj = 0; \
+ _block.uniq = (b)?block_unique++:0; \
+ if (b) { \
+ prot_tag->blkid = _block.uniq; \
+ } \
+ ruby_block = &_block
+
+#define POP_BLOCK() \
+ ruby_block = _block.prev; \
+} while (0)
+
+struct RVarmap *ruby_dyna_vars;
+#define PUSH_VARS() do { \
+ struct RVarmap * volatile _old; \
+ _old = ruby_dyna_vars; \
+ ruby_dyna_vars = 0
+
+#define POP_VARS() \
+ if (_old && (ruby_scope->flags & SCOPE_DONT_RECYCLE)) {\
+ if (RBASIC(_old)->flags) /* unless it's already recycled */ \
+ FL_SET(_old, DVAR_DONT_RECYCLE); \
+ }\
+ ruby_dyna_vars = _old; \
+} while (0)
+
+#define DVAR_DONT_RECYCLE FL_USER2
+
+#define DMETHOD_P() (ruby_frame->flags & FRAME_DMETH)
+
+static struct RVarmap*
+new_dvar(id, value, prev)
+ ID id;
+ VALUE value;
+ struct RVarmap *prev;
+{
+ NEWOBJ(vars, struct RVarmap);
+ OBJSETUP(vars, 0, T_VARMAP);
+ vars->id = id;
+ vars->val = value;
+ vars->next = prev;
-#include "eval_error.c"
-#include "eval_jump.c"
+ return vars;
+}
-/* initialize ruby */
+VALUE
+rb_dvar_defined(id)
+ ID id;
+{
+ struct RVarmap *vars = ruby_dyna_vars;
+
+ while (vars) {
+ if (vars->id == id) return Qtrue;
+ vars = vars->next;
+ }
+ return Qfalse;
+}
+
+VALUE
+rb_dvar_curr(id)
+ ID id;
+{
+ struct RVarmap *vars = ruby_dyna_vars;
+
+ while (vars) {
+ if (vars->id == 0) break;
+ if (vars->id == id) return Qtrue;
+ vars = vars->next;
+ }
+ return Qfalse;
+}
+
+VALUE
+rb_dvar_ref(id)
+ ID id;
+{
+ struct RVarmap *vars = ruby_dyna_vars;
+
+ while (vars) {
+ if (vars->id == id) {
+ return vars->val;
+ }
+ vars = vars->next;
+ }
+ return Qnil;
+}
+
+void
+rb_dvar_push(id, value)
+ ID id;
+ VALUE value;
+{
+ ruby_dyna_vars = new_dvar(id, value, ruby_dyna_vars);
+}
+
+static void
+dvar_asgn_internal(id, value, curr)
+ ID id;
+ VALUE value;
+ int curr;
+{
+ int n = 0;
+ struct RVarmap *vars = ruby_dyna_vars;
+
+ while (vars) {
+ if (curr && vars->id == 0) {
+ /* first null is a dvar header */
+ n++;
+ if (n == 2) break;
+ }
+ if (vars->id == id) {
+ vars->val = value;
+ return;
+ }
+ vars = vars->next;
+ }
+ if (!ruby_dyna_vars) {
+ ruby_dyna_vars = new_dvar(id, value, 0);
+ }
+ else {
+ vars = new_dvar(id, value, ruby_dyna_vars->next);
+ ruby_dyna_vars->next = vars;
+ }
+}
+
+static inline void
+dvar_asgn(id, value)
+ ID id;
+ VALUE value;
+{
+ dvar_asgn_internal(id, value, 0);
+}
+
+static inline void
+dvar_asgn_curr(id, value)
+ ID id;
+ VALUE value;
+{
+ dvar_asgn_internal(id, value, 1);
+}
+
+VALUE *
+rb_svar(cnt)
+ int cnt;
+{
+ struct RVarmap *vars = ruby_dyna_vars;
+ ID id;
+
+ if (!ruby_scope->local_tbl) return NULL;
+ if (cnt >= ruby_scope->local_tbl[0]) return NULL;
+ id = ruby_scope->local_tbl[cnt+1];
+ while (vars) {
+ if (vars->id == id) return &vars->val;
+ vars = vars->next;
+ }
+ if (ruby_scope->local_vars == 0) return NULL;
+ return &ruby_scope->local_vars[cnt];
+}
+
+struct iter {
+ int iter;
+ struct iter *prev;
+};
+static struct iter *ruby_iter;
+
+#define ITER_NOT 0
+#define ITER_PRE 1
+#define ITER_CUR 2
+#define ITER_PAS 3
+
+#define PUSH_ITER(i) do { \
+ struct iter _iter; \
+ _iter.prev = ruby_iter; \
+ _iter.iter = (i); \
+ ruby_iter = &_iter
+
+#define POP_ITER() \
+ ruby_iter = _iter.prev; \
+} while (0)
+
+struct tag {
+ rb_jmpbuf_t buf;
+ struct FRAME *frame;
+ struct iter *iter;
+ VALUE tag;
+ VALUE retval;
+ struct SCOPE *scope;
+ VALUE dst;
+ struct tag *prev;
+ int blkid;
+};
+static struct tag *prot_tag;
+
+#define PUSH_TAG(ptag) do { \
+ struct tag _tag; \
+ _tag.retval = Qnil; \
+ _tag.frame = ruby_frame; \
+ _tag.iter = ruby_iter; \
+ _tag.prev = prot_tag; \
+ _tag.scope = ruby_scope; \
+ _tag.tag = ptag; \
+ _tag.dst = 0; \
+ _tag.blkid = 0; \
+ prot_tag = &_tag
+
+#define PROT_NONE Qfalse /* 0 */
+#define PROT_THREAD Qtrue /* 2 */
+#define PROT_FUNC INT2FIX(0) /* 1 */
+#define PROT_LOOP INT2FIX(1) /* 3 */
+#define PROT_LAMBDA INT2FIX(2) /* 5 */
+#define PROT_YIELD INT2FIX(3) /* 7 */
+
+#define EXEC_TAG() ruby_setjmp(((void)0), prot_tag->buf)
+
+#define JUMP_TAG(st) do { \
+ ruby_frame = prot_tag->frame; \
+ ruby_iter = prot_tag->iter; \
+ ruby_longjmp(prot_tag->buf,(st)); \
+} while (0)
+
+#define POP_TAG() \
+ prot_tag = _tag.prev; \
+} while (0)
+
+#define TAG_DST() (_tag.dst == (VALUE)ruby_frame->uniq)
+
+#define TAG_RETURN 0x1
+#define TAG_BREAK 0x2
+#define TAG_NEXT 0x3
+#define TAG_RETRY 0x4
+#define TAG_REDO 0x5
+#define TAG_RAISE 0x6
+#define TAG_THROW 0x7
+#define TAG_FATAL 0x8
+#define TAG_MASK 0xf
+
+VALUE ruby_class;
+static VALUE ruby_wrapper; /* security wrapper */
+
+#define PUSH_CLASS(c) do { \
+ volatile VALUE _class = ruby_class; \
+ ruby_class = (c)
+
+#define POP_CLASS() ruby_class = _class; \
+} while (0)
+
+NODE *ruby_cref = 0;
+NODE *ruby_top_cref;
+#define PUSH_CREF(c) ruby_cref = NEW_NODE(NODE_CREF,(c),0,ruby_cref)
+#define POP_CREF() ruby_cref = ruby_cref->nd_next
+
+#define PUSH_SCOPE() do { \
+ volatile int _vmode = scope_vmode; \
+ struct SCOPE * volatile _old; \
+ NEWOBJ(_scope, struct SCOPE); \
+ OBJSETUP(_scope, 0, T_SCOPE); \
+ _scope->local_tbl = 0; \
+ _scope->local_vars = 0; \
+ _scope->flags = 0; \
+ _old = ruby_scope; \
+ ruby_scope = _scope; \
+ scope_vmode = SCOPE_PUBLIC
+
+rb_thread_t rb_curr_thread;
+rb_thread_t rb_main_thread;
+#define main_thread rb_main_thread
+#define curr_thread rb_curr_thread
+
+static void scope_dup _((struct SCOPE *));
+
+#define POP_SCOPE() \
+ if (ruby_scope->flags & SCOPE_DONT_RECYCLE) {\
+ if (_old) scope_dup(_old); \
+ } \
+ if (!(ruby_scope->flags & SCOPE_MALLOC)) {\
+ ruby_scope->local_vars = 0; \
+ ruby_scope->local_tbl = 0; \
+ if (!(ruby_scope->flags & SCOPE_DONT_RECYCLE) && \
+ ruby_scope != top_scope) { \
+ rb_gc_force_recycle((VALUE)ruby_scope);\
+ } \
+ } \
+ ruby_scope->flags |= SCOPE_NOSTACK; \
+ ruby_scope = _old; \
+ scope_vmode = _vmode; \
+} while (0)
+
+static VALUE rb_eval _((VALUE,NODE*));
+static VALUE eval _((VALUE,VALUE,VALUE,const char*,int));
+static NODE *compile _((VALUE, const char*, int));
+
+static VALUE rb_yield_0 _((VALUE, VALUE, VALUE, int, int));
+
+#define YIELD_LAMBDA_CALL 1
+#define YIELD_PROC_CALL 2
+#define YIELD_PUBLIC_DEF 4
+#define YIELD_FUNC_AVALUE 1
+#define YIELD_FUNC_SVALUE 2
+#define YIELD_FUNC_LAMBDA 3
+
+static VALUE rb_call _((VALUE,VALUE,ID,int,const VALUE*,int,VALUE));
+static VALUE module_setup _((VALUE,NODE*));
+
+static VALUE massign _((VALUE,NODE*,VALUE,int));
+static void assign _((VALUE,NODE*,VALUE,int));
+
+typedef struct event_hook {
+ rb_event_hook_func_t func;
+ rb_event_t events;
+ struct event_hook *next;
+} rb_event_hook_t;
+
+static rb_event_hook_t *event_hooks;
+
+#define EXEC_EVENT_HOOK(event, node, self, id, klass) \
+ do { \
+ rb_event_hook_t *hook = event_hooks; \
+ rb_event_hook_func_t hook_func; \
+ rb_event_t events; \
+ \
+ while (hook) { \
+ hook_func = hook->func; \
+ events = hook->events; \
+ hook = hook->next; \
+ if (events & event) \
+ (*hook_func)(event, node, self, id, klass); \
+ } \
+ } while (0)
+
+static VALUE trace_func = 0;
+static int tracing = 0;
+static void call_trace_func _((rb_event_t,NODE*,VALUE,ID,VALUE));
+
+#if 0
+#define SET_CURRENT_SOURCE() (ruby_sourcefile = ruby_current_node->nd_file, \
+ ruby_sourceline = nd_line(ruby_current_node))
+#else
+#define SET_CURRENT_SOURCE() ((void)0)
+#endif
+
+void
+ruby_set_current_source()
+{
+ if (ruby_current_node) {
+ ruby_sourcefile = ruby_current_node->nd_file;
+ ruby_sourceline = nd_line(ruby_current_node);
+ }
+}
+
+static void
+#ifdef HAVE_STDARG_PROTOTYPES
+warn_printf(const char *fmt, ...)
+#else
+warn_printf(fmt, va_alist)
+ const char *fmt;
+ va_dcl
+#endif
+{
+ char buf[BUFSIZ];
+ va_list args;
+
+ va_init_list(args, fmt);
+ vsnprintf(buf, BUFSIZ, fmt, args);
+ va_end(args);
+ rb_write_error(buf);
+}
+
+#define warn_print(x) rb_write_error(x)
+#define warn_print2(x,l) rb_write_error2(x,l)
+
+static void
+error_pos()
+{
+ ruby_set_current_source();
+ if (ruby_sourcefile) {
+ if (ruby_frame->last_func) {
+ warn_printf("%s:%d:in `%s'", ruby_sourcefile, ruby_sourceline,
+ rb_id2name(ruby_frame->orig_func));
+ }
+ else if (ruby_sourceline == 0) {
+ warn_printf("%s", ruby_sourcefile);
+ }
+ else {
+ warn_printf("%s:%d", ruby_sourcefile, ruby_sourceline);
+ }
+ }
+}
+
+VALUE rb_check_backtrace(VALUE);
+
+static VALUE
+get_backtrace(info)
+ VALUE info;
+{
+ if (NIL_P(info)) return Qnil;
+ info = rb_funcall(info, rb_intern("backtrace"), 0);
+ if (NIL_P(info)) return Qnil;
+ return rb_check_backtrace(info);
+}
+
+static void
+set_backtrace(info, bt)
+ VALUE info, bt;
+{
+ rb_funcall(info, rb_intern("set_backtrace"), 1, bt);
+}
+
+static void
+error_print()
+{
+ VALUE errat = Qnil; /* OK */
+ volatile VALUE eclass, e;
+ const char *einfo;
+ long elen;
+
+ if (NIL_P(ruby_errinfo)) return;
+
+ PUSH_TAG(PROT_NONE);
+ if (EXEC_TAG() == 0) {
+ errat = get_backtrace(ruby_errinfo);
+ }
+ else {
+ errat = Qnil;
+ }
+ if (EXEC_TAG()) goto error;
+ if (NIL_P(errat)){
+ ruby_set_current_source();
+ if (ruby_sourcefile)
+ warn_printf("%s:%d", ruby_sourcefile, ruby_sourceline);
+ else
+ warn_printf("%d", ruby_sourceline);
+ }
+ else if (RARRAY(errat)->len == 0) {
+ error_pos();
+ }
+ else {
+ VALUE mesg = RARRAY(errat)->ptr[0];
+
+ if (NIL_P(mesg)) error_pos();
+ else {
+ warn_print2(RSTRING(mesg)->ptr, RSTRING(mesg)->len);
+ }
+ }
+
+ eclass = CLASS_OF(ruby_errinfo);
+ if (EXEC_TAG() == 0) {
+ e = rb_funcall(ruby_errinfo, rb_intern("message"), 0, 0);
+ StringValue(e);
+ einfo = RSTRING(e)->ptr;
+ elen = RSTRING(e)->len;
+ }
+ else {
+ einfo = "";
+ elen = 0;
+ }
+ if (EXEC_TAG()) goto error;
+ if (eclass == rb_eRuntimeError && elen == 0) {
+ warn_print(": unhandled exception\n");
+ }
+ else {
+ VALUE epath;
+
+ epath = rb_class_name(eclass);
+ if (elen == 0) {
+ warn_print(": ");
+ warn_print2(RSTRING(epath)->ptr, RSTRING(epath)->len);
+ warn_print("\n");
+ }
+ else {
+ char *tail = 0;
+ long len = elen;
+
+ if (RSTRING(epath)->ptr[0] == '#') epath = 0;
+ if ((tail = memchr(einfo, '\n', elen)) != 0) {
+ len = tail - einfo;
+ tail++; /* skip newline */
+ }
+ warn_print(": ");
+ warn_print2(einfo, len);
+ if (epath) {
+ warn_print(" (");
+ warn_print2(RSTRING(epath)->ptr, RSTRING(epath)->len);
+ warn_print(")\n");
+ }
+ if (tail && elen>len+1) {
+ warn_print2(tail, elen-len-1);
+ if (einfo[elen-1] != '\n') warn_print2("\n", 1);
+ }
+ }
+ }
+
+ if (!NIL_P(errat)) {
+ long i;
+ struct RArray *ep = RARRAY(errat);
+ int truncate = eclass == rb_eSysStackError;
+
+#define TRACE_MAX (TRACE_HEAD+TRACE_TAIL+5)
+#define TRACE_HEAD 8
+#define TRACE_TAIL 5
+
+ ep = RARRAY(errat);
+ for (i=1; i<ep->len; i++) {
+ if (TYPE(ep->ptr[i]) == T_STRING) {
+ warn_printf("\tfrom %s\n", RSTRING(ep->ptr[i])->ptr);
+ }
+ if (truncate && i == TRACE_HEAD && ep->len > TRACE_MAX) {
+ warn_printf("\t ... %ld levels...\n",
+ ep->len - TRACE_HEAD - TRACE_TAIL);
+ i = ep->len - TRACE_TAIL;
+ }
+ }
+ }
+ error:
+ POP_TAG();
+}
#if defined(__APPLE__)
#define environ (*_NSGetEnviron())
-#elif !defined(_WIN32)
+#elif !defined(_WIN32) && !defined(__MACOS__) || defined(_WIN32_WCE)
extern char **environ;
#endif
char **rb_origenviron;
-void rb_clear_trace_func(void);
-void rb_thread_stop_timer_thread(void);
+void rb_call_inits _((void));
+void Init_stack _((VALUE*));
+void Init_heap _((void));
+void Init_ext _((void));
+
+#ifdef HAVE_NATIVETHREAD
+static rb_nativethread_t ruby_thid;
+int
+is_ruby_native_thread() {
+ return NATIVETHREAD_EQUAL(ruby_thid, NATIVETHREAD_CURRENT());
+}
-void rb_call_inits(void);
-void Init_heap(void);
-void Init_BareVM(void);
+# ifdef HAVE_NATIVETHREAD_KILL
+void
+ruby_native_thread_kill(sig)
+ int sig;
+{
+ NATIVETHREAD_KILL(ruby_thid, sig);
+}
+# endif
+#endif
void
-ruby_init(void)
+ruby_init()
{
static int initialized = 0;
+ static struct FRAME frame;
+ static struct iter iter;
int state;
if (initialized)
return;
initialized = 1;
+#ifdef HAVE_NATIVETHREAD
+ ruby_thid = NATIVETHREAD_CURRENT();
+#endif
+
+ ruby_frame = top_frame = &frame;
+ ruby_iter = &iter;
+#ifdef __MACOS__
+ rb_origenviron = 0;
+#else
rb_origenviron = environ;
+#endif
- ruby_init_stack((void *)&state);
- Init_BareVM();
+ Init_stack((void*)&state);
Init_heap();
-
- PUSH_TAG();
+ PUSH_SCOPE();
+ ruby_scope->local_vars = 0;
+ ruby_scope->local_tbl = 0;
+ top_scope = ruby_scope;
+ /* default visibility is private at toplevel */
+ SCOPE_SET(SCOPE_PRIVATE);
+
+ PUSH_TAG(PROT_NONE);
if ((state = EXEC_TAG()) == 0) {
rb_call_inits();
+ ruby_class = rb_cObject;
+ ruby_frame->self = ruby_top_self;
+ ruby_top_cref = rb_node_newnode(NODE_CREF,rb_cObject,0,0);
+ ruby_cref = ruby_top_cref;
+ rb_define_global_const("TOPLEVEL_BINDING", rb_f_binding(ruby_top_self));
+#ifdef __MACOS__
+ _macruby_init();
+#elif defined(__VMS)
+ _vmsruby_init();
+#endif
ruby_prog_init();
+ ALLOW_INTS;
}
POP_TAG();
-
if (state) {
error_print();
exit(EXIT_FAILURE);
}
- GET_VM()->running = 1;
+ POP_SCOPE();
+ ruby_scope = top_scope;
+ top_scope->flags &= ~SCOPE_NOSTACK;
+ ruby_running = 1;
}
-extern void rb_clear_trace_func(void);
+static VALUE
+eval_node(self, node)
+ VALUE self;
+ NODE *node;
+{
+ NODE *beg_tree = ruby_eval_tree_begin;
+
+ ruby_eval_tree_begin = 0;
+ if (beg_tree) {
+ rb_eval(self, beg_tree);
+ }
+
+ if (!node) return Qnil;
+ return rb_eval(self, node);
+}
+
+int ruby_in_eval;
+
+static void rb_thread_cleanup _((void));
+static void rb_thread_wait_other_threads _((void));
+
+static int thread_set_raised();
+static int thread_reset_raised();
+
+static int thread_no_ensure _((void));
+
+static VALUE exception_error;
+static VALUE sysstack_error;
+
+static int
+sysexit_status(err)
+ VALUE err;
+{
+ VALUE st = rb_iv_get(err, "status");
+ return NUM2INT(st);
+}
+
+static int
+error_handle(ex)
+ int ex;
+{
+ int status = EXIT_FAILURE;
+
+ if (thread_set_raised()) return EXIT_FAILURE;
+ switch (ex & TAG_MASK) {
+ case 0:
+ status = EXIT_SUCCESS;
+ break;
+
+ case TAG_RETURN:
+ error_pos();
+ warn_print(": unexpected return\n");
+ break;
+ case TAG_NEXT:
+ error_pos();
+ warn_print(": unexpected next\n");
+ break;
+ case TAG_BREAK:
+ error_pos();
+ warn_print(": unexpected break\n");
+ break;
+ case TAG_REDO:
+ error_pos();
+ warn_print(": unexpected redo\n");
+ break;
+ case TAG_RETRY:
+ error_pos();
+ warn_print(": retry outside of rescue clause\n");
+ break;
+ case TAG_THROW:
+ if (prot_tag && prot_tag->frame && prot_tag->frame->node) {
+ NODE *tag = prot_tag->frame->node;
+ warn_printf("%s:%d: uncaught throw\n",
+ tag->nd_file, nd_line(tag));
+ }
+ else {
+ error_pos();
+ warn_printf(": unexpected throw\n");
+ }
+ break;
+ case TAG_RAISE:
+ case TAG_FATAL:
+ if (rb_obj_is_kind_of(ruby_errinfo, rb_eSystemExit)) {
+ status = sysexit_status(ruby_errinfo);
+ }
+ else if (rb_obj_is_instance_of(ruby_errinfo, rb_eSignal)) {
+ /* no message when exiting by signal */
+ }
+ else {
+ error_print();
+ }
+ break;
+ default:
+ rb_bug("Unknown longjmp status %d", ex);
+ break;
+ }
+ thread_reset_raised();
+ return status;
+}
-void *
-ruby_options(int argc, char **argv)
+void
+ruby_options(argc, argv)
+ int argc;
+ char **argv;
{
int state;
- void *volatile iseq = 0;
- ruby_init_stack((void *)&iseq);
- PUSH_TAG();
+ Init_stack((void*)&state);
+ PUSH_TAG(PROT_NONE);
if ((state = EXEC_TAG()) == 0) {
- SAVE_ROOT_JMPBUF(GET_THREAD(), iseq = ruby_process_options(argc, argv));
+ ruby_process_options(argc, argv);
}
else {
- rb_clear_trace_func();
- state = error_handle(state);
- iseq = (void *)INT2FIX(state);
+ trace_func = 0;
+ tracing = 0;
+ exit(error_handle(state));
}
POP_TAG();
- return iseq;
}
+void rb_exec_end_proc _((void));
+
static void
-ruby_finalize_0(void)
+ruby_finalize_0()
{
- PUSH_TAG();
+ PUSH_TAG(PROT_NONE);
if (EXEC_TAG() == 0) {
rb_trap_exit();
}
POP_TAG();
rb_exec_end_proc();
- rb_clear_trace_func();
}
static void
-ruby_finalize_1(void)
+ruby_finalize_1()
{
- ruby_sig_finalize();
- GET_THREAD()->errinfo = Qnil;
+ signal(SIGINT, SIG_DFL);
+ ruby_errinfo = 0;
rb_gc_call_finalizer_at_exit();
+ trace_func = 0;
+ tracing = 0;
}
void
-ruby_finalize(void)
+ruby_finalize()
{
ruby_finalize_0();
ruby_finalize_1();
}
-void rb_thread_stop_timer_thread(void);
-
int
-ruby_cleanup(volatile int ex)
+ruby_cleanup(ex)
+ int ex;
{
int state;
volatile VALUE errs[2];
- rb_thread_t *th = GET_THREAD();
int nerr;
- errs[1] = th->errinfo;
- th->safe_level = 0;
- ruby_init_stack(&errs[STACK_UPPER(errs, 0, 1)]);
-
- PUSH_TAG();
- if ((state = EXEC_TAG()) == 0) {
- SAVE_ROOT_JMPBUF(th, ruby_finalize_0());
- }
- POP_TAG();
-
- errs[0] = th->errinfo;
- PUSH_TAG();
+ errs[1] = ruby_errinfo;
+ ruby_safe_level = 0;
+ Init_stack((void *)&state);
+ ruby_finalize_0();
+ errs[0] = ruby_errinfo;
+ PUSH_TAG(PROT_NONE);
+ PUSH_ITER(ITER_NOT);
if ((state = EXEC_TAG()) == 0) {
- SAVE_ROOT_JMPBUF(th, rb_thread_terminate_all());
+ rb_thread_cleanup();
+ rb_thread_wait_other_threads();
}
else if (ex == 0) {
ex = state;
}
- th->errinfo = errs[1];
+ POP_ITER();
+ ruby_errinfo = errs[1];
ex = error_handle(ex);
ruby_finalize_1();
POP_TAG();
- rb_thread_stop_timer_thread();
- for (nerr = 0; nerr < numberof(errs); ++nerr) {
+ for (nerr = 0; nerr < sizeof(errs) / sizeof(errs[0]); ++nerr) {
VALUE err = errs[nerr];
if (!RTEST(err)) continue;
- /* th->errinfo contains a NODE while break'ing */
- if (TYPE(err) == T_NODE) continue;
-
if (rb_obj_is_kind_of(err, rb_eSystemExit)) {
return sysexit_status(err);
}
@@ -193,54 +1629,347 @@ ruby_cleanup(volatile int ex)
return ex;
}
-int
-ruby_exec_node(void *n, const char *file)
+static int
+ruby_exec_internal()
{
- volatile int state;
- VALUE iseq = (VALUE)n;
- rb_thread_t *th = GET_THREAD();
-
- if (!n) return 0;
+ int state;
- PUSH_TAG();
+ PUSH_TAG(PROT_NONE);
+ PUSH_ITER(ITER_NOT);
+ /* default visibility is private at toplevel */
+ SCOPE_SET(SCOPE_PRIVATE);
if ((state = EXEC_TAG()) == 0) {
- SAVE_ROOT_JMPBUF(th, {
- th->base_block = 0;
- rb_iseq_eval_main(iseq);
- });
+ eval_node(ruby_top_self, ruby_eval_tree);
}
+ POP_ITER();
POP_TAG();
return state;
}
void
-ruby_stop(int ex)
+ruby_stop(ex)
+ int ex;
{
exit(ruby_cleanup(ex));
}
int
-ruby_run_node(void *n)
+ruby_exec()
+{
+ volatile NODE *tmp;
+
+ Init_stack((void*)&tmp);
+ return ruby_exec_internal();
+}
+
+void
+ruby_run()
+{
+ int state;
+ static int ex;
+
+ if (ruby_nerrs > 0) exit(EXIT_FAILURE);
+ state = ruby_exec();
+ if (state && !ex) ex = state;
+ ruby_stop(ex);
+}
+
+static void
+compile_error(at)
+ const char *at;
{
- VALUE v = (VALUE)n;
+ VALUE str;
- switch (v) {
- case Qtrue: return EXIT_SUCCESS;
- case Qfalse: return EXIT_FAILURE;
+ ruby_nerrs = 0;
+ str = rb_str_buf_new2("compile error");
+ if (at) {
+ rb_str_buf_cat2(str, " in ");
+ rb_str_buf_cat2(str, at);
}
- if (FIXNUM_P(v)) {
- return FIX2INT(v);
+ rb_str_buf_cat(str, "\n", 1);
+ if (!NIL_P(ruby_errinfo)) {
+ rb_str_append(str, rb_obj_as_string(ruby_errinfo));
}
- ruby_init_stack((void *)&n);
- return ruby_cleanup(ruby_exec_node(n, 0));
+ rb_exc_raise(rb_exc_new3(rb_eSyntaxError, str));
+}
+
+VALUE
+rb_eval_string(str)
+ const char *str;
+{
+ VALUE v;
+ NODE *oldsrc = ruby_current_node;
+
+ ruby_current_node = 0;
+ ruby_sourcefile = rb_source_filename("(eval)");
+ v = eval(ruby_top_self, rb_str_new2(str), Qnil, 0, 0);
+ ruby_current_node = oldsrc;
+
+ return v;
+}
+
+VALUE
+rb_eval_string_protect(str, state)
+ const char *str;
+ int *state;
+{
+ return rb_protect((VALUE (*)_((VALUE)))rb_eval_string, (VALUE)str, state);
+}
+
+VALUE
+rb_eval_string_wrap(str, state)
+ const char *str;
+ int *state;
+{
+ int status;
+ VALUE self = ruby_top_self;
+ VALUE wrapper = ruby_wrapper;
+ VALUE val;
+
+ PUSH_CLASS(ruby_wrapper = rb_module_new());
+ ruby_top_self = rb_obj_clone(ruby_top_self);
+ rb_extend_object(ruby_top_self, ruby_wrapper);
+ PUSH_FRAME();
+ ruby_frame->last_func = 0;
+ ruby_frame->last_class = 0;
+ ruby_frame->self = self;
+ PUSH_CREF(ruby_wrapper);
+ PUSH_SCOPE();
+
+ val = rb_eval_string_protect(str, &status);
+ ruby_top_self = self;
+
+ POP_SCOPE();
+ POP_FRAME();
+ POP_CLASS();
+ ruby_wrapper = wrapper;
+ if (state) {
+ *state = status;
+ }
+ else if (status) {
+ JUMP_TAG(status);
+ }
+ return val;
+}
+
+NORETURN(static void localjump_error(const char*, VALUE, int));
+static void
+localjump_error(mesg, value, reason)
+ const char *mesg;
+ VALUE value;
+ int reason;
+{
+ VALUE exc = rb_exc_new2(rb_eLocalJumpError, mesg);
+ ID id;
+
+ rb_iv_set(exc, "@exit_value", value);
+ switch (reason) {
+ case TAG_BREAK:
+ id = rb_intern("break"); break;
+ case TAG_REDO:
+ id = rb_intern("redo"); break;
+ case TAG_RETRY:
+ id = rb_intern("retry"); break;
+ case TAG_NEXT:
+ id = rb_intern("next"); break;
+ case TAG_RETURN:
+ id = rb_intern("return"); break;
+ default:
+ id = rb_intern("noreason"); break;
+ }
+ rb_iv_set(exc, "@reason", ID2SYM(id));
+ rb_exc_raise(exc);
+}
+
+/*
+ * call_seq:
+ * local_jump_error.exit_value => obj
+ *
+ * Returns the exit value associated with this +LocalJumpError+.
+ */
+static VALUE
+localjump_xvalue(exc)
+ VALUE exc;
+{
+ return rb_iv_get(exc, "@exit_value");
+}
+
+/*
+ * call-seq:
+ * local_jump_error.reason => symbol
+ *
+ * The reason this block was terminated:
+ * :break, :redo, :retry, :next, :return, or :noreason.
+ */
+
+static VALUE
+localjump_reason(exc)
+ VALUE exc;
+{
+ return rb_iv_get(exc, "@reason");
+}
+
+NORETURN(static void jump_tag_but_local_jump _((int,VALUE)));
+static void
+jump_tag_but_local_jump(state, val)
+ int state;
+ VALUE val;
+{
+
+ if (val == Qundef) val = prot_tag->retval;
+ switch (state) {
+ case 0:
+ break;
+ case TAG_RETURN:
+ localjump_error("unexpected return", val, state);
+ break;
+ case TAG_BREAK:
+ localjump_error("unexpected break", val, state);
+ break;
+ case TAG_NEXT:
+ localjump_error("unexpected next", val, state);
+ break;
+ case TAG_REDO:
+ localjump_error("unexpected redo", Qnil, state);
+ break;
+ case TAG_RETRY:
+ localjump_error("retry outside of rescue clause", Qnil, state);
+ break;
+ default:
+ break;
+ }
+ JUMP_TAG(state);
+}
+
+VALUE
+rb_eval_cmd(cmd, arg, level)
+ VALUE cmd, arg;
+ int level;
+{
+ int state;
+ VALUE val = Qnil; /* OK */
+ struct SCOPE *saved_scope;
+ volatile int safe = ruby_safe_level;
+
+ if (OBJ_TAINTED(cmd)) {
+ level = 4;
+ }
+ if (TYPE(cmd) != T_STRING) {
+ PUSH_ITER(ITER_NOT);
+ PUSH_TAG(PROT_NONE);
+ ruby_safe_level = level;
+ if ((state = EXEC_TAG()) == 0) {
+ val = rb_funcall2(cmd, rb_intern("call"), RARRAY(arg)->len, RARRAY(arg)->ptr);
+ }
+ ruby_safe_level = safe;
+ POP_TAG();
+ POP_ITER();
+ if (state) JUMP_TAG(state);
+ return val;
+ }
+
+ saved_scope = ruby_scope;
+ ruby_scope = top_scope;
+ PUSH_FRAME();
+ ruby_frame->last_func = 0;
+ ruby_frame->last_class = 0;
+ ruby_frame->self = ruby_top_self;
+ PUSH_CREF(ruby_wrapper ? ruby_wrapper : rb_cObject);
+
+ ruby_safe_level = level;
+
+ PUSH_TAG(PROT_NONE);
+ if ((state = EXEC_TAG()) == 0) {
+ val = eval(ruby_top_self, cmd, Qnil, 0, 0);
+ }
+ if (ruby_scope->flags & SCOPE_DONT_RECYCLE)
+ scope_dup(saved_scope);
+ ruby_scope = saved_scope;
+ ruby_safe_level = safe;
+ POP_TAG();
+ POP_FRAME();
+
+ if (state) jump_tag_but_local_jump(state, val);
+ return val;
+}
+
+#define ruby_cbase (ruby_cref->nd_clss)
+
+static VALUE
+ev_const_defined(cref, id, self)
+ NODE *cref;
+ ID id;
+ VALUE self;
+{
+ NODE *cbase = cref;
+ VALUE result;
+
+ while (cbase && cbase->nd_next) {
+ struct RClass *klass = RCLASS(cbase->nd_clss);
+
+ if (!NIL_P(klass)) {
+ if (klass->iv_tbl && st_lookup(klass->iv_tbl, id, &result)) {
+ if (result == Qundef && NIL_P(rb_autoload_p((VALUE)klass, id))) {
+ return Qfalse;
+ }
+ return Qtrue;
+ }
+ }
+ cbase = cbase->nd_next;
+ }
+ return rb_const_defined(cref->nd_clss, id);
+}
+
+static VALUE
+ev_const_get(cref, id, self)
+ NODE *cref;
+ ID id;
+ VALUE self;
+{
+ NODE *cbase = cref;
+ VALUE result;
+
+ while (cbase && cbase->nd_next) {
+ VALUE klass = cbase->nd_clss;
+
+ if (!NIL_P(klass)) {
+ while (RCLASS(klass)->iv_tbl &&
+ st_lookup(RCLASS(klass)->iv_tbl, id, &result)) {
+ if (result == Qundef) {
+ if (!RTEST(rb_autoload_load(klass, id))) break;
+ continue;
+ }
+ return result;
+ }
+ }
+ cbase = cbase->nd_next;
+ }
+ return rb_const_get(NIL_P(cref->nd_clss) ? CLASS_OF(self): cref->nd_clss, id);
+}
+
+static VALUE
+cvar_cbase()
+{
+ NODE *cref = ruby_cref;
+
+ while (cref && cref->nd_next && (NIL_P(cref->nd_clss) || FL_TEST(cref->nd_clss, FL_SINGLETON))) {
+ cref = cref->nd_next;
+ if (!cref->nd_next) {
+ rb_warn("class variable access from toplevel singleton method");
+ }
+ }
+ if (NIL_P(cref->nd_clss)) {
+ rb_raise(rb_eTypeError, "no class variables available");
+ }
+ return cref->nd_clss;
}
/*
* call-seq:
* Module.nesting => array
- *
+ *
* Returns the list of +Modules+ nested at the point of call.
- *
+ *
* module M1
* module M2
* $a = Module.nesting
@@ -251,17 +1980,17 @@ ruby_run_node(void *n)
*/
static VALUE
-rb_mod_nesting(void)
+rb_mod_nesting()
{
+ NODE *cbase = ruby_cref;
VALUE ary = rb_ary_new();
- const NODE *cref = rb_vm_cref();
- while (cref && cref->nd_next) {
- VALUE klass = cref->nd_clss;
- if (!NIL_P(klass)) {
- rb_ary_push(ary, klass);
- }
- cref = cref->nd_next;
+ while (cbase && cbase->nd_next) {
+ if (!NIL_P(cbase->nd_clss)) rb_ary_push(ary, cbase->nd_clss);
+ cbase = cbase->nd_next;
+ }
+ if (ruby_wrapper && RARRAY(ary)->len == 0) {
+ rb_ary_push(ary, ruby_wrapper);
}
return ary;
}
@@ -269,48 +1998,39 @@ rb_mod_nesting(void)
/*
* call-seq:
* Module.constants => array
- *
+ *
* Returns an array of the names of all constants defined in the
* system. This list includes the names of all modules and classes.
- *
+ *
* p Module.constants.sort[1..5]
- *
+ *
* <em>produces:</em>
- *
+ *
* ["ARGV", "ArgumentError", "Array", "Bignum", "Binding"]
*/
static VALUE
-rb_mod_s_constants(int argc, VALUE *argv, VALUE mod)
+rb_mod_s_constants()
{
- const NODE *cref = rb_vm_cref();
- VALUE klass;
- VALUE cbase = 0;
+ NODE *cbase = ruby_cref;
void *data = 0;
- if (argc > 0) {
- return rb_mod_constants(argc, argv, rb_cModule);
- }
-
- while (cref) {
- klass = cref->nd_clss;
- if (!NIL_P(klass)) {
- data = rb_mod_const_at(cref->nd_clss, data);
- if (!cbase) {
- cbase = klass;
- }
+ while (cbase) {
+ if (!NIL_P(cbase->nd_clss)) {
+ data = rb_mod_const_at(cbase->nd_clss, data);
}
- cref = cref->nd_next;
+ cbase = cbase->nd_next;
}
- if (cbase) {
- data = rb_mod_const_of(cbase, data);
+ if (!NIL_P(ruby_cbase)) {
+ data = rb_mod_const_of(ruby_cbase, data);
}
return rb_const_list(data);
}
void
-rb_frozen_class_p(VALUE klass)
+rb_frozen_class_p(klass)
+ VALUE klass;
{
const char *desc = "something(?!)";
@@ -321,121 +2041,2616 @@ rb_frozen_class_p(VALUE klass)
switch (TYPE(klass)) {
case T_MODULE:
case T_ICLASS:
- desc = "module";
+ desc = "module"; break;
+ case T_CLASS:
+ desc = "class"; break;
+ }
+ }
+ rb_error_frozen(desc);
+ }
+}
+
+void
+rb_undef(klass, id)
+ VALUE klass;
+ ID id;
+{
+ VALUE origin;
+ NODE *body;
+
+ if (ruby_cbase == rb_cObject && klass == rb_cObject) {
+ rb_secure(4);
+ }
+ if (ruby_safe_level >= 4 && !OBJ_TAINTED(klass)) {
+ rb_raise(rb_eSecurityError, "Insecure: can't undef `%s'", rb_id2name(id));
+ }
+ rb_frozen_class_p(klass);
+ if (id == __id__ || id == __send__ || id == init) {
+ rb_warn("undefining `%s' may cause serious problem", rb_id2name(id));
+ }
+ body = search_method(klass, id, &origin);
+ if (!body || !body->nd_body) {
+ const char *s0 = " class";
+ VALUE c = klass;
+
+ if (FL_TEST(c, FL_SINGLETON)) {
+ VALUE obj = rb_iv_get(klass, "__attached__");
+
+ switch (TYPE(obj)) {
+ case T_MODULE:
+ case T_CLASS:
+ c = obj;
+ s0 = "";
+ }
+ }
+ else if (TYPE(c) == T_MODULE) {
+ s0 = " module";
+ }
+ rb_name_error(id, "undefined method `%s' for%s `%s'",
+ rb_id2name(id),s0,rb_class2name(c));
+ }
+ rb_add_method(klass, id, 0, NOEX_PUBLIC);
+ if (FL_TEST(klass, FL_SINGLETON)) {
+ rb_funcall(rb_iv_get(klass, "__attached__"),
+ singleton_undefined, 1, ID2SYM(id));
+ }
+ else {
+ rb_funcall(klass, undefined, 1, ID2SYM(id));
+ }
+}
+
+/*
+ * call-seq:
+ * undef_method(symbol) => self
+ *
+ * Prevents the current class from responding to calls to the named
+ * method. Contrast this with <code>remove_method</code>, which deletes
+ * the method from the particular class; Ruby will still search
+ * superclasses and mixed-in modules for a possible receiver.
+ *
+ * class Parent
+ * def hello
+ * puts "In parent"
+ * end
+ * end
+ * class Child < Parent
+ * def hello
+ * puts "In child"
+ * end
+ * end
+ *
+ *
+ * c = Child.new
+ * c.hello
+ *
+ *
+ * class Child
+ * remove_method :hello # remove from child, still in parent
+ * end
+ * c.hello
+ *
+ *
+ * class Child
+ * undef_method :hello # prevent any calls to 'hello'
+ * end
+ * c.hello
+ *
+ * <em>produces:</em>
+ *
+ * In child
+ * In parent
+ * prog.rb:23: undefined method `hello' for #<Child:0x401b3bb4> (NoMethodError)
+ */
+
+static VALUE
+rb_mod_undef_method(argc, argv, mod)
+ int argc;
+ VALUE *argv;
+ VALUE mod;
+{
+ int i;
+
+ for (i=0; i<argc; i++) {
+ rb_undef(mod, rb_to_id(argv[i]));
+ }
+ return mod;
+}
+
+void
+rb_alias(klass, name, def)
+ VALUE klass;
+ ID name, def;
+{
+ VALUE origin = 0;
+ NODE *orig, *body, *node;
+ VALUE singleton = 0;
+ st_data_t data;
+
+ rb_frozen_class_p(klass);
+ if (name == def) return;
+ if (klass == rb_cObject) {
+ rb_secure(4);
+ }
+ orig = search_method(klass, def, &origin);
+ if (!orig || !orig->nd_body) {
+ if (TYPE(klass) == T_MODULE) {
+ orig = search_method(rb_cObject, def, &origin);
+ }
+ }
+ if (!orig || !orig->nd_body) {
+ print_undef(klass, def);
+ }
+ if (FL_TEST(klass, FL_SINGLETON)) {
+ singleton = rb_iv_get(klass, "__attached__");
+ }
+ body = orig->nd_body;
+ orig->nd_cnt++;
+ if (nd_type(body) == NODE_FBODY) { /* was alias */
+ def = body->nd_mid;
+ origin = body->nd_orig;
+ body = body->nd_head;
+ }
+
+ rb_clear_cache_by_id(name);
+ if (RTEST(ruby_verbose) && st_lookup(RCLASS(klass)->m_tbl, name, &data)) {
+ node = (NODE *)data;
+ if (node->nd_cnt == 0 && node->nd_body) {
+ rb_warning("discarding old %s", rb_id2name(name));
+ }
+ }
+ st_insert(RCLASS(klass)->m_tbl, name,
+ (st_data_t)NEW_METHOD(NEW_FBODY(body, def, origin),
+ NOEX_WITH_SAFE(orig->nd_noex)));
+
+ if (!ruby_running) return;
+
+ if (singleton) {
+ rb_funcall(singleton, singleton_added, 1, ID2SYM(name));
+ }
+ else {
+ rb_funcall(klass, added, 1, ID2SYM(name));
+ }
+}
+
+/*
+ * call-seq:
+ * alias_method(new_name, old_name) => self
+ *
+ * Makes <i>new_name</i> a new copy of the method <i>old_name</i>. This can
+ * be used to retain access to methods that are overridden.
+ *
+ * module Mod
+ * alias_method :orig_exit, :exit
+ * def exit(code=0)
+ * puts "Exiting with code #{code}"
+ * orig_exit(code)
+ * end
+ * end
+ * include Mod
+ * exit(99)
+ *
+ * <em>produces:</em>
+ *
+ * Exiting with code 99
+ */
+
+static VALUE
+rb_mod_alias_method(mod, newname, oldname)
+ VALUE mod, newname, oldname;
+{
+ rb_alias(mod, rb_to_id(newname), rb_to_id(oldname));
+ return mod;
+}
+
+NODE *
+rb_copy_node_scope(node, rval)
+ NODE *node;
+ NODE *rval;
+{
+ NODE *copy = NEW_NODE(NODE_SCOPE,0,rval,node->nd_next);
+
+ if (node->nd_tbl) {
+ copy->nd_tbl = ALLOC_N(ID, node->nd_tbl[0]+1);
+ MEMCPY(copy->nd_tbl, node->nd_tbl, ID, node->nd_tbl[0]+1);
+ }
+ else {
+ copy->nd_tbl = 0;
+ }
+ return copy;
+}
+
+#ifdef C_ALLOCA
+# define TMP_PROTECT NODE * volatile tmp__protect_tmp=0
+# define TMP_ALLOC(n) \
+ (tmp__protect_tmp = NEW_NODE(NODE_ALLOCA, \
+ ALLOC_N(VALUE,n),tmp__protect_tmp,n), \
+ (void*)tmp__protect_tmp->nd_head)
+#else
+# define TMP_PROTECT typedef int foobazzz
+# define TMP_ALLOC(n) ALLOCA_N(VALUE,n)
+#endif
+
+#define SETUP_ARGS0(anode,extra) do {\
+ NODE *n = anode;\
+ if (!n) {\
+ argc = 0;\
+ argv = 0;\
+ }\
+ else if (nd_type(n) == NODE_ARRAY) {\
+ argc=anode->nd_alen;\
+ if (argc > 0) {\
+ int i;\
+ n = anode;\
+ argv = TMP_ALLOC(argc+extra);\
+ for (i=0;i<argc;i++) {\
+ argv[i] = rb_eval(self,n->nd_head);\
+ n=n->nd_next;\
+ }\
+ }\
+ else {\
+ argc = 0;\
+ argv = 0;\
+ }\
+ }\
+ else {\
+ VALUE args = rb_eval(self,n);\
+ if (TYPE(args) != T_ARRAY)\
+ args = rb_ary_to_ary(args);\
+ argc = RARRAY(args)->len;\
+ argv = TMP_ALLOC(argc+extra);\
+ MEMCPY(argv, RARRAY(args)->ptr, VALUE, argc);\
+ }\
+} while (0)
+
+#define SETUP_ARGS(anode) SETUP_ARGS0(anode,0)
+
+#define BEGIN_CALLARGS do {\
+ struct BLOCK *tmp_block = ruby_block;\
+ int tmp_iter = ruby_iter->iter;\
+ switch (tmp_iter) {\
+ case ITER_PRE:\
+ if (ruby_block) ruby_block = ruby_block->outer;\
+ case ITER_PAS:\
+ tmp_iter = ITER_NOT;\
+ }\
+ PUSH_ITER(tmp_iter)
+
+#define END_CALLARGS \
+ ruby_block = tmp_block;\
+ POP_ITER();\
+} while (0)
+
+#define MATCH_DATA *rb_svar(node->nd_cnt)
+
+static const char* is_defined _((VALUE, NODE*, char*));
+
+static const char*
+arg_defined(self, node, buf, type)
+ VALUE self;
+ NODE *node;
+ char *buf;
+ char *type;
+{
+ int argc;
+ int i;
+
+ if (!node) return type; /* no args */
+ if (nd_type(node) == NODE_ARRAY) {
+ argc=node->nd_alen;
+ if (argc > 0) {
+ for (i=0;i<argc;i++) {
+ if (!is_defined(self, node->nd_head, buf))
+ return 0;
+ node = node->nd_next;
+ }
+ }
+ }
+ else if (!is_defined(self, node, buf)) {
+ return 0;
+ }
+ return type;
+}
+
+static const char*
+is_defined(self, node, buf)
+ VALUE self;
+ NODE *node; /* OK */
+ char *buf;
+{
+ VALUE val; /* OK */
+ int state;
+
+ again:
+ if (!node) return "expression";
+ switch (nd_type(node)) {
+ case NODE_SUPER:
+ case NODE_ZSUPER:
+ if (ruby_frame->last_func == 0) return 0;
+ else if (ruby_frame->last_class == 0) return 0;
+ val = ruby_frame->last_class;
+ if (rb_method_boundp(RCLASS(val)->super, ruby_frame->orig_func, 0)) {
+ if (nd_type(node) == NODE_SUPER) {
+ return arg_defined(self, node->nd_args, buf, "super");
+ }
+ return "super";
+ }
+ break;
+
+ case NODE_VCALL:
+ case NODE_FCALL:
+ val = self;
+ goto check_bound;
+
+ case NODE_ATTRASGN:
+ val = self;
+ if (node->nd_recv == (NODE *)1) goto check_bound;
+ case NODE_CALL:
+ PUSH_TAG(PROT_NONE);
+ if ((state = EXEC_TAG()) == 0) {
+ val = rb_eval(self, node->nd_recv);
+ }
+ POP_TAG();
+ if (state) {
+ ruby_errinfo = Qnil;
+ return 0;
+ }
+ check_bound:
+ {
+ int call = nd_type(node)==NODE_CALL;
+
+ val = CLASS_OF(val);
+ if (call) {
+ int noex;
+ ID id = node->nd_mid;
+
+ if (!rb_get_method_body(&val, &id, &noex))
+ break;
+ if ((noex & NOEX_PRIVATE))
+ break;
+ if ((noex & NOEX_PROTECTED) &&
+ !rb_obj_is_kind_of(self, rb_class_real(val)))
+ break;
+ }
+ else if (!rb_method_boundp(val, node->nd_mid, call))
break;
+ return arg_defined(self, node->nd_args, buf,
+ nd_type(node) == NODE_ATTRASGN ?
+ "assignment" : "method");
+ }
+ break;
+
+ case NODE_MATCH2:
+ case NODE_MATCH3:
+ return "method";
+
+ case NODE_YIELD:
+ if (rb_block_given_p()) {
+ return "yield";
+ }
+ break;
+
+ case NODE_SELF:
+ return "self";
+
+ case NODE_NIL:
+ return "nil";
+
+ case NODE_TRUE:
+ return "true";
+
+ case NODE_FALSE:
+ return "false";
+
+ case NODE_ATTRSET:
+ case NODE_OP_ASGN1:
+ case NODE_OP_ASGN2:
+ case NODE_OP_ASGN_OR:
+ case NODE_OP_ASGN_AND:
+ case NODE_MASGN:
+ case NODE_LASGN:
+ case NODE_DASGN:
+ case NODE_DASGN_CURR:
+ case NODE_GASGN:
+ case NODE_IASGN:
+ case NODE_CDECL:
+ case NODE_CVDECL:
+ case NODE_CVASGN:
+ return "assignment";
+
+ case NODE_LVAR:
+ return "local-variable";
+ case NODE_DVAR:
+ return "local-variable(in-block)";
+
+ case NODE_GVAR:
+ if (rb_gvar_defined(node->nd_entry)) {
+ return "global-variable";
+ }
+ break;
+
+ case NODE_IVAR:
+ if (rb_ivar_defined(self, node->nd_vid)) {
+ return "instance-variable";
+ }
+ break;
+
+ case NODE_CONST:
+ if (ev_const_defined(ruby_cref, node->nd_vid, self)) {
+ return "constant";
+ }
+ break;
+
+ case NODE_CVAR:
+ if (rb_cvar_defined(cvar_cbase(), node->nd_vid)) {
+ return "class variable";
+ }
+ break;
+
+ case NODE_COLON2:
+ PUSH_TAG(PROT_NONE);
+ if ((state = EXEC_TAG()) == 0) {
+ val = rb_eval(self, node->nd_head);
+ }
+ POP_TAG();
+ if (state) {
+ ruby_errinfo = Qnil;
+ return 0;
+ }
+ else {
+ switch (TYPE(val)) {
case T_CLASS:
- desc = "class";
+ case T_MODULE:
+ if (rb_const_defined_from(val, node->nd_mid))
+ return "constant";
break;
+ default:
+ if (rb_method_boundp(CLASS_OF(val), node->nd_mid, 1)) {
+ return "method";
+ }
}
}
- rb_error_frozen(desc);
+ break;
+
+ case NODE_COLON3:
+ if (rb_const_defined_from(rb_cObject, node->nd_mid)) {
+ return "constant";
+ }
+ break;
+
+ case NODE_NTH_REF:
+ if (RTEST(rb_reg_nth_defined(node->nd_nth, MATCH_DATA))) {
+ sprintf(buf, "$%d", (int)node->nd_nth);
+ return buf;
+ }
+ break;
+
+ case NODE_BACK_REF:
+ if (RTEST(rb_reg_nth_defined(0, MATCH_DATA))) {
+ sprintf(buf, "$%c", (char)node->nd_nth);
+ return buf;
+ }
+ break;
+
+ case NODE_NEWLINE:
+ node = node->nd_next;
+ goto again;
+
+ default:
+ PUSH_TAG(PROT_NONE);
+ if ((state = EXEC_TAG()) == 0) {
+ rb_eval(self, node);
+ }
+ POP_TAG();
+ if (!state) {
+ return "expression";
+ }
+ ruby_errinfo = Qnil;
+ break;
+ }
+ return 0;
+}
+
+static int handle_rescue _((VALUE,NODE*));
+
+static void blk_free();
+
+static VALUE
+rb_obj_is_proc(proc)
+ VALUE proc;
+{
+ if (TYPE(proc) == T_DATA && RDATA(proc)->dfree == (RUBY_DATA_FUNC)blk_free) {
+ return Qtrue;
+ }
+ return Qfalse;
+}
+
+void
+rb_add_event_hook(func, events)
+ rb_event_hook_func_t func;
+ rb_event_t events;
+{
+ rb_event_hook_t *hook;
+
+ hook = ALLOC(rb_event_hook_t);
+ hook->func = func;
+ hook->events = events;
+ hook->next = event_hooks;
+ event_hooks = hook;
+}
+
+int
+rb_remove_event_hook(func)
+ rb_event_hook_func_t func;
+{
+ rb_event_hook_t *prev, *hook;
+
+ prev = NULL;
+ hook = event_hooks;
+ while (hook) {
+ if (hook->func == func) {
+ if (prev) {
+ prev->next = hook->next;
+ }
+ else {
+ event_hooks = hook->next;
+ }
+ xfree(hook);
+ return 0;
+ }
+ prev = hook;
+ hook = hook->next;
+ }
+ return -1;
+}
+
+/*
+ * call-seq:
+ * set_trace_func(proc) => proc
+ * set_trace_func(nil) => nil
+ *
+ * Establishes _proc_ as the handler for tracing, or disables
+ * tracing if the parameter is +nil+. _proc_ takes up
+ * to six parameters: an event name, a filename, a line number, an
+ * object id, a binding, and the name of a class. _proc_ is
+ * invoked whenever an event occurs. Events are: <code>c-call</code>
+ * (call a C-language routine), <code>c-return</code> (return from a
+ * C-language routine), <code>call</code> (call a Ruby method),
+ * <code>class</code> (start a class or module definition),
+ * <code>end</code> (finish a class or module definition),
+ * <code>line</code> (execute code on a new line), <code>raise</code>
+ * (raise an exception), and <code>return</code> (return from a Ruby
+ * method). Tracing is disabled within the context of _proc_.
+ *
+ * class Test
+ * def test
+ * a = 1
+ * b = 2
+ * end
+ * end
+ *
+ * set_trace_func proc { |event, file, line, id, binding, classname|
+ * printf "%8s %s:%-2d %10s %8s\n", event, file, line, id, classname
+ * }
+ * t = Test.new
+ * t.test
+ *
+ * line prog.rb:11 false
+ * c-call prog.rb:11 new Class
+ * c-call prog.rb:11 initialize Object
+ * c-return prog.rb:11 initialize Object
+ * c-return prog.rb:11 new Class
+ * line prog.rb:12 false
+ * call prog.rb:2 test Test
+ * line prog.rb:3 test Test
+ * line prog.rb:4 test Test
+ * return prog.rb:4 test Test
+ */
+
+
+static VALUE
+set_trace_func(obj, trace)
+ VALUE obj, trace;
+{
+ rb_event_hook_t *hook;
+
+ rb_secure(4);
+ if (NIL_P(trace)) {
+ trace_func = 0;
+ rb_remove_event_hook(call_trace_func);
+ return Qnil;
+ }
+ if (!rb_obj_is_proc(trace)) {
+ rb_raise(rb_eTypeError, "trace_func needs to be Proc");
+ }
+ trace_func = trace;
+ for (hook = event_hooks; hook; hook = hook->next) {
+ if (hook->func == call_trace_func)
+ return trace;
+ }
+ rb_add_event_hook(call_trace_func, RUBY_EVENT_ALL);
+ return trace;
+}
+
+static const char *
+get_event_name(rb_event_t event)
+{
+ switch (event) {
+ case RUBY_EVENT_LINE:
+ return "line";
+ case RUBY_EVENT_CLASS:
+ return "class";
+ case RUBY_EVENT_END:
+ return "end";
+ case RUBY_EVENT_CALL:
+ return "call";
+ case RUBY_EVENT_RETURN:
+ return "return";
+ case RUBY_EVENT_C_CALL:
+ return "c-call";
+ case RUBY_EVENT_C_RETURN:
+ return "c-return";
+ case RUBY_EVENT_RAISE:
+ return "raise";
+ default:
+ return "unknown";
+ }
+}
+
+static void
+call_trace_func(event, node, self, id, klass)
+ rb_event_t event;
+ NODE *node;
+ VALUE self;
+ ID id;
+ VALUE klass; /* OK */
+{
+ int state, raised;
+ struct FRAME *prev;
+ NODE *node_save;
+ VALUE srcfile;
+ const char *event_name;
+
+ if (!trace_func) return;
+ if (tracing) return;
+ if (ruby_in_compile) return;
+ if (id == ID_ALLOCATOR) return;
+
+ if (!(node_save = ruby_current_node)) {
+ node_save = NEW_NEWLINE(0);
+ }
+ tracing = 1;
+ prev = ruby_frame;
+ PUSH_FRAME();
+ *ruby_frame = *prev;
+ ruby_frame->prev = prev;
+ ruby_frame->iter = 0; /* blocks not available anyway */
+
+ if (node) {
+ ruby_current_node = node;
+ ruby_frame->node = node;
+ ruby_sourcefile = node->nd_file;
+ ruby_sourceline = nd_line(node);
+ }
+ if (klass) {
+ if (TYPE(klass) == T_ICLASS) {
+ klass = RBASIC(klass)->klass;
+ }
+ else if (FL_TEST(klass, FL_SINGLETON)) {
+ klass = rb_iv_get(klass, "__attached__");
+ }
+ }
+ PUSH_TAG(PROT_NONE);
+ raised = thread_reset_raised();
+ if ((state = EXEC_TAG()) == 0) {
+ srcfile = rb_str_new2(ruby_sourcefile?ruby_sourcefile:"(ruby)");
+ event_name = get_event_name(event);
+ proc_invoke(trace_func, rb_ary_new3(6, rb_str_new2(event_name),
+ srcfile,
+ INT2FIX(ruby_sourceline),
+ id?ID2SYM(id):Qnil,
+ self?rb_f_binding(self):Qnil,
+ klass),
+ Qundef, 0);
+ }
+ if (raised) thread_set_raised();
+ POP_TAG();
+ POP_FRAME();
+
+ tracing = 0;
+ ruby_current_node = node_save;
+ SET_CURRENT_SOURCE();
+ if (state) JUMP_TAG(state);
+}
+
+static VALUE
+avalue_to_svalue(v)
+ VALUE v;
+{
+ VALUE tmp, top;
+
+ tmp = rb_check_array_type(v);
+ if (NIL_P(tmp)) {
+ return v;
+ }
+ if (RARRAY(tmp)->len == 0) {
+ return Qundef;
+ }
+ if (RARRAY(tmp)->len == 1) {
+ top = rb_check_array_type(RARRAY(tmp)->ptr[0]);
+ if (NIL_P(top)) {
+ return RARRAY(tmp)->ptr[0];
+ }
+ if (RARRAY(top)->len > 1) {
+ return v;
+ }
+ return top;
+ }
+ return tmp;
+}
+
+static VALUE
+svalue_to_avalue(v)
+ VALUE v;
+{
+ VALUE tmp, top;
+
+ if (v == Qundef) return rb_ary_new2(0);
+ tmp = rb_check_array_type(v);
+ if (NIL_P(tmp)) {
+ return rb_ary_new3(1, v);
+ }
+ if (RARRAY(tmp)->len == 1) {
+ top = rb_check_array_type(RARRAY(tmp)->ptr[0]);
+ if (!NIL_P(top) && RARRAY(top)->len > 1) {
+ return tmp;
+ }
+ return rb_ary_new3(1, v);
+ }
+ return tmp;
+}
+
+static VALUE
+svalue_to_mrhs(v, lhs)
+ VALUE v;
+ NODE *lhs;
+{
+ VALUE tmp;
+
+ if (v == Qundef) return rb_ary_new2(0);
+ tmp = rb_check_array_type(v);
+ if (NIL_P(tmp)) {
+ return rb_ary_new3(1, v);
+ }
+ /* no lhs means splat lhs only */
+ if (!lhs) {
+ return rb_ary_new3(1, v);
+ }
+ return tmp;
+}
+
+static VALUE
+avalue_splat(v)
+ VALUE v;
+{
+ if (RARRAY(v)->len == 0) {
+ return Qundef;
+ }
+ if (RARRAY(v)->len == 1) {
+ return RARRAY(v)->ptr[0];
+ }
+ return v;
+}
+
+#if 1
+VALUE
+rb_Array(val)
+ VALUE val;
+{
+ VALUE tmp = rb_check_array_type(val);
+
+ if (NIL_P(tmp)) {
+ /* hack to avoid invoke Object#to_a */
+ VALUE origin;
+ ID id = rb_intern("to_a");
+
+ if (search_method(CLASS_OF(val), id, &origin) &&
+ RCLASS(origin)->m_tbl != RCLASS(rb_mKernel)->m_tbl) { /* exclude Kernel#to_a */
+ val = rb_funcall(val, id, 0);
+ if (TYPE(val) != T_ARRAY) {
+ rb_raise(rb_eTypeError, "`to_a' did not return Array");
+ }
+ return val;
+ }
+ else {
+ return rb_ary_new3(1, val);
+ }
+ }
+ return tmp;
+}
+#endif
+
+static VALUE
+splat_value(v)
+ VALUE v;
+{
+ if (NIL_P(v)) return rb_ary_new3(1, Qnil);
+ return rb_Array(v);
+}
+
+static VALUE
+class_prefix(self, cpath)
+ VALUE self;
+ NODE *cpath;
+{
+ if (!cpath) {
+ rb_bug("class path missing");
+ }
+ if (cpath->nd_head) {
+ VALUE c = rb_eval(self, cpath->nd_head);
+ switch (TYPE(c)) {
+ case T_CLASS:
+ case T_MODULE:
+ break;
+ default:
+ rb_raise(rb_eTypeError, "%s is not a class/module",
+ RSTRING(rb_obj_as_string(c))->ptr);
+ }
+ return c;
+ }
+ else if (nd_type(cpath) == NODE_COLON2) {
+ return ruby_cbase;
+ }
+ else if (ruby_wrapper) {
+ return ruby_wrapper;
+ }
+ else {
+ return rb_cObject;
}
}
-NORETURN(static void rb_longjmp(int, volatile VALUE));
+#define return_value(v) do {\
+ if ((prot_tag->retval = (v)) == Qundef) {\
+ prot_tag->retval = Qnil;\
+ }\
+} while (0)
+
+NORETURN(static void return_jump _((VALUE)));
+NORETURN(static void break_jump _((VALUE)));
+NORETURN(static void next_jump _((VALUE)));
+NORETURN(static void unknown_node _((NODE * volatile)));
static void
-rb_longjmp(int tag, volatile VALUE mesg)
+unknown_node(node)
+ NODE *volatile node;
+{
+ ruby_current_node = 0;
+ if (node->flags == 0) {
+ rb_bug("terminated node (0x%lx)", node);
+ }
+ else if (BUILTIN_TYPE(node) != T_NODE) {
+ rb_bug("not a node 0x%02lx (0x%lx)", BUILTIN_TYPE(node), node);
+ }
+ else {
+ rb_bug("unknown node type %d (0x%lx)", nd_type(node), node);
+ }
+}
+
+static VALUE
+rb_eval(self, n)
+ VALUE self;
+ NODE *n;
+{
+ NODE * volatile contnode = 0;
+ NODE * volatile node = n;
+ int state;
+ volatile VALUE result = Qnil;
+ st_data_t data;
+
+#define RETURN(v) do { \
+ result = (v); \
+ goto finish; \
+} while (0)
+
+ again:
+ if (!node) RETURN(Qnil);
+
+ ruby_current_node = node;
+ switch (nd_type(node)) {
+ case NODE_BLOCK:
+ if (contnode) {
+ result = rb_eval(self, node);
+ break;
+ }
+ contnode = node->nd_next;
+ node = node->nd_head;
+ goto again;
+
+ case NODE_POSTEXE:
+ rb_f_END();
+ nd_set_type(node, NODE_NIL); /* exec just once */
+ result = Qnil;
+ break;
+
+ /* begin .. end without clauses */
+ case NODE_BEGIN:
+ node = node->nd_body;
+ goto again;
+
+ /* nodes for speed-up(default match) */
+ case NODE_MATCH:
+ result = rb_reg_match2(node->nd_lit);
+ break;
+
+ /* nodes for speed-up(literal match) */
+ case NODE_MATCH2:
+ {
+ VALUE l = rb_eval(self,node->nd_recv);
+ VALUE r = rb_eval(self,node->nd_value);
+ result = rb_reg_match(l, r);
+ }
+ break;
+
+ /* nodes for speed-up(literal match) */
+ case NODE_MATCH3:
+ {
+ VALUE r = rb_eval(self,node->nd_recv);
+ VALUE l = rb_eval(self,node->nd_value);
+ if (TYPE(l) == T_STRING) {
+ result = rb_reg_match(r, l);
+ }
+ else {
+ result = rb_funcall(l, match, 1, r);
+ }
+ }
+ break;
+
+ /* node for speed-up(top-level loop for -n/-p) */
+ case NODE_OPT_N:
+ PUSH_TAG(PROT_LOOP);
+ switch (state = EXEC_TAG()) {
+ case 0:
+ opt_n_next:
+ while (!NIL_P(rb_gets())) {
+ opt_n_redo:
+ rb_eval(self, node->nd_body);
+ }
+ break;
+
+ case TAG_REDO:
+ state = 0;
+ goto opt_n_redo;
+ case TAG_NEXT:
+ state = 0;
+ goto opt_n_next;
+ case TAG_BREAK:
+ state = 0;
+ default:
+ break;
+ }
+ POP_TAG();
+ if (state) JUMP_TAG(state);
+ RETURN(Qnil);
+
+ case NODE_SELF:
+ RETURN(self);
+
+ case NODE_NIL:
+ RETURN(Qnil);
+
+ case NODE_TRUE:
+ RETURN(Qtrue);
+
+ case NODE_FALSE:
+ RETURN(Qfalse);
+
+ case NODE_IF:
+ if (RTEST(rb_eval(self, node->nd_cond))) {
+ EXEC_EVENT_HOOK(RUBY_EVENT_LINE, node, self,
+ ruby_frame->last_func,
+ ruby_frame->last_class);
+ node = node->nd_body;
+ }
+ else {
+ EXEC_EVENT_HOOK(RUBY_EVENT_LINE, node, self,
+ ruby_frame->last_func,
+ ruby_frame->last_class);
+ node = node->nd_else;
+ }
+ goto again;
+
+ case NODE_WHEN:
+ while (node) {
+ NODE *tag;
+
+ if (nd_type(node) != NODE_WHEN) goto again;
+ tag = node->nd_head;
+ while (tag) {
+ EXEC_EVENT_HOOK(RUBY_EVENT_LINE, tag, self,
+ ruby_frame->last_func,
+ ruby_frame->last_class);
+ if (tag->nd_head && nd_type(tag->nd_head) == NODE_WHEN) {
+ VALUE v = rb_eval(self, tag->nd_head->nd_head);
+ long i;
+
+ if (TYPE(v) != T_ARRAY) v = rb_ary_to_ary(v);
+ for (i=0; i<RARRAY(v)->len; i++) {
+ if (RTEST(RARRAY(v)->ptr[i])) {
+ node = node->nd_body;
+ goto again;
+ }
+ }
+ tag = tag->nd_next;
+ continue;
+ }
+ if (RTEST(rb_eval(self, tag->nd_head))) {
+ node = node->nd_body;
+ goto again;
+ }
+ tag = tag->nd_next;
+ }
+ node = node->nd_next;
+ }
+ RETURN(Qnil);
+
+ case NODE_CASE:
+ {
+ VALUE val;
+
+ val = rb_eval(self, node->nd_head);
+ node = node->nd_body;
+ while (node) {
+ NODE *tag;
+
+ if (nd_type(node) != NODE_WHEN) {
+ goto again;
+ }
+ tag = node->nd_head;
+ while (tag) {
+ EXEC_EVENT_HOOK(RUBY_EVENT_LINE, tag, self,
+ ruby_frame->last_func,
+ ruby_frame->last_class);
+ if (tag->nd_head && nd_type(tag->nd_head) == NODE_WHEN) {
+ VALUE v = rb_eval(self, tag->nd_head->nd_head);
+ long i;
+
+ if (TYPE(v) != T_ARRAY) v = rb_ary_to_ary(v);
+ for (i=0; i<RARRAY(v)->len; i++) {
+ if (RTEST(rb_funcall2(RARRAY(v)->ptr[i], eqq, 1, &val))){
+ node = node->nd_body;
+ goto again;
+ }
+ }
+ tag = tag->nd_next;
+ continue;
+ }
+ if (RTEST(rb_funcall2(rb_eval(self, tag->nd_head), eqq, 1, &val))) {
+ node = node->nd_body;
+ goto again;
+ }
+ tag = tag->nd_next;
+ }
+ node = node->nd_next;
+ }
+ }
+ RETURN(Qnil);
+
+ case NODE_WHILE:
+ PUSH_TAG(PROT_LOOP);
+ result = Qnil;
+ switch (state = EXEC_TAG()) {
+ case 0:
+ if (node->nd_state && !RTEST(rb_eval(self, node->nd_cond)))
+ goto while_out;
+ do {
+ while_redo:
+ rb_eval(self, node->nd_body);
+ while_next:
+ ;
+ } while (RTEST(rb_eval(self, node->nd_cond)));
+ break;
+
+ case TAG_REDO:
+ state = 0;
+ goto while_redo;
+ case TAG_NEXT:
+ state = 0;
+ goto while_next;
+ case TAG_BREAK:
+ if (TAG_DST()) {
+ state = 0;
+ result = prot_tag->retval;
+ }
+ /* fall through */
+ default:
+ break;
+ }
+ while_out:
+ POP_TAG();
+ if (state) JUMP_TAG(state);
+ RETURN(result);
+
+ case NODE_UNTIL:
+ PUSH_TAG(PROT_LOOP);
+ result = Qnil;
+ switch (state = EXEC_TAG()) {
+ case 0:
+ if (node->nd_state && RTEST(rb_eval(self, node->nd_cond)))
+ goto until_out;
+ do {
+ until_redo:
+ rb_eval(self, node->nd_body);
+ until_next:
+ ;
+ } while (!RTEST(rb_eval(self, node->nd_cond)));
+ break;
+
+ case TAG_REDO:
+ state = 0;
+ goto until_redo;
+ case TAG_NEXT:
+ state = 0;
+ goto until_next;
+ case TAG_BREAK:
+ if (TAG_DST()) {
+ state = 0;
+ result = prot_tag->retval;
+ }
+ /* fall through */
+ default:
+ break;
+ }
+ until_out:
+ POP_TAG();
+ if (state) JUMP_TAG(state);
+ RETURN(result);
+
+ case NODE_BLOCK_PASS:
+ result = block_pass(self, node);
+ break;
+
+ case NODE_ITER:
+ case NODE_FOR:
+ {
+ PUSH_TAG(PROT_LOOP);
+ PUSH_BLOCK(node->nd_var, node->nd_body);
+
+ state = EXEC_TAG();
+ if (state == 0) {
+ iter_retry:
+ PUSH_ITER(ITER_PRE);
+ if (nd_type(node) == NODE_ITER) {
+ result = rb_eval(self, node->nd_iter);
+ }
+ else {
+ VALUE recv;
+
+ _block.flags &= ~BLOCK_D_SCOPE;
+ BEGIN_CALLARGS;
+ recv = rb_eval(self, node->nd_iter);
+ END_CALLARGS;
+ ruby_current_node = node;
+ SET_CURRENT_SOURCE();
+ result = rb_call(CLASS_OF(recv),recv,each,0,0,0,self);
+ }
+ POP_ITER();
+ }
+ else if (state == TAG_BREAK && TAG_DST()) {
+ result = prot_tag->retval;
+ state = 0;
+ }
+ else if (state == TAG_RETRY) {
+ state = 0;
+ goto iter_retry;
+ }
+ POP_BLOCK();
+ POP_TAG();
+ switch (state) {
+ case 0:
+ break;
+ default:
+ JUMP_TAG(state);
+ }
+ }
+ break;
+
+ case NODE_BREAK:
+ break_jump(rb_eval(self, node->nd_stts));
+ break;
+
+ case NODE_NEXT:
+ CHECK_INTS;
+ next_jump(rb_eval(self, node->nd_stts));
+ break;
+
+ case NODE_REDO:
+ CHECK_INTS;
+ JUMP_TAG(TAG_REDO);
+ break;
+
+ case NODE_RETRY:
+ CHECK_INTS;
+ JUMP_TAG(TAG_RETRY);
+ break;
+
+ case NODE_SPLAT:
+ result = splat_value(rb_eval(self, node->nd_head));
+ break;
+
+ case NODE_TO_ARY:
+ result = rb_ary_to_ary(rb_eval(self, node->nd_head));
+ break;
+
+ case NODE_SVALUE:
+ result = avalue_splat(rb_eval(self, node->nd_head));
+ if (result == Qundef) result = Qnil;
+ break;
+
+ case NODE_YIELD:
+ if (node->nd_head) {
+ result = rb_eval(self, node->nd_head);
+ ruby_current_node = node;
+ }
+ else {
+ result = Qundef; /* no arg */
+ }
+ SET_CURRENT_SOURCE();
+ result = rb_yield_0(result, 0, 0, 0, node->nd_state);
+ break;
+
+ case NODE_RESCUE:
+ {
+ volatile VALUE e_info = ruby_errinfo;
+ volatile int rescuing = 0;
+
+ PUSH_TAG(PROT_NONE);
+ if ((state = EXEC_TAG()) == 0) {
+ retry_entry:
+ result = rb_eval(self, node->nd_head);
+ }
+ else if (rescuing) {
+ if (rescuing < 0) {
+ /* in rescue argument, just reraise */
+ }
+ else if (state == TAG_RETRY) {
+ rescuing = state = 0;
+ ruby_errinfo = e_info;
+ goto retry_entry;
+ }
+ else if (state != TAG_RAISE) {
+ result = prot_tag->retval;
+ }
+ }
+ else if (state == TAG_RAISE) {
+ NODE *resq = node->nd_resq;
+
+ rescuing = -1;
+ while (resq) {
+ ruby_current_node = resq;
+ if (handle_rescue(self, resq)) {
+ state = 0;
+ rescuing = 1;
+ result = rb_eval(self, resq->nd_body);
+ break;
+ }
+ resq = resq->nd_head; /* next rescue */
+ }
+ }
+ else {
+ result = prot_tag->retval;
+ }
+ POP_TAG();
+ if (state != TAG_RAISE) ruby_errinfo = e_info;
+ if (state) {
+ JUMP_TAG(state);
+ }
+ /* no exception raised */
+ if (!rescuing && (node = node->nd_else)) { /* else clause given */
+ goto again;
+ }
+ }
+ break;
+
+ case NODE_ENSURE:
+ PUSH_TAG(PROT_NONE);
+ if ((state = EXEC_TAG()) == 0) {
+ result = rb_eval(self, node->nd_head);
+ }
+ POP_TAG();
+ if (node->nd_ensr && !thread_no_ensure()) {
+ VALUE retval = prot_tag->retval; /* save retval */
+ VALUE errinfo = ruby_errinfo;
+
+ rb_eval(self, node->nd_ensr);
+ return_value(retval);
+ ruby_errinfo = errinfo;
+ }
+ if (state) JUMP_TAG(state);
+ break;
+
+ case NODE_AND:
+ result = rb_eval(self, node->nd_1st);
+ if (!RTEST(result)) break;
+ node = node->nd_2nd;
+ goto again;
+
+ case NODE_OR:
+ result = rb_eval(self, node->nd_1st);
+ if (RTEST(result)) break;
+ node = node->nd_2nd;
+ goto again;
+
+ case NODE_NOT:
+ if (RTEST(rb_eval(self, node->nd_body))) result = Qfalse;
+ else result = Qtrue;
+ break;
+
+ case NODE_DOT2:
+ case NODE_DOT3:
+ {
+ VALUE beg = rb_eval(self, node->nd_beg);
+ VALUE end = rb_eval(self, node->nd_end);
+ result = rb_range_new(beg, end, nd_type(node) == NODE_DOT3);
+ }
+ break;
+
+ case NODE_FLIP2: /* like AWK */
+ {
+ VALUE *flip = rb_svar(node->nd_cnt);
+ if (!flip) rb_bug("unexpected local variable");
+ if (!RTEST(*flip)) {
+ if (RTEST(rb_eval(self, node->nd_beg))) {
+ *flip = RTEST(rb_eval(self, node->nd_end))?Qfalse:Qtrue;
+ result = Qtrue;
+ }
+ else {
+ result = Qfalse;
+ }
+ }
+ else {
+ if (RTEST(rb_eval(self, node->nd_end))) {
+ *flip = Qfalse;
+ }
+ result = Qtrue;
+ }
+ }
+ break;
+
+ case NODE_FLIP3: /* like SED */
+ {
+ VALUE *flip = rb_svar(node->nd_cnt);
+ if (!flip) rb_bug("unexpected local variable");
+ if (!RTEST(*flip)) {
+ result = RTEST(rb_eval(self, node->nd_beg)) ? Qtrue : Qfalse;
+ *flip = result;
+ }
+ else {
+ if (RTEST(rb_eval(self, node->nd_end))) {
+ *flip = Qfalse;
+ }
+ result = Qtrue;
+ }
+ }
+ break;
+
+ case NODE_RETURN:
+ return_jump(rb_eval(self, node->nd_stts));
+ break;
+
+ case NODE_ARGSCAT:
+ {
+ VALUE args = rb_eval(self, node->nd_head);
+ result = rb_ary_concat(args, splat_value(rb_eval(self, node->nd_body)));
+ }
+ break;
+
+ case NODE_ARGSPUSH:
+ {
+ VALUE args = rb_ary_dup(rb_eval(self, node->nd_head));
+ result = rb_ary_push(args, rb_eval(self, node->nd_body));
+ }
+ break;
+
+ case NODE_ATTRASGN:
+ {
+ VALUE recv;
+ int argc; VALUE *argv; /* used in SETUP_ARGS */
+ int scope;
+ TMP_PROTECT;
+
+ BEGIN_CALLARGS;
+ if (node->nd_recv == (NODE *)1) {
+ recv = self;
+ scope = 1;
+ }
+ else {
+ recv = rb_eval(self, node->nd_recv);
+ scope = 0;
+ }
+ SETUP_ARGS(node->nd_args);
+ END_CALLARGS;
+
+ ruby_current_node = node;
+ SET_CURRENT_SOURCE();
+ rb_call(CLASS_OF(recv),recv,node->nd_mid,argc,argv,scope,self);
+ result = argv[argc-1];
+ }
+ break;
+
+ case NODE_CALL:
+ {
+ VALUE recv;
+ int argc; VALUE *argv; /* used in SETUP_ARGS */
+ TMP_PROTECT;
+
+ BEGIN_CALLARGS;
+ recv = rb_eval(self, node->nd_recv);
+ SETUP_ARGS(node->nd_args);
+ END_CALLARGS;
+
+ ruby_current_node = node;
+ SET_CURRENT_SOURCE();
+ result = rb_call(CLASS_OF(recv),recv,node->nd_mid,argc,argv,0,self);
+ }
+ break;
+
+ case NODE_FCALL:
+ {
+ int argc; VALUE *argv; /* used in SETUP_ARGS */
+ TMP_PROTECT;
+
+ BEGIN_CALLARGS;
+ SETUP_ARGS(node->nd_args);
+ END_CALLARGS;
+
+ ruby_current_node = node;
+ SET_CURRENT_SOURCE();
+ result = rb_call(CLASS_OF(self),self,node->nd_mid,argc,argv,1,self);
+ }
+ break;
+
+ case NODE_VCALL:
+ SET_CURRENT_SOURCE();
+ result = rb_call(CLASS_OF(self),self,node->nd_mid,0,0,2,self);
+ break;
+
+ case NODE_SUPER:
+ case NODE_ZSUPER:
+ {
+ int argc; VALUE *argv; /* used in SETUP_ARGS */
+ TMP_PROTECT;
+
+ if (ruby_frame->last_class == 0) {
+ if (ruby_frame->last_func) {
+ rb_name_error(ruby_frame->last_func,
+ "superclass method `%s' disabled",
+ rb_id2name(ruby_frame->orig_func));
+ }
+ else {
+ rb_raise(rb_eNoMethodError, "super called outside of method");
+ }
+ }
+ if (nd_type(node) == NODE_ZSUPER) {
+ argc = ruby_frame->argc;
+ if (argc && DMETHOD_P()) {
+ if (TYPE(RBASIC(ruby_scope)->klass) != T_ARRAY ||
+ RARRAY(RBASIC(ruby_scope)->klass)->len != argc) {
+ rb_raise(rb_eRuntimeError,
+ "super: specify arguments explicitly");
+ }
+ argv = RARRAY(RBASIC(ruby_scope)->klass)->ptr;
+ }
+ else if (!ruby_scope->local_vars) {
+ argc = 0;
+ argv = 0;
+ }
+ else {
+ argv = ruby_scope->local_vars + 2;
+ }
+ }
+ else {
+ BEGIN_CALLARGS;
+ SETUP_ARGS(node->nd_args);
+ END_CALLARGS;
+ ruby_current_node = node;
+ }
+
+ SET_CURRENT_SOURCE();
+ result = rb_call_super(argc, argv);
+ }
+ break;
+
+ case NODE_SCOPE:
+ {
+ struct FRAME frame;
+ NODE *saved_cref = 0;
+
+ frame = *ruby_frame;
+ frame.tmp = ruby_frame;
+ ruby_frame = &frame;
+
+ PUSH_SCOPE();
+ PUSH_TAG(PROT_NONE);
+ if (node->nd_rval) {
+ saved_cref = ruby_cref;
+ ruby_cref = (NODE*)node->nd_rval;
+ }
+ if (node->nd_tbl) {
+ VALUE *vars = ALLOCA_N(VALUE, node->nd_tbl[0]+1);
+ *vars++ = (VALUE)node;
+ ruby_scope->local_vars = vars;
+ rb_mem_clear(ruby_scope->local_vars, node->nd_tbl[0]);
+ ruby_scope->local_tbl = node->nd_tbl;
+ }
+ else {
+ ruby_scope->local_vars = 0;
+ ruby_scope->local_tbl = 0;
+ }
+ if ((state = EXEC_TAG()) == 0) {
+ result = rb_eval(self, node->nd_next);
+ }
+ POP_TAG();
+ POP_SCOPE();
+ ruby_frame = frame.tmp;
+ if (saved_cref)
+ ruby_cref = saved_cref;
+ if (state) JUMP_TAG(state);
+ }
+ break;
+
+ case NODE_OP_ASGN1:
+ {
+ int argc; VALUE *argv; /* used in SETUP_ARGS */
+ VALUE recv, val, tmp;
+ NODE *rval;
+ TMP_PROTECT;
+
+ recv = rb_eval(self, node->nd_recv);
+ rval = node->nd_args->nd_head;
+ SETUP_ARGS0(node->nd_args->nd_body, 1);
+ val = rb_funcall3(recv, aref, argc, argv);
+ switch (node->nd_mid) {
+ case 0: /* OR */
+ if (RTEST(val)) RETURN(val);
+ val = rb_eval(self, rval);
+ break;
+ case 1: /* AND */
+ if (!RTEST(val)) RETURN(val);
+ val = rb_eval(self, rval);
+ break;
+ default:
+ tmp = rb_eval(self, rval);
+ val = rb_funcall3(val, node->nd_mid, 1, &tmp);
+ }
+ argv[argc] = val;
+ rb_funcall2(recv, aset, argc+1, argv);
+ result = val;
+ }
+ break;
+
+ case NODE_OP_ASGN2:
+ {
+ ID id = node->nd_next->nd_vid;
+ VALUE recv, val, tmp;
+
+ recv = rb_eval(self, node->nd_recv);
+ val = rb_funcall3(recv, id, 0, 0);
+ switch (node->nd_next->nd_mid) {
+ case 0: /* OR */
+ if (RTEST(val)) RETURN(val);
+ val = rb_eval(self, node->nd_value);
+ break;
+ case 1: /* AND */
+ if (!RTEST(val)) RETURN(val);
+ val = rb_eval(self, node->nd_value);
+ break;
+ default:
+ tmp = rb_eval(self, node->nd_value);
+ val = rb_funcall3(val, node->nd_next->nd_mid, 1, &tmp);
+ }
+
+ rb_funcall2(recv, node->nd_next->nd_aid, 1, &val);
+ result = val;
+ }
+ break;
+
+ case NODE_OP_ASGN_AND:
+ result = rb_eval(self, node->nd_head);
+ if (!RTEST(result)) break;
+ node = node->nd_value;
+ goto again;
+
+ case NODE_OP_ASGN_OR:
+ if ((node->nd_aid && !is_defined(self, node->nd_head, 0)) ||
+ !RTEST(result = rb_eval(self, node->nd_head))) {
+ node = node->nd_value;
+ goto again;
+ }
+ break;
+
+ case NODE_MASGN:
+ result = massign(self, node, rb_eval(self, node->nd_value), 0);
+ break;
+
+ case NODE_LASGN:
+ if (ruby_scope->local_vars == 0)
+ rb_bug("unexpected local variable assignment");
+ result = rb_eval(self, node->nd_value);
+ ruby_scope->local_vars[node->nd_cnt] = result;
+ break;
+
+ case NODE_DASGN:
+ result = rb_eval(self, node->nd_value);
+ dvar_asgn(node->nd_vid, result);
+ break;
+
+ case NODE_DASGN_CURR:
+ result = rb_eval(self, node->nd_value);
+ dvar_asgn_curr(node->nd_vid, result);
+ break;
+
+ case NODE_GASGN:
+ result = rb_eval(self, node->nd_value);
+ rb_gvar_set(node->nd_entry, result);
+ break;
+
+ case NODE_IASGN:
+ result = rb_eval(self, node->nd_value);
+ rb_ivar_set(self, node->nd_vid, result);
+ break;
+
+ case NODE_CDECL:
+ result = rb_eval(self, node->nd_value);
+ if (node->nd_vid == 0) {
+ rb_const_set(class_prefix(self, node->nd_else), node->nd_else->nd_mid, result);
+ }
+ else {
+ rb_const_set(ruby_cbase, node->nd_vid, result);
+ }
+ break;
+
+ case NODE_CVDECL:
+ if (NIL_P(ruby_cbase)) {
+ rb_raise(rb_eTypeError, "no class/module to define class variable");
+ }
+ result = rb_eval(self, node->nd_value);
+ rb_cvar_set(cvar_cbase(), node->nd_vid, result, Qtrue);
+ break;
+
+ case NODE_CVASGN:
+ result = rb_eval(self, node->nd_value);
+ rb_cvar_set(cvar_cbase(), node->nd_vid, result, Qfalse);
+ break;
+
+ case NODE_LVAR:
+ if (ruby_scope->local_vars == 0) {
+ rb_bug("unexpected local variable");
+ }
+ result = ruby_scope->local_vars[node->nd_cnt];
+ break;
+
+ case NODE_DVAR:
+ result = rb_dvar_ref(node->nd_vid);
+ break;
+
+ case NODE_GVAR:
+ result = rb_gvar_get(node->nd_entry);
+ break;
+
+ case NODE_IVAR:
+ result = rb_ivar_get(self, node->nd_vid);
+ break;
+
+ case NODE_CONST:
+ result = ev_const_get(ruby_cref, node->nd_vid, self);
+ break;
+
+ case NODE_CVAR:
+ result = rb_cvar_get(cvar_cbase(), node->nd_vid);
+ break;
+
+ case NODE_BLOCK_ARG:
+ if (ruby_scope->local_vars == 0)
+ rb_bug("unexpected block argument");
+ if (rb_block_given_p()) {
+ result = rb_block_proc();
+ ruby_scope->local_vars[node->nd_cnt] = result;
+ }
+ else {
+ result = Qnil;
+ }
+ break;
+
+ case NODE_COLON2:
+ {
+ VALUE klass;
+
+ klass = rb_eval(self, node->nd_head);
+ if (rb_is_const_id(node->nd_mid)) {
+ switch (TYPE(klass)) {
+ case T_CLASS:
+ case T_MODULE:
+ result = rb_const_get_from(klass, node->nd_mid);
+ break;
+ default:
+ rb_raise(rb_eTypeError, "%s is not a class/module",
+ RSTRING(rb_obj_as_string(klass))->ptr);
+ break;
+ }
+ }
+ else {
+ result = rb_funcall(klass, node->nd_mid, 0, 0);
+ }
+ }
+ break;
+
+ case NODE_COLON3:
+ result = rb_const_get_from(rb_cObject, node->nd_mid);
+ break;
+
+ case NODE_NTH_REF:
+ result = rb_reg_nth_match(node->nd_nth, MATCH_DATA);
+ break;
+
+ case NODE_BACK_REF:
+ switch (node->nd_nth) {
+ case '&':
+ result = rb_reg_last_match(MATCH_DATA);
+ break;
+ case '`':
+ result = rb_reg_match_pre(MATCH_DATA);
+ break;
+ case '\'':
+ result = rb_reg_match_post(MATCH_DATA);
+ break;
+ case '+':
+ result = rb_reg_match_last(MATCH_DATA);
+ break;
+ default:
+ rb_bug("unexpected back-ref");
+ }
+ break;
+
+ case NODE_HASH:
+ {
+ NODE *list;
+ VALUE hash = rb_hash_new();
+ VALUE key, val;
+
+ list = node->nd_head;
+ while (list) {
+ key = rb_eval(self, list->nd_head);
+ list = list->nd_next;
+ if (list == 0)
+ rb_bug("odd number list for Hash");
+ val = rb_eval(self, list->nd_head);
+ list = list->nd_next;
+ rb_hash_aset(hash, key, val);
+ }
+ result = hash;
+ }
+ break;
+
+ case NODE_ZARRAY: /* zero length list */
+ result = rb_ary_new();
+ break;
+
+ case NODE_ARRAY:
+ {
+ VALUE ary;
+ long i;
+
+ i = node->nd_alen;
+ ary = rb_ary_new2(i);
+ for (i=0;node;node=node->nd_next) {
+ RARRAY(ary)->ptr[i++] = rb_eval(self, node->nd_head);
+ RARRAY(ary)->len = i;
+ }
+
+ result = ary;
+ }
+ break;
+
+ case NODE_STR:
+ result = rb_str_new3(node->nd_lit);
+ break;
+
+ case NODE_EVSTR:
+ result = rb_obj_as_string(rb_eval(self, node->nd_body));
+ break;
+
+ case NODE_DSTR:
+ case NODE_DXSTR:
+ case NODE_DREGX:
+ case NODE_DREGX_ONCE:
+ case NODE_DSYM:
+ {
+ VALUE str, str2;
+ NODE *list = node->nd_next;
+
+ str = rb_str_new3(node->nd_lit);
+ while (list) {
+ if (list->nd_head) {
+ switch (nd_type(list->nd_head)) {
+ case NODE_STR:
+ str2 = list->nd_head->nd_lit;
+ break;
+ default:
+ str2 = rb_eval(self, list->nd_head);
+ break;
+ }
+ rb_str_append(str, str2);
+ OBJ_INFECT(str, str2);
+ }
+ list = list->nd_next;
+ }
+ switch (nd_type(node)) {
+ case NODE_DREGX:
+ result = rb_reg_new(RSTRING(str)->ptr, RSTRING(str)->len,
+ node->nd_cflag);
+ break;
+ case NODE_DREGX_ONCE: /* regexp expand once */
+ result = rb_reg_new(RSTRING(str)->ptr, RSTRING(str)->len,
+ node->nd_cflag);
+ nd_set_type(node, NODE_LIT);
+ node->nd_lit = result;
+ break;
+ case NODE_LIT:
+ /* other thread may replace NODE_DREGX_ONCE to NODE_LIT */
+ goto again;
+ case NODE_DXSTR:
+ result = rb_funcall(self, '`', 1, str);
+ break;
+ case NODE_DSYM:
+ result = rb_str_intern(str);
+ break;
+ default:
+ result = str;
+ break;
+ }
+ }
+ break;
+
+ case NODE_XSTR:
+ result = rb_funcall(self, '`', 1, rb_str_new3(node->nd_lit));
+ break;
+
+ case NODE_LIT:
+ result = node->nd_lit;
+ break;
+
+ case NODE_DEFN:
+ if (node->nd_defn) {
+ NODE *body, *defn;
+ VALUE origin = 0;
+ int noex;
+
+ if (NIL_P(ruby_class)) {
+ rb_raise(rb_eTypeError, "no class/module to add method");
+ }
+ if (ruby_class == rb_cObject && node->nd_mid == init) {
+ rb_warn("redefining Object#initialize may cause infinite loop");
+ }
+ if (node->nd_mid == __id__ || node->nd_mid == __send__) {
+ rb_warn("redefining `%s' may cause serious problem",
+ rb_id2name(node->nd_mid));
+ }
+ rb_frozen_class_p(ruby_class);
+ body = search_method(ruby_class, node->nd_mid, &origin);
+ if (body){
+ if (RTEST(ruby_verbose) && ruby_class == origin && body->nd_cnt == 0 && body->nd_body) {
+ rb_warning("method redefined; discarding old %s", rb_id2name(node->nd_mid));
+ }
+ }
+
+ if (SCOPE_TEST(SCOPE_PRIVATE) || node->nd_mid == init) {
+ noex = NOEX_PRIVATE;
+ }
+ else if (SCOPE_TEST(SCOPE_PROTECTED)) {
+ noex = NOEX_PROTECTED;
+ }
+ else {
+ noex = NOEX_PUBLIC;
+ }
+ if (body && origin == ruby_class && body->nd_body == 0) {
+ noex |= NOEX_NOSUPER;
+ }
+
+ defn = rb_copy_node_scope(node->nd_defn, ruby_cref);
+ rb_add_method(ruby_class, node->nd_mid, defn, noex);
+ if (scope_vmode == SCOPE_MODFUNC) {
+ rb_add_method(rb_singleton_class(ruby_class),
+ node->nd_mid, defn, NOEX_PUBLIC);
+ }
+ result = Qnil;
+ }
+ break;
+
+ case NODE_DEFS:
+ if (node->nd_defn) {
+ VALUE recv = rb_eval(self, node->nd_recv);
+ VALUE klass;
+ NODE *body = 0, *defn;
+
+ if (ruby_safe_level >= 4 && !OBJ_TAINTED(recv)) {
+ rb_raise(rb_eSecurityError, "Insecure: can't define singleton method");
+ }
+ if (FIXNUM_P(recv) || SYMBOL_P(recv)) {
+ rb_raise(rb_eTypeError,
+ "can't define singleton method \"%s\" for %s",
+ rb_id2name(node->nd_mid),
+ rb_obj_classname(recv));
+ }
+
+ if (OBJ_FROZEN(recv)) rb_error_frozen("object");
+ klass = rb_singleton_class(recv);
+ if (st_lookup(RCLASS(klass)->m_tbl, node->nd_mid, &data)) {
+ body = (NODE *)data;
+ if (ruby_safe_level >= 4) {
+ rb_raise(rb_eSecurityError, "redefining method prohibited");
+ }
+ if (RTEST(ruby_verbose)) {
+ rb_warning("redefine %s", rb_id2name(node->nd_mid));
+ }
+ }
+ defn = rb_copy_node_scope(node->nd_defn, ruby_cref);
+ rb_add_method(klass, node->nd_mid, defn,
+ NOEX_PUBLIC|(body?body->nd_noex&NOEX_UNDEF:0));
+ result = Qnil;
+ }
+ break;
+
+ case NODE_UNDEF:
+ if (NIL_P(ruby_class)) {
+ rb_raise(rb_eTypeError, "no class to undef method");
+ }
+ rb_undef(ruby_class, rb_to_id(rb_eval(self, node->u2.node)));
+ result = Qnil;
+ break;
+
+ case NODE_ALIAS:
+ if (NIL_P(ruby_class)) {
+ rb_raise(rb_eTypeError, "no class to make alias");
+ }
+ rb_alias(ruby_class, rb_to_id(rb_eval(self, node->u1.node)),
+ rb_to_id(rb_eval(self, node->u2.node)));
+ result = Qnil;
+ break;
+
+ case NODE_VALIAS:
+ rb_alias_variable(node->u1.id, node->u2.id);
+ result = Qnil;
+ break;
+
+ case NODE_CLASS:
+ {
+ VALUE super, klass, tmp, cbase;
+ ID cname;
+ int gen = Qfalse;
+
+ cbase = class_prefix(self, node->nd_cpath);
+ cname = node->nd_cpath->nd_mid;
+
+ if (NIL_P(ruby_cbase)) {
+ rb_raise(rb_eTypeError, "no outer class/module");
+ }
+ if (node->nd_super) {
+ super = rb_eval(self, node->nd_super);
+ rb_check_inheritable(super);
+ }
+ else {
+ super = 0;
+ }
+
+ if (rb_const_defined_at(cbase, cname)) {
+ klass = rb_const_get_at(cbase, cname);
+ if (TYPE(klass) != T_CLASS) {
+ rb_raise(rb_eTypeError, "%s is not a class",
+ rb_id2name(cname));
+ }
+ if (super) {
+ tmp = rb_class_real(RCLASS(klass)->super);
+ if (tmp != super) {
+ rb_raise(rb_eTypeError, "superclass mismatch for class %s",
+ rb_id2name(cname));
+ }
+ super = 0;
+ }
+ if (ruby_safe_level >= 4) {
+ rb_raise(rb_eSecurityError, "extending class prohibited");
+ }
+ }
+ else {
+ if (!super) super = rb_cObject;
+ klass = rb_define_class_id(cname, super);
+ rb_set_class_path(klass, cbase, rb_id2name(cname));
+ rb_const_set(cbase, cname, klass);
+ gen = Qtrue;
+ }
+ if (ruby_wrapper) {
+ rb_extend_object(klass, ruby_wrapper);
+ rb_include_module(klass, ruby_wrapper);
+ }
+ if (super && gen) {
+ rb_class_inherited(super, klass);
+ }
+ result = module_setup(klass, node);
+ }
+ break;
+
+ case NODE_MODULE:
+ {
+ VALUE module, cbase;
+ ID cname;
+
+ if (NIL_P(ruby_cbase)) {
+ rb_raise(rb_eTypeError, "no outer class/module");
+ }
+ cbase = class_prefix(self, node->nd_cpath);
+ cname = node->nd_cpath->nd_mid;
+ if (rb_const_defined_at(cbase, cname)) {
+ module = rb_const_get_at(cbase, cname);
+ if (TYPE(module) != T_MODULE) {
+ rb_raise(rb_eTypeError, "%s is not a module",
+ rb_id2name(cname));
+ }
+ if (ruby_safe_level >= 4) {
+ rb_raise(rb_eSecurityError, "extending module prohibited");
+ }
+ }
+ else {
+ module = rb_define_module_id(cname);
+ rb_set_class_path(module, cbase, rb_id2name(cname));
+ rb_const_set(cbase, cname, module);
+ }
+ if (ruby_wrapper) {
+ rb_extend_object(module, ruby_wrapper);
+ rb_include_module(module, ruby_wrapper);
+ }
+
+ result = module_setup(module, node);
+ }
+ break;
+
+ case NODE_SCLASS:
+ {
+ VALUE klass;
+
+ result = rb_eval(self, node->nd_recv);
+ if (FIXNUM_P(result) || SYMBOL_P(result)) {
+ rb_raise(rb_eTypeError, "no virtual class for %s",
+ rb_obj_classname(result));
+ }
+ if (ruby_safe_level >= 4 && !OBJ_TAINTED(result))
+ rb_raise(rb_eSecurityError, "Insecure: can't extend object");
+ klass = rb_singleton_class(result);
+
+ if (ruby_wrapper) {
+ rb_extend_object(klass, ruby_wrapper);
+ rb_include_module(klass, ruby_wrapper);
+ }
+
+ result = module_setup(klass, node);
+ }
+ break;
+
+ case NODE_DEFINED:
+ {
+ char buf[20];
+ const char *desc = is_defined(self, node->nd_head, buf);
+
+ if (desc) result = rb_str_new2(desc);
+ else result = Qnil;
+ }
+ break;
+
+ case NODE_NEWLINE:
+ EXEC_EVENT_HOOK(RUBY_EVENT_LINE, node, self,
+ ruby_frame->last_func,
+ ruby_frame->last_class);
+ node = node->nd_next;
+ goto again;
+
+ default:
+ unknown_node(node);
+ }
+ finish:
+ CHECK_INTS;
+ if (contnode) {
+ node = contnode;
+ contnode = 0;
+ goto again;
+ }
+ return result;
+}
+
+static VALUE
+module_setup(module, n)
+ VALUE module;
+ NODE *n;
+{
+ NODE * volatile node = n->nd_body;
+ int state;
+ struct FRAME frame;
+ VALUE result = Qnil; /* OK */
+ TMP_PROTECT;
+
+ frame = *ruby_frame;
+ frame.tmp = ruby_frame;
+ ruby_frame = &frame;
+
+ PUSH_CLASS(module);
+ PUSH_SCOPE();
+ PUSH_VARS();
+
+ if (node->nd_tbl) {
+ VALUE *vars = TMP_ALLOC(node->nd_tbl[0]+1);
+ *vars++ = (VALUE)node;
+ ruby_scope->local_vars = vars;
+ rb_mem_clear(ruby_scope->local_vars, node->nd_tbl[0]);
+ ruby_scope->local_tbl = node->nd_tbl;
+ }
+ else {
+ ruby_scope->local_vars = 0;
+ ruby_scope->local_tbl = 0;
+ }
+
+ PUSH_CREF(module);
+ PUSH_TAG(PROT_NONE);
+ if ((state = EXEC_TAG()) == 0) {
+ EXEC_EVENT_HOOK(RUBY_EVENT_CLASS, n, ruby_cbase,
+ ruby_frame->last_func, ruby_frame->last_class);
+ result = rb_eval(ruby_cbase, node->nd_next);
+ }
+ POP_TAG();
+ POP_CREF();
+ POP_VARS();
+ POP_SCOPE();
+ POP_CLASS();
+
+ ruby_frame = frame.tmp;
+ EXEC_EVENT_HOOK(RUBY_EVENT_END, n, 0,
+ ruby_frame->last_func, ruby_frame->last_class);
+ if (state) JUMP_TAG(state);
+
+ return result;
+}
+
+static NODE *basic_respond_to = 0;
+
+int
+rb_obj_respond_to(obj, id, priv)
+ VALUE obj;
+ ID id;
+ int priv;
+{
+ VALUE klass = CLASS_OF(obj);
+
+ if (rb_method_node(klass, respond_to) == basic_respond_to) {
+ return rb_method_boundp(klass, id, !priv);
+ }
+ else {
+ VALUE args[2];
+ int n = 0;
+ args[n++] = ID2SYM(id);
+ if (priv) args[n++] = Qtrue;
+ return rb_funcall2(obj, respond_to, n, args);
+ }
+}
+
+int
+rb_respond_to(obj, id)
+ VALUE obj;
+ ID id;
+{
+ return rb_obj_respond_to(obj, id, Qfalse);
+}
+
+/*
+ * call-seq:
+ * obj.respond_to?(symbol, include_private=false) => true or false
+ *
+ * Returns +true+> if _obj_ responds to the given
+ * method. Private methods are included in the search only if the
+ * optional second parameter evaluates to +true+.
+ */
+
+static VALUE
+obj_respond_to(argc, argv, obj)
+ int argc;
+ VALUE *argv;
+ VALUE obj;
+{
+ VALUE mid, priv;
+ ID id;
+
+ rb_scan_args(argc, argv, "11", &mid, &priv);
+ id = rb_to_id(mid);
+ if (rb_method_boundp(CLASS_OF(obj), id, !RTEST(priv))) {
+ return Qtrue;
+ }
+ return Qfalse;
+}
+
+/*
+ * call-seq:
+ * mod.method_defined?(symbol) => true or false
+ *
+ * Returns +true+ if the named method is defined by
+ * _mod_ (or its included modules and, if _mod_ is a class,
+ * its ancestors). Public and protected methods are matched.
+ *
+ * module A
+ * def method1() end
+ * end
+ * class B
+ * def method2() end
+ * end
+ * class C < B
+ * include A
+ * def method3() end
+ * end
+ *
+ * A.method_defined? :method1 #=> true
+ * C.method_defined? "method1" #=> true
+ * C.method_defined? "method2" #=> true
+ * C.method_defined? "method3" #=> true
+ * C.method_defined? "method4" #=> false
+ */
+
+static VALUE
+rb_mod_method_defined(mod, mid)
+ VALUE mod, mid;
+{
+ return rb_method_boundp(mod, rb_to_id(mid), 1);
+}
+
+#define VISI_CHECK(x,f) (((x)&NOEX_MASK) == (f))
+
+/*
+ * call-seq:
+ * mod.public_method_defined?(symbol) => true or false
+ *
+ * Returns +true+ if the named public method is defined by
+ * _mod_ (or its included modules and, if _mod_ is a class,
+ * its ancestors).
+ *
+ * module A
+ * def method1() end
+ * end
+ * class B
+ * protected
+ * def method2() end
+ * end
+ * class C < B
+ * include A
+ * def method3() end
+ * end
+ *
+ * A.method_defined? :method1 #=> true
+ * C.public_method_defined? "method1" #=> true
+ * C.public_method_defined? "method2" #=> false
+ * C.method_defined? "method2" #=> true
+ */
+
+static VALUE
+rb_mod_public_method_defined(mod, mid)
+ VALUE mod, mid;
+{
+ ID id = rb_to_id(mid);
+ int noex;
+
+ if (rb_get_method_body(&mod, &id, &noex)) {
+ if (VISI_CHECK(noex, NOEX_PUBLIC))
+ return Qtrue;
+ }
+ return Qfalse;
+}
+
+/*
+ * call-seq:
+ * mod.private_method_defined?(symbol) => true or false
+ *
+ * Returns +true+ if the named private method is defined by
+ * _ mod_ (or its included modules and, if _mod_ is a class,
+ * its ancestors).
+ *
+ * module A
+ * def method1() end
+ * end
+ * class B
+ * private
+ * def method2() end
+ * end
+ * class C < B
+ * include A
+ * def method3() end
+ * end
+ *
+ * A.method_defined? :method1 #=> true
+ * C.private_method_defined? "method1" #=> false
+ * C.private_method_defined? "method2" #=> true
+ * C.method_defined? "method2" #=> false
+ */
+
+static VALUE
+rb_mod_private_method_defined(mod, mid)
+ VALUE mod, mid;
+{
+ ID id = rb_to_id(mid);
+ int noex;
+
+ if (rb_get_method_body(&mod, &id, &noex)) {
+ if (VISI_CHECK(noex, NOEX_PRIVATE))
+ return Qtrue;
+ }
+ return Qfalse;
+}
+
+/*
+ * call-seq:
+ * mod.protected_method_defined?(symbol) => true or false
+ *
+ * Returns +true+ if the named protected method is defined
+ * by _mod_ (or its included modules and, if _mod_ is a
+ * class, its ancestors).
+ *
+ * module A
+ * def method1() end
+ * end
+ * class B
+ * protected
+ * def method2() end
+ * end
+ * class C < B
+ * include A
+ * def method3() end
+ * end
+ *
+ * A.method_defined? :method1 #=> true
+ * C.protected_method_defined? "method1" #=> false
+ * C.protected_method_defined? "method2" #=> true
+ * C.method_defined? "method2" #=> true
+ */
+
+static VALUE
+rb_mod_protected_method_defined(mod, mid)
+ VALUE mod, mid;
+{
+ ID id = rb_to_id(mid);
+ int noex;
+
+ if (rb_get_method_body(&mod, &id, &noex)) {
+ if (VISI_CHECK(noex, NOEX_PROTECTED))
+ return Qtrue;
+ }
+ return Qfalse;
+}
+
+NORETURN(static VALUE terminate_process _((int, VALUE)));
+static VALUE
+terminate_process(status, mesg)
+ int status;
+ VALUE mesg;
+{
+ VALUE args[2];
+ args[0] = INT2NUM(status);
+ args[1] = mesg;
+
+ rb_exc_raise(rb_class_new_instance(2, args, rb_eSystemExit));
+}
+
+void
+rb_exit(status)
+ int status;
+{
+ if (prot_tag) {
+ terminate_process(status, rb_str_new("exit", 4));
+ }
+ ruby_finalize();
+ exit(status);
+}
+
+
+/*
+ * call-seq:
+ * exit(integer=0)
+ * Kernel::exit(integer=0)
+ * Process::exit(integer=0)
+ *
+ * Initiates the termination of the Ruby script by raising the
+ * <code>SystemExit</code> exception. This exception may be caught. The
+ * optional parameter is used to return a status code to the invoking
+ * environment.
+ *
+ * begin
+ * exit
+ * puts "never get here"
+ * rescue SystemExit
+ * puts "rescued a SystemExit exception"
+ * end
+ * puts "after begin block"
+ *
+ * <em>produces:</em>
+ *
+ * rescued a SystemExit exception
+ * after begin block
+ *
+ * Just prior to termination, Ruby executes any <code>at_exit</code> functions
+ * (see Kernel::at_exit) and runs any object finalizers (see
+ * ObjectSpace::define_finalizer).
+ *
+ * at_exit { puts "at_exit function" }
+ * ObjectSpace.define_finalizer("string", proc { puts "in finalizer" })
+ * exit
+ *
+ * <em>produces:</em>
+ *
+ * at_exit function
+ * in finalizer
+ */
+
+VALUE
+rb_f_exit(argc, argv)
+ int argc;
+ VALUE *argv;
+{
+ VALUE status;
+ int istatus;
+
+ rb_secure(4);
+ if (rb_scan_args(argc, argv, "01", &status) == 1) {
+ switch (status) {
+ case Qtrue:
+ istatus = EXIT_SUCCESS;
+ break;
+ case Qfalse:
+ istatus = EXIT_FAILURE;
+ break;
+ default:
+ istatus = NUM2INT(status);
+#if EXIT_SUCCESS != 0
+ if (istatus == 0) istatus = EXIT_SUCCESS;
+#endif
+ break;
+ }
+ }
+ else {
+ istatus = EXIT_SUCCESS;
+ }
+ rb_exit(istatus);
+ return Qnil; /* not reached */
+}
+
+
+/*
+ * call-seq:
+ * abort
+ * Kernel::abort
+ * Process::abort
+ *
+ * Terminate execution immediately, effectively by calling
+ * <code>Kernel.exit(1)</code>. If _msg_ is given, it is written
+ * to STDERR prior to terminating.
+ */
+
+VALUE
+rb_f_abort(argc, argv)
+ int argc;
+ VALUE *argv;
+{
+ rb_secure(4);
+ if (argc == 0) {
+ if (!NIL_P(ruby_errinfo)) {
+ error_print();
+ }
+ rb_exit(EXIT_FAILURE);
+ }
+ else {
+ VALUE mesg;
+
+ rb_scan_args(argc, argv, "1", &mesg);
+ StringValue(mesg);
+ rb_io_puts(1, &mesg, rb_stderr);
+ terminate_process(EXIT_FAILURE, mesg);
+ }
+ return Qnil; /* not reached */
+}
+
+void
+rb_iter_break()
+{
+ break_jump(Qnil);
+}
+
+NORETURN(static void rb_longjmp _((int, VALUE)));
+static VALUE make_backtrace _((void));
+
+static void
+rb_longjmp(tag, mesg)
+ int tag;
+ VALUE mesg;
{
VALUE at;
- VALUE e;
- rb_thread_t *th = GET_THREAD();
- const char *file;
- volatile int line = 0;
- if (rb_threadptr_set_raised(th)) {
- th->errinfo = exception_error;
- rb_threadptr_reset_raised(th);
+ if (thread_set_raised()) {
+ ruby_errinfo = exception_error;
JUMP_TAG(TAG_FATAL);
}
-
- if (NIL_P(mesg))
- mesg = th->errinfo;
+ if (NIL_P(mesg)) mesg = ruby_errinfo;
if (NIL_P(mesg)) {
mesg = rb_exc_new(rb_eRuntimeError, 0, 0);
}
- file = rb_sourcefile();
- if (file) line = rb_sourceline();
- if (file && !NIL_P(mesg)) {
+ ruby_set_current_source();
+ if (ruby_sourcefile && !NIL_P(mesg)) {
at = get_backtrace(mesg);
if (NIL_P(at)) {
- at = rb_make_backtrace();
- if (OBJ_FROZEN(mesg)) {
- mesg = rb_obj_dup(mesg);
- }
+ at = make_backtrace();
set_backtrace(mesg, at);
}
}
if (!NIL_P(mesg)) {
- th->errinfo = mesg;
+ ruby_errinfo = mesg;
}
- if (RTEST(ruby_debug) && !NIL_P(e = th->errinfo) &&
- !rb_obj_is_kind_of(e, rb_eSystemExit)) {
+ if (RTEST(ruby_debug) && !NIL_P(ruby_errinfo)
+ && !rb_obj_is_kind_of(ruby_errinfo, rb_eSystemExit)) {
+ VALUE e = ruby_errinfo;
int status;
- PUSH_TAG();
+ PUSH_TAG(PROT_NONE);
if ((status = EXEC_TAG()) == 0) {
- RB_GC_GUARD(e) = rb_obj_as_string(e);
- if (file) {
- warn_printf("Exception `%s' at %s:%d - %s\n",
- rb_obj_classname(th->errinfo),
- file, line, RSTRING_PTR(e));
- }
- else {
- warn_printf("Exception `%s' - %s\n",
- rb_obj_classname(th->errinfo),
- RSTRING_PTR(e));
- }
+ StringValue(e);
+ warn_printf("Exception `%s' at %s:%d - %s\n",
+ rb_obj_classname(ruby_errinfo),
+ ruby_sourcefile, ruby_sourceline,
+ RSTRING(e)->ptr);
}
POP_TAG();
- if (status == TAG_FATAL && th->errinfo == exception_error) {
- th->errinfo = mesg;
+ if (status == TAG_FATAL && ruby_errinfo == exception_error) {
+ ruby_errinfo = mesg;
}
else if (status) {
- rb_threadptr_reset_raised(th);
+ thread_reset_raised();
JUMP_TAG(status);
}
}
rb_trap_restore_mask();
-
if (tag != TAG_FATAL) {
- EXEC_EVENT_HOOK(th, RUBY_EVENT_RAISE, th->cfp->self,
- 0 /* TODO: id */, 0 /* TODO: klass */);
+ EXEC_EVENT_HOOK(RUBY_EVENT_RAISE, ruby_current_node,
+ ruby_frame->self,
+ ruby_frame->last_func,
+ ruby_frame->last_class);
}
-
- rb_thread_raised_clear(th);
+ if (!prot_tag) {
+ error_print();
+ }
+ thread_reset_raised();
JUMP_TAG(tag);
}
void
-rb_exc_raise(VALUE mesg)
+rb_exc_raise(mesg)
+ VALUE mesg;
{
- if (!NIL_P(mesg)) {
- mesg = rb_make_exception(1, &mesg);
- }
rb_longjmp(TAG_RAISE, mesg);
}
void
-rb_exc_fatal(VALUE mesg)
+rb_exc_fatal(mesg)
+ VALUE mesg;
{
- if (!NIL_P(mesg)) {
- mesg = rb_make_exception(1, &mesg);
- }
rb_longjmp(TAG_FATAL, mesg);
}
void
-rb_interrupt(void)
+rb_interrupt()
{
- rb_raise(rb_eInterrupt, "%s", "");
+ static const char fmt[1] = {'\0'};
+ rb_raise(rb_eInterrupt, fmt);
}
-static VALUE get_errinfo(void);
-
/*
* call-seq:
* raise
@@ -444,7 +4659,7 @@ static VALUE get_errinfo(void);
* fail
* fail(string)
* fail(exception [, string [, array]])
- *
+ *
* With no arguments, raises the exception in <code>$!</code> or raises
* a <code>RuntimeError</code> if <code>$!</code> is +nil+.
* With a single +String+ argument, raises a
@@ -455,28 +4670,24 @@ static VALUE get_errinfo(void);
* message associated with the exception, and the third parameter is an
* array of callback information. Exceptions are caught by the
* +rescue+ clause of <code>begin...end</code> blocks.
- *
+ *
* raise "Failed to create socket"
* raise ArgumentError, "No parameters", caller
*/
static VALUE
-rb_f_raise(int argc, VALUE *argv)
+rb_f_raise(argc, argv)
+ int argc;
+ VALUE *argv;
{
- VALUE err;
- if (argc == 0) {
- err = get_errinfo();
- if (!NIL_P(err)) {
- argc = 1;
- argv = &err;
- }
- }
rb_raise_jump(rb_make_exception(argc, argv));
return Qnil; /* not reached */
}
-VALUE
-rb_make_exception(int argc, VALUE *argv)
+static VALUE
+rb_make_exception(argc, argv)
+ int argc;
+ VALUE *argv;
{
VALUE mesg;
ID exception;
@@ -485,13 +4696,12 @@ rb_make_exception(int argc, VALUE *argv)
mesg = Qnil;
switch (argc) {
case 0:
+ mesg = Qnil;
break;
case 1:
- if (NIL_P(argv[0]))
- break;
- mesg = rb_check_string_type(argv[0]);
- if (!NIL_P(mesg)) {
- mesg = rb_exc_new3(rb_eRuntimeError, mesg);
+ if (NIL_P(argv[0])) break;
+ if (TYPE(argv[0]) == T_STRING) {
+ mesg = rb_exc_new3(rb_eRuntimeError, argv[0]);
break;
}
n = 0;
@@ -501,7 +4711,7 @@ rb_make_exception(int argc, VALUE *argv)
case 3:
n = 1;
exception_call:
- CONST_ID(exception, "exception");
+ exception = rb_intern("exception");
if (!rb_respond_to(argv[0], exception)) {
rb_raise(rb_eTypeError, "exception class/object expected");
}
@@ -514,155 +4724,800 @@ rb_make_exception(int argc, VALUE *argv)
if (argc > 0) {
if (!rb_obj_is_kind_of(mesg, rb_eException))
rb_raise(rb_eTypeError, "exception object expected");
- if (argc > 2)
+ if (argc>2)
set_backtrace(mesg, argv[2]);
}
return mesg;
}
-void
-rb_raise_jump(VALUE mesg)
+static void
+rb_raise_jump(mesg)
+ VALUE mesg;
{
- rb_thread_t *th = GET_THREAD();
- th->cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(th->cfp);
- /* TODO: fix me */
+ if (ruby_frame != top_frame) {
+ PUSH_FRAME(); /* fake frame */
+ *ruby_frame = *_frame.prev->prev;
+ rb_longjmp(TAG_RAISE, mesg);
+ POP_FRAME();
+ }
rb_longjmp(TAG_RAISE, mesg);
}
void
-rb_jump_tag(int tag)
+rb_jump_tag(tag)
+ int tag;
{
JUMP_TAG(tag);
}
int
-rb_block_given_p(void)
+rb_block_given_p()
{
- rb_thread_t *th = GET_THREAD();
-
- if ((th->cfp->lfp[0] & 0x02) == 0 &&
- GC_GUARDED_PTR_REF(th->cfp->lfp[0])) {
- return TRUE;
- }
- else {
- return FALSE;
- }
+ if (ruby_frame->iter == ITER_CUR && ruby_block)
+ return Qtrue;
+ return Qfalse;
}
int
-rb_iterator_p(void)
+rb_iterator_p()
{
return rb_block_given_p();
}
+/*
+ * call-seq:
+ * block_given? => true or false
+ * iterator? => true or false
+ *
+ * Returns <code>true</code> if <code>yield</code> would execute a
+ * block in the current context. The <code>iterator?</code> form
+ * is mildly deprecated.
+ *
+ * def try
+ * if block_given?
+ * yield
+ * else
+ * "no block"
+ * end
+ * end
+ * try #=> "no block"
+ * try { "hello" } #=> "hello"
+ * try do "hello" end #=> "hello"
+ */
+
+
+static VALUE
+rb_f_block_given_p()
+{
+ if (ruby_frame->prev && ruby_frame->prev->iter == ITER_CUR && ruby_block)
+ return Qtrue;
+ return Qfalse;
+}
+
VALUE rb_eThreadError;
+NORETURN(static void proc_jump_error(int, VALUE));
+static void
+proc_jump_error(state, result)
+ int state;
+ VALUE result;
+{
+ char mesg[32];
+ const char *statement;
+
+ switch (state) {
+ case TAG_BREAK:
+ statement = "break"; break;
+ case TAG_RETURN:
+ statement = "return"; break;
+ case TAG_RETRY:
+ statement = "retry"; break;
+ default:
+ statement = "local-jump"; break; /* should not happen */
+ }
+ snprintf(mesg, sizeof mesg, "%s from proc-closure", statement);
+ localjump_error(mesg, result, state);
+}
+
+static void
+return_jump(retval)
+ VALUE retval;
+{
+ struct tag *tt = prot_tag;
+ int yield = Qfalse;
+
+ if (retval == Qundef) retval = Qnil;
+ while (tt) {
+ if (tt->tag == PROT_YIELD) {
+ yield = Qtrue;
+ tt = tt->prev;
+ }
+ if (tt->tag == PROT_FUNC && tt->frame->uniq == ruby_frame->uniq) {
+ tt->dst = (VALUE)ruby_frame->uniq;
+ tt->retval = retval;
+ JUMP_TAG(TAG_RETURN);
+ }
+ if (tt->tag == PROT_LAMBDA && !yield) {
+ tt->dst = (VALUE)tt->frame->uniq;
+ tt->retval = retval;
+ JUMP_TAG(TAG_RETURN);
+ }
+ if (tt->tag == PROT_THREAD) {
+ rb_raise(rb_eThreadError, "return can't jump across threads");
+ }
+ tt = tt->prev;
+ }
+ localjump_error("unexpected return", retval, TAG_RETURN);
+}
+
+static void
+break_jump(retval)
+ VALUE retval;
+{
+ struct tag *tt = prot_tag;
+
+ if (retval == Qundef) retval = Qnil;
+ while (tt) {
+ switch (tt->tag) {
+ case PROT_THREAD:
+ case PROT_YIELD:
+ case PROT_LOOP:
+ case PROT_LAMBDA:
+ tt->dst = (VALUE)tt->frame->uniq;
+ tt->retval = retval;
+ JUMP_TAG(TAG_BREAK);
+ break;
+ case PROT_FUNC:
+ tt = 0;
+ continue;
+ default:
+ break;
+ }
+ tt = tt->prev;
+ }
+ localjump_error("unexpected break", retval, TAG_BREAK);
+}
+
+static void
+next_jump(retval)
+ VALUE retval;
+{
+ struct tag *tt = prot_tag;
+
+ if (retval == Qundef) retval = Qnil;
+ while (tt) {
+ switch (tt->tag) {
+ case PROT_THREAD:
+ case PROT_YIELD:
+ case PROT_LOOP:
+ case PROT_LAMBDA:
+ case PROT_FUNC:
+ tt->dst = (VALUE)tt->frame->uniq;
+ tt->retval = retval;
+ JUMP_TAG(TAG_NEXT);
+ break;
+ default:
+ break;
+ }
+ tt = tt->prev;
+ }
+ localjump_error("unexpected next", retval, TAG_NEXT);
+}
+
void
-rb_need_block(void)
+rb_need_block()
{
if (!rb_block_given_p()) {
- rb_vm_localjump_error("no block given", Qnil, 0);
+ localjump_error("no block given", Qnil, 0);
}
}
-VALUE
-rb_rescue2(VALUE (* b_proc) (ANYARGS), VALUE data1,
- VALUE (* r_proc) (ANYARGS), VALUE data2, ...)
+static VALUE
+rb_yield_0(val, self, klass, flags, avalue)
+ VALUE val, self, klass; /* OK */
+ int flags, avalue;
{
+ NODE *node, *var;
+ volatile VALUE result = Qnil;
+ volatile VALUE old_cref;
+ volatile VALUE old_wrapper;
+ struct BLOCK * volatile block;
+ struct SCOPE * volatile old_scope;
+ int old_vmode;
+ struct FRAME frame;
+ NODE *cnode = ruby_current_node;
+ int lambda = flags & YIELD_LAMBDA_CALL;
int state;
- rb_thread_t *th = GET_THREAD();
- rb_control_frame_t *cfp = th->cfp;
- volatile VALUE result;
- volatile VALUE e_info = th->errinfo;
- va_list args;
- PUSH_TAG();
- if ((state = EXEC_TAG()) == 0) {
- retry_entry:
- result = (*b_proc) (data1);
+ rb_need_block();
+
+ PUSH_VARS();
+ block = ruby_block;
+ frame = block->frame;
+ frame.prev = ruby_frame;
+ frame.node = cnode;
+ ruby_frame = &(frame);
+ old_cref = (VALUE)ruby_cref;
+ ruby_cref = block->cref;
+ old_wrapper = ruby_wrapper;
+ ruby_wrapper = block->wrapper;
+ old_scope = ruby_scope;
+ ruby_scope = block->scope;
+ old_vmode = scope_vmode;
+ scope_vmode = (flags & YIELD_PUBLIC_DEF) ? SCOPE_PUBLIC : block->vmode;
+ ruby_block = block->prev;
+ if (block->flags & BLOCK_D_SCOPE) {
+ /* put place holder for dynamic (in-block) local variables */
+ ruby_dyna_vars = new_dvar(0, 0, block->dyna_vars);
}
else {
- th->cfp = cfp; /* restore */
-
- if (state == TAG_RAISE) {
- int handle = FALSE;
- VALUE eclass;
-
- va_init_list(args, data2);
- while ((eclass = va_arg(args, VALUE)) != 0) {
- if (rb_obj_is_kind_of(th->errinfo, eclass)) {
- handle = TRUE;
- break;
+ /* FOR does not introduce new scope */
+ ruby_dyna_vars = block->dyna_vars;
+ }
+ PUSH_CLASS(klass ? klass : block->klass);
+ if (!klass) {
+ self = block->self;
+ }
+ node = block->body;
+ var = block->var;
+
+ if (var) {
+ PUSH_TAG(PROT_NONE);
+ if ((state = EXEC_TAG()) == 0) {
+ NODE *bvar = NULL;
+ block_var:
+ if (var == (NODE*)1) { /* no parameter || */
+ if (lambda && RARRAY(val)->len != 0) {
+ rb_raise(rb_eArgError, "wrong number of arguments (%ld for 0)",
+ RARRAY(val)->len);
}
}
- va_end(args);
-
- if (handle) {
- if (r_proc) {
- PUSH_TAG();
- if ((state = EXEC_TAG()) == 0) {
- result = (*r_proc) (data2, th->errinfo);
+ else if (var == (NODE*)2) {
+ if (TYPE(val) == T_ARRAY && RARRAY(val)->len != 0) {
+ rb_raise(rb_eArgError, "wrong number of arguments (%ld for 0)",
+ RARRAY(val)->len);
+ }
+ }
+ else if (!bvar && nd_type(var) == NODE_BLOCK_PASS) {
+ bvar = var->nd_body;
+ var = var->nd_args;
+ goto block_var;
+ }
+ else if (nd_type(var) == NODE_MASGN) {
+ if (!avalue) {
+ val = svalue_to_mrhs(val, var->nd_head);
+ }
+ massign(self, var, val, lambda);
+ }
+ else {
+ int len = 0;
+ if (avalue) {
+ len = RARRAY(val)->len;
+ if (len == 0) {
+ goto zero_arg;
}
- POP_TAG();
- if (state == TAG_RETRY) {
- state = 0;
- th->errinfo = Qnil;
- goto retry_entry;
+ if (len == 1) {
+ val = RARRAY(val)->ptr[0];
+ }
+ else {
+ goto multi_values;
}
}
- else {
- result = Qnil;
- state = 0;
+ else if (val == Qundef) {
+ zero_arg:
+ val = Qnil;
+ multi_values:
+ {
+ ruby_current_node = var;
+ rb_warn("multiple values for a block parameter (%d for 1)\n\tfrom %s:%d",
+ len, cnode->nd_file, nd_line(cnode));
+ ruby_current_node = cnode;
+ }
}
- if (state == 0) {
- th->errinfo = e_info;
+ assign(self, var, val, lambda);
+ }
+ if (bvar) {
+ VALUE blk;
+ if (flags & YIELD_PROC_CALL)
+ blk = block->block_obj;
+ else
+ blk = rb_block_proc();
+ assign(self, bvar, blk, 0);
+ }
+ }
+ POP_TAG();
+ if (state) goto pop_state;
+ }
+ if (!node) {
+ state = 0;
+ goto pop_state;
+ }
+ ruby_current_node = node;
+
+ PUSH_ITER(block->iter);
+ PUSH_TAG(lambda ? PROT_NONE : PROT_YIELD);
+ if ((state = EXEC_TAG()) == 0) {
+ redo:
+ if (nd_type(node) == NODE_CFUNC || nd_type(node) == NODE_IFUNC) {
+ switch (node->nd_state) {
+ case YIELD_FUNC_LAMBDA:
+ if (!avalue) {
+ val = rb_ary_new3(1, val);
+ }
+ break;
+ case YIELD_FUNC_AVALUE:
+ if (!avalue) {
+ val = svalue_to_avalue(val);
+ }
+ break;
+ default:
+ if (avalue) {
+ val = avalue_to_svalue(val);
+ }
+ if (val == Qundef && node->nd_state != YIELD_FUNC_SVALUE)
+ val = Qnil;
+ }
+ result = (*node->nd_cfnc)(val, node->nd_tval, self);
+ }
+ else {
+ result = rb_eval(self, node);
+ }
+ }
+ else {
+ switch (state) {
+ case TAG_REDO:
+ state = 0;
+ CHECK_INTS;
+ goto redo;
+ case TAG_NEXT:
+ if (!lambda) {
+ state = 0;
+ result = prot_tag->retval;
+ }
+ break;
+ case TAG_BREAK:
+ if (TAG_DST()) {
+ result = prot_tag->retval;
+ }
+ else {
+ lambda = Qtrue; /* just pass TAG_BREAK */
+ }
+ break;
+ default:
+ break;
+ }
+ }
+ POP_TAG();
+ POP_ITER();
+ pop_state:
+ POP_CLASS();
+ if (ruby_dyna_vars && (block->flags & BLOCK_D_SCOPE) &&
+ !FL_TEST(ruby_dyna_vars, DVAR_DONT_RECYCLE)) {
+ struct RVarmap *vars = ruby_dyna_vars;
+
+ if (ruby_dyna_vars->id == 0) {
+ vars = ruby_dyna_vars->next;
+ rb_gc_force_recycle((VALUE)ruby_dyna_vars);
+ while (vars && vars->id != 0 && vars != block->dyna_vars) {
+ struct RVarmap *tmp = vars->next;
+ rb_gc_force_recycle((VALUE)vars);
+ vars = tmp;
+ }
+ }
+ }
+ POP_VARS();
+ ruby_block = block;
+ ruby_frame = ruby_frame->prev;
+ ruby_cref = (NODE*)old_cref;
+ ruby_wrapper = old_wrapper;
+ if (ruby_scope->flags & SCOPE_DONT_RECYCLE)
+ scope_dup(old_scope);
+ ruby_scope = old_scope;
+ scope_vmode = old_vmode;
+ switch (state) {
+ case 0:
+ break;
+ case TAG_BREAK:
+ if (!lambda) {
+ struct tag *tt = prot_tag;
+
+ while (tt) {
+ if (tt->tag == PROT_LOOP && tt->blkid == ruby_block->uniq) {
+ tt->dst = (VALUE)tt->frame->uniq;
+ tt->retval = result;
+ JUMP_TAG(TAG_BREAK);
}
+ tt = tt->prev;
+ }
+ proc_jump_error(TAG_BREAK, result);
+ }
+ /* fall through */
+ default:
+ JUMP_TAG(state);
+ break;
+ }
+ ruby_current_node = cnode;
+ return result;
+}
+
+VALUE
+rb_yield(val)
+ VALUE val;
+{
+ return rb_yield_0(val, 0, 0, 0, Qfalse);
+}
+
+VALUE
+#ifdef HAVE_STDARG_PROTOTYPES
+rb_yield_values(int n, ...)
+#else
+rb_yield_values(n, va_alist)
+ int n;
+ va_dcl
+#endif
+{
+ va_list args;
+ VALUE ary;
+
+ if (n == 0) {
+ return rb_yield_0(Qundef, 0, 0, 0, Qfalse);
+ }
+ ary = rb_ary_new2(n);
+ va_init_list(args, n);
+ while (n--) {
+ rb_ary_push(ary, va_arg(args, VALUE));
+ }
+ va_end(args);
+ return rb_yield_0(ary, 0, 0, 0, Qtrue);
+}
+
+VALUE
+rb_yield_splat(values)
+ VALUE values;
+{
+ int avalue = Qfalse;
+
+ if (TYPE(values) == T_ARRAY) {
+ if (RARRAY(values)->len == 0) {
+ values = Qundef;
+ }
+ else {
+ avalue = Qtrue;
+ }
+ }
+ return rb_yield_0(values, 0, 0, 0, avalue);
+}
+
+static VALUE
+loop_i()
+{
+ for (;;) {
+ rb_yield_0(Qundef, 0, 0, 0, Qfalse);
+ CHECK_INTS;
+ }
+ return Qnil;
+}
+
+/*
+ * call-seq:
+ * loop {|| block }
+ *
+ * Repeatedly executes the block.
+ *
+ * loop do
+ * print "Input: "
+ * line = gets
+ * break if !line or line =~ /^qQ/
+ * # ...
+ * end
+ *
+ * StopIteration raised in the block breaks the loop.
+ */
+
+static VALUE
+rb_f_loop()
+{
+ rb_rescue2(loop_i, (VALUE)0, 0, 0, rb_eStopIteration, (VALUE)0);
+ return Qnil; /* dummy */
+}
+
+static VALUE
+massign(self, node, val, pcall)
+ VALUE self;
+ NODE *node;
+ VALUE val;
+ int pcall;
+{
+ NODE *list;
+ long i = 0, len;
+
+ len = RARRAY(val)->len;
+ list = node->nd_head;
+ for (; list && i<len; i++) {
+ assign(self, list->nd_head, RARRAY(val)->ptr[i], pcall);
+ list = list->nd_next;
+ }
+ if (pcall && list) goto arg_error;
+ if (node->nd_args) {
+ if ((long)(node->nd_args) == -1) {
+ /* no check for mere `*' */
+ }
+ else if (!list && i<len) {
+ assign(self, node->nd_args, rb_ary_new4(len-i, RARRAY(val)->ptr+i), pcall);
+ }
+ else {
+ assign(self, node->nd_args, rb_ary_new2(0), pcall);
+ }
+ }
+ else if (pcall && i < len) {
+ goto arg_error;
+ }
+
+ while (list) {
+ i++;
+ assign(self, list->nd_head, Qnil, pcall);
+ list = list->nd_next;
+ }
+ return val;
+
+ arg_error:
+ while (list) {
+ i++;
+ list = list->nd_next;
+ }
+ rb_raise(rb_eArgError, "wrong number of arguments (%ld for %ld)", len, i);
+}
+
+static void
+assign(self, lhs, val, pcall)
+ VALUE self;
+ NODE *lhs;
+ VALUE val;
+ int pcall;
+{
+ ruby_current_node = lhs;
+ if (val == Qundef) {
+ rb_warning("assigning void value");
+ val = Qnil;
+ }
+ switch (nd_type(lhs)) {
+ case NODE_GASGN:
+ rb_gvar_set(lhs->nd_entry, val);
+ break;
+
+ case NODE_IASGN:
+ rb_ivar_set(self, lhs->nd_vid, val);
+ break;
+
+ case NODE_LASGN:
+ if (ruby_scope->local_vars == 0)
+ rb_bug("unexpected local variable assignment");
+ ruby_scope->local_vars[lhs->nd_cnt] = val;
+ break;
+
+ case NODE_DASGN:
+ dvar_asgn(lhs->nd_vid, val);
+ break;
+
+ case NODE_DASGN_CURR:
+ dvar_asgn_curr(lhs->nd_vid, val);
+ break;
+
+ case NODE_CDECL:
+ if (lhs->nd_vid == 0) {
+ rb_const_set(class_prefix(self, lhs->nd_else), lhs->nd_else->nd_mid, val);
+ }
+ else {
+ rb_const_set(ruby_cbase, lhs->nd_vid, val);
+ }
+ break;
+
+ case NODE_CVDECL:
+ if (RTEST(ruby_verbose) && FL_TEST(ruby_cbase, FL_SINGLETON)) {
+ rb_warn("declaring singleton class variable");
+ }
+ rb_cvar_set(cvar_cbase(), lhs->nd_vid, val, Qtrue);
+ break;
+
+ case NODE_CVASGN:
+ rb_cvar_set(cvar_cbase(), lhs->nd_vid, val, Qfalse);
+ break;
+
+ case NODE_MASGN:
+ massign(self, lhs, svalue_to_mrhs(val, lhs->nd_head), pcall);
+ break;
+
+ case NODE_CALL:
+ case NODE_ATTRASGN:
+ {
+ VALUE recv;
+ int scope;
+ if (lhs->nd_recv == (NODE *)1) {
+ recv = self;
+ scope = 1;
+ }
+ else {
+ recv = rb_eval(self, lhs->nd_recv);
+ scope = 0;
+ }
+ if (!lhs->nd_args) {
+ /* attr set */
+ ruby_current_node = lhs;
+ SET_CURRENT_SOURCE();
+ rb_call(CLASS_OF(recv), recv, lhs->nd_mid, 1, &val, scope, self);
+ }
+ else {
+ /* array set */
+ VALUE args;
+
+ args = rb_eval(self, lhs->nd_args);
+ rb_ary_push(args, val);
+ ruby_current_node = lhs;
+ SET_CURRENT_SOURCE();
+ rb_call(CLASS_OF(recv), recv, lhs->nd_mid,
+ RARRAY(args)->len, RARRAY(args)->ptr, scope, self);
}
}
+ break;
+
+ default:
+ rb_bug("bug in variable assignment");
+ break;
}
+}
+
+VALUE
+rb_iterate(it_proc, data1, bl_proc, data2)
+ VALUE (*it_proc) _((VALUE)), (*bl_proc)(ANYARGS);
+ VALUE data1, data2;
+{
+ int state;
+ volatile VALUE retval = Qnil;
+ NODE *node = NEW_IFUNC(bl_proc, data2);
+ VALUE self = ruby_top_self;
+
+ PUSH_TAG(PROT_LOOP);
+ PUSH_BLOCK(0, node);
+ PUSH_ITER(ITER_PRE);
+ state = EXEC_TAG();
+ if (state == 0) {
+ iter_retry:
+ retval = (*it_proc)(data1);
+ }
+ else if (state == TAG_BREAK && TAG_DST()) {
+ retval = prot_tag->retval;
+ state = 0;
+ }
+ else if (state == TAG_RETRY) {
+ state = 0;
+ goto iter_retry;
+ }
+ POP_ITER();
+ POP_BLOCK();
POP_TAG();
- if (state)
+
+ switch (state) {
+ case 0:
+ break;
+ default:
JUMP_TAG(state);
+ }
+ return retval;
+}
+
+static int
+handle_rescue(self, node)
+ VALUE self;
+ NODE *node;
+{
+ int argc; VALUE *argv; /* used in SETUP_ARGS */
+ TMP_PROTECT;
+
+ if (!node->nd_args) {
+ return rb_obj_is_kind_of(ruby_errinfo, rb_eStandardError);
+ }
+
+ BEGIN_CALLARGS;
+ SETUP_ARGS(node->nd_args);
+ END_CALLARGS;
+
+ while (argc--) {
+ if (!rb_obj_is_kind_of(argv[0], rb_cModule)) {
+ rb_raise(rb_eTypeError, "class or module required for rescue clause");
+ }
+ if (RTEST(rb_funcall(*argv, eqq, 1, ruby_errinfo))) return 1;
+ argv++;
+ }
+ return 0;
+}
+
+VALUE
+#ifdef HAVE_STDARG_PROTOTYPES
+rb_rescue2(VALUE (*b_proc)(ANYARGS), VALUE data1, VALUE (*r_proc)(ANYARGS), VALUE data2, ...)
+#else
+rb_rescue2(b_proc, data1, r_proc, data2, va_alist)
+ VALUE (*b_proc)(ANYARGS), (*r_proc)(ANYARGS);
+ VALUE data1, data2;
+ va_dcl
+#endif
+{
+ int state;
+ volatile VALUE result;
+ volatile VALUE e_info = ruby_errinfo;
+ volatile int handle = Qfalse;
+ VALUE eclass;
+ va_list args;
+
+ PUSH_TAG(PROT_NONE);
+ switch (state = EXEC_TAG()) {
+ case TAG_RETRY:
+ if (!handle) break;
+ handle = Qfalse;
+ state = 0;
+ ruby_errinfo = Qnil;
+ case 0:
+ result = (*b_proc)(data1);
+ break;
+ case TAG_RAISE:
+ if (handle) break;
+ handle = Qfalse;
+ va_init_list(args, data2);
+ while ((eclass = va_arg(args, VALUE)) != 0) {
+ if (rb_obj_is_kind_of(ruby_errinfo, eclass)) {
+ handle = Qtrue;
+ break;
+ }
+ }
+ va_end(args);
+
+ if (handle) {
+ state = 0;
+ if (r_proc) {
+ result = (*r_proc)(data2, ruby_errinfo);
+ }
+ else {
+ result = Qnil;
+ }
+ ruby_errinfo = e_info;
+ }
+ }
+ POP_TAG();
+ if (state) JUMP_TAG(state);
return result;
}
VALUE
-rb_rescue(VALUE (* b_proc)(ANYARGS), VALUE data1,
- VALUE (* r_proc)(ANYARGS), VALUE data2)
+rb_rescue(b_proc, data1, r_proc, data2)
+ VALUE (*b_proc)(), (*r_proc)();
+ VALUE data1, data2;
{
- return rb_rescue2(b_proc, data1, r_proc, data2, rb_eStandardError,
- (VALUE)0);
+ return rb_rescue2(b_proc, data1, r_proc, data2, rb_eStandardError, (VALUE)0);
}
+static VALUE cont_protect;
+
VALUE
-rb_protect(VALUE (* proc) (VALUE), VALUE data, int * state)
+rb_protect(proc, data, state)
+ VALUE (*proc) _((VALUE));
+ VALUE data;
+ int *state;
{
- volatile VALUE result = Qnil;
+ VALUE result = Qnil; /* OK */
int status;
- rb_thread_t *th = GET_THREAD();
- rb_control_frame_t *cfp = th->cfp;
- struct rb_vm_trap_tag trap_tag;
- rb_jmpbuf_t org_jmpbuf;
- trap_tag.prev = th->trap_tag;
-
- PUSH_TAG();
- th->trap_tag = &trap_tag;
- MEMCPY(&org_jmpbuf, &(th)->root_jmpbuf, rb_jmpbuf_t, 1);
+ PUSH_TAG(PROT_NONE);
+ cont_protect = (VALUE)rb_node_newnode(NODE_MEMO, cont_protect, 0, 0);
if ((status = EXEC_TAG()) == 0) {
- SAVE_ROOT_JMPBUF(th, result = (*proc) (data));
+ result = (*proc)(data);
}
- MEMCPY(&(th)->root_jmpbuf, &org_jmpbuf, rb_jmpbuf_t, 1);
- th->trap_tag = trap_tag.prev;
+ cont_protect = ((NODE *)cont_protect)->u1.value;
POP_TAG();
-
if (state) {
*state = status;
}
if (status != 0) {
- th->cfp = cfp;
return Qnil;
}
@@ -670,81 +5525,2188 @@ rb_protect(VALUE (* proc) (VALUE), VALUE data, int * state)
}
VALUE
-rb_ensure(VALUE (*b_proc)(ANYARGS), VALUE data1, VALUE (*e_proc)(ANYARGS), VALUE data2)
+rb_ensure(b_proc, data1, e_proc, data2)
+ VALUE (*b_proc)();
+ VALUE data1;
+ VALUE (*e_proc)();
+ VALUE data2;
{
int state;
volatile VALUE result = Qnil;
+ VALUE retval;
- PUSH_TAG();
+ PUSH_TAG(PROT_NONE);
if ((state = EXEC_TAG()) == 0) {
- result = (*b_proc) (data1);
+ result = (*b_proc)(data1);
}
POP_TAG();
- /* TODO: fix me */
- /* retval = prot_tag ? prot_tag->retval : Qnil; */ /* save retval */
- (*e_proc) (data2);
- if (state)
+ retval = prot_tag ? prot_tag->retval : Qnil; /* save retval */
+ if (!thread_no_ensure()) {
+ (*e_proc)(data2);
+ }
+ if (prot_tag) return_value(retval);
+ if (state) JUMP_TAG(state);
+ return result;
+}
+
+VALUE
+rb_with_disable_interrupt(proc, data)
+ VALUE (*proc)();
+ VALUE data;
+{
+ VALUE result = Qnil; /* OK */
+ int status;
+
+ DEFER_INTS;
+ {
+ int thr_critical = rb_thread_critical;
+
+ rb_thread_critical = Qtrue;
+ PUSH_TAG(PROT_NONE);
+ if ((status = EXEC_TAG()) == 0) {
+ result = (*proc)(data);
+ }
+ POP_TAG();
+ rb_thread_critical = thr_critical;
+ }
+ ENABLE_INTS;
+ if (status) JUMP_TAG(status);
+
+ return result;
+}
+
+static void
+stack_check()
+{
+ static int overflowing = 0;
+
+ if (!overflowing && ruby_stack_check()) {
+ int state;
+ overflowing = 1;
+ PUSH_TAG(PROT_NONE);
+ if ((state = EXEC_TAG()) == 0) {
+ rb_exc_raise(sysstack_error);
+ }
+ POP_TAG();
+ overflowing = 0;
JUMP_TAG(state);
+ }
+}
+
+static int last_call_status;
+
+#define CSTAT_PRIV 1
+#define CSTAT_PROT 2
+#define CSTAT_VCALL 4
+#define CSTAT_SUPER 8
+
+/*
+ * call-seq:
+ * obj.method_missing(symbol [, *args] ) => result
+ *
+ * Invoked by Ruby when <i>obj</i> is sent a message it cannot handle.
+ * <i>symbol</i> is the symbol for the method called, and <i>args</i>
+ * are any arguments that were passed to it. By default, the interpreter
+ * raises an error when this method is called. However, it is possible
+ * to override the method to provide more dynamic behavior.
+ * The example below creates
+ * a class <code>Roman</code>, which responds to methods with names
+ * consisting of roman numerals, returning the corresponding integer
+ * values.
+ *
+ * class Roman
+ * def romanToInt(str)
+ * # ...
+ * end
+ * def method_missing(methId)
+ * str = methId.id2name
+ * romanToInt(str)
+ * end
+ * end
+ *
+ * r = Roman.new
+ * r.iv #=> 4
+ * r.xxiii #=> 23
+ * r.mm #=> 2000
+ */
+
+static VALUE
+rb_method_missing(argc, argv, obj)
+ int argc;
+ VALUE *argv;
+ VALUE obj;
+{
+ ID id;
+ VALUE exc = rb_eNoMethodError;
+ const char *format = 0;
+ NODE *cnode = ruby_current_node;
+
+ if (argc == 0 || !SYMBOL_P(argv[0])) {
+ rb_raise(rb_eArgError, "no id given");
+ }
+
+ stack_check();
+
+ id = SYM2ID(argv[0]);
+
+ if (last_call_status & CSTAT_PRIV) {
+ format = "private method `%s' called for %s";
+ }
+ else if (last_call_status & CSTAT_PROT) {
+ format = "protected method `%s' called for %s";
+ }
+ else if (last_call_status & CSTAT_VCALL) {
+ format = "undefined local variable or method `%s' for %s";
+ exc = rb_eNameError;
+ }
+ else if (last_call_status & CSTAT_SUPER) {
+ format = "super: no superclass method `%s'";
+ }
+ if (!format) {
+ format = "undefined method `%s' for %s";
+ }
+
+ ruby_current_node = cnode;
+ {
+ int n = 0;
+ VALUE args[3];
+
+ args[n++] = rb_funcall(rb_const_get(exc, rb_intern("message")), '!',
+ 3, rb_str_new2(format), obj, argv[0]);
+ args[n++] = argv[0];
+ if (exc == rb_eNoMethodError) {
+ args[n++] = rb_ary_new4(argc-1, argv+1);
+ }
+ exc = rb_class_new_instance(n, args, exc);
+ ruby_frame = ruby_frame->prev; /* pop frame for "method_missing" */
+ rb_exc_raise(exc);
+ }
+
+ return Qnil; /* not reached */
+}
+
+static VALUE
+method_missing(obj, id, argc, argv, call_status)
+ VALUE obj;
+ ID id;
+ int argc;
+ const VALUE *argv;
+ int call_status;
+{
+ VALUE *nargv;
+
+ last_call_status = call_status;
+
+ if (id == missing) {
+ PUSH_FRAME();
+ rb_method_missing(argc, argv, obj);
+ POP_FRAME();
+ }
+ else if (id == ID_ALLOCATOR) {
+ rb_raise(rb_eTypeError, "allocator undefined for %s", rb_class2name(obj));
+ }
+ if (argc < 0) {
+ VALUE tmp;
+
+ argc = -argc-1;
+ tmp = splat_value(argv[argc]);
+ nargv = ALLOCA_N(VALUE, argc + RARRAY(tmp)->len + 1);
+ MEMCPY(nargv+1, argv, VALUE, argc);
+ MEMCPY(nargv+1+argc, RARRAY(tmp)->ptr, VALUE, RARRAY(tmp)->len);
+ argc += RARRAY(tmp)->len;
+ }
+ else {
+ nargv = ALLOCA_N(VALUE, argc+1);
+ MEMCPY(nargv+1, argv, VALUE, argc);
+ }
+ nargv[0] = ID2SYM(id);
+ return rb_funcall2(obj, missing, argc+1, nargv);
+}
+
+static inline VALUE
+call_cfunc(func, recv, len, argc, argv)
+ VALUE (*func)();
+ VALUE recv;
+ int len, argc;
+ VALUE *argv;
+{
+ if (len >= 0 && argc != len) {
+ rb_raise(rb_eArgError, "wrong number of arguments (%d for %d)",
+ argc, len);
+ }
+
+ switch (len) {
+ case -2:
+ return (*func)(recv, rb_ary_new4(argc, argv));
+ break;
+ case -1:
+ return (*func)(argc, argv, recv);
+ break;
+ case 0:
+ return (*func)(recv);
+ break;
+ case 1:
+ return (*func)(recv, argv[0]);
+ break;
+ case 2:
+ return (*func)(recv, argv[0], argv[1]);
+ break;
+ case 3:
+ return (*func)(recv, argv[0], argv[1], argv[2]);
+ break;
+ case 4:
+ return (*func)(recv, argv[0], argv[1], argv[2], argv[3]);
+ break;
+ case 5:
+ return (*func)(recv, argv[0], argv[1], argv[2], argv[3], argv[4]);
+ break;
+ case 6:
+ return (*func)(recv, argv[0], argv[1], argv[2], argv[3], argv[4],
+ argv[5]);
+ break;
+ case 7:
+ return (*func)(recv, argv[0], argv[1], argv[2], argv[3], argv[4],
+ argv[5], argv[6]);
+ break;
+ case 8:
+ return (*func)(recv, argv[0], argv[1], argv[2], argv[3], argv[4],
+ argv[5], argv[6], argv[7]);
+ break;
+ case 9:
+ return (*func)(recv, argv[0], argv[1], argv[2], argv[3], argv[4],
+ argv[5], argv[6], argv[7], argv[8]);
+ break;
+ case 10:
+ return (*func)(recv, argv[0], argv[1], argv[2], argv[3], argv[4],
+ argv[5], argv[6], argv[7], argv[8], argv[9]);
+ break;
+ case 11:
+ return (*func)(recv, argv[0], argv[1], argv[2], argv[3], argv[4],
+ argv[5], argv[6], argv[7], argv[8], argv[9], argv[10]);
+ break;
+ case 12:
+ return (*func)(recv, argv[0], argv[1], argv[2], argv[3], argv[4],
+ argv[5], argv[6], argv[7], argv[8], argv[9],
+ argv[10], argv[11]);
+ break;
+ case 13:
+ return (*func)(recv, argv[0], argv[1], argv[2], argv[3], argv[4],
+ argv[5], argv[6], argv[7], argv[8], argv[9], argv[10],
+ argv[11], argv[12]);
+ break;
+ case 14:
+ return (*func)(recv, argv[0], argv[1], argv[2], argv[3], argv[4],
+ argv[5], argv[6], argv[7], argv[8], argv[9], argv[10],
+ argv[11], argv[12], argv[13]);
+ break;
+ case 15:
+ return (*func)(recv, argv[0], argv[1], argv[2], argv[3], argv[4],
+ argv[5], argv[6], argv[7], argv[8], argv[9], argv[10],
+ argv[11], argv[12], argv[13], argv[14]);
+ break;
+ default:
+ rb_raise(rb_eArgError, "too many arguments (%d)", len);
+ break;
+ }
+ return Qnil; /* not reached */
+}
+
+static VALUE
+rb_call0(klass, recv, id, oid, argc, argv, body, flags)
+ VALUE klass, recv;
+ ID id;
+ ID oid;
+ int argc; /* OK */
+ VALUE *argv; /* OK */
+ NODE * volatile body;
+ int flags;
+{
+ NODE *b2; /* OK */
+ volatile VALUE result = Qnil;
+ int itr;
+ static int tick;
+ TMP_PROTECT;
+ volatile int safe = -1;
+
+ if (NOEX_SAFE(flags) > ruby_safe_level &&
+ ruby_safe_level == 0 && NOEX_SAFE(flags) > 2) {
+ rb_raise(rb_eSecurityError, "calling insecure method: %s",
+ rb_id2name(id));
+ }
+ switch (ruby_iter->iter) {
+ case ITER_PRE:
+ case ITER_PAS:
+ itr = ITER_CUR;
+ break;
+ case ITER_CUR:
+ default:
+ itr = ITER_NOT;
+ break;
+ }
+
+ if ((++tick & 0xff) == 0) {
+ CHECK_INTS; /* better than nothing */
+ stack_check();
+ rb_gc_finalize_deferred();
+ }
+ if (argc < 0) {
+ VALUE tmp;
+ VALUE *nargv;
+
+ argc = -argc-1;
+ tmp = splat_value(argv[argc]);
+ nargv = TMP_ALLOC(argc + RARRAY(tmp)->len);
+ MEMCPY(nargv, argv, VALUE, argc);
+ MEMCPY(nargv+argc, RARRAY(tmp)->ptr, VALUE, RARRAY(tmp)->len);
+ argc += RARRAY(tmp)->len;
+ argv = nargv;
+ }
+ PUSH_ITER(itr);
+ PUSH_FRAME();
+
+ ruby_frame->last_func = id;
+ ruby_frame->orig_func = oid;
+ ruby_frame->last_class = (flags & NOEX_NOSUPER)?0:klass;
+ ruby_frame->self = recv;
+ ruby_frame->argc = argc;
+ ruby_frame->flags = 0;
+
+ switch (nd_type(body)) {
+ case NODE_CFUNC:
+ {
+ int len = body->nd_argc;
+
+ if (len < -2) {
+ rb_bug("bad argc (%d) specified for `%s(%s)'",
+ len, rb_class2name(klass), rb_id2name(id));
+ }
+ if (event_hooks) {
+ int state;
+
+ EXEC_EVENT_HOOK(RUBY_EVENT_C_CALL, ruby_current_node,
+ recv, id, klass);
+ PUSH_TAG(PROT_FUNC);
+ if ((state = EXEC_TAG()) == 0) {
+ result = call_cfunc(body->nd_cfnc, recv, len, argc, argv);
+ }
+ POP_TAG();
+ ruby_current_node = ruby_frame->node;
+ EXEC_EVENT_HOOK(RUBY_EVENT_C_RETURN, ruby_current_node,
+ recv, id, klass);
+ if (state) JUMP_TAG(state);
+ }
+ else {
+ result = call_cfunc(body->nd_cfnc, recv, len, argc, argv);
+ }
+ }
+ break;
+
+ /* for attr get/set */
+ case NODE_IVAR:
+ if (argc != 0) {
+ rb_raise(rb_eArgError, "wrong number of arguments (%d for 0)", argc);
+ }
+ result = rb_attr_get(recv, body->nd_vid);
+ break;
+
+ case NODE_ATTRSET:
+ if (argc != 1)
+ rb_raise(rb_eArgError, "wrong number of arguments (%d for 1)", argc);
+ result = rb_ivar_set(recv, body->nd_vid, argv[0]);
+ break;
+
+ case NODE_ZSUPER:
+ result = rb_call_super(argc, argv);
+ break;
+
+ case NODE_DMETHOD:
+ result = method_call(argc, argv, umethod_bind(body->nd_cval, recv));
+ break;
+
+ case NODE_BMETHOD:
+ ruby_frame->flags |= FRAME_DMETH;
+ if (event_hooks) {
+ struct BLOCK *data;
+ Data_Get_Struct(body->nd_cval, struct BLOCK, data);
+ EXEC_EVENT_HOOK(RUBY_EVENT_CALL, data->body, recv, id, klass);
+ }
+ result = proc_invoke(body->nd_cval, rb_ary_new4(argc, argv), recv, klass);
+ if (event_hooks) {
+ EXEC_EVENT_HOOK(RUBY_EVENT_RETURN, ruby_current_node, recv, id, klass);
+ }
+ break;
+
+ case NODE_SCOPE:
+ {
+ int state;
+ VALUE *local_vars; /* OK */
+ NODE *saved_cref = 0;
+
+ PUSH_SCOPE();
+ if (body->nd_rval) {
+ saved_cref = ruby_cref;
+ ruby_cref = (NODE*)body->nd_rval;
+ }
+ PUSH_CLASS(ruby_cbase);
+ if (body->nd_tbl) {
+ local_vars = TMP_ALLOC(body->nd_tbl[0]+1);
+ *local_vars++ = (VALUE)body;
+ rb_mem_clear(local_vars, body->nd_tbl[0]);
+ ruby_scope->local_tbl = body->nd_tbl;
+ ruby_scope->local_vars = local_vars;
+ }
+ else {
+ local_vars = ruby_scope->local_vars = 0;
+ ruby_scope->local_tbl = 0;
+ }
+ b2 = body = body->nd_next;
+
+ if (NOEX_SAFE(flags) > ruby_safe_level) {
+ safe = ruby_safe_level;
+ ruby_safe_level = NOEX_SAFE(flags);
+ }
+ PUSH_VARS();
+ PUSH_TAG(PROT_FUNC);
+ if ((state = EXEC_TAG()) == 0) {
+ NODE *node = 0;
+ int i, nopt = 0;
+
+ if (nd_type(body) == NODE_ARGS) {
+ node = body;
+ body = 0;
+ }
+ else if (nd_type(body) == NODE_BLOCK) {
+ node = body->nd_head;
+ body = body->nd_next;
+ }
+ if (node) {
+ if (nd_type(node) != NODE_ARGS) {
+ rb_bug("no argument-node");
+ }
+
+ i = node->nd_cnt;
+ if (i > argc) {
+ rb_raise(rb_eArgError, "wrong number of arguments (%d for %d)",
+ argc, i);
+ }
+ if (!node->nd_rest) {
+ NODE *optnode = node->nd_opt;
+
+ nopt = i;
+ while (optnode) {
+ nopt++;
+ optnode = optnode->nd_next;
+ }
+ if (nopt < argc) {
+ rb_raise(rb_eArgError,
+ "wrong number of arguments (%d for %d)",
+ argc, nopt);
+ }
+ }
+ if (local_vars) {
+ if (i > 0) {
+ /* +2 for $_ and $~ */
+ MEMCPY(local_vars+2, argv, VALUE, i);
+ }
+ }
+ argv += i; argc -= i;
+ if (node->nd_opt) {
+ NODE *opt = node->nd_opt;
+
+ while (opt && argc) {
+ assign(recv, opt->nd_head, *argv, 1);
+ argv++; argc--;
+ ++i;
+ opt = opt->nd_next;
+ }
+ if (opt) {
+ rb_eval(recv, opt);
+ while (opt) {
+ opt = opt->nd_next;
+ ++i;
+ }
+ }
+ }
+ if (!node->nd_rest) {
+ i = nopt;
+ }
+ else {
+ VALUE v;
+
+ if (argc > 0) {
+ v = rb_ary_new4(argc,argv);
+ i = -i - 1;
+ }
+ else {
+ v = rb_ary_new2(0);
+ }
+ assign(recv, node->nd_rest, v, 1);
+ }
+ ruby_frame->argc = i;
+ }
+ if (event_hooks) {
+ EXEC_EVENT_HOOK(RUBY_EVENT_CALL, b2, recv, id, klass);
+ }
+ result = rb_eval(recv, body);
+ }
+ else if (state == TAG_RETURN && TAG_DST()) {
+ result = prot_tag->retval;
+ state = 0;
+ }
+ POP_TAG();
+ if (event_hooks) {
+ EXEC_EVENT_HOOK(RUBY_EVENT_RETURN, ruby_current_node, recv, id, klass);
+ }
+ POP_VARS();
+ POP_CLASS();
+ POP_SCOPE();
+ ruby_cref = saved_cref;
+ if (safe >= 0) ruby_safe_level = safe;
+ switch (state) {
+ case 0:
+ break;
+
+ case TAG_BREAK:
+ case TAG_RETURN:
+ JUMP_TAG(state);
+ break;
+
+ case TAG_RETRY:
+ if (rb_block_given_p()) JUMP_TAG(state);
+ /* fall through */
+ default:
+ jump_tag_but_local_jump(state, result);
+ break;
+ }
+ }
+ break;
+
+ default:
+ unknown_node(body);
+ break;
+ }
+ POP_FRAME();
+ POP_ITER();
return result;
}
-static ID
-frame_func_id(rb_control_frame_t *cfp)
+static VALUE
+rb_call(klass, recv, mid, argc, argv, scope, self)
+ VALUE klass, recv;
+ ID mid;
+ int argc; /* OK */
+ const VALUE *argv; /* OK */
+ int scope;
+ VALUE self;
{
- rb_iseq_t *iseq = cfp->iseq;
- if (!iseq) {
- return cfp->me->def->original_id;
+ NODE *body; /* OK */
+ int noex;
+ ID id = mid;
+ struct cache_entry *ent;
+
+ if (!klass) {
+ rb_raise(rb_eNotImpError, "method `%s' called on terminated object (0x%lx)",
+ rb_id2name(mid), recv);
}
- while (iseq) {
- if (RUBY_VM_IFUNC_P(iseq)) {
- return rb_intern("<ifunc>");
+ /* is it in the method cache? */
+ ent = cache + EXPR1(klass, mid);
+ if (ent->mid == mid && ent->klass == klass) {
+ if (!ent->method)
+ return method_missing(recv, mid, argc, argv, scope==2?CSTAT_VCALL:0);
+ klass = ent->origin;
+ id = ent->mid0;
+ noex = ent->noex;
+ body = ent->method;
+ }
+ else if ((body = rb_get_method_body(&klass, &id, &noex)) == 0) {
+ if (scope == 3) {
+ return method_missing(recv, mid, argc, argv, CSTAT_SUPER);
}
- if (iseq->defined_method_id) {
- return iseq->defined_method_id;
+ return method_missing(recv, mid, argc, argv, scope==2?CSTAT_VCALL:0);
+ }
+
+ if (mid != missing && scope == 0) {
+ /* receiver specified form for private method */
+ if (noex & NOEX_PRIVATE)
+ return method_missing(recv, mid, argc, argv, CSTAT_PRIV);
+
+ /* self must be kind of a specified form for protected method */
+ if (noex & NOEX_PROTECTED) {
+ VALUE defined_class = klass;
+
+ if (self == Qundef) self = ruby_frame->self;
+ if (TYPE(defined_class) == T_ICLASS) {
+ defined_class = RBASIC(defined_class)->klass;
+ }
+ if (!rb_obj_is_kind_of(self, rb_class_real(defined_class)))
+ return method_missing(recv, mid, argc, argv, CSTAT_PROT);
}
- if (iseq->local_iseq == iseq) {
- break;
+ }
+
+ return rb_call0(klass, recv, mid, id, argc, argv, body, noex);
+}
+
+VALUE
+rb_apply(recv, mid, args)
+ VALUE recv;
+ ID mid;
+ VALUE args;
+{
+ int argc;
+ VALUE *argv;
+
+ argc = RARRAY(args)->len; /* Assigns LONG, but argc is INT */
+ argv = ALLOCA_N(VALUE, argc);
+ MEMCPY(argv, RARRAY(args)->ptr, VALUE, argc);
+ return rb_call(CLASS_OF(recv), recv, mid, argc, argv, 1, Qundef);
+}
+
+/*
+ * call-seq:
+ * obj.send(symbol [, args...]) => obj
+ * obj.__send__(symbol [, args...]) => obj
+ *
+ * Invokes the method identified by _symbol_, passing it any
+ * arguments specified. You can use <code>\_\_send__</code> if the name
+ * +send+ clashes with an existing method in _obj_.
+ *
+ * class Klass
+ * def hello(*args)
+ * "Hello " + args.join(' ')
+ * end
+ * end
+ * k = Klass.new
+ * k.send :hello, "gentle", "readers" #=> "Hello gentle readers"
+ */
+
+static VALUE
+rb_f_send(argc, argv, recv)
+ int argc;
+ VALUE *argv;
+ VALUE recv;
+{
+ VALUE vid;
+
+ if (argc == 0) rb_raise(rb_eArgError, "no method name given");
+
+ vid = *argv++; argc--;
+ PUSH_ITER(rb_block_given_p()?ITER_PRE:ITER_NOT);
+ vid = rb_call(CLASS_OF(recv), recv, rb_to_id(vid), argc, argv, 1, Qundef);
+ POP_ITER();
+
+ return vid;
+}
+
+static VALUE
+vafuncall(recv, mid, n, ar)
+ VALUE recv;
+ ID mid;
+ int n;
+ va_list *ar;
+{
+ VALUE *argv;
+
+ if (n > 0) {
+ long i;
+
+ argv = ALLOCA_N(VALUE, n);
+
+ for (i=0;i<n;i++) {
+ argv[i] = va_arg(*ar, VALUE);
}
- iseq = iseq->parent_iseq;
+ va_end(*ar);
}
- return 0;
+ else {
+ argv = 0;
+ }
+
+ return rb_call(CLASS_OF(recv), recv, mid, n, argv, 1, Qundef);
+}
+
+VALUE
+#ifdef HAVE_STDARG_PROTOTYPES
+rb_funcall(VALUE recv, ID mid, int n, ...)
+#else
+rb_funcall(recv, mid, n, va_alist)
+ VALUE recv;
+ ID mid;
+ int n;
+ va_dcl
+#endif
+{
+ va_list ar;
+ va_init_list(ar, n);
+
+ return vafuncall(recv, mid, n, &ar);
+}
+
+VALUE
+#ifdef HAVE_STDARG_PROTOTYPES
+rb_funcall_rescue(VALUE recv, ID mid, int n, ...)
+#else
+rb_funcall_rescue(recv, mid, n, va_alist)
+ VALUE recv;
+ ID mid;
+ int n;
+ va_dcl
+#endif
+{
+ VALUE result = Qnil; /* OK */
+ int status;
+ va_list ar;
+
+ va_init_list(ar, n);
+
+ PUSH_TAG(PROT_NONE);
+ if ((status = EXEC_TAG()) == 0) {
+ result = vafuncall(recv, mid, n, &ar);
+ }
+ POP_TAG();
+ switch (status) {
+ case 0:
+ return result;
+ case TAG_RAISE:
+ return Qundef;
+ default:
+ JUMP_TAG(status);
+ }
+}
+
+VALUE
+rb_funcall2(recv, mid, argc, argv)
+ VALUE recv;
+ ID mid;
+ int argc;
+ const VALUE *argv;
+{
+ return rb_call(CLASS_OF(recv), recv, mid, argc, argv, 1, Qundef);
+}
+
+VALUE
+rb_funcall3(recv, mid, argc, argv)
+ VALUE recv;
+ ID mid;
+ int argc;
+ const VALUE *argv;
+{
+ return rb_call(CLASS_OF(recv), recv, mid, argc, argv, 0, Qundef);
+}
+
+VALUE
+rb_call_super(argc, argv)
+ int argc;
+ const VALUE *argv;
+{
+ VALUE result, self, klass;
+
+ if (ruby_frame->last_class == 0) {
+ rb_name_error(ruby_frame->last_func, "calling `super' from `%s' is prohibited",
+ rb_id2name(ruby_frame->orig_func));
+ }
+
+ self = ruby_frame->self;
+ klass = ruby_frame->last_class;
+ if (RCLASS(klass)->super == 0) {
+ return method_missing(self, ruby_frame->orig_func, argc, argv, CSTAT_SUPER);
+ }
+
+ PUSH_ITER(ruby_iter->iter ? ITER_PRE : ITER_NOT);
+ result = rb_call(RCLASS(klass)->super, self, ruby_frame->orig_func, argc, argv, 3, Qundef);
+ POP_ITER();
+
+ return result;
+}
+
+static VALUE
+backtrace(lev)
+ int lev;
+{
+ struct FRAME *frame = ruby_frame;
+ char buf[BUFSIZ];
+ VALUE ary;
+ NODE *n;
+
+ ary = rb_ary_new();
+ if (frame->last_func == ID_ALLOCATOR) {
+ frame = frame->prev;
+ }
+ if (lev < 0) {
+ ruby_set_current_source();
+ if (frame->last_func) {
+ snprintf(buf, BUFSIZ, "%s:%d:in `%s'",
+ ruby_sourcefile, ruby_sourceline,
+ rb_id2name(frame->last_func));
+ }
+ else if (ruby_sourceline == 0) {
+ snprintf(buf, BUFSIZ, "%s", ruby_sourcefile);
+ }
+ else {
+ snprintf(buf, BUFSIZ, "%s:%d", ruby_sourcefile, ruby_sourceline);
+ }
+ rb_ary_push(ary, rb_str_new2(buf));
+ if (lev < -1) return ary;
+ }
+ else {
+ while (lev-- > 0) {
+ frame = frame->prev;
+ if (!frame) {
+ ary = Qnil;
+ break;
+ }
+ }
+ }
+ for (; frame && (n = frame->node); frame = frame->prev) {
+ if (frame->prev && frame->prev->last_func) {
+ if (frame->prev->node == n) {
+ if (frame->prev->last_func == frame->last_func) continue;
+ }
+ snprintf(buf, BUFSIZ, "%s:%d:in `%s'",
+ n->nd_file, nd_line(n),
+ rb_id2name(frame->prev->last_func));
+ }
+ else {
+ snprintf(buf, BUFSIZ, "%s:%d", n->nd_file, nd_line(n));
+ }
+ rb_ary_push(ary, rb_str_new2(buf));
+ }
+
+ return ary;
+}
+
+/*
+ * call-seq:
+ * caller(start=1) => array
+ *
+ * Returns the current execution stack---an array containing strings in
+ * the form ``<em>file:line</em>'' or ``<em>file:line: in
+ * `method'</em>''. The optional _start_ parameter
+ * determines the number of initial stack entries to omit from the
+ * result.
+ *
+ * def a(skip)
+ * caller(skip)
+ * end
+ * def b(skip)
+ * a(skip)
+ * end
+ * def c(skip)
+ * b(skip)
+ * end
+ * c(0) #=> ["prog:2:in `a'", "prog:5:in `b'", "prog:8:in `c'", "prog:10"]
+ * c(1) #=> ["prog:5:in `b'", "prog:8:in `c'", "prog:11"]
+ * c(2) #=> ["prog:8:in `c'", "prog:12"]
+ * c(3) #=> ["prog:13"]
+ */
+
+static VALUE
+rb_f_caller(argc, argv)
+ int argc;
+ VALUE *argv;
+{
+ VALUE level;
+ int lev;
+
+ rb_scan_args(argc, argv, "01", &level);
+
+ if (NIL_P(level)) lev = 1;
+ else lev = NUM2INT(level);
+ if (lev < 0) rb_raise(rb_eArgError, "negative level (%d)", lev);
+
+ return backtrace(lev);
+}
+
+void
+rb_backtrace()
+{
+ long i;
+ VALUE ary;
+
+ ary = backtrace(-1);
+ for (i=0; i<RARRAY(ary)->len; i++) {
+ printf("\tfrom %s\n", RSTRING(RARRAY(ary)->ptr[i])->ptr);
+ }
+}
+
+static VALUE
+make_backtrace()
+{
+ return backtrace(-1);
}
ID
-rb_frame_this_func(void)
+rb_frame_last_func()
{
- return frame_func_id(GET_THREAD()->cfp);
+ return ruby_frame->last_func;
}
ID
-rb_frame_callee(void)
+rb_frame_this_func()
+{
+ return ruby_frame->orig_func;
+}
+
+static NODE*
+compile(src, file, line)
+ VALUE src;
+ const char *file;
+ int line;
+{
+ NODE *node;
+ int critical;
+
+ ruby_nerrs = 0;
+ StringValue(src);
+ critical = rb_thread_critical;
+ rb_thread_critical = Qtrue;
+ node = rb_compile_string(file, src, line);
+ rb_thread_critical = critical;
+
+ if (ruby_nerrs == 0) return node;
+ return 0;
+}
+
+static VALUE
+eval(self, src, scope, file, line)
+ VALUE self, src, scope;
+ const char *file;
+ int line;
+{
+ struct BLOCK *data = NULL;
+ volatile VALUE result = Qnil;
+ struct SCOPE * volatile old_scope;
+ struct BLOCK * volatile old_block;
+ struct RVarmap * volatile old_dyna_vars;
+ VALUE volatile old_cref;
+ int volatile old_vmode;
+ volatile VALUE old_wrapper;
+ struct FRAME frame;
+ NODE *nodesave = ruby_current_node;
+ volatile int iter = ruby_frame->iter;
+ volatile int safe = ruby_safe_level;
+ int state;
+
+ if (!NIL_P(scope)) {
+ if (!rb_obj_is_proc(scope)) {
+ rb_raise(rb_eTypeError, "wrong argument type %s (expected Proc/Binding)",
+ rb_obj_classname(scope));
+ }
+
+ Data_Get_Struct(scope, struct BLOCK, data);
+ /* PUSH BLOCK from data */
+ frame = data->frame;
+ frame.tmp = ruby_frame; /* gc protection */
+ ruby_frame = &(frame);
+ old_scope = ruby_scope;
+ ruby_scope = data->scope;
+ old_block = ruby_block;
+ ruby_block = data->prev;
+ old_dyna_vars = ruby_dyna_vars;
+ ruby_dyna_vars = data->dyna_vars;
+ old_vmode = scope_vmode;
+ scope_vmode = data->vmode;
+ old_cref = (VALUE)ruby_cref;
+ ruby_cref = data->cref;
+ old_wrapper = ruby_wrapper;
+ ruby_wrapper = data->wrapper;
+ if ((file == 0 || (line == 1 && strcmp(file, "(eval)") == 0)) && data->frame.node) {
+ file = data->frame.node->nd_file;
+ if (!file) file = "__builtin__";
+ line = nd_line(data->frame.node);
+ }
+
+ self = data->self;
+ ruby_frame->iter = data->iter;
+ }
+ else {
+ if (ruby_frame->prev) {
+ ruby_frame->iter = ruby_frame->prev->iter;
+ }
+ }
+ if (file == 0) {
+ ruby_set_current_source();
+ file = ruby_sourcefile;
+ line = ruby_sourceline;
+ }
+ PUSH_CLASS(data ? data->klass : ruby_class);
+ ruby_in_eval++;
+ if (TYPE(ruby_class) == T_ICLASS) {
+ ruby_class = RBASIC(ruby_class)->klass;
+ }
+ PUSH_TAG(PROT_NONE);
+ if ((state = EXEC_TAG()) == 0) {
+ NODE *node;
+
+ ruby_safe_level = 0;
+ result = ruby_errinfo;
+ ruby_errinfo = Qnil;
+ node = compile(src, file, line);
+ ruby_safe_level = safe;
+ if (ruby_nerrs > 0) {
+ compile_error(0);
+ }
+ if (!NIL_P(result)) ruby_errinfo = result;
+ result = eval_node(self, node);
+ }
+ POP_TAG();
+ POP_CLASS();
+ ruby_in_eval--;
+ if (!NIL_P(scope)) {
+ int dont_recycle = ruby_scope->flags & SCOPE_DONT_RECYCLE;
+
+ ruby_wrapper = old_wrapper;
+ ruby_cref = (NODE*)old_cref;
+ ruby_frame = frame.tmp;
+ ruby_scope = old_scope;
+ ruby_block = old_block;
+ ruby_dyna_vars = old_dyna_vars;
+ data->vmode = scope_vmode; /* write back visibility mode */
+ scope_vmode = old_vmode;
+ if (dont_recycle) {
+ struct tag *tag;
+ struct RVarmap *vars;
+
+ scope_dup(ruby_scope);
+ for (tag=prot_tag; tag; tag=tag->prev) {
+ scope_dup(tag->scope);
+ }
+ for (vars = ruby_dyna_vars; vars; vars = vars->next) {
+ FL_SET(vars, DVAR_DONT_RECYCLE);
+ }
+ }
+ }
+ else {
+ ruby_frame->iter = iter;
+ }
+ ruby_current_node = nodesave;
+ ruby_set_current_source();
+ if (state) {
+ if (state == TAG_RAISE) {
+ if (strcmp(file, "(eval)") == 0) {
+ VALUE mesg, errat, bt2;
+
+ errat = get_backtrace(ruby_errinfo);
+ mesg = rb_attr_get(ruby_errinfo, rb_intern("mesg"));
+ if (!NIL_P(errat) && TYPE(errat) == T_ARRAY &&
+ (bt2 = backtrace(-2), RARRAY_LEN(bt2) > 0)) {
+ if (!NIL_P(mesg) && TYPE(mesg) == T_STRING) {
+ rb_str_update(mesg, 0, 0, rb_str_new2(": "));
+ rb_str_update(mesg, 0, 0, RARRAY_PTR(errat)[0]);
+ }
+ RARRAY_PTR(errat)[0] = RARRAY_PTR(bt2)[0];
+ }
+ }
+ rb_exc_raise(ruby_errinfo);
+ }
+ JUMP_TAG(state);
+ }
+
+ return result;
+}
+
+/*
+ * call-seq:
+ * eval(string [, binding [, filename [,lineno]]]) => obj
+ *
+ * Evaluates the Ruby expression(s) in <em>string</em>. If
+ * <em>binding</em> is given, the evaluation is performed in its
+ * context. The binding may be a <code>Binding</code> object or a
+ * <code>Proc</code> object. If the optional <em>filename</em> and
+ * <em>lineno</em> parameters are present, they will be used when
+ * reporting syntax errors.
+ *
+ * def getBinding(str)
+ * return binding
+ * end
+ * str = "hello"
+ * eval "str + ' Fred'" #=> "hello Fred"
+ * eval "str + ' Fred'", getBinding("bye") #=> "bye Fred"
+ */
+
+static VALUE
+rb_f_eval(argc, argv, self)
+ int argc;
+ VALUE *argv;
+ VALUE self;
+{
+ VALUE src, scope, vfile, vline;
+ const char *file = "(eval)";
+ int line = 1;
+
+ rb_scan_args(argc, argv, "13", &src, &scope, &vfile, &vline);
+ if (ruby_safe_level >= 4) {
+ StringValue(src);
+ if (!NIL_P(scope) && !OBJ_TAINTED(scope)) {
+ rb_raise(rb_eSecurityError, "Insecure: can't modify trusted binding");
+ }
+ }
+ else {
+ SafeStringValue(src);
+ }
+ if (argc >= 3) {
+ StringValue(vfile);
+ }
+ if (argc >= 4) {
+ line = NUM2INT(vline);
+ }
+
+ if (!NIL_P(vfile)) file = RSTRING(vfile)->ptr;
+ if (NIL_P(scope) && ruby_frame->prev) {
+ struct FRAME *prev;
+ VALUE val;
+
+ prev = ruby_frame;
+ PUSH_FRAME();
+ *ruby_frame = *prev->prev;
+ ruby_frame->prev = prev;
+ val = eval(self, src, scope, file, line);
+ POP_FRAME();
+
+ return val;
+ }
+ return eval(self, src, scope, file, line);
+}
+
+/* function to call func under the specified class/module context */
+static VALUE
+exec_under(func, under, cbase, args)
+ VALUE (*func)();
+ VALUE under, cbase;
+ void *args;
+{
+ VALUE val = Qnil; /* OK */
+ int state;
+ int mode;
+ struct FRAME *f = ruby_frame;
+
+ PUSH_CLASS(under);
+ PUSH_FRAME();
+ ruby_frame->self = f->self;
+ ruby_frame->last_func = f->last_func;
+ ruby_frame->orig_func = f->orig_func;
+ ruby_frame->last_class = f->last_class;
+ ruby_frame->argc = f->argc;
+ if (cbase) {
+ PUSH_CREF(cbase);
+ }
+
+ mode = scope_vmode;
+ SCOPE_SET(SCOPE_PUBLIC);
+ PUSH_TAG(PROT_NONE);
+ if ((state = EXEC_TAG()) == 0) {
+ val = (*func)(args);
+ }
+ POP_TAG();
+ if (cbase) POP_CREF();
+ SCOPE_SET(mode);
+ POP_FRAME();
+ POP_CLASS();
+ if (state) JUMP_TAG(state);
+
+ return val;
+}
+
+static VALUE
+eval_under_i(args)
+ VALUE *args;
+{
+ struct FRAME *f = ruby_frame;
+
+ if (f && (f = f->prev) && (f = f->prev)) {
+ ruby_frame = f;
+ }
+ return eval(args[0], args[1], Qnil, (char*)args[2], (int)args[3]);
+}
+
+/* string eval under the class/module context */
+static VALUE
+eval_under(under, self, src, file, line)
+ VALUE under, self, src;
+ const char *file;
+ int line;
+{
+ VALUE args[4];
+
+ if (ruby_safe_level >= 4) {
+ StringValue(src);
+ }
+ else {
+ SafeStringValue(src);
+ }
+ args[0] = self;
+ args[1] = src;
+ args[2] = (VALUE)file;
+ args[3] = (VALUE)line;
+ return exec_under(eval_under_i, under, under, args);
+}
+
+static VALUE
+yield_under_i(self)
+ VALUE self;
+{
+ return rb_yield_0(self, self, ruby_class, YIELD_PUBLIC_DEF, Qfalse);
+}
+
+static VALUE
+yield_args_under_i(vinfo)
+ VALUE vinfo;
+{
+ VALUE *info = (VALUE *)vinfo;
+
+ return rb_yield_0(info[0], info[1], ruby_class, YIELD_PUBLIC_DEF, Qtrue);
+}
+
+/* block eval under the class/module context */
+static VALUE
+yield_under(under, self, args)
+ VALUE under, self, args;
+{
+ if (args == Qundef) {
+ return exec_under(yield_under_i, under, 0, self);
+ }
+ else {
+ VALUE info[2] = { args, self };
+
+ return exec_under(yield_args_under_i, under, 0, (VALUE)info);
+ }
+}
+
+static VALUE
+specific_eval(argc, argv, klass, self)
+ int argc;
+ VALUE *argv;
+ VALUE klass, self;
+{
+ if (rb_block_given_p()) {
+ if (argc > 0) {
+ rb_raise(rb_eArgError, "wrong number of arguments (%d for 0)", argc);
+ }
+ return yield_under(klass, self, Qundef);
+ }
+ else {
+ const char *file = "(eval)";
+ int line = 1;
+
+ if (argc == 0) {
+ rb_raise(rb_eArgError, "block not supplied");
+ }
+ else {
+ if (ruby_safe_level >= 4) {
+ StringValue(argv[0]);
+ }
+ else {
+ SafeStringValue(argv[0]);
+ }
+ if (argc > 3) {
+ rb_raise(rb_eArgError, "wrong number of arguments: %s(src) or %s{..}",
+ rb_id2name(ruby_frame->last_func),
+ rb_id2name(ruby_frame->last_func));
+ }
+ if (argc > 2) line = NUM2INT(argv[2]);
+ if (argc > 1) {
+ file = StringValuePtr(argv[1]);
+ }
+ }
+ return eval_under(klass, self, argv[0], file, line);
+ }
+}
+
+/*
+ * call-seq:
+ * obj.instance_eval(string [, filename [, lineno]] ) => obj
+ * obj.instance_eval {| | block } => obj
+ *
+ * Evaluates a string containing Ruby source code, or the given block,
+ * within the context of the receiver (_obj_). In order to set the
+ * context, the variable +self+ is set to _obj_ while
+ * the code is executing, giving the code access to _obj_'s
+ * instance variables. In the version of <code>instance_eval</code>
+ * that takes a +String+, the optional second and third
+ * parameters supply a filename and starting line number that are used
+ * when reporting compilation errors.
+ *
+ * class Klass
+ * def initialize
+ * @secret = 99
+ * end
+ * end
+ * k = Klass.new
+ * k.instance_eval { @secret } #=> 99
+ */
+
+VALUE
+rb_obj_instance_eval(argc, argv, self)
+ int argc;
+ VALUE *argv;
+ VALUE self;
+{
+ VALUE klass;
+
+ if (SPECIAL_CONST_P(self)) {
+ klass = Qnil;
+ }
+ else {
+ klass = rb_singleton_class(self);
+ }
+ return specific_eval(argc, argv, klass, self);
+}
+
+/*
+ * call-seq:
+ * obj.instance_exec(arg...) {|var...| block } => obj
+ *
+ * Executes the given block within the context of the receiver
+ * (_obj_). In order to set the context, the variable +self+ is set
+ * to _obj_ while the code is executing, giving the code access to
+ * _obj_'s instance variables. Arguments are passed as block parameters.
+ *
+ * class KlassWithSecret
+ * def initialize
+ * @secret = 99
+ * end
+ * end
+ * k = KlassWithSecret.new
+ * k.instance_exec(5) {|x| @secret+x } #=> 104
+ */
+
+VALUE
+rb_obj_instance_exec(argc, argv, self)
+ int argc;
+ VALUE *argv;
+ VALUE self;
+{
+ VALUE klass;
+
+ if (SPECIAL_CONST_P(self)) {
+ klass = Qnil;
+ }
+ else {
+ klass = rb_singleton_class(self);
+ }
+ return yield_under(klass, self, rb_ary_new4(argc, argv));
+}
+
+/*
+ * call-seq:
+ * mod.class_eval(string [, filename [, lineno]]) => obj
+ * mod.module_eval {|| block } => obj
+ *
+ * Evaluates the string or block in the context of _mod_. This can
+ * be used to add methods to a class. <code>module_eval</code> returns
+ * the result of evaluating its argument. The optional _filename_
+ * and _lineno_ parameters set the text for error messages.
+ *
+ * class Thing
+ * end
+ * a = %q{def hello() "Hello there!" end}
+ * Thing.module_eval(a)
+ * puts Thing.new.hello()
+ * Thing.module_eval("invalid code", "dummy", 123)
+ *
+ * <em>produces:</em>
+ *
+ * Hello there!
+ * dummy:123:in `module_eval': undefined local variable
+ * or method `code' for Thing:Class
+ */
+
+VALUE
+rb_mod_module_eval(argc, argv, mod)
+ int argc;
+ VALUE *argv;
+ VALUE mod;
+{
+ return specific_eval(argc, argv, mod, mod);
+}
+
+/*
+ * call-seq:
+ * mod.module_exec(arg...) {|var...| block } => obj
+ * mod.class_exec(arg...) {|var...| block } => obj
+ *
+ * Evaluates the given block in the context of the class/module.
+ * The method defined in the block will belong to the receiver.
+ *
+ * class Thing
+ * end
+ * Thing.class_exec{
+ * def hello() "Hello there!" end
+ * }
+ * puts Thing.new.hello()
+ *
+ * <em>produces:</em>
+ *
+ * Hello there!
+ */
+
+VALUE
+rb_mod_module_exec(argc, argv, mod)
+ int argc;
+ VALUE *argv;
+ VALUE mod;
{
- return frame_func_id(GET_THREAD()->cfp);
+ return yield_under(mod, mod, rb_ary_new4(argc, argv));
}
-static ID
-rb_frame_caller(void)
+VALUE rb_load_path;
+
+NORETURN(static void load_failed _((VALUE)));
+
+void
+rb_load(fname, wrap)
+ VALUE fname;
+ int wrap;
{
- rb_thread_t *th = GET_THREAD();
- rb_control_frame_t *prev_cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(th->cfp);
- /* check if prev_cfp can be accessible */
- if ((void *)(th->stack + th->stack_size) == (void *)(prev_cfp)) {
- return 0;
+ VALUE tmp;
+ int state;
+ volatile int prohibit_int = rb_prohibit_interrupt;
+ volatile ID last_func;
+ volatile VALUE wrapper = ruby_wrapper;
+ volatile VALUE self = ruby_top_self;
+ NODE *volatile last_node;
+ NODE *saved_cref = ruby_cref;
+
+ if (wrap && ruby_safe_level >= 4) {
+ StringValue(fname);
+ }
+ else {
+ SafeStringValue(fname);
+ }
+ fname = rb_str_new4(fname);
+ tmp = rb_find_file(fname);
+ if (!tmp) {
+ load_failed(fname);
}
- return frame_func_id(prev_cfp);
+ fname = tmp;
+
+ ruby_errinfo = Qnil; /* ensure */
+ PUSH_VARS();
+ PUSH_CLASS(ruby_wrapper);
+ ruby_cref = ruby_top_cref;
+ if (!wrap) {
+ rb_secure(4); /* should alter global state */
+ ruby_class = rb_cObject;
+ ruby_wrapper = 0;
+ }
+ else {
+ /* load in anonymous module as toplevel */
+ ruby_class = ruby_wrapper = rb_module_new();
+ self = rb_obj_clone(ruby_top_self);
+ rb_extend_object(self, ruby_wrapper);
+ PUSH_CREF(ruby_wrapper);
+ }
+ PUSH_ITER(ITER_NOT);
+ PUSH_FRAME();
+ ruby_frame->last_func = 0;
+ ruby_frame->last_class = 0;
+ ruby_frame->self = self;
+ PUSH_SCOPE();
+ /* default visibility is private at loading toplevel */
+ SCOPE_SET(SCOPE_PRIVATE);
+ PUSH_TAG(PROT_NONE);
+ state = EXEC_TAG();
+ last_func = ruby_frame->last_func;
+ last_node = ruby_current_node;
+ if (!ruby_current_node && ruby_sourcefile) {
+ last_node = NEW_NEWLINE(0);
+ }
+ ruby_current_node = 0;
+ if (state == 0) {
+ NODE *node;
+ volatile int critical;
+
+ DEFER_INTS;
+ ruby_in_eval++;
+ critical = rb_thread_critical;
+ rb_thread_critical = Qtrue;
+ rb_load_file(RSTRING(fname)->ptr);
+ ruby_in_eval--;
+ node = ruby_eval_tree;
+ rb_thread_critical = critical;
+ ALLOW_INTS;
+ if (ruby_nerrs == 0) {
+ eval_node(self, node);
+ }
+ }
+ ruby_frame->last_func = last_func;
+ ruby_current_node = last_node;
+ ruby_sourcefile = 0;
+ ruby_set_current_source();
+ if (ruby_scope->flags == SCOPE_ALLOCA && ruby_class == rb_cObject) {
+ if (ruby_scope->local_tbl) /* toplevel was empty */
+ free(ruby_scope->local_tbl);
+ }
+ POP_TAG();
+ rb_prohibit_interrupt = prohibit_int;
+ ruby_cref = saved_cref;
+ POP_SCOPE();
+ POP_FRAME();
+ POP_ITER();
+ POP_CLASS();
+ POP_VARS();
+ ruby_wrapper = wrapper;
+ if (ruby_nerrs > 0) {
+ ruby_nerrs = 0;
+ rb_exc_raise(ruby_errinfo);
+ }
+ if (state) jump_tag_but_local_jump(state, Qundef);
+ if (!NIL_P(ruby_errinfo)) /* exception during load */
+ rb_exc_raise(ruby_errinfo);
}
void
-rb_frame_pop(void)
+rb_load_protect(fname, wrap, state)
+ VALUE fname;
+ int wrap;
+ int *state;
{
- rb_thread_t *th = GET_THREAD();
- th->cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(th->cfp);
+ int status;
+
+ PUSH_TAG(PROT_NONE);
+ if ((status = EXEC_TAG()) == 0) {
+ rb_load(fname, wrap);
+ }
+ POP_TAG();
+ if (state) *state = status;
+}
+
+/*
+ * call-seq:
+ * load(filename, wrap=false) => true
+ *
+ * Loads and executes the Ruby
+ * program in the file _filename_. If the filename does not
+ * resolve to an absolute path, the file is searched for in the library
+ * directories listed in <code>$:</code>. If the optional _wrap_
+ * parameter is +true+, the loaded script will be executed
+ * under an anonymous module, protecting the calling program's global
+ * namespace. In no circumstance will any local variables in the loaded
+ * file be propagated to the loading environment.
+ */
+
+
+static VALUE
+rb_f_load(argc, argv)
+ int argc;
+ VALUE *argv;
+{
+ VALUE fname, wrap;
+
+ rb_scan_args(argc, argv, "11", &fname, &wrap);
+ rb_load(fname, RTEST(wrap));
+ return Qtrue;
+}
+
+VALUE ruby_dln_librefs;
+static VALUE rb_features;
+static st_table *loading_tbl;
+
+#define IS_SOEXT(e) (strcmp(e, ".so") == 0 || strcmp(e, ".o") == 0)
+#ifdef DLEXT2
+#define IS_DLEXT(e) (strcmp(e, DLEXT) == 0 || strcmp(e, DLEXT2) == 0)
+#else
+#define IS_DLEXT(e) (strcmp(e, DLEXT) == 0)
+#endif
+
+
+static const char *const loadable_ext[] = {
+ ".rb", DLEXT,
+#ifdef DLEXT2
+ DLEXT2,
+#endif
+ 0
+};
+
+static int rb_feature_p _((const char *, const char *, int));
+static int search_required _((VALUE, VALUE *, VALUE *));
+
+static int
+rb_feature_p(feature, ext, rb)
+ const char *feature, *ext;
+ int rb;
+{
+ VALUE v;
+ const char *f, *e;
+ long i, len, elen;
+
+ if (ext) {
+ len = ext - feature;
+ elen = strlen(ext);
+ }
+ else {
+ len = strlen(feature);
+ elen = 0;
+ }
+ for (i = 0; i < RARRAY_LEN(rb_features); ++i) {
+ v = RARRAY_PTR(rb_features)[i];
+ f = StringValuePtr(v);
+ if (RSTRING_LEN(v) < len || strncmp(f, feature, len) != 0)
+ continue;
+ if (!*(e = f + len)) {
+ if (ext) continue;
+ return 'u';
+ }
+ if (*e != '.') continue;
+ if ((!rb || !ext) && (IS_SOEXT(e) || IS_DLEXT(e))) {
+ return 's';
+ }
+ if ((rb || !ext) && (strcmp(e, ".rb") == 0)) {
+ return 'r';
+ }
+ }
+ if (loading_tbl) {
+ if (st_lookup(loading_tbl, (st_data_t)feature, 0)) {
+ if (!ext) return 'u';
+ return strcmp(ext, ".rb") ? 's' : 'r';
+ }
+ else {
+ char *buf;
+
+ if (ext && *ext) return 0;
+ buf = ALLOCA_N(char, len + DLEXT_MAXLEN + 1);
+ MEMCPY(buf, feature, char, len);
+ for (i = 0; (e = loadable_ext[i]) != 0; i++) {
+ strncpy(buf + len, e, DLEXT_MAXLEN + 1);
+ if (st_lookup(loading_tbl, (st_data_t)buf, 0)) {
+ return i ? 's' : 'r';
+ }
+ }
+ }
+ }
+ return 0;
+}
+
+int
+rb_provided(feature)
+ const char *feature;
+{
+ const char *ext = strrchr(feature, '.');
+
+ if (ext && !strchr(ext, '/')) {
+ if (strcmp(".rb", ext) == 0) {
+ if (rb_feature_p(feature, ext, Qtrue)) return Qtrue;
+ return Qfalse;
+ }
+ else if (IS_SOEXT(ext) || IS_DLEXT(ext)) {
+ if (rb_feature_p(feature, ext, Qfalse)) return Qtrue;
+ return Qfalse;
+ }
+ }
+ if (rb_feature_p(feature, feature + strlen(feature), Qtrue))
+ return Qtrue;
+
+ return Qfalse;
+}
+
+static void
+rb_provide_feature(feature)
+ VALUE feature;
+{
+ rb_ary_push(rb_features, feature);
+}
+
+void
+rb_provide(feature)
+ const char *feature;
+{
+ rb_provide_feature(rb_str_new2(feature));
+}
+
+static char *
+load_lock(ftptr)
+ const char *ftptr;
+{
+ st_data_t th;
+
+ if (!loading_tbl ||
+ !st_lookup(loading_tbl, (st_data_t)ftptr, &th))
+ {
+ /* loading ruby library should be serialized. */
+ if (!loading_tbl) {
+ loading_tbl = st_init_strtable();
+ }
+ /* partial state */
+ ftptr = ruby_strdup(ftptr);
+ st_insert(loading_tbl, (st_data_t)ftptr, (st_data_t)curr_thread);
+ return (char *)ftptr;
+ }
+ do {
+ if ((rb_thread_t)th == curr_thread) return 0;
+ CHECK_INTS;
+ } while (st_lookup(loading_tbl, (st_data_t)ftptr, &th));
+ return 0;
+}
+
+static void
+load_unlock(const char *ftptr)
+{
+ if (ftptr) {
+ st_data_t key = (st_data_t)ftptr;
+
+ if (st_delete(loading_tbl, &key, 0)) {
+ free((char *)key);
+ }
+ }
+}
+
+/*
+ * call-seq:
+ * require(string) => true or false
+ *
+ * Ruby tries to load the library named _string_, returning
+ * +true+ if successful. If the filename does not resolve to
+ * an absolute path, it will be searched for in the directories listed
+ * in <code>$:</code>. If the file has the extension ``.rb'', it is
+ * loaded as a source file; if the extension is ``.so'', ``.o'', or
+ * ``.dll'', or whatever the default shared library extension is on
+ * the current platform, Ruby loads the shared library as a Ruby
+ * extension. Otherwise, Ruby tries adding ``.rb'', ``.so'', and so on
+ * to the name. The name of the loaded feature is added to the array in
+ * <code>$"</code>. A feature will not be loaded if it's name already
+ * appears in <code>$"</code>. However, the file name is not converted
+ * to an absolute path, so that ``<code>require 'a';require
+ * './a'</code>'' will load <code>a.rb</code> twice.
+ *
+ * require "my-library.rb"
+ * require "db-driver"
+ */
+
+VALUE
+rb_f_require(obj, fname)
+ VALUE obj, fname;
+{
+ return rb_require_safe(fname, ruby_safe_level);
+}
+
+static int
+search_required(fname, featurep, path)
+ VALUE fname, *featurep, *path;
+{
+ VALUE tmp;
+ char *ext, *ftptr;
+ int type;
+
+ *featurep = fname;
+ *path = 0;
+ ext = strrchr(ftptr = RSTRING_PTR(fname), '.');
+ if (ext && !strchr(ext, '/')) {
+ if (strcmp(".rb", ext) == 0) {
+ if (rb_feature_p(ftptr, ext, Qtrue)) return 'r';
+ if ((*path = rb_find_file(fname)) != 0) return 'r';
+ return 0;
+ }
+ else if (IS_SOEXT(ext)) {
+ if (rb_feature_p(ftptr, ext, Qfalse)) return 's';
+ tmp = rb_str_new(RSTRING_PTR(fname), ext-RSTRING_PTR(fname));
+ *featurep = tmp;
+#ifdef DLEXT2
+ OBJ_FREEZE(tmp);
+ if (rb_find_file_ext(&tmp, loadable_ext+1)) {
+ *featurep = tmp;
+ *path = rb_find_file(tmp);
+ return 's';
+ }
+#else
+ rb_str_cat2(tmp, DLEXT);
+ OBJ_FREEZE(tmp);
+ if ((*path = rb_find_file(tmp)) != 0) {
+ return 's';
+ }
+#endif
+ }
+ else if (IS_DLEXT(ext)) {
+ if (rb_feature_p(ftptr, ext, Qfalse)) return 's';
+ if ((*path = rb_find_file(fname)) != 0) return 's';
+ }
+ }
+ tmp = fname;
+ type = rb_find_file_ext(&tmp, loadable_ext);
+ *featurep = tmp;
+ switch (type) {
+ case 0:
+ ftptr = RSTRING_PTR(tmp);
+ return rb_feature_p(ftptr, 0, Qfalse);
+
+ default:
+ ext = strrchr(ftptr = RSTRING(tmp)->ptr, '.');
+ if (rb_feature_p(ftptr, ext, !--type)) break;
+ *path = rb_find_file(tmp);
+ }
+ return type ? 's' : 'r';
+}
+
+static void
+load_failed(fname)
+ VALUE fname;
+{
+ rb_raise(rb_eLoadError, "no such file to load -- %s", RSTRING(fname)->ptr);
+}
+
+VALUE
+rb_require_safe(fname, safe)
+ VALUE fname;
+ int safe;
+{
+ VALUE result = Qnil;
+ volatile VALUE errinfo = ruby_errinfo;
+ int state;
+ struct {
+ NODE *node;
+ ID func;
+ int vmode, safe;
+ } volatile saved;
+ char *volatile ftptr = 0;
+
+ if (OBJ_TAINTED(fname)) {
+ rb_check_safe_obj(fname);
+ }
+ StringValue(fname);
+ fname = rb_str_new4(fname);
+ saved.vmode = scope_vmode;
+ saved.node = ruby_current_node;
+ saved.func = ruby_frame->last_func;
+ saved.safe = ruby_safe_level;
+ PUSH_TAG(PROT_NONE);
+ if ((state = EXEC_TAG()) == 0) {
+ VALUE feature, path;
+ long handle;
+ int found;
+
+ ruby_safe_level = safe;
+ found = search_required(fname, &feature, &path);
+ if (found) {
+ if (!path || !(ftptr = load_lock(RSTRING_PTR(feature)))) {
+ result = Qfalse;
+ }
+ else {
+ ruby_safe_level = 0;
+ switch (found) {
+ case 'r':
+ rb_load(path, 0);
+ break;
+
+ case 's':
+ ruby_current_node = 0;
+ ruby_sourcefile = rb_source_filename(RSTRING(path)->ptr);
+ ruby_sourceline = 0;
+ ruby_frame->last_func = 0;
+ SCOPE_SET(SCOPE_PUBLIC);
+ handle = (long)dln_load(RSTRING(path)->ptr);
+ rb_ary_push(ruby_dln_librefs, LONG2NUM(handle));
+ break;
+ }
+ rb_provide_feature(feature);
+ result = Qtrue;
+ }
+ }
+ }
+ POP_TAG();
+ ruby_current_node = saved.node;
+ ruby_set_current_source();
+ ruby_frame->last_func = saved.func;
+ SCOPE_SET(saved.vmode);
+ ruby_safe_level = saved.safe;
+ load_unlock(ftptr);
+ if (state) JUMP_TAG(state);
+ if (NIL_P(result)) {
+ load_failed(fname);
+ }
+ ruby_errinfo = errinfo;
+
+ return result;
+}
+
+VALUE
+rb_require(fname)
+ const char *fname;
+{
+ VALUE fn = rb_str_new2(fname);
+ OBJ_FREEZE(fn);
+ return rb_require_safe(fn, ruby_safe_level);
+}
+
+void
+ruby_init_ext(name, init)
+ const char *name;
+ void (*init) _((void));
+{
+ ruby_current_node = 0;
+ ruby_sourcefile = rb_source_filename(name);
+ ruby_sourceline = 0;
+ ruby_frame->last_func = 0;
+ ruby_frame->orig_func = 0;
+ SCOPE_SET(SCOPE_PUBLIC);
+ if (load_lock(name)) {
+ (*init)();
+ rb_provide(name);
+ load_unlock(name);
+ }
+}
+
+static void
+secure_visibility(self)
+ VALUE self;
+{
+ if (ruby_safe_level >= 4 && !OBJ_TAINTED(self)) {
+ rb_raise(rb_eSecurityError, "Insecure: can't change method visibility");
+ }
+}
+
+static void
+set_method_visibility(self, argc, argv, ex)
+ VALUE self;
+ int argc;
+ VALUE *argv;
+ ID ex;
+{
+ int i;
+
+ secure_visibility(self);
+ for (i=0; i<argc; i++) {
+ rb_export_method(self, rb_to_id(argv[i]), ex);
+ }
+ rb_clear_cache_by_class(self);
+}
+
+/*
+ * call-seq:
+ * public => self
+ * public(symbol, ...) => self
+ *
+ * With no arguments, sets the default visibility for subsequently
+ * defined methods to public. With arguments, sets the named methods to
+ * have public visibility.
+ */
+
+static VALUE
+rb_mod_public(argc, argv, module)
+ int argc;
+ VALUE *argv;
+ VALUE module;
+{
+ secure_visibility(module);
+ if (argc == 0) {
+ SCOPE_SET(SCOPE_PUBLIC);
+ }
+ else {
+ set_method_visibility(module, argc, argv, NOEX_PUBLIC);
+ }
+ return module;
+}
+
+/*
+ * call-seq:
+ * protected => self
+ * protected(symbol, ...) => self
+ *
+ * With no arguments, sets the default visibility for subsequently
+ * defined methods to protected. With arguments, sets the named methods
+ * to have protected visibility.
+ */
+
+static VALUE
+rb_mod_protected(argc, argv, module)
+ int argc;
+ VALUE *argv;
+ VALUE module;
+{
+ secure_visibility(module);
+ if (argc == 0) {
+ SCOPE_SET(SCOPE_PROTECTED);
+ }
+ else {
+ set_method_visibility(module, argc, argv, NOEX_PROTECTED);
+ }
+ return module;
+}
+
+/*
+ * call-seq:
+ * private => self
+ * private(symbol, ...) => self
+ *
+ * With no arguments, sets the default visibility for subsequently
+ * defined methods to private. With arguments, sets the named methods
+ * to have private visibility.
+ *
+ * module Mod
+ * def a() end
+ * def b() end
+ * private
+ * def c() end
+ * private :a
+ * end
+ * Mod.private_instance_methods #=> ["a", "c"]
+ */
+
+static VALUE
+rb_mod_private(argc, argv, module)
+ int argc;
+ VALUE *argv;
+ VALUE module;
+{
+ secure_visibility(module);
+ if (argc == 0) {
+ SCOPE_SET(SCOPE_PRIVATE);
+ }
+ else {
+ set_method_visibility(module, argc, argv, NOEX_PRIVATE);
+ }
+ return module;
+}
+
+/*
+ * call-seq:
+ * mod.public_class_method(symbol, ...) => mod
+ *
+ * Makes a list of existing class methods public.
+ */
+
+static VALUE
+rb_mod_public_method(argc, argv, obj)
+ int argc;
+ VALUE *argv;
+ VALUE obj;
+{
+ set_method_visibility(CLASS_OF(obj), argc, argv, NOEX_PUBLIC);
+ return obj;
+}
+
+/*
+ * call-seq:
+ * mod.private_class_method(symbol, ...) => mod
+ *
+ * Makes existing class methods private. Often used to hide the default
+ * constructor <code>new</code>.
+ *
+ * class SimpleSingleton # Not thread safe
+ * private_class_method :new
+ * def SimpleSingleton.create(*args, &block)
+ * @me = new(*args, &block) if ! @me
+ * @me
+ * end
+ * end
+ */
+
+static VALUE
+rb_mod_private_method(argc, argv, obj)
+ int argc;
+ VALUE *argv;
+ VALUE obj;
+{
+ set_method_visibility(CLASS_OF(obj), argc, argv, NOEX_PRIVATE);
+ return obj;
+}
+
+/*
+ * call-seq:
+ * public
+ * public(symbol, ...)
+ *
+ * With no arguments, sets the default visibility for subsequently
+ * defined methods to public. With arguments, sets the named methods to
+ * have public visibility.
+ */
+
+static VALUE
+top_public(argc, argv)
+ int argc;
+ VALUE *argv;
+{
+ return rb_mod_public(argc, argv, rb_cObject);
+}
+
+static VALUE
+top_private(argc, argv)
+ int argc;
+ VALUE *argv;
+{
+ return rb_mod_private(argc, argv, rb_cObject);
+}
+
+/*
+ * call-seq:
+ * module_function(symbol, ...) => self
+ *
+ * Creates module functions for the named methods. These functions may
+ * be called with the module as a receiver, and also become available
+ * as instance methods to classes that mix in the module. Module
+ * functions are copies of the original, and so may be changed
+ * independently. The instance-method versions are made private. If
+ * used with no arguments, subsequently defined methods become module
+ * functions.
+ *
+ * module Mod
+ * def one
+ * "This is one"
+ * end
+ * module_function :one
+ * end
+ * class Cls
+ * include Mod
+ * def callOne
+ * one
+ * end
+ * end
+ * Mod.one #=> "This is one"
+ * c = Cls.new
+ * c.callOne #=> "This is one"
+ * module Mod
+ * def one
+ * "This is the new one"
+ * end
+ * end
+ * Mod.one #=> "This is one"
+ * c.callOne #=> "This is the new one"
+ */
+
+static VALUE
+rb_mod_modfunc(argc, argv, module)
+ int argc;
+ VALUE *argv;
+ VALUE module;
+{
+ int i;
+ ID id;
+ NODE *body;
+
+ if (TYPE(module) != T_MODULE) {
+ rb_raise(rb_eTypeError, "module_function must be called for modules");
+ }
+
+ secure_visibility(module);
+ if (argc == 0) {
+ SCOPE_SET(SCOPE_MODFUNC);
+ return module;
+ }
+
+ set_method_visibility(module, argc, argv, NOEX_PRIVATE);
+ for (i=0; i<argc; i++) {
+ VALUE m = module;
+
+ id = rb_to_id(argv[i]);
+ for (;;) {
+ body = search_method(m, id, &m);
+ if (body == 0) {
+ body = search_method(rb_cObject, id, &m);
+ }
+ if (body == 0 || body->nd_body == 0) {
+ rb_bug("undefined method `%s'; can't happen", rb_id2name(id));
+ }
+ if (nd_type(body->nd_body) != NODE_ZSUPER) {
+ break; /* normal case: need not to follow 'super' link */
+ }
+ m = RCLASS(m)->super;
+ if (!m) break;
+ }
+ rb_add_method(rb_singleton_class(module), id, body->nd_body, NOEX_PUBLIC);
+ }
+ return module;
}
/*
* call-seq:
* append_features(mod) => mod
- *
+ *
* When this module is included in another, Ruby calls
* <code>append_features</code> in this module, passing it the
* receiving module in _mod_. Ruby's default implementation is
@@ -754,7 +7716,8 @@ rb_frame_pop(void)
*/
static VALUE
-rb_mod_append_features(VALUE module, VALUE include)
+rb_mod_append_features(module, include)
+ VALUE module, include;
{
switch (TYPE(include)) {
case T_CLASS:
@@ -772,17 +7735,19 @@ rb_mod_append_features(VALUE module, VALUE include)
/*
* call-seq:
* include(module, ...) => self
- *
- * Invokes <code>Module.append_features</code> on each parameter in reverse order.
+ *
+ * Invokes <code>Module.append_features</code> on each parameter in turn.
*/
static VALUE
-rb_mod_include(int argc, VALUE *argv, VALUE module)
+rb_mod_include(argc, argv, module)
+ int argc;
+ VALUE *argv;
+ VALUE module;
{
int i;
- for (i = 0; i < argc; i++)
- Check_Type(argv[i], T_MODULE);
+ for (i=0; i<argc; i++) Check_Type(argv[i], T_MODULE);
while (argc--) {
rb_funcall(argv[argc], rb_intern("append_features"), 1, module);
rb_funcall(argv[argc], rb_intern("included"), 1, module);
@@ -791,14 +7756,19 @@ rb_mod_include(int argc, VALUE *argv, VALUE module)
}
void
-rb_obj_call_init(VALUE obj, int argc, VALUE *argv)
+rb_obj_call_init(obj, argc, argv)
+ VALUE obj;
+ int argc;
+ VALUE *argv;
{
- PASS_PASSED_BLOCK();
- rb_funcall2(obj, idInitialize, argc, argv);
+ PUSH_ITER(rb_block_given_p()?ITER_PRE:ITER_NOT);
+ rb_funcall2(obj, init, argc, argv);
+ POP_ITER();
}
void
-rb_extend_object(VALUE obj, VALUE module)
+rb_extend_object(obj, module)
+ VALUE obj, module;
{
rb_include_module(rb_singleton_class(obj), module);
}
@@ -806,11 +7776,11 @@ rb_extend_object(VALUE obj, VALUE module)
/*
* call-seq:
* extend_object(obj) => obj
- *
+ *
* Extends the specified object by adding this module's constants and
* methods (which are added as singleton methods). This is the callback
* method used by <code>Object#extend</code>.
- *
+ *
* module Picky
* def Picky.extend_object(o)
* if String === o
@@ -823,15 +7793,16 @@ rb_extend_object(VALUE obj, VALUE module)
* end
* (s = Array.new).extend Picky # Call Object.extend
* (s = "quick brown fox").extend Picky
- *
+ *
* <em>produces:</em>
- *
+ *
* Picky added to Array
* Can't add Picky to a String
*/
static VALUE
-rb_mod_extend_object(VALUE mod, VALUE obj)
+rb_mod_extend_object(mod, obj)
+ VALUE mod, obj;
{
rb_extend_object(obj, mod);
return obj;
@@ -840,22 +7811,22 @@ rb_mod_extend_object(VALUE mod, VALUE obj)
/*
* call-seq:
* obj.extend(module, ...) => obj
- *
+ *
* Adds to _obj_ the instance methods from each module given as a
* parameter.
- *
+ *
* module Mod
* def hello
* "Hello from Mod.\n"
* end
* end
- *
+ *
* class Klass
* def hello
* "Hello from Klass.\n"
* end
* end
- *
+ *
* k = Klass.new
* k.hello #=> "Hello from Klass.\n"
* k.extend(Mod) #=> #<Klass:0x401b3bc8>
@@ -863,15 +7834,17 @@ rb_mod_extend_object(VALUE mod, VALUE obj)
*/
static VALUE
-rb_obj_extend(int argc, VALUE *argv, VALUE obj)
+rb_obj_extend(argc, argv, obj)
+ int argc;
+ VALUE *argv;
+ VALUE obj;
{
int i;
if (argc == 0) {
rb_raise(rb_eArgError, "wrong number of arguments (0 for 1)");
}
- for (i = 0; i < argc; i++)
- Check_Type(argv[i], T_MODULE);
+ for (i=0; i<argc; i++) Check_Type(argv[i], T_MODULE);
while (argc--) {
rb_funcall(argv[argc], rb_intern("extend_object"), 1, obj);
rb_funcall(argv[argc], rb_intern("extended"), 1, obj);
@@ -882,22 +7855,22 @@ rb_obj_extend(int argc, VALUE *argv, VALUE obj)
/*
* call-seq:
* include(module, ...) => self
- *
+ *
* Invokes <code>Module.append_features</code>
* on each parameter in turn. Effectively adds the methods and constants
* in each module to the receiver.
*/
static VALUE
-top_include(int argc, VALUE *argv, VALUE self)
+top_include(argc, argv, self)
+ int argc;
+ VALUE *argv;
+ VALUE self;
{
- rb_thread_t *th = GET_THREAD();
-
rb_secure(4);
- if (th->top_wrapper) {
- rb_warning
- ("main#include in the wrapped load is effective only in wrapper module");
- return rb_mod_include(argc, argv, th->top_wrapper);
+ if (ruby_wrapper) {
+ rb_warning("main#include in the wrapped load is effective only in wrapper module");
+ return rb_mod_include(argc, argv, ruby_wrapper);
}
return rb_mod_include(argc, argv, rb_cObject);
}
@@ -905,173 +7878,5723 @@ top_include(int argc, VALUE *argv, VALUE self)
VALUE rb_f_trace_var();
VALUE rb_f_untrace_var();
-static VALUE *
-errinfo_place(void)
+static void
+errinfo_setter(val, id, var)
+ VALUE val;
+ ID id;
+ VALUE *var;
+{
+ if (!NIL_P(val) && !rb_obj_is_kind_of(val, rb_eException)) {
+ rb_raise(rb_eTypeError, "assigning non-exception to $!");
+ }
+ *var = val;
+}
+
+static VALUE
+errat_getter(id)
+ ID id;
+{
+ return get_backtrace(ruby_errinfo);
+}
+
+static void
+errat_setter(val, id, var)
+ VALUE val;
+ ID id;
+ VALUE *var;
+{
+ if (NIL_P(ruby_errinfo)) {
+ rb_raise(rb_eArgError, "$! not set");
+ }
+ set_backtrace(ruby_errinfo, val);
+}
+
+/*
+ * call-seq:
+ * local_variables => array
+ *
+ * Returns the names of the current local variables.
+ *
+ * fred = 1
+ * for i in 1..10
+ * # ...
+ * end
+ * local_variables #=> ["fred", "i"]
+ */
+
+static VALUE
+rb_f_local_variables()
+{
+ ID *tbl;
+ int n, i;
+ VALUE ary = rb_ary_new();
+ struct RVarmap *vars;
+
+ tbl = ruby_scope->local_tbl;
+ if (tbl) {
+ n = *tbl++;
+ for (i=2; i<n; i++) { /* skip first 2 ($_ and $~) */
+ if (!rb_is_local_id(tbl[i])) continue; /* skip flip states */
+ rb_ary_push(ary, rb_str_new2(rb_id2name(tbl[i])));
+ }
+ }
+
+ vars = ruby_dyna_vars;
+ while (vars) {
+ if (vars->id && rb_is_local_id(vars->id)) { /* skip $_, $~ and flip states */
+ rb_ary_push(ary, rb_str_new2(rb_id2name(vars->id)));
+ }
+ vars = vars->next;
+ }
+
+ return ary;
+}
+
+static VALUE rb_f_catch _((VALUE,VALUE));
+NORETURN(static VALUE rb_f_throw _((int,VALUE*)));
+
+struct end_proc_data {
+ void (*func)();
+ VALUE data;
+ int safe;
+ struct end_proc_data *next;
+};
+
+static struct end_proc_data *end_procs, *ephemeral_end_procs, *tmp_end_procs;
+
+void
+rb_set_end_proc(func, data)
+ void (*func) _((VALUE));
+ VALUE data;
+{
+ struct end_proc_data *link = ALLOC(struct end_proc_data);
+ struct end_proc_data **list;
+
+ if (ruby_wrapper) list = &ephemeral_end_procs;
+ else list = &end_procs;
+ link->next = *list;
+ link->func = func;
+ link->data = data;
+ link->safe = ruby_safe_level;
+ *list = link;
+}
+
+void
+rb_mark_end_proc()
+{
+ struct end_proc_data *link;
+
+ link = end_procs;
+ while (link) {
+ rb_gc_mark(link->data);
+ link = link->next;
+ }
+ link = ephemeral_end_procs;
+ while (link) {
+ rb_gc_mark(link->data);
+ link = link->next;
+ }
+ link = tmp_end_procs;
+ while (link) {
+ rb_gc_mark(link->data);
+ link = link->next;
+ }
+}
+
+static void call_end_proc _((VALUE data));
+
+static void
+call_end_proc(data)
+ VALUE data;
+{
+ PUSH_ITER(ITER_NOT);
+ PUSH_FRAME();
+ ruby_frame->self = ruby_frame->prev->self;
+ ruby_frame->node = 0;
+ ruby_frame->last_func = 0;
+ ruby_frame->last_class = 0;
+ proc_invoke(data, rb_ary_new2(0), Qundef, 0);
+ POP_FRAME();
+ POP_ITER();
+}
+
+static void
+rb_f_END()
{
- rb_thread_t *th = GET_THREAD();
- rb_control_frame_t *cfp = th->cfp;
- rb_control_frame_t *end_cfp = RUBY_VM_END_CONTROL_FRAME(th);
+ PUSH_FRAME();
+ ruby_frame->argc = 0;
+ ruby_frame->iter = ITER_CUR;
+ rb_set_end_proc(call_end_proc, rb_block_proc());
+ POP_FRAME();
+}
+
+/*
+ * call-seq:
+ * at_exit { block } -> proc
+ *
+ * Converts _block_ to a +Proc+ object (and therefore
+ * binds it at the point of call) and registers it for execution when
+ * the program exits. If multiple handlers are registered, they are
+ * executed in reverse order of registration.
+ *
+ * def do_at_exit(str1)
+ * at_exit { print str1 }
+ * end
+ * at_exit { puts "cruel world" }
+ * do_at_exit("goodbye ")
+ * exit
+ *
+ * <em>produces:</em>
+ *
+ * goodbye cruel world
+ */
+
+static VALUE
+rb_f_at_exit()
+{
+ VALUE proc;
+
+ if (!rb_block_given_p()) {
+ rb_raise(rb_eArgError, "called without a block");
+ }
+ proc = rb_block_proc();
+ rb_set_end_proc(call_end_proc, proc);
+ return proc;
+}
- while (RUBY_VM_VALID_CONTROL_FRAME_P(cfp, end_cfp)) {
- if (RUBY_VM_NORMAL_ISEQ_P(cfp->iseq)) {
- if (cfp->iseq->type == ISEQ_TYPE_RESCUE) {
- return &cfp->dfp[-2];
+void
+rb_exec_end_proc()
+{
+ struct end_proc_data *link, *tmp;
+ int status;
+ volatile int safe = ruby_safe_level;
+
+ while (ephemeral_end_procs) {
+ tmp_end_procs = link = ephemeral_end_procs;
+ ephemeral_end_procs = 0;
+ while (link) {
+ PUSH_TAG(PROT_NONE);
+ if ((status = EXEC_TAG()) == 0) {
+ ruby_safe_level = link->safe;
+ (*link->func)(link->data);
+ }
+ POP_TAG();
+ if (status) {
+ error_handle(status);
}
- else if (cfp->iseq->type == ISEQ_TYPE_ENSURE &&
- TYPE(cfp->dfp[-2]) != T_NODE &&
- !FIXNUM_P(cfp->dfp[-2])) {
- return &cfp->dfp[-2];
+ tmp = link;
+ tmp_end_procs = link = link->next;
+ free(tmp);
+ }
+ }
+ while (end_procs) {
+ tmp_end_procs = link = end_procs;
+ end_procs = 0;
+ while (link) {
+ PUSH_TAG(PROT_NONE);
+ if ((status = EXEC_TAG()) == 0) {
+ ruby_safe_level = link->safe;
+ (*link->func)(link->data);
}
+ POP_TAG();
+ if (status) {
+ error_handle(status);
+ }
+ tmp = link;
+ tmp_end_procs = link = link->next;
+ free(tmp);
+ }
+ }
+ ruby_safe_level = safe;
+}
+
+/*
+ * call-seq:
+ * __method__ => symbol
+ *
+ * Returns the name of the current method as a Symbol.
+ * If called from inside of an aliased method it will return the original
+ * nonaliased name.
+ * If called outside of a method, it returns <code>nil</code>.
+ *
+ * def foo
+ * __method__
+ * end
+ * alias bar foo
+ *
+ * foo # => :foo
+ * bar # => :foo
+ *
+ */
+
+static VALUE
+rb_f_method_name()
+{
+ struct FRAME* prev = ruby_frame->prev;
+ if (prev && prev->orig_func) {
+ return ID2SYM(prev->orig_func);
+ }
+ else {
+ return Qnil;
+ }
+}
+
+void
+Init_eval()
+{
+ init = rb_intern("initialize");
+ eqq = rb_intern("===");
+ each = rb_intern("each");
+
+ aref = rb_intern("[]");
+ aset = rb_intern("[]=");
+ match = rb_intern("=~");
+ missing = rb_intern("method_missing");
+ added = rb_intern("method_added");
+ singleton_added = rb_intern("singleton_method_added");
+ removed = rb_intern("method_removed");
+ singleton_removed = rb_intern("singleton_method_removed");
+ undefined = rb_intern("method_undefined");
+ singleton_undefined = rb_intern("singleton_method_undefined");
+
+ __id__ = rb_intern("__id__");
+ __send__ = rb_intern("__send__");
+
+ rb_global_variable((void *)&top_scope);
+ rb_global_variable((void *)&ruby_eval_tree_begin);
+
+ rb_global_variable((void *)&ruby_eval_tree);
+ rb_global_variable((void *)&ruby_dyna_vars);
+
+ rb_define_virtual_variable("$@", errat_getter, errat_setter);
+ rb_define_hooked_variable("$!", &ruby_errinfo, 0, errinfo_setter);
+
+ rb_define_global_function("eval", rb_f_eval, -1);
+ rb_define_global_function("iterator?", rb_f_block_given_p, 0);
+ rb_define_global_function("block_given?", rb_f_block_given_p, 0);
+ rb_define_global_function("method_missing", rb_method_missing, -1);
+ rb_define_global_function("loop", rb_f_loop, 0);
+
+ rb_define_method(rb_mKernel, "respond_to?", obj_respond_to, -1);
+ respond_to = rb_intern("respond_to?");
+ rb_global_variable((void *)&basic_respond_to);
+ basic_respond_to = rb_method_node(rb_cObject, respond_to);
+
+ rb_define_global_function("raise", rb_f_raise, -1);
+ rb_define_global_function("fail", rb_f_raise, -1);
+
+ rb_define_global_function("caller", rb_f_caller, -1);
+
+ rb_define_global_function("exit", rb_f_exit, -1);
+ rb_define_global_function("abort", rb_f_abort, -1);
+
+ rb_define_global_function("at_exit", rb_f_at_exit, 0);
+
+ rb_define_global_function("catch", rb_f_catch, 1);
+ rb_define_global_function("throw", rb_f_throw, -1);
+ rb_define_global_function("global_variables", rb_f_global_variables, 0); /* in variable.c */
+ rb_define_global_function("local_variables", rb_f_local_variables, 0);
+
+ rb_define_global_function("__method__", rb_f_method_name, 0);
+
+ rb_define_method(rb_mKernel, "send", rb_f_send, -1);
+ rb_define_method(rb_mKernel, "__send__", rb_f_send, -1);
+ rb_define_method(rb_mKernel, "instance_eval", rb_obj_instance_eval, -1);
+ rb_define_method(rb_mKernel, "instance_exec", rb_obj_instance_exec, -1);
+
+ rb_define_private_method(rb_cModule, "append_features", rb_mod_append_features, 1);
+ rb_define_private_method(rb_cModule, "extend_object", rb_mod_extend_object, 1);
+ rb_define_private_method(rb_cModule, "include", rb_mod_include, -1);
+ rb_define_private_method(rb_cModule, "public", rb_mod_public, -1);
+ rb_define_private_method(rb_cModule, "protected", rb_mod_protected, -1);
+ rb_define_private_method(rb_cModule, "private", rb_mod_private, -1);
+ rb_define_private_method(rb_cModule, "module_function", rb_mod_modfunc, -1);
+ rb_define_method(rb_cModule, "method_defined?", rb_mod_method_defined, 1);
+ rb_define_method(rb_cModule, "public_method_defined?", rb_mod_public_method_defined, 1);
+ rb_define_method(rb_cModule, "private_method_defined?", rb_mod_private_method_defined, 1);
+ rb_define_method(rb_cModule, "protected_method_defined?", rb_mod_protected_method_defined, 1);
+ rb_define_method(rb_cModule, "public_class_method", rb_mod_public_method, -1);
+ rb_define_method(rb_cModule, "private_class_method", rb_mod_private_method, -1);
+ rb_define_method(rb_cModule, "module_eval", rb_mod_module_eval, -1);
+ rb_define_method(rb_cModule, "module_exec", rb_mod_module_exec, -1);
+ rb_define_method(rb_cModule, "class_eval", rb_mod_module_eval, -1);
+ rb_define_method(rb_cModule, "class_exec", rb_mod_module_exec, -1);
+
+ rb_undef_method(rb_cClass, "module_function");
+
+ rb_define_private_method(rb_cModule, "remove_method", rb_mod_remove_method, -1);
+ rb_define_private_method(rb_cModule, "undef_method", rb_mod_undef_method, -1);
+ rb_define_private_method(rb_cModule, "alias_method", rb_mod_alias_method, 2);
+ rb_define_private_method(rb_cModule, "define_method", rb_mod_define_method, -1);
+
+ rb_define_singleton_method(rb_cModule, "nesting", rb_mod_nesting, 0);
+ rb_define_singleton_method(rb_cModule, "constants", rb_mod_s_constants, 0);
+
+ rb_define_singleton_method(ruby_top_self, "include", top_include, -1);
+ rb_define_singleton_method(ruby_top_self, "public", top_public, -1);
+ rb_define_singleton_method(ruby_top_self, "private", top_private, -1);
+
+ rb_define_method(rb_mKernel, "extend", rb_obj_extend, -1);
+
+ rb_define_global_function("trace_var", rb_f_trace_var, -1); /* in variable.c */
+ rb_define_global_function("untrace_var", rb_f_untrace_var, -1); /* in variable.c */
+
+ rb_define_global_function("set_trace_func", set_trace_func, 1);
+ rb_global_variable(&trace_func);
+
+ rb_define_virtual_variable("$SAFE", safe_getter, safe_setter);
+}
+
+/*
+ * call-seq:
+ * mod.autoload(name, filename) => nil
+ *
+ * Registers _filename_ to be loaded (using <code>Kernel::require</code>)
+ * the first time that _name_ (which may be a <code>String</code> or
+ * a symbol) is accessed in the namespace of _mod_.
+ *
+ * module A
+ * end
+ * A.autoload(:B, "b")
+ * A::B.doit # autoloads "b"
+ */
+
+static VALUE
+rb_mod_autoload(mod, sym, file)
+ VALUE mod;
+ VALUE sym;
+ VALUE file;
+{
+ ID id = rb_to_id(sym);
+
+ Check_SafeStr(file);
+ rb_autoload(mod, id, RSTRING(file)->ptr);
+ return Qnil;
+}
+
+/*
+ * call-seq:
+ * mod.autoload?(name) => String or nil
+ *
+ * Returns _filename_ to be loaded if _name_ is registered as
+ * +autoload+ in the namespace of _mod_.
+ *
+ * module A
+ * end
+ * A.autoload(:B, "b")
+ * A.autoload?(:B) # => "b"
+ */
+
+static VALUE
+rb_mod_autoload_p(mod, sym)
+ VALUE mod, sym;
+{
+ return rb_autoload_p(mod, rb_to_id(sym));
+}
+
+/*
+ * call-seq:
+ * autoload(module, filename) => nil
+ *
+ * Registers _filename_ to be loaded (using <code>Kernel::require</code>)
+ * the first time that _module_ (which may be a <code>String</code> or
+ * a symbol) is accessed.
+ *
+ * autoload(:MyModule, "/usr/local/lib/modules/my_module.rb")
+ */
+
+static VALUE
+rb_f_autoload(obj, sym, file)
+ VALUE obj;
+ VALUE sym;
+ VALUE file;
+{
+ if (NIL_P(ruby_cbase)) {
+ rb_raise(rb_eTypeError, "no class/module for autoload target");
+ }
+ return rb_mod_autoload(ruby_cbase, sym, file);
+}
+
+/*
+ * call-seq:
+ * autoload(module, filename) => nil
+ *
+ * Registers _filename_ to be loaded (using <code>Kernel::require</code>)
+ * the first time that _module_ (which may be a <code>String</code> or
+ * a symbol) is accessed.
+ *
+ * autoload(:MyModule, "/usr/local/lib/modules/my_module.rb")
+ */
+
+static VALUE
+rb_f_autoload_p(obj, sym)
+ VALUE obj;
+ VALUE sym;
+{
+ /* use ruby_cbase as same as rb_f_autoload. */
+ if (NIL_P(ruby_cbase)) {
+ return Qfalse;
+ }
+ return rb_mod_autoload_p(ruby_cbase, sym);
+}
+
+void
+Init_load()
+{
+ rb_define_readonly_variable("$:", &rb_load_path);
+ rb_define_readonly_variable("$-I", &rb_load_path);
+ rb_define_readonly_variable("$LOAD_PATH", &rb_load_path);
+ rb_load_path = rb_ary_new();
+
+ rb_define_readonly_variable("$\"", &rb_features);
+ rb_define_readonly_variable("$LOADED_FEATURES", &rb_features);
+ rb_features = rb_ary_new();
+
+ rb_define_global_function("load", rb_f_load, -1);
+ rb_define_global_function("require", rb_f_require, 1);
+ rb_define_method(rb_cModule, "autoload", rb_mod_autoload, 2);
+ rb_define_method(rb_cModule, "autoload?", rb_mod_autoload_p, 1);
+ rb_define_global_function("autoload", rb_f_autoload, 2);
+ rb_define_global_function("autoload?", rb_f_autoload_p, 1);
+ rb_global_variable(&ruby_wrapper);
+
+ rb_global_variable(&ruby_dln_librefs);
+ ruby_dln_librefs = rb_ary_new();
+}
+
+static void
+scope_dup(scope)
+ struct SCOPE *scope;
+{
+ ID *tbl;
+ VALUE *vars;
+
+ scope->flags |= SCOPE_DONT_RECYCLE;
+ if (scope->flags & SCOPE_MALLOC) return;
+
+ if (scope->local_tbl) {
+ tbl = scope->local_tbl;
+ vars = ALLOC_N(VALUE, tbl[0]+1);
+ *vars++ = scope->local_vars[-1];
+ MEMCPY(vars, scope->local_vars, VALUE, tbl[0]);
+ scope->local_vars = vars;
+ scope->flags |= SCOPE_MALLOC;
+ }
+}
+
+static void
+blk_mark(data)
+ struct BLOCK *data;
+{
+ while (data) {
+ rb_gc_mark_frame(&data->frame);
+ rb_gc_mark((VALUE)data->scope);
+ rb_gc_mark((VALUE)data->var);
+ rb_gc_mark((VALUE)data->body);
+ rb_gc_mark((VALUE)data->self);
+ rb_gc_mark((VALUE)data->dyna_vars);
+ rb_gc_mark((VALUE)data->cref);
+ rb_gc_mark(data->wrapper);
+ rb_gc_mark(data->block_obj);
+ data = data->prev;
+ }
+}
+
+static void
+frame_free(frame)
+ struct FRAME *frame;
+{
+ struct FRAME *tmp;
+
+ frame = frame->prev;
+ while (frame) {
+ tmp = frame;
+ frame = frame->prev;
+ free(tmp);
+ }
+}
+
+static void
+blk_free(data)
+ struct BLOCK *data;
+{
+ void *tmp;
+
+ while (data) {
+ frame_free(&data->frame);
+ tmp = data;
+ data = data->prev;
+ free(tmp);
+ }
+}
+
+static void
+frame_dup(frame)
+ struct FRAME *frame;
+{
+ struct FRAME *tmp;
+
+ for (;;) {
+ frame->tmp = 0; /* should not preserve tmp */
+ if (!frame->prev) break;
+ tmp = ALLOC(struct FRAME);
+ *tmp = *frame->prev;
+ frame->prev = tmp;
+ frame = tmp;
+ }
+}
+
+
+static void
+blk_copy_prev(block)
+ struct BLOCK *block;
+{
+ struct BLOCK *tmp;
+ struct RVarmap* vars;
+
+ while (block->prev) {
+ tmp = ALLOC_N(struct BLOCK, 1);
+ MEMCPY(tmp, block->prev, struct BLOCK, 1);
+ scope_dup(tmp->scope);
+ frame_dup(&tmp->frame);
+
+ for (vars = tmp->dyna_vars; vars; vars = vars->next) {
+ if (FL_TEST(vars, DVAR_DONT_RECYCLE)) break;
+ FL_SET(vars, DVAR_DONT_RECYCLE);
}
- cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp);
+
+ block->prev = tmp;
+ block = tmp;
+ }
+}
+
+
+static void
+blk_dup(dup, orig)
+ struct BLOCK *dup, *orig;
+{
+ MEMCPY(dup, orig, struct BLOCK, 1);
+ frame_dup(&dup->frame);
+
+ if (dup->iter) {
+ blk_copy_prev(dup);
+ }
+ else {
+ dup->prev = 0;
+ }
+}
+
+/*
+ * MISSING: documentation
+ */
+
+static VALUE
+proc_clone(self)
+ VALUE self;
+{
+ struct BLOCK *orig, *data;
+ VALUE bind;
+
+ Data_Get_Struct(self, struct BLOCK, orig);
+ bind = Data_Make_Struct(rb_obj_class(self),struct BLOCK,blk_mark,blk_free,data);
+ CLONESETUP(bind, self);
+ blk_dup(data, orig);
+
+ return bind;
+}
+
+/*
+ * MISSING: documentation
+ */
+
+#define PROC_TSHIFT (FL_USHIFT+1)
+#define PROC_TMASK (FL_USER1|FL_USER2|FL_USER3)
+#define PROC_TMAX (PROC_TMASK >> PROC_TSHIFT)
+
+static int proc_get_safe_level(VALUE);
+
+static VALUE
+proc_dup(self)
+ VALUE self;
+{
+ struct BLOCK *orig, *data;
+ VALUE bind;
+ int safe = proc_get_safe_level(self);
+
+ Data_Get_Struct(self, struct BLOCK, orig);
+ bind = Data_Make_Struct(rb_obj_class(self),struct BLOCK,blk_mark,blk_free,data);
+ blk_dup(data, orig);
+ if (safe > PROC_TMAX) safe = PROC_TMAX;
+ FL_SET(bind, (safe << PROC_TSHIFT) & PROC_TMASK);
+
+ return bind;
+}
+
+VALUE
+rb_block_dup(self, klass, cref)
+ VALUE self, klass, cref;
+{
+ struct BLOCK *block;
+ VALUE obj = proc_dup(self);
+ Data_Get_Struct(obj, struct BLOCK, block);
+ block->klass = klass;
+ block->cref = NEW_NODE(nd_type(block->cref), cref, block->cref->u2.node,
+ block->cref->u3.node);
+ return obj;
+}
+
+/*
+ * call-seq:
+ * binding -> a_binding
+ *
+ * Returns a +Binding+ object, describing the variable and
+ * method bindings at the point of call. This object can be used when
+ * calling +eval+ to execute the evaluated command in this
+ * environment. Also see the description of class +Binding+.
+ *
+ * def getBinding(param)
+ * return binding
+ * end
+ * b = getBinding("hello")
+ * eval("param", b) #=> "hello"
+ */
+
+static VALUE
+rb_f_binding(self)
+ VALUE self;
+{
+ struct BLOCK *data, *p;
+ struct RVarmap *vars;
+ VALUE bind;
+
+ PUSH_BLOCK(0,0);
+ bind = Data_Make_Struct(rb_cBinding,struct BLOCK,blk_mark,blk_free,data);
+ *data = *ruby_block;
+
+ data->orig_thread = rb_thread_current();
+ data->wrapper = ruby_wrapper;
+ data->iter = rb_f_block_given_p();
+ frame_dup(&data->frame);
+ if (ruby_frame->prev) {
+ data->frame.last_func = ruby_frame->prev->last_func;
+ data->frame.last_class = ruby_frame->prev->last_class;
+ data->frame.orig_func = ruby_frame->prev->orig_func;
+ }
+
+ if (data->iter) {
+ blk_copy_prev(data);
+ }
+ else {
+ data->prev = 0;
+ }
+
+ for (p = data; p; p = p->prev) {
+ for (vars = p->dyna_vars; vars; vars = vars->next) {
+ if (FL_TEST(vars, DVAR_DONT_RECYCLE)) break;
+ FL_SET(vars, DVAR_DONT_RECYCLE);
+ }
+ }
+ scope_dup(data->scope);
+ POP_BLOCK();
+
+ return bind;
+}
+
+/*
+ * call-seq:
+ * binding.eval(string [, filename [,lineno]]) => obj
+ *
+ * Evaluates the Ruby expression(s) in <em>string</em>, in the
+ * <em>binding</em>'s context. If the optional <em>filename</em> and
+ * <em>lineno</em> parameters are present, they will be used when
+ * reporting syntax errors.
+ *
+ * def getBinding(param)
+ * return binding
+ * end
+ * b = getBinding("hello")
+ * b.eval("param") #=> "hello"
+ */
+
+static VALUE
+bind_eval(argc, argv, bindval)
+ int argc;
+ VALUE *argv;
+ VALUE bindval;
+{
+ VALUE args[4];
+
+ rb_scan_args(argc, argv, "12", &args[0], &args[2], &args[3]);
+ args[1] = bindval;
+ return rb_f_eval(argc+1, args, Qnil /* self will be searched in eval */);
+}
+
+#define SAFE_LEVEL_MAX PROC_TMASK
+
+static void
+proc_save_safe_level(data)
+ VALUE data;
+{
+ int safe = ruby_safe_level;
+ if (safe > PROC_TMAX) safe = PROC_TMAX;
+ FL_SET(data, (safe << PROC_TSHIFT) & PROC_TMASK);
+}
+
+static int
+proc_get_safe_level(data)
+ VALUE data;
+{
+ return (RBASIC(data)->flags & PROC_TMASK) >> PROC_TSHIFT;
+}
+
+static void
+proc_set_safe_level(data)
+ VALUE data;
+{
+ ruby_safe_level = proc_get_safe_level(data);
+}
+
+static VALUE
+proc_alloc(klass, proc)
+ VALUE klass;
+ int proc;
+{
+ volatile VALUE block;
+ struct BLOCK *data, *p;
+ struct RVarmap *vars;
+
+ if (!rb_block_given_p() && !rb_f_block_given_p()) {
+ rb_raise(rb_eArgError, "tried to create Proc object without a block");
+ }
+ if (proc && !rb_block_given_p()) {
+ rb_warn("tried to create Proc object without a block");
+ }
+
+ if (!proc && ruby_block->block_obj && CLASS_OF(ruby_block->block_obj) == klass) {
+ return ruby_block->block_obj;
+ }
+ block = Data_Make_Struct(klass, struct BLOCK, blk_mark, blk_free, data);
+ *data = *ruby_block;
+
+ data->orig_thread = rb_thread_current();
+ data->wrapper = ruby_wrapper;
+ data->iter = data->prev?Qtrue:Qfalse;
+ data->block_obj = block;
+ frame_dup(&data->frame);
+ if (data->iter) {
+ blk_copy_prev(data);
+ }
+ else {
+ data->prev = 0;
+ }
+
+ for (p = data; p; p = p->prev) {
+ for (vars = p->dyna_vars; vars; vars = vars->next) {
+ if (FL_TEST(vars, DVAR_DONT_RECYCLE)) break;
+ FL_SET(vars, DVAR_DONT_RECYCLE);
+ }
+ }
+ scope_dup(data->scope);
+ proc_save_safe_level(block);
+ if (proc) {
+ data->flags |= BLOCK_LAMBDA;
+ }
+ else {
+ ruby_block->block_obj = block;
+ }
+
+ return block;
+}
+
+/*
+ * call-seq:
+ * Proc.new {|...| block } => a_proc
+ * Proc.new => a_proc
+ *
+ * Creates a new <code>Proc</code> object, bound to the current
+ * context. <code>Proc::new</code> may be called without a block only
+ * within a method with an attached block, in which case that block is
+ * converted to the <code>Proc</code> object.
+ *
+ * def proc_from
+ * Proc.new
+ * end
+ * proc = proc_from { "hello" }
+ * proc.call #=> "hello"
+ */
+
+static VALUE
+proc_s_new(argc, argv, klass)
+ int argc;
+ VALUE *argv;
+ VALUE klass;
+{
+ VALUE block = proc_alloc(klass, Qfalse);
+
+ rb_obj_call_init(block, argc, argv);
+ return block;
+}
+
+VALUE
+rb_block_proc()
+{
+ return proc_alloc(rb_cProc, Qfalse);
+}
+
+VALUE
+rb_f_lambda()
+{
+ rb_warn("rb_f_lambda() is deprecated; use rb_block_proc() instead");
+ return proc_alloc(rb_cProc, Qtrue);
+}
+
+/*
+ * call-seq:
+ * proc { |...| block } => a_proc
+ * lambda { |...| block } => a_proc
+ *
+ * Equivalent to <code>Proc.new</code>, except the resulting Proc objects
+ * check the number of parameters passed when called.
+ */
+
+static VALUE
+proc_lambda()
+{
+ return proc_alloc(rb_cProc, Qtrue);
+}
+
+static int
+block_orphan(data)
+ struct BLOCK *data;
+{
+ if (data->scope->flags & SCOPE_NOSTACK) {
+ return 1;
+ }
+ if (data->orig_thread != rb_thread_current()) {
+ return 1;
}
return 0;
}
static VALUE
-get_errinfo(void)
+proc_invoke(proc, args, self, klass)
+ VALUE proc, args; /* OK */
+ VALUE self, klass;
+{
+ struct BLOCK * volatile old_block;
+ struct BLOCK _block;
+ struct BLOCK *data;
+ volatile VALUE result = Qundef;
+ int state;
+ volatile int safe = ruby_safe_level;
+ volatile VALUE old_wrapper = ruby_wrapper;
+ volatile int pcall, avalue = Qtrue;
+ volatile VALUE tmp = args;
+ VALUE bvar = Qnil;
+
+ if (rb_block_given_p() && ruby_frame->last_func) {
+ if (klass != ruby_frame->last_class)
+ klass = rb_obj_class(proc);
+ bvar = rb_block_proc();
+ }
+
+ Data_Get_Struct(proc, struct BLOCK, data);
+ pcall = (data->flags & BLOCK_LAMBDA) ? YIELD_LAMBDA_CALL : 0;
+ if (!pcall && RARRAY(args)->len == 1) {
+ avalue = Qfalse;
+ args = RARRAY(args)->ptr[0];
+ }
+
+ PUSH_VARS();
+ ruby_wrapper = data->wrapper;
+ ruby_dyna_vars = data->dyna_vars;
+ /* PUSH BLOCK from data */
+ old_block = ruby_block;
+ _block = *data;
+ _block.block_obj = bvar;
+ if (self != Qundef) _block.frame.self = self;
+ if (klass) _block.frame.last_class = klass;
+ _block.frame.argc = RARRAY(tmp)->len;
+ _block.frame.flags = ruby_frame->flags;
+ if (_block.frame.argc && DMETHOD_P()) {
+ NEWOBJ(scope, struct SCOPE);
+ OBJSETUP(scope, tmp, T_SCOPE);
+ scope->local_tbl = _block.scope->local_tbl;
+ scope->local_vars = _block.scope->local_vars;
+ scope->flags |= SCOPE_CLONE;
+ _block.scope = scope;
+ }
+ /* modify current frame */
+ ruby_block = &_block;
+ PUSH_ITER(ITER_CUR);
+ ruby_frame->iter = ITER_CUR;
+ PUSH_TAG(pcall ? PROT_LAMBDA : PROT_NONE);
+ state = EXEC_TAG();
+ if (state == 0) {
+ proc_set_safe_level(proc);
+ result = rb_yield_0(args, self, (self!=Qundef)?CLASS_OF(self):0,
+ pcall | YIELD_PROC_CALL, avalue);
+ }
+ else if (TAG_DST()) {
+ result = prot_tag->retval;
+ }
+ POP_TAG();
+ POP_ITER();
+ ruby_block = old_block;
+ ruby_wrapper = old_wrapper;
+ POP_VARS();
+ ruby_safe_level = safe;
+
+ switch (state) {
+ case 0:
+ break;
+ case TAG_RETRY:
+ proc_jump_error(TAG_RETRY, Qnil); /* xxx */
+ JUMP_TAG(state);
+ break;
+ case TAG_NEXT:
+ case TAG_BREAK:
+ if (!pcall && result != Qundef) {
+ proc_jump_error(state, result);
+ }
+ case TAG_RETURN:
+ if (result != Qundef) {
+ if (pcall) break;
+ return_jump(result);
+ }
+ default:
+ JUMP_TAG(state);
+ }
+ return result;
+}
+
+/* CHECKME: are the argument checking semantics correct? */
+
+/*
+ * call-seq:
+ * prc.call(params,...) => obj
+ * prc[params,...] => obj
+ *
+ * Invokes the block, setting the block's parameters to the values in
+ * <i>params</i> using something close to method calling semantics.
+ * Generates a warning if multiple values are passed to a proc that
+ * expects just one (previously this silently converted the parameters
+ * to an array).
+ *
+ * For procs created using <code>Kernel.proc</code>, generates an
+ * error if the wrong number of parameters
+ * are passed to a proc with multiple parameters. For procs created using
+ * <code>Proc.new</code>, extra parameters are silently discarded.
+ *
+ * Returns the value of the last expression evaluated in the block. See
+ * also <code>Proc#yield</code>.
+ *
+ * a_proc = Proc.new {|a, *b| b.collect {|i| i*a }}
+ * a_proc.call(9, 1, 2, 3) #=> [9, 18, 27]
+ * a_proc[9, 1, 2, 3] #=> [9, 18, 27]
+ * a_proc = Proc.new {|a,b| a}
+ * a_proc.call(1,2,3)
+ *
+ * <em>produces:</em>
+ *
+ * prog.rb:5: wrong number of arguments (3 for 2) (ArgumentError)
+ * from prog.rb:4:in `call'
+ * from prog.rb:5
+ */
+
+VALUE
+rb_proc_call(proc, args)
+ VALUE proc, args; /* OK */
+{
+ return proc_invoke(proc, args, Qundef, 0);
+}
+
+static VALUE bmcall _((VALUE, VALUE));
+static VALUE method_arity _((VALUE));
+
+/*
+ * call-seq:
+ * prc.arity -> fixnum
+ *
+ * Returns the number of arguments that would not be ignored. If the block
+ * is declared to take no arguments, returns 0. If the block is known
+ * to take exactly n arguments, returns n. If the block has optional
+ * arguments, return -n-1, where n is the number of mandatory
+ * arguments. A <code>proc</code> with no argument declarations
+ * is the same a block declaring <code>||</code> as its arguments.
+ *
+ * Proc.new {}.arity #=> 0
+ * Proc.new {||}.arity #=> 0
+ * Proc.new {|a|}.arity #=> 1
+ * Proc.new {|a,b|}.arity #=> 2
+ * Proc.new {|a,b,c|}.arity #=> 3
+ * Proc.new {|*a|}.arity #=> -1
+ * Proc.new {|a,*b|}.arity #=> -2
+ */
+
+static VALUE
+proc_arity(proc)
+ VALUE proc;
+{
+ struct BLOCK *data;
+ NODE *var, *list;
+ int n;
+
+ Data_Get_Struct(proc, struct BLOCK, data);
+ var = data->var;
+ if (var == 0) {
+ if (data->body && nd_type(data->body) == NODE_IFUNC &&
+ data->body->nd_cfnc == bmcall) {
+ return method_arity(data->body->nd_tval);
+ }
+ return INT2FIX(-1);
+ }
+ if (var == (NODE*)1) return INT2FIX(0);
+ if (var == (NODE*)2) return INT2FIX(0);
+ if (nd_type(var) == NODE_BLOCK_ARG) {
+ var = var->nd_args;
+ if (var == (NODE*)1) return INT2FIX(0);
+ if (var == (NODE*)2) return INT2FIX(0);
+ }
+ switch (nd_type(var)) {
+ default:
+ return INT2FIX(1);
+ case NODE_MASGN:
+ list = var->nd_head;
+ n = 0;
+ while (list) {
+ n++;
+ list = list->nd_next;
+ }
+ if (var->nd_args) return INT2FIX(-n-1);
+ return INT2FIX(n);
+ }
+}
+
+/*
+ * call-seq:
+ * prc == other_proc => true or false
+ *
+ * Return <code>true</code> if <i>prc</i> is the same object as
+ * <i>other_proc</i>, or if they are both procs with the same body.
+ */
+
+static VALUE
+proc_eq(self, other)
+ VALUE self, other;
{
- VALUE *ptr = errinfo_place();
- if (ptr) {
- return *ptr;
+ struct BLOCK *data, *data2;
+
+ if (self == other) return Qtrue;
+ if (TYPE(other) != T_DATA) return Qfalse;
+ if (RDATA(other)->dmark != (RUBY_DATA_FUNC)blk_mark) return Qfalse;
+ if (CLASS_OF(self) != CLASS_OF(other)) return Qfalse;
+ Data_Get_Struct(self, struct BLOCK, data);
+ Data_Get_Struct(other, struct BLOCK, data2);
+ if (data->body != data2->body) return Qfalse;
+ if (data->var != data2->var) return Qfalse;
+ if (data->scope != data2->scope) return Qfalse;
+ if (data->dyna_vars != data2->dyna_vars) return Qfalse;
+ if (data->flags != data2->flags) return Qfalse;
+
+ return Qtrue;
+}
+
+/*
+ * call-seq:
+ * prc.to_s => string
+ *
+ * Shows the unique identifier for this proc, along with
+ * an indication of where the proc was defined.
+ */
+
+static VALUE
+proc_to_s(self)
+ VALUE self;
+{
+ struct BLOCK *data;
+ NODE *node;
+ const char *cname = rb_obj_classname(self);
+ const int w = (sizeof(VALUE) * CHAR_BIT) / 4;
+ long len = strlen(cname)+6+w; /* 6:tags 16:addr */
+ VALUE str;
+
+ Data_Get_Struct(self, struct BLOCK, data);
+ if ((node = data->frame.node) || (node = data->body)) {
+ len += strlen(node->nd_file) + 2 + (SIZEOF_LONG*CHAR_BIT-NODE_LSHIFT)/3;
+ str = rb_str_new(0, len);
+ snprintf(RSTRING(str)->ptr, len+1,
+ "#<%s:0x%.*lx@%s:%d>", cname, w, (VALUE)data->body,
+ node->nd_file, nd_line(node));
}
else {
- rb_thread_t *th = GET_THREAD();
- return th->errinfo;
+ str = rb_str_new(0, len);
+ snprintf(RSTRING(str)->ptr, len+1,
+ "#<%s:0x%.*lx>", cname, w, (VALUE)data->body);
}
+ RSTRING(str)->len = strlen(RSTRING(str)->ptr);
+ if (OBJ_TAINTED(self)) OBJ_TAINT(str);
+
+ return str;
}
+/*
+ * call-seq:
+ * prc.to_proc -> prc
+ *
+ * Part of the protocol for converting objects to <code>Proc</code>
+ * objects. Instances of class <code>Proc</code> simply return
+ * themselves.
+ */
+
static VALUE
-errinfo_getter(ID id)
+proc_to_self(self)
+ VALUE self;
{
- return get_errinfo();
+ return self;
}
-#if 0
+/*
+ * call-seq:
+ * prc.binding => binding
+ *
+ * Returns the binding associated with <i>prc</i>. Note that
+ * <code>Kernel#eval</code> accepts either a <code>Proc</code> or a
+ * <code>Binding</code> object as its second parameter.
+ *
+ * def fred(param)
+ * proc {}
+ * end
+ *
+ * b = fred(99)
+ * eval("param", b.binding) #=> 99
+ * eval("param", b) #=> 99
+ */
+
+static VALUE
+proc_binding(proc)
+ VALUE proc;
+{
+ struct BLOCK *orig, *data;
+ VALUE bind;
+
+ Data_Get_Struct(proc, struct BLOCK, orig);
+ bind = Data_Make_Struct(rb_cBinding,struct BLOCK,blk_mark,blk_free,data);
+ MEMCPY(data, orig, struct BLOCK, 1);
+ frame_dup(&data->frame);
+
+ if (data->iter) {
+ blk_copy_prev(data);
+ }
+ else {
+ data->prev = 0;
+ }
+
+ return bind;
+}
+
+static VALUE
+block_pass(self, node)
+ VALUE self;
+ NODE *node;
+{
+ VALUE proc = rb_eval(self, node->nd_body); /* OK */
+ VALUE b;
+ struct BLOCK * volatile old_block;
+ struct BLOCK _block;
+ struct BLOCK *data;
+ volatile VALUE result = Qnil;
+ int state;
+ volatile int orphan;
+ volatile int safe = ruby_safe_level;
+
+ if (NIL_P(proc)) {
+ PUSH_ITER(ITER_NOT);
+ result = rb_eval(self, node->nd_iter);
+ POP_ITER();
+ return result;
+ }
+ if (!rb_obj_is_proc(proc)) {
+ b = rb_check_convert_type(proc, T_DATA, "Proc", "to_proc");
+ if (!rb_obj_is_proc(b)) {
+ rb_raise(rb_eTypeError, "wrong argument type %s (expected Proc)",
+ rb_obj_classname(proc));
+ }
+ proc = b;
+ }
+
+ if (ruby_safe_level >= 1 && OBJ_TAINTED(proc) &&
+ ruby_safe_level > proc_get_safe_level(proc)) {
+ rb_raise(rb_eSecurityError, "Insecure: tainted block value");
+ }
+
+ if (ruby_block && ruby_block->block_obj == proc) {
+ PUSH_ITER(ITER_PAS);
+ result = rb_eval(self, node->nd_iter);
+ POP_ITER();
+ return result;
+ }
+
+ Data_Get_Struct(proc, struct BLOCK, data);
+ orphan = block_orphan(data);
+
+ /* PUSH BLOCK from data */
+ old_block = ruby_block;
+ _block = *data;
+ _block.outer = ruby_block;
+ if (orphan) _block.uniq = block_unique++;
+ ruby_block = &_block;
+ PUSH_ITER(ITER_PRE);
+ if (ruby_frame->iter == ITER_NOT)
+ ruby_frame->iter = ITER_PRE;
+
+ PUSH_TAG(PROT_LOOP);
+ state = EXEC_TAG();
+ if (state == 0) {
+ retry:
+ proc_set_safe_level(proc);
+ if (safe > ruby_safe_level)
+ ruby_safe_level = safe;
+ result = rb_eval(self, node->nd_iter);
+ }
+ else if (state == TAG_BREAK && TAG_DST()) {
+ result = prot_tag->retval;
+ state = 0;
+ }
+ else if (state == TAG_RETRY) {
+ state = 0;
+ goto retry;
+ }
+ POP_TAG();
+ POP_ITER();
+ ruby_block = old_block;
+ ruby_safe_level = safe;
+
+ switch (state) {/* escape from orphan block */
+ case 0:
+ break;
+ case TAG_RETURN:
+ if (orphan) {
+ proc_jump_error(state, prot_tag->retval);
+ }
+ default:
+ JUMP_TAG(state);
+ }
+
+ return result;
+}
+
+struct METHOD {
+ VALUE klass, rklass;
+ VALUE recv;
+ ID id, oid;
+ int safe_level;
+ NODE *body;
+};
+
static void
-errinfo_setter(VALUE val, ID id, VALUE *var)
+bm_mark(data)
+ struct METHOD *data;
{
- if (!NIL_P(val) && !rb_obj_is_kind_of(val, rb_eException)) {
- rb_raise(rb_eTypeError, "assigning non-exception to $!");
+ rb_gc_mark(data->rklass);
+ rb_gc_mark(data->klass);
+ rb_gc_mark(data->recv);
+ rb_gc_mark((VALUE)data->body);
+}
+
+static VALUE
+mnew(klass, obj, id, mklass)
+ VALUE klass, obj, mklass;
+ ID id;
+{
+ VALUE method;
+ NODE *body;
+ int noex;
+ struct METHOD *data;
+ VALUE rklass = klass;
+ ID oid = id;
+
+ again:
+ if ((body = rb_get_method_body(&klass, &id, &noex)) == 0) {
+ print_undef(rklass, oid);
+ }
+
+ if (nd_type(body) == NODE_ZSUPER) {
+ klass = RCLASS(klass)->super;
+ goto again;
+ }
+
+ while (rklass != klass &&
+ (FL_TEST(rklass, FL_SINGLETON) || TYPE(rklass) == T_ICLASS)) {
+ rklass = RCLASS(rklass)->super;
+ }
+ if (TYPE(klass) == T_ICLASS) klass = RBASIC(klass)->klass;
+ method = Data_Make_Struct(mklass, struct METHOD, bm_mark, free, data);
+ data->klass = klass;
+ data->recv = obj;
+ data->id = id;
+ data->body = body;
+ data->rklass = rklass;
+ data->oid = oid;
+ data->safe_level = NOEX_WITH_SAFE(noex);
+ OBJ_INFECT(method, klass);
+
+ return method;
+}
+
+
+/**********************************************************************
+ *
+ * Document-class : Method
+ *
+ * Method objects are created by <code>Object#method</code>, and are
+ * associated with a particular object (not just with a class). They
+ * may be used to invoke the method within the object, and as a block
+ * associated with an iterator. They may also be unbound from one
+ * object (creating an <code>UnboundMethod</code>) and bound to
+ * another.
+ *
+ * class Thing
+ * def square(n)
+ * n*n
+ * end
+ * end
+ * thing = Thing.new
+ * meth = thing.method(:square)
+ *
+ * meth.call(9) #=> 81
+ * [ 1, 2, 3 ].collect(&meth) #=> [1, 4, 9]
+ *
+ */
+
+/*
+ * call-seq:
+ * meth == other_meth => true or false
+ *
+ * Two method objects are equal if that are bound to the same
+ * object and contain the same body.
+ */
+
+
+static VALUE
+method_eq(method, other)
+ VALUE method, other;
+{
+ struct METHOD *m1, *m2;
+
+ if (TYPE(other) != T_DATA || RDATA(other)->dmark != (RUBY_DATA_FUNC)bm_mark)
+ return Qfalse;
+ if (CLASS_OF(method) != CLASS_OF(other))
+ return Qfalse;
+
+ Data_Get_Struct(method, struct METHOD, m1);
+ Data_Get_Struct(other, struct METHOD, m2);
+
+ if (m1->klass != m2->klass || m1->rklass != m2->rklass ||
+ m1->recv != m2->recv || m1->body != m2->body)
+ return Qfalse;
+
+ return Qtrue;
+}
+
+/*
+ * call-seq:
+ * meth.unbind => unbound_method
+ *
+ * Dissociates <i>meth</i> from it's current receiver. The resulting
+ * <code>UnboundMethod</code> can subsequently be bound to a new object
+ * of the same class (see <code>UnboundMethod</code>).
+ */
+
+static VALUE
+method_unbind(obj)
+ VALUE obj;
+{
+ VALUE method;
+ struct METHOD *orig, *data;
+
+ Data_Get_Struct(obj, struct METHOD, orig);
+ method = Data_Make_Struct(rb_cUnboundMethod, struct METHOD, bm_mark, free, data);
+ data->klass = orig->klass;
+ data->recv = Qundef;
+ data->id = orig->id;
+ data->body = orig->body;
+ data->rklass = orig->rklass;
+ data->oid = orig->oid;
+ OBJ_INFECT(method, obj);
+
+ return method;
+}
+
+/*
+ * call-seq:
+ * meth.receiver => object
+ *
+ * Returns the bound receiver of the method object.
+ */
+
+static VALUE
+method_receiver(obj)
+ VALUE obj;
+{
+ struct METHOD *data;
+
+ Data_Get_Struct(obj, struct METHOD, data);
+ return data->recv;
+}
+
+/*
+ * call-seq:
+ * meth.name => string
+ *
+ * Returns the name of the method.
+ */
+
+static VALUE
+method_name(obj)
+ VALUE obj;
+{
+ struct METHOD *data;
+
+ Data_Get_Struct(obj, struct METHOD, data);
+ return rb_str_new2(rb_id2name(data->oid));
+}
+
+/*
+ * call-seq:
+ * meth.owner => class_or_module
+ *
+ * Returns the class or module that defines the method.
+ */
+
+static VALUE
+method_owner(obj)
+ VALUE obj;
+{
+ struct METHOD *data;
+
+ Data_Get_Struct(obj, struct METHOD, data);
+ return data->klass;
+}
+
+/*
+ * call-seq:
+ * obj.method(sym) => method
+ *
+ * Looks up the named method as a receiver in <i>obj</i>, returning a
+ * <code>Method</code> object (or raising <code>NameError</code>). The
+ * <code>Method</code> object acts as a closure in <i>obj</i>'s object
+ * instance, so instance variables and the value of <code>self</code>
+ * remain available.
+ *
+ * class Demo
+ * def initialize(n)
+ * @iv = n
+ * end
+ * def hello()
+ * "Hello, @iv = #{@iv}"
+ * end
+ * end
+ *
+ * k = Demo.new(99)
+ * m = k.method(:hello)
+ * m.call #=> "Hello, @iv = 99"
+ *
+ * l = Demo.new('Fred')
+ * m = l.method("hello")
+ * m.call #=> "Hello, @iv = Fred"
+ */
+
+VALUE
+rb_obj_method(obj, vid)
+ VALUE obj;
+ VALUE vid;
+{
+ return mnew(CLASS_OF(obj), obj, rb_to_id(vid), rb_cMethod);
+}
+
+/*
+ * call-seq:
+ * mod.instance_method(symbol) => unbound_method
+ *
+ * Returns an +UnboundMethod+ representing the given
+ * instance method in _mod_.
+ *
+ * class Interpreter
+ * def do_a() print "there, "; end
+ * def do_d() print "Hello "; end
+ * def do_e() print "!\n"; end
+ * def do_v() print "Dave"; end
+ * Dispatcher = {
+ * ?a => instance_method(:do_a),
+ * ?d => instance_method(:do_d),
+ * ?e => instance_method(:do_e),
+ * ?v => instance_method(:do_v)
+ * }
+ * def interpret(string)
+ * string.each_byte {|b| Dispatcher[b].bind(self).call }
+ * end
+ * end
+ *
+ *
+ * interpreter = Interpreter.new
+ * interpreter.interpret('dave')
+ *
+ * <em>produces:</em>
+ *
+ * Hello there, Dave!
+ */
+
+static VALUE
+rb_mod_method(mod, vid)
+ VALUE mod;
+ VALUE vid;
+{
+ return mnew(mod, Qundef, rb_to_id(vid), rb_cUnboundMethod);
+}
+
+/*
+ * MISSING: documentation
+ */
+
+static VALUE
+method_clone(self)
+ VALUE self;
+{
+ VALUE clone;
+ struct METHOD *orig, *data;
+
+ Data_Get_Struct(self, struct METHOD, orig);
+ clone = Data_Make_Struct(CLASS_OF(self),struct METHOD, bm_mark, free, data);
+ CLONESETUP(clone, self);
+ *data = *orig;
+
+ return clone;
+}
+
+VALUE
+rb_method_dup(self, klass, cref)
+ VALUE self;
+ VALUE klass;
+ VALUE cref;
+{
+ VALUE clone;
+ struct METHOD *orig, *data;
+
+ Data_Get_Struct(self, struct METHOD, orig);
+ clone = Data_Make_Struct(CLASS_OF(self),struct METHOD, bm_mark, free, data);
+ *data = *orig;
+ data->rklass = klass;
+ if (data->body->nd_rval) {
+ NODE *tmp = NEW_NODE(nd_type(data->body->u2.node), cref,
+ data->body->u2.node->u2.node,
+ data->body->u2.node->u3.node);
+ data->body = NEW_NODE(nd_type(data->body), data->body->u1.node, tmp,
+ data->body->u3.node);
+ }
+ return clone;
+}
+
+/*
+ * call-seq:
+ * meth.call(args, ...) => obj
+ * meth[args, ...] => obj
+ *
+ * Invokes the <i>meth</i> with the specified arguments, returning the
+ * method's return value.
+ *
+ * m = 12.method("+")
+ * m.call(3) #=> 15
+ * m.call(20) #=> 32
+ */
+
+static VALUE
+method_call(argc, argv, method)
+ int argc;
+ VALUE *argv;
+ VALUE method;
+{
+ VALUE result = Qnil; /* OK */
+ struct METHOD *data;
+ int safe;
+
+ Data_Get_Struct(method, struct METHOD, data);
+ if (data->recv == Qundef) {
+ rb_raise(rb_eTypeError, "can't call unbound method; bind first");
+ }
+ if (OBJ_TAINTED(method)) {
+ safe = NOEX_WITH(data->safe_level, 4)|NOEX_TAINTED;
}
else {
- VALUE *ptr = errinfo_place();
- if (ptr) {
- *ptr = val;
+ safe = data->safe_level;
+ }
+ PUSH_ITER(rb_block_given_p()?ITER_PRE:ITER_NOT);
+ result = rb_call0(data->klass,data->recv,data->id,data->oid,argc,argv,data->body,safe);
+ POP_ITER();
+ return result;
+}
+
+/**********************************************************************
+ *
+ * Document-class: UnboundMethod
+ *
+ * Ruby supports two forms of objectified methods. Class
+ * <code>Method</code> is used to represent methods that are associated
+ * with a particular object: these method objects are bound to that
+ * object. Bound method objects for an object can be created using
+ * <code>Object#method</code>.
+ *
+ * Ruby also supports unbound methods; methods objects that are not
+ * associated with a particular object. These can be created either by
+ * calling <code>Module#instance_method</code> or by calling
+ * <code>unbind</code> on a bound method object. The result of both of
+ * these is an <code>UnboundMethod</code> object.
+ *
+ * Unbound methods can only be called after they are bound to an
+ * object. That object must be be a kind_of? the method's original
+ * class.
+ *
+ * class Square
+ * def area
+ * @side * @side
+ * end
+ * def initialize(side)
+ * @side = side
+ * end
+ * end
+ *
+ * area_un = Square.instance_method(:area)
+ *
+ * s = Square.new(12)
+ * area = area_un.bind(s)
+ * area.call #=> 144
+ *
+ * Unbound methods are a reference to the method at the time it was
+ * objectified: subsequent changes to the underlying class will not
+ * affect the unbound method.
+ *
+ * class Test
+ * def test
+ * :original
+ * end
+ * end
+ * um = Test.instance_method(:test)
+ * class Test
+ * def test
+ * :modified
+ * end
+ * end
+ * t = Test.new
+ * t.test #=> :modified
+ * um.bind(t).call #=> :original
+ *
+ */
+
+/*
+ * call-seq:
+ * umeth.bind(obj) -> method
+ *
+ * Bind <i>umeth</i> to <i>obj</i>. If <code>Klass</code> was the class
+ * from which <i>umeth</i> was obtained,
+ * <code>obj.kind_of?(Klass)</code> must be true.
+ *
+ * class A
+ * def test
+ * puts "In test, class = #{self.class}"
+ * end
+ * end
+ * class B < A
+ * end
+ * class C < B
+ * end
+ *
+ *
+ * um = B.instance_method(:test)
+ * bm = um.bind(C.new)
+ * bm.call
+ * bm = um.bind(B.new)
+ * bm.call
+ * bm = um.bind(A.new)
+ * bm.call
+ *
+ * <em>produces:</em>
+ *
+ * In test, class = C
+ * In test, class = B
+ * prog.rb:16:in `bind': bind argument must be an instance of B (TypeError)
+ * from prog.rb:16
+ */
+
+static VALUE
+umethod_bind(method, recv)
+ VALUE method, recv;
+{
+ struct METHOD *data, *bound;
+ VALUE rklass = CLASS_OF(recv);
+
+ Data_Get_Struct(method, struct METHOD, data);
+ if (data->rklass != rklass) {
+ if (FL_TEST(data->rklass, FL_SINGLETON)) {
+ rb_raise(rb_eTypeError, "singleton method bound for a different object");
+ }
+ if (TYPE(data->rklass) == T_MODULE) {
+ st_table *m_tbl = RCLASS(data->rklass)->m_tbl;
+ while (RCLASS(rklass)->m_tbl != m_tbl) {
+ rklass = RCLASS(rklass)->super;
+ if (!rklass) goto not_instace;
+ }
+ }
+ else if (!rb_obj_is_kind_of(recv, data->rklass)) {
+ not_instace:
+ rb_raise(rb_eTypeError, "bind argument must be an instance of %s",
+ rb_class2name(data->rklass));
+ }
+ }
+
+ method = Data_Make_Struct(rb_cMethod,struct METHOD,bm_mark,free,bound);
+ *bound = *data;
+ bound->recv = recv;
+ bound->rklass = rklass;
+
+ return method;
+}
+
+/*
+ * call-seq:
+ * meth.arity => fixnum
+ *
+ * Returns an indication of the number of arguments accepted by a
+ * method. Returns a nonnegative integer for methods that take a fixed
+ * number of arguments. For Ruby methods that take a variable number of
+ * arguments, returns -n-1, where n is the number of required
+ * arguments. For methods written in C, returns -1 if the call takes a
+ * variable number of arguments.
+ *
+ * class C
+ * def one; end
+ * def two(a); end
+ * def three(*a); end
+ * def four(a, b); end
+ * def five(a, b, *c); end
+ * def six(a, b, *c, &d); end
+ * end
+ * c = C.new
+ * c.method(:one).arity #=> 0
+ * c.method(:two).arity #=> 1
+ * c.method(:three).arity #=> -1
+ * c.method(:four).arity #=> 2
+ * c.method(:five).arity #=> -3
+ * c.method(:six).arity #=> -3
+ *
+ * "cat".method(:size).arity #=> 0
+ * "cat".method(:replace).arity #=> 1
+ * "cat".method(:squeeze).arity #=> -1
+ * "cat".method(:count).arity #=> -1
+ */
+
+static VALUE
+method_arity(method)
+ VALUE method;
+{
+ struct METHOD *data;
+ NODE *body;
+ int n;
+
+ Data_Get_Struct(method, struct METHOD, data);
+
+ body = data->body;
+ switch (nd_type(body)) {
+ case NODE_CFUNC:
+ if (body->nd_argc < 0) return INT2FIX(-1);
+ return INT2FIX(body->nd_argc);
+ case NODE_ZSUPER:
+ return INT2FIX(-1);
+ case NODE_ATTRSET:
+ return INT2FIX(1);
+ case NODE_IVAR:
+ return INT2FIX(0);
+ case NODE_BMETHOD:
+ return proc_arity(body->nd_cval);
+ case NODE_DMETHOD:
+ return method_arity(body->nd_cval);
+ case NODE_SCOPE:
+ body = body->nd_next; /* skip NODE_SCOPE */
+ if (nd_type(body) == NODE_BLOCK)
+ body = body->nd_head;
+ if (!body) return INT2FIX(0);
+ n = body->nd_cnt;
+ if (body->nd_opt || body->nd_rest)
+ n = -n-1;
+ return INT2FIX(n);
+ default:
+ rb_raise(rb_eArgError, "invalid node 0x%x", nd_type(body));
+ }
+}
+
+/*
+ * call-seq:
+ * meth.to_s => string
+ * meth.inspect => string
+ *
+ * Show the name of the underlying method.
+ *
+ * "cat".method(:count).inspect #=> "#<Method: String#count>"
+ */
+
+static VALUE
+method_inspect(method)
+ VALUE method;
+{
+ struct METHOD *data;
+ VALUE str;
+ const char *s;
+ const char *sharp = "#";
+
+ Data_Get_Struct(method, struct METHOD, data);
+ str = rb_str_buf_new2("#<");
+ s = rb_obj_classname(method);
+ rb_str_buf_cat2(str, s);
+ rb_str_buf_cat2(str, ": ");
+
+ if (FL_TEST(data->klass, FL_SINGLETON)) {
+ VALUE v = rb_iv_get(data->klass, "__attached__");
+
+ if (data->recv == Qundef) {
+ rb_str_buf_append(str, rb_inspect(data->klass));
+ }
+ else if (data->recv == v) {
+ rb_str_buf_append(str, rb_inspect(v));
+ sharp = ".";
}
else {
- rb_raise(rb_eRuntimeError, "errinfo_setter: not in rescue clause.");
+ rb_str_buf_append(str, rb_inspect(data->recv));
+ rb_str_buf_cat2(str, "(");
+ rb_str_buf_append(str, rb_inspect(v));
+ rb_str_buf_cat2(str, ")");
+ sharp = ".";
}
}
+ else {
+ rb_str_buf_cat2(str, rb_class2name(data->rklass));
+ if (data->rklass != data->klass) {
+ rb_str_buf_cat2(str, "(");
+ rb_str_buf_cat2(str, rb_class2name(data->klass));
+ rb_str_buf_cat2(str, ")");
+ }
+ }
+ rb_str_buf_cat2(str, sharp);
+ rb_str_buf_cat2(str, rb_id2name(data->oid));
+ rb_str_buf_cat2(str, ">");
+
+ return str;
+}
+
+static VALUE
+mproc(method)
+ VALUE method;
+{
+ VALUE proc;
+
+ /* emulate ruby's method call */
+ PUSH_ITER(ITER_CUR);
+ PUSH_FRAME();
+ proc = rb_block_proc();
+ POP_FRAME();
+ POP_ITER();
+
+ return proc;
+}
+
+static VALUE
+bmcall(args, method)
+ VALUE args, method;
+{
+ volatile VALUE a;
+ VALUE ret;
+
+ a = svalue_to_avalue(args);
+ ret = method_call(RARRAY(a)->len, RARRAY(a)->ptr, method);
+ a = Qnil; /* prevent tail call */
+ return ret;
}
-#endif
VALUE
-rb_errinfo(void)
+rb_proc_new(func, val)
+ VALUE (*func)(ANYARGS); /* VALUE yieldarg[, VALUE procarg] */
+ VALUE val;
+{
+ struct BLOCK *data;
+ VALUE proc = rb_iterate((VALUE(*)_((VALUE)))mproc, 0, func, val);
+
+ Data_Get_Struct(proc, struct BLOCK, data);
+ data->body->nd_state = YIELD_FUNC_LAMBDA;
+ data->flags |= BLOCK_LAMBDA;
+ return proc;
+}
+
+/*
+ * call-seq:
+ * meth.to_proc => prc
+ *
+ * Returns a <code>Proc</code> object corresponding to this method.
+ */
+
+static VALUE
+method_proc(method)
+ VALUE method;
{
- rb_thread_t *th = GET_THREAD();
- return th->errinfo;
+ VALUE proc;
+ struct METHOD *mdata;
+ struct BLOCK *bdata;
+
+ proc = rb_iterate((VALUE(*)_((VALUE)))mproc, 0, bmcall, method);
+ Data_Get_Struct(method, struct METHOD, mdata);
+ Data_Get_Struct(proc, struct BLOCK, bdata);
+ bdata->body->nd_file = mdata->body->nd_file;
+ nd_set_line(bdata->body, nd_line(mdata->body));
+ bdata->body->nd_state = YIELD_FUNC_SVALUE;
+
+ return proc;
}
+static VALUE
+rb_obj_is_method(m)
+ VALUE m;
+{
+ if (TYPE(m) == T_DATA && RDATA(m)->dmark == (RUBY_DATA_FUNC)bm_mark) {
+ return Qtrue;
+ }
+ return Qfalse;
+}
+
+/*
+ * call-seq:
+ * define_method(symbol, method) => new_method
+ * define_method(symbol) { block } => proc
+ *
+ * Defines an instance method in the receiver. The _method_
+ * parameter can be a +Proc+ or +Method+ object.
+ * If a block is specified, it is used as the method body. This block
+ * is evaluated using <code>instance_eval</code>, a point that is
+ * tricky to demonstrate because <code>define_method</code> is private.
+ * (This is why we resort to the +send+ hack in this example.)
+ *
+ * class A
+ * def fred
+ * puts "In Fred"
+ * end
+ * def create_method(name, &block)
+ * self.class.send(:define_method, name, &block)
+ * end
+ * define_method(:wilma) { puts "Charge it!" }
+ * end
+ * class B < A
+ * define_method(:barney, instance_method(:fred))
+ * end
+ * a = B.new
+ * a.barney
+ * a.wilma
+ * a.create_method(:betty) { p self }
+ * a.betty
+ *
+ * <em>produces:</em>
+ *
+ * In Fred
+ * Charge it!
+ * #<B:0x401b39e8>
+ */
+
+static VALUE
+rb_mod_define_method(argc, argv, mod)
+ int argc;
+ VALUE *argv;
+ VALUE mod;
+{
+ ID id;
+ VALUE body;
+ NODE *node;
+ int noex;
+
+ if (argc == 1) {
+ id = rb_to_id(argv[0]);
+ body = proc_lambda();
+ }
+ else if (argc == 2) {
+ id = rb_to_id(argv[0]);
+ body = argv[1];
+ if (!rb_obj_is_method(body) && !rb_obj_is_proc(body)) {
+ rb_raise(rb_eTypeError, "wrong argument type %s (expected Proc/Method)",
+ rb_obj_classname(body));
+ }
+ }
+ else {
+ rb_raise(rb_eArgError, "wrong number of arguments (%d for 1)", argc);
+ }
+ if (RDATA(body)->dmark == (RUBY_DATA_FUNC)bm_mark) {
+ node = NEW_DMETHOD(method_unbind(body));
+ }
+ else if (RDATA(body)->dmark == (RUBY_DATA_FUNC)blk_mark) {
+ struct BLOCK *block;
+
+ body = proc_clone(body);
+ Data_Get_Struct(body, struct BLOCK, block);
+ block->frame.last_func = id;
+ block->frame.orig_func = id;
+ block->frame.last_class = mod;
+ node = NEW_BMETHOD(body);
+ }
+ else {
+ /* type error */
+ rb_raise(rb_eTypeError, "wrong argument type (expected Proc/Method)");
+ }
+
+ noex = NOEX_PUBLIC;
+ if (ruby_cbase == mod) {
+ if (SCOPE_TEST(SCOPE_PRIVATE)) {
+ noex = NOEX_PRIVATE;
+ }
+ else if (SCOPE_TEST(SCOPE_PROTECTED)) {
+ noex = NOEX_PROTECTED;
+ }
+ }
+ rb_add_method(mod, id, node, noex);
+ return body;
+}
+
+/*
+ * <code>Proc</code> objects are blocks of code that have been bound to
+ * a set of local variables. Once bound, the code may be called in
+ * different contexts and still access those variables.
+ *
+ * def gen_times(factor)
+ * return Proc.new {|n| n*factor }
+ * end
+ *
+ * times3 = gen_times(3)
+ * times5 = gen_times(5)
+ *
+ * times3.call(12) #=> 36
+ * times5.call(5) #=> 25
+ * times3.call(times5.call(4)) #=> 60
+ *
+ */
+
void
-rb_set_errinfo(VALUE err)
+Init_Proc()
{
- if (!NIL_P(err) && !rb_obj_is_kind_of(err, rb_eException)) {
- rb_raise(rb_eTypeError, "assigning non-exception to $!");
+ rb_eLocalJumpError = rb_define_class("LocalJumpError", rb_eStandardError);
+ rb_define_method(rb_eLocalJumpError, "exit_value", localjump_xvalue, 0);
+ rb_define_method(rb_eLocalJumpError, "reason", localjump_reason, 0);
+
+ rb_global_variable(&exception_error);
+ exception_error = rb_exc_new2(rb_eFatal, "exception reentered");
+
+ rb_eSysStackError = rb_define_class("SystemStackError", rb_eStandardError);
+ rb_global_variable(&sysstack_error);
+ sysstack_error = rb_exc_new2(rb_eSysStackError, "stack level too deep");
+ OBJ_TAINT(sysstack_error);
+
+ rb_cProc = rb_define_class("Proc", rb_cObject);
+ rb_undef_alloc_func(rb_cProc);
+ rb_define_singleton_method(rb_cProc, "new", proc_s_new, -1);
+
+ rb_define_method(rb_cProc, "clone", proc_clone, 0);
+ rb_define_method(rb_cProc, "dup", proc_dup, 0);
+ rb_define_method(rb_cProc, "call", rb_proc_call, -2);
+ rb_define_method(rb_cProc, "arity", proc_arity, 0);
+ rb_define_method(rb_cProc, "[]", rb_proc_call, -2);
+ rb_define_method(rb_cProc, "==", proc_eq, 1);
+ rb_define_method(rb_cProc, "to_s", proc_to_s, 0);
+ rb_define_method(rb_cProc, "to_proc", proc_to_self, 0);
+ rb_define_method(rb_cProc, "binding", proc_binding, 0);
+
+ rb_define_global_function("proc", proc_lambda, 0);
+ rb_define_global_function("lambda", proc_lambda, 0);
+
+ rb_cMethod = rb_define_class("Method", rb_cObject);
+ rb_undef_alloc_func(rb_cMethod);
+ rb_undef_method(CLASS_OF(rb_cMethod), "new");
+ rb_define_method(rb_cMethod, "==", method_eq, 1);
+ rb_define_method(rb_cMethod, "clone", method_clone, 0);
+ rb_define_method(rb_cMethod, "call", method_call, -1);
+ rb_define_method(rb_cMethod, "[]", method_call, -1);
+ rb_define_method(rb_cMethod, "arity", method_arity, 0);
+ rb_define_method(rb_cMethod, "inspect", method_inspect, 0);
+ rb_define_method(rb_cMethod, "to_s", method_inspect, 0);
+ rb_define_method(rb_cMethod, "to_proc", method_proc, 0);
+ rb_define_method(rb_cMethod, "receiver", method_receiver, 0);
+ rb_define_method(rb_cMethod, "name", method_name, 0);
+ rb_define_method(rb_cMethod, "owner", method_owner, 0);
+ rb_define_method(rb_cMethod, "unbind", method_unbind, 0);
+ rb_define_method(rb_mKernel, "method", rb_obj_method, 1);
+
+ rb_cUnboundMethod = rb_define_class("UnboundMethod", rb_cObject);
+ rb_undef_alloc_func(rb_cUnboundMethod);
+ rb_undef_method(CLASS_OF(rb_cUnboundMethod), "new");
+ rb_define_method(rb_cUnboundMethod, "==", method_eq, 1);
+ rb_define_method(rb_cUnboundMethod, "clone", method_clone, 0);
+ rb_define_method(rb_cUnboundMethod, "arity", method_arity, 0);
+ rb_define_method(rb_cUnboundMethod, "inspect", method_inspect, 0);
+ rb_define_method(rb_cUnboundMethod, "to_s", method_inspect, 0);
+ rb_define_method(rb_cUnboundMethod, "name", method_name, 0);
+ rb_define_method(rb_cUnboundMethod, "owner", method_owner, 0);
+ rb_define_method(rb_cUnboundMethod, "bind", umethod_bind, 1);
+ rb_define_method(rb_cModule, "instance_method", rb_mod_method, 1);
+}
+
+/*
+ * Objects of class <code>Binding</code> encapsulate the execution
+ * context at some particular place in the code and retain this context
+ * for future use. The variables, methods, value of <code>self</code>,
+ * and possibly an iterator block that can be accessed in this context
+ * are all retained. Binding objects can be created using
+ * <code>Kernel#binding</code>, and are made available to the callback
+ * of <code>Kernel#set_trace_func</code>.
+ *
+ * These binding objects can be passed as the second argument of the
+ * <code>Kernel#eval</code> method, establishing an environment for the
+ * evaluation.
+ *
+ * class Demo
+ * def initialize(n)
+ * @secret = n
+ * end
+ * def getBinding
+ * return binding()
+ * end
+ * end
+ *
+ * k1 = Demo.new(99)
+ * b1 = k1.getBinding
+ * k2 = Demo.new(-3)
+ * b2 = k2.getBinding
+ *
+ * eval("@secret", b1) #=> 99
+ * eval("@secret", b2) #=> -3
+ * eval("@secret") #=> nil
+ *
+ * Binding objects have no class-specific methods.
+ *
+ */
+
+void
+Init_Binding()
+{
+ rb_cBinding = rb_define_class("Binding", rb_cObject);
+ rb_undef_alloc_func(rb_cBinding);
+ rb_undef_method(CLASS_OF(rb_cBinding), "new");
+ rb_define_method(rb_cBinding, "clone", proc_clone, 0);
+ rb_define_method(rb_cBinding, "dup", proc_dup, 0);
+ rb_define_method(rb_cBinding, "eval", bind_eval, -1);
+ rb_define_global_function("binding", rb_f_binding, 0);
+}
+
+/* Windows SEH refers data on the stack. */
+#undef SAVE_WIN32_EXCEPTION_LIST
+#if defined _WIN32 || defined __CYGWIN__
+#if defined __CYGWIN__
+typedef unsigned long DWORD;
+#endif
+
+static inline DWORD
+win32_get_exception_list()
+{
+ DWORD p;
+# if defined _MSC_VER
+# ifdef _M_IX86
+# define SAVE_WIN32_EXCEPTION_LIST
+# if _MSC_VER >= 1310
+ /* warning: unsafe assignment to fs:0 ... this is ok */
+# pragma warning(disable: 4733)
+# endif
+ __asm mov eax, fs:[0];
+ __asm mov p, eax;
+# endif
+# elif defined __GNUC__
+# ifdef __i386__
+# define SAVE_WIN32_EXCEPTION_LIST
+ __asm__("movl %%fs:0,%0" : "=r"(p));
+# endif
+# elif defined __BORLANDC__
+# define SAVE_WIN32_EXCEPTION_LIST
+ __emit__(0x64, 0xA1, 0, 0, 0, 0); /* mov eax, fs:[0] */
+ p = _EAX;
+# endif
+ return p;
+}
+
+static inline void
+win32_set_exception_list(p)
+ DWORD p;
+{
+# if defined _MSC_VER
+# ifdef _M_IX86
+ __asm mov eax, p;
+ __asm mov fs:[0], eax;
+# endif
+# elif defined __GNUC__
+# ifdef __i386__
+ __asm__("movl %0,%%fs:0" :: "r"(p));
+# endif
+# elif defined __BORLANDC__
+ _EAX = p;
+ __emit__(0x64, 0xA3, 0, 0, 0, 0); /* mov fs:[0], eax */
+# endif
+}
+
+#if !defined SAVE_WIN32_EXCEPTION_LIST && !defined _WIN32_WCE
+# error unsupported platform
+#endif
+#endif
+
+int rb_thread_pending = 0;
+
+VALUE rb_cThread;
+
+extern VALUE rb_last_status;
+
+#define WAIT_FD (1<<0)
+#define WAIT_SELECT (1<<1)
+#define WAIT_TIME (1<<2)
+#define WAIT_JOIN (1<<3)
+#define WAIT_PID (1<<4)
+
+/* +infty, for this purpose */
+#define DELAY_INFTY 1E30
+
+#if !defined HAVE_PAUSE
+# if defined _WIN32 && !defined __CYGWIN__
+# define pause() Sleep(INFINITE)
+# else
+# define pause() sleep(0x7fffffff)
+# endif
+#endif
+
+#define THREAD_RAISED 0x200 /* temporary flag */
+#define THREAD_TERMINATING 0x400 /* persistent flag */
+#define THREAD_NO_ENSURE 0x800 /* persistent flag */
+#define THREAD_FLAGS_MASK 0xc00 /* mask for persistent flags */
+
+#define FOREACH_THREAD_FROM(f,x) x = f; do { x = x->next;
+#define END_FOREACH_FROM(f,x) } while (x != f)
+
+#define FOREACH_THREAD(x) FOREACH_THREAD_FROM(curr_thread,x)
+#define END_FOREACH(x) END_FOREACH_FROM(curr_thread,x)
+
+struct thread_status_t {
+ NODE *node;
+
+ int tracing;
+ VALUE errinfo;
+ VALUE last_status;
+ VALUE last_line;
+ VALUE last_match;
+
+ int safe;
+
+ enum rb_thread_status status;
+ int wait_for;
+ int fd;
+ fd_set readfds;
+ fd_set writefds;
+ fd_set exceptfds;
+ int select_value;
+ double delay;
+ rb_thread_t join;
+};
+
+#define THREAD_COPY_STATUS(src, dst) (void)( \
+ (dst)->node = (src)->node, \
+ \
+ (dst)->tracing = (src)->tracing, \
+ (dst)->errinfo = (src)->errinfo, \
+ (dst)->last_status = (src)->last_status, \
+ (dst)->last_line = (src)->last_line, \
+ (dst)->last_match = (src)->last_match, \
+ \
+ (dst)->safe = (src)->safe, \
+ \
+ (dst)->status = (src)->status, \
+ (dst)->wait_for = (src)->wait_for, \
+ (dst)->fd = (src)->fd, \
+ (dst)->readfds = (src)->readfds, \
+ (dst)->writefds = (src)->writefds, \
+ (dst)->exceptfds = (src)->exceptfds, \
+ (dst)->select_value = (src)->select_value, \
+ (dst)->delay = (src)->delay, \
+ (dst)->join = (src)->join, \
+ 0)
+
+static int
+thread_set_raised()
+{
+ if (curr_thread->flags & THREAD_RAISED) return 1;
+ curr_thread->flags |= THREAD_RAISED;
+ return 0;
+}
+
+static int
+thread_reset_raised()
+{
+ if (!(curr_thread->flags & THREAD_RAISED)) return 0;
+ curr_thread->flags &= ~THREAD_RAISED;
+ return 1;
+}
+
+static int
+thread_no_ensure()
+{
+ return ((curr_thread->flags & THREAD_NO_ENSURE) == THREAD_NO_ENSURE);
+}
+
+static void rb_thread_ready _((rb_thread_t));
+
+static VALUE run_trap_eval _((VALUE));
+static VALUE
+run_trap_eval(arg)
+ VALUE arg;
+{
+ VALUE *p = (VALUE *)arg;
+ return rb_eval_cmd(p[0], p[1], (int)p[2]);
+}
+
+static VALUE
+rb_trap_eval(cmd, sig, safe)
+ VALUE cmd;
+ int sig, safe;
+{
+ int state;
+ VALUE val = Qnil; /* OK */
+ volatile struct thread_status_t save;
+ VALUE arg[3];
+
+ arg[0] = cmd;
+ arg[1] = rb_ary_new3(1, INT2FIX(sig));
+ arg[2] = (VALUE)safe;
+ THREAD_COPY_STATUS(curr_thread, &save);
+ rb_thread_ready(curr_thread);
+ PUSH_ITER(ITER_NOT);
+ val = rb_protect(run_trap_eval, (VALUE)&arg, &state);
+ POP_ITER();
+ THREAD_COPY_STATUS(&save, curr_thread);
+
+ if (state) {
+ rb_trap_immediate = 0;
+ rb_thread_ready(curr_thread);
+ JUMP_TAG(state);
}
- GET_THREAD()->errinfo = err;
+
+ if (curr_thread->status == THREAD_STOPPED) {
+ rb_thread_schedule();
+ }
+ errno = EINTR;
+
+ return val;
}
-VALUE
-rb_rubylevel_errinfo(void)
+static const char *
+thread_status_name(status)
+ enum rb_thread_status status;
{
- return get_errinfo();
+ switch (status) {
+ case THREAD_RUNNABLE:
+ return "run";
+ case THREAD_STOPPED:
+ return "sleep";
+ case THREAD_TO_KILL:
+ return "aborting";
+ case THREAD_KILLED:
+ return "dead";
+ default:
+ return "unknown";
+ }
+}
+
+/* $SAFE accessor */
+void
+rb_set_safe_level(level)
+ int level;
+{
+ if (level > ruby_safe_level) {
+ if (level > SAFE_LEVEL_MAX) level = SAFE_LEVEL_MAX;
+ ruby_safe_level = level;
+ curr_thread->safe = level;
+ }
}
static VALUE
-errat_getter(ID id)
+safe_getter()
+{
+ return INT2NUM(ruby_safe_level);
+}
+
+static void
+safe_setter(val)
+ VALUE val;
{
- VALUE err = get_errinfo();
- if (!NIL_P(err)) {
- return get_backtrace(err);
+ int level = NUM2INT(val);
+
+ if (level < ruby_safe_level) {
+ rb_raise(rb_eSecurityError, "tried to downgrade safe level from %d to %d",
+ ruby_safe_level, level);
+ }
+ if (level > SAFE_LEVEL_MAX) level = SAFE_LEVEL_MAX;
+ ruby_safe_level = level;
+ curr_thread->safe = level;
+}
+
+/* Return the current time as a floating-point number */
+static double
+timeofday()
+{
+ struct timeval tv;
+ gettimeofday(&tv, NULL);
+ return (double)tv.tv_sec + (double)tv.tv_usec * 1e-6;
+}
+
+#define STACK(addr) (th->stk_pos<(VALUE*)(addr) && (VALUE*)(addr)<th->stk_pos+th->stk_len)
+#define ADJ(addr) (void*)(STACK(addr)?(((VALUE*)(addr)-th->stk_pos)+th->stk_ptr):(VALUE*)(addr))
+static void
+thread_mark(th)
+ rb_thread_t th;
+{
+ struct FRAME *frame;
+ struct BLOCK *block;
+
+ rb_gc_mark(th->result);
+ rb_gc_mark(th->thread);
+ if (th->join) rb_gc_mark(th->join->thread);
+
+ rb_gc_mark(th->klass);
+ rb_gc_mark(th->wrapper);
+ rb_gc_mark((VALUE)th->cref);
+
+ rb_gc_mark((VALUE)th->scope);
+ rb_gc_mark((VALUE)th->dyna_vars);
+ rb_gc_mark(th->errinfo);
+ rb_gc_mark(th->last_status);
+ rb_gc_mark(th->last_line);
+ rb_gc_mark(th->last_match);
+ rb_mark_tbl(th->locals);
+ rb_gc_mark(th->thgroup);
+ rb_gc_mark_maybe(th->sandbox);
+
+ /* mark data in copied stack */
+ if (th == curr_thread) return;
+ if (th->status == THREAD_KILLED) return;
+ if (th->stk_len == 0) return; /* stack not active, no need to mark. */
+ if (th->stk_ptr) {
+ rb_gc_mark_locations(th->stk_ptr, th->stk_ptr+th->stk_len);
+#if defined(THINK_C) || defined(__human68k__)
+ rb_gc_mark_locations(th->stk_ptr+2, th->stk_ptr+th->stk_len+2);
+#endif
+#ifdef __ia64
+ if (th->bstr_ptr) {
+ rb_gc_mark_locations(th->bstr_ptr, th->bstr_ptr+th->bstr_len);
+ }
+#endif
+ }
+ frame = th->frame;
+ while (frame && frame != top_frame) {
+ frame = ADJ(frame);
+ rb_gc_mark_frame(frame);
+ if (frame->tmp) {
+ struct FRAME *tmp = frame->tmp;
+
+ while (tmp && tmp != top_frame) {
+ tmp = ADJ(tmp);
+ rb_gc_mark_frame(tmp);
+ tmp = tmp->prev;
+ }
+ }
+ frame = frame->prev;
+ }
+ block = th->block;
+ while (block) {
+ block = ADJ(block);
+ rb_gc_mark_frame(&block->frame);
+ block = block->prev;
+ }
+}
+
+static int
+mark_loading_thread(key, value, lev)
+ ID key;
+ VALUE value;
+ int lev;
+{
+ rb_gc_mark(((rb_thread_t)value)->thread);
+ return ST_CONTINUE;
+}
+
+void
+rb_gc_mark_threads()
+{
+ rb_thread_t th;
+
+ /* static global mark */
+ rb_gc_mark((VALUE)ruby_cref);
+
+ if (!curr_thread) return;
+ rb_gc_mark(main_thread->thread);
+ rb_gc_mark(curr_thread->thread);
+ FOREACH_THREAD_FROM(main_thread, th) {
+ switch (th->status) {
+ case THREAD_TO_KILL:
+ case THREAD_RUNNABLE:
+ break;
+ case THREAD_STOPPED:
+ if (th->wait_for) break;
+ default:
+ continue;
+ }
+ rb_gc_mark(th->thread);
+ } END_FOREACH_FROM(main_thread, th);
+ if (loading_tbl) st_foreach(loading_tbl, mark_loading_thread, 0);
+}
+
+void
+rb_gc_abort_threads()
+{
+ rb_thread_t th;
+
+ if (!main_thread)
+ return;
+
+ FOREACH_THREAD_FROM(main_thread, th) {
+ if (FL_TEST(th->thread, FL_MARK)) continue;
+ if (th->status == THREAD_STOPPED) {
+ th->status = THREAD_TO_KILL;
+ rb_gc_mark(th->thread);
+ }
+ } END_FOREACH_FROM(main_thread, th);
+}
+
+static void
+thread_free(th)
+ rb_thread_t th;
+{
+ if (th->stk_ptr) free(th->stk_ptr);
+ th->stk_ptr = 0;
+#ifdef __ia64
+ if (th->bstr_ptr) free(th->bstr_ptr);
+ th->bstr_ptr = 0;
+#endif
+ if (th->locals) st_free_table(th->locals);
+ if (th->status != THREAD_KILLED) {
+ if (th->prev) th->prev->next = th->next;
+ if (th->next) th->next->prev = th->prev;
+ }
+ if (th != main_thread) free(th);
+}
+
+static rb_thread_t
+rb_thread_check(data)
+ VALUE data;
+{
+ if (TYPE(data) != T_DATA || RDATA(data)->dmark != (RUBY_DATA_FUNC)thread_mark) {
+ rb_raise(rb_eTypeError, "wrong argument type %s (expected Thread)",
+ rb_obj_classname(data));
+ }
+ return (rb_thread_t)RDATA(data)->data;
+}
+
+static VALUE rb_thread_raise _((int, VALUE*, rb_thread_t));
+
+static VALUE th_raise_exception;
+static NODE *th_raise_node;
+static VALUE th_cmd;
+static int th_sig, th_safe;
+
+#define RESTORE_NORMAL 1
+#define RESTORE_FATAL 2
+#define RESTORE_INTERRUPT 3
+#define RESTORE_TRAP 4
+#define RESTORE_RAISE 5
+#define RESTORE_SIGNAL 6
+#define RESTORE_EXIT 7
+
+extern VALUE *rb_gc_stack_start;
+#ifdef __ia64
+extern VALUE *rb_gc_register_stack_start;
+#endif
+
+static void
+rb_thread_save_context(th)
+ rb_thread_t th;
+{
+ VALUE *pos;
+ int len;
+ static VALUE tval;
+
+ len = ruby_stack_length(&pos);
+ th->stk_len = 0;
+ th->stk_pos = pos;
+ if (len > th->stk_max) {
+ VALUE *ptr = realloc(th->stk_ptr, sizeof(VALUE) * len);
+ if (!ptr) rb_memerror();
+ th->stk_ptr = ptr;
+ th->stk_max = len;
+ }
+ th->stk_len = len;
+ FLUSH_REGISTER_WINDOWS;
+ MEMCPY(th->stk_ptr, th->stk_pos, VALUE, th->stk_len);
+#ifdef __ia64
+ th->bstr_pos = rb_gc_register_stack_start;
+ len = (VALUE*)rb_ia64_bsp() - th->bstr_pos;
+ th->bstr_len = 0;
+ if (len > th->bstr_max) {
+ VALUE *ptr = realloc(th->bstr_ptr, sizeof(VALUE) * len);
+ if (!ptr) rb_memerror();
+ th->bstr_ptr = ptr;
+ th->bstr_max = len;
+ }
+ th->bstr_len = len;
+ rb_ia64_flushrs();
+ MEMCPY(th->bstr_ptr, th->bstr_pos, VALUE, th->bstr_len);
+#endif
+#ifdef SAVE_WIN32_EXCEPTION_LIST
+ th->win32_exception_list = win32_get_exception_list();
+#endif
+
+ th->frame = ruby_frame;
+ th->scope = ruby_scope;
+ ruby_scope->flags |= SCOPE_DONT_RECYCLE;
+ th->klass = ruby_class;
+ th->wrapper = ruby_wrapper;
+ th->cref = ruby_cref;
+ th->dyna_vars = ruby_dyna_vars;
+ th->block = ruby_block;
+ th->flags &= THREAD_FLAGS_MASK;
+ th->flags |= (rb_trap_immediate<<8) | scope_vmode;
+ th->iter = ruby_iter;
+ th->tag = prot_tag;
+ th->tracing = tracing;
+ th->errinfo = ruby_errinfo;
+ th->last_status = rb_last_status;
+ tval = rb_lastline_get();
+ rb_lastline_set(th->last_line);
+ th->last_line = tval;
+ tval = rb_backref_get();
+ rb_backref_set(th->last_match);
+ th->last_match = tval;
+ th->safe = ruby_safe_level;
+
+ th->node = ruby_current_node;
+ if (ruby_sandbox_save != NULL)
+ {
+ ruby_sandbox_save(th);
+ }
+}
+
+static int
+rb_thread_switch(n)
+ int n;
+{
+ rb_trap_immediate = (curr_thread->flags&0x100)?1:0;
+ switch (n) {
+ case 0:
+ return 0;
+ case RESTORE_FATAL:
+ JUMP_TAG(TAG_FATAL);
+ break;
+ case RESTORE_INTERRUPT:
+ rb_interrupt();
+ break;
+ case RESTORE_TRAP:
+ rb_trap_eval(th_cmd, th_sig, th_safe);
+ break;
+ case RESTORE_RAISE:
+ ruby_frame->last_func = 0;
+ ruby_current_node = th_raise_node;
+ rb_raise_jump(th_raise_exception);
+ break;
+ case RESTORE_SIGNAL:
+ rb_thread_signal_raise(th_sig);
+ break;
+ case RESTORE_EXIT:
+ ruby_errinfo = th_raise_exception;
+ ruby_current_node = th_raise_node;
+ if (!rb_obj_is_kind_of(ruby_errinfo, rb_eSystemExit)) {
+ terminate_process(EXIT_FAILURE, ruby_errinfo);
+ }
+ rb_exc_raise(th_raise_exception);
+ break;
+ case RESTORE_NORMAL:
+ default:
+ break;
+ }
+ return 1;
+}
+
+#define THREAD_SAVE_CONTEXT(th) \
+ (rb_thread_switch(ruby_setjmp(rb_thread_save_context(th), (th)->context)))
+
+NORETURN(static void rb_thread_restore_context _((rb_thread_t,int)));
+NORETURN(NOINLINE(static void rb_thread_restore_context_0(rb_thread_t,int,void*)));
+NORETURN(NOINLINE(static void stack_extend(rb_thread_t, int, VALUE *)));
+
+static void
+rb_thread_restore_context_0(rb_thread_t th, int exit, void *vp)
+{
+ static rb_thread_t tmp;
+ static int ex;
+ static VALUE tval;
+
+ rb_trap_immediate = 0; /* inhibit interrupts from here */
+ if (ruby_sandbox_restore != NULL)
+ {
+ ruby_sandbox_restore(th);
+ }
+ ruby_frame = th->frame;
+ ruby_scope = th->scope;
+ ruby_class = th->klass;
+ ruby_wrapper = th->wrapper;
+ ruby_cref = th->cref;
+ ruby_dyna_vars = th->dyna_vars;
+ ruby_block = th->block;
+ scope_vmode = th->flags&SCOPE_MASK;
+ ruby_iter = th->iter;
+ prot_tag = th->tag;
+ tracing = th->tracing;
+ ruby_errinfo = th->errinfo;
+ rb_last_status = th->last_status;
+ ruby_safe_level = th->safe;
+
+ ruby_current_node = th->node;
+
+#ifdef SAVE_WIN32_EXCEPTION_LIST
+ win32_set_exception_list(th->win32_exception_list);
+#endif
+ tmp = th;
+ ex = exit;
+ FLUSH_REGISTER_WINDOWS;
+ MEMCPY(tmp->stk_pos, tmp->stk_ptr, VALUE, tmp->stk_len);
+#ifdef __ia64
+ MEMCPY(tmp->bstr_pos, tmp->bstr_ptr, VALUE, tmp->bstr_len);
+#endif
+
+ tval = rb_lastline_get();
+ rb_lastline_set(tmp->last_line);
+ tmp->last_line = tval;
+ tval = rb_backref_get();
+ rb_backref_set(tmp->last_match);
+ tmp->last_match = tval;
+
+ ruby_longjmp(tmp->context, ex);
+}
+
+#ifdef __ia64
+#define C(a) rse_##a##0, rse_##a##1, rse_##a##2, rse_##a##3, rse_##a##4
+#define E(a) rse_##a##0= rse_##a##1= rse_##a##2= rse_##a##3= rse_##a##4
+static volatile int C(a), C(b), C(c), C(d), C(e);
+static volatile int C(f), C(g), C(h), C(i), C(j);
+static volatile int C(k), C(l), C(m), C(n), C(o);
+static volatile int C(p), C(q), C(r), C(s), C(t);
+int rb_dummy_false = 0;
+NORETURN(NOINLINE(static void register_stack_extend(rb_thread_t, int, void *, VALUE *)));
+static void
+register_stack_extend(rb_thread_t th, int exit, void *vp, VALUE *curr_bsp)
+{
+ if (rb_dummy_false) {
+ /* use registers as much as possible */
+ E(a) = E(b) = E(c) = E(d) = E(e) =
+ E(f) = E(g) = E(h) = E(i) = E(j) =
+ E(k) = E(l) = E(m) = E(n) = E(o) =
+ E(p) = E(q) = E(r) = E(s) = E(t) = 0;
+ E(a) = E(b) = E(c) = E(d) = E(e) =
+ E(f) = E(g) = E(h) = E(i) = E(j) =
+ E(k) = E(l) = E(m) = E(n) = E(o) =
+ E(p) = E(q) = E(r) = E(s) = E(t) = 0;
+ }
+ if (curr_bsp < th->bstr_pos+th->bstr_len) {
+ register_stack_extend(th, exit, &exit, (VALUE*)rb_ia64_bsp());
+ }
+ rb_thread_restore_context_0(th, exit, &exit);
+}
+#undef C
+#undef E
+#endif
+
+# if defined(_MSC_VER) && _MSC_VER >= 1300
+__declspec(noinline) static void stack_extend(rb_thread_t, int, VALUE*);
+# endif
+static void
+stack_extend(rb_thread_t th, int exit, VALUE *addr_in_prev_frame)
+{
+#define STACK_PAD_SIZE 1024
+ VALUE space[STACK_PAD_SIZE];
+
+#if STACK_GROW_DIRECTION < 0
+ if (addr_in_prev_frame > th->stk_pos) stack_extend(th, exit, &space[0]);
+#elif STACK_GROW_DIRECTION > 0
+ if (addr_in_prev_frame < th->stk_pos + th->stk_len) stack_extend(th, exit, &space[STACK_PAD_SIZE-1]);
+#else
+ if (addr_in_prev_frame < rb_gc_stack_start) {
+ /* Stack grows downward */
+ if (addr_in_prev_frame > th->stk_pos) stack_extend(th, exit, &space[0]);
}
else {
+ /* Stack grows upward */
+ if (addr_in_prev_frame < th->stk_pos + th->stk_len) stack_extend(th, exit, &space[STACK_PAD_SIZE-1]);
+ }
+#endif
+#ifdef __ia64
+ register_stack_extend(th, exit, space, (VALUE*)rb_ia64_bsp());
+#else
+ rb_thread_restore_context_0(th, exit, space);
+#endif
+}
+
+static void
+rb_thread_restore_context(th, exit)
+ rb_thread_t th;
+ int exit;
+{
+ VALUE v;
+ if (!th->stk_ptr) rb_bug("unsaved context");
+ stack_extend(th, exit, &v);
+}
+
+static void
+rb_thread_ready(th)
+ rb_thread_t th;
+{
+ th->wait_for = 0;
+ if (th->status != THREAD_TO_KILL) {
+ th->status = THREAD_RUNNABLE;
+ }
+}
+
+static void
+rb_thread_die(th)
+ rb_thread_t th;
+{
+ th->thgroup = 0;
+ th->status = THREAD_KILLED;
+ if (th->stk_ptr) free(th->stk_ptr);
+ th->stk_ptr = 0;
+}
+
+static void
+rb_thread_remove(th)
+ rb_thread_t th;
+{
+ if (th->status == THREAD_KILLED) return;
+
+ rb_thread_ready(th);
+ rb_thread_die(th);
+ th->prev->next = th->next;
+ th->next->prev = th->prev;
+}
+
+static int
+rb_thread_dead(th)
+ rb_thread_t th;
+{
+ return th->status == THREAD_KILLED;
+}
+
+void
+rb_thread_fd_close(fd)
+ int fd;
+{
+ rb_thread_t th;
+
+ FOREACH_THREAD(th) {
+ if (((th->wait_for & WAIT_FD) && fd == th->fd) ||
+ ((th->wait_for & WAIT_SELECT) && (fd < th->fd) &&
+ (FD_ISSET(fd, &th->readfds) ||
+ FD_ISSET(fd, &th->writefds) ||
+ FD_ISSET(fd, &th->exceptfds)))) {
+ VALUE exc = rb_exc_new2(rb_eIOError, "stream closed");
+ rb_thread_raise(1, &exc, th);
+ }
+ }
+ END_FOREACH(th);
+}
+
+NORETURN(static void rb_thread_main_jump _((VALUE, int)));
+static void
+rb_thread_main_jump(err, tag)
+ VALUE err;
+ int tag;
+{
+ curr_thread = main_thread;
+ th_raise_exception = err;
+ th_raise_node = ruby_current_node;
+ rb_thread_restore_context(main_thread, tag);
+}
+
+NORETURN(static void rb_thread_deadlock _((void)));
+static void
+rb_thread_deadlock()
+{
+ char msg[21+SIZEOF_LONG*2];
+ VALUE e;
+
+ sprintf(msg, "Thread(0x%lx): deadlock", curr_thread->thread);
+ e = rb_exc_new2(rb_eFatal, msg);
+ if (curr_thread == main_thread) {
+ rb_exc_raise(e);
+ }
+ rb_thread_main_jump(e, RESTORE_RAISE);
+}
+
+static void
+copy_fds(dst, src, max)
+ fd_set *dst, *src;
+ int max;
+{
+ int n = 0;
+ int i;
+
+ for (i=0; i<=max; i++) {
+ if (FD_ISSET(i, src)) {
+ n = i;
+ FD_SET(i, dst);
+ }
+ }
+}
+
+static int
+match_fds(dst, src, max)
+ fd_set *dst, *src;
+ int max;
+{
+ int i;
+
+ for (i=0; i<=max; i++) {
+ if (FD_ISSET(i, src) && FD_ISSET(i, dst)) {
+ return Qtrue;
+ }
+ }
+ return Qfalse;
+}
+
+static int
+intersect_fds(src, dst, max)
+ fd_set *src, *dst;
+ int max;
+{
+ int i, n = 0;
+
+ for (i=0; i<=max; i++) {
+ if (FD_ISSET(i, dst)) {
+ if (FD_ISSET(i, src)) {
+ /* Wake up only one thread per fd. */
+ FD_CLR(i, src);
+ n++;
+ }
+ else {
+ FD_CLR(i, dst);
+ }
+ }
+ }
+ return n;
+}
+
+static int
+find_bad_fds(dst, src, max)
+ fd_set *dst, *src;
+ int max;
+{
+ int i, test = Qfalse;
+
+ for (i=0; i<=max; i++) {
+ if (FD_ISSET(i, src) && !FD_ISSET(i, dst)) {
+ FD_CLR(i, src);
+ test = Qtrue;
+ }
+ }
+ return test;
+}
+
+void
+rb_thread_schedule()
+{
+ rb_thread_t next; /* OK */
+ rb_thread_t th;
+ rb_thread_t curr;
+ int found = 0;
+
+ fd_set readfds;
+ fd_set writefds;
+ fd_set exceptfds;
+ struct timeval delay_tv, *delay_ptr;
+ double delay, now; /* OK */
+ int n, max;
+ int need_select = 0;
+ int select_timeout = 0;
+
+#ifdef HAVE_NATIVETHREAD
+ if (!is_ruby_native_thread()) {
+ rb_bug("cross-thread violation on rb_thread_schedule()");
+ }
+#endif
+ rb_thread_pending = 0;
+ if (curr_thread == curr_thread->next
+ && curr_thread->status == THREAD_RUNNABLE)
+ return;
+
+ next = 0;
+ curr = curr_thread; /* starting thread */
+
+ while (curr->status == THREAD_KILLED) {
+ curr = curr->prev;
+ }
+
+ again:
+ max = -1;
+ FD_ZERO(&readfds);
+ FD_ZERO(&writefds);
+ FD_ZERO(&exceptfds);
+ delay = DELAY_INFTY;
+ now = -1.0;
+
+ FOREACH_THREAD_FROM(curr, th) {
+ if (!found && th->status <= THREAD_RUNNABLE) {
+ found = 1;
+ }
+ if (th->status != THREAD_STOPPED) continue;
+ if (th->wait_for & WAIT_JOIN) {
+ if (rb_thread_dead(th->join)) {
+ th->status = THREAD_RUNNABLE;
+ found = 1;
+ }
+ }
+ if (th->wait_for & WAIT_FD) {
+ FD_SET(th->fd, &readfds);
+ if (max < th->fd) max = th->fd;
+ need_select = 1;
+ }
+ if (th->wait_for & WAIT_SELECT) {
+ copy_fds(&readfds, &th->readfds, th->fd);
+ copy_fds(&writefds, &th->writefds, th->fd);
+ copy_fds(&exceptfds, &th->exceptfds, th->fd);
+ if (max < th->fd) max = th->fd;
+ need_select = 1;
+ if (th->wait_for & WAIT_TIME) {
+ select_timeout = 1;
+ }
+ th->select_value = 0;
+ }
+ if (th->wait_for & WAIT_TIME) {
+ double th_delay;
+
+ if (now < 0.0) now = timeofday();
+ th_delay = th->delay - now;
+ if (th_delay <= 0.0) {
+ th->status = THREAD_RUNNABLE;
+ found = 1;
+ }
+ else if (th_delay < delay) {
+ delay = th_delay;
+ need_select = 1;
+ }
+ else if (th->delay == DELAY_INFTY) {
+ need_select = 1;
+ }
+ }
+ }
+ END_FOREACH_FROM(curr, th);
+
+ /* Do the select if needed */
+ if (need_select) {
+ /* Convert delay to a timeval */
+ /* If a thread is runnable, just poll */
+ if (found) {
+ delay_tv.tv_sec = 0;
+ delay_tv.tv_usec = 0;
+ delay_ptr = &delay_tv;
+ }
+ else if (delay == DELAY_INFTY) {
+ delay_ptr = 0;
+ }
+ else {
+ delay_tv.tv_sec = delay;
+ delay_tv.tv_usec = (delay - (double)delay_tv.tv_sec)*1e6;
+ delay_ptr = &delay_tv;
+ }
+
+ n = select(max+1, &readfds, &writefds, &exceptfds, delay_ptr);
+ if (n < 0) {
+ int e = errno;
+
+ if (rb_trap_pending) rb_trap_exec();
+ if (e == EINTR) goto again;
+#ifdef ERESTART
+ if (e == ERESTART) goto again;
+#endif
+ FOREACH_THREAD_FROM(curr, th) {
+ if (th->wait_for & WAIT_SELECT) {
+ int v = 0;
+
+ v |= find_bad_fds(&readfds, &th->readfds, th->fd);
+ v |= find_bad_fds(&writefds, &th->writefds, th->fd);
+ v |= find_bad_fds(&exceptfds, &th->exceptfds, th->fd);
+ if (v) {
+ th->select_value = n;
+ n = max;
+ }
+ }
+ }
+ END_FOREACH_FROM(curr, th);
+ }
+ if (select_timeout && n == 0) {
+ if (now < 0.0) now = timeofday();
+ FOREACH_THREAD_FROM(curr, th) {
+ if (((th->wait_for&(WAIT_SELECT|WAIT_TIME)) == (WAIT_SELECT|WAIT_TIME)) &&
+ th->delay <= now) {
+ th->status = THREAD_RUNNABLE;
+ th->wait_for = 0;
+ th->select_value = 0;
+ found = 1;
+ intersect_fds(&readfds, &th->readfds, max);
+ intersect_fds(&writefds, &th->writefds, max);
+ intersect_fds(&exceptfds, &th->exceptfds, max);
+ }
+ }
+ END_FOREACH_FROM(curr, th);
+ }
+ if (n > 0) {
+ now = -1.0;
+ /* Some descriptors are ready.
+ Make the corresponding threads runnable. */
+ FOREACH_THREAD_FROM(curr, th) {
+ if ((th->wait_for&WAIT_FD) && FD_ISSET(th->fd, &readfds)) {
+ /* Wake up only one thread per fd. */
+ FD_CLR(th->fd, &readfds);
+ th->status = THREAD_RUNNABLE;
+ th->fd = 0;
+ th->wait_for = 0;
+ found = 1;
+ }
+ if ((th->wait_for&WAIT_SELECT) &&
+ (match_fds(&readfds, &th->readfds, max) ||
+ match_fds(&writefds, &th->writefds, max) ||
+ match_fds(&exceptfds, &th->exceptfds, max))) {
+ /* Wake up only one thread per fd. */
+ th->status = THREAD_RUNNABLE;
+ th->wait_for = 0;
+ n = intersect_fds(&readfds, &th->readfds, max) +
+ intersect_fds(&writefds, &th->writefds, max) +
+ intersect_fds(&exceptfds, &th->exceptfds, max);
+ th->select_value = n;
+ found = 1;
+ }
+ }
+ END_FOREACH_FROM(curr, th);
+ }
+ /* The delays for some of the threads should have expired.
+ Go through the loop once more, to check the delays. */
+ if (!found && delay != DELAY_INFTY)
+ goto again;
+ }
+
+ FOREACH_THREAD_FROM(curr, th) {
+ if (th->status == THREAD_TO_KILL) {
+ next = th;
+ break;
+ }
+ if (th->status == THREAD_RUNNABLE && th->stk_ptr) {
+ if (!next || next->priority < th->priority)
+ next = th;
+ }
+ }
+ END_FOREACH_FROM(curr, th);
+
+ if (!next) {
+ /* raise fatal error to main thread */
+ curr_thread->node = ruby_current_node;
+ if (curr->next == curr) {
+ TRAP_BEG;
+ pause();
+ TRAP_END;
+ }
+ FOREACH_THREAD_FROM(curr, th) {
+ warn_printf("deadlock 0x%lx: %s:",
+ th->thread, thread_status_name(th->status));
+ if (th->wait_for & WAIT_FD) warn_printf("F(%d)", th->fd);
+ if (th->wait_for & WAIT_SELECT) warn_printf("S");
+ if (th->wait_for & WAIT_TIME) warn_printf("T(%f)", th->delay);
+ if (th->wait_for & WAIT_JOIN)
+ warn_printf("J(0x%lx)", th->join ? th->join->thread : 0);
+ if (th->wait_for & WAIT_PID) warn_printf("P");
+ if (!th->wait_for) warn_printf("-");
+ warn_printf(" %s - %s:%d\n",
+ th==main_thread ? "(main)" : "",
+ th->node->nd_file, nd_line(th->node));
+ }
+ END_FOREACH_FROM(curr, th);
+ next = main_thread;
+ rb_thread_ready(next);
+ next->status = THREAD_TO_KILL;
+ if (!rb_thread_dead(curr_thread)) {
+ rb_thread_save_context(curr_thread);
+ }
+ rb_thread_deadlock();
+ }
+ next->wait_for = 0;
+ if (next->status == THREAD_RUNNABLE && next == curr_thread) {
+ return;
+ }
+
+ /* context switch */
+ if (curr == curr_thread) {
+ if (THREAD_SAVE_CONTEXT(curr)) {
+ return;
+ }
+ }
+
+ curr_thread = next;
+ if (next->status == THREAD_TO_KILL) {
+ if (!(next->flags & THREAD_TERMINATING)) {
+ next->flags |= THREAD_TERMINATING;
+ /* terminate; execute ensure-clause if any */
+ rb_thread_restore_context(next, RESTORE_FATAL);
+ }
+ }
+ rb_thread_restore_context(next, RESTORE_NORMAL);
+}
+
+void
+rb_thread_wait_fd(fd)
+ int fd;
+{
+ if (rb_thread_critical) return;
+ if (ruby_in_compile) return;
+ if (curr_thread == curr_thread->next) return;
+ if (curr_thread->status == THREAD_TO_KILL) return;
+
+ curr_thread->status = THREAD_STOPPED;
+ curr_thread->fd = fd;
+ curr_thread->wait_for = WAIT_FD;
+ rb_thread_schedule();
+}
+
+int
+rb_thread_fd_writable(fd)
+ int fd;
+{
+ if (rb_thread_critical) return Qtrue;
+ if (curr_thread == curr_thread->next) return Qtrue;
+ if (curr_thread->status == THREAD_TO_KILL) return Qtrue;
+ if (curr_thread->status == THREAD_KILLED) return Qtrue;
+
+ curr_thread->status = THREAD_STOPPED;
+ FD_ZERO(&curr_thread->readfds);
+ FD_ZERO(&curr_thread->writefds);
+ FD_SET(fd, &curr_thread->writefds);
+ FD_ZERO(&curr_thread->exceptfds);
+ curr_thread->fd = fd+1;
+ curr_thread->wait_for = WAIT_SELECT;
+ rb_thread_schedule();
+ return Qfalse;
+}
+
+void
+rb_thread_wait_for(time)
+ struct timeval time;
+{
+ double date;
+
+ if (rb_thread_critical ||
+ curr_thread == curr_thread->next ||
+ curr_thread->status == THREAD_TO_KILL) {
+ int n;
+ int thr_critical = rb_thread_critical;
+#ifndef linux
+ double d, limit;
+ limit = timeofday()+(double)time.tv_sec+(double)time.tv_usec*1e-6;
+#endif
+ for (;;) {
+ rb_thread_critical = Qtrue;
+ TRAP_BEG;
+ n = select(0, 0, 0, 0, &time);
+ rb_thread_critical = thr_critical;
+ TRAP_END;
+ if (n == 0) return;
+ if (n < 0) {
+ switch (errno) {
+ case EINTR:
+#ifdef ERESTART
+ case ERESTART:
+#endif
+ break;
+ default:
+ rb_sys_fail("sleep");
+ }
+ }
+#ifndef linux
+ d = limit - timeofday();
+
+ time.tv_sec = (int)d;
+ time.tv_usec = (int)((d - (int)d)*1e6);
+ if (time.tv_usec < 0) {
+ time.tv_usec += (long)1e6;
+ time.tv_sec -= 1;
+ }
+ if (time.tv_sec < 0) return;
+#endif
+ }
+ }
+
+ date = timeofday() + (double)time.tv_sec + (double)time.tv_usec*1e-6;
+ curr_thread->status = THREAD_STOPPED;
+ curr_thread->delay = date;
+ curr_thread->wait_for = WAIT_TIME;
+ rb_thread_schedule();
+}
+
+void rb_thread_sleep_forever _((void));
+
+int
+rb_thread_alone()
+{
+ return curr_thread == curr_thread->next;
+}
+
+int
+rb_thread_select(max, read, write, except, timeout)
+ int max;
+ fd_set *read, *write, *except;
+ struct timeval *timeout;
+{
+#ifndef linux
+ double limit;
+#endif
+ int n;
+
+ if (!read && !write && !except) {
+ if (!timeout) {
+ rb_thread_sleep_forever();
+ return 0;
+ }
+ rb_thread_wait_for(*timeout);
+ return 0;
+ }
+
+#ifndef linux
+ if (timeout) {
+ limit = timeofday()+
+ (double)timeout->tv_sec+(double)timeout->tv_usec*1e-6;
+ }
+#endif
+
+ if (rb_thread_critical ||
+ curr_thread == curr_thread->next ||
+ curr_thread->status == THREAD_TO_KILL) {
+#ifndef linux
+ struct timeval tv, *tvp = timeout;
+
+ if (timeout) {
+ tv = *timeout;
+ tvp = &tv;
+ }
+#else
+ struct timeval *const tvp = timeout;
+#endif
+ for (;;) {
+ TRAP_BEG;
+ n = select(max, read, write, except, tvp);
+ TRAP_END;
+ if (n < 0) {
+ switch (errno) {
+ case EINTR:
+#ifdef ERESTART
+ case ERESTART:
+#endif
+#ifndef linux
+ if (timeout) {
+ double d = limit - timeofday();
+
+ tv.tv_sec = (unsigned int)d;
+ tv.tv_usec = (long)((d-(double)tv.tv_sec)*1e6);
+ if (tv.tv_sec < 0) tv.tv_sec = 0;
+ if (tv.tv_usec < 0) tv.tv_usec = 0;
+ }
+#endif
+ continue;
+ default:
+ break;
+ }
+ }
+ return n;
+ }
+ }
+
+ curr_thread->status = THREAD_STOPPED;
+ if (read) curr_thread->readfds = *read;
+ else FD_ZERO(&curr_thread->readfds);
+ if (write) curr_thread->writefds = *write;
+ else FD_ZERO(&curr_thread->writefds);
+ if (except) curr_thread->exceptfds = *except;
+ else FD_ZERO(&curr_thread->exceptfds);
+ curr_thread->fd = max;
+ curr_thread->wait_for = WAIT_SELECT;
+ if (timeout) {
+ curr_thread->delay = timeofday() +
+ (double)timeout->tv_sec + (double)timeout->tv_usec*1e-6;
+ curr_thread->wait_for |= WAIT_TIME;
+ }
+ rb_thread_schedule();
+ if (read) *read = curr_thread->readfds;
+ if (write) *write = curr_thread->writefds;
+ if (except) *except = curr_thread->exceptfds;
+ return curr_thread->select_value;
+}
+
+static int rb_thread_join _((rb_thread_t, double));
+
+static int
+rb_thread_join(th, limit)
+ rb_thread_t th;
+ double limit;
+{
+ enum rb_thread_status last_status = THREAD_RUNNABLE;
+
+ if (rb_thread_critical) rb_thread_deadlock();
+ if (!rb_thread_dead(th)) {
+ if (th == curr_thread)
+ rb_raise(rb_eThreadError, "thread 0x%lx tried to join itself",
+ th->thread);
+ if ((th->wait_for & WAIT_JOIN) && th->join == curr_thread)
+ rb_raise(rb_eThreadError, "Thread#join: deadlock 0x%lx - mutual join(0x%lx)",
+ curr_thread->thread, th->thread);
+ if (curr_thread->status == THREAD_TO_KILL)
+ last_status = THREAD_TO_KILL;
+ if (limit == 0) return Qfalse;
+ curr_thread->status = THREAD_STOPPED;
+ curr_thread->join = th;
+ curr_thread->wait_for = WAIT_JOIN;
+ curr_thread->delay = timeofday() + limit;
+ if (limit < DELAY_INFTY) curr_thread->wait_for |= WAIT_TIME;
+ rb_thread_schedule();
+ curr_thread->status = last_status;
+ if (!rb_thread_dead(th)) return Qfalse;
+ }
+
+ if (!NIL_P(th->errinfo) && (th->flags & THREAD_RAISED)) {
+ VALUE oldbt = get_backtrace(th->errinfo);
+ VALUE errat = make_backtrace();
+ VALUE errinfo = rb_obj_dup(th->errinfo);
+
+ if (TYPE(oldbt) == T_ARRAY && RARRAY(oldbt)->len > 0) {
+ rb_ary_unshift(errat, rb_ary_entry(oldbt, 0));
+ }
+ set_backtrace(errinfo, errat);
+ rb_exc_raise(errinfo);
+ }
+
+ return Qtrue;
+}
+
+
+/*
+ * call-seq:
+ * thr.join => thr
+ * thr.join(limit) => thr
+ *
+ * The calling thread will suspend execution and run <i>thr</i>. Does not
+ * return until <i>thr</i> exits or until <i>limit</i> seconds have passed. If
+ * the time limit expires, <code>nil</code> will be returned, otherwise
+ * <i>thr</i> is returned.
+ *
+ * Any threads not joined will be killed when the main program exits. If
+ * <i>thr</i> had previously raised an exception and the
+ * <code>abort_on_exception</code> and <code>$DEBUG</code> flags are not set
+ * (so the exception has not yet been processed) it will be processed at this
+ * time.
+ *
+ * a = Thread.new { print "a"; sleep(10); print "b"; print "c" }
+ * x = Thread.new { print "x"; Thread.pass; print "y"; print "z" }
+ * x.join # Let x thread finish, a will be killed on exit.
+ *
+ * <em>produces:</em>
+ *
+ * axyz
+ *
+ * The following example illustrates the <i>limit</i> parameter.
+ *
+ * y = Thread.new { 4.times { sleep 0.1; puts 'tick... ' }}
+ * puts "Waiting" until y.join(0.15)
+ *
+ * <em>produces:</em>
+ *
+ * tick...
+ * Waiting
+ * tick...
+ * Waitingtick...
+ *
+ *
+ * tick...
+ */
+
+static VALUE
+rb_thread_join_m(argc, argv, thread)
+ int argc;
+ VALUE *argv;
+ VALUE thread;
+{
+ VALUE limit;
+ double delay = DELAY_INFTY;
+ rb_thread_t th = rb_thread_check(thread);
+
+ rb_scan_args(argc, argv, "01", &limit);
+ if (!NIL_P(limit)) delay = rb_num2dbl(limit);
+ if (!rb_thread_join(th, delay))
return Qnil;
+ return thread;
+}
+
+
+/*
+ * call-seq:
+ * Thread.current => thread
+ *
+ * Returns the currently executing thread.
+ *
+ * Thread.current #=> #<Thread:0x401bdf4c run>
+ */
+
+VALUE
+rb_thread_current()
+{
+ return curr_thread->thread;
+}
+
+
+/*
+ * call-seq:
+ * Thread.main => thread
+ *
+ * Returns the main thread for the process.
+ *
+ * Thread.main #=> #<Thread:0x401bdf4c run>
+ */
+
+VALUE
+rb_thread_main()
+{
+ return main_thread->thread;
+}
+
+
+/*
+ * call-seq:
+ * Thread.list => array
+ *
+ * Returns an array of <code>Thread</code> objects for all threads that are
+ * either runnable or stopped.
+ *
+ * Thread.new { sleep(200) }
+ * Thread.new { 1000000.times {|i| i*i } }
+ * Thread.new { Thread.stop }
+ * Thread.list.each {|t| p t}
+ *
+ * <em>produces:</em>
+ *
+ * #<Thread:0x401b3e84 sleep>
+ * #<Thread:0x401b3f38 run>
+ * #<Thread:0x401b3fb0 sleep>
+ * #<Thread:0x401bdf4c run>
+ */
+
+VALUE
+rb_thread_list()
+{
+ rb_thread_t th;
+ VALUE ary = rb_ary_new();
+
+ FOREACH_THREAD(th) {
+ switch (th->status) {
+ case THREAD_RUNNABLE:
+ case THREAD_STOPPED:
+ case THREAD_TO_KILL:
+ rb_ary_push(ary, th->thread);
+ default:
+ break;
+ }
}
+ END_FOREACH(th);
+
+ return ary;
+}
+
+
+/*
+ * call-seq:
+ * thr.wakeup => thr
+ *
+ * Marks <i>thr</i> as eligible for scheduling (it may still remain blocked on
+ * I/O, however). Does not invoke the scheduler (see <code>Thread#run</code>).
+ *
+ * c = Thread.new { Thread.stop; puts "hey!" }
+ * c.wakeup
+ *
+ * <em>produces:</em>
+ *
+ * hey!
+ */
+
+VALUE
+rb_thread_wakeup(thread)
+ VALUE thread;
+{
+ if (!RTEST(rb_thread_wakeup_alive(thread)))
+ rb_raise(rb_eThreadError, "killed thread");
+ return thread;
+}
+
+VALUE
+rb_thread_wakeup_alive(thread)
+ VALUE thread;
+{
+ rb_thread_t th = rb_thread_check(thread);
+
+ if (th->status == THREAD_KILLED)
+ return Qnil;
+ rb_thread_ready(th);
+
+ return thread;
+}
+
+
+/*
+ * call-seq:
+ * thr.run => thr
+ *
+ * Wakes up <i>thr</i>, making it eligible for scheduling. If not in a critical
+ * section, then invokes the scheduler.
+ *
+ * a = Thread.new { puts "a"; Thread.stop; puts "c" }
+ * Thread.pass
+ * puts "Got here"
+ * a.run
+ * a.join
+ *
+ * <em>produces:</em>
+ *
+ * a
+ * Got here
+ * c
+ */
+
+VALUE
+rb_thread_run(thread)
+ VALUE thread;
+{
+ rb_thread_wakeup(thread);
+ if (!rb_thread_critical) rb_thread_schedule();
+
+ return thread;
}
+
static void
-errat_setter(VALUE val, ID id, VALUE *var)
+rb_kill_thread(th, flags)
+ rb_thread_t th;
+ int flags;
{
- VALUE err = get_errinfo();
- if (NIL_P(err)) {
- rb_raise(rb_eArgError, "$! not set");
+ if (th != curr_thread && th->safe < 4) {
+ rb_secure(4);
}
- set_backtrace(err, val);
+ if (th->status == THREAD_TO_KILL || th->status == THREAD_KILLED)
+ return;
+ if (th == th->next || th == main_thread) rb_exit(EXIT_SUCCESS);
+
+ rb_thread_ready(th);
+ th->flags |= flags;
+ th->status = THREAD_TO_KILL;
+ if (!rb_thread_critical) rb_thread_schedule();
}
+
/*
* call-seq:
- * __method__ => symbol
- * __callee__ => symbol
+ * thr.exit => thr
+ * thr.kill => thr
+ * thr.terminate => thr
+ *
+ * Terminates <i>thr</i> and schedules another thread to be run, returning
+ * the terminated <code>Thread</code>. If this is the main thread, or the
+ * last thread, exits the process.
+ */
+
+VALUE
+rb_thread_kill(thread)
+ VALUE thread;
+{
+ rb_thread_t th = rb_thread_check(thread);
+
+ rb_kill_thread(th, 0);
+ return thread;
+}
+
+
+/*
+ * call-seq:
+ * thr.exit! => thr
+ * thr.kill! => thr
+ * thr.terminate! => thr
+ *
+ * Terminates <i>thr</i> without calling ensure clauses and schedules
+ * another thread to be run, returning the terminated <code>Thread</code>.
+ * If this is the main thread, or the last thread, exits the process.
*
- * Returns the name of the current method as a Symbol.
- * If called outside of a method, it returns <code>nil</code>.
+ * See <code>Thread#exit</code> for the safer version.
+ */
+
+static VALUE
+rb_thread_kill_bang(thread)
+ VALUE thread;
+{
+ rb_thread_t th = rb_thread_check(thread);
+ rb_kill_thread(th, THREAD_NO_ENSURE);
+ return thread;
+}
+
+/*
+ * call-seq:
+ * Thread.kill(thread) => thread
+ *
+ * Causes the given <em>thread</em> to exit (see <code>Thread::exit</code>).
+ *
+ * count = 0
+ * a = Thread.new { loop { count += 1 } }
+ * sleep(0.1) #=> 0
+ * Thread.kill(a) #=> #<Thread:0x401b3d30 dead>
+ * count #=> 93947
+ * a.alive? #=> false
+ */
+
+static VALUE
+rb_thread_s_kill(obj, th)
+ VALUE obj, th;
+{
+ return rb_thread_kill(th);
+}
+
+
+/*
+ * call-seq:
+ * Thread.exit => thread
+ *
+ * Terminates the currently running thread and schedules another thread to be
+ * run. If this thread is already marked to be killed, <code>exit</code>
+ * returns the <code>Thread</code>. If this is the main thread, or the last
+ * thread, exit the process.
+ */
+
+static VALUE
+rb_thread_exit()
+{
+ return rb_thread_kill(curr_thread->thread);
+}
+
+
+/*
+ * call-seq:
+ * Thread.pass => nil
+ *
+ * Invokes the thread scheduler to pass execution to another thread.
+ *
+ * a = Thread.new { print "a"; Thread.pass;
+ * print "b"; Thread.pass;
+ * print "c" }
+ * b = Thread.new { print "x"; Thread.pass;
+ * print "y"; Thread.pass;
+ * print "z" }
+ * a.join
+ * b.join
+ *
+ * <em>produces:</em>
+ *
+ * axbycz
+ */
+
+static VALUE
+rb_thread_pass()
+{
+ rb_thread_schedule();
+ return Qnil;
+}
+
+
+/*
+ * call-seq:
+ * Thread.stop => nil
+ *
+ * Stops execution of the current thread, putting it into a ``sleep'' state,
+ * and schedules execution of another thread. Resets the ``critical'' condition
+ * to <code>false</code>.
+ *
+ * a = Thread.new { print "a"; Thread.stop; print "c" }
+ * Thread.pass
+ * print "b"
+ * a.run
+ * a.join
+ *
+ * <em>produces:</em>
+ *
+ * abc
+ */
+
+VALUE
+rb_thread_stop()
+{
+ enum rb_thread_status last_status = THREAD_RUNNABLE;
+
+ rb_thread_critical = 0;
+ if (curr_thread == curr_thread->next) {
+ rb_raise(rb_eThreadError, "stopping only thread\n\tnote: use sleep to stop forever");
+ }
+ if (curr_thread->status == THREAD_TO_KILL)
+ last_status = THREAD_TO_KILL;
+ curr_thread->status = THREAD_STOPPED;
+ rb_thread_schedule();
+ curr_thread->status = last_status;
+
+ return Qnil;
+}
+
+struct timeval rb_time_timeval();
+
+void
+rb_thread_polling()
+{
+ if (curr_thread != curr_thread->next) {
+ curr_thread->status = THREAD_STOPPED;
+ curr_thread->delay = timeofday() + (double)0.06;
+ curr_thread->wait_for = WAIT_TIME;
+ rb_thread_schedule();
+ }
+}
+
+void
+rb_thread_sleep(sec)
+ int sec;
+{
+ if (curr_thread == curr_thread->next) {
+ TRAP_BEG;
+ sleep(sec);
+ TRAP_END;
+ return;
+ }
+ rb_thread_wait_for(rb_time_timeval(INT2FIX(sec)));
+}
+
+void
+rb_thread_sleep_forever()
+{
+ int thr_critical = rb_thread_critical;
+ if (curr_thread == curr_thread->next ||
+ curr_thread->status == THREAD_TO_KILL) {
+ rb_thread_critical = Qtrue;
+ TRAP_BEG;
+ pause();
+ rb_thread_critical = thr_critical;
+ TRAP_END;
+ return;
+ }
+
+ curr_thread->delay = DELAY_INFTY;
+ curr_thread->wait_for = WAIT_TIME;
+ curr_thread->status = THREAD_STOPPED;
+ rb_thread_schedule();
+}
+
+
+/*
+ * call-seq:
+ * thr.priority => integer
+ *
+ * Returns the priority of <i>thr</i>. Default is inherited from the
+ * current thread which creating the new thread, or zero for the
+ * initial main thread; higher-priority threads will run before
+ * lower-priority threads.
+ *
+ * Thread.current.priority #=> 0
+ */
+
+static VALUE
+rb_thread_priority(thread)
+ VALUE thread;
+{
+ return INT2NUM(rb_thread_check(thread)->priority);
+}
+
+
+/*
+ * call-seq:
+ * thr.priority= integer => thr
*
+ * Sets the priority of <i>thr</i> to <i>integer</i>. Higher-priority threads
+ * will run before lower-priority threads.
+ *
+ * count1 = count2 = 0
+ * a = Thread.new do
+ * loop { count1 += 1 }
+ * end
+ * a.priority = -1
+ *
+ * b = Thread.new do
+ * loop { count2 += 1 }
+ * end
+ * b.priority = -2
+ * sleep 1 #=> 1
+ * Thread.critical = 1
+ * count1 #=> 622504
+ * count2 #=> 5832
*/
static VALUE
-rb_f_method_name(void)
+rb_thread_priority_set(thread, prio)
+ VALUE thread, prio;
{
- ID fname = rb_frame_caller(); /* need *caller* ID */
+ rb_thread_t th;
+
+ rb_secure(4);
+ th = rb_thread_check(thread);
- if (fname) {
- return ID2SYM(fname);
+ th->priority = NUM2INT(prio);
+ rb_thread_schedule();
+ return prio;
+}
+
+
+/*
+ * call-seq:
+ * thr.safe_level => integer
+ *
+ * Returns the safe level in effect for <i>thr</i>. Setting thread-local safe
+ * levels can help when implementing sandboxes which run insecure code.
+ *
+ * thr = Thread.new { $SAFE = 3; sleep }
+ * Thread.current.safe_level #=> 0
+ * thr.safe_level #=> 3
+ */
+
+static VALUE
+rb_thread_safe_level(thread)
+ VALUE thread;
+{
+ rb_thread_t th;
+
+ th = rb_thread_check(thread);
+ if (th == curr_thread) {
+ return INT2NUM(ruby_safe_level);
}
- else {
+ return INT2NUM(th->safe);
+}
+
+static int ruby_thread_abort;
+static VALUE thgroup_default;
+
+
+/*
+ * call-seq:
+ * Thread.abort_on_exception => true or false
+ *
+ * Returns the status of the global ``abort on exception'' condition. The
+ * default is <code>false</code>. When set to <code>true</code>, or if the
+ * global <code>$DEBUG</code> flag is <code>true</code> (perhaps because the
+ * command line option <code>-d</code> was specified) all threads will abort
+ * (the process will <code>exit(0)</code>) if an exception is raised in any
+ * thread. See also <code>Thread::abort_on_exception=</code>.
+ */
+
+static VALUE
+rb_thread_s_abort_exc()
+{
+ return ruby_thread_abort?Qtrue:Qfalse;
+}
+
+
+/*
+ * call-seq:
+ * Thread.abort_on_exception= boolean => true or false
+ *
+ * When set to <code>true</code>, all threads will abort if an exception is
+ * raised. Returns the new state.
+ *
+ * Thread.abort_on_exception = true
+ * t1 = Thread.new do
+ * puts "In new thread"
+ * raise "Exception from thread"
+ * end
+ * sleep(1)
+ * puts "not reached"
+ *
+ * <em>produces:</em>
+ *
+ * In new thread
+ * prog.rb:4: Exception from thread (RuntimeError)
+ * from prog.rb:2:in `initialize'
+ * from prog.rb:2:in `new'
+ * from prog.rb:2
+ */
+
+static VALUE
+rb_thread_s_abort_exc_set(self, val)
+ VALUE self, val;
+{
+ rb_secure(4);
+ ruby_thread_abort = RTEST(val);
+ return val;
+}
+
+
+/*
+ * call-seq:
+ * thr.abort_on_exception => true or false
+ *
+ * Returns the status of the thread-local ``abort on exception'' condition for
+ * <i>thr</i>. The default is <code>false</code>. See also
+ * <code>Thread::abort_on_exception=</code>.
+ */
+
+static VALUE
+rb_thread_abort_exc(thread)
+ VALUE thread;
+{
+ return rb_thread_check(thread)->abort?Qtrue:Qfalse;
+}
+
+
+/*
+ * call-seq:
+ * thr.abort_on_exception= boolean => true or false
+ *
+ * When set to <code>true</code>, causes all threads (including the main
+ * program) to abort if an exception is raised in <i>thr</i>. The process will
+ * effectively <code>exit(0)</code>.
+ */
+
+static VALUE
+rb_thread_abort_exc_set(thread, val)
+ VALUE thread, val;
+{
+ rb_secure(4);
+ rb_thread_check(thread)->abort = RTEST(val);
+ return val;
+}
+
+
+/*
+ * call-seq:
+ * thr.group => thgrp or nil
+ *
+ * Returns the <code>ThreadGroup</code> which contains <i>thr</i>, or nil if
+ * the thread is not a member of any group.
+ *
+ * Thread.main.group #=> #<ThreadGroup:0x4029d914>
+ */
+
+VALUE
+rb_thread_group(thread)
+ VALUE thread;
+{
+ VALUE group = rb_thread_check(thread)->thgroup;
+ if (!group) {
+ group = Qnil;
+ }
+ return group;
+}
+
+#ifdef __ia64
+# define IA64_INIT(x) x
+#else
+# define IA64_INIT(x)
+#endif
+
+#define THREAD_ALLOC(th) do {\
+ th = ALLOC(struct rb_thread);\
+\
+ th->next = 0;\
+ th->prev = 0;\
+\
+ th->status = THREAD_RUNNABLE;\
+ th->result = 0;\
+ th->flags = 0;\
+\
+ th->stk_ptr = 0;\
+ th->stk_len = 0;\
+ th->stk_max = 0;\
+ th->wait_for = 0;\
+ IA64_INIT(th->bstr_ptr = 0);\
+ IA64_INIT(th->bstr_len = 0);\
+ IA64_INIT(th->bstr_max = 0);\
+ FD_ZERO(&th->readfds);\
+ FD_ZERO(&th->writefds);\
+ FD_ZERO(&th->exceptfds);\
+ th->delay = 0.0;\
+ th->join = 0;\
+\
+ th->frame = 0;\
+ th->scope = 0;\
+ th->klass = 0;\
+ th->wrapper = 0;\
+ th->cref = ruby_cref;\
+ th->dyna_vars = ruby_dyna_vars;\
+ th->block = 0;\
+ th->iter = 0;\
+ th->tag = 0;\
+ th->tracing = 0;\
+ th->errinfo = Qnil;\
+ th->last_status = 0;\
+ th->last_line = 0;\
+ th->last_match = Qnil;\
+ th->abort = 0;\
+ th->priority = 0;\
+ th->thgroup = thgroup_default;\
+ th->locals = 0;\
+ th->thread = 0;\
+ if (curr_thread == 0) {\
+ th->sandbox = Qnil;\
+ } else {\
+ th->sandbox = curr_thread->sandbox;\
+ }\
+} while (0)
+
+static rb_thread_t
+rb_thread_alloc(klass)
+ VALUE klass;
+{
+ rb_thread_t th;
+ struct RVarmap *vars;
+
+ THREAD_ALLOC(th);
+ th->thread = Data_Wrap_Struct(klass, thread_mark, thread_free, th);
+
+ for (vars = th->dyna_vars; vars; vars = vars->next) {
+ if (FL_TEST(vars, DVAR_DONT_RECYCLE)) break;
+ FL_SET(vars, DVAR_DONT_RECYCLE);
+ }
+ return th;
+}
+
+static int thread_init;
+
+#if defined(_THREAD_SAFE)
+static void
+catch_timer(sig)
+ int sig;
+{
+#if !defined(POSIX_SIGNAL) && !defined(BSD_SIGNAL)
+ signal(sig, catch_timer);
+#endif
+ /* cause EINTR */
+}
+
+static pthread_t time_thread;
+
+static void*
+thread_timer(dummy)
+ void *dummy;
+{
+ sigset_t all_signals;
+
+ sigfillset(&all_signals);
+ pthread_sigmask(SIG_BLOCK, &all_signals, 0);
+
+ for (;;) {
+#ifdef HAVE_NANOSLEEP
+ struct timespec req, rem;
+
+ req.tv_sec = 0;
+ req.tv_nsec = 10000000;
+ nanosleep(&req, &rem);
+#else
+ struct timeval tv;
+ tv.tv_sec = 0;
+ tv.tv_usec = 10000;
+ select(0, NULL, NULL, NULL, &tv);
+#endif
+ if (!rb_thread_critical) {
+ rb_thread_pending = 1;
+ if (rb_trap_immediate) {
+ pthread_kill(ruby_thid, SIGVTALRM);
+ }
+ }
+ }
+}
+
+void
+rb_thread_start_timer()
+{
+}
+
+void
+rb_thread_stop_timer()
+{
+}
+#elif defined(HAVE_SETITIMER)
+static void
+catch_timer(sig)
+ int sig;
+{
+#if !defined(POSIX_SIGNAL) && !defined(BSD_SIGNAL)
+ signal(sig, catch_timer);
+#endif
+ if (!rb_thread_critical) {
+ rb_thread_pending = 1;
+ }
+ /* cause EINTR */
+}
+
+void
+rb_thread_start_timer()
+{
+ struct itimerval tval;
+
+ if (!thread_init) return;
+ tval.it_interval.tv_sec = 0;
+ tval.it_interval.tv_usec = 10000;
+ tval.it_value = tval.it_interval;
+ setitimer(ITIMER_VIRTUAL, &tval, NULL);
+}
+
+void
+rb_thread_stop_timer()
+{
+ struct itimerval tval;
+
+ if (!thread_init) return;
+ tval.it_interval.tv_sec = 0;
+ tval.it_interval.tv_usec = 0;
+ tval.it_value = tval.it_interval;
+ setitimer(ITIMER_VIRTUAL, &tval, NULL);
+}
+#else /* !(_THREAD_SAFE || HAVE_SETITIMER) */
+int rb_thread_tick = THREAD_TICK;
+#endif
+
+static VALUE
+rb_thread_start_0(fn, arg, th)
+ VALUE (*fn)();
+ void *arg;
+ rb_thread_t th;
+{
+ volatile rb_thread_t th_save = th;
+ volatile VALUE thread = th->thread;
+ struct BLOCK *volatile saved_block = 0;
+ enum rb_thread_status status;
+ int state;
+
+ if (OBJ_FROZEN(curr_thread->thgroup)) {
+ rb_raise(rb_eThreadError,
+ "can't start a new thread (frozen ThreadGroup)");
+ }
+
+ if (!thread_init) {
+ thread_init = 1;
+#if defined(HAVE_SETITIMER) || defined(_THREAD_SAFE)
+#if defined(POSIX_SIGNAL)
+ posix_signal(SIGVTALRM, catch_timer);
+#else
+ signal(SIGVTALRM, catch_timer);
+#endif
+
+#ifdef _THREAD_SAFE
+ pthread_create(&time_thread, 0, thread_timer, 0);
+#else
+ rb_thread_start_timer();
+#endif
+#endif
+ }
+
+ if (THREAD_SAVE_CONTEXT(curr_thread)) {
+ return thread;
+ }
+
+ if (ruby_block) { /* should nail down higher blocks */
+ struct BLOCK dummy;
+
+ dummy.prev = ruby_block;
+ blk_copy_prev(&dummy);
+ saved_block = ruby_block = dummy.prev;
+ }
+ scope_dup(ruby_scope);
+
+ if (!th->next) {
+ /* merge in thread list */
+ th->prev = curr_thread;
+ curr_thread->next->prev = th;
+ th->next = curr_thread->next;
+ curr_thread->next = th;
+ th->priority = curr_thread->priority;
+ th->thgroup = curr_thread->thgroup;
+ }
+
+ PUSH_TAG(PROT_THREAD);
+ if ((state = EXEC_TAG()) == 0) {
+ if (THREAD_SAVE_CONTEXT(th) == 0) {
+ curr_thread = th;
+ th->result = (*fn)(arg, th);
+ }
+ th = th_save;
+ }
+ else if (TAG_DST()) {
+ th = th_save;
+ th->result = prot_tag->retval;
+ }
+ POP_TAG();
+ status = th->status;
+
+ if (th == main_thread) ruby_stop(state);
+ rb_thread_remove(th);
+
+ if (saved_block) {
+ blk_free(saved_block);
+ }
+
+ if (state && status != THREAD_TO_KILL && !NIL_P(ruby_errinfo)) {
+ th->flags |= THREAD_RAISED;
+ if (state == TAG_FATAL) {
+ /* fatal error within this thread, need to stop whole script */
+ main_thread->errinfo = ruby_errinfo;
+ rb_thread_cleanup();
+ }
+ else if (rb_obj_is_kind_of(ruby_errinfo, rb_eSystemExit)) {
+ if (th->safe >= 4) {
+ char buf[32];
+
+ sprintf(buf, "Insecure exit at level %d", th->safe);
+ th->errinfo = rb_exc_new2(rb_eSecurityError, buf);
+ }
+ else {
+ /* delegate exception to main_thread */
+ rb_thread_main_jump(ruby_errinfo, RESTORE_RAISE);
+ }
+ }
+ else if (th->safe < 4 && (ruby_thread_abort || th->abort || RTEST(ruby_debug))) {
+ /* exit on main_thread */
+ error_print();
+ rb_thread_main_jump(ruby_errinfo, RESTORE_EXIT);
+ }
+ else {
+ th->errinfo = ruby_errinfo;
+ }
+ }
+ rb_thread_schedule();
+ ruby_stop(0); /* last thread termination */
+ return 0; /* not reached */
+}
+
+VALUE
+rb_thread_create(fn, arg)
+ VALUE (*fn)();
+ void *arg;
+{
+ Init_stack((void *)&arg);
+ return rb_thread_start_0(fn, arg, rb_thread_alloc(rb_cThread));
+}
+
+static VALUE
+rb_thread_yield(arg, th)
+ VALUE arg;
+ rb_thread_t th;
+{
+ const ID *tbl;
+
+ scope_dup(ruby_block->scope);
+
+ tbl = ruby_scope->local_tbl;
+ if (tbl) {
+ int n = *tbl++;
+ for (tbl += 2, n -= 2; n > 0; --n) { /* skip first 2 ($_ and $~) */
+ ID id = *tbl++;
+ if (id != 0 && !rb_is_local_id(id)) /* push flip states */
+ rb_dvar_push(id, Qfalse);
+ }
+ }
+ rb_dvar_push('_', Qnil);
+ rb_dvar_push('~', Qnil);
+ ruby_block->dyna_vars = ruby_dyna_vars;
+
+ return rb_yield_0(arg, 0, 0, YIELD_LAMBDA_CALL, Qtrue);
+}
+
+/*
+ * call-seq:
+ * Thread.new([arg]*) {|args| block } => thread
+ *
+ * Creates and runs a new thread to execute the instructions given in
+ * <i>block</i>. Any arguments passed to <code>Thread::new</code> are passed
+ * into the block.
+ *
+ * x = Thread.new { sleep 0.1; print "x"; print "y"; print "z" }
+ * a = Thread.new { print "a"; print "b"; sleep 0.2; print "c" }
+ * x.join # Let the threads finish before
+ * a.join # main thread exits...
+ *
+ * <em>produces:</em>
+ *
+ * abxyzc
+ */
+
+static VALUE
+rb_thread_s_new(argc, argv, klass)
+ int argc;
+ VALUE *argv;
+ VALUE klass;
+{
+ rb_thread_t th = rb_thread_alloc(klass);
+ volatile VALUE *pos;
+
+ pos = th->stk_pos;
+ rb_obj_call_init(th->thread, argc, argv);
+ if (th->stk_pos == 0) {
+ rb_raise(rb_eThreadError, "uninitialized thread - check `%s#initialize'",
+ rb_class2name(klass));
+ }
+
+ return th->thread;
+}
+
+
+/*
+ * call-seq:
+ * Thread.new([arg]*) {|args| block } => thread
+ *
+ * Creates and runs a new thread to execute the instructions given in
+ * <i>block</i>. Any arguments passed to <code>Thread::new</code> are passed
+ * into the block.
+ *
+ * x = Thread.new { sleep 0.1; print "x"; print "y"; print "z" }
+ * a = Thread.new { print "a"; print "b"; sleep 0.2; print "c" }
+ * x.join # Let the threads finish before
+ * a.join # main thread exits...
+ *
+ * <em>produces:</em>
+ *
+ * abxyzc
+ */
+
+static VALUE
+rb_thread_initialize(thread, args)
+ VALUE thread, args;
+{
+ rb_thread_t th;
+
+ if (!rb_block_given_p()) {
+ rb_raise(rb_eThreadError, "must be called with a block");
+ }
+ th = rb_thread_check(thread);
+ if (th->stk_max) {
+ NODE *node = th->node;
+ if (!node) {
+ rb_raise(rb_eThreadError, "already initialized thread");
+ }
+ rb_raise(rb_eThreadError, "already initialized thread - %s:%d",
+ node->nd_file, nd_line(node));
+ }
+ return rb_thread_start_0(rb_thread_yield, args, th);
+}
+
+
+/*
+ * call-seq:
+ * Thread.start([args]*) {|args| block } => thread
+ * Thread.fork([args]*) {|args| block } => thread
+ *
+ * Basically the same as <code>Thread::new</code>. However, if class
+ * <code>Thread</code> is subclassed, then calling <code>start</code> in that
+ * subclass will not invoke the subclass's <code>initialize</code> method.
+ */
+
+static VALUE
+rb_thread_start(klass, args)
+ VALUE klass, args;
+{
+ if (!rb_block_given_p()) {
+ rb_raise(rb_eThreadError, "must be called with a block");
+ }
+ return rb_thread_start_0(rb_thread_yield, args, rb_thread_alloc(klass));
+}
+
+
+/*
+ * call-seq:
+ * thr.value => obj
+ *
+ * Waits for <i>thr</i> to complete (via <code>Thread#join</code>) and returns
+ * its value.
+ *
+ * a = Thread.new { 2 + 2 }
+ * a.value #=> 4
+ */
+
+static VALUE
+rb_thread_value(thread)
+ VALUE thread;
+{
+ rb_thread_t th = rb_thread_check(thread);
+
+ while (!rb_thread_join(th, DELAY_INFTY));
+
+ return th->result;
+}
+
+
+/*
+ * call-seq:
+ * thr.status => string, false or nil
+ *
+ * Returns the status of <i>thr</i>: ``<code>sleep</code>'' if <i>thr</i> is
+ * sleeping or waiting on I/O, ``<code>run</code>'' if <i>thr</i> is executing,
+ * ``<code>aborting</code>'' if <i>thr</i> is aborting, <code>false</code> if
+ * <i>thr</i> terminated normally, and <code>nil</code> if <i>thr</i>
+ * terminated with an exception.
+ *
+ * a = Thread.new { raise("die now") }
+ * b = Thread.new { Thread.stop }
+ * c = Thread.new { Thread.exit }
+ * d = Thread.new { sleep }
+ * Thread.critical = true
+ * d.kill #=> #<Thread:0x401b3678 aborting>
+ * a.status #=> nil
+ * b.status #=> "sleep"
+ * c.status #=> false
+ * d.status #=> "aborting"
+ * Thread.current.status #=> "run"
+ */
+
+static VALUE
+rb_thread_status(thread)
+ VALUE thread;
+{
+ rb_thread_t th = rb_thread_check(thread);
+
+ if (rb_thread_dead(th)) {
+ if (!NIL_P(th->errinfo) && (th->flags & THREAD_RAISED))
+ return Qnil;
+ return Qfalse;
+ }
+
+ return rb_str_new2(thread_status_name(th->status));
+}
+
+
+/*
+ * call-seq:
+ * thr.alive? => true or false
+ *
+ * Returns <code>true</code> if <i>thr</i> is running or sleeping.
+ *
+ * thr = Thread.new { }
+ * thr.join #=> #<Thread:0x401b3fb0 dead>
+ * Thread.current.alive? #=> true
+ * thr.alive? #=> false
+ */
+
+VALUE
+rb_thread_alive_p(thread)
+ VALUE thread;
+{
+ rb_thread_t th = rb_thread_check(thread);
+
+ if (rb_thread_dead(th)) return Qfalse;
+ return Qtrue;
+}
+
+
+/*
+ * call-seq:
+ * thr.stop? => true or false
+ *
+ * Returns <code>true</code> if <i>thr</i> is dead or sleeping.
+ *
+ * a = Thread.new { Thread.stop }
+ * b = Thread.current
+ * a.stop? #=> true
+ * b.stop? #=> false
+ */
+
+static VALUE
+rb_thread_stop_p(thread)
+ VALUE thread;
+{
+ rb_thread_t th = rb_thread_check(thread);
+
+ if (rb_thread_dead(th)) return Qtrue;
+ if (th->status == THREAD_STOPPED) return Qtrue;
+ return Qfalse;
+}
+
+static void
+rb_thread_wait_other_threads()
+{
+ rb_thread_t th;
+ int found;
+
+ /* wait other threads to terminate */
+ while (curr_thread != curr_thread->next) {
+ found = 0;
+ FOREACH_THREAD(th) {
+ if (th != curr_thread && th->status != THREAD_STOPPED) {
+ found = 1;
+ break;
+ }
+ }
+ END_FOREACH(th);
+ if (!found) return;
+ rb_thread_schedule();
+ }
+}
+
+static void
+rb_thread_cleanup()
+{
+ rb_thread_t curr, th;
+
+ curr = curr_thread;
+ while (curr->status == THREAD_KILLED) {
+ curr = curr->prev;
+ }
+
+ FOREACH_THREAD_FROM(curr, th) {
+ if (th->status != THREAD_KILLED) {
+ rb_thread_ready(th);
+ if (th != main_thread) {
+ th->thgroup = 0;
+ th->priority = 0;
+ th->status = THREAD_TO_KILL;
+ RDATA(th->thread)->dfree = NULL;
+ }
+ }
+ }
+ END_FOREACH_FROM(curr, th);
+}
+
+int rb_thread_critical;
+
+
+/*
+ * call-seq:
+ * Thread.critical => true or false
+ *
+ * Returns the status of the global ``thread critical'' condition.
+ */
+
+static VALUE
+rb_thread_critical_get()
+{
+ return rb_thread_critical?Qtrue:Qfalse;
+}
+
+
+/*
+ * call-seq:
+ * Thread.critical= boolean => true or false
+ *
+ * Sets the status of the global ``thread critical'' condition and returns
+ * it. When set to <code>true</code>, prohibits scheduling of any existing
+ * thread. Does not block new threads from being created and run. Certain
+ * thread operations (such as stopping or killing a thread, sleeping in the
+ * current thread, and raising an exception) may cause a thread to be scheduled
+ * even when in a critical section. <code>Thread::critical</code> is not
+ * intended for daily use: it is primarily there to support folks writing
+ * threading libraries.
+ */
+
+static VALUE
+rb_thread_critical_set(obj, val)
+ VALUE obj, val;
+{
+ rb_thread_critical = RTEST(val);
+ return val;
+}
+
+void
+rb_thread_interrupt()
+{
+ rb_thread_critical = 0;
+ rb_thread_ready(main_thread);
+ if (curr_thread == main_thread) {
+ rb_interrupt();
+ }
+ if (!rb_thread_dead(curr_thread)) {
+ if (THREAD_SAVE_CONTEXT(curr_thread)) {
+ return;
+ }
+ }
+ curr_thread = main_thread;
+ rb_thread_restore_context(curr_thread, RESTORE_INTERRUPT);
+}
+
+void
+rb_thread_signal_raise(sig)
+ int sig;
+{
+ rb_thread_critical = 0;
+ if (curr_thread == main_thread) {
+ VALUE argv[1];
+
+ rb_thread_ready(curr_thread);
+ argv[0] = INT2FIX(sig);
+ rb_exc_raise(rb_class_new_instance(1, argv, rb_eSignal));
+ }
+ rb_thread_ready(main_thread);
+ if (!rb_thread_dead(curr_thread)) {
+ if (THREAD_SAVE_CONTEXT(curr_thread)) {
+ return;
+ }
+ }
+ th_sig = sig;
+ curr_thread = main_thread;
+ rb_thread_restore_context(curr_thread, RESTORE_SIGNAL);
+}
+
+void
+rb_thread_trap_eval(cmd, sig, safe)
+ VALUE cmd;
+ int sig, safe;
+{
+ rb_thread_critical = 0;
+ if (curr_thread == main_thread) {
+ rb_trap_eval(cmd, sig, safe);
+ return;
+ }
+ if (!rb_thread_dead(curr_thread)) {
+ if (THREAD_SAVE_CONTEXT(curr_thread)) {
+ return;
+ }
+ }
+ th_cmd = cmd;
+ th_sig = sig;
+ th_safe = safe;
+ curr_thread = main_thread;
+ rb_thread_restore_context(curr_thread, RESTORE_TRAP);
+}
+
+void
+rb_thread_signal_exit()
+{
+ VALUE args[2];
+
+ rb_thread_critical = 0;
+ if (curr_thread == main_thread) {
+ rb_thread_ready(curr_thread);
+ rb_exit(EXIT_SUCCESS);
+ }
+ args[0] = INT2NUM(EXIT_SUCCESS);
+ args[1] = rb_str_new2("exit");
+ rb_thread_ready(main_thread);
+ if (!rb_thread_dead(curr_thread)) {
+ if (THREAD_SAVE_CONTEXT(curr_thread)) {
+ return;
+ }
+ }
+ rb_thread_main_jump(rb_class_new_instance(2, args, rb_eSystemExit),
+ RESTORE_EXIT);
+}
+
+static VALUE
+rb_thread_raise(argc, argv, th)
+ int argc;
+ VALUE *argv;
+ rb_thread_t th;
+{
+ volatile rb_thread_t th_save = th;
+ VALUE exc;
+
+ if (!th->next) {
+ rb_raise(rb_eArgError, "unstarted thread");
+ }
+ if (rb_thread_dead(th)) return Qnil;
+ exc = rb_make_exception(argc, argv);
+ if (curr_thread == th) {
+ rb_raise_jump(exc);
+ }
+
+ if (!rb_thread_dead(curr_thread)) {
+ if (THREAD_SAVE_CONTEXT(curr_thread)) {
+ return th_save->thread;
+ }
+ }
+
+ rb_thread_ready(th);
+ curr_thread = th;
+
+ th_raise_exception = exc;
+ th_raise_node = ruby_current_node;
+ rb_thread_restore_context(curr_thread, RESTORE_RAISE);
+ return Qnil; /* not reached */
+}
+
+
+/*
+ * call-seq:
+ * thr.raise(exception)
+ *
+ * Raises an exception (see <code>Kernel::raise</code>) from <i>thr</i>. The
+ * caller does not have to be <i>thr</i>.
+ *
+ * Thread.abort_on_exception = true
+ * a = Thread.new { sleep(200) }
+ * a.raise("Gotcha")
+ *
+ * <em>produces:</em>
+ *
+ * prog.rb:3: Gotcha (RuntimeError)
+ * from prog.rb:2:in `initialize'
+ * from prog.rb:2:in `new'
+ * from prog.rb:2
+ */
+
+static VALUE
+rb_thread_raise_m(argc, argv, thread)
+ int argc;
+ VALUE *argv;
+ VALUE thread;
+{
+ rb_thread_t th = rb_thread_check(thread);
+
+ if (ruby_safe_level > th->safe) {
+ rb_secure(4);
+ }
+ rb_thread_raise(argc, argv, th);
+ return Qnil; /* not reached */
+}
+
+VALUE
+rb_thread_local_aref(thread, id)
+ VALUE thread;
+ ID id;
+{
+ rb_thread_t th;
+ VALUE val;
+
+ th = rb_thread_check(thread);
+ if (ruby_safe_level >= 4 && th != curr_thread) {
+ rb_raise(rb_eSecurityError, "Insecure: thread locals");
+ }
+ if (!th->locals) return Qnil;
+ if (st_lookup(th->locals, id, &val)) {
+ return val;
+ }
+ return Qnil;
+}
+
+
+/*
+ * call-seq:
+ * thr[sym] => obj or nil
+ *
+ * Attribute Reference---Returns the value of a thread-local variable, using
+ * either a symbol or a string name. If the specified variable does not exist,
+ * returns <code>nil</code>.
+ *
+ * a = Thread.new { Thread.current["name"] = "A"; Thread.stop }
+ * b = Thread.new { Thread.current[:name] = "B"; Thread.stop }
+ * c = Thread.new { Thread.current["name"] = "C"; Thread.stop }
+ * Thread.list.each {|x| puts "#{x.inspect}: #{x[:name]}" }
+ *
+ * <em>produces:</em>
+ *
+ * #<Thread:0x401b3b3c sleep>: C
+ * #<Thread:0x401b3bc8 sleep>: B
+ * #<Thread:0x401b3c68 sleep>: A
+ * #<Thread:0x401bdf4c run>:
+ */
+
+static VALUE
+rb_thread_aref(thread, id)
+ VALUE thread, id;
+{
+ return rb_thread_local_aref(thread, rb_to_id(id));
+}
+
+VALUE
+rb_thread_local_aset(thread, id, val)
+ VALUE thread;
+ ID id;
+ VALUE val;
+{
+ rb_thread_t th = rb_thread_check(thread);
+
+ if (ruby_safe_level >= 4 && th != curr_thread) {
+ rb_raise(rb_eSecurityError, "Insecure: can't modify thread locals");
+ }
+ if (OBJ_FROZEN(thread)) rb_error_frozen("thread locals");
+
+ if (!th->locals) {
+ th->locals = st_init_numtable();
+ }
+ if (NIL_P(val)) {
+ st_delete(th->locals, (st_data_t*)&id, 0);
return Qnil;
}
+ st_insert(th->locals, id, val);
+
+ return val;
+}
+
+
+/*
+ * call-seq:
+ * thr[sym] = obj => obj
+ *
+ * Attribute Assignment---Sets or creates the value of a thread-local variable,
+ * using either a symbol or a string. See also <code>Thread#[]</code>.
+ */
+
+static VALUE
+rb_thread_aset(thread, id, val)
+ VALUE thread, id, val;
+{
+ return rb_thread_local_aset(thread, rb_to_id(id), val);
+}
+
+
+/*
+ * call-seq:
+ * thr.key?(sym) => true or false
+ *
+ * Returns <code>true</code> if the given string (or symbol) exists as a
+ * thread-local variable.
+ *
+ * me = Thread.current
+ * me[:oliver] = "a"
+ * me.key?(:oliver) #=> true
+ * me.key?(:stanley) #=> false
+ */
+
+static VALUE
+rb_thread_key_p(thread, id)
+ VALUE thread, id;
+{
+ rb_thread_t th = rb_thread_check(thread);
+
+ if (!th->locals) return Qfalse;
+ if (st_lookup(th->locals, rb_to_id(id), 0))
+ return Qtrue;
+ return Qfalse;
+}
+
+static int
+thread_keys_i(key, value, ary)
+ ID key;
+ VALUE value, ary;
+{
+ rb_ary_push(ary, ID2SYM(key));
+ return ST_CONTINUE;
+}
+
+
+/*
+ * call-seq:
+ * thr.keys => array
+ *
+ * Returns an an array of the names of the thread-local variables (as Symbols).
+ *
+ * thr = Thread.new do
+ * Thread.current[:cat] = 'meow'
+ * Thread.current["dog"] = 'woof'
+ * end
+ * thr.join #=> #<Thread:0x401b3f10 dead>
+ * thr.keys #=> [:dog, :cat]
+ */
+
+static VALUE
+rb_thread_keys(thread)
+ VALUE thread;
+{
+ rb_thread_t th = rb_thread_check(thread);
+ VALUE ary = rb_ary_new();
+
+ if (th->locals) {
+ st_foreach(th->locals, thread_keys_i, ary);
+ }
+ return ary;
+}
+
+/*
+ * call-seq:
+ * thr.inspect => string
+ *
+ * Dump the name, id, and status of _thr_ to a string.
+ */
+
+static VALUE
+rb_thread_inspect(thread)
+ VALUE thread;
+{
+ const char *cname = rb_obj_classname(thread);
+ rb_thread_t th = rb_thread_check(thread);
+ const char *status = thread_status_name(th->status);
+ VALUE str;
+ size_t len = strlen(cname)+7+16+9+1;
+
+ str = rb_str_new(0, len); /* 7:tags 16:addr 9:status 1:nul */
+ snprintf(RSTRING(str)->ptr, len, "#<%s:0x%lx %s>", cname, thread, status);
+ RSTRING(str)->len = strlen(RSTRING(str)->ptr);
+ OBJ_INFECT(str, thread);
+
+ return str;
}
void
-Init_eval(void)
+rb_thread_atfork()
{
- rb_define_virtual_variable("$@", errat_getter, errat_setter);
- rb_define_virtual_variable("$!", errinfo_getter, 0);
+ rb_thread_t th;
- rb_define_global_function("raise", rb_f_raise, -1);
- rb_define_global_function("fail", rb_f_raise, -1);
+ if (rb_thread_alone()) return;
+ FOREACH_THREAD(th) {
+ if (th != curr_thread) {
+ rb_thread_die(th);
+ }
+ }
+ END_FOREACH(th);
+ main_thread = curr_thread;
+ curr_thread->next = curr_thread;
+ curr_thread->prev = curr_thread;
+}
- rb_define_global_function("global_variables", rb_f_global_variables, 0); /* in variable.c */
- rb_define_global_function("__method__", rb_f_method_name, 0);
- rb_define_global_function("__callee__", rb_f_method_name, 0);
+/*
+ * Document-class: Continuation
+ *
+ * Continuation objects are generated by
+ * <code>Kernel#callcc</code>. They hold a return address and execution
+ * context, allowing a nonlocal return to the end of the
+ * <code>callcc</code> block from anywhere within a program.
+ * Continuations are somewhat analogous to a structured version of C's
+ * <code>setjmp/longjmp</code> (although they contain more state, so
+ * you might consider them closer to threads).
+ *
+ * For instance:
+ *
+ * arr = [ "Freddie", "Herbie", "Ron", "Max", "Ringo" ]
+ * callcc{|$cc|}
+ * puts(message = arr.shift)
+ * $cc.call unless message =~ /Max/
+ *
+ * <em>produces:</em>
+ *
+ * Freddie
+ * Herbie
+ * Ron
+ * Max
+ *
+ * This (somewhat contrived) example allows the inner loop to abandon
+ * processing early:
+ *
+ * callcc {|cont|
+ * for i in 0..4
+ * print "\n#{i}: "
+ * for j in i*5...(i+1)*5
+ * cont.call() if j == 17
+ * printf "%3d", j
+ * end
+ * end
+ * }
+ * print "\n"
+ *
+ * <em>produces:</em>
+ *
+ * 0: 0 1 2 3 4
+ * 1: 5 6 7 8 9
+ * 2: 10 11 12 13 14
+ * 3: 15 16
+ */
- rb_define_private_method(rb_cModule, "append_features", rb_mod_append_features, 1);
- rb_define_private_method(rb_cModule, "extend_object", rb_mod_extend_object, 1);
- rb_define_private_method(rb_cModule, "include", rb_mod_include, -1);
+VALUE rb_cCont;
- rb_undef_method(rb_cClass, "module_function");
+/*
+ * call-seq:
+ * callcc {|cont| block } => obj
+ *
+ * Generates a <code>Continuation</code> object, which it passes to the
+ * associated block. Performing a <em>cont</em><code>.call</code> will
+ * cause the <code>callcc</code> to return (as will falling through the
+ * end of the block). The value returned by the <code>callcc</code> is
+ * the value of the block, or the value passed to
+ * <em>cont</em><code>.call</code>. See class <code>Continuation</code>
+ * for more details. Also see <code>Kernel::throw</code> for
+ * an alternative mechanism for unwinding a call stack.
+ */
- {
- extern void Init_vm_eval(void);
- extern void Init_eval_method(void);
- Init_vm_eval();
- Init_eval_method();
+static VALUE
+rb_callcc(self)
+ VALUE self;
+{
+ volatile VALUE cont;
+ rb_thread_t th;
+ volatile rb_thread_t th_save;
+ struct tag *tag;
+ struct RVarmap *vars;
+
+ THREAD_ALLOC(th);
+ cont = Data_Wrap_Struct(rb_cCont, thread_mark, thread_free, th);
+
+ scope_dup(ruby_scope);
+ for (tag=prot_tag; tag; tag=tag->prev) {
+ scope_dup(tag->scope);
}
+ th->thread = curr_thread->thread;
+ th->thgroup = cont_protect;
- rb_define_singleton_method(rb_cModule, "nesting", rb_mod_nesting, 0);
- rb_define_singleton_method(rb_cModule, "constants", rb_mod_s_constants, -1);
+ for (vars = ruby_dyna_vars; vars; vars = vars->next) {
+ if (FL_TEST(vars, DVAR_DONT_RECYCLE)) break;
+ FL_SET(vars, DVAR_DONT_RECYCLE);
+ }
+ th_save = th;
+ if (THREAD_SAVE_CONTEXT(th)) {
+ return th_save->result;
+ }
+ else {
+ return rb_yield(cont);
+ }
+}
- rb_define_singleton_method(rb_vm_top_self(), "include", top_include, -1);
+/*
+ * call-seq:
+ * cont.call(args, ...)
+ * cont[args, ...]
+ *
+ * Invokes the continuation. The program continues from the end of the
+ * <code>callcc</code> block. If no arguments are given, the original
+ * <code>callcc</code> returns <code>nil</code>. If one argument is
+ * given, <code>callcc</code> returns it. Otherwise, an array
+ * containing <i>args</i> is returned.
+ *
+ * callcc {|cont| cont.call } #=> nil
+ * callcc {|cont| cont.call 1 } #=> 1
+ * callcc {|cont| cont.call 1, 2, 3 } #=> [1, 2, 3]
+ */
- rb_define_method(rb_mKernel, "extend", rb_obj_extend, -1);
+static VALUE
+rb_cont_call(argc, argv, cont)
+ int argc;
+ VALUE *argv;
+ VALUE cont;
+{
+ rb_thread_t th = rb_thread_check(cont);
+
+ if (th->thread != curr_thread->thread) {
+ rb_raise(rb_eRuntimeError, "continuation called across threads");
+ }
+ if (th->thgroup != cont_protect) {
+ rb_raise(rb_eRuntimeError, "continuation called across trap");
+ }
+ switch (argc) {
+ case 0:
+ th->result = Qnil;
+ break;
+ case 1:
+ th->result = argv[0];
+ break;
+ default:
+ th->result = rb_ary_new4(argc, argv);
+ break;
+ }
+
+ rb_thread_restore_context(th, RESTORE_NORMAL);
+ return Qnil;
+}
+
+struct thgroup {
+ int enclosed;
+ VALUE group;
+};
+
+
+/*
+ * Document-class: ThreadGroup
+ *
+ * <code>ThreadGroup</code> provides a means of keeping track of a number of
+ * threads as a group. A <code>Thread</code> can belong to only one
+ * <code>ThreadGroup</code> at a time; adding a thread to a new group will
+ * remove it from any previous group.
+ *
+ * Newly created threads belong to the same group as the thread from which they
+ * were created.
+ */
+
+static VALUE thgroup_s_alloc _((VALUE));
+static VALUE
+thgroup_s_alloc(klass)
+ VALUE klass;
+{
+ VALUE group;
+ struct thgroup *data;
+
+ group = Data_Make_Struct(klass, struct thgroup, 0, free, data);
+ data->enclosed = 0;
+ data->group = group;
+
+ return group;
+}
+
+
+/*
+ * call-seq:
+ * thgrp.list => array
+ *
+ * Returns an array of all existing <code>Thread</code> objects that belong to
+ * this group.
+ *
+ * ThreadGroup::Default.list #=> [#<Thread:0x401bdf4c run>]
+ */
+
+static VALUE
+thgroup_list(group)
+ VALUE group;
+{
+ struct thgroup *data;
+ rb_thread_t th;
+ VALUE ary;
+
+ Data_Get_Struct(group, struct thgroup, data);
+ ary = rb_ary_new();
+
+ FOREACH_THREAD(th) {
+ if (th->thgroup == data->group) {
+ rb_ary_push(ary, th->thread);
+ }
+ }
+ END_FOREACH(th);
+
+ return ary;
+}
+
+
+/*
+ * call-seq:
+ * thgrp.enclose => thgrp
+ *
+ * Prevents threads from being added to or removed from the receiving
+ * <code>ThreadGroup</code>. New threads can still be started in an enclosed
+ * <code>ThreadGroup</code>.
+ *
+ * ThreadGroup::Default.enclose #=> #<ThreadGroup:0x4029d914>
+ * thr = Thread::new { Thread.stop } #=> #<Thread:0x402a7210 sleep>
+ * tg = ThreadGroup::new #=> #<ThreadGroup:0x402752d4>
+ * tg.add thr
+ *
+ * <em>produces:</em>
+ *
+ * ThreadError: can't move from the enclosed thread group
+ */
+
+static VALUE
+thgroup_enclose(group)
+ VALUE group;
+{
+ struct thgroup *data;
+
+ Data_Get_Struct(group, struct thgroup, data);
+ data->enclosed = 1;
+
+ return group;
+}
+
+
+/*
+ * call-seq:
+ * thgrp.enclosed? => true or false
+ *
+ * Returns <code>true</code> if <em>thgrp</em> is enclosed. See also
+ * ThreadGroup#enclose.
+ */
+
+static VALUE
+thgroup_enclosed_p(group)
+ VALUE group;
+{
+ struct thgroup *data;
+
+ Data_Get_Struct(group, struct thgroup, data);
+ if (data->enclosed) return Qtrue;
+ return Qfalse;
+}
+
+
+/*
+ * call-seq:
+ * thgrp.add(thread) => thgrp
+ *
+ * Adds the given <em>thread</em> to this group, removing it from any other
+ * group to which it may have previously belonged.
+ *
+ * puts "Initial group is #{ThreadGroup::Default.list}"
+ * tg = ThreadGroup.new
+ * t1 = Thread.new { sleep }
+ * t2 = Thread.new { sleep }
+ * puts "t1 is #{t1}"
+ * puts "t2 is #{t2}"
+ * tg.add(t1)
+ * puts "Initial group now #{ThreadGroup::Default.list}"
+ * puts "tg group now #{tg.list}"
+ *
+ * <em>produces:</em>
+ *
+ * Initial group is #<Thread:0x401bdf4c>
+ * t1 is #<Thread:0x401b3c90>
+ * t2 is #<Thread:0x401b3c18>
+ * Initial group now #<Thread:0x401b3c18>#<Thread:0x401bdf4c>
+ * tg group now #<Thread:0x401b3c90>
+ */
+
+static VALUE
+thgroup_add(group, thread)
+ VALUE group, thread;
+{
+ rb_thread_t th;
+ struct thgroup *data;
+
+ rb_secure(4);
+ th = rb_thread_check(thread);
+ if (!th->next || !th->prev) {
+ rb_raise(rb_eTypeError, "wrong argument type %s (expected Thread)",
+ rb_obj_classname(thread));
+ }
+
+ if (OBJ_FROZEN(group)) {
+ rb_raise(rb_eThreadError, "can't move to the frozen thread group");
+ }
+ Data_Get_Struct(group, struct thgroup, data);
+ if (data->enclosed) {
+ rb_raise(rb_eThreadError, "can't move to the enclosed thread group");
+ }
+
+ if (!th->thgroup) {
+ return Qnil;
+ }
+ if (OBJ_FROZEN(th->thgroup)) {
+ rb_raise(rb_eThreadError, "can't move from the frozen thread group");
+ }
+ Data_Get_Struct(th->thgroup, struct thgroup, data);
+ if (data->enclosed) {
+ rb_raise(rb_eThreadError, "can't move from the enclosed thread group");
+ }
+
+ th->thgroup = group;
+ return group;
+}
+
+
+/* variables for recursive traversals */
+static ID recursive_key;
+
+static VALUE
+recursive_check(hash, obj)
+ VALUE hash;
+ VALUE obj;
+{
+ if (NIL_P(hash) || TYPE(hash) != T_HASH) {
+ return Qfalse;
+ }
+ else {
+ VALUE list = rb_hash_aref(hash, ID2SYM(rb_frame_last_func()));
+
+ if (NIL_P(list) || TYPE(list) != T_HASH)
+ return Qfalse;
+ if (NIL_P(rb_hash_lookup(list, obj)))
+ return Qfalse;
+ return Qtrue;
+ }
+}
+
+static VALUE
+recursive_push(hash, obj)
+ VALUE hash;
+ VALUE obj;
+{
+ VALUE list, sym;
+
+ sym = ID2SYM(rb_frame_last_func());
+ if (NIL_P(hash) || TYPE(hash) != T_HASH) {
+ hash = rb_hash_new();
+ rb_thread_local_aset(rb_thread_current(), recursive_key, hash);
+ list = Qnil;
+ }
+ else {
+ list = rb_hash_aref(hash, sym);
+ }
+ if (NIL_P(list) || TYPE(list) != T_HASH) {
+ list = rb_hash_new();
+ rb_hash_aset(hash, sym, list);
+ }
+ rb_hash_aset(list, obj, Qtrue);
+ return hash;
+}
+
+static void
+recursive_pop(hash, obj)
+ VALUE hash;
+ VALUE obj;
+{
+ VALUE list, sym;
+
+ sym = ID2SYM(rb_frame_last_func());
+ if (NIL_P(hash) || TYPE(hash) != T_HASH) {
+ VALUE symname;
+ VALUE thrname;
+ symname = rb_inspect(sym);
+ thrname = rb_inspect(rb_thread_current());
+
+ rb_raise(rb_eTypeError, "invalid inspect_tbl hash for %s in %s",
+ StringValuePtr(symname), StringValuePtr(thrname));
+ }
+ list = rb_hash_aref(hash, sym);
+ if (NIL_P(list) || TYPE(list) != T_HASH) {
+ VALUE symname = rb_inspect(sym);
+ VALUE thrname = rb_inspect(rb_thread_current());
+ rb_raise(rb_eTypeError, "invalid inspect_tbl list for %s in %s",
+ StringValuePtr(symname), StringValuePtr(thrname));
+ }
+ rb_hash_delete(list, obj);
+}
+
+VALUE
+rb_exec_recursive(func, obj, arg)
+ VALUE (*func) _((VALUE, VALUE, int));
+ VALUE obj;
+ VALUE arg;
+{
+ VALUE hash = rb_thread_local_aref(rb_thread_current(), recursive_key);
+ VALUE objid = rb_obj_id(obj);
+
+ if (recursive_check(hash, objid)) {
+ return (*func) (obj, arg, Qtrue);
+ }
+ else {
+ VALUE result = Qundef;
+ int state;
+
+ hash = recursive_push(hash, objid);
+ PUSH_TAG(PROT_NONE);
+ if ((state = EXEC_TAG()) == 0) {
+ result = (*func) (obj, arg, Qfalse);
+ }
+ POP_TAG();
+ recursive_pop(hash, objid);
+ if (state)
+ JUMP_TAG(state);
+ return result;
+ }
+}
+
+
+/*
+ * +Thread+ encapsulates the behavior of a thread of
+ * execution, including the main thread of the Ruby script.
+ *
+ * In the descriptions of the methods in this class, the parameter _sym_
+ * refers to a symbol, which is either a quoted string or a
+ * +Symbol+ (such as <code>:name</code>).
+ */
+
+void
+Init_Thread()
+{
+ VALUE cThGroup;
+
+ recursive_key = rb_intern("__recursive_key__");
+ rb_eThreadError = rb_define_class("ThreadError", rb_eStandardError);
+ rb_cThread = rb_define_class("Thread", rb_cObject);
+ rb_undef_alloc_func(rb_cThread);
+
+ rb_define_singleton_method(rb_cThread, "new", rb_thread_s_new, -1);
+ rb_define_method(rb_cThread, "initialize", rb_thread_initialize, -2);
+ rb_define_singleton_method(rb_cThread, "start", rb_thread_start, -2);
+ rb_define_singleton_method(rb_cThread, "fork", rb_thread_start, -2);
+
+ rb_define_singleton_method(rb_cThread, "stop", rb_thread_stop, 0);
+ rb_define_singleton_method(rb_cThread, "kill", rb_thread_s_kill, 1);
+ rb_define_singleton_method(rb_cThread, "exit", rb_thread_exit, 0);
+ rb_define_singleton_method(rb_cThread, "pass", rb_thread_pass, 0);
+ rb_define_singleton_method(rb_cThread, "current", rb_thread_current, 0);
+ rb_define_singleton_method(rb_cThread, "main", rb_thread_main, 0);
+ rb_define_singleton_method(rb_cThread, "list", rb_thread_list, 0);
+
+ rb_define_singleton_method(rb_cThread, "critical", rb_thread_critical_get, 0);
+ rb_define_singleton_method(rb_cThread, "critical=", rb_thread_critical_set, 1);
+
+ rb_define_singleton_method(rb_cThread, "abort_on_exception", rb_thread_s_abort_exc, 0);
+ rb_define_singleton_method(rb_cThread, "abort_on_exception=", rb_thread_s_abort_exc_set, 1);
+
+ rb_define_method(rb_cThread, "run", rb_thread_run, 0);
+ rb_define_method(rb_cThread, "wakeup", rb_thread_wakeup, 0);
+ rb_define_method(rb_cThread, "kill", rb_thread_kill, 0);
+ rb_define_method(rb_cThread, "terminate", rb_thread_kill, 0);
+ rb_define_method(rb_cThread, "exit", rb_thread_kill, 0);
+ rb_define_method(rb_cThread, "kill!", rb_thread_kill_bang, 0);
+ rb_define_method(rb_cThread, "terminate!", rb_thread_kill_bang, 0);
+ rb_define_method(rb_cThread, "exit!", rb_thread_kill_bang, 0);
+ rb_define_method(rb_cThread, "value", rb_thread_value, 0);
+ rb_define_method(rb_cThread, "status", rb_thread_status, 0);
+ rb_define_method(rb_cThread, "join", rb_thread_join_m, -1);
+ rb_define_method(rb_cThread, "alive?", rb_thread_alive_p, 0);
+ rb_define_method(rb_cThread, "stop?", rb_thread_stop_p, 0);
+ rb_define_method(rb_cThread, "raise", rb_thread_raise_m, -1);
+
+ rb_define_method(rb_cThread, "abort_on_exception", rb_thread_abort_exc, 0);
+ rb_define_method(rb_cThread, "abort_on_exception=", rb_thread_abort_exc_set, 1);
+
+ rb_define_method(rb_cThread, "priority", rb_thread_priority, 0);
+ rb_define_method(rb_cThread, "priority=", rb_thread_priority_set, 1);
+ rb_define_method(rb_cThread, "safe_level", rb_thread_safe_level, 0);
+ rb_define_method(rb_cThread, "group", rb_thread_group, 0);
+
+ rb_define_method(rb_cThread, "[]", rb_thread_aref, 1);
+ rb_define_method(rb_cThread, "[]=", rb_thread_aset, 2);
+ rb_define_method(rb_cThread, "key?", rb_thread_key_p, 1);
+ rb_define_method(rb_cThread, "keys", rb_thread_keys, 0);
+
+ rb_define_method(rb_cThread, "inspect", rb_thread_inspect, 0);
+
+ rb_cCont = rb_define_class("Continuation", rb_cObject);
+ rb_undef_alloc_func(rb_cCont);
+ rb_undef_method(CLASS_OF(rb_cCont), "new");
+ rb_define_method(rb_cCont, "call", rb_cont_call, -1);
+ rb_define_method(rb_cCont, "[]", rb_cont_call, -1);
+ rb_define_global_function("callcc", rb_callcc, 0);
+ rb_global_variable(&cont_protect);
+
+ cThGroup = rb_define_class("ThreadGroup", rb_cObject);
+ rb_define_alloc_func(cThGroup, thgroup_s_alloc);
+ rb_define_method(cThGroup, "list", thgroup_list, 0);
+ rb_define_method(cThGroup, "enclose", thgroup_enclose, 0);
+ rb_define_method(cThGroup, "enclosed?", thgroup_enclosed_p, 0);
+ rb_define_method(cThGroup, "add", thgroup_add, 1);
+ rb_global_variable(&thgroup_default);
+ thgroup_default = rb_obj_alloc(cThGroup);
+ rb_define_const(cThGroup, "Default", thgroup_default);
+
+ /* allocate main thread */
+ main_thread = rb_thread_alloc(rb_cThread);
+ curr_thread = main_thread->prev = main_thread->next = main_thread;
+}
+
+/*
+ * call-seq:
+ * catch(symbol) {| | block } > obj
+ *
+ * +catch+ executes its block. If a +throw+ is
+ * executed, Ruby searches up its stack for a +catch+ block
+ * with a tag corresponding to the +throw+'s
+ * _symbol_. If found, that block is terminated, and
+ * +catch+ returns the value given to +throw+. If
+ * +throw+ is not called, the block terminates normally, and
+ * the value of +catch+ is the value of the last expression
+ * evaluated. +catch+ expressions may be nested, and the
+ * +throw+ call need not be in lexical scope.
+ *
+ * def routine(n)
+ * puts n
+ * throw :done if n <= 0
+ * routine(n-1)
+ * end
+ *
+ *
+ * catch(:done) { routine(3) }
+ *
+ * <em>produces:</em>
+ *
+ * 3
+ * 2
+ * 1
+ * 0
+ */
+
+static VALUE
+rb_f_catch(dmy, tag)
+ VALUE dmy, tag;
+{
+ int state;
+ VALUE val = Qnil; /* OK */
+
+ tag = ID2SYM(rb_to_id(tag));
+ PUSH_TAG(tag);
+ if ((state = EXEC_TAG()) == 0) {
+ val = rb_yield_0(tag, 0, 0, 0, Qfalse);
+ }
+ else if (state == TAG_THROW && tag == prot_tag->dst) {
+ val = prot_tag->retval;
+ state = 0;
+ }
+ POP_TAG();
+ if (state) JUMP_TAG(state);
- rb_define_global_function("trace_var", rb_f_trace_var, -1); /* in variable.c */
- rb_define_global_function("untrace_var", rb_f_untrace_var, -1); /* in variable.c */
+ return val;
+}
+
+static VALUE
+catch_i(tag)
+ VALUE tag;
+{
+ return rb_funcall(Qnil, rb_intern("catch"), 1, tag);
+}
+
+VALUE
+rb_catch(tag, func, data)
+ const char *tag;
+ VALUE (*func)();
+ VALUE data;
+{
+ return rb_iterate((VALUE(*)_((VALUE)))catch_i, ID2SYM(rb_intern(tag)), func, data);
+}
+
+/*
+ * call-seq:
+ * throw(symbol [, obj])
+ *
+ * Transfers control to the end of the active +catch+ block
+ * waiting for _symbol_. Raises +NameError+ if there
+ * is no +catch+ block for the symbol. The optional second
+ * parameter supplies a return value for the +catch+ block,
+ * which otherwise defaults to +nil+. For examples, see
+ * <code>Kernel::catch</code>.
+ */
+
+static VALUE
+rb_f_throw(argc, argv)
+ int argc;
+ VALUE *argv;
+{
+ VALUE tag, value;
+ struct tag *tt = prot_tag;
+
+ rb_scan_args(argc, argv, "11", &tag, &value);
+ tag = ID2SYM(rb_to_id(tag));
+
+ while (tt) {
+ if (tt->tag == tag) {
+ tt->dst = tag;
+ tt->retval = value;
+ break;
+ }
+ if (tt->tag == PROT_THREAD) {
+ rb_raise(rb_eThreadError, "uncaught throw `%s' in thread 0x%lx",
+ rb_id2name(SYM2ID(tag)),
+ curr_thread);
+ }
+ tt = tt->prev;
+ }
+ if (!tt) {
+ rb_name_error(SYM2ID(tag), "uncaught throw `%s'", rb_id2name(SYM2ID(tag)));
+ }
+ rb_trap_restore_mask();
+ JUMP_TAG(TAG_THROW);
+#ifndef __GNUC__
+ return Qnil; /* not reached */
+#endif
+}
+
+void
+rb_throw(tag, val)
+ const char *tag;
+ VALUE val;
+{
+ VALUE argv[2];
- exception_error = rb_exc_new3(rb_eFatal,
- rb_obj_freeze(rb_str_new2("exception reentered")));
- OBJ_TAINT(exception_error);
- OBJ_FREEZE(exception_error);
+ argv[0] = ID2SYM(rb_intern(tag));
+ argv[1] = val;
+ rb_f_throw(2, argv);
}
diff --git a/eval_error.c b/eval_error.c
deleted file mode 100644
index 46a0705f4a..0000000000
--- a/eval_error.c
+++ /dev/null
@@ -1,274 +0,0 @@
-/* -*-c-*- */
-/*
- * included by eval.c
- */
-
-static void
-warn_printf(const char *fmt, ...)
-{
- char buf[BUFSIZ];
- va_list args;
-
- va_init_list(args, fmt);
- vsnprintf(buf, BUFSIZ, fmt, args);
- va_end(args);
- rb_write_error(buf);
-}
-
-#define warn_print(x) rb_write_error(x)
-#define warn_print2(x,l) rb_write_error2(x,l)
-
-static void
-error_pos(void)
-{
- const char *sourcefile = rb_sourcefile();
- int sourceline = rb_sourceline();
-
- if (sourcefile) {
- if (sourceline == 0) {
- warn_printf("%s", sourcefile);
- }
- else if (rb_frame_callee()) {
- warn_printf("%s:%d:in `%s'", sourcefile, sourceline,
- rb_id2name(rb_frame_callee()));
- }
- else {
- warn_printf("%s:%d", sourcefile, sourceline);
- }
- }
-}
-
-VALUE rb_check_backtrace(VALUE);
-
-static VALUE
-get_backtrace(VALUE info)
-{
- if (NIL_P(info))
- return Qnil;
- info = rb_funcall(info, rb_intern("backtrace"), 0);
- if (NIL_P(info))
- return Qnil;
- return rb_check_backtrace(info);
-}
-
-VALUE
-rb_get_backtrace(VALUE info)
-{
- return get_backtrace(info);
-}
-
-static void
-set_backtrace(VALUE info, VALUE bt)
-{
- rb_funcall(info, rb_intern("set_backtrace"), 1, bt);
-}
-
-static void
-error_print(void)
-{
- volatile VALUE errat = Qnil; /* OK */
- VALUE errinfo = GET_THREAD()->errinfo;
- volatile VALUE eclass, e;
- const char *volatile einfo;
- volatile long elen;
-
- if (NIL_P(errinfo))
- return;
-
- PUSH_TAG();
- if (EXEC_TAG() == 0) {
- errat = get_backtrace(errinfo);
- }
- else {
- errat = Qnil;
- }
- if (EXEC_TAG())
- goto error;
- if (NIL_P(errat)) {
- const char *file = rb_sourcefile();
- int line = rb_sourceline();
- if (!file)
- warn_printf("%d", line);
- else if (!line)
- warn_printf("%s", file);
- else
- warn_printf("%s:%d", file, line);
- }
- else if (RARRAY_LEN(errat) == 0) {
- error_pos();
- }
- else {
- VALUE mesg = RARRAY_PTR(errat)[0];
-
- if (NIL_P(mesg))
- error_pos();
- else {
- warn_print2(RSTRING_PTR(mesg), RSTRING_LEN(mesg));
- }
- }
-
- eclass = CLASS_OF(errinfo);
- if (EXEC_TAG() == 0) {
- e = rb_funcall(errinfo, rb_intern("message"), 0, 0);
- StringValue(e);
- einfo = RSTRING_PTR(e);
- elen = RSTRING_LEN(e);
- }
- else {
- einfo = "";
- elen = 0;
- }
- if (EXEC_TAG())
- goto error;
- if (eclass == rb_eRuntimeError && elen == 0) {
- warn_print(": unhandled exception\n");
- }
- else {
- VALUE epath;
-
- epath = rb_class_name(eclass);
- if (elen == 0) {
- warn_print(": ");
- warn_print2(RSTRING_PTR(epath), RSTRING_LEN(epath));
- warn_print("\n");
- }
- else {
- char *tail = 0;
- long len = elen;
-
- if (RSTRING_PTR(epath)[0] == '#')
- epath = 0;
- if ((tail = memchr(einfo, '\n', elen)) != 0) {
- len = tail - einfo;
- tail++; /* skip newline */
- }
- warn_print(": ");
- warn_print2(einfo, len);
- if (epath) {
- warn_print(" (");
- warn_print2(RSTRING_PTR(epath), RSTRING_LEN(epath));
- warn_print(")\n");
- }
- if (tail) {
- warn_print2(tail, elen - len - 1);
- if (einfo[elen-1] != '\n') warn_print2("\n", 1);
- }
- }
- }
-
- if (!NIL_P(errat)) {
- long i;
- long len = RARRAY_LEN(errat);
- VALUE *ptr = RARRAY_PTR(errat);
- int skip = eclass == rb_eSysStackError;
-
-#define TRACE_MAX (TRACE_HEAD+TRACE_TAIL+5)
-#define TRACE_HEAD 8
-#define TRACE_TAIL 5
-
- for (i = 1; i < len; i++) {
- if (TYPE(ptr[i]) == T_STRING) {
- warn_printf("\tfrom %s\n", RSTRING_PTR(ptr[i]));
- }
- if (skip && i == TRACE_HEAD && len > TRACE_MAX) {
- warn_printf("\t ... %ld levels...\n",
- len - TRACE_HEAD - TRACE_TAIL);
- i = len - TRACE_TAIL;
- }
- }
- }
- error:
- POP_TAG();
-}
-
-void
-ruby_error_print(void)
-{
- error_print();
-}
-
-void
-rb_print_undef(VALUE klass, ID id, int scope)
-{
- const char *v;
-
- switch (scope) {
- default:
- case NOEX_PUBLIC: v = ""; break;
- case NOEX_PRIVATE: v = " private"; break;
- case NOEX_PROTECTED: v = " protected"; break;
- }
- rb_name_error(id, "undefined%s method `%s' for %s `%s'", v,
- rb_id2name(id),
- (TYPE(klass) == T_MODULE) ? "module" : "class",
- rb_class2name(klass));
-}
-
-static int
-sysexit_status(VALUE err)
-{
- VALUE st = rb_iv_get(err, "status");
- return NUM2INT(st);
-}
-
-static int
-error_handle(int ex)
-{
- int status = EXIT_FAILURE;
- rb_thread_t *th = GET_THREAD();
-
- if (rb_threadptr_set_raised(th))
- return EXIT_FAILURE;
- switch (ex & TAG_MASK) {
- case 0:
- status = EXIT_SUCCESS;
- break;
-
- case TAG_RETURN:
- error_pos();
- warn_print(": unexpected return\n");
- break;
- case TAG_NEXT:
- error_pos();
- warn_print(": unexpected next\n");
- break;
- case TAG_BREAK:
- error_pos();
- warn_print(": unexpected break\n");
- break;
- case TAG_REDO:
- error_pos();
- warn_print(": unexpected redo\n");
- break;
- case TAG_RETRY:
- error_pos();
- warn_print(": retry outside of rescue clause\n");
- break;
- case TAG_THROW:
- /* TODO: fix me */
- error_pos();
- warn_printf(": unexpected throw\n");
- break;
- case TAG_RAISE: {
- VALUE errinfo = GET_THREAD()->errinfo;
- if (rb_obj_is_kind_of(errinfo, rb_eSystemExit)) {
- status = sysexit_status(errinfo);
- }
- else if (rb_obj_is_instance_of(errinfo, rb_eSignal)) {
- /* no message when exiting by signal */
- }
- else {
- error_print();
- }
- break;
- }
- case TAG_FATAL:
- error_print();
- break;
- default:
- rb_bug("Unknown longjmp status %d", ex);
- break;
- }
- rb_threadptr_reset_raised(th);
- return status;
-}
diff --git a/eval_intern.h b/eval_intern.h
deleted file mode 100644
index 573f49751b..0000000000
--- a/eval_intern.h
+++ /dev/null
@@ -1,232 +0,0 @@
-#ifndef RUBY_EVAL_INTERN_H
-#define RUBY_EVAL_INTERN_H
-
-#include "ruby/ruby.h"
-#include "vm_core.h"
-
-#define PASS_PASSED_BLOCK_TH(th) do { \
- (th)->passed_block = GC_GUARDED_PTR_REF((rb_block_t *)(th)->cfp->lfp[0]); \
- (th)->cfp->flag |= VM_FRAME_FLAG_PASSED; \
-} while (0)
-
-#define PASS_PASSED_BLOCK() do { \
- rb_thread_t * const __th__ = GET_THREAD(); \
- PASS_PASSED_BLOCK_TH(__th__); \
-} while (0)
-
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#ifndef EXIT_SUCCESS
-#define EXIT_SUCCESS 0
-#endif
-#ifndef EXIT_FAILURE
-#define EXIT_FAILURE 1
-#endif
-
-#include <stdio.h>
-#include <setjmp.h>
-
-#ifdef __APPLE__
-#include <crt_externs.h>
-#endif
-
-/* Make alloca work the best possible way. */
-#ifdef __GNUC__
-# ifndef atarist
-# ifndef alloca
-# define alloca __builtin_alloca
-# endif
-# endif /* atarist */
-#else
-# ifdef HAVE_ALLOCA_H
-# include <alloca.h>
-# else
-# ifdef _AIX
-#pragma alloca
-# else
-# ifndef alloca /* predefined by HP cc +Olibcalls */
-void *alloca();
-# endif
-# endif /* AIX */
-# endif /* HAVE_ALLOCA_H */
-#endif /* __GNUC__ */
-
-#ifndef HAVE_STRING_H
-char *strrchr(const char *, const char);
-#endif
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#ifdef HAVE_NET_SOCKET_H
-#include <net/socket.h>
-#endif
-
-#define ruby_setjmp(env) RUBY_SETJMP(env)
-#define ruby_longjmp(env,val) RUBY_LONGJMP(env,val)
-#ifdef __CYGWIN__
-# ifndef _setjmp
-int _setjmp(jmp_buf);
-# endif
-# ifndef _longjmp
-NORETURN(void _longjmp(jmp_buf, int));
-# endif
-#endif
-
-#include <sys/types.h>
-#include <signal.h>
-#include <errno.h>
-
-#ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h>
-#endif
-
-/*
- Solaris sys/select.h switches select to select_large_fdset to support larger
- file descriptors if FD_SETSIZE is larger than 1024 on 32bit environment.
- But Ruby doesn't change FD_SETSIZE because fd_set is allocated dynamically.
- So following definition is required to use select_large_fdset.
-*/
-#ifdef HAVE_SELECT_LARGE_FDSET
-#define select(n, r, w, e, t) select_large_fdset(n, r, w, e, t)
-#endif
-
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-
-#include <sys/stat.h>
-
-#define SAVE_ROOT_JMPBUF(th, stmt) do \
- if (ruby_setjmp((th)->root_jmpbuf) == 0) { \
- stmt; \
- } \
- else { \
- rb_fiber_start(); \
- } while (0)
-
-#define TH_PUSH_TAG(th) do { \
- rb_thread_t * const _th = th; \
- struct rb_vm_tag _tag; \
- _tag.tag = 0; \
- _tag.prev = _th->tag; \
- _th->tag = &_tag;
-
-#define TH_POP_TAG() \
- _th->tag = _tag.prev; \
-} while (0)
-
-#define TH_POP_TAG2() \
- _th->tag = _tag.prev
-
-#define PUSH_TAG() TH_PUSH_TAG(GET_THREAD())
-#define POP_TAG() TH_POP_TAG()
-
-#define TH_EXEC_TAG() ruby_setjmp(_th->tag->buf)
-
-#define EXEC_TAG() \
- TH_EXEC_TAG()
-
-#define TH_JUMP_TAG(th, st) do { \
- ruby_longjmp(th->tag->buf,(st)); \
-} while (0)
-
-#define JUMP_TAG(st) TH_JUMP_TAG(GET_THREAD(), st)
-
-enum ruby_tag_type {
- RUBY_TAG_RETURN = 0x1,
- RUBY_TAG_BREAK = 0x2,
- RUBY_TAG_NEXT = 0x3,
- RUBY_TAG_RETRY = 0x4,
- RUBY_TAG_REDO = 0x5,
- RUBY_TAG_RAISE = 0x6,
- RUBY_TAG_THROW = 0x7,
- RUBY_TAG_FATAL = 0x8,
- RUBY_TAG_MASK = 0xf
-};
-#define TAG_RETURN RUBY_TAG_RETURN
-#define TAG_BREAK RUBY_TAG_BREAK
-#define TAG_NEXT RUBY_TAG_NEXT
-#define TAG_RETRY RUBY_TAG_RETRY
-#define TAG_REDO RUBY_TAG_REDO
-#define TAG_RAISE RUBY_TAG_RAISE
-#define TAG_THROW RUBY_TAG_THROW
-#define TAG_FATAL RUBY_TAG_FATAL
-#define TAG_MASK RUBY_TAG_MASK
-
-#define NEW_THROW_OBJECT(val, pt, st) \
- ((VALUE)NEW_NODE(NODE_LIT, (val), (pt), (st)))
-#define SET_THROWOBJ_CATCH_POINT(obj, val) \
- (RNODE((obj))->u2.value = (val))
-#define SET_THROWOBJ_STATE(obj, val) \
- (RNODE((obj))->u3.value = (val))
-
-#define GET_THROWOBJ_VAL(obj) ((VALUE)RNODE((obj))->u1.value)
-#define GET_THROWOBJ_CATCH_POINT(obj) ((VALUE*)RNODE((obj))->u2.value)
-#define GET_THROWOBJ_STATE(obj) ((int)RNODE((obj))->u3.value)
-
-#define SCOPE_TEST(f) (rb_vm_cref()->nd_visi & (f))
-#define SCOPE_CHECK(f) (rb_vm_cref()->nd_visi == (f))
-#define SCOPE_SET(f) (rb_vm_cref()->nd_visi = (f))
-
-#define CHECK_STACK_OVERFLOW(cfp, margin) do \
- if (((VALUE *)(cfp)->sp) + (margin) + sizeof(rb_control_frame_t) >= ((VALUE *)cfp)) { \
- rb_exc_raise(sysstack_error); \
- } \
-while (0)
-
-void rb_thread_cleanup(void);
-void rb_thread_wait_other_threads(void);
-
-enum {
- RAISED_EXCEPTION = 1,
- RAISED_STACKOVERFLOW = 2,
- RAISED_NOMEMORY = 4
-};
-int rb_threadptr_set_raised(rb_thread_t *th);
-int rb_threadptr_reset_raised(rb_thread_t *th);
-#define rb_thread_raised_set(th, f) ((th)->raised_flag |= (f))
-#define rb_thread_raised_reset(th, f) ((th)->raised_flag &= ~(f))
-#define rb_thread_raised_p(th, f) (((th)->raised_flag & (f)) != 0)
-#define rb_thread_raised_clear(th) ((th)->raised_flag = 0)
-
-VALUE rb_f_eval(int argc, VALUE *argv, VALUE self);
-VALUE rb_make_exception(int argc, VALUE *argv);
-
-NORETURN(void rb_fiber_start(void));
-
-NORETURN(void rb_print_undef(VALUE, ID, int));
-NORETURN(void rb_vm_localjump_error(const char *,VALUE, int));
-NORETURN(void rb_vm_jump_tag_but_local_jump(int, VALUE));
-NORETURN(void rb_raise_method_missing(rb_thread_t *th, int argc, VALUE *argv,
- VALUE obj, int call_status));
-
-VALUE rb_vm_make_jump_tag_but_local_jump(int state, VALUE val);
-NODE *rb_vm_cref(void);
-VALUE rb_obj_is_proc(VALUE);
-VALUE rb_vm_call_cfunc(VALUE recv, VALUE (*func)(VALUE), VALUE arg, const rb_block_t *blockptr, VALUE filename);
-void rb_vm_set_progname(VALUE filename);
-void rb_thread_terminate_all(void);
-VALUE rb_vm_top_self();
-VALUE rb_vm_cbase(void);
-void rb_trap_restore_mask(void);
-
-#ifndef CharNext /* defined as CharNext[AW] on Windows. */
-#define CharNext(p) ((p) + mblen(p, RUBY_MBCHAR_MAXSIZE))
-#endif
-
-#if defined DOSISH || defined __CYGWIN__
-static inline void
-translit_char(char *p, int from, int to)
-{
- while (*p) {
- if ((unsigned char)*p == from)
- *p = to;
- p = CharNext(p);
- }
-}
-#endif
-
-#endif /* RUBY_EVAL_INTERN_H */
diff --git a/eval_jump.c b/eval_jump.c
deleted file mode 100644
index 18b6835c9c..0000000000
--- a/eval_jump.c
+++ /dev/null
@@ -1,152 +0,0 @@
-/* -*-c-*- */
-/*
- * from eval.c
- */
-
-#include "eval_intern.h"
-
-/* exit */
-
-void
-rb_call_end_proc(VALUE data)
-{
- rb_proc_call(data, rb_ary_new());
-}
-
-/*
- * call-seq:
- * at_exit { block } -> proc
- *
- * Converts _block_ to a +Proc+ object (and therefore
- * binds it at the point of call) and registers it for execution when
- * the program exits. If multiple handlers are registered, they are
- * executed in reverse order of registration.
- *
- * def do_at_exit(str1)
- * at_exit { print str1 }
- * end
- * at_exit { puts "cruel world" }
- * do_at_exit("goodbye ")
- * exit
- *
- * <em>produces:</em>
- *
- * goodbye cruel world
- */
-
-static VALUE
-rb_f_at_exit(void)
-{
- VALUE proc;
-
- if (!rb_block_given_p()) {
- rb_raise(rb_eArgError, "called without a block");
- }
- proc = rb_block_proc();
- rb_set_end_proc(rb_call_end_proc, proc);
- return proc;
-}
-
-struct end_proc_data {
- void (*func) ();
- VALUE data;
- int safe;
- struct end_proc_data *next;
-};
-
-static struct end_proc_data *end_procs, *ephemeral_end_procs, *tmp_end_procs;
-
-void
-rb_set_end_proc(void (*func)(VALUE), VALUE data)
-{
- struct end_proc_data *link = ALLOC(struct end_proc_data);
- struct end_proc_data **list;
- rb_thread_t *th = GET_THREAD();
-
- if (th->top_wrapper) {
- list = &ephemeral_end_procs;
- }
- else {
- list = &end_procs;
- }
- link->next = *list;
- link->func = func;
- link->data = data;
- link->safe = rb_safe_level();
- *list = link;
-}
-
-void
-rb_mark_end_proc(void)
-{
- struct end_proc_data *link;
-
- link = end_procs;
- while (link) {
- rb_gc_mark(link->data);
- link = link->next;
- }
- link = ephemeral_end_procs;
- while (link) {
- rb_gc_mark(link->data);
- link = link->next;
- }
- link = tmp_end_procs;
- while (link) {
- rb_gc_mark(link->data);
- link = link->next;
- }
-}
-
-void
-rb_exec_end_proc(void)
-{
- struct end_proc_data *volatile link;
- struct end_proc_data *tmp;
- int status;
- volatile int safe = rb_safe_level();
-
- while (ephemeral_end_procs) {
- tmp_end_procs = link = ephemeral_end_procs;
- ephemeral_end_procs = 0;
- while (link) {
- PUSH_TAG();
- if ((status = EXEC_TAG()) == 0) {
- rb_set_safe_level_force(link->safe);
- (*link->func) (link->data);
- }
- POP_TAG();
- if (status) {
- error_handle(status);
- }
- tmp = link;
- tmp_end_procs = link = link->next;
- xfree(tmp);
- }
- }
- while (end_procs) {
- tmp_end_procs = link = end_procs;
- end_procs = 0;
- while (link) {
- PUSH_TAG();
- if ((status = EXEC_TAG()) == 0) {
- rb_set_safe_level_force(link->safe);
- (*link->func) (link->data);
- }
- POP_TAG();
- if (status) {
- error_handle(status);
- }
- tmp = link;
- tmp_end_procs = link = link->next;
- xfree(tmp);
- }
- }
- rb_set_safe_level_force(safe);
-}
-
-void
-Init_jump(void)
-{
- rb_define_global_function("at_exit", rb_f_at_exit, 0);
-}
diff --git a/ext/.document b/ext/.document
index b4ef7886a6..ba8182593e 100644
--- a/ext/.document
+++ b/ext/.document
@@ -1,73 +1,10 @@
# Add files to this as they become documented
-bigdecimal/bigdecimal.c
-bigdecimal/lib
-coverage/coverage.c
-digest/digest.c
-etc/etc.c
-fcntl/fcntl.c
-gdbm/gdbm.c
+enumerator/enumerator.c
iconv/iconv.c
-io/wait/wait.c
-io/wait/lib
-json/ext/generator/generator.c
-json/ext/parser/parser.c
-json/lib
nkf/lib/kconv.rb
nkf/nkf.c
-objspace/objspace.c
-openssl/ossl.c
-openssl/ossl_asn1.c
-openssl/ossl_bn.c
-openssl/ossl_cipher.c
-openssl/ossl_config.c
-openssl/ossl_digest.c
-openssl/ossl_engine.c
-openssl/ossl_hmac.c
-openssl/ossl_ns_spki.c
-openssl/ossl_ocsp.c
-openssl/ossl_pkcs5.c
-openssl/ossl_pkcs7.c
-openssl/ossl_pkcs12.c
-openssl/ossl_pkey.c
-openssl/ossl_pkey_dh.c
-openssl/ossl_pkey_dsa.c
-openssl/ossl_pkey_ec.c
-openssl/ossl_pkey_rsa.c
-openssl/ossl_rand.c
-openssl/ossl_ssl.c
-openssl/ossl_ssl_session.c
-openssl/ossl_x509.c
-openssl/ossl_x509attr.c
-openssl/ossl_x509cert.c
-openssl/ossl_x509crl.c
-openssl/ossl_x509ext.c
-openssl/ossl_x509name.c
-openssl/ossl_x509req.c
-openssl/ossl_x509revoked.c
-openssl/ossl_x509store.c
-openssl/lib/openssl/buffering.rb
-pty/pty.c
-pty/lib
-readline/readline.c
-ripper/ripper.c
-ripper/lib
-socket/init.c
-socket/raddrinfo.c
-socket/basicsocket.c
-socket/ipsocket.c
-socket/tcpsocket.c
-socket/tcpserver.c
-socket/sockssocket.c
-socket/udpsocket.c
-socket/unixsocket.c
-socket/unixserver.c
socket/socket.c
-socket/option.c
-socket/ancdata.c
-socket/constants.c
-socket/constdefs.c
-socket/lib/socket.rb
stringio/stringio.c
strscan/strscan.c
win32ole
diff --git a/ext/Setup b/ext/Setup
index b0f29b9f7b..d0d6317a5e 100644
--- a/ext/Setup
+++ b/ext/Setup
@@ -10,23 +10,25 @@
#digest/sha1
#digest/sha2
#dl
+#enumerator
#etc
#fcntl
#gdbm
#iconv
#io/wait
#nkf
-#openssl
#pty
+#openssl
#racc/cparse
#readline
-#ripper
#sdbm
#socket
#stringio
#strscan
#syck
#syslog
+#tcltklib
+#thread
#tk
#win32ole
#zlib
diff --git a/ext/Setup.atheos b/ext/Setup.atheos
index 6e0b8ae5a6..6bda3a4cfb 100644
--- a/ext/Setup.atheos
+++ b/ext/Setup.atheos
@@ -17,17 +17,18 @@ gdbm
iconv
io/wait
nkf
-#openssl
pty
+#openssl
racc/parse
readline
-ripper
sdbm
socket
stringio
strscan
syck
syslog
+#tcltklib
+thread
#tk
#win32ole
zlib
diff --git a/ext/Setup.dj b/ext/Setup.dj
new file mode 100644
index 0000000000..4f94788886
--- /dev/null
+++ b/ext/Setup.dj
@@ -0,0 +1,34 @@
+option nodynamic
+
+#Win32API
+bigdecimal
+curses
+dbm
+digest
+digest/md5
+digest/rmd160
+digest/sha1
+digest/sha2
+#dl
+etc
+enumerator
+fcntl
+gdbm
+#iconv
+#io/wait
+nkf
+#pty
+#openssl
+racc/cparse
+readline
+sdbm
+#socket
+stringio
+strscan
+syck
+#syslog
+#tcltklib
+thread
+#tk
+#win32ole
+zlib
diff --git a/ext/Setup.emx b/ext/Setup.emx
index fade917e92..afc5923577 100644
--- a/ext/Setup.emx
+++ b/ext/Setup.emx
@@ -17,17 +17,18 @@ fcntl
#iconv
#io/wait
nkf
-#openssl
#pty
+#openssl
racc/cparse
#readline
-#ripper
#sdbm
socket
stringio
strscan
#syck
#syslog
+#tcltklib
+thread
#tk
#win32ole
#zlib
diff --git a/ext/Setup.nt b/ext/Setup.nt
index c8574ba70a..9f8abf9b8d 100644
--- a/ext/Setup.nt
+++ b/ext/Setup.nt
@@ -17,17 +17,18 @@ fcntl
#iconv
#io/wait
nkf
-#openssl
#pty
+#openssl
racc/cparse
#readline
-#ripper
sdbm
socket
stringio
strscan
syck
#syslog
+#tcltklib
+thread
#tk
win32ole
#zlib
diff --git a/ext/Setup.x68 b/ext/Setup.x68
new file mode 100644
index 0000000000..0966e737e9
--- /dev/null
+++ b/ext/Setup.x68
@@ -0,0 +1,34 @@
+option nodynamic
+
+#Win32API
+bigdecimal
+#curses
+dbm
+digest
+digest/md5
+digest/rmd160
+digest/sha1
+digest/sha2
+#dl
+#etc
+enumerator
+fcntl
+#gdbm
+#iconv
+#io/wait
+nkf
+#pty
+#openssl
+racc/cparse
+#readline
+#sdbm
+#socket
+stringio
+strscan
+#syck
+#syslog
+#tcltklib
+thread
+#tk
+#win32ole
+#zlib
diff --git a/ext/Win32API/.cvsignore b/ext/Win32API/.cvsignore
new file mode 100644
index 0000000000..90c83ed9b1
--- /dev/null
+++ b/ext/Win32API/.cvsignore
@@ -0,0 +1,3 @@
+Makefile
+*.log
+*.def
diff --git a/ext/Win32API/Win32API.c b/ext/Win32API/Win32API.c
new file mode 100644
index 0000000000..a4fd0396f0
--- /dev/null
+++ b/ext/Win32API/Win32API.c
@@ -0,0 +1,215 @@
+/*
+ Win32API - Ruby Win32 API Import Facility
+*/
+
+#if !defined _MSC_VER && !defined _WIN32
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include <stdio.h>
+#endif
+
+#define _T_VOID 0
+#define _T_NUMBER 1
+#define _T_POINTER 2
+#define _T_INTEGER 3
+
+#include "ruby.h"
+
+typedef struct {
+ HANDLE dll;
+ HANDLE proc;
+ VALUE dllname;
+ VALUE import;
+ VALUE export;
+} Win32API;
+
+static void
+Win32API_FreeLibrary(hdll)
+ HINSTANCE hdll;
+{
+ FreeLibrary(hdll);
+}
+
+static VALUE
+Win32API_initialize(self, dllname, proc, import, export)
+ VALUE self;
+ VALUE dllname;
+ VALUE proc;
+ VALUE import;
+ VALUE export;
+{
+ HANDLE hproc;
+ HINSTANCE hdll;
+ VALUE str;
+ VALUE a_import;
+ VALUE *ptr;
+ char *s;
+ int i;
+ int len;
+ int ex = _T_VOID;
+
+ SafeStringValue(dllname);
+ SafeStringValue(proc);
+ hdll = LoadLibrary(RSTRING(dllname)->ptr);
+ if (!hdll)
+ rb_raise(rb_eRuntimeError, "LoadLibrary: %s\n", RSTRING(dllname)->ptr);
+ rb_iv_set(self, "__hdll__", Data_Wrap_Struct(rb_cData, 0, Win32API_FreeLibrary, (void*)hdll));
+ hproc = (HANDLE)GetProcAddress(hdll, RSTRING(proc)->ptr);
+ if (!hproc) {
+ str = rb_str_new3(proc);
+ str = rb_str_cat(str, "A", 1);
+ hproc = (HANDLE)GetProcAddress(hdll, RSTRING(str)->ptr);
+ if (!hproc)
+ rb_raise(rb_eRuntimeError, "GetProcAddress: %s or %s\n",
+ RSTRING(proc)->ptr, RSTRING(str)->ptr);
+ }
+ rb_iv_set(self, "__dll__", UINT2NUM((unsigned long)hdll));
+ rb_iv_set(self, "__dllname__", dllname);
+ rb_iv_set(self, "__proc__", UINT2NUM((unsigned long)hproc));
+
+ a_import = rb_ary_new();
+ switch (TYPE(import)) {
+ case T_NIL:
+ break;
+ case T_ARRAY:
+ ptr = RARRAY(import)->ptr;
+ for (i = 0, len = RARRAY(import)->len; i < len; i++) {
+ SafeStringValue(ptr[i]);
+ switch (*(char *)RSTRING(ptr[i])->ptr) {
+ case 'N': case 'n': case 'L': case 'l':
+ rb_ary_push(a_import, INT2FIX(_T_NUMBER));
+ break;
+ case 'P': case 'p':
+ rb_ary_push(a_import, INT2FIX(_T_POINTER));
+ break;
+ case 'I': case 'i':
+ rb_ary_push(a_import, INT2FIX(_T_INTEGER));
+ break;
+ }
+ }
+ break;
+ default:
+ SafeStringValue(import);
+ s = RSTRING(import)->ptr;
+ for (i = 0, len = RSTRING(import)->len; i < len; i++) {
+ switch (*s++) {
+ case 'N': case 'n': case 'L': case 'l':
+ rb_ary_push(a_import, INT2FIX(_T_NUMBER));
+ break;
+ case 'P': case 'p':
+ rb_ary_push(a_import, INT2FIX(_T_POINTER));
+ break;
+ case 'I': case 'i':
+ rb_ary_push(a_import, INT2FIX(_T_INTEGER));
+ break;
+ }
+ }
+ break;
+ }
+
+ if (16 < RARRAY(a_import)->len) {
+ rb_raise(rb_eRuntimeError, "too many parameters: %ld\n", RARRAY(a_import)->len);
+ }
+
+ rb_iv_set(self, "__import__", a_import);
+
+ if (NIL_P(export)) {
+ ex = _T_VOID;
+ } else {
+ SafeStringValue(export);
+ switch (*RSTRING(export)->ptr) {
+ case 'V': case 'v':
+ ex = _T_VOID;
+ break;
+ case 'N': case 'n': case 'L': case 'l':
+ ex = _T_NUMBER;
+ break;
+ case 'P': case 'p':
+ ex = _T_POINTER;
+ break;
+ case 'I': case 'i':
+ ex = _T_INTEGER;
+ break;
+ }
+ }
+ rb_iv_set(self, "__export__", INT2FIX(ex));
+
+ return Qnil;
+}
+
+#ifdef _MSC_VER
+#pragma optimize("g", off)
+#endif
+static VALUE
+Win32API_Call(argc, argv, obj)
+ int argc;
+ VALUE *argv;
+ VALUE obj;
+{
+ VALUE args;
+ unsigned long ret;
+ int i;
+ struct {
+ unsigned long params[16];
+ } param;
+#define params param.params
+
+ VALUE obj_proc = rb_iv_get(obj, "__proc__");
+ VALUE obj_import = rb_iv_get(obj, "__import__");
+ VALUE obj_export = rb_iv_get(obj, "__export__");
+ FARPROC ApiFunction = (FARPROC)NUM2ULONG(obj_proc);
+ int items = rb_scan_args(argc, argv, "0*", &args);
+ int nimport = RARRAY(obj_import)->len;
+
+
+ if (items != nimport)
+ rb_raise(rb_eRuntimeError, "wrong number of parameters: expected %d, got %d",
+ nimport, items);
+
+ for (i = 0; i < nimport; i++) {
+ unsigned long lParam = 0;
+ switch (FIX2INT(rb_ary_entry(obj_import, i))) {
+ VALUE str;
+ case _T_NUMBER:
+ case _T_INTEGER:
+ default:
+ lParam = NUM2ULONG(rb_ary_entry(args, i));
+ break;
+ case _T_POINTER:
+ str = rb_ary_entry(args, i);
+ if (NIL_P(str)) {
+ lParam = 0;
+ } else if (FIXNUM_P(str)) {
+ lParam = NUM2ULONG(str);
+ } else {
+ StringValue(str);
+ rb_str_modify(str);
+ lParam = (unsigned long)StringValuePtr(str);
+ }
+ break;
+ }
+ params[i] = lParam;
+ }
+
+ ret = ApiFunction(param);
+
+ switch (FIX2INT(obj_export)) {
+ case _T_NUMBER:
+ case _T_INTEGER:
+ return INT2NUM(ret);
+ case _T_POINTER:
+ return rb_str_new2((char *)ret);
+ case _T_VOID:
+ default:
+ return INT2NUM(0);
+ }
+}
+
+void
+Init_Win32API()
+{
+ VALUE cWin32API = rb_define_class("Win32API", rb_cObject);
+ rb_define_method(cWin32API, "initialize", Win32API_initialize, 4);
+ rb_define_method(cWin32API, "call", Win32API_Call, -1);
+ rb_define_alias(cWin32API, "Call", "call");
+}
diff --git a/ext/Win32API/depend b/ext/Win32API/depend
new file mode 100644
index 0000000000..b224bb66c9
--- /dev/null
+++ b/ext/Win32API/depend
@@ -0,0 +1 @@
+Win32API.o : Win32API.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
diff --git a/ext/Win32API/extconf.rb b/ext/Win32API/extconf.rb
new file mode 100644
index 0000000000..865788556f
--- /dev/null
+++ b/ext/Win32API/extconf.rb
@@ -0,0 +1,6 @@
+require 'mkmf'
+
+dir_config("win32")
+if have_header("windows.h") and have_library("kernel32")
+ create_makefile("Win32API")
+end
diff --git a/ext/Win32API/getch.rb b/ext/Win32API/getch.rb
new file mode 100644
index 0000000000..c015bbe9bc
--- /dev/null
+++ b/ext/Win32API/getch.rb
@@ -0,0 +1,5 @@
+require 'Win32API'
+
+getch = Win32API.new("crtdll", "_getch", [], 'L')
+
+puts getch.Call.chr
diff --git a/ext/Win32API/lib/win32/registry.rb b/ext/Win32API/lib/win32/registry.rb
new file mode 100644
index 0000000000..9a2f3827b7
--- /dev/null
+++ b/ext/Win32API/lib/win32/registry.rb
@@ -0,0 +1,831 @@
+=begin
+= Win32 Registry I/F
+win32/registry is registry accessor library for Win32 platform.
+It uses Win32API to call Win32 Registry APIs.
+
+== example
+ Win32::Registry::HKEY_CURRENT_USER.open('SOFTWARE\foo') do |reg|
+ value = reg['foo'] # read a value
+ value = reg['foo', Win32::Registry::REG_SZ] # read a value with type
+ type, value = reg.read('foo') # read a value
+ reg['foo'] = 'bar' # write a value
+ reg['foo', Win32::Registry::REG_SZ] = 'bar' # write a value with type
+ reg.write('foo', Win32::Registry::REG_SZ, 'bar') # write a value
+
+ reg.each_value { |name, type, data| ... } # Enumerate values
+ reg.each_key { |key, wtime| ... } # Enumerate subkeys
+
+ reg.delete_value(name) # Delete a value
+ reg.delete_key(name) # Delete a subkey
+ reg.delete_key(name, true) # Delete a subkey recursively
+ end
+
+= Reference
+
+== Win32::Registry class
+
+=== including modules
+
+* Enumerable
+* Registry::Constants
+
+=== class methods
+--- Registry.open(key, subkey, desired = KEY_READ, opt = REG_OPTION_RESERVED)
+--- Registry.open(key, subkey, desired = KEY_READ, opt = REG_OPTION_RESERVED) { |reg| ... }
+ Open the registry key ((|subkey|)) under ((|key|)).
+ ((|key|)) is Win32::Registry object of parent key.
+ You can use predefined key HKEY_* (see ((<constants>)))
+
+ ((|desired|)) and ((|opt|)) is access mask and key option.
+ For detail, see ((<MSDN Library|URL:http://msdn.microsoft.com/library/en-us/sysinfo/base/regopenkeyex.asp>)).
+
+ If block is given, the key is closed automatically.
+
+--- Registry.create(key, subkey, desired = KEY_ALL_ACCESS, opt = REG_OPTION_RESERVED)
+--- Registry.create(key, subkey, desired = KEY_ALL_ACCESS, opt = REG_OPTION_RESERVED) { |reg| ... }
+ Create or open the registry key ((|subkey|)) under ((|key|)).
+ You can use predefined key HKEY_* (see ((<constants>)))
+
+ If subkey is already exists, key is opened and Registry#((<created?>))
+ method will return false.
+
+ If block is given, the key is closed automatically.
+
+--- Registry.expand_environ(str)
+ Replace (({%\w+%})) into the environment value of ((|str|)).
+ This method is used for REG_EXPAND_SZ.
+
+ For detail, see ((<ExpandEnvironmentStrings|URL:http://msdn.microsoft.com/library/en-us/sysinfo/base/expandenvironmentstrings.asp>)) Win32 API.
+
+--- Registry.type2name(type)
+ Convert registry type value to readable string.
+
+--- Registry.wtime2time(wtime)
+ Convert 64-bit FILETIME integer into Time object.
+
+--- Registry.time2wtime(time)
+ Convert Time object or Integer object into 64-bit FILETIME.
+
+=== instance methods
+--- open(subkey, desired = KEY_READ, opt = REG_OPTION_RESERVED)
+ Same as (({Win32::((<Registry.open>))(self, subkey, desired, opt)}))
+
+--- create(subkey, desired = KEY_ALL_ACCESS, opt = REG_OPTION_RESERVED)
+ Same as (({Win32::((<Registry.create>))(self, subkey, desired, opt)}))
+
+--- close
+ Close key.
+
+ After closed, most method raises error.
+
+--- read(name, *rtype)
+ Read a registry value named ((|name|)) and return array of
+ [ ((|type|)), ((|data|)) ].
+ When name is nil, the `default' value is read.
+
+ ((|type|)) is value type. (see ((<Win32::Registry::Constants module>)))
+ ((|data|)) is value data, its class is:
+ :REG_SZ, REG_EXPAND_SZ
+ String
+ :REG_MULTI_SZ
+ Array of String
+ :REG_DWORD, REG_DWORD_BIG_ENDIAN, REG_QWORD
+ Integer
+ :REG_BINARY
+ String (contains binary data)
+
+ When ((|rtype|)) is specified, the value type must be included by
+ ((|rtype|)) array, or TypeError is raised.
+
+--- self[name, *rtype]
+ Read a registry value named ((|name|)) and return its value data.
+ The class of value is same as ((<read>)) method returns.
+
+ If the value type is REG_EXPAND_SZ, returns value data whose environment
+ variables are replaced.
+ If the value type is neither REG_SZ, REG_MULTI_SZ, REG_DWORD,
+ REG_DWORD_BIG_ENDIAN, nor REG_QWORD, TypeError is raised.
+
+ The meaning of ((|rtype|)) is same as ((<read>)) method.
+
+--- read_s(name)
+--- read_i(name)
+--- read_bin(name)
+ Read a REG_SZ(read_s), REG_DWORD(read_i), or REG_BINARY(read_bin)
+ registry value named ((|name|)).
+
+ If the values type does not match, TypeError is raised.
+
+--- read_s_expand(name)
+ Read a REG_SZ or REG_EXPAND_SZ registry value named ((|name|)).
+
+ If the value type is REG_EXPAND_SZ, environment variables are replaced.
+ Unless the value type is REG_SZ or REG_EXPAND_SZ, TypeError is raised.
+
+--- write(name, type, data)
+ Write ((|data|)) to a registry value named ((|name|)).
+ When name is nil, write to the `default' value.
+
+ ((|type|)) is type value. (see ((<Registry::Constants module>)))
+ Class of ((|data|)) must be same as which ((<read>))
+ method returns.
+
+--- self[name, wtype = nil] = value
+ Write ((|value|)) to a registry value named ((|name|)).
+
+ If ((|wtype|)) is specified, the value type is it.
+ Otherwise, the value type is depend on class of ((|value|)):
+ :Integer
+ REG_DWORD
+ :String
+ REG_SZ
+ :Array
+ REG_MULTI_SZ
+
+--- write_s(name, value)
+--- write_i(name, value)
+--- write_bin(name, value)
+ Write ((|value|)) to a registry value named ((|name|)).
+
+ The value type is REG_SZ(write_s), REG_DWORD(write_i), or
+ REG_BINARY(write_bin).
+
+--- each { |name, type, value| ... }
+--- each_value { |name, type, value| ... }
+ Enumerate values.
+
+--- each_key { |subkey, wtime| ... }
+ Enumerate subkeys.
+
+ ((|subkey|)) is String which contains name of subkey.
+ ((|wtime|)) is last write time as FILETIME (64-bit integer).
+ (see ((<Registry.wtime2time>)))
+
+--- delete(name)
+--- delete_value(name)
+ Delete a registry value named ((|name|)).
+ We can not delete the `default' value.
+
+--- delete_key(name, recursive = false)
+ Delete a subkey named ((|name|)) and all its values.
+
+ If ((|recursive|)) is false, the subkey must not have subkeys.
+ Otherwise, this method deletes all subkeys and values recursively.
+
+--- flush
+ Write all the attributes into the registry file.
+
+--- created?
+ Returns if key is created ((*newly*)).
+ (see ((<Registry.create>)))
+
+--- open?
+ Returns if key is not closed.
+
+--- hkey
+ Returns key handle value.
+
+--- parent
+ Win32::Registry object of parent key, or nil if predefeined key.
+
+--- keyname
+ Same as ((|subkey|)) value of ((<Registry.open>)) or
+ ((<Registry.create>)) method.
+
+--- disposition
+ Disposition value (REG_CREATED_NEW_KEY or REG_OPENED_EXISTING_KEY).
+
+--- name
+--- to_s
+ Full path of key such as (({'HKEY_CURRENT_USER\SOFTWARE\foo\bar'})).
+
+--- info
+ Returns key information as Array of:
+ :num_keys
+ The number of subkeys.
+ :max_key_length
+ Maximum length of name of subkeys.
+ :num_values
+ The number of values.
+ :max_value_name_length
+ Maximum length of name of values.
+ :max_value_length
+ Maximum length of value of values.
+ :descriptor_length
+ Length of security descriptor.
+ :wtime
+ Last write time as FILETIME(64-bit integer)
+
+ For detail, see ((<RegQueryInfoKey|URL:http://msdn.microsoft.com/library/en-us/sysinfo/base/regqueryinfokey.asp>)) Win32 API.
+
+--- num_keys
+--- max_key_length
+--- num_values
+--- max_value_name_length
+--- max_value_length
+--- descriptor_length
+--- wtime
+ Returns an item of key information.
+
+=== constants
+--- HKEY_CLASSES_ROOT
+--- HKEY_CURRENT_USER
+--- HKEY_LOCAL_MACHINE
+--- HKEY_PERFORMANCE_DATA
+--- HKEY_CURRENT_CONFIG
+--- HKEY_DYN_DATA
+ Win32::Registry object whose key is predefined key.
+ For detail, see ((<MSDN Library|URL:http://msdn.microsoft.com/library/en-us/sysinfo/base/predefined_keys.asp>)).
+
+== Win32::Registry::Constants module
+
+For detail, see ((<MSDN Library|URL:http://msdn.microsoft.com/library/en-us/sysinfo/base/registry.asp>)).
+
+--- HKEY_*
+ Predefined key ((*handle*)).
+ These are Integer, not Win32::Registry.
+
+--- REG_*
+ Registry value type.
+
+--- KEY_*
+ Security access mask.
+
+--- KEY_OPTIONS_*
+ Key options.
+
+--- REG_CREATED_NEW_KEY
+--- REG_OPENED_EXISTING_KEY
+ If the key is created newly or opened existing key.
+ See also Registry#((<disposition>)) method.
+
+=end
+
+require 'Win32API'
+
+module Win32
+ class Registry
+ module Constants
+ HKEY_CLASSES_ROOT = 0x80000000
+ HKEY_CURRENT_USER = 0x80000001
+ HKEY_LOCAL_MACHINE = 0x80000002
+ HKEY_USERS = 0x80000003
+ HKEY_PERFORMANCE_DATA = 0x80000004
+ HKEY_PERFORMANCE_TEXT = 0x80000050
+ HKEY_PERFORMANCE_NLSTEXT = 0x80000060
+ HKEY_CURRENT_CONFIG = 0x80000005
+ HKEY_DYN_DATA = 0x80000006
+
+ REG_NONE = 0
+ REG_SZ = 1
+ REG_EXPAND_SZ = 2
+ REG_BINARY = 3
+ REG_DWORD = 4
+ REG_DWORD_LITTLE_ENDIAN = 4
+ REG_DWORD_BIG_ENDIAN = 5
+ REG_LINK = 6
+ REG_MULTI_SZ = 7
+ REG_RESOURCE_LIST = 8
+ REG_FULL_RESOURCE_DESCRIPTOR = 9
+ REG_RESOURCE_REQUIREMENTS_LIST = 10
+ REG_QWORD = 11
+ REG_QWORD_LITTLE_ENDIAN = 11
+
+ STANDARD_RIGHTS_READ = 0x00020000
+ STANDARD_RIGHTS_WRITE = 0x00020000
+ KEY_QUERY_VALUE = 0x0001
+ KEY_SET_VALUE = 0x0002
+ KEY_CREATE_SUB_KEY = 0x0004
+ KEY_ENUMERATE_SUB_KEYS = 0x0008
+ KEY_NOTIFY = 0x0010
+ KEY_CREATE_LINK = 0x0020
+ KEY_READ = STANDARD_RIGHTS_READ |
+ KEY_QUERY_VALUE | KEY_ENUMERATE_SUB_KEYS | KEY_NOTIFY
+ KEY_WRITE = STANDARD_RIGHTS_WRITE |
+ KEY_SET_VALUE | KEY_CREATE_SUB_KEY
+ KEY_EXECUTE = KEY_READ
+ KEY_ALL_ACCESS = KEY_READ | KEY_WRITE | KEY_CREATE_LINK
+
+ REG_OPTION_RESERVED = 0x0000
+ REG_OPTION_NON_VOLATILE = 0x0000
+ REG_OPTION_VOLATILE = 0x0001
+ REG_OPTION_CREATE_LINK = 0x0002
+ REG_OPTION_BACKUP_RESTORE = 0x0004
+ REG_OPTION_OPEN_LINK = 0x0008
+ REG_LEGAL_OPTION = REG_OPTION_RESERVED |
+ REG_OPTION_NON_VOLATILE | REG_OPTION_CREATE_LINK |
+ REG_OPTION_BACKUP_RESTORE | REG_OPTION_OPEN_LINK
+
+ REG_CREATED_NEW_KEY = 1
+ REG_OPENED_EXISTING_KEY = 2
+
+ REG_WHOLE_HIVE_VOLATILE = 0x0001
+ REG_REFRESH_HIVE = 0x0002
+ REG_NO_LAZY_FLUSH = 0x0004
+ REG_FORCE_RESTORE = 0x0008
+
+ MAX_KEY_LENGTH = 514
+ MAX_VALUE_LENGTH = 32768
+ end
+ include Constants
+ include Enumerable
+
+ #
+ # Error
+ #
+ class Error < ::StandardError
+ FormatMessageA = Win32API.new('kernel32.dll', 'FormatMessageA', 'LPLLPLP', 'L')
+ def initialize(code)
+ @code = code
+ msg = "\0" * 1024
+ len = FormatMessageA.call(0x1200, 0, code, 0, msg, 1024, 0)
+ super msg[0, len].tr("\r", '').chomp
+ end
+ attr_reader :code
+ end
+
+ #
+ # Predefined Keys
+ #
+ class PredefinedKey < Registry
+ def initialize(hkey, keyname)
+ @hkey = hkey
+ @parent = nil
+ @keyname = keyname
+ @disposition = REG_OPENED_EXISTING_KEY
+ end
+
+ # Predefined keys cannot be closed
+ def close
+ raise Error.new(5) ## ERROR_ACCESS_DENIED
+ end
+
+ # Fake class for Registry#open, Registry#create
+ def class
+ Registry
+ end
+
+ # Make all
+ Constants.constants.grep(/^HKEY_/) do |c|
+ Registry.const_set c, new(Constants.const_get(c), c)
+ end
+ end
+
+ #
+ # Win32 APIs
+ #
+ module API
+ [
+ %w/RegOpenKeyExA LPLLP L/,
+ %w/RegCreateKeyExA LPLLLLPPP L/,
+ %w/RegEnumValueA LLPPPPPP L/,
+ %w/RegEnumKeyExA LLPPLLLP L/,
+ %w/RegQueryValueExA LPLPPP L/,
+ %w/RegSetValueExA LPLLPL L/,
+ %w/RegDeleteValue LP L/,
+ %w/RegDeleteKey LP L/,
+ %w/RegFlushKey L L/,
+ %w/RegCloseKey L L/,
+ %w/RegQueryInfoKey LPPPPPPPPPPP L/,
+ ].each do |fn|
+ const_set fn[0].intern, Win32API.new('advapi32.dll', *fn)
+ end
+
+ module_function
+
+ def check(result)
+ raise Error, result, caller(2) if result != 0
+ end
+
+ def packdw(dw)
+ [dw].pack('V')
+ end
+
+ def unpackdw(dw)
+ dw += [0].pack('V')
+ dw.unpack('V')[0]
+ end
+
+ def packqw(qw)
+ [ qw & 0xFFFFFFFF, qw >> 32 ].pack('VV')
+ end
+
+ def unpackqw(qw)
+ qw = qw.unpack('VV')
+ (qw[1] << 32) | qw[0]
+ end
+
+ def OpenKey(hkey, name, opt, desired)
+ result = packdw(0)
+ check RegOpenKeyExA.call(hkey, name, opt, desired, result)
+ unpackdw(result)
+ end
+
+ def CreateKey(hkey, name, opt, desired)
+ result = packdw(0)
+ disp = packdw(0)
+ check RegCreateKeyExA.call(hkey, name, 0, 0, opt, desired,
+ 0, result, disp)
+ [ unpackdw(result), unpackdw(disp) ]
+ end
+
+ def EnumValue(hkey, index)
+ name = ' ' * Constants::MAX_KEY_LENGTH
+ size = packdw(Constants::MAX_KEY_LENGTH)
+ check RegEnumValueA.call(hkey, index, name, size, 0, 0, 0, 0)
+ name[0, unpackdw(size)]
+ end
+
+ def EnumKey(hkey, index)
+ name = ' ' * Constants::MAX_KEY_LENGTH
+ size = packdw(Constants::MAX_KEY_LENGTH)
+ wtime = ' ' * 8
+ check RegEnumKeyExA.call(hkey, index, name, size, 0, 0, 0, wtime)
+ [ name[0, unpackdw(size)], unpackqw(wtime) ]
+ end
+
+ def QueryValue(hkey, name)
+ type = packdw(0)
+ size = packdw(0)
+ check RegQueryValueExA.call(hkey, name, 0, type, 0, size)
+ data = ' ' * unpackdw(size)
+ check RegQueryValueExA.call(hkey, name, 0, type, data, size)
+ [ unpackdw(type), data[0, unpackdw(size)] ]
+ end
+
+ def SetValue(hkey, name, type, data, size)
+ check RegSetValueExA.call(hkey, name, 0, type, data, size)
+ end
+
+ def DeleteValue(hkey, name)
+ check RegDeleteValue.call(hkey, name)
+ end
+
+ def DeleteKey(hkey, name)
+ check RegDeleteKey.call(hkey, name)
+ end
+
+ def FlushKey(hkey)
+ check RegFlushKey.call(hkey)
+ end
+
+ def CloseKey(hkey)
+ check RegCloseKey.call(hkey)
+ end
+
+ def QueryInfoKey(hkey)
+ subkeys = packdw(0)
+ maxsubkeylen = packdw(0)
+ values = packdw(0)
+ maxvaluenamelen = packdw(0)
+ maxvaluelen = packdw(0)
+ secdescs = packdw(0)
+ wtime = ' ' * 8
+ check RegQueryInfoKey.call(hkey, 0, 0, 0, subkeys, maxsubkeylen, 0,
+ values, maxvaluenamelen, maxvaluelen, secdescs, wtime)
+ [ unpackdw(subkeys), unpackdw(maxsubkeylen), unpackdw(values),
+ unpackdw(maxvaluenamelen), unpackdw(maxvaluelen),
+ unpackdw(secdescs), unpackqw(wtime) ]
+ end
+ end
+
+ #
+ # utility functions
+ #
+ def self.expand_environ(str)
+ str.gsub(/%([^%]+)%/) { ENV[$1] || ENV[$1.upcase] || $& }
+ end
+
+ @@type2name = { }
+ %w[
+ REG_NONE REG_SZ REG_EXPAND_SZ REG_BINARY REG_DWORD
+ REG_DWORD_BIG_ENDIAN REG_LINK REG_MULTI_SZ
+ REG_RESOURCE_LIST REG_FULL_RESOURCE_DESCRIPTOR
+ REG_RESOURCE_REQUIREMENTS_LIST REG_QWORD
+ ].each do |type|
+ @@type2name[Constants.const_get(type)] = type
+ end
+
+ def self.type2name(type)
+ @@type2name[type] || type.to_s
+ end
+
+ def self.wtime2time(wtime)
+ Time.at((wtime - 116444736000000000) / 10000000)
+ end
+
+ def self.time2wtime(time)
+ time.to_i * 10000000 + 116444736000000000
+ end
+
+ #
+ # constructors
+ #
+ private_class_method :new
+
+ def self.open(hkey, subkey, desired = KEY_READ, opt = REG_OPTION_RESERVED)
+ subkey = subkey.chomp('\\')
+ newkey = API.OpenKey(hkey.hkey, subkey, opt, desired)
+ obj = new(newkey, hkey, subkey, REG_OPENED_EXISTING_KEY)
+ if block_given?
+ begin
+ yield obj
+ ensure
+ obj.close
+ end
+ else
+ obj
+ end
+ end
+
+ def self.create(hkey, subkey, desired = KEY_ALL_ACCESS, opt = REG_OPTION_RESERVED)
+ newkey, disp = API.CreateKey(hkey.hkey, subkey, opt, desired)
+ obj = new(newkey, hkey, subkey, disp)
+ if block_given?
+ begin
+ yield obj
+ ensure
+ obj.close
+ end
+ else
+ obj
+ end
+ end
+
+ #
+ # finalizer
+ #
+ @@final = proc { |hkey| proc { API.CloseKey(hkey[0]) if hkey[0] } }
+
+ #
+ # initialize
+ #
+ def initialize(hkey, parent, keyname, disposition)
+ @hkey = hkey
+ @parent = parent
+ @keyname = keyname
+ @disposition = disposition
+ @hkeyfinal = [ hkey ]
+ ObjectSpace.define_finalizer self, @@final.call(@hkeyfinal)
+ end
+ attr_reader :hkey, :parent, :keyname, :disposition
+
+ #
+ # attributes
+ #
+ def created?
+ @disposition == REG_CREATED_NEW_KEY
+ end
+
+ def open?
+ !@hkey.nil?
+ end
+
+ def name
+ parent = self
+ name = @keyname
+ while parent = parent.parent
+ name = parent.keyname + '\\' + name
+ end
+ name
+ end
+
+ def inspect
+ "\#<Win32::Registry key=#{name.inspect}>"
+ end
+
+ #
+ # marshalling
+ #
+ def _dump(depth)
+ raise TypeError, "can't dump Win32::Registry"
+ end
+
+ #
+ # open/close
+ #
+ def open(subkey, desired = KEY_READ, opt = REG_OPTION_RESERVED, &blk)
+ self.class.open(self, subkey, desired, opt, &blk)
+ end
+
+ def create(subkey, desired = KEY_ALL_ACCESS, opt = REG_OPTION_RESERVED, &blk)
+ self.class.create(self, subkey, desired, opt, &blk)
+ end
+
+ def close
+ API.CloseKey(@hkey)
+ @hkey = @parent = @keyname = nil
+ @hkeyfinal[0] = nil
+ end
+
+ #
+ # iterator
+ #
+ def each_value
+ index = 0
+ while true
+ begin
+ subkey = API.EnumValue(@hkey, index)
+ rescue Error
+ break
+ end
+ begin
+ type, data = read(subkey)
+ rescue Error
+ next
+ end
+ yield subkey, type, data
+ index += 1
+ end
+ index
+ end
+ alias each each_value
+
+ def each_key
+ index = 0
+ while true
+ begin
+ subkey, wtime = API.EnumKey(@hkey, index)
+ rescue Error
+ break
+ end
+ yield subkey, wtime
+ index += 1
+ end
+ index
+ end
+
+ def keys
+ keys_ary = []
+ each_key { |key,| keys_ary << key }
+ keys_ary
+ end
+
+ #
+ # reader
+ #
+ def read(name, *rtype)
+ type, data = API.QueryValue(@hkey, name)
+ unless rtype.empty? or rtype.include?(type)
+ raise TypeError, "Type mismatch (expect #{rtype.inspect} but #{type} present)"
+ end
+ case type
+ when REG_SZ, REG_EXPAND_SZ
+ [ type, data.chop ]
+ when REG_MULTI_SZ
+ [ type, data.split(/\0/) ]
+ when REG_BINARY
+ [ type, data ]
+ when REG_DWORD
+ [ type, API.unpackdw(data) ]
+ when REG_DWORD_BIG_ENDIAN
+ [ type, data.unpack('N')[0] ]
+ when REG_QWORD
+ [ type, API.unpackqw(data) ]
+ else
+ raise TypeError, "Type #{type} is not supported."
+ end
+ end
+
+ def [](name, *rtype)
+ type, data = read(name, *rtype)
+ case type
+ when REG_SZ, REG_DWORD, REG_QWORD, REG_MULTI_SZ
+ data
+ when REG_EXPAND_SZ
+ Registry.expand_environ(data)
+ else
+ raise TypeError, "Type #{type} is not supported."
+ end
+ end
+
+ def read_s(name)
+ read(name, REG_SZ)[1]
+ end
+
+ def read_s_expand(name)
+ type, data = read(name, REG_SZ, REG_EXPAND_SZ)
+ if type == REG_EXPAND_SZ
+ Registry.expand_environ(data)
+ else
+ data
+ end
+ end
+
+ def read_i(name)
+ read(name, REG_DWORD, REG_DWORD_BIG_ENDIAN, REG_QWORD)[1]
+ end
+
+ def read_bin(name)
+ read(name, REG_BINARY)[1]
+ end
+
+ #
+ # writer
+ #
+ def write(name, type, data)
+ case type
+ when REG_SZ, REG_EXPAND_SZ
+ data = data.to_s + "\0"
+ when REG_MULTI_SZ
+ data = data.to_a.join("\0") + "\0\0"
+ when REG_BINARY
+ data = data.to_s
+ when REG_DWORD
+ data = API.packdw(data.to_i)
+ when REG_DWORD_BIG_ENDIAN
+ data = [data.to_i].pack('N')
+ when REG_QWORD
+ data = API.packqw(data.to_i)
+ else
+ raise TypeError, "Unsupported type #{type}"
+ end
+ API.SetValue(@hkey, name, type, data, data.length)
+ end
+
+ def []=(name, rtype, value = nil)
+ if value
+ write name, rtype, value
+ else
+ case value = rtype
+ when Integer
+ write name, REG_DWORD, value
+ when String
+ write name, REG_SZ, value
+ when Array
+ write name, REG_MULTI_SZ, value
+ else
+ raise TypeError, "Unexpected type #{value.class}"
+ end
+ end
+ value
+ end
+
+ def write_s(name, value)
+ write name, REG_SZ, value.to_s
+ end
+
+ def write_i(name, value)
+ write name, REG_DWORD, value.to_i
+ end
+
+ def write_bin(name, value)
+ write name, REG_BINARY, value.to_s
+ end
+
+ #
+ # delete
+ #
+ def delete_value(name)
+ API.DeleteValue(@hkey, name)
+ end
+ alias delete delete_value
+
+ def delete_key(name, recursive = false)
+ if recursive
+ open(name, KEY_ALL_ACCESS) do |reg|
+ reg.keys.each do |key|
+ begin
+ reg.delete_key(key, true)
+ rescue Error
+ #
+ end
+ end
+ end
+ API.DeleteKey(@hkey, name)
+ else
+ begin
+ API.EnumKey @hkey, 0
+ rescue Error
+ return API.DeleteKey(@hkey, name)
+ end
+ raise Error.new(5) ## ERROR_ACCESS_DENIED
+ end
+ end
+
+ #
+ # flush
+ #
+ def flush
+ API.FlushKey @hkey
+ end
+
+ #
+ # key information
+ #
+ def info
+ API.QueryInfoKey(@hkey)
+ end
+ %w[
+ num_keys max_key_length
+ num_values max_value_name_length max_value_length
+ descriptor_length wtime
+ ].each_with_index do |s, i|
+ eval <<-__END__
+ def #{s}
+ info[#{i}]
+ end
+ __END__
+ end
+ end
+end
diff --git a/ext/Win32API/lib/win32/resolv.rb b/ext/Win32API/lib/win32/resolv.rb
new file mode 100644
index 0000000000..92336fac28
--- /dev/null
+++ b/ext/Win32API/lib/win32/resolv.rb
@@ -0,0 +1,366 @@
+=begin
+= Win32 DNS and DHCP I/F
+
+=end
+
+require 'win32/registry'
+
+module Win32
+ module Resolv
+ API = Registry::API
+
+ def self.get_hosts_path
+ path = get_hosts_dir
+ path = File.expand_path('hosts', path)
+ File.exist?(path) ? path : nil
+ end
+
+ def self.get_resolv_info
+ search, nameserver = get_info
+ if search.empty?
+ search = nil
+ else
+ search.delete("")
+ search.uniq!
+ end
+ if nameserver.empty?
+ nameserver = nil
+ else
+ nameserver.delete("")
+ nameserver.delete("0.0.0.0")
+ nameserver.uniq!
+ end
+ [ search, nameserver ]
+ end
+
+getv = Win32API.new('kernel32.dll', 'GetVersionExA', 'P', 'L')
+info = [ 148, 0, 0, 0, 0 ].pack('V5') + "\0" * 128
+getv.call(info)
+if info.unpack('V5')[4] == 2 # VER_PLATFORM_WIN32_NT
+#====================================================================
+# Windows NT
+#====================================================================
+ module_eval <<-'__EOS__', __FILE__, __LINE__+1
+ TCPIP_NT = 'SYSTEM\CurrentControlSet\Services\Tcpip\Parameters'
+
+ class << self
+ private
+ def get_hosts_dir
+ Registry::HKEY_LOCAL_MACHINE.open(TCPIP_NT) do |reg|
+ reg.read_s_expand('DataBasePath')
+ end
+ end
+
+ def get_info
+ search = nil
+ nameserver = []
+ Registry::HKEY_LOCAL_MACHINE.open(TCPIP_NT) do |reg|
+ begin
+ slist = reg.read_s('SearchList')
+ search = slist.split(/,\s*/) unless slist.empty?
+ rescue Registry::Error
+ end
+
+ if add_search = search.nil?
+ search = []
+ begin
+ nvdom = reg.read_s('NV Domain')
+ unless nvdom.empty?
+ @search = [ nvdom ]
+ if reg.read_i('UseDomainNameDevolution') != 0
+ if /^[\w\d]+\./ =~ nvdom
+ devo = $'
+ end
+ end
+ end
+ rescue Registry::Error
+ end
+ end
+
+ reg.open('Interfaces') do |reg|
+ reg.each_key do |iface,|
+ reg.open(iface) do |regif|
+ begin
+ [ 'NameServer', 'DhcpNameServer' ].each do |key|
+ ns = regif.read_s(key)
+ unless ns.empty?
+ nameserver.concat(ns.split(/[,\s]\s*/))
+ break
+ end
+ end
+ rescue Registry::Error
+ end
+
+ if add_search
+ begin
+ [ 'Domain', 'DhcpDomain' ].each do |key|
+ dom = regif.read_s(key)
+ unless dom.empty?
+ search.concat(dom.split(/,\s*/))
+ break
+ end
+ end
+ rescue Registry::Error
+ end
+ end
+ end
+ end
+ end
+ search << devo if add_search and devo
+ end
+ [ search.uniq, nameserver.uniq ]
+ end
+ end
+ __EOS__
+else
+#====================================================================
+# Windows 9x
+#====================================================================
+ module_eval <<-'__EOS__', __FILE__, __LINE__+1
+ TCPIP_9X = 'SYSTEM\CurrentControlSet\Services\VxD\MSTCP'
+ DHCP_9X = 'SYSTEM\CurrentControlSet\Services\VxD\DHCP'
+ WINDOWS = 'Software\Microsoft\Windows\CurrentVersion'
+
+ class << self
+ # private
+
+ def get_hosts_dir
+ Registry::HKEY_LOCAL_MACHINE.open(WINDOWS) do |reg|
+ reg.read_s_expand('SystemRoot')
+ end
+ end
+
+ def get_info
+ search = []
+ nameserver = []
+ begin
+ Registry::HKEY_LOCAL_MACHINE.open(TCPIP_9X) do |reg|
+ if reg.read_s("EnableDNS") == "1"
+ domain = reg.read_s("Domain")
+ ns = reg.read_s("NameServer")
+ slist = reg.read_s("SearchList")
+ search << domain unless domain.empty?
+ search.concat(slist.split(/,\s*/))
+ nameserver.concat(ns.split(/[,\s]\s*/))
+ end
+ end
+ rescue Registry::Error
+ end
+
+ dhcpinfo = get_dhcpinfo
+ search.concat(dhcpinfo[0])
+ nameserver.concat(dhcpinfo[1])
+ [ search, nameserver ]
+ end
+
+ def get_dhcpinfo
+ macaddrs = {}
+ ipaddrs = {}
+ WsControl.get_iflist.each do |index, macaddr, *ipaddr|
+ macaddrs[macaddr] = 1
+ ipaddr.each { |ipaddr| ipaddrs[ipaddr] = 1 }
+ end
+ iflist = [ macaddrs, ipaddrs ]
+
+ search = []
+ nameserver = []
+ version = -1
+ Registry::HKEY_LOCAL_MACHINE.open(DHCP_9X) do |reg|
+ begin
+ version = API.unpackdw(reg.read_bin("Version"))
+ rescue Registry::Error
+ end
+
+ reg.each_key do |key,|
+ catch(:not_used) do
+ reg.open(key) do |regdi|
+ dom, ns = get_dhcpinfo_key(version, regdi, iflist)
+ search << dom if dom
+ nameserver.concat(ns) if ns
+ end
+ end
+ end
+ end
+ [ search, nameserver ]
+ end
+
+ def get_dhcpinfo_95(reg)
+ dhcp = reg.read_bin("DhcpInfo")
+ [
+ API.unpackdw(dhcp[4..7]),
+ API.unpackdw(dhcp[8..11]),
+ 1,
+ dhcp[45..50],
+ reg.read_bin("OptionInfo"),
+ ]
+ end
+
+ def get_dhcpinfo_98(reg)
+ [
+ API.unpackdw(reg.read_bin("DhcpIPAddress")),
+ API.unpackdw(reg.read_bin("DhcpSubnetMask")),
+ API.unpackdw(reg.read_bin("HardwareType")),
+ reg.read_bin("HardwareAddress"),
+ reg.read_bin("OptionInfo"),
+ ]
+ end
+
+ def get_dhcpinfo_key(version, reg, iflist)
+ info = case version
+ when 1
+ get_dhcpinfo_95(reg)
+ when 2
+ get_dhcpinfo_98(reg)
+ else
+ begin
+ get_dhcpinfo_98(reg)
+ rescue Registry::Error
+ get_dhcpinfo_95(reg)
+ end
+ end
+ ipaddr, netmask, hwtype, macaddr, opt = info
+ throw :not_used unless
+ ipaddr and ipaddr != 0 and
+ netmask and netmask != 0 and
+ macaddr and macaddr.size == 6 and
+ hwtype == 1 and
+ iflist[0][macaddr] and iflist[1][ipaddr]
+
+ size = opt.size
+ idx = 0
+ while idx <= size
+ opttype = opt[idx]
+ optsize = opt[idx + 1]
+ optval = opt[idx + 2, optsize]
+ case opttype
+ when 0xFF ## term
+ break
+ when 0x0F ## domain
+ domain = optval.chomp("\0")
+ when 0x06 ## dns
+ nameserver = optval.scan(/..../).collect { |addr|
+ "%d.%d.%d.%d" % addr.unpack('C4')
+ }
+ end
+ idx += optsize + 2
+ end
+ [ domain, nameserver ]
+ rescue Registry::Error
+ throw :not_used
+ end
+ end
+
+ module WsControl
+ WsControl = Win32API.new('wsock32.dll', 'WsControl', 'LLPPPP', 'L')
+ WSAGetLastError = Win32API.new('wsock32.dll', 'WSAGetLastError', 'V', 'L')
+
+ MAX_TDI_ENTITIES = 512
+ IPPROTO_TCP = 6
+ WSCTL_TCP_QUERY_INFORMATION = 0
+ INFO_CLASS_GENERIC = 0x100
+ INFO_CLASS_PROTOCOL = 0x200
+ INFO_TYPE_PROVIDER = 0x100
+ ENTITY_LIST_ID = 0
+ GENERIC_ENTITY = 0
+ CL_NL_ENTITY = 0x301
+ IF_ENTITY = 0x200
+ ENTITY_TYPE_ID = 1
+ CL_NL_IP = 0x303
+ IF_MIB = 0x202
+ IF_MIB_STATS_ID = 1
+ IP_MIB_ADDRTABLE_ENTRY_ID = 0x102
+
+ def self.wsctl(tei_entity, tei_instance,
+ toi_class, toi_type, toi_id,
+ buffsize)
+ reqinfo = [
+ ## TDIEntityID
+ tei_entity, tei_instance,
+ ## TDIObjectID
+ toi_class, toi_type, toi_id,
+ ## TCP_REQUEST_INFORMATION_EX
+ ""
+ ].pack('VVVVVa16')
+ reqsize = API.packdw(reqinfo.size)
+ buff = "\0" * buffsize
+ buffsize = API.packdw(buffsize)
+ result = WsControl.call(
+ IPPROTO_TCP,
+ WSCTL_TCP_QUERY_INFORMATION,
+ reqinfo, reqsize,
+ buff, buffsize)
+ if result != 0
+ raise RuntimeError, "WsControl failed.(#{result})"
+ end
+ [ buff, API.unpackdw(buffsize) ]
+ end
+ private_class_method :wsctl
+
+ def self.get_iflist
+ # Get TDI Entity List
+ entities, size =
+ wsctl(GENERIC_ENTITY, 0,
+ INFO_CLASS_GENERIC,
+ INFO_TYPE_PROVIDER,
+ ENTITY_LIST_ID,
+ MAX_TDI_ENTITIES * 8) # sizeof(TDIEntityID)
+ entities = entities[0, size].
+ scan(/.{8}/).
+ collect { |e| e.unpack('VV') }
+
+ # Get MIB Interface List
+ iflist = []
+ ifcount = 0
+ entities.each do |entity, instance|
+ if( (entity & IF_ENTITY)>0 )
+ ifcount += 1
+ etype, = wsctl(entity, instance,
+ INFO_CLASS_GENERIC,
+ INFO_TYPE_PROVIDER,
+ ENTITY_TYPE_ID,
+ 4)
+ if( (API.unpackdw(etype) & IF_MIB)==IF_MIB )
+ ifentry, = wsctl(entity, instance,
+ INFO_CLASS_PROTOCOL,
+ INFO_TYPE_PROVIDER,
+ IF_MIB_STATS_ID,
+ 21 * 4 + 8 + 130) # sizeof(IFEntry)
+ iflist << [
+ API.unpackdw(ifentry[0,4]),
+ ifentry[20, 6]
+ ]
+ end
+ end
+ end
+
+ # Get IP Addresses
+ entities.each do |entity, instance|
+ if entity == CL_NL_ENTITY
+ etype, = wsctl(entity, instance,
+ INFO_CLASS_GENERIC,
+ INFO_TYPE_PROVIDER,
+ ENTITY_TYPE_ID,
+ 4)
+ if API.unpackdw(etype) == CL_NL_IP
+ ipentries, = wsctl(entity, instance,
+ INFO_CLASS_PROTOCOL,
+ INFO_TYPE_PROVIDER,
+ IP_MIB_ADDRTABLE_ENTRY_ID,
+ 24 * (ifcount+1)) # sizeof(IPAddrEntry)
+ ipentries.scan(/.{24}/) do |ipentry|
+ ipaddr, index = ipentry.unpack('VV')
+ if ifitem = iflist.assoc(index)
+ ifitem << ipaddr
+ end
+ end
+ end
+ end
+ end
+ iflist
+ end
+ end
+ __EOS__
+end
+#====================================================================
+ end
+end
diff --git a/ext/Win32API/point.rb b/ext/Win32API/point.rb
new file mode 100644
index 0000000000..60e265f3ee
--- /dev/null
+++ b/ext/Win32API/point.rb
@@ -0,0 +1,18 @@
+require 'Win32API'
+
+getCursorPos = Win32API.new("user32", "GetCursorPos", ['P'], 'V')
+
+lpPoint = " " * 8 # store two LONGs
+getCursorPos.Call(lpPoint)
+x, y = lpPoint.unpack("LL") # get the actual values
+
+print "x: ", x, "\n"
+print "y: ", y, "\n"
+
+ods = Win32API.new("kernel32", "OutputDebugString", ['P'], 'V')
+ods.Call("Hello, World\n");
+
+GetDesktopWindow = Win32API.new("user32", "GetDesktopWindow", [], 'L')
+GetActiveWindow = Win32API.new("user32", "GetActiveWindow", [], 'L')
+SendMessage = Win32API.new("user32", "SendMessage", ['L'] * 4, 'L')
+SendMessage.Call GetDesktopWindow.Call, 274, 0xf140, 0
diff --git a/ext/bigdecimal/.cvsignore b/ext/bigdecimal/.cvsignore
index 814345ece8..4088712231 100644
--- a/ext/bigdecimal/.cvsignore
+++ b/ext/bigdecimal/.cvsignore
@@ -1,4 +1,3 @@
Makefile
mkmf.log
*.def
-extconf.h
diff --git a/ext/bigdecimal/bigdecimal.c b/ext/bigdecimal/bigdecimal.c
index c917e84090..636c0907d6 100644
--- a/ext/bigdecimal/bigdecimal.c
+++ b/ext/bigdecimal/bigdecimal.c
@@ -13,7 +13,7 @@
*
*/
-#include "ruby/ruby.h"
+#include "ruby.h"
#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
@@ -22,10 +22,7 @@
#include <float.h>
#include <math.h>
#include "math.h"
-
-#ifdef HAVE_IEEEFP_H
-#include <ieeefp.h>
-#endif
+#include "version.h"
/* #define ENABLE_NUMERIC_STRING */
@@ -39,28 +36,10 @@ VALUE rb_cBigDecimal;
#define SAVE(p) PUSH(p->obj);
#define GUARD_OBJ(p,y) {p=y;SAVE(p);}
-#ifndef BASE_FIG
-static U_LONG BASE_FIG = 4; /* =log10(BASE) */
-static U_LONG BASE = 10000L; /* Base value(value must be 10**BASE_FIG) */
- /* The value of BASE**2 + BASE must be represented */
- /* within one U_LONG. */
-static U_LONG HALF_BASE = 5000L;/* =BASE/2 */
-static U_LONG BASE1 = 1000L; /* =BASE/10 */
-#else
-#ifndef BASE
-#error BASE_FIG is defined but BASE is not
-#endif
-#define HALF_BASE (BASE/2)
-#define BASE1 (BASE/10)
-#endif
-#ifndef DBLE_FIG
-#define DBLE_FIG (DBL_DIG+1) /* figure of double */
-#endif
-
/*
* ================== Ruby Interface part ==========================
*/
-#define DoSomeOne(x,y,f) rb_num_coerce_bin(x,y,f)
+#define DoSomeOne(x,y) rb_num_coerce_bin(x,y)
#if 0
/* BigDecimal provides arbitrary-precision floating point decimal arithmetic.
@@ -327,19 +306,17 @@ static VALUE
BigDecimal_dump(int argc, VALUE *argv, VALUE self)
{
ENTER(5);
+ char sz[50];
Real *vp;
char *psz;
VALUE dummy;
- volatile VALUE dump;
-
rb_scan_args(argc, argv, "01", &dummy);
GUARD_OBJ(vp,GetVpValue(self,1));
- dump = rb_str_new(0,VpNumOfChars(vp,"E")+50);
- psz = RSTRING_PTR(dump);
- sprintf(psz,"%lu:",VpMaxPrec(vp)*VpBaseFig());
+ sprintf(sz,"%lu:",VpMaxPrec(vp)*VpBaseFig());
+ psz = ALLOCA_N(char,(unsigned int)VpNumOfChars(vp,"E")+strlen(sz));
+ sprintf(psz,"%s",sz);
VpToString(vp, psz+strlen(psz), 0, 0);
- rb_str_resize(dump, strlen(psz));
- return dump;
+ return rb_str_new2(psz);
}
/*
@@ -432,22 +409,11 @@ BigDecimal_mode(int argc, VALUE *argv, VALUE self)
VpSetException((unsigned short)((val==Qtrue)?(fo|VP_EXCEPTION_INFINITY):
(fo&(~VP_EXCEPTION_INFINITY))));
}
- fo = VpGetException();
if(f&VP_EXCEPTION_NaN) {
VpSetException((unsigned short)((val==Qtrue)?(fo|VP_EXCEPTION_NaN):
(fo&(~VP_EXCEPTION_NaN))));
}
fo = VpGetException();
- if(f&VP_EXCEPTION_UNDERFLOW) {
- VpSetException((unsigned short)((val==Qtrue)?(fo|VP_EXCEPTION_UNDERFLOW):
- (fo&(~VP_EXCEPTION_UNDERFLOW))));
- }
- fo = VpGetException();
- if(f&VP_EXCEPTION_ZERODIVIDE) {
- VpSetException((unsigned short)((val==Qtrue)?(fo|VP_EXCEPTION_ZERODIVIDE):
- (fo&(~VP_EXCEPTION_ZERODIVIDE))));
- }
- fo = VpGetException();
return INT2FIX(fo);
}
if(VP_ROUND_MODE==f) {
@@ -544,18 +510,6 @@ BigDecimal_IsFinite(VALUE self)
return Qtrue;
}
-static void
-BigDecimal_check_num(Real *p)
-{
- if(VpIsNaN(p)) {
- VpException(VP_EXCEPTION_NaN,"Computation results to 'NaN'(Not a Number)",1);
- } else if(VpIsPosInf(p)) {
- VpException(VP_EXCEPTION_INFINITY,"Computation results to 'Infinity'",1);
- } else if(VpIsNegInf(p)) {
- VpException(VP_EXCEPTION_INFINITY,"Computation results to '-Infinity'",1);
- }
-}
-
/* Returns the value as an integer (Fixnum or Bignum).
*
* If the BigNumber is infinity or NaN, returns nil.
@@ -566,12 +520,22 @@ BigDecimal_to_i(VALUE self)
ENTER(5);
int e,n,i,nf;
U_LONG v,b,j;
- volatile VALUE str;
char *psz,*pch;
Real *p;
GUARD_OBJ(p,GetVpValue(self,1));
- BigDecimal_check_num(p);
+
+ /* Infinity or NaN not converted. */
+ if(VpIsNaN(p)) {
+ VpException(VP_EXCEPTION_NaN,"Computation results to 'NaN'(Not a Number)",0);
+ return Qnil;
+ } else if(VpIsPosInf(p)) {
+ VpException(VP_EXCEPTION_INFINITY,"Computation results to 'Infinity'",0);
+ return Qnil;
+ } else if(VpIsNegInf(p)) {
+ VpException(VP_EXCEPTION_INFINITY,"Computation results to '-Infinity'",0);
+ return Qnil;
+ }
e = VpExponent10(p);
if(e<=0) return INT2FIX(0);
@@ -580,8 +544,7 @@ BigDecimal_to_i(VALUE self)
e = VpGetSign(p)*p->frac[0];
return INT2FIX(e);
}
- str = rb_str_new(0, e+nf+2);
- psz = RSTRING_PTR(str);
+ psz = ALLOCA_N(char,(unsigned int)(e+nf+2));
n = (e+nf-1)/nf;
pch = psz;
@@ -607,6 +570,13 @@ BigDecimal_to_i(VALUE self)
return rb_cstr2inum(psz,10);
}
+static VALUE
+BigDecimal_induced_from(VALUE self, VALUE x)
+{
+ Real *p = GetVpValue(x,1);
+ return p->obj;
+}
+
/* Returns a new Float object having approximately the same value as the
* BigDecimal number. Normal accuracy limits and built-in errors of binary
* Float arithmetic apply.
@@ -619,62 +589,21 @@ BigDecimal_to_f(VALUE self)
double d;
S_LONG e;
char *buf;
- volatile VALUE str;
GUARD_OBJ(p,GetVpValue(self,1));
- if (VpVtoD(&d, &e, p)!=1) return rb_float_new(d);
- if (e > DBL_MAX_10_EXP+BASE_FIG) goto erange;
- str = rb_str_new(0, VpNumOfChars(p,"E"));
- buf = RSTRING_PTR(str);
+ if(VpVtoD(&d, &e, p)!=1) return rb_float_new(d);
+ buf = ALLOCA_N(char,(unsigned int)VpNumOfChars(p,"E"));
VpToString(p, buf, 0, 0);
errno = 0;
d = strtod(buf, 0);
if(errno == ERANGE) {
- erange:
VpException(VP_EXCEPTION_OVERFLOW,"BigDecimal to Float conversion",0);
- if(d>0.0) d = VpGetDoublePosInf();
- else d = VpGetDoubleNegInf();
+ if(d>0.0) return rb_float_new(DBL_MAX);
+ else return rb_float_new(-DBL_MAX);
}
return rb_float_new(d);
}
-
-static VALUE BigDecimal_split(VALUE self);
-
-/* Converts a BigDecimal to a Rational.
- */
-static VALUE
-BigDecimal_to_r(VALUE self)
-{
- Real *p;
- S_LONG sign, power, denomi_power;
- VALUE a, digits, numerator;
-
- p = GetVpValue(self,1);
- BigDecimal_check_num(p);
-
- sign = VpGetSign(p);
- power = VpExponent10(p);
- a = BigDecimal_split(self);
- digits = RARRAY_PTR(a)[1];
- denomi_power = power - RSTRING_LEN(digits);
- numerator = rb_funcall(digits, rb_intern("to_i"), 0);
-
- if (sign < 0) {
- numerator = rb_funcall(numerator, '*', 1, INT2FIX(-1));
- }
- if (denomi_power < 0) {
- return rb_Rational(numerator,
- rb_funcall(INT2FIX(10), rb_intern("**"), 1,
- INT2FIX(-denomi_power)));
- }
- else {
- return rb_Rational1(rb_funcall(numerator, '*', 1,
- rb_funcall(INT2FIX(10), rb_intern("**"), 1,
- INT2FIX(denomi_power))));
- }
-}
-
/* The coerce method provides support for Ruby type coercion. It is not
* enabled by default.
*
@@ -695,16 +624,11 @@ BigDecimal_coerce(VALUE self, VALUE other)
ENTER(2);
VALUE obj;
Real *b;
- switch (TYPE(other)) {
- case T_FLOAT:
- obj = rb_assoc_new(other, BigDecimal_to_f(self));
- break;
- case T_RATIONAL:
- obj = rb_assoc_new(other, BigDecimal_to_r(self));
- break;
- default:
- GUARD_OBJ(b,GetVpValue(other,1));
- obj = rb_assoc_new(b->obj, self);
+ if(TYPE(other) == T_FLOAT) {
+ obj = rb_assoc_new(other, BigDecimal_to_f(self));
+ } else {
+ GUARD_OBJ(b,GetVpValue(other,1));
+ obj = rb_assoc_new(b->obj, self);
}
return obj;
}
@@ -734,7 +658,7 @@ BigDecimal_add(VALUE self, VALUE r)
U_LONG mx;
GUARD_OBJ(a,GetVpValue(self,1));
b = GetVpValue(r,0);
- if(!b) return DoSomeOne(self,r,'+');
+ if(!b) return DoSomeOne(self,r);
SAVE(b);
if(VpIsNaN(b)) return b->obj;
if(VpIsNaN(a)) return a->obj;
@@ -773,7 +697,7 @@ BigDecimal_sub(VALUE self, VALUE r)
GUARD_OBJ(a,GetVpValue(self,1));
b = GetVpValue(r,0);
- if(!b) return DoSomeOne(self,r,'-');
+ if(!b) return DoSomeOne(self,r);
SAVE(b);
if(VpIsNaN(b)) return b->obj;
@@ -802,20 +726,7 @@ BigDecimalCmp(VALUE self, VALUE r,char op)
Real *a, *b;
GUARD_OBJ(a,GetVpValue(self,1));
b = GetVpValue(r,0);
- if(!b) {
- ID f = 0;
-
- switch(op)
- {
- case '*': f = rb_intern("<=>");break;
- case '=': f = rb_intern("=="); break;
- case '!': f = rb_intern("!="); break;
- case 'G': f = rb_intern(">="); break;
- case 'L': f = rb_intern("<="); break;
- case '>': case '<': f = (ID)op; break;
- }
- return rb_num_coerce_cmp(self,r,f);
- }
+ if(!b) return rb_num_coerce_cmp(self,r);
SAVE(b);
e = VpComp(a, b);
if(e==999) return Qnil;
@@ -952,7 +863,7 @@ BigDecimal_mult(VALUE self, VALUE r)
GUARD_OBJ(a,GetVpValue(self,1));
b = GetVpValue(r,0);
- if(!b) return DoSomeOne(self,r,'*');
+ if(!b) return DoSomeOne(self,r);
SAVE(b);
mx = a->Prec + b->Prec;
@@ -971,7 +882,7 @@ BigDecimal_divide(Real **c, Real **res, Real **div, VALUE self, VALUE r)
GUARD_OBJ(a,GetVpValue(self,1));
b = GetVpValue(r,0);
- if(!b) return DoSomeOne(self,r,'/');
+ if(!b) return DoSomeOne(self,r);
SAVE(b);
*div = b;
mx =(a->MaxPrec + b->MaxPrec + 1) * VpBaseFig();
@@ -1032,14 +943,12 @@ BigDecimal_DoDivmod(VALUE self, VALUE r, Real **div, Real **mod)
GUARD_OBJ(a,GetVpValue(self,1));
b = GetVpValue(r,0);
- if(!b) return DoSomeOne(self,r,rb_intern("divmod"));
+ if(!b) return DoSomeOne(self,r);
SAVE(b);
if(VpIsNaN(a) || VpIsNaN(b)) goto NaN;
if(VpIsInf(a) || VpIsInf(b)) goto NaN;
- if(VpIsZero(b)) {
- rb_raise(rb_eZeroDivError, "divided by 0");
- }
+ if(VpIsZero(b)) goto NaN;
if(VpIsZero(a)) {
GUARD_OBJ(c,VpCreateRbObject(1, "0"));
GUARD_OBJ(d,VpCreateRbObject(1, "0"));
@@ -1107,7 +1016,7 @@ BigDecimal_divremain(VALUE self, VALUE r, Real **dv, Real **rv)
GUARD_OBJ(a,GetVpValue(self,1));
b = GetVpValue(r,0);
- if(!b) return DoSomeOne(self,r,rb_intern("remainder"));
+ if(!b) return DoSomeOne(self,r);
SAVE(b);
mx =(a->MaxPrec + b->MaxPrec) *VpBaseFig();
@@ -1180,7 +1089,7 @@ BigDecimal_divmod(VALUE self, VALUE r)
obj = BigDecimal_DoDivmod(self,r,&div,&mod);
if(obj!=(VALUE)0) return obj;
SAVE(div);SAVE(mod);
- obj = rb_assoc_new(BigDecimal_to_i(ToValue(div)), ToValue(mod));
+ obj = rb_assoc_new(ToValue(div), ToValue(mod));
return obj;
}
@@ -1196,7 +1105,7 @@ BigDecimal_div2(int argc, VALUE *argv, VALUE self)
Real *mod;
obj = BigDecimal_DoDivmod(self,b,&div,&mod);
if(obj!=(VALUE)0) return obj;
- return BigDecimal_to_i(ToValue(div));
+ return ToValue(div);
} else { /* div in BigDecimal sense */
U_LONG ix = (U_LONG)GetPositiveInt(n);
if(ix==0) return BigDecimal_div(self,b);
@@ -1394,9 +1303,6 @@ BigDecimal_round(int argc, VALUE *argv, VALUE self)
GUARD_OBJ(c,VpCreateRbObject(mx, "0"));
VpSetPrecLimit(pl);
VpActiveRound(c,a,sw,iLoc);
- if (argc == 0) {
- return BigDecimal_to_i(ToValue(c));
- }
return ToValue(c);
}
@@ -1441,9 +1347,6 @@ BigDecimal_truncate(int argc, VALUE *argv, VALUE self)
GUARD_OBJ(c,VpCreateRbObject(mx, "0"));
VpSetPrecLimit(pl);
VpActiveRound(c,a,VP_ROUND_DOWN,iLoc); /* 0: truncate */
- if (argc == 0) {
- return BigDecimal_to_i(ToValue(c));
- }
return ToValue(c);
}
@@ -1504,9 +1407,6 @@ BigDecimal_floor(int argc, VALUE *argv, VALUE self)
GUARD_OBJ(c,VpCreateRbObject(mx, "0"));
VpSetPrecLimit(pl);
VpActiveRound(c,a,VP_ROUND_FLOOR,iLoc);
- if (argc == 0) {
- return BigDecimal_to_i(ToValue(c));
- }
return ToValue(c);
}
@@ -1551,9 +1451,6 @@ BigDecimal_ceil(int argc, VALUE *argv, VALUE self)
GUARD_OBJ(c,VpCreateRbObject(mx, "0"));
VpSetPrecLimit(pl);
VpActiveRound(c,a,VP_ROUND_CEIL,iLoc);
- if (argc == 0) {
- return BigDecimal_to_i(ToValue(c));
- }
return ToValue(c);
}
@@ -1594,7 +1491,6 @@ BigDecimal_to_s(int argc, VALUE *argv, VALUE self)
int fmt=0; /* 0:E format */
int fPlus=0; /* =0:default,=1: set ' ' before digits ,set '+' before digits. */
Real *vp;
- volatile VALUE str;
char *psz;
char ch;
U_LONG nc;
@@ -1631,16 +1527,14 @@ BigDecimal_to_s(int argc, VALUE *argv, VALUE self)
}
if(mc>0) nc += (nc + mc - 1) / mc + 1;
- str = rb_str_new(0, nc);
- psz = RSTRING_PTR(str);
+ psz = ALLOCA_N(char,(unsigned int)nc);
if(fmt) {
VpToFString(vp, psz, mc, fPlus);
} else {
VpToString (vp, psz, mc, fPlus);
}
- rb_str_resize(str, strlen(psz));
- return str;
+ return rb_str_new2(psz);
}
/* Splits a BigDecimal number into four parts, returned as an array of values.
@@ -1672,29 +1566,24 @@ BigDecimal_split(VALUE self)
{
ENTER(5);
Real *vp;
- VALUE obj,str;
+ VALUE obj,obj1;
S_LONG e;
S_LONG s;
char *psz1;
GUARD_OBJ(vp,GetVpValue(self,1));
- str = rb_str_new(0, VpNumOfChars(vp,"E"));
- psz1 = RSTRING_PTR(str);
+ psz1 = ALLOCA_N(char,(unsigned int)VpNumOfChars(vp,"E"));
VpSzMantissa(vp,psz1);
s = 1;
if(psz1[0]=='-') {
- int len = strlen(psz1+1);
-
- memmove(psz1, psz1+1, len);
- psz1[len] = '\0';
- s = -1;
+ s = -1; ++psz1;
}
if(psz1[0]=='N') s=0; /* NaN */
e = VpExponent10(vp);
+ obj1 = rb_str_new2(psz1);
obj = rb_ary_new2(4);
rb_ary_push(obj, INT2FIX(s));
- rb_ary_push(obj, str);
- rb_str_resize(str, strlen(psz1));
+ rb_ary_push(obj, obj1);
rb_ary_push(obj, INT2FIX(10));
rb_ary_push(obj, INT2NUM(e));
return obj;
@@ -1727,22 +1616,20 @@ BigDecimal_inspect(VALUE self)
{
ENTER(5);
Real *vp;
- volatile VALUE obj;
+ VALUE obj;
unsigned int nc;
- char *psz, *tmp;
+ char *psz1;
+ char *pszAll;
GUARD_OBJ(vp,GetVpValue(self,1));
nc = VpNumOfChars(vp,"E");
nc +=(nc + 9) / 10;
- obj = rb_str_new(0, nc+256);
- psz = RSTRING_PTR(obj);
- sprintf(psz,"#<BigDecimal:%lx,'",self);
- tmp = psz + strlen(psz);
- VpToString(vp, tmp, 10, 0);
- tmp += strlen(tmp);
- sprintf(tmp,"',%lu(%lu)>",VpPrec(vp)*VpBaseFig(),VpMaxPrec(vp)*VpBaseFig());
- rb_str_resize(obj, strlen(psz));
+ psz1 = ALLOCA_N(char,nc);
+ pszAll = ALLOCA_N(char,nc+256);
+ VpToString(vp, psz1, 10, 0);
+ sprintf(pszAll,"#<BigDecimal:%lx,'%s',%lu(%lu)>",self,psz1,VpPrec(vp)*VpBaseFig(),VpMaxPrec(vp)*VpBaseFig());
+ obj = rb_str_new2(pszAll);
return obj;
}
@@ -1836,7 +1723,7 @@ BigDecimal_new(int argc, VALUE *argv, VALUE self)
*
* A limit of 0, the default, means no upper limit.
*
- * The limit specified by this method takes less priority over any limit
+ * The limit specified by this method takes priority over any limit
* specified to instance methods such as ceil, floor, truncate, or round.
*/
static VALUE
@@ -1898,6 +1785,7 @@ Init_bigdecimal(void)
rb_define_singleton_method(rb_cBigDecimal, "mode", BigDecimal_mode, -1);
rb_define_singleton_method(rb_cBigDecimal, "limit", BigDecimal_limit, -1);
rb_define_singleton_method(rb_cBigDecimal, "double_fig", BigDecimal_double_fig, 0);
+ rb_define_singleton_method(rb_cBigDecimal, "induced_from",BigDecimal_induced_from, 1);
rb_define_singleton_method(rb_cBigDecimal, "_load", BigDecimal_load, 1);
rb_define_singleton_method(rb_cBigDecimal, "ver", BigDecimal_version, 0);
@@ -1940,7 +1828,7 @@ Init_bigdecimal(void)
/*
* 0x01: Determines what happens when the result of a computation is an
- * overflow (a result too large to be represented). See BigDecimal.mode.
+ * underflow (a result too large to be represented). See BigDecimal.mode.
*/
rb_define_const(rb_cBigDecimal, "EXCEPTION_OVERFLOW",INT2FIX(VP_EXCEPTION_OVERFLOW));
@@ -2011,12 +1899,11 @@ Init_bigdecimal(void)
rb_define_method(rb_cBigDecimal, "add", BigDecimal_add2, 2);
rb_define_method(rb_cBigDecimal, "sub", BigDecimal_sub2, 2);
rb_define_method(rb_cBigDecimal, "mult", BigDecimal_mult2, 2);
- rb_define_method(rb_cBigDecimal, "div", BigDecimal_div2, -1);
+ rb_define_method(rb_cBigDecimal, "div",BigDecimal_div2, -1);
rb_define_method(rb_cBigDecimal, "hash", BigDecimal_hash, 0);
rb_define_method(rb_cBigDecimal, "to_s", BigDecimal_to_s, -1);
rb_define_method(rb_cBigDecimal, "to_i", BigDecimal_to_i, 0);
rb_define_method(rb_cBigDecimal, "to_int", BigDecimal_to_i, 0);
- rb_define_method(rb_cBigDecimal, "to_r", BigDecimal_to_r, 0);
rb_define_method(rb_cBigDecimal, "split", BigDecimal_split, 0);
rb_define_method(rb_cBigDecimal, "+", BigDecimal_add, 1);
rb_define_method(rb_cBigDecimal, "-", BigDecimal_sub, 1);
@@ -2071,15 +1958,31 @@ Init_bigdecimal(void)
*
*/
#ifdef _DEBUG
-static int gfDebug = 1; /* Debug switch */
-#if 0
+/*static int gfDebug = 1;*/ /* Debug switch */
static int gfCheckVal = 1; /* Value checking flag in VpNmlz() */
-#endif
#endif /* _DEBUG */
static U_LONG gnPrecLimit = 0; /* Global upper limit of the precision newly allocated */
static U_LONG gfRoundMode = VP_ROUND_HALF_UP; /* Mode for general rounding operation */
+#ifndef BASE_FIG
+static U_LONG BASE_FIG = 4; /* =log10(BASE) */
+static U_LONG BASE = 10000L; /* Base value(value must be 10**BASE_FIG) */
+ /* The value of BASE**2 + BASE must be represented */
+ /* within one U_LONG. */
+static U_LONG HALF_BASE = 5000L;/* =BASE/2 */
+static U_LONG BASE1 = 1000L; /* =BASE/10 */
+#else
+#ifndef BASE
+#error BASE_FIG is defined but BASE is not
+#endif
+#define HALF_BASE (BASE/2)
+#define BASE1 (BASE/10)
+#endif
+#ifndef DBLE_FIG
+#define DBLE_FIG (DBL_DIG+1) /* figure of double */
+#endif
+
static Real *VpConstOne; /* constant 1.0 */
static Real *VpPt5; /* constant 0.5 */
#define maxnr 100UL /* Maximum iterations for calcurating sqrt. */
@@ -2176,9 +2079,9 @@ VpGetRoundMode(void)
VP_EXPORT int
VpIsRoundMode(unsigned long n)
{
- if(n==VP_ROUND_UP || n==VP_ROUND_DOWN ||
- n==VP_ROUND_HALF_UP || n==VP_ROUND_HALF_DOWN ||
- n==VP_ROUND_CEIL || n==VP_ROUND_FLOOR ||
+ if(n==VP_ROUND_UP || n!=VP_ROUND_DOWN ||
+ n==VP_ROUND_HALF_UP || n!=VP_ROUND_HALF_DOWN ||
+ n==VP_ROUND_CEIL || n!=VP_ROUND_FLOOR ||
n==VP_ROUND_HALF_EVEN
) return 1;
return 0;
@@ -2277,14 +2180,12 @@ VpGetDoubleNegZero(void) /* Returns the value of -0 */
return nzero;
}
-#if 0 /* unused */
VP_EXPORT int
VpIsNegDoubleZero(double v)
{
double z = VpGetDoubleNegZero();
return MemCmp(&v,&z,sizeof(v))==0;
}
-#endif
VP_EXPORT int
VpException(unsigned short f, const char *str,int always)
@@ -2298,12 +2199,18 @@ VpException(unsigned short f, const char *str,int always)
switch(f)
{
/*
+ case VP_EXCEPTION_ZERODIVIDE:
case VP_EXCEPTION_OVERFLOW:
*/
- case VP_EXCEPTION_ZERODIVIDE:
case VP_EXCEPTION_INFINITY:
+ exc = rb_eFloatDomainError;
+ goto raise;
case VP_EXCEPTION_NaN:
+ exc = rb_eFloatDomainError;
+ goto raise;
case VP_EXCEPTION_UNDERFLOW:
+ exc = rb_eFloatDomainError;
+ goto raise;
case VP_EXCEPTION_OP:
exc = rb_eFloatDomainError;
goto raise;
@@ -2509,8 +2416,8 @@ VpInit(U_LONG BaseVal)
printf(" BASE = %lu\n", BASE);
printf(" HALF_BASE = %lu\n", HALF_BASE);
printf(" BASE1 = %lu\n", BASE1);
- printf(" BASE_FIG = %d\n", BASE_FIG);
- printf(" DBLE_FIG = %d\n", DBLE_FIG);
+ printf(" BASE_FIG = %lu\n", BASE_FIG);
+ printf(" DBLE_FIG = %lu\n", DBLE_FIG);
}
#endif /* _DEBUG */
@@ -2575,7 +2482,6 @@ VpAlloc(U_LONG mx, const char *szVal)
int sign=1;
Real *vp = NULL;
U_LONG mf = VpGetPrecLimit();
- volatile VALUE buf;
mx = (mx + BASE_FIG - 1) / BASE_FIG + 1; /* Determine allocation unit. */
if(szVal) {
@@ -2603,8 +2509,7 @@ VpAlloc(U_LONG mx, const char *szVal)
/* Skip all '_' after digit: 2006-6-30 */
ni = 0;
- buf = rb_str_new(0,strlen(szVal)+1);
- psz = RSTRING_PTR(buf);
+ psz = ALLOCA_N(char,strlen(szVal)+1);
i = 0;
ipn = 0;
while((psz[i]=szVal[ipn])!=0) {
@@ -3241,10 +3146,7 @@ VpMult(Real *c, Real *a, Real *b)
/* set LHSV c info */
c->exponent = a->exponent; /* set exponent */
- if(!AddExponent(c,b->exponent)) {
- if(w) VpFree(c);
- return 0;
- }
+ if(!AddExponent(c,b->exponent)) return 0;
VpSetSign(c,VpGetSign(a)*VpGetSign(b)); /* set sign */
Carry = 0;
nc = ind_c = MxIndAB;
@@ -3660,7 +3562,7 @@ Exit:
* a ... VP variable to be printed
*/
VP_EXPORT int
-VPrint(FILE *fp, const char *cntl_chr, Real *a)
+VPrint(FILE *fp, char *cntl_chr, Real *a)
{
U_LONG i, j, nc, nd, ZeroSup;
U_LONG n, m, e, nn;
@@ -3699,12 +3601,12 @@ VPrint(FILE *fp, const char *cntl_chr, Real *a)
nc += fprintf(fp, "0.");
n = a->Prec;
for(i=0;i < n;++i) {
- m = BASE1;
+ m = BASE1;
e = a->frac[i];
while(m) {
nn = e / m;
if((!ZeroSup) || nn) {
- nc += fprintf(fp, "%lu", nn); /* The leading zero(s) */
+ nc += fprintf(fp, "%lu", nn); /* The reading zero(s) */
/* as 0.00xx will not */
/* be printed. */
++nd;
@@ -3826,7 +3728,7 @@ VpSzMantissa(Real *a,char *psz)
while(m) {
nn = e / m;
if((!ZeroSup) || nn) {
- sprintf(psz, "%lu", nn); /* The leading zero(s) */
+ sprintf(psz, "%lu", nn); /* The reading zero(s) */
psz += strlen(psz);
/* as 0.00xx will be ignored. */
ZeroSup = 0; /* Set to print succeeding zeros */
@@ -4015,12 +3917,7 @@ VpCtoV(Real *a, const char *int_chr, U_LONG ni, const char *frac, U_LONG nf, con
es = e*((S_INT)BASE_FIG);
e = e * 10 + exp_chr[i] - '0';
if(es>e*((S_INT)BASE_FIG)) {
- VpException(VP_EXCEPTION_INFINITY,"exponent overflow",0);
- sign = 1;
- if(int_chr[0] == '-') sign = -1;
- if(signe > 0) VpSetInf(a, sign);
- else VpSetZero(a, sign);
- return 1;
+ return VpException(VP_EXCEPTION_INFINITY,"exponent overflow",0);
}
++i;
}
@@ -4181,7 +4078,7 @@ Exit:
if(gfDebug) {
VPrint(stdout, " VpVtoD: m=%\n", m);
printf(" d=%e * 10 **%ld\n", *d, *e);
- printf(" DBLE_FIG = %d\n", DBLE_FIG);
+ printf(" DBLE_FIG = %ld\n", DBLE_FIG);
}
#endif /*_DEBUG */
return f;
@@ -4260,7 +4157,6 @@ Exit:
/*
* m <- ival
*/
-#if 0 /* unused */
VP_EXPORT void
VpItoV(Real *m, S_INT ival)
{
@@ -4318,7 +4214,6 @@ Exit:
#endif /* _DEBUG */
return;
}
-#endif
/*
* y = SQRT(x), y*y - x =>0
@@ -4429,6 +4324,7 @@ Exit:
/*
*
+ * f = 0: Round off/Truncate, 1: round up, 2:ceil, 3: floor, 4: Banker's rounding
* nf: digit position for operation.
*
*/
@@ -4449,22 +4345,15 @@ VpMidRound(Real *y, int f, int nf)
nf += y->exponent*((int)BASE_FIG);
exptoadd=0;
if (nf < 0) {
- /* rounding position too left(large). */
- if((f!=VP_ROUND_CEIL) && (f!=VP_ROUND_FLOOR)) {
- VpSetZero(y,VpGetSign(y)); /* truncate everything */
- return 0;
- }
exptoadd = -nf;
nf = 0;
}
-
/* ix: x->fraq[ix] contains round position */
ix = nf/(int)BASE_FIG;
- if(((U_LONG)ix)>=y->Prec) return 0; /* rounding position too right(small). */
+ if(((U_LONG)ix)>=y->Prec) return 0; /* Unable to round */
ioffset = nf - ix*((int)BASE_FIG);
v = y->frac[ix];
-
/* drop digits after pointed digit */
n = BASE_FIG - ioffset - 1;
for(shifter=1,i=0;i<n;++i) shifter *= 10;
@@ -4709,20 +4598,8 @@ VpPower(Real *y, Real *x, S_INT n)
}
goto Exit;
}
- if(VpIsNaN(x)) {
- VpSetNaN(y);
- goto Exit;
- }
- if(VpIsInf(x)) {
- if(n==0) {
- VpSetOne(y);
- goto Exit;
- }
- if(n>0) {
- VpSetInf(y, (n%2==0 || VpIsPosInf(x)) ? 1 : -1);
- goto Exit;
- }
- VpSetZero(y, (n%2==0 || VpIsPosInf(x)) ? 1 : -1);
+ if(!VpIsDef(x)) {
+ VpSetNaN(y); /* Not sure !!! */
goto Exit;
}
diff --git a/ext/bigdecimal/bigdecimal.h b/ext/bigdecimal/bigdecimal.h
index c8a1feb30e..4f77feab00 100644
--- a/ext/bigdecimal/bigdecimal.h
+++ b/ext/bigdecimal/bigdecimal.h
@@ -45,7 +45,7 @@ extern "C" {
#define VP_EXCEPTION_NaN ((unsigned short)0x0002)
#define VP_EXCEPTION_UNDERFLOW ((unsigned short)0x0004)
#define VP_EXCEPTION_OVERFLOW ((unsigned short)0x0001) /* 0x0008) */
-#define VP_EXCEPTION_ZERODIVIDE ((unsigned short)0x0010)
+#define VP_EXCEPTION_ZERODIVIDE ((unsigned short)0x0001) /* 0x0010) */
/* Following 2 exceptions cann't controlled by user */
#define VP_EXCEPTION_OP ((unsigned short)0x0020)
@@ -127,9 +127,7 @@ VP_EXPORT unsigned long VpGetRoundMode(void);
VP_EXPORT unsigned long VpSetRoundMode(unsigned long n);
VP_EXPORT int VpException(unsigned short f,const char *str,int always);
-#if 0 /* unused */
VP_EXPORT int VpIsNegDoubleZero(double v);
-#endif
VP_EXPORT U_LONG VpNumOfChars(Real *vp,const char *pszFmt);
VP_EXPORT U_LONG VpInit(U_LONG BaseVal);
VP_EXPORT void *VpMemAlloc(U_LONG mb);
@@ -148,9 +146,7 @@ VP_EXPORT void VpToFString(Real *a,char *psz,int fFmt,int fPlus);
VP_EXPORT int VpCtoV(Real *a,const char *int_chr,U_LONG ni,const char *frac,U_LONG nf,const char *exp_chr,U_LONG ne);
VP_EXPORT int VpVtoD(double *d,S_LONG *e,Real *m);
VP_EXPORT void VpDtoV(Real *m,double d);
-#if 0 /* unused */
VP_EXPORT void VpItoV(Real *m,S_INT ival);
-#endif
VP_EXPORT int VpSqrt(Real *y,Real *x);
VP_EXPORT int VpActiveRound(Real *y,Real *x,int f,int il);
VP_EXPORT int VpMidRound(Real *y, int f, int nf);
@@ -211,7 +207,7 @@ VP_EXPORT Real *VpOne(void);
#define VpExponent(a) (a->exponent)
#ifdef _DEBUG
int VpVarCheck(Real * v);
-VP_EXPORT int VPrint(FILE *fp,const char *cntl_chr,Real *a);
+VP_EXPORT int VPrint(FILE *fp,char *cntl_chr,Real *a);
#endif /* _DEBUG */
#if defined(__cplusplus)
diff --git a/ext/bigdecimal/lib/bigdecimal/jacobian.rb b/ext/bigdecimal/lib/bigdecimal/jacobian.rb
index 8c36ad14fc..d80eeab901 100644
--- a/ext/bigdecimal/lib/bigdecimal/jacobian.rb
+++ b/ext/bigdecimal/lib/bigdecimal/jacobian.rb
@@ -52,7 +52,7 @@ module Jacobian
s = f.zero
deriv = []
if(nRetry>100) then
- raise "Singular Jacobian matrix. No change at x[" + i.to_s + "]"
+ raize "Singular Jacobian matrix. No change at x[" + i.to_s + "]"
end
dx = dx*f.two
x[i] += dx
diff --git a/ext/bigdecimal/lib/bigdecimal/ludcmp.rb b/ext/bigdecimal/lib/bigdecimal/ludcmp.rb
index 176ed84caf..8f4888725e 100644
--- a/ext/bigdecimal/lib/bigdecimal/ludcmp.rb
+++ b/ext/bigdecimal/lib/bigdecimal/ludcmp.rb
@@ -17,7 +17,7 @@ module LUSolve
end
if nrmrow>zero then
scales <<= one.div(nrmrow,prec)
- else
+ else
raise "Singular matrix"
end
end
diff --git a/ext/bigdecimal/lib/bigdecimal/math.rb b/ext/bigdecimal/lib/bigdecimal/math.rb
index 24e928b901..f3248a3c5c 100644
--- a/ext/bigdecimal/lib/bigdecimal/math.rb
+++ b/ext/bigdecimal/lib/bigdecimal/math.rb
@@ -30,10 +30,10 @@
#
module BigMath
- # Computes the square root of x to the specified number of digits of
+ # Computes the square root of x to the specified number of digits of
# precision.
#
- # BigDecimal.new('2').sqrt(16).to_s
+ # BigDecimal.new('2').sqrt(16).to_s
# -> "0.14142135623730950488016887242096975E1"
#
def sqrt(x,prec)
@@ -120,7 +120,7 @@ module BigMath
y
end
- # Computes the value of e (the base of natural logarithms) raised to the
+ # Computes the value of e (the base of natural logarithms) raised to the
# power of x, to the specified number of digits of precision.
#
# If x is infinite or NaN, returns NaN.
@@ -148,7 +148,7 @@ module BigMath
y
end
- # Computes the natural logarithm of x to the specified number of digits
+ # Computes the natural logarithm of x to the specified number of digits
# of precision.
#
# Returns x if x is infinite or NaN.
diff --git a/ext/bigdecimal/lib/bigdecimal/newton.rb b/ext/bigdecimal/lib/bigdecimal/newton.rb
index d78c3d7647..59ac0f7f04 100644
--- a/ext/bigdecimal/lib/bigdecimal/newton.rb
+++ b/ext/bigdecimal/lib/bigdecimal/newton.rb
@@ -1,5 +1,5 @@
#
-# newton.rb
+# newton.rb
#
# Solves the nonlinear algebraic equation system f = 0 by Newton's method.
# This program is not dependent on BigDecimal.
@@ -28,7 +28,7 @@ require "bigdecimal/jacobian"
module Newton
include LUSolve
include Jacobian
-
+
def norm(fv,zero=0.0)
s = zero
n = fv.size
diff --git a/ext/bigdecimal/lib/bigdecimal/util.rb b/ext/bigdecimal/lib/bigdecimal/util.rb
index 257781f035..09e926acd5 100644
--- a/ext/bigdecimal/lib/bigdecimal/util.rb
+++ b/ext/bigdecimal/lib/bigdecimal/util.rb
@@ -39,6 +39,18 @@ class BigDecimal < Numeric
i + "." + ("0"*(-z)) + f
end
end
+
+ # Converts a BigDecimal to a Rational.
+ def to_r
+ sign,digits,base,power = self.split
+ numerator = sign*digits.to_i
+ denomi_power = power - digits.size # base is always 10
+ if denomi_power < 0
+ Rational(numerator,base ** (-denomi_power))
+ else
+ Rational(numerator * (base ** denomi_power),1)
+ end
+ end
end
class Rational < Numeric
diff --git a/ext/continuation/continuation.c b/ext/continuation/continuation.c
deleted file mode 100644
index ae69b66cd8..0000000000
--- a/ext/continuation/continuation.c
+++ /dev/null
@@ -1,8 +0,0 @@
-
-void ruby_Init_Continuation_body(void);
-
-void
-Init_continuation(void)
-{
- ruby_Init_Continuation_body();
-}
diff --git a/ext/continuation/extconf.rb b/ext/continuation/extconf.rb
deleted file mode 100644
index 17e2d056db..0000000000
--- a/ext/continuation/extconf.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-require 'mkmf'
-create_makefile('continuation')
-
diff --git a/ext/coverage/coverage.c b/ext/coverage/coverage.c
deleted file mode 100644
index 145be1834d..0000000000
--- a/ext/coverage/coverage.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/************************************************
-
- coverage.c -
-
- $Author: $
-
- Copyright (c) 2008 Yusuke Endoh
-
-************************************************/
-
-#include "ruby.h"
-
-extern VALUE rb_get_coverages(void);
-extern void rb_set_coverages(VALUE);
-extern void rb_reset_coverages(void);
-
-/*
- * call-seq:
- * Coverage.start => nil
- *
- * Enables coverage measurement.
- */
-static VALUE
-rb_coverage_start(VALUE klass)
-{
- if (!RTEST(rb_get_coverages())) {
- VALUE coverages = rb_hash_new();
- RBASIC(coverages)->klass = 0;
- rb_set_coverages(coverages);
- }
- return Qnil;
-}
-
-static int
-coverage_result_i(st_data_t key, st_data_t val, st_data_t dummy)
-{
- VALUE coverage = (VALUE)val;
- RBASIC(coverage)->klass = rb_cArray;
- rb_ary_freeze(coverage);
- return ST_CONTINUE;
-}
-
-/*
- * call-seq:
- * Coverage.result => hash
- *
- * Returns a hash that contains filename as key and coverage array as value
- * and disables coverage measurement.
- */
-static VALUE
-rb_coverage_result(VALUE klass)
-{
- VALUE coverages = rb_get_coverages();
- if (!RTEST(coverages)) {
- rb_raise(rb_eRuntimeError, "coverage measurement is not enabled");
- }
- RBASIC(coverages)->klass = rb_cHash;
- st_foreach(RHASH_TBL(coverages), coverage_result_i, 0);
- rb_hash_freeze(coverages);
- rb_reset_coverages();
- return coverages;
-}
-
-/* Coverage provides coverage measurement feature for Ruby.
- * This feature is experimental, so these APIs may be changed in future.
- *
- * = Usage
- *
- * (1) require "coverage.so"
- * (2) do Coverage.start
- * (3) require or load Ruby source file
- * (4) Coverage.result will return a hash that contains filename as key and
- * coverage array as value.
- *
- * = Example
- *
- * [foo.rb]
- * s = 0
- * 10.times do |x|
- * s += x
- * end
- *
- * if s == 45
- * p :ok
- * else
- * p :ng
- * end
- * [EOF]
- *
- * require "coverage.so"
- * Coverage.start
- * require "foo.rb"
- * p Coverage.result #=> {"foo.rb"=>[1, 1, 10, nil, nil, 1, 1, nil, 0, nil]}
- */
-void
-Init_coverage(void)
-{
- VALUE rb_mCoverage = rb_define_module("Coverage");
- rb_define_module_function(rb_mCoverage, "start", rb_coverage_start, 0);
- rb_define_module_function(rb_mCoverage, "result", rb_coverage_result, 0);
-}
diff --git a/ext/coverage/extconf.rb b/ext/coverage/extconf.rb
deleted file mode 100644
index 3ebced54a6..0000000000
--- a/ext/coverage/extconf.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-require 'mkmf'
-create_makefile('coverage')
diff --git a/ext/curses/.cvsignore b/ext/curses/.cvsignore
index 814345ece8..4088712231 100644
--- a/ext/curses/.cvsignore
+++ b/ext/curses/.cvsignore
@@ -1,4 +1,3 @@
Makefile
mkmf.log
*.def
-extconf.h
diff --git a/ext/curses/curses.c b/ext/curses/curses.c
index 94da77f826..9c51a2127f 100644
--- a/ext/curses/curses.c
+++ b/ext/curses/curses.c
@@ -2,7 +2,7 @@
* $Id$
*
* ext/curses/curses.c
- *
+ *
* by MAEDA Shugo (ender@pic-internet.or.jp)
* modified by Yukihiro Matsumoto (matz@netlab.co.jp),
* Toki Yoshinori,
@@ -14,7 +14,7 @@
*/
#include "ruby.h"
-#include "ruby/io.h"
+#include "rubyio.h"
#if defined(HAVE_NCURSES_H)
# include <ncurses.h>
@@ -54,8 +54,8 @@
# define USE_MOUSE 1
#endif
-#define NUM2CH NUM2CHR
-#define CH2FIX CHR2FIX
+#define NUM2CH NUM2LONG
+#define CH2FIX LONG2FIX
static VALUE mCurses;
static VALUE mKey;
@@ -72,12 +72,12 @@ struct windata {
#define CHECK(c) c
-static VALUE window_attroff(VALUE obj, VALUE attrs);
-static VALUE window_attron(VALUE obj, VALUE attrs);
-static VALUE window_attrset(VALUE obj, VALUE attrs);
+static VALUE window_attroff();
+static VALUE window_attron();
+static VALUE window_attrset();
static void
-no_window(void)
+no_window()
{
rb_raise(rb_eRuntimeError, "already closed window");
}
@@ -90,15 +90,18 @@ no_window(void)
} while (0)
static void
-free_window(struct windata *winp)
+free_window(winp)
+ struct windata *winp;
{
if (winp->window && winp->window != stdscr) delwin(winp->window);
winp->window = 0;
- xfree(winp);
+ free(winp);
}
static VALUE
-prep_window(VALUE class, WINDOW *window)
+prep_window(class, window)
+ VALUE class;
+ WINDOW *window;
{
VALUE obj;
struct windata *winp;
@@ -110,15 +113,15 @@ prep_window(VALUE class, WINDOW *window)
obj = rb_obj_alloc(class);
Data_Get_Struct(obj, struct windata, winp);
winp->window = window;
-
- return obj;
+
+ return obj;
}
/*-------------------------- module Curses --------------------------*/
/* def init_screen */
static VALUE
-curses_init_screen(void)
+curses_init_screen()
{
rb_secure(4);
if (rb_stdscr) return rb_stdscr;
@@ -136,7 +139,7 @@ curses_init_screen(void)
/* def close_screen */
static VALUE
-curses_close_screen(void)
+curses_close_screen()
{
#ifdef HAVE_ISENDWIN
if (!isendwin())
@@ -159,23 +162,24 @@ curses_finalize(VALUE dummy)
rb_gc_unregister_address(&rb_stdscr);
}
-#ifdef HAVE_ISENDWIN
/* def closed? */
static VALUE
-curses_closed(void)
+curses_closed()
{
+#ifdef HAVE_ISENDWIN
if (isendwin()) {
return Qtrue;
}
return Qfalse;
-}
#else
-#define curses_closed rb_f_notimplement
+ rb_notimplement();
#endif
+}
/* def clear */
static VALUE
-curses_clear(VALUE obj)
+curses_clear(obj)
+ VALUE obj;
{
curses_stdscr();
wclear(stdscr);
@@ -184,7 +188,7 @@ curses_clear(VALUE obj)
/* def clrtoeol */
static VALUE
-curses_clrtoeol(void)
+curses_clrtoeol()
{
curses_stdscr();
clrtoeol();
@@ -193,7 +197,8 @@ curses_clrtoeol(void)
/* def refresh */
static VALUE
-curses_refresh(VALUE obj)
+curses_refresh(obj)
+ VALUE obj;
{
curses_stdscr();
refresh();
@@ -202,7 +207,8 @@ curses_refresh(VALUE obj)
/* def doupdate */
static VALUE
-curses_doupdate(VALUE obj)
+curses_doupdate(obj)
+ VALUE obj;
{
curses_stdscr();
#ifdef HAVE_DOUPDATE
@@ -215,7 +221,8 @@ curses_doupdate(VALUE obj)
/* def echo */
static VALUE
-curses_echo(VALUE obj)
+curses_echo(obj)
+ VALUE obj;
{
curses_stdscr();
echo();
@@ -224,7 +231,8 @@ curses_echo(VALUE obj)
/* def noecho */
static VALUE
-curses_noecho(VALUE obj)
+curses_noecho(obj)
+ VALUE obj;
{
curses_stdscr();
noecho();
@@ -233,7 +241,8 @@ curses_noecho(VALUE obj)
/* def raw */
static VALUE
-curses_raw(VALUE obj)
+curses_raw(obj)
+ VALUE obj;
{
curses_stdscr();
raw();
@@ -242,7 +251,8 @@ curses_raw(VALUE obj)
/* def noraw */
static VALUE
-curses_noraw(VALUE obj)
+curses_noraw(obj)
+ VALUE obj;
{
curses_stdscr();
noraw();
@@ -251,7 +261,8 @@ curses_noraw(VALUE obj)
/* def cbreak */
static VALUE
-curses_cbreak(VALUE obj)
+curses_cbreak(obj)
+ VALUE obj;
{
curses_stdscr();
cbreak();
@@ -260,7 +271,8 @@ curses_cbreak(VALUE obj)
/* def nocbreak */
static VALUE
-curses_nocbreak(VALUE obj)
+curses_nocbreak(obj)
+ VALUE obj;
{
curses_stdscr();
nocbreak();
@@ -269,7 +281,8 @@ curses_nocbreak(VALUE obj)
/* def nl */
static VALUE
-curses_nl(VALUE obj)
+curses_nl(obj)
+ VALUE obj;
{
curses_stdscr();
nl();
@@ -278,7 +291,8 @@ curses_nl(VALUE obj)
/* def nonl */
static VALUE
-curses_nonl(VALUE obj)
+curses_nonl(obj)
+ VALUE obj;
{
curses_stdscr();
nonl();
@@ -287,7 +301,8 @@ curses_nonl(VALUE obj)
/* def beep */
static VALUE
-curses_beep(VALUE obj)
+curses_beep(obj)
+ VALUE obj;
{
#ifdef HAVE_BEEP
curses_stdscr();
@@ -298,7 +313,8 @@ curses_beep(VALUE obj)
/* def flash */
static VALUE
-curses_flash(VALUE obj)
+curses_flash(obj)
+ VALUE obj;
{
#ifdef HAVE_FLASH
curses_stdscr();
@@ -307,44 +323,27 @@ curses_flash(VALUE obj)
return Qnil;
}
-static int
-curses_char(VALUE c)
-{
- if (FIXNUM_P(c)) {
- return NUM2INT(c);
- }
- else {
- int cc;
-
- StringValue(c);
- if (RSTRING_LEN(c) == 0 || RSTRING_LEN(c) > 1) {
- rb_raise(rb_eArgError, "string not corresponding a character");
- }
- cc = RSTRING_PTR(c)[0];
- if (cc > 0x7f) {
- rb_raise(rb_eArgError, "no multibyte string supported (yet)");
- }
- return cc;
- }
-}
-
-#ifdef HAVE_UNGETCH
/* def ungetch */
static VALUE
-curses_ungetch(VALUE obj, VALUE ch)
+curses_ungetch(obj, ch)
+ VALUE obj;
+ VALUE ch;
{
- int c = curses_char(ch);
+#ifdef HAVE_UNGETCH
curses_stdscr();
- ungetch(c);
- return Qnil;
-}
+ ungetch(NUM2INT(ch));
#else
-#define curses_ungetch rb_f_notimplement
+ rb_notimplement();
#endif
+ return Qnil;
+}
/* def setpos(y, x) */
static VALUE
-curses_setpos(VALUE obj, VALUE y, VALUE x)
+curses_setpos(obj, y, x)
+ VALUE obj;
+ VALUE y;
+ VALUE x;
{
curses_stdscr();
move(NUM2INT(y), NUM2INT(x));
@@ -353,7 +352,8 @@ curses_setpos(VALUE obj, VALUE y, VALUE x)
/* def standout */
static VALUE
-curses_standout(VALUE obj)
+curses_standout(obj)
+ VALUE obj;
{
standout();
return Qnil;
@@ -361,7 +361,8 @@ curses_standout(VALUE obj)
/* def standend */
static VALUE
-curses_standend(VALUE obj)
+curses_standend(obj)
+ VALUE obj;
{
standend();
return Qnil;
@@ -369,7 +370,8 @@ curses_standend(VALUE obj)
/* def inch */
static VALUE
-curses_inch(VALUE obj)
+curses_inch(obj)
+ VALUE obj;
{
curses_stdscr();
return CH2FIX(inch());
@@ -377,7 +379,9 @@ curses_inch(VALUE obj)
/* def addch(ch) */
static VALUE
-curses_addch(VALUE obj, VALUE ch)
+curses_addch(obj, ch)
+ VALUE obj;
+ VALUE ch;
{
curses_stdscr();
addch(NUM2CH(ch));
@@ -386,7 +390,9 @@ curses_addch(VALUE obj, VALUE ch)
/* def insch(ch) */
static VALUE
-curses_insch(VALUE obj, VALUE ch)
+curses_insch(obj, ch)
+ VALUE obj;
+ VALUE ch;
{
curses_stdscr();
insch(NUM2CH(ch));
@@ -395,38 +401,31 @@ curses_insch(VALUE obj, VALUE ch)
/* def addstr(str) */
static VALUE
-curses_addstr(VALUE obj, VALUE str)
+curses_addstr(obj, str)
+ VALUE obj;
+ VALUE str;
{
- StringValue(str);
- str = rb_str_export_locale(str);
curses_stdscr();
if (!NIL_P(str)) {
- addstr(StringValueCStr(str));
+ addstr(STR2CSTR(str));
}
return Qnil;
}
/* def getch */
static VALUE
-curses_getch(VALUE obj)
+curses_getch(obj)
+ VALUE obj;
{
- int c;
-
rb_read_check(stdin);
curses_stdscr();
- c = getch();
- if (c == EOF) return Qnil;
- if (rb_isprint(c)) {
- char ch = (char)c;
-
- return rb_locale_str_new(&ch, 1);
- }
- return UINT2NUM(c);
+ return UINT2NUM(getch());
}
/* def getstr */
static VALUE
-curses_getstr(VALUE obj)
+curses_getstr(obj)
+ VALUE obj;
{
char rtn[1024]; /* This should be big enough.. I hope */
@@ -436,12 +435,13 @@ curses_getstr(VALUE obj)
#else
getstr(rtn);
#endif
- return rb_locale_str_new_cstr(rtn);
+ return rb_tainted_str_new2(rtn);
}
/* def delch */
static VALUE
-curses_delch(VALUE obj)
+curses_delch(obj)
+ VALUE obj;
{
delch();
return Qnil;
@@ -449,7 +449,8 @@ curses_delch(VALUE obj)
/* def delelteln */
static VALUE
-curses_deleteln(VALUE obj)
+curses_deleteln(obj)
+ VALUE obj;
{
#if defined(HAVE_DELETELN) || defined(deleteln)
deleteln();
@@ -459,7 +460,8 @@ curses_deleteln(VALUE obj)
/* def insertln */
static VALUE
-curses_insertln(VALUE obj)
+curses_insertln(obj)
+ VALUE obj;
{
#if defined(HAVE_INSERTLN) || defined(insertln)
insertln();
@@ -469,175 +471,116 @@ curses_insertln(VALUE obj)
/* def keyname */
static VALUE
-curses_keyname(VALUE obj, VALUE c)
+curses_keyname(obj, c)
+ VALUE obj;
+ VALUE c;
{
#ifdef HAVE_KEYNAME
- int cc = curses_char(c);
- const char *name;
+ const char *name;
- name = keyname(cc);
- if (name) {
- return rb_str_new_cstr(name);
- }
- else {
- return Qnil;
- }
-#else
+ name = keyname(NUM2INT(c));
+ if (name) {
+ return rb_str_new2(name);
+ } else {
return Qnil;
+ }
+#else
+ return Qnil;
#endif
}
static VALUE
-curses_lines(void)
+curses_lines()
{
return INT2FIX(LINES);
}
static VALUE
-curses_cols(void)
+curses_cols()
{
return INT2FIX(COLS);
}
-/**
- * Sets Cursor Visibility.
- * 0: invisible
- * 1: visible
- * 2: very visible
- */
static VALUE
curses_curs_set(VALUE obj, VALUE visibility)
{
#ifdef HAVE_CURS_SET
- int n;
- return (n = curs_set(NUM2INT(visibility)) != ERR) ? INT2FIX(n) : Qnil;
+ int n;
+ return (n = curs_set(NUM2INT(visibility)) != ERR) ? INT2FIX(n) : Qnil;
#else
- return Qnil;
+ return Qnil;
#endif
}
static VALUE
curses_scrl(VALUE obj, VALUE n)
{
- /* may have to raise exception on ERR */
+ /* may have to raise exception on ERR */
#ifdef HAVE_SCRL
- return (scrl(NUM2INT(n)) == OK) ? Qtrue : Qfalse;
+ return (scrl(NUM2INT(n)) == OK) ? Qtrue : Qfalse;
#else
- return Qfalse;
+ return Qfalse;
#endif
}
static VALUE
curses_setscrreg(VALUE obj, VALUE top, VALUE bottom)
{
- /* may have to raise exception on ERR */
+ /* may have to raise exception on ERR */
#ifdef HAVE_SETSCRREG
- return (setscrreg(NUM2INT(top), NUM2INT(bottom)) == OK) ? Qtrue : Qfalse;
+ return (setscrreg(NUM2INT(top), NUM2INT(bottom)) == OK) ? Qtrue : Qfalse;
#else
- return Qfalse;
+ return Qfalse;
#endif
}
static VALUE
curses_attroff(VALUE obj, VALUE attrs)
{
- return window_attroff(rb_stdscr,attrs);
- /* return INT2FIX(attroff(NUM2INT(attrs))); */
+ return window_attroff(rb_stdscr,attrs);
+ /* return INT2FIX(attroff(NUM2INT(attrs))); */
}
static VALUE
curses_attron(VALUE obj, VALUE attrs)
{
- return window_attron(rb_stdscr,attrs);
- /* return INT2FIX(attroff(NUM2INT(attrs))); */
+ return window_attron(rb_stdscr,attrs);
+ /* return INT2FIX(attroff(NUM2INT(attrs))); */
}
static VALUE
curses_attrset(VALUE obj, VALUE attrs)
{
- return window_attrset(rb_stdscr,attrs);
- /* return INT2FIX(attroff(NUM2INT(attrs))); */
+ return window_attrset(rb_stdscr,attrs);
+ /* return INT2FIX(attroff(NUM2INT(attrs))); */
}
static VALUE
curses_bkgdset(VALUE obj, VALUE ch)
{
#ifdef HAVE_BKGDSET
- bkgdset(NUM2CH(ch));
+ bkgdset(NUM2CH(ch));
#endif
- return Qnil;
+ return Qnil;
}
static VALUE
curses_bkgd(VALUE obj, VALUE ch)
{
#ifdef HAVE_BKGD
- return (bkgd(NUM2CH(ch)) == OK) ? Qtrue : Qfalse;
-#else
- return Qfalse;
-#endif
-}
-
-#if defined(HAVE_USE_DEFAULT_COLORS)
-static VALUE
-curses_use_default_colors(VALUE obj)
-{
- use_default_colors();
- return Qnil;
-}
-#else
-#define curses_use_default_colors rb_f_notimplement
-#endif
-
-#if defined(HAVE_TABSIZE)
-static VALUE
-curses_tabsize_set(VALUE obj, VALUE val)
-{
- TABSIZE = NUM2INT(val);
- return INT2NUM(TABSIZE);
-}
+ return (bkgd(NUM2CH(ch)) == OK) ? Qtrue : Qfalse;
#else
-#define curses_tabsize_set rb_f_notimplement
+ return Qfalse;
#endif
-
-#if defined(HAVE_TABSIZE)
-static VALUE
-curses_tabsize_get(VALUE ojb)
-{
- return INT2NUM(TABSIZE);
}
-#else
-#define curses_tabsize_get rb_f_notimplement
-#endif
-
-#if defined(HAVE_ESCDELAY)
-static VALUE
-curses_escdelay_set(VALUE obj, VALUE val)
-{
- ESCDELAY = NUM2INT(val);
- return INT2NUM(ESCDELAY);
-}
-#else
-#define curses_escdelay_set rb_f_notimplement
-#endif
-
-#if defined(HAVE_ESCDELAY)
-static VALUE
-curses_escdelay_get(VALUE obj)
-{
- return INT2NUM(ESCDELAY);
-}
-#else
-#define curses_escdelay_get rb_f_notimplement
-#endif
static VALUE
curses_resizeterm(VALUE obj, VALUE lin, VALUE col)
{
#if defined(HAVE_RESIZETERM)
- return (resizeterm(NUM2INT(lin),NUM2INT(col)) == OK) ? Qtrue : Qfalse;
+ return (resizeterm(NUM2INT(lin),NUM2INT(col)) == OK) ? Qtrue : Qfalse;
#else
- return Qnil;
+ return Qnil;
#endif
}
@@ -645,98 +588,77 @@ curses_resizeterm(VALUE obj, VALUE lin, VALUE col)
static VALUE
curses_start_color(VALUE obj)
{
- /* may have to raise exception on ERR */
- return (start_color() == OK) ? Qtrue : Qfalse;
+ /* may have to raise exception on ERR */
+ return (start_color() == OK) ? Qtrue : Qfalse;
}
static VALUE
curses_init_pair(VALUE obj, VALUE pair, VALUE f, VALUE b)
{
- /* may have to raise exception on ERR */
- return (init_pair(NUM2INT(pair),NUM2INT(f),NUM2INT(b)) == OK) ? Qtrue : Qfalse;
+ /* may have to raise exception on ERR */
+ return (init_pair(NUM2INT(pair),NUM2INT(f),NUM2INT(b)) == OK) ? Qtrue : Qfalse;
}
static VALUE
curses_init_color(VALUE obj, VALUE color, VALUE r, VALUE g, VALUE b)
{
- /* may have to raise exception on ERR */
- return (init_color(NUM2INT(color),NUM2INT(r),
- NUM2INT(g),NUM2INT(b)) == OK) ? Qtrue : Qfalse;
+ /* may have to raise exception on ERR */
+ return (init_color(NUM2INT(color),NUM2INT(r),
+ NUM2INT(g),NUM2INT(b)) == OK) ? Qtrue : Qfalse;
}
static VALUE
curses_has_colors(VALUE obj)
{
- return has_colors() ? Qtrue : Qfalse;
+ return has_colors() ? Qtrue : Qfalse;
}
static VALUE
curses_can_change_color(VALUE obj)
{
- return can_change_color() ? Qtrue : Qfalse;
+ return can_change_color() ? Qtrue : Qfalse;
}
-#if defined(HAVE_COLORS)
-static VALUE
-curses_colors(VALUE obj)
-{
- return INT2FIX(COLORS);
-}
-#else
-#define curses_colors rb_f_notimplement
-#endif
-
static VALUE
curses_color_content(VALUE obj, VALUE color)
{
- short r,g,b;
+ short r,g,b;
- color_content(NUM2INT(color),&r,&g,&b);
- return rb_ary_new3(3,INT2FIX(r),INT2FIX(g),INT2FIX(b));
+ color_content(NUM2INT(color),&r,&g,&b);
+ return rb_ary_new3(3,INT2FIX(r),INT2FIX(g),INT2FIX(b));
}
-
-#if defined(HAVE_COLOR_PAIRS)
-static VALUE
-curses_color_pairs(VALUE obj)
-{
- return INT2FIX(COLOR_PAIRS);
-}
-#else
-#define curses_color_pairs rb_f_notimplement
-#endif
-
static VALUE
curses_pair_content(VALUE obj, VALUE pair)
{
- short f,b;
+ short f,b;
- pair_content(NUM2INT(pair),&f,&b);
- return rb_ary_new3(2,INT2FIX(f),INT2FIX(b));
+ pair_content(NUM2INT(pair),&f,&b);
+ return rb_ary_new3(2,INT2FIX(f),INT2FIX(b));
}
static VALUE
curses_color_pair(VALUE obj, VALUE attrs)
{
- return INT2FIX(COLOR_PAIR(NUM2INT(attrs)));
+ return INT2FIX(COLOR_PAIR(NUM2INT(attrs)));
}
static VALUE
curses_pair_number(VALUE obj, VALUE attrs)
{
- return INT2FIX(PAIR_NUMBER(NUM2INT(attrs)));
+ return INT2FIX(PAIR_NUMBER(NUM2INT(attrs)));
}
#endif /* USE_COLOR */
#ifdef USE_MOUSE
struct mousedata {
- MEVENT *mevent;
+ MEVENT *mevent;
};
static void
-no_mevent(void)
+no_mevent()
{
- rb_raise(rb_eRuntimeError, "no such mouse event");
+ rb_raise(rb_eRuntimeError, "no such mouse event");
}
#define GetMOUSE(obj, data) do {\
@@ -749,49 +671,49 @@ no_mevent(void)
static void
curses_mousedata_free(struct mousedata *mdata)
{
- if (mdata->mevent)
- xfree(mdata->mevent);
+ if (mdata->mevent)
+ free(mdata->mevent);
}
static VALUE
curses_getmouse(VALUE obj)
{
- struct mousedata *mdata;
- VALUE val;
+ struct mousedata *mdata;
+ VALUE val;
- val = Data_Make_Struct(cMouseEvent,struct mousedata,
- 0,curses_mousedata_free,mdata);
- mdata->mevent = (MEVENT*)xmalloc(sizeof(MEVENT));
- return (getmouse(mdata->mevent) == OK) ? val : Qnil;
+ val = Data_Make_Struct(cMouseEvent,struct mousedata,
+ 0,curses_mousedata_free,mdata);
+ mdata->mevent = (MEVENT*)xmalloc(sizeof(MEVENT));
+ return (getmouse(mdata->mevent) == OK) ? val : Qnil;
}
static VALUE
curses_ungetmouse(VALUE obj, VALUE mevent)
{
- struct mousedata *mdata;
+ struct mousedata *mdata;
- GetMOUSE(mevent,mdata);
- return (ungetmouse(mdata->mevent) == OK) ? Qtrue : Qfalse;
+ GetMOUSE(mevent,mdata);
+ return (ungetmouse(mdata->mevent) == OK) ? Qtrue : Qfalse;
}
static VALUE
curses_mouseinterval(VALUE obj, VALUE interval)
{
- return mouseinterval(NUM2INT(interval)) ? Qtrue : Qfalse;
+ return mouseinterval(NUM2INT(interval)) ? Qtrue : Qfalse;
}
static VALUE
curses_mousemask(VALUE obj, VALUE mask)
{
- return INT2NUM(mousemask(NUM2UINT(mask),NULL));
+ return INT2NUM(mousemask(NUM2UINT(mask),NULL));
}
#define DEFINE_MOUSE_GET_MEMBER(func_name,mem) \
static VALUE func_name (VALUE mouse) \
{ \
- struct mousedata *mdata; \
- GetMOUSE(mouse, mdata); \
- return (UINT2NUM(mdata->mevent -> mem)); \
+ struct mousedata *mdata; \
+ GetMOUSE(mouse, mdata); \
+ return (UINT2NUM(mdata->mevent -> mem)); \
}
DEFINE_MOUSE_GET_MEMBER(curs_mouse_id, id)
@@ -802,36 +724,36 @@ DEFINE_MOUSE_GET_MEMBER(curs_mouse_bstate, bstate)
#undef define_curs_mouse_member
#endif /* USE_MOUSE */
-#ifdef HAVE_TIMEOUT
static VALUE
curses_timeout(VALUE obj, VALUE delay)
{
- timeout(NUM2INT(delay));
- return Qnil;
-}
+#ifdef HAVE_TIMEOUT
+ timeout(NUM2INT(delay));
+ return Qnil;
#else
-#define curses_timeout rb_f_notimplement
+ rb_notimplement();
#endif
+}
-#ifdef HAVE_DEF_PROG_MODE
static VALUE
curses_def_prog_mode(VALUE obj)
{
- return def_prog_mode() == OK ? Qtrue : Qfalse;
-}
+#ifdef HAVE_DEF_PROG_MODE
+ return def_prog_mode() == OK ? Qtrue : Qfalse;
#else
-#define curses_def_prog_mode rb_f_notimplement
+ rb_notimplement();
#endif
+}
-#ifdef HAVE_RESET_PROG_MODE
static VALUE
curses_reset_prog_mode(VALUE obj)
{
- return reset_prog_mode() == OK ? Qtrue : Qfalse;
-}
+#ifdef HAVE_RESET_PROG_MODE
+ return reset_prog_mode() == OK ? Qtrue : Qfalse;
#else
-#define curses_reset_prog_mode rb_f_notimplement
+ rb_notimplement();
#endif
+}
/*-------------------------- class Window --------------------------*/
@@ -846,7 +768,12 @@ window_s_allocate(VALUE class)
/* def initialize(h, w, top, left) */
static VALUE
-window_initialize(VALUE obj, VALUE h, VALUE w, VALUE top, VALUE left)
+window_initialize(obj, h, w, top, left)
+ VALUE obj;
+ VALUE h;
+ VALUE w;
+ VALUE top;
+ VALUE left;
{
struct windata *winp;
WINDOW *window;
@@ -864,7 +791,12 @@ window_initialize(VALUE obj, VALUE h, VALUE w, VALUE top, VALUE left)
/* def subwin(height, width, top, left) */
static VALUE
-window_subwin(VALUE obj, VALUE height, VALUE width, VALUE top, VALUE left)
+window_subwin(obj, height, width, top, left)
+ VALUE obj;
+ VALUE height;
+ VALUE width;
+ VALUE top;
+ VALUE left;
{
struct windata *winp;
WINDOW *window;
@@ -884,10 +816,11 @@ window_subwin(VALUE obj, VALUE height, VALUE width, VALUE top, VALUE left)
/* def close */
static VALUE
-window_close(VALUE obj)
+window_close(obj)
+ VALUE obj;
{
struct windata *winp;
-
+
GetWINDOW(obj, winp);
delwin(winp->window);
winp->window = 0;
@@ -897,43 +830,47 @@ window_close(VALUE obj)
/* def clear */
static VALUE
-window_clear(VALUE obj)
+window_clear(obj)
+ VALUE obj;
{
struct windata *winp;
-
+
GetWINDOW(obj, winp);
wclear(winp->window);
-
+
return Qnil;
}
/* def clrtoeol */
static VALUE
-window_clrtoeol(VALUE obj)
+window_clrtoeol(obj)
+ VALUE obj;
{
struct windata *winp;
-
+
GetWINDOW(obj, winp);
wclrtoeol(winp->window);
-
+
return Qnil;
}
/* def refresh */
static VALUE
-window_refresh(VALUE obj)
+window_refresh(obj)
+ VALUE obj;
{
struct windata *winp;
-
+
GetWINDOW(obj, winp);
wrefresh(winp->window);
-
+
return Qnil;
}
/* def noutrefresh */
static VALUE
-window_noutrefresh(VALUE obj)
+window_noutrefresh(obj)
+ VALUE obj;
{
struct windata *winp;
@@ -949,10 +886,13 @@ window_noutrefresh(VALUE obj)
/* def move(y, x) */
static VALUE
-window_move(VALUE obj, VALUE y, VALUE x)
+window_move(obj, y, x)
+ VALUE obj;
+ VALUE y;
+ VALUE x;
{
struct windata *winp;
-
+
GetWINDOW(obj, winp);
mvwin(winp->window, NUM2INT(y), NUM2INT(x));
@@ -961,10 +901,13 @@ window_move(VALUE obj, VALUE y, VALUE x)
/* def setpos(y, x) */
static VALUE
-window_setpos(VALUE obj, VALUE y, VALUE x)
+window_setpos(obj, y, x)
+ VALUE obj;
+ VALUE y;
+ VALUE x;
{
struct windata *winp;
-
+
GetWINDOW(obj, winp);
wmove(winp->window, NUM2INT(y), NUM2INT(x));
return Qnil;
@@ -972,7 +915,8 @@ window_setpos(VALUE obj, VALUE y, VALUE x)
/* def cury */
static VALUE
-window_cury(VALUE obj)
+window_cury(obj)
+ VALUE obj;
{
struct windata *winp;
int x, y;
@@ -984,7 +928,8 @@ window_cury(VALUE obj)
/* def curx */
static VALUE
-window_curx(VALUE obj)
+window_curx(obj)
+ VALUE obj;
{
struct windata *winp;
int x, y;
@@ -996,7 +941,8 @@ window_curx(VALUE obj)
/* def maxy */
static VALUE
-window_maxy(VALUE obj)
+window_maxy(obj)
+ VALUE obj;
{
struct windata *winp;
@@ -1016,7 +962,8 @@ window_maxy(VALUE obj)
/* def maxx */
static VALUE
-window_maxx(VALUE obj)
+window_maxx(obj)
+ VALUE obj;
{
struct windata *winp;
@@ -1036,7 +983,8 @@ window_maxx(VALUE obj)
/* def begy */
static VALUE
-window_begy(VALUE obj)
+window_begy(obj)
+ VALUE obj;
{
struct windata *winp;
int x, y;
@@ -1052,7 +1000,8 @@ window_begy(VALUE obj)
/* def begx */
static VALUE
-window_begx(VALUE obj)
+window_begx(obj)
+ VALUE obj;
{
struct windata *winp;
int x, y;
@@ -1068,9 +1017,11 @@ window_begx(VALUE obj)
/* def box(vert, hor) */
static VALUE
-window_box(int argc, VALUE *argv, VALUE self)
+window_box(argc, argv, self)
+ int argc;
+ VALUE argv[], self;
{
- struct windata *winp;
+ struct windata *winp;
VALUE vert, hor, corn;
rb_scan_args(argc, argv, "21", &vert, &hor, &corn);
@@ -1079,33 +1030,34 @@ window_box(int argc, VALUE *argv, VALUE self)
box(winp->window, NUM2CH(vert), NUM2CH(hor));
if (!NIL_P(corn)) {
- int cur_x, cur_y, x, y;
- chtype c;
-
- c = NUM2CH(corn);
- getyx(winp->window, cur_y, cur_x);
- x = NUM2INT(window_maxx(self)) - 1;
- y = NUM2INT(window_maxy(self)) - 1;
- wmove(winp->window, 0, 0);
- waddch(winp->window, c);
- wmove(winp->window, y, 0);
- waddch(winp->window, c);
- wmove(winp->window, y, x);
- waddch(winp->window, c);
- wmove(winp->window, 0, x);
- waddch(winp->window, c);
- wmove(winp->window, cur_y, cur_x);
+ int cur_x, cur_y, x, y;
+ chtype c;
+
+ c = NUM2CH(corn);
+ getyx(winp->window, cur_y, cur_x);
+ x = NUM2INT(window_maxx(self)) - 1;
+ y = NUM2INT(window_maxy(self)) - 1;
+ wmove(winp->window, 0, 0);
+ waddch(winp->window, c);
+ wmove(winp->window, y, 0);
+ waddch(winp->window, c);
+ wmove(winp->window, y, x);
+ waddch(winp->window, c);
+ wmove(winp->window, 0, x);
+ waddch(winp->window, c);
+ wmove(winp->window, cur_y, cur_x);
}
-
+
return Qnil;
}
/* def standout */
static VALUE
-window_standout(VALUE obj)
+window_standout(obj)
+ VALUE obj;
{
struct windata *winp;
-
+
GetWINDOW(obj, winp);
wstandout(winp->window);
return Qnil;
@@ -1113,10 +1065,11 @@ window_standout(VALUE obj)
/* def standend */
static VALUE
-window_standend(VALUE obj)
+window_standend(obj)
+ VALUE obj;
{
struct windata *winp;
-
+
GetWINDOW(obj, winp);
wstandend(winp->window);
return Qnil;
@@ -1124,56 +1077,63 @@ window_standend(VALUE obj)
/* def inch */
static VALUE
-window_inch(VALUE obj)
+window_inch(obj)
+ VALUE obj;
{
struct windata *winp;
-
+
GetWINDOW(obj, winp);
return CH2FIX(winch(winp->window));
}
/* def addch(ch) */
static VALUE
-window_addch(VALUE obj, VALUE ch)
+window_addch(obj, ch)
+ VALUE obj;
+ VALUE ch;
{
struct windata *winp;
-
+
GetWINDOW(obj, winp);
waddch(winp->window, NUM2CH(ch));
-
+
return Qnil;
}
/* def insch(ch) */
static VALUE
-window_insch(VALUE obj, VALUE ch)
+window_insch(obj, ch)
+ VALUE obj;
+ VALUE ch;
{
struct windata *winp;
-
+
GetWINDOW(obj, winp);
winsch(winp->window, NUM2CH(ch));
-
+
return Qnil;
}
/* def addstr(str) */
static VALUE
-window_addstr(VALUE obj, VALUE str)
+window_addstr(obj, str)
+ VALUE obj;
+ VALUE str;
{
if (!NIL_P(str)) {
struct windata *winp;
- StringValue(str);
- str = rb_str_export_locale(str);
GetWINDOW(obj, winp);
- waddstr(winp->window, StringValueCStr(str));
+ waddstr(winp->window, STR2CSTR(str));
}
return Qnil;
}
/* def <<(str) */
static VALUE
-window_addstr2(VALUE obj, VALUE str)
+window_addstr2(obj, str)
+ VALUE obj;
+ VALUE str;
{
window_addstr(obj, str);
return obj;
@@ -1181,30 +1141,24 @@ window_addstr2(VALUE obj, VALUE str)
/* def getch */
static VALUE
-window_getch(VALUE obj)
+window_getch(obj)
+ VALUE obj;
{
struct windata *winp;
- int c;
-
+
rb_read_check(stdin);
GetWINDOW(obj, winp);
- c = wgetch(winp->window);
- if (c == EOF) return Qnil;
- if (rb_isprint(c)) {
- char ch = (char)c;
-
- return rb_locale_str_new(&ch, 1);
- }
- return UINT2NUM(c);
+ return UINT2NUM(wgetch(winp->window));
}
/* def getstr */
static VALUE
-window_getstr(VALUE obj)
+window_getstr(obj)
+ VALUE obj;
{
struct windata *winp;
char rtn[1024]; /* This should be big enough.. I hope */
-
+
GetWINDOW(obj, winp);
rb_read_check(stdin);
#if defined(HAVE_WGETNSTR)
@@ -1212,15 +1166,16 @@ window_getstr(VALUE obj)
#else
wgetstr(winp->window, rtn);
#endif
- return rb_locale_str_new_cstr(rtn);
+ return rb_tainted_str_new2(rtn);
}
/* def delch */
static VALUE
-window_delch(VALUE obj)
+window_delch(obj)
+ VALUE obj;
{
struct windata *winp;
-
+
GetWINDOW(obj, winp);
wdelch(winp->window);
return Qnil;
@@ -1228,11 +1183,12 @@ window_delch(VALUE obj)
/* def delelteln */
static VALUE
-window_deleteln(VALUE obj)
+window_deleteln(obj)
+ VALUE obj;
{
#if defined(HAVE_WDELETELN) || defined(wdeleteln)
struct windata *winp;
-
+
GetWINDOW(obj, winp);
wdeleteln(winp->window);
#endif
@@ -1241,11 +1197,12 @@ window_deleteln(VALUE obj)
/* def insertln */
static VALUE
-window_insertln(VALUE obj)
+window_insertln(obj)
+ VALUE obj;
{
#if defined(HAVE_WINSERTLN) || defined(winsertln)
struct windata *winp;
-
+
GetWINDOW(obj, winp);
winsertln(winp->window);
#endif
@@ -1255,73 +1212,73 @@ window_insertln(VALUE obj)
static VALUE
window_scrollok(VALUE obj, VALUE bf)
{
- struct windata *winp;
+ struct windata *winp;
- GetWINDOW(obj, winp);
- scrollok(winp->window, RTEST(bf) ? TRUE : FALSE);
- return Qnil;
+ GetWINDOW(obj, winp);
+ scrollok(winp->window, RTEST(bf) ? TRUE : FALSE);
+ return Qnil;
}
static VALUE
window_idlok(VALUE obj, VALUE bf)
{
- struct windata *winp;
+ struct windata *winp;
- GetWINDOW(obj, winp);
- idlok(winp->window, RTEST(bf) ? TRUE : FALSE);
- return Qnil;
+ GetWINDOW(obj, winp);
+ idlok(winp->window, RTEST(bf) ? TRUE : FALSE);
+ return Qnil;
}
static VALUE
window_setscrreg(VALUE obj, VALUE top, VALUE bottom)
{
#ifdef HAVE_WSETSCRREG
- struct windata *winp;
- int res;
+ struct windata *winp;
+ int res;
- GetWINDOW(obj, winp);
- res = wsetscrreg(winp->window, NUM2INT(top), NUM2INT(bottom));
- /* may have to raise exception on ERR */
- return (res == OK) ? Qtrue : Qfalse;
+ GetWINDOW(obj, winp);
+ res = wsetscrreg(winp->window, NUM2INT(top), NUM2INT(bottom));
+ /* may have to raise exception on ERR */
+ return (res == OK) ? Qtrue : Qfalse;
#else
- return Qfalse;
+ return Qfalse;
#endif
}
#if defined(USE_COLOR) && defined(HAVE_WCOLOR_SET)
static VALUE
-window_color_set(VALUE obj, VALUE col)
+window_color_set(VALUE obj, VALUE col)
{
- struct windata *winp;
- int res;
+ struct windata *winp;
+ int res;
- GetWINDOW(obj, winp);
- res = wcolor_set(winp->window, NUM2INT(col), NULL);
- return (res == OK) ? Qtrue : Qfalse;
+ GetWINDOW(obj, winp);
+ res = wcolor_set(winp->window, NUM2INT(col), NULL);
+ return (res == OK) ? Qtrue : Qfalse;
}
-#endif /* defined(USE_COLOR) && defined(HAVE_WCOLOR_SET) */
+#endif /* USE_COLOR */
static VALUE
window_scroll(VALUE obj)
{
- struct windata *winp;
+ struct windata *winp;
- GetWINDOW(obj, winp);
- /* may have to raise exception on ERR */
- return (scroll(winp->window) == OK) ? Qtrue : Qfalse;
+ GetWINDOW(obj, winp);
+ /* may have to raise exception on ERR */
+ return (scroll(winp->window) == OK) ? Qtrue : Qfalse;
}
static VALUE
window_scrl(VALUE obj, VALUE n)
{
#ifdef HAVE_WSCRL
- struct windata *winp;
+ struct windata *winp;
- GetWINDOW(obj, winp);
- /* may have to raise exception on ERR */
- return (wscrl(winp->window,NUM2INT(n)) == OK) ? Qtrue : Qfalse;
+ GetWINDOW(obj, winp);
+ /* may have to raise exception on ERR */
+ return (wscrl(winp->window,NUM2INT(n)) == OK) ? Qtrue : Qfalse;
#else
- return Qfalse;
+ return Qfalse;
#endif
}
@@ -1329,12 +1286,12 @@ static VALUE
window_attroff(VALUE obj, VALUE attrs)
{
#ifdef HAVE_WATTROFF
- struct windata *winp;
+ struct windata *winp;
- GetWINDOW(obj,winp);
- return INT2FIX(wattroff(winp->window,NUM2INT(attrs)));
+ GetWINDOW(obj,winp);
+ return INT2FIX(wattroff(winp->window,NUM2INT(attrs)));
#else
- return Qtrue;
+ return Qtrue;
#endif
}
@@ -1342,21 +1299,21 @@ static VALUE
window_attron(VALUE obj, VALUE attrs)
{
#ifdef HAVE_WATTRON
- struct windata *winp;
- VALUE val;
-
- GetWINDOW(obj,winp);
- val = INT2FIX(wattron(winp->window,NUM2INT(attrs)));
- if (rb_block_given_p()) {
- rb_yield(val);
- wattroff(winp->window,NUM2INT(attrs));
- return val;
- }
- else{
- return val;
- }
+ struct windata *winp;
+ VALUE val;
+
+ GetWINDOW(obj,winp);
+ val = INT2FIX(wattron(winp->window,NUM2INT(attrs)));
+ if( rb_block_given_p() ){
+ rb_yield(val);
+ wattroff(winp->window,NUM2INT(attrs));
+ return val;
+ }
+ else{
+ return val;
+ }
#else
- return Qtrue;
+ return Qtrue;
#endif
}
@@ -1364,12 +1321,12 @@ static VALUE
window_attrset(VALUE obj, VALUE attrs)
{
#ifdef HAVE_WATTRSET
- struct windata *winp;
+ struct windata *winp;
- GetWINDOW(obj,winp);
- return INT2FIX(wattrset(winp->window,NUM2INT(attrs)));
+ GetWINDOW(obj,winp);
+ return INT2FIX(wattrset(winp->window,NUM2INT(attrs)));
#else
- return Qtrue;
+ return Qtrue;
#endif
}
@@ -1377,24 +1334,24 @@ static VALUE
window_bkgdset(VALUE obj, VALUE ch)
{
#ifdef HAVE_WBKGDSET
- struct windata *winp;
+ struct windata *winp;
- GetWINDOW(obj,winp);
- wbkgdset(winp->window, NUM2CH(ch));
+ GetWINDOW(obj,winp);
+ wbkgdset(winp->window, NUM2CH(ch));
#endif
- return Qnil;
+ return Qnil;
}
static VALUE
window_bkgd(VALUE obj, VALUE ch)
{
#ifdef HAVE_WBKGD
- struct windata *winp;
+ struct windata *winp;
- GetWINDOW(obj,winp);
- return (wbkgd(winp->window, NUM2CH(ch)) == OK) ? Qtrue : Qfalse;
+ GetWINDOW(obj,winp);
+ return (wbkgd(winp->window, NUM2CH(ch)) == OK) ? Qtrue : Qfalse;
#else
- return Qfalse;
+ return Qfalse;
#endif
}
@@ -1402,13 +1359,13 @@ static VALUE
window_getbkgd(VALUE obj)
{
#ifdef HAVE_WGETBKGD
- chtype c;
- struct windata *winp;
+ chtype c;
+ struct windata *winp;
- GetWINDOW(obj,winp);
- return (c = getbkgd(winp->window) != ERR) ? CH2FIX(c) : Qnil;
+ GetWINDOW(obj,winp);
+ return (c = getbkgd(winp->window) != ERR) ? CH2FIX(c) : Qnil;
#else
- return Qnil;
+ return Qnil;
#endif
}
@@ -1416,73 +1373,73 @@ static VALUE
window_resize(VALUE obj, VALUE lin, VALUE col)
{
#if defined(HAVE_WRESIZE)
- struct windata *winp;
+ struct windata *winp;
- GetWINDOW(obj,winp);
- return wresize(winp->window, NUM2INT(lin), NUM2INT(col)) == OK ? Qtrue : Qfalse;
+ GetWINDOW(obj,winp);
+ return wresize(winp->window, NUM2INT(lin), NUM2INT(col)) == OK ? Qtrue : Qfalse;
#else
- return Qnil;
+ return Qnil;
#endif
}
-#ifdef HAVE_KEYPAD
static VALUE
window_keypad(VALUE obj, VALUE val)
{
- struct windata *winp;
+#ifdef HAVE_KEYPAD
+ struct windata *winp;
- GetWINDOW(obj,winp);
- /* keypad() of NetBSD's libcurses returns no value */
+ GetWINDOW(obj,winp);
+ /* keypad() of NetBSD's libcurses returns no value */
#if defined(__NetBSD__) && !defined(NCURSES_VERSION)
- keypad(winp->window,(RTEST(val) ? TRUE : FALSE));
- return Qnil;
+ keypad(winp->window,(RTEST(val) ? TRUE : FALSE));
+ return Qnil;
#else
- /* may have to raise exception on ERR */
- return (keypad(winp->window,RTEST(val) ? TRUE : FALSE)) == OK ?
- Qtrue : Qfalse;
+ /* may have to raise exception on ERR */
+ return (keypad(winp->window,RTEST(val) ? TRUE : FALSE)) == OK ?
+ Qtrue : Qfalse;
#endif
-}
#else
-#define window_keypad rb_f_notimplement
-#endif
+ rb_notimplement();
+#endif /* HAVE_KEYPAD */
+}
-#ifdef HAVE_NODELAY
static VALUE
window_nodelay(VALUE obj, VALUE val)
{
- struct windata *winp;
- GetWINDOW(obj,winp);
+#ifdef HAVE_NODELAY
+ struct windata *winp;
+ GetWINDOW(obj,winp);
- /* nodelay() of NetBSD's libcurses returns no value */
+ /* nodelay() of NetBSD's libcurses returns no value */
#if defined(__NetBSD__) && !defined(NCURSES_VERSION)
- nodelay(winp->window, RTEST(val) ? TRUE : FALSE);
- return Qnil;
+ nodelay(winp->window, RTEST(val) ? TRUE : FALSE);
+ return Qnil;
#else
- return nodelay(winp->window,RTEST(val) ? TRUE : FALSE) == OK ? Qtrue : Qfalse;
+ return nodelay(winp->window,RTEST(val) ? TRUE : FALSE) == OK ? Qtrue : Qfalse;
#endif
-}
#else
-#define window_nodelay rb_f_notimplement
+ rb_notimplement();
#endif
+}
-#ifdef HAVE_WTIMEOUT
static VALUE
window_timeout(VALUE obj, VALUE delay)
{
- struct windata *winp;
- GetWINDOW(obj,winp);
+#ifdef HAVE_WTIMEOUT
+ struct windata *winp;
+ GetWINDOW(obj,winp);
- wtimeout(winp->window,NUM2INT(delay));
- return Qnil;
-}
+ wtimeout(winp->window,NUM2INT(delay));
+ return Qnil;
#else
-#define window_timeout rb_f_notimplement
+ rb_notimplement();
#endif
+}
/*------------------------- Initialization -------------------------*/
void
-Init_curses(void)
+Init_curses()
{
mCurses = rb_define_module("Curses");
mKey = rb_define_module_under(mCurses, "Key");
@@ -1499,12 +1456,6 @@ Init_curses(void)
rb_define_method(cMouseEvent, "bstate", curs_mouse_bstate, 0);
#endif /* USE_MOUSE */
- rb_define_module_function(mCurses, "ESCDELAY=", curses_escdelay_set, 1);
- rb_define_module_function(mCurses, "ESCDELAY", curses_escdelay_get, 0);
- rb_define_module_function(mCurses, "TABSIZE", curses_tabsize_get, 0);
- rb_define_module_function(mCurses, "TABSIZE=", curses_tabsize_set, 1);
-
- rb_define_module_function(mCurses, "use_default_colors", curses_use_default_colors, 0);
rb_define_module_function(mCurses, "init_screen", curses_init_screen, 0);
rb_define_module_function(mCurses, "close_screen", curses_close_screen, 0);
rb_define_module_function(mCurses, "closed?", curses_closed, 0);
@@ -1519,8 +1470,8 @@ Init_curses(void)
rb_define_module_function(mCurses, "noraw", curses_noraw, 0);
rb_define_module_function(mCurses, "cbreak", curses_cbreak, 0);
rb_define_module_function(mCurses, "nocbreak", curses_nocbreak, 0);
- rb_define_module_function(mCurses, "crmode", curses_nocbreak, 0);
- rb_define_module_function(mCurses, "nocrmode", curses_nocbreak, 0);
+ rb_define_alias(mCurses, "crmode", "cbreak");
+ rb_define_alias(mCurses, "nocrmode", "nocbreak");
rb_define_module_function(mCurses, "nl", curses_nl, 0);
rb_define_module_function(mCurses, "nonl", curses_nonl, 0);
rb_define_module_function(mCurses, "beep", curses_beep, 0);
@@ -1558,9 +1509,7 @@ Init_curses(void)
rb_define_module_function(mCurses, "has_colors?", curses_has_colors, 0);
rb_define_module_function(mCurses, "can_change_color?",
curses_can_change_color, 0);
- rb_define_module_function(mCurses, "colors", curses_colors, 0);
rb_define_module_function(mCurses, "color_content", curses_color_content, 1);
- rb_define_module_function(mCurses, "color_pairs", curses_color_pairs, 0);
rb_define_module_function(mCurses, "pair_content", curses_pair_content, 1);
rb_define_module_function(mCurses, "color_pair", curses_color_pair, 1);
rb_define_module_function(mCurses, "pair_number", curses_pair_number, 1);
@@ -1796,14 +1745,14 @@ Init_curses(void)
#ifdef KEY_F
/* KEY_F(n) : 0 <= n <= 63 */
{
- int i;
- char c[8];
- for (i=0; i<64; i++) {
- sprintf(c, "KEY_F%d", i);
- rb_define_const(mCurses, c, INT2NUM(KEY_F(i)));
- sprintf(c, "F%d", i);
- rb_define_const(mKey, c, INT2NUM(KEY_F(i)));
- }
+ int i;
+ char c[8];
+ for( i=0; i<64; i++ ){
+ sprintf(c, "KEY_F%d", i);
+ rb_define_const(mCurses, c, INT2NUM(KEY_F(i)));
+ sprintf(c, "F%d", i);
+ rb_define_const(mKey, c, INT2NUM(KEY_F(i)));
+ }
}
#endif
#ifdef KEY_DL
@@ -2139,12 +2088,12 @@ Init_curses(void)
rb_define_const(mKey, "MAX", INT2NUM(KEY_MAX));
#endif
{
- int c;
- char name[] = "KEY_CTRL_x";
- for (c = 'A'; c <= 'Z'; c++) {
- name[sizeof(name) - 2] = c;
- rb_define_const(mCurses, name, INT2FIX(c - 'A' + 1));
- }
+ int c;
+ char name[] = "KEY_CTRL_x";
+ for( c = 'A'; c <= 'Z'; c++ ){
+ sprintf(name, "KEY_CTRL_%c", c);
+ rb_define_const(mCurses, name, INT2FIX(c - 'A' + 1));
+ }
}
#undef rb_curses_define_const
diff --git a/ext/curses/extconf.rb b/ext/curses/extconf.rb
index 4172c8a6b6..0124bbbf4a 100644
--- a/ext/curses/extconf.rb
+++ b/ext/curses/extconf.rb
@@ -5,11 +5,9 @@ dir_config('ncurses')
dir_config('termcap')
make=false
-headers = []
-
have_library("mytinfo", "tgetent") if /bow/ =~ RUBY_PLATFORM
have_library("tinfo", "tgetent") or have_library("termcap", "tgetent")
-if have_header(*curses=%w"ncurses.h") and (have_library("ncursesw", "initscr") or have_library("ncurses", "initscr"))
+if have_header(*curses=%w"ncurses.h") and have_library("ncurses", "initscr")
make=true
elsif have_header(*curses=%w"ncurses/curses.h") and have_library("ncurses", "initscr")
make=true
@@ -21,16 +19,13 @@ elsif have_header(*curses=%w"curses.h") and have_library("curses", "initscr")
end
if make
- for f in %w(beep bkgd bkgdset curs_set deleteln doupdate flash getbkgd getnstr init isendwin keyname keypad resizeterm scrl set setscrreg ungetch wattroff wattron wattrset wbkgd wbkgdset wdeleteln wgetnstr wresize wscrl wsetscrreg def_prog_mode reset_prog_mode timeout wtimeout nodelay init_color wcolor_set use_default_colors)
+ for f in %w(beep bkgd bkgdset curs_set deleteln doupdate flash getbkgd getnstr init isendwin keyname keypad resizeterm scrl set setscrreg ungetch wattroff wattron wattrset wbkgd wbkgdset wdeleteln wgetnstr wresize wscrl wsetscrreg def_prog_mode reset_prog_mode timeout wtimeout nodelay init_color wcolor_set)
have_func(f) || (have_macro(f, curses) && $defs.push(format("-DHAVE_%s", f.upcase)))
end
flag = "-D_XOPEN_SOURCE_EXTENDED"
- if try_static_assert("sizeof(char*)>sizeof(int)", %w[stdio.h stdlib.h]+curses , flag)
+ src = "int test_var[(sizeof(char*)>sizeof(int))*2-1];"
+ if try_compile(cpp_include(%w[stdio.h stdlib.h]+curses)+src , flag)
$defs << flag
end
- have_var("ESCDELAY", curses)
- have_var("TABSIZE", curses)
- have_var("COLORS", curses)
- have_var("COLOR_PAIRS", curses)
create_makefile("curses")
end
diff --git a/ext/curses/view.rb b/ext/curses/view.rb
index e033fd8ae2..d9a82a57db 100644
--- a/ext/curses/view.rb
+++ b/ext/curses/view.rb
@@ -48,7 +48,7 @@ while TRUE
explicit = FALSE
n = 0
while TRUE
- c = getch
+ c = getch.chr
if c =~ /[0-9]/
n = 10 * n + c.to_i
else
@@ -67,10 +67,10 @@ while TRUE
else
break
end
- i += 1
+ i += 1
end
#wscrl(i)
-
+
when "p" #when KEY_UP
i = 0
while i < n
@@ -79,8 +79,8 @@ while TRUE
else
break
end
- i += 1
- end
+ i += 1
+ end
#wscrl(-i)
when "q"
diff --git a/ext/dbm/.cvsignore b/ext/dbm/.cvsignore
index 814345ece8..4088712231 100644
--- a/ext/dbm/.cvsignore
+++ b/ext/dbm/.cvsignore
@@ -1,4 +1,3 @@
Makefile
mkmf.log
*.def
-extconf.h
diff --git a/ext/dbm/dbm.c b/ext/dbm/dbm.c
index 84d331ae53..0247387fdc 100644
--- a/ext/dbm/dbm.c
+++ b/ext/dbm/dbm.c
@@ -3,6 +3,7 @@
dbm.c -
$Author$
+ $Date$
created at: Mon Jan 24 15:59:52 JST 1994
Copyright (C) 1995-2001 Yukihiro Matsumoto
@@ -31,7 +32,7 @@ struct dbmdata {
};
static void
-closed_dbm(void)
+closed_dbm()
{
rb_raise(rb_eDBMError, "closed DBM file");
}
@@ -48,16 +49,18 @@ closed_dbm(void)
}
static void
-free_dbm(struct dbmdata *dbmp)
+free_dbm(dbmp)
+ struct dbmdata *dbmp;
{
if (dbmp) {
if (dbmp->di_dbm) dbm_close(dbmp->di_dbm);
- xfree(dbmp);
+ free(dbmp);
}
}
static VALUE
-fdbm_close(VALUE obj)
+fdbm_close(obj)
+ VALUE obj;
{
struct dbmdata *dbmp;
@@ -69,7 +72,8 @@ fdbm_close(VALUE obj)
}
static VALUE
-fdbm_closed(VALUE obj)
+fdbm_closed(obj)
+ VALUE obj;
{
struct dbmdata *dbmp;
@@ -82,17 +86,21 @@ fdbm_closed(VALUE obj)
return Qfalse;
}
+static VALUE fdbm_alloc _((VALUE));
static VALUE
-fdbm_alloc(VALUE klass)
+fdbm_alloc(klass)
+ VALUE klass;
{
return Data_Wrap_Struct(klass, 0, free_dbm, 0);
}
static VALUE
-fdbm_initialize(int argc, VALUE *argv, VALUE obj)
+fdbm_initialize(argc, argv, obj)
+ int argc;
+ VALUE *argv;
+ VALUE obj;
{
- volatile VALUE file;
- VALUE vmode, vflags;
+ VALUE file, vmode, vflags;
DBM *dbm;
struct dbmdata *dbmp;
int mode, flags = 0;
@@ -110,28 +118,28 @@ fdbm_initialize(int argc, VALUE *argv, VALUE obj)
if (!NIL_P(vflags))
flags = NUM2INT(vflags);
- FilePathValue(file);
+ SafeStringValue(file);
if (flags & RUBY_DBM_RW_BIT) {
flags &= ~RUBY_DBM_RW_BIT;
- dbm = dbm_open(RSTRING_PTR(file), flags, mode);
+ dbm = dbm_open(RSTRING(file)->ptr, flags, mode);
}
else {
dbm = 0;
if (mode >= 0) {
- dbm = dbm_open(RSTRING_PTR(file), O_RDWR|O_CREAT, mode);
+ dbm = dbm_open(RSTRING(file)->ptr, O_RDWR|O_CREAT, mode);
}
if (!dbm) {
- dbm = dbm_open(RSTRING_PTR(file), O_RDWR, 0);
+ dbm = dbm_open(RSTRING(file)->ptr, O_RDWR, 0);
}
if (!dbm) {
- dbm = dbm_open(RSTRING_PTR(file), O_RDONLY, 0);
+ dbm = dbm_open(RSTRING(file)->ptr, O_RDONLY, 0);
}
}
if (!dbm) {
if (mode == -1) return Qnil;
- rb_sys_fail(RSTRING_PTR(file));
+ rb_sys_fail(RSTRING(file)->ptr);
}
dbmp = ALLOC(struct dbmdata);
@@ -143,7 +151,10 @@ fdbm_initialize(int argc, VALUE *argv, VALUE obj)
}
static VALUE
-fdbm_s_open(int argc, VALUE *argv, VALUE klass)
+fdbm_s_open(argc, argv, klass)
+ int argc;
+ VALUE *argv;
+ VALUE klass;
{
VALUE obj = Data_Wrap_Struct(klass, 0, free_dbm, 0);
@@ -159,15 +170,16 @@ fdbm_s_open(int argc, VALUE *argv, VALUE klass)
}
static VALUE
-fdbm_fetch(VALUE obj, VALUE keystr, VALUE ifnone)
+fdbm_fetch(obj, keystr, ifnone)
+ VALUE obj, keystr, ifnone;
{
datum key, value;
struct dbmdata *dbmp;
DBM *dbm;
- ExportStringValue(keystr);
- key.dptr = RSTRING_PTR(keystr);
- key.dsize = RSTRING_LEN(keystr);
+ StringValue(keystr);
+ key.dptr = RSTRING(keystr)->ptr;
+ key.dsize = RSTRING(keystr)->len;
GetDBM2(obj, dbmp, dbm);
value = dbm_fetch(dbm, key);
@@ -180,13 +192,17 @@ fdbm_fetch(VALUE obj, VALUE keystr, VALUE ifnone)
}
static VALUE
-fdbm_aref(VALUE obj, VALUE keystr)
+fdbm_aref(obj, keystr)
+ VALUE obj, keystr;
{
return fdbm_fetch(obj, keystr, Qnil);
}
static VALUE
-fdbm_fetch_m(int argc, VALUE *argv, VALUE obj)
+fdbm_fetch_m(argc, argv, obj)
+ int argc;
+ VALUE *argv;
+ VALUE obj;
{
VALUE keystr, valstr, ifnone;
@@ -199,21 +215,22 @@ fdbm_fetch_m(int argc, VALUE *argv, VALUE obj)
}
static VALUE
-fdbm_key(VALUE obj, VALUE valstr)
+fdbm_index(obj, valstr)
+ VALUE obj, valstr;
{
datum key, val;
struct dbmdata *dbmp;
DBM *dbm;
- ExportStringValue(valstr);
- val.dptr = RSTRING_PTR(valstr);
- val.dsize = RSTRING_LEN(valstr);
+ StringValue(valstr);
+ val.dptr = RSTRING(valstr)->ptr;
+ val.dsize = RSTRING(valstr)->len;
GetDBM2(obj, dbmp, dbm);
for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
val = dbm_fetch(dbm, key);
- if (val.dsize == RSTRING_LEN(valstr) &&
- memcmp(val.dptr, RSTRING_PTR(valstr), val.dsize) == 0) {
+ if (val.dsize == RSTRING(valstr)->len &&
+ memcmp(val.dptr, RSTRING(valstr)->ptr, val.dsize) == 0) {
return rb_tainted_str_new(key.dptr, key.dsize);
}
}
@@ -221,38 +238,68 @@ fdbm_key(VALUE obj, VALUE valstr)
}
static VALUE
-fdbm_index(VALUE hash, VALUE value)
+fdbm_indexes(argc, argv, obj)
+ int argc;
+ VALUE *argv;
+ VALUE obj;
{
- rb_warn("DBM#index is deprecated; use DBM#key");
- return fdbm_key(hash, value);
+ VALUE new;
+ int i;
+
+ new = rb_ary_new2(argc);
+ for (i=0; i<argc; i++) {
+ rb_ary_push(new, fdbm_fetch(obj, argv[i], Qnil));
+ }
+
+ return new;
}
static VALUE
-fdbm_select(VALUE obj)
+fdbm_select(argc, argv, obj)
+ int argc;
+ VALUE *argv;
+ VALUE obj;
{
- VALUE new = rb_ary_new();
- datum key, val;
- DBM *dbm;
- struct dbmdata *dbmp;
+ VALUE new = rb_ary_new2(argc);
+ int i;
- GetDBM2(obj, dbmp, dbm);
- for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
- VALUE assoc, v;
- val = dbm_fetch(dbm, key);
- assoc = rb_assoc_new(rb_tainted_str_new(key.dptr, key.dsize),
- rb_tainted_str_new(val.dptr, val.dsize));
- v = rb_yield(assoc);
- if (RTEST(v)) {
- rb_ary_push(new, assoc);
+ if (rb_block_given_p()) {
+ datum key, val;
+ DBM *dbm;
+ struct dbmdata *dbmp;
+
+ if (argc > 0) {
+ rb_raise(rb_eArgError, "wrong number arguments(%d for 0)", argc);
}
- GetDBM2(obj, dbmp, dbm);
+ GetDBM2(obj, dbmp, dbm);
+ for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
+ VALUE assoc, v;
+ val = dbm_fetch(dbm, key);
+ assoc = rb_assoc_new(rb_tainted_str_new(key.dptr, key.dsize),
+ rb_tainted_str_new(val.dptr, val.dsize));
+ v = rb_yield(assoc);
+ if (RTEST(v)) {
+ rb_ary_push(new, assoc);
+ }
+ GetDBM2(obj, dbmp, dbm);
+ }
+ }
+ else {
+ rb_warn("DBM#select(index..) is deprecated; use DBM#values_at");
+
+ for (i=0; i<argc; i++) {
+ rb_ary_push(new, fdbm_fetch(obj, argv[i], Qnil));
+ }
}
return new;
}
static VALUE
-fdbm_values_at(int argc, VALUE *argv, VALUE obj)
+fdbm_values_at(argc, argv, obj)
+ int argc;
+ VALUE *argv;
+ VALUE obj;
{
VALUE new = rb_ary_new2(argc);
int i;
@@ -265,14 +312,16 @@ fdbm_values_at(int argc, VALUE *argv, VALUE obj)
}
static void
-fdbm_modify(VALUE obj)
+fdbm_modify(obj)
+ VALUE obj;
{
rb_secure(4);
if (OBJ_FROZEN(obj)) rb_error_frozen("DBM");
}
static VALUE
-fdbm_delete(VALUE obj, VALUE keystr)
+fdbm_delete(obj, keystr)
+ VALUE obj, keystr;
{
datum key, value;
struct dbmdata *dbmp;
@@ -280,12 +329,11 @@ fdbm_delete(VALUE obj, VALUE keystr)
VALUE valstr;
fdbm_modify(obj);
- ExportStringValue(keystr);
- key.dptr = RSTRING_PTR(keystr);
- key.dsize = RSTRING_LEN(keystr);
+ StringValue(keystr);
+ key.dptr = RSTRING(keystr)->ptr;
+ key.dsize = RSTRING(keystr)->len;
GetDBM2(obj, dbmp, dbm);
-
value = dbm_fetch(dbm, key);
if (value.dptr == 0) {
if (rb_block_given_p()) return rb_yield(keystr);
@@ -306,7 +354,8 @@ fdbm_delete(VALUE obj, VALUE keystr)
}
static VALUE
-fdbm_shift(VALUE obj)
+fdbm_shift(obj)
+ VALUE obj;
{
datum key, val;
struct dbmdata *dbmp;
@@ -328,7 +377,8 @@ fdbm_shift(VALUE obj)
}
static VALUE
-fdbm_delete_if(VALUE obj)
+fdbm_delete_if(obj)
+ VALUE obj;
{
datum key, val;
struct dbmdata *dbmp;
@@ -352,23 +402,24 @@ fdbm_delete_if(VALUE obj)
GetDBM2(obj, dbmp, dbm);
}
- for (i = 0; i < RARRAY_LEN(ary); i++) {
- keystr = RARRAY_PTR(ary)[i];
- ExportStringValue(keystr);
- key.dptr = RSTRING_PTR(keystr);
- key.dsize = RSTRING_LEN(keystr);
+ for (i = 0; i < RARRAY(ary)->len; i++) {
+ keystr = RARRAY(ary)->ptr[i];
+ StringValue(keystr);
+ key.dptr = RSTRING(keystr)->ptr;
+ key.dsize = RSTRING(keystr)->len;
if (dbm_delete(dbm, key)) {
rb_raise(rb_eDBMError, "dbm_delete failed");
}
}
if (status) rb_jump_tag(status);
- if (n > 0) dbmp->di_size = n - RARRAY_LEN(ary);
+ if (n > 0) dbmp->di_size = n - RARRAY(ary)->len;
return obj;
}
static VALUE
-fdbm_clear(VALUE obj)
+fdbm_clear(obj)
+ VALUE obj;
{
datum key;
struct dbmdata *dbmp;
@@ -388,7 +439,8 @@ fdbm_clear(VALUE obj)
}
static VALUE
-fdbm_invert(VALUE obj)
+fdbm_invert(obj)
+ VALUE obj;
{
datum key, val;
struct dbmdata *dbmp;
@@ -406,36 +458,49 @@ fdbm_invert(VALUE obj)
return hash;
}
-static VALUE fdbm_store(VALUE,VALUE,VALUE);
+static VALUE each_pair _((VALUE));
static VALUE
-update_i(VALUE pair, VALUE dbm)
+each_pair(obj)
+ VALUE obj;
+{
+ return rb_funcall(obj, rb_intern("each_pair"), 0, 0);
+}
+
+static VALUE fdbm_store _((VALUE,VALUE,VALUE));
+
+static VALUE
+update_i(pair, dbm)
+ VALUE pair, dbm;
{
Check_Type(pair, T_ARRAY);
- if (RARRAY_LEN(pair) < 2) {
+ if (RARRAY(pair)->len < 2) {
rb_raise(rb_eArgError, "pair must be [key, value]");
}
- fdbm_store(dbm, RARRAY_PTR(pair)[0], RARRAY_PTR(pair)[1]);
+ fdbm_store(dbm, RARRAY(pair)->ptr[0], RARRAY(pair)->ptr[1]);
return Qnil;
}
static VALUE
-fdbm_update(VALUE obj, VALUE other)
+fdbm_update(obj, other)
+ VALUE obj, other;
{
- rb_block_call(other, rb_intern("each_pair"), 0, 0, update_i, obj);
+ rb_iterate(each_pair, other, update_i, obj);
return obj;
}
static VALUE
-fdbm_replace(VALUE obj, VALUE other)
+fdbm_replace(obj, other)
+ VALUE obj, other;
{
fdbm_clear(obj);
- rb_block_call(other, rb_intern("each_pair"), 0, 0, update_i, obj);
+ rb_iterate(each_pair, other, update_i, obj);
return obj;
}
static VALUE
-fdbm_store(VALUE obj, VALUE keystr, VALUE valstr)
+fdbm_store(obj, keystr, valstr)
+ VALUE obj, keystr, valstr;
{
datum key, val;
struct dbmdata *dbmp;
@@ -445,11 +510,11 @@ fdbm_store(VALUE obj, VALUE keystr, VALUE valstr)
keystr = rb_obj_as_string(keystr);
valstr = rb_obj_as_string(valstr);
- key.dptr = RSTRING_PTR(keystr);
- key.dsize = RSTRING_LEN(keystr);
+ key.dptr = RSTRING(keystr)->ptr;
+ key.dsize = RSTRING(keystr)->len;
- val.dptr = RSTRING_PTR(valstr);
- val.dsize = RSTRING_LEN(valstr);
+ val.dptr = RSTRING(valstr)->ptr;
+ val.dsize = RSTRING(valstr)->len;
GetDBM2(obj, dbmp, dbm);
dbmp->di_size = -1;
@@ -465,7 +530,8 @@ fdbm_store(VALUE obj, VALUE keystr, VALUE valstr)
}
static VALUE
-fdbm_length(VALUE obj)
+fdbm_length(obj)
+ VALUE obj;
{
datum key;
struct dbmdata *dbmp;
@@ -484,7 +550,8 @@ fdbm_length(VALUE obj)
}
static VALUE
-fdbm_empty_p(VALUE obj)
+fdbm_empty_p(obj)
+ VALUE obj;
{
datum key;
struct dbmdata *dbmp;
@@ -507,14 +574,13 @@ fdbm_empty_p(VALUE obj)
}
static VALUE
-fdbm_each_value(VALUE obj)
+fdbm_each_value(obj)
+ VALUE obj;
{
datum key, val;
struct dbmdata *dbmp;
DBM *dbm;
- RETURN_ENUMERATOR(obj, 0, 0);
-
GetDBM2(obj, dbmp, dbm);
for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
val = dbm_fetch(dbm, key);
@@ -525,14 +591,13 @@ fdbm_each_value(VALUE obj)
}
static VALUE
-fdbm_each_key(VALUE obj)
+fdbm_each_key(obj)
+ VALUE obj;
{
datum key;
struct dbmdata *dbmp;
DBM *dbm;
- RETURN_ENUMERATOR(obj, 0, 0);
-
GetDBM2(obj, dbmp, dbm);
for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
rb_yield(rb_tainted_str_new(key.dptr, key.dsize));
@@ -542,15 +607,14 @@ fdbm_each_key(VALUE obj)
}
static VALUE
-fdbm_each_pair(VALUE obj)
+fdbm_each_pair(obj)
+ VALUE obj;
{
datum key, val;
DBM *dbm;
struct dbmdata *dbmp;
VALUE keystr, valstr;
- RETURN_ENUMERATOR(obj, 0, 0);
-
GetDBM2(obj, dbmp, dbm);
for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
@@ -565,7 +629,8 @@ fdbm_each_pair(VALUE obj)
}
static VALUE
-fdbm_keys(VALUE obj)
+fdbm_keys(obj)
+ VALUE obj;
{
datum key;
struct dbmdata *dbmp;
@@ -583,7 +648,8 @@ fdbm_keys(VALUE obj)
}
static VALUE
-fdbm_values(VALUE obj)
+fdbm_values(obj)
+ VALUE obj;
{
datum key, val;
struct dbmdata *dbmp;
@@ -601,15 +667,16 @@ fdbm_values(VALUE obj)
}
static VALUE
-fdbm_has_key(VALUE obj, VALUE keystr)
+fdbm_has_key(obj, keystr)
+ VALUE obj, keystr;
{
datum key, val;
struct dbmdata *dbmp;
DBM *dbm;
- ExportStringValue(keystr);
- key.dptr = RSTRING_PTR(keystr);
- key.dsize = RSTRING_LEN(keystr);
+ StringValue(keystr);
+ key.dptr = RSTRING(keystr)->ptr;
+ key.dsize = RSTRING(keystr)->len;
GetDBM2(obj, dbmp, dbm);
val = dbm_fetch(dbm, key);
@@ -618,28 +685,30 @@ fdbm_has_key(VALUE obj, VALUE keystr)
}
static VALUE
-fdbm_has_value(VALUE obj, VALUE valstr)
+fdbm_has_value(obj, valstr)
+ VALUE obj, valstr;
{
datum key, val;
struct dbmdata *dbmp;
DBM *dbm;
- ExportStringValue(valstr);
- val.dptr = RSTRING_PTR(valstr);
- val.dsize = RSTRING_LEN(valstr);
+ StringValue(valstr);
+ val.dptr = RSTRING(valstr)->ptr;
+ val.dsize = RSTRING(valstr)->len;
GetDBM2(obj, dbmp, dbm);
for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
val = dbm_fetch(dbm, key);
- if (val.dsize == RSTRING_LEN(valstr) &&
- memcmp(val.dptr, RSTRING_PTR(valstr), val.dsize) == 0)
+ if (val.dsize == RSTRING(valstr)->len &&
+ memcmp(val.dptr, RSTRING(valstr)->ptr, val.dsize) == 0)
return Qtrue;
}
return Qfalse;
}
static VALUE
-fdbm_to_a(VALUE obj)
+fdbm_to_a(obj)
+ VALUE obj;
{
datum key, val;
struct dbmdata *dbmp;
@@ -658,7 +727,8 @@ fdbm_to_a(VALUE obj)
}
static VALUE
-fdbm_to_hash(VALUE obj)
+fdbm_to_hash(obj)
+ VALUE obj;
{
datum key, val;
struct dbmdata *dbmp;
@@ -677,13 +747,14 @@ fdbm_to_hash(VALUE obj)
}
static VALUE
-fdbm_reject(VALUE obj)
+fdbm_reject(obj)
+ VALUE obj;
{
return rb_hash_delete_if(fdbm_to_hash(obj));
}
void
-Init_dbm(void)
+Init_dbm()
{
rb_cDBM = rb_define_class("DBM", rb_cObject);
rb_eDBMError = rb_define_class("DBMError", rb_eStandardError);
@@ -700,8 +771,9 @@ Init_dbm(void)
rb_define_method(rb_cDBM, "[]=", fdbm_store, 2);
rb_define_method(rb_cDBM, "store", fdbm_store, 2);
rb_define_method(rb_cDBM, "index", fdbm_index, 1);
- rb_define_method(rb_cDBM, "key", fdbm_key, 1);
- rb_define_method(rb_cDBM, "select", fdbm_select, 0);
+ rb_define_method(rb_cDBM, "indexes", fdbm_indexes, -1);
+ rb_define_method(rb_cDBM, "indices", fdbm_indexes, -1);
+ rb_define_method(rb_cDBM, "select", fdbm_select, -1);
rb_define_method(rb_cDBM, "values_at", fdbm_values_at, -1);
rb_define_method(rb_cDBM, "length", fdbm_length, 0);
rb_define_method(rb_cDBM, "size", fdbm_length, 0);
diff --git a/ext/dbm/extconf.rb b/ext/dbm/extconf.rb
index 4d12264063..0074ab605b 100644
--- a/ext/dbm/extconf.rb
+++ b/ext/dbm/extconf.rb
@@ -36,7 +36,7 @@ def headers.db_check(db)
db_prefix ||= ""
if (have_library(db, db_prefix+"dbm_open") || have_func(db_prefix+"dbm_open")) and
- hdr = self.fetch(db, ["ndbm.h"]).find {|h| have_type("DBM", h, hsearch)}
+ hdr = self.fetch(db, ["ndbm.h"]).find {|hdr| have_type("DBM", hdr, hsearch)}
have_func(db_prefix+"dbm_clearerr") unless have_gdbm
$defs << hsearch if hsearch
$defs << '-DDBM_HDR="<'+hdr+'>"'
diff --git a/ext/digest/.cvsignore b/ext/digest/.cvsignore
index 814345ece8..4088712231 100644
--- a/ext/digest/.cvsignore
+++ b/ext/digest/.cvsignore
@@ -1,4 +1,3 @@
Makefile
mkmf.log
*.def
-extconf.h
diff --git a/ext/digest/bubblebabble/.cvsignore b/ext/digest/bubblebabble/.cvsignore
index 814345ece8..4088712231 100644
--- a/ext/digest/bubblebabble/.cvsignore
+++ b/ext/digest/bubblebabble/.cvsignore
@@ -1,4 +1,3 @@
Makefile
mkmf.log
*.def
-extconf.h
diff --git a/ext/digest/defs.h b/ext/digest/defs.h
index 77a134f364..b9a3470e65 100644
--- a/ext/digest/defs.h
+++ b/ext/digest/defs.h
@@ -16,4 +16,18 @@
# define __END_DECLS
#endif
+#if defined(HAVE_INTTYPES_H)
+# include <inttypes.h>
+#elif !defined __CYGWIN__ || !defined __uint8_t_defined
+ typedef unsigned char uint8_t;
+ typedef unsigned int uint32_t;
+# if SIZEOF_LONG == 8
+ typedef unsigned long uint64_t;
+# elif SIZEOF_LONG_LONG == 8
+ typedef unsigned LONG_LONG uint64_t;
+# else
+# define NO_UINT64_T
+# endif
+#endif
+
#endif /* DEFS_H */
diff --git a/ext/digest/digest.c b/ext/digest/digest.c
index c3e9546ab4..0b910e8c47 100644
--- a/ext/digest/digest.c
+++ b/ext/digest/digest.c
@@ -266,7 +266,7 @@ rb_digest_instance_inspect(VALUE self)
{
VALUE str;
size_t digest_len = 32; /* about this size at least */
- const char *cname;
+ char *cname;
cname = rb_obj_classname(self);
@@ -426,7 +426,7 @@ get_digest_base_metadata(VALUE klass)
VALUE obj;
rb_digest_metadata_t *algo;
- for (p = klass; p; p = RCLASS_SUPER(p)) {
+ for (p = klass; p; p = RCLASS(p)->super) {
if (rb_ivar_defined(p, id_metadata)) {
obj = rb_ivar_get(p, id_metadata);
break;
@@ -469,7 +469,7 @@ rb_digest_base_alloc(VALUE klass)
pctx = xmalloc(algo->ctx_size);
algo->init_func(pctx);
- obj = Data_Wrap_Struct(klass, 0, xfree, pctx);
+ obj = Data_Wrap_Struct(klass, 0, free, pctx);
return obj;
}
diff --git a/ext/digest/extconf.rb b/ext/digest/extconf.rb
index a20ca8d68f..cf9127ecc0 100644
--- a/ext/digest/extconf.rb
+++ b/ext/digest/extconf.rb
@@ -4,7 +4,7 @@
require "mkmf"
$INSTALLFILES = {
- "digest.h" => "$(HDRDIR)"
+ "digest.h" => "$(RUBYARCHDIR)"
}
create_makefile("digest")
diff --git a/ext/digest/lib/digest.rb b/ext/digest/lib/digest.rb
index e42f984f95..0c4ee3c2cc 100644
--- a/ext/digest/lib/digest.rb
+++ b/ext/digest/lib/digest.rb
@@ -22,7 +22,7 @@ module Digest
class ::Digest::Class
# creates a digest object and reads a given file, _name_.
- #
+ #
# p Digest::SHA256.file("X11R6.8.2-src.tar.bz2").hexdigest
# # => "f02e3c85572dc9ad7cb77c2a638e3be24cc1b5bea9fdbb0b0299c9668475c534"
def self.file(name)
diff --git a/ext/digest/lib/digest/hmac.rb b/ext/digest/lib/digest/hmac.rb
deleted file mode 100644
index 1948352c4b..0000000000
--- a/ext/digest/lib/digest/hmac.rb
+++ /dev/null
@@ -1,274 +0,0 @@
-# = digest/hmac.rb
-#
-# An implementation of HMAC keyed-hashing algorithm
-#
-# == Overview
-#
-# This library adds a method named hmac() to Digest classes, which
-# creates a Digest class for calculating HMAC digests.
-#
-# == Examples
-#
-# require 'digest/hmac'
-#
-# # one-liner example
-# puts Digest::HMAC.hexdigest("data", "hash key", Digest::SHA1)
-#
-# # rather longer one
-# hmac = Digest::HMAC.new("foo", Digest::RMD160)
-#
-# buf = ""
-# while stream.read(16384, buf)
-# hmac.update(buf)
-# end
-#
-# puts hmac.bubblebabble
-#
-# == License
-#
-# Copyright (c) 2006 Akinori MUSHA <knu@iDaemons.org>
-#
-# Documentation by Akinori MUSHA
-#
-# All rights reserved. You can redistribute and/or modify it under
-# the same terms as Ruby.
-#
-# $Id$
-#
-
-require 'digest'
-
-module Digest
- class HMAC < Digest::Class
- def initialize(key, digester)
- @md = digester.new
-
- block_len = @md.block_length
-
- if key.bytesize > block_len
- key = @md.digest(key)
- end
-
- ipad = Array.new(block_len, 0x36)
- opad = Array.new(block_len, 0x5c)
-
- key.bytes.each_with_index { |c, i|
- ipad[i] ^= c
- opad[i] ^= c
- }
-
- @key = key.freeze
- @ipad = ipad.pack('C*').freeze
- @opad = opad.pack('C*').freeze
- @md.update(@ipad)
- end
-
- def initialize_copy(other)
- @md = other.instance_eval { @md.clone }
- end
-
- def update(text)
- @md.update(text)
- self
- end
- alias << update
-
- def reset
- @md.reset
- @md.update(@ipad)
- self
- end
-
- def finish
- d = @md.digest!
- @md.update(@opad)
- @md.update(d)
- @md.digest!
- end
- private :finish
-
- def digest_length
- @md.digest_length
- end
-
- def block_length
- @md.block_length
- end
-
- def inspect
- sprintf('#<%s: key=%s, digest=%s>', self.class.name, @key.inspect, @md.inspect.sub(/^\#<(.*)>$/) { $1 });
- end
- end
-end
-
-if $0 == __FILE__
- eval DATA.gets(nil), nil, $0, DATA.lineno
-end
-
-__END__
-
-require 'test/unit'
-
-module TM_HMAC
- def test_s_hexdigest
- cases.each { |h|
- digesters.each { |d|
- assert_equal(h[:hexdigest], Digest::HMAC.hexdigest(h[:data], h[:key], d))
- }
- }
- end
-
- def test_hexdigest
- cases.each { |h|
- digesters.each { |d|
- hmac = Digest::HMAC.new(h[:key], d)
-
- hmac.update(h[:data])
-
- assert_equal(h[:hexdigest], hmac.hexdigest)
- }
- }
- end
-
- def test_reset
- cases.each { |h|
- digesters.each { |d|
- hmac = Digest::HMAC.new(h[:key], d)
- hmac.update("test")
- hmac.reset
- hmac.update(h[:data])
-
- assert_equal(h[:hexdigest], hmac.hexdigest)
- }
- }
- end
-end
-
-class TC_HMAC_MD5 < Test::Unit::TestCase
- include TM_HMAC
-
- def digesters
- [Digest::MD5, Digest::MD5.new]
- end
-
- # Taken from RFC 2202: Test Cases for HMAC-MD5 and HMAC-SHA-1
- def cases
- [
- {
- :key => "\x0b" * 16,
- :data => "Hi There",
- :hexdigest => "9294727a3638bb1c13f48ef8158bfc9d",
- }, {
- :key => "Jefe",
- :data => "what do ya want for nothing?",
- :hexdigest => "750c783e6ab0b503eaa86e310a5db738",
- }, {
- :key => "\xaa" * 16,
- :data => "\xdd" * 50,
- :hexdigest => "56be34521d144c88dbb8c733f0e8b3f6",
- }, {
- :key => "\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19",
- :data => "\xcd" * 50,
- :hexdigest => "697eaf0aca3a3aea3a75164746ffaa79",
- }, {
- :key => "\x0c" * 16,
- :data => "Test With Truncation",
- :hexdigest => "56461ef2342edc00f9bab995690efd4c",
- }, {
- :key => "\xaa" * 80,
- :data => "Test Using Larger Than Block-Size Key - Hash Key First",
- :hexdigest => "6b1ab7fe4bd7bf8f0b62e6ce61b9d0cd",
- }, {
- :key => "\xaa" * 80,
- :data => "Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data",
- :hexdigest => "6f630fad67cda0ee1fb1f562db3aa53e",
- }
- ]
- end
-end
-
-class TC_HMAC_SHA1 < Test::Unit::TestCase
- include TM_HMAC
-
- def digesters
- [Digest::SHA1, Digest::SHA1.new]
- end
-
- # Taken from RFC 2202: Test Cases for HMAC-MD5 and HMAC-SHA-1
- def cases
- [
- {
- :key => "\x0b" * 20,
- :data => "Hi There",
- :hexdigest => "b617318655057264e28bc0b6fb378c8ef146be00",
- }, {
- :key => "Jefe",
- :data => "what do ya want for nothing?",
- :hexdigest => "effcdf6ae5eb2fa2d27416d5f184df9c259a7c79",
- }, {
- :key => "\xaa" * 20,
- :data => "\xdd" * 50,
- :hexdigest => "125d7342b9ac11cd91a39af48aa17b4f63f175d3",
- }, {
- :key => "\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19",
- :data => "\xcd" * 50,
- :hexdigest => "4c9007f4026250c6bc8414f9bf50c86c2d7235da",
- }, {
- :key => "\x0c" * 20,
- :data => "Test With Truncation",
- :hexdigest => "4c1a03424b55e07fe7f27be1d58bb9324a9a5a04",
- }, {
- :key => "\xaa" * 80,
- :data => "Test Using Larger Than Block-Size Key - Hash Key First",
- :hexdigest => "aa4ae5e15272d00e95705637ce8a3b55ed402112",
- }, {
- :key => "\xaa" * 80,
- :data => "Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data",
- :hexdigest => "e8e99d0f45237d786d6bbaa7965c7808bbff1a91",
- }
- ]
- end
-end
-
-class TC_HMAC_RMD160 < Test::Unit::TestCase
- include TM_HMAC
-
- def digesters
- [Digest::RMD160, Digest::RMD160.new]
- end
-
- # Taken from RFC 2286: Test Cases for HMAC-RIPEMD160 and HMAC-RIPEMD128
- def cases
- [
- {
- :key => "\x0b" * 20,
- :data => "Hi There",
- :hexdigest => "24cb4bd67d20fc1a5d2ed7732dcc39377f0a5668",
- }, {
- :key => "Jefe",
- :data => "what do ya want for nothing?",
- :hexdigest => "dda6c0213a485a9e24f4742064a7f033b43c4069",
- }, {
- :key => "\xaa" * 20,
- :data => "\xdd" * 50,
- :hexdigest => "b0b105360de759960ab4f35298e116e295d8e7c1",
- }, {
- :key => "\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19",
- :data => "\xcd" * 50,
- :hexdigest => "d5ca862f4d21d5e610e18b4cf1beb97a4365ecf4",
- }, {
- :key => "\x0c" * 20,
- :data => "Test With Truncation",
- :hexdigest => "7619693978f91d90539ae786500ff3d8e0518e39",
- }, {
- :key => "\xaa" * 80,
- :data => "Test Using Larger Than Block-Size Key - Hash Key First",
- :hexdigest => "6466ca07ac5eac29e1bd523e5ada7605b791fd8b",
- }, {
- :key => "\xaa" * 80,
- :data => "Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data",
- :hexdigest => "69ea60798d71616cce5fd0871e23754cd75d5a0a",
- }
- ]
- end
-end
diff --git a/ext/digest/lib/md5.rb b/ext/digest/lib/md5.rb
new file mode 100644
index 0000000000..c399f2de1d
--- /dev/null
+++ b/ext/digest/lib/md5.rb
@@ -0,0 +1,23 @@
+# just for compatibility; requiring "md5" is obsoleted
+#
+# $RoughId: md5.rb,v 1.4 2001/07/13 15:38:27 knu Exp $
+# $Id$
+
+require 'digest/md5'
+
+class MD5 < Digest::MD5
+ class << self
+ alias orig_new new
+ def new(str = nil)
+ if str
+ orig_new.update(str)
+ else
+ orig_new
+ end
+ end
+
+ def md5(*args)
+ new(*args)
+ end
+ end
+end
diff --git a/ext/digest/lib/sha1.rb b/ext/digest/lib/sha1.rb
new file mode 100644
index 0000000000..4446e12e8d
--- /dev/null
+++ b/ext/digest/lib/sha1.rb
@@ -0,0 +1,23 @@
+# just for compatibility; requiring "sha1" is obsoleted
+#
+# $RoughId: sha1.rb,v 1.4 2001/07/13 15:38:27 knu Exp $
+# $Id$
+
+require 'digest/sha1'
+
+class SHA1 < Digest::SHA1
+ class << self
+ alias orig_new new
+ def new(str = nil)
+ if str
+ orig_new.update(str)
+ else
+ orig_new
+ end
+ end
+
+ def sha1(*args)
+ new(*args)
+ end
+ end
+end
diff --git a/ext/digest/md5/.cvsignore b/ext/digest/md5/.cvsignore
index 814345ece8..4088712231 100644
--- a/ext/digest/md5/.cvsignore
+++ b/ext/digest/md5/.cvsignore
@@ -1,4 +1,3 @@
Makefile
mkmf.log
*.def
-extconf.h
diff --git a/ext/digest/md5/extconf.rb b/ext/digest/md5/extconf.rb
index ddfdb707f2..018f8ccb02 100644
--- a/ext/digest/md5/extconf.rb
+++ b/ext/digest/md5/extconf.rb
@@ -20,6 +20,10 @@ end
have_header("sys/cdefs.h")
+have_header("inttypes.h")
+
+have_header("unistd.h")
+
$preload = %w[digest]
create_makefile("digest/md5")
diff --git a/ext/digest/md5/md5.c b/ext/digest/md5/md5.c
index 518f8239ed..993bc47a06 100644
--- a/ext/digest/md5/md5.c
+++ b/ext/digest/md5/md5.c
@@ -60,7 +60,6 @@
* A.5 of RFC 1321, reproduced below.
*/
#include <string.h>
-int
main()
{
static const char *const test[7*2] = {
@@ -101,7 +100,6 @@ main()
*/
#ifdef COMPUTE_T_VALUES
#include <math.h>
-int
main()
{
int i;
diff --git a/ext/digest/md5/md5init.c b/ext/digest/md5/md5init.c
index d1229b5c6e..17658f4fce 100644
--- a/ext/digest/md5/md5init.c
+++ b/ext/digest/md5/md5init.c
@@ -8,7 +8,7 @@
#include "md5.h"
#endif
-static const rb_digest_metadata_t md5 = {
+static rb_digest_metadata_t md5 = {
RUBY_DIGEST_API_VERSION,
MD5_DIGEST_LENGTH,
MD5_BLOCK_LENGTH,
@@ -36,5 +36,5 @@ Init_md5()
cDigest_MD5 = rb_define_class_under(mDigest, "MD5", cDigest_Base);
rb_ivar_set(cDigest_MD5, rb_intern("metadata"),
- Data_Wrap_Struct(rb_cObject, 0, 0, (void *)&md5));
+ Data_Wrap_Struct(rb_cObject, 0, 0, &md5));
}
diff --git a/ext/digest/rmd160/.cvsignore b/ext/digest/rmd160/.cvsignore
index 814345ece8..4088712231 100644
--- a/ext/digest/rmd160/.cvsignore
+++ b/ext/digest/rmd160/.cvsignore
@@ -1,4 +1,3 @@
Makefile
mkmf.log
*.def
-extconf.h
diff --git a/ext/digest/rmd160/extconf.rb b/ext/digest/rmd160/extconf.rb
index cc361e3d2b..09359944f2 100644
--- a/ext/digest/rmd160/extconf.rb
+++ b/ext/digest/rmd160/extconf.rb
@@ -19,6 +19,10 @@ end
have_header("sys/cdefs.h")
+have_header("inttypes.h")
+
+have_header("unistd.h")
+
$preload = %w[digest]
create_makefile("digest/rmd160")
diff --git a/ext/digest/rmd160/rmd160init.c b/ext/digest/rmd160/rmd160init.c
index 0839f1b820..763867df86 100644
--- a/ext/digest/rmd160/rmd160init.c
+++ b/ext/digest/rmd160/rmd160init.c
@@ -8,7 +8,7 @@
#include "rmd160.h"
#endif
-static const rb_digest_metadata_t rmd160 = {
+static rb_digest_metadata_t rmd160 = {
RUBY_DIGEST_API_VERSION,
RMD160_DIGEST_LENGTH,
RMD160_BLOCK_LENGTH,
@@ -36,5 +36,5 @@ Init_rmd160()
cDigest_RMD160 = rb_define_class_under(mDigest, "RMD160", cDigest_Base);
rb_ivar_set(cDigest_RMD160, rb_intern("metadata"),
- Data_Wrap_Struct(rb_cObject, 0, 0, (void *)&rmd160));
+ Data_Wrap_Struct(rb_cObject, 0, 0, &rmd160));
}
diff --git a/ext/digest/sha1/.cvsignore b/ext/digest/sha1/.cvsignore
index 814345ece8..4088712231 100644
--- a/ext/digest/sha1/.cvsignore
+++ b/ext/digest/sha1/.cvsignore
@@ -1,4 +1,3 @@
Makefile
mkmf.log
*.def
-extconf.h
diff --git a/ext/digest/sha1/extconf.rb b/ext/digest/sha1/extconf.rb
index fa9945cd43..87b74c34af 100644
--- a/ext/digest/sha1/extconf.rb
+++ b/ext/digest/sha1/extconf.rb
@@ -19,6 +19,10 @@ end
have_header("sys/cdefs.h")
+have_header("inttypes.h")
+
+have_header("unistd.h")
+
$preload = %w[digest]
create_makefile("digest/sha1")
diff --git a/ext/digest/sha1/sha1init.c b/ext/digest/sha1/sha1init.c
index d46a1cd67d..b2146f05a9 100644
--- a/ext/digest/sha1/sha1init.c
+++ b/ext/digest/sha1/sha1init.c
@@ -8,7 +8,7 @@
#include "sha1.h"
#endif
-static const rb_digest_metadata_t sha1 = {
+static rb_digest_metadata_t sha1 = {
RUBY_DIGEST_API_VERSION,
SHA1_DIGEST_LENGTH,
SHA1_BLOCK_LENGTH,
@@ -36,5 +36,5 @@ Init_sha1()
cDigest_SHA1 = rb_define_class_under(mDigest, "SHA1", cDigest_Base);
rb_ivar_set(cDigest_SHA1, rb_intern("metadata"),
- Data_Wrap_Struct(rb_cObject, 0, 0, (void *)&sha1));
+ Data_Wrap_Struct(rb_cObject, 0, 0, &sha1));
}
diff --git a/ext/digest/sha2/.cvsignore b/ext/digest/sha2/.cvsignore
index 814345ece8..4088712231 100644
--- a/ext/digest/sha2/.cvsignore
+++ b/ext/digest/sha2/.cvsignore
@@ -1,4 +1,3 @@
Makefile
mkmf.log
*.def
-extconf.h
diff --git a/ext/digest/sha2/extconf.rb b/ext/digest/sha2/extconf.rb
index c15043f113..c084a51a64 100644
--- a/ext/digest/sha2/extconf.rb
+++ b/ext/digest/sha2/extconf.rb
@@ -13,6 +13,10 @@ $objs = [
have_header("sys/cdefs.h")
+have_header("inttypes.h")
+
+have_header("unistd.h")
+
$preload = %w[digest]
if have_type("uint64_t", "defs.h", $defs.join(' '))
diff --git a/ext/digest/sha2/lib/sha2.rb b/ext/digest/sha2/lib/sha2.rb
index b8e4609478..52dd639f9b 100644
--- a/ext/digest/sha2/lib/sha2.rb
+++ b/ext/digest/sha2/lib/sha2.rb
@@ -10,7 +10,6 @@
# $Id$
require 'digest'
-require 'digest/sha2.so'
module Digest
#
diff --git a/ext/digest/sha2/sha2.c b/ext/digest/sha2/sha2.c
index 253e54f265..aca9ee926f 100644
--- a/ext/digest/sha2/sha2.c
+++ b/ext/digest/sha2/sha2.c
@@ -1,9 +1,11 @@
/*
- * FILE: sha2.c
- * AUTHOR: Aaron D. Gifford - http://www.aarongifford.com/
- *
- * Copyright (c) 2000-2001, Aaron D. Gifford
- * All rights reserved.
+ * sha2.c
+ *
+ * Version 1.0.0beta1
+ *
+ * Written by Aaron D. Gifford <me@aarongifford.com>
+ *
+ * Copyright 2000 Aaron D. Gifford. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -17,10 +19,10 @@
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTOR(S) ``AS IS'' AND
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) AND CONTRIBUTOR(S) ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTOR(S) BE LIABLE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR(S) OR CONTRIBUTOR(S) BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
@@ -29,15 +31,15 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $OrigId: sha2.c,v 1.1 2001/11/08 00:01:51 adg Exp adg $
- * $RoughId: sha2.c,v 1.3 2002/02/26 22:03:36 knu Exp $
- * $Id$
*/
-#include "defs.h"
+/* $RoughId: sha2.c,v 1.3 2002/02/26 22:03:36 knu Exp $ */
+/* $Id$ */
+
+#include "sha2.h"
+#include <stdio.h>
#include <string.h> /* memcpy()/memset() or bcopy()/bzero() */
#include <assert.h> /* assert() */
-#include "sha2.h"
/*
* ASSERT NOTE:
@@ -61,64 +63,15 @@
/*** SHA-256/384/512 Machine Architecture Definitions *****************/
-/*
- * BYTE_ORDER NOTE:
- *
- * Please make sure that your system defines BYTE_ORDER. If your
- * architecture is little-endian, make sure it also defines
- * LITTLE_ENDIAN and that the two (BYTE_ORDER and LITTLE_ENDIAN) are
- * equivilent.
- *
- * If your system does not define the above, then you can do so by
- * hand like this:
- *
- * #define LITTLE_ENDIAN 1234
- * #define BIG_ENDIAN 4321
- *
- * And for little-endian machines, add:
- *
- * #define BYTE_ORDER LITTLE_ENDIAN
- *
- * Or for big-endian machines:
- *
- * #define BYTE_ORDER BIG_ENDIAN
- *
- * The FreeBSD machine this was written on defines BYTE_ORDER
- * appropriately by including <sys/types.h> (which in turn includes
- * <machine/endian.h> where the appropriate definitions are actually
- * made).
- */
-#if !defined(BYTE_ORDER) || (BYTE_ORDER != LITTLE_ENDIAN && BYTE_ORDER != BIG_ENDIAN)
-#error Define BYTE_ORDER to be equal to either LITTLE_ENDIAN or BIG_ENDIAN
-#endif
-
-/*
- * Define the followingsha2_* types to types of the correct length on
- * the native archtecture. Most BSD systems and Linux define u_intXX_t
- * types. Machines with very recent ANSI C headers, can use the
- * uintXX_t definintions from inttypes.h by defining SHA2_USE_INTTYPES_H
- * during compile or in the sha.h header file.
- *
- * Machines that support neither u_intXX_t nor inttypes.h's uintXX_t
- * will need to define these three typedefs below (and the appropriate
- * ones in sha.h too) by hand according to their system architecture.
- *
- * Thank you, Jun-ichiro itojun Hagino, for suggesting using u_intXX_t
- * types and pointing out recent ANSI C support for uintXX_t in inttypes.h.
- */
-#ifdef SHA2_USE_INTTYPES_H
-
typedef uint8_t sha2_byte; /* Exactly 1 byte */
typedef uint32_t sha2_word32; /* Exactly 4 bytes */
typedef uint64_t sha2_word64; /* Exactly 8 bytes */
-#else /* SHA2_USE_INTTYPES_H */
-
-typedef u_int8_t sha2_byte; /* Exactly 1 byte */
-typedef u_int32_t sha2_word32; /* Exactly 4 bytes */
-typedef u_int64_t sha2_word64; /* Exactly 8 bytes */
-
-#endif /* SHA2_USE_INTTYPES_H */
+#if defined(__GNUC__) || defined(_HPUX_SOURCE) || defined(__IBMC__)
+#define ULL(number) number##ULL
+#else
+#define ULL(number) (uint64_t)(number)
+#endif
/*** SHA-256/384/512 Various Length Definitions ***********************/
@@ -128,13 +81,8 @@ typedef u_int64_t sha2_word64; /* Exactly 8 bytes */
#define SHA512_SHORT_BLOCK_LENGTH (SHA512_BLOCK_LENGTH - 16)
-#if (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) || defined(__GNUC__) || defined(_HPUX_SOURCE) || defined(__IBMC__)
-#define ULL(number) number##ULL
-#else
-#define ULL(number) (uint64_t)(number)
-#endif
/*** ENDIAN REVERSAL MACROS *******************************************/
-#if BYTE_ORDER == LITTLE_ENDIAN
+#ifndef WORDS_BIGENDIAN
#define REVERSE32(w,x) { \
sha2_word32 tmp = (w); \
tmp = (tmp >> 16) | (tmp << 16); \
@@ -148,7 +96,7 @@ typedef u_int64_t sha2_word64; /* Exactly 8 bytes */
(x) = ((tmp & ULL(0xffff0000ffff0000)) >> 16) | \
((tmp & ULL(0x0000ffff0000ffff)) << 16); \
}
-#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+#endif
/*
* Macro for incrementally adding the unsigned 64-bit integer n to the
@@ -333,12 +281,6 @@ const static sha2_word64 sha512_initial_hash_value[8] = {
ULL(0x5be0cd19137e2179)
};
-/*
- * Constant used by SHA256/384/512_End() functions for converting the
- * digest to a readable hexadecimal character string:
- */
-static const char *sha2_hex_digits = "0123456789abcdef";
-
/*** SHA-256: *********************************************************/
void SHA256_Init(SHA256_CTX* context) {
@@ -354,7 +296,7 @@ void SHA256_Init(SHA256_CTX* context) {
/* Unrolled SHA-256 round macros: */
-#if BYTE_ORDER == LITTLE_ENDIAN
+#ifndef WORDS_BIGENDIAN
#define ROUND256_0_TO_15(a,b,c,d,e,f,g,h) \
REVERSE32(*data++, W256[j]); \
@@ -365,7 +307,7 @@ void SHA256_Init(SHA256_CTX* context) {
j++
-#else /* BYTE_ORDER == LITTLE_ENDIAN */
+#else
#define ROUND256_0_TO_15(a,b,c,d,e,f,g,h) \
T1 = (h) + Sigma1_256(e) + Ch((e), (f), (g)) + \
@@ -374,7 +316,7 @@ void SHA256_Init(SHA256_CTX* context) {
(h) = T1 + Sigma0_256(a) + Maj((a), (b), (c)); \
j++
-#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+#endif
#define ROUND256(a,b,c,d,e,f,g,h) \
s0 = W256[(j+1)&0x0f]; \
@@ -464,15 +406,15 @@ void SHA256_Transform(SHA256_CTX* context, const sha2_word32* data) {
j = 0;
do {
-#if BYTE_ORDER == LITTLE_ENDIAN
+#ifndef WORDS_BIGENDIAN
/* Copy data while converting to host byte order */
REVERSE32(*data++,W256[j]);
/* Apply the SHA-256 compression function to update a..h */
T1 = h + Sigma1_256(e) + Ch(e, f, g) + K256[j] + W256[j];
-#else /* BYTE_ORDER == LITTLE_ENDIAN */
+#else
/* Apply the SHA-256 compression function to update a..h with copy */
T1 = h + Sigma1_256(e) + Ch(e, f, g) + K256[j] + (W256[j] = *data++);
-#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+#endif
T2 = Sigma0_256(a) + Maj(a, b, c);
h = g;
g = f;
@@ -534,7 +476,7 @@ void SHA256_Update(SHA256_CTX* context, const sha2_byte *data, size_t len) {
}
/* Sanity check: */
- assert(context != (SHA256_CTX*)0 && data != (sha2_byte*)0);
+ assert(context != NULL && data != NULL);
usedspace = (context->bitcount >> 3) % SHA256_BLOCK_LENGTH;
if (usedspace > 0) {
@@ -559,7 +501,7 @@ void SHA256_Update(SHA256_CTX* context, const sha2_byte *data, size_t len) {
}
while (len >= SHA256_BLOCK_LENGTH) {
/* Process as many complete blocks as we can */
- SHA256_Transform(context, (sha2_word32*)data);
+ SHA256_Transform(context, (const sha2_word32*)data);
context->bitcount += SHA256_BLOCK_LENGTH << 3;
len -= SHA256_BLOCK_LENGTH;
data += SHA256_BLOCK_LENGTH;
@@ -573,21 +515,17 @@ void SHA256_Update(SHA256_CTX* context, const sha2_byte *data, size_t len) {
usedspace = freespace = 0;
}
-#ifdef RUBY
void SHA256_Finish(SHA256_CTX* context, sha2_byte digest[]) {
-#else
-void SHA256_Final(sha2_byte digest[], SHA256_CTX* context) {
-#endif
sha2_word32 *d = (sha2_word32*)digest;
unsigned int usedspace;
/* Sanity check: */
- assert(context != (SHA256_CTX*)0);
+ assert(context != NULL);
/* If no digest buffer is passed, we don't bother doing this: */
if (digest != (sha2_byte*)0) {
usedspace = (context->bitcount >> 3) % SHA256_BLOCK_LENGTH;
-#if BYTE_ORDER == LITTLE_ENDIAN
+#ifndef WORDS_BIGENDIAN
/* Convert FROM host byte order */
REVERSE64(context->bitcount,context->bitcount);
#endif
@@ -621,7 +559,7 @@ void SHA256_Final(sha2_byte digest[], SHA256_CTX* context) {
/* Final transform: */
SHA256_Transform(context, (sha2_word32*)context->buffer);
-#if BYTE_ORDER == LITTLE_ENDIAN
+#ifndef WORDS_BIGENDIAN
{
/* Convert TO host byte order */
int j;
@@ -636,46 +574,10 @@ void SHA256_Final(sha2_byte digest[], SHA256_CTX* context) {
}
/* Clean up state data: */
- MEMSET_BZERO(context, sizeof(context));
+ MEMSET_BZERO(context, sizeof(SHA256_CTX));
usedspace = 0;
}
-char *SHA256_End(SHA256_CTX* context, char buffer[]) {
- sha2_byte digest[SHA256_DIGEST_LENGTH], *d = digest;
- int i;
-
- /* Sanity check: */
- assert(context != (SHA256_CTX*)0);
-
- if (buffer != (char*)0) {
-#ifdef RUBY
- SHA256_Finish(context, digest);
-#else
- SHA256_Final(digest, context);
-#endif
-
- for (i = 0; i < SHA256_DIGEST_LENGTH; i++) {
- *buffer++ = sha2_hex_digits[(*d & 0xf0) >> 4];
- *buffer++ = sha2_hex_digits[*d & 0x0f];
- d++;
- }
- *buffer = (char)0;
- } else {
- MEMSET_BZERO(context, sizeof(context));
- }
- MEMSET_BZERO(digest, SHA256_DIGEST_LENGTH);
- return buffer;
-}
-
-char* SHA256_Data(const sha2_byte* data, size_t len, char digest[SHA256_DIGEST_STRING_LENGTH]) {
- SHA256_CTX context;
-
- SHA256_Init(&context);
- SHA256_Update(&context, data, len);
- return SHA256_End(&context, digest);
-}
-
-
/*** SHA-512: *********************************************************/
void SHA512_Init(SHA512_CTX* context) {
if (context == (SHA512_CTX*)0) {
@@ -689,7 +591,7 @@ void SHA512_Init(SHA512_CTX* context) {
#ifdef SHA2_UNROLL_TRANSFORM
/* Unrolled SHA-512 round macros: */
-#if BYTE_ORDER == LITTLE_ENDIAN
+#ifndef WORDS_BIGENDIAN
#define ROUND512_0_TO_15(a,b,c,d,e,f,g,h) \
REVERSE64(*data++, W512[j]); \
@@ -700,7 +602,7 @@ void SHA512_Init(SHA512_CTX* context) {
j++
-#else /* BYTE_ORDER == LITTLE_ENDIAN */
+#else
#define ROUND512_0_TO_15(a,b,c,d,e,f,g,h) \
T1 = (h) + Sigma1_512(e) + Ch((e), (f), (g)) + \
@@ -709,7 +611,7 @@ void SHA512_Init(SHA512_CTX* context) {
(h) = T1 + Sigma0_512(a) + Maj((a), (b), (c)); \
j++
-#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+#endif
#define ROUND512(a,b,c,d,e,f,g,h) \
s0 = W512[(j+1)&0x0f]; \
@@ -794,15 +696,15 @@ void SHA512_Transform(SHA512_CTX* context, const sha2_word64* data) {
j = 0;
do {
-#if BYTE_ORDER == LITTLE_ENDIAN
+#ifndef WORDS_BIGENDIAN
/* Convert TO host byte order */
REVERSE64(*data++, W512[j]);
/* Apply the SHA-512 compression function to update a..h */
T1 = h + Sigma1_512(e) + Ch(e, f, g) + K512[j] + W512[j];
-#else /* BYTE_ORDER == LITTLE_ENDIAN */
+#else
/* Apply the SHA-512 compression function to update a..h with copy */
T1 = h + Sigma1_512(e) + Ch(e, f, g) + K512[j] + (W512[j] = *data++);
-#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+#endif
T2 = Sigma0_512(a) + Maj(a, b, c);
h = g;
g = f;
@@ -864,7 +766,7 @@ void SHA512_Update(SHA512_CTX* context, const sha2_byte *data, size_t len) {
}
/* Sanity check: */
- assert(context != (SHA512_CTX*)0 && data != (sha2_byte*)0);
+ assert(context != NULL && data != NULL);
usedspace = (context->bitcount[0] >> 3) % SHA512_BLOCK_LENGTH;
if (usedspace > 0) {
@@ -877,7 +779,7 @@ void SHA512_Update(SHA512_CTX* context, const sha2_byte *data, size_t len) {
ADDINC128(context->bitcount, freespace << 3);
len -= freespace;
data += freespace;
- SHA512_Transform(context, (sha2_word64*)context->buffer);
+ SHA512_Transform(context, (const sha2_word64*)context->buffer);
} else {
/* The buffer is not yet full */
MEMCPY_BCOPY(&context->buffer[usedspace], data, len);
@@ -889,7 +791,7 @@ void SHA512_Update(SHA512_CTX* context, const sha2_byte *data, size_t len) {
}
while (len >= SHA512_BLOCK_LENGTH) {
/* Process as many complete blocks as we can */
- SHA512_Transform(context, (sha2_word64*)data);
+ SHA512_Transform(context, (const sha2_word64*)data);
ADDINC128(context->bitcount, SHA512_BLOCK_LENGTH << 3);
len -= SHA512_BLOCK_LENGTH;
data += SHA512_BLOCK_LENGTH;
@@ -907,7 +809,7 @@ void SHA512_Last(SHA512_CTX* context) {
unsigned int usedspace;
usedspace = (context->bitcount[0] >> 3) % SHA512_BLOCK_LENGTH;
-#if BYTE_ORDER == LITTLE_ENDIAN
+#ifndef WORDS_BIGENDIAN
/* Convert FROM host byte order */
REVERSE64(context->bitcount[0],context->bitcount[0]);
REVERSE64(context->bitcount[1],context->bitcount[1]);
@@ -924,7 +826,7 @@ void SHA512_Last(SHA512_CTX* context) {
MEMSET_BZERO(&context->buffer[usedspace], SHA512_BLOCK_LENGTH - usedspace);
}
/* Do second-to-last transform: */
- SHA512_Transform(context, (sha2_word64*)context->buffer);
+ SHA512_Transform(context, (const sha2_word64*)context->buffer);
/* And set-up for the last transform: */
MEMSET_BZERO(context->buffer, SHA512_BLOCK_LENGTH - 2);
@@ -941,25 +843,21 @@ void SHA512_Last(SHA512_CTX* context) {
*(sha2_word64*)&context->buffer[SHA512_SHORT_BLOCK_LENGTH+8] = context->bitcount[0];
/* Final transform: */
- SHA512_Transform(context, (sha2_word64*)context->buffer);
+ SHA512_Transform(context, (const sha2_word64*)context->buffer);
}
-#ifdef RUBY
void SHA512_Finish(SHA512_CTX* context, sha2_byte digest[]) {
-#else
-void SHA512_Final(sha2_byte digest[], SHA512_CTX* context) {
-#endif
sha2_word64 *d = (sha2_word64*)digest;
/* Sanity check: */
- assert(context != (SHA512_CTX*)0);
+ assert(context != NULL);
/* If no digest buffer is passed, we don't bother doing this: */
if (digest != (sha2_byte*)0) {
SHA512_Last(context);
/* Save the hash data for output: */
-#if BYTE_ORDER == LITTLE_ENDIAN
+#ifndef WORDS_BIGENDIAN
{
/* Convert TO host byte order */
int j;
@@ -974,45 +872,9 @@ void SHA512_Final(sha2_byte digest[], SHA512_CTX* context) {
}
/* Zero out state data */
- MEMSET_BZERO(context, sizeof(context));
-}
-
-char *SHA512_End(SHA512_CTX* context, char buffer[]) {
- sha2_byte digest[SHA512_DIGEST_LENGTH], *d = digest;
- int i;
-
- /* Sanity check: */
- assert(context != (SHA512_CTX*)0);
-
- if (buffer != (char*)0) {
-#ifdef RUBY
- SHA512_Finish(context, digest);
-#else
- SHA512_Final(digest, context);
-#endif
-
- for (i = 0; i < SHA512_DIGEST_LENGTH; i++) {
- *buffer++ = sha2_hex_digits[(*d & 0xf0) >> 4];
- *buffer++ = sha2_hex_digits[*d & 0x0f];
- d++;
- }
- *buffer = (char)0;
- } else {
- MEMSET_BZERO(context, sizeof(context));
- }
- MEMSET_BZERO(digest, SHA512_DIGEST_LENGTH);
- return buffer;
-}
-
-char* SHA512_Data(const sha2_byte* data, size_t len, char digest[SHA512_DIGEST_STRING_LENGTH]) {
- SHA512_CTX context;
-
- SHA512_Init(&context);
- SHA512_Update(&context, data, len);
- return SHA512_End(&context, digest);
+ MEMSET_BZERO(context, sizeof(SHA512_CTX));
}
-
/*** SHA-384: *********************************************************/
void SHA384_Init(SHA384_CTX* context) {
if (context == (SHA384_CTX*)0) {
@@ -1027,22 +889,18 @@ void SHA384_Update(SHA384_CTX* context, const sha2_byte* data, size_t len) {
SHA512_Update((SHA512_CTX*)context, data, len);
}
-#ifdef RUBY
void SHA384_Finish(SHA384_CTX* context, sha2_byte digest[]) {
-#else
-void SHA384_Final(sha2_byte digest[], SHA384_CTX* context) {
-#endif
sha2_word64 *d = (sha2_word64*)digest;
/* Sanity check: */
- assert(context != (SHA384_CTX*)0);
+ assert(context != NULL);
/* If no digest buffer is passed, we don't bother doing this: */
if (digest != (sha2_byte*)0) {
SHA512_Last((SHA512_CTX*)context);
/* Save the hash data for output: */
-#if BYTE_ORDER == LITTLE_ENDIAN
+#ifndef WORDS_BIGENDIAN
{
/* Convert TO host byte order */
int j;
@@ -1057,41 +915,5 @@ void SHA384_Final(sha2_byte digest[], SHA384_CTX* context) {
}
/* Zero out state data */
- MEMSET_BZERO(context, sizeof(context));
-}
-
-char *SHA384_End(SHA384_CTX* context, char buffer[]) {
- sha2_byte digest[SHA384_DIGEST_LENGTH], *d = digest;
- int i;
-
- /* Sanity check: */
- assert(context != (SHA384_CTX*)0);
-
- if (buffer != (char*)0) {
-#ifdef RUBY
- SHA384_Finish(context, digest);
-#else
- SHA384_Final(digest, context);
-#endif
-
- for (i = 0; i < SHA384_DIGEST_LENGTH; i++) {
- *buffer++ = sha2_hex_digits[(*d & 0xf0) >> 4];
- *buffer++ = sha2_hex_digits[*d & 0x0f];
- d++;
- }
- *buffer = (char)0;
- } else {
- MEMSET_BZERO(context, sizeof(context));
- }
- MEMSET_BZERO(digest, SHA384_DIGEST_LENGTH);
- return buffer;
-}
-
-char* SHA384_Data(const sha2_byte* data, size_t len, char digest[SHA384_DIGEST_STRING_LENGTH]) {
- SHA384_CTX context;
-
- SHA384_Init(&context);
- SHA384_Update(&context, data, len);
- return SHA384_End(&context, digest);
+ MEMSET_BZERO(context, sizeof(SHA384_CTX));
}
-
diff --git a/ext/digest/sha2/sha2.h b/ext/digest/sha2/sha2.h
index 3536b31330..917d415b73 100644
--- a/ext/digest/sha2/sha2.h
+++ b/ext/digest/sha2/sha2.h
@@ -1,9 +1,11 @@
/*
- * FILE: sha2.h
- * AUTHOR: Aaron D. Gifford - http://www.aarongifford.com/
- *
- * Copyright (c) 2000-2001, Aaron D. Gifford
- * All rights reserved.
+ * sha2.h
+ *
+ * Version 1.0.0beta1
+ *
+ * Written by Aaron D. Gifford <me@aarongifford.com>
+ *
+ * Copyright 2000 Aaron D. Gifford. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -17,10 +19,10 @@
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTOR(S) ``AS IS'' AND
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) AND CONTRIBUTOR(S) ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTOR(S) BE LIABLE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR(S) OR CONTRIBUTOR(S) BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
@@ -29,11 +31,11 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $OrigId: sha2.h,v 1.1 2001/11/08 00:02:01 adg Exp adg $
- * $RoughId: sha2.h,v 1.3 2002/02/24 08:14:32 knu Exp $
- * $Id$
*/
+/* $RoughId: sha2.h,v 1.3 2002/02/24 08:14:32 knu Exp $ */
+/* $Id$ */
+
#ifndef __SHA2_H__
#define __SHA2_H__
@@ -41,37 +43,7 @@
extern "C" {
#endif
-
-/*
- * Import u_intXX_t size_t type definitions from system headers. You
- * may need to change this, or define these things yourself in this
- * file.
- */
-#include <sys/types.h>
-
-#ifdef RUBY
-# ifdef HAVE_PROTOTYPES
-# undef NOPROTO
-# else
-# define NOPROTO
-# endif /* HAVE_PROTOTYPES */
-# ifndef BYTE_ORDER
-# define LITTLE_ENDIAN 1234
-# define BIG_ENDIAN 4321
-# ifdef WORDS_BIGENDIAN
-# define BYTE_ORDER BIG_ENDIAN
-# else
-# define BYTE_ORDER LITTLE_ENDIAN
-# endif
-# endif /* BYTE_ORDER */
-# define SHA2_USE_INTTYPES_H
-#else /* RUBY */
-#ifdef SHA2_USE_INTTYPES_H
-
-#include <inttypes.h>
-
-#endif /* SHA2_USE_INTTYPES_H */
-#endif /* RUBY */
+#include "defs.h"
/*** SHA-256/384/512 Various Length Definitions ***********************/
@@ -87,32 +59,6 @@ extern "C" {
/*** SHA-256/384/512 Context Structures *******************************/
-/* NOTE: If your architecture does not define either u_intXX_t types or
- * uintXX_t (from inttypes.h), you may need to define things by hand
- * for your system:
- */
-#if 0
-typedef unsigned char u_int8_t; /* 1-byte (8-bits) */
-typedef unsigned int u_int32_t; /* 4-bytes (32-bits) */
-typedef unsigned long long u_int64_t; /* 8-bytes (64-bits) */
-#endif
-/*
- * Most BSD systems already define u_intXX_t types, as does Linux.
- * Some systems, however, like Compaq's Tru64 Unix instead can use
- * uintXX_t types defined by very recent ANSI C standards and included
- * in the file:
- *
- * #include <inttypes.h>
- *
- * If you choose to use <inttypes.h> then please define:
- *
- * #define SHA2_USE_INTTYPES_H
- *
- * Or on the command line during compile:
- *
- * cc -DSHA2_USE_INTTYPES_H ...
- */
-#ifdef SHA2_USE_INTTYPES_H
typedef struct _SHA256_CTX {
uint32_t state[8];
@@ -125,25 +71,9 @@ typedef struct _SHA512_CTX {
uint8_t buffer[SHA512_BLOCK_LENGTH];
} SHA512_CTX;
-#else /* SHA2_USE_INTTYPES_H */
-
-typedef struct _SHA256_CTX {
- u_int32_t state[8];
- u_int64_t bitcount;
- u_int8_t buffer[SHA256_BLOCK_LENGTH];
-} SHA256_CTX;
-typedef struct _SHA512_CTX {
- u_int64_t state[8];
- u_int64_t bitcount[2];
- u_int8_t buffer[SHA512_BLOCK_LENGTH];
-} SHA512_CTX;
-
-#endif /* SHA2_USE_INTTYPES_H */
-
typedef SHA512_CTX SHA384_CTX;
-/*** SHA-256/384/512 Function Prototypes ******************************/
#ifdef RUBY
#define SHA256_Init rb_Digest_SHA256_Init
#define SHA256_Update rb_Digest_SHA256_Update
@@ -156,95 +86,20 @@ typedef SHA512_CTX SHA384_CTX;
#define SHA512_Init rb_Digest_SHA512_Init
#define SHA512_Update rb_Digest_SHA512_Update
#define SHA512_Finish rb_Digest_SHA512_Finish
-#endif /* RUBY */
-#ifndef NOPROTO
-#ifdef SHA2_USE_INTTYPES_H
+#endif
-void SHA256_Init(SHA256_CTX *);
-void SHA256_Update(SHA256_CTX*, const uint8_t*, size_t);
-#ifdef RUBY
-void SHA256_Finish(SHA256_CTX*, uint8_t[SHA256_DIGEST_LENGTH]);
-#else
-void SHA256_Final(uint8_t[SHA256_DIGEST_LENGTH], SHA256_CTX*);
-#endif /* RUBY */
-char* SHA256_End(SHA256_CTX*, char[SHA256_DIGEST_STRING_LENGTH]);
-char* SHA256_Data(const uint8_t*, size_t, char[SHA256_DIGEST_STRING_LENGTH]);
-
-void SHA384_Init(SHA384_CTX*);
-void SHA384_Update(SHA384_CTX*, const uint8_t*, size_t);
-#ifdef RUBY
-void SHA384_Finish(SHA384_CTX*, uint8_t[SHA384_DIGEST_LENGTH]);
-#else
-void SHA384_Final(uint8_t[SHA384_DIGEST_LENGTH], SHA384_CTX*);
-#endif /* RUBY */
-char* SHA384_End(SHA384_CTX*, char[SHA384_DIGEST_STRING_LENGTH]);
-char* SHA384_Data(const uint8_t*, size_t, char[SHA384_DIGEST_STRING_LENGTH]);
-
-void SHA512_Init(SHA512_CTX*);
-void SHA512_Update(SHA512_CTX*, const uint8_t*, size_t);
-#ifdef RUBY
-void SHA512_Finish(SHA512_CTX*, uint8_t[SHA512_DIGEST_LENGTH]);
-#else
-void SHA512_Final(uint8_t[SHA512_DIGEST_LENGTH], SHA512_CTX*);
-#endif /* RUBY */
-char* SHA512_End(SHA512_CTX*, char[SHA512_DIGEST_STRING_LENGTH]);
-char* SHA512_Data(const uint8_t*, size_t, char[SHA512_DIGEST_STRING_LENGTH]);
-
-#else /* SHA2_USE_INTTYPES_H */
-
-void SHA256_Init(SHA256_CTX *);
-void SHA256_Update(SHA256_CTX*, const u_int8_t*, size_t);
-void SHA256_Final(u_int8_t[SHA256_DIGEST_LENGTH], SHA256_CTX*);
-char* SHA256_End(SHA256_CTX*, char[SHA256_DIGEST_STRING_LENGTH]);
-char* SHA256_Data(const u_int8_t*, size_t, char[SHA256_DIGEST_STRING_LENGTH]);
-
-void SHA384_Init(SHA384_CTX*);
-void SHA384_Update(SHA384_CTX*, const u_int8_t*, size_t);
-void SHA384_Final(u_int8_t[SHA384_DIGEST_LENGTH], SHA384_CTX*);
-char* SHA384_End(SHA384_CTX*, char[SHA384_DIGEST_STRING_LENGTH]);
-char* SHA384_Data(const u_int8_t*, size_t, char[SHA384_DIGEST_STRING_LENGTH]);
-
-void SHA512_Init(SHA512_CTX*);
-void SHA512_Update(SHA512_CTX*, const u_int8_t*, size_t);
-void SHA512_Final(u_int8_t[SHA512_DIGEST_LENGTH], SHA512_CTX*);
-char* SHA512_End(SHA512_CTX*, char[SHA512_DIGEST_STRING_LENGTH]);
-char* SHA512_Data(const u_int8_t*, size_t, char[SHA512_DIGEST_STRING_LENGTH]);
-
-#endif /* SHA2_USE_INTTYPES_H */
-
-#else /* NOPROTO */
-
-void SHA256_Init();
-void SHA256_Update();
-#ifdef RUBY
-void SHA256_Finish();
-#else
-void SHA256_Final();
-#endif /* RUBY */
-char* SHA256_End();
-char* SHA256_Data();
-
-void SHA384_Init();
-void SHA384_Update();
-#ifdef RUBY
-void SHA384_Finish();
-#else
-void SHA384_Final();
-#endif /* RUBY */
-char* SHA384_End();
-char* SHA384_Data();
-
-void SHA512_Init();
-void SHA512_Update();
-#ifdef RUBY
-void SHA512_Finish();
-#else
-void SHA512_Final();
-#endif /* RUBY */
-char* SHA512_End();
-char* SHA512_Data();
-
-#endif /* NOPROTO */
+/*** SHA-256/384/512 Function Prototypes ******************************/
+void SHA256_Init _((SHA256_CTX *));
+void SHA256_Update _((SHA256_CTX*, const uint8_t*, size_t));
+void SHA256_Finish _((SHA256_CTX*, uint8_t[SHA256_DIGEST_LENGTH]));
+
+void SHA384_Init _((SHA384_CTX*));
+void SHA384_Update _((SHA384_CTX*, const uint8_t*, size_t));
+void SHA384_Finish _((SHA384_CTX*, uint8_t[SHA384_DIGEST_LENGTH]));
+
+void SHA512_Init _((SHA512_CTX*));
+void SHA512_Update _((SHA512_CTX*, const uint8_t*, size_t));
+void SHA512_Finish _((SHA512_CTX*, uint8_t[SHA512_DIGEST_LENGTH]));
#ifdef __cplusplus
}
diff --git a/ext/digest/sha2/sha2init.c b/ext/digest/sha2/sha2init.c
index 8b79e950a6..c83a29316a 100644
--- a/ext/digest/sha2/sha2init.c
+++ b/ext/digest/sha2/sha2init.c
@@ -7,7 +7,7 @@
#define FOREACH_BITLEN(func) func(256) func(384) func(512)
#define DEFINE_ALGO_METADATA(bitlen) \
-static const rb_digest_metadata_t sha##bitlen = { \
+static rb_digest_metadata_t sha##bitlen = { \
RUBY_DIGEST_API_VERSION, \
SHA##bitlen##_DIGEST_LENGTH, \
SHA##bitlen##_BLOCK_LENGTH, \
@@ -46,7 +46,7 @@ Init_sha2()
cDigest_SHA##bitlen = rb_define_class_under(mDigest, "SHA" #bitlen, cDigest_Base); \
\
rb_ivar_set(cDigest_SHA##bitlen, id_metadata, \
- Data_Wrap_Struct(rb_cObject, 0, 0, (void *)&sha##bitlen));
+ Data_Wrap_Struct(rb_cObject, 0, 0, &sha##bitlen));
FOREACH_BITLEN(DEFINE_ALGO_CLASS)
}
diff --git a/ext/dl/.cvsignore b/ext/dl/.cvsignore
index 6c0b25a1c5..6d884b6cec 100644
--- a/ext/dl/.cvsignore
+++ b/ext/dl/.cvsignore
@@ -2,9 +2,7 @@ Makefile
mkmf.log
dlconfig.h
dlconfig.rb
-callback.h
*.func
*.o
*~
*.def
-extconf.h
diff --git a/ext/dl/callback/depend b/ext/dl/callback/depend
deleted file mode 100644
index 7a1dc1ee62..0000000000
--- a/ext/dl/callback/depend
+++ /dev/null
@@ -1,15 +0,0 @@
-src: callback.c \
- callback-0.c callback-1.c callback-2.c \
- callback-3.c callback-4.c callback-5.c \
- callback-6.c callback-7.c callback-8.c
-
-$(OBJS): $(hdrdir)/ruby.h
-
-callback-0.c callback-1.c callback-2.c \
-callback-3.c callback-4.c callback-5.c \
-callback-6.c callback-7.c callback-8.c \
- : callback.c
-
-callback.c: $(srcdir)/mkcallback.rb $(srcdir)/../dl.h
- @echo "generating callback.c"
- @$(RUBY) $(srcdir)/mkcallback.rb -output=callback $(srcdir)/../dl.h
diff --git a/ext/dl/callback/extconf.rb b/ext/dl/callback/extconf.rb
deleted file mode 100644
index 6c3387670d..0000000000
--- a/ext/dl/callback/extconf.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-require 'mkmf'
-
-if compiled?("dl")
- callbacks = (0..8).map{|i| "callback-#{i}"}.unshift("callback")
- callback_srcs = callbacks.map{|basename| "#{basename}.c"}
- callback_objs = callbacks.map{|basename| "#{basename}.o"}
-
- $distcleanfiles << '$(SRCS)'
- $srcs = callback_srcs
- $objs = callback_objs
- $INCFLAGS << " -I$(srcdir)/.."
-
- create_makefile("dl/callback")
-end
diff --git a/ext/dl/callback/mkcallback.rb b/ext/dl/callback/mkcallback.rb
deleted file mode 100644
index d2f9e3f2e1..0000000000
--- a/ext/dl/callback/mkcallback.rb
+++ /dev/null
@@ -1,238 +0,0 @@
-#!ruby -s
-$output ||= "callback"
-$out = open("#{$output}.c", "w")
-
-$dl_h = ARGV[0] || "dl.h"
-
-# import DLSTACK_SIZE, DLSTACK_ARGS and so on
-File.open($dl_h){|f|
- pre = ""
- f.each{|line|
- line.chop!
- if( line[-1] == ?\\ )
- line.chop!
- line.concat(" ")
- pre += line
- next
- end
- if( pre.size > 0 )
- line = pre + line
- pre = ""
- end
- case line
- when /#define\s+DLSTACK_SIZE\s+\(?(\d+)\)?/
- DLSTACK_SIZE = $1.to_i
- when /#define\s+DLSTACK_ARGS\s+(.+)/
- DLSTACK_ARGS = $1.to_i
- when /#define\s+DLTYPE_([A-Z_]+)\s+\(?(\d+)\)?/
- eval("#{$1} = #{$2}")
- when /#define\s+MAX_DLTYPE\s+\(?(\d+)\)?/
- MAX_DLTYPE = $1.to_i
- when /#define\s+MAX_CALLBACK\s+\(?(\d+)\)?/
- MAX_CALLBACK = $1.to_i
- end
- }
-}
-
-CDECL = "cdecl"
-STDCALL = "stdcall"
-
-CALLTYPES = [CDECL, STDCALL]
-
-DLTYPE = {
- VOID => {
- :name => 'void',
- :type => 'void',
- :conv => nil,
- },
- CHAR => {
- :name => 'char',
- :type => 'char',
- :conv => 'NUM2CHR(%s)'
- },
- SHORT => {
- :name => 'short',
- :type => 'short',
- :conv => 'NUM2INT(%s)',
- },
- INT => {
- :name => 'int',
- :type => 'int',
- :conv => 'NUM2INT(%s)',
- },
- LONG => {
- :name => 'long',
- :type => 'long',
- :conv => 'NUM2LONG(%s)',
- },
- LONG_LONG => {
- :name => 'long_long',
- :type => 'LONG_LONG',
- :conv => 'NUM2LL(%s)',
- },
- FLOAT => {
- :name => 'float',
- :type => 'float',
- :conv => '(float)RFLOAT_VALUE(%s)',
- },
- DOUBLE => {
- :name => 'double',
- :type => 'double',
- :conv => 'RFLOAT_VALUE(%s)',
- },
- VOIDP => {
- :name => 'ptr',
- :type => 'void *',
- :conv => 'NUM2PTR(%s)',
- },
-}
-
-
-def func_name(ty, argc, n, calltype)
- "rb_dl_callback_#{DLTYPE[ty][:name]}_#{argc}_#{n}_#{calltype}"
-end
-
-$out << (<<EOS)
-#include "ruby.h"
-
-VALUE rb_DLCdeclCallbackAddrs, rb_DLCdeclCallbackProcs;
-#ifdef FUNC_STDCALL
-VALUE rb_DLStdcallCallbackAddrs, rb_DLStdcallCallbackProcs;
-#endif
-/*static void *cdecl_callbacks[MAX_DLTYPE][MAX_CALLBACK];*/
-#ifdef FUNC_STDCALL
-/*static void *stdcall_callbacks[MAX_DLTYPE][MAX_CALLBACK];*/
-#endif
-ID rb_dl_cb_call;
-EOS
-
-def foreach_proc_entry
- for calltype in CALLTYPES
- case calltype
- when CDECL
- proc_entry = "rb_DLCdeclCallbackProcs"
- when STDCALL
- proc_entry = "rb_DLStdcallCallbackProcs"
- else
- raise "unknown calltype: #{calltype}"
- end
- yield calltype, proc_entry
- end
-end
-
-def gencallback(ty, calltype, proc_entry, argc, n)
- <<-EOS
-#{calltype == STDCALL ? "\n#ifdef FUNC_STDCALL" : ""}
-static #{DLTYPE[ty][:type]}
-FUNC_#{calltype.upcase}(#{func_name(ty,argc,n,calltype)})(#{(0...argc).collect{|i| "DLSTACK_TYPE stack" + i.to_s}.join(", ")})
-{
- VALUE ret, cb#{argc > 0 ? ", args[#{argc}]" : ""};
-#{
- (0...argc).collect{|i|
- " args[%d] = LONG2NUM(stack%d);" % [i,i]
- }.join("\n")
-}
- cb = rb_ary_entry(rb_ary_entry(#{proc_entry}, #{ty}), #{(n * DLSTACK_SIZE) + argc});
- ret = rb_funcall2(cb, rb_dl_cb_call, #{argc}, #{argc > 0 ? 'args' : 'NULL'});
- return #{DLTYPE[ty][:conv] ? DLTYPE[ty][:conv] % "ret" : ""};
-}
-#{calltype == STDCALL ? "#endif\n" : ""}
- EOS
-end
-
-def gen_push_proc_ary(ty, aryname)
- sprintf(" rb_ary_push(#{aryname}, rb_ary_new3(%d,%s));",
- MAX_CALLBACK * DLSTACK_SIZE,
- (0...MAX_CALLBACK).collect{
- (0...DLSTACK_SIZE).collect{ "Qnil" }.join(",")
- }.join(","))
-end
-
-def gen_push_addr_ary(ty, aryname, calltype)
- sprintf(" rb_ary_push(#{aryname}, rb_ary_new3(%d,%s));",
- MAX_CALLBACK * DLSTACK_SIZE,
- (0...MAX_CALLBACK).collect{|i|
- (0...DLSTACK_SIZE).collect{|argc|
- "PTR2NUM(%s)" % func_name(ty,argc,i,calltype)
- }.join(",")
- }.join(","))
-end
-
-def gen_callback_file(ty)
- filename = "#{$output}-#{ty}.c"
- initname = "rb_dl_init_callbacks_#{ty}"
- body = <<-EOS
-#include "dl.h"
-
-extern VALUE rb_DLCdeclCallbackAddrs, rb_DLCdeclCallbackProcs;
-#ifdef FUNC_STDCALL
-extern VALUE rb_DLStdcallCallbackAddrs, rb_DLStdcallCallbackProcs;
-#endif
-extern ID rb_dl_cb_call;
- EOS
- yield body
- body << <<-EOS
-void
-#{initname}()
-{
-#{gen_push_proc_ary(ty, "rb_DLCdeclCallbackProcs")}
-#{gen_push_addr_ary(ty, "rb_DLCdeclCallbackAddrs", CDECL)}
-#ifdef FUNC_STDCALL
-#{gen_push_proc_ary(ty, "rb_DLStdcallCallbackProcs")}
-#{gen_push_addr_ary(ty, "rb_DLStdcallCallbackAddrs", STDCALL)}
-#endif
-}
- EOS
- [filename, initname, body]
-end
-
-callbacks = []
-for ty in 0...MAX_DLTYPE
- filename, initname, body = gen_callback_file(ty) {|f|
- foreach_proc_entry do |calltype, proc_entry|
- for argc in 0...DLSTACK_SIZE
- for n in 0...MAX_CALLBACK
- f << gencallback(ty, calltype, proc_entry, argc, n)
- end
- end
- end
- }
- $out << "void #{initname}();\n"
- callbacks << [filename, body]
-end
-
-$out << (<<EOS)
-void
-Init_callback(void)
-{
- VALUE tmp;
- VALUE rb_mDL = rb_path2class("DL");
-
- rb_dl_cb_call = rb_intern("call");
-
- tmp = rb_DLCdeclCallbackProcs = rb_ary_new();
- rb_define_const(rb_mDL, "CdeclCallbackProcs", tmp);
-
- tmp = rb_DLCdeclCallbackAddrs = rb_ary_new();
- rb_define_const(rb_mDL, "CdeclCallbackAddrs", tmp);
-
-#ifdef FUNC_STDCALL
- tmp = rb_DLStdcallCallbackProcs = rb_ary_new();
- rb_define_const(rb_mDL, "StdcallCallbackProcs", tmp);
-
- tmp = rb_DLStdcallCallbackAddrs = rb_ary_new();
- rb_define_const(rb_mDL, "StdcallCallbackAddrs", tmp);
-#endif
-
-#{
- (0...MAX_DLTYPE).collect{|ty|
- " rb_dl_init_callbacks_#{ty}();"
- }.join("\n")
-}
-}
-EOS
-$out.close
-
-for filename, body in callbacks
- open(filename, "wb") {|f| f.puts body}
-end
diff --git a/ext/dl/cfunc.c b/ext/dl/cfunc.c
deleted file mode 100644
index 6110e14f55..0000000000
--- a/ext/dl/cfunc.c
+++ /dev/null
@@ -1,532 +0,0 @@
-/* -*- C -*-
- * $Id$
- */
-
-#include <ruby.h>
-#include <errno.h>
-#include "dl.h"
-
-VALUE rb_cDLCFunc;
-
-static ID id_last_error;
-
-static VALUE
-rb_dl_get_last_error(VALUE self)
-{
- return rb_thread_local_aref(rb_thread_current(), id_last_error);
-}
-
-static VALUE
-rb_dl_set_last_error(VALUE self, VALUE val)
-{
- rb_thread_local_aset(rb_thread_current(), id_last_error, val);
- return Qnil;
-}
-
-#if defined(HAVE_WINDOWS_H)
-#include <windows.h>
-static ID id_win32_last_error;
-
-static VALUE
-rb_dl_get_win32_last_error(VALUE self)
-{
- return rb_thread_local_aref(rb_thread_current(), id_win32_last_error);
-}
-
-static VALUE
-rb_dl_set_win32_last_error(VALUE self, VALUE val)
-{
- rb_thread_local_aset(rb_thread_current(), id_win32_last_error, val);
- return Qnil;
-}
-#endif
-
-
-void
-dlcfunc_free(void *ptr)
-{
- struct cfunc_data *data = ptr;
- if( data->name ){
- xfree(data->name);
- }
- xfree(data);
-}
-
-VALUE
-rb_dlcfunc_new(void (*func)(), int type, const char *name, ID calltype)
-{
- VALUE val;
- struct cfunc_data *data;
-
- rb_secure(4);
- if( func ){
- val = Data_Make_Struct(rb_cDLCFunc, struct cfunc_data, 0, dlcfunc_free, data);
- data->ptr = func;
- data->name = name ? strdup(name) : NULL;
- data->type = type;
- data->calltype = calltype;
- }
- else{
- val = Qnil;
- }
-
- return val;
-}
-
-void *
-rb_dlcfunc2ptr(VALUE val)
-{
- struct cfunc_data *data;
- void * func;
-
- if( rb_obj_is_kind_of(val, rb_cDLCFunc) ){
- Data_Get_Struct(val, struct cfunc_data, data);
- func = data->ptr;
- }
- else if( val == Qnil ){
- func = NULL;
- }
- else{
- rb_raise(rb_eTypeError, "DL::CFunc was expected");
- }
-
- return func;
-}
-
-VALUE
-rb_dlcfunc_s_allocate(VALUE klass)
-{
- VALUE obj;
- struct cfunc_data *data;
-
- obj = Data_Make_Struct(klass, struct cfunc_data, 0, dlcfunc_free, data);
- data->ptr = 0;
- data->name = 0;
- data->type = 0;
- data->calltype = CFUNC_CDECL;
-
- return obj;
-}
-
-int
-rb_dlcfunc_kind_p(VALUE func)
-{
- if (TYPE(func) == T_DATA) return 0;
- return RDATA(func)->dfree == dlcfunc_free;
-}
-
-VALUE
-rb_dlcfunc_initialize(int argc, VALUE argv[], VALUE self)
-{
- VALUE addr, name, type, calltype;
- struct cfunc_data *data;
- void *saddr;
- const char *sname;
-
- rb_scan_args(argc, argv, "13", &addr, &type, &name, &calltype);
-
- saddr = (void*)(NUM2PTR(rb_Integer(addr)));
- sname = NIL_P(name) ? NULL : StringValuePtr(name);
-
- Data_Get_Struct(self, struct cfunc_data, data);
- if( data->name ) xfree(data->name);
- data->ptr = saddr;
- data->name = sname ? strdup(sname) : 0;
- data->type = (type == Qnil) ? DLTYPE_VOID : NUM2INT(type);
- data->calltype = (calltype == Qnil) ? CFUNC_CDECL : SYM2ID(calltype);
-
- return Qnil;
-}
-
-VALUE
-rb_dlcfunc_name(VALUE self)
-{
- struct cfunc_data *cfunc;
-
- Data_Get_Struct(self, struct cfunc_data, cfunc);
- return cfunc->name ? rb_tainted_str_new2(cfunc->name) : Qnil;
-}
-
-VALUE
-rb_dlcfunc_ctype(VALUE self)
-{
- struct cfunc_data *cfunc;
-
- Data_Get_Struct(self, struct cfunc_data, cfunc);
- return INT2NUM(cfunc->type);
-}
-
-VALUE
-rb_dlcfunc_set_ctype(VALUE self, VALUE ctype)
-{
- struct cfunc_data *cfunc;
-
- Data_Get_Struct(self, struct cfunc_data, cfunc);
- cfunc->type = NUM2INT(ctype);
- return ctype;
-}
-
-VALUE
-rb_dlcfunc_calltype(VALUE self)
-{
- struct cfunc_data *cfunc;
-
- Data_Get_Struct(self, struct cfunc_data, cfunc);
- return ID2SYM(cfunc->calltype);
-}
-
-VALUE
-rb_dlcfunc_set_calltype(VALUE self, VALUE sym)
-{
- struct cfunc_data *cfunc;
-
- Data_Get_Struct(self, struct cfunc_data, cfunc);
- cfunc->calltype = SYM2ID(sym);
- return sym;
-}
-
-
-VALUE
-rb_dlcfunc_ptr(VALUE self)
-{
- struct cfunc_data *cfunc;
-
- Data_Get_Struct(self, struct cfunc_data, cfunc);
- return PTR2NUM(cfunc->ptr);
-}
-
-VALUE
-rb_dlcfunc_set_ptr(VALUE self, VALUE addr)
-{
- struct cfunc_data *cfunc;
-
- Data_Get_Struct(self, struct cfunc_data, cfunc);
- cfunc->ptr = NUM2PTR(addr);
-
- return Qnil;
-}
-
-VALUE
-rb_dlcfunc_inspect(VALUE self)
-{
- VALUE val;
- char *str;
- int str_size;
- struct cfunc_data *cfunc;
-
- Data_Get_Struct(self, struct cfunc_data, cfunc);
-
- str_size = (cfunc->name ? strlen(cfunc->name) : 0) + 100;
- str = ruby_xmalloc(str_size);
- snprintf(str, str_size - 1,
- "#<DL::CFunc:%p ptr=%p type=%d name='%s'>",
- cfunc,
- cfunc->ptr,
- cfunc->type,
- cfunc->name ? cfunc->name : "");
- val = rb_tainted_str_new2(str);
- ruby_xfree(str);
-
- return val;
-}
-
-
-# define DECL_FUNC_CDECL(f,ret,args) ret (FUNC_CDECL(*f))(args)
-#ifdef FUNC_STDCALL
-# define DECL_FUNC_STDCALL(f,ret,args) ret (FUNC_STDCALL(*f))(args)
-#endif
-
-#define CALL_CASE switch( RARRAY_LEN(ary) ){ \
- CASE(0); break; \
- CASE(1); break; CASE(2); break; CASE(3); break; CASE(4); break; CASE(5); break; \
- CASE(6); break; CASE(7); break; CASE(8); break; CASE(9); break; CASE(10);break; \
- CASE(11);break; CASE(12);break; CASE(13);break; CASE(14);break; CASE(15);break; \
- CASE(16);break; CASE(17);break; CASE(18);break; CASE(19);break; CASE(20);break; \
- default: rb_raise(rb_eArgError, "too many arguments"); \
-}
-
-
-VALUE
-rb_dlcfunc_call(VALUE self, VALUE ary)
-{
- struct cfunc_data *cfunc;
- int i;
- DLSTACK_TYPE stack[DLSTACK_SIZE];
- VALUE result = Qnil;
-
- rb_secure_update(self);
-
- memset(stack, 0, sizeof(DLSTACK_TYPE) * DLSTACK_SIZE);
- Check_Type(ary, T_ARRAY);
-
- Data_Get_Struct(self, struct cfunc_data, cfunc);
-
- if( cfunc->ptr == 0 ){
- rb_raise(rb_eDLError, "can't call null-function");
- return Qnil;
- }
-
- for( i = 0; i < RARRAY_LEN(ary); i++ ){
- if( i >= DLSTACK_SIZE ){
- rb_raise(rb_eDLError, "too many arguments (stack overflow)");
- }
- rb_check_safe_obj(RARRAY_PTR(ary)[i]);
- stack[i] = NUM2LONG(RARRAY_PTR(ary)[i]);
- }
-
- /* calltype == CFUNC_CDECL */
- if( cfunc->calltype == CFUNC_CDECL
-#ifndef FUNC_STDCALL
- || cfunc->calltype == CFUNC_STDCALL
-#endif
- ){
- switch( cfunc->type ){
- case DLTYPE_VOID:
-#define CASE(n) case n: { \
- DECL_FUNC_CDECL(f,void,DLSTACK_PROTO##n) = cfunc->ptr; \
- f(DLSTACK_ARGS##n(stack)); \
- result = Qnil; \
-}
- CALL_CASE;
-#undef CASE
- break;
- case DLTYPE_VOIDP:
-#define CASE(n) case n: { \
- DECL_FUNC_CDECL(f,void*,DLSTACK_PROTO##n) = cfunc->ptr; \
- void * ret; \
- ret = f(DLSTACK_ARGS##n(stack)); \
- result = PTR2NUM(ret); \
-}
- CALL_CASE;
-#undef CASE
- break;
- case DLTYPE_CHAR:
-#define CASE(n) case n: { \
- DECL_FUNC_CDECL(f,char,DLSTACK_PROTO##n) = cfunc->ptr; \
- char ret; \
- ret = f(DLSTACK_ARGS##n(stack)); \
- result = CHR2FIX(ret); \
-}
- CALL_CASE;
-#undef CASE
- break;
- case DLTYPE_SHORT:
-#define CASE(n) case n: { \
- DECL_FUNC_CDECL(f,short,DLSTACK_PROTO##n) = cfunc->ptr; \
- short ret; \
- ret = f(DLSTACK_ARGS##n(stack)); \
- result = INT2NUM((int)ret); \
-}
- CALL_CASE;
-#undef CASE
- break;
- case DLTYPE_INT:
-#define CASE(n) case n: { \
- DECL_FUNC_CDECL(f,int,DLSTACK_PROTO##n) = cfunc->ptr; \
- int ret; \
- ret = f(DLSTACK_ARGS##n(stack)); \
- result = INT2NUM(ret); \
-}
- CALL_CASE;
-#undef CASE
- break;
- case DLTYPE_LONG:
-#define CASE(n) case n: { \
- DECL_FUNC_CDECL(f,long,DLSTACK_PROTO##n) = cfunc->ptr; \
- long ret; \
- ret = f(DLSTACK_ARGS##n(stack)); \
- result = LONG2NUM(ret); \
-}
- CALL_CASE;
-#undef CASE
- break;
-#if HAVE_LONG_LONG /* used in ruby.h */
- case DLTYPE_LONG_LONG:
-#define CASE(n) case n: { \
- DECL_FUNC_CDECL(f,LONG_LONG,DLSTACK_PROTO##n) = cfunc->ptr; \
- LONG_LONG ret; \
- ret = f(DLSTACK_ARGS##n(stack)); \
- result = LL2NUM(ret); \
-}
- CALL_CASE;
-#undef CASE
- break;
-#endif
- case DLTYPE_FLOAT:
-#define CASE(n) case n: { \
- DECL_FUNC_CDECL(f,float,DLSTACK_PROTO##n) = cfunc->ptr; \
- float ret; \
- ret = f(DLSTACK_ARGS##n(stack)); \
- result = rb_float_new(ret); \
-}
- CALL_CASE;
-#undef CASE
- break;
- case DLTYPE_DOUBLE:
-#define CASE(n) case n: { \
- DECL_FUNC_CDECL(f,double,DLSTACK_PROTO##n) = cfunc->ptr; \
- double ret; \
- ret = f(DLSTACK_ARGS##n(stack)); \
- result = rb_float_new(ret); \
-}
- CALL_CASE;
-#undef CASE
- break;
- default:
- rb_raise(rb_eDLTypeError, "unknown type %d", cfunc->type);
- }
- }
-#ifdef FUNC_STDCALL
- else if( cfunc->calltype == CFUNC_STDCALL ){
- /* calltype == CFUNC_STDCALL */
- switch( cfunc->type ){
- case DLTYPE_VOID:
-#define CASE(n) case n: { \
- DECL_FUNC_STDCALL(f,void,DLSTACK_PROTO##n##_) = cfunc->ptr; \
- f(DLSTACK_ARGS##n(stack)); \
- result = Qnil; \
-}
- CALL_CASE;
-#undef CASE
- break;
- case DLTYPE_VOIDP:
-#define CASE(n) case n: { \
- DECL_FUNC_STDCALL(f,void*,DLSTACK_PROTO##n##_) = cfunc->ptr; \
- void * ret; \
- ret = f(DLSTACK_ARGS##n(stack)); \
- result = PTR2NUM(ret); \
-}
- CALL_CASE;
-#undef CASE
- break;
- case DLTYPE_CHAR:
-#define CASE(n) case n: { \
- DECL_FUNC_STDCALL(f,char,DLSTACK_PROTO##n##_) = cfunc->ptr; \
- char ret; \
- ret = f(DLSTACK_ARGS##n(stack)); \
- result = CHR2FIX(ret); \
-}
- CALL_CASE;
-#undef CASE
- break;
- case DLTYPE_SHORT:
-#define CASE(n) case n: { \
- DECL_FUNC_STDCALL(f,short,DLSTACK_PROTO##n##_) = cfunc->ptr; \
- short ret; \
- ret = f(DLSTACK_ARGS##n(stack)); \
- result = INT2NUM((int)ret); \
-}
- CALL_CASE;
-#undef CASE
- break;
- case DLTYPE_INT:
-#define CASE(n) case n: { \
- DECL_FUNC_STDCALL(f,int,DLSTACK_PROTO##n##_) = cfunc->ptr; \
- int ret; \
- ret = f(DLSTACK_ARGS##n(stack)); \
- result = INT2NUM(ret); \
-}
- CALL_CASE;
-#undef CASE
- break;
- case DLTYPE_LONG:
-#define CASE(n) case n: { \
- DECL_FUNC_STDCALL(f,long,DLSTACK_PROTO##n##_) = cfunc->ptr; \
- long ret; \
- ret = f(DLSTACK_ARGS##n(stack)); \
- result = LONG2NUM(ret); \
-}
- CALL_CASE;
-#undef CASE
- break;
-#if HAVE_LONG_LONG /* used in ruby.h */
- case DLTYPE_LONG_LONG:
-#define CASE(n) case n: { \
- DECL_FUNC_STDCALL(f,LONG_LONG,DLSTACK_PROTO##n##_) = cfunc->ptr; \
- LONG_LONG ret; \
- ret = f(DLSTACK_ARGS##n(stack)); \
- result = LL2NUM(ret); \
-}
- CALL_CASE;
-#undef CASE
- break;
-#endif
- case DLTYPE_FLOAT:
-#define CASE(n) case n: { \
- DECL_FUNC_STDCALL(f,float,DLSTACK_PROTO##n##_) = cfunc->ptr; \
- float ret; \
- ret = f(DLSTACK_ARGS##n(stack)); \
- result = rb_float_new(ret); \
-}
- CALL_CASE;
-#undef CASE
- break;
- case DLTYPE_DOUBLE:
-#define CASE(n) case n: { \
- DECL_FUNC_STDCALL(f,double,DLSTACK_PROTO##n##_) = cfunc->ptr; \
- double ret; \
- ret = f(DLSTACK_ARGS##n(stack)); \
- result = rb_float_new(ret); \
-}
- CALL_CASE;
-#undef CASE
- break;
- default:
- rb_raise(rb_eDLTypeError, "unknown type %d", cfunc->type);
- }
- }
-#endif
- else{
- rb_raise(rb_eDLError,
-#ifndef LONG_LONG_VALUE
- "unsupported call type: %lx",
-#else
- "unsupported call type: %llx",
-#endif
- cfunc->calltype);
- }
-
- rb_dl_set_last_error(self, INT2NUM(errno));
-#if defined(HAVE_WINDOWS_H)
- rb_dl_set_win32_last_error(self, INT2NUM(GetLastError()));
-#endif
-
- return result;
-}
-
-VALUE
-rb_dlcfunc_to_i(VALUE self)
-{
- struct cfunc_data *cfunc;
-
- Data_Get_Struct(self, struct cfunc_data, cfunc);
- return PTR2NUM(cfunc->ptr);
-}
-
-void
-Init_dlcfunc(void)
-{
- id_last_error = rb_intern("__DL2_LAST_ERROR__");
-#if defined(HAVE_WINDOWS_H)
- id_win32_last_error = rb_intern("__DL2_WIN32_LAST_ERROR__");
-#endif
- rb_cDLCFunc = rb_define_class_under(rb_mDL, "CFunc", rb_cObject);
- rb_define_alloc_func(rb_cDLCFunc, rb_dlcfunc_s_allocate);
- rb_define_module_function(rb_cDLCFunc, "last_error", rb_dl_get_last_error, 0);
-#if defined(HAVE_WINDOWS_H)
- rb_define_module_function(rb_cDLCFunc, "win32_last_error", rb_dl_get_win32_last_error, 0);
-#endif
- rb_define_method(rb_cDLCFunc, "initialize", rb_dlcfunc_initialize, -1);
- rb_define_method(rb_cDLCFunc, "call", rb_dlcfunc_call, 1);
- rb_define_method(rb_cDLCFunc, "[]", rb_dlcfunc_call, 1);
- rb_define_method(rb_cDLCFunc, "name", rb_dlcfunc_name, 0);
- rb_define_method(rb_cDLCFunc, "ctype", rb_dlcfunc_ctype, 0);
- rb_define_method(rb_cDLCFunc, "ctype=", rb_dlcfunc_set_ctype, 1);
- rb_define_method(rb_cDLCFunc, "calltype", rb_dlcfunc_calltype, 0);
- rb_define_method(rb_cDLCFunc, "calltype=", rb_dlcfunc_set_calltype, 1);
- rb_define_method(rb_cDLCFunc, "ptr", rb_dlcfunc_ptr, 0);
- rb_define_method(rb_cDLCFunc, "ptr=", rb_dlcfunc_set_ptr, 1);
- rb_define_method(rb_cDLCFunc, "inspect", rb_dlcfunc_inspect, 0);
- rb_define_method(rb_cDLCFunc, "to_s", rb_dlcfunc_inspect, 0);
- rb_define_method(rb_cDLCFunc, "to_i", rb_dlcfunc_to_i, 0);
-}
diff --git a/ext/dl/cptr.c b/ext/dl/cptr.c
deleted file mode 100644
index b7c27e9f9e..0000000000
--- a/ext/dl/cptr.c
+++ /dev/null
@@ -1,491 +0,0 @@
-/* -*- C -*-
- * $Id$
- */
-
-#include <ruby/ruby.h>
-#include <ruby/io.h>
-#include <ctype.h>
-#include "dl.h"
-
-VALUE rb_cDLCPtr;
-
-static inline freefunc_t
-get_freefunc(VALUE func)
-{
- if (NIL_P(func)) {
- return NULL;
- }
- if (rb_dlcfunc_kind_p(func)) {
- return RCFUNC_DATA(func)->ptr;
- }
- return NUM2PTR(rb_Integer(func));
-}
-
-static ID id_to_ptr;
-
-static void
-dlptr_free(struct ptr_data *data)
-{
- if (data->ptr) {
- if (data->free) {
- (*(data->free))(data->ptr);
- }
- }
-}
-
-static void
-dlptr_mark(struct ptr_data *data)
-{
-}
-
-void
-dlptr_init(VALUE val)
-{
- struct ptr_data *data;
-
- Data_Get_Struct(val, struct ptr_data, data);
- OBJ_TAINT(val);
-}
-
-VALUE
-rb_dlptr_new2(VALUE klass, void *ptr, long size, freefunc_t func)
-{
- struct ptr_data *data;
- VALUE val;
-
- rb_secure(4);
- val = Data_Make_Struct(klass, struct ptr_data,
- 0, dlptr_free, data);
- data->ptr = ptr;
- data->free = func;
- data->size = size;
- dlptr_init(val);
-
- return val;
-}
-
-VALUE
-rb_dlptr_new(void *ptr, long size, freefunc_t func)
-{
- return rb_dlptr_new2(rb_cDLCPtr, ptr, size, func);
-}
-
-VALUE
-rb_dlptr_malloc(long size, freefunc_t func)
-{
- void *ptr;
-
- rb_secure(4);
- ptr = ruby_xmalloc((size_t)size);
- memset(ptr,0,(size_t)size);
- return rb_dlptr_new(ptr, size, func);
-}
-
-void *
-rb_dlptr2cptr(VALUE val)
-{
- struct ptr_data *data;
- void *ptr;
-
- if (rb_obj_is_kind_of(val, rb_cDLCPtr)) {
- Data_Get_Struct(val, struct ptr_data, data);
- ptr = data->ptr;
- }
- else if (val == Qnil) {
- ptr = NULL;
- }
- else{
- rb_raise(rb_eTypeError, "DL::PtrData was expected");
- }
-
- return ptr;
-}
-
-static VALUE
-rb_dlptr_s_allocate(VALUE klass)
-{
- VALUE obj;
- struct ptr_data *data;
-
- rb_secure(4);
- obj = Data_Make_Struct(klass, struct ptr_data, dlptr_mark, dlptr_free, data);
- data->ptr = 0;
- data->size = 0;
- data->free = 0;
-
- return obj;
-}
-
-static VALUE
-rb_dlptr_initialize(int argc, VALUE argv[], VALUE self)
-{
- VALUE ptr, sym, size;
- struct ptr_data *data;
- void *p = NULL;
- freefunc_t f = NULL;
- long s = 0;
-
- switch (rb_scan_args(argc, argv, "12", &ptr, &size, &sym)) {
- case 1:
- p = (void*)(NUM2PTR(rb_Integer(ptr)));
- break;
- case 2:
- p = (void*)(NUM2PTR(rb_Integer(ptr)));
- s = NUM2LONG(size);
- break;
- case 3:
- p = (void*)(NUM2PTR(rb_Integer(ptr)));
- s = NUM2LONG(size);
- f = get_freefunc(sym);
- break;
- default:
- rb_bug("rb_dlptr_initialize");
- }
-
- if (p) {
- Data_Get_Struct(self, struct ptr_data, data);
- if (data->ptr && data->free) {
- /* Free previous memory. Use of inappropriate initialize may cause SEGV. */
- (*(data->free))(data->ptr);
- }
- data->ptr = p;
- data->size = s;
- data->free = f;
- }
-
- return Qnil;
-}
-
-static VALUE
-rb_dlptr_s_malloc(int argc, VALUE argv[], VALUE klass)
-{
- VALUE size, sym, obj;
- int s;
- freefunc_t f;
-
- switch (rb_scan_args(argc, argv, "11", &size, &sym)) {
- case 1:
- s = NUM2LONG(size);
- f = NULL;
- break;
- case 2:
- s = NUM2LONG(size);
- f = get_freefunc(sym);
- break;
- default:
- rb_bug("rb_dlptr_s_malloc");
- }
-
- obj = rb_dlptr_malloc(s,f);
-
- return obj;
-}
-
-VALUE
-rb_dlptr_to_i(VALUE self)
-{
- struct ptr_data *data;
-
- Data_Get_Struct(self, struct ptr_data, data);
- return PTR2NUM(data->ptr);
-}
-
-VALUE
-rb_dlptr_to_value(VALUE self)
-{
- struct ptr_data *data;
- Data_Get_Struct(self, struct ptr_data, data);
- return (VALUE)(data->ptr);
-}
-
-VALUE
-rb_dlptr_ptr(VALUE self)
-{
- struct ptr_data *data;
-
- Data_Get_Struct(self, struct ptr_data, data);
- return rb_dlptr_new(*((void**)(data->ptr)),0,0);
-}
-
-VALUE
-rb_dlptr_ref(VALUE self)
-{
- struct ptr_data *data;
-
- Data_Get_Struct(self, struct ptr_data, data);
- return rb_dlptr_new(&(data->ptr),0,0);
-}
-
-VALUE
-rb_dlptr_null_p(VALUE self)
-{
- struct ptr_data *data;
-
- Data_Get_Struct(self, struct ptr_data, data);
- return data->ptr ? Qfalse : Qtrue;
-}
-
-VALUE
-rb_dlptr_free_set(VALUE self, VALUE val)
-{
- struct ptr_data *data;
-
- Data_Get_Struct(self, struct ptr_data, data);
- data->free = get_freefunc(val);
-
- return Qnil;
-}
-
-VALUE
-rb_dlptr_free_get(VALUE self)
-{
- struct ptr_data *pdata;
-
- Data_Get_Struct(self, struct ptr_data, pdata);
-
- return rb_dlcfunc_new(pdata->free, DLTYPE_VOID, "free<anonymous>", CFUNC_CDECL);
-}
-
-VALUE
-rb_dlptr_to_s(int argc, VALUE argv[], VALUE self)
-{
- struct ptr_data *data;
- VALUE arg1, val;
- int len;
-
- Data_Get_Struct(self, struct ptr_data, data);
- switch (rb_scan_args(argc, argv, "01", &arg1)) {
- case 0:
- val = rb_tainted_str_new2((char*)(data->ptr));
- break;
- case 1:
- len = NUM2INT(arg1);
- val = rb_tainted_str_new((char*)(data->ptr), len);
- break;
- default:
- rb_bug("rb_dlptr_to_s");
- }
-
- return val;
-}
-
-VALUE
-rb_dlptr_to_str(int argc, VALUE argv[], VALUE self)
-{
- struct ptr_data *data;
- VALUE arg1, val;
- int len;
-
- Data_Get_Struct(self, struct ptr_data, data);
- switch (rb_scan_args(argc, argv, "01", &arg1)) {
- case 0:
- val = rb_tainted_str_new((char*)(data->ptr),data->size);
- break;
- case 1:
- len = NUM2INT(arg1);
- val = rb_tainted_str_new((char*)(data->ptr), len);
- break;
- default:
- rb_bug("rb_dlptr_to_str");
- }
-
- return val;
-}
-
-VALUE
-rb_dlptr_inspect(VALUE self)
-{
- struct ptr_data *data;
- char str[1024];
-
- Data_Get_Struct(self, struct ptr_data, data);
- snprintf(str, 1023, "#<%s:%p ptr=%p size=%ld free=%p>",
- rb_class2name(CLASS_OF(self)), data, data->ptr, data->size, data->free);
- return rb_str_new2(str);
-}
-
-VALUE
-rb_dlptr_eql(VALUE self, VALUE other)
-{
- void *ptr1, *ptr2;
- ptr1 = rb_dlptr2cptr(self);
- ptr2 = rb_dlptr2cptr(other);
-
- return ptr1 == ptr2 ? Qtrue : Qfalse;
-}
-
-VALUE
-rb_dlptr_cmp(VALUE self, VALUE other)
-{
- void *ptr1, *ptr2;
- SIGNED_VALUE diff;
- ptr1 = rb_dlptr2cptr(self);
- ptr2 = rb_dlptr2cptr(other);
- diff = (SIGNED_VALUE)ptr1 - (SIGNED_VALUE)ptr2;
- if (!diff) return INT2FIX(0);
- return diff > 0 ? INT2NUM(1) : INT2NUM(-1);
-}
-
-VALUE
-rb_dlptr_plus(VALUE self, VALUE other)
-{
- void *ptr;
- long num, size;
-
- ptr = rb_dlptr2cptr(self);
- size = RPTR_DATA(self)->size;
- num = NUM2LONG(other);
- return rb_dlptr_new((char *)ptr + num, size - num, 0);
-}
-
-VALUE
-rb_dlptr_minus(VALUE self, VALUE other)
-{
- void *ptr;
- long num, size;
-
- ptr = rb_dlptr2cptr(self);
- size = RPTR_DATA(self)->size;
- num = NUM2LONG(other);
- return rb_dlptr_new((char *)ptr - num, size + num, 0);
-}
-
-VALUE
-rb_dlptr_aref(int argc, VALUE argv[], VALUE self)
-{
- VALUE arg0, arg1;
- VALUE retval = Qnil;
- size_t offset, len;
-
- switch( rb_scan_args(argc, argv, "11", &arg0, &arg1) ){
- case 1:
- offset = NUM2ULONG(arg0);
- retval = INT2NUM(*((char*)RPTR_DATA(self)->ptr + offset));
- break;
- case 2:
- offset = NUM2ULONG(arg0);
- len = NUM2ULONG(arg1);
- retval = rb_tainted_str_new((char *)RPTR_DATA(self)->ptr + offset, len);
- break;
- default:
- rb_bug("rb_dlptr_aref()");
- }
- return retval;
-}
-
-VALUE
-rb_dlptr_aset(int argc, VALUE argv[], VALUE self)
-{
- VALUE arg0, arg1, arg2;
- VALUE retval = Qnil;
- size_t offset, len;
- void *mem;
-
- switch( rb_scan_args(argc, argv, "21", &arg0, &arg1, &arg2) ){
- case 2:
- offset = NUM2ULONG(arg0);
- ((char*)RPTR_DATA(self)->ptr)[offset] = NUM2UINT(arg1);
- retval = arg1;
- break;
- case 3:
- offset = NUM2ULONG(arg0);
- len = NUM2ULONG(arg1);
- if( TYPE(arg2) == T_STRING ){
- mem = StringValuePtr(arg2);
- }
- else if( rb_obj_is_kind_of(arg2, rb_cDLCPtr) ){
- mem = rb_dlptr2cptr(arg2);
- }
- else{
- mem = NUM2PTR(arg2);
- }
- memcpy((char *)RPTR_DATA(self)->ptr + offset, mem, len);
- retval = arg2;
- break;
- default:
- rb_bug("rb_dlptr_aset()");
- }
- return retval;
-}
-
-VALUE
-rb_dlptr_size(int argc, VALUE argv[], VALUE self)
-{
- VALUE size;
-
- if (rb_scan_args(argc, argv, "01", &size) == 0){
- return LONG2NUM(RPTR_DATA(self)->size);
- }
- else{
- RPTR_DATA(self)->size = NUM2LONG(size);
- return size;
- }
-}
-
-VALUE
-rb_dlptr_s_to_ptr(VALUE self, VALUE val)
-{
- VALUE ptr;
-
- if (rb_obj_is_kind_of(val, rb_cIO) == Qtrue){
- rb_io_t *fptr;
- FILE *fp;
- GetOpenFile(val, fptr);
- fp = rb_io_stdio_file(fptr);
- ptr = rb_dlptr_new(fp, 0, NULL);
- }
- else if (rb_obj_is_kind_of(val, rb_cString) == Qtrue){
- char *str = StringValuePtr(val);
- ptr = rb_dlptr_new(str, RSTRING_LEN(val), NULL);
- }
- else if (rb_respond_to(val, id_to_ptr)){
- VALUE vptr = rb_funcall(val, id_to_ptr, 0);
- if (rb_obj_is_kind_of(vptr, rb_cDLCPtr)){
- ptr = vptr;
- }
- else{
- rb_raise(rb_eDLError, "to_ptr should return a CPtr object");
- }
- }
- else{
- ptr = rb_dlptr_new(NUM2PTR(rb_Integer(val)), 0, NULL);
- }
- OBJ_INFECT(ptr, val);
- return ptr;
-}
-
-void
-Init_dlptr(void)
-{
- id_to_ptr = rb_intern("to_ptr");
-
- rb_cDLCPtr = rb_define_class_under(rb_mDL, "CPtr", rb_cObject);
- rb_define_alloc_func(rb_cDLCPtr, rb_dlptr_s_allocate);
- rb_define_singleton_method(rb_cDLCPtr, "malloc", rb_dlptr_s_malloc, -1);
- rb_define_singleton_method(rb_cDLCPtr, "to_ptr", rb_dlptr_s_to_ptr, 1);
- rb_define_singleton_method(rb_cDLCPtr, "[]", rb_dlptr_s_to_ptr, 1);
- rb_define_method(rb_cDLCPtr, "initialize", rb_dlptr_initialize, -1);
- rb_define_method(rb_cDLCPtr, "free=", rb_dlptr_free_set, 1);
- rb_define_method(rb_cDLCPtr, "free", rb_dlptr_free_get, 0);
- rb_define_method(rb_cDLCPtr, "to_i", rb_dlptr_to_i, 0);
- rb_define_method(rb_cDLCPtr, "to_value", rb_dlptr_to_value, 0);
- rb_define_method(rb_cDLCPtr, "ptr", rb_dlptr_ptr, 0);
- rb_define_method(rb_cDLCPtr, "+@", rb_dlptr_ptr, 0);
- rb_define_method(rb_cDLCPtr, "ref", rb_dlptr_ref, 0);
- rb_define_method(rb_cDLCPtr, "-@", rb_dlptr_ref, 0);
- rb_define_method(rb_cDLCPtr, "null?", rb_dlptr_null_p, 0);
- rb_define_method(rb_cDLCPtr, "to_s", rb_dlptr_to_s, -1);
- rb_define_method(rb_cDLCPtr, "to_str", rb_dlptr_to_str, -1);
- rb_define_method(rb_cDLCPtr, "inspect", rb_dlptr_inspect, 0);
- rb_define_method(rb_cDLCPtr, "<=>", rb_dlptr_cmp, 1);
- rb_define_method(rb_cDLCPtr, "==", rb_dlptr_eql, 1);
- rb_define_method(rb_cDLCPtr, "eql?", rb_dlptr_eql, 1);
- rb_define_method(rb_cDLCPtr, "+", rb_dlptr_plus, 1);
- rb_define_method(rb_cDLCPtr, "-", rb_dlptr_minus, 1);
- rb_define_method(rb_cDLCPtr, "[]", rb_dlptr_aref, -1);
- rb_define_method(rb_cDLCPtr, "[]=", rb_dlptr_aset, -1);
- rb_define_method(rb_cDLCPtr, "size", rb_dlptr_size, -1);
- rb_define_method(rb_cDLCPtr, "size=", rb_dlptr_size, -1);
-
- rb_define_const(rb_mDL, "NULL", rb_dlptr_new(0, 0, 0));
-}
diff --git a/ext/dl/depend b/ext/dl/depend
index 992c17c1b8..fba3df7a3d 100644
--- a/ext/dl/depend
+++ b/ext/dl/depend
@@ -1,7 +1,46 @@
-cfunc.o: cfunc.c dl.h $(hdrdir)/ruby.h
+LDSHARED_TEST = $(LDSHARED) $(LDFLAGS) test/test.o -o test/libtest.so $(LOCAL_LIBS)
-cptr.o: cptr.c dl.h $(hdrdir)/ruby.h $(hdrdir)/io.h
+libtest.so: test/libtest.so
-handle.o: handle.c dl.h $(hdrdir)/ruby.h
+test/libtest.so: test/test.o $(srcdir)/test/libtest.def
+ $(RUBY) -rftools -e 'ARGV.each do|d|File.mkpath(File.dirname(d))end' $@
+ $(LDSHARED_TEST:dl.def=test/libtest.def)
-dl.o: dl.c dl.h $(hdrdir)/ruby.h $(hdrdir)/io.h
+test/test.o: $(srcdir)/test/test.c
+ @$(RUBY) -rftools -e 'File.mkpath(*ARGV)' test
+ $(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/test/test.c -o $@
+
+test:: dl.so libtest.so force
+ $(RUBY) -I. -I$(srcdir)/lib $(srcdir)/test/test.rb
+
+force:
+
+.PHONY: force test
+
+allclean: distclean
+ @rm -f $(CLEANFILES) $(DISTCLEANFILES)
+
+$(OBJS): ./dlconfig.h
+
+sym.o: dl.h call.func
+
+dl.o: dl.h callback.func cbtable.func
+
+ptr.o: dl.h
+
+handle.o: dl.h
+
+call.func: $(srcdir)/mkcall.rb ./dlconfig.rb
+ @echo "Generating call.func"
+ @$(RUBY) $(srcdir)/mkcall.rb > $@
+
+callback.func: $(srcdir)/mkcallback.rb ./dlconfig.rb
+ @echo "Generating callback.func"
+ @$(RUBY) $(srcdir)/mkcallback.rb > $@
+
+cbtable.func: $(srcdir)/mkcbtable.rb ./dlconfig.rb
+ @echo "Generating cbtable.func"
+ @$(RUBY) $(srcdir)/mkcbtable.rb > $@
+
+debug:
+ $(MAKE) CPPFLAGS="$(CPPFLAGS) -DDEBUG"
diff --git a/ext/dl/dl.c b/ext/dl/dl.c
index 00762c5be1..e92db298f6 100644
--- a/ext/dl/dl.c
+++ b/ext/dl/dl.c
@@ -1,5 +1,9 @@
-#include <ruby/ruby.h>
-#include <ruby/io.h>
+/*
+ * $Id$
+ */
+
+#include <ruby.h>
+#include <rubyio.h>
#include <ctype.h>
#include "dl.h"
@@ -7,142 +11,718 @@ VALUE rb_mDL;
VALUE rb_eDLError;
VALUE rb_eDLTypeError;
-ID rbdl_id_cdecl;
-ID rbdl_id_stdcall;
+static VALUE DLFuncTable;
+static void *rb_dl_callback_table[CALLBACK_TYPES][MAX_CALLBACK];
+static ID id_call;
-VALUE
-rb_dl_dlopen(int argc, VALUE argv[], VALUE self)
+static int
+rb_dl_scan_callback_args(long stack[], const char *proto,
+ int *argc, VALUE argv[])
{
- rb_secure(2);
- return rb_class_new_instance(argc, argv, rb_cDLHandle);
+ int i;
+ long *sp;
+ VALUE val;
+
+ sp = stack;
+ for (i=1; proto[i]; i++) {
+ switch (proto[i]) {
+ case 'C':
+ {
+ char v;
+ v = (char)(*sp);
+ sp++;
+ val = INT2NUM(v);
+ }
+ break;
+ case 'H':
+ {
+ short v;
+ v = (short)(*sp);
+ sp++;
+ val = INT2NUM(v);
+ }
+ break;
+ case 'I':
+ {
+ int v;
+ v = (int)(*sp);
+ sp++;
+ val = INT2NUM(v);
+ }
+ break;
+ case 'L':
+ {
+ long v;
+ v = (long)(*sp);
+ sp++;
+ val = INT2NUM(v);
+ }
+ break;
+ case 'F':
+ {
+ float v;
+ memcpy(&v, sp, sizeof(float));
+ sp += sizeof(float)/sizeof(long);
+ val = rb_float_new(v);
+ }
+ break;
+ case 'D':
+ {
+ double v;
+ memcpy(&v, sp, sizeof(double));
+ sp += sizeof(double)/sizeof(long);
+ val = rb_float_new(v);
+ }
+ break;
+ case 'P':
+ {
+ void *v;
+ memcpy(&v, sp, sizeof(void*));
+ sp++;
+ val = rb_dlptr_new(v, 0, 0);
+ }
+ break;
+ case 'S':
+ {
+ char *v;
+ memcpy(&v, sp, sizeof(void*));
+ sp++;
+ val = rb_tainted_str_new2(v);
+ }
+ break;
+ default:
+ rb_raise(rb_eDLTypeError, "unsupported type `%c'", proto[i]);
+ break;
+ }
+ argv[i-1] = val;
+ }
+ *argc = (i - 1);
+
+ return (*argc);
}
-VALUE
-rb_dl_malloc(VALUE self, VALUE size)
+#include "callback.func"
+
+static void
+init_dl_func_table(){
+#include "cbtable.func"
+}
+
+void *
+dlmalloc(size_t size)
{
+ DEBUG_CODE2({
void *ptr;
- rb_secure(4);
- ptr = (void*)ruby_xmalloc(NUM2INT(size));
- return PTR2NUM(ptr);
+ printf("dlmalloc(%d)",size);
+ ptr = xmalloc(size);
+ printf(":0x%x\n",ptr);
+ return ptr;
+ },
+ {
+ return xmalloc(size);
+ });
+}
+
+void *
+dlrealloc(void *ptr, size_t size)
+{
+ DEBUG_CODE({
+ printf("dlrealloc(0x%x,%d)\n",ptr,size);
+ });
+ return xrealloc(ptr, size);
+}
+
+void
+dlfree(void *ptr)
+{
+ DEBUG_CODE({
+ printf("dlfree(0x%x)\n",ptr);
+ });
+ xfree(ptr);
+}
+
+char*
+dlstrdup(const char *str)
+{
+ char *newstr;
+
+ newstr = (char*)dlmalloc(strlen(str)+1);
+ strcpy(newstr,str);
+
+ return newstr;
+}
+
+size_t
+dlsizeof(const char *cstr)
+{
+ size_t size;
+ int i, len, n, dlen;
+ char *d;
+
+ len = strlen(cstr);
+ size = 0;
+ for (i=0; i<len; i++) {
+ n = 1;
+ if (isdigit(cstr[i+1])) {
+ dlen = 1;
+ while (isdigit(cstr[i+dlen])) { dlen ++; };
+ dlen --;
+ d = ALLOCA_N(char, dlen + 1);
+ strncpy(d, cstr + i + 1, dlen);
+ d[dlen] = '\0';
+ n = atoi(d);
+ }
+ else{
+ dlen = 0;
+ }
+
+ switch (cstr[i]) {
+ case 'I':
+ DLALIGN(0,size,INT_ALIGN);
+ case 'i':
+ size += sizeof(int) * n;
+ break;
+ case 'L':
+ DLALIGN(0,size,LONG_ALIGN);
+ case 'l':
+ size += sizeof(long) * n;
+ break;
+ case 'F':
+ DLALIGN(0,size,FLOAT_ALIGN);
+ case 'f':
+ size += sizeof(float) * n;
+ break;
+ case 'D':
+ DLALIGN(0,size,DOUBLE_ALIGN);
+ case 'd':
+ size += sizeof(double) * n;
+ break;
+ case 'C':
+ case 'c':
+ size += sizeof(char) * n;
+ break;
+ case 'H':
+ DLALIGN(0,size,SHORT_ALIGN);
+ case 'h':
+ size += sizeof(short) * n;
+ break;
+ case 'P':
+ case 'S':
+ DLALIGN(0,size,VOIDP_ALIGN);
+ case 'p':
+ case 's':
+ size += sizeof(void*) * n;
+ break;
+ default:
+ rb_raise(rb_eDLTypeError, "unexpected type '%c'", cstr[i]);
+ break;
+ }
+ i += dlen;
+ }
+
+ return size;
+}
+
+static float *
+c_farray(VALUE v, long *size)
+{
+ int i, len;
+ float *ary;
+ VALUE e;
+
+ len = RARRAY(v)->len;
+ *size = sizeof(float) * len;
+ ary = dlmalloc(*size);
+ for (i=0; i < len; i++) {
+ e = rb_ary_entry(v, i);
+ switch (TYPE(e)) {
+ case T_FLOAT:
+ ary[i] = (float)(RFLOAT(e)->value);
+ break;
+ case T_NIL:
+ ary[i] = 0.0;
+ break;
+ default:
+ rb_raise(rb_eDLTypeError, "unexpected type of the element #%d", i);
+ break;
+ }
+ }
+
+ return ary;
+}
+
+static double *
+c_darray(VALUE v, long *size)
+{
+ int i, len;
+ double *ary;
+ VALUE e;
+
+ len = RARRAY(v)->len;
+ *size = sizeof(double) * len;
+ ary = dlmalloc(*size);
+ for (i=0; i < len; i++) {
+ e = rb_ary_entry(v, i);
+ switch (TYPE(e)) {
+ case T_FLOAT:
+ ary[i] = (double)(RFLOAT(e)->value);
+ break;
+ case T_NIL:
+ ary[i] = 0.0;
+ break;
+ default:
+ rb_raise(rb_eDLTypeError, "unexpected type of the element #%d", i);
+ break;
+ }
+ }
+
+ return ary;
+}
+
+static long *
+c_larray(VALUE v, long *size)
+{
+ int i, len;
+ long *ary;
+ VALUE e;
+
+ len = RARRAY(v)->len;
+ *size = sizeof(long) * len;
+ ary = dlmalloc(*size);
+ for (i=0; i < len; i++) {
+ e = rb_ary_entry(v, i);
+ switch (TYPE(e)) {
+ case T_FIXNUM:
+ case T_BIGNUM:
+ ary[i] = (long)(NUM2INT(e));
+ break;
+ case T_NIL:
+ ary[i] = 0;
+ break;
+ default:
+ rb_raise(rb_eDLTypeError, "unexpected type of the element #%d", i);
+ break;
+ }
+ }
+
+ return ary;
+}
+
+static int *
+c_iarray(VALUE v, long *size)
+{
+ int i, len;
+ int *ary;
+ VALUE e;
+
+ len = RARRAY(v)->len;
+ *size = sizeof(int) * len;
+ ary = dlmalloc(*size);
+ for (i=0; i < len; i++) {
+ e = rb_ary_entry(v, i);
+ switch (TYPE(e)) {
+ case T_FIXNUM:
+ case T_BIGNUM:
+ ary[i] = (int)(NUM2INT(e));
+ break;
+ case T_NIL:
+ ary[i] = 0;
+ break;
+ default:
+ rb_raise(rb_eDLTypeError, "unexpected type of the element #%d", i);
+ break;
+ }
+ }
+
+ return ary;
+}
+
+static short *
+c_harray(VALUE v, long *size)
+{
+ int i, len;
+ short *ary;
+ VALUE e;
+
+ len = RARRAY(v)->len;
+ *size = sizeof(short) * len;
+ ary = dlmalloc(*size);
+ for (i=0; i < len; i++) {
+ e = rb_ary_entry(v, i);
+ switch (TYPE(e)) {
+ case T_FIXNUM:
+ case T_BIGNUM:
+ ary[i] = (short)(NUM2INT(e));
+ break;
+ case T_NIL:
+ ary[i] = 0;
+ break;
+ default:
+ rb_raise(rb_eDLTypeError, "unexpected type of the element #%d", i);
+ break;
+ }
+ }
+
+ return ary;
+}
+
+static char *
+c_carray(VALUE v, long *size)
+{
+ int i, len;
+ char *ary;
+ VALUE e;
+
+ len = RARRAY(v)->len;
+ *size = sizeof(char) * len;
+ ary = dlmalloc(*size);
+ for (i=0; i < len; i++) {
+ e = rb_ary_entry(v, i);
+ switch (TYPE(e)) {
+ case T_FIXNUM:
+ case T_BIGNUM:
+ ary[i] = (char)(NUM2INT(e));
+ break;
+ case T_NIL:
+ ary[i] = 0;
+ break;
+ default:
+ rb_raise(rb_eDLTypeError, "unexpected type of the element #%d", i);
+ break;
+ }
+ }
+
+ return ary;
+}
+
+static void *
+c_parray(VALUE v, long *size)
+{
+ int i, len;
+ void **ary;
+ VALUE e, tmp;
+
+ len = RARRAY(v)->len;
+ *size = sizeof(void*) * len;
+ ary = dlmalloc(*size);
+ for (i=0; i < len; i++) {
+ e = rb_ary_entry(v, i);
+ switch (TYPE(e)) {
+ default:
+ tmp = rb_check_string_type(e);
+ if (NIL_P(tmp)) {
+ rb_raise(rb_eDLTypeError, "unexpected type of the element #%d", i);
+ }
+ e = tmp;
+ /* fall through */
+ case T_STRING:
+ rb_check_safe_str(e);
+ {
+ char *str, *src;
+ src = RSTRING(e)->ptr;
+ str = dlstrdup(src);
+ ary[i] = (void*)str;
+ }
+ break;
+ case T_NIL:
+ ary[i] = NULL;
+ break;
+ case T_DATA:
+ if (rb_obj_is_kind_of(e, rb_cDLPtrData)) {
+ struct ptr_data *pdata;
+ Data_Get_Struct(e, struct ptr_data, pdata);
+ ary[i] = (void*)(pdata->ptr);
+ }
+ else{
+ e = rb_funcall(e, rb_intern("to_ptr"), 0);
+ if (rb_obj_is_kind_of(e, rb_cDLPtrData)) {
+ struct ptr_data *pdata;
+ Data_Get_Struct(e, struct ptr_data, pdata);
+ ary[i] = (void*)(pdata->ptr);
+ }
+ else{
+ rb_raise(rb_eDLTypeError, "unexpected type of the element #%d", i);
+ }
+ }
+ break;
+ }
+ }
+
+ return ary;
+}
+
+void *
+rb_ary2cary(char t, VALUE v, long *size)
+{
+ int len;
+ VALUE val0;
+
+ val0 = rb_check_array_type(v);
+ if(NIL_P(val0)) {
+ rb_raise(rb_eDLTypeError, "an array is expected.");
+ }
+ v = val0;
+
+ len = RARRAY(v)->len;
+ if (len == 0) {
+ return NULL;
+ }
+
+ if (!size) {
+ size = ALLOCA_N(long,1);
+ }
+
+ val0 = rb_ary_entry(v,0);
+ switch (TYPE(val0)) {
+ case T_FIXNUM:
+ case T_BIGNUM:
+ switch (t) {
+ case 'C': case 'c':
+ return (void*)c_carray(v,size);
+ case 'H': case 'h':
+ return (void*)c_harray(v,size);
+ case 'I': case 'i':
+ return (void*)c_iarray(v,size);
+ case 'L': case 'l': case 0:
+ return (void*)c_larray(v,size);
+ default:
+ rb_raise(rb_eDLTypeError, "type mismatch");
+ }
+ case T_STRING:
+ return (void*)c_parray(v,size);
+ case T_FLOAT:
+ switch (t) {
+ case 'F': case 'f':
+ return (void*)c_farray(v,size);
+ case 'D': case 'd': case 0:
+ return (void*)c_darray(v,size);
+ }
+ rb_raise(rb_eDLTypeError, "type mismatch");
+ case T_DATA:
+ if (rb_obj_is_kind_of(val0, rb_cDLPtrData)) {
+ return (void*)c_parray(v,size);
+ }
+ else{
+ val0 = rb_funcall(val0, rb_intern("to_ptr"), 0);
+ if (rb_obj_is_kind_of(val0, rb_cDLPtrData)) {
+ return (void*)c_parray(v,size);
+ }
+ }
+ rb_raise(rb_eDLTypeError, "type mismatch");
+ case T_NIL:
+ return (void*)c_parray(v, size);
+ default:
+ rb_raise(rb_eDLTypeError, "unsupported type");
+ }
}
VALUE
-rb_dl_realloc(VALUE self, VALUE addr, VALUE size)
+rb_str_to_ptr(VALUE self)
{
- void *ptr = NUM2PTR(addr);
+ char *ptr;
+ int len;
- rb_secure(4);
- ptr = (void*)ruby_xrealloc(ptr, NUM2INT(size));
- return PTR2NUM(ptr);
+ len = RSTRING(self)->len;
+ ptr = (char*)dlmalloc(len + 1);
+ memcpy(ptr, RSTRING(self)->ptr, len);
+ ptr[len] = '\0';
+ return rb_dlptr_new((void*)ptr,len,dlfree);
}
VALUE
-rb_dl_free(VALUE self, VALUE addr)
+rb_ary_to_ptr(int argc, VALUE argv[], VALUE self)
{
- void *ptr = NUM2PTR(addr);
+ void *ptr;
+ VALUE t;
+ long size;
- rb_secure(4);
- ruby_xfree(ptr);
- return Qnil;
+ switch (rb_scan_args(argc, argv, "01", &t)) {
+ case 1:
+ ptr = rb_ary2cary(StringValuePtr(t)[0], self, &size);
+ break;
+ case 0:
+ ptr = rb_ary2cary(0, self, &size);
+ break;
+ }
+ return ptr ? rb_dlptr_new(ptr, size, dlfree) : Qnil;
}
VALUE
-rb_dl_ptr2value(VALUE self, VALUE addr)
+rb_io_to_ptr(VALUE self)
{
- rb_secure(4);
- return (VALUE)NUM2PTR(addr);
+ rb_io_t *fptr;
+ FILE *fp;
+
+ GetOpenFile(self, fptr);
+ fp = fptr->f;
+
+ return fp ? rb_dlptr_new(fp, 0, 0) : Qnil;
}
VALUE
-rb_dl_value2ptr(VALUE self, VALUE val)
+rb_dl_dlopen(int argc, VALUE argv[], VALUE self)
{
- return PTR2NUM((void*)val);
+ rb_secure(4);
+ return rb_class_new_instance(argc, argv, rb_cDLHandle);
}
-static void
-rb_dl_init_callbacks(VALUE dl)
+VALUE
+rb_dl_malloc(VALUE self, VALUE size)
{
- static const char cb[] = "dl/callback.so";
+ rb_secure(4);
+ return rb_dlptr_malloc(DLNUM2LONG(size), dlfree);
+}
- rb_autoload(dl, rb_intern_const("CdeclCallbackAddrs"), cb);
- rb_autoload(dl, rb_intern_const("CdeclCallbackProcs"), cb);
-#ifdef FUNC_STDCALL
- rb_autoload(dl, rb_intern_const("StdcallCallbackAddrs"), cb);
- rb_autoload(dl, rb_intern_const("StdcallCallbackProcs"), cb);
-#endif
+VALUE
+rb_dl_strdup(VALUE self, VALUE str)
+{
+ SafeStringValue(str);
+ return rb_dlptr_new(strdup(RSTRING(str)->ptr), RSTRING(str)->len, dlfree);
+}
+
+static VALUE
+rb_dl_sizeof(VALUE self, VALUE str)
+{
+ return INT2NUM(dlsizeof(StringValuePtr(str)));
+}
+
+static VALUE
+rb_dl_callback(int argc, VALUE argv[], VALUE self)
+{
+ VALUE type, proc;
+ int rettype, entry, i;
+ char fname[127];
+
+ rb_secure(4);
+ proc = Qnil;
+ switch (rb_scan_args(argc, argv, "11", &type, &proc)) {
+ case 1:
+ if (rb_block_given_p()) {
+ proc = rb_block_proc();
+ }
+ else{
+ proc = Qnil;
+ }
+ default:
+ break;
+ }
+
+ StringValue(type);
+ switch (RSTRING(type)->ptr[0]) {
+ case '0':
+ rettype = 0x00;
+ break;
+ case 'C':
+ rettype = 0x01;
+ break;
+ case 'H':
+ rettype = 0x02;
+ break;
+ case 'I':
+ rettype = 0x03;
+ break;
+ case 'L':
+ rettype = 0x04;
+ break;
+ case 'F':
+ rettype = 0x05;
+ break;
+ case 'D':
+ rettype = 0x06;
+ break;
+ case 'P':
+ rettype = 0x07;
+ break;
+ default:
+ rb_raise(rb_eDLTypeError, "unsupported type `%c'", RSTRING(type)->ptr[0]);
+ }
+
+ entry = -1;
+ for (i=0; i < MAX_CALLBACK; i++) {
+ if (rb_hash_aref(DLFuncTable, rb_assoc_new(INT2NUM(rettype), INT2NUM(i))) == Qnil) {
+ entry = i;
+ break;
+ }
+ }
+ if (entry < 0) {
+ rb_raise(rb_eDLError, "too many callbacks are defined.");
+ }
+
+ rb_hash_aset(DLFuncTable,
+ rb_assoc_new(INT2NUM(rettype),INT2NUM(entry)),
+ rb_assoc_new(type,proc));
+ sprintf(fname, "rb_dl_callback_func_%d_%d", rettype, entry);
+ return rb_dlsym_new((void (*)())rb_dl_callback_table[rettype][entry],
+ fname, RSTRING(type)->ptr);
+}
+
+static VALUE
+rb_dl_remove_callback(VALUE mod, VALUE sym)
+{
+ freefunc_t f;
+ int i, j;
+
+ rb_secure(4);
+ f = rb_dlsym2csym(sym);
+ for (i=0; i < CALLBACK_TYPES; i++) {
+ for (j=0; j < MAX_CALLBACK; j++) {
+ if (rb_dl_callback_table[i][j] == f) {
+ rb_hash_aset(DLFuncTable, rb_assoc_new(INT2NUM(i),INT2NUM(j)),Qnil);
+ break;
+ }
+ }
+ }
+ return Qnil;
}
void
-Init_dl(void)
-{
- void Init_dlhandle(void);
- void Init_dlcfunc(void);
- void Init_dlptr(void);
-
- rbdl_id_cdecl = rb_intern_const("cdecl");
- rbdl_id_stdcall = rb_intern_const("stdcall");
-
- rb_mDL = rb_define_module("DL");
- rb_eDLError = rb_define_class_under(rb_mDL, "DLError", rb_eStandardError);
- rb_eDLTypeError = rb_define_class_under(rb_mDL, "DLTypeError", rb_eDLError);
-
- rb_define_const(rb_mDL, "MAX_CALLBACK", INT2NUM(MAX_CALLBACK));
- rb_define_const(rb_mDL, "DLSTACK_SIZE", INT2NUM(DLSTACK_SIZE));
-
- rb_dl_init_callbacks(rb_mDL);
-
- rb_define_const(rb_mDL, "RTLD_GLOBAL", INT2NUM(RTLD_GLOBAL));
- rb_define_const(rb_mDL, "RTLD_LAZY", INT2NUM(RTLD_LAZY));
- rb_define_const(rb_mDL, "RTLD_NOW", INT2NUM(RTLD_NOW));
-
- rb_define_const(rb_mDL, "TYPE_VOID", INT2NUM(DLTYPE_VOID));
- rb_define_const(rb_mDL, "TYPE_VOIDP", INT2NUM(DLTYPE_VOIDP));
- rb_define_const(rb_mDL, "TYPE_CHAR", INT2NUM(DLTYPE_CHAR));
- rb_define_const(rb_mDL, "TYPE_SHORT", INT2NUM(DLTYPE_SHORT));
- rb_define_const(rb_mDL, "TYPE_INT", INT2NUM(DLTYPE_INT));
- rb_define_const(rb_mDL, "TYPE_LONG", INT2NUM(DLTYPE_LONG));
-#if HAVE_LONG_LONG
- rb_define_const(rb_mDL, "TYPE_LONG_LONG", INT2NUM(DLTYPE_LONG_LONG));
-#endif
- rb_define_const(rb_mDL, "TYPE_FLOAT", INT2NUM(DLTYPE_FLOAT));
- rb_define_const(rb_mDL, "TYPE_DOUBLE", INT2NUM(DLTYPE_DOUBLE));
-
- rb_define_const(rb_mDL, "ALIGN_VOIDP", INT2NUM(ALIGN_VOIDP));
- rb_define_const(rb_mDL, "ALIGN_CHAR", INT2NUM(ALIGN_CHAR));
- rb_define_const(rb_mDL, "ALIGN_SHORT", INT2NUM(ALIGN_SHORT));
- rb_define_const(rb_mDL, "ALIGN_INT", INT2NUM(ALIGN_INT));
- rb_define_const(rb_mDL, "ALIGN_LONG", INT2NUM(ALIGN_LONG));
-#if HAVE_LONG_LONG
- rb_define_const(rb_mDL, "ALIGN_LONG_LONG", INT2NUM(ALIGN_LONG_LONG));
-#endif
- rb_define_const(rb_mDL, "ALIGN_FLOAT", INT2NUM(ALIGN_FLOAT));
- rb_define_const(rb_mDL, "ALIGN_DOUBLE",INT2NUM(ALIGN_DOUBLE));
-
- rb_define_const(rb_mDL, "SIZEOF_VOIDP", INT2NUM(sizeof(void*)));
- rb_define_const(rb_mDL, "SIZEOF_CHAR", INT2NUM(sizeof(char)));
- rb_define_const(rb_mDL, "SIZEOF_SHORT", INT2NUM(sizeof(short)));
- rb_define_const(rb_mDL, "SIZEOF_INT", INT2NUM(sizeof(int)));
- rb_define_const(rb_mDL, "SIZEOF_LONG", INT2NUM(sizeof(long)));
-#if HAVE_LONG_LONG
- rb_define_const(rb_mDL, "SIZEOF_LONG_LONG", INT2NUM(sizeof(LONG_LONG)));
-#endif
- rb_define_const(rb_mDL, "SIZEOF_FLOAT", INT2NUM(sizeof(float)));
- rb_define_const(rb_mDL, "SIZEOF_DOUBLE",INT2NUM(sizeof(double)));
-
- rb_define_module_function(rb_mDL, "dlwrap", rb_dl_value2ptr, 1);
- rb_define_module_function(rb_mDL, "dlunwrap", rb_dl_ptr2value, 1);
-
- rb_define_module_function(rb_mDL, "dlopen", rb_dl_dlopen, -1);
- rb_define_module_function(rb_mDL, "malloc", rb_dl_malloc, 1);
- rb_define_module_function(rb_mDL, "realloc", rb_dl_realloc, 2);
- rb_define_module_function(rb_mDL, "free", rb_dl_free, 1);
-
- rb_define_const(rb_mDL, "RUBY_FREE", PTR2NUM(ruby_xfree));
- rb_define_const(rb_mDL, "BUILD_RUBY_PLATFORM", rb_str_new2(RUBY_PLATFORM));
- rb_define_const(rb_mDL, "BUILD_RUBY_VERSION", rb_str_new2(RUBY_VERSION));
-
- Init_dlhandle();
- Init_dlcfunc();
- Init_dlptr();
+Init_dl()
+{
+ void Init_dlptr();
+ void Init_dlsym();
+ void Init_dlhandle();
+
+ id_call = rb_intern("call");
+
+ rb_mDL = rb_define_module("DL");
+
+ rb_eDLError = rb_define_class_under(rb_mDL, "DLError", rb_eStandardError);
+ rb_eDLTypeError = rb_define_class_under(rb_mDL, "DLTypeError", rb_eDLError);
+
+ DLFuncTable = rb_hash_new();
+ init_dl_func_table();
+ rb_define_const(rb_mDL, "FuncTable", DLFuncTable);
+
+ rb_define_const(rb_mDL, "RTLD_GLOBAL", INT2NUM(RTLD_GLOBAL));
+ rb_define_const(rb_mDL, "RTLD_LAZY", INT2NUM(RTLD_LAZY));
+ rb_define_const(rb_mDL, "RTLD_NOW", INT2NUM(RTLD_NOW));
+
+ rb_define_const(rb_mDL, "ALIGN_INT", INT2NUM(ALIGN_INT));
+ rb_define_const(rb_mDL, "ALIGN_LONG", INT2NUM(ALIGN_LONG));
+ rb_define_const(rb_mDL, "ALIGN_FLOAT", INT2NUM(ALIGN_FLOAT));
+ rb_define_const(rb_mDL, "ALIGN_SHORT", INT2NUM(ALIGN_SHORT));
+ rb_define_const(rb_mDL, "ALIGN_DOUBLE",INT2NUM(ALIGN_DOUBLE));
+ rb_define_const(rb_mDL, "ALIGN_VOIDP", INT2NUM(ALIGN_VOIDP));
+
+ rb_define_const(rb_mDL, "MAX_ARG", INT2NUM(MAX_ARG));
+ rb_define_const(rb_mDL, "DLSTACK", rb_tainted_str_new2(DLSTACK_METHOD));
+
+ rb_define_module_function(rb_mDL, "dlopen", rb_dl_dlopen, -1);
+ rb_define_module_function(rb_mDL, "callback", rb_dl_callback, -1);
+ rb_define_module_function(rb_mDL, "define_callback", rb_dl_callback, -1);
+ rb_define_module_function(rb_mDL, "remove_callback", rb_dl_remove_callback, 1);
+ rb_define_module_function(rb_mDL, "malloc", rb_dl_malloc, 1);
+ rb_define_module_function(rb_mDL, "strdup", rb_dl_strdup, 1);
+ rb_define_module_function(rb_mDL, "sizeof", rb_dl_sizeof, 1);
+
+ Init_dlptr();
+ Init_dlsym();
+ Init_dlhandle();
+
+ rb_define_const(rb_mDL, "FREE", rb_dlsym_new(dlfree, "free", "0P"));
+
+ rb_define_method(rb_cString, "to_ptr", rb_str_to_ptr, 0);
+ rb_define_method(rb_cArray, "to_ptr", rb_ary_to_ptr, -1);
+ rb_define_method(rb_cIO, "to_ptr", rb_io_to_ptr, 0);
}
diff --git a/ext/dl/dl.def b/ext/dl/dl.def
new file mode 100644
index 0000000000..cdab4af90d
--- /dev/null
+++ b/ext/dl/dl.def
@@ -0,0 +1,59 @@
+EXPORTS
+Init_dl
+dlfree
+dlmalloc
+dlrealloc
+dlstrdup
+rb_ary_to_ptr
+rb_dl_dlopen
+rb_dl_malloc
+rb_dl_strdup
+rb_eDLError
+rb_eDLTypeError
+rb_io_to_ptr
+rb_mDL
+rb_str_to_ptr
+Init_dlhandle
+rb_cDLHandle
+rb_dlhandle_close
+rb_dlhandle_disable_close
+rb_dlhandle_enable_close
+rb_dlhandle_sym
+Init_dlptr
+rb_cDLPtrData
+rb_dlmem_each
+rb_dlptr2cptr
+rb_dlptr_malloc
+rb_dlptr_aref
+rb_dlptr_aset
+rb_dlptr_cmp
+rb_dlptr_define_data_type
+rb_dlptr_define_struct
+rb_dlptr_define_union
+rb_dlptr_eql
+rb_dlptr_free_get
+rb_dlptr_free_set
+rb_dlptr_get_data_type
+rb_dlptr_inspect
+rb_dlptr_minus
+rb_dlptr_new
+rb_dlptr_new2
+rb_dlptr_null_p
+rb_dlptr_plus
+rb_dlptr_ptr
+rb_dlptr_ref
+rb_dlptr_to_array
+rb_dlptr_to_i
+rb_dlptr_to_s
+rb_dlptr_to_str
+rb_mDLMemorySpace
+Init_dlsym
+rb_cDLSymbol
+rb_dlsym2csym
+rb_dlsym_call
+rb_dlsym_cproto
+rb_dlsym_inspect
+rb_dlsym_name
+rb_dlsym_new
+rb_dlsym_proto
+rb_dlsym_to_ptr
diff --git a/ext/dl/dl.h b/ext/dl/dl.h
index d06cad4e6b..1faa316cf1 100644
--- a/ext/dl/dl.h
+++ b/ext/dl/dl.h
@@ -1,11 +1,12 @@
+/* -*- C -*-
+ * $Id$
+ */
+
#ifndef RUBY_DL_H
#define RUBY_DL_H
#include <ruby.h>
-
-#if !defined(FUNC_CDECL)
-# define FUNC_CDECL(x) x
-#endif
+#include <dlconfig.h>
#if defined(HAVE_DLFCN_H)
# include <dlfcn.h>
@@ -22,8 +23,9 @@
#else
# if defined(HAVE_WINDOWS_H)
# include <windows.h>
+# define dlclose(ptr) FreeLibrary((HINSTANCE)ptr)
# define dlopen(name,flag) ((void*)LoadLibrary(name))
-# define dlerror() strerror(rb_w32_map_errno(GetLastError()))
+# define dlerror() "unknown error"
# define dlsym(handle,name) ((void*)GetProcAddress(handle,name))
# define RTLD_LAZY -1
# define RTLD_NOW -1
@@ -31,194 +33,281 @@
# endif
#endif
-#define MAX_CALLBACK 5
-#define DLSTACK_TYPE long
-#define DLSTACK_SIZE (20)
-#define DLSTACK_PROTO \
- DLSTACK_TYPE,DLSTACK_TYPE,DLSTACK_TYPE,DLSTACK_TYPE,DLSTACK_TYPE,\
- DLSTACK_TYPE,DLSTACK_TYPE,DLSTACK_TYPE,DLSTACK_TYPE,DLSTACK_TYPE,\
- DLSTACK_TYPE,DLSTACK_TYPE,DLSTACK_TYPE,DLSTACK_TYPE,DLSTACK_TYPE,\
- DLSTACK_TYPE,DLSTACK_TYPE,DLSTACK_TYPE,DLSTACK_TYPE,DLSTACK_TYPE
-#define DLSTACK_ARGS(stack) \
- stack[0],stack[1],stack[2],stack[3],stack[4],\
- stack[5],stack[6],stack[7],stack[8],stack[9],\
- stack[10],stack[11],stack[12],stack[13],stack[14],\
- stack[15],stack[16],stack[17],stack[18],stack[19]
-
-#define DLSTACK_PROTO0_ void
-#define DLSTACK_PROTO1_ DLSTACK_TYPE
-#define DLSTACK_PROTO2_ DLSTACK_PROTO1_, DLSTACK_TYPE
-#define DLSTACK_PROTO3_ DLSTACK_PROTO2_, DLSTACK_TYPE
-#define DLSTACK_PROTO4_ DLSTACK_PROTO3_, DLSTACK_TYPE
-#define DLSTACK_PROTO4_ DLSTACK_PROTO3_, DLSTACK_TYPE
-#define DLSTACK_PROTO5_ DLSTACK_PROTO4_, DLSTACK_TYPE
-#define DLSTACK_PROTO6_ DLSTACK_PROTO5_, DLSTACK_TYPE
-#define DLSTACK_PROTO7_ DLSTACK_PROTO6_, DLSTACK_TYPE
-#define DLSTACK_PROTO8_ DLSTACK_PROTO7_, DLSTACK_TYPE
-#define DLSTACK_PROTO9_ DLSTACK_PROTO8_, DLSTACK_TYPE
-#define DLSTACK_PROTO10_ DLSTACK_PROTO9_, DLSTACK_TYPE
-#define DLSTACK_PROTO11_ DLSTACK_PROTO10_, DLSTACK_TYPE
-#define DLSTACK_PROTO12_ DLSTACK_PROTO11_, DLSTACK_TYPE
-#define DLSTACK_PROTO13_ DLSTACK_PROTO12_, DLSTACK_TYPE
-#define DLSTACK_PROTO14_ DLSTACK_PROTO13_, DLSTACK_TYPE
-#define DLSTACK_PROTO14_ DLSTACK_PROTO13_, DLSTACK_TYPE
-#define DLSTACK_PROTO15_ DLSTACK_PROTO14_, DLSTACK_TYPE
-#define DLSTACK_PROTO16_ DLSTACK_PROTO15_, DLSTACK_TYPE
-#define DLSTACK_PROTO17_ DLSTACK_PROTO16_, DLSTACK_TYPE
-#define DLSTACK_PROTO18_ DLSTACK_PROTO17_, DLSTACK_TYPE
-#define DLSTACK_PROTO19_ DLSTACK_PROTO18_, DLSTACK_TYPE
-#define DLSTACK_PROTO20_ DLSTACK_PROTO19_, DLSTACK_TYPE
+#if !defined(StringValue)
+# define StringValue(v) if(TYPE(v) != T_STRING) v = rb_str_to_str(v)
+#endif
+#if !defined(StringValuePtr)
+# define StringValuePtr(v) RSTRING((TYPE(v) == T_STRING) ? (v) : rb_str_to_str(v))->ptr
+#endif
-/*
- * Add ",..." as the last argument.
- * This is required for variable argument functions such
- * as fprintf() on x86_64-linux.
- *
- * http://refspecs.linuxfoundation.org/elf/x86_64-abi-0.95.pdf
- * page 19:
- *
- * For calls that may call functions that use varargs or stdargs
- * (prototype-less calls or calls to functions containing ellipsis
- * (...) in the declaration) %al is used as hidden argument to
- * specify the number of SSE registers used.
- */
-#define DLSTACK_PROTO0 void
-#define DLSTACK_PROTO1 DLSTACK_PROTO1_, ...
-#define DLSTACK_PROTO2 DLSTACK_PROTO2_, ...
-#define DLSTACK_PROTO3 DLSTACK_PROTO3_, ...
-#define DLSTACK_PROTO4 DLSTACK_PROTO4_, ...
-#define DLSTACK_PROTO4 DLSTACK_PROTO4_, ...
-#define DLSTACK_PROTO5 DLSTACK_PROTO5_, ...
-#define DLSTACK_PROTO6 DLSTACK_PROTO6_, ...
-#define DLSTACK_PROTO7 DLSTACK_PROTO7_, ...
-#define DLSTACK_PROTO8 DLSTACK_PROTO8_, ...
-#define DLSTACK_PROTO9 DLSTACK_PROTO9_, ...
-#define DLSTACK_PROTO10 DLSTACK_PROTO10_, ...
-#define DLSTACK_PROTO11 DLSTACK_PROTO11_, ...
-#define DLSTACK_PROTO12 DLSTACK_PROTO12_, ...
-#define DLSTACK_PROTO13 DLSTACK_PROTO13_, ...
-#define DLSTACK_PROTO14 DLSTACK_PROTO14_, ...
-#define DLSTACK_PROTO14 DLSTACK_PROTO14_, ...
-#define DLSTACK_PROTO15 DLSTACK_PROTO15_, ...
-#define DLSTACK_PROTO16 DLSTACK_PROTO16_, ...
-#define DLSTACK_PROTO17 DLSTACK_PROTO17_, ...
-#define DLSTACK_PROTO18 DLSTACK_PROTO18_, ...
-#define DLSTACK_PROTO19 DLSTACK_PROTO19_, ...
-#define DLSTACK_PROTO20 DLSTACK_PROTO20_, ...
-
-#define DLSTACK_ARGS0(stack)
-#define DLSTACK_ARGS1(stack) stack[0]
-#define DLSTACK_ARGS2(stack) DLSTACK_ARGS1(stack), stack[1]
-#define DLSTACK_ARGS3(stack) DLSTACK_ARGS2(stack), stack[2]
-#define DLSTACK_ARGS4(stack) DLSTACK_ARGS3(stack), stack[3]
-#define DLSTACK_ARGS5(stack) DLSTACK_ARGS4(stack), stack[4]
-#define DLSTACK_ARGS6(stack) DLSTACK_ARGS5(stack), stack[5]
-#define DLSTACK_ARGS7(stack) DLSTACK_ARGS6(stack), stack[6]
-#define DLSTACK_ARGS8(stack) DLSTACK_ARGS7(stack), stack[7]
-#define DLSTACK_ARGS9(stack) DLSTACK_ARGS8(stack), stack[8]
-#define DLSTACK_ARGS10(stack) DLSTACK_ARGS9(stack), stack[9]
-#define DLSTACK_ARGS11(stack) DLSTACK_ARGS10(stack), stack[10]
-#define DLSTACK_ARGS12(stack) DLSTACK_ARGS11(stack), stack[11]
-#define DLSTACK_ARGS13(stack) DLSTACK_ARGS12(stack), stack[12]
-#define DLSTACK_ARGS14(stack) DLSTACK_ARGS13(stack), stack[13]
-#define DLSTACK_ARGS15(stack) DLSTACK_ARGS14(stack), stack[14]
-#define DLSTACK_ARGS16(stack) DLSTACK_ARGS15(stack), stack[15]
-#define DLSTACK_ARGS17(stack) DLSTACK_ARGS16(stack), stack[16]
-#define DLSTACK_ARGS18(stack) DLSTACK_ARGS17(stack), stack[17]
-#define DLSTACK_ARGS19(stack) DLSTACK_ARGS18(stack), stack[18]
-#define DLSTACK_ARGS20(stack) DLSTACK_ARGS19(stack), stack[19]
+#ifdef DEBUG
+#define DEBUG_CODE(b) {printf("DEBUG:%d\n",__LINE__);b;}
+#define DEBUG_CODE2(b1,b2) {printf("DEBUG:%d\n",__LINE__);b1;}
+#else
+#define DEBUG_CODE(b)
+#define DEBUG_CODE2(b1,b2) b2
+#endif
+
+#define VOID_DLTYPE 0x00
+#define CHAR_DLTYPE 0x01
+#define SHORT_DLTYPE 0x02
+#define INT_DLTYPE 0x03
+#define LONG_DLTYPE 0x04
+#define FLOAT_DLTYPE 0x05
+#define DOUBLE_DLTYPE 0x06
+#define VOIDP_DLTYPE 0x07
+
+#define ARG_TYPE(x,i) (((x) & (0x07 << ((i)*3))) >> ((i)*3))
+#define PUSH_ARG(x,t) do{x <<= 3; x |= t;}while(0)
+#define PUSH_0(x) PUSH_ARG(x,VOID_DLTYPE)
+
+#if SIZEOF_INT == SIZEOF_LONG
+# define PUSH_I(x) PUSH_ARG(x,LONG_DLTYPE)
+# define ANY2I(x) x.l
+# define DLINT(x) (long)x
+#else
+# define PUSH_I(x) PUSH_ARG(x,INT_DLTYPE)
+# define ANY2I(x) x.i
+# define DLINT(x) (int)x
+#endif
+#define PUSH_L(x) PUSH_ARG(x,LONG_DLTYPE)
+#define ANY2L(x) x.l
+#define DLLONG(x) (long)x
+
+#if defined(WITH_TYPE_FLOAT)
+# if SIZEOF_FLOAT == SIZEOF_DOUBLE
+# define PUSH_F(x) PUSH_ARG(x,DOUBLE_DLTYPE)
+# define ANY2F(x) (x.d)
+# define DLFLOAT(x) ((double)x)
+# else
+# define PUSH_F(x) PUSH_ARG(x,FLOAT_DLTYPE)
+# define ANY2F(x) (x.f)
+# define DLFLOAT(x) ((float)x)
+# endif
+#else
+# define PUSH_F(x) PUSH_ARG(x,DOUBLE_DLTYPE)
+# define ANY2F(x) (x.d)
+# define DLFLOAT(x) ((double)x)
+#endif
+#define PUSH_D(x) PUSH_ARG(x,DOUBLE_DLTYPE)
+#define ANY2D(x) (x.d)
+#define DLDOUBLE(x) ((double)x)
+
+#if SIZEOF_INT == SIZEOF_VOIDP && SIZEOF_INT != SIZEOF_LONG
+# define PUSH_P(x) PUSH_ARG(x,INT_DLTYPE)
+# define ANY2P(x) (x.i)
+# define DLVOIDP(x) ((int)x)
+#elif SIZEOF_LONG == SIZEOF_VOIDP
+# define PUSH_P(x) PUSH_ARG(x,LONG_DLTYPE)
+# define ANY2P(x) (x.l)
+# define DLVOIDP(x) ((long)x)
+#else
+# define PUSH_P(x) PUSH_ARG(x,VOIDP_DLTYPE)
+# define ANY2P(x) (x.p)
+# define DLVOIDP(x) ((void*)p)
+#endif
+
+#if defined(WITH_TYPE_CHAR)
+# define PUSH_C(x) PUSH_ARG(x,CHAR_DLTYPE)
+# define ANY2C(x) (x.c)
+# define DLCHAR(x) ((char)x)
+#else
+# define PUSH_C(x) PUSH_I(x)
+# define ANY2C(x) ANY2I(x)
+# define DLCHAR(x) DLINT(x)
+#endif
+
+#if defined(WITH_TYPE_SHORT)
+# define PUSH_H(x) PUSH_ARG(x,SHORT_DLTYPE)
+# define ANY2H(x) (x.h)
+# define DLSHORT(x) ((short)x)
+#else
+# define PUSH_H(x) PUSH_I(x)
+# define ANY2H(x) ANY2I(x)
+# define DLSHORT(x) DLINT(x)
+#endif
+
+#define PUSH_S(x) PUSH_P(x)
+#define ANY2S(x) ANY2P(x)
+#define DLSTR(x) DLVOIDP(x)
+
+#define CBPUSH_0(x) PUSH_0(x)
+#define CBPUSH_C(x) PUSH_C(x)
+#define CBPUSH_H(x) PUSH_H(x)
+#define CBPUSH_I(x) PUSH_I(x)
+#define CBPUSH_L(x) PUSH_L(x)
+#define CBPUSH_F(x) PUSH_F(x)
+#define CBPUSH_D(x) PUSH_D(x)
+#if defined(WITH_CBTYPE_VOIDP)
+# define CBPUSH_P(x) PUSH_ARG(x,VOIDP_DLTYPE)
+#else
+# define CBPUSH_P(x) PUSH_P(x)
+#endif
+
+
+#if defined(USE_INLINE_ASM)
+# if defined(__i386__) && defined(__GNUC__)
+# define DLSTACK
+# define DLSTACK_METHOD "asm"
+# define DLSTACK_REVERSE
+# define DLSTACK_PROTO
+# define DLSTACK_ARGS
+# define DLSTACK_START(sym)
+# define DLSTACK_END(sym)
+# define DLSTACK_PUSH_C(x) asm volatile ("pushl %0" :: "g" (x));
+# define DLSTACK_PUSH_H(x) asm volatile ("pushl %0" :: "g" (x));
+# define DLSTACK_PUSH_I(x) asm volatile ("pushl %0" :: "g" (x));
+# define DLSTACK_PUSH_L(x) asm volatile ("pushl %0" :: "g" (x));
+# define DLSTACK_PUSH_P(x) asm volatile ("pushl %0" :: "g" (x));
+# define DLSTACK_PUSH_F(x) asm volatile ("flds %0"::"g"(x));\
+ asm volatile ("subl $4,%esp");\
+ asm volatile ("fstps (%esp)");
+# define DLSTACK_PUSH_D(x) asm volatile ("fldl %0"::"g"(x));\
+ asm volatile ("subl $8,%esp");\
+ asm volatile ("fstpl (%esp)")
+# else
+# error --with-asm is not supported on this machine
+# endif
+#elif defined(USE_DLSTACK)
+# define DLSTACK
+# define DLSTACK_GUARD
+# define DLSTACK_METHOD "dl"
+# define DLSTACK_PROTO long,long,long,long,long,\
+ long,long,long,long,long,\
+ long,long,long,long,long
+# define DLSTACK_ARGS stack[0],stack[1],stack[2],stack[3],stack[4],\
+ stack[5],stack[6],stack[7],stack[8],stack[9],\
+ stack[10],stack[11],stack[12],stack[13],stack[14]
+# define DLSTACK_SIZE (sizeof(long)*15)
+# define DLSTACK_START(sym)
+# define DLSTACK_END(sym)
+# define DLSTACK_PUSH_C(x) {long v=(long)x; memcpy(sp,&v,sizeof(long)); sp++;}
+# define DLSTACK_PUSH_H(x) {long v=(long)x; memcpy(sp,&v,sizeof(long)); sp++;}
+# define DLSTACK_PUSH_I(x) {long v=(long)x; memcpy(sp,&v,sizeof(long)); sp++;}
+# define DLSTACK_PUSH_L(x) memcpy(sp,&x,sizeof(long)); sp++;
+# define DLSTACK_PUSH_P(x) memcpy(sp,&x,sizeof(void*)); sp++;
+# define DLSTACK_PUSH_F(x) memcpy(sp,&x,sizeof(float)); sp+=sizeof(float)/sizeof(long);
+# define DLSTACK_PUSH_D(x) memcpy(sp,&x,sizeof(double)); sp+=sizeof(double)/sizeof(long);
+#else
+# define DLSTACK_METHOD "none"
+#endif
extern VALUE rb_mDL;
+extern VALUE rb_mDLMemorySpace;
extern VALUE rb_cDLHandle;
extern VALUE rb_cDLSymbol;
+extern VALUE rb_cDLPtrData;
+extern VALUE rb_cDLStructData;
+
extern VALUE rb_eDLError;
extern VALUE rb_eDLTypeError;
+#if defined(LONG2NUM) && (SIZEOF_LONG == SIZEOF_VOIDP)
+# define DLLONG2NUM(x) LONG2NUM((long)x)
+# define DLNUM2LONG(x) (long)(NUM2LONG(x))
+#else
+# define DLLONG2NUM(x) INT2NUM((long)x)
+# define DLNUM2LONG(x) (long)(NUM2INT(x))
+#endif
+
typedef struct { char c; void *x; } s_voidp;
typedef struct { char c; short x; } s_short;
typedef struct { char c; int x; } s_int;
typedef struct { char c; long x; } s_long;
typedef struct { char c; float x; } s_float;
typedef struct { char c; double x; } s_double;
-#if HAVE_LONG_LONG
-typedef struct { char c; LONG_LONG x; } s_long_long;
-#endif
#define ALIGN_VOIDP (sizeof(s_voidp) - sizeof(void *))
#define ALIGN_SHORT (sizeof(s_short) - sizeof(short))
-#define ALIGN_CHAR (1)
#define ALIGN_INT (sizeof(s_int) - sizeof(int))
#define ALIGN_LONG (sizeof(s_long) - sizeof(long))
-#if HAVE_LONG_LONG
-#define ALIGN_LONG_LONG (sizeof(s_long_long) - sizeof(LONG_LONG))
-#endif
#define ALIGN_FLOAT (sizeof(s_float) - sizeof(float))
#define ALIGN_DOUBLE (sizeof(s_double) - sizeof(double))
+/* for compatibility */
+#define VOIDP_ALIGN ALIGN_VOIDP
+#define SHORT_ALIGN ALIGN_SHORT
+#define INT_ALIGN ALIGN_INT
+#define LONG_ALIGN ALIGN_LONG
+#define FLOAT_ALIGN ALIGN_FLOAT
+#define DOUBLE_ALIGN ALIGN_DOUBLE
+
#define DLALIGN(ptr,offset,align) {\
while( (((unsigned long)((char *)ptr + offset)) % align) != 0 ) offset++;\
}
+typedef void (*freefunc_t)(void *);
+#define DLFREEFUNC(func) ((freefunc_t)(func))
-#define DLTYPE_VOID 0
-#define DLTYPE_VOIDP 1
-#define DLTYPE_CHAR 2
-#define DLTYPE_SHORT 3
-#define DLTYPE_INT 4
-#define DLTYPE_LONG 5
-#if HAVE_LONG_LONG
-#define DLTYPE_LONG_LONG 6
-#endif
-#define DLTYPE_FLOAT 7
-#define DLTYPE_DOUBLE 8
-#define MAX_DLTYPE 9
-
-#if SIZEOF_VOIDP == SIZEOF_LONG
-# define PTR2NUM(x) (ULONG2NUM((unsigned long)(x)))
-# define NUM2PTR(x) ((void*)(NUM2ULONG(x)))
-#else
-/* # error --->> Ruby/DL2 requires sizeof(void*) == sizeof(long) to be compiled. <<--- */
-# define PTR2NUM(x) (ULL2NUM((unsigned long long)(x)))
-# define NUM2PTR(x) ((void*)(NUM2ULL(x)))
-#endif
-
-#define BOOL2INT(x) ((x == Qtrue)?1:0)
-#define INT2BOOL(x) (x?Qtrue:Qfalse)
-
-typedef void (*freefunc_t)(void*);
+typedef union {
+ void* p;
+ char c;
+ short h;
+ int i;
+ long l;
+ float f;
+ double d;
+ char *s;
+} ANY_TYPE;
struct dl_handle {
- void *ptr;
- int open;
- int enable_close;
+ void *ptr;
+ int open;
+ int enable_close;
};
+struct sym_data {
+ void *func;
+ char *name;
+ char *type;
+ int len;
+};
-struct cfunc_data {
- void *ptr;
- char *name;
- int type;
- ID calltype;
+enum DLPTR_CTYPE {
+ DLPTR_CTYPE_UNKNOWN,
+ DLPTR_CTYPE_STRUCT,
+ DLPTR_CTYPE_UNION
};
-extern ID rbdl_id_cdecl;
-extern ID rbdl_id_stdcall;
-#define CFUNC_CDECL (rbdl_id_cdecl)
-#define CFUNC_STDCALL (rbdl_id_stdcall)
struct ptr_data {
- void *ptr;
- long size;
- freefunc_t free;
+ void *ptr; /* a pointer to the data */
+ freefunc_t free; /* free() */
+ char *stype; /* array of type specifiers */
+ int *ssize; /* size[i] = sizeof(type[i]) > 0 */
+ int slen; /* the number of type specifiers */
+ ID *ids;
+ int ids_num;
+ int ctype; /* DLPTR_CTYPE_UNKNOWN, DLPTR_CTYPE_STRUCT, DLPTR_CTYPE_UNION */
+ long size;
};
-#define RDL_HANDLE(obj) ((struct dl_handle *)(DATA_PTR(obj)))
-#define RCFUNC_DATA(obj) ((struct cfunc_data *)(DATA_PTR(obj)))
-#define RPTR_DATA(obj) ((struct ptr_data *)(DATA_PTR(obj)))
+#define RDLPTR(obj) ((struct ptr_data *)(DATA_PTR(obj)))
+#define RDLSYM(obj) ((struct sym_data *)(DATA_PTR(obj)))
+
+void dlfree(void*);
+void *dlmalloc(size_t);
+void *dlrealloc(void*,size_t);
+char *dlstrdup(const char *);
+size_t dlsizeof(const char *);
+
+void *rb_ary2cary(char t, VALUE ary, long *size);
+
+/*
+void rb_dlmem_delete(void *ptr);
+void rb_dlmem_aset(void *ptr, VALUE obj);
+VALUE rb_dlmem_aref(void *ptr);
+*/
+
+void dlptr_free(struct ptr_data *data);
+void dlptr_init(VALUE val);
-VALUE rb_dlcfunc_new(void (*func)(), int dltype, const char * name, ID calltype);
-int rb_dlcfunc_kind_p(VALUE func);
VALUE rb_dlptr_new(void *ptr, long size, freefunc_t func);
VALUE rb_dlptr_new2(VALUE klass, void *ptr, long size, freefunc_t func);
VALUE rb_dlptr_malloc(long size, freefunc_t func);
+void *rb_dlptr2cptr(VALUE val);
-#endif
+VALUE rb_dlsym_new(void (*func)(), const char *name, const char *type);
+freefunc_t rb_dlsym2csym(VALUE val);
+
+
+#endif /* RUBY_DL_H */
diff --git a/ext/dl/doc/dl.txt b/ext/dl/doc/dl.txt
new file mode 100644
index 0000000000..893bd21d79
--- /dev/null
+++ b/ext/dl/doc/dl.txt
@@ -0,0 +1,266 @@
+=begin
+
+= Ruby/DL
+
+Ruby/DL provides an interface to the dynamic linker such as dlopen() on UNIX
+and LoadLibrary() on Windows.
+
+= Building and Installing
+
+ $ ruby extconf.rb # to create the Makefile
+ $ make # to build the library 'dl.so'
+ $ make libtest.so # to build the C library 'libtest.so' for the test script
+ $ make test # to run the test script
+ $ make install # to install the library
+ $ make clean # to remove the created files without Makefile
+ $ make distclean # to remove the all created files
+
+= Using Ruby/DL
+
+We should usually use DL::Importable module provided by "dl/import.rb".
+It has high-level functions to access library functions. We use
+DL::Importable module to extend a module as follows:
+
+ require "dl/import"
+ module LIBC
+ extend DL::Importable
+ end
+
+Now we can use methods dlload and extern in this module. We load the
+libraries using dlload, and define wrapper methods to library functions
+using extern respectively as follows:
+
+ module LIBC
+ extend DL::Importable
+ dlload "libc.so.6","libm.so.6"
+ extern "int strlen(char*)"
+ end
+ # Note that we should not include the module LIBC from some reason.
+
+We can call the library function strlen() using LIBC.strlen. If the first
+character of given function name is an uppercase, the first character of the
+defined method name becomes lowercase.
+We can also construct memory images of structures and unions using functions
+struct and union which are defined in "dl/struct.rb" as follows:
+
+ require "dl/import"
+ require "dl/struct"
+ module LIBC
+ extend DL::Importable
+ Timeval = struct [ # define timeval structure.
+ "long tv_sec",
+ "long tv_uses",
+ ]
+ end
+ val = LIBC::Timeval.malloc # allocate memory.
+
+Notice that the above example takes LIBC::Timeval.malloc to allocate memory,
+rather than LIBC::Timeval.new. It is because DL::Timeval.new is for wrapping
+an object, PtrData, which has already been created.
+
+We can define a callback using the module function "callback" as follows:
+
+ module Foo
+ extend DL::Importable
+ def my_comp(str1,str2)
+ str1 <=> str2
+ end
+ COMPARE = callback "int my_comp(char*,char*)"
+ end
+
+where Foo::COMPARE is a Symbol object which invokes the method "my_comp".
+
+DL::Importable module is very useful. However, we sometimes encounter a case
+that we must directly use low-level functions such as dlsym(). In such case,
+we would use DL module functions. They are described in next section.
+
+= DL module
+
+Module DL consists of three classes, a few module functions and constants.
+The class Symbol represents the symbol we can call. The class PtrData
+indicates a memory block such as a pointer in C. An object instantiated from
+the class Handle keeps a handle to opened library.
+
+== Constants
+
+* VERSION
+* MAJOR_VERSION
+* MINOR_VERSION
+* PATCH_VERSION
+* RTLD_GLOBAL
+* RTLD_LAZY
+* RTLD_NOW
+* MAX_ARG
+* MAX_CBARG
+* MAX_CBENT
+
+== Functions
+
+* handle = dlopen(lib){|handle| ... }
+ * is quite equal to `Handle.new(lib)'
+
+* sym = set_callback(cbtype, entry){|args| ... }
+* sym = set_callback(cbtype, entry, proc)
+ * makes entry-th pre-defined function to call the proc or given block. the
+ entry-th pre-defined function is specified by cbtype and entry. cbtype is a
+ prototype of the callback. see also the section `Type specifiers' about
+ cbtype.
+
+* sym = get_callback(cbtype, entry)
+ * returns the Proc object which is given by the above function
+ `set_callback'.
+
+* ptr = malloc(size, [free = nil])
+ * allocates the size bytes, and returns the pointer as a PtrData object ptr.
+
+* ptr = strdup(str)
+ * returns a PtrData object ptr which represents the pointer to a new string
+ which is a duplicate of the string str.
+
+* size = sizeof(type)
+ * returns the size of type. `sizeof("C") + sizeof("L")' is not equal to
+ `sizeof("CL")'. the latter is assumed to returns the enough size of the
+ structure `struct foo { char c; long l; }', but the size may not equal to
+ `sizeof(foo)' of C.
+
+== Handle class
+
+* handle = Handle.new(lib){|handle| ... }
+ * opens a library lib and returns a Handle object handle. if a block is
+ given, the handle is automatically closed as the block ends.
+
+* Handle#close
+ * closes the handle opened by the above Handle.new(lib).
+
+* sym = Handle#sym(func, prototype = "0"),
+ sym = Handle#[func, prototype = nil]
+
+ * obtains the pointer to a function called func and returns a Symbol object
+ or a DataPtr object. prototype is a string which consists of type
+ specifiers, it indicates the function's prototype. see also the section
+ `Type specifiers'.
+
+== Symbol class
+
+* sym = Symbol.new(addr, type = nil, name = nil)
+ * creates the Symbol object sym with the type type if type is not nil. addr
+ is the address where the function is allocated. If type is nil, it returns
+ a DataPtr object.
+
+* Symbol::char2type(char)
+ * takes a character char that represents a type and returns the type
+ specifier of the C language.
+
+* str = Symbol#proto()
+ * returns the function prototype.
+
+* str = Symbol#name()
+ * Returns the function name.
+
+* str = Symbol#cproto(),
+ str = Symbol#to_s()
+ * returns the prototype of the C language.
+
+* str = Symbol#inspect()
+ * returns the inspectable string.
+
+* r,rs = Symbol#call(arg1,arg2,...,argN),
+ r,rs = Symbol#[](arg1,arg2,...,argN)
+ * calls the function with parameters arg1, arg2, ..., argN. and the result
+ consists of the return value r and parameters rs. rs is an array.
+
+* ptr = Symbol#to_ptr
+ * returns the corresponding PtrData object ptr.
+
+== PtrData class
+
+* ptr = PtrData.new(addr, [size = 0, free = nil])
+ * returns the PtrData object representing the pointer which indicates the
+ address addr. GC frees the memory using the free function.
+
+* PtrData#free=(sym)
+ * If you specify a symbol object sym, GC frees the memory using the function
+ represented by sym.
+
+* sym = PtrData#free
+ * returns a symbol object sym which is used when GC frees the memory. it
+ usually configured by `PtrData#free=' or `PtrData.new'.
+
+* size = PtrData#size, PtrData#size=(size)
+ * gets and sets allocated size of the memory.
+
+* ary = PtrData#to_a(type, [size])
+ * returns an array of the type which specified with type. type must be one of
+ 'S','P','I','L','D' and 'F'.
+
+* str = PtrData#to_s([len])
+ * returns a string which length is len. if len is omitted, the end of the
+ string is '\0'.
+
+* ptr = PtrData#ptr,+@
+ * returns the pointed value as a PtrData object ptr.
+
+* ptr = PtrData#ref,-@
+ * returns the reference as a PtrData object ptr.
+
+* ptr = PtrData#+
+ * returns the PtrData object
+
+* ptr = PtrData#-
+ * returns the PtrData object
+
+* PtrData#struct!(type, *members)
+ * defines the data type to get access to a structure member with a symbol.
+ (see also PtrData#[])
+
+* PtrData#union!(type, *members)
+ * defines the data type to get access to a union member with a symbol. (see
+ also PtrData#[])
+
+* val = PtrData#[key], PtrData#[key, num = 0]
+ * if the key is a string or symbol, this method returns the value of the
+ structure/union member which has the type defined by PtrData#
+ {struct!,union!}. if the key is a integer value and this object represents
+ the pointer ptr, it returns the value of `(ptr + key).to_s(num)'
+
+* PtrData#[key,num]=val, PtrData#[key]=val
+ * if the key is a string or symbol, this method substitute the value of the
+ structure/union member with val. if the key is a integer value and val is a
+ string, this method copies num bytes of val to the memory area ptr using
+ memcpy(3).
+
+== Type specifiers
+
+the prototype consists of the following type specifiers, first element of
+prototype represents the type of return value, and remaining elements represent
+the type of each argument.
+
+ C : char
+ c : char *
+ H : short
+ h : short *
+ I : int
+ i : int *
+ L : long
+ l : long *
+ F : float
+ f : float *
+ D : double
+ d : double *
+ S : const char *
+ s : char *
+ A : const type[]
+ a : type[] (allocates new memory space)
+ P : void * (same as 'p')
+ p : void * (same as 'P')
+ 0 : void function (this must be a first character of the prototype)
+
+the cbtype consists of type specifiers 0, C, I, H, L, F, D, S and P.
+for example:
+
+ DL.callback('IPP'){|ptr1,ptr2|
+ str1 = ptr1.ptr.to_s
+ str2 = ptr2.ptr.to_s
+ str1 <=> str2
+ }
+=end
diff --git a/ext/dl/extconf.rb b/ext/dl/extconf.rb
index 36babf4143..beb15ab04c 100644
--- a/ext/dl/extconf.rb
+++ b/ext/dl/extconf.rb
@@ -1,29 +1,193 @@
require 'mkmf'
-if( RbConfig::CONFIG['CC'] =~ /gcc/ )
+begin # for the exception SystemExit
+
+$:.unshift File.dirname(__FILE__)
+require 'type'
+
+if( ARGV.include?("--help") )
+ print <<EOF
+ --help print this messages
+ --with-type-char strictly use type 'char'
+ --with-type-short strictly use type 'short'
+ --with-type-float strictly use type 'float'
+ --with-args=<max_arg>
+ --with-callback=<max_callback>
+ --enable-asm use the embedded assembler for passing arguments.
+ (this option is available for i386 machine now.)
+ --enable-dlstack use a stack emulation for constructing function call.
+EOF
+ exit(0)
+end
+
+($CPPFLAGS || $CFLAGS) << " -I."
+
+if (Config::CONFIG['CC'] =~ /gcc/) # from Win32API
$CFLAGS << " -fno-defer-pop -fno-omit-frame-pointer"
end
-$INSTALLFILES = [
- ["dl.h", "$(HDRDIR)"],
-]
+$with_dlstack ||= true
+$with_asm = ! $with_dlstack
+
+$with_type_int = try_cpp(<<EOF)
+#include "config.h"
+#if SIZEOF_INT == SIZEOF_LONG
+#error int not needed
+#endif
+EOF
+
+$with_type_float = try_cpp(<<EOF)
+#include "config.h"
+#if SIZEOF_FLOAT == SIZEOF_DOUBLE
+#error float not needed
+#endif
+EOF
+
+$with_type_voidp = try_cpp(<<EOF)
+#include "config.h"
+#if SIZEOF_VOIDP == SIZEOF_INT || SIZEOF_VOIDP == SIZEOF_LONG
+#error void* not needed
+#endif
+EOF
+
+$with_type_char = DLTYPE[CHAR][:sym]
+$with_type_short = DLTYPE[SHORT][:sym]
+$with_type_long = DLTYPE[LONG][:sym]
+$with_type_double= DLTYPE[DOUBLE][:sym]
+$with_type_int &= DLTYPE[INT][:sym]
+$with_type_float &= DLTYPE[FLOAT][:sym]
+$with_type_voidp &= DLTYPE[VOIDP][:sym]
+
+$with_type_char = enable_config("type-char", $with_type_char)
+$with_type_short = enable_config("type-short", $with_type_short)
+$with_type_float = enable_config("type-float", $with_type_float)
+
+$with_asm = enable_config("asm", $with_asm)
+$with_dlstack = enable_config("dlstack", $with_dlstack)
+
+args = with_config("args")
+max_arg = nil
+if( $with_asm || $with_dlstack )
+ $with_type_char = true
+ $with_type_short = true
+ $with_type_float = true
+ max_arg = 0
+end
+if( args )
+ max_arg = args.to_i
+ if( !max_arg )
+ print("--with-args=<max_arg>\n")
+ exit(1)
+ end
+end
+max_arg ||= 6
+
+max_callback = with_config("callback","10").to_i
+callback_types = DLTYPE.keys.length
+
+
+$dlconfig_h = <<EOF
+#define MAX_ARG #{max_arg}
+EOF
+
+def dlc_define(const)
+ $dlconfig_h << "#if !defined(#{const})\n" +
+ "# define #{const}\n" +
+ "#endif\n"
+end
+
+$dlconfig_h << "#define MAX_CALLBACK #{max_callback}\n"
+$dlconfig_h << "#define CALLBACK_TYPES #{callback_types}\n"
+if( $with_dlstack )
+ $dlconfig_h << "#define USE_DLSTACK\n"
+else
+ if( $with_asm )
+ $dlconfig_h << "#define USE_INLINE_ASM\n"
+ end
+end
+if( $with_type_char )
+ $dlconfig_h << "#define WITH_TYPE_CHAR\n"
+end
+if( $with_type_short )
+ $dlconfig_h << "#define WITH_TYPE_SHORT\n"
+end
+if( $with_type_long )
+ $dlconfig_h << "#define WITH_TYPE_LONG\n"
+end
+if( $with_type_double )
+ $dlconfig_h << "#define WITH_TYPE_DOUBLE\n"
+end
+if( $with_type_float )
+ $dlconfig_h << "#define WITH_TYPE_FLOAT\n"
+end
+if( $with_type_int )
+ $dlconfig_h << "#define WITH_TYPE_INT\n"
+end
+if( $with_type_voidp )
+ $dlconfig_h << "#define WITH_TYPE_VOIDP\n"
+end
+
+if( have_header("windows.h") )
+ have_library("kernel32")
+ have_func("GetLastError", "windows.h")
+ dlc_define("HAVE_WINDOWS_H")
+ have_windows_h = true
+end
-check = true
if( have_header("dlfcn.h") )
+ dlc_define("HAVE_DLFCN_H")
have_library("dl")
- check &&= have_func("dlopen")
- check &&= have_func("dlclose")
- check &&= have_func("dlsym")
- have_func("dlerror")
-elsif( have_header("windows.h") )
- check &&= have_func("LoadLibrary")
- check &&= have_func("FreeLibrary")
- check &&= have_func("GetProcAddress")
+ have_func("dlopen")
+ have_func("dlclose")
+ have_func("dlsym")
+ if( have_func("dlerror") )
+ dlc_define("HAVE_DLERROR")
+ end
+elsif ( have_windows_h )
+ have_func("LoadLibrary")
+ have_func("FreeLibrary")
+ have_func("GetProcAddress")
else
- check = false
+ exit(0)
+end
+
+def File.update(file, str)
+ begin
+ open(file){|f|f.read} == str
+ rescue Errno::ENOENT
+ false
+ end or open(file, "w"){|f|f.print(str)}
end
-if check
- $defs << %[-DRUBY_VERSION=\\"#{RUBY_VERSION}\\"]
- create_makefile("dl")
+File.update("dlconfig.h", <<EOF)
+#ifndef DLCONFIG_H
+#define DLCONFIG_H
+#{$dlconfig_h}
+#endif /* DLCONFIG_H */
+EOF
+
+File.update("dlconfig.rb", <<EOF)
+MAX_ARG = #{max_arg}
+MAX_CALLBACK = #{max_callback}
+CALLBACK_TYPES = #{callback_types}
+DLTYPE[CHAR][:sym] = #{$with_type_char}
+DLTYPE[SHORT][:sym] = #{$with_type_short}
+DLTYPE[INT][:sym] = #{$with_type_int}
+DLTYPE[LONG][:sym] = #{$with_type_long}
+DLTYPE[FLOAT][:sym] = #{$with_type_float}
+DLTYPE[DOUBLE][:sym]= #{$with_type_double}
+DLTYPE[VOIDP][:sym] = #{$with_type_voidp}
+EOF
+
+$INSTALLFILES = [
+ ["./dlconfig.h", "$(archdir)$(target_prefix)", "."],
+ ["dl.h", "$(archdir)$(target_prefix)", ""],
+]
+$cleanfiles = %w[test/test.o]
+$distcleanfiles = %w[call.func callback.func cbtable.func dlconfig.rb
+./dlconfig.h test/libtest.so test/*~ *~ mkmf.log]
+
+create_makefile('dl')
+rescue SystemExit
+ # do nothing
end
diff --git a/ext/dl/h2rb b/ext/dl/h2rb
new file mode 100644
index 0000000000..00fbd60c82
--- /dev/null
+++ b/ext/dl/h2rb
@@ -0,0 +1,500 @@
+#!/usr/bin/env ruby
+# -*- ruby -*-
+# $Id$
+
+require 'mkmf'
+require 'ftools'
+
+$recursive = false
+$force = false
+$conly = true
+$inc_path = []
+$infilename= nil
+$insert_require = true
+
+def valid_ruby_code?(code)
+ begin
+ eval("BEGIN {return true}; #{code}")
+ rescue SyntaxError
+ return false
+ end
+ return false
+end
+
+def print_usage
+ print <<EOF
+h2rb [-r] [-I <path>] [-d] [<filename>]
+EOF
+end
+
+while( ARGV[0] )
+ case( ARGV[0] )
+ when "-r"
+ ARGV.shift
+ $recursive = true
+ when "-R"
+ ARGV.shift
+ $recursive = false
+ when "-l"
+ ARGV.shift
+ $insert_require = true
+ when "-L"
+ ARGV.shift
+ $insert_require = false
+ when "-c"
+ ARGV.shift
+ $conly = true
+ when "-C"
+ ARGV.shift
+ $conly = false
+ when "-f"
+ ARGV.shift
+ $force = true
+ when "-F"
+ ARGV.shift
+ $force = false
+ when "-I"
+ ARGV.shift
+ $inc_path << ARGV.shift
+ when "-d"
+ ARGV.shift
+ $DEBUG = true
+ when "-h","--help"
+ print_usage()
+ exit 0
+ when /-.*/
+ $stderr.print("unknown option '#{ARGV[0]}'.\n")
+ print_usage()
+ exit 0
+ else
+ $infilename = ARGV.shift
+ end
+end
+
+$inc_dir = File.join(CONFIG["prefix"], "lib", "ruby",
+ CONFIG["MAJOR"] + "." + CONFIG["MINOR"],
+ "dl")
+
+class H2RBError < StandardError; end
+
+
+class H2RB
+ def initialize(inc_dir = nil, inc_path = nil, insert_require = nil)
+ @inc_path = inc_path || []
+ @inc_dir = inc_dir || '.'
+ @indent = 0
+ @parsed_files = []
+ @insert_require = insert_require || false
+ end
+
+ def find_path(file)
+ if( ! file )
+ return nil
+ end
+ if( File.exist?(file) )
+ if( file[0] == ?/ )
+ return file
+ else
+ return file
+ end
+ end
+ @inc_path.each{|path|
+ full = File.join(path, file)
+ if( File.exist?(full) )
+ return full
+ end
+ }
+ return nil
+ end
+
+ def strip_comment(line)
+ if( @commented )
+ if( e = line.index("*/") )
+ line[0..(e+1)] = ""
+ @commented = false
+ else
+ line = ""
+ end
+ else
+ if( s = line.index("/*") )
+ if( e = line.index("*/") )
+ line[s..(e+1)] = ""
+ else
+ line[s..-1] = ""
+ @commented = true
+ end
+ elsif( s = line.index("//") )
+ line[s..(-1)] = ""
+ end
+ end
+
+ line.gsub!(/\s+$/,"")
+ return line
+ end
+
+ def up_indent
+ @indent += 1
+ end
+
+ def down_indent
+ @indent -= 1
+ if( @indent < 0 )
+ raise
+ end
+ end
+
+ def indent
+ " " * @indent
+ end
+
+ def rescue_begin
+ line = "#{indent}begin"
+ up_indent
+ return line
+ end
+
+ def rescue_nameerror
+ down_indent
+ line = [
+ "#{indent}rescue NameError => e",
+ "#{indent} raise e if( $DEBUG )",
+ "#{indent}end"].join($/)
+ return line
+ end
+
+ def parse_enum(line)
+ if( line =~ /enum\s+(\S+\s+)?\{(.+)\}/ )
+ enum_name = $1
+ enum_block = $2
+ if( enum_name )
+ line = "#{indent}# -- enum #{enum_name}\n"
+ else
+ line = "#{indent}# -- enum\n"
+ end
+ enums = enum_block.split(/,/).collect{|e| e.strip}
+ i = 0
+ enums.each{|elem|
+ var,val = elem.split(/=/).collect{|e| e.strip}
+ if( val )
+ i = val.to_i
+ end
+ line += "#{indent}#{var} = #{i.to_s}\n"
+ i += 1
+ }
+ line += "#{indent}# -- end of enum"
+ return line
+ else
+ return nil
+ end
+ end
+
+ def parse_define(line)
+ case line
+ when /^#\s*define\s+(\S+)\(\)/
+ line = nil
+ when /^#\s*define\s+(\S+)\((.+)\)\s+(.+)$/
+ if( @conly )
+ line = nil
+ else
+ defname = $1
+ defargs = $2
+ defval = $3
+ if( !valid_ruby_code?(defval) )
+ defval = "nil # #{defval}"
+ end
+ if( defname[0,1] =~ /^[A-Z]$/ )
+ line = "#{indent}#{defname} = proc{|#{defargs}| #{defval}}"
+ else
+ line = [
+ "#{indent}def #{defname}(#{defargs})",
+ "#{indent} #{defval}",
+ "#{indent}end"
+ ].join("\n")
+ end
+ end
+ when /^#\s*define\s+(\S+)\((.+)\)$/
+ if( @conly )
+ line = nil
+ else
+ defname = $1
+ defargs = $2
+ defval = nil
+ if( !valid_ruby_code?(defval) )
+ defval = "nil # #{defval}"
+ end
+ if( defname[0,1] =~ /^[A-Z]$/ )
+ line = "#{indent}#{defname} = proc{|#{defargs}| #{defval}}"
+ else
+ line = [
+ "#{indent}def #{defname}(#{defargs})",
+ "#{indent} #{defval}",
+ "#{indent}end"
+ ].join("\n")
+ end
+ end
+ when /^#\s*define\s+(\S+)\s+(.+)$/
+ defname = $1
+ defval = $2
+ if( !valid_ruby_code?(defval) )
+ defval = "nil # #{defval}"
+ end
+ line = [rescue_begin, "#{indent}#{defname} = #{defval}", rescue_nameerror].join($/)
+ when /^#\s*define\s+(\S+)$/
+ defname = $1
+ line = "#{indent}#{defname} = nil"
+ else
+ line = nil
+ end
+ return line
+ end
+
+ def parse_undef(line)
+ case line
+ when /^#\s*undef\s+([A-Z]\S+)$/
+ defname = $1
+ line = "#{indent}remove_const(:#{defname})"
+ when /^#\s*undef\s+(\S+)$/
+ defname = $1
+ line = "#{indent}#{defname} = nil"
+ else
+ line = nil
+ end
+ return line
+ end
+
+ def parse_ifdef(line)
+ case line
+ when /^#\s*ifdef\s+(\S+)$/
+ defname = $1
+ line = [
+ rescue_begin,
+ "#{indent}if( defined?(#{defname}) && ! #{defname}.nil? )"].join($/)
+ else
+ line = nil
+ end
+ return line
+ end
+
+ def parse_ifndef(line)
+ case line
+ when /^#\s*ifndef\s+(\S+)$/
+ defname = $1
+ line = [
+ rescue_begin,
+ "#{indent}if( ! defined?(#{defname}) || #{defname}.nil? )"].join($/)
+ else
+ line = nil
+ end
+ return line
+ end
+
+ def parse_if(line)
+ case line
+ when /^#\s*if\s+(.+)$/
+ cond = $1
+ cond.gsub!(/defined(.+)/){ "defined?(#{$1}) && ! #{$1}.nil?" }
+ if( valid_ruby_code?(cond) )
+ line = "#{indent}if( #{cond} )"
+ else
+ line = "#{indent}if( false ) # #{cond}"
+ end
+ line = [rescue_begin, line].join($/)
+ else
+ line = nil
+ end
+ return line
+ end
+
+ def parse_elif(line)
+ case line
+ when /^#\s*elif\s+(.+)$/
+ cond = $1
+ cond.gsub!("defined","defined?")
+ line = "#{indent}elsif( #{cond} )"
+ else
+ line = nil
+ end
+ return line
+ end
+
+ def parse_else(line)
+ case line
+ when /^#\s*else\s*/
+ line = "#{indent}else"
+ else
+ line = nil
+ end
+ return line
+ end
+
+ def parse_endif(line)
+ case line
+ when /^#\s*endif\s*$/
+ line = ["#{indent}end", rescue_nameerror].join($/)
+ else
+ line = nil
+ end
+ return line
+ end
+
+ def parse_include(line)
+ if( ! @insert_require )
+ return nil
+ end
+
+ file = nil
+ case line
+ when /^#\s*include "(.+)"$/
+ file = $1
+ line = "#{indent}require '#{file}'"
+ when /^#\s*include \<(.+)\>$/
+ file = $1
+ line = "#{indent}require '#{file}'"
+ else
+ line = nil
+ end
+ if( @recursive && file && (!@parsed_files.include?(file)) )
+ parse(file, @recursive, @force, @conly)
+ end
+ return line
+ end
+
+
+ def open_files(infilename)
+ if( ! infilename )
+ return [$stdin, $stdout]
+ end
+
+ old_infilename = infilename
+ infilename = find_path(infilename)
+ if( ! infilename )
+ $stderr.print("'#{old_infilename}' was not found.\n")
+ return [nil,nil]
+ end
+
+ if( infilename )
+ if( infilename[0,1] == '/' )
+ outfilename = File.join(@inc_dir, infilename[1..-1] + ".rb")
+ else
+ outfilename = infilename + ".rb"
+ end
+ File.mkpath(File.dirname(outfilename))
+ else
+ outfilename = nil
+ end
+
+ if( infilename )
+ fin = File.open(infilename,"r")
+ else
+ fin = $stdin
+ end
+ if( outfilename )
+ if( File.exist?(outfilename) && (!@force) )
+ $stderr.print("'#{outfilename}' have already existed.\n")
+ return [fin, nil]
+ end
+ fout = File.open(outfilename,"w")
+ else
+ fout = $stdout
+ end
+
+ $stderr.print("#{infilename} -> #{outfilename}\n")
+ if( fout )
+ dir = File.dirname(outfilename)
+ if( dir[0,1] != "." && dir != "" )
+ fout.print("if( ! $LOAD_PATH.include?('#{dir}') )\n",
+ " $LOAD_PATH.push('#{dir}')\n",
+ "end\n")
+ end
+ end
+ return [fin,fout]
+ end
+
+ def parse(infilename = nil, recursive = false, force = false, conly = false)
+ @commented = false
+ @recursive = recursive
+ @force = force
+ @conly = conly
+ @parsed_files << infilename
+
+ fin,fout = open_files(infilename)
+ if( !fin )
+ return
+ end
+
+ begin
+ line_number = 0
+ pre_line = nil
+ fin.each_line{|line|
+ line_number += 1
+ line.chop!
+ if( $DEBUG )
+ $stderr.print("#{line_number}:(#{@indent}):", line, "\n")
+ end
+
+ if( pre_line )
+ line = pre_line + line
+ pre_line = nil
+ end
+
+ if( line[-1,1] == "\\" )
+ pre_line = line[0..-2]
+ next
+ end
+
+ if( eidx = line.index("enum ") )
+ pre_line = line[eidx .. -1]
+ if( i = line.index("{") && j = line.index("}") )
+ line = line[0..j]
+ pre_line = nil
+ else
+ next
+ end
+ end
+
+ line = strip_comment(line)
+ case line
+ when /^enum\s/
+ line = parse_enum(line)
+ when /^#\s*define\s/
+ line = parse_define(line)
+ when /^#\s*undef\s/
+ line = parse_undef(line)
+ when /^#\s*ifdef\s/
+ line = parse_ifdef(line)
+ up_indent
+ when /^#\s*ifndef\s/
+ line = parse_ifndef(line)
+ up_indent
+ when /^#\s*if\s/
+ line = parse_if(line)
+ up_indent
+ when /^#\s*elif\s/
+ down_indent
+ line = parse_elif(line)
+ up_indent
+ when /^#\s*else/
+ down_indent
+ line = parse_else(line)
+ up_indent
+ when /^#\s*endif/
+ down_indent
+ line = parse_endif(line)
+ when /^#\s*include\s/
+ line = parse_include(line)
+ else
+ line = nil
+ end
+ if( line && fout )
+ fout.print(line, " # #{line_number}",$/)
+ end
+ }
+ ensure
+ fin.close if fin
+ fout.close if fout
+ end
+ end
+end
+
+h2rb = H2RB.new($inc_dir, $inc_path, $insert_require)
+h2rb.parse($infilename, $recursive, $force, $conly)
diff --git a/ext/dl/handle.c b/ext/dl/handle.c
index 14a5299223..69d47caac0 100644
--- a/ext/dl/handle.c
+++ b/ext/dl/handle.c
@@ -7,284 +7,209 @@
VALUE rb_cDLHandle;
-#ifdef HAVE_WINDOWS_H
-# ifndef _WIN32_WCE
-static void *
-w32_coredll(void)
-{
- MEMORY_BASIC_INFORMATION m;
- memset(&m, 0, sizeof(m));
- if( !VirtualQuery(_errno, &m, sizeof(m)) ) return NULL;
- return m.AllocationBase;
-}
-# endif
-
-static int
-w32_dlclose(void *ptr)
-{
-# ifndef _WIN32_WCE
- if( ptr == w32_coredll() ) return 0;
-# endif
- if( FreeLibrary((HMODULE)ptr) ) return 0;
- return errno = rb_w32_map_errno(GetLastError());
-}
-#define dlclose(ptr) w32_dlclose(ptr)
-#endif
-
void
dlhandle_free(struct dl_handle *dlhandle)
{
- if( dlhandle->ptr && dlhandle->open && dlhandle->enable_close ){
- dlclose(dlhandle->ptr);
- }
+ if (dlhandle->ptr && dlhandle->open && dlhandle->enable_close) {
+ dlclose(dlhandle->ptr);
+ }
}
VALUE
rb_dlhandle_close(VALUE self)
{
- struct dl_handle *dlhandle;
+ struct dl_handle *dlhandle;
- Data_Get_Struct(self, struct dl_handle, dlhandle);
- dlhandle->open = 0;
- return INT2NUM(dlclose(dlhandle->ptr));
+ Data_Get_Struct(self, struct dl_handle, dlhandle);
+ dlhandle->open = 0;
+ return INT2NUM(dlclose(dlhandle->ptr));
}
VALUE
rb_dlhandle_s_allocate(VALUE klass)
{
- VALUE obj;
- struct dl_handle *dlhandle;
-
- obj = Data_Make_Struct(rb_cDLHandle, struct dl_handle, 0,
- dlhandle_free, dlhandle);
- dlhandle->ptr = 0;
- dlhandle->open = 0;
- dlhandle->enable_close = 0;
-
- return obj;
-}
+ VALUE obj;
+ struct dl_handle *dlhandle;
-static VALUE
-predefined_dlhandle(void *handle)
-{
- VALUE obj = rb_dlhandle_s_allocate(rb_cDLHandle);
- struct dl_handle *dlhandle = DATA_PTR(obj);
+ obj = Data_Make_Struct(rb_cDLHandle, struct dl_handle, 0,
+ dlhandle_free, dlhandle);
+ dlhandle->ptr = 0;
+ dlhandle->open = 0;
+ dlhandle->enable_close = 0;
- dlhandle->ptr = handle;
- dlhandle->open = 1;
- OBJ_FREEZE(obj);
- return obj;
+ return obj;
}
VALUE
rb_dlhandle_initialize(int argc, VALUE argv[], VALUE self)
{
- void *ptr;
- struct dl_handle *dlhandle;
- VALUE lib, flag;
- char *clib;
- int cflag;
- const char *err;
-
- switch( rb_scan_args(argc, argv, "02", &lib, &flag) ){
- case 0:
- clib = NULL;
- cflag = RTLD_LAZY | RTLD_GLOBAL;
- break;
- case 1:
- clib = NIL_P(lib) ? NULL : StringValuePtr(lib);
- cflag = RTLD_LAZY | RTLD_GLOBAL;
- break;
- case 2:
- clib = NIL_P(lib) ? NULL : StringValuePtr(lib);
- cflag = NUM2INT(flag);
- break;
- default:
- rb_bug("rb_dlhandle_new");
- }
-
-#if defined(HAVE_WINDOWS_H)
- if( !clib ){
- HANDLE rb_libruby_handle(void);
- ptr = rb_libruby_handle();
- }
- else if( STRCASECMP(clib, "libc") == 0
-# ifdef RUBY_COREDLL
- || STRCASECMP(clib, RUBY_COREDLL) == 0
- || STRCASECMP(clib, RUBY_COREDLL".dll") == 0
-# endif
- ){
-# ifdef _WIN32_WCE
- ptr = dlopen("coredll.dll", cflag);
-# else
- ptr = w32_coredll();
-# endif
- }
- else
-#endif
- ptr = dlopen(clib, cflag);
+ void *ptr;
+ struct dl_handle *dlhandle;
+ VALUE lib, flag;
+ char *clib;
+ int cflag;
+ const char *err;
+
+ switch (rb_scan_args(argc, argv, "11", &lib, &flag)) {
+ case 1:
+ clib = NIL_P(lib) ? NULL : StringValuePtr(lib);
+ cflag = RTLD_LAZY | RTLD_GLOBAL;
+ break;
+ case 2:
+ clib = NIL_P(lib) ? NULL : StringValuePtr(lib);
+ cflag = NUM2INT(flag);
+ break;
+ default:
+ rb_bug("rb_dlhandle_new");
+ }
+
+ ptr = dlopen(clib, cflag);
#if defined(HAVE_DLERROR)
- if( !ptr && (err = dlerror()) ){
- rb_raise(rb_eDLError, "%s", err);
- }
+ if (!ptr && (err = dlerror())) {
+ rb_raise(rb_eRuntimeError, "%s", err);
+ }
#else
- if( !ptr ){
- err = dlerror();
- rb_raise(rb_eDLError, "%s", err);
- }
+ if (!ptr) {
+ err = dlerror();
+ rb_raise(rb_eRuntimeError, "%s", err);
+ }
#endif
- Data_Get_Struct(self, struct dl_handle, dlhandle);
- if( dlhandle->ptr && dlhandle->open && dlhandle->enable_close ){
- dlclose(dlhandle->ptr);
- }
- dlhandle->ptr = ptr;
- dlhandle->open = 1;
- dlhandle->enable_close = 0;
-
- if( rb_block_given_p() ){
- rb_ensure(rb_yield, self, rb_dlhandle_close, self);
- }
-
- return Qnil;
+ Data_Get_Struct(self, struct dl_handle, dlhandle);
+ if (dlhandle->ptr && dlhandle->open && dlhandle->enable_close) {
+ dlclose(dlhandle->ptr);
+ }
+ dlhandle->ptr = ptr;
+ dlhandle->open = 1;
+ dlhandle->enable_close = 0;
+
+ if (rb_block_given_p()) {
+ rb_ensure(rb_yield, self, rb_dlhandle_close, self);
+ }
+
+ return Qnil;
}
VALUE
rb_dlhandle_enable_close(VALUE self)
{
- struct dl_handle *dlhandle;
+ struct dl_handle *dlhandle;
- Data_Get_Struct(self, struct dl_handle, dlhandle);
- dlhandle->enable_close = 1;
- return Qnil;
+ Data_Get_Struct(self, struct dl_handle, dlhandle);
+ dlhandle->enable_close = 1;
+ return Qnil;
}
VALUE
rb_dlhandle_disable_close(VALUE self)
{
- struct dl_handle *dlhandle;
+ struct dl_handle *dlhandle;
- Data_Get_Struct(self, struct dl_handle, dlhandle);
- dlhandle->enable_close = 0;
- return Qnil;
+ Data_Get_Struct(self, struct dl_handle, dlhandle);
+ dlhandle->enable_close = 0;
+ return Qnil;
}
VALUE
rb_dlhandle_to_i(VALUE self)
{
- struct dl_handle *dlhandle;
+ struct dl_handle *dlhandle;
- Data_Get_Struct(self, struct dl_handle, dlhandle);
- return PTR2NUM(dlhandle);
+ Data_Get_Struct(self, struct dl_handle, dlhandle);
+ return DLLONG2NUM(dlhandle);
}
-static VALUE dlhandle_sym(void *handle, const char *symbol);
-
VALUE
-rb_dlhandle_sym(VALUE self, VALUE sym)
+rb_dlhandle_to_ptr(VALUE self)
{
- struct dl_handle *dlhandle;
- const char *name;
-
- rb_secure(2);
-
- name = StringValuePtr(sym);
+ struct dl_handle *dlhandle;
- Data_Get_Struct(self, struct dl_handle, dlhandle);
- if( ! dlhandle->open ){
- rb_raise(rb_eDLError, "closed handle");
- }
-
- return dlhandle_sym(dlhandle->ptr, StringValueCStr(sym));
+ Data_Get_Struct(self, struct dl_handle, dlhandle);
+ return rb_dlptr_new(dlhandle, sizeof(dlhandle), 0);
}
-#ifndef RTLD_NEXT
-#define RTLD_NEXT NULL
-#endif
-#ifndef RTLD_DEFAULT
-#define RTLD_DEFAULT NULL
-#endif
-
VALUE
-rb_dlhandle_s_sym(VALUE self, VALUE sym)
+rb_dlhandle_sym(int argc, VALUE argv[], VALUE self)
{
- rb_secure(2);
- return dlhandle_sym(RTLD_NEXT, StringValueCStr(sym));
-}
+ VALUE sym, type;
+ void (*func)();
+ VALUE val;
+ struct dl_handle *dlhandle;
+ void *handle;
+ const char *name, *stype;
+ const char *err;
+
+ rb_secure(2);
+ if (rb_scan_args(argc, argv, "11", &sym, &type) == 2) {
+ SafeStringValue(type);
+ stype = StringValuePtr(type);
+ }
+ else{
+ stype = NULL;
+ }
+
+ if (sym == Qnil) {
+#if defined(RTLD_NEXT)
+ name = RTLD_NEXT;
+#else
+ name = NULL;
+#endif
+ }
+ else{
+ SafeStringValue(sym);
+ name = StringValuePtr(sym);
+ }
-static VALUE
-dlhandle_sym(void *handle, const char *name)
-{
+ Data_Get_Struct(self, struct dl_handle, dlhandle);
+ if (!dlhandle->open) {
+ rb_raise(rb_eRuntimeError, "closed handle");
+ }
+ handle = dlhandle->ptr;
+
+ func = dlsym(handle, name);
#if defined(HAVE_DLERROR)
- const char *err;
-# define CHECK_DLERROR if( err = dlerror() ){ func = 0; }
+ if (!func && (err = dlerror()))
#else
-# define CHECK_DLERROR
+ if (!func)
#endif
- void (*func)() = dlsym(handle, name);
-
- CHECK_DLERROR;
-#if defined(FUNC_STDCALL)
- if( !func ){
- int i;
- int len = strlen(name);
- char *name_n;
-#if defined(__CYGWIN__) || defined(_WIN32) || defined(__MINGW32__)
- {
- char *name_a = (char*)xmalloc(len+2);
- strcpy(name_a, name);
- name_n = name_a;
- name_a[len] = 'A';
- name_a[len+1] = '\0';
- func = dlsym(handle, name_a);
- CHECK_DLERROR;
- if( func ) goto found;
- name_n = xrealloc(name_a, len+6);
- }
+ {
+#if defined(__CYGWIN__) || defined(WIN32) || defined(__MINGW32__)
+ {
+ int len = strlen(name);
+ char *name_a = (char*)dlmalloc(len+2);
+ strcpy(name_a, name);
+ name_a[len] = 'A';
+ name_a[len+1] = '\0';
+ func = dlsym(handle, name_a);
+ dlfree(name_a);
+#if defined(HAVE_DLERROR)
+ if (!func && (err = dlerror()))
#else
- name_n = (char*)xmalloc(len+6);
+ if (!func)
#endif
- memcpy(name_n, name, len);
- name_n[len++] = '@';
- for( i = 0; i < 256; i += 4 ){
- sprintf(name_n + len, "%d", i);
- func = dlsym(handle, name_n);
- CHECK_DLERROR;
- if( func ) break;
- }
- if( func ) goto found;
- name_n[len-1] = 'A';
- name_n[len++] = '@';
- for( i = 0; i < 256; i += 4 ){
- sprintf(name_n + len, "%d", i);
- func = dlsym(handle, name_n);
- CHECK_DLERROR;
- if( func ) break;
- }
- found:
- xfree(name_n);
+ {
+ rb_raise(rb_eRuntimeError, "unknown symbol \"%sA\"", name);
+ }
}
+#else
+ rb_raise(rb_eRuntimeError, "unknown symbol \"%s\"", name);
#endif
- if( !func ){
- rb_raise(rb_eDLError, "unknown symbol \"%s\"", name);
- }
+ }
+ val = rb_dlsym_new(func, name, stype);
- return PTR2NUM(func);
+ return val;
}
void
-Init_dlhandle(void)
+Init_dlhandle()
{
- rb_cDLHandle = rb_define_class_under(rb_mDL, "Handle", rb_cObject);
- rb_define_alloc_func(rb_cDLHandle, rb_dlhandle_s_allocate);
- rb_define_singleton_method(rb_cDLHandle, "sym", rb_dlhandle_s_sym, 1);
- rb_define_singleton_method(rb_cDLHandle, "[]", rb_dlhandle_s_sym, 1);
- rb_define_const(rb_cDLHandle, "NEXT", predefined_dlhandle(RTLD_NEXT));
- rb_define_const(rb_cDLHandle, "DEFAULT", predefined_dlhandle(RTLD_DEFAULT));
- rb_define_method(rb_cDLHandle, "initialize", rb_dlhandle_initialize, -1);
- rb_define_method(rb_cDLHandle, "to_i", rb_dlhandle_to_i, 0);
- rb_define_method(rb_cDLHandle, "close", rb_dlhandle_close, 0);
- rb_define_method(rb_cDLHandle, "sym", rb_dlhandle_sym, 1);
- rb_define_method(rb_cDLHandle, "[]", rb_dlhandle_sym, 1);
- rb_define_method(rb_cDLHandle, "disable_close", rb_dlhandle_disable_close, 0);
- rb_define_method(rb_cDLHandle, "enable_close", rb_dlhandle_enable_close, 0);
+ rb_cDLHandle = rb_define_class_under(rb_mDL, "Handle", rb_cObject);
+ rb_define_alloc_func(rb_cDLHandle, rb_dlhandle_s_allocate);
+ rb_define_method(rb_cDLHandle, "initialize", rb_dlhandle_initialize, -1);
+ rb_define_method(rb_cDLHandle, "to_i", rb_dlhandle_to_i, 0);
+ rb_define_method(rb_cDLHandle, "to_ptr", rb_dlhandle_to_ptr, 0);
+ rb_define_method(rb_cDLHandle, "close", rb_dlhandle_close, 0);
+ rb_define_method(rb_cDLHandle, "sym", rb_dlhandle_sym, -1);
+ rb_define_method(rb_cDLHandle, "[]", rb_dlhandle_sym, -1);
+ rb_define_method(rb_cDLHandle, "disable_close", rb_dlhandle_disable_close, 0);
+ rb_define_method(rb_cDLHandle, "enable_close", rb_dlhandle_enable_close, 0);
}
diff --git a/ext/dl/install.rb b/ext/dl/install.rb
new file mode 100644
index 0000000000..69b1834301
--- /dev/null
+++ b/ext/dl/install.rb
@@ -0,0 +1,49 @@
+require 'mkmf'
+require 'ftools'
+
+SO_LIBS = ["dl.so"]
+
+$ruby_version = CONFIG['MAJOR'] + "." + CONFIG['MINOR']
+$prefix = CONFIG['prefix']
+$libdir = File.join($prefix,'lib')
+$rubylibdir = File.join($libdir, 'ruby', $ruby_version)
+$arch = CONFIG['arch']
+$archdir = File.join($rubylibdir, $arch)
+
+def find(dir, match = /./)
+ Dir.chdir(dir)
+ files = []
+ Dir.new(".").each{|file|
+ if( file != "." && file != ".." )
+ case File.ftype(file)
+ when "file"
+ if( file =~ match )
+ files.push(File.join(dir,file))
+ end
+ when "directory"
+ files += find(file, match).collect{|f| File.join(dir,f)}
+ end
+ end
+ }
+ Dir.chdir("..")
+ return files
+end
+
+def install()
+ rb_files = find(File.join(".","lib"), /.rb$/)
+
+ SO_LIBS.each{|f|
+ File.makedirs($rubylibdir, "#{$archdir}")
+ File.install(f, File.join($archdir,f), 0555, true)
+ }
+
+ rb_files.each{|f|
+ origfile = f
+ instfile = File.join($rubylibdir, origfile.sub("./lib/",""))
+ instdir = File.dirname(instfile)
+ File.makedirs(instdir)
+ File.install(origfile, instfile, 0644, true)
+ }
+end
+
+install()
diff --git a/ext/dl/lib/dl/callback.rb b/ext/dl/lib/dl/callback.rb
deleted file mode 100644
index c8daaf6322..0000000000
--- a/ext/dl/lib/dl/callback.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-require 'dl'
-require 'thread'
-
-module DL
- SEM = Mutex.new
-
- def set_callback_internal(proc_entry, addr_entry, argc, ty, &cbp)
- if( argc < 0 )
- raise(ArgumentError, "arity should not be less than 0.")
- end
- addr = nil
- SEM.synchronize{
- ary = proc_entry[ty]
- (0...MAX_CALLBACK).each{|n|
- idx = (n * DLSTACK_SIZE) + argc
- if( ary[idx].nil? )
- ary[idx] = cbp
- addr = addr_entry[ty][idx]
- break
- end
- }
- }
- addr
- end
-
- def set_cdecl_callback(ty, argc, &cbp)
- set_callback_internal(CdeclCallbackProcs, CdeclCallbackAddrs, argc, ty, &cbp)
- end
-
- def set_stdcall_callback(ty, argc, &cbp)
- set_callback_internal(StdcallCallbackProcs, StdcallCallbackAddrs, argc, ty, &cbp)
- end
-
- def remove_callback_internal(proc_entry, addr_entry, addr, ctype = nil)
- index = nil
- if( ctype )
- addr_entry[ctype].each_with_index{|xaddr, idx|
- if( xaddr == addr )
- index = idx
- end
- }
- else
- addr_entry.each{|ty,entry|
- entry.each_with_index{|xaddr, idx|
- if( xaddr == addr )
- index = idx
- end
- }
- }
- end
- if( index and proc_entry[ctype][index] )
- proc_entry[ctype][index] = nil
- return true
- else
- return false
- end
- end
-
- def remove_cdecl_callback(addr, ctype = nil)
- remove_callback_internal(CdeclCallbackProcs, CdeclCallbackAddrs, addr, ctype)
- end
-
- def remove_stdcall_callback(addr, ctype = nil)
- remove_callback_internal(StdcallCallbackProcs, StdcallCallbackAddrs, addr, ctype)
- end
-
- alias set_callback set_cdecl_callback
- alias remove_callback remove_cdecl_callback
-end
diff --git a/ext/dl/lib/dl/cparser.rb b/ext/dl/lib/dl/cparser.rb
deleted file mode 100644
index 2e78da5ad6..0000000000
--- a/ext/dl/lib/dl/cparser.rb
+++ /dev/null
@@ -1,109 +0,0 @@
-module DL
- module CParser
- def parse_struct_signature(signature, tymap=nil)
- if( signature.is_a?(String) )
- signature = signature.split(/\s*,\s*/)
- end
- mems = []
- tys = []
- signature.each{|msig|
- tks = msig.split(/\s+(\*)?/)
- ty = tks[0..-2].join(" ")
- member = tks[-1]
-
- case ty
- when /\[(\d+)\]/
- n = $1.to_i
- ty.gsub!(/\s*\[\d+\]/,"")
- ty = [ty, n]
- when /\[\]/
- ty.gsub!(/\s*\[\]/, "*")
- end
-
- case member
- when /\[(\d+)\]/
- ty = [ty, $1.to_i]
- member.gsub!(/\s*\[\d+\]/,"")
- when /\[\]/
- ty = ty + "*"
- member.gsub!(/\s*\[\]/, "")
- end
-
- mems.push(member)
- tys.push(parse_ctype(ty,tymap))
- }
- return tys, mems
- end
-
- def parse_signature(signature, tymap=nil)
- tymap ||= {}
- signature = signature.gsub(/\s+/, " ").strip
- case signature
- when /^([\d\w@\*_\s]+)\(([\d\w\*_\s\,\[\]]*)\)$/
- ret = $1
- (args = $2).strip!
- ret = ret.split(/\s+/)
- args = args.split(/\s*,\s*/)
- func = ret.pop
- if( func =~ /^\*/ )
- func.gsub!(/^\*+/,"")
- ret.push("*")
- end
- ret = ret.join(" ")
- return [func, parse_ctype(ret, tymap), args.collect{|arg| parse_ctype(arg, tymap)}]
- else
- raise(RuntimeError,"can't parse the function prototype: #{signature}")
- end
- end
-
- def parse_ctype(ty, tymap=nil)
- tymap ||= {}
- case ty
- when Array
- return [parse_ctype(ty[0], tymap), ty[1]]
- when "void"
- return TYPE_VOID
- when "char"
- return TYPE_CHAR
- when "unsigned char"
- return -TYPE_CHAR
- when "short"
- return TYPE_SHORT
- when "unsigned short"
- return -TYPE_SHORT
- when "int"
- return TYPE_INT
- when "unsigned int"
- return -TYPE_INT
- when "long"
- return TYPE_LONG
- when "unsigned long"
- return -TYPE_LONG
- when "long long"
- if( defined?(TYPE_LONG_LONG) )
- return TYPE_LONG_LONG
- else
- raise(RuntimeError, "unsupported type: #{ty}")
- end
- when "unsigned long long"
- if( defined?(TYPE_LONG_LONG) )
- return -TYPE_LONG_LONG
- else
- raise(RuntimeError, "unsupported type: #{ty}")
- end
- when "float"
- return TYPE_FLOAT
- when "double"
- return TYPE_DOUBLE
- when /\*/, /\[\s*\]/
- return TYPE_VOIDP
- else
- if( tymap[ty] )
- return parse_ctype(tymap[ty], tymap)
- else
- raise(DLError, "unknown type: #{ty}")
- end
- end
- end
- end
-end
diff --git a/ext/dl/lib/dl/func.rb b/ext/dl/lib/dl/func.rb
deleted file mode 100644
index 7a8b62e325..0000000000
--- a/ext/dl/lib/dl/func.rb
+++ /dev/null
@@ -1,151 +0,0 @@
-require 'dl'
-require 'dl/callback'
-require 'dl/stack'
-require 'dl/value'
-require 'thread'
-
-module DL
- class Function
- include DL
- include ValueUtil
-
- def initialize(cfunc, argtypes, &proc)
- @cfunc = cfunc
- @stack = Stack.new(argtypes.collect{|ty| ty.abs})
- if( @cfunc.ctype < 0 )
- @cfunc.ctype = @cfunc.ctype.abs
- @unsigned = true
- else
- @unsigned = false
- end
- if( proc )
- bind(&proc)
- end
- end
-
- def to_i()
- @cfunc.to_i
- end
-
- def name
- @cfunc.name
- end
-
- def call(*args, &block)
- funcs = []
- args = wrap_args(args, @stack.types, funcs, &block)
- r = @cfunc.call(@stack.pack(args))
- funcs.each{|f| f.unbind_at_call()}
- return wrap_result(r)
- end
-
- def wrap_result(r)
- case @cfunc.ctype
- when TYPE_VOIDP
- r = CPtr.new(r)
- else
- if( @unsigned )
- r = unsigned_value(r, @cfunc.ctype)
- end
- end
- r
- end
-
- def bind(&block)
- if( !block )
- raise(RuntimeError, "block must be given.")
- end
- if( @cfunc.ptr == 0 )
- cb = Proc.new{|*args|
- ary = @stack.unpack(args)
- @stack.types.each_with_index{|ty, idx|
- case ty
- when TYPE_VOIDP
- ary[idx] = CPtr.new(ary[idx])
- end
- }
- r = block.call(*ary)
- wrap_arg(r, @cfunc.ctype, [])
- }
- case @cfunc.calltype
- when :cdecl
- @cfunc.ptr = set_cdecl_callback(@cfunc.ctype, @stack.size, &cb)
- when :stdcall
- @cfunc.ptr = set_stdcall_callback(@cfunc.ctype, @stack.size, &cb)
- else
- raise(RuntimeError, "unsupported calltype: #{@cfunc.calltype}")
- end
- if( @cfunc.ptr == 0 )
- raise(RuntimeException, "can't bind C function.")
- end
- end
- end
-
- def unbind()
- if( @cfunc.ptr != 0 )
- case @cfunc.calltype
- when :cdecl
- remove_cdecl_callback(@cfunc.ptr, @cfunc.ctype)
- when :stdcall
- remove_stdcall_callback(@cfunc.ptr, @cfunc.ctype)
- else
- raise(RuntimeError, "unsupported calltype: #{@cfunc.calltype}")
- end
- @cfunc.ptr = 0
- end
- end
-
- def bound?()
- @cfunc.ptr != 0
- end
-
- def bind_at_call(&block)
- bind(&block)
- end
-
- def unbind_at_call()
- end
- end
-
- class TempFunction < Function
- def bind_at_call(&block)
- bind(&block)
- end
-
- def unbind_at_call()
- unbind()
- end
- end
-
- class CarriedFunction < Function
- def initialize(cfunc, argtypes, n)
- super(cfunc, argtypes)
- @carrier = []
- @index = n
- @mutex = Mutex.new
- end
-
- def create_carrier(data)
- ary = []
- userdata = [ary, data]
- @mutex.lock()
- @carrier.push(userdata)
- return dlwrap(userdata)
- end
-
- def bind_at_call(&block)
- userdata = @carrier[-1]
- userdata[0].push(block)
- bind{|*args|
- ptr = args[@index]
- if( !ptr )
- raise(RuntimeError, "The index of userdata should be lower than #{args.size}.")
- end
- userdata = dlunwrap(Integer(ptr))
- args[@index] = userdata[1]
- userdata[0][0].call(*args)
- }
- @mutex.unlock()
- end
- end
-end
diff --git a/ext/dl/lib/dl/import.rb b/ext/dl/lib/dl/import.rb
index 199354c18e..01ee2490e8 100644
--- a/ext/dl/lib/dl/import.rb
+++ b/ext/dl/lib/dl/import.rb
@@ -1,227 +1,225 @@
+# -*- ruby -*-
+
require 'dl'
-require 'dl/func.rb'
-require 'dl/struct.rb'
-require 'dl/cparser.rb'
+require 'dl/types'
module DL
- class CompositeHandler
- def initialize(handlers)
- @handlers = handlers
- end
-
- def handlers()
- @handlers
- end
-
- def sym(symbol)
- @handlers.each{|handle|
- if( handle )
- begin
- addr = handle.sym(symbol)
- return addr
- rescue DLError
- end
- end
- }
- return nil
- end
-
- def [](symbol)
- sym(symbol)
- end
- end
-
- module Importer
- include DL
- include CParser
- extend Importer
-
- def dlload(*libs)
- handles = libs.collect{|lib|
- case lib
- when nil
- nil
- when Handle
- lib
- when Importer
- lib.handlers
- else
- begin
- DL.dlopen(lib)
- rescue DLError
- raise(DLError, "can't load #{lib}")
- end
- end
- }.flatten()
- @handler = CompositeHandler.new(handles)
- @func_map = {}
- @type_alias = {}
- end
-
- def typealias(alias_type, orig_type)
- @type_alias[alias_type] = orig_type
- end
-
- def sizeof(ty)
- case ty
- when String
- ty = parse_ctype(ty, @type_alias).abs()
- case ty
- when TYPE_CHAR
- return SIZEOF_CHAR
- when TYPE_SHORT
- return SIZEOF_SHORT
- when TYPE_INT
- return SIZEOF_INT
- when TYPE_LONG
- return SIZEOF_LONG
- when TYPE_LONG_LONG
- return SIZEOF_LONG_LON
- when TYPE_FLOAT
- return SIZEOF_FLOAT
- when TYPE_DOUBLE
- return SIZEOF_DOUBLE
- when TYPE_VOIDP
- return SIZEOF_VOIDP
- else
- raise(DLError, "unknown type: #{ty}")
- end
- when Class
- if( ty.instance_methods().include?(:to_ptr) )
- return ty.size()
- end
+ module Importable
+ LIB_MAP = {}
+
+ module Internal
+ def init_types()
+ @types ||= ::DL::Types.new
end
- return CPtr[ty].size()
- end
-
- def parse_bind_options(opts)
- h = {}
- prekey = nil
- while( opt = opts.shift() )
- case opt
- when :stdcall, :cdecl
- h[:call_type] = opt
- when :carried, :temp, :temporal, :bind
- h[:callback_type] = opt
- h[:carrier] = opts.shift()
- else
- h[opt] = true
- end
+
+ def init_sym()
+ @SYM ||= {}
+ end
+
+ def [](name)
+ return @SYM[name.to_s][0]
+ end
+
+ def dlload(*libnames)
+ if( !defined?(@LIBS) )
+ @LIBS = []
+ end
+ libnames.each{|libname|
+ if( !LIB_MAP[libname] )
+ LIB_MAP[libname] = DL.dlopen(libname)
+ end
+ @LIBS.push(LIB_MAP[libname])
+ }
end
- h
- end
- private :parse_bind_options
-
- def extern(signature, *opts)
- symname, ctype, argtype = parse_signature(signature, @type_alias)
- opt = parse_bind_options(opts)
- f = import_function(symname, ctype, argtype, opt[:call_type])
- name = symname.gsub(/@.+/,'')
- @func_map[name] = f
- # define_method(name){|*args,&block| f.call(*args,&block)}
- begin
- /^(.+?):(\d+)/ =~ caller.first
- file, line = $1, $2.to_i
- rescue
- file, line = __FILE__, __LINE__+3
+ alias dllink :dlload
+
+ def parse_cproto(proto)
+ proto = proto.gsub(/\s+/, " ").strip
+ case proto
+ when /^([\d\w\*_\s]+)\(([\d\w\*_\s\,\[\]]*)\)$/
+ ret = $1
+ args = $2.strip()
+ ret = ret.split(/\s+/)
+ args = args.split(/\s*,\s*/)
+ func = ret.pop()
+ if( func =~ /^\*/ )
+ func.gsub!(/^\*+/,"")
+ ret.push("*")
+ end
+ ret = ret.join(" ")
+ return [func, ret, args]
+ else
+ raise(RuntimeError,"can't parse the function prototype: #{proto}")
+ end
end
- module_eval(<<-EOS, file, line)
- def #{name}(*args, &block)
- @func_map['#{name}'].call(*args,&block)
+
+ # example:
+ # extern "int strlen(char*)"
+ #
+ def extern(proto)
+ func,ret,args = parse_cproto(proto)
+ return import(func, ret, args)
+ end
+
+ # example:
+ # callback "int method_name(int, char*)"
+ #
+ def callback(proto)
+ func,ret,args = parse_cproto(proto)
+
+ init_types()
+ init_sym()
+
+ rty,renc,rdec = @types.encode_return_type(ret)
+ if( !rty )
+ raise(TypeError, "unsupported type: #{ret}")
end
- EOS
- module_function(name)
- f
- end
-
- def bind(signature, *opts, &blk)
- name, ctype, argtype = parse_signature(signature, @type_alias)
- h = parse_bind_options(opts)
- case h[:callback_type]
- when :bind, nil
- f = bind_function(name, ctype, argtype, h[:call_type], &blk)
- when :temp, :temporal
- f = create_temp_function(name, ctype, argtype, h[:call_type])
- when :carried
- f = create_carried_function(name, ctype, argtype, h[:call_type], h[:carrier])
- else
- raise(RuntimeError, "unknown callback type: #{h[:callback_type]}")
+ ty,enc,dec = encode_argument_types(args)
+ symty = rty + ty
+
+ module_eval("module_function :#{func}")
+ sym = module_eval([
+ "DL::callback(\"#{symty}\"){|*args|",
+ " sym,rdec,enc,dec = @SYM['#{func}']",
+ " args = enc.call(args) if enc",
+ " r,rs = #{func}(*args)",
+ " r = renc.call(r) if rdec",
+ " rs = dec.call(rs) if (dec && rs)",
+ " @retval = r",
+ " @args = rs",
+ " r",
+ "}",
+ ].join("\n"))
+
+ @SYM[func] = [sym,rdec,enc,dec]
+
+ return sym
+ end
+
+ # example:
+ # typealias("uint", "unsigned int")
+ #
+ def typealias(alias_type, ty1, enc1=nil, dec1=nil, ty2=nil, enc2=nil, dec2=nil)
+ init_types()
+ @types.typealias(alias_type, ty1, enc1, dec1,
+ ty2||ty1, enc2, dec2)
end
- @func_map[name] = f
- #define_method(name){|*args,&block| f.call(*args,&block)}
- begin
- /^(.+?):(\d+)/ =~ caller.first
- file, line = $1, $2.to_i
- rescue
- file, line = __FILE__, __LINE__+3
+
+ # example:
+ # symbol "foo_value"
+ # symbol "foo_func", "IIP"
+ #
+ def symbol(name, ty = nil)
+ sym = nil
+ @LIBS.each{|lib|
+ begin
+ if( ty )
+ sym = lib[name, ty]
+ else
+ sym = lib[name]
+ end
+ rescue
+ next
+ end
+ }
+ if( !sym )
+ raise(RuntimeError, "can't find the symbol `#{name}'")
+ end
+ return sym
end
- module_eval(<<-EOS, file, line)
- def #{name}(*args,&block)
- @func_map['#{name}'].call(*args,&block)
+
+ # example:
+ # import("get_length", "int", ["void*", "int"])
+ #
+ def import(name, rettype, argtypes = nil)
+ init_types()
+ init_sym()
+
+ rty,_,rdec = @types.encode_return_type(rettype)
+ if( !rty )
+ raise(TypeError, "unsupported type: #{rettype}")
end
- EOS
- module_function(name)
- f
- end
-
- def struct(signature)
- tys, mems = parse_struct_signature(signature, @type_alias)
- DL::CStructBuilder.create(CStruct, tys, mems)
- end
-
- def union(signature)
- tys, mems = parse_struct_signature(signature, @type_alias)
- DL::CStructBuilder.create(CUnion, tys, mems)
- end
-
- def [](name)
- @func_map[name]
- end
-
- def create_value(ty, val=nil)
- s = struct([ty + " value"])
- ptr = s.malloc()
- if( val )
- ptr.value = val
+ ty,enc,dec = encode_argument_types(argtypes)
+ symty = rty + ty
+
+ sym = symbol(name, symty)
+
+ mname = name.dup
+ if( ?A <= mname[0] && mname[0] <= ?Z )
+ mname[0,1] = mname[0,1].downcase
+ end
+ @SYM[mname] = [sym,rdec,enc,dec]
+
+ module_eval [
+ "def #{mname}(*args)",
+ " sym,rdec,enc,dec = @SYM['#{mname}']",
+ " args = enc.call(args) if enc",
+ if( $DEBUG )
+ " p \"[DL] call #{mname} with \#{args.inspect}\""
+ else
+ ""
+ end,
+ " r,rs = sym.call(*args)",
+ if( $DEBUG )
+ " p \"[DL] retval=\#{r.inspect} args=\#{rs.inspect}\""
+ else
+ ""
+ end,
+ " r = rdec.call(r) if rdec",
+ " rs = dec.call(rs) if dec",
+ " @retval = r",
+ " @args = rs",
+ " return r",
+ "end",
+ "module_function :#{mname}",
+ ].join("\n")
+
+ return sym
end
- return ptr
- end
- alias value create_value
-
- def import_value(ty, addr)
- s = struct([ty + " value"])
- ptr = s.new(addr)
- return ptr
- end
-
- def import_symbol(name)
- addr = @handler.sym(name)
- if( !addr )
- raise(DLError, "cannot find the symbol: #{name}")
+
+ def _args_
+ return @args
end
- CPtr.new(addr)
- end
- def import_function(name, ctype, argtype, call_type = nil)
- addr = @handler.sym(name)
- if( !addr )
- raise(DLError, "cannot find the function: #{name}()")
+ def _retval_
+ return @retval
+ end
+
+ def encode_argument_types(tys)
+ init_types()
+ encty = []
+ enc = nil
+ dec = nil
+ tys.each_with_index{|ty,idx|
+ ty,c1,c2 = @types.encode_argument_type(ty)
+ if( !ty )
+ raise(TypeError, "unsupported type: #{ty}")
+ end
+ encty.push(ty)
+ if( enc )
+ if( c1 )
+ conv1 = enc
+ enc = proc{|v| v = conv1.call(v); v[idx] = c1.call(v[idx]); v}
+ end
+ else
+ if( c1 )
+ enc = proc{|v| v[idx] = c1.call(v[idx]); v}
+ end
+ end
+ if( dec )
+ if( c2 )
+ conv2 = dec
+ dec = proc{|v| v = conv2.call(v); v[idx] = c2.call(v[idx]); v}
+ end
+ else
+ if( c2 )
+ dec = proc{|v| v[idx] = c2.call(v[idx]); v}
+ end
+ end
+ }
+ return [encty.join, enc, dec]
end
- Function.new(CFunc.new(addr, ctype, name, call_type || :cdecl), argtype)
- end
-
- def bind_function(name, ctype, argtype, call_type = nil, &block)
- f = Function.new(CFunc.new(0, ctype, name, call_type || :cdecl), argtype)
- f.bind(&block)
- f
- end
-
- def create_temp_function(name, ctype, argtype, call_type = nil)
- TempFunction.new(CFunc.new(0, ctype, name, call_type || :cdecl), argtype)
- end
-
- def create_carried_function(name, ctype, argtype, call_type = nil, n = 0)
- CarriedFunction.new(CFunc.new(0, ctype, name, call_type || :cdecl), argtype, n)
- end
- end
+ end # end of Internal
+ include Internal
+ end # end of Importable
end
diff --git a/ext/dl/lib/dl/pack.rb b/ext/dl/lib/dl/pack.rb
deleted file mode 100644
index d760edaab5..0000000000
--- a/ext/dl/lib/dl/pack.rb
+++ /dev/null
@@ -1,128 +0,0 @@
-require 'dl'
-
-module DL
- module PackInfo
- ALIGN_MAP = {
- TYPE_VOIDP => ALIGN_VOIDP,
- TYPE_CHAR => ALIGN_CHAR,
- TYPE_SHORT => ALIGN_SHORT,
- TYPE_INT => ALIGN_INT,
- TYPE_LONG => ALIGN_LONG,
- TYPE_FLOAT => ALIGN_FLOAT,
- TYPE_DOUBLE => ALIGN_DOUBLE,
- -TYPE_CHAR => ALIGN_CHAR,
- -TYPE_SHORT => ALIGN_SHORT,
- -TYPE_INT => ALIGN_INT,
- -TYPE_LONG => ALIGN_LONG,
- }
-
- PACK_MAP = {
- TYPE_VOIDP => ((SIZEOF_VOIDP == SIZEOF_LONG_LONG) ? "q" : "l!"),
- TYPE_CHAR => "c",
- TYPE_SHORT => "s!",
- TYPE_INT => "i!",
- TYPE_LONG => "l!",
- TYPE_FLOAT => "f",
- TYPE_DOUBLE => "d",
- -TYPE_CHAR => "c",
- -TYPE_SHORT => "s!",
- -TYPE_INT => "i!",
- -TYPE_LONG => "l!",
- }
-
- SIZE_MAP = {
- TYPE_VOIDP => SIZEOF_VOIDP,
- TYPE_CHAR => SIZEOF_CHAR,
- TYPE_SHORT => SIZEOF_SHORT,
- TYPE_INT => SIZEOF_INT,
- TYPE_LONG => SIZEOF_LONG,
- TYPE_FLOAT => SIZEOF_FLOAT,
- TYPE_DOUBLE => SIZEOF_DOUBLE,
- -TYPE_CHAR => SIZEOF_CHAR,
- -TYPE_SHORT => SIZEOF_SHORT,
- -TYPE_INT => SIZEOF_INT,
- -TYPE_LONG => SIZEOF_LONG,
- }
- if defined?(TYPE_LONG_LONG)
- ALIGN_MAP[TYPE_LONG_LONG] = ALIGN_MAP[-TYPE_LONG_LONG] = ALIGN_LONG_LONG
- PACK_MAP[TYPE_LONG_LONG] = PACK_MAP[-TYPE_LONG_LONG] = "q"
- SIZE_MAP[TYPE_LONG_LONG] = SIZE_MAP[-TYPE_LONG_LONG] = SIZEOF_LONG_LONG
- end
-
- def align(addr, align)
- d = addr % align
- if( d == 0 )
- addr
- else
- addr + (align - d)
- end
- end
- module_function :align
- end
-
- class Packer
- include PackInfo
-
- def self.[](*types)
- new(types)
- end
-
- def initialize(types)
- parse_types(types)
- end
-
- def size()
- @size
- end
-
- def pack(ary)
- case SIZEOF_VOIDP
- when SIZEOF_LONG
- ary.pack(@template)
- when SIZEOF_LONG
- ary.pack(@template)
- else
- raise(RuntimeError, "sizeof(void*)?")
- end
- end
-
- def unpack(ary)
- case SIZEOF_VOIDP
- when SIZEOF_LONG
- ary.join().unpack(@template)
- when SIZEOF_LONG_LONG
- ary.join().unpack(@template)
- else
- raise(RuntimeError, "sizeof(void*)?")
- end
- end
-
- private
-
- def parse_types(types)
- @template = ""
- addr = 0
- types.each{|t|
- orig_addr = addr
- if( t.is_a?(Array) )
- addr = align(orig_addr, ALIGN_MAP[TYPE_VOIDP])
- else
- addr = align(orig_addr, ALIGN_MAP[t])
- end
- d = addr - orig_addr
- if( d > 0 )
- @template << "x#{d}"
- end
- if( t.is_a?(Array) )
- @template << (PACK_MAP[t[0]] * t[1])
- addr += (SIZE_MAP[t[0]] * t[1])
- else
- @template << PACK_MAP[t]
- addr += SIZE_MAP[t]
- end
- }
- addr = align(addr, ALIGN_MAP[TYPE_VOIDP])
- @size = addr
- end
- end
-end
diff --git a/ext/dl/lib/dl/stack.rb b/ext/dl/lib/dl/stack.rb
deleted file mode 100644
index dc22378fcb..0000000000
--- a/ext/dl/lib/dl/stack.rb
+++ /dev/null
@@ -1,116 +0,0 @@
-require 'dl'
-
-module DL
- class Stack
- def self.[](*types)
- new(types)
- end
-
- def initialize(types)
- parse_types(types)
- end
-
- def size()
- @size
- end
-
- def types()
- @types
- end
-
- def pack(ary)
- case SIZEOF_VOIDP
- when SIZEOF_LONG
- ary.pack(@template).unpack('l!*')
- when SIZEOF_LONG_LONG
- ary.pack(@template).unpack('q*')
- else
- raise(RuntimeError, "sizeof(void*)?")
- end
- end
-
- def unpack(ary)
- case SIZEOF_VOIDP
- when SIZEOF_LONG
- ary.pack('l!*').unpack(@template)
- when SIZEOF_LONG_LONG
- ary.pack('q*').unpack(@template)
- else
- raise(RuntimeError, "sizeof(void*)?")
- end
- end
-
- private
-
- def align(addr, align)
- d = addr % align
- if( d == 0 )
- addr
- else
- addr + (align - d)
- end
- end
-
- ALIGN_MAP = {
- TYPE_VOIDP => ALIGN_VOIDP,
- TYPE_CHAR => ALIGN_VOIDP,
- TYPE_SHORT => ALIGN_VOIDP,
- TYPE_INT => ALIGN_VOIDP,
- TYPE_LONG => ALIGN_VOIDP,
- TYPE_FLOAT => ALIGN_FLOAT,
- TYPE_DOUBLE => ALIGN_DOUBLE,
- }
-
- PACK_MAP = {
- TYPE_VOIDP => ((SIZEOF_VOIDP == SIZEOF_LONG_LONG)? "q" : "l!"),
- TYPE_CHAR => "c",
- TYPE_SHORT => "s!",
- TYPE_INT => "i!",
- TYPE_LONG => "l!",
- TYPE_FLOAT => "f",
- TYPE_DOUBLE => "d",
- }
-
- SIZE_MAP = {
- TYPE_VOIDP => SIZEOF_VOIDP,
- TYPE_CHAR => SIZEOF_CHAR,
- TYPE_SHORT => SIZEOF_SHORT,
- TYPE_INT => SIZEOF_INT,
- TYPE_LONG => SIZEOF_LONG,
- TYPE_FLOAT => SIZEOF_FLOAT,
- TYPE_DOUBLE => SIZEOF_DOUBLE,
- }
- if defined?(TYPE_LONG_LONG)
- ALIGN_MAP[TYPE_LONG_LONG] = ALIGN_LONG_LONG
- PACK_MAP[TYPE_LONG_LONG] = "q"
- SIZE_MAP[TYPE_LONG_LONG] = SIZEOF_LONG_LONG
- end
-
- def parse_types(types)
- @types = types
- @template = ""
- addr = 0
- types.each{|t|
- addr = add_padding(addr, ALIGN_MAP[t])
- @template << PACK_MAP[t]
- addr += SIZE_MAP[t]
- }
- addr = add_padding(addr, ALIGN_MAP[SIZEOF_VOIDP])
- if( addr % SIZEOF_VOIDP == 0 )
- @size = addr / SIZEOF_VOIDP
- else
- @size = (addr / SIZEOF_VOIDP) + 1
- end
- end
-
- def add_padding(addr, align)
- orig_addr = addr
- addr = align(orig_addr, align)
- d = addr - orig_addr
- if( d > 0 )
- @template << "x#{d}"
- end
- addr
- end
- end
-end
diff --git a/ext/dl/lib/dl/struct.rb b/ext/dl/lib/dl/struct.rb
index dc116f3be5..33f303fe22 100644
--- a/ext/dl/lib/dl/struct.rb
+++ b/ext/dl/lib/dl/struct.rb
@@ -1,213 +1,149 @@
+# -*- ruby -*-
+
require 'dl'
-require 'dl/pack.rb'
+require 'dl/import'
module DL
- class CStruct
- def CStruct.entity_class()
- CStructEntity
- end
- end
-
- class CUnion
- def CUnion.entity_class()
- CUnionEntity
- end
- end
-
- module CStructBuilder
- def create(klass, types, members)
- new_class = Class.new(klass){
- define_method(:initialize){|addr|
- @entity = klass.entity_class.new(addr, types)
- @entity.assign_names(members)
- }
- define_method(:to_ptr){ @entity }
- define_method(:to_i){ @entity.to_i }
- members.each{|name|
- define_method(name){ @entity[name] }
- define_method(name + "="){|val| @entity[name] = val }
- }
- }
- size = klass.entity_class.size(types)
- new_class.module_eval(<<-EOS, __FILE__, __LINE__+1)
- def new_class.size()
- #{size}
- end
- def new_class.malloc()
- addr = DL.malloc(#{size})
- new(addr)
- end
- EOS
- return new_class
- end
- module_function :create
- end
-
- class CStructEntity < CPtr
- include PackInfo
- include ValueUtil
-
- def CStructEntity.malloc(types, func = nil)
- addr = DL.malloc(CStructEntity.size(types))
- CStructEntity.new(addr, types, func)
- end
-
- def CStructEntity.size(types)
- offset = 0
- max_align = 0
- types.each_with_index{|t,i|
- orig_offset = offset
- if( t.is_a?(Array) )
- align = PackInfo::ALIGN_MAP[t[0]]
- offset = PackInfo.align(orig_offset, align)
- size = offset - orig_offset
- offset += (PackInfo::SIZE_MAP[t[0]] * t[1])
- else
- align = PackInfo::ALIGN_MAP[t]
- offset = PackInfo.align(orig_offset, align)
- size = offset - orig_offset
- offset += PackInfo::SIZE_MAP[t]
- end
- if (max_align < align)
- max_align = align
- end
- }
- offset = PackInfo.align(offset, max_align)
- offset
- end
-
- def initialize(addr, types, func = nil)
- set_ctypes(types)
- super(addr, @size, func)
- end
-
- def assign_names(members)
- @members = members
- end
-
- def set_ctypes(types)
- @ctypes = types
- @offset = []
- offset = 0
- max_align = 0
- types.each_with_index{|t,i|
- orig_offset = offset
- if( t.is_a?(Array) )
- align = ALIGN_MAP[t[0]]
- else
- align = ALIGN_MAP[t]
- end
- offset = PackInfo.align(orig_offset, align)
- size = offset - orig_offset
- @offset[i] = offset
- if( t.is_a?(Array) )
- offset += (SIZE_MAP[t[0]] * t[1])
- else
- offset += SIZE_MAP[t]
- end
- if (max_align < align)
- max_align = align
- end
- }
- offset = PackInfo.align(offset, max_align)
- @size = offset
- end
-
- def [](name)
- idx = @members.index(name)
- if( idx.nil? )
- raise(ArgumentError, "no such member: #{name}")
+ module Importable
+ module Internal
+ def define_struct(contents)
+ init_types()
+ Struct.new(@types, contents)
end
- ty = @ctypes[idx]
- if( ty.is_a?(Array) )
- r = super(@offset[idx], SIZE_MAP[ty[0]] * ty[1])
- else
- r = super(@offset[idx], SIZE_MAP[ty.abs])
- end
- packer = Packer.new([ty])
- val = packer.unpack([r])
- case ty
- when Array
- case ty[0]
- when TYPE_VOIDP
- val = val.collect{|v| CPtr.new(v)}
- end
- when TYPE_VOIDP
- val = CPtr.new(val[0])
- else
- val = val[0]
- end
- if( ty.is_a?(Integer) && (ty < 0) )
- return unsigned_value(val, ty)
- elsif( ty.is_a?(Array) && (ty[0] < 0) )
- return val.collect{|v| unsigned_value(v,ty[0])}
- else
- return val
- end
- end
+ alias struct define_struct
- def []=(name, val)
- idx = @members.index(name)
- if( idx.nil? )
- raise(ArgumentError, "no such member: #{name}")
+ def define_union(contents)
+ init_types()
+ Union.new(@types, contents)
end
- ty = @ctypes[idx]
- packer = Packer.new([ty])
- val = wrap_arg(val, ty, [])
- buff = packer.pack([val].flatten())
- super(@offset[idx], buff.size, buff)
- if( ty.is_a?(Integer) && (ty < 0) )
- return unsigned_value(val, ty)
- elsif( ty.is_a?(Array) && (ty[0] < 0) )
- return val.collect{|v| unsigned_value(v,ty[0])}
- else
- return val
+ alias union define_union
+
+ class Memory
+ def initialize(ptr, names, ty, len, enc, dec)
+ @ptr = ptr
+ @names = names
+ @ty = ty
+ @len = len
+ @enc = enc
+ @dec = dec
+
+ # define methods
+ @names.each{|name|
+ instance_eval [
+ "def #{name}",
+ " v = @ptr[\"#{name}\"]",
+ " if( @len[\"#{name}\"] )",
+ " v = v.collect{|x| @dec[\"#{name}\"] ? @dec[\"#{name}\"].call(x) : x }",
+ " else",
+ " v = @dec[\"#{name}\"].call(v) if @dec[\"#{name}\"]",
+ " end",
+ " return v",
+ "end",
+ "def #{name}=(v)",
+ " if( @len[\"#{name}\"] )",
+ " v = v.collect{|x| @enc[\"#{name}\"] ? @enc[\"#{name}\"].call(x) : x }",
+ " else",
+ " v = @enc[\"#{name}\"].call(v) if @enc[\"#{name}\"]",
+ " end",
+ " @ptr[\"#{name}\"] = v",
+ " return v",
+ "end",
+ ].join("\n")
+ }
+ end
+
+ def to_ptr
+ return @ptr
+ end
+
+ def size
+ return @ptr.size
+ end
end
- end
-
- def to_s()
- super(@size)
- end
- end
-
- class CUnionEntity < CStructEntity
- include PackInfo
-
- def CUnionEntity.malloc(types, func=nil)
- addr = DL.malloc(CUnionEntity.size(types))
- CUnionEntity.new(addr, types, func)
- end
-
- def CUnionEntity.size(types)
- size = 0
- types.each_with_index{|t,i|
- if( t.is_a?(Array) )
- tsize = PackInfo::SIZE_MAP[t[0]] * t[1]
- else
- tsize = PackInfo::SIZE_MAP[t]
- end
- if( tsize > size )
- size = tsize
- end
- }
- end
-
- def set_ctypes(types)
- @ctypes = types
- @offset = []
- @size = 0
- types.each_with_index{|t,i|
- @offset[i] = 0
- if( t.is_a?(Array) )
- size = SIZE_MAP[t[0]] * t[1]
- else
- size = SIZE_MAP[t]
- end
- if( size > @size )
- @size = size
- end
- }
- end
- end
-end
+ class Struct
+ def initialize(types, contents)
+ @names = []
+ @ty = {}
+ @len = {}
+ @enc = {}
+ @dec = {}
+ @size = 0
+ @tys = ""
+ @types = types
+ parse(contents)
+ end
+
+ def size
+ return @size
+ end
+
+ def members
+ return @names
+ end
+
+ # ptr must be a PtrData object.
+ def new(ptr)
+ ptr.struct!(@tys, *@names)
+ mem = Memory.new(ptr, @names, @ty, @len, @enc, @dec)
+ return mem
+ end
+
+ def malloc(size = nil)
+ if( !size )
+ size = @size
+ end
+ ptr = DL::malloc(size)
+ return new(ptr)
+ end
+
+ def parse(contents)
+ contents.each{|elem|
+ name,ty,num,enc,dec = parse_elem(elem)
+ @names.push(name)
+ @ty[name] = ty
+ @len[name] = num
+ @enc[name] = enc
+ @dec[name] = dec
+ if( num )
+ @tys += "#{ty}#{num}"
+ else
+ @tys += ty
+ end
+ }
+ @size = DL.sizeof(@tys)
+ end
+
+ def parse_elem(elem)
+ elem.strip!
+ case elem
+ when /^([\w\d_\*]+)([\*\s]+)([\w\d_]+)$/
+ ty = ($1 + $2).strip
+ name = $3
+ num = nil;
+ when /^([\w\d_\*]+)([\*\s]+)([\w\d_]+)\[(\d+)\]$/
+ ty = ($1 + $2).strip
+ name = $3
+ num = $4.to_i
+ else
+ raise(RuntimeError, "invalid element: #{elem}")
+ end
+ ty,enc,dec = @types.encode_struct_type(ty)
+ if( !ty )
+ raise(TypeError, "unsupported type: #{ty}")
+ end
+ return [name,ty,num,enc,dec]
+ end
+ end # class Struct
+
+ class Union < Struct
+ def new
+ ptr = DL::malloc(@size)
+ ptr.union!(@tys, *@names)
+ mem = Memory.new(ptr, @names, @ty, @len, @enc, @dec)
+ return mem
+ end
+ end
+ end # module Internal
+ end # module Importable
+end # module DL
diff --git a/ext/dl/lib/dl/types.rb b/ext/dl/lib/dl/types.rb
index b85ac890cd..1144917dae 100644
--- a/ext/dl/lib/dl/types.rb
+++ b/ext/dl/lib/dl/types.rb
@@ -1,40 +1,245 @@
+# -*- ruby -*-
+
+require 'dl'
+
module DL
- module Win32Types
- def included(m)
- m.module_eval{
- typealias "DWORD", "unsigned long"
- typealias "PDWORD", "unsigned long *"
- typealias "WORD", "unsigned short"
- typealias "PWORD", "unsigned short *"
- typealias "BOOL", "int"
- typealias "ATOM", "int"
- typealias "BYTE", "unsigned char"
- typealias "PBYTE", "unsigned char *"
- typealias "UINT", "unsigned int"
- typealias "ULONG", "unsigned long"
- typealias "UCHAR", "unsigned char"
- typealias "HANDLE", "unsigned long"
- typealias "PHANDLE", "void*"
- typealias "PVOID", "void*"
- typealias "LPCSTR", "char*"
- typealias "LPSTR", "char*"
- typealias "HINSTANCE", "unsigned int"
- typealias "HDC", "unsigned int"
- typealias "HWND", "unsigned int"
+ class Types
+ TYPES = [
+ # FORMAT:
+ # ["alias name",
+ # "type name", encoding_method, decoding_method, for function prototypes
+ # "type name", encoding_method, decoding_method] for structures (not implemented)
+
+ # for Windows
+ ["DWORD", "unsigned long", nil, nil,
+ "unsigned long", nil, nil],
+ ["PDWORD", "unsigned long *", nil, nil,
+ "unsigned long *", nil, nil],
+ ["WORD", "unsigned short", nil, nil,
+ "unsigned short", nil, nil],
+ ["PWORD", "unsigned int *", nil, nil,
+ "unsigned int *", nil, nil],
+ ["BYTE", "unsigned char", nil, nil,
+ "unsigned char", nil, nil],
+ ["PBYTE", "unsigned char *", nil, nil,
+ "unsigned char *", nil, nil],
+ ["BOOL", "ibool", nil, nil,
+ "ibool", nil, nil],
+ ["ATOM", "int", nil, nil,
+ "int", nil, nil],
+ ["BYTE", "unsigned char", nil, nil,
+ "unsigned char", nil, nil],
+ ["PBYTE", "unsigned char *", nil, nil,
+ "unsigned char *", nil, nil],
+ ["UINT", "unsigned int", nil, nil,
+ "unsigned int", nil, nil],
+ ["ULONG", "unsigned long", nil, nil,
+ "unsigned long", nil, nil],
+ ["UCHAR", "unsigned char", nil, nil,
+ "unsigned char", nil, nil],
+ ["HANDLE", "unsigned long", nil, nil,
+ "unsigned long", nil, nil],
+ ["PHANDLE","void*", nil, nil,
+ "void*", nil, nil],
+ ["PVOID", "void*", nil, nil,
+ "void*", nil, nil],
+ ["LPCSTR", "char*", nil, nil,
+ "char*", nil, nil],
+ ["HDC", "unsigned int", nil, nil,
+ "unsigned int", nil, nil],
+ ["HWND", "unsigned int", nil, nil,
+ "unsigned int", nil, nil],
+
+ # Others
+ ["uint", "unsigned int", nil, nil,
+ "unsigned int", nil, nil],
+ ["u_int", "unsigned int", nil, nil,
+ "unsigned int", nil, nil],
+ ["ulong", "unsigned long", nil, nil,
+ "unsigned long", nil, nil],
+ ["u_long", "unsigned long", nil, nil,
+ "unsigned long", nil, nil],
+
+ # DL::Importable primitive types
+ ["ibool",
+ "I",
+ proc{|v| v ? 1 : 0},
+ proc{|v| (v != 0) ? true : false},
+ "I",
+ proc{|v| v ? 1 : 0 },
+ proc{|v| (v != 0) ? true : false} ],
+ ["cbool",
+ "C",
+ proc{|v| v ? 1 : 0},
+ proc{|v| (v != 0) ? true : false},
+ "C",
+ proc{|v,len| v ? 1 : 0},
+ proc{|v,len| (v != 0) ? true : false}],
+ ["lbool",
+ "L",
+ proc{|v| v ? 1 : 0},
+ proc{|v| (v != 0) ? true : false},
+ "L",
+ proc{|v,len| v ? 1 : 0},
+ proc{|v,len| (v != 0) ? true : false}],
+ ["unsigned char",
+ "C",
+ proc{|v| [v].pack("C").unpack("c")[0]},
+ proc{|v| [v].pack("c").unpack("C")[0]},
+ "C",
+ proc{|v| [v].pack("C").unpack("c")[0]},
+ proc{|v| [v].pack("c").unpack("C")[0]}],
+ ["unsigned short",
+ "H",
+ proc{|v| [v].pack("S").unpack("s")[0]},
+ proc{|v| [v].pack("s").unpack("S")[0]},
+ "H",
+ proc{|v| [v].pack("S").unpack("s")[0]},
+ proc{|v| [v].pack("s").unpack("S")[0]}],
+ ["unsigned int",
+ "I",
+ proc{|v| [v].pack("I").unpack("i")[0]},
+ proc{|v| [v].pack("i").unpack("I")[0]},
+ "I",
+ proc{|v| [v].pack("I").unpack("i")[0]},
+ proc{|v| [v].pack("i").unpack("I")[0]}],
+ ["unsigned long",
+ "L",
+ proc{|v| [v].pack("L").unpack("l")[0]},
+ proc{|v| [v].pack("l").unpack("L")[0]},
+ "L",
+ proc{|v| [v].pack("L").unpack("l")[0]},
+ proc{|v| [v].pack("l").unpack("L")[0]}],
+ ["unsigned char ref",
+ "c",
+ proc{|v| [v].pack("C").unpack("c")[0]},
+ proc{|v| [v].pack("c").unpack("C")[0]},
+ nil, nil, nil],
+ ["unsigned int ref",
+ "i",
+ proc{|v| [v].pack("I").unpack("i")[0]},
+ proc{|v| [v].pack("i").unpack("I")[0]},
+ nil, nil, nil],
+ ["unsigned long ref",
+ "l",
+ proc{|v| [v].pack("L").unpack("l")[0]},
+ proc{|v| [v].pack("l").unpack("L")[0]},
+ nil, nil, nil],
+ ["char ref", "c", nil, nil,
+ nil, nil, nil],
+ ["short ref", "h", nil, nil,
+ nil, nil, nil],
+ ["int ref", "i", nil, nil,
+ nil, nil, nil],
+ ["long ref", "l", nil, nil,
+ nil, nil, nil],
+ ["float ref", "f", nil, nil,
+ nil, nil, nil],
+ ["double ref","d", nil, nil,
+ nil, nil, nil],
+ ["char", "C", nil, nil,
+ "C", nil, nil],
+ ["short", "H", nil, nil,
+ "H", nil, nil],
+ ["int", "I", nil, nil,
+ "I", nil, nil],
+ ["long", "L", nil, nil,
+ "L", nil, nil],
+ ["float", "F", nil, nil,
+ "F", nil, nil],
+ ["double", "D", nil, nil,
+ "D", nil, nil],
+ [/^char\s*\*$/,"s",nil, nil,
+ "S",nil, nil],
+ [/^const char\s*\*$/,"S",nil, nil,
+ "S",nil, nil],
+ [/^.+\*$/, "P", nil, nil,
+ "P", nil, nil],
+ [/^.+\[\]$/, "a", nil, nil,
+ "a", nil, nil],
+ ["void", "0", nil, nil,
+ nil, nil, nil],
+ ]
+
+ def initialize
+ init_types()
+ end
+
+ def typealias(ty1, ty2, enc=nil, dec=nil, ty3=nil, senc=nil, sdec=nil)
+ @TYDEFS.unshift([ty1, ty2, enc, dec, ty3, senc, sdec])
+ end
+
+ def init_types
+ @TYDEFS = TYPES.dup
+ end
+
+ def encode_argument_type(alias_type)
+ proc_encode = nil
+ proc_decode = nil
+ @TYDEFS.each{|aty,ty,enc,dec,_,_,_|
+ if( (aty.is_a?(Regexp) && (aty =~ alias_type)) || (aty == alias_type) )
+ alias_type = alias_type.gsub(aty,ty) if ty
+ alias_type.strip! if alias_type
+ if( proc_encode )
+ if( enc )
+ conv1 = proc_encode
+ proc_encode = proc{|v| enc.call(conv1.call(v))}
+ end
+ else
+ if( enc )
+ proc_encode = enc
+ end
+ end
+ if( proc_decode )
+ if( dec )
+ conv2 = proc_decode
+ proc_decode = proc{|v| dec.call(conv2.call(v))}
+ end
+ else
+ if( dec )
+ proc_decode = dec
+ end
+ end
+ end
}
+ return [alias_type, proc_encode, proc_decode]
end
- module_function :included
- end
-
- module BasicTypes
- def included(m)
- m.module_eval{
- typealias "uint", "unsigned int"
- typealias "u_int", "unsigned int"
- typealias "ulong", "unsigned long"
- typealias "u_long", "unsigned long"
+
+ def encode_return_type(ty)
+ ty, enc, dec = encode_argument_type(ty)
+ return [ty, enc, dec]
+ end
+
+ def encode_struct_type(alias_type)
+ proc_encode = nil
+ proc_decode = nil
+ @TYDEFS.each{|aty,_,_,_,ty,enc,dec|
+ if( (aty.is_a?(Regexp) && (aty =~ alias_type)) || (aty == alias_type) )
+ alias_type = alias_type.gsub(aty,ty) if ty
+ alias_type.strip! if alias_type
+ if( proc_encode )
+ if( enc )
+ conv1 = proc_encode
+ proc_encode = proc{|v| enc.call(conv1.call(v))}
+ end
+ else
+ if( enc )
+ proc_encode = enc
+ end
+ end
+ if( proc_decode )
+ if( dec )
+ conv2 = proc_decode
+ proc_decode = proc{|v| dec.call(conv2.call(v))}
+ end
+ else
+ if( dec )
+ proc_decode = dec
+ end
+ end
+ end
}
+ return [alias_type, proc_encode, proc_decode]
end
- module_function :included
- end
+ end # end of Types
end
diff --git a/ext/dl/lib/dl/value.rb b/ext/dl/lib/dl/value.rb
deleted file mode 100644
index 56dfcefa32..0000000000
--- a/ext/dl/lib/dl/value.rb
+++ /dev/null
@@ -1,112 +0,0 @@
-require 'dl'
-
-module DL
- module ValueUtil
- def unsigned_value(val, ty)
- case ty.abs
- when TYPE_CHAR
- [val].pack("c").unpack("C")[0]
- when TYPE_SHORT
- [val].pack("s!").unpack("S!")[0]
- when TYPE_INT
- [val].pack("i!").unpack("I!")[0]
- when TYPE_LONG
- [val].pack("l!").unpack("L!")[0]
- when TYPE_LONG_LONG
- [val].pack("q!").unpack("Q!")[0]
- else
- val
- end
- end
-
- def signed_value(val, ty)
- case ty.abs
- when TYPE_CHAR
- [val].pack("C").unpack("c")[0]
- when TYPE_SHORT
- [val].pack("S!").unpack("s!")[0]
- when TYPE_INT
- [val].pack("I!").unpack("i!")[0]
- when TYPE_LONG
- [val].pack("L!").unpack("l!")[0]
- when TYPE_LONG_LONG
- [val].pack("Q!").unpack("q!")[0]
- else
- val
- end
- end
-
- def wrap_args(args, tys, funcs, &block)
- result = []
- tys ||= []
- args.each_with_index{|arg, idx|
- result.push(wrap_arg(arg, tys[idx], funcs, &block))
- }
- result
- end
-
- def wrap_arg(arg, ty, funcs, &block)
- funcs ||= []
- case arg
- when nil
- return 0
- when CPtr
- return arg.to_i
- when IO
- case ty
- when TYPE_VOIDP
- return CPtr[arg].to_i
- else
- return arg.to_i
- end
- when Function
- if( block )
- arg.bind_at_call(&block)
- funcs.push(arg)
- elsif !arg.bound?
- raise(RuntimeError, "block must be given.")
- end
- return arg.to_i
- when String
- if( ty.is_a?(Array) )
- return arg.unpack('C*')
- else
- case SIZEOF_VOIDP
- when SIZEOF_LONG
- return [arg].pack("p").unpack("l!")[0]
- when SIZEOF_LONG_LONG
- return [arg].pack("p").unpack("q")[0]
- else
- raise(RuntimeError, "sizeof(void*)?")
- end
- end
- when Float, Integer
- return arg
- when Array
- if( ty.is_a?(Array) ) # used only by struct
- case ty[0]
- when TYPE_VOIDP
- return arg.collect{|v| Integer(v)}
- when TYPE_CHAR
- if( arg.is_a?(String) )
- return val.unpack('C*')
- end
- end
- return arg
- else
- return arg
- end
- else
- if( arg.respond_to?(:to_ptr) )
- return arg.to_ptr.to_i
- else
- begin
- return Integer(arg)
- rescue
- raise(ArgumentError, "unknown argument type: #{arg.class}")
- end
- end
- end
- end
- end
-end
diff --git a/ext/dl/lib/dl/win32.rb b/ext/dl/lib/dl/win32.rb
new file mode 100644
index 0000000000..0fed47c324
--- /dev/null
+++ b/ext/dl/lib/dl/win32.rb
@@ -0,0 +1,25 @@
+# -*- ruby -*-
+
+require 'dl'
+
+class Win32API
+ DLL = {}
+
+ def initialize(dllname, func, import, export = "0")
+ prototype = (export + import.to_s).tr("VPpNnLlIi", "0SSI").sub(/^(.)0*$/, '\1')
+ handle = DLL[dllname] ||= DL::Handle.new(dllname)
+ @sym = handle.sym(func, prototype)
+ end
+
+ def call(*args)
+ import = @sym.proto.split("", 2)[1]
+ args.each_with_index do |x, i|
+ args[i] = nil if x == 0 and import[i] == ?S
+ args[i], = [x].pack("I").unpack("i") if import[i] == ?I
+ end
+ ret, = @sym.call(*args)
+ return ret || 0
+ end
+
+ alias Call call
+end
diff --git a/ext/dl/mkcall.rb b/ext/dl/mkcall.rb
new file mode 100644
index 0000000000..6a85570152
--- /dev/null
+++ b/ext/dl/mkcall.rb
@@ -0,0 +1,62 @@
+# -*- ruby -*-
+
+require 'mkmf'
+$:.unshift File.dirname(__FILE__)
+require 'type'
+require 'dlconfig'
+
+def output_arg(x,i)
+ "args[#{i}].#{DLTYPE[x][:stmem]}"
+end
+
+def output_args(types)
+ t = []
+ types[1..-1].each_with_index{|x,i| t.push(output_arg(x,i))}
+ t.join(",")
+end
+
+def output_callfunc(types)
+ t = types[0]
+ stmem = DLTYPE[t][:stmem]
+ ctypes = types2ctypes(types)
+ if( t == VOID )
+ callstm = "(*f)(#{output_args(types)})"
+ else
+ callstm = "ret.#{stmem} = (*f)(#{output_args(types)})"
+ end
+ [ "{",
+ "#{ctypes[0]} (*f)(#{ctypes[1..-1].join(',')}) = func;",
+ "#{callstm};",
+ "}"].join(" ")
+end
+
+def output_case(types)
+ num = types2num(types)
+ callfunc_stm = output_callfunc(types)
+<<EOF
+ case #{num}:
+#ifdef DEBUG
+ printf("#{callfunc_stm}\\n");
+#endif
+ #{callfunc_stm};
+ break;
+EOF
+end
+
+def rec_output(types = [VOID])
+ print output_case(types)
+ if( types.length <= MAX_ARG )
+ DLTYPE.keys.sort.each{|t|
+ if( t != VOID && DLTYPE[t][:sym] )
+ rec_output(types + [t])
+ end
+ }
+ end
+end
+
+DLTYPE.keys.sort.each{|t|
+ if( DLTYPE[t][:sym] )
+ $stderr.printf(" #{DLTYPE[t][:ctype]}\n")
+ rec_output([t])
+ end
+}
diff --git a/ext/dl/mkcallback.rb b/ext/dl/mkcallback.rb
new file mode 100644
index 0000000000..c9f92e4a0d
--- /dev/null
+++ b/ext/dl/mkcallback.rb
@@ -0,0 +1,56 @@
+# -*- ruby -*-
+
+require 'mkmf'
+$:.unshift File.dirname(__FILE__)
+require 'type'
+require 'dlconfig'
+
+def mkfunc(rettype, fnum, argc)
+ args = (0..(argc-1)).collect{|i| "long arg#{i}"}.join(", ")
+
+ subst_code = (0..(argc-1)).collect{|i|
+ " buff[#{i.to_s}] = arg#{i.to_s};"
+ }.join("\n")
+
+ ret_code =
+ if( DLTYPE[rettype][:c2rb] )
+ " return #{DLTYPE[rettype][:rb2c]['retval']};"
+ else
+ " /* no return value */"
+ end
+
+ code = [
+ "static #{DLTYPE[rettype][:ctype]}",
+ "rb_dl_callback_func_#{rettype.to_s}_#{fnum.to_s}(#{args})",
+ "{",
+ " VALUE retval, proto, proc, obj;",
+ " VALUE argv[#{argc.to_s}];",
+ " int argc;",
+ " long buff[#{argc.to_s}];",
+ "",
+ subst_code,
+ "",
+ " obj = rb_hash_aref(DLFuncTable, rb_assoc_new(INT2NUM(#{rettype.to_s}),INT2NUM(#{fnum.to_s})));",
+ " if(NIL_P(obj))",
+ " rb_raise(rb_eDLError, \"callback function does not exist in DL::FuncTable\");",
+ " Check_Type(obj, T_ARRAY);",
+ " proto = rb_ary_entry(obj, 0);",
+ " proc = rb_ary_entry(obj, 1);",
+ " Check_Type(proto, T_STRING);",
+ " if( RSTRING(proto)->len >= #{argc.to_s} )",
+ " rb_raise(rb_eArgError, \"too many arguments\");",
+ " rb_dl_scan_callback_args(buff, RSTRING(proto)->ptr, &argc, argv);",
+ " retval = rb_funcall2(proc, id_call, argc, argv);",
+ "",
+ ret_code,
+ "}",
+ ].join("\n")
+
+ return code
+end
+
+DLTYPE.keys.sort.each{|t|
+ for n in 0..(MAX_CALLBACK - 1)
+ print(mkfunc(t, n, 15), "\n\n")
+ end
+}
diff --git a/ext/dl/mkcbtable.rb b/ext/dl/mkcbtable.rb
new file mode 100644
index 0000000000..165c4bdc88
--- /dev/null
+++ b/ext/dl/mkcbtable.rb
@@ -0,0 +1,18 @@
+# -*- ruby -*-
+
+require 'mkmf'
+$:.unshift File.dirname(__FILE__)
+require 'type'
+require 'dlconfig'
+
+def mktable(rettype, fnum, argc)
+ code =
+ "rb_dl_callback_table[#{rettype}][#{fnum}] = &rb_dl_callback_func_#{rettype.to_s}_#{fnum};"
+ return code
+end
+
+DLTYPE.keys.sort.each{|t|
+ for n in 0..(MAX_CALLBACK - 1)
+ print(mktable(t, n, 15), "\n")
+ end
+}
diff --git a/ext/dl/ptr.c b/ext/dl/ptr.c
new file mode 100644
index 0000000000..01eb31da20
--- /dev/null
+++ b/ext/dl/ptr.c
@@ -0,0 +1,1058 @@
+/* -*- C -*-
+ * $Id$
+ */
+
+#include <ruby.h>
+#include <ctype.h>
+#include "st.h"
+#include "dl.h"
+
+VALUE rb_cDLPtrData;
+VALUE rb_mDLMemorySpace;
+static st_table* st_memory_table;
+
+#ifndef T_SYMBOL
+# define T_SYMBOL T_FIXNUM
+#endif
+
+static void
+rb_dlmem_delete(void *ptr)
+{
+ rb_secure(4);
+ st_delete(st_memory_table, (st_data_t*)&ptr, NULL);
+}
+
+static void
+rb_dlmem_aset(void *ptr, VALUE obj)
+{
+ if (obj == Qnil) {
+ rb_dlmem_delete(ptr);
+ }
+ else{
+ st_insert(st_memory_table, (st_data_t)ptr, (st_data_t)obj);
+ }
+}
+
+static VALUE
+rb_dlmem_aref(void *ptr)
+{
+ VALUE val;
+
+ if(!st_lookup(st_memory_table, (st_data_t)ptr, &val)) return Qnil;
+ return val == Qundef ? Qnil : val;
+}
+
+void
+dlptr_free(struct ptr_data *data)
+{
+ if (data->ptr) {
+ DEBUG_CODE({
+ printf("dlptr_free(): removing the pointer `0x%x' from the MemorySpace\n",
+ data->ptr);
+ });
+ rb_dlmem_delete(data->ptr);
+ if (data->free) {
+ DEBUG_CODE({
+ printf("dlptr_free(): 0x%x(data->ptr:0x%x)\n",data->free,data->ptr);
+ });
+ (*(data->free))(data->ptr);
+ }
+ }
+ if (data->stype) dlfree(data->stype);
+ if (data->ssize) dlfree(data->ssize);
+ if (data->ids) dlfree(data->ids);
+}
+
+void
+dlptr_init(VALUE val)
+{
+ struct ptr_data *data;
+
+ Data_Get_Struct(val, struct ptr_data, data);
+ DEBUG_CODE({
+ printf("dlptr_init(): add the pointer `0x%x' to the MemorySpace\n",
+ data->ptr);
+ });
+ rb_dlmem_aset(data->ptr, val);
+ OBJ_TAINT(val);
+}
+
+VALUE
+rb_dlptr_new2(VALUE klass, void *ptr, long size, freefunc_t func)
+{
+ struct ptr_data *data;
+ VALUE val;
+
+ rb_secure(4);
+ if (ptr) {
+ val = rb_dlmem_aref(ptr);
+ if (val == Qnil) {
+ val = Data_Make_Struct(klass, struct ptr_data,
+ 0, dlptr_free, data);
+ data->ptr = ptr;
+ data->free = func;
+ data->ctype = DLPTR_CTYPE_UNKNOWN;
+ data->stype = NULL;
+ data->ssize = NULL;
+ data->slen = 0;
+ data->size = size;
+ data->ids = NULL;
+ data->ids_num = 0;
+ dlptr_init(val);
+ }
+ else{
+ if (func) {
+ Data_Get_Struct(val, struct ptr_data, data);
+ data->free = func;
+ }
+ }
+ }
+ else{
+ val = Qnil;
+ }
+
+ return val;
+}
+
+VALUE
+rb_dlptr_new(void *ptr, long size, freefunc_t func)
+{
+ return rb_dlptr_new2(rb_cDLPtrData, ptr, size, func);
+}
+
+VALUE
+rb_dlptr_malloc(long size, freefunc_t func)
+{
+ void *ptr;
+
+ rb_secure(4);
+ ptr = dlmalloc((size_t)size);
+ memset(ptr,0,(size_t)size);
+ return rb_dlptr_new(ptr, size, func);
+}
+
+void *
+rb_dlptr2cptr(VALUE val)
+{
+ struct ptr_data *data;
+ void *ptr;
+
+ if (rb_obj_is_kind_of(val, rb_cDLPtrData)) {
+ Data_Get_Struct(val, struct ptr_data, data);
+ ptr = data->ptr;
+ }
+ else if (val == Qnil) {
+ ptr = NULL;
+ }
+ else{
+ rb_raise(rb_eTypeError, "DL::PtrData was expected");
+ }
+
+ return ptr;
+}
+
+static VALUE
+rb_dlptr_s_allocate(VALUE klass)
+{
+ VALUE obj;
+ struct ptr_data *data;
+
+ rb_secure(4);
+ obj = Data_Make_Struct(klass, struct ptr_data, 0, dlptr_free, data);
+ data->ptr = 0;
+ data->free = 0;
+ data->ctype = DLPTR_CTYPE_UNKNOWN;
+ data->stype = NULL;
+ data->ssize = NULL;
+ data->slen = 0;
+ data->size = 0;
+ data->ids = NULL;
+ data->ids_num = 0;
+
+ return obj;
+}
+
+static VALUE
+rb_dlptr_initialize(int argc, VALUE argv[], VALUE self)
+{
+ VALUE ptr, sym, size;
+ struct ptr_data *data;
+ void *p = NULL;
+ freefunc_t f = NULL;
+ long s = 0;
+
+ switch (rb_scan_args(argc, argv, "12", &ptr, &size, &sym)) {
+ case 1:
+ p = (void*)(DLNUM2LONG(rb_Integer(ptr)));
+ break;
+ case 2:
+ p = (void*)(DLNUM2LONG(rb_Integer(ptr)));
+ s = DLNUM2LONG(size);
+ break;
+ case 3:
+ p = (void*)(DLNUM2LONG(rb_Integer(ptr)));
+ s = DLNUM2LONG(size);
+ f = rb_dlsym2csym(sym);
+ break;
+ default:
+ rb_bug("rb_dlptr_initialize");
+ }
+
+ if (p) {
+ Data_Get_Struct(self, struct ptr_data, data);
+ if (data->ptr && data->free) {
+ /* Free previous memory. Use of inappropriate initialize may cause SEGV. */
+ (*(data->free))(data->ptr);
+ }
+ data->ptr = p;
+ data->size = s;
+ data->free = f;
+ }
+
+ return Qnil;
+}
+
+static VALUE
+rb_dlptr_s_malloc(int argc, VALUE argv[], VALUE klass)
+{
+ VALUE size, sym, obj;
+ int s;
+ freefunc_t f = NULL;
+
+ switch (rb_scan_args(argc, argv, "11", &size, &sym)) {
+ case 1:
+ s = NUM2INT(size);
+ break;
+ case 2:
+ s = NUM2INT(size);
+ f = rb_dlsym2csym(sym);
+ break;
+ default:
+ rb_bug("rb_dlptr_s_malloc");
+ }
+
+ obj = rb_dlptr_malloc(s,f);
+
+ return obj;
+}
+
+VALUE
+rb_dlptr_to_i(VALUE self)
+{
+ struct ptr_data *data;
+
+ Data_Get_Struct(self, struct ptr_data, data);
+ return DLLONG2NUM(data->ptr);
+}
+
+VALUE
+rb_dlptr_ptr(VALUE self)
+{
+ struct ptr_data *data;
+
+ Data_Get_Struct(self, struct ptr_data, data);
+ return rb_dlptr_new(*((void**)(data->ptr)),0,0);
+}
+
+VALUE
+rb_dlptr_ref(VALUE self)
+{
+ struct ptr_data *data;
+
+ Data_Get_Struct(self, struct ptr_data, data);
+ return rb_dlptr_new(&(data->ptr),0,0);
+}
+
+VALUE
+rb_dlptr_null_p(VALUE self)
+{
+ struct ptr_data *data;
+
+ Data_Get_Struct(self, struct ptr_data, data);
+ return data->ptr ? Qfalse : Qtrue;
+}
+
+VALUE
+rb_dlptr_free_set(VALUE self, VALUE val)
+{
+ struct ptr_data *data;
+
+ Data_Get_Struct(self, struct ptr_data, data);
+
+ data->free = DLFREEFUNC(rb_dlsym2csym(val));
+
+ return Qnil;
+}
+
+VALUE
+rb_dlptr_free_get(VALUE self)
+{
+ struct ptr_data *pdata;
+
+ Data_Get_Struct(self, struct ptr_data, pdata);
+
+ return rb_dlsym_new(pdata->free,"(free)","0P");
+}
+
+VALUE
+rb_dlptr_to_array(int argc, VALUE argv[], VALUE self)
+{
+ struct ptr_data *data;
+ int n;
+ int i;
+ int t;
+ VALUE ary;
+ VALUE type, size;
+
+ Data_Get_Struct(self, struct ptr_data, data);
+
+ switch (rb_scan_args(argc, argv, "11", &type, &size)) {
+ case 2:
+ t = StringValuePtr(type)[0];
+ n = NUM2INT(size);
+ break;
+ case 1:
+ t = StringValuePtr(type)[0];
+ switch (t) {
+ case 'C':
+ n = data->size;
+ break;
+ case 'H':
+ n = data->size / sizeof(short);
+ break;
+ case 'I':
+ n = data->size / sizeof(int);
+ break;
+ case 'L':
+ n = data->size / sizeof(long);
+ break;
+ case 'F':
+ n = data->size / sizeof(float);
+ break;
+ case 'D':
+ n = data->size / sizeof(double);
+ break;
+ case 'P': case 'p':
+ n = data->size / sizeof(void*);
+ break;
+ case 'S': case 's':
+ n = data->size / sizeof(char*);
+ break;
+ default:
+ n = 0;
+ }
+ break;
+ default:
+ rb_bug("rb_dlptr_to_array");
+ }
+
+ ary = rb_ary_new();
+
+ for (i=0; i < n; i++) {
+ switch (t) {
+ case 'C':
+ rb_ary_push(ary, INT2NUM(((char*)(data->ptr))[i]));
+ break;
+ case 'H':
+ rb_ary_push(ary, INT2NUM(((short*)(data->ptr))[i]));
+ break;
+ case 'I':
+ rb_ary_push(ary, INT2NUM(((int*)(data->ptr))[i]));
+ break;
+ case 'L':
+ rb_ary_push(ary, DLLONG2NUM(((long*)(data->ptr))[i]));
+ break;
+ case 'D':
+ rb_ary_push(ary, rb_float_new(((double*)(data->ptr))[i]));
+ break;
+ case 'F':
+ rb_ary_push(ary, rb_float_new(((float*)(data->ptr))[i]));
+ break;
+ case 'S':
+ {
+ char *str = ((char**)(data->ptr))[i];
+ if (str) {
+ rb_ary_push(ary, rb_tainted_str_new2(str));
+ }
+ else{
+ rb_ary_push(ary, Qnil);
+ }
+ }
+ break;
+ case 's':
+ {
+ char *str = ((char**)(data->ptr))[i];
+ if (str) {
+ rb_ary_push(ary, rb_tainted_str_new2(str));
+ xfree(str);
+ }
+ else{
+ rb_ary_push(ary, Qnil);
+ }
+ }
+ break;
+ case 'P':
+ rb_ary_push(ary, rb_dlptr_new(((void**)(data->ptr))[i],0,0));
+ break;
+ case 'p':
+ rb_ary_push(ary,
+ rb_dlptr_new(((void**)(data->ptr))[i],0,dlfree));
+ break;
+ }
+ }
+
+ return ary;
+}
+
+
+VALUE
+rb_dlptr_to_s(int argc, VALUE argv[], VALUE self)
+{
+ struct ptr_data *data;
+ VALUE arg1, val;
+ int len;
+
+ Data_Get_Struct(self, struct ptr_data, data);
+ switch (rb_scan_args(argc, argv, "01", &arg1)) {
+ case 0:
+ val = rb_tainted_str_new2((char*)(data->ptr));
+ break;
+ case 1:
+ len = NUM2INT(arg1);
+ val = rb_tainted_str_new((char*)(data->ptr), len);
+ break;
+ default:
+ rb_bug("rb_dlptr_to_s");
+ }
+
+ return val;
+}
+
+VALUE
+rb_dlptr_to_str(int argc, VALUE argv[], VALUE self)
+{
+ struct ptr_data *data;
+ VALUE arg1, val;
+ int len;
+
+ Data_Get_Struct(self, struct ptr_data, data);
+ switch (rb_scan_args(argc, argv, "01", &arg1)) {
+ case 0:
+ val = rb_tainted_str_new((char*)(data->ptr),data->size);
+ break;
+ case 1:
+ len = NUM2INT(arg1);
+ val = rb_tainted_str_new((char*)(data->ptr), len);
+ break;
+ default:
+ rb_bug("rb_dlptr_to_str");
+ }
+
+ return val;
+}
+
+VALUE
+rb_dlptr_inspect(VALUE self)
+{
+ struct ptr_data *data;
+ char str[1024];
+
+ Data_Get_Struct(self, struct ptr_data, data);
+ snprintf(str, 1023, "#<%s:0x%lx ptr=0x%lx size=%ld free=0x%lx>",
+ rb_class2name(CLASS_OF(self)), data, data->ptr, data->size,
+ (long)data->free);
+ return rb_str_new2(str);
+}
+
+VALUE
+rb_dlptr_eql(VALUE self, VALUE other)
+{
+ void *ptr1, *ptr2;
+ ptr1 = rb_dlptr2cptr(self);
+ ptr2 = rb_dlptr2cptr(other);
+
+ return ptr1 == ptr2 ? Qtrue : Qfalse;
+}
+
+VALUE
+rb_dlptr_cmp(VALUE self, VALUE other)
+{
+ void *ptr1, *ptr2;
+ ptr1 = rb_dlptr2cptr(self);
+ ptr2 = rb_dlptr2cptr(other);
+ return DLLONG2NUM((long)ptr1 - (long)ptr2);
+}
+
+VALUE
+rb_dlptr_plus(VALUE self, VALUE other)
+{
+ void *ptr;
+ long num, size;
+
+ ptr = rb_dlptr2cptr(self);
+ size = RDLPTR(self)->size;
+ num = DLNUM2LONG(other);
+ return rb_dlptr_new((char *)ptr + num, size - num, 0);
+}
+
+VALUE
+rb_dlptr_minus(VALUE self, VALUE other)
+{
+ void *ptr;
+ long num, size;
+
+ ptr = rb_dlptr2cptr(self);
+ size = RDLPTR(self)->size;
+ num = DLNUM2LONG(other);
+ return rb_dlptr_new((char *)ptr - num, size + num, 0);
+}
+
+VALUE
+rb_dlptr_define_data_type(int argc, VALUE argv[], VALUE self)
+{
+ VALUE data_type, type, rest, vid;
+ struct ptr_data *data;
+ int i, t, num;
+ char *ctype;
+
+ rb_scan_args(argc, argv, "11*", &data_type, &type, &rest);
+ Data_Get_Struct(self, struct ptr_data, data);
+
+ if (argc == 1 || (argc == 2 && type == Qnil)) {
+ if (NUM2INT(data_type) == DLPTR_CTYPE_UNKNOWN) {
+ data->ctype = DLPTR_CTYPE_UNKNOWN;
+ data->slen = 0;
+ data->ids_num = 0;
+ if (data->stype) {
+ dlfree(data->stype);
+ data->stype = NULL;
+ }
+ if (data->ids) {
+ dlfree(data->ids);
+ data->ids = NULL;
+ }
+ return Qnil;
+ }
+ else{
+ rb_raise(rb_eArgError, "wrong arguments");
+ }
+ }
+
+ t = NUM2INT(data_type);
+ StringValue(type);
+ Check_Type(rest, T_ARRAY);
+ num = RARRAY(rest)->len;
+ for (i=0; i<num; i++) {
+ rb_to_id(rb_ary_entry(rest,i));
+ }
+
+ data->ctype = t;
+ data->slen = num;
+ data->ids_num = num;
+ if (data->stype) dlfree(data->stype);
+ data->stype = (char*)dlmalloc(sizeof(char) * num);
+ if (data->ssize) dlfree(data->ssize);
+ data->ssize = (int*)dlmalloc(sizeof(int) * num);
+ if (data->ids) dlfree(data->ids);
+ data->ids = (ID*)dlmalloc(sizeof(ID) * data->ids_num);
+
+ ctype = StringValuePtr(type);
+ for (i=0; i<num; i++) {
+ vid = rb_ary_entry(rest,i);
+ data->ids[i] = rb_to_id(vid);
+ data->stype[i] = *ctype;
+ ctype ++;
+ if (isdigit(*ctype)) {
+ char *p, *d;
+ for (p=ctype; isdigit(*p); p++) ;
+ d = ALLOCA_N(char, p - ctype + 1);
+ strncpy(d, ctype, p - ctype);
+ d[p - ctype] = '\0';
+ data->ssize[i] = atoi(d);
+ ctype = p;
+ }
+ else{
+ data->ssize[i] = 1;
+ }
+ }
+
+ if (*ctype) {
+ rb_raise(rb_eArgError, "too few/many arguments");
+ }
+
+ if (!data->size)
+ data->size = dlsizeof(RSTRING(type)->ptr);
+
+ return Qnil;
+}
+
+VALUE
+rb_dlptr_define_struct(int argc, VALUE argv[], VALUE self)
+{
+ VALUE *pass_argv;
+ int pass_argc, i;
+
+ pass_argc = argc + 1;
+ pass_argv = ALLOCA_N(VALUE, pass_argc);
+ pass_argv[0] = INT2FIX(DLPTR_CTYPE_STRUCT);
+ for (i=1; i<pass_argc; i++) {
+ pass_argv[i] = argv[i-1];
+ }
+ return rb_dlptr_define_data_type(pass_argc, pass_argv, self);
+}
+
+VALUE
+rb_dlptr_define_union(int argc, VALUE argv[], VALUE self)
+{
+ VALUE *pass_argv;
+ int pass_argc, i;
+
+ pass_argc = argc + 1;
+ pass_argv = ALLOCA_N(VALUE, pass_argc);
+ pass_argv[0] = INT2FIX(DLPTR_CTYPE_UNION);
+ for (i=1; i<pass_argc; i++) {
+ pass_argv[i] = argv[i-1];
+ }
+ return rb_dlptr_define_data_type(pass_argc, pass_argv, self);
+}
+
+VALUE
+rb_dlptr_get_data_type(VALUE self)
+{
+ struct ptr_data *data;
+
+ Data_Get_Struct(self, struct ptr_data, data);
+ if (data->stype)
+ return rb_assoc_new(INT2FIX(data->ctype),
+ rb_tainted_str_new(data->stype, data->slen));
+ else
+ return rb_assoc_new(INT2FIX(data->ctype), Qnil);
+}
+
+static VALUE
+cary2ary(void *ptr, char t, int len)
+{
+ VALUE ary;
+ VALUE elem;
+ int i;
+
+ if (len < 1)
+ return Qnil;
+
+ if (len == 1) {
+ switch (t) {
+ case 'I':
+ elem = INT2NUM(*((int*)ptr));
+ ptr = (char *)ptr + sizeof(int);
+ break;
+ case 'L':
+ elem = DLLONG2NUM(*((long*)ptr));
+ ptr = (char *)ptr + sizeof(long);
+ break;
+ case 'P':
+ case 'S':
+ elem = rb_dlptr_new(*((void**)ptr),0, 0);
+ ptr = (char *)ptr + sizeof(void*);
+ break;
+ case 'F':
+ elem = rb_float_new(*((float*)ptr));
+ ptr = (char *)ptr + sizeof(float);
+ break;
+ case 'D':
+ elem = rb_float_new(*((double*)ptr));
+ ptr = (char *)ptr + sizeof(double);
+ break;
+ case 'C':
+ elem = INT2NUM(*((char*)ptr));
+ ptr = (char *)ptr + sizeof(char);
+ break;
+ case 'H':
+ elem = INT2NUM(*((short*)ptr));
+ ptr = (char *)ptr + sizeof(short);
+ break;
+ default:
+ rb_raise(rb_eDLTypeError, "unsupported type '%c'", t);
+ }
+ return elem;
+ }
+
+ ary = rb_ary_new();
+ for (i=0; i < len; i++) {
+ switch (t) {
+ case 'I':
+ elem = INT2NUM(*((int*)ptr));
+ ptr = (char *)ptr + sizeof(int);
+ break;
+ case 'L':
+ elem = DLLONG2NUM(*((long*)ptr));
+ ptr = (char *)ptr + sizeof(long);
+ break;
+ case 'P':
+ case 'S':
+ elem = rb_dlptr_new(*((void**)ptr), 0, 0);
+ ptr = (char *)ptr + sizeof(void*);
+ break;
+ case 'F':
+ elem = rb_float_new(*((float*)ptr));
+ ptr = (char *)ptr + sizeof(float);
+ break;
+ case 'D':
+ elem = rb_float_new(*((float*)ptr));
+ ptr = (char *)ptr + sizeof(double);
+ break;
+ case 'C':
+ elem = INT2NUM(*((char*)ptr));
+ ptr = (char *)ptr + sizeof(char);
+ break;
+ case 'H':
+ elem = INT2NUM(*((short*)ptr));
+ ptr = (char *)ptr + sizeof(short);
+ break;
+ default:
+ rb_raise(rb_eDLTypeError, "unsupported type '%c'", t);
+ }
+ rb_ary_push(ary, elem);
+ }
+
+ return ary;
+}
+
+VALUE
+rb_dlptr_aref(int argc, VALUE argv[], VALUE self)
+{
+ VALUE key = Qnil, num = Qnil;
+ ID id;
+ struct ptr_data *data;
+ int i;
+ int offset;
+
+ if (rb_scan_args(argc, argv, "11", &key, &num) == 1) {
+ num = INT2NUM(0);
+ }
+
+ if (TYPE(key) == T_FIXNUM || TYPE(key) == T_BIGNUM) {
+ VALUE pass[1];
+ pass[0] = num;
+ return rb_dlptr_to_str(1, pass, rb_dlptr_plus(self, key));
+ }
+ rb_to_id(key);
+ if (! (TYPE(key) == T_STRING || TYPE(key) == T_SYMBOL)) {
+ rb_raise(rb_eTypeError, "the key must be a string or symbol");
+ }
+
+ id = rb_to_id(key);
+ Data_Get_Struct(self, struct ptr_data, data);
+ offset = 0;
+ switch (data->ctype) {
+ case DLPTR_CTYPE_STRUCT:
+ for (i=0; i < data->ids_num; i++) {
+ switch (data->stype[i]) {
+ case 'I':
+ DLALIGN(data->ptr,offset,INT_ALIGN);
+ break;
+ case 'L':
+ DLALIGN(data->ptr,offset,LONG_ALIGN);
+ break;
+ case 'P':
+ case 'S':
+ DLALIGN(data->ptr,offset,VOIDP_ALIGN);
+ break;
+ case 'F':
+ DLALIGN(data->ptr,offset,FLOAT_ALIGN);
+ break;
+ case 'D':
+ DLALIGN(data->ptr,offset,DOUBLE_ALIGN);
+ break;
+ case 'C':
+ break;
+ case 'H':
+ DLALIGN(data->ptr,offset,SHORT_ALIGN);
+ break;
+ default:
+ rb_raise(rb_eDLTypeError, "unsupported type '%c'", data->stype[i]);
+ }
+ if (data->ids[i] == id) {
+ return cary2ary((char *)data->ptr + offset, data->stype[i], data->ssize[i]);
+ }
+ switch (data->stype[i]) {
+ case 'I':
+ offset += sizeof(int) * data->ssize[i];
+ break;
+ case 'L':
+ offset += sizeof(long) * data->ssize[i];
+ break;
+ case 'P':
+ case 'S':
+ offset += sizeof(void*) * data->ssize[i];
+ break;
+ case 'F':
+ offset += sizeof(float) * data->ssize[i];
+ break;
+ case 'D':
+ offset += sizeof(double) * data->ssize[i];
+ break;
+ case 'C':
+ offset += sizeof(char) * data->ssize[i];
+ break;
+ case 'H':
+ offset += sizeof(short) * data->ssize[i];
+ break;
+ default:
+ rb_raise(rb_eDLTypeError, "unsupported type '%c'", data->stype[i]);
+ }
+ }
+ break;
+ case DLPTR_CTYPE_UNION:
+ for (i=0; i < data->ids_num; i++) {
+ if (data->ids[i] == id) {
+ return cary2ary((char *)data->ptr + offset, data->stype[i], data->ssize[i]);
+ }
+ }
+ break;
+ } /* end of switch */
+
+ rb_raise(rb_eNameError, "undefined key `%s' for %s",
+ rb_id2name(id), rb_class2name(CLASS_OF(self)));
+
+ return Qnil;
+}
+
+static void *
+ary2cary(char t, VALUE val, long *size)
+{
+ void *ptr;
+
+ if (TYPE(val) == T_ARRAY) {
+ ptr = rb_ary2cary(t, val, size);
+ }
+ else{
+ ptr = rb_ary2cary(t, rb_ary_new3(1, val), size);
+ }
+ return ptr;
+}
+
+VALUE
+rb_dlptr_aset(int argc, VALUE argv[], VALUE self)
+{
+ VALUE key = Qnil, num = Qnil, val = Qnil;
+ ID id;
+ struct ptr_data *data;
+ int i;
+ int offset;
+ long memsize;
+ void *memimg;
+
+ rb_secure(4);
+ switch (rb_scan_args(argc, argv, "21", &key, &num, &val)) {
+ case 2:
+ val = num;
+ num = Qnil;
+ break;
+ }
+
+ if (TYPE(key) == T_FIXNUM || TYPE(key) == T_BIGNUM) {
+ void *dst, *src;
+ long len;
+
+ StringValue(val);
+ Data_Get_Struct(self, struct ptr_data, data);
+ dst = (void*)((long)(data->ptr) + DLNUM2LONG(key));
+ src = RSTRING(val)->ptr;
+ len = RSTRING(val)->len;
+ if (num == Qnil) {
+ memcpy(dst, src, len);
+ }
+ else{
+ long n = NUM2INT(num);
+ memcpy(dst, src, n < len ? n : len);
+ if (n > len) MEMZERO((char*)dst + len, char, n - len);
+ }
+ return val;
+ }
+
+ id = rb_to_id(key);
+ Data_Get_Struct(self, struct ptr_data, data);
+ switch (data->ctype) {
+ case DLPTR_CTYPE_STRUCT:
+ offset = 0;
+ for (i=0; i < data->ids_num; i++) {
+ switch (data->stype[i]) {
+ case 'I':
+ DLALIGN(data->ptr,offset,INT_ALIGN);
+ break;
+ case 'L':
+ DLALIGN(data->ptr,offset,LONG_ALIGN);
+ break;
+ case 'P':
+ case 'S':
+ DLALIGN(data->ptr,offset,VOIDP_ALIGN);
+ break;
+ case 'D':
+ DLALIGN(data->ptr,offset,DOUBLE_ALIGN);
+ break;
+ case 'F':
+ DLALIGN(data->ptr,offset,FLOAT_ALIGN);
+ break;
+ case 'C':
+ break;
+ case 'H':
+ DLALIGN(data->ptr,offset,SHORT_ALIGN);
+ break;
+ default:
+ rb_raise(rb_eDLTypeError, "unsupported type '%c'", data->stype[i]);
+ }
+ if (data->ids[i] == id) {
+ memimg = ary2cary(data->stype[i], val, &memsize);
+ memcpy((char *)data->ptr + offset, memimg, memsize);
+ dlfree(memimg);
+ return val;
+ }
+ switch (data->stype[i]) {
+ case 'I':
+ case 'i':
+ offset += sizeof(int) * data->ssize[i];
+ break;
+ case 'L':
+ case 'l':
+ offset += sizeof(long) * data->ssize[i];
+ break;
+ case 'P':
+ case 'p':
+ case 'S':
+ case 's':
+ offset += sizeof(void*) * data->ssize[i];
+ break;
+ case 'D':
+ case 'd':
+ offset += sizeof(double) * data->ssize[i];
+ break;
+ case 'F':
+ case 'f':
+ offset += sizeof(float) * data->ssize[i];
+ break;
+ case 'C':
+ case 'c':
+ offset += sizeof(char) * data->ssize[i];
+ break;
+ case 'H':
+ case 'h':
+ offset += sizeof(short) * data->ssize[i];
+ break;
+ default:
+ rb_raise(rb_eDLTypeError, "unsupported type '%c'", data->stype[i]);
+ }
+ }
+ return val;
+ /* break; */
+ case DLPTR_CTYPE_UNION:
+ for (i=0; i < data->ids_num; i++) {
+ if (data->ids[i] == id) {
+ switch (data->stype[i]) {
+ case 'I': case 'i':
+ memsize = sizeof(int) * data->ssize[i];
+ break;
+ case 'L': case 'l':
+ memsize = sizeof(long) * data->ssize[i];
+ break;
+ case 'P': case 'p':
+ case 'S': case 's':
+ memsize = sizeof(void*) * data->ssize[i];
+ break;
+ case 'F': case 'f':
+ memsize = sizeof(float) * data->ssize[i];
+ break;
+ case 'D': case 'd':
+ memsize = sizeof(double) * data->ssize[i];
+ break;
+ case 'C': case 'c':
+ memsize = sizeof(char) * data->ssize[i];
+ break;
+ case 'H': case 'h':
+ memsize = sizeof(short) * data->ssize[i];
+ break;
+ default:
+ rb_raise(rb_eDLTypeError, "unsupported type '%c'", data->stype[i]);
+ }
+ memimg = ary2cary(data->stype[i], val, NULL);
+ memcpy(data->ptr, memimg, memsize);
+ dlfree(memimg);
+ }
+ }
+ return val;
+ /* break; */
+ }
+
+ rb_raise(rb_eNameError, "undefined key `%s' for %s",
+ rb_id2name(id), rb_class2name(CLASS_OF(self)));
+
+ return Qnil;
+}
+
+VALUE
+rb_dlptr_size(int argc, VALUE argv[], VALUE self)
+{
+ VALUE size;
+
+ if (rb_scan_args(argc, argv, "01", &size) == 0){
+ return DLLONG2NUM(RDLPTR(self)->size);
+ }
+ else{
+ RDLPTR(self)->size = DLNUM2LONG(size);
+ return size;
+ }
+}
+
+static int
+dlmem_each_i(void* key, VALUE value, void* arg)
+{
+ VALUE vkey = DLLONG2NUM(key);
+ rb_yield(rb_assoc_new(vkey, value));
+ return Qnil;
+}
+
+VALUE
+rb_dlmem_each(VALUE self)
+{
+ st_foreach(st_memory_table, dlmem_each_i, 0);
+ return Qnil;
+}
+
+void
+Init_dlptr()
+{
+ rb_cDLPtrData = rb_define_class_under(rb_mDL, "PtrData", rb_cObject);
+ rb_define_alloc_func(rb_cDLPtrData, rb_dlptr_s_allocate);
+ rb_define_singleton_method(rb_cDLPtrData, "malloc", rb_dlptr_s_malloc, -1);
+ rb_define_method(rb_cDLPtrData, "initialize", rb_dlptr_initialize, -1);
+ rb_define_method(rb_cDLPtrData, "free=", rb_dlptr_free_set, 1);
+ rb_define_method(rb_cDLPtrData, "free", rb_dlptr_free_get, 0);
+ rb_define_method(rb_cDLPtrData, "to_i", rb_dlptr_to_i, 0);
+ rb_define_method(rb_cDLPtrData, "ptr", rb_dlptr_ptr, 0);
+ rb_define_method(rb_cDLPtrData, "+@", rb_dlptr_ptr, 0);
+ rb_define_method(rb_cDLPtrData, "ref", rb_dlptr_ref, 0);
+ rb_define_method(rb_cDLPtrData, "-@", rb_dlptr_ref, 0);
+ rb_define_method(rb_cDLPtrData, "null?", rb_dlptr_null_p, 0);
+ rb_define_method(rb_cDLPtrData, "to_a", rb_dlptr_to_array, -1);
+ rb_define_method(rb_cDLPtrData, "to_s", rb_dlptr_to_s, -1);
+ rb_define_method(rb_cDLPtrData, "to_str", rb_dlptr_to_str, -1);
+ rb_define_method(rb_cDLPtrData, "inspect", rb_dlptr_inspect, 0);
+ rb_define_method(rb_cDLPtrData, "<=>", rb_dlptr_cmp, 1);
+ rb_define_method(rb_cDLPtrData, "==", rb_dlptr_eql, 1);
+ rb_define_method(rb_cDLPtrData, "eql?", rb_dlptr_eql, 1);
+ rb_define_method(rb_cDLPtrData, "+", rb_dlptr_plus, 1);
+ rb_define_method(rb_cDLPtrData, "-", rb_dlptr_minus, 1);
+ rb_define_method(rb_cDLPtrData, "define_data_type",
+ rb_dlptr_define_data_type, -1);
+ rb_define_method(rb_cDLPtrData, "struct!", rb_dlptr_define_struct, -1);
+ rb_define_method(rb_cDLPtrData, "union!", rb_dlptr_define_union, -1);
+ rb_define_method(rb_cDLPtrData, "data_type", rb_dlptr_get_data_type, 0);
+ rb_define_method(rb_cDLPtrData, "[]", rb_dlptr_aref, -1);
+ rb_define_method(rb_cDLPtrData, "[]=", rb_dlptr_aset, -1);
+ rb_define_method(rb_cDLPtrData, "size", rb_dlptr_size, -1);
+ rb_define_method(rb_cDLPtrData, "size=", rb_dlptr_size, -1);
+
+ rb_mDLMemorySpace = rb_define_module_under(rb_mDL, "MemorySpace");
+ st_memory_table = st_init_numtable();
+ rb_define_const(rb_mDLMemorySpace, "MemoryTable", Qnil); /* historical */
+ rb_define_module_function(rb_mDLMemorySpace, "each", rb_dlmem_each, 0);
+}
diff --git a/ext/dl/sample/c++sample.C b/ext/dl/sample/c++sample.C
new file mode 100644
index 0000000000..d083d337a7
--- /dev/null
+++ b/ext/dl/sample/c++sample.C
@@ -0,0 +1,35 @@
+#include <stdio.h>
+
+class Person {
+private:
+ const char *name;
+ int age;
+
+public:
+ Person(const char *name, int age);
+ const char * get_name();
+ int get_age();
+ void set_age(int i);
+};
+
+Person::Person(const char *name, int age)
+ : name(name), age(age)
+{
+ /* empty */
+}
+
+const char *
+Person::get_name()
+{
+ return name;
+}
+
+int
+Person::get_age(){
+ return age;
+}
+
+void
+Person::set_age(int i){
+ age = i;
+}
diff --git a/ext/dl/sample/c++sample.rb b/ext/dl/sample/c++sample.rb
new file mode 100644
index 0000000000..29887df845
--- /dev/null
+++ b/ext/dl/sample/c++sample.rb
@@ -0,0 +1,60 @@
+=begin
+ This script shows how to deal with C++ classes using Ruby/DL.
+ You must build a dynamic loadable library using "c++sample.C"
+ to run this script as follows:
+ $ g++ -o libsample.so -shared c++sample.C
+=end
+
+require 'dl'
+require 'dl/import'
+require 'dl/struct'
+
+# Give a name of dynamic loadable library
+LIBNAME = ARGV[0] || "libsample.so"
+
+class Person
+ module Core
+ extend DL::Importable
+
+ dlload LIBNAME
+
+ # mangled symbol names
+ extern "void __6PersonPCci(void *, const char *, int)"
+ extern "const char *get_name__6Person(void *)"
+ extern "int get_age__6Person(void *)"
+ extern "void set_age__6Personi(void *, int)"
+
+ Data = struct [
+ "char *name",
+ "int age",
+ ]
+ end
+
+ def initialize(name, age)
+ @ptr = Core::Data.alloc
+ Core::__6PersonPCci(@ptr, name, age)
+ end
+
+ def get_name()
+ str = Core::get_name__6Person(@ptr)
+ if( str )
+ str.to_s
+ else
+ nil
+ end
+ end
+
+ def get_age()
+ Core::get_age__6Person(@ptr)
+ end
+
+ def set_age(age)
+ Core::set_age__6Personi(@ptr, age)
+ end
+end
+
+obj = Person.new("ttate", 1)
+p obj.get_name()
+p obj.get_age()
+obj.set_age(10)
+p obj.get_age()
diff --git a/ext/dl/sample/drives.rb b/ext/dl/sample/drives.rb
new file mode 100644
index 0000000000..8a590404b1
--- /dev/null
+++ b/ext/dl/sample/drives.rb
@@ -0,0 +1,70 @@
+# -*- ruby -*-
+# drives.rb -- find existing drives and show the drive type.
+
+require 'dl'
+require 'dl/import'
+
+module Kernel32
+ extend DL::Importable
+
+ dlload "kernel32"
+
+ extern "long GetLogicalDrives()"
+ extern "int GetDriveType(char*)"
+ extern "long GetDiskFreeSpace(char*, long ref, long ref, long ref, long ref)"
+end
+
+include Kernel32
+
+buff = Kernel32.getLogicalDrives()
+
+i = 0
+ds = []
+while( i < 26 )
+ mask = (1 << i)
+ if( buff & mask > 0 )
+ ds.push((65+i).chr)
+ end
+ i += 1
+end
+
+=begin
+From the cygwin's /usr/include/w32api/winbase.h:
+#define DRIVE_UNKNOWN 0
+#define DRIVE_NO_ROOT_DIR 1
+#define DRIVE_REMOVABLE 2
+#define DRIVE_FIXED 3
+#define DRIVE_REMOTE 4
+#define DRIVE_CDROM 5
+#define DRIVE_RAMDISK 6
+=end
+
+types = [
+ "unknown",
+ "no root dir",
+ "Removable",
+ "Fixed",
+ "Remote",
+ "CDROM",
+ "RAM",
+]
+print("Drive : Type (Free Space/Available Space)\n")
+ds.each{|d|
+ t = Kernel32.getDriveType(d + ":\\")
+ Kernel32.getDiskFreeSpace(d + ":\\", 0, 0, 0, 0)
+ _,sec_per_clus,byte_per_sec,free_clus,total_clus = Kernel32._args_
+ fbytes = sec_per_clus * byte_per_sec * free_clus
+ tbytes = sec_per_clus * byte_per_sec * total_clus
+ unit = "B"
+ if( fbytes > 1024 && tbytes > 1024 )
+ fbytes = fbytes / 1024
+ tbytes = tbytes / 1024
+ unit = "K"
+ end
+ if( fbytes > 1024 && tbytes > 1024 )
+ fbytes = fbytes / 1024
+ tbytes = tbytes / 1024
+ unit = "M"
+ end
+ print("#{d} : #{types[t]} (#{fbytes} #{unit}/#{tbytes} #{unit})\n")
+}
diff --git a/ext/dl/sample/getch.rb b/ext/dl/sample/getch.rb
new file mode 100644
index 0000000000..3f7261c979
--- /dev/null
+++ b/ext/dl/sample/getch.rb
@@ -0,0 +1,5 @@
+require 'dl'
+
+crtdll = DL::dlopen("crtdll")
+getch = crtdll['_getch', 'L']
+print(getch.call, "\n")
diff --git a/ext/dl/sample/libc.rb b/ext/dl/sample/libc.rb
new file mode 100644
index 0000000000..a1f6fbe543
--- /dev/null
+++ b/ext/dl/sample/libc.rb
@@ -0,0 +1,69 @@
+require "dl/import"
+require "dl/struct"
+
+module LIBC
+ extend DL::Importable
+
+ begin
+ dlload "libc.so.6"
+ rescue
+ dlload "libc.so.5"
+ end
+
+ extern "int atoi(char*)"
+ extern "ibool isdigit(int)"
+ extern "int gettimeofday(struct timeval *, struct timezone *)"
+ extern "char* strcat(char*, char*)"
+ extern "FILE* fopen(char*, char*)"
+ extern "int fclose(FILE*)"
+ extern "int fgetc(FILE*)"
+ extern "int strlen(char*)"
+ extern "void qsort(void*, int, int, void*)"
+
+ def str_qsort(ary, comp)
+ len = ary.length
+ r,rs = qsort(ary, len, DL.sizeof('P'), comp)
+ return rs[0].to_a('S', len)
+ end
+
+ Timeval = struct [
+ "long tv_sec",
+ "long tv_usec",
+ ]
+
+ Timezone = struct [
+ "int tz_minuteswest",
+ "int tz_dsttime",
+ ]
+
+ def my_compare(ptr1, ptr2)
+ ptr1.ptr.to_s <=> ptr2.ptr.to_s
+ end
+ COMPARE = callback("int my_compare(char**, char**)")
+end
+
+
+$cb1 = DL.callback('IPP'){|ptr1, ptr2|
+ str1 = ptr1.ptr.to_s
+ str2 = ptr2.ptr.to_s
+ str1 <=> str2
+}
+
+p LIBC.atoi("10")
+
+p LIBC.isdigit(?1)
+
+p LIBC.isdigit(?a)
+
+p LIBC.strcat("a", "b")
+
+ary = ["a","c","b"]
+ptr = ary.to_ptr
+LIBC.qsort(ptr, ary.length, DL.sizeof('P'), LIBC::COMPARE)
+p ptr.to_a('S', ary.length)
+
+tv = LIBC::Timeval.malloc
+tz = LIBC::Timezone.malloc
+LIBC.gettimeofday(tv, tz)
+
+p Time.at(tv.tv_sec)
diff --git a/ext/dl/sample/msgbox.rb b/ext/dl/sample/msgbox.rb
new file mode 100644
index 0000000000..091e646091
--- /dev/null
+++ b/ext/dl/sample/msgbox.rb
@@ -0,0 +1,19 @@
+# This script works on Windows.
+
+require 'dl'
+
+User32 = DL.dlopen("user32")
+Kernel32 = DL.dlopen("kernel32")
+
+MB_OK = 0
+MB_OKCANCEL = 1
+
+message_box = User32['MessageBoxA', 'ILSSI']
+r,rs = message_box.call(0, 'ok?', 'error', MB_OKCANCEL)
+
+case r
+when 1
+ print("OK!\n")
+when 2
+ print("Cancel!\n")
+end
diff --git a/ext/dl/sample/msgbox2.rb b/ext/dl/sample/msgbox2.rb
new file mode 100644
index 0000000000..e49846cc5e
--- /dev/null
+++ b/ext/dl/sample/msgbox2.rb
@@ -0,0 +1,18 @@
+# This script works on Windows.
+
+require 'dl/win32'
+
+MB_OK = 0
+MB_OKCANCEL = 1
+
+message_box = Win32API.new("user32",'MessageBoxA', 'ISSI', 'I')
+r = message_box.call(0, 'ok?', 'error', MB_OKCANCEL)
+
+case r
+when 1
+ print("OK!\n")
+when 2
+ print("Cancel!\n")
+else
+ p r
+end
diff --git a/ext/dl/sample/stream.rb b/ext/dl/sample/stream.rb
new file mode 100644
index 0000000000..179836999d
--- /dev/null
+++ b/ext/dl/sample/stream.rb
@@ -0,0 +1,87 @@
+# -*- ruby -*-
+# Display a file name and stream names of a file with those size.
+
+require 'dl'
+require 'dl/import'
+
+module NTFS
+ extend DL::Importable
+
+ dlload "kernel32.dll"
+
+ OPEN_EXISTING = 3
+ GENERIC_READ = 0x80000000
+ BACKUP_DATA = 0x00000001
+ BACKUP_ALTERNATE_DATA = 0x00000004
+ FILE_SHARE_READ = 0x00000001
+ FILE_FLAG_BACKUP_SEMANTICS = 0x02000000
+
+ typealias "LPSECURITY_ATTRIBUTES", "void*"
+
+ extern "BOOL BackupRead(HANDLE, PBYTE, DWORD, PDWORD, BOOL, BOOL, PVOID)"
+ extern "BOOL BackupSeek(HANDLE, DWORD, DWORD, PDWORD, PDWORD, PVOID)"
+ extern "BOOL CloseHandle(HANDLE)"
+ extern "HANDLE CreateFile(LPCSTR, DWORD, DWORD, LPSECURITY_ATTRIBUTES,
+ DWORD, DWORD, HANDLE)"
+
+ module_function
+
+ def streams(filename)
+ status = []
+ h = createFile(filename,GENERIC_READ,FILE_SHARE_READ,nil,
+ OPEN_EXISTING,FILE_FLAG_BACKUP_SEMANTICS,0)
+ if( h != 0 )
+ begin
+ # allocate the memory for backup data used in backupRead().
+ data = DL.malloc(DL.sizeof("L5"))
+ data.struct!("LLLLL", :id, :attrs, :size_low, :size_high, :name_size)
+
+ # allocate memories for references to long values used in backupRead().
+ context = DL.malloc(DL.sizeof("L"))
+ lval = DL.malloc(DL.sizeof("L"))
+
+ while( backupRead(h, data, data.size, lval, false, false, context) )
+ size = data[:size_low] + (data[:size_high] << (DL.sizeof("I") * 8))
+ case data[:id]
+ when BACKUP_ALTERNATE_DATA
+ stream_name = DL.malloc(data[:name_size])
+ backupRead(h, stream_name, stream_name.size,
+ lval, false, false, context)
+ name = stream_name[0, stream_name.size]
+ name.tr!("\000","")
+ if( name =~ /^:(.*?):.*$/ )
+ status.push([$1,size])
+ end
+ when BACKUP_DATA
+ status.push([nil,size])
+ else
+ raise(RuntimeError, "unknown data type #{data[:id]}.")
+ end
+ l1 = DL.malloc(DL.sizeof("L"))
+ l2 = DL.malloc(DL.sizeof("L"))
+ if( !backupSeek(h, data[:size_low], data[:size_high], l1, l2, context) )
+ break
+ end
+ end
+ ensure
+ backupRead(h, nil, 0, lval, true, false, context)
+ closeHandle(h)
+ end
+ return status
+ else
+ raise(RuntimeError, "can't open #{filename}.\n")
+ end
+ end
+end
+
+ARGV.each{|filename|
+ if( File.exist?(filename) )
+ NTFS.streams(filename).each{|name,size|
+ if( name )
+ print("#{filename}:#{name}\t#{size}bytes\n")
+ else
+ print("#{filename}\t#{size}bytes\n")
+ end
+ }
+ end
+}
diff --git a/ext/dl/sym.c b/ext/dl/sym.c
new file mode 100644
index 0000000000..01e0474f58
--- /dev/null
+++ b/ext/dl/sym.c
@@ -0,0 +1,992 @@
+/* -*- C -*-
+ * $Id$
+ */
+
+#include <ruby.h>
+#include <errno.h>
+#include "dl.h"
+
+VALUE rb_cDLSymbol;
+
+static const char *
+char2type(int ch)
+{
+ switch (ch) {
+ case '0':
+ return "void";
+ case 'P':
+ return "void *";
+ case 'p':
+ return "void *";
+ case 'C':
+ return "char";
+ case 'c':
+ return "char *";
+ case 'H':
+ return "short";
+ case 'h':
+ return "short *";
+ case 'I':
+ return "int";
+ case 'i':
+ return "int *";
+ case 'L':
+ return "long";
+ case 'l':
+ return "long *";
+ case 'F':
+ return "double";
+ case 'f':
+ return "double *";
+ case 'D':
+ return "double";
+ case 'd':
+ return "double *";
+ case 'S':
+ return "const char *";
+ case 's':
+ return "char *";
+ case 'A':
+ return "[]";
+ case 'a':
+ return "[]"; /* ?? */
+ }
+ return NULL;
+}
+
+void
+dlsym_free(struct sym_data *data)
+{
+ if( data->name ){
+ DEBUG_CODE({
+ printf("dlsym_free(): free(data->name:%s)\n",data->name);
+ });
+ free(data->name);
+ }
+ if( data->type ){
+ DEBUG_CODE({
+ printf("dlsym_free(): free(data->type:%s)\n",data->type);
+ });
+ free(data->type);
+ }
+}
+
+VALUE
+rb_dlsym_new(void (*func)(), const char *name, const char *type)
+{
+ VALUE val;
+ struct sym_data *data;
+ const char *ptype;
+
+ rb_secure(4);
+ if( !type || !type[0] ){
+ return rb_dlptr_new((void*)func, 0, 0);
+ }
+
+ for( ptype = type; *ptype; ptype ++ ){
+ if( ! char2type(*ptype) ){
+ rb_raise(rb_eDLTypeError, "unknown type specifier '%c'", *ptype);
+ }
+ }
+
+ if( func ){
+ val = Data_Make_Struct(rb_cDLSymbol, struct sym_data, 0, dlsym_free, data);
+ data->func = func;
+ data->name = name ? strdup(name) : NULL;
+ data->type = type ? strdup(type) : NULL;
+ data->len = type ? strlen(type) : 0;
+#if !(defined(DLSTACK))
+ if( data->len - 1 > MAX_ARG ){
+ rb_raise(rb_eDLError, "maximum number of arguments is %d.", MAX_ARG);
+ }
+#endif
+ }
+ else{
+ val = Qnil;
+ }
+
+ return val;
+}
+
+freefunc_t
+rb_dlsym2csym(VALUE val)
+{
+ struct sym_data *data;
+ freefunc_t func;
+
+ if( rb_obj_is_kind_of(val, rb_cDLSymbol) ){
+ Data_Get_Struct(val, struct sym_data, data);
+ func = data->func;
+ }
+ else if( val == Qnil ){
+ func = NULL;
+ }
+ else{
+ rb_raise(rb_eTypeError, "DL::Symbol was expected");
+ }
+
+ return func;
+}
+
+VALUE
+rb_dlsym_s_allocate(VALUE klass)
+{
+ VALUE obj;
+ struct sym_data *data;
+
+ obj = Data_Make_Struct(klass, struct sym_data, 0, dlsym_free, data);
+ data->func = 0;
+ data->name = 0;
+ data->type = 0;
+ data->len = 0;
+
+ return obj;
+}
+
+VALUE
+rb_dlsym_initialize(int argc, VALUE argv[], VALUE self)
+{
+ VALUE addr, name, type;
+ struct sym_data *data;
+ void *saddr;
+ const char *sname, *stype;
+
+ rb_scan_args(argc, argv, "12", &addr, &name, &type);
+
+ saddr = (void*)(DLNUM2LONG(rb_Integer(addr)));
+ if (!NIL_P(name)) StringValue(name);
+ stype = NIL_P(type) ? NULL : StringValuePtr(type);
+ sname = NIL_P(name) ? NULL : RSTRING(name)->ptr;
+
+ if( saddr ){
+ Data_Get_Struct(self, struct sym_data, data);
+ if( data->name ) free(data->name);
+ if( data->type ) free(data->type);
+ data->func = saddr;
+ data->name = sname ? strdup(sname) : 0;
+ data->type = stype ? strdup(stype) : 0;
+ data->len = stype ? strlen(stype) : 0;
+ }
+
+ return Qnil;
+}
+
+VALUE
+rb_s_dlsym_char2type(VALUE self, VALUE ch)
+{
+ const char *type;
+
+ type = char2type(StringValuePtr(ch)[0]);
+
+ if (type == NULL)
+ return Qnil;
+ else
+ return rb_str_new2(type);
+}
+
+VALUE
+rb_dlsym_name(VALUE self)
+{
+ struct sym_data *sym;
+
+ Data_Get_Struct(self, struct sym_data, sym);
+ return sym->name ? rb_tainted_str_new2(sym->name) : Qnil;
+}
+
+VALUE
+rb_dlsym_proto(VALUE self)
+{
+ struct sym_data *sym;
+
+ Data_Get_Struct(self, struct sym_data, sym);
+ return sym->type ? rb_tainted_str_new2(sym->type) : Qnil;
+}
+
+VALUE
+rb_dlsym_cproto(VALUE self)
+{
+ struct sym_data *sym;
+ const char *ptype, *typestr;
+ size_t len;
+ VALUE val;
+
+ Data_Get_Struct(self, struct sym_data, sym);
+
+ ptype = sym->type;
+
+ if( ptype ){
+ typestr = char2type(*ptype++);
+ len = strlen(typestr);
+
+ val = rb_tainted_str_new(typestr, len);
+ if (typestr[len - 1] != '*')
+ rb_str_cat(val, " ", 1);
+
+ if( sym->name ){
+ rb_str_cat2(val, sym->name);
+ }
+ else{
+ rb_str_cat2(val, "(null)");
+ }
+ rb_str_cat(val, "(", 1);
+
+ while (*ptype) {
+ const char *ty = char2type(*ptype++);
+ rb_str_cat2(val, ty);
+ if (*ptype)
+ rb_str_cat(val, ", ", 2);
+ }
+
+ rb_str_cat(val, ");", 2);
+ }
+ else{
+ val = rb_tainted_str_new2("void (");
+ if( sym->name ){
+ rb_str_cat2(val, sym->name);
+ }
+ else{
+ rb_str_cat2(val, "(null)");
+ }
+ rb_str_cat2(val, ")()");
+ }
+
+ return val;
+}
+
+VALUE
+rb_dlsym_inspect(VALUE self)
+{
+ VALUE proto;
+ VALUE val;
+ char *str;
+ int str_size;
+ struct sym_data *sym;
+
+ Data_Get_Struct(self, struct sym_data, sym);
+ proto = rb_dlsym_cproto(self);
+
+ str_size = RSTRING(proto)->len + 100;
+ str = dlmalloc(str_size);
+ snprintf(str, str_size - 1,
+ "#<DL::Symbol:0x%lx func=0x%lx '%s'>",
+ sym, sym->func, RSTRING(proto)->ptr);
+ val = rb_tainted_str_new2(str);
+ dlfree(str);
+
+ return val;
+}
+
+static int
+stack_size(struct sym_data *sym)
+{
+ int i;
+ int size;
+
+ size = 0;
+ for( i=1; i < sym->len; i++ ){
+ switch(sym->type[i]){
+ case 'C':
+ case 'H':
+ case 'I':
+ case 'L':
+ size += sizeof(long);
+ break;
+ case 'F':
+ size += sizeof(float);
+ break;
+ case 'D':
+ size += sizeof(double);
+ break;
+ case 'c':
+ case 'h':
+ case 'i':
+ case 'l':
+ case 'f':
+ case 'd':
+ case 'p':
+ case 'P':
+ case 's':
+ case 'S':
+ case 'a':
+ case 'A':
+ size += sizeof(void*);
+ break;
+ default:
+ return -(sym->type[i]);
+ }
+ }
+ return size;
+}
+
+static ID rb_dl_id_DLErrno;
+
+static VALUE
+rb_dl_get_last_error(VALUE self)
+{
+ return rb_thread_local_aref(rb_thread_current(), rb_dl_id_DLErrno);
+}
+
+static VALUE
+rb_dl_set_last_error(VALUE self, VALUE val)
+{
+ errno = NUM2INT(val);
+ rb_thread_local_aset(rb_thread_current(), rb_dl_id_DLErrno, val);
+ return Qnil;
+}
+
+#ifdef HAVE_WINDOWS_H
+#include <windows.h>
+static ID rb_dl_id_DLW32Error;
+
+static VALUE
+rb_dl_win32_get_last_error(VALUE self)
+{
+ return rb_thread_local_aref(rb_thread_current(), rb_dl_id_DLW32Error);
+}
+
+static VALUE
+rb_dl_win32_set_last_error(VALUE self, VALUE val)
+{
+ SetLastError(NUM2INT(val));
+ rb_thread_local_aset(rb_thread_current(), rb_dl_id_DLW32Error, val);
+ return Qnil;
+}
+#endif
+
+#ifdef DLSTACK_GUARD
+# ifdef __MSVC_RUNTIME_CHECKS
+# pragma runtime_checks("s", off)
+# endif
+# if _MSC_VER >= 1300
+__declspec(noinline)
+# endif
+static int
+rb_dlsym_guardcall(char type, ANY_TYPE *ret, long *stack, void *func)
+{
+ char *volatile guard = ALLOCA_N(char, 1); /* guard stack pointer */
+ switch(type){
+ case '0':
+ {
+ void (*f)(DLSTACK_PROTO) = func;
+ f(DLSTACK_ARGS);
+ }
+ break;
+ case 'P':
+ case 'p':
+ {
+ void * (*f)(DLSTACK_PROTO) = func;
+ ret->p = f(DLSTACK_ARGS);
+ }
+ break;
+ case 'C':
+ case 'c':
+ {
+ char (*f)(DLSTACK_PROTO) = func;
+ ret->c = f(DLSTACK_ARGS);
+ }
+ break;
+ case 'H':
+ case 'h':
+ {
+ short (*f)(DLSTACK_PROTO) = func;
+ ret->h = f(DLSTACK_ARGS);
+ }
+ break;
+ case 'I':
+ case 'i':
+ {
+ int (*f)(DLSTACK_PROTO) = func;
+ ret->i = f(DLSTACK_ARGS);
+ }
+ break;
+ case 'L':
+ case 'l':
+ {
+ long (*f)(DLSTACK_PROTO) = func;
+ ret->l = f(DLSTACK_ARGS);
+ }
+ break;
+ case 'F':
+ case 'f':
+ {
+ float (*f)(DLSTACK_PROTO) = func;
+ ret->f = f(DLSTACK_ARGS);
+ }
+ break;
+ case 'D':
+ case 'd':
+ {
+ double (*f)(DLSTACK_PROTO) = func;
+ ret->d = f(DLSTACK_ARGS);
+ }
+ break;
+ case 'S':
+ case 's':
+ {
+ char * (*f)(DLSTACK_PROTO) = func;
+ ret->s = f(DLSTACK_ARGS);
+ }
+ break;
+ default:
+ return 0;
+ }
+ return 1;
+}
+# ifdef __MSVC_RUNTIME_CHECKS
+# pragma runtime_checks("s", restore)
+# endif
+#endif /* defined(DLSTACK_GUARD) */
+
+VALUE
+rb_dlsym_call(int argc, VALUE argv[], VALUE self)
+{
+ struct sym_data *sym;
+ ANY_TYPE *args;
+ ANY_TYPE *dargs;
+ ANY_TYPE ret;
+ int *dtypes;
+ VALUE val;
+ VALUE dvals;
+ int i;
+ long ftype;
+ void *func;
+
+ rb_secure_update(self);
+ Data_Get_Struct(self, struct sym_data, sym);
+ DEBUG_CODE({
+ printf("rb_dlsym_call(): type = '%s', func = 0x%x\n", sym->type, sym->func);
+ });
+ if( (sym->len - 1) != argc ){
+ rb_raise(rb_eArgError, "%d arguments are needed", sym->len - 1);
+ }
+
+ ftype = 0;
+ dvals = Qnil;
+
+ args = ALLOC_N(ANY_TYPE, sym->len - 1);
+ dargs = ALLOC_N(ANY_TYPE, sym->len - 1);
+ dtypes = ALLOC_N(int, sym->len - 1);
+#define FREE_ARGS {xfree(args); xfree(dargs); xfree(dtypes);}
+
+ for( i = sym->len - 2; i >= 0; i-- ){
+ dtypes[i] = 0;
+
+ switch( sym->type[i+1] ){
+ case 'p':
+ dtypes[i] = 'p';
+ case 'P':
+ {
+ struct ptr_data *data;
+ VALUE pval;
+
+ if( argv[i] == Qnil ){
+ ANY2P(args[i]) = DLVOIDP(0);
+ }
+ else{
+ if( rb_obj_is_kind_of(argv[i], rb_cDLPtrData) ){
+ pval = argv[i];
+ }
+ else{
+ pval = rb_funcall(argv[i], rb_intern("to_ptr"), 0);
+ if( !rb_obj_is_kind_of(pval, rb_cDLPtrData) ){
+ rb_raise(rb_eDLTypeError, "unexpected type of argument #%d", i);
+ }
+ }
+ Data_Get_Struct(pval, struct ptr_data, data);
+ ANY2P(args[i]) = DLVOIDP(data->ptr);
+ }
+ }
+ PUSH_P(ftype);
+ break;
+ case 'a':
+ dtypes[i] = 'a';
+ case 'A':
+ if( argv[i] == Qnil ){
+ ANY2P(args[i]) = DLVOIDP(0);
+ }
+ else{
+ ANY2P(args[i]) = DLVOIDP(rb_ary2cary(0, argv[i], NULL));
+ }
+ PUSH_P(ftype);
+ break;
+ case 'C':
+ ANY2C(args[i]) = DLCHAR(NUM2CHR(argv[i]));
+ PUSH_C(ftype);
+ break;
+ case 'c':
+ ANY2C(dargs[i]) = DLCHAR(NUM2CHR(argv[i]));
+ ANY2P(args[i]) = DLVOIDP(&(ANY2C(dargs[i])));
+ dtypes[i] = 'c';
+ PUSH_P(ftype);
+ break;
+ case 'H':
+ ANY2H(args[i]) = DLSHORT(NUM2INT(argv[i]));
+ PUSH_C(ftype);
+ break;
+ case 'h':
+ ANY2H(dargs[i]) = DLSHORT(NUM2INT(argv[i]));
+ ANY2P(args[i]) = DLVOIDP(&(ANY2H(dargs[i])));
+ dtypes[i] = 'h';
+ PUSH_P(ftype);
+ break;
+ case 'I':
+ ANY2I(args[i]) = DLINT(NUM2INT(argv[i]));
+ PUSH_I(ftype);
+ break;
+ case 'i':
+ ANY2I(dargs[i]) = DLINT(NUM2INT(argv[i]));
+ ANY2P(args[i]) = DLVOIDP(&(ANY2I(dargs[i])));
+ dtypes[i] = 'i';
+ PUSH_P(ftype);
+ break;
+ case 'L':
+ ANY2L(args[i]) = DLNUM2LONG(argv[i]);
+ PUSH_L(ftype);
+ break;
+ case 'l':
+ ANY2L(dargs[i]) = DLNUM2LONG(argv[i]);
+ ANY2P(args[i]) = DLVOIDP(&(ANY2L(dargs[i])));
+ dtypes[i] = 'l';
+ PUSH_P(ftype);
+ break;
+ case 'F':
+ Check_Type(argv[i], T_FLOAT);
+ ANY2F(args[i]) = DLFLOAT(RFLOAT(argv[i])->value);
+ PUSH_F(ftype);
+ break;
+ case 'f':
+ Check_Type(argv[i], T_FLOAT);
+ ANY2F(dargs[i]) = DLFLOAT(RFLOAT(argv[i])->value);
+ ANY2P(args[i]) = DLVOIDP(&(ANY2F(dargs[i])));
+ dtypes[i] = 'f';
+ PUSH_P(ftype);
+ break;
+ case 'D':
+ Check_Type(argv[i], T_FLOAT);
+ ANY2D(args[i]) = RFLOAT(argv[i])->value;
+ PUSH_D(ftype);
+ break;
+ case 'd':
+ Check_Type(argv[i], T_FLOAT);
+ ANY2D(dargs[i]) = RFLOAT(argv[i])->value;
+ ANY2P(args[i]) = DLVOIDP(&(ANY2D(dargs[i])));
+ dtypes[i] = 'd';
+ PUSH_P(ftype);
+ break;
+ case 'S':
+ if( argv[i] == Qnil ){
+ ANY2S(args[i]) = DLSTR(0);
+ }
+ else{
+ VALUE str = argv[i];
+ SafeStringValue(str);
+ ANY2S(args[i]) = DLSTR(RSTRING(str)->ptr);
+ }
+ PUSH_P(ftype);
+ break;
+ case 's':
+ {
+ VALUE str = argv[i];
+ SafeStringValue(str);
+ ANY2S(args[i]) = DLSTR(dlmalloc(RSTRING(str)->len + 1));
+ memcpy((char*)(ANY2S(args[i])), RSTRING(str)->ptr, RSTRING(str)->len + 1);
+ dtypes[i] = 's';
+ }
+ PUSH_P(ftype);
+ break;
+ default:
+ FREE_ARGS;
+ rb_raise(rb_eDLTypeError,
+ "unknown type '%c' of the return value.",
+ sym->type[i+1]);
+ }
+ }
+
+ switch( sym->type[0] ){
+ case '0':
+ PUSH_0(ftype);
+ break;
+ case 'P':
+ case 'p':
+ case 'S':
+ case 's':
+ case 'A':
+ case 'a':
+ PUSH_P(ftype);
+ break;
+ case 'C':
+ case 'c':
+ PUSH_C(ftype);
+ break;
+ case 'H':
+ case 'h':
+ PUSH_H(ftype);
+ break;
+ case 'I':
+ case 'i':
+ PUSH_I(ftype);
+ break;
+ case 'L':
+ case 'l':
+ PUSH_L(ftype);
+ break;
+ case 'F':
+ case 'f':
+ PUSH_F(ftype);
+ break;
+ case 'D':
+ case 'd':
+ PUSH_D(ftype);
+ break;
+ default:
+ FREE_ARGS;
+ rb_raise(rb_eDLTypeError,
+ "unknown type `%c' of the return value.",
+ sym->type[0]);
+ }
+
+ func = sym->func;
+
+#if defined(DLSTACK)
+ {
+#if defined(DLSTACK_SIZE)
+ int stk_size;
+ long stack[DLSTACK_SIZE];
+ long *sp;
+
+ sp = stack;
+ stk_size = stack_size(sym);
+ if( stk_size < 0 ){
+ FREE_ARGS;
+ rb_raise(rb_eDLTypeError, "unknown type '%c'.", -stk_size);
+ }
+ else if( stk_size > (int)(DLSTACK_SIZE) ){
+ FREE_ARGS;
+ rb_raise(rb_eArgError, "too many arguments.");
+ }
+#endif
+
+ DLSTACK_START(sym);
+
+#if defined(DLSTACK_REVERSE)
+ for( i = sym->len - 2; i >= 0; i-- )
+#else
+ for( i = 0; i <= sym->len -2; i++ )
+#endif
+ {
+ switch( sym->type[i+1] ){
+ case 'p':
+ case 'P':
+ DLSTACK_PUSH_P(ANY2P(args[i]));
+ break;
+ case 'a':
+ case 'A':
+ DLSTACK_PUSH_P(ANY2P(args[i]));
+ break;
+ case 'C':
+ DLSTACK_PUSH_C(ANY2C(args[i]));
+ break;
+ case 'c':
+ DLSTACK_PUSH_P(ANY2P(args[i]));
+ break;
+ case 'H':
+ DLSTACK_PUSH_H(ANY2H(args[i]));
+ break;
+ case 'h':
+ DLSTACK_PUSH_P(ANY2P(args[i]));
+ break;
+ case 'I':
+ DLSTACK_PUSH_I(ANY2I(args[i]));
+ break;
+ case 'i':
+ DLSTACK_PUSH_P(ANY2P(args[i]));
+ break;
+ case 'L':
+ DLSTACK_PUSH_L(ANY2L(args[i]));
+ break;
+ case 'l':
+ DLSTACK_PUSH_P(ANY2P(args[i]));
+ break;
+ case 'F':
+ DLSTACK_PUSH_F(ANY2F(args[i]));
+ break;
+ case 'f':
+ DLSTACK_PUSH_P(ANY2P(args[i]));
+ break;
+ case 'D':
+ DLSTACK_PUSH_D(ANY2D(args[i]));
+ break;
+ case 'd':
+ DLSTACK_PUSH_P(ANY2P(args[i]));
+ break;
+ case 'S':
+ case 's':
+ DLSTACK_PUSH_P(ANY2S(args[i]));
+ break;
+ }
+ }
+ DLSTACK_END(sym->type);
+
+#ifdef DLSTACK_GUARD
+ if(!rb_dlsym_guardcall(sym->type[0], &ret, stack, func)) {
+ FREE_ARGS;
+ rb_raise(rb_eDLTypeError, "unknown type `%c'", sym->type[0]);
+ }
+#else /* defined(DLSTACK_GUARD) */
+ {
+ switch( sym->type[0] ){
+ case '0':
+ {
+ void (*f)(DLSTACK_PROTO) = func;
+ f(DLSTACK_ARGS);
+ }
+ break;
+ case 'P':
+ case 'p':
+ {
+ void * (*f)(DLSTACK_PROTO) = func;
+ ret.p = f(DLSTACK_ARGS);
+ }
+ break;
+ case 'C':
+ case 'c':
+ {
+ char (*f)(DLSTACK_PROTO) = func;
+ ret.c = f(DLSTACK_ARGS);
+ }
+ break;
+ case 'H':
+ case 'h':
+ {
+ short (*f)(DLSTACK_PROTO) = func;
+ ret.h = f(DLSTACK_ARGS);
+ }
+ break;
+ case 'I':
+ case 'i':
+ {
+ int (*f)(DLSTACK_PROTO) = func;
+ ret.i = f(DLSTACK_ARGS);
+ }
+ break;
+ case 'L':
+ case 'l':
+ {
+ long (*f)(DLSTACK_PROTO) = func;
+ ret.l = f(DLSTACK_ARGS);
+ }
+ break;
+ case 'F':
+ case 'f':
+ {
+ float (*f)(DLSTACK_PROTO) = func;
+ ret.f = f(DLSTACK_ARGS);
+ }
+ break;
+ case 'D':
+ case 'd':
+ {
+ double (*f)(DLSTACK_PROTO) = func;
+ ret.d = f(DLSTACK_ARGS);
+ }
+ break;
+ case 'S':
+ case 's':
+ {
+ char * (*f)(DLSTACK_PROTO) = func;
+ ret.s = f(DLSTACK_ARGS);
+ }
+ break;
+ default:
+ FREE_ARGS;
+ rb_raise(rb_eDLTypeError, "unknown type `%c'", sym->type[0]);
+ }
+ }
+#endif /* defubed(DLSTACK_GUARD) */
+
+ {
+ /*
+ * We should get the value of errno/GetLastError() before calling another functions.
+ */
+ int last_errno = errno;
+#ifdef _WIN32
+ DWORD win32_last_err = GetLastError();
+#endif
+
+ rb_thread_local_aset(rb_thread_current(), rb_dl_id_DLErrno, INT2NUM(last_errno));
+#ifdef _WIN32
+ rb_thread_local_aset(rb_thread_current(), rb_dl_id_DLW32Error, INT2NUM(win32_last_err));
+#endif
+ }
+
+ }
+#else /* defined(DLSTACK) */
+ switch(ftype){
+#include "call.func"
+ default:
+ FREE_ARGS;
+ rb_raise(rb_eDLTypeError, "unsupported function type `%s'", sym->type);
+ }
+#endif /* defined(DLSTACK) */
+
+ switch( sym->type[0] ){
+ case '0':
+ val = Qnil;
+ break;
+ case 'P':
+ val = rb_dlptr_new((void*)(ANY2P(ret)), 0, 0);
+ break;
+ case 'p':
+ val = rb_dlptr_new((void*)(ANY2P(ret)), 0, dlfree);
+ break;
+ case 'C':
+ case 'c':
+ val = CHR2FIX((char)(ANY2C(ret)));
+ break;
+ case 'H':
+ case 'h':
+ val = INT2NUM((short)(ANY2H(ret)));
+ break;
+ case 'I':
+ case 'i':
+ val = INT2NUM((int)(ANY2I(ret)));
+ break;
+ case 'L':
+ case 'l':
+ val = DLLONG2NUM((long)(ANY2L(ret)));
+ break;
+ case 'F':
+ case 'f':
+ val = rb_float_new((double)(ANY2F(ret)));
+ break;
+ case 'D':
+ case 'd':
+ val = rb_float_new((double)(ANY2D(ret)));
+ break;
+ case 'S':
+ if( ANY2S(ret) ){
+ val = rb_tainted_str_new2((char*)(ANY2S(ret)));
+ }
+ else{
+ val = Qnil;
+ }
+ break;
+ case 's':
+ if( ANY2S(ret) ){
+ val = rb_tainted_str_new2((char*)(ANY2S(ret)));
+ DEBUG_CODE({
+ printf("dlfree(%s)\n",(char*)(ANY2S(ret)));
+ });
+ dlfree((void*)(ANY2S(ret)));
+ }
+ else{
+ val = Qnil;
+ }
+ break;
+ default:
+ FREE_ARGS;
+ rb_raise(rb_eDLTypeError, "unknown type `%c'", sym->type[0]);
+ }
+
+ dvals = rb_ary_new();
+ for( i = 0; i <= sym->len - 2; i++ ){
+ if( dtypes[i] ){
+ switch( dtypes[i] ){
+ case 'c':
+ rb_ary_push(dvals, CHR2FIX(*((char*)(ANY2P(args[i])))));
+ break;
+ case 'h':
+ rb_ary_push(dvals, INT2NUM(*((short*)(ANY2P(args[i])))));
+ break;
+ case 'i':
+ rb_ary_push(dvals, INT2NUM(*((int*)(ANY2P(args[i])))));
+ break;
+ case 'l':
+ rb_ary_push(dvals, DLLONG2NUM(*((long*)(ANY2P(args[i])))));
+ break;
+ case 'f':
+ rb_ary_push(dvals, rb_float_new(*((float*)(ANY2P(args[i])))));
+ break;
+ case 'd':
+ rb_ary_push(dvals, rb_float_new(*((double*)(ANY2P(args[i])))));
+ break;
+ case 'p':
+ rb_ary_push(dvals, rb_dlptr_new((void*)(ANY2P(args[i])), 0, 0));
+ break;
+ case 'a':
+ rb_ary_push(dvals, rb_dlptr_new((void*)ANY2P(args[i]), 0, 0));
+ break;
+ case 's':
+ rb_ary_push(dvals, rb_tainted_str_new2((char*)ANY2S(args[i])));
+ DEBUG_CODE({
+ printf("dlfree(%s)\n",(char*)ANY2S(args[i]));
+ });
+ dlfree((void*)ANY2S(args[i]));
+ break;
+ default:
+ {
+ char c = dtypes[i];
+ FREE_ARGS;
+ rb_raise(rb_eRuntimeError, "unknown argument type '%c'", i, c);
+ }
+ }
+ }
+ else{
+ switch( sym->type[i+1] ){
+ case 'A':
+ dlfree((void*)ANY2P(args[i]));
+ break;
+ }
+ rb_ary_push(dvals, argv[i]);
+ }
+ }
+
+ FREE_ARGS;
+#undef FREE_ARGS
+ return rb_assoc_new(val,dvals);
+}
+
+VALUE
+rb_dlsym_to_i(VALUE self)
+{
+ struct sym_data *sym;
+
+ Data_Get_Struct(self, struct sym_data, sym);
+ return DLLONG2NUM(sym);
+}
+
+VALUE
+rb_dlsym_to_ptr(VALUE self)
+{
+ struct sym_data *sym;
+
+ Data_Get_Struct(self, struct sym_data, sym);
+ return rb_dlptr_new(sym->func, sizeof(freefunc_t), 0);
+}
+
+void
+Init_dlsym()
+{
+ rb_cDLSymbol = rb_define_class_under(rb_mDL, "Symbol", rb_cObject);
+ rb_define_alloc_func(rb_cDLSymbol, rb_dlsym_s_allocate);
+ rb_define_singleton_method(rb_cDLSymbol, "char2type", rb_s_dlsym_char2type, 1);
+ rb_define_method(rb_cDLSymbol, "initialize", rb_dlsym_initialize, -1);
+ rb_define_method(rb_cDLSymbol, "call", rb_dlsym_call, -1);
+ rb_define_method(rb_cDLSymbol, "[]", rb_dlsym_call, -1);
+ rb_define_method(rb_cDLSymbol, "name", rb_dlsym_name, 0);
+ rb_define_method(rb_cDLSymbol, "proto", rb_dlsym_proto, 0);
+ rb_define_method(rb_cDLSymbol, "cproto", rb_dlsym_cproto, 0);
+ rb_define_method(rb_cDLSymbol, "inspect", rb_dlsym_inspect, 0);
+ rb_define_method(rb_cDLSymbol, "to_s", rb_dlsym_cproto, 0);
+ rb_define_method(rb_cDLSymbol, "to_ptr", rb_dlsym_to_ptr, 0);
+ rb_define_method(rb_cDLSymbol, "to_i", rb_dlsym_to_i, 0);
+
+ rb_dl_id_DLErrno = rb_intern("DLErrno");
+ rb_define_singleton_method(rb_mDL, "last_error", rb_dl_get_last_error, 0);
+ rb_define_singleton_method(rb_mDL, "last_error=", rb_dl_set_last_error, 1);
+#ifdef _WIN32
+ rb_dl_id_DLW32Error = rb_intern("DLW32Error");
+ rb_define_singleton_method(rb_mDL, "win32_last_error", rb_dl_win32_get_last_error, 0);
+ rb_define_singleton_method(rb_mDL, "win32_last_error=", rb_dl_win32_set_last_error, 1);
+#endif
+}
diff --git a/ext/dl/test/libtest.def b/ext/dl/test/libtest.def
new file mode 100644
index 0000000000..8ecefc917b
--- /dev/null
+++ b/ext/dl/test/libtest.def
@@ -0,0 +1,28 @@
+EXPORTS
+test_alloc_test_struct
+test_append
+test_arylen
+test_c2i
+test_call_func1
+test_callback1
+test_close
+test_d2f
+test_f2d
+test_fill_test_struct
+test_fill_test_union
+test_gets
+test_i2c
+test_init
+test_isucc
+test_lcc
+test_lsucc
+test_open
+test_strcat
+test_strlen
+test_succ
+test_data_init
+test_data_add
+test_data_aref
+test_set_long_value
+test_get_long_value
+internal_long_value
diff --git a/ext/dl/test/test.c b/ext/dl/test/test.c
new file mode 100644
index 0000000000..7321379390
--- /dev/null
+++ b/ext/dl/test/test.c
@@ -0,0 +1,247 @@
+#include <stdio.h>
+#include <string.h>
+
+static char internal_string[] = "internal_string";
+long internal_long_value = 100;
+
+struct test_struct {
+ char c;
+ long l;
+};
+
+union test_union {
+ char c;
+ int i;
+ long l;
+ void *p;
+};
+
+struct test_data {
+ char name[1024];
+ struct test_data *next;
+};
+
+long
+test_get_long_value()
+{
+ return internal_long_value;
+};
+
+void
+test_set_long_value(long l)
+{
+ internal_long_value = l;
+};
+
+void
+test_fill_test_struct(struct test_struct *ptr, char c, long l)
+{
+ ptr->c = c;
+ ptr->l = l;
+};
+
+void
+test_fill_test_union(union test_union *ptr, long l)
+{
+ ptr->l = l;
+};
+
+struct test_struct *
+test_alloc_test_struct(char c, long l)
+{
+ struct test_struct *data;
+
+ data = (struct test_struct *)malloc(sizeof(struct test_struct));
+ data->c = c;
+ data->l = l;
+
+ return data;
+};
+
+int
+test_c2i(char c)
+{
+ return (int)c;
+};
+
+char
+test_i2c(int i)
+{
+ return (char)i;
+};
+
+long
+test_lcc(char c1, char c2)
+{
+ return (long)(c1 + c2);
+};
+
+double
+test_f2d(float f)
+{
+ double d;
+ d = f;
+ return d;
+};
+
+float
+test_d2f(double d)
+{
+ float f;
+ f = d;
+ return f;
+};
+
+int
+test_strlen(const char *str)
+{
+ return strlen(str);
+};
+
+int
+test_isucc(int i)
+{
+ return (i+1);
+};
+
+long
+test_lsucc(long l)
+{
+ return (l+1);
+};
+
+void
+test_succ(long *l)
+{
+ (*l)++;
+};
+
+char *
+test_strcat(char *str1, const char *str2)
+{
+ return strcat(str1, str2);
+};
+
+int
+test_arylen(char *ary[])
+{
+ int i;
+ for( i=0; ary[i]; i++ ){};
+ return i;
+};
+
+void
+test_append(char *ary[], int len, char *astr)
+{
+ int i;
+ int size1,size2;
+ char *str;
+
+ size2 = strlen(astr);
+
+ for( i=0; i <= len - 1; i++ ){
+ size1 = strlen(ary[i]);
+ str = (char*)malloc(size1 + size2 + 1);
+ strcpy(str, ary[i]);
+ strcat(str, astr);
+ ary[i] = str;
+ };
+};
+
+int
+test_init(int *argc, char **argv[])
+{
+ int i;
+ char s[256];
+
+ for( i=0; i < (*argc); i++ ){
+ sprintf(s, "arg%d", i);
+ if( strcmp((*argv)[i], s) != 0 ){
+ return 1;
+ }
+ }
+ return 0;
+}
+
+FILE *
+test_open(const char *filename, const char *mode)
+{
+ FILE *file;
+ file = fopen(filename,mode);
+ return file;
+};
+
+void
+test_close(FILE *file)
+{
+ fclose(file);
+};
+
+char *
+test_gets(char *s, int size, FILE *f)
+{
+ return fgets(s,size,f);
+};
+
+typedef int callback1_t(int, char *);
+#define CALLBACK_MSG "callback message"
+
+int
+test_callback1(int err, const char *msg)
+{
+ if( strcmp(msg, CALLBACK_MSG) == 0 ){
+ return 1;
+ }
+ else{
+ return 0;
+ }
+}
+
+int
+test_call_func1(callback1_t *func)
+{
+ if( func ){
+ return (*func)(0, CALLBACK_MSG);
+ }
+ else{
+ return 0;
+ }
+}
+
+struct test_data *
+test_data_init()
+{
+ struct test_data *data;
+
+ data = (struct test_data *)malloc(sizeof(struct test_data));
+ data->next = NULL;
+ memset(data->name, 0, 1024);
+
+ return data;
+};
+
+void
+test_data_add(struct test_data *list, const char *name)
+{
+ struct test_data *data;
+
+ data = (struct test_data *)malloc(sizeof(struct test_data));
+ memset(data->name, 0, 1024);
+ strncpy(data->name, name, 1024);
+ data->next = list->next;
+ list->next = data;
+};
+
+struct test_data *
+test_data_aref(struct test_data *list, int i)
+{
+ struct test_data *data;
+ int j;
+
+ for( data = list->next, j=0; data; data = data->next, j++ ){
+ if( i == j ){
+ return data;
+ };
+ };
+ return NULL;
+};
diff --git a/ext/dl/test/test.rb b/ext/dl/test/test.rb
new file mode 100644
index 0000000000..bf8dfc18e3
--- /dev/null
+++ b/ext/dl/test/test.rb
@@ -0,0 +1,306 @@
+# -*- ruby -*-
+
+require 'dl'
+require 'dl/import'
+
+$FAIL = 0
+$TOTAL = 0
+
+def assert(label, ty, *conds)
+ $TOTAL += 1
+ cond = !conds.include?(false)
+ if( cond )
+ printf("succeed in `#{label}'\n")
+ else
+ $FAIL += 1
+ case ty
+ when :may
+ printf("fail in `#{label}' ... expected\n")
+ when :must
+ printf("fail in `#{label}' ... unexpected\n")
+ when :raise
+ raise(RuntimeError, "fail in `#{label}'")
+ end
+ end
+end
+
+def debug(*xs)
+ if( $DEBUG )
+ xs.each{|x|
+ p x
+ }
+ end
+end
+
+print("DLSTACK = #{DL::DLSTACK}\n")
+print("MAX_ARG = #{DL::MAX_ARG}\n")
+print("\n")
+print("DL::FREE = #{DL::FREE.inspect}\n")
+print("\n")
+
+$LIB = nil
+if( !$LIB && File.exist?("libtest.so") )
+ $LIB = "./libtest.so"
+end
+if( !$LIB && File.exist?("test/libtest.so") )
+ $LIB = "./test/libtest.so"
+end
+
+module LIBTest
+ extend DL::Importable
+
+ dlload($LIB)
+ extern "int test_c2i(char)"
+ extern "char test_i2c(int)"
+ extern "long test_lcc(char, char)"
+ extern "double test_f2d(float)"
+ extern "float test_d2f(double)"
+ extern "int test_strlen(char*)"
+ extern "int test_isucc(int)"
+ extern "long test_lsucc(long)"
+ extern "void test_succ(long *)"
+ extern "int test_arylen(int [])"
+ extern "void test_append(char*[], int, char *)"
+end
+
+DL.dlopen($LIB){|h|
+ c2i = h["test_c2i","IC"]
+ debug c2i
+ r,rs = c2i[?a]
+ debug r,rs
+ assert("c2i", :may, r == ?a)
+ assert("extern c2i", :must, r == LIBTest.test_c2i(?a))
+
+ i2c = h["test_i2c","CI"]
+ debug i2c
+ r,rs = i2c[?a]
+ debug r,rs
+ assert("i2c", :may, r == ?a)
+ assert("exern i2c", :must, r == LIBTest.test_i2c(?a))
+
+ lcc = h["test_lcc","LCC"]
+ debug lcc
+ r,rs = lcc[1,2]
+ assert("lcc", :may, r == 3)
+ assert("extern lcc", :must, r == LIBTest.test_lcc(1,2))
+
+ f2d = h["test_f2d","DF"]
+ debug f2d
+ r,rs = f2d[20.001]
+ debug r,rs
+ assert("f2d", :may, r.to_i == 20)
+ assert("extern f2d", :must, r = LIBTest.test_f2d(20.001))
+
+ d2f = h["test_d2f","FD"]
+ debug d2f
+ r,rs = d2f[20.001]
+ debug r,rs
+ assert("d2f", :may, r.to_i == 20)
+ assert("extern d2f", :must, r == LIBTest.test_d2f(20.001))
+
+ strlen = h["test_strlen","IS"]
+ debug strlen
+ r,rs = strlen["0123456789"]
+ debug r,rs
+ assert("strlen", :must, r == 10)
+ assert("extern strlen", :must, r == LIBTest.test_strlen("0123456789"))
+
+ isucc = h["test_isucc","II"]
+ debug isucc
+ r,rs = isucc[2]
+ debug r,rs
+ assert("isucc", :must, r == 3)
+ assert("extern isucc", :must, r == LIBTest.test_isucc(2))
+
+ lsucc = h["test_lsucc","LL"]
+ debug lsucc
+ r,rs = lsucc[10000000]
+ debug r,rs
+ assert("lsucc", :must, r == 10000001)
+ assert("extern lsucc", :must, r == LIBTest.test_lsucc(10000000))
+
+ succ = h["test_succ","0l"]
+ debug succ
+ r,rs = succ[0]
+ debug r,rs
+ assert("succ", :must, rs[0] == 1)
+ l = DL.malloc(DL.sizeof("L"))
+ l.struct!("L",:lval)
+ LIBTest.test_succ(l)
+ assert("extern succ", :must, rs[0] == l[:lval])
+
+ arylen = h["test_arylen","IA"]
+ debug arylen
+ r,rs = arylen[["a","b","c","d",nil]]
+ debug r,rs
+ assert("arylen", :must, r == 4)
+
+ arylen = h["test_arylen","IP"]
+ debug arylen
+ r,rs = arylen[["a","b","c","d",nil]]
+ debug r,rs
+ assert("arylen", :must, r == 4)
+ assert("extern arylen", :must, r == LIBTest.test_arylen(["a","b","c","d",nil]))
+
+ append = h["test_append","0aIS"]
+ debug append
+ r,rs = append[["a","b","c"],3,"x"]
+ debug r,rs
+ assert("append", :must, rs[0].to_a('S',3) == ["ax","bx","cx"])
+
+ LIBTest.test_append(["a","b","c"],3,"x")
+ assert("extern append", :must, rs[0].to_a('S',3) == LIBTest._args_[0].to_a('S',3))
+
+ strcat = h["test_strcat","SsS"]
+ debug strcat
+ r,rs = strcat["abc\0","x"]
+ debug r,rs
+ assert("strcat", :must, rs[0].to_s == "abcx")
+
+ init = h["test_init","IiP"]
+ debug init
+ argc = 3
+ argv = ["arg0","arg1","arg2"].to_ptr
+ r,rs = init[argc, argv.ref]
+ assert("init", :must, r == 0)
+}
+
+
+h = DL.dlopen($LIB)
+
+sym_open = h["test_open", "PSS"]
+sym_gets = h["test_gets", "SsIP"]
+sym_close = h["test_close", "0P"]
+debug sym_open,sym_gets,sym_close
+
+line = "Hello world!\n"
+File.open("tmp.txt", "w"){|f|
+ f.print(line)
+}
+
+fp,rs = sym_open["tmp.txt", "r"]
+if( fp )
+ fp.free = sym_close
+ r,rs = sym_gets[" " * 256, 256, fp]
+ debug r,rs
+ assert("open,gets", :must, rs[0] == line)
+ ObjectSpace.define_finalizer(fp) {File.unlink("tmp.txt")}
+ fp = nil
+else
+ assert("open,gets", :must, line == nil)
+ File.unlink("tmp.txt")
+end
+
+
+callback1 = h["test_callback1"]
+debug callback1
+r,rs = h["test_call_func1", "IP"][callback1]
+debug r,rs
+assert("callback1", :must, r == 1)
+
+
+callback2 = DL.callback("LLP"){|num,ptr|
+ msg = ptr.to_s
+ if( msg == "callback message" )
+ 2
+ else
+ 0
+ end
+}
+debug callback2
+r,rs = h["test_call_func1", "IP"][callback2]
+debug r,rs
+assert("callback2", :must, r == 2)
+DL.remove_callback(callback2)
+
+ptr = DL.malloc(DL.sizeof('CL'))
+ptr.struct!("CL", :c, :l)
+ptr["c"] = 0
+ptr["l"] = 0
+r,rs = h["test_fill_test_struct","0PIL"][ptr,100,1000]
+debug r,rs
+assert("fill_test_struct", :must, ptr["c"] == 100, ptr["l"] == 1000)
+assert("fill_test_struct", :must, ptr[:c] == 100, ptr[:l] == 1000) unless (Fixnum === :-)
+
+
+r,rs = h["test_alloc_test_struct", "PIL"][100,200]
+r.free = DL::FREE
+r.struct!("CL", :c, :l)
+assert("alloc_test_struct", :must, r["c"] == 100, r["l"] == 200)
+assert("alloc_test_struct", :must, r[:c] == 100, r[:l] == 200) unless (Fixnum === :-)
+
+ptr = h["test_strlen"]
+sym1 = DL::Symbol.new(ptr,"foo","0")
+sym2 = h["test_strlen","LS"]
+assert("Symbol.new", :must, ptr == sym1.to_ptr, sym1.to_ptr == sym2.to_ptr)
+
+set_val = h["test_set_long_value","0"]
+get_val = h["test_get_long_value","L"]
+lval = get_val[][0]
+ptr = h["internal_long_value"]
+ptr.struct!("L", :l)
+assert("get value", :must, ptr["l"] == lval)
+assert("get value", :must, ptr[:l] == lval) unless (Fixnum === :-)
+ptr["l"] = 200
+lval = get_val[][0]
+assert("set value", :must, ptr["l"] == lval)
+assert("set value", :must, ptr[:l] == lval) unless (Fixnum === :-)
+
+
+data_init = h["test_data_init", "P"]
+data_add = h["test_data_add", "0PS"]
+data_aref = h["test_data_aref", "PPI"]
+r,rs = data_init[]
+ptr = r
+data_add[ptr, "name1"]
+data_add[ptr, "name2"]
+data_add[ptr, "name3"]
+
+r,rs = data_aref[ptr, 1]
+ptr = r
+ptr.struct!("C1024P", :name, :next)
+assert("data_aref", :must,
+ ptr["name"].collect{|c| c.chr}.join.split("\0")[0] == "name2")
+assert("data_aref", :must,
+ ptr["name"].collect{|c| c.chr}.join.split("\0")[0] == "name2") unless (Fixnum === :-)
+
+ptr = ptr["next"]
+ptr.struct!("C1024P", :name, :next)
+assert("data_aref", :must,
+ ptr["name"].collect{|c| c.chr}.join.split("\0")[0] == "name1")
+assert("data_aref", :must,
+ ptr["name"].collect{|c| c.chr}.join.split("\0")[0] == "name1") unless (Fixnum === :-)
+
+GC.start
+
+ptr = DL::malloc(32)
+ptr.struct!("CHIL", "c", "h", "i", "l")
+ptr["c"] = 1
+ptr["h"] = 2
+ptr["i"] = 3
+ptr["l"] = 4
+assert("struct!", :must,
+ ptr["c"] == 1 &&
+ ptr["h"] == 2 &&
+ ptr["i"] == 3 &&
+ ptr["l"] == 4)
+
+ptr = DL::malloc(DL::sizeof("IP"))
+ptr.struct!("IP", "n", "ptr")
+ptr["n"] = 10
+ptr["ptr"] = nil
+assert("struct!", :must, ptr["n"] == 10 && ptr["ptr"] == nil)
+
+ptr = DL::malloc(16)
+ptr.struct!("CICI", "c1", "i1", "c2", "i2")
+ptr["c1"] = 0xf1
+ptr["c2"] = 0xf2
+c1 = [ptr["c1"]].pack("c").unpack("C")[0]
+c2 = [ptr["c2"]].pack("c").unpack("C")[0]
+assert("struct!", :must,
+ c1 == 0xf1 &&
+ c2 == 0xf2)
+
+
+GC.start
+printf("fail/total = #{$FAIL}/#{$TOTAL}\n")
diff --git a/ext/dl/type.rb b/ext/dl/type.rb
new file mode 100644
index 0000000000..804420c395
--- /dev/null
+++ b/ext/dl/type.rb
@@ -0,0 +1,115 @@
+# example:
+# DLTYPE[INT][:rb2c]["arg0"] => "NUM2INT(arg0)"
+# DLTYPE[DOUBLE][:c2rb]["r"] => "rb_float_new(r)"
+
+DLTYPE = {
+ VOID = 0x00 => {
+ :name => 'VOID',
+ :rb2c => nil,
+ :c2rb => nil,
+ :ctype => "void",
+ :stmem => "v",
+ :sym => true,
+ :cb => true,
+ },
+ CHAR = 0x01 => {
+ :name => 'CHAR',
+ :rb2c => proc{|x| "NUM2CHR(#{x})"},
+ :c2rb => proc{|x| "CHR2FIX(#{x})"},
+ :ctype => "char",
+ :stmem => "c",
+ :sym => false,
+ :cb => false,
+ },
+ SHORT = 0x02 => {
+ :name => 'SHORT',
+ :rb2c => proc{|x| "FIX2INT(#{x})"},
+ :c2rb => proc{|x| "INT2FIX(#{x})"},
+ :ctype => "short",
+ :stmem => "h",
+ :sym => false,
+ :cb => false,
+ },
+ INT = 0x03 => {
+ :name => 'INT',
+ :rb2c => proc{|x| "NUM2INT(#{x})"},
+ :c2rb => proc{|x| "INT2NUM(#{x})"},
+ :ctype => "int",
+ :stmem => "i",
+ :sym => true,
+ :cb => false,
+ },
+ LONG = 0x04 => {
+ :name => 'LONG',
+ :rb2c => proc{|x| "NUM2INT(#{x})"},
+ :c2rb => proc{|x| "INT2NUM(#{x})"},
+ :ctype => "long",
+ :stmem => "l",
+ :sym => true,
+ :cb => true,
+ },
+ FLOAT = 0x05 => {
+ :name => 'FLOAT',
+ :rb2c => proc{|x| "(float)(RFLOAT(#{x})->value)"},
+ :c2rb => proc{|x| "rb_float_new((double)#{x})"},
+ :ctype => "float",
+ :stmem => "f",
+ :sym => false,
+ :cb => false,
+ },
+ DOUBLE = 0x06 => {
+ :name => 'DOUBLE',
+ :rb2c => proc{|x| "RFLOAT(#{x})->value"},
+ :c2rb => proc{|x| "rb_float_new(#{x})"},
+ :ctype => "double",
+ :stmem => "d",
+ :sym => true,
+ :cb => true,
+ },
+ VOIDP = 0x07 => {
+ :name => 'VOIDP',
+ :rb2c => proc{|x| "rb_dlptr2cptr(#{x})"},
+ :c2rb => proc{|x| "rb_dlptr_new(#{x},sizeof(void*),0)"},
+ :ctype => "void *",
+ :stmem => "p",
+ :sym => true,
+ :cb => true,
+ },
+}
+
+def tpush(t, x)
+ (t << 3)|x
+end
+
+def tget(t, i)
+ (t & (0x07 << (i * 3))) >> (i * 3)
+end
+
+def types2num(types)
+ res = 0x00
+ r = types.reverse
+ r.each{|t|
+ res = tpush(res,t)
+ }
+ res
+end
+
+def num2types(num)
+ ts = []
+ i = 0
+ t = tget(num,i)
+ while( (t != VOID && i > 0) || (i == 0) )
+ ts.push(DLTYPE[t][:ctype])
+ i += 1
+ t = tget(num,i)
+ end
+ ts
+end
+
+def types2ctypes(types)
+ res = []
+ types.each{|t|
+ res.push(DLTYPE[t][:ctype])
+ }
+ res
+end
diff --git a/ext/dl/win32/extconf.rb b/ext/dl/win32/extconf.rb
deleted file mode 100644
index a72ca49c06..0000000000
--- a/ext/dl/win32/extconf.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-if compiled?('dl') and $mswin||$bccwin||$mingw||$cygwin
- create_makefile('win32')
-end
diff --git a/ext/dl/win32/lib/Win32API.rb b/ext/dl/win32/lib/Win32API.rb
deleted file mode 100644
index f18cec5749..0000000000
--- a/ext/dl/win32/lib/Win32API.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-# -*- ruby -*-
-# for backward compatibility
-warn "Warning:#{caller[0].sub(/:in `.*'\z/, '')}: Win32API is deprecated after Ruby 1.9.1; use dl directly instead" if $VERBOSE
-
-require 'dl'
-
-class Win32API
- DLL = {}
- TYPEMAP = {"0" => DL::TYPE_VOID, "S" => DL::TYPE_VOIDP, "I" => DL::TYPE_LONG}
-
- def initialize(dllname, func, import, export = "0", calltype = :stdcall)
- @proto = [import].join.tr("VPpNnLlIi", "0SSI").sub(/^(.)0*$/, '\1')
- handle = DLL[dllname] ||= DL.dlopen(dllname)
- @func = DL::CFunc.new(handle[func], TYPEMAP[export.tr("VPpNnLlIi", "0SSI")], func, calltype)
- rescue DL::DLError => e
- raise LoadError, e.message, e.backtrace
- end
-
- def call(*args)
- import = @proto.split("")
- args.each_with_index do |x, i|
- args[i], = [x == 0 ? nil : x].pack("p").unpack("l!*") if import[i] == "S"
- args[i], = [x].pack("I").unpack("i") if import[i] == "I"
- end
- ret, = @func.call(args)
- return ret || 0
- end
-
- alias Call call
-end
diff --git a/ext/dl/win32/lib/win32/registry.rb b/ext/dl/win32/lib/win32/registry.rb
deleted file mode 100644
index a2b69a08fe..0000000000
--- a/ext/dl/win32/lib/win32/registry.rb
+++ /dev/null
@@ -1,839 +0,0 @@
-=begin
-= Win32 Registry I/F
-win32/registry is registry accessor library for Win32 platform.
-It uses dl/import to call Win32 Registry APIs.
-
-== example
- Win32::Registry::HKEY_CURRENT_USER.open('SOFTWARE\foo') do |reg|
- value = reg['foo'] # read a value
- value = reg['foo', Win32::Registry::REG_SZ] # read a value with type
- type, value = reg.read('foo') # read a value
- reg['foo'] = 'bar' # write a value
- reg['foo', Win32::Registry::REG_SZ] = 'bar' # write a value with type
- reg.write('foo', Win32::Registry::REG_SZ, 'bar') # write a value
-
- reg.each_value { |name, type, data| ... } # Enumerate values
- reg.each_key { |key, wtime| ... } # Enumerate subkeys
-
- reg.delete_value(name) # Delete a value
- reg.delete_key(name) # Delete a subkey
- reg.delete_key(name, true) # Delete a subkey recursively
- end
-
-= Reference
-
-== Win32::Registry class
-
-=== including modules
-
-* Enumerable
-* Registry::Constants
-
-=== class methods
---- Registry.open(key, subkey, desired = KEY_READ, opt = REG_OPTION_RESERVED)
---- Registry.open(key, subkey, desired = KEY_READ, opt = REG_OPTION_RESERVED) { |reg| ... }
- Open the registry key ((|subkey|)) under ((|key|)).
- ((|key|)) is Win32::Registry object of parent key.
- You can use predefined key HKEY_* (see ((<constants>)))
-
- ((|desired|)) and ((|opt|)) is access mask and key option.
- For detail, see ((<MSDN Library|URL:http://msdn.microsoft.com/library/en-us/sysinfo/base/regopenkeyex.asp>)).
-
- If block is given, the key is closed automatically.
-
---- Registry.create(key, subkey, desired = KEY_ALL_ACCESS, opt = REG_OPTION_RESERVED)
---- Registry.create(key, subkey, desired = KEY_ALL_ACCESS, opt = REG_OPTION_RESERVED) { |reg| ... }
- Create or open the registry key ((|subkey|)) under ((|key|)).
- You can use predefined key HKEY_* (see ((<constants>)))
-
- If subkey is already exists, key is opened and Registry#((<created?>))
- method will return false.
-
- If block is given, the key is closed automatically.
-
---- Registry.expand_environ(str)
- Replace (({%\w+%})) into the environment value of ((|str|)).
- This method is used for REG_EXPAND_SZ.
-
- For detail, see ((<ExpandEnvironmentStrings|URL:http://msdn.microsoft.com/library/en-us/sysinfo/base/expandenvironmentstrings.asp>)) Win32 API.
-
---- Registry.type2name(type)
- Convert registry type value to readable string.
-
---- Registry.wtime2time(wtime)
- Convert 64-bit FILETIME integer into Time object.
-
---- Registry.time2wtime(time)
- Convert Time object or Integer object into 64-bit FILETIME.
-
-=== instance methods
---- open(subkey, desired = KEY_READ, opt = REG_OPTION_RESERVED)
- Same as (({Win32::((<Registry.open>))(self, subkey, desired, opt)}))
-
---- create(subkey, desired = KEY_ALL_ACCESS, opt = REG_OPTION_RESERVED)
- Same as (({Win32::((<Registry.create>))(self, subkey, desired, opt)}))
-
---- close
- Close key.
-
- After closed, most method raises error.
-
---- read(name, *rtype)
- Read a registry value named ((|name|)) and return array of
- [ ((|type|)), ((|data|)) ].
- When name is nil, the `default' value is read.
-
- ((|type|)) is value type. (see ((<Win32::Registry::Constants module>)))
- ((|data|)) is value data, its class is:
- :REG_SZ, REG_EXPAND_SZ
- String
- :REG_MULTI_SZ
- Array of String
- :REG_DWORD, REG_DWORD_BIG_ENDIAN, REG_QWORD
- Integer
- :REG_BINARY
- String (contains binary data)
-
- When ((|rtype|)) is specified, the value type must be included by
- ((|rtype|)) array, or TypeError is raised.
-
---- self[name, *rtype]
- Read a registry value named ((|name|)) and return its value data.
- The class of value is same as ((<read>)) method returns.
-
- If the value type is REG_EXPAND_SZ, returns value data whose environment
- variables are replaced.
- If the value type is neither REG_SZ, REG_MULTI_SZ, REG_DWORD,
- REG_DWORD_BIG_ENDIAN, nor REG_QWORD, TypeError is raised.
-
- The meaning of ((|rtype|)) is same as ((<read>)) method.
-
---- read_s(name)
---- read_i(name)
---- read_bin(name)
- Read a REG_SZ(read_s), REG_DWORD(read_i), or REG_BINARY(read_bin)
- registry value named ((|name|)).
-
- If the values type does not match, TypeError is raised.
-
---- read_s_expand(name)
- Read a REG_SZ or REG_EXPAND_SZ registry value named ((|name|)).
-
- If the value type is REG_EXPAND_SZ, environment variables are replaced.
- Unless the value type is REG_SZ or REG_EXPAND_SZ, TypeError is raised.
-
---- write(name, type, data)
- Write ((|data|)) to a registry value named ((|name|)).
- When name is nil, write to the `default' value.
-
- ((|type|)) is type value. (see ((<Registry::Constants module>)))
- Class of ((|data|)) must be same as which ((<read>))
- method returns.
-
---- self[name, wtype = nil] = value
- Write ((|value|)) to a registry value named ((|name|)).
-
- If ((|wtype|)) is specified, the value type is it.
- Otherwise, the value type is depend on class of ((|value|)):
- :Integer
- REG_DWORD
- :String
- REG_SZ
- :Array
- REG_MULTI_SZ
-
---- write_s(name, value)
---- write_i(name, value)
---- write_bin(name, value)
- Write ((|value|)) to a registry value named ((|name|)).
-
- The value type is REG_SZ(write_s), REG_DWORD(write_i), or
- REG_BINARY(write_bin).
-
---- each { |name, type, value| ... }
---- each_value { |name, type, value| ... }
- Enumerate values.
-
---- each_key { |subkey, wtime| ... }
- Enumerate subkeys.
-
- ((|subkey|)) is String which contains name of subkey.
- ((|wtime|)) is last write time as FILETIME (64-bit integer).
- (see ((<Registry.wtime2time>)))
-
---- delete(name)
---- delete_value(name)
- Delete a registry value named ((|name|)).
- We can not delete the `default' value.
-
---- delete_key(name, recursive = false)
- Delete a subkey named ((|name|)) and all its values.
-
- If ((|recursive|)) is false, the subkey must not have subkeys.
- Otherwise, this method deletes all subkeys and values recursively.
-
---- flush
- Write all the attributes into the registry file.
-
---- created?
- Returns if key is created ((*newly*)).
- (see ((<Registry.create>)))
-
---- open?
- Returns if key is not closed.
-
---- hkey
- Returns key handle value.
-
---- parent
- Win32::Registry object of parent key, or nil if predefeined key.
-
---- keyname
- Same as ((|subkey|)) value of ((<Registry.open>)) or
- ((<Registry.create>)) method.
-
---- disposition
- Disposition value (REG_CREATED_NEW_KEY or REG_OPENED_EXISTING_KEY).
-
---- name
---- to_s
- Full path of key such as (({'HKEY_CURRENT_USER\SOFTWARE\foo\bar'})).
-
---- info
- Returns key information as Array of:
- :num_keys
- The number of subkeys.
- :max_key_length
- Maximum length of name of subkeys.
- :num_values
- The number of values.
- :max_value_name_length
- Maximum length of name of values.
- :max_value_length
- Maximum length of value of values.
- :descriptor_length
- Length of security descriptor.
- :wtime
- Last write time as FILETIME(64-bit integer)
-
- For detail, see ((<RegQueryInfoKey|URL:http://msdn.microsoft.com/library/en-us/sysinfo/base/regqueryinfokey.asp>)) Win32 API.
-
---- num_keys
---- max_key_length
---- num_values
---- max_value_name_length
---- max_value_length
---- descriptor_length
---- wtime
- Returns an item of key information.
-
-=== constants
---- HKEY_CLASSES_ROOT
---- HKEY_CURRENT_USER
---- HKEY_LOCAL_MACHINE
---- HKEY_PERFORMANCE_DATA
---- HKEY_CURRENT_CONFIG
---- HKEY_DYN_DATA
- Win32::Registry object whose key is predefined key.
- For detail, see ((<MSDN Library|URL:http://msdn.microsoft.com/library/en-us/sysinfo/base/predefined_keys.asp>)).
-
-== Win32::Registry::Constants module
-
-For detail, see ((<MSDN Library|URL:http://msdn.microsoft.com/library/en-us/sysinfo/base/registry.asp>)).
-
---- HKEY_*
- Predefined key ((*handle*)).
- These are Integer, not Win32::Registry.
-
---- REG_*
- Registry value type.
-
---- KEY_*
- Security access mask.
-
---- KEY_OPTIONS_*
- Key options.
-
---- REG_CREATED_NEW_KEY
---- REG_OPENED_EXISTING_KEY
- If the key is created newly or opened existing key.
- See also Registry#((<disposition>)) method.
-
-=end
-
-require 'dl/import'
-
-module Win32
- class Registry
- module Constants
- HKEY_CLASSES_ROOT = 0x80000000
- HKEY_CURRENT_USER = 0x80000001
- HKEY_LOCAL_MACHINE = 0x80000002
- HKEY_USERS = 0x80000003
- HKEY_PERFORMANCE_DATA = 0x80000004
- HKEY_PERFORMANCE_TEXT = 0x80000050
- HKEY_PERFORMANCE_NLSTEXT = 0x80000060
- HKEY_CURRENT_CONFIG = 0x80000005
- HKEY_DYN_DATA = 0x80000006
-
- REG_NONE = 0
- REG_SZ = 1
- REG_EXPAND_SZ = 2
- REG_BINARY = 3
- REG_DWORD = 4
- REG_DWORD_LITTLE_ENDIAN = 4
- REG_DWORD_BIG_ENDIAN = 5
- REG_LINK = 6
- REG_MULTI_SZ = 7
- REG_RESOURCE_LIST = 8
- REG_FULL_RESOURCE_DESCRIPTOR = 9
- REG_RESOURCE_REQUIREMENTS_LIST = 10
- REG_QWORD = 11
- REG_QWORD_LITTLE_ENDIAN = 11
-
- STANDARD_RIGHTS_READ = 0x00020000
- STANDARD_RIGHTS_WRITE = 0x00020000
- KEY_QUERY_VALUE = 0x0001
- KEY_SET_VALUE = 0x0002
- KEY_CREATE_SUB_KEY = 0x0004
- KEY_ENUMERATE_SUB_KEYS = 0x0008
- KEY_NOTIFY = 0x0010
- KEY_CREATE_LINK = 0x0020
- KEY_READ = STANDARD_RIGHTS_READ |
- KEY_QUERY_VALUE | KEY_ENUMERATE_SUB_KEYS | KEY_NOTIFY
- KEY_WRITE = STANDARD_RIGHTS_WRITE |
- KEY_SET_VALUE | KEY_CREATE_SUB_KEY
- KEY_EXECUTE = KEY_READ
- KEY_ALL_ACCESS = KEY_READ | KEY_WRITE | KEY_CREATE_LINK
-
- REG_OPTION_RESERVED = 0x0000
- REG_OPTION_NON_VOLATILE = 0x0000
- REG_OPTION_VOLATILE = 0x0001
- REG_OPTION_CREATE_LINK = 0x0002
- REG_OPTION_BACKUP_RESTORE = 0x0004
- REG_OPTION_OPEN_LINK = 0x0008
- REG_LEGAL_OPTION = REG_OPTION_RESERVED |
- REG_OPTION_NON_VOLATILE | REG_OPTION_CREATE_LINK |
- REG_OPTION_BACKUP_RESTORE | REG_OPTION_OPEN_LINK
-
- REG_CREATED_NEW_KEY = 1
- REG_OPENED_EXISTING_KEY = 2
-
- REG_WHOLE_HIVE_VOLATILE = 0x0001
- REG_REFRESH_HIVE = 0x0002
- REG_NO_LAZY_FLUSH = 0x0004
- REG_FORCE_RESTORE = 0x0008
-
- MAX_KEY_LENGTH = 514
- MAX_VALUE_LENGTH = 32768
- end
- include Constants
- include Enumerable
-
- #
- # Error
- #
- class Error < ::StandardError
- module Kernel32
- extend DL::Importer
- dlload "kernel32.dll"
- end
- FormatMessageA = Kernel32.extern "int FormatMessageA(int, void *, int, int, void *, int, void *)", :stdcall
- def initialize(code)
- @code = code
- msg = "\0".force_encoding(Encoding::ASCII_8BIT) * 1024
- len = FormatMessageA.call(0x1200, 0, code, 0, msg, 1024, 0)
- msg = msg[0, len].force_encoding(Encoding.find(Encoding.locale_charmap))
- super msg.tr("\r", '').chomp
- end
- attr_reader :code
- end
-
- #
- # Predefined Keys
- #
- class PredefinedKey < Registry
- def initialize(hkey, keyname)
- @hkey = hkey
- @parent = nil
- @keyname = keyname
- @disposition = REG_OPENED_EXISTING_KEY
- end
-
- # Predefined keys cannot be closed
- def close
- raise Error.new(5) ## ERROR_ACCESS_DENIED
- end
-
- # Fake class for Registry#open, Registry#create
- def class
- Registry
- end
-
- # Make all
- Constants.constants.grep(/^HKEY_/) do |c|
- Registry.const_set c, new(Constants.const_get(c), c)
- end
- end
-
- #
- # Win32 APIs
- #
- module API
- extend DL::Importer
- dlload "advapi32.dll"
- [
- "long RegOpenKeyExA(void *, void *, long, long, void *)",
- "long RegCreateKeyExA(void *, void *, long, long, long, long, void *, void *)",
- "long RegEnumValueA(void *, long, void *, void *, void *, void *, void *, void *)",
- "long RegEnumKeyExA(void *, long, void *, void *, void *, void *, void *, void *)",
- "long RegQueryValueExA(void *, void *, void *, void *, void *, void *)",
- "long RegSetValueExA(void *, void *, long, long, void *, long)",
- "long RegDeleteValue(void *, void *)",
- "long RegDeleteKey(void *, void *)",
- "long RegFlushKey(void *)",
- "long RegCloseKey(void *)",
- "long RegQueryInfoKey(void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *)",
- ].each do |fn|
- cfunc = extern fn, :stdcall
- const_set cfunc.name.intern, cfunc
- end
-
- module_function
-
- def check(result)
- raise Error, result, caller(2) if result != 0
- end
-
- def packdw(dw)
- [dw].pack('V')
- end
-
- def unpackdw(dw)
- dw += [0].pack('V')
- dw.unpack('V')[0]
- end
-
- def packqw(qw)
- [ qw & 0xFFFFFFFF, qw >> 32 ].pack('VV')
- end
-
- def unpackqw(qw)
- qw = qw.unpack('VV')
- (qw[1] << 32) | qw[0]
- end
-
- def OpenKey(hkey, name, opt, desired)
- result = packdw(0)
- check RegOpenKeyExA.call(hkey, name, opt, desired, result)
- unpackdw(result)
- end
-
- def CreateKey(hkey, name, opt, desired)
- result = packdw(0)
- disp = packdw(0)
- check RegCreateKeyExA.call(hkey, name, 0, 0, opt, desired,
- 0, result, disp)
- [ unpackdw(result), unpackdw(disp) ]
- end
-
- def EnumValue(hkey, index)
- name = ' ' * Constants::MAX_KEY_LENGTH
- size = packdw(Constants::MAX_KEY_LENGTH)
- check RegEnumValueA.call(hkey, index, name, size, 0, 0, 0, 0)
- name[0, unpackdw(size)]
- end
-
- def EnumKey(hkey, index)
- name = ' ' * Constants::MAX_KEY_LENGTH
- size = packdw(Constants::MAX_KEY_LENGTH)
- wtime = ' ' * 8
- check RegEnumKeyExA.call(hkey, index, name, size, 0, 0, 0, wtime)
- [ name[0, unpackdw(size)], unpackqw(wtime) ]
- end
-
- def QueryValue(hkey, name)
- type = packdw(0)
- size = packdw(0)
- check RegQueryValueExA.call(hkey, name, 0, type, 0, size)
- data = ' ' * unpackdw(size)
- check RegQueryValueExA.call(hkey, name, 0, type, data, size)
- [ unpackdw(type), data[0, unpackdw(size)] ]
- end
-
- def SetValue(hkey, name, type, data, size)
- check RegSetValueExA.call(hkey, name, 0, type, data, size)
- end
-
- def DeleteValue(hkey, name)
- check RegDeleteValue.call(hkey, name)
- end
-
- def DeleteKey(hkey, name)
- check RegDeleteKey.call(hkey, name)
- end
-
- def FlushKey(hkey)
- check RegFlushKey.call(hkey)
- end
-
- def CloseKey(hkey)
- check RegCloseKey.call(hkey)
- end
-
- def QueryInfoKey(hkey)
- subkeys = packdw(0)
- maxsubkeylen = packdw(0)
- values = packdw(0)
- maxvaluenamelen = packdw(0)
- maxvaluelen = packdw(0)
- secdescs = packdw(0)
- wtime = ' ' * 8
- check RegQueryInfoKey.call(hkey, 0, 0, 0, subkeys, maxsubkeylen, 0,
- values, maxvaluenamelen, maxvaluelen, secdescs, wtime)
- [ unpackdw(subkeys), unpackdw(maxsubkeylen), unpackdw(values),
- unpackdw(maxvaluenamelen), unpackdw(maxvaluelen),
- unpackdw(secdescs), unpackqw(wtime) ]
- end
- end
-
- #
- # utility functions
- #
- def self.expand_environ(str)
- str.gsub(/%([^%]+)%/) { ENV[$1] || ENV[$1.upcase] || $& }
- end
-
- @@type2name = { }
- %w[
- REG_NONE REG_SZ REG_EXPAND_SZ REG_BINARY REG_DWORD
- REG_DWORD_BIG_ENDIAN REG_LINK REG_MULTI_SZ
- REG_RESOURCE_LIST REG_FULL_RESOURCE_DESCRIPTOR
- REG_RESOURCE_REQUIREMENTS_LIST REG_QWORD
- ].each do |type|
- @@type2name[Constants.const_get(type)] = type
- end
-
- def self.type2name(type)
- @@type2name[type] || type.to_s
- end
-
- def self.wtime2time(wtime)
- Time.at((wtime - 116444736000000000) / 10000000)
- end
-
- def self.time2wtime(time)
- time.to_i * 10000000 + 116444736000000000
- end
-
- #
- # constructors
- #
- private_class_method :new
-
- def self.open(hkey, subkey, desired = KEY_READ, opt = REG_OPTION_RESERVED)
- subkey = subkey.chomp('\\')
- newkey = API.OpenKey(hkey.hkey, subkey, opt, desired)
- obj = new(newkey, hkey, subkey, REG_OPENED_EXISTING_KEY)
- if block_given?
- begin
- yield obj
- ensure
- obj.close
- end
- else
- obj
- end
- end
-
- def self.create(hkey, subkey, desired = KEY_ALL_ACCESS, opt = REG_OPTION_RESERVED)
- newkey, disp = API.CreateKey(hkey.hkey, subkey, opt, desired)
- obj = new(newkey, hkey, subkey, disp)
- if block_given?
- begin
- yield obj
- ensure
- obj.close
- end
- else
- obj
- end
- end
-
- #
- # finalizer
- #
- @@final = proc { |hkey| proc { API.CloseKey(hkey[0]) if hkey[0] } }
-
- #
- # initialize
- #
- def initialize(hkey, parent, keyname, disposition)
- @hkey = hkey
- @parent = parent
- @keyname = keyname
- @disposition = disposition
- @hkeyfinal = [ hkey ]
- ObjectSpace.define_finalizer self, @@final.call(@hkeyfinal)
- end
- attr_reader :hkey, :parent, :keyname, :disposition
-
- #
- # attributes
- #
- def created?
- @disposition == REG_CREATED_NEW_KEY
- end
-
- def open?
- !@hkey.nil?
- end
-
- def name
- parent = self
- name = @keyname
- while parent = parent.parent
- name = parent.keyname + '\\' + name
- end
- name
- end
-
- def inspect
- "\#<Win32::Registry key=#{name.inspect}>"
- end
-
- #
- # marshalling
- #
- def _dump(depth)
- raise TypeError, "can't dump Win32::Registry"
- end
-
- #
- # open/close
- #
- def open(subkey, desired = KEY_READ, opt = REG_OPTION_RESERVED, &blk)
- self.class.open(self, subkey, desired, opt, &blk)
- end
-
- def create(subkey, desired = KEY_ALL_ACCESS, opt = REG_OPTION_RESERVED, &blk)
- self.class.create(self, subkey, desired, opt, &blk)
- end
-
- def close
- API.CloseKey(@hkey)
- @hkey = @parent = @keyname = nil
- @hkeyfinal[0] = nil
- end
-
- #
- # iterator
- #
- def each_value
- index = 0
- while true
- begin
- subkey = API.EnumValue(@hkey, index)
- rescue Error
- break
- end
- begin
- type, data = read(subkey)
- rescue Error
- next
- end
- yield subkey, type, data
- index += 1
- end
- index
- end
- alias each each_value
-
- def each_key
- index = 0
- while true
- begin
- subkey, wtime = API.EnumKey(@hkey, index)
- rescue Error
- break
- end
- yield subkey, wtime
- index += 1
- end
- index
- end
-
- def keys
- keys_ary = []
- each_key { |key,| keys_ary << key }
- keys_ary
- end
-
- #
- # reader
- #
- def read(name, *rtype)
- type, data = API.QueryValue(@hkey, name)
- unless rtype.empty? or rtype.include?(type)
- raise TypeError, "Type mismatch (expect #{rtype.inspect} but #{type} present)"
- end
- case type
- when REG_SZ, REG_EXPAND_SZ
- [ type, data.chop ]
- when REG_MULTI_SZ
- [ type, data.split(/\0/) ]
- when REG_BINARY
- [ type, data ]
- when REG_DWORD
- [ type, API.unpackdw(data) ]
- when REG_DWORD_BIG_ENDIAN
- [ type, data.unpack('N')[0] ]
- when REG_QWORD
- [ type, API.unpackqw(data) ]
- else
- raise TypeError, "Type #{type} is not supported."
- end
- end
-
- def [](name, *rtype)
- type, data = read(name, *rtype)
- case type
- when REG_SZ, REG_DWORD, REG_QWORD, REG_MULTI_SZ
- data
- when REG_EXPAND_SZ
- Registry.expand_environ(data)
- else
- raise TypeError, "Type #{type} is not supported."
- end
- end
-
- def read_s(name)
- read(name, REG_SZ)[1]
- end
-
- def read_s_expand(name)
- type, data = read(name, REG_SZ, REG_EXPAND_SZ)
- if type == REG_EXPAND_SZ
- Registry.expand_environ(data)
- else
- data
- end
- end
-
- def read_i(name)
- read(name, REG_DWORD, REG_DWORD_BIG_ENDIAN, REG_QWORD)[1]
- end
-
- def read_bin(name)
- read(name, REG_BINARY)[1]
- end
-
- #
- # writer
- #
- def write(name, type, data)
- case type
- when REG_SZ, REG_EXPAND_SZ
- data = data.to_s + "\0"
- when REG_MULTI_SZ
- data = data.to_a.join("\0") + "\0\0"
- when REG_BINARY
- data = data.to_s
- when REG_DWORD
- data = API.packdw(data.to_i)
- when REG_DWORD_BIG_ENDIAN
- data = [data.to_i].pack('N')
- when REG_QWORD
- data = API.packqw(data.to_i)
- else
- raise TypeError, "Unsupported type #{type}"
- end
- API.SetValue(@hkey, name, type, data, data.length)
- end
-
- def []=(name, rtype, value = nil)
- if value
- write name, rtype, value
- else
- case value = rtype
- when Integer
- write name, REG_DWORD, value
- when String
- write name, REG_SZ, value
- when Array
- write name, REG_MULTI_SZ, value
- else
- raise TypeError, "Unexpected type #{value.class}"
- end
- end
- value
- end
-
- def write_s(name, value)
- write name, REG_SZ, value.to_s
- end
-
- def write_i(name, value)
- write name, REG_DWORD, value.to_i
- end
-
- def write_bin(name, value)
- write name, REG_BINARY, value.to_s
- end
-
- #
- # delete
- #
- def delete_value(name)
- API.DeleteValue(@hkey, name)
- end
- alias delete delete_value
-
- def delete_key(name, recursive = false)
- if recursive
- open(name, KEY_ALL_ACCESS) do |reg|
- reg.keys.each do |key|
- begin
- reg.delete_key(key, true)
- rescue Error
- #
- end
- end
- end
- API.DeleteKey(@hkey, name)
- else
- begin
- API.EnumKey @hkey, 0
- rescue Error
- return API.DeleteKey(@hkey, name)
- end
- raise Error.new(5) ## ERROR_ACCESS_DENIED
- end
- end
-
- #
- # flush
- #
- def flush
- API.FlushKey @hkey
- end
-
- #
- # key information
- #
- def info
- API.QueryInfoKey(@hkey)
- end
- %w[
- num_keys max_key_length
- num_values max_value_name_length max_value_length
- descriptor_length wtime
- ].each_with_index do |s, i|
- eval <<-__END__
- def #{s}
- info[#{i}]
- end
- __END__
- end
- end
-end
diff --git a/ext/dl/win32/lib/win32/resolv.rb b/ext/dl/win32/lib/win32/resolv.rb
deleted file mode 100644
index a164fd54d2..0000000000
--- a/ext/dl/win32/lib/win32/resolv.rb
+++ /dev/null
@@ -1,379 +0,0 @@
-=begin
-= Win32 DNS and DHCP I/F
-
-=end
-
-require "dl/import"
-require 'win32/registry'
-
-module Win32
- module Resolv
- API = Registry::API
-
- def self.get_hosts_path
- path = get_hosts_dir
- path = File.expand_path('hosts', path)
- File.exist?(path) ? path : nil
- end
-
- def self.get_resolv_info
- search, nameserver = get_info
- if search.empty?
- search = nil
- else
- search.delete("")
- search.uniq!
- end
- if nameserver.empty?
- nameserver = nil
- else
- nameserver.delete("")
- nameserver.delete("0.0.0.0")
- nameserver.uniq!
- end
- [ search, nameserver ]
- end
-
-module Kernel32
- extend DL::Importer
- dlload "kernel32"
-end
-getv = Kernel32.extern "int GetVersionExA(void *)", :stdcall
-info = [ 148, 0, 0, 0, 0 ].pack('V5') + "\0" * 128
-getv.call(info)
-if info.unpack('V5')[4] == 2 # VER_PLATFORM_WIN32_NT
-#====================================================================
-# Windows NT
-#====================================================================
- module_eval <<-'__EOS__', __FILE__, __LINE__+1
- TCPIP_NT = 'SYSTEM\CurrentControlSet\Services\Tcpip\Parameters'
-
- class << self
- private
- def get_hosts_dir
- Registry::HKEY_LOCAL_MACHINE.open(TCPIP_NT) do |reg|
- reg.read_s_expand('DataBasePath')
- end
- end
-
- def get_info
- search = nil
- nameserver = []
- Registry::HKEY_LOCAL_MACHINE.open(TCPIP_NT) do |reg|
- begin
- slist = reg.read_s('SearchList')
- search = slist.split(/,\s*/) unless slist.empty?
- rescue Registry::Error
- end
-
- if add_search = search.nil?
- search = []
- begin
- nvdom = reg.read_s('NV Domain')
- unless nvdom.empty?
- @search = [ nvdom ]
- if reg.read_i('UseDomainNameDevolution') != 0
- if /^[\w\d]+\./ =~ nvdom
- devo = $'
- end
- end
- end
- rescue Registry::Error
- end
- end
-
- reg.open('Interfaces') do |h|
- h.each_key do |iface,|
- h.open(iface) do |regif|
- begin
- [ 'NameServer', 'DhcpNameServer' ].each do |key|
- begin
- ns = regif.read_s(key)
- rescue
- else
- unless ns.empty?
- nameserver.concat(ns.split(/[,\s]\s*/))
- break
- end
- end
- end
- rescue Registry::Error
- end
-
- if add_search
- begin
- [ 'Domain', 'DhcpDomain' ].each do |key|
- dom = regif.read_s(key)
- unless dom.empty?
- search.concat(dom.split(/,\s*/))
- break
- end
- end
- rescue Registry::Error
- end
- end
- end
- end
- end
- search << devo if add_search and devo
- end
- [ search.uniq, nameserver.uniq ]
- end
- end
- __EOS__
-else
-#====================================================================
-# Windows 9x
-#====================================================================
- module_eval <<-'__EOS__', __FILE__, __LINE__+1
- TCPIP_9X = 'SYSTEM\CurrentControlSet\Services\VxD\MSTCP'
- DHCP_9X = 'SYSTEM\CurrentControlSet\Services\VxD\DHCP'
- WINDOWS = 'Software\Microsoft\Windows\CurrentVersion'
-
- class << self
- # private
-
- def get_hosts_dir
- Registry::HKEY_LOCAL_MACHINE.open(WINDOWS) do |reg|
- reg.read_s_expand('SystemRoot')
- end
- end
-
- def get_info
- search = []
- nameserver = []
- begin
- Registry::HKEY_LOCAL_MACHINE.open(TCPIP_9X) do |reg|
- if reg.read_s("EnableDNS") == "1"
- domain = reg.read_s("Domain")
- ns = reg.read_s("NameServer")
- slist = reg.read_s("SearchList")
- search << domain unless domain.empty?
- search.concat(slist.split(/,\s*/))
- nameserver.concat(ns.split(/[,\s]\s*/))
- end
- end
- rescue Registry::Error
- end
-
- dhcpinfo = get_dhcpinfo
- search.concat(dhcpinfo[0])
- nameserver.concat(dhcpinfo[1])
- [ search, nameserver ]
- end
-
- def get_dhcpinfo
- macaddrs = {}
- ipaddrs = {}
- WsControl.get_iflist.each do |index, macaddr, *ipaddr|
- macaddrs[macaddr] = 1
- ipaddr.each { |ipaddr| ipaddrs[ipaddr] = 1 }
- end
- iflist = [ macaddrs, ipaddrs ]
-
- search = []
- nameserver = []
- version = -1
- Registry::HKEY_LOCAL_MACHINE.open(DHCP_9X) do |reg|
- begin
- version = API.unpackdw(reg.read_bin("Version"))
- rescue Registry::Error
- end
-
- reg.each_key do |key,|
- catch(:not_used) do
- reg.open(key) do |regdi|
- dom, ns = get_dhcpinfo_key(version, regdi, iflist)
- search << dom if dom
- nameserver.concat(ns) if ns
- end
- end
- end
- end
- [ search, nameserver ]
- end
-
- def get_dhcpinfo_95(reg)
- dhcp = reg.read_bin("DhcpInfo")
- [
- API.unpackdw(dhcp[4..7]),
- API.unpackdw(dhcp[8..11]),
- 1,
- dhcp[45..50],
- reg.read_bin("OptionInfo"),
- ]
- end
-
- def get_dhcpinfo_98(reg)
- [
- API.unpackdw(reg.read_bin("DhcpIPAddress")),
- API.unpackdw(reg.read_bin("DhcpSubnetMask")),
- API.unpackdw(reg.read_bin("HardwareType")),
- reg.read_bin("HardwareAddress"),
- reg.read_bin("OptionInfo"),
- ]
- end
-
- def get_dhcpinfo_key(version, reg, iflist)
- info = case version
- when 1
- get_dhcpinfo_95(reg)
- when 2
- get_dhcpinfo_98(reg)
- else
- begin
- get_dhcpinfo_98(reg)
- rescue Registry::Error
- get_dhcpinfo_95(reg)
- end
- end
- ipaddr, netmask, hwtype, macaddr, opt = info
- throw :not_used unless
- ipaddr and ipaddr != 0 and
- netmask and netmask != 0 and
- macaddr and macaddr.size == 6 and
- hwtype == 1 and
- iflist[0][macaddr] and iflist[1][ipaddr]
-
- size = opt.size
- idx = 0
- while idx <= size
- opttype = opt[idx]
- optsize = opt[idx + 1]
- optval = opt[idx + 2, optsize]
- case opttype
- when 0xFF ## term
- break
- when 0x0F ## domain
- domain = optval.chomp("\0")
- when 0x06 ## dns
- nameserver = optval.scan(/..../).collect { |addr|
- "%d.%d.%d.%d" % addr.unpack('C4')
- }
- end
- idx += optsize + 2
- end
- [ domain, nameserver ]
- rescue Registry::Error
- throw :not_used
- end
- end
-
- module WsControl
- module WSock32
- extend DL::Importer
- dlload "wsock32.dll"
- end
- WsControl = WSock32.extern "int WsControl(int, int, void *, void *, void *, void *", :stdcall
- WSAGetLastError = WSock32.extern "int WSAGetLastError(void)", :stdcall
-
- MAX_TDI_ENTITIES = 512
- IPPROTO_TCP = 6
- WSCTL_TCP_QUERY_INFORMATION = 0
- INFO_CLASS_GENERIC = 0x100
- INFO_CLASS_PROTOCOL = 0x200
- INFO_TYPE_PROVIDER = 0x100
- ENTITY_LIST_ID = 0
- GENERIC_ENTITY = 0
- CL_NL_ENTITY = 0x301
- IF_ENTITY = 0x200
- ENTITY_TYPE_ID = 1
- CL_NL_IP = 0x303
- IF_MIB = 0x202
- IF_MIB_STATS_ID = 1
- IP_MIB_ADDRTABLE_ENTRY_ID = 0x102
-
- def self.wsctl(tei_entity, tei_instance,
- toi_class, toi_type, toi_id,
- buffsize)
- reqinfo = [
- ## TDIEntityID
- tei_entity, tei_instance,
- ## TDIObjectID
- toi_class, toi_type, toi_id,
- ## TCP_REQUEST_INFORMATION_EX
- ""
- ].pack('VVVVVa16')
- reqsize = API.packdw(reqinfo.size)
- buff = "\0" * buffsize
- buffsize = API.packdw(buffsize)
- result = WsControl.call(
- IPPROTO_TCP,
- WSCTL_TCP_QUERY_INFORMATION,
- reqinfo, reqsize,
- buff, buffsize)
- if result != 0
- raise RuntimeError, "WsControl failed.(#{result})"
- end
- [ buff, API.unpackdw(buffsize) ]
- end
- private_class_method :wsctl
-
- def self.get_iflist
- # Get TDI Entity List
- entities, size =
- wsctl(GENERIC_ENTITY, 0,
- INFO_CLASS_GENERIC,
- INFO_TYPE_PROVIDER,
- ENTITY_LIST_ID,
- MAX_TDI_ENTITIES * 8) # sizeof(TDIEntityID)
- entities = entities[0, size].
- scan(/.{8}/).
- collect { |e| e.unpack('VV') }
-
- # Get MIB Interface List
- iflist = []
- ifcount = 0
- entities.each do |entity, instance|
- if( (entity & IF_ENTITY)>0 )
- ifcount += 1
- etype, = wsctl(entity, instance,
- INFO_CLASS_GENERIC,
- INFO_TYPE_PROVIDER,
- ENTITY_TYPE_ID,
- 4)
- if( (API.unpackdw(etype) & IF_MIB)==IF_MIB )
- ifentry, = wsctl(entity, instance,
- INFO_CLASS_PROTOCOL,
- INFO_TYPE_PROVIDER,
- IF_MIB_STATS_ID,
- 21 * 4 + 8 + 130) # sizeof(IFEntry)
- iflist << [
- API.unpackdw(ifentry[0,4]),
- ifentry[20, 6]
- ]
- end
- end
- end
-
- # Get IP Addresses
- entities.each do |entity, instance|
- if entity == CL_NL_ENTITY
- etype, = wsctl(entity, instance,
- INFO_CLASS_GENERIC,
- INFO_TYPE_PROVIDER,
- ENTITY_TYPE_ID,
- 4)
- if API.unpackdw(etype) == CL_NL_IP
- ipentries, = wsctl(entity, instance,
- INFO_CLASS_PROTOCOL,
- INFO_TYPE_PROVIDER,
- IP_MIB_ADDRTABLE_ENTRY_ID,
- 24 * (ifcount+1)) # sizeof(IPAddrEntry)
- ipentries.scan(/.{24}/) do |ipentry|
- ipaddr, index = ipentry.unpack('VV')
- if ifitem = iflist.assoc(index)
- ifitem << ipaddr
- end
- end
- end
- end
- end
- iflist
- end
- end
- __EOS__
-end
-#====================================================================
- end
-end
diff --git a/ext/dl/win32/lib/win32/sspi.rb b/ext/dl/win32/lib/win32/sspi.rb
deleted file mode 100644
index 6022df96c3..0000000000
--- a/ext/dl/win32/lib/win32/sspi.rb
+++ /dev/null
@@ -1,330 +0,0 @@
-#
-# = win32/sspi.rb
-#
-# Copyright (c) 2006-2007 Justin Bailey
-#
-# Written and maintained by Justin Bailey <jgbailey@gmail.com>.
-#
-# This program is free software. You can re-distribute and/or
-# modify this program under the same terms of ruby itself ---
-# Ruby Distribution License or GNU General Public License.
-#
-
-require 'Win32API'
-
-# Implements bindings to Win32 SSPI functions, focused on authentication to a proxy server over HTTP.
-module Win32
- module SSPI
- # Specifies how credential structure requested will be used. Only SECPKG_CRED_OUTBOUND is used
- # here.
- SECPKG_CRED_INBOUND = 0x00000001
- SECPKG_CRED_OUTBOUND = 0x00000002
- SECPKG_CRED_BOTH = 0x00000003
-
- # Format of token. NETWORK format is used here.
- SECURITY_NATIVE_DREP = 0x00000010
- SECURITY_NETWORK_DREP = 0x00000000
-
- # InitializeSecurityContext Requirement flags
- ISC_REQ_REPLAY_DETECT = 0x00000004
- ISC_REQ_SEQUENCE_DETECT = 0x00000008
- ISC_REQ_CONFIDENTIALITY = 0x00000010
- ISC_REQ_USE_SESSION_KEY = 0x00000020
- ISC_REQ_PROMPT_FOR_CREDS = 0x00000040
- ISC_REQ_CONNECTION = 0x00000800
-
- # Win32 API Functions. Uses Win32API to bind methods to constants contained in class.
- module API
- # Can be called with AcquireCredentialsHandle.call()
- AcquireCredentialsHandle = Win32API.new("secur32", "AcquireCredentialsHandle", 'ppLpppppp', 'L')
- # Can be called with InitializeSecurityContext.call()
- InitializeSecurityContext = Win32API.new("secur32", "InitializeSecurityContext", 'pppLLLpLpppp', 'L')
- # Can be called with DeleteSecurityContext.call()
- DeleteSecurityContext = Win32API.new("secur32", "DeleteSecurityContext", 'P', 'L')
- # Can be called with FreeCredentialsHandle.call()
- FreeCredentialsHandle = Win32API.new("secur32", "FreeCredentialsHandle", 'P', 'L')
- end
-
- # SecHandle struct
- class SecurityHandle
- def upper
- @struct.unpack("LL")[1]
- end
-
- def lower
- @struct.unpack("LL")[0]
- end
-
- def to_p
- @struct ||= "\0" * 8
- end
- end
-
- # Some familiar aliases for the SecHandle structure
- CredHandle = CtxtHandle = SecurityHandle
-
- # TimeStamp struct
- class TimeStamp
- attr_reader :struct
-
- def to_p
- @struct ||= "\0" * 8
- end
- end
-
- # Creates binary representaiton of a SecBufferDesc structure,
- # including the SecBuffer contained inside.
- class SecurityBuffer
-
- SECBUFFER_TOKEN = 2 # Security token
-
- TOKENBUFSIZE = 12288
- SECBUFFER_VERSION = 0
-
- def initialize(buffer = nil)
- @buffer = buffer || "\0" * TOKENBUFSIZE
- @bufferSize = @buffer.length
- @type = SECBUFFER_TOKEN
- end
-
- def bufferSize
- unpack
- @bufferSize
- end
-
- def bufferType
- unpack
- @type
- end
-
- def token
- unpack
- @buffer
- end
-
- def to_p
- # Assumption is that when to_p is called we are going to get a packed structure. Therefore,
- # set @unpacked back to nil so we know to unpack when accessors are next accessed.
- @unpacked = nil
- # Assignment of inner structure to variable is very important here. Without it,
- # will not be able to unpack changes to the structure. Alternative, nested unpacks,
- # does not work (i.e. @struct.unpack("LLP12")[2].unpack("LLP12") results in "no associated pointer")
- @sec_buffer ||= [@bufferSize, @type, @buffer].pack("LLP")
- @struct ||= [SECBUFFER_VERSION, 1, @sec_buffer].pack("LLP")
- end
-
- private
-
- # Unpacks the SecurityBufferDesc structure into member variables. We
- # only want to do this once per struct, so the struct is deleted
- # after unpacking.
- def unpack
- if ! @unpacked && @sec_buffer && @struct
- @bufferSize, @type = @sec_buffer.unpack("LL")
- @buffer = @sec_buffer.unpack("LLP#{@bufferSize}")[2]
- @struct = nil
- @sec_buffer = nil
- @unpacked = true
- end
- end
- end
-
- # SEC_WINNT_AUTH_IDENTITY structure
- class Identity
- SEC_WINNT_AUTH_IDENTITY_ANSI = 0x1
-
- attr_accessor :user, :domain, :password
-
- def initialize(user = nil, domain = nil, password = nil)
- @user = user
- @domain = domain
- @password = password
- @flags = SEC_WINNT_AUTH_IDENTITY_ANSI
- end
-
- def to_p
- [@user, @user ? @user.length : 0,
- @domain, @domain ? @domain.length : 0,
- @password, @password ? @password.length : 0,
- @flags].pack("PLPLPLL")
- end
- end
-
- # Takes a return result from an SSPI function and interprets the value.
- class SSPIResult
- # Good results
- SEC_E_OK = 0x00000000
- SEC_I_CONTINUE_NEEDED = 0x00090312
-
- # These are generally returned by InitializeSecurityContext
- SEC_E_INSUFFICIENT_MEMORY = 0x80090300
- SEC_E_INTERNAL_ERROR = 0x80090304
- SEC_E_INVALID_HANDLE = 0x80090301
- SEC_E_INVALID_TOKEN = 0x80090308
- SEC_E_LOGON_DENIED = 0x8009030C
- SEC_E_NO_AUTHENTICATING_AUTHORITY = 0x80090311
- SEC_E_NO_CREDENTIALS = 0x8009030E
- SEC_E_TARGET_UNKNOWN = 0x80090303
- SEC_E_UNSUPPORTED_FUNCTION = 0x80090302
- SEC_E_WRONG_PRINCIPAL = 0x80090322
-
- # These are generally returned by AcquireCredentialsHandle
- SEC_E_NOT_OWNER = 0x80090306
- SEC_E_SECPKG_NOT_FOUND = 0x80090305
- SEC_E_UNKNOWN_CREDENTIALS = 0x8009030D
-
- @@map = {}
- constants.each { |v| @@map[self.const_get(v.to_s)] = v }
-
- attr_reader :value
-
- def initialize(value)
- # convert to unsigned long
- value = [value].pack("L").unpack("L").first
- raise "#{value.to_s(16)} is not a recognized result" unless @@map.has_key? value
- @value = value
- end
-
- def to_s
- @@map[@value].to_s
- end
-
- def ok?
- @value == SEC_I_CONTINUE_NEEDED || @value == SEC_E_OK
- end
-
- def ==(other)
- if other.is_a?(SSPIResult)
- @value == other.value
- elsif other.is_a?(Fixnum)
- @value == @@map[other]
- else
- false
- end
- end
- end
-
- # Handles "Negotiate" type authentication. Geared towards authenticating with a proxy server over HTTP
- class NegotiateAuth
- attr_accessor :credentials, :context, :contextAttributes, :user, :domain
-
- # Default request flags for SSPI functions
- REQUEST_FLAGS = ISC_REQ_CONFIDENTIALITY | ISC_REQ_REPLAY_DETECT | ISC_REQ_CONNECTION
-
- # NTLM tokens start with this header always. Encoding alone adds "==" and newline, so remove those
- B64_TOKEN_PREFIX = ["NTLMSSP"].pack("m").delete("=\n")
-
- # Given a connection and a request path, performs authentication as the current user and returns
- # the response from a GET request. The connnection should be a Net::HTTP object, and it should
- # have been constructed using the Net::HTTP.Proxy method, but anything that responds to "get" will work.
- # If a user and domain are given, will authenticate as the given user.
- # Returns the response received from the get method (usually Net::HTTPResponse)
- def NegotiateAuth.proxy_auth_get(http, path, user = nil, domain = nil)
- raise "http must respond to :get" unless http.respond_to?(:get)
- nego_auth = self.new user, domain
-
- resp = http.get path, { "Proxy-Authorization" => "Negotiate " + nego_auth.get_initial_token }
- if resp["Proxy-Authenticate"]
- resp = http.get path, { "Proxy-Authorization" => "Negotiate " + nego_auth.complete_authentication(resp["Proxy-Authenticate"].split(" ").last.strip) }
- end
-
- resp
- end
-
- # Creates a new instance ready for authentication as the given user in the given domain.
- # Defaults to current user and domain as defined by ENV["USERDOMAIN"] and ENV["USERNAME"] if
- # no arguments are supplied.
- def initialize(user = nil, domain = nil)
- if user.nil? && domain.nil? && ENV["USERNAME"].nil? && ENV["USERDOMAIN"].nil?
- raise "A username or domain must be supplied since they cannot be retrieved from the environment"
- end
-
- @user = user || ENV["USERNAME"]
- @domain = domain || ENV["USERDOMAIN"]
- end
-
- # Gets the initial Negotiate token. Returns it as a base64 encoded string suitable for use in HTTP. Can
- # be easily decoded, however.
- def get_initial_token
- raise "This object is no longer usable because its resources have been freed." if @cleaned_up
- get_credentials
-
- outputBuffer = SecurityBuffer.new
- @context = CtxtHandle.new
- @contextAttributes = "\0" * 4
-
- result = SSPIResult.new(API::InitializeSecurityContext.call(@credentials.to_p, nil, nil,
- REQUEST_FLAGS,0, SECURITY_NETWORK_DREP, nil, 0, @context.to_p, outputBuffer.to_p, @contextAttributes, TimeStamp.new.to_p))
-
- if result.ok? then
- return encode_token(outputBuffer.token)
- else
- raise "Error: #{result.to_s}"
- end
- end
-
- # Takes a token and gets the next token in the Negotiate authentication chain. Token can be Base64 encoded or not.
- # The token can include the "Negotiate" header and it will be stripped.
- # Does not indicate if SEC_I_CONTINUE or SEC_E_OK was returned.
- # Token returned is Base64 encoded w/ all new lines removed.
- def complete_authentication(token)
- raise "This object is no longer usable because its resources have been freed." if @cleaned_up
-
- # Nil token OK, just set it to empty string
- token = "" if token.nil?
-
- if token.include? "Negotiate"
- # If the Negotiate prefix is passed in, assume we are seeing "Negotiate <token>" and get the token.
- token = token.split(" ").last
- end
-
- if token.include? B64_TOKEN_PREFIX
- # indicates base64 encoded token
- token = token.strip.unpack("m")[0]
- end
-
- outputBuffer = SecurityBuffer.new
- result = SSPIResult.new(API::InitializeSecurityContext.call(@credentials.to_p, @context.to_p, nil,
- REQUEST_FLAGS, 0, SECURITY_NETWORK_DREP, SecurityBuffer.new(token).to_p, 0,
- @context.to_p,
- outputBuffer.to_p, @contextAttributes, TimeStamp.new.to_p))
-
- if result.ok? then
- return encode_token(outputBuffer.token)
- else
- raise "Error: #{result.to_s}"
- end
- ensure
- # need to make sure we don't clean up if we've already cleaned up.
- clean_up unless @cleaned_up
- end
-
- private
-
- def clean_up
- # free structures allocated
- @cleaned_up = true
- API::FreeCredentialsHandle.call(@credentials.to_p)
- API::DeleteSecurityContext.call(@context.to_p)
- @context = nil
- @credentials = nil
- @contextAttributes = nil
- end
-
- # Gets credentials based on user, domain or both. If both are nil, an error occurs
- def get_credentials
- @credentials = CredHandle.new
- ts = TimeStamp.new
- @identity = Identity.new @user, @domain
- result = SSPIResult.new(API::AcquireCredentialsHandle.call(nil, "Negotiate", SECPKG_CRED_OUTBOUND, nil, @identity.to_p,
- nil, nil, @credentials.to_p, ts.to_p))
- raise "Error acquire credentials: #{result}" unless result.ok?
- end
-
- def encode_token(t)
- # encode64 will add newlines every 60 characters so we need to remove those.
- [t].pack("m").delete("\n")
- end
- end
- end
-end \ No newline at end of file
diff --git a/ext/etc/etc.c b/ext/etc/etc.c
index c8e52dabc2..ecb9e16411 100644
--- a/ext/etc/etc.c
+++ b/ext/etc/etc.c
@@ -3,6 +3,7 @@
etc.c -
$Author$
+ $Date$
created at: Tue Mar 22 18:39:19 JST 1994
************************************************/
@@ -22,11 +23,12 @@
#include <grp.h>
#endif
-static VALUE sPasswd;
-#ifdef HAVE_GETGRENT
-static VALUE sGroup;
+#ifndef HAVE_TYPE_UID_T
+#define uid_t int
#endif
+static VALUE sPasswd, sGroup;
+
#ifndef _WIN32
char *getenv();
#endif
@@ -40,7 +42,8 @@ char *getlogin();
* Etc.getlogin -> 'guest'
*/
static VALUE
-etc_getlogin(VALUE obj)
+etc_getlogin(obj)
+ VALUE obj;
{
char *login;
@@ -59,7 +62,8 @@ etc_getlogin(VALUE obj)
#if defined(HAVE_GETPWENT) || defined(HAVE_GETGRENT)
static VALUE
-safe_setup_str(const char *str)
+safe_setup_str(str)
+ const char *str;
{
if (str == 0) str = "";
return rb_tainted_str_new2(str);
@@ -68,7 +72,8 @@ safe_setup_str(const char *str)
#ifdef HAVE_GETPWENT
static VALUE
-setup_passwd(struct passwd *pwd)
+setup_passwd(pwd)
+ struct passwd *pwd;
{
if (pwd == 0) rb_sys_fail("/etc/passwd");
return rb_struct_new(sPasswd,
@@ -76,8 +81,8 @@ setup_passwd(struct passwd *pwd)
#ifdef HAVE_ST_PW_PASSWD
safe_setup_str(pwd->pw_passwd),
#endif
- UIDT2NUM(pwd->pw_uid),
- GIDT2NUM(pwd->pw_gid),
+ PW_UID2VAL(pwd->pw_uid),
+ PW_GID2VAL(pwd->pw_gid),
#ifdef HAVE_ST_PW_GECOS
safe_setup_str(pwd->pw_gecos),
#endif
@@ -116,22 +121,25 @@ setup_passwd(struct passwd *pwd)
* passwd="x", uid=0, gid=0, gecos="root",dir="/root", shell="/bin/bash">
*/
static VALUE
-etc_getpwuid(int argc, VALUE *argv, VALUE obj)
+etc_getpwuid(argc, argv, obj)
+ int argc;
+ VALUE *argv;
+ VALUE obj;
{
#if defined(HAVE_GETPWENT)
VALUE id;
- rb_uid_t uid;
+ uid_t uid;
struct passwd *pwd;
rb_secure(4);
if (rb_scan_args(argc, argv, "01", &id) == 1) {
- uid = NUM2UIDT(id);
+ uid = PW_VAL2UID(id);
}
else {
uid = getuid();
}
pwd = getpwuid(uid);
- if (pwd == 0) rb_raise(rb_eArgError, "can't find user for %d", (int)uid);
+ if (pwd == 0) rb_raise(rb_eArgError, "can't find user for %d", uid);
return setup_passwd(pwd);
#else
return Qnil;
@@ -147,14 +155,15 @@ etc_getpwuid(int argc, VALUE *argv, VALUE obj)
* passwd="x", uid=0, gid=0, gecos="root",dir="/root", shell="/bin/bash">
*/
static VALUE
-etc_getpwnam(VALUE obj, VALUE nam)
+etc_getpwnam(obj, nam)
+ VALUE obj, nam;
{
#ifdef HAVE_GETPWENT
struct passwd *pwd;
SafeStringValue(nam);
- pwd = getpwnam(RSTRING_PTR(nam));
- if (pwd == 0) rb_raise(rb_eArgError, "can't find user for %s", RSTRING_PTR(nam));
+ pwd = getpwnam(RSTRING(nam)->ptr);
+ if (pwd == 0) rb_raise(rb_eArgError, "can't find user for %s", RSTRING(nam)->ptr);
return setup_passwd(pwd);
#else
return Qnil;
@@ -164,14 +173,14 @@ etc_getpwnam(VALUE obj, VALUE nam)
#ifdef HAVE_GETPWENT
static int passwd_blocking = 0;
static VALUE
-passwd_ensure(void)
+passwd_ensure()
{
passwd_blocking = Qfalse;
return Qnil;
}
static VALUE
-passwd_iterate(void)
+passwd_iterate()
{
struct passwd *pw;
@@ -182,22 +191,12 @@ passwd_iterate(void)
endpwent();
return Qnil;
}
-
-static void
-each_passwd(void)
-{
- if (passwd_blocking) {
- rb_raise(rb_eRuntimeError, "parallel passwd iteration");
- }
- passwd_blocking = Qtrue;
- rb_ensure(passwd_iterate, 0, passwd_ensure, 0);
-}
#endif
/* Provides a convenient Ruby iterator which executes a block for each entry
* in the /etc/passwd file.
*
- * The code block is passed an Struct::Passwd struct; see getpwent above for
+ * The code block is passed an Etc::Passwd struct; see getpwent above for
* details.
*
* Example:
@@ -210,55 +209,33 @@ each_passwd(void)
*
*/
static VALUE
-etc_passwd(VALUE obj)
+etc_passwd(obj)
+ VALUE obj;
{
#ifdef HAVE_GETPWENT
struct passwd *pw;
rb_secure(4);
if (rb_block_given_p()) {
- each_passwd();
+ if (passwd_blocking) {
+ rb_raise(rb_eRuntimeError, "parallel passwd iteration");
+ }
+ passwd_blocking = Qtrue;
+ rb_ensure(passwd_iterate, 0, passwd_ensure, 0);
}
- else if (pw = getpwent()) {
+ if (pw = getpwent()) {
return setup_passwd(pw);
}
#endif
return Qnil;
}
-/* Iterates for each entry in the /etc/passwd file if a block is given.
- * If no block is given, returns the enumerator.
- *
- * The code block is passed an Struct::Passwd struct; see getpwent above for
- * details.
- *
- * Example:
- *
- * require 'etc'
- *
- * Etc::Passwd.each {|u|
- * puts u.name + " = " + u.gecos
- * }
- *
- * Etc::Passwd.collect {|u| u.gecos}
- * Etc::Passwd.collect {|u| u.gecos}
- *
- */
-static VALUE
-etc_each_passwd(VALUE obj)
-{
-#ifdef HAVE_GETPWENT
- RETURN_ENUMERATOR(obj, 0, 0);
- each_passwd();
-#endif
- return obj;
-}
-
/* Resets the process of reading the /etc/passwd file, so that the next call
* to getpwent will return the first entry again.
*/
static VALUE
-etc_setpwent(VALUE obj)
+etc_setpwent(obj)
+ VALUE obj;
{
#ifdef HAVE_GETPWENT
setpwent();
@@ -270,7 +247,8 @@ etc_setpwent(VALUE obj)
* getpwent, and closes the file.
*/
static VALUE
-etc_endpwent(VALUE obj)
+etc_endpwent(obj)
+ VALUE obj;
{
#ifdef HAVE_GETPWENT
endpwent();
@@ -305,7 +283,8 @@ etc_endpwent(VALUE obj)
* - Passwd#shell contains the path to the login shell of the user as a String.
*/
static VALUE
-etc_getpwent(VALUE obj)
+etc_getpwent(obj)
+ VALUE obj;
{
#ifdef HAVE_GETPWENT
struct passwd *pw;
@@ -319,7 +298,8 @@ etc_getpwent(VALUE obj)
#ifdef HAVE_GETGRENT
static VALUE
-setup_group(struct group *grp)
+setup_group(grp)
+ struct group *grp;
{
VALUE mem;
char **tbl;
@@ -335,7 +315,7 @@ setup_group(struct group *grp)
#ifdef HAVE_ST_GR_PASSWD
safe_setup_str(grp->gr_passwd),
#endif
- GIDT2NUM(grp->gr_gid),
+ PW_GID2VAL(grp->gr_gid),
mem);
}
#endif
@@ -351,22 +331,17 @@ setup_group(struct group *grp)
*
*/
static VALUE
-etc_getgrgid(int argc, VALUE *argv, VALUE obj)
+etc_getgrgid(obj, id)
+ VALUE obj, id;
{
#ifdef HAVE_GETGRENT
- VALUE id;
gid_t gid;
struct group *grp;
rb_secure(4);
- if (rb_scan_args(argc, argv, "01", &id) == 1) {
- gid = NUM2GIDT(id);
- }
- else {
- gid = getgid();
- }
+ gid = PW_VAL2GID(id);
grp = getgrgid(gid);
- if (grp == 0) rb_raise(rb_eArgError, "can't find group for %d", (int)gid);
+ if (grp == 0) rb_raise(rb_eArgError, "can't find group for %d", gid);
return setup_group(grp);
#else
return Qnil;
@@ -384,15 +359,16 @@ etc_getgrgid(int argc, VALUE *argv, VALUE obj)
*
*/
static VALUE
-etc_getgrnam(VALUE obj, VALUE nam)
+etc_getgrnam(obj, nam)
+ VALUE obj, nam;
{
#ifdef HAVE_GETGRENT
struct group *grp;
rb_secure(4);
SafeStringValue(nam);
- grp = getgrnam(RSTRING_PTR(nam));
- if (grp == 0) rb_raise(rb_eArgError, "can't find group for %s", RSTRING_PTR(nam));
+ grp = getgrnam(RSTRING(nam)->ptr);
+ if (grp == 0) rb_raise(rb_eArgError, "can't find group for %s", RSTRING(nam)->ptr);
return setup_group(grp);
#else
return Qnil;
@@ -402,14 +378,14 @@ etc_getgrnam(VALUE obj, VALUE nam)
#ifdef HAVE_GETGRENT
static int group_blocking = 0;
static VALUE
-group_ensure(void)
+group_ensure()
{
group_blocking = Qfalse;
return Qnil;
}
static VALUE
-group_iterate(void)
+group_iterate()
{
struct group *pw;
@@ -420,22 +396,12 @@ group_iterate(void)
endgrent();
return Qnil;
}
-
-static void
-each_group(void)
-{
- if (group_blocking) {
- rb_raise(rb_eRuntimeError, "parallel group iteration");
- }
- group_blocking = Qtrue;
- rb_ensure(group_iterate, 0, group_ensure, 0);
-}
#endif
/* Provides a convenient Ruby iterator which executes a block for each entry
* in the /etc/group file.
*
- * The code block is passed an Struct::Group struct; see getgrent above for
+ * The code block is passed an Etc::Group struct; see getgrent above for
* details.
*
* Example:
@@ -448,55 +414,33 @@ each_group(void)
*
*/
static VALUE
-etc_group(VALUE obj)
+etc_group(obj)
+ VALUE obj;
{
#ifdef HAVE_GETGRENT
struct group *grp;
rb_secure(4);
if (rb_block_given_p()) {
- each_group();
+ if (group_blocking) {
+ rb_raise(rb_eRuntimeError, "parallel group iteration");
+ }
+ group_blocking = Qtrue;
+ rb_ensure(group_iterate, 0, group_ensure, 0);
}
- else if (grp = getgrent()) {
+ if (grp = getgrent()) {
return setup_group(grp);
}
#endif
return Qnil;
}
-#ifdef HAVE_GETPWENT
-/* Iterates for each entry in the /etc/group file if a block is given.
- * If no block is given, returns the enumerator.
- *
- * The code block is passed an Struct::Group struct; see getpwent above for
- * details.
- *
- * Example:
- *
- * require 'etc'
- *
- * Etc::Group.each {|g|
- * puts g.name + ": " + g.mem.join(', ')
- * }
- *
- * Etc::Group.collect {|g| g.name}
- * Etc::Group.select {|g| !g.mem.empty?}
- *
- */
-static VALUE
-etc_each_group(VALUE obj)
-{
- RETURN_ENUMERATOR(obj, 0, 0);
- each_group();
- return obj;
-}
-#endif
-
/* Resets the process of reading the /etc/group file, so that the next call
* to getgrent will return the first entry again.
*/
static VALUE
-etc_setgrent(VALUE obj)
+etc_setgrent(obj)
+ VALUE obj;
{
#ifdef HAVE_GETGRENT
setgrent();
@@ -508,7 +452,8 @@ etc_setgrent(VALUE obj)
* getgrent, and closes the file.
*/
static VALUE
-etc_endgrent(VALUE obj)
+etc_endgrent(obj)
+ VALUE obj;
{
#ifdef HAVE_GETGRENT
endgrent();
@@ -537,7 +482,8 @@ etc_endgrent(VALUE obj)
* members of the group.
*/
static VALUE
-etc_getgrent(VALUE obj)
+etc_getgrent(obj)
+ VALUE obj;
{
#ifdef HAVE_GETGRENT
struct group *gr;
@@ -549,17 +495,18 @@ etc_getgrent(VALUE obj)
return Qnil;
}
+static VALUE mEtc;
+
/* The etc module provides access to information from the /etc/passwd and
* /etc/group files on Linux and Unix systems.
*
* Documented by mathew <meta@pobox.com>.
*/
void
-Init_etc(void)
+Init_etc()
{
- VALUE mEtc;
-
mEtc = rb_define_module("Etc");
+
rb_define_module_function(mEtc, "getlogin", etc_getlogin, 0);
rb_define_module_function(mEtc, "getpwuid", etc_getpwuid, -1);
@@ -569,13 +516,14 @@ Init_etc(void)
rb_define_module_function(mEtc, "getpwent", etc_getpwent, 0);
rb_define_module_function(mEtc, "passwd", etc_passwd, 0);
- rb_define_module_function(mEtc, "getgrgid", etc_getgrgid, -1);
+ rb_define_module_function(mEtc, "getgrgid", etc_getgrgid, 1);
rb_define_module_function(mEtc, "getgrnam", etc_getgrnam, 1);
rb_define_module_function(mEtc, "group", etc_group, 0);
rb_define_module_function(mEtc, "setgrent", etc_setgrent, 0);
rb_define_module_function(mEtc, "endgrent", etc_endgrent, 0);
rb_define_module_function(mEtc, "getgrent", etc_getgrent, 0);
+ rb_global_variable(&sPasswd);
sPasswd = rb_struct_define("Passwd",
"name", "passwd", "uid", "gid",
#ifdef HAVE_ST_PW_GECOS
@@ -601,19 +549,13 @@ Init_etc(void)
"expire",
#endif
NULL);
- rb_define_const(mEtc, "Passwd", sPasswd);
- rb_extend_object(sPasswd, rb_mEnumerable);
- rb_define_singleton_method(sPasswd, "each", etc_each_passwd, 0);
#ifdef HAVE_GETGRENT
+ rb_global_variable(&sGroup);
sGroup = rb_struct_define("Group", "name",
#ifdef HAVE_ST_GR_PASSWD
"passwd",
#endif
"gid", "mem", NULL);
-
- rb_define_const(mEtc, "Group", sGroup);
- rb_extend_object(sGroup, rb_mEnumerable);
- rb_define_singleton_method(sGroup, "each", etc_each_group, 0);
#endif
}
diff --git a/ext/etc/extconf.rb b/ext/etc/extconf.rb
index 2914bfb196..dbd0672545 100644
--- a/ext/etc/extconf.rb
+++ b/ext/etc/extconf.rb
@@ -24,5 +24,20 @@ if a or b or c
have_struct_member('struct passwd', 'pw_expire', 'pwd.h')
have_struct_member('struct passwd', 'pw_passwd', 'pwd.h')
have_struct_member('struct group', 'gr_passwd', 'grp.h')
+ [%w"uid_t pwd.h", %w"gid_t grp.h"].each do |t, *h|
+ h.unshift("sys/types.h")
+ f = "INT2NUM"
+ if have_type(t, h)
+ if try_static_assert("sizeof(#{t}) > sizeof(long)", h)
+ f = "LL2NUM"
+ end
+ if try_static_assert("(#{t})-1 > 0", h)
+ f = "U#{f}"
+ end
+ end
+ t = t.chomp('_t').upcase
+ $defs.push("-DPW_#{t}2VAL=#{f}")
+ $defs.push("-DPW_VAL2#{t}=#{f.sub(/([A-Z]+)2(NUM)/, '\22\1')}")
+ end
create_makefile("etc")
end
diff --git a/ext/extmk.rb b/ext/extmk.rb
index 30de287cd8..64746552c1 100644
--- a/ext/extmk.rb
+++ b/ext/extmk.rb
@@ -16,7 +16,6 @@ $extlibs = nil
$extpath = nil
$ignore = nil
$message = nil
-$command_output = nil
$progname = $0
alias $PROGRAM_NAME $0
@@ -25,25 +24,33 @@ alias $0 $progname
$extlist = []
$compiled = {}
-srcdir = File.dirname(File.dirname(__FILE__))
-unless defined?(CROSS_COMPILING) and CROSS_COMPILING
- $:.replace([File.expand_path("lib", srcdir), Dir.pwd])
-end
-$:.unshift(srcdir)
+$:.replace([Dir.pwd])
require 'rbconfig'
+srcdir = File.dirname(File.dirname(__FILE__))
+
+$:.unshift(srcdir, File.expand_path("lib", srcdir))
+
$topdir = "."
$top_srcdir = srcdir
-$" << "mkmf.rb"
-load File.expand_path("lib/mkmf.rb", srcdir)
+require 'mkmf'
require 'optparse/shellwords'
def sysquote(x)
- @quote ||= /os2/ =~ (CROSS_COMPILING || RUBY_PLATFORM)
+ @quote ||= /human|os2|macos/ =~ (CROSS_COMPILING || RUBY_PLATFORM)
@quote ? x.quote : x
end
+def relative_from(path, base)
+ dir = File.join(path, "")
+ if File.expand_path(dir) == File.expand_path(dir, base)
+ path
+ else
+ File.join(base, path)
+ end
+end
+
def extract_makefile(makefile, keep = true)
m = File.read(makefile)
if !(target = m[/^TARGET[ \t]*=[ \t]*(\S*)/, 1])
@@ -62,7 +69,7 @@ def extract_makefile(makefile, keep = true)
unless installrb.empty?
config = CONFIG.dup
install_dirs(target_prefix).each {|var, val| config[var] = val}
- FileUtils.rm_f(installrb.values.collect {|f| RbConfig.expand(f, config)}, :verbose => true)
+ FileUtils.rm_f(installrb.values.collect {|f| Config.expand(f, config)}, :verbose => true)
end
end
return false
@@ -80,7 +87,6 @@ def extract_makefile(makefile, keep = true)
end
$objs = (m[/^OBJS[ \t]*=[ \t](.*)/, 1] || "").split
$srcs = (m[/^SRCS[ \t]*=[ \t](.*)/, 1] || "").split
- $distcleanfiles = (m[/^DISTCLEANFILES[ \t]*=[ \t](.*)/, 1] || "").split
$LOCAL_LIBS = m[/^LOCAL_LIBS[ \t]*=[ \t]*(.*)/, 1] || ""
$LIBPATH = Shellwords.shellwords(m[/^libpath[ \t]*=[ \t]*(.*)/, 1] || "") - %w[$(libdir) $(topdir)]
true
@@ -89,6 +95,15 @@ end
def extmake(target)
print "#{$message} #{target}\n"
$stdout.flush
+ if $force_static or $static_ext[target]
+ $static = target
+ else
+ $static = false
+ end
+
+ unless $ignore
+ return true if $nodynamic and not $static
+ end
FileUtils.mkpath target unless File.directory?(target)
begin
@@ -106,13 +121,13 @@ def extmake(target)
$mdir = target
$srcdir = File.join($top_srcdir, "ext", $mdir)
$preload = nil
- $objs = []
- $srcs = []
+ $objs = ""
+ $srcs = ""
$compiled[target] = false
makefile = "./Makefile"
ok = File.exist?(makefile)
unless $ignore
- rbconfig0 = RbConfig::CONFIG
+ rbconfig0 = Config::CONFIG
mkconfig0 = CONFIG
rbconfig = {
"hdrdir" => $hdrdir,
@@ -120,13 +135,13 @@ def extmake(target)
"topdir" => $topdir,
}
mkconfig = {
- "hdrdir" => ($hdrdir == top_srcdir) ? top_srcdir : "$(top_srcdir)/include",
+ "hdrdir" => "$(top_srcdir)",
"srcdir" => "$(top_srcdir)/ext/#{$mdir}",
"topdir" => $topdir,
}
rbconfig0.each_pair {|key, val| rbconfig[key] ||= val.dup}
mkconfig0.each_pair {|key, val| mkconfig[key] ||= val.dup}
- RbConfig.module_eval {
+ Config.module_eval {
remove_const(:CONFIG)
const_set(:CONFIG, rbconfig)
remove_const(:MAKEFILE_CONFIG)
@@ -139,19 +154,18 @@ def extmake(target)
begin
$extconf_h = nil
ok &&= extract_makefile(makefile)
- old_objs = $objs
- old_cleanfiles = $distcleanfiles
- conf = ["#{$srcdir}/makefile.rb", "#{$srcdir}/extconf.rb"].find {|f| File.exist?(f)}
if (($extconf_h && !File.exist?($extconf_h)) ||
!(t = modified?(makefile, MTIMES)) ||
- [conf, "#{$srcdir}/depend"].any? {|f| modified?(f, [t])})
+ ["#{$srcdir}/makefile.rb", "#{$srcdir}/extconf.rb", "#{$srcdir}/depend"].any? {|f| modified?(f, [t])})
then
ok = false
init_mkmf
Logging::logfile 'mkmf.log'
rm_f makefile
- if conf
- load $0 = conf
+ if File.exist?($0 = "#{$srcdir}/makefile.rb")
+ load $0
+ elsif File.exist?($0 = "#{$srcdir}/extconf.rb")
+ load $0
else
create_makefile(target)
end
@@ -169,7 +183,7 @@ def extmake(target)
ok = yield(ok) if block_given?
unless ok
open(makefile, "w") do |f|
- f.print(*dummy_makefile(CONFIG["srcdir"]))
+ f.print dummy_makefile(CONFIG["srcdir"])
end
return true
end
@@ -181,8 +195,6 @@ def extmake(target)
args += ["static"] unless $clean
$extlist.push [$static, $target, File.basename($target), $preload]
end
- FileUtils.rm_f(old_cleanfiles - $distcleanfiles)
- FileUtils.rm_f(old_objs - $objs)
unless system($make, *args)
$ignore or $continue or return false
end
@@ -192,6 +204,7 @@ def extmake(target)
if $clean != true
FileUtils.rm_f([makefile, $extconf_h || "extconf.h"])
end
+ File.unlink(makefile) rescue nil
end
if $static
$extflags ||= ""
@@ -205,7 +218,7 @@ def extmake(target)
end
ensure
unless $ignore
- RbConfig.module_eval {
+ Config.module_eval {
remove_const(:CONFIG)
const_set(:CONFIG, rbconfig0)
remove_const(:MAKEFILE_CONFIG)
@@ -236,8 +249,8 @@ end
def parse_args()
$mflags = []
- $makeflags = []
+ opts = nil
$optparser ||= OptionParser.new do |opts|
opts.on('-n') {$dryrun = true}
opts.on('--[no-]extension [EXTS]', Array) do |v|
@@ -265,22 +278,18 @@ def parse_args()
if arg = v.first
arg.insert(0, '-') if /\A[^-][^=]*\Z/ =~ arg
end
- $makeflags.concat(v.reject {|arg| /\AMINIRUBY=/ =~ arg}.quote)
$mflags.concat(v)
end
opts.on('--message [MESSAGE]', String) do |v|
$message = v
end
- opts.on('--command-output=FILE', String) do |v|
- $command_output = v
- end
end
begin
$optparser.parse!(ARGV)
rescue OptionParser::InvalidOption => e
retry if /^--/ =~ e.args[0]
$optparser.warn(e)
- abort $optparser.to_s
+ abort opts.to_s
end
$destdir ||= ''
@@ -306,7 +315,7 @@ def parse_args()
$continue = $mflags.set?(?k)
if $extout
$extout = '$(topdir)/'+$extout
- RbConfig::CONFIG["extout"] = CONFIG["extout"] = $extout
+ Config::CONFIG["extout"] = CONFIG["extout"] = $extout
$extout_prefix = $extout ? "$(extout)$(target_prefix)/" : ""
$mflags << "extout=#$extout" << "extout_prefix=#$extout_prefix"
end
@@ -339,7 +348,7 @@ end
EXEEXT = CONFIG['EXEEXT']
if CROSS_COMPILING
- $ruby = $mflags.defined?("MINIRUBY") || CONFIG['MINIRUBY']
+ $ruby = CONFIG['MINIRUBY']
elsif sep = config_string('BUILD_FILE_SEPARATOR')
$ruby = "$(topdir:/=#{sep})#{sep}miniruby" + EXEEXT
else
@@ -351,8 +360,9 @@ unless CROSS_COMPILING
$ruby << " -I'$(extout)/$(arch)' -I'$(extout)/common'" if $extout
$ruby << " -I./- -I'$(top_srcdir)/ext' -rpurelib.rb"
ENV["RUBYLIB"] = "-"
- ENV["RUBYOPT"] = "-r#{File.expand_path('ext/purelib.rb', $top_srcdir)}"
+ ENV["RUBYOPT"] = "-rpurelib.rb"
end
+$config_h = '$(topdir)/config.h'
$mflags << "ruby=#$ruby"
MTIMES = [__FILE__, 'rbconfig.rb', srcdir+'/lib/mkmf.rb'].collect {|f| File.mtime(f)}
@@ -360,9 +370,8 @@ MTIMES = [__FILE__, 'rbconfig.rb', srcdir+'/lib/mkmf.rb'].collect {|f| File.mtim
# get static-link modules
$static_ext = {}
if $extstatic
- $extstatic.each do |t|
- target = t
- target = target.downcase if File::FNM_SYSCASE.nonzero?
+ $extstatic.each do |target|
+ target = target.downcase if /mswin32|bccwin32/ =~ RUBY_PLATFORM
$static_ext[target] = $static_ext.size
end
end
@@ -382,7 +391,7 @@ for dir in ["ext", File::join($top_srcdir, "ext")]
end
next
end
- target = target.downcase if File::FNM_SYSCASE.nonzero?
+ target = target.downcase if /mswin32|bccwin32/ =~ RUBY_PLATFORM
$static_ext[target] = $static_ext.size
end
MTIMES << f.mtime
@@ -398,22 +407,16 @@ if $extension
exts |= $extension.select {|d| File.directory?("#{ext_prefix}/#{d}")}
else
withes, withouts = %w[--with --without].collect {|w|
- if not (w = %w[-extensions -ext].collect {|o|arg_config(w+o)}).any?
- nil
+ if not (w = %w[-extensions -ext].collect {|opt|arg_config(w+opt)}).any?
+ proc {false}
elsif (w = w.grep(String)).empty?
proc {true}
else
- proc {|c1| w.collect {|o| o.split(/,/)}.flatten.any?(&c1)}
+ proc {|c1| w.collect {|opt| opt.split(/,/)}.flatten.any?(&c1)}
end
}
- if withes
- withouts ||= proc {true}
- else
- withes = proc {false}
- withouts ||= withes
- end
- cond = proc {|ext, *|
- cond1 = proc {|n| File.fnmatch(n, ext)}
+ cond = proc {|ext|
+ cond1 = proc {|n| File.fnmatch(n, ext, File::FNM_PATHNAME)}
withes.call(cond1) or !withouts.call(cond1)
}
exts |= Dir.glob("#{ext_prefix}/*/**/extconf.rb").collect {|d|
@@ -426,7 +429,7 @@ else
end
if $extout
- extout = RbConfig.expand("#{$extout}", RbConfig::CONFIG.merge("topdir"=>$topdir))
+ extout = Config.expand("#{$extout}", Config::CONFIG.merge("topdir"=>$topdir))
unless $ignore
FileUtils.mkpath(extout)
end
@@ -437,13 +440,9 @@ FileUtils::makedirs('ext')
Dir::chdir('ext')
hdrdir = $hdrdir
-$hdrdir = ($top_srcdir = relative_from(srcdir, $topdir = "..")) + "/include"
+$hdrdir = $top_srcdir = relative_from(srcdir, $topdir = "..")
exts.each do |d|
- $static = $force_static ? $static_ext[target] : false
-
- if $ignore or !$nodynamic or $static
- extmake(d) or abort
- end
+ extmake(d) or abort
end
$top_srcdir = srcdir
$topdir = "."
@@ -502,21 +501,18 @@ unless $extlist.empty?
src = %{\
#include "ruby.h"
-#define init(func, name) { \\
- extern void func _((void)); \\
- ruby_init_ext(name, func); \\
-}
+#define init(func, name) {void func _((void)); ruby_init_ext(name, func);}
void ruby_init_ext _((const char *name, void (*init)(void)));
void Init_ext _((void))\n{\n#$extinit}
}
if !modified?(extinit.c, MTIMES) || IO.read(extinit.c) != src
- open(extinit.c, "w") {|fe| fe.print src}
+ open(extinit.c, "w") {|f| f.print src}
end
$extobjs = "ext/#{extinit.o} #{$extobjs}"
- if RUBY_PLATFORM =~ /beos/
+ if RUBY_PLATFORM =~ /m68k-human|beos/
$extflags.delete("-L/usr/local/lib")
end
$extpath.delete("$(topdir)")
@@ -529,18 +525,17 @@ void Init_ext _((void))\n{\n#$extinit}
].map {|n, v|
"#{n}=#{v}" if v and !(v = v.strip).empty?
}.compact
- puts(*conf)
+ puts conf
$stdout.flush
$mflags.concat(conf)
- $makeflags.concat(conf)
else
FileUtils.rm_f(extinit.to_a)
end
rubies = []
-%w[RUBY RUBYW STATIC_RUBY].each {|n|
- r = n
+%w[RUBY RUBYW STATIC_RUBY].each {|r|
+ n = r
if r = arg_config("--"+r.downcase) || config_string(r+"_INSTALL_NAME")
- rubies << RbConfig.expand(r+=EXEEXT)
+ rubies << Config.expand(r+=EXEEXT)
$mflags << "#{n}=#{r}"
end
}
@@ -549,10 +544,9 @@ Dir.chdir ".."
unless $destdir.to_s.empty?
$mflags.defined?("DESTDIR") or $mflags << "DESTDIR=#{$destdir}"
end
-message = "making #{rubies.join(', ')}"
+puts "making #{rubies.join(', ')}"
+$stdout.flush
$mflags.concat(rubies)
-$makeflags.uniq!
-$makeflags.concat(rubies)
if $nmake == ?b
unless (vars = $mflags.grep(/\A\w+=/n)).empty?
@@ -566,29 +560,7 @@ if $nmake == ?b
vars.each {|flag| flag.sub!(/\A/, "-D")}
end
end
-$mflags.unshift("topdir=#$topdir")
-ENV.delete("RUBYOPT")
-if $command_output
- message = "echo #{message}"
- cmd = $makeflags.quote.join(' ')
- open($command_output, 'wb') do |f|
- case $command_output
- when /\.sh\z/
- f.puts message, "rm -f $0; exec \"$@\" #{cmd}"
- when /\.bat\z/
- ["@echo off", message, "%* #{cmd}", "del %0 & exit %ERRORLEVEL%"].each do |s|
- f.print s, "\r\n"
- end
- else
- f.puts cmd
- end
- f.chmod(0755)
- end
-else
- puts message
- $stdout.flush
- system($make, *sysquote($mflags)) or exit($?.exitstatus)
-end
+system($make, *sysquote($mflags)) or exit($?.exitstatus)
#Local variables:
# mode: ruby
diff --git a/ext/fcntl/.cvsignore b/ext/fcntl/.cvsignore
index 814345ece8..4088712231 100644
--- a/ext/fcntl/.cvsignore
+++ b/ext/fcntl/.cvsignore
@@ -1,4 +1,3 @@
Makefile
mkmf.log
*.def
-extconf.h
diff --git a/ext/fiber/extconf.rb b/ext/fiber/extconf.rb
deleted file mode 100644
index 904ab94a9c..0000000000
--- a/ext/fiber/extconf.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-require 'mkmf'
-create_makefile('fiber')
-
diff --git a/ext/fiber/fiber.c b/ext/fiber/fiber.c
deleted file mode 100644
index 12fcaad73b..0000000000
--- a/ext/fiber/fiber.c
+++ /dev/null
@@ -1,8 +0,0 @@
-
-void ruby_Init_Fiber_as_Coroutine(void);
-
-void
-Init_fiber(void)
-{
- ruby_Init_Fiber_as_Coroutine();
-}
diff --git a/ext/gdbm/.cvsignore b/ext/gdbm/.cvsignore
index 814345ece8..4088712231 100644
--- a/ext/gdbm/.cvsignore
+++ b/ext/gdbm/.cvsignore
@@ -1,4 +1,3 @@
Makefile
mkmf.log
*.def
-extconf.h
diff --git a/ext/gdbm/gdbm.c b/ext/gdbm/gdbm.c
index 71a159171e..82109fda90 100644
--- a/ext/gdbm/gdbm.c
+++ b/ext/gdbm/gdbm.c
@@ -3,6 +3,7 @@
gdbm.c -
$Author$
+ $Date$
modified at: Mon Jan 24 15:59:52 JST 1994
Documentation by Peter Adolphs < futzilogik at users dot sourceforge dot net >
@@ -78,7 +79,8 @@ static VALUE rb_cGDBM, rb_eGDBMError, rb_eGDBMFatalError;
#define MY_BLOCK_SIZE (2048)
#define MY_FATAL_FUNC rb_gdbm_fatal
static void
-rb_gdbm_fatal(char *msg)
+rb_gdbm_fatal(msg)
+ char *msg;
{
rb_raise(rb_eGDBMFatalError, "%s", msg);
}
@@ -89,7 +91,7 @@ struct dbmdata {
};
static void
-closed_dbm(void)
+closed_dbm()
{
rb_raise(rb_eRuntimeError, "closed GDBM file");
}
@@ -106,11 +108,12 @@ closed_dbm(void)
}
static void
-free_dbm(struct dbmdata *dbmp)
+free_dbm(dbmp)
+ struct dbmdata *dbmp;
{
if (dbmp) {
if (dbmp->di_dbm) gdbm_close(dbmp->di_dbm);
- xfree(dbmp);
+ free(dbmp);
}
}
@@ -121,7 +124,8 @@ free_dbm(struct dbmdata *dbmp)
* Closes the associated database file.
*/
static VALUE
-fgdbm_close(VALUE obj)
+fgdbm_close(obj)
+ VALUE obj;
{
struct dbmdata *dbmp;
@@ -139,7 +143,8 @@ fgdbm_close(VALUE obj)
* Returns true if the associated database file has been closed.
*/
static VALUE
-fgdbm_closed(VALUE obj)
+fgdbm_closed(obj)
+ VALUE obj;
{
struct dbmdata *dbmp;
@@ -152,8 +157,11 @@ fgdbm_closed(VALUE obj)
return Qfalse;
}
+static VALUE fgdbm_s_alloc _((VALUE));
+
static VALUE
-fgdbm_s_alloc(VALUE klass)
+fgdbm_s_alloc(klass)
+ VALUE klass;
{
return Data_Wrap_Struct(klass, 0, free_dbm, 0);
}
@@ -182,7 +190,10 @@ fgdbm_s_alloc(VALUE klass)
* database file as a reader (cf. flag <tt>READER</tt>).
*/
static VALUE
-fgdbm_initialize(int argc, VALUE *argv, VALUE obj)
+fgdbm_initialize(argc, argv, obj)
+ int argc;
+ VALUE *argv;
+ VALUE obj;
{
VALUE file, vmode, vflags;
GDBM_FILE dbm;
@@ -206,31 +217,31 @@ fgdbm_initialize(int argc, VALUE *argv, VALUE obj)
if (flags & RUBY_GDBM_RW_BIT) {
flags &= ~RUBY_GDBM_RW_BIT;
- dbm = gdbm_open(RSTRING_PTR(file), MY_BLOCK_SIZE,
- flags, mode, MY_FATAL_FUNC);
+ dbm = gdbm_open(RSTRING(file)->ptr, MY_BLOCK_SIZE,
+ flags, mode, MY_FATAL_FUNC);
}
else {
dbm = 0;
if (mode >= 0)
- dbm = gdbm_open(RSTRING_PTR(file), MY_BLOCK_SIZE,
+ dbm = gdbm_open(RSTRING(file)->ptr, MY_BLOCK_SIZE,
GDBM_WRCREAT|flags, mode, MY_FATAL_FUNC);
if (!dbm)
- dbm = gdbm_open(RSTRING_PTR(file), MY_BLOCK_SIZE,
+ dbm = gdbm_open(RSTRING(file)->ptr, MY_BLOCK_SIZE,
GDBM_WRITER|flags, 0, MY_FATAL_FUNC);
if (!dbm)
- dbm = gdbm_open(RSTRING_PTR(file), MY_BLOCK_SIZE,
+ dbm = gdbm_open(RSTRING(file)->ptr, MY_BLOCK_SIZE,
GDBM_READER|flags, 0, MY_FATAL_FUNC);
}
if (!dbm) {
- if (mode == -1) return Qnil;
-
- if (gdbm_errno == GDBM_FILE_OPEN_ERROR ||
- gdbm_errno == GDBM_CANT_BE_READER ||
- gdbm_errno == GDBM_CANT_BE_WRITER)
- rb_sys_fail(RSTRING_PTR(file));
- else
- rb_raise(rb_eGDBMError, "%s", gdbm_strerror(gdbm_errno));
+ if (mode == -1) return Qnil;
+
+ if (gdbm_errno == GDBM_FILE_OPEN_ERROR ||
+ gdbm_errno == GDBM_CANT_BE_READER ||
+ gdbm_errno == GDBM_CANT_BE_WRITER)
+ rb_sys_fail(RSTRING(file)->ptr);
+ else
+ rb_raise(rb_eGDBMError, "%s", gdbm_strerror(gdbm_errno));
}
dbmp = ALLOC(struct dbmdata);
@@ -262,12 +273,15 @@ fgdbm_initialize(int argc, VALUE *argv, VALUE obj)
* end
*/
static VALUE
-fgdbm_s_open(int argc, VALUE *argv, VALUE klass)
+fgdbm_s_open(argc, argv, klass)
+ int argc;
+ VALUE *argv;
+ VALUE klass;
{
VALUE obj = Data_Wrap_Struct(klass, 0, free_dbm, 0);
if (NIL_P(fgdbm_initialize(argc, argv, obj))) {
- return Qnil;
+ return Qnil;
}
if (rb_block_given_p()) {
@@ -278,7 +292,9 @@ fgdbm_s_open(int argc, VALUE *argv, VALUE klass)
}
static VALUE
-rb_gdbm_fetch(GDBM_FILE dbm, datum key)
+rb_gdbm_fetch(dbm, key)
+ GDBM_FILE dbm;
+ datum key;
{
datum val;
VALUE str;
@@ -287,26 +303,33 @@ rb_gdbm_fetch(GDBM_FILE dbm, datum key)
if (val.dptr == 0)
return Qnil;
- str = rb_str_new(val.dptr, val.dsize);
- free(val.dptr);
+ str = rb_obj_alloc(rb_cString);
+ RSTRING(str)->len = val.dsize;
+ RSTRING(str)->aux.capa = val.dsize;
+ RSTRING(str)->ptr = REALLOC_N(val.dptr,char,val.dsize+1);
+ RSTRING(str)->ptr[val.dsize] = '\0';
+
OBJ_TAINT(str);
- return str;
+ return (VALUE)str;
}
static VALUE
-rb_gdbm_fetch2(GDBM_FILE dbm, VALUE keystr)
+rb_gdbm_fetch2(dbm, keystr)
+ GDBM_FILE dbm;
+ VALUE keystr;
{
datum key;
StringValue(keystr);
- key.dptr = RSTRING_PTR(keystr);
- key.dsize = RSTRING_LEN(keystr);
+ key.dptr = RSTRING(keystr)->ptr;
+ key.dsize = RSTRING(keystr)->len;
return rb_gdbm_fetch(dbm, key);
}
static VALUE
-rb_gdbm_fetch3(VALUE obj, VALUE keystr)
+rb_gdbm_fetch3(obj, keystr)
+ VALUE obj, keystr;
{
struct dbmdata *dbmp;
GDBM_FILE dbm;
@@ -316,7 +339,8 @@ rb_gdbm_fetch3(VALUE obj, VALUE keystr)
}
static VALUE
-rb_gdbm_firstkey(GDBM_FILE dbm)
+rb_gdbm_firstkey(dbm)
+ GDBM_FILE dbm;
{
datum key;
VALUE str;
@@ -325,40 +349,51 @@ rb_gdbm_firstkey(GDBM_FILE dbm)
if (key.dptr == 0)
return Qnil;
- str = rb_str_new(key.dptr, key.dsize);
- free(key.dptr);
+ str = rb_obj_alloc(rb_cString);
+ RSTRING(str)->len = key.dsize;
+ RSTRING(str)->aux.capa = key.dsize;
+ RSTRING(str)->ptr = REALLOC_N(key.dptr,char,key.dsize+1);
+ RSTRING(str)->ptr[RSTRING(str)->len] = '\0';
+
OBJ_TAINT(str);
return str;
}
static VALUE
-rb_gdbm_nextkey(GDBM_FILE dbm, VALUE keystr)
+rb_gdbm_nextkey(dbm, keystr)
+ GDBM_FILE dbm;
+ VALUE keystr;
{
datum key, key2;
VALUE str;
- key.dptr = RSTRING_PTR(keystr);
- key.dsize = RSTRING_LEN(keystr);
+ key.dptr = RSTRING(keystr)->ptr;
+ key.dsize = RSTRING(keystr)->len;
key2 = gdbm_nextkey(dbm, key);
if (key2.dptr == 0)
return Qnil;
- str = rb_str_new(key2.dptr, key2.dsize);
- free(key2.dptr);
+ str = rb_obj_alloc(rb_cString);
+ RSTRING(str)->len = key2.dsize;
+ RSTRING(str)->aux.capa = key2.dsize;
+ RSTRING(str)->ptr = REALLOC_N(key2.dptr,char,key2.dsize+1);
+ RSTRING(str)->ptr[RSTRING(str)->len] = '\0';
+
OBJ_TAINT(str);
return str;
}
static VALUE
-fgdbm_fetch(VALUE obj, VALUE keystr, VALUE ifnone)
+fgdbm_fetch(obj, keystr, ifnone)
+ VALUE obj, keystr, ifnone;
{
VALUE valstr;
valstr = rb_gdbm_fetch3(obj, keystr);
if (NIL_P(valstr)) {
- if (ifnone == Qnil && rb_block_given_p())
- return rb_yield(keystr);
- return ifnone;
+ if (ifnone == Qnil && rb_block_given_p())
+ return rb_yield(keystr);
+ return ifnone;
}
return valstr;
}
@@ -370,7 +405,8 @@ fgdbm_fetch(VALUE obj, VALUE keystr, VALUE ifnone)
* Retrieves the _value_ corresponding to _key_.
*/
static VALUE
-fgdbm_aref(VALUE obj, VALUE keystr)
+fgdbm_aref(obj, keystr)
+ VALUE obj, keystr;
{
return rb_gdbm_fetch3(obj, keystr);
}
@@ -383,7 +419,10 @@ fgdbm_aref(VALUE obj, VALUE keystr)
* associated with _key_, _default_ will be returned instead.
*/
static VALUE
-fgdbm_fetch_m(int argc, VALUE *argv, VALUE obj)
+fgdbm_fetch_m(argc, argv, obj)
+ int argc;
+ VALUE *argv;
+ VALUE obj;
{
VALUE keystr, valstr, ifnone;
@@ -397,13 +436,14 @@ fgdbm_fetch_m(int argc, VALUE *argv, VALUE obj)
/*
* call-seq:
- * gdbm.key(value) -> key
+ * gdbm.index(value) -> key
*
* Returns the _key_ for a given _value_. If several keys may map to the
* same value, the key that is found first will be returned.
*/
static VALUE
-fgdbm_key(VALUE obj, VALUE valstr)
+fgdbm_index(obj, valstr)
+ VALUE obj, valstr;
{
struct dbmdata *dbmp;
GDBM_FILE dbm;
@@ -414,23 +454,32 @@ fgdbm_key(VALUE obj, VALUE valstr)
for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
keystr = rb_gdbm_nextkey(dbm, keystr)) {
- valstr2 = rb_gdbm_fetch2(dbm, keystr);
+ valstr2 = rb_gdbm_fetch2(dbm, keystr);
if (!NIL_P(valstr2) &&
- RSTRING_LEN(valstr) == RSTRING_LEN(valstr2) &&
- memcmp(RSTRING_PTR(valstr), RSTRING_PTR(valstr2),
- RSTRING_LEN(valstr)) == 0) {
- return keystr;
+ RSTRING(valstr)->len == RSTRING(valstr2)->len &&
+ memcmp(RSTRING(valstr)->ptr, RSTRING(valstr2)->ptr,
+ RSTRING(valstr)->len) == 0) {
+ return keystr;
}
}
return Qnil;
}
-/* :nodoc: */
static VALUE
-fgdbm_index(VALUE obj, VALUE value)
+fgdbm_indexes(argc, argv, obj)
+ int argc;
+ VALUE *argv;
+ VALUE obj;
{
- rb_warn("GDBM#index is deprecated; use GDBM#key");
- return fgdbm_key(obj, value);
+ VALUE new;
+ int i;
+
+ new = rb_ary_new2(argc);
+ for (i=0; i<argc; i++) {
+ rb_ary_push(new, rb_gdbm_fetch3(obj, argv[i]));
+ }
+
+ return new;
}
/*
@@ -441,23 +490,40 @@ fgdbm_index(VALUE obj, VALUE value)
* evaluates to true.
*/
static VALUE
-fgdbm_select(VALUE obj)
+fgdbm_select(argc, argv, obj)
+ int argc;
+ VALUE *argv;
+ VALUE obj;
{
- VALUE new = rb_ary_new();
- GDBM_FILE dbm;
- struct dbmdata *dbmp;
- VALUE keystr;
+ VALUE new = rb_ary_new2(argc);
+ int i;
- GetDBM2(obj, dbmp, dbm);
- for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
- keystr = rb_gdbm_nextkey(dbm, keystr)) {
- VALUE assoc = rb_assoc_new(keystr, rb_gdbm_fetch2(dbm, keystr));
- VALUE v = rb_yield(assoc);
+ if (rb_block_given_p()) {
+ GDBM_FILE dbm;
+ struct dbmdata *dbmp;
+ VALUE keystr;
- if (RTEST(v)) {
- rb_ary_push(new, assoc);
- }
+ if (argc > 0) {
+ rb_raise(rb_eArgError, "wrong number arguments(%d for 0)", argc);
+ }
GetDBM2(obj, dbmp, dbm);
+ for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
+ keystr = rb_gdbm_nextkey(dbm, keystr)) {
+ VALUE assoc = rb_assoc_new(keystr, rb_gdbm_fetch2(dbm, keystr));
+ VALUE v = rb_yield(assoc);
+
+ if (RTEST(v)) {
+ rb_ary_push(new, assoc);
+ }
+ GetDBM2(obj, dbmp, dbm);
+ }
+ }
+ else {
+ rb_warn("GDBM#select(index..) is deprecated; use GDBM#values_at");
+
+ for (i=0; i<argc; i++) {
+ rb_ary_push(new, rb_gdbm_fetch3(obj, argv[i]));
+ }
}
return new;
@@ -470,7 +536,10 @@ fgdbm_select(VALUE obj)
* Returns an array of the values associated with each specified _key_.
*/
static VALUE
-fgdbm_values_at(int argc, VALUE *argv, VALUE obj)
+fgdbm_values_at(argc, argv, obj)
+ int argc;
+ VALUE *argv;
+ VALUE obj;
{
VALUE new = rb_ary_new2(argc);
int i;
@@ -483,14 +552,16 @@ fgdbm_values_at(int argc, VALUE *argv, VALUE obj)
}
static void
-rb_gdbm_modify(VALUE obj)
+rb_gdbm_modify(obj)
+ VALUE obj;
{
rb_secure(4);
if (OBJ_FROZEN(obj)) rb_error_frozen("GDBM");
}
static VALUE
-rb_gdbm_delete(VALUE obj, VALUE keystr)
+rb_gdbm_delete(obj, keystr)
+ VALUE obj, keystr;
{
datum key;
struct dbmdata *dbmp;
@@ -498,8 +569,8 @@ rb_gdbm_delete(VALUE obj, VALUE keystr)
rb_gdbm_modify(obj);
StringValue(keystr);
- key.dptr = RSTRING_PTR(keystr);
- key.dsize = RSTRING_LEN(keystr);
+ key.dptr = RSTRING(keystr)->ptr;
+ key.dsize = RSTRING(keystr)->len;
GetDBM2(obj, dbmp, dbm);
if (!gdbm_exists(dbm, key)) {
@@ -524,7 +595,8 @@ rb_gdbm_delete(VALUE obj, VALUE keystr)
* returns the corresponding _value_. Returns nil if the database is empty.
*/
static VALUE
-fgdbm_delete(VALUE obj, VALUE keystr)
+fgdbm_delete(obj, keystr)
+ VALUE obj, keystr;
{
VALUE valstr;
@@ -541,7 +613,8 @@ fgdbm_delete(VALUE obj, VALUE keystr)
* two-item array [ _key_, _value_ ]. Returns nil if the database is empty.
*/
static VALUE
-fgdbm_shift(VALUE obj)
+fgdbm_shift(obj)
+ VALUE obj;
{
struct dbmdata *dbmp;
GDBM_FILE dbm;
@@ -565,7 +638,8 @@ fgdbm_shift(VALUE obj)
* Deletes every key-value pair from _gdbm_ for which _block_ evaluates to true.
*/
static VALUE
-fgdbm_delete_if(VALUE obj)
+fgdbm_delete_if(obj)
+ VALUE obj;
{
struct dbmdata *dbmp;
GDBM_FILE dbm;
@@ -588,10 +662,10 @@ fgdbm_delete_if(VALUE obj)
GetDBM2(obj, dbmp, dbm);
}
- for (i = 0; i < RARRAY_LEN(ary); i++)
- rb_gdbm_delete(obj, RARRAY_PTR(ary)[i]);
+ for (i = 0; i < RARRAY(ary)->len; i++)
+ rb_gdbm_delete(obj, RARRAY(ary)->ptr[i]);
if (status) rb_jump_tag(status);
- if (n > 0) dbmp->di_size = n - RARRAY_LEN(ary);
+ if (n > 0) dbmp->di_size = n - RARRAY(ary)->len;
return obj;
}
@@ -603,7 +677,8 @@ fgdbm_delete_if(VALUE obj)
* Removes all the key-value pairs within _gdbm_.
*/
static VALUE
-fgdbm_clear(VALUE obj)
+fgdbm_clear(obj)
+ VALUE obj;
{
datum key, nextkey;
struct dbmdata *dbmp;
@@ -647,7 +722,8 @@ fgdbm_clear(VALUE obj)
* as values.
*/
static VALUE
-fgdbm_invert(VALUE obj)
+fgdbm_invert(obj)
+ VALUE obj;
{
struct dbmdata *dbmp;
GDBM_FILE dbm;
@@ -657,55 +733,33 @@ fgdbm_invert(VALUE obj)
GetDBM2(obj, dbmp, dbm);
for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
keystr = rb_gdbm_nextkey(dbm, keystr)) {
- valstr = rb_gdbm_fetch2(dbm, keystr);
+ valstr = rb_gdbm_fetch2(dbm, keystr);
- rb_hash_aset(hash, valstr, keystr);
+ rb_hash_aset(hash, valstr, keystr);
}
return hash;
}
-/*
- * call-seq:
- * gdbm[key]= value -> value
- * gdbm.store(key, value) -> value
- *
- * Associates the value _value_ with the specified _key_.
- */
+static VALUE each_pair _((VALUE));
+
static VALUE
-fgdbm_store(VALUE obj, VALUE keystr, VALUE valstr)
+each_pair(obj)
+ VALUE obj;
{
- datum key, val;
- struct dbmdata *dbmp;
- GDBM_FILE dbm;
-
- rb_gdbm_modify(obj);
- StringValue(keystr);
- StringValue(valstr);
-
- key.dptr = RSTRING_PTR(keystr);
- key.dsize = RSTRING_LEN(keystr);
-
- val.dptr = RSTRING_PTR(valstr);
- val.dsize = RSTRING_LEN(valstr);
-
- GetDBM2(obj, dbmp, dbm);
- dbmp->di_size = -1;
- if (gdbm_store(dbm, key, val, GDBM_REPLACE)) {
- if (errno == EPERM) rb_sys_fail(0);
- rb_raise(rb_eGDBMError, "%s", gdbm_strerror(gdbm_errno));
- }
-
- return valstr;
+ return rb_funcall(obj, rb_intern("each_pair"), 0, 0);
}
+static VALUE fgdbm_store _((VALUE,VALUE,VALUE));
+
static VALUE
-update_i(VALUE pair, VALUE dbm)
+update_i(pair, dbm)
+ VALUE pair, dbm;
{
Check_Type(pair, T_ARRAY);
- if (RARRAY_LEN(pair) < 2) {
- rb_raise(rb_eArgError, "pair must be [key, value]");
+ if (RARRAY(pair)->len < 2) {
+ rb_raise(rb_eArgError, "pair must be [key, value]");
}
- fgdbm_store(dbm, RARRAY_PTR(pair)[0], RARRAY_PTR(pair)[1]);
+ fgdbm_store(dbm, RARRAY(pair)->ptr[0], RARRAY(pair)->ptr[1]);
return Qnil;
}
@@ -718,9 +772,10 @@ update_i(VALUE pair, VALUE dbm)
* method.
*/
static VALUE
-fgdbm_update(VALUE obj, VALUE other)
+fgdbm_update(obj, other)
+ VALUE obj, other;
{
- rb_block_call(other, rb_intern("each_pair"), 0, 0, update_i, obj);
+ rb_iterate(each_pair, other, update_i, obj);
return obj;
}
@@ -732,22 +787,59 @@ fgdbm_update(VALUE obj, VALUE other)
* _other_ must have an each_pair method.
*/
static VALUE
-fgdbm_replace(VALUE obj, VALUE other)
+fgdbm_replace(obj, other)
+ VALUE obj, other;
{
fgdbm_clear(obj);
- rb_block_call(other, rb_intern("each_pair"), 0, 0, update_i, obj);
+ rb_iterate(each_pair, other, update_i, obj);
return obj;
}
/*
* call-seq:
+ * gdbm[key]= value -> value
+ * gdbm.store(key, value) -> value
+ *
+ * Associates the value _value_ with the specified _key_.
+ */
+static VALUE
+fgdbm_store(obj, keystr, valstr)
+ VALUE obj, keystr, valstr;
+{
+ datum key, val;
+ struct dbmdata *dbmp;
+ GDBM_FILE dbm;
+
+ rb_gdbm_modify(obj);
+ StringValue(keystr);
+ StringValue(valstr);
+
+ key.dptr = RSTRING(keystr)->ptr;
+ key.dsize = RSTRING(keystr)->len;
+
+ val.dptr = RSTRING(valstr)->ptr;
+ val.dsize = RSTRING(valstr)->len;
+
+ GetDBM2(obj, dbmp, dbm);
+ dbmp->di_size = -1;
+ if (gdbm_store(dbm, key, val, GDBM_REPLACE)) {
+ if (errno == EPERM) rb_sys_fail(0);
+ rb_raise(rb_eGDBMError, "%s", gdbm_strerror(gdbm_errno));
+ }
+
+ return valstr;
+}
+
+/*
+ * call-seq:
* gdbm.length -> fixnum
* gdbm.size -> fixnum
*
* Returns the number of key-value pairs in this database.
*/
static VALUE
-fgdbm_length(VALUE obj)
+fgdbm_length(obj)
+ VALUE obj;
{
datum key, nextkey;
struct dbmdata *dbmp;
@@ -760,7 +852,7 @@ fgdbm_length(VALUE obj)
for (key = gdbm_firstkey(dbm); key.dptr; key = nextkey) {
nextkey = gdbm_nextkey(dbm, key);
free(key.dptr);
- i++;
+ i++;
}
dbmp->di_size = i;
@@ -774,7 +866,8 @@ fgdbm_length(VALUE obj)
* Returns true if the database is empty.
*/
static VALUE
-fgdbm_empty_p(VALUE obj)
+fgdbm_empty_p(obj)
+ VALUE obj;
{
datum key;
struct dbmdata *dbmp;
@@ -782,13 +875,13 @@ fgdbm_empty_p(VALUE obj)
GetDBM(obj, dbmp);
if (dbmp->di_size < 0) {
- dbm = dbmp->di_dbm;
+ dbm = dbmp->di_dbm;
- key = gdbm_firstkey(dbm);
+ key = gdbm_firstkey(dbm);
if (key.dptr) {
free(key.dptr);
return Qfalse;
- }
+ }
return Qtrue;
}
@@ -804,20 +897,19 @@ fgdbm_empty_p(VALUE obj)
* _value_ as a parameter.
*/
static VALUE
-fgdbm_each_value(VALUE obj)
+fgdbm_each_value(obj)
+ VALUE obj;
{
struct dbmdata *dbmp;
GDBM_FILE dbm;
VALUE keystr;
- RETURN_ENUMERATOR(obj, 0, 0);
-
GetDBM2(obj, dbmp, dbm);
for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
keystr = rb_gdbm_nextkey(dbm, keystr)) {
rb_yield(rb_gdbm_fetch2(dbm, keystr));
- GetDBM2(obj, dbmp, dbm);
+ GetDBM2(obj, dbmp, dbm);
}
return obj;
}
@@ -830,20 +922,19 @@ fgdbm_each_value(VALUE obj)
* _key_ as a parameter.
*/
static VALUE
-fgdbm_each_key(VALUE obj)
+fgdbm_each_key(obj)
+ VALUE obj;
{
struct dbmdata *dbmp;
GDBM_FILE dbm;
VALUE keystr;
- RETURN_ENUMERATOR(obj, 0, 0);
-
GetDBM2(obj, dbmp, dbm);
for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
keystr = rb_gdbm_nextkey(dbm, keystr)) {
rb_yield(keystr);
- GetDBM2(obj, dbmp, dbm);
+ GetDBM2(obj, dbmp, dbm);
}
return obj;
}
@@ -856,14 +947,13 @@ fgdbm_each_key(VALUE obj)
* correspoding _value_ as a parameter.
*/
static VALUE
-fgdbm_each_pair(VALUE obj)
+fgdbm_each_pair(obj)
+ VALUE obj;
{
GDBM_FILE dbm;
struct dbmdata *dbmp;
VALUE keystr;
- RETURN_ENUMERATOR(obj, 0, 0);
-
GetDBM2(obj, dbmp, dbm);
for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
keystr = rb_gdbm_nextkey(dbm, keystr)) {
@@ -882,7 +972,8 @@ fgdbm_each_pair(VALUE obj)
* Returns an array of all keys of this database.
*/
static VALUE
-fgdbm_keys(VALUE obj)
+fgdbm_keys(obj)
+ VALUE obj;
{
struct dbmdata *dbmp;
GDBM_FILE dbm;
@@ -906,7 +997,8 @@ fgdbm_keys(VALUE obj)
* Returns an array of all values of this database.
*/
static VALUE
-fgdbm_values(VALUE obj)
+fgdbm_values(obj)
+ VALUE obj;
{
datum key, nextkey;
struct dbmdata *dbmp;
@@ -934,15 +1026,16 @@ fgdbm_values(VALUE obj)
* Returns false otherwise.
*/
static VALUE
-fgdbm_has_key(VALUE obj, VALUE keystr)
+fgdbm_has_key(obj, keystr)
+ VALUE obj, keystr;
{
datum key;
struct dbmdata *dbmp;
GDBM_FILE dbm;
StringValue(keystr);
- key.dptr = RSTRING_PTR(keystr);
- key.dsize = RSTRING_LEN(keystr);
+ key.dptr = RSTRING(keystr)->ptr;
+ key.dsize = RSTRING(keystr)->len;
GetDBM2(obj, dbmp, dbm);
if (gdbm_exists(dbm, key))
@@ -959,7 +1052,8 @@ fgdbm_has_key(VALUE obj, VALUE keystr)
* Returns false otherwise.
*/
static VALUE
-fgdbm_has_value(VALUE obj, VALUE valstr)
+fgdbm_has_value(obj, valstr)
+ VALUE obj, valstr;
{
struct dbmdata *dbmp;
GDBM_FILE dbm;
@@ -970,13 +1064,13 @@ fgdbm_has_value(VALUE obj, VALUE valstr)
for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
keystr = rb_gdbm_nextkey(dbm, keystr)) {
- valstr2 = rb_gdbm_fetch2(dbm, keystr);
+ valstr2 = rb_gdbm_fetch2(dbm, keystr);
if (!NIL_P(valstr2) &&
- RSTRING_LEN(valstr) == RSTRING_LEN(valstr2) &&
- memcmp(RSTRING_PTR(valstr), RSTRING_PTR(valstr2),
- RSTRING_LEN(valstr)) == 0) {
- return Qtrue;
+ RSTRING(valstr)->len == RSTRING(valstr2)->len &&
+ memcmp(RSTRING(valstr)->ptr, RSTRING(valstr2)->ptr,
+ RSTRING(valstr)->len) == 0) {
+ return Qtrue;
}
}
return Qfalse;
@@ -989,7 +1083,8 @@ fgdbm_has_value(VALUE obj, VALUE valstr)
* Returns an array of all key-value pairs contained in the database.
*/
static VALUE
-fgdbm_to_a(VALUE obj)
+fgdbm_to_a(obj)
+ VALUE obj;
{
struct dbmdata *dbmp;
GDBM_FILE dbm;
@@ -1015,7 +1110,8 @@ fgdbm_to_a(VALUE obj)
* deletions in the database.
*/
static VALUE
-fgdbm_reorganize(VALUE obj)
+fgdbm_reorganize(obj)
+ VALUE obj;
{
struct dbmdata *dbmp;
GDBM_FILE dbm;
@@ -1037,7 +1133,8 @@ fgdbm_reorganize(VALUE obj)
* to the disk have been finished.
*/
static VALUE
-fgdbm_sync(VALUE obj)
+fgdbm_sync(obj)
+ VALUE obj;
{
struct dbmdata *dbmp;
GDBM_FILE dbm;
@@ -1055,7 +1152,8 @@ fgdbm_sync(VALUE obj)
* Sets the size of the internal bucket cache to _size_.
*/
static VALUE
-fgdbm_set_cachesize(VALUE obj, VALUE val)
+fgdbm_set_cachesize(obj, val)
+ VALUE obj, val;
{
struct dbmdata *dbmp;
GDBM_FILE dbm;
@@ -1080,7 +1178,8 @@ fgdbm_set_cachesize(VALUE obj, VALUE val)
* default. See also: #syncmode=
*/
static VALUE
-fgdbm_set_fastmode(VALUE obj, VALUE val)
+fgdbm_set_fastmode(obj, val)
+ VALUE obj, val;
{
struct dbmdata *dbmp;
GDBM_FILE dbm;
@@ -1111,7 +1210,8 @@ fgdbm_set_fastmode(VALUE obj, VALUE val)
* by default. See also: #fastmode=
*/
static VALUE
-fgdbm_set_syncmode(VALUE obj, VALUE val)
+fgdbm_set_syncmode(obj, val)
+ VALUE obj, val;
{
#if !defined(GDBM_SYNCMODE)
fgdbm_set_fastmode(obj, RTEST(val) ? Qfalse : Qtrue);
@@ -1140,7 +1240,8 @@ fgdbm_set_syncmode(VALUE obj, VALUE val)
* Returns a hash of all key-value pairs contained in the database.
*/
static VALUE
-fgdbm_to_hash(VALUE obj)
+fgdbm_to_hash(obj)
+ VALUE obj;
{
struct dbmdata *dbmp;
GDBM_FILE dbm;
@@ -1165,13 +1266,14 @@ fgdbm_to_hash(VALUE obj)
* which _block_ evaluates to true are removed. See also: #delete_if
*/
static VALUE
-fgdbm_reject(VALUE obj)
+fgdbm_reject(obj)
+ VALUE obj;
{
return rb_hash_delete_if(fgdbm_to_hash(obj));
}
void
-Init_gdbm(void)
+Init_gdbm()
{
rb_cGDBM = rb_define_class("GDBM", rb_cObject);
rb_eGDBMError = rb_define_class("GDBMError", rb_eStandardError);
@@ -1189,8 +1291,9 @@ Init_gdbm(void)
rb_define_method(rb_cGDBM, "[]=", fgdbm_store, 2);
rb_define_method(rb_cGDBM, "store", fgdbm_store, 2);
rb_define_method(rb_cGDBM, "index", fgdbm_index, 1);
- rb_define_method(rb_cGDBM, "key", fgdbm_key, 1);
- rb_define_method(rb_cGDBM, "select", fgdbm_select, 0);
+ rb_define_method(rb_cGDBM, "indexes", fgdbm_indexes, -1);
+ rb_define_method(rb_cGDBM, "indices", fgdbm_indexes, -1);
+ rb_define_method(rb_cGDBM, "select", fgdbm_select, -1);
rb_define_method(rb_cGDBM, "values_at", fgdbm_values_at, -1);
rb_define_method(rb_cGDBM, "length", fgdbm_length, 0);
rb_define_method(rb_cGDBM, "size", fgdbm_length, 0);
diff --git a/ext/iconv/.cvsignore b/ext/iconv/.cvsignore
index 66c8f5297a..394787fced 100644
--- a/ext/iconv/.cvsignore
+++ b/ext/iconv/.cvsignore
@@ -3,4 +3,3 @@ mkmf.log
*.def
iconv.rb
config.charset
-extconf.h
diff --git a/ext/iconv/charset_alias.rb b/ext/iconv/charset_alias.rb
index d4ed9139c8..aed4644290 100644
--- a/ext/iconv/charset_alias.rb
+++ b/ext/iconv/charset_alias.rb
@@ -6,8 +6,8 @@ require 'optparse'
# http://www.ctan.org/tex-archive/macros/texinfo/texinfo/intl/config.charset
# Fri, 30 May 2003 00:09:00 GMT'
-OS = RbConfig::CONFIG["target_os"]
-SHELL = RbConfig::CONFIG['SHELL']
+OS = Config::CONFIG["target_os"]
+SHELL = Config::CONFIG['SHELL']
class Hash::Ordered < Hash
def [](key)
diff --git a/ext/iconv/depend b/ext/iconv/depend
index ac555596ce..688ddd97b7 100644
--- a/ext/iconv/depend
+++ b/ext/iconv/depend
@@ -1,2 +1,2 @@
iconv.o: iconv.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h \
- $(hdrdir)/st.h $(hdrdir)/intern.h $(hdrdir)/encoding.h
+ $(hdrdir)/intern.h
diff --git a/ext/iconv/extconf.rb b/ext/iconv/extconf.rb
index 9632bf4db9..a9d0cfb5e6 100644
--- a/ext/iconv/extconf.rb
+++ b/ext/iconv/extconf.rb
@@ -23,8 +23,6 @@ if have_func("iconv", "iconv.h") or
end
$defs.push('-DICONV_INPTR_CONST')
end
- have_func("iconvlist", "iconv.h")
- have_func("__iconv_free_list", "iconv.h")
if conf
prefix = '$(srcdir)'
prefix = $nmake ? "{#{prefix}}" : "#{prefix}/"
diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
index 35e5c34634..d989b97df2 100644
--- a/ext/iconv/iconv.c
+++ b/ext/iconv/iconv.c
@@ -4,6 +4,7 @@
iconv.c -
$Author$
+ $Date$
created at: Wed Dec 1 20:28:09 JST 1999
All the files in this distribution are covered under the Ruby's
@@ -13,12 +14,12 @@
**********************************************************************/
-#include "ruby/ruby.h"
+#include "ruby.h"
#include <errno.h>
#include <iconv.h>
#include <assert.h>
-#include "ruby/st.h"
-#include "ruby/encoding.h"
+#include "st.h"
+#include "intern.h"
/*
* Document-class: Iconv
@@ -66,12 +67,6 @@
* 4. Shorthand for (3).
*
* Iconv.iconv(to, from, *input.to_a)
- *
- * == Attentions
- *
- * Even if some extentions of implementation dependent are useful,
- * DON'T USE those extentions in libraries and scripts to widely distribute.
- * If you want to use those feature, use String#encode.
*/
/* Invalid value for iconv_t is -1 but 0 for VALUE, I hope VALUE is
@@ -85,18 +80,9 @@ struct iconv_env_t
int argc;
VALUE *argv;
VALUE ret;
- int toidx;
VALUE (*append)_((VALUE, VALUE));
};
-struct rb_iconv_opt_t
-{
- VALUE transliterate;
- VALUE discard_ilseq;
-};
-
-static ID id_transliterate, id_discard_ilseq;
-
static VALUE rb_eIconvInvalidEncoding;
static VALUE rb_eIconvFailure;
static VALUE rb_eIconvIllegalSeq;
@@ -110,22 +96,20 @@ static VALUE iconv_failure_initialize _((VALUE error, VALUE mesg, VALUE success,
static VALUE iconv_failure_success _((VALUE self));
static VALUE iconv_failure_failed _((VALUE self));
-static iconv_t iconv_create _((VALUE to, VALUE from, struct rb_iconv_opt_t *opt, int *idx));
+static iconv_t iconv_create _((VALUE to, VALUE from));
static void iconv_dfree _((void *cd));
static VALUE iconv_free _((VALUE cd));
static VALUE iconv_try _((iconv_t cd, const char **inptr, size_t *inlen, char **outptr, size_t *outlen));
static VALUE rb_str_derive _((VALUE str, const char* ptr, int len));
-static VALUE iconv_convert _((iconv_t cd, VALUE str, long start, long length, int toidx,
- struct iconv_env_t* env));
+static VALUE iconv_convert _((iconv_t cd, VALUE str, long start, long length, struct iconv_env_t* env));
static VALUE iconv_s_allocate _((VALUE klass));
-static VALUE iconv_initialize _((int argc, VALUE *argv, VALUE self));
-static VALUE iconv_s_open _((int argc, VALUE *argv, VALUE self));
+static VALUE iconv_initialize _((VALUE self, VALUE to, VALUE from));
+static VALUE iconv_s_open _((VALUE self, VALUE to, VALUE from));
static VALUE iconv_s_convert _((struct iconv_env_t* env));
static VALUE iconv_s_iconv _((int argc, VALUE *argv, VALUE self));
static VALUE iconv_init_state _((VALUE cd));
static VALUE iconv_finish _((VALUE self));
static VALUE iconv_iconv _((int argc, VALUE *argv, VALUE self));
-static VALUE iconv_conv _((int argc, VALUE *argv, VALUE self));
static VALUE charset_map;
@@ -135,37 +119,26 @@ static VALUE charset_map;
*
* Returns the map from canonical name to system dependent name.
*/
-static VALUE
-charset_map_get(void)
+static VALUE charset_map_get _((void))
{
return charset_map;
}
-static VALUE
-strip_glibc_option(VALUE *code)
-{
- VALUE val = StringValue(*code);
- const char *ptr = RSTRING_PTR(val), *pend = RSTRING_END(val);
- const char *slash = memchr(ptr, '/', pend - ptr);
-
- if (slash && slash < pend - 1 && slash[1] == '/') {
- VALUE opt = rb_str_subseq(val, slash - ptr, pend - slash);
- val = rb_str_subseq(val, 0, slash - ptr);
- *code = val;
- return opt;
- }
- return 0;
-}
-
static char *
-map_charset(VALUE *code)
+map_charset
+#ifdef HAVE_PROTOTYPES
+ (VALUE *code)
+#else /* HAVE_PROTOTYPES */
+ (code)
+ VALUE *code;
+#endif /* HAVE_PROTOTYPES */
{
- VALUE val = StringValue(*code);
+ VALUE val = *code;
- if (RHASH_SIZE(charset_map)) {
+ if (RHASH(charset_map)->tbl && RHASH(charset_map)->tbl->num_entries) {
VALUE key = rb_funcall2(val, rb_intern("downcase"), 0, 0);
StringValuePtr(key);
- if (st_lookup(RHASH_TBL(charset_map), key, &val)) {
+ if (st_lookup(RHASH(charset_map)->tbl, key, &val)) {
*code = val;
}
}
@@ -173,107 +146,55 @@ map_charset(VALUE *code)
}
static iconv_t
-iconv_create(VALUE to, VALUE from, struct rb_iconv_opt_t *opt, int *idx)
+iconv_create
+#ifdef HAVE_PROTOTYPES
+ (VALUE to, VALUE from)
+#else /* HAVE_PROTOTYPES */
+ (to, from)
+ VALUE to;
+ VALUE from;
+#endif /* HAVE_PROTOTYPES */
{
- VALUE toopt = strip_glibc_option(&to);
- VALUE fromopt = strip_glibc_option(&from);
- VALUE toenc = 0, fromenc = 0;
const char* tocode = map_charset(&to);
const char* fromcode = map_charset(&from);
- iconv_t cd;
- int retry = 0;
- *idx = rb_enc_find_index(tocode);
+ iconv_t cd = iconv_open(tocode, fromcode);
- if (toopt) {
- toenc = rb_str_plus(to, toopt);
- tocode = RSTRING_PTR(toenc);
- }
- if (fromopt) {
- fromenc = rb_str_plus(from, fromopt);
- fromcode = RSTRING_PTR(fromenc);
- }
- while ((cd = iconv_open(tocode, fromcode)) == (iconv_t)-1) {
- int inval = 0;
+ if (cd == (iconv_t)-1) {
switch (errno) {
case EMFILE:
case ENFILE:
case ENOMEM:
- if (!retry++) {
- rb_gc();
- continue;
- }
- break;
- case EINVAL:
- retry = 0;
- inval = 1;
- if (toenc) {
- tocode = RSTRING_PTR(to);
- rb_str_resize(toenc, 0);
- toenc = 0;
- continue;
- }
- if (fromenc) {
- fromcode = RSTRING_PTR(from);
- rb_str_resize(fromenc, 0);
- fromenc = 0;
- continue;
- }
- break;
+ rb_gc();
+ cd = iconv_open(tocode, fromcode);
}
- {
+ if (cd == (iconv_t)-1) {
+ int inval = errno == EINVAL;
const char *s = inval ? "invalid encoding " : "iconv";
- volatile VALUE msg = rb_str_new(0, strlen(s) + RSTRING_LEN(to) +
- RSTRING_LEN(from) + 8);
+ volatile VALUE msg = rb_str_new(0, strlen(s) + RSTRING(to)->len +
+ RSTRING(from)->len + 8);
- sprintf(RSTRING_PTR(msg), "%s(\"%s\", \"%s\")",
- s, RSTRING_PTR(to), RSTRING_PTR(from));
- s = RSTRING_PTR(msg);
- rb_str_set_len(msg, strlen(s));
+ sprintf(RSTRING(msg)->ptr, "%s(\"%s\", \"%s\")",
+ s, RSTRING(to)->ptr, RSTRING(from)->ptr);
+ s = RSTRING(msg)->ptr;
+ RSTRING(msg)->len = strlen(s);
if (!inval) rb_sys_fail(s);
iconv_fail(rb_eIconvInvalidEncoding,
Qnil, rb_ary_new3(2, to, from), NULL, s);
}
}
- if (toopt || fromopt) {
- if (toopt && fromopt && RTEST(rb_str_equal(toopt, fromopt))) {
- fromopt = 0;
- }
- if (toopt && fromopt) {
- rb_warning("encoding option isn't portable: %s, %s",
- RSTRING_PTR(toopt) + 2, RSTRING_PTR(fromopt) + 2);
- }
- else {
- rb_warning("encoding option isn't portable: %s",
- (toopt ? RSTRING_PTR(toopt) : RSTRING_PTR(fromopt)) + 2);
- }
- }
-
- if (opt) {
-#ifdef ICONV_SET_TRANSLITERATE
- if (opt->transliterate != Qundef) {
- int flag = RTEST(opt->transliterate);
- rb_warning("encoding option isn't portable: transliterate");
- if (iconvctl(cd, ICONV_SET_TRANSLITERATE, (void *)&flag))
- rb_sys_fail("ICONV_SET_TRANSLITERATE");
- }
-#endif
-#ifdef ICONV_SET_DISCARD_ILSEQ
- if (opt->discard_ilseq != Qundef) {
- int flag = RTEST(opt->discard_ilseq);
- rb_warning("encoding option isn't portable: discard_ilseq");
- if (iconvctl(cd, ICONV_SET_DISCARD_ILSEQ, (void *)&flag))
- rb_sys_fail("ICONV_SET_DISCARD_ILSEQ");
- }
-#endif
- }
-
return cd;
}
static void
-iconv_dfree(void *cd)
+iconv_dfree
+#ifdef HAVE_PROTOTYPES
+ (void *cd)
+#else /* HAVE_PROTOTYPES */
+ (cd)
+ void *cd;
+#endif /* HAVE_PROTOTYPES */
{
iconv_close(VALUE2ICONV(cd));
}
@@ -281,7 +202,13 @@ iconv_dfree(void *cd)
#define ICONV_FREE iconv_dfree
static VALUE
-iconv_free(VALUE cd)
+iconv_free
+#ifdef HAVE_PROTOTYPES
+ (VALUE cd)
+#else /* HAVE_PROTOTYPES */
+ (cd)
+ VALUE cd;
+#endif /* HAVE_PROTOTYPES */
{
if (cd && iconv_close(VALUE2ICONV(cd)) == -1)
rb_sys_fail("iconv_close");
@@ -289,7 +216,13 @@ iconv_free(VALUE cd)
}
static VALUE
-check_iconv(VALUE obj)
+check_iconv
+#ifdef HAVE_PROTOTYPES
+ (VALUE obj)
+#else /* HAVE_PROTOTYPES */
+ (obj)
+ VALUE obj;
+#endif /* HAVE_PROTOTYPES */
{
Check_Type(obj, T_DATA);
if (RDATA(obj)->dfree != ICONV_FREE) {
@@ -299,7 +232,17 @@ check_iconv(VALUE obj)
}
static VALUE
-iconv_try(iconv_t cd, const char **inptr, size_t *inlen, char **outptr, size_t *outlen)
+iconv_try
+#ifdef HAVE_PROTOTYPES
+ (iconv_t cd, const char **inptr, size_t *inlen, char **outptr, size_t *outlen)
+#else /* HAVE_PROTOTYPES */
+ (cd, inptr, inlen, outptr, outlen)
+ iconv_t cd;
+ const char **inptr;
+ size_t *inlen;
+ char **outptr;
+ size_t *outlen;
+#endif /* HAVE_PROTOTYPES */
{
#ifdef ICONV_INPTR_CONST
#define ICONV_INPTR_CAST
@@ -339,8 +282,13 @@ iconv_try(iconv_t cd, const char **inptr, size_t *inlen, char **outptr, size_t *
#define FAILED_MAXLEN 16
-static VALUE
-iconv_failure_initialize(VALUE error, VALUE mesg, VALUE success, VALUE failed)
+static VALUE iconv_failure_initialize
+#ifdef HAVE_PROTOTYPES
+ (VALUE error, VALUE mesg, VALUE success, VALUE failed)
+#else /* HAVE_PROTOTYPES */
+ (error, mesg, success, failed)
+ VALUE error, mesg, success, failed;
+#endif /* HAVE_PROTOTYPES */
{
rb_call_super(1, &mesg);
rb_ivar_set(error, rb_success, success);
@@ -349,14 +297,22 @@ iconv_failure_initialize(VALUE error, VALUE mesg, VALUE success, VALUE failed)
}
static VALUE
-iconv_fail(VALUE error, VALUE success, VALUE failed, struct iconv_env_t* env, const char *mesg)
+iconv_fail
+#ifdef HAVE_PROTOTYPES
+ (VALUE error, VALUE success, VALUE failed, struct iconv_env_t* env, const char *mesg)
+#else /* HAVE_PROTOTYPES */
+ (error, success, failed, env, mesg)
+ VALUE error, success, failed;
+ struct iconv_env_t *env;
+ const char *mesg;
+#endif /* HAVE_PROTOTYPES */
{
VALUE args[3];
if (mesg && *mesg) {
args[0] = rb_str_new2(mesg);
}
- else if (TYPE(failed) != T_STRING || RSTRING_LEN(failed) < FAILED_MAXLEN) {
+ else if (TYPE(failed) != T_STRING || RSTRING(failed)->len < FAILED_MAXLEN) {
args[0] = rb_inspect(failed);
}
else {
@@ -374,19 +330,29 @@ iconv_fail(VALUE error, VALUE success, VALUE failed, struct iconv_env_t* env, co
}
error = rb_class_new_instance(3, args, error);
if (!rb_block_given_p()) rb_exc_raise(error);
- rb_set_errinfo(error);
+ ruby_errinfo = error;
return rb_yield(failed);
}
static VALUE
-rb_str_derive(VALUE str, const char* ptr, int len)
+rb_str_derive
+#ifdef HAVE_PROTOTYPES
+ (VALUE str, const char* ptr, int len)
+#else /* HAVE_PROTOTYPES */
+ (str, ptr, len)
+ VALUE str;
+ const char *ptr;
+ int len;
+#endif /* HAVE_PROTOTYPES */
{
VALUE ret;
if (NIL_P(str))
return rb_str_new(ptr, len);
- if (RSTRING_PTR(str) + RSTRING_LEN(str) == ptr + len)
- ret = rb_str_subseq(str, ptr - RSTRING_PTR(str), len);
+ if (RSTRING(str)->ptr == ptr && RSTRING(str)->len == len)
+ return str;
+ if (RSTRING(str)->ptr + RSTRING(str)->len == ptr + len)
+ ret = rb_str_substr(str, ptr - RSTRING(str)->ptr, len);
else
ret = rb_str_new(ptr, len);
OBJ_INFECT(ret, str);
@@ -394,7 +360,17 @@ rb_str_derive(VALUE str, const char* ptr, int len)
}
static VALUE
-iconv_convert(iconv_t cd, VALUE str, long start, long length, int toidx, struct iconv_env_t* env)
+iconv_convert
+#ifdef HAVE_PROTOTYPES
+ (iconv_t cd, VALUE str, long start, long length, struct iconv_env_t* env)
+#else /* HAVE_PROTOTYPES */
+ (cd, str, start, length, env)
+ iconv_t cd;
+ VALUE str;
+ long start;
+ long length;
+ struct iconv_env_t *env;
+#endif /* HAVE_PROTOTYPES */
{
VALUE ret = Qfalse;
VALUE error = Qfalse;
@@ -420,7 +396,7 @@ iconv_convert(iconv_t cd, VALUE str, long start, long length, int toidx, struct
unsigned int i;
rescue = iconv_fail(error, Qnil, Qnil, env, 0);
if (TYPE(rescue) == T_ARRAY) {
- str = RARRAY_LEN(rescue) > 0 ? RARRAY_PTR(rescue)[0] : Qnil;
+ str = RARRAY(rescue)->len > 0 ? RARRAY(rescue)->ptr[0] : Qnil;
}
if (FIXNUM_P(str) && (i = FIX2INT(str)) <= 0xff) {
char c = i;
@@ -438,8 +414,8 @@ iconv_convert(iconv_t cd, VALUE str, long start, long length, int toidx, struct
int slen;
StringValue(str);
- slen = RSTRING_LEN(str);
- inptr = RSTRING_PTR(str);
+ slen = RSTRING(str)->len;
+ inptr = RSTRING(str)->ptr;
inptr += start;
if (length < 0 || length > start + slen)
@@ -466,7 +442,6 @@ iconv_convert(iconv_t cd, VALUE str, long start, long length, int toidx, struct
{
if (NIL_P(str)) {
ret = rb_str_new(buffer, outlen);
- if (toidx >= 0) rb_enc_associate_index(ret, toidx);
}
else {
if (ret) {
@@ -474,7 +449,6 @@ iconv_convert(iconv_t cd, VALUE str, long start, long length, int toidx, struct
}
else {
ret = rb_str_new(instart, tmpstart - instart);
- if (toidx >= 0) rb_enc_associate_index(ret, toidx);
OBJ_INFECT(ret, str);
}
ret = rb_str_buf_cat(ret, buffer, outlen);
@@ -494,22 +468,19 @@ iconv_convert(iconv_t cd, VALUE str, long start, long length, int toidx, struct
if (RTEST(error)) {
long len = 0;
- if (!ret) {
+ if (!ret)
ret = rb_str_derive(str, instart, inptr - instart);
- if (toidx >= 0) rb_enc_associate_index(ret, toidx);
- }
- else if (inptr > instart) {
+ else if (inptr > instart)
rb_str_cat(ret, instart, inptr - instart);
- }
str = rb_str_derive(str, inptr, inlen);
rescue = iconv_fail(error, ret, str, env, errmsg);
if (TYPE(rescue) == T_ARRAY) {
- if ((len = RARRAY_LEN(rescue)) > 0)
- rb_str_concat(ret, RARRAY_PTR(rescue)[0]);
- if (len > 1 && !NIL_P(str = RARRAY_PTR(rescue)[1])) {
+ if ((len = RARRAY(rescue)->len) > 0)
+ rb_str_concat(ret, RARRAY(rescue)->ptr[0]);
+ if (len > 1 && !NIL_P(str = RARRAY(rescue)->ptr[1])) {
StringValue(str);
- inlen = length = RSTRING_LEN(str);
- instart = inptr = RSTRING_PTR(str);
+ inlen = length = RSTRING(str)->len;
+ instart = inptr = RSTRING(str)->ptr;
continue;
}
}
@@ -520,94 +491,28 @@ iconv_convert(iconv_t cd, VALUE str, long start, long length, int toidx, struct
}
} while (inlen > 0);
- if (!ret) {
+ if (!ret)
ret = rb_str_derive(str, instart, inptr - instart);
- if (toidx >= 0) rb_enc_associate_index(ret, toidx);
- }
- else if (inptr > instart) {
+ else if (inptr > instart)
rb_str_cat(ret, instart, inptr - instart);
- }
return ret;
}
static VALUE
-iconv_s_allocate(VALUE klass)
+iconv_s_allocate
+#ifdef HAVE_PROTOTYPES
+ (VALUE klass)
+#else /* HAVE_PROTOTYPES */
+ (klass)
+ VALUE klass;
+#endif /* HAVE_PROTOTYPES */
{
return Data_Wrap_Struct(klass, 0, ICONV_FREE, 0);
}
-static VALUE
-get_iconv_opt_i(VALUE i, VALUE arg)
-{
- struct rb_iconv_opt_t *opt = (struct rb_iconv_opt_t *)arg;
- VALUE name, val;
-
- (void)opt;
- i = rb_Array(i);
- name = rb_ary_entry(i, 0);
- val = rb_ary_entry(i, 1);
- do {
- if (SYMBOL_P(name)) {
- ID id = SYM2ID(name);
- if (id == id_transliterate) {
-#ifdef ICONV_SET_TRANSLITERATE
- opt->transliterate = val;
-#else
- rb_notimplement();
-#endif
- break;
- }
- if (id == id_discard_ilseq) {
-#ifdef ICONV_SET_DISCARD_ILSEQ
- opt->discard_ilseq = val;
-#else
- rb_notimplement();
-#endif
- break;
- }
- }
- else {
- const char *s = StringValueCStr(name);
- if (strcmp(s, "transliterate") == 0) {
-#ifdef ICONV_SET_TRANSLITERATE
- opt->transliterate = val;
-#else
- rb_notimplement();
-#endif
- break;
- }
- if (strcmp(s, "discard_ilseq") == 0) {
-#ifdef ICONV_SET_DISCARD_ILSEQ
- opt->discard_ilseq = val;
-#else
- rb_notimplement();
-#endif
- break;
- }
- }
- name = rb_inspect(name);
- rb_raise(rb_eArgError, "unknown option - %s", StringValueCStr(name));
- } while (0);
- return Qnil;
-}
-
-static void
-get_iconv_opt(struct rb_iconv_opt_t *opt, VALUE options)
-{
- opt->transliterate = Qundef;
- opt->discard_ilseq = Qundef;
- if (!NIL_P(options)) {
- rb_block_call(options, rb_intern("each"), 0, 0, get_iconv_opt_i, (VALUE)opt);
- }
-}
-
-#define iconv_ctl(self, func, val) (\
- iconvctl(VALUE2ICONV(check_iconv(self)), func, (void *)&(val)) ? \
- rb_sys_fail(#func) : (void)0)
-
/*
* Document-method: new
- * call-seq: Iconv.new(to, from, [options])
+ * call-seq: Iconv.new(to, from)
*
* Creates new code converter from a coding-system designated with +from+
* to another one designated with +to+.
@@ -616,7 +521,6 @@ get_iconv_opt(struct rb_iconv_opt_t *opt, VALUE options)
*
* +to+:: encoding name for destination
* +from+:: encoding name for source
- * +options+:: options for converter
*
* === Exceptions
*
@@ -625,18 +529,19 @@ get_iconv_opt(struct rb_iconv_opt_t *opt, VALUE options)
* SystemCallError:: if <tt>iconv_open(3)</tt> fails
*/
static VALUE
-iconv_initialize(int argc, VALUE *argv, VALUE self)
+iconv_initialize
+#ifdef HAVE_PROTOTYPES
+ (VALUE self, VALUE to, VALUE from)
+#else /* HAVE_PROTOTYPES */
+ (self, to, from)
+ VALUE self;
+ VALUE to;
+ VALUE from;
+#endif /* HAVE_PROTOTYPES */
{
- VALUE to, from, options;
- struct rb_iconv_opt_t opt;
- int idx;
-
- rb_scan_args(argc, argv, "21", &to, &from, &options);
- get_iconv_opt(&opt, options);
iconv_free(check_iconv(self));
DATA_PTR(self) = NULL;
- DATA_PTR(self) = (void *)ICONV2VALUE(iconv_create(to, from, &opt, &idx));
- if (idx >= 0) ENCODING_SET(self, idx);
+ DATA_PTR(self) = (void *)ICONV2VALUE(iconv_create(to, from));
return self;
}
@@ -649,19 +554,19 @@ iconv_initialize(int argc, VALUE *argv, VALUE self)
* returned from the block.
*/
static VALUE
-iconv_s_open(int argc, VALUE *argv, VALUE self)
-{
- VALUE to, from, options, cd;
- struct rb_iconv_opt_t opt;
- int idx;
-
- rb_scan_args(argc, argv, "21", &to, &from, &options);
- get_iconv_opt(&opt, options);
- cd = ICONV2VALUE(iconv_create(to, from, &opt, &idx));
+iconv_s_open
+#ifdef HAVE_PROTOTYPES
+ (VALUE self, VALUE to, VALUE from)
+#else /* HAVE_PROTOTYPES */
+ (self, to, from)
+ VALUE self;
+ VALUE to;
+ VALUE from;
+#endif /* HAVE_PROTOTYPES */
+{
+ VALUE cd = ICONV2VALUE(iconv_create(to, from));
self = Data_Wrap_Struct(self, NULL, ICONV_FREE, (void *)cd);
- if (idx >= 0) ENCODING_SET(self, idx);
-
if (rb_block_given_p()) {
return rb_ensure(rb_yield, self, (VALUE(*)())iconv_finish, self);
}
@@ -671,19 +576,24 @@ iconv_s_open(int argc, VALUE *argv, VALUE self)
}
static VALUE
-iconv_s_convert(struct iconv_env_t* env)
+iconv_s_convert
+#ifdef HAVE_PROTOTYPES
+ (struct iconv_env_t* env)
+#else /* HAVE_PROTOTYPES */
+ (env)
+ struct iconv_env_t *env;
+#endif /* HAVE_PROTOTYPES */
{
VALUE last = 0;
for (; env->argc > 0; --env->argc, ++env->argv) {
- VALUE s = iconv_convert(env->cd, last = *(env->argv),
- 0, -1, env->toidx, env);
+ VALUE s = iconv_convert(env->cd, last = *(env->argv), 0, -1, env);
env->append(env->ret, s);
}
if (!NIL_P(last)) {
- VALUE s = iconv_convert(env->cd, Qnil, 0, 0, env->toidx, env);
- if (RSTRING_LEN(s))
+ VALUE s = iconv_convert(env->cd, Qnil, 0, 0, env);
+ if (RSTRING(s)->len)
env->append(env->ret, s);
}
@@ -709,7 +619,15 @@ iconv_s_convert(struct iconv_env_t* env)
* Exceptions thrown by Iconv.new, Iconv.open and Iconv#iconv.
*/
static VALUE
-iconv_s_iconv(int argc, VALUE *argv, VALUE self)
+iconv_s_iconv
+#ifdef HAVE_PROTOTYPES
+ (int argc, VALUE *argv, VALUE self)
+#else /* HAVE_PROTOTYPES */
+ (argc, argv, self)
+ int argc;
+ VALUE *argv;
+ VALUE self;
+#endif /* HAVE_PROTOTYPES */
{
struct iconv_env_t arg;
@@ -720,7 +638,7 @@ iconv_s_iconv(int argc, VALUE *argv, VALUE self)
arg.argv = argv + 2;
arg.append = rb_ary_push;
arg.ret = rb_ary_new2(argc);
- arg.cd = iconv_create(argv[0], argv[1], NULL, &arg.toidx);
+ arg.cd = iconv_create(argv[0], argv[1]);
return rb_ensure(iconv_s_convert, (VALUE)&arg, iconv_free, ICONV2VALUE(arg.cd));
}
@@ -733,7 +651,13 @@ iconv_s_iconv(int argc, VALUE *argv, VALUE self)
* See Iconv.iconv.
*/
static VALUE
-iconv_s_conv(VALUE self, VALUE to, VALUE from, VALUE str)
+iconv_s_conv
+#ifdef HAVE_PROTOTYPES
+ (VALUE self, VALUE to, VALUE from, VALUE str)
+#else /* HAVE_PROTOTYPES */
+ (self, to, from, str)
+ VALUE self, to, from, str;
+#endif /* HAVE_PROTOTYPES */
{
struct iconv_env_t arg;
@@ -741,95 +665,11 @@ iconv_s_conv(VALUE self, VALUE to, VALUE from, VALUE str)
arg.argv = &str;
arg.append = rb_str_append;
arg.ret = rb_str_new(0, 0);
- arg.cd = iconv_create(to, from, NULL, &arg.toidx);
+ arg.cd = iconv_create(to, from);
return rb_ensure(iconv_s_convert, (VALUE)&arg, iconv_free, ICONV2VALUE(arg.cd));
}
/*
- * Document-method: list
- * call-seq: Iconv.list {|*aliases| ... }
- *
- * Iterates each alias sets.
- */
-
-#ifdef HAVE_ICONVLIST
-struct iconv_name_list
-{
- unsigned int namescount;
- const char *const *names;
- VALUE array;
-};
-
-static VALUE
-list_iconv_i(VALUE ptr)
-{
- struct iconv_name_list *p = (struct iconv_name_list *)ptr;
- unsigned int i, namescount = p->namescount;
- const char *const *names = p->names;
- VALUE ary = rb_ary_new2(namescount);
-
- for (i = 0; i < namescount; i++) {
- rb_ary_push(ary, rb_str_new2(names[i]));
- }
- if (p->array) {
- return rb_ary_push(p->array, ary);
- }
- return rb_yield(ary);
-}
-
-static int
-list_iconv(unsigned int namescount, const char *const *names, void *data)
-{
- int *state = data;
- struct iconv_name_list list;
-
- list.namescount = namescount;
- list.names = names;
- list.array = ((VALUE *)data)[1];
- rb_protect(list_iconv_i, (VALUE)&list, state);
- return *state;
-}
-#endif
-
-#if defined(HAVE_ICONVLIST) || defined(HAVE___ICONV_FREE_LIST)
-static VALUE
-iconv_s_list(void)
-{
-#ifdef HAVE_ICONVLIST
- int state;
- VALUE args[2];
-
- args[1] = rb_block_given_p() ? 0 : rb_ary_new();
- iconvlist(list_iconv, args);
- state = *(int *)args;
- if (state) rb_jump_tag(state);
- if (args[1]) return args[1];
-#elif defined(HAVE___ICONV_FREE_LIST)
- char **list;
- size_t sz, i;
- VALUE ary;
-
- if (__iconv_get_list(&list, &sz)) return Qnil;
-
- ary = rb_ary_new2(sz);
- for (i = 0; i < sz; i++) {
- rb_ary_push(ary, rb_str_new2(list[i]));
- }
- __iconv_free_list(list, sz);
-
- if (!rb_block_given_p())
- return ary;
- for (i = 0; i < RARRAY_LEN(ary); i++) {
- rb_yield(RARRAY_PTR(ary)[i]);
- }
-#endif
- return Qnil;
-}
-#else
-#define iconv_s_list rb_f_notimplement
-#endif
-
-/*
* Document-method: close
*
* Finishes conversion.
@@ -841,20 +681,32 @@ iconv_s_list(void)
* its initial shift state.
*/
static VALUE
-iconv_init_state(VALUE self)
+iconv_init_state
+#ifdef HAVE_PROTOTYPES
+ (VALUE cd)
+#else /* HAVE_PROTOTYPES */
+ (cd)
+ VALUE cd;
+#endif /* HAVE_PROTOTYPES */
{
- iconv_t cd = VALUE2ICONV((VALUE)DATA_PTR(self));
- DATA_PTR(self) = NULL;
- return iconv_convert(cd, Qnil, 0, 0, ENCODING_GET(self), NULL);
+ return iconv_convert(VALUE2ICONV(cd), Qnil, 0, 0, NULL);
}
static VALUE
-iconv_finish(VALUE self)
+iconv_finish
+#ifdef HAVE_PROTOTYPES
+ (VALUE self)
+#else /* HAVE_PROTOTYPES */
+ (self)
+ VALUE self;
+#endif /* HAVE_PROTOTYPES */
{
VALUE cd = check_iconv(self);
if (!cd) return Qnil;
- return rb_ensure(iconv_init_state, self, iconv_free, cd);
+ DATA_PTR(self) = NULL;
+
+ return rb_ensure(iconv_init_state, cd, iconv_free, cd);
}
/*
@@ -885,186 +737,34 @@ iconv_finish(VALUE self)
* See the Iconv documentation.
*/
static VALUE
-iconv_iconv(int argc, VALUE *argv, VALUE self)
+iconv_iconv
+#ifdef HAVE_PROTOTYPES
+ (int argc, VALUE *argv, VALUE self)
+#else /* HAVE_PROTOTYPES */
+ (argc, argv, self)
+ int argc;
+ VALUE *argv;
+ VALUE self;
+#endif /* HAVE_PROTOTYPES */
{
VALUE str, n1, n2;
VALUE cd = check_iconv(self);
long start = 0, length = 0, slen = 0;
rb_scan_args(argc, argv, "12", &str, &n1, &n2);
- if (!NIL_P(str)) {
- VALUE n = rb_str_length(StringValue(str));
- slen = NUM2LONG(n);
- }
+ if (!NIL_P(str)) slen = RSTRING_LEN(StringValue(str));
if (argc != 2 || !RTEST(rb_range_beg_len(n1, &start, &length, slen, 0))) {
if (NIL_P(n1) || ((start = NUM2LONG(n1)) < 0 ? (start += slen) >= 0 : start < slen)) {
- length = NIL_P(n2) ? -1 : NUM2LONG(n2);
- }
- }
- if (start > 0 || length > 0) {
- rb_encoding *enc = rb_enc_get(str);
- const char *s = RSTRING_PTR(str), *e = s + RSTRING_LEN(str);
- const char *ps = s;
- if (start > 0) {
- start = (ps = rb_enc_nth(s, e, start, enc)) - s;
- }
- if (length > 0) {
- length = rb_enc_nth(ps, e, length, enc) - ps;
+ if (NIL_P(n2)) {
+ length = -1;
+ }
+ else if ((length = NUM2LONG(n2)) >= slen - start) {
+ length = slen - start;
+ }
}
}
- return iconv_convert(VALUE2ICONV(cd), str, start, length, ENCODING_GET(self), NULL);
-}
-
-/*
- * Document-method: conv
- * call-seq: conv(str...)
- *
- * Equivalent to
- *
- * iconv(nil, str..., nil).join
- */
-static VALUE
-iconv_conv(int argc, VALUE *argv, VALUE self)
-{
- iconv_t cd = VALUE2ICONV(check_iconv(self));
- VALUE str, s;
- int toidx = ENCODING_GET(self);
-
- str = iconv_convert(cd, Qnil, 0, 0, toidx, NULL);
- if (argc > 0) {
- do {
- s = iconv_convert(cd, *argv++, 0, -1, toidx, NULL);
- if (RSTRING_LEN(s))
- rb_str_buf_append(str, s);
- } while (--argc);
- s = iconv_convert(cd, Qnil, 0, 0, toidx, NULL);
- if (RSTRING_LEN(s))
- rb_str_buf_append(str, s);
- }
-
- return str;
-}
-
-#ifdef ICONV_TRIVIALP
-/*
- * Document-method: trivial?
- * call-seq: trivial?
- *
- * Returns trivial flag.
- */
-static VALUE
-iconv_trivialp(VALUE self)
-{
- int trivial = 0;
- iconv_ctl(self, ICONV_TRIVIALP, trivial);
- if (trivial) return Qtrue;
- return Qfalse;
-}
-#else
-#define iconv_trivialp rb_f_notimplement
-#endif
-
-#ifdef ICONV_GET_TRANSLITERATE
-/*
- * Document-method: transliterate?
- * call-seq: transliterate?
- *
- * Returns transliterate flag.
- */
-static VALUE
-iconv_get_transliterate(VALUE self)
-{
- int trans = 0;
- iconv_ctl(self, ICONV_GET_TRANSLITERATE, trans);
- if (trans) return Qtrue;
- return Qfalse;
-}
-#else
-#define iconv_get_transliterate rb_f_notimplement
-#endif
-
-#ifdef ICONV_SET_TRANSLITERATE
-/*
- * Document-method: transliterate=
- * call-seq: cd.transliterate = flag
- *
- * Sets transliterate flag.
- */
-static VALUE
-iconv_set_transliterate(VALUE self, VALUE transliterate)
-{
- int trans = RTEST(transliterate);
- iconv_ctl(self, ICONV_SET_TRANSLITERATE, trans);
- return self;
-}
-#else
-#define iconv_set_transliterate rb_f_notimplement
-#endif
-
-#ifdef ICONV_GET_DISCARD_ILSEQ
-/*
- * Document-method: discard_ilseq?
- * call-seq: discard_ilseq?
- *
- * Returns discard_ilseq flag.
- */
-static VALUE
-iconv_get_discard_ilseq(VALUE self)
-{
- int dis = 0;
- iconv_ctl(self, ICONV_GET_DISCARD_ILSEQ, dis);
- if (dis) return Qtrue;
- return Qfalse;
-}
-#else
-#define iconv_get_discard_ilseq rb_f_notimplement
-#endif
-
-#ifdef ICONV_SET_DISCARD_ILSEQ
-/*
- * Document-method: discard_ilseq=
- * call-seq: cd.discard_ilseq = flag
- *
- * Sets discard_ilseq flag.
- */
-static VALUE
-iconv_set_discard_ilseq(VALUE self, VALUE discard_ilseq)
-{
- int dis = RTEST(discard_ilseq);
- iconv_ctl(self, ICONV_SET_DISCARD_ILSEQ, dis);
- return self;
-}
-#else
-#define iconv_set_discard_ilseq rb_f_notimplement
-#endif
-
-/*
- * Document-method: ctlmethods
- * call-seq: Iconv.ctlmethods => array
- *
- * Returns available iconvctl() method list.
- */
-static VALUE
-iconv_s_ctlmethods(VALUE klass)
-{
- VALUE ary = rb_ary_new();
-#ifdef ICONV_TRIVIALP
- rb_ary_push(ary, ID2SYM(rb_intern("trivial?")));
-#endif
-#ifdef ICONV_GET_TRANSLITERATE
- rb_ary_push(ary, ID2SYM(rb_intern("transliterate?")));
-#endif
-#ifdef ICONV_SET_TRANSLITERATE
- rb_ary_push(ary, ID2SYM(rb_intern("transliterate=")));
-#endif
-#ifdef ICONV_GET_DISCARD_ILSEQ
- rb_ary_push(ary, ID2SYM(rb_intern("discard_ilseq?")));
-#endif
-#ifdef ICONV_SET_DISCARD_ILSEQ
- rb_ary_push(ary, ID2SYM(rb_intern("discard_ilseq=")));
-#endif
- return ary;
+ return iconv_convert(VALUE2ICONV(cd), str, start, length, NULL);
}
/*
@@ -1083,7 +783,13 @@ iconv_s_ctlmethods(VALUE klass)
* failure and the last element is string on the way.
*/
static VALUE
-iconv_failure_success(VALUE self)
+iconv_failure_success
+#ifdef HAVE_PROTOTYPES
+(VALUE self)
+#else /* HAVE_PROTOTYPES */
+ (self)
+ VALUE self;
+#endif /* HAVE_PROTOTYPES */
{
return rb_attr_get(self, rb_success);
}
@@ -1096,7 +802,13 @@ iconv_failure_success(VALUE self)
* character caused the exception.
*/
static VALUE
-iconv_failure_failed(VALUE self)
+iconv_failure_failed
+#ifdef HAVE_PROTOTYPES
+(VALUE self)
+#else /* HAVE_PROTOTYPES */
+ (self)
+ VALUE self;
+#endif /* HAVE_PROTOTYPES */
{
return rb_attr_get(self, rb_failed);
}
@@ -1108,7 +820,13 @@ iconv_failure_failed(VALUE self)
* Returns inspected string like as: #<_class_: _success_, _failed_>
*/
static VALUE
-iconv_failure_inspect(VALUE self)
+iconv_failure_inspect
+#ifdef HAVE_PROTOTYPES
+ (VALUE self)
+#else /* HAVE_PROTOTYPES */
+ (self)
+ VALUE self;
+#endif /* HAVE_PROTOTYPES */
{
const char *cname = rb_class2name(CLASS_OF(self));
VALUE success = rb_attr_get(self, rb_success);
@@ -1156,25 +874,17 @@ iconv_failure_inspect(VALUE self)
*/
void
-Init_iconv(void)
+Init_iconv _((void))
{
VALUE rb_cIconv = rb_define_class("Iconv", rb_cData);
rb_define_alloc_func(rb_cIconv, iconv_s_allocate);
- rb_define_singleton_method(rb_cIconv, "open", iconv_s_open, -1);
+ rb_define_singleton_method(rb_cIconv, "open", iconv_s_open, 2);
rb_define_singleton_method(rb_cIconv, "iconv", iconv_s_iconv, -1);
rb_define_singleton_method(rb_cIconv, "conv", iconv_s_conv, 3);
- rb_define_singleton_method(rb_cIconv, "list", iconv_s_list, 0);
- rb_define_singleton_method(rb_cIconv, "ctlmethods", iconv_s_ctlmethods, 0);
- rb_define_method(rb_cIconv, "initialize", iconv_initialize, -1);
+ rb_define_method(rb_cIconv, "initialize", iconv_initialize, 2);
rb_define_method(rb_cIconv, "close", iconv_finish, 0);
rb_define_method(rb_cIconv, "iconv", iconv_iconv, -1);
- rb_define_method(rb_cIconv, "conv", iconv_conv, -1);
- rb_define_method(rb_cIconv, "trivial?", iconv_trivialp, 0);
- rb_define_method(rb_cIconv, "transliterate?", iconv_get_transliterate, 0);
- rb_define_method(rb_cIconv, "transliterate=", iconv_set_transliterate, 1);
- rb_define_method(rb_cIconv, "discard_ilseq?", iconv_get_discard_ilseq, 0);
- rb_define_method(rb_cIconv, "discard_ilseq=", iconv_set_discard_ilseq, 1);
rb_eIconvFailure = rb_define_module_under(rb_cIconv, "Failure");
rb_define_method(rb_eIconvFailure, "initialize", iconv_failure_initialize, 3);
@@ -1195,8 +905,6 @@ Init_iconv(void)
rb_success = rb_intern("success");
rb_failed = rb_intern("failed");
- id_transliterate = rb_intern("transliterate");
- id_discard_ilseq = rb_intern("discard_ilseq");
rb_gc_register_address(&charset_map);
charset_map = rb_hash_new();
diff --git a/ext/iconv/mkwrapper.rb b/ext/iconv/mkwrapper.rb
deleted file mode 100644
index 34718507d6..0000000000
--- a/ext/iconv/mkwrapper.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-#! /usr/bin/ruby
-require 'rbconfig'
-require 'optparse'
-
-# http://www.ctan.org/tex-archive/macros/texinfo/texinfo/intl/config.charset
-# Fri, 30 May 2003 00:09:00 GMT'
-
-HEADER = <<SRC
-require 'iconv.so'
-
-class Iconv
- case RUBY_PLATFORM
-SRC
-
-def charset_alias(config_charset, mapfile = nil)
- found = nil
- src = [HEADER]
- open(config_charset) do |input|
- input.find {|line| /^case "\$os" in/ =~ line} or return
- input.each do |line|
- case line
- when /^\s*([-\w\*]+(?:\s*\|\s*[-\w\*]+)*)(?=\))/
- (s = " when ") << $&.split('|').collect {|targ|
- targ.strip!
- tail = targ.chomp!("*") ? '' : '\z'
- head = targ.slice!(/\A\*/) ? '' : '\A'
- targ.gsub!(/\*/, '.*')
- "/#{head}#{targ}#{tail}/"
- }.join(", ")
- src << s
- found = {}
- when /^\s*echo "(?:\$\w+\.)?([-\w*]+)\s+([-\w]+)"/
- sys, can = $1, $2
- can.downcase!
- unless found[can] or (/\Aen_(?!US\z)/ =~ sys && /\ACP437\z/i =~ can)
- found[can] = true
- src << " charset_map['#{can}'] = '#{sys}'.freeze"
- end
- when /^\s*;;/
- found = nil
- end
- end
- end
- src << " end" << "end"
- if mapfile
- open(mapfile, "wb") {|f| f.puts *src}
- else
- puts *src
- end
-end
-
-(1..2) === ARGV.size or abort "usage: #{$0} config_charset [mapfile]"
-charset_alias(*ARGV)
diff --git a/ext/io/nonblock/extconf.rb b/ext/io/nonblock/extconf.rb
deleted file mode 100644
index aecdc16cea..0000000000
--- a/ext/io/nonblock/extconf.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-require 'mkmf'
-target = "io/nonblock"
-
-hdr = %w"fcntl.h"
-if have_macro("O_NONBLOCK", hdr) and
- (have_macro("F_GETFL", hdr) or have_macro("F_SETFL", hdr))
- create_makefile(target)
-end
diff --git a/ext/io/nonblock/nonblock.c b/ext/io/nonblock/nonblock.c
deleted file mode 100644
index d7e1ac8e01..0000000000
--- a/ext/io/nonblock/nonblock.c
+++ /dev/null
@@ -1,108 +0,0 @@
-/**********************************************************************
-
- io/wait.c -
-
- $Author$
- created at: Tue Jul 14 21:53:18 2009
-
- All the files in this distribution are covered under the Ruby's
- license (see the file COPYING).
-
-**********************************************************************/
-
-#include "ruby.h"
-#include "ruby/io.h"
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#include <fcntl.h>
-
-#ifdef F_GETFL
-static int
-io_nonblock_mode(int fd)
-{
- int f = fcntl(fd, F_GETFL);
- if (f == -1) rb_sys_fail(0);
- return f;
-}
-#else
-#define io_nonblock_mode(fd) ((void)(fd), 0)
-#endif
-
-#ifdef F_GETFL
-static VALUE
-rb_io_nonblock_p(VALUE io)
-{
- rb_io_t *fptr;
- GetOpenFile(io, fptr);
- if (io_nonblock_mode(fptr->fd) & O_NONBLOCK)
- return Qtrue;
- return Qfalse;
-}
-#else
-#define rb_io_nonblock_p rb_f_notimplement
-#endif
-
-#ifdef F_SETFL
-static void
-io_nonblock_set(int fd, int f, int nb)
-{
- if (nb)
- f |= O_NONBLOCK;
- else
- f &= ~O_NONBLOCK;
- if (fcntl(fd, F_SETFL, f) == -1)
- rb_sys_fail(0);
-}
-
-static VALUE
-rb_io_nonblock_set(VALUE io, VALUE nb)
-{
- rb_io_t *fptr;
- GetOpenFile(io, fptr);
- io_nonblock_set(fptr->fd, io_nonblock_mode(fptr->fd), RTEST(nb));
- return io;
-}
-
-static VALUE
-io_nonblock_restore(VALUE arg)
-{
- int *restore = (int *)arg;
- if (fcntl(restore[0], F_SETFL, restore[1]) == -1)
- rb_sys_fail(0);
- return Qnil;
-}
-
-static VALUE
-rb_io_nonblock_block(int argc, VALUE *argv, VALUE io)
-{
- int nb = 1;
- rb_io_t *fptr;
- int f, restore[2];
-
- GetOpenFile(io, fptr);
- if (argc > 0) {
- VALUE v;
- rb_scan_args(argc, argv, "01", &v);
- nb = RTEST(v);
- }
- f = io_nonblock_mode(fptr->fd);
- restore[0] = fptr->fd;
- restore[1] = f;
- io_nonblock_set(fptr->fd, f, nb);
- return rb_ensure(rb_yield, io, io_nonblock_restore, (VALUE)restore);
-}
-#else
-#define rb_io_nonblock_set rb_f_notimplement
-#define rb_io_nonblock_block rb_f_notimplement
-#endif
-
-void
-Init_nonblock(void)
-{
- VALUE io = rb_cIO;
-
- rb_define_method(io, "nonblock?", rb_io_nonblock_p, 0);
- rb_define_method(io, "nonblock=", rb_io_nonblock_set, 1);
- rb_define_method(io, "nonblock", rb_io_nonblock_block, -1);
-}
diff --git a/ext/io/wait/.cvsignore b/ext/io/wait/.cvsignore
index 8767482975..fc802ff1c2 100644
--- a/ext/io/wait/.cvsignore
+++ b/ext/io/wait/.cvsignore
@@ -1,3 +1,2 @@
Makefile
mkmf.log
-extconf.h
diff --git a/ext/io/wait/extconf.rb b/ext/io/wait/extconf.rb
index eed3543124..e8181d25f5 100644
--- a/ext/io/wait/extconf.rb
+++ b/ext/io/wait/extconf.rb
@@ -2,9 +2,8 @@ require 'mkmf'
target = "io/wait"
unless macro_defined?("DOSISH", "#include <ruby.h>")
- have_header(ioctl_h = "sys/ioctl.h") or ioctl_h = nil
- fionread = %w[sys/ioctl.h sys/filio.h sys/socket.h].find do |h|
- have_macro("FIONREAD", [h, ioctl_h].compact)
+ fionread = %w[sys/ioctl.h sys/filio.h].find do |h|
+ have_macro("FIONREAD", h)
end
if fionread
$defs << "-DFIONREAD_HEADER=\"<#{fionread}>\""
diff --git a/ext/io/wait/lib/nonblock.rb b/ext/io/wait/lib/nonblock.rb
new file mode 100644
index 0000000000..2103fdf25b
--- /dev/null
+++ b/ext/io/wait/lib/nonblock.rb
@@ -0,0 +1,23 @@
+require "fcntl"
+class IO
+ def nonblock?
+ (fcntl(Fcntl::F_GETFL) & File::NONBLOCK) != 0
+ end
+
+ def nonblock=(nb)
+ f = fcntl(Fcntl::F_GETFL)
+ if nb
+ f |= File::NONBLOCK
+ else
+ f &= ~File::NONBLOCK
+ end
+ fcntl(Fcntl::F_SETFL, f)
+ end
+
+ def nonblock(nb = true)
+ nb, self.nonblock = nonblock?, nb
+ yield
+ ensure
+ self.nonblock = nb
+ end
+end if defined?(Fcntl::F_GETFL)
diff --git a/ext/io/wait/wait.c b/ext/io/wait/wait.c
index b73c9af1ce..02cb54a014 100644
--- a/ext/io/wait/wait.c
+++ b/ext/io/wait/wait.c
@@ -3,6 +3,7 @@
io/wait.c -
$Author$
+ $Date$
created at: Tue Aug 28 09:08:06 JST 2001
All the files in this distribution are covered under the Ruby's
@@ -11,12 +12,9 @@
**********************************************************************/
#include "ruby.h"
-#include "ruby/io.h"
+#include "rubyio.h"
#include <sys/types.h>
-#if defined(HAVE_SYS_IOCTL_H)
-#include <sys/ioctl.h>
-#endif
#if defined(FIONREAD_HEADER)
#include FIONREAD_HEADER
#endif
@@ -33,7 +31,7 @@
#ifdef HAVE_RB_W32_IS_SOCKET
#define FIONREAD_POSSIBLE_P(fd) rb_w32_is_socket(fd)
#else
-#define FIONREAD_POSSIBLE_P(fd) ((void)(fd),Qtrue)
+#define FIONREAD_POSSIBLE_P(fd) ((fd),Qtrue)
#endif
static VALUE io_ready_p _((VALUE io));
@@ -43,126 +41,86 @@ void Init_wait _((void));
EXTERN struct timeval rb_time_interval _((VALUE time));
/*
- * call-seq:
- * io.nread -> int
- *
- * Returns number of bytes that can be read without blocking.
- * Returns zero if no information available.
+=begin
+= IO wait methods.
+=end
*/
-static VALUE
-io_nread(VALUE io)
-{
- rb_io_t *fptr;
- int len;
- ioctl_arg n;
-
- GetOpenFile(io, fptr);
- rb_io_check_readable(fptr);
- len = rb_io_read_pending(fptr);
- if (len > 0) return len;
- if (!FIONREAD_POSSIBLE_P(fptr->fd)) return INT2FIX(0);
- if (ioctl(fptr->fd, FIONREAD, &n)) return INT2FIX(0);
- if (n > 0) return ioctl_arg2num(n);
- return INT2FIX(0);
-}
-
/*
- * call-seq:
- * io.ready? -> true, false or nil
- *
- * Returns true if input available without blocking, or false.
- * Returns nil if no information available.
- */
-
+=begin
+--- IO#ready?
+ returns non-nil if input available without blocking, or nil.
+=end
+*/
static VALUE
-io_ready_p(VALUE io)
+io_ready_p(io)
+ VALUE io;
{
rb_io_t *fptr;
+ FILE *fp;
ioctl_arg n;
GetOpenFile(io, fptr);
rb_io_check_readable(fptr);
- if (rb_io_read_pending(fptr)) return Qtrue;
- if (!FIONREAD_POSSIBLE_P(fptr->fd)) return Qnil;
- if (ioctl(fptr->fd, FIONREAD, &n)) return Qnil;
- if (n > 0) return Qtrue;
- return Qfalse;
-}
-
-struct wait_readable_arg {
- rb_fdset_t fds;
- struct timeval *timeout;
-};
-
-#ifdef HAVE_RB_FD_INIT
-static VALUE
-wait_readable(VALUE p)
-{
- struct wait_readable_arg *arg = (struct wait_readable_arg *)p;
- rb_fdset_t *fds = &arg->fds;
-
- return (VALUE)rb_thread_select(rb_fd_max(fds), rb_fd_ptr(fds), NULL, NULL, arg->timeout);
+ if (!FIONREAD_POSSIBLE_P(fileno(fptr->f))) return Qfalse;
+ fp = fptr->f;
+ if (feof(fp)) return Qfalse;
+ if (rb_read_pending(fp)) return Qtrue;
+ if (ioctl(fileno(fp), FIONREAD, &n)) rb_sys_fail(0);
+ if (n > 0) return ioctl_arg2num(n);
+ return Qnil;
}
-#endif
/*
- * call-seq:
- * io.wait -> IO, true, false or nil
- * io.wait(timeout) -> IO, true, false or nil
- *
- * Waits until input is available or times out and returns self or nil when
- * EOF is reached.
- */
-
+=begin
+--- IO#wait([timeout])
+ waits until input available or timed out and returns self, or nil
+ when EOF reached.
+=end
+*/
static VALUE
-io_wait(int argc, VALUE *argv, VALUE io)
+io_wait(argc, argv, io)
+ int argc;
+ VALUE *argv;
+ VALUE io;
{
rb_io_t *fptr;
- struct wait_readable_arg arg;
- int fd, i;
+ fd_set rd;
+ FILE *fp;
+ int fd;
ioctl_arg n;
VALUE timeout;
- struct timeval timerec;
+ struct timeval *tp, timerec;
GetOpenFile(io, fptr);
rb_io_check_readable(fptr);
rb_scan_args(argc, argv, "01", &timeout);
if (NIL_P(timeout)) {
- arg.timeout = 0;
+ tp = 0;
}
else {
timerec = rb_time_interval(timeout);
- arg.timeout = &timerec;
+ tp = &timerec;
}
- if (rb_io_read_pending(fptr)) return Qtrue;
- if (!FIONREAD_POSSIBLE_P(fptr->fd)) return Qfalse;
- fd = fptr->fd;
- rb_fd_init(&arg.fds);
- rb_fd_set(fd, &arg.fds);
-#ifdef HAVE_RB_FD_INIT
- i = (int)rb_ensure(wait_readable, (VALUE)&arg,
- (VALUE (*)_((VALUE)))rb_fd_term, (VALUE)&arg.fds);
-#else
- i = rb_thread_select(fd + 1, rb_fd_ptr(&arg.fds), NULL, NULL, arg.timeout);
-#endif
- if (i < 0)
+ fp = fptr->f;
+ if (feof(fp)) return Qfalse;
+ if (rb_read_pending(fp)) return Qtrue;
+ fd = fileno(fp);
+ FD_ZERO(&rd);
+ FD_SET(fd, &rd);
+ if (rb_thread_select(fd + 1, &rd, NULL, NULL, tp) < 0)
rb_sys_fail(0);
rb_io_check_closed(fptr);
- if (ioctl(fptr->fd, FIONREAD, &n)) rb_sys_fail(0);
+ if (!FIONREAD_POSSIBLE_P(fileno(fptr->f))) return Qfalse;
+ if (ioctl(fileno(fp), FIONREAD, &n)) rb_sys_fail(0);
if (n > 0) return io;
return Qnil;
}
-/*
- * IO wait methods
- */
-
void
Init_wait()
{
- rb_define_method(rb_cIO, "nread", io_nread, 0);
rb_define_method(rb_cIO, "ready?", io_ready_p, 0);
rb_define_method(rb_cIO, "wait", io_wait, -1);
}
diff --git a/ext/json/ext/generator/extconf.rb b/ext/json/ext/generator/extconf.rb
deleted file mode 100644
index 55741516f4..0000000000
--- a/ext/json/ext/generator/extconf.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'mkmf'
-require 'rbconfig'
-
-if CONFIG['CC'] =~ /gcc/
- $CFLAGS += ' -Wall'
- #$CFLAGS += ' -O0 -ggdb'
-end
-
-create_makefile 'json/ext/generator'
diff --git a/ext/json/ext/generator/generator.c b/ext/json/ext/generator/generator.c
deleted file mode 100644
index 94e59f77fc..0000000000
--- a/ext/json/ext/generator/generator.c
+++ /dev/null
@@ -1,919 +0,0 @@
-#include <string.h>
-#include "ruby.h"
-#if HAVE_RUBY_ST_H
-#include "ruby/st.h"
-#endif
-#if HAVE_ST_H
-#include "st.h"
-#endif
-#include "unicode.h"
-#include <math.h>
-
-#ifndef RHASH_TBL
-#define RHASH_TBL(hsh) (RHASH(hsh)->tbl)
-#endif
-
-#ifndef RHASH_SIZE
-#define RHASH_SIZE(hsh) (RHASH(hsh)->tbl->num_entries)
-#endif
-
-#ifndef RFLOAT_VALUE
-#define RFLOAT_VALUE(val) (RFLOAT(val)->value)
-#endif
-
-#ifdef HAVE_RUBY_ENCODING_H
-#include "ruby/encoding.h"
-#define FORCE_UTF8(obj) rb_enc_associate((obj), rb_utf8_encoding())
-#else
-#define FORCE_UTF8(obj)
-#endif
-
-#define check_max_nesting(state, depth) do { \
- long current_nesting = 1 + depth; \
- if (state->max_nesting != 0 && current_nesting > state->max_nesting) \
- rb_raise(eNestingError, "nesting of %ld is too deep", current_nesting); \
-} while (0);
-
-static VALUE mJSON, mExt, mGenerator, cState, mGeneratorMethods, mObject,
- mHash, mArray, mInteger, mFloat, mString, mString_Extend,
- mTrueClass, mFalseClass, mNilClass, eGeneratorError,
- eCircularDatastructure, eNestingError;
-
-static ID i_to_s, i_to_json, i_new, i_indent, i_space, i_space_before,
- i_object_nl, i_array_nl, i_check_circular, i_max_nesting,
- i_allow_nan, i_pack, i_unpack, i_create_id, i_extend;
-
-typedef struct JSON_Generator_StateStruct {
- VALUE indent;
- VALUE space;
- VALUE space_before;
- VALUE object_nl;
- VALUE array_nl;
- int check_circular;
- VALUE seen;
- VALUE memo;
- VALUE depth;
- long max_nesting;
- int flag;
- int allow_nan;
-} JSON_Generator_State;
-
-#define GET_STATE(self) \
- JSON_Generator_State *state; \
- Data_Get_Struct(self, JSON_Generator_State, state);
-
-/*
- * Document-module: JSON::Ext::Generator
- *
- * This is the JSON generator implemented as a C extension. It can be
- * configured to be used by setting
- *
- * JSON.generator = JSON::Ext::Generator
- *
- * with the method generator= in JSON.
- *
- */
-
-static int hash_to_json_state_i(VALUE key, VALUE value, VALUE Vstate)
-{
- VALUE json, buf, Vdepth;
- GET_STATE(Vstate);
- buf = state->memo;
- Vdepth = state->depth;
-
- if (key == Qundef) return ST_CONTINUE;
- if (state->flag) {
- state->flag = 0;
- rb_str_buf_cat2(buf, ",");
- if (RSTRING_LEN(state->object_nl)) rb_str_buf_append(buf, state->object_nl);
- }
- if (RSTRING_LEN(state->object_nl)) {
- rb_str_buf_append(buf, rb_str_times(state->indent, Vdepth));
- }
- json = rb_funcall(rb_funcall(key, i_to_s, 0), i_to_json, 2, Vstate, Vdepth);
- Check_Type(json, T_STRING);
- rb_str_buf_append(buf, json);
- OBJ_INFECT(buf, json);
- if (RSTRING_LEN(state->space_before)) {
- rb_str_buf_append(buf, state->space_before);
- }
- rb_str_buf_cat2(buf, ":");
- if (RSTRING_LEN(state->space)) rb_str_buf_append(buf, state->space);
- json = rb_funcall(value, i_to_json, 2, Vstate, Vdepth);
- Check_Type(json, T_STRING);
- state->flag = 1;
- rb_str_buf_append(buf, json);
- OBJ_INFECT(buf, json);
- state->depth = Vdepth;
- state->memo = buf;
- return ST_CONTINUE;
-}
-
-inline static VALUE mHash_json_transfrom(VALUE self, VALUE Vstate, VALUE Vdepth) {
- long depth, len = RHASH_SIZE(self);
- VALUE result;
- GET_STATE(Vstate);
-
- depth = 1 + FIX2LONG(Vdepth);
- result = rb_str_buf_new(len);
- state->memo = result;
- state->depth = LONG2FIX(depth);
- state->flag = 0;
- rb_str_buf_cat2(result, "{");
- if (RSTRING_LEN(state->object_nl)) rb_str_buf_append(result, state->object_nl);
- rb_hash_foreach(self, hash_to_json_state_i, Vstate);
- if (RSTRING_LEN(state->object_nl)) rb_str_buf_append(result, state->object_nl);
- if (RSTRING_LEN(state->object_nl)) {
- rb_str_buf_append(result, rb_str_times(state->indent, Vdepth));
- }
- rb_str_buf_cat2(result, "}");
- return result;
-}
-
-static int hash_to_json_i(VALUE key, VALUE value, VALUE buf)
-{
- VALUE tmp;
-
- if (key == Qundef) return ST_CONTINUE;
- if (RSTRING_LEN(buf) > 1) rb_str_buf_cat2(buf, ",");
- tmp = rb_funcall(rb_funcall(key, i_to_s, 0), i_to_json, 0);
- Check_Type(tmp, T_STRING);
- rb_str_buf_append(buf, tmp);
- OBJ_INFECT(buf, tmp);
- rb_str_buf_cat2(buf, ":");
- tmp = rb_funcall(value, i_to_json, 0);
- Check_Type(tmp, T_STRING);
- rb_str_buf_append(buf, tmp);
- OBJ_INFECT(buf, tmp);
-
- return ST_CONTINUE;
-}
-
-/*
- * call-seq: to_json(state = nil, depth = 0)
- *
- * Returns a JSON string containing a JSON object, that is unparsed from
- * this Hash instance.
- * _state_ is a JSON::State object, that can also be used to configure the
- * produced JSON string output further.
- * _depth_ is used to find out nesting depth, to indent accordingly.
- */
-static VALUE mHash_to_json(int argc, VALUE *argv, VALUE self)
-{
- VALUE Vstate, Vdepth, result;
- long depth;
-
- rb_scan_args(argc, argv, "02", &Vstate, &Vdepth);
- depth = NIL_P(Vdepth) ? 0 : FIX2LONG(Vdepth);
- if (NIL_P(Vstate)) {
- long len = RHASH_SIZE(self);
- result = rb_str_buf_new(len);
- rb_str_buf_cat2(result, "{");
- rb_hash_foreach(self, hash_to_json_i, result);
- rb_str_buf_cat2(result, "}");
- } else {
- GET_STATE(Vstate);
- check_max_nesting(state, depth);
- if (state->check_circular) {
- VALUE self_id = rb_obj_id(self);
- if (RTEST(rb_hash_aref(state->seen, self_id))) {
- rb_raise(eCircularDatastructure,
- "circular data structures not supported!");
- }
- rb_hash_aset(state->seen, self_id, Qtrue);
- result = mHash_json_transfrom(self, Vstate, LONG2FIX(depth));
- rb_hash_delete(state->seen, self_id);
- } else {
- result = mHash_json_transfrom(self, Vstate, LONG2FIX(depth));
- }
- }
- OBJ_INFECT(result, self);
- FORCE_UTF8(result);
- return result;
-}
-
-inline static VALUE mArray_json_transfrom(VALUE self, VALUE Vstate, VALUE Vdepth) {
- long i, len = RARRAY_LEN(self);
- VALUE shift, result;
- long depth = NIL_P(Vdepth) ? 0 : FIX2LONG(Vdepth);
- VALUE delim = rb_str_new2(",");
- GET_STATE(Vstate);
-
- check_max_nesting(state, depth);
- if (state->check_circular) {
- VALUE self_id = rb_obj_id(self);
- rb_hash_aset(state->seen, self_id, Qtrue);
- result = rb_str_buf_new(len);
- if (RSTRING_LEN(state->array_nl)) rb_str_append(delim, state->array_nl);
- shift = rb_str_times(state->indent, LONG2FIX(depth + 1));
-
- rb_str_buf_cat2(result, "[");
- OBJ_INFECT(result, self);
- rb_str_buf_append(result, state->array_nl);
- for (i = 0; i < len; i++) {
- VALUE element = RARRAY_PTR(self)[i];
- if (RTEST(rb_hash_aref(state->seen, rb_obj_id(element)))) {
- rb_raise(eCircularDatastructure,
- "circular data structures not supported!");
- }
- OBJ_INFECT(result, element);
- if (i > 0) rb_str_buf_append(result, delim);
- rb_str_buf_append(result, shift);
- element = rb_funcall(element, i_to_json, 2, Vstate, LONG2FIX(depth + 1));
- Check_Type(element, T_STRING);
- rb_str_buf_append(result, element);
- }
- if (RSTRING_LEN(state->array_nl)) {
- rb_str_buf_append(result, state->array_nl);
- rb_str_buf_append(result, rb_str_times(state->indent, LONG2FIX(depth)));
- }
- rb_str_buf_cat2(result, "]");
- rb_hash_delete(state->seen, self_id);
- } else {
- result = rb_str_buf_new(len);
- OBJ_INFECT(result, self);
- if (RSTRING_LEN(state->array_nl)) rb_str_append(delim, state->array_nl);
- shift = rb_str_times(state->indent, LONG2FIX(depth + 1));
-
- rb_str_buf_cat2(result, "[");
- rb_str_buf_append(result, state->array_nl);
- for (i = 0; i < len; i++) {
- VALUE element = RARRAY_PTR(self)[i];
- OBJ_INFECT(result, element);
- if (i > 0) rb_str_buf_append(result, delim);
- rb_str_buf_append(result, shift);
- element = rb_funcall(element, i_to_json, 2, Vstate, LONG2FIX(depth + 1));
- Check_Type(element, T_STRING);
- rb_str_buf_append(result, element);
- }
- rb_str_buf_append(result, state->array_nl);
- if (RSTRING_LEN(state->array_nl)) {
- rb_str_buf_append(result, rb_str_times(state->indent, LONG2FIX(depth)));
- }
- rb_str_buf_cat2(result, "]");
- }
- return result;
-}
-
-/*
- * call-seq: to_json(state = nil, depth = 0)
- *
- * Returns a JSON string containing a JSON array, that is unparsed from
- * this Array instance.
- * _state_ is a JSON::State object, that can also be used to configure the
- * produced JSON string output further.
- * _depth_ is used to find out nesting depth, to indent accordingly.
- */
-static VALUE mArray_to_json(int argc, VALUE *argv, VALUE self) {
- VALUE Vstate, Vdepth, result;
-
- rb_scan_args(argc, argv, "02", &Vstate, &Vdepth);
- if (NIL_P(Vstate)) {
- long i, len = RARRAY_LEN(self);
- result = rb_str_buf_new(2 + 2 * len);
- rb_str_buf_cat2(result, "[");
- OBJ_INFECT(result, self);
- for (i = 0; i < len; i++) {
- VALUE element = RARRAY_PTR(self)[i];
- OBJ_INFECT(result, element);
- if (i > 0) rb_str_buf_cat2(result, ",");
- element = rb_funcall(element, i_to_json, 0);
- Check_Type(element, T_STRING);
- rb_str_buf_append(result, element);
- }
- rb_str_buf_cat2(result, "]");
- } else {
- result = mArray_json_transfrom(self, Vstate, Vdepth);
- }
- OBJ_INFECT(result, self);
- FORCE_UTF8(result);
- return result;
-}
-
-/*
- * call-seq: to_json(*)
- *
- * Returns a JSON string representation for this Integer number.
- */
-static VALUE mInteger_to_json(int argc, VALUE *argv, VALUE self)
-{
- VALUE result = rb_funcall(self, i_to_s, 0);
- FORCE_UTF8(result);
- return result;
-}
-
-/*
- * call-seq: to_json(*)
- *
- * Returns a JSON string representation for this Float number.
- */
-static VALUE mFloat_to_json(int argc, VALUE *argv, VALUE self)
-{
- JSON_Generator_State *state = NULL;
- VALUE Vstate, rest, tmp, result;
- double value = RFLOAT_VALUE(self);
- rb_scan_args(argc, argv, "01*", &Vstate, &rest);
- if (!NIL_P(Vstate)) Data_Get_Struct(Vstate, JSON_Generator_State, state);
- if (isinf(value)) {
- if (!state || state->allow_nan) {
- result = rb_funcall(self, i_to_s, 0);
- } else {
- tmp = rb_funcall(self, i_to_s, 0);
- rb_raise(eGeneratorError, "%u: %s not allowed in JSON", __LINE__, StringValueCStr(tmp));
- }
- } else if (isnan(value)) {
- if (!state || state->allow_nan) {
- result = rb_funcall(self, i_to_s, 0);
- } else {
- tmp = rb_funcall(self, i_to_s, 0);
- rb_raise(eGeneratorError, "%u: %s not allowed in JSON", __LINE__, StringValueCStr(tmp));
- }
- } else {
- result = rb_funcall(self, i_to_s, 0);
- }
- FORCE_UTF8(result);
- return result;
-}
-
-/*
- * call-seq: String.included(modul)
- *
- * Extends _modul_ with the String::Extend module.
- */
-static VALUE mString_included_s(VALUE self, VALUE modul) {
- VALUE result = rb_funcall(modul, i_extend, 1, mString_Extend);
- FORCE_UTF8(result);
- return result;
-}
-
-/*
- * call-seq: to_json(*)
- *
- * This string should be encoded with UTF-8 A call to this method
- * returns a JSON string encoded with UTF16 big endian characters as
- * \u????.
- */
-static VALUE mString_to_json(int argc, VALUE *argv, VALUE self)
-{
- VALUE result = rb_str_buf_new(RSTRING_LEN(self));
- rb_str_buf_cat2(result, "\"");
- JSON_convert_UTF8_to_JSON(result, self, strictConversion);
- rb_str_buf_cat2(result, "\"");
- FORCE_UTF8(result);
- return result;
-}
-
-/*
- * call-seq: to_json_raw_object()
- *
- * This method creates a raw object hash, that can be nested into
- * other data structures and will be unparsed as a raw string. This
- * method should be used, if you want to convert raw strings to JSON
- * instead of UTF-8 strings, e. g. binary data.
- */
-static VALUE mString_to_json_raw_object(VALUE self) {
- VALUE ary;
- VALUE result = rb_hash_new();
- rb_hash_aset(result, rb_funcall(mJSON, i_create_id, 0), rb_class_name(rb_obj_class(self)));
- ary = rb_funcall(self, i_unpack, 1, rb_str_new2("C*"));
- rb_hash_aset(result, rb_str_new2("raw"), ary);
- FORCE_UTF8(result);
- return result;
-}
-
-/*
- * call-seq: to_json_raw(*args)
- *
- * This method creates a JSON text from the result of a call to
- * to_json_raw_object of this String.
- */
-static VALUE mString_to_json_raw(int argc, VALUE *argv, VALUE self) {
- VALUE result, obj = mString_to_json_raw_object(self);
- Check_Type(obj, T_HASH);
- result = mHash_to_json(argc, argv, obj);
- FORCE_UTF8(result);
- return result;
-}
-
-/*
- * call-seq: json_create(o)
- *
- * Raw Strings are JSON Objects (the raw bytes are stored in an array for the
- * key "raw"). The Ruby String can be created by this module method.
- */
-static VALUE mString_Extend_json_create(VALUE self, VALUE o) {
- VALUE ary;
- Check_Type(o, T_HASH);
- ary = rb_hash_aref(o, rb_str_new2("raw"));
- return rb_funcall(ary, i_pack, 1, rb_str_new2("C*"));
-}
-
-/*
- * call-seq: to_json(state = nil, depth = 0)
- *
- * Returns a JSON string for true: 'true'.
- */
-static VALUE mTrueClass_to_json(int argc, VALUE *argv, VALUE self)
-{
- VALUE result = rb_str_new2("true");
- FORCE_UTF8(result);
- return result;
-}
-
-/*
- * call-seq: to_json(state = nil, depth = 0)
- *
- * Returns a JSON string for false: 'false'.
- */
-static VALUE mFalseClass_to_json(int argc, VALUE *argv, VALUE self)
-{
- VALUE result = rb_str_new2("false");
- FORCE_UTF8(result);
- return result;
-}
-
-/*
- * call-seq: to_json(state = nil, depth = 0)
- *
- */
-static VALUE mNilClass_to_json(int argc, VALUE *argv, VALUE self)
-{
- VALUE result = rb_str_new2("null");
- FORCE_UTF8(result);
- return result;
-}
-
-/*
- * call-seq: to_json(*)
- *
- * Converts this object to a string (calling #to_s), converts
- * it to a JSON string, and returns the result. This is a fallback, if no
- * special method #to_json was defined for some object.
- */
-static VALUE mObject_to_json(int argc, VALUE *argv, VALUE self)
-{
- VALUE result, string = rb_funcall(self, i_to_s, 0);
- Check_Type(string, T_STRING);
- result = mString_to_json(argc, argv, string);
- FORCE_UTF8(result);
- return result;
-}
-
-/*
- * Document-class: JSON::Ext::Generator::State
- *
- * This class is used to create State instances, that are use to hold data
- * while generating a JSON text from a a Ruby data structure.
- */
-
-static void State_mark(JSON_Generator_State *state)
-{
- rb_gc_mark_maybe(state->indent);
- rb_gc_mark_maybe(state->space);
- rb_gc_mark_maybe(state->space_before);
- rb_gc_mark_maybe(state->object_nl);
- rb_gc_mark_maybe(state->array_nl);
- rb_gc_mark_maybe(state->seen);
- rb_gc_mark_maybe(state->memo);
- rb_gc_mark_maybe(state->depth);
-}
-
-static JSON_Generator_State *State_allocate()
-{
- JSON_Generator_State *state = ALLOC(JSON_Generator_State);
- return state;
-}
-
-static VALUE cState_s_allocate(VALUE klass)
-{
- JSON_Generator_State *state = State_allocate();
- return Data_Wrap_Struct(klass, State_mark, -1, state);
-}
-
-/*
- * call-seq: configure(opts)
- *
- * Configure this State instance with the Hash _opts_, and return
- * itself.
- */
-static VALUE cState_configure(VALUE self, VALUE opts)
-{
- VALUE tmp;
- GET_STATE(self);
- tmp = rb_convert_type(opts, T_HASH, "Hash", "to_hash");
- if (NIL_P(tmp)) tmp = rb_convert_type(opts, T_HASH, "Hash", "to_h");
- if (NIL_P(tmp)) {
- rb_raise(rb_eArgError, "opts has to be hash like or convertable into a hash");
- }
- opts = tmp;
- tmp = rb_hash_aref(opts, ID2SYM(i_indent));
- if (RTEST(tmp)) {
- Check_Type(tmp, T_STRING);
- state->indent = tmp;
- }
- tmp = rb_hash_aref(opts, ID2SYM(i_space));
- if (RTEST(tmp)) {
- Check_Type(tmp, T_STRING);
- state->space = tmp;
- }
- tmp = rb_hash_aref(opts, ID2SYM(i_space_before));
- if (RTEST(tmp)) {
- Check_Type(tmp, T_STRING);
- state->space_before = tmp;
- }
- tmp = rb_hash_aref(opts, ID2SYM(i_array_nl));
- if (RTEST(tmp)) {
- Check_Type(tmp, T_STRING);
- state->array_nl = tmp;
- }
- tmp = rb_hash_aref(opts, ID2SYM(i_object_nl));
- if (RTEST(tmp)) {
- Check_Type(tmp, T_STRING);
- state->object_nl = tmp;
- }
- tmp = ID2SYM(i_check_circular);
- if (st_lookup(RHASH_TBL(opts), tmp, 0)) {
- tmp = rb_hash_aref(opts, ID2SYM(i_check_circular));
- state->check_circular = RTEST(tmp);
- } else {
- state->check_circular = 1;
- }
- tmp = ID2SYM(i_max_nesting);
- state->max_nesting = 19;
- if (st_lookup(RHASH_TBL(opts), tmp, 0)) {
- VALUE max_nesting = rb_hash_aref(opts, tmp);
- if (RTEST(max_nesting)) {
- Check_Type(max_nesting, T_FIXNUM);
- state->max_nesting = FIX2LONG(max_nesting);
- } else {
- state->max_nesting = 0;
- }
- }
- tmp = rb_hash_aref(opts, ID2SYM(i_allow_nan));
- state->allow_nan = RTEST(tmp);
- return self;
-}
-
-/*
- * call-seq: to_h
- *
- * Returns the configuration instance variables as a hash, that can be
- * passed to the configure method.
- */
-static VALUE cState_to_h(VALUE self)
-{
- VALUE result = rb_hash_new();
- GET_STATE(self);
- rb_hash_aset(result, ID2SYM(i_indent), state->indent);
- rb_hash_aset(result, ID2SYM(i_space), state->space);
- rb_hash_aset(result, ID2SYM(i_space_before), state->space_before);
- rb_hash_aset(result, ID2SYM(i_object_nl), state->object_nl);
- rb_hash_aset(result, ID2SYM(i_array_nl), state->array_nl);
- rb_hash_aset(result, ID2SYM(i_check_circular), state->check_circular ? Qtrue : Qfalse);
- rb_hash_aset(result, ID2SYM(i_allow_nan), state->allow_nan ? Qtrue : Qfalse);
- rb_hash_aset(result, ID2SYM(i_max_nesting), LONG2FIX(state->max_nesting));
- return result;
-}
-
-
-/*
- * call-seq: new(opts = {})
- *
- * Instantiates a new State object, configured by _opts_.
- *
- * _opts_ can have the following keys:
- *
- * * *indent*: a string used to indent levels (default: ''),
- * * *space*: a string that is put after, a : or , delimiter (default: ''),
- * * *space_before*: a string that is put before a : pair delimiter (default: ''),
- * * *object_nl*: a string that is put at the end of a JSON object (default: ''),
- * * *array_nl*: a string that is put at the end of a JSON array (default: ''),
- * * *check_circular*: true if checking for circular data structures
- * should be done, false (the default) otherwise.
- * * *allow_nan*: true if NaN, Infinity, and -Infinity should be
- * generated, otherwise an exception is thrown, if these values are
- * encountered. This options defaults to false.
- */
-static VALUE cState_initialize(int argc, VALUE *argv, VALUE self)
-{
- VALUE opts;
- GET_STATE(self);
-
- rb_scan_args(argc, argv, "01", &opts);
- state->indent = rb_str_new2("");
- state->space = rb_str_new2("");
- state->space_before = rb_str_new2("");
- state->array_nl = rb_str_new2("");
- state->object_nl = rb_str_new2("");
- if (NIL_P(opts)) {
- state->check_circular = 1;
- state->allow_nan = 0;
- state->max_nesting = 19;
- } else {
- cState_configure(self, opts);
- }
- state->seen = rb_hash_new();
- state->memo = Qnil;
- state->depth = INT2FIX(0);
- return self;
-}
-
-/*
- * call-seq: from_state(opts)
- *
- * Creates a State object from _opts_, which ought to be Hash to create a
- * new State instance configured by _opts_, something else to create an
- * unconfigured instance. If _opts_ is a State object, it is just returned.
- */
-static VALUE cState_from_state_s(VALUE self, VALUE opts)
-{
- if (rb_obj_is_kind_of(opts, self)) {
- return opts;
- } else if (rb_obj_is_kind_of(opts, rb_cHash)) {
- return rb_funcall(self, i_new, 1, opts);
- } else {
- return rb_funcall(self, i_new, 0);
- }
-}
-
-/*
- * call-seq: indent()
- *
- * This string is used to indent levels in the JSON text.
- */
-static VALUE cState_indent(VALUE self)
-{
- GET_STATE(self);
- return state->indent;
-}
-
-/*
- * call-seq: indent=(indent)
- *
- * This string is used to indent levels in the JSON text.
- */
-static VALUE cState_indent_set(VALUE self, VALUE indent)
-{
- GET_STATE(self);
- Check_Type(indent, T_STRING);
- return state->indent = indent;
-}
-
-/*
- * call-seq: space()
- *
- * This string is used to insert a space between the tokens in a JSON
- * string.
- */
-static VALUE cState_space(VALUE self)
-{
- GET_STATE(self);
- return state->space;
-}
-
-/*
- * call-seq: space=(space)
- *
- * This string is used to insert a space between the tokens in a JSON
- * string.
- */
-static VALUE cState_space_set(VALUE self, VALUE space)
-{
- GET_STATE(self);
- Check_Type(space, T_STRING);
- return state->space = space;
-}
-
-/*
- * call-seq: space_before()
- *
- * This string is used to insert a space before the ':' in JSON objects.
- */
-static VALUE cState_space_before(VALUE self)
-{
- GET_STATE(self);
- return state->space_before;
-}
-
-/*
- * call-seq: space_before=(space_before)
- *
- * This string is used to insert a space before the ':' in JSON objects.
- */
-static VALUE cState_space_before_set(VALUE self, VALUE space_before)
-{
- GET_STATE(self);
- Check_Type(space_before, T_STRING);
- return state->space_before = space_before;
-}
-
-/*
- * call-seq: object_nl()
- *
- * This string is put at the end of a line that holds a JSON object (or
- * Hash).
- */
-static VALUE cState_object_nl(VALUE self)
-{
- GET_STATE(self);
- return state->object_nl;
-}
-
-/*
- * call-seq: object_nl=(object_nl)
- *
- * This string is put at the end of a line that holds a JSON object (or
- * Hash).
- */
-static VALUE cState_object_nl_set(VALUE self, VALUE object_nl)
-{
- GET_STATE(self);
- Check_Type(object_nl, T_STRING);
- return state->object_nl = object_nl;
-}
-
-/*
- * call-seq: array_nl()
- *
- * This string is put at the end of a line that holds a JSON array.
- */
-static VALUE cState_array_nl(VALUE self)
-{
- GET_STATE(self);
- return state->array_nl;
-}
-
-/*
- * call-seq: array_nl=(array_nl)
- *
- * This string is put at the end of a line that holds a JSON array.
- */
-static VALUE cState_array_nl_set(VALUE self, VALUE array_nl)
-{
- GET_STATE(self);
- Check_Type(array_nl, T_STRING);
- return state->array_nl = array_nl;
-}
-
-/*
- * call-seq: check_circular?
- *
- * Returns true, if circular data structures should be checked,
- * otherwise returns false.
- */
-static VALUE cState_check_circular_p(VALUE self)
-{
- GET_STATE(self);
- return state->check_circular ? Qtrue : Qfalse;
-}
-
-/*
- * call-seq: max_nesting
- *
- * This integer returns the maximum level of data structure nesting in
- * the generated JSON, max_nesting = 0 if no maximum is checked.
- */
-static VALUE cState_max_nesting(VALUE self)
-{
- GET_STATE(self);
- return LONG2FIX(state->max_nesting);
-}
-
-/*
- * call-seq: max_nesting=(depth)
- *
- * This sets the maximum level of data structure nesting in the generated JSON
- * to the integer depth, max_nesting = 0 if no maximum should be checked.
- */
-static VALUE cState_max_nesting_set(VALUE self, VALUE depth)
-{
- GET_STATE(self);
- Check_Type(depth, T_FIXNUM);
- state->max_nesting = FIX2LONG(depth);
- return Qnil;
-}
-
-/*
- * call-seq: allow_nan?
- *
- * Returns true, if NaN, Infinity, and -Infinity should be generated, otherwise
- * returns false.
- */
-static VALUE cState_allow_nan_p(VALUE self)
-{
- GET_STATE(self);
- return state->allow_nan ? Qtrue : Qfalse;
-}
-
-/*
- * call-seq: seen?(object)
- *
- * Returns _true_, if _object_ was already seen during this generating run.
- */
-static VALUE cState_seen_p(VALUE self, VALUE object)
-{
- GET_STATE(self);
- return rb_hash_aref(state->seen, rb_obj_id(object));
-}
-
-/*
- * call-seq: remember(object)
- *
- * Remember _object_, to find out if it was already encountered (if a cyclic
- * data structure is rendered).
- */
-static VALUE cState_remember(VALUE self, VALUE object)
-{
- GET_STATE(self);
- return rb_hash_aset(state->seen, rb_obj_id(object), Qtrue);
-}
-
-/*
- * call-seq: forget(object)
- *
- * Forget _object_ for this generating run.
- */
-static VALUE cState_forget(VALUE self, VALUE object)
-{
- GET_STATE(self);
- return rb_hash_delete(state->seen, rb_obj_id(object));
-}
-
-/*
- *
- */
-void Init_generator()
-{
- rb_require("json/common");
- mJSON = rb_define_module("JSON");
- mExt = rb_define_module_under(mJSON, "Ext");
- mGenerator = rb_define_module_under(mExt, "Generator");
- eGeneratorError = rb_path2class("JSON::GeneratorError");
- eCircularDatastructure = rb_path2class("JSON::CircularDatastructure");
- eNestingError = rb_path2class("JSON::NestingError");
- cState = rb_define_class_under(mGenerator, "State", rb_cObject);
- rb_define_alloc_func(cState, cState_s_allocate);
- rb_define_singleton_method(cState, "from_state", cState_from_state_s, 1);
- rb_define_method(cState, "initialize", cState_initialize, -1);
-
- rb_define_method(cState, "indent", cState_indent, 0);
- rb_define_method(cState, "indent=", cState_indent_set, 1);
- rb_define_method(cState, "space", cState_space, 0);
- rb_define_method(cState, "space=", cState_space_set, 1);
- rb_define_method(cState, "space_before", cState_space_before, 0);
- rb_define_method(cState, "space_before=", cState_space_before_set, 1);
- rb_define_method(cState, "object_nl", cState_object_nl, 0);
- rb_define_method(cState, "object_nl=", cState_object_nl_set, 1);
- rb_define_method(cState, "array_nl", cState_array_nl, 0);
- rb_define_method(cState, "array_nl=", cState_array_nl_set, 1);
- rb_define_method(cState, "check_circular?", cState_check_circular_p, 0);
- rb_define_method(cState, "max_nesting", cState_max_nesting, 0);
- rb_define_method(cState, "max_nesting=", cState_max_nesting_set, 1);
- rb_define_method(cState, "allow_nan?", cState_allow_nan_p, 0);
- rb_define_method(cState, "seen?", cState_seen_p, 1);
- rb_define_method(cState, "remember", cState_remember, 1);
- rb_define_method(cState, "forget", cState_forget, 1);
- rb_define_method(cState, "configure", cState_configure, 1);
- rb_define_method(cState, "to_h", cState_to_h, 0);
-
- mGeneratorMethods = rb_define_module_under(mGenerator, "GeneratorMethods");
- mObject = rb_define_module_under(mGeneratorMethods, "Object");
- rb_define_method(mObject, "to_json", mObject_to_json, -1);
- mHash = rb_define_module_under(mGeneratorMethods, "Hash");
- rb_define_method(mHash, "to_json", mHash_to_json, -1);
- mArray = rb_define_module_under(mGeneratorMethods, "Array");
- rb_define_method(mArray, "to_json", mArray_to_json, -1);
- mInteger = rb_define_module_under(mGeneratorMethods, "Integer");
- rb_define_method(mInteger, "to_json", mInteger_to_json, -1);
- mFloat = rb_define_module_under(mGeneratorMethods, "Float");
- rb_define_method(mFloat, "to_json", mFloat_to_json, -1);
- mString = rb_define_module_under(mGeneratorMethods, "String");
- rb_define_singleton_method(mString, "included", mString_included_s, 1);
- rb_define_method(mString, "to_json", mString_to_json, -1);
- rb_define_method(mString, "to_json_raw", mString_to_json_raw, -1);
- rb_define_method(mString, "to_json_raw_object", mString_to_json_raw_object, 0);
- mString_Extend = rb_define_module_under(mString, "Extend");
- rb_define_method(mString_Extend, "json_create", mString_Extend_json_create, 1);
- mTrueClass = rb_define_module_under(mGeneratorMethods, "TrueClass");
- rb_define_method(mTrueClass, "to_json", mTrueClass_to_json, -1);
- mFalseClass = rb_define_module_under(mGeneratorMethods, "FalseClass");
- rb_define_method(mFalseClass, "to_json", mFalseClass_to_json, -1);
- mNilClass = rb_define_module_under(mGeneratorMethods, "NilClass");
- rb_define_method(mNilClass, "to_json", mNilClass_to_json, -1);
-
- i_to_s = rb_intern("to_s");
- i_to_json = rb_intern("to_json");
- i_new = rb_intern("new");
- i_indent = rb_intern("indent");
- i_space = rb_intern("space");
- i_space_before = rb_intern("space_before");
- i_object_nl = rb_intern("object_nl");
- i_array_nl = rb_intern("array_nl");
- i_check_circular = rb_intern("check_circular");
- i_max_nesting = rb_intern("max_nesting");
- i_allow_nan = rb_intern("allow_nan");
- i_pack = rb_intern("pack");
- i_unpack = rb_intern("unpack");
- i_create_id = rb_intern("create_id");
- i_extend = rb_intern("extend");
-}
diff --git a/ext/json/ext/generator/unicode.c b/ext/json/ext/generator/unicode.c
deleted file mode 100644
index 93e8502b08..0000000000
--- a/ext/json/ext/generator/unicode.c
+++ /dev/null
@@ -1,180 +0,0 @@
-#include "unicode.h"
-
-#define unicode_escape(buffer, character) \
- snprintf(buf, 7, "\\u%04x", (unsigned int) (character)); \
- rb_str_buf_cat(buffer, buf, 6);
-
-/*
- * Copyright 2001-2004 Unicode, Inc.
- *
- * Disclaimer
- *
- * This source code is provided as is by Unicode, Inc. No claims are
- * made as to fitness for any particular purpose. No warranties of any
- * kind are expressed or implied. The recipient agrees to determine
- * applicability of information provided. If this file has been
- * purchased on magnetic or optical media from Unicode, Inc., the
- * sole remedy for any claim will be exchange of defective media
- * within 90 days of receipt.
- *
- * Limitations on Rights to Redistribute This Code
- *
- * Unicode, Inc. hereby grants the right to freely use the information
- * supplied in this file in the creation of products supporting the
- * Unicode Standard, and to make copies of this file in any form
- * for internal or external distribution as long as this notice
- * remains attached.
- */
-
-/*
- * Index into the table below with the first byte of a UTF-8 sequence to
- * get the number of trailing bytes that are supposed to follow it.
- * Note that *legal* UTF-8 values can't have 4 or 5-bytes. The table is
- * left as-is for anyone who may want to do such conversion, which was
- * allowed in earlier algorithms.
- */
-static const char trailingBytesForUTF8[256] = {
- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
- 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
- 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 3,3,3,3,3,3,3,3,4,4,4,4,5,5,5,5
-};
-
-/*
- * Magic values subtracted from a buffer value during UTF8 conversion.
- * This table contains as many values as there might be trailing bytes
- * in a UTF-8 sequence.
- */
-static const UTF32 offsetsFromUTF8[6] = { 0x00000000UL, 0x00003080UL, 0x000E2080UL,
- 0x03C82080UL, 0xFA082080UL, 0x82082080UL };
-
-/*
- * Once the bits are split out into bytes of UTF-8, this is a mask OR-ed
- * into the first byte, depending on how many bytes follow. There are
- * as many entries in this table as there are UTF-8 sequence types.
- * (I.e., one byte sequence, two byte... etc.). Remember that sequencs
- * for *legal* UTF-8 will be 4 or fewer bytes total.
- */
-static const UTF8 firstByteMark[7] = { 0x00, 0x00, 0xC0, 0xE0, 0xF0, 0xF8, 0xFC };
-
-/*
- * Utility routine to tell whether a sequence of bytes is legal UTF-8.
- * This must be called with the length pre-determined by the first byte.
- * If not calling this from ConvertUTF8to*, then the length can be set by:
- * length = trailingBytesForUTF8[*source]+1;
- * and the sequence is illegal right away if there aren't that many bytes
- * available.
- * If presented with a length > 4, this returns 0. The Unicode
- * definition of UTF-8 goes up to 4-byte sequences.
- */
-
-inline static unsigned char isLegalUTF8(const UTF8 *source, int length)
-{
- UTF8 a;
- const UTF8 *srcptr = source+length;
- switch (length) {
- default: return 0;
- /* Everything else falls through when "1"... */
- case 4: if ((a = (*--srcptr)) < 0x80 || a > 0xBF) return 0;
- case 3: if ((a = (*--srcptr)) < 0x80 || a > 0xBF) return 0;
- case 2: if ((a = (*--srcptr)) > 0xBF) return 0;
-
- switch (*source) {
- /* no fall-through in this inner switch */
- case 0xE0: if (a < 0xA0) return 0; break;
- case 0xED: if (a > 0x9F) return 0; break;
- case 0xF0: if (a < 0x90) return 0; break;
- case 0xF4: if (a > 0x8F) return 0; break;
- default: if (a < 0x80) return 0;
- }
-
- case 1: if (*source >= 0x80 && *source < 0xC2) return 0;
- }
- if (*source > 0xF4) return 0;
- return 1;
-}
-
-void JSON_convert_UTF8_to_JSON(VALUE buffer, VALUE string, ConversionFlags flags)
-{
- char buf[7];
- const UTF8* source = (UTF8 *) RSTRING_PTR(string);
- const UTF8* sourceEnd = source + RSTRING_LEN(string);
-
- while (source < sourceEnd) {
- UTF32 ch = 0;
- unsigned short extraBytesToRead = trailingBytesForUTF8[*source];
- if (source + extraBytesToRead >= sourceEnd) {
- rb_raise(rb_path2class("JSON::GeneratorError"),
- "partial character in source, but hit end");
- }
- if (!isLegalUTF8(source, extraBytesToRead+1)) {
- rb_raise(rb_path2class("JSON::GeneratorError"),
- "source sequence is illegal/malformed");
- }
- /*
- * The cases all fall through. See "Note A" below.
- */
- switch (extraBytesToRead) {
- case 5: ch += *source++; ch <<= 6; /* remember, illegal UTF-8 */
- case 4: ch += *source++; ch <<= 6; /* remember, illegal UTF-8 */
- case 3: ch += *source++; ch <<= 6;
- case 2: ch += *source++; ch <<= 6;
- case 1: ch += *source++; ch <<= 6;
- case 0: ch += *source++;
- }
- ch -= offsetsFromUTF8[extraBytesToRead];
-
- if (ch <= UNI_MAX_BMP) { /* Target is a character <= 0xFFFF */
- /* UTF-16 surrogate values are illegal in UTF-32 */
- if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_LOW_END) {
- if (flags == strictConversion) {
- source -= (extraBytesToRead+1); /* return to the illegal value itself */
- rb_raise(rb_path2class("JSON::GeneratorError"),
- "source sequence is illegal/malformed");
- } else {
- unicode_escape(buffer, UNI_REPLACEMENT_CHAR);
- }
- } else {
- /* normal case */
- if (ch == '"') {
- rb_str_buf_cat2(buffer, "\\\"");
- } else if (ch == '\\') {
- rb_str_buf_cat2(buffer, "\\\\");
- } else if (ch >= 0x20 && ch <= 0x7f) {
- rb_str_buf_cat(buffer, (char *) source - 1, 1);
- } else if (ch == '\n') {
- rb_str_buf_cat2(buffer, "\\n");
- } else if (ch == '\r') {
- rb_str_buf_cat2(buffer, "\\r");
- } else if (ch == '\t') {
- rb_str_buf_cat2(buffer, "\\t");
- } else if (ch == '\f') {
- rb_str_buf_cat2(buffer, "\\f");
- } else if (ch == '\b') {
- rb_str_buf_cat2(buffer, "\\b");
- } else if (ch < 0x20) {
- unicode_escape(buffer, (UTF16) ch);
- } else {
- unicode_escape(buffer, (UTF16) ch);
- }
- }
- } else if (ch > UNI_MAX_UTF16) {
- if (flags == strictConversion) {
- source -= (extraBytesToRead+1); /* return to the start */
- rb_raise(rb_path2class("JSON::GeneratorError"),
- "source sequence is illegal/malformed");
- } else {
- unicode_escape(buffer, UNI_REPLACEMENT_CHAR);
- }
- } else {
- /* target is a character in range 0xFFFF - 0x10FFFF. */
- ch -= halfBase;
- unicode_escape(buffer, (UTF16)((ch >> halfShift) + UNI_SUR_HIGH_START));
- unicode_escape(buffer, (UTF16)((ch & halfMask) + UNI_SUR_LOW_START));
- }
- }
-}
diff --git a/ext/json/ext/generator/unicode.h b/ext/json/ext/generator/unicode.h
deleted file mode 100644
index 841474bcea..0000000000
--- a/ext/json/ext/generator/unicode.h
+++ /dev/null
@@ -1,53 +0,0 @@
-#include "ruby.h"
-
-#ifndef _GENERATOR_UNICODE_H_
-#define _GENERATOR_UNICODE_H_
-
-typedef enum {
- conversionOK = 0, /* conversion successful */
- sourceExhausted, /* partial character in source, but hit end */
- targetExhausted, /* insuff. room in target for conversion */
- sourceIllegal /* source sequence is illegal/malformed */
-} ConversionResult;
-
-typedef enum {
- strictConversion = 0,
- lenientConversion
-} ConversionFlags;
-
-typedef unsigned long UTF32; /* at least 32 bits */
-typedef unsigned short UTF16; /* at least 16 bits */
-typedef unsigned char UTF8; /* typically 8 bits */
-
-#define UNI_REPLACEMENT_CHAR (UTF32)0x0000FFFD
-#define UNI_MAX_BMP (UTF32)0x0000FFFF
-#define UNI_MAX_UTF16 (UTF32)0x0010FFFF
-#define UNI_MAX_UTF32 (UTF32)0x7FFFFFFF
-#define UNI_MAX_LEGAL_UTF32 (UTF32)0x0010FFFF
-
-#define UNI_SUR_HIGH_START (UTF32)0xD800
-#define UNI_SUR_HIGH_END (UTF32)0xDBFF
-#define UNI_SUR_LOW_START (UTF32)0xDC00
-#define UNI_SUR_LOW_END (UTF32)0xDFFF
-
-static const int halfShift = 10; /* used for shifting by 10 bits */
-
-static const UTF32 halfBase = 0x0010000UL;
-static const UTF32 halfMask = 0x3FFUL;
-
-void JSON_convert_UTF8_to_JSON(VALUE buffer, VALUE string, ConversionFlags flags);
-
-#ifndef RARRAY_PTR
-#define RARRAY_PTR(ARRAY) RARRAY(ARRAY)->ptr
-#endif
-#ifndef RARRAY_LEN
-#define RARRAY_LEN(ARRAY) RARRAY(ARRAY)->len
-#endif
-#ifndef RSTRING_PTR
-#define RSTRING_PTR(string) RSTRING(string)->ptr
-#endif
-#ifndef RSTRING_LEN
-#define RSTRING_LEN(string) RSTRING(string)->len
-#endif
-
-#endif
diff --git a/ext/json/ext/parser/extconf.rb b/ext/json/ext/parser/extconf.rb
deleted file mode 100644
index b56c4e66d7..0000000000
--- a/ext/json/ext/parser/extconf.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'mkmf'
-require 'rbconfig'
-
-if CONFIG['CC'] =~ /gcc/
- $CFLAGS += ' -Wall'
- #$CFLAGS += ' -O0 -ggdb'
-end
-
-create_makefile 'json/ext/parser'
diff --git a/ext/json/ext/parser/parser.c b/ext/json/ext/parser/parser.c
deleted file mode 100644
index 6851e06235..0000000000
--- a/ext/json/ext/parser/parser.c
+++ /dev/null
@@ -1,1829 +0,0 @@
-
-#line 1 "parser.rl"
-#include "ruby.h"
-#include "unicode.h"
-#if HAVE_RE_H
-#include "re.h"
-#endif
-#if HAVE_RUBY_ST_H
-#include "ruby/st.h"
-#endif
-#if HAVE_ST_H
-#include "st.h"
-#endif
-
-#define EVIL 0x666
-
-#ifndef RHASH_TBL
-#define RHASH_TBL(hsh) (RHASH(hsh)->tbl)
-#endif
-
-#ifdef HAVE_RUBY_ENCODING_H
-#include "ruby/encoding.h"
-#define FORCE_UTF8(obj) rb_enc_associate((obj), rb_utf8_encoding())
-#else
-#define FORCE_UTF8(obj)
-#endif
-
-static VALUE mJSON, mExt, cParser, eParserError, eNestingError;
-static VALUE CNaN, CInfinity, CMinusInfinity;
-
-static ID i_json_creatable_p, i_json_create, i_create_id, i_create_additions,
- i_chr, i_max_nesting, i_allow_nan, i_object_class, i_array_class;
-
-#define MinusInfinity "-Infinity"
-
-typedef struct JSON_ParserStruct {
- VALUE Vsource;
- char *source;
- long len;
- char *memo;
- VALUE create_id;
- int max_nesting;
- int current_nesting;
- int allow_nan;
- VALUE object_class;
- VALUE array_class;
-} JSON_Parser;
-
-static char *JSON_parse_object(JSON_Parser *json, char *p, char *pe, VALUE *result);
-static char *JSON_parse_array(JSON_Parser *json, char *p, char *pe, VALUE *result);
-static char *JSON_parse_value(JSON_Parser *json, char *p, char *pe, VALUE *result);
-static char *JSON_parse_string(JSON_Parser *json, char *p, char *pe, VALUE *result);
-static char *JSON_parse_integer(JSON_Parser *json, char *p, char *pe, VALUE *result);
-static char *JSON_parse_float(JSON_Parser *json, char *p, char *pe, VALUE *result);
-
-#define GET_STRUCT \
- JSON_Parser *json; \
- Data_Get_Struct(self, JSON_Parser, json);
-
-
-#line 84 "parser.rl"
-
-
-
-#line 66 "parser.c"
-static const int JSON_object_start = 1;
-static const int JSON_object_first_final = 27;
-static const int JSON_object_error = 0;
-
-static const int JSON_object_en_main = 1;
-
-
-#line 117 "parser.rl"
-
-
-static char *JSON_parse_object(JSON_Parser *json, char *p, char *pe, VALUE *result)
-{
- int cs = EVIL;
- VALUE last_name = Qnil;
- VALUE object_class = json->object_class;
-
- if (json->max_nesting && json->current_nesting > json->max_nesting) {
- rb_raise(eNestingError, "nesting of %d is too deep", json->current_nesting);
- }
-
- *result = NIL_P(object_class) ? rb_hash_new() : rb_class_new_instance(0, 0, object_class);
-
-
-#line 90 "parser.c"
- {
- cs = JSON_object_start;
- }
-
-#line 132 "parser.rl"
-
-#line 97 "parser.c"
- {
- if ( p == pe )
- goto _test_eof;
- switch ( cs )
- {
-case 1:
- if ( (*p) == 123 )
- goto st2;
- goto st0;
-st0:
-cs = 0;
- goto _out;
-st2:
- if ( ++p == pe )
- goto _test_eof2;
-case 2:
- switch( (*p) ) {
- case 13: goto st2;
- case 32: goto st2;
- case 34: goto tr2;
- case 47: goto st23;
- case 125: goto tr4;
- }
- if ( 9 <= (*p) && (*p) <= 10 )
- goto st2;
- goto st0;
-tr2:
-#line 103 "parser.rl"
- {
- char *np = JSON_parse_string(json, p, pe, &last_name);
- if (np == NULL) { p--; {p++; cs = 3; goto _out;} } else {p = (( np))-1;}
- }
- goto st3;
-st3:
- if ( ++p == pe )
- goto _test_eof3;
-case 3:
-#line 135 "parser.c"
- switch( (*p) ) {
- case 13: goto st3;
- case 32: goto st3;
- case 47: goto st4;
- case 58: goto st8;
- }
- if ( 9 <= (*p) && (*p) <= 10 )
- goto st3;
- goto st0;
-st4:
- if ( ++p == pe )
- goto _test_eof4;
-case 4:
- switch( (*p) ) {
- case 42: goto st5;
- case 47: goto st7;
- }
- goto st0;
-st5:
- if ( ++p == pe )
- goto _test_eof5;
-case 5:
- if ( (*p) == 42 )
- goto st6;
- goto st5;
-st6:
- if ( ++p == pe )
- goto _test_eof6;
-case 6:
- switch( (*p) ) {
- case 42: goto st6;
- case 47: goto st3;
- }
- goto st5;
-st7:
- if ( ++p == pe )
- goto _test_eof7;
-case 7:
- if ( (*p) == 10 )
- goto st3;
- goto st7;
-st8:
- if ( ++p == pe )
- goto _test_eof8;
-case 8:
- switch( (*p) ) {
- case 13: goto st8;
- case 32: goto st8;
- case 34: goto tr11;
- case 45: goto tr11;
- case 47: goto st19;
- case 73: goto tr11;
- case 78: goto tr11;
- case 91: goto tr11;
- case 102: goto tr11;
- case 110: goto tr11;
- case 116: goto tr11;
- case 123: goto tr11;
- }
- if ( (*p) > 10 ) {
- if ( 48 <= (*p) && (*p) <= 57 )
- goto tr11;
- } else if ( (*p) >= 9 )
- goto st8;
- goto st0;
-tr11:
-#line 92 "parser.rl"
- {
- VALUE v = Qnil;
- char *np = JSON_parse_value(json, p, pe, &v);
- if (np == NULL) {
- p--; {p++; cs = 9; goto _out;}
- } else {
- rb_hash_aset(*result, last_name, v);
- {p = (( np))-1;}
- }
- }
- goto st9;
-st9:
- if ( ++p == pe )
- goto _test_eof9;
-case 9:
-#line 218 "parser.c"
- switch( (*p) ) {
- case 13: goto st9;
- case 32: goto st9;
- case 44: goto st10;
- case 47: goto st15;
- case 125: goto tr4;
- }
- if ( 9 <= (*p) && (*p) <= 10 )
- goto st9;
- goto st0;
-st10:
- if ( ++p == pe )
- goto _test_eof10;
-case 10:
- switch( (*p) ) {
- case 13: goto st10;
- case 32: goto st10;
- case 34: goto tr2;
- case 47: goto st11;
- }
- if ( 9 <= (*p) && (*p) <= 10 )
- goto st10;
- goto st0;
-st11:
- if ( ++p == pe )
- goto _test_eof11;
-case 11:
- switch( (*p) ) {
- case 42: goto st12;
- case 47: goto st14;
- }
- goto st0;
-st12:
- if ( ++p == pe )
- goto _test_eof12;
-case 12:
- if ( (*p) == 42 )
- goto st13;
- goto st12;
-st13:
- if ( ++p == pe )
- goto _test_eof13;
-case 13:
- switch( (*p) ) {
- case 42: goto st13;
- case 47: goto st10;
- }
- goto st12;
-st14:
- if ( ++p == pe )
- goto _test_eof14;
-case 14:
- if ( (*p) == 10 )
- goto st10;
- goto st14;
-st15:
- if ( ++p == pe )
- goto _test_eof15;
-case 15:
- switch( (*p) ) {
- case 42: goto st16;
- case 47: goto st18;
- }
- goto st0;
-st16:
- if ( ++p == pe )
- goto _test_eof16;
-case 16:
- if ( (*p) == 42 )
- goto st17;
- goto st16;
-st17:
- if ( ++p == pe )
- goto _test_eof17;
-case 17:
- switch( (*p) ) {
- case 42: goto st17;
- case 47: goto st9;
- }
- goto st16;
-st18:
- if ( ++p == pe )
- goto _test_eof18;
-case 18:
- if ( (*p) == 10 )
- goto st9;
- goto st18;
-tr4:
-#line 108 "parser.rl"
- { p--; {p++; cs = 27; goto _out;} }
- goto st27;
-st27:
- if ( ++p == pe )
- goto _test_eof27;
-case 27:
-#line 314 "parser.c"
- goto st0;
-st19:
- if ( ++p == pe )
- goto _test_eof19;
-case 19:
- switch( (*p) ) {
- case 42: goto st20;
- case 47: goto st22;
- }
- goto st0;
-st20:
- if ( ++p == pe )
- goto _test_eof20;
-case 20:
- if ( (*p) == 42 )
- goto st21;
- goto st20;
-st21:
- if ( ++p == pe )
- goto _test_eof21;
-case 21:
- switch( (*p) ) {
- case 42: goto st21;
- case 47: goto st8;
- }
- goto st20;
-st22:
- if ( ++p == pe )
- goto _test_eof22;
-case 22:
- if ( (*p) == 10 )
- goto st8;
- goto st22;
-st23:
- if ( ++p == pe )
- goto _test_eof23;
-case 23:
- switch( (*p) ) {
- case 42: goto st24;
- case 47: goto st26;
- }
- goto st0;
-st24:
- if ( ++p == pe )
- goto _test_eof24;
-case 24:
- if ( (*p) == 42 )
- goto st25;
- goto st24;
-st25:
- if ( ++p == pe )
- goto _test_eof25;
-case 25:
- switch( (*p) ) {
- case 42: goto st25;
- case 47: goto st2;
- }
- goto st24;
-st26:
- if ( ++p == pe )
- goto _test_eof26;
-case 26:
- if ( (*p) == 10 )
- goto st2;
- goto st26;
- }
- _test_eof2: cs = 2; goto _test_eof;
- _test_eof3: cs = 3; goto _test_eof;
- _test_eof4: cs = 4; goto _test_eof;
- _test_eof5: cs = 5; goto _test_eof;
- _test_eof6: cs = 6; goto _test_eof;
- _test_eof7: cs = 7; goto _test_eof;
- _test_eof8: cs = 8; goto _test_eof;
- _test_eof9: cs = 9; goto _test_eof;
- _test_eof10: cs = 10; goto _test_eof;
- _test_eof11: cs = 11; goto _test_eof;
- _test_eof12: cs = 12; goto _test_eof;
- _test_eof13: cs = 13; goto _test_eof;
- _test_eof14: cs = 14; goto _test_eof;
- _test_eof15: cs = 15; goto _test_eof;
- _test_eof16: cs = 16; goto _test_eof;
- _test_eof17: cs = 17; goto _test_eof;
- _test_eof18: cs = 18; goto _test_eof;
- _test_eof27: cs = 27; goto _test_eof;
- _test_eof19: cs = 19; goto _test_eof;
- _test_eof20: cs = 20; goto _test_eof;
- _test_eof21: cs = 21; goto _test_eof;
- _test_eof22: cs = 22; goto _test_eof;
- _test_eof23: cs = 23; goto _test_eof;
- _test_eof24: cs = 24; goto _test_eof;
- _test_eof25: cs = 25; goto _test_eof;
- _test_eof26: cs = 26; goto _test_eof;
-
- _test_eof: {}
- _out: {}
- }
-
-#line 133 "parser.rl"
-
- if (cs >= JSON_object_first_final) {
- if (RTEST(json->create_id)) {
- VALUE klassname = rb_hash_aref(*result, json->create_id);
- if (!NIL_P(klassname)) {
- VALUE klass = rb_path2class(StringValueCStr(klassname));
- if RTEST(rb_funcall(klass, i_json_creatable_p, 0)) {
- *result = rb_funcall(klass, i_json_create, 1, *result);
- }
- }
- }
- return p + 1;
- } else {
- return NULL;
- }
-}
-
-
-#line 431 "parser.c"
-static const int JSON_value_start = 1;
-static const int JSON_value_first_final = 21;
-static const int JSON_value_error = 0;
-
-static const int JSON_value_en_main = 1;
-
-
-#line 231 "parser.rl"
-
-
-static char *JSON_parse_value(JSON_Parser *json, char *p, char *pe, VALUE *result)
-{
- int cs = EVIL;
-
-
-#line 447 "parser.c"
- {
- cs = JSON_value_start;
- }
-
-#line 238 "parser.rl"
-
-#line 454 "parser.c"
- {
- if ( p == pe )
- goto _test_eof;
- switch ( cs )
- {
-case 1:
- switch( (*p) ) {
- case 34: goto tr0;
- case 45: goto tr2;
- case 73: goto st2;
- case 78: goto st9;
- case 91: goto tr5;
- case 102: goto st11;
- case 110: goto st15;
- case 116: goto st18;
- case 123: goto tr9;
- }
- if ( 48 <= (*p) && (*p) <= 57 )
- goto tr2;
- goto st0;
-st0:
-cs = 0;
- goto _out;
-tr0:
-#line 179 "parser.rl"
- {
- char *np = JSON_parse_string(json, p, pe, result);
- if (np == NULL) { p--; {p++; cs = 21; goto _out;} } else {p = (( np))-1;}
- }
- goto st21;
-tr2:
-#line 184 "parser.rl"
- {
- char *np;
- if(pe > p + 9 && !strncmp(MinusInfinity, p, 9)) {
- if (json->allow_nan) {
- *result = CMinusInfinity;
- {p = (( p + 10))-1;}
- p--; {p++; cs = 21; goto _out;}
- } else {
- rb_raise(eParserError, "%u: unexpected token at '%s'", __LINE__, p);
- }
- }
- np = JSON_parse_float(json, p, pe, result);
- if (np != NULL) {p = (( np))-1;}
- np = JSON_parse_integer(json, p, pe, result);
- if (np != NULL) {p = (( np))-1;}
- p--; {p++; cs = 21; goto _out;}
- }
- goto st21;
-tr5:
-#line 202 "parser.rl"
- {
- char *np;
- json->current_nesting++;
- np = JSON_parse_array(json, p, pe, result);
- json->current_nesting--;
- if (np == NULL) { p--; {p++; cs = 21; goto _out;} } else {p = (( np))-1;}
- }
- goto st21;
-tr9:
-#line 210 "parser.rl"
- {
- char *np;
- json->current_nesting++;
- np = JSON_parse_object(json, p, pe, result);
- json->current_nesting--;
- if (np == NULL) { p--; {p++; cs = 21; goto _out;} } else {p = (( np))-1;}
- }
- goto st21;
-tr16:
-#line 172 "parser.rl"
- {
- if (json->allow_nan) {
- *result = CInfinity;
- } else {
- rb_raise(eParserError, "%u: unexpected token at '%s'", __LINE__, p - 8);
- }
- }
- goto st21;
-tr18:
-#line 165 "parser.rl"
- {
- if (json->allow_nan) {
- *result = CNaN;
- } else {
- rb_raise(eParserError, "%u: unexpected token at '%s'", __LINE__, p - 2);
- }
- }
- goto st21;
-tr22:
-#line 159 "parser.rl"
- {
- *result = Qfalse;
- }
- goto st21;
-tr25:
-#line 156 "parser.rl"
- {
- *result = Qnil;
- }
- goto st21;
-tr28:
-#line 162 "parser.rl"
- {
- *result = Qtrue;
- }
- goto st21;
-st21:
- if ( ++p == pe )
- goto _test_eof21;
-case 21:
-#line 218 "parser.rl"
- { p--; {p++; cs = 21; goto _out;} }
-#line 569 "parser.c"
- goto st0;
-st2:
- if ( ++p == pe )
- goto _test_eof2;
-case 2:
- if ( (*p) == 110 )
- goto st3;
- goto st0;
-st3:
- if ( ++p == pe )
- goto _test_eof3;
-case 3:
- if ( (*p) == 102 )
- goto st4;
- goto st0;
-st4:
- if ( ++p == pe )
- goto _test_eof4;
-case 4:
- if ( (*p) == 105 )
- goto st5;
- goto st0;
-st5:
- if ( ++p == pe )
- goto _test_eof5;
-case 5:
- if ( (*p) == 110 )
- goto st6;
- goto st0;
-st6:
- if ( ++p == pe )
- goto _test_eof6;
-case 6:
- if ( (*p) == 105 )
- goto st7;
- goto st0;
-st7:
- if ( ++p == pe )
- goto _test_eof7;
-case 7:
- if ( (*p) == 116 )
- goto st8;
- goto st0;
-st8:
- if ( ++p == pe )
- goto _test_eof8;
-case 8:
- if ( (*p) == 121 )
- goto tr16;
- goto st0;
-st9:
- if ( ++p == pe )
- goto _test_eof9;
-case 9:
- if ( (*p) == 97 )
- goto st10;
- goto st0;
-st10:
- if ( ++p == pe )
- goto _test_eof10;
-case 10:
- if ( (*p) == 78 )
- goto tr18;
- goto st0;
-st11:
- if ( ++p == pe )
- goto _test_eof11;
-case 11:
- if ( (*p) == 97 )
- goto st12;
- goto st0;
-st12:
- if ( ++p == pe )
- goto _test_eof12;
-case 12:
- if ( (*p) == 108 )
- goto st13;
- goto st0;
-st13:
- if ( ++p == pe )
- goto _test_eof13;
-case 13:
- if ( (*p) == 115 )
- goto st14;
- goto st0;
-st14:
- if ( ++p == pe )
- goto _test_eof14;
-case 14:
- if ( (*p) == 101 )
- goto tr22;
- goto st0;
-st15:
- if ( ++p == pe )
- goto _test_eof15;
-case 15:
- if ( (*p) == 117 )
- goto st16;
- goto st0;
-st16:
- if ( ++p == pe )
- goto _test_eof16;
-case 16:
- if ( (*p) == 108 )
- goto st17;
- goto st0;
-st17:
- if ( ++p == pe )
- goto _test_eof17;
-case 17:
- if ( (*p) == 108 )
- goto tr25;
- goto st0;
-st18:
- if ( ++p == pe )
- goto _test_eof18;
-case 18:
- if ( (*p) == 114 )
- goto st19;
- goto st0;
-st19:
- if ( ++p == pe )
- goto _test_eof19;
-case 19:
- if ( (*p) == 117 )
- goto st20;
- goto st0;
-st20:
- if ( ++p == pe )
- goto _test_eof20;
-case 20:
- if ( (*p) == 101 )
- goto tr28;
- goto st0;
- }
- _test_eof21: cs = 21; goto _test_eof;
- _test_eof2: cs = 2; goto _test_eof;
- _test_eof3: cs = 3; goto _test_eof;
- _test_eof4: cs = 4; goto _test_eof;
- _test_eof5: cs = 5; goto _test_eof;
- _test_eof6: cs = 6; goto _test_eof;
- _test_eof7: cs = 7; goto _test_eof;
- _test_eof8: cs = 8; goto _test_eof;
- _test_eof9: cs = 9; goto _test_eof;
- _test_eof10: cs = 10; goto _test_eof;
- _test_eof11: cs = 11; goto _test_eof;
- _test_eof12: cs = 12; goto _test_eof;
- _test_eof13: cs = 13; goto _test_eof;
- _test_eof14: cs = 14; goto _test_eof;
- _test_eof15: cs = 15; goto _test_eof;
- _test_eof16: cs = 16; goto _test_eof;
- _test_eof17: cs = 17; goto _test_eof;
- _test_eof18: cs = 18; goto _test_eof;
- _test_eof19: cs = 19; goto _test_eof;
- _test_eof20: cs = 20; goto _test_eof;
-
- _test_eof: {}
- _out: {}
- }
-
-#line 239 "parser.rl"
-
- if (cs >= JSON_value_first_final) {
- return p;
- } else {
- return NULL;
- }
-}
-
-
-#line 740 "parser.c"
-static const int JSON_integer_start = 1;
-static const int JSON_integer_first_final = 5;
-static const int JSON_integer_error = 0;
-
-static const int JSON_integer_en_main = 1;
-
-
-#line 255 "parser.rl"
-
-
-static char *JSON_parse_integer(JSON_Parser *json, char *p, char *pe, VALUE *result)
-{
- int cs = EVIL;
-
-
-#line 756 "parser.c"
- {
- cs = JSON_integer_start;
- }
-
-#line 262 "parser.rl"
- json->memo = p;
-
-#line 764 "parser.c"
- {
- if ( p == pe )
- goto _test_eof;
- switch ( cs )
- {
-case 1:
- switch( (*p) ) {
- case 45: goto st2;
- case 48: goto st3;
- }
- if ( 49 <= (*p) && (*p) <= 57 )
- goto st4;
- goto st0;
-st0:
-cs = 0;
- goto _out;
-st2:
- if ( ++p == pe )
- goto _test_eof2;
-case 2:
- if ( (*p) == 48 )
- goto st3;
- if ( 49 <= (*p) && (*p) <= 57 )
- goto st4;
- goto st0;
-st3:
- if ( ++p == pe )
- goto _test_eof3;
-case 3:
- if ( 48 <= (*p) && (*p) <= 57 )
- goto st0;
- goto tr4;
-tr4:
-#line 252 "parser.rl"
- { p--; {p++; cs = 5; goto _out;} }
- goto st5;
-st5:
- if ( ++p == pe )
- goto _test_eof5;
-case 5:
-#line 805 "parser.c"
- goto st0;
-st4:
- if ( ++p == pe )
- goto _test_eof4;
-case 4:
- if ( 48 <= (*p) && (*p) <= 57 )
- goto st4;
- goto tr4;
- }
- _test_eof2: cs = 2; goto _test_eof;
- _test_eof3: cs = 3; goto _test_eof;
- _test_eof5: cs = 5; goto _test_eof;
- _test_eof4: cs = 4; goto _test_eof;
-
- _test_eof: {}
- _out: {}
- }
-
-#line 264 "parser.rl"
-
- if (cs >= JSON_integer_first_final) {
- long len = p - json->memo;
- *result = rb_Integer(rb_str_new(json->memo, len));
- return p + 1;
- } else {
- return NULL;
- }
-}
-
-
-#line 836 "parser.c"
-static const int JSON_float_start = 1;
-static const int JSON_float_first_final = 10;
-static const int JSON_float_error = 0;
-
-static const int JSON_float_en_main = 1;
-
-
-#line 286 "parser.rl"
-
-
-static char *JSON_parse_float(JSON_Parser *json, char *p, char *pe, VALUE *result)
-{
- int cs = EVIL;
-
-
-#line 852 "parser.c"
- {
- cs = JSON_float_start;
- }
-
-#line 293 "parser.rl"
- json->memo = p;
-
-#line 860 "parser.c"
- {
- if ( p == pe )
- goto _test_eof;
- switch ( cs )
- {
-case 1:
- switch( (*p) ) {
- case 45: goto st2;
- case 48: goto st3;
- }
- if ( 49 <= (*p) && (*p) <= 57 )
- goto st9;
- goto st0;
-st0:
-cs = 0;
- goto _out;
-st2:
- if ( ++p == pe )
- goto _test_eof2;
-case 2:
- if ( (*p) == 48 )
- goto st3;
- if ( 49 <= (*p) && (*p) <= 57 )
- goto st9;
- goto st0;
-st3:
- if ( ++p == pe )
- goto _test_eof3;
-case 3:
- switch( (*p) ) {
- case 46: goto st4;
- case 69: goto st6;
- case 101: goto st6;
- }
- goto st0;
-st4:
- if ( ++p == pe )
- goto _test_eof4;
-case 4:
- if ( 48 <= (*p) && (*p) <= 57 )
- goto st5;
- goto st0;
-st5:
- if ( ++p == pe )
- goto _test_eof5;
-case 5:
- switch( (*p) ) {
- case 69: goto st6;
- case 101: goto st6;
- }
- if ( (*p) > 46 ) {
- if ( 48 <= (*p) && (*p) <= 57 )
- goto st5;
- } else if ( (*p) >= 45 )
- goto st0;
- goto tr7;
-tr7:
-#line 280 "parser.rl"
- { p--; {p++; cs = 10; goto _out;} }
- goto st10;
-st10:
- if ( ++p == pe )
- goto _test_eof10;
-case 10:
-#line 925 "parser.c"
- goto st0;
-st6:
- if ( ++p == pe )
- goto _test_eof6;
-case 6:
- switch( (*p) ) {
- case 43: goto st7;
- case 45: goto st7;
- }
- if ( 48 <= (*p) && (*p) <= 57 )
- goto st8;
- goto st0;
-st7:
- if ( ++p == pe )
- goto _test_eof7;
-case 7:
- if ( 48 <= (*p) && (*p) <= 57 )
- goto st8;
- goto st0;
-st8:
- if ( ++p == pe )
- goto _test_eof8;
-case 8:
- switch( (*p) ) {
- case 69: goto st0;
- case 101: goto st0;
- }
- if ( (*p) > 46 ) {
- if ( 48 <= (*p) && (*p) <= 57 )
- goto st8;
- } else if ( (*p) >= 45 )
- goto st0;
- goto tr7;
-st9:
- if ( ++p == pe )
- goto _test_eof9;
-case 9:
- switch( (*p) ) {
- case 46: goto st4;
- case 69: goto st6;
- case 101: goto st6;
- }
- if ( 48 <= (*p) && (*p) <= 57 )
- goto st9;
- goto st0;
- }
- _test_eof2: cs = 2; goto _test_eof;
- _test_eof3: cs = 3; goto _test_eof;
- _test_eof4: cs = 4; goto _test_eof;
- _test_eof5: cs = 5; goto _test_eof;
- _test_eof10: cs = 10; goto _test_eof;
- _test_eof6: cs = 6; goto _test_eof;
- _test_eof7: cs = 7; goto _test_eof;
- _test_eof8: cs = 8; goto _test_eof;
- _test_eof9: cs = 9; goto _test_eof;
-
- _test_eof: {}
- _out: {}
- }
-
-#line 295 "parser.rl"
-
- if (cs >= JSON_float_first_final) {
- long len = p - json->memo;
- *result = rb_Float(rb_str_new(json->memo, len));
- return p + 1;
- } else {
- return NULL;
- }
-}
-
-
-
-#line 999 "parser.c"
-static const int JSON_array_start = 1;
-static const int JSON_array_first_final = 17;
-static const int JSON_array_error = 0;
-
-static const int JSON_array_en_main = 1;
-
-
-#line 331 "parser.rl"
-
-
-static char *JSON_parse_array(JSON_Parser *json, char *p, char *pe, VALUE *result)
-{
- int cs = EVIL;
- VALUE array_class = json->array_class;
-
- if (json->max_nesting && json->current_nesting > json->max_nesting) {
- rb_raise(eNestingError, "nesting of %d is too deep", json->current_nesting);
- }
- *result = NIL_P(array_class) ? rb_ary_new() : rb_class_new_instance(0, 0, array_class);
-
-
-#line 1021 "parser.c"
- {
- cs = JSON_array_start;
- }
-
-#line 344 "parser.rl"
-
-#line 1028 "parser.c"
- {
- if ( p == pe )
- goto _test_eof;
- switch ( cs )
- {
-case 1:
- if ( (*p) == 91 )
- goto st2;
- goto st0;
-st0:
-cs = 0;
- goto _out;
-st2:
- if ( ++p == pe )
- goto _test_eof2;
-case 2:
- switch( (*p) ) {
- case 13: goto st2;
- case 32: goto st2;
- case 34: goto tr2;
- case 45: goto tr2;
- case 47: goto st13;
- case 73: goto tr2;
- case 78: goto tr2;
- case 91: goto tr2;
- case 93: goto tr4;
- case 102: goto tr2;
- case 110: goto tr2;
- case 116: goto tr2;
- case 123: goto tr2;
- }
- if ( (*p) > 10 ) {
- if ( 48 <= (*p) && (*p) <= 57 )
- goto tr2;
- } else if ( (*p) >= 9 )
- goto st2;
- goto st0;
-tr2:
-#line 312 "parser.rl"
- {
- VALUE v = Qnil;
- char *np = JSON_parse_value(json, p, pe, &v);
- if (np == NULL) {
- p--; {p++; cs = 3; goto _out;}
- } else {
- rb_ary_push(*result, v);
- {p = (( np))-1;}
- }
- }
- goto st3;
-st3:
- if ( ++p == pe )
- goto _test_eof3;
-case 3:
-#line 1083 "parser.c"
- switch( (*p) ) {
- case 13: goto st3;
- case 32: goto st3;
- case 44: goto st4;
- case 47: goto st9;
- case 93: goto tr4;
- }
- if ( 9 <= (*p) && (*p) <= 10 )
- goto st3;
- goto st0;
-st4:
- if ( ++p == pe )
- goto _test_eof4;
-case 4:
- switch( (*p) ) {
- case 13: goto st4;
- case 32: goto st4;
- case 34: goto tr2;
- case 45: goto tr2;
- case 47: goto st5;
- case 73: goto tr2;
- case 78: goto tr2;
- case 91: goto tr2;
- case 102: goto tr2;
- case 110: goto tr2;
- case 116: goto tr2;
- case 123: goto tr2;
- }
- if ( (*p) > 10 ) {
- if ( 48 <= (*p) && (*p) <= 57 )
- goto tr2;
- } else if ( (*p) >= 9 )
- goto st4;
- goto st0;
-st5:
- if ( ++p == pe )
- goto _test_eof5;
-case 5:
- switch( (*p) ) {
- case 42: goto st6;
- case 47: goto st8;
- }
- goto st0;
-st6:
- if ( ++p == pe )
- goto _test_eof6;
-case 6:
- if ( (*p) == 42 )
- goto st7;
- goto st6;
-st7:
- if ( ++p == pe )
- goto _test_eof7;
-case 7:
- switch( (*p) ) {
- case 42: goto st7;
- case 47: goto st4;
- }
- goto st6;
-st8:
- if ( ++p == pe )
- goto _test_eof8;
-case 8:
- if ( (*p) == 10 )
- goto st4;
- goto st8;
-st9:
- if ( ++p == pe )
- goto _test_eof9;
-case 9:
- switch( (*p) ) {
- case 42: goto st10;
- case 47: goto st12;
- }
- goto st0;
-st10:
- if ( ++p == pe )
- goto _test_eof10;
-case 10:
- if ( (*p) == 42 )
- goto st11;
- goto st10;
-st11:
- if ( ++p == pe )
- goto _test_eof11;
-case 11:
- switch( (*p) ) {
- case 42: goto st11;
- case 47: goto st3;
- }
- goto st10;
-st12:
- if ( ++p == pe )
- goto _test_eof12;
-case 12:
- if ( (*p) == 10 )
- goto st3;
- goto st12;
-tr4:
-#line 323 "parser.rl"
- { p--; {p++; cs = 17; goto _out;} }
- goto st17;
-st17:
- if ( ++p == pe )
- goto _test_eof17;
-case 17:
-#line 1190 "parser.c"
- goto st0;
-st13:
- if ( ++p == pe )
- goto _test_eof13;
-case 13:
- switch( (*p) ) {
- case 42: goto st14;
- case 47: goto st16;
- }
- goto st0;
-st14:
- if ( ++p == pe )
- goto _test_eof14;
-case 14:
- if ( (*p) == 42 )
- goto st15;
- goto st14;
-st15:
- if ( ++p == pe )
- goto _test_eof15;
-case 15:
- switch( (*p) ) {
- case 42: goto st15;
- case 47: goto st2;
- }
- goto st14;
-st16:
- if ( ++p == pe )
- goto _test_eof16;
-case 16:
- if ( (*p) == 10 )
- goto st2;
- goto st16;
- }
- _test_eof2: cs = 2; goto _test_eof;
- _test_eof3: cs = 3; goto _test_eof;
- _test_eof4: cs = 4; goto _test_eof;
- _test_eof5: cs = 5; goto _test_eof;
- _test_eof6: cs = 6; goto _test_eof;
- _test_eof7: cs = 7; goto _test_eof;
- _test_eof8: cs = 8; goto _test_eof;
- _test_eof9: cs = 9; goto _test_eof;
- _test_eof10: cs = 10; goto _test_eof;
- _test_eof11: cs = 11; goto _test_eof;
- _test_eof12: cs = 12; goto _test_eof;
- _test_eof17: cs = 17; goto _test_eof;
- _test_eof13: cs = 13; goto _test_eof;
- _test_eof14: cs = 14; goto _test_eof;
- _test_eof15: cs = 15; goto _test_eof;
- _test_eof16: cs = 16; goto _test_eof;
-
- _test_eof: {}
- _out: {}
- }
-
-#line 345 "parser.rl"
-
- if(cs >= JSON_array_first_final) {
- return p + 1;
- } else {
- rb_raise(eParserError, "%u: unexpected token at '%s'", __LINE__, p);
- }
-}
-
-static VALUE json_string_unescape(char *p, char *pe)
-{
- VALUE result = rb_str_buf_new(pe - p + 1);
-
- while (p < pe) {
- if (*p == '\\') {
- p++;
- if (p >= pe) return Qnil; /* raise an exception later, \ at end */
- switch (*p) {
- case '"':
- case '\\':
- rb_str_buf_cat(result, p, 1);
- p++;
- break;
- case 'b':
- rb_str_buf_cat2(result, "\b");
- p++;
- break;
- case 'f':
- rb_str_buf_cat2(result, "\f");
- p++;
- break;
- case 'n':
- rb_str_buf_cat2(result, "\n");
- p++;
- break;
- case 'r':
- rb_str_buf_cat2(result, "\r");
- p++;
- break;
- case 't':
- rb_str_buf_cat2(result, "\t");
- p++;
- break;
- case 'u':
- if (p > pe - 4) {
- return Qnil;
- } else {
- p = JSON_convert_UTF16_to_UTF8(result, p, pe, strictConversion);
- }
- break;
- default:
- rb_str_buf_cat(result, p, 1);
- p++;
- break;
- }
- } else {
- char *q = p;
- while (*q != '\\' && q < pe) q++;
- rb_str_buf_cat(result, p, q - p);
- p = q;
- }
- }
- return result;
-}
-
-
-#line 1312 "parser.c"
-static const int JSON_string_start = 1;
-static const int JSON_string_first_final = 8;
-static const int JSON_string_error = 0;
-
-static const int JSON_string_en_main = 1;
-
-
-#line 429 "parser.rl"
-
-
-static char *JSON_parse_string(JSON_Parser *json, char *p, char *pe, VALUE *result)
-{
- int cs = EVIL;
-
- *result = rb_str_new("", 0);
-
-#line 1329 "parser.c"
- {
- cs = JSON_string_start;
- }
-
-#line 437 "parser.rl"
- json->memo = p;
-
-#line 1337 "parser.c"
- {
- if ( p == pe )
- goto _test_eof;
- switch ( cs )
- {
-case 1:
- if ( (*p) == 34 )
- goto st2;
- goto st0;
-st0:
-cs = 0;
- goto _out;
-st2:
- if ( ++p == pe )
- goto _test_eof2;
-case 2:
- switch( (*p) ) {
- case 34: goto tr2;
- case 92: goto st3;
- }
- if ( 0 <= (*p) && (*p) <= 31 )
- goto st0;
- goto st2;
-tr2:
-#line 415 "parser.rl"
- {
- *result = json_string_unescape(json->memo + 1, p);
- if (NIL_P(*result)) {
- p--;
- {p++; cs = 8; goto _out;}
- } else {
- FORCE_UTF8(*result);
- {p = (( p + 1))-1;}
- }
- }
-#line 426 "parser.rl"
- { p--; {p++; cs = 8; goto _out;} }
- goto st8;
-st8:
- if ( ++p == pe )
- goto _test_eof8;
-case 8:
-#line 1380 "parser.c"
- goto st0;
-st3:
- if ( ++p == pe )
- goto _test_eof3;
-case 3:
- if ( (*p) == 117 )
- goto st4;
- if ( 0 <= (*p) && (*p) <= 31 )
- goto st0;
- goto st2;
-st4:
- if ( ++p == pe )
- goto _test_eof4;
-case 4:
- if ( (*p) < 65 ) {
- if ( 48 <= (*p) && (*p) <= 57 )
- goto st5;
- } else if ( (*p) > 70 ) {
- if ( 97 <= (*p) && (*p) <= 102 )
- goto st5;
- } else
- goto st5;
- goto st0;
-st5:
- if ( ++p == pe )
- goto _test_eof5;
-case 5:
- if ( (*p) < 65 ) {
- if ( 48 <= (*p) && (*p) <= 57 )
- goto st6;
- } else if ( (*p) > 70 ) {
- if ( 97 <= (*p) && (*p) <= 102 )
- goto st6;
- } else
- goto st6;
- goto st0;
-st6:
- if ( ++p == pe )
- goto _test_eof6;
-case 6:
- if ( (*p) < 65 ) {
- if ( 48 <= (*p) && (*p) <= 57 )
- goto st7;
- } else if ( (*p) > 70 ) {
- if ( 97 <= (*p) && (*p) <= 102 )
- goto st7;
- } else
- goto st7;
- goto st0;
-st7:
- if ( ++p == pe )
- goto _test_eof7;
-case 7:
- if ( (*p) < 65 ) {
- if ( 48 <= (*p) && (*p) <= 57 )
- goto st2;
- } else if ( (*p) > 70 ) {
- if ( 97 <= (*p) && (*p) <= 102 )
- goto st2;
- } else
- goto st2;
- goto st0;
- }
- _test_eof2: cs = 2; goto _test_eof;
- _test_eof8: cs = 8; goto _test_eof;
- _test_eof3: cs = 3; goto _test_eof;
- _test_eof4: cs = 4; goto _test_eof;
- _test_eof5: cs = 5; goto _test_eof;
- _test_eof6: cs = 6; goto _test_eof;
- _test_eof7: cs = 7; goto _test_eof;
-
- _test_eof: {}
- _out: {}
- }
-
-#line 439 "parser.rl"
-
- if (cs >= JSON_string_first_final) {
- return p + 1;
- } else {
- return NULL;
- }
-}
-
-
-
-#line 1467 "parser.c"
-static const int JSON_start = 1;
-static const int JSON_first_final = 10;
-static const int JSON_error = 0;
-
-static const int JSON_en_main = 1;
-
-
-#line 473 "parser.rl"
-
-
-/*
- * Document-class: JSON::Ext::Parser
- *
- * This is the JSON parser implemented as a C extension. It can be configured
- * to be used by setting
- *
- * JSON.parser = JSON::Ext::Parser
- *
- * with the method parser= in JSON.
- *
- */
-
-/*
- * call-seq: new(source, opts => {})
- *
- * Creates a new JSON::Ext::Parser instance for the string _source_.
- *
- * Creates a new JSON::Ext::Parser instance for the string _source_.
- *
- * It will be configured by the _opts_ hash. _opts_ can have the following
- * keys:
- *
- * _opts_ can have the following keys:
- * * *max_nesting*: The maximum depth of nesting allowed in the parsed data
- * structures. Disable depth checking with :max_nesting => false|nil|0, it
- * defaults to 19.
- * * *allow_nan*: If set to true, allow NaN, Infinity and -Infinity in
- * defiance of RFC 4627 to be parsed by the Parser. This option defaults to
- * false.
- * * *create_additions*: If set to false, the Parser doesn't create
- * additions even if a matchin class and create_id was found. This option
- * defaults to true.
- * * *object_class*: Defaults to Hash
- * * *array_class*: Defaults to Array
- */
-static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
-{
- char *ptr;
- long len;
- VALUE source, opts;
- GET_STRUCT;
- rb_scan_args(argc, argv, "11", &source, &opts);
- source = StringValue(source);
- ptr = RSTRING_PTR(source);
- len = RSTRING_LEN(source);
- if (len < 2) {
- rb_raise(eParserError, "A JSON text must at least contain two octets!");
- }
- if (!NIL_P(opts)) {
- opts = rb_convert_type(opts, T_HASH, "Hash", "to_hash");
- if (NIL_P(opts)) {
- rb_raise(rb_eArgError, "opts needs to be like a hash");
- } else {
- VALUE tmp = ID2SYM(i_max_nesting);
- if (st_lookup(RHASH_TBL(opts), tmp, 0)) {
- VALUE max_nesting = rb_hash_aref(opts, tmp);
- if (RTEST(max_nesting)) {
- Check_Type(max_nesting, T_FIXNUM);
- json->max_nesting = FIX2INT(max_nesting);
- } else {
- json->max_nesting = 0;
- }
- } else {
- json->max_nesting = 19;
- }
- tmp = ID2SYM(i_allow_nan);
- if (st_lookup(RHASH_TBL(opts), tmp, 0)) {
- VALUE allow_nan = rb_hash_aref(opts, tmp);
- json->allow_nan = RTEST(allow_nan) ? 1 : 0;
- } else {
- json->allow_nan = 0;
- }
- tmp = ID2SYM(i_create_additions);
- if (st_lookup(RHASH_TBL(opts), tmp, 0)) {
- VALUE create_additions = rb_hash_aref(opts, tmp);
- if (RTEST(create_additions)) {
- json->create_id = rb_funcall(mJSON, i_create_id, 0);
- } else {
- json->create_id = Qnil;
- }
- } else {
- json->create_id = rb_funcall(mJSON, i_create_id, 0);
- }
- tmp = ID2SYM(i_object_class);
- if (st_lookup(RHASH_TBL(opts), tmp, 0)) {
- json->object_class = rb_hash_aref(opts, tmp);
- } else {
- json->object_class = Qnil;
- }
- tmp = ID2SYM(i_array_class);
- if (st_lookup(RHASH_TBL(opts), tmp, 0)) {
- json->array_class = rb_hash_aref(opts, tmp);
- } else {
- json->array_class = Qnil;
- }
- }
- } else {
- json->max_nesting = 19;
- json->allow_nan = 0;
- json->create_id = rb_funcall(mJSON, i_create_id, 0);
- json->object_class = Qnil;
- json->array_class = Qnil;
- }
- json->current_nesting = 0;
- /*
- Convert these?
- if (len >= 4 && ptr[0] == 0 && ptr[1] == 0 && ptr[2] == 0) {
- rb_raise(eParserError, "Only UTF8 octet streams are supported atm!");
- } else if (len >= 4 && ptr[0] == 0 && ptr[2] == 0) {
- rb_raise(eParserError, "Only UTF8 octet streams are supported atm!");
- } else if (len >= 4 && ptr[1] == 0 && ptr[2] == 0 && ptr[3] == 0) {
- rb_raise(eParserError, "Only UTF8 octet streams are supported atm!");
- } else if (len >= 4 && ptr[1] == 0 && ptr[3] == 0) {
- rb_raise(eParserError, "Only UTF8 octet streams are supported atm!");
- }
- */
- json->len = len;
- json->source = ptr;
- json->Vsource = source;
- return self;
-}
-
-/*
- * call-seq: parse()
- *
- * Parses the current JSON text _source_ and returns the complete data
- * structure as a result.
- */
-static VALUE cParser_parse(VALUE self)
-{
- char *p, *pe;
- int cs = EVIL;
- VALUE result = Qnil;
- GET_STRUCT;
-
-
-#line 1614 "parser.c"
- {
- cs = JSON_start;
- }
-
-#line 611 "parser.rl"
- p = json->source;
- pe = p + json->len;
-
-#line 1623 "parser.c"
- {
- if ( p == pe )
- goto _test_eof;
- switch ( cs )
- {
-st1:
- if ( ++p == pe )
- goto _test_eof1;
-case 1:
- switch( (*p) ) {
- case 13: goto st1;
- case 32: goto st1;
- case 47: goto st2;
- case 91: goto tr3;
- case 123: goto tr4;
- }
- if ( 9 <= (*p) && (*p) <= 10 )
- goto st1;
- goto st0;
-st0:
-cs = 0;
- goto _out;
-st2:
- if ( ++p == pe )
- goto _test_eof2;
-case 2:
- switch( (*p) ) {
- case 42: goto st3;
- case 47: goto st5;
- }
- goto st0;
-st3:
- if ( ++p == pe )
- goto _test_eof3;
-case 3:
- if ( (*p) == 42 )
- goto st4;
- goto st3;
-st4:
- if ( ++p == pe )
- goto _test_eof4;
-case 4:
- switch( (*p) ) {
- case 42: goto st4;
- case 47: goto st1;
- }
- goto st3;
-st5:
- if ( ++p == pe )
- goto _test_eof5;
-case 5:
- if ( (*p) == 10 )
- goto st1;
- goto st5;
-tr3:
-#line 462 "parser.rl"
- {
- char *np;
- json->current_nesting = 1;
- np = JSON_parse_array(json, p, pe, &result);
- if (np == NULL) { p--; {p++; cs = 10; goto _out;} } else {p = (( np))-1;}
- }
- goto st10;
-tr4:
-#line 455 "parser.rl"
- {
- char *np;
- json->current_nesting = 1;
- np = JSON_parse_object(json, p, pe, &result);
- if (np == NULL) { p--; {p++; cs = 10; goto _out;} } else {p = (( np))-1;}
- }
- goto st10;
-st10:
- if ( ++p == pe )
- goto _test_eof10;
-case 10:
-#line 1700 "parser.c"
- switch( (*p) ) {
- case 13: goto st10;
- case 32: goto st10;
- case 47: goto st6;
- }
- if ( 9 <= (*p) && (*p) <= 10 )
- goto st10;
- goto st0;
-st6:
- if ( ++p == pe )
- goto _test_eof6;
-case 6:
- switch( (*p) ) {
- case 42: goto st7;
- case 47: goto st9;
- }
- goto st0;
-st7:
- if ( ++p == pe )
- goto _test_eof7;
-case 7:
- if ( (*p) == 42 )
- goto st8;
- goto st7;
-st8:
- if ( ++p == pe )
- goto _test_eof8;
-case 8:
- switch( (*p) ) {
- case 42: goto st8;
- case 47: goto st10;
- }
- goto st7;
-st9:
- if ( ++p == pe )
- goto _test_eof9;
-case 9:
- if ( (*p) == 10 )
- goto st10;
- goto st9;
- }
- _test_eof1: cs = 1; goto _test_eof;
- _test_eof2: cs = 2; goto _test_eof;
- _test_eof3: cs = 3; goto _test_eof;
- _test_eof4: cs = 4; goto _test_eof;
- _test_eof5: cs = 5; goto _test_eof;
- _test_eof10: cs = 10; goto _test_eof;
- _test_eof6: cs = 6; goto _test_eof;
- _test_eof7: cs = 7; goto _test_eof;
- _test_eof8: cs = 8; goto _test_eof;
- _test_eof9: cs = 9; goto _test_eof;
-
- _test_eof: {}
- _out: {}
- }
-
-#line 614 "parser.rl"
-
- if (cs >= JSON_first_final && p == pe) {
- return result;
- } else {
- rb_raise(eParserError, "%u: unexpected token at '%s'", __LINE__, p);
- }
-}
-
-inline static JSON_Parser *JSON_allocate()
-{
- JSON_Parser *json = ALLOC(JSON_Parser);
- MEMZERO(json, JSON_Parser, 1);
- return json;
-}
-
-static void JSON_mark(JSON_Parser *json)
-{
- rb_gc_mark_maybe(json->Vsource);
- rb_gc_mark_maybe(json->create_id);
- rb_gc_mark_maybe(json->object_class);
- rb_gc_mark_maybe(json->array_class);
-}
-
-static void JSON_free(JSON_Parser *json)
-{
- ruby_xfree(json);
-}
-
-static VALUE cJSON_parser_s_allocate(VALUE klass)
-{
- JSON_Parser *json = JSON_allocate();
- return Data_Wrap_Struct(klass, JSON_mark, JSON_free, json);
-}
-
-/*
- * call-seq: source()
- *
- * Returns a copy of the current _source_ string, that was used to construct
- * this Parser.
- */
-static VALUE cParser_source(VALUE self)
-{
- GET_STRUCT;
- return rb_str_dup(json->Vsource);
-}
-
-void Init_parser()
-{
- rb_require("json/common");
- mJSON = rb_define_module("JSON");
- mExt = rb_define_module_under(mJSON, "Ext");
- cParser = rb_define_class_under(mExt, "Parser", rb_cObject);
- eParserError = rb_path2class("JSON::ParserError");
- eNestingError = rb_path2class("JSON::NestingError");
- rb_define_alloc_func(cParser, cJSON_parser_s_allocate);
- rb_define_method(cParser, "initialize", cParser_initialize, -1);
- rb_define_method(cParser, "parse", cParser_parse, 0);
- rb_define_method(cParser, "source", cParser_source, 0);
-
- CNaN = rb_const_get(mJSON, rb_intern("NaN"));
- CInfinity = rb_const_get(mJSON, rb_intern("Infinity"));
- CMinusInfinity = rb_const_get(mJSON, rb_intern("MinusInfinity"));
-
- i_json_creatable_p = rb_intern("json_creatable?");
- i_json_create = rb_intern("json_create");
- i_create_id = rb_intern("create_id");
- i_create_additions = rb_intern("create_additions");
- i_chr = rb_intern("chr");
- i_max_nesting = rb_intern("max_nesting");
- i_allow_nan = rb_intern("allow_nan");
- i_object_class = rb_intern("object_class");
- i_array_class = rb_intern("array_class");
-}
diff --git a/ext/json/ext/parser/parser.rl b/ext/json/ext/parser/parser.rl
deleted file mode 100644
index 384ab9f42f..0000000000
--- a/ext/json/ext/parser/parser.rl
+++ /dev/null
@@ -1,686 +0,0 @@
-#include "ruby.h"
-#include "unicode.h"
-#if HAVE_RE_H
-#include "re.h"
-#endif
-#if HAVE_RUBY_ST_H
-#include "ruby/st.h"
-#endif
-#if HAVE_ST_H
-#include "st.h"
-#endif
-
-#define EVIL 0x666
-
-#ifndef RHASH_TBL
-#define RHASH_TBL(hsh) (RHASH(hsh)->tbl)
-#endif
-
-#ifdef HAVE_RUBY_ENCODING_H
-#include "ruby/encoding.h"
-#define FORCE_UTF8(obj) rb_enc_associate((obj), rb_utf8_encoding())
-#else
-#define FORCE_UTF8(obj)
-#endif
-
-static VALUE mJSON, mExt, cParser, eParserError, eNestingError;
-static VALUE CNaN, CInfinity, CMinusInfinity;
-
-static ID i_json_creatable_p, i_json_create, i_create_id, i_create_additions,
- i_chr, i_max_nesting, i_allow_nan, i_object_class, i_array_class;
-
-#define MinusInfinity "-Infinity"
-
-typedef struct JSON_ParserStruct {
- VALUE Vsource;
- char *source;
- long len;
- char *memo;
- VALUE create_id;
- int max_nesting;
- int current_nesting;
- int allow_nan;
- VALUE object_class;
- VALUE array_class;
-} JSON_Parser;
-
-static char *JSON_parse_object(JSON_Parser *json, char *p, char *pe, VALUE *result);
-static char *JSON_parse_array(JSON_Parser *json, char *p, char *pe, VALUE *result);
-static char *JSON_parse_value(JSON_Parser *json, char *p, char *pe, VALUE *result);
-static char *JSON_parse_string(JSON_Parser *json, char *p, char *pe, VALUE *result);
-static char *JSON_parse_integer(JSON_Parser *json, char *p, char *pe, VALUE *result);
-static char *JSON_parse_float(JSON_Parser *json, char *p, char *pe, VALUE *result);
-
-#define GET_STRUCT \
- JSON_Parser *json; \
- Data_Get_Struct(self, JSON_Parser, json);
-
-%%{
- machine JSON_common;
-
- cr = '\n';
- cr_neg = [^\n];
- ws = [ \t\r\n];
- c_comment = '/*' ( any* - (any* '*/' any* ) ) '*/';
- cpp_comment = '//' cr_neg* cr;
- comment = c_comment | cpp_comment;
- ignore = ws | comment;
- name_separator = ':';
- value_separator = ',';
- Vnull = 'null';
- Vfalse = 'false';
- Vtrue = 'true';
- VNaN = 'NaN';
- VInfinity = 'Infinity';
- VMinusInfinity = '-Infinity';
- begin_value = [nft"\-[{NI] | digit;
- begin_object = '{';
- end_object = '}';
- begin_array = '[';
- end_array = ']';
- begin_string = '"';
- begin_name = begin_string;
- begin_number = digit | '-';
-}%%
-
-%%{
- machine JSON_object;
- include JSON_common;
-
- write data;
-
- action parse_value {
- VALUE v = Qnil;
- char *np = JSON_parse_value(json, fpc, pe, &v);
- if (np == NULL) {
- fhold; fbreak;
- } else {
- rb_hash_aset(*result, last_name, v);
- fexec np;
- }
- }
-
- action parse_name {
- char *np = JSON_parse_string(json, fpc, pe, &last_name);
- if (np == NULL) { fhold; fbreak; } else fexec np;
- }
-
- action exit { fhold; fbreak; }
-
- a_pair = ignore* begin_name >parse_name
- ignore* name_separator ignore*
- begin_value >parse_value;
-
- main := begin_object
- (a_pair (ignore* value_separator a_pair)*)?
- ignore* end_object @exit;
-}%%
-
-static char *JSON_parse_object(JSON_Parser *json, char *p, char *pe, VALUE *result)
-{
- int cs = EVIL;
- VALUE last_name = Qnil;
- VALUE object_class = json->object_class;
-
- if (json->max_nesting && json->current_nesting > json->max_nesting) {
- rb_raise(eNestingError, "nesting of %d is too deep", json->current_nesting);
- }
-
- *result = NIL_P(object_class) ? rb_hash_new() : rb_class_new_instance(0, 0, object_class);
-
- %% write init;
- %% write exec;
-
- if (cs >= JSON_object_first_final) {
- if (RTEST(json->create_id)) {
- VALUE klassname = rb_hash_aref(*result, json->create_id);
- if (!NIL_P(klassname)) {
- VALUE klass = rb_path2class(StringValueCStr(klassname));
- if RTEST(rb_funcall(klass, i_json_creatable_p, 0)) {
- *result = rb_funcall(klass, i_json_create, 1, *result);
- }
- }
- }
- return p + 1;
- } else {
- return NULL;
- }
-}
-
-%%{
- machine JSON_value;
- include JSON_common;
-
- write data;
-
- action parse_null {
- *result = Qnil;
- }
- action parse_false {
- *result = Qfalse;
- }
- action parse_true {
- *result = Qtrue;
- }
- action parse_nan {
- if (json->allow_nan) {
- *result = CNaN;
- } else {
- rb_raise(eParserError, "%u: unexpected token at '%s'", __LINE__, p - 2);
- }
- }
- action parse_infinity {
- if (json->allow_nan) {
- *result = CInfinity;
- } else {
- rb_raise(eParserError, "%u: unexpected token at '%s'", __LINE__, p - 8);
- }
- }
- action parse_string {
- char *np = JSON_parse_string(json, fpc, pe, result);
- if (np == NULL) { fhold; fbreak; } else fexec np;
- }
-
- action parse_number {
- char *np;
- if(pe > fpc + 9 && !strncmp(MinusInfinity, fpc, 9)) {
- if (json->allow_nan) {
- *result = CMinusInfinity;
- fexec p + 10;
- fhold; fbreak;
- } else {
- rb_raise(eParserError, "%u: unexpected token at '%s'", __LINE__, p);
- }
- }
- np = JSON_parse_float(json, fpc, pe, result);
- if (np != NULL) fexec np;
- np = JSON_parse_integer(json, fpc, pe, result);
- if (np != NULL) fexec np;
- fhold; fbreak;
- }
-
- action parse_array {
- char *np;
- json->current_nesting++;
- np = JSON_parse_array(json, fpc, pe, result);
- json->current_nesting--;
- if (np == NULL) { fhold; fbreak; } else fexec np;
- }
-
- action parse_object {
- char *np;
- json->current_nesting++;
- np = JSON_parse_object(json, fpc, pe, result);
- json->current_nesting--;
- if (np == NULL) { fhold; fbreak; } else fexec np;
- }
-
- action exit { fhold; fbreak; }
-
-main := (
- Vnull @parse_null |
- Vfalse @parse_false |
- Vtrue @parse_true |
- VNaN @parse_nan |
- VInfinity @parse_infinity |
- begin_number >parse_number |
- begin_string >parse_string |
- begin_array >parse_array |
- begin_object >parse_object
- ) %*exit;
-}%%
-
-static char *JSON_parse_value(JSON_Parser *json, char *p, char *pe, VALUE *result)
-{
- int cs = EVIL;
-
- %% write init;
- %% write exec;
-
- if (cs >= JSON_value_first_final) {
- return p;
- } else {
- return NULL;
- }
-}
-
-%%{
- machine JSON_integer;
-
- write data;
-
- action exit { fhold; fbreak; }
-
- main := '-'? ('0' | [1-9][0-9]*) (^[0-9] @exit);
-}%%
-
-static char *JSON_parse_integer(JSON_Parser *json, char *p, char *pe, VALUE *result)
-{
- int cs = EVIL;
-
- %% write init;
- json->memo = p;
- %% write exec;
-
- if (cs >= JSON_integer_first_final) {
- long len = p - json->memo;
- *result = rb_Integer(rb_str_new(json->memo, len));
- return p + 1;
- } else {
- return NULL;
- }
-}
-
-%%{
- machine JSON_float;
- include JSON_common;
-
- write data;
-
- action exit { fhold; fbreak; }
-
- main := '-'? (
- (('0' | [1-9][0-9]*) '.' [0-9]+ ([Ee] [+\-]?[0-9]+)?)
- | (('0' | [1-9][0-9]*) ([Ee] [+\-]?[0-9]+))
- ) (^[0-9Ee.\-] @exit );
-}%%
-
-static char *JSON_parse_float(JSON_Parser *json, char *p, char *pe, VALUE *result)
-{
- int cs = EVIL;
-
- %% write init;
- json->memo = p;
- %% write exec;
-
- if (cs >= JSON_float_first_final) {
- long len = p - json->memo;
- *result = rb_Float(rb_str_new(json->memo, len));
- return p + 1;
- } else {
- return NULL;
- }
-}
-
-
-%%{
- machine JSON_array;
- include JSON_common;
-
- write data;
-
- action parse_value {
- VALUE v = Qnil;
- char *np = JSON_parse_value(json, fpc, pe, &v);
- if (np == NULL) {
- fhold; fbreak;
- } else {
- rb_ary_push(*result, v);
- fexec np;
- }
- }
-
- action exit { fhold; fbreak; }
-
- next_element = value_separator ignore* begin_value >parse_value;
-
- main := begin_array ignore*
- ((begin_value >parse_value ignore*)
- (ignore* next_element ignore*)*)?
- end_array @exit;
-}%%
-
-static char *JSON_parse_array(JSON_Parser *json, char *p, char *pe, VALUE *result)
-{
- int cs = EVIL;
- VALUE array_class = json->array_class;
-
- if (json->max_nesting && json->current_nesting > json->max_nesting) {
- rb_raise(eNestingError, "nesting of %d is too deep", json->current_nesting);
- }
- *result = NIL_P(array_class) ? rb_ary_new() : rb_class_new_instance(0, 0, array_class);
-
- %% write init;
- %% write exec;
-
- if(cs >= JSON_array_first_final) {
- return p + 1;
- } else {
- rb_raise(eParserError, "%u: unexpected token at '%s'", __LINE__, p);
- }
-}
-
-static VALUE json_string_unescape(char *p, char *pe)
-{
- VALUE result = rb_str_buf_new(pe - p + 1);
-
- while (p < pe) {
- if (*p == '\\') {
- p++;
- if (p >= pe) return Qnil; /* raise an exception later, \ at end */
- switch (*p) {
- case '"':
- case '\\':
- rb_str_buf_cat(result, p, 1);
- p++;
- break;
- case 'b':
- rb_str_buf_cat2(result, "\b");
- p++;
- break;
- case 'f':
- rb_str_buf_cat2(result, "\f");
- p++;
- break;
- case 'n':
- rb_str_buf_cat2(result, "\n");
- p++;
- break;
- case 'r':
- rb_str_buf_cat2(result, "\r");
- p++;
- break;
- case 't':
- rb_str_buf_cat2(result, "\t");
- p++;
- break;
- case 'u':
- if (p > pe - 4) {
- return Qnil;
- } else {
- p = JSON_convert_UTF16_to_UTF8(result, p, pe, strictConversion);
- }
- break;
- default:
- rb_str_buf_cat(result, p, 1);
- p++;
- break;
- }
- } else {
- char *q = p;
- while (*q != '\\' && q < pe) q++;
- rb_str_buf_cat(result, p, q - p);
- p = q;
- }
- }
- return result;
-}
-
-%%{
- machine JSON_string;
- include JSON_common;
-
- write data;
-
- action parse_string {
- *result = json_string_unescape(json->memo + 1, p);
- if (NIL_P(*result)) {
- fhold;
- fbreak;
- } else {
- FORCE_UTF8(*result);
- fexec p + 1;
- }
- }
-
- action exit { fhold; fbreak; }
-
- main := '"' ((^(["\\] | 0..0x1f) | '\\'["\\/bfnrt] | '\\u'[0-9a-fA-F]{4} | '\\'^(["\\/bfnrtu]|0..0x1f))* %parse_string) '"' @exit;
-}%%
-
-static char *JSON_parse_string(JSON_Parser *json, char *p, char *pe, VALUE *result)
-{
- int cs = EVIL;
-
- *result = rb_str_new("", 0);
- %% write init;
- json->memo = p;
- %% write exec;
-
- if (cs >= JSON_string_first_final) {
- return p + 1;
- } else {
- return NULL;
- }
-}
-
-
-%%{
- machine JSON;
-
- write data;
-
- include JSON_common;
-
- action parse_object {
- char *np;
- json->current_nesting = 1;
- np = JSON_parse_object(json, fpc, pe, &result);
- if (np == NULL) { fhold; fbreak; } else fexec np;
- }
-
- action parse_array {
- char *np;
- json->current_nesting = 1;
- np = JSON_parse_array(json, fpc, pe, &result);
- if (np == NULL) { fhold; fbreak; } else fexec np;
- }
-
- main := ignore* (
- begin_object >parse_object |
- begin_array >parse_array
- ) ignore*;
-}%%
-
-/*
- * Document-class: JSON::Ext::Parser
- *
- * This is the JSON parser implemented as a C extension. It can be configured
- * to be used by setting
- *
- * JSON.parser = JSON::Ext::Parser
- *
- * with the method parser= in JSON.
- *
- */
-
-/*
- * call-seq: new(source, opts => {})
- *
- * Creates a new JSON::Ext::Parser instance for the string _source_.
- *
- * Creates a new JSON::Ext::Parser instance for the string _source_.
- *
- * It will be configured by the _opts_ hash. _opts_ can have the following
- * keys:
- *
- * _opts_ can have the following keys:
- * * *max_nesting*: The maximum depth of nesting allowed in the parsed data
- * structures. Disable depth checking with :max_nesting => false|nil|0, it
- * defaults to 19.
- * * *allow_nan*: If set to true, allow NaN, Infinity and -Infinity in
- * defiance of RFC 4627 to be parsed by the Parser. This option defaults to
- * false.
- * * *create_additions*: If set to false, the Parser doesn't create
- * additions even if a matchin class and create_id was found. This option
- * defaults to true.
- * * *object_class*: Defaults to Hash
- * * *array_class*: Defaults to Array
- */
-static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
-{
- char *ptr;
- long len;
- VALUE source, opts;
- GET_STRUCT;
- rb_scan_args(argc, argv, "11", &source, &opts);
- source = StringValue(source);
- ptr = RSTRING_PTR(source);
- len = RSTRING_LEN(source);
- if (len < 2) {
- rb_raise(eParserError, "A JSON text must at least contain two octets!");
- }
- if (!NIL_P(opts)) {
- opts = rb_convert_type(opts, T_HASH, "Hash", "to_hash");
- if (NIL_P(opts)) {
- rb_raise(rb_eArgError, "opts needs to be like a hash");
- } else {
- VALUE tmp = ID2SYM(i_max_nesting);
- if (st_lookup(RHASH_TBL(opts), tmp, 0)) {
- VALUE max_nesting = rb_hash_aref(opts, tmp);
- if (RTEST(max_nesting)) {
- Check_Type(max_nesting, T_FIXNUM);
- json->max_nesting = FIX2INT(max_nesting);
- } else {
- json->max_nesting = 0;
- }
- } else {
- json->max_nesting = 19;
- }
- tmp = ID2SYM(i_allow_nan);
- if (st_lookup(RHASH_TBL(opts), tmp, 0)) {
- VALUE allow_nan = rb_hash_aref(opts, tmp);
- json->allow_nan = RTEST(allow_nan) ? 1 : 0;
- } else {
- json->allow_nan = 0;
- }
- tmp = ID2SYM(i_create_additions);
- if (st_lookup(RHASH_TBL(opts), tmp, 0)) {
- VALUE create_additions = rb_hash_aref(opts, tmp);
- if (RTEST(create_additions)) {
- json->create_id = rb_funcall(mJSON, i_create_id, 0);
- } else {
- json->create_id = Qnil;
- }
- } else {
- json->create_id = rb_funcall(mJSON, i_create_id, 0);
- }
- tmp = ID2SYM(i_object_class);
- if (st_lookup(RHASH_TBL(opts), tmp, 0)) {
- json->object_class = rb_hash_aref(opts, tmp);
- } else {
- json->object_class = Qnil;
- }
- tmp = ID2SYM(i_array_class);
- if (st_lookup(RHASH_TBL(opts), tmp, 0)) {
- json->array_class = rb_hash_aref(opts, tmp);
- } else {
- json->array_class = Qnil;
- }
- }
- } else {
- json->max_nesting = 19;
- json->allow_nan = 0;
- json->create_id = rb_funcall(mJSON, i_create_id, 0);
- json->object_class = Qnil;
- json->array_class = Qnil;
- }
- json->current_nesting = 0;
- /*
- Convert these?
- if (len >= 4 && ptr[0] == 0 && ptr[1] == 0 && ptr[2] == 0) {
- rb_raise(eParserError, "Only UTF8 octet streams are supported atm!");
- } else if (len >= 4 && ptr[0] == 0 && ptr[2] == 0) {
- rb_raise(eParserError, "Only UTF8 octet streams are supported atm!");
- } else if (len >= 4 && ptr[1] == 0 && ptr[2] == 0 && ptr[3] == 0) {
- rb_raise(eParserError, "Only UTF8 octet streams are supported atm!");
- } else if (len >= 4 && ptr[1] == 0 && ptr[3] == 0) {
- rb_raise(eParserError, "Only UTF8 octet streams are supported atm!");
- }
- */
- json->len = len;
- json->source = ptr;
- json->Vsource = source;
- return self;
-}
-
-/*
- * call-seq: parse()
- *
- * Parses the current JSON text _source_ and returns the complete data
- * structure as a result.
- */
-static VALUE cParser_parse(VALUE self)
-{
- char *p, *pe;
- int cs = EVIL;
- VALUE result = Qnil;
- GET_STRUCT;
-
- %% write init;
- p = json->source;
- pe = p + json->len;
- %% write exec;
-
- if (cs >= JSON_first_final && p == pe) {
- return result;
- } else {
- rb_raise(eParserError, "%u: unexpected token at '%s'", __LINE__, p);
- }
-}
-
-inline static JSON_Parser *JSON_allocate()
-{
- JSON_Parser *json = ALLOC(JSON_Parser);
- MEMZERO(json, JSON_Parser, 1);
- return json;
-}
-
-static void JSON_mark(JSON_Parser *json)
-{
- rb_gc_mark_maybe(json->Vsource);
- rb_gc_mark_maybe(json->create_id);
- rb_gc_mark_maybe(json->object_class);
- rb_gc_mark_maybe(json->array_class);
-}
-
-static void JSON_free(JSON_Parser *json)
-{
- ruby_xfree(json);
-}
-
-static VALUE cJSON_parser_s_allocate(VALUE klass)
-{
- JSON_Parser *json = JSON_allocate();
- return Data_Wrap_Struct(klass, JSON_mark, JSON_free, json);
-}
-
-/*
- * call-seq: source()
- *
- * Returns a copy of the current _source_ string, that was used to construct
- * this Parser.
- */
-static VALUE cParser_source(VALUE self)
-{
- GET_STRUCT;
- return rb_str_dup(json->Vsource);
-}
-
-void Init_parser()
-{
- rb_require("json/common");
- mJSON = rb_define_module("JSON");
- mExt = rb_define_module_under(mJSON, "Ext");
- cParser = rb_define_class_under(mExt, "Parser", rb_cObject);
- eParserError = rb_path2class("JSON::ParserError");
- eNestingError = rb_path2class("JSON::NestingError");
- rb_define_alloc_func(cParser, cJSON_parser_s_allocate);
- rb_define_method(cParser, "initialize", cParser_initialize, -1);
- rb_define_method(cParser, "parse", cParser_parse, 0);
- rb_define_method(cParser, "source", cParser_source, 0);
-
- CNaN = rb_const_get(mJSON, rb_intern("NaN"));
- CInfinity = rb_const_get(mJSON, rb_intern("Infinity"));
- CMinusInfinity = rb_const_get(mJSON, rb_intern("MinusInfinity"));
-
- i_json_creatable_p = rb_intern("json_creatable?");
- i_json_create = rb_intern("json_create");
- i_create_id = rb_intern("create_id");
- i_create_additions = rb_intern("create_additions");
- i_chr = rb_intern("chr");
- i_max_nesting = rb_intern("max_nesting");
- i_allow_nan = rb_intern("allow_nan");
- i_object_class = rb_intern("object_class");
- i_array_class = rb_intern("array_class");
-}
diff --git a/ext/json/ext/parser/unicode.c b/ext/json/ext/parser/unicode.c
deleted file mode 100644
index 80e5c6f036..0000000000
--- a/ext/json/ext/parser/unicode.c
+++ /dev/null
@@ -1,154 +0,0 @@
-#include "unicode.h"
-
-/*
- * Copyright 2001-2004 Unicode, Inc.
- *
- * Disclaimer
- *
- * This source code is provided as is by Unicode, Inc. No claims are
- * made as to fitness for any particular purpose. No warranties of any
- * kind are expressed or implied. The recipient agrees to determine
- * applicability of information provided. If this file has been
- * purchased on magnetic or optical media from Unicode, Inc., the
- * sole remedy for any claim will be exchange of defective media
- * within 90 days of receipt.
- *
- * Limitations on Rights to Redistribute This Code
- *
- * Unicode, Inc. hereby grants the right to freely use the information
- * supplied in this file in the creation of products supporting the
- * Unicode Standard, and to make copies of this file in any form
- * for internal or external distribution as long as this notice
- * remains attached.
- */
-
-/*
- * Index into the table below with the first byte of a UTF-8 sequence to
- * get the number of trailing bytes that are supposed to follow it.
- * Note that *legal* UTF-8 values can't have 4 or 5-bytes. The table is
- * left as-is for anyone who may want to do such conversion, which was
- * allowed in earlier algorithms.
- */
-static const char trailingBytesForUTF8[256] = {
- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
- 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
- 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 3,3,3,3,3,3,3,3,4,4,4,4,5,5,5,5
-};
-
-/*
- * Magic values subtracted from a buffer value during UTF8 conversion.
- * This table contains as many values as there might be trailing bytes
- * in a UTF-8 sequence.
- */
-static const UTF32 offsetsFromUTF8[6] = { 0x00000000UL, 0x00003080UL, 0x000E2080UL,
- 0x03C82080UL, 0xFA082080UL, 0x82082080UL };
-
-/*
- * Once the bits are split out into bytes of UTF-8, this is a mask OR-ed
- * into the first byte, depending on how many bytes follow. There are
- * as many entries in this table as there are UTF-8 sequence types.
- * (I.e., one byte sequence, two byte... etc.). Remember that sequencs
- * for *legal* UTF-8 will be 4 or fewer bytes total.
- */
-static const UTF8 firstByteMark[7] = { 0x00, 0x00, 0xC0, 0xE0, 0xF0, 0xF8, 0xFC };
-
-char *JSON_convert_UTF16_to_UTF8 (
- VALUE buffer,
- char *source,
- char *sourceEnd,
- ConversionFlags flags)
-{
- UTF16 *tmp, *tmpPtr, *tmpEnd;
- char buf[5];
- long n = 0, i;
- char *p = source - 1;
-
- while (p < sourceEnd && p[0] == '\\' && p[1] == 'u') {
- p += 6;
- n++;
- }
- p = source + 1;
- buf[4] = 0;
- tmpPtr = tmp = ALLOC_N(UTF16, n);
- tmpEnd = tmp + n;
- for (i = 0; i < n; i++) {
- buf[0] = *p++;
- buf[1] = *p++;
- buf[2] = *p++;
- buf[3] = *p++;
- tmpPtr[i] = (UTF16)strtol(buf, NULL, 16);
- p += 2;
- }
-
- while (tmpPtr < tmpEnd) {
- UTF32 ch;
- unsigned short bytesToWrite = 0;
- const UTF32 byteMask = 0xBF;
- const UTF32 byteMark = 0x80;
- ch = *tmpPtr++;
- /* If we have a surrogate pair, convert to UTF32 first. */
- if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_HIGH_END) {
- /* If the 16 bits following the high surrogate are in the source
- * buffer... */
- if (tmpPtr < tmpEnd) {
- UTF32 ch2 = *tmpPtr;
- /* If it's a low surrogate, convert to UTF32. */
- if (ch2 >= UNI_SUR_LOW_START && ch2 <= UNI_SUR_LOW_END) {
- ch = ((ch - UNI_SUR_HIGH_START) << halfShift)
- + (ch2 - UNI_SUR_LOW_START) + halfBase;
- ++tmpPtr;
- } else if (flags == strictConversion) { /* it's an unpaired high surrogate */
- ruby_xfree(tmp);
- rb_raise(rb_path2class("JSON::ParserError"),
- "source sequence is illegal/malformed near %s", source);
- }
- } else { /* We don't have the 16 bits following the high surrogate. */
- ruby_xfree(tmp);
- rb_raise(rb_path2class("JSON::ParserError"),
- "partial character in source, but hit end near %s", source);
- break;
- }
- } else if (flags == strictConversion) {
- /* UTF-16 surrogate values are illegal in UTF-32 */
- if (ch >= UNI_SUR_LOW_START && ch <= UNI_SUR_LOW_END) {
- ruby_xfree(tmp);
- rb_raise(rb_path2class("JSON::ParserError"),
- "source sequence is illegal/malformed near %s", source);
- }
- }
- /* Figure out how many bytes the result will require */
- if (ch < (UTF32) 0x80) {
- bytesToWrite = 1;
- } else if (ch < (UTF32) 0x800) {
- bytesToWrite = 2;
- } else if (ch < (UTF32) 0x10000) {
- bytesToWrite = 3;
- } else if (ch < (UTF32) 0x110000) {
- bytesToWrite = 4;
- } else {
- bytesToWrite = 3;
- ch = UNI_REPLACEMENT_CHAR;
- }
-
- buf[0] = 0;
- buf[1] = 0;
- buf[2] = 0;
- buf[3] = 0;
- p = buf + bytesToWrite;
- switch (bytesToWrite) { /* note: everything falls through. */
- case 4: *--p = (UTF8) ((ch | byteMark) & byteMask); ch >>= 6;
- case 3: *--p = (UTF8) ((ch | byteMark) & byteMask); ch >>= 6;
- case 2: *--p = (UTF8) ((ch | byteMark) & byteMask); ch >>= 6;
- case 1: *--p = (UTF8) (ch | firstByteMark[bytesToWrite]);
- }
- rb_str_buf_cat(buffer, p, bytesToWrite);
- }
- ruby_xfree(tmp);
- source += 5 + (n - 1) * 6;
- return source;
-}
diff --git a/ext/json/ext/parser/unicode.h b/ext/json/ext/parser/unicode.h
deleted file mode 100644
index 155da0ceee..0000000000
--- a/ext/json/ext/parser/unicode.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-#ifndef _PARSER_UNICODE_H_
-#define _PARSER_UNICODE_H_
-
-#include "ruby.h"
-
-typedef unsigned long UTF32; /* at least 32 bits */
-typedef unsigned short UTF16; /* at least 16 bits */
-typedef unsigned char UTF8; /* typically 8 bits */
-
-#define UNI_REPLACEMENT_CHAR (UTF32)0x0000FFFD
-#define UNI_MAX_BMP (UTF32)0x0000FFFF
-#define UNI_MAX_UTF16 (UTF32)0x0010FFFF
-#define UNI_MAX_UTF32 (UTF32)0x7FFFFFFF
-#define UNI_MAX_LEGAL_UTF32 (UTF32)0x0010FFFF
-
-#define UNI_SUR_HIGH_START (UTF32)0xD800
-#define UNI_SUR_HIGH_END (UTF32)0xDBFF
-#define UNI_SUR_LOW_START (UTF32)0xDC00
-#define UNI_SUR_LOW_END (UTF32)0xDFFF
-
-static const int halfShift = 10; /* used for shifting by 10 bits */
-
-static const UTF32 halfBase = 0x0010000UL;
-static const UTF32 halfMask = 0x3FFUL;
-
-typedef enum {
- conversionOK = 0, /* conversion successful */
- sourceExhausted, /* partial character in source, but hit end */
- targetExhausted, /* insuff. room in target for conversion */
- sourceIllegal /* source sequence is illegal/malformed */
-} ConversionResult;
-
-typedef enum {
- strictConversion = 0,
- lenientConversion
-} ConversionFlags;
-
-char *JSON_convert_UTF16_to_UTF8 (
- VALUE buffer,
- char *source,
- char *sourceEnd,
- ConversionFlags flags);
-
-#ifndef RARRAY_PTR
-#define RARRAY_PTR(ARRAY) RARRAY(ARRAY)->ptr
-#endif
-#ifndef RARRAY_LEN
-#define RARRAY_LEN(ARRAY) RARRAY(ARRAY)->len
-#endif
-#ifndef RSTRING_PTR
-#define RSTRING_PTR(string) RSTRING(string)->ptr
-#endif
-#ifndef RSTRING_LEN
-#define RSTRING_LEN(string) RSTRING(string)->len
-#endif
-
-#endif
diff --git a/ext/json/extconf.rb b/ext/json/extconf.rb
deleted file mode 100644
index 850798c643..0000000000
--- a/ext/json/extconf.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-require 'mkmf'
-create_makefile('json')
-
diff --git a/ext/json/lib/json.rb b/ext/json/lib/json.rb
deleted file mode 100755
index 789b0de546..0000000000
--- a/ext/json/lib/json.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-require 'json/common'
-module JSON
- require 'json/version'
-
- begin
- require 'json/ext'
- rescue LoadError
- require 'json/pure'
- end
-end
diff --git a/ext/json/lib/json/add/core.rb b/ext/json/lib/json/add/core.rb
deleted file mode 100644
index 4423e7ad75..0000000000
--- a/ext/json/lib/json/add/core.rb
+++ /dev/null
@@ -1,135 +0,0 @@
-# This file contains implementations of ruby core's custom objects for
-# serialisation/deserialisation.
-
-unless Object.const_defined?(:JSON) and ::JSON.const_defined?(:JSON_LOADED) and
- ::JSON::JSON_LOADED
- require 'json'
-end
-require 'date'
-
-class Time
- def self.json_create(object)
- if usec = object.delete('u') # used to be tv_usec -> tv_nsec
- object['n'] = usec * 1000
- end
- if respond_to?(:tv_nsec)
- at(*object.values_at('s', 'n'))
- else
- at(object['s'], object['n'] / 1000)
- end
- end
-
- def to_json(*args)
- {
- 'json_class' => self.class.name,
- 's' => tv_sec,
- 'n' => respond_to?(:tv_nsec) ? tv_nsec : tv_usec * 1000
- }.to_json(*args)
- end
-end
-
-class Date
- def self.json_create(object)
- civil(*object.values_at('y', 'm', 'd', 'sg'))
- end
-
- alias start sg unless method_defined?(:start)
-
- def to_json(*args)
- {
- 'json_class' => self.class.name,
- 'y' => year,
- 'm' => month,
- 'd' => day,
- 'sg' => start,
- }.to_json(*args)
- end
-end
-
-class DateTime
- def self.json_create(object)
- args = object.values_at('y', 'm', 'd', 'H', 'M', 'S')
- of_a, of_b = object['of'].split('/')
- if of_b and of_b != '0'
- args << Rational(of_a.to_i, of_b.to_i)
- else
- args << of_a
- end
- args << object['sg']
- civil(*args)
- end
-
- alias start sg unless method_defined?(:start)
-
- def to_json(*args)
- {
- 'json_class' => self.class.name,
- 'y' => year,
- 'm' => month,
- 'd' => day,
- 'H' => hour,
- 'M' => min,
- 'S' => sec,
- 'of' => offset.to_s,
- 'sg' => start,
- }.to_json(*args)
- end
-end
-
-class Range
- def self.json_create(object)
- new(*object['a'])
- end
-
- def to_json(*args)
- {
- 'json_class' => self.class.name,
- 'a' => [ first, last, exclude_end? ]
- }.to_json(*args)
- end
-end
-
-class Struct
- def self.json_create(object)
- new(*object['v'])
- end
-
- def to_json(*args)
- klass = self.class.name
- klass.to_s.empty? and raise JSON::JSONError, "Only named structs are supported!"
- {
- 'json_class' => klass,
- 'v' => values,
- }.to_json(*args)
- end
-end
-
-class Exception
- def self.json_create(object)
- result = new(object['m'])
- result.set_backtrace object['b']
- result
- end
-
- def to_json(*args)
- {
- 'json_class' => self.class.name,
- 'm' => message,
- 'b' => backtrace,
- }.to_json(*args)
- end
-end
-
-class Regexp
- def self.json_create(object)
- new(object['s'], object['o'])
- end
-
- def to_json(*)
- {
- 'json_class' => self.class.name,
- 'o' => options,
- 's' => source,
- }.to_json
- end
-end
diff --git a/ext/json/lib/json/add/rails.rb b/ext/json/lib/json/add/rails.rb
deleted file mode 100644
index e86ed1aab9..0000000000
--- a/ext/json/lib/json/add/rails.rb
+++ /dev/null
@@ -1,58 +0,0 @@
-# This file contains implementations of rails custom objects for
-# serialisation/deserialisation.
-
-unless Object.const_defined?(:JSON) and ::JSON.const_defined?(:JSON_LOADED) and
- ::JSON::JSON_LOADED
- require 'json'
-end
-
-class Object
- def self.json_create(object)
- obj = new
- for key, value in object
- next if key == 'json_class'
- instance_variable_set "@#{key}", value
- end
- obj
- end
-
- def to_json(*a)
- result = {
- 'json_class' => self.class.name
- }
- instance_variables.inject(result) do |r, name|
- r[name[1..-1]] = instance_variable_get name
- r
- end
- result.to_json(*a)
- end
-end
-
-class Symbol
- def to_json(*a)
- to_s.to_json(*a)
- end
-end
-
-module Enumerable
- def to_json(*a)
- to_a.to_json(*a)
- end
-end
-
-# class Regexp
-# def to_json(*)
-# inspect
-# end
-# end
-#
-# The above rails definition has some problems:
-#
-# 1. { 'foo' => /bar/ }.to_json # => "{foo: /bar/}"
-# This isn't valid JSON, because the regular expression syntax is not
-# defined in RFC 4627. (And unquoted strings are disallowed there, too.)
-# Though it is valid Javascript.
-#
-# 2. { 'foo' => /bar/mix }.to_json # => "{foo: /bar/mix}"
-# This isn't even valid Javascript.
-
diff --git a/ext/json/lib/json/common.rb b/ext/json/lib/json/common.rb
deleted file mode 100755
index 0df8a8995e..0000000000
--- a/ext/json/lib/json/common.rb
+++ /dev/null
@@ -1,355 +0,0 @@
-require 'json/version'
-
-module JSON
- class << self
- # If _object_ is string-like parse the string and return the parsed result
- # as a Ruby data structure. Otherwise generate a JSON text from the Ruby
- # data structure object and return it.
- #
- # The _opts_ argument is passed through to generate/parse respectively, see
- # generate and parse for their documentation.
- def [](object, opts = {})
- if object.respond_to? :to_str
- JSON.parse(object.to_str, opts => {})
- else
- JSON.generate(object, opts => {})
- end
- end
-
- # Returns the JSON parser class, that is used by JSON. This might be either
- # JSON::Ext::Parser or JSON::Pure::Parser.
- attr_reader :parser
-
- # Set the JSON parser class _parser_ to be used by JSON.
- def parser=(parser) # :nodoc:
- @parser = parser
- remove_const :Parser if const_defined? :Parser
- const_set :Parser, parser
- end
-
- # Return the constant located at _path_. The format of _path_ has to be
- # either ::A::B::C or A::B::C. In any case A has to be located at the top
- # level (absolute namespace path?). If there doesn't exist a constant at
- # the given path, an ArgumentError is raised.
- def deep_const_get(path) # :nodoc:
- path = path.to_s
- path.split(/::/).inject(Object) do |p, c|
- case
- when c.empty? then p
- when p.const_defined?(c) then p.const_get(c)
- else raise ArgumentError, "can't find const #{path}"
- end
- end
- end
-
- # Set the module _generator_ to be used by JSON.
- def generator=(generator) # :nodoc:
- @generator = generator
- generator_methods = generator::GeneratorMethods
- for const in generator_methods.constants
- klass = deep_const_get(const)
- modul = generator_methods.const_get(const)
- klass.class_eval do
- instance_methods(false).each do |m|
- m.to_s == 'to_json' and remove_method m
- end
- include modul
- end
- end
- self.state = generator::State
- const_set :State, self.state
- end
-
- # Returns the JSON generator modul, that is used by JSON. This might be
- # either JSON::Ext::Generator or JSON::Pure::Generator.
- attr_reader :generator
-
- # Returns the JSON generator state class, that is used by JSON. This might
- # be either JSON::Ext::Generator::State or JSON::Pure::Generator::State.
- attr_accessor :state
-
- # This is create identifier, that is used to decide, if the _json_create_
- # hook of a class should be called. It defaults to 'json_class'.
- attr_accessor :create_id
- end
- self.create_id = 'json_class'
-
- NaN = 0.0/0
-
- Infinity = 1.0/0
-
- MinusInfinity = -Infinity
-
- # The base exception for JSON errors.
- class JSONError < StandardError; end
-
- # This exception is raised, if a parser error occurs.
- class ParserError < JSONError; end
-
- # This exception is raised, if the nesting of parsed datastructures is too
- # deep.
- class NestingError < ParserError; end
-
- # This exception is raised, if a generator or unparser error occurs.
- class GeneratorError < JSONError; end
- # For backwards compatibility
- UnparserError = GeneratorError
-
- # If a circular data structure is encountered while unparsing
- # this exception is raised.
- class CircularDatastructure < GeneratorError; end
-
- # This exception is raised, if the required unicode support is missing on the
- # system. Usually this means, that the iconv library is not installed.
- class MissingUnicodeSupport < JSONError; end
-
- module_function
-
- # Parse the JSON string _source_ into a Ruby data structure and return it.
- #
- # _opts_ can have the following
- # keys:
- # * *max_nesting*: The maximum depth of nesting allowed in the parsed data
- # structures. Disable depth checking with :max_nesting => false, it defaults
- # to 19.
- # * *allow_nan*: If set to true, allow NaN, Infinity and -Infinity in
- # defiance of RFC 4627 to be parsed by the Parser. This option defaults
- # to false.
- # * *create_additions*: If set to false, the Parser doesn't create
- # additions even if a matchin class and create_id was found. This option
- # defaults to true.
- def parse(source, opts = {})
- JSON.parser.new(source, opts).parse
- end
-
- # Parse the JSON string _source_ into a Ruby data structure and return it.
- # The bang version of the parse method, defaults to the more dangerous values
- # for the _opts_ hash, so be sure only to parse trusted _source_ strings.
- #
- # _opts_ can have the following keys:
- # * *max_nesting*: The maximum depth of nesting allowed in the parsed data
- # structures. Enable depth checking with :max_nesting => anInteger. The parse!
- # methods defaults to not doing max depth checking: This can be dangerous,
- # if someone wants to fill up your stack.
- # * *allow_nan*: If set to true, allow NaN, Infinity, and -Infinity in
- # defiance of RFC 4627 to be parsed by the Parser. This option defaults
- # to true.
- # * *create_additions*: If set to false, the Parser doesn't create
- # additions even if a matchin class and create_id was found. This option
- # defaults to true.
- def parse!(source, opts = {})
- opts = {
- :max_nesting => false,
- :allow_nan => true
- }.update(opts)
- JSON.parser.new(source, opts).parse
- end
-
- # Unparse the Ruby data structure _obj_ into a single line JSON string and
- # return it. _state_ is
- # * a JSON::State object,
- # * or a Hash like object (responding to to_hash),
- # * an object convertible into a hash by a to_h method,
- # that is used as or to configure a State object.
- #
- # It defaults to a state object, that creates the shortest possible JSON text
- # in one line, checks for circular data structures and doesn't allow NaN,
- # Infinity, and -Infinity.
- #
- # A _state_ hash can have the following keys:
- # * *indent*: a string used to indent levels (default: ''),
- # * *space*: a string that is put after, a : or , delimiter (default: ''),
- # * *space_before*: a string that is put before a : pair delimiter (default: ''),
- # * *object_nl*: a string that is put at the end of a JSON object (default: ''),
- # * *array_nl*: a string that is put at the end of a JSON array (default: ''),
- # * *check_circular*: true if checking for circular data structures
- # should be done (the default), false otherwise.
- # * *allow_nan*: true if NaN, Infinity, and -Infinity should be
- # generated, otherwise an exception is thrown, if these values are
- # encountered. This options defaults to false.
- # * *max_nesting*: The maximum depth of nesting allowed in the data
- # structures from which JSON is to be generated. Disable depth checking
- # with :max_nesting => false, it defaults to 19.
- #
- # See also the fast_generate for the fastest creation method with the least
- # amount of sanity checks, and the pretty_generate method for some
- # defaults for a pretty output.
- def generate(obj, state = nil)
- if state
- state = State.from_state(state)
- else
- state = State.new
- end
- obj.to_json(state)
- end
-
- # :stopdoc:
- # I want to deprecate these later, so I'll first be silent about them, and
- # later delete them.
- alias unparse generate
- module_function :unparse
- # :startdoc:
-
- # Unparse the Ruby data structure _obj_ into a single line JSON string and
- # return it. This method disables the checks for circles in Ruby objects, and
- # also generates NaN, Infinity, and, -Infinity float values.
- #
- # *WARNING*: Be careful not to pass any Ruby data structures with circles as
- # _obj_ argument, because this will cause JSON to go into an infinite loop.
- def fast_generate(obj)
- obj.to_json(nil)
- end
-
- # :stopdoc:
- # I want to deprecate these later, so I'll first be silent about them, and later delete them.
- alias fast_unparse fast_generate
- module_function :fast_unparse
- # :startdoc:
-
- # Unparse the Ruby data structure _obj_ into a JSON string and return it. The
- # returned string is a prettier form of the string returned by #unparse.
- #
- # The _opts_ argument can be used to configure the generator, see the
- # generate method for a more detailed explanation.
- def pretty_generate(obj, opts = nil)
- state = JSON.state.new(
- :indent => ' ',
- :space => ' ',
- :object_nl => "\n",
- :array_nl => "\n",
- :check_circular => true
- )
- if opts
- if opts.respond_to? :to_hash
- opts = opts.to_hash
- elsif opts.respond_to? :to_h
- opts = opts.to_h
- else
- raise TypeError, "can't convert #{opts.class} into Hash"
- end
- state.configure(opts)
- end
- obj.to_json(state)
- end
-
- # :stopdoc:
- # I want to deprecate these later, so I'll first be silent about them, and later delete them.
- alias pretty_unparse pretty_generate
- module_function :pretty_unparse
- # :startdoc:
-
- # Load a ruby data structure from a JSON _source_ and return it. A source can
- # either be a string-like object, an IO like object, or an object responding
- # to the read method. If _proc_ was given, it will be called with any nested
- # Ruby object as an argument recursively in depth first order.
- #
- # This method is part of the implementation of the load/dump interface of
- # Marshal and YAML.
- def load(source, proc = nil)
- if source.respond_to? :to_str
- source = source.to_str
- elsif source.respond_to? :to_io
- source = source.to_io.read
- else
- source = source.read
- end
- result = parse(source, :max_nesting => false, :allow_nan => true)
- recurse_proc(result, &proc) if proc
- result
- end
-
- def recurse_proc(result, &proc)
- case result
- when Array
- result.each { |x| recurse_proc x, &proc }
- proc.call result
- when Hash
- result.each { |x, y| recurse_proc x, &proc; recurse_proc y, &proc }
- proc.call result
- else
- proc.call result
- end
- end
- module_function :recurse_proc
-
- alias restore load
- module_function :restore
-
- # Dumps _obj_ as a JSON string, i.e. calls generate on the object and returns
- # the result.
- #
- # If anIO (an IO like object or an object that responds to the write method)
- # was given, the resulting JSON is written to it.
- #
- # If the number of nested arrays or objects exceeds _limit_ an ArgumentError
- # exception is raised. This argument is similar (but not exactly the
- # same!) to the _limit_ argument in Marshal.dump.
- #
- # This method is part of the implementation of the load/dump interface of
- # Marshal and YAML.
- def dump(obj, anIO = nil, limit = nil)
- if anIO and limit.nil?
- anIO = anIO.to_io if anIO.respond_to?(:to_io)
- unless anIO.respond_to?(:write)
- limit = anIO
- anIO = nil
- end
- end
- limit ||= 0
- result = generate(obj, :allow_nan => true, :max_nesting => limit)
- if anIO
- anIO.write result
- anIO
- else
- result
- end
- rescue JSON::NestingError
- raise ArgumentError, "exceed depth limit"
- end
-end
-
-module ::Kernel
- private
-
- # Outputs _objs_ to STDOUT as JSON strings in the shortest form, that is in
- # one line.
- def j(*objs)
- objs.each do |obj|
- puts JSON::generate(obj, :allow_nan => true, :max_nesting => false)
- end
- nil
- end
-
- # Ouputs _objs_ to STDOUT as JSON strings in a pretty format, with
- # indentation and over many lines.
- def jj(*objs)
- objs.each do |obj|
- puts JSON::pretty_generate(obj, :allow_nan => true, :max_nesting => false)
- end
- nil
- end
-
- # If _object_ is string-like parse the string and return the parsed result as
- # a Ruby data structure. Otherwise generate a JSON text from the Ruby data
- # structure object and return it.
- #
- # The _opts_ argument is passed through to generate/parse respectively, see
- # generate and parse for their documentation.
- def JSON(object, opts = {})
- if object.respond_to? :to_str
- JSON.parse(object.to_str, opts)
- else
- JSON.generate(object, opts)
- end
- end
-end
-
-class ::Class
- # Returns true, if this class can be used to create an instance
- # from a serialised JSON string. The class has to implement a class
- # method _json_create_ that expects a hash as first parameter, which includes
- # the required data.
- def json_creatable?
- respond_to?(:json_create)
- end
-end
diff --git a/ext/json/lib/json/editor.rb b/ext/json/lib/json/editor.rb
deleted file mode 100755
index 9e05f44b5b..0000000000
--- a/ext/json/lib/json/editor.rb
+++ /dev/null
@@ -1,1371 +0,0 @@
-# To use the GUI JSON editor, start the edit_json.rb executable script. It
-# requires ruby-gtk to be installed.
-
-require 'gtk2'
-require 'iconv'
-require 'json'
-require 'rbconfig'
-require 'open-uri'
-
-module JSON
- module Editor
- include Gtk
-
- # Beginning of the editor window title
- TITLE = 'JSON Editor'.freeze
-
- # Columns constants
- ICON_COL, TYPE_COL, CONTENT_COL = 0, 1, 2
-
- # JSON primitive types (Containers)
- CONTAINER_TYPES = %w[Array Hash].sort
- # All JSON primitive types
- ALL_TYPES = (%w[TrueClass FalseClass Numeric String NilClass] +
- CONTAINER_TYPES).sort
-
- # The Nodes necessary for the tree representation of a JSON document
- ALL_NODES = (ALL_TYPES + %w[Key]).sort
-
- DEFAULT_DIALOG_KEY_PRESS_HANDLER = lambda do |dialog, event|
- case event.keyval
- when Gdk::Keyval::GDK_Return
- dialog.response Dialog::RESPONSE_ACCEPT
- when Gdk::Keyval::GDK_Escape
- dialog.response Dialog::RESPONSE_REJECT
- end
- end
-
- # Returns the Gdk::Pixbuf of the icon named _name_ from the icon cache.
- def Editor.fetch_icon(name)
- @icon_cache ||= {}
- unless @icon_cache.key?(name)
- path = File.dirname(__FILE__)
- @icon_cache[name] = Gdk::Pixbuf.new(File.join(path, name + '.xpm'))
- end
- @icon_cache[name]
- end
-
- # Opens an error dialog on top of _window_ showing the error message
- # _text_.
- def Editor.error_dialog(window, text)
- dialog = MessageDialog.new(window, Dialog::MODAL,
- MessageDialog::ERROR,
- MessageDialog::BUTTONS_CLOSE, text)
- dialog.show_all
- dialog.run
- rescue TypeError
- dialog = MessageDialog.new(Editor.window, Dialog::MODAL,
- MessageDialog::ERROR,
- MessageDialog::BUTTONS_CLOSE, text)
- dialog.show_all
- dialog.run
- ensure
- dialog.destroy if dialog
- end
-
- # Opens a yes/no question dialog on top of _window_ showing the error
- # message _text_. If yes was answered _true_ is returned, otherwise
- # _false_.
- def Editor.question_dialog(window, text)
- dialog = MessageDialog.new(window, Dialog::MODAL,
- MessageDialog::QUESTION,
- MessageDialog::BUTTONS_YES_NO, text)
- dialog.show_all
- dialog.run do |response|
- return Gtk::Dialog::RESPONSE_YES === response
- end
- ensure
- dialog.destroy if dialog
- end
-
- # Convert the tree model starting from Gtk::TreeIter _iter_ into a Ruby
- # data structure and return it.
- def Editor.model2data(iter)
- return nil if iter.nil?
- case iter.type
- when 'Hash'
- hash = {}
- iter.each { |c| hash[c.content] = Editor.model2data(c.first_child) }
- hash
- when 'Array'
- array = Array.new(iter.n_children)
- iter.each_with_index { |c, i| array[i] = Editor.model2data(c) }
- array
- when 'Key'
- iter.content
- when 'String'
- iter.content
- when 'Numeric'
- content = iter.content
- if /\./.match(content)
- content.to_f
- else
- content.to_i
- end
- when 'TrueClass'
- true
- when 'FalseClass'
- false
- when 'NilClass'
- nil
- else
- fail "Unknown type found in model: #{iter.type}"
- end
- end
-
- # Convert the Ruby data structure _data_ into tree model data for Gtk and
- # returns the whole model. If the parameter _model_ wasn't given a new
- # Gtk::TreeStore is created as the model. The _parent_ parameter specifies
- # the parent node (iter, Gtk:TreeIter instance) to which the data is
- # appended, alternativeley the result of the yielded block is used as iter.
- def Editor.data2model(data, model = nil, parent = nil)
- model ||= TreeStore.new(Gdk::Pixbuf, String, String)
- iter = if block_given?
- yield model
- else
- model.append(parent)
- end
- case data
- when Hash
- iter.type = 'Hash'
- data.sort.each do |key, value|
- pair_iter = model.append(iter)
- pair_iter.type = 'Key'
- pair_iter.content = key.to_s
- Editor.data2model(value, model, pair_iter)
- end
- when Array
- iter.type = 'Array'
- data.each do |value|
- Editor.data2model(value, model, iter)
- end
- when Numeric
- iter.type = 'Numeric'
- iter.content = data.to_s
- when String, true, false, nil
- iter.type = data.class.name
- iter.content = data.nil? ? 'null' : data.to_s
- else
- iter.type = 'String'
- iter.content = data.to_s
- end
- model
- end
-
- # The Gtk::TreeIter class is reopened and some auxiliary methods are added.
- class Gtk::TreeIter
- include Enumerable
-
- # Traverse each of this Gtk::TreeIter instance's children
- # and yield to them.
- def each
- n_children.times { |i| yield nth_child(i) }
- end
-
- # Recursively traverse all nodes of this Gtk::TreeIter's subtree
- # (including self) and yield to them.
- def recursive_each(&block)
- yield self
- each do |i|
- i.recursive_each(&block)
- end
- end
-
- # Remove the subtree of this Gtk::TreeIter instance from the
- # model _model_.
- def remove_subtree(model)
- while current = first_child
- model.remove(current)
- end
- end
-
- # Returns the type of this node.
- def type
- self[TYPE_COL]
- end
-
- # Sets the type of this node to _value_. This implies setting
- # the respective icon accordingly.
- def type=(value)
- self[TYPE_COL] = value
- self[ICON_COL] = Editor.fetch_icon(value)
- end
-
- # Returns the content of this node.
- def content
- self[CONTENT_COL]
- end
-
- # Sets the content of this node to _value_.
- def content=(value)
- self[CONTENT_COL] = value
- end
- end
-
- # This module bundles some method, that can be used to create a menu. It
- # should be included into the class in question.
- module MenuExtension
- include Gtk
-
- # Creates a Menu, that includes MenuExtension. _treeview_ is the
- # Gtk::TreeView, on which it operates.
- def initialize(treeview)
- @treeview = treeview
- @menu = Menu.new
- end
-
- # Returns the Gtk::TreeView of this menu.
- attr_reader :treeview
-
- # Returns the menu.
- attr_reader :menu
-
- # Adds a Gtk::SeparatorMenuItem to this instance's #menu.
- def add_separator
- menu.append SeparatorMenuItem.new
- end
-
- # Adds a Gtk::MenuItem to this instance's #menu. _label_ is the label
- # string, _klass_ is the item type, and _callback_ is the procedure, that
- # is called if the _item_ is activated.
- def add_item(label, keyval = nil, klass = MenuItem, &callback)
- label = "#{label} (C-#{keyval.chr})" if keyval
- item = klass.new(label)
- item.signal_connect(:activate, &callback)
- if keyval
- self.signal_connect(:'key-press-event') do |item, event|
- if event.state & Gdk::Window::ModifierType::CONTROL_MASK != 0 and
- event.keyval == keyval
- callback.call item
- end
- end
- end
- menu.append item
- item
- end
-
- # This method should be implemented in subclasses to create the #menu of
- # this instance. It has to be called after an instance of this class is
- # created, to build the menu.
- def create
- raise NotImplementedError
- end
-
- def method_missing(*a, &b)
- treeview.__send__(*a, &b)
- end
- end
-
- # This class creates the popup menu, that opens when clicking onto the
- # treeview.
- class PopUpMenu
- include MenuExtension
-
- # Change the type or content of the selected node.
- def change_node(item)
- if current = selection.selected
- parent = current.parent
- old_type, old_content = current.type, current.content
- if ALL_TYPES.include?(old_type)
- @clipboard_data = Editor.model2data(current)
- type, content = ask_for_element(parent, current.type,
- current.content)
- if type
- current.type, current.content = type, content
- current.remove_subtree(model)
- toplevel.display_status("Changed a node in tree.")
- window.change
- end
- else
- toplevel.display_status(
- "Cannot change node of type #{old_type} in tree!")
- end
- end
- end
-
- # Cut the selected node and its subtree, and save it into the
- # clipboard.
- def cut_node(item)
- if current = selection.selected
- if current and current.type == 'Key'
- @clipboard_data = {
- current.content => Editor.model2data(current.first_child)
- }
- else
- @clipboard_data = Editor.model2data(current)
- end
- model.remove(current)
- window.change
- toplevel.display_status("Cut a node from tree.")
- end
- end
-
- # Copy the selected node and its subtree, and save it into the
- # clipboard.
- def copy_node(item)
- if current = selection.selected
- if current and current.type == 'Key'
- @clipboard_data = {
- current.content => Editor.model2data(current.first_child)
- }
- else
- @clipboard_data = Editor.model2data(current)
- end
- window.change
- toplevel.display_status("Copied a node from tree.")
- end
- end
-
- # Paste the data in the clipboard into the selected Array or Hash by
- # appending it.
- def paste_node_appending(item)
- if current = selection.selected
- if @clipboard_data
- case current.type
- when 'Array'
- Editor.data2model(@clipboard_data, model, current)
- expand_collapse(current)
- when 'Hash'
- if @clipboard_data.is_a? Hash
- parent = current.parent
- hash = Editor.model2data(current)
- model.remove(current)
- hash.update(@clipboard_data)
- Editor.data2model(hash, model, parent)
- if parent
- expand_collapse(parent)
- elsif @expanded
- expand_all
- end
- window.change
- else
- toplevel.display_status(
- "Cannot paste non-#{current.type} data into '#{current.type}'!")
- end
- else
- toplevel.display_status(
- "Cannot paste node below '#{current.type}'!")
- end
- else
- toplevel.display_status("Nothing to paste in clipboard!")
- end
- else
- toplevel.display_status("Append a node into the root first!")
- end
- end
-
- # Paste the data in the clipboard into the selected Array inserting it
- # before the selected element.
- def paste_node_inserting_before(item)
- if current = selection.selected
- if @clipboard_data
- parent = current.parent or return
- parent_type = parent.type
- if parent_type == 'Array'
- selected_index = parent.each_with_index do |c, i|
- break i if c == current
- end
- Editor.data2model(@clipboard_data, model, parent) do |m|
- m.insert_before(parent, current)
- end
- expand_collapse(current)
- toplevel.display_status("Inserted an element to " +
- "'#{parent_type}' before index #{selected_index}.")
- window.change
- else
- toplevel.display_status(
- "Cannot insert node below '#{parent_type}'!")
- end
- else
- toplevel.display_status("Nothing to paste in clipboard!")
- end
- else
- toplevel.display_status("Append a node into the root first!")
- end
- end
-
- # Append a new node to the selected Hash or Array.
- def append_new_node(item)
- if parent = selection.selected
- parent_type = parent.type
- case parent_type
- when 'Hash'
- key, type, content = ask_for_hash_pair(parent)
- key or return
- iter = create_node(parent, 'Key', key)
- iter = create_node(iter, type, content)
- toplevel.display_status(
- "Added a (key, value)-pair to '#{parent_type}'.")
- window.change
- when 'Array'
- type, content = ask_for_element(parent)
- type or return
- iter = create_node(parent, type, content)
- window.change
- toplevel.display_status("Appendend an element to '#{parent_type}'.")
- else
- toplevel.display_status("Cannot append to '#{parent_type}'!")
- end
- else
- type, content = ask_for_element
- type or return
- iter = create_node(nil, type, content)
- window.change
- end
- end
-
- # Insert a new node into an Array before the selected element.
- def insert_new_node(item)
- if current = selection.selected
- parent = current.parent or return
- parent_parent = parent.parent
- parent_type = parent.type
- if parent_type == 'Array'
- selected_index = parent.each_with_index do |c, i|
- break i if c == current
- end
- type, content = ask_for_element(parent)
- type or return
- iter = model.insert_before(parent, current)
- iter.type, iter.content = type, content
- toplevel.display_status("Inserted an element to " +
- "'#{parent_type}' before index #{selected_index}.")
- window.change
- else
- toplevel.display_status(
- "Cannot insert node below '#{parent_type}'!")
- end
- else
- toplevel.display_status("Append a node into the root first!")
- end
- end
-
- # Recursively collapse/expand a subtree starting from the selected node.
- def collapse_expand(item)
- if current = selection.selected
- if row_expanded?(current.path)
- collapse_row(current.path)
- else
- expand_row(current.path, true)
- end
- else
- toplevel.display_status("Append a node into the root first!")
- end
- end
-
- # Create the menu.
- def create
- add_item("Change node", ?n, &method(:change_node))
- add_separator
- add_item("Cut node", ?X, &method(:cut_node))
- add_item("Copy node", ?C, &method(:copy_node))
- add_item("Paste node (appending)", ?A, &method(:paste_node_appending))
- add_item("Paste node (inserting before)", ?I,
- &method(:paste_node_inserting_before))
- add_separator
- add_item("Append new node", ?a, &method(:append_new_node))
- add_item("Insert new node before", ?i, &method(:insert_new_node))
- add_separator
- add_item("Collapse/Expand node (recursively)", ?e,
- &method(:collapse_expand))
-
- menu.show_all
- signal_connect(:button_press_event) do |widget, event|
- if event.kind_of? Gdk::EventButton and event.button == 3
- menu.popup(nil, nil, event.button, event.time)
- end
- end
- signal_connect(:popup_menu) do
- menu.popup(nil, nil, 0, Gdk::Event::CURRENT_TIME)
- end
- end
- end
-
- # This class creates the File pulldown menu.
- class FileMenu
- include MenuExtension
-
- # Clear the model and filename, but ask to save the JSON document, if
- # unsaved changes have occured.
- def new(item)
- window.clear
- end
-
- # Open a file and load it into the editor. Ask to save the JSON document
- # first, if unsaved changes have occured.
- def open(item)
- window.file_open
- end
-
- def open_location(item)
- window.location_open
- end
-
- # Revert the current JSON document in the editor to the saved version.
- def revert(item)
- window.instance_eval do
- @filename and file_open(@filename)
- end
- end
-
- # Save the current JSON document.
- def save(item)
- window.file_save
- end
-
- # Save the current JSON document under the given filename.
- def save_as(item)
- window.file_save_as
- end
-
- # Quit the editor, after asking to save any unsaved changes first.
- def quit(item)
- window.quit
- end
-
- # Create the menu.
- def create
- title = MenuItem.new('File')
- title.submenu = menu
- add_item('New', &method(:new))
- add_item('Open', ?o, &method(:open))
- add_item('Open location', ?l, &method(:open_location))
- add_item('Revert', &method(:revert))
- add_separator
- add_item('Save', ?s, &method(:save))
- add_item('Save As', ?S, &method(:save_as))
- add_separator
- add_item('Quit', ?q, &method(:quit))
- title
- end
- end
-
- # This class creates the Edit pulldown menu.
- class EditMenu
- include MenuExtension
-
- # Copy data from model into primary clipboard.
- def copy(item)
- data = Editor.model2data(model.iter_first)
- json = JSON.pretty_generate(data, :max_nesting => false)
- c = Gtk::Clipboard.get(Gdk::Selection::PRIMARY)
- c.text = json
- end
-
- # Copy json text from primary clipboard into model.
- def paste(item)
- c = Gtk::Clipboard.get(Gdk::Selection::PRIMARY)
- if json = c.wait_for_text
- window.ask_save if @changed
- begin
- window.edit json
- rescue JSON::ParserError
- window.clear
- end
- end
- end
-
- # Find a string in all nodes' contents and select the found node in the
- # treeview.
- def find(item)
- @search = ask_for_find_term(@search) or return
- iter = model.get_iter('0') or return
- iter.recursive_each do |i|
- if @iter
- if @iter != i
- next
- else
- @iter = nil
- next
- end
- elsif @search.match(i[CONTENT_COL])
- set_cursor(i.path, nil, false)
- @iter = i
- break
- end
- end
- end
-
- # Repeat the last search given by #find.
- def find_again(item)
- @search or return
- iter = model.get_iter('0')
- iter.recursive_each do |i|
- if @iter
- if @iter != i
- next
- else
- @iter = nil
- next
- end
- elsif @search.match(i[CONTENT_COL])
- set_cursor(i.path, nil, false)
- @iter = i
- break
- end
- end
- end
-
- # Sort (Reverse sort) all elements of the selected array by the given
- # expression. _x_ is the element in question.
- def sort(item)
- if current = selection.selected
- if current.type == 'Array'
- parent = current.parent
- ary = Editor.model2data(current)
- order, reverse = ask_for_order
- order or return
- begin
- block = eval "lambda { |x| #{order} }"
- if reverse
- ary.sort! { |a,b| block[b] <=> block[a] }
- else
- ary.sort! { |a,b| block[a] <=> block[b] }
- end
- rescue => e
- Editor.error_dialog(self, "Failed to sort Array with #{order}: #{e}!")
- else
- Editor.data2model(ary, model, parent) do |m|
- m.insert_before(parent, current)
- end
- model.remove(current)
- expand_collapse(parent)
- window.change
- toplevel.display_status("Array has been sorted.")
- end
- else
- toplevel.display_status("Only Array nodes can be sorted!")
- end
- else
- toplevel.display_status("Select an Array to sort first!")
- end
- end
-
- # Create the menu.
- def create
- title = MenuItem.new('Edit')
- title.submenu = menu
- add_item('Copy', ?c, &method(:copy))
- add_item('Paste', ?v, &method(:paste))
- add_separator
- add_item('Find', ?f, &method(:find))
- add_item('Find Again', ?g, &method(:find_again))
- add_separator
- add_item('Sort', ?S, &method(:sort))
- title
- end
- end
-
- class OptionsMenu
- include MenuExtension
-
- # Collapse/Expand all nodes by default.
- def collapsed_nodes(item)
- if expanded
- self.expanded = false
- collapse_all
- else
- self.expanded = true
- expand_all
- end
- end
-
- # Toggle pretty saving mode on/off.
- def pretty_saving(item)
- @pretty_item.toggled
- window.change
- end
-
- attr_reader :pretty_item
-
- # Create the menu.
- def create
- title = MenuItem.new('Options')
- title.submenu = menu
- add_item('Collapsed nodes', nil, CheckMenuItem, &method(:collapsed_nodes))
- @pretty_item = add_item('Pretty saving', nil, CheckMenuItem,
- &method(:pretty_saving))
- @pretty_item.active = true
- window.unchange
- title
- end
- end
-
- # This class inherits from Gtk::TreeView, to configure it and to add a lot
- # of behaviour to it.
- class JSONTreeView < Gtk::TreeView
- include Gtk
-
- # Creates a JSONTreeView instance, the parameter _window_ is
- # a MainWindow instance and used for self delegation.
- def initialize(window)
- @window = window
- super(TreeStore.new(Gdk::Pixbuf, String, String))
- self.selection.mode = SELECTION_BROWSE
-
- @expanded = false
- self.headers_visible = false
- add_columns
- add_popup_menu
- end
-
- # Returns the MainWindow instance of this JSONTreeView.
- attr_reader :window
-
- # Returns true, if nodes are autoexpanding, false otherwise.
- attr_accessor :expanded
-
- private
-
- def add_columns
- cell = CellRendererPixbuf.new
- column = TreeViewColumn.new('Icon', cell,
- 'pixbuf' => ICON_COL
- )
- append_column(column)
-
- cell = CellRendererText.new
- column = TreeViewColumn.new('Type', cell,
- 'text' => TYPE_COL
- )
- append_column(column)
-
- cell = CellRendererText.new
- cell.editable = true
- column = TreeViewColumn.new('Content', cell,
- 'text' => CONTENT_COL
- )
- cell.signal_connect(:edited, &method(:cell_edited))
- append_column(column)
- end
-
- def unify_key(iter, key)
- return unless iter.type == 'Key'
- parent = iter.parent
- if parent.any? { |c| c != iter and c.content == key }
- old_key = key
- i = 0
- begin
- key = sprintf("%s.%d", old_key, i += 1)
- end while parent.any? { |c| c != iter and c.content == key }
- end
- iter.content = key
- end
-
- def cell_edited(cell, path, value)
- iter = model.get_iter(path)
- case iter.type
- when 'Key'
- unify_key(iter, value)
- toplevel.display_status('Key has been changed.')
- when 'FalseClass'
- value.downcase!
- if value == 'true'
- iter.type, iter.content = 'TrueClass', 'true'
- end
- when 'TrueClass'
- value.downcase!
- if value == 'false'
- iter.type, iter.content = 'FalseClass', 'false'
- end
- when 'Numeric'
- iter.content =
- if value == 'Infinity'
- value
- else
- (Integer(value) rescue Float(value) rescue 0).to_s
- end
- when 'String'
- iter.content = value
- when 'Hash', 'Array'
- return
- else
- fail "Unknown type found in model: #{iter.type}"
- end
- window.change
- end
-
- def configure_value(value, type)
- value.editable = false
- case type
- when 'Array', 'Hash'
- value.text = ''
- when 'TrueClass'
- value.text = 'true'
- when 'FalseClass'
- value.text = 'false'
- when 'NilClass'
- value.text = 'null'
- when 'Numeric', 'String'
- value.text ||= ''
- value.editable = true
- else
- raise ArgumentError, "unknown type '#{type}' encountered"
- end
- end
-
- def add_popup_menu
- menu = PopUpMenu.new(self)
- menu.create
- end
-
- public
-
- # Create a _type_ node with content _content_, and add it to _parent_
- # in the model. If _parent_ is nil, create a new model and put it into
- # the editor treeview.
- def create_node(parent, type, content)
- iter = if parent
- model.append(parent)
- else
- new_model = Editor.data2model(nil)
- toplevel.view_new_model(new_model)
- new_model.iter_first
- end
- iter.type, iter.content = type, content
- expand_collapse(parent) if parent
- iter
- end
-
- # Ask for a hash key, value pair to be added to the Hash node _parent_.
- def ask_for_hash_pair(parent)
- key_input = type_input = value_input = nil
-
- dialog = Dialog.new("New (key, value) pair for Hash", nil, nil,
- [ Stock::OK, Dialog::RESPONSE_ACCEPT ],
- [ Stock::CANCEL, Dialog::RESPONSE_REJECT ]
- )
- dialog.width_request = 640
-
- hbox = HBox.new(false, 5)
- hbox.pack_start(Label.new("Key:"), false)
- hbox.pack_start(key_input = Entry.new)
- key_input.text = @key || ''
- dialog.vbox.pack_start(hbox, false)
- key_input.signal_connect(:activate) do
- if parent.any? { |c| c.content == key_input.text }
- toplevel.display_status('Key already exists in Hash!')
- key_input.text = ''
- else
- toplevel.display_status('Key has been changed.')
- end
- end
-
- hbox = HBox.new(false, 5)
- hbox.pack_start(Label.new("Type:"), false)
- hbox.pack_start(type_input = ComboBox.new(true))
- ALL_TYPES.each { |t| type_input.append_text(t) }
- type_input.active = @type || 0
- dialog.vbox.pack_start(hbox, false)
-
- type_input.signal_connect(:changed) do
- value_input.editable = false
- case ALL_TYPES[type_input.active]
- when 'Array', 'Hash'
- value_input.text = ''
- when 'TrueClass'
- value_input.text = 'true'
- when 'FalseClass'
- value_input.text = 'false'
- when 'NilClass'
- value_input.text = 'null'
- else
- value_input.text = ''
- value_input.editable = true
- end
- end
-
- hbox = HBox.new(false, 5)
- hbox.pack_start(Label.new("Value:"), false)
- hbox.pack_start(value_input = Entry.new)
- value_input.width_chars = 60
- value_input.text = @value || ''
- dialog.vbox.pack_start(hbox, false)
-
- dialog.signal_connect(:'key-press-event', &DEFAULT_DIALOG_KEY_PRESS_HANDLER)
- dialog.show_all
- self.focus = dialog
- dialog.run do |response|
- if response == Dialog::RESPONSE_ACCEPT
- @key = key_input.text
- type = ALL_TYPES[@type = type_input.active]
- content = value_input.text
- return @key, type, content
- end
- end
- return
- ensure
- dialog.destroy
- end
-
- # Ask for an element to be appended _parent_.
- def ask_for_element(parent = nil, default_type = nil, value_text = @content)
- type_input = value_input = nil
-
- dialog = Dialog.new(
- "New element into #{parent ? parent.type : 'root'}",
- nil, nil,
- [ Stock::OK, Dialog::RESPONSE_ACCEPT ],
- [ Stock::CANCEL, Dialog::RESPONSE_REJECT ]
- )
- hbox = HBox.new(false, 5)
- hbox.pack_start(Label.new("Type:"), false)
- hbox.pack_start(type_input = ComboBox.new(true))
- default_active = 0
- types = parent ? ALL_TYPES : CONTAINER_TYPES
- types.each_with_index do |t, i|
- type_input.append_text(t)
- if t == default_type
- default_active = i
- end
- end
- type_input.active = default_active
- dialog.vbox.pack_start(hbox, false)
- type_input.signal_connect(:changed) do
- configure_value(value_input, types[type_input.active])
- end
-
- hbox = HBox.new(false, 5)
- hbox.pack_start(Label.new("Value:"), false)
- hbox.pack_start(value_input = Entry.new)
- value_input.width_chars = 60
- value_input.text = value_text if value_text
- configure_value(value_input, types[type_input.active])
-
- dialog.vbox.pack_start(hbox, false)
-
- dialog.signal_connect(:'key-press-event', &DEFAULT_DIALOG_KEY_PRESS_HANDLER)
- dialog.show_all
- self.focus = dialog
- dialog.run do |response|
- if response == Dialog::RESPONSE_ACCEPT
- type = types[type_input.active]
- @content = case type
- when 'Numeric'
- if (t = value_input.text) == 'Infinity'
- 1 / 0.0
- else
- Integer(t) rescue Float(t) rescue 0
- end
- else
- value_input.text
- end.to_s
- return type, @content
- end
- end
- return
- ensure
- dialog.destroy if dialog
- end
-
- # Ask for an order criteria for sorting, using _x_ for the element in
- # question. Returns the order criterium, and true/false for reverse
- # sorting.
- def ask_for_order
- dialog = Dialog.new(
- "Give an order criterium for 'x'.",
- nil, nil,
- [ Stock::OK, Dialog::RESPONSE_ACCEPT ],
- [ Stock::CANCEL, Dialog::RESPONSE_REJECT ]
- )
- hbox = HBox.new(false, 5)
-
- hbox.pack_start(Label.new("Order:"), false)
- hbox.pack_start(order_input = Entry.new)
- order_input.text = @order || 'x'
- order_input.width_chars = 60
-
- hbox.pack_start(reverse_checkbox = CheckButton.new('Reverse'), false)
-
- dialog.vbox.pack_start(hbox, false)
-
- dialog.signal_connect(:'key-press-event', &DEFAULT_DIALOG_KEY_PRESS_HANDLER)
- dialog.show_all
- self.focus = dialog
- dialog.run do |response|
- if response == Dialog::RESPONSE_ACCEPT
- return @order = order_input.text, reverse_checkbox.active?
- end
- end
- return
- ensure
- dialog.destroy if dialog
- end
-
- # Ask for a find term to search for in the tree. Returns the term as a
- # string.
- def ask_for_find_term(search = nil)
- dialog = Dialog.new(
- "Find a node matching regex in tree.",
- nil, nil,
- [ Stock::OK, Dialog::RESPONSE_ACCEPT ],
- [ Stock::CANCEL, Dialog::RESPONSE_REJECT ]
- )
- hbox = HBox.new(false, 5)
-
- hbox.pack_start(Label.new("Regex:"), false)
- hbox.pack_start(regex_input = Entry.new)
- hbox.pack_start(icase_checkbox = CheckButton.new('Icase'), false)
- regex_input.width_chars = 60
- if search
- regex_input.text = search.source
- icase_checkbox.active = search.casefold?
- end
-
- dialog.vbox.pack_start(hbox, false)
-
- dialog.signal_connect(:'key-press-event', &DEFAULT_DIALOG_KEY_PRESS_HANDLER)
- dialog.show_all
- self.focus = dialog
- dialog.run do |response|
- if response == Dialog::RESPONSE_ACCEPT
- begin
- return Regexp.new(regex_input.text, icase_checkbox.active? ? Regexp::IGNORECASE : 0)
- rescue => e
- Editor.error_dialog(self, "Evaluation of regex /#{regex_input.text}/ failed: #{e}!")
- return
- end
- end
- end
- return
- ensure
- dialog.destroy if dialog
- end
-
- # Expand or collapse row pointed to by _iter_ according
- # to the #expanded attribute.
- def expand_collapse(iter)
- if expanded
- expand_row(iter.path, true)
- else
- collapse_row(iter.path)
- end
- end
- end
-
- # The editor main window
- class MainWindow < Gtk::Window
- include Gtk
-
- def initialize(encoding)
- @changed = false
- @encoding = encoding
- super(TOPLEVEL)
- display_title
- set_default_size(800, 600)
- signal_connect(:delete_event) { quit }
-
- vbox = VBox.new(false, 0)
- add(vbox)
- #vbox.border_width = 0
-
- @treeview = JSONTreeView.new(self)
- @treeview.signal_connect(:'cursor-changed') do
- display_status('')
- end
-
- menu_bar = create_menu_bar
- vbox.pack_start(menu_bar, false, false, 0)
-
- sw = ScrolledWindow.new(nil, nil)
- sw.shadow_type = SHADOW_ETCHED_IN
- sw.set_policy(POLICY_AUTOMATIC, POLICY_AUTOMATIC)
- vbox.pack_start(sw, true, true, 0)
- sw.add(@treeview)
-
- @status_bar = Statusbar.new
- vbox.pack_start(@status_bar, false, false, 0)
-
- @filename ||= nil
- if @filename
- data = read_data(@filename)
- view_new_model Editor.data2model(data)
- end
-
- signal_connect(:button_release_event) do |_,event|
- if event.button == 2
- c = Gtk::Clipboard.get(Gdk::Selection::PRIMARY)
- if url = c.wait_for_text
- location_open url
- end
- false
- else
- true
- end
- end
- end
-
- # Creates the menu bar with the pulldown menus and returns it.
- def create_menu_bar
- menu_bar = MenuBar.new
- @file_menu = FileMenu.new(@treeview)
- menu_bar.append @file_menu.create
- @edit_menu = EditMenu.new(@treeview)
- menu_bar.append @edit_menu.create
- @options_menu = OptionsMenu.new(@treeview)
- menu_bar.append @options_menu.create
- menu_bar
- end
-
- # Sets editor status to changed, to indicate that the edited data
- # containts unsaved changes.
- def change
- @changed = true
- display_title
- end
-
- # Sets editor status to unchanged, to indicate that the edited data
- # doesn't containt unsaved changes.
- def unchange
- @changed = false
- display_title
- end
-
- # Puts a new model _model_ into the Gtk::TreeView to be edited.
- def view_new_model(model)
- @treeview.model = model
- @treeview.expanded = true
- @treeview.expand_all
- unchange
- end
-
- # Displays _text_ in the status bar.
- def display_status(text)
- @cid ||= nil
- @status_bar.pop(@cid) if @cid
- @cid = @status_bar.get_context_id('dummy')
- @status_bar.push(@cid, text)
- end
-
- # Opens a dialog, asking, if changes should be saved to a file.
- def ask_save
- if Editor.question_dialog(self,
- "Unsaved changes to JSON model. Save?")
- if @filename
- file_save
- else
- file_save_as
- end
- end
- end
-
- # Quit this editor, that is, leave this editor's main loop.
- def quit
- ask_save if @changed
- if Gtk.main_level > 0
- destroy
- Gtk.main_quit
- end
- nil
- end
-
- # Display the new title according to the editor's current state.
- def display_title
- title = TITLE.dup
- title << ": #@filename" if @filename
- title << " *" if @changed
- self.title = title
- end
-
- # Clear the current model, after asking to save all unsaved changes.
- def clear
- ask_save if @changed
- @filename = nil
- self.view_new_model nil
- end
-
- def check_pretty_printed(json)
- pretty = !!((nl_index = json.index("\n")) && nl_index != json.size - 1)
- @options_menu.pretty_item.active = pretty
- end
- private :check_pretty_printed
-
- # Open the data at the location _uri_, if given. Otherwise open a dialog
- # to ask for the _uri_.
- def location_open(uri = nil)
- uri = ask_for_location unless uri
- uri or return
- ask_save if @changed
- data = load_location(uri) or return
- view_new_model Editor.data2model(data)
- end
-
- # Open the file _filename_ or call the #select_file method to ask for a
- # filename.
- def file_open(filename = nil)
- filename = select_file('Open as a JSON file') unless filename
- data = load_file(filename) or return
- view_new_model Editor.data2model(data)
- end
-
- # Edit the string _json_ in the editor.
- def edit(json)
- if json.respond_to? :read
- json = json.read
- end
- data = parse_json json
- view_new_model Editor.data2model(data)
- end
-
- # Save the current file.
- def file_save
- if @filename
- store_file(@filename)
- else
- file_save_as
- end
- end
-
- # Save the current file as the filename
- def file_save_as
- filename = select_file('Save as a JSON file')
- store_file(filename)
- end
-
- # Store the current JSON document to _path_.
- def store_file(path)
- if path
- data = Editor.model2data(@treeview.model.iter_first)
- File.open(path + '.tmp', 'wb') do |output|
- data or break
- if @options_menu.pretty_item.active?
- output.puts JSON.pretty_generate(data, :max_nesting => false)
- else
- output.write JSON.generate(data, :max_nesting => false)
- end
- end
- File.rename path + '.tmp', path
- @filename = path
- toplevel.display_status("Saved data to '#@filename'.")
- unchange
- end
- rescue SystemCallError => e
- Editor.error_dialog(self, "Failed to store JSON file: #{e}!")
- end
-
- # Load the file named _filename_ into the editor as a JSON document.
- def load_file(filename)
- if filename
- if File.directory?(filename)
- Editor.error_dialog(self, "Try to select a JSON file!")
- nil
- else
- @filename = filename
- if data = read_data(filename)
- toplevel.display_status("Loaded data from '#@filename'.")
- end
- display_title
- data
- end
- end
- end
-
- # Load the data at location _uri_ into the editor as a JSON document.
- def load_location(uri)
- data = read_data(uri) or return
- @filename = nil
- toplevel.display_status("Loaded data from '#{uri}'.")
- display_title
- data
- end
-
- def parse_json(json)
- check_pretty_printed(json)
- if @encoding && !/^utf8$/i.match(@encoding)
- iconverter = Iconv.new('utf8', @encoding)
- json = iconverter.iconv(json)
- end
- JSON::parse(json, :max_nesting => false, :create_additions => false)
- end
- private :parse_json
-
- # Read a JSON document from the file named _filename_, parse it into a
- # ruby data structure, and return the data.
- def read_data(filename)
- open(filename) do |f|
- json = f.read
- return parse_json(json)
- end
- rescue => e
- Editor.error_dialog(self, "Failed to parse JSON file: #{e}!")
- return
- end
-
- # Open a file selecton dialog, displaying _message_, and return the
- # selected filename or nil, if no file was selected.
- def select_file(message)
- filename = nil
- fs = FileSelection.new(message)
- fs.set_modal(true)
- @default_dir = File.join(Dir.pwd, '') unless @default_dir
- fs.set_filename(@default_dir)
- fs.set_transient_for(self)
- fs.signal_connect(:destroy) { Gtk.main_quit }
- fs.ok_button.signal_connect(:clicked) do
- filename = fs.filename
- @default_dir = File.join(File.dirname(filename), '')
- fs.destroy
- Gtk.main_quit
- end
- fs.cancel_button.signal_connect(:clicked) do
- fs.destroy
- Gtk.main_quit
- end
- fs.show_all
- Gtk.main
- filename
- end
-
- # Ask for location URI a to load data from. Returns the URI as a string.
- def ask_for_location
- dialog = Dialog.new(
- "Load data from location...",
- nil, nil,
- [ Stock::OK, Dialog::RESPONSE_ACCEPT ],
- [ Stock::CANCEL, Dialog::RESPONSE_REJECT ]
- )
- hbox = HBox.new(false, 5)
-
- hbox.pack_start(Label.new("Location:"), false)
- hbox.pack_start(location_input = Entry.new)
- location_input.width_chars = 60
- location_input.text = @location || ''
-
- dialog.vbox.pack_start(hbox, false)
-
- dialog.signal_connect(:'key-press-event', &DEFAULT_DIALOG_KEY_PRESS_HANDLER)
- dialog.show_all
- dialog.run do |response|
- if response == Dialog::RESPONSE_ACCEPT
- return @location = location_input.text
- end
- end
- return
- ensure
- dialog.destroy if dialog
- end
- end
-
- class << self
- # Starts a JSON Editor. If a block was given, it yields
- # to the JSON::Editor::MainWindow instance.
- def start(encoding = 'utf8') # :yield: window
- Gtk.init
- @window = Editor::MainWindow.new(encoding)
- @window.icon_list = [ Editor.fetch_icon('json') ]
- yield @window if block_given?
- @window.show_all
- Gtk.main
- end
-
- # Edit the string _json_ with encoding _encoding_ in the editor.
- def edit(json, encoding = 'utf8')
- start(encoding) do |window|
- window.edit json
- end
- end
-
- attr_reader :window
- end
- end
-end
diff --git a/ext/json/lib/json/ext.rb b/ext/json/lib/json/ext.rb
deleted file mode 100644
index 719e56025c..0000000000
--- a/ext/json/lib/json/ext.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-require 'json/common'
-
-module JSON
- # This module holds all the modules/classes that implement JSON's
- # functionality as C extensions.
- module Ext
- require 'json/ext/parser'
- require 'json/ext/generator'
- $DEBUG and warn "Using c extension for JSON."
- JSON.parser = Parser
- JSON.generator = Generator
- end
-
- JSON_LOADED = true
-end
diff --git a/ext/json/lib/json/version.rb b/ext/json/lib/json/version.rb
deleted file mode 100644
index 28bea76b19..0000000000
--- a/ext/json/lib/json/version.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-module JSON
- # JSON version
- VERSION = '1.1.8'
- VERSION_ARRAY = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
- VERSION_MAJOR = VERSION_ARRAY[0] # :nodoc:
- VERSION_MINOR = VERSION_ARRAY[1] # :nodoc:
- VERSION_BUILD = VERSION_ARRAY[2] # :nodoc:
-end
diff --git a/ext/mathn/complex/complex.c b/ext/mathn/complex/complex.c
deleted file mode 100644
index dce494959f..0000000000
--- a/ext/mathn/complex/complex.c
+++ /dev/null
@@ -1,7 +0,0 @@
-extern void nucomp_canonicalization(int);
-
-void
-Init_complex(void)
-{
- nucomp_canonicalization(1);
-}
diff --git a/ext/mathn/complex/extconf.rb b/ext/mathn/complex/extconf.rb
deleted file mode 100644
index d4d14ffcb8..0000000000
--- a/ext/mathn/complex/extconf.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-require "mkmf"
-
-create_makefile "mathn/complex"
diff --git a/ext/mathn/rational/extconf.rb b/ext/mathn/rational/extconf.rb
deleted file mode 100644
index ba76306b7b..0000000000
--- a/ext/mathn/rational/extconf.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-require "mkmf"
-
-create_makefile "mathn/rational"
diff --git a/ext/mathn/rational/rational.c b/ext/mathn/rational/rational.c
deleted file mode 100644
index 2ac5999946..0000000000
--- a/ext/mathn/rational/rational.c
+++ /dev/null
@@ -1,7 +0,0 @@
-extern void nurat_canonicalization(int);
-
-void
-Init_rational(void)
-{
- nurat_canonicalization(1);
-}
diff --git a/ext/nkf/.cvsignore b/ext/nkf/.cvsignore
index 814345ece8..4088712231 100644
--- a/ext/nkf/.cvsignore
+++ b/ext/nkf/.cvsignore
@@ -1,4 +1,3 @@
Makefile
mkmf.log
*.def
-extconf.h
diff --git a/ext/nkf/lib/kconv.rb b/ext/nkf/lib/kconv.rb
index 6230996876..4ffe8d984e 100644
--- a/ext/nkf/lib/kconv.rb
+++ b/ext/nkf/lib/kconv.rb
@@ -18,9 +18,9 @@ module Kconv
#
# Public Constants
#
-
+
#Constant of Encoding
-
+
# Auto-Detect
AUTO = NKF::AUTO
# ISO-2022-JP
@@ -45,18 +45,84 @@ module Kconv
UNKNOWN = NKF::UNKNOWN
#
+ # Private Constants
+ #
+
+ # Revision of kconv.rb
+ REVISION = %q$Revision$
+
+ #Regexp of Encoding
+
+ # Regexp of Shift_JIS string (private constant)
+ RegexpShiftjis = /\A(?:
+ [\x00-\x7f\xa1-\xdf] |
+ [\x81-\x9f\xe0-\xfc][\x40-\x7e\x80-\xfc]
+ )*\z/nx
+
+ # Regexp of EUC-JP string (private constant)
+ RegexpEucjp = /\A(?:
+ [\x00-\x7f] |
+ \x8e [\xa1-\xdf] |
+ \x8f [\xa1-\xfe] [\xa1-\xfe] |
+ [\xa1-\xfe] [\xa1-\xfe]
+ )*\z/nx
+
+ # Regexp of UTF-8 string (private constant)
+ RegexpUtf8 = /\A(?:
+ [\x00-\x7f] |
+ [\xc2-\xdf] [\x80-\xbf] |
+ \xe0 [\xa0-\xbf] [\x80-\xbf] |
+ [\xe1-\xef] [\x80-\xbf] [\x80-\xbf] |
+ \xf0 [\x90-\xbf] [\x80-\xbf] [\x80-\xbf] |
+ [\xf1-\xf3] [\x80-\xbf] [\x80-\xbf] [\x80-\xbf] |
+ \xf4 [\x80-\x8f] [\x80-\xbf] [\x80-\xbf]
+ )*\z/nx
+
+ #
# Public Methods
#
-
+
# call-seq:
- # Kconv.kconv(str, to_enc, from_enc=nil)
+ # Kconv.kconv(str, out_code, in_code = Kconv::AUTO)
#
# Convert <code>str</code> to out_code.
# <code>out_code</code> and <code>in_code</code> are given as constants of Kconv.
- def kconv(str, to_enc, from_enc=nil)
- opt = ''
- opt += ' --ic=' + from_enc.to_s if from_enc
- opt += ' --oc=' + to_enc.to_s if to_enc
+ #
+ # *Note*
+ # This method decode MIME encoded string and
+ # convert halfwidth katakana to fullwidth katakana.
+ # If you don't want to decode them, use NKF.nkf.
+ def kconv(str, out_code, in_code = AUTO)
+ opt = '-'
+ case in_code
+ when ::NKF::JIS
+ opt << 'J'
+ when ::NKF::EUC
+ opt << 'E'
+ when ::NKF::SJIS
+ opt << 'S'
+ when ::NKF::UTF8
+ opt << 'W'
+ when ::NKF::UTF16
+ opt << 'W16'
+ end
+
+ case out_code
+ when ::NKF::JIS
+ opt << 'j'
+ when ::NKF::EUC
+ opt << 'e'
+ when ::NKF::SJIS
+ opt << 's'
+ when ::NKF::UTF8
+ opt << 'w'
+ when ::NKF::UTF16
+ opt << 'w16'
+ when ::NKF::NOCONV
+ return str
+ end
+
+ opt = '' if opt == '-'
::NKF::nkf(opt, str)
end
@@ -67,216 +133,235 @@ module Kconv
#
# call-seq:
- # Kconv.tojis(str) => string
+ # Kconv.tojis(str) -> string
#
# Convert <code>str</code> to ISO-2022-JP
+ #
+ # *Note*
+ # This method decode MIME encoded string and
+ # convert halfwidth katakana to fullwidth katakana.
+ # If you don't want it, use NKF.nkf('-jxm0', str).
def tojis(str)
- kconv(str, JIS)
+ ::NKF::nkf('-jm', str)
end
module_function :tojis
# call-seq:
- # Kconv.toeuc(str) => string
+ # Kconv.toeuc(str) -> string
#
# Convert <code>str</code> to EUC-JP
+ #
+ # *Note*
+ # This method decode MIME encoded string and
+ # convert halfwidth katakana to fullwidth katakana.
+ # If you don't want it, use NKF.nkf('-exm0', str).
def toeuc(str)
- kconv(str, EUC)
+ ::NKF::nkf('-em', str)
end
module_function :toeuc
# call-seq:
- # Kconv.tosjis(str) => string
+ # Kconv.tosjis(str) -> string
#
# Convert <code>str</code> to Shift_JIS
+ #
+ # *Note*
+ # This method decode MIME encoded string and
+ # convert halfwidth katakana to fullwidth katakana.
+ # If you don't want it, use NKF.nkf('-sxm0', str).
def tosjis(str)
- kconv(str, SJIS)
+ ::NKF::nkf('-sm', str)
end
module_function :tosjis
# call-seq:
- # Kconv.toutf8(str) => string
+ # Kconv.toutf8(str) -> string
#
# Convert <code>str</code> to UTF-8
+ #
+ # *Note*
+ # This method decode MIME encoded string and
+ # convert halfwidth katakana to fullwidth katakana.
+ # If you don't want it, use NKF.nkf('-wxm0', str).
def toutf8(str)
- kconv(str, UTF8)
+ ::NKF::nkf('-wm', str)
end
module_function :toutf8
# call-seq:
- # Kconv.toutf16(str) => string
+ # Kconv.toutf16(str) -> string
#
# Convert <code>str</code> to UTF-16
+ #
+ # *Note*
+ # This method decode MIME encoded string and
+ # convert halfwidth katakana to fullwidth katakana.
+ # If you don't want it, use NKF.nkf('-w16xm0', str).
def toutf16(str)
- kconv(str, UTF16)
+ ::NKF::nkf('-w16m', str)
end
module_function :toutf16
- # call-seq:
- # Kconv.toutf32(str) => string
- #
- # Convert <code>str</code> to UTF-32
- def toutf32(str)
- kconv(str, UTF32)
- end
- module_function :toutf32
-
- # call-seq:
- # Kconv.tolocale => string
- #
- # Convert <code>self</code> to locale encoding
- def tolocale(str)
- kconv(str, Encoding.locale_charmap)
- end
- module_function :tolocale
-
#
# guess
#
# call-seq:
- # Kconv.guess(str) => encoding
+ # Kconv.guess(str) -> integer
#
- # Guess input encoding by NKF.guess
+ # Guess input encoding by NKF.guess2
def guess(str)
::NKF::guess(str)
end
module_function :guess
+ # call-seq:
+ # Kconv.guess_old(str) -> integer
+ #
+ # Guess input encoding by NKF.guess1
+ def guess_old(str)
+ ::NKF::guess1(str)
+ end
+ module_function :guess_old
+
#
# isEncoding
#
# call-seq:
- # Kconv.iseuc(str) => true or false
+ # Kconv.iseuc(str) -> obj or nil
#
# Returns whether input encoding is EUC-JP or not.
#
# *Note* don't expect this return value is MatchData.
def iseuc(str)
- str.dup.force_encoding(EUC).valid_encoding?
+ RegexpEucjp.match( str )
end
module_function :iseuc
# call-seq:
- # Kconv.issjis(str) => true or false
+ # Kconv.issjis(str) -> obj or nil
#
# Returns whether input encoding is Shift_JIS or not.
+ #
+ # *Note* don't expect this return value is MatchData.
def issjis(str)
- str.dup.force_encoding(SJIS).valid_encoding?
+ RegexpShiftjis.match( str )
end
module_function :issjis
# call-seq:
- # Kconv.isjis(str) => true or false
- #
- # Returns whether input encoding is ISO-2022-JP or not.
- def isjis(str)
- /\A [\t\n\r\x20-\x7E]*
- (?:
- (?:\x1b \x28 I [\x21-\x7E]*
- |\x1b \x28 J [\x21-\x7E]*
- |\x1b \x24 @ (?:[\x21-\x7E]{2})*
- |\x1b \x24 B (?:[\x21-\x7E]{2})*
- |\x1b \x24 \x28 D (?:[\x21-\x7E]{2})*
- )*
- \x1b \x28 B [\t\n\r\x20-\x7E]*
- )*
- \z/nox =~ str.dup.force_encoding('BINARY') ? true : false
- end
- module_function :isjis
-
- # call-seq:
- # Kconv.isutf8(str) => true or false
+ # Kconv.isutf8(str) -> obj or nil
#
# Returns whether input encoding is UTF-8 or not.
+ #
+ # *Note* don't expect this return value is MatchData.
def isutf8(str)
- str.dup.force_encoding(UTF8).valid_encoding?
+ RegexpUtf8.match( str )
end
module_function :isutf8
+
end
class String
# call-seq:
- # String#kconv(to_enc, from_enc)
+ # String#kconv(out_code, in_code = Kconv::AUTO)
#
# Convert <code>self</code> to out_code.
# <code>out_code</code> and <code>in_code</code> are given as constants of Kconv.
- def kconv(to_enc, from_enc=nil)
- form_enc = self.encoding if !from_enc && self.encoding != Encoding.list[0]
- Kconv::kconv(self, to_enc, from_enc)
+ #
+ # *Note*
+ # This method decode MIME encoded string and
+ # convert halfwidth katakana to fullwidth katakana.
+ # If you don't want to decode them, use NKF.nkf.
+ def kconv(out_code, in_code=Kconv::AUTO)
+ Kconv::kconv(self, out_code, in_code)
end
-
+
#
# to Encoding
#
-
+
# call-seq:
- # String#tojis => string
+ # String#tojis -> string
#
# Convert <code>self</code> to ISO-2022-JP
+ #
+ # *Note*
+ # This method decode MIME encoded string and
+ # convert halfwidth katakana to fullwidth katakana.
+ # If you don't want it, use NKF.nkf('-jxm0', str).
def tojis; Kconv.tojis(self) end
# call-seq:
- # String#toeuc => string
+ # String#toeuc -> string
#
# Convert <code>self</code> to EUC-JP
+ #
+ # *Note*
+ # This method decode MIME encoded string and
+ # convert halfwidth katakana to fullwidth katakana.
+ # If you don't want it, use NKF.nkf('-exm0', str).
def toeuc; Kconv.toeuc(self) end
# call-seq:
- # String#tosjis => string
+ # String#tosjis -> string
#
# Convert <code>self</code> to Shift_JIS
+ #
+ # *Note*
+ # This method decode MIME encoded string and
+ # convert halfwidth katakana to fullwidth katakana.
+ # If you don't want it, use NKF.nkf('-sxm0', str).
def tosjis; Kconv.tosjis(self) end
# call-seq:
- # String#toutf8 => string
+ # String#toutf8 -> string
#
# Convert <code>self</code> to UTF-8
+ #
+ # *Note*
+ # This method decode MIME encoded string and
+ # convert halfwidth katakana to fullwidth katakana.
+ # If you don't want it, use NKF.nkf('-wxm0', str).
def toutf8; Kconv.toutf8(self) end
# call-seq:
- # String#toutf16 => string
+ # String#toutf16 -> string
#
# Convert <code>self</code> to UTF-16
- def toutf16; Kconv.toutf16(self) end
-
- # call-seq:
- # String#toutf32 => string
#
- # Convert <code>self</code> to UTF-32
- def toutf32; Kconv.toutf32(self) end
-
- # call-seq:
- # String#tolocale => string
- #
- # Convert <code>self</code> to locale encoding
- def tolocale; Kconv.tolocale(self) end
+ # *Note*
+ # This method decode MIME encoded string and
+ # convert halfwidth katakana to fullwidth katakana.
+ # If you don't want it, use NKF.nkf('-w16xm0', str).
+ def toutf16; Kconv.toutf16(self) end
#
# is Encoding
#
# call-seq:
- # String#iseuc => true or false
+ # String#iseuc -> obj or nil
#
# Returns whether <code>self</code>'s encoding is EUC-JP or not.
+ #
+ # *Note* don't expect this return value is MatchData.
def iseuc; Kconv.iseuc(self) end
# call-seq:
- # String#issjis => true or false
+ # String#issjis -> obj or nil
#
# Returns whether <code>self</code>'s encoding is Shift_JIS or not.
- def issjis; Kconv.issjis(self) end
-
- # call-seq:
- # String#isjis => true or false
#
- # Returns whether <code>self</code>'s encoding is ISO-2022-JP or not.
- def isjis; Kconv.isjis(self) end
+ # *Note* don't expect this return value is MatchData.
+ def issjis; Kconv.issjis(self) end
# call-seq:
- # String#isutf8 => true or false
+ # String#isutf8 -> obj or nil
#
# Returns whether <code>self</code>'s encoding is UTF-8 or not.
+ #
+ # *Note* don't expect this return value is MatchData.
def isutf8; Kconv.isutf8(self) end
end
diff --git a/ext/nkf/nkf-utf8/config.h b/ext/nkf/nkf-utf8/config.h
index 752ed38d59..9da82c6aee 100644
--- a/ext/nkf/nkf-utf8/config.h
+++ b/ext/nkf/nkf-utf8/config.h
@@ -1,51 +1,88 @@
#ifndef _CONFIG_H_
#define _CONFIG_H_
-/* UTF8 input and output */
+/* UTF8 $BF~=PNO(B */
#define UTF8_INPUT_ENABLE
#define UTF8_OUTPUT_ENABLE
-/* invert characters invalid in Shift_JIS to CP932 */
+/* Shift_JIS $BHO0O30$NJ8;z$r!"(BCP932 $B$GF1CM$JJ8;z$KFI$_49$($k(B */
#define SHIFTJIS_CP932
-/* fix input encoding when given by option */
+/* $B%*%W%7%g%s$GF~NO$r;XDj$7$?;~$K!"J8;z%3!<%I$r8GDj$9$k(B */
#define INPUT_CODE_FIX
-/* --overwrite option */
+/* --overwrite $B%*%W%7%g%s(B */
/* by Satoru Takabayashi <ccsatoru@vega.aichi-u.ac.jp> */
#define OVERWRITE
-/* --cap-input, --url-input option */
+/* --cap-input, --url-input $B%*%W%7%g%s(B */
#define INPUT_OPTION
-/* --numchar-input option */
+/* --numchar-input $B%*%W%7%g%s(B */
#define NUMCHAR_OPTION
-/* --debug, --no-output option */
+/* --debug, --no-output $B%*%W%7%g%s(B */
#define CHECK_OPTION
/* JIS X0212 */
#define X0212_ENABLE
-/* --exec-in, --exec-out option
- * require pipe, fork, execvp and so on.
- * please undef this on MS-DOS, MinGW
- * this is still buggy arround child process
+/* --exec-in, --exec-out $B%*%W%7%g%s(B
+ * pipe, fork, execvp $B$"$?$j$,L5$$$HF0$-$^$;$s!#(B
+ * MS-DOS, MinGW $B$J$I$G$O(B undef $B$K$7$F$/$@$5$$(B
+ * child process $B=*N;;~$N=hM}$,$$$$$+$2$s$J$N$G!"(B
+ * $B%G%U%)%k%H$GL58z$K$7$F$$$^$9!#(B
*/
/* #define EXEC_IO */
+/* SunOS $B$N(B cc $B$r;H$&$H$-$O(B undef $B$K$7$F$/$@$5$$(B */
+#define ANSI_C_PROTOTYPE
+
+/* int $B$,(B 32bit $BL$K~$N4D6-$G(B NUMCHAR_OPTION $B$r;H$&$K$O!"(B
+ * $B%3%a%s%H$r30$7$F$/$@$5$$!#(B
+ */
+/* #define INT_IS_SHORT */
+
+
+#if defined(INT_IS_SHORT)
+typedef long nkf_char;
+typedef unsigned char nkf_nfchar;
+#else
+typedef int nkf_char;
+typedef int nkf_nfchar;
+#endif
+
/* Unicode Normalization */
#define UNICODE_NORMALIZATION
-/*
- * Select Default Output Encoding
- *
- */
+#ifndef WIN32DLL
+/******************************/
+/* $B%G%U%)%k%H$N=PNO%3!<%IA*Br(B */
+/* Select DEFAULT_CODE */
+#define DEFAULT_CODE_JIS
+/* #define DEFAULT_CODE_SJIS */
+/* #define DEFAULT_CODE_EUC */
+/* #define DEFAULT_CODE_UTF8 */
+/******************************/
+#else
+#define DEFAULT_CODE_SJIS
+#endif
+
+#if defined(NUMCHAR_OPTION) && !defined(UTF8_INPUT_ENABLE)
+#define UTF8_INPUT_ENABLE
+#endif
-/* #define DEFAULT_CODE_JIS */
-/* #define DEFAULT_CODE_SJIS */
-/* #define DEFAULT_CODE_WINDOWS_31J */
-/* #define DEFAULT_CODE_EUC */
-/* #define DEFAULT_CODE_UTF8 */
+#ifdef UNICODE_NORMALIZATION
+#ifndef UTF8_INPUT_ENABLE
+#define UTF8_INPUT_ENABLE
+#endif
+#define NORMALIZATION_TABLE_LENGTH 942
+#define NORMALIZATION_TABLE_NFC_LENGTH 3
+#define NORMALIZATION_TABLE_NFD_LENGTH 9
+struct normalization_pair{
+ const nkf_nfchar nfc[NORMALIZATION_TABLE_NFC_LENGTH];
+ const nkf_nfchar nfd[NORMALIZATION_TABLE_NFD_LENGTH];
+};
+#endif
#endif /* _CONFIG_H_ */
diff --git a/ext/nkf/nkf-utf8/nkf.c b/ext/nkf/nkf-utf8/nkf.c
index da1c766b4a..3cd1b160da 100644
--- a/ext/nkf/nkf-utf8/nkf.c
+++ b/ext/nkf/nkf-utf8/nkf.c
@@ -1,301 +1,290 @@
-/*
- * Copyright (c) 1987, Fujitsu LTD. (Itaru ICHIKAWA).
- * Copyright (c) 1996-2009, The nkf Project.
- *
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- *
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- *
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- *
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- *
- * 3. This notice may not be removed or altered from any source distribution.
- */
-#define NKF_VERSION "2.0.9"
-#define NKF_RELEASE_DATE "2009-01-20"
-#define COPY_RIGHT \
- "Copyright (C) 1987, FUJITSU LTD. (I.Ichikawa).\n" \
- "Copyright (C) 1996-2009, The nkf Project."
-
+/** Network Kanji Filter. (PDS Version)
+************************************************************************
+** Copyright (C) 1987, Fujitsu LTD. (Itaru ICHIKAWA)
+** $BO"Mm@h!'(B $B!J3t!KIY;NDL8&5f=j!!%=%U%H#38&!!;T@n!!;j(B
+** $B!J(BE-Mail Address: ichikawa@flab.fujitsu.co.jp$B!K(B
+** Copyright (C) 1996,1998
+** Copyright (C) 2002
+** $BO"Mm@h!'(B $BN05eBg3X>pJs9)3X2J(B $B2OLn(B $B??<#(B mime/X0208 support
+** $B!J(BE-Mail Address: kono@ie.u-ryukyu.ac.jp$B!K(B
+** $BO"Mm@h!'(B COW for DOS & Win16 & Win32 & OS/2
+** $B!J(BE-Mail Address: GHG00637@niftyserve.or.p$B!K(B
+**
+** $B$3$N%=!<%9$N$$$+$J$kJ#<L!$2~JQ!$=$@5$b5vBz$7$^$9!#$?$@$7!"(B
+** $B$=$N:]$K$O!"C/$,9W8%$7$?$r<($9$3$NItJ,$r;D$9$3$H!#(B
+** $B:FG[I[$d;(;o$NIUO?$J$I$NLd$$9g$o$;$bI,MW$"$j$^$;$s!#(B
+** $B1DMxMxMQ$b>e5-$KH?$7$J$$HO0O$G5v2D$7$^$9!#(B
+** $B%P%$%J%j$NG[I[$N:]$K$O(Bversion message$B$rJ]B8$9$k$3$H$r>r7o$H$7$^$9!#(B
+** $B$3$N%W%m%0%i%`$K$D$$$F$OFC$K2?$NJ]>Z$b$7$J$$!"0-$7$+$i$:!#(B
+**
+** Everyone is permitted to do anything on this program
+** including copying, modifying, improving,
+** as long as you don't try to pretend that you wrote it.
+** i.e., the above copyright notice has to appear in all copies.
+** Binary distribution requires original version messages.
+** You don't have to ask before copying, redistribution or publishing.
+** THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE.
+***********************************************************************/
+
+/***********************************************************************
+** UTF-8 $B%5%]!<%H$K$D$$$F(B
+** $B=>Mh$N(B nkf $B$HF~$l$+$($F$=$N$^$^;H$($k$h$&$K$J$C$F$$$^$9(B
+** nkf -e $B$J$I$H$7$F5/F0$9$k$H!"<+F0H=JL$G(B UTF-8 $B$HH=Dj$5$l$l$P!"(B
+** $B$=$N$^$^(B euc-jp $B$KJQ49$5$l$^$9(B
+**
+** $B$^$@%P%0$,$"$k2DG=@-$,9b$$$G$9!#(B
+** ($BFC$K<+F0H=JL!"%3!<%I:.:_!"%(%i!<=hM}7O(B)
+**
+** $B2?$+LdBj$r8+$D$1$?$i!"(B
+** E-Mail: furukawa@tcp-ip.or.jp
+** $B$^$G8fO"Mm$r$*4j$$$7$^$9!#(B
+***********************************************************************/
+/* $Id$ */
+#define NKF_VERSION "2.0.8"
+#define NKF_RELEASE_DATE "2007-01-28"
#include "config.h"
-#include "nkf.h"
#include "utf8tbl.h"
-#ifdef __WIN32__
+
+#define COPY_RIGHT \
+ "Copyright (C) 1987, FUJITSU LTD. (I.Ichikawa),2000 S. Kono, COW\n" \
+ "Copyright (C) 2002-2006 Kono, Furukawa, Naruse, mastodon"
+
+
+/*
+**
+**
+**
+** USAGE: nkf [flags] [file]
+**
+** Flags:
+** b Output is buffered (DEFAULT)
+** u Output is unbuffered
+**
+** t no operation
+**
+** j Output code is JIS 7 bit (DEFAULT SELECT)
+** s Output code is MS Kanji (DEFAULT SELECT)
+** e Output code is AT&T JIS (DEFAULT SELECT)
+** w Output code is AT&T JIS (DEFAULT SELECT)
+** l Output code is JIS 7bit and ISO8859-1 Latin-1
+**
+** m MIME conversion for ISO-2022-JP
+** I Convert non ISO-2022-JP charactor to GETA by Pekoe <pekoe@lair.net>
+** i_ Output sequence to designate JIS-kanji (DEFAULT_J)
+** o_ Output sequence to designate single-byte roman characters (DEFAULT_R)
+** M MIME output conversion
+**
+** r {de/en}crypt ROT13/47
+**
+** v display Version
+**
+** T Text mode output (for MS-DOS)
+**
+** x Do not convert X0201 kana into X0208
+** Z Convert X0208 alphabet to ASCII
+**
+** f60 fold option
+**
+** m MIME decode
+** B try to fix broken JIS, missing Escape
+** B[1-9] broken level
+**
+** O Output to 'nkf.out' file or last file name
+** d Delete \r in line feed
+** c Add \r in line feed
+** -- other long option
+** -- ignore following option (don't use with -O )
+**
+**/
+
+#if (defined(__TURBOC__) || defined(_MSC_VER) || defined(LSI_C) || defined(__MINGW32__) || defined(__EMX__) || defined(__MSDOS__) || defined(__WINDOWS__) || defined(__DOS__) || defined(__OS2__)) && !defined(MSDOS)
+#define MSDOS
+#if (defined(__Win32__) || defined(_WIN32)) && !defined(__WIN32__)
+#define __WIN32__
+#endif
+#endif
+
+#ifdef PERL_XS
+#undef OVERWRITE
+#endif
+
+#ifndef PERL_XS
+#include <stdio.h>
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+
+#if defined(MSDOS) || defined(__OS2__)
+#include <fcntl.h>
+#include <io.h>
+#if defined(_MSC_VER) || defined(__WATCOMC__)
+#define mktemp _mktemp
+#endif
+#endif
+
+#ifdef MSDOS
+#ifdef LSI_C
+#define setbinmode(fp) fsetbin(fp)
+#elif defined(__DJGPP__)
+#include <libc/dosio.h>
+#define setbinmode(fp) djgpp_setbinmode(fp)
+#else /* Microsoft C, Turbo C */
+#define setbinmode(fp) setmode(fileno(fp), O_BINARY)
+#endif
+#else /* UNIX */
+#define setbinmode(fp)
+#endif
+
+#if defined(__DJGPP__)
+void djgpp_setbinmode(FILE *fp)
+{
+ /* we do not use libc's setmode(), which changes COOKED/RAW mode in device. */
+ int fd, m;
+ fd = fileno(fp);
+ m = (__file_handle_modes[fd] & (~O_TEXT)) | O_BINARY;
+ __file_handle_set(fd, m);
+}
+#endif
+
+#ifdef _IOFBF /* SysV and MSDOS, Windows */
+#define setvbuffer(fp, buf, size) setvbuf(fp, buf, _IOFBF, size)
+#else /* BSD */
+#define setvbuffer(fp, buf, size) setbuffer(fp, buf, size)
+#endif
+
+/*Borland C++ 4.5 EasyWin*/
+#if defined(__TURBOC__) && defined(_Windows) && !defined(__WIN32__) /*Easy Win */
+#define EASYWIN
+#ifndef __WIN16__
+#define __WIN16__
+#endif
#include <windows.h>
-#include <locale.h>
#endif
-#if defined(__OS2__)
-# define INCL_DOS
-# define INCL_DOSERRORS
-# include <os2.h>
+
+#ifdef OVERWRITE
+/* added by satoru@isoternet.org */
+#if defined(__EMX__)
+#include <sys/types.h>
+#endif
+#include <sys/stat.h>
+#if !defined(MSDOS) || defined(__DJGPP__) /* UNIX, djgpp */
+#include <unistd.h>
+#if defined(__WATCOMC__)
+#include <sys/utime.h>
+#else
+#include <utime.h>
+#endif
+#else /* defined(MSDOS) */
+#ifdef __WIN32__
+#ifdef __BORLANDC__ /* BCC32 */
+#include <utime.h>
+#else /* !defined(__BORLANDC__) */
+#include <sys/utime.h>
+#endif /* (__BORLANDC__) */
+#else /* !defined(__WIN32__) */
+#if defined(_MSC_VER) || defined(__MINGW32__) || defined(__WATCOMC__) || defined(__OS2__) || defined(__EMX__) || defined(__IBMC__) || defined(__IBMCPP__) /* VC++, MinGW, Watcom, emx+gcc, IBM VAC++ */
+#include <sys/utime.h>
+#elif defined(__TURBOC__) /* BCC */
+#include <utime.h>
+#elif defined(LSI_C) /* LSI C */
+#endif /* (__WIN32__) */
+#endif
+#endif
#endif
-#include <assert.h>
+#define FALSE 0
+#define TRUE 1
-/* state of output_mode and input_mode
+/* state of output_mode and input_mode
c2 0 means ASCII
- JIS_X_0201_1976_K
- ISO_8859_1
- JIS_X_0208
- EOF all termination
+ X0201
+ ISO8859_1
+ X0208
+ EOF all termination
c1 32bit data
*/
-/* MIME ENCODE */
-
+#define ASCII 0
+#define X0208 1
+#define X0201 2
+#define ISO8859_1 8
+#define NO_X0201 3
+#define X0212 0x2844
+#define X0213_1 0x284F
+#define X0213_2 0x2850
+
+/* Input Assumption */
+
+#define JIS_INPUT 4
+#define EUC_INPUT 16
+#define SJIS_INPUT 5
+#define LATIN1_INPUT 6
#define FIXED_MIME 7
#define STRICT_MIME 8
+/* MIME ENCODE */
+
+#define ISO2022JP 9
+#define JAPANESE_EUC 10
+#define SHIFT_JIS 11
+
+#define UTF8 12
+#define UTF8_INPUT 13
+#define UTF16_INPUT 1015
+#define UTF32_INPUT 1017
+
/* byte order */
-enum byte_order {
- ENDIAN_BIG = 1,
- ENDIAN_LITTLE = 2,
- ENDIAN_2143 = 3,
- ENDIAN_3412 = 4
-};
+
+#define ENDIAN_BIG 1234
+#define ENDIAN_LITTLE 4321
+#define ENDIAN_2143 2143
+#define ENDIAN_3412 3412
+
+#define WISH_TRUE 15
/* ASCII CODE */
#define BS 0x08
#define TAB 0x09
-#define LF 0x0a
+#define NL 0x0a
#define CR 0x0d
#define ESC 0x1b
-#define SP 0x20
+#define SPACE 0x20
+#define AT 0x40
+#define SSP 0xa0
#define DEL 0x7f
#define SI 0x0f
#define SO 0x0e
-#define SS2 0x8e
+#define SSO 0x8e
#define SS3 0x8f
-#define CRLF 0x0D0A
-
-
-/* encodings */
-
-enum nkf_encodings {
- ASCII,
- ISO_8859_1,
- ISO_2022_JP,
- CP50220,
- CP50221,
- CP50222,
- ISO_2022_JP_1,
- ISO_2022_JP_3,
- ISO_2022_JP_2004,
- SHIFT_JIS,
- WINDOWS_31J,
- CP10001,
- EUC_JP,
- EUCJP_NKF,
- CP51932,
- EUCJP_MS,
- EUCJP_ASCII,
- SHIFT_JISX0213,
- SHIFT_JIS_2004,
- EUC_JISX0213,
- EUC_JIS_2004,
- UTF_8,
- UTF_8N,
- UTF_8_BOM,
- UTF8_MAC,
- UTF_16,
- UTF_16BE,
- UTF_16BE_BOM,
- UTF_16LE,
- UTF_16LE_BOM,
- UTF_32,
- UTF_32BE,
- UTF_32BE_BOM,
- UTF_32LE,
- UTF_32LE_BOM,
- BINARY,
- NKF_ENCODING_TABLE_SIZE,
- JIS_X_0201_1976_K = 0x1013, /* I */ /* JIS C 6220-1969 */
- /* JIS_X_0201_1976_R = 0x1014, */ /* J */ /* JIS C 6220-1969 */
- /* JIS_X_0208_1978 = 0x1040, */ /* @ */ /* JIS C 6226-1978 */
- /* JIS_X_0208_1983 = 0x1087, */ /* B */ /* JIS C 6226-1983 */
- JIS_X_0208 = 0x1168, /* @B */
- JIS_X_0212 = 0x1159, /* D */
- /* JIS_X_0213_2000_1 = 0x1228, */ /* O */
- JIS_X_0213_2 = 0x1229, /* P */
- JIS_X_0213_1 = 0x1233 /* Q */
-};
-
-static nkf_char s_iconv(nkf_char c2, nkf_char c1, nkf_char c0);
-static nkf_char e_iconv(nkf_char c2, nkf_char c1, nkf_char c0);
-static nkf_char w_iconv(nkf_char c2, nkf_char c1, nkf_char c0);
-static nkf_char w_iconv16(nkf_char c2, nkf_char c1, nkf_char c0);
-static nkf_char w_iconv32(nkf_char c2, nkf_char c1, nkf_char c0);
-static void j_oconv(nkf_char c2, nkf_char c1);
-static void s_oconv(nkf_char c2, nkf_char c1);
-static void e_oconv(nkf_char c2, nkf_char c1);
-static void w_oconv(nkf_char c2, nkf_char c1);
-static void w_oconv16(nkf_char c2, nkf_char c1);
-static void w_oconv32(nkf_char c2, nkf_char c1);
-
-typedef struct {
- const char *name;
- nkf_char (*iconv)(nkf_char c2, nkf_char c1, nkf_char c0);
- void (*oconv)(nkf_char c2, nkf_char c1);
-} nkf_native_encoding;
-
-nkf_native_encoding NkfEncodingASCII = { "ASCII", e_iconv, e_oconv };
-nkf_native_encoding NkfEncodingISO_2022_JP = { "ISO-2022-JP", e_iconv, j_oconv };
-nkf_native_encoding NkfEncodingShift_JIS = { "Shift_JIS", s_iconv, s_oconv };
-nkf_native_encoding NkfEncodingEUC_JP = { "EUC-JP", e_iconv, e_oconv };
-nkf_native_encoding NkfEncodingUTF_8 = { "UTF-8", w_iconv, w_oconv };
-nkf_native_encoding NkfEncodingUTF_16 = { "UTF-16", w_iconv16, w_oconv16 };
-nkf_native_encoding NkfEncodingUTF_32 = { "UTF-32", w_iconv32, w_oconv32 };
-
-typedef struct {
- const int id;
- const char *name;
- const nkf_native_encoding *base_encoding;
-} nkf_encoding;
-
-nkf_encoding nkf_encoding_table[] = {
- {ASCII, "US-ASCII", &NkfEncodingASCII},
- {ISO_8859_1, "ISO-8859-1", &NkfEncodingASCII},
- {ISO_2022_JP, "ISO-2022-JP", &NkfEncodingISO_2022_JP},
- {CP50220, "CP50220", &NkfEncodingISO_2022_JP},
- {CP50221, "CP50221", &NkfEncodingISO_2022_JP},
- {CP50222, "CP50222", &NkfEncodingISO_2022_JP},
- {ISO_2022_JP_1, "ISO-2022-JP-1", &NkfEncodingISO_2022_JP},
- {ISO_2022_JP_3, "ISO-2022-JP-3", &NkfEncodingISO_2022_JP},
- {ISO_2022_JP_2004, "ISO-2022-JP-2004", &NkfEncodingISO_2022_JP},
- {SHIFT_JIS, "Shift_JIS", &NkfEncodingShift_JIS},
- {WINDOWS_31J, "Windows-31J", &NkfEncodingShift_JIS},
- {CP10001, "CP10001", &NkfEncodingShift_JIS},
- {EUC_JP, "EUC-JP", &NkfEncodingEUC_JP},
- {EUCJP_NKF, "eucJP-nkf", &NkfEncodingEUC_JP},
- {CP51932, "CP51932", &NkfEncodingEUC_JP},
- {EUCJP_MS, "eucJP-MS", &NkfEncodingEUC_JP},
- {EUCJP_ASCII, "eucJP-ASCII", &NkfEncodingEUC_JP},
- {SHIFT_JISX0213, "Shift_JISX0213", &NkfEncodingShift_JIS},
- {SHIFT_JIS_2004, "Shift_JIS-2004", &NkfEncodingShift_JIS},
- {EUC_JISX0213, "EUC-JISX0213", &NkfEncodingEUC_JP},
- {EUC_JIS_2004, "EUC-JIS-2004", &NkfEncodingEUC_JP},
- {UTF_8, "UTF-8", &NkfEncodingUTF_8},
- {UTF_8N, "UTF-8N", &NkfEncodingUTF_8},
- {UTF_8_BOM, "UTF-8-BOM", &NkfEncodingUTF_8},
- {UTF8_MAC, "UTF8-MAC", &NkfEncodingUTF_8},
- {UTF_16, "UTF-16", &NkfEncodingUTF_16},
- {UTF_16BE, "UTF-16BE", &NkfEncodingUTF_16},
- {UTF_16BE_BOM, "UTF-16BE-BOM", &NkfEncodingUTF_16},
- {UTF_16LE, "UTF-16LE", &NkfEncodingUTF_16},
- {UTF_16LE_BOM, "UTF-16LE-BOM", &NkfEncodingUTF_16},
- {UTF_32, "UTF-32", &NkfEncodingUTF_32},
- {UTF_32BE, "UTF-32BE", &NkfEncodingUTF_32},
- {UTF_32BE_BOM, "UTF-32BE-BOM", &NkfEncodingUTF_32},
- {UTF_32LE, "UTF-32LE", &NkfEncodingUTF_32},
- {UTF_32LE_BOM, "UTF-32LE-BOM", &NkfEncodingUTF_32},
- {BINARY, "BINARY", &NkfEncodingASCII},
- {-1, NULL, NULL}
-};
-
-struct {
- const char *name;
- const int id;
-} encoding_name_to_id_table[] = {
- {"US-ASCII", ASCII},
- {"ASCII", ASCII},
- {"ISO-2022-JP", ISO_2022_JP},
- {"ISO2022JP-CP932", CP50220},
- {"CP50220", CP50220},
- {"CP50221", CP50221},
- {"CSISO2022JP", CP50221},
- {"CP50222", CP50222},
- {"ISO-2022-JP-1", ISO_2022_JP_1},
- {"ISO-2022-JP-3", ISO_2022_JP_3},
- {"ISO-2022-JP-2004", ISO_2022_JP_2004},
- {"SHIFT_JIS", SHIFT_JIS},
- {"SJIS", SHIFT_JIS},
- {"WINDOWS-31J", WINDOWS_31J},
- {"CSWINDOWS31J", WINDOWS_31J},
- {"CP932", WINDOWS_31J},
- {"MS932", WINDOWS_31J},
- {"CP10001", CP10001},
- {"EUCJP", EUC_JP},
- {"EUC-JP", EUC_JP},
- {"EUCJP-NKF", EUCJP_NKF},
- {"CP51932", CP51932},
- {"EUC-JP-MS", EUCJP_MS},
- {"EUCJP-MS", EUCJP_MS},
- {"EUCJPMS", EUCJP_MS},
- {"EUC-JP-ASCII", EUCJP_ASCII},
- {"EUCJP-ASCII", EUCJP_ASCII},
- {"SHIFT_JISX0213", SHIFT_JISX0213},
- {"SHIFT_JIS-2004", SHIFT_JIS_2004},
- {"EUC-JISX0213", EUC_JISX0213},
- {"EUC-JIS-2004", EUC_JIS_2004},
- {"UTF-8", UTF_8},
- {"UTF-8N", UTF_8N},
- {"UTF-8-BOM", UTF_8_BOM},
- {"UTF8-MAC", UTF8_MAC},
- {"UTF-8-MAC", UTF8_MAC},
- {"UTF-16", UTF_16},
- {"UTF-16BE", UTF_16BE},
- {"UTF-16BE-BOM", UTF_16BE_BOM},
- {"UTF-16LE", UTF_16LE},
- {"UTF-16LE-BOM", UTF_16LE_BOM},
- {"UTF-32", UTF_32},
- {"UTF-32BE", UTF_32BE},
- {"UTF-32BE-BOM", UTF_32BE_BOM},
- {"UTF-32LE", UTF_32LE},
- {"UTF-32LE-BOM", UTF_32LE_BOM},
- {"BINARY", BINARY},
- {NULL, -1}
-};
-
-#if defined(DEFAULT_CODE_JIS)
-#define DEFAULT_ENCIDX ISO_2022_JP
-#elif defined(DEFAULT_CODE_SJIS)
-#define DEFAULT_ENCIDX SHIFT_JIS
-#elif defined(DEFAULT_CODE_WINDOWS_31J)
-#define DEFAULT_ENCIDX WINDOWS_31J
-#elif defined(DEFAULT_CODE_EUC)
-#define DEFAULT_ENCIDX EUC_JP
-#elif defined(DEFAULT_CODE_UTF8)
-#define DEFAULT_ENCIDX UTF_8
-#endif
-
#define is_alnum(c) \
- (('a'<=c && c<='z')||('A'<= c && c<='Z')||('0'<=c && c<='9'))
+ (('a'<=c && c<='z')||('A'<= c && c<='Z')||('0'<=c && c<='9'))
/* I don't trust portablity of toupper */
#define nkf_toupper(c) (('a'<=c && c<='z')?(c-('a'-'A')):c)
#define nkf_isoctal(c) ('0'<=c && c<='7')
#define nkf_isdigit(c) ('0'<=c && c<='9')
#define nkf_isxdigit(c) (nkf_isdigit(c) || ('a'<=c && c<='f') || ('A'<=c && c <= 'F'))
-#define nkf_isblank(c) (c == SP || c == TAB)
-#define nkf_isspace(c) (nkf_isblank(c) || c == CR || c == LF)
+#define nkf_isblank(c) (c == SPACE || c == TAB)
+#define nkf_isspace(c) (nkf_isblank(c) || c == CR || c == NL)
#define nkf_isalpha(c) (('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z'))
#define nkf_isalnum(c) (nkf_isdigit(c) || nkf_isalpha(c))
-#define nkf_isprint(c) (SP<=c && c<='~')
+#define nkf_isprint(c) (' '<=c && c<='~')
#define nkf_isgraph(c) ('!'<=c && c<='~')
#define hex2bin(c) (('0'<=c&&c<='9') ? (c-'0') : \
- ('A'<=c&&c<='F') ? (c-'A'+10) : \
- ('a'<=c&&c<='f') ? (c-'a'+10) : 0)
-#define bin2hex(c) ("0123456789ABCDEF"[c&15])
+ ('A'<=c&&c<='F') ? (c-'A'+10) : \
+ ('a'<=c&&c<='f') ? (c-'a'+10) : 0 )
#define is_eucg3(c2) (((unsigned short)c2 >> 8) == SS3)
-#define nkf_noescape_mime(c) ((c == CR) || (c == LF) || \
- ((c > SP) && (c < DEL) && (c != '?') && (c != '=') && (c != '_') \
- && (c != '(') && (c != ')') && (c != '.') && (c != 0x22)))
+#define CP932_TABLE_BEGIN 0xFA
+#define CP932_TABLE_END 0xFC
+#define CP932INV_TABLE_BEGIN 0xED
+#define CP932INV_TABLE_END 0xEE
#define is_ibmext_in_sjis(c2) (CP932_TABLE_BEGIN <= c2 && c2 <= CP932_TABLE_END)
-#define nkf_byte_jisx0201_katakana_p(c) (SP <= c && c < (0xE0&0x7F))
#define HOLD_SIZE 1024
#if defined(INT_IS_SHORT)
@@ -307,11 +296,23 @@ struct {
#define DEFAULT_J 'B'
#define DEFAULT_R 'B'
+#define SJ0162 0x00e1 /* 01 - 62 ku offset */
+#define SJ6394 0x0161 /* 63 - 94 ku offset */
+#define RANGE_NUM_MAX 18
#define GETA1 0x22
#define GETA2 0x2e
+#if defined(UTF8_OUTPUT_ENABLE) || defined(UTF8_INPUT_ENABLE)
+#define sizeof_euc_to_utf8_1byte 94
+#define sizeof_euc_to_utf8_2bytes 94
+#define sizeof_utf8_to_euc_C2 64
+#define sizeof_utf8_to_euc_E5B8 64
+#define sizeof_utf8_to_euc_2bytes 112
+#define sizeof_utf8_to_euc_3bytes 16
+#endif
+
/* MIME preprocessor */
#ifdef EASYWIN /*Easy Win */
@@ -319,7 +320,7 @@ extern POINT _BufferSize;
#endif
struct input_code{
- const char *name;
+ char *name;
nkf_char stat;
nkf_char score;
nkf_char index;
@@ -329,21 +330,31 @@ struct input_code{
int _file_stat;
};
-static const char *input_codename = NULL; /* NULL: unestablished, "": BINARY */
-static nkf_encoding *input_encoding = NULL;
-static nkf_encoding *output_encoding = NULL;
+static char *input_codename = "";
+#ifndef PERL_XS
+static const char *CopyRight = COPY_RIGHT;
+#endif
+#if !defined(PERL_XS) && !defined(WIN32DLL)
+static nkf_char noconvert(FILE *f);
+#endif
+static void module_connection(void);
+static nkf_char kanji_convert(FILE *f);
+static nkf_char h_conv(FILE *f,nkf_char c2,nkf_char c1);
+static nkf_char push_hold_buf(nkf_char c2);
+static void set_iconv(nkf_char f, nkf_char (*iconv_func)(nkf_char c2,nkf_char c1,nkf_char c0));
+static nkf_char s_iconv(nkf_char c2,nkf_char c1,nkf_char c0);
+static nkf_char s2e_conv(nkf_char c2, nkf_char c1, nkf_char *p2, nkf_char *p1);
+static nkf_char e_iconv(nkf_char c2,nkf_char c1,nkf_char c0);
#if defined(UTF8_INPUT_ENABLE) || defined(UTF8_OUTPUT_ENABLE)
/* UCS Mapping
* 0: Shift_JIS, eucJP-ascii
* 1: eucJP-ms
* 2: CP932, CP51932
- * 3: CP10001
*/
-#define UCS_MAP_ASCII 0
-#define UCS_MAP_MS 1
-#define UCS_MAP_CP932 2
-#define UCS_MAP_CP10001 3
+#define UCS_MAP_ASCII 0
+#define UCS_MAP_MS 1
+#define UCS_MAP_CP932 2
static int ms_ucs_map_f = UCS_MAP_ASCII;
#endif
#ifdef UTF8_INPUT_ENABLE
@@ -353,13 +364,48 @@ static int no_cp932ext_f = FALSE;
static int no_best_fit_chars_f = FALSE;
static int input_endian = ENDIAN_BIG;
static nkf_char unicode_subchar = '?'; /* the regular substitution character */
+static void nkf_each_char_to_hex(void (*f)(nkf_char c2,nkf_char c1), nkf_char c);
+static void encode_fallback_html(nkf_char c);
+static void encode_fallback_xml(nkf_char c);
+static void encode_fallback_java(nkf_char c);
+static void encode_fallback_perl(nkf_char c);
+static void encode_fallback_subchar(nkf_char c);
static void (*encode_fallback)(nkf_char c) = NULL;
+static nkf_char w2e_conv(nkf_char c2,nkf_char c1,nkf_char c0,nkf_char *p2,nkf_char *p1);
+static nkf_char w_iconv(nkf_char c2,nkf_char c1,nkf_char c0);
+static nkf_char w_iconv16(nkf_char c2,nkf_char c1,nkf_char c0);
+static nkf_char w_iconv32(nkf_char c2,nkf_char c1,nkf_char c0);
+static nkf_char unicode_to_jis_common(nkf_char c2,nkf_char c1,nkf_char c0,nkf_char *p2,nkf_char *p1);
+static nkf_char w_iconv_common(nkf_char c1,nkf_char c0,const unsigned short *const *pp,nkf_char psize,nkf_char *p2,nkf_char *p1);
+static void w16w_conv(nkf_char val, nkf_char *p2, nkf_char *p1, nkf_char *p0);
+static nkf_char ww16_conv(nkf_char c2, nkf_char c1, nkf_char c0);
+static nkf_char w16e_conv(nkf_char val,nkf_char *p2,nkf_char *p1);
static void w_status(struct input_code *, nkf_char);
#endif
#ifdef UTF8_OUTPUT_ENABLE
static int output_bom_f = FALSE;
static int output_endian = ENDIAN_BIG;
-#endif
+static nkf_char e2w_conv(nkf_char c2,nkf_char c1);
+static void w_oconv(nkf_char c2,nkf_char c1);
+static void w_oconv16(nkf_char c2,nkf_char c1);
+static void w_oconv32(nkf_char c2,nkf_char c1);
+#endif
+static void e_oconv(nkf_char c2,nkf_char c1);
+static nkf_char e2s_conv(nkf_char c2, nkf_char c1, nkf_char *p2, nkf_char *p1);
+static void s_oconv(nkf_char c2,nkf_char c1);
+static void j_oconv(nkf_char c2,nkf_char c1);
+static void fold_conv(nkf_char c2,nkf_char c1);
+static void cr_conv(nkf_char c2,nkf_char c1);
+static void z_conv(nkf_char c2,nkf_char c1);
+static void rot_conv(nkf_char c2,nkf_char c1);
+static void hira_conv(nkf_char c2,nkf_char c1);
+static void base64_conv(nkf_char c2,nkf_char c1);
+static void iso2022jp_check_conv(nkf_char c2,nkf_char c1);
+static void no_connection(nkf_char c2,nkf_char c1);
+static nkf_char no_connection2(nkf_char c2,nkf_char c1,nkf_char c0);
+
+static void code_score(struct input_code *ptr);
+static void code_status(nkf_char c);
static void std_putc(nkf_char c);
static nkf_char std_getc(FILE *f);
@@ -368,9 +414,32 @@ static nkf_char std_ungetc(nkf_char c,FILE *f);
static nkf_char broken_getc(FILE *f);
static nkf_char broken_ungetc(nkf_char c,FILE *f);
+static nkf_char mime_begin(FILE *f);
static nkf_char mime_getc(FILE *f);
-
-static void mime_putc(nkf_char c);
+static nkf_char mime_ungetc(nkf_char c,FILE *f);
+
+static void switch_mime_getc(void);
+static void unswitch_mime_getc(void);
+static nkf_char mime_begin_strict(FILE *f);
+static nkf_char mime_getc_buf(FILE *f);
+static nkf_char mime_ungetc_buf(nkf_char c,FILE *f);
+static nkf_char mime_integrity(FILE *f,const unsigned char *p);
+
+static nkf_char base64decode(nkf_char c);
+static void mime_prechar(nkf_char c2, nkf_char c1);
+static void mime_putc(nkf_char c);
+static void open_mime(nkf_char c);
+static void close_mime(void);
+static void eof_mime(void);
+static void mimeout_addchar(nkf_char c);
+#ifndef PERL_XS
+static void usage(void);
+static void version(void);
+#endif
+static void options(unsigned char *c);
+#if defined(PERL_XS) || defined(WIN32DLL)
+static void reinit(void);
+#endif
/* buffers */
@@ -378,6 +447,19 @@ static void mime_putc(nkf_char c);
static unsigned char stdibuf[IOBUF_SIZE];
static unsigned char stdobuf[IOBUF_SIZE];
#endif
+static unsigned char hold_buf[HOLD_SIZE*2];
+static int hold_count = 0;
+
+/* MIME preprocessor fifo */
+
+#define MIME_BUF_SIZE (1024) /* 2^n ring buffer */
+#define MIME_BUF_MASK (MIME_BUF_SIZE-1)
+#define Fifo(n) mime_buf[(n)&MIME_BUF_MASK]
+static unsigned char mime_buf[MIME_BUF_SIZE];
+static unsigned int mime_top = 0;
+static unsigned int mime_last = 0; /* decoded */
+static unsigned int mime_input = 0; /* undecoded */
+static nkf_char (*mime_iconv_back)(nkf_char c2,nkf_char c1,nkf_char c0) = NULL;
/* flags */
static int unbuf_f = FALSE;
@@ -386,60 +468,79 @@ static int nop_f = FALSE;
static int binmode_f = TRUE; /* binary mode */
static int rot_f = FALSE; /* rot14/43 mode */
static int hira_f = FALSE; /* hira/kata henkan */
+static int input_f = FALSE; /* non fixed input code */
static int alpha_f = FALSE; /* convert JIx0208 alphbet to ASCII */
-static int mime_f = MIME_DECODE_DEFAULT; /* convert MIME B base64 or Q */
+static int mime_f = STRICT_MIME; /* convert MIME B base64 or Q */
static int mime_decode_f = FALSE; /* mime decode is explicitly on */
static int mimebuf_f = FALSE; /* MIME buffered input */
static int broken_f = FALSE; /* convert ESC-less broken JIS */
static int iso8859_f = FALSE; /* ISO8859 through */
static int mimeout_f = FALSE; /* base64 mode */
-static int x0201_f = X0201_DEFAULT; /* convert JIS X 0201 */
-static int iso2022jp_f = FALSE; /* replace non ISO-2022-JP with GETA */
+#if defined(MSDOS) || defined(__OS2__)
+static int x0201_f = TRUE; /* Assume JISX0201 kana */
+#else
+static int x0201_f = NO_X0201; /* Assume NO JISX0201 */
+#endif
+static int iso2022jp_f = FALSE; /* convert ISO-2022-JP */
#ifdef UNICODE_NORMALIZATION
static int nfc_f = FALSE;
static nkf_char (*i_nfc_getc)(FILE *) = std_getc; /* input of ugetc */
static nkf_char (*i_nfc_ungetc)(nkf_char c ,FILE *f) = std_ungetc;
+static nkf_char nfc_getc(FILE *f);
+static nkf_char nfc_ungetc(nkf_char c,FILE *f);
#endif
#ifdef INPUT_OPTION
static int cap_f = FALSE;
static nkf_char (*i_cgetc)(FILE *) = std_getc; /* input of cgetc */
static nkf_char (*i_cungetc)(nkf_char c ,FILE *f) = std_ungetc;
+static nkf_char cap_getc(FILE *f);
+static nkf_char cap_ungetc(nkf_char c,FILE *f);
static int url_f = FALSE;
static nkf_char (*i_ugetc)(FILE *) = std_getc; /* input of ugetc */
static nkf_char (*i_uungetc)(nkf_char c ,FILE *f) = std_ungetc;
+static nkf_char url_getc(FILE *f);
+static nkf_char url_ungetc(nkf_char c,FILE *f);
#endif
-#define PREFIX_EUCG3 NKF_INT32_C(0x8F00)
-#define CLASS_MASK NKF_INT32_C(0xFF000000)
-#define CLASS_UNICODE NKF_INT32_C(0x01000000)
-#define VALUE_MASK NKF_INT32_C(0x00FFFFFF)
-#define UNICODE_BMP_MAX NKF_INT32_C(0x0000FFFF)
-#define UNICODE_MAX NKF_INT32_C(0x0010FFFF)
-#define nkf_char_euc3_new(c) ((c) | PREFIX_EUCG3)
-#define nkf_char_unicode_new(c) ((c) | CLASS_UNICODE)
-#define nkf_char_unicode_p(c) ((c & CLASS_MASK) == CLASS_UNICODE)
-#define nkf_char_unicode_bmp_p(c) ((c & VALUE_MASK) <= UNICODE_BMP_MAX)
-#define nkf_char_unicode_value_p(c) ((c & VALUE_MASK) <= UNICODE_MAX)
+#if defined(INT_IS_SHORT)
+#define NKF_INT32_C(n) (n##L)
+#else
+#define NKF_INT32_C(n) (n)
+#endif
+#define PREFIX_EUCG3 NKF_INT32_C(0x8F00)
+#define CLASS_MASK NKF_INT32_C(0xFF000000)
+#define CLASS_UNICODE NKF_INT32_C(0x01000000)
+#define VALUE_MASK NKF_INT32_C(0x00FFFFFF)
+#define UNICODE_MAX NKF_INT32_C(0x0010FFFF)
+#define is_unicode_capsule(c) ((c & CLASS_MASK) == CLASS_UNICODE)
+#define is_unicode_bmp(c) ((c & VALUE_MASK) <= NKF_INT32_C(0xFFFF))
#ifdef NUMCHAR_OPTION
static int numchar_f = FALSE;
static nkf_char (*i_ngetc)(FILE *) = std_getc; /* input of ugetc */
static nkf_char (*i_nungetc)(nkf_char c ,FILE *f) = std_ungetc;
+static nkf_char numchar_getc(FILE *f);
+static nkf_char numchar_ungetc(nkf_char c,FILE *f);
#endif
#ifdef CHECK_OPTION
static int noout_f = FALSE;
static void no_putc(nkf_char c);
-static int debug_f = FALSE;
+static nkf_char debug_f = FALSE;
static void debug(const char *str);
static nkf_char (*iconv_for_check)(nkf_char c2,nkf_char c1,nkf_char c0) = 0;
#endif
-static int guess_f = 0; /* 0: OFF, 1: ON, 2: VERBOSE */
-static void set_input_codename(const char *codename);
+static int guess_f = FALSE;
+#if !defined PERL_XS
+static void print_guessed_code(char *filename);
+#endif
+static void set_input_codename(char *codename);
+static int is_inputcode_mixed = FALSE;
+static int is_inputcode_set = FALSE;
#ifdef EXEC_IO
static int exec_f = 0;
@@ -455,11 +556,23 @@ static int cp932inv_f = TRUE;
/* static nkf_char cp932_conv(nkf_char c2, nkf_char c1); */
#endif /* SHIFTJIS_CP932 */
+#ifdef X0212_ENABLE
static int x0212_f = FALSE;
+static nkf_char x0212_shift(nkf_char c);
+static nkf_char x0212_unshift(nkf_char c);
+#endif
static int x0213_f = FALSE;
static unsigned char prefix_table[256];
+static void set_code_score(struct input_code *ptr, nkf_char score);
+static void clr_code_score(struct input_code *ptr, nkf_char score);
+static void status_disable(struct input_code *ptr);
+static void status_push_ch(struct input_code *ptr, nkf_char c);
+static void status_clear(struct input_code *ptr);
+static void status_reset(struct input_code *ptr);
+static void status_reinit(struct input_code *ptr);
+static void status_check(struct input_code *ptr, nkf_char c);
static void e_status(struct input_code *, nkf_char);
static void s_status(struct input_code *, nkf_char);
@@ -468,11 +581,13 @@ struct input_code input_code_list[] = {
{"Shift_JIS", 0, 0, 0, {0, 0, 0}, s_status, s_iconv, 0},
#ifdef UTF8_INPUT_ENABLE
{"UTF-8", 0, 0, 0, {0, 0, 0}, w_status, w_iconv, 0},
+ {"UTF-16", 0, 0, 0, {0, 0, 0}, NULL, w_iconv16, 0},
+ {"UTF-32", 0, 0, 0, {0, 0, 0}, NULL, w_iconv32, 0},
#endif
{0}
};
-static int mimeout_mode = 0; /* 0, -1, 'Q', 'B', 1, 2 */
+static int mimeout_mode = 0;
static int base64_count = 0;
/* X0208 -> ASCII converter */
@@ -495,28 +610,31 @@ static unsigned char ascii_intro = DEFAULT_R;
static int fold_margin = FOLD_MARGIN;
-/* process default */
+/* converters */
-static nkf_char
-no_connection2(nkf_char c2, nkf_char c1, nkf_char c0)
-{
- fprintf(stderr,"nkf internal module connection failure.\n");
- exit(EXIT_FAILURE);
- return 0; /* LINT */
-}
+#ifdef DEFAULT_CODE_JIS
+# define DEFAULT_CONV j_oconv
+#endif
+#ifdef DEFAULT_CODE_SJIS
+# define DEFAULT_CONV s_oconv
+#endif
+#ifdef DEFAULT_CODE_EUC
+# define DEFAULT_CONV e_oconv
+#endif
+#ifdef DEFAULT_CODE_UTF8
+# define DEFAULT_CONV w_oconv
+#endif
-static void
-no_connection(nkf_char c2, nkf_char c1)
-{
- no_connection2(c2,c1,0);
-}
+/* process default */
+static void (*output_conv)(nkf_char c2,nkf_char c1) = DEFAULT_CONV;
-static nkf_char (*iconv)(nkf_char c2,nkf_char c1,nkf_char c0) = no_connection2;
static void (*oconv)(nkf_char c2,nkf_char c1) = no_connection;
+/* s_iconv or oconv */
+static nkf_char (*iconv)(nkf_char c2,nkf_char c1,nkf_char c0) = no_connection2;
static void (*o_zconv)(nkf_char c2,nkf_char c1) = no_connection;
static void (*o_fconv)(nkf_char c2,nkf_char c1) = no_connection;
-static void (*o_eol_conv)(nkf_char c2,nkf_char c1) = no_connection;
+static void (*o_crconv)(nkf_char c2,nkf_char c1) = no_connection;
static void (*o_rot_conv)(nkf_char c2,nkf_char c1) = no_connection;
static void (*o_hira_conv)(nkf_char c2,nkf_char c1) = no_connection;
static void (*o_base64conv)(nkf_char c2,nkf_char c1) = no_connection;
@@ -542,15 +660,17 @@ static nkf_char (*i_mgetc_buf)(FILE *) = std_getc; /* input of mgetc_buf */
static nkf_char (*i_mungetc_buf)(nkf_char c,FILE *f) = std_ungetc;
/* Global states */
-static int output_mode = ASCII; /* output kanji mode */
-static int input_mode = ASCII; /* input kanji mode */
+static int output_mode = ASCII, /* output kanji mode */
+ input_mode = ASCII, /* input kanji mode */
+ shift_mode = FALSE; /* TRUE shift out, or X0201 */
static int mime_decode_mode = FALSE; /* MIME mode B base64, Q hex */
/* X0201 / X0208 conversion tables */
/* X0201 kana conversion table */
/* 90-9F A0-DF */
-static const unsigned char cv[]= {
+static const
+unsigned char cv[]= {
0x21,0x21,0x21,0x23,0x21,0x56,0x21,0x57,
0x21,0x22,0x21,0x26,0x25,0x72,0x25,0x21,
0x25,0x23,0x25,0x25,0x25,0x27,0x25,0x29,
@@ -572,7 +692,8 @@ static const unsigned char cv[]= {
/* X0201 kana conversion table for daguten */
/* 90-9F A0-DF */
-static const unsigned char dv[]= {
+static const
+unsigned char dv[]= {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
@@ -593,7 +714,8 @@ static const unsigned char dv[]= {
/* X0201 kana conversion table for han-daguten */
/* 90-9F A0-DF */
-static const unsigned char ev[]= {
+static const
+unsigned char ev[]= {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
@@ -615,7 +737,8 @@ static const unsigned char ev[]= {
/* X0208 kigou conversion table */
/* 0x8140 - 0x819e */
-static const unsigned char fv[] = {
+static const
+unsigned char fv[] = {
0x00,0x00,0x00,0x00,0x2c,0x2e,0x00,0x3a,
0x3b,0x3f,0x21,0x00,0x00,0x27,0x60,0x00,
@@ -632,359 +755,283 @@ static const unsigned char fv[] = {
} ;
+#define CRLF 1
-static int option_mode = 0;
static int file_out_f = FALSE;
#ifdef OVERWRITE
static int overwrite_f = FALSE;
static int preserve_time_f = FALSE;
static int backup_f = FALSE;
static char *backup_suffix = "";
+static char *get_backup_filename(const char *suffix, const char *filename);
#endif
-static int eolmode_f = 0; /* CR, LF, CRLF */
-static int input_eol = 0; /* 0: unestablished, EOF: MIXED */
-static nkf_char prev_cr = 0; /* CR or 0 */
+static int crmode_f = 0; /* CR, NL, CRLF */
#ifdef EASYWIN /*Easy Win */
static int end_check;
#endif /*Easy Win */
-static void *
-nkf_xmalloc(size_t size)
-{
- void *ptr;
-
- if (size == 0) size = 1;
-
- ptr = malloc(size);
- if (ptr == NULL) {
- perror("can't malloc");
- exit(EXIT_FAILURE);
- }
-
- return ptr;
-}
-
-static void *
-nkf_xrealloc(void *ptr, size_t size)
-{
- if (size == 0) size = 1;
-
- ptr = realloc(ptr, size);
- if (ptr == NULL) {
- perror("can't realloc");
- exit(EXIT_FAILURE);
- }
-
- return ptr;
-}
-
-#define nkf_xfree(ptr) free(ptr)
-
-static int
-nkf_str_caseeql(const char *src, const char *target)
-{
- int i;
- for (i = 0; src[i] && target[i]; i++) {
- if (nkf_toupper(src[i]) != nkf_toupper(target[i])) return FALSE;
- }
- if (src[i] || target[i]) return FALSE;
- else return TRUE;
-}
-
-static nkf_encoding*
-nkf_enc_from_index(int idx)
-{
- if (idx < 0 || NKF_ENCODING_TABLE_SIZE <= idx) {
- return 0;
- }
- return &nkf_encoding_table[idx];
-}
-
-static int
-nkf_enc_find_index(const char *name)
-{
- int i;
- if (name[0] == 'X' && *(name+1) == '-') name += 2;
- for (i = 0; encoding_name_to_id_table[i].id >= 0; i++) {
- if (nkf_str_caseeql(encoding_name_to_id_table[i].name, name)) {
- return encoding_name_to_id_table[i].id;
- }
- }
- return -1;
-}
-
-static nkf_encoding*
-nkf_enc_find(const char *name)
-{
- int idx = -1;
- idx = nkf_enc_find_index(name);
- if (idx < 0) return 0;
- return nkf_enc_from_index(idx);
-}
-
-#define nkf_enc_name(enc) (enc)->name
-#define nkf_enc_to_index(enc) (enc)->id
-#define nkf_enc_to_base_encoding(enc) (enc)->base_encoding
-#define nkf_enc_to_iconv(enc) nkf_enc_to_base_encoding(enc)->iconv
-#define nkf_enc_to_oconv(enc) nkf_enc_to_base_encoding(enc)->oconv
-#define nkf_enc_asciicompat(enc) (\
- nkf_enc_to_base_encoding(enc) == &NkfEncodingASCII ||\
- nkf_enc_to_base_encoding(enc) == &NkfEncodingISO_2022_JP)
-#define nkf_enc_unicode_p(enc) (\
- nkf_enc_to_base_encoding(enc) == &NkfEncodingUTF_8 ||\
- nkf_enc_to_base_encoding(enc) == &NkfEncodingUTF_16 ||\
- nkf_enc_to_base_encoding(enc) == &NkfEncodingUTF_32)
-#define nkf_enc_cp5022x_p(enc) (\
- nkf_enc_to_index(enc) == CP50220 ||\
- nkf_enc_to_index(enc) == CP50221 ||\
- nkf_enc_to_index(enc) == CP50222)
-
-#ifdef DEFAULT_CODE_LOCALE
-static const char*
-nkf_locale_charmap()
-{
-#ifdef HAVE_LANGINFO_H
- return nl_langinfo(CODESET);
-#elif defined(__WIN32__)
- static char buf[16];
- sprintf(buf, "CP%d", GetACP());
- return buf;
-#elif defined(__OS2__)
-# if defined(INT_IS_SHORT)
- /* OS/2 1.x */
- return NULL;
-# else
- /* OS/2 32bit */
- static char buf[16];
- ULONG ulCP[1], ulncp;
- DosQueryCp(sizeof(ulCP), ulCP, &ulncp);
- if (ulCP[0] == 932 || ulCP[0] == 943)
- strcpy(buf, "Shift_JIS");
- else
- sprintf(buf, "CP%lu", ulCP[0]);
- return buf;
-# endif
-#endif
- return NULL;
-}
-
-static nkf_encoding*
-nkf_locale_encoding()
-{
- nkf_encoding *enc = 0;
- const char *encname = nkf_locale_charmap();
- if (encname)
- enc = nkf_enc_find(encname);
- return enc;
-}
-#endif /* DEFAULT_CODE_LOCALE */
-
-static nkf_encoding*
-nkf_utf8_encoding()
-{
- return &nkf_encoding_table[UTF_8];
-}
+#define STD_GC_BUFSIZE (256)
+nkf_char std_gc_buf[STD_GC_BUFSIZE];
+nkf_char std_gc_ndx;
-static nkf_encoding*
-nkf_default_encoding()
+#ifdef WIN32DLL
+#include "nkf32dll.c"
+#elif defined(PERL_XS)
+#else /* WIN32DLL */
+int main(int argc, char **argv)
{
- nkf_encoding *enc = 0;
-#ifdef DEFAULT_CODE_LOCALE
- enc = nkf_locale_encoding();
-#elif defined(DEFAULT_ENCIDX)
- enc = nkf_enc_from_index(DEFAULT_ENCIDX);
-#endif
- if (!enc) enc = nkf_utf8_encoding();
- return enc;
-}
-
-typedef struct {
- long capa;
- long len;
- nkf_char *ptr;
-} nkf_buf_t;
+ FILE *fin;
+ unsigned char *cp;
-static nkf_buf_t *
-nkf_buf_new(int length)
-{
- nkf_buf_t *buf = nkf_xmalloc(sizeof(nkf_buf_t));
- buf->ptr = nkf_xmalloc(length);
- buf->capa = length;
- buf->len = 0;
- return buf;
-}
+ char *outfname = NULL;
+ char *origfname;
-#if 0
-static void
-nkf_buf_dispose(nkf_buf_t *buf)
-{
- nkf_xfree(buf->ptr);
- nkf_xfree(buf);
-}
+#ifdef EASYWIN /*Easy Win */
+ _BufferSize.y = 400;/*Set Scroll Buffer Size*/
#endif
-#define nkf_buf_length(buf) ((buf)->len)
-#define nkf_buf_empty_p(buf) ((buf)->len == 0)
-
-static unsigned char
-nkf_buf_at(nkf_buf_t *buf, int index)
-{
- assert(index <= buf->len);
- return buf->ptr[index];
-}
-
-static void
-nkf_buf_clear(nkf_buf_t *buf)
-{
- buf->len = 0;
-}
-
-static void
-nkf_buf_push(nkf_buf_t *buf, nkf_char c)
-{
- if (buf->capa <= buf->len) {
- exit(EXIT_FAILURE);
- }
- buf->ptr[buf->len++] = c;
-}
-
-static unsigned char
-nkf_buf_pop(nkf_buf_t *buf)
-{
- assert(!nkf_buf_empty_p(buf));
- return buf->ptr[--buf->len];
-}
+ for (argc--,argv++; (argc > 0) && **argv == '-'; argc--, argv++) {
+ cp = (unsigned char *)*argv;
+ options(cp);
+#ifdef EXEC_IO
+ if (exec_f){
+ int fds[2], pid;
+ if (pipe(fds) < 0 || (pid = fork()) < 0){
+ abort();
+ }
+ if (pid == 0){
+ if (exec_f > 0){
+ close(fds[0]);
+ dup2(fds[1], 1);
+ }else{
+ close(fds[1]);
+ dup2(fds[0], 0);
+ }
+ execvp(argv[1], &argv[1]);
+ }
+ if (exec_f > 0){
+ close(fds[1]);
+ dup2(fds[0], 0);
+ }else{
+ close(fds[0]);
+ dup2(fds[1], 1);
+ }
+ argc = 0;
+ break;
+ }
+#endif
+ }
+ if(x0201_f == WISH_TRUE)
+ x0201_f = ((!iso2022jp_f)? TRUE : NO_X0201);
-/* Normalization Form C */
-#ifndef PERL_XS
-#ifdef WIN32DLL
-#define fprintf dllprintf
+ if (binmode_f == TRUE)
+#if defined(__OS2__) && (defined(__IBMC__) || defined(__IBMCPP__))
+ if (freopen("","wb",stdout) == NULL)
+ return (-1);
+#else
+ setbinmode(stdout);
#endif
-static void
-version(void)
-{
- fprintf(HELP_OUTPUT,"Network Kanji Filter Version " NKF_VERSION " (" NKF_RELEASE_DATE ") \n" COPY_RIGHT "\n");
-}
+ if (unbuf_f)
+ setbuf(stdout, (char *) NULL);
+ else
+ setvbuffer(stdout, (char *) stdobuf, IOBUF_SIZE);
-static void
-usage(void)
-{
- fprintf(HELP_OUTPUT,
- "Usage: nkf -[flags] [--] [in file] .. [out file for -O flag]\n"
-#ifdef UTF8_OUTPUT_ENABLE
- " j/s/e/w Specify output encoding ISO-2022-JP, Shift_JIS, EUC-JP\n"
- " UTF options is -w[8[0],{16,32}[{B,L}[0]]]\n"
-#else
-#endif
-#ifdef UTF8_INPUT_ENABLE
- " J/S/E/W Specify input encoding ISO-2022-JP, Shift_JIS, EUC-JP\n"
- " UTF option is -W[8,[16,32][B,L]]\n"
+ if (argc == 0) {
+ if (binmode_f == TRUE)
+#if defined(__OS2__) && (defined(__IBMC__) || defined(__IBMCPP__))
+ if (freopen("","rb",stdin) == NULL) return (-1);
#else
- " J/S/E Specify output encoding ISO-2022-JP, Shift_JIS, EUC-JP\n"
-#endif
- );
- fprintf(HELP_OUTPUT,
- " m[BQSN0] MIME decode [B:base64,Q:quoted,S:strict,N:nonstrict,0:no decode]\n"
- " M[BQ] MIME encode [B:base64 Q:quoted]\n"
- " f/F Folding: -f60 or -f or -f60-10 (fold margin 10) F preserve nl\n"
- );
- fprintf(HELP_OUTPUT,
- " Z[0-4] Default/0: Convert JISX0208 Alphabet to ASCII\n"
- " 1: Kankaku to one space 2: to two spaces 3: HTML Entity\n"
- " 4: JISX0208 Katakana to JISX0201 Katakana\n"
- " X,x Assume X0201 kana in MS-Kanji, -x preserves X0201\n"
- );
- fprintf(HELP_OUTPUT,
- " O Output to File (DEFAULT 'nkf.out')\n"
- " L[uwm] Line mode u:LF w:CRLF m:CR (DEFAULT noconversion)\n"
- );
- fprintf(HELP_OUTPUT,
- " --ic=<encoding> Specify the input encoding\n"
- " --oc=<encoding> Specify the output encoding\n"
- " --hiragana --katakana Hiragana/Katakana Conversion\n"
- " --katakana-hiragana Converts each other\n"
- );
- fprintf(HELP_OUTPUT,
-#ifdef INPUT_OPTION
- " --{cap, url}-input Convert hex after ':' or '%%'\n"
-#endif
-#ifdef NUMCHAR_OPTION
- " --numchar-input Convert Unicode Character Reference\n"
-#endif
-#ifdef UTF8_INPUT_ENABLE
- " --fb-{skip, html, xml, perl, java, subchar}\n"
- " Specify unassigned character's replacement\n"
+ setbinmode(stdin);
+#endif
+ setvbuffer(stdin, (char *) stdibuf, IOBUF_SIZE);
+ if (nop_f)
+ noconvert(stdin);
+ else {
+ kanji_convert(stdin);
+ if (guess_f) print_guessed_code(NULL);
+ }
+ } else {
+ int nfiles = argc;
+ int is_argument_error = FALSE;
+ while (argc--) {
+ is_inputcode_mixed = FALSE;
+ is_inputcode_set = FALSE;
+ input_codename = "";
+#ifdef CHECK_OPTION
+ iconv_for_check = 0;
#endif
- );
- fprintf(HELP_OUTPUT,
+ if ((fin = fopen((origfname = *argv++), "r")) == NULL) {
+ perror(*--argv);
+ *argv++;
+ is_argument_error = TRUE;
+ continue;
+ } else {
#ifdef OVERWRITE
- " --in-place[=SUF] Overwrite original files\n"
- " --overwrite[=SUF] Preserve timestamp of original files\n"
+ int fd = 0;
+ int fd_backup = 0;
#endif
- " -g --guess Guess the input code\n"
- " -v --version Print the version\n"
- " --help/-V Print this help / configuration\n"
- );
- version();
-}
-static void
-show_configuration(void)
-{
- fprintf(HELP_OUTPUT,
- "Summary of my nkf " NKF_VERSION " (" NKF_RELEASE_DATE ") configuration:\n"
- " Compile-time options:\n"
- " Compiled at: " __DATE__ " " __TIME__ "\n"
- );
- fprintf(HELP_OUTPUT,
- " Default output encoding: "
-#ifdef DEFAULT_CODE_LOCALE
- "LOCALE (%s)\n", nkf_enc_name(nkf_default_encoding())
-#elif defined(DEFAULT_ENCIDX)
- "CONFIG (%s)\n", nkf_enc_name(nkf_default_encoding())
+/* reopen file for stdout */
+ if (file_out_f == TRUE) {
+#ifdef OVERWRITE
+ if (overwrite_f){
+ outfname = malloc(strlen(origfname)
+ + strlen(".nkftmpXXXXXX")
+ + 1);
+ if (!outfname){
+ perror(origfname);
+ return -1;
+ }
+ strcpy(outfname, origfname);
+#ifdef MSDOS
+ {
+ int i;
+ for (i = strlen(outfname); i; --i){
+ if (outfname[i - 1] == '/'
+ || outfname[i - 1] == '\\'){
+ break;
+ }
+ }
+ outfname[i] = '\0';
+ }
+ strcat(outfname, "ntXXXXXX");
+ mktemp(outfname);
+ fd = open(outfname, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL,
+ S_IREAD | S_IWRITE);
#else
- "NONE\n"
-#endif
- );
- fprintf(HELP_OUTPUT,
- " Default output end of line: "
-#if DEFAULT_NEWLINE == CR
- "CR"
-#elif DEFAULT_NEWLINE == CRLF
- "CRLF"
+ strcat(outfname, ".nkftmpXXXXXX");
+ fd = mkstemp(outfname);
+#endif
+ if (fd < 0
+ || (fd_backup = dup(fileno(stdout))) < 0
+ || dup2(fd, fileno(stdout)) < 0
+ ){
+ perror(origfname);
+ return -1;
+ }
+ }else
+#endif
+ if(argc == 1 ) {
+ outfname = *argv++;
+ argc--;
+ } else {
+ outfname = "nkf.out";
+ }
+
+ if(freopen(outfname, "w", stdout) == NULL) {
+ perror (outfname);
+ return (-1);
+ }
+ if (binmode_f == TRUE) {
+#if defined(__OS2__) && (defined(__IBMC__) || defined(__IBMCPP__))
+ if (freopen("","wb",stdout) == NULL)
+ return (-1);
#else
- "LF"
+ setbinmode(stdout);
#endif
- "\n"
- " Decode MIME encoded string: "
-#if MIME_DECODE_DEFAULT
- "ON"
+ }
+ }
+ if (binmode_f == TRUE)
+#if defined(__OS2__) && (defined(__IBMC__) || defined(__IBMCPP__))
+ if (freopen("","rb",fin) == NULL)
+ return (-1);
#else
- "OFF"
-#endif
- "\n"
- " Convert JIS X 0201 Katakana: "
-#if X0201_DEFAULT
- "ON"
+ setbinmode(fin);
+#endif
+ setvbuffer(fin, (char *) stdibuf, IOBUF_SIZE);
+ if (nop_f)
+ noconvert(fin);
+ else {
+ char *filename = NULL;
+ kanji_convert(fin);
+ if (nfiles > 1) filename = origfname;
+ if (guess_f) print_guessed_code(filename);
+ }
+ fclose(fin);
+#ifdef OVERWRITE
+ if (overwrite_f) {
+ struct stat sb;
+#if defined(MSDOS) && !defined(__MINGW32__) && !defined(__WIN32__) && !defined(__WATCOMC__) && !defined(__EMX__) && !defined(__OS2__) && !defined(__DJGPP__)
+ time_t tb[2];
#else
- "OFF"
-#endif
- "\n"
- " --help, --version output: "
-#if HELP_OUTPUT_HELP_OUTPUT
- "HELP_OUTPUT"
+ struct utimbuf tb;
+#endif
+
+ fflush(stdout);
+ close(fd);
+ if (dup2(fd_backup, fileno(stdout)) < 0){
+ perror("dup2");
+ }
+ if (stat(origfname, &sb)) {
+ fprintf(stderr, "Can't stat %s\n", origfname);
+ }
+ /* $B%Q!<%_%C%7%g%s$rI|85(B */
+ if (chmod(outfname, sb.st_mode)) {
+ fprintf(stderr, "Can't set permission %s\n", outfname);
+ }
+
+ /* $B%?%$%`%9%?%s%W$rI|85(B */
+ if(preserve_time_f){
+#if defined(MSDOS) && !defined(__MINGW32__) && !defined(__WIN32__) && !defined(__WATCOMC__) && !defined(__EMX__) && !defined(__OS2__) && !defined(__DJGPP__)
+ tb[0] = tb[1] = sb.st_mtime;
+ if (utime(outfname, tb)) {
+ fprintf(stderr, "Can't set timestamp %s\n", outfname);
+ }
#else
- "STDOUT"
+ tb.actime = sb.st_atime;
+ tb.modtime = sb.st_mtime;
+ if (utime(outfname, &tb)) {
+ fprintf(stderr, "Can't set timestamp %s\n", outfname);
+ }
+#endif
+ }
+ if(backup_f){
+ char *backup_filename = get_backup_filename(backup_suffix, origfname);
+#ifdef MSDOS
+ unlink(backup_filename);
+#endif
+ if (rename(origfname, backup_filename)) {
+ perror(backup_filename);
+ fprintf(stderr, "Can't rename %s to %s\n",
+ origfname, backup_filename);
+ }
+ }else{
+#ifdef MSDOS
+ if (unlink(origfname)){
+ perror(origfname);
+ }
#endif
- "\n");
+ }
+ if (rename(outfname, origfname)) {
+ perror(origfname);
+ fprintf(stderr, "Can't rename %s to %s\n",
+ outfname, origfname);
+ }
+ free(outfname);
+ }
+#endif
+ }
+ }
+ if (is_argument_error)
+ return(-1);
+ }
+#ifdef EASYWIN /*Easy Win */
+ if (file_out_f == FALSE)
+ scanf("%d",&end_check);
+ else
+ fclose(stdout);
+#else /* for Other OS */
+ if (file_out_f == TRUE)
+ fclose(stdout);
+#endif /*Easy Win */
+ return (0);
}
-#endif /*PERL_XS*/
+#endif /* WIN32DLL */
#ifdef OVERWRITE
-static char*
-get_backup_filename(const char *suffix, const char *filename)
+char *get_backup_filename(const char *suffix, const char *filename)
{
char *backup_filename;
int asterisk_count = 0;
@@ -996,7 +1043,12 @@ get_backup_filename(const char *suffix, const char *filename)
}
if(asterisk_count){
- backup_filename = nkf_xmalloc(strlen(suffix) + (asterisk_count * (filename_length - 1)) + 1);
+ backup_filename = malloc(strlen(suffix) + (asterisk_count * (filename_length - 1)) + 1);
+ if (!backup_filename){
+ perror("Can't malloc backup filename.");
+ return NULL;
+ }
+
for(i = 0, j = 0; suffix[i];){
if(suffix[i] == '*'){
backup_filename[j] = '\0';
@@ -1009,8 +1061,8 @@ get_backup_filename(const char *suffix, const char *filename)
}
backup_filename[j] = '\0';
}else{
- j = filename_length + strlen(suffix);
- backup_filename = nkf_xmalloc(j + 1);
+ j = strlen(suffix) + filename_length;
+ backup_filename = malloc( + 1);
strcpy(backup_filename, filename);
strcat(backup_filename, suffix);
backup_filename[j] = '\0';
@@ -1019,102 +1071,8 @@ get_backup_filename(const char *suffix, const char *filename)
}
#endif
-#ifdef UTF8_INPUT_ENABLE
-static void
-nkf_each_char_to_hex(void (*f)(nkf_char c2,nkf_char c1), nkf_char c)
-{
- int shift = 20;
- c &= VALUE_MASK;
- while(shift >= 0){
- if(c >= 1<<shift){
- while(shift >= 0){
- (*f)(0, bin2hex(c>>shift));
- shift -= 4;
- }
- }else{
- shift -= 4;
- }
- }
- return;
-}
-
-static void
-encode_fallback_html(nkf_char c)
-{
- (*oconv)(0, '&');
- (*oconv)(0, '#');
- c &= VALUE_MASK;
- if(c >= NKF_INT32_C(1000000))
- (*oconv)(0, 0x30+(c/NKF_INT32_C(1000000))%10);
- if(c >= NKF_INT32_C(100000))
- (*oconv)(0, 0x30+(c/NKF_INT32_C(100000) )%10);
- if(c >= 10000)
- (*oconv)(0, 0x30+(c/10000 )%10);
- if(c >= 1000)
- (*oconv)(0, 0x30+(c/1000 )%10);
- if(c >= 100)
- (*oconv)(0, 0x30+(c/100 )%10);
- if(c >= 10)
- (*oconv)(0, 0x30+(c/10 )%10);
- if(c >= 0)
- (*oconv)(0, 0x30+ c %10);
- (*oconv)(0, ';');
- return;
-}
-
-static void
-encode_fallback_xml(nkf_char c)
-{
- (*oconv)(0, '&');
- (*oconv)(0, '#');
- (*oconv)(0, 'x');
- nkf_each_char_to_hex(oconv, c);
- (*oconv)(0, ';');
- return;
-}
-
-static void
-encode_fallback_java(nkf_char c)
-{
- (*oconv)(0, '\\');
- c &= VALUE_MASK;
- if(!nkf_char_unicode_bmp_p(c)){
- (*oconv)(0, 'U');
- (*oconv)(0, '0');
- (*oconv)(0, '0');
- (*oconv)(0, bin2hex(c>>20));
- (*oconv)(0, bin2hex(c>>16));
- }else{
- (*oconv)(0, 'u');
- }
- (*oconv)(0, bin2hex(c>>12));
- (*oconv)(0, bin2hex(c>> 8));
- (*oconv)(0, bin2hex(c>> 4));
- (*oconv)(0, bin2hex(c ));
- return;
-}
-
-static void
-encode_fallback_perl(nkf_char c)
-{
- (*oconv)(0, '\\');
- (*oconv)(0, 'x');
- (*oconv)(0, '{');
- nkf_each_char_to_hex(oconv, c);
- (*oconv)(0, '}');
- return;
-}
-
-static void
-encode_fallback_subchar(nkf_char c)
-{
- c = unicode_subchar;
- (*oconv)((c>>8)&0xFF, c&0xFF);
- return;
-}
-#endif
-
-static const struct {
+static const
+struct {
const char *name;
const char *alias;
} long_option[] = {
@@ -1124,7 +1082,7 @@ static const struct {
{"euc","e"},
{"euc-input","E"},
{"fj","jm"},
- {"help",""},
+ {"help","v"},
{"jis","j"},
{"jis-input","J"},
{"mac","sLm"},
@@ -1134,13 +1092,12 @@ static const struct {
{"sjis","s"},
{"sjis-input","S"},
{"unix","eLu"},
- {"version","v"},
+ {"version","V"},
{"windows","sLw"},
{"hiragana","h1"},
{"katakana","h2"},
{"katakana-hiragana","h3"},
- {"guess=", ""},
- {"guess", "g2"},
+ {"guess", "g"},
{"cp932", ""},
{"no-cp932", ""},
#ifdef X0212_ENABLE
@@ -1194,412 +1151,2019 @@ static const struct {
{"prefix=", ""},
};
-static void
-set_input_encoding(nkf_encoding *enc)
+static int option_mode = 0;
+
+void options(unsigned char *cp)
{
- switch (nkf_enc_to_index(enc)) {
- case ISO_8859_1:
- iso8859_f = TRUE;
- break;
- case CP50220:
- case CP50221:
- case CP50222:
+ nkf_char i, j;
+ unsigned char *p;
+ unsigned char *cp_back = NULL;
+ char codeset[32];
+
+ if (option_mode==1)
+ return;
+ while(*cp && *cp++!='-');
+ while (*cp || cp_back) {
+ if(!*cp){
+ cp = cp_back;
+ cp_back = NULL;
+ continue;
+ }
+ p = 0;
+ switch (*cp++) {
+ case '-': /* literal options */
+ if (!*cp || *cp == SPACE) { /* ignore the rest of arguments */
+ option_mode = 1;
+ return;
+ }
+ for (i=0;i<sizeof(long_option)/sizeof(long_option[0]);i++) {
+ p = (unsigned char *)long_option[i].name;
+ for (j=0;*p && *p != '=' && *p == cp[j];p++, j++);
+ if (*p == cp[j] || cp[j] == ' '){
+ p = &cp[j] + 1;
+ break;
+ }
+ p = 0;
+ }
+ if (p == 0) return;
+ while(*cp && *cp != SPACE && cp++);
+ if (long_option[i].alias[0]){
+ cp_back = cp;
+ cp = (unsigned char *)long_option[i].alias;
+ }else{
+ if (strcmp(long_option[i].name, "ic=") == 0){
+ for (i=0; i < 16 && SPACE < p[i] && p[i] < DEL; i++){
+ codeset[i] = nkf_toupper(p[i]);
+ }
+ codeset[i] = 0;
+ if(strcmp(codeset, "ISO-2022-JP") == 0){
+ input_f = JIS_INPUT;
+ }else if(strcmp(codeset, "X-ISO2022JP-CP932") == 0 ||
+ strcmp(codeset, "CP50220") == 0 ||
+ strcmp(codeset, "CP50221") == 0 ||
+ strcmp(codeset, "CP50222") == 0){
+ input_f = JIS_INPUT;
#ifdef SHIFTJIS_CP932
- cp51932_f = TRUE;
+ cp51932_f = TRUE;
#endif
#ifdef UTF8_OUTPUT_ENABLE
- ms_ucs_map_f = UCS_MAP_CP932;
+ ms_ucs_map_f = UCS_MAP_CP932;
#endif
- break;
- case ISO_2022_JP_1:
- x0212_f = TRUE;
- break;
- case ISO_2022_JP_3:
- x0212_f = TRUE;
- x0213_f = TRUE;
- break;
- case ISO_2022_JP_2004:
- x0212_f = TRUE;
- x0213_f = TRUE;
- break;
- case SHIFT_JIS:
- break;
- case WINDOWS_31J:
-#ifdef SHIFTJIS_CP932
- cp51932_f = TRUE;
-#endif
-#ifdef UTF8_OUTPUT_ENABLE
- ms_ucs_map_f = UCS_MAP_CP932;
+ }else if(strcmp(codeset, "ISO-2022-JP-1") == 0){
+ input_f = JIS_INPUT;
+#ifdef X0212_ENABLE
+ x0212_f = TRUE;
#endif
- break;
- break;
- case CP10001:
+ }else if(strcmp(codeset, "ISO-2022-JP-3") == 0){
+ input_f = JIS_INPUT;
+#ifdef X0212_ENABLE
+ x0212_f = TRUE;
+#endif
+ x0213_f = TRUE;
+ }else if(strcmp(codeset, "SHIFT_JIS") == 0){
+ input_f = SJIS_INPUT;
+ }else if(strcmp(codeset, "WINDOWS-31J") == 0 ||
+ strcmp(codeset, "CSWINDOWS31J") == 0 ||
+ strcmp(codeset, "CP932") == 0 ||
+ strcmp(codeset, "MS932") == 0){
+ input_f = SJIS_INPUT;
#ifdef SHIFTJIS_CP932
- cp51932_f = TRUE;
+ cp51932_f = TRUE;
#endif
#ifdef UTF8_OUTPUT_ENABLE
- ms_ucs_map_f = UCS_MAP_CP10001;
+ ms_ucs_map_f = UCS_MAP_CP932;
#endif
- break;
- case EUC_JP:
- break;
- case EUCJP_NKF:
- break;
- case CP51932:
+ }else if(strcmp(codeset, "EUCJP") == 0 ||
+ strcmp(codeset, "EUC-JP") == 0){
+ input_f = EUC_INPUT;
+ }else if(strcmp(codeset, "CP51932") == 0){
+ input_f = EUC_INPUT;
#ifdef SHIFTJIS_CP932
- cp51932_f = TRUE;
+ cp51932_f = TRUE;
#endif
#ifdef UTF8_OUTPUT_ENABLE
- ms_ucs_map_f = UCS_MAP_CP932;
+ ms_ucs_map_f = UCS_MAP_CP932;
#endif
- break;
- case EUCJP_MS:
+ }else if(strcmp(codeset, "EUC-JP-MS") == 0 ||
+ strcmp(codeset, "EUCJP-MS") == 0 ||
+ strcmp(codeset, "EUCJPMS") == 0){
+ input_f = EUC_INPUT;
#ifdef SHIFTJIS_CP932
- cp51932_f = FALSE;
+ cp51932_f = FALSE;
#endif
#ifdef UTF8_OUTPUT_ENABLE
- ms_ucs_map_f = UCS_MAP_MS;
+ ms_ucs_map_f = UCS_MAP_MS;
#endif
- break;
- case EUCJP_ASCII:
+ }else if(strcmp(codeset, "EUC-JP-ASCII") == 0 ||
+ strcmp(codeset, "EUCJP-ASCII") == 0){
+ input_f = EUC_INPUT;
#ifdef SHIFTJIS_CP932
- cp51932_f = FALSE;
+ cp51932_f = FALSE;
#endif
#ifdef UTF8_OUTPUT_ENABLE
- ms_ucs_map_f = UCS_MAP_ASCII;
+ ms_ucs_map_f = UCS_MAP_ASCII;
#endif
- break;
- case SHIFT_JISX0213:
- case SHIFT_JIS_2004:
- x0213_f = TRUE;
+ }else if(strcmp(codeset, "SHIFT_JISX0213") == 0 ||
+ strcmp(codeset, "SHIFT_JIS-2004") == 0){
+ input_f = SJIS_INPUT;
+ x0213_f = TRUE;
#ifdef SHIFTJIS_CP932
- cp51932_f = FALSE;
+ cp51932_f = FALSE;
#endif
- break;
- case EUC_JISX0213:
- case EUC_JIS_2004:
- x0213_f = TRUE;
+ }else if(strcmp(codeset, "EUC-JISX0213") == 0 ||
+ strcmp(codeset, "EUC-JIS-2004") == 0){
+ input_f = EUC_INPUT;
+ x0213_f = TRUE;
#ifdef SHIFTJIS_CP932
- cp51932_f = FALSE;
+ cp51932_f = FALSE;
#endif
- break;
#ifdef UTF8_INPUT_ENABLE
+ }else if(strcmp(codeset, "UTF-8") == 0 ||
+ strcmp(codeset, "UTF-8N") == 0 ||
+ strcmp(codeset, "UTF-8-BOM") == 0){
+ input_f = UTF8_INPUT;
#ifdef UNICODE_NORMALIZATION
- case UTF8_MAC:
- nfc_f = TRUE;
- break;
+ }else if(strcmp(codeset, "UTF8-MAC") == 0 ||
+ strcmp(codeset, "UTF-8-MAC") == 0){
+ input_f = UTF8_INPUT;
+ nfc_f = TRUE;
+#endif
+ }else if(strcmp(codeset, "UTF-16") == 0 ||
+ strcmp(codeset, "UTF-16BE") == 0 ||
+ strcmp(codeset, "UTF-16BE-BOM") == 0){
+ input_f = UTF16_INPUT;
+ input_endian = ENDIAN_BIG;
+ }else if(strcmp(codeset, "UTF-16LE") == 0 ||
+ strcmp(codeset, "UTF-16LE-BOM") == 0){
+ input_f = UTF16_INPUT;
+ input_endian = ENDIAN_LITTLE;
+ }else if(strcmp(codeset, "UTF-32") == 0 ||
+ strcmp(codeset, "UTF-32BE") == 0 ||
+ strcmp(codeset, "UTF-32BE-BOM") == 0){
+ input_f = UTF32_INPUT;
+ input_endian = ENDIAN_BIG;
+ }else if(strcmp(codeset, "UTF-32LE") == 0 ||
+ strcmp(codeset, "UTF-32LE-BOM") == 0){
+ input_f = UTF32_INPUT;
+ input_endian = ENDIAN_LITTLE;
#endif
- case UTF_16:
- case UTF_16BE:
- case UTF_16BE_BOM:
- input_endian = ENDIAN_BIG;
- break;
- case UTF_16LE:
- case UTF_16LE_BOM:
- input_endian = ENDIAN_LITTLE;
- break;
- case UTF_32:
- case UTF_32BE:
- case UTF_32BE_BOM:
- input_endian = ENDIAN_BIG;
- break;
- case UTF_32LE:
- case UTF_32LE_BOM:
- input_endian = ENDIAN_LITTLE;
- break;
+ }
+ continue;
+ }
+ if (strcmp(long_option[i].name, "oc=") == 0){
+ x0201_f = FALSE;
+ for (i=0; i < 16 && SPACE < p[i] && p[i] < DEL; i++){
+ codeset[i] = nkf_toupper(p[i]);
+ }
+ codeset[i] = 0;
+ if(strcmp(codeset, "ISO-2022-JP") == 0){
+ output_conv = j_oconv;
+ }else if(strcmp(codeset, "X-ISO2022JP-CP932") == 0){
+ output_conv = j_oconv;
+ no_cp932ext_f = TRUE;
+#ifdef SHIFTJIS_CP932
+ cp932inv_f = FALSE;
#endif
- }
-}
-
-static void
-set_output_encoding(nkf_encoding *enc)
-{
- switch (nkf_enc_to_index(enc)) {
- case CP50220:
- x0201_f = TRUE;
+#ifdef UTF8_OUTPUT_ENABLE
+ ms_ucs_map_f = UCS_MAP_CP932;
+#endif
+ }else if(strcmp(codeset, "CP50220") == 0){
+ output_conv = j_oconv;
+ x0201_f = TRUE;
#ifdef SHIFTJIS_CP932
- if (cp932inv_f == TRUE) cp932inv_f = FALSE;
+ cp932inv_f = FALSE;
#endif
#ifdef UTF8_OUTPUT_ENABLE
- ms_ucs_map_f = UCS_MAP_CP932;
+ ms_ucs_map_f = UCS_MAP_CP932;
#endif
- break;
- case CP50221:
+ }else if(strcmp(codeset, "CP50221") == 0){
+ output_conv = j_oconv;
#ifdef SHIFTJIS_CP932
- if (cp932inv_f == TRUE) cp932inv_f = FALSE;
+ cp932inv_f = FALSE;
#endif
#ifdef UTF8_OUTPUT_ENABLE
- ms_ucs_map_f = UCS_MAP_CP932;
+ ms_ucs_map_f = UCS_MAP_CP932;
+#endif
+ }else if(strcmp(codeset, "ISO-2022-JP-1") == 0){
+ output_conv = j_oconv;
+#ifdef X0212_ENABLE
+ x0212_f = TRUE;
#endif
- break;
- case ISO_2022_JP_1:
- x0212_f = TRUE;
#ifdef SHIFTJIS_CP932
- if (cp932inv_f == TRUE) cp932inv_f = FALSE;
+ cp932inv_f = FALSE;
#endif
- break;
- case ISO_2022_JP_3:
- x0212_f = TRUE;
- x0213_f = TRUE;
+ }else if(strcmp(codeset, "ISO-2022-JP-3") == 0){
+ output_conv = j_oconv;
+#ifdef X0212_ENABLE
+ x0212_f = TRUE;
+#endif
+ x0213_f = TRUE;
+#ifdef SHIFTJIS_CP932
+ cp932inv_f = FALSE;
+#endif
+ }else if(strcmp(codeset, "SHIFT_JIS") == 0){
+ output_conv = s_oconv;
+ }else if(strcmp(codeset, "WINDOWS-31J") == 0 ||
+ strcmp(codeset, "CSWINDOWS31J") == 0 ||
+ strcmp(codeset, "CP932") == 0 ||
+ strcmp(codeset, "MS932") == 0){
+ output_conv = s_oconv;
+#ifdef UTF8_OUTPUT_ENABLE
+ ms_ucs_map_f = UCS_MAP_CP932;
+#endif
+ }else if(strcmp(codeset, "EUCJP") == 0 ||
+ strcmp(codeset, "EUC-JP") == 0){
+ output_conv = e_oconv;
+ }else if(strcmp(codeset, "CP51932") == 0){
+ output_conv = e_oconv;
#ifdef SHIFTJIS_CP932
- if (cp932inv_f == TRUE) cp932inv_f = FALSE;
+ cp932inv_f = FALSE;
#endif
- break;
- case SHIFT_JIS:
- break;
- case WINDOWS_31J:
#ifdef UTF8_OUTPUT_ENABLE
- ms_ucs_map_f = UCS_MAP_CP932;
+ ms_ucs_map_f = UCS_MAP_CP932;
+#endif
+ }else if(strcmp(codeset, "EUC-JP-MS") == 0 ||
+ strcmp(codeset, "EUCJP-MS") == 0 ||
+ strcmp(codeset, "EUCJPMS") == 0){
+ output_conv = e_oconv;
+#ifdef X0212_ENABLE
+ x0212_f = TRUE;
#endif
- break;
- case CP10001:
#ifdef UTF8_OUTPUT_ENABLE
- ms_ucs_map_f = UCS_MAP_CP10001;
+ ms_ucs_map_f = UCS_MAP_MS;
#endif
- break;
- case EUC_JP:
- x0212_f = TRUE;
-#ifdef SHIFTJIS_CP932
- if (cp932inv_f == TRUE) cp932inv_f = FALSE;
+ }else if(strcmp(codeset, "EUC-JP-ASCII") == 0 ||
+ strcmp(codeset, "EUCJP-ASCII") == 0){
+ output_conv = e_oconv;
+#ifdef X0212_ENABLE
+ x0212_f = TRUE;
#endif
#ifdef UTF8_OUTPUT_ENABLE
- ms_ucs_map_f = UCS_MAP_ASCII;
+ ms_ucs_map_f = UCS_MAP_ASCII;
#endif
- break;
- case EUCJP_NKF:
- x0212_f = FALSE;
+ }else if(strcmp(codeset, "SHIFT_JISX0213") == 0 ||
+ strcmp(codeset, "SHIFT_JIS-2004") == 0){
+ output_conv = s_oconv;
+ x0213_f = TRUE;
#ifdef SHIFTJIS_CP932
- if (cp932inv_f == TRUE) cp932inv_f = FALSE;
+ cp932inv_f = FALSE;
#endif
-#ifdef UTF8_OUTPUT_ENABLE
- ms_ucs_map_f = UCS_MAP_ASCII;
+ }else if(strcmp(codeset, "EUC-JISX0213") == 0 ||
+ strcmp(codeset, "EUC-JIS-2004") == 0){
+ output_conv = e_oconv;
+#ifdef X0212_ENABLE
+ x0212_f = TRUE;
#endif
- break;
- case CP51932:
+ x0213_f = TRUE;
#ifdef SHIFTJIS_CP932
- if (cp932inv_f == TRUE) cp932inv_f = FALSE;
+ cp932inv_f = FALSE;
#endif
#ifdef UTF8_OUTPUT_ENABLE
- ms_ucs_map_f = UCS_MAP_CP932;
+ }else if(strcmp(codeset, "UTF-8") == 0){
+ output_conv = w_oconv;
+ }else if(strcmp(codeset, "UTF-8N") == 0){
+ output_conv = w_oconv;
+ }else if(strcmp(codeset, "UTF-8-BOM") == 0){
+ output_conv = w_oconv;
+ output_bom_f = TRUE;
+ }else if(strcmp(codeset, "UTF-16BE") == 0){
+ output_conv = w_oconv16;
+ }else if(strcmp(codeset, "UTF-16") == 0 ||
+ strcmp(codeset, "UTF-16BE-BOM") == 0){
+ output_conv = w_oconv16;
+ output_bom_f = TRUE;
+ }else if(strcmp(codeset, "UTF-16LE") == 0){
+ output_conv = w_oconv16;
+ output_endian = ENDIAN_LITTLE;
+ }else if(strcmp(codeset, "UTF-16LE-BOM") == 0){
+ output_conv = w_oconv16;
+ output_endian = ENDIAN_LITTLE;
+ output_bom_f = TRUE;
+ }else if(strcmp(codeset, "UTF-32") == 0 ||
+ strcmp(codeset, "UTF-32BE") == 0){
+ output_conv = w_oconv32;
+ }else if(strcmp(codeset, "UTF-32BE-BOM") == 0){
+ output_conv = w_oconv32;
+ output_bom_f = TRUE;
+ }else if(strcmp(codeset, "UTF-32LE") == 0){
+ output_conv = w_oconv32;
+ output_endian = ENDIAN_LITTLE;
+ }else if(strcmp(codeset, "UTF-32LE-BOM") == 0){
+ output_conv = w_oconv32;
+ output_endian = ENDIAN_LITTLE;
+ output_bom_f = TRUE;
#endif
- break;
- case EUCJP_MS:
- x0212_f = TRUE;
-#ifdef UTF8_OUTPUT_ENABLE
- ms_ucs_map_f = UCS_MAP_MS;
+ }
+ continue;
+ }
+#ifdef OVERWRITE
+ if (strcmp(long_option[i].name, "overwrite") == 0){
+ file_out_f = TRUE;
+ overwrite_f = TRUE;
+ preserve_time_f = TRUE;
+ continue;
+ }
+ if (strcmp(long_option[i].name, "overwrite=") == 0){
+ file_out_f = TRUE;
+ overwrite_f = TRUE;
+ preserve_time_f = TRUE;
+ backup_f = TRUE;
+ backup_suffix = malloc(strlen((char *) p) + 1);
+ strcpy(backup_suffix, (char *) p);
+ continue;
+ }
+ if (strcmp(long_option[i].name, "in-place") == 0){
+ file_out_f = TRUE;
+ overwrite_f = TRUE;
+ preserve_time_f = FALSE;
+ continue;
+ }
+ if (strcmp(long_option[i].name, "in-place=") == 0){
+ file_out_f = TRUE;
+ overwrite_f = TRUE;
+ preserve_time_f = FALSE;
+ backup_f = TRUE;
+ backup_suffix = malloc(strlen((char *) p) + 1);
+ strcpy(backup_suffix, (char *) p);
+ continue;
+ }
+#endif
+#ifdef INPUT_OPTION
+ if (strcmp(long_option[i].name, "cap-input") == 0){
+ cap_f = TRUE;
+ continue;
+ }
+ if (strcmp(long_option[i].name, "url-input") == 0){
+ url_f = TRUE;
+ continue;
+ }
+#endif
+#ifdef NUMCHAR_OPTION
+ if (strcmp(long_option[i].name, "numchar-input") == 0){
+ numchar_f = TRUE;
+ continue;
+ }
+#endif
+#ifdef CHECK_OPTION
+ if (strcmp(long_option[i].name, "no-output") == 0){
+ noout_f = TRUE;
+ continue;
+ }
+ if (strcmp(long_option[i].name, "debug") == 0){
+ debug_f = TRUE;
+ continue;
+ }
+#endif
+ if (strcmp(long_option[i].name, "cp932") == 0){
+#ifdef SHIFTJIS_CP932
+ cp51932_f = TRUE;
+ cp932inv_f = TRUE;
#endif
- break;
- case EUCJP_ASCII:
- x0212_f = TRUE;
#ifdef UTF8_OUTPUT_ENABLE
- ms_ucs_map_f = UCS_MAP_ASCII;
+ ms_ucs_map_f = UCS_MAP_CP932;
#endif
- break;
- case SHIFT_JISX0213:
- case SHIFT_JIS_2004:
- x0213_f = TRUE;
+ continue;
+ }
+ if (strcmp(long_option[i].name, "no-cp932") == 0){
#ifdef SHIFTJIS_CP932
- if (cp932inv_f == TRUE) cp932inv_f = FALSE;
+ cp51932_f = FALSE;
+ cp932inv_f = FALSE;
#endif
- break;
- case EUC_JISX0213:
- case EUC_JIS_2004:
- x0212_f = TRUE;
- x0213_f = TRUE;
+#ifdef UTF8_OUTPUT_ENABLE
+ ms_ucs_map_f = UCS_MAP_ASCII;
+#endif
+ continue;
+ }
#ifdef SHIFTJIS_CP932
- if (cp932inv_f == TRUE) cp932inv_f = FALSE;
+ if (strcmp(long_option[i].name, "cp932inv") == 0){
+ cp932inv_f = TRUE;
+ continue;
+ }
+#endif
+
+#ifdef X0212_ENABLE
+ if (strcmp(long_option[i].name, "x0212") == 0){
+ x0212_f = TRUE;
+ continue;
+ }
+#endif
+
+#ifdef EXEC_IO
+ if (strcmp(long_option[i].name, "exec-in") == 0){
+ exec_f = 1;
+ return;
+ }
+ if (strcmp(long_option[i].name, "exec-out") == 0){
+ exec_f = -1;
+ return;
+ }
+#endif
+#if defined(UTF8_OUTPUT_ENABLE) && defined(UTF8_INPUT_ENABLE)
+ if (strcmp(long_option[i].name, "no-cp932ext") == 0){
+ no_cp932ext_f = TRUE;
+ continue;
+ }
+ if (strcmp(long_option[i].name, "no-best-fit-chars") == 0){
+ no_best_fit_chars_f = TRUE;
+ continue;
+ }
+ if (strcmp(long_option[i].name, "fb-skip") == 0){
+ encode_fallback = NULL;
+ continue;
+ }
+ if (strcmp(long_option[i].name, "fb-html") == 0){
+ encode_fallback = encode_fallback_html;
+ continue;
+ }
+ if (strcmp(long_option[i].name, "fb-xml" ) == 0){
+ encode_fallback = encode_fallback_xml;
+ continue;
+ }
+ if (strcmp(long_option[i].name, "fb-java") == 0){
+ encode_fallback = encode_fallback_java;
+ continue;
+ }
+ if (strcmp(long_option[i].name, "fb-perl") == 0){
+ encode_fallback = encode_fallback_perl;
+ continue;
+ }
+ if (strcmp(long_option[i].name, "fb-subchar") == 0){
+ encode_fallback = encode_fallback_subchar;
+ continue;
+ }
+ if (strcmp(long_option[i].name, "fb-subchar=") == 0){
+ encode_fallback = encode_fallback_subchar;
+ unicode_subchar = 0;
+ if (p[0] != '0'){
+ /* decimal number */
+ for (i = 0; i < 7 && nkf_isdigit(p[i]); i++){
+ unicode_subchar *= 10;
+ unicode_subchar += hex2bin(p[i]);
+ }
+ }else if(p[1] == 'x' || p[1] == 'X'){
+ /* hexadecimal number */
+ for (i = 2; i < 8 && nkf_isxdigit(p[i]); i++){
+ unicode_subchar <<= 4;
+ unicode_subchar |= hex2bin(p[i]);
+ }
+ }else{
+ /* octal number */
+ for (i = 1; i < 8 && nkf_isoctal(p[i]); i++){
+ unicode_subchar *= 8;
+ unicode_subchar += hex2bin(p[i]);
+ }
+ }
+ w16e_conv(unicode_subchar, &i, &j);
+ unicode_subchar = i<<8 | j;
+ continue;
+ }
#endif
- break;
#ifdef UTF8_OUTPUT_ENABLE
- case UTF_8_BOM:
- output_bom_f = TRUE;
- break;
- case UTF_16:
- case UTF_16BE_BOM:
- output_bom_f = TRUE;
- break;
- case UTF_16LE:
- output_endian = ENDIAN_LITTLE;
- output_bom_f = FALSE;
- break;
- case UTF_16LE_BOM:
- output_endian = ENDIAN_LITTLE;
- output_bom_f = TRUE;
- break;
- case UTF_32BE_BOM:
- output_bom_f = TRUE;
- break;
- case UTF_32LE:
- output_endian = ENDIAN_LITTLE;
- output_bom_f = FALSE;
- break;
- case UTF_32LE_BOM:
- output_endian = ENDIAN_LITTLE;
- output_bom_f = TRUE;
- break;
+ if (strcmp(long_option[i].name, "ms-ucs-map") == 0){
+ ms_ucs_map_f = UCS_MAP_MS;
+ continue;
+ }
+#endif
+#ifdef UNICODE_NORMALIZATION
+ if (strcmp(long_option[i].name, "utf8mac-input") == 0){
+ input_f = UTF8_INPUT;
+ nfc_f = TRUE;
+ continue;
+ }
+#endif
+ if (strcmp(long_option[i].name, "prefix=") == 0){
+ if (nkf_isgraph(p[0])){
+ for (i = 1; nkf_isgraph(p[i]); i++){
+ prefix_table[p[i]] = p[0];
+ }
+ }
+ continue;
+ }
+ }
+ continue;
+ case 'b': /* buffered mode */
+ unbuf_f = FALSE;
+ continue;
+ case 'u': /* non bufferd mode */
+ unbuf_f = TRUE;
+ continue;
+ case 't': /* transparent mode */
+ if (*cp=='1') {
+ /* alias of -t */
+ nop_f = TRUE;
+ *cp++;
+ } else if (*cp=='2') {
+ /*
+ * -t with put/get
+ *
+ * nkf -t2MB hoge.bin | nkf -t2mB | diff -s - hoge.bin
+ *
+ */
+ nop_f = 2;
+ *cp++;
+ } else
+ nop_f = TRUE;
+ continue;
+ case 'j': /* JIS output */
+ case 'n':
+ output_conv = j_oconv;
+ continue;
+ case 'e': /* AT&T EUC output */
+ output_conv = e_oconv;
+ cp932inv_f = FALSE;
+ continue;
+ case 's': /* SJIS output */
+ output_conv = s_oconv;
+ continue;
+ case 'l': /* ISO8859 Latin-1 support, no conversion */
+ iso8859_f = TRUE; /* Only compatible with ISO-2022-JP */
+ input_f = LATIN1_INPUT;
+ continue;
+ case 'i': /* Kanji IN ESC-$-@/B */
+ if (*cp=='@'||*cp=='B')
+ kanji_intro = *cp++;
+ continue;
+ case 'o': /* ASCII IN ESC-(-J/B */
+ if (*cp=='J'||*cp=='B'||*cp=='H')
+ ascii_intro = *cp++;
+ continue;
+ case 'h':
+ /*
+ bit:1 katakana->hiragana
+ bit:2 hiragana->katakana
+ */
+ if ('9'>= *cp && *cp>='0')
+ hira_f |= (*cp++ -'0');
+ else
+ hira_f |= 1;
+ continue;
+ case 'r':
+ rot_f = TRUE;
+ continue;
+#if defined(MSDOS) || defined(__OS2__)
+ case 'T':
+ binmode_f = FALSE;
+ continue;
+#endif
+#ifndef PERL_XS
+ case 'V':
+ version();
+ exit(1);
+ break;
+ case 'v':
+ usage();
+ exit(1);
+ break;
+#endif
+#ifdef UTF8_OUTPUT_ENABLE
+ case 'w': /* UTF-8 output */
+ if (cp[0] == '8') {
+ output_conv = w_oconv; cp++;
+ if (cp[0] == '0'){
+ cp++;
+ } else {
+ output_bom_f = TRUE;
+ }
+ } else {
+ if ('1'== cp[0] && '6'==cp[1]) {
+ output_conv = w_oconv16; cp+=2;
+ } else if ('3'== cp[0] && '2'==cp[1]) {
+ output_conv = w_oconv32; cp+=2;
+ } else {
+ output_conv = w_oconv;
+ continue;
+ }
+ if (cp[0]=='L') {
+ cp++;
+ output_endian = ENDIAN_LITTLE;
+ } else if (cp[0] == 'B') {
+ cp++;
+ } else {
+ continue;
+ }
+ if (cp[0] == '0'){
+ cp++;
+ } else {
+ output_bom_f = TRUE;
+ }
+ }
+ continue;
+#endif
+#ifdef UTF8_INPUT_ENABLE
+ case 'W': /* UTF input */
+ if (cp[0] == '8') {
+ cp++;
+ input_f = UTF8_INPUT;
+ }else{
+ if ('1'== cp[0] && '6'==cp[1]) {
+ cp += 2;
+ input_f = UTF16_INPUT;
+ input_endian = ENDIAN_BIG;
+ } else if ('3'== cp[0] && '2'==cp[1]) {
+ cp += 2;
+ input_f = UTF32_INPUT;
+ input_endian = ENDIAN_BIG;
+ } else {
+ input_f = UTF8_INPUT;
+ continue;
+ }
+ if (cp[0]=='L') {
+ cp++;
+ input_endian = ENDIAN_LITTLE;
+ } else if (cp[0] == 'B') {
+ cp++;
+ }
+ }
+ continue;
+#endif
+ /* Input code assumption */
+ case 'J': /* JIS input */
+ input_f = JIS_INPUT;
+ continue;
+ case 'E': /* AT&T EUC input */
+ input_f = EUC_INPUT;
+ continue;
+ case 'S': /* MS Kanji input */
+ input_f = SJIS_INPUT;
+ if (x0201_f==NO_X0201) x0201_f=TRUE;
+ continue;
+ case 'Z': /* Convert X0208 alphabet to asii */
+ /* bit:0 Convert X0208
+ bit:1 Convert Kankaku to one space
+ bit:2 Convert Kankaku to two spaces
+ bit:3 Convert HTML Entity
+ */
+ if ('9'>= *cp && *cp>='0')
+ alpha_f |= 1<<(*cp++ -'0');
+ else
+ alpha_f |= TRUE;
+ continue;
+ case 'x': /* Convert X0201 kana to X0208 or X0201 Conversion */
+ x0201_f = FALSE; /* No X0201->X0208 conversion */
+ /* accept X0201
+ ESC-(-I in JIS, EUC, MS Kanji
+ SI/SO in JIS, EUC, MS Kanji
+ SSO in EUC, JIS, not in MS Kanji
+ MS Kanji (0xa0-0xdf)
+ output X0201
+ ESC-(-I in JIS (0x20-0x5f)
+ SSO in EUC (0xa0-0xdf)
+ 0xa0-0xd in MS Kanji (0xa0-0xdf)
+ */
+ continue;
+ case 'X': /* Assume X0201 kana */
+ /* Default value is NO_X0201 for EUC/MS-Kanji mix */
+ x0201_f = TRUE;
+ continue;
+ case 'F': /* prserve new lines */
+ fold_preserve_f = TRUE;
+ case 'f': /* folding -f60 or -f */
+ fold_f = TRUE;
+ fold_len = 0;
+ while('0'<= *cp && *cp <='9') { /* we don't use atoi here */
+ fold_len *= 10;
+ fold_len += *cp++ - '0';
+ }
+ if (!(0<fold_len && fold_len<BUFSIZ))
+ fold_len = DEFAULT_FOLD;
+ if (*cp=='-') {
+ fold_margin = 0;
+ cp++;
+ while('0'<= *cp && *cp <='9') { /* we don't use atoi here */
+ fold_margin *= 10;
+ fold_margin += *cp++ - '0';
+ }
+ }
+ continue;
+ case 'm': /* MIME support */
+ /* mime_decode_f = TRUE; */ /* this has too large side effects... */
+ if (*cp=='B'||*cp=='Q') {
+ mime_decode_mode = *cp++;
+ mimebuf_f = FIXED_MIME;
+ } else if (*cp=='N') {
+ mime_f = TRUE; cp++;
+ } else if (*cp=='S') {
+ mime_f = STRICT_MIME; cp++;
+ } else if (*cp=='0') {
+ mime_decode_f = FALSE;
+ mime_f = FALSE; cp++;
+ }
+ continue;
+ case 'M': /* MIME output */
+ if (*cp=='B') {
+ mimeout_mode = 'B';
+ mimeout_f = FIXED_MIME; cp++;
+ } else if (*cp=='Q') {
+ mimeout_mode = 'Q';
+ mimeout_f = FIXED_MIME; cp++;
+ } else {
+ mimeout_f = TRUE;
+ }
+ continue;
+ case 'B': /* Broken JIS support */
+ /* bit:0 no ESC JIS
+ bit:1 allow any x on ESC-(-x or ESC-$-x
+ bit:2 reset to ascii on NL
+ */
+ if ('9'>= *cp && *cp>='0')
+ broken_f |= 1<<(*cp++ -'0');
+ else
+ broken_f |= TRUE;
+ continue;
+#ifndef PERL_XS
+ case 'O':/* for Output file */
+ file_out_f = TRUE;
+ continue;
+#endif
+ case 'c':/* add cr code */
+ crmode_f = CRLF;
+ continue;
+ case 'd':/* delete cr code */
+ crmode_f = NL;
+ continue;
+ case 'I': /* ISO-2022-JP output */
+ iso2022jp_f = TRUE;
+ continue;
+ case 'L': /* line mode */
+ if (*cp=='u') { /* unix */
+ crmode_f = NL; cp++;
+ } else if (*cp=='m') { /* mac */
+ crmode_f = CR; cp++;
+ } else if (*cp=='w') { /* windows */
+ crmode_f = CRLF; cp++;
+ } else if (*cp=='0') { /* no conversion */
+ crmode_f = 0; cp++;
+ }
+ continue;
+ case 'g':
+#ifndef PERL_XS
+ guess_f = TRUE;
#endif
+ continue;
+ case ' ':
+ /* module muliple options in a string are allowed for Perl moudle */
+ while(*cp && *cp++!='-');
+ continue;
+ default:
+ /* bogus option but ignored */
+ continue;
+ }
}
}
-static struct input_code*
-find_inputcode_byfunc(nkf_char (*iconv_func)(nkf_char c2,nkf_char c1,nkf_char c0))
+struct input_code * find_inputcode_byfunc(nkf_char (*iconv_func)(nkf_char c2,nkf_char c1,nkf_char c0))
{
if (iconv_func){
- struct input_code *p = input_code_list;
- while (p->name){
- if (iconv_func == p->iconv_func){
- return p;
- }
- p++;
- }
+ struct input_code *p = input_code_list;
+ while (p->name){
+ if (iconv_func == p->iconv_func){
+ return p;
+ }
+ p++;
+ }
}
return 0;
}
-static void
-set_iconv(nkf_char f, nkf_char (*iconv_func)(nkf_char c2,nkf_char c1,nkf_char c0))
+void set_iconv(nkf_char f, nkf_char (*iconv_func)(nkf_char c2,nkf_char c1,nkf_char c0))
{
#ifdef INPUT_CODE_FIX
- if (f || !input_encoding)
+ if (f || !input_f)
#endif
- if (estab_f != f){
- estab_f = f;
- }
+ if (estab_f != f){
+ estab_f = f;
+ }
if (iconv_func
#ifdef INPUT_CODE_FIX
- && (f == -TRUE || !input_encoding) /* -TRUE means "FORCE" */
+ && (f == -TRUE || !input_f) /* -TRUE means "FORCE" */
#endif
- ){
- iconv = iconv_func;
+ ){
+ iconv = iconv_func;
}
#ifdef CHECK_OPTION
if (estab_f && iconv_for_check != iconv){
- struct input_code *p = find_inputcode_byfunc(iconv);
- if (p){
- set_input_codename(p->name);
- debug(p->name);
- }
- iconv_for_check = iconv;
+ struct input_code *p = find_inputcode_byfunc(iconv);
+ if (p){
+ set_input_codename(p->name);
+ debug(input_codename);
+ }
+ iconv_for_check = iconv;
}
#endif
}
-#ifdef X0212_ENABLE
-static nkf_char
-x0212_shift(nkf_char c)
+#define SCORE_L2 (1) /* $BBh(B2$B?e=`4A;z(B */
+#define SCORE_KANA (SCORE_L2 << 1) /* $B$$$o$f$kH>3Q%+%J(B */
+#define SCORE_DEPEND (SCORE_KANA << 1) /* $B5!<o0MB8J8;z(B */
+#ifdef SHIFTJIS_CP932
+#define SCORE_CP932 (SCORE_DEPEND << 1) /* CP932 $B$K$h$kFI$_49$((B */
+#define SCORE_NO_EXIST (SCORE_CP932 << 1) /* $BB8:_$7$J$$J8;z(B */
+#else
+#define SCORE_NO_EXIST (SCORE_DEPEND << 1) /* $BB8:_$7$J$$J8;z(B */
+#endif
+#define SCORE_iMIME (SCORE_NO_EXIST << 1) /* MIME $B$K$h$k;XDj(B */
+#define SCORE_ERROR (SCORE_iMIME << 1) /* $B%(%i!<(B */
+
+#define SCORE_INIT (SCORE_iMIME)
+
+const nkf_char score_table_A0[] = {
+ 0, 0, 0, 0,
+ 0, 0, 0, 0,
+ 0, SCORE_DEPEND, SCORE_DEPEND, SCORE_DEPEND,
+ SCORE_DEPEND, SCORE_DEPEND, SCORE_DEPEND, SCORE_NO_EXIST,
+};
+
+const nkf_char score_table_F0[] = {
+ SCORE_L2, SCORE_L2, SCORE_L2, SCORE_L2,
+ SCORE_L2, SCORE_DEPEND, SCORE_NO_EXIST, SCORE_NO_EXIST,
+ SCORE_DEPEND, SCORE_DEPEND, SCORE_DEPEND, SCORE_DEPEND,
+ SCORE_DEPEND, SCORE_NO_EXIST, SCORE_NO_EXIST, SCORE_ERROR,
+};
+
+void set_code_score(struct input_code *ptr, nkf_char score)
{
- nkf_char ret = c;
- c &= 0x7f;
- if (is_eucg3(ret)){
- if (0x75 <= c && c <= 0x7f){
- ret = c + (0x109 - 0x75);
- }
- }else{
- if (0x75 <= c && c <= 0x7f){
- ret = c + (0x113 - 0x75);
- }
+ if (ptr){
+ ptr->score |= score;
}
- return ret;
}
+void clr_code_score(struct input_code *ptr, nkf_char score)
+{
+ if (ptr){
+ ptr->score &= ~score;
+ }
+}
-static nkf_char
-x0212_unshift(nkf_char c)
+void code_score(struct input_code *ptr)
{
- nkf_char ret = c;
- if (0x7f <= c && c <= 0x88){
- ret = c + (0x75 - 0x7f);
- }else if (0x89 <= c && c <= 0x92){
- ret = PREFIX_EUCG3 | 0x80 | (c + (0x75 - 0x89));
+ nkf_char c2 = ptr->buf[0];
+#ifdef UTF8_OUTPUT_ENABLE
+ nkf_char c1 = ptr->buf[1];
+#endif
+ if (c2 < 0){
+ set_code_score(ptr, SCORE_ERROR);
+ }else if (c2 == SSO){
+ set_code_score(ptr, SCORE_KANA);
+#ifdef UTF8_OUTPUT_ENABLE
+ }else if (!e2w_conv(c2, c1)){
+ set_code_score(ptr, SCORE_NO_EXIST);
+#endif
+ }else if ((c2 & 0x70) == 0x20){
+ set_code_score(ptr, score_table_A0[c2 & 0x0f]);
+ }else if ((c2 & 0x70) == 0x70){
+ set_code_score(ptr, score_table_F0[c2 & 0x0f]);
+ }else if ((c2 & 0x70) >= 0x50){
+ set_code_score(ptr, SCORE_L2);
+ }
+}
+
+void status_disable(struct input_code *ptr)
+{
+ ptr->stat = -1;
+ ptr->buf[0] = -1;
+ code_score(ptr);
+ if (iconv == ptr->iconv_func) set_iconv(FALSE, 0);
+}
+
+void status_push_ch(struct input_code *ptr, nkf_char c)
+{
+ ptr->buf[ptr->index++] = c;
+}
+
+void status_clear(struct input_code *ptr)
+{
+ ptr->stat = 0;
+ ptr->index = 0;
+}
+
+void status_reset(struct input_code *ptr)
+{
+ status_clear(ptr);
+ ptr->score = SCORE_INIT;
+}
+
+void status_reinit(struct input_code *ptr)
+{
+ status_reset(ptr);
+ ptr->_file_stat = 0;
+}
+
+void status_check(struct input_code *ptr, nkf_char c)
+{
+ if (c <= DEL && estab_f){
+ status_reset(ptr);
+ }
+}
+
+void s_status(struct input_code *ptr, nkf_char c)
+{
+ switch(ptr->stat){
+ case -1:
+ status_check(ptr, c);
+ break;
+ case 0:
+ if (c <= DEL){
+ break;
+#ifdef NUMCHAR_OPTION
+ }else if (is_unicode_capsule(c)){
+ break;
+#endif
+ }else if (0xa1 <= c && c <= 0xdf){
+ status_push_ch(ptr, SSO);
+ status_push_ch(ptr, c);
+ code_score(ptr);
+ status_clear(ptr);
+ }else if ((0x81 <= c && c < 0xa0) || (0xe0 <= c && c <= 0xef)){
+ ptr->stat = 1;
+ status_push_ch(ptr, c);
+#ifdef SHIFTJIS_CP932
+ }else if (cp51932_f
+ && is_ibmext_in_sjis(c)){
+ ptr->stat = 2;
+ status_push_ch(ptr, c);
+#endif /* SHIFTJIS_CP932 */
+#ifdef X0212_ENABLE
+ }else if (x0212_f && 0xf0 <= c && c <= 0xfc){
+ ptr->stat = 1;
+ status_push_ch(ptr, c);
+#endif /* X0212_ENABLE */
+ }else{
+ status_disable(ptr);
+ }
+ break;
+ case 1:
+ if ((0x40 <= c && c <= 0x7e) || (0x80 <= c && c <= 0xfc)){
+ status_push_ch(ptr, c);
+ s2e_conv(ptr->buf[0], ptr->buf[1], &ptr->buf[0], &ptr->buf[1]);
+ code_score(ptr);
+ status_clear(ptr);
+ }else{
+ status_disable(ptr);
+ }
+ break;
+ case 2:
+#ifdef SHIFTJIS_CP932
+ if ((0x40 <= c && c <= 0x7e) || (0x80 <= c && c <= 0xfc)){
+ status_push_ch(ptr, c);
+ if (s2e_conv(ptr->buf[0], ptr->buf[1], &ptr->buf[0], &ptr->buf[1]) == 0){
+ set_code_score(ptr, SCORE_CP932);
+ status_clear(ptr);
+ break;
+ }
+ }
+#endif /* SHIFTJIS_CP932 */
+#ifndef X0212_ENABLE
+ status_disable(ptr);
+#endif
+ break;
}
- return ret;
}
+
+void e_status(struct input_code *ptr, nkf_char c)
+{
+ switch (ptr->stat){
+ case -1:
+ status_check(ptr, c);
+ break;
+ case 0:
+ if (c <= DEL){
+ break;
+#ifdef NUMCHAR_OPTION
+ }else if (is_unicode_capsule(c)){
+ break;
+#endif
+ }else if (SSO == c || (0xa1 <= c && c <= 0xfe)){
+ ptr->stat = 1;
+ status_push_ch(ptr, c);
+#ifdef X0212_ENABLE
+ }else if (0x8f == c){
+ ptr->stat = 2;
+ status_push_ch(ptr, c);
+#endif /* X0212_ENABLE */
+ }else{
+ status_disable(ptr);
+ }
+ break;
+ case 1:
+ if (0xa1 <= c && c <= 0xfe){
+ status_push_ch(ptr, c);
+ code_score(ptr);
+ status_clear(ptr);
+ }else{
+ status_disable(ptr);
+ }
+ break;
+#ifdef X0212_ENABLE
+ case 2:
+ if (0xa1 <= c && c <= 0xfe){
+ ptr->stat = 1;
+ status_push_ch(ptr, c);
+ }else{
+ status_disable(ptr);
+ }
#endif /* X0212_ENABLE */
+ }
+}
-static nkf_char
-e2s_conv(nkf_char c2, nkf_char c1, nkf_char *p2, nkf_char *p1)
+#ifdef UTF8_INPUT_ENABLE
+void w_status(struct input_code *ptr, nkf_char c)
{
- nkf_char ndx;
- if (is_eucg3(c2)){
- ndx = c2 & 0x7f;
- if (x0213_f){
- if((0x21 <= ndx && ndx <= 0x2F)){
- if (p2) *p2 = ((ndx - 1) >> 1) + 0xec - ndx / 8 * 3;
- if (p1) *p1 = c1 + ((ndx & 1) ? ((c1 < 0x60) ? 0x1f : 0x20) : 0x7e);
- return 0;
- }else if(0x6E <= ndx && ndx <= 0x7E){
- if (p2) *p2 = ((ndx - 1) >> 1) + 0xbe;
- if (p1) *p1 = c1 + ((ndx & 1) ? ((c1 < 0x60) ? 0x1f : 0x20) : 0x7e);
- return 0;
+ switch (ptr->stat){
+ case -1:
+ status_check(ptr, c);
+ break;
+ case 0:
+ if (c <= DEL){
+ break;
+#ifdef NUMCHAR_OPTION
+ }else if (is_unicode_capsule(c)){
+ break;
+#endif
+ }else if (0xc0 <= c && c <= 0xdf){
+ ptr->stat = 1;
+ status_push_ch(ptr, c);
+ }else if (0xe0 <= c && c <= 0xef){
+ ptr->stat = 2;
+ status_push_ch(ptr, c);
+ }else if (0xf0 <= c && c <= 0xf4){
+ ptr->stat = 3;
+ status_push_ch(ptr, c);
+ }else{
+ status_disable(ptr);
+ }
+ break;
+ case 1:
+ case 2:
+ if (0x80 <= c && c <= 0xbf){
+ status_push_ch(ptr, c);
+ if (ptr->index > ptr->stat){
+ int bom = (ptr->buf[0] == 0xef && ptr->buf[1] == 0xbb
+ && ptr->buf[2] == 0xbf);
+ w2e_conv(ptr->buf[0], ptr->buf[1], ptr->buf[2],
+ &ptr->buf[0], &ptr->buf[1]);
+ if (!bom){
+ code_score(ptr);
+ }
+ status_clear(ptr);
+ }
+ }else{
+ status_disable(ptr);
+ }
+ break;
+ case 3:
+ if (0x80 <= c && c <= 0xbf){
+ if (ptr->index < ptr->stat){
+ status_push_ch(ptr, c);
+ } else {
+ status_clear(ptr);
}
- return 1;
+ }else{
+ status_disable(ptr);
+ }
+ break;
+ }
+}
+#endif
+
+void code_status(nkf_char c)
+{
+ int action_flag = 1;
+ struct input_code *result = 0;
+ struct input_code *p = input_code_list;
+ while (p->name){
+ if (!p->status_func) {
+ ++p;
+ continue;
}
+ if (!p->status_func)
+ continue;
+ (p->status_func)(p, c);
+ if (p->stat > 0){
+ action_flag = 0;
+ }else if(p->stat == 0){
+ if (result){
+ action_flag = 0;
+ }else{
+ result = p;
+ }
+ }
+ ++p;
+ }
+
+ if (action_flag){
+ if (result && !estab_f){
+ set_iconv(TRUE, result->iconv_func);
+ }else if (c <= DEL){
+ struct input_code *ptr = input_code_list;
+ while (ptr->name){
+ status_reset(ptr);
+ ++ptr;
+ }
+ }
+ }
+}
+
+#ifndef WIN32DLL
+nkf_char std_getc(FILE *f)
+{
+ if (std_gc_ndx){
+ return std_gc_buf[--std_gc_ndx];
+ }
+ return getc(f);
+}
+#endif /*WIN32DLL*/
+
+nkf_char std_ungetc(nkf_char c, FILE *f)
+{
+ if (std_gc_ndx == STD_GC_BUFSIZE){
+ return EOF;
+ }
+ std_gc_buf[std_gc_ndx++] = c;
+ return c;
+}
+
+#ifndef WIN32DLL
+void std_putc(nkf_char c)
+{
+ if(c!=EOF)
+ putchar(c);
+}
+#endif /*WIN32DLL*/
+
+#if !defined(PERL_XS) && !defined(WIN32DLL)
+nkf_char noconvert(FILE *f)
+{
+ nkf_char c;
+
+ if (nop_f == 2)
+ module_connection();
+ while ((c = (*i_getc)(f)) != EOF)
+ (*o_putc)(c);
+ (*o_putc)(EOF);
+ return 1;
+}
+#endif
+
+void module_connection(void)
+{
+ oconv = output_conv;
+ o_putc = std_putc;
+
+ /* replace continucation module, from output side */
+
+ /* output redicrection */
+#ifdef CHECK_OPTION
+ if (noout_f || guess_f){
+ o_putc = no_putc;
+ }
+#endif
+ if (mimeout_f) {
+ o_mputc = o_putc;
+ o_putc = mime_putc;
+ if (mimeout_f == TRUE) {
+ o_base64conv = oconv; oconv = base64_conv;
+ }
+ /* base64_count = 0; */
+ }
+
+ if (crmode_f) {
+ o_crconv = oconv; oconv = cr_conv;
+ }
+ if (rot_f) {
+ o_rot_conv = oconv; oconv = rot_conv;
+ }
+ if (iso2022jp_f) {
+ o_iso2022jp_check_conv = oconv; oconv = iso2022jp_check_conv;
+ }
+ if (hira_f) {
+ o_hira_conv = oconv; oconv = hira_conv;
+ }
+ if (fold_f) {
+ o_fconv = oconv; oconv = fold_conv;
+ f_line = 0;
+ }
+ if (alpha_f || x0201_f) {
+ o_zconv = oconv; oconv = z_conv;
+ }
+
+ i_getc = std_getc;
+ i_ungetc = std_ungetc;
+ /* input redicrection */
+#ifdef INPUT_OPTION
+ if (cap_f){
+ i_cgetc = i_getc; i_getc = cap_getc;
+ i_cungetc = i_ungetc; i_ungetc= cap_ungetc;
+ }
+ if (url_f){
+ i_ugetc = i_getc; i_getc = url_getc;
+ i_uungetc = i_ungetc; i_ungetc= url_ungetc;
+ }
+#endif
+#ifdef NUMCHAR_OPTION
+ if (numchar_f){
+ i_ngetc = i_getc; i_getc = numchar_getc;
+ i_nungetc = i_ungetc; i_ungetc= numchar_ungetc;
+ }
+#endif
+#ifdef UNICODE_NORMALIZATION
+ if (nfc_f && input_f == UTF8_INPUT){
+ i_nfc_getc = i_getc; i_getc = nfc_getc;
+ i_nfc_ungetc = i_ungetc; i_ungetc= nfc_ungetc;
+ }
+#endif
+ if (mime_f && mimebuf_f==FIXED_MIME) {
+ i_mgetc = i_getc; i_getc = mime_getc;
+ i_mungetc = i_ungetc; i_ungetc = mime_ungetc;
+ }
+ if (broken_f & 1) {
+ i_bgetc = i_getc; i_getc = broken_getc;
+ i_bungetc = i_ungetc; i_ungetc = broken_ungetc;
+ }
+ if (input_f == JIS_INPUT || input_f == EUC_INPUT || input_f == LATIN1_INPUT) {
+ set_iconv(-TRUE, e_iconv);
+ } else if (input_f == SJIS_INPUT) {
+ set_iconv(-TRUE, s_iconv);
+#ifdef UTF8_INPUT_ENABLE
+ } else if (input_f == UTF8_INPUT) {
+ set_iconv(-TRUE, w_iconv);
+ } else if (input_f == UTF16_INPUT) {
+ set_iconv(-TRUE, w_iconv16);
+ } else if (input_f == UTF32_INPUT) {
+ set_iconv(-TRUE, w_iconv32);
+#endif
+ } else {
+ set_iconv(FALSE, e_iconv);
+ }
+
+ {
+ struct input_code *p = input_code_list;
+ while (p->name){
+ status_reinit(p++);
+ }
+ }
+}
+
+/*
+ * Check and Ignore BOM
+ */
+void check_bom(FILE *f)
+{
+ int c2;
+ switch(c2 = (*i_getc)(f)){
+ case 0x00:
+ if((c2 = (*i_getc)(f)) == 0x00){
+ if((c2 = (*i_getc)(f)) == 0xFE){
+ if((c2 = (*i_getc)(f)) == 0xFF){
+ if(!input_f){
+ set_iconv(TRUE, w_iconv32);
+ }
+ if (iconv == w_iconv32) {
+ input_endian = ENDIAN_BIG;
+ return;
+ }
+ (*i_ungetc)(0xFF,f);
+ }else (*i_ungetc)(c2,f);
+ (*i_ungetc)(0xFE,f);
+ }else if(c2 == 0xFF){
+ if((c2 = (*i_getc)(f)) == 0xFE){
+ if(!input_f){
+ set_iconv(TRUE, w_iconv32);
+ }
+ if (iconv == w_iconv32) {
+ input_endian = ENDIAN_2143;
+ return;
+ }
+ (*i_ungetc)(0xFF,f);
+ }else (*i_ungetc)(c2,f);
+ (*i_ungetc)(0xFF,f);
+ }else (*i_ungetc)(c2,f);
+ (*i_ungetc)(0x00,f);
+ }else (*i_ungetc)(c2,f);
+ (*i_ungetc)(0x00,f);
+ break;
+ case 0xEF:
+ if((c2 = (*i_getc)(f)) == 0xBB){
+ if((c2 = (*i_getc)(f)) == 0xBF){
+ if(!input_f){
+ set_iconv(TRUE, w_iconv);
+ }
+ if (iconv == w_iconv) {
+ return;
+ }
+ (*i_ungetc)(0xBF,f);
+ }else (*i_ungetc)(c2,f);
+ (*i_ungetc)(0xBB,f);
+ }else (*i_ungetc)(c2,f);
+ (*i_ungetc)(0xEF,f);
+ break;
+ case 0xFE:
+ if((c2 = (*i_getc)(f)) == 0xFF){
+ if((c2 = (*i_getc)(f)) == 0x00){
+ if((c2 = (*i_getc)(f)) == 0x00){
+ if(!input_f){
+ set_iconv(TRUE, w_iconv32);
+ }
+ if (iconv == w_iconv32) {
+ input_endian = ENDIAN_3412;
+ return;
+ }
+ (*i_ungetc)(0x00,f);
+ }else (*i_ungetc)(c2,f);
+ (*i_ungetc)(0x00,f);
+ }else (*i_ungetc)(c2,f);
+ if(!input_f){
+ set_iconv(TRUE, w_iconv16);
+ }
+ if (iconv == w_iconv16) {
+ input_endian = ENDIAN_BIG;
+ return;
+ }
+ (*i_ungetc)(0xFF,f);
+ }else (*i_ungetc)(c2,f);
+ (*i_ungetc)(0xFE,f);
+ break;
+ case 0xFF:
+ if((c2 = (*i_getc)(f)) == 0xFE){
+ if((c2 = (*i_getc)(f)) == 0x00){
+ if((c2 = (*i_getc)(f)) == 0x00){
+ if(!input_f){
+ set_iconv(TRUE, w_iconv32);
+ }
+ if (iconv == w_iconv32) {
+ input_endian = ENDIAN_LITTLE;
+ return;
+ }
+ (*i_ungetc)(0x00,f);
+ }else (*i_ungetc)(c2,f);
+ (*i_ungetc)(0x00,f);
+ }else (*i_ungetc)(c2,f);
+ if(!input_f){
+ set_iconv(TRUE, w_iconv16);
+ }
+ if (iconv == w_iconv16) {
+ input_endian = ENDIAN_LITTLE;
+ return;
+ }
+ (*i_ungetc)(0xFE,f);
+ }else (*i_ungetc)(c2,f);
+ (*i_ungetc)(0xFF,f);
+ break;
+ default:
+ (*i_ungetc)(c2,f);
+ break;
+ }
+}
+
+/*
+ Conversion main loop. Code detection only.
+ */
+
+nkf_char kanji_convert(FILE *f)
+{
+ nkf_char c3, c2=0, c1, c0=0;
+ int is_8bit = FALSE;
+
+ if(input_f == SJIS_INPUT || input_f == EUC_INPUT
+#ifdef UTF8_INPUT_ENABLE
+ || input_f == UTF8_INPUT || input_f == UTF16_INPUT
+#endif
+ ){
+ is_8bit = TRUE;
+ }
+
+ input_mode = ASCII;
+ output_mode = ASCII;
+ shift_mode = FALSE;
+
+#define NEXT continue /* no output, get next */
+#define SEND ; /* output c1 and c2, get next */
+#define LAST break /* end of loop, go closing */
+
+ module_connection();
+ check_bom(f);
+
+ while ((c1 = (*i_getc)(f)) != EOF) {
+#ifdef INPUT_CODE_FIX
+ if (!input_f)
+#endif
+ code_status(c1);
+ if (c2) {
+ /* second byte */
+ if (c2 > ((input_f == JIS_INPUT && ms_ucs_map_f) ? 0x92 : DEL)) {
+ /* in case of 8th bit is on */
+ if (!estab_f&&!mime_decode_mode) {
+ /* in case of not established yet */
+ /* It is still ambiguious */
+ if (h_conv(f, c2, c1)==EOF)
+ LAST;
+ else
+ c2 = 0;
+ NEXT;
+ } else {
+ /* in case of already established */
+ if (c1 < AT) {
+ /* ignore bogus code and not CP5022x UCD */
+ c2 = 0;
+ NEXT;
+ } else {
+ SEND;
+ }
+ }
+ } else
+ /* second byte, 7 bit code */
+ /* it might be kanji shitfted */
+ if ((c1 == DEL) || (c1 <= SPACE)) {
+ /* ignore bogus first code */
+ c2 = 0;
+ NEXT;
+ } else
+ SEND;
+ } else {
+ /* first byte */
+#ifdef UTF8_INPUT_ENABLE
+ if (iconv == w_iconv16) {
+ if (input_endian == ENDIAN_BIG) {
+ c2 = c1;
+ if ((c1 = (*i_getc)(f)) != EOF) {
+ if (0xD8 <= c2 && c2 <= 0xDB) {
+ if ((c0 = (*i_getc)(f)) != EOF) {
+ c0 <<= 8;
+ if ((c3 = (*i_getc)(f)) != EOF) {
+ c0 |= c3;
+ } else c2 = EOF;
+ } else c2 = EOF;
+ }
+ } else c2 = EOF;
+ } else {
+ if ((c2 = (*i_getc)(f)) != EOF) {
+ if (0xD8 <= c2 && c2 <= 0xDB) {
+ if ((c3 = (*i_getc)(f)) != EOF) {
+ if ((c0 = (*i_getc)(f)) != EOF) {
+ c0 <<= 8;
+ c0 |= c3;
+ } else c2 = EOF;
+ } else c2 = EOF;
+ }
+ } else c2 = EOF;
+ }
+ SEND;
+ } else if(iconv == w_iconv32){
+ int c3 = c1;
+ if((c2 = (*i_getc)(f)) != EOF &&
+ (c1 = (*i_getc)(f)) != EOF &&
+ (c0 = (*i_getc)(f)) != EOF){
+ switch(input_endian){
+ case ENDIAN_BIG:
+ c1 = (c2&0xFF)<<16 | (c1&0xFF)<<8 | (c0&0xFF);
+ break;
+ case ENDIAN_LITTLE:
+ c1 = (c3&0xFF) | (c2&0xFF)<<8 | (c1&0xFF)<<16;
+ break;
+ case ENDIAN_2143:
+ c1 = (c3&0xFF)<<16 | (c1&0xFF) | (c0&0xFF)<<8;
+ break;
+ case ENDIAN_3412:
+ c1 = (c3&0xFF)<<8 | (c2&0xFF) | (c0&0xFF)<<16;
+ break;
+ }
+ c2 = 0;
+ }else{
+ c2 = EOF;
+ }
+ SEND;
+ } else
+#endif
+#ifdef NUMCHAR_OPTION
+ if (is_unicode_capsule(c1)){
+ SEND;
+ } else
+#endif
+ if (c1 > ((input_f == JIS_INPUT && ms_ucs_map_f) ? 0x92 : DEL)) {
+ /* 8 bit code */
+ if (!estab_f && !iso8859_f) {
+ /* not established yet */
+ c2 = c1;
+ NEXT;
+ } else { /* estab_f==TRUE */
+ if (iso8859_f) {
+ c2 = ISO8859_1;
+ c1 &= 0x7f;
+ SEND;
+ } else if (SSP<=c1 && c1<0xe0 && iconv == s_iconv) {
+ /* SJIS X0201 Case... */
+ if(iso2022jp_f && x0201_f==NO_X0201) {
+ (*oconv)(GETA1, GETA2);
+ NEXT;
+ } else {
+ c2 = X0201;
+ c1 &= 0x7f;
+ SEND;
+ }
+ } else if (c1==SSO && iconv != s_iconv) {
+ /* EUC X0201 Case */
+ c1 = (*i_getc)(f); /* skip SSO */
+ code_status(c1);
+ if (SSP<=c1 && c1<0xe0) {
+ if(iso2022jp_f && x0201_f==NO_X0201) {
+ (*oconv)(GETA1, GETA2);
+ NEXT;
+ } else {
+ c2 = X0201;
+ c1 &= 0x7f;
+ SEND;
+ }
+ } else { /* bogus code, skip SSO and one byte */
+ NEXT;
+ }
+ } else {
+ /* already established */
+ c2 = c1;
+ NEXT;
+ }
+ }
+ } else if ((c1 > SPACE) && (c1 != DEL)) {
+ /* in case of Roman characters */
+ if (shift_mode) {
+ /* output 1 shifted byte */
+ if (iso8859_f) {
+ c2 = ISO8859_1;
+ SEND;
+ } else if (SPACE<=c1 && c1<(0xe0&0x7f) ){
+ /* output 1 shifted byte */
+ if(iso2022jp_f && x0201_f==NO_X0201) {
+ (*oconv)(GETA1, GETA2);
+ NEXT;
+ } else {
+ c2 = X0201;
+ SEND;
+ }
+ } else {
+ /* look like bogus code */
+ NEXT;
+ }
+ } else if (input_mode == X0208 || input_mode == X0212 ||
+ input_mode == X0213_1 || input_mode == X0213_2) {
+ /* in case of Kanji shifted */
+ c2 = c1;
+ NEXT;
+ } else if (c1 == '=' && mime_f && !mime_decode_mode ) {
+ /* Check MIME code */
+ if ((c1 = (*i_getc)(f)) == EOF) {
+ (*oconv)(0, '=');
+ LAST;
+ } else if (c1 == '?') {
+ /* =? is mime conversion start sequence */
+ if(mime_f == STRICT_MIME) {
+ /* check in real detail */
+ if (mime_begin_strict(f) == EOF)
+ LAST;
+ else
+ NEXT;
+ } else if (mime_begin(f) == EOF)
+ LAST;
+ else
+ NEXT;
+ } else {
+ (*oconv)(0, '=');
+ (*i_ungetc)(c1,f);
+ NEXT;
+ }
+ } else {
+ /* normal ASCII code */
+ SEND;
+ }
+ } else if (c1 == SI && (!is_8bit || mime_decode_mode)) {
+ shift_mode = FALSE;
+ NEXT;
+ } else if (c1 == SO && (!is_8bit || mime_decode_mode)) {
+ shift_mode = TRUE;
+ NEXT;
+ } else if (c1 == ESC && (!is_8bit || mime_decode_mode)) {
+ if ((c1 = (*i_getc)(f)) == EOF) {
+ /* (*oconv)(0, ESC); don't send bogus code */
+ LAST;
+ } else if (c1 == '$') {
+ if ((c1 = (*i_getc)(f)) == EOF) {
+ /*
+ (*oconv)(0, ESC); don't send bogus code
+ (*oconv)(0, '$'); */
+ LAST;
+ } else if (c1 == '@'|| c1 == 'B') {
+ /* This is kanji introduction */
+ input_mode = X0208;
+ shift_mode = FALSE;
+ set_input_codename("ISO-2022-JP");
+#ifdef CHECK_OPTION
+ debug(input_codename);
+#endif
+ NEXT;
+ } else if (c1 == '(') {
+ if ((c1 = (*i_getc)(f)) == EOF) {
+ /* don't send bogus code
+ (*oconv)(0, ESC);
+ (*oconv)(0, '$');
+ (*oconv)(0, '(');
+ */
+ LAST;
+ } else if (c1 == '@'|| c1 == 'B') {
+ /* This is kanji introduction */
+ input_mode = X0208;
+ shift_mode = FALSE;
+ NEXT;
#ifdef X0212_ENABLE
- else if(nkf_isgraph(ndx)){
- nkf_char val = 0;
- const unsigned short *ptr;
- ptr = x0212_shiftjis[ndx - 0x21];
- if (ptr){
- val = ptr[(c1 & 0x7f) - 0x21];
+ } else if (c1 == 'D'){
+ input_mode = X0212;
+ shift_mode = FALSE;
+ NEXT;
+#endif /* X0212_ENABLE */
+ } else if (c1 == (X0213_1&0x7F)){
+ input_mode = X0213_1;
+ shift_mode = FALSE;
+ NEXT;
+ } else if (c1 == (X0213_2&0x7F)){
+ input_mode = X0213_2;
+ shift_mode = FALSE;
+ NEXT;
+ } else {
+ /* could be some special code */
+ (*oconv)(0, ESC);
+ (*oconv)(0, '$');
+ (*oconv)(0, '(');
+ (*oconv)(0, c1);
+ NEXT;
+ }
+ } else if (broken_f&0x2) {
+ /* accept any ESC-(-x as broken code ... */
+ input_mode = X0208;
+ shift_mode = FALSE;
+ NEXT;
+ } else {
+ (*oconv)(0, ESC);
+ (*oconv)(0, '$');
+ (*oconv)(0, c1);
+ NEXT;
+ }
+ } else if (c1 == '(') {
+ if ((c1 = (*i_getc)(f)) == EOF) {
+ /* don't send bogus code
+ (*oconv)(0, ESC);
+ (*oconv)(0, '('); */
+ LAST;
+ } else {
+ if (c1 == 'I') {
+ /* This is X0201 kana introduction */
+ input_mode = X0201; shift_mode = X0201;
+ NEXT;
+ } else if (c1 == 'B' || c1 == 'J' || c1 == 'H') {
+ /* This is X0208 kanji introduction */
+ input_mode = ASCII; shift_mode = FALSE;
+ NEXT;
+ } else if (broken_f&0x2) {
+ input_mode = ASCII; shift_mode = FALSE;
+ NEXT;
+ } else {
+ (*oconv)(0, ESC);
+ (*oconv)(0, '(');
+ /* maintain various input_mode here */
+ SEND;
+ }
+ }
+ } else if ( c1 == 'N' || c1 == 'n' ){
+ /* SS2 */
+ c3 = (*i_getc)(f); /* skip SS2 */
+ if ( (SPACE<=c3 && c3 < 0x60) || (0xa0<=c3 && c3 < 0xe0)){
+ c1 = c3;
+ c2 = X0201;
+ SEND;
+ }else{
+ (*i_ungetc)(c3, f);
+ /* lonely ESC */
+ (*oconv)(0, ESC);
+ SEND;
+ }
+ } else {
+ /* lonely ESC */
+ (*oconv)(0, ESC);
+ SEND;
+ }
+ } else if (c1 == ESC && iconv == s_iconv) {
+ /* ESC in Shift_JIS */
+ if ((c1 = (*i_getc)(f)) == EOF) {
+ /* (*oconv)(0, ESC); don't send bogus code */
+ LAST;
+ } else if (c1 == '$') {
+ /* J-PHONE emoji */
+ if ((c1 = (*i_getc)(f)) == EOF) {
+ /*
+ (*oconv)(0, ESC); don't send bogus code
+ (*oconv)(0, '$'); */
+ LAST;
+ } else {
+ if (('E' <= c1 && c1 <= 'G') ||
+ ('O' <= c1 && c1 <= 'Q')) {
+ /*
+ NUM : 0 1 2 3 4 5
+ BYTE: G E F O P Q
+ C%7 : 1 6 0 2 3 4
+ C%7 : 0 1 2 3 4 5 6
+ NUM : 2 0 3 4 5 X 1
+ */
+ static const int jphone_emoji_first_table[7] = {2, 0, 3, 4, 5, 0, 1};
+ c0 = (jphone_emoji_first_table[c1 % 7] << 8) - SPACE + 0xE000 + CLASS_UNICODE;
+ while ((c1 = (*i_getc)(f)) != EOF) {
+ if (SPACE <= c1 && c1 <= 'z') {
+ (*oconv)(0, c1 + c0);
+ } else break; /* c1 == SO */
+ }
+ }
+ }
+ if (c1 == EOF) LAST;
+ NEXT;
+ } else {
+ /* lonely ESC */
+ (*oconv)(0, ESC);
+ SEND;
+ }
+ } else if ((c1 == NL || c1 == CR) && broken_f&4) {
+ input_mode = ASCII; set_iconv(FALSE, 0);
+ SEND;
+ } else if (c1 == NL && mime_decode_f && !mime_decode_mode ) {
+ if ((c1=(*i_getc)(f))!=EOF && c1 == SPACE) {
+ i_ungetc(SPACE,f);
+ continue;
+ } else {
+ i_ungetc(c1,f);
+ }
+ c1 = NL;
+ SEND;
+ } else if (c1 == CR && mime_decode_f && !mime_decode_mode ) {
+ if ((c1=(*i_getc)(f))!=EOF) {
+ if (c1==SPACE) {
+ i_ungetc(SPACE,f);
+ continue;
+ } else if (c1 == NL && (c1=(*i_getc)(f))!=EOF && c1 == SPACE) {
+ i_ungetc(SPACE,f);
+ continue;
+ } else {
+ i_ungetc(c1,f);
+ }
+ i_ungetc(NL,f);
+ } else {
+ i_ungetc(c1,f);
+ }
+ c1 = CR;
+ SEND;
+ } else if (c1 == DEL && input_mode == X0208 ) {
+ /* CP5022x */
+ c2 = c1;
+ NEXT;
+ } else
+ SEND;
+ }
+ /* send: */
+ switch(input_mode){
+ case ASCII:
+ switch ((*iconv)(c2, c1, c0)) { /* can be EUC / SJIS / UTF-8 / UTF-16 */
+ case -2:
+ /* 4 bytes UTF-8 */
+ if ((c0 = (*i_getc)(f)) != EOF) {
+ code_status(c0);
+ c0 <<= 8;
+ if ((c3 = (*i_getc)(f)) != EOF) {
+ code_status(c3);
+ (*iconv)(c2, c1, c0|c3);
+ }
+ }
+ break;
+ case -1:
+ /* 3 bytes EUC or UTF-8 */
+ if ((c0 = (*i_getc)(f)) != EOF) {
+ code_status(c0);
+ (*iconv)(c2, c1, c0);
+ }
+ break;
}
- if (val){
- c2 = val >> 8;
- c1 = val & 0xff;
- if (p2) *p2 = c2;
- if (p1) *p1 = c1;
- return 0;
+ break;
+ case X0208:
+ case X0213_1:
+ if (ms_ucs_map_f &&
+ 0x7F <= c2 && c2 <= 0x92 &&
+ 0x21 <= c1 && c1 <= 0x7E) {
+ /* CP932 UDC */
+ if(c1 == 0x7F) return 0;
+ c1 = (c2 - 0x7F) * 94 + c1 - 0x21 + 0xE000 + CLASS_UNICODE;
+ c2 = 0;
}
- c2 = x0212_shift(c2);
- }
+ (*oconv)(c2, c1); /* this is JIS, not SJIS/EUC case */
+ break;
+#ifdef X0212_ENABLE
+ case X0212:
+ (*oconv)(PREFIX_EUCG3 | c2, c1);
+ break;
#endif /* X0212_ENABLE */
+ case X0213_2:
+ (*oconv)(PREFIX_EUCG3 | c2, c1);
+ break;
+ default:
+ (*oconv)(input_mode, c1); /* other special case */
+ }
+
+ c2 = 0;
+ c0 = 0;
+ continue;
+ /* goto next_word */
}
- if(0x7F < c2) return 1;
- if (p2) *p2 = ((c2 - 1) >> 1) + ((c2 <= 0x5e) ? 0x71 : 0xb1);
- if (p1) *p1 = c1 + ((c2 & 1) ? ((c1 < 0x60) ? 0x1f : 0x20) : 0x7e);
- return 0;
+
+ /* epilogue */
+ (*iconv)(EOF, 0, 0);
+ if (!is_inputcode_set)
+ {
+ if (is_8bit) {
+ struct input_code *p = input_code_list;
+ struct input_code *result = p;
+ while (p->name){
+ if (p->score < result->score) result = p;
+ ++p;
+ }
+ set_input_codename(result->name);
+ }
+ }
+ return 1;
+}
+
+nkf_char
+h_conv(FILE *f, nkf_char c2, nkf_char c1)
+{
+ nkf_char ret, c3, c0;
+ int hold_index;
+
+
+ /** it must NOT be in the kanji shifte sequence */
+ /** it must NOT be written in JIS7 */
+ /** and it must be after 2 byte 8bit code */
+
+ hold_count = 0;
+ push_hold_buf(c2);
+ push_hold_buf(c1);
+
+ while ((c1 = (*i_getc)(f)) != EOF) {
+ if (c1 == ESC){
+ (*i_ungetc)(c1,f);
+ break;
+ }
+ code_status(c1);
+ if (push_hold_buf(c1) == EOF || estab_f){
+ break;
+ }
+ }
+
+ if (!estab_f){
+ struct input_code *p = input_code_list;
+ struct input_code *result = p;
+ if (c1 == EOF){
+ code_status(c1);
+ }
+ while (p->name){
+ if (p->score < result->score){
+ result = p;
+ }
+ ++p;
+ }
+ set_iconv(FALSE, result->iconv_func);
+ }
+
+
+ /** now,
+ ** 1) EOF is detected, or
+ ** 2) Code is established, or
+ ** 3) Buffer is FULL (but last word is pushed)
+ **
+ ** in 1) and 3) cases, we continue to use
+ ** Kanji codes by oconv and leave estab_f unchanged.
+ **/
+
+ ret = c1;
+ hold_index = 0;
+ while (hold_index < hold_count){
+ c2 = hold_buf[hold_index++];
+ if (c2 <= DEL
+#ifdef NUMCHAR_OPTION
+ || is_unicode_capsule(c2)
+#endif
+ ){
+ (*iconv)(0, c2, 0);
+ continue;
+ }else if (iconv == s_iconv && 0xa1 <= c2 && c2 <= 0xdf){
+ (*iconv)(X0201, c2, 0);
+ continue;
+ }
+ if (hold_index < hold_count){
+ c1 = hold_buf[hold_index++];
+ }else{
+ c1 = (*i_getc)(f);
+ if (c1 == EOF){
+ c3 = EOF;
+ break;
+ }
+ code_status(c1);
+ }
+ c0 = 0;
+ switch ((*iconv)(c2, c1, 0)) { /* can be EUC/SJIS/UTF-8 */
+ case -2:
+ /* 4 bytes UTF-8 */
+ if (hold_index < hold_count){
+ c0 = hold_buf[hold_index++];
+ } else if ((c0 = (*i_getc)(f)) == EOF) {
+ ret = EOF;
+ break;
+ } else {
+ code_status(c0);
+ c0 <<= 8;
+ if (hold_index < hold_count){
+ c3 = hold_buf[hold_index++];
+ } else if ((c3 = (*i_getc)(f)) == EOF) {
+ c0 = ret = EOF;
+ break;
+ } else {
+ code_status(c3);
+ (*iconv)(c2, c1, c0|c3);
+ }
+ }
+ break;
+ case -1:
+ /* 3 bytes EUC or UTF-8 */
+ if (hold_index < hold_count){
+ c0 = hold_buf[hold_index++];
+ } else if ((c0 = (*i_getc)(f)) == EOF) {
+ ret = EOF;
+ break;
+ } else {
+ code_status(c0);
+ }
+ (*iconv)(c2, c1, c0);
+ break;
+ }
+ if (c0 == EOF) break;
+ }
+ return ret;
}
-static nkf_char
-s2e_conv(nkf_char c2, nkf_char c1, nkf_char *p2, nkf_char *p1)
+nkf_char push_hold_buf(nkf_char c2)
+{
+ if (hold_count >= HOLD_SIZE*2)
+ return (EOF);
+ hold_buf[hold_count++] = (unsigned char)c2;
+ return ((hold_count >= HOLD_SIZE*2) ? EOF : hold_count);
+}
+
+nkf_char s2e_conv(nkf_char c2, nkf_char c1, nkf_char *p2, nkf_char *p1)
{
#if defined(SHIFTJIS_CP932) || defined(X0212_ENABLE)
nkf_char val;
#endif
- static const char shift_jisx0213_s1a3_table[5][2] ={ { 1, 8}, { 3, 4}, { 5,12}, {13,14}, {15, 0} };
- if (0xFC < c1) return 1;
+ static const nkf_char shift_jisx0213_s1a3_table[5][2] ={ { 1, 8}, { 3, 4}, { 5,12}, {13,14}, {15, 0} };
#ifdef SHIFTJIS_CP932
if (!cp932inv_f && is_ibmext_in_sjis(c2)){
- val = shiftjis_cp932[c2 - CP932_TABLE_BEGIN][c1 - 0x40];
- if (val){
- c2 = val >> 8;
- c1 = val & 0xff;
- }
+#if 0
+ extern const unsigned short shiftjis_cp932[3][189];
+#endif
+ val = shiftjis_cp932[c2 - CP932_TABLE_BEGIN][c1 - 0x40];
+ if (val){
+ c2 = val >> 8;
+ c1 = val & 0xff;
+ }
}
if (cp932inv_f
- && CP932INV_TABLE_BEGIN <= c2 && c2 <= CP932INV_TABLE_END){
- val = cp932inv[c2 - CP932INV_TABLE_BEGIN][c1 - 0x40];
- if (val){
- c2 = val >> 8;
- c1 = val & 0xff;
- }
+ && CP932INV_TABLE_BEGIN <= c2 && c2 <= CP932INV_TABLE_END){
+#if 0
+ extern const unsigned short cp932inv[2][189];
+#endif
+ nkf_char c = cp932inv[c2 - CP932INV_TABLE_BEGIN][c1 - 0x40];
+ if (c){
+ c2 = c >> 8;
+ c1 = c & 0xff;
+ }
}
#endif /* SHIFTJIS_CP932 */
#ifdef X0212_ENABLE
if (!x0213_f && is_ibmext_in_sjis(c2)){
- val = shiftjis_x0212[c2 - 0xfa][c1 - 0x40];
- if (val){
- if (val > 0x7FFF){
- c2 = PREFIX_EUCG3 | ((val >> 8) & 0x7f);
- c1 = val & 0xff;
- }else{
- c2 = val >> 8;
- c1 = val & 0xff;
- }
- if (p2) *p2 = c2;
- if (p1) *p1 = c1;
- return 0;
- }
+#if 0
+ extern const unsigned short shiftjis_x0212[3][189];
+#endif
+ val = shiftjis_x0212[c2 - 0xfa][c1 - 0x40];
+ if (val){
+ if (val > 0x7FFF){
+ c2 = PREFIX_EUCG3 | ((val >> 8) & 0x7f);
+ c1 = val & 0xff;
+ }else{
+ c2 = val >> 8;
+ c1 = val & 0xff;
+ }
+ if (p2) *p2 = c2;
+ if (p1) *p1 = c1;
+ return 0;
+ }
}
#endif
if(c2 >= 0x80){
@@ -1611,13 +3175,11 @@ s2e_conv(nkf_char c2, nkf_char c1, nkf_char *p2, nkf_char *p1)
if (0x9E < c1) c2++;
}
}else{
-#define SJ0162 0x00e1 /* 01 - 62 ku offset */
-#define SJ6394 0x0161 /* 63 - 94 ku offset */
c2 = c2 + c2 - ((c2 <= 0x9F) ? SJ0162 : SJ6394);
if (0x9E < c1) c2++;
}
if (c1 < 0x9F)
- c1 = c1 - ((c1 > DEL) ? SP : 0x1F);
+ c1 = c1 - ((c1 > DEL) ? SPACE : 0x1F);
else {
c1 = c1 - 0x7E;
}
@@ -1631,135 +3193,320 @@ s2e_conv(nkf_char c2, nkf_char c1, nkf_char *p2, nkf_char *p1)
return 0;
}
+nkf_char s_iconv(nkf_char c2, nkf_char c1, nkf_char c0)
+{
+ if (c2 == X0201) {
+ c1 &= 0x7f;
+ } else if ((c2 == EOF) || (c2 == 0) || c2 < SPACE) {
+ /* NOP */
+ } else if (!x0213_f && 0xF0 <= c2 && c2 <= 0xF9 && 0x40 <= c1 && c1 <= 0xFC) {
+ /* CP932 UDC */
+ if(c1 == 0x7F) return 0;
+ c1 = (c2 - 0xF0) * 188 + (c1 - 0x40 - (0x7E < c1)) + 0xE000 + CLASS_UNICODE;
+ c2 = 0;
+ } else {
+ nkf_char ret = s2e_conv(c2, c1, &c2, &c1);
+ if (ret) return ret;
+ }
+ (*oconv)(c2, c1);
+ return 0;
+}
+
+nkf_char e_iconv(nkf_char c2, nkf_char c1, nkf_char c0)
+{
+ if (c2 == X0201) {
+ c1 &= 0x7f;
+#ifdef X0212_ENABLE
+ }else if (c2 == 0x8f){
+ if (c0 == 0){
+ return -1;
+ }
+ if (!cp51932_f && !x0213_f && 0xF5 <= c1 && c1 <= 0xFE && 0xA1 <= c0 && c0 <= 0xFE) {
+ /* encoding is eucJP-ms, so invert to Unicode Private User Area */
+ c1 = (c1 - 0xF5) * 94 + c0 - 0xA1 + 0xE3AC + CLASS_UNICODE;
+ c2 = 0;
+ } else {
+ c2 = (c2 << 8) | (c1 & 0x7f);
+ c1 = c0 & 0x7f;
+#ifdef SHIFTJIS_CP932
+ if (cp51932_f){
+ nkf_char s2, s1;
+ if (e2s_conv(c2, c1, &s2, &s1) == 0){
+ s2e_conv(s2, s1, &c2, &c1);
+ if (c2 < 0x100){
+ c1 &= 0x7f;
+ c2 &= 0x7f;
+ }
+ }
+ }
+#endif /* SHIFTJIS_CP932 */
+ }
+#endif /* X0212_ENABLE */
+ } else if (c2 == SSO){
+ c2 = X0201;
+ c1 &= 0x7f;
+ } else if ((c2 == EOF) || (c2 == 0) || c2 < SPACE) {
+ /* NOP */
+ } else {
+ if (!cp51932_f && ms_ucs_map_f && 0xF5 <= c2 && c2 <= 0xFE && 0xA1 <= c1 && c1 <= 0xFE) {
+ /* encoding is eucJP-ms, so invert to Unicode Private User Area */
+ c1 = (c2 - 0xF5) * 94 + c1 - 0xA1 + 0xE000 + CLASS_UNICODE;
+ c2 = 0;
+ } else {
+ c1 &= 0x7f;
+ c2 &= 0x7f;
+#ifdef SHIFTJIS_CP932
+ if (cp51932_f && 0x79 <= c2 && c2 <= 0x7c){
+ nkf_char s2, s1;
+ if (e2s_conv(c2, c1, &s2, &s1) == 0){
+ s2e_conv(s2, s1, &c2, &c1);
+ if (c2 < 0x100){
+ c1 &= 0x7f;
+ c2 &= 0x7f;
+ }
+ }
+ }
+#endif /* SHIFTJIS_CP932 */
+ }
+ }
+ (*oconv)(c2, c1);
+ return 0;
+}
+
+#ifdef UTF8_INPUT_ENABLE
+nkf_char w2e_conv(nkf_char c2, nkf_char c1, nkf_char c0, nkf_char *p2, nkf_char *p1)
+{
+ nkf_char ret = 0;
+
+ if (!c1){
+ *p2 = 0;
+ *p1 = c2;
+ }else if (0xc0 <= c2 && c2 <= 0xef) {
+ ret = unicode_to_jis_common(c2, c1, c0, p2, p1);
+#ifdef NUMCHAR_OPTION
+ if (ret > 0){
+ if (p2) *p2 = 0;
+ if (p1) *p1 = CLASS_UNICODE | ww16_conv(c2, c1, c0);
+ ret = 0;
+ }
+#endif
+ }
+ return ret;
+}
+
+nkf_char w_iconv(nkf_char c2, nkf_char c1, nkf_char c0)
+{
+ nkf_char ret = 0;
+ static const int w_iconv_utf8_1st_byte[] =
+ { /* 0xC0 - 0xFF */
+ 20, 20, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+ 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+ 30, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 33, 33,
+ 40, 41, 41, 41, 42, 43, 43, 43, 50, 50, 50, 50, 60, 60, 70, 70};
+
+ if (c2 < 0 || 0xff < c2) {
+ }else if (c2 == 0) { /* 0 : 1 byte*/
+ c0 = 0;
+ } else if ((c2 & 0xc0) == 0x80) { /* 0x80-0xbf : trail byte */
+ return 0;
+ } else{
+ switch (w_iconv_utf8_1st_byte[c2 - 0xC0]) {
+ case 21:
+ if (c1 < 0x80 || 0xBF < c1) return 0;
+ break;
+ case 30:
+ if (c0 == 0) return -1;
+ if (c1 < 0xA0 || 0xBF < c1 || (c0 & 0xc0) != 0x80)
+ return 0;
+ break;
+ case 31:
+ case 33:
+ if (c0 == 0) return -1;
+ if ((c1 & 0xc0) != 0x80 || (c0 & 0xc0) != 0x80)
+ return 0;
+ break;
+ case 32:
+ if (c0 == 0) return -1;
+ if (c1 < 0x80 || 0x9F < c1 || (c0 & 0xc0) != 0x80)
+ return 0;
+ break;
+ case 40:
+ if (c0 == 0) return -2;
+ if (c1 < 0x90 || 0xBF < c1 || (c0 & 0xc0c0) != 0x8080)
+ return 0;
+ break;
+ case 41:
+ if (c0 == 0) return -2;
+ if (c1 < 0x80 || 0xBF < c1 || (c0 & 0xc0c0) != 0x8080)
+ return 0;
+ break;
+ case 42:
+ if (c0 == 0) return -2;
+ if (c1 < 0x80 || 0x8F < c1 || (c0 & 0xc0c0) != 0x8080)
+ return 0;
+ break;
+ default:
+ return 0;
+ break;
+ }
+ }
+ if (c2 == 0 || c2 == EOF){
+ } else if ((c2 & 0xf8) == 0xf0) { /* 4 bytes */
+ c1 = CLASS_UNICODE | ww16_conv(c2, c1, c0);
+ c2 = 0;
+ } else {
+ ret = w2e_conv(c2, c1, c0, &c2, &c1);
+ }
+ if (ret == 0){
+ (*oconv)(c2, c1);
+ }
+ return ret;
+}
+#endif
+
#if defined(UTF8_INPUT_ENABLE) || defined(UTF8_OUTPUT_ENABLE)
-static void
-nkf_unicode_to_utf8(nkf_char val, nkf_char *p1, nkf_char *p2, nkf_char *p3, nkf_char *p4)
+void w16w_conv(nkf_char val, nkf_char *p2, nkf_char *p1, nkf_char *p0)
{
val &= VALUE_MASK;
if (val < 0x80){
- *p1 = val;
- *p2 = 0;
- *p3 = 0;
- *p4 = 0;
+ *p2 = val;
+ *p1 = 0;
+ *p0 = 0;
}else if (val < 0x800){
- *p1 = 0xc0 | (val >> 6);
- *p2 = 0x80 | (val & 0x3f);
- *p3 = 0;
- *p4 = 0;
- } else if (nkf_char_unicode_bmp_p(val)) {
- *p1 = 0xe0 | (val >> 12);
- *p2 = 0x80 | ((val >> 6) & 0x3f);
- *p3 = 0x80 | ( val & 0x3f);
- *p4 = 0;
- } else if (nkf_char_unicode_value_p(val)) {
- *p1 = 0xe0 | (val >> 16);
- *p2 = 0x80 | ((val >> 12) & 0x3f);
- *p3 = 0x80 | ((val >> 6) & 0x3f);
- *p4 = 0x80 | ( val & 0x3f);
+ *p2 = 0xc0 | (val >> 6);
+ *p1 = 0x80 | (val & 0x3f);
+ *p0 = 0;
+ } else if (val <= NKF_INT32_C(0xFFFF)) {
+ *p2 = 0xe0 | (val >> 12);
+ *p1 = 0x80 | ((val >> 6) & 0x3f);
+ *p0 = 0x80 | (val & 0x3f);
+ } else if (val <= NKF_INT32_C(0x10FFFF)) {
+ *p2 = 0xe0 | (val >> 16);
+ *p1 = 0x80 | ((val >> 12) & 0x3f);
+ *p0 = 0x8080 | ((val << 2) & 0x3f00)| (val & 0x3f);
} else {
- *p1 = 0;
- *p2 = 0;
- *p3 = 0;
- *p4 = 0;
+ *p2 = 0;
+ *p1 = 0;
+ *p0 = 0;
+ }
+}
+#endif
+
+#ifdef UTF8_INPUT_ENABLE
+nkf_char ww16_conv(nkf_char c2, nkf_char c1, nkf_char c0)
+{
+ nkf_char val;
+ if (c2 >= 0xf8) {
+ val = -1;
+ } else if (c2 >= 0xf0){
+ /* c2: 1st, c1: 2nd, c0: 3rd/4th */
+ val = (c2 & 0x0f) << 18;
+ val |= (c1 & 0x3f) << 12;
+ val |= (c0 & 0x3f00) >> 2;
+ val |= (c0 & 0x3f);
+ }else if (c2 >= 0xe0){
+ val = (c2 & 0x0f) << 12;
+ val |= (c1 & 0x3f) << 6;
+ val |= (c0 & 0x3f);
+ }else if (c2 >= 0xc0){
+ val = (c2 & 0x1f) << 6;
+ val |= (c1 & 0x3f);
+ }else{
+ val = c2;
}
+ return val;
}
-static nkf_char
-nkf_utf8_to_unicode(nkf_char c1, nkf_char c2, nkf_char c3, nkf_char c4)
+nkf_char w16e_conv(nkf_char val, nkf_char *p2, nkf_char *p1)
{
- nkf_char wc;
- if (c1 <= 0x7F) {
- /* single byte */
- wc = c1;
- }
- else if (c1 <= 0xC3) {
- /* trail byte or invalid */
- return -1;
- }
- else if (c1 <= 0xDF) {
- /* 2 bytes */
- wc = (c1 & 0x1F) << 6;
- wc |= (c2 & 0x3F);
- }
- else if (c1 <= 0xEF) {
- /* 3 bytes */
- wc = (c1 & 0x0F) << 12;
- wc |= (c2 & 0x3F) << 6;
- wc |= (c3 & 0x3F);
- }
- else if (c2 <= 0xF4) {
- /* 4 bytes */
- wc = (c1 & 0x0F) << 18;
- wc |= (c2 & 0x3F) << 12;
- wc |= (c3 & 0x3F) << 6;
- wc |= (c4 & 0x3F);
- }
- else {
- return -1;
- }
- return wc;
+ nkf_char c2, c1, c0;
+ nkf_char ret = 0;
+ val &= VALUE_MASK;
+ if (val < 0x80){
+ *p2 = 0;
+ *p1 = val;
+ }else{
+ w16w_conv(val, &c2, &c1, &c0);
+ ret = unicode_to_jis_common(c2, c1, c0, p2, p1);
+#ifdef NUMCHAR_OPTION
+ if (ret > 0){
+ *p2 = 0;
+ *p1 = CLASS_UNICODE | val;
+ ret = 0;
+ }
+#endif
+ }
+ return ret;
}
#endif
#ifdef UTF8_INPUT_ENABLE
-static int
-unicode_to_jis_common2(nkf_char c1, nkf_char c0,
- const unsigned short *const *pp, nkf_char psize,
- nkf_char *p2, nkf_char *p1)
+nkf_char w_iconv16(nkf_char c2, nkf_char c1, nkf_char c0)
{
- nkf_char c2;
- const unsigned short *p;
- unsigned short val;
-
- if (pp == 0) return 1;
-
- c1 -= 0x80;
- if (c1 < 0 || psize <= c1) return 1;
- p = pp[c1];
- if (p == 0) return 1;
+ nkf_char ret = 0;
+ if ((c2==0 && c1 < 0x80) || c2==EOF) {
+ (*oconv)(c2, c1);
+ return 0;
+ }else if (0xD8 <= c2 && c2 <= 0xDB) {
+ if (c0 < NKF_INT32_C(0xDC00) || NKF_INT32_C(0xDFFF) < c0)
+ return -2;
+ c1 = CLASS_UNICODE | ((c2 << 18) + (c1 << 10) + c0 - NKF_INT32_C(0x35FDC00));
+ c2 = 0;
+ }else if ((c2>>3) == 27) { /* unpaired surrogate */
+ /*
+ return 2;
+ */
+ return 1;
+ }else ret = w16e_conv(((c2 & 0xff)<<8) + c1, &c2, &c1);
+ if (ret) return ret;
+ (*oconv)(c2, c1);
+ return 0;
+}
- c0 -= 0x80;
- if (c0 < 0 || sizeof_utf8_to_euc_C2 <= c0) return 1;
- val = p[c0];
- if (val == 0) return 1;
- if (no_cp932ext_f && (
- (val>>8) == 0x2D || /* NEC special characters */
- val > NKF_INT32_C(0xF300) /* IBM extended characters */
- )) return 1;
+nkf_char w_iconv32(nkf_char c2, nkf_char c1, nkf_char c0)
+{
+ int ret = 0;
- c2 = val >> 8;
- if (val > 0x7FFF){
- c2 &= 0x7f;
- c2 |= PREFIX_EUCG3;
+ if ((c2 == 0 && c1 < 0x80) || c2==EOF) {
+ } else if (is_unicode_bmp(c1)) {
+ ret = w16e_conv(c1, &c2, &c1);
+ } else {
+ c2 = 0;
+ c1 = CLASS_UNICODE | c1;
}
- if (c2 == SO) c2 = JIS_X_0201_1976_K;
- c1 = val & 0xFF;
- if (p2) *p2 = c2;
- if (p1) *p1 = c1;
+ if (ret) return ret;
+ (*oconv)(c2, c1);
return 0;
}
-static int
-unicode_to_jis_common(nkf_char c2, nkf_char c1, nkf_char c0, nkf_char *p2, nkf_char *p1)
+nkf_char unicode_to_jis_common(nkf_char c2, nkf_char c1, nkf_char c0, nkf_char *p2, nkf_char *p1)
{
+#if 0
+ extern const unsigned short *const utf8_to_euc_2bytes[];
+ extern const unsigned short *const utf8_to_euc_2bytes_ms[];
+ extern const unsigned short *const utf8_to_euc_2bytes_932[];
+ extern const unsigned short *const *const utf8_to_euc_3bytes[];
+ extern const unsigned short *const *const utf8_to_euc_3bytes_ms[];
+ extern const unsigned short *const *const utf8_to_euc_3bytes_932[];
+#endif
const unsigned short *const *pp;
const unsigned short *const *const *ppp;
- static const char no_best_fit_chars_table_C2[] =
+ static const int no_best_fit_chars_table_C2[] =
{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 0, 0, 1, 0, 0, 0, 0, 1, 1, 1, 2, 1, 1, 2,
0, 0, 1, 1, 0, 1, 0, 1, 2, 1, 1, 1, 1, 1, 1, 1};
- static const char no_best_fit_chars_table_C2_ms[] =
+ static const int no_best_fit_chars_table_C2_ms[] =
{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 1, 1, 1, 0, 0,
0, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 0};
- static const char no_best_fit_chars_table_932_C2[] =
+ static const int no_best_fit_chars_table_932_C2[] =
{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 0, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1,
0, 0, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0};
- static const char no_best_fit_chars_table_932_C3[] =
+ static const int no_best_fit_chars_table_932_C3[] =
{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
@@ -1791,29 +3538,13 @@ unicode_to_jis_common(nkf_char c2, nkf_char c1, nkf_char c0, nkf_char *p2, nkf_c
}
}else if(ms_ucs_map_f == UCS_MAP_MS){
if(c2 == 0xC2 && no_best_fit_chars_table_C2_ms[c1&0x3F]) return 1;
- }else if(ms_ucs_map_f == UCS_MAP_CP10001){
- switch(c2){
- case 0xC2:
- switch(c1){
- case 0xA2:
- case 0xA3:
- case 0xA5:
- case 0xA6:
- case 0xAC:
- case 0xAF:
- case 0xB8:
- return 1;
- }
- break;
- }
}
}
pp =
ms_ucs_map_f == UCS_MAP_CP932 ? utf8_to_euc_2bytes_932 :
ms_ucs_map_f == UCS_MAP_MS ? utf8_to_euc_2bytes_ms :
- ms_ucs_map_f == UCS_MAP_CP10001 ? utf8_to_euc_2bytes_mac :
utf8_to_euc_2bytes;
- ret = unicode_to_jis_common2(c2, c1, pp, sizeof_utf8_to_euc_2bytes, p2, p1);
+ ret = w_iconv_common(c2, c1, pp, sizeof_utf8_to_euc_2bytes, p2, p1);
}else if(c0 < 0xF0){
if(no_best_fit_chars_f){
if(ms_ucs_map_f == UCS_MAP_CP932){
@@ -1834,19 +3565,6 @@ unicode_to_jis_common(nkf_char c2, nkf_char c1, nkf_char c0, nkf_char *p2, nkf_c
if(c1 == 0x80 || c0 == 0x9C) return 1;
break;
}
- }else if(ms_ucs_map_f == UCS_MAP_CP10001){
- switch(c2){
- case 0xE3:
- switch(c1){
- case 0x82:
- if(c0 == 0x94) return 1;
- break;
- case 0x83:
- if(c0 == 0xBB) return 1;
- break;
- }
- break;
- }
}else{
switch(c2){
case 0xE2:
@@ -1878,9 +3596,8 @@ unicode_to_jis_common(nkf_char c2, nkf_char c1, nkf_char c0, nkf_char *p2, nkf_c
ppp =
ms_ucs_map_f == UCS_MAP_CP932 ? utf8_to_euc_3bytes_932 :
ms_ucs_map_f == UCS_MAP_MS ? utf8_to_euc_3bytes_ms :
- ms_ucs_map_f == UCS_MAP_CP10001 ? utf8_to_euc_3bytes_mac :
utf8_to_euc_3bytes;
- ret = unicode_to_jis_common2(c1, c0, ppp[c2 - 0xE0], sizeof_utf8_to_euc_C2, p2, p1);
+ ret = w_iconv_common(c1, c0, ppp[c2 - 0xE0], sizeof_utf8_to_euc_C2, p2, p1);
}else return -1;
#ifdef SHIFTJIS_CP932
if (!ret && !cp932inv_f && is_eucg3(*p2)) {
@@ -1895,476 +3612,341 @@ unicode_to_jis_common(nkf_char c2, nkf_char c1, nkf_char c0, nkf_char *p2, nkf_c
return ret;
}
-#ifdef UTF8_OUTPUT_ENABLE
-static nkf_char
-e2w_conv(nkf_char c2, nkf_char c1)
+nkf_char w_iconv_common(nkf_char c1, nkf_char c0, const unsigned short *const *pp, nkf_char psize, nkf_char *p2, nkf_char *p1)
{
+ nkf_char c2;
const unsigned short *p;
+ unsigned short val;
- if (c2 == JIS_X_0201_1976_K) {
- if (ms_ucs_map_f == UCS_MAP_CP10001) {
- switch (c1) {
- case 0x20:
- return 0xA0;
- case 0x7D:
- return 0xA9;
- }
- }
- p = euc_to_utf8_1byte;
-#ifdef X0212_ENABLE
- } else if (is_eucg3(c2)){
- if(ms_ucs_map_f == UCS_MAP_ASCII&& c2 == NKF_INT32_C(0x8F22) && c1 == 0x43){
- return 0xA6;
- }
- c2 = (c2&0x7f) - 0x21;
- if (0<=c2 && c2<sizeof_euc_to_utf8_2bytes)
- p = x0212_to_utf8_2bytes[c2];
- else
- return 0;
-#endif
- } else {
- c2 &= 0x7f;
- c2 = (c2&0x7f) - 0x21;
- if (0<=c2 && c2<sizeof_euc_to_utf8_2bytes)
- p =
- ms_ucs_map_f == UCS_MAP_ASCII ? euc_to_utf8_2bytes[c2] :
- ms_ucs_map_f == UCS_MAP_CP10001 ? euc_to_utf8_2bytes_mac[c2] :
- euc_to_utf8_2bytes_ms[c2];
- else
- return 0;
+ if (pp == 0) return 1;
+
+ c1 -= 0x80;
+ if (c1 < 0 || psize <= c1) return 1;
+ p = pp[c1];
+ if (p == 0) return 1;
+
+ c0 -= 0x80;
+ if (c0 < 0 || sizeof_utf8_to_euc_C2 <= c0) return 1;
+ val = p[c0];
+ if (val == 0) return 1;
+ if (no_cp932ext_f && (
+ (val>>8) == 0x2D || /* NEC special characters */
+ val > NKF_INT32_C(0xF300) /* IBM extended characters */
+ )) return 1;
+
+ c2 = val >> 8;
+ if (val > 0x7FFF){
+ c2 &= 0x7f;
+ c2 |= PREFIX_EUCG3;
}
- if (!p) return 0;
- c1 = (c1 & 0x7f) - 0x21;
- if (0<=c1 && c1<sizeof_euc_to_utf8_1byte)
- return p[c1];
+ if (c2 == SO) c2 = X0201;
+ c1 = val & 0x7f;
+ if (p2) *p2 = c2;
+ if (p1) *p1 = c1;
return 0;
}
-#endif
-static nkf_char
-w2e_conv(nkf_char c2, nkf_char c1, nkf_char c0, nkf_char *p2, nkf_char *p1)
+void nkf_each_char_to_hex(void (*f)(nkf_char c2,nkf_char c1), nkf_char c)
{
- nkf_char ret = 0;
-
- if (!c1){
- *p2 = 0;
- *p1 = c2;
- }else if (0xc0 <= c2 && c2 <= 0xef) {
- ret = unicode_to_jis_common(c2, c1, c0, p2, p1);
-#ifdef NUMCHAR_OPTION
- if (ret > 0){
- if (p2) *p2 = 0;
- if (p1) *p1 = nkf_char_unicode_new(nkf_utf8_to_unicode(c2, c1, c0, 0));
- ret = 0;
+ const char *hex = "0123456789ABCDEF";
+ int shift = 20;
+ c &= VALUE_MASK;
+ while(shift >= 0){
+ if(c >= 1<<shift){
+ while(shift >= 0){
+ (*f)(0, hex[(c>>shift)&0xF]);
+ shift -= 4;
+ }
+ }else{
+ shift -= 4;
}
-#endif
}
- return ret;
+ return;
}
-#ifdef UTF8_INPUT_ENABLE
-static nkf_char
-w16e_conv(nkf_char val, nkf_char *p2, nkf_char *p1)
+void encode_fallback_html(nkf_char c)
{
- nkf_char c1, c2, c3, c4;
- nkf_char ret = 0;
- val &= VALUE_MASK;
- if (val < 0x80) {
- *p2 = 0;
- *p1 = val;
- }
- else if (nkf_char_unicode_bmp_p(val)){
- nkf_unicode_to_utf8(val, &c1, &c2, &c3, &c4);
- ret = unicode_to_jis_common(c1, c2, c3, p2, p1);
- if (ret > 0){
- *p2 = 0;
- *p1 = nkf_char_unicode_new(val);
- ret = 0;
- }
- }
- else {
- *p2 = 0;
- *p1 = nkf_char_unicode_new(val);
- }
- return ret;
+ (*oconv)(0, '&');
+ (*oconv)(0, '#');
+ c &= VALUE_MASK;
+ if(c >= NKF_INT32_C(1000000))
+ (*oconv)(0, 0x30+(c/NKF_INT32_C(1000000))%10);
+ if(c >= NKF_INT32_C(100000))
+ (*oconv)(0, 0x30+(c/NKF_INT32_C(100000) )%10);
+ if(c >= 10000)
+ (*oconv)(0, 0x30+(c/10000 )%10);
+ if(c >= 1000)
+ (*oconv)(0, 0x30+(c/1000 )%10);
+ if(c >= 100)
+ (*oconv)(0, 0x30+(c/100 )%10);
+ if(c >= 10)
+ (*oconv)(0, 0x30+(c/10 )%10);
+ if(c >= 0)
+ (*oconv)(0, 0x30+ c %10);
+ (*oconv)(0, ';');
+ return;
}
-#endif
-static nkf_char
-e_iconv(nkf_char c2, nkf_char c1, nkf_char c0)
+void encode_fallback_xml(nkf_char c)
{
- if (c2 == JIS_X_0201_1976_K || c2 == SS2){
- if (iso2022jp_f && !x0201_f) {
- c2 = GETA1; c1 = GETA2;
- } else {
- c2 = JIS_X_0201_1976_K;
- c1 &= 0x7f;
- }
-#ifdef X0212_ENABLE
- }else if (c2 == 0x8f){
- if (c0 == 0){
- return -1;
- }
- if (!cp51932_f && !x0213_f && 0xF5 <= c1 && c1 <= 0xFE && 0xA1 <= c0 && c0 <= 0xFE) {
- /* encoding is eucJP-ms, so invert to Unicode Private User Area */
- c1 = nkf_char_unicode_new((c1 - 0xF5) * 94 + c0 - 0xA1 + 0xE3AC);
- c2 = 0;
- } else {
- c2 = (c2 << 8) | (c1 & 0x7f);
- c1 = c0 & 0x7f;
-#ifdef SHIFTJIS_CP932
- if (cp51932_f){
- nkf_char s2, s1;
- if (e2s_conv(c2, c1, &s2, &s1) == 0){
- s2e_conv(s2, s1, &c2, &c1);
- if (c2 < 0x100){
- c1 &= 0x7f;
- c2 &= 0x7f;
- }
- }
- }
-#endif /* SHIFTJIS_CP932 */
- }
-#endif /* X0212_ENABLE */
- } else if ((c2 == EOF) || (c2 == 0) || c2 < SP || c2 == ISO_8859_1) {
- /* NOP */
- } else {
- if (!cp51932_f && ms_ucs_map_f && 0xF5 <= c2 && c2 <= 0xFE && 0xA1 <= c1 && c1 <= 0xFE) {
- /* encoding is eucJP-ms, so invert to Unicode Private User Area */
- c1 = nkf_char_unicode_new((c2 - 0xF5) * 94 + c1 - 0xA1 + 0xE000);
- c2 = 0;
- } else {
- c1 &= 0x7f;
- c2 &= 0x7f;
-#ifdef SHIFTJIS_CP932
- if (cp51932_f && 0x79 <= c2 && c2 <= 0x7c){
- nkf_char s2, s1;
- if (e2s_conv(c2, c1, &s2, &s1) == 0){
- s2e_conv(s2, s1, &c2, &c1);
- if (c2 < 0x100){
- c1 &= 0x7f;
- c2 &= 0x7f;
- }
- }
- }
-#endif /* SHIFTJIS_CP932 */
- }
- }
- (*oconv)(c2, c1);
- return 0;
+ (*oconv)(0, '&');
+ (*oconv)(0, '#');
+ (*oconv)(0, 'x');
+ nkf_each_char_to_hex(oconv, c);
+ (*oconv)(0, ';');
+ return;
}
-static nkf_char
-s_iconv(nkf_char c2, nkf_char c1, nkf_char c0)
+void encode_fallback_java(nkf_char c)
{
- if (c2 == JIS_X_0201_1976_K || (0xA1 <= c2 && c2 <= 0xDF)) {
- if (iso2022jp_f && !x0201_f) {
- c2 = GETA1; c1 = GETA2;
- } else {
- c1 &= 0x7f;
- }
- } else if ((c2 == EOF) || (c2 == 0) || c2 < SP) {
- /* NOP */
- } else if (!x0213_f && 0xF0 <= c2 && c2 <= 0xF9 && 0x40 <= c1 && c1 <= 0xFC) {
- /* CP932 UDC */
- if(c1 == 0x7F) return 0;
- c1 = nkf_char_unicode_new((c2 - 0xF0) * 188 + (c1 - 0x40 - (0x7E < c1)) + 0xE000);
- c2 = 0;
- } else {
- nkf_char ret = s2e_conv(c2, c1, &c2, &c1);
- if (ret) return ret;
+ const char *hex = "0123456789ABCDEF";
+ (*oconv)(0, '\\');
+ c &= VALUE_MASK;
+ if(!is_unicode_bmp(c)){
+ (*oconv)(0, 'U');
+ (*oconv)(0, '0');
+ (*oconv)(0, '0');
+ (*oconv)(0, hex[(c>>20)&0xF]);
+ (*oconv)(0, hex[(c>>16)&0xF]);
+ }else{
+ (*oconv)(0, 'u');
}
- (*oconv)(c2, c1);
- return 0;
+ (*oconv)(0, hex[(c>>12)&0xF]);
+ (*oconv)(0, hex[(c>> 8)&0xF]);
+ (*oconv)(0, hex[(c>> 4)&0xF]);
+ (*oconv)(0, hex[ c &0xF]);
+ return;
}
-static nkf_char
-w_iconv(nkf_char c1, nkf_char c2, nkf_char c3)
+void encode_fallback_perl(nkf_char c)
{
- nkf_char ret = 0, c4 = 0;
- static const char w_iconv_utf8_1st_byte[] =
- { /* 0xC0 - 0xFF */
- 20, 20, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
- 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
- 30, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 33, 33,
- 40, 41, 41, 41, 42, 43, 43, 43, 50, 50, 50, 50, 60, 60, 70, 70};
-
- if (c3 > 0xFF) {
- c4 = c3 & 0xFF;
- c3 >>= 8;
- }
+ (*oconv)(0, '\\');
+ (*oconv)(0, 'x');
+ (*oconv)(0, '{');
+ nkf_each_char_to_hex(oconv, c);
+ (*oconv)(0, '}');
+ return;
+}
- if (c1 < 0 || 0xff < c1) {
- }else if (c1 == 0) { /* 0 : 1 byte*/
- c3 = 0;
- } else if ((c1 & 0xC0) == 0x80) { /* 0x80-0xbf : trail byte */
- return 0;
- } else{
- switch (w_iconv_utf8_1st_byte[c1 - 0xC0]) {
- case 21:
- if (c2 < 0x80 || 0xBF < c2) return 0;
- break;
- case 30:
- if (c3 == 0) return -1;
- if (c2 < 0xA0 || 0xBF < c2 || (c3 & 0xC0) != 0x80)
- return 0;
- break;
- case 31:
- case 33:
- if (c3 == 0) return -1;
- if ((c2 & 0xC0) != 0x80 || (c3 & 0xC0) != 0x80)
- return 0;
- break;
- case 32:
- if (c3 == 0) return -1;
- if (c2 < 0x80 || 0x9F < c2 || (c3 & 0xC0) != 0x80)
- return 0;
- break;
- case 40:
- if (c3 == 0) return -2;
- if (c2 < 0x90 || 0xBF < c2 || (c3 & 0xC0) != 0x80 || (c4 & 0xC0) != 0x80)
- return 0;
- break;
- case 41:
- if (c3 == 0) return -2;
- if (c2 < 0x80 || 0xBF < c2 || (c3 & 0xC0) != 0x80 || (c4 & 0xC0) != 0x80)
- return 0;
- break;
- case 42:
- if (c3 == 0) return -2;
- if (c2 < 0x80 || 0x8F < c2 || (c3 & 0xC0) != 0x80 || (c4 & 0xC0) != 0x80)
- return 0;
- break;
- default:
- return 0;
- break;
- }
- }
- if (c1 == 0 || c1 == EOF){
- } else if ((c1 & 0xf8) == 0xf0) { /* 4 bytes */
- c2 = nkf_char_unicode_new(nkf_utf8_to_unicode(c1, c2, c3, c4));
- c1 = 0;
- } else {
- ret = w2e_conv(c1, c2, c3, &c1, &c2);
- }
- if (ret == 0){
- (*oconv)(c1, c2);
- }
- return ret;
+void encode_fallback_subchar(nkf_char c)
+{
+ c = unicode_subchar;
+ (*oconv)((c>>8)&0xFF, c&0xFF);
+ return;
}
+#endif
-#define NKF_ICONV_INVALID_CODE_RANGE -13
-static size_t
-unicode_iconv(nkf_char wc)
+#ifdef UTF8_OUTPUT_ENABLE
+nkf_char e2w_conv(nkf_char c2, nkf_char c1)
{
- nkf_char c1, c2;
- int ret = 0;
+#if 0
+ extern const unsigned short euc_to_utf8_1byte[];
+ extern const unsigned short *const euc_to_utf8_2bytes[];
+ extern const unsigned short *const euc_to_utf8_2bytes_ms[];
+ extern const unsigned short *const x0212_to_utf8_2bytes[];
+#endif
+ const unsigned short *p;
- if (wc < 0x80) {
- c2 = 0;
- c1 = wc;
- }else if ((wc>>11) == 27) {
- /* unpaired surrogate */
- return NKF_ICONV_INVALID_CODE_RANGE;
- }else if (wc < 0xFFFF) {
- ret = w16e_conv(wc, &c2, &c1);
- if (ret) return ret;
- }else if (wc < 0x10FFFF) {
- c2 = 0;
- c1 = nkf_char_unicode_new(wc);
+ if (c2 == X0201) {
+ p = euc_to_utf8_1byte;
+#ifdef X0212_ENABLE
+ } else if (is_eucg3(c2)){
+ if(ms_ucs_map_f == UCS_MAP_ASCII&& c2 == NKF_INT32_C(0x8F22) && c1 == 0x43){
+ return 0xA6;
+ }
+ c2 = (c2&0x7f) - 0x21;
+ if (0<=c2 && c2<sizeof_euc_to_utf8_2bytes)
+ p = x0212_to_utf8_2bytes[c2];
+ else
+ return 0;
+#endif
} else {
- return NKF_ICONV_INVALID_CODE_RANGE;
+ c2 &= 0x7f;
+ c2 = (c2&0x7f) - 0x21;
+ if (0<=c2 && c2<sizeof_euc_to_utf8_2bytes)
+ p = ms_ucs_map_f != UCS_MAP_ASCII ? euc_to_utf8_2bytes_ms[c2] : euc_to_utf8_2bytes[c2];
+ else
+ return 0;
}
- (*oconv)(c2, c1);
+ if (!p) return 0;
+ c1 = (c1 & 0x7f) - 0x21;
+ if (0<=c1 && c1<sizeof_euc_to_utf8_1byte)
+ return p[c1];
return 0;
}
-#define NKF_ICONV_NEED_ONE_MORE_BYTE -1
-#define NKF_ICONV_NEED_TWO_MORE_BYTES -2
-#define UTF16_TO_UTF32(lead, trail) (((lead) << 10) + (trail) - NKF_INT32_C(0x35FDC00))
-static size_t
-nkf_iconv_utf_16(nkf_char c1, nkf_char c2, nkf_char c3, nkf_char c4)
+void w_oconv(nkf_char c2, nkf_char c1)
{
- nkf_char wc;
+ nkf_char c0;
+ nkf_char val;
- if (c1 == EOF) {
- (*oconv)(EOF, 0);
- return 0;
+ if (output_bom_f) {
+ output_bom_f = FALSE;
+ (*o_putc)('\357');
+ (*o_putc)('\273');
+ (*o_putc)('\277');
}
- if (input_endian == ENDIAN_BIG) {
- if (0xD8 <= c1 && c1 <= 0xDB) {
- if (0xDC <= c3 && c3 <= 0xDF) {
- wc = UTF16_TO_UTF32(c1 << 8 | c2, c3 << 8 | c4);
- } else return NKF_ICONV_NEED_TWO_MORE_BYTES;
- } else {
- wc = c1 << 8 | c2;
- }
- } else {
- if (0xD8 <= c2 && c2 <= 0xDB) {
- if (0xDC <= c4 && c4 <= 0xDF) {
- wc = UTF16_TO_UTF32(c2 << 8 | c1, c4 << 8 | c3);
- } else return NKF_ICONV_NEED_TWO_MORE_BYTES;
- } else {
- wc = c2 << 8 | c1;
- }
+ if (c2 == EOF) {
+ (*o_putc)(EOF);
+ return;
}
- return (*unicode_iconv)(wc);
-}
-
-static nkf_char
-w_iconv16(nkf_char c2, nkf_char c1, nkf_char c0)
-{
- return 0;
-}
-
-static nkf_char
-w_iconv32(nkf_char c2, nkf_char c1, nkf_char c0)
-{
- return 0;
+#ifdef NUMCHAR_OPTION
+ if (c2 == 0 && is_unicode_capsule(c1)){
+ val = c1 & VALUE_MASK;
+ if (val < 0x80){
+ (*o_putc)(val);
+ }else if (val < 0x800){
+ (*o_putc)(0xC0 | (val >> 6));
+ (*o_putc)(0x80 | (val & 0x3f));
+ } else if (val <= NKF_INT32_C(0xFFFF)) {
+ (*o_putc)(0xE0 | (val >> 12));
+ (*o_putc)(0x80 | ((val >> 6) & 0x3f));
+ (*o_putc)(0x80 | (val & 0x3f));
+ } else if (val <= NKF_INT32_C(0x10FFFF)) {
+ (*o_putc)(0xF0 | ( val>>18));
+ (*o_putc)(0x80 | ((val>>12) & 0x3f));
+ (*o_putc)(0x80 | ((val>> 6) & 0x3f));
+ (*o_putc)(0x80 | ( val & 0x3f));
+ }
+ return;
+ }
+#endif
+
+ if (c2 == 0) {
+ output_mode = ASCII;
+ (*o_putc)(c1);
+ } else if (c2 == ISO8859_1) {
+ output_mode = ISO8859_1;
+ (*o_putc)(c1 | 0x080);
+ } else {
+ output_mode = UTF8;
+ val = e2w_conv(c2, c1);
+ if (val){
+ w16w_conv(val, &c2, &c1, &c0);
+ (*o_putc)(c2);
+ if (c1){
+ (*o_putc)(c1);
+ if (c0) (*o_putc)(c0);
+ }
+ }
+ }
}
-static size_t
-nkf_iconv_utf_32(nkf_char c1, nkf_char c2, nkf_char c3, nkf_char c4)
+void w_oconv16(nkf_char c2, nkf_char c1)
{
- nkf_char wc;
-
- if (c1 == EOF) {
- (*oconv)(EOF, 0);
- return 0;
+ if (output_bom_f) {
+ output_bom_f = FALSE;
+ if (output_endian == ENDIAN_LITTLE){
+ (*o_putc)((unsigned char)'\377');
+ (*o_putc)('\376');
+ }else{
+ (*o_putc)('\376');
+ (*o_putc)((unsigned char)'\377');
+ }
}
- switch(input_endian){
- case ENDIAN_BIG:
- wc = c2 << 16 | c3 << 8 | c4;
- break;
- case ENDIAN_LITTLE:
- wc = c3 << 16 | c2 << 8 | c1;
- break;
- case ENDIAN_2143:
- wc = c1 << 16 | c4 << 8 | c3;
- break;
- case ENDIAN_3412:
- wc = c4 << 16 | c1 << 8 | c2;
- break;
- default:
- return NKF_ICONV_INVALID_CODE_RANGE;
+ if (c2 == EOF) {
+ (*o_putc)(EOF);
+ return;
}
- return (*unicode_iconv)(wc);
-}
+ if (c2 == ISO8859_1) {
+ c2 = 0;
+ c1 |= 0x80;
+#ifdef NUMCHAR_OPTION
+ } else if (c2 == 0 && is_unicode_capsule(c1)) {
+ if (is_unicode_bmp(c1)) {
+ c2 = (c1 >> 8) & 0xff;
+ c1 &= 0xff;
+ } else {
+ c1 &= VALUE_MASK;
+ if (c1 <= UNICODE_MAX) {
+ c2 = (c1 >> 10) + NKF_INT32_C(0xD7C0); /* high surrogate */
+ c1 = (c1 & 0x3FF) + NKF_INT32_C(0xDC00); /* low surrogate */
+ if (output_endian == ENDIAN_LITTLE){
+ (*o_putc)(c2 & 0xff);
+ (*o_putc)((c2 >> 8) & 0xff);
+ (*o_putc)(c1 & 0xff);
+ (*o_putc)((c1 >> 8) & 0xff);
+ }else{
+ (*o_putc)((c2 >> 8) & 0xff);
+ (*o_putc)(c2 & 0xff);
+ (*o_putc)((c1 >> 8) & 0xff);
+ (*o_putc)(c1 & 0xff);
+ }
+ }
+ return;
+ }
#endif
-
-#define output_ascii_escape_sequence(mode) do { \
- if (output_mode != ASCII && output_mode != ISO_8859_1) { \
- (*o_putc)(ESC); \
- (*o_putc)('('); \
- (*o_putc)(ascii_intro); \
- output_mode = mode; \
- } \
- } while (0)
-
-static void
-output_escape_sequence(int mode)
-{
- if (output_mode == mode)
- return;
- switch(mode) {
- case ISO_8859_1:
- (*o_putc)(ESC);
- (*o_putc)('.');
- (*o_putc)('A');
- break;
- case JIS_X_0201_1976_K:
- (*o_putc)(ESC);
- (*o_putc)('(');
- (*o_putc)('I');
- break;
- case JIS_X_0208:
- (*o_putc)(ESC);
- (*o_putc)('$');
- (*o_putc)(kanji_intro);
- break;
- case JIS_X_0212:
- (*o_putc)(ESC);
- (*o_putc)('$');
- (*o_putc)('(');
- (*o_putc)('D');
- break;
- case JIS_X_0213_1:
- (*o_putc)(ESC);
- (*o_putc)('$');
- (*o_putc)('(');
- (*o_putc)('Q');
- break;
- case JIS_X_0213_2:
- (*o_putc)(ESC);
- (*o_putc)('$');
- (*o_putc)('(');
- (*o_putc)('P');
- break;
+ } else if (c2) {
+ nkf_char val = e2w_conv(c2, c1);
+ c2 = (val >> 8) & 0xff;
+ c1 = val & 0xff;
+ if (!val) return;
+ }
+ if (output_endian == ENDIAN_LITTLE){
+ (*o_putc)(c1);
+ (*o_putc)(c2);
+ }else{
+ (*o_putc)(c2);
+ (*o_putc)(c1);
}
- output_mode = mode;
}
-static void
-j_oconv(nkf_char c2, nkf_char c1)
+void w_oconv32(nkf_char c2, nkf_char c1)
{
-#ifdef NUMCHAR_OPTION
- if (c2 == 0 && nkf_char_unicode_p(c1)){
- w16e_conv(c1, &c2, &c1);
- if (c2 == 0 && nkf_char_unicode_p(c1)){
- c2 = c1 & VALUE_MASK;
- if (ms_ucs_map_f && 0xE000 <= c2 && c2 <= 0xE757) {
- /* CP5022x UDC */
- c1 &= 0xFFF;
- c2 = 0x7F + c1 / 94;
- c1 = 0x21 + c1 % 94;
- } else {
- if (encode_fallback) (*encode_fallback)(c1);
- return;
- }
- }
- }
-#endif
- if (c2 == 0) {
- output_ascii_escape_sequence(ASCII);
- (*o_putc)(c1);
- }
- else if (c2 == EOF) {
- output_ascii_escape_sequence(ASCII);
- (*o_putc)(EOF);
+ if (output_bom_f) {
+ output_bom_f = FALSE;
+ if (output_endian == ENDIAN_LITTLE){
+ (*o_putc)((unsigned char)'\377');
+ (*o_putc)('\376');
+ (*o_putc)('\000');
+ (*o_putc)('\000');
+ }else{
+ (*o_putc)('\000');
+ (*o_putc)('\000');
+ (*o_putc)('\376');
+ (*o_putc)((unsigned char)'\377');
+ }
}
- else if (c2 == ISO_8859_1) {
- output_ascii_escape_sequence(ISO_8859_1);
- (*o_putc)(c1|0x80);
+
+ if (c2 == EOF) {
+ (*o_putc)(EOF);
+ return;
}
- else if (c2 == JIS_X_0201_1976_K) {
- output_escape_sequence(JIS_X_0201_1976_K);
- (*o_putc)(c1);
-#ifdef X0212_ENABLE
- } else if (is_eucg3(c2)){
- output_escape_sequence(x0213_f ? JIS_X_0213_2 : JIS_X_0212);
- (*o_putc)(c2 & 0x7f);
- (*o_putc)(c1);
+
+ if (c2 == ISO8859_1) {
+ c1 |= 0x80;
+#ifdef NUMCHAR_OPTION
+ } else if (c2 == 0 && is_unicode_capsule(c1)) {
+ c1 &= VALUE_MASK;
#endif
- } else {
- if(ms_ucs_map_f
- ? c2<0x20 || 0x92<c2 || c1<0x20 || 0x7e<c1
- : c2<0x20 || 0x7e<c2 || c1<0x20 || 0x7e<c1) return;
- output_escape_sequence(x0213_f ? JIS_X_0213_1 : JIS_X_0208);
- (*o_putc)(c2);
- (*o_putc)(c1);
+ } else if (c2) {
+ c1 = e2w_conv(c2, c1);
+ if (!c1) return;
+ }
+ if (output_endian == ENDIAN_LITTLE){
+ (*o_putc)( c1 & NKF_INT32_C(0x000000FF));
+ (*o_putc)((c1 & NKF_INT32_C(0x0000FF00)) >> 8);
+ (*o_putc)((c1 & NKF_INT32_C(0x00FF0000)) >> 16);
+ (*o_putc)('\000');
+ }else{
+ (*o_putc)('\000');
+ (*o_putc)((c1 & NKF_INT32_C(0x00FF0000)) >> 16);
+ (*o_putc)((c1 & NKF_INT32_C(0x0000FF00)) >> 8);
+ (*o_putc)( c1 & NKF_INT32_C(0x000000FF));
}
}
+#endif
-static void
-e_oconv(nkf_char c2, nkf_char c1)
+void e_oconv(nkf_char c2, nkf_char c1)
{
- if (c2 == 0 && nkf_char_unicode_p(c1)){
- w16e_conv(c1, &c2, &c1);
- if (c2 == 0 && nkf_char_unicode_p(c1)){
+#ifdef NUMCHAR_OPTION
+ if (c2 == 0 && is_unicode_capsule(c1)){
+ w16e_conv(c1, &c2, &c1);
+ if (c2 == 0 && is_unicode_capsule(c1)){
c2 = c1 & VALUE_MASK;
if (x0212_f && 0xE000 <= c2 && c2 <= 0xE757) {
/* eucJP-ms UDC */
@@ -2385,68 +3967,143 @@ e_oconv(nkf_char c2, nkf_char c1)
if (encode_fallback) (*encode_fallback)(c1);
return;
}
- }
+ }
}
-
+#endif
if (c2 == EOF) {
- (*o_putc)(EOF);
- } else if (c2 == 0) {
+ (*o_putc)(EOF);
+ return;
+ } else if (c2 == 0) {
output_mode = ASCII;
- (*o_putc)(c1);
- } else if (c2 == JIS_X_0201_1976_K) {
- output_mode = EUC_JP;
- (*o_putc)(SS2); (*o_putc)(c1|0x80);
- } else if (c2 == ISO_8859_1) {
- output_mode = ISO_8859_1;
- (*o_putc)(c1 | 0x080);
+ (*o_putc)(c1);
+ } else if (c2 == X0201) {
+ output_mode = JAPANESE_EUC;
+ (*o_putc)(SSO); (*o_putc)(c1|0x80);
+ } else if (c2 == ISO8859_1) {
+ output_mode = ISO8859_1;
+ (*o_putc)(c1 | 0x080);
#ifdef X0212_ENABLE
} else if (is_eucg3(c2)){
- output_mode = EUC_JP;
+ output_mode = JAPANESE_EUC;
#ifdef SHIFTJIS_CP932
- if (!cp932inv_f){
- nkf_char s2, s1;
- if (e2s_conv(c2, c1, &s2, &s1) == 0){
- s2e_conv(s2, s1, &c2, &c1);
- }
- }
-#endif
- if (c2 == 0) {
+ if (!cp932inv_f){
+ nkf_char s2, s1;
+ if (e2s_conv(c2, c1, &s2, &s1) == 0){
+ s2e_conv(s2, s1, &c2, &c1);
+ }
+ }
+#endif
+ if (c2 == 0) {
output_mode = ASCII;
(*o_putc)(c1);
}else if (is_eucg3(c2)){
- if (x0212_f){
- (*o_putc)(0x8f);
- (*o_putc)((c2 & 0x7f) | 0x080);
- (*o_putc)(c1 | 0x080);
+ if (x0212_f){
+ (*o_putc)(0x8f);
+ (*o_putc)((c2 & 0x7f) | 0x080);
+ (*o_putc)(c1 | 0x080);
+ }
+ }else{
+ (*o_putc)((c2 & 0x7f) | 0x080);
+ (*o_putc)(c1 | 0x080);
+ }
+#endif
+ } else {
+ if (!nkf_isgraph(c1) || !nkf_isgraph(c2)) {
+ set_iconv(FALSE, 0);
+ return; /* too late to rescue this char */
+ }
+ output_mode = JAPANESE_EUC;
+ (*o_putc)(c2 | 0x080);
+ (*o_putc)(c1 | 0x080);
+ }
+}
+
+#ifdef X0212_ENABLE
+nkf_char x0212_shift(nkf_char c)
+{
+ nkf_char ret = c;
+ c &= 0x7f;
+ if (is_eucg3(ret)){
+ if (0x75 <= c && c <= 0x7f){
+ ret = c + (0x109 - 0x75);
+ }
+ }else{
+ if (0x75 <= c && c <= 0x7f){
+ ret = c + (0x113 - 0x75);
+ }
+ }
+ return ret;
+}
+
+
+nkf_char x0212_unshift(nkf_char c)
+{
+ nkf_char ret = c;
+ if (0x7f <= c && c <= 0x88){
+ ret = c + (0x75 - 0x7f);
+ }else if (0x89 <= c && c <= 0x92){
+ ret = PREFIX_EUCG3 | 0x80 | (c + (0x75 - 0x89));
+ }
+ return ret;
+}
+#endif /* X0212_ENABLE */
+
+nkf_char e2s_conv(nkf_char c2, nkf_char c1, nkf_char *p2, nkf_char *p1)
+{
+ nkf_char ndx;
+ if (is_eucg3(c2)){
+ ndx = c2 & 0x7f;
+ if (x0213_f){
+ if((0x21 <= ndx && ndx <= 0x2F)){
+ if (p2) *p2 = ((ndx - 1) >> 1) + 0xec - ndx / 8 * 3;
+ if (p1) *p1 = c1 + ((ndx & 1) ? ((c1 < 0x60) ? 0x1f : 0x20) : 0x7e);
+ return 0;
+ }else if(0x6E <= ndx && ndx <= 0x7E){
+ if (p2) *p2 = ((ndx - 1) >> 1) + 0xbe;
+ if (p1) *p1 = c1 + ((ndx & 1) ? ((c1 < 0x60) ? 0x1f : 0x20) : 0x7e);
+ return 0;
}
- }else{
- (*o_putc)((c2 & 0x7f) | 0x080);
- (*o_putc)(c1 | 0x080);
+ return 1;
}
+#ifdef X0212_ENABLE
+ else if(nkf_isgraph(ndx)){
+ nkf_char val = 0;
+ const unsigned short *ptr;
+#if 0
+ extern const unsigned short *const x0212_shiftjis[];
#endif
- } else {
- if (!nkf_isgraph(c1) || !nkf_isgraph(c2)) {
- set_iconv(FALSE, 0);
- return; /* too late to rescue this char */
+ ptr = x0212_shiftjis[ndx - 0x21];
+ if (ptr){
+ val = ptr[(c1 & 0x7f) - 0x21];
+ }
+ if (val){
+ c2 = val >> 8;
+ c1 = val & 0xff;
+ if (p2) *p2 = c2;
+ if (p1) *p1 = c1;
+ return 0;
+ }
+ c2 = x0212_shift(c2);
}
- output_mode = EUC_JP;
- (*o_putc)(c2 | 0x080);
- (*o_putc)(c1 | 0x080);
+#endif /* X0212_ENABLE */
}
+ if(0x7F < c2) return 1;
+ if (p2) *p2 = ((c2 - 1) >> 1) + ((c2 <= 0x5e) ? 0x71 : 0xb1);
+ if (p1) *p1 = c1 + ((c2 & 1) ? ((c1 < 0x60) ? 0x1f : 0x20) : 0x7e);
+ return 0;
}
-static void
-s_oconv(nkf_char c2, nkf_char c1)
+void s_oconv(nkf_char c2, nkf_char c1)
{
#ifdef NUMCHAR_OPTION
- if (c2 == 0 && nkf_char_unicode_p(c1)){
- w16e_conv(c1, &c2, &c1);
- if (c2 == 0 && nkf_char_unicode_p(c1)){
+ if (c2 == 0 && is_unicode_capsule(c1)){
+ w16e_conv(c1, &c2, &c1);
+ if (c2 == 0 && is_unicode_capsule(c1)){
c2 = c1 & VALUE_MASK;
if (!x0213_f && 0xE000 <= c2 && c2 <= 0xE757) {
/* CP932 UDC */
c1 &= 0xFFF;
- c2 = c1 / 188 + (cp932inv_f ? 0xF0 : 0xEB);
+ c2 = c1 / 188 + 0xF0;
c1 = c1 % 188;
c1 += 0x40 + (c1 > 0x3e);
(*o_putc)(c2);
@@ -2460,1250 +4117,515 @@ s_oconv(nkf_char c2, nkf_char c1)
}
#endif
if (c2 == EOF) {
- (*o_putc)(EOF);
- return;
+ (*o_putc)(EOF);
+ return;
} else if (c2 == 0) {
output_mode = ASCII;
- (*o_putc)(c1);
- } else if (c2 == JIS_X_0201_1976_K) {
+ (*o_putc)(c1);
+ } else if (c2 == X0201) {
output_mode = SHIFT_JIS;
- (*o_putc)(c1|0x80);
- } else if (c2 == ISO_8859_1) {
- output_mode = ISO_8859_1;
- (*o_putc)(c1 | 0x080);
+ (*o_putc)(c1|0x80);
+ } else if (c2 == ISO8859_1) {
+ output_mode = ISO8859_1;
+ (*o_putc)(c1 | 0x080);
#ifdef X0212_ENABLE
} else if (is_eucg3(c2)){
output_mode = SHIFT_JIS;
- if (e2s_conv(c2, c1, &c2, &c1) == 0){
- (*o_putc)(c2);
- (*o_putc)(c1);
- }
+ if (e2s_conv(c2, c1, &c2, &c1) == 0){
+ (*o_putc)(c2);
+ (*o_putc)(c1);
+ }
#endif
} else {
- if (!nkf_isprint(c1) || !nkf_isprint(c2)) {
- set_iconv(FALSE, 0);
- return; /* too late to rescue this char */
- }
+ if (!nkf_isprint(c1) || !nkf_isprint(c2)) {
+ set_iconv(FALSE, 0);
+ return; /* too late to rescue this char */
+ }
output_mode = SHIFT_JIS;
- e2s_conv(c2, c1, &c2, &c1);
+ e2s_conv(c2, c1, &c2, &c1);
#ifdef SHIFTJIS_CP932
- if (cp932inv_f
- && CP932INV_TABLE_BEGIN <= c2 && c2 <= CP932INV_TABLE_END){
- nkf_char c = cp932inv[c2 - CP932INV_TABLE_BEGIN][c1 - 0x40];
- if (c){
- c2 = c >> 8;
- c1 = c & 0xff;
- }
- }
+ if (cp932inv_f
+ && CP932INV_TABLE_BEGIN <= c2 && c2 <= CP932INV_TABLE_END){
+#if 0
+ extern const unsigned short cp932inv[2][189];
+#endif
+ nkf_char c = cp932inv[c2 - CP932INV_TABLE_BEGIN][c1 - 0x40];
+ if (c){
+ c2 = c >> 8;
+ c1 = c & 0xff;
+ }
+ }
#endif /* SHIFTJIS_CP932 */
- (*o_putc)(c2);
+ (*o_putc)(c2);
if (prefix_table[(unsigned char)c1]){
- (*o_putc)(prefix_table[(unsigned char)c1]);
- }
- (*o_putc)(c1);
- }
-}
-
-#ifdef UTF8_OUTPUT_ENABLE
-static void
-w_oconv(nkf_char c2, nkf_char c1)
-{
- nkf_char c3, c4;
- nkf_char val;
-
- if (output_bom_f) {
- output_bom_f = FALSE;
- (*o_putc)('\357');
- (*o_putc)('\273');
- (*o_putc)('\277');
- }
-
- if (c2 == EOF) {
- (*o_putc)(EOF);
- return;
- }
-
- if (c2 == 0 && nkf_char_unicode_p(c1)){
- val = c1 & VALUE_MASK;
- nkf_unicode_to_utf8(val, &c1, &c2, &c3, &c4);
- (*o_putc)(c1);
- if (c2) (*o_putc)(c2);
- if (c3) (*o_putc)(c3);
- if (c4) (*o_putc)(c4);
- return;
- }
-
- if (c2 == 0) {
- (*o_putc)(c1);
- } else {
- val = e2w_conv(c2, c1);
- if (val){
- nkf_unicode_to_utf8(val, &c1, &c2, &c3, &c4);
- (*o_putc)(c1);
- if (c2) (*o_putc)(c2);
- if (c3) (*o_putc)(c3);
- if (c4) (*o_putc)(c4);
+ (*o_putc)(prefix_table[(unsigned char)c1]);
}
+ (*o_putc)(c1);
}
}
-static void
-w_oconv16(nkf_char c2, nkf_char c1)
+void j_oconv(nkf_char c2, nkf_char c1)
{
- if (output_bom_f) {
- output_bom_f = FALSE;
- if (output_endian == ENDIAN_LITTLE){
- (*o_putc)(0xFF);
- (*o_putc)(0xFE);
- }else{
- (*o_putc)(0xFE);
- (*o_putc)(0xFF);
- }
- }
-
- if (c2 == EOF) {
- (*o_putc)(EOF);
- return;
- }
-
- if (c2 == 0 && nkf_char_unicode_p(c1)) {
- if (nkf_char_unicode_bmp_p(c1)) {
- c2 = (c1 >> 8) & 0xff;
- c1 &= 0xff;
- } else {
- c1 &= VALUE_MASK;
- if (c1 <= UNICODE_MAX) {
- c2 = (c1 >> 10) + NKF_INT32_C(0xD7C0); /* high surrogate */
- c1 = (c1 & 0x3FF) + NKF_INT32_C(0xDC00); /* low surrogate */
- if (output_endian == ENDIAN_LITTLE){
- (*o_putc)(c2 & 0xff);
- (*o_putc)((c2 >> 8) & 0xff);
- (*o_putc)(c1 & 0xff);
- (*o_putc)((c1 >> 8) & 0xff);
- }else{
- (*o_putc)((c2 >> 8) & 0xff);
- (*o_putc)(c2 & 0xff);
- (*o_putc)((c1 >> 8) & 0xff);
- (*o_putc)(c1 & 0xff);
- }
+#ifdef NUMCHAR_OPTION
+ if (c2 == 0 && is_unicode_capsule(c1)){
+ w16e_conv(c1, &c2, &c1);
+ if (c2 == 0 && is_unicode_capsule(c1)){
+ c2 = c1 & VALUE_MASK;
+ if (ms_ucs_map_f && 0xE000 <= c2 && c2 <= 0xE757) {
+ /* CP5022x UDC */
+ c1 &= 0xFFF;
+ c2 = 0x7F + c1 / 94;
+ c1 = 0x21 + c1 % 94;
+ } else {
+ if (encode_fallback) (*encode_fallback)(c1);
+ return;
}
- return;
- }
- } else if (c2) {
- nkf_char val = e2w_conv(c2, c1);
- c2 = (val >> 8) & 0xff;
- c1 = val & 0xff;
- if (!val) return;
- }
-
- if (output_endian == ENDIAN_LITTLE){
- (*o_putc)(c1);
- (*o_putc)(c2);
- }else{
- (*o_putc)(c2);
- (*o_putc)(c1);
- }
-}
-
-static void
-w_oconv32(nkf_char c2, nkf_char c1)
-{
- if (output_bom_f) {
- output_bom_f = FALSE;
- if (output_endian == ENDIAN_LITTLE){
- (*o_putc)(0xFF);
- (*o_putc)(0xFE);
- (*o_putc)(0);
- (*o_putc)(0);
- }else{
- (*o_putc)(0);
- (*o_putc)(0);
- (*o_putc)(0xFE);
- (*o_putc)(0xFF);
- }
- }
-
- if (c2 == EOF) {
- (*o_putc)(EOF);
- return;
- }
-
- if (c2 == ISO_8859_1) {
- c1 |= 0x80;
- } else if (c2 == 0 && nkf_char_unicode_p(c1)) {
- c1 &= VALUE_MASK;
- } else if (c2) {
- c1 = e2w_conv(c2, c1);
- if (!c1) return;
- }
- if (output_endian == ENDIAN_LITTLE){
- (*o_putc)( c1 & 0xFF);
- (*o_putc)((c1 >> 8) & 0xFF);
- (*o_putc)((c1 >> 16) & 0xFF);
- (*o_putc)(0);
- }else{
- (*o_putc)(0);
- (*o_putc)((c1 >> 16) & 0xFF);
- (*o_putc)((c1 >> 8) & 0xFF);
- (*o_putc)( c1 & 0xFF);
- }
-}
-#endif
-
-#define SCORE_L2 (1) /* Kanji Level 2 */
-#define SCORE_KANA (SCORE_L2 << 1) /* Halfwidth Katakana */
-#define SCORE_DEPEND (SCORE_KANA << 1) /* MD Characters */
-#define SCORE_CP932 (SCORE_DEPEND << 1) /* IBM extended characters */
-#define SCORE_X0212 (SCORE_CP932 << 1) /* JIS X 0212 */
-#define SCORE_NO_EXIST (SCORE_X0212 << 1) /* Undefined Characters */
-#define SCORE_iMIME (SCORE_NO_EXIST << 1) /* MIME selected */
-#define SCORE_ERROR (SCORE_iMIME << 1) /* Error */
-
-#define SCORE_INIT (SCORE_iMIME)
-
-static const nkf_char score_table_A0[] = {
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, SCORE_DEPEND, SCORE_DEPEND, SCORE_DEPEND,
- SCORE_DEPEND, SCORE_DEPEND, SCORE_DEPEND, SCORE_NO_EXIST,
-};
-
-static const nkf_char score_table_F0[] = {
- SCORE_L2, SCORE_L2, SCORE_L2, SCORE_L2,
- SCORE_L2, SCORE_DEPEND, SCORE_NO_EXIST, SCORE_NO_EXIST,
- SCORE_DEPEND, SCORE_DEPEND, SCORE_CP932, SCORE_CP932,
- SCORE_CP932, SCORE_NO_EXIST, SCORE_NO_EXIST, SCORE_ERROR,
-};
-
-static void
-set_code_score(struct input_code *ptr, nkf_char score)
-{
- if (ptr){
- ptr->score |= score;
+ }
}
-}
-
-static void
-clr_code_score(struct input_code *ptr, nkf_char score)
-{
- if (ptr){
- ptr->score &= ~score;
- }
-}
-
-static void
-code_score(struct input_code *ptr)
-{
- nkf_char c2 = ptr->buf[0];
-#ifdef UTF8_OUTPUT_ENABLE
- nkf_char c1 = ptr->buf[1];
#endif
- if (c2 < 0){
- set_code_score(ptr, SCORE_ERROR);
- }else if (c2 == SS2){
- set_code_score(ptr, SCORE_KANA);
- }else if (c2 == 0x8f){
- set_code_score(ptr, SCORE_X0212);
-#ifdef UTF8_OUTPUT_ENABLE
- }else if (!e2w_conv(c2, c1)){
- set_code_score(ptr, SCORE_NO_EXIST);
-#endif
- }else if ((c2 & 0x70) == 0x20){
- set_code_score(ptr, score_table_A0[c2 & 0x0f]);
- }else if ((c2 & 0x70) == 0x70){
- set_code_score(ptr, score_table_F0[c2 & 0x0f]);
- }else if ((c2 & 0x70) >= 0x50){
- set_code_score(ptr, SCORE_L2);
- }
-}
-
-static void
-status_disable(struct input_code *ptr)
-{
- ptr->stat = -1;
- ptr->buf[0] = -1;
- code_score(ptr);
- if (iconv == ptr->iconv_func) set_iconv(FALSE, 0);
-}
-
-static void
-status_push_ch(struct input_code *ptr, nkf_char c)
-{
- ptr->buf[ptr->index++] = c;
-}
-
-static void
-status_clear(struct input_code *ptr)
-{
- ptr->stat = 0;
- ptr->index = 0;
-}
-
-static void
-status_reset(struct input_code *ptr)
-{
- status_clear(ptr);
- ptr->score = SCORE_INIT;
-}
-
-static void
-status_reinit(struct input_code *ptr)
-{
- status_reset(ptr);
- ptr->_file_stat = 0;
-}
-
-static void
-status_check(struct input_code *ptr, nkf_char c)
-{
- if (c <= DEL && estab_f){
- status_reset(ptr);
- }
-}
-
-static void
-s_status(struct input_code *ptr, nkf_char c)
-{
- switch(ptr->stat){
- case -1:
- status_check(ptr, c);
- break;
- case 0:
- if (c <= DEL){
- break;
- }else if (nkf_char_unicode_p(c)){
- break;
- }else if (0xa1 <= c && c <= 0xdf){
- status_push_ch(ptr, SS2);
- status_push_ch(ptr, c);
- code_score(ptr);
- status_clear(ptr);
- }else if ((0x81 <= c && c < 0xa0) || (0xe0 <= c && c <= 0xea)){
- ptr->stat = 1;
- status_push_ch(ptr, c);
- }else if (0xed <= c && c <= 0xee){
- ptr->stat = 3;
- status_push_ch(ptr, c);
-#ifdef SHIFTJIS_CP932
- }else if (is_ibmext_in_sjis(c)){
- ptr->stat = 2;
- status_push_ch(ptr, c);
-#endif /* SHIFTJIS_CP932 */
-#ifdef X0212_ENABLE
- }else if (0xf0 <= c && c <= 0xfc){
- ptr->stat = 1;
- status_push_ch(ptr, c);
-#endif /* X0212_ENABLE */
- }else{
- status_disable(ptr);
- }
- break;
- case 1:
- if ((0x40 <= c && c <= 0x7e) || (0x80 <= c && c <= 0xfc)){
- status_push_ch(ptr, c);
- s2e_conv(ptr->buf[0], ptr->buf[1], &ptr->buf[0], &ptr->buf[1]);
- code_score(ptr);
- status_clear(ptr);
- }else{
- status_disable(ptr);
- }
- break;
- case 2:
-#ifdef SHIFTJIS_CP932
- if ((0x40 <= c && c <= 0x7e) || (0x80 <= c && c <= 0xfc)) {
- status_push_ch(ptr, c);
- if (s2e_conv(ptr->buf[0], ptr->buf[1], &ptr->buf[0], &ptr->buf[1]) == 0) {
- set_code_score(ptr, SCORE_CP932);
- status_clear(ptr);
- break;
- }
- }
-#endif /* SHIFTJIS_CP932 */
- status_disable(ptr);
- break;
- case 3:
- if ((0x40 <= c && c <= 0x7e) || (0x80 <= c && c <= 0xfc)){
- status_push_ch(ptr, c);
- s2e_conv(ptr->buf[0], ptr->buf[1], &ptr->buf[0], &ptr->buf[1]);
- set_code_score(ptr, SCORE_CP932);
- status_clear(ptr);
- }else{
- status_disable(ptr);
- }
- break;
- }
-}
-
-static void
-e_status(struct input_code *ptr, nkf_char c)
-{
- switch (ptr->stat){
- case -1:
- status_check(ptr, c);
- break;
- case 0:
- if (c <= DEL){
- break;
- }else if (nkf_char_unicode_p(c)){
- break;
- }else if (SS2 == c || (0xa1 <= c && c <= 0xfe)){
- ptr->stat = 1;
- status_push_ch(ptr, c);
-#ifdef X0212_ENABLE
- }else if (0x8f == c){
- ptr->stat = 2;
- status_push_ch(ptr, c);
-#endif /* X0212_ENABLE */
- }else{
- status_disable(ptr);
- }
- break;
- case 1:
- if (0xa1 <= c && c <= 0xfe){
- status_push_ch(ptr, c);
- code_score(ptr);
- status_clear(ptr);
- }else{
- status_disable(ptr);
- }
- break;
+ if (c2 == EOF) {
+ if (output_mode !=ASCII && output_mode!=ISO8859_1) {
+ (*o_putc)(ESC);
+ (*o_putc)('(');
+ (*o_putc)(ascii_intro);
+ output_mode = ASCII;
+ }
+ (*o_putc)(EOF);
#ifdef X0212_ENABLE
- case 2:
- if (0xa1 <= c && c <= 0xfe){
- ptr->stat = 1;
- status_push_ch(ptr, c);
- }else{
- status_disable(ptr);
- }
-#endif /* X0212_ENABLE */
- }
-}
-
-#ifdef UTF8_INPUT_ENABLE
-static void
-w_status(struct input_code *ptr, nkf_char c)
-{
- switch (ptr->stat){
- case -1:
- status_check(ptr, c);
- break;
- case 0:
- if (c <= DEL){
- break;
- }else if (nkf_char_unicode_p(c)){
- break;
- }else if (0xc0 <= c && c <= 0xdf){
- ptr->stat = 1;
- status_push_ch(ptr, c);
- }else if (0xe0 <= c && c <= 0xef){
- ptr->stat = 2;
- status_push_ch(ptr, c);
- }else if (0xf0 <= c && c <= 0xf4){
- ptr->stat = 3;
- status_push_ch(ptr, c);
- }else{
- status_disable(ptr);
- }
- break;
- case 1:
- case 2:
- if (0x80 <= c && c <= 0xbf){
- status_push_ch(ptr, c);
- if (ptr->index > ptr->stat){
- int bom = (ptr->buf[0] == 0xef && ptr->buf[1] == 0xbb
- && ptr->buf[2] == 0xbf);
- w2e_conv(ptr->buf[0], ptr->buf[1], ptr->buf[2],
- &ptr->buf[0], &ptr->buf[1]);
- if (!bom){
- code_score(ptr);
- }
- status_clear(ptr);
+ } else if (is_eucg3(c2)){
+ if(x0213_f){
+ if(output_mode!=X0213_2){
+ output_mode = X0213_2;
+ (*o_putc)(ESC);
+ (*o_putc)('$');
+ (*o_putc)('(');
+ (*o_putc)(X0213_2&0x7F);
}
}else{
- status_disable(ptr);
- }
- break;
- case 3:
- if (0x80 <= c && c <= 0xbf){
- if (ptr->index < ptr->stat){
- status_push_ch(ptr, c);
- } else {
- status_clear(ptr);
+ if(output_mode!=X0212){
+ output_mode = X0212;
+ (*o_putc)(ESC);
+ (*o_putc)('$');
+ (*o_putc)('(');
+ (*o_putc)(X0212&0x7F);
}
- }else{
- status_disable(ptr);
- }
- break;
- }
-}
-#endif
-
-static void
-code_status(nkf_char c)
-{
- int action_flag = 1;
- struct input_code *result = 0;
- struct input_code *p = input_code_list;
- while (p->name){
- if (!p->status_func) {
- ++p;
- continue;
- }
- if (!p->status_func)
- continue;
- (p->status_func)(p, c);
- if (p->stat > 0){
- action_flag = 0;
- }else if(p->stat == 0){
- if (result){
- action_flag = 0;
- }else{
- result = p;
- }
- }
- ++p;
- }
-
- if (action_flag){
- if (result && !estab_f){
- set_iconv(TRUE, result->iconv_func);
- }else if (c <= DEL){
- struct input_code *ptr = input_code_list;
- while (ptr->name){
- status_reset(ptr);
- ++ptr;
+ }
+ (*o_putc)(c2 & 0x7f);
+ (*o_putc)(c1);
+#endif
+ } else if (c2==X0201) {
+ if (output_mode!=X0201) {
+ output_mode = X0201;
+ (*o_putc)(ESC);
+ (*o_putc)('(');
+ (*o_putc)('I');
+ }
+ (*o_putc)(c1);
+ } else if (c2==ISO8859_1) {
+ /* iso8859 introduction, or 8th bit on */
+ /* Can we convert in 7bit form using ESC-'-'-A ?
+ Is this popular? */
+ output_mode = ISO8859_1;
+ (*o_putc)(c1|0x80);
+ } else if (c2 == 0) {
+ if (output_mode !=ASCII && output_mode!=ISO8859_1) {
+ (*o_putc)(ESC);
+ (*o_putc)('(');
+ (*o_putc)(ascii_intro);
+ output_mode = ASCII;
+ }
+ (*o_putc)(c1);
+ } else {
+ if(ms_ucs_map_f
+ ? c2<0x20 || 0x92<c2 || c1<0x20 || 0x7e<c1
+ : c2<0x20 || 0x7e<c2 || c1<0x20 || 0x7e<c1) return;
+ if(x0213_f){
+ if (output_mode!=X0213_1) {
+ output_mode = X0213_1;
+ (*o_putc)(ESC);
+ (*o_putc)('$');
+ (*o_putc)('(');
+ (*o_putc)(X0213_1&0x7F);
}
- }
- }
-}
-
-typedef struct {
- nkf_buf_t *std_gc_buf;
- nkf_char broken_state;
- nkf_buf_t *broken_buf;
- nkf_char mimeout_state;
- nkf_buf_t *nfc_buf;
-} nkf_state_t;
-
-static nkf_state_t *nkf_state = NULL;
-
-#define STD_GC_BUFSIZE (256)
-
-static void
-nkf_state_init(void)
-{
- if (nkf_state) {
- nkf_buf_clear(nkf_state->std_gc_buf);
- nkf_buf_clear(nkf_state->broken_buf);
- nkf_buf_clear(nkf_state->nfc_buf);
- }
- else {
- nkf_state = nkf_xmalloc(sizeof(nkf_state_t));
- nkf_state->std_gc_buf = nkf_buf_new(STD_GC_BUFSIZE);
- nkf_state->broken_buf = nkf_buf_new(3);
- nkf_state->nfc_buf = nkf_buf_new(9);
- }
- nkf_state->broken_state = 0;
- nkf_state->mimeout_state = 0;
-}
-
-#ifndef WIN32DLL
-static nkf_char
-std_getc(FILE *f)
-{
- if (!nkf_buf_empty_p(nkf_state->std_gc_buf)){
- return nkf_buf_pop(nkf_state->std_gc_buf);
+ }else if (output_mode != X0208) {
+ output_mode = X0208;
+ (*o_putc)(ESC);
+ (*o_putc)('$');
+ (*o_putc)(kanji_intro);
+ }
+ (*o_putc)(c2);
+ (*o_putc)(c1);
}
- return getc(f);
-}
-#endif /*WIN32DLL*/
-
-static nkf_char
-std_ungetc(nkf_char c, FILE *f)
-{
- nkf_buf_push(nkf_state->std_gc_buf, c);
- return c;
-}
-
-#ifndef WIN32DLL
-static void
-std_putc(nkf_char c)
-{
- if(c!=EOF)
- putchar(c);
}
-#endif /*WIN32DLL*/
-static unsigned char hold_buf[HOLD_SIZE*2];
-static int hold_count = 0;
-static nkf_char
-push_hold_buf(nkf_char c2)
+void base64_conv(nkf_char c2, nkf_char c1)
{
- if (hold_count >= HOLD_SIZE*2)
- return (EOF);
- hold_buf[hold_count++] = (unsigned char)c2;
- return ((hold_count >= HOLD_SIZE*2) ? EOF : hold_count);
-}
-
-static int
-h_conv(FILE *f, int c1, int c2)
-{
- int ret, c4, c3;
- int hold_index;
-
-
- /** it must NOT be in the kanji shifte sequence */
- /** it must NOT be written in JIS7 */
- /** and it must be after 2 byte 8bit code */
-
- hold_count = 0;
- push_hold_buf(c1);
- push_hold_buf(c2);
-
- while ((c2 = (*i_getc)(f)) != EOF) {
- if (c2 == ESC){
- (*i_ungetc)(c2,f);
- break;
- }
- code_status(c2);
- if (push_hold_buf(c2) == EOF || estab_f) {
- break;
- }
- }
-
- if (!estab_f) {
- struct input_code *p = input_code_list;
- struct input_code *result = p;
- if (c2 == EOF) {
- code_status(c2);
- }
- while (p->name) {
- if (p->status_func && p->score < result->score) {
- result = p;
- }
- p++;
- }
- set_iconv(TRUE, result->iconv_func);
- }
-
-
- /** now,
- ** 1) EOF is detected, or
- ** 2) Code is established, or
- ** 3) Buffer is FULL (but last word is pushed)
- **
- ** in 1) and 3) cases, we continue to use
- ** Kanji codes by oconv and leave estab_f unchanged.
- **/
-
- ret = c2;
- hold_index = 0;
- while (hold_index < hold_count){
- c1 = hold_buf[hold_index++];
- if (c1 <= DEL){
- (*iconv)(0, c1, 0);
- continue;
- }else if (iconv == s_iconv && 0xa1 <= c1 && c1 <= 0xdf){
- (*iconv)(JIS_X_0201_1976_K, c1, 0);
- continue;
- }
- if (hold_index < hold_count){
- c2 = hold_buf[hold_index++];
- }else{
- c2 = (*i_getc)(f);
- if (c2 == EOF){
- c4 = EOF;
- break;
- }
- code_status(c2);
- }
- c3 = 0;
- switch ((*iconv)(c1, c2, 0)) { /* can be EUC/SJIS/UTF-8 */
- case -2:
- /* 4 bytes UTF-8 */
- if (hold_index < hold_count){
- c3 = hold_buf[hold_index++];
- } else if ((c3 = (*i_getc)(f)) == EOF) {
- ret = EOF;
- break;
- } else {
- code_status(c3);
- if (hold_index < hold_count){
- c4 = hold_buf[hold_index++];
- } else if ((c4 = (*i_getc)(f)) == EOF) {
- c3 = ret = EOF;
- break;
- } else {
- code_status(c4);
- (*iconv)(c1, c2, (c3<<8)|c4);
- }
- }
- break;
- case -1:
- /* 3 bytes EUC or UTF-8 */
- if (hold_index < hold_count){
- c3 = hold_buf[hold_index++];
- } else if ((c3 = (*i_getc)(f)) == EOF) {
- ret = EOF;
- break;
- } else {
- code_status(c3);
- }
- (*iconv)(c1, c2, c3);
- break;
- }
- if (c3 == EOF) break;
- }
- return ret;
+ mime_prechar(c2, c1);
+ (*o_base64conv)(c2,c1);
}
-/*
- * Check and Ignore BOM
- */
-static void
-check_bom(FILE *f)
-{
- int c2;
- switch(c2 = (*i_getc)(f)){
- case 0x00:
- if((c2 = (*i_getc)(f)) == 0x00){
- if((c2 = (*i_getc)(f)) == 0xFE){
- if((c2 = (*i_getc)(f)) == 0xFF){
- if(!input_encoding){
- set_iconv(TRUE, w_iconv32);
- }
- if (iconv == w_iconv32) {
- input_endian = ENDIAN_BIG;
- return;
- }
- (*i_ungetc)(0xFF,f);
- }else (*i_ungetc)(c2,f);
- (*i_ungetc)(0xFE,f);
- }else if(c2 == 0xFF){
- if((c2 = (*i_getc)(f)) == 0xFE){
- if(!input_encoding){
- set_iconv(TRUE, w_iconv32);
- }
- if (iconv == w_iconv32) {
- input_endian = ENDIAN_2143;
- return;
- }
- (*i_ungetc)(0xFF,f);
- }else (*i_ungetc)(c2,f);
- (*i_ungetc)(0xFF,f);
- }else (*i_ungetc)(c2,f);
- (*i_ungetc)(0x00,f);
- }else (*i_ungetc)(c2,f);
- (*i_ungetc)(0x00,f);
- break;
- case 0xEF:
- if((c2 = (*i_getc)(f)) == 0xBB){
- if((c2 = (*i_getc)(f)) == 0xBF){
- if(!input_encoding){
- set_iconv(TRUE, w_iconv);
- }
- if (iconv == w_iconv) {
- return;
- }
- (*i_ungetc)(0xBF,f);
- }else (*i_ungetc)(c2,f);
- (*i_ungetc)(0xBB,f);
- }else (*i_ungetc)(c2,f);
- (*i_ungetc)(0xEF,f);
- break;
- case 0xFE:
- if((c2 = (*i_getc)(f)) == 0xFF){
- if((c2 = (*i_getc)(f)) == 0x00){
- if((c2 = (*i_getc)(f)) == 0x00){
- if(!input_encoding){
- set_iconv(TRUE, w_iconv32);
- }
- if (iconv == w_iconv32) {
- input_endian = ENDIAN_3412;
- return;
- }
- (*i_ungetc)(0x00,f);
- }else (*i_ungetc)(c2,f);
- (*i_ungetc)(0x00,f);
- }else (*i_ungetc)(c2,f);
- if(!input_encoding){
- set_iconv(TRUE, w_iconv16);
- }
- if (iconv == w_iconv16) {
- input_endian = ENDIAN_BIG;
- return;
- }
- (*i_ungetc)(0xFF,f);
- }else (*i_ungetc)(c2,f);
- (*i_ungetc)(0xFE,f);
- break;
- case 0xFF:
- if((c2 = (*i_getc)(f)) == 0xFE){
- if((c2 = (*i_getc)(f)) == 0x00){
- if((c2 = (*i_getc)(f)) == 0x00){
- if(!input_encoding){
- set_iconv(TRUE, w_iconv32);
- }
- if (iconv == w_iconv32) {
- input_endian = ENDIAN_LITTLE;
- return;
- }
- (*i_ungetc)(0x00,f);
- }else (*i_ungetc)(c2,f);
- (*i_ungetc)(0x00,f);
- }else (*i_ungetc)(c2,f);
- if(!input_encoding){
- set_iconv(TRUE, w_iconv16);
- }
- if (iconv == w_iconv16) {
- input_endian = ENDIAN_LITTLE;
- return;
- }
- (*i_ungetc)(0xFE,f);
- }else (*i_ungetc)(c2,f);
- (*i_ungetc)(0xFF,f);
- break;
- default:
- (*i_ungetc)(c2,f);
- break;
- }
-}
-static nkf_char
-broken_getc(FILE *f)
+static nkf_char broken_buf[3];
+static int broken_counter = 0;
+static int broken_last = 0;
+nkf_char broken_getc(FILE *f)
{
- nkf_char c, c1;
+ nkf_char c,c1;
- if (!nkf_buf_empty_p(nkf_state->broken_buf)) {
- return nkf_buf_pop(nkf_state->broken_buf);
+ if (broken_counter>0) {
+ return broken_buf[--broken_counter];
}
- c = (*i_bgetc)(f);
- if (c=='$' && nkf_state->broken_state != ESC
- && (input_mode == ASCII || input_mode == JIS_X_0201_1976_K)) {
+ c= (*i_bgetc)(f);
+ if (c=='$' && broken_last != ESC
+ && (input_mode==ASCII || input_mode==X0201)) {
c1= (*i_bgetc)(f);
- nkf_state->broken_state = 0;
+ broken_last = 0;
if (c1=='@'|| c1=='B') {
- nkf_buf_push(nkf_state->broken_buf, c1);
- nkf_buf_push(nkf_state->broken_buf, c);
+ broken_buf[0]=c1; broken_buf[1]=c;
+ broken_counter=2;
return ESC;
} else {
(*i_bungetc)(c1,f);
return c;
}
- } else if (c=='(' && nkf_state->broken_state != ESC
- && (input_mode == JIS_X_0208 || input_mode == JIS_X_0201_1976_K)) {
+ } else if (c=='(' && broken_last != ESC
+ && (input_mode==X0208 || input_mode==X0201)) { /* ) */
c1= (*i_bgetc)(f);
- nkf_state->broken_state = 0;
+ broken_last = 0;
if (c1=='J'|| c1=='B') {
- nkf_buf_push(nkf_state->broken_buf, c1);
- nkf_buf_push(nkf_state->broken_buf, c);
+ broken_buf[0]=c1; broken_buf[1]=c;
+ broken_counter=2;
return ESC;
} else {
(*i_bungetc)(c1,f);
return c;
}
} else {
- nkf_state->broken_state = c;
+ broken_last = c;
return c;
}
}
-static nkf_char
-broken_ungetc(nkf_char c, FILE *f)
+nkf_char broken_ungetc(nkf_char c, FILE *f)
{
- if (nkf_buf_length(nkf_state->broken_buf) < 2)
- nkf_buf_push(nkf_state->broken_buf, c);
+ if (broken_counter<2)
+ broken_buf[broken_counter++]=c;
return c;
}
-static void
-eol_conv(nkf_char c2, nkf_char c1)
+static nkf_char prev_cr = 0;
+
+void cr_conv(nkf_char c2, nkf_char c1)
{
- if (guess_f && input_eol != EOF) {
- if (c2 == 0 && c1 == LF) {
- if (!input_eol) input_eol = prev_cr ? CRLF : LF;
- else if (input_eol != (prev_cr ? CRLF : LF)) input_eol = EOF;
- } else if (c2 == 0 && c1 == CR && input_eol == LF) input_eol = EOF;
- else if (!prev_cr);
- else if (!input_eol) input_eol = CR;
- else if (input_eol != CR) input_eol = EOF;
- }
- if (prev_cr || (c2 == 0 && c1 == LF)) {
+ if (prev_cr) {
prev_cr = 0;
- if (eolmode_f != LF) (*o_eol_conv)(0, CR);
- if (eolmode_f != CR) (*o_eol_conv)(0, LF);
+ if (! (c2==0&&c1==NL) ) {
+ cr_conv(0,'\n');
+ }
+ }
+ if (c2) {
+ (*o_crconv)(c2,c1);
+ } else if (c1=='\r') {
+ prev_cr = c1;
+ } else if (c1=='\n') {
+ if (crmode_f==CRLF) {
+ (*o_crconv)(0,'\r');
+ } else if (crmode_f==CR) {
+ (*o_crconv)(0,'\r');
+ return;
+ }
+ (*o_crconv)(0,NL);
+ } else if (c1!='\032' || crmode_f!=NL){
+ (*o_crconv)(c2,c1);
}
- if (c2 == 0 && c1 == CR) prev_cr = CR;
- else if (c2 != 0 || c1 != LF) (*o_eol_conv)(c2, c1);
}
-/*
- Return value of fold_conv()
+/*
+ Return value of fold_conv()
- LF add newline and output char
- CR add newline and output nothing
- SP space
- 0 skip
- 1 (or else) normal output
+ \n add newline and output char
+ \r add newline and output nothing
+ ' ' space
+ 0 skip
+ 1 (or else) normal output
- fold state in prev (previous character)
+ fold state in prev (previous character)
- >0x80 Japanese (X0208/X0201)
- <0x80 ASCII
- LF new line
- SP space
+ >0x80 Japanese (X0208/X0201)
+ <0x80 ASCII
+ \n new line
+ ' ' space
- This fold algorthm does not preserve heading space in a line.
- This is the main difference from fmt.
- */
+ This fold algorthm does not preserve heading space in a line.
+ This is the main difference from fmt.
+*/
#define char_size(c2,c1) (c2?2:1)
-static void
-fold_conv(nkf_char c2, nkf_char c1)
-{
+void fold_conv(nkf_char c2, nkf_char c1)
+{
nkf_char prev0;
nkf_char fold_state;
- if (c1== CR && !fold_preserve_f) {
- fold_state=0; /* ignore cr */
- }else if (c1== LF&&f_prev==CR && fold_preserve_f) {
- f_prev = LF;
- fold_state=0; /* ignore cr */
+ if (c1== '\r' && !fold_preserve_f) {
+ fold_state=0; /* ignore cr */
+ }else if (c1== '\n'&&f_prev=='\r' && fold_preserve_f) {
+ f_prev = '\n';
+ fold_state=0; /* ignore cr */
} else if (c1== BS) {
- if (f_line>0) f_line--;
- fold_state = 1;
+ if (f_line>0) f_line--;
+ fold_state = 1;
} else if (c2==EOF && f_line != 0) { /* close open last line */
- fold_state = LF;
- } else if ((c1==LF && !fold_preserve_f)
- || ((c1==CR||(c1==LF&&f_prev!=CR))
- && fold_preserve_f)) {
- /* new line */
- if (fold_preserve_f) {
- f_prev = c1;
- f_line = 0;
- fold_state = CR;
+ fold_state = '\n';
+ } else if ((c1=='\n' && !fold_preserve_f)
+ || ((c1=='\r'||(c1=='\n'&&f_prev!='\r'))
+ && fold_preserve_f)) {
+ /* new line */
+ if (fold_preserve_f) {
+ f_prev = c1;
+ f_line = 0;
+ fold_state = '\r';
} else if ((f_prev == c1 && !fold_preserve_f)
- || (f_prev == LF && fold_preserve_f)
- ) { /* duplicate newline */
- if (f_line) {
- f_line = 0;
- fold_state = LF; /* output two newline */
- } else {
- f_line = 0;
- fold_state = 1;
- }
- } else {
- if (f_prev&0x80) { /* Japanese? */
- f_prev = c1;
- fold_state = 0; /* ignore given single newline */
- } else if (f_prev==SP) {
- fold_state = 0;
- } else {
- f_prev = c1;
- if (++f_line<=fold_len)
- fold_state = SP;
- else {
- f_line = 0;
- fold_state = CR; /* fold and output nothing */
- }
- }
- }
+ || (f_prev == '\n' && fold_preserve_f)
+ ) { /* duplicate newline */
+ if (f_line) {
+ f_line = 0;
+ fold_state = '\n'; /* output two newline */
+ } else {
+ f_line = 0;
+ fold_state = 1;
+ }
+ } else {
+ if (f_prev&0x80) { /* Japanese? */
+ f_prev = c1;
+ fold_state = 0; /* ignore given single newline */
+ } else if (f_prev==' ') {
+ fold_state = 0;
+ } else {
+ f_prev = c1;
+ if (++f_line<=fold_len)
+ fold_state = ' ';
+ else {
+ f_line = 0;
+ fold_state = '\r'; /* fold and output nothing */
+ }
+ }
+ }
} else if (c1=='\f') {
- f_prev = LF;
- f_line = 0;
- fold_state = LF; /* output newline and clear */
- } else if ((c2==0 && nkf_isblank(c1)) || (c2 == '!' && c1 == '!')) {
- /* X0208 kankaku or ascii space */
- if (f_prev == SP) {
- fold_state = 0; /* remove duplicate spaces */
- } else {
- f_prev = SP;
- if (++f_line<=fold_len)
- fold_state = SP; /* output ASCII space only */
- else {
- f_prev = SP; f_line = 0;
- fold_state = CR; /* fold and output nothing */
- }
- }
+ f_prev = '\n';
+ f_line = 0;
+ fold_state = '\n'; /* output newline and clear */
+ } else if ( (c2==0 && c1==' ')||
+ (c2==0 && c1=='\t')||
+ (c2=='!'&& c1=='!')) {
+ /* X0208 kankaku or ascii space */
+ if (f_prev == ' ') {
+ fold_state = 0; /* remove duplicate spaces */
+ } else {
+ f_prev = ' ';
+ if (++f_line<=fold_len)
+ fold_state = ' '; /* output ASCII space only */
+ else {
+ f_prev = ' '; f_line = 0;
+ fold_state = '\r'; /* fold and output nothing */
+ }
+ }
} else {
- prev0 = f_prev; /* we still need this one... , but almost done */
- f_prev = c1;
- if (c2 || c2 == JIS_X_0201_1976_K)
- f_prev |= 0x80; /* this is Japanese */
- f_line += char_size(c2,c1);
- if (f_line<=fold_len) { /* normal case */
- fold_state = 1;
- } else {
- if (f_line>fold_len+fold_margin) { /* too many kinsoku suspension */
- f_line = char_size(c2,c1);
- fold_state = LF; /* We can't wait, do fold now */
- } else if (c2 == JIS_X_0201_1976_K) {
- /* simple kinsoku rules return 1 means no folding */
- if (c1==(0xde&0x7f)) fold_state = 1; /* $B!+(B*/
- else if (c1==(0xdf&0x7f)) fold_state = 1; /* $B!,(B*/
- else if (c1==(0xa4&0x7f)) fold_state = 1; /* $B!#(B*/
- else if (c1==(0xa3&0x7f)) fold_state = 1; /* $B!$(B*/
- else if (c1==(0xa1&0x7f)) fold_state = 1; /* $B!W(B*/
- else if (c1==(0xb0&0x7f)) fold_state = 1; /* - */
- else if (SP<=c1 && c1<=(0xdf&0x7f)) { /* X0201 */
+ prev0 = f_prev; /* we still need this one... , but almost done */
+ f_prev = c1;
+ if (c2 || c2==X0201)
+ f_prev |= 0x80; /* this is Japanese */
+ f_line += char_size(c2,c1);
+ if (f_line<=fold_len) { /* normal case */
+ fold_state = 1;
+ } else {
+ if (f_line>fold_len+fold_margin) { /* too many kinsoku suspension */
+ f_line = char_size(c2,c1);
+ fold_state = '\n'; /* We can't wait, do fold now */
+ } else if (c2==X0201) {
+ /* simple kinsoku rules return 1 means no folding */
+ if (c1==(0xde&0x7f)) fold_state = 1; /* $B!+(B*/
+ else if (c1==(0xdf&0x7f)) fold_state = 1; /* $B!,(B*/
+ else if (c1==(0xa4&0x7f)) fold_state = 1; /* $B!#(B*/
+ else if (c1==(0xa3&0x7f)) fold_state = 1; /* $B!$(B*/
+ else if (c1==(0xa1&0x7f)) fold_state = 1; /* $B!W(B*/
+ else if (c1==(0xb0&0x7f)) fold_state = 1; /* - */
+ else if (SPACE<=c1 && c1<=(0xdf&0x7f)) { /* X0201 */
f_line = 1;
- fold_state = LF;/* add one new f_line before this character */
+ fold_state = '\n';/* add one new f_line before this character */
} else {
f_line = 1;
- fold_state = LF;/* add one new f_line before this character */
+ fold_state = '\n';/* add one new f_line before this character */
}
- } else if (c2==0) {
- /* kinsoku point in ASCII */
+ } else if (c2==0) {
+ /* kinsoku point in ASCII */
if ( c1==')'|| /* { [ ( */
- c1==']'||
- c1=='}'||
- c1=='.'||
- c1==','||
- c1=='!'||
- c1=='?'||
- c1=='/'||
- c1==':'||
- c1==';') {
+ c1==']'||
+ c1=='}'||
+ c1=='.'||
+ c1==','||
+ c1=='!'||
+ c1=='?'||
+ c1=='/'||
+ c1==':'||
+ c1==';' ) {
fold_state = 1;
- /* just after special */
+ /* just after special */
} else if (!is_alnum(prev0)) {
f_line = char_size(c2,c1);
- fold_state = LF;
- } else if ((prev0==SP) || /* ignored new f_line */
- (prev0==LF)|| /* ignored new f_line */
- (prev0&0x80)) { /* X0208 - ASCII */
+ fold_state = '\n';
+ } else if ((prev0==' ') || /* ignored new f_line */
+ (prev0=='\n')|| /* ignored new f_line */
+ (prev0&0x80)) { /* X0208 - ASCII */
f_line = char_size(c2,c1);
- fold_state = LF;/* add one new f_line before this character */
- } else {
- fold_state = 1; /* default no fold in ASCII */
- }
- } else {
- if (c2=='!') {
- if (c1=='"') fold_state = 1; /* $B!"(B */
- else if (c1=='#') fold_state = 1; /* $B!#(B */
- else if (c1=='W') fold_state = 1; /* $B!W(B */
- else if (c1=='K') fold_state = 1; /* $B!K(B */
- else if (c1=='$') fold_state = 1; /* $B!$(B */
- else if (c1=='%') fold_state = 1; /* $B!%(B */
- else if (c1=='\'') fold_state = 1; /* $B!\(B */
- else if (c1=='(') fold_state = 1; /* $B!((B */
- else if (c1==')') fold_state = 1; /* $B!)(B */
- else if (c1=='*') fold_state = 1; /* $B!*(B */
- else if (c1=='+') fold_state = 1; /* $B!+(B */
- else if (c1==',') fold_state = 1; /* $B!,(B */
- /* default no fold in kinsoku */
- else {
- fold_state = LF;
+ fold_state = '\n';/* add one new f_line before this character */
+ } else {
+ fold_state = 1; /* default no fold in ASCII */
+ }
+ } else {
+ if (c2=='!') {
+ if (c1=='"') fold_state = 1; /* $B!"(B */
+ else if (c1=='#') fold_state = 1; /* $B!#(B */
+ else if (c1=='W') fold_state = 1; /* $B!W(B */
+ else if (c1=='K') fold_state = 1; /* $B!K(B */
+ else if (c1=='$') fold_state = 1; /* $B!$(B */
+ else if (c1=='%') fold_state = 1; /* $B!%(B */
+ else if (c1=='\'') fold_state = 1; /* $B!\(B */
+ else if (c1=='(') fold_state = 1; /* $B!((B */
+ else if (c1==')') fold_state = 1; /* $B!)(B */
+ else if (c1=='*') fold_state = 1; /* $B!*(B */
+ else if (c1=='+') fold_state = 1; /* $B!+(B */
+ else if (c1==',') fold_state = 1; /* $B!,(B */
+ /* default no fold in kinsoku */
+ else {
+ fold_state = '\n';
f_line = char_size(c2,c1);
/* add one new f_line before this character */
}
- } else {
+ } else {
f_line = char_size(c2,c1);
- fold_state = LF;
- /* add one new f_line before this character */
- }
- }
- }
+ fold_state = '\n';
+ /* add one new f_line before this character */
+ }
+ }
+ }
}
/* terminator process */
switch(fold_state) {
- case LF:
- OCONV_NEWLINE((*o_fconv));
- (*o_fconv)(c2,c1);
- break;
- case 0:
- return;
- case CR:
- OCONV_NEWLINE((*o_fconv));
- break;
- case TAB:
- case SP:
- (*o_fconv)(0,SP);
- break;
- default:
- (*o_fconv)(c2,c1);
+ case '\n':
+ (*o_fconv)(0,'\n');
+ (*o_fconv)(c2,c1);
+ break;
+ case 0:
+ return;
+ case '\r':
+ (*o_fconv)(0,'\n');
+ break;
+ case '\t':
+ case ' ':
+ (*o_fconv)(0,' ');
+ break;
+ default:
+ (*o_fconv)(c2,c1);
}
}
-static nkf_char z_prev2=0,z_prev1=0;
+nkf_char z_prev2=0,z_prev1=0;
-static void
-z_conv(nkf_char c2, nkf_char c1)
+void z_conv(nkf_char c2, nkf_char c1)
{
/* if (c2) c1 &= 0x7f; assertion */
- if (c2 == JIS_X_0201_1976_K && (c1 == 0x20 || c1 == 0x7D || c1 == 0x7E)) {
- (*o_zconv)(c2,c1);
- return;
- }
-
- if (x0201_f) {
- if (z_prev2 == JIS_X_0201_1976_K) {
- if (c2 == JIS_X_0201_1976_K) {
- if (c1 == (0xde&0x7f)) { /* $BByE@(B */
- z_prev2 = 0;
- (*o_zconv)(dv[(z_prev1-SP)*2], dv[(z_prev1-SP)*2+1]);
- return;
- } else if (c1 == (0xdf&0x7f) && ev[(z_prev1-SP)*2]) { /* $BH>ByE@(B */
- z_prev2 = 0;
- (*o_zconv)(ev[(z_prev1-SP)*2], ev[(z_prev1-SP)*2+1]);
- return;
- }
- }
- z_prev2 = 0;
- (*o_zconv)(cv[(z_prev1-SP)*2], cv[(z_prev1-SP)*2+1]);
- }
- if (c2 == JIS_X_0201_1976_K) {
- if (dv[(c1-SP)*2] || ev[(c1-SP)*2]) {
- /* wait for $BByE@(B or $BH>ByE@(B */
- z_prev1 = c1;
- z_prev2 = c2;
- return;
- } else {
- (*o_zconv)(cv[(c1-SP)*2], cv[(c1-SP)*2+1]);
- return;
- }
- }
- }
-
- if (c2 == EOF) {
- (*o_zconv)(c2, c1);
- return;
- }
-
- if (alpha_f&1 && c2 == 0x23) {
- /* JISX0208 Alphabet */
- c2 = 0;
- } else if (c2 == 0x21) {
- /* JISX0208 Kigou */
- if (0x21==c1) {
- if (alpha_f&2) {
- c2 = 0;
- c1 = SP;
- } else if (alpha_f&4) {
- (*o_zconv)(0, SP);
- (*o_zconv)(0, SP);
- return;
- }
- } else if (alpha_f&1 && 0x20<c1 && c1<0x7f && fv[c1-0x20]) {
- c2 = 0;
- c1 = fv[c1-0x20];
- }
- }
-
- if (alpha_f&8 && c2 == 0) {
- /* HTML Entity */
- const char *entity = 0;
- switch (c1){
- case '>': entity = "&gt;"; break;
- case '<': entity = "&lt;"; break;
- case '\"': entity = "&quot;"; break;
- case '&': entity = "&amp;"; break;
- }
- if (entity){
- while (*entity) (*o_zconv)(0, *entity++);
- return;
- }
- }
-
- if (alpha_f & 16) {
- /* JIS X 0208 Katakana to JIS X 0201 Katakana */
- if (c2 == 0x21) {
- nkf_char c = 0;
- switch (c1) {
- case 0x23:
- /* U+3002 (0x8142) Ideographic Full Stop -> U+FF61 (0xA1) Halfwidth Ideographic Full Stop */
- c = 0xA1;
- break;
- case 0x56:
- /* U+300C (0x8175) Left Corner Bracket -> U+FF62 (0xA2) Halfwidth Left Corner Bracket */
- c = 0xA2;
- break;
- case 0x57:
- /* U+300D (0x8176) Right Corner Bracket -> U+FF63 (0xA3) Halfwidth Right Corner Bracket */
- c = 0xA3;
- break;
- case 0x22:
- /* U+3001 (0x8141) Ideographic Comma -> U+FF64 (0xA4) Halfwidth Ideographic Comma */
- c = 0xA4;
- break;
- case 0x26:
- /* U+30FB (0x8145) Katakana Middle Dot -> U+FF65 (0xA5) Halfwidth Katakana Middle Dot */
- c = 0xA5;
- break;
- case 0x3C:
- /* U+30FC (0x815B) Katakana-Hiragana Prolonged Sound Mark -> U+FF70 (0xB0) Halfwidth Katakana-Hiragana Prolonged Sound Mark */
- c = 0xB0;
- break;
- case 0x2B:
- /* U+309B (0x814A) Katakana-Hiragana Voiced Sound Mark -> U+FF9E (0xDE) Halfwidth Katakana Voiced Sound Mark */
- c = 0xDE;
- break;
- case 0x2C:
- /* U+309C (0x814B) Katakana-Hiragana Semi-Voiced Sound Mark -> U+FF9F (0xDF) Halfwidth Katakana Semi-Voiced Sound Mark */
- c = 0xDF;
- break;
- }
- if (c) {
- (*o_zconv)(JIS_X_0201_1976_K, c);
- return;
- }
- } else if (c2 == 0x25) {
- /* JISX0208 Katakana */
- static const int fullwidth_to_halfwidth[] =
- {
- 0x0000, 0x2700, 0x3100, 0x2800, 0x3200, 0x2900, 0x3300, 0x2A00,
- 0x3400, 0x2B00, 0x3500, 0x3600, 0x365E, 0x3700, 0x375E, 0x3800,
- 0x385E, 0x3900, 0x395E, 0x3A00, 0x3A5E, 0x3B00, 0x3B5E, 0x3C00,
- 0x3C5E, 0x3D00, 0x3D5E, 0x3E00, 0x3E5E, 0x3F00, 0x3F5E, 0x4000,
- 0x405E, 0x4100, 0x415E, 0x2F00, 0x4200, 0x425E, 0x4300, 0x435E,
- 0x4400, 0x445E, 0x4500, 0x4600, 0x4700, 0x4800, 0x4900, 0x4A00,
- 0x4A5E, 0x4A5F, 0x4B00, 0x4B5E, 0x4B5F, 0x4C00, 0x4C5E, 0x4C5F,
- 0x4D00, 0x4D5E, 0x4D5F, 0x4E00, 0x4E5E, 0x4E5F, 0x4F00, 0x5000,
- 0x5100, 0x5200, 0x5300, 0x2C00, 0x5400, 0x2D00, 0x5500, 0x2E00,
- 0x5600, 0x5700, 0x5800, 0x5900, 0x5A00, 0x5B00, 0x0000, 0x5C00,
- 0x0000, 0x0000, 0x2600, 0x5D00, 0x335E, 0x0000, 0x0000, 0x0000,
- 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
- };
- if (fullwidth_to_halfwidth[c1-0x20]){
- c2 = fullwidth_to_halfwidth[c1-0x20];
- (*o_zconv)(JIS_X_0201_1976_K, c2>>8);
- if (c2 & 0xFF) {
- (*o_zconv)(JIS_X_0201_1976_K, c2&0xFF);
- }
- return;
- }
- }
+ if (x0201_f && z_prev2==X0201) { /* X0201 */
+ if (c1==(0xde&0x7f)) { /* $BByE@(B */
+ z_prev2=0;
+ (*o_zconv)(dv[(z_prev1-SPACE)*2],dv[(z_prev1-SPACE)*2+1]);
+ return;
+ } else if (c1==(0xdf&0x7f)&&ev[(z_prev1-SPACE)*2]) { /* $BH>ByE@(B */
+ z_prev2=0;
+ (*o_zconv)(ev[(z_prev1-SPACE)*2],ev[(z_prev1-SPACE)*2+1]);
+ return;
+ } else {
+ z_prev2=0;
+ (*o_zconv)(cv[(z_prev1-SPACE)*2],cv[(z_prev1-SPACE)*2+1]);
+ }
+ }
+
+ if (c2==EOF) {
+ (*o_zconv)(c2,c1);
+ return;
+ }
+
+ if (x0201_f && c2==X0201) {
+ if (dv[(c1-SPACE)*2]||ev[(c1-SPACE)*2]) {
+ /* wait for $BByE@(B or $BH>ByE@(B */
+ z_prev1 = c1; z_prev2 = c2;
+ return;
+ } else {
+ (*o_zconv)(cv[(c1-SPACE)*2],cv[(c1-SPACE)*2+1]);
+ return;
+ }
+ }
+
+ /* JISX0208 Alphabet */
+ if (alpha_f && c2 == 0x23 ) {
+ c2 = 0;
+ } else if (alpha_f && c2 == 0x21 ) {
+ /* JISX0208 Kigou */
+ if (0x21==c1) {
+ if (alpha_f&0x2) {
+ c1 = ' ';
+ c2 = 0;
+ } else if (alpha_f&0x4) {
+ (*o_zconv)(0,' ');
+ (*o_zconv)(0,' ');
+ return;
+ }
+ } else if (0x20<c1 && c1<0x7f && fv[c1-0x20]) {
+ c1 = fv[c1-0x20];
+ c2 = 0;
+ if (alpha_f&0x8) {
+ char *entity = 0;
+ switch (c1){
+ case '>': entity = "&gt;"; break;
+ case '<': entity = "&lt;"; break;
+ case '\"': entity = "&quot;"; break;
+ case '&': entity = "&amp;"; break;
+ }
+ if (entity){
+ while (*entity) (*o_zconv)(0, *entity++);
+ return;
+ }
+ }
+ }
}
(*o_zconv)(c2,c1);
}
#define rot13(c) ( \
- ( c < 'A') ? c: \
- (c <= 'M') ? (c + 13): \
- (c <= 'Z') ? (c - 13): \
- (c < 'a') ? (c): \
- (c <= 'm') ? (c + 13): \
- (c <= 'z') ? (c - 13): \
- (c) \
- )
+ ( c < 'A' ) ? c: \
+ (c <= 'M') ? (c + 13): \
+ (c <= 'Z') ? (c - 13): \
+ (c < 'a') ? (c): \
+ (c <= 'm') ? (c + 13): \
+ (c <= 'z') ? (c - 13): \
+ (c) \
+)
#define rot47(c) ( \
- ( c < '!') ? c: \
- ( c <= 'O') ? (c + 47) : \
- ( c <= '~') ? (c - 47) : \
- c \
- )
-
-static void
-rot_conv(nkf_char c2, nkf_char c1)
+ ( c < '!' ) ? c: \
+ ( c <= 'O' ) ? (c + 47) : \
+ ( c <= '~' ) ? (c - 47) : \
+ c \
+)
+
+void rot_conv(nkf_char c2, nkf_char c1)
{
- if (c2 == 0 || c2 == JIS_X_0201_1976_K || c2 == ISO_8859_1) {
+ if (c2==0 || c2==X0201 || c2==ISO8859_1) {
c1 = rot13(c1);
} else if (c2) {
c1 = rot47(c1);
@@ -3712,64 +4634,61 @@ rot_conv(nkf_char c2, nkf_char c1)
(*o_rot_conv)(c2,c1);
}
-static void
-hira_conv(nkf_char c2, nkf_char c1)
+void hira_conv(nkf_char c2, nkf_char c1)
{
if (hira_f & 1) {
- if (c2 == 0x25) {
- if (0x20 < c1 && c1 < 0x74) {
- c2 = 0x24;
- (*o_hira_conv)(c2,c1);
- return;
- } else if (c1 == 0x74 && nkf_enc_unicode_p(output_encoding)) {
- c2 = 0;
- c1 = nkf_char_unicode_new(0x3094);
- (*o_hira_conv)(c2,c1);
- return;
- }
- } else if (c2 == 0x21 && (c1 == 0x33 || c1 == 0x34)) {
- c1 += 2;
- (*o_hira_conv)(c2,c1);
- return;
- }
+ if (c2 == 0x25) {
+ if (0x20 < c1 && c1 < 0x74) {
+ c2 = 0x24;
+ (*o_hira_conv)(c2,c1);
+ return;
+ } else if (c1 == 0x74 && (output_conv == w_oconv || output_conv == w_oconv16)) {
+ c2 = 0;
+ c1 = CLASS_UNICODE | 0x3094;
+ (*o_hira_conv)(c2,c1);
+ return;
+ }
+ } else if (c2 == 0x21 && (c1 == 0x33 || c1 == 0x34)) {
+ c1 += 2;
+ (*o_hira_conv)(c2,c1);
+ return;
+ }
}
if (hira_f & 2) {
- if (c2 == 0 && c1 == nkf_char_unicode_new(0x3094)) {
- c2 = 0x25;
- c1 = 0x74;
- } else if (c2 == 0x24 && 0x20 < c1 && c1 < 0x74) {
- c2 = 0x25;
- } else if (c2 == 0x21 && (c1 == 0x35 || c1 == 0x36)) {
- c1 -= 2;
- }
+ if (c2 == 0 && c1 == (CLASS_UNICODE | 0x3094)) {
+ c2 = 0x25;
+ c1 = 0x74;
+ } else if (c2 == 0x24 && 0x20 < c1 && c1 < 0x74) {
+ c2 = 0x25;
+ } else if (c2 == 0x21 && (c1 == 0x35 || c1 == 0x36)) {
+ c1 -= 2;
+ }
}
(*o_hira_conv)(c2,c1);
}
-static void
-iso2022jp_check_conv(nkf_char c2, nkf_char c1)
+void iso2022jp_check_conv(nkf_char c2, nkf_char c1)
{
-#define RANGE_NUM_MAX 18
static const nkf_char range[RANGE_NUM_MAX][2] = {
- {0x222f, 0x2239,},
- {0x2242, 0x2249,},
- {0x2251, 0x225b,},
- {0x226b, 0x2271,},
- {0x227a, 0x227d,},
- {0x2321, 0x232f,},
- {0x233a, 0x2340,},
- {0x235b, 0x2360,},
- {0x237b, 0x237e,},
- {0x2474, 0x247e,},
- {0x2577, 0x257e,},
- {0x2639, 0x2640,},
- {0x2659, 0x267e,},
- {0x2742, 0x2750,},
- {0x2772, 0x277e,},
- {0x2841, 0x287e,},
- {0x4f54, 0x4f7e,},
- {0x7425, 0x747e},
+ {0x222f, 0x2239,},
+ {0x2242, 0x2249,},
+ {0x2251, 0x225b,},
+ {0x226b, 0x2271,},
+ {0x227a, 0x227d,},
+ {0x2321, 0x232f,},
+ {0x233a, 0x2340,},
+ {0x235b, 0x2360,},
+ {0x237b, 0x237e,},
+ {0x2474, 0x247e,},
+ {0x2577, 0x257e,},
+ {0x2639, 0x2640,},
+ {0x2659, 0x267e,},
+ {0x2742, 0x2750,},
+ {0x2772, 0x277e,},
+ {0x2841, 0x287e,},
+ {0x4f54, 0x4f7e,},
+ {0x7425, 0x747e},
};
nkf_char i;
nkf_char start, end, c;
@@ -3798,7 +4717,7 @@ iso2022jp_check_conv(nkf_char c2, nkf_char c1)
/* This converts =?ISO-2022-JP?B?HOGE HOGE?= */
-static const unsigned char *mime_pattern[] = {
+const unsigned char *mime_pattern[] = {
(const unsigned char *)"\075?EUC-JP?B?",
(const unsigned char *)"\075?SHIFT_JIS?B?",
(const unsigned char *)"\075?ISO-8859-1?Q?",
@@ -3823,16 +4742,16 @@ nkf_char (*mime_priority_func[])(nkf_char c2, nkf_char c1, nkf_char c0) = {
0,
};
-static const nkf_char mime_encode[] = {
- EUC_JP, SHIFT_JIS, ISO_8859_1, ISO_8859_1, JIS_X_0208, JIS_X_0201_1976_K,
+const nkf_char mime_encode[] = {
+ JAPANESE_EUC, SHIFT_JIS,ISO8859_1, ISO8859_1, X0208, X0201,
#if defined(UTF8_INPUT_ENABLE)
- UTF_8, UTF_8,
+ UTF8, UTF8,
#endif
ASCII,
0
};
-static const nkf_char mime_encode_method[] = {
+const nkf_char mime_encode_method[] = {
'B', 'B','Q', 'B', 'B', 'Q',
#if defined(UTF8_INPUT_ENABLE)
'B', 'Q',
@@ -3842,55 +4761,9 @@ static const nkf_char mime_encode_method[] = {
};
-/* MIME preprocessor fifo */
-
-#define MIME_BUF_SIZE (1024) /* 2^n ring buffer */
-#define MIME_BUF_MASK (MIME_BUF_SIZE-1)
-#define mime_input_buf(n) mime_input_state.buf[(n)&MIME_BUF_MASK]
-static struct {
- unsigned char buf[MIME_BUF_SIZE];
- unsigned int top;
- unsigned int last; /* decoded */
- unsigned int input; /* undecoded */
-} mime_input_state;
-static nkf_char (*mime_iconv_back)(nkf_char c2,nkf_char c1,nkf_char c0) = NULL;
-
#define MAXRECOVER 20
-static void
-mime_input_buf_unshift(nkf_char c)
-{
- mime_input_buf(--mime_input_state.top) = (unsigned char)c;
-}
-
-static nkf_char
-mime_ungetc(nkf_char c, FILE *f)
-{
- mime_input_buf_unshift(c);
- return c;
-}
-
-static nkf_char
-mime_ungetc_buf(nkf_char c, FILE *f)
-{
- if (mimebuf_f)
- (*i_mungetc_buf)(c,f);
- else
- mime_input_buf(--mime_input_state.input) = (unsigned char)c;
- return c;
-}
-
-static nkf_char
-mime_getc_buf(FILE *f)
-{
- /* we don't keep eof of mime_input_buf, becase it contains ?= as
- a terminator. It was checked in mime_integrity. */
- return ((mimebuf_f)?
- (*i_mgetc_buf)(f):mime_input_buf(mime_input_state.input++));
-}
-
-static void
-switch_mime_getc(void)
+void switch_mime_getc(void)
{
if (i_getc!=mime_getc) {
i_mgetc = i_getc; i_getc = mime_getc;
@@ -3902,8 +4775,7 @@ switch_mime_getc(void)
}
}
-static void
-unswitch_mime_getc(void)
+void unswitch_mime_getc(void)
{
if(mime_f==STRICT_MIME) {
i_mgetc = i_mgetc_buf;
@@ -3915,47 +4787,7 @@ unswitch_mime_getc(void)
mime_iconv_back = NULL;
}
-static nkf_char
-mime_integrity(FILE *f, const unsigned char *p)
-{
- nkf_char c,d;
- unsigned int q;
- /* In buffered mode, read until =? or NL or buffer full
- */
- mime_input_state.input = mime_input_state.top;
- mime_input_state.last = mime_input_state.top;
-
- while(*p) mime_input_buf(mime_input_state.input++) = *p++;
- d = 0;
- q = mime_input_state.input;
- while((c=(*i_getc)(f))!=EOF) {
- if (((mime_input_state.input-mime_input_state.top)&MIME_BUF_MASK)==0) {
- break; /* buffer full */
- }
- if (c=='=' && d=='?') {
- /* checked. skip header, start decode */
- mime_input_buf(mime_input_state.input++) = (unsigned char)c;
- /* mime_last_input = mime_input_state.input; */
- mime_input_state.input = q;
- switch_mime_getc();
- return 1;
- }
- if (!( (c=='+'||c=='/'|| c=='=' || c=='?' || is_alnum(c))))
- break;
- /* Should we check length mod 4? */
- mime_input_buf(mime_input_state.input++) = (unsigned char)c;
- d=c;
- }
- /* In case of Incomplete MIME, no MIME decode */
- mime_input_buf(mime_input_state.input++) = (unsigned char)c;
- mime_input_state.last = mime_input_state.input; /* point undecoded buffer */
- mime_decode_mode = 1; /* no decode on mime_input_buf last in mime_getc */
- switch_mime_getc(); /* anyway we need buffered getc */
- return 1;
-}
-
-static nkf_char
-mime_begin_strict(FILE *f)
+nkf_char mime_begin_strict(FILE *f)
{
nkf_char c1 = 0;
int i,j,k;
@@ -3968,25 +4800,25 @@ mime_begin_strict(FILE *f)
p = mime_pattern[j];
r[0]='='; r[1]='?';
- for(i=2;p[i]>SP;i++) { /* start at =? */
- if (((r[i] = c1 = (*i_getc)(f))==EOF) || nkf_toupper(c1) != p[i]) {
- /* pattern fails, try next one */
- q = p;
- while (mime_pattern[++j]) {
+ for(i=2;p[i]>' ';i++) { /* start at =? */
+ if ( ((r[i] = c1 = (*i_getc)(f))==EOF) || nkf_toupper(c1) != p[i] ) {
+ /* pattern fails, try next one */
+ q = p;
+ while (mime_pattern[++j]) {
p = mime_pattern[j];
- for(k=2;k<i;k++) /* assume length(p) > i */
- if (p[k]!=q[k]) break;
- if (k==i && nkf_toupper(c1)==p[k]) break;
- }
+ for(k=2;k<i;k++) /* assume length(p) > i */
+ if (p[k]!=q[k]) break;
+ if (k==i && nkf_toupper(c1)==p[k]) break;
+ }
p = mime_pattern[j];
- if (p) continue; /* found next one, continue */
- /* all fails, output from recovery buffer */
- (*i_ungetc)(c1,f);
- for(j=0;j<i;j++) {
- (*oconv)(0,r[j]);
- }
- return c1;
- }
+ if (p) continue; /* found next one, continue */
+ /* all fails, output from recovery buffer */
+ (*i_ungetc)(c1,f);
+ for(j=0;j<i;j++) {
+ (*oconv)(0,r[j]);
+ }
+ return c1;
+ }
}
mime_decode_mode = p[i-2];
@@ -3995,19 +4827,35 @@ mime_begin_strict(FILE *f)
clr_code_score(find_inputcode_byfunc(mime_priority_func[j]), SCORE_iMIME);
if (mime_decode_mode=='B') {
- mimebuf_f = unbuf_f;
- if (!unbuf_f) {
- /* do MIME integrity check */
- return mime_integrity(f,mime_pattern[j]);
- }
+ mimebuf_f = unbuf_f;
+ if (!unbuf_f) {
+ /* do MIME integrity check */
+ return mime_integrity(f,mime_pattern[j]);
+ }
}
switch_mime_getc();
mimebuf_f = TRUE;
return c1;
}
-static nkf_char
-mime_begin(FILE *f)
+nkf_char mime_getc_buf(FILE *f)
+{
+ /* we don't keep eof of Fifo, becase it contains ?= as
+ a terminator. It was checked in mime_integrity. */
+ return ((mimebuf_f)?
+ (*i_mgetc_buf)(f):Fifo(mime_input++));
+}
+
+nkf_char mime_ungetc_buf(nkf_char c, FILE *f)
+{
+ if (mimebuf_f)
+ (*i_mungetc_buf)(c,f);
+ else
+ Fifo(--mime_input) = (unsigned char)c;
+ return c;
+}
+
+nkf_char mime_begin(FILE *f)
{
nkf_char c1;
int i,k;
@@ -4016,236 +4864,195 @@ mime_begin(FILE *f)
/* re-read and convert again from mime_buffer. */
/* =? has been checked */
- k = mime_input_state.last;
- mime_input_buf(mime_input_state.last++)='='; mime_input_buf(mime_input_state.last++)='?';
+ k = mime_last;
+ Fifo(mime_last++)='='; Fifo(mime_last++)='?';
for(i=2;i<MAXRECOVER;i++) { /* start at =? */
- /* We accept any character type even if it is breaked by new lines */
- c1 = (*i_getc)(f); mime_input_buf(mime_input_state.last++) = (unsigned char)c1;
- if (c1==LF||c1==SP||c1==CR||
- c1=='-'||c1=='_'||is_alnum(c1)) continue;
- if (c1=='=') {
- /* Failed. But this could be another MIME preemble */
- (*i_ungetc)(c1,f);
- mime_input_state.last--;
- break;
- }
- if (c1!='?') break;
- else {
- /* c1=='?' */
- c1 = (*i_getc)(f); mime_input_buf(mime_input_state.last++) = (unsigned char)c1;
- if (!(++i<MAXRECOVER) || c1==EOF) break;
- if (c1=='b'||c1=='B') {
- mime_decode_mode = 'B';
- } else if (c1=='q'||c1=='Q') {
- mime_decode_mode = 'Q';
- } else {
- break;
- }
- c1 = (*i_getc)(f); mime_input_buf(mime_input_state.last++) = (unsigned char)c1;
- if (!(++i<MAXRECOVER) || c1==EOF) break;
- if (c1!='?') {
- mime_decode_mode = FALSE;
- }
- break;
- }
+ /* We accept any character type even if it is breaked by new lines */
+ c1 = (*i_getc)(f); Fifo(mime_last++) = (unsigned char)c1;
+ if (c1=='\n'||c1==' '||c1=='\r'||
+ c1=='-'||c1=='_'||is_alnum(c1) ) continue;
+ if (c1=='=') {
+ /* Failed. But this could be another MIME preemble */
+ (*i_ungetc)(c1,f);
+ mime_last--;
+ break;
+ }
+ if (c1!='?') break;
+ else {
+ /* c1=='?' */
+ c1 = (*i_getc)(f); Fifo(mime_last++) = (unsigned char)c1;
+ if (!(++i<MAXRECOVER) || c1==EOF) break;
+ if (c1=='b'||c1=='B') {
+ mime_decode_mode = 'B';
+ } else if (c1=='q'||c1=='Q') {
+ mime_decode_mode = 'Q';
+ } else {
+ break;
+ }
+ c1 = (*i_getc)(f); Fifo(mime_last++) = (unsigned char)c1;
+ if (!(++i<MAXRECOVER) || c1==EOF) break;
+ if (c1!='?') {
+ mime_decode_mode = FALSE;
+ }
+ break;
+ }
}
switch_mime_getc();
if (!mime_decode_mode) {
- /* false MIME premble, restart from mime_buffer */
- mime_decode_mode = 1; /* no decode, but read from the mime_buffer */
- /* Since we are in MIME mode until buffer becomes empty, */
- /* we never go into mime_begin again for a while. */
- return c1;
+ /* false MIME premble, restart from mime_buffer */
+ mime_decode_mode = 1; /* no decode, but read from the mime_buffer */
+ /* Since we are in MIME mode until buffer becomes empty, */
+ /* we never go into mime_begin again for a while. */
+ return c1;
}
/* discard mime preemble, and goto MIME mode */
- mime_input_state.last = k;
+ mime_last = k;
/* do no MIME integrity check */
return c1; /* used only for checking EOF */
}
#ifdef CHECK_OPTION
-static void
-no_putc(nkf_char c)
+void no_putc(nkf_char c)
{
;
}
-static void
-debug(const char *str)
+void debug(const char *str)
{
if (debug_f){
- fprintf(stderr, "%s\n", str ? str : "NULL");
+ fprintf(stderr, "%s\n", str);
}
}
#endif
-static void
-set_input_codename(const char *codename)
+void set_input_codename(char *codename)
{
- if (!input_codename) {
- input_codename = codename;
- } else if (strcmp(codename, input_codename) != 0) {
- input_codename = "";
- }
-}
-
-static const char*
-get_guessed_code(void)
-{
- if (input_codename && !*input_codename) {
- input_codename = "BINARY";
- } else {
- struct input_code *p = find_inputcode_byfunc(iconv);
- if (!input_codename) {
- input_codename = "ASCII";
- } else if (strcmp(input_codename, "Shift_JIS") == 0) {
- if (p->score & (SCORE_DEPEND|SCORE_CP932))
- input_codename = "CP932";
- } else if (strcmp(input_codename, "EUC-JP") == 0) {
- if (p->score & (SCORE_X0212))
- input_codename = "EUCJP-MS";
- else if (p->score & (SCORE_DEPEND|SCORE_CP932))
- input_codename = "CP51932";
- } else if (strcmp(input_codename, "ISO-2022-JP") == 0) {
- if (p->score & (SCORE_KANA))
- input_codename = "CP50221";
- else if (p->score & (SCORE_DEPEND|SCORE_CP932))
- input_codename = "CP50220";
- }
+ if (guess_f &&
+ is_inputcode_set &&
+ strcmp(codename, "") != 0 &&
+ strcmp(codename, input_codename) != 0)
+ {
+ is_inputcode_mixed = TRUE;
}
- return input_codename;
+ input_codename = codename;
+ is_inputcode_set = TRUE;
}
#if !defined(PERL_XS) && !defined(WIN32DLL)
-static void
-print_guessed_code(char *filename)
+void print_guessed_code(char *filename)
{
- if (filename != NULL) printf("%s: ", filename);
- if (input_codename && !*input_codename) {
- printf("BINARY\n");
- } else {
- input_codename = get_guessed_code();
- if (guess_f == 1) {
- printf("%s\n", input_codename);
- } else {
- printf("%s%s\n",
- input_codename,
- input_eol == CR ? " (CR)" :
- input_eol == LF ? " (LF)" :
- input_eol == CRLF ? " (CRLF)" :
- input_eol == EOF ? " (MIXED NL)" :
- "");
- }
- }
+ char *codename = "BINARY";
+ if (!is_inputcode_mixed) {
+ if (strcmp(input_codename, "") == 0) {
+ codename = "ASCII";
+ } else {
+ codename = input_codename;
+ }
+ }
+ if (filename != NULL) printf("%s:", filename);
+ printf("%s\n", codename);
}
#endif /*WIN32DLL*/
-#ifdef INPUT_OPTION
+#ifdef INPUT_OPTION
-static nkf_char
-hex_getc(nkf_char ch, FILE *f, nkf_char (*g)(FILE *f), nkf_char (*u)(nkf_char c, FILE *f))
+nkf_char hex_getc(nkf_char ch, FILE *f, nkf_char (*g)(FILE *f), nkf_char (*u)(nkf_char c, FILE *f))
{
nkf_char c1, c2, c3;
c1 = (*g)(f);
if (c1 != ch){
- return c1;
+ return c1;
}
c2 = (*g)(f);
if (!nkf_isxdigit(c2)){
- (*u)(c2, f);
- return c1;
+ (*u)(c2, f);
+ return c1;
}
c3 = (*g)(f);
if (!nkf_isxdigit(c3)){
- (*u)(c2, f);
- (*u)(c3, f);
- return c1;
+ (*u)(c2, f);
+ (*u)(c3, f);
+ return c1;
}
return (hex2bin(c2) << 4) | hex2bin(c3);
}
-static nkf_char
-cap_getc(FILE *f)
+nkf_char cap_getc(FILE *f)
{
return hex_getc(':', f, i_cgetc, i_cungetc);
}
-static nkf_char
-cap_ungetc(nkf_char c, FILE *f)
+nkf_char cap_ungetc(nkf_char c, FILE *f)
{
return (*i_cungetc)(c, f);
}
-static nkf_char
-url_getc(FILE *f)
+nkf_char url_getc(FILE *f)
{
return hex_getc('%', f, i_ugetc, i_uungetc);
}
-static nkf_char
-url_ungetc(nkf_char c, FILE *f)
+nkf_char url_ungetc(nkf_char c, FILE *f)
{
return (*i_uungetc)(c, f);
}
#endif
#ifdef NUMCHAR_OPTION
-static nkf_char
-numchar_getc(FILE *f)
+nkf_char numchar_getc(FILE *f)
{
nkf_char (*g)(FILE *) = i_ngetc;
nkf_char (*u)(nkf_char c ,FILE *f) = i_nungetc;
int i = 0, j;
- nkf_char buf[12];
+ nkf_char buf[8];
long c = -1;
buf[i] = (*g)(f);
if (buf[i] == '&'){
- buf[++i] = (*g)(f);
- if (buf[i] == '#'){
- c = 0;
- buf[++i] = (*g)(f);
- if (buf[i] == 'x' || buf[i] == 'X'){
- for (j = 0; j < 7; j++){
- buf[++i] = (*g)(f);
- if (!nkf_isxdigit(buf[i])){
- if (buf[i] != ';'){
- c = -1;
- }
- break;
- }
- c <<= 4;
- c |= hex2bin(buf[i]);
- }
- }else{
- for (j = 0; j < 8; j++){
- if (j){
- buf[++i] = (*g)(f);
- }
- if (!nkf_isdigit(buf[i])){
- if (buf[i] != ';'){
- c = -1;
- }
- break;
- }
- c *= 10;
- c += hex2bin(buf[i]);
- }
- }
- }
+ buf[++i] = (*g)(f);
+ if (buf[i] == '#'){
+ c = 0;
+ buf[++i] = (*g)(f);
+ if (buf[i] == 'x' || buf[i] == 'X'){
+ for (j = 0; j < 7; j++){
+ buf[++i] = (*g)(f);
+ if (!nkf_isxdigit(buf[i])){
+ if (buf[i] != ';'){
+ c = -1;
+ }
+ break;
+ }
+ c <<= 4;
+ c |= hex2bin(buf[i]);
+ }
+ }else{
+ for (j = 0; j < 8; j++){
+ if (j){
+ buf[++i] = (*g)(f);
+ }
+ if (!nkf_isdigit(buf[i])){
+ if (buf[i] != ';'){
+ c = -1;
+ }
+ break;
+ }
+ c *= 10;
+ c += hex2bin(buf[i]);
+ }
+ }
+ }
}
if (c != -1){
- return nkf_char_unicode_new(c);
+ return CLASS_UNICODE | c;
}
while (i > 0){
- (*u)(buf[i], f);
- --i;
+ (*u)(buf[i], f);
+ --i;
}
return buf[0];
}
-static nkf_char
-numchar_ungetc(nkf_char c, FILE *f)
+nkf_char numchar_ungetc(nkf_char c, FILE *f)
{
return (*i_nungetc)(c, f);
}
@@ -4253,89 +5060,54 @@ numchar_ungetc(nkf_char c, FILE *f)
#ifdef UNICODE_NORMALIZATION
-static nkf_char
-nfc_getc(FILE *f)
+/* Normalization Form C */
+nkf_char nfc_getc(FILE *f)
{
nkf_char (*g)(FILE *f) = i_nfc_getc;
nkf_char (*u)(nkf_char c ,FILE *f) = i_nfc_ungetc;
- nkf_buf_t *buf = nkf_state->nfc_buf;
- const unsigned char *array;
- int lower=0, upper=NORMALIZATION_TABLE_LENGTH-1;
- nkf_char c = (*g)(f);
-
- if (c == EOF || c > 0xFF || (c & 0xc0) == 0x80) return c;
-
- nkf_buf_push(buf, c);
- do {
- while (lower <= upper) {
- int mid = (lower+upper) / 2;
- int len;
- array = normalization_table[mid].nfd;
- for (len=0; len < NORMALIZATION_TABLE_NFD_LENGTH && array[len]; len++) {
- if (len >= nkf_buf_length(buf)) {
- c = (*g)(f);
- if (c == EOF) {
- len = 0;
- lower = 1, upper = 0;
- break;
- }
- nkf_buf_push(buf, c);
- }
- if (array[len] != nkf_buf_at(buf, len)) {
- if (array[len] < nkf_buf_at(buf, len)) lower = mid + 1;
- else upper = mid - 1;
- len = 0;
+ int i=0, j, k=1, lower, upper;
+ nkf_char buf[9];
+ const nkf_nfchar *array;
+#if 0
+ extern const struct normalization_pair normalization_table[];
+#endif
+
+ buf[i] = (*g)(f);
+ while (k > 0 && ((buf[i] & 0xc0) != 0x80)){
+ lower=0, upper=NORMALIZATION_TABLE_LENGTH-1;
+ while (upper >= lower) {
+ j = (lower+upper) / 2;
+ array = normalization_table[j].nfd;
+ for (k=0; k < NORMALIZATION_TABLE_NFD_LENGTH && array[k]; k++){
+ if (array[k] != buf[k]){
+ array[k] < buf[k] ? (lower = j + 1) : (upper = j - 1);
+ k = 0;
break;
- }
+ } else if (k >= i)
+ buf[++i] = (*g)(f);
}
- if (len > 0) {
- int i;
- array = normalization_table[mid].nfc;
- nkf_buf_clear(buf);
+ if (k > 0){
+ array = normalization_table[j].nfc;
for (i=0; i < NORMALIZATION_TABLE_NFC_LENGTH && array[i]; i++)
- nkf_buf_push(buf, array[i]);
+ buf[i] = (nkf_char)(array[i]);
+ i--;
break;
}
}
- } while (lower <= upper);
-
- while (nkf_buf_length(buf) > 1) (*u)(nkf_buf_pop(buf), f);
- c = nkf_buf_pop(buf);
-
- return c;
+ while (i > 0)
+ (*u)(buf[i--], f);
+ }
+ return buf[0];
}
-static nkf_char
-nfc_ungetc(nkf_char c, FILE *f)
+nkf_char nfc_ungetc(nkf_char c, FILE *f)
{
return (*i_nfc_ungetc)(c, f);
}
#endif /* UNICODE_NORMALIZATION */
-static nkf_char
-base64decode(nkf_char c)
-{
- int i;
- if (c > '@') {
- if (c < '[') {
- i = c - 'A'; /* A..Z 0-25 */
- } else if (c == '_') {
- i = '?' /* 63 */ ; /* _ 63 */
- } else {
- i = c - 'G' /* - 'a' + 26 */ ; /* a..z 26-51 */
- }
- } else if (c > '/') {
- i = c - '0' + '4' /* - '0' + 52 */ ; /* 0..9 52-61 */
- } else if (c == '+' || c == '-') {
- i = '>' /* 62 */ ; /* + and - 62 */
- } else {
- i = '?' /* 63 */ ; /* / 63 */
- }
- return (i);
-}
-
-static nkf_char
+nkf_char
mime_getc(FILE *f)
{
nkf_char c1, c2, c3, c4, cc;
@@ -4345,8 +5117,8 @@ mime_getc(FILE *f)
char *lwsp_buf_new;
nkf_char lwsp_size = 128;
- if (mime_input_state.top != mime_input_state.last) { /* Something is in FIFO */
- return mime_input_buf(mime_input_state.top++);
+ if (mime_top != mime_last) { /* Something is in FIFO */
+ return Fifo(mime_top++);
}
if (mime_decode_mode==1 ||mime_decode_mode==FALSE) {
mime_decode_mode=FALSE;
@@ -4355,193 +5127,211 @@ mime_getc(FILE *f)
}
if (mimebuf_f == FIXED_MIME)
- exit_mode = mime_decode_mode;
+ exit_mode = mime_decode_mode;
else
- exit_mode = FALSE;
+ exit_mode = FALSE;
if (mime_decode_mode == 'Q') {
- if ((c1 = (*i_mgetc)(f)) == EOF) return (EOF);
- restart_mime_q:
- if (c1=='_' && mimebuf_f != FIXED_MIME) return SP;
- if (c1<=SP || DEL<=c1) {
+ if ((c1 = (*i_mgetc)(f)) == EOF) return (EOF);
+restart_mime_q:
+ if (c1=='_' && mimebuf_f != FIXED_MIME) return ' ';
+ if (c1<=' ' || DEL<=c1) {
mime_decode_mode = exit_mode; /* prepare for quit */
return c1;
}
- if (c1!='=' && (c1!='?' || mimebuf_f == FIXED_MIME)) {
+ if (c1!='=' && (c1!='?' || mimebuf_f == FIXED_MIME)) {
return c1;
}
-
- mime_decode_mode = exit_mode; /* prepare for quit */
- if ((c2 = (*i_mgetc)(f)) == EOF) return (EOF);
- if (c1=='?'&&c2=='=' && mimebuf_f != FIXED_MIME) {
- /* end Q encoding */
- input_mode = exit_mode;
+
+ mime_decode_mode = exit_mode; /* prepare for quit */
+ if ((c2 = (*i_mgetc)(f)) == EOF) return (EOF);
+ if (c1=='?'&&c2=='=' && mimebuf_f != FIXED_MIME) {
+ /* end Q encoding */
+ input_mode = exit_mode;
lwsp_count = 0;
- lwsp_buf = nkf_xmalloc((lwsp_size+5)*sizeof(char));
+ lwsp_buf = malloc((lwsp_size+5)*sizeof(char));
+ if (lwsp_buf==NULL) {
+ perror("can't malloc");
+ return -1;
+ }
while ((c1=(*i_getc)(f))!=EOF) {
switch (c1) {
- case LF:
+ case NL:
case CR:
- if (c1==LF) {
- if ((c1=(*i_getc)(f))!=EOF && nkf_isblank(c1)) {
- i_ungetc(SP,f);
+ if (c1==NL) {
+ if ((c1=(*i_getc)(f))!=EOF && (c1==SPACE||c1==TAB)) {
+ i_ungetc(SPACE,f);
continue;
} else {
i_ungetc(c1,f);
}
- c1 = LF;
+ c1 = NL;
} else {
- if ((c1=(*i_getc)(f))!=EOF && c1 == LF) {
- if ((c1=(*i_getc)(f))!=EOF && nkf_isblank(c1)) {
- i_ungetc(SP,f);
+ if ((c1=(*i_getc)(f))!=EOF && c1 == NL) {
+ if ((c1=(*i_getc)(f))!=EOF && (c1==SPACE||c1==TAB)) {
+ i_ungetc(SPACE,f);
continue;
} else {
i_ungetc(c1,f);
}
- i_ungetc(LF,f);
+ i_ungetc(NL,f);
} else {
i_ungetc(c1,f);
}
c1 = CR;
}
break;
- case SP:
+ case SPACE:
case TAB:
lwsp_buf[lwsp_count] = (unsigned char)c1;
if (lwsp_count++>lwsp_size){
lwsp_size <<= 1;
- lwsp_buf_new = nkf_xrealloc(lwsp_buf, (lwsp_size+5)*sizeof(char));
+ lwsp_buf_new = realloc(lwsp_buf, (lwsp_size+5)*sizeof(char));
+ if (lwsp_buf_new==NULL) {
+ free(lwsp_buf);
+ perror("can't realloc");
+ return -1;
+ }
lwsp_buf = lwsp_buf_new;
}
continue;
}
break;
}
- if (lwsp_count > 0 && (c1 != '=' || (lwsp_buf[lwsp_count-1] != SP && lwsp_buf[lwsp_count-1] != TAB))) {
+ if (lwsp_count > 0 && (c1 != '=' || (lwsp_buf[lwsp_count-1] != SPACE && lwsp_buf[lwsp_count-1] != TAB))) {
i_ungetc(c1,f);
for(lwsp_count--;lwsp_count>0;lwsp_count--)
i_ungetc(lwsp_buf[lwsp_count],f);
c1 = lwsp_buf[0];
}
- nkf_xfree(lwsp_buf);
- return c1;
- }
- if (c1=='='&&c2<SP) { /* this is soft wrap */
- while((c1 = (*i_mgetc)(f)) <=SP) {
+ free(lwsp_buf);
+ return c1;
+ }
+ if (c1=='='&&c2<' ') { /* this is soft wrap */
+ while((c1 = (*i_mgetc)(f)) <=' ') {
if ((c1 = (*i_mgetc)(f)) == EOF) return (EOF);
}
- mime_decode_mode = 'Q'; /* still in MIME */
+ mime_decode_mode = 'Q'; /* still in MIME */
goto restart_mime_q;
}
- if (c1=='?') {
- mime_decode_mode = 'Q'; /* still in MIME */
- (*i_mungetc)(c2,f);
- return c1;
- }
- if ((c3 = (*i_mgetc)(f)) == EOF) return (EOF);
- if (c2<=SP) return c2;
- mime_decode_mode = 'Q'; /* still in MIME */
- return ((hex2bin(c2)<<4) + hex2bin(c3));
+ if (c1=='?') {
+ mime_decode_mode = 'Q'; /* still in MIME */
+ (*i_mungetc)(c2,f);
+ return c1;
+ }
+ if ((c3 = (*i_mgetc)(f)) == EOF) return (EOF);
+ if (c2<=' ') return c2;
+ mime_decode_mode = 'Q'; /* still in MIME */
+ return ((hex2bin(c2)<<4) + hex2bin(c3));
}
if (mime_decode_mode != 'B') {
- mime_decode_mode = FALSE;
- return (*i_mgetc)(f);
+ mime_decode_mode = FALSE;
+ return (*i_mgetc)(f);
}
/* Base64 encoding */
- /*
- MIME allows line break in the middle of
- Base64, but we are very pessimistic in decoding
- in unbuf mode because MIME encoded code may broken by
- less or editor's control sequence (such as ESC-[-K in unbuffered
- mode. ignore incomplete MIME.
- */
+ /*
+ MIME allows line break in the middle of
+ Base64, but we are very pessimistic in decoding
+ in unbuf mode because MIME encoded code may broken by
+ less or editor's control sequence (such as ESC-[-K in unbuffered
+ mode. ignore incomplete MIME.
+ */
mode = mime_decode_mode;
mime_decode_mode = exit_mode; /* prepare for quit */
- while ((c1 = (*i_mgetc)(f))<=SP) {
- if (c1==EOF)
- return (EOF);
+ while ((c1 = (*i_mgetc)(f))<=' ') {
+ if (c1==EOF)
+ return (EOF);
}
- mime_c2_retry:
- if ((c2 = (*i_mgetc)(f))<=SP) {
- if (c2==EOF)
- return (EOF);
+mime_c2_retry:
+ if ((c2 = (*i_mgetc)(f))<=' ') {
+ if (c2==EOF)
+ return (EOF);
if (mime_f != STRICT_MIME) goto mime_c2_retry;
- if (mimebuf_f!=FIXED_MIME) input_mode = ASCII;
- return c2;
+ if (mimebuf_f!=FIXED_MIME) input_mode = ASCII;
+ return c2;
}
if ((c1 == '?') && (c2 == '=')) {
- input_mode = ASCII;
+ input_mode = ASCII;
lwsp_count = 0;
- lwsp_buf = nkf_xmalloc((lwsp_size+5)*sizeof(char));
+ lwsp_buf = malloc((lwsp_size+5)*sizeof(char));
+ if (lwsp_buf==NULL) {
+ perror("can't malloc");
+ return -1;
+ }
while ((c1=(*i_getc)(f))!=EOF) {
switch (c1) {
- case LF:
+ case NL:
case CR:
- if (c1==LF) {
- if ((c1=(*i_getc)(f))!=EOF && nkf_isblank(c1)) {
- i_ungetc(SP,f);
+ if (c1==NL) {
+ if ((c1=(*i_getc)(f))!=EOF && (c1==SPACE||c1==TAB)) {
+ i_ungetc(SPACE,f);
continue;
} else {
i_ungetc(c1,f);
}
- c1 = LF;
+ c1 = NL;
} else {
if ((c1=(*i_getc)(f))!=EOF) {
- if (c1==SP) {
- i_ungetc(SP,f);
+ if (c1==SPACE) {
+ i_ungetc(SPACE,f);
continue;
- } else if ((c1=(*i_getc)(f))!=EOF && nkf_isblank(c1)) {
- i_ungetc(SP,f);
+ } else if ((c1=(*i_getc)(f))!=EOF && (c1==SPACE||c1==TAB)) {
+ i_ungetc(SPACE,f);
continue;
} else {
i_ungetc(c1,f);
}
- i_ungetc(LF,f);
+ i_ungetc(NL,f);
} else {
i_ungetc(c1,f);
}
c1 = CR;
}
break;
- case SP:
+ case SPACE:
case TAB:
lwsp_buf[lwsp_count] = (unsigned char)c1;
if (lwsp_count++>lwsp_size){
lwsp_size <<= 1;
- lwsp_buf_new = nkf_xrealloc(lwsp_buf, (lwsp_size+5)*sizeof(char));
+ lwsp_buf_new = realloc(lwsp_buf, (lwsp_size+5)*sizeof(char));
+ if (lwsp_buf_new==NULL) {
+ free(lwsp_buf);
+ perror("can't realloc");
+ return -1;
+ }
lwsp_buf = lwsp_buf_new;
}
continue;
}
break;
}
- if (lwsp_count > 0 && (c1 != '=' || (lwsp_buf[lwsp_count-1] != SP && lwsp_buf[lwsp_count-1] != TAB))) {
+ if (lwsp_count > 0 && (c1 != '=' || (lwsp_buf[lwsp_count-1] != SPACE && lwsp_buf[lwsp_count-1] != TAB))) {
i_ungetc(c1,f);
for(lwsp_count--;lwsp_count>0;lwsp_count--)
i_ungetc(lwsp_buf[lwsp_count],f);
c1 = lwsp_buf[0];
}
- nkf_xfree(lwsp_buf);
- return c1;
+ free(lwsp_buf);
+ return c1;
}
- mime_c3_retry:
- if ((c3 = (*i_mgetc)(f))<=SP) {
- if (c3==EOF)
- return (EOF);
+mime_c3_retry:
+ if ((c3 = (*i_mgetc)(f))<=' ') {
+ if (c3==EOF)
+ return (EOF);
if (mime_f != STRICT_MIME) goto mime_c3_retry;
- if (mimebuf_f!=FIXED_MIME) input_mode = ASCII;
- return c3;
+ if (mimebuf_f!=FIXED_MIME) input_mode = ASCII;
+ return c3;
}
- mime_c4_retry:
- if ((c4 = (*i_mgetc)(f))<=SP) {
- if (c4==EOF)
- return (EOF);
+mime_c4_retry:
+ if ((c4 = (*i_mgetc)(f))<=' ') {
+ if (c4==EOF)
+ return (EOF);
if (mime_f != STRICT_MIME) goto mime_c4_retry;
- if (mimebuf_f!=FIXED_MIME) input_mode = ASCII;
- return c4;
+ if (mimebuf_f!=FIXED_MIME) input_mode = ASCII;
+ return c4;
}
mime_decode_mode = mode; /* still in MIME sigh... */
@@ -4554,112 +5344,147 @@ mime_getc(FILE *f)
t4 = 0x3f & base64decode(c4);
cc = ((t1 << 2) & 0x0fc) | ((t2 >> 4) & 0x03);
if (c2 != '=') {
- mime_input_buf(mime_input_state.last++) = (unsigned char)cc;
- cc = ((t2 << 4) & 0x0f0) | ((t3 >> 2) & 0x0f);
- if (c3 != '=') {
- mime_input_buf(mime_input_state.last++) = (unsigned char)cc;
- cc = ((t3 << 6) & 0x0c0) | (t4 & 0x3f);
- if (c4 != '=')
- mime_input_buf(mime_input_state.last++) = (unsigned char)cc;
+ Fifo(mime_last++) = (unsigned char)cc;
+ cc = ((t2 << 4) & 0x0f0) | ((t3 >> 2) & 0x0f);
+ if (c3 != '=') {
+ Fifo(mime_last++) = (unsigned char)cc;
+ cc = ((t3 << 6) & 0x0c0) | (t4 & 0x3f);
+ if (c4 != '=')
+ Fifo(mime_last++) = (unsigned char)cc;
+ }
+ } else {
+ return c1;
+ }
+ return Fifo(mime_top++);
+}
+
+nkf_char mime_ungetc(nkf_char c, FILE *f)
+{
+ Fifo(--mime_top) = (unsigned char)c;
+ return c;
+}
+
+nkf_char mime_integrity(FILE *f, const unsigned char *p)
+{
+ nkf_char c,d;
+ unsigned int q;
+ /* In buffered mode, read until =? or NL or buffer full
+ */
+ mime_input = mime_top;
+ mime_last = mime_top;
+
+ while(*p) Fifo(mime_input++) = *p++;
+ d = 0;
+ q = mime_input;
+ while((c=(*i_getc)(f))!=EOF) {
+ if (((mime_input-mime_top)&MIME_BUF_MASK)==0) {
+ break; /* buffer full */
+ }
+ if (c=='=' && d=='?') {
+ /* checked. skip header, start decode */
+ Fifo(mime_input++) = (unsigned char)c;
+ /* mime_last_input = mime_input; */
+ mime_input = q;
+ switch_mime_getc();
+ return 1;
+ }
+ if (!( (c=='+'||c=='/'|| c=='=' || c=='?' || is_alnum(c))))
+ break;
+ /* Should we check length mod 4? */
+ Fifo(mime_input++) = (unsigned char)c;
+ d=c;
+ }
+ /* In case of Incomplete MIME, no MIME decode */
+ Fifo(mime_input++) = (unsigned char)c;
+ mime_last = mime_input; /* point undecoded buffer */
+ mime_decode_mode = 1; /* no decode on Fifo last in mime_getc */
+ switch_mime_getc(); /* anyway we need buffered getc */
+ return 1;
+}
+
+nkf_char base64decode(nkf_char c)
+{
+ int i;
+ if (c > '@') {
+ if (c < '[') {
+ i = c - 'A'; /* A..Z 0-25 */
+ } else {
+ i = c - 'G' /* - 'a' + 26 */ ; /* a..z 26-51 */
}
+ } else if (c > '/') {
+ i = c - '0' + '4' /* - '0' + 52 */ ; /* 0..9 52-61 */
+ } else if (c == '+') {
+ i = '>' /* 62 */ ; /* + 62 */
} else {
- return c1;
+ i = '?' /* 63 */ ; /* / 63 */
}
- return mime_input_buf(mime_input_state.top++);
+ return (i);
}
static const char basis_64[] =
- "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-#define MIMEOUT_BUF_LENGTH 74
-static struct {
- char buf[MIMEOUT_BUF_LENGTH+1];
- int count;
-} mimeout_state;
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-/*nkf_char mime_lastchar2, mime_lastchar1;*/
+static nkf_char b64c;
+#define MIMEOUT_BUF_LENGTH (60)
+char mimeout_buf[MIMEOUT_BUF_LENGTH+1];
+int mimeout_buf_count = 0;
+int mimeout_preserve_space = 0;
+#define itoh4(c) (c>=10?c+'A'-10:c+'0')
-static void
-open_mime(nkf_char mode)
+void open_mime(nkf_char mode)
{
const unsigned char *p;
int i;
int j;
p = mime_pattern[0];
- for(i=0;mime_pattern[i];i++) {
+ for(i=0;mime_encode[i];i++) {
if (mode == mime_encode[i]) {
p = mime_pattern[i];
break;
}
}
mimeout_mode = mime_encode_method[i];
+
i = 0;
if (base64_count>45) {
- if (mimeout_state.count>0 && nkf_isblank(mimeout_state.buf[i])){
- (*o_mputc)(mimeout_state.buf[i]);
+ if (mimeout_buf_count>0 && nkf_isblank(mimeout_buf[i])){
+ (*o_mputc)(mimeout_buf[i]);
i++;
}
- PUT_NEWLINE((*o_mputc));
- (*o_mputc)(SP);
+ (*o_mputc)(NL);
+ (*o_mputc)(SPACE);
base64_count = 1;
- if (mimeout_state.count>0 && nkf_isspace(mimeout_state.buf[i])) {
+ if (!mimeout_preserve_space && mimeout_buf_count>0
+ && (mimeout_buf[i]==SPACE || mimeout_buf[i]==TAB
+ || mimeout_buf[i]==CR || mimeout_buf[i]==NL )) {
i++;
}
}
- for (;i<mimeout_state.count;i++) {
- if (nkf_isspace(mimeout_state.buf[i])) {
- (*o_mputc)(mimeout_state.buf[i]);
- base64_count ++;
- } else {
- break;
+ if (!mimeout_preserve_space) {
+ for (;i<mimeout_buf_count;i++) {
+ if (mimeout_buf[i]==SPACE || mimeout_buf[i]==TAB
+ || mimeout_buf[i]==CR || mimeout_buf[i]==NL ) {
+ (*o_mputc)(mimeout_buf[i]);
+ base64_count ++;
+ } else {
+ break;
+ }
}
}
+ mimeout_preserve_space = FALSE;
+
while(*p) {
- (*o_mputc)(*p++);
- base64_count ++;
+ (*o_mputc)(*p++);
+ base64_count ++;
}
- j = mimeout_state.count;
- mimeout_state.count = 0;
+ j = mimeout_buf_count;
+ mimeout_buf_count = 0;
for (;i<j;i++) {
- mime_putc(mimeout_state.buf[i]);
+ mime_putc(mimeout_buf[i]);
}
}
-static void
-mime_prechar(nkf_char c2, nkf_char c1)
-{
- if (mimeout_mode > 0){
- if (c2 == EOF){
- if (base64_count + mimeout_state.count/3*4> 73){
- (*o_base64conv)(EOF,0);
- OCONV_NEWLINE((*o_base64conv));
- (*o_base64conv)(0,SP);
- base64_count = 1;
- }
- } else {
- if (base64_count + mimeout_state.count/3*4> 66) {
- (*o_base64conv)(EOF,0);
- OCONV_NEWLINE((*o_base64conv));
- (*o_base64conv)(0,SP);
- base64_count = 1;
- mimeout_mode = -1;
- }
- }
- } else if (c2) {
- if (c2 != EOF && base64_count + mimeout_state.count/3*4> 60) {
- mimeout_mode = (output_mode==ASCII ||output_mode == ISO_8859_1) ? 'Q' : 'B';
- open_mime(output_mode);
- (*o_base64conv)(EOF,0);
- OCONV_NEWLINE((*o_base64conv));
- (*o_base64conv)(0,SP);
- base64_count = 1;
- mimeout_mode = -1;
- }
- }
-}
-
-static void
-close_mime(void)
+void close_mime(void)
{
(*o_mputc)('?');
(*o_mputc)('=');
@@ -4667,340 +5492,290 @@ close_mime(void)
mimeout_mode = 0;
}
-static void
-eof_mime(void)
+void eof_mime(void)
{
switch(mimeout_mode) {
case 'Q':
case 'B':
break;
case 2:
- (*o_mputc)(basis_64[((nkf_state->mimeout_state & 0x3)<< 4)]);
+ (*o_mputc)(basis_64[((b64c & 0x3)<< 4)]);
(*o_mputc)('=');
(*o_mputc)('=');
base64_count += 3;
break;
case 1:
- (*o_mputc)(basis_64[((nkf_state->mimeout_state & 0xF) << 2)]);
+ (*o_mputc)(basis_64[((b64c & 0xF) << 2)]);
(*o_mputc)('=');
base64_count += 2;
break;
}
- if (mimeout_mode > 0) {
+ if (mimeout_mode) {
if (mimeout_f!=FIXED_MIME) {
- close_mime();
+ close_mime();
} else if (mimeout_mode != 'Q')
mimeout_mode = 'B';
}
}
-static void
-mimeout_addchar(nkf_char c)
+void mimeout_addchar(nkf_char c)
{
switch(mimeout_mode) {
case 'Q':
- if (c==CR||c==LF) {
+ if (c==CR||c==NL) {
(*o_mputc)(c);
base64_count = 0;
} else if(!nkf_isalnum(c)) {
(*o_mputc)('=');
- (*o_mputc)(bin2hex(((c>>4)&0xf)));
- (*o_mputc)(bin2hex((c&0xf)));
+ (*o_mputc)(itoh4(((c>>4)&0xf)));
+ (*o_mputc)(itoh4((c&0xf)));
base64_count += 3;
} else {
(*o_mputc)(c);
base64_count++;
}
- break;
+ break;
case 'B':
- nkf_state->mimeout_state=c;
- (*o_mputc)(basis_64[c>>2]);
- mimeout_mode=2;
- base64_count ++;
- break;
+ b64c=c;
+ (*o_mputc)(basis_64[c>>2]);
+ mimeout_mode=2;
+ base64_count ++;
+ break;
case 2:
- (*o_mputc)(basis_64[((nkf_state->mimeout_state & 0x3)<< 4) | ((c & 0xF0) >> 4)]);
- nkf_state->mimeout_state=c;
- mimeout_mode=1;
- base64_count ++;
- break;
+ (*o_mputc)(basis_64[((b64c & 0x3)<< 4) | ((c & 0xF0) >> 4)]);
+ b64c=c;
+ mimeout_mode=1;
+ base64_count ++;
+ break;
case 1:
- (*o_mputc)(basis_64[((nkf_state->mimeout_state & 0xF) << 2) | ((c & 0xC0) >>6)]);
- (*o_mputc)(basis_64[c & 0x3F]);
- mimeout_mode='B';
- base64_count += 2;
- break;
+ (*o_mputc)(basis_64[((b64c & 0xF) << 2) | ((c & 0xC0) >>6)]);
+ (*o_mputc)(basis_64[c & 0x3F]);
+ mimeout_mode='B';
+ base64_count += 2;
+ break;
default:
(*o_mputc)(c);
base64_count++;
- break;
+ break;
}
}
-static void
-mime_putc(nkf_char c)
+nkf_char mime_lastchar2, mime_lastchar1;
+
+void mime_prechar(nkf_char c2, nkf_char c1)
+{
+ if (mimeout_mode){
+ if (c2){
+ if (base64_count + mimeout_buf_count/3*4> 66){
+ (*o_base64conv)(EOF,0);
+ (*o_base64conv)(0,NL);
+ (*o_base64conv)(0,SPACE);
+ }
+ }/*else if (mime_lastchar2){
+ if (c1 <=DEL && !nkf_isspace(c1)){
+ (*o_base64conv)(0,SPACE);
+ }
+ }*/
+ }/*else{
+ if (c2 && mime_lastchar2 == 0
+ && mime_lastchar1 && !nkf_isspace(mime_lastchar1)){
+ (*o_base64conv)(0,SPACE);
+ }
+ }*/
+ mime_lastchar2 = c2;
+ mime_lastchar1 = c1;
+}
+
+void mime_putc(nkf_char c)
{
int i, j;
nkf_char lastchar;
if (mimeout_f == FIXED_MIME){
- if (mimeout_mode == 'Q'){
- if (base64_count > 71){
- if (c!=CR && c!=LF) {
- (*o_mputc)('=');
- PUT_NEWLINE((*o_mputc));
- }
- base64_count = 0;
- }
- }else{
- if (base64_count > 71){
- eof_mime();
- PUT_NEWLINE((*o_mputc));
- base64_count = 0;
- }
- if (c == EOF) { /* c==EOF */
- eof_mime();
- }
- }
- if (c != EOF) { /* c==EOF */
- mimeout_addchar(c);
- }
- return;
- }
-
+ if (mimeout_mode == 'Q'){
+ if (base64_count > 71){
+ if (c!=CR && c!=NL) {
+ (*o_mputc)('=');
+ (*o_mputc)(NL);
+ }
+ base64_count = 0;
+ }
+ }else{
+ if (base64_count > 71){
+ eof_mime();
+ (*o_mputc)(NL);
+ base64_count = 0;
+ }
+ if (c == EOF) { /* c==EOF */
+ eof_mime();
+ }
+ }
+ if (c != EOF) { /* c==EOF */
+ mimeout_addchar(c);
+ }
+ return;
+ }
+
/* mimeout_f != FIXED_MIME */
if (c == EOF) { /* c==EOF */
- if (mimeout_mode == -1 && mimeout_state.count > 1) open_mime(output_mode);
- j = mimeout_state.count;
- mimeout_state.count = 0;
+ j = mimeout_buf_count;
+ mimeout_buf_count = 0;
i = 0;
- if (mimeout_mode > 0) {
- if (!nkf_isblank(mimeout_state.buf[j-1])) {
- for (;i<j;i++) {
- if (nkf_isspace(mimeout_state.buf[i]) && base64_count < 71){
- break;
- }
- mimeout_addchar(mimeout_state.buf[i]);
- }
- eof_mime();
- for (;i<j;i++) {
- mimeout_addchar(mimeout_state.buf[i]);
- }
- } else {
- for (;i<j;i++) {
- mimeout_addchar(mimeout_state.buf[i]);
+ if (mimeout_mode) {
+ for (;i<j;i++) {
+ if (nkf_isspace(mimeout_buf[i]) && base64_count < 71){
+ break;
}
- eof_mime();
+ mimeout_addchar(mimeout_buf[i]);
+ }
+ eof_mime();
+ for (;i<j;i++) {
+ mimeout_addchar(mimeout_buf[i]);
}
} else {
for (;i<j;i++) {
- mimeout_addchar(mimeout_state.buf[i]);
+ mimeout_addchar(mimeout_buf[i]);
}
}
- return;
- }
-
- if (mimeout_state.count > 0){
- lastchar = mimeout_state.buf[mimeout_state.count - 1];
- }else{
- lastchar = -1;
+ return;
}
if (mimeout_mode=='Q') {
- if (c <= DEL && (output_mode==ASCII ||output_mode == ISO_8859_1)) {
- if (c == CR || c == LF) {
- close_mime();
- (*o_mputc)(c);
- base64_count = 0;
- return;
- } else if (c <= SP) {
- close_mime();
- if (base64_count > 70) {
- PUT_NEWLINE((*o_mputc));
- base64_count = 0;
- }
- if (!nkf_isblank(c)) {
- (*o_mputc)(SP);
- base64_count++;
- }
- } else {
- if (base64_count > 70) {
- close_mime();
- PUT_NEWLINE((*o_mputc));
- (*o_mputc)(SP);
- base64_count = 1;
- open_mime(output_mode);
- }
- if (!nkf_noescape_mime(c)) {
- mimeout_addchar(c);
- return;
- }
- }
- (*o_mputc)(c);
- base64_count++;
- }
- return;
- }
-
- if (mimeout_mode <= 0) {
- if (c <= DEL && (output_mode==ASCII ||output_mode == ISO_8859_1)) {
- if (nkf_isspace(c)) {
- int flag = 0;
- if (mimeout_mode == -1) {
- flag = 1;
- }
- if (c==CR || c==LF) {
- if (flag) {
- open_mime(output_mode);
- output_mode = 0;
- } else {
- base64_count = 0;
- }
- }
- for (i=0;i<mimeout_state.count;i++) {
- (*o_mputc)(mimeout_state.buf[i]);
- if (mimeout_state.buf[i] == CR || mimeout_state.buf[i] == LF){
- base64_count = 0;
- }else{
- base64_count++;
- }
- }
- if (flag) {
- eof_mime();
- base64_count = 0;
- mimeout_mode = 0;
- }
- mimeout_state.buf[0] = (char)c;
- mimeout_state.count = 1;
- }else{
- if (base64_count > 1
- && base64_count + mimeout_state.count > 76
- && mimeout_state.buf[0] != CR && mimeout_state.buf[0] != LF){
- static const char *str = "boundary=\"";
- static int len = 10;
- i = 0;
-
- for (; i < mimeout_state.count - len; ++i) {
- if (!strncmp(mimeout_state.buf+i, str, len)) {
- i += len - 2;
- break;
- }
- }
-
- if (i == 0 || i == mimeout_state.count - len) {
- PUT_NEWLINE((*o_mputc));
- base64_count = 0;
- if (!nkf_isspace(mimeout_state.buf[0])){
- (*o_mputc)(SP);
- base64_count++;
- }
- }
- else {
- int j;
- for (j = 0; j <= i; ++j) {
- (*o_mputc)(mimeout_state.buf[j]);
- }
- PUT_NEWLINE((*o_mputc));
- base64_count = 1;
- for (; j <= mimeout_state.count; ++j) {
- mimeout_state.buf[j - i] = mimeout_state.buf[j];
- }
- mimeout_state.count -= i;
- }
- }
- mimeout_state.buf[mimeout_state.count++] = (char)c;
- if (mimeout_state.count>MIMEOUT_BUF_LENGTH) {
- open_mime(output_mode);
- }
- }
- return;
- }else{
- if (lastchar==CR || lastchar == LF){
- for (i=0;i<mimeout_state.count;i++) {
- (*o_mputc)(mimeout_state.buf[i]);
- }
- base64_count = 0;
- mimeout_state.count = 0;
- }
- if (lastchar==SP) {
- for (i=0;i<mimeout_state.count-1;i++) {
- (*o_mputc)(mimeout_state.buf[i]);
- base64_count++;
- }
- mimeout_state.buf[0] = SP;
- mimeout_state.count = 1;
- }
- open_mime(output_mode);
- }
+ if (c <= DEL && (output_mode==ASCII ||output_mode == ISO8859_1 ) ) {
+ if (c <= SPACE) {
+ close_mime();
+ (*o_mputc)(SPACE);
+ base64_count++;
+ }
+ (*o_mputc)(c);
+ base64_count++;
+ }
+ return;
+ }
+
+ if (mimeout_buf_count > 0){
+ lastchar = mimeout_buf[mimeout_buf_count - 1];
}else{
- /* mimeout_mode == 'B', 1, 2 */
- if ( c<=DEL && (output_mode==ASCII ||output_mode == ISO_8859_1)) {
- if (lastchar == CR || lastchar == LF){
- if (nkf_isblank(c)) {
- for (i=0;i<mimeout_state.count;i++) {
- mimeout_addchar(mimeout_state.buf[i]);
- }
- mimeout_state.count = 0;
- } else if (SP<c && c<DEL) {
- eof_mime();
- for (i=0;i<mimeout_state.count;i++) {
- (*o_mputc)(mimeout_state.buf[i]);
- }
- base64_count = 0;
- mimeout_state.count = 0;
- }
- mimeout_state.buf[mimeout_state.count++] = (char)c;
- return;
- }
- if (nkf_isspace(c)) {
- for (i=0;i<mimeout_state.count;i++) {
- if (SP<mimeout_state.buf[i] && mimeout_state.buf[i]<DEL) {
- eof_mime();
- for (i=0;i<mimeout_state.count;i++) {
- (*o_mputc)(mimeout_state.buf[i]);
- base64_count++;
- }
- mimeout_state.count = 0;
- }
- }
- mimeout_state.buf[mimeout_state.count++] = (char)c;
- if (mimeout_state.count>MIMEOUT_BUF_LENGTH) {
- eof_mime();
- for (i=0;i<mimeout_state.count;i++) {
- (*o_mputc)(mimeout_state.buf[i]);
- base64_count++;
- }
- mimeout_state.count = 0;
- }
- return;
- }
- if (mimeout_state.count>0 && SP<c && c!='=') {
- mimeout_state.buf[mimeout_state.count++] = (char)c;
- if (mimeout_state.count>MIMEOUT_BUF_LENGTH) {
- j = mimeout_state.count;
- mimeout_state.count = 0;
- for (i=0;i<j;i++) {
- mimeout_addchar(mimeout_state.buf[i]);
- }
- }
- return;
- }
- }
- }
- if (mimeout_state.count>0) {
- j = mimeout_state.count;
- mimeout_state.count = 0;
+ lastchar = -1;
+ }
+
+ if (!mimeout_mode) {
+ if (c <= DEL && (output_mode==ASCII ||output_mode == ISO8859_1)) {
+ if (nkf_isspace(c)) {
+ if (c==CR || c==NL) {
+ base64_count=0;
+ }
+ for (i=0;i<mimeout_buf_count;i++) {
+ (*o_mputc)(mimeout_buf[i]);
+ if (mimeout_buf[i] == CR || mimeout_buf[i] == NL){
+ base64_count = 0;
+ }else{
+ base64_count++;
+ }
+ }
+ mimeout_buf[0] = (char)c;
+ mimeout_buf_count = 1;
+ }else{
+ if (base64_count > 1
+ && base64_count + mimeout_buf_count > 76){
+ (*o_mputc)(NL);
+ base64_count = 0;
+ if (!nkf_isspace(mimeout_buf[0])){
+ (*o_mputc)(SPACE);
+ base64_count++;
+ }
+ }
+ mimeout_buf[mimeout_buf_count++] = (char)c;
+ if (mimeout_buf_count>MIMEOUT_BUF_LENGTH) {
+ open_mime(output_mode);
+ }
+ }
+ return;
+ }else{
+ if (lastchar==CR || lastchar == NL){
+ for (i=0;i<mimeout_buf_count;i++) {
+ (*o_mputc)(mimeout_buf[i]);
+ }
+ base64_count = 0;
+ mimeout_buf_count = 0;
+ }
+ if (lastchar==SPACE) {
+ for (i=0;i<mimeout_buf_count-1;i++) {
+ (*o_mputc)(mimeout_buf[i]);
+ base64_count++;
+ }
+ mimeout_buf[0] = SPACE;
+ mimeout_buf_count = 1;
+ }
+ open_mime(output_mode);
+ }
+ }else{
+ /* mimeout_mode == 'B', 1, 2 */
+ if ( c<=DEL && (output_mode==ASCII ||output_mode == ISO8859_1 ) ) {
+ if (lastchar == CR || lastchar == NL){
+ if (nkf_isblank(c)) {
+ for (i=0;i<mimeout_buf_count;i++) {
+ mimeout_addchar(mimeout_buf[i]);
+ }
+ mimeout_buf_count = 0;
+ } else if (SPACE<c && c<DEL) {
+ eof_mime();
+ for (i=0;i<mimeout_buf_count;i++) {
+ (*o_mputc)(mimeout_buf[i]);
+ }
+ base64_count = 0;
+ mimeout_buf_count = 0;
+ }
+ }
+ if (c==SPACE || c==TAB || c==CR || c==NL) {
+ for (i=0;i<mimeout_buf_count;i++) {
+ if (SPACE<mimeout_buf[i] && mimeout_buf[i]<DEL) {
+ eof_mime();
+ for (i=0;i<mimeout_buf_count;i++) {
+ (*o_mputc)(mimeout_buf[i]);
+ base64_count++;
+ }
+ mimeout_buf_count = 0;
+ }
+ }
+ mimeout_buf[mimeout_buf_count++] = (char)c;
+ if (mimeout_buf_count>MIMEOUT_BUF_LENGTH) {
+ eof_mime();
+ for (i=0;i<mimeout_buf_count;i++) {
+ (*o_mputc)(mimeout_buf[i]);
+ base64_count++;
+ }
+ mimeout_buf_count = 0;
+ }
+ return;
+ }
+ if (mimeout_buf_count>0 && SPACE<c && c!='=') {
+ mimeout_buf[mimeout_buf_count++] = (char)c;
+ if (mimeout_buf_count>MIMEOUT_BUF_LENGTH) {
+ j = mimeout_buf_count;
+ mimeout_buf_count = 0;
+ for (i=0;i<j;i++) {
+ mimeout_addchar(mimeout_buf[i]);
+ }
+ }
+ return;
+ }
+ }
+ }
+ if (mimeout_buf_count>0) {
+ j = mimeout_buf_count;
+ mimeout_buf_count = 0;
for (i=0;i<j;i++) {
- if (mimeout_state.buf[i]==CR || mimeout_state.buf[i]==LF)
+ if (mimeout_buf[i]==CR || mimeout_buf[i]==NL)
break;
- mimeout_addchar(mimeout_state.buf[i]);
+ mimeout_addchar(mimeout_buf[i]);
}
if (i<j) {
eof_mime();
base64_count=0;
for (;i<j;i++) {
- (*o_mputc)(mimeout_state.buf[i]);
+ (*o_mputc)(mimeout_buf[i]);
}
open_mime(output_mode);
}
@@ -5008,112 +5783,15 @@ mime_putc(nkf_char c)
mimeout_addchar(c);
}
-static void
-base64_conv(nkf_char c2, nkf_char c1)
-{
- mime_prechar(c2, c1);
- (*o_base64conv)(c2,c1);
-}
-
-#ifdef HAVE_ICONV_H
-typedef struct nkf_iconv_t {
- iconv_t cd;
- char *input_buffer;
- size_t input_buffer_size;
- char *output_buffer;
- size_t output_buffer_size;
-}
-
-static nkf_iconv_t
-nkf_iconv_new(char *tocode, char *fromcode)
-{
- nkf_iconv_t converter;
-
- converter->input_buffer_size = IOBUF_SIZE;
- converter->input_buffer = nkf_xmalloc(converter->input_buffer_size);
- converter->output_buffer_size = IOBUF_SIZE * 2;
- converter->output_buffer = nkf_xmalloc(converter->output_buffer_size);
- converter->cd = iconv_open(tocode, fromcode);
- if (converter->cd == (iconv_t)-1)
- {
- switch (errno) {
- case EINVAL:
- perror(fprintf("iconv doesn't support %s to %s conversion.", fromcode, tocode));
- return -1;
- default:
- perror("can't iconv_open");
- }
- }
-}
-
-static size_t
-nkf_iconv_convert(nkf_iconv_t *converter, FILE *input)
-{
- size_t invalid = (size_t)0;
- char *input_buffer = converter->input_buffer;
- size_t input_length = (size_t)0;
- char *output_buffer = converter->output_buffer;
- size_t output_length = converter->output_buffer_size;
- int c;
-
- do {
- if (c != EOF) {
- while ((c = (*i_getc)(f)) != EOF) {
- input_buffer[input_length++] = c;
- if (input_length < converter->input_buffer_size) break;
- }
- }
-
- size_t ret = iconv(converter->cd, &input_buffer, &input_length, &output_buffer, &output_length);
- while (output_length-- > 0) {
- (*o_putc)(output_buffer[converter->output_buffer_size-output_length]);
- }
- if (ret == (size_t) - 1) {
- switch (errno) {
- case EINVAL:
- if (input_buffer != converter->input_buffer)
- memmove(converter->input_buffer, input_buffer, input_length);
- break;
- case E2BIG:
- converter->output_buffer_size *= 2;
- output_buffer = realloc(converter->outbuf, converter->output_buffer_size);
- if (output_buffer == NULL) {
- perror("can't realloc");
- return -1;
- }
- converter->output_buffer = output_buffer;
- break;
- default:
- perror("can't iconv");
- return -1;
- }
- } else {
- invalid += ret;
- }
- } while (1);
-
- return invalid;
-}
-
-
-static void
-nkf_iconv_close(nkf_iconv_t *convert)
-{
- nkf_xfree(converter->inbuf);
- nkf_xfree(converter->outbuf);
- iconv_close(converter->cd);
-}
-#endif
-
-static void
-reinit(void)
+#if defined(PERL_XS) || defined(WIN32DLL)
+void reinit(void)
{
{
- struct input_code *p = input_code_list;
- while (p->name){
- status_reinit(p++);
- }
+ struct input_code *p = input_code_list;
+ while (p->name){
+ status_reinit(p++);
+ }
}
unbuf_f = FALSE;
estab_f = FALSE;
@@ -5121,14 +5799,19 @@ reinit(void)
binmode_f = TRUE;
rot_f = FALSE;
hira_f = FALSE;
+ input_f = FALSE;
alpha_f = FALSE;
- mime_f = MIME_DECODE_DEFAULT;
+ mime_f = STRICT_MIME;
mime_decode_f = FALSE;
mimebuf_f = FALSE;
broken_f = FALSE;
iso8859_f = FALSE;
mimeout_f = FALSE;
- x0201_f = X0201_DEFAULT;
+#if defined(MSDOS) || defined(__OS2__)
+ x0201_f = TRUE;
+#else
+ x0201_f = NO_X0201;
+#endif
iso2022jp_f = FALSE;
#if defined(UTF8_INPUT_ENABLE) || defined(UTF8_OUTPUT_ENABLE)
ms_ucs_map_f = UCS_MAP_ASCII;
@@ -5156,7 +5839,9 @@ reinit(void)
noout_f = FALSE;
debug_f = FALSE;
#endif
- guess_f = 0;
+ guess_f = FALSE;
+ is_inputcode_mixed = FALSE;
+ is_inputcode_set = FALSE;
#ifdef EXEC_IO
exec_f = 0;
#endif
@@ -5169,13 +5854,13 @@ reinit(void)
x0213_f = FALSE;
#endif
{
- int i;
- for (i = 0; i < 256; i++){
- prefix_table[i] = 0;
- }
+ int i;
+ for (i = 0; i < 256; i++){
+ prefix_table[i] = 0;
+ }
}
hold_count = 0;
- mimeout_state.count = 0;
+ mimeout_buf_count = 0;
mimeout_mode = 0;
base64_count = 0;
f_line = 0;
@@ -5186,9 +5871,11 @@ reinit(void)
kanji_intro = DEFAULT_J;
ascii_intro = DEFAULT_R;
fold_margin = FOLD_MARGIN;
+ output_conv = DEFAULT_CONV;
+ oconv = DEFAULT_CONV;
o_zconv = no_connection;
o_fconv = no_connection;
- o_eol_conv = no_connection;
+ o_crconv = no_connection;
o_rot_conv = no_connection;
o_hira_conv = no_connection;
o_base64conv = no_connection;
@@ -5205,1435 +5892,149 @@ reinit(void)
i_mungetc_buf = std_ungetc;
output_mode = ASCII;
input_mode = ASCII;
+ shift_mode = FALSE;
mime_decode_mode = FALSE;
file_out_f = FALSE;
- eolmode_f = 0;
- input_eol = 0;
- prev_cr = 0;
+ crmode_f = 0;
option_mode = 0;
+ broken_counter = 0;
+ broken_last = 0;
z_prev2=0,z_prev1=0;
#ifdef CHECK_OPTION
iconv_for_check = 0;
#endif
- input_codename = NULL;
- input_encoding = NULL;
- output_encoding = NULL;
- nkf_state_init();
+ input_codename = "";
#ifdef WIN32DLL
reinitdll();
#endif /*WIN32DLL*/
}
-
-static int
-module_connection(void)
-{
- if (input_encoding) set_input_encoding(input_encoding);
- if (!output_encoding) {
- output_encoding = nkf_default_encoding();
- }
- if (!output_encoding) {
- if (noout_f || guess_f) output_encoding = nkf_enc_from_index(ISO_2022_JP);
- else return -1;
- }
- set_output_encoding(output_encoding);
- oconv = nkf_enc_to_oconv(output_encoding);
- o_putc = std_putc;
-
- /* replace continucation module, from output side */
-
- /* output redicrection */
-#ifdef CHECK_OPTION
- if (noout_f || guess_f){
- o_putc = no_putc;
- }
-#endif
- if (mimeout_f) {
- o_mputc = o_putc;
- o_putc = mime_putc;
- if (mimeout_f == TRUE) {
- o_base64conv = oconv; oconv = base64_conv;
- }
- /* base64_count = 0; */
- }
-
- if (eolmode_f || guess_f) {
- o_eol_conv = oconv; oconv = eol_conv;
- }
- if (rot_f) {
- o_rot_conv = oconv; oconv = rot_conv;
- }
- if (iso2022jp_f) {
- o_iso2022jp_check_conv = oconv; oconv = iso2022jp_check_conv;
- }
- if (hira_f) {
- o_hira_conv = oconv; oconv = hira_conv;
- }
- if (fold_f) {
- o_fconv = oconv; oconv = fold_conv;
- f_line = 0;
- }
- if (alpha_f || x0201_f) {
- o_zconv = oconv; oconv = z_conv;
- }
-
- i_getc = std_getc;
- i_ungetc = std_ungetc;
- /* input redicrection */
-#ifdef INPUT_OPTION
- if (cap_f){
- i_cgetc = i_getc; i_getc = cap_getc;
- i_cungetc = i_ungetc; i_ungetc= cap_ungetc;
- }
- if (url_f){
- i_ugetc = i_getc; i_getc = url_getc;
- i_uungetc = i_ungetc; i_ungetc= url_ungetc;
- }
#endif
-#ifdef NUMCHAR_OPTION
- if (numchar_f){
- i_ngetc = i_getc; i_getc = numchar_getc;
- i_nungetc = i_ungetc; i_ungetc= numchar_ungetc;
- }
-#endif
-#ifdef UNICODE_NORMALIZATION
- if (nfc_f){
- i_nfc_getc = i_getc; i_getc = nfc_getc;
- i_nfc_ungetc = i_ungetc; i_ungetc= nfc_ungetc;
- }
-#endif
- if (mime_f && mimebuf_f==FIXED_MIME) {
- i_mgetc = i_getc; i_getc = mime_getc;
- i_mungetc = i_ungetc; i_ungetc = mime_ungetc;
- }
- if (broken_f & 1) {
- i_bgetc = i_getc; i_getc = broken_getc;
- i_bungetc = i_ungetc; i_ungetc = broken_ungetc;
- }
- if (input_encoding) {
- set_iconv(-TRUE, nkf_enc_to_iconv(input_encoding));
- } else {
- set_iconv(FALSE, e_iconv);
- }
-
- {
- struct input_code *p = input_code_list;
- while (p->name){
- status_reinit(p++);
- }
- }
- return 0;
-}
-
-/*
- Conversion main loop. Code detection only.
- */
-#if !defined(PERL_XS) && !defined(WIN32DLL)
-static nkf_char
-noconvert(FILE *f)
+void no_connection(nkf_char c2, nkf_char c1)
{
- nkf_char c;
-
- if (nop_f == 2)
- module_connection();
- while ((c = (*i_getc)(f)) != EOF)
- (*o_putc)(c);
- (*o_putc)(EOF);
- return 1;
+ no_connection2(c2,c1,0);
}
-#endif
-#define NEXT continue /* no output, get next */
-#define SKIP c2=0;continue /* no output, get next */
-#define MORE c2=c1;continue /* need one more byte */
-#define SEND ; /* output c1 and c2, get next */
-#define LAST break /* end of loop, go closing */
-#define set_input_mode(mode) do { \
- input_mode = mode; \
- shift_mode = 0; \
- set_input_codename("ISO-2022-JP"); \
- debug("ISO-2022-JP"); \
-} while (0)
-
-static int
-kanji_convert(FILE *f)
+nkf_char no_connection2(nkf_char c2, nkf_char c1, nkf_char c0)
{
- nkf_char c1=0, c2=0, c3=0, c4=0;
- int shift_mode = 0; /* 0, 1, 2, 3 */
- int g2 = 0;
- int is_8bit = FALSE;
-
- if (input_encoding && !nkf_enc_asciicompat(input_encoding)) {
- is_8bit = TRUE;
- }
-
- input_mode = ASCII;
- output_mode = ASCII;
-
- if (module_connection() < 0) {
-#if !defined(PERL_XS) && !defined(WIN32DLL)
- fprintf(stderr, "no output encoding given\n");
-#endif
- return -1;
- }
- check_bom(f);
-
-#ifdef UTF8_INPUT_ENABLE
- if(iconv == w_iconv32){
- while ((c1 = (*i_getc)(f)) != EOF &&
- (c2 = (*i_getc)(f)) != EOF &&
- (c3 = (*i_getc)(f)) != EOF &&
- (c4 = (*i_getc)(f)) != EOF) {
- nkf_iconv_utf_32(c1, c2, c3, c4);
- }
- (*i_ungetc)(EOF, f);
- }
- else if (iconv == w_iconv16) {
- while ((c1 = (*i_getc)(f)) != EOF &&
- (c2 = (*i_getc)(f)) != EOF) {
- if (nkf_iconv_utf_16(c1, c2, 0, 0) == -2 &&
- (c3 = (*i_getc)(f)) != EOF &&
- (c4 = (*i_getc)(f)) != EOF) {
- nkf_iconv_utf_16(c1, c2, c3, c4);
- }
- }
- (*i_ungetc)(EOF, f);
- }
-#endif
-
- while ((c1 = (*i_getc)(f)) != EOF) {
-#ifdef INPUT_CODE_FIX
- if (!input_encoding)
-#endif
- code_status(c1);
- if (c2) {
- /* second byte */
- if (c2 > DEL) {
- /* in case of 8th bit is on */
- if (!estab_f&&!mime_decode_mode) {
- /* in case of not established yet */
- /* It is still ambiguious */
- if (h_conv(f, c2, c1)==EOF) {
- LAST;
- }
- else {
- SKIP;
- }
- }
- else {
- /* in case of already established */
- if (c1 < 0x40) {
- /* ignore bogus code */
- SKIP;
- } else {
- SEND;
- }
- }
- }
- else {
- /* 2nd byte of 7 bit code or SJIS */
- SEND;
- }
- }
- else if (nkf_char_unicode_p(c1)) {
- (*oconv)(0, c1);
- NEXT;
- }
- else {
- /* first byte */
- if (input_mode == JIS_X_0208 && DEL <= c1 && c1 < 0x92) {
- /* CP5022x */
- MORE;
- } else if (c1 > DEL) {
- /* 8 bit code */
- if (!estab_f && !iso8859_f) {
- /* not established yet */
- MORE;
- } else { /* estab_f==TRUE */
- if (iso8859_f) {
- c2 = ISO_8859_1;
- c1 &= 0x7f;
- SEND;
- }
- else if ((iconv == s_iconv && 0xA0 <= c1 && c1 <= 0xDF) ||
- (ms_ucs_map_f == UCS_MAP_CP10001 && (c1 == 0xFD || c1 == 0xFE))) {
- /* JIS X 0201 */
- c2 = JIS_X_0201_1976_K;
- c1 &= 0x7f;
- SEND;
- }
- else {
- /* already established */
- MORE;
- }
- }
- } else if (SP < c1 && c1 < DEL) {
- /* in case of Roman characters */
- if (shift_mode) {
- /* output 1 shifted byte */
- if (iso8859_f) {
- c2 = ISO_8859_1;
- SEND;
- } else if (nkf_byte_jisx0201_katakana_p(c1)){
- /* output 1 shifted byte */
- c2 = JIS_X_0201_1976_K;
- SEND;
- } else {
- /* look like bogus code */
- SKIP;
- }
- } else if (input_mode == JIS_X_0208 || input_mode == JIS_X_0212 ||
- input_mode == JIS_X_0213_1 || input_mode == JIS_X_0213_2) {
- /* in case of Kanji shifted */
- MORE;
- } else if (c1 == '=' && mime_f && !mime_decode_mode) {
- /* Check MIME code */
- if ((c1 = (*i_getc)(f)) == EOF) {
- (*oconv)(0, '=');
- LAST;
- } else if (c1 == '?') {
- /* =? is mime conversion start sequence */
- if(mime_f == STRICT_MIME) {
- /* check in real detail */
- if (mime_begin_strict(f) == EOF)
- LAST;
- SKIP;
- } else if (mime_begin(f) == EOF)
- LAST;
- SKIP;
- } else {
- (*oconv)(0, '=');
- (*i_ungetc)(c1,f);
- SKIP;
- }
- } else {
- /* normal ASCII code */
- SEND;
- }
- } else if (c1 == SI && (!is_8bit || mime_decode_mode)) {
- shift_mode = 0;
- SKIP;
- } else if (c1 == SO && (!is_8bit || mime_decode_mode)) {
- shift_mode = 1;
- SKIP;
- } else if (c1 == ESC && (!is_8bit || mime_decode_mode)) {
- if ((c1 = (*i_getc)(f)) == EOF) {
- /* (*oconv)(0, ESC); don't send bogus code */
- LAST;
- }
- else if (c1 == '&') {
- /* IRR */
- if ((c1 = (*i_getc)(f)) == EOF) {
- LAST;
- } else {
- SKIP;
- }
- }
- else if (c1 == '$') {
- /* GZDMx */
- if ((c1 = (*i_getc)(f)) == EOF) {
- /* don't send bogus code
- (*oconv)(0, ESC);
- (*oconv)(0, '$'); */
- LAST;
- } else if (c1 == '@' || c1 == 'B') {
- /* JIS X 0208 */
- set_input_mode(JIS_X_0208);
- SKIP;
- } else if (c1 == '(') {
- /* GZDM4 */
- if ((c1 = (*i_getc)(f)) == EOF) {
- /* don't send bogus code
- (*oconv)(0, ESC);
- (*oconv)(0, '$');
- (*oconv)(0, '(');
- */
- LAST;
- } else if (c1 == '@'|| c1 == 'B') {
- /* JIS X 0208 */
- set_input_mode(JIS_X_0208);
- SKIP;
-#ifdef X0212_ENABLE
- } else if (c1 == 'D'){
- set_input_mode(JIS_X_0212);
- SKIP;
-#endif /* X0212_ENABLE */
- } else if (c1 == 'O' || c1 == 'Q'){
- set_input_mode(JIS_X_0213_1);
- SKIP;
- } else if (c1 == 'P'){
- set_input_mode(JIS_X_0213_2);
- SKIP;
- } else {
- /* could be some special code */
- (*oconv)(0, ESC);
- (*oconv)(0, '$');
- (*oconv)(0, '(');
- (*oconv)(0, c1);
- SKIP;
- }
- } else if (broken_f&0x2) {
- /* accept any ESC-(-x as broken code ... */
- input_mode = JIS_X_0208;
- shift_mode = 0;
- SKIP;
- } else {
- (*oconv)(0, ESC);
- (*oconv)(0, '$');
- (*oconv)(0, c1);
- SKIP;
- }
- } else if (c1 == '(') {
- /* GZD4 */
- if ((c1 = (*i_getc)(f)) == EOF) {
- /* don't send bogus code
- (*oconv)(0, ESC);
- (*oconv)(0, '('); */
- LAST;
- }
- else if (c1 == 'I') {
- /* JIS X 0201 Katakana */
- set_input_mode(JIS_X_0201_1976_K);
- SKIP;
- }
- else if (c1 == 'B' || c1 == 'J' || c1 == 'H') {
- /* ISO-646IRV:1983 or JIS X 0201 Roman or JUNET */
- set_input_mode(ASCII);
- SKIP;
- }
- else if (broken_f&0x2) {
- set_input_mode(ASCII);
- SKIP;
- }
- else {
- (*oconv)(0, ESC);
- (*oconv)(0, '(');
- SEND;
- }
- }
- else if (c1 == '.') {
- /* G2D6 */
- if ((c1 = (*i_getc)(f)) == EOF) {
- LAST;
- }
- else if (c1 == 'A') {
- /* ISO-8859-1 */
- g2 = ISO_8859_1;
- SKIP;
- }
- else {
- (*oconv)(0, ESC);
- (*oconv)(0, '.');
- SEND;
- }
- }
- else if (c1 == 'N') {
- /* SS2 */
- c1 = (*i_getc)(f);
- if (g2 == ISO_8859_1) {
- c2 = ISO_8859_1;
- SEND;
- }else{
- (*i_ungetc)(c1, f);
- /* lonely ESC */
- (*oconv)(0, ESC);
- SEND;
- }
- }
- else {
- /* lonely ESC */
- (*oconv)(0, ESC);
- SEND;
- }
- } else if (c1 == ESC && iconv == s_iconv) {
- /* ESC in Shift_JIS */
- if ((c1 = (*i_getc)(f)) == EOF) {
- /* (*oconv)(0, ESC); don't send bogus code */
- LAST;
- } else if (c1 == '$') {
- /* J-PHONE emoji */
- if ((c1 = (*i_getc)(f)) == EOF) {
- LAST;
- } else if (('E' <= c1 && c1 <= 'G') ||
- ('O' <= c1 && c1 <= 'Q')) {
- /*
- NUM : 0 1 2 3 4 5
- BYTE: G E F O P Q
- C%7 : 1 6 0 2 3 4
- C%7 : 0 1 2 3 4 5 6
- NUM : 2 0 3 4 5 X 1
- */
- static const nkf_char jphone_emoji_first_table[7] =
- {0xE1E0, 0xDFE0, 0xE2E0, 0xE3E0, 0xE4E0, 0xDFE0, 0xE0E0};
- c3 = nkf_char_unicode_new(jphone_emoji_first_table[c1 % 7]);
- if ((c1 = (*i_getc)(f)) == EOF) LAST;
- while (SP <= c1 && c1 <= 'z') {
- (*oconv)(0, c1 + c3);
- if ((c1 = (*i_getc)(f)) == EOF) LAST;
- }
- SKIP;
- }
- else {
- (*oconv)(0, ESC);
- (*oconv)(0, '$');
- SEND;
- }
- }
- else {
- /* lonely ESC */
- (*oconv)(0, ESC);
- SEND;
- }
- } else if (c1 == LF || c1 == CR) {
- if (broken_f&4) {
- input_mode = ASCII; set_iconv(FALSE, 0);
- SEND;
- } else if (mime_decode_f && !mime_decode_mode){
- if (c1 == LF) {
- if ((c1=(*i_getc)(f))!=EOF && c1 == SP) {
- i_ungetc(SP,f);
- continue;
- } else {
- i_ungetc(c1,f);
- }
- c1 = LF;
- SEND;
- } else { /* if (c1 == CR)*/
- if ((c1=(*i_getc)(f))!=EOF) {
- if (c1==SP) {
- i_ungetc(SP,f);
- continue;
- } else if (c1 == LF && (c1=(*i_getc)(f))!=EOF && c1 == SP) {
- i_ungetc(SP,f);
- continue;
- } else {
- i_ungetc(c1,f);
- }
- i_ungetc(LF,f);
- } else {
- i_ungetc(c1,f);
- }
- c1 = CR;
- SEND;
- }
- }
- } else
- SEND;
- }
- /* send: */
- switch(input_mode){
- case ASCII:
- switch ((*iconv)(c2, c1, 0)) { /* can be EUC / SJIS / UTF-8 */
- case -2:
- /* 4 bytes UTF-8 */
- if ((c3 = (*i_getc)(f)) != EOF) {
- code_status(c3);
- c3 <<= 8;
- if ((c4 = (*i_getc)(f)) != EOF) {
- code_status(c4);
- (*iconv)(c2, c1, c3|c4);
- }
- }
- break;
- case -1:
- /* 3 bytes EUC or UTF-8 */
- if ((c3 = (*i_getc)(f)) != EOF) {
- code_status(c3);
- (*iconv)(c2, c1, c3);
- }
- break;
- }
- break;
- case JIS_X_0208:
- case JIS_X_0213_1:
- if (ms_ucs_map_f &&
- 0x7F <= c2 && c2 <= 0x92 &&
- 0x21 <= c1 && c1 <= 0x7E) {
- /* CP932 UDC */
- c1 = nkf_char_unicode_new((c2 - 0x7F) * 94 + c1 - 0x21 + 0xE000);
- c2 = 0;
- }
- (*oconv)(c2, c1); /* this is JIS, not SJIS/EUC case */
- break;
-#ifdef X0212_ENABLE
- case JIS_X_0212:
- (*oconv)(PREFIX_EUCG3 | c2, c1);
- break;
-#endif /* X0212_ENABLE */
- case JIS_X_0213_2:
- (*oconv)(PREFIX_EUCG3 | c2, c1);
- break;
- default:
- (*oconv)(input_mode, c1); /* other special case */
- }
-
- c2 = 0;
- c3 = 0;
- continue;
- /* goto next_word */
- }
-
- /* epilogue */
- (*iconv)(EOF, 0, 0);
- if (!input_codename)
- {
- if (is_8bit) {
- struct input_code *p = input_code_list;
- struct input_code *result = p;
- while (p->name){
- if (p->score < result->score) result = p;
- ++p;
- }
- set_input_codename(result->name);
-#ifdef CHECK_OPTION
- debug(result->name);
-#endif
- }
- }
- return 0;
+ fprintf(stderr,"nkf internal module connection failure.\n");
+ exit(1);
+ return 0; /* LINT */
}
-/*
- * int options(unsigned char *cp)
- *
- * return values:
- * 0: success
- * -1: ArgumentError
- */
-static int
-options(unsigned char *cp)
-{
- nkf_char i, j;
- unsigned char *p;
- unsigned char *cp_back = NULL;
- nkf_encoding *enc;
-
- if (option_mode==1)
- return 0;
- while(*cp && *cp++!='-');
- while (*cp || cp_back) {
- if(!*cp){
- cp = cp_back;
- cp_back = NULL;
- continue;
- }
- p = 0;
- switch (*cp++) {
- case '-': /* literal options */
- if (!*cp || *cp == SP) { /* ignore the rest of arguments */
- option_mode = 1;
- return 0;
- }
- for (i=0;i<sizeof(long_option)/sizeof(long_option[0]);i++) {
- p = (unsigned char *)long_option[i].name;
- for (j=0;*p && *p != '=' && *p == cp[j];p++, j++);
- if (*p == cp[j] || cp[j] == SP){
- p = &cp[j] + 1;
- break;
- }
- p = 0;
- }
- if (p == 0) {
-#if !defined(PERL_XS) && !defined(WIN32DLL)
- fprintf(stderr, "unknown long option: --%s\n", cp);
-#endif
- return -1;
- }
- while(*cp && *cp != SP && cp++);
- if (long_option[i].alias[0]){
- cp_back = cp;
- cp = (unsigned char *)long_option[i].alias;
- }else{
#ifndef PERL_XS
- if (strcmp(long_option[i].name, "help") == 0){
- usage();
- exit(EXIT_SUCCESS);
- }
-#endif
- if (strcmp(long_option[i].name, "ic=") == 0){
- enc = nkf_enc_find((char *)p);
- if (!enc) continue;
- input_encoding = enc;
- continue;
- }
- if (strcmp(long_option[i].name, "oc=") == 0){
- enc = nkf_enc_find((char *)p);
- /* if (enc <= 0) continue; */
- if (!enc) continue;
- output_encoding = enc;
- continue;
- }
- if (strcmp(long_option[i].name, "guess=") == 0){
- if (p[0] == '0' || p[0] == '1') {
- guess_f = 1;
- } else {
- guess_f = 2;
- }
- continue;
- }
-#ifdef OVERWRITE
- if (strcmp(long_option[i].name, "overwrite") == 0){
- file_out_f = TRUE;
- overwrite_f = TRUE;
- preserve_time_f = TRUE;
- continue;
- }
- if (strcmp(long_option[i].name, "overwrite=") == 0){
- file_out_f = TRUE;
- overwrite_f = TRUE;
- preserve_time_f = TRUE;
- backup_f = TRUE;
- backup_suffix = (char *)p;
- continue;
- }
- if (strcmp(long_option[i].name, "in-place") == 0){
- file_out_f = TRUE;
- overwrite_f = TRUE;
- preserve_time_f = FALSE;
- continue;
- }
- if (strcmp(long_option[i].name, "in-place=") == 0){
- file_out_f = TRUE;
- overwrite_f = TRUE;
- preserve_time_f = FALSE;
- backup_f = TRUE;
- backup_suffix = (char *)p;
- continue;
- }
-#endif
-#ifdef INPUT_OPTION
- if (strcmp(long_option[i].name, "cap-input") == 0){
- cap_f = TRUE;
- continue;
- }
- if (strcmp(long_option[i].name, "url-input") == 0){
- url_f = TRUE;
- continue;
- }
-#endif
-#ifdef NUMCHAR_OPTION
- if (strcmp(long_option[i].name, "numchar-input") == 0){
- numchar_f = TRUE;
- continue;
- }
-#endif
-#ifdef CHECK_OPTION
- if (strcmp(long_option[i].name, "no-output") == 0){
- noout_f = TRUE;
- continue;
- }
- if (strcmp(long_option[i].name, "debug") == 0){
- debug_f = TRUE;
- continue;
- }
-#endif
- if (strcmp(long_option[i].name, "cp932") == 0){
-#ifdef SHIFTJIS_CP932
- cp51932_f = TRUE;
- cp932inv_f = -TRUE;
-#endif
-#ifdef UTF8_OUTPUT_ENABLE
- ms_ucs_map_f = UCS_MAP_CP932;
-#endif
- continue;
- }
- if (strcmp(long_option[i].name, "no-cp932") == 0){
-#ifdef SHIFTJIS_CP932
- cp51932_f = FALSE;
- cp932inv_f = FALSE;
-#endif
-#ifdef UTF8_OUTPUT_ENABLE
- ms_ucs_map_f = UCS_MAP_ASCII;
-#endif
- continue;
- }
-#ifdef SHIFTJIS_CP932
- if (strcmp(long_option[i].name, "cp932inv") == 0){
- cp932inv_f = -TRUE;
- continue;
- }
-#endif
-
-#ifdef X0212_ENABLE
- if (strcmp(long_option[i].name, "x0212") == 0){
- x0212_f = TRUE;
- continue;
- }
-#endif
-
-#ifdef EXEC_IO
- if (strcmp(long_option[i].name, "exec-in") == 0){
- exec_f = 1;
- return 0;
- }
- if (strcmp(long_option[i].name, "exec-out") == 0){
- exec_f = -1;
- return 0;
- }
-#endif
-#if defined(UTF8_OUTPUT_ENABLE) && defined(UTF8_INPUT_ENABLE)
- if (strcmp(long_option[i].name, "no-cp932ext") == 0){
- no_cp932ext_f = TRUE;
- continue;
- }
- if (strcmp(long_option[i].name, "no-best-fit-chars") == 0){
- no_best_fit_chars_f = TRUE;
- continue;
- }
- if (strcmp(long_option[i].name, "fb-skip") == 0){
- encode_fallback = NULL;
- continue;
- }
- if (strcmp(long_option[i].name, "fb-html") == 0){
- encode_fallback = encode_fallback_html;
- continue;
- }
- if (strcmp(long_option[i].name, "fb-xml") == 0){
- encode_fallback = encode_fallback_xml;
- continue;
- }
- if (strcmp(long_option[i].name, "fb-java") == 0){
- encode_fallback = encode_fallback_java;
- continue;
- }
- if (strcmp(long_option[i].name, "fb-perl") == 0){
- encode_fallback = encode_fallback_perl;
- continue;
- }
- if (strcmp(long_option[i].name, "fb-subchar") == 0){
- encode_fallback = encode_fallback_subchar;
- continue;
- }
- if (strcmp(long_option[i].name, "fb-subchar=") == 0){
- encode_fallback = encode_fallback_subchar;
- unicode_subchar = 0;
- if (p[0] != '0'){
- /* decimal number */
- for (i = 0; i < 7 && nkf_isdigit(p[i]); i++){
- unicode_subchar *= 10;
- unicode_subchar += hex2bin(p[i]);
- }
- }else if(p[1] == 'x' || p[1] == 'X'){
- /* hexadecimal number */
- for (i = 2; i < 8 && nkf_isxdigit(p[i]); i++){
- unicode_subchar <<= 4;
- unicode_subchar |= hex2bin(p[i]);
- }
- }else{
- /* octal number */
- for (i = 1; i < 8 && nkf_isoctal(p[i]); i++){
- unicode_subchar *= 8;
- unicode_subchar += hex2bin(p[i]);
- }
- }
- w16e_conv(unicode_subchar, &i, &j);
- unicode_subchar = i<<8 | j;
- continue;
- }
+#ifdef WIN32DLL
+#define fprintf dllprintf
#endif
-#ifdef UTF8_OUTPUT_ENABLE
- if (strcmp(long_option[i].name, "ms-ucs-map") == 0){
- ms_ucs_map_f = UCS_MAP_MS;
- continue;
- }
+void usage(void)
+{
+ fprintf(stderr,"USAGE: nkf(nkf32,wnkf,nkf2) -[flags] [in file] .. [out file for -O flag]\n");
+ fprintf(stderr,"Flags:\n");
+ fprintf(stderr,"b,u Output is buffered (DEFAULT),Output is unbuffered\n");
+#ifdef DEFAULT_CODE_SJIS
+ fprintf(stderr,"j,s,e,w Output code is JIS 7 bit, Shift_JIS (DEFAULT), EUC-JP, UTF-8N\n");
#endif
-#ifdef UNICODE_NORMALIZATION
- if (strcmp(long_option[i].name, "utf8mac-input") == 0){
- nfc_f = TRUE;
- continue;
- }
+#ifdef DEFAULT_CODE_JIS
+ fprintf(stderr,"j,s,e,w Output code is JIS 7 bit (DEFAULT), Shift JIS, EUC-JP, UTF-8N\n");
#endif
- if (strcmp(long_option[i].name, "prefix=") == 0){
- if (nkf_isgraph(p[0])){
- for (i = 1; nkf_isgraph(p[i]); i++){
- prefix_table[p[i]] = p[0];
- }
- }
- continue;
- }
-#if !defined(PERL_XS) && !defined(WIN32DLL)
- fprintf(stderr, "unsupported long option: --%s\n", long_option[i].name);
+#ifdef DEFAULT_CODE_EUC
+ fprintf(stderr,"j,s,e,w Output code is JIS 7 bit, Shift JIS, EUC-JP (DEFAULT), UTF-8N\n");
#endif
- return -1;
- }
- continue;
- case 'b': /* buffered mode */
- unbuf_f = FALSE;
- continue;
- case 'u': /* non bufferd mode */
- unbuf_f = TRUE;
- continue;
- case 't': /* transparent mode */
- if (*cp=='1') {
- /* alias of -t */
- cp++;
- nop_f = TRUE;
- } else if (*cp=='2') {
- /*
- * -t with put/get
- *
- * nkf -t2MB hoge.bin | nkf -t2mB | diff -s - hoge.bin
- *
- */
- cp++;
- nop_f = 2;
- } else
- nop_f = TRUE;
- continue;
- case 'j': /* JIS output */
- case 'n':
- output_encoding = nkf_enc_from_index(ISO_2022_JP);
- continue;
- case 'e': /* AT&T EUC output */
- output_encoding = nkf_enc_from_index(EUCJP_NKF);
- continue;
- case 's': /* SJIS output */
- output_encoding = nkf_enc_from_index(SHIFT_JIS);
- continue;
- case 'l': /* ISO8859 Latin-1 support, no conversion */
- iso8859_f = TRUE; /* Only compatible with ISO-2022-JP */
- input_encoding = nkf_enc_from_index(ISO_8859_1);
- continue;
- case 'i': /* Kanji IN ESC-$-@/B */
- if (*cp=='@'||*cp=='B')
- kanji_intro = *cp++;
- continue;
- case 'o': /* ASCII IN ESC-(-J/B/H */
- /* ESC ( H was used in initial JUNET messages */
- if (*cp=='J'||*cp=='B'||*cp=='H')
- ascii_intro = *cp++;
- continue;
- case 'h':
- /*
- bit:1 katakana->hiragana
- bit:2 hiragana->katakana
- */
- if ('9'>= *cp && *cp>='0')
- hira_f |= (*cp++ -'0');
- else
- hira_f |= 1;
- continue;
- case 'r':
- rot_f = TRUE;
- continue;
-#if defined(MSDOS) || defined(__OS2__)
- case 'T':
- binmode_f = FALSE;
- continue;
-#endif
-#ifndef PERL_XS
- case 'V':
- show_configuration();
- exit(EXIT_SUCCESS);
- break;
- case 'v':
- version();
- exit(EXIT_SUCCESS);
- break;
+#ifdef DEFAULT_CODE_UTF8
+ fprintf(stderr,"j,s,e,w Output code is JIS 7 bit, Shift JIS, EUC-JP, UTF-8N (DEFAULT)\n");
#endif
#ifdef UTF8_OUTPUT_ENABLE
- case 'w': /* UTF-8 output */
- if (cp[0] == '8') {
- cp++;
- if (cp[0] == '0'){
- cp++;
- output_encoding = nkf_enc_from_index(UTF_8N);
- } else {
- output_bom_f = TRUE;
- output_encoding = nkf_enc_from_index(UTF_8_BOM);
- }
- } else {
- int enc_idx;
- if ('1'== cp[0] && '6'==cp[1]) {
- cp += 2;
- enc_idx = UTF_16;
- } else if ('3'== cp[0] && '2'==cp[1]) {
- cp += 2;
- enc_idx = UTF_32;
- } else {
- output_encoding = nkf_enc_from_index(UTF_8);
- continue;
- }
- if (cp[0]=='L') {
- cp++;
- output_endian = ENDIAN_LITTLE;
- } else if (cp[0] == 'B') {
- cp++;
- } else {
- output_encoding = nkf_enc_from_index(enc_idx);
- continue;
- }
- if (cp[0] == '0'){
- cp++;
- enc_idx = enc_idx == UTF_16
- ? (output_endian == ENDIAN_LITTLE ? UTF_16LE : UTF_16BE)
- : (output_endian == ENDIAN_LITTLE ? UTF_32LE : UTF_32BE);
- } else {
- output_bom_f = TRUE;
- enc_idx = enc_idx == UTF_16
- ? (output_endian == ENDIAN_LITTLE ? UTF_16LE_BOM : UTF_16BE_BOM)
- : (output_endian == ENDIAN_LITTLE ? UTF_32LE_BOM : UTF_32BE_BOM);
- }
- output_encoding = nkf_enc_from_index(enc_idx);
- }
- continue;
+ fprintf(stderr," After 'w' you can add more options. -w[ 8 [0], 16 [[BL] [0]] ]\n");
#endif
+ fprintf(stderr,"J,S,E,W Input assumption is JIS 7 bit , Shift JIS, EUC-JP, UTF-8\n");
#ifdef UTF8_INPUT_ENABLE
- case 'W': /* UTF input */
- if (cp[0] == '8') {
- cp++;
- input_encoding = nkf_enc_from_index(UTF_8);
- }else{
- int enc_idx;
- if ('1'== cp[0] && '6'==cp[1]) {
- cp += 2;
- input_endian = ENDIAN_BIG;
- enc_idx = UTF_16;
- } else if ('3'== cp[0] && '2'==cp[1]) {
- cp += 2;
- input_endian = ENDIAN_BIG;
- enc_idx = UTF_32;
- } else {
- input_encoding = nkf_enc_from_index(UTF_8);
- continue;
- }
- if (cp[0]=='L') {
- cp++;
- input_endian = ENDIAN_LITTLE;
- } else if (cp[0] == 'B') {
- cp++;
- input_endian = ENDIAN_BIG;
- }
- enc_idx = (enc_idx == UTF_16
- ? (input_endian == ENDIAN_LITTLE ? UTF_16LE : UTF_16BE)
- : (input_endian == ENDIAN_LITTLE ? UTF_32LE : UTF_32BE));
- input_encoding = nkf_enc_from_index(enc_idx);
- }
- continue;
-#endif
- /* Input code assumption */
- case 'J': /* ISO-2022-JP input */
- input_encoding = nkf_enc_from_index(ISO_2022_JP);
- continue;
- case 'E': /* EUC-JP input */
- input_encoding = nkf_enc_from_index(EUCJP_NKF);
- continue;
- case 'S': /* Shift_JIS input */
- input_encoding = nkf_enc_from_index(SHIFT_JIS);
- continue;
- case 'Z': /* Convert X0208 alphabet to asii */
- /* alpha_f
- bit:0 Convert JIS X 0208 Alphabet to ASCII
- bit:1 Convert Kankaku to one space
- bit:2 Convert Kankaku to two spaces
- bit:3 Convert HTML Entity
- bit:4 Convert JIS X 0208 Katakana to JIS X 0201 Katakana
- */
- while ('0'<= *cp && *cp <='9') {
- alpha_f |= 1 << (*cp++ - '0');
- }
- if (!alpha_f) alpha_f = 1;
- continue;
- case 'x': /* Convert X0201 kana to X0208 or X0201 Conversion */
- x0201_f = FALSE; /* No X0201->X0208 conversion */
- /* accept X0201
- ESC-(-I in JIS, EUC, MS Kanji
- SI/SO in JIS, EUC, MS Kanji
- SS2 in EUC, JIS, not in MS Kanji
- MS Kanji (0xa0-0xdf)
- output X0201
- ESC-(-I in JIS (0x20-0x5f)
- SS2 in EUC (0xa0-0xdf)
- 0xa0-0xd in MS Kanji (0xa0-0xdf)
- */
- continue;
- case 'X': /* Convert X0201 kana to X0208 */
- x0201_f = TRUE;
- continue;
- case 'F': /* prserve new lines */
- fold_preserve_f = TRUE;
- case 'f': /* folding -f60 or -f */
- fold_f = TRUE;
- fold_len = 0;
- while('0'<= *cp && *cp <='9') { /* we don't use atoi here */
- fold_len *= 10;
- fold_len += *cp++ - '0';
- }
- if (!(0<fold_len && fold_len<BUFSIZ))
- fold_len = DEFAULT_FOLD;
- if (*cp=='-') {
- fold_margin = 0;
- cp++;
- while('0'<= *cp && *cp <='9') { /* we don't use atoi here */
- fold_margin *= 10;
- fold_margin += *cp++ - '0';
- }
- }
- continue;
- case 'm': /* MIME support */
- /* mime_decode_f = TRUE; */ /* this has too large side effects... */
- if (*cp=='B'||*cp=='Q') {
- mime_decode_mode = *cp++;
- mimebuf_f = FIXED_MIME;
- } else if (*cp=='N') {
- mime_f = TRUE; cp++;
- } else if (*cp=='S') {
- mime_f = STRICT_MIME; cp++;
- } else if (*cp=='0') {
- mime_decode_f = FALSE;
- mime_f = FALSE; cp++;
- } else {
- mime_f = STRICT_MIME;
- }
- continue;
- case 'M': /* MIME output */
- if (*cp=='B') {
- mimeout_mode = 'B';
- mimeout_f = FIXED_MIME; cp++;
- } else if (*cp=='Q') {
- mimeout_mode = 'Q';
- mimeout_f = FIXED_MIME; cp++;
- } else {
- mimeout_f = TRUE;
- }
- continue;
- case 'B': /* Broken JIS support */
- /* bit:0 no ESC JIS
- bit:1 allow any x on ESC-(-x or ESC-$-x
- bit:2 reset to ascii on NL
- */
- if ('9'>= *cp && *cp>='0')
- broken_f |= 1<<(*cp++ -'0');
- else
- broken_f |= TRUE;
- continue;
-#ifndef PERL_XS
- case 'O':/* for Output file */
- file_out_f = TRUE;
- continue;
-#endif
- case 'c':/* add cr code */
- eolmode_f = CRLF;
- continue;
- case 'd':/* delete cr code */
- eolmode_f = LF;
- continue;
- case 'I': /* ISO-2022-JP output */
- iso2022jp_f = TRUE;
- continue;
- case 'L': /* line mode */
- if (*cp=='u') { /* unix */
- eolmode_f = LF; cp++;
- } else if (*cp=='m') { /* mac */
- eolmode_f = CR; cp++;
- } else if (*cp=='w') { /* windows */
- eolmode_f = CRLF; cp++;
- } else if (*cp=='0') { /* no conversion */
- eolmode_f = 0; cp++;
- }
- continue;
-#ifndef PERL_XS
- case 'g':
- if ('2' <= *cp && *cp <= '9') {
- guess_f = 2;
- cp++;
- } else if (*cp == '0' || *cp == '1') {
- guess_f = 1;
- cp++;
- } else {
- guess_f = 1;
- }
- continue;
-#endif
- case SP:
- /* module muliple options in a string are allowed for Perl moudle */
- while(*cp && *cp++!='-');
- continue;
- default:
-#if !defined(PERL_XS) && !defined(WIN32DLL)
- fprintf(stderr, "unknown option: -%c\n", *(cp-1));
-#endif
- /* bogus option but ignored */
- return -1;
- }
- }
- return 0;
-}
-
-#ifdef WIN32DLL
-#include "nkf32dll.c"
-#elif defined(PERL_XS)
-#else /* WIN32DLL */
-int
-main(int argc, char **argv)
-{
- FILE *fin;
- unsigned char *cp;
-
- char *outfname = NULL;
- char *origfname;
-
-#ifdef EASYWIN /*Easy Win */
- _BufferSize.y = 400;/*Set Scroll Buffer Size*/
-#endif
-#ifdef DEFAULT_CODE_LOCALE
- setlocale(LC_CTYPE, "");
-#endif
- nkf_state_init();
-
- for (argc--,argv++; (argc > 0) && **argv == '-'; argc--, argv++) {
- cp = (unsigned char *)*argv;
- options(cp);
-#ifdef EXEC_IO
- if (exec_f){
- int fds[2], pid;
- if (pipe(fds) < 0 || (pid = fork()) < 0){
- abort();
- }
- if (pid == 0){
- if (exec_f > 0){
- close(fds[0]);
- dup2(fds[1], 1);
- }else{
- close(fds[1]);
- dup2(fds[0], 0);
- }
- execvp(argv[1], &argv[1]);
- }
- if (exec_f > 0){
- close(fds[1]);
- dup2(fds[0], 0);
- }else{
- close(fds[0]);
- dup2(fds[1], 1);
- }
- argc = 0;
- break;
- }
-#endif
- }
-
- if (guess_f) {
-#ifdef CHECK_OPTION
- int debug_f_back = debug_f;
-#endif
-#ifdef EXEC_IO
- int exec_f_back = exec_f;
-#endif
-#ifdef X0212_ENABLE
- int x0212_f_back = x0212_f;
-#endif
- int x0213_f_back = x0213_f;
- int guess_f_back = guess_f;
- reinit();
- guess_f = guess_f_back;
- mime_f = FALSE;
-#ifdef CHECK_OPTION
- debug_f = debug_f_back;
-#endif
-#ifdef EXEC_IO
- exec_f = exec_f_back;
-#endif
- x0212_f = x0212_f_back;
- x0213_f = x0213_f_back;
- }
-
- if (binmode_f == TRUE)
-#if defined(__OS2__) && (defined(__IBMC__) || defined(__IBMCPP__))
- if (freopen("","wb",stdout) == NULL)
- return (-1);
-#else
- setbinmode(stdout);
-#endif
-
- if (unbuf_f)
- setbuf(stdout, (char *) NULL);
- else
- setvbuffer(stdout, (char *) stdobuf, IOBUF_SIZE);
-
- if (argc == 0) {
- if (binmode_f == TRUE)
-#if defined(__OS2__) && (defined(__IBMC__) || defined(__IBMCPP__))
- if (freopen("","rb",stdin) == NULL) return (-1);
-#else
- setbinmode(stdin);
-#endif
- setvbuffer(stdin, (char *) stdibuf, IOBUF_SIZE);
- if (nop_f)
- noconvert(stdin);
- else {
- kanji_convert(stdin);
- if (guess_f) print_guessed_code(NULL);
- }
- } else {
- int nfiles = argc;
- int is_argument_error = FALSE;
- while (argc--) {
- input_codename = NULL;
- input_eol = 0;
-#ifdef CHECK_OPTION
- iconv_for_check = 0;
-#endif
- if ((fin = fopen((origfname = *argv++), "r")) == NULL) {
- perror(*(argv-1));
- is_argument_error = TRUE;
- continue;
- } else {
-#ifdef OVERWRITE
- int fd = 0;
- int fd_backup = 0;
-#endif
-
- /* reopen file for stdout */
- if (file_out_f == TRUE) {
-#ifdef OVERWRITE
- if (overwrite_f){
- outfname = nkf_xmalloc(strlen(origfname)
- + strlen(".nkftmpXXXXXX")
- + 1);
- strcpy(outfname, origfname);
+ fprintf(stderr," After 'W' you can add more options. -W[ 8, 16 [BL] ] \n");
+#endif
+ fprintf(stderr,"t no conversion\n");
+ fprintf(stderr,"i[@B] Specify the Esc Seq for JIS X 0208-1978/83 (DEFAULT B)\n");
+ fprintf(stderr,"o[BJH] Specify the Esc Seq for ASCII/Roman (DEFAULT B)\n");
+ fprintf(stderr,"r {de/en}crypt ROT13/47\n");
+ fprintf(stderr,"h 1 katakana->hiragana, 2 hiragana->katakana, 3 both\n");
+ fprintf(stderr,"v Show this usage. V: show version\n");
+ fprintf(stderr,"m[BQN0] MIME decode [B:base64,Q:quoted,N:non-strict,0:no decode]\n");
+ fprintf(stderr,"M[BQ] MIME encode [B:base64 Q:quoted]\n");
+ fprintf(stderr,"l ISO8859-1 (Latin-1) support\n");
+ fprintf(stderr,"f/F Folding: -f60 or -f or -f60-10 (fold margin 10) F preserve nl\n");
+ fprintf(stderr,"Z[0-3] Convert X0208 alphabet to ASCII\n");
+ fprintf(stderr," 1: Kankaku to 1 space 2: to 2 spaces 3: Convert to HTML Entity\n");
+ fprintf(stderr,"X,x Assume X0201 kana in MS-Kanji, -x preserves X0201\n");
+ fprintf(stderr,"B[0-2] Broken input 0: missing ESC,1: any X on ESC-[($]-X,2: ASCII on NL\n");
#ifdef MSDOS
- {
- int i;
- for (i = strlen(outfname); i; --i){
- if (outfname[i - 1] == '/'
- || outfname[i - 1] == '\\'){
- break;
- }
- }
- outfname[i] = '\0';
- }
- strcat(outfname, "ntXXXXXX");
- mktemp(outfname);
- fd = open(outfname, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL,
- S_IREAD | S_IWRITE);
-#else
- strcat(outfname, ".nkftmpXXXXXX");
- fd = mkstemp(outfname);
+ fprintf(stderr,"T Text mode output\n");
+#endif
+ fprintf(stderr,"O Output to File (DEFAULT 'nkf.out')\n");
+ fprintf(stderr,"I Convert non ISO-2022-JP charactor to GETA\n");
+ fprintf(stderr,"d,c Convert line breaks -d: LF -c: CRLF\n");
+ fprintf(stderr,"-L[uwm] line mode u:LF w:CRLF m:CR (DEFAULT noconversion)\n");
+ fprintf(stderr,"\n");
+ fprintf(stderr,"Long name options\n");
+ fprintf(stderr," --ic=<input codeset> --oc=<output codeset>\n");
+ fprintf(stderr," Specify the input or output codeset\n");
+ fprintf(stderr," --fj --unix --mac --windows\n");
+ fprintf(stderr," --jis --euc --sjis --utf8 --utf16 --mime --base64\n");
+ fprintf(stderr," Convert for the system or code\n");
+ fprintf(stderr," --hiragana --katakana --katakana-hiragana\n");
+ fprintf(stderr," To Hiragana/Katakana Conversion\n");
+ fprintf(stderr," --prefix= Insert escape before troublesome characters of Shift_JIS\n");
+#ifdef INPUT_OPTION
+ fprintf(stderr," --cap-input, --url-input Convert hex after ':' or '%%'\n");
#endif
- if (fd < 0
- || (fd_backup = dup(fileno(stdout))) < 0
- || dup2(fd, fileno(stdout)) < 0
- ){
- perror(origfname);
- return -1;
- }
- }else
+#ifdef NUMCHAR_OPTION
+ fprintf(stderr," --numchar-input Convert Unicode Character Reference\n");
#endif
- if(argc == 1) {
- outfname = *argv++;
- argc--;
- } else {
- outfname = "nkf.out";
- }
-
- if(freopen(outfname, "w", stdout) == NULL) {
- perror (outfname);
- return (-1);
- }
- if (binmode_f == TRUE) {
-#if defined(__OS2__) && (defined(__IBMC__) || defined(__IBMCPP__))
- if (freopen("","wb",stdout) == NULL)
- return (-1);
-#else
- setbinmode(stdout);
+#ifdef UTF8_INPUT_ENABLE
+ fprintf(stderr," --fb-{skip, html, xml, perl, java, subchar}\n");
+ fprintf(stderr," Specify how nkf handles unassigned characters\n");
#endif
- }
- }
- if (binmode_f == TRUE)
-#if defined(__OS2__) && (defined(__IBMC__) || defined(__IBMCPP__))
- if (freopen("","rb",fin) == NULL)
- return (-1);
-#else
- setbinmode(fin);
-#endif
- setvbuffer(fin, (char *) stdibuf, IOBUF_SIZE);
- if (nop_f)
- noconvert(fin);
- else {
- char *filename = NULL;
- kanji_convert(fin);
- if (nfiles > 1) filename = origfname;
- if (guess_f) print_guessed_code(filename);
- }
- fclose(fin);
#ifdef OVERWRITE
- if (overwrite_f) {
- struct stat sb;
-#if defined(MSDOS) && !defined(__MINGW32__) && !defined(__WIN32__) && !defined(__WATCOMC__) && !defined(__EMX__) && !defined(__OS2__) && !defined(__DJGPP__)
- time_t tb[2];
-#else
- struct utimbuf tb;
-#endif
-
- fflush(stdout);
- close(fd);
- if (dup2(fd_backup, fileno(stdout)) < 0){
- perror("dup2");
- }
- if (stat(origfname, &sb)) {
- fprintf(stderr, "Can't stat %s\n", origfname);
- }
- /* $B%Q!<%_%C%7%g%s$rI|85(B */
- if (chmod(outfname, sb.st_mode)) {
- fprintf(stderr, "Can't set permission %s\n", outfname);
- }
+ fprintf(stderr," --in-place[=SUFFIX] --overwrite[=SUFFIX]\n");
+ fprintf(stderr," Overwrite original listed files by filtered result\n");
+ fprintf(stderr," --overwrite preserves timestamp of original files\n");
+#endif
+ fprintf(stderr," -g --guess Guess the input code\n");
+ fprintf(stderr," --help --version Show this help/the version\n");
+ fprintf(stderr," For more information, see also man nkf\n");
+ fprintf(stderr,"\n");
+ version();
+}
- /* $B%?%$%`%9%?%s%W$rI|85(B */
- if(preserve_time_f){
-#if defined(MSDOS) && !defined(__MINGW32__) && !defined(__WIN32__) && !defined(__WATCOMC__) && !defined(__EMX__) && !defined(__OS2__) && !defined(__DJGPP__)
- tb[0] = tb[1] = sb.st_mtime;
- if (utime(outfname, tb)) {
- fprintf(stderr, "Can't set timestamp %s\n", outfname);
- }
-#else
- tb.actime = sb.st_atime;
- tb.modtime = sb.st_mtime;
- if (utime(outfname, &tb)) {
- fprintf(stderr, "Can't set timestamp %s\n", outfname);
- }
+void version(void)
+{
+ fprintf(stderr,"Network Kanji Filter Version %s (%s) "
+#if defined(MSDOS) && !defined(__WIN32__) && !defined(__WIN16__) && !defined(__OS2__)
+ "for DOS"
#endif
- }
- if(backup_f){
- char *backup_filename = get_backup_filename(backup_suffix, origfname);
-#ifdef MSDOS
- unlink(backup_filename);
+#if defined(MSDOS) && defined(__WIN16__)
+ "for Win16"
#endif
- if (rename(origfname, backup_filename)) {
- perror(backup_filename);
- fprintf(stderr, "Can't rename %s to %s\n",
- origfname, backup_filename);
- }
- nkf_xfree(backup_filename);
- }else{
-#ifdef MSDOS
- if (unlink(origfname)){
- perror(origfname);
- }
+#if defined(MSDOS) && defined(__WIN32__)
+ "for Win32"
#endif
- }
- if (rename(outfname, origfname)) {
- perror(origfname);
- fprintf(stderr, "Can't rename %s to %s\n",
- outfname, origfname);
- }
- nkf_xfree(outfname);
- }
+#ifdef __OS2__
+ "for OS/2"
#endif
- }
- }
- if (is_argument_error)
- return(-1);
- }
-#ifdef EASYWIN /*Easy Win */
- if (file_out_f == FALSE)
- scanf("%d",&end_check);
- else
- fclose(stdout);
-#else /* for Other OS */
- if (file_out_f == TRUE)
- fclose(stdout);
-#endif /*Easy Win */
- return (0);
+ ,NKF_VERSION,NKF_RELEASE_DATE);
+ fprintf(stderr,"\n%s\n",CopyRight);
}
-#endif /* WIN32DLL */
+#endif /*PERL_XS*/
+
+/**
+ ** $B%Q%C%A@):n<T(B
+ ** void@merope.pleiades.or.jp (Kusakabe Youichi)
+ ** NIDE Naoyuki <nide@ics.nara-wu.ac.jp>
+ ** ohta@src.ricoh.co.jp (Junn Ohta)
+ ** inouet@strl.nhk.or.jp (Tomoyuki Inoue)
+ ** kiri@pulser.win.or.jp (Tetsuaki Kiriyama)
+ ** Kimihiko Sato <sato@sail.t.u-tokyo.ac.jp>
+ ** a_kuroe@kuroe.aoba.yokohama.jp (Akihiko Kuroe)
+ ** kono@ie.u-ryukyu.ac.jp (Shinji Kono)
+ ** GHG00637@nifty-serve.or.jp (COW)
+ **
+ **/
+
+/* end */
diff --git a/ext/nkf/nkf-utf8/nkf.h b/ext/nkf/nkf-utf8/nkf.h
deleted file mode 100644
index 49f3b7ff34..0000000000
--- a/ext/nkf/nkf-utf8/nkf.h
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- *
- * nkf.h - Header file for nkf
- *
- * $Id$
- */
-
-#ifndef NKF_H
-
-/* Wrapper of configurations */
-
-#ifndef MIME_DECODE_DEFAULT
-#define MIME_DECODE_DEFAULT STRICT_MIME
-#endif
-#ifndef X0201_DEFAULT
-#define X0201_DEFAULT TRUE
-#endif
-
-#if DEFAULT_NEWLINE == 0x0D0A
-#define PUT_NEWLINE(func) do {\
- func(0x0D);\
- func(0x0A);\
-} while (0)
-#define OCONV_NEWLINE(func) do {\
- func(0, 0x0D);\
- func(0, 0x0A);\
-} while (0)
-#elif DEFAULT_NEWLINE == 0x0D
-#define PUT_NEWLINE(func) func(0x0D)
-#define OCONV_NEWLINE(func) func(0, 0x0D)
-#else
-#define DEFAULT_NEWLINE 0x0A
-#define PUT_NEWLINE(func) func(0x0A)
-#define OCONV_NEWLINE(func) func(0, 0x0A)
-#endif
-#ifdef HELP_OUTPUT_STDERR
-#define HELP_OUTPUT stderr
-#else
-#define HELP_OUTPUT stdout
-#endif
-
-
-/* Compatibility definitions */
-
-#ifdef nkf_char
-#elif defined(INT_IS_SHORT)
-typedef long nkf_char;
-#define NKF_INT32_C(n) (n##L)
-#else
-typedef int nkf_char;
-#define NKF_INT32_C(n) (n)
-#endif
-
-#if (defined(__TURBOC__) || defined(_MSC_VER) || defined(LSI_C) || (defined(__WATCOMC__) && defined(__386__) && !defined(__LINUX__)) || defined(__MINGW32__) || defined(__EMX__) || defined(__MSDOS__) || defined(__WINDOWS__) || defined(__DOS__) || defined(__OS2__)) && !defined(MSDOS)
-#define MSDOS
-#if (defined(__Win32__) || defined(_WIN32)) && !defined(__WIN32__)
-#define __WIN32__
-#endif
-#endif
-
-#ifdef PERL_XS
-#undef OVERWRITE
-#endif
-
-#ifndef PERL_XS
-#include <stdio.h>
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-
-#if defined(MSDOS) || defined(__OS2__)
-#include <fcntl.h>
-#include <io.h>
-#if defined(_MSC_VER) || defined(__WATCOMC__)
-#define mktemp _mktemp
-#endif
-#endif
-
-#ifdef MSDOS
-#ifdef LSI_C
-#define setbinmode(fp) fsetbin(fp)
-#elif defined(__DJGPP__)
-#include <libc/dosio.h>
-void setbinmode(FILE *fp)
-{
- /* we do not use libc's setmode(), which changes COOKED/RAW mode in device. */
- int fd, m;
- fd = fileno(fp);
- m = (__file_handle_modes[fd] & (~O_TEXT)) | O_BINARY;
- __file_handle_set(fd, m);
-}
-#else /* Microsoft C, Turbo C */
-#define setbinmode(fp) setmode(fileno(fp), O_BINARY)
-#endif
-#else /* UNIX */
-#define setbinmode(fp)
-#endif
-
-#ifdef _IOFBF /* SysV and MSDOS, Windows */
-#define setvbuffer(fp, buf, size) setvbuf(fp, buf, _IOFBF, size)
-#else /* BSD */
-#define setvbuffer(fp, buf, size) setbuffer(fp, buf, size)
-#endif
-
-/*Borland C++ 4.5 EasyWin*/
-#if defined(__TURBOC__) && defined(_Windows) && !defined(__WIN32__) /*Easy Win */
-#define EASYWIN
-#ifndef __WIN16__
-#define __WIN16__
-#endif
-#include <windows.h>
-#endif
-
-#ifdef OVERWRITE
-/* added by satoru@isoternet.org */
-#if defined(__EMX__)
-#include <sys/types.h>
-#endif
-#include <sys/stat.h>
-#if !defined(MSDOS) || defined(__DJGPP__) /* UNIX, djgpp */
-#include <unistd.h>
-#if defined(__WATCOMC__)
-#include <sys/utime.h>
-#else
-#include <utime.h>
-#endif
-#else /* defined(MSDOS) */
-#ifdef __WIN32__
-#ifdef __BORLANDC__ /* BCC32 */
-#include <utime.h>
-#else /* !defined(__BORLANDC__) */
-#include <sys/utime.h>
-#endif /* (__BORLANDC__) */
-#else /* !defined(__WIN32__) */
-#if defined(_MSC_VER) || defined(__MINGW32__) || defined(__WATCOMC__) || defined(__OS2__) || defined(__EMX__) || defined(__IBMC__) || defined(__IBMCPP__) /* VC++, MinGW, Watcom, emx+gcc, IBM VAC++ */
-#include <sys/utime.h>
-#elif defined(__TURBOC__) /* BCC */
-#include <utime.h>
-#elif defined(LSI_C) /* LSI C */
-#endif /* (__WIN32__) */
-#endif
-#endif
-#endif
-
-#if !defined(DEFAULT_CODE_JIS) && !defined(DEFAULT_CODE_SJIS) && \
- !defined(DEFAULT_CODE_WINDOWS_31J) && !defined(DEFAULT_CODE_EUC) && \
- !defined(DEFAULT_CODE_UTF8) && !defined(DEFAULT_CODE_LOCALE)
-#define DEFAULT_CODE_LOCALE
-#endif
-
-#ifdef DEFAULT_CODE_LOCALE
-
-#if defined(__WIN32__) /* not win32 should be posix */
-# ifndef HAVE_LOCALE_H
-# define HAVE_LOCALE_H
-# endif
-#elif defined(__OS2__)
-# undef HAVE_LANGINFO_H /* We do not use kLIBC's langinfo. */
-# ifndef HAVE_LOCALE_H
-# define HAVE_LOCALE_H
-# endif
-#elif defined(MSDOS)
-# ifndef HAVE_LOCALE_H
-# define HAVE_LOCALE_H
-# endif
-#else
-# ifndef HAVE_LANGINFO_H
-# define HAVE_LANGINFO_H
-# endif
-# ifndef HAVE_LOCALE_H
-# define HAVE_LOCALE_H
-# endif
-#endif
-
-#ifdef HAVE_LANGINFO_H
-#include <langinfo.h>
-#endif
-#ifdef HAVE_LOCALE_H
-#include <locale.h>
-#endif
-
-#endif /* DEFAULT_CODE_LOCALE */
-
-#define FALSE 0
-#define TRUE 1
-
-#ifdef WIN32DLL
-#include "nkf32.h"
-#endif
-
-#endif /* NKF_H */
diff --git a/ext/nkf/nkf-utf8/utf8tbl.c b/ext/nkf/nkf-utf8/utf8tbl.c
index 10eec60c5d..e43ad553d6 100644
--- a/ext/nkf/nkf-utf8/utf8tbl.c
+++ b/ext/nkf/nkf-utf8/utf8tbl.c
@@ -1,14 +1,7 @@
-/*
- * utf8tbl.c - Convertion Table for nkf
- *
- * $Id$
- */
-
#include "config.h"
-#include "utf8tbl.h"
#ifdef UTF8_OUTPUT_ENABLE
-static const unsigned short euc_to_utf8_A1[] = {
+const unsigned short euc_to_utf8_A1[] = {
0x3000, 0x3001, 0x3002, 0xFF0C, 0xFF0E, 0x30FB, 0xFF1A,
0xFF1B, 0xFF1F, 0xFF01, 0x309B, 0x309C, 0x00B4, 0xFF40, 0x00A8,
0xFF3E, 0x203E, 0xFF3F, 0x30FD, 0x30FE, 0x309D, 0x309E, 0x3003,
@@ -24,7 +17,7 @@ static const unsigned short euc_to_utf8_A1[] = {
};
/* Microsoft UCS Mapping Compatible */
-static const unsigned short euc_to_utf8_A1_ms[] = {
+const unsigned short euc_to_utf8_A1_ms[] = {
0x3000, 0x3001, 0x3002, 0xFF0C, 0xFF0E, 0x30FB, 0xFF1A,
0xFF1B, 0xFF1F, 0xFF01, 0x309B, 0x309C, 0x00B4, 0xFF40, 0x00A8,
0xFF3E, 0xFFE3, 0xFF3F, 0x30FD, 0x30FE, 0x309D, 0x309E, 0x3003,
@@ -38,7 +31,7 @@ static const unsigned short euc_to_utf8_A1_ms[] = {
0xFF04, 0xFFE0, 0xFFE1, 0xFF05, 0xFF03, 0xFF06, 0xFF0A, 0xFF20,
0x00A7, 0x2606, 0x2605, 0x25CB, 0x25CF, 0x25CE, 0x25C7,
};
-static const unsigned short euc_to_utf8_A2[] = {
+const unsigned short euc_to_utf8_A2[] = {
0x25C6, 0x25A1, 0x25A0, 0x25B3, 0x25B2, 0x25BD, 0x25BC,
0x203B, 0x3012, 0x2192, 0x2190, 0x2191, 0x2193, 0x3013, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -54,7 +47,7 @@ static const unsigned short euc_to_utf8_A2[] = {
};
/* Microsoft UCS Mapping Compatible */
-static const unsigned short euc_to_utf8_A2_ms[] = {
+const unsigned short euc_to_utf8_A2_ms[] = {
0x25C6, 0x25A1, 0x25A0, 0x25B3, 0x25B2, 0x25BD, 0x25BC,
0x203B, 0x3012, 0x2192, 0x2190, 0x2191, 0x2193, 0x3013, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -68,7 +61,7 @@ static const unsigned short euc_to_utf8_A2_ms[] = {
0, 0, 0x212B, 0x2030, 0x266F, 0x266D, 0x266A, 0x2020,
0x2021, 0x00B6, 0, 0, 0, 0, 0x25EF,
};
-static const unsigned short euc_to_utf8_A3[] = {
+const unsigned short euc_to_utf8_A3[] = {
0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0xFF10, 0xFF11, 0xFF12, 0xFF13, 0xFF14, 0xFF15, 0xFF16, 0xFF17,
@@ -82,7 +75,7 @@ static const unsigned short euc_to_utf8_A3[] = {
0xFF50, 0xFF51, 0xFF52, 0xFF53, 0xFF54, 0xFF55, 0xFF56, 0xFF57,
0xFF58, 0xFF59, 0xFF5A, 0, 0, 0, 0,
};
-static const unsigned short euc_to_utf8_A4[] = {
+const unsigned short euc_to_utf8_A4[] = {
0x3041, 0x3042, 0x3043, 0x3044, 0x3045, 0x3046, 0x3047,
0x3048, 0x3049, 0x304A, 0x304B, 0x304C, 0x304D, 0x304E, 0x304F,
0x3050, 0x3051, 0x3052, 0x3053, 0x3054, 0x3055, 0x3056, 0x3057,
@@ -96,7 +89,7 @@ static const unsigned short euc_to_utf8_A4[] = {
0x3090, 0x3091, 0x3092, 0x3093, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short euc_to_utf8_A5[] = {
+const unsigned short euc_to_utf8_A5[] = {
0x30A1, 0x30A2, 0x30A3, 0x30A4, 0x30A5, 0x30A6, 0x30A7,
0x30A8, 0x30A9, 0x30AA, 0x30AB, 0x30AC, 0x30AD, 0x30AE, 0x30AF,
0x30B0, 0x30B1, 0x30B2, 0x30B3, 0x30B4, 0x30B5, 0x30B6, 0x30B7,
@@ -110,7 +103,7 @@ static const unsigned short euc_to_utf8_A5[] = {
0x30F0, 0x30F1, 0x30F2, 0x30F3, 0x30F4, 0x30F5, 0x30F6, 0,
0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short euc_to_utf8_A6[] = {
+const unsigned short euc_to_utf8_A6[] = {
0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397,
0x0398, 0x0399, 0x039A, 0x039B, 0x039C, 0x039D, 0x039E, 0x039F,
0x03A0, 0x03A1, 0x03A3, 0x03A4, 0x03A5, 0x03A6, 0x03A7, 0x03A8,
@@ -124,7 +117,7 @@ static const unsigned short euc_to_utf8_A6[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short euc_to_utf8_A7[] = {
+const unsigned short euc_to_utf8_A7[] = {
0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0401,
0x0416, 0x0417, 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D,
0x041E, 0x041F, 0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425,
@@ -138,7 +131,7 @@ static const unsigned short euc_to_utf8_A7[] = {
0x044E, 0x044F, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short euc_to_utf8_A8[] = {
+const unsigned short euc_to_utf8_A8[] = {
0x2500, 0x2502, 0x250C, 0x2510, 0x2518, 0x2514, 0x251C,
0x252C, 0x2524, 0x2534, 0x253C, 0x2501, 0x2503, 0x250F, 0x2513,
0x251B, 0x2517, 0x2523, 0x2533, 0x252B, 0x253B, 0x254B, 0x2520,
@@ -152,7 +145,7 @@ static const unsigned short euc_to_utf8_A8[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short euc_to_utf8_A9[] = {
+const unsigned short euc_to_utf8_A9[] = {
0x2460, 0x2461, 0x2462, 0x2463, 0x2464, 0x2465, 0x2466,
0x2467, 0x2468, 0x2469, 0x246A, 0x246B, 0x246C, 0x246D, 0x246E,
0x246F, 0x2470, 0x2471, 0x2472, 0x2473, 0, 0, 0,
@@ -166,7 +159,7 @@ static const unsigned short euc_to_utf8_A9[] = {
0, 0, 0x2488, 0x2489, 0x248A, 0x248B, 0x248C, 0x248D,
0x248E, 0x248F, 0x2490, 0, 0, 0, 0,
};
-static const unsigned short euc_to_utf8_AA[] = {
+const unsigned short euc_to_utf8_AA[] = {
0x2160, 0x2161, 0x2162, 0x2163, 0x2164, 0x2165, 0x2166,
0x2167, 0x2168, 0x2169, 0x216A, 0x216B, 0, 0, 0,
0, 0, 0, 0, 0, 0x2170, 0x2171, 0x2172,
@@ -180,7 +173,7 @@ static const unsigned short euc_to_utf8_AA[] = {
0x24AF, 0x24B0, 0x24B1, 0x24B2, 0x24B3, 0x24B4, 0x24B5, 0,
0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short euc_to_utf8_AB[] = {
+const unsigned short euc_to_utf8_AB[] = {
0x339C, 0x339F, 0x339D, 0x33A0, 0x33A4, 0, 0x33A1,
0x33A5, 0x339E, 0x33A2, 0x338E, 0, 0x338F, 0x33C4, 0x3396,
0x3397, 0x2113, 0x3398, 0x33B3, 0x33B2, 0x33B1, 0x33B0, 0x2109,
@@ -194,7 +187,7 @@ static const unsigned short euc_to_utf8_AB[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0x2116, 0x33CD, 0x2121, 0,
};
-static const unsigned short euc_to_utf8_AC[] = {
+const unsigned short euc_to_utf8_AC[] = {
0x2664, 0x2667, 0x2661, 0x2662, 0x2660, 0x2663, 0x2665,
0x2666, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0x3020, 0x260E, 0x3004,
@@ -208,21 +201,7 @@ static const unsigned short euc_to_utf8_AC[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short euc_to_utf8_AC_mac[] = {
- 0x2664, 0x2667, 0x2661, 0x2662, 0x2660, 0x2663, 0x2665,
- 0x2666, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0x3020, 0x260E, 0x3004,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0x261E, 0x261C, 0x261D, 0x261F, 0x21C6, 0x21C4, 0x21C5,
- 0, 0x21E8, 0x21E6, 0x21E7, 0x21E9, 0x2192, 0x2190, 0x2191,
- 0x2193, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0,
-};
-static const unsigned short euc_to_utf8_AD[] = {
+const unsigned short euc_to_utf8_AD[] = {
0x2460, 0x2461, 0x2462, 0x2463, 0x2464, 0x2465, 0x2466,
0x2467, 0x2468, 0x2469, 0x246A, 0x246B, 0x246C, 0x246D, 0x246E,
0x246F, 0x2470, 0x2471, 0x2472, 0x2473, 0x2160, 0x2161, 0x2162,
@@ -236,21 +215,7 @@ static const unsigned short euc_to_utf8_AD[] = {
0x2252, 0x2261, 0x222B, 0x222E, 0x2211, 0x221A, 0x22A5, 0x2220,
0x221F, 0x22BF, 0x2235, 0x2229, 0x222A, 0, 0x3299,
};
-static const unsigned short euc_to_utf8_AD_mac[] = {
- 0x65E5, 0x6708, 0x706B, 0x6C34, 0x6728, 0x91D1, 0x571F,
- 0x796D, 0x795D, 0x81EA, 0x81F3, 0x3239, 0x547C, 0x3231, 0x8CC7,
- 0x540D, 0x3232, 0x5B66, 0x8CA1, 0x793E, 0x7279, 0x76E3, 0x4F01,
- 0x5354, 0x52B4, 0x2165, 0x2166, 0x2167, 0x2168, 0x2169, 0,
- 0x3349, 0x3314, 0x3322, 0x334D, 0x3318, 0x3327, 0x3303, 0x3336,
- 0x3351, 0x3357, 0x330D, 0x3326, 0x3323, 0x332B, 0x334A, 0x333B,
- 0x339C, 0x339D, 0x339E, 0x338E, 0x338F, 0x33C4, 0x33A1, 0,
- 0, 0, 0, 0, 0, 0, 0, 0x337B,
- 0x301D, 0x301F, 0x2116, 0x33CD, 0x2121, 0x32A4, 0x32A5, 0x32A6,
- 0x32A7, 0x32A8, 0x3231, 0x3232, 0x3239, 0x337E, 0x337D, 0x337C,
- 0x2252, 0x5927, 0x5C0F, 0x32A4, 0x32A5, 0x32A6, 0x32A7, 0x32A8,
- 0x533B, 0x8CA1, 0x512A, 0x52B4, 0x5370, 0x63A7, 0x79D8,
-};
-static const unsigned short euc_to_utf8_AE[] = {
+const unsigned short euc_to_utf8_AE[] = {
0x3349, 0x3322, 0x334D, 0x3314, 0x3316, 0x3305, 0x3333,
0x334E, 0x3303, 0x3336, 0x3318, 0x3315, 0x3327, 0x3351, 0x334A,
0x3339, 0x3357, 0x330D, 0x3342, 0x3323, 0x3326, 0x333B, 0x332B,
@@ -264,7 +229,7 @@ static const unsigned short euc_to_utf8_AE[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0x337F, 0, 0,
};
-static const unsigned short euc_to_utf8_AF[] = {
+const unsigned short euc_to_utf8_AF[] = {
0x222E, 0x221F, 0x22BF, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0x301D, 0x301F, 0,
@@ -278,7 +243,7 @@ static const unsigned short euc_to_utf8_AF[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short euc_to_utf8_B0[] = {
+const unsigned short euc_to_utf8_B0[] = {
0x4E9C, 0x5516, 0x5A03, 0x963F, 0x54C0, 0x611B, 0x6328,
0x59F6, 0x9022, 0x8475, 0x831C, 0x7A50, 0x60AA, 0x63E1, 0x6E25,
0x65ED, 0x8466, 0x82A6, 0x9BF5, 0x6893, 0x5727, 0x65A1, 0x6271,
@@ -292,7 +257,7 @@ static const unsigned short euc_to_utf8_B0[] = {
0x7A32, 0x8328, 0x828B, 0x9C2F, 0x5141, 0x5370, 0x54BD, 0x54E1,
0x56E0, 0x59FB, 0x5F15, 0x98F2, 0x6DEB, 0x80E4, 0x852D,
};
-static const unsigned short euc_to_utf8_B1[] = {
+const unsigned short euc_to_utf8_B1[] = {
0x9662, 0x9670, 0x96A0, 0x97FB, 0x540B, 0x53F3, 0x5B87,
0x70CF, 0x7FBD, 0x8FC2, 0x96E8, 0x536F, 0x9D5C, 0x7ABA, 0x4E11,
0x7893, 0x81FC, 0x6E26, 0x5618, 0x5504, 0x6B1D, 0x851A, 0x9C3B,
@@ -306,7 +271,7 @@ static const unsigned short euc_to_utf8_B1[] = {
0x8276, 0x82D1, 0x8597, 0x9060, 0x925B, 0x9D1B, 0x5869, 0x65BC,
0x6C5A, 0x7525, 0x51F9, 0x592E, 0x5965, 0x5F80, 0x5FDC,
};
-static const unsigned short euc_to_utf8_B2[] = {
+const unsigned short euc_to_utf8_B2[] = {
0x62BC, 0x65FA, 0x6A2A, 0x6B27, 0x6BB4, 0x738B, 0x7FC1,
0x8956, 0x9D2C, 0x9D0E, 0x9EC4, 0x5CA1, 0x6C96, 0x837B, 0x5104,
0x5C4B, 0x61B6, 0x81C6, 0x6876, 0x7261, 0x4E59, 0x4FFA, 0x5378,
@@ -320,7 +285,7 @@ static const unsigned short euc_to_utf8_B2[] = {
0x4ECB, 0x4F1A, 0x89E3, 0x56DE, 0x584A, 0x58CA, 0x5EFB, 0x5FEB,
0x602A, 0x6094, 0x6062, 0x61D0, 0x6212, 0x62D0, 0x6539,
};
-static const unsigned short euc_to_utf8_B3[] = {
+const unsigned short euc_to_utf8_B3[] = {
0x9B41, 0x6666, 0x68B0, 0x6D77, 0x7070, 0x754C, 0x7686,
0x7D75, 0x82A5, 0x87F9, 0x958B, 0x968E, 0x8C9D, 0x51F1, 0x52BE,
0x5916, 0x54B3, 0x5BB3, 0x5D16, 0x6168, 0x6982, 0x6DAF, 0x788D,
@@ -334,7 +299,7 @@ static const unsigned short euc_to_utf8_B3[] = {
0x53F6, 0x691B, 0x6A3A, 0x9784, 0x682A, 0x515C, 0x7AC3, 0x84B2,
0x91DC, 0x938C, 0x565B, 0x9D28, 0x6822, 0x8305, 0x8431,
};
-static const unsigned short euc_to_utf8_B4[] = {
+const unsigned short euc_to_utf8_B4[] = {
0x7CA5, 0x5208, 0x82C5, 0x74E6, 0x4E7E, 0x4F83, 0x51A0,
0x5BD2, 0x520A, 0x52D8, 0x52E7, 0x5DFB, 0x559A, 0x582A, 0x59E6,
0x5B8C, 0x5B98, 0x5BDB, 0x5E72, 0x5E79, 0x60A3, 0x611F, 0x6163,
@@ -348,7 +313,7 @@ static const unsigned short euc_to_utf8_B4[] = {
0x57FA, 0x5947, 0x5B09, 0x5BC4, 0x5C90, 0x5E0C, 0x5E7E, 0x5FCC,
0x63EE, 0x673A, 0x65D7, 0x65E2, 0x671F, 0x68CB, 0x68C4,
};
-static const unsigned short euc_to_utf8_B5[] = {
+const unsigned short euc_to_utf8_B5[] = {
0x6A5F, 0x5E30, 0x6BC5, 0x6C17, 0x6C7D, 0x757F, 0x7948,
0x5B63, 0x7A00, 0x7D00, 0x5FBD, 0x898F, 0x8A18, 0x8CB4, 0x8D77,
0x8ECC, 0x8F1D, 0x98E2, 0x9A0E, 0x9B3C, 0x4E80, 0x507D, 0x5100,
@@ -362,7 +327,7 @@ static const unsigned short euc_to_utf8_B5[] = {
0x5DE8, 0x62D2, 0x62E0, 0x6319, 0x6E20, 0x865A, 0x8A31, 0x8DDD,
0x92F8, 0x6F01, 0x79A6, 0x9B5A, 0x4EA8, 0x4EAB, 0x4EAC,
};
-static const unsigned short euc_to_utf8_B6[] = {
+const unsigned short euc_to_utf8_B6[] = {
0x4F9B, 0x4FA0, 0x50D1, 0x5147, 0x7AF6, 0x5171, 0x51F6,
0x5354, 0x5321, 0x537F, 0x53EB, 0x55AC, 0x5883, 0x5CE1, 0x5F37,
0x5F4A, 0x602F, 0x6050, 0x606D, 0x631F, 0x6559, 0x6A4B, 0x6CC1,
@@ -376,7 +341,7 @@ static const unsigned short euc_to_utf8_B6[] = {
0x99D2, 0x5177, 0x611A, 0x865E, 0x55B0, 0x7A7A, 0x5076, 0x5BD3,
0x9047, 0x9685, 0x4E32, 0x6ADB, 0x91E7, 0x5C51, 0x5C48,
};
-static const unsigned short euc_to_utf8_B7[] = {
+const unsigned short euc_to_utf8_B7[] = {
0x6398, 0x7A9F, 0x6C93, 0x9774, 0x8F61, 0x7AAA, 0x718A,
0x9688, 0x7C82, 0x6817, 0x7E70, 0x6851, 0x936C, 0x52F2, 0x541B,
0x85AB, 0x8A13, 0x7FA4, 0x8ECD, 0x90E1, 0x5366, 0x8888, 0x7941,
@@ -390,7 +355,7 @@ static const unsigned short euc_to_utf8_B7[] = {
0x5039, 0x5026, 0x5065, 0x517C, 0x5238, 0x5263, 0x55A7, 0x570F,
0x5805, 0x5ACC, 0x5EFA, 0x61B2, 0x61F8, 0x62F3, 0x6372,
};
-static const unsigned short euc_to_utf8_B8[] = {
+const unsigned short euc_to_utf8_B8[] = {
0x691C, 0x6A29, 0x727D, 0x72AC, 0x732E, 0x7814, 0x786F,
0x7D79, 0x770C, 0x80A9, 0x898B, 0x8B19, 0x8CE2, 0x8ED2, 0x9063,
0x9375, 0x967A, 0x9855, 0x9A13, 0x9E78, 0x5143, 0x539F, 0x53B3,
@@ -404,7 +369,7 @@ static const unsigned short euc_to_utf8_B8[] = {
0x4E5E, 0x9BC9, 0x4EA4, 0x4F7C, 0x4FAF, 0x5019, 0x5016, 0x5149,
0x516C, 0x529F, 0x52B9, 0x52FE, 0x539A, 0x53E3, 0x5411,
};
-static const unsigned short euc_to_utf8_B9[] = {
+const unsigned short euc_to_utf8_B9[] = {
0x540E, 0x5589, 0x5751, 0x57A2, 0x597D, 0x5B54, 0x5B5D,
0x5B8F, 0x5DE5, 0x5DE7, 0x5DF7, 0x5E78, 0x5E83, 0x5E9A, 0x5EB7,
0x5F18, 0x6052, 0x614C, 0x6297, 0x62D8, 0x63A7, 0x653B, 0x6602,
@@ -418,7 +383,7 @@ static const unsigned short euc_to_utf8_B9[] = {
0x544A, 0x56FD, 0x7A40, 0x9177, 0x9D60, 0x9ED2, 0x7344, 0x6F09,
0x8170, 0x7511, 0x5FFD, 0x60DA, 0x9AA8, 0x72DB, 0x8FBC,
};
-static const unsigned short euc_to_utf8_BA[] = {
+const unsigned short euc_to_utf8_BA[] = {
0x6B64, 0x9803, 0x4ECA, 0x56F0, 0x5764, 0x58BE, 0x5A5A,
0x6068, 0x61C7, 0x660F, 0x6606, 0x6839, 0x68B1, 0x6DF7, 0x75D5,
0x7D3A, 0x826E, 0x9B42, 0x4E9B, 0x4F50, 0x53C9, 0x5506, 0x5D6F,
@@ -432,7 +397,7 @@ static const unsigned short euc_to_utf8_BA[] = {
0x548B, 0x643E, 0x6628, 0x6714, 0x67F5, 0x7A84, 0x7B56, 0x7D22,
0x932F, 0x685C, 0x9BAD, 0x7B39, 0x5319, 0x518A, 0x5237,
};
-static const unsigned short euc_to_utf8_BB[] = {
+const unsigned short euc_to_utf8_BB[] = {
0x5BDF, 0x62F6, 0x64AE, 0x64E6, 0x672D, 0x6BBA, 0x85A9,
0x96D1, 0x7690, 0x9BD6, 0x634C, 0x9306, 0x9BAB, 0x76BF, 0x6652,
0x4E09, 0x5098, 0x53C2, 0x5C71, 0x60E8, 0x6492, 0x6563, 0x685F,
@@ -446,7 +411,7 @@ static const unsigned short euc_to_utf8_BB[] = {
0x8AEE, 0x8CC7, 0x8CDC, 0x96CC, 0x98FC, 0x6B6F, 0x4E8B, 0x4F3C,
0x4F8D, 0x5150, 0x5B57, 0x5BFA, 0x6148, 0x6301, 0x6642,
};
-static const unsigned short euc_to_utf8_BC[] = {
+const unsigned short euc_to_utf8_BC[] = {
0x6B21, 0x6ECB, 0x6CBB, 0x723E, 0x74BD, 0x75D4, 0x78C1,
0x793A, 0x800C, 0x8033, 0x81EA, 0x8494, 0x8F9E, 0x6C50, 0x9E7F,
0x5F0F, 0x8B58, 0x9D2B, 0x7AFA, 0x8EF8, 0x5B8D, 0x96EB, 0x4E03,
@@ -460,7 +425,7 @@ static const unsigned short euc_to_utf8_BC[] = {
0x816B, 0x8DA3, 0x9152, 0x9996, 0x5112, 0x53D7, 0x546A, 0x5BFF,
0x6388, 0x6A39, 0x7DAC, 0x9700, 0x56DA, 0x53CE, 0x5468,
};
-static const unsigned short euc_to_utf8_BD[] = {
+const unsigned short euc_to_utf8_BD[] = {
0x5B97, 0x5C31, 0x5DDE, 0x4FEE, 0x6101, 0x62FE, 0x6D32,
0x79C0, 0x79CB, 0x7D42, 0x7E4D, 0x7FD2, 0x81ED, 0x821F, 0x8490,
0x8846, 0x8972, 0x8B90, 0x8E74, 0x8F2F, 0x9031, 0x914B, 0x916C,
@@ -474,7 +439,7 @@ static const unsigned short euc_to_utf8_BD[] = {
0x7F72, 0x66F8, 0x85AF, 0x85F7, 0x8AF8, 0x52A9, 0x53D9, 0x5973,
0x5E8F, 0x5F90, 0x6055, 0x92E4, 0x9664, 0x50B7, 0x511F,
};
-static const unsigned short euc_to_utf8_BE[] = {
+const unsigned short euc_to_utf8_BE[] = {
0x52DD, 0x5320, 0x5347, 0x53EC, 0x54E8, 0x5546, 0x5531,
0x5617, 0x5968, 0x59BE, 0x5A3C, 0x5BB5, 0x5C06, 0x5C0F, 0x5C11,
0x5C1A, 0x5E84, 0x5E8A, 0x5EE0, 0x5F70, 0x627F, 0x6284, 0x62DB,
@@ -488,7 +453,7 @@ static const unsigned short euc_to_utf8_BE[] = {
0x60C5, 0x64FE, 0x6761, 0x6756, 0x6D44, 0x72B6, 0x7573, 0x7A63,
0x84B8, 0x8B72, 0x91B8, 0x9320, 0x5631, 0x57F4, 0x98FE,
};
-static const unsigned short euc_to_utf8_BF[] = {
+const unsigned short euc_to_utf8_BF[] = {
0x62ED, 0x690D, 0x6B96, 0x71ED, 0x7E54, 0x8077, 0x8272,
0x89E6, 0x98DF, 0x8755, 0x8FB1, 0x5C3B, 0x4F38, 0x4FE1, 0x4FB5,
0x5507, 0x5A20, 0x5BDD, 0x5BE9, 0x5FC3, 0x614E, 0x632F, 0x65B0,
@@ -502,7 +467,7 @@ static const unsigned short euc_to_utf8_BF[] = {
0x745E, 0x9AC4, 0x5D07, 0x5D69, 0x6570, 0x67A2, 0x8DA8, 0x96DB,
0x636E, 0x6749, 0x6919, 0x83C5, 0x9817, 0x96C0, 0x88FE,
};
-static const unsigned short euc_to_utf8_C0[] = {
+const unsigned short euc_to_utf8_C0[] = {
0x6F84, 0x647A, 0x5BF8, 0x4E16, 0x702C, 0x755D, 0x662F,
0x51C4, 0x5236, 0x52E2, 0x59D3, 0x5F81, 0x6027, 0x6210, 0x653F,
0x6574, 0x661F, 0x6674, 0x68F2, 0x6816, 0x6B63, 0x6E05, 0x7272,
@@ -516,7 +481,7 @@ static const unsigned short euc_to_utf8_C0[] = {
0x6247, 0x64B0, 0x6813, 0x6834, 0x6CC9, 0x6D45, 0x6D17, 0x67D3,
0x6F5C, 0x714E, 0x717D, 0x65CB, 0x7A7F, 0x7BAD, 0x7DDA,
};
-static const unsigned short euc_to_utf8_C1[] = {
+const unsigned short euc_to_utf8_C1[] = {
0x7E4A, 0x7FA8, 0x817A, 0x821B, 0x8239, 0x85A6, 0x8A6E,
0x8CCE, 0x8DF5, 0x9078, 0x9077, 0x92AD, 0x9291, 0x9583, 0x9BAE,
0x524D, 0x5584, 0x6F38, 0x7136, 0x5168, 0x7985, 0x7E55, 0x81B3,
@@ -530,7 +495,7 @@ static const unsigned short euc_to_utf8_C1[] = {
0x8349, 0x8358, 0x846C, 0x84BC, 0x85FB, 0x88C5, 0x8D70, 0x9001,
0x906D, 0x9397, 0x971C, 0x9A12, 0x50CF, 0x5897, 0x618E,
};
-static const unsigned short euc_to_utf8_C2[] = {
+const unsigned short euc_to_utf8_C2[] = {
0x81D3, 0x8535, 0x8D08, 0x9020, 0x4FC3, 0x5074, 0x5247,
0x5373, 0x606F, 0x6349, 0x675F, 0x6E2C, 0x8DB3, 0x901F, 0x4FD7,
0x5C5E, 0x8CCA, 0x65CF, 0x7D9A, 0x5352, 0x8896, 0x5176, 0x63C3,
@@ -544,7 +509,7 @@ static const unsigned short euc_to_utf8_C2[] = {
0x5B85, 0x6258, 0x629E, 0x62D3, 0x6CA2, 0x6FEF, 0x7422, 0x8A17,
0x9438, 0x6FC1, 0x8AFE, 0x8338, 0x51E7, 0x86F8, 0x53EA,
};
-static const unsigned short euc_to_utf8_C3[] = {
+const unsigned short euc_to_utf8_C3[] = {
0x53E9, 0x4F46, 0x9054, 0x8FB0, 0x596A, 0x8131, 0x5DFD,
0x7AEA, 0x8FBF, 0x68DA, 0x8C37, 0x72F8, 0x9C48, 0x6A3D, 0x8AB0,
0x4E39, 0x5358, 0x5606, 0x5766, 0x62C5, 0x63A2, 0x65E6, 0x6B4E,
@@ -558,7 +523,7 @@ static const unsigned short euc_to_utf8_C3[] = {
0x8A3B, 0x914E, 0x92F3, 0x99D0, 0x6A17, 0x7026, 0x732A, 0x82E7,
0x8457, 0x8CAF, 0x4E01, 0x5146, 0x51CB, 0x558B, 0x5BF5,
};
-static const unsigned short euc_to_utf8_C4[] = {
+const unsigned short euc_to_utf8_C4[] = {
0x5E16, 0x5E33, 0x5E81, 0x5F14, 0x5F35, 0x5F6B, 0x5FB4,
0x61F2, 0x6311, 0x66A2, 0x671D, 0x6F6E, 0x7252, 0x753A, 0x773A,
0x8074, 0x8139, 0x8178, 0x8776, 0x8ABF, 0x8ADC, 0x8D85, 0x8DF3,
@@ -572,7 +537,7 @@ static const unsigned short euc_to_utf8_C4[] = {
0x608C, 0x62B5, 0x633A, 0x63D0, 0x68AF, 0x6C40, 0x7887, 0x798E,
0x7A0B, 0x7DE0, 0x8247, 0x8A02, 0x8AE6, 0x8E44, 0x9013,
};
-static const unsigned short euc_to_utf8_C5[] = {
+const unsigned short euc_to_utf8_C5[] = {
0x90B8, 0x912D, 0x91D8, 0x9F0E, 0x6CE5, 0x6458, 0x64E2,
0x6575, 0x6EF4, 0x7684, 0x7B1B, 0x9069, 0x93D1, 0x6EBA, 0x54F2,
0x5FB9, 0x64A4, 0x8F4D, 0x8FED, 0x9244, 0x5178, 0x586B, 0x5929,
@@ -586,7 +551,7 @@ static const unsigned short euc_to_utf8_C5[] = {
0x76D7, 0x6DD8, 0x6E6F, 0x6D9B, 0x706F, 0x71C8, 0x5F53, 0x75D8,
0x7977, 0x7B49, 0x7B54, 0x7B52, 0x7CD6, 0x7D71, 0x5230,
};
-static const unsigned short euc_to_utf8_C6[] = {
+const unsigned short euc_to_utf8_C6[] = {
0x8463, 0x8569, 0x85E4, 0x8A0E, 0x8B04, 0x8C46, 0x8E0F,
0x9003, 0x900F, 0x9419, 0x9676, 0x982D, 0x9A30, 0x95D8, 0x50CD,
0x52D5, 0x540C, 0x5802, 0x5C0E, 0x61A7, 0x649E, 0x6D1E, 0x77B3,
@@ -600,7 +565,7 @@ static const unsigned short euc_to_utf8_C6[] = {
0x8EDF, 0x96E3, 0x6C5D, 0x4E8C, 0x5C3C, 0x5F10, 0x8FE9, 0x5302,
0x8CD1, 0x8089, 0x8679, 0x5EFF, 0x65E5, 0x4E73, 0x5165,
};
-static const unsigned short euc_to_utf8_C7[] = {
+const unsigned short euc_to_utf8_C7[] = {
0x5982, 0x5C3F, 0x97EE, 0x4EFB, 0x598A, 0x5FCD, 0x8A8D,
0x6FE1, 0x79B0, 0x7962, 0x5BE7, 0x8471, 0x732B, 0x71B1, 0x5E74,
0x5FF5, 0x637B, 0x649A, 0x71C3, 0x7C98, 0x4E43, 0x5EFC, 0x4E4B,
@@ -614,7 +579,7 @@ static const unsigned short euc_to_utf8_C7[] = {
0x67CF, 0x6CCA, 0x767D, 0x7B94, 0x7C95, 0x8236, 0x8584, 0x8FEB,
0x66DD, 0x6F20, 0x7206, 0x7E1B, 0x83AB, 0x99C1, 0x9EA6,
};
-static const unsigned short euc_to_utf8_C8[] = {
+const unsigned short euc_to_utf8_C8[] = {
0x51FD, 0x7BB1, 0x7872, 0x7BB8, 0x8087, 0x7B48, 0x6AE8,
0x5E61, 0x808C, 0x7551, 0x7560, 0x516B, 0x9262, 0x6E8C, 0x767A,
0x9197, 0x9AEA, 0x4F10, 0x7F70, 0x629C, 0x7B4F, 0x95A5, 0x9CE9,
@@ -628,7 +593,7 @@ static const unsigned short euc_to_utf8_C8[] = {
0x8AB9, 0x8CBB, 0x907F, 0x975E, 0x98DB, 0x6A0B, 0x7C38, 0x5099,
0x5C3E, 0x5FAE, 0x6787, 0x6BD8, 0x7435, 0x7709, 0x7F8E,
};
-static const unsigned short euc_to_utf8_C9[] = {
+const unsigned short euc_to_utf8_C9[] = {
0x9F3B, 0x67CA, 0x7A17, 0x5339, 0x758B, 0x9AED, 0x5F66,
0x819D, 0x83F1, 0x8098, 0x5F3C, 0x5FC5, 0x7562, 0x7B46, 0x903C,
0x6867, 0x59EB, 0x5A9B, 0x7D10, 0x767E, 0x8B2C, 0x4FF5, 0x5F6A,
@@ -642,7 +607,7 @@ static const unsigned short euc_to_utf8_C9[] = {
0x6B66, 0x821E, 0x8461, 0x856A, 0x90E8, 0x5C01, 0x6953, 0x98A8,
0x847A, 0x8557, 0x4F0F, 0x526F, 0x5FA9, 0x5E45, 0x670D,
};
-static const unsigned short euc_to_utf8_CA[] = {
+const unsigned short euc_to_utf8_CA[] = {
0x798F, 0x8179, 0x8907, 0x8986, 0x6DF5, 0x5F17, 0x6255,
0x6CB8, 0x4ECF, 0x7269, 0x9B92, 0x5206, 0x543B, 0x5674, 0x58B3,
0x61A4, 0x626E, 0x711A, 0x596E, 0x7C89, 0x7CDE, 0x7D1B, 0x96F0,
@@ -656,7 +621,7 @@ static const unsigned short euc_to_utf8_CA[] = {
0x4FF8, 0x5305, 0x5446, 0x5831, 0x5949, 0x5B9D, 0x5CF0, 0x5CEF,
0x5D29, 0x5E96, 0x62B1, 0x6367, 0x653E, 0x65B9, 0x670B,
};
-static const unsigned short euc_to_utf8_CB[] = {
+const unsigned short euc_to_utf8_CB[] = {
0x6CD5, 0x6CE1, 0x70F9, 0x7832, 0x7E2B, 0x80DE, 0x82B3,
0x840C, 0x84EC, 0x8702, 0x8912, 0x8A2A, 0x8C4A, 0x90A6, 0x92D2,
0x98FD, 0x9CF3, 0x9D6C, 0x4E4F, 0x4EA1, 0x508D, 0x5256, 0x574A,
@@ -670,7 +635,7 @@ static const unsigned short euc_to_utf8_CB[] = {
0x9C52, 0x685D, 0x4EA6, 0x4FE3, 0x53C8, 0x62B9, 0x672B, 0x6CAB,
0x8FC4, 0x4FAD, 0x7E6D, 0x9EBF, 0x4E07, 0x6162, 0x6E80,
};
-static const unsigned short euc_to_utf8_CC[] = {
+const unsigned short euc_to_utf8_CC[] = {
0x6F2B, 0x8513, 0x5473, 0x672A, 0x9B45, 0x5DF3, 0x7B95,
0x5CAC, 0x5BC6, 0x871C, 0x6E4A, 0x84D1, 0x7A14, 0x8108, 0x5999,
0x7C8D, 0x6C11, 0x7720, 0x52D9, 0x5922, 0x7121, 0x725F, 0x77DB,
@@ -684,7 +649,7 @@ static const unsigned short euc_to_utf8_CC[] = {
0x77E2, 0x5384, 0x5F79, 0x7D04, 0x85AC, 0x8A33, 0x8E8D, 0x9756,
0x67F3, 0x85AE, 0x9453, 0x6109, 0x6108, 0x6CB9, 0x7652,
};
-static const unsigned short euc_to_utf8_CD[] = {
+const unsigned short euc_to_utf8_CD[] = {
0x8AED, 0x8F38, 0x552F, 0x4F51, 0x512A, 0x52C7, 0x53CB,
0x5BA5, 0x5E7D, 0x60A0, 0x6182, 0x63D6, 0x6709, 0x67DA, 0x6E67,
0x6D8C, 0x7336, 0x7337, 0x7531, 0x7950, 0x88D5, 0x8A98, 0x904A,
@@ -698,7 +663,7 @@ static const unsigned short euc_to_utf8_CD[] = {
0x4E71, 0x5375, 0x5D50, 0x6B04, 0x6FEB, 0x85CD, 0x862D, 0x89A7,
0x5229, 0x540F, 0x5C65, 0x674E, 0x68A8, 0x7406, 0x7483,
};
-static const unsigned short euc_to_utf8_CE[] = {
+const unsigned short euc_to_utf8_CE[] = {
0x75E2, 0x88CF, 0x88E1, 0x91CC, 0x96E2, 0x9678, 0x5F8B,
0x7387, 0x7ACB, 0x844E, 0x63A0, 0x7565, 0x5289, 0x6D41, 0x6E9C,
0x7409, 0x7559, 0x786B, 0x7C92, 0x9686, 0x7ADC, 0x9F8D, 0x4FB6,
@@ -712,7 +677,7 @@ static const unsigned short euc_to_utf8_CE[] = {
0x9F62, 0x66A6, 0x6B74, 0x5217, 0x52A3, 0x70C8, 0x88C2, 0x5EC9,
0x604B, 0x6190, 0x6F23, 0x7149, 0x7C3E, 0x7DF4, 0x806F,
};
-static const unsigned short euc_to_utf8_CF[] = {
+const unsigned short euc_to_utf8_CF[] = {
0x84EE, 0x9023, 0x932C, 0x5442, 0x9B6F, 0x6AD3, 0x7089,
0x8CC2, 0x8DEF, 0x9732, 0x52B4, 0x5A41, 0x5ECA, 0x5F04, 0x6717,
0x697C, 0x6994, 0x6D6A, 0x6F0F, 0x7262, 0x72FC, 0x7BED, 0x8001,
@@ -726,7 +691,7 @@ static const unsigned short euc_to_utf8_CF[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short euc_to_utf8_D0[] = {
+const unsigned short euc_to_utf8_D0[] = {
0x5F0C, 0x4E10, 0x4E15, 0x4E2A, 0x4E31, 0x4E36, 0x4E3C,
0x4E3F, 0x4E42, 0x4E56, 0x4E58, 0x4E82, 0x4E85, 0x8C6B, 0x4E8A,
0x8212, 0x5F0D, 0x4E8E, 0x4E9E, 0x4E9F, 0x4EA0, 0x4EA2, 0x4EB0,
@@ -740,7 +705,7 @@ static const unsigned short euc_to_utf8_D0[] = {
0x5043, 0x5047, 0x6703, 0x5055, 0x5050, 0x5048, 0x505A, 0x5056,
0x506C, 0x5078, 0x5080, 0x509A, 0x5085, 0x50B4, 0x50B2,
};
-static const unsigned short euc_to_utf8_D1[] = {
+const unsigned short euc_to_utf8_D1[] = {
0x50C9, 0x50CA, 0x50B3, 0x50C2, 0x50D6, 0x50DE, 0x50E5,
0x50ED, 0x50E3, 0x50EE, 0x50F9, 0x50F5, 0x5109, 0x5101, 0x5102,
0x5116, 0x5115, 0x5114, 0x511A, 0x5121, 0x513A, 0x5137, 0x513C,
@@ -754,7 +719,7 @@ static const unsigned short euc_to_utf8_D1[] = {
0x525E, 0x5254, 0x526A, 0x5274, 0x5269, 0x5273, 0x527F, 0x527D,
0x528D, 0x5294, 0x5292, 0x5271, 0x5288, 0x5291, 0x8FA8,
};
-static const unsigned short euc_to_utf8_D2[] = {
+const unsigned short euc_to_utf8_D2[] = {
0x8FA7, 0x52AC, 0x52AD, 0x52BC, 0x52B5, 0x52C1, 0x52CD,
0x52D7, 0x52DE, 0x52E3, 0x52E6, 0x98ED, 0x52E0, 0x52F3, 0x52F5,
0x52F8, 0x52F9, 0x5306, 0x5308, 0x7538, 0x530D, 0x5310, 0x530F,
@@ -768,7 +733,7 @@ static const unsigned short euc_to_utf8_D2[] = {
0x5492, 0x547B, 0x5480, 0x5476, 0x5484, 0x5490, 0x5486, 0x54C7,
0x54A2, 0x54B8, 0x54A5, 0x54AC, 0x54C4, 0x54C8, 0x54A8,
};
-static const unsigned short euc_to_utf8_D3[] = {
+const unsigned short euc_to_utf8_D3[] = {
0x54AB, 0x54C2, 0x54A4, 0x54BE, 0x54BC, 0x54D8, 0x54E5,
0x54E6, 0x550F, 0x5514, 0x54FD, 0x54EE, 0x54ED, 0x54FA, 0x54E2,
0x5539, 0x5540, 0x5563, 0x554C, 0x552E, 0x555C, 0x5545, 0x5556,
@@ -782,7 +747,7 @@ static const unsigned short euc_to_utf8_D3[] = {
0x56BC, 0x56C1, 0x56C3, 0x56C0, 0x56C8, 0x56CE, 0x56D1, 0x56D3,
0x56D7, 0x56EE, 0x56F9, 0x5700, 0x56FF, 0x5704, 0x5709,
};
-static const unsigned short euc_to_utf8_D4[] = {
+const unsigned short euc_to_utf8_D4[] = {
0x5708, 0x570B, 0x570D, 0x5713, 0x5718, 0x5716, 0x55C7,
0x571C, 0x5726, 0x5737, 0x5738, 0x574E, 0x573B, 0x5740, 0x574F,
0x5769, 0x57C0, 0x5788, 0x5761, 0x577F, 0x5789, 0x5793, 0x57A0,
@@ -796,7 +761,7 @@ static const unsigned short euc_to_utf8_D4[] = {
0x592D, 0x5932, 0x5938, 0x593E, 0x7AD2, 0x5955, 0x5950, 0x594E,
0x595A, 0x5958, 0x5962, 0x5960, 0x5967, 0x596C, 0x5969,
};
-static const unsigned short euc_to_utf8_D5[] = {
+const unsigned short euc_to_utf8_D5[] = {
0x5978, 0x5981, 0x599D, 0x4F5E, 0x4FAB, 0x59A3, 0x59B2,
0x59C6, 0x59E8, 0x59DC, 0x598D, 0x59D9, 0x59DA, 0x5A25, 0x5A1F,
0x5A11, 0x5A1C, 0x5A09, 0x5A1A, 0x5A40, 0x5A6C, 0x5A49, 0x5A35,
@@ -810,7 +775,7 @@ static const unsigned short euc_to_utf8_D5[] = {
0x5BF3, 0x5C05, 0x5C07, 0x5C08, 0x5C0D, 0x5C13, 0x5C20, 0x5C22,
0x5C28, 0x5C38, 0x5C39, 0x5C41, 0x5C46, 0x5C4E, 0x5C53,
};
-static const unsigned short euc_to_utf8_D6[] = {
+const unsigned short euc_to_utf8_D6[] = {
0x5C50, 0x5C4F, 0x5B71, 0x5C6C, 0x5C6E, 0x4E62, 0x5C76,
0x5C79, 0x5C8C, 0x5C91, 0x5C94, 0x599B, 0x5CAB, 0x5CBB, 0x5CB6,
0x5CBC, 0x5CB7, 0x5CC5, 0x5CBE, 0x5CC7, 0x5CD9, 0x5CE9, 0x5CFD,
@@ -824,7 +789,7 @@ static const unsigned short euc_to_utf8_D6[] = {
0x5E5F, 0x5E62, 0x5E64, 0x5E47, 0x5E75, 0x5E76, 0x5E7A, 0x9EBC,
0x5E7F, 0x5EA0, 0x5EC1, 0x5EC2, 0x5EC8, 0x5ED0, 0x5ECF,
};
-static const unsigned short euc_to_utf8_D7[] = {
+const unsigned short euc_to_utf8_D7[] = {
0x5ED6, 0x5EE3, 0x5EDD, 0x5EDA, 0x5EDB, 0x5EE2, 0x5EE1,
0x5EE8, 0x5EE9, 0x5EEC, 0x5EF1, 0x5EF3, 0x5EF0, 0x5EF4, 0x5EF8,
0x5EFE, 0x5F03, 0x5F09, 0x5F5D, 0x5F5C, 0x5F0B, 0x5F11, 0x5F16,
@@ -838,7 +803,7 @@ static const unsigned short euc_to_utf8_D7[] = {
0x604A, 0x6046, 0x604D, 0x6063, 0x6043, 0x6064, 0x6042, 0x606C,
0x606B, 0x6059, 0x6081, 0x608D, 0x60E7, 0x6083, 0x609A,
};
-static const unsigned short euc_to_utf8_D8[] = {
+const unsigned short euc_to_utf8_D8[] = {
0x6084, 0x609B, 0x6096, 0x6097, 0x6092, 0x60A7, 0x608B,
0x60E1, 0x60B8, 0x60E0, 0x60D3, 0x60B4, 0x5FF0, 0x60BD, 0x60C6,
0x60B5, 0x60D8, 0x614D, 0x6115, 0x6106, 0x60F6, 0x60F7, 0x6100,
@@ -852,7 +817,7 @@ static const unsigned short euc_to_utf8_D8[] = {
0x61E3, 0x61F6, 0x61FA, 0x61F4, 0x61FF, 0x61FD, 0x61FC, 0x61FE,
0x6200, 0x6208, 0x6209, 0x620D, 0x620C, 0x6214, 0x621B,
};
-static const unsigned short euc_to_utf8_D9[] = {
+const unsigned short euc_to_utf8_D9[] = {
0x621E, 0x6221, 0x622A, 0x622E, 0x6230, 0x6232, 0x6233,
0x6241, 0x624E, 0x625E, 0x6263, 0x625B, 0x6260, 0x6268, 0x627C,
0x6282, 0x6289, 0x627E, 0x6292, 0x6293, 0x6296, 0x62D4, 0x6283,
@@ -866,7 +831,7 @@ static const unsigned short euc_to_utf8_D9[] = {
0x651D, 0x6417, 0x6428, 0x640F, 0x6467, 0x646F, 0x6476, 0x644E,
0x652A, 0x6495, 0x6493, 0x64A5, 0x64A9, 0x6488, 0x64BC,
};
-static const unsigned short euc_to_utf8_DA[] = {
+const unsigned short euc_to_utf8_DA[] = {
0x64DA, 0x64D2, 0x64C5, 0x64C7, 0x64BB, 0x64D8, 0x64C2,
0x64F1, 0x64E7, 0x8209, 0x64E0, 0x64E1, 0x62AC, 0x64E3, 0x64EF,
0x652C, 0x64F6, 0x64F4, 0x64F2, 0x64FA, 0x6500, 0x64FD, 0x6518,
@@ -880,7 +845,7 @@ static const unsigned short euc_to_utf8_DA[] = {
0x665F, 0x6662, 0x6670, 0x6683, 0x6688, 0x668E, 0x6689, 0x6684,
0x6698, 0x669D, 0x66C1, 0x66B9, 0x66C9, 0x66BE, 0x66BC,
};
-static const unsigned short euc_to_utf8_DB[] = {
+const unsigned short euc_to_utf8_DB[] = {
0x66C4, 0x66B8, 0x66D6, 0x66DA, 0x66E0, 0x663F, 0x66E6,
0x66E9, 0x66F0, 0x66F5, 0x66F7, 0x670F, 0x6716, 0x671E, 0x6726,
0x6727, 0x9738, 0x672E, 0x673F, 0x6736, 0x6741, 0x6738, 0x6737,
@@ -894,7 +859,7 @@ static const unsigned short euc_to_utf8_DB[] = {
0x68B5, 0x68A0, 0x68BA, 0x690F, 0x688D, 0x687E, 0x6901, 0x68CA,
0x6908, 0x68D8, 0x6922, 0x6926, 0x68E1, 0x690C, 0x68CD,
};
-static const unsigned short euc_to_utf8_DC[] = {
+const unsigned short euc_to_utf8_DC[] = {
0x68D4, 0x68E7, 0x68D5, 0x6936, 0x6912, 0x6904, 0x68D7,
0x68E3, 0x6925, 0x68F9, 0x68E0, 0x68EF, 0x6928, 0x692A, 0x691A,
0x6923, 0x6921, 0x68C6, 0x6979, 0x6977, 0x695C, 0x6978, 0x696B,
@@ -908,7 +873,7 @@ static const unsigned short euc_to_utf8_DC[] = {
0x6A36, 0x6A78, 0x6A47, 0x6A62, 0x6A59, 0x6A66, 0x6A48, 0x6A38,
0x6A22, 0x6A90, 0x6A8D, 0x6AA0, 0x6A84, 0x6AA2, 0x6AA3,
};
-static const unsigned short euc_to_utf8_DD[] = {
+const unsigned short euc_to_utf8_DD[] = {
0x6A97, 0x8617, 0x6ABB, 0x6AC3, 0x6AC2, 0x6AB8, 0x6AB3,
0x6AAC, 0x6ADE, 0x6AD1, 0x6ADF, 0x6AAA, 0x6ADA, 0x6AEA, 0x6AFB,
0x6B05, 0x8616, 0x6AFA, 0x6B12, 0x6B16, 0x9B31, 0x6B1F, 0x6B38,
@@ -922,7 +887,7 @@ static const unsigned short euc_to_utf8_DD[] = {
0x6C7E, 0x6C68, 0x6C73, 0x6C92, 0x6C90, 0x6CC4, 0x6CF1, 0x6CD3,
0x6CBD, 0x6CD7, 0x6CC5, 0x6CDD, 0x6CAE, 0x6CB1, 0x6CBE,
};
-static const unsigned short euc_to_utf8_DE[] = {
+const unsigned short euc_to_utf8_DE[] = {
0x6CBA, 0x6CDB, 0x6CEF, 0x6CD9, 0x6CEA, 0x6D1F, 0x884D,
0x6D36, 0x6D2B, 0x6D3D, 0x6D38, 0x6D19, 0x6D35, 0x6D33, 0x6D12,
0x6D0C, 0x6D63, 0x6D93, 0x6D64, 0x6D5A, 0x6D79, 0x6D59, 0x6D8E,
@@ -936,7 +901,7 @@ static const unsigned short euc_to_utf8_DE[] = {
0x6EA5, 0x6EC2, 0x6E9F, 0x6F41, 0x6F11, 0x704C, 0x6EEC, 0x6EF8,
0x6EFE, 0x6F3F, 0x6EF2, 0x6F31, 0x6EEF, 0x6F32, 0x6ECC,
};
-static const unsigned short euc_to_utf8_DF[] = {
+const unsigned short euc_to_utf8_DF[] = {
0x6F3E, 0x6F13, 0x6EF7, 0x6F86, 0x6F7A, 0x6F78, 0x6F81,
0x6F80, 0x6F6F, 0x6F5B, 0x6FF3, 0x6F6D, 0x6F82, 0x6F7C, 0x6F58,
0x6F8E, 0x6F91, 0x6FC2, 0x6F66, 0x6FB3, 0x6FA3, 0x6FA1, 0x6FA4,
@@ -950,7 +915,7 @@ static const unsigned short euc_to_utf8_DF[] = {
0x7195, 0x71A8, 0x71AC, 0x71D7, 0x71B9, 0x71BE, 0x71D2, 0x71C9,
0x71D4, 0x71CE, 0x71E0, 0x71EC, 0x71E7, 0x71F5, 0x71FC,
};
-static const unsigned short euc_to_utf8_E0[] = {
+const unsigned short euc_to_utf8_E0[] = {
0x71F9, 0x71FF, 0x720D, 0x7210, 0x721B, 0x7228, 0x722D,
0x722C, 0x7230, 0x7232, 0x723B, 0x723C, 0x723F, 0x7240, 0x7246,
0x724B, 0x7258, 0x7274, 0x727E, 0x7282, 0x7281, 0x7287, 0x7292,
@@ -964,7 +929,7 @@ static const unsigned short euc_to_utf8_E0[] = {
0x7441, 0x745C, 0x7469, 0x7470, 0x7463, 0x746A, 0x7476, 0x747E,
0x748B, 0x749E, 0x74A7, 0x74CA, 0x74CF, 0x74D4, 0x73F1,
};
-static const unsigned short euc_to_utf8_E1[] = {
+const unsigned short euc_to_utf8_E1[] = {
0x74E0, 0x74E3, 0x74E7, 0x74E9, 0x74EE, 0x74F2, 0x74F0,
0x74F1, 0x74F8, 0x74F7, 0x7504, 0x7503, 0x7505, 0x750C, 0x750E,
0x750D, 0x7515, 0x7513, 0x751E, 0x7526, 0x752C, 0x753C, 0x7544,
@@ -978,7 +943,7 @@ static const unsigned short euc_to_utf8_E1[] = {
0x7630, 0x763B, 0x7647, 0x7648, 0x7646, 0x765C, 0x7658, 0x7661,
0x7662, 0x7668, 0x7669, 0x766A, 0x7667, 0x766C, 0x7670,
};
-static const unsigned short euc_to_utf8_E2[] = {
+const unsigned short euc_to_utf8_E2[] = {
0x7672, 0x7676, 0x7678, 0x767C, 0x7680, 0x7683, 0x7688,
0x768B, 0x768E, 0x7696, 0x7693, 0x7699, 0x769A, 0x76B0, 0x76B4,
0x76B8, 0x76B9, 0x76BA, 0x76C2, 0x76CD, 0x76D6, 0x76D2, 0x76DE,
@@ -992,7 +957,7 @@ static const unsigned short euc_to_utf8_E2[] = {
0x789A, 0x788C, 0x78A3, 0x78B5, 0x78AA, 0x78AF, 0x78D1, 0x78C6,
0x78CB, 0x78D4, 0x78BE, 0x78BC, 0x78C5, 0x78CA, 0x78EC,
};
-static const unsigned short euc_to_utf8_E3[] = {
+const unsigned short euc_to_utf8_E3[] = {
0x78E7, 0x78DA, 0x78FD, 0x78F4, 0x7907, 0x7912, 0x7911,
0x7919, 0x792C, 0x792B, 0x7940, 0x7960, 0x7957, 0x795F, 0x795A,
0x7955, 0x7953, 0x797A, 0x797F, 0x798A, 0x799D, 0x79A7, 0x9F4B,
@@ -1006,7 +971,7 @@ static const unsigned short euc_to_utf8_E3[] = {
0x7AE6, 0x7AED, 0x7AF0, 0x7B02, 0x7B0F, 0x7B0A, 0x7B06, 0x7B33,
0x7B18, 0x7B19, 0x7B1E, 0x7B35, 0x7B28, 0x7B36, 0x7B50,
};
-static const unsigned short euc_to_utf8_E4[] = {
+const unsigned short euc_to_utf8_E4[] = {
0x7B7A, 0x7B04, 0x7B4D, 0x7B0B, 0x7B4C, 0x7B45, 0x7B75,
0x7B65, 0x7B74, 0x7B67, 0x7B70, 0x7B71, 0x7B6C, 0x7B6E, 0x7B9D,
0x7B98, 0x7B9F, 0x7B8D, 0x7B9C, 0x7B9A, 0x7B8B, 0x7B92, 0x7B8F,
@@ -1020,7 +985,7 @@ static const unsigned short euc_to_utf8_E4[] = {
0x7CBD, 0x7CC0, 0x7CC5, 0x7CC2, 0x7CD8, 0x7CD2, 0x7CDC, 0x7CE2,
0x9B3B, 0x7CEF, 0x7CF2, 0x7CF4, 0x7CF6, 0x7CFA, 0x7D06,
};
-static const unsigned short euc_to_utf8_E5[] = {
+const unsigned short euc_to_utf8_E5[] = {
0x7D02, 0x7D1C, 0x7D15, 0x7D0A, 0x7D45, 0x7D4B, 0x7D2E,
0x7D32, 0x7D3F, 0x7D35, 0x7D46, 0x7D73, 0x7D56, 0x7D4E, 0x7D72,
0x7D68, 0x7D6E, 0x7D4F, 0x7D63, 0x7D93, 0x7D89, 0x7D5B, 0x7D8F,
@@ -1034,7 +999,7 @@ static const unsigned short euc_to_utf8_E5[] = {
0x8FAE, 0x7E7F, 0x7E88, 0x7E89, 0x7E8C, 0x7E92, 0x7E90, 0x7E93,
0x7E94, 0x7E96, 0x7E8E, 0x7E9B, 0x7E9C, 0x7F38, 0x7F3A,
};
-static const unsigned short euc_to_utf8_E6[] = {
+const unsigned short euc_to_utf8_E6[] = {
0x7F45, 0x7F4C, 0x7F4D, 0x7F4E, 0x7F50, 0x7F51, 0x7F55,
0x7F54, 0x7F58, 0x7F5F, 0x7F60, 0x7F68, 0x7F69, 0x7F67, 0x7F78,
0x7F82, 0x7F86, 0x7F83, 0x7F88, 0x7F87, 0x7F8C, 0x7F94, 0x7F9E,
@@ -1048,7 +1013,7 @@ static const unsigned short euc_to_utf8_E6[] = {
0x80DB, 0x80E5, 0x80D9, 0x80DD, 0x80C4, 0x80DA, 0x80D6, 0x8109,
0x80EF, 0x80F1, 0x811B, 0x8129, 0x8123, 0x812F, 0x814B,
};
-static const unsigned short euc_to_utf8_E7[] = {
+const unsigned short euc_to_utf8_E7[] = {
0x968B, 0x8146, 0x813E, 0x8153, 0x8151, 0x80FC, 0x8171,
0x816E, 0x8165, 0x8166, 0x8174, 0x8183, 0x8188, 0x818A, 0x8180,
0x8182, 0x81A0, 0x8195, 0x81A4, 0x81A3, 0x815F, 0x8193, 0x81A9,
@@ -1062,7 +1027,7 @@ static const unsigned short euc_to_utf8_E7[] = {
0x82E3, 0x82DF, 0x82D2, 0x82F4, 0x82F3, 0x82FA, 0x8393, 0x8303,
0x82FB, 0x82F9, 0x82DE, 0x8306, 0x82DC, 0x8309, 0x82D9,
};
-static const unsigned short euc_to_utf8_E8[] = {
+const unsigned short euc_to_utf8_E8[] = {
0x8335, 0x8334, 0x8316, 0x8332, 0x8331, 0x8340, 0x8339,
0x8350, 0x8345, 0x832F, 0x832B, 0x8317, 0x8318, 0x8385, 0x839A,
0x83AA, 0x839F, 0x83A2, 0x8396, 0x8323, 0x838E, 0x8387, 0x838A,
@@ -1076,7 +1041,7 @@ static const unsigned short euc_to_utf8_E8[] = {
0x84A1, 0x8521, 0x84FF, 0x84F4, 0x8517, 0x8518, 0x852C, 0x851F,
0x8515, 0x8514, 0x84FC, 0x8540, 0x8563, 0x8558, 0x8548,
};
-static const unsigned short euc_to_utf8_E9[] = {
+const unsigned short euc_to_utf8_E9[] = {
0x8541, 0x8602, 0x854B, 0x8555, 0x8580, 0x85A4, 0x8588,
0x8591, 0x858A, 0x85A8, 0x856D, 0x8594, 0x859B, 0x85EA, 0x8587,
0x859C, 0x8577, 0x857E, 0x8590, 0x85C9, 0x85BA, 0x85CF, 0x85B9,
@@ -1090,7 +1055,7 @@ static const unsigned short euc_to_utf8_E9[] = {
0x8737, 0x873B, 0x8725, 0x8729, 0x871A, 0x8760, 0x875F, 0x8778,
0x874C, 0x874E, 0x8774, 0x8757, 0x8768, 0x876E, 0x8759,
};
-static const unsigned short euc_to_utf8_EA[] = {
+const unsigned short euc_to_utf8_EA[] = {
0x8753, 0x8763, 0x876A, 0x8805, 0x87A2, 0x879F, 0x8782,
0x87AF, 0x87CB, 0x87BD, 0x87C0, 0x87D0, 0x96D6, 0x87AB, 0x87C4,
0x87B3, 0x87C7, 0x87C6, 0x87BB, 0x87EF, 0x87F2, 0x87E0, 0x880F,
@@ -1104,7 +1069,7 @@ static const unsigned short euc_to_utf8_EA[] = {
0x8913, 0x8943, 0x891E, 0x8925, 0x892A, 0x892B, 0x8941, 0x8944,
0x893B, 0x8936, 0x8938, 0x894C, 0x891D, 0x8960, 0x895E,
};
-static const unsigned short euc_to_utf8_EB[] = {
+const unsigned short euc_to_utf8_EB[] = {
0x8966, 0x8964, 0x896D, 0x896A, 0x896F, 0x8974, 0x8977,
0x897E, 0x8983, 0x8988, 0x898A, 0x8993, 0x8998, 0x89A1, 0x89A9,
0x89A6, 0x89AC, 0x89AF, 0x89B2, 0x89BA, 0x89BD, 0x89BF, 0x89C0,
@@ -1118,7 +1083,7 @@ static const unsigned short euc_to_utf8_EB[] = {
0x8B33, 0x97AB, 0x8B26, 0x8B2B, 0x8B3E, 0x8B28, 0x8B41, 0x8B4C,
0x8B4F, 0x8B4E, 0x8B49, 0x8B56, 0x8B5B, 0x8B5A, 0x8B6B,
};
-static const unsigned short euc_to_utf8_EC[] = {
+const unsigned short euc_to_utf8_EC[] = {
0x8B5F, 0x8B6C, 0x8B6F, 0x8B74, 0x8B7D, 0x8B80, 0x8B8C,
0x8B8E, 0x8B92, 0x8B93, 0x8B96, 0x8B99, 0x8B9A, 0x8C3A, 0x8C41,
0x8C3F, 0x8C48, 0x8C4C, 0x8C4E, 0x8C50, 0x8C55, 0x8C62, 0x8C6C,
@@ -1132,7 +1097,7 @@ static const unsigned short euc_to_utf8_EC[] = {
0x8DDF, 0x8DE3, 0x8DFC, 0x8E08, 0x8E09, 0x8DFF, 0x8E1D, 0x8E1E,
0x8E10, 0x8E1F, 0x8E42, 0x8E35, 0x8E30, 0x8E34, 0x8E4A,
};
-static const unsigned short euc_to_utf8_ED[] = {
+const unsigned short euc_to_utf8_ED[] = {
0x8E47, 0x8E49, 0x8E4C, 0x8E50, 0x8E48, 0x8E59, 0x8E64,
0x8E60, 0x8E2A, 0x8E63, 0x8E55, 0x8E76, 0x8E72, 0x8E7C, 0x8E81,
0x8E87, 0x8E85, 0x8E84, 0x8E8B, 0x8E8A, 0x8E93, 0x8E91, 0x8E94,
@@ -1146,7 +1111,7 @@ static const unsigned short euc_to_utf8_ED[] = {
0x9005, 0x8FF9, 0x8FFA, 0x9011, 0x9015, 0x9021, 0x900D, 0x901E,
0x9016, 0x900B, 0x9027, 0x9036, 0x9035, 0x9039, 0x8FF8,
};
-static const unsigned short euc_to_utf8_EE[] = {
+const unsigned short euc_to_utf8_EE[] = {
0x904F, 0x9050, 0x9051, 0x9052, 0x900E, 0x9049, 0x903E,
0x9056, 0x9058, 0x905E, 0x9068, 0x906F, 0x9076, 0x96A8, 0x9072,
0x9082, 0x907D, 0x9081, 0x9080, 0x908A, 0x9089, 0x908F, 0x90A8,
@@ -1160,7 +1125,7 @@ static const unsigned short euc_to_utf8_EE[] = {
0x924B, 0x9250, 0x929C, 0x9296, 0x9293, 0x929B, 0x925A, 0x92CF,
0x92B9, 0x92B7, 0x92E9, 0x930F, 0x92FA, 0x9344, 0x932E,
};
-static const unsigned short euc_to_utf8_EF[] = {
+const unsigned short euc_to_utf8_EF[] = {
0x9319, 0x9322, 0x931A, 0x9323, 0x933A, 0x9335, 0x933B,
0x935C, 0x9360, 0x937C, 0x936E, 0x9356, 0x93B0, 0x93AC, 0x93AD,
0x9394, 0x93B9, 0x93D6, 0x93D7, 0x93E8, 0x93E5, 0x93D8, 0x93C3,
@@ -1174,7 +1139,7 @@ static const unsigned short euc_to_utf8_EF[] = {
0x95DC, 0x95E1, 0x95E5, 0x95E2, 0x9621, 0x9628, 0x962E, 0x962F,
0x9642, 0x964C, 0x964F, 0x964B, 0x9677, 0x965C, 0x965E,
};
-static const unsigned short euc_to_utf8_F0[] = {
+const unsigned short euc_to_utf8_F0[] = {
0x965D, 0x965F, 0x9666, 0x9672, 0x966C, 0x968D, 0x9698,
0x9695, 0x9697, 0x96AA, 0x96A7, 0x96B1, 0x96B2, 0x96B0, 0x96B4,
0x96B6, 0x96B8, 0x96B9, 0x96CE, 0x96CB, 0x96C9, 0x96CD, 0x894D,
@@ -1188,7 +1153,7 @@ static const unsigned short euc_to_utf8_F0[] = {
0x97F6, 0x97F5, 0x980F, 0x980C, 0x9838, 0x9824, 0x9821, 0x9837,
0x983D, 0x9846, 0x984F, 0x984B, 0x986B, 0x986F, 0x9870,
};
-static const unsigned short euc_to_utf8_F1[] = {
+const unsigned short euc_to_utf8_F1[] = {
0x9871, 0x9874, 0x9873, 0x98AA, 0x98AF, 0x98B1, 0x98B6,
0x98C4, 0x98C3, 0x98C6, 0x98E9, 0x98EB, 0x9903, 0x9909, 0x9912,
0x9914, 0x9918, 0x9921, 0x991D, 0x991E, 0x9924, 0x9920, 0x992C,
@@ -1202,7 +1167,7 @@ static const unsigned short euc_to_utf8_F1[] = {
0x9ACF, 0x9AD1, 0x9AD3, 0x9AD4, 0x9ADE, 0x9ADF, 0x9AE2, 0x9AE3,
0x9AE6, 0x9AEF, 0x9AEB, 0x9AEE, 0x9AF4, 0x9AF1, 0x9AF7,
};
-static const unsigned short euc_to_utf8_F2[] = {
+const unsigned short euc_to_utf8_F2[] = {
0x9AFB, 0x9B06, 0x9B18, 0x9B1A, 0x9B1F, 0x9B22, 0x9B23,
0x9B25, 0x9B27, 0x9B28, 0x9B29, 0x9B2A, 0x9B2E, 0x9B2F, 0x9B32,
0x9B44, 0x9B43, 0x9B4F, 0x9B4D, 0x9B4E, 0x9B51, 0x9B58, 0x9B74,
@@ -1216,7 +1181,7 @@ static const unsigned short euc_to_utf8_F2[] = {
0x9D03, 0x9D06, 0x9D2A, 0x9D26, 0x9DAF, 0x9D23, 0x9D1F, 0x9D44,
0x9D15, 0x9D12, 0x9D41, 0x9D3F, 0x9D3E, 0x9D46, 0x9D48,
};
-static const unsigned short euc_to_utf8_F3[] = {
+const unsigned short euc_to_utf8_F3[] = {
0x9D5D, 0x9D5E, 0x9D64, 0x9D51, 0x9D50, 0x9D59, 0x9D72,
0x9D89, 0x9D87, 0x9DAB, 0x9D6F, 0x9D7A, 0x9D9A, 0x9DA4, 0x9DA9,
0x9DB2, 0x9DC4, 0x9DC1, 0x9DBB, 0x9DB8, 0x9DBA, 0x9DC6, 0x9DCF,
@@ -1230,7 +1195,7 @@ static const unsigned short euc_to_utf8_F3[] = {
0x9F54, 0x9F63, 0x9F5F, 0x9F60, 0x9F61, 0x9F66, 0x9F67, 0x9F6C,
0x9F6A, 0x9F77, 0x9F72, 0x9F76, 0x9F95, 0x9F9C, 0x9FA0,
};
-static const unsigned short euc_to_utf8_F4[] = {
+const unsigned short euc_to_utf8_F4[] = {
0x582F, 0x69C7, 0x9059, 0x7464, 0x51DC, 0x7199, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -1244,7 +1209,7 @@ static const unsigned short euc_to_utf8_F4[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short euc_to_utf8_F5[] = {
+const unsigned short euc_to_utf8_F5[] = {
0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0xFE33, 0, 0, 0, 0, 0,
@@ -1258,7 +1223,7 @@ static const unsigned short euc_to_utf8_F5[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short euc_to_utf8_F9[] = {
+const unsigned short euc_to_utf8_F9[] = {
0x7E8A, 0x891C, 0x9348, 0x9288, 0x84DC, 0x4FC9, 0x70BB,
0x6631, 0x68C8, 0x92F9, 0x66FB, 0x5F45, 0x4E28, 0x4EE1, 0x4EFC,
0x4F00, 0x4F03, 0x4F39, 0x4F56, 0x4F92, 0x4F8A, 0x4F9A, 0x4F94,
@@ -1272,7 +1237,7 @@ static const unsigned short euc_to_utf8_F9[] = {
0x5CA6, 0x5CBA, 0x5CF5, 0x5D27, 0x5D53, 0xFA11, 0x5D42, 0x5D6D,
0x5DB8, 0x5DB9, 0x5DD0, 0x5F21, 0x5F34, 0x5F67, 0x5FB7,
};
-static const unsigned short euc_to_utf8_FA[] = {
+const unsigned short euc_to_utf8_FA[] = {
0x5FDE, 0x605D, 0x6085, 0x608A, 0x60DE, 0x60D5, 0x6120,
0x60F2, 0x6111, 0x6137, 0x6130, 0x6198, 0x6213, 0x62A6, 0x63F5,
0x6460, 0x649D, 0x64CE, 0x654E, 0x6600, 0x6615, 0x663B, 0x6609,
@@ -1286,7 +1251,7 @@ static const unsigned short euc_to_utf8_FA[] = {
0x6FF5, 0x7005, 0x7007, 0x7028, 0x7085, 0x70AB, 0x710F, 0x7104,
0x715C, 0x7146, 0x7147, 0xFA15, 0x71C1, 0x71FE, 0x72B1,
};
-static const unsigned short euc_to_utf8_FB[] = {
+const unsigned short euc_to_utf8_FB[] = {
0x72BE, 0x7324, 0xFA16, 0x7377, 0x73BD, 0x73C9, 0x73D6,
0x73E3, 0x73D2, 0x7407, 0x73F5, 0x7426, 0x742A, 0x7429, 0x742E,
0x7462, 0x7489, 0x749F, 0x7501, 0x756F, 0x7682, 0x769C, 0x769E,
@@ -1300,7 +1265,7 @@ static const unsigned short euc_to_utf8_FB[] = {
0x8B7F, 0x8CF0, 0x8CF4, 0x8D12, 0x8D76, 0xFA23, 0x8ECF, 0xFA24,
0xFA25, 0x9067, 0x90DE, 0xFA26, 0x9115, 0x9127, 0x91DA,
};
-static const unsigned short euc_to_utf8_FC[] = {
+const unsigned short euc_to_utf8_FC[] = {
0x91D7, 0x91DE, 0x91ED, 0x91EE, 0x91E4, 0x91E5, 0x9206,
0x9210, 0x920A, 0x923A, 0x9240, 0x923C, 0x924E, 0x9259, 0x9251,
0x9239, 0x9267, 0x92A7, 0x9277, 0x9278, 0x92E7, 0x92D7, 0x92D9,
@@ -1316,7 +1281,7 @@ static const unsigned short euc_to_utf8_FC[] = {
};
/* Microsoft UCS Mapping Compatible */
-static const unsigned short euc_to_utf8_FC_ms[] = {
+const unsigned short euc_to_utf8_FC_ms[] = {
0x91D7, 0x91DE, 0x91ED, 0x91EE, 0x91E4, 0x91E5, 0x9206,
0x9210, 0x920A, 0x923A, 0x9240, 0x923C, 0x924E, 0x9259, 0x9251,
0x9239, 0x9267, 0x92A7, 0x9277, 0x9278, 0x92E7, 0x92D7, 0x92D9,
@@ -1332,7 +1297,7 @@ static const unsigned short euc_to_utf8_FC_ms[] = {
};
#ifdef X0212_ENABLE
-static const unsigned short euc_to_utf8_8FA2[] = {
+const unsigned short euc_to_utf8_8FA2[] = {
0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0x02D8,
0x02C7, 0x00B8, 0x02D9, 0x02DD, 0x00AF, 0x02DB, 0x02DA, 0xFF5E,
@@ -1346,7 +1311,7 @@ static const unsigned short euc_to_utf8_8FA2[] = {
0x00A4, 0x2116, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short euc_to_utf8_8FA6[] = {
+const unsigned short euc_to_utf8_8FA6[] = {
0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -1360,7 +1325,7 @@ static const unsigned short euc_to_utf8_8FA6[] = {
0, 0x03AC, 0x03AD, 0x03AE, 0x03AF, 0x03CA, 0x0390, 0x03CC,
0x03C2, 0x03CD, 0x03CB, 0x03B0, 0x03CE, 0, 0,
};
-static const unsigned short euc_to_utf8_8FA7[] = {
+const unsigned short euc_to_utf8_8FA7[] = {
0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -1374,7 +1339,7 @@ static const unsigned short euc_to_utf8_8FA7[] = {
0, 0, 0x0452, 0x0453, 0x0454, 0x0455, 0x0456, 0x0457,
0x0458, 0x0459, 0x045A, 0x045B, 0x045C, 0x045E, 0x045F,
};
-static const unsigned short euc_to_utf8_8FA9[] = {
+const unsigned short euc_to_utf8_8FA9[] = {
0x00C6, 0x0110, 0, 0x0126, 0, 0x0132, 0,
0x0141, 0x013F, 0, 0x014A, 0x00D8, 0x0152, 0, 0x0166,
0x00DE, 0, 0, 0, 0, 0, 0, 0,
@@ -1388,7 +1353,7 @@ static const unsigned short euc_to_utf8_8FA9[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short euc_to_utf8_8FAA[] = {
+const unsigned short euc_to_utf8_8FAA[] = {
0x00C1, 0x00C0, 0x00C4, 0x00C2, 0x0102, 0x01CD, 0x0100,
0x0104, 0x00C5, 0x00C3, 0x0106, 0x0108, 0x010C, 0x00C7, 0x010A,
0x010E, 0x00C9, 0x00C8, 0x00CB, 0x00CA, 0x011A, 0x0116, 0x0112,
@@ -1402,7 +1367,7 @@ static const unsigned short euc_to_utf8_8FAA[] = {
0x01D5, 0x0174, 0x00DD, 0x0178, 0x0176, 0x0179, 0x017D, 0x017B,
0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short euc_to_utf8_8FAB[] = {
+const unsigned short euc_to_utf8_8FAB[] = {
0x00E1, 0x00E0, 0x00E4, 0x00E2, 0x0103, 0x01CE, 0x0101,
0x0105, 0x00E5, 0x00E3, 0x0107, 0x0109, 0x010D, 0x00E7, 0x010B,
0x010F, 0x00E9, 0x00E8, 0x00EB, 0x00EA, 0x011B, 0x0117, 0x0113,
@@ -1416,7 +1381,7 @@ static const unsigned short euc_to_utf8_8FAB[] = {
0x01D6, 0x0175, 0x00FD, 0x00FF, 0x0177, 0x017A, 0x017E, 0x017C,
0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short euc_to_utf8_8FB0[] = {
+const unsigned short euc_to_utf8_8FB0[] = {
0x4E02, 0x4E04, 0x4E05, 0x4E0C, 0x4E12, 0x4E1F, 0x4E23,
0x4E24, 0x4E28, 0x4E2B, 0x4E2E, 0x4E2F, 0x4E30, 0x4E35, 0x4E40,
0x4E41, 0x4E44, 0x4E47, 0x4E51, 0x4E5A, 0x4E5C, 0x4E63, 0x4E68,
@@ -1430,7 +1395,7 @@ static const unsigned short euc_to_utf8_8FB0[] = {
0x4F5F, 0x4F63, 0x4F6A, 0x4F6C, 0x4F6E, 0x4F71, 0x4F77, 0x4F78,
0x4F79, 0x4F7A, 0x4F7D, 0x4F7E, 0x4F81, 0x4F82, 0x4F84,
};
-static const unsigned short euc_to_utf8_8FB1[] = {
+const unsigned short euc_to_utf8_8FB1[] = {
0x4F85, 0x4F89, 0x4F8A, 0x4F8C, 0x4F8E, 0x4F90, 0x4F92,
0x4F93, 0x4F94, 0x4F97, 0x4F99, 0x4F9A, 0x4F9E, 0x4F9F, 0x4FB2,
0x4FB7, 0x4FB9, 0x4FBB, 0x4FBC, 0x4FBD, 0x4FBE, 0x4FC0, 0x4FC1,
@@ -1444,7 +1409,7 @@ static const unsigned short euc_to_utf8_8FB1[] = {
0x5066, 0x5067, 0x506A, 0x506D, 0x5070, 0x5071, 0x503B, 0x5081,
0x5083, 0x5084, 0x5086, 0x508A, 0x508E, 0x508F, 0x5090,
};
-static const unsigned short euc_to_utf8_8FB2[] = {
+const unsigned short euc_to_utf8_8FB2[] = {
0x5092, 0x5093, 0x5094, 0x5096, 0x509B, 0x509C, 0x509E,
0x509F, 0x50A0, 0x50A1, 0x50A2, 0x50AA, 0x50AF, 0x50B0, 0x50B9,
0x50BA, 0x50BD, 0x50C0, 0x50C3, 0x50C4, 0x50C7, 0x50CC, 0x50CE,
@@ -1458,7 +1423,7 @@ static const unsigned short euc_to_utf8_8FB2[] = {
0x5183, 0x5184, 0x518B, 0x518E, 0x5198, 0x519D, 0x51A1, 0x51A3,
0x51AD, 0x51B8, 0x51BA, 0x51BC, 0x51BE, 0x51BF, 0x51C2,
};
-static const unsigned short euc_to_utf8_8FB3[] = {
+const unsigned short euc_to_utf8_8FB3[] = {
0x51C8, 0x51CF, 0x51D1, 0x51D2, 0x51D3, 0x51D5, 0x51D8,
0x51DE, 0x51E2, 0x51E5, 0x51EE, 0x51F2, 0x51F3, 0x51F4, 0x51F7,
0x5201, 0x5202, 0x5205, 0x5212, 0x5213, 0x5215, 0x5216, 0x5218,
@@ -1472,7 +1437,7 @@ static const unsigned short euc_to_utf8_8FB3[] = {
0x52E1, 0x52E5, 0x52E8, 0x52E9, 0x52EA, 0x52EC, 0x52F0, 0x52F1,
0x52F4, 0x52F6, 0x52F7, 0x5300, 0x5303, 0x530A, 0x530B,
};
-static const unsigned short euc_to_utf8_8FB4[] = {
+const unsigned short euc_to_utf8_8FB4[] = {
0x530C, 0x5311, 0x5313, 0x5318, 0x531B, 0x531C, 0x531E,
0x531F, 0x5325, 0x5327, 0x5328, 0x5329, 0x532B, 0x532C, 0x532D,
0x5330, 0x5332, 0x5335, 0x533C, 0x533D, 0x533E, 0x5342, 0x534C,
@@ -1486,7 +1451,7 @@ static const unsigned short euc_to_utf8_8FB4[] = {
0x5444, 0x5447, 0x544D, 0x544F, 0x545E, 0x5462, 0x5464, 0x5466,
0x5467, 0x5469, 0x546B, 0x546D, 0x546E, 0x5474, 0x547F,
};
-static const unsigned short euc_to_utf8_8FB5[] = {
+const unsigned short euc_to_utf8_8FB5[] = {
0x5481, 0x5483, 0x5485, 0x5488, 0x5489, 0x548D, 0x5491,
0x5495, 0x5496, 0x549C, 0x549F, 0x54A1, 0x54A6, 0x54A7, 0x54A9,
0x54AA, 0x54AD, 0x54AE, 0x54B1, 0x54B7, 0x54B9, 0x54BA, 0x54BB,
@@ -1500,7 +1465,7 @@ static const unsigned short euc_to_utf8_8FB5[] = {
0x5597, 0x55A3, 0x55A4, 0x55AD, 0x55B2, 0x55BF, 0x55C1, 0x55C3,
0x55C6, 0x55C9, 0x55CB, 0x55CC, 0x55CE, 0x55D1, 0x55D2,
};
-static const unsigned short euc_to_utf8_8FB6[] = {
+const unsigned short euc_to_utf8_8FB6[] = {
0x55D3, 0x55D7, 0x55D8, 0x55DB, 0x55DE, 0x55E2, 0x55E9,
0x55F6, 0x55FF, 0x5605, 0x5608, 0x560A, 0x560D, 0x560E, 0x560F,
0x5610, 0x5611, 0x5612, 0x5619, 0x562C, 0x5630, 0x5633, 0x5635,
@@ -1514,7 +1479,7 @@ static const unsigned short euc_to_utf8_8FB6[] = {
0x56CC, 0x56CD, 0x56D9, 0x56DC, 0x56DD, 0x56DF, 0x56E1, 0x56E4,
0x56E5, 0x56E6, 0x56E7, 0x56E8, 0x56F1, 0x56EB, 0x56ED,
};
-static const unsigned short euc_to_utf8_8FB7[] = {
+const unsigned short euc_to_utf8_8FB7[] = {
0x56F6, 0x56F7, 0x5701, 0x5702, 0x5707, 0x570A, 0x570C,
0x5711, 0x5715, 0x571A, 0x571B, 0x571D, 0x5720, 0x5722, 0x5723,
0x5724, 0x5725, 0x5729, 0x572A, 0x572C, 0x572E, 0x572F, 0x5733,
@@ -1528,7 +1493,7 @@ static const unsigned short euc_to_utf8_8FB7[] = {
0x57E7, 0x57E9, 0x57ED, 0x57F0, 0x57F5, 0x57F6, 0x57F8, 0x57FD,
0x57FE, 0x57FF, 0x5803, 0x5804, 0x5808, 0x5809, 0x57E1,
};
-static const unsigned short euc_to_utf8_8FB8[] = {
+const unsigned short euc_to_utf8_8FB8[] = {
0x580C, 0x580D, 0x581B, 0x581E, 0x581F, 0x5820, 0x5826,
0x5827, 0x582D, 0x5832, 0x5839, 0x583F, 0x5849, 0x584C, 0x584D,
0x584F, 0x5850, 0x5855, 0x585F, 0x5861, 0x5864, 0x5867, 0x5868,
@@ -1542,7 +1507,7 @@ static const unsigned short euc_to_utf8_8FB8[] = {
0x5936, 0x593F, 0x5943, 0x5946, 0x5952, 0x5953, 0x5959, 0x595B,
0x595D, 0x595E, 0x595F, 0x5961, 0x5963, 0x596B, 0x596D,
};
-static const unsigned short euc_to_utf8_8FB9[] = {
+const unsigned short euc_to_utf8_8FB9[] = {
0x596F, 0x5972, 0x5975, 0x5976, 0x5979, 0x597B, 0x597C,
0x598B, 0x598C, 0x598E, 0x5992, 0x5995, 0x5997, 0x599F, 0x59A4,
0x59A7, 0x59AD, 0x59AE, 0x59AF, 0x59B0, 0x59B3, 0x59B7, 0x59BA,
@@ -1556,7 +1521,7 @@ static const unsigned short euc_to_utf8_8FB9[] = {
0x5A9C, 0x5A9E, 0x5A9F, 0x5AA0, 0x5AA2, 0x5AA7, 0x5AAC, 0x5AB1,
0x5AB2, 0x5AB3, 0x5AB5, 0x5AB8, 0x5ABA, 0x5ABB, 0x5ABF,
};
-static const unsigned short euc_to_utf8_8FBA[] = {
+const unsigned short euc_to_utf8_8FBA[] = {
0x5AC4, 0x5AC6, 0x5AC8, 0x5ACF, 0x5ADA, 0x5ADC, 0x5AE0,
0x5AE5, 0x5AEA, 0x5AEE, 0x5AF5, 0x5AF6, 0x5AFD, 0x5B00, 0x5B01,
0x5B08, 0x5B17, 0x5B34, 0x5B19, 0x5B1B, 0x5B1D, 0x5B21, 0x5B25,
@@ -1570,7 +1535,7 @@ static const unsigned short euc_to_utf8_8FBA[] = {
0x5C2B, 0x5C2C, 0x5C2E, 0x5C30, 0x5C32, 0x5C35, 0x5C36, 0x5C59,
0x5C5A, 0x5C5C, 0x5C62, 0x5C63, 0x5C67, 0x5C68, 0x5C69,
};
-static const unsigned short euc_to_utf8_8FBB[] = {
+const unsigned short euc_to_utf8_8FBB[] = {
0x5C6D, 0x5C70, 0x5C74, 0x5C75, 0x5C7A, 0x5C7B, 0x5C7C,
0x5C7D, 0x5C87, 0x5C88, 0x5C8A, 0x5C8F, 0x5C92, 0x5C9D, 0x5C9F,
0x5CA0, 0x5CA2, 0x5CA3, 0x5CA6, 0x5CAA, 0x5CB2, 0x5CB4, 0x5CB5,
@@ -1584,7 +1549,7 @@ static const unsigned short euc_to_utf8_8FBB[] = {
0x5DA7, 0x5DAB, 0x5DB0, 0x5DB4, 0x5DB8, 0x5DB9, 0x5DC3, 0x5DC7,
0x5DCB, 0x5DD0, 0x5DCE, 0x5DD8, 0x5DD9, 0x5DE0, 0x5DE4,
};
-static const unsigned short euc_to_utf8_8FBC[] = {
+const unsigned short euc_to_utf8_8FBC[] = {
0x5DE9, 0x5DF8, 0x5DF9, 0x5E00, 0x5E07, 0x5E0D, 0x5E12,
0x5E14, 0x5E15, 0x5E18, 0x5E1F, 0x5E20, 0x5E2E, 0x5E28, 0x5E32,
0x5E35, 0x5E3E, 0x5E4B, 0x5E50, 0x5E49, 0x5E51, 0x5E56, 0x5E58,
@@ -1598,7 +1563,7 @@ static const unsigned short euc_to_utf8_8FBC[] = {
0x5F3D, 0x5F3F, 0x5F40, 0x5F44, 0x5F45, 0x5F47, 0x5F4D, 0x5F50,
0x5F54, 0x5F58, 0x5F5B, 0x5F60, 0x5F63, 0x5F64, 0x5F67,
};
-static const unsigned short euc_to_utf8_8FBD[] = {
+const unsigned short euc_to_utf8_8FBD[] = {
0x5F6F, 0x5F72, 0x5F74, 0x5F75, 0x5F78, 0x5F7A, 0x5F7D,
0x5F7E, 0x5F89, 0x5F8D, 0x5F8F, 0x5F96, 0x5F9C, 0x5F9D, 0x5FA2,
0x5FA7, 0x5FAB, 0x5FA4, 0x5FAC, 0x5FAF, 0x5FB0, 0x5FB1, 0x5FB8,
@@ -1612,7 +1577,7 @@ static const unsigned short euc_to_utf8_8FBD[] = {
0x608A, 0x608E, 0x6091, 0x6093, 0x6095, 0x6098, 0x609D, 0x609E,
0x60A2, 0x60A4, 0x60A5, 0x60A8, 0x60B0, 0x60B1, 0x60B7,
};
-static const unsigned short euc_to_utf8_8FBE[] = {
+const unsigned short euc_to_utf8_8FBE[] = {
0x60BB, 0x60BE, 0x60C2, 0x60C4, 0x60C8, 0x60C9, 0x60CA,
0x60CB, 0x60CE, 0x60CF, 0x60D4, 0x60D5, 0x60D9, 0x60DB, 0x60DD,
0x60DE, 0x60E2, 0x60E5, 0x60F2, 0x60F5, 0x60F8, 0x60FC, 0x60FD,
@@ -1626,7 +1591,7 @@ static const unsigned short euc_to_utf8_8FBE[] = {
0x61C0, 0x61C1, 0x61C2, 0x61CE, 0x61CF, 0x61D5, 0x61DC, 0x61DD,
0x61DE, 0x61DF, 0x61E1, 0x61E2, 0x61E7, 0x61E9, 0x61E5,
};
-static const unsigned short euc_to_utf8_8FBF[] = {
+const unsigned short euc_to_utf8_8FBF[] = {
0x61EC, 0x61ED, 0x61EF, 0x6201, 0x6203, 0x6204, 0x6207,
0x6213, 0x6215, 0x621C, 0x6220, 0x6222, 0x6223, 0x6227, 0x6229,
0x622B, 0x6239, 0x623D, 0x6242, 0x6243, 0x6244, 0x6246, 0x624C,
@@ -1640,7 +1605,7 @@ static const unsigned short euc_to_utf8_8FBF[] = {
0x634A, 0x634B, 0x634E, 0x6352, 0x6353, 0x6354, 0x6358, 0x635B,
0x6365, 0x6366, 0x636C, 0x636D, 0x6371, 0x6374, 0x6375,
};
-static const unsigned short euc_to_utf8_8FC0[] = {
+const unsigned short euc_to_utf8_8FC0[] = {
0x6378, 0x637C, 0x637D, 0x637F, 0x6382, 0x6384, 0x6387,
0x638A, 0x6390, 0x6394, 0x6395, 0x6399, 0x639A, 0x639E, 0x63A4,
0x63A6, 0x63AD, 0x63AE, 0x63AF, 0x63BD, 0x63C1, 0x63C5, 0x63C8,
@@ -1654,7 +1619,7 @@ static const unsigned short euc_to_utf8_8FC0[] = {
0x6491, 0x6498, 0x6499, 0x649B, 0x649D, 0x649F, 0x64A1, 0x64A3,
0x64A6, 0x64A8, 0x64AC, 0x64B3, 0x64BD, 0x64BE, 0x64BF,
};
-static const unsigned short euc_to_utf8_8FC1[] = {
+const unsigned short euc_to_utf8_8FC1[] = {
0x64C4, 0x64C9, 0x64CA, 0x64CB, 0x64CC, 0x64CE, 0x64D0,
0x64D1, 0x64D5, 0x64D7, 0x64E4, 0x64E5, 0x64E9, 0x64EA, 0x64ED,
0x64F0, 0x64F5, 0x64F7, 0x64FB, 0x64FF, 0x6501, 0x6504, 0x6508,
@@ -1668,7 +1633,7 @@ static const unsigned short euc_to_utf8_8FC1[] = {
0x65F4, 0x65F5, 0x65F9, 0x65FE, 0x65FF, 0x6600, 0x6604, 0x6608,
0x6609, 0x660D, 0x6611, 0x6612, 0x6615, 0x6616, 0x661D,
};
-static const unsigned short euc_to_utf8_8FC2[] = {
+const unsigned short euc_to_utf8_8FC2[] = {
0x661E, 0x6621, 0x6622, 0x6623, 0x6624, 0x6626, 0x6629,
0x662A, 0x662B, 0x662C, 0x662E, 0x6630, 0x6631, 0x6633, 0x6639,
0x6637, 0x6640, 0x6645, 0x6646, 0x664A, 0x664C, 0x6651, 0x664E,
@@ -1682,7 +1647,7 @@ static const unsigned short euc_to_utf8_8FC2[] = {
0x670E, 0x6713, 0x6719, 0x671C, 0x6720, 0x6722, 0x6733, 0x673E,
0x6745, 0x6747, 0x6748, 0x674C, 0x6754, 0x6755, 0x675D,
};
-static const unsigned short euc_to_utf8_8FC3[] = {
+const unsigned short euc_to_utf8_8FC3[] = {
0x6766, 0x676C, 0x676E, 0x6774, 0x6776, 0x677B, 0x6781,
0x6784, 0x678E, 0x678F, 0x6791, 0x6793, 0x6796, 0x6798, 0x6799,
0x679B, 0x67B0, 0x67B1, 0x67B2, 0x67B5, 0x67BB, 0x67BC, 0x67BD,
@@ -1696,7 +1661,7 @@ static const unsigned short euc_to_utf8_8FC3[] = {
0x6898, 0x689A, 0x689C, 0x68A1, 0x68A3, 0x68A5, 0x68A9, 0x68AA,
0x68AE, 0x68B2, 0x68BB, 0x68C5, 0x68C8, 0x68CC, 0x68CF,
};
-static const unsigned short euc_to_utf8_8FC4[] = {
+const unsigned short euc_to_utf8_8FC4[] = {
0x68D0, 0x68D1, 0x68D3, 0x68D6, 0x68D9, 0x68DC, 0x68DD,
0x68E5, 0x68E8, 0x68EA, 0x68EB, 0x68EC, 0x68ED, 0x68F0, 0x68F1,
0x68F5, 0x68F6, 0x68FB, 0x68FC, 0x68FD, 0x6906, 0x6909, 0x690A,
@@ -1710,7 +1675,7 @@ static const unsigned short euc_to_utf8_8FC4[] = {
0x69F5, 0x69FE, 0x6A00, 0x6A01, 0x6A03, 0x6A0F, 0x6A11, 0x6A15,
0x6A1A, 0x6A1D, 0x6A20, 0x6A24, 0x6A28, 0x6A30, 0x6A32,
};
-static const unsigned short euc_to_utf8_8FC5[] = {
+const unsigned short euc_to_utf8_8FC5[] = {
0x6A34, 0x6A37, 0x6A3B, 0x6A3E, 0x6A3F, 0x6A45, 0x6A46,
0x6A49, 0x6A4A, 0x6A4E, 0x6A50, 0x6A51, 0x6A52, 0x6A55, 0x6A56,
0x6A5B, 0x6A64, 0x6A67, 0x6A6A, 0x6A71, 0x6A73, 0x6A7E, 0x6A81,
@@ -1724,7 +1689,7 @@ static const unsigned short euc_to_utf8_8FC5[] = {
0x6B3F, 0x6B46, 0x6B4A, 0x6B4D, 0x6B52, 0x6B56, 0x6B58, 0x6B5D,
0x6B60, 0x6B67, 0x6B6B, 0x6B6E, 0x6B70, 0x6B75, 0x6B7D,
};
-static const unsigned short euc_to_utf8_8FC6[] = {
+const unsigned short euc_to_utf8_8FC6[] = {
0x6B7E, 0x6B82, 0x6B85, 0x6B97, 0x6B9B, 0x6B9F, 0x6BA0,
0x6BA2, 0x6BA3, 0x6BA8, 0x6BA9, 0x6BAC, 0x6BAD, 0x6BAE, 0x6BB0,
0x6BB8, 0x6BB9, 0x6BBD, 0x6BBE, 0x6BC3, 0x6BC4, 0x6BC9, 0x6BCC,
@@ -1738,7 +1703,7 @@ static const unsigned short euc_to_utf8_8FC6[] = {
0x6C98, 0x6C9C, 0x6C9F, 0x6CB0, 0x6CB2, 0x6CB4, 0x6CC2, 0x6CC6,
0x6CCD, 0x6CCF, 0x6CD0, 0x6CD1, 0x6CD2, 0x6CD4, 0x6CD6,
};
-static const unsigned short euc_to_utf8_8FC7[] = {
+const unsigned short euc_to_utf8_8FC7[] = {
0x6CDA, 0x6CDC, 0x6CE0, 0x6CE7, 0x6CE9, 0x6CEB, 0x6CEC,
0x6CEE, 0x6CF2, 0x6CF4, 0x6D04, 0x6D07, 0x6D0A, 0x6D0E, 0x6D0F,
0x6D11, 0x6D13, 0x6D1A, 0x6D26, 0x6D27, 0x6D28, 0x6C67, 0x6D2E,
@@ -1752,7 +1717,7 @@ static const unsigned short euc_to_utf8_8FC7[] = {
0x6E3C, 0x6E44, 0x6E45, 0x6E48, 0x6E49, 0x6E4B, 0x6E4F, 0x6E51,
0x6E52, 0x6E53, 0x6E54, 0x6E57, 0x6E5C, 0x6E5D, 0x6E5E,
};
-static const unsigned short euc_to_utf8_8FC8[] = {
+const unsigned short euc_to_utf8_8FC8[] = {
0x6E62, 0x6E63, 0x6E68, 0x6E73, 0x6E7B, 0x6E7D, 0x6E8D,
0x6E93, 0x6E99, 0x6EA0, 0x6EA7, 0x6EAD, 0x6EAE, 0x6EB1, 0x6EB3,
0x6EBB, 0x6EBF, 0x6EC0, 0x6EC1, 0x6EC3, 0x6EC7, 0x6EC8, 0x6ECA,
@@ -1766,7 +1731,7 @@ static const unsigned short euc_to_utf8_8FC8[] = {
0x6FA0, 0x6FA5, 0x6FA6, 0x6FA7, 0x6FA8, 0x6FAE, 0x6FAF, 0x6FB0,
0x6FB5, 0x6FB6, 0x6FBC, 0x6FC5, 0x6FC7, 0x6FC8, 0x6FCA,
};
-static const unsigned short euc_to_utf8_8FC9[] = {
+const unsigned short euc_to_utf8_8FC9[] = {
0x6FDA, 0x6FDE, 0x6FE8, 0x6FE9, 0x6FF0, 0x6FF5, 0x6FF9,
0x6FFC, 0x6FFD, 0x7000, 0x7005, 0x7006, 0x7007, 0x700D, 0x7017,
0x7020, 0x7023, 0x702F, 0x7034, 0x7037, 0x7039, 0x703C, 0x7043,
@@ -1780,7 +1745,7 @@ static const unsigned short euc_to_utf8_8FC9[] = {
0x7131, 0x7138, 0x7141, 0x7145, 0x7146, 0x7147, 0x714A, 0x714B,
0x7150, 0x7152, 0x7157, 0x715A, 0x715C, 0x715E, 0x7160,
};
-static const unsigned short euc_to_utf8_8FCA[] = {
+const unsigned short euc_to_utf8_8FCA[] = {
0x7168, 0x7179, 0x7180, 0x7185, 0x7187, 0x718C, 0x7192,
0x719A, 0x719B, 0x71A0, 0x71A2, 0x71AF, 0x71B0, 0x71B2, 0x71B3,
0x71BA, 0x71BF, 0x71C0, 0x71C1, 0x71C4, 0x71CB, 0x71CC, 0x71D3,
@@ -1794,7 +1759,7 @@ static const unsigned short euc_to_utf8_8FCA[] = {
0x72B4, 0x72BE, 0x72C1, 0x72C7, 0x72C9, 0x72CC, 0x72D5, 0x72D6,
0x72D8, 0x72DF, 0x72E5, 0x72F3, 0x72F4, 0x72FA, 0x72FB,
};
-static const unsigned short euc_to_utf8_8FCB[] = {
+const unsigned short euc_to_utf8_8FCB[] = {
0x72FE, 0x7302, 0x7304, 0x7305, 0x7307, 0x730B, 0x730D,
0x7312, 0x7313, 0x7318, 0x7319, 0x731E, 0x7322, 0x7324, 0x7327,
0x7328, 0x732C, 0x7331, 0x7332, 0x7335, 0x733A, 0x733B, 0x733D,
@@ -1808,7 +1773,7 @@ static const unsigned short euc_to_utf8_8FCB[] = {
0x73D6, 0x73D9, 0x73DD, 0x73E1, 0x73E3, 0x73E6, 0x73E7, 0x73E9,
0x73F4, 0x73F5, 0x73F7, 0x73F9, 0x73FA, 0x73FB, 0x73FD,
};
-static const unsigned short euc_to_utf8_8FCC[] = {
+const unsigned short euc_to_utf8_8FCC[] = {
0x73FF, 0x7400, 0x7401, 0x7404, 0x7407, 0x740A, 0x7411,
0x741A, 0x741B, 0x7424, 0x7426, 0x7428, 0x7429, 0x742A, 0x742B,
0x742C, 0x742D, 0x742E, 0x742F, 0x7430, 0x7431, 0x7439, 0x7440,
@@ -1822,7 +1787,7 @@ static const unsigned short euc_to_utf8_8FCC[] = {
0x74DA, 0x74DB, 0x74DE, 0x74DF, 0x74E4, 0x74E8, 0x74EA, 0x74EB,
0x74EF, 0x74F4, 0x74FA, 0x74FB, 0x74FC, 0x74FF, 0x7506,
};
-static const unsigned short euc_to_utf8_8FCD[] = {
+const unsigned short euc_to_utf8_8FCD[] = {
0x7512, 0x7516, 0x7517, 0x7520, 0x7521, 0x7524, 0x7527,
0x7529, 0x752A, 0x752F, 0x7536, 0x7539, 0x753D, 0x753E, 0x753F,
0x7540, 0x7543, 0x7547, 0x7548, 0x754E, 0x7550, 0x7552, 0x7557,
@@ -1836,7 +1801,7 @@ static const unsigned short euc_to_utf8_8FCD[] = {
0x7619, 0x761B, 0x761C, 0x761D, 0x761E, 0x7623, 0x7625, 0x7626,
0x7629, 0x762D, 0x7632, 0x7633, 0x7635, 0x7638, 0x7639,
};
-static const unsigned short euc_to_utf8_8FCE[] = {
+const unsigned short euc_to_utf8_8FCE[] = {
0x763A, 0x763C, 0x764A, 0x7640, 0x7641, 0x7643, 0x7644,
0x7645, 0x7649, 0x764B, 0x7655, 0x7659, 0x765F, 0x7664, 0x7665,
0x766D, 0x766E, 0x766F, 0x7671, 0x7674, 0x7681, 0x7685, 0x768C,
@@ -1850,7 +1815,7 @@ static const unsigned short euc_to_utf8_8FCE[] = {
0x7742, 0x7745, 0x7746, 0x774A, 0x774D, 0x774E, 0x774F, 0x7752,
0x7756, 0x7757, 0x775C, 0x775E, 0x775F, 0x7760, 0x7762,
};
-static const unsigned short euc_to_utf8_8FCF[] = {
+const unsigned short euc_to_utf8_8FCF[] = {
0x7764, 0x7767, 0x776A, 0x776C, 0x7770, 0x7772, 0x7773,
0x7774, 0x777A, 0x777D, 0x7780, 0x7784, 0x778C, 0x778D, 0x7794,
0x7795, 0x7796, 0x779A, 0x779F, 0x77A2, 0x77A7, 0x77AA, 0x77AE,
@@ -1864,7 +1829,7 @@ static const unsigned short euc_to_utf8_8FCF[] = {
0x788F, 0x7894, 0x7898, 0x78A1, 0x789D, 0x789E, 0x789F, 0x78A4,
0x78A8, 0x78AC, 0x78AD, 0x78B0, 0x78B1, 0x78B2, 0x78B3,
};
-static const unsigned short euc_to_utf8_8FD0[] = {
+const unsigned short euc_to_utf8_8FD0[] = {
0x78BB, 0x78BD, 0x78BF, 0x78C7, 0x78C8, 0x78C9, 0x78CC,
0x78CE, 0x78D2, 0x78D3, 0x78D5, 0x78D6, 0x78E4, 0x78DB, 0x78DF,
0x78E0, 0x78E1, 0x78E6, 0x78EA, 0x78F2, 0x78F3, 0x7900, 0x78F6,
@@ -1878,7 +1843,7 @@ static const unsigned short euc_to_utf8_8FD0[] = {
0x79B1, 0x79B4, 0x79B8, 0x79BB, 0x79C2, 0x79C4, 0x79C7, 0x79C8,
0x79CA, 0x79CF, 0x79D4, 0x79D6, 0x79DA, 0x79DD, 0x79DE,
};
-static const unsigned short euc_to_utf8_8FD1[] = {
+const unsigned short euc_to_utf8_8FD1[] = {
0x79E0, 0x79E2, 0x79E5, 0x79EA, 0x79EB, 0x79ED, 0x79F1,
0x79F8, 0x79FC, 0x7A02, 0x7A03, 0x7A07, 0x7A09, 0x7A0A, 0x7A0C,
0x7A11, 0x7A15, 0x7A1B, 0x7A1E, 0x7A21, 0x7A27, 0x7A2B, 0x7A2D,
@@ -1892,7 +1857,7 @@ static const unsigned short euc_to_utf8_8FD1[] = {
0x7AFB, 0x7AFD, 0x7AFE, 0x7B07, 0x7B14, 0x7B1F, 0x7B23, 0x7B27,
0x7B29, 0x7B2A, 0x7B2B, 0x7B2D, 0x7B2E, 0x7B2F, 0x7B30,
};
-static const unsigned short euc_to_utf8_8FD2[] = {
+const unsigned short euc_to_utf8_8FD2[] = {
0x7B31, 0x7B34, 0x7B3D, 0x7B3F, 0x7B40, 0x7B41, 0x7B47,
0x7B4E, 0x7B55, 0x7B60, 0x7B64, 0x7B66, 0x7B69, 0x7B6A, 0x7B6D,
0x7B6F, 0x7B72, 0x7B73, 0x7B77, 0x7B84, 0x7B89, 0x7B8E, 0x7B90,
@@ -1906,7 +1871,7 @@ static const unsigned short euc_to_utf8_8FD2[] = {
0x7C36, 0x7C39, 0x7C3A, 0x7C46, 0x7C4A, 0x7C55, 0x7C51, 0x7C52,
0x7C53, 0x7C59, 0x7C5A, 0x7C5B, 0x7C5C, 0x7C5D, 0x7C5E,
};
-static const unsigned short euc_to_utf8_8FD3[] = {
+const unsigned short euc_to_utf8_8FD3[] = {
0x7C61, 0x7C63, 0x7C67, 0x7C69, 0x7C6D, 0x7C6E, 0x7C70,
0x7C72, 0x7C79, 0x7C7C, 0x7C7D, 0x7C86, 0x7C87, 0x7C8F, 0x7C94,
0x7C9E, 0x7CA0, 0x7CA6, 0x7CB0, 0x7CB6, 0x7CB7, 0x7CBA, 0x7CBB,
@@ -1920,7 +1885,7 @@ static const unsigned short euc_to_utf8_8FD3[] = {
0x7D7B, 0x7D7F, 0x7D81, 0x7D82, 0x7D83, 0x7D85, 0x7D86, 0x7D88,
0x7D8B, 0x7D8C, 0x7D8D, 0x7D91, 0x7D96, 0x7D97, 0x7D9D,
};
-static const unsigned short euc_to_utf8_8FD4[] = {
+const unsigned short euc_to_utf8_8FD4[] = {
0x7D9E, 0x7DA6, 0x7DA7, 0x7DAA, 0x7DB3, 0x7DB6, 0x7DB7,
0x7DB9, 0x7DC2, 0x7DC3, 0x7DC4, 0x7DC5, 0x7DC6, 0x7DCC, 0x7DCD,
0x7DCE, 0x7DD7, 0x7DD9, 0x7E00, 0x7DE2, 0x7DE5, 0x7DE6, 0x7DEA,
@@ -1934,7 +1899,7 @@ static const unsigned short euc_to_utf8_8FD4[] = {
0x7F43, 0x7F44, 0x7F47, 0x7F4F, 0x7F52, 0x7F53, 0x7F5B, 0x7F5C,
0x7F5D, 0x7F61, 0x7F63, 0x7F64, 0x7F65, 0x7F66, 0x7F6D,
};
-static const unsigned short euc_to_utf8_8FD5[] = {
+const unsigned short euc_to_utf8_8FD5[] = {
0x7F71, 0x7F7D, 0x7F7E, 0x7F7F, 0x7F80, 0x7F8B, 0x7F8D,
0x7F8F, 0x7F90, 0x7F91, 0x7F96, 0x7F97, 0x7F9C, 0x7FA1, 0x7FA2,
0x7FA6, 0x7FAA, 0x7FAD, 0x7FB4, 0x7FBC, 0x7FBF, 0x7FC0, 0x7FC3,
@@ -1948,7 +1913,7 @@ static const unsigned short euc_to_utf8_8FD5[] = {
0x80A7, 0x80AB, 0x80B8, 0x80B9, 0x80C8, 0x80CD, 0x80CF, 0x80D2,
0x80D4, 0x80D5, 0x80D7, 0x80D8, 0x80E0, 0x80ED, 0x80EE,
};
-static const unsigned short euc_to_utf8_8FD6[] = {
+const unsigned short euc_to_utf8_8FD6[] = {
0x80F0, 0x80F2, 0x80F3, 0x80F6, 0x80F9, 0x80FA, 0x80FE,
0x8103, 0x810B, 0x8116, 0x8117, 0x8118, 0x811C, 0x811E, 0x8120,
0x8124, 0x8127, 0x812C, 0x8130, 0x8135, 0x813A, 0x813C, 0x8145,
@@ -1962,7 +1927,7 @@ static const unsigned short euc_to_utf8_8FD6[] = {
0x8213, 0x8214, 0x8219, 0x821A, 0x821D, 0x8221, 0x8222, 0x8228,
0x8232, 0x8234, 0x823A, 0x8243, 0x8244, 0x8245, 0x8246,
};
-static const unsigned short euc_to_utf8_8FD7[] = {
+const unsigned short euc_to_utf8_8FD7[] = {
0x824B, 0x824E, 0x824F, 0x8251, 0x8256, 0x825C, 0x8260,
0x8263, 0x8267, 0x826D, 0x8274, 0x827B, 0x827D, 0x827F, 0x8280,
0x8281, 0x8283, 0x8284, 0x8287, 0x8289, 0x828A, 0x828E, 0x8291,
@@ -1976,7 +1941,7 @@ static const unsigned short euc_to_utf8_8FD7[] = {
0x833A, 0x833C, 0x833D, 0x8342, 0x8343, 0x8344, 0x8347, 0x834D,
0x834E, 0x8351, 0x8355, 0x8356, 0x8357, 0x8370, 0x8378,
};
-static const unsigned short euc_to_utf8_8FD8[] = {
+const unsigned short euc_to_utf8_8FD8[] = {
0x837D, 0x837F, 0x8380, 0x8382, 0x8384, 0x8386, 0x838D,
0x8392, 0x8394, 0x8395, 0x8398, 0x8399, 0x839B, 0x839C, 0x839D,
0x83A6, 0x83A7, 0x83A9, 0x83AC, 0x83BE, 0x83BF, 0x83C0, 0x83C7,
@@ -1990,7 +1955,7 @@ static const unsigned short euc_to_utf8_8FD8[] = {
0x84A9, 0x84AA, 0x84AF, 0x84B1, 0x84B4, 0x84BA, 0x84BD, 0x84BE,
0x84C0, 0x84C2, 0x84C7, 0x84C8, 0x84CC, 0x84CF, 0x84D3,
};
-static const unsigned short euc_to_utf8_8FD9[] = {
+const unsigned short euc_to_utf8_8FD9[] = {
0x84DC, 0x84E7, 0x84EA, 0x84EF, 0x84F0, 0x84F1, 0x84F2,
0x84F7, 0x8532, 0x84FA, 0x84FB, 0x84FD, 0x8502, 0x8503, 0x8507,
0x850C, 0x850E, 0x8510, 0x851C, 0x851E, 0x8522, 0x8523, 0x8524,
@@ -2004,7 +1969,7 @@ static const unsigned short euc_to_utf8_8FD9[] = {
0x85C7, 0x85CA, 0x85CB, 0x85CE, 0x85AD, 0x85D8, 0x85DA, 0x85DF,
0x85E0, 0x85E6, 0x85E8, 0x85ED, 0x85F3, 0x85F6, 0x85FC,
};
-static const unsigned short euc_to_utf8_8FDA[] = {
+const unsigned short euc_to_utf8_8FDA[] = {
0x85FF, 0x8600, 0x8604, 0x8605, 0x860D, 0x860E, 0x8610,
0x8611, 0x8612, 0x8618, 0x8619, 0x861B, 0x861E, 0x8621, 0x8627,
0x8629, 0x8636, 0x8638, 0x863A, 0x863C, 0x863D, 0x8640, 0x8642,
@@ -2018,7 +1983,7 @@ static const unsigned short euc_to_utf8_8FDA[] = {
0x86FD, 0x8704, 0x8705, 0x8707, 0x870B, 0x870E, 0x870F, 0x8710,
0x8713, 0x8714, 0x8719, 0x871E, 0x871F, 0x8721, 0x8723,
};
-static const unsigned short euc_to_utf8_8FDB[] = {
+const unsigned short euc_to_utf8_8FDB[] = {
0x8728, 0x872E, 0x872F, 0x8731, 0x8732, 0x8739, 0x873A,
0x873C, 0x873D, 0x873E, 0x8740, 0x8743, 0x8745, 0x874D, 0x8758,
0x875D, 0x8761, 0x8764, 0x8765, 0x876F, 0x8771, 0x8772, 0x877B,
@@ -2032,7 +1997,7 @@ static const unsigned short euc_to_utf8_8FDB[] = {
0x8812, 0x8813, 0x8814, 0x8818, 0x881A, 0x881B, 0x881C, 0x881E,
0x881F, 0x8828, 0x882D, 0x882E, 0x8830, 0x8832, 0x8835,
};
-static const unsigned short euc_to_utf8_8FDC[] = {
+const unsigned short euc_to_utf8_8FDC[] = {
0x883A, 0x883C, 0x8841, 0x8843, 0x8845, 0x8848, 0x8849,
0x884A, 0x884B, 0x884E, 0x8851, 0x8855, 0x8856, 0x8858, 0x885A,
0x885C, 0x885F, 0x8860, 0x8864, 0x8869, 0x8871, 0x8879, 0x887B,
@@ -2046,7 +2011,7 @@ static const unsigned short euc_to_utf8_8FDC[] = {
0x894F, 0x8952, 0x8957, 0x895A, 0x895B, 0x895C, 0x8961, 0x8962,
0x8963, 0x896B, 0x896E, 0x8970, 0x8973, 0x8975, 0x897A,
};
-static const unsigned short euc_to_utf8_8FDD[] = {
+const unsigned short euc_to_utf8_8FDD[] = {
0x897B, 0x897C, 0x897D, 0x8989, 0x898D, 0x8990, 0x8994,
0x8995, 0x899B, 0x899C, 0x899F, 0x89A0, 0x89A5, 0x89B0, 0x89B4,
0x89B5, 0x89B6, 0x89B7, 0x89BC, 0x89D4, 0x89D5, 0x89D6, 0x89D7,
@@ -2060,7 +2025,7 @@ static const unsigned short euc_to_utf8_8FDD[] = {
0x8A83, 0x8A86, 0x8A8B, 0x8A8F, 0x8A90, 0x8A92, 0x8A96, 0x8A97,
0x8A99, 0x8A9F, 0x8AA7, 0x8AA9, 0x8AAE, 0x8AAF, 0x8AB3,
};
-static const unsigned short euc_to_utf8_8FDE[] = {
+const unsigned short euc_to_utf8_8FDE[] = {
0x8AB6, 0x8AB7, 0x8ABB, 0x8ABE, 0x8AC3, 0x8AC6, 0x8AC8,
0x8AC9, 0x8ACA, 0x8AD1, 0x8AD3, 0x8AD4, 0x8AD5, 0x8AD7, 0x8ADD,
0x8ADF, 0x8AEC, 0x8AF0, 0x8AF4, 0x8AF5, 0x8AF6, 0x8AFC, 0x8AFF,
@@ -2074,7 +2039,7 @@ static const unsigned short euc_to_utf8_8FDE[] = {
0x8C5B, 0x8C5D, 0x8C59, 0x8C63, 0x8C64, 0x8C66, 0x8C68, 0x8C69,
0x8C6D, 0x8C73, 0x8C75, 0x8C76, 0x8C7B, 0x8C7E, 0x8C86,
};
-static const unsigned short euc_to_utf8_8FDF[] = {
+const unsigned short euc_to_utf8_8FDF[] = {
0x8C87, 0x8C8B, 0x8C90, 0x8C92, 0x8C93, 0x8C99, 0x8C9B,
0x8C9C, 0x8CA4, 0x8CB9, 0x8CBA, 0x8CC5, 0x8CC6, 0x8CC9, 0x8CCB,
0x8CCF, 0x8CD6, 0x8CD5, 0x8CD9, 0x8CDD, 0x8CE1, 0x8CE8, 0x8CEC,
@@ -2088,7 +2053,7 @@ static const unsigned short euc_to_utf8_8FDF[] = {
0x8DF1, 0x8DF2, 0x8DF4, 0x8DFD, 0x8E01, 0x8E04, 0x8E05, 0x8E06,
0x8E0B, 0x8E11, 0x8E14, 0x8E16, 0x8E20, 0x8E21, 0x8E22,
};
-static const unsigned short euc_to_utf8_8FE0[] = {
+const unsigned short euc_to_utf8_8FE0[] = {
0x8E23, 0x8E26, 0x8E27, 0x8E31, 0x8E33, 0x8E36, 0x8E37,
0x8E38, 0x8E39, 0x8E3D, 0x8E40, 0x8E41, 0x8E4B, 0x8E4D, 0x8E4E,
0x8E4F, 0x8E54, 0x8E5B, 0x8E5C, 0x8E5D, 0x8E5E, 0x8E61, 0x8E62,
@@ -2102,7 +2067,7 @@ static const unsigned short euc_to_utf8_8FE0[] = {
0x8F21, 0x8F23, 0x8F25, 0x8F27, 0x8F28, 0x8F2C, 0x8F2D, 0x8F2E,
0x8F34, 0x8F35, 0x8F36, 0x8F37, 0x8F3A, 0x8F40, 0x8F41,
};
-static const unsigned short euc_to_utf8_8FE1[] = {
+const unsigned short euc_to_utf8_8FE1[] = {
0x8F43, 0x8F47, 0x8F4F, 0x8F51, 0x8F52, 0x8F53, 0x8F54,
0x8F55, 0x8F58, 0x8F5D, 0x8F5E, 0x8F65, 0x8F9D, 0x8FA0, 0x8FA1,
0x8FA4, 0x8FA5, 0x8FA6, 0x8FB5, 0x8FB6, 0x8FB8, 0x8FBE, 0x8FC0,
@@ -2116,7 +2081,7 @@ static const unsigned short euc_to_utf8_8FE1[] = {
0x9099, 0x909B, 0x90A0, 0x90A1, 0x90A2, 0x90A5, 0x90B0, 0x90B2,
0x90B3, 0x90B4, 0x90B6, 0x90BD, 0x90CC, 0x90BE, 0x90C3,
};
-static const unsigned short euc_to_utf8_8FE2[] = {
+const unsigned short euc_to_utf8_8FE2[] = {
0x90C4, 0x90C5, 0x90C7, 0x90C8, 0x90D5, 0x90D7, 0x90D8,
0x90D9, 0x90DC, 0x90DD, 0x90DF, 0x90E5, 0x90D2, 0x90F6, 0x90EB,
0x90EF, 0x90F0, 0x90F4, 0x90FE, 0x90FF, 0x9100, 0x9104, 0x9105,
@@ -2130,7 +2095,7 @@ static const unsigned short euc_to_utf8_8FE2[] = {
0x91A1, 0x91A6, 0x91A8, 0x91AC, 0x91AD, 0x91AE, 0x91B0, 0x91B1,
0x91B2, 0x91B3, 0x91B6, 0x91BB, 0x91BC, 0x91BD, 0x91BF,
};
-static const unsigned short euc_to_utf8_8FE3[] = {
+const unsigned short euc_to_utf8_8FE3[] = {
0x91C2, 0x91C3, 0x91C5, 0x91D3, 0x91D4, 0x91D7, 0x91D9,
0x91DA, 0x91DE, 0x91E4, 0x91E5, 0x91E9, 0x91EA, 0x91EC, 0x91ED,
0x91EE, 0x91EF, 0x91F0, 0x91F1, 0x91F7, 0x91F9, 0x91FB, 0x91FD,
@@ -2144,7 +2109,7 @@ static const unsigned short euc_to_utf8_8FE3[] = {
0x9276, 0x9277, 0x9278, 0x9279, 0x927B, 0x927C, 0x927D, 0x927F,
0x9288, 0x9289, 0x928A, 0x928D, 0x928E, 0x9292, 0x9297,
};
-static const unsigned short euc_to_utf8_8FE4[] = {
+const unsigned short euc_to_utf8_8FE4[] = {
0x9299, 0x929F, 0x92A0, 0x92A4, 0x92A5, 0x92A7, 0x92A8,
0x92AB, 0x92AF, 0x92B2, 0x92B6, 0x92B8, 0x92BA, 0x92BB, 0x92BC,
0x92BD, 0x92BF, 0x92C0, 0x92C1, 0x92C2, 0x92C3, 0x92C5, 0x92C6,
@@ -2158,7 +2123,7 @@ static const unsigned short euc_to_utf8_8FE4[] = {
0x9358, 0x935A, 0x935E, 0x9364, 0x9365, 0x9367, 0x9369, 0x936A,
0x936D, 0x936F, 0x9370, 0x9371, 0x9373, 0x9374, 0x9376,
};
-static const unsigned short euc_to_utf8_8FE5[] = {
+const unsigned short euc_to_utf8_8FE5[] = {
0x937A, 0x937D, 0x937F, 0x9380, 0x9381, 0x9382, 0x9388,
0x938A, 0x938B, 0x938D, 0x938F, 0x9392, 0x9395, 0x9398, 0x939B,
0x939E, 0x93A1, 0x93A3, 0x93A4, 0x93A6, 0x93A8, 0x93AB, 0x93B4,
@@ -2172,7 +2137,7 @@ static const unsigned short euc_to_utf8_8FE5[] = {
0x945C, 0x945F, 0x9461, 0x9463, 0x9468, 0x946B, 0x946D, 0x946E,
0x946F, 0x9471, 0x9472, 0x9484, 0x9483, 0x9578, 0x9579,
};
-static const unsigned short euc_to_utf8_8FE6[] = {
+const unsigned short euc_to_utf8_8FE6[] = {
0x957E, 0x9584, 0x9588, 0x958C, 0x958D, 0x958E, 0x959D,
0x959E, 0x959F, 0x95A1, 0x95A6, 0x95A9, 0x95AB, 0x95AC, 0x95B4,
0x95B6, 0x95BA, 0x95BD, 0x95BF, 0x95C6, 0x95C8, 0x95C9, 0x95CB,
@@ -2186,7 +2151,7 @@ static const unsigned short euc_to_utf8_8FE6[] = {
0x96B3, 0x96BA, 0x96CA, 0x96D2, 0x5DB2, 0x96D8, 0x96DA, 0x96DD,
0x96DE, 0x96DF, 0x96E9, 0x96EF, 0x96F1, 0x96FA, 0x9702,
};
-static const unsigned short euc_to_utf8_8FE7[] = {
+const unsigned short euc_to_utf8_8FE7[] = {
0x9703, 0x9705, 0x9709, 0x971A, 0x971B, 0x971D, 0x9721,
0x9722, 0x9723, 0x9728, 0x9731, 0x9733, 0x9741, 0x9743, 0x974A,
0x974E, 0x974F, 0x9755, 0x9757, 0x9758, 0x975A, 0x975B, 0x9763,
@@ -2200,7 +2165,7 @@ static const unsigned short euc_to_utf8_8FE7[] = {
0x97F7, 0x97F8, 0x97FA, 0x9807, 0x980A, 0x9819, 0x980D, 0x980E,
0x9814, 0x9816, 0x981C, 0x981E, 0x9820, 0x9823, 0x9826,
};
-static const unsigned short euc_to_utf8_8FE8[] = {
+const unsigned short euc_to_utf8_8FE8[] = {
0x982B, 0x982E, 0x982F, 0x9830, 0x9832, 0x9833, 0x9835,
0x9825, 0x983E, 0x9844, 0x9847, 0x984A, 0x9851, 0x9852, 0x9853,
0x9856, 0x9857, 0x9859, 0x985A, 0x9862, 0x9863, 0x9865, 0x9866,
@@ -2214,7 +2179,7 @@ static const unsigned short euc_to_utf8_8FE8[] = {
0x9958, 0x9959, 0x995B, 0x995C, 0x995E, 0x995F, 0x9960, 0x999B,
0x999D, 0x999F, 0x99A6, 0x99B0, 0x99B1, 0x99B2, 0x99B5,
};
-static const unsigned short euc_to_utf8_8FE9[] = {
+const unsigned short euc_to_utf8_8FE9[] = {
0x99B9, 0x99BA, 0x99BD, 0x99BF, 0x99C3, 0x99C9, 0x99D3,
0x99D4, 0x99D9, 0x99DA, 0x99DC, 0x99DE, 0x99E7, 0x99EA, 0x99EB,
0x99EC, 0x99F0, 0x99F4, 0x99F5, 0x99F9, 0x99FD, 0x99FE, 0x9A02,
@@ -2228,7 +2193,7 @@ static const unsigned short euc_to_utf8_8FE9[] = {
0x9AE5, 0x9AE7, 0x9AE9, 0x9AEC, 0x9AF2, 0x9AF3, 0x9AF5, 0x9AF9,
0x9AFA, 0x9AFD, 0x9AFF, 0x9B00, 0x9B01, 0x9B02, 0x9B03,
};
-static const unsigned short euc_to_utf8_8FEA[] = {
+const unsigned short euc_to_utf8_8FEA[] = {
0x9B04, 0x9B05, 0x9B08, 0x9B09, 0x9B0B, 0x9B0C, 0x9B0D,
0x9B0E, 0x9B10, 0x9B12, 0x9B16, 0x9B19, 0x9B1B, 0x9B1C, 0x9B20,
0x9B26, 0x9B2B, 0x9B2D, 0x9B33, 0x9B34, 0x9B35, 0x9B37, 0x9B39,
@@ -2242,7 +2207,7 @@ static const unsigned short euc_to_utf8_8FEA[] = {
0x9BC8, 0x9BCE, 0x9BD0, 0x9BD7, 0x9BD8, 0x9BDD, 0x9BDF, 0x9BE5,
0x9BE7, 0x9BEA, 0x9BEB, 0x9BEF, 0x9BF3, 0x9BF7, 0x9BF8,
};
-static const unsigned short euc_to_utf8_8FEB[] = {
+const unsigned short euc_to_utf8_8FEB[] = {
0x9BF9, 0x9BFA, 0x9BFD, 0x9BFF, 0x9C00, 0x9C02, 0x9C0B,
0x9C0F, 0x9C11, 0x9C16, 0x9C18, 0x9C19, 0x9C1A, 0x9C1C, 0x9C1E,
0x9C22, 0x9C23, 0x9C26, 0x9C27, 0x9C28, 0x9C29, 0x9C2A, 0x9C31,
@@ -2256,7 +2221,7 @@ static const unsigned short euc_to_utf8_8FEB[] = {
0x9D47, 0x9D4A, 0x9D53, 0x9D54, 0x9D5F, 0x9D63, 0x9D62, 0x9D65,
0x9D69, 0x9D6A, 0x9D6B, 0x9D70, 0x9D76, 0x9D77, 0x9D7B,
};
-static const unsigned short euc_to_utf8_8FEC[] = {
+const unsigned short euc_to_utf8_8FEC[] = {
0x9D7C, 0x9D7E, 0x9D83, 0x9D84, 0x9D86, 0x9D8A, 0x9D8D,
0x9D8E, 0x9D92, 0x9D93, 0x9D95, 0x9D96, 0x9D97, 0x9D98, 0x9DA1,
0x9DAA, 0x9DAC, 0x9DAE, 0x9DB1, 0x9DB5, 0x9DB9, 0x9DBC, 0x9DBF,
@@ -2270,7 +2235,7 @@ static const unsigned short euc_to_utf8_8FEC[] = {
0x9EB5, 0x9EC6, 0x9EC8, 0x9ECB, 0x9ED5, 0x9EDF, 0x9EE4, 0x9EE7,
0x9EEC, 0x9EED, 0x9EEE, 0x9EF0, 0x9EF1, 0x9EF2, 0x9EF5,
};
-static const unsigned short euc_to_utf8_8FED[] = {
+const unsigned short euc_to_utf8_8FED[] = {
0x9EF8, 0x9EFF, 0x9F02, 0x9F03, 0x9F09, 0x9F0F, 0x9F10,
0x9F11, 0x9F12, 0x9F14, 0x9F16, 0x9F17, 0x9F19, 0x9F1A, 0x9F1B,
0x9F1F, 0x9F22, 0x9F26, 0x9F2A, 0x9F2B, 0x9F2F, 0x9F31, 0x9F32,
@@ -2284,7 +2249,7 @@ static const unsigned short euc_to_utf8_8FED[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short euc_to_utf8_8FF3[] = {
+const unsigned short euc_to_utf8_8FF3[] = {
0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -2298,7 +2263,7 @@ static const unsigned short euc_to_utf8_8FF3[] = {
0, 0, 0, 0x2170, 0x2171, 0x2172, 0x2173, 0x2174,
0x2175, 0x2176, 0x2177, 0x2178, 0x2179, 0x2160, 0x2161,
};
-static const unsigned short euc_to_utf8_8FF4[] = {
+const unsigned short euc_to_utf8_8FF4[] = {
0x2162, 0x2163, 0x2164, 0x2165, 0x2166, 0x2167, 0x2168,
0x2169, 0xff07, 0xff02, 0x3231, 0x2116, 0x2121, 0x70bb, 0x4efc,
0x50f4, 0x51ec, 0x5307, 0x5324, 0xfa0e, 0x548a, 0x5759, 0xfa0f,
@@ -2381,33 +2346,6 @@ const unsigned short *const euc_to_utf8_2bytes_ms[] = {
0, euc_to_utf8_F9, euc_to_utf8_FA, euc_to_utf8_FB,
euc_to_utf8_FC_ms, 0, 0,
};
-/* CP10001 */
-const unsigned short *const euc_to_utf8_2bytes_mac[] = {
- euc_to_utf8_A1_ms, euc_to_utf8_A2_ms, euc_to_utf8_A3,
- euc_to_utf8_A4, euc_to_utf8_A5, euc_to_utf8_A6, euc_to_utf8_A7,
- euc_to_utf8_A8, euc_to_utf8_A9, euc_to_utf8_AA, euc_to_utf8_AB,
- euc_to_utf8_AC_mac, euc_to_utf8_AD_mac, euc_to_utf8_AE, euc_to_utf8_AF,
- euc_to_utf8_B0, euc_to_utf8_B1, euc_to_utf8_B2, euc_to_utf8_B3,
- euc_to_utf8_B4, euc_to_utf8_B5, euc_to_utf8_B6, euc_to_utf8_B7,
- euc_to_utf8_B8, euc_to_utf8_B9, euc_to_utf8_BA, euc_to_utf8_BB,
- euc_to_utf8_BC, euc_to_utf8_BD, euc_to_utf8_BE, euc_to_utf8_BF,
- euc_to_utf8_C0, euc_to_utf8_C1, euc_to_utf8_C2, euc_to_utf8_C3,
- euc_to_utf8_C4, euc_to_utf8_C5, euc_to_utf8_C6, euc_to_utf8_C7,
- euc_to_utf8_C8, euc_to_utf8_C9, euc_to_utf8_CA, euc_to_utf8_CB,
- euc_to_utf8_CC, euc_to_utf8_CD, euc_to_utf8_CE, euc_to_utf8_CF,
- euc_to_utf8_D0, euc_to_utf8_D1, euc_to_utf8_D2, euc_to_utf8_D3,
- euc_to_utf8_D4, euc_to_utf8_D5, euc_to_utf8_D6, euc_to_utf8_D7,
- euc_to_utf8_D8, euc_to_utf8_D9, euc_to_utf8_DA, euc_to_utf8_DB,
- euc_to_utf8_DC, euc_to_utf8_DD, euc_to_utf8_DE, euc_to_utf8_DF,
- euc_to_utf8_E0, euc_to_utf8_E1, euc_to_utf8_E2, euc_to_utf8_E3,
- euc_to_utf8_E4, euc_to_utf8_E5, euc_to_utf8_E6, euc_to_utf8_E7,
- euc_to_utf8_E8, euc_to_utf8_E9, euc_to_utf8_EA, euc_to_utf8_EB,
- euc_to_utf8_EC, euc_to_utf8_ED, euc_to_utf8_EE, euc_to_utf8_EF,
- euc_to_utf8_F0, euc_to_utf8_F1, euc_to_utf8_F2, euc_to_utf8_F3,
- euc_to_utf8_F4, euc_to_utf8_F5, 0, 0,
- 0, euc_to_utf8_F9, euc_to_utf8_FA, euc_to_utf8_FB,
- euc_to_utf8_FC_ms, 0, 0,
-};
#ifdef X0212_ENABLE
const unsigned short *const x0212_to_utf8_2bytes[] = {
@@ -2439,7 +2377,7 @@ const unsigned short *const x0212_to_utf8_2bytes[] = {
#endif /* UTF8_OUTPUT_ENABLE */
#ifdef UTF8_INPUT_ENABLE
-static const unsigned short utf8_to_euc_C2[] = {
+const unsigned short utf8_to_euc_C2[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -2449,7 +2387,7 @@ static const unsigned short utf8_to_euc_C2[] = {
0x216B, 0x215E, 0, 0, 0x212D, 0, 0x2279, 0,
0xA231, 0, 0xA26B, 0, 0, 0, 0, 0xA244,
};
-static const unsigned short utf8_to_euc_C2_ms[] = {
+const unsigned short utf8_to_euc_C2_ms[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -2459,17 +2397,7 @@ static const unsigned short utf8_to_euc_C2_ms[] = {
0x216B, 0x215E, 0, 0, 0x212D, 0, 0x2279, 0,
0xA231, 0, 0xA26B, 0, 0, 0, 0, 0xA244,
};
-static const unsigned short utf8_to_euc_C2_mac[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0x00A0, 0xA242, 0x2171, 0x2172, 0xA270, 0x5C, 0xA243, 0x2178,
- 0x212F, 0x00FD, 0xA26C, 0, 0x224C, 0, 0xA26E, 0xA234,
- 0x216B, 0x215E, 0, 0, 0x212D, 0, 0x2279, 0,
- 0xA231, 0, 0xA26B, 0, 0, 0, 0, 0xA244,
-};
-static const unsigned short utf8_to_euc_C2_932[] = {
+const unsigned short utf8_to_euc_C2_932[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -2479,7 +2407,7 @@ static const unsigned short utf8_to_euc_C2_932[] = {
0x216B, 0x215E, 0x32, 0x33, 0x212D, 0x264C, 0x2279, 0x2126,
0x2124, 0x31, 0x6F, 0x2264, 0, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_C3[] = {
+const unsigned short utf8_to_euc_C3[] = {
0xAA22, 0xAA21, 0xAA24, 0xAA2A, 0xAA23, 0xAA29, 0xA921, 0xAA2E,
0xAA32, 0xAA31, 0xAA34, 0xAA33, 0xAA40, 0xAA3F, 0xAA42, 0xAA41,
0, 0xAA50, 0xAA52, 0xAA51, 0xAA54, 0xAA58, 0xAA53, 0x215F,
@@ -2489,7 +2417,7 @@ static const unsigned short utf8_to_euc_C3[] = {
0xA943, 0xAB50, 0xAB52, 0xAB51, 0xAB54, 0xAB58, 0xAB53, 0x2160,
0xA94C, 0xAB63, 0xAB62, 0xAB65, 0xAB64, 0xAB72, 0xA950, 0xAB73,
};
-static const unsigned short utf8_to_euc_C3_932[] = {
+const unsigned short utf8_to_euc_C3_932[] = {
0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x43,
0x45, 0x45, 0x45, 0x45, 0x49, 0x49, 0x49, 0x49,
0x44, 0x4E, 0x4F, 0x4F, 0x4F, 0x4F, 0x4F, 0x215F,
@@ -2499,7 +2427,7 @@ static const unsigned short utf8_to_euc_C3_932[] = {
0x64, 0x6E, 0x6F, 0x6F, 0x6F, 0x6F, 0x6F, 0x2160,
0x6F, 0x75, 0x75, 0x75, 0x75, 0x79, 0x74, 0x79,
};
-static const unsigned short utf8_to_euc_C4[] = {
+const unsigned short utf8_to_euc_C4[] = {
0xAA27, 0xAB27, 0xAA25, 0xAB25, 0xAA28, 0xAB28, 0xAA2B, 0xAB2B,
0xAA2C, 0xAB2C, 0xAA2F, 0xAB2F, 0xAA2D, 0xAB2D, 0xAA30, 0xAB30,
0xA922, 0xA942, 0xAA37, 0xAB37, 0, 0, 0xAA36, 0xAB36,
@@ -2509,7 +2437,7 @@ static const unsigned short utf8_to_euc_C4[] = {
0xAA44, 0xA945, 0xA926, 0xA946, 0xAA48, 0xAB48, 0xAA49, 0xAB49,
0xA947, 0xAA4A, 0xAB4A, 0xAA4C, 0xAB4C, 0xAA4B, 0xAB4B, 0xA929,
};
-static const unsigned short utf8_to_euc_C5[] = {
+const unsigned short utf8_to_euc_C5[] = {
0xA949, 0xA928, 0xA948, 0xAA4D, 0xAB4D, 0xAA4F, 0xAB4F, 0xAA4E,
0xAB4E, 0xA94A, 0xA92B, 0xA94B, 0xAA57, 0xAB57, 0, 0,
0xAA56, 0xAB56, 0xA92D, 0xA94D, 0xAA59, 0xAB59, 0xAA5B, 0xAB5B,
@@ -2519,7 +2447,7 @@ static const unsigned short utf8_to_euc_C5[] = {
0xAA68, 0xAB68, 0xAA6A, 0xAB6A, 0xAA71, 0xAB71, 0xAA74, 0xAB74,
0xAA73, 0xAA75, 0xAB75, 0xAA77, 0xAB77, 0xAA76, 0xAB76, 0,
};
-static const unsigned short utf8_to_euc_C7[] = {
+const unsigned short utf8_to_euc_C7[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0xAA26, 0xAB26, 0xAA43,
0xAB43, 0xAA55, 0xAB55, 0xAA67, 0xAB67, 0xAA70, 0xAB70, 0xAA6D,
@@ -2529,7 +2457,7 @@ static const unsigned short utf8_to_euc_C7[] = {
0, 0, 0, 0, 0, 0xAB39, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_CB[] = {
+const unsigned short utf8_to_euc_CB[] = {
0, 0, 0, 0, 0, 0, 0, 0xA230,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -2539,7 +2467,7 @@ static const unsigned short utf8_to_euc_CB[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_CE[] = {
+const unsigned short utf8_to_euc_CE[] = {
0, 0, 0, 0, 0xA238, 0xA239, 0xA661, 0,
0xA662, 0xA663, 0xA664, 0, 0xA667, 0, 0xA669, 0xA66C,
0xA676, 0x2621, 0x2622, 0x2623, 0x2624, 0x2625, 0x2626, 0x2627,
@@ -2549,7 +2477,7 @@ static const unsigned short utf8_to_euc_CE[] = {
0xA67B, 0x2641, 0x2642, 0x2643, 0x2644, 0x2645, 0x2646, 0x2647,
0x2648, 0x2649, 0x264A, 0x264B, 0x264C, 0x264D, 0x264E, 0x264F,
};
-static const unsigned short utf8_to_euc_CF[] = {
+const unsigned short utf8_to_euc_CF[] = {
0x2650, 0x2651, 0xA678, 0x2652, 0x2653, 0x2654, 0x2655, 0x2656,
0x2657, 0x2658, 0xA675, 0xA67A, 0xA677, 0xA679, 0xA67C, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -2559,7 +2487,7 @@ static const unsigned short utf8_to_euc_CF[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_D0[] = {
+const unsigned short utf8_to_euc_D0[] = {
0, 0x2727, 0xA742, 0xA743, 0xA744, 0xA745, 0xA746, 0xA747,
0xA748, 0xA749, 0xA74A, 0xA74B, 0xA74C, 0, 0xA74D, 0xA74E,
0x2721, 0x2722, 0x2723, 0x2724, 0x2725, 0x2726, 0x2728, 0x2729,
@@ -2569,7 +2497,7 @@ static const unsigned short utf8_to_euc_D0[] = {
0x2751, 0x2752, 0x2753, 0x2754, 0x2755, 0x2756, 0x2758, 0x2759,
0x275A, 0x275B, 0x275C, 0x275D, 0x275E, 0x275F, 0x2760, 0x2761,
};
-static const unsigned short utf8_to_euc_D1[] = {
+const unsigned short utf8_to_euc_D1[] = {
0x2762, 0x2763, 0x2764, 0x2765, 0x2766, 0x2767, 0x2768, 0x2769,
0x276A, 0x276B, 0x276C, 0x276D, 0x276E, 0x276F, 0x2770, 0x2771,
0, 0x2757, 0xA772, 0xA773, 0xA774, 0xA775, 0xA776, 0xA777,
@@ -2579,7 +2507,7 @@ static const unsigned short utf8_to_euc_D1[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E280[] = {
+const unsigned short utf8_to_euc_E280[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0x213E, 0, 0, 0, 0x213D, 0x213D, 0x2142, 0,
@@ -2589,7 +2517,7 @@ static const unsigned short utf8_to_euc_E280[] = {
0x2273, 0, 0x216C, 0x216D, 0, 0, 0, 0,
0, 0, 0, 0x2228, 0, 0, 0x2131, 0,
};
-static const unsigned short utf8_to_euc_E280_ms[] = {
+const unsigned short utf8_to_euc_E280_ms[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0x213E, 0, 0, 0, 0x213D, 0x213D, 0x2142, 0,
@@ -2599,7 +2527,7 @@ static const unsigned short utf8_to_euc_E280_ms[] = {
0x2273, 0, 0x216C, 0x216D, 0, 0, 0, 0,
0, 0, 0, 0x2228, 0, 0, 0x7E, 0,
};
-static const unsigned short utf8_to_euc_E280_932[] = {
+const unsigned short utf8_to_euc_E280_932[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0x213E, 0, 0, 0, 0, 0x213D, 0, 0,
@@ -2609,7 +2537,7 @@ static const unsigned short utf8_to_euc_E280_932[] = {
0x2273, 0, 0x216C, 0x216D, 0, 0, 0, 0,
0, 0, 0, 0x2228, 0, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E284[] = {
+const unsigned short utf8_to_euc_E284[] = {
0, 0, 0, 0x216E, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0x2D62, 0,
@@ -2619,17 +2547,7 @@ static const unsigned short utf8_to_euc_E284[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E284_mac[] = {
- 0, 0, 0, 0x216E, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0x2B7B, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0x2B7D, 0x00FE, 0, 0, 0, 0, 0,
- 0, 0, 0, 0x2272, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
-};
-static const unsigned short utf8_to_euc_E285[] = {
+const unsigned short utf8_to_euc_E285[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -2639,17 +2557,7 @@ static const unsigned short utf8_to_euc_E285[] = {
0xF373, 0xF374, 0xF375, 0xF376, 0xF377, 0xF378, 0xF379, 0xF37A,
0xF37B, 0xF37C, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E285_mac[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0x2A21, 0x2A22, 0x2A23, 0x2A24, 0x2A25, 0x2A26, 0x2A27, 0x2A28,
- 0x2A29, 0x2A2A, 0, 0, 0, 0, 0, 0,
- 0x2A35, 0x2A36, 0x2A37, 0x2A38, 0x2A39, 0x2A3A, 0x2A3B, 0x2A3C,
- 0x2A3D, 0x2A3E, 0, 0, 0, 0, 0, 0,
-};
-static const unsigned short utf8_to_euc_E286[] = {
+const unsigned short utf8_to_euc_E286[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0x222B, 0x222C, 0x222A, 0x222D, 0, 0, 0, 0,
@@ -2659,7 +2567,7 @@ static const unsigned short utf8_to_euc_E286[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E287[] = {
+const unsigned short utf8_to_euc_E287[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0x224D, 0, 0x224E, 0, 0, 0,
@@ -2669,7 +2577,7 @@ static const unsigned short utf8_to_euc_E287[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E288[] = {
+const unsigned short utf8_to_euc_E288[] = {
0x224F, 0, 0x225F, 0x2250, 0, 0, 0, 0x2260,
0x223A, 0, 0, 0x223B, 0, 0, 0, 0,
0, 0x2D74, 0x215D, 0, 0, 0, 0, 0,
@@ -2679,7 +2587,7 @@ static const unsigned short utf8_to_euc_E288[] = {
0, 0, 0, 0, 0x2168, 0x2268, 0, 0,
0, 0, 0, 0, 0, 0x2266, 0, 0,
};
-static const unsigned short utf8_to_euc_E288_932[] = {
+const unsigned short utf8_to_euc_E288_932[] = {
0x224F, 0, 0x225F, 0x2250, 0, 0, 0, 0x2260,
0x223A, 0, 0, 0x223B, 0, 0, 0, 0,
0, 0x2D74, 0, 0, 0, 0, 0, 0,
@@ -2689,17 +2597,7 @@ static const unsigned short utf8_to_euc_E288_932[] = {
0, 0, 0, 0, 0x2168, 0x2268, 0, 0,
0, 0, 0, 0, 0, 0x2266, 0, 0,
};
-static const unsigned short utf8_to_euc_E288_mac[] = {
- 0x224F, 0, 0x225F, 0x2250, 0, 0, 0, 0x2260,
- 0x223A, 0, 0, 0x223B, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0x2265, 0, 0, 0x2267, 0x2167, 0x2F22,
- 0x225C, 0, 0, 0, 0, 0x2142, 0, 0x224A,
- 0x224B, 0x2241, 0x2240, 0x2269, 0x226A, 0, 0x2F21, 0,
- 0, 0, 0, 0, 0x2168, 0x2268, 0, 0,
- 0, 0, 0, 0, 0, 0x2266, 0, 0,
-};
-static const unsigned short utf8_to_euc_E289[] = {
+const unsigned short utf8_to_euc_E289[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0x2262, 0, 0, 0, 0, 0,
@@ -2709,7 +2607,7 @@ static const unsigned short utf8_to_euc_E289[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E28A[] = {
+const unsigned short utf8_to_euc_E28A[] = {
0, 0, 0x223E, 0x223F, 0, 0, 0x223C, 0x223D,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -2719,17 +2617,7 @@ static const unsigned short utf8_to_euc_E28A[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0x2D79,
};
-static const unsigned short utf8_to_euc_E28A_mac[] = {
- 0, 0, 0x223E, 0x223F, 0, 0, 0x223C, 0x223D,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0x225D, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0x2F23,
-};
-static const unsigned short utf8_to_euc_E28C[] = {
+const unsigned short utf8_to_euc_E28C[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0x225E, 0, 0, 0, 0, 0,
@@ -2739,7 +2627,7 @@ static const unsigned short utf8_to_euc_E28C[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E291[] = {
+const unsigned short utf8_to_euc_E291[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -2749,17 +2637,7 @@ static const unsigned short utf8_to_euc_E291[] = {
0x2D31, 0x2D32, 0x2D33, 0x2D34, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E291_mac[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0x2921, 0x2922, 0x2923, 0x2924, 0x2925, 0x2926, 0x2927, 0x2928,
- 0x2929, 0x292A, 0x292B, 0x292C, 0x292D, 0x292E, 0x292F, 0x2930,
- 0x2931, 0x2932, 0x2933, 0x2934, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
-};
-static const unsigned short utf8_to_euc_E294[] = {
+const unsigned short utf8_to_euc_E294[] = {
0x2821, 0x282C, 0x2822, 0x282D, 0, 0, 0, 0,
0, 0, 0, 0, 0x2823, 0, 0, 0x282E,
0x2824, 0, 0, 0x282F, 0x2826, 0, 0, 0x2831,
@@ -2769,7 +2647,7 @@ static const unsigned short utf8_to_euc_E294[] = {
0x283D, 0, 0, 0x2833, 0x282A, 0, 0, 0x283A,
0x283F, 0, 0, 0x2835, 0x282B, 0, 0, 0x283B,
};
-static const unsigned short utf8_to_euc_E295[] = {
+const unsigned short utf8_to_euc_E295[] = {
0, 0, 0x2840, 0, 0, 0, 0, 0,
0, 0, 0, 0x2836, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -2779,7 +2657,7 @@ static const unsigned short utf8_to_euc_E295[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E296[] = {
+const unsigned short utf8_to_euc_E296[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -2789,7 +2667,7 @@ static const unsigned short utf8_to_euc_E296[] = {
0, 0, 0x2225, 0x2224, 0, 0, 0, 0,
0, 0, 0, 0, 0x2227, 0x2226, 0, 0,
};
-static const unsigned short utf8_to_euc_E297[] = {
+const unsigned short utf8_to_euc_E297[] = {
0, 0, 0, 0, 0, 0, 0x2221, 0x217E,
0, 0, 0, 0x217B, 0, 0, 0x217D, 0x217C,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -2799,7 +2677,7 @@ static const unsigned short utf8_to_euc_E297[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E298[] = {
+const unsigned short utf8_to_euc_E298[] = {
0, 0, 0, 0, 0, 0x217A, 0x2179, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -2809,7 +2687,7 @@ static const unsigned short utf8_to_euc_E298[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E299[] = {
+const unsigned short utf8_to_euc_E299[] = {
0x216A, 0, 0x2169, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -2819,7 +2697,7 @@ static const unsigned short utf8_to_euc_E299[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E380[] = {
+const unsigned short utf8_to_euc_E380[] = {
0x2121, 0x2122, 0x2123, 0x2137, 0, 0x2139, 0x213A, 0x213B,
0x2152, 0x2153, 0x2154, 0x2155, 0x2156, 0x2157, 0x2158, 0x2159,
0x215A, 0x215B, 0x2229, 0x222E, 0x214C, 0x214D, 0, 0,
@@ -2829,7 +2707,7 @@ static const unsigned short utf8_to_euc_E380[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E380_932[] = {
+const unsigned short utf8_to_euc_E380_932[] = {
0x2121, 0x2122, 0x2123, 0x2137, 0, 0x2139, 0x213A, 0x213B,
0x2152, 0x2153, 0x2154, 0x2155, 0x2156, 0x2157, 0x2158, 0x2159,
0x215A, 0x215B, 0x2229, 0x222E, 0x214C, 0x214D, 0, 0,
@@ -2839,7 +2717,7 @@ static const unsigned short utf8_to_euc_E380_932[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E381[] = {
+const unsigned short utf8_to_euc_E381[] = {
0, 0x2421, 0x2422, 0x2423, 0x2424, 0x2425, 0x2426, 0x2427,
0x2428, 0x2429, 0x242A, 0x242B, 0x242C, 0x242D, 0x242E, 0x242F,
0x2430, 0x2431, 0x2432, 0x2433, 0x2434, 0x2435, 0x2436, 0x2437,
@@ -2849,7 +2727,7 @@ static const unsigned short utf8_to_euc_E381[] = {
0x2450, 0x2451, 0x2452, 0x2453, 0x2454, 0x2455, 0x2456, 0x2457,
0x2458, 0x2459, 0x245A, 0x245B, 0x245C, 0x245D, 0x245E, 0x245F,
};
-static const unsigned short utf8_to_euc_E382[] = {
+const unsigned short utf8_to_euc_E382[] = {
0x2460, 0x2461, 0x2462, 0x2463, 0x2464, 0x2465, 0x2466, 0x2467,
0x2468, 0x2469, 0x246A, 0x246B, 0x246C, 0x246D, 0x246E, 0x246F,
0x2470, 0x2471, 0x2472, 0x2473, 0, 0, 0, 0,
@@ -2859,7 +2737,7 @@ static const unsigned short utf8_to_euc_E382[] = {
0x2530, 0x2531, 0x2532, 0x2533, 0x2534, 0x2535, 0x2536, 0x2537,
0x2538, 0x2539, 0x253A, 0x253B, 0x253C, 0x253D, 0x253E, 0x253F,
};
-static const unsigned short utf8_to_euc_E382_932[] = {
+const unsigned short utf8_to_euc_E382_932[] = {
0x2460, 0x2461, 0x2462, 0x2463, 0x2464, 0x2465, 0x2466, 0x2467,
0x2468, 0x2469, 0x246A, 0x246B, 0x246C, 0x246D, 0x246E, 0x246F,
0x2470, 0x2471, 0x2472, 0x2473, 0x2574, 0, 0, 0,
@@ -2869,7 +2747,7 @@ static const unsigned short utf8_to_euc_E382_932[] = {
0x2530, 0x2531, 0x2532, 0x2533, 0x2534, 0x2535, 0x2536, 0x2537,
0x2538, 0x2539, 0x253A, 0x253B, 0x253C, 0x253D, 0x253E, 0x253F,
};
-static const unsigned short utf8_to_euc_E383[] = {
+const unsigned short utf8_to_euc_E383[] = {
0x2540, 0x2541, 0x2542, 0x2543, 0x2544, 0x2545, 0x2546, 0x2547,
0x2548, 0x2549, 0x254A, 0x254B, 0x254C, 0x254D, 0x254E, 0x254F,
0x2550, 0x2551, 0x2552, 0x2553, 0x2554, 0x2555, 0x2556, 0x2557,
@@ -2879,7 +2757,7 @@ static const unsigned short utf8_to_euc_E383[] = {
0x2570, 0x2571, 0x2572, 0x2573, 0x2574, 0x2575, 0x2576, 0,
0, 0, 0, 0x2126, 0x213C, 0x2133, 0x2134, 0,
};
-static const unsigned short utf8_to_euc_E388[] = {
+const unsigned short utf8_to_euc_E388[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -2889,17 +2767,7 @@ static const unsigned short utf8_to_euc_E388[] = {
0, 0x2D6A, 0x2D6B, 0, 0, 0, 0, 0,
0, 0x2D6C, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E388_mac[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0x2D2E, 0x2D31, 0, 0, 0, 0, 0,
- 0, 0x2D2C, 0, 0, 0, 0, 0, 0,
-};
-static const unsigned short utf8_to_euc_E38A[] = {
+const unsigned short utf8_to_euc_E38A[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -2909,17 +2777,7 @@ static const unsigned short utf8_to_euc_E38A[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E38A_mac[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0x2D73, 0x2D74, 0x2D75, 0x2D76,
- 0x2D77, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
-};
-static const unsigned short utf8_to_euc_E38C[] = {
+const unsigned short utf8_to_euc_E38C[] = {
0, 0, 0, 0x2D46, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0x2D4A, 0, 0,
0, 0, 0, 0, 0x2D41, 0, 0, 0,
@@ -2929,17 +2787,7 @@ static const unsigned short utf8_to_euc_E38C[] = {
0, 0, 0, 0, 0, 0, 0x2D47, 0,
0, 0, 0, 0x2D4F, 0, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E38C_mac[] = {
- 0, 0, 0, 0x2E29, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0x2E32, 0, 0,
- 0, 0, 0, 0, 0x2E24, 0, 0, 0,
- 0x2E2B, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0x2E22, 0x2E34, 0, 0, 0x2E35, 0x2E2D,
- 0, 0, 0, 0x2E37, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0x2E2A, 0,
- 0, 0, 0, 0x2E36, 0, 0, 0, 0,
-};
-static const unsigned short utf8_to_euc_E38D[] = {
+const unsigned short utf8_to_euc_E38D[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0x2D40, 0x2D4E, 0, 0, 0x2D43, 0, 0,
0, 0x2D48, 0, 0, 0, 0, 0, 0x2D49,
@@ -2949,17 +2797,7 @@ static const unsigned short utf8_to_euc_E38D[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0x2D5F, 0x2D6F, 0x2D6E, 0x2D6D, 0,
};
-static const unsigned short utf8_to_euc_E38D_mac[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0x2E21, 0x2E2F, 0, 0, 0x2E23, 0, 0,
- 0, 0x2E2E, 0, 0, 0, 0, 0, 0x2E31,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0x2E6A, 0x2E69, 0x2E68, 0x2E67, 0,
-};
-static const unsigned short utf8_to_euc_E38E[] = {
+const unsigned short utf8_to_euc_E38E[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0x2D53, 0x2D54,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -2969,17 +2807,7 @@ static const unsigned short utf8_to_euc_E38E[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E38E_mac[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0x2B2B, 0x2B2D,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0x2B21, 0x2B23, 0x2B29, 0,
- 0, 0x2B27, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
-};
-static const unsigned short utf8_to_euc_E38F[] = {
+const unsigned short utf8_to_euc_E38F[] = {
0, 0, 0, 0, 0x2D55, 0, 0, 0,
0, 0, 0, 0, 0, 0x2D63, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -2989,17 +2817,7 @@ static const unsigned short utf8_to_euc_E38F[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E38F_mac[] = {
- 0, 0, 0, 0, 0x2B2E, 0, 0, 0,
- 0, 0, 0, 0, 0, 0x2B7C, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
-};
-static const unsigned short utf8_to_euc_E4B8[] = {
+const unsigned short utf8_to_euc_E4B8[] = {
0x306C, 0x437A, 0xB021, 0x3C37, 0xB022, 0xB023, 0, 0x4B7C,
0x3E66, 0x3B30, 0x3E65, 0x323C, 0xB024, 0x4954, 0x4D3F, 0,
0x5022, 0x312F, 0xB025, 0, 0x336E, 0x5023, 0x4024, 0x5242,
@@ -3009,7 +2827,7 @@ static const unsigned short utf8_to_euc_E4B8[] = {
0xB02D, 0x5025, 0x367A, 0, 0, 0xB02E, 0x5026, 0,
0x345D, 0x4330, 0, 0x3C67, 0x5027, 0, 0, 0x5028,
};
-static const unsigned short utf8_to_euc_E4B9[] = {
+const unsigned short utf8_to_euc_E4B9[] = {
0xB02F, 0xB030, 0x5029, 0x4735, 0xB031, 0x3557, 0, 0xB032,
0, 0, 0, 0x4737, 0, 0x4663, 0x3843, 0x4B33,
0, 0xB033, 0, 0, 0, 0x6949, 0x502A, 0x3E68,
@@ -3019,7 +2837,7 @@ static const unsigned short utf8_to_euc_E4B9[] = {
0, 0x4D70, 0, 0x467D, 0xB039, 0xB03A, 0, 0,
0, 0xB03B, 0, 0, 0, 0, 0x3425, 0xB03C,
};
-static const unsigned short utf8_to_euc_E4BA[] = {
+const unsigned short utf8_to_euc_E4BA[] = {
0x3535, 0, 0x502C, 0, 0, 0x502D, 0x4E3B, 0,
0x4D3D, 0x4168, 0x502F, 0x3B76, 0x4673, 0xB03D, 0x5032, 0,
0, 0x313E, 0x385F, 0, 0x385E, 0x3066, 0xB03E, 0xB03F,
@@ -3029,7 +2847,7 @@ static const unsigned short utf8_to_euc_E4BA[] = {
0x5037, 0, 0, 0x5038, 0, 0, 0x5039, 0,
0, 0xB042, 0x3F4D, 0, 0, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E4BB[] = {
+const unsigned short utf8_to_euc_E4BB[] = {
0x3D3A, 0x3F4E, 0x503E, 0xB043, 0x503C, 0, 0x503D, 0x3558,
0, 0, 0x3A23, 0x3270, 0, 0x503B, 0x503A, 0x4A29,
0xB044, 0, 0, 0, 0x3B46, 0x3B45, 0x423E, 0x503F,
@@ -3039,7 +2857,7 @@ static const unsigned short utf8_to_euc_E4BB[] = {
0x3644, 0xB04C, 0x4367, 0xB04D, 0, 0xB04E, 0x376F, 0x5043,
0, 0, 0, 0x4724, 0xF42F, 0xB04F, 0xB050, 0xB051,
};
-static const unsigned short utf8_to_euc_E4BC[] = {
+const unsigned short utf8_to_euc_E4BC[] = {
0xB052, 0x346B, 0xB053, 0xB054, 0, 0, 0, 0,
0xB055, 0x5044, 0x304B, 0xB056, 0xB057, 0x3860, 0x346C, 0x497A,
0x4832, 0x3559, 0xB058, 0, 0, 0xB059, 0xB05A, 0xB05B,
@@ -3049,7 +2867,7 @@ static const unsigned short utf8_to_euc_E4BC[] = {
0x5046, 0xB05E, 0, 0xB060, 0x483C, 0xB061, 0x4E62, 0xB062,
0x3F2D, 0xB063, 0x3B47, 0xB064, 0x3B77, 0x3240, 0xB065, 0,
};
-static const unsigned short utf8_to_euc_E4BD[] = {
+const unsigned short utf8_to_euc_E4BD[] = {
0xB066, 0, 0xB067, 0x4451, 0, 0, 0x4322, 0x504A,
0xB068, 0xB069, 0, 0xB06A, 0xB06B, 0x304C, 0x4463, 0x3D3B,
0x3A34, 0x4D24, 0xB06C, 0x424E, 0xB06D, 0x323F, 0xB06E, 0x5049,
@@ -3059,7 +2877,7 @@ static const unsigned short utf8_to_euc_E4BD[] = {
0x5051, 0xB075, 0, 0x3242, 0, 0x4A3B, 0x504B, 0xB076,
0xB077, 0xB078, 0xB079, 0x504F, 0x3873, 0xB07A, 0xB07B, 0x3B48,
};
-static const unsigned short utf8_to_euc_E4BE[] = {
+const unsigned short utf8_to_euc_E4BE[] = {
0, 0xB07C, 0xB07D, 0x3426, 0xB07E, 0xB121, 0x5054, 0,
0x504C, 0xB122, 0xB123, 0x4E63, 0xB124, 0x3B78, 0xB125, 0x504D,
0xB126, 0x5052, 0xB127, 0xB128, 0xB129, 0, 0x5055, 0xB12A,
@@ -3069,7 +2887,7 @@ static const unsigned short utf8_to_euc_E4BE[] = {
0, 0, 0xB12F, 0, 0, 0x3F2F, 0x4E37, 0xB130,
0, 0xB131, 0, 0xB132, 0xB133, 0xB134, 0xB135, 0x4A58,
};
-static const unsigned short utf8_to_euc_E4BF[] = {
+const unsigned short utf8_to_euc_E4BF[] = {
0xB136, 0xB137, 0x3738, 0x4225, 0x3264, 0xB138, 0xB139, 0,
0xB13A, 0xB13B, 0x3D53, 0xB13C, 0xB13D, 0xB13E, 0x5059, 0xB13F,
0x505E, 0x505C, 0xB140, 0, 0x5057, 0, 0, 0x422F,
@@ -3079,7 +2897,7 @@ static const unsigned short utf8_to_euc_E4BF[] = {
0xB144, 0, 0xB145, 0x4750, 0, 0x4936, 0x5068, 0,
0x4A70, 0, 0x3236, 0, 0xB146, 0xB147, 0x506C, 0xB148,
};
-static const unsigned short utf8_to_euc_E580[] = {
+const unsigned short utf8_to_euc_E580[] = {
0xB149, 0xB14A, 0, 0, 0xB14B, 0x5066, 0x506F, 0xB14C,
0, 0x4152, 0xB14D, 0x3844, 0xB14E, 0x475C, 0xB14F, 0x6047,
0xB150, 0x506E, 0x455D, 0xB151, 0x5063, 0, 0x3876, 0xB152,
@@ -3089,7 +2907,7 @@ static const unsigned short utf8_to_euc_E580[] = {
0xB15B, 0, 0xB15C, 0xB15D, 0, 0xB15E, 0x3666, 0,
0, 0x3770, 0, 0xB176, 0, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E581[] = {
+const unsigned short utf8_to_euc_E581[] = {
0xB15F, 0xB160, 0xB161, 0x5070, 0, 0xB162, 0xB163, 0x5071,
0x5075, 0x304E, 0xB164, 0, 0xB165, 0, 0xB166, 0x4A50,
0x5074, 0xB167, 0xB168, 0xB169, 0, 0x5073, 0x5077, 0xB16A,
@@ -3099,7 +2917,7 @@ static const unsigned short utf8_to_euc_E581[] = {
0xB174, 0xB175, 0x3C45, 0, 0x4226, 0x4465, 0x3676, 0,
0x5079, 0, 0, 0, 0, 0x3536, 0, 0,
};
-static const unsigned short utf8_to_euc_E582[] = {
+const unsigned short utf8_to_euc_E582[] = {
0x507A, 0xB177, 0, 0xB178, 0xB179, 0x507C, 0xB17A, 0,
0, 0, 0xB17B, 0, 0, 0x4B35, 0xB17C, 0xB17D,
0xB17E, 0x3766, 0xB221, 0xB222, 0xB223, 0, 0xB224, 0,
@@ -3109,7 +2927,7 @@ static const unsigned short utf8_to_euc_E582[] = {
0xB22E, 0, 0x507E, 0x5123, 0x507D, 0x3A44, 0, 0x3D7D,
0, 0xB22F, 0xB230, 0, 0, 0xB231, 0x3739, 0,
};
-static const unsigned short utf8_to_euc_E583[] = {
+const unsigned short utf8_to_euc_E583[] = {
0xB232, 0, 0x5124, 0xB233, 0xB234, 0x364F, 0, 0xB235,
0, 0x5121, 0x5122, 0, 0xB236, 0x462F, 0xB237, 0x417C,
0xB238, 0x3623, 0, 0xB239, 0xB23A, 0x4B4D, 0x5125, 0,
@@ -3119,7 +2937,7 @@ static const unsigned short utf8_to_euc_E583[] = {
0, 0xB245, 0xB251, 0, 0xF430, 0x512C, 0xB246, 0,
0, 0x512B, 0xB247, 0x4A48, 0, 0, 0xB248, 0,
};
-static const unsigned short utf8_to_euc_E584[] = {
+const unsigned short utf8_to_euc_E584[] = {
0x3537, 0x512E, 0x512F, 0xB249, 0x322F, 0, 0xB24A, 0xB24B,
0xB24C, 0x512D, 0, 0xB24D, 0xB24E, 0xB24F, 0xB250, 0,
0xB252, 0, 0x3C74, 0, 0x5132, 0x5131, 0x5130, 0xB253,
@@ -3129,7 +2947,7 @@ static const unsigned short utf8_to_euc_E584[] = {
0, 0xB25F, 0x4C59, 0xB260, 0xB261, 0xB262, 0, 0x5136,
0xB263, 0xB264, 0x5135, 0x5138, 0x5137, 0, 0, 0x5139,
};
-static const unsigned short utf8_to_euc_E585[] = {
+const unsigned short utf8_to_euc_E585[] = {
0x513A, 0x3074, 0xB265, 0x3835, 0x373B, 0x3D3C, 0x437B, 0x3624,
0x4068, 0x3877, 0xB266, 0x396E, 0x513C, 0x4C48, 0x4546, 0xB267,
0x3B79, 0, 0x513B, 0xB268, 0x513D, 0xB269, 0, 0xB26A,
@@ -3139,7 +2957,7 @@ static const unsigned short utf8_to_euc_E585[] = {
0, 0x3626, 0, 0, 0, 0x4A3C, 0x4236, 0x3671,
0x4535, 0, 0, 0, 0x3773, 0, 0xB26F, 0,
};
-static const unsigned short utf8_to_euc_E586[] = {
+const unsigned short utf8_to_euc_E586[] = {
0x5143, 0, 0x5144, 0xB270, 0xB271, 0x4662, 0x315F, 0,
0, 0x5147, 0x3A7D, 0xB272, 0x5146, 0x3A46, 0xB273, 0x5148,
0x666E, 0x5149, 0x4B41, 0x514A, 0, 0x514B, 0x514C, 0x3E69,
@@ -3149,7 +2967,7 @@ static const unsigned short utf8_to_euc_E586[] = {
0x5156, 0x5154, 0x5155, 0x5153, 0x3A63, 0x5157, 0x4C6A, 0x4E64,
0xB279, 0, 0xB27A, 0, 0xB27B, 0x5158, 0xB27C, 0xB27D,
};
-static const unsigned short utf8_to_euc_E587[] = {
+const unsigned short utf8_to_euc_E587[] = {
0, 0, 0xB27E, 0, 0x4028, 0x5159, 0x3D5A, 0,
0xB321, 0x515A, 0, 0x437C, 0x4E3F, 0x4560, 0, 0xB322,
0, 0xB323, 0xB324, 0xB325, 0, 0xB326, 0x5245, 0,
@@ -3159,7 +2977,7 @@ static const unsigned short utf8_to_euc_E587[] = {
0x5160, 0x332E, 0xB32C, 0xB32D, 0xB32E, 0x5161, 0x3627, 0xB32F,
0x464C, 0x317A, 0x3D50, 0, 0, 0x4821, 0x5162, 0,
};
-static const unsigned short utf8_to_euc_E588[] = {
+const unsigned short utf8_to_euc_E588[] = {
0x4561, 0xB330, 0xB331, 0x3F4F, 0x5163, 0xB332, 0x4A2C, 0x405A,
0x3422, 0, 0x3429, 0x5164, 0, 0, 0x5166, 0,
0, 0x373A, 0xB333, 0xB334, 0x5165, 0xB335, 0xB336, 0x4E73,
@@ -3169,7 +2987,7 @@ static const unsigned short utf8_to_euc_E588[] = {
0x457E, 0xB33A, 0xB33B, 0x516A, 0, 0xB33C, 0x4029, 0x3A7E,
0x3774, 0x516B, 0x3B49, 0x396F, 0xB33D, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E589[] = {
+const unsigned short utf8_to_euc_E589[] = {
0, 0, 0, 0x4466, 0x516D, 0xB33E, 0, 0x4227,
0, 0xB33F, 0x3A6F, 0x516E, 0x516F, 0x4130, 0, 0x516C,
0, 0, 0, 0, 0x5171, 0xB340, 0x4B36, 0xB341,
@@ -3179,7 +2997,7 @@ static const unsigned short utf8_to_euc_E589[] = {
0x3E6A, 0x517B, 0x3364, 0x5175, 0x5173, 0x414F, 0, 0xB34A,
0xB34B, 0xB34C, 0, 0, 0, 0x5177, 0, 0x5176,
};
-static const unsigned short utf8_to_euc_E58A[] = {
+const unsigned short utf8_to_euc_E58A[] = {
0xB34D, 0, 0xB34E, 0x3344, 0, 0xB34F, 0, 0x3760,
0x517C, 0x4E2D, 0xB350, 0, 0xB351, 0x5178, 0, 0,
0, 0x517D, 0x517A, 0xB352, 0x5179, 0xB353, 0xB354, 0xB355,
@@ -3189,7 +3007,7 @@ static const unsigned short utf8_to_euc_E58A[] = {
0xB35E, 0x4E65, 0, 0, 0x4F2B, 0x5225, 0xB35F, 0xB360,
0xB361, 0x387A, 0xB362, 0xB363, 0x5224, 0xB364, 0x332F, 0,
};
-static const unsigned short utf8_to_euc_E58B[] = {
+const unsigned short utf8_to_euc_E58B[] = {
0xB365, 0x5226, 0, 0x4B56, 0xB366, 0x443C, 0xB367, 0x4D26,
0xB368, 0x4A59, 0, 0, 0xB369, 0x5227, 0, 0xB36A,
0, 0xB36B, 0x7055, 0, 0xB36C, 0x4630, 0xB36D, 0x5228,
@@ -3199,7 +3017,7 @@ static const unsigned short utf8_to_euc_E58B[] = {
0xB376, 0xB377, 0x372E, 0x522E, 0xB378, 0x522F, 0xB379, 0xB37A,
0x5230, 0x5231, 0x3C5B, 0, 0, 0, 0x387B, 0x4C5E,
};
-static const unsigned short utf8_to_euc_E58C[] = {
+const unsigned short utf8_to_euc_E58C[] = {
0xB37B, 0x4C68, 0x4677, 0xB37C, 0, 0x4A71, 0x5232, 0xF432,
0x5233, 0, 0xB37D, 0xB37E, 0xB421, 0x5235, 0, 0x5237,
0x5236, 0xB422, 0, 0xB423, 0, 0x5238, 0x323D, 0x4B4C,
@@ -3209,7 +3027,7 @@ static const unsigned short utf8_to_euc_E58C[] = {
0xB430, 0x523C, 0xB431, 0x523D, 0, 0xB432, 0, 0,
0x523E, 0x4924, 0x3668, 0x3065, 0xB433, 0xB434, 0xB435, 0x463F,
};
-static const unsigned short utf8_to_euc_E58D[] = {
+const unsigned short utf8_to_euc_E58D[] = {
0x523F, 0x3D3D, 0xB436, 0x4069, 0, 0x5241, 0x5240, 0x3E23,
0x3861, 0x5243, 0x483E, 0xB438, 0xB437, 0x5244, 0, 0,
0, 0x485C, 0x4234, 0x426E, 0x3628, 0, 0, 0x466E,
@@ -3219,7 +3037,7 @@ static const unsigned short utf8_to_euc_E58D[] = {
0x3075, 0x346D, 0xB440, 0x4228, 0x3551, 0x4D71, 0, 0x524B,
0x3237, 0xB441, 0, 0x524A, 0, 0, 0xB442, 0x362A,
};
-static const unsigned short utf8_to_euc_E58E[] = {
+const unsigned short utf8_to_euc_E58E[] = {
0, 0, 0x524C, 0xB443, 0x4C71, 0, 0, 0xB444,
0xB445, 0, 0, 0, 0, 0, 0xB446, 0,
0, 0, 0, 0xB447, 0xB448, 0, 0x524D, 0,
@@ -3229,7 +3047,7 @@ static const unsigned short utf8_to_euc_E58E[] = {
0x5252, 0, 0xB450, 0x3837, 0xB451, 0xB452, 0x5253, 0xB453,
0xB454, 0, 0xB455, 0x356E, 0, 0xB456, 0, 0,
};
-static const unsigned short utf8_to_euc_E58F[] = {
+const unsigned short utf8_to_euc_E58F[] = {
0xB457, 0, 0x3B32, 0x5254, 0, 0xB458, 0, 0,
0x4B74, 0x3A35, 0x355A, 0x4D27, 0x4150, 0x483F, 0x3C7D, 0xB459,
0, 0, 0xB45A, 0xB45B, 0x3D47, 0xB45C, 0x3C68, 0x3C75,
@@ -3239,7 +3057,7 @@ static const unsigned short utf8_to_euc_E58F[] = {
0x4266, 0x3C38, 0x3B4B, 0x3126, 0, 0xB463, 0x3370, 0x3966,
0x3B4A, 0, 0x525D, 0, 0, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E590[] = {
+const unsigned short utf8_to_euc_E590[] = {
0, 0x525E, 0xB464, 0x3549, 0x3346, 0, 0, 0,
0x3967, 0x3548, 0x445F, 0x3125, 0x4631, 0x4C3E, 0x3921, 0x4D79,
0x4547, 0x387E, 0, 0xB465, 0, 0, 0, 0,
@@ -3249,7 +3067,7 @@ static const unsigned short utf8_to_euc_E590[] = {
0, 0xB46C, 0, 0, 0xB46D, 0xB46E, 0x5265, 0,
0x355B, 0x3F61, 0, 0x4A2D, 0x5263, 0x525F, 0x3863, 0,
};
-static const unsigned short utf8_to_euc_E591[] = {
+const unsigned short utf8_to_euc_E591[] = {
0x5260, 0, 0x4F24, 0xB46F, 0xB470, 0, 0x4A72, 0xB471,
0x4468, 0x3862, 0x3970, 0, 0, 0xB472, 0x5268, 0xB473,
0, 0x465D, 0, 0, 0, 0, 0, 0,
@@ -3259,7 +3077,7 @@ static const unsigned short utf8_to_euc_E591[] = {
0x526F, 0x526D, 0, 0x4C23, 0xB47D, 0x526A, 0x5273, 0x526E,
0, 0, 0, 0x5271, 0x3846, 0x4C3F, 0, 0xB47E,
};
-static const unsigned short utf8_to_euc_E592[] = {
+const unsigned short utf8_to_euc_E592[] = {
0x5272, 0xB521, 0, 0xB522, 0x5274, 0xB523, 0x5276, 0,
0xB524, 0xB525, 0xF435, 0x3A70, 0x4F42, 0xB526, 0x526B, 0x5269,
0x5275, 0xB527, 0x5270, 0, 0, 0xB528, 0xB529, 0,
@@ -3269,7 +3087,7 @@ static const unsigned short utf8_to_euc_E592[] = {
0, 0xB533, 0x3A69, 0x3331, 0, 0, 0, 0xB534,
0x5279, 0xB535, 0xB536, 0xB537, 0x5325, 0x3076, 0x5324, 0xB538,
};
-static const unsigned short utf8_to_euc_E593[] = {
+const unsigned short utf8_to_euc_E593[] = {
0x3025, 0x494A, 0x5322, 0, 0x527C, 0, 0xB539, 0x5277,
0x527D, 0x3A48, 0xB53A, 0, 0, 0xB53B, 0xB53C, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -3279,7 +3097,7 @@ static const unsigned short utf8_to_euc_E593[] = {
0, 0, 0x452F, 0, 0, 0, 0xB541, 0,
0, 0, 0x532E, 0, 0xB542, 0x532B, 0xB543, 0xB544,
};
-static const unsigned short utf8_to_euc_E594[] = {
+const unsigned short utf8_to_euc_E594[] = {
0xB545, 0xB546, 0, 0, 0x3134, 0xB547, 0x3A36, 0x3F30,
0xB548, 0xB549, 0, 0, 0xB54A, 0xB54B, 0xB54C, 0x5329,
0x4562, 0, 0, 0, 0x532A, 0xB54D, 0x3022, 0,
@@ -3289,7 +3107,7 @@ static const unsigned short utf8_to_euc_E594[] = {
0, 0x3E27, 0xB550, 0x533A, 0, 0xB551, 0xB552, 0,
0x5339, 0x5330, 0, 0xB553, 0xB554, 0xB555, 0x4243, 0,
};
-static const unsigned short utf8_to_euc_E595[] = {
+const unsigned short utf8_to_euc_E595[] = {
0x5331, 0xB556, 0, 0, 0x426F, 0x5336, 0x3E26, 0xB557,
0, 0xB558, 0xB559, 0, 0x5333, 0xB55A, 0, 0x4C64,
0xB55B, 0xB55C, 0, 0x373C, 0, 0, 0x5337, 0x5338,
@@ -3299,7 +3117,7 @@ static const unsigned short utf8_to_euc_E595[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0x5341, 0x5346, 0, 0x5342, 0xB565,
};
-static const unsigned short utf8_to_euc_E596[] = {
+const unsigned short utf8_to_euc_E596[] = {
0x533D, 0xB566, 0xB567, 0x5347, 0x4131, 0, 0xB568, 0x5349,
0xB569, 0x3922, 0x533F, 0x437D, 0, 0, 0xB56A, 0xB56B,
0, 0xB56C, 0xB56D, 0xB56E, 0xB56F, 0, 0, 0xB570,
@@ -3309,7 +3127,7 @@ static const unsigned short utf8_to_euc_E596[] = {
0x3674, 0, 0xB574, 0, 0, 0, 0x3144, 0,
0, 0, 0, 0, 0, 0, 0, 0xB575,
};
-static const unsigned short utf8_to_euc_E597[] = {
+const unsigned short utf8_to_euc_E597[] = {
0, 0xB576, 0, 0xB577, 0x534E, 0x534C, 0xB578, 0x5427,
0, 0xB579, 0, 0xB57A, 0xB57B, 0, 0xB57C, 0,
0, 0xB57D, 0xB57E, 0xB621, 0x5351, 0, 0, 0xB622,
@@ -3319,7 +3137,7 @@ static const unsigned short utf8_to_euc_E597[] = {
0, 0, 0, 0, 0, 0, 0xB628, 0x5353,
0, 0x5358, 0, 0, 0, 0x5356, 0x5355, 0xB629,
};
-static const unsigned short utf8_to_euc_E598[] = {
+const unsigned short utf8_to_euc_E598[] = {
0, 0, 0, 0, 0, 0xB62A, 0x4332, 0,
0xB62B, 0x3245, 0xB62C, 0, 0, 0xB62D, 0xB62E, 0xB62F,
0xB630, 0xB631, 0xB632, 0, 0x5352, 0, 0x5354, 0x3E28,
@@ -3329,7 +3147,7 @@ static const unsigned short utf8_to_euc_E598[] = {
0xB635, 0x3E7C, 0x535E, 0xB636, 0x535C, 0xB637, 0x535D, 0xB638,
0x535F, 0xB639, 0, 0xB63A, 0xB63B, 0xB63C, 0, 0xB63D,
};
-static const unsigned short utf8_to_euc_E599[] = {
+const unsigned short utf8_to_euc_E599[] = {
0xB63E, 0xB63F, 0x313D, 0xB640, 0xB641, 0, 0xB642, 0,
0, 0xB643, 0, 0xB644, 0x4139, 0xB645, 0x5359, 0xB646,
0x535A, 0, 0, 0, 0xB647, 0, 0, 0,
@@ -3339,7 +3157,7 @@ static const unsigned short utf8_to_euc_E599[] = {
0, 0xB651, 0xB652, 0, 0x4A2E, 0xB653, 0, 0,
0x4655, 0, 0x4838, 0, 0, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E59A[] = {
+const unsigned short utf8_to_euc_E59A[] = {
0x5366, 0, 0, 0, 0xB654, 0xB655, 0x5365, 0x3345,
0xB656, 0, 0x5367, 0xB657, 0xB658, 0, 0, 0x536A,
0, 0, 0, 0, 0x5369, 0xB659, 0, 0,
@@ -3349,7 +3167,7 @@ static const unsigned short utf8_to_euc_E59A[] = {
0, 0xB666, 0, 0xB667, 0x536E, 0, 0x536D, 0xB668,
0, 0, 0, 0, 0x5370, 0, 0xB669, 0,
};
-static const unsigned short utf8_to_euc_E59B[] = {
+const unsigned short utf8_to_euc_E59B[] = {
0x5373, 0x5371, 0x536F, 0x5372, 0, 0xB66A, 0, 0,
0x5374, 0xB66B, 0xB66C, 0xB66D, 0xB670, 0xB671, 0x5375, 0xB66E,
0xB66F, 0x5376, 0, 0x5377, 0, 0, 0, 0x5378,
@@ -3359,7 +3177,7 @@ static const unsigned short utf8_to_euc_E59B[] = {
0x3A24, 0xB67C, 0x304F, 0x3F5E, 0, 0, 0xB721, 0xB722,
0, 0x537A, 0x3847, 0, 0, 0x3971, 0, 0x537C,
};
-static const unsigned short utf8_to_euc_E59C[] = {
+const unsigned short utf8_to_euc_E59C[] = {
0x537B, 0xB723, 0xB724, 0x4A60, 0x537D, 0, 0, 0xB725,
0x5421, 0x537E, 0xB726, 0x5422, 0xB727, 0x5423, 0, 0x3777,
0, 0xB728, 0x3160, 0x5424, 0, 0xB729, 0x5426, 0,
@@ -3369,7 +3187,7 @@ static const unsigned short utf8_to_euc_E59C[] = {
0x434F, 0, 0, 0xB737, 0xB738, 0, 0, 0x542A,
0x542B, 0, 0, 0x542D, 0, 0xB739, 0xB73A, 0xB73B,
};
-static const unsigned short utf8_to_euc_E59D[] = {
+const unsigned short utf8_to_euc_E59D[] = {
0x542E, 0, 0x3A64, 0, 0, 0xB73C, 0xB73D, 0x3651,
0, 0, 0x4B37, 0, 0xB73E, 0xB73F, 0x542C, 0x542F,
0x3A41, 0x3923, 0xB740, 0, 0, 0, 0, 0,
@@ -3379,7 +3197,7 @@ static const unsigned short utf8_to_euc_E59D[] = {
0xB749, 0xB74A, 0, 0xB74B, 0xB74C, 0xB74D, 0, 0xB74E,
0, 0xB74F, 0xB750, 0xB751, 0xB752, 0, 0xB753, 0x5434,
};
-static const unsigned short utf8_to_euc_E59E[] = {
+const unsigned short utf8_to_euc_E59E[] = {
0, 0xB754, 0x3F62, 0xB755, 0, 0, 0, 0,
0x5432, 0x5435, 0, 0x373F, 0xB756, 0, 0, 0,
0, 0, 0, 0x5436, 0xB757, 0xB760, 0, 0xB758,
@@ -3389,7 +3207,7 @@ static const unsigned short utf8_to_euc_E59E[] = {
0x543B, 0, 0, 0x5438, 0, 0, 0, 0,
0xB765, 0, 0, 0, 0, 0xB766, 0, 0,
};
-static const unsigned short utf8_to_euc_E59F[] = {
+const unsigned short utf8_to_euc_E59F[] = {
0x5431, 0, 0, 0x543C, 0, 0, 0x543D, 0xB767,
0xB768, 0, 0, 0x4B64, 0xB769, 0, 0x3E6B, 0xB76A,
0, 0, 0x543F, 0x5440, 0x543E, 0xB76B, 0x5442, 0,
@@ -3399,7 +3217,7 @@ static const unsigned short utf8_to_euc_E59F[] = {
0xB773, 0, 0, 0, 0x3E7D, 0xB774, 0xB775, 0x3C39,
0xB776, 0x475D, 0x3470, 0, 0x3A6B, 0xB777, 0xB778, 0xB779,
};
-static const unsigned short utf8_to_euc_E5A0[] = {
+const unsigned short utf8_to_euc_E5A0[] = {
0x4B59, 0, 0x4632, 0xB77A, 0xB77B, 0x3778, 0x424F, 0,
0xB77C, 0xB77D, 0x5441, 0x5444, 0xB821, 0xB822, 0, 0,
0, 0, 0, 0, 0, 0x4244, 0, 0,
@@ -3409,7 +3227,7 @@ static const unsigned short utf8_to_euc_E5A0[] = {
0x3161, 0x4A73, 0xB82A, 0, 0x3E6C, 0x4548, 0, 0,
0, 0xB82B, 0x3A66, 0, 0, 0x544E, 0, 0xB82C,
};
-static const unsigned short utf8_to_euc_E5A1[] = {
+const unsigned short utf8_to_euc_E5A1[] = {
0x4A3D, 0x4E5D, 0, 0, 0, 0, 0, 0,
0, 0xB82D, 0x3274, 0x544A, 0xB82E, 0xB82F, 0, 0xB830,
0xB831, 0x413A, 0x544D, 0, 0x4563, 0xB832, 0, 0x4549,
@@ -3419,7 +3237,7 @@ static const unsigned short utf8_to_euc_E5A1[] = {
0x544B, 0, 0x5447, 0, 0, 0x3F50, 0, 0,
0xB838, 0x544F, 0, 0, 0xB839, 0, 0x3D4E, 0xB83A,
};
-static const unsigned short utf8_to_euc_E5A2[] = {
+const unsigned short utf8_to_euc_E5A2[] = {
0xB83B, 0xB83C, 0, 0x362D, 0, 0x5450, 0, 0xB83D,
0xB83E, 0xB83F, 0xB840, 0, 0xB841, 0xB842, 0, 0xB843,
0xB844, 0, 0, 0x4A68, 0xB845, 0, 0xB846, 0x417D,
@@ -3429,7 +3247,7 @@ static const unsigned short utf8_to_euc_E5A2[] = {
0, 0xB84D, 0xB84E, 0x4A2F, 0, 0, 0, 0,
0x5457, 0x5451, 0x5454, 0x5456, 0xB850, 0, 0x3A26, 0,
};
-static const unsigned short utf8_to_euc_E5A3[] = {
+const unsigned short utf8_to_euc_E5A3[] = {
0, 0x4A49, 0xB851, 0, 0xB84F, 0x5459, 0, 0x4345,
0xB852, 0, 0x3275, 0, 0x3E6D, 0xB853, 0xB854, 0,
0xB855, 0x545B, 0xB856, 0x545A, 0xB857, 0x3968, 0xB858, 0x545C,
@@ -3439,7 +3257,7 @@ static const unsigned short utf8_to_euc_E5A3[] = {
0x403C, 0x306D, 0x4764, 0xB85E, 0, 0, 0, 0x445B,
0, 0x5465, 0x5464, 0x5466, 0x5467, 0x5468, 0, 0,
};
-static const unsigned short utf8_to_euc_E5A4[] = {
+const unsigned short utf8_to_euc_E5A4[] = {
0, 0, 0x5469, 0, 0, 0xB85F, 0xB860, 0,
0, 0x4A51, 0x546A, 0xB861, 0xB862, 0, 0, 0x3246,
0x546B, 0, 0xB863, 0xB864, 0xB865, 0x4D3C, 0x3330, 0,
@@ -3449,7 +3267,7 @@ static const unsigned short utf8_to_euc_E5A4[] = {
0xB86D, 0x3C3A, 0x5471, 0xB86E, 0, 0xB86F, 0xB870, 0x3050,
0x5472, 0, 0, 0, 0, 0, 0x5473, 0xB871,
};
-static const unsigned short utf8_to_euc_E5A5[] = {
+const unsigned short utf8_to_euc_E5A5[] = {
0, 0, 0, 0xB872, 0x3162, 0, 0xB873, 0x3471,
0x4660, 0x4A74, 0, 0, 0, 0, 0x5477, 0x4155,
0x5476, 0x3740, 0xB874, 0xB875, 0x4B5B, 0x5475, 0, 0x4565,
@@ -3459,7 +3277,7 @@ static const unsigned short utf8_to_euc_E5A5[] = {
0, 0, 0xB922, 0x3D77, 0x455B, 0xB923, 0xB924, 0,
0x5521, 0xB925, 0, 0xB926, 0xB927, 0x3925, 0, 0,
};
-static const unsigned short utf8_to_euc_E5A6[] = {
+const unsigned short utf8_to_euc_E5A6[] = {
0, 0x5522, 0x4721, 0x485E, 0x4C51, 0, 0, 0,
0, 0, 0x4725, 0xB928, 0xB929, 0x552B, 0xB92A, 0,
0, 0, 0xB92B, 0x3538, 0, 0xB92C, 0x4D45, 0xB92D,
@@ -3469,7 +3287,7 @@ static const unsigned short utf8_to_euc_E5A6[] = {
0xB934, 0, 0x5527, 0xB935, 0, 0, 0, 0xB936,
0, 0x4B65, 0xB937, 0x3A4A, 0xB938, 0, 0x3E2A, 0,
};
-static const unsigned short utf8_to_euc_E5A7[] = {
+const unsigned short utf8_to_euc_E5A7[] = {
0, 0xB939, 0, 0xB93A, 0xB93B, 0, 0x5528, 0,
0xB93C, 0x3B50, 0xB93D, 0x3B4F, 0, 0xB93E, 0, 0,
0x3039, 0x3848, 0xB93F, 0x402B, 0x3051, 0, 0, 0,
@@ -3479,7 +3297,7 @@ static const unsigned short utf8_to_euc_E5A7[] = {
0, 0xB948, 0xB949, 0, 0xB94A, 0, 0x3028, 0xB94B,
0, 0, 0, 0x3079, 0, 0, 0, 0x3B51,
};
-static const unsigned short utf8_to_euc_E5A8[] = {
+const unsigned short utf8_to_euc_E5A8[] = {
0xB94C, 0x3052, 0, 0x3023, 0xB94D, 0, 0, 0,
0, 0x5532, 0, 0, 0xB94E, 0xB94F, 0xB950, 0,
0, 0x5530, 0xB951, 0xB952, 0, 0, 0, 0,
@@ -3489,7 +3307,7 @@ static const unsigned short utf8_to_euc_E5A8[] = {
0xB95A, 0, 0, 0, 0, 0x5537, 0x5538, 0,
0, 0, 0, 0, 0x3E2B, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E5A9[] = {
+const unsigned short utf8_to_euc_E5A9[] = {
0x5534, 0x4F2C, 0, 0, 0xB95B, 0xB95C, 0x474C, 0xB95D,
0xB95E, 0x5536, 0, 0, 0xB95F, 0, 0, 0,
0xB960, 0, 0, 0, 0, 0xB961, 0, 0,
@@ -3499,7 +3317,7 @@ static const unsigned short utf8_to_euc_E5A9[] = {
0, 0, 0, 0, 0, 0, 0, 0xB967,
0, 0, 0xB968, 0xB969, 0, 0, 0xB96A, 0x4C3B,
};
-static const unsigned short utf8_to_euc_E5AA[] = {
+const unsigned short utf8_to_euc_E5AA[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0xB96B, 0, 0, 0, 0,
0xB96C, 0, 0x475E, 0xB96D, 0, 0, 0xB96E, 0,
@@ -3509,7 +3327,7 @@ static const unsigned short utf8_to_euc_E5AA[] = {
0, 0xB977, 0xB978, 0xB979, 0, 0xB97A, 0, 0,
0xB97B, 0, 0xB97C, 0xB97D, 0x553C, 0x5540, 0x553D, 0xB97E,
};
-static const unsigned short utf8_to_euc_E5AB[] = {
+const unsigned short utf8_to_euc_E5AB[] = {
0, 0x3247, 0x553F, 0, 0xBA21, 0, 0xBA22, 0,
0xBA23, 0x3C3B, 0, 0x553E, 0x3779, 0, 0, 0xBA24,
0x554C, 0, 0, 0, 0, 0, 0x5545, 0x5542,
@@ -3519,7 +3337,7 @@ static const unsigned short utf8_to_euc_E5AB[] = {
0, 0, 0, 0, 0, 0xBA2B, 0xBA2C, 0,
0, 0, 0x5546, 0x5547, 0, 0xBA2D, 0, 0,
};
-static const unsigned short utf8_to_euc_E5AC[] = {
+const unsigned short utf8_to_euc_E5AC[] = {
0xBA2E, 0xBA2F, 0, 0, 0, 0, 0, 0,
0xBA30, 0x3472, 0, 0x5549, 0x5548, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0x554A, 0xBA31,
@@ -3529,7 +3347,7 @@ static const unsigned short utf8_to_euc_E5AC[] = {
0x3145, 0, 0x554B, 0, 0xBA32, 0, 0x554E, 0,
0xBA39, 0, 0, 0, 0, 0, 0x554F, 0,
};
-static const unsigned short utf8_to_euc_E5AD[] = {
+const unsigned short utf8_to_euc_E5AD[] = {
0x5552, 0xBA3A, 0, 0x5550, 0, 0x5551, 0, 0,
0, 0, 0, 0xBA3B, 0xBA3C, 0, 0, 0,
0x3B52, 0x5553, 0xBA3D, 0, 0x3926, 0x5554, 0xBA3E, 0x3B7A,
@@ -3539,7 +3357,7 @@ static const unsigned short utf8_to_euc_E5AD[] = {
0x5559, 0x5623, 0, 0x555A, 0, 0x555B, 0, 0,
0x555C, 0, 0x555E, 0, 0xBA43, 0xBA44, 0xBA45, 0xBA46,
};
-static const unsigned short utf8_to_euc_E5AE[] = {
+const unsigned short utf8_to_euc_E5AE[] = {
0x555F, 0xBA47, 0, 0x5560, 0xBA48, 0x4270, 0xBA49, 0x3127,
0x3C69, 0x3042, 0xBA4A, 0x4157, 0x3430, 0x3C35, 0xBA4B, 0x3928,
0xBA4C, 0xBA4D, 0, 0xBA4E, 0xBA4F, 0x4566, 0xBA50, 0x3D21,
@@ -3549,7 +3367,7 @@ static const unsigned short utf8_to_euc_E5AE[] = {
0x3A4B, 0xBA56, 0xBA57, 0x3332, 0x3163, 0x3E2C, 0x3248, 0xBA58,
0x5562, 0x4D46, 0xBA59, 0, 0xBA5A, 0, 0, 0x3D49,
};
-static const unsigned short utf8_to_euc_E5AF[] = {
+const unsigned short utf8_to_euc_E5AF[] = {
0xBA5B, 0xBA5C, 0x3C64, 0x5563, 0x3473, 0x4652, 0x4C29, 0x5564,
0, 0x5565, 0, 0, 0x4959, 0xBA5D, 0, 0xBA5E,
0x5567, 0, 0x3428, 0x3677, 0x5566, 0, 0xBA5F, 0xBA60,
@@ -3559,7 +3377,7 @@ static const unsigned short utf8_to_euc_E5AF[] = {
0x556E, 0xBA66, 0, 0x5570, 0xBA67, 0x437E, 0x556F, 0,
0x4023, 0, 0x3B7B, 0, 0, 0xBA68, 0x4250, 0x3C77,
};
-static const unsigned short utf8_to_euc_E5B0[] = {
+const unsigned short utf8_to_euc_E5B0[] = {
0, 0x4975, 0x406C, 0, 0x3C4D, 0x5571, 0x3E2D, 0x5572,
0x5573, 0x3053, 0x423A, 0x3F52, 0xBA69, 0x5574, 0x4633, 0x3E2E,
0, 0x3E2F, 0, 0x5575, 0, 0, 0x406D, 0xBA6A,
@@ -3569,7 +3387,7 @@ static const unsigned short utf8_to_euc_E5B0[] = {
0xBA73, 0x3D22, 0xBA74, 0, 0, 0xBA75, 0xBA76, 0,
0x5579, 0x557A, 0x3C5C, 0x3F2C, 0x4674, 0x3F54, 0x4878, 0x4722,
};
-static const unsigned short utf8_to_euc_E5B1[] = {
+const unsigned short utf8_to_euc_E5B1[] = {
0x3649, 0x557B, 0, 0, 0, 0x356F, 0x557C, 0,
0x367E, 0, 0x464F, 0x3230, 0, 0x3B53, 0x557D, 0x5622,
0x5621, 0x367D, 0, 0x557E, 0, 0x4538, 0, 0,
@@ -3579,7 +3397,7 @@ static const unsigned short utf8_to_euc_E5B1[] = {
0xBB22, 0x3B33, 0, 0, 0xBB23, 0xBB24, 0x5627, 0,
0, 0x5628, 0xBB25, 0xBB26, 0xBB27, 0xBB28, 0, 0,
};
-static const unsigned short utf8_to_euc_E5B2[] = {
+const unsigned short utf8_to_euc_E5B2[] = {
0, 0, 0, 0, 0, 0, 0, 0xBB29,
0xBB2A, 0, 0xBB2B, 0, 0x5629, 0, 0, 0xBB2C,
0x3474, 0x562A, 0xBB2D, 0, 0x562B, 0, 0, 0,
@@ -3589,7 +3407,7 @@ static const unsigned short utf8_to_euc_E5B2[] = {
0, 0x4252, 0xBB35, 0x3359, 0xBB36, 0xBB37, 0x562F, 0x5631,
0x345F, 0, 0xBB38, 0x562E, 0x5630, 0, 0x5633, 0,
};
-static const unsigned short utf8_to_euc_E5B3[] = {
+const unsigned short utf8_to_euc_E5B3[] = {
0, 0, 0, 0, 0, 0x5632, 0, 0x5634,
0, 0xBB39, 0, 0xBB3A, 0, 0, 0, 0,
0, 0, 0xBB3B, 0, 0, 0, 0, 0xBB3D,
@@ -3599,7 +3417,7 @@ static const unsigned short utf8_to_euc_E5B3[] = {
0x4A76, 0xBB3F, 0xBB40, 0, 0xBB41, 0xF43B, 0x4567, 0,
0, 0, 0x5638, 0x3D54, 0, 0x5637, 0, 0,
};
-static const unsigned short utf8_to_euc_E5B4[] = {
+const unsigned short utf8_to_euc_E5B4[] = {
0, 0xBB42, 0, 0, 0, 0, 0xBB43, 0x3F72,
0, 0, 0, 0x563C, 0, 0xBB44, 0x3A6A, 0,
0, 0x5642, 0xBB45, 0, 0x5643, 0x563D, 0x3333, 0x563E,
@@ -3609,7 +3427,7 @@ static const unsigned short utf8_to_euc_E5B4[] = {
0, 0xBB4B, 0, 0, 0xBB4C, 0, 0, 0,
0, 0xBB4D, 0, 0, 0, 0xBB4E, 0, 0xBB4F,
};
-static const unsigned short utf8_to_euc_E5B5[] = {
+const unsigned short utf8_to_euc_E5B5[] = {
0, 0, 0xBB50, 0xBB51, 0, 0, 0xBB52, 0,
0xBB53, 0, 0xBB57, 0x564B, 0x5648, 0, 0x564A, 0,
0x4D72, 0xBB55, 0x5649, 0xF43C, 0, 0xBB54, 0, 0,
@@ -3619,7 +3437,7 @@ static const unsigned short utf8_to_euc_E5B5[] = {
0xBB5F, 0, 0, 0x564D, 0, 0, 0x564E, 0,
0, 0xBB60, 0xBB61, 0, 0, 0, 0xBB62, 0xBB63,
};
-static const unsigned short utf8_to_euc_E5B6[] = {
+const unsigned short utf8_to_euc_E5B6[] = {
0, 0xBB64, 0x5651, 0xBB65, 0x5650, 0, 0, 0x564F,
0xBB66, 0, 0xBB67, 0x4568, 0x563A, 0, 0, 0,
0x5657, 0, 0xBB68, 0xBB69, 0xBB6A, 0xBB6B, 0, 0,
@@ -3629,7 +3447,7 @@ static const unsigned short utf8_to_euc_E5B6[] = {
0xBB72, 0, 0xE674, 0, 0xBB73, 0, 0, 0x5658,
0xBB74, 0xBB75, 0x4E66, 0, 0x5659, 0x5656, 0, 0,
};
-static const unsigned short utf8_to_euc_E5B7[] = {
+const unsigned short utf8_to_euc_E5B7[] = {
0, 0, 0, 0xBB76, 0, 0, 0, 0xBB77,
0, 0x565A, 0, 0xBB78, 0x3460, 0x565B, 0xBB7A, 0,
0xBB79, 0, 0x565D, 0x565C, 0, 0, 0x565E, 0,
@@ -3639,7 +3457,7 @@ static const unsigned short utf8_to_euc_E5B7[] = {
0, 0x384A, 0x5661, 0x4C26, 0x4743, 0x5662, 0, 0x392B,
0xBC22, 0xBC23, 0, 0x342C, 0, 0x4327, 0x3652, 0,
};
-static const unsigned short utf8_to_euc_E5B8[] = {
+const unsigned short utf8_to_euc_E5B8[] = {
0xBC24, 0, 0x3B54, 0x495B, 0, 0, 0x4841, 0xBC25,
0, 0, 0, 0x5663, 0x3475, 0xBC26, 0, 0,
0, 0x5666, 0xBC27, 0, 0xBC28, 0xBC29, 0x4421, 0,
@@ -3649,7 +3467,7 @@ static const unsigned short utf8_to_euc_E5B8[] = {
0x3522, 0, 0xBC2F, 0x4422, 0, 0xBC30, 0x5668, 0x5669,
0x3E6F, 0, 0, 0, 0, 0x4B39, 0xBC31, 0,
};
-static const unsigned short utf8_to_euc_E5B9[] = {
+const unsigned short utf8_to_euc_E5B9[] = {
0x566C, 0, 0, 0x566B, 0x566A, 0x497D, 0, 0x5673,
0, 0xBC34, 0, 0xBC32, 0x4B5A, 0, 0x566D, 0,
0xBC33, 0xBC35, 0, 0, 0x566F, 0x4B6B, 0xBC36, 0x566E,
@@ -3659,7 +3477,7 @@ static const unsigned short utf8_to_euc_E5B9[] = {
0xBC41, 0, 0x3433, 0x4A3F, 0x472F, 0x5674, 0x5675, 0,
0x392C, 0x3434, 0x5676, 0x3838, 0x4D44, 0x4D29, 0x3476, 0x5678,
};
-static const unsigned short utf8_to_euc_E5BA[] = {
+const unsigned short utf8_to_euc_E5BA[] = {
0xBC42, 0x4423, 0, 0x392D, 0x3E31, 0, 0, 0x485F,
0, 0, 0x3E32, 0xBC43, 0, 0, 0xBC44, 0x3D78,
0, 0, 0, 0, 0, 0x446C, 0x4A79, 0x4539,
@@ -3669,7 +3487,7 @@ static const unsigned short utf8_to_euc_E5BA[] = {
0, 0xBC4B, 0, 0xBC4C, 0, 0x3043, 0x3D6E, 0x392F,
0x4D47, 0, 0, 0, 0, 0xBC4D, 0xBC4E, 0xBC4F,
};
-static const unsigned short utf8_to_euc_E5BB[] = {
+const unsigned short utf8_to_euc_E5BB[] = {
0, 0x567A, 0x567B, 0x4751, 0, 0, 0xBC50, 0,
0x567C, 0x4E77, 0x4F2D, 0xBC52, 0xBC51, 0, 0xBC53, 0x567E,
0x567D, 0xBC54, 0xBC55, 0x3347, 0xBC56, 0xBC57, 0x5721, 0,
@@ -3679,7 +3497,7 @@ static const unsigned short utf8_to_euc_E5BB[] = {
0x572D, 0x572B, 0, 0x572C, 0x572E, 0, 0x3164, 0x446E,
0x572F, 0, 0x377A, 0x3276, 0x4736, 0, 0x5730, 0x467B,
};
-static const unsigned short utf8_to_euc_E5BC[] = {
+const unsigned short utf8_to_euc_E5BC[] = {
0, 0x4A5B, 0xBC5C, 0x5731, 0x4F2E, 0, 0xBC5D, 0xBC5E,
0xBC5F, 0x5732, 0x4A40, 0x5735, 0x5021, 0x5031, 0xBC60, 0x3C30,
0x4675, 0x5736, 0, 0x355D, 0x4424, 0x307A, 0x5737, 0x4A26,
@@ -3689,7 +3507,7 @@ static const unsigned short utf8_to_euc_E5BC[] = {
0xBC6C, 0x3C65, 0, 0, 0xBC6D, 0x4425, 0xBC6E, 0x362F,
0x573A, 0, 0, 0xBC6F, 0x492B, 0xBC70, 0x4346, 0xBC71,
};
-static const unsigned short utf8_to_euc_E5BD[] = {
+const unsigned short utf8_to_euc_E5BD[] = {
0xBC72, 0x573B, 0, 0, 0xBC73, 0xBC74, 0, 0xBC75,
0x573C, 0, 0x3630, 0, 0x573D, 0xBC76, 0x573E, 0,
0xBC77, 0x5740, 0, 0x4576, 0xBC78, 0, 0x5741, 0x5742,
@@ -3699,7 +3517,7 @@ static const unsigned short utf8_to_euc_E5BD[] = {
0x3E34, 0x3146, 0xBD22, 0x5746, 0xBD23, 0xBD24, 0, 0x5747,
0xBD25, 0x4C72, 0xBD26, 0, 0x4860, 0xBD27, 0xBD28, 0x574A,
};
-static const unsigned short utf8_to_euc_E5BE[] = {
+const unsigned short utf8_to_euc_E5BE[] = {
0x317D, 0x402C, 0x5749, 0x5748, 0x3742, 0x4254, 0, 0x574E,
0x574C, 0xBD29, 0x574B, 0x4E27, 0x3865, 0xBD2A, 0, 0xBD2B,
0x3D79, 0x574D, 0x454C, 0x3D3E, 0, 0, 0xBD2C, 0x4640,
@@ -3709,7 +3527,7 @@ static const unsigned short utf8_to_euc_E5BE[] = {
0xBD35, 0xBD36, 0, 0x4641, 0x4427, 0, 0, 0xF43E,
0xBD37, 0x4530, 0, 0, 0x5755, 0x352B, 0, 0,
};
-static const unsigned short utf8_to_euc_E5BF[] = {
+const unsigned short utf8_to_euc_E5BF[] = {
0, 0, 0, 0x3F34, 0xBD38, 0x492C, 0, 0xBD39,
0xBD3A, 0xBD3B, 0, 0xBD3C, 0x3477, 0x4726, 0, 0,
0xBD3D, 0xBD3E, 0xBD3F, 0xBD40, 0xBD41, 0, 0x5756, 0x3B56,
@@ -3719,7 +3537,7 @@ static const unsigned short utf8_to_euc_E5BF[] = {
0x582D, 0x575A, 0xBD4C, 0xBD4D, 0, 0x4730, 0xBD4E, 0,
0x5759, 0, 0xBD4F, 0x5757, 0xBD50, 0x397A, 0, 0x575D,
};
-static const unsigned short utf8_to_euc_E680[] = {
+const unsigned short utf8_to_euc_E680[] = {
0, 0, 0, 0, 0, 0, 0, 0xBD51,
0, 0, 0xBD52, 0, 0, 0xBD53, 0x5763, 0x5769,
0x5761, 0, 0x455C, 0xBD54, 0xBD55, 0x5766, 0x495D, 0xBD56,
@@ -3729,7 +3547,7 @@ static const unsigned short utf8_to_euc_E680[] = {
0, 0x5764, 0, 0xBD5C, 0, 0xBD5D, 0, 0,
0, 0, 0x576A, 0, 0, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E681[] = {
+const unsigned short utf8_to_euc_E681[] = {
0xBD5E, 0x576C, 0x5776, 0x5774, 0, 0, 0x5771, 0xBD5F,
0xBD60, 0xBD61, 0x5770, 0x4E78, 0xBD62, 0x5772, 0, 0,
0x3632, 0xBD63, 0x3931, 0, 0xBD64, 0x3D7A, 0xBD65, 0xBD66,
@@ -3739,7 +3557,7 @@ static const unsigned short utf8_to_euc_E681[] = {
0x3366, 0xBD6A, 0, 0, 0, 0x3743, 0, 0x576E,
0, 0, 0, 0, 0, 0, 0xBD6B, 0xBD6C,
};
-static const unsigned short utf8_to_euc_E682[] = {
+const unsigned short utf8_to_euc_E682[] = {
0, 0x577A, 0xBD6D, 0x577D, 0x5821, 0xF43F, 0xBD6E, 0,
0xBD6F, 0x3C3D, 0xBD70, 0x5827, 0x4470, 0x577B, 0xBD71, 0,
0, 0xBD72, 0x5825, 0xBD73, 0x3279, 0xBD74, 0x5823, 0x5824,
@@ -3749,7 +3567,7 @@ static const unsigned short utf8_to_euc_E682[] = {
0xBD7C, 0xBD7D, 0x4861, 0x575C, 0x582C, 0x5830, 0x4C65, 0xBD7E,
0x5829, 0, 0, 0xBE21, 0x4569, 0x582E, 0xBE22, 0,
};
-static const unsigned short utf8_to_euc_E683[] = {
+const unsigned short utf8_to_euc_E683[] = {
0, 0, 0xBE23, 0, 0xBE24, 0x3E70, 0x582F, 0x4657,
0xBE25, 0xBE26, 0xBE27, 0xBE28, 0, 0, 0xBE29, 0xBE2A,
0, 0x4F47, 0, 0x582B, 0xBE2B, 0xBE2C, 0, 0,
@@ -3759,7 +3577,7 @@ static const unsigned short utf8_to_euc_E683[] = {
0x4246, 0x583D, 0xBE33, 0x415B, 0x5838, 0xBE34, 0x5835, 0x5836,
0xBE35, 0x3C66, 0x5839, 0x583C, 0xBE36, 0xBE37, 0, 0,
};
-static const unsigned short utf8_to_euc_E684[] = {
+const unsigned short utf8_to_euc_E684[] = {
0x5837, 0x3D25, 0xBE38, 0x583A, 0, 0, 0x5834, 0xBE39,
0x4C7C, 0x4C7B, 0xBE3A, 0, 0xBE3B, 0x583E, 0x583F, 0x3055,
0xBE3C, 0xBE3D, 0xBE3E, 0xBE3F, 0xBE40, 0x5833, 0xBE41, 0xBE42,
@@ -3769,7 +3587,7 @@ static const unsigned short utf8_to_euc_E684[] = {
0xBE49, 0xBE4A, 0, 0, 0x5848, 0xBE4B, 0xBE4C, 0xBE4D,
0, 0xBE4E, 0, 0, 0x5846, 0x5849, 0x5841, 0x5845,
};
-static const unsigned short utf8_to_euc_E685[] = {
+const unsigned short utf8_to_euc_E685[] = {
0, 0xBE4F, 0x584A, 0, 0x584B, 0xBE50, 0xBE51, 0x5840,
0x3B7C, 0xBE52, 0x5844, 0x4256, 0x3932, 0x5832, 0x3F35, 0,
0, 0, 0, 0x5858, 0, 0x4A69, 0, 0,
@@ -3779,7 +3597,7 @@ static const unsigned short utf8_to_euc_E685[] = {
0x3056, 0x5855, 0xBE56, 0x584C, 0x5852, 0x5859, 0x3744, 0x584D,
0xBE57, 0, 0, 0xBE58, 0xBE59, 0, 0x4D5D, 0xBE5A,
};
-static const unsigned short utf8_to_euc_E686[] = {
+const unsigned short utf8_to_euc_E686[] = {
0xBE5B, 0xBE5C, 0x4D2B, 0xBE5D, 0xBE5E, 0, 0, 0x585C,
0, 0, 0x5860, 0xBE5F, 0, 0xBE60, 0x417E, 0,
0x4E79, 0x5861, 0xBE61, 0xBE62, 0x585E, 0, 0x585B, 0xBE63,
@@ -3789,7 +3607,7 @@ static const unsigned short utf8_to_euc_E686[] = {
0, 0, 0x377B, 0, 0, 0, 0x3231, 0,
0xBE6D, 0xBE6E, 0x586B, 0, 0xBE6F, 0, 0x3438, 0,
};
-static const unsigned short utf8_to_euc_E687[] = {
+const unsigned short utf8_to_euc_E687[] = {
0xBE70, 0xBE71, 0xBE72, 0x5869, 0, 0, 0x586A, 0x3A29,
0x5868, 0x5866, 0x5865, 0x586C, 0x5864, 0x586E, 0xBE73, 0xBE74,
0x327B, 0, 0, 0, 0, 0xBE75, 0, 0,
@@ -3799,7 +3617,7 @@ static const unsigned short utf8_to_euc_E687[] = {
0, 0, 0x4428, 0, 0x5873, 0, 0x5871, 0x5867,
0x377C, 0, 0x5872, 0, 0x5876, 0x5875, 0x5877, 0x5874,
};
-static const unsigned short utf8_to_euc_E688[] = {
+const unsigned short utf8_to_euc_E688[] = {
0x5878, 0xBF24, 0, 0xBF25, 0xBF26, 0, 0, 0xBF27,
0x5879, 0x587A, 0x4A6A, 0, 0x587C, 0x587B, 0x3D3F, 0,
0x402E, 0x3266, 0x327C, 0xBF28, 0x587D, 0xBF29, 0x303F, 0,
@@ -3809,7 +3627,7 @@ static const unsigned short utf8_to_euc_E688[] = {
0x5925, 0, 0x5926, 0x5927, 0x4257, 0, 0, 0,
0x384D, 0xBF31, 0, 0x4C61, 0, 0xBF32, 0, 0x4B3C,
};
-static const unsigned short utf8_to_euc_E689[] = {
+const unsigned short utf8_to_euc_E689[] = {
0x3D6A, 0x5928, 0xBF33, 0xBF34, 0xBF35, 0, 0xBF36, 0x4070,
0x6E3D, 0x4862, 0, 0x3C6A, 0xBF37, 0x3A4D, 0x5929, 0,
0xBF38, 0xBF39, 0xBF3A, 0x4247, 0xBF3B, 0x4A27, 0xBF3C, 0,
@@ -3819,7 +3637,7 @@ static const unsigned short utf8_to_euc_E689[] = {
0, 0x3037, 0, 0xBF42, 0, 0, 0x495E, 0,
0, 0x4863, 0xBF43, 0, 0x592F, 0xBF44, 0x5932, 0x3E35,
};
-static const unsigned short utf8_to_euc_E68A[] = {
+const unsigned short utf8_to_euc_E68A[] = {
0x353B, 0, 0x5930, 0x5937, 0x3E36, 0, 0, 0,
0, 0x5931, 0x4744, 0, 0, 0xBF45, 0xBF46, 0xBF47,
0xBF48, 0x4D5E, 0x5933, 0x5934, 0x5938, 0x456A, 0x5935, 0x3933,
@@ -3829,7 +3647,7 @@ static const unsigned short utf8_to_euc_E68A[] = {
0, 0x4A7A, 0, 0xBF4B, 0, 0x4471, 0xBF4C, 0xBF4D,
0, 0x4B75, 0xBF4E, 0x593B, 0x3221, 0x436A, 0xBF4F, 0xBF50,
};
-static const unsigned short utf8_to_euc_E68B[] = {
+const unsigned short utf8_to_euc_E68B[] = {
0, 0, 0x5944, 0, 0xBF51, 0x4334, 0x593E, 0x5945,
0x5940, 0x5947, 0x5943, 0, 0x5942, 0x476F, 0xBF52, 0x593C,
0x327D, 0x593A, 0x3571, 0x4273, 0x5936, 0xBF53, 0xBF54, 0x5939,
@@ -3839,7 +3657,7 @@ static const unsigned short utf8_to_euc_E68B[] = {
0, 0x594A, 0xBF57, 0x377D, 0xBF58, 0x594F, 0x3B22, 0x3969,
0, 0, 0, 0, 0xBF59, 0xBF5A, 0x3D26, 0x593D,
};
-static const unsigned short utf8_to_euc_E68C[] = {
+const unsigned short utf8_to_euc_E68C[] = {
0, 0x3B7D, 0x594C, 0xBF5B, 0xBF5C, 0, 0, 0x3B58,
0x594D, 0x3044, 0xBF5D, 0xBF5E, 0x5948, 0xBF5F, 0, 0,
0xBF60, 0x4429, 0, 0xBF61, 0, 0, 0xBF62, 0,
@@ -3849,7 +3667,7 @@ static const unsigned short utf8_to_euc_E68C[] = {
0, 0, 0, 0, 0, 0xBF67, 0xBF68, 0,
0, 0xBF69, 0x4472, 0, 0xBF6A, 0x4854, 0x5951, 0x415E,
};
-static const unsigned short utf8_to_euc_E68D[] = {
+const unsigned short utf8_to_euc_E68D[] = {
0, 0xBF6B, 0xBF6C, 0xBF6D, 0xBF6E, 0, 0xBF6F, 0,
0, 0x422A, 0xBF70, 0xBF71, 0x3B2B, 0x5952, 0xBF72, 0x5954,
0x5950, 0, 0xBF73, 0xBF74, 0xBF75, 0x4A61, 0, 0x443D,
@@ -3859,7 +3677,7 @@ static const unsigned short utf8_to_euc_E68D[] = {
0, 0xBF7C, 0x377E, 0, 0xBF7D, 0xBF7E, 0x5959, 0x3E39,
0xC021, 0, 0x4668, 0x4731, 0xC022, 0xC023, 0, 0xC024,
};
-static const unsigned short utf8_to_euc_E68E[] = {
+const unsigned short utf8_to_euc_E68E[] = {
0x5957, 0, 0xC025, 0x415D, 0xC026, 0, 0, 0xC027,
0x3C78, 0x595C, 0xC028, 0, 0x3E38, 0, 0x5956, 0x595B,
0xC029, 0, 0x4753, 0, 0xC02A, 0xC02B, 0x5955, 0,
@@ -3869,7 +3687,7 @@ static const unsigned short utf8_to_euc_E68E[] = {
0, 0, 0x3747, 0, 0x444F, 0x595E, 0, 0,
0, 0, 0, 0x415F, 0, 0xC034, 0x5961, 0,
};
-static const unsigned short utf8_to_euc_E68F[] = {
+const unsigned short utf8_to_euc_E68F[] = {
0x5963, 0xC035, 0, 0x4237, 0x5969, 0xC036, 0x5964, 0,
0xC037, 0x5966, 0, 0, 0, 0, 0xC038, 0x4941,
0x4473, 0xC039, 0x5967, 0xC03A, 0xC03B, 0xC03C, 0x4D2C, 0,
@@ -3879,7 +3697,7 @@ static const unsigned short utf8_to_euc_E68F[] = {
0, 0, 0xC042, 0xC043, 0x3167, 0xC044, 0x5968, 0,
0xC045, 0xC046, 0x4D49, 0, 0, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E690[] = {
+const unsigned short utf8_to_euc_E690[] = {
0, 0, 0, 0, 0, 0, 0x596C, 0,
0, 0xC047, 0xC048, 0, 0, 0x423B, 0, 0x5973,
0xC049, 0, 0xC04A, 0x596D, 0xC04B, 0, 0x596A, 0x5971,
@@ -3889,7 +3707,7 @@ static const unsigned short utf8_to_euc_E690[] = {
0xC055, 0, 0, 0, 0x596B, 0xC056, 0x596F, 0,
0, 0, 0x3748, 0, 0, 0xC057, 0x3A71, 0xC058,
};
-static const unsigned short utf8_to_euc_E691[] = {
+const unsigned short utf8_to_euc_E691[] = {
0, 0, 0x405D, 0, 0, 0, 0, 0,
0, 0, 0, 0xC059, 0, 0, 0x5977, 0xC05A,
0, 0xC05B, 0xC05C, 0xC05D, 0xC05E, 0, 0, 0,
@@ -3899,7 +3717,7 @@ static const unsigned short utf8_to_euc_E691[] = {
0, 0, 0, 0xC068, 0xC069, 0, 0x5976, 0,
0x4C4E, 0, 0x4022, 0xC06A, 0, 0xC06B, 0, 0,
};
-static const unsigned short utf8_to_euc_E692[] = {
+const unsigned short utf8_to_euc_E692[] = {
0, 0, 0, 0x3762, 0, 0xC06C, 0, 0xC06D,
0x597D, 0, 0, 0, 0, 0, 0, 0xC06E,
0xC06F, 0xC070, 0x3B35, 0x597A, 0, 0x5979, 0, 0,
@@ -3909,7 +3727,7 @@ static const unsigned short utf8_to_euc_E692[] = {
0x4071, 0, 0x4B50, 0xC07B, 0, 0, 0, 0,
0, 0x3349, 0, 0x5A25, 0x597E, 0xC07C, 0xC07D, 0xC07E,
};
-static const unsigned short utf8_to_euc_E693[] = {
+const unsigned short utf8_to_euc_E693[] = {
0, 0x4D4A, 0x5A27, 0, 0xC121, 0x5A23, 0, 0x5A24,
0, 0xC122, 0xC123, 0xC124, 0xC125, 0x4160, 0xC126, 0,
0xC127, 0xC128, 0x5A22, 0, 0x593F, 0xC129, 0, 0xC12A,
@@ -3919,7 +3737,7 @@ static const unsigned short utf8_to_euc_E693[] = {
0xC130, 0x5A28, 0x5A33, 0, 0x5A32, 0xC131, 0x5A31, 0xC132,
0, 0, 0x5A34, 0xC133, 0, 0x5A36, 0x3E71, 0xC134,
};
-static const unsigned short utf8_to_euc_E694[] = {
+const unsigned short utf8_to_euc_E694[] = {
0x5A35, 0xC135, 0, 0, 0xC136, 0x5A39, 0, 0,
0xC137, 0xC138, 0xC139, 0, 0, 0, 0, 0xC13A,
0, 0, 0, 0xC13B, 0xC13C, 0, 0xC13D, 0,
@@ -3929,7 +3747,7 @@ static const unsigned short utf8_to_euc_E694[] = {
0, 0xC146, 0, 0, 0x5A3D, 0x5A3E, 0x5A40, 0x5A3F,
0x5A41, 0x327E, 0xC147, 0x3936, 0xC148, 0xC149, 0x4A7C, 0x402F,
};
-static const unsigned short utf8_to_euc_E695[] = {
+const unsigned short utf8_to_euc_E695[] = {
0, 0, 0, 0xC14A, 0, 0x384E, 0, 0xC14B,
0x5A43, 0xC14C, 0, 0, 0, 0x5A46, 0xF441, 0x4952,
0xC14D, 0x355F, 0xC14E, 0, 0xC14F, 0x5A45, 0x5A44, 0x4754,
@@ -3939,7 +3757,7 @@ static const unsigned short utf8_to_euc_E695[] = {
0x3F74, 0, 0x5A4A, 0, 0x4030, 0x4528, 0, 0x495F,
0x5A4B, 0, 0xC154, 0, 0, 0xC155, 0, 0,
};
-static const unsigned short utf8_to_euc_E696[] = {
+const unsigned short utf8_to_euc_E696[] = {
0, 0xC156, 0x5A4C, 0x5A4D, 0, 0xC157, 0, 0x4A38,
0x555D, 0x4046, 0xC158, 0, 0x494C, 0, 0x3A58, 0,
0x4865, 0x4843, 0xC159, 0, 0, 0xC15A, 0, 0x454D,
@@ -3949,7 +3767,7 @@ static const unsigned short utf8_to_euc_E696[] = {
0x3F37, 0, 0xC161, 0xC162, 0xC163, 0, 0, 0x5A52,
0, 0x4A7D, 0, 0, 0x3177, 0x3B5C, 0, 0xC164,
};
-static const unsigned short utf8_to_euc_E697[] = {
+const unsigned short utf8_to_euc_E697[] = {
0, 0x5A55, 0xC165, 0x5A53, 0x5A56, 0x4E39, 0x5A54, 0,
0xC166, 0xC167, 0, 0x407B, 0x5A57, 0, 0xC168, 0x4232,
0xC169, 0, 0x5A58, 0, 0xC16A, 0, 0xC16B, 0x347A,
@@ -3959,7 +3777,7 @@ static const unsigned short utf8_to_euc_E697[] = {
0xC16E, 0x5A5D, 0xC16F, 0, 0xC170, 0xC171, 0, 0,
0, 0xC172, 0x3222, 0x5A61, 0, 0, 0xC173, 0xC174,
};
-static const unsigned short utf8_to_euc_E698[] = {
+const unsigned short utf8_to_euc_E698[] = {
0xC175, 0, 0x3937, 0x5A60, 0xC176, 0, 0x3A2B, 0x3E3A,
0xC177, 0xC178, 0x5A5F, 0, 0x3E3B, 0xC179, 0x4C40, 0x3A2A,
0, 0xC17A, 0xC17B, 0x3057, 0x404E, 0xC17C, 0xC17D, 0,
@@ -3969,7 +3787,7 @@ static const unsigned short utf8_to_euc_E698[] = {
0xC22C, 0xC22D, 0, 0xC22E, 0x5A65, 0x5A63, 0x5A64, 0xC230,
0, 0xC22F, 0, 0xF442, 0x436B, 0, 0, 0x5B26,
};
-static const unsigned short utf8_to_euc_E699[] = {
+const unsigned short utf8_to_euc_E699[] = {
0xC231, 0x5A6A, 0x3B7E, 0x3938, 0x5A68, 0xC232, 0xC233, 0,
0, 0x5A69, 0xC234, 0x3F38, 0xC235, 0, 0xC237, 0x5A67,
0, 0xC236, 0x3B2F, 0, 0, 0, 0, 0xC238,
@@ -3979,7 +3797,7 @@ static const unsigned short utf8_to_euc_E699[] = {
0x5A72, 0, 0, 0xC244, 0x4032, 0xC245, 0x3E3D, 0xC247,
0xC248, 0xC249, 0x4352, 0xC24A, 0xC24C, 0, 0xC243, 0xC246,
};
-static const unsigned short utf8_to_euc_E69A[] = {
+const unsigned short utf8_to_euc_E69A[] = {
0xC24B, 0x3647, 0, 0x5A73, 0x5A77, 0, 0, 0x324B,
0x5A74, 0x5A76, 0, 0xC24D, 0xC24E, 0xC24F, 0x5A75, 0,
0xC250, 0x3D6B, 0xC251, 0, 0, 0, 0x4348, 0x3045,
@@ -3989,7 +3807,7 @@ static const unsigned short utf8_to_euc_E69A[] = {
0, 0xC25A, 0xC25B, 0, 0x4B3D, 0xC25C, 0, 0,
0x5B22, 0x5A7B, 0, 0xC25D, 0x5A7E, 0, 0x5A7D, 0xC25E,
};
-static const unsigned short utf8_to_euc_E69B[] = {
+const unsigned short utf8_to_euc_E69B[] = {
0xC25F, 0x5A7A, 0xC260, 0xC261, 0x5B21, 0, 0, 0x465E,
0xC262, 0x5A7C, 0, 0, 0xC263, 0, 0xC264, 0xC265,
0, 0, 0, 0, 0xC266, 0, 0x5B23, 0,
@@ -3999,7 +3817,7 @@ static const unsigned short utf8_to_euc_E69B[] = {
0x5B29, 0, 0x364A, 0x3148, 0x3939, 0x5B2A, 0, 0x5B2B,
0x3D71, 0x4162, 0xC26D, 0xC23F, 0x5258, 0x413E, 0x413D, 0x4258,
};
-static const unsigned short utf8_to_euc_E69C[] = {
+const unsigned short utf8_to_euc_E69C[] = {
0x3A47, 0, 0, 0x5072, 0, 0xC26E, 0, 0xC26F,
0x376E, 0x4D2D, 0, 0x4A7E, 0, 0x497E, 0xC270, 0x5B2C,
0, 0, 0, 0xC271, 0x3A73, 0x443F, 0x5B2D, 0x4F2F,
@@ -4009,7 +3827,7 @@ static const unsigned short utf8_to_euc_E69C[] = {
0, 0x3C6B, 0, 0xC276, 0x4B51, 0, 0x5B34, 0x5B37,
0x5B36, 0, 0x3479, 0, 0, 0x3560, 0xC277, 0x5B33,
};
-static const unsigned short utf8_to_euc_E69D[] = {
+const unsigned short utf8_to_euc_E69D[] = {
0, 0x5B35, 0, 0, 0, 0xC278, 0x5B38, 0xC279,
0xC27A, 0x3F79, 0, 0, 0xC27B, 0, 0x4D7B, 0x3049,
0x3A60, 0x423C, 0, 0x3C5D, 0xC27C, 0xC27D, 0x3E73, 0,
@@ -4019,7 +3837,7 @@ static const unsigned short utf8_to_euc_E69D[] = {
0x5B3F, 0x456C, 0x5A5E, 0x5A62, 0xC324, 0x354F, 0xC325, 0x4747,
0, 0, 0, 0xC326, 0x5B41, 0, 0x3E3E, 0x4844,
};
-static const unsigned short utf8_to_euc_E69E[] = {
+const unsigned short utf8_to_euc_E69E[] = {
0, 0xC327, 0, 0, 0xC328, 0x5B47, 0, 0x487A,
0, 0x5B3E, 0, 0x5B44, 0x5B43, 0, 0xC329, 0xC32A,
0x404F, 0xC32B, 0, 0xC32C, 0, 0x4B6D, 0xC32D, 0x4E53,
@@ -4029,7 +3847,7 @@ static const unsigned short utf8_to_euc_E69E[] = {
0xC331, 0xC332, 0xC333, 0x5B4C, 0x5B4A, 0xC334, 0x324D, 0x5B48,
0x5B4E, 0x5B54, 0, 0xC335, 0xC336, 0xC337, 0, 0,
};
-static const unsigned short utf8_to_euc_E69F[] = {
+const unsigned short utf8_to_euc_E69F[] = {
0xC339, 0x4248, 0xC33A, 0xC33B, 0x4A41, 0xC33C, 0x5B56, 0,
0xC33D, 0xC33E, 0x4922, 0, 0, 0, 0x5B55, 0x4770,
0x4B3F, 0x343B, 0xC33F, 0x4077, 0x3D40, 0, 0, 0xC340,
@@ -4039,7 +3857,7 @@ static const unsigned short utf8_to_euc_E69F[] = {
0xC345, 0x436C, 0xC346, 0x4C78, 0x3C46, 0x3A74, 0xC347, 0xC348,
0, 0xC338, 0, 0x3A3A, 0, 0, 0x4B6F, 0x3341,
};
-static const unsigned short utf8_to_euc_E6A0[] = {
+const unsigned short utf8_to_euc_E6A0[] = {
0, 0xF446, 0x444E, 0x464A, 0x3149, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0x4072, 0xC34A, 0, 0x4034, 0x372A,
@@ -4049,7 +3867,7 @@ static const unsigned short utf8_to_euc_E6A0[] = {
0xC353, 0xC354, 0x5B5E, 0xC355, 0x4073, 0, 0, 0,
0x334B, 0x3A2C, 0, 0xC356, 0x334A, 0x3A4F, 0, 0xC357,
};
-static const unsigned short utf8_to_euc_E6A1[] = {
+const unsigned short utf8_to_euc_E6A1[] = {
0x5B5C, 0x3765, 0x374B, 0x456D, 0xC358, 0xC359, 0x5B5A, 0,
0x3046, 0, 0xC35A, 0, 0xC35B, 0x5B5D, 0x5B5F, 0,
0x364D, 0x372C, 0xC349, 0x343C, 0x354B, 0xC35C, 0, 0xC35D,
@@ -4059,7 +3877,7 @@ static const unsigned short utf8_to_euc_E6A1[] = {
0xC363, 0xC364, 0xC365, 0, 0x5B6F, 0xC366, 0x3233, 0x5B64,
0, 0xC367, 0xC368, 0xC369, 0xC36A, 0, 0x5B75, 0x5B65,
};
-static const unsigned short utf8_to_euc_E6A2[] = {
+const unsigned short utf8_to_euc_E6A2[] = {
0, 0x4E42, 0xC36B, 0x5B6C, 0xC36C, 0x475F, 0xC36D, 0,
0xC36E, 0, 0, 0, 0, 0x5B74, 0, 0x5B67,
0, 0, 0, 0x3034, 0x5B69, 0, 0xC36F, 0x393C,
@@ -4069,7 +3887,7 @@ static const unsigned short utf8_to_euc_E6A2[] = {
0x3323, 0x3A2D, 0xC379, 0x5B60, 0, 0x5B70, 0x3361, 0,
0, 0x5B6E, 0x5B72, 0xC37A, 0x456E, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E6A3[] = {
+const unsigned short utf8_to_euc_E6A3[] = {
0, 0, 0, 0, 0x347E, 0xC37B, 0x5C32, 0,
0xC37C, 0x4C49, 0x5B77, 0x347D, 0xC37D, 0x5B7E, 0, 0xC37E,
0xC421, 0xC422, 0x4B40, 0xC423, 0x5C21, 0x5C23, 0xC424, 0x5C27,
@@ -4079,7 +3897,7 @@ static const unsigned short utf8_to_euc_E6A3[] = {
0xC42E, 0xC42F, 0x4033, 0, 0, 0xC430, 0xC431, 0,
0, 0x5C2A, 0x343D, 0xC432, 0xC433, 0xC434, 0, 0,
};
-static const unsigned short utf8_to_euc_E6A4[] = {
+const unsigned short utf8_to_euc_E6A4[] = {
0x4F50, 0x5B76, 0, 0, 0x5C26, 0x3058, 0xC435, 0,
0x5B78, 0xC436, 0xC437, 0x4C3A, 0x5B7D, 0x3F22, 0x4447, 0x5B73,
0xC438, 0xC439, 0x5C25, 0xC43A, 0, 0, 0xC43B, 0xC43C,
@@ -4089,7 +3907,7 @@ static const unsigned short utf8_to_euc_E6A4[] = {
0x5C3F, 0xC43D, 0, 0xC43E, 0x464E, 0xC43F, 0x5C24, 0,
0xC440, 0x5C3B, 0, 0xC441, 0, 0x5C3D, 0, 0x4458,
};
-static const unsigned short utf8_to_euc_E6A5[] = {
+const unsigned short utf8_to_euc_E6A5[] = {
0, 0, 0xC442, 0, 0, 0xC443, 0, 0,
0, 0xC444, 0x4D4C, 0, 0, 0, 0xC445, 0,
0, 0, 0, 0x4976, 0x5C38, 0x424A, 0, 0xC446,
@@ -4099,7 +3917,7 @@ static const unsigned short utf8_to_euc_E6A5[] = {
0xC44F, 0xC450, 0xC451, 0x4760, 0x5C3C, 0x364B, 0, 0x5C34,
0x5C36, 0x5C33, 0xC452, 0xC453, 0x4F30, 0x335A, 0x5C39, 0xC454,
};
-static const unsigned short utf8_to_euc_E6A6[] = {
+const unsigned short utf8_to_euc_E6A6[] = {
0xC455, 0x5C43, 0x3335, 0, 0, 0, 0, 0,
0, 0, 0x3A67, 0, 0, 0xC456, 0x315D, 0,
0, 0x5C54, 0xC457, 0, 0x4F31, 0x5C57, 0xC458, 0,
@@ -4109,7 +3927,7 @@ static const unsigned short utf8_to_euc_E6A6[] = {
0, 0x5C63, 0x5C45, 0, 0x5C58, 0, 0, 0xC461,
0xC462, 0, 0xC463, 0x5C50, 0xC464, 0, 0x5C4B, 0x5C48,
};
-static const unsigned short utf8_to_euc_E6A7[] = {
+const unsigned short utf8_to_euc_E6A7[] = {
0, 0x5C49, 0, 0x5C51, 0, 0xC465, 0, 0x7422,
0xC466, 0, 0x5C4E, 0x393D, 0x4448, 0x4164, 0x5C4C, 0,
0x5C47, 0xC467, 0, 0x5C4A, 0, 0, 0xC468, 0xC469,
@@ -4119,7 +3937,7 @@ static const unsigned short utf8_to_euc_E6A7[] = {
0, 0xC46E, 0x5C60, 0xC46F, 0, 0xC470, 0, 0,
0, 0x5C5F, 0, 0x4450, 0, 0x4165, 0xC471, 0x5C5D,
};
-static const unsigned short utf8_to_euc_E6A8[] = {
+const unsigned short utf8_to_euc_E6A8[] = {
0xC472, 0xC473, 0x5C5B, 0xC474, 0, 0x5C62, 0, 0,
0, 0, 0x5C68, 0x4875, 0x5C6E, 0, 0, 0xC475,
0, 0xC476, 0x5C69, 0x5C6C, 0x5C66, 0xC477, 0, 0x4374,
@@ -4129,7 +3947,7 @@ static const unsigned short utf8_to_euc_E6A8[] = {
0xC47D, 0, 0xC47E, 0, 0xC521, 0x3E41, 0x5C70, 0xC522,
0x5C77, 0x3C79, 0x3372, 0xC523, 0, 0x432E, 0xC524, 0xC525,
};
-static const unsigned short utf8_to_euc_E6A9[] = {
+const unsigned short utf8_to_euc_E6A9[] = {
0, 0, 0, 0, 0x5C6D, 0xC526, 0xC527, 0x5C72,
0x5C76, 0xC528, 0xC529, 0x3636, 0, 0, 0xC52A, 0,
0xC52B, 0xC52C, 0xC52D, 0, 0, 0xC52E, 0xC52F, 0,
@@ -4139,7 +3957,7 @@ static const unsigned short utf8_to_euc_E6A9[] = {
0, 0xC534, 0x5C6F, 0xC535, 0, 0, 0, 0,
0x5C71, 0, 0, 0, 0, 0, 0xC536, 0x3360,
};
-static const unsigned short utf8_to_euc_E6AA[] = {
+const unsigned short utf8_to_euc_E6AA[] = {
0x4349, 0xC537, 0, 0xC538, 0x5C7C, 0, 0xC539, 0xC53A,
0, 0xC53B, 0, 0xC53C, 0, 0x5C7A, 0x3869, 0,
0x5C79, 0xC53D, 0, 0, 0, 0, 0, 0x5D21,
@@ -4149,7 +3967,7 @@ static const unsigned short utf8_to_euc_E6AA[] = {
0xC545, 0xC546, 0, 0x5D27, 0xC547, 0, 0, 0,
0x5D26, 0, 0, 0x5D23, 0, 0xC548, 0xC549, 0xC54A,
};
-static const unsigned short utf8_to_euc_E6AB[] = {
+const unsigned short utf8_to_euc_E6AB[] = {
0, 0x5C6A, 0x5D25, 0x5D24, 0, 0, 0xC54B, 0,
0xC54D, 0xC54C, 0, 0, 0xC54E, 0, 0, 0,
0xC54F, 0x5D2A, 0, 0x4F26, 0xC550, 0xC551, 0xC552, 0,
@@ -4159,7 +3977,7 @@ static const unsigned short utf8_to_euc_E6AB[] = {
0xC558, 0xC559, 0xC55A, 0, 0, 0, 0, 0,
0, 0, 0x5D32, 0x5D2F, 0xC55B, 0xC55C, 0, 0,
};
-static const unsigned short utf8_to_euc_E6AC[] = {
+const unsigned short utf8_to_euc_E6AC[] = {
0, 0, 0xC55D, 0xC55E, 0x4D73, 0x5D30, 0xC55F, 0xC560,
0, 0xC561, 0x5C5E, 0, 0, 0, 0, 0xC562,
0xC563, 0xC564, 0x5D33, 0, 0, 0, 0x5D34, 0xC565,
@@ -4169,7 +3987,7 @@ static const unsigned short utf8_to_euc_E6AC[] = {
0, 0, 0x4D5F, 0, 0, 0xC56D, 0xC56E, 0x5D38,
0x5D37, 0x5D3A, 0x353D, 0xC56F, 0, 0x3656, 0x343E, 0xC570,
};
-static const unsigned short utf8_to_euc_E6AD[] = {
+const unsigned short utf8_to_euc_E6AD[] = {
0, 0, 0, 0x5D3D, 0, 0, 0xC571, 0x5D3C,
0, 0x5D3E, 0xC572, 0, 0x324E, 0xC573, 0x4337, 0,
0x5D3F, 0, 0xC574, 0x343F, 0x5D41, 0, 0xC575, 0,
@@ -4179,7 +3997,7 @@ static const unsigned short utf8_to_euc_E6AD[] = {
0xC57C, 0, 0, 0x3A50, 0x4E72, 0xC57D, 0, 0,
0x5D45, 0x5D46, 0, 0x3B60, 0, 0xC57E, 0xC621, 0x5D47,
};
-static const unsigned short utf8_to_euc_E6AE[] = {
+const unsigned short utf8_to_euc_E6AE[] = {
0x5D48, 0, 0xC622, 0x5D4A, 0x5D49, 0xC623, 0x4B58, 0,
0, 0x3D5E, 0x3C6C, 0x3B44, 0, 0x5D4B, 0, 0,
0, 0, 0, 0, 0, 0x5D4D, 0x3F23, 0xC624,
@@ -4189,7 +4007,7 @@ static const unsigned short utf8_to_euc_E6AE[] = {
0xC62F, 0x5D54, 0x5D53, 0x5D55, 0x3225, 0x434A, 0, 0x5D56,
0xC630, 0xC631, 0x3B26, 0x334C, 0x5D57, 0xC632, 0xC633, 0x4542,
};
-static const unsigned short utf8_to_euc_E6AF[] = {
+const unsigned short utf8_to_euc_E6AF[] = {
0x544C, 0, 0, 0xC634, 0xC635, 0x3523, 0x5D58, 0,
0, 0xC636, 0, 0x5D59, 0xC637, 0x4A6C, 0x4B68, 0,
0, 0, 0x4647, 0x5D5A, 0x4866, 0, 0xC638, 0,
@@ -4199,7 +4017,7 @@ static const unsigned short utf8_to_euc_E6AF[] = {
0, 0xC63F, 0, 0x5D5E, 0, 0, 0, 0xC640,
0, 0xC641, 0, 0, 0, 0, 0, 0xC642,
};
-static const unsigned short utf8_to_euc_E6B0[] = {
+const unsigned short utf8_to_euc_E6B0[] = {
0, 0, 0xC643, 0, 0xC644, 0xC645, 0, 0,
0x5D61, 0xC646, 0, 0, 0, 0xC647, 0xC648, 0x3B61,
0xC649, 0x4C31, 0xC64A, 0x5D62, 0x5D63, 0, 0, 0x3524,
@@ -4209,7 +4027,7 @@ static const unsigned short utf8_to_euc_E6B0[] = {
0, 0, 0, 0xC652, 0x3F65, 0xC653, 0xC654, 0x4939,
0x314A, 0, 0xC655, 0xC656, 0, 0, 0x4845, 0xC657,
};
-static const unsigned short utf8_to_euc_E6B1[] = {
+const unsigned short utf8_to_euc_E6B1[] = {
0x4475, 0x3D41, 0x3561, 0, 0, 0, 0, 0,
0, 0, 0xC658, 0xC659, 0, 0xC65A, 0x4846, 0xC65B,
0x3C2E, 0, 0xC65C, 0, 0xC65D, 0x5D68, 0, 0x3440,
@@ -4219,7 +4037,7 @@ static const unsigned short utf8_to_euc_E6B1[] = {
0x4241, 0, 0x3562, 0x5D72, 0xC664, 0, 0xC665, 0,
0xC666, 0xC667, 0x3768, 0xC668, 0, 0x3525, 0x5D70, 0,
};
-static const unsigned short utf8_to_euc_E6B2[] = {
+const unsigned short utf8_to_euc_E6B2[] = {
0, 0x5D6E, 0x5D6B, 0x4D60, 0, 0xC669, 0xC66A, 0xC66B,
0x4440, 0xC66C, 0, 0, 0x4659, 0x5D6C, 0, 0,
0x5D74, 0, 0x5D73, 0x3723, 0xC66D, 0xC66E, 0x322D, 0xC66F,
@@ -4229,7 +4047,7 @@ static const unsigned short utf8_to_euc_E6B2[] = {
0xC673, 0x5D7D, 0xC674, 0x324F, 0xC675, 0, 0, 0,
0x4A28, 0x4C7D, 0x5E21, 0x3C23, 0x3E42, 0x5D78, 0x5D7E, 0x3168,
};
-static const unsigned short utf8_to_euc_E6B3[] = {
+const unsigned short utf8_to_euc_E6B3[] = {
0, 0x3637, 0xC676, 0, 0x5D75, 0x5D7A, 0xC677, 0,
0, 0x4074, 0x4771, 0, 0x4867, 0xC678, 0, 0xC679,
0xC67A, 0xC67B, 0xC67C, 0x5D77, 0xC67D, 0x4B21, 0xC67E, 0x5D79,
@@ -4239,7 +4057,7 @@ static const unsigned short utf8_to_euc_E6B3[] = {
0x4259, 0x5D76, 0xC729, 0x314B, 0xC72A, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E6B4[] = {
+const unsigned short utf8_to_euc_E6B4[] = {
0, 0, 0, 0, 0xC72B, 0, 0, 0xC72C,
0, 0, 0xC72D, 0x4D4E, 0x5E30, 0, 0xC72E, 0xC72F,
0, 0xC730, 0x5E2F, 0xC731, 0, 0, 0, 0x4076,
@@ -4249,7 +4067,7 @@ static const unsigned short utf8_to_euc_E6B4[] = {
0, 0xC739, 0x3D27, 0x5E2E, 0, 0x5E2D, 0x5E28, 0,
0x5E2B, 0xC73A, 0, 0x3368, 0xC73B, 0x5E2A, 0x4749, 0xC73C,
};
-static const unsigned short utf8_to_euc_E6B5[] = {
+const unsigned short utf8_to_euc_E6B5[] = {
0, 0x4E2E, 0, 0, 0x3E74, 0x4075, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0xC73D,
@@ -4259,7 +4077,7 @@ static const unsigned short utf8_to_euc_E6B5[] = {
0xC744, 0, 0, 0, 0x4D61, 0, 0, 0x3324,
0x3F3B, 0x5E35, 0, 0, 0xC745, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E6B6[] = {
+const unsigned short utf8_to_euc_E6B6[] = {
0, 0, 0xC746, 0, 0, 0x5E3A, 0, 0xC747,
0x3E43, 0, 0, 0, 0x4D30, 0, 0x5E37, 0,
0, 0xC748, 0xC749, 0x5E32, 0xC74A, 0x5E38, 0xC74B, 0xC74C,
@@ -4269,7 +4087,7 @@ static const unsigned short utf8_to_euc_E6B6[] = {
0, 0, 0x3155, 0, 0xC750, 0x5E3E, 0, 0xC751,
0x5E41, 0xC752, 0, 0, 0x4E43, 0xC753, 0, 0xC754,
};
-static const unsigned short utf8_to_euc_E6B7[] = {
+const unsigned short utf8_to_euc_E6B7[] = {
0x4D64, 0, 0, 0, 0xC755, 0x5E48, 0x5E42, 0x5E3F,
0xC756, 0, 0xC757, 0x4E54, 0x5E45, 0, 0xC758, 0xC759,
0, 0x3D4A, 0x5E47, 0, 0, 0x5E4C, 0xC75A, 0,
@@ -4279,7 +4097,7 @@ static const unsigned short utf8_to_euc_E6B7[] = {
0xC763, 0x3F3C, 0xF44C, 0x3D5F, 0xC764, 0x4A25, 0xC765, 0x3A2E,
0xF44B, 0x5E3B, 0x5E49, 0x453A, 0xC766, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E6B8[] = {
+const unsigned short utf8_to_euc_E6B8[] = {
0xC767, 0, 0, 0, 0xC768, 0x4036, 0, 0x3369,
0x3A51, 0x3E44, 0x5E3D, 0x3D42, 0, 0, 0, 0,
0, 0, 0, 0x374C, 0, 0x5E3C, 0, 0,
@@ -4289,7 +4107,7 @@ static const unsigned short utf8_to_euc_E6B8[] = {
0, 0, 0xC76C, 0, 0, 0, 0xC76D, 0,
0x5E62, 0xC76E, 0x5E5D, 0xC76F, 0xC770, 0, 0x5E55, 0,
};
-static const unsigned short utf8_to_euc_E6B9[] = {
+const unsigned short utf8_to_euc_E6B9[] = {
0, 0, 0, 0x5E5C, 0xC771, 0xC772, 0, 0,
0xC773, 0xC774, 0x4C2B, 0xC775, 0, 0x5E5A, 0x5E5E, 0xC776,
0, 0xC777, 0xC778, 0xC779, 0xC77A, 0, 0x3850, 0xC77B,
@@ -4299,7 +4117,7 @@ static const unsigned short utf8_to_euc_E6B9[] = {
0, 0, 0x5E53, 0xC824, 0, 0, 0x5E59, 0,
0, 0, 0, 0xC825, 0, 0xC826, 0x4F51, 0x3C3E,
};
-static const unsigned short utf8_to_euc_E6BA[] = {
+const unsigned short utf8_to_euc_E6BA[] = {
0x4B7E, 0, 0x5E63, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0x482E, 0xC827, 0, 0x5E6F,
0x383B, 0, 0, 0xC828, 0, 0, 0x3D60, 0,
@@ -4309,7 +4127,7 @@ static const unsigned short utf8_to_euc_E6BA[] = {
0, 0xC82E, 0x5E6C, 0xC82F, 0, 0, 0x4D4F, 0x5E67,
0, 0, 0x452E, 0xC830, 0, 0x5E69, 0, 0xC831,
};
-static const unsigned short utf8_to_euc_E6BB[] = {
+const unsigned short utf8_to_euc_E6BB[] = {
0xC832, 0xC833, 0x5E71, 0xC834, 0x5E6B, 0x4C47, 0, 0xC835,
0xC836, 0x5E66, 0xC837, 0x3C22, 0x5E7E, 0xC838, 0xC839, 0xC83A,
0, 0x336A, 0, 0x5E68, 0x5E6D, 0x5E6E, 0, 0,
@@ -4319,7 +4137,7 @@ static const unsigned short utf8_to_euc_E6BB[] = {
0, 0, 0x5E7A, 0, 0x4529, 0, 0, 0x5F23,
0x5E77, 0xC83E, 0, 0xC83F, 0, 0xC840, 0x5E78, 0x5E60,
};
-static const unsigned short utf8_to_euc_E6BC[] = {
+const unsigned short utf8_to_euc_E6BC[] = {
0, 0x3579, 0x493A, 0, 0xC841, 0, 0x3C3F, 0,
0xC842, 0x3977, 0xC843, 0, 0xC844, 0xC845, 0, 0x4F33,
0, 0x5E74, 0, 0x5F22, 0x3169, 0x4166, 0xC846, 0,
@@ -4329,7 +4147,7 @@ static const unsigned short utf8_to_euc_E6BC[] = {
0xC84E, 0x5E7B, 0x5E7D, 0xC84F, 0, 0, 0xC850, 0,
0x4132, 0, 0, 0xC851, 0xC852, 0, 0x5F21, 0x5E79,
};
-static const unsigned short utf8_to_euc_E6BD[] = {
+const unsigned short utf8_to_euc_E6BD[] = {
0, 0x5E73, 0, 0, 0, 0x3443, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0xC854,
0, 0xC855, 0xC856, 0xC857, 0x3769, 0, 0, 0xC858,
@@ -4339,7 +4157,7 @@ static const unsigned short utf8_to_euc_E6BD[] = {
0x4459, 0, 0, 0, 0x5F4C, 0, 0, 0,
0x5F26, 0, 0x5F25, 0, 0x5F2E, 0xC861, 0xC862, 0,
};
-static const unsigned short utf8_to_euc_E6BE[] = {
+const unsigned short utf8_to_euc_E6BE[] = {
0x5F28, 0x5F27, 0x5F2D, 0xC863, 0x4021, 0, 0x5F24, 0xC864,
0xC865, 0, 0, 0xC866, 0xC867, 0xC868, 0x5F30, 0,
0xC869, 0x5F31, 0xC86A, 0xC86B, 0xC86C, 0, 0xC86D, 0x3442,
@@ -4349,7 +4167,7 @@ static const unsigned short utf8_to_euc_E6BE[] = {
0xC877, 0x4543, 0, 0x5F34, 0, 0xC878, 0xC879, 0,
0, 0x5F38, 0, 0, 0xC87A, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E6BF[] = {
+const unsigned short utf8_to_euc_E6BF[] = {
0x3763, 0x4279, 0x5F32, 0x473B, 0, 0xC87B, 0x5F39, 0xC87C,
0xC87D, 0, 0xC87E, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0x5F3E, 0x5F3C, 0, 0,
@@ -4359,7 +4177,7 @@ static const unsigned short utf8_to_euc_E6BF[] = {
0xC925, 0x5F40, 0, 0x5F2B, 0, 0xC926, 0x6F69, 0,
0, 0xC927, 0x5F45, 0, 0xC928, 0xC929, 0x5F49, 0,
};
-static const unsigned short utf8_to_euc_E780[] = {
+const unsigned short utf8_to_euc_E780[] = {
0xC92A, 0x5F47, 0, 0, 0, 0xC92B, 0xC92C, 0xC92D,
0, 0x5F43, 0, 0x5F44, 0, 0xC92E, 0, 0x5F48,
0, 0x5F46, 0, 0, 0, 0x494E, 0, 0xC92F,
@@ -4369,7 +4187,7 @@ static const unsigned short utf8_to_euc_E780[] = {
0x5F50, 0, 0x5F52, 0, 0xC933, 0, 0, 0xC934,
0, 0xC935, 0, 0, 0xC936, 0, 0x5F51, 0,
};
-static const unsigned short utf8_to_euc_E781[] = {
+const unsigned short utf8_to_euc_E781[] = {
0, 0, 0, 0xC937, 0xC938, 0, 0, 0,
0xC939, 0xC93A, 0xC93B, 0xC93C, 0x5E75, 0, 0xC941, 0,
0, 0x5F53, 0, 0, 0xC93D, 0xC93E, 0, 0,
@@ -4379,7 +4197,7 @@ static const unsigned short utf8_to_euc_E781[] = {
0x3325, 0, 0, 0, 0, 0xC946, 0xC947, 0,
0x3564, 0, 0, 0, 0x3C5E, 0x3A52, 0xC948, 0,
};
-static const unsigned short utf8_to_euc_E782[] = {
+const unsigned short utf8_to_euc_E782[] = {
0, 0xC949, 0, 0, 0, 0xC94A, 0xC94B, 0,
0, 0x4F27, 0x3F66, 0, 0, 0, 0x316A, 0,
0, 0, 0x5F56, 0, 0xC94C, 0xC94D, 0xC94E, 0xC94F,
@@ -4389,7 +4207,7 @@ static const unsigned short utf8_to_euc_E782[] = {
0xC954, 0xC955, 0, 0x5F5B, 0xC956, 0, 0, 0xC957,
0x5F5A, 0x4540, 0x3059, 0xF42E, 0, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E783[] = {
+const unsigned short utf8_to_euc_E783[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0x4E75, 0, 0xC958, 0x5F5E, 0, 0, 0, 0x3128,
0, 0xC959, 0, 0xC95A, 0xC95B, 0xC95C, 0xC95D, 0,
@@ -4399,7 +4217,7 @@ static const unsigned short utf8_to_euc_E783[] = {
0, 0x5F58, 0, 0, 0, 0, 0, 0,
0, 0x4B23, 0xC961, 0, 0, 0x5F62, 0, 0,
};
-static const unsigned short utf8_to_euc_E784[] = {
+const unsigned short utf8_to_euc_E784[] = {
0, 0, 0, 0xC962, 0xC963, 0xC964, 0xC965, 0xC966,
0, 0x5F61, 0, 0xC967, 0xC968, 0, 0, 0xC969,
0, 0, 0, 0, 0x316B, 0, 0, 0,
@@ -4409,7 +4227,7 @@ static const unsigned short utf8_to_euc_E784[] = {
0xC96F, 0xC970, 0, 0, 0, 0, 0x4133, 0,
0xC971, 0, 0, 0, 0x3E46, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E785[] = {
+const unsigned short utf8_to_euc_E785[] = {
0, 0xC972, 0, 0, 0, 0xC973, 0xC974, 0xC975,
0, 0x4E7B, 0xC976, 0xC977, 0x5F6A, 0, 0x4079, 0,
0xC978, 0, 0xC979, 0, 0, 0x5F66, 0x5F6B, 0xC97A,
@@ -4419,7 +4237,7 @@ static const unsigned short utf8_to_euc_E785[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0xCA22, 0, 0, 0, 0x407A, 0, 0,
};
-static const unsigned short utf8_to_euc_E786[] = {
+const unsigned short utf8_to_euc_E786[] = {
0xCA23, 0, 0, 0, 0x5F6F, 0xCA24, 0, 0xCA25,
0x5F67, 0, 0x3727, 0, 0xCA26, 0, 0, 0x5F6D,
0, 0, 0xCA27, 0, 0x4D50, 0x5F70, 0, 0,
@@ -4429,7 +4247,7 @@ static const unsigned short utf8_to_euc_E786[] = {
0xCA2D, 0x472E, 0xCA2E, 0xCA2F, 0, 0, 0, 0,
0, 0x5F74, 0xCA30, 0, 0, 0, 0x5F75, 0xCA31,
};
-static const unsigned short utf8_to_euc_E787[] = {
+const unsigned short utf8_to_euc_E787[] = {
0xCA32, 0xCA33, 0, 0x4733, 0xCA34, 0, 0, 0,
0x4575, 0x5F77, 0, 0xCA35, 0xCA36, 0, 0x5F79, 0,
0x4E55, 0, 0x5F76, 0xCA37, 0x5F78, 0x316D, 0xCA38, 0x5F73,
@@ -4439,7 +4257,7 @@ static const unsigned short utf8_to_euc_E787[] = {
0, 0, 0, 0, 0, 0x5F7D, 0, 0,
0xCA3C, 0x6021, 0, 0x5F6E, 0x5F7E, 0, 0xCA3D, 0x6022,
};
-static const unsigned short utf8_to_euc_E788[] = {
+const unsigned short utf8_to_euc_E788[] = {
0xCA3E, 0, 0, 0, 0, 0, 0x477A, 0xCA3F,
0xCA40, 0xCA41, 0, 0, 0, 0x6023, 0, 0,
0x6024, 0, 0, 0xCA42, 0, 0, 0, 0xCA43,
@@ -4449,7 +4267,7 @@ static const unsigned short utf8_to_euc_E788[] = {
0x6029, 0, 0x602A, 0, 0xCA4A, 0x3C5F, 0x4963, 0,
0xCA4B, 0xCA4C, 0x4C6C, 0x602B, 0x602C, 0x4156, 0x3C24, 0x602D,
};
-static const unsigned short utf8_to_euc_E789[] = {
+const unsigned short utf8_to_euc_E789[] = {
0x602E, 0xCA4D, 0xCA4E, 0xCA4F, 0, 0xCA50, 0x602F, 0x4A52,
0x4847, 0, 0, 0x6030, 0x4757, 0, 0xCA51, 0xCA52,
0xCA53, 0, 0x442D, 0xCA54, 0, 0xCA55, 0xCA56, 0,
@@ -4459,7 +4277,7 @@ static const unsigned short utf8_to_euc_E789[] = {
0, 0xCA60, 0x4037, 0, 0x6032, 0, 0, 0xCA61,
0xCA62, 0x4643, 0, 0xCA63, 0xCA64, 0x3823, 0x6033, 0xCA65,
};
-static const unsigned short utf8_to_euc_E78A[] = {
+const unsigned short utf8_to_euc_E78A[] = {
0x3A54, 0x6035, 0x6034, 0, 0xCA66, 0, 0, 0x6036,
0, 0xCA67, 0, 0, 0, 0xCA68, 0xCA69, 0,
0, 0, 0x6037, 0xCA6A, 0, 0, 0x6038, 0,
@@ -4469,7 +4287,7 @@ static const unsigned short utf8_to_euc_E78A[] = {
0, 0xCA6F, 0x603C, 0, 0xCA70, 0, 0x3E75, 0,
0, 0x603B, 0, 0, 0, 0, 0xCA71, 0,
};
-static const unsigned short utf8_to_euc_E78B[] = {
+const unsigned short utf8_to_euc_E78B[] = {
0, 0xCA72, 0x3638, 0x603D, 0x603F, 0, 0x603E, 0xCA73,
0, 0xCA74, 0, 0, 0xCA75, 0, 0x6040, 0,
0x3851, 0, 0x6041, 0, 0, 0xCA76, 0xCA77, 0x3669,
@@ -4479,7 +4297,7 @@ static const unsigned short utf8_to_euc_E78B[] = {
0, 0, 0, 0xCA7B, 0xCA7C, 0, 0, 0x6046,
0x432C, 0x6045, 0xCA7D, 0xCA7E, 0x4F35, 0x4762, 0xCB21, 0,
};
-static const unsigned short utf8_to_euc_E78C[] = {
+const unsigned short utf8_to_euc_E78C[] = {
0, 0, 0xCB22, 0, 0xCB23, 0xCB24, 0, 0xCB25,
0, 0, 0x6049, 0xCB26, 0, 0xCB27, 0, 0,
0, 0, 0xCB28, 0xCB29, 0, 0, 0x604B, 0x6048,
@@ -4489,7 +4307,7 @@ static const unsigned short utf8_to_euc_E78C[] = {
0, 0xCB32, 0xCB33, 0, 0x604D, 0xCB34, 0x4D31, 0x4D32,
0, 0, 0xCB35, 0xCB36, 0, 0xCB37, 0x6051, 0x316E,
};
-static const unsigned short utf8_to_euc_E78D[] = {
+const unsigned short utf8_to_euc_E78D[] = {
0, 0, 0, 0xCB38, 0x3976, 0x3B62, 0, 0,
0, 0, 0, 0, 0, 0xCB39, 0x6052, 0x6053,
0xCB3A, 0, 0xCB3B, 0, 0, 0, 0xCB3C, 0x6055,
@@ -4499,7 +4317,7 @@ static const unsigned short utf8_to_euc_E78D[] = {
0x6058, 0xCB49, 0x334D, 0, 0, 0x605A, 0, 0xCB4A,
0x6059, 0xCB4B, 0x605C, 0x605B, 0xCB4C, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E78E[] = {
+const unsigned short utf8_to_euc_E78E[] = {
0xCB4D, 0xCB4E, 0, 0xCB4F, 0x383C, 0xCB50, 0xCB51, 0x4E28,
0, 0x364C, 0, 0x3226, 0, 0, 0xCB52, 0,
0xCB53, 0, 0, 0xCB54, 0, 0xCB55, 0x366A, 0xCB56,
@@ -4509,7 +4327,7 @@ static const unsigned short utf8_to_euc_E78E[] = {
0, 0, 0x4E68, 0x605E, 0, 0xCB62, 0, 0xCB63,
0, 0xCB64, 0, 0x6060, 0xCB65, 0xCB66, 0, 0xCB67,
};
-static const unsigned short utf8_to_euc_E78F[] = {
+const unsigned short utf8_to_euc_E78F[] = {
0x6061, 0, 0x3251, 0, 0, 0xCB68, 0xCB69, 0,
0x605D, 0xCB6A, 0x3B39, 0xCB6B, 0xCB6C, 0x4441, 0x605F, 0xCB6D,
0, 0, 0xCB6E, 0xCB6F, 0, 0, 0xCB70, 0,
@@ -4519,7 +4337,7 @@ static const unsigned short utf8_to_euc_E78F[] = {
0, 0x607E, 0, 0, 0xCB78, 0xCB79, 0, 0xCB7A,
0x6069, 0xCB7B, 0xCB7C, 0xCB7D, 0, 0xCB7E, 0x383D, 0xCC21,
};
-static const unsigned short utf8_to_euc_E790[] = {
+const unsigned short utf8_to_euc_E790[] = {
0xCC22, 0xCC23, 0, 0x3565, 0xCC24, 0x6066, 0x4D7D, 0xCC25,
0, 0x4E30, 0xCC26, 0, 0, 0, 0, 0,
0, 0xCC27, 0, 0, 0, 0, 0, 0,
@@ -4529,7 +4347,7 @@ static const unsigned short utf8_to_euc_E790[] = {
0xCC34, 0xCC35, 0x606A, 0x4E56, 0x3657, 0x487C, 0x474A, 0,
0, 0xCC36, 0x606B, 0, 0, 0, 0, 0x606D,
};
-static const unsigned short utf8_to_euc_E791[] = {
+const unsigned short utf8_to_euc_E791[] = {
0xCC37, 0x6070, 0, 0xCC38, 0xCC39, 0, 0xCC3A, 0xCC3B,
0, 0, 0, 0xCC3C, 0, 0xCC3D, 0, 0,
0, 0xCC3E, 0xCC3F, 0, 0, 0x606C, 0, 0xCC40,
@@ -4539,7 +4357,7 @@ static const unsigned short utf8_to_euc_E791[] = {
0x6073, 0xCC49, 0xCC4A, 0x3A3C, 0, 0, 0x6076, 0,
0, 0, 0, 0, 0, 0, 0x6077, 0,
};
-static const unsigned short utf8_to_euc_E792[] = {
+const unsigned short utf8_to_euc_E792[] = {
0xCC4B, 0xCC4C, 0, 0x4D7E, 0, 0xCC4D, 0xCC4E, 0xCC4F,
0, 0xCC50, 0, 0x6078, 0, 0, 0, 0xCC51,
0xCC52, 0xCC53, 0xCC54, 0, 0, 0, 0, 0,
@@ -4549,7 +4367,7 @@ static const unsigned short utf8_to_euc_E792[] = {
0x3444, 0xCC64, 0xCC65, 0, 0, 0xCC66, 0, 0,
0, 0xCC67, 0, 0xCC68, 0, 0x3C25, 0, 0xCC69,
};
-static const unsigned short utf8_to_euc_E793[] = {
+const unsigned short utf8_to_euc_E793[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0xCC6A, 0xCC6B, 0x607B, 0, 0xCC6C, 0, 0, 0x607C,
0xCC6D, 0, 0, 0xCC6E, 0x607D, 0, 0, 0,
@@ -4559,7 +4377,7 @@ static const unsigned short utf8_to_euc_E793[] = {
0x6127, 0x6128, 0x6126, 0, 0xCC79, 0, 0x4953, 0x612A,
0x6129, 0, 0xCC7A, 0xCC7B, 0xCC7C, 0, 0, 0xCC7D,
};
-static const unsigned short utf8_to_euc_E794[] = {
+const unsigned short utf8_to_euc_E794[] = {
0, 0xF450, 0, 0x612C, 0x612B, 0x612D, 0xCC7E, 0,
0, 0, 0, 0, 0x612E, 0x6130, 0x612F, 0,
0, 0x3979, 0xCD21, 0x6132, 0, 0x6131, 0xCD22, 0xCD23,
@@ -4569,7 +4387,7 @@ static const unsigned short utf8_to_euc_E794[] = {
0x4544, 0x4D33, 0x3943, 0x3F3D, 0, 0, 0xCD2B, 0x434B,
0x5234, 0xCD2C, 0x442E, 0x3268, 0x6136, 0xCD2D, 0xCD2E, 0xCD2F,
};
-static const unsigned short utf8_to_euc_E795[] = {
+const unsigned short utf8_to_euc_E795[] = {
0xCD30, 0, 0, 0xCD31, 0x6137, 0, 0x613C, 0xCD32,
0xCD33, 0x613A, 0x6139, 0x5A42, 0x3326, 0x6138, 0xCD34, 0x305A,
0xCD35, 0x482A, 0xCD36, 0, 0x484A, 0, 0, 0xCD37,
@@ -4579,7 +4397,7 @@ static const unsigned short utf8_to_euc_E795[] = {
0x305B, 0xCD3C, 0, 0x3E76, 0x6147, 0, 0x6144, 0x466D,
0x6143, 0xCD3D, 0xCD3E, 0xCD3F, 0xCD40, 0xCD41, 0xCD42, 0x3526,
};
-static const unsigned short utf8_to_euc_E796[] = {
+const unsigned short utf8_to_euc_E796[] = {
0, 0xCD43, 0x614A, 0, 0, 0xCD44, 0x6145, 0x6146,
0, 0x6149, 0x6148, 0x4925, 0, 0, 0x4142, 0x4141,
0xCD45, 0x353F, 0xCD46, 0xCD47, 0x614B, 0xCD48, 0, 0,
@@ -4589,7 +4407,7 @@ static const unsigned short utf8_to_euc_E796[] = {
0, 0x6157, 0x4868, 0x6151, 0xCD4D, 0x6153, 0, 0,
0x6155, 0x3F3E, 0xCD4E, 0, 0x6156, 0x6154, 0x3C40, 0xCD4F,
};
-static const unsigned short utf8_to_euc_E797[] = {
+const unsigned short utf8_to_euc_E797[] = {
0xCD50, 0xCD51, 0x6150, 0x6152, 0xCD52, 0x4942, 0xCD53, 0x3E49,
0, 0, 0x6159, 0, 0xCD54, 0x6158, 0xCD55, 0xCD56,
0, 0, 0x615A, 0, 0x3C26, 0x3A2F, 0, 0xCD57,
@@ -4599,7 +4417,7 @@ static const unsigned short utf8_to_euc_E797[] = {
0x6162, 0xCD61, 0x6164, 0x6165, 0x4354, 0, 0, 0,
0, 0xCD62, 0x6163, 0, 0x6160, 0, 0x615E, 0x615F,
};
-static const unsigned short utf8_to_euc_E798[] = {
+const unsigned short utf8_to_euc_E798[] = {
0xCD63, 0x6161, 0xCD64, 0xCD65, 0xCD66, 0, 0, 0xCD67,
0xCD68, 0x6168, 0xCD69, 0x6166, 0xCD6A, 0x6167, 0, 0xCD6B,
0, 0, 0xCD6C, 0xCD6D, 0, 0xCD6E, 0xCD6F, 0,
@@ -4609,7 +4427,7 @@ static const unsigned short utf8_to_euc_E798[] = {
0x6170, 0, 0xCD7A, 0xCD7B, 0x616F, 0xCD7C, 0, 0,
0xCD7D, 0xCD7E, 0xCE21, 0x6171, 0xCE22, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E799[] = {
+const unsigned short utf8_to_euc_E799[] = {
0xCE24, 0xCE25, 0x4E45, 0xCE26, 0xCE27, 0xCE28, 0x6174, 0x6172,
0x6173, 0xCE29, 0xCE23, 0xCE2A, 0x3462, 0, 0, 0,
0, 0, 0x4C7E, 0, 0, 0xCE2B, 0x4A4A, 0,
@@ -4619,7 +4437,7 @@ static const unsigned short utf8_to_euc_E799[] = {
0x617E, 0xCE33, 0x6221, 0, 0xCE34, 0, 0x6222, 0,
0x6223, 0, 0x482F, 0x4550, 0x6224, 0x4772, 0x4934, 0,
};
-static const unsigned short utf8_to_euc_E79A[] = {
+const unsigned short utf8_to_euc_E79A[] = {
0x6225, 0xCE35, 0xF451, 0x6226, 0x452A, 0xCE36, 0x3327, 0x3944,
0x6227, 0, 0, 0x6228, 0xCE37, 0xCE38, 0x6229, 0,
0x3B29, 0, 0, 0x622B, 0, 0xCE39, 0x622A, 0,
@@ -4629,7 +4447,7 @@ static const unsigned short utf8_to_euc_E79A[] = {
0x622E, 0, 0, 0, 0x622F, 0, 0, 0x7369,
0x6230, 0x6231, 0x6232, 0, 0, 0xCE48, 0, 0x3B2E,
};
-static const unsigned short utf8_to_euc_E79B[] = {
+const unsigned short utf8_to_euc_E79B[] = {
0, 0xCE49, 0x6233, 0x4756, 0, 0xCE4A, 0x4B5F, 0,
0x314E, 0xCE4B, 0x3157, 0xCE4C, 0xCE4D, 0x6234, 0xCE4E, 0,
0, 0, 0x6236, 0, 0xCE4F, 0, 0x6235, 0x4570,
@@ -4639,7 +4457,7 @@ static const unsigned short utf8_to_euc_E79B[] = {
0xCE55, 0xCE56, 0x4C55, 0, 0x443E, 0, 0xCE57, 0,
0x416A, 0xCE58, 0, 0x623D, 0xCE59, 0, 0x3D62, 0,
};
-static const unsigned short utf8_to_euc_E79C[] = {
+const unsigned short utf8_to_euc_E79C[] = {
0xCE5A, 0x3E4A, 0, 0, 0x6240, 0, 0xCE5B, 0x623F,
0x623E, 0x487D, 0xCE5C, 0x3447, 0x3829, 0, 0xCE5D, 0,
0, 0, 0xCE5E, 0, 0xCE5F, 0xCE60, 0, 0xCE61,
@@ -4649,7 +4467,7 @@ static const unsigned short utf8_to_euc_E79C[] = {
0, 0, 0, 0, 0xCE6A, 0xCE6B, 0xCE6C, 0x6247,
0x6248, 0xCE6D, 0x442F, 0, 0x3463, 0xCE6E, 0xCE6F, 0,
};
-static const unsigned short utf8_to_euc_E79D[] = {
+const unsigned short utf8_to_euc_E79D[] = {
0x4365, 0, 0xCE70, 0, 0, 0xCE71, 0xCE72, 0x6249,
0, 0, 0xCE73, 0, 0, 0xCE74, 0xCE75, 0xCE76,
0, 0, 0xCE77, 0, 0, 0, 0xCE78, 0xCE79,
@@ -4659,7 +4477,7 @@ static const unsigned short utf8_to_euc_E79D[] = {
0xCF25, 0, 0xCF26, 0xCF27, 0xCF28, 0, 0, 0,
0, 0x6251, 0xCF29, 0, 0, 0xCF2A, 0x6250, 0x624F,
};
-static const unsigned short utf8_to_euc_E79E[] = {
+const unsigned short utf8_to_euc_E79E[] = {
0xCF2B, 0, 0, 0, 0xCF2C, 0, 0, 0,
0, 0, 0, 0x6253, 0xCF2D, 0xCF2E, 0x6252, 0,
0, 0x6254, 0, 0, 0xCF2F, 0xCF30, 0xCF31, 0,
@@ -4669,7 +4487,7 @@ static const unsigned short utf8_to_euc_E79E[] = {
0x6257, 0xCF39, 0, 0x4637, 0, 0xCF3A, 0x6258, 0,
0, 0x6259, 0, 0x625D, 0x625B, 0x625C, 0xCF3B, 0x625A,
};
-static const unsigned short utf8_to_euc_E79F[] = {
+const unsigned short utf8_to_euc_E79F[] = {
0, 0, 0, 0xCF3C, 0, 0, 0, 0x625E,
0, 0xCF3D, 0, 0, 0, 0x625F, 0, 0,
0, 0xCF3E, 0xCF3F, 0, 0, 0xCF40, 0, 0x6260,
@@ -4679,7 +4497,7 @@ static const unsigned short utf8_to_euc_E79F[] = {
0xCF49, 0xCF4A, 0, 0x4050, 0xCF4B, 0, 0, 0,
0xCF4C, 0, 0, 0xCF4D, 0x6265, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E7A0[] = {
+const unsigned short utf8_to_euc_E7A0[] = {
0, 0, 0x3A3D, 0, 0, 0xCF4E, 0xCF4F, 0,
0, 0xCF50, 0, 0, 0x6266, 0xCF51, 0xCF52, 0,
0, 0xCF53, 0x6267, 0, 0x3826, 0x3A55, 0, 0,
@@ -4689,7 +4507,7 @@ static const unsigned short utf8_to_euc_E7A0[] = {
0xCF5A, 0, 0x4B24, 0, 0x474B, 0xCF5B, 0, 0xCF5C,
0, 0, 0x4557, 0, 0, 0, 0, 0x395C,
};
-static const unsigned short utf8_to_euc_E7A1[] = {
+const unsigned short utf8_to_euc_E7A1[] = {
0, 0, 0, 0xCF5D, 0xCF5E, 0x626B, 0, 0xCF5F,
0xCF60, 0, 0, 0, 0xCF61, 0, 0xCF62, 0,
0, 0, 0xCF63, 0, 0, 0, 0, 0,
@@ -4699,7 +4517,7 @@ static const unsigned short utf8_to_euc_E7A1[] = {
0, 0, 0x4823, 0, 0x626D, 0, 0, 0,
0, 0, 0xCF6D, 0, 0x626F, 0, 0xCF6E, 0,
};
-static const unsigned short utf8_to_euc_E7A2[] = {
+const unsigned short utf8_to_euc_E7A2[] = {
0, 0x386B, 0, 0, 0, 0, 0x626E, 0x4476,
0, 0, 0xCF6F, 0, 0x6271, 0x3337, 0x626C, 0xCF70,
0, 0x486A, 0, 0x3130, 0xCF71, 0x3A6C, 0, 0x4F52,
@@ -4709,7 +4527,7 @@ static const unsigned short utf8_to_euc_E7A2[] = {
0xCF7B, 0xCF7C, 0xCF7D, 0xCF7E, 0, 0x6273, 0, 0,
0, 0, 0x334E, 0xD021, 0x627B, 0xD022, 0x627A, 0xD023,
};
-static const unsigned short utf8_to_euc_E7A3[] = {
+const unsigned short utf8_to_euc_E7A3[] = {
0, 0x3C27, 0, 0, 0, 0x627C, 0x6277, 0xD024,
0xD025, 0xD026, 0x627D, 0x6278, 0xD027, 0, 0xD028, 0,
0x4858, 0x6276, 0xD029, 0xD02A, 0x6279, 0xD02B, 0xD02C, 0,
@@ -4719,7 +4537,7 @@ static const unsigned short utf8_to_euc_E7A3[] = {
0, 0, 0xD034, 0xD035, 0x6324, 0, 0xD037, 0xD038,
0, 0, 0xD039, 0xD03A, 0, 0x6323, 0, 0xD03B,
};
-static const unsigned short utf8_to_euc_E7A4[] = {
+const unsigned short utf8_to_euc_E7A4[] = {
0xD036, 0x3E4C, 0, 0, 0, 0, 0xD03C, 0x6325,
0, 0, 0, 0, 0xD03D, 0, 0x4143, 0,
0xD03E, 0x6327, 0x6326, 0, 0, 0, 0, 0,
@@ -4729,7 +4547,7 @@ static const unsigned short utf8_to_euc_E7A4[] = {
0xF454, 0xD048, 0, 0, 0xD049, 0xD04A, 0, 0,
0, 0, 0x3C28, 0xD04B, 0x4E69, 0xD04C, 0x3C52, 0xD04D,
};
-static const unsigned short utf8_to_euc_E7A5[] = {
+const unsigned short utf8_to_euc_E7A5[] = {
0x632B, 0x3737, 0, 0, 0xD04E, 0xD04F, 0xD050, 0x3540,
0x3527, 0x3B63, 0xD051, 0xD052, 0, 0, 0, 0xD053,
0x4D34, 0xD054, 0, 0x6331, 0xD055, 0x6330, 0x4144, 0x632D,
@@ -4739,7 +4557,7 @@ static const unsigned short utf8_to_euc_E7A5[] = {
0, 0, 0xD05C, 0, 0, 0, 0, 0x4578,
0, 0xD05D, 0x6332, 0xD05E, 0xD05F, 0, 0xD060, 0x6333,
};
-static const unsigned short utf8_to_euc_E7A6[] = {
+const unsigned short utf8_to_euc_E7A6[] = {
0x6349, 0x3658, 0, 0, 0x4F3D, 0x4135, 0, 0,
0, 0, 0x6334, 0xD061, 0xD062, 0x3252, 0x4477, 0x4A21,
0, 0xD063, 0, 0xD064, 0xD065, 0xD066, 0xD067, 0,
@@ -4749,7 +4567,7 @@ static const unsigned short utf8_to_euc_E7A6[] = {
0x4729, 0xD070, 0, 0x633A, 0xD071, 0, 0, 0,
0xD072, 0x633B, 0x633C, 0xD073, 0, 0x3659, 0x3253, 0x4645,
};
-static const unsigned short utf8_to_euc_E7A7[] = {
+const unsigned short utf8_to_euc_E7A7[] = {
0x3D28, 0x3B64, 0xD074, 0, 0xD075, 0, 0, 0xD076,
0xD077, 0x633D, 0xD078, 0x3D29, 0, 0, 0, 0xD079,
0, 0x324A, 0x4943, 0, 0xD07A, 0x633E, 0xD07B, 0,
@@ -4759,7 +4577,7 @@ static const unsigned short utf8_to_euc_E7A7[] = {
0x3E4E, 0xD127, 0, 0, 0, 0, 0, 0,
0xD128, 0, 0, 0x305C, 0xD129, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E7A8[] = {
+const unsigned short utf8_to_euc_E7A8[] = {
0x3529, 0, 0xD12A, 0xD12B, 0, 0, 0, 0xD12C,
0x6343, 0xD12D, 0xD12E, 0x4478, 0xD12F, 0x6344, 0x4047, 0,
0, 0xD130, 0, 0, 0x4C2D, 0xD131, 0, 0x4923,
@@ -4769,7 +4587,7 @@ static const unsigned short utf8_to_euc_E7A8[] = {
0xD139, 0x634A, 0x3070, 0, 0xD13A, 0xD13B, 0, 0x634D,
0xD13C, 0xD13D, 0xD13E, 0x634B, 0x3254, 0x374E, 0x634C, 0x3946,
};
-static const unsigned short utf8_to_euc_E7A9[] = {
+const unsigned short utf8_to_euc_E7A9[] = {
0x3972, 0, 0x4A66, 0x634E, 0xD13F, 0xD140, 0x4B54, 0xD141,
0xD142, 0x6350, 0, 0, 0xD143, 0x4051, 0x314F, 0x323A,
0x302C, 0, 0, 0, 0, 0xD144, 0xD145, 0x634F,
@@ -4779,7 +4597,7 @@ static const unsigned short utf8_to_euc_E7A9[] = {
0x6355, 0, 0, 0, 0x376A, 0xD14F, 0x3566, 0,
0xD150, 0x6356, 0x3675, 0, 0, 0x6357, 0xD151, 0x407C,
};
-static const unsigned short utf8_to_euc_E7AA[] = {
+const unsigned short utf8_to_euc_E7AA[] = {
0xD152, 0x464D, 0xD153, 0x4060, 0x3A75, 0xD154, 0xD155, 0,
0x6358, 0, 0xD156, 0xD157, 0, 0, 0, 0,
0xD158, 0xD159, 0x4362, 0x416B, 0xD15A, 0x635A, 0x635C, 0x6359,
@@ -4789,7 +4607,7 @@ static const unsigned short utf8_to_euc_E7AA[] = {
0x635F, 0, 0, 0xD15F, 0, 0xD160, 0x6360, 0,
0, 0xD161, 0x312E, 0xD162, 0xD163, 0, 0, 0x6363,
};
-static const unsigned short utf8_to_euc_E7AB[] = {
+const unsigned short utf8_to_euc_E7AB[] = {
0, 0, 0, 0x3376, 0x6362, 0x6361, 0xD164, 0x6365,
0x635E, 0xD165, 0x6366, 0x4E29, 0xD166, 0x6367, 0xD167, 0x6368,
0, 0xD168, 0x5474, 0x636A, 0, 0x6369, 0, 0,
@@ -4799,7 +4617,7 @@ static const unsigned short utf8_to_euc_E7AB[] = {
0x6372, 0xD16E, 0, 0, 0xD16F, 0, 0x3625, 0,
0x513F, 0x435D, 0x3C33, 0xD170, 0, 0xD171, 0xD172, 0x3448,
};
-static const unsigned short utf8_to_euc_E7AC[] = {
+const unsigned short utf8_to_euc_E7AC[] = {
0, 0, 0x6373, 0, 0x6422, 0, 0x6376, 0xD173,
0x3568, 0, 0x6375, 0x6424, 0, 0, 0, 0x6374,
0, 0x3E50, 0, 0, 0xD174, 0, 0, 0,
@@ -4809,7 +4627,7 @@ static const unsigned short utf8_to_euc_E7AC[] = {
0xD17E, 0xD221, 0, 0x6377, 0xD222, 0x637B, 0x637D, 0,
0, 0x3A7B, 0, 0, 0, 0xD223, 0, 0xD224,
};
-static const unsigned short utf8_to_euc_E7AD[] = {
+const unsigned short utf8_to_euc_E7AD[] = {
0xD225, 0xD226, 0, 0, 0, 0x6426, 0x492E, 0xD227,
0x4826, 0x4579, 0, 0x365A, 0x6425, 0x6423, 0xD228, 0x4835,
0x637E, 0x435E, 0x457B, 0, 0x457A, 0xD229, 0x3A76, 0,
@@ -4819,7 +4637,7 @@ static const unsigned short utf8_to_euc_E7AD[] = {
0x642B, 0x642C, 0xD231, 0xD232, 0x6429, 0x6427, 0, 0xD233,
0, 0, 0x6421, 0, 0, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E7AE[] = {
+const unsigned short utf8_to_euc_E7AE[] = {
0, 0, 0, 0, 0xD234, 0, 0x4A4F, 0x3255,
0, 0xD235, 0, 0x6435, 0, 0x6432, 0xD236, 0x6437,
0xD237, 0xD238, 0x6436, 0, 0x4773, 0x4C27, 0xD239, 0x3B3B,
@@ -4829,7 +4647,7 @@ static const unsigned short utf8_to_euc_E7AE[] = {
0xD240, 0x4822, 0xD241, 0, 0x643E, 0xD242, 0xD243, 0,
0x4824, 0, 0xD244, 0xD245, 0xD246, 0xD247, 0, 0,
};
-static const unsigned short utf8_to_euc_E7AF[] = {
+const unsigned short utf8_to_euc_E7AF[] = {
0x4061, 0x643B, 0xD248, 0, 0x484F, 0xD249, 0x643F, 0x4A53,
0xD24A, 0x435B, 0xD24B, 0x643A, 0x643C, 0, 0, 0x643D,
0, 0, 0, 0, 0xD24C, 0, 0xD24D, 0xD24E,
@@ -4839,7 +4657,7 @@ static const unsigned short utf8_to_euc_E7AF[] = {
0, 0, 0xD254, 0x644A, 0xD255, 0xD256, 0x644E, 0x644B,
0xD257, 0xD258, 0xD259, 0, 0xD25A, 0, 0xD25B, 0,
};
-static const unsigned short utf8_to_euc_E7B0[] = {
+const unsigned short utf8_to_euc_E7B0[] = {
0x6447, 0xD25C, 0xD25D, 0xD25E, 0xD25F, 0, 0xD260, 0x6448,
0, 0xD261, 0, 0xD262, 0xD263, 0x644D, 0xD264, 0xD265,
0, 0x6442, 0x5255, 0x6449, 0x6443, 0, 0, 0x644C,
@@ -4849,7 +4667,7 @@ static const unsigned short utf8_to_euc_E7B0[] = {
0, 0xD26D, 0, 0xD26E, 0xD26F, 0, 0xD270, 0x6453,
0x4876, 0xD271, 0xD272, 0, 0, 0x6455, 0x4E7C, 0x4A6D,
};
-static const unsigned short utf8_to_euc_E7B1[] = {
+const unsigned short utf8_to_euc_E7B1[] = {
0x645A, 0, 0, 0x6457, 0, 0, 0xD273, 0,
0, 0, 0xD274, 0, 0x6456, 0x4052, 0, 0x6459,
0x645B, 0xD276, 0xD277, 0xD278, 0x6458, 0xD275, 0x645F, 0,
@@ -4859,7 +4677,7 @@ static const unsigned short utf8_to_euc_E7B1[] = {
0xD327, 0, 0xD328, 0x4A46, 0, 0x6462, 0, 0,
0, 0xD329, 0, 0, 0xD32A, 0xD32B, 0x4C62, 0,
};
-static const unsigned short utf8_to_euc_E7B2[] = {
+const unsigned short utf8_to_euc_E7B2[] = {
0, 0x364E, 0x3729, 0x6463, 0, 0, 0xD32C, 0xD32D,
0, 0x4A34, 0, 0x3F68, 0, 0x4C30, 0, 0xD32E,
0x6464, 0, 0x4E33, 0, 0xD32F, 0x4774, 0, 0x4146,
@@ -4869,7 +4687,7 @@ static const unsigned short utf8_to_euc_E7B2[] = {
0xD333, 0x646D, 0x646C, 0x646B, 0, 0, 0xD334, 0xD335,
0, 0x646F, 0xD336, 0xD337, 0xD338, 0x6470, 0x403A, 0xD339,
};
-static const unsigned short utf8_to_euc_E7B3[] = {
+const unsigned short utf8_to_euc_E7B3[] = {
0x6471, 0, 0x6473, 0, 0xD33A, 0x6472, 0, 0xD33B,
0xD33C, 0xD33D, 0x3852, 0, 0, 0xD33E, 0x4138, 0xD33F,
0, 0, 0x6475, 0xD340, 0xD341, 0xD342, 0x457C, 0xD343,
@@ -4879,7 +4697,7 @@ static const unsigned short utf8_to_euc_E7B3[] = {
0, 0, 0x647A, 0, 0x647B, 0xD34A, 0x647C, 0,
0x3B65, 0, 0x647D, 0x374F, 0, 0, 0x356A, 0,
};
-static const unsigned short utf8_to_euc_E7B4[] = {
+const unsigned short utf8_to_euc_E7B4[] = {
0x352A, 0, 0x6521, 0xD34B, 0x4C73, 0x3948, 0x647E, 0xD34C,
0xD34D, 0xD34E, 0x6524, 0x4C66, 0, 0x473C, 0, 0xD34F,
0x4933, 0xD350, 0xD351, 0xD352, 0x3D63, 0x6523, 0xD353, 0x3C53,
@@ -4889,7 +4707,7 @@ static const unsigned short utf8_to_euc_E7B4[] = {
0x3A59, 0xD35A, 0x6528, 0x3F42, 0, 0x652A, 0, 0,
0, 0x3E52, 0x3A30, 0, 0xD35B, 0xD35C, 0xD35D, 0x6529,
};
-static const unsigned short utf8_to_euc_E7B5[] = {
+const unsigned short utf8_to_euc_E7B5[] = {
0xD35E, 0xD35F, 0x3D2A, 0x383E, 0x4148, 0x6525, 0x652B, 0xD360,
0xD361, 0, 0, 0x6526, 0x3750, 0xD362, 0x652E, 0x6532,
0x376B, 0xD363, 0, 0xD364, 0, 0, 0x652D, 0xD365,
@@ -4899,7 +4717,7 @@ static const unsigned short utf8_to_euc_E7B5[] = {
0xD36D, 0x457D, 0x652F, 0x652C, 0, 0x3328, 0x4064, 0,
0xD36E, 0x3828, 0xD36F, 0xD370, 0, 0x6538, 0, 0xD371,
};
-static const unsigned short utf8_to_euc_E7B6[] = {
+const unsigned short utf8_to_euc_E7B6[] = {
0, 0xD372, 0xD373, 0xD374, 0, 0xD375, 0xD376, 0,
0xD377, 0x6535, 0, 0xD378, 0xD379, 0xD37A, 0, 0x6537,
0, 0xD37B, 0, 0x6534, 0, 0, 0xD37C, 0xD37D,
@@ -4909,7 +4727,7 @@ static const unsigned short utf8_to_euc_E7B6[] = {
0x6547, 0x394B, 0x4C56, 0xD425, 0x4456, 0x653D, 0xD426, 0xD427,
0x6545, 0xD428, 0x653A, 0x433E, 0, 0x653F, 0x303D, 0x4C4A,
};
-static const unsigned short utf8_to_euc_E7B7[] = {
+const unsigned short utf8_to_euc_E7B7[] = {
0, 0, 0xD429, 0xD42A, 0xD42B, 0xD42C, 0xD42D, 0x653E,
0, 0, 0x365B, 0x486C, 0xD42E, 0xD42F, 0xD430, 0x416D,
0, 0x4E50, 0x3D6F, 0, 0, 0x656E, 0xF45D, 0xD431,
@@ -4919,7 +4737,7 @@ static const unsigned short utf8_to_euc_E7B7[] = {
0, 0xD43A, 0x654D, 0, 0x4E7D, 0xD43B, 0xD43C, 0,
0, 0xD43D, 0xD43E, 0x654C, 0, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E7B8[] = {
+const unsigned short utf8_to_euc_E7B8[] = {
0xD433, 0x316F, 0, 0, 0x466C, 0x654F, 0, 0,
0xD43F, 0x6556, 0x6550, 0x6557, 0, 0, 0, 0,
0xD440, 0xD441, 0x6553, 0, 0, 0xD442, 0, 0xD443,
@@ -4929,7 +4747,7 @@ static const unsigned short utf8_to_euc_E7B8[] = {
0, 0x6554, 0x6560, 0xD44C, 0, 0x655C, 0xD44D, 0x655F,
0, 0x655D, 0x6561, 0x655B, 0, 0x6541, 0x4053, 0xD44E,
};
-static const unsigned short utf8_to_euc_E7B9[] = {
+const unsigned short utf8_to_euc_E7B9[] = {
0, 0x484B, 0, 0x655E, 0xD44F, 0xD450, 0x6559, 0xD451,
0, 0, 0x4121, 0x3752, 0, 0x3D2B, 0xD452, 0,
0xD453, 0, 0xD454, 0, 0x3F25, 0x4136, 0x6564, 0,
@@ -4939,7 +4757,7 @@ static const unsigned short utf8_to_euc_E7B9[] = {
0x372B, 0, 0, 0xD45D, 0, 0, 0, 0,
0xD45E, 0x6568, 0, 0x656C, 0x656B, 0x656F, 0xD45F, 0x6571,
};
-static const unsigned short utf8_to_euc_E7BA[] = {
+const unsigned short utf8_to_euc_E7BA[] = {
0, 0xD460, 0x3B3C, 0x656D, 0, 0, 0xD461, 0xD462,
0x6572, 0x6573, 0xD463, 0, 0x6574, 0xD464, 0x657A, 0x453B,
0x6576, 0xD465, 0x6575, 0x6577, 0x6578, 0xD466, 0x6579, 0,
@@ -4949,7 +4767,7 @@ static const unsigned short utf8_to_euc_E7BA[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E7BC[] = {
+const unsigned short utf8_to_euc_E7BC[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -4959,7 +4777,7 @@ static const unsigned short utf8_to_euc_E7BC[] = {
0, 0, 0, 0, 0, 0, 0x344C, 0,
0x657D, 0, 0x657E, 0xD46C, 0xD46B, 0xD46D, 0xD46E, 0xD46F,
};
-static const unsigned short utf8_to_euc_E7BD[] = {
+const unsigned short utf8_to_euc_E7BD[] = {
0, 0, 0, 0xD470, 0xD471, 0x6621, 0, 0xD472,
0, 0, 0, 0, 0x6622, 0x6623, 0x6624, 0xD473,
0x6625, 0x6626, 0xD474, 0xD475, 0x6628, 0x6627, 0, 0,
@@ -4969,7 +4787,7 @@ static const unsigned short utf8_to_euc_E7BD[] = {
0x4833, 0xD521, 0x3D70, 0, 0, 0x474D, 0, 0x486D,
0x662F, 0x586D, 0, 0, 0, 0xD522, 0xD523, 0xD524,
};
-static const unsigned short utf8_to_euc_E7BE[] = {
+const unsigned short utf8_to_euc_E7BE[] = {
0xD525, 0, 0x6630, 0x6632, 0, 0x4D65, 0x6631, 0x6634,
0x6633, 0, 0x4D53, 0xD526, 0x6635, 0xD527, 0x487E, 0xD528,
0xD529, 0xD52A, 0, 0, 0x6636, 0, 0xD52B, 0xD52C,
@@ -4979,7 +4797,7 @@ static const unsigned short utf8_to_euc_E7BE[] = {
0, 0, 0x663C, 0, 0xD533, 0, 0x663F, 0,
0x6640, 0x663D, 0, 0, 0xD534, 0x3129, 0, 0xD535,
};
-static const unsigned short utf8_to_euc_E7BF[] = {
+const unsigned short utf8_to_euc_E7BF[] = {
0xD536, 0x3227, 0, 0xD537, 0, 0x6642, 0x6643, 0,
0xD538, 0, 0x6644, 0, 0x4D62, 0, 0xD539, 0xD53A,
0, 0, 0x3D2C, 0, 0x6646, 0x6645, 0, 0,
@@ -4989,7 +4807,7 @@ static const unsigned short utf8_to_euc_E7BF[] = {
0x344D, 0, 0xD543, 0x664A, 0, 0, 0, 0,
0, 0x664B, 0xD544, 0x4B5D, 0x4D63, 0xD545, 0xD546, 0xD547,
};
-static const unsigned short utf8_to_euc_E880[] = {
+const unsigned short utf8_to_euc_E880[] = {
0x4D54, 0x4F37, 0, 0x394D, 0x664E, 0x3C54, 0x664D, 0xD548,
0xD549, 0, 0xD54A, 0x664F, 0x3C29, 0xD54B, 0xD54C, 0xD54D,
0x4251, 0xD54E, 0x6650, 0xD54F, 0xD550, 0x394C, 0xD551, 0x4C57,
@@ -4999,7 +4817,7 @@ static const unsigned short utf8_to_euc_E880[] = {
0xD55A, 0, 0, 0x3C2A, 0xD55B, 0xD55C, 0x4C6D, 0xD55D,
0, 0xD55E, 0xD55F, 0x6657, 0xD560, 0x433F, 0xD561, 0x6656,
};
-static const unsigned short utf8_to_euc_E881[] = {
+const unsigned short utf8_to_euc_E881[] = {
0xD562, 0, 0, 0, 0xD563, 0, 0x6659, 0,
0, 0, 0x6658, 0, 0, 0, 0, 0,
0, 0, 0x665A, 0, 0, 0, 0x403B, 0,
@@ -5009,7 +4827,7 @@ static const unsigned short utf8_to_euc_E881[] = {
0x6662, 0xD568, 0x6661, 0x6660, 0x4430, 0xD569, 0x6663, 0x3F26,
0, 0x6664, 0, 0, 0, 0x6665, 0x4F38, 0x6666,
};
-static const unsigned short utf8_to_euc_E882[] = {
+const unsigned short utf8_to_euc_E882[] = {
0, 0xD56A, 0, 0, 0x6667, 0x6669, 0x6668, 0x4825,
0xD56B, 0x4679, 0, 0x4F3E, 0x4829, 0, 0xD56C, 0,
0, 0, 0, 0x666B, 0, 0, 0x3E53, 0,
@@ -5019,7 +4837,7 @@ static const unsigned short utf8_to_euc_E882[] = {
0, 0x394F, 0x3069, 0, 0x3A68, 0, 0, 0,
0xD572, 0xD573, 0x4759, 0, 0, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E883[] = {
+const unsigned short utf8_to_euc_E883[] = {
0, 0, 0, 0x305F, 0x6674, 0, 0x4340, 0,
0xD574, 0, 0, 0, 0x4758, 0xD575, 0x425B, 0xD576,
0, 0, 0xD577, 0, 0xD578, 0xD579, 0x6676, 0xD57A,
@@ -5029,7 +4847,7 @@ static const unsigned short utf8_to_euc_E883[] = {
0xD621, 0x6679, 0xD622, 0xD623, 0x4639, 0, 0xD624, 0,
0x363B, 0xD625, 0xD626, 0, 0x6726, 0x473D, 0xD627, 0,
};
-static const unsigned short utf8_to_euc_E884[] = {
+const unsigned short utf8_to_euc_E884[] = {
0, 0, 0x3B69, 0xD628, 0, 0x363C, 0x4048, 0x4F46,
0x4C2E, 0x6677, 0x4054, 0xD629, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0xD62A, 0xD62B,
@@ -5039,7 +4857,7 @@ static const unsigned short utf8_to_euc_E884[] = {
0xD633, 0x4326, 0, 0x473E, 0, 0xD634, 0, 0,
0, 0x4431, 0xD635, 0, 0xD636, 0, 0x6723, 0,
};
-static const unsigned short utf8_to_euc_E885[] = {
+const unsigned short utf8_to_euc_E885[] = {
0, 0, 0, 0, 0, 0xD637, 0x6722, 0xD638,
0, 0, 0xD639, 0x667E, 0xD63A, 0, 0x3F55, 0,
0x4965, 0x6725, 0xD63B, 0x6724, 0x3950, 0x4F53, 0, 0xD63C,
@@ -5049,7 +4867,7 @@ static const unsigned short utf8_to_euc_E885[] = {
0x3978, 0x6727, 0, 0, 0x672B, 0, 0, 0xD644,
0x4432, 0x4A22, 0x4123, 0, 0, 0, 0, 0x425C,
};
-static const unsigned short utf8_to_euc_E886[] = {
+const unsigned short utf8_to_euc_E886[] = {
0x672F, 0xD645, 0x6730, 0x672C, 0xD647, 0xD648, 0xD649, 0,
0x672D, 0, 0x672E, 0xD64A, 0, 0, 0xD64B, 0x3951,
0xD646, 0, 0, 0x6736, 0, 0x6732, 0xD64C, 0,
@@ -5059,7 +4877,7 @@ static const unsigned short utf8_to_euc_E886[] = {
0x6738, 0, 0xD652, 0x4137, 0xD653, 0x6739, 0, 0,
0x673B, 0, 0x673F, 0xD654, 0, 0x673C, 0x673A, 0x473F,
};
-static const unsigned short utf8_to_euc_E887[] = {
+const unsigned short utf8_to_euc_E887[] = {
0x673D, 0, 0x673E, 0xD656, 0, 0xD657, 0x3232, 0,
0x6745, 0x6740, 0xD658, 0xD655, 0, 0x6741, 0xD659, 0xD65A,
0, 0x6742, 0, 0x4221, 0, 0xD65B, 0, 0xD65C,
@@ -5069,7 +4887,7 @@ static const unsigned short utf8_to_euc_E887[] = {
0xD664, 0xD665, 0xD666, 0x3B6A, 0x4357, 0xD667, 0xD668, 0,
0xD669, 0xD66A, 0x674A, 0x674B, 0x3131, 0xD66B, 0x674C, 0xD66C,
};
-static const unsigned short utf8_to_euc_E888[] = {
+const unsigned short utf8_to_euc_E888[] = {
0xD66D, 0x674D, 0x674E, 0xD66E, 0, 0x674F, 0, 0x6750,
0x363D, 0x5A2A, 0x6751, 0, 0x4065, 0x6752, 0x3C4B, 0xD66F,
0x6753, 0, 0x5030, 0xD670, 0xD671, 0, 0x6754, 0x4A5E,
@@ -5079,7 +4897,7 @@ static const unsigned short utf8_to_euc_E888[] = {
0, 0, 0xD678, 0x6758, 0xD679, 0x4249, 0x4775, 0x383F,
0x6757, 0x4125, 0xD67A, 0, 0, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E889[] = {
+const unsigned short utf8_to_euc_E889[] = {
0x6759, 0, 0, 0xD67B, 0xD67C, 0xD67D, 0xD67E, 0x447A,
0, 0, 0, 0xD721, 0, 0, 0xD722, 0xD723,
0, 0xD724, 0, 0, 0, 0, 0xD725, 0,
@@ -5089,7 +4907,7 @@ static const unsigned short utf8_to_euc_E889[] = {
0, 0x6765, 0x3F27, 0, 0xD72B, 0, 0x3170, 0x6766,
0x6767, 0, 0, 0xD72C, 0, 0xD72D, 0x6768, 0xD72E,
};
-static const unsigned short utf8_to_euc_E88A[] = {
+const unsigned short utf8_to_euc_E88A[] = {
0xD72F, 0xD730, 0, 0xD731, 0xD732, 0, 0, 0xD733,
0, 0xD734, 0xD735, 0x3072, 0, 0x6769, 0xD736, 0,
0, 0xD737, 0x676A, 0, 0xD738, 0, 0xD739, 0,
@@ -5099,7 +4917,7 @@ static const unsigned short utf8_to_euc_E88A[] = {
0xD746, 0x3256, 0xD747, 0x4B27, 0xD748, 0, 0, 0xD749,
0x375D, 0x365C, 0xD74A, 0x676D, 0xD74B, 0x326A, 0xD74C, 0xD74D,
};
-static const unsigned short utf8_to_euc_E88B[] = {
+const unsigned short utf8_to_euc_E88B[] = {
0, 0, 0, 0, 0, 0x3423, 0xD74E, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0xD74F, 0x3171, 0x6772, 0x4E6A, 0x425D, 0xD750, 0, 0x4944,
@@ -5109,7 +4927,7 @@ static const unsigned short utf8_to_euc_E88B[] = {
0, 0x3151, 0, 0x6774, 0x6773, 0, 0xD759, 0xD75A,
0, 0x6779, 0x6775, 0x6778, 0, 0xD75B, 0xD75C, 0,
};
-static const unsigned short utf8_to_euc_E88C[] = {
+const unsigned short utf8_to_euc_E88C[] = {
0xD75D, 0xD75E, 0x4C50, 0x6777, 0x3258, 0x337D, 0x677B, 0xD75F,
0xD760, 0x677D, 0xD761, 0xD762, 0, 0, 0x3754, 0,
0, 0, 0, 0, 0, 0, 0x6823, 0x682C,
@@ -5119,7 +4937,7 @@ static const unsigned short utf8_to_euc_E88C[] = {
0xD76D, 0x6825, 0x6824, 0xD76E, 0x6822, 0x6821, 0x4363, 0xD76F,
0x427B, 0x6827, 0xD770, 0, 0xD771, 0xD772, 0, 0,
};
-static const unsigned short utf8_to_euc_E88D[] = {
+const unsigned short utf8_to_euc_E88D[] = {
0x6826, 0, 0xD773, 0xD774, 0xD775, 0x6829, 0, 0xD776,
0, 0x4170, 0x3755, 0, 0, 0xD777, 0xD778, 0x3141,
0x6828, 0xD779, 0x3953, 0xD83E, 0xD763, 0xD77A, 0xD77B, 0xD77C,
@@ -5129,7 +4947,7 @@ static const unsigned short utf8_to_euc_E88D[] = {
0xD77D, 0, 0, 0x683A, 0, 0x683B, 0, 0x3259,
0xD77E, 0, 0, 0x322E, 0x6838, 0xD821, 0, 0xD822,
};
-static const unsigned short utf8_to_euc_E88E[] = {
+const unsigned short utf8_to_euc_E88E[] = {
0xD823, 0, 0xD824, 0, 0xD825, 0x682E, 0xD826, 0x6836,
0, 0x683D, 0x6837, 0, 0, 0xD827, 0x6835, 0,
0, 0, 0xD828, 0x6776, 0xD829, 0xD82A, 0x6833, 0,
@@ -5139,7 +4957,7 @@ static const unsigned short utf8_to_euc_E88E[] = {
0, 0x4D69, 0, 0, 0, 0x6839, 0, 0,
0, 0, 0, 0, 0, 0x684F, 0xD834, 0xD835,
};
-static const unsigned short utf8_to_euc_E88F[] = {
+const unsigned short utf8_to_euc_E88F[] = {
0xD836, 0x6847, 0, 0, 0, 0x3F7B, 0, 0xD837,
0, 0xD838, 0x3546, 0, 0x365D, 0, 0x6842, 0xD839,
0xD83A, 0xD83B, 0, 0x325B, 0xD83C, 0, 0x3E54, 0,
@@ -5149,7 +4967,7 @@ static const unsigned short utf8_to_euc_E88F[] = {
0x3856, 0x4929, 0x684B, 0, 0x683F, 0, 0xD841, 0x6848,
0xD842, 0xD843, 0, 0x6852, 0xD844, 0x6843, 0, 0,
};
-static const unsigned short utf8_to_euc_E890[] = {
+const unsigned short utf8_to_euc_E890[] = {
0, 0xD845, 0, 0x6844, 0x463A, 0, 0xD846, 0x6849,
0, 0, 0xD847, 0x6846, 0x4B28, 0x684C, 0x3060, 0xD848,
0, 0xD849, 0, 0x6840, 0, 0xD84A, 0, 0,
@@ -5159,7 +4977,7 @@ static const unsigned short utf8_to_euc_E890[] = {
0, 0x337E, 0, 0, 0, 0x6862, 0, 0,
0x6850, 0xD84E, 0, 0, 0x6855, 0x4D6E, 0, 0,
};
-static const unsigned short utf8_to_euc_E891[] = {
+const unsigned short utf8_to_euc_E891[] = {
0, 0, 0, 0, 0, 0xD84F, 0x685E, 0xD850,
0xD851, 0x4D55, 0xD852, 0, 0, 0xD853, 0x4E2A, 0xD854,
0, 0xD855, 0xD856, 0, 0, 0, 0xD857, 0x4378,
@@ -5169,7 +4987,7 @@ static const unsigned short utf8_to_euc_E891[] = {
0xD861, 0x472C, 0, 0xD862, 0xD863, 0x302A, 0xD864, 0x6858,
0xD865, 0x6861, 0x4978, 0, 0xD866, 0xD867, 0, 0,
};
-static const unsigned short utf8_to_euc_E892[] = {
+const unsigned short utf8_to_euc_E892[] = {
0, 0xD868, 0x685C, 0, 0x6857, 0xD869, 0, 0,
0, 0, 0, 0x3E55, 0, 0, 0, 0,
0x3D2F, 0, 0xD86A, 0xD86B, 0x3C2C, 0xD86C, 0, 0,
@@ -5179,7 +4997,7 @@ static const unsigned short utf8_to_euc_E892[] = {
0, 0xD873, 0x3377, 0, 0xD874, 0, 0, 0,
0x3E78, 0x6865, 0xD875, 0x686A, 0x4173, 0xD876, 0xD877, 0x6866,
};
-static const unsigned short utf8_to_euc_E893[] = {
+const unsigned short utf8_to_euc_E893[] = {
0xD878, 0x686D, 0xD879, 0, 0x435F, 0, 0x686E, 0xD87A,
0xD87B, 0x4D56, 0x6863, 0x3338, 0xD87C, 0x6869, 0, 0xD87D,
0x686C, 0x4C2C, 0, 0xD87E, 0, 0, 0x686F, 0,
@@ -5189,7 +5007,7 @@ static const unsigned short utf8_to_euc_E893[] = {
0xD925, 0xD926, 0xD927, 0, 0x6873, 0, 0, 0xD928,
0, 0, 0xD92A, 0xD92B, 0x687A, 0xD92C, 0, 0x6872,
};
-static const unsigned short utf8_to_euc_E894[] = {
+const unsigned short utf8_to_euc_E894[] = {
0x3C43, 0, 0xD92D, 0xD92E, 0, 0, 0x6851, 0xD92F,
0, 0, 0, 0, 0xD930, 0, 0xD931, 0,
0xD932, 0x4A4E, 0, 0x4C22, 0x6879, 0x6878, 0, 0x6874,
@@ -5199,7 +5017,7 @@ static const unsigned short utf8_to_euc_E894[] = {
0, 0, 0xD929, 0xD93D, 0xD93E, 0x4222, 0xD93F, 0,
0, 0, 0, 0, 0, 0x4A43, 0, 0xD940,
};
-static const unsigned short utf8_to_euc_E895[] = {
+const unsigned short utf8_to_euc_E895[] = {
0x687B, 0x6921, 0, 0x4859, 0, 0, 0xD941, 0,
0x687E, 0x3E56, 0x3C49, 0x6923, 0, 0, 0x363E, 0xD942,
0xD943, 0xD944, 0xD945, 0xD946, 0, 0x6924, 0xD947, 0x4979,
@@ -5209,7 +5027,7 @@ static const unsigned short utf8_to_euc_E895[] = {
0, 0, 0, 0, 0, 0, 0, 0x6931,
0, 0xD953, 0xD954, 0xD955, 0, 0xD956, 0x6932, 0xD957,
};
-static const unsigned short utf8_to_euc_E896[] = {
+const unsigned short utf8_to_euc_E896[] = {
0x6925, 0xD958, 0, 0, 0x4776, 0xD959, 0xD95A, 0x692F,
0x6927, 0xD95B, 0x6929, 0xD95C, 0xD95D, 0, 0, 0xD95E,
0x6933, 0x6928, 0, 0xD95F, 0x692C, 0, 0, 0x3172,
@@ -5219,7 +5037,7 @@ static const unsigned short utf8_to_euc_E896[] = {
0xF461, 0, 0, 0, 0xD967, 0, 0xD968, 0xD969,
0xD96A, 0x6937, 0x6935, 0, 0xD96B, 0xD96C, 0xD96D, 0xD96E,
};
-static const unsigned short utf8_to_euc_E897[] = {
+const unsigned short utf8_to_euc_E897[] = {
0, 0x4F4E, 0xD96F, 0, 0, 0, 0, 0xD970,
0, 0x6934, 0xD971, 0xD972, 0, 0x4D75, 0xD973, 0x6936,
0x6938, 0, 0, 0, 0, 0x6939, 0, 0,
@@ -5229,7 +5047,7 @@ static const unsigned short utf8_to_euc_E897[] = {
0, 0, 0, 0xD97C, 0, 0, 0xD97D, 0x3D73,
0, 0x693D, 0x6942, 0x4174, 0xD97E, 0, 0x6941, 0xDA21,
};
-static const unsigned short utf8_to_euc_E898[] = {
+const unsigned short utf8_to_euc_E898[] = {
0xDA22, 0, 0x6922, 0, 0xDA23, 0xDA24, 0x6943, 0x4149,
0, 0, 0x693E, 0x6940, 0, 0xDA25, 0xDA26, 0,
0xDA27, 0xDA28, 0xDA29, 0x693F, 0, 0, 0x5D31, 0x5D22,
@@ -5239,7 +5057,7 @@ static const unsigned short utf8_to_euc_E898[] = {
0x6946, 0, 0, 0, 0, 0, 0xDA31, 0,
0xDA32, 0, 0xDA33, 0, 0xDA34, 0xDA35, 0, 0x6947,
};
-static const unsigned short utf8_to_euc_E899[] = {
+const unsigned short utf8_to_euc_E899[] = {
0xDA36, 0xB866, 0xDA37, 0, 0, 0, 0xDA38, 0,
0, 0, 0, 0, 0, 0x6948, 0x3857, 0,
0x3554, 0, 0xDA39, 0xDA3A, 0x694A, 0x515D, 0xDA3B, 0xDA3C,
@@ -5249,7 +5067,7 @@ static const unsigned short utf8_to_euc_E899[] = {
0, 0x694D, 0, 0, 0, 0xDA48, 0xDA49, 0xDA4A,
0, 0x467A, 0xDA4B, 0x303A, 0, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E89A[] = {
+const unsigned short utf8_to_euc_E89A[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0xDA6D, 0, 0x3263, 0x6952, 0x6953, 0xDA4C, 0, 0,
0, 0xDA4D, 0, 0x694E, 0, 0x3B3D, 0xDA4E, 0,
@@ -5259,7 +5077,7 @@ static const unsigned short utf8_to_euc_E89A[] = {
0x6958, 0xDA57, 0, 0xDA58, 0xDA59, 0xDA5A, 0x6954, 0xDA5B,
0xDA5C, 0xDA5D, 0, 0, 0, 0, 0, 0xDA5E,
};
-static const unsigned short utf8_to_euc_E89B[] = {
+const unsigned short utf8_to_euc_E89B[] = {
0xDA5F, 0xDA60, 0, 0xDA61, 0x6956, 0xDA62, 0x6957, 0x3C58,
0, 0x6959, 0, 0x4341, 0, 0x3756, 0x3342, 0,
0, 0xDA63, 0xDA64, 0, 0x695C, 0xDA65, 0, 0xDA66,
@@ -5269,7 +5087,7 @@ static const unsigned short utf8_to_euc_E89B[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0x427D, 0x696C, 0xDA6E, 0x6968, 0xDA6F, 0xDA70, 0x326B, 0,
};
-static const unsigned short utf8_to_euc_E89C[] = {
+const unsigned short utf8_to_euc_E89C[] = {
0x6966, 0, 0x4B2A, 0x6967, 0xDA71, 0xDA72, 0x6964, 0xDA73,
0x6965, 0x696A, 0x696D, 0xDA74, 0, 0x696B, 0xDA75, 0xDA76,
0xDA77, 0x6969, 0x6963, 0xDA78, 0xDA79, 0, 0, 0,
@@ -5279,7 +5097,7 @@ static const unsigned short utf8_to_euc_E89C[] = {
0, 0xDB24, 0xDB25, 0, 0x696E, 0, 0, 0x6970,
0, 0xDB26, 0xDB27, 0x6971, 0xDB28, 0xDB29, 0xDB2A, 0x696F,
};
-static const unsigned short utf8_to_euc_E89D[] = {
+const unsigned short utf8_to_euc_E89D[] = {
0xDB2B, 0, 0, 0xDB2C, 0, 0xDB2D, 0, 0,
0, 0x4066, 0, 0x4F39, 0x6978, 0xDB2E, 0x6979, 0,
0, 0, 0, 0x6A21, 0, 0x3F2A, 0, 0x697B,
@@ -5289,7 +5107,7 @@ static const unsigned short utf8_to_euc_E89D[] = {
0, 0xDB35, 0xDB36, 0, 0x697A, 0, 0x4433, 0,
0x6977, 0, 0, 0xDB37, 0, 0, 0, 0x4768,
};
-static const unsigned short utf8_to_euc_E89E[] = {
+const unsigned short utf8_to_euc_E89E[] = {
0, 0, 0x6A27, 0xDB38, 0xDB39, 0xDB3A, 0xDB3B, 0xDB3C,
0xDB3D, 0xDB3E, 0, 0xDB3F, 0xDB40, 0x4D3B, 0, 0,
0xDB41, 0, 0, 0xDB42, 0, 0xDB43, 0, 0xDB44,
@@ -5299,7 +5117,7 @@ static const unsigned short utf8_to_euc_E89E[] = {
0, 0xDB4E, 0, 0x6A30, 0, 0xDB4F, 0, 0,
0, 0, 0x4D66, 0x6A33, 0, 0x6A2A, 0xDB50, 0xDB51,
};
-static const unsigned short utf8_to_euc_E89F[] = {
+const unsigned short utf8_to_euc_E89F[] = {
0x6A2B, 0xDB52, 0, 0, 0x6A2F, 0, 0x6A32, 0x6A31,
0xDB53, 0xDB54, 0xDB55, 0x6A29, 0, 0, 0xDB56, 0,
0x6A2C, 0, 0x6A3D, 0, 0, 0xDB57, 0xDB58, 0,
@@ -5309,7 +5127,7 @@ static const unsigned short utf8_to_euc_E89F[] = {
0, 0xDB63, 0x6A35, 0xDB64, 0, 0, 0x6A3A, 0x6A3B,
0xDB65, 0x332A, 0xDB66, 0x3542, 0, 0, 0x6A39, 0xDB67,
};
-static const unsigned short utf8_to_euc_E8A0[] = {
+const unsigned short utf8_to_euc_E8A0[] = {
0, 0xDB68, 0, 0xDB69, 0, 0x6A24, 0xDB6A, 0xF464,
0, 0xDB6B, 0xDB6C, 0xDB6D, 0, 0x6A38, 0x6A3C, 0x6A37,
0xDB6E, 0x6A3E, 0xDB70, 0xDB71, 0xDB72, 0x6A40, 0x6A3F, 0,
@@ -5319,7 +5137,7 @@ static const unsigned short utf8_to_euc_E8A0[] = {
0xDB7C, 0x6A43, 0xDB7D, 0, 0, 0xDB7E, 0x6A44, 0,
0, 0x6A45, 0xDC21, 0x6A47, 0xDC22, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E8A1[] = {
+const unsigned short utf8_to_euc_E8A1[] = {
0x376C, 0xDC23, 0x6A49, 0xDC24, 0x6A48, 0xDC25, 0x3D30, 0,
0xDC26, 0xDC27, 0xDC28, 0xDC29, 0x3954, 0x5E27, 0xDC2A, 0,
0, 0xDC2B, 0x6A4A, 0x3D51, 0, 0xDC2C, 0xDC2D, 0x3339,
@@ -5329,7 +5147,7 @@ static const unsigned short utf8_to_euc_E8A1[] = {
0x3F6A, 0xDC35, 0x6A55, 0, 0, 0x6A52, 0, 0x436F,
0, 0xDC36, 0, 0xDC37, 0, 0x6A53, 0x6A50, 0x365E,
};
-static const unsigned short utf8_to_euc_E8A2[] = {
+const unsigned short utf8_to_euc_E8A2[] = {
0xDC38, 0x6A4F, 0x6A56, 0, 0, 0, 0, 0,
0x3736, 0, 0, 0x425E, 0, 0x6A5C, 0, 0,
0, 0, 0x6A58, 0, 0, 0, 0x4235, 0x6A57,
@@ -5339,7 +5157,7 @@ static const unsigned short utf8_to_euc_E8A2[] = {
0x6A5E, 0x6A60, 0, 0, 0x3853, 0x6A54, 0, 0x3041,
0, 0, 0xDC41, 0, 0, 0xDC42, 0xDC43, 0x6A5F,
};
-static const unsigned short utf8_to_euc_E8A3[] = {
+const unsigned short utf8_to_euc_E8A3[] = {
0xDC44, 0x3A5B, 0x4E76, 0x6A61, 0x6A62, 0x4175, 0, 0,
0, 0, 0xDC45, 0xDC46, 0xDC47, 0xDC48, 0xDC49, 0x4E22,
0, 0xDC4A, 0xDC4B, 0xDC4C, 0x6A63, 0x4D35, 0, 0,
@@ -5349,7 +5167,7 @@ static const unsigned short utf8_to_euc_E8A3[] = {
0xDC51, 0xDC52, 0x6A6C, 0x3E58, 0x6A6A, 0xDC53, 0, 0xDC54,
0x4D67, 0x6A67, 0, 0, 0x6A69, 0x403D, 0x3F7E, 0,
};
-static const unsigned short utf8_to_euc_E8A4[] = {
+const unsigned short utf8_to_euc_E8A4[] = {
0, 0xDC55, 0x6A68, 0, 0x6A6D, 0, 0xDC56, 0x4A23,
0, 0, 0x6A6F, 0, 0x6A6E, 0xDC57, 0xDC58, 0xDC59,
0x336C, 0, 0x4B2B, 0x6A70, 0, 0xDC5A, 0xDC5B, 0,
@@ -5359,7 +5177,7 @@ static const unsigned short utf8_to_euc_E8A4[] = {
0xDC64, 0xDC65, 0xDC66, 0, 0, 0xDC67, 0x6A79, 0,
0x6A7A, 0xDC68, 0xDC69, 0x6A78, 0, 0, 0xDC6A, 0,
};
-static const unsigned short utf8_to_euc_E8A5[] = {
+const unsigned short utf8_to_euc_E8A5[] = {
0xDC6B, 0x6A76, 0xDC6C, 0x6A71, 0x6A77, 0xDC6D, 0xDC6E, 0,
0, 0xDC6F, 0, 0, 0x6A7B, 0x7037, 0, 0xDC70,
0, 0, 0xDC71, 0, 0, 0, 0x3228, 0xDC72,
@@ -5369,7 +5187,7 @@ static const unsigned short utf8_to_euc_E8A5[] = {
0xDC7B, 0, 0x3D31, 0xDC7C, 0x6B26, 0xDC7D, 0, 0x6B27,
0, 0, 0xDC7E, 0xDD21, 0xDD22, 0xDD23, 0x6B28, 0x403E,
};
-static const unsigned short utf8_to_euc_E8A6[] = {
+const unsigned short utf8_to_euc_E8A6[] = {
0, 0x4D57, 0, 0x6B29, 0, 0, 0x4A24, 0x4746,
0x6B2A, 0xDD24, 0x6B2B, 0x382B, 0, 0xDD25, 0, 0x352C,
0xDD26, 0, 0, 0x6B2C, 0xDD27, 0xDD28, 0x3B6B, 0x4741,
@@ -5379,7 +5197,7 @@ static const unsigned short utf8_to_euc_E8A6[] = {
0xDD2E, 0, 0x6B33, 0x3451, 0xDD2F, 0xDD30, 0xDD31, 0xDD32,
0, 0, 0x6B34, 0, 0xDD33, 0x6B35, 0, 0x6B36,
};
-static const unsigned short utf8_to_euc_E8A7[] = {
+const unsigned short utf8_to_euc_E8A7[] = {
0x6B37, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0x3351, 0, 0xDD34, 0xDD35, 0xDD36, 0xDD37,
@@ -5389,7 +5207,7 @@ static const unsigned short utf8_to_euc_E8A7[] = {
0, 0xDD3D, 0, 0xDD3E, 0x6B3C, 0, 0xDD3F, 0,
0x6B3D, 0xDD40, 0, 0, 0, 0xDD41, 0, 0xDD42,
};
-static const unsigned short utf8_to_euc_E8A8[] = {
+const unsigned short utf8_to_euc_E8A8[] = {
0x3840, 0, 0x447B, 0x6B3E, 0xDD43, 0xDD44, 0, 0xDD45,
0x3757, 0, 0x3F56, 0, 0x6B41, 0, 0x4624, 0xDD46,
0x6B40, 0xDD47, 0xDD48, 0x3731, 0xDD49, 0xDD4A, 0x6B3F, 0x4277,
@@ -5399,7 +5217,7 @@ static const unsigned short utf8_to_euc_E8A8[] = {
0, 0x3576, 0, 0x4C75, 0x414A, 0xDD53, 0x6B45, 0xDD54,
0, 0, 0x3F47, 0x4370, 0x3E5A, 0xDD55, 0xDD56, 0,
};
-static const unsigned short utf8_to_euc_E8A9[] = {
+const unsigned short utf8_to_euc_E8A9[] = {
0xDD57, 0x6B46, 0, 0xDD58, 0, 0xDD59, 0x6B49, 0xDD5A,
0x6B4A, 0xDD5B, 0, 0, 0, 0xDD5C, 0xDD5D, 0,
0x3A3E, 0x4242, 0x6B48, 0xDD5E, 0x3E5B, 0x493E, 0xDD5F, 0xDD60,
@@ -5409,7 +5227,7 @@ static const unsigned short utf8_to_euc_E8A9[] = {
0x354D, 0x4F43, 0x333A, 0x3E5C, 0, 0xDD67, 0xDD68, 0xDD69,
0, 0xDD6A, 0xDD6B, 0xDD6C, 0x6B4B, 0, 0xDD6D, 0xDD6E,
};
-static const unsigned short utf8_to_euc_E8AA[] = {
+const unsigned short utf8_to_euc_E8AA[] = {
0xDD6F, 0, 0x6B50, 0xDD70, 0x6B51, 0x6B4F, 0xDD71, 0x3858,
0, 0x4D40, 0, 0xDD72, 0x3B6F, 0x4727, 0, 0xDD73,
0xDD74, 0x6B54, 0xDD75, 0x4040, 0, 0x4342, 0xDD76, 0xDD77,
@@ -5419,7 +5237,7 @@ static const unsigned short utf8_to_euc_E8AA[] = {
0x432F, 0, 0x325D, 0xDD7E, 0, 0, 0xDE21, 0xDE22,
0, 0x4870, 0, 0xDE23, 0x3543, 0, 0xDE24, 0x4434,
};
-static const unsigned short utf8_to_euc_E8AB[] = {
+const unsigned short utf8_to_euc_E8AB[] = {
0, 0, 0x6B5B, 0xDE25, 0x6B59, 0, 0xDE26, 0x434C,
0xDE27, 0xDE28, 0xDE29, 0x4041, 0x3452, 0x6B5A, 0, 0x3F5B,
0, 0xDE2A, 0x4E4A, 0xDE2B, 0xDE2C, 0xDE2D, 0x4F40, 0xDE2E,
@@ -5429,7 +5247,7 @@ static const unsigned short utf8_to_euc_E8AB[] = {
0xDE32, 0x6B61, 0, 0x6B5E, 0xDE33, 0xDE34, 0xDE35, 0x6B65,
0x3D74, 0, 0x3841, 0, 0xDE36, 0, 0x427A, 0xDE37,
};
-static const unsigned short utf8_to_euc_E8AC[] = {
+const unsigned short utf8_to_euc_E8AC[] = {
0x4B45, 0x315A, 0x3062, 0, 0x4625, 0xDE38, 0xDE39, 0x6B69,
0, 0, 0xDE3F, 0xDE3A, 0x6B68, 0, 0x4666, 0,
0x6B6D, 0xDE3B, 0, 0, 0x6B62, 0, 0x6B6C, 0x6B6E,
@@ -5439,7 +5257,7 @@ static const unsigned short utf8_to_euc_E8AC[] = {
0xDE41, 0, 0, 0x6B70, 0, 0, 0, 0xDE42,
0, 0x3660, 0, 0, 0xDE43, 0, 0x6B74, 0,
};
-static const unsigned short utf8_to_euc_E8AD[] = {
+const unsigned short utf8_to_euc_E8AD[] = {
0, 0x6B76, 0xDE44, 0xDE45, 0xDE46, 0xDE47, 0xDE48, 0,
0xDE49, 0x6B7A, 0, 0, 0x6B77, 0xDE4E, 0x6B79, 0x6B78,
0, 0, 0xDE4A, 0xDE4B, 0xDE4C, 0, 0x6B7B, 0,
@@ -5449,7 +5267,7 @@ static const unsigned short utf8_to_euc_E8AD[] = {
0x3544, 0x6641, 0x3E79, 0, 0x6C24, 0, 0xDE52, 0x386E,
0xDE53, 0xDE54, 0, 0, 0xDE55, 0x6C25, 0xDE56, 0xF466,
};
-static const unsigned short utf8_to_euc_E8AE[] = {
+const unsigned short utf8_to_euc_E8AE[] = {
0x6C26, 0xDE57, 0, 0x3B3E, 0xDE58, 0xDE59, 0, 0,
0, 0, 0x5A4E, 0xDE5A, 0x6C27, 0xDE5B, 0x6C28, 0xDE5C,
0x3D32, 0, 0x6C29, 0x6C2A, 0xDE5D, 0xDE5E, 0x6C2B, 0,
@@ -5459,7 +5277,7 @@ static const unsigned short utf8_to_euc_E8AE[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E8B0[] = {
+const unsigned short utf8_to_euc_E8B0[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -5469,7 +5287,7 @@ static const unsigned short utf8_to_euc_E8B0[] = {
0, 0, 0, 0, 0, 0, 0, 0x432B,
0xDE62, 0xDE63, 0x6C2E, 0, 0, 0xDE64, 0xDE65, 0x6C30,
};
-static const unsigned short utf8_to_euc_E8B1[] = {
+const unsigned short utf8_to_euc_E8B1[] = {
0, 0x6C2F, 0, 0, 0, 0xDE66, 0x4626, 0xDE67,
0x6C31, 0xDE68, 0x4B2D, 0xDE69, 0x6C32, 0, 0x6C33, 0xDE6A,
0x6C34, 0xDE6B, 0, 0xDE6C, 0xDE6D, 0x6C35, 0, 0xDE6E,
@@ -5479,7 +5297,7 @@ static const unsigned short utf8_to_euc_E8B1[] = {
0, 0, 0, 0xDE79, 0, 0xDE7A, 0xDE7B, 0,
0x6C38, 0x493F, 0x6C39, 0xDE7C, 0x6C41, 0, 0xDE7D, 0,
};
-static const unsigned short utf8_to_euc_E8B2[] = {
+const unsigned short utf8_to_euc_E8B2[] = {
0, 0, 0x6C3A, 0, 0, 0x6C3C, 0xDE7E, 0xDF21,
0, 0x6C3B, 0x6C3D, 0xDF22, 0x4B46, 0x6C3E, 0x6C3F, 0,
0xDF23, 0, 0xDF24, 0xDF25, 0x6C40, 0, 0, 0,
@@ -5489,7 +5307,7 @@ static const unsigned short utf8_to_euc_E8B2[] = {
0x4C63, 0, 0x6C47, 0x6C48, 0x352E, 0, 0x6C4A, 0x4763,
0x425F, 0xDF2A, 0xDF2B, 0x4871, 0x453D, 0x6C46, 0, 0x4B47,
};
-static const unsigned short utf8_to_euc_E8B3[] = {
+const unsigned short utf8_to_euc_E8B3[] = {
0x326C, 0x6C4C, 0x4F28, 0x4442, 0x4F45, 0xDF2C, 0xDF2D, 0x3B71,
0x6C4B, 0xDF2E, 0x4231, 0xDF2F, 0, 0x6C5C, 0x4128, 0xDF30,
0, 0x4678, 0, 0x4950, 0, 0xDF32, 0xDF31, 0,
@@ -5499,7 +5317,7 @@ static const unsigned short utf8_to_euc_E8B3[] = {
0xDF39, 0, 0xDF3A, 0, 0xF467, 0xDF3B, 0, 0xDF3C,
0xDF3D, 0, 0x6C51, 0x6C52, 0x3958, 0x6C50, 0xDF3E, 0xDF3F,
};
-static const unsigned short utf8_to_euc_E8B4[] = {
+const unsigned short utf8_to_euc_E8B4[] = {
0, 0xDF40, 0, 0xDF41, 0x6C53, 0x6C54, 0, 0x6C56,
0x4223, 0xDF42, 0x6C55, 0x3466, 0, 0x6C58, 0, 0x6C57,
0x6C59, 0, 0xDF43, 0x6C5B, 0x6C5D, 0, 0x6C5E, 0xDF44,
@@ -5509,7 +5327,7 @@ static const unsigned short utf8_to_euc_E8B4[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E8B5[] = {
+const unsigned short utf8_to_euc_E8B5[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -5519,7 +5337,7 @@ static const unsigned short utf8_to_euc_E8B5[] = {
0x4176, 0x6C61, 0, 0x6C62, 0x496B, 0, 0xF468, 0x352F,
0, 0, 0, 0, 0, 0, 0, 0xDF4A,
};
-static const unsigned short utf8_to_euc_E8B6[] = {
+const unsigned short utf8_to_euc_E8B6[] = {
0, 0x6C63, 0xDF4B, 0, 0xDF4C, 0x4436, 0, 0,
0xDF4D, 0, 0x315B, 0, 0, 0xDF4E, 0, 0,
0xDF4F, 0xDF50, 0, 0, 0, 0xDF51, 0, 0,
@@ -5529,7 +5347,7 @@ static const unsigned short utf8_to_euc_E8B6[] = {
0, 0, 0xDF59, 0x422D, 0, 0xDF5A, 0, 0xDF5B,
0, 0xDF5C, 0x6C67, 0xDF5D, 0xDF6F, 0, 0x6C66, 0,
};
-static const unsigned short utf8_to_euc_E8B7[] = {
+const unsigned short utf8_to_euc_E8B7[] = {
0xDF5E, 0, 0x6C65, 0, 0, 0xDF5F, 0xDF60, 0xDF61,
0xDF62, 0, 0xDF63, 0x6C6D, 0x6C6B, 0, 0xDF64, 0x6C68,
0, 0xDF65, 0, 0, 0xDF66, 0xDF67, 0x6C6A, 0xDF68,
@@ -5539,7 +5357,7 @@ static const unsigned short utf8_to_euc_E8B7[] = {
0xDF6E, 0xDF70, 0xDF71, 0x4437, 0xDF72, 0x4129, 0, 0,
0, 0, 0, 0, 0x6C72, 0xDF73, 0, 0x6C75,
};
-static const unsigned short utf8_to_euc_E8B8[] = {
+const unsigned short utf8_to_euc_E8B8[] = {
0, 0xDF74, 0, 0, 0xDF75, 0xDF76, 0xDF77, 0,
0x6C73, 0x6C74, 0x4D59, 0xDF78, 0, 0, 0, 0x4627,
0x6C78, 0xDF79, 0, 0, 0xDF7A, 0, 0xDF7B, 0,
@@ -5549,7 +5367,7 @@ static const unsigned short utf8_to_euc_E8B8[] = {
0x6C7C, 0xE024, 0, 0xE025, 0x6C7D, 0x6C7B, 0xE026, 0xE027,
0xE028, 0xE029, 0, 0, 0, 0xE02A, 0, 0,
};
-static const unsigned short utf8_to_euc_E8B9[] = {
+const unsigned short utf8_to_euc_E8B9[] = {
0xE02B, 0xE02C, 0x6C7A, 0, 0x447D, 0, 0, 0x6D21,
0x6D25, 0x6D22, 0x6C7E, 0xE02D, 0x6D23, 0xE02E, 0xE02F, 0xE030,
0x6D24, 0, 0, 0, 0xE031, 0x6D2B, 0, 0,
@@ -5559,7 +5377,7 @@ static const unsigned short utf8_to_euc_E8B9[] = {
0xE03C, 0xE03D, 0x6D2D, 0, 0x3D33, 0, 0x6D2C, 0,
0, 0xE03E, 0xE03F, 0xE040, 0x6D2E, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E8BA[] = {
+const unsigned short utf8_to_euc_E8BA[] = {
0, 0x6D2F, 0xE041, 0xE042, 0x6D32, 0x6D31, 0, 0x6D30,
0, 0xE043, 0x6D34, 0x6D33, 0, 0x4C76, 0, 0,
0xE044, 0x6D36, 0xE045, 0x6D35, 0x6D37, 0xE046, 0, 0,
@@ -5569,7 +5387,7 @@ static const unsigned short utf8_to_euc_E8BA[] = {
0x6D3C, 0x6D3E, 0, 0xE050, 0, 0xE051, 0, 0,
0, 0, 0xE052, 0xE053, 0, 0, 0x6D3F, 0,
};
-static const unsigned short utf8_to_euc_E8BB[] = {
+const unsigned short utf8_to_euc_E8BB[] = {
0xE054, 0xE055, 0, 0xE056, 0xE057, 0x6D40, 0x6D3D, 0xE058,
0x6D41, 0, 0x3C56, 0x6D42, 0x3530, 0x3733, 0, 0xE059,
0, 0xE05A, 0x382E, 0, 0xE05B, 0, 0, 0,
@@ -5579,7 +5397,7 @@ static const unsigned short utf8_to_euc_E8BB[] = {
0xE05F, 0xE060, 0, 0, 0, 0, 0, 0xE061,
0x3C34, 0xE062, 0xE063, 0x6D46, 0x6D45, 0x375A, 0x6D48, 0,
};
-static const unsigned short utf8_to_euc_E8BC[] = {
+const unsigned short utf8_to_euc_E8BC[] = {
0xE065, 0, 0xE066, 0x3353, 0, 0x6D4A, 0, 0xE067,
0xE068, 0x3A5C, 0x6D49, 0, 0x6D52, 0, 0, 0xE069,
0xE06A, 0, 0x6D4C, 0x6D4E, 0x4A65, 0x6D4B, 0xE06B, 0xE06C,
@@ -5589,7 +5407,7 @@ static const unsigned short utf8_to_euc_E8BC[] = {
0, 0, 0, 0x6D54, 0xE078, 0xE079, 0xE07A, 0xE07B,
0x4D22, 0x6D56, 0xE07C, 0x6D55, 0, 0, 0x6D59, 0x4D41,
};
-static const unsigned short utf8_to_euc_E8BD[] = {
+const unsigned short utf8_to_euc_E8BD[] = {
0xE07D, 0xE07E, 0x6D58, 0xE121, 0x336D, 0x6D57, 0x6D5C, 0xE122,
0, 0x6D5B, 0, 0, 0x6D5A, 0x4532, 0x6D5D, 0xE123,
0, 0xE124, 0xE125, 0xE126, 0xE127, 0xE128, 0, 0x6D5E,
@@ -5599,7 +5417,7 @@ static const unsigned short utf8_to_euc_E8BD[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E8BE[] = {
+const unsigned short utf8_to_euc_E8BE[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -5609,7 +5427,7 @@ static const unsigned short utf8_to_euc_E8BE[] = {
0x4324, 0x3F2B, 0x4740, 0, 0, 0xE133, 0xE134, 0x6D68,
0xE135, 0, 0x4A55, 0x4454, 0x397E, 0, 0xE136, 0x4329,
};
-static const unsigned short utf8_to_euc_E8BF[] = {
+const unsigned short utf8_to_euc_E8BF[] = {
0xE137, 0xE138, 0x312A, 0, 0x4B78, 0x3F57, 0xE139, 0,
0, 0, 0xE13A, 0xE13B, 0, 0xE13C, 0x375E, 0,
0xE13D, 0x3661, 0xE13E, 0xE13F, 0x4A56, 0xE140, 0, 0,
@@ -5619,7 +5437,7 @@ static const unsigned short utf8_to_euc_E8BF[] = {
0x3D52, 0xE146, 0, 0, 0x6D6F, 0xE147, 0xE148, 0x4C42,
0x6D7E, 0x6D71, 0x6D72, 0xE149, 0, 0x4449, 0xE14A, 0,
};
-static const unsigned short utf8_to_euc_E980[] = {
+const unsigned short utf8_to_euc_E980[] = {
0x4260, 0x4177, 0xE14B, 0x4628, 0xE14C, 0x6D70, 0x3555, 0,
0xE14D, 0, 0, 0x6D79, 0xE14E, 0x6D76, 0x6E25, 0x4629,
0x4360, 0x6D73, 0, 0x447E, 0x4553, 0x6D74, 0x6D78, 0x3F60,
@@ -5629,7 +5447,7 @@ static const unsigned short utf8_to_euc_E980[] = {
0, 0x3D35, 0x3F4A, 0xE157, 0xE158, 0x6D7C, 0x6D7B, 0xE159,
0x306F, 0x6D7D, 0, 0, 0x492F, 0, 0x6E27, 0xE15A,
};
-static const unsigned short utf8_to_euc_E981[] = {
+const unsigned short utf8_to_euc_E981[] = {
0, 0x465B, 0x3F6B, 0xE15B, 0xE15C, 0x4359, 0, 0x3678,
0, 0x6E26, 0x4D37, 0x313F, 0xE15D, 0x4A57, 0x3261, 0x6E21,
0x6E22, 0x6E23, 0x6E24, 0x463B, 0x4323, 0x3063, 0x6E28, 0,
@@ -5639,7 +5457,7 @@ static const unsigned short utf8_to_euc_E981[] = {
0xE164, 0, 0x6E2F, 0, 0xE165, 0x3D65, 0x6E2D, 0x412B,
0x412A, 0xE166, 0x3064, 0, 0x4E4B, 0x6E31, 0, 0x4872,
};
-static const unsigned short utf8_to_euc_E982[] = {
+const unsigned short utf8_to_euc_E982[] = {
0x6E33, 0x6E32, 0x6E30, 0x6364, 0x3454, 0xE167, 0, 0x6D6E,
0xE168, 0x6E35, 0x6E34, 0xE169, 0xE16A, 0, 0xE16B, 0x6E36,
0xE16C, 0x4D38, 0, 0, 0, 0xE16D, 0, 0xE16E,
@@ -5649,7 +5467,7 @@ static const unsigned short utf8_to_euc_E982[] = {
0xE176, 0x6E39, 0xE177, 0xE178, 0xE179, 0x6E3A, 0xE17A, 0,
0x4521, 0, 0, 0, 0, 0xE17B, 0xE17D, 0,
};
-static const unsigned short utf8_to_euc_E983[] = {
+const unsigned short utf8_to_euc_E983[] = {
0, 0x306A, 0, 0xE17E, 0xE221, 0xE222, 0, 0xE223,
0xE224, 0, 0x3959, 0, 0xE17C, 0, 0x4F3A, 0,
0, 0, 0xE22D, 0, 0, 0xE225, 0, 0xE226,
@@ -5659,7 +5477,7 @@ static const unsigned short utf8_to_euc_E983[] = {
0xE231, 0, 0, 0, 0xE232, 0x4D39, 0xE22E, 0x363F,
0, 0, 0, 0, 0, 0x4554, 0xE233, 0xE234,
};
-static const unsigned short utf8_to_euc_E984[] = {
+const unsigned short utf8_to_euc_E984[] = {
0xE235, 0, 0x6E3F, 0, 0xE236, 0xE237, 0xE238, 0,
0xE239, 0, 0, 0, 0, 0xE23A, 0, 0,
0xE23B, 0, 0x6E40, 0, 0xE23C, 0xF46E, 0xE23D, 0xE23E,
@@ -5669,7 +5487,7 @@ static const unsigned short utf8_to_euc_E984[] = {
0x6E43, 0xE24B, 0x6E42, 0, 0xE24C, 0, 0xE24D, 0xE24E,
0, 0xE24F, 0xE250, 0, 0xE251, 0xE252, 0, 0,
};
-static const unsigned short utf8_to_euc_E985[] = {
+const unsigned short utf8_to_euc_E985[] = {
0, 0, 0, 0xE253, 0, 0, 0, 0xE254,
0xE255, 0x4653, 0x6E44, 0x3D36, 0x3C60, 0x475B, 0x4371, 0xE256,
0, 0, 0x3C72, 0xE257, 0x3F6C, 0, 0x6E45, 0xE258,
@@ -5679,7 +5497,7 @@ static const unsigned short utf8_to_euc_E985[] = {
0, 0, 0x6E4B, 0x6E4A, 0xE260, 0x395A, 0, 0x3973,
0x3B40, 0xE261, 0xE262, 0xE263, 0, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E986[] = {
+const unsigned short utf8_to_euc_E986[] = {
0, 0xE264, 0x6E4E, 0xE265, 0, 0xE266, 0xE267, 0x3D66,
0, 0x6E4D, 0xE268, 0x6E4C, 0, 0x4269, 0xE269, 0,
0x386F, 0xE26A, 0x4043, 0xE26B, 0xE26C, 0xE26D, 0, 0x4830,
@@ -5689,7 +5507,7 @@ static const unsigned short utf8_to_euc_E986[] = {
0xE276, 0xE277, 0xE278, 0xE279, 0x6E54, 0x6E53, 0xE27A, 0,
0x3E7A, 0, 0x6E55, 0xE27B, 0xE27C, 0xE27D, 0, 0xE27E,
};
-static const unsigned short utf8_to_euc_E987[] = {
+const unsigned short utf8_to_euc_E987[] = {
0x6E56, 0x6E57, 0xE321, 0xE322, 0, 0xE323, 0x4850, 0x3A53,
0x3C61, 0x6E58, 0, 0x6E59, 0x4E24, 0x3D45, 0x4C6E, 0x4E4C,
0x6E5A, 0x3662, 0, 0xE324, 0xE325, 0, 0x6E5B, 0xE326,
@@ -5699,7 +5517,7 @@ static const unsigned short utf8_to_euc_E987[] = {
0xE332, 0xE333, 0, 0, 0, 0x6E60, 0x6E61, 0xE334,
0, 0xE335, 0, 0xE336, 0x6E5F, 0xE337, 0, 0x6E63,
};
-static const unsigned short utf8_to_euc_E988[] = {
+const unsigned short utf8_to_euc_E988[] = {
0xE338, 0xE339, 0, 0, 0xE33A, 0xE33B, 0xE33C, 0xE33D,
0, 0xE33E, 0xE33F, 0, 0xE340, 0x465F, 0x3343, 0,
0xE341, 0x6E67, 0xE342, 0xE343, 0x6E64, 0x6E66, 0xE344, 0,
@@ -5709,7 +5527,7 @@ static const unsigned short utf8_to_euc_E988[] = {
0xE34F, 0, 0, 0xE350, 0x4E6B, 0xE351, 0xE352, 0x385A,
0xE353, 0xE354, 0xE355, 0, 0xE356, 0, 0xE357, 0x6E6F,
};
-static const unsigned short utf8_to_euc_E989[] = {
+const unsigned short utf8_to_euc_E989[] = {
0xE358, 0, 0xE359, 0xE35A, 0x4534, 0x6E6A, 0xE35B, 0xE35C,
0x6E6D, 0x6E6B, 0xE35D, 0x6E70, 0, 0xE35E, 0xE35F, 0xE360,
0x6E71, 0xE361, 0, 0, 0, 0, 0, 0x6E69,
@@ -5719,7 +5537,7 @@ static const unsigned short utf8_to_euc_E989[] = {
0xE36E, 0x395B, 0, 0, 0, 0xE36F, 0xE370, 0xE371,
0xE372, 0xE373, 0, 0xE374, 0xE375, 0xE376, 0x4B48, 0xE377,
};
-static const unsigned short utf8_to_euc_E98A[] = {
+const unsigned short utf8_to_euc_E98A[] = {
0x3664, 0, 0, 0x3D46, 0, 0x463C, 0, 0,
0xE378, 0xE379, 0xE37A, 0, 0, 0xE37B, 0xE37C, 0,
0, 0x412D, 0xE37D, 0x6E74, 0, 0x6E6E, 0x6E73, 0xE37E,
@@ -5729,7 +5547,7 @@ static const unsigned short utf8_to_euc_E98A[] = {
0, 0, 0xE42A, 0, 0, 0, 0xE42B, 0x6E79,
0xE42C, 0x6E78, 0xE42D, 0xE42E, 0xE42F, 0xE430, 0, 0xE431,
};
-static const unsigned short utf8_to_euc_E98B[] = {
+const unsigned short utf8_to_euc_E98B[] = {
0xE432, 0xE433, 0xE434, 0xE435, 0, 0xE436, 0xE437, 0xE438,
0xE439, 0, 0, 0xE43A, 0xE43B, 0xE43C, 0xE43D, 0x6E77,
0xE43E, 0, 0x4B2F, 0xE43F, 0, 0xE440, 0, 0xE441,
@@ -5739,7 +5557,7 @@ static const unsigned short utf8_to_euc_E98B[] = {
0xE44F, 0, 0x4946, 0x4372, 0, 0, 0, 0,
0x3578, 0xE450, 0x6E7C, 0xE451, 0x395D, 0, 0, 0xE452,
};
-static const unsigned short utf8_to_euc_E98C[] = {
+const unsigned short utf8_to_euc_E98C[] = {
0xE453, 0, 0xE454, 0, 0, 0, 0x3B2C, 0,
0xE455, 0, 0, 0, 0, 0xE456, 0, 0x6E7B,
0x3F6D, 0xE457, 0, 0, 0xE458, 0xE459, 0, 0,
@@ -5749,7 +5567,7 @@ static const unsigned short utf8_to_euc_E98C[] = {
0, 0, 0x4F3F, 0xE464, 0xE465, 0x6F26, 0xE466, 0xE467,
0, 0, 0x6F25, 0x6F27, 0, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E98D[] = {
+const unsigned short utf8_to_euc_E98D[] = {
0, 0, 0, 0, 0x6E7D, 0, 0, 0xE468,
0xE469, 0xE46A, 0, 0x4669, 0, 0x4555, 0, 0,
0xE46B, 0xE46C, 0xE46D, 0, 0x4457, 0xE46E, 0x6F2C, 0xE46F,
@@ -5759,7 +5577,7 @@ static const unsigned short utf8_to_euc_E98D[] = {
0xE47A, 0xE47B, 0, 0xE47C, 0xE47D, 0x3830, 0xE47E, 0,
0, 0, 0xE521, 0, 0x6F2A, 0xE522, 0x3E61, 0xE523,
};
-static const unsigned short utf8_to_euc_E98E[] = {
+const unsigned short utf8_to_euc_E98E[] = {
0xE524, 0xE525, 0xE526, 0, 0, 0, 0, 0,
0xE527, 0, 0xE528, 0xE529, 0x3379, 0xE52A, 0, 0xE52B,
0, 0, 0xE52C, 0, 0x6F30, 0xE52D, 0x3A3F, 0x4179,
@@ -5769,7 +5587,7 @@ static const unsigned short utf8_to_euc_E98E[] = {
0x6F2D, 0, 0, 0, 0xE537, 0xE538, 0xE539, 0,
0, 0x6F31, 0xE53A, 0, 0, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E98F[] = {
+const unsigned short utf8_to_euc_E98F[] = {
0, 0xE53C, 0, 0x6F37, 0xE53D, 0xE53E, 0xE53F, 0xE540,
0x6F3A, 0xE541, 0xE542, 0xE543, 0xE544, 0xE545, 0, 0,
0x6F39, 0x452D, 0, 0xE546, 0, 0, 0x6F32, 0x6F33,
@@ -5779,7 +5597,7 @@ static const unsigned short utf8_to_euc_E98F[] = {
0, 0, 0, 0, 0, 0, 0, 0xE54F,
0xE550, 0xE54E, 0xE551, 0xE552, 0, 0xE553, 0, 0,
};
-static const unsigned short utf8_to_euc_E990[] = {
+const unsigned short utf8_to_euc_E990[] = {
0, 0xE554, 0xE555, 0x6F3F, 0xE556, 0, 0, 0x6F40,
0xE557, 0xE558, 0, 0, 0, 0xE559, 0xE55A, 0xE55B,
0x6F41, 0, 0, 0x6F3E, 0x6F3D, 0xE55C, 0xE55D, 0xE55E,
@@ -5789,7 +5607,7 @@ static const unsigned short utf8_to_euc_E990[] = {
0, 0xE562, 0xE563, 0xE564, 0xE565, 0x6F44, 0x6F42, 0,
0x4278, 0, 0x6F46, 0xE566, 0, 0xE568, 0, 0xE567,
};
-static const unsigned short utf8_to_euc_E991[] = {
+const unsigned short utf8_to_euc_E991[] = {
0, 0x6F47, 0, 0xE569, 0x6F49, 0xE56A, 0, 0,
0xE56B, 0, 0xE56C, 0, 0xE56D, 0, 0, 0,
0, 0x3455, 0x6F48, 0x4C7A, 0, 0xE56E, 0, 0,
@@ -5799,7 +5617,7 @@ static const unsigned short utf8_to_euc_E991[] = {
0x6F50, 0xE579, 0xE57A, 0, 0, 0x6F51, 0, 0x6F52,
0, 0, 0, 0, 0x6F55, 0x6F53, 0x6F56, 0x6F58,
};
-static const unsigned short utf8_to_euc_E992[] = {
+const unsigned short utf8_to_euc_E992[] = {
0, 0x6F57, 0, 0xE57C, 0xE57B, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -5809,7 +5627,7 @@ static const unsigned short utf8_to_euc_E992[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E995[] = {
+const unsigned short utf8_to_euc_E995[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -5819,7 +5637,7 @@ static const unsigned short utf8_to_euc_E995[] = {
0, 0, 0, 0, 0, 0, 0, 0x4439,
0xE57D, 0xE57E, 0, 0, 0, 0, 0xE621, 0,
};
-static const unsigned short utf8_to_euc_E996[] = {
+const unsigned short utf8_to_euc_E996[] = {
0x4C67, 0, 0x6F59, 0x412E, 0xE622, 0, 0, 0x6F5A,
0xE623, 0x4A44, 0x6F5B, 0x332B, 0xE624, 0xE625, 0xE626, 0x313C,
0, 0x3457, 0xF471, 0x3456, 0x6F5C, 0, 0x6F5D, 0,
@@ -5829,7 +5647,7 @@ static const unsigned short utf8_to_euc_E996[] = {
0, 0, 0x315C, 0, 0xE62F, 0, 0xE630, 0,
0, 0x6F66, 0xE631, 0x6F65, 0x6F64, 0xE632, 0x6F67, 0xE633,
};
-static const unsigned short utf8_to_euc_E997[] = {
+const unsigned short utf8_to_euc_E997[] = {
0, 0, 0, 0x6F6A, 0, 0, 0xE634, 0x3047,
0xE635, 0xE636, 0x6F68, 0xE637, 0x6F6C, 0x6F6B, 0, 0,
0xE638, 0xE639, 0xE63A, 0xE63B, 0x6F6E, 0x6F6D, 0x6F6F, 0,
@@ -5839,7 +5657,7 @@ static const unsigned short utf8_to_euc_E997[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E998[] = {
+const unsigned short utf8_to_euc_E998[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -5849,7 +5667,7 @@ static const unsigned short utf8_to_euc_E998[] = {
0, 0xE64B, 0x4B49, 0xE64C, 0, 0, 0, 0xE64D,
0xE64E, 0xE64F, 0xE650, 0x414B, 0xE651, 0xE652, 0, 0x3024,
};
-static const unsigned short utf8_to_euc_E999[] = {
+const unsigned short utf8_to_euc_E999[] = {
0x424B, 0xE653, 0x6F78, 0, 0x496D, 0, 0, 0,
0, 0, 0, 0x6F7B, 0x6F79, 0x395F, 0, 0x6F7A,
0x3842, 0, 0xE654, 0, 0xE655, 0, 0xE656, 0xE657,
@@ -5859,7 +5677,7 @@ static const unsigned short utf8_to_euc_E999[] = {
0x3122, 0, 0x7024, 0x4444, 0xE65B, 0x4E4D, 0x462B, 0x6F7C,
0x4E26, 0, 0x3831, 0xE65C, 0xE65D, 0x4D5B, 0xE65E, 0xE65F,
};
-static const unsigned short utf8_to_euc_E99A[] = {
+const unsigned short utf8_to_euc_E99A[] = {
0, 0xE660, 0xE661, 0xE662, 0xE663, 0x3679, 0x4E34, 0,
0x3728, 0xE664, 0x4262, 0x6721, 0, 0x7026, 0x332C, 0x3F6F,
0, 0xE665, 0, 0, 0x3356, 0x7028, 0xE666, 0x7029,
@@ -5869,7 +5687,7 @@ static const unsigned short utf8_to_euc_E99A[] = {
0x702E, 0x702C, 0x702D, 0xE670, 0x702F, 0, 0x7030, 0x4E6C,
0x7031, 0x7032, 0xE671, 0x4049, 0x483B, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E99B[] = {
+const unsigned short utf8_to_euc_E99B[] = {
0x3F7D, 0x3467, 0, 0, 0x4D3A, 0x326D, 0x3D38, 0x385B,
0, 0x7035, 0xE672, 0x7034, 0x3B73, 0x7036, 0x7033, 0,
0, 0x3B28, 0xE673, 0, 0, 0x703A, 0x6A2D, 0,
@@ -5879,7 +5697,7 @@ static const unsigned short utf8_to_euc_E99B[] = {
0x4A37, 0xE67C, 0x3140, 0, 0, 0, 0x4E6D, 0x4D6B,
0, 0x703B, 0xE67D, 0x4545, 0, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E99C[] = {
+const unsigned short utf8_to_euc_E99C[] = {
0x3C7B, 0, 0xE67E, 0xE721, 0x703C, 0xE722, 0x703D, 0x3F4C,
0x703E, 0xE723, 0x4E6E, 0, 0, 0x7039, 0x7040, 0x7042,
0, 0x7041, 0, 0x703F, 0, 0, 0x7043, 0,
@@ -5889,7 +5707,7 @@ static const unsigned short utf8_to_euc_E99C[] = {
0x7047, 0xE72B, 0x4F2A, 0xE72C, 0, 0, 0, 0,
0x5B31, 0x7048, 0, 0xF474, 0, 0x7049, 0x704A, 0,
};
-static const unsigned short utf8_to_euc_E99D[] = {
+const unsigned short utf8_to_euc_E99D[] = {
0, 0xE72D, 0x704E, 0xE72E, 0x704B, 0, 0x704C, 0,
0x704D, 0x704F, 0xE72F, 0, 0, 0xF475, 0xE730, 0xE731,
0, 0xF476, 0x4044, 0, 0, 0xE732, 0x4C77, 0xE733,
@@ -5899,7 +5717,7 @@ static const unsigned short utf8_to_euc_E99D[] = {
0, 0x7057, 0, 0xE73B, 0x3724, 0, 0xE73C, 0xE73D,
0xE73E, 0x7058, 0x705C, 0xE73F, 0x705A, 0xE740, 0, 0xE741,
};
-static const unsigned short utf8_to_euc_E99E[] = {
+const unsigned short utf8_to_euc_E99E[] = {
0xE742, 0x705B, 0, 0, 0x3373, 0x7059, 0x705D, 0,
0, 0xE743, 0, 0x705E, 0, 0x3048, 0, 0x705F,
0x7060, 0, 0, 0, 0, 0xE744, 0xE745, 0xE746,
@@ -5909,7 +5727,7 @@ static const unsigned short utf8_to_euc_E99E[] = {
0, 0xE74E, 0xE74F, 0x7065, 0x7066, 0xE750, 0xE751, 0,
0xE752, 0xE753, 0xE754, 0, 0xE755, 0, 0xE756, 0xE757,
};
-static const unsigned short utf8_to_euc_E99F[] = {
+const unsigned short utf8_to_euc_E99F[] = {
0, 0xE758, 0, 0x7067, 0xE759, 0xE75A, 0x7068, 0xE75B,
0x7069, 0xE75C, 0xE75D, 0x706A, 0xE75E, 0xE75F, 0xE760, 0,
0xE761, 0xE762, 0, 0x345A, 0xE763, 0, 0, 0xE764,
@@ -5919,7 +5737,7 @@ static const unsigned short utf8_to_euc_E99F[] = {
0, 0xE76E, 0x706E, 0x323B, 0xE76F, 0x7071, 0x7070, 0xE770,
0xE771, 0, 0xE772, 0x3124, 0, 0, 0, 0x3641,
};
-static const unsigned short utf8_to_euc_E9A0[] = {
+const unsigned short utf8_to_euc_E9A0[] = {
0, 0x4A47, 0x443A, 0x3A22, 0, 0x3960, 0x3D67, 0xE773,
0x3F5C, 0, 0xE774, 0, 0x7073, 0xE776, 0xE777, 0x7072,
0x4D42, 0x3468, 0x4852, 0x465C, 0xE778, 0, 0xE779, 0x3F7C,
@@ -5929,7 +5747,7 @@ static const unsigned short utf8_to_euc_E9A0[] = {
0xE824, 0, 0xE825, 0xE826, 0x3150, 0xE827, 0, 0x7077,
0x7074, 0, 0, 0x4951, 0x4D6A, 0x7078, 0xE829, 0,
};
-static const unsigned short utf8_to_euc_E9A1[] = {
+const unsigned short utf8_to_euc_E9A1[] = {
0, 0, 0, 0, 0xE82A, 0, 0x7079, 0xE82B,
0, 0, 0xE82C, 0x707B, 0x426A, 0x335B, 0x335C, 0x707A,
0, 0xE82D, 0xE82E, 0xE82F, 0x3469, 0x3832, 0xE830, 0xE831,
@@ -5939,7 +5757,7 @@ static const unsigned short utf8_to_euc_E9A1[] = {
0x707E, 0x7121, 0, 0x7123, 0x7122, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E9A2[] = {
+const unsigned short utf8_to_euc_E9A2[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -5949,7 +5767,7 @@ static const unsigned short utf8_to_euc_E9A2[] = {
0xE83D, 0x7126, 0, 0, 0xE83E, 0, 0x7127, 0xE83F,
0xE840, 0, 0xE841, 0xE842, 0, 0, 0, 0xE843,
};
-static const unsigned short utf8_to_euc_E9A3[] = {
+const unsigned short utf8_to_euc_E9A3[] = {
0, 0, 0xE844, 0x7129, 0x7128, 0xE845, 0x712A, 0,
0xE846, 0, 0, 0, 0xE847, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -5959,7 +5777,7 @@ static const unsigned short utf8_to_euc_E9A3[] = {
0, 0, 0x307B, 0xE84E, 0x303B, 0, 0xE84F, 0,
0, 0, 0, 0, 0x3B74, 0x4B30, 0x3E7E, 0,
};
-static const unsigned short utf8_to_euc_E9A4[] = {
+const unsigned short utf8_to_euc_E9A4[] = {
0, 0, 0xE850, 0x712D, 0, 0x4C5F, 0, 0xE851,
0xE852, 0x712E, 0x4D5C, 0, 0x3142, 0, 0, 0,
0x3B41, 0xE853, 0x712F, 0x326E, 0x7130, 0xE854, 0xE855, 0xE856,
@@ -5969,7 +5787,7 @@ static const unsigned short utf8_to_euc_E9A4[] = {
0, 0xE85F, 0xE860, 0xE861, 0xE862, 0xE863, 0, 0,
0, 0xE864, 0xE865, 0xE866, 0xE867, 0x7139, 0x713A, 0,
};
-static const unsigned short utf8_to_euc_E9A5[] = {
+const unsigned short utf8_to_euc_E9A5[] = {
0xE868, 0xE869, 0x713B, 0, 0, 0x713D, 0xE86A, 0xE86B,
0xE86C, 0x713C, 0, 0x713F, 0x7142, 0xE86D, 0xE86E, 0,
0x713E, 0x7140, 0x7141, 0, 0xE86F, 0x7143, 0, 0x3642,
@@ -5979,7 +5797,7 @@ static const unsigned short utf8_to_euc_E9A5[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E9A6[] = {
+const unsigned short utf8_to_euc_E9A6[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0x3C73, 0x7144,
@@ -5989,7 +5807,7 @@ static const unsigned short utf8_to_euc_E9A6[] = {
0xE87B, 0xE87C, 0xE87D, 0x435A, 0x466B, 0xE87E, 0, 0,
0, 0xE921, 0xE922, 0, 0x7149, 0xE923, 0, 0xE924,
};
-static const unsigned short utf8_to_euc_E9A7[] = {
+const unsigned short utf8_to_euc_E9A7[] = {
0, 0x477D, 0, 0xE925, 0x424C, 0x3158, 0x366E, 0,
0x366F, 0xE926, 0, 0, 0, 0, 0, 0,
0x4373, 0x714E, 0x3670, 0xE927, 0xE928, 0x326F, 0, 0,
@@ -5999,7 +5817,7 @@ static const unsigned short utf8_to_euc_E9A7[] = {
0xE931, 0x7151, 0x7152, 0, 0xE932, 0xE933, 0, 0,
0x7154, 0xE934, 0, 0x7153, 0, 0xE935, 0xE936, 0x3D59,
};
-static const unsigned short utf8_to_euc_E9A8[] = {
+const unsigned short utf8_to_euc_E9A8[] = {
0, 0x7155, 0xE937, 0xE938, 0xE939, 0x7157, 0, 0,
0, 0, 0, 0xE93A, 0xE93B, 0, 0x3533, 0x7156,
0xE93C, 0xE93D, 0x417B, 0x3833, 0, 0, 0xE93E, 0,
@@ -6009,7 +5827,7 @@ static const unsigned short utf8_to_euc_E9A8[] = {
0x462D, 0, 0, 0xE947, 0, 0xE948, 0xE949, 0x715B,
0xE94A, 0, 0, 0, 0, 0, 0x7160, 0,
};
-static const unsigned short utf8_to_euc_E9A9[] = {
+const unsigned short utf8_to_euc_E9A9[] = {
0x715E, 0xE94C, 0x715D, 0x715F, 0xE94D, 0x715C, 0, 0xE94B,
0, 0, 0xE94E, 0xE94F, 0xE950, 0x7162, 0xE951, 0,
0, 0xE952, 0, 0, 0xE953, 0x7161, 0xE954, 0x7164,
@@ -6019,7 +5837,7 @@ static const unsigned short utf8_to_euc_E9A9[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E9AA[] = {
+const unsigned short utf8_to_euc_E9AA[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -6029,7 +5847,7 @@ static const unsigned short utf8_to_euc_E9AA[] = {
0x716D, 0, 0xE95A, 0, 0xE95B, 0xE95C, 0xE95D, 0,
0x333C, 0xE95E, 0, 0xE95F, 0x716E, 0, 0xE960, 0xE961,
};
-static const unsigned short utf8_to_euc_E9AB[] = {
+const unsigned short utf8_to_euc_E9AB[] = {
0x716F, 0xE962, 0, 0xE963, 0x3F71, 0, 0xE964, 0,
0xE965, 0, 0, 0, 0, 0, 0xE966, 0x7170,
0xE967, 0x7171, 0xE968, 0x7172, 0x7173, 0xE969, 0xE96A, 0xE96B,
@@ -6039,7 +5857,7 @@ static const unsigned short utf8_to_euc_E9AB[] = {
0, 0x717D, 0xE974, 0xE975, 0x717C, 0xE976, 0, 0x717E,
0, 0xE977, 0xE978, 0x7221, 0, 0xE979, 0, 0xE97A,
};
-static const unsigned short utf8_to_euc_E9AC[] = {
+const unsigned short utf8_to_euc_E9AC[] = {
0xE97B, 0xE97C, 0xE97D, 0xE97E, 0xEA21, 0xEA22, 0x7222, 0,
0xEA23, 0xEA24, 0, 0xEA25, 0xEA26, 0xEA27, 0xEA28, 0,
0xEA29, 0, 0xEA2A, 0, 0, 0, 0xEA2B, 0,
@@ -6049,7 +5867,7 @@ static const unsigned short utf8_to_euc_E9AC[] = {
0, 0x5D35, 0x722F, 0xEA33, 0xEA34, 0xEA35, 0, 0xEA36,
0, 0xEA37, 0xEA38, 0x6478, 0x3534, 0xEA39, 0, 0,
};
-static const unsigned short utf8_to_euc_E9AD[] = {
+const unsigned short utf8_to_euc_E9AD[] = {
0, 0x3321, 0x3A32, 0x7231, 0x7230, 0x4C25, 0, 0,
0xEA3A, 0, 0, 0xEA3B, 0xEA3C, 0x7233, 0x7234, 0x7232,
0, 0x7235, 0, 0, 0x4B62, 0xEA3D, 0xEA3E, 0xEA3F,
@@ -6059,7 +5877,7 @@ static const unsigned short utf8_to_euc_E9AD[] = {
0, 0, 0xF47C, 0xEA4C, 0x7237, 0xEA4D, 0, 0xEA4E,
0xEA4F, 0xEA50, 0, 0, 0, 0, 0, 0xEA51,
};
-static const unsigned short utf8_to_euc_E9AE[] = {
+const unsigned short utf8_to_euc_E9AE[] = {
0xEA52, 0, 0, 0x7239, 0xEA53, 0xEA54, 0xEA55, 0xEA56,
0, 0xEA57, 0xEA58, 0xEA59, 0, 0xEA5A, 0x303E, 0xEA5B,
0xEA5C, 0x723A, 0x4A2B, 0x7238, 0xEA5D, 0, 0x723B, 0x723C,
@@ -6069,7 +5887,7 @@ static const unsigned short utf8_to_euc_E9AE[] = {
0xEA65, 0xEA66, 0xEA67, 0, 0x7240, 0, 0, 0xEA68,
0xEA69, 0x7243, 0, 0xEA6A, 0xEA6B, 0, 0xEA6C, 0xEA6D,
};
-static const unsigned short utf8_to_euc_E9AF[] = {
+const unsigned short utf8_to_euc_E9AF[] = {
0x7241, 0xEA6E, 0, 0, 0, 0, 0x7244, 0xEA6F,
0xEA70, 0x3871, 0x7242, 0, 0, 0, 0xEA71, 0x7245,
0xEA72, 0x7246, 0x7247, 0, 0x724B, 0, 0x3B2A, 0xEA73,
@@ -6079,7 +5897,7 @@ static const unsigned short utf8_to_euc_E9AF[] = {
0x7250, 0x724F, 0x724E, 0xEA7C, 0, 0x3033, 0, 0xEA7D,
0xEA7E, 0xEB21, 0xEB22, 0, 0, 0xEB23, 0, 0xEB24,
};
-static const unsigned short utf8_to_euc_E9B0[] = {
+const unsigned short utf8_to_euc_E9B0[] = {
0xEB25, 0, 0xEB26, 0, 0x725A, 0, 0x7256, 0,
0x7257, 0x7253, 0x7259, 0xEB27, 0x7255, 0x3362, 0, 0xEB28,
0x4F4C, 0xEB29, 0x7258, 0x7254, 0x7252, 0x7251, 0xEB2A, 0,
@@ -6089,7 +5907,7 @@ static const unsigned short utf8_to_euc_E9B0[] = {
0x7260, 0xEB37, 0x7262, 0, 0, 0xEB38, 0xEB39, 0xEB3A,
0, 0x336F, 0x724D, 0x3137, 0, 0xEB3B, 0x7264, 0,
};
-static const unsigned short utf8_to_euc_E9B1[] = {
+const unsigned short utf8_to_euc_E9B1[] = {
0, 0xEB3C, 0, 0xEB3D, 0xEB3E, 0xEB3F, 0x7263, 0x7261,
0x432D, 0xEB40, 0xEB41, 0, 0, 0, 0xEB42, 0xEB43,
0xEB44, 0, 0x4B70, 0xEB45, 0xEB46, 0, 0xEB47, 0x4E5A,
@@ -6099,7 +5917,7 @@ static const unsigned short utf8_to_euc_E9B1[] = {
0xEB54, 0, 0xEB55, 0, 0, 0xEB56, 0x7268, 0xEB57,
0x7269, 0, 0, 0xEB58, 0, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E9B3[] = {
+const unsigned short utf8_to_euc_E9B3[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -6109,7 +5927,7 @@ static const unsigned short utf8_to_euc_E9B3[] = {
0x726C, 0, 0xEB5A, 0x4B31, 0x4C44, 0, 0x4650, 0xEB5B,
0, 0xEB5C, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E9B4[] = {
+const unsigned short utf8_to_euc_E9B4[] = {
0, 0, 0xEB5E, 0x7270, 0, 0, 0x7271, 0x463E,
0x726E, 0x726D, 0, 0xEB5D, 0, 0, 0x322A, 0,
0, 0xEB5F, 0x7279, 0, 0, 0x7278, 0, 0xEB60,
@@ -6119,7 +5937,7 @@ static const unsigned short utf8_to_euc_E9B4[] = {
0xEB66, 0, 0xEB67, 0xEB68, 0xEB69, 0, 0, 0,
0, 0, 0xEB6A, 0x3963, 0xEB6B, 0xEB6D, 0x727C, 0x727B,
};
-static const unsigned short utf8_to_euc_E9B5[] = {
+const unsigned short utf8_to_euc_E9B5[] = {
0, 0x727A, 0xEB6E, 0xEB6F, 0x7277, 0xEB6C, 0x727D, 0xEB70,
0x727E, 0, 0xEB71, 0, 0, 0, 0, 0,
0x7325, 0x7324, 0, 0xEB72, 0xEB73, 0, 0, 0,
@@ -6129,7 +5947,7 @@ static const unsigned short utf8_to_euc_E9B5[] = {
0xEB7B, 0, 0x7327, 0, 0, 0, 0xEB7C, 0xEB7D,
0, 0, 0x732C, 0xEB7E, 0xEC21, 0, 0xEC22, 0,
};
-static const unsigned short utf8_to_euc_E9B6[] = {
+const unsigned short utf8_to_euc_E9B6[] = {
0, 0, 0, 0xEC23, 0xEC24, 0, 0xEC25, 0x7329,
0, 0x7328, 0xEC26, 0, 0, 0xEC27, 0xEC28, 0x375C,
0, 0, 0xEC29, 0xEC2A, 0, 0xEC2B, 0xEC2C, 0xEC2D,
@@ -6139,7 +5957,7 @@ static const unsigned short utf8_to_euc_E9B6[] = {
0, 0xEC33, 0x7330, 0, 0x4461, 0xEC34, 0, 0,
0x7334, 0xEC35, 0x7335, 0x7333, 0xEC36, 0, 0, 0xEC37,
};
-static const unsigned short utf8_to_euc_E9B7[] = {
+const unsigned short utf8_to_euc_E9B7[] = {
0, 0x7332, 0x7338, 0xEC38, 0x7331, 0, 0x7336, 0xEC39,
0, 0xEC3A, 0xEC3B, 0, 0, 0, 0, 0x7337,
0, 0, 0, 0x733A, 0xEC3C, 0xEC3D, 0xEC3E, 0xEC3F,
@@ -6149,7 +5967,7 @@ static const unsigned short utf8_to_euc_E9B7[] = {
0xEC49, 0, 0x4F49, 0xEC4A, 0xEC4B, 0, 0, 0,
0x733B, 0x426B, 0x3A6D, 0, 0, 0x733F, 0xEC4C, 0,
};
-static const unsigned short utf8_to_euc_E9B8[] = {
+const unsigned short utf8_to_euc_E9B8[] = {
0, 0, 0xEC4E, 0, 0, 0, 0, 0xEC4F,
0, 0, 0xEC4D, 0, 0, 0, 0xEC50, 0,
0xEC51, 0xEC52, 0xEC53, 0, 0, 0xEC54, 0xEC55, 0,
@@ -6159,7 +5977,7 @@ static const unsigned short utf8_to_euc_E9B8[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E9B9[] = {
+const unsigned short utf8_to_euc_E9B9[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -6169,7 +5987,7 @@ static const unsigned short utf8_to_euc_E9B9[] = {
0, 0, 0, 0, 0, 0x7343, 0, 0,
0x3834, 0x7344, 0xEC59, 0xEC5A, 0xEC5B, 0x7345, 0, 0x3C2F,
};
-static const unsigned short utf8_to_euc_E9BA[] = {
+const unsigned short utf8_to_euc_E9BA[] = {
0xEC5C, 0x7346, 0xEC5D, 0xEC5E, 0xEC5F, 0xEC60, 0, 0xEC61,
0x7347, 0, 0, 0x7348, 0x7349, 0, 0xEC62, 0xEC63,
0, 0x734C, 0x734A, 0x4F3C, 0, 0x734B, 0xEC64, 0x4E6F,
@@ -6179,7 +5997,7 @@ static const unsigned short utf8_to_euc_E9BA[] = {
0xEC6D, 0, 0, 0xEC6E, 0xEC6F, 0xEC70, 0, 0,
0x7350, 0x396D, 0x4C4D, 0x4B63, 0x5677, 0, 0x5D60, 0x4B7B,
};
-static const unsigned short utf8_to_euc_E9BB[] = {
+const unsigned short utf8_to_euc_E9BB[] = {
0, 0, 0, 0, 0x322B, 0, 0xEC71, 0,
0xEC72, 0, 0, 0xEC73, 0x7354, 0x3550, 0x7355, 0x7356,
0x7357, 0xF47E, 0x3975, 0, 0x7358, 0xEC74, 0, 0,
@@ -6189,7 +6007,7 @@ static const unsigned short utf8_to_euc_E9BB[] = {
0xEC7B, 0xEC7C, 0xEC7D, 0, 0x7360, 0xEC7E, 0x7361, 0x7362,
0xED21, 0x7363, 0, 0x7364, 0x7365, 0x7366, 0, 0xED22,
};
-static const unsigned short utf8_to_euc_E9BC[] = {
+const unsigned short utf8_to_euc_E9BC[] = {
0, 0, 0xED23, 0xED24, 0, 0, 0, 0x7367,
0x7368, 0xED25, 0, 0, 0, 0, 0x4524, 0xED26,
0xED27, 0xED28, 0xED29, 0x385D, 0xED2A, 0x736A, 0xED2B, 0xED2C,
@@ -6199,7 +6017,7 @@ static const unsigned short utf8_to_euc_E9BC[] = {
0, 0xED36, 0xED37, 0, 0xED38, 0, 0, 0xED39,
0, 0xED3A, 0xED3B, 0x4921, 0xED3C, 0xED3D, 0x736D, 0xED3E,
};
-static const unsigned short utf8_to_euc_E9BD[] = {
+const unsigned short utf8_to_euc_E9BD[] = {
0, 0xED3F, 0, 0xED40, 0xED41, 0xED42, 0xED43, 0xED44,
0, 0, 0x736E, 0x6337, 0, 0, 0x6C5A, 0x706D,
0, 0, 0x736F, 0xED45, 0x7370, 0xED46, 0xED47, 0xED48,
@@ -6209,7 +6027,7 @@ static const unsigned short utf8_to_euc_E9BD[] = {
0xED52, 0xED53, 0x737A, 0xED54, 0, 0xED55, 0x737B, 0x7379,
0, 0, 0xED56, 0, 0, 0xED57, 0, 0,
};
-static const unsigned short utf8_to_euc_E9BE[] = {
+const unsigned short utf8_to_euc_E9BE[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0x4E36, 0, 0xED58,
0xED59, 0xED5A, 0xED5B, 0, 0xED5C, 0x737C, 0xED5D, 0xED5E,
@@ -6219,7 +6037,7 @@ static const unsigned short utf8_to_euc_E9BE[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_EFA4[] = {
+const unsigned short utf8_to_euc_EFA4[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -6229,7 +6047,7 @@ static const unsigned short utf8_to_euc_EFA4[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_EFA7[] = {
+const unsigned short utf8_to_euc_EFA7[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -6239,7 +6057,7 @@ static const unsigned short utf8_to_euc_EFA7[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_EFA8[] = {
+const unsigned short utf8_to_euc_EFA8[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0xF434, 0xF437,
0xF438, 0xF43D, 0xF444, 0xF447, 0xF448, 0xF44E, 0xF44F, 0xF453,
@@ -6249,7 +6067,7 @@ static const unsigned short utf8_to_euc_EFA8[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_EFBC[] = {
+const unsigned short utf8_to_euc_EFBC[] = {
0, 0x212A, 0xF42A, 0x2174, 0x2170, 0x2173, 0x2175, 0xF429,
0x214A, 0x214B, 0x2176, 0x215C, 0x2124, 0x215D, 0x2125, 0x213F,
0x2330, 0x2331, 0x2332, 0x2333, 0x2334, 0x2335, 0x2336, 0x2337,
@@ -6259,7 +6077,7 @@ static const unsigned short utf8_to_euc_EFBC[] = {
0x2350, 0x2351, 0x2352, 0x2353, 0x2354, 0x2355, 0x2356, 0x2357,
0x2358, 0x2359, 0x235A, 0x214E, 0x2140, 0x214F, 0x2130, 0x2132,
};
-static const unsigned short utf8_to_euc_EFBD[] = {
+const unsigned short utf8_to_euc_EFBD[] = {
0x212E, 0x2361, 0x2362, 0x2363, 0x2364, 0x2365, 0x2366, 0x2367,
0x2368, 0x2369, 0x236A, 0x236B, 0x236C, 0x236D, 0x236E, 0x236F,
0x2370, 0x2371, 0x2372, 0x2373, 0x2374, 0x2375, 0x2376, 0x2377,
@@ -6269,7 +6087,7 @@ static const unsigned short utf8_to_euc_EFBD[] = {
0x0E30, 0x0E31, 0x0E32, 0x0E33, 0x0E34, 0x0E35, 0x0E36, 0x0E37,
0x0E38, 0x0E39, 0x0E3A, 0x0E3B, 0x0E3C, 0x0E3D, 0x0E3E, 0x0E3F,
};
-static const unsigned short utf8_to_euc_EFBD_ms[] = {
+const unsigned short utf8_to_euc_EFBD_ms[] = {
0x212E, 0x2361, 0x2362, 0x2363, 0x2364, 0x2365, 0x2366, 0x2367,
0x2368, 0x2369, 0x236A, 0x236B, 0x236C, 0x236D, 0x236E, 0x236F,
0x2370, 0x2371, 0x2372, 0x2373, 0x2374, 0x2375, 0x2376, 0x2377,
@@ -6279,7 +6097,7 @@ static const unsigned short utf8_to_euc_EFBD_ms[] = {
0x0E30, 0x0E31, 0x0E32, 0x0E33, 0x0E34, 0x0E35, 0x0E36, 0x0E37,
0x0E38, 0x0E39, 0x0E3A, 0x0E3B, 0x0E3C, 0x0E3D, 0x0E3E, 0x0E3F,
};
-static const unsigned short utf8_to_euc_EFBE[] = {
+const unsigned short utf8_to_euc_EFBE[] = {
0x0E40, 0x0E41, 0x0E42, 0x0E43, 0x0E44, 0x0E45, 0x0E46, 0x0E47,
0x0E48, 0x0E49, 0x0E4A, 0x0E4B, 0x0E4C, 0x0E4D, 0x0E4E, 0x0E4F,
0x0E50, 0x0E51, 0x0E52, 0x0E53, 0x0E54, 0x0E55, 0x0E56, 0x0E57,
@@ -6289,7 +6107,7 @@ static const unsigned short utf8_to_euc_EFBE[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_EFBF[] = {
+const unsigned short utf8_to_euc_EFBF[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -6299,7 +6117,7 @@ static const unsigned short utf8_to_euc_EFBF[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short *const utf8_to_euc_E2[] = {
+const unsigned short *const utf8_to_euc_E2[] = {
utf8_to_euc_E280, 0, 0, 0,
utf8_to_euc_E284, utf8_to_euc_E285, utf8_to_euc_E286, utf8_to_euc_E287,
utf8_to_euc_E288, utf8_to_euc_E289, utf8_to_euc_E28A, 0,
@@ -6317,7 +6135,7 @@ static const unsigned short *const utf8_to_euc_E2[] = {
0, 0, 0, 0,
0, 0, 0, 0,
};
-static const unsigned short *const utf8_to_euc_E2_ms[] = {
+const unsigned short *const utf8_to_euc_E2_ms[] = {
utf8_to_euc_E280_ms, 0, 0, 0,
utf8_to_euc_E284, utf8_to_euc_E285, utf8_to_euc_E286, utf8_to_euc_E287,
utf8_to_euc_E288, utf8_to_euc_E289, utf8_to_euc_E28A, 0,
@@ -6335,7 +6153,7 @@ static const unsigned short *const utf8_to_euc_E2_ms[] = {
0, 0, 0, 0,
0, 0, 0, 0,
};
-static const unsigned short *const utf8_to_euc_E2_932[] = {
+const unsigned short *const utf8_to_euc_E2_932[] = {
utf8_to_euc_E280_932, 0, 0, 0,
utf8_to_euc_E284, utf8_to_euc_E285, utf8_to_euc_E286, utf8_to_euc_E287,
utf8_to_euc_E288_932, utf8_to_euc_E289, utf8_to_euc_E28A, 0,
@@ -6353,25 +6171,7 @@ static const unsigned short *const utf8_to_euc_E2_932[] = {
0, 0, 0, 0,
0, 0, 0, 0,
};
-static const unsigned short *const utf8_to_euc_E2_mac[] = {
- utf8_to_euc_E280_932, 0, 0, 0,
- utf8_to_euc_E284_mac, utf8_to_euc_E285_mac, utf8_to_euc_E286, utf8_to_euc_E287,
- utf8_to_euc_E288_mac, utf8_to_euc_E289, utf8_to_euc_E28A_mac, 0,
- utf8_to_euc_E28C, 0, 0, 0,
- 0, utf8_to_euc_E291_mac, 0, 0,
- utf8_to_euc_E294, utf8_to_euc_E295, utf8_to_euc_E296, utf8_to_euc_E297,
- utf8_to_euc_E298, utf8_to_euc_E299, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
-};
-static const unsigned short *const utf8_to_euc_E3[] = {
+const unsigned short *const utf8_to_euc_E3[] = {
utf8_to_euc_E380, utf8_to_euc_E381, utf8_to_euc_E382, utf8_to_euc_E383,
0, 0, 0, 0,
utf8_to_euc_E388, 0, utf8_to_euc_E38A, 0,
@@ -6389,7 +6189,7 @@ static const unsigned short *const utf8_to_euc_E3[] = {
0, 0, 0, 0,
0, 0, 0, 0,
};
-static const unsigned short *const utf8_to_euc_E3_932[] = {
+const unsigned short *const utf8_to_euc_E3_932[] = {
utf8_to_euc_E380_932, utf8_to_euc_E381, utf8_to_euc_E382_932, utf8_to_euc_E383,
0, 0, 0, 0,
utf8_to_euc_E388, 0, utf8_to_euc_E38A, 0,
@@ -6407,25 +6207,7 @@ static const unsigned short *const utf8_to_euc_E3_932[] = {
0, 0, 0, 0,
0, 0, 0, 0,
};
-static const unsigned short *const utf8_to_euc_E3_mac[] = {
- utf8_to_euc_E380_932, utf8_to_euc_E381, utf8_to_euc_E382_932, utf8_to_euc_E383,
- 0, 0, 0, 0,
- utf8_to_euc_E388_mac, 0, utf8_to_euc_E38A_mac, 0,
- utf8_to_euc_E38C_mac, utf8_to_euc_E38D_mac, utf8_to_euc_E38E_mac, utf8_to_euc_E38F_mac,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
-};
-static const unsigned short *const utf8_to_euc_E4[] = {
+const unsigned short *const utf8_to_euc_E4[] = {
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
@@ -6443,7 +6225,7 @@ static const unsigned short *const utf8_to_euc_E4[] = {
utf8_to_euc_E4B8, utf8_to_euc_E4B9, utf8_to_euc_E4BA, utf8_to_euc_E4BB,
utf8_to_euc_E4BC, utf8_to_euc_E4BD, utf8_to_euc_E4BE, utf8_to_euc_E4BF,
};
-static const unsigned short *const utf8_to_euc_E5[] = {
+const unsigned short *const utf8_to_euc_E5[] = {
utf8_to_euc_E580, utf8_to_euc_E581, utf8_to_euc_E582, utf8_to_euc_E583,
utf8_to_euc_E584, utf8_to_euc_E585, utf8_to_euc_E586, utf8_to_euc_E587,
utf8_to_euc_E588, utf8_to_euc_E589, utf8_to_euc_E58A, utf8_to_euc_E58B,
@@ -6461,7 +6243,7 @@ static const unsigned short *const utf8_to_euc_E5[] = {
utf8_to_euc_E5B8, utf8_to_euc_E5B9, utf8_to_euc_E5BA, utf8_to_euc_E5BB,
utf8_to_euc_E5BC, utf8_to_euc_E5BD, utf8_to_euc_E5BE, utf8_to_euc_E5BF,
};
-static const unsigned short *const utf8_to_euc_E6[] = {
+const unsigned short *const utf8_to_euc_E6[] = {
utf8_to_euc_E680, utf8_to_euc_E681, utf8_to_euc_E682, utf8_to_euc_E683,
utf8_to_euc_E684, utf8_to_euc_E685, utf8_to_euc_E686, utf8_to_euc_E687,
utf8_to_euc_E688, utf8_to_euc_E689, utf8_to_euc_E68A, utf8_to_euc_E68B,
@@ -6479,7 +6261,7 @@ static const unsigned short *const utf8_to_euc_E6[] = {
utf8_to_euc_E6B8, utf8_to_euc_E6B9, utf8_to_euc_E6BA, utf8_to_euc_E6BB,
utf8_to_euc_E6BC, utf8_to_euc_E6BD, utf8_to_euc_E6BE, utf8_to_euc_E6BF,
};
-static const unsigned short *const utf8_to_euc_E7[] = {
+const unsigned short *const utf8_to_euc_E7[] = {
utf8_to_euc_E780, utf8_to_euc_E781, utf8_to_euc_E782, utf8_to_euc_E783,
utf8_to_euc_E784, utf8_to_euc_E785, utf8_to_euc_E786, utf8_to_euc_E787,
utf8_to_euc_E788, utf8_to_euc_E789, utf8_to_euc_E78A, utf8_to_euc_E78B,
@@ -6497,7 +6279,7 @@ static const unsigned short *const utf8_to_euc_E7[] = {
utf8_to_euc_E7B8, utf8_to_euc_E7B9, utf8_to_euc_E7BA, 0,
utf8_to_euc_E7BC, utf8_to_euc_E7BD, utf8_to_euc_E7BE, utf8_to_euc_E7BF,
};
-static const unsigned short *const utf8_to_euc_E8[] = {
+const unsigned short *const utf8_to_euc_E8[] = {
utf8_to_euc_E880, utf8_to_euc_E881, utf8_to_euc_E882, utf8_to_euc_E883,
utf8_to_euc_E884, utf8_to_euc_E885, utf8_to_euc_E886, utf8_to_euc_E887,
utf8_to_euc_E888, utf8_to_euc_E889, utf8_to_euc_E88A, utf8_to_euc_E88B,
@@ -6515,7 +6297,7 @@ static const unsigned short *const utf8_to_euc_E8[] = {
utf8_to_euc_E8B8, utf8_to_euc_E8B9, utf8_to_euc_E8BA, utf8_to_euc_E8BB,
utf8_to_euc_E8BC, utf8_to_euc_E8BD, utf8_to_euc_E8BE, utf8_to_euc_E8BF,
};
-static const unsigned short *const utf8_to_euc_E9[] = {
+const unsigned short *const utf8_to_euc_E9[] = {
utf8_to_euc_E980, utf8_to_euc_E981, utf8_to_euc_E982, utf8_to_euc_E983,
utf8_to_euc_E984, utf8_to_euc_E985, utf8_to_euc_E986, utf8_to_euc_E987,
utf8_to_euc_E988, utf8_to_euc_E989, utf8_to_euc_E98A, utf8_to_euc_E98B,
@@ -6533,7 +6315,7 @@ static const unsigned short *const utf8_to_euc_E9[] = {
utf8_to_euc_E9B8, utf8_to_euc_E9B9, utf8_to_euc_E9BA, utf8_to_euc_E9BB,
utf8_to_euc_E9BC, utf8_to_euc_E9BD, utf8_to_euc_E9BE, 0,
};
-static const unsigned short *const utf8_to_euc_EF[] = {
+const unsigned short *const utf8_to_euc_EF[] = {
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
@@ -6551,7 +6333,7 @@ static const unsigned short *const utf8_to_euc_EF[] = {
0, 0, 0, 0,
utf8_to_euc_EFBC, utf8_to_euc_EFBD, utf8_to_euc_EFBE, utf8_to_euc_EFBF,
};
-static const unsigned short *const utf8_to_euc_EF_ms[] = {
+const unsigned short *const utf8_to_euc_EF_ms[] = {
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
@@ -6659,36 +6441,6 @@ const unsigned short *const utf8_to_euc_2bytes_932[] = {
0, 0, 0, 0,
0, 0, 0, 0,
};
-const unsigned short *const utf8_to_euc_2bytes_mac[] = {
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, utf8_to_euc_C2_mac, utf8_to_euc_C3,
- utf8_to_euc_C4, utf8_to_euc_C5, 0, utf8_to_euc_C7,
- 0, 0, 0, utf8_to_euc_CB,
- 0, 0, utf8_to_euc_CE, utf8_to_euc_CF,
- utf8_to_euc_D0, utf8_to_euc_D1, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
-};
const unsigned short *const *const utf8_to_euc_3bytes[] = {
0, 0, utf8_to_euc_E2, utf8_to_euc_E3,
utf8_to_euc_E4, utf8_to_euc_E5, utf8_to_euc_E6, utf8_to_euc_E7,
@@ -6707,12 +6459,6 @@ const unsigned short *const *const utf8_to_euc_3bytes_932[] = {
utf8_to_euc_E8, utf8_to_euc_E9, 0, 0,
0, 0, 0, utf8_to_euc_EF_ms,
};
-const unsigned short *const *const utf8_to_euc_3bytes_mac[] = {
- 0, 0, utf8_to_euc_E2_mac, utf8_to_euc_E3_mac,
- utf8_to_euc_E4, utf8_to_euc_E5, utf8_to_euc_E6, utf8_to_euc_E7,
- utf8_to_euc_E8, utf8_to_euc_E9, 0, 0,
- 0, 0, 0, utf8_to_euc_EF_ms,
-};
#ifdef UNICODE_NORMALIZATION
@@ -7885,7 +7631,7 @@ const unsigned short shiftjis_x0212[3][189] = {
},
};
-static const unsigned short x0212_shiftjis_A2[] = {
+const unsigned short x0212_shiftjis_A2[] = {
0x819F, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0x8143, 0, 0, 0x8150, 0, 0, 0x8160,
@@ -7899,7 +7645,7 @@ static const unsigned short x0212_shiftjis_A2[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short x0212_shiftjis_B0[] = {
+const unsigned short x0212_shiftjis_B0[] = {
0, 0, 0, 0, 0, 0, 0,
0, 0xFA68, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -7913,7 +7659,7 @@ static const unsigned short x0212_shiftjis_B0[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short x0212_shiftjis_B1[] = {
+const unsigned short x0212_shiftjis_B1[] = {
0, 0, 0xFA70, 0, 0, 0, 0xFA6F,
0, 0xFA72, 0, 0, 0xFA71, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -7927,7 +7673,7 @@ static const unsigned short x0212_shiftjis_B1[] = {
0, 0, 0, 0, 0xFA79, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short x0212_shiftjis_B2[] = {
+const unsigned short x0212_shiftjis_B2[] = {
0, 0, 0xFA7B, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -7941,7 +7687,7 @@ static const unsigned short x0212_shiftjis_B2[] = {
0, 0, 0, 0, 0, 0xFA81, 0, 0,
0, 0, 0, 0, 0xFA82, 0, 0,
};
-static const unsigned short x0212_shiftjis_B3[] = {
+const unsigned short x0212_shiftjis_B3[] = {
0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0xFA84, 0, 0,
@@ -7955,7 +7701,7 @@ static const unsigned short x0212_shiftjis_B3[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0xFA89, 0, 0, 0,
};
-static const unsigned short x0212_shiftjis_B4[] = {
+const unsigned short x0212_shiftjis_B4[] = {
0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -7969,7 +7715,7 @@ static const unsigned short x0212_shiftjis_B4[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short x0212_shiftjis_B5[] = {
+const unsigned short x0212_shiftjis_B5[] = {
0, 0, 0, 0, 0, 0, 0,
0, 0, 0xFA91, 0, 0, 0, 0, 0xFA93,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -7983,7 +7729,7 @@ static const unsigned short x0212_shiftjis_B5[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short x0212_shiftjis_B7[] = {
+const unsigned short x0212_shiftjis_B7[] = {
0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -7997,7 +7743,7 @@ static const unsigned short x0212_shiftjis_B7[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short x0212_shiftjis_B8[] = {
+const unsigned short x0212_shiftjis_B8[] = {
0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -8011,7 +7757,7 @@ static const unsigned short x0212_shiftjis_B8[] = {
0, 0, 0, 0, 0, 0xFAA0, 0, 0xFAA1,
0xFAA2, 0, 0, 0, 0xFAA3, 0, 0,
};
-static const unsigned short x0212_shiftjis_B9[] = {
+const unsigned short x0212_shiftjis_B9[] = {
0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0xFAA4,
0, 0, 0, 0, 0, 0, 0, 0xFAA5,
@@ -8025,7 +7771,7 @@ static const unsigned short x0212_shiftjis_B9[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short x0212_shiftjis_BA[] = {
+const unsigned short x0212_shiftjis_BA[] = {
0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -8039,7 +7785,7 @@ static const unsigned short x0212_shiftjis_BA[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short x0212_shiftjis_BB[] = {
+const unsigned short x0212_shiftjis_BB[] = {
0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0xFAAC, 0, 0, 0, 0,
@@ -8053,7 +7799,7 @@ static const unsigned short x0212_shiftjis_BB[] = {
0, 0, 0, 0, 0xFAB4, 0xFAB5, 0, 0,
0, 0xFAB6, 0, 0, 0, 0, 0,
};
-static const unsigned short x0212_shiftjis_BC[] = {
+const unsigned short x0212_shiftjis_BC[] = {
0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -8067,7 +7813,7 @@ static const unsigned short x0212_shiftjis_BC[] = {
0, 0, 0, 0, 0xFA67, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0xFAB9,
};
-static const unsigned short x0212_shiftjis_BD[] = {
+const unsigned short x0212_shiftjis_BD[] = {
0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -8081,7 +7827,7 @@ static const unsigned short x0212_shiftjis_BD[] = {
0xFABE, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short x0212_shiftjis_BE[] = {
+const unsigned short x0212_shiftjis_BE[] = {
0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0xFAC0, 0, 0, 0,
0xFABF, 0, 0, 0xFAC2, 0, 0, 0, 0,
@@ -8095,7 +7841,7 @@ static const unsigned short x0212_shiftjis_BE[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short x0212_shiftjis_BF[] = {
+const unsigned short x0212_shiftjis_BF[] = {
0, 0, 0, 0, 0, 0, 0,
0xFAC7, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -8109,7 +7855,7 @@ static const unsigned short x0212_shiftjis_BF[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short x0212_shiftjis_C0[] = {
+const unsigned short x0212_shiftjis_C0[] = {
0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -8123,7 +7869,7 @@ static const unsigned short x0212_shiftjis_C0[] = {
0, 0, 0, 0, 0xFACB, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short x0212_shiftjis_C1[] = {
+const unsigned short x0212_shiftjis_C1[] = {
0, 0, 0, 0, 0, 0xFACC, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -8137,7 +7883,7 @@ static const unsigned short x0212_shiftjis_C1[] = {
0, 0, 0, 0, 0, 0xFACE, 0, 0,
0xFAD1, 0, 0, 0, 0xFACF, 0, 0,
};
-static const unsigned short x0212_shiftjis_C2[] = {
+const unsigned short x0212_shiftjis_C2[] = {
0xFAD3, 0, 0, 0, 0xFAD4, 0, 0,
0, 0, 0, 0xFAD2, 0, 0xFA63, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -8151,7 +7897,7 @@ static const unsigned short x0212_shiftjis_C2[] = {
0xFADF, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short x0212_shiftjis_C3[] = {
+const unsigned short x0212_shiftjis_C3[] = {
0xFAE1, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0xFAE2, 0, 0,
@@ -8165,7 +7911,7 @@ static const unsigned short x0212_shiftjis_C3[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0xFA64, 0, 0xFAE7,
};
-static const unsigned short x0212_shiftjis_C4[] = {
+const unsigned short x0212_shiftjis_C4[] = {
0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -8179,7 +7925,7 @@ static const unsigned short x0212_shiftjis_C4[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0xFAED, 0,
};
-static const unsigned short x0212_shiftjis_C5[] = {
+const unsigned short x0212_shiftjis_C5[] = {
0, 0, 0, 0, 0, 0, 0xFAEF,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0xFAF0, 0xFAF1, 0,
@@ -8193,7 +7939,7 @@ static const unsigned short x0212_shiftjis_C5[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short x0212_shiftjis_C6[] = {
+const unsigned short x0212_shiftjis_C6[] = {
0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -8207,7 +7953,7 @@ static const unsigned short x0212_shiftjis_C6[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short x0212_shiftjis_C7[] = {
+const unsigned short x0212_shiftjis_C7[] = {
0xFAF9, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0xFAFA, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -8221,7 +7967,7 @@ static const unsigned short x0212_shiftjis_C7[] = {
0xFB49, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0xFB47, 0, 0,
};
-static const unsigned short x0212_shiftjis_C8[] = {
+const unsigned short x0212_shiftjis_C8[] = {
0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0xFB4A, 0, 0, 0, 0, 0, 0,
@@ -8235,7 +7981,7 @@ static const unsigned short x0212_shiftjis_C8[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0xFB4C, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short x0212_shiftjis_C9[] = {
+const unsigned short x0212_shiftjis_C9[] = {
0, 0, 0, 0, 0, 0xFB4D, 0,
0, 0, 0, 0xFB4E, 0, 0xFB4F, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -8249,7 +7995,7 @@ static const unsigned short x0212_shiftjis_C9[] = {
0, 0, 0, 0, 0xFB56, 0xFB57, 0, 0,
0, 0, 0, 0, 0xFB55, 0, 0,
};
-static const unsigned short x0212_shiftjis_CA[] = {
+const unsigned short x0212_shiftjis_CA[] = {
0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0xFB59, 0, 0, 0, 0,
@@ -8263,7 +8009,7 @@ static const unsigned short x0212_shiftjis_CA[] = {
0, 0xFB5C, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short x0212_shiftjis_CB[] = {
+const unsigned short x0212_shiftjis_CB[] = {
0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0xFB5D, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -8277,7 +8023,7 @@ static const unsigned short x0212_shiftjis_CB[] = {
0xFB62, 0, 0, 0, 0xFB63, 0, 0, 0,
0, 0xFB66, 0, 0, 0, 0, 0,
};
-static const unsigned short x0212_shiftjis_CC[] = {
+const unsigned short x0212_shiftjis_CC[] = {
0, 0, 0, 0, 0xFB65, 0, 0,
0, 0, 0, 0xFB67, 0, 0xFB69, 0xFB68, 0,
0, 0, 0xFB6A, 0, 0, 0, 0, 0,
@@ -8291,7 +8037,7 @@ static const unsigned short x0212_shiftjis_CC[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short x0212_shiftjis_CD[] = {
+const unsigned short x0212_shiftjis_CD[] = {
0, 0, 0, 0, 0, 0, 0,
0, 0, 0xFAA8, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -8305,7 +8051,7 @@ static const unsigned short x0212_shiftjis_CD[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short x0212_shiftjis_CE[] = {
+const unsigned short x0212_shiftjis_CE[] = {
0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -8319,7 +8065,7 @@ static const unsigned short x0212_shiftjis_CE[] = {
0, 0, 0xFB76, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short x0212_shiftjis_CF[] = {
+const unsigned short x0212_shiftjis_CF[] = {
0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -8333,7 +8079,7 @@ static const unsigned short x0212_shiftjis_CF[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short x0212_shiftjis_D0[] = {
+const unsigned short x0212_shiftjis_D0[] = {
0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -8347,7 +8093,7 @@ static const unsigned short x0212_shiftjis_D0[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short x0212_shiftjis_D1[] = {
+const unsigned short x0212_shiftjis_D1[] = {
0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -8361,7 +8107,7 @@ static const unsigned short x0212_shiftjis_D1[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short x0212_shiftjis_D2[] = {
+const unsigned short x0212_shiftjis_D2[] = {
0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -8375,7 +8121,7 @@ static const unsigned short x0212_shiftjis_D2[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short x0212_shiftjis_D3[] = {
+const unsigned short x0212_shiftjis_D3[] = {
0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -8389,7 +8135,7 @@ static const unsigned short x0212_shiftjis_D3[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short x0212_shiftjis_D4[] = {
+const unsigned short x0212_shiftjis_D4[] = {
0, 0, 0, 0, 0, 0, 0xFB8C,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -8403,7 +8149,7 @@ static const unsigned short x0212_shiftjis_D4[] = {
0, 0, 0xFB90, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short x0212_shiftjis_D5[] = {
+const unsigned short x0212_shiftjis_D5[] = {
0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0xFB91, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -8417,7 +8163,7 @@ static const unsigned short x0212_shiftjis_D5[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short x0212_shiftjis_D7[] = {
+const unsigned short x0212_shiftjis_D7[] = {
0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -8431,7 +8177,7 @@ static const unsigned short x0212_shiftjis_D7[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short x0212_shiftjis_D8[] = {
+const unsigned short x0212_shiftjis_D8[] = {
0, 0xFB95, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0xFB96,
@@ -8445,7 +8191,7 @@ static const unsigned short x0212_shiftjis_D8[] = {
0, 0, 0, 0, 0xFB99, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short x0212_shiftjis_D9[] = {
+const unsigned short x0212_shiftjis_D9[] = {
0xFA60, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -8459,7 +8205,7 @@ static const unsigned short x0212_shiftjis_D9[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short x0212_shiftjis_DC[] = {
+const unsigned short x0212_shiftjis_DC[] = {
0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -8473,7 +8219,7 @@ static const unsigned short x0212_shiftjis_DC[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short x0212_shiftjis_DD[] = {
+const unsigned short x0212_shiftjis_DD[] = {
0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -8487,7 +8233,7 @@ static const unsigned short x0212_shiftjis_DD[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0xFBA6, 0, 0, 0, 0,
};
-static const unsigned short x0212_shiftjis_DE[] = {
+const unsigned short x0212_shiftjis_DE[] = {
0, 0, 0, 0xFBA7, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0xFBA8, 0, 0, 0, 0, 0xFBAA, 0, 0,
@@ -8501,7 +8247,7 @@ static const unsigned short x0212_shiftjis_DE[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short x0212_shiftjis_DF[] = {
+const unsigned short x0212_shiftjis_DF[] = {
0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -8515,7 +8261,7 @@ static const unsigned short x0212_shiftjis_DF[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short x0212_shiftjis_E0[] = {
+const unsigned short x0212_shiftjis_E0[] = {
0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -8529,7 +8275,7 @@ static const unsigned short x0212_shiftjis_E0[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short x0212_shiftjis_E1[] = {
+const unsigned short x0212_shiftjis_E1[] = {
0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -8543,7 +8289,7 @@ static const unsigned short x0212_shiftjis_E1[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short x0212_shiftjis_E2[] = {
+const unsigned short x0212_shiftjis_E2[] = {
0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -8557,7 +8303,7 @@ static const unsigned short x0212_shiftjis_E2[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short x0212_shiftjis_E3[] = {
+const unsigned short x0212_shiftjis_E3[] = {
0, 0, 0, 0, 0, 0xFBBB, 0,
0xFBBA, 0xFBBC, 0xFBBF, 0xFBC0, 0, 0, 0, 0xFBBD,
0xFBBE, 0, 0, 0, 0, 0, 0, 0,
@@ -8571,7 +8317,7 @@ static const unsigned short x0212_shiftjis_E3[] = {
0, 0xFBCD, 0xFBCE, 0, 0, 0, 0, 0,
0xFA5F, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short x0212_shiftjis_E4[] = {
+const unsigned short x0212_shiftjis_E4[] = {
0, 0, 0, 0, 0, 0xFBCC, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -8585,7 +8331,7 @@ static const unsigned short x0212_shiftjis_E4[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0xFBDF, 0, 0, 0, 0,
};
-static const unsigned short x0212_shiftjis_E5[] = {
+const unsigned short x0212_shiftjis_E5[] = {
0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0xFBE1, 0, 0, 0, 0,
@@ -8599,7 +8345,7 @@ static const unsigned short x0212_shiftjis_E5[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short x0212_shiftjis_E6[] = {
+const unsigned short x0212_shiftjis_E6[] = {
0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -8613,7 +8359,7 @@ static const unsigned short x0212_shiftjis_E6[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short x0212_shiftjis_E7[] = {
+const unsigned short x0212_shiftjis_E7[] = {
0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0xFBED, 0, 0xFBEF, 0,
0, 0xFBF1, 0xFBF3, 0, 0, 0, 0, 0,
@@ -8627,7 +8373,7 @@ static const unsigned short x0212_shiftjis_E7[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short x0212_shiftjis_E8[] = {
+const unsigned short x0212_shiftjis_E8[] = {
0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0xFBF4, 0, 0, 0, 0, 0xFBF5, 0,
@@ -8641,7 +8387,7 @@ static const unsigned short x0212_shiftjis_E8[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short x0212_shiftjis_E9[] = {
+const unsigned short x0212_shiftjis_E9[] = {
0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -8655,7 +8401,7 @@ static const unsigned short x0212_shiftjis_E9[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short x0212_shiftjis_EA[] = {
+const unsigned short x0212_shiftjis_EA[] = {
0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -8669,7 +8415,7 @@ static const unsigned short x0212_shiftjis_EA[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short x0212_shiftjis_EB[] = {
+const unsigned short x0212_shiftjis_EB[] = {
0, 0, 0, 0, 0xFC46, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -8683,7 +8429,7 @@ static const unsigned short x0212_shiftjis_EB[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0xFC48, 0xFC47, 0, 0, 0,
};
-static const unsigned short x0212_shiftjis_EC[] = {
+const unsigned short x0212_shiftjis_EC[] = {
0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -8697,7 +8443,7 @@ static const unsigned short x0212_shiftjis_EC[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short x0212_shiftjis_F3[] = {
+const unsigned short x0212_shiftjis_F3[] = {
0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -8711,7 +8457,7 @@ static const unsigned short x0212_shiftjis_F3[] = {
0, 0, 0, 0xFA40, 0xFA41, 0xFA42, 0xFA43, 0xFA44,
0xFA45, 0xFA46, 0xFA47, 0xFA48, 0xFA49, 0xFA4A, 0xFA4B,
};
-static const unsigned short x0212_shiftjis_F4[] = {
+const unsigned short x0212_shiftjis_F4[] = {
0xFA4C, 0xFA4D, 0xFA4E, 0xFA4F, 0xFA50, 0xFA51, 0xFA52,
0xFA53, 0xFA56, 0xFA57, 0xFA58, 0xFA59, 0xFA5A, 0xFA62, 0xFA6A,
0xFA7C, 0xFA83, 0xFA8A, 0xFA8B, 0xFA90, 0xFA92, 0xFA96, 0xFA9B,
diff --git a/ext/nkf/nkf-utf8/utf8tbl.h b/ext/nkf/nkf-utf8/utf8tbl.h
index c3d7709ef7..1f40f0b363 100644
--- a/ext/nkf/nkf-utf8/utf8tbl.h
+++ b/ext/nkf/nkf-utf8/utf8tbl.h
@@ -1,55 +1,28 @@
-/*
- * utf8tbl.h - Header file for Convertion Table
- *
- * $Id$
- */
-
#ifndef _UTF8TBL_H_
#define _UTF8TBL_H_
#ifdef UTF8_OUTPUT_ENABLE
-#define sizeof_euc_to_utf8_1byte 94
-#define sizeof_euc_to_utf8_2bytes 94
extern const unsigned short euc_to_utf8_1byte[];
extern const unsigned short *const euc_to_utf8_2bytes[];
extern const unsigned short *const euc_to_utf8_2bytes_ms[];
-extern const unsigned short *const euc_to_utf8_2bytes_mac[];
extern const unsigned short *const x0212_to_utf8_2bytes[];
#endif /* UTF8_OUTPUT_ENABLE */
#ifdef UTF8_INPUT_ENABLE
-#define sizeof_utf8_to_euc_C2 64
-#define sizeof_utf8_to_euc_E5B8 64
-#define sizeof_utf8_to_euc_2bytes 112
-#define sizeof_utf8_to_euc_3bytes 16
extern const unsigned short *const utf8_to_euc_2bytes[];
extern const unsigned short *const utf8_to_euc_2bytes_ms[];
extern const unsigned short *const utf8_to_euc_2bytes_932[];
-extern const unsigned short *const utf8_to_euc_2bytes_mac[];
extern const unsigned short *const *const utf8_to_euc_3bytes[];
extern const unsigned short *const *const utf8_to_euc_3bytes_ms[];
extern const unsigned short *const *const utf8_to_euc_3bytes_932[];
-extern const unsigned short *const *const utf8_to_euc_3bytes_mac[];
#endif /* UTF8_INPUT_ENABLE */
#ifdef UNICODE_NORMALIZATION
-
-#define NORMALIZATION_TABLE_LENGTH 942
-#define NORMALIZATION_TABLE_NFC_LENGTH 3
-#define NORMALIZATION_TABLE_NFD_LENGTH 9
-struct normalization_pair {
- const unsigned char nfc[NORMALIZATION_TABLE_NFC_LENGTH];
- const unsigned char nfd[NORMALIZATION_TABLE_NFD_LENGTH];
-};
extern const struct normalization_pair normalization_table[];
#endif
#ifdef SHIFTJIS_CP932
-#define CP932_TABLE_BEGIN 0xFA
-#define CP932_TABLE_END 0xFC
extern const unsigned short shiftjis_cp932[3][189];
-#define CP932INV_TABLE_BEGIN 0xED
-#define CP932INV_TABLE_END 0xEE
extern const unsigned short cp932inv[2][189];
#endif /* SHIFTJIS_CP932 */
diff --git a/ext/nkf/nkf.c b/ext/nkf/nkf.c
index 82327bf356..2bb0340a64 100644
--- a/ext/nkf/nkf.c
+++ b/ext/nkf/nkf.c
@@ -10,8 +10,24 @@
#define RUBY_NKF_REVISION "$Revision$"
#define RUBY_NKF_VERSION NKF_VERSION " (" NKF_RELEASE_DATE ")"
-#include "ruby/ruby.h"
-#include "ruby/encoding.h"
+#include "ruby.h"
+
+/* Encoding Constants */
+#define _AUTO 0
+#define _JIS 1
+#define _EUC 2
+#define _SJIS 3
+#define _BINARY 4
+#define _NOCONV 4
+#define _ASCII 5
+/* 0b011x is reserved for UTF-8 Family */
+#define _UTF8 6
+/* 0b10xx is reserved for UTF-16 Family */
+#define _UTF16 8
+/* 0b11xx is reserved for UTF-32 Family */
+#define _UTF32 12
+#define _OTHER 16
+#define _UNKNOWN _AUTO
/* Replace nkf's getchar/putchar for variable modification */
/* we never use getc, ungetc */
@@ -40,13 +56,14 @@ static int incsize;
static VALUE result;
static int
-rb_nkf_putchar(unsigned int c)
+rb_nkf_putchar(c)
+ unsigned int c;
{
if (output_ctr >= o_len) {
o_len += incsize;
rb_str_resize(result, o_len);
incsize *= 2;
- output = (unsigned char *)RSTRING_PTR(result);
+ output = (unsigned char *)RSTRING(result)->ptr;
}
output[output_ctr++] = c;
@@ -61,23 +78,11 @@ rb_nkf_putchar(unsigned int c)
#include "nkf-utf8/utf8tbl.c"
#include "nkf-utf8/nkf.c"
-rb_encoding* rb_nkf_enc_get(const char *name)
-{
- int idx = rb_enc_find_index(name);
- if (idx < 0) {
- nkf_encoding *nkf_enc = nkf_enc_find(name);
- idx = rb_enc_find_index(nkf_enc_name(nkf_enc_to_base_encoding(nkf_enc)));
- if (idx < 0) {
- idx = rb_define_dummy_encoding(name);
- }
- }
- return rb_enc_from_index(idx);
-}
-
-int nkf_split_options(const char *arg)
+int nkf_split_options(arg)
+ const char* arg;
{
int count = 0;
- unsigned char option[256];
+ char option[256];
int i = 0, j = 0;
int is_escaped = FALSE;
int is_single_quoted = FALSE;
@@ -123,82 +128,235 @@ int nkf_split_options(const char *arg)
/*
* call-seq:
- * NKF.nkf(opt, str) => string
+ * NKF.nkf(opt, str) -> string
*
* Convert _str_ and return converted result.
* Conversion details are specified by _opt_ as String.
*
* require 'nkf'
* output = NKF.nkf("-s", input)
+ *
+ * *Note*
+ * By default, nkf decodes MIME encoded string.
+ * If you want not to decode input, use NKF.nkf with <b>-m0</b> flag.
*/
static VALUE
-rb_nkf_convert(VALUE obj, VALUE opt, VALUE src)
+rb_nkf_kconv(obj, opt, src)
+ VALUE obj, opt, src;
{
- volatile VALUE tmp;
- reinit();
- StringValue(opt);
- nkf_split_options(RSTRING_PTR(opt));
- if (!output_encoding) rb_raise(rb_eArgError, "no output encoding given");
-
- switch (nkf_enc_to_index(output_encoding)) {
- case UTF_8_BOM: output_encoding = nkf_enc_from_index(UTF_8); break;
- case UTF_16BE_BOM: output_encoding = nkf_enc_from_index(UTF_16BE); break;
- case UTF_16LE_BOM: output_encoding = nkf_enc_from_index(UTF_16LE); break;
- case UTF_32BE_BOM: output_encoding = nkf_enc_from_index(UTF_32BE); break;
- case UTF_32LE_BOM: output_encoding = nkf_enc_from_index(UTF_32LE); break;
- }
- output_bom_f = FALSE;
-
- incsize = INCSIZE;
-
- input_ctr = 0;
- StringValue(src);
- input = (unsigned char *)RSTRING_PTR(src);
- i_len = RSTRING_LEN(src);
- tmp = result = rb_str_new(0, i_len*3 + 10);
-
- output_ctr = 0;
- output = (unsigned char *)RSTRING_PTR(result);
- o_len = RSTRING_LEN(result);
- *output = '\0';
+ char *opt_ptr, *opt_end;
+ volatile VALUE v;
+
+ reinit();
+ StringValue(opt);
+ opt_ptr = RSTRING(opt)->ptr;
+ opt_end = opt_ptr + RSTRING(opt)->len;
+ nkf_split_options(opt_ptr);
+
+ incsize = INCSIZE;
+
+ input_ctr = 0;
+ StringValue(src);
+ input = (unsigned char *)RSTRING(src)->ptr;
+ i_len = RSTRING(src)->len;
+ result = rb_str_new(0, i_len*3 + 10);
+ v = result;
+
+ output_ctr = 0;
+ output = (unsigned char *)RSTRING(result)->ptr;
+ o_len = RSTRING(result)->len;
+ *output = '\0';
+
+ if(x0201_f == WISH_TRUE)
+ x0201_f = ((!iso2022jp_f)? TRUE : NO_X0201);
+
+ kanji_convert(NULL);
+ RSTRING(result)->ptr[output_ctr] = '\0';
+ RSTRING(result)->len = output_ctr;
+ OBJ_INFECT(result, src);
+
+ return result;
+}
- kanji_convert(NULL);
- rb_str_set_len(result, output_ctr);
- OBJ_INFECT(result, src);
- if (mimeout_f)
- rb_enc_associate(result, rb_usascii_encoding());
- else
- rb_enc_associate(result, rb_nkf_enc_get(nkf_enc_name(output_encoding)));
+/*
+ * call-seq:
+ * NKF.guess1(str) -> integer
+ *
+ * Returns guessed encoding of _str_ as integer.
+ *
+ * Algorithm described in:
+ * Ken Lunde. `Understanding Japanese Information Processing'
+ * Sebastopol, CA: O'Reilly & Associates.
+ *
+ * case NKF.guess1(input)
+ * when NKF::JIS
+ * "ISO-2022-JP"
+ * when NKF::SJIS
+ * "Shift_JIS"
+ * when NKF::EUC
+ * "EUC-JP"
+ * when NKF::UNKNOWN
+ * "UNKNOWN(ASCII)"
+ * when NKF::BINARY
+ * "BINARY"
+ * end
+ */
- return result;
+static VALUE
+rb_nkf_guess1(obj, src)
+ VALUE obj, src;
+{
+ unsigned char *p;
+ unsigned char *pend;
+ int sequence_counter = 0;
+
+ StringValue(src);
+ p = (unsigned char *)RSTRING(src)->ptr;
+ pend = p + RSTRING(src)->len;
+ if (p == pend) return INT2FIX(_UNKNOWN);
+
+#define INCR do {\
+ p++;\
+ if (p==pend) return INT2FIX(_UNKNOWN);\
+ sequence_counter++;\
+ if (sequence_counter % 2 == 1 && *p != 0xa4)\
+ sequence_counter = 0;\
+ if (6 <= sequence_counter) {\
+ sequence_counter = 0;\
+ return INT2FIX(_EUC);\
+ }\
+ } while (0)
+
+ if (*p == 0xa4)
+ sequence_counter = 1;
+
+ while (p<pend) {
+ if (*p == '\033') {
+ return INT2FIX(_JIS);
+ }
+ if (*p < '\006' || *p == 0x7f || *p == 0xff) {
+ return INT2FIX(_BINARY);
+ }
+ if (0x81 <= *p && *p <= 0x8d) {
+ return INT2FIX(_SJIS);
+ }
+ if (0x8f <= *p && *p <= 0x9f) {
+ return INT2FIX(_SJIS);
+ }
+ if (*p == 0x8e) { /* SS2 */
+ INCR;
+ if ((0x40 <= *p && *p <= 0x7e) ||
+ (0x80 <= *p && *p <= 0xa0) ||
+ (0xe0 <= *p && *p <= 0xfc))
+ return INT2FIX(_SJIS);
+ }
+ else if (0xa1 <= *p && *p <= 0xdf) {
+ INCR;
+ if (0xf0 <= *p && *p <= 0xfe)
+ return INT2FIX(_EUC);
+ if (0xe0 <= *p && *p <= 0xef) {
+ while (p < pend && *p >= 0x40) {
+ if (*p >= 0x81) {
+ if (*p <= 0x8d || (0x8f <= *p && *p <= 0x9f)) {
+ return INT2FIX(_SJIS);
+ }
+ else if (0xfd <= *p && *p <= 0xfe) {
+ return INT2FIX(_EUC);
+ }
+ }
+ INCR;
+ }
+ }
+ else if (*p <= 0x9f) {
+ return INT2FIX(_SJIS);
+ }
+ }
+ else if (0xf0 <= *p && *p <= 0xfe) {
+ return INT2FIX(_EUC);
+ }
+ else if (0xe0 <= *p && *p <= 0xef) {
+ INCR;
+ if ((0x40 <= *p && *p <= 0x7e) ||
+ (0x80 <= *p && *p <= 0xa0)) {
+ return INT2FIX(_SJIS);
+ }
+ if (0xfd <= *p && *p <= 0xfe) {
+ return INT2FIX(_EUC);
+ }
+ }
+ INCR;
+ }
+ return INT2FIX(_UNKNOWN);
}
/*
* call-seq:
- * NKF.guess(str) => encoding
- *
- * Returns guessed encoding of _str_ by nkf routine.
- *
+ * NKF.guess2(str) -> integer
+ *
+ * Returns guessed encoding of _str_ as integer by nkf routine.
+ *
+ * case NKF.guess(input)
+ * when NKF::ASCII
+ * "ASCII"
+ * when NKF::JIS
+ * "ISO-2022-JP"
+ * when NKF::SJIS
+ * "Shift_JIS"
+ * when NKF::EUC
+ * "EUC-JP"
+ * when NKF::UTF8
+ * "UTF-8"
+ * when NKF::UTF16
+ * "UTF-16"
+ * when NKF::UNKNOWN
+ * "UNKNOWN"
+ * when NKF::BINARY
+ * "BINARY"
+ * end
*/
static VALUE
-rb_nkf_guess(VALUE obj, VALUE src)
+rb_nkf_guess2(obj, src)
+ VALUE obj, src;
{
- reinit();
-
- input_ctr = 0;
- StringValue(src);
- input = (unsigned char *)RSTRING_PTR(src);
- i_len = RSTRING_LEN(src);
-
- guess_f = TRUE;
- kanji_convert( NULL );
- guess_f = FALSE;
+ int code = _BINARY;
+
+ reinit();
+
+ input_ctr = 0;
+ StringValue(src);
+ input = (unsigned char *)RSTRING(src)->ptr;
+ i_len = RSTRING(src)->len;
+
+ if(x0201_f == WISH_TRUE)
+ x0201_f = ((!iso2022jp_f)? TRUE : NO_X0201);
+
+ guess_f = TRUE;
+ kanji_convert( NULL );
+ guess_f = FALSE;
+
+ if (!is_inputcode_mixed) {
+ if (strcmp(input_codename, "") == 0) {
+ code = _ASCII;
+ } else if (strcmp(input_codename, "ISO-2022-JP") == 0) {
+ code = _JIS;
+ } else if (strcmp(input_codename, "EUC-JP") == 0) {
+ code = _EUC;
+ } else if (strcmp(input_codename, "Shift_JIS") == 0) {
+ code = _SJIS;
+ } else if (strcmp(input_codename, "UTF-8") == 0) {
+ code = _UTF8;
+ } else if (strcmp(input_codename, "UTF-16") == 0) {
+ code = _UTF16;
+ } else if (strlen(input_codename) > 0) {
+ code = _UNKNOWN;
+ }
+ }
- return rb_enc_from_encoding(rb_nkf_enc_get(get_guessed_code()));
+ return INT2FIX( code );
}
@@ -207,8 +365,8 @@ rb_nkf_guess(VALUE obj, VALUE src)
*
* == Description
*
- * This is a Ruby Extension version of nkf (Network Kanji Filter).
- * It converts the first argument and returns converted result. Conversion
+ * This is a Ruby Extension version of nkf (Netowrk Kanji Filter).
+ * It converts the first argument and return converted result. Conversion
* details are specified by flags as the first argument.
*
* *Nkf* is a yet another kanji code converter among networks, hosts and terminals.
@@ -230,16 +388,16 @@ rb_nkf_guess(VALUE obj, VALUE src)
*
* Output is buffered (DEFAULT), Output is unbuffered.
*
- * === -j -s -e -w -w16 -w32
+ * === -j -s -e -w -w16
*
* Output code is ISO-2022-JP (7bit JIS), Shift_JIS, EUC-JP,
- * UTF-8N, UTF-16BE, UTF-32BE.
+ * UTF-8N, UTF-16BE.
* Without this option and compile option, ISO-2022-JP is assumed.
*
- * === -J -S -E -W -W16 -W32
+ * === -J -S -E -W -W16
*
* Input assumption is JIS 7 bit, Shift_JIS, EUC-JP,
- * UTF-8, UTF-16, UTF-32.
+ * UTF-8, UTF-16LE.
*
* ==== -J
*
@@ -404,7 +562,7 @@ rb_nkf_guess(VALUE obj, VALUE src)
*
* [Shift_JIS] SJIS, MS-Kanji
*
- * [Windows-31J] a.k.a. CP932
+ * [CP932] a.k.a. Windows-31J
*
* [UTF-8] same as UTF-8N
*
@@ -422,16 +580,6 @@ rb_nkf_guess(VALUE obj, VALUE src)
*
* [UTF-16LE-BOM] UTF-16 Little Endian with BOM
*
- * [UTF-32] same as UTF-32BE
- *
- * [UTF-32BE] UTF-32 Big Endian without BOM
- *
- * [UTF-32BE-BOM] UTF-32 Big Endian with BOM
- *
- * [UTF-32LE] UTF-32 Little Endian without BOM
- *
- * [UTF-32LE-BOM] UTF-32 Little Endian with BOM
- *
* [UTF8-MAC] NKDed UTF-8, a.k.a. UTF8-NFD (input only)
*
* === --fb-{skip, html, xml, perl, java, subchar}
@@ -445,20 +593,10 @@ rb_nkf_guess(VALUE obj, VALUE src)
* nkf adds a specified escape character to specified 2nd byte of Shift_JIS characters.
* 1st byte of argument is the escape character and following bytes are target characters.
*
- * === --no-cp932ext
+ * === --disable-cp932ext
*
* Handle the characters extended in CP932 as unassigned characters.
*
- * == --no-best-fit-chars
- *
- * When Unicode to Encoded byte conversion,
- * don't convert characters which is not round trip safe.
- * When Unicode to Unicode conversion,
- * with this and -x option, nkf can be used as UTF converter.
- * (In other words, without this and -x option, nkf doesn't save some characters)
- *
- * When nkf convert string which related to path, you should use this opion.
- *
* === --cap-input
*
* Decode hex encoded characters.
@@ -475,28 +613,42 @@ rb_nkf_guess(VALUE obj, VALUE src)
void
Init_nkf()
{
- VALUE mNKF = rb_define_module("NKF");
-
- rb_define_module_function(mNKF, "nkf", rb_nkf_convert, 2);
- rb_define_module_function(mNKF, "guess", rb_nkf_guess, 1);
- rb_define_alias(rb_singleton_class(mNKF), "guess", "guess");
-
- rb_define_const(mNKF, "AUTO", Qnil);
- rb_define_const(mNKF, "NOCONV", Qnil);
- rb_define_const(mNKF, "UNKNOWN", Qnil);
- rb_define_const(mNKF, "BINARY", rb_enc_from_encoding(rb_nkf_enc_get("BINARY")));
- rb_define_const(mNKF, "ASCII", rb_enc_from_encoding(rb_nkf_enc_get("US-ASCII")));
- rb_define_const(mNKF, "JIS", rb_enc_from_encoding(rb_nkf_enc_get("ISO-2022-JP")));
- rb_define_const(mNKF, "EUC", rb_enc_from_encoding(rb_nkf_enc_get("EUC-JP")));
- rb_define_const(mNKF, "SJIS", rb_enc_from_encoding(rb_nkf_enc_get("Shift_JIS")));
- rb_define_const(mNKF, "UTF8", rb_enc_from_encoding(rb_utf8_encoding()));
- rb_define_const(mNKF, "UTF16", rb_enc_from_encoding(rb_nkf_enc_get("UTF-16BE")));
- rb_define_const(mNKF, "UTF32", rb_enc_from_encoding(rb_nkf_enc_get("UTF-32BE")));
-
+ /* hoge */
+ VALUE mKconv = rb_define_module("NKF");
+ /* hoge */
+
+ rb_define_module_function(mKconv, "nkf", rb_nkf_kconv, 2);
+ rb_define_module_function(mKconv, "guess1", rb_nkf_guess1, 1);
+ rb_define_module_function(mKconv, "guess2", rb_nkf_guess2, 1);
+ rb_define_alias(mKconv, "guess", "guess2");
+ rb_define_alias(rb_singleton_class(mKconv), "guess", "guess2");
+
+ /* Auto-Detect */
+ rb_define_const(mKconv, "AUTO", INT2FIX(_AUTO));
+ /* ISO-2022-JP */
+ rb_define_const(mKconv, "JIS", INT2FIX(_JIS));
+ /* EUC-JP */
+ rb_define_const(mKconv, "EUC", INT2FIX(_EUC));
+ /* Shift_JIS */
+ rb_define_const(mKconv, "SJIS", INT2FIX(_SJIS));
+ /* BINARY */
+ rb_define_const(mKconv, "BINARY", INT2FIX(_BINARY));
+ /* No conversion */
+ rb_define_const(mKconv, "NOCONV", INT2FIX(_NOCONV));
+ /* ASCII */
+ rb_define_const(mKconv, "ASCII", INT2FIX(_ASCII));
+ /* UTF-8 */
+ rb_define_const(mKconv, "UTF8", INT2FIX(_UTF8));
+ /* UTF-16 */
+ rb_define_const(mKconv, "UTF16", INT2FIX(_UTF16));
+ /* UTF-32 */
+ rb_define_const(mKconv, "UTF32", INT2FIX(_UTF32));
+ /* UNKNOWN */
+ rb_define_const(mKconv, "UNKNOWN", INT2FIX(_UNKNOWN));
/* Full version string of nkf */
- rb_define_const(mNKF, "VERSION", rb_str_new2(RUBY_NKF_VERSION));
+ rb_define_const(mKconv, "VERSION", rb_str_new2(RUBY_NKF_VERSION));
/* Version of nkf */
- rb_define_const(mNKF, "NKF_VERSION", rb_str_new2(NKF_VERSION));
+ rb_define_const(mKconv, "NKF_VERSION", rb_str_new2(NKF_VERSION));
/* Release date of nkf */
- rb_define_const(mNKF, "NKF_RELEASE_DATE", rb_str_new2(NKF_RELEASE_DATE));
+ rb_define_const(mKconv, "NKF_RELEASE_DATE", rb_str_new2(NKF_RELEASE_DATE));
}
diff --git a/ext/objspace/extconf.rb b/ext/objspace/extconf.rb
deleted file mode 100644
index a0cc3cecce..0000000000
--- a/ext/objspace/extconf.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-
-create_makefile('objspace')
diff --git a/ext/objspace/objspace.c b/ext/objspace/objspace.c
deleted file mode 100644
index 68c6086fa0..0000000000
--- a/ext/objspace/objspace.c
+++ /dev/null
@@ -1,552 +0,0 @@
-/**********************************************************************
-
- objspace.c - ObjectSpace extender for MRI.
-
- $Author$
- created at: Wed Jun 17 07:39:17 2009
-
- NOTE: This extension library is not expected to exist except C Ruby.
-
- All the files in this distribution are covered under the Ruby's
- license (see the file COPYING).
-
-**********************************************************************/
-
-/* objspace library extends ObjectSpace module and add several
- * methods to get internal statistic information about
- * object/memory management.
- *
- * Generally, you *SHOULD NOT*use this library if you do not know
- * about the MRI implementation. Mainly, this library is for (memory)
- * profiler developers and MRI developers who need to know how MRI
- * memory usage.
- *
- */
-
-#include <ruby/ruby.h>
-#include <ruby/st.h>
-#include <ruby/io.h>
-#include <ruby/re.h>
-#include <../../node.h>
-
-size_t rb_str_memsize(VALUE);
-size_t rb_ary_memsize(VALUE);
-size_t st_memsize(st_table *);
-size_t rb_io_memsize(rb_io_t *);
-size_t onig_memsize(regex_t *);
-size_t rb_generic_ivar_memsize(VALUE);
-size_t rb_objspace_data_type_memsize(VALUE obj);
-
-void rb_objspace_each_objects(
- int (*callback)(void *start, void *end, size_t stride, void *data),
- void *data);
-
-static size_t
-memsize_of(VALUE obj)
-{
- size_t size = 0;
-
- if (SPECIAL_CONST_P(obj)) {
- return 0;
- }
-
- if (FL_TEST(obj, FL_EXIVAR)) {
- size += rb_generic_ivar_memsize(obj);
- }
-
- switch (BUILTIN_TYPE(obj)) {
- case T_OBJECT:
- if (!(RBASIC(obj)->flags & ROBJECT_EMBED) &&
- ROBJECT(obj)->as.heap.ivptr) {
- size += ROBJECT(obj)->as.heap.numiv * sizeof(VALUE);
- }
- break;
- case T_MODULE:
- case T_CLASS:
- size += st_memsize(RCLASS_M_TBL(obj));
- if (RCLASS_IV_TBL(obj)) {
- size += st_memsize(RCLASS_IV_TBL(obj));
- }
- if (RCLASS_IV_INDEX_TBL(obj)) {
- size += st_memsize(RCLASS_IV_INDEX_TBL(obj));
- }
- if (RCLASS(obj)->ptr->iv_tbl) {
- size += st_memsize(RCLASS(obj)->ptr->iv_tbl);
- }
- size += sizeof(rb_classext_t);
- break;
- case T_STRING:
- size += rb_str_memsize(obj);
- break;
- case T_ARRAY:
- size += rb_ary_memsize(obj);
- break;
- case T_HASH:
- if (RHASH(obj)->ntbl) {
- size += st_memsize(RHASH(obj)->ntbl);
- }
- break;
- case T_REGEXP:
- if (RREGEXP(obj)->ptr) {
- size += onig_memsize(RREGEXP(obj)->ptr);
- }
- break;
- case T_DATA:
- size += rb_objspace_data_type_memsize(obj);
- break;
- case T_MATCH:
- if (RMATCH(obj)->rmatch) {
- struct rmatch *rm = RMATCH(obj)->rmatch;
- size += sizeof(struct re_registers); /* TODO: onig_region_memsize(&rm->regs); */
- size += sizeof(struct rmatch_offset) * rm->char_offset_num_allocated;
- size += sizeof(struct rmatch);
- }
- break;
- case T_FILE:
- if (RFILE(obj)->fptr) {
- size += rb_io_memsize(RFILE(obj)->fptr);
- }
- break;
- case T_RATIONAL:
- case T_COMPLEX:
- break;
- case T_ICLASS:
- /* iClass shares table with the module */
- break;
-
- case T_FLOAT:
- break;
-
- case T_BIGNUM:
- if (!(RBASIC(obj)->flags & RBIGNUM_EMBED_FLAG) && RBIGNUM_DIGITS(obj)) {
- size += RBIGNUM_LEN(obj) * sizeof(BDIGIT);
- }
- break;
- case T_NODE:
- switch (nd_type(obj)) {
- case NODE_SCOPE:
- if (RNODE(obj)->u1.tbl) {
- /* TODO: xfree(RANY(obj)->as.node.u1.tbl); */
- }
- break;
- case NODE_ALLOCA:
- /* TODO: xfree(RANY(obj)->as.node.u1.node); */
- ;
- }
- break; /* no need to free iv_tbl */
-
- case T_STRUCT:
- if ((RBASIC(obj)->flags & RSTRUCT_EMBED_LEN_MASK) == 0 &&
- RSTRUCT(obj)->as.heap.ptr) {
- size += sizeof(VALUE) * RSTRUCT_LEN(obj);
- }
- break;
-
- default:
- rb_bug("objspace/memsize_of(): unknown data type 0x%x(%p)",
- BUILTIN_TYPE(obj), (void*)obj);
- }
-
- return size;
-}
-
-/*
- * call-seq:
- * ObjectSpace.memsize_of(obj) -> Integer
- *
- * Return consuming memory size of obj.
- *
- * Note that this information is incomplete. You need to deal with
- * this information as only a *HINT*. Especaially, the size of
- * T_DATA may not right size.
- *
- * This method is not expected to work except C Ruby.
- */
-
-static VALUE
-memsize_of_m(VALUE self, VALUE obj)
-{
- return SIZET2NUM(memsize_of(obj));
-}
-
-static int
-set_zero_i(st_data_t key, st_data_t val, st_data_t arg)
-{
- VALUE k = (VALUE)key;
- VALUE hash = (VALUE)arg;
- rb_hash_aset(hash, k, INT2FIX(0));
- return ST_CONTINUE;
-}
-
-static int
-cos_i(void *vstart, void *vend, size_t stride, void *data)
-{
- size_t *counts = (size_t *)data;
- VALUE v = (VALUE)vstart;
-
- for (;v != (VALUE)vend; v += stride) {
- if (RBASIC(v)->flags) {
- counts[BUILTIN_TYPE(v)] += memsize_of(v);
- }
- }
- return 0;
-}
-
-/*
- * call-seq:
- * ObjectSpace.count_objects_size([result_hash]) -> hash
- *
- * Counts objects size (in bytes) for each type.
- *
- * Note that this information is incomplete. You need to deal with
- * this information as only a *HINT*. Especaially, total size of
- * T_DATA may not right size.
- *
- * It returns a hash as:
- * {:TOTAL=>1461154, :T_CLASS=>158280, :T_MODULE=>20672, :T_STRING=>527249, ...}
- *
- * If the optional argument, result_hash, is given,
- * it is overwritten and returned.
- * This is intended to avoid probe effect.
- *
- * The contents of the returned hash is implementation defined.
- * It may be changed in future.
- *
- * This method is not expected to work except C Ruby.
- */
-
-static VALUE
-count_objects_size(int argc, VALUE *argv, VALUE os)
-{
- size_t counts[T_MASK+1];
- size_t total = 0;
- size_t i;
- VALUE hash;
-
- if (rb_scan_args(argc, argv, "01", &hash) == 1) {
- if (TYPE(hash) != T_HASH)
- rb_raise(rb_eTypeError, "non-hash given");
- }
-
- for (i = 0; i <= T_MASK; i++) {
- counts[i] = 0;
- }
-
- rb_objspace_each_objects(cos_i, &counts[0]);
-
- if (hash == Qnil) {
- hash = rb_hash_new();
- }
- else if (!RHASH_EMPTY_P(hash)) {
- st_foreach(RHASH_TBL(hash), set_zero_i, hash);
- }
-
- for (i = 0; i <= T_MASK; i++) {
- if (counts[i]) {
- VALUE type;
- switch (i) {
-#define COUNT_TYPE(t) case t: type = ID2SYM(rb_intern(#t)); break;
- COUNT_TYPE(T_NONE);
- COUNT_TYPE(T_OBJECT);
- COUNT_TYPE(T_CLASS);
- COUNT_TYPE(T_MODULE);
- COUNT_TYPE(T_FLOAT);
- COUNT_TYPE(T_STRING);
- COUNT_TYPE(T_REGEXP);
- COUNT_TYPE(T_ARRAY);
- COUNT_TYPE(T_HASH);
- COUNT_TYPE(T_STRUCT);
- COUNT_TYPE(T_BIGNUM);
- COUNT_TYPE(T_FILE);
- COUNT_TYPE(T_DATA);
- COUNT_TYPE(T_MATCH);
- COUNT_TYPE(T_COMPLEX);
- COUNT_TYPE(T_RATIONAL);
- COUNT_TYPE(T_NIL);
- COUNT_TYPE(T_TRUE);
- COUNT_TYPE(T_FALSE);
- COUNT_TYPE(T_SYMBOL);
- COUNT_TYPE(T_FIXNUM);
- COUNT_TYPE(T_UNDEF);
- COUNT_TYPE(T_NODE);
- COUNT_TYPE(T_ICLASS);
- COUNT_TYPE(T_ZOMBIE);
-#undef COUNT_TYPE
- default: type = INT2NUM(i); break;
- }
- total += counts[i];
- rb_hash_aset(hash, type, SIZET2NUM(counts[i]));
- }
- }
- rb_hash_aset(hash, ID2SYM(rb_intern("TOTAL")), SIZET2NUM(total));
- return hash;
-}
-
-static int
-cn_i(void *vstart, void *vend, size_t stride, void *n)
-{
- size_t *nodes = (size_t *)n;
- VALUE v = (VALUE)vstart;
-
- for (; v != (VALUE)vend; v += stride) {
- if (RBASIC(v)->flags && BUILTIN_TYPE(v) == T_NODE) {
- size_t s = nd_type((NODE *)v);
- nodes[s]++;
- }
- }
-
- return 0;
-}
-
-/*
- * call-seq:
- * ObjectSpace.count_nodes([result_hash]) -> hash
- *
- * Counts nodes for each node type.
- *
- * This method is not for ordinary Ruby programmers, but for MRI developers
- * who have interest in MRI performance and memory usage.
- *
- * It returns a hash as:
- * {:NODE_METHOD=>2027, :NODE_FBODY=>1927, :NODE_CFUNC=>1798, ...}
- *
- * If the optional argument, result_hash, is given,
- * it is overwritten and returned.
- * This is intended to avoid probe effect.
- *
- * The contents of the returned hash is implementation defined.
- * It may be changed in future.
- *
- * This method is not expected to work except C Ruby.
- */
-
-static VALUE
-count_nodes(int argc, VALUE *argv, VALUE os)
-{
- size_t nodes[NODE_LAST+1];
- size_t i;
- VALUE hash;
-
- if (rb_scan_args(argc, argv, "01", &hash) == 1) {
- if (TYPE(hash) != T_HASH)
- rb_raise(rb_eTypeError, "non-hash given");
- }
-
- for (i = 0; i <= NODE_LAST; i++) {
- nodes[i] = 0;
- }
-
- rb_objspace_each_objects(cn_i, &nodes[0]);
-
- if (hash == Qnil) {
- hash = rb_hash_new();
- }
- else if (!RHASH_EMPTY_P(hash)) {
- st_foreach(RHASH_TBL(hash), set_zero_i, hash);
- }
-
- for (i=0; i<NODE_LAST; i++) {
- if (nodes[i] != 0) {
- VALUE node;
- switch (i) {
-#define COUNT_NODE(n) case n: node = ID2SYM(rb_intern(#n)); break;
- COUNT_NODE(NODE_SCOPE);
- COUNT_NODE(NODE_BLOCK);
- COUNT_NODE(NODE_IF);
- COUNT_NODE(NODE_CASE);
- COUNT_NODE(NODE_WHEN);
- COUNT_NODE(NODE_OPT_N);
- COUNT_NODE(NODE_WHILE);
- COUNT_NODE(NODE_UNTIL);
- COUNT_NODE(NODE_ITER);
- COUNT_NODE(NODE_FOR);
- COUNT_NODE(NODE_BREAK);
- COUNT_NODE(NODE_NEXT);
- COUNT_NODE(NODE_REDO);
- COUNT_NODE(NODE_RETRY);
- COUNT_NODE(NODE_BEGIN);
- COUNT_NODE(NODE_RESCUE);
- COUNT_NODE(NODE_RESBODY);
- COUNT_NODE(NODE_ENSURE);
- COUNT_NODE(NODE_AND);
- COUNT_NODE(NODE_OR);
- COUNT_NODE(NODE_MASGN);
- COUNT_NODE(NODE_LASGN);
- COUNT_NODE(NODE_DASGN);
- COUNT_NODE(NODE_DASGN_CURR);
- COUNT_NODE(NODE_GASGN);
- COUNT_NODE(NODE_IASGN);
- COUNT_NODE(NODE_IASGN2);
- COUNT_NODE(NODE_CDECL);
- COUNT_NODE(NODE_CVASGN);
- COUNT_NODE(NODE_CVDECL);
- COUNT_NODE(NODE_OP_ASGN1);
- COUNT_NODE(NODE_OP_ASGN2);
- COUNT_NODE(NODE_OP_ASGN_AND);
- COUNT_NODE(NODE_OP_ASGN_OR);
- COUNT_NODE(NODE_CALL);
- COUNT_NODE(NODE_FCALL);
- COUNT_NODE(NODE_VCALL);
- COUNT_NODE(NODE_SUPER);
- COUNT_NODE(NODE_ZSUPER);
- COUNT_NODE(NODE_ARRAY);
- COUNT_NODE(NODE_ZARRAY);
- COUNT_NODE(NODE_VALUES);
- COUNT_NODE(NODE_HASH);
- COUNT_NODE(NODE_RETURN);
- COUNT_NODE(NODE_YIELD);
- COUNT_NODE(NODE_LVAR);
- COUNT_NODE(NODE_DVAR);
- COUNT_NODE(NODE_GVAR);
- COUNT_NODE(NODE_IVAR);
- COUNT_NODE(NODE_CONST);
- COUNT_NODE(NODE_CVAR);
- COUNT_NODE(NODE_NTH_REF);
- COUNT_NODE(NODE_BACK_REF);
- COUNT_NODE(NODE_MATCH);
- COUNT_NODE(NODE_MATCH2);
- COUNT_NODE(NODE_MATCH3);
- COUNT_NODE(NODE_LIT);
- COUNT_NODE(NODE_STR);
- COUNT_NODE(NODE_DSTR);
- COUNT_NODE(NODE_XSTR);
- COUNT_NODE(NODE_DXSTR);
- COUNT_NODE(NODE_EVSTR);
- COUNT_NODE(NODE_DREGX);
- COUNT_NODE(NODE_DREGX_ONCE);
- COUNT_NODE(NODE_ARGS);
- COUNT_NODE(NODE_ARGS_AUX);
- COUNT_NODE(NODE_OPT_ARG);
- COUNT_NODE(NODE_POSTARG);
- COUNT_NODE(NODE_ARGSCAT);
- COUNT_NODE(NODE_ARGSPUSH);
- COUNT_NODE(NODE_SPLAT);
- COUNT_NODE(NODE_TO_ARY);
- COUNT_NODE(NODE_BLOCK_ARG);
- COUNT_NODE(NODE_BLOCK_PASS);
- COUNT_NODE(NODE_DEFN);
- COUNT_NODE(NODE_DEFS);
- COUNT_NODE(NODE_ALIAS);
- COUNT_NODE(NODE_VALIAS);
- COUNT_NODE(NODE_UNDEF);
- COUNT_NODE(NODE_CLASS);
- COUNT_NODE(NODE_MODULE);
- COUNT_NODE(NODE_SCLASS);
- COUNT_NODE(NODE_COLON2);
- COUNT_NODE(NODE_COLON3);
- COUNT_NODE(NODE_DOT2);
- COUNT_NODE(NODE_DOT3);
- COUNT_NODE(NODE_FLIP2);
- COUNT_NODE(NODE_FLIP3);
- COUNT_NODE(NODE_SELF);
- COUNT_NODE(NODE_NIL);
- COUNT_NODE(NODE_TRUE);
- COUNT_NODE(NODE_FALSE);
- COUNT_NODE(NODE_ERRINFO);
- COUNT_NODE(NODE_DEFINED);
- COUNT_NODE(NODE_POSTEXE);
- COUNT_NODE(NODE_ALLOCA);
- COUNT_NODE(NODE_BMETHOD);
- COUNT_NODE(NODE_MEMO);
- COUNT_NODE(NODE_IFUNC);
- COUNT_NODE(NODE_DSYM);
- COUNT_NODE(NODE_ATTRASGN);
- COUNT_NODE(NODE_PRELUDE);
- COUNT_NODE(NODE_LAMBDA);
- COUNT_NODE(NODE_OPTBLOCK);
-#undef COUNT_NODE
- default: node = INT2FIX(nodes[i]);
- }
- rb_hash_aset(hash, node, SIZET2NUM(nodes[i]));
- }
- }
- return hash;
-}
-
-static int
-cto_i(void *vstart, void *vend, size_t stride, void *data)
-{
- VALUE hash = (VALUE)data;
- VALUE v = (VALUE)vstart;
-
- for (; v != (VALUE)vend; v += stride) {
- if (RBASIC(v)->flags && BUILTIN_TYPE(v) == T_DATA) {
- VALUE counter = rb_hash_aref(hash, RBASIC(v)->klass);
- if (NIL_P(counter)) {
- counter = INT2FIX(1);
- }
- else {
- counter = INT2FIX(FIX2INT(counter) + 1);
- }
- rb_hash_aset(hash, RBASIC(v)->klass, counter);
- }
- }
-
- return 0;
-}
-
-/*
- * call-seq:
- * ObjectSpace.count_tdata_objects([result_hash]) -> hash
- *
- * Counts nodes for each node type.
- *
- * This method is not for ordinary Ruby programmers, but for MRI developers
- * who interest on MRI performance.
- *
- * It returns a hash as:
- * {:NODE_METHOD=>2027, :NODE_FBODY=>1927, :NODE_CFUNC=>1798, ...}
- *
- * If the optional argument, result_hash, is given,
- * it is overwritten and returned.
- * This is intended to avoid probe effect.
- *
- * The contents of the returned hash is implementation defined.
- * It may be changed in future.
- *
- * This method is not expected to work except C Ruby.
- *
- */
-
-static VALUE
-count_tdata_objects(int argc, VALUE *argv, VALUE self)
-{
- VALUE hash;
-
- if (rb_scan_args(argc, argv, "01", &hash) == 1) {
- if (TYPE(hash) != T_HASH)
- rb_raise(rb_eTypeError, "non-hash given");
- }
-
- if (hash == Qnil) {
- hash = rb_hash_new();
- }
- else if (!RHASH_EMPTY_P(hash)) {
- st_foreach(RHASH_TBL(hash), set_zero_i, hash);
- }
-
- rb_objspace_each_objects(cto_i, (void *)hash);
-
- return hash;
-}
-
-/* objspace library extends ObjectSpace module and add several
- * methods to get internal statistic information about
- * object/memory management.
- *
- * Generally, you *SHOULD NOT*use this library if you do not know
- * about the MRI implementation. Mainly, this library is for (memory)
- * profiler developers and MRI developers who need to know how MRI
- * memory usage.
- */
-
-void
-Init_objspace(void)
-{
- VALUE rb_mObjSpace = rb_const_get(rb_cObject, rb_intern("ObjectSpace"));
-
- rb_define_module_function(rb_mObjSpace, "count_objects_size", count_objects_size, -1);
- rb_define_module_function(rb_mObjSpace, "memsize_of", memsize_of_m, 1);
- rb_define_module_function(rb_mObjSpace, "count_nodes", count_nodes, -1);
- rb_define_module_function(rb_mObjSpace, "count_tdata_objects", count_tdata_objects, -1);
-}
diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb
index 6b83489642..02e06b7149 100644
--- a/ext/openssl/extconf.rb
+++ b/ext/openssl/extconf.rb
@@ -96,10 +96,7 @@ have_func("X509_STORE_set_ex_data")
have_func("OBJ_NAME_do_all_sorted")
have_func("SSL_SESSION_get_id")
have_func("OPENSSL_cleanse")
-unless have_func("SSL_set_tlsext_host_name", ['openssl/ssl.h'])
- have_macro("SSL_set_tlsext_host_name", ['openssl/ssl.h']) && $defs.push("-DHAVE_SSL_SET_TLSEXT_HOST_NAME")
-end
-if try_compile("#define FOO(...) foo(__VA_ARGS__)\n int x(){FOO(1);FOO(1,2);FOO(1,2,3);}\n")
+if try_compile("#define FOO(a, ...) foo(a, ##__VA_ARGS__)\n int x(){FOO(1);FOO(1,2);FOO(1,2,3);}\n")
$defs.push("-DHAVE_VA_ARGS_MACRO")
end
if have_header("openssl/engine.h")
diff --git a/ext/openssl/lib/net/ftptls.rb b/ext/openssl/lib/net/ftptls.rb
new file mode 100644
index 0000000000..a21c1f6c3c
--- /dev/null
+++ b/ext/openssl/lib/net/ftptls.rb
@@ -0,0 +1,53 @@
+=begin
+= $RCSfile$ -- SSL/TLS enhancement for Net::HTTP.
+
+= Info
+ 'OpenSSL for Ruby 2' project
+ Copyright (C) 2003 Blaz Grilc <farmer@gmx.co.uk>
+ All rights reserved.
+
+= Licence
+ This program is licenced under the same licence as Ruby.
+ (See the file 'LICENCE'.)
+
+= Requirements
+
+= Version
+ $Id$
+
+= Notes
+ Tested on FreeBSD 5-CURRENT and 4-STABLE
+ - ruby 1.6.8 (2003-01-17) [i386-freebsd5]
+ - OpenSSL 0.9.7a Feb 19 2003
+ - ruby-openssl-0.2.0.p0
+ tested on ftp server: glftpd 1.30
+=end
+
+require 'socket'
+require 'openssl'
+require 'net/ftp'
+
+module Net
+ class FTPTLS < FTP
+ def connect(host, port=FTP_PORT)
+ @hostname = host
+ super
+ end
+
+ def login(user = "anonymous", passwd = nil, acct = nil)
+ store = OpenSSL::X509::Store.new
+ store.set_default_paths
+ ctx = OpenSSL::SSL::SSLContext.new('SSLv23')
+ ctx.cert_store = store
+ ctx.verify_mode = OpenSSL::SSL::VERIFY_PEER
+ ctx.key = nil
+ ctx.cert = nil
+ voidcmd("AUTH TLS")
+ @sock = OpenSSL::SSL::SSLSocket.new(@sock, ctx)
+ @sock.connect
+ @sock.post_connection_check(@hostname)
+ super(user, passwd, acct)
+ voidcmd("PBSZ 0")
+ end
+ end
+end
diff --git a/ext/openssl/lib/net/telnets.rb b/ext/openssl/lib/net/telnets.rb
new file mode 100644
index 0000000000..2b69280432
--- /dev/null
+++ b/ext/openssl/lib/net/telnets.rb
@@ -0,0 +1,251 @@
+=begin
+= $RCSfile$ -- SSL/TLS enhancement for Net::Telnet.
+
+= Info
+ 'OpenSSL for Ruby 2' project
+ Copyright (C) 2001 GOTOU YUUZOU <gotoyuzo@notwork.org>
+ All rights reserved.
+
+= Licence
+ This program is licenced under the same licence as Ruby.
+ (See the file 'LICENCE'.)
+
+= Version
+ $Id$
+
+ 2001/11/06: Contiributed to Ruby/OpenSSL project.
+
+== class Net::Telnet
+
+This class will initiate SSL/TLS session automaticaly if the server
+sent OPT_STARTTLS. Some options are added for SSL/TLS.
+
+ host = Net::Telnet::new({
+ "Host" => "localhost",
+ "Port" => "telnets",
+ ## follows are new options.
+ 'CertFile' => "user.crt",
+ 'KeyFile' => "user.key",
+ 'CAFile' => "/some/where/certs/casert.pem",
+ 'CAPath' => "/some/where/caserts",
+ 'VerifyMode' => SSL::VERIFY_PEER,
+ 'VerifyCallback' => verify_proc
+ })
+
+Or, the new options ('Cert', 'Key' and 'CACert') are available from
+Michal Rokos's OpenSSL module.
+
+ cert_data = File.open("user.crt"){|io| io.read }
+ pkey_data = File.open("user.key"){|io| io.read }
+ cacert_data = File.open("your_ca.pem"){|io| io.read }
+ host = Net::Telnet::new({
+ "Host" => "localhost",
+ "Port" => "telnets",
+ 'Cert' => OpenSSL::X509::Certificate.new(cert_data)
+ 'Key' => OpenSSL::PKey::RSA.new(pkey_data)
+ 'CACert' => OpenSSL::X509::Certificate.new(cacert_data)
+ 'CAFile' => "/some/where/certs/casert.pem",
+ 'CAPath' => "/some/where/caserts",
+ 'VerifyMode' => SSL::VERIFY_PEER,
+ 'VerifyCallback' => verify_proc
+ })
+
+This class is expected to be a superset of usual Net::Telnet.
+=end
+
+require "net/telnet"
+require "openssl"
+
+module Net
+ class Telnet
+ attr_reader :ssl
+
+ OPT_STARTTLS = 46.chr # "\056" # "\x2e" # Start TLS
+ TLS_FOLLOWS = 1.chr # "\001" # "\x01" # FOLLOWS (for STARTTLS)
+
+ alias preprocess_orig preprocess
+
+ def ssl?; @ssl; end
+
+ def preprocess(string)
+ # combine CR+NULL into CR
+ string = string.gsub(/#{CR}#{NULL}/no, CR) if @options["Telnetmode"]
+
+ # combine EOL into "\n"
+ string = string.gsub(/#{EOL}/no, "\n") unless @options["Binmode"]
+
+ string.gsub(/#{IAC}(
+ [#{IAC}#{AO}#{AYT}#{DM}#{IP}#{NOP}]|
+ [#{DO}#{DONT}#{WILL}#{WONT}][#{OPT_BINARY}-#{OPT_EXOPL}]|
+ #{SB}[#{OPT_BINARY}-#{OPT_EXOPL}]
+ (#{IAC}#{IAC}|[^#{IAC}])+#{IAC}#{SE}
+ )/xno) do
+ if IAC == $1 # handle escaped IAC characters
+ IAC
+ elsif AYT == $1 # respond to "IAC AYT" (are you there)
+ self.write("nobody here but us pigeons" + EOL)
+ ''
+ elsif DO[0] == $1[0] # respond to "IAC DO x"
+ if OPT_BINARY[0] == $1[1]
+ @telnet_option["BINARY"] = true
+ self.write(IAC + WILL + OPT_BINARY)
+ elsif OPT_STARTTLS[0] == $1[1]
+ self.write(IAC + WILL + OPT_STARTTLS)
+ self.write(IAC + SB + OPT_STARTTLS + TLS_FOLLOWS + IAC + SE)
+ else
+ self.write(IAC + WONT + $1[1..1])
+ end
+ ''
+ elsif DONT[0] == $1[0] # respond to "IAC DON'T x" with "IAC WON'T x"
+ self.write(IAC + WONT + $1[1..1])
+ ''
+ elsif WILL[0] == $1[0] # respond to "IAC WILL x"
+ if OPT_BINARY[0] == $1[1]
+ self.write(IAC + DO + OPT_BINARY)
+ elsif OPT_ECHO[0] == $1[1]
+ self.write(IAC + DO + OPT_ECHO)
+ elsif OPT_SGA[0] == $1[1]
+ @telnet_option["SGA"] = true
+ self.write(IAC + DO + OPT_SGA)
+ else
+ self.write(IAC + DONT + $1[1..1])
+ end
+ ''
+ elsif WONT[0] == $1[0] # respond to "IAC WON'T x"
+ if OPT_ECHO[0] == $1[1]
+ self.write(IAC + DONT + OPT_ECHO)
+ elsif OPT_SGA[0] == $1[1]
+ @telnet_option["SGA"] = false
+ self.write(IAC + DONT + OPT_SGA)
+ else
+ self.write(IAC + DONT + $1[1..1])
+ end
+ ''
+ elsif SB[0] == $1[0] # respond to "IAC SB xxx IAC SE"
+ if OPT_STARTTLS[0] == $1[1] && TLS_FOLLOWS[0] == $2[0]
+ @sock = OpenSSL::SSL::SSLSocket.new(@sock)
+ @sock.cert = @options['Cert'] unless @sock.cert
+ @sock.key = @options['Key'] unless @sock.key
+ @sock.ca_cert = @options['CACert']
+ @sock.ca_file = @options['CAFile']
+ @sock.ca_path = @options['CAPath']
+ @sock.timeout = @options['Timeout']
+ @sock.verify_mode = @options['VerifyMode']
+ @sock.verify_callback = @options['VerifyCallback']
+ @sock.verify_depth = @options['VerifyDepth']
+ @sock.connect
+ if @options['VerifyMode'] != OpenSSL::SSL::VERIFY_NONE
+ @sock.post_connection_check(@options['Host'])
+ end
+ @ssl = true
+ end
+ ''
+ else
+ ''
+ end
+ end
+ end # preprocess
+
+ alias waitfor_org waitfor
+
+ def waitfor(options)
+ time_out = @options["Timeout"]
+ waittime = @options["Waittime"]
+
+ if options.kind_of?(Hash)
+ prompt = if options.has_key?("Match")
+ options["Match"]
+ elsif options.has_key?("Prompt")
+ options["Prompt"]
+ elsif options.has_key?("String")
+ Regexp.new( Regexp.quote(options["String"]) )
+ end
+ time_out = options["Timeout"] if options.has_key?("Timeout")
+ waittime = options["Waittime"] if options.has_key?("Waittime")
+ else
+ prompt = options
+ end
+
+ if time_out == false
+ time_out = nil
+ end
+
+ line = ''
+ buf = ''
+ @rest = '' unless @rest
+
+ until(prompt === line and not IO::select([@sock], nil, nil, waittime))
+ unless IO::select([@sock], nil, nil, time_out)
+ raise TimeoutError, "timed-out; wait for the next data"
+ end
+ begin
+ c = @rest + @sock.sysread(1024 * 1024)
+ @dumplog.log_dump('<', c) if @options.has_key?("Dump_log")
+ if @options["Telnetmode"]
+ pos = 0
+ catch(:next){
+ while true
+ case c[pos]
+ when IAC[0]
+ case c[pos+1]
+ when DO[0], DONT[0], WILL[0], WONT[0]
+ throw :next unless c[pos+2]
+ pos += 3
+ when SB[0]
+ ret = detect_sub_negotiation(c, pos)
+ throw :next unless ret
+ pos = ret
+ when nil
+ throw :next
+ else
+ pos += 2
+ end
+ when nil
+ throw :next
+ else
+ pos += 1
+ end
+ end
+ }
+
+ buf = preprocess(c[0...pos])
+ @rest = c[pos..-1]
+ end
+ @log.print(buf) if @options.has_key?("Output_log")
+ line.concat(buf)
+ yield buf if block_given?
+ rescue EOFError # End of file reached
+ if line == ''
+ line = nil
+ yield nil if block_given?
+ end
+ break
+ end
+ end
+ line
+ end
+
+ private
+
+ def detect_sub_negotiation(data, pos)
+ return nil if data.length < pos+6 # IAC SB x param IAC SE
+ pos += 3
+ while true
+ case data[pos]
+ when IAC[0]
+ if data[pos+1] == SE[0]
+ pos += 2
+ return pos
+ else
+ pos += 2
+ end
+ when nil
+ return nil
+ else
+ pos += 1
+ end
+ end
+ end
+
+ end
+end
diff --git a/ext/openssl/lib/openssl.rb b/ext/openssl/lib/openssl.rb
index 70fce196a5..f10985ed2c 100644
--- a/ext/openssl/lib/openssl.rb
+++ b/ext/openssl/lib/openssl.rb
@@ -19,6 +19,7 @@ require 'openssl.so'
require 'openssl/bn'
require 'openssl/cipher'
require 'openssl/digest'
-require 'openssl/ssl-internal'
-require 'openssl/x509-internal'
+require 'openssl/pkcs7'
+require 'openssl/ssl'
+require 'openssl/x509'
diff --git a/ext/openssl/lib/openssl/buffering.rb b/ext/openssl/lib/openssl/buffering.rb
index 3028fe5b52..761a017487 100644
--- a/ext/openssl/lib/openssl/buffering.rb
+++ b/ext/openssl/lib/openssl/buffering.rb
@@ -14,7 +14,6 @@
$Id$
=end
-module OpenSSL
module Buffering
include Enumerable
attr_accessor :sync
@@ -58,10 +57,10 @@ module Buffering
if size == 0
if buf
buf.clear
- return buf
else
- return ""
+ buf = ""
end
+ return @eof ? nil : buf
end
until @eof
break if size && size <= @rbuffer.size
@@ -79,10 +78,10 @@ module Buffering
if maxlen == 0
if buf
buf.clear
- return buf
else
- return ""
+ buf = ""
end
+ return @eof ? nil : buf
end
if @rbuffer.empty?
begin
@@ -100,60 +99,7 @@ module Buffering
ret
end
- # Reads at most _maxlen_ bytes in the non-blocking manner.
- #
- # When no data can be read without blocking,
- # It raises OpenSSL::SSL::SSLError extended by
- # IO::WaitReadable or IO::WaitWritable.
- #
- # IO::WaitReadable means SSL needs to read internally.
- # So read_nonblock should be called again after
- # underlying IO is readable.
- #
- # IO::WaitWritable means SSL needs to write internally.
- # So read_nonblock should be called again after
- # underlying IO is writable.
- #
- # So OpenSSL::Buffering#read_nonblock needs two rescue clause as follows.
- #
- # # emulates blocking read (readpartial).
- # begin
- # result = ssl.read_nonblock(maxlen)
- # rescue IO::WaitReadable
- # IO.select([io])
- # retry
- # rescue IO::WaitWritable
- # IO.select(nil, [io])
- # retry
- # end
- #
- # Note that one reason that read_nonblock write to a underlying IO
- # is the peer requests a new TLS/SSL handshake.
- # See openssl FAQ for more details.
- # http://www.openssl.org/support/faq.html
- #
- def read_nonblock(maxlen, buf=nil)
- if maxlen == 0
- if buf
- buf.clear
- return buf
- else
- return ""
- end
- end
- if @rbuffer.empty?
- return sysread_nonblock(maxlen, buf)
- end
- ret = consume_rbuff(maxlen)
- if buf
- buf.replace(ret)
- ret = buf
- end
- raise EOFError if ret.empty?
- ret
- end
-
- def gets(eol=$/, limit=nil)
+ def gets(eol=$/)
idx = @rbuffer.index(eol)
until @eof
break if idx
@@ -165,9 +111,6 @@ module Buffering
else
size = idx ? idx+eol.size : nil
end
- if limit and limit >= 0
- size = [size, limit].min
- end
consume_rbuff(size)
end
@@ -250,48 +193,6 @@ module Buffering
s.length
end
- # Writes _str_ in the non-blocking manner.
- #
- # If there are buffered data, it is flushed at first.
- # This may block.
- #
- # write_nonblock returns number of bytes written to the SSL connection.
- #
- # When no data can be written without blocking,
- # It raises OpenSSL::SSL::SSLError extended by
- # IO::WaitReadable or IO::WaitWritable.
- #
- # IO::WaitReadable means SSL needs to read internally.
- # So write_nonblock should be called again after
- # underlying IO is readable.
- #
- # IO::WaitWritable means SSL needs to write internally.
- # So write_nonblock should be called again after
- # underlying IO is writable.
- #
- # So OpenSSL::Buffering#write_nonblock needs two rescue clause as follows.
- #
- # # emulates blocking write.
- # begin
- # result = ssl.write_nonblock(str)
- # rescue IO::WaitReadable
- # IO.select([io])
- # retry
- # rescue IO::WaitWritable
- # IO.select(nil, [io])
- # retry
- # end
- #
- # Note that one reason that write_nonblock read from a underlying IO
- # is the peer requests a new TLS/SSL handshake.
- # See openssl FAQ for more details.
- # http://www.openssl.org/support/faq.html
- #
- def write_nonblock(s)
- flush
- syswrite_nonblock(s)
- end
-
def << (s)
do_write(s)
self
@@ -336,4 +237,3 @@ module Buffering
sysclose
end
end
-end
diff --git a/ext/openssl/lib/openssl/digest.rb b/ext/openssl/lib/openssl/digest.rb
index e603c41de4..4810f0121b 100644
--- a/ext/openssl/lib/openssl/digest.rb
+++ b/ext/openssl/lib/openssl/digest.rb
@@ -40,7 +40,7 @@ module OpenSSL
super(name, data.first)
}
}
- singleton = (class << klass; self; end)
+ singleton = (class <<klass; self; end)
singleton.class_eval{
define_method(:digest){|data| Digest.digest(name, data) }
define_method(:hexdigest){|data| Digest.hexdigest(name, data) }
diff --git a/ext/openssl/lib/openssl/pkcs7.rb b/ext/openssl/lib/openssl/pkcs7.rb
new file mode 100644
index 0000000000..1f88c1de5e
--- /dev/null
+++ b/ext/openssl/lib/openssl/pkcs7.rb
@@ -0,0 +1,25 @@
+=begin
+= $RCSfile$ -- PKCS7
+
+= Licence
+ This program is licenced under the same licence as Ruby.
+ (See the file 'LICENCE'.)
+
+= Version
+ $Id: digest.rb 12148 2007-04-05 05:59:22Z technorama $
+=end
+
+module OpenSSL
+ class PKCS7
+ # This class is only provided for backwards compatibility. Use OpenSSL::PKCS7 in the future.
+ class PKCS7 < PKCS7
+ def initialize(*args)
+ super(*args)
+
+ warn("Warning: OpenSSL::PKCS7::PKCS7 is deprecated after Ruby 1.9; use OpenSSL::PKCS7 instead")
+ end
+ end
+
+ end # PKCS7
+end # OpenSSL
+
diff --git a/ext/openssl/lib/openssl/ssl-internal.rb b/ext/openssl/lib/openssl/ssl-internal.rb
deleted file mode 100644
index 04a9faa0b6..0000000000
--- a/ext/openssl/lib/openssl/ssl-internal.rb
+++ /dev/null
@@ -1,177 +0,0 @@
-=begin
-= $RCSfile$ -- Ruby-space definitions that completes C-space funcs for SSL
-
-= Info
- 'OpenSSL for Ruby 2' project
- Copyright (C) 2001 GOTOU YUUZOU <gotoyuzo@notwork.org>
- All rights reserved.
-
-= Licence
- This program is licenced under the same licence as Ruby.
- (See the file 'LICENCE'.)
-
-= Version
- $Id$
-=end
-
-require "openssl/buffering"
-require "fcntl"
-
-module OpenSSL
- module SSL
- class SSLContext
- DEFAULT_PARAMS = {
- :ssl_version => "SSLv23",
- :verify_mode => OpenSSL::SSL::VERIFY_PEER,
- :ciphers => "ALL:!ADH:!EXPORT:!SSLv2:RC4+RSA:+HIGH:+MEDIUM:+LOW",
- :options => OpenSSL::SSL::OP_ALL,
- }
-
- DEFAULT_CERT_STORE = OpenSSL::X509::Store.new
- DEFAULT_CERT_STORE.set_default_paths
- if defined?(OpenSSL::X509::V_FLAG_CRL_CHECK_ALL)
- DEFAULT_CERT_STORE.flags = OpenSSL::X509::V_FLAG_CRL_CHECK_ALL
- end
-
- def set_params(params={})
- params = DEFAULT_PARAMS.merge(params)
- params.each{|name, value| self.__send__("#{name}=", value) }
- if self.verify_mode != OpenSSL::SSL::VERIFY_NONE
- unless self.ca_file or self.ca_path or self.cert_store
- self.cert_store = DEFAULT_CERT_STORE
- end
- end
- return params
- end
- end
-
- module SocketForwarder
- def addr
- to_io.addr
- end
-
- def peeraddr
- to_io.peeraddr
- end
-
- def setsockopt(level, optname, optval)
- to_io.setsockopt(level, optname, optval)
- end
-
- def getsockopt(level, optname)
- to_io.getsockopt(level, optname)
- end
-
- def fcntl(*args)
- to_io.fcntl(*args)
- end
-
- def closed?
- to_io.closed?
- end
-
- def do_not_reverse_lookup=(flag)
- to_io.do_not_reverse_lookup = flag
- end
- end
-
- module Nonblock
- def initialize(*args)
- flag = File::NONBLOCK
- flag |= @io.fcntl(Fcntl::F_GETFL) if defined?(Fcntl::F_GETFL)
- @io.fcntl(Fcntl::F_SETFL, flag)
- super
- end
- end
-
- def verify_certificate_identity(cert, hostname)
- should_verify_common_name = true
- cert.extensions.each{|ext|
- next if ext.oid != "subjectAltName"
- ext.value.split(/,\s+/).each{|general_name|
- if /\ADNS:(.*)/ =~ general_name
- should_verify_common_name = false
- reg = Regexp.escape($1).gsub(/\\\*/, "[^.]+")
- return true if /\A#{reg}\z/i =~ hostname
- elsif /\AIP Address:(.*)/ =~ general_name
- should_verify_common_name = false
- return true if $1 == hostname
- end
- }
- }
- if should_verify_common_name
- cert.subject.to_a.each{|oid, value|
- if oid == "CN"
- reg = Regexp.escape(value).gsub(/\\\*/, "[^.]+")
- return true if /\A#{reg}\z/i =~ hostname
- end
- }
- end
- return false
- end
- module_function :verify_certificate_identity
-
- class SSLSocket
- include Buffering
- include SocketForwarder
- include Nonblock
-
- def post_connection_check(hostname)
- unless OpenSSL::SSL.verify_certificate_identity(peer_cert, hostname)
- raise SSLError, "hostname was not match with the server certificate"
- end
- return true
- end
-
- def session
- SSL::Session.new(self)
- rescue SSL::Session::SessionError
- nil
- end
- end
-
- class SSLServer
- include SocketForwarder
- attr_accessor :start_immediately
-
- def initialize(svr, ctx)
- @svr = svr
- @ctx = ctx
- unless ctx.session_id_context
- session_id = OpenSSL::Digest::MD5.hexdigest($0)
- @ctx.session_id_context = session_id
- end
- @start_immediately = true
- end
-
- def to_io
- @svr
- end
-
- def listen(backlog=5)
- @svr.listen(backlog)
- end
-
- def shutdown(how=Socket::SHUT_RDWR)
- @svr.shutdown(how)
- end
-
- def accept
- sock = @svr.accept
- begin
- ssl = OpenSSL::SSL::SSLSocket.new(sock, @ctx)
- ssl.sync_close = true
- ssl.accept if @start_immediately
- ssl
- rescue SSLError => ex
- sock.close
- raise ex
- end
- end
-
- def close
- @svr.close
- end
- end
- end
-end
diff --git a/ext/openssl/lib/openssl/ssl.rb b/ext/openssl/lib/openssl/ssl.rb
index 3f17f5aa29..f722cb0c45 100644
--- a/ext/openssl/lib/openssl/ssl.rb
+++ b/ext/openssl/lib/openssl/ssl.rb
@@ -1 +1,179 @@
-require 'openssl'
+=begin
+= $RCSfile$ -- Ruby-space definitions that completes C-space funcs for SSL
+
+= Info
+ 'OpenSSL for Ruby 2' project
+ Copyright (C) 2001 GOTOU YUUZOU <gotoyuzo@notwork.org>
+ All rights reserved.
+
+= Licence
+ This program is licenced under the same licence as Ruby.
+ (See the file 'LICENCE'.)
+
+= Version
+ $Id$
+=end
+
+require "openssl"
+require "openssl/buffering"
+require "fcntl"
+
+module OpenSSL
+ module SSL
+ class SSLContext
+ DEFAULT_PARAMS = {
+ :ssl_version => "SSLv23",
+ :verify_mode => OpenSSL::SSL::VERIFY_PEER,
+ :ciphers => "ALL:!ADH:!EXPORT:!SSLv2:RC4+RSA:+HIGH:+MEDIUM:+LOW",
+ :options => OpenSSL::SSL::OP_ALL,
+ }
+
+ DEFAULT_CERT_STORE = OpenSSL::X509::Store.new
+ DEFAULT_CERT_STORE.set_default_paths
+ if defined?(OpenSSL::X509::V_FLAG_CRL_CHECK_ALL)
+ DEFAULT_CERT_STORE.flags = OpenSSL::X509::V_FLAG_CRL_CHECK_ALL
+ end
+
+ def set_params(params={})
+ params = DEFAULT_PARAMS.merge(params)
+ self.ssl_version = params.delete(:ssl_version)
+ params.each{|name, value| self.__send__("#{name}=", value) }
+ if self.verify_mode != OpenSSL::SSL::VERIFY_NONE
+ unless self.ca_file or self.ca_path or self.cert_store
+ self.cert_store = DEFAULT_CERT_STORE
+ end
+ end
+ return params
+ end
+ end
+
+ module SocketForwarder
+ def addr
+ to_io.addr
+ end
+
+ def peeraddr
+ to_io.peeraddr
+ end
+
+ def setsockopt(level, optname, optval)
+ to_io.setsockopt(level, optname, optval)
+ end
+
+ def getsockopt(level, optname)
+ to_io.getsockopt(level, optname)
+ end
+
+ def fcntl(*args)
+ to_io.fcntl(*args)
+ end
+
+ def closed?
+ to_io.closed?
+ end
+
+ def do_not_reverse_lookup=(flag)
+ to_io.do_not_reverse_lookup = flag
+ end
+ end
+
+ module Nonblock
+ def initialize(*args)
+ flag = File::NONBLOCK
+ flag |= @io.fcntl(Fcntl::F_GETFL) if defined?(Fcntl::F_GETFL)
+ @io.fcntl(Fcntl::F_SETFL, flag)
+ super
+ end
+ end
+
+ def verify_certificate_identity(cert, hostname)
+ should_verify_common_name = true
+ cert.extensions.each{|ext|
+ next if ext.oid != "subjectAltName"
+ ext.value.split(/,\s+/).each{|general_name|
+ if /\ADNS:(.*)/ =~ general_name
+ should_verify_common_name = false
+ reg = Regexp.escape($1).gsub(/\\\*/, "[^.]+")
+ return true if /\A#{reg}\z/i =~ hostname
+ elsif /\AIP Address:(.*)/ =~ general_name
+ should_verify_common_name = false
+ return true if $1 == hostname
+ end
+ }
+ }
+ if should_verify_common_name
+ cert.subject.to_a.each{|oid, value|
+ if oid == "CN"
+ reg = Regexp.escape(value).gsub(/\\\*/, "[^.]+")
+ return true if /\A#{reg}\z/i =~ hostname
+ end
+ }
+ end
+ return false
+ end
+ module_function :verify_certificate_identity
+
+ class SSLSocket
+ include Buffering
+ include SocketForwarder
+ include Nonblock
+
+ def post_connection_check(hostname)
+ unless OpenSSL::SSL.verify_certificate_identity(peer_cert, hostname)
+ raise SSLError, "hostname was not match with the server certificate"
+ end
+ return true
+ end
+
+ def session
+ SSL::Session.new(self)
+ rescue SSL::Session::SessionError
+ nil
+ end
+ end
+
+ class SSLServer
+ include SocketForwarder
+ attr_accessor :start_immediately
+
+ def initialize(svr, ctx)
+ @svr = svr
+ @ctx = ctx
+ unless ctx.session_id_context
+ session_id = OpenSSL::Digest::MD5.hexdigest($0)
+ @ctx.session_id_context = session_id
+ end
+ @start_immediately = true
+ end
+
+ def to_io
+ @svr
+ end
+
+ def listen(backlog=5)
+ @svr.listen(backlog)
+ end
+
+ def shutdown(how=Socket::SHUT_RDWR)
+ @svr.shutdown(how)
+ end
+
+ def accept
+ sock = @svr.accept
+ begin
+ ssl = OpenSSL::SSL::SSLSocket.new(sock, @ctx)
+ ssl.sync_close = true
+ ssl.accept if @start_immediately
+ ssl
+ rescue SSLError => ex
+ sock.close
+ raise ex
+ end
+ end
+
+ def close
+ @svr.close
+ end
+ end
+ end
+end
diff --git a/ext/openssl/lib/openssl/x509-internal.rb b/ext/openssl/lib/openssl/x509-internal.rb
deleted file mode 100644
index 6aff4ca10d..0000000000
--- a/ext/openssl/lib/openssl/x509-internal.rb
+++ /dev/null
@@ -1,153 +0,0 @@
-=begin
-= $RCSfile$ -- Ruby-space definitions that completes C-space funcs for X509 and subclasses
-
-= Info
- 'OpenSSL for Ruby 2' project
- Copyright (C) 2002 Michal Rokos <m.rokos@sh.cvut.cz>
- All rights reserved.
-
-= Licence
- This program is licenced under the same licence as Ruby.
- (See the file 'LICENCE'.)
-
-= Version
- $Id$
-=end
-
-module OpenSSL
- module X509
- class ExtensionFactory
- def create_extension(*arg)
- if arg.size > 1
- create_ext(*arg)
- else
- send("create_ext_from_"+arg[0].class.name.downcase, arg[0])
- end
- end
-
- def create_ext_from_array(ary)
- raise ExtensionError, "unexpected array form" if ary.size > 3
- create_ext(ary[0], ary[1], ary[2])
- end
-
- def create_ext_from_string(str) # "oid = critical, value"
- oid, value = str.split(/=/, 2)
- oid.strip!
- value.strip!
- create_ext(oid, value)
- end
-
- def create_ext_from_hash(hash)
- create_ext(hash["oid"], hash["value"], hash["critical"])
- end
- end
-
- class Extension
- def to_s # "oid = critical, value"
- str = self.oid
- str << " = "
- str << "critical, " if self.critical?
- str << self.value.gsub(/\n/, ", ")
- end
-
- def to_h # {"oid"=>sn|ln, "value"=>value, "critical"=>true|false}
- {"oid"=>self.oid,"value"=>self.value,"critical"=>self.critical?}
- end
-
- def to_a
- [ self.oid, self.value, self.critical? ]
- end
- end
-
- class Name
- module RFC2253DN
- Special = ',=+<>#;'
- HexChar = /[0-9a-fA-F]/
- HexPair = /#{HexChar}#{HexChar}/
- HexString = /#{HexPair}+/
- Pair = /\\(?:[#{Special}]|\\|"|#{HexPair})/
- StringChar = /[^#{Special}\\"]/
- QuoteChar = /[^\\"]/
- AttributeType = /[a-zA-Z][0-9a-zA-Z]*|[0-9]+(?:\.[0-9]+)*/
- AttributeValue = /
- (?!["#])((?:#{StringChar}|#{Pair})*)|
- \#(#{HexString})|
- "((?:#{QuoteChar}|#{Pair})*)"
- /x
- TypeAndValue = /\A(#{AttributeType})=#{AttributeValue}/
-
- module_function
-
- def expand_pair(str)
- return nil unless str
- return str.gsub(Pair){
- pair = $&
- case pair.size
- when 2 then pair[1,1]
- when 3 then Integer("0x#{pair[1,2]}").chr
- else raise OpenSSL::X509::NameError, "invalid pair: #{str}"
- end
- }
- end
-
- def expand_hexstring(str)
- return nil unless str
- der = str.gsub(HexPair){$&.to_i(16).chr }
- a1 = OpenSSL::ASN1.decode(der)
- return a1.value, a1.tag
- end
-
- def expand_value(str1, str2, str3)
- value = expand_pair(str1)
- value, tag = expand_hexstring(str2) unless value
- value = expand_pair(str3) unless value
- return value, tag
- end
-
- def scan(dn)
- str = dn
- ary = []
- while true
- if md = TypeAndValue.match(str)
- matched = md.to_s
- remain = md.post_match
- type = md[1]
- value, tag = expand_value(md[2], md[3], md[4]) rescue nil
- if value
- type_and_value = [type, value]
- type_and_value.push(tag) if tag
- ary.unshift(type_and_value)
- if remain.length > 2 && remain[0] == ?,
- str = remain[1..-1]
- next
- elsif remain.length > 2 && remain[0] == ?+
- raise OpenSSL::X509::NameError,
- "multi-valued RDN is not supported: #{dn}"
- elsif remain.empty?
- break
- end
- end
- end
- msg_dn = dn[0, dn.length - str.length] + " =>" + str
- raise OpenSSL::X509::NameError, "malformed RDN: #{msg_dn}"
- end
- return ary
- end
- end
-
- class <<self
- def parse_rfc2253(str, template=OBJECT_TYPE_TEMPLATE)
- ary = OpenSSL::X509::Name::RFC2253DN.scan(str)
- self.new(ary, template)
- end
-
- def parse_openssl(str, template=OBJECT_TYPE_TEMPLATE)
- ary = str.scan(/\s*([^\/,]+)\s*/).collect{|i| i[0].split("=", 2) }
- self.new(ary, template)
- end
-
- alias parse parse_openssl
- end
- end
- end
-end
diff --git a/ext/openssl/lib/openssl/x509.rb b/ext/openssl/lib/openssl/x509.rb
index 3f17f5aa29..e711bda39c 100644
--- a/ext/openssl/lib/openssl/x509.rb
+++ b/ext/openssl/lib/openssl/x509.rb
@@ -1 +1,154 @@
-require 'openssl'
+=begin
+= $RCSfile$ -- Ruby-space definitions that completes C-space funcs for X509 and subclasses
+
+= Info
+ 'OpenSSL for Ruby 2' project
+ Copyright (C) 2002 Michal Rokos <m.rokos@sh.cvut.cz>
+ All rights reserved.
+
+= Licence
+ This program is licenced under the same licence as Ruby.
+ (See the file 'LICENCE'.)
+
+= Version
+ $Id$
+=end
+
+require "openssl"
+
+module OpenSSL
+ module X509
+ class ExtensionFactory
+ def create_extension(*arg)
+ if arg.size > 1
+ create_ext(*arg)
+ else
+ send("create_ext_from_"+arg[0].class.name.downcase, arg[0])
+ end
+ end
+
+ def create_ext_from_array(ary)
+ raise ExtensionError, "unexpected array form" if ary.size > 3
+ create_ext(ary[0], ary[1], ary[2])
+ end
+
+ def create_ext_from_string(str) # "oid = critical, value"
+ oid, value = str.split(/=/, 2)
+ oid.strip!
+ value.strip!
+ create_ext(oid, value)
+ end
+
+ def create_ext_from_hash(hash)
+ create_ext(hash["oid"], hash["value"], hash["critical"])
+ end
+ end
+
+ class Extension
+ def to_s # "oid = critical, value"
+ str = self.oid
+ str << " = "
+ str << "critical, " if self.critical?
+ str << self.value.gsub(/\n/, ", ")
+ end
+
+ def to_h # {"oid"=>sn|ln, "value"=>value, "critical"=>true|false}
+ {"oid"=>self.oid,"value"=>self.value,"critical"=>self.critical?}
+ end
+
+ def to_a
+ [ self.oid, self.value, self.critical? ]
+ end
+ end
+
+ class Name
+ module RFC2253DN
+ Special = ',=+<>#;'
+ HexChar = /[0-9a-fA-F]/
+ HexPair = /#{HexChar}#{HexChar}/
+ HexString = /#{HexPair}+/
+ Pair = /\\(?:[#{Special}]|\\|"|#{HexPair})/
+ StringChar = /[^#{Special}\\"]/
+ QuoteChar = /[^\\"]/
+ AttributeType = /[a-zA-Z][0-9a-zA-Z]*|[0-9]+(?:\.[0-9]+)*/
+ AttributeValue = /
+ (?!["#])((?:#{StringChar}|#{Pair})*)|
+ \#(#{HexString})|
+ "((?:#{QuoteChar}|#{Pair})*)"
+ /x
+ TypeAndValue = /\A(#{AttributeType})=#{AttributeValue}/
+
+ module_function
+
+ def expand_pair(str)
+ return nil unless str
+ return str.gsub(Pair){|pair|
+ case pair.size
+ when 2 then pair[1,1]
+ when 3 then Integer("0x#{pair[1,2]}").chr
+ else raise OpenSSL::X509::NameError, "invalid pair: #{str}"
+ end
+ }
+ end
+
+ def expand_hexstring(str)
+ return nil unless str
+ der = str.gsub(HexPair){|hex| Integer("0x#{hex}").chr }
+ a1 = OpenSSL::ASN1.decode(der)
+ return a1.value, a1.tag
+ end
+
+ def expand_value(str1, str2, str3)
+ value = expand_pair(str1)
+ value, tag = expand_hexstring(str2) unless value
+ value = expand_pair(str3) unless value
+ return value, tag
+ end
+
+ def scan(dn)
+ str = dn
+ ary = []
+ while true
+ if md = TypeAndValue.match(str)
+ matched = md.to_s
+ remain = md.post_match
+ type = md[1]
+ value, tag = expand_value(md[2], md[3], md[4]) rescue nil
+ if value
+ type_and_value = [type, value]
+ type_and_value.push(tag) if tag
+ ary.unshift(type_and_value)
+ if remain.length > 2 && remain[0] == ?,
+ str = remain[1..-1]
+ next
+ elsif remain.length > 2 && remain[0] == ?+
+ raise OpenSSL::X509::NameError,
+ "multi-valued RDN is not supported: #{dn}"
+ elsif remain.empty?
+ break
+ end
+ end
+ end
+ msg_dn = dn[0, dn.length - str.length] + " =>" + str
+ raise OpenSSL::X509::NameError, "malformed RDN: #{msg_dn}"
+ end
+ return ary
+ end
+ end
+
+ class <<self
+ def parse_rfc2253(str, template=OBJECT_TYPE_TEMPLATE)
+ ary = OpenSSL::X509::Name::RFC2253DN.scan(str)
+ self.new(ary, template)
+ end
+
+ def parse_openssl(str, template=OBJECT_TYPE_TEMPLATE)
+ ary = str.scan(/\s*([^\/,]+)\s*/).collect{|i| i[0].split("=", 2) }
+ self.new(ary, template)
+ end
+
+ alias parse parse_openssl
+ end
+ end
+ end
+end
diff --git a/ext/openssl/openssl_missing.h b/ext/openssl/openssl_missing.h
index 619cf6fdb5..3450b8130d 100644
--- a/ext/openssl/openssl_missing.h
+++ b/ext/openssl/openssl_missing.h
@@ -15,52 +15,45 @@
extern "C" {
#endif
-#ifndef TYPEDEF_D2I_OF
-typedef char *d2i_of_void();
-#endif
-#ifndef TYPEDEF_I2D_OF
-typedef int i2d_of_void();
-#endif
-
/*
* These functions are not included in headers of OPENSSL <= 0.9.6b
*/
#if !defined(PEM_read_bio_DSAPublicKey)
# define PEM_read_bio_DSAPublicKey(bp,x,cb,u) (DSA *)PEM_ASN1_read_bio( \
- (d2i_of_void *)d2i_DSAPublicKey,PEM_STRING_DSA_PUBLIC,bp,(void **)x,cb,u)
+ (char *(*)())d2i_DSAPublicKey,PEM_STRING_DSA_PUBLIC,bp,(char **)x,cb,u)
#endif
#if !defined(PEM_write_bio_DSAPublicKey)
# define PEM_write_bio_DSAPublicKey(bp,x) \
- PEM_ASN1_write_bio((i2d_of_void *)i2d_DSAPublicKey,\
+ PEM_ASN1_write_bio((int (*)())i2d_DSAPublicKey,\
PEM_STRING_DSA_PUBLIC,\
bp,(char *)x, NULL, NULL, 0, NULL, NULL)
#endif
#if !defined(DSAPrivateKey_dup)
-# define DSAPrivateKey_dup(dsa) (DSA *)ASN1_dup((i2d_of_void *)i2d_DSAPrivateKey, \
- (d2i_of_void *)d2i_DSAPrivateKey,(char *)dsa)
+# define DSAPrivateKey_dup(dsa) (DSA *)ASN1_dup((int (*)())i2d_DSAPrivateKey, \
+ (char *(*)())d2i_DSAPrivateKey,(char *)dsa)
#endif
#if !defined(DSAPublicKey_dup)
-# define DSAPublicKey_dup(dsa) (DSA *)ASN1_dup((i2d_of_void *)i2d_DSAPublicKey, \
- (d2i_of_void *)d2i_DSAPublicKey,(char *)dsa)
+# define DSAPublicKey_dup(dsa) (DSA *)ASN1_dup((int (*)())i2d_DSAPublicKey, \
+ (char *(*)())d2i_DSAPublicKey,(char *)dsa)
#endif
#if !defined(X509_REVOKED_dup)
-# define X509_REVOKED_dup(rev) (X509_REVOKED *)ASN1_dup((i2d_of_void *)i2d_X509_REVOKED, \
- (d2i_of_void *)d2i_X509_REVOKED, (char *)rev)
+# define X509_REVOKED_dup(rev) (X509_REVOKED *)ASN1_dup((int (*)())i2d_X509_REVOKED, \
+ (char *(*)())d2i_X509_REVOKED, (char *)rev)
#endif
#if !defined(PKCS7_SIGNER_INFO_dup)
-# define PKCS7_SIGNER_INFO_dup(si) (PKCS7_SIGNER_INFO *)ASN1_dup((i2d_of_void *)i2d_PKCS7_SIGNER_INFO, \
- (d2i_of_void *)d2i_PKCS7_SIGNER_INFO, (char *)si)
+# define PKCS7_SIGNER_INFO_dup(si) (PKCS7_SIGNER_INFO *)ASN1_dup((int (*)())i2d_PKCS7_SIGNER_INFO, \
+ (char *(*)())d2i_PKCS7_SIGNER_INFO, (char *)si)
#endif
#if !defined(PKCS7_RECIP_INFO_dup)
-# define PKCS7_RECIP_INFO_dup(ri) (PKCS7_RECIP_INFO *)ASN1_dup((i2d_of_void *)i2d_PKCS7_RECIP_INFO, \
- (d2i_of_void *)d2i_PKCS7_RECIP_INFO, (char *)ri)
+# define PKCS7_RECIP_INFO_dup(ri) (PKCS7_RECIP_INFO *)ASN1_dup((int (*)())i2d_PKCS7_RECIP_INFO, \
+ (char *(*)())d2i_PKCS7_RECIP_INFO, (char *)ri)
#endif
#if !defined(HAVE_EVP_MD_CTX_INIT)
diff --git a/ext/openssl/ossl.c b/ext/openssl/ossl.c
index d4a2dc1276..53f476fd65 100644
--- a/ext/openssl/ossl.c
+++ b/ext/openssl/ossl.c
@@ -15,7 +15,7 @@
* String to HEXString conversion
*/
int
-string2hex(const unsigned char *buf, int buf_len, char **hexbuf, int *hexbuf_len)
+string2hex(char *buf, int buf_len, char **hexbuf, int *hexbuf_len)
{
static const char hex[]="0123456789abcdef";
int i, len = 2 * buf_len;
@@ -272,9 +272,10 @@ ossl_to_der_if_possible(VALUE obj)
/*
* Errors
*/
-static VALUE
-ossl_make_error(VALUE exc, const char *fmt, va_list args)
+void
+ossl_raise(VALUE exc, const char *fmt, ...)
{
+ va_list args;
char buf[BUFSIZ];
const char *msg;
long e;
@@ -286,14 +287,17 @@ ossl_make_error(VALUE exc, const char *fmt, va_list args)
e = ERR_peek_error();
#endif
if (fmt) {
+ va_start(args, fmt);
len = vsnprintf(buf, BUFSIZ, fmt, args);
+ va_end(args);
}
if (len < BUFSIZ && e) {
if (dOSSL == Qtrue) /* FULL INFO */
msg = ERR_error_string(e, NULL);
else
msg = ERR_reason_error_string(e);
- len += snprintf(buf+len, BUFSIZ-len, "%s%s", (len ? ": " : ""), msg);
+ fmt = len ? ": %s" : "%s";
+ len += snprintf(buf+len, BUFSIZ-len, fmt, msg);
}
if (dOSSL == Qtrue){ /* show all errors on the stack */
while ((e = ERR_get_error()) != 0){
@@ -303,29 +307,7 @@ ossl_make_error(VALUE exc, const char *fmt, va_list args)
ERR_clear_error();
if(len > BUFSIZ) len = strlen(buf);
- return rb_exc_new(exc, buf, len);
-}
-
-void
-ossl_raise(VALUE exc, const char *fmt, ...)
-{
- va_list args;
- VALUE err;
- va_start(args, fmt);
- err = ossl_make_error(exc, fmt, args);
- va_end(args);
- rb_exc_raise(err);
-}
-
-VALUE
-ossl_exc_new(VALUE exc, const char *fmt, ...)
-{
- va_list args;
- VALUE err;
- va_start(args, fmt);
- err = ossl_make_error(exc, fmt, args);
- va_end(args);
- return err;
+ rb_exc_raise(rb_exc_new(exc, buf, len));
}
/*
@@ -464,7 +446,7 @@ Init_openssl()
/*
* Verify callback Proc index for ext-data
*/
- if ((ossl_verify_cb_idx = X509_STORE_CTX_get_ex_new_index(0, (void *)"ossl_verify_cb_idx", 0, 0, 0)) < 0)
+ if ((ossl_verify_cb_idx = X509_STORE_CTX_get_ex_new_index(0, "ossl_verify_cb_idx", 0, 0, 0)) < 0)
ossl_raise(eOSSLError, "X509_STORE_CTX_get_ex_new_index");
/*
@@ -506,7 +488,7 @@ Init_openssl()
* Check if all symbols are OK with 'make LDSHARED=gcc all'
*/
int
-main(int argc, char *argv[])
+main(int argc, char *argv[], char *env[])
{
return 0;
}
diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h
index 9ac1525085..3cc30ae2e8 100644
--- a/ext/openssl/ossl.h
+++ b/ext/openssl/ossl.h
@@ -29,7 +29,7 @@ extern "C" {
# undef RFILE
#endif
#include <ruby.h>
-#include <ruby/io.h>
+#include <rubyio.h>
/*
* Check the OpenSSL version
@@ -46,7 +46,11 @@ extern "C" {
#if defined(_WIN32)
# define OSSL_NO_CONF_API 1
-# include <winsock2.h>
+# ifdef USE_WINSOCK2
+# include <winsock2.h>
+# else
+# include <winsock.h>
+# endif
#endif
#include <errno.h>
#include <openssl/err.h>
@@ -106,7 +110,7 @@ extern VALUE eOSSLError;
/*
* String to HEXString conversion
*/
-int string2hex(const unsigned char *, int, char **, int *);
+int string2hex(char *, int, char **, int *);
/*
* Data Conversion
@@ -135,7 +139,6 @@ int ossl_pem_passwd_cb(char *, int, int, void *);
*/
#define OSSL_ErrMsg() ERR_reason_error_string(ERR_get_error())
NORETURN(void ossl_raise(VALUE, const char *, ...));
-VALUE ossl_exc_new(VALUE, const char *, ...);
/*
* Verify callback
@@ -164,10 +167,10 @@ VALUE ossl_to_der_if_possible(VALUE);
extern VALUE dOSSL;
#if defined(HAVE_VA_ARGS_MACRO)
-#define OSSL_Debug(...) do { \
+#define OSSL_Debug(fmt, ...) do { \
if (dOSSL == Qtrue) { \
fprintf(stderr, "OSSL_DEBUG: "); \
- fprintf(stderr, __VA_ARGS__); \
+ fprintf(stderr, fmt, ##__VA_ARGS__); \
fprintf(stderr, " [%s:%d]\n", __FILE__, __LINE__); \
} \
} while (0)
diff --git a/ext/openssl/ossl_asn1.c b/ext/openssl/ossl_asn1.c
index 6aff2b7e95..8ceea95021 100644
--- a/ext/openssl/ossl_asn1.c
+++ b/ext/openssl/ossl_asn1.c
@@ -33,7 +33,7 @@ asn1time_to_time(ASN1_TIME *time)
switch (time->type) {
case V_ASN1_UTCTIME:
- if (sscanf((const char *)time->data, "%2d%2d%2d%2d%2d%2dZ", &tm.tm_year, &tm.tm_mon,
+ if (sscanf(time->data, "%2d%2d%2d%2d%2d%2dZ", &tm.tm_year, &tm.tm_mon,
&tm.tm_mday, &tm.tm_hour, &tm.tm_min, &tm.tm_sec) != 6) {
ossl_raise(rb_eTypeError, "bad UTCTIME format");
}
@@ -44,7 +44,7 @@ asn1time_to_time(ASN1_TIME *time)
}
break;
case V_ASN1_GENERALIZEDTIME:
- if (sscanf((const char *)time->data, "%4d%2d%2d%2d%2d%2dZ", &tm.tm_year, &tm.tm_mon,
+ if (sscanf(time->data, "%4d%2d%2d%2d%2d%2dZ", &tm.tm_year, &tm.tm_mon,
&tm.tm_mday, &tm.tm_hour, &tm.tm_min, &tm.tm_sec) != 6) {
ossl_raise(rb_eTypeError, "bad GENERALIZEDTIME format" );
}
@@ -80,7 +80,7 @@ time_to_time_t(VALUE time)
VALUE
asn1str_to_str(ASN1_STRING *str)
{
- return rb_str_new((const char *)str->data, str->length);
+ return rb_str_new(str->data, str->length);
}
/*
@@ -214,7 +214,7 @@ obj_to_asn1bstr(VALUE obj, long unused_bits)
StringValue(obj);
if(!(bstr = ASN1_BIT_STRING_new()))
ossl_raise(eASN1Error, NULL);
- ASN1_BIT_STRING_set(bstr, (unsigned char *)RSTRING_PTR(obj), RSTRING_LEN(obj));
+ ASN1_BIT_STRING_set(bstr, RSTRING_PTR(obj), RSTRING_LEN(obj));
bstr->flags &= ~(ASN1_STRING_FLAG_BITS_LEFT|0x07); /* clear */
bstr->flags |= ASN1_STRING_FLAG_BITS_LEFT|(unused_bits&0x07);
@@ -306,21 +306,21 @@ obj_to_asn1derstr(VALUE obj)
static VALUE
decode_bool(unsigned char* der, int length)
{
- int val;
- const unsigned char *p;
+ int bool;
+ unsigned char *p;
p = der;
- if((val = d2i_ASN1_BOOLEAN(NULL, &p, length)) < 0)
+ if((bool = d2i_ASN1_BOOLEAN(NULL, &p, length)) < 0)
ossl_raise(eASN1Error, NULL);
- return val ? Qtrue : Qfalse;
+ return bool ? Qtrue : Qfalse;
}
static VALUE
decode_int(unsigned char* der, int length)
{
ASN1_INTEGER *ai;
- const unsigned char *p;
+ unsigned char *p;
VALUE ret;
int status = 0;
@@ -339,7 +339,7 @@ static VALUE
decode_bstr(unsigned char* der, int length, long *unused_bits)
{
ASN1_BIT_STRING *bstr;
- const unsigned char *p;
+ unsigned char *p, *buf;
long len;
VALUE ret;
@@ -347,11 +347,16 @@ decode_bstr(unsigned char* der, int length, long *unused_bits)
if(!(bstr = d2i_ASN1_BIT_STRING(NULL, &p, length)))
ossl_raise(eASN1Error, NULL);
len = bstr->length;
+ if(!(buf = OPENSSL_malloc(len))){
+ ASN1_BIT_STRING_free(bstr);
+ ossl_raise(eASN1Error, NULL);
+ }
*unused_bits = 0;
if(bstr->flags & ASN1_STRING_FLAG_BITS_LEFT)
*unused_bits = bstr->flags & 0x07;
- ret = rb_str_new((const char *)bstr->data, len);
+ memcpy(buf, bstr->data, len);
ASN1_BIT_STRING_free(bstr);
+ ret = ossl_buf2str(buf, len);
return ret;
}
@@ -360,7 +365,7 @@ static VALUE
decode_enum(unsigned char* der, int length)
{
ASN1_ENUMERATED *ai;
- const unsigned char *p;
+ unsigned char *p;
VALUE ret;
int status = 0;
@@ -379,7 +384,7 @@ static VALUE
decode_null(unsigned char* der, int length)
{
ASN1_NULL *null;
- const unsigned char *p;
+ unsigned char *p;
p = der;
if(!(null = d2i_ASN1_NULL(NULL, &p, length)))
@@ -393,7 +398,7 @@ static VALUE
decode_obj(unsigned char* der, int length)
{
ASN1_OBJECT *obj;
- const unsigned char *p;
+ unsigned char *p;
VALUE ret;
int nid;
BIO *bio;
@@ -422,7 +427,7 @@ static VALUE
decode_time(unsigned char* der, int length)
{
ASN1_TIME *time;
- const unsigned char *p;
+ unsigned char *p;
VALUE ret;
int status = 0;
@@ -495,7 +500,7 @@ ossl_asn1_get_asn1type(VALUE obj)
value = ossl_asn1_get_value(obj);
switch(tag){
case V_ASN1_BOOLEAN:
- ptr = (void*)(VALUE)obj_to_asn1bool(value);
+ ptr = (void*)obj_to_asn1bool(value);
free_func = NULL;
break;
case V_ASN1_INTEGER: /* FALLTHROUGH */
@@ -697,7 +702,7 @@ ossl_asn1data_to_der(VALUE self)
if((length = ASN1_object_size(1, RSTRING_LEN(value), tag)) <= 0)
ossl_raise(eASN1Error, NULL);
der = rb_str_new(0, length);
- p = (unsigned char *)RSTRING_PTR(der);
+ p = RSTRING_PTR(der);
ASN1_put_object(&p, is_cons, RSTRING_LEN(value), tag, tag_class);
memcpy(p, RSTRING_PTR(value), RSTRING_LEN(value));
p += RSTRING_LEN(value);
@@ -711,7 +716,6 @@ ossl_asn1_decode0(unsigned char **pp, long length, long *offset, long depth,
int once, int yield)
{
unsigned char *start, *p;
- const unsigned char *p0;
long len, off = *offset;
int hlen, tag, tc, j;
VALUE ary, asn1data, value, tag_class;
@@ -720,9 +724,7 @@ ossl_asn1_decode0(unsigned char **pp, long length, long *offset, long depth,
p = *pp;
while(length > 0){
start = p;
- p0 = p;
- j = ASN1_get_object(&p0, &len, &tag, &tc, length);
- p = (unsigned char *)p0;
+ j = ASN1_get_object(&p, &len, &tag, &tc, length);
if(j & 0x80) ossl_raise(eASN1Error, NULL);
hlen = p - start;
if(yield){
@@ -757,7 +759,7 @@ ossl_asn1_decode0(unsigned char **pp, long length, long *offset, long depth,
else value = ossl_asn1_decode0(&p, len, &off, depth+1, 0, yield);
}
else{
- value = rb_str_new((const char *)p, len);
+ value = rb_str_new(p, len);
p += len;
off += len;
}
@@ -822,7 +824,7 @@ ossl_asn1_traverse(VALUE self, VALUE obj)
obj = ossl_to_der_if_possible(obj);
tmp = rb_str_new4(StringValue(obj));
- p = (unsigned char *)RSTRING_PTR(tmp);
+ p = RSTRING_PTR(tmp);
ossl_asn1_decode0(&p, RSTRING_LEN(tmp), &offset, 0, 0, 1);
return Qnil;
@@ -838,7 +840,7 @@ ossl_asn1_decode(VALUE self, VALUE obj)
obj = ossl_to_der_if_possible(obj);
tmp = rb_str_new4(StringValue(obj));
- p = (unsigned char *)RSTRING_PTR(tmp);
+ p = RSTRING_PTR(tmp);
ary = ossl_asn1_decode0(&p, RSTRING_LEN(tmp), &offset, 0, 1, 0);
ret = rb_ary_entry(ary, 0);
@@ -855,7 +857,7 @@ ossl_asn1_decode_all(VALUE self, VALUE obj)
obj = ossl_to_der_if_possible(obj);
tmp = rb_str_new4(StringValue(obj));
- p = (unsigned char *)RSTRING_PTR(tmp);
+ p = RSTRING_PTR(tmp);
ret = ossl_asn1_decode0(&p, RSTRING_LEN(tmp), &offset, 0, 0, 0);
return ret;
@@ -923,7 +925,7 @@ ossl_asn1prim_to_der(VALUE self)
{
ASN1_TYPE *asn1;
int tn, tc, explicit;
- long len, reallen;
+ long length, reallen;
unsigned char *buf, *p;
VALUE str;
@@ -932,25 +934,27 @@ ossl_asn1prim_to_der(VALUE self)
explicit = ossl_asn1_is_explicit(self);
asn1 = ossl_asn1_get_asn1type(self);
- len = ASN1_object_size(1, ossl_i2d_ASN1_TYPE(asn1, NULL), tn);
- if(!(buf = OPENSSL_malloc(len))){
+ length = ASN1_object_size(1, ossl_i2d_ASN1_TYPE(asn1, NULL), tn);
+ if(!(buf = OPENSSL_malloc(length))){
ossl_ASN1_TYPE_free(asn1);
ossl_raise(eASN1Error, "cannot alloc buffer");
}
p = buf;
- if (tc == V_ASN1_UNIVERSAL) {
- ossl_i2d_ASN1_TYPE(asn1, &p);
- } else if (explicit) {
- ASN1_put_object(&p, 1, ossl_i2d_ASN1_TYPE(asn1, NULL), tn, tc);
- ossl_i2d_ASN1_TYPE(asn1, &p);
- } else {
- ossl_i2d_ASN1_TYPE(asn1, &p);
- *buf = tc | tn | (*buf & V_ASN1_CONSTRUCTED);
+ if(tc == V_ASN1_UNIVERSAL) ossl_i2d_ASN1_TYPE(asn1, &p);
+ else{
+ if(explicit){
+ ASN1_put_object(&p, 1, ossl_i2d_ASN1_TYPE(asn1, NULL), tn, tc);
+ ossl_i2d_ASN1_TYPE(asn1, &p);
+ }
+ else{
+ ossl_i2d_ASN1_TYPE(asn1, &p);
+ *buf = tc | tn | (*buf & V_ASN1_CONSTRUCTED);
+ }
}
ossl_ASN1_TYPE_free(asn1);
reallen = p - buf;
- assert(reallen <= len);
- str = ossl_buf2str((char *)buf, reallen); /* buf will be free in ossl_buf2str */
+ assert(reallen <= length);
+ str = ossl_buf2str(buf, reallen); /* buf will be free in ossl_buf2str */
return str;
}
@@ -972,7 +976,7 @@ ossl_asn1cons_to_der(VALUE self)
seq_len = ASN1_object_size(1, RSTRING_LEN(value), tag);
length = ASN1_object_size(1, seq_len, tn);
str = rb_str_new(0, length);
- p = (unsigned char *)RSTRING_PTR(str);
+ p = RSTRING_PTR(str);
if(tc == V_ASN1_UNIVERSAL)
ASN1_put_object(&p, 1, RSTRING_LEN(value), tn, tc);
else{
diff --git a/ext/openssl/ossl_bn.c b/ext/openssl/ossl_bn.c
index 6db9670bb7..6856476261 100644
--- a/ext/openssl/ossl_bn.c
+++ b/ext/openssl/ossl_bn.c
@@ -131,12 +131,12 @@ ossl_bn_initialize(int argc, VALUE *argv, VALUE self)
switch (base) {
case 0:
- if (!BN_mpi2bn((unsigned char *)RSTRING_PTR(str), RSTRING_LEN(str), bn)) {
+ if (!BN_mpi2bn(RSTRING_PTR(str), RSTRING_LEN(str), bn)) {
ossl_raise(eBNError, NULL);
}
break;
case 2:
- if (!BN_bin2bn((unsigned char *)RSTRING_PTR(str), RSTRING_LEN(str), bn)) {
+ if (!BN_bin2bn(RSTRING_PTR(str), RSTRING_LEN(str), bn)) {
ossl_raise(eBNError, NULL);
}
break;
@@ -151,7 +151,7 @@ ossl_bn_initialize(int argc, VALUE *argv, VALUE self)
}
break;
default:
- ossl_raise(rb_eArgError, "invalid radix %d", base);
+ ossl_raise(rb_eArgError, "illegal radix %d", base);
}
return self;
}
@@ -185,13 +185,13 @@ ossl_bn_to_s(int argc, VALUE *argv, VALUE self)
case 0:
len = BN_bn2mpi(bn, NULL);
str = rb_str_new(0, len);
- if (BN_bn2mpi(bn, (unsigned char *)RSTRING_PTR(str)) != len)
+ if (BN_bn2mpi(bn, RSTRING_PTR(str)) != len)
ossl_raise(eBNError, NULL);
break;
case 2:
len = BN_num_bytes(bn);
str = rb_str_new(0, len);
- if (BN_bn2bin(bn, (unsigned char *)RSTRING_PTR(str)) != len)
+ if (BN_bn2bin(bn, RSTRING_PTR(str)) != len)
ossl_raise(eBNError, NULL);
break;
case 10:
@@ -203,7 +203,7 @@ ossl_bn_to_s(int argc, VALUE *argv, VALUE self)
str = ossl_buf2str(buf, strlen(buf));
break;
default:
- ossl_raise(rb_eArgError, "invalid radix %d", base);
+ ossl_raise(rb_eArgError, "illegal radix %d", base);
}
return str;
@@ -272,9 +272,9 @@ ossl_bn_coerce(VALUE self, VALUE other)
} \
return Qfalse; \
}
-BIGNUM_BOOL1(is_zero)
-BIGNUM_BOOL1(is_one)
-BIGNUM_BOOL1(is_odd)
+BIGNUM_BOOL1(is_zero);
+BIGNUM_BOOL1(is_one);
+BIGNUM_BOOL1(is_odd);
#define BIGNUM_1c(func) \
/* \
@@ -298,7 +298,7 @@ BIGNUM_BOOL1(is_odd)
WrapBN(CLASS_OF(self), obj, result); \
return obj; \
}
-BIGNUM_1c(sqr)
+BIGNUM_1c(sqr);
#define BIGNUM_2(func) \
/* \
@@ -322,8 +322,8 @@ BIGNUM_1c(sqr)
WrapBN(CLASS_OF(self), obj, result); \
return obj; \
}
-BIGNUM_2(add)
-BIGNUM_2(sub)
+BIGNUM_2(add);
+BIGNUM_2(sub);
#define BIGNUM_2c(func) \
/* \
@@ -347,12 +347,12 @@ BIGNUM_2(sub)
WrapBN(CLASS_OF(self), obj, result); \
return obj; \
}
-BIGNUM_2c(mul)
-BIGNUM_2c(mod)
-BIGNUM_2c(exp)
-BIGNUM_2c(gcd)
-BIGNUM_2c(mod_sqr)
-BIGNUM_2c(mod_inverse)
+BIGNUM_2c(mul);
+BIGNUM_2c(mod);
+BIGNUM_2c(exp);
+BIGNUM_2c(gcd);
+BIGNUM_2c(mod_sqr);
+BIGNUM_2c(mod_inverse);
/*
* call-seq:
@@ -407,10 +407,10 @@ ossl_bn_div(VALUE self, VALUE other)
WrapBN(CLASS_OF(self), obj, result); \
return obj; \
}
-BIGNUM_3c(mod_add)
-BIGNUM_3c(mod_sub)
-BIGNUM_3c(mod_mul)
-BIGNUM_3c(mod_exp)
+BIGNUM_3c(mod_add);
+BIGNUM_3c(mod_sub);
+BIGNUM_3c(mod_mul);
+BIGNUM_3c(mod_exp);
#define BIGNUM_BIT(func) \
/* \
@@ -428,9 +428,9 @@ BIGNUM_3c(mod_exp)
} \
return self; \
}
-BIGNUM_BIT(set_bit)
-BIGNUM_BIT(clear_bit)
-BIGNUM_BIT(mask_bits)
+BIGNUM_BIT(set_bit);
+BIGNUM_BIT(clear_bit);
+BIGNUM_BIT(mask_bits);
/*
* call-seq:
@@ -474,8 +474,8 @@ ossl_bn_is_bit_set(VALUE self, VALUE bit)
WrapBN(CLASS_OF(self), obj, result); \
return obj; \
}
-BIGNUM_SHIFT(lshift)
-BIGNUM_SHIFT(rshift)
+BIGNUM_SHIFT(lshift);
+BIGNUM_SHIFT(rshift);
#define BIGNUM_SELF_SHIFT(func) \
/* \
@@ -494,8 +494,8 @@ BIGNUM_SHIFT(rshift)
ossl_raise(eBNError, NULL); \
return self; \
}
-BIGNUM_SELF_SHIFT(lshift)
-BIGNUM_SELF_SHIFT(rshift)
+BIGNUM_SELF_SHIFT(lshift);
+BIGNUM_SELF_SHIFT(rshift);
#define BIGNUM_RAND(func) \
/* \
@@ -528,8 +528,8 @@ BIGNUM_SELF_SHIFT(rshift)
WrapBN(klass, obj, result); \
return obj; \
}
-BIGNUM_RAND(rand)
-BIGNUM_RAND(pseudo_rand)
+BIGNUM_RAND(rand);
+BIGNUM_RAND(pseudo_rand);
#define BIGNUM_RAND_RANGE(func) \
/* \
@@ -552,8 +552,8 @@ BIGNUM_RAND(pseudo_rand)
WrapBN(klass, obj, result); \
return obj; \
}
-BIGNUM_RAND_RANGE(rand)
-BIGNUM_RAND_RANGE(pseudo_rand)
+BIGNUM_RAND_RANGE(rand);
+BIGNUM_RAND_RANGE(pseudo_rand);
/*
* call-seq:
@@ -608,8 +608,8 @@ ossl_bn_s_generate_prime(int argc, VALUE *argv, VALUE klass)
GetBN(self, bn); \
return INT2FIX(BN_##func(bn)); \
}
-BIGNUM_NUM(num_bytes)
-BIGNUM_NUM(num_bits)
+BIGNUM_NUM(num_bytes);
+BIGNUM_NUM(num_bits);
static VALUE
ossl_bn_copy(VALUE self, VALUE other)
@@ -642,8 +642,8 @@ ossl_bn_copy(VALUE self, VALUE other)
GetBN(self, bn1); \
return INT2FIX(BN_##func(bn1, bn2)); \
}
-BIGNUM_CMP(cmp)
-BIGNUM_CMP(ucmp)
+BIGNUM_CMP(cmp);
+BIGNUM_CMP(ucmp);
static VALUE
ossl_bn_eql(VALUE self, VALUE other)
diff --git a/ext/openssl/ossl_cipher.c b/ext/openssl/ossl_cipher.c
index df7856b6f0..b680dc6e64 100644
--- a/ext/openssl/ossl_cipher.c
+++ b/ext/openssl/ossl_cipher.c
@@ -67,7 +67,7 @@ ossl_cipher_free(EVP_CIPHER_CTX *ctx)
{
if (ctx) {
EVP_CIPHER_CTX_cleanup(ctx);
- ruby_xfree(ctx);
+ free(ctx);
}
}
@@ -124,16 +124,13 @@ ossl_cipher_copy(VALUE self, VALUE other)
return self;
}
-#ifdef HAVE_OBJ_NAME_DO_ALL_SORTED
static void*
add_cipher_name_to_ary(const OBJ_NAME *name, VALUE ary)
{
rb_ary_push(ary, rb_str_new2(name->name));
return NULL;
}
-#endif
-#ifdef HAVE_OBJ_NAME_DO_ALL_SORTED
/*
* call-seq:
* Cipher.ciphers -> array[string...]
@@ -143,6 +140,7 @@ add_cipher_name_to_ary(const OBJ_NAME *name, VALUE ary)
static VALUE
ossl_s_ciphers(VALUE self)
{
+#ifdef HAVE_OBJ_NAME_DO_ALL_SORTED
VALUE ary;
ary = rb_ary_new();
@@ -151,10 +149,10 @@ ossl_s_ciphers(VALUE self)
(void*)ary);
return ary;
-}
#else
-#define ossl_s_ciphers rb_f_notimplement
+ rb_notimplement();
#endif
+}
/*
* call-seq:
@@ -188,7 +186,7 @@ ossl_cipher_init(int argc, VALUE *argv, VALUE self, int mode)
* We deprecated the arguments for this method, but we decided
* keeping this behaviour for backward compatibility.
*/
- const char *cname = rb_class2name(rb_obj_class(self));
+ char *cname = rb_class2name(rb_obj_class(self));
rb_warn("argumtents for %s#encrypt and %s#decrypt were deprecated; "
"use %s#pkcs5_keyivgen to derive key and IV",
cname, cname, cname);
@@ -204,7 +202,7 @@ ossl_cipher_init(int argc, VALUE *argv, VALUE self, int mode)
else memcpy(iv, RSTRING_PTR(init_v), sizeof(iv));
}
EVP_BytesToKey(EVP_CIPHER_CTX_cipher(ctx), EVP_md5(), iv,
- (unsigned char *)RSTRING_PTR(pass), RSTRING_LEN(pass), 1, key, NULL);
+ RSTRING_PTR(pass), RSTRING_LEN(pass), 1, key, NULL);
p_key = key;
p_iv = iv;
}
@@ -281,13 +279,13 @@ ossl_cipher_pkcs5_keyivgen(int argc, VALUE *argv, VALUE self)
StringValue(vsalt);
if(RSTRING_LEN(vsalt) != PKCS5_SALT_LEN)
rb_raise(eCipherError, "salt must be an 8-octet string");
- salt = (unsigned char *)RSTRING_PTR(vsalt);
+ salt = RSTRING_PTR(vsalt);
}
iter = NIL_P(viter) ? 2048 : NUM2INT(viter);
digest = NIL_P(vdigest) ? EVP_md5() : GetDigestPtr(vdigest);
GetCipher(self, ctx);
EVP_BytesToKey(EVP_CIPHER_CTX_cipher(ctx), digest, salt,
- (unsigned char *)RSTRING_PTR(vpass), RSTRING_LEN(vpass), iter, key, iv);
+ RSTRING_PTR(vpass), RSTRING_LEN(vpass), iter, key, iv);
if (EVP_CipherInit_ex(ctx, NULL, NULL, key, iv, -1) != 1)
ossl_raise(eCipherError, NULL);
OPENSSL_cleanse(key, sizeof key);
@@ -299,6 +297,26 @@ ossl_cipher_pkcs5_keyivgen(int argc, VALUE *argv, VALUE self)
/*
* call-seq:
+ * cipher << data -> string
+ *
+ * === Parameters
+ * +data+ is a nonempty string.
+ *
+ * This method is deprecated and not available in 1.9.x or later.
+ */
+static VALUE
+ossl_cipher_update_deprecated(VALUE self, VALUE data)
+{
+ char *cname;
+
+ cname = rb_class2name(rb_obj_class(self));
+ rb_warning("%s#<< is deprecated; use %s#update instead", cname, cname);
+ return rb_funcall(self, rb_intern("update"), 1, data);
+}
+
+
+/*
+ * call-seq:
* cipher.update(data [, buffer]) -> string or buffer
*
* === Parameters
@@ -309,14 +327,14 @@ static VALUE
ossl_cipher_update(int argc, VALUE *argv, VALUE self)
{
EVP_CIPHER_CTX *ctx;
- unsigned char *in;
+ char *in;
int in_len, out_len;
VALUE data, str;
rb_scan_args(argc, argv, "11", &data, &str);
StringValue(data);
- in = (unsigned char *)RSTRING_PTR(data);
+ in = RSTRING_PTR(data);
if ((in_len = RSTRING_LEN(data)) == 0)
rb_raise(rb_eArgError, "data must not be empty");
GetCipher(self, ctx);
@@ -329,7 +347,7 @@ ossl_cipher_update(int argc, VALUE *argv, VALUE self)
rb_str_resize(str, out_len);
}
- if (!EVP_CipherUpdate(ctx, (unsigned char *)RSTRING_PTR(str), &out_len, in, in_len))
+ if (!EVP_CipherUpdate(ctx, RSTRING_PTR(str), &out_len, in, in_len))
ossl_raise(eCipherError, NULL);
assert(out_len < RSTRING_LEN(str));
rb_str_set_len(str, out_len);
@@ -354,7 +372,7 @@ ossl_cipher_final(VALUE self)
GetCipher(self, ctx);
str = rb_str_new(0, EVP_CIPHER_CTX_block_size(ctx));
- if (!EVP_CipherFinal_ex(ctx, (unsigned char *)RSTRING_PTR(str), &out_len))
+ if (!EVP_CipherFinal_ex(ctx, RSTRING_PTR(str), &out_len))
ossl_raise(eCipherError, NULL);
assert(out_len <= RSTRING_LEN(str));
rb_str_set_len(str, out_len);
@@ -397,7 +415,7 @@ ossl_cipher_set_key(VALUE self, VALUE key)
if (RSTRING_LEN(key) < EVP_CIPHER_CTX_key_length(ctx))
ossl_raise(eCipherError, "key length too short");
- if (EVP_CipherInit_ex(ctx, NULL, NULL, (unsigned char *)RSTRING_PTR(key), NULL, -1) != 1)
+ if (EVP_CipherInit_ex(ctx, NULL, NULL, RSTRING_PTR(key), NULL, -1) != 1)
ossl_raise(eCipherError, NULL);
return key;
@@ -422,7 +440,7 @@ ossl_cipher_set_iv(VALUE self, VALUE iv)
if (RSTRING_LEN(iv) < EVP_CIPHER_CTX_iv_length(ctx))
ossl_raise(eCipherError, "iv length too short");
- if (EVP_CipherInit_ex(ctx, NULL, NULL, NULL, (unsigned char *)RSTRING_PTR(iv), -1) != 1)
+ if (EVP_CipherInit_ex(ctx, NULL, NULL, NULL, RSTRING_PTR(iv), -1) != 1)
ossl_raise(eCipherError, NULL);
return iv;
@@ -453,7 +471,6 @@ ossl_cipher_set_key_length(VALUE self, VALUE key_length)
return key_length;
}
-#if defined(HAVE_EVP_CIPHER_CTX_SET_PADDING)
/*
* call-seq:
* cipher.padding = integer -> integer
@@ -467,17 +484,18 @@ ossl_cipher_set_key_length(VALUE self, VALUE key_length)
static VALUE
ossl_cipher_set_padding(VALUE self, VALUE padding)
{
+#if defined(HAVE_EVP_CIPHER_CTX_SET_PADDING)
EVP_CIPHER_CTX *ctx;
int pad = NUM2INT(padding);
GetCipher(self, ctx);
if (EVP_CIPHER_CTX_set_padding(ctx, pad) != 1)
ossl_raise(eCipherError, NULL);
- return padding;
-}
#else
-#define ossl_cipher_set_padding rb_f_notimplement
+ rb_notimplement();
#endif
+ return padding;
+}
#define CIPHER_0ARG_INT(func) \
static VALUE \
@@ -533,6 +551,9 @@ Init_ossl_cipher(void)
rb_define_method(cCipher, "decrypt", ossl_cipher_decrypt, -1);
rb_define_method(cCipher, "pkcs5_keyivgen", ossl_cipher_pkcs5_keyivgen, -1);
rb_define_method(cCipher, "update", ossl_cipher_update, -1);
+#if RUBY_VERSION_CODE < 190
+ rb_define_method(cCipher, "<<", ossl_cipher_update_deprecated, 1);
+#endif
rb_define_method(cCipher, "final", ossl_cipher_final, 0);
rb_define_method(cCipher, "name", ossl_cipher_name, 0);
rb_define_method(cCipher, "key=", ossl_cipher_set_key, 1);
diff --git a/ext/openssl/ossl_config.c b/ext/openssl/ossl_config.c
index bbd4975031..cc8e324029 100644
--- a/ext/openssl/ossl_config.c
+++ b/ext/openssl/ossl_config.c
@@ -192,16 +192,6 @@ ossl_config_add_value(VALUE self, VALUE section, VALUE name, VALUE value)
#endif
}
-#if !defined(OSSL_NO_CONF_API)
-static VALUE
-ossl_config_add_value_m(VALUE self, VALUE section, VALUE name, VALUE value)
-{
- return ossl_config_add_value(self, section, name, value);
-}
-#else
-#define ossl_config_add_value_m rb_f_notimplement
-#endif
-
static VALUE
ossl_config_get_value(VALUE self, VALUE section, VALUE name)
{
@@ -310,7 +300,7 @@ get_conf_section(CONF_VALUE *cv, VALUE ary)
rb_ary_push(ary, rb_str_new2(cv->section));
}
-static IMPLEMENT_LHASH_DOALL_ARG_FN(get_conf_section, CONF_VALUE*, VALUE)
+static IMPLEMENT_LHASH_DOALL_ARG_FN(get_conf_section, CONF_VALUE*, VALUE);
static VALUE
ossl_config_get_sections(VALUE self)
@@ -348,7 +338,7 @@ dump_conf_value(CONF_VALUE *cv, VALUE str)
rb_str_cat2(str, "\n");
}
-static IMPLEMENT_LHASH_DOALL_ARG_FN(dump_conf_value, CONF_VALUE*, VALUE)
+static IMPLEMENT_LHASH_DOALL_ARG_FN(dump_conf_value, CONF_VALUE*, VALUE);
static VALUE
dump_conf(CONF *conf)
@@ -392,15 +382,13 @@ each_conf_value(CONF_VALUE *cv, void* dummy)
}
}
-static IMPLEMENT_LHASH_DOALL_ARG_FN(each_conf_value, CONF_VALUE*, void*)
+static IMPLEMENT_LHASH_DOALL_ARG_FN(each_conf_value, CONF_VALUE*, void*);
static VALUE
ossl_config_each(VALUE self)
{
CONF *conf;
- RETURN_ENUMERATOR(self, 0, 0);
-
GetConfig(self, conf);
lh_doall_arg(conf->data, LHASH_DOALL_ARG_FN(each_conf_value), (void*)NULL);
@@ -433,7 +421,7 @@ static VALUE
ossl_config_inspect(VALUE self)
{
VALUE str, ary = ossl_config_get_sections(self);
- const char *cname = rb_class2name(rb_obj_class(self));
+ char *cname = rb_class2name(rb_obj_class(self));
str = rb_str_new2("#<");
rb_str_cat2(str, cname);
@@ -450,14 +438,11 @@ ossl_config_inspect(VALUE self)
void
Init_ossl_config()
{
- char *default_config_file;
eConfigError = rb_define_class_under(mOSSL, "ConfigError", eOSSLError);
cConfig = rb_define_class_under(mOSSL, "Config", rb_cObject);
- default_config_file = CONF_get1_default_config_file();
rb_define_const(cConfig, "DEFAULT_CONFIG_FILE",
- rb_str_new2(default_config_file));
- OPENSSL_free(default_config_file);
+ rb_str_new2(CONF_get1_default_config_file()));
rb_include_module(cConfig, rb_mEnumerable);
rb_define_singleton_method(cConfig, "parse", ossl_config_s_parse, 1);
rb_define_alias(CLASS_OF(cConfig), "load", "new");
@@ -466,7 +451,7 @@ Init_ossl_config()
rb_define_method(cConfig, "initialize", ossl_config_initialize, -1);
rb_define_method(cConfig, "get_value", ossl_config_get_value, 2);
rb_define_method(cConfig, "value", ossl_config_get_value_old, -1);
- rb_define_method(cConfig, "add_value", ossl_config_add_value_m, 3);
+ rb_define_method(cConfig, "add_value", ossl_config_add_value, 3);
rb_define_method(cConfig, "[]", ossl_config_get_section, 1);
rb_define_method(cConfig, "section", ossl_config_get_section_old, 1);
rb_define_method(cConfig, "[]=", ossl_config_set_section, 2);
diff --git a/ext/openssl/ossl_digest.c b/ext/openssl/ossl_digest.c
index 9b8ced5233..879d399fe7 100644
--- a/ext/openssl/ossl_digest.c
+++ b/ext/openssl/ossl_digest.c
@@ -38,7 +38,7 @@ GetDigestPtr(VALUE obj)
const EVP_MD *md;
if (TYPE(obj) == T_STRING) {
- const char *name = StringValueCStr(obj);
+ const char *name = STR2CSTR(obj);
md = EVP_get_digestbyname(name);
if (!md)
@@ -96,6 +96,7 @@ ossl_digest_initialize(int argc, VALUE *argv, VALUE self)
{
EVP_MD_CTX *ctx;
const EVP_MD *md;
+ char *name;
VALUE type, data;
rb_scan_args(argc, argv, "11", &type, &data);
@@ -181,7 +182,7 @@ ossl_digest_finish(int argc, VALUE *argv, VALUE self)
rb_str_resize(str, EVP_MD_CTX_size(ctx));
}
- EVP_DigestFinal_ex(ctx, (unsigned char *)RSTRING_PTR(str), NULL);
+ EVP_DigestFinal_ex(ctx, RSTRING_PTR(str), NULL);
return str;
}
@@ -233,6 +234,7 @@ ossl_digest_block_length(VALUE self)
void
Init_ossl_digest()
{
+ rb_require("openssl");
rb_require("digest");
#if 0 /* let rdoc know about mOSSL */
diff --git a/ext/openssl/ossl_engine.c b/ext/openssl/ossl_engine.c
index ec6f7fdf96..cd835d1237 100644
--- a/ext/openssl/ossl_engine.c
+++ b/ext/openssl/ossl_engine.c
@@ -119,7 +119,7 @@ ossl_engine_s_by_id(VALUE klass, VALUE id)
if(!ENGINE_init(e))
ossl_raise(eEngineError, NULL);
ENGINE_ctrl(e, ENGINE_CTRL_SET_PASSWORD_CALLBACK,
- 0, NULL, (void(*)(void))ossl_pem_passwd_cb);
+ 0, NULL, (void(*)())ossl_pem_passwd_cb);
ERR_clear_error();
return obj;
@@ -166,10 +166,10 @@ ossl_engine_finish(VALUE self)
return Qnil;
}
-#if defined(HAVE_ENGINE_GET_CIPHER)
static VALUE
ossl_engine_get_cipher(VALUE self, VALUE name)
{
+#if defined(HAVE_ENGINE_GET_CIPHER)
ENGINE *e;
const EVP_CIPHER *ciph, *tmp;
char *s;
@@ -184,15 +184,15 @@ ossl_engine_get_cipher(VALUE self, VALUE name)
if(!ciph) ossl_raise(eEngineError, NULL);
return ossl_cipher_new(ciph);
-}
#else
-#define ossl_engine_get_cipher rb_f_notimplement
+ rb_notimplement();
#endif
+}
-#if defined(HAVE_ENGINE_GET_DIGEST)
static VALUE
ossl_engine_get_digest(VALUE self, VALUE name)
{
+#if defined(HAVE_ENGINE_GET_DIGEST)
ENGINE *e;
const EVP_MD *md, *tmp;
char *s;
@@ -207,10 +207,10 @@ ossl_engine_get_digest(VALUE self, VALUE name)
if(!md) ossl_raise(eEngineError, NULL);
return ossl_digest_new(md);
-}
#else
-#define ossl_engine_get_digest rb_f_notimplement
+ rb_notimplement();
#endif
+}
static VALUE
ossl_engine_load_privkey(int argc, VALUE *argv, VALUE self)
@@ -326,7 +326,7 @@ static VALUE
ossl_engine_inspect(VALUE self)
{
VALUE str;
- const char *cname = rb_class2name(rb_obj_class(self));
+ char *cname = rb_class2name(rb_obj_class(self));
str = rb_str_new2("#<");
rb_str_cat2(str, cname);
diff --git a/ext/openssl/ossl_hmac.c b/ext/openssl/ossl_hmac.c
index aa7644aa5c..ef77d6c427 100644
--- a/ext/openssl/ossl_hmac.c
+++ b/ext/openssl/ossl_hmac.c
@@ -42,7 +42,7 @@ static void
ossl_hmac_free(HMAC_CTX *ctx)
{
HMAC_CTX_cleanup(ctx);
- ruby_xfree(ctx);
+ free(ctx);
}
static VALUE
@@ -103,13 +103,13 @@ ossl_hmac_update(VALUE self, VALUE data)
StringValue(data);
GetHMAC(self, ctx);
- HMAC_Update(ctx, (unsigned char *)RSTRING_PTR(data), RSTRING_LEN(data));
+ HMAC_Update(ctx, RSTRING_PTR(data), RSTRING_LEN(data));
return self;
}
static void
-hmac_final(HMAC_CTX *ctx, unsigned char **buf, unsigned int *buf_len)
+hmac_final(HMAC_CTX *ctx, char **buf, int *buf_len)
{
HMAC_CTX final;
@@ -132,13 +132,13 @@ static VALUE
ossl_hmac_digest(VALUE self)
{
HMAC_CTX *ctx;
- unsigned char *buf;
- unsigned int buf_len;
+ char *buf;
+ int buf_len;
VALUE digest;
GetHMAC(self, ctx);
hmac_final(ctx, &buf, &buf_len);
- digest = ossl_buf2str((char *)buf, buf_len);
+ digest = ossl_buf2str(buf, buf_len);
return digest;
}
@@ -152,9 +152,8 @@ static VALUE
ossl_hmac_hexdigest(VALUE self)
{
HMAC_CTX *ctx;
- unsigned char *buf;
- char *hexbuf;
- unsigned int buf_len;
+ char *buf, *hexbuf;
+ int buf_len;
VALUE hexdigest;
GetHMAC(self, ctx);
@@ -193,15 +192,15 @@ ossl_hmac_reset(VALUE self)
static VALUE
ossl_hmac_s_digest(VALUE klass, VALUE digest, VALUE key, VALUE data)
{
- unsigned char *buf;
- unsigned int buf_len;
+ char *buf;
+ int buf_len;
StringValue(key);
StringValue(data);
buf = HMAC(GetDigestPtr(digest), RSTRING_PTR(key), RSTRING_LEN(key),
- (unsigned char *)RSTRING_PTR(data), RSTRING_LEN(data), NULL, &buf_len);
+ RSTRING_PTR(data), RSTRING_LEN(data), NULL, &buf_len);
- return rb_str_new((const char *)buf, buf_len);
+ return rb_str_new(buf, buf_len);
}
/*
@@ -212,16 +211,15 @@ ossl_hmac_s_digest(VALUE klass, VALUE digest, VALUE key, VALUE data)
static VALUE
ossl_hmac_s_hexdigest(VALUE klass, VALUE digest, VALUE key, VALUE data)
{
- unsigned char *buf;
- char *hexbuf;
- unsigned int buf_len;
+ char *buf, *hexbuf;
+ int buf_len;
VALUE hexdigest;
StringValue(key);
StringValue(data);
buf = HMAC(GetDigestPtr(digest), RSTRING_PTR(key), RSTRING_LEN(key),
- (unsigned char *)RSTRING_PTR(data), RSTRING_LEN(data), NULL, &buf_len);
+ RSTRING_PTR(data), RSTRING_LEN(data), NULL, &buf_len);
if (string2hex(buf, buf_len, &hexbuf, NULL) != 2 * buf_len) {
ossl_raise(eHMACError, "Cannot convert buf to hexbuf");
}
diff --git a/ext/openssl/ossl_ns_spki.c b/ext/openssl/ossl_ns_spki.c
index 5ff58c3108..738a203d93 100644
--- a/ext/openssl/ossl_ns_spki.c
+++ b/ext/openssl/ossl_ns_spki.c
@@ -56,14 +56,14 @@ ossl_spki_initialize(int argc, VALUE *argv, VALUE self)
{
NETSCAPE_SPKI *spki;
VALUE buffer;
- const unsigned char *p;
+ unsigned char *p;
if (rb_scan_args(argc, argv, "01", &buffer) == 0) {
return self;
}
StringValue(buffer);
if (!(spki = NETSCAPE_SPKI_b64_decode(RSTRING_PTR(buffer), -1))) {
- p = (unsigned char *)RSTRING_PTR(buffer);
+ p = RSTRING_PTR(buffer);
if (!(spki = d2i_NETSCAPE_SPKI(NULL, &p, RSTRING_LEN(buffer)))) {
ossl_raise(eSPKIError, NULL);
}
@@ -87,7 +87,7 @@ ossl_spki_to_der(VALUE self)
if ((len = i2d_NETSCAPE_SPKI(spki, NULL)) <= 0)
ossl_raise(eX509CertError, NULL);
str = rb_str_new(0, len);
- p = (unsigned char *)RSTRING_PTR(str);
+ p = RSTRING_PTR(str);
if (i2d_NETSCAPE_SPKI(spki, &p) <= 0)
ossl_raise(eX509CertError, NULL);
ossl_str_adjust(str, p);
@@ -172,7 +172,7 @@ ossl_spki_get_challenge(VALUE self)
return rb_str_new(0, 0);
}
- return rb_str_new((const char *)spki->spkac->challenge->data,
+ return rb_str_new(spki->spkac->challenge->data,
spki->spkac->challenge->length);
}
diff --git a/ext/openssl/ossl_ocsp.c b/ext/openssl/ossl_ocsp.c
index a658c0180a..1e8e5903bd 100644
--- a/ext/openssl/ossl_ocsp.c
+++ b/ext/openssl/ossl_ocsp.c
@@ -103,17 +103,15 @@ static VALUE
ossl_ocspreq_initialize(int argc, VALUE *argv, VALUE self)
{
VALUE arg;
- const unsigned char *p;
+ unsigned char *p;
rb_scan_args(argc, argv, "01", &arg);
if(!NIL_P(arg)){
- OCSP_REQUEST *req = DATA_PTR(self), *x;
arg = ossl_to_der_if_possible(arg);
StringValue(arg);
p = (unsigned char*)RSTRING_PTR(arg);
- x = d2i_OCSP_REQUEST(&req, &p, RSTRING_LEN(arg));
- DATA_PTR(self) = req;
- if(!x){
+ if(!d2i_OCSP_REQUEST((OCSP_REQUEST**)&DATA_PTR(self), &p,
+ RSTRING_LEN(arg))){
ossl_raise(eOCSPError, "cannot load DER encoded request");
}
}
@@ -136,7 +134,7 @@ ossl_ocspreq_add_nonce(int argc, VALUE *argv, VALUE self)
else{
StringValue(val);
GetOCSPReq(self, req);
- ret = OCSP_request_add1_nonce(req, (unsigned char *)RSTRING_PTR(val), RSTRING_LEN(val));
+ ret = OCSP_request_add1_nonce(req, RSTRING_PTR(val), RSTRING_LEN(val));
}
if(!ret) ossl_raise(eOCSPError, NULL);
@@ -267,7 +265,7 @@ ossl_ocspreq_to_der(VALUE self)
if((len = i2d_OCSP_REQUEST(req, NULL)) <= 0)
ossl_raise(eOCSPError, NULL);
str = rb_str_new(0, len);
- p = (unsigned char *)RSTRING_PTR(str);
+ p = RSTRING_PTR(str);
if(i2d_OCSP_REQUEST(req, &p) <= 0)
ossl_raise(eOCSPError, NULL);
ossl_str_adjust(str, p);
@@ -312,17 +310,15 @@ static VALUE
ossl_ocspres_initialize(int argc, VALUE *argv, VALUE self)
{
VALUE arg;
- const unsigned char *p;
+ unsigned char *p;
rb_scan_args(argc, argv, "01", &arg);
if(!NIL_P(arg)){
- OCSP_RESPONSE *res = DATA_PTR(self), *x;
arg = ossl_to_der_if_possible(arg);
StringValue(arg);
- p = (unsigned char *)RSTRING_PTR(arg);
- x = d2i_OCSP_RESPONSE(&res, &p, RSTRING_LEN(arg));
- DATA_PTR(self) = res;
- if(!x){
+ p = RSTRING_PTR(arg);
+ if(!d2i_OCSP_RESPONSE((OCSP_RESPONSE**)&DATA_PTR(self), &p,
+ RSTRING_LEN(arg))){
ossl_raise(eOCSPError, "cannot load DER encoded response");
}
}
@@ -381,7 +377,7 @@ ossl_ocspres_to_der(VALUE self)
if((len = i2d_OCSP_RESPONSE(res, NULL)) <= 0)
ossl_raise(eOCSPError, NULL);
str = rb_str_new(0, len);
- p = (unsigned char *)RSTRING_PTR(str);
+ p = RSTRING_PTR(str);
if(i2d_OCSP_RESPONSE(res, NULL) <= 0)
ossl_raise(eOCSPError, NULL);
ossl_str_adjust(str, p);
@@ -440,7 +436,7 @@ ossl_ocspbres_add_nonce(int argc, VALUE *argv, VALUE self)
else{
StringValue(val);
GetOCSPBasicRes(self, bs);
- ret = OCSP_basic_add1_nonce(bs, (unsigned char *)RSTRING_PTR(val), RSTRING_LEN(val));
+ ret = OCSP_basic_add1_nonce(bs, RSTRING_PTR(val), RSTRING_LEN(val));
}
if(!ret) ossl_raise(eOCSPError, NULL);
@@ -593,22 +589,22 @@ ossl_ocspbres_sign(int argc, VALUE *argv, VALUE self)
static VALUE
ossl_ocspbres_verify(int argc, VALUE *argv, VALUE self)
{
- VALUE certs, store, flags, result;
+ VALUE certs, store, flags;
OCSP_BASICRESP *bs;
STACK_OF(X509) *x509s;
X509_STORE *x509st;
- int flg;
+ int flg, result;
rb_scan_args(argc, argv, "21", &certs, &store, &flags);
x509st = GetX509StorePtr(store);
flg = NIL_P(flags) ? 0 : INT2NUM(flags);
x509s = ossl_x509_ary2sk(certs);
GetOCSPBasicRes(self, bs);
- result = OCSP_basic_verify(bs, x509s, x509st, flg) > 0 ? Qtrue : Qfalse;
+ result = OCSP_basic_verify(bs, x509s, x509st, flg);
sk_X509_pop_free(x509s, X509_free);
if(!result) rb_warn("%s", ERR_error_string(ERR_peek_error(), NULL));
- return result;
+ return result ? Qtrue : Qfalse;
}
/*
diff --git a/ext/openssl/ossl_pkcs12.c b/ext/openssl/ossl_pkcs12.c
index a58d5e05e8..2ec69ba8db 100644
--- a/ext/openssl/ossl_pkcs12.c
+++ b/ext/openssl/ossl_pkcs12.c
@@ -137,17 +137,15 @@ ossl_pkcs12_initialize(int argc, VALUE *argv, VALUE self)
X509 *x509;
STACK_OF(X509) *x509s = NULL;
int st = 0;
- PKCS12 *pkcs = DATA_PTR(self);
if(rb_scan_args(argc, argv, "02", &arg, &pass) == 0) return self;
passphrase = NIL_P(pass) ? NULL : StringValuePtr(pass);
in = ossl_obj2bio(arg);
- d2i_PKCS12_bio(in, &pkcs);
- DATA_PTR(self) = pkcs;
+ d2i_PKCS12_bio(in, (PKCS12 **)&DATA_PTR(self));
BIO_free(in);
pkey = cert = ca = Qnil;
- if(!PKCS12_parse(pkcs, passphrase, &key, &x509, &x509s))
+ if(!PKCS12_parse((PKCS12*)DATA_PTR(self), passphrase, &key, &x509, &x509s))
ossl_raise(ePKCS12Error, "PKCS12_parse");
pkey = rb_protect((VALUE(*)_((VALUE)))ossl_pkey_new, (VALUE)key,
&st); /* NO DUP */
@@ -183,7 +181,7 @@ ossl_pkcs12_to_der(VALUE self)
if((len = i2d_PKCS12(p12, NULL)) <= 0)
ossl_raise(ePKCS12Error, NULL);
str = rb_str_new(0, len);
- p = (unsigned char *)RSTRING_PTR(str);
+ p = RSTRING_PTR(str);
if(i2d_PKCS12(p12, &p) <= 0)
ossl_raise(ePKCS12Error, NULL);
ossl_str_adjust(str, p);
diff --git a/ext/openssl/ossl_pkcs5.c b/ext/openssl/ossl_pkcs5.c
index 18d166d1ca..007889fc94 100644
--- a/ext/openssl/ossl_pkcs5.c
+++ b/ext/openssl/ossl_pkcs5.c
@@ -7,7 +7,6 @@
VALUE mPKCS5;
VALUE ePKCS5;
-#ifdef HAVE_PKCS5_PBKDF2_HMAC
/*
* call-seq:
* PKCS5.pbkdf2_hmac(pass, salt, iter, keylen, digest) => string
@@ -26,6 +25,7 @@ VALUE ePKCS5;
static VALUE
ossl_pkcs5_pbkdf2_hmac(VALUE self, VALUE pass, VALUE salt, VALUE iter, VALUE keylen, VALUE digest)
{
+#ifdef HAVE_PKCS5_PBKDF2_HMAC
VALUE str;
const EVP_MD *md;
int len = NUM2INT(keylen);
@@ -40,13 +40,12 @@ ossl_pkcs5_pbkdf2_hmac(VALUE self, VALUE pass, VALUE salt, VALUE iter, VALUE key
ossl_raise(ePKCS5, "PKCS5_PBKDF2_HMAC");
return str;
-}
#else
-#define ossl_pkcs5_pbkdf2_hmac rb_f_notimplement
+ rb_notimplement();
#endif
+}
-#ifdef HAVE_PKCS5_PBKDF2_HMAC_SHA1
/*
* call-seq:
* PKCS5.pbkdf2_hmac_sha1(pass, salt, iter, keylen) => string
@@ -64,6 +63,7 @@ ossl_pkcs5_pbkdf2_hmac(VALUE self, VALUE pass, VALUE salt, VALUE iter, VALUE key
static VALUE
ossl_pkcs5_pbkdf2_hmac_sha1(VALUE self, VALUE pass, VALUE salt, VALUE iter, VALUE keylen)
{
+#ifdef HAVE_PKCS5_PBKDF2_HMAC_SHA1
VALUE str;
int len = NUM2INT(keylen);
@@ -72,16 +72,14 @@ ossl_pkcs5_pbkdf2_hmac_sha1(VALUE self, VALUE pass, VALUE salt, VALUE iter, VALU
str = rb_str_new(0, len);
- if (PKCS5_PBKDF2_HMAC_SHA1(RSTRING_PTR(pass), RSTRING_LEN(pass),
- (const unsigned char *)RSTRING_PTR(salt), RSTRING_LEN(salt), NUM2INT(iter),
- len, (unsigned char *)RSTRING_PTR(str)) != 1)
+ if (PKCS5_PBKDF2_HMAC_SHA1(RSTRING_PTR(pass), RSTRING_LEN(pass), RSTRING_PTR(salt), RSTRING_LEN(salt), NUM2INT(iter), len, RSTRING_PTR(str)) != 1)
ossl_raise(ePKCS5, "PKCS5_PBKDF2_HMAC_SHA1");
return str;
-}
#else
-#define ossl_pkcs5_pbkdf2_hmac_sha1 rb_f_notimplement
+ rb_notimplement();
#endif
+}
void
Init_ossl_pkcs5()
diff --git a/ext/openssl/ossl_pkcs7.c b/ext/openssl/ossl_pkcs7.c
index fe1ef7c5de..6918844779 100644
--- a/ext/openssl/ossl_pkcs7.c
+++ b/ext/openssl/ossl_pkcs7.c
@@ -309,7 +309,7 @@ ossl_pkcs7_alloc(VALUE klass)
static VALUE
ossl_pkcs7_initialize(int argc, VALUE *argv, VALUE self)
{
- PKCS7 *p7, *pkcs = DATA_PTR(self);
+ PKCS7 *p7;
BIO *in;
VALUE arg;
@@ -317,12 +317,10 @@ ossl_pkcs7_initialize(int argc, VALUE *argv, VALUE self)
return self;
arg = ossl_to_der_if_possible(arg);
in = ossl_obj2bio(arg);
- p7 = PEM_read_bio_PKCS7(in, &pkcs, NULL, NULL);
- DATA_PTR(self) = pkcs;
+ p7 = PEM_read_bio_PKCS7(in, (PKCS7 **)&DATA_PTR(self), NULL, NULL);
if (!p7) {
- (void)BIO_reset(in);
- p7 = d2i_PKCS7_bio(in, &pkcs);
- DATA_PTR(self) = pkcs;
+ BIO_reset(in);
+ p7 = d2i_PKCS7_bio(in, (PKCS7 **)&DATA_PTR(self));
}
BIO_free(in);
ossl_pkcs7_set_data(self, Qnil);
@@ -780,7 +778,7 @@ ossl_pkcs7_to_der(VALUE self)
if((len = i2d_PKCS7(pkcs7, NULL)) <= 0)
ossl_raise(ePKCS7Error, NULL);
str = rb_str_new(0, len);
- p = (unsigned char *)RSTRING_PTR(str);
+ p = RSTRING_PTR(str);
if(i2d_PKCS7(pkcs7, &p) <= 0)
ossl_raise(ePKCS7Error, NULL);
ossl_str_adjust(str, p);
diff --git a/ext/openssl/ossl_pkey.c b/ext/openssl/ossl_pkey.c
index 903a3bb1e5..b295cfc25e 100644
--- a/ext/openssl/ossl_pkey.c
+++ b/ext/openssl/ossl_pkey.c
@@ -164,7 +164,7 @@ ossl_pkey_sign(VALUE self, VALUE digest, VALUE data)
{
EVP_PKEY *pkey;
EVP_MD_CTX ctx;
- unsigned int buf_len;
+ int buf_len;
VALUE str;
if (rb_funcall(self, id_private_q, 0, NULL) != Qtrue) {
@@ -175,9 +175,9 @@ ossl_pkey_sign(VALUE self, VALUE digest, VALUE data)
StringValue(data);
EVP_SignUpdate(&ctx, RSTRING_PTR(data), RSTRING_LEN(data));
str = rb_str_new(0, EVP_PKEY_size(pkey)+16);
- if (!EVP_SignFinal(&ctx, (unsigned char *)RSTRING_PTR(str), &buf_len, pkey))
+ if (!EVP_SignFinal(&ctx, RSTRING_PTR(str), &buf_len, pkey))
ossl_raise(ePKeyError, NULL);
- assert((long)buf_len <= RSTRING_LEN(str));
+ assert(buf_len <= RSTRING_LEN(str));
rb_str_set_len(str, buf_len);
return str;
@@ -194,7 +194,7 @@ ossl_pkey_verify(VALUE self, VALUE digest, VALUE sig, VALUE data)
StringValue(sig);
StringValue(data);
EVP_VerifyUpdate(&ctx, RSTRING_PTR(data), RSTRING_LEN(data));
- switch (EVP_VerifyFinal(&ctx, (unsigned char *)RSTRING_PTR(sig), RSTRING_LEN(sig), pkey)) {
+ switch (EVP_VerifyFinal(&ctx, RSTRING_PTR(sig), RSTRING_LEN(sig), pkey)) {
case 0:
return Qfalse;
case 1:
diff --git a/ext/openssl/ossl_pkey_dh.c b/ext/openssl/ossl_pkey_dh.c
index 768cda86b7..02c3d99ed8 100644
--- a/ext/openssl/ossl_pkey_dh.c
+++ b/ext/openssl/ossl_pkey_dh.c
@@ -169,7 +169,7 @@ ossl_dh_initialize(int argc, VALUE *argv, VALUE self)
in = ossl_obj2bio(arg);
dh = PEM_read_bio_DHparams(in, NULL, NULL, NULL);
if (!dh){
- (void)BIO_reset(in);
+ BIO_reset(in);
dh = d2i_DHparams_bio(in, NULL);
}
BIO_free(in);
@@ -254,7 +254,7 @@ ossl_dh_to_der(VALUE self)
if((len = i2d_DHparams(pkey->pkey.dh, NULL)) <= 0)
ossl_raise(eDHError, NULL);
str = rb_str_new(0, len);
- p = (unsigned char *)RSTRING_PTR(str);
+ p = RSTRING_PTR(str);
if(i2d_DHparams(pkey->pkey.dh, &p) < 0)
ossl_raise(eDHError, NULL);
ossl_str_adjust(str, p);
@@ -407,7 +407,7 @@ ossl_dh_compute_key(VALUE self, VALUE pub)
pub_key = GetBNPtr(pub);
len = DH_size(dh);
str = rb_str_new(0, len);
- if ((len = DH_compute_key((unsigned char *)RSTRING_PTR(str), pub_key, dh)) < 0) {
+ if ((len = DH_compute_key(RSTRING_PTR(str), pub_key, dh)) < 0) {
ossl_raise(eDHError, NULL);
}
rb_str_set_len(str, len);
@@ -415,10 +415,10 @@ ossl_dh_compute_key(VALUE self, VALUE pub)
return str;
}
-OSSL_PKEY_BN(dh, p)
-OSSL_PKEY_BN(dh, g)
-OSSL_PKEY_BN(dh, pub_key)
-OSSL_PKEY_BN(dh, priv_key)
+OSSL_PKEY_BN(dh, p);
+OSSL_PKEY_BN(dh, g);
+OSSL_PKEY_BN(dh, pub_key);
+OSSL_PKEY_BN(dh, priv_key);
/*
* -----BEGIN DH PARAMETERS-----
diff --git a/ext/openssl/ossl_pkey_dsa.c b/ext/openssl/ossl_pkey_dsa.c
index d39933b754..d9c7fcbe78 100644
--- a/ext/openssl/ossl_pkey_dsa.c
+++ b/ext/openssl/ossl_pkey_dsa.c
@@ -161,19 +161,19 @@ ossl_dsa_initialize(int argc, VALUE *argv, VALUE self)
in = ossl_obj2bio(arg);
dsa = PEM_read_bio_DSAPrivateKey(in, NULL, ossl_pem_passwd_cb, passwd);
if (!dsa) {
- (void)BIO_reset(in);
+ BIO_reset(in);
dsa = PEM_read_bio_DSAPublicKey(in, NULL, NULL, NULL);
}
if (!dsa) {
- (void)BIO_reset(in);
+ BIO_reset(in);
dsa = PEM_read_bio_DSA_PUBKEY(in, NULL, NULL, NULL);
}
if (!dsa) {
- (void)BIO_reset(in);
+ BIO_reset(in);
dsa = d2i_DSAPrivateKey_bio(in, NULL);
}
if (!dsa) {
- (void)BIO_reset(in);
+ BIO_reset(in);
dsa = d2i_DSA_PUBKEY_bio(in, NULL);
}
BIO_free(in);
@@ -289,7 +289,7 @@ ossl_dsa_to_der(VALUE self)
if((len = i2d_func(pkey->pkey.dsa, NULL)) <= 0)
ossl_raise(eDSAError, NULL);
str = rb_str_new(0, len);
- p = (unsigned char *)RSTRING_PTR(str);
+ p = RSTRING_PTR(str);
if(i2d_func(pkey->pkey.dsa, &p) < 0)
ossl_raise(eDSAError, NULL);
ossl_str_adjust(str, p);
@@ -387,7 +387,7 @@ static VALUE
ossl_dsa_sign(VALUE self, VALUE data)
{
EVP_PKEY *pkey;
- unsigned int buf_len;
+ int buf_len;
VALUE str;
GetPKeyDSA(self, pkey);
@@ -396,8 +396,7 @@ ossl_dsa_sign(VALUE self, VALUE data)
ossl_raise(eDSAError, "Private DSA key needed!");
}
str = rb_str_new(0, ossl_dsa_buf_size(pkey));
- if (!DSA_sign(0, (unsigned char *)RSTRING_PTR(data), RSTRING_LEN(data),
- (unsigned char *)RSTRING_PTR(str),
+ if (!DSA_sign(0, RSTRING_PTR(data), RSTRING_LEN(data), RSTRING_PTR(str),
&buf_len, pkey->pkey.dsa)) { /* type is ignored (0) */
ossl_raise(eDSAError, NULL);
}
@@ -421,8 +420,8 @@ ossl_dsa_verify(VALUE self, VALUE digest, VALUE sig)
StringValue(digest);
StringValue(sig);
/* type is ignored (0) */
- ret = DSA_verify(0, (unsigned char *)RSTRING_PTR(digest), RSTRING_LEN(digest),
- (unsigned char *)RSTRING_PTR(sig), RSTRING_LEN(sig), pkey->pkey.dsa);
+ ret = DSA_verify(0, RSTRING_PTR(digest), RSTRING_LEN(digest),
+ RSTRING_PTR(sig), RSTRING_LEN(sig), pkey->pkey.dsa);
if (ret < 0) {
ossl_raise(eDSAError, NULL);
}
@@ -433,11 +432,11 @@ ossl_dsa_verify(VALUE self, VALUE digest, VALUE sig)
return Qfalse;
}
-OSSL_PKEY_BN(dsa, p)
-OSSL_PKEY_BN(dsa, q)
-OSSL_PKEY_BN(dsa, g)
-OSSL_PKEY_BN(dsa, pub_key)
-OSSL_PKEY_BN(dsa, priv_key)
+OSSL_PKEY_BN(dsa, p);
+OSSL_PKEY_BN(dsa, q);
+OSSL_PKEY_BN(dsa, g);
+OSSL_PKEY_BN(dsa, pub_key);
+OSSL_PKEY_BN(dsa, priv_key);
/*
* INIT
diff --git a/ext/openssl/ossl_pkey_ec.c b/ext/openssl/ossl_pkey_ec.c
index edb5695fb4..210054121d 100644
--- a/ext/openssl/ossl_pkey_ec.c
+++ b/ext/openssl/ossl_pkey_ec.c
@@ -186,22 +186,22 @@ static VALUE ossl_ec_key_initialize(int argc, VALUE *argv, VALUE self)
ec = PEM_read_bio_ECPrivateKey(in, NULL, NULL, NULL);
if (!ec) {
- (void)BIO_reset(in);
+ BIO_reset(in);
ec = PEM_read_bio_EC_PUBKEY(in, NULL, NULL, NULL);
}
if (!ec) {
- (void)BIO_reset(in);
+ BIO_reset(in);
ec = d2i_ECPrivateKey_bio(in, NULL);
}
if (!ec) {
- (void)BIO_reset(in);
+ BIO_reset(in);
ec = d2i_EC_PUBKEY_bio(in, NULL);
}
BIO_free(in);
if (ec == NULL) {
- const char *name = StringValueCStr(arg);
+ const char *name = STR2CSTR(arg);
int nid = OBJ_sn2nid(name);
if (nid == NID_undef)
@@ -463,10 +463,8 @@ static VALUE ossl_ec_key_to_string(VALUE self, int format)
BIO *out;
int i = -1;
int private = 0;
-#if 0 /* unused now */
EVP_CIPHER *cipher = NULL;
char *password = NULL;
-#endif
VALUE str;
Require_EC_KEY(self, ec);
@@ -486,18 +484,13 @@ static VALUE ossl_ec_key_to_string(VALUE self, int format)
switch(format) {
case EXPORT_PEM:
if (private) {
-#if 0 /* unused now */
if (cipher || password)
/* BUG: finish cipher/password key export */
rb_notimplement();
i = PEM_write_bio_ECPrivateKey(out, ec, cipher, NULL, 0, NULL, password);
-#endif
- i = PEM_write_bio_ECPrivateKey(out, ec, NULL, NULL, 0, NULL, NULL);
} else {
-#if 0 /* unused now */
if (cipher || password)
rb_raise(rb_eArgError, "encryption is not supported when exporting this key type");
-#endif
i = PEM_write_bio_EC_PUBKEY(out, ec);
}
@@ -505,17 +498,13 @@ static VALUE ossl_ec_key_to_string(VALUE self, int format)
break;
case EXPORT_DER:
if (private) {
-#if 0 /* unused now */
if (cipher || password)
rb_raise(rb_eArgError, "encryption is not supported when exporting this key type");
-#endif
i = i2d_ECPrivateKey_bio(out, ec);
} else {
-#if 0 /* unused now */
if (cipher || password)
rb_raise(rb_eArgError, "encryption is not supported when exporting this key type");
-#endif
i = i2d_EC_PUBKEY_bio(out, ec);
}
@@ -706,7 +695,7 @@ static void ossl_ec_group_free(ossl_ec_group *ec_group)
{
if (!ec_group->dont_free && ec_group->group)
EC_GROUP_clear_free(ec_group->group);
- ruby_xfree(ec_group);
+ free(ec_group);
}
static VALUE ossl_ec_group_alloc(VALUE klass)
@@ -778,14 +767,14 @@ static VALUE ossl_ec_group_initialize(int argc, VALUE *argv, VALUE self)
group = PEM_read_bio_ECPKParameters(in, NULL, NULL, NULL);
if (!group) {
- (void)BIO_reset(in);
+ BIO_reset(in);
group = d2i_ECPKParameters_bio(in, NULL);
}
BIO_free(in);
if (!group) {
- const char *name = StringValueCStr(arg1);
+ const char *name = STR2CSTR(arg1);
int nid = OBJ_sn2nid(name);
if (nid == NID_undef)
@@ -1092,7 +1081,7 @@ static VALUE ossl_ec_group_get_seed(VALUE self)
if (seed_len == 0)
return Qnil;
- return rb_str_new((const char *)EC_GROUP_get0_seed(group), seed_len);
+ return rb_str_new(EC_GROUP_get0_seed(group), seed_len);
}
/* call-seq:
@@ -1107,7 +1096,7 @@ static VALUE ossl_ec_group_set_seed(VALUE self, VALUE seed)
Require_EC_GROUP(self, group);
StringValue(seed);
- if (EC_GROUP_set_seed(group, (unsigned char *)RSTRING_PTR(seed), RSTRING_LEN(seed)) != RSTRING_LEN(seed))
+ if (EC_GROUP_set_seed(group, RSTRING_PTR(seed), RSTRING_LEN(seed)) != RSTRING_LEN(seed))
ossl_raise(eEC_GROUP, "EC_GROUP_set_seed");
return seed;
@@ -1212,7 +1201,7 @@ static void ossl_ec_point_free(ossl_ec_point *ec_point)
{
if (!ec_point->dont_free && ec_point->point)
EC_POINT_clear_free(ec_point->point);
- ruby_xfree(ec_point);
+ free(ec_point);
}
static VALUE ossl_ec_point_alloc(VALUE klass)
diff --git a/ext/openssl/ossl_pkey_rsa.c b/ext/openssl/ossl_pkey_rsa.c
index 80665cddbd..9ac69e7ded 100644
--- a/ext/openssl/ossl_pkey_rsa.c
+++ b/ext/openssl/ossl_pkey_rsa.c
@@ -151,23 +151,23 @@ ossl_rsa_initialize(int argc, VALUE *argv, VALUE self)
in = ossl_obj2bio(arg);
rsa = PEM_read_bio_RSAPrivateKey(in, NULL, ossl_pem_passwd_cb, passwd);
if (!rsa) {
- (void)BIO_reset(in);
+ BIO_reset(in);
rsa = PEM_read_bio_RSAPublicKey(in, NULL, NULL, NULL);
}
if (!rsa) {
- (void)BIO_reset(in);
+ BIO_reset(in);
rsa = PEM_read_bio_RSA_PUBKEY(in, NULL, NULL, NULL);
}
if (!rsa) {
- (void)BIO_reset(in);
+ BIO_reset(in);
rsa = d2i_RSAPrivateKey_bio(in, NULL);
}
if (!rsa) {
- (void)BIO_reset(in);
+ BIO_reset(in);
rsa = d2i_RSAPublicKey_bio(in, NULL);
}
if (!rsa) {
- (void)BIO_reset(in);
+ BIO_reset(in);
rsa = d2i_RSA_PUBKEY_bio(in, NULL);
}
BIO_free(in);
@@ -288,7 +288,7 @@ ossl_rsa_to_der(VALUE self)
if((len = i2d_func(pkey->pkey.rsa, NULL)) <= 0)
ossl_raise(eRSAError, NULL);
str = rb_str_new(0, len);
- p = (unsigned char *)RSTRING_PTR(str);
+ p = RSTRING_PTR(str);
if(i2d_func(pkey->pkey.rsa, &p) < 0)
ossl_raise(eRSAError, NULL);
ossl_str_adjust(str, p);
@@ -315,8 +315,8 @@ ossl_rsa_public_encrypt(int argc, VALUE *argv, VALUE self)
pad = (argc == 1) ? RSA_PKCS1_PADDING : NUM2INT(padding);
StringValue(buffer);
str = rb_str_new(0, ossl_rsa_buf_size(pkey));
- buf_len = RSA_public_encrypt(RSTRING_LEN(buffer), (unsigned char *)RSTRING_PTR(buffer),
- (unsigned char *)RSTRING_PTR(str), pkey->pkey.rsa,
+ buf_len = RSA_public_encrypt(RSTRING_LEN(buffer), RSTRING_PTR(buffer),
+ RSTRING_PTR(str), pkey->pkey.rsa,
pad);
if (buf_len < 0) ossl_raise(eRSAError, NULL);
rb_str_set_len(str, buf_len);
@@ -341,8 +341,8 @@ ossl_rsa_public_decrypt(int argc, VALUE *argv, VALUE self)
pad = (argc == 1) ? RSA_PKCS1_PADDING : NUM2INT(padding);
StringValue(buffer);
str = rb_str_new(0, ossl_rsa_buf_size(pkey));
- buf_len = RSA_public_decrypt(RSTRING_LEN(buffer), (unsigned char *)RSTRING_PTR(buffer),
- (unsigned char *)RSTRING_PTR(str), pkey->pkey.rsa,
+ buf_len = RSA_public_decrypt(RSTRING_LEN(buffer), RSTRING_PTR(buffer),
+ RSTRING_PTR(str), pkey->pkey.rsa,
pad);
if (buf_len < 0) ossl_raise(eRSAError, NULL);
rb_str_set_len(str, buf_len);
@@ -370,8 +370,8 @@ ossl_rsa_private_encrypt(int argc, VALUE *argv, VALUE self)
pad = (argc == 1) ? RSA_PKCS1_PADDING : NUM2INT(padding);
StringValue(buffer);
str = rb_str_new(0, ossl_rsa_buf_size(pkey));
- buf_len = RSA_private_encrypt(RSTRING_LEN(buffer), (unsigned char *)RSTRING_PTR(buffer),
- (unsigned char *)RSTRING_PTR(str), pkey->pkey.rsa,
+ buf_len = RSA_private_encrypt(RSTRING_LEN(buffer), RSTRING_PTR(buffer),
+ RSTRING_PTR(str), pkey->pkey.rsa,
pad);
if (buf_len < 0) ossl_raise(eRSAError, NULL);
rb_str_set_len(str, buf_len);
@@ -400,8 +400,8 @@ ossl_rsa_private_decrypt(int argc, VALUE *argv, VALUE self)
pad = (argc == 1) ? RSA_PKCS1_PADDING : NUM2INT(padding);
StringValue(buffer);
str = rb_str_new(0, ossl_rsa_buf_size(pkey));
- buf_len = RSA_private_decrypt(RSTRING_LEN(buffer), (unsigned char *)RSTRING_PTR(buffer),
- (unsigned char *)RSTRING_PTR(str), pkey->pkey.rsa,
+ buf_len = RSA_private_decrypt(RSTRING_LEN(buffer), RSTRING_PTR(buffer),
+ RSTRING_PTR(str), pkey->pkey.rsa,
pad);
if (buf_len < 0) ossl_raise(eRSAError, NULL);
rb_str_set_len(str, buf_len);
@@ -519,14 +519,14 @@ ossl_rsa_blinding_off(VALUE self)
}
*/
-OSSL_PKEY_BN(rsa, n)
-OSSL_PKEY_BN(rsa, e)
-OSSL_PKEY_BN(rsa, d)
-OSSL_PKEY_BN(rsa, p)
-OSSL_PKEY_BN(rsa, q)
-OSSL_PKEY_BN(rsa, dmp1)
-OSSL_PKEY_BN(rsa, dmq1)
-OSSL_PKEY_BN(rsa, iqmp)
+OSSL_PKEY_BN(rsa, n);
+OSSL_PKEY_BN(rsa, e);
+OSSL_PKEY_BN(rsa, d);
+OSSL_PKEY_BN(rsa, p);
+OSSL_PKEY_BN(rsa, q);
+OSSL_PKEY_BN(rsa, dmp1);
+OSSL_PKEY_BN(rsa, dmq1);
+OSSL_PKEY_BN(rsa, iqmp);
/*
* INIT
diff --git a/ext/openssl/ossl_rand.c b/ext/openssl/ossl_rand.c
index af61fe33a0..ad830fbc98 100644
--- a/ext/openssl/ossl_rand.c
+++ b/ext/openssl/ossl_rand.c
@@ -99,7 +99,7 @@ ossl_rand_bytes(VALUE self, VALUE len)
int n = NUM2INT(len);
str = rb_str_new(0, n);
- if (!RAND_bytes((unsigned char *)RSTRING_PTR(str), n)) {
+ if (!RAND_bytes(RSTRING_PTR(str), n)) {
ossl_raise(eRandomError, NULL);
}
@@ -118,7 +118,7 @@ ossl_rand_pseudo_bytes(VALUE self, VALUE len)
int n = NUM2INT(len);
str = rb_str_new(0, n);
- if (!RAND_pseudo_bytes((unsigned char *)RSTRING_PTR(str), n)) {
+ if (!RAND_pseudo_bytes(RSTRING_PTR(str), n)) {
ossl_raise(eRandomError, NULL);
}
diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c
index 6a3e200ee7..01b86fec27 100644
--- a/ext/openssl/ossl_ssl.c
+++ b/ext/openssl/ossl_ssl.c
@@ -11,6 +11,8 @@
* (See the file 'LICENCE'.)
*/
#include "ossl.h"
+#include <rubysig.h>
+#include <rubyio.h>
#if defined(HAVE_UNISTD_H)
# include <unistd.h> /* for read(), and write() */
@@ -67,9 +69,6 @@ static const char *ossl_sslctx_attrs[] = {
"verify_callback", "options", "cert_store", "extra_chain_cert",
"client_cert_cb", "tmp_dh_callback", "session_id_context",
"session_get_cb", "session_new_cb", "session_remove_cb",
-#ifdef HAVE_SSL_SET_TLSEXT_HOST_NAME
- "servername_cb",
-#endif
};
#define ossl_ssl_get_io(o) rb_iv_get((o),"@io")
@@ -87,12 +86,7 @@ static const char *ossl_sslctx_attrs[] = {
#define ossl_ssl_set_tmp_dh(o,v) rb_iv_set((o),"@tmp_dh",(v))
static const char *ossl_ssl_attr_readers[] = { "io", "context", };
-static const char *ossl_ssl_attrs[] = {
-#ifdef HAVE_SSL_SET_TLSEXT_HOST_NAME
- "hostname",
-#endif
- "sync_close",
-};
+static const char *ossl_ssl_attrs[] = { "sync_close", };
ID ID_callback_state;
@@ -303,7 +297,7 @@ ossl_ssl_verify_callback(int preverify_ok, X509_STORE_CTX *ctx)
static VALUE
ossl_call_session_get_cb(VALUE ary)
{
- VALUE ssl_obj, sslctx_obj, cb;
+ VALUE ssl_obj, sslctx_obj, cb, ret;
Check_Type(ary, T_ARRAY);
ssl_obj = rb_ary_entry(ary, 0);
@@ -331,7 +325,7 @@ ossl_sslctx_session_get_cb(SSL *ssl, unsigned char *buf, int len, int *copy)
ssl_obj = (VALUE)ptr;
ary = rb_ary_new2(2);
rb_ary_push(ary, ssl_obj);
- rb_ary_push(ary, rb_str_new((const char *)buf, len));
+ rb_ary_push(ary, rb_str_new(buf, len));
ret_obj = rb_protect((VALUE(*)_((VALUE)))ossl_call_session_get_cb, ary, &state);
if (state) {
@@ -350,7 +344,7 @@ ossl_sslctx_session_get_cb(SSL *ssl, unsigned char *buf, int len, int *copy)
static VALUE
ossl_call_session_new_cb(VALUE ary)
{
- VALUE ssl_obj, sslctx_obj, cb;
+ VALUE ssl_obj, sslctx_obj, cb, ret;
Check_Type(ary, T_ARRAY);
ssl_obj = rb_ary_entry(ary, 0);
@@ -393,11 +387,10 @@ ossl_sslctx_session_new_cb(SSL *ssl, SSL_SESSION *sess)
return RTEST(ret_obj) ? 1 : 0;
}
-#if 0 /* unused */
static VALUE
ossl_call_session_remove_cb(VALUE ary)
{
- VALUE sslctx_obj, cb;
+ VALUE sslctx_obj, cb, ret;
Check_Type(ary, T_ARRAY);
sslctx_obj = rb_ary_entry(ary, 0);
@@ -407,7 +400,6 @@ ossl_call_session_remove_cb(VALUE ary)
return rb_funcall(cb, rb_intern("call"), 1, ary);
}
-#endif
static void
ossl_sslctx_session_remove_cb(SSL_CTX *ctx, SSL_SESSION *sess)
@@ -454,66 +446,6 @@ ossl_sslctx_add_extra_chain_cert_i(VALUE i, VALUE arg)
return i;
}
-static VALUE ossl_sslctx_setup(VALUE self);
-
-#ifdef HAVE_SSL_SET_TLSEXT_HOST_NAME
-static VALUE
-ossl_call_servername_cb(VALUE ary)
-{
- VALUE ssl_obj, sslctx_obj, cb, ret_obj;
-
- Check_Type(ary, T_ARRAY);
- ssl_obj = rb_ary_entry(ary, 0);
-
- sslctx_obj = rb_iv_get(ssl_obj, "@context");
- if (NIL_P(sslctx_obj)) return Qnil;
- cb = rb_iv_get(sslctx_obj, "@servername_cb");
- if (NIL_P(cb)) return Qnil;
-
- ret_obj = rb_funcall(cb, rb_intern("call"), 1, ary);
- if (rb_obj_is_kind_of(ret_obj, cSSLContext)) {
- SSL *ssl;
- SSL_CTX *ctx2;
-
- ossl_sslctx_setup(ret_obj);
- Data_Get_Struct(ssl_obj, SSL, ssl);
- Data_Get_Struct(ret_obj, SSL_CTX, ctx2);
- SSL_set_SSL_CTX(ssl, ctx2);
- } else if (!NIL_P(ret_obj)) {
- rb_raise(rb_eArgError, "servername_cb must return an OpenSSL::SSL::SSLContext object or nil");
- }
-
- return ret_obj;
-}
-
-static int
-ssl_servername_cb(SSL *ssl, int *ad, void *arg)
-{
- VALUE ary, ssl_obj, ret_obj;
- void *ptr;
- int state = 0;
- const char *servername = SSL_get_servername(ssl, TLSEXT_NAMETYPE_host_name);
-
- if (!servername)
- return SSL_TLSEXT_ERR_OK;
-
- if ((ptr = SSL_get_ex_data(ssl, ossl_ssl_ex_ptr_idx)) == NULL)
- return SSL_TLSEXT_ERR_ALERT_FATAL;
- ssl_obj = (VALUE)ptr;
- ary = rb_ary_new2(2);
- rb_ary_push(ary, ssl_obj);
- rb_ary_push(ary, rb_str_new2(servername));
-
- ret_obj = rb_protect((VALUE(*)_((VALUE)))ossl_call_servername_cb, ary, &state);
- if (state) {
- rb_ivar_set(ssl_obj, ID_callback_state, INT2NUM(state));
- return SSL_TLSEXT_ERR_ALERT_FATAL;
- }
-
- return SSL_TLSEXT_ERR_OK;
-}
-#endif
-
/*
* call-seq:
* ctx.setup => Qtrue # first time
@@ -631,7 +563,7 @@ ossl_sslctx_setup(VALUE self)
val = ossl_sslctx_get_sess_id_ctx(self);
if (!NIL_P(val)){
StringValue(val);
- if (!SSL_CTX_set_session_id_context(ctx, (unsigned char *)RSTRING_PTR(val),
+ if (!SSL_CTX_set_session_id_context(ctx, RSTRING_PTR(val),
RSTRING_LEN(val))){
ossl_raise(eSSLError, "SSL_CTX_set_session_id_context:");
}
@@ -649,15 +581,6 @@ ossl_sslctx_setup(VALUE self)
SSL_CTX_sess_set_remove_cb(ctx, ossl_sslctx_session_remove_cb);
OSSL_Debug("SSL SESSION remove callback added");
}
-
-#ifdef HAVE_SSL_SET_TLSEXT_HOST_NAME
- val = rb_iv_get(self, "@servername_cb");
- if (!NIL_P(val)) {
- SSL_CTX_set_tlsext_servername_callback(ctx, ssl_servername_cb);
- OSSL_Debug("SSL TLSEXT servername callback added");
- }
-#endif
-
return Qtrue;
}
@@ -892,6 +815,7 @@ ossl_sslctx_flush_sessions(int argc, VALUE *argv, VALUE self)
VALUE arg1;
SSL_CTX *ctx;
time_t tm = 0;
+ int cb_state;
rb_scan_args(argc, argv, "01", &arg1);
@@ -905,7 +829,7 @@ ossl_sslctx_flush_sessions(int argc, VALUE *argv, VALUE self)
rb_raise(rb_eArgError, "arg must be Time or nil");
}
- SSL_CTX_flush_sessions(ctx, (long)tm);
+ SSL_CTX_flush_sessions(ctx, tm);
return self;
}
@@ -978,10 +902,6 @@ ossl_ssl_setup(VALUE self)
Data_Get_Struct(self, SSL, ssl);
if(!ssl){
-#ifdef HAVE_SSL_SET_TLSEXT_HOST_NAME
- VALUE hostname = rb_iv_get(self, "@hostname");
-#endif
-
v_ctx = ossl_ssl_get_ctx(self);
Data_Get_Struct(v_ctx, SSL_CTX, ctx);
@@ -991,12 +911,6 @@ ossl_ssl_setup(VALUE self)
}
DATA_PTR(self) = ssl;
-#ifdef HAVE_SSL_SET_TLSEXT_HOST_NAME
- if (!NIL_P(hostname)) {
- if (SSL_set_tlsext_host_name(ssl, StringValuePtr(hostname)) != 1)
- ossl_raise(eSSLError, "SSL_set_tlsext_host_name:");
- }
-#endif
io = ossl_ssl_get_io(self);
GetOpenFile(io, fptr);
rb_io_check_readable(fptr);
@@ -1020,28 +934,8 @@ ossl_ssl_setup(VALUE self)
#define ssl_get_error(ssl, ret) SSL_get_error(ssl, ret)
#endif
-static void
-write_would_block(int nonblock)
-{
- if (nonblock) {
- VALUE exc = ossl_exc_new(eSSLError, "write would block");
- rb_extend_object(exc, rb_mWaitWritable);
- rb_exc_raise(exc);
- }
-}
-
-static void
-read_would_block(int nonblock)
-{
- if (nonblock) {
- VALUE exc = ossl_exc_new(eSSLError, "read would block");
- rb_extend_object(exc, rb_mWaitReadable);
- rb_exc_raise(exc);
- }
-}
-
static VALUE
-ossl_start_ssl(VALUE self, int (*func)(), const char *funcname, int nonblock)
+ossl_start_ssl(VALUE self, int (*func)(), const char *funcname)
{
SSL *ssl;
rb_io_t *fptr;
@@ -1053,22 +947,12 @@ ossl_start_ssl(VALUE self, int (*func)(), const char *funcname, int nonblock)
Data_Get_Struct(self, SSL, ssl);
GetOpenFile(ossl_ssl_get_io(self), fptr);
for(;;){
- ret = func(ssl);
-
- cb_state = rb_ivar_get(self, ID_callback_state);
- if (!NIL_P(cb_state))
- rb_jump_tag(NUM2INT(cb_state));
-
- if (ret > 0)
- break;
-
+ if((ret = func(ssl)) > 0) break;
switch((ret2 = ssl_get_error(ssl, ret))){
case SSL_ERROR_WANT_WRITE:
- write_would_block(nonblock);
rb_io_wait_writable(FPTR_TO_FD(fptr));
continue;
case SSL_ERROR_WANT_READ:
- read_would_block(nonblock);
rb_io_wait_readable(FPTR_TO_FD(fptr));
continue;
case SSL_ERROR_SYSCALL:
@@ -1079,6 +963,10 @@ ossl_start_ssl(VALUE self, int (*func)(), const char *funcname, int nonblock)
}
}
+ cb_state = rb_ivar_get(self, ID_callback_state);
+ if (!NIL_P(cb_state))
+ rb_jump_tag(NUM2INT(cb_state));
+
return self;
}
@@ -1090,32 +978,7 @@ static VALUE
ossl_ssl_connect(VALUE self)
{
ossl_ssl_setup(self);
- return ossl_start_ssl(self, SSL_connect, "SSL_connect", 0);
-}
-
-/*
- * call-seq:
- * ssl.connect_nonblock => self
- *
- * initiate the TLS/SSL handshake as a client in non-blocking manner.
- *
- * # emulates blocking connect
- * begin
- * ssl.connect_nonblock
- * rescue IO::WaitReadable
- * IO.select([s2])
- * retry
- * rescue IO::WaitWritable
- * IO.select(nil, [s2])
- * retry
- * end
- *
- */
-static VALUE
-ossl_ssl_connect_nonblock(VALUE self)
-{
- ossl_ssl_setup(self);
- return ossl_start_ssl(self, SSL_connect, "SSL_connect", 1);
+ return ossl_start_ssl(self, SSL_connect, "SSL_connect");
}
/*
@@ -1126,36 +989,20 @@ static VALUE
ossl_ssl_accept(VALUE self)
{
ossl_ssl_setup(self);
- return ossl_start_ssl(self, SSL_accept, "SSL_accept", 0);
+ return ossl_start_ssl(self, SSL_accept, "SSL_accept");
}
/*
* call-seq:
- * ssl.accept_nonblock => self
- *
- * initiate the TLS/SSL handshake as a server in non-blocking manner.
- *
- * # emulates blocking accept
- * begin
- * ssl.accept_nonblock
- * rescue IO::WaitReadable
- * IO.select([s2])
- * retry
- * rescue IO::WaitWritable
- * IO.select(nil, [s2])
- * retry
- * end
+ * ssl.sysread(length) => string
+ * ssl.sysread(length, buffer) => buffer
*
+ * === Parameters
+ * * +length+ is a positive integer.
+ * * +buffer+ is a string used to store the result.
*/
static VALUE
-ossl_ssl_accept_nonblock(VALUE self)
-{
- ossl_ssl_setup(self);
- return ossl_start_ssl(self, SSL_accept, "SSL_accept", 1);
-}
-
-static VALUE
-ossl_ssl_read_internal(int argc, VALUE *argv, VALUE self, int nonblock)
+ossl_ssl_read(int argc, VALUE *argv, VALUE self)
{
SSL *ssl;
int ilen, nread = 0;
@@ -1175,7 +1022,7 @@ ossl_ssl_read_internal(int argc, VALUE *argv, VALUE self, int nonblock)
Data_Get_Struct(self, SSL, ssl);
GetOpenFile(ossl_ssl_get_io(self), fptr);
if (ssl) {
- if(!nonblock && SSL_pending(ssl) <= 0)
+ if(SSL_pending(ssl) <= 0)
rb_thread_wait_fd(FPTR_TO_FD(fptr));
for (;;){
nread = SSL_read(ssl, RSTRING_PTR(str), RSTRING_LEN(str));
@@ -1185,11 +1032,9 @@ ossl_ssl_read_internal(int argc, VALUE *argv, VALUE self, int nonblock)
case SSL_ERROR_ZERO_RETURN:
rb_eof_error();
case SSL_ERROR_WANT_WRITE:
- write_would_block(nonblock);
rb_io_wait_writable(FPTR_TO_FD(fptr));
continue;
case SSL_ERROR_WANT_READ:
- read_would_block(nonblock);
rb_io_wait_readable(FPTR_TO_FD(fptr));
continue;
case SSL_ERROR_SYSCALL:
@@ -1201,9 +1046,9 @@ ossl_ssl_read_internal(int argc, VALUE *argv, VALUE self, int nonblock)
}
}
else {
- ID meth = nonblock ? rb_intern("read_nonblock") : rb_intern("sysread");
+ ID id_sysread = rb_intern("sysread");
rb_warning("SSL session is not started yet.");
- return rb_funcall(ossl_ssl_get_io(self), meth, 2, len, str);
+ return rb_funcall(ossl_ssl_get_io(self), id_sysread, 2, len, str);
}
end:
@@ -1213,39 +1058,12 @@ ossl_ssl_read_internal(int argc, VALUE *argv, VALUE self, int nonblock)
return str;
}
-
-/*
- * call-seq:
- * ssl.sysread(length) => string
- * ssl.sysread(length, buffer) => buffer
- *
- * === Parameters
- * * +length+ is a positive integer.
- * * +buffer+ is a string used to store the result.
- */
-static VALUE
-ossl_ssl_read(int argc, VALUE *argv, VALUE self)
-{
- return ossl_ssl_read_internal(argc, argv, self, 0);
-}
-
/*
* call-seq:
- * ssl.sysread_nonblock(length) => string
- * ssl.sysread_nonblock(length, buffer) => buffer
- *
- * === Parameters
- * * +length+ is a positive integer.
- * * +buffer+ is a string used to store the result.
+ * ssl.syswrite(string) => integer
*/
static VALUE
-ossl_ssl_read_nonblock(int argc, VALUE *argv, VALUE self)
-{
- return ossl_ssl_read_internal(argc, argv, self, 1);
-}
-
-static VALUE
-ossl_ssl_write_internal(VALUE self, VALUE str, int nonblock)
+ossl_ssl_write(VALUE self, VALUE str)
{
SSL *ssl;
int nwrite = 0;
@@ -1262,11 +1080,9 @@ ossl_ssl_write_internal(VALUE self, VALUE str, int nonblock)
case SSL_ERROR_NONE:
goto end;
case SSL_ERROR_WANT_WRITE:
- write_would_block(nonblock);
rb_io_wait_writable(FPTR_TO_FD(fptr));
continue;
case SSL_ERROR_WANT_READ:
- read_would_block(nonblock);
rb_io_wait_readable(FPTR_TO_FD(fptr));
continue;
case SSL_ERROR_SYSCALL:
@@ -1288,26 +1104,6 @@ ossl_ssl_write_internal(VALUE self, VALUE str, int nonblock)
/*
* call-seq:
- * ssl.syswrite(string) => integer
- */
-static VALUE
-ossl_ssl_write(VALUE self, VALUE str)
-{
- return ossl_ssl_write_internal(self, str, 0);
-}
-
-/*
- * call-seq:
- * ssl.syswrite_nonblock(string) => integer
- */
-static VALUE
-ossl_ssl_write_nonblock(VALUE self, VALUE str)
-{
- return ossl_ssl_write_internal(self, str, 1);
-}
-
-/*
- * call-seq:
* ssl.sysclose => nil
*/
static VALUE
@@ -1548,13 +1344,13 @@ Init_ossl_ssl()
ID_callback_state = rb_intern("@callback_state");
- ossl_ssl_ex_vcb_idx = SSL_get_ex_new_index(0,(void *)"ossl_ssl_ex_vcb_idx",0,0,0);
- ossl_ssl_ex_store_p = SSL_get_ex_new_index(0,(void *)"ossl_ssl_ex_store_p",0,0,0);
- ossl_ssl_ex_ptr_idx = SSL_get_ex_new_index(0,(void *)"ossl_ssl_ex_ptr_idx",0,0,0);
+ ossl_ssl_ex_vcb_idx = SSL_get_ex_new_index(0,"ossl_ssl_ex_vcb_idx",0,0,0);
+ ossl_ssl_ex_store_p = SSL_get_ex_new_index(0,"ossl_ssl_ex_store_p",0,0,0);
+ ossl_ssl_ex_ptr_idx = SSL_get_ex_new_index(0,"ossl_ssl_ex_ptr_idx",0,0,0);
ossl_ssl_ex_client_cert_cb_idx =
- SSL_get_ex_new_index(0,(void *)"ossl_ssl_ex_client_cert_cb_idx",0,0,0);
+ SSL_get_ex_new_index(0,"ossl_ssl_ex_client_cert_cb_idx",0,0,0);
ossl_ssl_ex_tmp_dh_callback_idx =
- SSL_get_ex_new_index(0,(void *)"ossl_ssl_ex_tmp_dh_callback_idx",0,0,0);
+ SSL_get_ex_new_index(0,"ossl_ssl_ex_tmp_dh_callback_idx",0,0,0);
mSSL = rb_define_module_under(mOSSL, "SSL");
eSSLError = rb_define_class_under(mSSL, "SSLError", eOSSLError);
@@ -1622,13 +1418,9 @@ Init_ossl_ssl()
rb_define_alias(cSSLSocket, "to_io", "io");
rb_define_method(cSSLSocket, "initialize", ossl_ssl_initialize, -1);
rb_define_method(cSSLSocket, "connect", ossl_ssl_connect, 0);
- rb_define_method(cSSLSocket, "connect_nonblock", ossl_ssl_connect_nonblock, 0);
rb_define_method(cSSLSocket, "accept", ossl_ssl_accept, 0);
- rb_define_method(cSSLSocket, "accept_nonblock", ossl_ssl_accept_nonblock, 0);
rb_define_method(cSSLSocket, "sysread", ossl_ssl_read, -1);
- rb_define_private_method(cSSLSocket, "sysread_nonblock", ossl_ssl_read_nonblock, -1);
rb_define_method(cSSLSocket, "syswrite", ossl_ssl_write, 1);
- rb_define_private_method(cSSLSocket, "syswrite_nonblock", ossl_ssl_write_nonblock, 1);
rb_define_method(cSSLSocket, "sysclose", ossl_ssl_close, 0);
rb_define_method(cSSLSocket, "cert", ossl_ssl_get_cert, 0);
rb_define_method(cSSLSocket, "peer_cert", ossl_ssl_get_peer_cert, 0);
@@ -1640,7 +1432,7 @@ Init_ossl_ssl()
rb_define_method(cSSLSocket, "session=", ossl_ssl_set_session, 1);
rb_define_method(cSSLSocket, "verify_result", ossl_ssl_get_verify_result, 0);
-#define ossl_ssl_def_const(x) rb_define_const(mSSL, #x, INT2NUM(SSL_##x))
+#define ossl_ssl_def_const(x) rb_define_const(mSSL, #x, INT2FIX(SSL_##x))
ossl_ssl_def_const(VERIFY_NONE);
ossl_ssl_def_const(VERIFY_PEER);
diff --git a/ext/openssl/ossl_ssl_session.c b/ext/openssl/ossl_ssl_session.c
index d5fdba6aed..63c2bbb87a 100644
--- a/ext/openssl/ossl_ssl_session.c
+++ b/ext/openssl/ossl_ssl_session.c
@@ -36,6 +36,8 @@ static VALUE ossl_ssl_session_alloc(VALUE klass)
static VALUE ossl_ssl_session_initialize(VALUE self, VALUE arg1)
{
SSL_SESSION *ctx = NULL;
+ VALUE obj;
+ unsigned char *p;
if (RDATA(self)->data)
ossl_raise(eSSLSession, "SSL Session already initialized");
@@ -53,7 +55,7 @@ static VALUE ossl_ssl_session_initialize(VALUE self, VALUE arg1)
ctx = PEM_read_bio_SSL_SESSION(in, NULL, NULL, NULL);
if (!ctx) {
- (void)BIO_reset(in);
+ BIO_reset(in);
ctx = d2i_SSL_SESSION_bio(in, NULL);
}
@@ -107,7 +109,7 @@ static VALUE ossl_ssl_session_get_time(VALUE self)
if (t == 0)
return Qnil;
- return rb_funcall(rb_cTime, rb_intern("at"), 1, TIMET2NUM(t));
+ return rb_funcall(rb_cTime, rb_intern("at"), 1, LONG2NUM(t));
}
/*
@@ -126,14 +128,14 @@ static VALUE ossl_ssl_session_get_timeout(VALUE self)
t = SSL_SESSION_get_timeout(ctx);
- return TIMET2NUM(t);
+ return ULONG2NUM(t);
}
#define SSLSESSION_SET_TIME(func) \
static VALUE ossl_ssl_session_set_##func(VALUE self, VALUE time_v) \
{ \
SSL_SESSION *ctx; \
- unsigned long t; \
+ time_t t; \
\
GetSSLSession(self, ctx); \
\
diff --git a/ext/openssl/ossl_version.h b/ext/openssl/ossl_version.h
index 193ceab089..63878e0d8e 100644
--- a/ext/openssl/ossl_version.h
+++ b/ext/openssl/ossl_version.h
@@ -11,6 +11,6 @@
#if !defined(_OSSL_VERSION_H_)
#define _OSSL_VERSION_H_
-#define OSSL_VERSION "1.1.0"
+#define OSSL_VERSION "1.0.0"
#endif /* _OSSL_VERSION_H_ */
diff --git a/ext/openssl/ossl_x509attr.c b/ext/openssl/ossl_x509attr.c
index 1f817cdafe..ca1c59aba9 100644
--- a/ext/openssl/ossl_x509attr.c
+++ b/ext/openssl/ossl_x509attr.c
@@ -92,17 +92,16 @@ static VALUE
ossl_x509attr_initialize(int argc, VALUE *argv, VALUE self)
{
VALUE oid, value;
- X509_ATTRIBUTE *attr, *x;
- const unsigned char *p;
+ X509_ATTRIBUTE *attr;
+ unsigned char *p;
GetX509Attr(self, attr);
if(rb_scan_args(argc, argv, "11", &oid, &value) == 1){
oid = ossl_to_der_if_possible(oid);
StringValue(oid);
- p = (unsigned char *)RSTRING_PTR(oid);
- x = d2i_X509_ATTRIBUTE(&attr, &p, RSTRING_LEN(oid));
- DATA_PTR(self) = attr;
- if(!x){
+ p = RSTRING_PTR(oid);
+ if(!d2i_X509_ATTRIBUTE((X509_ATTRIBUTE**)&DATA_PTR(self),
+ &p, RSTRING_LEN(oid))){
ossl_raise(eX509AttrError, NULL);
}
return self;
@@ -213,7 +212,7 @@ ossl_x509attr_get_value(VALUE self)
if(OSSL_X509ATTR_IS_SINGLE(attr)){
length = i2d_ASN1_TYPE(attr->value.single, NULL);
str = rb_str_new(0, length);
- p = (unsigned char *)RSTRING_PTR(str);
+ p = RSTRING_PTR(str);
i2d_ASN1_TYPE(attr->value.single, &p);
ossl_str_adjust(str, p);
}
@@ -221,7 +220,7 @@ ossl_x509attr_get_value(VALUE self)
length = i2d_ASN1_SET_OF_ASN1_TYPE(attr->value.set, NULL,
i2d_ASN1_TYPE, V_ASN1_SET, V_ASN1_UNIVERSAL, 0);
str = rb_str_new(0, length);
- p = (unsigned char *)RSTRING_PTR(str);
+ p = RSTRING_PTR(str);
i2d_ASN1_SET_OF_ASN1_TYPE(attr->value.set, &p,
i2d_ASN1_TYPE, V_ASN1_SET, V_ASN1_UNIVERSAL, 0);
ossl_str_adjust(str, p);
@@ -247,7 +246,7 @@ ossl_x509attr_to_der(VALUE self)
if((len = i2d_X509_ATTRIBUTE(attr, NULL)) <= 0)
ossl_raise(eX509AttrError, NULL);
str = rb_str_new(0, len);
- p = (unsigned char *)RSTRING_PTR(str);
+ p = RSTRING_PTR(str);
if(i2d_X509_ATTRIBUTE(attr, &p) <= 0)
ossl_raise(eX509AttrError, NULL);
rb_str_set_len(str, p - (unsigned char*)RSTRING_PTR(str));
diff --git a/ext/openssl/ossl_x509cert.c b/ext/openssl/ossl_x509cert.c
index fec2d8b1a3..b97f27ffa9 100644
--- a/ext/openssl/ossl_x509cert.c
+++ b/ext/openssl/ossl_x509cert.c
@@ -134,7 +134,7 @@ static VALUE
ossl_x509_initialize(int argc, VALUE *argv, VALUE self)
{
BIO *in;
- X509 *x509, *x = DATA_PTR(self);
+ X509 *x509;
VALUE arg;
if (rb_scan_args(argc, argv, "01", &arg) == 0) {
@@ -143,12 +143,10 @@ ossl_x509_initialize(int argc, VALUE *argv, VALUE self)
}
arg = ossl_to_der_if_possible(arg);
in = ossl_obj2bio(arg);
- x509 = PEM_read_bio_X509(in, &x, NULL, NULL);
- DATA_PTR(self) = x;
+ x509 = PEM_read_bio_X509(in, (X509 **)&DATA_PTR(self), NULL, NULL);
if (!x509) {
- (void)BIO_reset(in);
- x509 = d2i_X509_bio(in, &x);
- DATA_PTR(self) = x;
+ BIO_reset(in);
+ x509 = d2i_X509_bio(in, (X509 **)&DATA_PTR(self));
}
BIO_free(in);
if (!x509) ossl_raise(eX509CertError, NULL);
@@ -192,7 +190,7 @@ ossl_x509_to_der(VALUE self)
if ((len = i2d_X509(x509, NULL)) <= 0)
ossl_raise(eX509CertError, NULL);
str = rb_str_new(0, len);
- p = (unsigned char *)RSTRING_PTR(str);
+ p = RSTRING_PTR(str);
if (i2d_X509(x509, &p) <= 0)
ossl_raise(eX509CertError, NULL);
ossl_str_adjust(str, p);
@@ -692,7 +690,7 @@ static VALUE
ossl_x509_inspect(VALUE self)
{
VALUE str;
- const char *cname = rb_class2name(rb_obj_class(self));
+ char *cname = rb_class2name(rb_obj_class(self));
str = rb_str_new2("#<");
rb_str_cat2(str, cname);
diff --git a/ext/openssl/ossl_x509crl.c b/ext/openssl/ossl_x509crl.c
index 1be9640e6b..be9ddacf48 100644
--- a/ext/openssl/ossl_x509crl.c
+++ b/ext/openssl/ossl_x509crl.c
@@ -91,7 +91,7 @@ static VALUE
ossl_x509crl_initialize(int argc, VALUE *argv, VALUE self)
{
BIO *in;
- X509_CRL *crl, *x = DATA_PTR(self);
+ X509_CRL *crl;
VALUE arg;
if (rb_scan_args(argc, argv, "01", &arg) == 0) {
@@ -99,12 +99,10 @@ ossl_x509crl_initialize(int argc, VALUE *argv, VALUE self)
}
arg = ossl_to_der_if_possible(arg);
in = ossl_obj2bio(arg);
- crl = PEM_read_bio_X509_CRL(in, &x, NULL, NULL);
- DATA_PTR(self) = x;
+ crl = PEM_read_bio_X509_CRL(in, (X509_CRL **)&DATA_PTR(self), NULL, NULL);
if (!crl) {
- (void)BIO_reset(in);
- crl = d2i_X509_CRL_bio(in, &x);
- DATA_PTR(self) = x;
+ BIO_reset(in);
+ crl = d2i_X509_CRL_bio(in, (X509_CRL **)&DATA_PTR(self));
}
BIO_free(in);
if (!crl) ossl_raise(eX509CRLError, NULL);
diff --git a/ext/openssl/ossl_x509ext.c b/ext/openssl/ossl_x509ext.c
index d79615499b..aa9366f901 100644
--- a/ext/openssl/ossl_x509ext.c
+++ b/ext/openssl/ossl_x509ext.c
@@ -110,7 +110,6 @@ ossl_x509extfactory_alloc(VALUE klass)
VALUE obj;
MakeX509ExtFactory(klass, obj, ctx);
- rb_iv_set(obj, "@config", Qnil);
return obj;
}
@@ -163,10 +162,10 @@ ossl_x509extfactory_set_crl(VALUE self, VALUE crl)
return crl;
}
-#ifdef HAVE_X509V3_SET_NCONF
static VALUE
ossl_x509extfactory_set_config(VALUE self, VALUE config)
{
+#ifdef HAVE_X509V3_SET_NCONF
X509V3_CTX *ctx;
CONF *conf;
@@ -176,10 +175,10 @@ ossl_x509extfactory_set_config(VALUE self, VALUE config)
X509V3_set_nconf(ctx, conf);
return config;
-}
#else
-#define rb_f_fork rb_f_notimplement
+ rb_notimplement();
#endif
+}
static VALUE
ossl_x509extfactory_initialize(int argc, VALUE *argv, VALUE self)
@@ -274,17 +273,16 @@ static VALUE
ossl_x509ext_initialize(int argc, VALUE *argv, VALUE self)
{
VALUE oid, value, critical;
- const unsigned char *p;
- X509_EXTENSION *ext, *x;
+ unsigned char *p;
+ X509_EXTENSION *ext;
GetX509Ext(self, ext);
if(rb_scan_args(argc, argv, "12", &oid, &value, &critical) == 1){
oid = ossl_to_der_if_possible(oid);
StringValue(oid);
- p = (unsigned char *)RSTRING_PTR(oid);
- x = d2i_X509_EXTENSION(&ext, &p, RSTRING_LEN(oid));
- DATA_PTR(self) = ext;
- if(!x)
+ p = RSTRING_PTR(oid);
+ if(!d2i_X509_EXTENSION((X509_EXTENSION**)&DATA_PTR(self),
+ &p, RSTRING_LEN(oid)))
ossl_raise(eX509ExtError, NULL);
return self;
}
@@ -325,15 +323,14 @@ ossl_x509ext_set_value(VALUE self, VALUE data)
ossl_raise(eX509ExtError, "malloc error");
memcpy(s, RSTRING_PTR(data), RSTRING_LEN(data));
if(!(asn1s = ASN1_OCTET_STRING_new())){
- OPENSSL_free(s);
+ free(s);
ossl_raise(eX509ExtError, NULL);
}
if(!M_ASN1_OCTET_STRING_set(asn1s, s, RSTRING_LEN(data))){
- OPENSSL_free(s);
+ free(s);
ASN1_OCTET_STRING_free(asn1s);
ossl_raise(eX509ExtError, NULL);
}
- OPENSSL_free(s);
GetX509Ext(self, ext);
X509_EXTENSION_set_data(ext, asn1s);
@@ -412,7 +409,7 @@ ossl_x509ext_to_der(VALUE obj)
if((len = i2d_X509_EXTENSION(ext, NULL)) <= 0)
ossl_raise(eX509ExtError, NULL);
str = rb_str_new(0, len);
- p = (unsigned char *)RSTRING_PTR(str);
+ p = RSTRING_PTR(str);
if(i2d_X509_EXTENSION(ext, &p) < 0)
ossl_raise(eX509ExtError, NULL);
ossl_str_adjust(str, p);
diff --git a/ext/openssl/ossl_x509name.c b/ext/openssl/ossl_x509name.c
index fd8e329a85..b4434d2a34 100644
--- a/ext/openssl/ossl_x509name.c
+++ b/ext/openssl/ossl_x509name.c
@@ -135,14 +135,11 @@ ossl_x509name_initialize(int argc, VALUE *argv, VALUE self)
rb_block_call(tmp, rb_intern("each"), 0, 0, ossl_x509name_init_i, args);
}
else{
- const unsigned char *p;
+ unsigned char *p;
VALUE str = ossl_to_der_if_possible(arg);
- X509_NAME *x;
StringValue(str);
- p = (unsigned char *)RSTRING_PTR(str);
- x = d2i_X509_NAME(&name, &p, RSTRING_LEN(str));
- DATA_PTR(self) = name;
- if(!x){
+ p = RSTRING_PTR(str);
+ if(!d2i_X509_NAME((X509_NAME**)&DATA_PTR(self), &p, RSTRING_LEN(str))){
ossl_raise(eX509NameError, NULL);
}
}
@@ -167,7 +164,7 @@ VALUE ossl_x509name_add_entry(int argc, VALUE *argv, VALUE self)
if(NIL_P(type)) type = rb_aref(OBJECT_TYPE_TEMPLATE, oid);
GetX509Name(self, name);
if (!X509_NAME_add_entry_by_txt(name, RSTRING_PTR(oid), NUM2INT(type),
- (const unsigned char *)RSTRING_PTR(value), RSTRING_LEN(value), -1, 0)) {
+ RSTRING_PTR(value), RSTRING_LEN(value), -1, 0)) {
ossl_raise(eX509NameError, NULL);
}
@@ -248,7 +245,7 @@ ossl_x509name_to_a(VALUE self)
}
short_name = OBJ_nid2sn(OBJ_ln2nid(long_name));
ary = rb_ary_new3(3, rb_str_new2(short_name),
- rb_str_new((const char *)entry->value->data, entry->value->length),
+ rb_str_new(entry->value->data, entry->value->length),
INT2FIX(entry->value->type));
rb_ary_push(ret, ary);
}
@@ -322,7 +319,7 @@ ossl_x509name_to_der(VALUE self)
if((len = i2d_X509_NAME(name, NULL)) <= 0)
ossl_raise(eX509NameError, NULL);
str = rb_str_new(0, len);
- p = (unsigned char *)RSTRING_PTR(str);
+ p = RSTRING_PTR(str);
if(i2d_X509_NAME(name, &p) <= 0)
ossl_raise(eX509NameError, NULL);
ossl_str_adjust(str, p);
diff --git a/ext/openssl/ossl_x509req.c b/ext/openssl/ossl_x509req.c
index 7c1b610159..13a42dddaf 100644
--- a/ext/openssl/ossl_x509req.c
+++ b/ext/openssl/ossl_x509req.c
@@ -99,7 +99,7 @@ static VALUE
ossl_x509req_initialize(int argc, VALUE *argv, VALUE self)
{
BIO *in;
- X509_REQ *req, *x = DATA_PTR(self);
+ X509_REQ *req;
VALUE arg;
if (rb_scan_args(argc, argv, "01", &arg) == 0) {
@@ -107,12 +107,10 @@ ossl_x509req_initialize(int argc, VALUE *argv, VALUE self)
}
arg = ossl_to_der_if_possible(arg);
in = ossl_obj2bio(arg);
- req = PEM_read_bio_X509_REQ(in, &x, NULL, NULL);
- DATA_PTR(self) = x;
+ req = PEM_read_bio_X509_REQ(in, (X509_REQ **)&DATA_PTR(self), NULL, NULL);
if (!req) {
- (void)BIO_reset(in);
- req = d2i_X509_REQ_bio(in, &x);
- DATA_PTR(self) = x;
+ BIO_reset(in);
+ req = d2i_X509_REQ_bio(in, (X509_REQ **)&DATA_PTR(self));
}
BIO_free(in);
if (!req) ossl_raise(eX509ReqError, NULL);
@@ -173,7 +171,7 @@ ossl_x509req_to_der(VALUE self)
if ((len = i2d_X509_REQ(req, NULL)) <= 0)
ossl_raise(eX509CertError, NULL);
str = rb_str_new(0, len);
- p = (unsigned char *)RSTRING_PTR(str);
+ p = RSTRING_PTR(str);
if (i2d_X509_REQ(req, &p) <= 0)
ossl_raise(eX509ReqError, NULL);
ossl_str_adjust(str, p);
diff --git a/ext/openssl/ossl_x509store.c b/ext/openssl/ossl_x509store.c
index 23fb952305..769ce8a91a 100644
--- a/ext/openssl/ossl_x509store.c
+++ b/ext/openssl/ossl_x509store.c
@@ -9,6 +9,7 @@
* (See the file 'LICENCE'.)
*/
#include "ossl.h"
+#include <rubysig.h>
#define WrapX509Store(klass, obj, st) do { \
if (!st) { \
@@ -211,7 +212,7 @@ ossl_x509store_add_file(VALUE self, VALUE file)
char *path = NULL;
if(file != Qnil){
- SafeStringValue(file);
+ Check_SafeStr(file);
path = RSTRING_PTR(file);
}
GetX509Store(self, store);
@@ -232,7 +233,7 @@ ossl_x509store_add_path(VALUE self, VALUE dir)
char *path = NULL;
if(dir != Qnil){
- SafeStringValue(dir);
+ Check_SafeStr(dir);
path = RSTRING_PTR(dir);
}
GetX509Store(self, store);
diff --git a/ext/pty/.cvsignore b/ext/pty/.cvsignore
index 814345ece8..4088712231 100644
--- a/ext/pty/.cvsignore
+++ b/ext/pty/.cvsignore
@@ -1,4 +1,3 @@
Makefile
mkmf.log
*.def
-extconf.h
diff --git a/ext/pty/depend b/ext/pty/depend
index 2249eb8fcd..888be6c301 100644
--- a/ext/pty/depend
+++ b/ext/pty/depend
@@ -1 +1 @@
-pty.o: pty.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h $(hdrdir)/io.h
+pty.o: pty.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
diff --git a/ext/pty/expect_sample.rb b/ext/pty/expect_sample.rb
index d3b072b83c..2a2e29f866 100644
--- a/ext/pty/expect_sample.rb
+++ b/ext/pty/expect_sample.rb
@@ -12,9 +12,9 @@ require 'expect'
fnames = []
PTY.spawn("ftp ftp.ruby-lang.org") do |r_f,w_f,pid|
w_f.sync = true
-
+
$expect_verbose = false
-
+
if !ENV['USER'].nil?
username = ENV['USER']
elsif !ENV['LOGNAME'].nil?
@@ -22,14 +22,14 @@ PTY.spawn("ftp ftp.ruby-lang.org") do |r_f,w_f,pid|
else
username = 'guest'
end
-
+
r_f.expect(/^(Name).*: |(word):|> /) do
w_f.puts($1 ? "ftp" : $2 ? "#{username}@" : "cd pub/ruby")
end
r_f.expect("> ") do
w_f.print "dir\n"
end
-
+
r_f.expect(/[^\-]> /) do |output|
for x in output[0].split("\n")
if x =~ /(ruby.*?\.tar\.gz)/ then
diff --git a/ext/pty/extconf.rb b/ext/pty/extconf.rb
index 3d6d0f1e46..5e126fe0cf 100644
--- a/ext/pty/extconf.rb
+++ b/ext/pty/extconf.rb
@@ -1,14 +1,12 @@
require 'mkmf'
-if /mswin|mingw|bccwin/ !~ RUBY_PLATFORM
+if /mswin32|mingw|bccwin32/ !~ RUBY_PLATFORM
have_header("sys/stropts.h")
have_func("setresuid")
have_header("libutil.h")
- have_header("util.h") # OpenBSD openpty
have_header("pty.h")
have_library("util", "openpty")
- if have_func("posix_openpt") or
- have_func("openpty") or
+ if have_func("openpty") or
have_func("_getpty") or
have_func("ptsname") or
have_func("ioctl")
diff --git a/ext/pty/pty.c b/ext/pty/pty.c
index b4394c207c..939335242f 100644
--- a/ext/pty/pty.c
+++ b/ext/pty/pty.c
@@ -1,8 +1,4 @@
-#include "ruby/config.h"
-#ifdef RUBY_EXTCONF_H
-#include RUBY_EXTCONF_H
-#endif
-#include <stdlib.h>
+#include "config.h"
#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
@@ -16,9 +12,6 @@
#ifdef HAVE_LIBUTIL_H
#include <libutil.h>
#endif
-#ifdef HAVE_UTIL_H
-#include <util.h>
-#endif
#ifdef HAVE_PTY_H
#include <pty.h>
#endif
@@ -29,9 +22,9 @@
#endif
#include <ctype.h>
-#include "ruby/ruby.h"
-#include "ruby/io.h"
-#include "ruby/util.h"
+#include "ruby.h"
+#include "rubyio.h"
+#include "util.h"
#include <signal.h>
#ifdef HAVE_SYS_STROPTS_H
@@ -123,7 +116,8 @@ char MasterDevice[] = "/dev/pty%s",
static VALUE eChildExited;
static VALUE
-echild_status(VALUE self)
+echild_status(self)
+ VALUE self;
{
return rb_ivar_get(self, rb_intern("status"));
}
@@ -131,110 +125,86 @@ echild_status(VALUE self)
struct pty_info {
int fd;
rb_pid_t child_pid;
+ VALUE thread;
};
-static void getDevice(int*, int*, char [DEVICELEN], int);
+static void
+raise_from_wait(state, info)
+ struct pty_info *info;
+ char *state;
+{
+ extern VALUE rb_last_status;
+ char buf[1024];
+ VALUE exc;
-struct exec_info {
- int argc;
- VALUE *argv;
-};
+ snprintf(buf, sizeof(buf), "pty - %s: %ld", state, (long)info->child_pid);
+ exc = rb_exc_new2(eChildExited, buf);
+ rb_iv_set(exc, "status", rb_last_status);
+ rb_funcall(info->thread, rb_intern("raise"), 1, exc);
+}
static VALUE
-pty_exec(VALUE v)
+pty_syswait(info)
+ struct pty_info *info;
{
- struct exec_info *arg = (struct exec_info *)v;
- return rb_f_exec(arg->argc, arg->argv);
+ int cpid, status;
+
+ for (;;) {
+ cpid = rb_waitpid(info->child_pid, &status, WUNTRACED);
+ if (cpid == -1) return Qnil;
+
+#if defined(WIFSTOPPED)
+#elif defined(IF_STOPPED)
+#define WIFSTOPPED(status) IF_STOPPED(status)
+#else
+---->> Either IF_STOPPED or WIFSTOPPED is needed <<----
+#endif /* WIFSTOPPED | IF_STOPPED */
+ if (WIFSTOPPED(status)) { /* suspend */
+ raise_from_wait("stopped", info);
+ }
+ else if (kill(info->child_pid, 0) == 0) {
+ raise_from_wait("changed", info);
+ }
+ else {
+ raise_from_wait("exited", info);
+ return Qnil;
+ }
+ }
}
-struct child_info {
- int master, slave;
- char *slavename;
+static void getDevice _((int*, int*, char [DEVICELEN]));
+
+struct exec_info {
int argc;
VALUE *argv;
};
-static int
-chfunc(void *data)
-{
- struct child_info *carg = data;
- int master = carg->master;
- int slave = carg->slave;
- int argc = carg->argc;
- VALUE *argv = carg->argv;
-
- struct exec_info arg;
- int status;
-
- /*
- * Set free from process group and controlling terminal
- */
-#ifdef HAVE_SETSID
- (void) setsid();
-#else /* HAS_SETSID */
-# ifdef HAVE_SETPGRP
-# ifdef SETGRP_VOID
- if (setpgrp() == -1)
- perror("setpgrp()");
-# else /* SETGRP_VOID */
- if (setpgrp(0, getpid()) == -1)
- rb_sys_fail("setpgrp()");
- {
- int i = open("/dev/tty", O_RDONLY);
- if (i < 0) rb_sys_fail("/dev/tty");
- if (ioctl(i, TIOCNOTTY, (char *)0))
- perror("ioctl(TIOCNOTTY)");
- close(i);
- }
-# endif /* SETGRP_VOID */
-# endif /* HAVE_SETPGRP */
-#endif /* HAS_SETSID */
-
- /*
- * obtain new controlling terminal
- */
-#if defined(TIOCSCTTY)
- close(master);
- (void) ioctl(slave, TIOCSCTTY, (char *)0);
- /* errors ignored for sun */
-#else
- close(slave);
- slave = open(carg->slavename, O_RDWR);
- if (slave < 0) {
- perror("open: pty slave");
- _exit(1);
- }
- close(master);
-#endif
- write(slave, "", 1);
- dup2(slave,0);
- dup2(slave,1);
- dup2(slave,2);
- close(slave);
-#if defined(HAVE_SETEUID) || defined(HAVE_SETREUID) || defined(HAVE_SETRESUID)
- seteuid(getuid());
-#endif
+static VALUE pty_exec _((VALUE v));
- arg.argc = argc;
- arg.argv = argv;
- rb_protect(pty_exec, (VALUE)&arg, &status);
- sleep(1);
- _exit(1);
+static VALUE
+pty_exec(v)
+ VALUE v;
+{
+ struct exec_info *arg = (struct exec_info *)v;
+ return rb_f_exec(arg->argc, arg->argv);
}
static void
-establishShell(int argc, VALUE *argv, struct pty_info *info,
- char SlaveName[DEVICELEN])
+establishShell(argc, argv, info, SlaveName)
+ int argc;
+ VALUE *argv;
+ struct pty_info *info;
+ char SlaveName[DEVICELEN];
{
- int master,slave;
- rb_pid_t pid;
+ int i,master,slave;
char *p, tmp, *getenv();
struct passwd *pwent;
VALUE v;
- struct child_info carg;
+ struct exec_info arg;
+ int status;
if (argc == 0) {
- const char *shellname;
+ char *shellname;
if ((p = getenv("SHELL")) != NULL) {
shellname = p;
@@ -250,80 +220,95 @@ establishShell(int argc, VALUE *argv, struct pty_info *info,
argc = 1;
argv = &v;
}
+ getDevice(&master, &slave, SlaveName);
- getDevice(&master, &slave, SlaveName, 0);
+ info->thread = rb_thread_current();
+ if((i = fork()) < 0) {
+ close(master);
+ close(slave);
+ rb_sys_fail("fork failed");
+ }
- carg.master = master;
- carg.slave = slave;
- carg.slavename = SlaveName;
- carg.argc = argc;
- carg.argv = argv;
- pid = rb_fork(0, chfunc, &carg, Qnil);
+ if(i == 0) { /* child */
+ /*
+ * Set free from process group and controlling terminal
+ */
+#ifdef HAVE_SETSID
+ (void) setsid();
+#else /* HAS_SETSID */
+# ifdef HAVE_SETPGRP
+# ifdef SETGRP_VOID
+ if (setpgrp() == -1)
+ perror("setpgrp()");
+# else /* SETGRP_VOID */
+ if (setpgrp(0, getpid()) == -1)
+ rb_sys_fail("setpgrp()");
+ if ((i = open("/dev/tty", O_RDONLY)) < 0)
+ rb_sys_fail("/dev/tty");
+ else {
+ if (ioctl(i, TIOCNOTTY, (char *)0))
+ perror("ioctl(TIOCNOTTY)");
+ close(i);
+ }
+# endif /* SETGRP_VOID */
+# endif /* HAVE_SETPGRP */
+#endif /* HAS_SETSID */
- if (pid < 0) {
+ /*
+ * obtain new controlling terminal
+ */
+#if defined(TIOCSCTTY)
close(master);
+ (void) ioctl(slave, TIOCSCTTY, (char *)0);
+ /* errors ignored for sun */
+#else
close(slave);
- rb_sys_fail("fork failed");
+ slave = open(SlaveName, O_RDWR);
+ if (slave < 0) {
+ perror("open: pty slave");
+ _exit(1);
+ }
+ close(master);
+#endif
+ write(slave, "", 1);
+ dup2(slave,0);
+ dup2(slave,1);
+ dup2(slave,2);
+ close(slave);
+#if defined(HAVE_SETEUID) || defined(HAVE_SETREUID) || defined(HAVE_SETRESUID)
+ seteuid(getuid());
+#endif
+
+ arg.argc = argc;
+ arg.argv = argv;
+ rb_protect(pty_exec, (VALUE)&arg, &status);
+ sleep(1);
+ _exit(1);
}
read(master, &tmp, 1);
close(slave);
- info->child_pid = pid;
+ info->child_pid = i;
info->fd = master;
}
-static int
-no_mesg(char *slavedevice, int nomesg)
+static VALUE
+pty_finalize_syswait(info)
+ struct pty_info *info;
{
- if (nomesg)
- return chmod(slavedevice, 0600);
- else
- return 0;
+ rb_thread_kill(info->thread);
+ rb_funcall(info->thread, rb_intern("value"), 0);
+ rb_detach_process(info->child_pid);
+ return Qnil;
}
static int
-get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg, int fail)
+get_device_once(master, slave, SlaveName, fail)
+ int *master, *slave, fail;
+ char SlaveName[DEVICELEN];
{
-#if defined(HAVE_POSIX_OPENPT)
- int masterfd = -1, slavefd = -1;
- char *slavedevice;
- struct sigaction dfl, old;
-
- dfl.sa_handler = SIG_DFL;
- dfl.sa_flags = 0;
- sigemptyset(&dfl.sa_mask);
-
- if ((masterfd = posix_openpt(O_RDWR|O_NOCTTY)) == -1) goto error;
- if (sigaction(SIGCHLD, &dfl, &old) == -1) goto error;
- if (grantpt(masterfd) == -1) goto grantpt_error;
- if (sigaction(SIGCHLD, &old, NULL) == -1) goto error;
- if (unlockpt(masterfd) == -1) goto error;
- if ((slavedevice = ptsname(masterfd)) == NULL) goto error;
- if (no_mesg(slavedevice, nomesg) == -1) goto error;
- if ((slavefd = open(slavedevice, O_RDWR|O_NOCTTY, 0)) == -1) goto error;
-
-#if defined I_PUSH && !defined linux
- if (ioctl(slavefd, I_PUSH, "ptem") == -1) goto error;
- if (ioctl(slavefd, I_PUSH, "ldterm") == -1) goto error;
- if (ioctl(slavefd, I_PUSH, "ttcompat") == -1) goto error;
-#endif
-
- *master = masterfd;
- *slave = slavefd;
- strlcpy(SlaveName, slavedevice, DEVICELEN);
- return 0;
-
- grantpt_error:
- sigaction(SIGCHLD, &old, NULL);
- error:
- if (slavefd != -1) close(slavefd);
- if (masterfd != -1) close(masterfd);
- if (!fail) {
- rb_raise(rb_eRuntimeError, "can't get Master/Slave device");
- }
- return -1;
-#elif defined HAVE_OPENPTY
+#if defined HAVE_OPENPTY
/*
* Use openpty(3) of 4.3BSD Reno and later,
* or the same interface function.
@@ -333,210 +318,104 @@ get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg,
if (!fail) return -1;
rb_raise(rb_eRuntimeError, "openpty() failed");
}
- if (no_mesg(SlaveName, nomesg) == -1) {
- if (!fail) return -1;
- rb_raise(rb_eRuntimeError, "can't chmod slave pty");
- }
return 0;
-
#elif defined HAVE__GETPTY
char *name;
- mode_t mode = nomesg ? 0600 : 0622;
- if (!(name = _getpty(master, O_RDWR, mode, 0))) {
+ if (!(name = _getpty(master, O_RDWR, 0622, 0))) {
if (!fail) return -1;
rb_raise(rb_eRuntimeError, "_getpty() failed");
}
*slave = open(name, O_RDWR);
- strlcpy(SlaveName, name, DEVICELEN);
+ strncpy(SlaveName, name, sizeof SlaveName);
return 0;
-#elif defined(HAVE_PTSNAME)
- int masterfd = -1, slavefd = -1;
- char *slavedevice;
+#else /* HAVE__GETPTY */
+ int i,j;
+
+#ifdef HAVE_PTSNAME
+ char *pn;
void (*s)();
extern char *ptsname(int);
extern int unlockpt(int);
extern int grantpt(int);
- if((masterfd = open("/dev/ptmx", O_RDWR, 0)) == -1) goto error;
- s = signal(SIGCHLD, SIG_DFL);
- if(grantpt(masterfd) == -1) goto error;
- signal(SIGCHLD, s);
- if(unlockpt(masterfd) == -1) goto error;
- if((slavedevice = ptsname(masterfd)) == NULL) goto error;
- if (no_mesg(slavedevice, nomesg) == -1) goto error;
- if((slavefd = open(slavedevice, O_RDWR, 0)) == -1) goto error;
+ if((i = open("/dev/ptmx", O_RDWR, 0)) != -1) {
+ s = signal(SIGCHLD, SIG_DFL);
+ if(grantpt(i) != -1) {
+ signal(SIGCHLD, s);
+ if(unlockpt(i) != -1) {
+ if((pn = ptsname(i)) != NULL) {
+ if((j = open(pn, O_RDWR, 0)) != -1) {
#if defined I_PUSH && !defined linux
- if(ioctl(slavefd, I_PUSH, "ptem") == -1) goto error;
- if(ioctl(slavefd, I_PUSH, "ldterm") == -1) goto error;
- ioctl(slavefd, I_PUSH, "ttcompat");
+ if(ioctl(j, I_PUSH, "ptem") != -1) {
+ if(ioctl(j, I_PUSH, "ldterm") != -1) {
+ ioctl(j, I_PUSH, "ttcompat");
#endif
- *master = masterfd;
- *slave = slavefd;
- strlcpy(SlaveName, slavedevice, DEVICELEN);
- return 0;
-
- error:
- if (slavefd != -1) close(slavefd);
- if (masterfd != -1) close(masterfd);
+ *master = i;
+ *slave = j;
+ strncpy(SlaveName, pn, sizeof SlaveName);
+ return 0;
+#if defined I_PUSH && !defined linux
+ }
+ }
+#endif
+ }
+ }
+ }
+ }
+ close(i);
+ }
if (!fail) rb_raise(rb_eRuntimeError, "can't get Master/Slave device");
return -1;
#else
- int masterfd = -1, slavefd = -1;
- const char *const *p;
+ char **p;
char MasterName[DEVICELEN];
for (p = deviceNo; *p != NULL; p++) {
snprintf(MasterName, sizeof MasterName, MasterDevice, *p);
- if ((masterfd = open(MasterName,O_RDWR,0)) >= 0) {
- *master = masterfd;
- snprintf(SlaveName, DEVICELEN, SlaveDevice, *p);
- if ((slavefd = open(SlaveName,O_RDWR,0)) >= 0) {
- *slave = slavefd;
- if (chown(SlaveName, getuid(), getgid()) != 0) goto error;
- if (chmod(SlaveName, nomesg ? 0600 : 0622) != 0) goto error;
+ if ((i = open(MasterName,O_RDWR,0)) >= 0) {
+ *master = i;
+ snprintf(SlaveName, sizeof SlaveName, SlaveDevice, *p);
+ if ((j = open(SlaveName,O_RDWR,0)) >= 0) {
+ *slave = j;
+ chown(SlaveName, getuid(), getgid());
+ chmod(SlaveName, 0622);
return 0;
}
- close(masterfd);
+ close(i);
}
}
- error:
- if (slavefd != -1) close(slavefd);
- if (masterfd != -1) close(masterfd);
if (fail) rb_raise(rb_eRuntimeError, "can't get %s", SlaveName);
return -1;
#endif
+#endif
}
static void
-getDevice(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg)
+getDevice(master, slave, slavename)
+ int *master, *slave;
+ char slavename[DEVICELEN];
{
- if (get_device_once(master, slave, SlaveName, nomesg, 0)) {
+ if (get_device_once(master, slave, slavename, 0)) {
rb_gc();
- get_device_once(master, slave, SlaveName, nomesg, 1);
+ get_device_once(master, slave, slavename, 1);
}
}
+/* ruby function: getpty */
static VALUE
-pty_close_pty(VALUE assoc)
-{
- VALUE io;
- int i;
-
- for (i = 0; i < 2; i++) {
- io = rb_ary_entry(assoc, i);
- if (TYPE(io) == T_FILE && 0 <= RFILE(io)->fptr->fd)
- rb_io_close(io);
- }
- return Qnil;
-}
-
-/*
- * call-seq:
- * PTY.open => [master_io, slave_file]
- * PTY.open {|master_io, slave_file| ... } => block value
- *
- * Allocates a pty (pseudo-terminal).
- *
- * It returns an array which contains an IO object and a File object.
- * The former is the master of the pty.
- * The latter is the slave of the pty.
- *
- * If a block is given, it yields the array instead of return.
- * The value of the block is returned.
- * master_io and slave_file is closed when return if they are not closed.
- *
- * The path name of the terminal device can be gotten by slave_file.path.
- *
- * PTY.open {|m, s|
- * p m #=> #<IO: pty /dev/pts/1>
- * p s #=> #<File:/dev/pts/1>
- * p s.path #=> "/dev/pts/1"
- * }
- *
- * # Change the buffering type in factor command,
- * # assuming that factor uses stdio for stdout buffering.
- * # If IO.pipe is used instead of PTY.open,
- * # this code deadlocks because factor's stdout is fully buffered.
- * m, s = PTY.open
- * system("stty raw", :in=>s) # disable newline conversion.
- * r, w = IO.pipe
- * pid = spawn("factor", :in=>r, :out=>s)
- * r.close
- * s.close
- * w.puts "42"
- * p m.gets #=> "42: 2 3 7\n"
- * w.puts "144"
- * p m.gets #=> "144: 2 2 2 2 3 3\n"
- *
- */
-static VALUE
-pty_open(VALUE klass)
-{
- int master_fd, slave_fd;
- char slavename[DEVICELEN];
- VALUE master_io, slave_file;
- rb_io_t *master_fptr, *slave_fptr;
- VALUE assoc;
-
- getDevice(&master_fd, &slave_fd, slavename, 1);
-
- master_io = rb_obj_alloc(rb_cIO);
- MakeOpenFile(master_io, master_fptr);
- master_fptr->mode = FMODE_READWRITE | FMODE_SYNC | FMODE_DUPLEX;
- master_fptr->fd = master_fd;
- master_fptr->pathv = rb_obj_freeze(rb_sprintf(" pty %s", slavename));
-
- slave_file = rb_obj_alloc(rb_cFile);
- MakeOpenFile(slave_file, slave_fptr);
- slave_fptr->mode = FMODE_READWRITE | FMODE_SYNC | FMODE_DUPLEX | FMODE_TTY;
- slave_fptr->fd = slave_fd;
- slave_fptr->pathv = rb_obj_freeze(rb_str_new_cstr(slavename));
-
- assoc = rb_assoc_new(master_io, slave_file);
- if (rb_block_given_p()) {
- return rb_ensure(rb_yield, assoc, pty_close_pty, assoc);
- }
- return assoc;
-}
-
-static VALUE
-pty_detach_process(struct pty_info *info)
-{
- rb_detach_process(info->child_pid);
- return Qnil;
-}
-
-/*
- * call-seq:
- * PTY.spawn(command...) {|r, w, pid| ... } => nil
- * PTY.spawn(command...) => r, w, pid
- * PTY.getpty(command...) {|r, w, pid| ... } => nil
- * PTY.getpty(command...) => r, w, pid
- *
- * spawns the specified command on a newly allocated pty.
- *
- * The command's controlling tty is set to the slave device of the pty.
- * Also its standard input/output/error is redirected to the slave device.
- *
- * PTY.spawn returns two IO objects and PID.
- * PID is the process ID of the command.
- * The two IO objects are connected to the master device of the pty.
- * The first IO object is opened as read mode and
- * The second is opened as write mode.
- *
- * If a block is given, two IO objects and PID is yielded.
- *
- */
-static VALUE
-pty_getpty(int argc, VALUE *argv, VALUE self)
+pty_getpty(argc, argv, self)
+ int argc;
+ VALUE *argv;
+ VALUE self;
{
VALUE res;
struct pty_info info;
+ struct pty_info thinfo;
rb_io_t *wfptr,*rfptr;
VALUE rport = rb_obj_alloc(rb_cFile);
VALUE wport = rb_obj_alloc(rb_cFile);
@@ -548,69 +427,46 @@ pty_getpty(int argc, VALUE *argv, VALUE self)
establishShell(argc, argv, &info, SlaveName);
rfptr->mode = rb_io_mode_flags("r");
- rfptr->fd = info.fd;
- rfptr->pathv = rb_obj_freeze(rb_str_new_cstr(SlaveName));
+ rfptr->f = fdopen(info.fd, "r");
+ rfptr->path = strdup(SlaveName);
wfptr->mode = rb_io_mode_flags("w") | FMODE_SYNC;
- wfptr->fd = dup(info.fd);
- if (wfptr->fd == -1)
- rb_sys_fail("dup()");
- wfptr->pathv = rfptr->pathv;
+ wfptr->f = fdopen(dup(info.fd), "w");
+ wfptr->path = strdup(SlaveName);
res = rb_ary_new2(3);
rb_ary_store(res,0,(VALUE)rport);
rb_ary_store(res,1,(VALUE)wport);
- rb_ary_store(res,2,PIDT2NUM(info.child_pid));
+ rb_ary_store(res,2,INT2FIX(info.child_pid));
+
+ thinfo.thread = rb_thread_create(pty_syswait, (void*)&info);
+ thinfo.child_pid = info.child_pid;
+ rb_thread_schedule();
if (rb_block_given_p()) {
- rb_ensure(rb_yield, res, pty_detach_process, (VALUE)&info);
+ rb_ensure(rb_yield, res, pty_finalize_syswait, (VALUE)&thinfo);
return Qnil;
}
return res;
}
-static void
-raise_from_check(pid_t pid, int status)
+/* ruby function: protect_signal - obsolete */
+static VALUE
+pty_protect(self)
+ VALUE self;
{
- const char *state;
- char buf[1024];
- VALUE exc;
-
-#if defined(WIFSTOPPED)
-#elif defined(IF_STOPPED)
-#define WIFSTOPPED(status) IF_STOPPED(status)
-#else
----->> Either IF_STOPPED or WIFSTOPPED is needed <<----
-#endif /* WIFSTOPPED | IF_STOPPED */
- if (WIFSTOPPED(status)) { /* suspend */
- state = "stopped";
- }
- else if (kill(pid, 0) == 0) {
- state = "changed";
- }
- else {
- state = "exited";
- }
- snprintf(buf, sizeof(buf), "pty - %s: %ld", state, (long)pid);
- exc = rb_exc_new2(eChildExited, buf);
- rb_iv_set(exc, "status", rb_last_status_get());
- rb_exc_raise(exc);
+ rb_warn("PTY::protect_signal is no longer needed");
+ rb_yield(Qnil);
+ return self;
}
+/* ruby function: reset_signal - obsolete */
static VALUE
-pty_check(int argc, VALUE *argv, VALUE self)
+pty_reset_signal(self)
+ VALUE self;
{
- VALUE pid, exc;
- pid_t cpid;
- int status;
-
- rb_scan_args(argc, argv, "11", &pid, &exc);
- cpid = rb_waitpid(NUM2PIDT(pid), &status, WUNTRACED);
- if (cpid == -1) return Qnil;
-
- if (!RTEST(exc)) return status;
- raise_from_check(pid, status);
- return Qnil; /* not reached */
+ rb_warn("PTY::reset_signal is no longer needed");
+ return self;
}
static VALUE cPTY;
@@ -621,8 +477,8 @@ Init_pty()
cPTY = rb_define_module("PTY");
rb_define_module_function(cPTY,"getpty",pty_getpty,-1);
rb_define_module_function(cPTY,"spawn",pty_getpty,-1);
- rb_define_singleton_method(cPTY,"check",pty_check,-1);
- rb_define_singleton_method(cPTY,"open",pty_open,0);
+ rb_define_module_function(cPTY,"protect_signal",pty_protect,0);
+ rb_define_module_function(cPTY,"reset_signal",pty_reset_signal,0);
eChildExited = rb_define_class_under(cPTY,"ChildExited",rb_eRuntimeError);
rb_define_method(eChildExited,"status",echild_status,0);
diff --git a/ext/pty/script.rb b/ext/pty/script.rb
index 903a6f75bd..dbb933171f 100644
--- a/ext/pty/script.rb
+++ b/ext/pty/script.rb
@@ -18,7 +18,7 @@ PTY.spawn("/bin/csh") do |r_pty,w_pty,pid|
w_pty.flush
end
end
-
+
begin
while true
c = r_pty.sysread(512)
diff --git a/ext/purelib.rb b/ext/purelib.rb
index 6418fd618d..dbe514c34a 100644
--- a/ext/purelib.rb
+++ b/ext/purelib.rb
@@ -6,12 +6,5 @@ $:.each_with_index {|path, index|
end
}
if nul
- removed, $:[nul..-1] = $:[nul..-1], ["."]
- if defined?(Gem::QuickLoader)
- removed.each do |path|
- # replaces a fake rubygems by gem_prelude.rb with an alternative path
- index = $".index(File.join(path, 'rubygems.rb'))
- $"[index] = Gem::QuickLoader.path_to_full_rubygems_library if index
- end
- end
+ $:[nul..-1] = ["."]
end
diff --git a/ext/racc/cparse/.cvsignore b/ext/racc/cparse/.cvsignore
index 814345ece8..4088712231 100644
--- a/ext/racc/cparse/.cvsignore
+++ b/ext/racc/cparse/.cvsignore
@@ -1,4 +1,3 @@
Makefile
mkmf.log
*.def
-extconf.h
diff --git a/ext/racc/cparse/README b/ext/racc/cparse/README
deleted file mode 100644
index 80b4dce311..0000000000
--- a/ext/racc/cparse/README
+++ /dev/null
@@ -1,10 +0,0 @@
-Racc Runtime README
-===================
-
-This directory contains a runtime library of
-Racc parser generator. If you want to generate
-your own parser, you must get Racc full package.
-Get it from:
-
- http://raa.ruby-lang.org/list.rhtml?name=racc
-
diff --git a/ext/racc/cparse/cparse.c b/ext/racc/cparse/cparse.c
index d085158f11..18a26f670f 100644
--- a/ext/racc/cparse/cparse.c
+++ b/ext/racc/cparse/cparse.c
@@ -11,7 +11,8 @@
*/
-#include "ruby/ruby.h"
+#include "ruby.h"
+#include "version.h"
/* -----------------------------------------------------------------------
Important Constants
@@ -64,6 +65,9 @@ static ID id_d_e_pop;
#ifndef LONG2NUM
# define LONG2NUM(i) INT2NUM(i)
#endif
+#if RUBY_VERSION_CODE >= 190
+# define HAVE_RB_BLOCK_CALL 1
+#endif
static ID value_to_id _((VALUE v));
static inline long num_to_long _((VALUE n));
@@ -84,7 +88,7 @@ num_to_long(VALUE n)
}
#define AREF(s, idx) \
- ((0 <= idx && idx < RARRAY_LEN(s)) ? RARRAY_PTR(s)[idx] : Qnil)
+ ((0 <= idx && idx < RARRAY(s)->len) ? RARRAY(s)->ptr[idx] : Qnil)
/* -----------------------------------------------------------------------
Parser Stack Interfaces
@@ -97,8 +101,8 @@ static VALUE
get_stack_tail(VALUE stack, long len)
{
if (len < 0) return Qnil; /* system error */
- if (len > RARRAY_LEN(stack)) len = RARRAY_LEN(stack);
- return rb_ary_new4(len, RARRAY_PTR(stack) + RARRAY_LEN(stack) - len);
+ if (len > RARRAY(stack)->len) len = RARRAY(stack)->len;
+ return rb_ary_new4(len, RARRAY(stack)->ptr + RARRAY(stack)->len - len);
}
static void
@@ -112,10 +116,10 @@ cut_stack_tail(VALUE stack, long len)
#define STACK_INIT_LEN 64
#define NEW_STACK() rb_ary_new2(STACK_INIT_LEN)
-#define PUSH(s, i) rb_ary_store(s, RARRAY_LEN(s), i)
+#define PUSH(s, i) rb_ary_store(s, RARRAY(s)->len, i)
#define POP(s) rb_ary_pop(s)
#define LAST_I(s) \
- ((RARRAY_LEN(s) > 0) ? RARRAY_PTR(s)[RARRAY_LEN(s) - 1] : Qnil)
+ ((RARRAY(s)->len > 0) ? RARRAY(s)->ptr[RARRAY(s)->len - 1] : Qnil)
#define GET_TAIL(s, len) get_stack_tail(s, len)
#define CUT_TAIL(s, len) cut_stack_tail(s, len)
@@ -325,23 +329,23 @@ initialize_params(VALUE vparams, VALUE parser, VALUE arg, VALUE lexer, VALUE lex
v->debug = RTEST(rb_ivar_get(parser, id_yydebug));
Check_Type(arg, T_ARRAY);
- if (!(13 <= RARRAY_LEN(arg) && RARRAY_LEN(arg) <= 14))
- rb_raise(RaccBug, "[Racc Bug] wrong arg.size %ld", RARRAY_LEN(arg));
- v->action_table = assert_array (RARRAY_PTR(arg)[ 0]);
- v->action_check = assert_array (RARRAY_PTR(arg)[ 1]);
- v->action_default = assert_array (RARRAY_PTR(arg)[ 2]);
- v->action_pointer = assert_array (RARRAY_PTR(arg)[ 3]);
- v->goto_table = assert_array (RARRAY_PTR(arg)[ 4]);
- v->goto_check = assert_array (RARRAY_PTR(arg)[ 5]);
- v->goto_default = assert_array (RARRAY_PTR(arg)[ 6]);
- v->goto_pointer = assert_array (RARRAY_PTR(arg)[ 7]);
- v->nt_base = assert_integer(RARRAY_PTR(arg)[ 8]);
- v->reduce_table = assert_array (RARRAY_PTR(arg)[ 9]);
- v->token_table = assert_hash (RARRAY_PTR(arg)[10]);
- v->shift_n = assert_integer(RARRAY_PTR(arg)[11]);
- v->reduce_n = assert_integer(RARRAY_PTR(arg)[12]);
- if (RARRAY_LEN(arg) > 13) {
- v->use_result_var = RTEST(RARRAY_PTR(arg)[13]);
+ if (!(13 <= RARRAY(arg)->len && RARRAY(arg)->len <= 14))
+ rb_raise(RaccBug, "[Racc Bug] wrong arg.size %ld", RARRAY(arg)->len);
+ v->action_table = assert_array (RARRAY(arg)->ptr[ 0]);
+ v->action_check = assert_array (RARRAY(arg)->ptr[ 1]);
+ v->action_default = assert_array (RARRAY(arg)->ptr[ 2]);
+ v->action_pointer = assert_array (RARRAY(arg)->ptr[ 3]);
+ v->goto_table = assert_array (RARRAY(arg)->ptr[ 4]);
+ v->goto_check = assert_array (RARRAY(arg)->ptr[ 5]);
+ v->goto_default = assert_array (RARRAY(arg)->ptr[ 6]);
+ v->goto_pointer = assert_array (RARRAY(arg)->ptr[ 7]);
+ v->nt_base = assert_integer(RARRAY(arg)->ptr[ 8]);
+ v->reduce_table = assert_array (RARRAY(arg)->ptr[ 9]);
+ v->token_table = assert_hash (RARRAY(arg)->ptr[10]);
+ v->shift_n = assert_integer(RARRAY(arg)->ptr[11]);
+ v->reduce_n = assert_integer(RARRAY(arg)->ptr[12]);
+ if (RARRAY(arg)->len > 13) {
+ v->use_result_var = RTEST(RARRAY(arg)->ptr[13]);
}
else {
v->use_result_var = Qtrue;
@@ -416,12 +420,12 @@ extract_user_token(struct cparse_params *v, VALUE block_args,
v->lex_is_iterator ? "yielded" : "returned",
rb_class2name(CLASS_OF(block_args)));
}
- if (RARRAY_LEN(block_args) != 2) {
+ if (RARRAY(block_args)->len != 2) {
rb_raise(rb_eArgError,
"%s() %s wrong size of array (%ld for 2)",
v->lex_is_iterator ? rb_id2name(v->lexmid) : "next_token",
v->lex_is_iterator ? "yielded" : "returned",
- RARRAY_LEN(block_args));
+ RARRAY(block_args)->len);
}
*tok = AREF(block_args, 0);
*val = AREF(block_args, 1);
@@ -557,7 +561,7 @@ parse_main(struct cparse_params *v, VALUE tok, VALUE val, int resume)
accept:
if (v->debug) rb_funcall(v->parser, id_d_accept, 0);
- v->retval = RARRAY_PTR(v->vstack)[0];
+ v->retval = RARRAY(v->vstack)->ptr[0];
v->fin = CP_FIN_ACCEPT;
return;
@@ -617,7 +621,7 @@ parse_main(struct cparse_params *v, VALUE tok, VALUE val, int resume)
error_pop:
D_puts("(err) act not found: can't handle error token; pop");
- if (RARRAY_LEN(v->state) <= 1) {
+ if (RARRAY(v->state)->len <= 1) {
v->retval = Qnil;
v->fin = CP_FIN_CANTPOP;
return;
@@ -686,9 +690,9 @@ reduce0(VALUE val, VALUE data, VALUE self)
VALUE goto_state;
Data_Get_Struct(data, struct cparse_params, v);
- reduce_len = RARRAY_PTR(v->reduce_table)[v->ruleno];
- reduce_to = RARRAY_PTR(v->reduce_table)[v->ruleno+1];
- method_id = RARRAY_PTR(v->reduce_table)[v->ruleno+2];
+ reduce_len = RARRAY(v->reduce_table)->ptr[v->ruleno];
+ reduce_to = RARRAY(v->reduce_table)->ptr[v->ruleno+1];
+ method_id = RARRAY(v->reduce_table)->ptr[v->ruleno+2];
len = NUM2LONG(reduce_len);
mid = value_to_id(method_id);
@@ -703,10 +707,10 @@ reduce0(VALUE val, VALUE data, VALUE self)
else {
if (mid != id_noreduce) {
tmp_v = GET_TAIL(v->vstack, len);
- tmp = RARRAY_PTR(tmp_v)[0];
+ tmp = RARRAY(tmp_v)->ptr[0];
}
else {
- tmp = RARRAY_PTR(v->vstack)[ RARRAY_LEN(v->vstack) - len ];
+ tmp = RARRAY(v->vstack)->ptr[ RARRAY(v->vstack)->len - len ];
}
CUT_TAIL(v->vstack, len);
if (v->debug) {
@@ -735,7 +739,7 @@ reduce0(VALUE val, VALUE data, VALUE self)
}
/* calculate transition state */
- if (RARRAY_LEN(v->state) == 0)
+ if (RARRAY(v->state)->len == 0)
rb_raise(RaccBug, "state stack unexpectedly empty");
k2 = num_to_long(LAST_I(v->state));
k1 = num_to_long(reduce_to) - v->nt_base;
diff --git a/ext/racc/cparse/extconf.rb b/ext/racc/cparse/extconf.rb
index 3710f6f7e7..dd953a7e15 100644
--- a/ext/racc/cparse/extconf.rb
+++ b/ext/racc/cparse/extconf.rb
@@ -1,5 +1,4 @@
# $Id$
require 'mkmf'
-have_func('rb_block_call', 'ruby/ruby.h')
create_makefile 'racc/cparse'
diff --git a/ext/readline/.cvsignore b/ext/readline/.cvsignore
index 814345ece8..4088712231 100644
--- a/ext/readline/.cvsignore
+++ b/ext/readline/.cvsignore
@@ -1,4 +1,3 @@
Makefile
mkmf.log
*.def
-extconf.h
diff --git a/ext/readline/README b/ext/readline/README
index 57c51b5f5d..9bbf325c99 100644
--- a/ext/readline/README
+++ b/ext/readline/README
@@ -1,10 +1,62 @@
-The Readline module provides interface for GNU Readline.
-This module defines a number of methods to facilitate completion
-and accesses input history from the Ruby interpreter.
-This module supported Edit Line(libedit) too.
-libedit is compatible with GNU Readline.
+Extension for GNU Readline Library
-GNU Readline:: http://www.gnu.org/directory/readline.html
-libedit:: http://www.thrysoee.dk/editline/
+Example:
-See RDoc for Readline module.
+ require "readline"
+ include Readline
+
+ line = readline("Prompt> ", true)
+
+[Readline]
+
+<module function>
+
+readline(prompt, add_history=nil)
+
+ Reads one line with line editing. The inputted line is added to the
+ history if add_history is true.
+
+<class methods>
+
+completion_proc = proc
+
+ Specifies a Proc object to determine completion behavior. It
+ should take input-string, and return an array of completion
+ candidates.
+
+completion_proc
+
+ Returns the completion Proc object.
+
+completion_case_fold = bool
+
+ Sets whether or not to ignore case on completion.
+
+completion_case_fold
+
+ Returns true if completion ignores case.
+
+completion_append_character = char
+
+ Specifies a character to be appended on completion.
+ Nothing will be appended if an empty string ("") or nil is
+ specified.
+
+completion_append_character
+
+ Returns a string containing a character to be appended on
+ completion. The default is a space (" ").
+
+vi_editing_mode
+
+ Specifies VI editing mode.
+
+emacs_editing_mode
+
+ Specifies Emacs editing mode.
+
+<class constants>
+
+HISTORY
+
+The history buffer. It behaves just like an array.
diff --git a/ext/readline/README.ja b/ext/readline/README.ja
index 5c8e0da508..beb951fbf0 100644
--- a/ext/readline/README.ja
+++ b/ext/readline/README.ja
@@ -1,437 +1,63 @@
-GNU Readline ¤Ë¤è¤ë¥³¥Þ¥ó¥É¥é¥¤¥óÆþÎÏ¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤òÄ󶡤¹¤ë¥â¥¸¥å¡¼¥ë
-¤Ç¤¹¡£GNU Readline ¤Î¸ß´¹¥é¥¤¥Ö¥é¥ê¤Î¤Ò¤È¤Ä¤Ç¤¢¤ë Edit Line(libedit) ¤â
-¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤¹¡£
+GNU Readline Library¤òÍøÍѤ¹¤ë¤¿¤á¤Î³ÈÄ¥¥â¥¸¥å¡¼¥ë¤Ç¤¹¡£
-GNU Readline:: http://www.gnu.org/directory/readline.html
-libedit:: http://www.thrysoee.dk/editline/
+require "readline"
+include Readline
-Readline.readline ¤ò»ÈÍѤ·¤Æ¥æ¡¼¥¶¤«¤é¤ÎÆþÎϤò¼èÆÀ¤Ç¤­¤Þ¤¹¡£¤³¤Î¤È¤­¡¢
-GNU Readline ¤Î¤è¤¦¤ËÆþÎϤÎÊä´°¤äEmacs ¤Î¤è¤¦¤Ê¥­¡¼Áàºî¤Ê¤É¤¬¤Ç¤­¤Þ¤¹¡£
+line = readline("Prompt> ", true)
- require "readline"
- while buf = Readline.readline("> ", true)
- p buf
- end
+¤Î¤è¤¦¤Ë»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤¡£
-¥æ¡¼¥¶¤¬ÆþÎϤ·¤¿ÆâÍÆ¤òÍúÎò(°Ê²¼¡¢¥Ò¥¹¥È¥ê)¤È¤·¤Æµ­Ï¿¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-Äê¿ô Readline::HISTORY ¤ò»ÈÍѤ·¤Æ¥Ò¥¹¥È¥ê¤Ë¥¢¥¯¥»¥¹¤Ç¤­¤Þ¤¹¡£
+[Readline]
- require "readline"
- while buf = Readline.readline("> ", true)
- p Readline::HISTORY.to_a
- print("-> ", buf, "\n")
- end
+<¥â¥¸¥å¡¼¥ë´Ø¿ô>
-»ÈÍѤ¹¤ë¥é¥¤¥Ö¥é¥ê¤Ë¤è¤ê¡¢¤¤¤¯¤Ä¤«¤Î¥á¥½¥Ã¥É¤ÇÎã³° NotImplementedError
-¤¬È¯À¸¤·¤Þ¤¹¡£
+readline(prompt, add_history=nil)
-$SAFE ¤¬ 4 ¤Î¾ì¹ç¡¢Â¿¤¯¤Î¥á¥½¥Ã¥É¤ÇÎã³° SecurityError ¤¬È¯À¸¤·¤Þ¤¹¡£
+ °ì¹ÔÆþÎϤòÆÉ¤ß¹þ¤ß¤Þ¤¹¡£
+ add_history¤¬true¤Î¾ì¹ç¡¢¥Ò¥¹¥È¥ê¤ËÆÉ¤ß¹þ¤ó¤Àʸ»úÎó¤òÄɲä·¤Þ¤¹¡£
-== Readline ¥â¥¸¥å¡¼¥ë
+<¥¯¥é¥¹¥á¥½¥Ã¥É>
-=== ¥â¥¸¥å¡¼¥ë´Ø¿ô
+completion_proc = proc
-readline([prompt, [add_hist]]) -> String | nil
+ Êä´°»þ¤Îưºî¤ò·èÄꤹ¤ëProc¥ª¥Ö¥¸¥§¥¯¥È¤ò»ØÄꤷ¤Þ¤¹¡£
+ proc¤Ï°ú¿ô¤ËÆþÎÏʸ»úÎó¤ò¼è¤ê¡¢¸õÊäʸ»úÎó¤ÎÇÛÎó¤òÊÖ¤¹¤è¤¦¤Ë
+ ¤·¤Æ¤¯¤À¤µ¤¤¡£
- prompt ¤ò½ÐÎϤ·¡¢¥æ¡¼¥¶¤«¤é¤Î¥­¡¼ÆþÎϤòÂÔ¤Á¤Þ¤¹¡£
- ¥¨¥ó¥¿¡¼¥­¡¼¤Î²¡²¼¤Ê¤É¤Ç¥æ¡¼¥¶¤¬Ê¸»úÎó¤òÆþÎϤ·½ª¤¨¤ë¤È¡¢
- ÆþÎϤ·¤¿Ê¸»úÎó¤òÊÖ¤·¤Þ¤¹¡£
- ¤³¤Î¤È¤­¡¢add_hist ¤¬ true ¤Ç¤¢¤ì¤Ð¡¢ÆþÎϤ·¤¿Ê¸»úÎó¤ò¥Ò¥¹¥È¥ê¤ËÄɲä·¤Þ¤¹¡£
-
- ²¿¤âÆþÎϤ·¤Æ¤¤¤Ê¤¤¾õÂÖ¤Ç EOF(UNIX ¤Ç¤Ï ^D) ¤òÆþÎϤ¹¤ë¤Ê¤É¤Ç¡¢
- ¥æ¡¼¥¶¤«¤é¤ÎÆþÎϤ¬¤Ê¤¤¾ì¹ç¤Ï nil ¤òÊÖ¤·¤Þ¤¹¡£
-
- ¼¡¤Î¾ò·ï¤òÁ´¤ÆËþ¤¿¤¹¾ì¹ç¡¢Îã³° IOError ¤¬È¯À¸¤·¤Þ¤¹¡£
- 1. ɸ½àÆþÎϤ¬ tty ¤Ç¤Ê¤¤¡£
- 2. ɸ½àÆþÎϤò¥¯¥í¡¼¥º¤·¤Æ¤¤¤ë¡£(isatty(2) ¤Î errno ¤¬ EBADF ¤Ç¤¢¤ë¡£)
-
- Ëܥ᥽¥Ã¥É¤Ï¥¹¥ì¥Ã¥É¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£
- ÆþÎÏÂÔ¤Á¾õÂ֤ΤȤ­¤Ï¥¹¥ì¥Ã¥É¥³¥ó¥Æ¥­¥¹¥È¤ÎÀÚÂØ¤¨¤¬È¯À¸¤·¤Þ¤¹¡£
-
- ÆþÎÏ»þ¤Ë¤Ï¹ÔÆâÊÔ½¸¤¬²Äǽ¤Ç¡¢vi ¥â¡¼¥É¤È Emacs ¥â¡¼¥É¤¬ÍѰդµ¤ì¤Æ¤¤¤Þ¤¹¡£
- ¥Ç¥Õ¥©¥ë¥È¤Ï Emacs ¥â¡¼¥É¤Ç¤¹¡£
-
- Ëܥ᥽¥Ã¥É¤Ë¤ÏÃí°Õ»ö¹à¤¬¤¢¤ê¤Þ¤¹¡£
- ÆþÎÏÂÔ¤Á¤Î¾õÂÖ¤Ç ^C ¤¹¤ë¤È ruby ¥¤¥ó¥¿¥×¥ê¥¿¤¬½ªÎ»¤·¡¢Ã¼Ëö¾õÂÖ¤òÉüµ¢¤·¤Þ¤»¤ó¡£
- ¤³¤ì¤ò²óÈò¤¹¤ë¤¿¤á¤ÎÎã¤ò3¤Äµó¤²¤Þ¤¹¡£
-
- * ^C¤Ë¤è¤ëInterruptÎã³°¤òÊä­¤·¤Æ¡¢Ã¼Ëö¾õÂÖ¤òÉüµ¢¤·¤Þ¤¹:
-
- require "readline"
-
- stty_save = `stty -g`.chomp
- begin
- while buf = Readline.readline
- p buf
- end
- rescue Interrupt
- system("stty", stty_save)
- exit
- end
- end
- end
-
- * INT¥·¥°¥Ê¥ë¤òÊä­¤·¤Æ¡¢Ã¼Ëö¾õÂÖ¤òÉüµ¢¤·¤Þ¤¹:
-
- require "readline"
-
- stty_save = `stty -g`.chomp
- trap("INT") { system "stty", stty_save; exit }
-
- while buf = Readline.readline
- p buf
- end
-
- * ñ¤Ë ^C ¤ò̵»ë¤¹¤ëÊýË¡¤â¤¢¤ê¤Þ¤¹:
-
- require "readline"
-
- trap("INT", "SIG_IGN")
-
- while buf = Readline.readline
- p buf
- end
-
- ÆþÎÏÍúÎò Readline::HISTORY ¤ò»ÈÍѤ·¤Æ¡¢¶õ¹Ô¤äľÁ°¤ÎÆþÎÏ¤ÈÆ±¤¸ÆâÍÆ¤ÏÆþÎÏ
- ÍúÎò¤Ë»Ä¤µ¤Ê¤¤¤È¤¤¤¦¤³¤È¤â¤Ç¤­¤Þ¤¹¡£
-
- require "readline"
-
- while buf = Readline.readline("> ", true)
- # p Readline::HISTORY.to_a
- Readline::HISTORY.pop if /^\s*$/ =~ buf
-
- begin
- if Readline::HISTORY[Readline::HISTORY.length-2] == buf
- Readline::HISTORY.pop
- end
- rescue IndexError
- end
-
- # p Readline::HISTORY.to_a
- print "-> ", buf, "\n"
- end
-
- $SAFE ¤¬ 4 ¤Î¾ì¹ç¡¢Îã³° SecurityError ¤¬È¯À¸¤·¤Þ¤¹¡£
+completion_proc
-=== ¥¯¥é¥¹¥á¥½¥Ã¥É
+ Êä´°»þ¤Îưºî¤ò·èÄꤹ¤ëProc¥ª¥Ö¥¸¥§¥¯¥È¤òÊÖ¤·¤Þ¤¹¡£
-Readline.input = input
+completion_case_fold = case_fold
- Readline.readline ¥á¥½¥Ã¥É¤Ç»ÈÍѤ¹¤ëÆþÎÏÍѤΠFile ¥ª¥Ö¥¸¥§¥¯¥È input
- ¤ò»ØÄꤷ¤Þ¤¹¡£
+ Êä´°»þ¤ËÂçʸ»ú¾®Ê¸»ú¤ò¶èÊ̤·¤Ê¤¤¾ì¹ç¡¢true¤ò»ØÄꤷ¤Þ¤¹¡£
- $SAFE ¤¬ 4 ¤Î¾ì¹ç¡¢Îã³° SecurityError ¤¬È¯À¸¤·¤Þ¤¹¡£
+completion_case_fold
-Readline.output = output
+ Êä´°»þ¤ËÂçʸ»ú¾®Ê¸»ú¤ò¶èÊ̤·¤Ê¤¤¾ì¹ç¡¢true¤òÊÖ¤·¤Þ¤¹¡£
- Readline.readline ¥á¥½¥Ã¥É¤Ç»ÈÍѤ¹¤ë½ÐÎÏÍѤΠFile ¥ª¥Ö¥¸¥§¥¯¥È
- output ¤ò»ØÄꤷ¤Þ¤¹¡£
+completion_append_character = char
- $SAFE ¤¬ 4 ¤Î¾ì¹ç¡¢Îã³° SecurityError ¤¬È¯À¸¤·¤Þ¤¹¡£
+ Êä´°»þ¤ËÉղ䵤ì¤ëʸ»ú¤òʸ»úÎó¤Ç»ØÄꤷ¤Þ¤¹¡£ÀèÆ¬¤Î°ìʸ»ú¤¬
+ ÀßÄꤵ¤ì¡¢¶õʸ»úÎó ("") ¤Þ¤¿¤Ï nil ¤ò»ØÄꤹ¤ë¤È²¿¤âÉÕ²Ã
+ ¤µ¤ì¤Ê¤¯¤Ê¤ê¤Þ¤¹¡£
-Readline.completion_proc = proc
+completion_append_character
- ¥æ¡¼¥¶¤«¤é¤ÎÆþÎϤòÊä´°¤¹¤ë»þ¤Î¸õÊä¤ò¼èÆÀ¤¹¤ë Proc ¥ª¥Ö¥¸¥§¥¯¥È proc ¤ò
- »ØÄꤷ¤Þ¤¹¡£proc ¤Ï¡¢¼¡¤Î¤â¤Î¤òÁÛÄꤷ¤Æ¤¤¤Þ¤¹¡£
- 1. call ¥á¥½¥Ã¥É¤ò»ý¤Á¤Þ¤¹¡£
- call ¥á¥½¥Ã¥É¤ò»ý¤¿¤Ê¤¤¾ì¹ç¡¢Îã³° ArgumentError ¤¬È¯À¸¤·¤Þ¤¹¡£
- 2. °ú¿ô¤Ë¥æ¡¼¥¶¤«¤é¤ÎÆþÎÏʸ»úÎó(Ãí1)¤ò¼è¤ê¤Þ¤¹¡£
- 3. ¸õÊä¤Îʸ»úÎó¤ÎÇÛÎó¤òÊÖ¤·¤Þ¤¹¡£
+ Êä´°»þ¤ËÉղ䵤ì¤ëʸ»ú¤òʸ»úÎó¤ÇÊÖ¤·¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ï
+ ¶õÇò (" ") ¤Ç¤¹¡£
- Ãí1:¡Ö/var/lib /v¡×¤Î¸å¤ÇÊä´°¤ò¹Ô¤¦¤È¡¢
- ¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï proc ¤Î°ú¿ô¤Ë¡Ö/v¡×¤¬ÅϤµ¤ì¤Þ¤¹¡£
- ¤³¤Î¤è¤¦¤Ë¡¢¥æ¡¼¥¶¤¬ÆþÎϤ·¤¿Ê¸»úÎó¤ò
- Readline.completer_word_break_characters ¤Ë´Þ¤Þ¤ì¤ëʸ»ú¤Ç¶èÀڤ俤â
- ¤Î¤òñ¸ì¤È¤¹¤ë¤È¡¢¥«¡¼¥½¥ë¤¬¤¢¤ëñ¸ì¤ÎºÇ½é¤Îʸ»ú¤«¤é¸½ºß¤Î¥«¡¼¥½¥ë°Ì
- Ã֤ޤǤÎʸ»úÎó¤¬ proc ¤Î°ú¿ô¤ËÅϤµ¤ì¤Þ¤¹¡£
+vi_editing_mode
- $SAFE ¤¬ 4 ¤Î¾ì¹ç¡¢Îã³° SecurityError ¤¬È¯À¸¤·¤Þ¤¹¡£
+ VI¥â¡¼¥É¤Ë¤Ê¤ê¤Þ¤¹¡£
-Readline.completion_proc -> proc
+emacs_editing_mode
- ¥æ¡¼¥¶¤«¤é¤ÎÆþÎϤòÊä´°¤¹¤ë»þ¤Î¸õÊä¤ò¼èÆÀ¤¹¤ë Proc ¥ª¥Ö¥¸¥§¥¯¥È proc
- ¤ò¼èÆÀ¤·¤Þ¤¹¡£
+ Emacs¥â¡¼¥É¤Ë¤Ê¤ê¤Þ¤¹¡£
- $SAFE ¤¬ 4 ¤Î¾ì¹ç¡¢Îã³° SecurityError ¤¬È¯À¸¤·¤Þ¤¹¡£
-
-Readline.completion_case_fold = bool
-
- ¥æ¡¼¥¶¤ÎÆþÎϤòÊä´°¤¹¤ëºÝ¡¢Âçʸ»ú¤È¾®Ê¸»ú¤ò¶èÊ̤¹¤ë¡¿¤·¤Ê¤¤¤ò»ØÄꤷ¤Þ¤¹¡£
- bool ¤¬¿¿¤Ê¤é¤Ð¶èÊ̤·¤Þ¤»¤ó¡£bool ¤¬µ¶¤Ê¤é¤Ð¶èÊ̤·¤Þ¤¹¡£
-
- $SAFE ¤¬ 4 ¤Î¾ì¹ç¡¢Îã³° SecurityError ¤¬È¯À¸¤·¤Þ¤¹¡£
-
-Readline.completion_case_fold -> bool
-
- ¥æ¡¼¥¶¤ÎÆþÎϤòÊä´°¤¹¤ëºÝ¡¢Âçʸ»ú¤È¾®Ê¸»ú¤ò¶èÊ̤¹¤ë¡¿¤·¤Ê¤¤¤ò¼èÆÀ¤·¤Þ¤¹¡£
- bool ¤¬¿¿¤Ê¤é¤Ð¶èÊ̤·¤Þ¤»¤ó¡£bool ¤¬µ¶¤Ê¤é¤Ð¶èÊ̤·¤Þ¤¹¡£
-
- ¤Ê¤ª¡¢Readline.completion_case_fold= ¥á¥½¥Ã¥É¤Ç»ØÄꤷ¤¿¥ª¥Ö¥¸¥§¥¯¥È¤ò
- ¤½¤Î¤Þ¤Þ¼èÆÀ¤¹¤ë¤Î¤Ç¡¢¼¡¤Î¤è¤¦¤Êưºî¤ò¤·¤Þ¤¹¡£
-
- require "readline"
-
- Readline.completion_case_fold = "This is a String."
- p Readline.completion_case_fold # => "This is a String."
-
- $SAFE ¤¬ 4 ¤Î¾ì¹ç¡¢Îã³° SecurityError ¤¬È¯À¸¤·¤Þ¤¹¡£
-
-Readline.line_buffer -> string
-
- ÆþÎÏÃæ¤Î¹ÔÁ´ÂΤòÊÖ¤·¤Þ¤¹¡£complete_proc ¤ÎÃæ¤Ç»ÈÍѤ¹¤ë¤³¤È¤òÁÛÄꤷ
- ¤Æ¤¤¤Þ¤¹¡£Readline.line_buffer ¤ÎŤµ¤Ï GNU Readline ¤Î rl_end ÊÑ¿ô¤Î
- ÃͤȰìÃפ·¤Þ¤¹¡£
-
-Readline.point -> int
-
- ¸½ºß¤Î¥«¡¼¥½¥ë¤Î°ÌÃÖ¤òÊÖ¤·¤Þ¤¹¡£
- Readline ¥â¥¸¥å¡¼¥ë¤ÏÊä´°ÂоݤÎñ¸ì¤Î³«»Ï°ÌÃ֤ξðÊó¤òÄ󶡤·¤Æ¤¤¤Þ¤»¤ó¡£
- ¤·¤«¤·¤Ê¤¬¤é¡¢ completion_proc ¤ÎÃæ¤ÇÆþÎϤ·¤¿Ã±¸ì text ¤È
- Readline.point ¤ò»ÈÍѤ¹¤ë¤³¤È¤Ç³«»Ï°ÌÃÖ¤òƳ¤¯¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-
- ³«»Ï°ÌÃÖ = ÆþÎϤ·¤¿Ã±¸ì¤ÎŤµ - Readline.point
-
-Readline.vi_editing_mode -> nil
-
- ÊÔ½¸¥â¡¼¥É¤ò vi ¥â¡¼¥É¤Ë¤·¤Þ¤¹¡£
- vi ¥â¡¼¥É¤Î¾ÜºÙ¤Ï¡¢GNU Readline ¤Î¥Þ¥Ë¥å¥¢¥ë¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-
- ¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤´Ä¶­¤Ç¤Ï¡¢Îã³° NotImplementedError ¤¬È¯À¸¤·¤Þ¤¹¡£
-
- $SAFE ¤¬ 4 ¤Î¾ì¹ç¡¢Îã³° SecurityError ¤¬È¯À¸¤·¤Þ¤¹¡£
-
-Readline.vi_editing_mode? -> bool
-
- ÊÔ½¸¥â¡¼¥É¤¬ vi ¥â¡¼¥É¤Î¾ì¹ç¡¢true ¤òÊÖ¤·¤Þ¤¹¡£¤½¤¦¤Ç¤Ê¤±¤ì¤Ð false
- ¤òÊÖ¤·¤Þ¤¹¡£
-
- ¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤´Ä¶­¤Ç¤Ï¡¢Îã³° NotImplementedError ¤¬È¯À¸¤·¤Þ¤¹¡£
-
- $SAFE ¤¬ 4 ¤Î¾ì¹ç¡¢Îã³° SecurityError ¤¬È¯À¸¤·¤Þ¤¹¡£
-
-Readline.emacs_editing_mode -> nil
-
- ÊÔ½¸¥â¡¼¥É¤ò Emacs ¥â¡¼¥É¤Ë¤·¤Þ¤¹¡£
- ¥Ç¥Õ¥©¥ë¥È¤Ï Emacs ¥â¡¼¥É¤Ç¤¹¡£
- Emacs ¥â¡¼¥É¤Î¾ÜºÙ¤Ï¡¢GNU Readline ¤Î¥Þ¥Ë¥å¥¢¥ë¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-
- ¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤´Ä¶­¤Ç¤Ï¡¢Îã³° NotImplementedError ¤¬È¯À¸¤·¤Þ¤¹¡£
-
- $SAFE ¤¬ 4 ¤Î¾ì¹ç¡¢Îã³° SecurityError ¤¬È¯À¸¤·¤Þ¤¹¡£
-
-Readline.emacs_editing_mode? -> bool
-
- ÊÔ½¸¥â¡¼¥É¤¬ Emacs ¥â¡¼¥É¤Î¾ì¹ç¡¢true ¤òÊÖ¤·¤Þ¤¹¡£¤½¤¦¤Ç¤Ê¤±¤ì¤Ð false
- ¤òÊÖ¤·¤Þ¤¹¡£
-
- ¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤´Ä¶­¤Ç¤Ï¡¢Îã³° NotImplementedError ¤¬È¯À¸¤·¤Þ¤¹¡£
-
- $SAFE ¤¬ 4 ¤Î¾ì¹ç¡¢Îã³° SecurityError ¤¬È¯À¸¤·¤Þ¤¹¡£
-
-Readline.completion_append_character = char
-
- ¥æ¡¼¥¶¤ÎÆþÎϤÎÊä´°¤¬´°Î»¤·¤¿¾ì¹ç¤Ë¡¢ºÇ¸å¤ËÉղ乤ëʸ»ú char ¤ò»ØÄꤷ
- ¤Þ¤¹¡£È¾³Ñ¥¹¥Ú¡¼¥¹¡Ö" "¡×¤Ê¤É¤Îñ¸ì¤ò¶èÀÚ¤ëʸ»ú¤ò»ØÄꤹ¤ì¤Ð¡¢Ï¢Â³¤·¤Æ
- ÆþÎϤ¹¤ëºÝ¤ËÊØÍø¤Ç¤¹¡£
-
- »ÈÍÑÎã:
-
- require "readline"
-
- Readline.readline("> ", true)
- Readline.completion_append_character = " "
-
- ¼Â¹ÔÎã:
-
- >
- ¤³¤³¤Ç "/var/li" ¤òÆþÎϤ·¤Þ¤¹¡£
-
- > /var/li
- ¤³¤³¤Ç TAB ¥­¡¼¤òÆþÎϤ·¤Þ¤¹¡£
-
- > /var/lib
- "b" ¤¬Êä´°¤µ¤ì¡¢ºÇ¸å¤Ë " " ¤¬Äɲ䵤ì¤ë¤Î¤Ç¡¢"/usr" ¤òϢ³¤·¤ÆÆþÎϤǤ­¤Þ¤¹¡£
-
- > /var/lib /usr
-
- ¤Ê¤ª¡¢1ʸ»ú¤·¤«»ØÄꤹ¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£
- Î㤨¤Ð¡¢"string"¤ò»ØÄꤷ¤¿¾ì¹ç¤ÏºÇ½é¤Îʸ»ú¤Ç¤¢¤ë"s"¤À¤±¤ò»ÈÍѤ·¤Þ¤¹¡£
-
- require "readline"
-
- Readline.completion_append_character = "string"
- p Readline.completion_append_character # => "s"
-
- ¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤´Ä¶­¤Ç¤Ï¡¢Îã³° NotImplementedError ¤¬È¯À¸¤·¤Þ¤¹¡£
-
- $SAFE ¤¬ 4 ¤Î¾ì¹ç¡¢Îã³° SecurityError ¤¬È¯À¸¤·¤Þ¤¹¡£
-
-Readline.completion_append_character -> char
-
- ¥æ¡¼¥¶¤ÎÆþÎϤÎÊä´°¤¬´°Î»¤·¤¿¾ì¹ç¤Ë¡¢ºÇ¸å¤ËÉղ乤ëʸ»ú¤ò¼èÆÀ¤·¤Þ¤¹¡£
- ¥Ç¥Õ¥©¥ë¥È¤Ï¶õÇò (" ") ¤Ç¤¹¡£
-
- ¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤´Ä¶­¤Ç¤Ï¡¢Îã³° NotImplementedError ¤¬È¯À¸¤·¤Þ¤¹¡£
-
- $SAFE ¤¬ 4 ¤Î¾ì¹ç¡¢Îã³° SecurityError ¤¬È¯À¸¤·¤Þ¤¹¡£
-
-Readline.basic_word_break_characters = string
-
- ¥æ¡¼¥¶¤ÎÆþÎϤÎÊä´°¤ò¹Ô¤¦ºÝ¡¢Ã±¸ì¤Î¶èÀÚ¤ê¤ò¼¨¤¹Ê£¿ô¤Îʸ»ú¤Ç¹½À®¤µ¤ì¤ë
- ʸ»úÎó string ¤ò»ØÄꤷ¤Þ¤¹¡£
-
- GNU Readline ¤Î¥Ç¥Õ¥©¥ë¥È¤ÎÃͤϡ¢Bash ¤ÎÊä´°½èÍý¤Ç»ÈÍѤ·¤Æ¤¤¤ëʸ»úÎó
- " \t\n\"\\'`@$><=;|&{(" (¥¹¥Ú¡¼¥¹¤ò´Þ¤à) ¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£
-
- ¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤´Ä¶­¤Ç¤Ï¡¢Îã³° NotImplementedError ¤¬È¯À¸¤·¤Þ¤¹¡£
-
- $SAFE ¤¬ 4 ¤Î¾ì¹ç¡¢Îã³° SecurityError ¤¬È¯À¸¤·¤Þ¤¹¡£
-
-Readline.basic_word_break_characters -> string
-
- ¥æ¡¼¥¶¤ÎÆþÎϤÎÊä´°¤ò¹Ô¤¦ºÝ¡¢Ã±¸ì¤Î¶èÀÚ¤ê¤ò¼¨¤¹Ê£¿ô¤Îʸ»ú¤Ç¹½À®¤µ¤ì¤ë
- ʸ»úÎó¤ò¼èÆÀ¤·¤Þ¤¹¡£
-
- ¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤´Ä¶­¤Ç¤Ï¡¢Îã³° NotImplementedError ¤¬È¯À¸¤·¤Þ¤¹¡£
-
- $SAFE ¤¬ 4 ¤Î¾ì¹ç¡¢Îã³° SecurityError ¤¬È¯À¸¤·¤Þ¤¹¡£
-
-Readline.completer_word_break_characters = string
-
- ¥æ¡¼¥¶¤ÎÆþÎϤÎÊä´°¤ò¹Ô¤¦ºÝ¡¢Ã±¸ì¤Î¶èÀÚ¤ê¤ò¼¨¤¹Ê£¿ô¤Îʸ»ú¤Ç¹½À®¤µ¤ì¤ë
- ʸ»úÎó string ¤ò»ØÄꤷ¤Þ¤¹¡£
- Readline.basic_word_break_characters= ¤È¤Î°ã¤¤¤Ï¡¢
- GNU Readline ¤Î rl_complete_internal ´Ø¿ô¤Ç»ÈÍѤµ¤ì¤ë¤³¤È¤Ç¤¹¡£
-
- GNU Readline ¤Î¥Ç¥Õ¥©¥ë¥È¤ÎÃͤϡ¢
- Readline.basic_word_break_characters ¤ÈƱ¤¸¤Ç¤¹¡£
-
- ¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤´Ä¶­¤Ç¤Ï¡¢Îã³° NotImplementedError ¤¬È¯À¸¤·¤Þ¤¹¡£
-
- $SAFE ¤¬ 4 ¤Î¾ì¹ç¡¢Îã³° SecurityError ¤¬È¯À¸¤·¤Þ¤¹¡£
-
-Readline.completer_word_break_characters -> string
-
- ¥æ¡¼¥¶¤ÎÆþÎϤÎÊä´°¤ò¹Ô¤¦ºÝ¡¢Ã±¸ì¤Î¶èÀÚ¤ê¤ò¼¨¤¹Ê£¿ô¤Îʸ»ú¤Ç¹½À®¤µ¤ì¤¿
- ʸ»úÎó¤ò¼èÆÀ¤·¤Þ¤¹¡£
-
- ¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤´Ä¶­¤Ç¤Ï¡¢Îã³° NotImplementedError ¤¬È¯À¸¤·¤Þ¤¹¡£
-
- $SAFE ¤¬ 4 ¤Î¾ì¹ç¡¢Îã³° SecurityError ¤¬È¯À¸¤·¤Þ¤¹¡£
-
-Readline.basic_quote_characters = string
-
- ¥¹¥Ú¡¼¥¹¤Ê¤É¤Îñ¸ì¤Î¶èÀÚ¤ê¤ò¥¯¥ª¡¼¥È¤¹¤ë¤¿¤á¤ÎÊ£¿ô¤Îʸ»ú¤Ç¹½À®¤µ¤ì¤ë
- ʸ»úÎó string ¤ò»ØÄꤷ¤Þ¤¹¡£
-
- ¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤´Ä¶­¤Ç¤Ï¡¢Îã³° NotImplementedError ¤¬È¯À¸¤·¤Þ¤¹¡£
-
- $SAFE ¤¬ 4 ¤Î¾ì¹ç¡¢Îã³° SecurityError ¤¬È¯À¸¤·¤Þ¤¹¡£
-
-Readline.basic_quote_characters -> string
-
- ¥¹¥Ú¡¼¥¹¤Ê¤É¤Îñ¸ì¤Î¶èÀÚ¤ê¤ò¥¯¥ª¡¼¥È¤¹¤ë¤¿¤á¤ÎÊ£¿ô¤Îʸ»ú¤Ç¹½À®¤µ¤ì¤ë
- ʸ»úÎó¤ò¼èÆÀ¤·¤Þ¤¹¡£
-
- ¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤´Ä¶­¤Ç¤Ï¡¢Îã³° NotImplementedError ¤¬È¯À¸¤·¤Þ¤¹¡£
-
- $SAFE ¤¬ 4 ¤Î¾ì¹ç¡¢Îã³° SecurityError ¤¬È¯À¸¤·¤Þ¤¹¡£
-
-Readline.completer_quote_characters = string
-
- ¥æ¡¼¥¶¤ÎÆþÎϤÎÊä´°¤ò¹Ô¤¦ºÝ¡¢¥¹¥Ú¡¼¥¹¤Ê¤É¤Îñ¸ì¤Î¶èÀÚ¤ê¤ò
- ¥¯¥ª¡¼¥È¤¹¤ë¤¿¤á¤ÎÊ£¿ô¤Îʸ»ú¤Ç¹½À®¤µ¤ì¤ëʸ»úÎó string ¤ò»ØÄꤷ¤Þ¤¹¡£
- »ØÄꤷ¤¿Ê¸»ú¤Î´Ö¤Ç¤Ï¡¢Readline.completer_word_break_characters=
- ¤Ç»ØÄꤷ¤¿Ê¸»úÎó¤Ë´Þ¤Þ¤ì¤ëʸ»ú¤â¡¢ÉáÄ̤Îʸ»úÎó¤È¤·¤Æ°·¤ï¤ì¤Þ¤¹¡£
-
- ¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤´Ä¶­¤Ç¤Ï¡¢Îã³° NotImplementedError ¤¬È¯À¸¤·¤Þ¤¹¡£
-
- $SAFE ¤¬ 4 ¤Î¾ì¹ç¡¢Îã³° SecurityError ¤¬È¯À¸¤·¤Þ¤¹¡£
-
-Readline.completer_quote_characters -> string
-
- ¥æ¡¼¥¶¤ÎÆþÎϤÎÊä´°¤ò¹Ô¤¦ºÝ¡¢¥¹¥Ú¡¼¥¹¤Ê¤É¤Îñ¸ì¤Î¶èÀÚ¤ê¤ò
- ¥¯¥ª¡¼¥È¤¹¤ë¤¿¤á¤ÎÊ£¿ô¤Îʸ»ú¤Ç¹½À®¤µ¤ì¤ëʸ»úÎó¤ò¼èÆÀ¤·¤Þ¤¹¡£
-
- ¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤´Ä¶­¤Ç¤Ï¡¢Îã³° NotImplementedError ¤¬È¯À¸¤·¤Þ¤¹¡£
-
- $SAFE ¤¬ 4 ¤Î¾ì¹ç¡¢Îã³° SecurityError ¤¬È¯À¸¤·¤Þ¤¹¡£
-
-Readline.filename_quote_characters = string
-
- ¥æ¡¼¥¶¤ÎÆþÎÏ»þ¤Ë¥Õ¥¡¥¤¥ë̾¤ÎÊä´°¤ò¹Ô¤¦ºÝ¡¢¥¹¥Ú¡¼¥¹¤Ê¤É¤Îñ¸ì¤Î¶èÀÚ¤ê¤ò
- ¥¯¥ª¡¼¥È¤¹¤ë¤¿¤á¤ÎÊ£¿ô¤Îʸ»ú¤Ç¹½À®¤µ¤ì¤ëʸ»úÎó string ¤ò»ØÄꤷ¤Þ¤¹¡£
-
- GNU Readline ¤Î¥Ç¥Õ¥©¥ë¥ÈÃÍ¤Ï nil ¤Ç¤¹¡£
-
- ¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤´Ä¶­¤Ç¤Ï¡¢Îã³° NotImplementedError ¤¬È¯À¸¤·¤Þ¤¹¡£
-
- $SAFE ¤¬ 4 ¤Î¾ì¹ç¡¢Îã³° SecurityError ¤¬È¯À¸¤·¤Þ¤¹¡£
-
-Readline.filename_quote_characters -> string
-
- ¥æ¡¼¥¶¤ÎÆþÎÏ»þ¤Ë¥Õ¥¡¥¤¥ë̾¤ÎÊä´°¤ò¹Ô¤¦ºÝ¡¢¥¹¥Ú¡¼¥¹¤Ê¤É¤Îñ¸ì¤Î¶èÀÚ¤ê¤ò
- ¥¯¥ª¡¼¥È¤¹¤ë¤¿¤á¤ÎÊ£¿ô¤Îʸ»ú¤Ç¹½À®¤µ¤ì¤ëʸ»úÎó¤ò¼èÆÀ¤·¤Þ¤¹¡£
-
- ¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤´Ä¶­¤Ç¤Ï¡¢Îã³° NotImplementedError ¤¬È¯À¸¤·¤Þ¤¹¡£
-
- $SAFE ¤¬ 4 ¤Î¾ì¹ç¡¢Îã³° SecurityError ¤¬È¯À¸¤·¤Þ¤¹¡£
-
-=== ¥¯¥é¥¹Äê¿ô
+<¥¯¥é¥¹Äê¿ô>
HISTORY
- Äê¿ô HISTORY ¤ò»ÈÍѤ·¤Æ¥Ò¥¹¥È¥ê¤Ë¥¢¥¯¥»¥¹¤Ç¤­¤Þ¤¹¡£
- Enumerable ¥â¥¸¥å¡¼¥ë¤ò extend ¤·¤Æ¤ª¤ê¡¢
- ÇÛÎó¤Î¤è¤¦¤Ë¿¶¤ëÉñ¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
- Î㤨¤Ð¡¢HISTORY[4] ¤Ë¤è¤ê 5 ÈÖÌÜ¤ËÆþÎϤ·¤¿ÆâÍÆ¤ò¼è¤ê½Ð¤¹¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-
- require "readline"
-
- Readline::HISTORY.push("a", "b", "c", "d", "e")
- p Readline::HISTORY[4] # => "e"
-
- ¼ÂÁõ¤·¤Æ¤¤¤ë¥á¥½¥Ã¥É¤ò¼¡¤Ëµó¤²¤Þ¤¹¡£
- * HISTORY.to_s -> "HISTORY"
- * HISTORY[index] -> string
- * HISTORY[index] = string
- * HISTORY.push(string[, string, ...]) -> self
- * HISTORY << string -> self
- * HISTORY.pop -> string
- * HISTORY.shift -> string
- * HISTORY.each -> Enumerator
- * HISTORY.each { |i| } -> [string]
- * HISTORY.length -> Integer
- * HISTORY.empty? -> true or false
- * HISTORY.delete_at(index) -> string
- * HISTORY.clear -> self
-
- ¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤´Ä¶­¤Ç¤Ï¡¢¼¡¤Î¥á¥½¥Ã¥É¤ÇÎã³° NotImplementedError ¤¬
- ȯÀ¸¤·¤Þ¤¹¡£
- * HISTORY[index] = string
- * HISTORY.pop -> string
- * HISTORY.shift -> string
- * HISTORY.delete_at(index) -> string
- * HISTORY.clear -> self
-
- $SAFE ¤¬ 4 ¤Î¾ì¹ç¡¢¥Ò¥¹¥È¥ê¤Ë¥¢¥¯¥»¥¹¤·¤¿¤È¤­¤ËÎã³° SecurityError ¤¬
- ȯÀ¸¤·¤Þ¤¹¡£
-
-FILENAME_COMPLETION_PROC
-
- ¥Õ¥¡¥¤¥ë̾¤ÎÊä´°¤ò¹Ô¤¦ call ¥á¥½¥Ã¥É¤ò»ý¤Ä¥ª¥Ö¥¸¥§¥¯¥È¤Ç¤¹¡£
-
- Readline.completion_proc= ¤Ë¤è¤ê¡¢¥æ¡¼¥¶¤ÎÆþÎÏ»þ¤Ë¥Õ¥¡¥¤¥ë̾¤ÎÊä´°¤ò
- ¹Ô¤¦¤è¤¦¤ËÀßÄꤹ¤ë¤¿¤á¤Ë»ÈÍѤ¹¤ë¤³¤È¤òÁÛÄꤷ¤Æ¤Þ¤¹¡£
-
-USERNAME_COMPLETION_PROC
-
- ¥æ¡¼¥¶Ì¾¤ÎÊä´°¤ò¹Ô¤¦ call ¥á¥½¥Ã¥É¤ò»ý¤Ä¥ª¥Ö¥¸¥§¥¯¥È¤Ç¤¹¡£
-
- Readline.completion_proc= ¤Ë¤è¤ê¡¢¥æ¡¼¥¶¤ÎÆþÎÏ»þ¤Ë¥æ¡¼¥¶Ì¾¤ÎÊä´°¤ò¹Ô
- ¤¦¤è¤¦¤ËÀßÄꤹ¤ë¤¿¤á¤Ë»ÈÍѤ¹¤ë¤³¤È¤òÁÛÄꤷ¤Æ¤Þ¤¹¡£
-
-VERSION
-
- »ÈÍѤ·¤Æ¤¤¤ë GNU Readline ¤Þ¤¿¤Ï libedit ¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç¤¹¡£
+¥Ò¥¹¥È¥ê¤ËÂФ¹¤ëÁàºî¤Ï¤³¤ÎÄê¿ô¤òÄ̤·¤Æ¹Ô¤Ã¤Æ¤¯¤À¤µ¤¤¡£
+ÇÛÎó¤ÈƱ¤¸¤è¤¦¤Ë°·¤¨¤ë¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£
diff --git a/ext/readline/extconf.rb b/ext/readline/extconf.rb
index 14c2099b6d..b820c0b32f 100644
--- a/ext/readline/extconf.rb
+++ b/ext/readline/extconf.rb
@@ -15,10 +15,6 @@ def have_readline_var(var)
return have_var(var, $readline_headers)
end
-def have_readline_func(func)
- return have_func(func, $readline_headers)
-end
-
dir_config('curses')
dir_config('ncurses')
dir_config('termcap')
@@ -46,11 +42,9 @@ else
end
end
-have_readline_func("rl_getc_function")
-have_readline_func("rl_filename_completion_function")
-have_readline_func("rl_username_completion_function")
-have_readline_func("rl_completion_matches")
-have_readline_func("rl_refresh_line")
+have_func("rl_filename_completion_function")
+have_func("rl_username_completion_function")
+have_func("rl_completion_matches")
have_readline_var("rl_deprep_term_function")
have_readline_var("rl_completion_append_character")
have_readline_var("rl_basic_word_break_characters")
@@ -60,20 +54,11 @@ have_readline_var("rl_completer_quote_characters")
have_readline_var("rl_filename_quote_characters")
have_readline_var("rl_attempted_completion_over")
have_readline_var("rl_library_version")
-have_readline_var("rl_editing_mode")
-have_readline_var("rl_line_buffer")
-have_readline_var("rl_point")
-# workaround for native windows.
-/mswin|bccwin|mingw/ !~ RUBY_PLATFORM && have_readline_var("rl_event_hook")
-/mswin|bccwin|mingw/ !~ RUBY_PLATFORM && have_readline_var("rl_catch_sigwinch")
-/mswin|bccwin|mingw/ !~ RUBY_PLATFORM && have_readline_var("rl_catch_signals")
-have_readline_func("rl_cleanup_after_signal")
-have_readline_func("rl_clear_signals")
-have_readline_func("rl_set_screen_size")
-have_readline_func("rl_get_screen_size")
-have_readline_func("rl_vi_editing_mode")
-have_readline_func("rl_emacs_editing_mode")
-have_readline_func("replace_history_entry")
-have_readline_func("remove_history")
-have_readline_func("clear_history")
+have_readline_var("rl_event_hook")
+have_func("rl_cleanup_after_signal")
+have_func("rl_clear_signals")
+have_func("rl_vi_editing_mode")
+have_func("rl_emacs_editing_mode")
+have_func("replace_history_entry")
+have_func("remove_history")
create_makefile("readline")
diff --git a/ext/readline/readline.c b/ext/readline/readline.c
index abb9a0a33a..c9acaadac9 100644
--- a/ext/readline/readline.c
+++ b/ext/readline/readline.c
@@ -1,27 +1,10 @@
-/************************************************
+/* readline.c -- GNU Readline module
+ Copyright (C) 1997-2001 Shugo Maeda */
- readline.c - GNU Readline module
-
- $Author$
- created at: Wed Jan 20 13:59:32 JST 1999
-
- Copyright (C) 1997-2008 Shugo Maeda
- Copyright (C) 2008-2009 TAKAO Kouji
-
- $Id$
-
- Contact:
- - TAKAO Kouji <kouji at takao7 dot net> (current maintainer)
-
-************************************************/
-
-#ifdef RUBY_EXTCONF_H
-#include RUBY_EXTCONF_H
-#endif
-
-#include "ruby/config.h"
+#include "config.h"
#include <errno.h>
#include <stdio.h>
+#include <ctype.h>
#include <string.h>
#ifdef HAVE_READLINE_READLINE_H
#include <readline/readline.h>
@@ -33,8 +16,9 @@
#include <editline/readline.h>
#endif
-#include "ruby/ruby.h"
-#include "ruby/io.h"
+#include "ruby.h"
+#include "rubyio.h"
+#include "rubysig.h"
#ifdef HAVE_UNISTD_H
#include <unistd.h>
@@ -42,7 +26,7 @@
static VALUE mReadline;
-#define EDIT_LINE_LIBRARY_VERSION "EditLine wrapper"
+#define TOLOWER(c) (isupper(c) ? tolower(c) : c)
#define COMPLETION_PROC "completion_proc"
#define COMPLETION_CASE_FOLD "completion_case_fold"
@@ -58,75 +42,19 @@ static ID completion_proc, completion_case_fold;
# define rl_completion_matches completion_matches
#endif
-static int (*history_get_offset_func)(int);
-
static char **readline_attempted_completion_function(const char *text,
int start, int end);
-#define OutputStringValue(str) do {\
- SafeStringValue(str);\
- str = rb_str_conv_enc(str, rb_enc_get(str), rb_locale_encoding());\
-} while (0)\
-
-
-/*
- * Document-class: Readline
- *
- * The Readline module provides interface for GNU Readline.
- * This module defines a number of methods to facilitate completion
- * and accesses input history from the Ruby interpreter.
- * This module supported Edit Line(libedit) too.
- * libedit is compatible with GNU Readline.
- *
- * GNU Readline:: http://www.gnu.org/directory/readline.html
- * libedit:: http://www.thrysoee.dk/editline/
- *
- * Reads one inputted line with line edit by Readline.readline method.
- * At this time, the facilitatation completion and the key
- * bind like Emacs can be operated like GNU Readline.
- *
- * require "readline"
- * while buf = Readline.readline("> ", true)
- * p buf
- * end
- *
- * The content that the user input can be recorded to the history.
- * The history can be accessed by Readline::HISTORY constant.
- *
- * require "readline"
- * while buf = Readline.readline("> ", true)
- * p Readline::HISTORY.to_a
- * print("-> ", buf, "\n")
- * end
- *
- * Most of methods raise SecurityError exception if $SAFE is 4.
- *
- * Documented by TAKAO Kouji <kouji at takao7 dot net>.
- */
-
-#if defined HAVE_RL_GETC_FUNCTION
-static VALUE readline_instream;
-static ID id_getbyte;
-
-static int readline_getc(FILE *);
-static int
-readline_getc(FILE *input)
-{
- rb_io_t *ifp = 0;
- VALUE c;
- if (!readline_instream) return rl_getc(input);
- GetOpenFile(readline_instream, ifp);
- if (rl_instream != ifp->stdio_file) return rl_getc(input);
- c = rb_funcall(readline_instream, id_getbyte, 0, 0);
- if (NIL_P(c)) return EOF;
- return NUM2CHR(c);
-}
-#elif defined HAVE_RL_EVENT_HOOK
+#ifdef HAVE_RL_EVENT_HOOK
+#ifdef DOSISH
+#define BUSY_WAIT 1
+#else
#define BUSY_WAIT 0
+#endif
static int readline_event(void);
static int
-readline_event(void)
+readline_event()
{
#if BUSY_WAIT
rb_thread_schedule();
@@ -142,121 +70,36 @@ readline_event(void)
#endif
static VALUE
-readline_get(VALUE prompt)
-{
- return (VALUE)readline((char *)prompt);
-}
-
-/*
- * call-seq:
- * Readline.readline(prompt = "", add_hist = false) -> string or nil
- *
- * Shows the +prompt+ and reads the inputted line with line editing.
- * The inputted line is added to the history if +add_hist+ is true.
- *
- * Returns nil when the inputted line is empty and user inputs EOF
- * (Presses ^D on UNIX).
- *
- * Raises IOError exception if below conditions are satisfied.
- * 1. stdin is not tty.
- * 2. stdin was closed. (errno is EBADF after called isatty(2).)
- *
- * This method supports thread. Switchs the thread context when waits
- * inputting line.
- *
- * Supports line edit when inputs line. Provides VI and Emacs editing mode.
- * Default is Emacs editing mode.
- *
- * NOTE: Terminates ruby interpreter and does not return the terminal
- * status after user pressed '^C' when wait inputting line.
- * Give 3 examples that avoid it.
- *
- * * Catches the Interrupt exception by pressed ^C after returns
- * terminal status:
- *
- * require "readline"
- *
- * stty_save = `stty -g`.chomp
- * begin
- * while buf = Readline.readline
- * p buf
- * end
- * rescue Interrupt
- * system("stty", stty_save)
- * exit
- * end
- * end
- * end
- *
- * * Catches the INT signal by pressed ^C after returns terminal
- * status:
- *
- * require "readline"
- *
- * stty_save = `stty -g`.chomp
- * trap("INT") { system "stty", stty_save; exit }
- *
- * while buf = Readline.readline
- * p buf
- * end
- *
- * * Ignores pressing ^C:
- *
- * require "readline"
- *
- * trap("INT", "SIG_IGN")
- *
- * while buf = Readline.readline
- * p buf
- * end
- *
- * Can make as follows with Readline::HISTORY constant.
- * It does not record to the history if the inputted line is empty or
- * the same it as last one.
- *
- * require "readline"
- *
- * while buf = Readline.readline("> ", true)
- * # p Readline::HISTORY.to_a
- * Readline::HISTORY.pop if /^\s*$/ =~ buf
- *
- * begin
- * if Readline::HISTORY[Readline::HISTORY.length-2] == buf
- * Readline::HISTORY.pop
- * end
- * rescue IndexError
- * end
- *
- * # p Readline::HISTORY.to_a
- * print "-> ", buf, "\n"
- * end
- *
- * Raises SecurityError exception if $SAFE is 4.
- */
-static VALUE
-readline_readline(int argc, VALUE *argv, VALUE self)
+readline_readline(argc, argv, self)
+ int argc;
+ VALUE *argv;
+ VALUE self;
{
VALUE tmp, add_hist, result;
char *prompt = NULL;
char *buff;
int status;
+ rb_io_t *ofp, *ifp;
rb_secure(4);
if (rb_scan_args(argc, argv, "02", &tmp, &add_hist) > 0) {
- OutputStringValue(tmp);
- prompt = RSTRING_PTR(tmp);
+ SafeStringValue(tmp);
+ prompt = RSTRING(tmp)->ptr;
}
- if (!isatty(0) && errno == EBADF) rb_raise(rb_eIOError, "closed stdin");
+ if (!isatty(0) && errno == EBADF) rb_raise(rb_eIOError, "stdin closed");
-#ifdef _WIN32
- rl_prep_terminal(1);
-#endif
- buff = (char*)rb_protect(readline_get, (VALUE)prompt, &status);
+ Check_Type(rb_stdout, T_FILE);
+ GetOpenFile(rb_stdout, ofp);
+ rl_outstream = GetWriteFile(ofp);
+ Check_Type(rb_stdin, T_FILE);
+ GetOpenFile(rb_stdin, ifp);
+ rl_instream = GetReadFile(ifp);
+ buff = (char*)rb_protect((VALUE(*)_((VALUE)))readline, (VALUE)prompt,
+ &status);
if (status) {
#if defined HAVE_RL_CLEANUP_AFTER_SIGNAL
/* restore terminal mode and signal handler*/
- rl_free_line_state();
rl_cleanup_after_signal();
#elif defined HAVE_RL_DEPREP_TERM_FUNCTION
/* restore terminal mode */
@@ -272,191 +115,60 @@ readline_readline(int argc, VALUE *argv, VALUE self)
if (RTEST(add_hist) && buff) {
add_history(buff);
}
- if (buff) {
- result = rb_locale_str_new_cstr(buff);
- }
+ if (buff)
+ result = rb_tainted_str_new2(buff);
else
result = Qnil;
if (buff) free(buff);
return result;
}
-/*
- * call-seq:
- * Readline.input = input
- *
- * Specifies a File object +input+ that is input stream for
- * Readline.readline method.
- *
- * Raises SecurityError exception if $SAFE is 4.
- */
-static VALUE
-readline_s_set_input(VALUE self, VALUE input)
-{
- rb_io_t *ifp;
-
- rb_secure(4);
- Check_Type(input, T_FILE);
- GetOpenFile(input, ifp);
- rl_instream = rb_io_stdio_file(ifp);
-#ifdef HAVE_RL_GETC_FUNCTION
- readline_instream = input;
-#endif
- return input;
-}
-
-/*
- * call-seq:
- * Readline.output = output
- *
- * Specifies a File object +output+ that is output stream for
- * Readline.readline method.
- *
- * Raises SecurityError exception if $SAFE is 4.
- */
static VALUE
-readline_s_set_output(VALUE self, VALUE output)
+readline_s_set_completion_proc(self, proc)
+ VALUE self;
+ VALUE proc;
{
- rb_io_t *ofp;
-
rb_secure(4);
- Check_Type(output, T_FILE);
- GetOpenFile(output, ofp);
- rl_outstream = rb_io_stdio_file(ofp);
- return output;
-}
-
-/*
- * call-seq:
- * Readline.completion_proc = proc
- *
- * Specifies a Proc object +proc+ to determine completion behavior. It
- * should take input-string, and return an array of completion
- * candidates.
- *
- * Set default if +proc+ is nil.
- *
- * Raises ArgumentError exception if +proc+ does not respond to call method.
- *
- * Raises SecurityError exception if $SAFE is 4.
- */
-static VALUE
-readline_s_set_completion_proc(VALUE self, VALUE proc)
-{
- rb_secure(4);
- if (!NIL_P(proc) && !rb_respond_to(proc, rb_intern("call")))
+ if (!rb_respond_to(proc, rb_intern("call")))
rb_raise(rb_eArgError, "argument must respond to `call'");
return rb_ivar_set(mReadline, completion_proc, proc);
}
-/*
- * call-seq:
- * Readline.completion_proc -> proc
- *
- * Returns the completion Proc object.
- *
- * Raises SecurityError exception if $SAFE is 4.
- */
static VALUE
-readline_s_get_completion_proc(VALUE self)
+readline_s_get_completion_proc(self)
+ VALUE self;
{
rb_secure(4);
return rb_attr_get(mReadline, completion_proc);
}
-/*
- * call-seq:
- * Readline.completion_case_fold = bool
- *
- * Sets whether or not to ignore case on completion.
- *
- * Raises SecurityError exception if $SAFE is 4.
- */
static VALUE
-readline_s_set_completion_case_fold(VALUE self, VALUE val)
+readline_s_set_completion_case_fold(self, val)
+ VALUE self;
+ VALUE val;
{
rb_secure(4);
return rb_ivar_set(mReadline, completion_case_fold, val);
}
-/*
- * call-seq:
- * Readline.completion_case_fold -> bool
- *
- * Returns true if completion ignores case. If no, returns false.
- *
- * NOTE: Returns the same object that is specified by
- * Readline.completion_case_fold= method.
- *
- * require "readline"
- *
- * Readline.completion_case_fold = "This is a String."
- * p Readline.completion_case_fold # => "This is a String."
- *
- * Raises SecurityError exception if $SAFE is 4.
- */
static VALUE
-readline_s_get_completion_case_fold(VALUE self)
+readline_s_get_completion_case_fold(self)
+ VALUE self;
{
rb_secure(4);
return rb_attr_get(mReadline, completion_case_fold);
}
-#ifdef HAVE_RL_LINE_BUFFER
-/*
- * call-seq:
- * Readline.line_buffer -> string
- *
- * Returns the full line that is being edited. This is useful from
- * within the complete_proc for determining the context of the
- * completion request.
- *
- * The length of +Readline.line_buffer+ and GNU Readline's rl_end are
- * same.
- */
-static VALUE
-readline_s_get_line_buffer(VALUE self)
-{
- rb_secure(4);
- if (rl_line_buffer == NULL)
- return Qnil;
- return rb_tainted_str_new2(rl_line_buffer);
-}
-#else
-#define readline_s_get_line_buffer rb_f_notimplement
-#endif
-
-#ifdef HAVE_RL_POINT
-/*
- * call-seq:
- * Readline.point -> int
- *
- * Returns the index of the current cursor position in
- * +Readline.line_buffer+.
- *
- * The index in +Readline.line_buffer+ which matches the start of
- * input-string passed to completion_proc is computed by subtracting
- * the length of input-string from +Readline.point+.
- *
- * start = (the length of input-string) - Readline.point
- */
-static VALUE
-readline_s_get_point(VALUE self)
-{
- rb_secure(4);
- return INT2NUM(rl_point);
-}
-#else
-#define readline_s_get_point rb_f_notimplement
-#endif
-
static char **
-readline_attempted_completion_function(const char *text, int start, int end)
+readline_attempted_completion_function(text, start, end)
+ const char *text;
+ int start;
+ int end;
{
VALUE proc, ary, temp;
char **result;
int case_fold;
- long i, matches;
+ int i, matches;
proc = rb_attr_get(mReadline, completion_proc);
if (NIL_P(proc))
@@ -465,17 +177,17 @@ readline_attempted_completion_function(const char *text, int start, int end)
rl_attempted_completion_over = 1;
#endif
case_fold = RTEST(rb_attr_get(mReadline, completion_case_fold));
- ary = rb_funcall(proc, rb_intern("call"), 1, rb_locale_str_new_cstr(text));
+ ary = rb_funcall(proc, rb_intern("call"), 1, rb_tainted_str_new2(text));
if (TYPE(ary) != T_ARRAY)
ary = rb_Array(ary);
- matches = RARRAY_LEN(ary);
+ matches = RARRAY(ary)->len;
if (matches == 0)
return NULL;
result = ALLOC_N(char *, matches + 2);
for (i = 0; i < matches; i++) {
- temp = rb_obj_as_string(RARRAY_PTR(ary)[i]);
- result[i + 1] = ALLOC_N(char, RSTRING_LEN(temp) + 1);
- strcpy(result[i + 1], RSTRING_PTR(temp));
+ temp = rb_obj_as_string(RARRAY(ary)->ptr[i]);
+ result[i + 1] = ALLOC_N(char, RSTRING(temp)->len + 1);
+ strcpy(result[i + 1], RSTRING(temp)->ptr);
}
result[matches + 1] = NULL;
@@ -514,581 +226,304 @@ readline_attempted_completion_function(const char *text, int start, int end)
return result;
}
-#ifdef HAVE_RL_SET_SCREEN_SIZE
-/*
- * call-seq:
- * Readline.set_screen_size(rows, columns) -> self
- *
- * Set terminal size to +rows+ and +columns+.
- *
- * See GNU Readline's rl_set_screen_size function.
- *
- * Raises NotImplementedError if the using readline library does not support.
- *
- * Raises SecurityError exception if $SAFE is 4.
- */
-static VALUE
-readline_s_set_screen_size(VALUE self, VALUE rows, VALUE columns)
-{
- rb_secure(4);
- rl_set_screen_size(NUM2INT(rows), NUM2INT(columns));
- return self;
-}
-#else
-#define readline_s_set_screen_size rb_f_notimplement
-#endif
-
-#ifdef HAVE_RL_GET_SCREEN_SIZE
-/*
- * call-seq:
- * Readline.get_screen_size -> [rows, columns]
- *
- * Returns the terminal's rows and columns.
- *
- * See GNU Readline's rl_get_screen_size function.
- *
- * Raises NotImplementedError if the using readline library does not support.
- *
- * Raises SecurityError exception if $SAFE is 4.
- */
static VALUE
-readline_s_get_screen_size(VALUE self)
+readline_s_vi_editing_mode(self)
+ VALUE self;
{
- int rows, columns;
- VALUE res;
-
- rb_secure(4);
- rl_get_screen_size(&rows, &columns);
- res = rb_ary_new();
- rb_ary_push(res, INT2NUM(rows));
- rb_ary_push(res, INT2NUM(columns));
- return res;
-}
-#else
-#define readline_s_get_screen_size rb_f_notimplement
-#endif
-
#ifdef HAVE_RL_VI_EDITING_MODE
-/*
- * call-seq:
- * Readline.vi_editing_mode -> nil
- *
- * Specifies VI editing mode. See the manual of GNU Readline for
- * details of VI editing mode.
- *
- * Raises NotImplementedError if the using readline library does not support.
- *
- * Raises SecurityError exception if $SAFE is 4.
- */
-static VALUE
-readline_s_vi_editing_mode(VALUE self)
-{
rb_secure(4);
rl_vi_editing_mode(1,0);
return Qnil;
-}
#else
-#define readline_s_vi_editing_mode rb_f_notimplement
-#endif
-
-#ifdef HAVE_RL_EDITING_MODE
-/*
- * call-seq:
- * Readline.vi_editing_mode? -> bool
- *
- * Returns true if vi mode is active. Returns false if not.
- *
- * Raises NotImplementedError if the using readline library does not support.
- *
- * Raises SecurityError exception if $SAFE is 4.
- */
-static VALUE
-readline_s_vi_editing_mode_p(VALUE self)
-{
- rb_secure(4);
- return rl_editing_mode == 0 ? Qtrue : Qfalse;
+ rb_notimplement();
+ return Qnil; /* not reached */
+#endif /* HAVE_RL_VI_EDITING_MODE */
}
-#else
-#define readline_s_vi_editing_mode_p rb_f_notimplement
-#endif
-#ifdef HAVE_RL_EMACS_EDITING_MODE
-/*
- * call-seq:
- * Readline.emacs_editing_mode -> nil
- *
- * Specifies Emacs editing mode. The default is this mode. See the
- * manual of GNU Readline for details of Emacs editing mode.
- *
- * Raises NotImplementedError if the using readline library does not support.
- *
- * Raises SecurityError exception if $SAFE is 4.
- */
static VALUE
-readline_s_emacs_editing_mode(VALUE self)
+readline_s_emacs_editing_mode(self)
+ VALUE self;
{
+#ifdef HAVE_RL_EMACS_EDITING_MODE
rb_secure(4);
rl_emacs_editing_mode(1,0);
return Qnil;
-}
#else
-#define readline_s_emacs_editing_mode rb_f_notimplement
-#endif
-
-#ifdef HAVE_RL_EDITING_MODE
-/*
- * call-seq:
- * Readline.emacs_editing_mode? -> bool
- *
- * Returns true if emacs mode is active. Returns false if not.
- *
- * Raises NotImplementedError if the using readline library does not support.
- *
- * Raises SecurityError exception if $SAFE is 4.
- */
-static VALUE
-readline_s_emacs_editing_mode_p(VALUE self)
-{
- rb_secure(4);
- return rl_editing_mode == 1 ? Qtrue : Qfalse;
+ rb_notimplement();
+ return Qnil; /* not reached */
+#endif /* HAVE_RL_EMACS_EDITING_MODE */
}
-#else
-#define readline_s_emacs_editing_mode_p rb_f_notimplement
-#endif
-#ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER
-/*
- * call-seq:
- * Readline.completion_append_character = char
- *
- * Specifies a character to be appended on completion.
- * Nothing will be appended if an empty string ("") or nil is
- * specified.
- *
- * For example:
- * require "readline"
- *
- * Readline.readline("> ", true)
- * Readline.completion_append_character = " "
- *
- * Result:
- * >
- * Input "/var/li".
- *
- * > /var/li
- * Press TAB key.
- *
- * > /var/lib
- * Completes "b" and appends " ". So, you can continuously input "/usr".
- *
- * > /var/lib /usr
- *
- * NOTE: Only one character can be specified. When "string" is
- * specified, sets only "s" that is the first.
- *
- * require "readline"
- *
- * Readline.completion_append_character = "string"
- * p Readline.completion_append_character # => "s"
- *
- * Raises NotImplementedError if the using readline library does not support.
- *
- * Raises SecurityError exception if $SAFE is 4.
- */
static VALUE
-readline_s_set_completion_append_character(VALUE self, VALUE str)
+readline_s_set_completion_append_character(self, str)
+ VALUE self, str;
{
+#ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER
rb_secure(4);
if (NIL_P(str)) {
rl_completion_append_character = '\0';
}
else {
- OutputStringValue(str);
- if (RSTRING_LEN(str) == 0) {
+ SafeStringValue(str);
+ if (RSTRING(str)->len == 0) {
rl_completion_append_character = '\0';
} else {
- rl_completion_append_character = RSTRING_PTR(str)[0];
+ rl_completion_append_character = RSTRING(str)->ptr[0];
}
}
return self;
-}
#else
-#define readline_s_set_completion_append_character rb_f_notimplement
-#endif
+ rb_notimplement();
+ return Qnil; /* not reached */
+#endif /* HAVE_RL_COMPLETION_APPEND_CHARACTER */
+}
-#ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER
-/*
- * call-seq:
- * Readline.completion_append_character -> char
- *
- * Returns a string containing a character to be appended on
- * completion. The default is a space (" ").
- *
- * Raises NotImplementedError if the using readline library does not support.
- *
- * Raises SecurityError exception if $SAFE is 4.
- */
static VALUE
-readline_s_get_completion_append_character(VALUE self)
+readline_s_get_completion_append_character(self)
+ VALUE self;
{
- char buf[1];
+#ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER
+ VALUE str;
rb_secure(4);
if (rl_completion_append_character == '\0')
return Qnil;
- buf[0] = (char) rl_completion_append_character;
- return rb_locale_str_new(buf, 1);
-}
+ str = rb_str_new("", 1);
+ RSTRING(str)->ptr[0] = rl_completion_append_character;
+ return str;
#else
-#define readline_s_get_completion_append_character rb_f_notimplement
-#endif
+ rb_notimplement();
+ return Qnil; /* not reached */
+#endif /* HAVE_RL_COMPLETION_APPEND_CHARACTER */
+}
-#ifdef HAVE_RL_BASIC_WORD_BREAK_CHARACTERS
-/*
- * call-seq:
- * Readline.basic_word_break_characters = string
- *
- * Sets the basic list of characters that signal a break between words
- * for the completer routine. The default is the characters which
- * break words for completion in Bash: "\t\n\"\\'`@$><=;|&{(".
- *
- * Raises NotImplementedError if the using readline library does not support.
- *
- * Raises SecurityError exception if $SAFE is 4.
- */
static VALUE
-readline_s_set_basic_word_break_characters(VALUE self, VALUE str)
+readline_s_set_basic_word_break_characters(self, str)
+ VALUE self, str;
{
+#ifdef HAVE_RL_BASIC_WORD_BREAK_CHARACTERS
static char *basic_word_break_characters = NULL;
rb_secure(4);
- OutputStringValue(str);
+ SafeStringValue(str);
if (basic_word_break_characters == NULL) {
basic_word_break_characters =
- ALLOC_N(char, RSTRING_LEN(str) + 1);
+ ALLOC_N(char, RSTRING(str)->len + 1);
}
else {
- REALLOC_N(basic_word_break_characters, char, RSTRING_LEN(str) + 1);
+ REALLOC_N(basic_word_break_characters, char, RSTRING(str)->len + 1);
}
strncpy(basic_word_break_characters,
- RSTRING_PTR(str), RSTRING_LEN(str));
- basic_word_break_characters[RSTRING_LEN(str)] = '\0';
+ RSTRING(str)->ptr, RSTRING(str)->len);
+ basic_word_break_characters[RSTRING(str)->len] = '\0';
rl_basic_word_break_characters = basic_word_break_characters;
return self;
-}
#else
-#define readline_s_set_basic_word_break_characters rb_f_notimplement
-#endif
+ rb_notimplement();
+ return Qnil; /* not reached */
+#endif /* HAVE_RL_BASIC_WORD_BREAK_CHARACTERS */
+}
-#ifdef HAVE_RL_BASIC_WORD_BREAK_CHARACTERS
-/*
- * call-seq:
- * Readline.basic_word_break_characters -> string
- *
- * Gets the basic list of characters that signal a break between words
- * for the completer routine.
- *
- * Raises NotImplementedError if the using readline library does not support.
- *
- * Raises SecurityError exception if $SAFE is 4.
- */
static VALUE
-readline_s_get_basic_word_break_characters(VALUE self, VALUE str)
+readline_s_get_basic_word_break_characters(self, str)
+ VALUE self, str;
{
+#ifdef HAVE_RL_BASIC_WORD_BREAK_CHARACTERS
rb_secure(4);
if (rl_basic_word_break_characters == NULL)
return Qnil;
- return rb_locale_str_new_cstr(rl_basic_word_break_characters);
-}
+ return rb_tainted_str_new2(rl_basic_word_break_characters);
#else
-#define readline_s_get_basic_word_break_characters rb_f_notimplement
-#endif
+ rb_notimplement();
+ return Qnil; /* not reached */
+#endif /* HAVE_RL_BASIC_WORD_BREAK_CHARACTERS */
+}
-#ifdef HAVE_RL_COMPLETER_WORD_BREAK_CHARACTERS
-/*
- * call-seq:
- * Readline.completer_word_break_characters = string
- *
- * Sets the basic list of characters that signal a break between words
- * for rl_complete_internal(). The default is the value of
- * Readline.basic_word_break_characters.
- *
- * Raises NotImplementedError if the using readline library does not support.
- *
- * Raises SecurityError exception if $SAFE is 4.
- */
static VALUE
-readline_s_set_completer_word_break_characters(VALUE self, VALUE str)
+readline_s_set_completer_word_break_characters(self, str)
+ VALUE self, str;
{
+#ifdef HAVE_RL_COMPLETER_WORD_BREAK_CHARACTERS
static char *completer_word_break_characters = NULL;
rb_secure(4);
- OutputStringValue(str);
+ SafeStringValue(str);
if (completer_word_break_characters == NULL) {
completer_word_break_characters =
- ALLOC_N(char, RSTRING_LEN(str) + 1);
+ ALLOC_N(char, RSTRING(str)->len + 1);
}
else {
- REALLOC_N(completer_word_break_characters, char, RSTRING_LEN(str) + 1);
+ REALLOC_N(completer_word_break_characters, char, RSTRING(str)->len + 1);
}
strncpy(completer_word_break_characters,
- RSTRING_PTR(str), RSTRING_LEN(str));
- completer_word_break_characters[RSTRING_LEN(str)] = '\0';
+ RSTRING(str)->ptr, RSTRING(str)->len);
+ completer_word_break_characters[RSTRING(str)->len] = '\0';
rl_completer_word_break_characters = completer_word_break_characters;
return self;
-}
#else
-#define readline_s_set_completer_word_break_characters rb_f_notimplement
-#endif
+ rb_notimplement();
+ return Qnil; /* not reached */
+#endif /* HAVE_RL_COMPLETER_WORD_BREAK_CHARACTERS */
+}
-#ifdef HAVE_RL_COMPLETER_WORD_BREAK_CHARACTERS
-/*
- * call-seq:
- * Readline.completer_word_break_characters -> string
- *
- * Gets the basic list of characters that signal a break between words
- * for rl_complete_internal().
- *
- * Raises NotImplementedError if the using readline library does not support.
- *
- * Raises SecurityError exception if $SAFE is 4.
- */
static VALUE
-readline_s_get_completer_word_break_characters(VALUE self, VALUE str)
+readline_s_get_completer_word_break_characters(self, str)
+ VALUE self, str;
{
+#ifdef HAVE_RL_COMPLETER_WORD_BREAK_CHARACTERS
rb_secure(4);
if (rl_completer_word_break_characters == NULL)
return Qnil;
- return rb_locale_str_new_cstr(rl_completer_word_break_characters);
-}
+ return rb_tainted_str_new2(rl_completer_word_break_characters);
#else
-#define readline_s_get_completer_word_break_characters rb_f_notimplement
-#endif
+ rb_notimplement();
+ return Qnil; /* not reached */
+#endif /* HAVE_RL_COMPLETER_WORD_BREAK_CHARACTERS */
+}
-#ifdef HAVE_RL_BASIC_QUOTE_CHARACTERS
-/*
- * call-seq:
- * Readline.basic_quote_characters = string
- *
- * Sets a list of quote characters which can cause a word break.
- *
- * Raises NotImplementedError if the using readline library does not support.
- *
- * Raises SecurityError exception if $SAFE is 4.
- */
static VALUE
-readline_s_set_basic_quote_characters(VALUE self, VALUE str)
+readline_s_set_basic_quote_characters(self, str)
+ VALUE self, str;
{
+#ifdef HAVE_RL_BASIC_QUOTE_CHARACTERS
static char *basic_quote_characters = NULL;
rb_secure(4);
- OutputStringValue(str);
+ SafeStringValue(str);
if (basic_quote_characters == NULL) {
basic_quote_characters =
- ALLOC_N(char, RSTRING_LEN(str) + 1);
+ ALLOC_N(char, RSTRING(str)->len + 1);
}
else {
- REALLOC_N(basic_quote_characters, char, RSTRING_LEN(str) + 1);
+ REALLOC_N(basic_quote_characters, char, RSTRING(str)->len + 1);
}
strncpy(basic_quote_characters,
- RSTRING_PTR(str), RSTRING_LEN(str));
- basic_quote_characters[RSTRING_LEN(str)] = '\0';
+ RSTRING(str)->ptr, RSTRING(str)->len);
+ basic_quote_characters[RSTRING(str)->len] = '\0';
rl_basic_quote_characters = basic_quote_characters;
return self;
-}
#else
-#define readline_s_set_basic_quote_characters rb_f_notimplement
-#endif
+ rb_notimplement();
+ return Qnil; /* not reached */
+#endif /* HAVE_RL_BASIC_QUOTE_CHARACTERS */
+}
-#ifdef HAVE_RL_BASIC_QUOTE_CHARACTERS
-/*
- * call-seq:
- * Readline.basic_quote_characters -> string
- *
- * Gets a list of quote characters which can cause a word break.
- *
- * Raises NotImplementedError if the using readline library does not support.
- *
- * Raises SecurityError exception if $SAFE is 4.
- */
static VALUE
-readline_s_get_basic_quote_characters(VALUE self, VALUE str)
+readline_s_get_basic_quote_characters(self, str)
+ VALUE self, str;
{
+#ifdef HAVE_RL_BASIC_QUOTE_CHARACTERS
rb_secure(4);
if (rl_basic_quote_characters == NULL)
return Qnil;
- return rb_locale_str_new_cstr(rl_basic_quote_characters);
-}
+ return rb_tainted_str_new2(rl_basic_quote_characters);
#else
-#define readline_s_get_basic_quote_characters rb_f_notimplement
-#endif
+ rb_notimplement();
+ return Qnil; /* not reached */
+#endif /* HAVE_RL_BASIC_QUOTE_CHARACTERS */
+}
-#ifdef HAVE_RL_COMPLETER_QUOTE_CHARACTERS
-/*
- * call-seq:
- * Readline.completer_quote_characters = string
- *
- * Sets a list of characters which can be used to quote a substring of
- * the line. Completion occurs on the entire substring, and within
- * the substring Readline.completer_word_break_characters are treated
- * as any other character, unless they also appear within this list.
- *
- * Raises NotImplementedError if the using readline library does not support.
- *
- * Raises SecurityError exception if $SAFE is 4.
- */
static VALUE
-readline_s_set_completer_quote_characters(VALUE self, VALUE str)
+readline_s_set_completer_quote_characters(self, str)
+ VALUE self, str;
{
+#ifdef HAVE_RL_COMPLETER_QUOTE_CHARACTERS
static char *completer_quote_characters = NULL;
rb_secure(4);
- OutputStringValue(str);
+ SafeStringValue(str);
if (completer_quote_characters == NULL) {
completer_quote_characters =
- ALLOC_N(char, RSTRING_LEN(str) + 1);
+ ALLOC_N(char, RSTRING(str)->len + 1);
}
else {
- REALLOC_N(completer_quote_characters, char, RSTRING_LEN(str) + 1);
+ REALLOC_N(completer_quote_characters, char, RSTRING(str)->len + 1);
}
- strncpy(completer_quote_characters, RSTRING_PTR(str), RSTRING_LEN(str));
- completer_quote_characters[RSTRING_LEN(str)] = '\0';
+ strncpy(completer_quote_characters,
+ RSTRING(str)->ptr, RSTRING(str)->len);
+ completer_quote_characters[RSTRING(str)->len] = '\0';
rl_completer_quote_characters = completer_quote_characters;
return self;
-}
#else
-#define readline_s_set_completer_quote_characters rb_f_notimplement
-#endif
+ rb_notimplement();
+ return Qnil; /* not reached */
+#endif /* HAVE_RL_COMPLETER_QUOTE_CHARACTERS */
+}
-#ifdef HAVE_RL_COMPLETER_QUOTE_CHARACTERS
-/*
- * call-seq:
- * Readline.completer_quote_characters -> string
- *
- * Gets a list of characters which can be used to quote a substring of
- * the line.
- *
- * Raises NotImplementedError if the using readline library does not support.
- *
- * Raises SecurityError exception if $SAFE is 4.
- */
static VALUE
-readline_s_get_completer_quote_characters(VALUE self, VALUE str)
+readline_s_get_completer_quote_characters(self, str)
+ VALUE self, str;
{
+#ifdef HAVE_RL_COMPLETER_QUOTE_CHARACTERS
rb_secure(4);
if (rl_completer_quote_characters == NULL)
return Qnil;
- return rb_locale_str_new_cstr(rl_completer_quote_characters);
-}
+ return rb_tainted_str_new2(rl_completer_quote_characters);
#else
-#define readline_s_get_completer_quote_characters rb_f_notimplement
-#endif
+ rb_notimplement();
+ return Qnil; /* not reached */
+#endif /* HAVE_RL_COMPLETER_QUOTE_CHARACTERS */
+}
-#ifdef HAVE_RL_FILENAME_QUOTE_CHARACTERS
-/*
- * call-seq:
- * Readline.filename_quote_characters = string
- *
- * Sets a list of characters that cause a filename to be quoted by the completer
- * when they appear in a completed filename. The default is nil.
- *
- * Raises NotImplementedError if the using readline library does not support.
- *
- * Raises SecurityError exception if $SAFE is 4.
- */
static VALUE
-readline_s_set_filename_quote_characters(VALUE self, VALUE str)
+readline_s_set_filename_quote_characters(self, str)
+ VALUE self, str;
{
+#ifdef HAVE_RL_FILENAME_QUOTE_CHARACTERS
static char *filename_quote_characters = NULL;
rb_secure(4);
- OutputStringValue(str);
+ SafeStringValue(str);
if (filename_quote_characters == NULL) {
filename_quote_characters =
- ALLOC_N(char, RSTRING_LEN(str) + 1);
+ ALLOC_N(char, RSTRING(str)->len + 1);
}
else {
- REALLOC_N(filename_quote_characters, char, RSTRING_LEN(str) + 1);
+ REALLOC_N(filename_quote_characters, char, RSTRING(str)->len + 1);
}
- strncpy(filename_quote_characters, RSTRING_PTR(str), RSTRING_LEN(str));
- filename_quote_characters[RSTRING_LEN(str)] = '\0';
+ strncpy(filename_quote_characters,
+ RSTRING(str)->ptr, RSTRING(str)->len);
+ filename_quote_characters[RSTRING(str)->len] = '\0';
rl_filename_quote_characters = filename_quote_characters;
return self;
-}
#else
-#define readline_s_set_filename_quote_characters rb_f_notimplement
-#endif
+ rb_notimplement();
+ return Qnil; /* not reached */
+#endif /* HAVE_RL_FILENAME_QUOTE_CHARACTERS */
+}
-#ifdef HAVE_RL_FILENAME_QUOTE_CHARACTERS
-/*
- * call-seq:
- * Readline.filename_quote_characters -> string
- *
- * Gets a list of characters that cause a filename to be quoted by the completer
- * when they appear in a completed filename.
- *
- * Raises NotImplementedError if the using readline library does not support.
- *
- * Raises SecurityError exception if $SAFE is 4.
- */
static VALUE
-readline_s_get_filename_quote_characters(VALUE self, VALUE str)
+readline_s_get_filename_quote_characters(self, str)
+ VALUE self, str;
{
+#ifdef HAVE_RL_FILENAME_QUOTE_CHARACTERS
rb_secure(4);
if (rl_filename_quote_characters == NULL)
return Qnil;
- return rb_locale_str_new_cstr(rl_filename_quote_characters);
-}
+ return rb_tainted_str_new2(rl_filename_quote_characters);
#else
-#define readline_s_get_filename_quote_characters rb_f_notimplement
-#endif
-
-#ifdef HAVE_RL_REFRESH_LINE
-/*
- * call-seq:
- * Readline.refresh_line -> nil
- *
- * Clear the current input line.
- *
- * Raises SecurityError exception if $SAFE is 4.
- */
-static VALUE
-readline_s_refresh_line(VALUE self)
-{
- rb_secure(4);
- rl_refresh_line(0, 0);
- return Qnil;
+ rb_notimplement();
+ return Qnil; /* not reached */
+#endif /* HAVE_RL_FILENAME_QUOTE_CHARACTERS */
}
-#else
-#define readline_s_refresh_line rb_f_notimplement
-#endif
static VALUE
-hist_to_s(VALUE self)
+hist_to_s(self)
+ VALUE self;
{
- return rb_str_new_cstr("HISTORY");
-}
-
-static int
-history_get_offset_history_base(int offset)
-{
- return history_base + offset;
-}
-
-static int
-history_get_offset_0(int offset)
-{
- return offset;
+ return rb_str_new2("HISTORY");
}
static VALUE
-hist_get(VALUE self, VALUE index)
+hist_get(self, index)
+ VALUE self;
+ VALUE index;
{
- HIST_ENTRY *entry = NULL;
+ HIST_ENTRY *entry;
int i;
rb_secure(4);
@@ -1096,65 +531,71 @@ hist_get(VALUE self, VALUE index)
if (i < 0) {
i += history_length;
}
- if (i >= 0) {
- entry = history_get(history_get_offset_func(i));
- }
+ entry = history_get(history_base + i);
if (entry == NULL) {
rb_raise(rb_eIndexError, "invalid index");
}
- return rb_locale_str_new_cstr(entry->line);
+ return rb_tainted_str_new2(entry->line);
}
-#ifdef HAVE_REPLACE_HISTORY_ENTRY
static VALUE
-hist_set(VALUE self, VALUE index, VALUE str)
+hist_set(self, index, str)
+ VALUE self;
+ VALUE index;
+ VALUE str;
{
- HIST_ENTRY *entry = NULL;
+#ifdef HAVE_REPLACE_HISTORY_ENTRY
+ HIST_ENTRY *entry;
int i;
rb_secure(4);
i = NUM2INT(index);
- OutputStringValue(str);
+ SafeStringValue(str);
if (i < 0) {
i += history_length;
}
- if (i >= 0) {
- entry = replace_history_entry(i, RSTRING_PTR(str), NULL);
- }
+ entry = replace_history_entry(i, RSTRING(str)->ptr, NULL);
if (entry == NULL) {
rb_raise(rb_eIndexError, "invalid index");
}
return str;
-}
#else
-#define hist_set rb_f_notimplement
+ rb_notimplement();
+ return Qnil; /* not reached */
#endif
+}
static VALUE
-hist_push(VALUE self, VALUE str)
+hist_push(self, str)
+ VALUE self;
+ VALUE str;
{
rb_secure(4);
- OutputStringValue(str);
- add_history(RSTRING_PTR(str));
+ SafeStringValue(str);
+ add_history(RSTRING(str)->ptr);
return self;
}
static VALUE
-hist_push_method(int argc, VALUE *argv, VALUE self)
+hist_push_method(argc, argv, self)
+ int argc;
+ VALUE *argv;
+ VALUE self;
{
VALUE str;
rb_secure(4);
while (argc--) {
str = *argv++;
- OutputStringValue(str);
- add_history(RSTRING_PTR(str));
+ SafeStringValue(str);
+ add_history(RSTRING(str)->ptr);
}
return self;
}
static VALUE
-rb_remove_history(int index)
+rb_remove_history(index)
+ int index;
{
#ifdef HAVE_REMOVE_HISTORY
HIST_ENTRY *entry;
@@ -1163,8 +604,8 @@ rb_remove_history(int index)
rb_secure(4);
entry = remove_history(index);
if (entry) {
- val = rb_locale_str_new_cstr(entry->line);
- free((void *) entry->line);
+ val = rb_tainted_str_new2(entry->line);
+ free(entry->line);
free(entry);
return val;
}
@@ -1176,7 +617,8 @@ rb_remove_history(int index)
}
static VALUE
-hist_pop(VALUE self)
+hist_pop(self)
+ VALUE self;
{
rb_secure(4);
if (history_length > 0) {
@@ -1187,7 +629,8 @@ hist_pop(VALUE self)
}
static VALUE
-hist_shift(VALUE self)
+hist_shift(self)
+ VALUE self;
{
rb_secure(4);
if (history_length > 0) {
@@ -1198,39 +641,42 @@ hist_shift(VALUE self)
}
static VALUE
-hist_each(VALUE self)
+hist_each(self)
+ VALUE self;
{
HIST_ENTRY *entry;
int i;
- RETURN_ENUMERATOR(self, 0, 0);
-
rb_secure(4);
for (i = 0; i < history_length; i++) {
- entry = history_get(history_get_offset_func(i));
+ entry = history_get(history_base + i);
if (entry == NULL)
break;
- rb_yield(rb_locale_str_new_cstr(entry->line));
+ rb_yield(rb_tainted_str_new2(entry->line));
}
return self;
}
static VALUE
-hist_length(VALUE self)
+hist_length(self)
+ VALUE self;
{
rb_secure(4);
return INT2NUM(history_length);
}
static VALUE
-hist_empty_p(VALUE self)
+hist_empty_p(self)
+ VALUE self;
{
rb_secure(4);
return history_length == 0 ? Qtrue : Qfalse;
}
static VALUE
-hist_delete_at(VALUE self, VALUE index)
+hist_delete_at(self, index)
+ VALUE self;
+ VALUE index;
{
int i;
@@ -1244,20 +690,10 @@ hist_delete_at(VALUE self, VALUE index)
return rb_remove_history(i);
}
-#ifdef HAVE_CLEAR_HISTORY
static VALUE
-hist_clear(VALUE self)
-{
- rb_secure(4);
- clear_history();
- return self;
-}
-#else
-#define hist_clear rb_f_notimplement
-#endif
-
-static VALUE
-filename_completion_proc_call(VALUE self, VALUE str)
+filename_completion_proc_call(self, str)
+ VALUE self;
+ VALUE str;
{
VALUE result;
char **matches;
@@ -1268,11 +704,11 @@ filename_completion_proc_call(VALUE self, VALUE str)
if (matches) {
result = rb_ary_new();
for (i = 0; matches[i]; i++) {
- rb_ary_push(result, rb_locale_str_new_cstr(matches[i]));
+ rb_ary_push(result, rb_tainted_str_new2(matches[i]));
free(matches[i]);
}
free(matches);
- if (RARRAY_LEN(result) >= 2)
+ if (RARRAY(result)->len >= 2)
rb_ary_shift(result);
}
else {
@@ -1282,7 +718,9 @@ filename_completion_proc_call(VALUE self, VALUE str)
}
static VALUE
-username_completion_proc_call(VALUE self, VALUE str)
+username_completion_proc_call(self, str)
+ VALUE self;
+ VALUE str;
{
VALUE result;
char **matches;
@@ -1293,11 +731,11 @@ username_completion_proc_call(VALUE self, VALUE str)
if (matches) {
result = rb_ary_new();
for (i = 0; matches[i]; i++) {
- rb_ary_push(result, rb_locale_str_new_cstr(matches[i]));
+ rb_ary_push(result, rb_tainted_str_new2(matches[i]));
free(matches[i]);
}
free(matches);
- if (RARRAY_LEN(result) >= 2)
+ if (RARRAY(result)->len >= 2)
rb_ary_shift(result);
}
else {
@@ -1309,10 +747,10 @@ username_completion_proc_call(VALUE self, VALUE str)
void
Init_readline()
{
- VALUE history, fcomp, ucomp, version;
+ VALUE history, fcomp, ucomp;
/* Allow conditional parsing of the ~/.inputrc file. */
- rl_readline_name = (char *)"Ruby";
+ rl_readline_name = "Ruby";
using_history();
@@ -1322,10 +760,6 @@ Init_readline()
mReadline = rb_define_module("Readline");
rb_define_module_function(mReadline, "readline",
readline_readline, -1);
- rb_define_singleton_method(mReadline, "input=",
- readline_s_set_input, 1);
- rb_define_singleton_method(mReadline, "output=",
- readline_s_set_output, 1);
rb_define_singleton_method(mReadline, "completion_proc=",
readline_s_set_completion_proc, 1);
rb_define_singleton_method(mReadline, "completion_proc",
@@ -1334,22 +768,10 @@ Init_readline()
readline_s_set_completion_case_fold, 1);
rb_define_singleton_method(mReadline, "completion_case_fold",
readline_s_get_completion_case_fold, 0);
- rb_define_singleton_method(mReadline, "line_buffer",
- readline_s_get_line_buffer, 0);
- rb_define_singleton_method(mReadline, "point",
- readline_s_get_point, 0);
- rb_define_singleton_method(mReadline, "set_screen_size",
- readline_s_set_screen_size, 2);
- rb_define_singleton_method(mReadline, "get_screen_size",
- readline_s_get_screen_size, 0);
rb_define_singleton_method(mReadline, "vi_editing_mode",
readline_s_vi_editing_mode, 0);
- rb_define_singleton_method(mReadline, "vi_editing_mode?",
- readline_s_vi_editing_mode_p, 0);
rb_define_singleton_method(mReadline, "emacs_editing_mode",
readline_s_emacs_editing_mode, 0);
- rb_define_singleton_method(mReadline, "emacs_editing_mode?",
- readline_s_emacs_editing_mode_p, 0);
rb_define_singleton_method(mReadline, "completion_append_character=",
readline_s_set_completion_append_character, 1);
rb_define_singleton_method(mReadline, "completion_append_character",
@@ -1374,8 +796,6 @@ Init_readline()
readline_s_set_filename_quote_characters, 1);
rb_define_singleton_method(mReadline, "filename_quote_characters",
readline_s_get_filename_quote_characters, 0);
- rb_define_singleton_method(mReadline, "refresh_line",
- readline_s_refresh_line, 0);
history = rb_obj_alloc(rb_cObject);
rb_extend_object(history, rb_mEnumerable);
@@ -1391,75 +811,28 @@ Init_readline()
rb_define_singleton_method(history,"size", hist_length, 0);
rb_define_singleton_method(history,"empty?", hist_empty_p, 0);
rb_define_singleton_method(history,"delete_at", hist_delete_at, 1);
- rb_define_singleton_method(history,"clear", hist_clear, 0);
-
- /*
- * The history buffer. It extends Enumerable module, so it behaves
- * just like an array.
- * For example, gets the fifth content that the user input by
- * HISTORY[4].
- */
rb_define_const(mReadline, "HISTORY", history);
fcomp = rb_obj_alloc(rb_cObject);
rb_define_singleton_method(fcomp, "call",
filename_completion_proc_call, 1);
- /*
- * The Object with the call method that is a completion for filename.
- * This is sets by Readline.completion_proc= method.
- */
rb_define_const(mReadline, "FILENAME_COMPLETION_PROC", fcomp);
ucomp = rb_obj_alloc(rb_cObject);
rb_define_singleton_method(ucomp, "call",
username_completion_proc_call, 1);
- /*
- * The Object with the call method that is a completion for usernames.
- * This is sets by Readline.completion_proc= method.
- */
rb_define_const(mReadline, "USERNAME_COMPLETION_PROC", ucomp);
- history_get_offset_func = history_get_offset_history_base;
#if defined HAVE_RL_LIBRARY_VERSION
- version = rb_str_new_cstr(rl_library_version);
-#if defined HAVE_CLEAR_HISTORY || defined HAVE_REMOVE_HISTORY
- if (strncmp(rl_library_version, EDIT_LINE_LIBRARY_VERSION,
- strlen(EDIT_LINE_LIBRARY_VERSION)) == 0) {
- add_history("1");
- if (history_get(history_get_offset_func(0)) == NULL) {
- history_get_offset_func = history_get_offset_0;
- }
-#if !defined HAVE_CLEAR_HISTORY
- clear_history();
+ rb_define_const(mReadline, "VERSION", rb_str_new2(rl_library_version));
#else
- {
- HIST_ENTRY *entry = remove_history(0);
- if (entry) {
- free((char *)entry->line);
- free(entry);
- }
- }
+ rb_define_const(mReadline, "VERSION",
+ rb_str_new2("2.0 or before version"));
#endif
- }
-#endif
-#else
- version = rb_str_new_cstr("2.0 or prior version");
-#endif
- /* Version string of GNU Readline or libedit. */
- rb_define_const(mReadline, "VERSION", version);
rl_attempted_completion_function = readline_attempted_completion_function;
-#if defined HAVE_RL_GETC_FUNCTION
- rl_getc_function = readline_getc;
- id_getbyte = rb_intern_const("getbyte");
-#elif defined HAVE_RL_EVENT_HOOK
+#ifdef HAVE_RL_EVENT_HOOK
rl_event_hook = readline_event;
#endif
-#ifdef HAVE_RL_CATCH_SIGNALS
- rl_catch_signals = 0;
-#endif
-#ifdef HAVE_RL_CATCH_SIGWINCH
- rl_catch_sigwinch = 0;
-#endif
#ifdef HAVE_RL_CLEAR_SIGNALS
rl_clear_signals();
#endif
diff --git a/ext/ripper/.cvsignore b/ext/ripper/.cvsignore
deleted file mode 100644
index c9adce0b1a..0000000000
--- a/ext/ripper/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-Makefile
-mkmf.log
-eventids1.c
-eventids2table.c
-ripper.*
-ids1
-ids2
-extconf.h
diff --git a/ext/ripper/README b/ext/ripper/README
deleted file mode 100644
index 0825013ba9..0000000000
--- a/ext/ripper/README
+++ /dev/null
@@ -1,30 +0,0 @@
-Ripper README
-=============
-
- Ripper is a Ruby script parser. You can get information
- by event-based style from the parser.
-
- !! WARNING !!
-
- Ripper is still early-alpha version.
- I never assure any kind of backward compatibility.
-
-Requirements
-------------
-
- * ruby 1.9 (support CVS HEAD only)
- * bison 1.28 or later (Other yaccs do not work)
-
-Usage
------
-
- See test/ripper/* and sample/ripper/*.
-
-License
--------
-
- Ruby License.
-
- Minero Aoki
- aamine@loveruby.net
- http://i.loveruby.net
diff --git a/ext/ripper/depend b/ext/ripper/depend
deleted file mode 100644
index 306a75ca9e..0000000000
--- a/ext/ripper/depend
+++ /dev/null
@@ -1,41 +0,0 @@
-GEN = $(srcdir)/tools/generate.rb
-SRC1 = $(top_srcdir)/parse.y
-SRC2 = $(srcdir)/eventids2.c
-BISON = bison
-
-.SUFFIXES: .y
-
-src: ripper.c eventids1.c eventids2table.c
-
-ripper.o: ripper.c lex.c eventids1.c eventids2.c eventids2table.c \
- $(hdrdir)/ruby/ruby.h $(arch_hdrdir)/ruby/config.h \
- $(hdrdir)/ruby/defines.h $(hdrdir)/ruby/intern.h \
- $(hdrdir)/ruby/encoding.h $(hdrdir)/missing.h \
- $(hdrdir)/../node.h $(hdrdir)/oniguruma.h \
- $(hdrdir)/regex.h $(hdrdir)/st.h $(hdrdir)/util.h
-
-.y.c:
- $(BISON) -t -v -oy.tab.c $<
- sed -f $(top_srcdir)/tool/ytab.sed -e "/^#/s!y\.tab\.c!$@!" y.tab.c > $@
- @$(RM) y.tab.c
-
-all: check
-static: check
-
-ripper.y: $(srcdir)/tools/preproc.rb $(top_srcdir)/parse.y
- $(RUBY) $(srcdir)/tools/preproc.rb $(top_srcdir)/parse.y --output=$@
-
-check: $(GEN) $(SRC1) $(SRC2)
- $(RUBY) $(GEN) --mode=check --ids1src=$(SRC1) --ids2src=$(SRC2)
-
-eventids1.c: $(srcdir)/tools/generate.rb $(SRC1)
- $(RUBY) $(GEN) --mode=eventids1 --ids1src=$(SRC1) --output=$@
-
-eventids2table.c: $(srcdir)/tools/generate.rb $(SRC2)
- $(RUBY) $(GEN) --mode=eventids2table --ids2src=$(SRC2) --output=$@
-
-# Entries for Ripper maintainer
-
-preproc: ripper.E
-ripper.E: ripper.c
- $(CC) -E $(CPPFLAGS) ripper.c | $(RUBY) $(srcdir)/tools/strip.rb > $@
diff --git a/ext/ripper/eventids2.c b/ext/ripper/eventids2.c
deleted file mode 100644
index 8b0d9c3757..0000000000
--- a/ext/ripper/eventids2.c
+++ /dev/null
@@ -1,279 +0,0 @@
-#define tIGNORED_NL (tLAST_TOKEN + 1)
-#define tCOMMENT (tLAST_TOKEN + 2)
-#define tEMBDOC_BEG (tLAST_TOKEN + 3)
-#define tEMBDOC (tLAST_TOKEN + 4)
-#define tEMBDOC_END (tLAST_TOKEN + 5)
-#define tSP (tLAST_TOKEN + 6)
-#define tHEREDOC_BEG (tLAST_TOKEN + 7)
-#define tHEREDOC_END (tLAST_TOKEN + 8)
-#define k__END__ (tLAST_TOKEN + 9)
-
-static ID ripper_id_backref;
-static ID ripper_id_backtick;
-static ID ripper_id_comma;
-static ID ripper_id_const;
-static ID ripper_id_cvar;
-static ID ripper_id_embexpr_beg;
-static ID ripper_id_embexpr_end;
-static ID ripper_id_embvar;
-static ID ripper_id_float;
-static ID ripper_id_gvar;
-static ID ripper_id_ident;
-static ID ripper_id_int;
-static ID ripper_id_ivar;
-static ID ripper_id_kw;
-static ID ripper_id_lbrace;
-static ID ripper_id_lbracket;
-static ID ripper_id_lparen;
-static ID ripper_id_nl;
-static ID ripper_id_op;
-static ID ripper_id_period;
-static ID ripper_id_rbrace;
-static ID ripper_id_rbracket;
-static ID ripper_id_rparen;
-static ID ripper_id_semicolon;
-static ID ripper_id_symbeg;
-static ID ripper_id_tstring_beg;
-static ID ripper_id_tstring_content;
-static ID ripper_id_tstring_end;
-static ID ripper_id_words_beg;
-static ID ripper_id_qwords_beg;
-static ID ripper_id_words_sep;
-static ID ripper_id_regexp_beg;
-static ID ripper_id_regexp_end;
-static ID ripper_id_label;
-static ID ripper_id_tlambda;
-static ID ripper_id_tlambeg;
-
-static ID ripper_id_ignored_nl;
-static ID ripper_id_comment;
-static ID ripper_id_embdoc_beg;
-static ID ripper_id_embdoc;
-static ID ripper_id_embdoc_end;
-static ID ripper_id_sp;
-static ID ripper_id_heredoc_beg;
-static ID ripper_id_heredoc_end;
-static ID ripper_id___end__;
-static ID ripper_id_CHAR;
-
-#include "eventids2table.c"
-
-static void
-ripper_init_eventids2(VALUE self)
-{
- ripper_id_backref = rb_intern_const("on_backref");
- ripper_id_backtick = rb_intern_const("on_backtick");
- ripper_id_comma = rb_intern_const("on_comma");
- ripper_id_const = rb_intern_const("on_const");
- ripper_id_cvar = rb_intern_const("on_cvar");
- ripper_id_embexpr_beg = rb_intern_const("on_embexpr_beg");
- ripper_id_embexpr_end = rb_intern_const("on_embexpr_end");
- ripper_id_embvar = rb_intern_const("on_embvar");
- ripper_id_float = rb_intern_const("on_float");
- ripper_id_gvar = rb_intern_const("on_gvar");
- ripper_id_ident = rb_intern_const("on_ident");
- ripper_id_int = rb_intern_const("on_int");
- ripper_id_ivar = rb_intern_const("on_ivar");
- ripper_id_kw = rb_intern_const("on_kw");
- ripper_id_lbrace = rb_intern_const("on_lbrace");
- ripper_id_lbracket = rb_intern_const("on_lbracket");
- ripper_id_lparen = rb_intern_const("on_lparen");
- ripper_id_nl = rb_intern_const("on_nl");
- ripper_id_op = rb_intern_const("on_op");
- ripper_id_period = rb_intern_const("on_period");
- ripper_id_rbrace = rb_intern_const("on_rbrace");
- ripper_id_rbracket = rb_intern_const("on_rbracket");
- ripper_id_rparen = rb_intern_const("on_rparen");
- ripper_id_semicolon = rb_intern_const("on_semicolon");
- ripper_id_symbeg = rb_intern_const("on_symbeg");
- ripper_id_tstring_beg = rb_intern_const("on_tstring_beg");
- ripper_id_tstring_content = rb_intern_const("on_tstring_content");
- ripper_id_tstring_end = rb_intern_const("on_tstring_end");
- ripper_id_words_beg = rb_intern_const("on_words_beg");
- ripper_id_qwords_beg = rb_intern_const("on_qwords_beg");
- ripper_id_words_sep = rb_intern_const("on_words_sep");
- ripper_id_regexp_beg = rb_intern_const("on_regexp_beg");
- ripper_id_regexp_end = rb_intern_const("on_regexp_end");
- ripper_id_label = rb_intern_const("on_label");
- ripper_id_tlambda = rb_intern_const("on_tlambda");
- ripper_id_tlambeg = rb_intern_const("on_tlambeg");
-
- ripper_id_ignored_nl = rb_intern_const("on_ignored_nl");
- ripper_id_comment = rb_intern_const("on_comment");
- ripper_id_embdoc_beg = rb_intern_const("on_embdoc_beg");
- ripper_id_embdoc = rb_intern_const("on_embdoc");
- ripper_id_embdoc_end = rb_intern_const("on_embdoc_end");
- ripper_id_sp = rb_intern_const("on_sp");
- ripper_id_heredoc_beg = rb_intern_const("on_heredoc_beg");
- ripper_id_heredoc_end = rb_intern_const("on_heredoc_end");
- ripper_id___end__ = rb_intern_const("on___end__");
- ripper_id_CHAR = rb_intern_const("on_CHAR");
-
- ripper_init_eventids2_table(self);
-}
-
-static const struct token_assoc {
- int token;
- ID *id;
-} token_to_eventid[] = {
- {' ', &ripper_id_words_sep},
- {'!', &ripper_id_op},
- {'%', &ripper_id_op},
- {'&', &ripper_id_op},
- {'*', &ripper_id_op},
- {'+', &ripper_id_op},
- {'-', &ripper_id_op},
- {'/', &ripper_id_op},
- {'<', &ripper_id_op},
- {'=', &ripper_id_op},
- {'>', &ripper_id_op},
- {'?', &ripper_id_op},
- {'^', &ripper_id_op},
- {'|', &ripper_id_op},
- {'~', &ripper_id_op},
- {':', &ripper_id_op},
- {',', &ripper_id_comma},
- {'.', &ripper_id_period},
- {';', &ripper_id_semicolon},
- {'`', &ripper_id_backtick},
- {'\n', &ripper_id_nl},
- {keyword_alias, &ripper_id_kw},
- {keyword_and, &ripper_id_kw},
- {keyword_begin, &ripper_id_kw},
- {keyword_break, &ripper_id_kw},
- {keyword_case, &ripper_id_kw},
- {keyword_class, &ripper_id_kw},
- {keyword_def, &ripper_id_kw},
- {keyword_defined, &ripper_id_kw},
- {keyword_do, &ripper_id_kw},
- {keyword_do_block, &ripper_id_kw},
- {keyword_do_cond, &ripper_id_kw},
- {keyword_else, &ripper_id_kw},
- {keyword_elsif, &ripper_id_kw},
- {keyword_end, &ripper_id_kw},
- {keyword_ensure, &ripper_id_kw},
- {keyword_false, &ripper_id_kw},
- {keyword_for, &ripper_id_kw},
- {keyword_if, &ripper_id_kw},
- {modifier_if, &ripper_id_kw},
- {keyword_in, &ripper_id_kw},
- {keyword_module, &ripper_id_kw},
- {keyword_next, &ripper_id_kw},
- {keyword_nil, &ripper_id_kw},
- {keyword_not, &ripper_id_kw},
- {keyword_or, &ripper_id_kw},
- {keyword_redo, &ripper_id_kw},
- {keyword_rescue, &ripper_id_kw},
- {modifier_rescue, &ripper_id_kw},
- {keyword_retry, &ripper_id_kw},
- {keyword_return, &ripper_id_kw},
- {keyword_self, &ripper_id_kw},
- {keyword_super, &ripper_id_kw},
- {keyword_then, &ripper_id_kw},
- {keyword_true, &ripper_id_kw},
- {keyword_undef, &ripper_id_kw},
- {keyword_unless, &ripper_id_kw},
- {modifier_unless, &ripper_id_kw},
- {keyword_until, &ripper_id_kw},
- {modifier_until, &ripper_id_kw},
- {keyword_when, &ripper_id_kw},
- {keyword_while, &ripper_id_kw},
- {modifier_while, &ripper_id_kw},
- {keyword_yield, &ripper_id_kw},
- {keyword__FILE__, &ripper_id_kw},
- {keyword__LINE__, &ripper_id_kw},
- {keyword__ENCODING__, &ripper_id_kw},
- {keyword_BEGIN, &ripper_id_kw},
- {keyword_END, &ripper_id_kw},
- {keyword_do_LAMBDA, &ripper_id_kw},
- {tAMPER, &ripper_id_op},
- {tANDOP, &ripper_id_op},
- {tAREF, &ripper_id_op},
- {tASET, &ripper_id_op},
- {tASSOC, &ripper_id_op},
- {tBACK_REF, &ripper_id_backref},
- {tCHAR, &ripper_id_CHAR},
- {tCMP, &ripper_id_op},
- {tCOLON2, &ripper_id_op},
- {tCOLON3, &ripper_id_op},
- {tCONSTANT, &ripper_id_const},
- {tCVAR, &ripper_id_cvar},
- {tDOT2, &ripper_id_op},
- {tDOT3, &ripper_id_op},
- {tEQ, &ripper_id_op},
- {tEQQ, &ripper_id_op},
- {tFID, &ripper_id_ident},
- {tFLOAT, &ripper_id_float},
- {tGEQ, &ripper_id_op},
- {tGVAR, &ripper_id_gvar},
- {tIDENTIFIER, &ripper_id_ident},
- {tINTEGER, &ripper_id_int},
- {tIVAR, &ripper_id_ivar},
- {tLBRACE, &ripper_id_lbrace},
- {tLBRACE_ARG, &ripper_id_lbrace},
- {'{', &ripper_id_lbrace},
- {'}', &ripper_id_rbrace},
- {tLBRACK, &ripper_id_lbracket},
- {'[', &ripper_id_lbracket},
- {']', &ripper_id_rbracket},
- {tLEQ, &ripper_id_op},
- {tLPAREN, &ripper_id_lparen},
- {tLPAREN_ARG, &ripper_id_lparen},
- {'(', &ripper_id_lparen},
- {')', &ripper_id_rparen},
- {tLSHFT, &ripper_id_op},
- {tMATCH, &ripper_id_op},
- {tNEQ, &ripper_id_op},
- {tNMATCH, &ripper_id_op},
- {tNTH_REF, &ripper_id_backref},
- {tOP_ASGN, &ripper_id_op},
- {tOROP, &ripper_id_op},
- {tPOW, &ripper_id_op},
- {tQWORDS_BEG, &ripper_id_qwords_beg},
- {tREGEXP_BEG, &ripper_id_regexp_beg},
- {tREGEXP_END, &ripper_id_regexp_end},
- {tRPAREN, &ripper_id_rparen},
- {tRSHFT, &ripper_id_op},
- {tSTAR, &ripper_id_op},
- {tSTRING_BEG, &ripper_id_tstring_beg},
- {tSTRING_CONTENT, &ripper_id_tstring_content},
- {tSTRING_DBEG, &ripper_id_embexpr_beg},
- {tSTRING_DVAR, &ripper_id_embvar},
- {tSTRING_END, &ripper_id_tstring_end},
- {tSYMBEG, &ripper_id_symbeg},
- {tUMINUS, &ripper_id_op},
- {tUMINUS_NUM, &ripper_id_op},
- {tUPLUS, &ripper_id_op},
- {tWORDS_BEG, &ripper_id_words_beg},
- {tXSTRING_BEG, &ripper_id_backtick},
- {tLABEL, &ripper_id_label},
- {tLAMBDA, &ripper_id_tlambda},
- {tLAMBEG, &ripper_id_tlambeg},
-
- /* ripper specific tokens */
- {tIGNORED_NL, &ripper_id_ignored_nl},
- {tCOMMENT, &ripper_id_comment},
- {tEMBDOC_BEG, &ripper_id_embdoc_beg},
- {tEMBDOC, &ripper_id_embdoc},
- {tEMBDOC_END, &ripper_id_embdoc_end},
- {tSP, &ripper_id_sp},
- {tHEREDOC_BEG, &ripper_id_heredoc_beg},
- {tHEREDOC_END, &ripper_id_heredoc_end},
- {k__END__, &ripper_id___end__},
- {0, NULL}
-};
-
-static ID
-ripper_token2eventid(int tok)
-{
- const struct token_assoc *a;
-
- for (a = token_to_eventid; a->id != NULL; a++) {
- if (a->token == tok)
- return *a->id;
- }
- if (tok < 256) {
- return ripper_id_CHAR;
- }
- rb_raise(rb_eRuntimeError, "[Ripper FATAL] unknown token %d", tok);
-}
diff --git a/ext/ripper/extconf.rb b/ext/ripper/extconf.rb
deleted file mode 100644
index 4914d70e78..0000000000
--- a/ext/ripper/extconf.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-#!ruby -s
-
-require 'mkmf'
-require 'rbconfig'
-
-def main
- unless find_executable('bison')
- unless File.exist?('ripper.c') or File.exist?("#{$srcdir}/ripper.c")
- Logging.message 'missing bison; abort'
- return
- end
- end
- $objs = %w(ripper.o)
- $cleanfiles.concat %w(ripper.y ripper.c ripper.E ripper.output y.output eventids1.c eventids2table.c)
- $defs << '-DRIPPER'
- $defs << '-DRIPPER_DEBUG' if $debug
- $VPATH << '$(topdir)' << '$(top_srcdir)'
- $INCFLAGS << ' -I$(topdir) -I$(top_srcdir)'
- create_makefile 'ripper'
-end
-
-main
diff --git a/ext/ripper/lib/ripper.rb b/ext/ripper/lib/ripper.rb
deleted file mode 100644
index cb19da334a..0000000000
--- a/ext/ripper/lib/ripper.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require 'ripper/core'
-require 'ripper/lexer'
-require 'ripper/filter'
-require 'ripper/sexp'
diff --git a/ext/ripper/lib/ripper/core.rb b/ext/ripper/lib/ripper/core.rb
deleted file mode 100644
index 35aa54d090..0000000000
--- a/ext/ripper/lib/ripper/core.rb
+++ /dev/null
@@ -1,70 +0,0 @@
-#
-# $Id$
-#
-# Copyright (c) 2003-2005 Minero Aoki
-#
-# This program is free software.
-# You can distribute and/or modify this program under the Ruby License.
-# For details of Ruby License, see ruby/COPYING.
-#
-
-require 'ripper.so'
-
-class Ripper
-
- # Parses Ruby program read from _src_.
- # _src_ must be a String or a IO or a object which has #gets method.
- def Ripper.parse(src, filename = '(ripper)', lineno = 1)
- new(src, filename, lineno).parse
- end
-
- # This array contains name of parser events.
- PARSER_EVENTS = PARSER_EVENT_TABLE.keys
-
- # This array contains name of scanner events.
- SCANNER_EVENTS = SCANNER_EVENT_TABLE.keys
-
- # This array contains name of all ripper events.
- EVENTS = PARSER_EVENTS + SCANNER_EVENTS
-
- private
-
- #
- # Parser Events
- #
-
- PARSER_EVENT_TABLE.each do |id, arity|
- module_eval(<<-End, __FILE__, __LINE__ + 1)
- def on_#{id}(#{ ('a'..'z').to_a[0, arity].join(', ') })
- #{arity == 0 ? 'nil' : 'a'}
- end
- End
- end
-
- # This method is called when weak warning is produced by the parser.
- # _fmt_ and _args_ is printf style.
- def warn(fmt, *args)
- end
-
- # This method is called when strong warning is produced by the parser.
- # _fmt_ and _args_ is printf style.
- def warning(fmt, *args)
- end
-
- # This method is called when the parser found syntax error.
- def compile_error(msg)
- end
-
- #
- # Scanner Events
- #
-
- SCANNER_EVENTS.each do |id|
- module_eval(<<-End, __FILE__, __LINE__ + 1)
- def on_#{id}(token)
- token
- end
- End
- end
-
-end
diff --git a/ext/ripper/lib/ripper/filter.rb b/ext/ripper/lib/ripper/filter.rb
deleted file mode 100644
index 898501b23c..0000000000
--- a/ext/ripper/lib/ripper/filter.rb
+++ /dev/null
@@ -1,70 +0,0 @@
-#
-# $Id$
-#
-# Copyright (c) 2004,2005 Minero Aoki
-#
-# This program is free software.
-# You can distribute and/or modify this program under the Ruby License.
-# For details of Ruby License, see ruby/COPYING.
-#
-
-require 'ripper/lexer'
-
-class Ripper
-
- # This class handles only scanner events,
- # and they are dispatched in the `right' order (same with input).
- class Filter
-
- def initialize(src, filename = '-', lineno = 1)
- @__lexer = Lexer.new(src, filename, lineno)
- @__line = nil
- @__col = nil
- end
-
- # The file name of the input.
- def filename
- @__lexer.filename
- end
-
- # The line number of the current token.
- # This value starts from 1.
- # This method is valid only in event handlers.
- def lineno
- @__line
- end
-
- # The column number of the current token.
- # This value starts from 0.
- # This method is valid only in event handlers.
- def column
- @__col
- end
-
- # Starts parsing. _init_ is a data accumulator.
- # It is passed to the next event handler (as of Enumerable#inject).
- def parse(init = nil)
- data = init
- @__lexer.lex.each do |pos, event, tok|
- @__line, @__col = *pos
- data = if respond_to?(event, true)
- then __send__(event, tok, data)
- else on_default(event, tok, data)
- end
- end
- data
- end
-
- private
-
- # This method is called when some event handler have not defined.
- # _event_ is :on_XXX, _token_ is scanned token, _data_ is a data
- # accumulator. The return value of this method is passed to the
- # next event handler (as of Enumerable#inject).
- def on_default(event, token, data)
- data
- end
-
- end
-
-end
diff --git a/ext/ripper/lib/ripper/lexer.rb b/ext/ripper/lib/ripper/lexer.rb
deleted file mode 100644
index 5bbee39e06..0000000000
--- a/ext/ripper/lib/ripper/lexer.rb
+++ /dev/null
@@ -1,179 +0,0 @@
-#
-# $Id$
-#
-# Copyright (c) 2004,2005 Minero Aoki
-#
-# This program is free software.
-# You can distribute and/or modify this program under the Ruby License.
-# For details of Ruby License, see ruby/COPYING.
-#
-
-require 'ripper/core'
-
-class Ripper
-
- # Tokenizes Ruby program and returns an Array of String.
- def Ripper.tokenize(src, filename = '-', lineno = 1)
- Lexer.new(src, filename, lineno).tokenize
- end
-
- # Tokenizes Ruby program and returns an Array of Array,
- # which is formatted like [[lineno, column], type, token].
- #
- # require 'ripper'
- # require 'pp'
- #
- # p Ripper.lex("def m(a) nil end")
- # #=> [[[1, 0], :on_kw, "def"],
- # [[1, 3], :on_sp, " " ],
- # [[1, 4], :on_ident, "m" ],
- # [[1, 5], :on_lparen, "(" ],
- # [[1, 6], :on_ident, "a" ],
- # [[1, 7], :on_rparen, ")" ],
- # [[1, 8], :on_sp, " " ],
- # [[1, 9], :on_kw, "nil"],
- # [[1, 12], :on_sp, " " ],
- # [[1, 13], :on_kw, "end"]]
- #
- def Ripper.lex(src, filename = '-', lineno = 1)
- Lexer.new(src, filename, lineno).lex
- end
-
- class Lexer < ::Ripper #:nodoc: internal use only
- def tokenize
- lex().map {|pos, event, tok| tok }
- end
-
- def lex
- parse().sort_by {|pos, event, tok| pos }
- end
-
- def parse
- @buf = []
- super
- @buf
- end
-
- private
-
- SCANNER_EVENTS.each do |event|
- module_eval(<<-End, __FILE__+'/module_eval', __LINE__ + 1)
- def on_#{event}(tok)
- @buf.push [[lineno(), column()], :on_#{event}, tok]
- end
- End
- end
- end
-
- # [EXPERIMENTAL]
- # Parses +src+ and return a string which was matched to +pattern+.
- # +pattern+ should be described as Regexp.
- #
- # require 'ripper'
- #
- # p Ripper.slice('def m(a) nil end', 'ident') #=> "m"
- # p Ripper.slice('def m(a) nil end', '[ident lparen rparen]+') #=> "m(a)"
- # p Ripper.slice("<<EOS\nstring\nEOS",
- # 'heredoc_beg nl $(tstring_content*) heredoc_end', 1)
- # #=> "string\n"
- #
- def Ripper.slice(src, pattern, n = 0)
- if m = token_match(src, pattern)
- then m.string(n)
- else nil
- end
- end
-
- def Ripper.token_match(src, pattern) #:nodoc:
- TokenPattern.compile(pattern).match(src)
- end
-
- class TokenPattern #:nodoc:
-
- class Error < ::StandardError; end
- class CompileError < Error; end
- class MatchError < Error; end
-
- class << self
- alias compile new
- end
-
- def initialize(pattern)
- @source = pattern
- @re = compile(pattern)
- end
-
- def match(str)
- match_list(::Ripper.lex(str))
- end
-
- def match_list(tokens)
- if m = @re.match(map_tokens(tokens))
- then MatchData.new(tokens, m)
- else nil
- end
- end
-
- private
-
- def compile(pattern)
- if m = /[^\w\s$()\[\]{}?*+\.]/.match(pattern)
- raise CompileError, "invalid char in pattern: #{m[0].inspect}"
- end
- buf = ''
- pattern.scan(/(?:\w+|\$\(|[()\[\]\{\}?*+\.]+)/) do |tok|
- case tok
- when /\w/
- buf.concat map_token(tok)
- when '$('
- buf.concat '('
- when '('
- buf.concat '(?:'
- when /[?*\[\])\.]/
- buf.concat tok
- else
- raise 'must not happen'
- end
- end
- Regexp.compile(buf)
- rescue RegexpError => err
- raise CompileError, err.message
- end
-
- def map_tokens(tokens)
- tokens.map {|pos,type,str| map_token(type.to_s.sub(/\Aon_/,'')) }.join
- end
-
- MAP = {}
- seed = ('a'..'z').to_a + ('A'..'Z').to_a + ('0'..'9').to_a
- SCANNER_EVENT_TABLE.each do |ev, |
- raise CompileError, "[RIPPER FATAL] too many system token" if seed.empty?
- MAP[ev.to_s.sub(/\Aon_/,'')] = seed.shift
- end
-
- def map_token(tok)
- MAP[tok] or raise CompileError, "unknown token: #{tok}"
- end
-
- class MatchData
- def initialize(tokens, match)
- @tokens = tokens
- @match = match
- end
-
- def string(n = 0)
- return nil unless @match
- match(n).join
- end
-
- private
-
- def match(n = 0)
- return [] unless @match
- @tokens[@match.begin(n)...@match.end(n)].map {|pos,type,str| str }
- end
- end
-
- end
-
-end
diff --git a/ext/ripper/lib/ripper/sexp.rb b/ext/ripper/lib/ripper/sexp.rb
deleted file mode 100644
index f2260fe8dd..0000000000
--- a/ext/ripper/lib/ripper/sexp.rb
+++ /dev/null
@@ -1,99 +0,0 @@
-#
-# $Id$
-#
-# Copyright (c) 2004,2005 Minero Aoki
-#
-# This program is free software.
-# You can distribute and/or modify this program under the Ruby License.
-# For details of Ruby License, see ruby/COPYING.
-#
-
-require 'ripper/core'
-
-class Ripper
-
- # [EXPERIMENTAL]
- # Parses +src+ and create S-exp tree.
- # This method is for mainly developper use.
- #
- # require 'ripper'
- # require 'pp
- #
- # pp Ripper.sexp("def m(a) nil end")
- # #=> [:program,
- # [:stmts_add,
- # [:stmts_new],
- # [:def,
- # [:@ident, "m", [1, 4]],
- # [:paren, [:params, [[:@ident, "a", [1, 6]]], nil, nil, nil]],
- # [:bodystmt,
- # [:stmts_add, [:stmts_new], [:var_ref, [:@kw, "nil", [1, 9]]]],
- # nil,
- # nil,
- # nil]]]]
- #
- def Ripper.sexp(src, filename = '-', lineno = 1)
- SexpBuilderPP.new(src, filename, lineno).parse
- end
-
- def Ripper.sexp_raw(src, filename = '-', lineno = 1)
- SexpBuilder.new(src, filename, lineno).parse
- end
-
- class SexpBuilderPP < ::Ripper #:nodoc:
- private
-
- PARSER_EVENT_TABLE.each do |event, arity|
- if /_new\z/ =~ event.to_s and arity == 0
- module_eval(<<-End, __FILE__, __LINE__ + 1)
- def on_#{event}
- []
- end
- End
- elsif /_add\z/ =~ event.to_s
- module_eval(<<-End, __FILE__, __LINE__ + 1)
- def on_#{event}(list, item)
- list.push item
- list
- end
- End
- else
- module_eval(<<-End, __FILE__, __LINE__ + 1)
- def on_#{event}(*args)
- [:#{event}, *args]
- end
- End
- end
- end
-
- SCANNER_EVENTS.each do |event|
- module_eval(<<-End, __FILE__, __LINE__ + 1)
- def on_#{event}(tok)
- [:@#{event}, tok, [lineno(), column()]]
- end
- End
- end
- end
-
- class SexpBuilder < ::Ripper #:nodoc:
- private
-
- PARSER_EVENTS.each do |event|
- module_eval(<<-End, __FILE__, __LINE__ + 1)
- def on_#{event}(*args)
- args.unshift :#{event}
- args
- end
- End
- end
-
- SCANNER_EVENTS.each do |event|
- module_eval(<<-End, __FILE__, __LINE__ + 1)
- def on_#{event}(tok)
- [:@#{event}, tok, [lineno(), column()]]
- end
- End
- end
- end
-
-end
diff --git a/ext/ripper/tools/generate-param-macros.rb b/ext/ripper/tools/generate-param-macros.rb
deleted file mode 100755
index b19f6e8d5c..0000000000
--- a/ext/ripper/tools/generate-param-macros.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-off = true
-ARGF.each do |line|
- case line
- when /RIPPER_PARAMS_DECL_BEGIN/
- off = false
- when /RIPPER_PARAMS_DECL_END/
- exit
- when /ripper/
- next if off
- var = line.scan(/\w+/).last or next
- base = var.sub(/ripper_/, '')
- puts %"\#define #{base}\t\t(parser->ripper_#{base})"
- end
-end
diff --git a/ext/ripper/tools/generate.rb b/ext/ripper/tools/generate.rb
deleted file mode 100755
index 22c3ac0eb7..0000000000
--- a/ext/ripper/tools/generate.rb
+++ /dev/null
@@ -1,152 +0,0 @@
-# $Id$
-
-require 'optparse'
-
-def main
- mode = nil
- ids1src = nil
- ids2src = nil
- template = nil
- output = nil
-
- parser = @parser = OptionParser.new
- parser.banner = "Usage: #{File.basename($0)} --mode=MODE [--ids1src=PATH] [--ids2src=PATH] [--output=PATH]"
- parser.on('--mode=MODE', 'check, eventids1, or eventids2table.') {|m|
- mode = m
- }
- parser.on('--ids1src=PATH', 'A source file of event-IDs 1 (parse.y).') {|path|
- ids1src = path
- }
- parser.on('--ids2src=PATH', 'A source file of event-IDs 2 (eventids2.c).') {|path|
- ids2src = path
- }
- parser.on('--output=PATH', 'An output file.') {|path|
- output = path
- }
- parser.on('--help', 'Prints this message and quit.') {
- puts parser.help
- exit true
- }
- begin
- parser.parse!
- rescue OptionParser::ParseError => err
- usage err.message
- end
- usage 'no mode given' unless mode
- case mode
- when 'check'
- usage 'no --ids1src' unless ids1src
- usage 'no --ids2src' unless ids2src
- h = read_ids1_with_locations(ids1src)
- check_arity h
- ids2 = read_ids2(ids2src)
- common = h.keys & ids2
- unless common.empty?
- abort "event crash: #{common.join(' ')}"
- end
- exit 0
- when 'eventids1'
- usage 'no --ids1src' unless ids1src
- result = generate_eventids1(read_ids1(ids1src))
- when 'eventids2table'
- usage 'no --ids2src' unless ids2src
- result = generate_eventids2_table(read_ids2(ids2src))
- end
- if output
- File.open(output, 'w') {|f|
- f.write result
- }
- else
- puts result
- end
-end
-
-def usage(msg)
- $stderr.puts msg
- $stderr.puts @parser.help
- exit false
-end
-
-def generate_eventids1(ids)
- buf = ""
- ids.each do |id, arity|
- buf << %Q[static ID ripper_id_#{id};\n]
- end
- buf << %Q[\n]
- buf << %Q[static void\n]
- buf << %Q[ripper_init_eventids1(VALUE self)\n]
- buf << %Q[{\n]
- buf << %Q[ VALUE h;\n]
- buf << %Q[ ID id;\n]
- ids.each do |id, arity|
- buf << %Q[ ripper_id_#{id} = rb_intern_const("on_#{id}");\n]
- end
- buf << %Q[\n]
- buf << %Q[ h = rb_hash_new();\n]
- buf << %Q[ rb_define_const(self, "PARSER_EVENT_TABLE", h);\n]
- ids.each do |id, arity|
- buf << %Q[ id = rb_intern_const("#{id}");\n]
- buf << %Q[ rb_hash_aset(h, ID2SYM(id), INT2NUM(#{arity}));\n]
- end
- buf << %Q[}\n]
- buf
-end
-
-def generate_eventids2_table(ids)
- buf = ""
- buf << %Q[static void\n]
- buf << %Q[ripper_init_eventids2_table(VALUE self)\n]
- buf << %Q[{\n]
- buf << %Q[ VALUE h = rb_hash_new();\n]
- buf << %Q[ ID id;\n]
- buf << %Q[ rb_define_const(self, "SCANNER_EVENT_TABLE", h);\n]
- ids.each do |id|
- buf << %Q[ id = rb_intern_const("#{id}");\n]
- buf << %Q[ rb_hash_aset(h, ID2SYM(id), INT2NUM(1));\n]
- end
- buf << %Q[}\n]
- buf
-end
-
-def read_ids1(path)
- strip_locations(read_ids1_with_locations(path))
-end
-
-def strip_locations(h)
- h.map {|event, list| [event, list.first[1]] }\
- .sort_by {|event, arity| event.to_s }
-end
-
-def check_arity(h)
- invalid = false
- h.each do |event, list|
- unless list.map {|line, arity| arity }.uniq.size == 1
- invalid = true
- locations = list.map {|line, a| "#{line}:#{a}" }.join(', ')
- $stderr.puts "arity crash [event=#{event}]: #{locations}"
- end
- end
- abort if invalid
-end
-
-def read_ids1_with_locations(path)
- h = {}
- File.open(path) {|f|
- f.each do |line|
- next if /\A\#\s*define\s+s?dispatch/ =~ line
- next if /ripper_dispatch/ =~ line
- line.scan(/dispatch(\d)\((\w+)/) do |arity, event|
- (h[event] ||= []).push [f.lineno, arity.to_i]
- end
- end
- }
- h
-end
-
-def read_ids2(path)
- File.open(path) {|f|
- return f.read.scan(/ripper_id_(\w+)/).flatten.uniq.sort
- }
-end
-
-main
diff --git a/ext/ripper/tools/preproc.rb b/ext/ripper/tools/preproc.rb
deleted file mode 100755
index 06397cea05..0000000000
--- a/ext/ripper/tools/preproc.rb
+++ /dev/null
@@ -1,91 +0,0 @@
-# $Id$
-
-require 'optparse'
-
-def main
- output = nil
- parser = OptionParser.new
- parser.banner = "Usage: #{File.basename($0)} [--output=PATH] <parse.y>"
- parser.on('--output=PATH', 'An output file.') {|path|
- output = path
- }
- parser.on('--help', 'Prints this message and quit.') {
- puts parser.help
- exit true
- }
- begin
- parser.parse!
- rescue OptionParser::ParseError => err
- $stderr.puts err.message
- $stderr.puts parser.help
- exit false
- end
- unless ARGV.size == 1
- abort "wrong number of arguments (#{ARGV.size} for 1)"
- end
- out = ""
- File.open(ARGV[0]) {|f|
- prelude f, out
- grammar f, out
- usercode f, out
- }
- if output
- File.open(output, 'w') {|f|
- f.write out
- }
- else
- print out
- end
-end
-
-def prelude(f, out)
- while line = f.gets
- case line
- when %r</\*%%%\*/>
- out << '/*' << $/
- when %r</\*%>
- out << '*/' << $/
- when %r<%\*/>
- out << $/
- when /\A%%/
- out << '%%' << $/
- return
- when /\A%token/
- out << line.sub(/<\w+>/, '<val>')
- when /\A%type/
- out << line.sub(/<\w+>/, '<val>')
- else
- out << line
- end
- end
-end
-
-def grammar(f, out)
- while line = f.gets
- case line
- when %r</\*%%%\*/>
- out << '#if 0' << $/
- when %r</\*%c%\*/>
- out << '/*' << $/
- when %r</\*%c>
- out << '*/' << $/
- when %r</\*%>
- out << '#endif' << $/
- when %r<%\*/>
- out << $/
- when /\A%%/
- out << '%%' << $/
- return
- else
- out << line
- end
- end
-end
-
-def usercode(f, out)
- while line = f.gets
- out << line
- end
-end
-
-main
diff --git a/ext/ripper/tools/strip.rb b/ext/ripper/tools/strip.rb
deleted file mode 100755
index 99413c361d..0000000000
--- a/ext/ripper/tools/strip.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-last_is_void = false
-ARGF.each do |line|
- if line.strip.empty?
- #puts() unless last_is_void
- last_is_void = true
- elsif /\A\#/ === line
- ;
- else
- print line
- last_is_void = false
- end
-end
diff --git a/ext/sdbm/.cvsignore b/ext/sdbm/.cvsignore
index 814345ece8..4088712231 100644
--- a/ext/sdbm/.cvsignore
+++ b/ext/sdbm/.cvsignore
@@ -1,4 +1,3 @@
Makefile
mkmf.log
*.def
-extconf.h
diff --git a/ext/sdbm/_sdbm.c b/ext/sdbm/_sdbm.c
index b3a598dbc6..5b34824afc 100644
--- a/ext/sdbm/_sdbm.c
+++ b/ext/sdbm/_sdbm.c
@@ -12,8 +12,7 @@
#endif
#include "sdbm.h"
-#include "ruby/config.h"
-#include "ruby/defines.h"
+#include "config.h"
/*
* sdbm - ndbm work-alike hashed database library
@@ -104,7 +103,7 @@ static int duppair proto((char *, datum));
/*
* externals
*/
-#if !defined sun && !defined _WIN32 && !defined __CYGWIN__ && !defined(errno)
+#if !defined sun && !defined MSDOS && !defined _WIN32 && !defined __CYGWIN__ && !defined(errno)
extern int errno;
#endif
@@ -144,7 +143,10 @@ static long masks[] = {
datum nullitem = {NULL, 0};
DBM *
-sdbm_open(register char *file, register int flags, register int mode)
+sdbm_open(file, flags, mode)
+register char *file;
+register int flags;
+register int mode;
{
register DBM *db;
register char *dirname;
@@ -173,7 +175,11 @@ sdbm_open(register char *file, register int flags, register int mode)
}
DBM *
-sdbm_prep(char *dirname, char *pagname, int flags, int mode)
+sdbm_prep(dirname, pagname, flags, mode)
+char *dirname;
+char *pagname;
+int flags;
+int mode;
{
register DBM *db;
struct stat dstat;
@@ -229,7 +235,8 @@ sdbm_prep(char *dirname, char *pagname, int flags, int mode)
}
void
-sdbm_close(register DBM *db)
+sdbm_close(db)
+register DBM *db;
{
if (db == NULL)
errno = EINVAL;
@@ -241,7 +248,9 @@ sdbm_close(register DBM *db)
}
datum
-sdbm_fetch(register DBM *db, datum key)
+sdbm_fetch(db, key)
+register DBM *db;
+datum key;
{
if (db == NULL || bad(key))
return errno = EINVAL, nullitem;
@@ -253,7 +262,9 @@ sdbm_fetch(register DBM *db, datum key)
}
int
-sdbm_delete(register DBM *db, datum key)
+sdbm_delete(db, key)
+register DBM *db;
+datum key;
{
if (db == NULL || bad(key))
return errno = EINVAL, -1;
@@ -277,7 +288,11 @@ sdbm_delete(register DBM *db, datum key)
}
int
-sdbm_store(register DBM *db, datum key, datum val, int flags)
+sdbm_store(db, key, val, flags)
+register DBM *db;
+datum key;
+datum val;
+int flags;
{
int need;
register long hash;
@@ -335,11 +350,14 @@ sdbm_store(register DBM *db, datum key, datum val, int flags)
* giving up.
*/
static int
-makroom(register DBM *db, long int hash, int need)
+makroom(db, hash, need)
+register DBM *db;
+long hash;
+int need;
{
long newp;
char twin[PBLKSIZ];
-#if defined _WIN32 && !defined __CYGWIN__
+#if defined MSDOS || (defined _WIN32 && !defined __CYGWIN__)
char zer[PBLKSIZ];
long oldtail;
#endif
@@ -366,7 +384,7 @@ makroom(register DBM *db, long int hash, int need)
* here, as sdbm_store will do so, after it inserts the incoming pair.
*/
-#if defined _WIN32 && !defined __CYGWIN__
+#if defined MSDOS || (defined _WIN32 && !defined __CYGWIN__)
/*
* Fill hole with 0 if made it.
* (hole is NOT read as 0)
@@ -432,7 +450,8 @@ makroom(register DBM *db, long int hash, int need)
* deletions aren't taken into account. (ndbm bug)
*/
datum
-sdbm_firstkey(register DBM *db)
+sdbm_firstkey(db)
+register DBM *db;
{
if (db == NULL)
return errno = EINVAL, nullitem;
@@ -451,7 +470,8 @@ sdbm_firstkey(register DBM *db)
}
datum
-sdbm_nextkey(register DBM *db)
+sdbm_nextkey(db)
+register DBM *db;
{
if (db == NULL)
return errno = EINVAL, nullitem;
@@ -462,7 +482,9 @@ sdbm_nextkey(register DBM *db)
* all important binary trie traversal
*/
static int
-getpage(register DBM *db, register long int hash)
+getpage(db, hash)
+register DBM *db;
+register long hash;
{
register int hbit;
register long dbit;
@@ -504,7 +526,9 @@ getpage(register DBM *db, register long int hash)
}
static int
-getdbit(register DBM *db, register long int dbit)
+getdbit(db, dbit)
+register DBM *db;
+register long dbit;
{
register long c;
register long dirb;
@@ -525,7 +549,9 @@ getdbit(register DBM *db, register long int dbit)
}
static int
-setdbit(register DBM *db, register long int dbit)
+setdbit(db, dbit)
+register DBM *db;
+register long dbit;
{
register long c;
register long dirb;
@@ -559,7 +585,8 @@ setdbit(register DBM *db, register long int dbit)
* the page, try the next page in sequence
*/
static datum
-getnext(register DBM *db)
+getnext(db)
+register DBM *db;
{
datum key;
@@ -634,7 +661,9 @@ static int seepair proto((char *, int, char *, int));
*/
static int
-fitpair(char *pag, int need)
+fitpair(pag, need)
+char *pag;
+int need;
{
register int n;
register int off;
@@ -651,7 +680,10 @@ fitpair(char *pag, int need)
}
static void
-putpair(char *pag, datum key, datum val)
+putpair(pag, key, val)
+char *pag;
+datum key;
+datum val;
{
register int n;
register int off;
@@ -679,7 +711,9 @@ putpair(char *pag, datum key, datum val)
}
static datum
-getpair(char *pag, datum key)
+getpair(pag, key)
+char *pag;
+datum key;
{
register int i;
register int n;
@@ -699,7 +733,9 @@ getpair(char *pag, datum key)
#ifdef SEEDUPS
static int
-duppair(char *pag, datum key)
+duppair(pag, key)
+char *pag;
+datum key;
{
register short *ino = (short *) pag;
return GET_SHORT(ino,0) > 0 &&
@@ -708,7 +744,9 @@ duppair(char *pag, datum key)
#endif
static datum
-getnkey(char *pag, int num)
+getnkey(pag, num)
+char *pag;
+int num;
{
datum key;
register int off;
@@ -727,7 +765,9 @@ getnkey(char *pag, int num)
}
static int
-delpair(char *pag, datum key)
+delpair(pag, key)
+char *pag;
+datum key;
{
register int n;
register int i;
@@ -797,7 +837,11 @@ delpair(char *pag, datum key)
* return 0 if not found.
*/
static int
-seepair(char *pag, register int n, register char *key, register int siz)
+seepair(pag, n, key, siz)
+char *pag;
+register int n;
+register char *key;
+register int siz;
{
register int i;
register int off = PBLKSIZ;
@@ -813,7 +857,10 @@ seepair(char *pag, register int n, register char *key, register int siz)
}
static void
-splpage(char *pag, char *new, long int sbit)
+splpage(pag, new, sbit)
+char *pag;
+char *new;
+long sbit;
{
datum key;
datum val;
@@ -854,7 +901,8 @@ splpage(char *pag, char *new, long int sbit)
* this could be made more rigorous.
*/
static int
-chkpage(char *pag)
+chkpage(pag)
+char *pag;
{
register int n;
register int off;
@@ -894,7 +942,9 @@ chkpage(char *pag)
* 65587 even better.
*/
long
-sdbm_hash(register char *str, register int len)
+sdbm_hash(str, len)
+register char *str;
+register int len;
{
register unsigned long n = 0;
diff --git a/ext/sdbm/init.c b/ext/sdbm/init.c
index f630dc3cc9..acadc9b26a 100644
--- a/ext/sdbm/init.c
+++ b/ext/sdbm/init.c
@@ -3,6 +3,7 @@
sdbminit.c -
$Author$
+ $Date$
created at: Fri May 7 08:34:24 JST 1999
Copyright (C) 1995-2001 Yukihiro Matsumoto
@@ -40,15 +41,17 @@ closed_sdbm()
}
static void
-free_sdbm(struct dbmdata *dbmp)
+free_sdbm(dbmp)
+ struct dbmdata *dbmp;
{
if (dbmp->di_dbm) sdbm_close(dbmp->di_dbm);
- ruby_xfree(dbmp);
+ free(dbmp);
}
static VALUE
-fsdbm_close(VALUE obj)
+fsdbm_close(obj)
+ VALUE obj;
{
struct dbmdata *dbmp;
@@ -60,7 +63,8 @@ fsdbm_close(VALUE obj)
}
static VALUE
-fsdbm_closed(VALUE obj)
+fsdbm_closed(obj)
+ VALUE obj;
{
struct dbmdata *dbmp;
@@ -73,17 +77,21 @@ fsdbm_closed(VALUE obj)
return Qfalse;
}
+static VALUE fsdbm_alloc _((VALUE));
static VALUE
-fsdbm_alloc(VALUE klass)
+fsdbm_alloc(klass)
+ VALUE klass;
{
return Data_Wrap_Struct(klass, 0, free_sdbm, 0);
}
static VALUE
-fsdbm_initialize(int argc, VALUE *argv, VALUE obj)
+fsdbm_initialize(argc, argv, obj)
+ int argc;
+ VALUE *argv;
+ VALUE obj;
{
- volatile VALUE file;
- VALUE vmode;
+ VALUE file, vmode;
DBM *dbm;
struct dbmdata *dbmp;
int mode;
@@ -97,19 +105,19 @@ fsdbm_initialize(int argc, VALUE *argv, VALUE obj)
else {
mode = NUM2INT(vmode);
}
- FilePathValue(file);
+ SafeStringValue(file);
dbm = 0;
if (mode >= 0)
- dbm = sdbm_open(RSTRING_PTR(file), O_RDWR|O_CREAT, mode);
+ dbm = sdbm_open(RSTRING(file)->ptr, O_RDWR|O_CREAT, mode);
if (!dbm)
- dbm = sdbm_open(RSTRING_PTR(file), O_RDWR, 0);
+ dbm = sdbm_open(RSTRING(file)->ptr, O_RDWR, 0);
if (!dbm)
- dbm = sdbm_open(RSTRING_PTR(file), O_RDONLY, 0);
+ dbm = sdbm_open(RSTRING(file)->ptr, O_RDONLY, 0);
if (!dbm) {
if (mode == -1) return Qnil;
- rb_sys_fail(RSTRING_PTR(file));
+ rb_sys_fail(RSTRING(file)->ptr);
}
dbmp = ALLOC(struct dbmdata);
@@ -121,7 +129,10 @@ fsdbm_initialize(int argc, VALUE *argv, VALUE obj)
}
static VALUE
-fsdbm_s_open(int argc, VALUE *argv, VALUE klass)
+fsdbm_s_open(argc, argv, klass)
+ int argc;
+ VALUE *argv;
+ VALUE klass;
{
VALUE obj = Data_Wrap_Struct(klass, 0, free_sdbm, 0);
@@ -137,34 +148,39 @@ fsdbm_s_open(int argc, VALUE *argv, VALUE klass)
}
static VALUE
-fsdbm_fetch(VALUE obj, VALUE keystr, VALUE ifnone)
+fsdbm_fetch(obj, keystr, ifnone)
+ VALUE obj, keystr, ifnone;
{
datum key, value;
struct dbmdata *dbmp;
DBM *dbm;
- ExportStringValue(keystr);
- key.dptr = RSTRING_PTR(keystr);
- key.dsize = RSTRING_LEN(keystr);
+ StringValue(keystr);
+ key.dptr = RSTRING(keystr)->ptr;
+ key.dsize = RSTRING(keystr)->len;
GetDBM2(obj, dbmp, dbm);
value = sdbm_fetch(dbm, key);
if (value.dptr == 0) {
if (ifnone == Qnil && rb_block_given_p())
- return rb_yield(rb_external_str_new(key.dptr, key.dsize));
+ return rb_yield(rb_tainted_str_new(key.dptr, key.dsize));
return ifnone;
}
- return rb_external_str_new(value.dptr, value.dsize);
+ return rb_tainted_str_new(value.dptr, value.dsize);
}
static VALUE
-fsdbm_aref(VALUE obj, VALUE keystr)
+fsdbm_aref(obj, keystr)
+ VALUE obj, keystr;
{
return fsdbm_fetch(obj, keystr, Qnil);
}
static VALUE
-fsdbm_fetch_m(int argc, VALUE *argv, VALUE obj)
+fsdbm_fetch_m(argc, argv, obj)
+ int argc;
+ VALUE *argv;
+ VALUE obj;
{
VALUE keystr, valstr, ifnone;
@@ -177,59 +193,90 @@ fsdbm_fetch_m(int argc, VALUE *argv, VALUE obj)
}
static VALUE
-fsdbm_key(VALUE obj, VALUE valstr)
+fsdbm_index(obj, valstr)
+ VALUE obj, valstr;
{
datum key, val;
struct dbmdata *dbmp;
DBM *dbm;
- ExportStringValue(valstr);
- val.dptr = RSTRING_PTR(valstr);
- val.dsize = RSTRING_LEN(valstr);
+ StringValue(valstr);
+ val.dptr = RSTRING(valstr)->ptr;
+ val.dsize = RSTRING(valstr)->len;
GetDBM2(obj, dbmp, dbm);
for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
val = sdbm_fetch(dbm, key);
- if (val.dsize == RSTRING_LEN(valstr) &&
- memcmp(val.dptr, RSTRING_PTR(valstr), val.dsize) == 0)
- return rb_external_str_new(key.dptr, key.dsize);
+ if (val.dsize == RSTRING(valstr)->len &&
+ memcmp(val.dptr, RSTRING(valstr)->ptr, val.dsize) == 0)
+ return rb_tainted_str_new(key.dptr, key.dsize);
}
return Qnil;
}
static VALUE
-fsdbm_index(VALUE hash, VALUE value)
+fsdbm_indexes(argc, argv, obj)
+ int argc;
+ VALUE *argv;
+ VALUE obj;
{
- rb_warn("SDBM#index is deprecated; use SDBM#key");
- return fsdbm_key(hash, value);
+ VALUE new;
+ int i;
+
+ new = rb_ary_new2(argc);
+ for (i=0; i<argc; i++) {
+ rb_ary_push(new, fsdbm_fetch(obj, argv[i], Qnil));
+ }
+
+ return new;
}
static VALUE
-fsdbm_select(VALUE obj)
+fsdbm_select(argc, argv, obj)
+ int argc;
+ VALUE *argv;
+ VALUE obj;
{
- VALUE new = rb_ary_new();
- datum key, val;
- DBM *dbm;
- struct dbmdata *dbmp;
+ VALUE new = rb_ary_new2(argc);
+ int i;
- GetDBM2(obj, dbmp, dbm);
- for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
- VALUE assoc, v;
- val = sdbm_fetch(dbm, key);
- assoc = rb_assoc_new(rb_external_str_new(key.dptr, key.dsize),
- rb_external_str_new(val.dptr, val.dsize));
- v = rb_yield(assoc);
- if (RTEST(v)) {
- rb_ary_push(new, assoc);
+ if (rb_block_given_p()) {
+ datum key, val;
+ DBM *dbm;
+ struct dbmdata *dbmp;
+
+ if (argc > 0) {
+ rb_raise(rb_eArgError, "wrong number of arguments (%d for 0)", argc);
}
- GetDBM2(obj, dbmp, dbm);
+ GetDBM2(obj, dbmp, dbm);
+ for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
+ VALUE assoc, v;
+ val = sdbm_fetch(dbm, key);
+ assoc = rb_assoc_new(rb_tainted_str_new(key.dptr, key.dsize),
+ rb_tainted_str_new(val.dptr, val.dsize));
+ v = rb_yield(assoc);
+ if (RTEST(v)) {
+ rb_ary_push(new, assoc);
+ }
+ GetDBM2(obj, dbmp, dbm);
+ }
+ }
+ else {
+ rb_warn("SDBM#select(index..) is deprecated; use SDBM#values_at");
+
+ for (i=0; i<argc; i++) {
+ rb_ary_push(new, fsdbm_fetch(obj, argv[i], Qnil));
+ }
}
return new;
}
static VALUE
-fsdbm_values_at(int argc, VALUE *argv, VALUE obj)
+fsdbm_values_at(argc, argv, obj)
+ int argc;
+ VALUE *argv;
+ VALUE obj;
{
VALUE new = rb_ary_new2(argc);
int i;
@@ -242,14 +289,16 @@ fsdbm_values_at(int argc, VALUE *argv, VALUE obj)
}
static void
-fdbm_modify(VALUE obj)
+fdbm_modify(obj)
+ VALUE obj;
{
rb_secure(4);
if (OBJ_FROZEN(obj)) rb_error_frozen("SDBM");
}
static VALUE
-fsdbm_delete(VALUE obj, VALUE keystr)
+fsdbm_delete(obj, keystr)
+ VALUE obj, keystr;
{
datum key, value;
struct dbmdata *dbmp;
@@ -257,9 +306,9 @@ fsdbm_delete(VALUE obj, VALUE keystr)
VALUE valstr;
fdbm_modify(obj);
- ExportStringValue(keystr);
- key.dptr = RSTRING_PTR(keystr);
- key.dsize = RSTRING_LEN(keystr);
+ StringValue(keystr);
+ key.dptr = RSTRING(keystr)->ptr;
+ key.dsize = RSTRING(keystr)->len;
GetDBM2(obj, dbmp, dbm);
dbmp->di_size = -1;
@@ -271,7 +320,7 @@ fsdbm_delete(VALUE obj, VALUE keystr)
}
/* need to save value before sdbm_delete() */
- valstr = rb_external_str_new(value.dptr, value.dsize);
+ valstr = rb_tainted_str_new(value.dptr, value.dsize);
if (sdbm_delete(dbm, key)) {
dbmp->di_size = -1;
@@ -284,7 +333,8 @@ fsdbm_delete(VALUE obj, VALUE keystr)
}
static VALUE
-fsdbm_shift(VALUE obj)
+fsdbm_shift(obj)
+ VALUE obj;
{
datum key, val;
struct dbmdata *dbmp;
@@ -296,8 +346,8 @@ fsdbm_shift(VALUE obj)
key = sdbm_firstkey(dbm);
if (!key.dptr) return Qnil;
val = sdbm_fetch(dbm, key);
- keystr = rb_external_str_new(key.dptr, key.dsize);
- valstr = rb_external_str_new(val.dptr, val.dsize);
+ keystr = rb_tainted_str_new(key.dptr, key.dsize);
+ valstr = rb_tainted_str_new(val.dptr, val.dsize);
sdbm_delete(dbm, key);
if (dbmp->di_size >= 0) {
dbmp->di_size--;
@@ -307,7 +357,8 @@ fsdbm_shift(VALUE obj)
}
static VALUE
-fsdbm_delete_if(VALUE obj)
+fsdbm_delete_if(obj)
+ VALUE obj;
{
datum key, val;
struct dbmdata *dbmp;
@@ -322,31 +373,32 @@ fsdbm_delete_if(VALUE obj)
dbmp->di_size = -1;
for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
val = sdbm_fetch(dbm, key);
- keystr = rb_external_str_new(key.dptr, key.dsize);
- valstr = rb_external_str_new(val.dptr, val.dsize);
+ keystr = rb_tainted_str_new(key.dptr, key.dsize);
+ valstr = rb_tainted_str_new(val.dptr, val.dsize);
ret = rb_protect(rb_yield, rb_assoc_new(rb_str_dup(keystr), valstr), &status);
if (status != 0) break;
if (RTEST(ret)) rb_ary_push(ary, keystr);
GetDBM2(obj, dbmp, dbm);
}
- for (i = 0; i < RARRAY_LEN(ary); i++) {
- keystr = RARRAY_PTR(ary)[i];
- ExportStringValue(keystr);
- key.dptr = RSTRING_PTR(keystr);
- key.dsize = RSTRING_LEN(keystr);
+ for (i = 0; i < RARRAY(ary)->len; i++) {
+ keystr = RARRAY(ary)->ptr[i];
+ StringValue(keystr);
+ key.dptr = RSTRING(keystr)->ptr;
+ key.dsize = RSTRING(keystr)->len;
if (sdbm_delete(dbm, key)) {
rb_raise(rb_eDBMError, "sdbm_delete failed");
}
}
if (status) rb_jump_tag(status);
- if (n > 0) dbmp->di_size = n - RARRAY_LEN(ary);
+ if (n > 0) dbmp->di_size = n - RARRAY(ary)->len;
return obj;
}
static VALUE
-fsdbm_clear(VALUE obj)
+fsdbm_clear(obj)
+ VALUE obj;
{
datum key;
struct dbmdata *dbmp;
@@ -366,7 +418,8 @@ fsdbm_clear(VALUE obj)
}
static VALUE
-fsdbm_invert(VALUE obj)
+fsdbm_invert(obj)
+ VALUE obj;
{
datum key, val;
struct dbmdata *dbmp;
@@ -377,15 +430,56 @@ fsdbm_invert(VALUE obj)
GetDBM2(obj, dbmp, dbm);
for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
val = sdbm_fetch(dbm, key);
- keystr = rb_external_str_new(key.dptr, key.dsize);
- valstr = rb_external_str_new(val.dptr, val.dsize);
+ keystr = rb_tainted_str_new(key.dptr, key.dsize);
+ valstr = rb_tainted_str_new(val.dptr, val.dsize);
rb_hash_aset(hash, valstr, keystr);
}
return hash;
}
+static VALUE each_pair _((VALUE));
+
+static VALUE
+each_pair(obj)
+ VALUE obj;
+{
+ return rb_funcall(obj, rb_intern("each_pair"), 0, 0);
+}
+
+static VALUE fsdbm_store _((VALUE,VALUE,VALUE));
+
+static VALUE
+update_i(pair, dbm)
+ VALUE pair, dbm;
+{
+ Check_Type(pair, T_ARRAY);
+ if (RARRAY(pair)->len < 2) {
+ rb_raise(rb_eArgError, "pair must be [key, value]");
+ }
+ fsdbm_store(dbm, RARRAY(pair)->ptr[0], RARRAY(pair)->ptr[1]);
+ return Qnil;
+}
+
static VALUE
-fsdbm_store(VALUE obj, VALUE keystr, VALUE valstr)
+fsdbm_update(obj, other)
+ VALUE obj, other;
+{
+ rb_iterate(each_pair, other, update_i, obj);
+ return obj;
+}
+
+static VALUE
+fsdbm_replace(obj, other)
+ VALUE obj, other;
+{
+ fsdbm_clear(obj);
+ rb_iterate(each_pair, other, update_i, obj);
+ return obj;
+}
+
+static VALUE
+fsdbm_store(obj, keystr, valstr)
+ VALUE obj, keystr, valstr;
{
datum key, val;
struct dbmdata *dbmp;
@@ -397,14 +491,14 @@ fsdbm_store(VALUE obj, VALUE keystr, VALUE valstr)
}
fdbm_modify(obj);
- ExportStringValue(keystr);
- ExportStringValue(valstr);
+ StringValue(keystr);
+ StringValue(valstr);
- key.dptr = RSTRING_PTR(keystr);
- key.dsize = RSTRING_LEN(keystr);
+ key.dptr = RSTRING(keystr)->ptr;
+ key.dsize = RSTRING(keystr)->len;
- val.dptr = RSTRING_PTR(valstr);
- val.dsize = RSTRING_LEN(valstr);
+ val.dptr = RSTRING(valstr)->ptr;
+ val.dsize = RSTRING(valstr)->len;
GetDBM2(obj, dbmp, dbm);
dbmp->di_size = -1;
@@ -420,33 +514,8 @@ fsdbm_store(VALUE obj, VALUE keystr, VALUE valstr)
}
static VALUE
-update_i(VALUE pair, VALUE dbm)
-{
- Check_Type(pair, T_ARRAY);
- if (RARRAY_LEN(pair) < 2) {
- rb_raise(rb_eArgError, "pair must be [key, value]");
- }
- fsdbm_store(dbm, RARRAY_PTR(pair)[0], RARRAY_PTR(pair)[1]);
- return Qnil;
-}
-
-static VALUE
-fsdbm_update(VALUE obj, VALUE other)
-{
- rb_block_call(other, rb_intern("each_pair"), 0, 0, update_i, obj);
- return obj;
-}
-
-static VALUE
-fsdbm_replace(VALUE obj, VALUE other)
-{
- fsdbm_clear(obj);
- rb_block_call(other, rb_intern("each_pair"), 0, 0, update_i, obj);
- return obj;
-}
-
-static VALUE
-fsdbm_length(VALUE obj)
+fsdbm_length(obj)
+ VALUE obj;
{
datum key;
struct dbmdata *dbmp;
@@ -465,7 +534,8 @@ fsdbm_length(VALUE obj)
}
static VALUE
-fsdbm_empty_p(VALUE obj)
+fsdbm_empty_p(obj)
+ VALUE obj;
{
datum key;
struct dbmdata *dbmp;
@@ -488,55 +558,52 @@ fsdbm_empty_p(VALUE obj)
}
static VALUE
-fsdbm_each_value(VALUE obj)
+fsdbm_each_value(obj)
+ VALUE obj;
{
datum key, val;
struct dbmdata *dbmp;
DBM *dbm;
- RETURN_ENUMERATOR(obj, 0, 0);
-
GetDBM2(obj, dbmp, dbm);
for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
val = sdbm_fetch(dbm, key);
- rb_yield(rb_external_str_new(val.dptr, val.dsize));
+ rb_yield(rb_tainted_str_new(val.dptr, val.dsize));
GetDBM2(obj, dbmp, dbm);
}
return obj;
}
static VALUE
-fsdbm_each_key(VALUE obj)
+fsdbm_each_key(obj)
+ VALUE obj;
{
datum key;
struct dbmdata *dbmp;
DBM *dbm;
- RETURN_ENUMERATOR(obj, 0, 0);
-
GetDBM2(obj, dbmp, dbm);
for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
- rb_yield(rb_external_str_new(key.dptr, key.dsize));
+ rb_yield(rb_tainted_str_new(key.dptr, key.dsize));
GetDBM2(obj, dbmp, dbm);
}
return obj;
}
static VALUE
-fsdbm_each_pair(VALUE obj)
+fsdbm_each_pair(obj)
+ VALUE obj;
{
datum key, val;
DBM *dbm;
struct dbmdata *dbmp;
VALUE keystr, valstr;
- RETURN_ENUMERATOR(obj, 0, 0);
-
GetDBM2(obj, dbmp, dbm);
for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
val = sdbm_fetch(dbm, key);
- keystr = rb_external_str_new(key.dptr, key.dsize);
- valstr = rb_external_str_new(val.dptr, val.dsize);
+ keystr = rb_tainted_str_new(key.dptr, key.dsize);
+ valstr = rb_tainted_str_new(val.dptr, val.dsize);
rb_yield(rb_assoc_new(keystr, valstr));
GetDBM2(obj, dbmp, dbm);
}
@@ -545,7 +612,8 @@ fsdbm_each_pair(VALUE obj)
}
static VALUE
-fsdbm_keys(VALUE obj)
+fsdbm_keys(obj)
+ VALUE obj;
{
datum key;
struct dbmdata *dbmp;
@@ -555,14 +623,15 @@ fsdbm_keys(VALUE obj)
GetDBM2(obj, dbmp, dbm);
ary = rb_ary_new();
for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
- rb_ary_push(ary, rb_external_str_new(key.dptr, key.dsize));
+ rb_ary_push(ary, rb_tainted_str_new(key.dptr, key.dsize));
}
return ary;
}
static VALUE
-fsdbm_values(VALUE obj)
+fsdbm_values(obj)
+ VALUE obj;
{
datum key, val;
struct dbmdata *dbmp;
@@ -573,22 +642,23 @@ fsdbm_values(VALUE obj)
ary = rb_ary_new();
for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
val = sdbm_fetch(dbm, key);
- rb_ary_push(ary, rb_external_str_new(val.dptr, val.dsize));
+ rb_ary_push(ary, rb_tainted_str_new(val.dptr, val.dsize));
}
return ary;
}
static VALUE
-fsdbm_has_key(VALUE obj, VALUE keystr)
+fsdbm_has_key(obj, keystr)
+ VALUE obj, keystr;
{
datum key, val;
struct dbmdata *dbmp;
DBM *dbm;
- ExportStringValue(keystr);
- key.dptr = RSTRING_PTR(keystr);
- key.dsize = RSTRING_LEN(keystr);
+ StringValue(keystr);
+ key.dptr = RSTRING(keystr)->ptr;
+ key.dsize = RSTRING(keystr)->len;
GetDBM2(obj, dbmp, dbm);
val = sdbm_fetch(dbm, key);
@@ -597,28 +667,30 @@ fsdbm_has_key(VALUE obj, VALUE keystr)
}
static VALUE
-fsdbm_has_value(VALUE obj, VALUE valstr)
+fsdbm_has_value(obj, valstr)
+ VALUE obj, valstr;
{
datum key, val;
struct dbmdata *dbmp;
DBM *dbm;
- ExportStringValue(valstr);
- val.dptr = RSTRING_PTR(valstr);
- val.dsize = RSTRING_LEN(valstr);
+ StringValue(valstr);
+ val.dptr = RSTRING(valstr)->ptr;
+ val.dsize = RSTRING(valstr)->len;
GetDBM2(obj, dbmp, dbm);
for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
val = sdbm_fetch(dbm, key);
- if (val.dsize == RSTRING_LEN(valstr) &&
- memcmp(val.dptr, RSTRING_PTR(valstr), val.dsize) == 0)
+ if (val.dsize == RSTRING(valstr)->len &&
+ memcmp(val.dptr, RSTRING(valstr)->ptr, val.dsize) == 0)
return Qtrue;
}
return Qfalse;
}
static VALUE
-fsdbm_to_a(VALUE obj)
+fsdbm_to_a(obj)
+ VALUE obj;
{
datum key, val;
struct dbmdata *dbmp;
@@ -629,15 +701,16 @@ fsdbm_to_a(VALUE obj)
ary = rb_ary_new();
for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
val = sdbm_fetch(dbm, key);
- rb_ary_push(ary, rb_assoc_new(rb_external_str_new(key.dptr, key.dsize),
- rb_external_str_new(val.dptr, val.dsize)));
+ rb_ary_push(ary, rb_assoc_new(rb_tainted_str_new(key.dptr, key.dsize),
+ rb_tainted_str_new(val.dptr, val.dsize)));
}
return ary;
}
static VALUE
-fsdbm_to_hash(VALUE obj)
+fsdbm_to_hash(obj)
+ VALUE obj;
{
datum key, val;
struct dbmdata *dbmp;
@@ -648,15 +721,16 @@ fsdbm_to_hash(VALUE obj)
hash = rb_hash_new();
for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
val = sdbm_fetch(dbm, key);
- rb_hash_aset(hash, rb_external_str_new(key.dptr, key.dsize),
- rb_external_str_new(val.dptr, val.dsize));
+ rb_hash_aset(hash, rb_tainted_str_new(key.dptr, key.dsize),
+ rb_tainted_str_new(val.dptr, val.dsize));
}
return hash;
}
static VALUE
-fsdbm_reject(VALUE obj)
+fsdbm_reject(obj)
+ VALUE obj;
{
return rb_hash_delete_if(fsdbm_to_hash(obj));
}
@@ -679,8 +753,9 @@ Init_sdbm()
rb_define_method(rb_cDBM, "[]=", fsdbm_store, 2);
rb_define_method(rb_cDBM, "store", fsdbm_store, 2);
rb_define_method(rb_cDBM, "index", fsdbm_index, 1);
- rb_define_method(rb_cDBM, "key", fsdbm_key, 1);
- rb_define_method(rb_cDBM, "select", fsdbm_select, 0);
+ rb_define_method(rb_cDBM, "indexes", fsdbm_indexes, -1);
+ rb_define_method(rb_cDBM, "indices", fsdbm_indexes, -1);
+ rb_define_method(rb_cDBM, "select", fsdbm_select, -1);
rb_define_method(rb_cDBM, "values_at", fsdbm_values_at, -1);
rb_define_method(rb_cDBM, "length", fsdbm_length, 0);
rb_define_method(rb_cDBM, "size", fsdbm_length, 0);
diff --git a/ext/sdbm/sdbm.h b/ext/sdbm/sdbm.h
index 0c7ed1ba9b..ce8f54c4d4 100644
--- a/ext/sdbm/sdbm.h
+++ b/ext/sdbm/sdbm.h
@@ -52,7 +52,7 @@ typedef struct {
extern datum nullitem;
-#if defined(__STDC__)
+#if defined(__STDC__) || defined(MSDOS)
#define proto(p) p
#else
#define proto(p) ()
diff --git a/ext/socket/.cvsignore b/ext/socket/.cvsignore
index ce98586d91..4088712231 100644
--- a/ext/socket/.cvsignore
+++ b/ext/socket/.cvsignore
@@ -1,5 +1,3 @@
Makefile
mkmf.log
*.def
-constants.h
-extconf.h
diff --git a/ext/socket/addrinfo.h b/ext/socket/addrinfo.h
index 171d3c2ce7..e93adafba6 100644
--- a/ext/socket/addrinfo.h
+++ b/ext/socket/addrinfo.h
@@ -50,7 +50,6 @@
#undef AI_PASSIVE
#undef AI_CANONNAME
#undef AI_NUMERICHOST
-#undef AI_NUMERICSERV
#undef AI_ALL
#undef AI_ADDRCONFIG
#undef AI_V4MAPPED
@@ -108,11 +107,8 @@
#define AI_PASSIVE 0x00000001 /* get address to use bind() */
#define AI_CANONNAME 0x00000002 /* fill ai_canonname */
#define AI_NUMERICHOST 0x00000004 /* prevent name resolution */
-#define AI_NUMERICSERV 0x00000008 /* prevent service name resolution */
/* valid flags for addrinfo */
-#ifndef __HAIKU__
-#define AI_MASK (AI_PASSIVE | AI_CANONNAME | AI_NUMERICHOST | AI_NUMERICSERV)
-#endif
+#define AI_MASK (AI_PASSIVE | AI_CANONNAME | AI_NUMERICHOST)
#define AI_ALL 0x00000100 /* IPv6 and IPv4-mapped (with AI_V4MAPPED) */
#define AI_V4MAPPED_CFG 0x00000200 /* accept IPv4-mapped if kernel supports */
@@ -168,9 +164,7 @@ extern void freeaddrinfo __P((struct addrinfo *));
#if defined __UCLIBC__
const
#endif
-#ifndef __HAIKU__
extern char *gai_strerror __P((int));
-#endif
/* In case there is no definition of offsetof() provided - though any proper
Standard C system should have one. */
diff --git a/ext/socket/ancdata.c b/ext/socket/ancdata.c
deleted file mode 100644
index e4b616767a..0000000000
--- a/ext/socket/ancdata.c
+++ /dev/null
@@ -1,1808 +0,0 @@
-#include "rubysocket.h"
-
-#include <time.h>
-
-#if defined(HAVE_ST_MSG_CONTROL)
-static VALUE rb_cAncillaryData;
-
-static VALUE
-constant_to_sym(int constant, ID (*intern_const)(int))
-{
- ID name = intern_const(constant);
- if (name) {
- return ID2SYM(name);
- }
-
- return INT2NUM(constant);
-}
-
-static VALUE
-ip_cmsg_type_to_sym(int level, int cmsg_type)
-{
- switch (level) {
- case SOL_SOCKET:
- return constant_to_sym(cmsg_type, rsock_intern_scm_optname);
- case IPPROTO_IP:
- return constant_to_sym(cmsg_type, rsock_intern_ip_optname);
-#ifdef IPPROTO_IPV6
- case IPPROTO_IPV6:
- return constant_to_sym(cmsg_type, rsock_intern_ipv6_optname);
-#endif
- case IPPROTO_TCP:
- return constant_to_sym(cmsg_type, rsock_intern_tcp_optname);
- case IPPROTO_UDP:
- return constant_to_sym(cmsg_type, rsock_intern_udp_optname);
- default:
- return INT2NUM(cmsg_type);
- }
-}
-
-/*
- * call-seq:
- * Socket::AncillaryData.new(family, cmsg_level, cmsg_type, cmsg_data) -> ancillarydata
- *
- * _family_ should be an integer, a string or a symbol.
- * - Socket::AF_INET, "AF_INET", "INET", :AF_INET, :INET
- * - Socket::AF_UNIX, "AF_UNIX", "UNIX", :AF_UNIX, :UNIX
- * - etc.
- *
- * _cmsg_level_ should be an integer, a string or a symbol.
- * - Socket::SOL_SOCKET, "SOL_SOCKET", "SOCKET", :SOL_SOCKET and :SOCKET
- * - Socket::IPPROTO_IP, "IP" and :IP
- * - Socket::IPPROTO_IPV6, "IPV6" and :IPV6
- * - Socket::IPPROTO_TCP, "TCP" and :TCP
- * - etc.
- *
- * _cmsg_type_ should be an integer, a string or a symbol.
- * If a string/symbol is specified, it is interepreted depend on _cmsg_level_.
- * - Socket::SCM_RIGHTS, "SCM_RIGHTS", "RIGHTS", :SCM_RIGHTS, :RIGHTS for SOL_SOCKET
- * - Socket::IP_RECVTTL, "RECVTTL" and :RECVTTL for IPPROTO_IP
- * - Socket::IPV6_PKTINFO, "PKTINFO" and :PKTINFO for IPPROTO_IPV6
- * - etc.
- *
- * _cmsg_data_ should be a string.
- *
- * p Socket::AncillaryData.new(:INET, :TCP, :NODELAY, "")
- * #=> #<Socket::AncillaryData: INET TCP NODELAY "">
- *
- * p Socket::AncillaryData.new(:INET6, :IPV6, :PKTINFO, "")
- * #=> #<Socket::AncillaryData: INET6 IPV6 PKTINFO "">
- *
- */
-static VALUE
-ancillary_initialize(VALUE self, VALUE vfamily, VALUE vlevel, VALUE vtype, VALUE data)
-{
- int family = rsock_family_arg(vfamily);
- int level = rsock_level_arg(family, vlevel);
- int type = rsock_cmsg_type_arg(family, level, vtype);
- StringValue(data);
- rb_ivar_set(self, rb_intern("family"), INT2NUM(family));
- rb_ivar_set(self, rb_intern("level"), INT2NUM(level));
- rb_ivar_set(self, rb_intern("type"), INT2NUM(type));
- rb_ivar_set(self, rb_intern("data"), data);
- return self;
-}
-
-static VALUE
-ancdata_new(int family, int level, int type, VALUE data)
-{
- NEWOBJ(obj, struct RObject);
- OBJSETUP(obj, rb_cAncillaryData, T_OBJECT);
- StringValue(data);
- ancillary_initialize((VALUE)obj, INT2NUM(family), INT2NUM(level), INT2NUM(type), data);
- return (VALUE)obj;
-}
-
-static int
-ancillary_family(VALUE self)
-{
- VALUE v = rb_attr_get(self, rb_intern("family"));
- return NUM2INT(v);
-}
-
-/*
- * call-seq:
- * ancillarydata.family => integer
- *
- * returns the socket family as an integer.
- *
- * p Socket::AncillaryData.new(:INET6, :IPV6, :PKTINFO, "").family
- * #=> 10
- */
-static VALUE
-ancillary_family_m(VALUE self)
-{
- return INT2NUM(ancillary_family(self));
-}
-
-static int
-ancillary_level(VALUE self)
-{
- VALUE v = rb_attr_get(self, rb_intern("level"));
- return NUM2INT(v);
-}
-
-/*
- * call-seq:
- * ancillarydata.level => integer
- *
- * returns the cmsg level as an integer.
- *
- * p Socket::AncillaryData.new(:INET6, :IPV6, :PKTINFO, "").level
- * #=> 41
- */
-static VALUE
-ancillary_level_m(VALUE self)
-{
- return INT2NUM(ancillary_level(self));
-}
-
-static int
-ancillary_type(VALUE self)
-{
- VALUE v = rb_attr_get(self, rb_intern("type"));
- return NUM2INT(v);
-}
-
-/*
- * call-seq:
- * ancillarydata.type => integer
- *
- * returns the cmsg type as an integer.
- *
- * p Socket::AncillaryData.new(:INET6, :IPV6, :PKTINFO, "").type
- * #=> 2
- */
-static VALUE
-ancillary_type_m(VALUE self)
-{
- return INT2NUM(ancillary_type(self));
-}
-
-/*
- * call-seq:
- * ancillarydata.data => string
- *
- * returns the cmsg data as a string.
- *
- * p Socket::AncillaryData.new(:INET6, :IPV6, :PKTINFO, "").data
- * #=> ""
- */
-static VALUE
-ancillary_data(VALUE self)
-{
- VALUE v = rb_attr_get(self, rb_intern("data"));
- StringValue(v);
- return v;
-}
-
-#ifdef SCM_RIGHTS
-/*
- * call-seq:
- * Socket::AncillaryData.unix_rights(io1, io2, ...) => ancillarydata
- *
- * Creates a new Socket::AncillaryData object which contains file descriptors as data.
- *
- * p Socket::AncillaryData.unix_rights(STDERR)
- * #=> #<Socket::AncillaryData: UNIX SOCKET RIGHTS 2>
- */
-static VALUE
-ancillary_s_unix_rights(int argc, VALUE *argv, VALUE klass)
-{
- VALUE result, str, ary;
- int i;
-
- ary = rb_ary_new();
-
- for (i = 0 ; i < argc; i++) {
- VALUE obj = argv[i];
- if (TYPE(obj) != T_FILE) {
- rb_raise(rb_eTypeError, "IO expected");
- }
- rb_ary_push(ary, obj);
- }
-
- str = rb_str_buf_new(sizeof(int) * argc);
-
- for (i = 0 ; i < argc; i++) {
- VALUE obj = RARRAY_PTR(ary)[i];
- rb_io_t *fptr;
- int fd;
- GetOpenFile(obj, fptr);
- fd = fptr->fd;
- rb_str_buf_cat(str, (char *)&fd, sizeof(int));
- }
-
- result = ancdata_new(AF_UNIX, SOL_SOCKET, SCM_RIGHTS, str);
- rb_ivar_set(result, rb_intern("unix_rights"), ary);
- return result;
-}
-#else
-#define ancillary_s_unix_rights rb_f_notimplement
-#endif
-
-#ifdef SCM_RIGHTS
-/*
- * call-seq:
- * ancillarydata.unix_rights => array-of-IOs or nil
- *
- * returns the array of IO objects for SCM_RIGHTS control message in UNIX domain socket.
- *
- * The class of the IO objects in the array is IO or Socket.
- *
- * The array is attached to _ancillarydata_ when it is instantiated.
- * For example, BasicSocket#recvmsg attach the array when
- * receives a SCM_RIGHTS control message and :scm_rights=>true option is given.
- *
- * # recvmsg needs :scm_rights=>true for unix_rights
- * s1, s2 = UNIXSocket.pair
- * p s1 #=> #<UNIXSocket:fd 3>
- * s1.sendmsg "stdin and a socket", 0, nil, [:SOCKET, :RIGHTS, [0,s1.fileno].pack("ii")]
- * _, _, _, ctl = s2.recvmsg(:scm_rights=>true)
- * p ctl.unix_rights #=> [#<IO:fd 6>, #<Socket:fd 7>]
- * p File.identical?(STDIN, ctl.unix_rights[0]) #=> true
- * p File.identical?(s1, ctl.unix_rights[1]) #=> true
- *
- * # If :scm_rights=>true is not given, unix_rights returns nil
- * s1, s2 = UNIXSocket.pair
- * s1.sendmsg "stdin and a socket", 0, nil, [:SOCKET, :RIGHTS, [0,s1.fileno].pack("ii")]
- * _, _, _, ctl = s2.recvmsg
- * p ctl #=> #<Socket::AncillaryData: UNIX SOCKET RIGHTS 6 7>
- * p ctl.unix_rights #=> nil
- *
- */
-static VALUE
-ancillary_unix_rights(VALUE self)
-{
- int level, type;
-
- level = ancillary_level(self);
- type = ancillary_type(self);
-
- if (level != SOL_SOCKET || type != SCM_RIGHTS)
- rb_raise(rb_eTypeError, "SCM_RIGHTS ancillary data expected");
-
- VALUE v = rb_attr_get(self, rb_intern("unix_rights"));
- return v;
-}
-#else
-#define ancillary_unix_rights rb_f_notimplement
-#endif
-
-#if defined(SCM_TIMESTAMP) || defined(SCM_TIMESTAMPNS) || defined(SCM_BINTIME)
-/*
- * call-seq:
- * ancillarydata.timestamp => time
- *
- * returns the timestamp as a time object.
- *
- * _ancillarydata_ should be one of following type:
- * - SOL_SOCKET/SCM_TIMESTAMP (micro second) GNU/Linux, FreeBSD, NetBSD, OpenBSD, Solaris, MacOS X
- * - SOL_SOCKET/SCM_TIMESTAMPNS (nano second) GNU/Linux
- * - SOL_SOCKET/SCM_BINTIME (2**(-64) second) FreeBSD
- *
- * Addrinfo.udp("127.0.0.1", 0).bind {|s1|
- * Addrinfo.udp("127.0.0.1", 0).bind {|s2|
- * s1.setsockopt(:SOCKET, :TIMESTAMP, true)
- * s2.send "a", 0, s1.local_address
- * ctl = s1.recvmsg.last
- * p ctl #=> #<Socket::AncillaryData: INET SOCKET TIMESTAMP 2009-02-24 17:35:46.775581>
- * t = ctl.timestamp
- * p t #=> 2009-02-24 17:35:46 +0900
- * p t.usec #=> 775581
- * p t.nsec #=> 775581000
- * }
- * }
- *
- */
-static VALUE
-ancillary_timestamp(VALUE self)
-{
- int level, type;
- VALUE data;
- VALUE result = Qnil;
-
- level = ancillary_level(self);
- type = ancillary_type(self);
- data = ancillary_data(self);
-
-# ifdef SCM_TIMESTAMP
- if (level == SOL_SOCKET && type == SCM_TIMESTAMP &&
- RSTRING_LEN(data) == sizeof(struct timeval)) {
- struct timeval tv;
- memcpy((char*)&tv, RSTRING_PTR(data), sizeof(tv));
- result = rb_time_new(tv.tv_sec, tv.tv_usec);
- }
-# endif
-
-# ifdef SCM_TIMESTAMPNS
- if (level == SOL_SOCKET && type == SCM_TIMESTAMPNS &&
- RSTRING_LEN(data) == sizeof(struct timespec)) {
- struct timespec ts;
- memcpy((char*)&ts, RSTRING_PTR(data), sizeof(ts));
- result = rb_time_nano_new(ts.tv_sec, ts.tv_nsec);
- }
-# endif
-
-#define add(x,y) (rb_funcall((x), '+', 1, (y)))
-#define mul(x,y) (rb_funcall((x), '*', 1, (y)))
-#define quo(x,y) (rb_funcall((x), rb_intern("quo"), 1, (y)))
-
-# ifdef SCM_BINTIME
- if (level == SOL_SOCKET && type == SCM_BINTIME &&
- RSTRING_LEN(data) == sizeof(struct bintime)) {
- struct bintime bt;
- VALUE d, timev;
- memcpy((char*)&bt, RSTRING_PTR(data), sizeof(bt));
- d = ULL2NUM(0x100000000UL);
- d = mul(d,d);
- timev = add(TIMET2NUM(bt.sec), quo(ULL2NUM(bt.frac), d));
- result = rb_time_num_new(timev, Qnil);
- }
-# endif
-
- if (result == Qnil)
- rb_raise(rb_eTypeError, "timestamp ancillary data expected");
-
- return result;
-}
-#else
-#define ancillary_timestamp rb_f_notimplement
-#endif
-
-/*
- * call-seq:
- * Socket::AncillaryData.int(family, cmsg_level, cmsg_type, integer) => ancillarydata
- *
- * Creates a new Socket::AncillaryData object which contains a int as data.
- *
- * The size and endian is dependent on the host.
- *
- * p Socket::AncillaryData.int(:UNIX, :SOCKET, :RIGHTS, STDERR.fileno)
- * #=> #<Socket::AncillaryData: UNIX SOCKET RIGHTS 2>
- */
-static VALUE
-ancillary_s_int(VALUE klass, VALUE vfamily, VALUE vlevel, VALUE vtype, VALUE integer)
-{
- int family = rsock_family_arg(vfamily);
- int level = rsock_level_arg(family, vlevel);
- int type = rsock_cmsg_type_arg(family, level, vtype);
- int i = NUM2INT(integer);
- return ancdata_new(family, level, type, rb_str_new((char*)&i, sizeof(i)));
-}
-
-/*
- * call-seq:
- * ancillarydata.int => integer
- *
- * Returns the data in _ancillarydata_ as an int.
- *
- * The size and endian is dependent on the host.
- *
- * ancdata = Socket::AncillaryData.int(:UNIX, :SOCKET, :RIGHTS, STDERR.fileno)
- * p ancdata.int #=> 2
- */
-static VALUE
-ancillary_int(VALUE self)
-{
- VALUE data;
- int i;
- data = ancillary_data(self);
- if (RSTRING_LEN(data) != sizeof(int))
- rb_raise(rb_eTypeError, "size differ. expected as sizeof(int)=%d but %ld", (int)sizeof(int), (long)RSTRING_LEN(data));
- memcpy((char*)&i, RSTRING_PTR(data), sizeof(int));
- return INT2NUM(i);
-}
-
-#if defined(IPPROTO_IP) && defined(IP_PKTINFO) && defined(HAVE_TYPE_STRUCT_IN_PKTINFO) && defined(HAVE_IPI_SPEC_DST) /* GNU/Linux */
-/*
- * call-seq:
- * Socket::AncillaryData.ip_pktinfo(addr, ifindex) => ancdata
- * Socket::AncillaryData.ip_pktinfo(addr, ifindex, spec_dst) => ancdata
- *
- * Returns new ancillary data for IP_PKTINFO.
- *
- * If spec_dst is not given, addr is used.
- *
- * IP_PKTINFO is not standard.
- *
- * Supported platform: GNU/Linux
- *
- * addr = Addrinfo.ip("127.0.0.1")
- * ifindex = 0
- * spec_dst = Addrinfo.ip("127.0.0.1")
- * p Socket::AncillaryData.ip_pktinfo(addr, ifindex, spec_dst)
- * #=> #<Socket::AncillaryData: INET IP PKTINFO 127.0.0.1 ifindex:0 spec_dst:127.0.0.1>
- *
- */
-static VALUE
-ancillary_s_ip_pktinfo(int argc, VALUE *argv, VALUE self)
-{
- VALUE v_addr, v_ifindex, v_spec_dst;
- unsigned int ifindex;
- struct sockaddr_in sa;
- struct in_pktinfo pktinfo;
-
- rb_scan_args(argc, argv, "21", &v_addr, &v_ifindex, &v_spec_dst);
-
- SockAddrStringValue(v_addr);
- ifindex = NUM2UINT(v_ifindex);
- if (NIL_P(v_spec_dst))
- v_spec_dst = v_addr;
- else
- SockAddrStringValue(v_spec_dst);
-
- memset(&pktinfo, 0, sizeof(pktinfo));
-
- memset(&sa, 0, sizeof(sa));
- if (RSTRING_LEN(v_addr) != sizeof(sa))
- rb_raise(rb_eArgError, "addr size different to AF_INET sockaddr");
- memcpy(&sa, RSTRING_PTR(v_addr), sizeof(sa));
- if (sa.sin_family != AF_INET)
- rb_raise(rb_eArgError, "addr is not AF_INET sockaddr");
- memcpy(&pktinfo.ipi_addr, &sa.sin_addr, sizeof(pktinfo.ipi_addr));
-
- pktinfo.ipi_ifindex = ifindex;
-
- memset(&sa, 0, sizeof(sa));
- if (RSTRING_LEN(v_spec_dst) != sizeof(sa))
- rb_raise(rb_eArgError, "spec_dat size different to AF_INET sockaddr");
- memcpy(&sa, RSTRING_PTR(v_spec_dst), sizeof(sa));
- if (sa.sin_family != AF_INET)
- rb_raise(rb_eArgError, "spec_dst is not AF_INET sockaddr");
- memcpy(&pktinfo.ipi_spec_dst, &sa.sin_addr, sizeof(pktinfo.ipi_spec_dst));
-
- return ancdata_new(AF_INET, IPPROTO_IP, IP_PKTINFO, rb_str_new((char *)&pktinfo, sizeof(pktinfo)));
-}
-#else
-#define ancillary_s_ip_pktinfo rb_f_notimplement
-#endif
-
-#if defined(IPPROTO_IP) && defined(IP_PKTINFO) && defined(HAVE_TYPE_STRUCT_IN_PKTINFO) && defined(HAVE_IPI_SPEC_DST) /* GNU/Linux */
-/*
- * call-seq:
- * ancdata.ip_pktinfo => [addr, ifindex, spec_dst]
- *
- * Extracts addr, ifindex and spec_dst from IP_PKTINFO ancillary data.
- *
- * IP_PKTINFO is not standard.
- *
- * Supported platform: GNU/Linux
- *
- * addr = Addrinfo.ip("127.0.0.1")
- * ifindex = 0
- * spec_dest = Addrinfo.ip("127.0.0.1")
- * ancdata = Socket::AncillaryData.ip_pktinfo(addr, ifindex, spec_dest)
- * p ancdata.ip_pktinfo
- * #=> [#<Addrinfo: 127.0.0.1>, 0, #<Addrinfo: 127.0.0.1>]
- *
- *
- */
-static VALUE
-ancillary_ip_pktinfo(VALUE self)
-{
- int level, type;
- VALUE data;
- struct in_pktinfo pktinfo;
- struct sockaddr_in sa;
- VALUE v_spec_dst, v_addr;
-
- level = ancillary_level(self);
- type = ancillary_type(self);
- data = ancillary_data(self);
-
- if (level != IPPROTO_IP || type != IP_PKTINFO ||
- RSTRING_LEN(data) != sizeof(struct in_pktinfo)) {
- rb_raise(rb_eTypeError, "IP_PKTINFO ancillary data expected");
- }
-
- memcpy(&pktinfo, RSTRING_PTR(data), sizeof(struct in_pktinfo));
- memset(&sa, 0, sizeof(sa));
-
- sa.sin_family = AF_INET;
- memcpy(&sa.sin_addr, &pktinfo.ipi_addr, sizeof(sa.sin_addr));
- v_addr = rsock_addrinfo_new((struct sockaddr *)&sa, sizeof(sa), PF_INET, 0, 0, Qnil, Qnil);
-
- sa.sin_family = AF_INET;
- memcpy(&sa.sin_addr, &pktinfo.ipi_spec_dst, sizeof(sa.sin_addr));
- v_spec_dst = rsock_addrinfo_new((struct sockaddr *)&sa, sizeof(sa), PF_INET, 0, 0, Qnil, Qnil);
-
- return rb_ary_new3(3, v_addr, UINT2NUM(pktinfo.ipi_ifindex), v_spec_dst);
-}
-#else
-#define ancillary_ip_pktinfo rb_f_notimplement
-#endif
-
-#if defined(IPPROTO_IPV6) && defined(IPV6_PKTINFO) /* IPv6 RFC3542 */
-/*
- * call-seq:
- * Socket::AncillaryData.ipv6_pktinfo(addr, ifindex) => ancdata
- *
- * Returns new ancillary data for IPV6_PKTINFO.
- *
- * IPV6_PKTINFO is defined by RFC 3542.
- *
- * addr = Addrinfo.ip("::1")
- * ifindex = 0
- * p Socket::AncillaryData.ipv6_pktinfo(addr, ifindex)
- * #=> #<Socket::AncillaryData: INET6 IPV6 PKTINFO ::1 ifindex:0>
- *
- */
-static VALUE
-ancillary_s_ipv6_pktinfo(VALUE self, VALUE v_addr, VALUE v_ifindex)
-{
- unsigned int ifindex;
- struct sockaddr_in6 sa;
- struct in6_pktinfo pktinfo;
-
- SockAddrStringValue(v_addr);
- ifindex = NUM2UINT(v_ifindex);
-
- memset(&pktinfo, 0, sizeof(pktinfo));
-
- memset(&sa, 0, sizeof(sa));
- if (RSTRING_LEN(v_addr) != sizeof(sa))
- rb_raise(rb_eArgError, "addr size different to AF_INET6 sockaddr");
- memcpy(&sa, RSTRING_PTR(v_addr), sizeof(sa));
- if (sa.sin6_family != AF_INET6)
- rb_raise(rb_eArgError, "addr is not AF_INET6 sockaddr");
- memcpy(&pktinfo.ipi6_addr, &sa.sin6_addr, sizeof(pktinfo.ipi6_addr));
-
- pktinfo.ipi6_ifindex = ifindex;
-
- return ancdata_new(AF_INET6, IPPROTO_IPV6, IPV6_PKTINFO, rb_str_new((char *)&pktinfo, sizeof(pktinfo)));
-}
-#else
-#define ancillary_s_ipv6_pktinfo rb_f_notimplement
-#endif
-
-#if defined(IPPROTO_IPV6) && defined(IPV6_PKTINFO) /* IPv6 RFC3542 */
-static void
-extract_ipv6_pktinfo(VALUE self, struct in6_pktinfo *pktinfo_ptr, struct sockaddr_in6 *sa_ptr)
-{
- int level, type;
- VALUE data;
-
- level = ancillary_level(self);
- type = ancillary_type(self);
- data = ancillary_data(self);
-
- if (level != IPPROTO_IPV6 || type != IPV6_PKTINFO ||
- RSTRING_LEN(data) != sizeof(struct in6_pktinfo)) {
- rb_raise(rb_eTypeError, "IPV6_PKTINFO ancillary data expected");
- }
-
- memcpy(pktinfo_ptr, RSTRING_PTR(data), sizeof(*pktinfo_ptr));
-
- memset(sa_ptr, 0, sizeof(*sa_ptr));
- SET_SA_LEN((struct sockaddr *)sa_ptr, sizeof(struct sockaddr_in6));
- sa_ptr->sin6_family = AF_INET6;
- memcpy(&sa_ptr->sin6_addr, &pktinfo_ptr->ipi6_addr, sizeof(sa_ptr->sin6_addr));
- if (IN6_IS_ADDR_LINKLOCAL(&sa_ptr->sin6_addr))
- sa_ptr->sin6_scope_id = pktinfo_ptr->ipi6_ifindex;
-}
-#endif
-
-#if defined(IPPROTO_IPV6) && defined(IPV6_PKTINFO) /* IPv6 RFC3542 */
-/*
- * call-seq:
- * ancdata.ipv6_pktinfo => [addr, ifindex]
- *
- * Extracts addr and ifindex from IPV6_PKTINFO ancillary data.
- *
- * IPV6_PKTINFO is defined by RFC 3542.
- *
- * addr = Addrinfo.ip("::1")
- * ifindex = 0
- * ancdata = Socket::AncillaryData.ipv6_pktinfo(addr, ifindex)
- * p ancdata.ipv6_pktinfo #=> [#<Addrinfo: ::1>, 0]
- *
- */
-static VALUE
-ancillary_ipv6_pktinfo(VALUE self)
-{
- struct in6_pktinfo pktinfo;
- struct sockaddr_in6 sa;
- VALUE v_addr;
-
- extract_ipv6_pktinfo(self, &pktinfo, &sa);
- v_addr = rsock_addrinfo_new((struct sockaddr *)&sa, sizeof(sa), PF_INET6, 0, 0, Qnil, Qnil);
- return rb_ary_new3(2, v_addr, UINT2NUM(pktinfo.ipi6_ifindex));
-}
-#else
-#define ancillary_ipv6_pktinfo rb_f_notimplement
-#endif
-
-#if defined(IPPROTO_IPV6) && defined(IPV6_PKTINFO) /* IPv6 RFC3542 */
-/*
- * call-seq:
- * ancdata.ipv6_pktinfo_addr => addr
- *
- * Extracts addr from IPV6_PKTINFO ancillary data.
- *
- * IPV6_PKTINFO is defined by RFC 3542.
- *
- * addr = Addrinfo.ip("::1")
- * ifindex = 0
- * ancdata = Socket::AncillaryData.ipv6_pktinfo(addr, ifindex)
- * p ancdata.ipv6_pktinfo_addr #=> #<Addrinfo: ::1>
- *
- */
-static VALUE
-ancillary_ipv6_pktinfo_addr(VALUE self)
-{
- struct in6_pktinfo pktinfo;
- struct sockaddr_in6 sa;
- extract_ipv6_pktinfo(self, &pktinfo, &sa);
- return rsock_addrinfo_new((struct sockaddr *)&sa, sizeof(sa), PF_INET6, 0, 0, Qnil, Qnil);
-}
-#else
-#define ancillary_ipv6_pktinfo_addr rb_f_notimplement
-#endif
-
-#if defined(IPPROTO_IPV6) && defined(IPV6_PKTINFO) /* IPv6 RFC3542 */
-/*
- * call-seq:
- * ancdata.ipv6_pktinfo_ifindex => addr
- *
- * Extracts ifindex from IPV6_PKTINFO ancillary data.
- *
- * IPV6_PKTINFO is defined by RFC 3542.
- *
- * addr = Addrinfo.ip("::1")
- * ifindex = 0
- * ancdata = Socket::AncillaryData.ipv6_pktinfo(addr, ifindex)
- * p ancdata.ipv6_pktinfo_ifindex #=> 0
- *
- */
-static VALUE
-ancillary_ipv6_pktinfo_ifindex(VALUE self)
-{
- struct in6_pktinfo pktinfo;
- struct sockaddr_in6 sa;
- extract_ipv6_pktinfo(self, &pktinfo, &sa);
- return UINT2NUM(pktinfo.ipi6_ifindex);
-}
-#else
-#define ancillary_ipv6_pktinfo_ifindex rb_f_notimplement
-#endif
-
-#if defined(SOL_SOCKET) && defined(SCM_RIGHTS) /* 4.4BSD */
-static int
-anc_inspect_socket_rights(int level, int type, VALUE data, VALUE ret)
-{
- if (level == SOL_SOCKET && type == SCM_RIGHTS &&
- 0 < RSTRING_LEN(data) && (RSTRING_LEN(data) % sizeof(int) == 0)) {
- long off;
- for (off = 0; off < RSTRING_LEN(data); off += sizeof(int)) {
- int fd;
- memcpy((char*)&fd, RSTRING_PTR(data)+off, sizeof(int));
- rb_str_catf(ret, " %d", fd);
- }
- return 1;
- }
- else {
- return 0;
- }
-}
-#endif
-
-#if defined(SCM_CREDENTIALS) /* GNU/Linux */
-static int
-anc_inspect_passcred_credentials(int level, int type, VALUE data, VALUE ret)
-{
- if (level == SOL_SOCKET && type == SCM_CREDENTIALS &&
- RSTRING_LEN(data) == sizeof(struct ucred)) {
- struct ucred cred;
- memcpy(&cred, RSTRING_PTR(data), sizeof(struct ucred));
- rb_str_catf(ret, " pid=%u uid=%u gid=%u", cred.pid, cred.uid, cred.gid);
- rb_str_cat2(ret, " (ucred)");
- return 1;
- }
- else {
- return 0;
- }
-}
-#endif
-
-#if defined(SCM_CREDS)
-#define INSPECT_SCM_CREDS
-static int
-anc_inspect_socket_creds(int level, int type, VALUE data, VALUE ret)
-{
- if (level != SOL_SOCKET && type != SCM_CREDS)
- return 0;
-
- /*
- * FreeBSD has struct cmsgcred and struct sockcred.
- * They use both SOL_SOCKET/SCM_CREDS in the ancillary message.
- * They are not ambiguous from the view of the caller
- * because struct sockcred is sent if and only if the caller sets LOCAL_CREDS socket option.
- * But inspect method doesn't know it.
- * So they are ambiguous from the view of inspect.
- * This function distinguish them by the size of the ancillary message.
- * This heuristics works well except when sc_ngroups == CMGROUP_MAX.
- */
-
-#if defined(HAVE_TYPE_STRUCT_CMSGCRED) /* FreeBSD */
- if (RSTRING_LEN(data) == sizeof(struct cmsgcred)) {
- struct cmsgcred cred;
- memcpy(&cred, RSTRING_PTR(data), sizeof(struct cmsgcred));
- rb_str_catf(ret, " pid=%u", cred.cmcred_pid);
- rb_str_catf(ret, " uid=%u", cred.cmcred_uid);
- rb_str_catf(ret, " euid=%u", cred.cmcred_euid);
- rb_str_catf(ret, " gid=%u", cred.cmcred_gid);
- if (cred.cmcred_ngroups) {
- int i;
- const char *sep = " groups=";
- for (i = 0; i < cred.cmcred_ngroups; i++) {
- rb_str_catf(ret, "%s%u", sep, cred.cmcred_groups[i]);
- sep = ",";
- }
- }
- rb_str_cat2(ret, " (cmsgcred)");
- return 1;
- }
-#endif
-#if defined(HAVE_TYPE_STRUCT_SOCKCRED) /* FreeBSD, NetBSD */
- if ((size_t)RSTRING_LEN(data) >= SOCKCREDSIZE(0)) {
- struct sockcred cred0, *cred;
- memcpy(&cred0, RSTRING_PTR(data), SOCKCREDSIZE(0));
- if ((size_t)RSTRING_LEN(data) == SOCKCREDSIZE(cred0.sc_ngroups)) {
- cred = (struct sockcred *)ALLOCA_N(char, SOCKCREDSIZE(cred0.sc_ngroups));
- memcpy(cred, RSTRING_PTR(data), SOCKCREDSIZE(cred0.sc_ngroups));
- rb_str_catf(ret, " uid=%u", cred->sc_uid);
- rb_str_catf(ret, " euid=%u", cred->sc_euid);
- rb_str_catf(ret, " gid=%u", cred->sc_gid);
- rb_str_catf(ret, " egid=%u", cred->sc_egid);
- if (cred0.sc_ngroups) {
- int i;
- const char *sep = " groups=";
- for (i = 0; i < cred0.sc_ngroups; i++) {
- rb_str_catf(ret, "%s%u", sep, cred->sc_groups[i]);
- sep = ",";
- }
- }
- rb_str_cat2(ret, " (sockcred)");
- return 1;
- }
- }
-#endif
- return 0;
-}
-#endif
-
-#if defined(IPPROTO_IP) && defined(IP_RECVDSTADDR) /* 4.4BSD */
-static int
-anc_inspect_ip_recvdstaddr(int level, int type, VALUE data, VALUE ret)
-{
- if (level == IPPROTO_IP && type == IP_RECVDSTADDR &&
- RSTRING_LEN(data) == sizeof(struct in_addr)) {
- struct in_addr addr;
- char addrbuf[INET_ADDRSTRLEN];
- memcpy(&addr, RSTRING_PTR(data), sizeof(addr));
- if (inet_ntop(AF_INET, &addr, addrbuf, sizeof(addrbuf)) == NULL)
- rb_str_cat2(ret, " invalid-address");
- else
- rb_str_catf(ret, " %s", addrbuf);
- return 1;
- }
- else {
- return 0;
- }
-}
-#endif
-
-#if defined(IPPROTO_IP) && defined(IP_PKTINFO) && defined(HAVE_TYPE_STRUCT_IN_PKTINFO) && defined(HAVE_IPI_SPEC_DST) /* GNU/Linux */
-static int
-anc_inspect_ip_pktinfo(int level, int type, VALUE data, VALUE ret)
-{
- if (level == IPPROTO_IP && type == IP_PKTINFO &&
- RSTRING_LEN(data) == sizeof(struct in_pktinfo)) {
- struct in_pktinfo pktinfo;
- char buf[INET_ADDRSTRLEN > IFNAMSIZ ? INET_ADDRSTRLEN : IFNAMSIZ];
- memcpy(&pktinfo, RSTRING_PTR(data), sizeof(pktinfo));
- if (inet_ntop(AF_INET, &pktinfo.ipi_addr, buf, sizeof(buf)) == NULL)
- rb_str_cat2(ret, " invalid-address");
- else
- rb_str_catf(ret, " %s", buf);
- if (if_indextoname(pktinfo.ipi_ifindex, buf) == NULL)
- rb_str_catf(ret, " ifindex:%d", pktinfo.ipi_ifindex);
- else
- rb_str_catf(ret, " %s", buf);
- if (inet_ntop(AF_INET, &pktinfo.ipi_spec_dst, buf, sizeof(buf)) == NULL)
- rb_str_cat2(ret, " spec_dst:invalid-address");
- else
- rb_str_catf(ret, " spec_dst:%s", buf);
- return 1;
- }
- else {
- return 0;
- }
-}
-#endif
-
-#if defined(IPPROTO_IPV6) && defined(IPV6_PKTINFO) && defined(HAVE_TYPE_STRUCT_IN6_PKTINFO) /* IPv6 RFC3542 */
-static int
-anc_inspect_ipv6_pktinfo(int level, int type, VALUE data, VALUE ret)
-{
- if (level == IPPROTO_IPV6 && type == IPV6_PKTINFO &&
- RSTRING_LEN(data) == sizeof(struct in6_pktinfo)) {
- struct in6_pktinfo *pktinfo = (struct in6_pktinfo *)RSTRING_PTR(data);
- struct in6_addr addr;
- unsigned int ifindex;
- char addrbuf[INET6_ADDRSTRLEN], ifbuf[IFNAMSIZ];
- memcpy(&addr, &pktinfo->ipi6_addr, sizeof(addr));
- memcpy(&ifindex, &pktinfo->ipi6_ifindex, sizeof(ifindex));
- if (inet_ntop(AF_INET6, &addr, addrbuf, sizeof(addrbuf)) == NULL)
- rb_str_cat2(ret, " invalid-address");
- else
- rb_str_catf(ret, " %s", addrbuf);
- if (if_indextoname(ifindex, ifbuf) == NULL)
- rb_str_catf(ret, " ifindex:%d", ifindex);
- else
- rb_str_catf(ret, " %s", ifbuf);
- return 1;
- }
- else {
- return 0;
- }
-}
-#endif
-
-#if defined(SCM_TIMESTAMP) /* GNU/Linux, FreeBSD, NetBSD, OpenBSD, MacOS X, Solaris */
-static int
-inspect_timeval_as_abstime(int level, int optname, VALUE data, VALUE ret)
-{
- if (RSTRING_LEN(data) == sizeof(struct timeval)) {
- struct timeval tv;
- time_t time;
- struct tm tm;
- char buf[32];
- memcpy((char*)&tv, RSTRING_PTR(data), sizeof(tv));
- time = tv.tv_sec;
- tm = *localtime(&time);
- strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", &tm);
- rb_str_catf(ret, " %s.%06ld", buf, (long)tv.tv_usec);
- return 1;
- }
- else {
- return 0;
- }
-}
-#endif
-
-#if defined(SCM_TIMESTAMPNS) /* GNU/Linux */
-static int
-inspect_timespec_as_abstime(int level, int optname, VALUE data, VALUE ret)
-{
- if (RSTRING_LEN(data) == sizeof(struct timespec)) {
- struct timespec ts;
- struct tm tm;
- char buf[32];
- memcpy((char*)&ts, RSTRING_PTR(data), sizeof(ts));
- tm = *localtime(&ts.tv_sec);
- strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", &tm);
- rb_str_catf(ret, " %s.%09ld", buf, (long)ts.tv_nsec);
- return 1;
- }
- else {
- return 0;
- }
-}
-#endif
-
-#if defined(SCM_BINTIME) /* FreeBSD */
-static int
-inspect_bintime_as_abstime(int level, int optname, VALUE data, VALUE ret)
-{
- if (RSTRING_LEN(data) == sizeof(struct bintime)) {
- struct bintime bt;
- struct tm tm;
- uint64_t frac_h, frac_l;
- uint64_t scale_h, scale_l;
- uint64_t tmp1, tmp2;
- uint64_t res_h, res_l;
- char buf[32];
- memcpy((char*)&bt, RSTRING_PTR(data), sizeof(bt));
- tm = *localtime(&bt.sec);
- strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", &tm);
-
- /* res_h = frac * 10**19 / 2**64 */
-
- frac_h = bt.frac >> 32;
- frac_l = bt.frac & 0xffffffff;
-
- scale_h = 0x8ac72304; /* 0x8ac7230489e80000 == 10**19 */
- scale_l = 0x89e80000;
-
- res_h = frac_h * scale_h;
- res_l = frac_l * scale_l;
-
- tmp1 = frac_h * scale_l;
- res_h += tmp1 >> 32;
- tmp2 = res_l;
- res_l += tmp1 & 0xffffffff;
- if (res_l < tmp2) res_h++;
-
- tmp1 = frac_l * scale_h;
- res_h += tmp1 >> 32;
- tmp2 = res_l;
- res_l += tmp1 & 0xffffffff;
- if (res_l < tmp2) res_h++;
-
- rb_str_catf(ret, " %s.%019"PRIu64, buf, res_h);
- return 1;
- }
- else {
- return 0;
- }
-}
-#endif
-
-/*
- * call-seq:
- * ancillarydata.inspect => string
- *
- * returns a string which shows ancillarydata in human-readable form.
- *
- * p Socket::AncillaryData.new(:INET6, :IPV6, :PKTINFO, "").inspect
- * #=> "#<Socket::AncillaryData: INET6 IPV6 PKTINFO \"\">"
- */
-static VALUE
-ancillary_inspect(VALUE self)
-{
- VALUE ret;
- int family, level, type;
- VALUE data;
- ID family_id, level_id, type_id;
- VALUE vtype;
- int inspected;
-
- family = ancillary_family(self);
- level = ancillary_level(self);
- type = ancillary_type(self);
- data = ancillary_data(self);
-
- ret = rb_sprintf("#<%s:", rb_obj_classname(self));
-
- family_id = rsock_intern_family_noprefix(family);
- if (family_id)
- rb_str_catf(ret, " %s", rb_id2name(family_id));
- else
- rb_str_catf(ret, " family:%d", family);
-
- if (level == SOL_SOCKET) {
- rb_str_cat2(ret, " SOCKET");
-
- type_id = rsock_intern_scm_optname(type);
- if (type_id)
- rb_str_catf(ret, " %s", rb_id2name(type_id));
- else
- rb_str_catf(ret, " cmsg_type:%d", type);
- }
- else if (IS_IP_FAMILY(family)) {
- level_id = rsock_intern_iplevel(level);
- if (level_id)
- rb_str_catf(ret, " %s", rb_id2name(level_id));
- else
- rb_str_catf(ret, " cmsg_level:%d", level);
-
- vtype = ip_cmsg_type_to_sym(level, type);
- if (SYMBOL_P(vtype))
- rb_str_catf(ret, " %s", rb_id2name(SYM2ID(vtype)));
- else
- rb_str_catf(ret, " cmsg_type:%d", type);
- }
- else {
- rb_str_catf(ret, " cmsg_level:%d", level);
- rb_str_catf(ret, " cmsg_type:%d", type);
- }
-
- inspected = 0;
-
- if (level == SOL_SOCKET)
- family = AF_UNSPEC;
-
- switch (family) {
- case AF_UNSPEC:
- switch (level) {
-# if defined(SOL_SOCKET)
- case SOL_SOCKET:
- switch (type) {
-# if defined(SCM_TIMESTAMP) /* GNU/Linux, FreeBSD, NetBSD, OpenBSD, MacOS X, Solaris */
- case SCM_TIMESTAMP: inspected = inspect_timeval_as_abstime(level, type, data, ret); break;
-# endif
-# if defined(SCM_TIMESTAMPNS) /* GNU/Linux */
- case SCM_TIMESTAMPNS: inspected = inspect_timespec_as_abstime(level, type, data, ret); break;
-# endif
-# if defined(SCM_BINTIME) /* FreeBSD */
- case SCM_BINTIME: inspected = inspect_bintime_as_abstime(level, type, data, ret); break;
-# endif
-# if defined(SCM_RIGHTS) /* 4.4BSD */
- case SCM_RIGHTS: inspected = anc_inspect_socket_rights(level, type, data, ret); break;
-# endif
-# if defined(SCM_CREDENTIALS) /* GNU/Linux */
- case SCM_CREDENTIALS: inspected = anc_inspect_passcred_credentials(level, type, data, ret); break;
-# endif
-# if defined(INSPECT_SCM_CREDS) /* NetBSD */
- case SCM_CREDS: inspected = anc_inspect_socket_creds(level, type, data, ret); break;
-# endif
- }
- break;
-# endif
- }
- break;
-
- case AF_INET:
-#ifdef INET6
- case AF_INET6:
-#endif
- switch (level) {
-# if defined(IPPROTO_IP)
- case IPPROTO_IP:
- switch (type) {
-# if defined(IP_RECVDSTADDR) /* 4.4BSD */
- case IP_RECVDSTADDR: inspected = anc_inspect_ip_recvdstaddr(level, type, data, ret); break;
-# endif
-# if defined(IP_PKTINFO) && defined(HAVE_TYPE_STRUCT_IN_PKTINFO) && defined(HAVE_IPI_SPEC_DST) /* GNU/Linux */
- case IP_PKTINFO: inspected = anc_inspect_ip_pktinfo(level, type, data, ret); break;
-# endif
- }
- break;
-# endif
-
-# if defined(IPPROTO_IPV6)
- case IPPROTO_IPV6:
- switch (type) {
-# if defined(IPV6_PKTINFO) /* RFC 3542 */
- case IPV6_PKTINFO: inspected = anc_inspect_ipv6_pktinfo(level, type, data, ret); break;
-# endif
- }
- break;
-# endif
- }
- break;
- }
-
- if (!inspected) {
- data = rb_str_dump(data);
- rb_str_catf(ret, " %s", StringValueCStr(data));
- }
-
- rb_str_cat2(ret, ">");
-
- return ret;
-}
-
-/*
- * call-seq:
- * ancillarydata.cmsg_is?(level, type) => true or false
- *
- * tests the level and type of _ancillarydata_.
- *
- * ancdata = Socket::AncillaryData.new(:INET6, :IPV6, :PKTINFO, "")
- * ancdata.cmsg_is?(Socket::IPPROTO_IPV6, Socket::IPV6_PKTINFO) #=> true
- * ancdata.cmsg_is?(:IPV6, :PKTINFO) #=> true
- * ancdata.cmsg_is?(:IP, :PKTINFO) #=> false
- * ancdata.cmsg_is?(:SOCKET, :RIGHTS) #=> false
- */
-static VALUE
-ancillary_cmsg_is_p(VALUE self, VALUE vlevel, VALUE vtype)
-{
- int family = ancillary_family(self);
- int level = rsock_level_arg(family, vlevel);
- int type = rsock_cmsg_type_arg(family, level, vtype);
-
- if (ancillary_level(self) == level &&
- ancillary_type(self) == type)
- return Qtrue;
- else
- return Qfalse;
-}
-
-#endif
-
-#if defined(HAVE_SENDMSG)
-struct sendmsg_args_struct {
- int fd;
- const struct msghdr *msg;
- int flags;
-};
-
-static VALUE
-nogvl_sendmsg_func(void *ptr)
-{
- struct sendmsg_args_struct *args = ptr;
- return sendmsg(args->fd, args->msg, args->flags);
-}
-
-static ssize_t
-rb_sendmsg(int fd, const struct msghdr *msg, int flags)
-{
- struct sendmsg_args_struct args;
- args.fd = fd;
- args.msg = msg;
- args.flags = flags;
- return rb_thread_blocking_region(nogvl_sendmsg_func, &args, RUBY_UBF_IO, 0);
-}
-
-static VALUE
-bsock_sendmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock)
-{
- rb_io_t *fptr;
- VALUE data, vflags, dest_sockaddr;
- VALUE *controls_ptr;
- int controls_num;
- struct msghdr mh;
- struct iovec iov;
-#if defined(HAVE_ST_MSG_CONTROL)
- volatile VALUE controls_str = 0;
-#endif
- int flags;
- ssize_t ss;
- int family;
-
- rb_secure(4);
- GetOpenFile(sock, fptr);
- family = rsock_getfamily(fptr->fd);
-
- data = vflags = dest_sockaddr = Qnil;
- controls_ptr = NULL;
- controls_num = 0;
-
- if (argc == 0)
- rb_raise(rb_eArgError, "mesg argument required");
- data = argv[0];
- if (1 < argc) vflags = argv[1];
- if (2 < argc) dest_sockaddr = argv[2];
- if (3 < argc) { controls_ptr = &argv[3]; controls_num = argc - 3; }
-
- StringValue(data);
-
- if (controls_num) {
-#if defined(HAVE_ST_MSG_CONTROL)
- int i;
- int last_pad = 0;
- int last_level = 0;
- int last_type = 0;
- controls_str = rb_str_tmp_new(0);
- for (i = 0; i < controls_num; i++) {
- VALUE elt = controls_ptr[i], v;
- VALUE vlevel, vtype;
- int level, type;
- VALUE cdata;
- long oldlen;
- struct cmsghdr cmh;
- char *cmsg;
- size_t cspace;
- v = rb_check_convert_type(elt, T_ARRAY, "Array", "to_ary");
- if (!NIL_P(v)) {
- elt = v;
- if (RARRAY_LEN(elt) != 3)
- rb_raise(rb_eArgError, "an element of controls should be 3-elements array");
- vlevel = rb_ary_entry(elt, 0);
- vtype = rb_ary_entry(elt, 1);
- cdata = rb_ary_entry(elt, 2);
- }
- else {
- vlevel = rb_funcall(elt, rb_intern("level"), 0);
- vtype = rb_funcall(elt, rb_intern("type"), 0);
- cdata = rb_funcall(elt, rb_intern("data"), 0);
- }
- level = rsock_level_arg(family, vlevel);
- type = rsock_cmsg_type_arg(family, level, vtype);
- StringValue(cdata);
- oldlen = RSTRING_LEN(controls_str);
- cspace = CMSG_SPACE(RSTRING_LEN(cdata));
- rb_str_resize(controls_str, oldlen + cspace);
- cmsg = RSTRING_PTR(controls_str)+oldlen;
- memset((char *)cmsg, 0, cspace);
- memset((char *)&cmh, 0, sizeof(cmh));
- cmh.cmsg_level = level;
- cmh.cmsg_type = type;
- cmh.cmsg_len = CMSG_LEN(RSTRING_LEN(cdata));
- MEMCPY(cmsg, &cmh, char, sizeof(cmh));
- MEMCPY(cmsg+((char*)CMSG_DATA(&cmh)-(char*)&cmh), RSTRING_PTR(cdata), char, RSTRING_LEN(cdata));
- last_level = cmh.cmsg_level;
- last_type = cmh.cmsg_type;
- last_pad = cspace - cmh.cmsg_len;
- }
- if (last_pad) {
- /*
- * This code removes the last padding from msg_controllen.
- *
- * 4.3BSD-Reno reject the padding for SCM_RIGHTS. (There was no 64bit environments in those days?)
- * RFC 2292 require the padding.
- * RFC 3542 relaxes the condition - implementation must accept both as valid.
- *
- * Actual problems:
- *
- * - NetBSD 4.0.1
- * SCM_RIGHTS with padding causes EINVAL
- * IPV6_PKTINFO without padding causes "page fault trap"
- *
- * - OpenBSD 4.4
- * IPV6_PKTINFO without padding causes EINVAL
- *
- * Basically, msg_controllen should contains the padding.
- * So the padding is removed only if a problem really exists.
- */
-#if defined(__NetBSD__)
- if (last_level == SOL_SOCKET && last_type == SCM_RIGHTS)
- rb_str_set_len(controls_str, RSTRING_LEN(controls_str)-last_pad);
-#endif
- }
-#else
- rb_raise(rb_eNotImpError, "control message for sendmsg is unimplemented");
-#endif
- }
-
- flags = NIL_P(vflags) ? 0 : NUM2INT(vflags);
-#ifdef MSG_DONTWAIT
- if (nonblock)
- flags |= MSG_DONTWAIT;
-#endif
-
- if (!NIL_P(dest_sockaddr))
- SockAddrStringValue(dest_sockaddr);
-
- rb_io_check_closed(fptr);
-
- retry:
- memset(&mh, 0, sizeof(mh));
- if (!NIL_P(dest_sockaddr)) {
- mh.msg_name = RSTRING_PTR(dest_sockaddr);
- mh.msg_namelen = RSTRING_LEN(dest_sockaddr);
- }
- mh.msg_iovlen = 1;
- mh.msg_iov = &iov;
- iov.iov_base = RSTRING_PTR(data);
- iov.iov_len = RSTRING_LEN(data);
-#if defined(HAVE_ST_MSG_CONTROL)
- if (controls_str) {
- mh.msg_control = RSTRING_PTR(controls_str);
- mh.msg_controllen = RSTRING_LEN(controls_str);
- }
- else {
- mh.msg_control = NULL;
- mh.msg_controllen = 0;
- }
-#endif
-
- rb_io_check_closed(fptr);
- if (nonblock)
- rb_io_set_nonblock(fptr);
-
- ss = rb_sendmsg(fptr->fd, &mh, flags);
-
- if (!nonblock && rb_io_wait_writable(fptr->fd)) {
- rb_io_check_closed(fptr);
- goto retry;
- }
-
- if (ss == -1) {
- if (nonblock && (errno == EWOULDBLOCK || errno == EAGAIN))
- rb_mod_sys_fail(rb_mWaitWritable, "sendmsg(2) would block");
- rb_sys_fail("sendmsg(2)");
- }
-
- return SSIZET2NUM(ss);
-}
-#endif
-
-#if defined(HAVE_SENDMSG)
-/*
- * call-seq:
- * basicsocket.sendmsg(mesg, flags=0, dest_sockaddr=nil, *controls) => numbytes_sent
- *
- * sendmsg sends a message using sendmsg(2) system call in blocking manner.
- *
- * _mesg_ is a string to send.
- *
- * _flags_ is bitwise OR of MSG_* constants such as Socket::MSG_OOB.
- *
- * _dest_sockaddr_ is a destination socket address for connection-less socket.
- * It should be a sockaddr such as a result of Socket.sockaddr_in.
- * An Addrinfo object can be used too.
- *
- * _controls_ is a list of ancillary data.
- * The element of _controls_ should be Socket::AncillaryData or
- * 3-elements array.
- * The 3-element array should contains cmsg_level, cmsg_type and data.
- *
- * The return value, _numbytes_sent_ is an integer which is the number of bytes sent.
- *
- * sendmsg can be used to implement send_io as follows:
- *
- * # use Socket::AncillaryData.
- * ancdata = Socket::AncillaryData.int(:UNIX, :SOCKET, :RIGHTS, io.fileno)
- * sock.sendmsg("a", 0, nil, ancdata)
- *
- * # use 3-element array.
- * ancdata = [:SOCKET, :RIGHTS, [io.fileno].pack("i!")]
- * sock.sendmsg("\0", 0, nil, ancdata)
- *
- */
-static VALUE
-bsock_sendmsg(int argc, VALUE *argv, VALUE sock)
-{
- return bsock_sendmsg_internal(argc, argv, sock, 0);
-}
-#else
-#define bsock_sendmsg rb_f_notimplement
-#endif
-
-#if defined(HAVE_SENDMSG)
-/*
- * call-seq:
- * basicsocket.sendmsg_nonblock(mesg, flags=0, dest_sockaddr=nil, *controls) => numbytes_sent
- *
- * sendmsg_nonblock sends a message using sendmsg(2) system call in non-blocking manner.
- *
- * It is similar to BasicSocket#sendmsg
- * but the non-blocking flag is set before the system call
- * and it doesn't retry the system call.
- *
- */
-static VALUE
-bsock_sendmsg_nonblock(int argc, VALUE *argv, VALUE sock)
-{
- return bsock_sendmsg_internal(argc, argv, sock, 1);
-}
-#else
-#define bsock_sendmsg_nonblock rb_f_notimplement
-#endif
-
-#if defined(HAVE_RECVMSG)
-struct recvmsg_args_struct {
- int fd;
- struct msghdr *msg;
- int flags;
-};
-
-static VALUE
-nogvl_recvmsg_func(void *ptr)
-{
- struct recvmsg_args_struct *args = ptr;
- return recvmsg(args->fd, args->msg, args->flags);
-}
-
-static ssize_t
-rb_recvmsg(int fd, struct msghdr *msg, int flags)
-{
- struct recvmsg_args_struct args;
- args.fd = fd;
- args.msg = msg;
- args.flags = flags;
- return rb_thread_blocking_region(nogvl_recvmsg_func, &args, RUBY_UBF_IO, 0);
-}
-
-#if defined(HAVE_ST_MSG_CONTROL)
-static void
-discard_cmsg(struct cmsghdr *cmh, char *msg_end)
-{
- if (cmh->cmsg_level == SOL_SOCKET && cmh->cmsg_type == SCM_RIGHTS) {
- int *fdp = (int *)CMSG_DATA(cmh);
- int *end = (int *)((char *)cmh + cmh->cmsg_len);
- while ((char *)fdp + sizeof(int) <= (char *)end &&
- (char *)fdp + sizeof(int) <= msg_end) {
- close(*fdp);
- fdp++;
- }
- }
-}
-#endif
-
-void
-rsock_discard_cmsg_resource(struct msghdr *mh)
-{
-#if defined(HAVE_ST_MSG_CONTROL)
- struct cmsghdr *cmh;
- char *msg_end;
-
- if (mh->msg_controllen == 0)
- return;
-
- msg_end = (char *)mh->msg_control + mh->msg_controllen;
-
- for (cmh = CMSG_FIRSTHDR(mh); cmh != NULL; cmh = CMSG_NXTHDR(mh, cmh)) {
- discard_cmsg(cmh, msg_end);
- }
-#endif
-}
-
-#if defined(HAVE_ST_MSG_CONTROL)
-static void
-make_io_for_unix_rights(VALUE ctl, struct cmsghdr *cmh, char *msg_end)
-{
- if (cmh->cmsg_level == SOL_SOCKET && cmh->cmsg_type == SCM_RIGHTS) {
- int *fdp, *end;
- VALUE ary = rb_ary_new();
- rb_ivar_set(ctl, rb_intern("unix_rights"), ary);
- fdp = (int *)CMSG_DATA(cmh);
- end = (int *)((char *)cmh + cmh->cmsg_len);
- while ((char *)fdp + sizeof(int) <= (char *)end &&
- (char *)fdp + sizeof(int) <= msg_end) {
- int fd = *fdp;
- struct stat stbuf;
- VALUE io;
- if (fstat(fd, &stbuf) == -1)
- rb_raise(rb_eSocket, "invalid fd in SCM_RIGHTS");
- if (S_ISSOCK(stbuf.st_mode))
- io = rsock_init_sock(rb_obj_alloc(rb_cSocket), fd);
- else
- io = rb_io_fdopen(fd, O_RDWR, NULL);
- ary = rb_attr_get(ctl, rb_intern("unix_rights"));
- rb_ary_push(ary, io);
- fdp++;
- }
- OBJ_FREEZE(ary);
- }
-}
-#endif
-
-static VALUE
-bsock_recvmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock)
-{
- rb_io_t *fptr;
- VALUE vmaxdatlen, vmaxctllen, vflags, vopts;
- int grow_buffer;
- size_t maxdatlen;
- int flags, orig_flags;
- int request_scm_rights;
- struct msghdr mh;
- struct iovec iov;
- struct sockaddr_storage namebuf;
- char datbuf0[4096], *datbuf;
- VALUE dat_str = Qnil;
- VALUE ret;
- ssize_t ss;
-#if defined(HAVE_ST_MSG_CONTROL)
- struct cmsghdr *cmh;
- size_t maxctllen;
- union {
- char bytes[4096];
- struct cmsghdr align;
- } ctlbuf0;
- char *ctlbuf;
- VALUE ctl_str = Qnil;
- int family;
- int gc_done = 0;
-#endif
-
- rb_secure(4);
-
- vopts = Qnil;
- if (0 < argc && TYPE(argv[argc-1]) == T_HASH)
- vopts = argv[--argc];
-
- rb_scan_args(argc, argv, "03", &vmaxdatlen, &vflags, &vmaxctllen);
-
- maxdatlen = NIL_P(vmaxdatlen) ? sizeof(datbuf0) : NUM2SIZET(vmaxdatlen);
-#if defined(HAVE_ST_MSG_CONTROL)
- maxctllen = NIL_P(vmaxctllen) ? sizeof(ctlbuf0) : NUM2SIZET(vmaxctllen);
-#else
- if (!NIL_P(vmaxctllen))
- rb_raise(rb_eArgError, "control message not supported");
-#endif
- flags = NIL_P(vflags) ? 0 : NUM2INT(vflags);
-#ifdef MSG_DONTWAIT
- if (nonblock)
- flags |= MSG_DONTWAIT;
-#endif
- orig_flags = flags;
-
- grow_buffer = NIL_P(vmaxdatlen) || NIL_P(vmaxctllen);
-
- request_scm_rights = 0;
- if (!NIL_P(vopts) && RTEST(rb_hash_aref(vopts, ID2SYM(rb_intern("scm_rights")))))
- request_scm_rights = 1;
-
- GetOpenFile(sock, fptr);
- if (rb_io_read_pending(fptr)) {
- rb_raise(rb_eIOError, "recvmsg for buffered IO");
- }
-
-#if !defined(HAVE_ST_MSG_CONTROL)
- if (grow_buffer) {
- int socktype, optlen = sizeof(socktype);
- if (getsockopt(fptr->fd, SOL_SOCKET, SO_TYPE, (void*)&socktype, &optlen) == -1) {
- rb_sys_fail("getsockopt(SO_TYPE)");
- }
- if (socktype == SOCK_STREAM)
- grow_buffer = 0;
- }
-#endif
-
- retry:
- if (maxdatlen <= sizeof(datbuf0))
- datbuf = datbuf0;
- else {
- if (NIL_P(dat_str))
- dat_str = rb_str_tmp_new(maxdatlen);
- else
- rb_str_resize(dat_str, maxdatlen);
- datbuf = RSTRING_PTR(dat_str);
- }
-
-#if defined(HAVE_ST_MSG_CONTROL)
- if (maxctllen <= sizeof(ctlbuf0))
- ctlbuf = ctlbuf0.bytes;
- else {
- if (NIL_P(ctl_str))
- ctl_str = rb_str_tmp_new(maxctllen);
- else
- rb_str_resize(ctl_str, maxctllen);
- ctlbuf = RSTRING_PTR(ctl_str);
- }
-#endif
-
- memset(&mh, 0, sizeof(mh));
-
- memset(&namebuf, 0, sizeof(namebuf));
- mh.msg_name = (struct sockaddr *)&namebuf;
- mh.msg_namelen = sizeof(namebuf);
-
- mh.msg_iov = &iov;
- mh.msg_iovlen = 1;
- iov.iov_base = datbuf;
- iov.iov_len = maxdatlen;
-
-#if defined(HAVE_ST_MSG_CONTROL)
- mh.msg_control = ctlbuf;
- mh.msg_controllen = maxctllen;
-#endif
-
- if (grow_buffer)
- flags |= MSG_PEEK;
-
- rb_io_check_closed(fptr);
- if (nonblock)
- rb_io_set_nonblock(fptr);
-
- ss = rb_recvmsg(fptr->fd, &mh, flags);
-
- if (!nonblock && rb_io_wait_readable(fptr->fd)) {
- rb_io_check_closed(fptr);
- goto retry;
- }
-
- if (ss == -1) {
- if (nonblock && (errno == EWOULDBLOCK || errno == EAGAIN))
- rb_mod_sys_fail(rb_mWaitReadable, "recvmsg(2) would block");
-#if defined(HAVE_ST_MSG_CONTROL)
- if (!gc_done && (errno == EMFILE || errno == EMSGSIZE)) {
- /*
- * When SCM_RIGHTS hit the file descriptors limit:
- * - Linux 2.6.18 causes success with MSG_CTRUNC
- * - MacOS X 10.4 causes EMSGSIZE (and lost file descriptors?)
- * - Solaris 11 causes EMFILE
- */
- gc_and_retry:
- rb_gc();
- gc_done = 1;
- goto retry;
- }
-#endif
- rb_sys_fail("recvmsg(2)");
- }
-
- if (grow_buffer) {
- int grown = 0;
-#if defined(HAVE_ST_MSG_CONTROL)
- if (NIL_P(vmaxdatlen) && (mh.msg_flags & MSG_TRUNC)) {
- if (SIZE_MAX/2 < maxdatlen)
- rb_raise(rb_eArgError, "max data length too big");
- maxdatlen *= 2;
- grown = 1;
- }
- if (NIL_P(vmaxctllen) && (mh.msg_flags & MSG_CTRUNC)) {
-#define BIG_ENOUGH_SPACE 65536
- if (BIG_ENOUGH_SPACE < maxctllen &&
- mh.msg_controllen < maxctllen - BIG_ENOUGH_SPACE) {
- /* there are big space bug truncated.
- * file descriptors limit? */
- if (!gc_done) {
- rsock_discard_cmsg_resource(&mh);
- goto gc_and_retry;
- }
- }
- else {
- if (SIZE_MAX/2 < maxctllen)
- rb_raise(rb_eArgError, "max control message length too big");
- maxctllen *= 2;
- grown = 1;
- }
-#undef BIG_ENOUGH_SPACE
- }
-#else
- if (NIL_P(vmaxdatlen) && ss != -1 && ss == iov.iov_len) {
- if (SIZE_MAX/2 < maxdatlen)
- rb_raise(rb_eArgError, "max data length too big");
- maxdatlen *= 2;
- grown = 1;
- }
-#endif
- if (grown) {
- rsock_discard_cmsg_resource(&mh);
- goto retry;
- }
- else {
- grow_buffer = 0;
- if (flags != orig_flags) {
- flags = orig_flags;
- rsock_discard_cmsg_resource(&mh);
- goto retry;
- }
- }
- }
-
- if (NIL_P(dat_str))
- dat_str = rb_tainted_str_new(datbuf, ss);
- else {
- rb_str_resize(dat_str, ss);
- OBJ_TAINT(dat_str);
- RBASIC(dat_str)->klass = rb_cString;
- }
-
- ret = rb_ary_new3(3, dat_str,
- rsock_io_socket_addrinfo(sock, mh.msg_name, mh.msg_namelen),
-#if defined(HAVE_ST_MSG_CONTROL)
- INT2NUM(mh.msg_flags)
-#else
- Qnil
-#endif
- );
-
-#if defined(HAVE_ST_MSG_CONTROL)
- family = rsock_getfamily(fptr->fd);
- if (mh.msg_controllen) {
- char *msg_end = (char *)mh.msg_control + mh.msg_controllen;
- for (cmh = CMSG_FIRSTHDR(&mh); cmh != NULL; cmh = CMSG_NXTHDR(&mh, cmh)) {
- VALUE ctl;
- char *ctl_end;
- size_t clen;
- if (cmh->cmsg_len == 0) {
- rb_raise(rb_eTypeError, "invalid control message (cmsg_len == 0)");
- }
- ctl_end = (char*)cmh + cmh->cmsg_len;
- clen = (ctl_end <= msg_end ? ctl_end : msg_end) - (char*)CMSG_DATA(cmh);
- ctl = ancdata_new(family, cmh->cmsg_level, cmh->cmsg_type, rb_tainted_str_new((char*)CMSG_DATA(cmh), clen));
- if (request_scm_rights)
- make_io_for_unix_rights(ctl, cmh, msg_end);
- else
- discard_cmsg(cmh, msg_end);
- rb_ary_push(ret, ctl);
- }
- }
-#endif
-
- return ret;
-}
-#endif
-
-#if defined(HAVE_RECVMSG)
-/*
- * call-seq:
- * basicsocket.recvmsg(maxmesglen=nil, flags=0, maxcontrollen=nil, opts={}) => [mesg, sender_addrinfo, rflags, *controls]
- *
- * recvmsg receives a message using recvmsg(2) system call in blocking manner.
- *
- * _maxmesglen_ is the maximum length of mesg to receive.
- *
- * _flags_ is bitwise OR of MSG_* constants such as Socket::MSG_PEEK.
- *
- * _maxcontrolslen_ is the maximum length of controls (ancillary data) to receive.
- *
- * _opts_ is option hash.
- * Currently :scm_rights=>bool is the only option.
- *
- * :scm_rights option specifies that application expects SCM_RIGHTS control message.
- * If the value is nil or false, application don't expects SCM_RIGHTS control message.
- * In this case, recvmsg closes the passed file descriptors immediately.
- * This is the default behavior.
- *
- * If :scm_rights value is neigher nil nor false, application expects SCM_RIGHTS control message.
- * In this case, recvmsg creates IO objects for each file descriptors for
- * Socket::AncillaryData#unix_rights method.
- *
- * The return value is 4-elements array.
- *
- * _mesg_ is a string of the received message.
- *
- * _sender_addrinfo_ is a sender socket address for connection-less socket.
- * It is an Addrinfo object.
- * For connection-oriented socket such as TCP, sender_addrinfo is platform dependent.
- *
- * _rflags_ is a flags on the received message which is bitwise OR of MSG_* constants such as Socket::MSG_TRUNC.
- * It will be nil if the system uses 4.3BSD style old recvmsg system call.
- *
- * _controls_ is ancillary data which is an array of Socket::AncillaryData objects such as:
- *
- * #<Socket::AncillaryData: AF_UNIX SOCKET RIGHTS 7>
- *
- * _maxmesglen_ and _maxcontrolslen_ can be nil.
- * In that case, the buffer will be grown until the message is not truncated.
- * Internally, MSG_PEEK is used and MSG_TRUNC/MSG_CTRUNC are checked.
- *
- * recvmsg can be used to implement recv_io as follows:
- *
- * mesg, sender_sockaddr, rflags, *controls = sock.recvmsg(:scm_rights=>true)
- * controls.each {|ancdata|
- * if ancdata.cmsg_is?(:SOCKET, :RIGHTS)
- * return ancdata.unix_rights[0]
- * end
- * }
- *
- */
-static VALUE
-bsock_recvmsg(int argc, VALUE *argv, VALUE sock)
-{
- return bsock_recvmsg_internal(argc, argv, sock, 0);
-}
-#else
-#define bsock_recvmsg rb_f_notimplement
-#endif
-
-#if defined(HAVE_RECVMSG)
-/*
- * call-seq:
- * basicsocket.recvmsg_nonblock(maxdatalen=nil, flags=0, maxcontrollen=nil, opts={}) => [data, sender_addrinfo, rflags, *controls]
- *
- * recvmsg receives a message using recvmsg(2) system call in non-blocking manner.
- *
- * It is similar to BasicSocket#recvmsg
- * but non-blocking flag is set before the system call
- * and it doesn't retry the system call.
- *
- */
-static VALUE
-bsock_recvmsg_nonblock(int argc, VALUE *argv, VALUE sock)
-{
- return bsock_recvmsg_internal(argc, argv, sock, 1);
-}
-#else
-#define bsock_recvmsg_nonblock rb_f_notimplement
-#endif
-
-void
-Init_ancdata(void)
-{
- /* for rdoc */
- /* rb_cBasicSocket = rb_define_class("BasicSocket", rb_cIO); */
- /* rb_cSocket = rb_define_class("Socket", rb_cBasicSocket); */
-
- rb_define_method(rb_cBasicSocket, "sendmsg", bsock_sendmsg, -1);
- rb_define_method(rb_cBasicSocket, "sendmsg_nonblock", bsock_sendmsg_nonblock, -1);
- rb_define_method(rb_cBasicSocket, "recvmsg", bsock_recvmsg, -1);
- rb_define_method(rb_cBasicSocket, "recvmsg_nonblock", bsock_recvmsg_nonblock, -1);
-
-#if defined(HAVE_ST_MSG_CONTROL)
- rb_cAncillaryData = rb_define_class_under(rb_cSocket, "AncillaryData", rb_cObject);
- rb_define_method(rb_cAncillaryData, "initialize", ancillary_initialize, 4);
- rb_define_method(rb_cAncillaryData, "inspect", ancillary_inspect, 0);
- rb_define_method(rb_cAncillaryData, "family", ancillary_family_m, 0);
- rb_define_method(rb_cAncillaryData, "level", ancillary_level_m, 0);
- rb_define_method(rb_cAncillaryData, "type", ancillary_type_m, 0);
- rb_define_method(rb_cAncillaryData, "data", ancillary_data, 0);
-
- rb_define_method(rb_cAncillaryData, "cmsg_is?", ancillary_cmsg_is_p, 2);
-
- rb_define_singleton_method(rb_cAncillaryData, "int", ancillary_s_int, 4);
- rb_define_method(rb_cAncillaryData, "int", ancillary_int, 0);
-
- rb_define_singleton_method(rb_cAncillaryData, "unix_rights", ancillary_s_unix_rights, -1);
- rb_define_method(rb_cAncillaryData, "unix_rights", ancillary_unix_rights, 0);
-
- rb_define_method(rb_cAncillaryData, "timestamp", ancillary_timestamp, 0);
-
- rb_define_singleton_method(rb_cAncillaryData, "ip_pktinfo", ancillary_s_ip_pktinfo, -1);
- rb_define_method(rb_cAncillaryData, "ip_pktinfo", ancillary_ip_pktinfo, 0);
-
- rb_define_singleton_method(rb_cAncillaryData, "ipv6_pktinfo", ancillary_s_ipv6_pktinfo, 2);
- rb_define_method(rb_cAncillaryData, "ipv6_pktinfo", ancillary_ipv6_pktinfo, 0);
- rb_define_method(rb_cAncillaryData, "ipv6_pktinfo_addr", ancillary_ipv6_pktinfo_addr, 0);
- rb_define_method(rb_cAncillaryData, "ipv6_pktinfo_ifindex", ancillary_ipv6_pktinfo_ifindex, 0);
-#endif
-}
diff --git a/ext/socket/basicsocket.c b/ext/socket/basicsocket.c
deleted file mode 100644
index 4ffbd497bf..0000000000
--- a/ext/socket/basicsocket.c
+++ /dev/null
@@ -1,723 +0,0 @@
-/************************************************
-
- basicsocket.c -
-
- created at: Thu Mar 31 12:21:29 JST 1994
-
- Copyright (C) 1993-2007 Yukihiro Matsumoto
-
-************************************************/
-
-#include "rubysocket.h"
-
-/*
- * call-seq:
- * BasicSocket.for_fd(fd) => basicsocket
- *
- * Returns a socket object which contains the file descriptor, _fd_.
- *
- * # If invoked by inetd, STDIN/STDOUT/STDERR is a socket.
- * STDIN_SOCK = Socket.for_fd(STDIN.fileno)
- * p STDIN_SOCK.remote_address
- *
- */
-static VALUE
-bsock_s_for_fd(VALUE klass, VALUE fd)
-{
- rb_io_t *fptr;
- VALUE sock = rsock_init_sock(rb_obj_alloc(klass), NUM2INT(fd));
-
- GetOpenFile(sock, fptr);
-
- return sock;
-}
-
-/*
- * call-seq:
- * basicsocket.shutdown([how]) => 0
- *
- * Calls shutdown(2) system call.
- *
- * s.shutdown(Socket::SHUT_RD) disallows further read.
- *
- * s.shutdown(Socket::SHUT_WR) disallows further write.
- *
- * s.shutdown(Socket::SHUT_RDWR) disallows further read and write.
- *
- * _how_ can be symbol or string:
- * - :RD, :SHUT_RD, "RD" and "SHUT_RD" are accepted as Socket::SHUT_RD.
- * - :WR, :SHUT_WR, "WR" and "SHUT_WR" are accepted as Socket::SHUT_WR.
- * - :RDWR, :SHUT_RDWR, "RDWR" and "SHUT_RDWR" are accepted as Socket::SHUT_RDWR.
- *
- * UNIXSocket.pair {|s1, s2|
- * s1.puts "ping"
- * s1.shutdown(:WR)
- * p s2.read #=> "ping\n"
- * s2.puts "pong"
- * s2.close
- * p s1.read #=> "pong\n"
- * }
- *
- */
-static VALUE
-bsock_shutdown(int argc, VALUE *argv, VALUE sock)
-{
- VALUE howto;
- int how;
- rb_io_t *fptr;
-
- if (rb_safe_level() >= 4 && !OBJ_TAINTED(sock)) {
- rb_raise(rb_eSecurityError, "Insecure: can't shutdown socket");
- }
- rb_scan_args(argc, argv, "01", &howto);
- if (howto == Qnil)
- how = SHUT_RDWR;
- else {
- how = rsock_shutdown_how_arg(howto);
- if (how != SHUT_WR && how != SHUT_RD && how != SHUT_RDWR) {
- rb_raise(rb_eArgError, "`how' should be either :SHUT_RD, :SHUT_WR, :SHUT_RDWR");
- }
- }
- GetOpenFile(sock, fptr);
- if (shutdown(fptr->fd, how) == -1)
- rb_sys_fail(0);
-
- return INT2FIX(0);
-}
-
-/*
- * call-seq:
- * basicsocket.close_read => nil
- *
- * Disallows further read.
- *
- * s1, s2 = UNIXSocket.pair
- * s1.close_read
- * s2.puts #=> Broken pipe (Errno::EPIPE)
- */
-static VALUE
-bsock_close_read(VALUE sock)
-{
- rb_io_t *fptr;
-
- if (rb_safe_level() >= 4 && !OBJ_TAINTED(sock)) {
- rb_raise(rb_eSecurityError, "Insecure: can't close socket");
- }
- GetOpenFile(sock, fptr);
- shutdown(fptr->fd, 0);
- if (!(fptr->mode & FMODE_WRITABLE)) {
- return rb_io_close(sock);
- }
- fptr->mode &= ~FMODE_READABLE;
-
- return Qnil;
-}
-
-/*
- * call-seq:
- * basicsocket.close_write => nil
- *
- * Disallows further write.
- *
- * UNIXSocket.pair {|s1, s2|
- * s1.print "ping"
- * s1.close_write
- * p s2.read #=> "ping"
- * s2.print "pong"
- * s2.close
- * p s1.read #=> "pong"
- * }
- */
-static VALUE
-bsock_close_write(VALUE sock)
-{
- rb_io_t *fptr;
-
- if (rb_safe_level() >= 4 && !OBJ_TAINTED(sock)) {
- rb_raise(rb_eSecurityError, "Insecure: can't close socket");
- }
- GetOpenFile(sock, fptr);
- if (!(fptr->mode & FMODE_READABLE)) {
- return rb_io_close(sock);
- }
- shutdown(fptr->fd, 1);
- fptr->mode &= ~FMODE_WRITABLE;
-
- return Qnil;
-}
-
-/*
- * Document-method: setsockopt
- * call-seq: setsockopt(level, optname, optval)
- *
- * Sets a socket option. These are protocol and system specific, see your
- * local sytem documentation for details.
- *
- * === Parameters
- * * +level+ is an integer, usually one of the SOL_ constants such as
- * Socket::SOL_SOCKET, or a protocol level.
- * * +optname+ is an integer, usually one of the SO_ constants, such
- * as Socket::SO_REUSEADDR.
- * * +optval+ is the value of the option, it is passed to the underlying
- * setsockopt() as a pointer to a certain number of bytes. How this is
- * done depends on the type:
- * - Fixnum: value is assigned to an int, and a pointer to the int is
- * passed, with length of sizeof(int).
- * - true or false: 1 or 0 (respectively) is assigned to an int, and the
- * int is passed as for a Fixnum. Note that +false+ must be passed,
- * not +nil+.
- * - String: the string's data and length is passed to the socket.
- *
- * === Examples
- *
- * Some socket options are integers with boolean values, in this case
- * #setsockopt could be called like this:
- * sock.setsockopt(Socket::SOL_SOCKET,Socket::SO_REUSEADDR, true)
- *
- * Some socket options are integers with numeric values, in this case
- * #setsockopt could be called like this:
- * sock.setsockopt(Socket::IPPROTO_IP, Socket::IP_TTL, 255)
- *
- * Option values may be structs. Passing them can be complex as it involves
- * examining your system headers to determine the correct definition. An
- * example is an +ip_mreq+, which may be defined in your system headers as:
- * struct ip_mreq {
- * struct in_addr imr_multiaddr;
- * struct in_addr imr_interface;
- * };
- *
- * In this case #setsockopt could be called like this:
- * optval = IPAddr.new("224.0.0.251") + Socket::INADDR_ANY
- * sock.setsockopt(Socket::IPPROTO_IP, Socket::IP_ADD_MEMBERSHIP, optval)
- *
-*/
-static VALUE
-bsock_setsockopt(int argc, VALUE *argv, VALUE sock)
-{
- VALUE lev, optname, val;
- int family, level, option;
- rb_io_t *fptr;
- int i;
- char *v;
- int vlen;
-
- if (argc == 1) {
- lev = rb_funcall(argv[0], rb_intern("level"), 0);
- optname = rb_funcall(argv[0], rb_intern("optname"), 0);
- val = rb_funcall(argv[0], rb_intern("data"), 0);
- }
- else {
- rb_scan_args(argc, argv, "30", &lev, &optname, &val);
- }
-
- rb_secure(2);
- GetOpenFile(sock, fptr);
- family = rsock_getfamily(fptr->fd);
- level = rsock_level_arg(family, lev);
- option = rsock_optname_arg(family, level, optname);
-
- switch (TYPE(val)) {
- case T_FIXNUM:
- i = FIX2INT(val);
- goto numval;
- case T_FALSE:
- i = 0;
- goto numval;
- case T_TRUE:
- i = 1;
- numval:
- v = (char*)&i; vlen = sizeof(i);
- break;
- default:
- StringValue(val);
- v = RSTRING_PTR(val);
- vlen = RSTRING_LEN(val);
- break;
- }
-
-#define rb_sys_fail_path(path) rb_sys_fail(NIL_P(path) ? 0 : RSTRING_PTR(path))
-
- rb_io_check_closed(fptr);
- if (setsockopt(fptr->fd, level, option, v, vlen) < 0)
- rb_sys_fail_path(fptr->pathv);
-
- return INT2FIX(0);
-}
-
-#if !defined(__BEOS__)
-/*
- * Document-method: getsockopt
- * call-seq: getsockopt(level, optname)
- *
- * Gets a socket option. These are protocol and system specific, see your
- * local sytem documentation for details. The option is returned as
- * a String with the data being the binary value of the socket option.
- *
- * === Parameters
- * * +level+ is an integer, usually one of the SOL_ constants such as
- * Socket::SOL_SOCKET, or a protocol level.
- * * +optname+ is an integer, usually one of the SO_ constants, such
- * as Socket::SO_REUSEADDR.
- *
- * === Examples
- *
- * Some socket options are integers with boolean values, in this case
- * #getsockopt could be called like this:
- * optval = sock.getsockopt(Socket::SOL_SOCKET,Socket::SO_REUSEADDR)
- * optval = optval.unpack "i"
- * reuseaddr = optval[0] == 0 ? false : true
- *
- * Some socket options are integers with numeric values, in this case
- * #getsockopt could be called like this:
- * optval = sock.getsockopt(Socket::IPPROTO_IP, Socket::IP_TTL)
- * ipttl = optval.unpack("i")[0]
- *
- * Option values may be structs. Decoding them can be complex as it involves
- * examining your system headers to determine the correct definition. An
- * example is a +struct linger+, which may be defined in your system headers
- * as:
- * struct linger {
- * int l_onoff;
- * int l_linger;
- * };
- *
- * In this case #getsockopt could be called like this:
- * optval = sock.getsockopt(Socket::SOL_SOCKET, Socket::SO_LINGER)
- * onoff, linger = optval.unpack "ii"
-*/
-static VALUE
-bsock_getsockopt(VALUE sock, VALUE lev, VALUE optname)
-{
- int level, option;
- socklen_t len;
- char *buf;
- rb_io_t *fptr;
- int family;
-
- GetOpenFile(sock, fptr);
- family = rsock_getfamily(fptr->fd);
- level = rsock_level_arg(family, lev);
- option = rsock_optname_arg(family, level, optname);
- len = 256;
- buf = ALLOCA_N(char,len);
-
- rb_io_check_closed(fptr);
-
- if (getsockopt(fptr->fd, level, option, buf, &len) < 0)
- rb_sys_fail_path(fptr->pathv);
-
- return rsock_sockopt_new(family, level, option, rb_str_new(buf, len));
-}
-#else
-#define bsock_getsockopt rb_f_notimplement
-#endif
-
-/*
- * call-seq:
- * basicsocket.getsockname => sockaddr
- *
- * Returns the local address of the socket as a sockaddr string.
- *
- * TCPServer.open("127.0.0.1", 15120) {|serv|
- * p serv.getsockname #=> "\x02\x00;\x10\x7F\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00"
- * }
- */
-static VALUE
-bsock_getsockname(VALUE sock)
-{
- struct sockaddr_storage buf;
- socklen_t len = sizeof buf;
- rb_io_t *fptr;
-
- GetOpenFile(sock, fptr);
- if (getsockname(fptr->fd, (struct sockaddr*)&buf, &len) < 0)
- rb_sys_fail("getsockname(2)");
- return rb_str_new((char*)&buf, len);
-}
-
-/*
- * call-seq:
- * basicsocket.getpeername => sockaddr
- *
- * Returns the remote address of the socket as a sockaddr string.
- *
- * TCPServer.open("127.0.0.1", 1440) {|serv|
- * c = TCPSocket.new("127.0.0.1", 1440)
- * s = serv.accept
- * p s.getpeername #=> "\x02\x00\x82u\x7F\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00"
- * }
- *
- */
-static VALUE
-bsock_getpeername(VALUE sock)
-{
- struct sockaddr_storage buf;
- socklen_t len = sizeof buf;
- rb_io_t *fptr;
-
- GetOpenFile(sock, fptr);
- if (getpeername(fptr->fd, (struct sockaddr*)&buf, &len) < 0)
- rb_sys_fail("getpeername(2)");
- return rb_str_new((char*)&buf, len);
-}
-
-#if defined(HAVE_GETPEEREID) || defined(SO_PEERCRED) || defined(HAVE_GETPEERUCRED)
-/*
- * call-seq:
- * basicsocket.getpeereid => [euid, egid]
- *
- * Returns the user and group on the peer of the UNIX socket.
- * The result is a two element array which contains the effective uid and the effective gid.
- *
- * Socket.unix_server_loop("/tmp/sock") {|s|
- * begin
- * euid, egid = s.getpeereid
- *
- * # Check the connected client is myself or not.
- * next if euid != Process.uid
- *
- * # do something about my resource.
- *
- * ensure
- * s.close
- * end
- * }
- *
- */
-static VALUE
-bsock_getpeereid(VALUE self)
-{
-#if defined(HAVE_GETPEEREID)
- rb_io_t *fptr;
- uid_t euid;
- gid_t egid;
- GetOpenFile(self, fptr);
- if (getpeereid(fptr->fd, &euid, &egid) == -1)
- rb_sys_fail("getpeereid");
- return rb_assoc_new(UIDT2NUM(euid), GIDT2NUM(egid));
-#elif defined(SO_PEERCRED) /* GNU/Linux */
- rb_io_t *fptr;
- struct ucred cred;
- socklen_t len = sizeof(cred);
- GetOpenFile(self, fptr);
- if (getsockopt(fptr->fd, SOL_SOCKET, SO_PEERCRED, &cred, &len) == -1)
- rb_sys_fail("getsockopt(SO_PEERCRED)");
- return rb_assoc_new(UIDT2NUM(cred.uid), GIDT2NUM(cred.gid));
-#elif defined(HAVE_GETPEERUCRED) /* Solaris */
- rb_io_t *fptr;
- ucred_t *uc = NULL;
- VALUE ret;
- GetOpenFile(self, fptr);
- if (getpeerucred(fptr->fd, &uc) == -1)
- rb_sys_fail("getpeerucred");
- ret = rb_assoc_new(UIDT2NUM(ucred_geteuid(uc)), GIDT2NUM(ucred_getegid(uc)));
- ucred_free(uc);
- return ret;
-#endif
-}
-#else
-#define bsock_getpeereid rb_f_notimplement
-#endif
-
-/*
- * call-seq:
- * bsock.local_address => addrinfo
- *
- * Returns an Addrinfo object for local address obtained by getsockname.
- *
- * Note that addrinfo.protocol is filled by 0.
- *
- * TCPServer.open("127.0.0.1", 1512) {|serv|
- * p serv.local_address #=> #<Addrinfo: 127.0.0.1:1512 TCP>
- * }
- *
- */
-static VALUE
-bsock_local_address(VALUE sock)
-{
- struct sockaddr_storage buf;
- socklen_t len = sizeof buf;
- rb_io_t *fptr;
-
- GetOpenFile(sock, fptr);
- if (getsockname(fptr->fd, (struct sockaddr*)&buf, &len) < 0)
- rb_sys_fail("getsockname(2)");
- return rsock_fd_socket_addrinfo(fptr->fd, (struct sockaddr *)&buf, len);
-}
-
-/*
- * call-seq:
- * bsock.remote_address => addrinfo
- *
- * Returns an Addrinfo object for remote address obtained by getpeername.
- *
- * Note that addrinfo.protocol is filled by 0.
- *
- * TCPServer.open("127.0.0.1", 1728) {|serv|
- * c = TCPSocket.new("127.0.0.1", 1728)
- * s = serv.accept
- * p s.remote_address #=> #<Addrinfo: 127.0.0.1:36504 TCP>
- * }
- *
- */
-static VALUE
-bsock_remote_address(VALUE sock)
-{
- struct sockaddr_storage buf;
- socklen_t len = sizeof buf;
- rb_io_t *fptr;
-
- GetOpenFile(sock, fptr);
- if (getpeername(fptr->fd, (struct sockaddr*)&buf, &len) < 0)
- rb_sys_fail("getpeername(2)");
- return rsock_fd_socket_addrinfo(fptr->fd, (struct sockaddr *)&buf, len);
-}
-
-/*
- * call-seq:
- * basicsocket.send(mesg, flags [, sockaddr_to]) => numbytes_sent
- *
- * send _mesg_ via _basicsocket_.
- *
- * _mesg_ should be a string.
- *
- * _flags_ should be a bitwise OR of Socket::MSG_* constants.
- *
- * _sockaddr_to_ should be a packed sockaddr string or an addrinfo.
- *
- * TCPSocket.open("localhost", 80) {|s|
- * s.send "GET / HTTP/1.0\r\n\r\n", 0
- * p s.read
- * }
- */
-VALUE
-rsock_bsock_send(int argc, VALUE *argv, VALUE sock)
-{
- struct rsock_send_arg arg;
- VALUE flags, to;
- rb_io_t *fptr;
- int n;
- rb_blocking_function_t *func;
-
- rb_secure(4);
- rb_scan_args(argc, argv, "21", &arg.mesg, &flags, &to);
-
- StringValue(arg.mesg);
- if (!NIL_P(to)) {
- SockAddrStringValue(to);
- to = rb_str_new4(to);
- arg.to = (struct sockaddr *)RSTRING_PTR(to);
- arg.tolen = RSTRING_LEN(to);
- func = rsock_sendto_blocking;
- }
- else {
- func = rsock_send_blocking;
- }
- GetOpenFile(sock, fptr);
- arg.fd = fptr->fd;
- arg.flags = NUM2INT(flags);
- while (rb_thread_fd_writable(arg.fd),
- (n = (int)BLOCKING_REGION(func, &arg)) < 0) {
- if (rb_io_wait_writable(arg.fd)) {
- continue;
- }
- rb_sys_fail("send(2)");
- }
- return INT2FIX(n);
-}
-
-/*
- * call-seq:
- * basicsocket.do_not_reverse_lookup => true or false
- *
- * Gets the do_not_reverse_lookup flag of _basicsocket_.
- *
- * TCPSocket.open("www.ruby-lang.org", 80) {|sock|
- * p sock.do_not_reverse_lookup #=> false
- * p sock.peeraddr #=> ["AF_INET", 80, "carbon.ruby-lang.org", "221.186.184.68"]
- * sock.do_not_reverse_lookup = true
- * p sock.peeraddr #=> ["AF_INET", 80, "221.186.184.68", "221.186.184.68"]
- * }
- */
-static VALUE
-bsock_do_not_reverse_lookup(VALUE sock)
-{
- rb_io_t *fptr;
-
- GetOpenFile(sock, fptr);
- return (fptr->mode & FMODE_NOREVLOOKUP) ? Qtrue : Qfalse;
-}
-
-/*
- * call-seq:
- * basicsocket.do_not_reverse_lookup = bool
- *
- * Sets the do_not_reverse_lookup flag of _basicsocket_.
- *
- * BasicSocket.do_not_reverse_lookup = false
- * p TCPSocket.new("127.0.0.1", 80).do_not_reverse_lookup #=> false
- * BasicSocket.do_not_reverse_lookup = true
- * p TCPSocket.new("127.0.0.1", 80).do_not_reverse_lookup #=> true
- *
- */
-static VALUE
-bsock_do_not_reverse_lookup_set(VALUE sock, VALUE state)
-{
- rb_io_t *fptr;
-
- rb_secure(4);
- GetOpenFile(sock, fptr);
- if (RTEST(state)) {
- fptr->mode |= FMODE_NOREVLOOKUP;
- }
- else {
- fptr->mode &= ~FMODE_NOREVLOOKUP;
- }
- return sock;
-}
-
-/*
- * call-seq:
- * basicsocket.recv(maxlen) => mesg
- * basicsocket.recv(maxlen, flags) => mesg
- *
- * Receives a message.
- *
- * _maxlen_ is the maximum number of bytes to receive.
- *
- * _flags_ should be a bitwise OR of Socket::MSG_* constants.
- *
- * UNIXSocket.pair {|s1, s2|
- * s1.puts "Hello World"
- * p s2.recv(4) #=> "Hell"
- * p s2.recv(4, Socket::MSG_PEEK) #=> "o Wo"
- * p s2.recv(4) #=> "o Wo"
- * p s2.recv(10) #=> "rld\n"
- * }
- */
-static VALUE
-bsock_recv(int argc, VALUE *argv, VALUE sock)
-{
- return rsock_s_recvfrom(sock, argc, argv, RECV_RECV);
-}
-
-/*
- * call-seq:
- * basicsocket.recv_nonblock(maxlen) => mesg
- * basicsocket.recv_nonblock(maxlen, flags) => mesg
- *
- * Receives up to _maxlen_ bytes from +socket+ using recvfrom(2) after
- * O_NONBLOCK is set for the underlying file descriptor.
- * _flags_ is zero or more of the +MSG_+ options.
- * The result, _mesg_, is the data received.
- *
- * When recvfrom(2) returns 0, Socket#recv_nonblock returns
- * an empty string as data.
- * The meaning depends on the socket: EOF on TCP, empty packet on UDP, etc.
- *
- * === Parameters
- * * +maxlen+ - the number of bytes to receive from the socket
- * * +flags+ - zero or more of the +MSG_+ options
- *
- * === Example
- * serv = TCPServer.new("127.0.0.1", 0)
- * af, port, host, addr = serv.addr
- * c = TCPSocket.new(addr, port)
- * s = serv.accept
- * c.send "aaa", 0
- * begin # emulate blocking recv.
- * p s.recv_nonblock(10) #=> "aaa"
- * rescue IO::WaitReadable
- * IO.select([s])
- * retry
- * end
- *
- * Refer to Socket#recvfrom for the exceptions that may be thrown if the call
- * to _recv_nonblock_ fails.
- *
- * BasicSocket#recv_nonblock may raise any error corresponding to recvfrom(2) failure,
- * including Errno::EWOULDBLOCK.
- *
- * If the exception is Errno::EWOULDBLOCK or Errno::AGAIN,
- * it is extended by IO::WaitReadable.
- * So IO::WaitReadable can be used to rescue the exceptions for retrying recv_nonblock.
- *
- * === See
- * * Socket#recvfrom
- */
-
-static VALUE
-bsock_recv_nonblock(int argc, VALUE *argv, VALUE sock)
-{
- return rsock_s_recvfrom_nonblock(sock, argc, argv, RECV_RECV);
-}
-
-/*
- * call-seq:
- * BasicSocket.do_not_reverse_lookup => true or false
- *
- * Gets the global do_not_reverse_lookup flag.
- *
- * BasicSocket.do_not_reverse_lookup #=> false
- */
-static VALUE
-bsock_do_not_rev_lookup(void)
-{
- return rsock_do_not_reverse_lookup?Qtrue:Qfalse;
-}
-
-/*
- * call-seq:
- * BasicSocket.do_not_reverse_lookup = bool
- *
- * Sets the global do_not_reverse_lookup flag.
- *
- * The flag is used for initial value of do_not_reverse_lookup for each socket.
- *
- * s1 = TCPSocket.new("localhost", 80)
- * p s1.do_not_reverse_lookup #=> true
- * BasicSocket.do_not_reverse_lookup = false
- * s2 = TCPSocket.new("localhost", 80)
- * p s2.do_not_reverse_lookup #=> false
- * p s1.do_not_reverse_lookup #=> true
- *
- */
-static VALUE
-bsock_do_not_rev_lookup_set(VALUE self, VALUE val)
-{
- rb_secure(4);
- rsock_do_not_reverse_lookup = RTEST(val);
- return val;
-}
-
-/*
- * BasicSocket class
- */
-void
-Init_basicsocket(void)
-{
- rb_cBasicSocket = rb_define_class("BasicSocket", rb_cIO);
- rb_undef_method(rb_cBasicSocket, "initialize");
-
- rb_define_singleton_method(rb_cBasicSocket, "do_not_reverse_lookup",
- bsock_do_not_rev_lookup, 0);
- rb_define_singleton_method(rb_cBasicSocket, "do_not_reverse_lookup=",
- bsock_do_not_rev_lookup_set, 1);
- rb_define_singleton_method(rb_cBasicSocket, "for_fd", bsock_s_for_fd, 1);
-
- rb_define_method(rb_cBasicSocket, "close_read", bsock_close_read, 0);
- rb_define_method(rb_cBasicSocket, "close_write", bsock_close_write, 0);
- rb_define_method(rb_cBasicSocket, "shutdown", bsock_shutdown, -1);
- rb_define_method(rb_cBasicSocket, "setsockopt", bsock_setsockopt, -1);
- rb_define_method(rb_cBasicSocket, "getsockopt", bsock_getsockopt, 2);
- rb_define_method(rb_cBasicSocket, "getsockname", bsock_getsockname, 0);
- rb_define_method(rb_cBasicSocket, "getpeername", bsock_getpeername, 0);
- rb_define_method(rb_cBasicSocket, "getpeereid", bsock_getpeereid, 0);
- rb_define_method(rb_cBasicSocket, "local_address", bsock_local_address, 0);
- rb_define_method(rb_cBasicSocket, "remote_address", bsock_remote_address, 0);
- rb_define_method(rb_cBasicSocket, "send", rsock_bsock_send, -1);
- rb_define_method(rb_cBasicSocket, "recv", bsock_recv, -1);
- rb_define_method(rb_cBasicSocket, "recv_nonblock", bsock_recv_nonblock, -1);
- rb_define_method(rb_cBasicSocket, "do_not_reverse_lookup", bsock_do_not_reverse_lookup, 0);
- rb_define_method(rb_cBasicSocket, "do_not_reverse_lookup=", bsock_do_not_reverse_lookup_set, 1);
-}
diff --git a/ext/socket/constants.c b/ext/socket/constants.c
deleted file mode 100644
index 4350a127d5..0000000000
--- a/ext/socket/constants.c
+++ /dev/null
@@ -1,146 +0,0 @@
-/************************************************
-
- constants.c -
-
- created at: Thu Mar 31 12:21:29 JST 1994
-
- Copyright (C) 1993-2007 Yukihiro Matsumoto
-
-************************************************/
-
-#include "rubysocket.h"
-
-static VALUE rb_mSockConst;
-
-#include "constdefs.c"
-
-static int
-constant_arg(VALUE arg, int (*str_to_int)(const char*, int, int*), const char *errmsg)
-{
- VALUE tmp;
- char *ptr;
- int ret;
-
- if (SYMBOL_P(arg)) {
- arg = rb_sym_to_s(arg);
- goto str;
- }
- else if (!NIL_P(tmp = rb_check_string_type(arg))) {
- arg = tmp;
- str:
- rb_check_safe_obj(arg);
- ptr = RSTRING_PTR(arg);
- if (str_to_int(ptr, RSTRING_LEN(arg), &ret) == -1)
- rb_raise(rb_eSocket, "%s: %s", errmsg, ptr);
- }
- else {
- ret = NUM2INT(arg);
- }
- return ret;
-}
-
-int
-rsock_family_arg(VALUE domain)
-{
- /* convert AF_INET, etc. */
- return constant_arg(domain, rsock_family_to_int, "unknown socket domain");
-}
-
-int
-rsock_socktype_arg(VALUE type)
-{
- /* convert SOCK_STREAM, etc. */
- return constant_arg(type, rsock_socktype_to_int, "unknown socket type");
-}
-
-int
-rsock_level_arg(int family, VALUE level)
-{
- /* convert SOL_SOCKET, IPPROTO_TCP, etc. */
- if (IS_IP_FAMILY(family)) {
- return constant_arg(level, rsock_ip_level_to_int, "unknown protocol level");
- }
- else {
- return constant_arg(level, rsock_unknown_level_to_int, "unknown protocol level");
- }
-}
-
-int
-rsock_optname_arg(int family, int level, VALUE optname)
-{
- if (IS_IP_FAMILY(family)) {
- switch (level) {
- case SOL_SOCKET:
- return constant_arg(optname, rsock_so_optname_to_int, "unknown socket level option name");
- case IPPROTO_IP:
- return constant_arg(optname, rsock_ip_optname_to_int, "unknown IP level option name");
-#ifdef IPPROTO_IPV6
- case IPPROTO_IPV6:
- return constant_arg(optname, rsock_ipv6_optname_to_int, "unknown IPv6 level option name");
-#endif
- case IPPROTO_TCP:
- return constant_arg(optname, rsock_tcp_optname_to_int, "unknown TCP level option name");
- case IPPROTO_UDP:
- return constant_arg(optname, rsock_udp_optname_to_int, "unknown UDP level option name");
- default:
- return NUM2INT(optname);
- }
- }
- else {
- switch (level) {
- case SOL_SOCKET:
- return constant_arg(optname, rsock_so_optname_to_int, "unknown socket level option name");
- default:
- return NUM2INT(optname);
- }
- }
-}
-
-int
-rsock_cmsg_type_arg(int family, int level, VALUE type)
-{
- if (IS_IP_FAMILY(family)) {
- switch (level) {
- case SOL_SOCKET:
- return constant_arg(type, rsock_scm_optname_to_int, "unknown UNIX control message");
- case IPPROTO_IP:
- return constant_arg(type, rsock_ip_optname_to_int, "unknown IP control message");
-#ifdef INET6
- case IPPROTO_IPV6:
- return constant_arg(type, rsock_ipv6_optname_to_int, "unknown IPv6 control message");
-#endif
- case IPPROTO_TCP:
- return constant_arg(type, rsock_tcp_optname_to_int, "unknown TCP control message");
- case IPPROTO_UDP:
- return constant_arg(type, rsock_udp_optname_to_int, "unknown UDP control message");
- default:
- return NUM2INT(type);
- }
- }
- else {
- switch (level) {
- case SOL_SOCKET:
- return constant_arg(type, rsock_scm_optname_to_int, "unknown UNIX control message");
- default:
- return NUM2INT(type);
- }
- }
-}
-
-int
-rsock_shutdown_how_arg(VALUE how)
-{
- /* convert SHUT_RD, SHUT_WR, SHUT_RDWR. */
- return constant_arg(how, rsock_shutdown_how_to_int, "unknown shutdown argument");
-}
-
-/*
- * Socket::Constants module
- */
-void
-Init_socket_constants(void)
-{
- /* constants */
- rb_mSockConst = rb_define_module_under(rb_cSocket, "Constants");
- init_constants();
-}
diff --git a/ext/socket/depend b/ext/socket/depend
index 000a013c5f..cca6d4e62a 100644
--- a/ext/socket/depend
+++ b/ext/socket/depend
@@ -1,25 +1,3 @@
-SOCK_HEADERS = $(srcdir)/rubysocket.h $(hdrdir)/ruby/ruby.h $(arch_hdrdir)/ruby/config.h \
- $(hdrdir)/ruby/defines.h $(hdrdir)/ruby/io.h \
- $(srcdir)/sockport.h constdefs.h
-
-init.o: init.c $(SOCK_HEADERS)
-constants.o: constants.c constdefs.c $(SOCK_HEADERS)
-basicsocket.o: basicsocket.c $(SOCK_HEADERS)
-socket.o: socket.c $(SOCK_HEADERS)
-ipsocket.o: ipsocket.c $(SOCK_HEADERS)
-tcpsocket.o: tcpsocket.c $(SOCK_HEADERS)
-tcpserver.o: tcpserver.c $(SOCK_HEADERS)
-sockssocket.o: sockssocket.c $(SOCK_HEADERS)
-udpsocket.o: udpsocket.c $(SOCK_HEADERS)
-unixsocket.o: unixsocket.c $(SOCK_HEADERS)
-unixserver.o: unixserver.c $(SOCK_HEADERS)
-option.o: option.c $(SOCK_HEADERS)
-ancdata.o: ancdata.c $(SOCK_HEADERS)
-raddrinfo.o: raddrinfo.c $(SOCK_HEADERS)
-
-getnameinfo.o: getnameinfo.c $(arch_hdrdir)/ruby/config.h addrinfo.h sockport.h
-getaddrinfo.o: getaddrinfo.c $(arch_hdrdir)/ruby/config.h addrinfo.h sockport.h
-
-constdefs.h constdefs.c : $(srcdir)/mkconstants.rb
- @echo "generating constant definitions"
- @$(RUBY) $(srcdir)/mkconstants.rb -H constdefs.h -o constdefs.c
+socket.o : socket.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h $(hdrdir)/rubyio.h $(hdrdir)/rubysig.h sockport.h
+getnameinfo.o: getnameinfo.c $(topdir)/config.h addrinfo.h sockport.h
+getaddrinfo.o: getaddrinfo.c $(topdir)/config.h addrinfo.h sockport.h
diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb
index 1d233fdd1f..8a13ddba73 100644
--- a/ext/socket/extconf.rb
+++ b/ext/socket/extconf.rb
@@ -1,17 +1,22 @@
require 'mkmf'
case RUBY_PLATFORM
-when /(ms|bcc)win32|mingw/
+when /bccwin32/
test_func = "WSACleanup"
have_library("ws2_32", "WSACleanup")
+when /mswin32|mingw/
+ test_func = "WSACleanup"
+ if with_config("winsock2")
+ have_library("ws2_32", "WSACleanup")
+ else
+ have_library("wsock32", "WSACleanup")
+ end
when /cygwin/
test_func = "socket"
when /beos/
test_func = "socket"
have_library("net", "socket")
-when /haiku/
- test_func = "socket"
- have_library("network", "socket")
+ have_func("closesocket")
when /i386-os2_emx/
test_func = "socket"
have_library("socket", "socket")
@@ -33,14 +38,11 @@ if have_header("arpa/inet.h")
end
ipv6 = false
-default_ipv6 = /mswin|cygwin|beos|haiku/ !~ RUBY_PLATFORM
+default_ipv6 = /cygwin/ !~ RUBY_PLATFORM
if enable_config("ipv6", default_ipv6)
if checking_for("ipv6") {try_link(<<EOF)}
#include <sys/types.h>
-#ifndef _WIN32
#include <sys/socket.h>
-#endif
-int
main()
{
socket(AF_INET6, SOCK_STREAM, 0);
@@ -52,9 +54,6 @@ EOF
end
if ipv6
- if $mingw
- $CPPFLAGS << " -D_WIN32_WINNT=0x501"
- end
ipv6lib = nil
class << (fmt = "unknown")
def %(s) s || self end
@@ -95,10 +94,17 @@ if have_struct_member("struct sockaddr_in", "sin_len", headers)
end
# doug's fix, NOW add -Dss_family... only if required!
-doug = proc {have_struct_member("struct sockaddr_storage", "ss_family", headers)}
-if (doug[] or
- with_cppflags($CPPFLAGS + " -Dss_family=__ss_family -Dss_len=__ss_len", &doug))
- $defs[-1] = "-DHAVE_SOCKADDR_STORAGE"
+[nil, " -Dss_family=__ss_family -Dss_len=__ss_len"].each do |flags|
+ if flags
+ cppflags = $CPPFLAGS
+ $CPPFLAGS += flags
+ end
+ if have_struct_member("struct sockaddr_storage", "ss_family", headers)
+ $defs[-1] = "-DHAVE_SOCKADDR_STORAGE"
+ break
+ elsif flags
+ $CPPFLAGS = cppflags
+ end
end
if have_struct_member("struct sockaddr", "sa_len", headers)
@@ -129,17 +135,11 @@ getaddr_info_ok = enable_config("wide-getaddrinfo") do
#define AF_LOCAL AF_UNIX
#endif
-int
main()
{
int passive, gaierr, inet4 = 0, inet6 = 0;
struct addrinfo hints, *ai, *aitop;
char straddr[INET6_ADDRSTRLEN], strport[16];
-#ifdef _WIN32
- WSADATA retdata;
-
- WSAStartup(MAKEWORD(2, 0), &retdata);
-#endif
for (passive = 0; passive <= 1; passive++) {
memset(&hints, 0, sizeof(hints));
@@ -247,90 +247,28 @@ Fatal: invalid value for --with-lookup-order-hack (expected INET, INET6 or UNSPE
EOS
end
-$objs = [
- "init.#{$OBJEXT}",
- "constants.#{$OBJEXT}",
- "basicsocket.#{$OBJEXT}",
- "socket.#{$OBJEXT}",
- "ipsocket.#{$OBJEXT}",
- "tcpsocket.#{$OBJEXT}",
- "tcpserver.#{$OBJEXT}",
- "sockssocket.#{$OBJEXT}",
- "udpsocket.#{$OBJEXT}",
- "unixsocket.#{$OBJEXT}",
- "unixserver.#{$OBJEXT}",
- "option.#{$OBJEXT}",
- "ancdata.#{$OBJEXT}",
- "raddrinfo.#{$OBJEXT}"
-]
+$objs = ["socket.#{$OBJEXT}"]
-unless getaddr_info_ok and have_func("getnameinfo", headers) and have_func("getaddrinfo", headers)
+unless getaddr_info_ok and have_func("getnameinfo", "netdb.h") and have_func("getaddrinfo", "netdb.h")
if have_struct_member("struct in6_addr", "s6_addr8", headers)
$defs[-1] = "-DHAVE_ADDR8"
end
$CPPFLAGS="-I. "+$CPPFLAGS
$objs += ["getaddrinfo.#{$OBJEXT}"]
$objs += ["getnameinfo.#{$OBJEXT}"]
- $defs << "-DGETADDRINFO_EMU"
have_func("inet_ntop") or have_func("inet_ntoa")
have_func("inet_pton") or have_func("inet_aton")
have_func("getservbyport")
- if have_func("gai_strerror")
- unless checking_for("gai_strerror() returns const pointer") {!try_compile(<<EOF)}
-#{cpp_include(headers)}
-#include <stdlib.h>
-void
-conftest_gai_strerror_is_const()
-{
- *gai_strerror(0) = 0;
-}
-EOF
- $defs << "-DGAI_STRERROR_CONST"
- end
- end
have_header("arpa/nameser.h")
have_header("resolv.h")
end
-have_header("ifaddrs.h")
-have_func("getifaddrs")
-have_header("sys/ioctl.h")
-have_header("sys/sockio.h")
-have_header("net/if.h", headers)
-
-have_header("sys/param.h", headers)
-have_header("sys/ucred.h", headers)
-
unless have_type("socklen_t", headers)
$defs << "-Dsocklen_t=int"
end
have_header("sys/un.h")
have_header("sys/uio.h")
-have_type("struct in_pktinfo", headers) {|src|
- src.sub(%r'^/\*top\*/', '\1'"\n#if defined(IPPROTO_IP) && defined(IP_PKTINFO)") <<
- "#else\n" << "#error\n" << ">>>>>> no in_pktinfo <<<<<<\n" << "#endif\n"
-}
-have_type("struct in6_pktinfo", headers) {|src|
- src.sub(%r'^/\*top\*/', '\1'"\n#if defined(IPPROTO_IPV6) && defined(IPV6_PKTINFO)") <<
- "#else\n" << "#error\n" << ">>>>>> no in6_pktinfo <<<<<<\n" << "#endif\n"
-}
-if have_struct_member("struct in_pktinfo", "ipi_spec_dst", headers)
- $defs[-1] = "-DHAVE_IPI_SPEC_DST"
-end
-
-have_type("struct sockcred", headers)
-have_type("struct cmsgcred", headers)
-
-have_func("getpeereid")
-
-have_header("ucred.h", headers)
-have_func("getpeerucred")
-
-# workaround for recent Windows SDK
-$defs << "-DIPPROTO_IPV6=IPPROTO_IPV6" if have_const("IPPROTO_IPV6") && !have_macro("IPPROTO_IPV6")
-
-$distcleanfiles << "constants.h" << "constdefs.*"
if have_func(test_func)
have_func("hsterror")
diff --git a/ext/socket/getaddrinfo.c b/ext/socket/getaddrinfo.c
index 53656b4c02..9fb4ebcb06 100644
--- a/ext/socket/getaddrinfo.c
+++ b/ext/socket/getaddrinfo.c
@@ -38,14 +38,11 @@
* - PF_UNSPEC case would be handled in getipnodebyname() with the AI_ALL flag.
*/
-#include "ruby/config.h"
-#ifdef RUBY_EXTCONF_H
-#include RUBY_EXTCONF_H
-#endif
+#include "config.h"
#include <sys/types.h>
-#ifndef _WIN32
+#if !defined(_WIN32) && !defined(__VMS)
#include <sys/param.h>
-#if defined(__BEOS__) && !defined(__HAIKU__) && !defined(BONE)
+#if defined(__BEOS__)
# include <net/socket.h>
#else
# include <sys/socket.h>
@@ -65,9 +62,13 @@
#include <resolv.h>
#endif
#include <unistd.h>
+#elif defined(__VMS )
+#include <socket.h>
+#include <inet.h>
+#include <in.h>
+#include <netdb.h>
#else
#include <winsock2.h>
-#include <ws2tcpip.h>
#include <io.h>
#endif
#include <string.h>
@@ -198,21 +199,21 @@ if (pai->ai_flags & AI_CANONNAME) {\
#define ERR(err) { error = (err); goto bad; }
-#ifndef HAVE_GAI_STRERROR
-#ifdef GAI_STRERROR_CONST
+#if defined __UCLIBC__
const
#endif
char *
-gai_strerror(int ecode)
+gai_strerror(ecode)
+ int ecode;
{
if (ecode < 0 || ecode > EAI_MAX)
ecode = EAI_MAX;
return (char *)ai_errlist[ecode];
}
-#endif
void
-freeaddrinfo(struct addrinfo *ai)
+freeaddrinfo(ai)
+ struct addrinfo *ai;
{
struct addrinfo *next;
@@ -226,7 +227,8 @@ freeaddrinfo(struct addrinfo *ai)
}
static int
-str_isnumber(const char *p)
+str_isnumber(p)
+ const char *p;
{
char *q = (char *)p;
while (*q) {
@@ -240,7 +242,10 @@ str_isnumber(const char *p)
#ifndef HAVE_INET_PTON
static int
-inet_pton(int af, const char *hostname, void *pton)
+inet_pton(af, hostname, pton)
+ int af;
+ const char *hostname;
+ void *pton;
{
struct in_addr in;
@@ -268,7 +273,10 @@ inet_pton(int af, const char *hostname, void *pton)
#endif
int
-getaddrinfo(const char *hostname, const char *servname, const struct addrinfo *hints, struct addrinfo **res)
+getaddrinfo(hostname, servname, hints, res)
+ const char *hostname, *servname;
+ const struct addrinfo *hints;
+ struct addrinfo **res;
{
struct addrinfo sentinel;
struct addrinfo *top = NULL;
@@ -378,11 +386,9 @@ getaddrinfo(const char *hostname, const char *servname, const struct addrinfo *h
pai->ai_protocol = IPPROTO_UDP;
}
port = htons((unsigned short)atoi(servname));
- } else if (pai->ai_flags & AI_NUMERICSERV) {
- ERR(EAI_NONAME);
} else {
struct servent *sp;
- const char *proto;
+ char *proto;
proto = NULL;
switch (pai->ai_socktype) {
@@ -436,7 +442,7 @@ getaddrinfo(const char *hostname, const char *servname, const struct addrinfo *h
s = socket(afd->a_af, SOCK_DGRAM, 0);
if (s < 0)
continue;
-#if defined(__BEOS__)
+#if defined(HAVE_CLOSESOCKET)
closesocket(s);
#else
close(s);
@@ -537,7 +543,13 @@ getaddrinfo(const char *hostname, const char *servname, const struct addrinfo *h
}
static int
-get_name(const char *addr, const struct afd *afd, struct addrinfo **res, char *numaddr, struct addrinfo *pai, int port0)
+get_name(addr, afd, res, numaddr, pai, port0)
+ const char *addr;
+ const struct afd *afd;
+ struct addrinfo **res;
+ char *numaddr;
+ struct addrinfo *pai;
+ int port0;
{
u_short port = port0 & 0xffff;
struct hostent *hp;
@@ -577,7 +589,12 @@ get_name(const char *addr, const struct afd *afd, struct addrinfo **res, char *n
}
static int
-get_addr(const char *hostname, int af, struct addrinfo **res, struct addrinfo *pai, int port0)
+get_addr(hostname, af, res, pai, port0)
+ const char *hostname;
+ int af;
+ struct addrinfo **res;
+ struct addrinfo *pai;
+ int port0;
{
u_short port = port0 & 0xffff;
struct addrinfo sentinel;
diff --git a/ext/socket/getnameinfo.c b/ext/socket/getnameinfo.c
index 689b91c291..66f7e8818a 100644
--- a/ext/socket/getnameinfo.c
+++ b/ext/socket/getnameinfo.c
@@ -34,11 +34,11 @@
* but INRIA implementation returns EAI_xxx defined for getaddrinfo().
*/
-#include "ruby/config.h"
+#include "config.h"
#include <stdio.h>
#include <sys/types.h>
#ifndef _WIN32
-#if defined(__BEOS__) && !defined(__HAIKU__) && !defined(BONE)
+#if defined(__BEOS__)
# include <net/socket.h>
#else
# include <sys/socket.h>
@@ -57,7 +57,6 @@
#endif
#ifdef _WIN32
#include <winsock2.h>
-#include <ws2tcpip.h>
#define snprintf _snprintf
#endif
@@ -111,12 +110,13 @@ static struct afd {
#define ENI_FAMILY 5
#define ENI_SALEN 6
-#ifdef __HAIKU__
-#define HAVE_INET_NTOP
-#endif
#ifndef HAVE_INET_NTOP
static const char *
-inet_ntop(int af, const void *addr, char *numaddr, size_t numaddr_len)
+inet_ntop(af, addr, numaddr, numaddr_len)
+ int af;
+ const void *addr;
+ char *numaddr;
+ size_t numaddr_len;
{
#ifdef HAVE_INET_NTOA
struct in_addr in;
@@ -133,9 +133,17 @@ inet_ntop(int af, const void *addr, char *numaddr, size_t numaddr_len)
#endif
int
-getnameinfo(const struct sockaddr *sa, size_t salen, char *host, size_t hostlen, char *serv, size_t servlen, int flags)
+getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)
+ const struct sockaddr *sa;
+ size_t salen;
+ char *host;
+ size_t hostlen;
+ char *serv;
+ size_t servlen;
+ int flags;
{
struct afd *afd;
+ struct servent *sp;
struct hostent *hp;
u_short port;
int family, len, i;
@@ -177,7 +185,7 @@ getnameinfo(const struct sockaddr *sa, size_t salen, char *host, size_t hostlen,
strcpy(serv, numserv);
} else {
#if defined(HAVE_GETSERVBYPORT)
- struct servent *sp = getservbyport(port, (flags & NI_DGRAM) ? "udp" : "tcp");
+ sp = getservbyport(port, (flags & NI_DGRAM) ? "udp" : "tcp");
if (sp) {
if (strlen(sp->s_name) + 1 > servlen)
return ENI_MEMORY;
diff --git a/ext/socket/init.c b/ext/socket/init.c
deleted file mode 100644
index ed85e0b503..0000000000
--- a/ext/socket/init.c
+++ /dev/null
@@ -1,558 +0,0 @@
-/************************************************
-
- init.c -
-
- created at: Thu Mar 31 12:21:29 JST 1994
-
- Copyright (C) 1993-2007 Yukihiro Matsumoto
-
-************************************************/
-
-#include "rubysocket.h"
-
-VALUE rb_cBasicSocket;
-VALUE rb_cIPSocket;
-VALUE rb_cTCPSocket;
-VALUE rb_cTCPServer;
-VALUE rb_cUDPSocket;
-#ifdef AF_UNIX
-VALUE rb_cUNIXSocket;
-VALUE rb_cUNIXServer;
-#endif
-VALUE rb_cSocket;
-VALUE rb_cAddrinfo;
-
-VALUE rb_eSocket;
-
-#ifdef SOCKS
-VALUE rb_cSOCKSSocket;
-#endif
-
-int rsock_do_not_reverse_lookup = 0;
-
-void
-rsock_raise_socket_error(const char *reason, int error)
-{
-#ifdef EAI_SYSTEM
- if (error == EAI_SYSTEM) rb_sys_fail(reason);
-#endif
- rb_raise(rb_eSocket, "%s: %s", reason, gai_strerror(error));
-}
-
-VALUE
-rsock_init_sock(VALUE sock, int fd)
-{
- rb_io_t *fp;
-
- MakeOpenFile(sock, fp);
- fp->fd = fd;
- fp->mode = FMODE_READWRITE|FMODE_DUPLEX;
- rb_io_ascii8bit_binmode(sock);
- if (rsock_do_not_reverse_lookup) {
- fp->mode |= FMODE_NOREVLOOKUP;
- }
- rb_io_synchronized(fp);
-
- return sock;
-}
-
-VALUE
-rsock_sendto_blocking(void *data)
-{
- struct rsock_send_arg *arg = data;
- VALUE mesg = arg->mesg;
- return (VALUE)sendto(arg->fd, RSTRING_PTR(mesg), RSTRING_LEN(mesg),
- arg->flags, arg->to, arg->tolen);
-}
-
-VALUE
-rsock_send_blocking(void *data)
-{
- struct rsock_send_arg *arg = data;
- VALUE mesg = arg->mesg;
- return (VALUE)send(arg->fd, RSTRING_PTR(mesg), RSTRING_LEN(mesg),
- arg->flags);
-}
-
-struct recvfrom_arg {
- int fd, flags;
- VALUE str;
- socklen_t alen;
- struct sockaddr_storage buf;
-};
-
-static VALUE
-recvfrom_blocking(void *data)
-{
- struct recvfrom_arg *arg = data;
- return (VALUE)recvfrom(arg->fd, RSTRING_PTR(arg->str), RSTRING_LEN(arg->str),
- arg->flags, (struct sockaddr*)&arg->buf, &arg->alen);
-}
-
-VALUE
-rsock_s_recvfrom(VALUE sock, int argc, VALUE *argv, enum sock_recv_type from)
-{
- rb_io_t *fptr;
- VALUE str, klass;
- struct recvfrom_arg arg;
- VALUE len, flg;
- long buflen;
- long slen;
-
- rb_scan_args(argc, argv, "11", &len, &flg);
-
- if (flg == Qnil) arg.flags = 0;
- else arg.flags = NUM2INT(flg);
- buflen = NUM2INT(len);
-
- GetOpenFile(sock, fptr);
- if (rb_io_read_pending(fptr)) {
- rb_raise(rb_eIOError, "recv for buffered IO");
- }
- arg.fd = fptr->fd;
- arg.alen = sizeof(arg.buf);
-
- arg.str = str = rb_tainted_str_new(0, buflen);
- klass = RBASIC(str)->klass;
- RBASIC(str)->klass = 0;
-
- while (rb_io_check_closed(fptr),
- rb_thread_wait_fd(arg.fd),
- (slen = BLOCKING_REGION(recvfrom_blocking, &arg)) < 0) {
- if (!rb_io_wait_readable(fptr->fd)) {
- rb_sys_fail("recvfrom(2)");
- }
- if (RBASIC(str)->klass || RSTRING_LEN(str) != buflen) {
- rb_raise(rb_eRuntimeError, "buffer string modified");
- }
- }
-
- RBASIC(str)->klass = klass;
- if (slen < RSTRING_LEN(str)) {
- rb_str_set_len(str, slen);
- }
- rb_obj_taint(str);
- switch (from) {
- case RECV_RECV:
- return str;
- case RECV_IP:
-#if 0
- if (arg.alen != sizeof(struct sockaddr_in)) {
- rb_raise(rb_eTypeError, "sockaddr size differs - should not happen");
- }
-#endif
- if (arg.alen && arg.alen != sizeof(arg.buf)) /* OSX doesn't return a from result for connection-oriented sockets */
- return rb_assoc_new(str, rsock_ipaddr((struct sockaddr*)&arg.buf, fptr->mode & FMODE_NOREVLOOKUP));
- else
- return rb_assoc_new(str, Qnil);
-
-#ifdef HAVE_SYS_UN_H
- case RECV_UNIX:
- return rb_assoc_new(str, rsock_unixaddr((struct sockaddr_un*)&arg.buf, arg.alen));
-#endif
- case RECV_SOCKET:
- return rb_assoc_new(str, rsock_io_socket_addrinfo(sock, (struct sockaddr*)&arg.buf, arg.alen));
- default:
- rb_bug("rsock_s_recvfrom called with bad value");
- }
-}
-
-VALUE
-rsock_s_recvfrom_nonblock(VALUE sock, int argc, VALUE *argv, enum sock_recv_type from)
-{
- rb_io_t *fptr;
- VALUE str;
- struct sockaddr_storage buf;
- socklen_t alen = sizeof buf;
- VALUE len, flg;
- long buflen;
- long slen;
- int fd, flags;
- VALUE addr = Qnil;
-
- rb_scan_args(argc, argv, "11", &len, &flg);
-
- if (flg == Qnil) flags = 0;
- else flags = NUM2INT(flg);
- buflen = NUM2INT(len);
-
-#ifdef MSG_DONTWAIT
- /* MSG_DONTWAIT avoids the race condition between fcntl and recvfrom.
- It is not portable, though. */
- flags |= MSG_DONTWAIT;
-#endif
-
- GetOpenFile(sock, fptr);
- if (rb_io_read_pending(fptr)) {
- rb_raise(rb_eIOError, "recvfrom for buffered IO");
- }
- fd = fptr->fd;
-
- str = rb_tainted_str_new(0, buflen);
-
- rb_io_check_closed(fptr);
- rb_io_set_nonblock(fptr);
- slen = recvfrom(fd, RSTRING_PTR(str), buflen, flags, (struct sockaddr*)&buf, &alen);
-
- if (slen < 0) {
- switch (errno) {
- case EAGAIN:
-#if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
- case EWOULDBLOCK:
-#endif
- rb_mod_sys_fail(rb_mWaitReadable, "recvfrom(2) would block");
- }
- rb_sys_fail("recvfrom(2)");
- }
- if (slen < RSTRING_LEN(str)) {
- rb_str_set_len(str, slen);
- }
- rb_obj_taint(str);
- switch (from) {
- case RECV_RECV:
- return str;
-
- case RECV_IP:
- if (alen && alen != sizeof(buf)) /* connection-oriented socket may not return a from result */
- addr = rsock_ipaddr((struct sockaddr*)&buf, fptr->mode & FMODE_NOREVLOOKUP);
- break;
-
- case RECV_SOCKET:
- addr = rsock_io_socket_addrinfo(sock, (struct sockaddr*)&buf, alen);
- break;
-
- default:
- rb_bug("rsock_s_recvfrom_nonblock called with bad value");
- }
- return rb_assoc_new(str, addr);
-}
-
-int
-rsock_socket(int domain, int type, int proto)
-{
- int fd;
-
- fd = socket(domain, type, proto);
- if (fd < 0) {
- if (errno == EMFILE || errno == ENFILE) {
- rb_gc();
- fd = socket(domain, type, proto);
- }
- }
- return fd;
-}
-
-static int
-wait_connectable0(int fd, rb_fdset_t *fds_w, rb_fdset_t *fds_e)
-{
- int sockerr;
- socklen_t sockerrlen;
-
- for (;;) {
- rb_fd_zero(fds_w);
- rb_fd_zero(fds_e);
-
- rb_fd_set(fd, fds_w);
- rb_fd_set(fd, fds_e);
-
- rb_thread_select(fd+1, 0, rb_fd_ptr(fds_w), rb_fd_ptr(fds_e), 0);
-
- if (rb_fd_isset(fd, fds_w)) {
- return 0;
- }
- else if (rb_fd_isset(fd, fds_e)) {
- sockerrlen = sizeof(sockerr);
- if (getsockopt(fd, SOL_SOCKET, SO_ERROR, (void *)&sockerr,
- &sockerrlen) == 0) {
- if (sockerr == 0)
- continue; /* workaround for winsock */
- errno = sockerr;
- }
- return -1;
- }
- }
-}
-
-struct wait_connectable_arg {
- int fd;
- rb_fdset_t fds_w;
- rb_fdset_t fds_e;
-};
-
-#ifdef HAVE_RB_FD_INIT
-static VALUE
-try_wait_connectable(VALUE arg)
-{
- struct wait_connectable_arg *p = (struct wait_connectable_arg *)arg;
- return (VALUE)wait_connectable0(p->fd, &p->fds_w, &p->fds_e);
-}
-
-static VALUE
-wait_connectable_ensure(VALUE arg)
-{
- struct wait_connectable_arg *p = (struct wait_connectable_arg *)arg;
- rb_fd_term(&p->fds_w);
- rb_fd_term(&p->fds_e);
- return Qnil;
-}
-#endif
-
-static int
-wait_connectable(int fd)
-{
- struct wait_connectable_arg arg;
-
- rb_fd_init(&arg.fds_w);
- rb_fd_init(&arg.fds_e);
-#ifdef HAVE_RB_FD_INIT
- arg.fd = fd;
- return (int)rb_ensure(try_wait_connectable, (VALUE)&arg,
- wait_connectable_ensure,(VALUE)&arg);
-#else
- return wait_connectable0(fd, &arg.fds_w, &arg.fds_e);
-#endif
-}
-
-#ifdef __CYGWIN__
-#define WAIT_IN_PROGRESS 10
-#endif
-#ifdef __APPLE__
-#define WAIT_IN_PROGRESS 10
-#endif
-#ifdef __linux__
-/* returns correct error */
-#define WAIT_IN_PROGRESS 0
-#endif
-#ifndef WAIT_IN_PROGRESS
-/* BSD origin code apparently has a problem */
-#define WAIT_IN_PROGRESS 1
-#endif
-
-struct connect_arg {
- int fd;
- const struct sockaddr *sockaddr;
- socklen_t len;
-};
-
-static VALUE
-connect_blocking(void *data)
-{
- struct connect_arg *arg = data;
- return (VALUE)connect(arg->fd, arg->sockaddr, arg->len);
-}
-
-#if defined(SOCKS) && !defined(SOCKS5)
-static VALUE
-socks_connect_blocking(void *data)
-{
- struct connect_arg *arg = data;
- return (VALUE)Rconnect(arg->fd, arg->sockaddr, arg->len);
-}
-#endif
-
-int
-rsock_connect(int fd, const struct sockaddr *sockaddr, int len, int socks)
-{
- int status;
- rb_blocking_function_t *func = connect_blocking;
- struct connect_arg arg;
-#if WAIT_IN_PROGRESS > 0
- int wait_in_progress = -1;
- int sockerr;
- socklen_t sockerrlen;
-#endif
-
- arg.fd = fd;
- arg.sockaddr = sockaddr;
- arg.len = len;
-#if defined(SOCKS) && !defined(SOCKS5)
- if (socks) func = socks_connect_blocking;
-#endif
- for (;;) {
- status = (int)BLOCKING_REGION(func, &arg);
- if (status < 0) {
- switch (errno) {
- case EAGAIN:
-#ifdef EINPROGRESS
- case EINPROGRESS:
-#endif
-#if WAIT_IN_PROGRESS > 0
- sockerrlen = sizeof(sockerr);
- status = getsockopt(fd, SOL_SOCKET, SO_ERROR, (void *)&sockerr, &sockerrlen);
- if (status) break;
- if (sockerr) {
- status = -1;
- errno = sockerr;
- break;
- }
-#endif
-#ifdef EALREADY
- case EALREADY:
-#endif
-#if WAIT_IN_PROGRESS > 0
- wait_in_progress = WAIT_IN_PROGRESS;
-#endif
- status = wait_connectable(fd);
- if (status) {
- break;
- }
- errno = 0;
- continue;
-
-#if WAIT_IN_PROGRESS > 0
- case EINVAL:
- if (wait_in_progress-- > 0) {
- /*
- * connect() after EINPROGRESS returns EINVAL on
- * some platforms, need to check true error
- * status.
- */
- sockerrlen = sizeof(sockerr);
- status = getsockopt(fd, SOL_SOCKET, SO_ERROR, (void *)&sockerr, &sockerrlen);
- if (!status && !sockerr) {
- struct timeval tv = {0, 100000};
- rb_thread_wait_for(tv);
- continue;
- }
- status = -1;
- errno = sockerr;
- }
- break;
-#endif
-
-#ifdef EISCONN
- case EISCONN:
- status = 0;
- errno = 0;
- break;
-#endif
- default:
- break;
- }
- }
- return status;
- }
-}
-
-static void
-make_fd_nonblock(int fd)
-{
- int flags;
-#ifdef F_GETFL
- flags = fcntl(fd, F_GETFL);
- if (flags == -1) {
- rb_sys_fail(0);
- }
-#else
- flags = 0;
-#endif
- flags |= O_NONBLOCK;
- if (fcntl(fd, F_SETFL, flags) == -1) {
- rb_sys_fail(0);
- }
-}
-
-VALUE
-rsock_s_accept_nonblock(VALUE klass, rb_io_t *fptr, struct sockaddr *sockaddr, socklen_t *len)
-{
- int fd2;
-
- rb_secure(3);
- rb_io_set_nonblock(fptr);
- fd2 = accept(fptr->fd, (struct sockaddr*)sockaddr, len);
- if (fd2 < 0) {
- switch (errno) {
- case EAGAIN:
-#if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
- case EWOULDBLOCK:
-#endif
- case ECONNABORTED:
-#if defined EPROTO
- case EPROTO:
-#endif
- rb_mod_sys_fail(rb_mWaitReadable, "accept(2) would block");
- }
- rb_sys_fail("accept(2)");
- }
- make_fd_nonblock(fd2);
- return rsock_init_sock(rb_obj_alloc(klass), fd2);
-}
-
-struct accept_arg {
- int fd;
- struct sockaddr *sockaddr;
- socklen_t *len;
-};
-
-static VALUE
-accept_blocking(void *data)
-{
- struct accept_arg *arg = data;
- return (VALUE)accept(arg->fd, arg->sockaddr, arg->len);
-}
-
-VALUE
-rsock_s_accept(VALUE klass, int fd, struct sockaddr *sockaddr, socklen_t *len)
-{
- int fd2;
- int retry = 0;
- struct accept_arg arg;
-
- rb_secure(3);
- arg.fd = fd;
- arg.sockaddr = sockaddr;
- arg.len = len;
- retry:
- rb_thread_wait_fd(fd);
- fd2 = BLOCKING_REGION(accept_blocking, &arg);
- if (fd2 < 0) {
- switch (errno) {
- case EMFILE:
- case ENFILE:
- if (retry) break;
- rb_gc();
- retry = 1;
- goto retry;
- default:
- if (!rb_io_wait_readable(fd)) break;
- retry = 0;
- goto retry;
- }
- rb_sys_fail(0);
- }
- if (!klass) return INT2NUM(fd2);
- return rsock_init_sock(rb_obj_alloc(klass), fd2);
-}
-
-int
-rsock_getfamily(int sockfd)
-{
- struct sockaddr_storage ss;
- socklen_t sslen = sizeof(ss);
-
- ss.ss_family = AF_UNSPEC;
- if (getsockname(sockfd, (struct sockaddr*)&ss, &sslen) < 0)
- return AF_UNSPEC;
-
- return ss.ss_family;
-}
-
-/*
- * SocketError is the error class for socket.
- */
-void
-Init_socket_init()
-{
- rb_eSocket = rb_define_class("SocketError", rb_eStandardError);
- Init_ipsocket();
- Init_tcpsocket();
- Init_tcpserver();
- Init_sockssocket();
- Init_udpsocket();
- Init_unixsocket();
- Init_unixserver();
- Init_sockopt();
- Init_ancdata();
- Init_addrinfo();
- Init_socket_constants();
-}
diff --git a/ext/socket/ipsocket.c b/ext/socket/ipsocket.c
deleted file mode 100644
index 35025803a9..0000000000
--- a/ext/socket/ipsocket.c
+++ /dev/null
@@ -1,252 +0,0 @@
-/************************************************
-
- ipsocket.c -
-
- created at: Thu Mar 31 12:21:29 JST 1994
-
- Copyright (C) 1993-2007 Yukihiro Matsumoto
-
-************************************************/
-
-#include "rubysocket.h"
-
-struct inetsock_arg
-{
- VALUE sock;
- struct {
- VALUE host, serv;
- struct addrinfo *res;
- } remote, local;
- int type;
- int fd;
-};
-
-static VALUE
-inetsock_cleanup(struct inetsock_arg *arg)
-{
- if (arg->remote.res) {
- freeaddrinfo(arg->remote.res);
- arg->remote.res = 0;
- }
- if (arg->local.res) {
- freeaddrinfo(arg->local.res);
- arg->local.res = 0;
- }
- if (arg->fd >= 0) {
- close(arg->fd);
- }
- return Qnil;
-}
-
-static VALUE
-init_inetsock_internal(struct inetsock_arg *arg)
-{
- int type = arg->type;
- struct addrinfo *res;
- int fd, status = 0;
- const char *syscall = 0;
-
- arg->remote.res = rsock_addrinfo(arg->remote.host, arg->remote.serv, SOCK_STREAM,
- (type == INET_SERVER) ? AI_PASSIVE : 0);
- /*
- * Maybe also accept a local address
- */
-
- if (type != INET_SERVER && (!NIL_P(arg->local.host) || !NIL_P(arg->local.serv))) {
- arg->local.res = rsock_addrinfo(arg->local.host, arg->local.serv, SOCK_STREAM, 0);
- }
-
- arg->fd = fd = -1;
- for (res = arg->remote.res; res; res = res->ai_next) {
-#if !defined(INET6) && defined(AF_INET6)
- if (res->ai_family == AF_INET6)
- continue;
-#endif
- status = rsock_socket(res->ai_family,res->ai_socktype,res->ai_protocol);
- syscall = "socket(2)";
- fd = status;
- if (fd < 0) {
- continue;
- }
- arg->fd = fd;
- if (type == INET_SERVER) {
-#if !defined(_WIN32) && !defined(__CYGWIN__)
- status = 1;
- setsockopt(fd, SOL_SOCKET, SO_REUSEADDR,
- (char*)&status, sizeof(status));
-#endif
- status = bind(fd, res->ai_addr, res->ai_addrlen);
- syscall = "bind(2)";
- }
- else {
- if (arg->local.res) {
- status = bind(fd, arg->local.res->ai_addr, arg->local.res->ai_addrlen);
- syscall = "bind(2)";
- }
-
- if (status >= 0) {
- status = rsock_connect(fd, res->ai_addr, res->ai_addrlen,
- (type == INET_SOCKS));
- syscall = "connect(2)";
- }
- }
-
- if (status < 0) {
- close(fd);
- arg->fd = fd = -1;
- continue;
- } else
- break;
- }
- if (status < 0) {
- rb_sys_fail(syscall);
- }
-
- arg->fd = -1;
-
- if (type == INET_SERVER)
- listen(fd, 5);
-
- /* create new instance */
- return rsock_init_sock(arg->sock, fd);
-}
-
-VALUE
-rsock_init_inetsock(VALUE sock, VALUE remote_host, VALUE remote_serv,
- VALUE local_host, VALUE local_serv, int type)
-{
- struct inetsock_arg arg;
- arg.sock = sock;
- arg.remote.host = remote_host;
- arg.remote.serv = remote_serv;
- arg.remote.res = 0;
- arg.local.host = local_host;
- arg.local.serv = local_serv;
- arg.local.res = 0;
- arg.type = type;
- arg.fd = -1;
- return rb_ensure(init_inetsock_internal, (VALUE)&arg,
- inetsock_cleanup, (VALUE)&arg);
-}
-
-/*
- * call-seq:
- * ipsocket.addr => [address_family, port, hostname, numeric_address]
- *
- * Returns the local address as an array which contains
- * address_family, port, hostname and numeric_address.
- *
- * hostname is obtained from numeric_address using reverse lookup.
- * If ipsocket.do_not_reverse_lookup is true,
- * hostname is same as numeric_address.
- *
- * TCPSocket.open("www.ruby-lang.org", 80) {|sock|
- * p sock.addr #=> ["AF_INET", 49429, "hal", "192.168.0.128"]
- * }
- *
- */
-static VALUE
-ip_addr(VALUE sock)
-{
- rb_io_t *fptr;
- struct sockaddr_storage addr;
- socklen_t len = sizeof addr;
-
- GetOpenFile(sock, fptr);
-
- if (getsockname(fptr->fd, (struct sockaddr*)&addr, &len) < 0)
- rb_sys_fail("getsockname(2)");
- return rsock_ipaddr((struct sockaddr*)&addr, fptr->mode & FMODE_NOREVLOOKUP);
-}
-
-/*
- * call-seq:
- * ipsocket.peeraddr => [address_family, port, hostname, numeric_address]
- *
- * Returns the remote address as an array which contains
- * address_family, port, hostname and numeric_address.
- * It is defined for connection oritented socket such as TCPSocket.
- *
- * TCPSocket.open("www.ruby-lang.org", 80) {|sock|
- * p sock.peeraddr #=> ["AF_INET", 80, "carbon.ruby-lang.org", "221.186.184.68"]
- * }
- *
- */
-static VALUE
-ip_peeraddr(VALUE sock)
-{
- rb_io_t *fptr;
- struct sockaddr_storage addr;
- socklen_t len = sizeof addr;
-
- GetOpenFile(sock, fptr);
-
- if (getpeername(fptr->fd, (struct sockaddr*)&addr, &len) < 0)
- rb_sys_fail("getpeername(2)");
- return rsock_ipaddr((struct sockaddr*)&addr, fptr->mode & FMODE_NOREVLOOKUP);
-}
-
-/*
- * call-seq:
- * ipsocket.recvfrom(maxlen) => [mesg, ipaddr]
- * ipsocket.recvfrom(maxlen, flags) => [mesg, ipaddr]
- *
- * Receives a message and return the message as a string and
- * an address which the message come from.
- *
- * _maxlen_ is the maximum number of bytes to receive.
- *
- * _flags_ should be a bitwise OR of Socket::MSG_* constants.
- *
- * ipaddr is same as IPSocket#{peeraddr,addr}.
- *
- * u1 = UDPSocket.new
- * u1.bind("127.0.0.1", 4913)
- * u2 = UDPSocket.new
- * u2.send "uuuu", 0, "127.0.0.1", 4913
- * p u1.recvfrom(10) #=> ["uuuu", ["AF_INET", 33230, "localhost", "127.0.0.1"]]
- *
- */
-static VALUE
-ip_recvfrom(int argc, VALUE *argv, VALUE sock)
-{
- return rsock_s_recvfrom(sock, argc, argv, RECV_IP);
-}
-
-/*
- * call-seq:
- * IPSocket.getaddress(host) => ipaddress
- *
- * Lookups IP address of _host_.
- *
- * IPSocket.getaddress("localhost") #=> "127.0.0.1"
- * IPSocket.getaddress("ip6-localhost") #=> "::1"
- *
- */
-static VALUE
-ip_s_getaddress(VALUE obj, VALUE host)
-{
- struct sockaddr_storage addr;
- struct addrinfo *res = rsock_addrinfo(host, Qnil, SOCK_STREAM, 0);
-
- /* just take the first one */
- memcpy(&addr, res->ai_addr, res->ai_addrlen);
- freeaddrinfo(res);
-
- return rsock_make_ipaddr((struct sockaddr*)&addr);
-}
-
-/*
- * IPSocket class
- */
-void
-Init_ipsocket(void)
-{
- rb_cIPSocket = rb_define_class("IPSocket", rb_cBasicSocket);
- rb_define_method(rb_cIPSocket, "addr", ip_addr, 0);
- rb_define_method(rb_cIPSocket, "peeraddr", ip_peeraddr, 0);
- rb_define_method(rb_cIPSocket, "recvfrom", ip_recvfrom, -1);
- rb_define_singleton_method(rb_cIPSocket, "getaddress", ip_s_getaddress, 1);
- rb_undef_method(rb_cIPSocket, "getpeereid");
-
-}
diff --git a/ext/socket/lib/socket.rb b/ext/socket/lib/socket.rb
deleted file mode 100644
index b3b31d87f7..0000000000
--- a/ext/socket/lib/socket.rb
+++ /dev/null
@@ -1,729 +0,0 @@
-require 'socket.so'
-
-class Addrinfo
- # creates an Addrinfo object from the arguments.
- #
- # The arguments are interpreted as similar to self.
- #
- # Addrinfo.tcp("0.0.0.0", 4649).family_addrinfo("www.ruby-lang.org", 80)
- # #=> #<Addrinfo: 221.186.184.68:80 TCP (www.ruby-lang.org:80)>
- #
- # Addrinfo.unix("/tmp/sock").family_addrinfo("/tmp/sock2")
- # #=> #<Addrinfo: /tmp/sock2 SOCK_STREAM>
- #
- def family_addrinfo(*args)
- if args.empty?
- raise ArgumentError, "no address specified"
- elsif Addrinfo === args.first
- raise ArgumentError, "too many arguments" if args.length != 1
- elsif self.ip?
- raise ArgumentError, "IP address needs host and port but #{args.length} arguments given" if args.length != 2
- host, port = args
- Addrinfo.getaddrinfo(host, port, self.pfamily, self.socktype, self.protocol)[0]
- elsif self.unix?
- raise ArgumentError, "UNIX socket needs single path argument but #{args.length} arguments given" if args.length != 1
- path, = args
- Addrinfo.unix(path)
- else
- raise ArgumentError, "unexpected family"
- end
- end
-
- def connect_internal(local_addrinfo)
- sock = Socket.new(self.pfamily, self.socktype, self.protocol)
- begin
- sock.ipv6only! if self.ipv6?
- sock.bind local_addrinfo if local_addrinfo
- sock.connect(self)
- if block_given?
- yield sock
- else
- sock
- end
- ensure
- sock.close if !sock.closed? && (block_given? || $!)
- end
- end
- private :connect_internal
-
- # creates a socket connected to the address of self.
- #
- # If one or more arguments given as _local_addr_args_,
- # it is used as the local address of the socket.
- # _local_addr_args_ is given for family_addrinfo to obtain actual address.
- #
- # If no arguments given, the local address of the socket is not bound.
- #
- # If a block is given, it is called with the socket and the value of the block is returned.
- # The socket is returned otherwise.
- #
- # Addrinfo.tcp("www.ruby-lang.org", 80).connect_from("0.0.0.0", 4649) {|s|
- # s.print "GET / HTTP/1.0\r\n\r\n"
- # p s.read
- # }
- #
- # # Addrinfo object can be taken for the argument.
- # Addrinfo.tcp("www.ruby-lang.org", 80).connect_from(Addrinfo.tcp("0.0.0.0", 4649)) {|s|
- # s.print "GET / HTTP/1.0\r\n\r\n"
- # p s.read
- # }
- #
- def connect_from(*local_addr_args, &block)
- connect_internal(family_addrinfo(*local_addr_args), &block)
- end
-
- # creates a socket connected to the address of self.
- #
- # If a block is given, it is called with the socket and the value of the block is returned.
- # The socket is returned otherwise.
- #
- # Addrinfo.tcp("www.ruby-lang.org", 80).connect {|s|
- # s.print "GET / HTTP/1.0\r\n\r\n"
- # p s.read
- # }
- #
- def connect(&block)
- connect_internal(nil, &block)
- end
-
- # creates a socket connected to _remote_addr_args_ and bound to self.
- #
- # If a block is given, it is called with the socket and the value of the block is returned.
- # The socket is returned otherwise.
- #
- # Addrinfo.tcp("0.0.0.0", 4649).connect_to("www.ruby-lang.org", 80) {|s|
- # s.print "GET / HTTP/1.0\r\n\r\n"
- # p s.read
- # }
- #
- def connect_to(*remote_addr_args, &block)
- remote_addrinfo = family_addrinfo(*remote_addr_args)
- remote_addrinfo.send(:connect_internal, self, &block)
- end
-
- # creates a socket bound to self.
- #
- # If a block is given, it is called with the socket and the value of the block is returned.
- # The socket is returned otherwise.
- #
- # Addrinfo.udp("0.0.0.0", 9981).bind {|s|
- # s.local_address.connect {|s| s.send "hello", 0 }
- # p s.recv(10) #=> "hello"
- # }
- #
- def bind
- sock = Socket.new(self.pfamily, self.socktype, self.protocol)
- begin
- sock.ipv6only! if self.ipv6?
- sock.setsockopt(:SOCKET, :REUSEADDR, 1)
- sock.bind(self)
- if block_given?
- yield sock
- else
- sock
- end
- ensure
- sock.close if !sock.closed? && (block_given? || $!)
- end
- end
-
- # creates a listening socket bound to self.
- def listen(backlog=5)
- sock = Socket.new(self.pfamily, self.socktype, self.protocol)
- begin
- sock.ipv6only! if self.ipv6?
- sock.setsockopt(:SOCKET, :REUSEADDR, 1)
- sock.bind(self)
- sock.listen(backlog)
- if block_given?
- yield sock
- else
- sock
- end
- ensure
- sock.close if !sock.closed? && (block_given? || $!)
- end
- end
-
- # iterates over the list of Addrinfo objects obtained by Addrinfo.getaddrinfo.
- #
- # Addrinfo.foreach(nil, 80) {|x| p x }
- # #=> #<Addrinfo: 127.0.0.1:80 TCP (:80)>
- # # #<Addrinfo: 127.0.0.1:80 UDP (:80)>
- # # #<Addrinfo: [::1]:80 TCP (:80)>
- # # #<Addrinfo: [::1]:80 UDP (:80)>
- #
- def self.foreach(nodename, service, family=nil, socktype=nil, protocol=nil, flags=nil, &block)
- Addrinfo.getaddrinfo(nodename, service, family, socktype, protocol, flags).each(&block)
- end
-end
-
-class BasicSocket
- # Returns an address of the socket suitable for connect in the local machine.
- #
- # This method returns _self_.local_address, except following condition.
- #
- # - IPv4 unspecified address (0.0.0.0) is replaced by IPv4 loopback address (127.0.0.1).
- # - IPv6 unspecified address (::) is replaced by IPv6 loopback address (::1).
- #
- # If the local address is not suitable for connect, SocketError is raised.
- # IPv4 and IPv6 address which port is 0 is not suitable for connect.
- # Unix domain socket which has no path is not suitable for connect.
- #
- # Addrinfo.tcp("0.0.0.0", 0).listen {|serv|
- # p serv.connect_address #=> #<Addrinfo: 127.0.0.1:53660 TCP>
- # serv.connect_address.connect {|c|
- # s, _ = serv.accept
- # p [c, s] #=> [#<Socket:fd 4>, #<Socket:fd 6>]
- # }
- # }
- #
- def connect_address
- addr = local_address
- afamily = addr.afamily
- if afamily == Socket::AF_INET
- raise SocketError, "unbound IPv4 socket" if addr.ip_port == 0
- if addr.ip_address == "0.0.0.0"
- addr = Addrinfo.new(["AF_INET", addr.ip_port, nil, "127.0.0.1"], addr.pfamily, addr.socktype, addr.protocol)
- end
- elsif defined?(Socket::AF_INET6) && afamily == Socket::AF_INET6
- raise SocketError, "unbound IPv6 socket" if addr.ip_port == 0
- if addr.ip_address == "::"
- addr = Addrinfo.new(["AF_INET6", addr.ip_port, nil, "::1"], addr.pfamily, addr.socktype, addr.protocol)
- elsif addr.ip_address == "0.0.0.0" # MacOS X 10.4 returns "a.b.c.d" for IPv4-mapped IPv6 address.
- addr = Addrinfo.new(["AF_INET6", addr.ip_port, nil, "::1"], addr.pfamily, addr.socktype, addr.protocol)
- end
- elsif defined?(Socket::AF_UNIX) && afamily == Socket::AF_UNIX
- raise SocketError, "unbound Unix socket" if addr.unix_path == ""
- end
- addr
- end
-end
-
-class Socket
- # enable the socket option IPV6_V6ONLY if IPV6_V6ONLY is available.
- def ipv6only!
- if defined? Socket::IPV6_V6ONLY
- self.setsockopt(:IPV6, :V6ONLY, 1)
- end
- end
-
- # creates a new socket object connected to host:port using TCP/IP.
- #
- # If local_host:local_port is given,
- # the socket is bound to it.
- #
- # If a block is given, the block is called with the socket.
- # The value of the block is returned.
- # The socket is closed when this method returns.
- #
- # If no block is given, the socket is returned.
- #
- # Socket.tcp("www.ruby-lang.org", 80) {|sock|
- # sock.print "GET / HTTP/1.0\r\n\r\n"
- # sock.close_write
- # print sock.read
- # }
- #
- def self.tcp(host, port, local_host=nil, local_port=nil) # :yield: socket
- last_error = nil
- ret = nil
-
- local_addr_list = nil
- if local_host != nil || local_port != nil
- local_addr_list = Addrinfo.getaddrinfo(local_host, local_port, nil, :STREAM, nil)
- end
-
- Addrinfo.foreach(host, port, nil, :STREAM) {|ai|
- if local_addr_list
- local_addr = local_addr_list.find {|local_ai| local_ai.afamily == ai.afamily }
- next if !local_addr
- else
- local_addr = nil
- end
- begin
- sock = local_addr ? ai.connect_from(local_addr) : ai.connect
- rescue SystemCallError
- last_error = $!
- next
- end
- ret = sock
- break
- }
- if !ret
- if last_error
- raise last_error
- else
- raise SocketError, "no appropriate local address"
- end
- end
- if block_given?
- begin
- yield ret
- ensure
- ret.close if !ret.closed?
- end
- else
- ret
- end
- end
-
- def self.ip_sockets_port0(ai_list, reuseaddr)
- begin
- sockets = []
- port = nil
- ai_list.each {|ai|
- begin
- s = Socket.new(ai.pfamily, ai.socktype, ai.protocol)
- rescue SystemCallError
- next
- end
- sockets << s
- s.ipv6only! if ai.ipv6?
- if reuseaddr
- s.setsockopt(:SOCKET, :REUSEADDR, 1)
- end
- if !port
- s.bind(ai)
- port = s.local_address.ip_port
- else
- s.bind(ai.family_addrinfo(ai.ip_address, port))
- end
- }
- rescue Errno::EADDRINUSE
- sockets.each {|s|
- s.close
- }
- retry
- end
- sockets
- ensure
- sockets.each {|s| s.close if !s.closed? } if $!
- end
- class << self
- private :ip_sockets_port0
- end
-
- def self.tcp_server_sockets_port0(host)
- ai_list = Addrinfo.getaddrinfo(host, 0, nil, :STREAM, nil, Socket::AI_PASSIVE)
- sockets = ip_sockets_port0(ai_list, true)
- sockets.each {|s|
- s.listen(5)
- }
- sockets
- ensure
- sockets.each {|s| s.close if !s.closed? } if $! && sockets
- end
- class << self
- private :tcp_server_sockets_port0
- end
-
- # creates TCP/IP server sockets for _host_ and _port_.
- # _host_ is optional.
- #
- # If no block given,
- # it returns an array of listening sockets.
- #
- # If a block is given, the block is called with the sockets.
- # The value of the block is returned.
- # The socket is closed when this method returns.
- #
- # If _port_ is 0, actual port number is choosen dynamically.
- # However all sockets in the result has same port number.
- #
- # # tcp_server_sockets returns two sockets.
- # sockets = Socket.tcp_server_sockets(1296)
- # p sockets #=> [#<Socket:fd 3>, #<Socket:fd 4>]
- #
- # # The sockets contains IPv6 and IPv4 sockets.
- # sockets.each {|s| p s.local_address }
- # #=> #<Addrinfo: [::]:1296 TCP>
- # # #<Addrinfo: 0.0.0.0:1296 TCP>
- #
- # # IPv6 and IPv4 socket has same port number, 53114, even if it is choosen dynamically.
- # sockets = Socket.tcp_server_sockets(0)
- # sockets.each {|s| p s.local_address }
- # #=> #<Addrinfo: [::]:53114 TCP>
- # # #<Addrinfo: 0.0.0.0:53114 TCP>
- #
- # # The block is called with the sockets.
- # Socket.tcp_server_sockets(0) {|sockets|
- # p sockets #=> [#<Socket:fd 3>, #<Socket:fd 4>]
- # }
- #
- def self.tcp_server_sockets(host=nil, port)
- if port == 0
- sockets = tcp_server_sockets_port0(host)
- else
- begin
- last_error = nil
- sockets = []
- Addrinfo.foreach(host, port, nil, :STREAM, nil, Socket::AI_PASSIVE) {|ai|
- begin
- s = ai.listen
- rescue SystemCallError
- last_error = $!
- next
- end
- sockets << s
- }
- if sockets.empty?
- raise last_error
- end
- ensure
- sockets.each {|s| s.close if !s.closed? } if $!
- end
- end
- if block_given?
- begin
- yield sockets
- ensure
- sockets.each {|s| s.close if !s.closed? }
- end
- else
- sockets
- end
- end
-
- # yield socket and client address for each a connection accepted via given sockets.
- #
- # The arguments are a list of sockets.
- # The individual argument should be a socket or an array of sockets.
- #
- # This method yields the block sequentially.
- # It means that the next connection is not accepted until the block returns.
- # So concurrent mechanism, thread for example, should be used to service multiple clients at a time.
- #
- def self.accept_loop(*sockets) # :yield: socket, client_addrinfo
- sockets.flatten!(1)
- if sockets.empty?
- raise ArgumentError, "no sockets"
- end
- loop {
- readable, _, _ = IO.select(sockets)
- readable.each {|r|
- begin
- sock, addr = r.accept_nonblock
- rescue IO::WaitReadable
- next
- end
- yield sock, addr
- }
- }
- end
-
- # creates a TCP/IP server on _port_ and calls the block for each connection accepted.
- # The block is called with a socket and a client_address as an Addrinfo object.
- #
- # If _host_ is specified, it is used with _port_ to determine the server addresses.
- #
- # The socket is *not* closed when the block returns.
- # So application should close it explicitly.
- #
- # This method calls the block sequentially.
- # It means that the next connection is not accepted until the block returns.
- # So concurrent mechanism, thread for example, should be used to service multiple clients at a time.
- #
- # Note that Addrinfo.getaddrinfo is used to determine the server socket addresses.
- # When Addrinfo.getaddrinfo returns two or more addresses,
- # IPv4 and IPv6 address for example,
- # all of them are used.
- # Socket.tcp_server_loop succeeds if one socket can be used at least.
- #
- # # Sequential echo server.
- # # It services only one client at a time.
- # Socket.tcp_server_loop(16807) {|sock, client_addrinfo|
- # begin
- # IO.copy_stream(sock, sock)
- # ensure
- # sock.close
- # end
- # }
- #
- # # Threaded echo server
- # # It services multiple clients at a time.
- # # Note that it may accept connections too much.
- # Socket.tcp_server_loop(16807) {|sock, client_addrinfo|
- # Thread.new {
- # begin
- # IO.copy_stream(sock, sock)
- # ensure
- # sock.close
- # end
- # }
- # }
- #
- def self.tcp_server_loop(host=nil, port, &b) # :yield: socket, client_addrinfo
- tcp_server_sockets(host, port) {|sockets|
- accept_loop(sockets, &b)
- }
- end
-
- # :call-seq:
- # Socket.udp_server_sockets([host, ] port)
- #
- # Creates UDP/IP sockets for a UDP server.
- #
- # If no block given, it returns an array of sockets.
- #
- # If a block is given, the block is called with the sockets.
- # The value of the block is returned.
- # The sockets are closed when this method returns.
- #
- # If _port_ is zero, some port is choosen.
- # But the choosen port is used for the all sockets.
- #
- # # UDP/IP echo server
- # Socket.udp_server_sockets(0) {|sockets|
- # p sockets.first.local_address.ip_port #=> 32963
- # Socket.udp_server_loop_on(sockets) {|msg, msg_src|
- # msg_src.reply msg
- # }
- # }
- #
- def self.udp_server_sockets(host=nil, port)
- last_error = nil
- sockets = []
- addr_hash = {}
-
- ipv6_recvpktinfo = nil
- if defined? Socket::AncillaryData
- if defined? Socket::IPV6_RECVPKTINFO # RFC 3542
- ipv6_recvpktinfo = Socket::IPV6_RECVPKTINFO
- elsif defined? Socket::IPV6_PKTINFO # RFC 2292
- ipv6_recvpktinfo = Socket::IPV6_PKTINFO
- end
- end
-
- local_addrs = Socket.ip_address_list
-
- ip_list = []
- Addrinfo.foreach(host, port, nil, :DGRAM, nil, Socket::AI_PASSIVE) {|ai|
- if ai.ipv4? && ai.ip_address == "0.0.0.0"
- local_addrs.each {|a|
- next if !a.ipv4?
- ip_list << Addrinfo.new(a.to_sockaddr, :INET, :DGRAM, 0);
- }
- elsif ai.ipv6? && ai.ip_address == "::" && !ipv6_recvpktinfo
- local_addrs.each {|a|
- next if !a.ipv6?
- ip_list << Addrinfo.new(a.to_sockaddr, :INET6, :DGRAM, 0);
- }
- else
- ip_list << ai
- end
- }
-
- if port == 0
- sockets = ip_sockets_port0(ip_list, false)
- else
- ip_list.each {|ip|
- ai = Addrinfo.udp(ip.ip_address, port)
- begin
- s = ai.bind
- rescue SystemCallError
- last_error = $!
- next
- end
- sockets << s
- }
- if sockets.empty?
- raise last_error
- end
- end
-
- pktinfo_sockets = {}
- sockets.each {|s|
- ai = s.local_address
- if ipv6_recvpktinfo && ai.ipv6? && ai.ip_address == "::"
- s.setsockopt(:IPV6, ipv6_recvpktinfo, 1)
- pktinfo_sockets[s] = true
- end
- }
-
- if block_given?
- begin
- yield sockets
- ensure
- sockets.each {|s| s.close if !s.closed? } if sockets
- end
- else
- sockets
- end
- end
-
- # :call-seq:
- # Socket.udp_server_loop_on(sockets) {|msg, msg_src| ... }
- #
- # Run UDP/IP server loop on the given sockets.
- #
- # The return value of Socket.udp_server_sockets is appropriate for the argument.
- #
- # It calls the block for each message received.
- #
- def self.udp_server_loop_on(sockets) # :yield: msg, msg_src
- loop {
- readable, _, _ = IO.select(sockets)
- readable.each {|r|
- begin
- msg, sender_addrinfo, rflags, *controls = r.recvmsg_nonblock
- rescue IO::WaitReadable
- next
- end
- ai = r.local_address
- if ai.ipv6? and pktinfo = controls.find {|c| c.cmsg_is?(:IPV6, :PKTINFO) }
- ai = Addrinfo.udp(pktinfo.ipv6_pktinfo_addr.ip_address, ai.ip_port)
- yield msg, UDPSource.new(sender_addrinfo, ai) {|reply_msg|
- r.sendmsg reply_msg, 0, sender_addrinfo, pktinfo
- }
- else
- yield msg, UDPSource.new(sender_addrinfo, ai) {|reply_msg|
- r.send reply_msg, 0, sender_addrinfo
- }
- end
- }
- }
- end
-
- # :call-seq:
- # Socket.udp_server_loop(port) {|msg, msg_src| ... }
- # Socket.udp_server_loop(host, port) {|msg, msg_src| ... }
- #
- # creates a UDP/IP server on _port_ and calls the block for each message arrived.
- # The block is called with the message and its source information.
- #
- # This method allocates sockets internally using _port_.
- # If _host_ is specified, it is used conjunction with _port_ to determine the server addresses.
- #
- # The _msg_ is a string.
- #
- # The _msg_src_ is a Socket::UDPSource object.
- # It is used for reply.
- #
- # # UDP/IP echo server.
- # Socket.udp_server_loop(9261) {|msg, msg_src|
- # msg_src.reply msg
- # }
- #
- def self.udp_server_loop(host=nil, port, &b) # :yield: message, message_source
- udp_server_sockets(host, port) {|sockets|
- udp_server_loop_on(sockets, &b)
- }
- end
-
- # UDP/IP address information used by Socket.udp_server_loop.
- class UDPSource
- def initialize(remote_address, local_address, &reply_proc)
- @remote_address = remote_address
- @local_address = local_address
- @reply_proc = reply_proc
- end
- attr_reader :remote_address, :local_address
-
- def inspect
- "\#<#{self.class}: #{@remote_address.inspect_sockaddr} to #{@local_address.inspect_sockaddr}>"
- end
-
- def reply(msg)
- @reply_proc.call msg
- end
- end
-
- # creates a new socket connected to path using UNIX socket socket.
- #
- # If a block is given, the block is called with the socket.
- # The value of the block is returned.
- # The socket is closed when this method returns.
- #
- # If no block is given, the socket is returned.
- #
- # # talk to /tmp/sock socket.
- # Socket.unix("/tmp/sock") {|sock|
- # t = Thread.new { IO.copy_stream(sock, STDOUT) }
- # IO.copy_stream(STDIN, sock)
- # t.join
- # }
- #
- def self.unix(path) # :yield: socket
- addr = Addrinfo.unix(path)
- sock = addr.connect
- if block_given?
- begin
- yield sock
- ensure
- sock.close if !sock.closed?
- end
- else
- sock
- end
- end
-
- # creates UNIX server sockets on _path_
- #
- # If no block given, it returns a listening socket.
- #
- # If a block is given, it is called with the socket and the block value is returned.
- # When the block exits, the socket is closed and the socket file is removed.
- #
- # socket = Socket.unix_server_socket("/tmp/s")
- # p socket #=> #<Socket:fd 3>
- # p socket.local_address #=> #<Addrinfo: /tmp/s SOCK_STREAM>
- #
- # Socket.unix_server_socket("/tmp/sock") {|s|
- # p s #=> #<Socket:fd 3>
- # p s.local_address #=> # #<Addrinfo: /tmp/sock SOCK_STREAM>
- # }
- #
- def self.unix_server_socket(path)
- begin
- st = File.lstat(path)
- rescue Errno::ENOENT
- end
- if st && st.socket? && st.owned?
- File.unlink path
- end
- s = Addrinfo.unix(path).listen
- if block_given?
- begin
- yield s
- ensure
- s.close if !s.closed?
- File.unlink path
- end
- else
- s
- end
- end
-
- # creates a UNIX socket server on _path_.
- # It calls the block for each socket accepted.
- #
- # If _host_ is specified, it is used with _port_ to determine the server ports.
- #
- # The socket is *not* closed when the block returns.
- # So application should close it.
- #
- # This method deletes the socket file pointed by _path_ at first if
- # the file is a socket file and it is owned by the user of the application.
- # This is safe only if the directory of _path_ is not changed by a malicious user.
- # So don't use /tmp/malicious-users-directory/socket.
- # Note that /tmp/socket and /tmp/your-private-directory/socket is safe assuming that /tmp has sticky bit.
- #
- # # Sequential echo server.
- # # It services only one client at a time.
- # Socket.unix_server_loop("/tmp/sock") {|sock, client_addrinfo|
- # begin
- # IO.copy_stream(sock, sock)
- # ensure
- # sock.close
- # end
- # }
- #
- def self.unix_server_loop(path, &b) # :yield: socket, client_addrinfo
- unix_server_socket(path) {|serv|
- accept_loop(serv, &b)
- }
- end
-
-end
-
diff --git a/ext/socket/mkconstants.rb b/ext/socket/mkconstants.rb
deleted file mode 100644
index 6df8fbeaf9..0000000000
--- a/ext/socket/mkconstants.rb
+++ /dev/null
@@ -1,683 +0,0 @@
-require 'optparse'
-require 'erb'
-
-opt = OptionParser.new
-
-opt.def_option('-h', 'help') {
- puts opt
- exit 0
-}
-
-opt_o = nil
-opt.def_option('-o FILE', 'specify output file') {|filename|
- opt_o = filename
-}
-
-opt_H = nil
-opt.def_option('-H FILE', 'specify output header file') {|filename|
- opt_H = filename
-}
-
-C_ESC = {
- "\\" => "\\\\",
- '"' => '\"',
- "\n" => '\n',
-}
-
-0x00.upto(0x1f) {|ch| C_ESC[[ch].pack("C")] ||= "\\%03o" % ch }
-0x7f.upto(0xff) {|ch| C_ESC[[ch].pack("C")] = "\\%03o" % ch }
-C_ESC_PAT = Regexp.union(*C_ESC.keys)
-
-def c_str(str)
- '"' + str.gsub(C_ESC_PAT) {|s| C_ESC[s]} + '"'
-end
-
-opt.parse!
-
-
-
-h = {}
-DATA.each_line {|s|
- name, default_value = s.scan(/\S+/)
- next unless name && name[0] != ?#
- if h.has_key? name
- warn "#{$.}: warning: duplicate name: #{name}"
- next
- end
- h[name] = default_value
-}
-DEFS = h.to_a
-
-def each_const
- DEFS.each {|name, default_value|
- if name =~ /\AINADDR_/
- make_value = "UINT2NUM"
- else
- make_value = "INT2NUM"
- end
- guard = nil
- if /\A(AF_INET6|PF_INET6|IPV6_.*)\z/ =~ name
- # IPv6 is not supported although AF_INET6 is defined on bcc32/mingw
- guard = "defined(INET6)"
- end
- yield guard, make_value, name, default_value
- }
-end
-
-def each_name(pat)
- DEFS.each {|name, default_value|
- next if pat !~ name
- yield name
- }
-end
-
-ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_const_decls")
-% each_const {|guard, make_value, name, default_value|
-% if default_value
-#ifndef <%=name%>
-# define <%=name%> <%=default_value%>
-#endif
-% end
-% }
-EOS
-
-ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_const_defs_in_guard(make_value, name, default_value)")
-#if defined(<%=name%>)
- rb_define_const(rb_cSocket, <%=c_str name%>, <%=make_value%>(<%=name%>));
- rb_define_const(rb_mSockConst, <%=c_str name%>, <%=make_value%>(<%=name%>));
-#endif
-EOS
-
-ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_const_defs")
-% each_const {|guard, make_value, name, default_value|
-% if guard
-#if <%=guard%>
-<%= gen_const_defs_in_guard(make_value, name, default_value).chomp %>
-#endif
-% else
-<%= gen_const_defs_in_guard(make_value, name, default_value).chomp %>
-% end
-% }
-EOS
-
-def reverse_each_name(pat)
- DEFS.reverse_each {|name, default_value|
- next if pat !~ name
- yield name
- }
-end
-
-def each_names_with_len(pat, prefix_optional=nil)
- h = {}
- DEFS.each {|name, default_value|
- next if pat !~ name
- (h[name.length] ||= []) << [name, name]
- }
- if prefix_optional
- if Regexp === prefix_optional
- prefix_pat = prefix_optional
- else
- prefix_pat = /\A#{Regexp.escape prefix_optional}/
- end
- DEFS.each {|const, default_value|
- next if pat !~ const
- next if prefix_pat !~ const
- name = $'
- (h[name.length] ||= []) << [name, const]
- }
- end
- hh = {}
- h.each {|len, pairs|
- pairs.each {|name, const|
- raise "name crash: #{name}" if hh[name]
- hh[name] = true
- }
- }
- h.keys.sort.each {|len|
- yield h[len], len
- }
-end
-
-ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_name_to_int_decl(funcname, pat, prefix_optional, guard=nil)")
-%if guard
-#ifdef <%=guard%>
-int <%=funcname%>(const char *str, int len, int *valp);
-#endif
-%else
-int <%=funcname%>(const char *str, int len, int *valp);
-%end
-EOS
-
-ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_name_to_int_func_in_guard(funcname, pat, prefix_optional, guard=nil)")
-int
-<%=funcname%>(const char *str, int len, int *valp)
-{
- switch (len) {
-% each_names_with_len(pat, prefix_optional) {|pairs, len|
- case <%=len%>:
-% pairs.each {|name, const|
-#ifdef <%=const%>
- if (memcmp(str, <%=c_str name%>, <%=len%>) == 0) { *valp = <%=const%>; return 0; }
-#endif
-% }
- return -1;
-
-% }
- default:
- return -1;
- }
-}
-EOS
-
-ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_name_to_int_func(funcname, pat, prefix_optional, guard=nil)")
-%if guard
-#ifdef <%=guard%>
-<%=gen_name_to_int_func_in_guard(funcname, pat, prefix_optional, guard)%>
-#endif
-%else
-<%=gen_name_to_int_func_in_guard(funcname, pat, prefix_optional, guard)%>
-%end
-EOS
-
-NAME_TO_INT_DEFS = []
-def def_name_to_int(funcname, pat, prefix_optional, guard=nil)
- decl = gen_name_to_int_decl(funcname, pat, prefix_optional, guard)
- func = gen_name_to_int_func(funcname, pat, prefix_optional, guard)
- NAME_TO_INT_DEFS << [decl, func]
-end
-
-def reverse_each_name_with_prefix_optional(pat, prefix_pat)
- reverse_each_name(pat) {|n|
- yield n, n
- }
- if prefix_pat
- reverse_each_name(pat) {|n|
- next if prefix_pat !~ n
- yield n, $'
- }
- end
-end
-
-ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_int_to_name_hash(hash_var, pat, prefix_pat)")
- <%=hash_var%> = st_init_numtable();
-% reverse_each_name_with_prefix_optional(pat, prefix_pat) {|n,s|
-#ifdef <%=n%>
- st_insert(<%=hash_var%>, (st_data_t)<%=n%>, (st_data_t)rb_intern2(<%=c_str s%>, <%=s.length%>));
-#endif
-% }
-EOS
-
-ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_int_to_name_func(func_name, hash_var)")
-ID
-<%=func_name%>(int val)
-{
- st_data_t name;
- if (st_lookup(<%=hash_var%>, (st_data_t)val, &name))
- return (ID)name;
- return 0;
-}
-EOS
-
-ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_int_to_name_decl(func_name, hash_var)")
-ID <%=func_name%>(int val);
-EOS
-
-INTERN_DEFS = []
-def def_intern(func_name, pat, prefix_optional=nil)
- prefix_pat = nil
- if prefix_optional
- if Regexp === prefix_optional
- prefix_pat = prefix_optional
- else
- prefix_pat = /\A#{Regexp.escape prefix_optional}/
- end
- end
- hash_var = "#{func_name}_hash"
- vardef = "static st_table *#{hash_var};"
- gen_hash = gen_int_to_name_hash(hash_var, pat, prefix_pat)
- decl = gen_int_to_name_decl(func_name, hash_var)
- func = gen_int_to_name_func(func_name, hash_var)
- INTERN_DEFS << [vardef, gen_hash, decl, func]
-end
-
-def_name_to_int("rsock_family_to_int", /\A(AF_|PF_)/, "AF_")
-def_name_to_int("rsock_socktype_to_int", /\ASOCK_/, "SOCK_")
-def_name_to_int("rsock_ipproto_to_int", /\AIPPROTO_/, "IPPROTO_")
-def_name_to_int("rsock_unknown_level_to_int", /\ASOL_SOCKET\z/, "SOL_")
-def_name_to_int("rsock_ip_level_to_int", /\A(SOL_SOCKET\z|IPPROTO_)/, /\A(SOL_|IPPROTO_)/)
-def_name_to_int("rsock_so_optname_to_int", /\ASO_/, "SO_")
-def_name_to_int("rsock_ip_optname_to_int", /\AIP_/, "IP_")
-def_name_to_int("rsock_ipv6_optname_to_int", /\AIPV6_/, "IPV6_", "IPPROTO_IPV6")
-def_name_to_int("rsock_tcp_optname_to_int", /\ATCP_/, "TCP_")
-def_name_to_int("rsock_udp_optname_to_int", /\AUDP_/, "UDP_")
-def_name_to_int("rsock_shutdown_how_to_int", /\ASHUT_/, "SHUT_")
-def_name_to_int("rsock_scm_optname_to_int", /\ASCM_/, "SCM_")
-
-def_intern('rsock_intern_family', /\AAF_/)
-def_intern('rsock_intern_family_noprefix', /\AAF_/, "AF_")
-def_intern('rsock_intern_protocol_family', /\APF_/)
-def_intern('rsock_intern_socktype', /\ASOCK_/)
-def_intern('rsock_intern_ipproto', /\AIPPROTO_/)
-def_intern('rsock_intern_iplevel', /\A(SOL_SOCKET\z|IPPROTO_)/, /\A(SOL_|IPPROTO_)/)
-def_intern('rsock_intern_so_optname', /\ASO_/, "SO_")
-def_intern('rsock_intern_ip_optname', /\AIP_/, "IP_")
-def_intern('rsock_intern_ipv6_optname', /\AIPV6_/, "IPV6_")
-def_intern('rsock_intern_tcp_optname', /\ATCP_/, "TCP_")
-def_intern('rsock_intern_udp_optname', /\AUDP_/, "UDP_")
-def_intern('rsock_intern_scm_optname', /\ASCM_/, "SCM_")
-def_intern('rsock_intern_local_optname', /\ALOCAL_/, "LOCAL_")
-
-result = ERB.new(<<'EOS', nil, '%').result(binding)
-/* autogenerated file */
-
-<%= INTERN_DEFS.map {|vardef, gen_hash, decl, func| vardef }.join("\n") %>
-
-static void
-init_constants(void)
-{
- /* for rdoc */
- /* rb_cSocket = rb_define_class("Socket", rb_cBasicSocket); */
- /* rb_mSockConst = rb_define_module_under(rb_cSocket, "Constants"); */
-
-<%= gen_const_defs %>
-<%= INTERN_DEFS.map {|vardef, gen_hash, decl, func| gen_hash }.join("\n") %>
-}
-
-<%= NAME_TO_INT_DEFS.map {|decl, func| func }.join("\n") %>
-
-<%= INTERN_DEFS.map {|vardef, gen_hash, decl, func| func }.join("\n") %>
-
-EOS
-
-header_result = ERB.new(<<'EOS', nil, '%').result(binding)
-/* autogenerated file */
-<%= gen_const_decls %>
-<%= NAME_TO_INT_DEFS.map {|decl, func| decl }.join("\n") %>
-<%= INTERN_DEFS.map {|vardef, gen_hash, decl, func| decl }.join("\n") %>
-EOS
-
-if opt_H
- File.open(opt_H, 'w') {|f|
- f << header_result
- }
-else
- result = header_result + result
-end
-
-if opt_o
- File.open(opt_o, 'w') {|f|
- f << result
- }
-else
- $stdout << result
-end
-
-__END__
-
-SOCK_STREAM
-SOCK_DGRAM
-SOCK_RAW
-SOCK_RDM
-SOCK_SEQPACKET
-SOCK_PACKET
-
-AF_UNSPEC
-PF_UNSPEC
-AF_INET
-PF_INET
-AF_INET6
-PF_INET6
-AF_UNIX
-PF_UNIX
-AF_AX25
-PF_AX25
-AF_IPX
-PF_IPX
-AF_APPLETALK
-PF_APPLETALK
-AF_LOCAL
-PF_LOCAL
-AF_IMPLINK
-PF_IMPLINK
-AF_PUP
-PF_PUP
-AF_CHAOS
-PF_CHAOS
-AF_NS
-PF_NS
-AF_ISO
-PF_ISO
-AF_OSI
-PF_OSI
-AF_ECMA
-PF_ECMA
-AF_DATAKIT
-PF_DATAKIT
-AF_CCITT
-PF_CCITT
-AF_SNA
-PF_SNA
-AF_DEC
-PF_DEC
-AF_DLI
-PF_DLI
-AF_LAT
-PF_LAT
-AF_HYLINK
-PF_HYLINK
-AF_ROUTE
-PF_ROUTE
-AF_LINK
-PF_LINK
-AF_COIP
-PF_COIP
-AF_CNT
-PF_CNT
-AF_SIP
-PF_SIP
-AF_NDRV
-PF_NDRV
-AF_ISDN
-PF_ISDN
-AF_NATM
-PF_NATM
-AF_SYSTEM
-PF_SYSTEM
-AF_NETBIOS
-PF_NETBIOS
-AF_PPP
-PF_PPP
-AF_ATM
-PF_ATM
-AF_NETGRAPH
-PF_NETGRAPH
-AF_MAX
-PF_MAX
-AF_PACKET
-PF_PACKET
-
-AF_E164
-PF_XTP
-PF_RTIP
-PF_PIP
-PF_KEY
-
-MSG_OOB
-MSG_PEEK
-MSG_DONTROUTE
-MSG_EOR
-MSG_TRUNC
-MSG_CTRUNC
-MSG_WAITALL
-MSG_DONTWAIT
-MSG_EOF
-MSG_FLUSH
-MSG_HOLD
-MSG_SEND
-MSG_HAVEMORE
-MSG_RCVMORE
-MSG_COMPAT
-MSG_PROXY
-MSG_FIN
-MSG_SYN
-MSG_CONFIRM
-MSG_RST
-MSG_ERRQUEUE
-MSG_NOSIGNAL
-MSG_MORE
-
-SOL_SOCKET
-SOL_IP
-SOL_IPX
-SOL_AX25
-SOL_ATALK
-SOL_TCP
-SOL_UDP
-
-IPPROTO_IP 0
-IPPROTO_ICMP 1
-IPPROTO_IGMP
-IPPROTO_GGP
-IPPROTO_TCP 6
-IPPROTO_EGP
-IPPROTO_PUP
-IPPROTO_UDP 17
-IPPROTO_IDP
-IPPROTO_HELLO
-IPPROTO_ND
-IPPROTO_TP
-IPPROTO_XTP
-IPPROTO_EON
-IPPROTO_BIP
-IPPROTO_AH
-IPPROTO_DSTOPTS
-IPPROTO_ESP
-IPPROTO_FRAGMENT
-IPPROTO_HOPOPTS
-IPPROTO_ICMPV6
-IPPROTO_IPV6
-IPPROTO_NONE
-IPPROTO_ROUTING
-
-IPPROTO_RAW 255
-IPPROTO_MAX
-
-# Some port configuration
-IPPORT_RESERVED 1024
-IPPORT_USERRESERVED 5000
-
-# Some reserved IP v.4 addresses
-INADDR_ANY 0x00000000
-INADDR_BROADCAST 0xffffffff
-INADDR_LOOPBACK 0x7F000001
-INADDR_UNSPEC_GROUP 0xe0000000
-INADDR_ALLHOSTS_GROUP 0xe0000001
-INADDR_MAX_LOCAL_GROUP 0xe00000ff
-INADDR_NONE 0xffffffff
-
-# IP [gs]etsockopt options
-IP_OPTIONS
-IP_HDRINCL
-IP_TOS
-IP_TTL
-IP_RECVOPTS
-IP_RECVRETOPTS
-IP_RECVDSTADDR
-IP_RETOPTS
-IP_MINTTL
-IP_DONTFRAG
-IP_SENDSRCADDR
-IP_ONESBCAST
-IP_RECVTTL
-IP_RECVIF
-IP_RECVSLLA
-IP_PORTRANGE
-IP_MULTICAST_IF
-IP_MULTICAST_TTL
-IP_MULTICAST_LOOP
-IP_ADD_MEMBERSHIP
-IP_DROP_MEMBERSHIP
-IP_DEFAULT_MULTICAST_TTL
-IP_DEFAULT_MULTICAST_LOOP
-IP_MAX_MEMBERSHIPS
-IP_ROUTER_ALERT
-IP_PKTINFO
-IP_PKTOPTIONS
-IP_MTU_DISCOVER
-IP_RECVERR
-IP_RECVTOS
-IP_MTU
-IP_FREEBIND
-IP_IPSEC_POLICY
-IP_XFRM_POLICY
-IP_PASSSEC
-IP_PMTUDISC_DONT
-IP_PMTUDISC_WANT
-IP_PMTUDISC_DO
-IP_UNBLOCK_SOURCE
-IP_BLOCK_SOURCE
-IP_ADD_SOURCE_MEMBERSHIP
-IP_DROP_SOURCE_MEMBERSHIP
-IP_MSFILTER
-
-MCAST_JOIN_GROUP
-MCAST_BLOCK_SOURCE
-MCAST_UNBLOCK_SOURCE
-MCAST_LEAVE_GROUP
-MCAST_JOIN_SOURCE_GROUP
-MCAST_LEAVE_SOURCE_GROUP
-MCAST_MSFILTER
-MCAST_EXCLUDE
-MCAST_INCLUDE
-
-SO_DEBUG
-SO_REUSEADDR
-SO_REUSEPORT
-SO_TYPE
-SO_ERROR
-SO_DONTROUTE
-SO_BROADCAST
-SO_SNDBUF
-SO_RCVBUF
-SO_KEEPALIVE
-SO_OOBINLINE
-SO_NO_CHECK
-SO_PRIORITY
-SO_LINGER
-SO_PASSCRED
-SO_PEERCRED
-SO_RCVLOWAT
-SO_SNDLOWAT
-SO_RCVTIMEO
-SO_SNDTIMEO
-SO_ACCEPTCONN
-SO_USELOOPBACK
-SO_ACCEPTFILTER
-SO_DONTTRUNC
-SO_WANTMORE
-SO_WANTOOBFLAG
-SO_NREAD
-SO_NKE
-SO_NOSIGPIPE
-SO_SECURITY_AUTHENTICATION
-SO_SECURITY_ENCRYPTION_TRANSPORT
-SO_SECURITY_ENCRYPTION_NETWORK
-SO_BINDTODEVICE
-SO_ATTACH_FILTER
-SO_DETACH_FILTER
-SO_PEERNAME
-SO_TIMESTAMP
-SO_TIMESTAMPNS
-SO_BINTIME
-SO_RECVUCRED
-SO_MAC_EXEMPT
-SO_ALLZONES
-
-SOPRI_INTERACTIVE
-SOPRI_NORMAL
-SOPRI_BACKGROUND
-
-IPX_TYPE
-
-TCP_NODELAY
-TCP_MAXSEG
-TCP_CORK
-TCP_DEFER_ACCEPT
-TCP_INFO
-TCP_KEEPCNT
-TCP_KEEPIDLE
-TCP_KEEPINTVL
-TCP_LINGER2
-TCP_MD5SIG
-TCP_NOOPT
-TCP_NOPUSH
-TCP_QUICKACK
-TCP_SYNCNT
-TCP_WINDOW_CLAMP
-
-UDP_CORK
-
-EAI_ADDRFAMILY
-EAI_AGAIN
-EAI_BADFLAGS
-EAI_FAIL
-EAI_FAMILY
-EAI_MEMORY
-EAI_NODATA
-EAI_NONAME
-EAI_OVERFLOW
-EAI_SERVICE
-EAI_SOCKTYPE
-EAI_SYSTEM
-EAI_BADHINTS
-EAI_PROTOCOL
-EAI_MAX
-
-AI_PASSIVE
-AI_CANONNAME
-AI_NUMERICHOST
-AI_NUMERICSERV
-AI_MASK
-AI_ALL
-AI_V4MAPPED_CFG
-AI_ADDRCONFIG
-AI_V4MAPPED
-AI_DEFAULT
-
-NI_MAXHOST
-NI_MAXSERV
-NI_NOFQDN
-NI_NUMERICHOST
-NI_NAMEREQD
-NI_NUMERICSERV
-NI_DGRAM
-
-SHUT_RD 0
-SHUT_WR 1
-SHUT_RDWR 2
-
-IPV6_JOIN_GROUP
-IPV6_LEAVE_GROUP
-IPV6_MULTICAST_HOPS
-IPV6_MULTICAST_IF
-IPV6_MULTICAST_LOOP
-IPV6_UNICAST_HOPS
-IPV6_V6ONLY
-IPV6_CHECKSUM
-IPV6_DONTFRAG
-IPV6_DSTOPTS
-IPV6_HOPLIMIT
-IPV6_HOPOPTS
-IPV6_NEXTHOP
-IPV6_PATHMTU
-IPV6_PKTINFO
-IPV6_RECVDSTOPTS
-IPV6_RECVHOPLIMIT
-IPV6_RECVHOPOPTS
-IPV6_RECVPKTINFO
-IPV6_RECVRTHDR
-IPV6_RECVTCLASS
-IPV6_RTHDR
-IPV6_RTHDRDSTOPTS
-IPV6_RTHDR_TYPE_0
-IPV6_RECVPATHMTU
-IPV6_TCLASS
-IPV6_USE_MIN_MTU
-
-INET_ADDRSTRLEN
-INET6_ADDRSTRLEN
-IFNAMSIZ
-
-SOMAXCONN
-
-SCM_RIGHTS
-SCM_TIMESTAMP
-SCM_TIMESTAMPNS
-SCM_BINTIME
-SCM_CREDENTIALS
-SCM_CREDS
-SCM_UCRED
-
-LOCAL_PEERCRED
-LOCAL_CREDS
-LOCAL_CONNWAIT
diff --git a/ext/socket/option.c b/ext/socket/option.c
deleted file mode 100644
index d1d557db14..0000000000
--- a/ext/socket/option.c
+++ /dev/null
@@ -1,688 +0,0 @@
-#include "rubysocket.h"
-
-VALUE rb_cSockOpt;
-
-static VALUE
-constant_to_sym(int constant, ID (*intern_const)(int))
-{
- ID name = intern_const(constant);
- if (name) {
- return ID2SYM(name);
- }
-
- return INT2NUM(constant);
-}
-
-static VALUE
-optname_to_sym(int level, int optname)
-{
- switch (level) {
- case SOL_SOCKET:
- return constant_to_sym(optname, rsock_intern_so_optname);
- case IPPROTO_IP:
- return constant_to_sym(optname, rsock_intern_ip_optname);
-#ifdef INET6
- case IPPROTO_IPV6:
- return constant_to_sym(optname, rsock_intern_ipv6_optname);
-#endif
- case IPPROTO_TCP:
- return constant_to_sym(optname, rsock_intern_tcp_optname);
- case IPPROTO_UDP:
- return constant_to_sym(optname, rsock_intern_udp_optname);
- default:
- return INT2NUM(optname);
- }
-}
-
-/*
- * call-seq:
- * Socket::Option.new(family, level, optname, data) => sockopt
- *
- * Returns a new Socket::Option object.
- *
- * sockopt = Socket::Option.new(:INET, :SOCKET, :KEEPALIVE, [1].pack("i"))
- * p sockopt #=> #<Socket::Option: INET SOCKET KEEPALIVE 1>
- *
- */
-static VALUE
-sockopt_initialize(VALUE self, VALUE vfamily, VALUE vlevel, VALUE voptname, VALUE data)
-{
- int family = rsock_family_arg(vfamily);
- int level = rsock_level_arg(family, vlevel);
- int optname = rsock_optname_arg(family, level, voptname);
- StringValue(data);
- rb_ivar_set(self, rb_intern("family"), INT2NUM(family));
- rb_ivar_set(self, rb_intern("level"), INT2NUM(level));
- rb_ivar_set(self, rb_intern("optname"), INT2NUM(optname));
- rb_ivar_set(self, rb_intern("data"), data);
- return self;
-}
-
-VALUE
-rsock_sockopt_new(int family, int level, int optname, VALUE data)
-{
- NEWOBJ(obj, struct RObject);
- OBJSETUP(obj, rb_cSockOpt, T_OBJECT);
- StringValue(data);
- sockopt_initialize((VALUE)obj, INT2NUM(family), INT2NUM(level), INT2NUM(optname), data);
- return (VALUE)obj;
-}
-
-/*
- * call-seq:
- * sockopt.family => integer
- *
- * returns the socket family as an integer.
- *
- * p Socket::Option.new(:INET6, :IPV6, :RECVPKTINFO, [1].pack("i!")).family
- * #=> 10
- */
-static VALUE
-sockopt_family_m(VALUE self)
-{
- return rb_attr_get(self, rb_intern("family"));
-}
-
-static int
-sockopt_level(VALUE self)
-{
- return NUM2INT(rb_attr_get(self, rb_intern("level")));
-}
-
-/*
- * call-seq:
- * sockopt.level => integer
- *
- * returns the socket level as an integer.
- *
- * p Socket::Option.new(:INET6, :IPV6, :RECVPKTINFO, [1].pack("i!")).level
- * #=> 41
- */
-static VALUE
-sockopt_level_m(VALUE self)
-{
- return INT2NUM(sockopt_level(self));
-}
-
-static int
-sockopt_optname(VALUE self)
-{
- return NUM2INT(rb_attr_get(self, rb_intern("optname")));
-}
-
-/*
- * call-seq:
- * sockopt.optname => integer
- *
- * returns the socket option name as an integer.
- *
- * p Socket::Option.new(:INET6, :IPV6, :RECVPKTINFO, [1].pack("i!")).optname
- * #=> 2
- */
-static VALUE
-sockopt_optname_m(VALUE self)
-{
- return INT2NUM(sockopt_optname(self));
-}
-
-/*
- * call-seq:
- * sockopt.data => string
- *
- * returns the socket option data as a string.
- *
- * p Socket::Option.new(:INET6, :IPV6, :RECVPKTINFO, [1].pack("i!")).data
- * #=> "\x01\x00\x00\x00"
- */
-static VALUE
-sockopt_data(VALUE self)
-{
- VALUE v = rb_attr_get(self, rb_intern("data"));
- StringValue(v);
- return v;
-}
-
-/*
- * call-seq:
- * Socket::Option.int(family, level, optname, integer) => sockopt
- *
- * Creates a new Socket::Option object which contains an int as data.
- *
- * The size and endian is dependent on the host.
- *
- * p Socket::Option.int(:INET, :SOCKET, :KEEPALIVE, 1)
- * #=> #<Socket::Option: INET SOCKET KEEPALIVE 1>
- */
-static VALUE
-sockopt_s_int(VALUE klass, VALUE vfamily, VALUE vlevel, VALUE voptname, VALUE vint)
-{
- int family = rsock_family_arg(vfamily);
- int level = rsock_level_arg(family, vlevel);
- int optname = rsock_optname_arg(family, level, voptname);
- int i = NUM2INT(vint);
- return rsock_sockopt_new(family, level, optname, rb_str_new((char*)&i, sizeof(i)));
-}
-
-/*
- * call-seq:
- * sockopt.int => integer
- *
- * Returns the data in _sockopt_ as an int.
- *
- * The size and endian is dependent on the host.
- *
- * sockopt = Socket::Option.int(:INET, :SOCKET, :KEEPALIVE, 1)
- * p sockopt.int => 1
- */
-static VALUE
-sockopt_int(VALUE self)
-{
- int i;
- VALUE data = sockopt_data(self);
- StringValue(data);
- if (RSTRING_LEN(data) != sizeof(int))
- rb_raise(rb_eTypeError, "size differ. expected as sizeof(int)=%d but %ld",
- (int)sizeof(int), (long)RSTRING_LEN(data));
- memcpy((char*)&i, RSTRING_PTR(data), sizeof(int));
- return INT2NUM(i);
-}
-
-/*
- * call-seq:
- * Socket::Option.bool(family, level, optname, bool) => sockopt
- *
- * Creates a new Socket::Option object which contains boolean as data.
- * Actually 0 or 1 as int is used.
- *
- * p Socket::Option.bool(:INET, :SOCKET, :KEEPALIVE, true)
- * #=> #<Socket::Option: INET SOCKET KEEPALIVE 1>
- *
- * p Socket::Option.bool(:INET, :SOCKET, :KEEPALIVE, false)
- * #=> #<Socket::Option: AF_INET SOCKET KEEPALIVE 0>
- *
- */
-static VALUE
-sockopt_s_bool(VALUE klass, VALUE vfamily, VALUE vlevel, VALUE voptname, VALUE vbool)
-{
- int family = rsock_family_arg(vfamily);
- int level = rsock_level_arg(family, vlevel);
- int optname = rsock_optname_arg(family, level, voptname);
- int i = RTEST(vbool) ? 1 : 0;
- return rsock_sockopt_new(family, level, optname, rb_str_new((char*)&i, sizeof(i)));
-}
-
-/*
- * call-seq:
- * sockopt.bool => true or false
- *
- * Returns the data in _sockopt_ as an boolean value.
- *
- * sockopt = Socket::Option.int(:INET, :SOCKET, :KEEPALIVE, 1)
- * p sockopt.bool => true
- */
-static VALUE
-sockopt_bool(VALUE self)
-{
- int i;
- VALUE data = sockopt_data(self);
- StringValue(data);
- if (RSTRING_LEN(data) != sizeof(int))
- rb_raise(rb_eTypeError, "size differ. expected as sizeof(int)=%d but %ld",
- (int)sizeof(int), (long)RSTRING_LEN(data));
- memcpy((char*)&i, RSTRING_PTR(data), sizeof(int));
- return i == 0 ? Qfalse : Qtrue;
-}
-
-/*
- * call-seq:
- * Socket::Option.linger(onoff, secs) => sockopt
- *
- * Creates a new Socket::Option object for SOL_SOCKET/SO_LINGER.
- *
- * _onoff_ should be an integer or a boolean.
- *
- * _secs_ should be the number of seconds.
- *
- * p Socket::Option.linger(true, 10)
- * #=> #<Socket::Option: UNSPEC SOCKET LINGER on 10sec>
- *
- */
-static VALUE
-sockopt_s_linger(VALUE klass, VALUE vonoff, VALUE vsecs)
-{
- VALUE tmp;
- struct linger l;
- memset(&l, 0, sizeof(l));
- if (!NIL_P(tmp = rb_check_to_integer(vonoff, "to_int")))
- l.l_onoff = NUM2INT(tmp);
- else
- l.l_onoff = RTEST(vonoff) ? 1 : 0;
- l.l_linger = NUM2INT(vsecs);
- return rsock_sockopt_new(AF_UNSPEC, SOL_SOCKET, SO_LINGER, rb_str_new((char*)&l, sizeof(l)));
-}
-
-/*
- * call-seq:
- * sockopt.linger => [bool, seconds]
- *
- * Returns the linger data in _sockopt_ as a pair of boolean and integer.
- *
- * sockopt = Socket::Option.linger(true, 10)
- * p sockopt.linger => [true, 10]
- */
-static VALUE
-sockopt_linger(VALUE self)
-{
- int level = sockopt_level(self);
- int optname = sockopt_optname(self);
- VALUE data = sockopt_data(self);
- struct linger l;
- VALUE vonoff, vsecs;
-
- if (level != SOL_SOCKET || optname != SO_LINGER)
- rb_raise(rb_eTypeError, "linger socket option expected");
- if (RSTRING_LEN(data) != sizeof(l))
- rb_raise(rb_eTypeError, "size differ. expected as sizeof(struct linger)=%d but %ld",
- (int)sizeof(struct linger), (long)RSTRING_LEN(data));
- memcpy((char*)&l, RSTRING_PTR(data), sizeof(struct linger));
- switch (l.l_onoff) {
- case 0: vonoff = Qfalse; break;
- case 1: vonoff = Qtrue; break;
- default: vonoff = INT2NUM(l.l_onoff); break;
- }
- vsecs = INT2NUM(l.l_linger);
- return rb_assoc_new(vonoff, vsecs);
-}
-
-static int
-inspect_int(int level, int optname, VALUE data, VALUE ret)
-{
- if (RSTRING_LEN(data) == sizeof(int)) {
- int i;
- memcpy((char*)&i, RSTRING_PTR(data), sizeof(int));
- rb_str_catf(ret, " %d", i);
- return 1;
- }
- else {
- return 0;
- }
-}
-
-static int
-inspect_errno(int level, int optname, VALUE data, VALUE ret)
-{
- if (RSTRING_LEN(data) == sizeof(int)) {
- int i;
- char *err;
- memcpy((char*)&i, RSTRING_PTR(data), sizeof(int));
- err = strerror(i);
- rb_str_catf(ret, " %s (%d)", err, i);
- return 1;
- }
- else {
- return 0;
- }
-}
-
-#if defined(IPV6_MULTICAST_IF) || defined(IPV6_MULTICAST_LOOP)
-static int
-inspect_uint(int level, int optname, VALUE data, VALUE ret)
-{
- if (RSTRING_LEN(data) == sizeof(int)) {
- unsigned int i;
- memcpy((char*)&i, RSTRING_PTR(data), sizeof(unsigned int));
- rb_str_catf(ret, " %u", i);
- return 1;
- }
- else {
- return 0;
- }
-}
-#endif
-
-#if defined(SOL_SOCKET) && defined(SO_LINGER) /* POSIX */
-static int
-inspect_linger(int level, int optname, VALUE data, VALUE ret)
-{
- if (RSTRING_LEN(data) == sizeof(struct linger)) {
- struct linger s;
- memcpy((char*)&s, RSTRING_PTR(data), sizeof(s));
- switch (s.l_onoff) {
- case 0: rb_str_cat2(ret, " off"); break;
- case 1: rb_str_cat2(ret, " on"); break;
- default: rb_str_catf(ret, " on(%d)", s.l_onoff); break;
- }
- rb_str_catf(ret, " %dsec", s.l_linger);
- return 1;
- }
- else {
- return 0;
- }
-}
-#endif
-
-#if defined(SOL_SOCKET) && defined(SO_TYPE) /* POSIX */
-static int
-inspect_socktype(int level, int optname, VALUE data, VALUE ret)
-{
- if (RSTRING_LEN(data) == sizeof(int)) {
- int i;
- ID id;
- memcpy((char*)&i, RSTRING_PTR(data), sizeof(int));
- id = rsock_intern_socktype(i);
- if (id)
- rb_str_catf(ret, " %s", rb_id2name(id));
- else
- rb_str_catf(ret, " %d", i);
- return 1;
- }
- else {
- return 0;
- }
-}
-#endif
-
-static int
-inspect_timeval_as_interval(int level, int optname, VALUE data, VALUE ret)
-{
- if (RSTRING_LEN(data) == sizeof(struct timeval)) {
- struct timeval s;
- memcpy((char*)&s, RSTRING_PTR(data), sizeof(s));
- rb_str_catf(ret, " %ld.%06ldsec", (long)s.tv_sec, (long)s.tv_usec);
- return 1;
- }
- else {
- return 0;
- }
-}
-
-#if defined(SOL_SOCKET) && defined(SO_PEERCRED) /* GNU/Linux */
-static int
-inspect_peercred(int level, int optname, VALUE data, VALUE ret)
-{
- if (RSTRING_LEN(data) == sizeof(struct ucred)) {
- struct ucred cred;
- memcpy(&cred, RSTRING_PTR(data), sizeof(struct ucred));
- rb_str_catf(ret, " pid=%u euid=%u egid=%u",
- (unsigned)cred.pid, (unsigned)cred.uid, (unsigned)cred.gid);
- rb_str_cat2(ret, " (ucred)");
- return 1;
- }
- else {
- return 0;
- }
-}
-#endif
-
-#if defined(LOCAL_PEERCRED) /* FreeBSD, MacOS X */
-static int
-inspect_local_peercred(int level, int optname, VALUE data, VALUE ret)
-{
- if (RSTRING_LEN(data) == sizeof(struct xucred)) {
- struct xucred cred;
- memcpy(&cred, RSTRING_PTR(data), sizeof(struct xucred));
- if (cred.cr_version != XUCRED_VERSION)
- return 0;
- rb_str_catf(ret, " version=%u", cred.cr_version);
- rb_str_catf(ret, " euid=%u", cred.cr_uid);
- if (cred.cr_ngroups) {
- int i;
- const char *sep = " groups=";
- for (i = 0; i < cred.cr_ngroups; i++) {
- rb_str_catf(ret, "%s%u", sep, cred.cr_groups[i]);
- sep = ",";
- }
- }
- rb_str_cat2(ret, " (xucred)");
- return 1;
- }
- else {
- return 0;
- }
-}
-#endif
-
-
-/*
- * call-seq:
- * sockopt.inspect => string
- *
- * Returns a string which shows sockopt in human-readable form.
- *
- * p Socket::Option.new(:INET, :SOCKET, :KEEPALIVE, [1].pack("i")).inspect
- * #=> "#<Socket::Option: INET SOCKET KEEPALIVE 1>"
- *
- */
-static VALUE
-sockopt_inspect(VALUE self)
-{
- int family = NUM2INT(sockopt_family_m(self));
- int level = NUM2INT(sockopt_level_m(self));
- int optname = NUM2INT(sockopt_optname_m(self));
- VALUE data = sockopt_data(self);
- VALUE v, ret;
- ID family_id, level_id, optname_id;
- int inspected;
-
- StringValue(data);
-
- ret = rb_sprintf("#<%s:", rb_obj_classname(self));
-
- family_id = rsock_intern_family_noprefix(family);
- if (family_id)
- rb_str_catf(ret, " %s", rb_id2name(family_id));
- else
- rb_str_catf(ret, " family:%d", family);
-
- if (level == SOL_SOCKET) {
- rb_str_cat2(ret, " SOCKET");
-
- optname_id = rsock_intern_so_optname(optname);
- if (optname_id)
- rb_str_catf(ret, " %s", rb_id2name(optname_id));
- else
- rb_str_catf(ret, " optname:%d", optname);
- }
-#ifdef HAVE_SYS_UN_H
- else if (family == AF_UNIX) {
- rb_str_catf(ret, " level:%d", level);
-
- optname_id = rsock_intern_local_optname(optname);
- if (optname_id)
- rb_str_catf(ret, " %s", rb_id2name(optname_id));
- else
- rb_str_catf(ret, " optname:%d", optname);
- }
-#endif
- else if (IS_IP_FAMILY(family)) {
- level_id = rsock_intern_iplevel(level);
- if (level_id)
- rb_str_catf(ret, " %s", rb_id2name(level_id));
- else
- rb_str_catf(ret, " level:%d", level);
-
- v = optname_to_sym(level, optname);
- if (SYMBOL_P(v))
- rb_str_catf(ret, " %s", rb_id2name(SYM2ID(v)));
- else
- rb_str_catf(ret, " optname:%d", optname);
- }
- else {
- rb_str_catf(ret, " level:%d", level);
- rb_str_catf(ret, " optname:%d", optname);
- }
-
- inspected = 0;
-
- if (level == SOL_SOCKET)
- family = AF_UNSPEC;
- switch (family) {
- case AF_UNSPEC:
- switch (level) {
- case SOL_SOCKET:
- switch (optname) {
-# if defined(SO_DEBUG) /* POSIX */
- case SO_DEBUG: inspected = inspect_int(level, optname, data, ret); break;
-# endif
-# if defined(SO_ERROR) /* POSIX */
- case SO_ERROR: inspected = inspect_errno(level, optname, data, ret); break;
-# endif
-# if defined(SO_TYPE) /* POSIX */
- case SO_TYPE: inspected = inspect_socktype(level, optname, data, ret); break;
-# endif
-# if defined(SO_ACCEPTCONN) /* POSIX */
- case SO_ACCEPTCONN: inspected = inspect_int(level, optname, data, ret); break;
-# endif
-# if defined(SO_BROADCAST) /* POSIX */
- case SO_BROADCAST: inspected = inspect_int(level, optname, data, ret); break;
-# endif
-# if defined(SO_REUSEADDR) /* POSIX */
- case SO_REUSEADDR: inspected = inspect_int(level, optname, data, ret); break;
-# endif
-# if defined(SO_KEEPALIVE) /* POSIX */
- case SO_KEEPALIVE: inspected = inspect_int(level, optname, data, ret); break;
-# endif
-# if defined(SO_OOBINLINE) /* POSIX */
- case SO_OOBINLINE: inspected = inspect_int(level, optname, data, ret); break;
-# endif
-# if defined(SO_SNDBUF) /* POSIX */
- case SO_SNDBUF: inspected = inspect_int(level, optname, data, ret); break;
-# endif
-# if defined(SO_RCVBUF) /* POSIX */
- case SO_RCVBUF: inspected = inspect_int(level, optname, data, ret); break;
-# endif
-# if defined(SO_DONTROUTE) /* POSIX */
- case SO_DONTROUTE: inspected = inspect_int(level, optname, data, ret); break;
-# endif
-# if defined(SO_RCVLOWAT) /* POSIX */
- case SO_RCVLOWAT: inspected = inspect_int(level, optname, data, ret); break;
-# endif
-# if defined(SO_SNDLOWAT) /* POSIX */
- case SO_SNDLOWAT: inspected = inspect_int(level, optname, data, ret); break;
-# endif
-# if defined(SO_LINGER) /* POSIX */
- case SO_LINGER: inspected = inspect_linger(level, optname, data, ret); break;
-# endif
-# if defined(SO_RCVTIMEO) /* POSIX */
- case SO_RCVTIMEO: inspected = inspect_timeval_as_interval(level, optname, data, ret); break;
-# endif
-# if defined(SO_SNDTIMEO) /* POSIX */
- case SO_SNDTIMEO: inspected = inspect_timeval_as_interval(level, optname, data, ret); break;
-# endif
-# if defined(SO_PEERCRED) /* GNU/Linux */
- case SO_PEERCRED: inspected = inspect_peercred(level, optname, data, ret); break;
-# endif
- }
- break;
- }
- break;
-
- case AF_INET:
-#ifdef INET6
- case AF_INET6:
-#endif
- switch (level) {
-# if defined(IPPROTO_IPV6)
- case IPPROTO_IPV6:
- switch (optname) {
- /* IPV6_JOIN_GROUP ipv6_mreq, IPV6_LEAVE_GROUP ipv6_mreq */
-# if defined(IPV6_MULTICAST_HOPS) /* POSIX */
- case IPV6_MULTICAST_HOPS: inspected = inspect_int(level, optname, data, ret); break;
-# endif
-# if defined(IPV6_MULTICAST_IF) /* POSIX */
- case IPV6_MULTICAST_IF: inspected = inspect_uint(level, optname, data, ret); break;
-# endif
-# if defined(IPV6_MULTICAST_LOOP) /* POSIX */
- case IPV6_MULTICAST_LOOP: inspected = inspect_uint(level, optname, data, ret); break;
-# endif
-# if defined(IPV6_UNICAST_HOPS) /* POSIX */
- case IPV6_UNICAST_HOPS: inspected = inspect_int(level, optname, data, ret); break;
-# endif
-# if defined(IPV6_V6ONLY) /* POSIX */
- case IPV6_V6ONLY: inspected = inspect_int(level, optname, data, ret); break;
-# endif
- }
- break;
-# endif
-
-# if defined(IPPROTO_TCP)
- case IPPROTO_TCP:
- switch (optname) {
-# if defined(TCP_NODELAY) /* POSIX */
- case TCP_NODELAY: inspected = inspect_int(level, optname, data, ret); break;
-# endif
- }
- break;
-# endif
- }
- break;
-
-#ifdef HAVE_SYS_UN_H
- case AF_UNIX:
- switch (level) {
- case 0:
- switch (optname) {
-# if defined(LOCAL_PEERCRED)
- case LOCAL_PEERCRED: inspected = inspect_local_peercred(level, optname, data, ret); break;
-# endif
- }
- break;
- }
- break;
-#endif
- }
-
- if (!inspected) {
- data = rb_str_dump(data);
- rb_str_catf(ret, " %s", StringValueCStr(data));
- }
-
- rb_str_cat2(ret, ">");
-
- return ret;
-}
-
-/*
- * call-seq:
- * sockopt.unpack(template) => array
- *
- * Calls String#unpack on sockopt.data.
- *
- * sockopt = Socket::Option.new(:INET, :SOCKET, :KEEPALIVE, [1].pack("i"))
- * p sockopt.unpack("i") #=> [1]
- * p sockopt.data.unpack("i") #=> [1]
- */
-static VALUE
-sockopt_unpack(VALUE self, VALUE template)
-{
- return rb_funcall(sockopt_data(self), rb_intern("unpack"), 1, template);
-}
-
-void
-Init_sockopt(void)
-{
- /* for rdoc */
- /* rb_cSocket = rb_define_class("Socket", rb_cBasicSocket); */
-
- rb_cSockOpt = rb_define_class_under(rb_cSocket, "Option", rb_cObject);
- rb_define_method(rb_cSockOpt, "initialize", sockopt_initialize, 4);
- rb_define_method(rb_cSockOpt, "family", sockopt_family_m, 0);
- rb_define_method(rb_cSockOpt, "level", sockopt_level_m, 0);
- rb_define_method(rb_cSockOpt, "optname", sockopt_optname_m, 0);
- rb_define_method(rb_cSockOpt, "data", sockopt_data, 0);
- rb_define_method(rb_cSockOpt, "inspect", sockopt_inspect, 0);
-
- rb_define_singleton_method(rb_cSockOpt, "int", sockopt_s_int, 4);
- rb_define_method(rb_cSockOpt, "int", sockopt_int, 0);
-
- rb_define_singleton_method(rb_cSockOpt, "bool", sockopt_s_bool, 4);
- rb_define_method(rb_cSockOpt, "bool", sockopt_bool, 0);
-
- rb_define_singleton_method(rb_cSockOpt, "linger", sockopt_s_linger, 2);
- rb_define_method(rb_cSockOpt, "linger", sockopt_linger, 0);
-
- rb_define_method(rb_cSockOpt, "unpack", sockopt_unpack, 1);
-
- rb_define_method(rb_cSockOpt, "to_s", sockopt_data, 0); /* compatibility for ruby before 1.9.2 */
-}
-
diff --git a/ext/socket/raddrinfo.c b/ext/socket/raddrinfo.c
deleted file mode 100644
index 21cc953e1f..0000000000
--- a/ext/socket/raddrinfo.c
+++ /dev/null
@@ -1,2171 +0,0 @@
-/************************************************
-
- ainfo.c -
-
- created at: Thu Mar 31 12:21:29 JST 1994
-
- Copyright (C) 1993-2007 Yukihiro Matsumoto
-
-************************************************/
-
-#include "rubysocket.h"
-
-#if defined(INET6) && (defined(LOOKUP_ORDER_HACK_INET) || defined(LOOKUP_ORDER_HACK_INET6))
-#define LOOKUP_ORDERS (sizeof(lookup_order_table) / sizeof(lookup_order_table[0]))
-static const int lookup_order_table[] = {
-#if defined(LOOKUP_ORDER_HACK_INET)
- PF_INET, PF_INET6, PF_UNSPEC,
-#elif defined(LOOKUP_ORDER_HACK_INET6)
- PF_INET6, PF_INET, PF_UNSPEC,
-#else
- /* should not happen */
-#endif
-};
-
-static int
-ruby_getaddrinfo(const char *nodename, const char *servname,
- const struct addrinfo *hints, struct addrinfo **res)
-{
- struct addrinfo tmp_hints;
- int i, af, error;
-
- if (hints->ai_family != PF_UNSPEC) {
- return getaddrinfo(nodename, servname, hints, res);
- }
-
- for (i = 0; i < LOOKUP_ORDERS; i++) {
- af = lookup_order_table[i];
- MEMCPY(&tmp_hints, hints, struct addrinfo, 1);
- tmp_hints.ai_family = af;
- error = getaddrinfo(nodename, servname, &tmp_hints, res);
- if (error) {
- if (tmp_hints.ai_family == PF_UNSPEC) {
- break;
- }
- }
- else {
- break;
- }
- }
-
- return error;
-}
-#define getaddrinfo(node,serv,hints,res) ruby_getaddrinfo((node),(serv),(hints),(res))
-#endif
-
-#if defined(_AIX)
-static int
-ruby_getaddrinfo__aix(const char *nodename, const char *servname,
- struct addrinfo *hints, struct addrinfo **res)
-{
- int error = getaddrinfo(nodename, servname, hints, res);
- struct addrinfo *r;
- if (error)
- return error;
- for (r = *res; r != NULL; r = r->ai_next) {
- if (r->ai_addr->sa_family == 0)
- r->ai_addr->sa_family = r->ai_family;
- if (r->ai_addr->sa_len == 0)
- r->ai_addr->sa_len = r->ai_addrlen;
- }
- return 0;
-}
-#undef getaddrinfo
-#define getaddrinfo(node,serv,hints,res) ruby_getaddrinfo__aix((node),(serv),(hints),(res))
-static int
-ruby_getnameinfo__aix(const struct sockaddr *sa, size_t salen,
- char *host, size_t hostlen,
- char *serv, size_t servlen, int flags)
-{
- struct sockaddr_in6 *sa6;
- u_int32_t *a6;
-
- if (sa->sa_family == AF_INET6) {
- sa6 = (struct sockaddr_in6 *)sa;
- a6 = sa6->sin6_addr.u6_addr.u6_addr32;
-
- if (a6[0] == 0 && a6[1] == 0 && a6[2] == 0 && a6[3] == 0) {
- strncpy(host, "::", hostlen);
- snprintf(serv, servlen, "%d", sa6->sin6_port);
- return 0;
- }
- }
- return getnameinfo(sa, salen, host, hostlen, serv, servlen, flags);
-}
-#undef getnameinfo
-#define getnameinfo(sa, salen, host, hostlen, serv, servlen, flags) \
- ruby_getnameinfo__aix((sa), (salen), (host), (hostlen), (serv), (servlen), (flags))
-#endif
-
-#ifndef GETADDRINFO_EMU
-struct getaddrinfo_arg
-{
- const char *node;
- const char *service;
- const struct addrinfo *hints;
- struct addrinfo **res;
-};
-
-static VALUE
-nogvl_getaddrinfo(void *arg)
-{
- struct getaddrinfo_arg *ptr = arg;
- return getaddrinfo(ptr->node, ptr->service,
- ptr->hints, ptr->res);
-}
-#endif
-
-int
-rb_getaddrinfo(const char *node, const char *service,
- const struct addrinfo *hints,
- struct addrinfo **res)
-{
-#ifdef GETADDRINFO_EMU
- return getaddrinfo(node, service, hints, res);
-#else
- struct getaddrinfo_arg arg;
- int ret;
- arg.node = node;
- arg.service = service;
- arg.hints = hints;
- arg.res = res;
- ret = BLOCKING_REGION(nogvl_getaddrinfo, &arg);
- return ret;
-#endif
-}
-
-#ifndef GETADDRINFO_EMU
-struct getnameinfo_arg
-{
- const struct sockaddr *sa;
- socklen_t salen;
- char *host;
- size_t hostlen;
- char *serv;
- size_t servlen;
- int flags;
-};
-
-static VALUE
-nogvl_getnameinfo(void *arg)
-{
- struct getnameinfo_arg *ptr = arg;
- return getnameinfo(ptr->sa, ptr->salen,
- ptr->host, ptr->hostlen,
- ptr->serv, ptr->servlen,
- ptr->flags);
-}
-#endif
-
-int
-rb_getnameinfo(const struct sockaddr *sa, socklen_t salen,
- char *host, size_t hostlen,
- char *serv, size_t servlen, int flags)
-{
-#ifdef GETADDRINFO_EMU
- return getnameinfo(sa, salen, host, hostlen, serv, servlen, flags);
-#else
- struct getnameinfo_arg arg;
- int ret;
- arg.sa = sa;
- arg.salen = salen;
- arg.host = host;
- arg.hostlen = hostlen;
- arg.serv = serv;
- arg.servlen = servlen;
- arg.flags = flags;
- ret = BLOCKING_REGION(nogvl_getnameinfo, &arg);
- return ret;
-#endif
-}
-
-static void
-make_ipaddr0(struct sockaddr *addr, char *buf, size_t len)
-{
- int error;
-
- error = rb_getnameinfo(addr, SA_LEN(addr), buf, len, NULL, 0, NI_NUMERICHOST);
- if (error) {
- rsock_raise_socket_error("getnameinfo", error);
- }
-}
-
-VALUE
-rsock_make_ipaddr(struct sockaddr *addr)
-{
- char hbuf[1024];
-
- make_ipaddr0(addr, hbuf, sizeof(hbuf));
- return rb_str_new2(hbuf);
-}
-
-static void
-make_inetaddr(long host, char *buf, size_t len)
-{
- struct sockaddr_in sin;
-
- MEMZERO(&sin, struct sockaddr_in, 1);
- sin.sin_family = AF_INET;
- SET_SIN_LEN(&sin, sizeof(sin));
- sin.sin_addr.s_addr = host;
- make_ipaddr0((struct sockaddr*)&sin, buf, len);
-}
-
-static int
-str_isnumber(const char *p)
-{
- char *ep;
-
- if (!p || *p == '\0')
- return 0;
- ep = NULL;
- (void)STRTOUL(p, &ep, 10);
- if (ep && *ep == '\0')
- return 1;
- else
- return 0;
-}
-
-static char*
-host_str(VALUE host, char *hbuf, size_t len, int *flags_ptr)
-{
- if (NIL_P(host)) {
- return NULL;
- }
- else if (rb_obj_is_kind_of(host, rb_cInteger)) {
- unsigned long i = NUM2ULONG(host);
-
- make_inetaddr(htonl(i), hbuf, len);
- if (flags_ptr) *flags_ptr |= AI_NUMERICHOST;
- return hbuf;
- }
- else {
- char *name;
-
- SafeStringValue(host);
- name = RSTRING_PTR(host);
- if (!name || *name == 0 || (name[0] == '<' && strcmp(name, "<any>") == 0)) {
- make_inetaddr(INADDR_ANY, hbuf, len);
- if (flags_ptr) *flags_ptr |= AI_NUMERICHOST;
- }
- else if (name[0] == '<' && strcmp(name, "<broadcast>") == 0) {
- make_inetaddr(INADDR_BROADCAST, hbuf, len);
- if (flags_ptr) *flags_ptr |= AI_NUMERICHOST;
- }
- else if (strlen(name) >= len) {
- rb_raise(rb_eArgError, "hostname too long (%"PRIuSIZE")",
- strlen(name));
- }
- else {
- strcpy(hbuf, name);
- }
- return hbuf;
- }
-}
-
-static char*
-port_str(VALUE port, char *pbuf, size_t len, int *flags_ptr)
-{
- if (NIL_P(port)) {
- return 0;
- }
- else if (FIXNUM_P(port)) {
- snprintf(pbuf, len, "%ld", FIX2LONG(port));
-#ifdef AI_NUMERICSERV
- if (flags_ptr) *flags_ptr |= AI_NUMERICSERV;
-#endif
- return pbuf;
- }
- else {
- char *serv;
-
- SafeStringValue(port);
- serv = RSTRING_PTR(port);
- if (strlen(serv) >= len) {
- rb_raise(rb_eArgError, "service name too long (%"PRIuSIZE")",
- strlen(serv));
- }
- strcpy(pbuf, serv);
- return pbuf;
- }
-}
-
-struct addrinfo*
-rsock_getaddrinfo(VALUE host, VALUE port, struct addrinfo *hints, int socktype_hack)
-{
- struct addrinfo* res = NULL;
- char *hostp, *portp;
- int error;
- char hbuf[NI_MAXHOST], pbuf[NI_MAXSERV];
- int additional_flags = 0;
-
- hostp = host_str(host, hbuf, sizeof(hbuf), &additional_flags);
- portp = port_str(port, pbuf, sizeof(pbuf), &additional_flags);
-
- if (socktype_hack && hints->ai_socktype == 0 && str_isnumber(portp)) {
- hints->ai_socktype = SOCK_DGRAM;
- }
- hints->ai_flags |= additional_flags;
-
- error = rb_getaddrinfo(hostp, portp, hints, &res);
- if (error) {
- if (hostp && hostp[strlen(hostp)-1] == '\n') {
- rb_raise(rb_eSocket, "newline at the end of hostname");
- }
- rsock_raise_socket_error("getaddrinfo", error);
- }
-
-#if defined(__APPLE__) && defined(__MACH__)
- {
- struct addrinfo *r;
- r = res;
- while (r) {
- if (! r->ai_socktype) r->ai_socktype = hints->ai_socktype;
- if (! r->ai_protocol) {
- if (r->ai_socktype == SOCK_DGRAM) {
- r->ai_protocol = IPPROTO_UDP;
- }
- else if (r->ai_socktype == SOCK_STREAM) {
- r->ai_protocol = IPPROTO_TCP;
- }
- }
- r = r->ai_next;
- }
- }
-#endif
- return res;
-}
-
-struct addrinfo*
-rsock_addrinfo(VALUE host, VALUE port, int socktype, int flags)
-{
- struct addrinfo hints;
-
- MEMZERO(&hints, struct addrinfo, 1);
- hints.ai_family = AF_UNSPEC;
- hints.ai_socktype = socktype;
- hints.ai_flags = flags;
- return rsock_getaddrinfo(host, port, &hints, 1);
-}
-
-VALUE
-rsock_ipaddr(struct sockaddr *sockaddr, int norevlookup)
-{
- VALUE family, port, addr1, addr2;
- VALUE ary;
- int error;
- char hbuf[1024], pbuf[1024];
- ID id;
-
- id = rsock_intern_family(sockaddr->sa_family);
- if (id) {
- family = rb_str_dup(rb_id2str(id));
- }
- else {
- sprintf(pbuf, "unknown:%d", sockaddr->sa_family);
- family = rb_str_new2(pbuf);
- }
-
- addr1 = Qnil;
- if (!norevlookup) {
- error = rb_getnameinfo(sockaddr, SA_LEN(sockaddr), hbuf, sizeof(hbuf),
- NULL, 0, 0);
- if (! error) {
- addr1 = rb_str_new2(hbuf);
- }
- }
- error = rb_getnameinfo(sockaddr, SA_LEN(sockaddr), hbuf, sizeof(hbuf),
- pbuf, sizeof(pbuf), NI_NUMERICHOST | NI_NUMERICSERV);
- if (error) {
- rsock_raise_socket_error("getnameinfo", error);
- }
- addr2 = rb_str_new2(hbuf);
- if (addr1 == Qnil) {
- addr1 = addr2;
- }
- port = INT2FIX(atoi(pbuf));
- ary = rb_ary_new3(4, family, port, addr1, addr2);
-
- return ary;
-}
-
-#ifdef HAVE_SYS_UN_H
-const char*
-rsock_unixpath(struct sockaddr_un *sockaddr, socklen_t len)
-{
- if (sockaddr->sun_path < (char*)sockaddr + len)
- return sockaddr->sun_path;
- else
- return "";
-}
-
-VALUE
-rsock_unixaddr(struct sockaddr_un *sockaddr, socklen_t len)
-{
- return rb_assoc_new(rb_str_new2("AF_UNIX"),
- rb_str_new2(rsock_unixpath(sockaddr, len)));
-}
-#endif
-
-struct hostent_arg {
- VALUE host;
- struct addrinfo* addr;
- VALUE (*ipaddr)(struct sockaddr*, size_t);
-};
-
-static VALUE
-make_hostent_internal(struct hostent_arg *arg)
-{
- VALUE host = arg->host;
- struct addrinfo* addr = arg->addr;
- VALUE (*ipaddr)(struct sockaddr*, size_t) = arg->ipaddr;
-
- struct addrinfo *ai;
- struct hostent *h;
- VALUE ary, names;
- char **pch;
- const char* hostp;
- char hbuf[NI_MAXHOST];
-
- ary = rb_ary_new();
- if (addr->ai_canonname) {
- hostp = addr->ai_canonname;
- }
- else {
- hostp = host_str(host, hbuf, sizeof(hbuf), NULL);
- }
- rb_ary_push(ary, rb_str_new2(hostp));
-
- if (addr->ai_canonname && (h = gethostbyname(addr->ai_canonname))) {
- names = rb_ary_new();
- if (h->h_aliases != NULL) {
- for (pch = h->h_aliases; *pch; pch++) {
- rb_ary_push(names, rb_str_new2(*pch));
- }
- }
- }
- else {
- names = rb_ary_new2(0);
- }
- rb_ary_push(ary, names);
- rb_ary_push(ary, INT2NUM(addr->ai_family));
- for (ai = addr; ai; ai = ai->ai_next) {
- rb_ary_push(ary, (*ipaddr)(ai->ai_addr, ai->ai_addrlen));
- }
-
- return ary;
-}
-
-VALUE
-rsock_make_hostent(VALUE host, struct addrinfo *addr, VALUE (*ipaddr)(struct sockaddr *, size_t))
-{
- struct hostent_arg arg;
-
- arg.host = host;
- arg.addr = addr;
- arg.ipaddr = ipaddr;
- return rb_ensure(make_hostent_internal, (VALUE)&arg,
- RUBY_METHOD_FUNC(freeaddrinfo), (VALUE)addr);
-}
-
-typedef struct {
- VALUE inspectname;
- VALUE canonname;
- int pfamily;
- int socktype;
- int protocol;
- size_t sockaddr_len;
- struct sockaddr_storage addr;
-} rb_addrinfo_t;
-
-static void
-addrinfo_mark(rb_addrinfo_t *rai)
-{
- if (rai) {
- rb_gc_mark(rai->inspectname);
- rb_gc_mark(rai->canonname);
- }
-}
-
-static void
-addrinfo_free(rb_addrinfo_t *rai)
-{
- xfree(rai);
-}
-
-static VALUE
-addrinfo_s_allocate(VALUE klass)
-{
- return Data_Wrap_Struct(klass, addrinfo_mark, addrinfo_free, 0);
-}
-
-#define IS_ADDRINFO(obj) (RDATA(obj)->dmark == (RUBY_DATA_FUNC)addrinfo_mark)
-static rb_addrinfo_t *
-check_addrinfo(VALUE self)
-{
- Check_Type(self, RUBY_T_DATA);
- if (!IS_ADDRINFO(self)) {
- rb_raise(rb_eTypeError, "wrong argument type %s (expected Addrinfo)",
- rb_class2name(CLASS_OF(self)));
- }
- return DATA_PTR(self);
-}
-
-static rb_addrinfo_t *
-get_addrinfo(VALUE self)
-{
- rb_addrinfo_t *rai = check_addrinfo(self);
-
- if (!rai) {
- rb_raise(rb_eTypeError, "uninitialized socket address");
- }
- return rai;
-}
-
-
-static rb_addrinfo_t *
-alloc_addrinfo()
-{
- rb_addrinfo_t *rai = ALLOC(rb_addrinfo_t);
- memset(rai, 0, sizeof(rb_addrinfo_t));
- rai->inspectname = Qnil;
- rai->canonname = Qnil;
- return rai;
-}
-
-static void
-init_addrinfo(rb_addrinfo_t *rai, struct sockaddr *sa, size_t len,
- int pfamily, int socktype, int protocol,
- VALUE canonname, VALUE inspectname)
-{
- if (sizeof(rai->addr) < len)
- rb_raise(rb_eArgError, "sockaddr string too big");
- memcpy((void *)&rai->addr, (void *)sa, len);
- rai->sockaddr_len = len;
-
- rai->pfamily = pfamily;
- rai->socktype = socktype;
- rai->protocol = protocol;
- rai->canonname = canonname;
- rai->inspectname = inspectname;
-}
-
-VALUE
-rsock_addrinfo_new(struct sockaddr *addr, socklen_t len,
- int family, int socktype, int protocol,
- VALUE canonname, VALUE inspectname)
-{
- VALUE a;
- rb_addrinfo_t *rai;
-
- a = addrinfo_s_allocate(rb_cAddrinfo);
- DATA_PTR(a) = rai = alloc_addrinfo();
- init_addrinfo(rai, addr, len, family, socktype, protocol, canonname, inspectname);
- return a;
-}
-
-static struct addrinfo *
-call_getaddrinfo(VALUE node, VALUE service,
- VALUE family, VALUE socktype, VALUE protocol, VALUE flags,
- int socktype_hack)
-{
- struct addrinfo hints, *res;
-
- MEMZERO(&hints, struct addrinfo, 1);
- hints.ai_family = NIL_P(family) ? PF_UNSPEC : rsock_family_arg(family);
-
- if (!NIL_P(socktype)) {
- hints.ai_socktype = rsock_socktype_arg(socktype);
- }
- if (!NIL_P(protocol)) {
- hints.ai_protocol = NUM2INT(protocol);
- }
- if (!NIL_P(flags)) {
- hints.ai_flags = NUM2INT(flags);
- }
- res = rsock_getaddrinfo(node, service, &hints, socktype_hack);
-
- if (res == NULL)
- rb_raise(rb_eSocket, "host not found");
- return res;
-}
-
-static VALUE make_inspectname(VALUE node, VALUE service, struct addrinfo *res);
-
-static void
-init_addrinfo_getaddrinfo(rb_addrinfo_t *rai, VALUE node, VALUE service,
- VALUE family, VALUE socktype, VALUE protocol, VALUE flags,
- VALUE inspectnode, VALUE inspectservice)
-{
- struct addrinfo *res = call_getaddrinfo(node, service, family, socktype, protocol, flags, 1);
- VALUE canonname;
- VALUE inspectname = rb_str_equal(node, inspectnode) ? Qnil : make_inspectname(inspectnode, inspectservice, res);
-
- canonname = Qnil;
- if (res->ai_canonname) {
- canonname = rb_tainted_str_new_cstr(res->ai_canonname);
- OBJ_FREEZE(canonname);
- }
-
- init_addrinfo(rai, res->ai_addr, res->ai_addrlen,
- NUM2INT(family), NUM2INT(socktype), NUM2INT(protocol),
- canonname, inspectname);
-
- freeaddrinfo(res);
-}
-
-static VALUE
-make_inspectname(VALUE node, VALUE service, struct addrinfo *res)
-{
- VALUE inspectname = Qnil;
-
- if (res) {
- char hbuf[NI_MAXHOST], pbuf[NI_MAXSERV];
- int ret;
- ret = rb_getnameinfo(res->ai_addr, res->ai_addrlen, hbuf,
- sizeof(hbuf), pbuf, sizeof(pbuf),
- NI_NUMERICHOST|NI_NUMERICSERV);
- if (ret == 0) {
- if (TYPE(node) == T_STRING && strcmp(hbuf, RSTRING_PTR(node)) == 0)
- node = Qnil;
- if (TYPE(service) == T_STRING && strcmp(pbuf, RSTRING_PTR(service)) == 0)
- service = Qnil;
- else if (TYPE(service) == T_FIXNUM && atoi(pbuf) == FIX2INT(service))
- service = Qnil;
- }
- }
-
- if (TYPE(node) == T_STRING) {
- inspectname = rb_str_dup(node);
- }
- if (TYPE(service) == T_STRING) {
- if (NIL_P(inspectname))
- inspectname = rb_sprintf(":%s", StringValueCStr(service));
- else
- rb_str_catf(inspectname, ":%s", StringValueCStr(service));
- }
- else if (TYPE(service) == T_FIXNUM && FIX2INT(service) != 0)
- {
- if (NIL_P(inspectname))
- inspectname = rb_sprintf(":%d", FIX2INT(service));
- else
- rb_str_catf(inspectname, ":%d", FIX2INT(service));
- }
- if (!NIL_P(inspectname)) {
- OBJ_INFECT(inspectname, node);
- OBJ_INFECT(inspectname, service);
- OBJ_FREEZE(inspectname);
- }
- return inspectname;
-}
-
-static VALUE
-addrinfo_firstonly_new(VALUE node, VALUE service, VALUE family, VALUE socktype, VALUE protocol, VALUE flags)
-{
- VALUE ret;
- VALUE canonname;
- VALUE inspectname;
-
- struct addrinfo *res = call_getaddrinfo(node, service, family, socktype, protocol, flags, 0);
-
- inspectname = make_inspectname(node, service, res);
-
- canonname = Qnil;
- if (res->ai_canonname) {
- canonname = rb_tainted_str_new_cstr(res->ai_canonname);
- OBJ_FREEZE(canonname);
- }
-
- ret = rsock_addrinfo_new(res->ai_addr, res->ai_addrlen,
- res->ai_family, res->ai_socktype, res->ai_protocol,
- canonname, inspectname);
-
- freeaddrinfo(res);
- return ret;
-}
-
-static VALUE
-addrinfo_list_new(VALUE node, VALUE service, VALUE family, VALUE socktype, VALUE protocol, VALUE flags)
-{
- VALUE ret;
- struct addrinfo *r;
- VALUE inspectname;
-
- struct addrinfo *res = call_getaddrinfo(node, service, family, socktype, protocol, flags, 0);
-
- inspectname = make_inspectname(node, service, res);
-
- ret = rb_ary_new();
- for (r = res; r; r = r->ai_next) {
- VALUE addr;
- VALUE canonname = Qnil;
-
- if (r->ai_canonname) {
- canonname = rb_tainted_str_new_cstr(r->ai_canonname);
- OBJ_FREEZE(canonname);
- }
-
- addr = rsock_addrinfo_new(r->ai_addr, r->ai_addrlen,
- r->ai_family, r->ai_socktype, r->ai_protocol,
- canonname, inspectname);
-
- rb_ary_push(ret, addr);
- }
-
- freeaddrinfo(res);
- return ret;
-}
-
-
-#ifdef HAVE_SYS_UN_H
-static void
-init_unix_addrinfo(rb_addrinfo_t *rai, VALUE path, int socktype)
-{
- struct sockaddr_un un;
-
- StringValue(path);
-
- if (sizeof(un.sun_path) <= (size_t)RSTRING_LEN(path))
- rb_raise(rb_eArgError, "too long unix socket path (max: %dbytes)",
- (int)sizeof(un.sun_path)-1);
-
- MEMZERO(&un, struct sockaddr_un, 1);
-
- un.sun_family = AF_UNIX;
- memcpy((void*)&un.sun_path, RSTRING_PTR(path), RSTRING_LEN(path));
-
- init_addrinfo(rai, (struct sockaddr *)&un, sizeof(un), PF_UNIX, socktype, 0, Qnil, Qnil);
-}
-#endif
-
-/*
- * call-seq:
- * Addrinfo.new(sockaddr) => addrinfo
- * Addrinfo.new(sockaddr, family) => addrinfo
- * Addrinfo.new(sockaddr, family, socktype) => addrinfo
- * Addrinfo.new(sockaddr, family, socktype, protocol) => addrinfo
- *
- * returns a new instance of Addrinfo.
- * The instnace contains sockaddr, family, socktype, protocol.
- * sockaddr means struct sockaddr which can be used for connect(2), etc.
- * family, socktype and protocol are integers which is used for arguments of socket(2).
- *
- * sockaddr is specified as an array or a string.
- * The array should be compatible to the value of IPSocket#addr or UNIXSocket#addr.
- * The string should be struct sockaddr as generated by
- * Socket.sockaddr_in or Socket.unpack_sockaddr_un.
- *
- * sockaddr examples:
- * - ["AF_INET", 46102, "localhost.localdomain", "127.0.0.1"]
- * - ["AF_INET6", 42304, "ip6-localhost", "::1"]
- * - ["AF_UNIX", "/tmp/sock"]
- * - Socket.sockaddr_in("smtp", "2001:DB8::1")
- * - Socket.sockaddr_in(80, "172.18.22.42")
- * - Socket.sockaddr_in(80, "www.ruby-lang.org")
- * - Socket.sockaddr_un("/tmp/sock")
- *
- * In an AF_INET/AF_INET6 sockaddr array, the 4th element,
- * numeric IP address, is used to construct socket address in the Addrinfo instance.
- * If the 3rd element, textual host name, is non-nil, it is also recorded but used only for Addrinfo#inspect.
- *
- * family is specified as an integer to specify the protocol family such as Socket::PF_INET.
- * It can be a symbol or a string which is the constant name
- * with or without PF_ prefix such as :INET, :INET6, :UNIX, "PF_INET", etc.
- * If ommitted, PF_UNSPEC is assumed.
- *
- * socktype is specified as an integer to specify the socket type such as Socket::SOCK_STREAM.
- * It can be a symbol or a string which is the constant name
- * with or without SOCK_ prefix such as :STREAM, :DGRAM, :RAW, "SOCK_STREAM", etc.
- * If ommitted, 0 is assumed.
- *
- * protocol is specified as an integer to specify the protocol such as Socket::IPPROTO_TCP.
- * It must be an integer, unlike family and socktype.
- * If ommitted, 0 is assumed.
- * Note that 0 is reasonable value for most protocols, except raw socket.
- *
- */
-static VALUE
-addrinfo_initialize(int argc, VALUE *argv, VALUE self)
-{
- rb_addrinfo_t *rai;
- VALUE sockaddr_arg, sockaddr_ary, pfamily, socktype, protocol;
- int i_pfamily, i_socktype, i_protocol;
- struct sockaddr *sockaddr_ptr;
- size_t sockaddr_len;
- VALUE canonname = Qnil, inspectname = Qnil;
-
- if (check_addrinfo(self))
- rb_raise(rb_eTypeError, "already initialized socket address");
- DATA_PTR(self) = rai = alloc_addrinfo();
-
- rb_scan_args(argc, argv, "13", &sockaddr_arg, &pfamily, &socktype, &protocol);
-
- i_pfamily = NIL_P(pfamily) ? PF_UNSPEC : rsock_family_arg(pfamily);
- i_socktype = NIL_P(socktype) ? 0 : rsock_socktype_arg(socktype);
- i_protocol = NIL_P(protocol) ? 0 : NUM2INT(protocol);
-
- sockaddr_ary = rb_check_array_type(sockaddr_arg);
- if (!NIL_P(sockaddr_ary)) {
- VALUE afamily = rb_ary_entry(sockaddr_ary, 0);
- int af;
- StringValue(afamily);
- if (rsock_family_to_int(RSTRING_PTR(afamily), RSTRING_LEN(afamily), &af) == -1)
- rb_raise(rb_eSocket, "unknown address family: %s", StringValueCStr(afamily));
- switch (af) {
- case AF_INET: /* ["AF_INET", 46102, "localhost.localdomain", "127.0.0.1"] */
-#ifdef INET6
- case AF_INET6: /* ["AF_INET6", 42304, "ip6-localhost", "::1"] */
-#endif
- {
- VALUE service = rb_ary_entry(sockaddr_ary, 1);
- VALUE nodename = rb_ary_entry(sockaddr_ary, 2);
- VALUE numericnode = rb_ary_entry(sockaddr_ary, 3);
- int flags;
-
- service = INT2NUM(NUM2INT(service));
- if (!NIL_P(nodename))
- StringValue(nodename);
- StringValue(numericnode);
- flags = AI_NUMERICHOST;
-#ifdef AI_NUMERICSERV
- flags |= AI_NUMERICSERV;
-#endif
-
- init_addrinfo_getaddrinfo(rai, numericnode, service,
- INT2NUM(i_pfamily ? i_pfamily : af), INT2NUM(i_socktype), INT2NUM(i_protocol),
- INT2NUM(flags),
- nodename, service);
- break;
- }
-
-#ifdef HAVE_SYS_UN_H
- case AF_UNIX: /* ["AF_UNIX", "/tmp/sock"] */
- {
- VALUE path = rb_ary_entry(sockaddr_ary, 1);
- StringValue(path);
- init_unix_addrinfo(rai, path, SOCK_STREAM);
- break;
- }
-#endif
-
- default:
- rb_raise(rb_eSocket, "unexpected address family");
- }
- }
- else {
- StringValue(sockaddr_arg);
- sockaddr_ptr = (struct sockaddr *)RSTRING_PTR(sockaddr_arg);
- sockaddr_len = RSTRING_LEN(sockaddr_arg);
- init_addrinfo(rai, sockaddr_ptr, sockaddr_len,
- i_pfamily, i_socktype, i_protocol,
- canonname, inspectname);
- }
-
- return self;
-}
-
-static int
-get_afamily(struct sockaddr *addr, socklen_t len)
-{
- if ((char*)&addr->sa_family + sizeof(addr->sa_family) - (char*)addr <= len)
- return addr->sa_family;
- else
- return AF_UNSPEC;
-}
-
-static int
-ai_get_afamily(rb_addrinfo_t *rai)
-{
- return get_afamily((struct sockaddr *)&rai->addr, rai->sockaddr_len);
-}
-
-static VALUE
-inspect_sockaddr(VALUE addrinfo, VALUE ret)
-{
- rb_addrinfo_t *rai = get_addrinfo(addrinfo);
-
- if (rai->sockaddr_len == 0) {
- rb_str_cat2(ret, "empty-sockaddr");
- }
- else if (rai->sockaddr_len < ((char*)&rai->addr.ss_family + sizeof(rai->addr.ss_family)) - (char*)&rai->addr)
- rb_str_cat2(ret, "too-short-sockaddr");
- else {
- switch (rai->addr.ss_family) {
- case AF_INET:
- {
- struct sockaddr_in *addr;
- int port;
- if (rai->sockaddr_len < sizeof(struct sockaddr_in)) {
- rb_str_cat2(ret, "too-short-AF_INET-sockaddr");
- }
- else {
- addr = (struct sockaddr_in *)&rai->addr;
- rb_str_catf(ret, "%d.%d.%d.%d",
- ((unsigned char*)&addr->sin_addr)[0],
- ((unsigned char*)&addr->sin_addr)[1],
- ((unsigned char*)&addr->sin_addr)[2],
- ((unsigned char*)&addr->sin_addr)[3]);
- port = ntohs(addr->sin_port);
- if (port)
- rb_str_catf(ret, ":%d", port);
- if (sizeof(struct sockaddr_in) < rai->sockaddr_len)
- rb_str_catf(ret, "(sockaddr %d bytes too long)", (int)(rai->sockaddr_len - sizeof(struct sockaddr_in)));
- }
- break;
- }
-
-#ifdef AF_INET6
- case AF_INET6:
- {
- struct sockaddr_in6 *addr;
- char hbuf[1024];
- int port;
- int error;
- if (rai->sockaddr_len < sizeof(struct sockaddr_in6)) {
- rb_str_cat2(ret, "too-short-AF_INET6-sockaddr");
- }
- else {
- addr = (struct sockaddr_in6 *)&rai->addr;
- /* use getnameinfo for scope_id.
- * RFC 4007: IPv6 Scoped Address Architecture
- * draft-ietf-ipv6-scope-api-00.txt: Scoped Address Extensions to the IPv6 Basic Socket API
- */
- error = getnameinfo((struct sockaddr *)&rai->addr, rai->sockaddr_len,
- hbuf, sizeof(hbuf), NULL, 0,
- NI_NUMERICHOST|NI_NUMERICSERV);
- if (error) {
- rsock_raise_socket_error("getnameinfo", error);
- }
- if (addr->sin6_port == 0) {
- rb_str_cat2(ret, hbuf);
- }
- else {
- port = ntohs(addr->sin6_port);
- rb_str_catf(ret, "[%s]:%d", hbuf, port);
- }
- if (sizeof(struct sockaddr_in6) < rai->sockaddr_len)
- rb_str_catf(ret, "(sockaddr %d bytes too long)", (int)(rai->sockaddr_len - sizeof(struct sockaddr_in6)));
- }
- break;
- }
-#endif
-
-#ifdef HAVE_SYS_UN_H
- case AF_UNIX:
- {
- struct sockaddr_un *addr = (struct sockaddr_un *)&rai->addr;
- char *p, *s, *t, *e;
- s = addr->sun_path;
- e = (char*)addr + rai->sockaddr_len;
- if (e < s)
- rb_str_cat2(ret, "too-short-AF_UNIX-sockaddr");
- else if (s == e)
- rb_str_cat2(ret, "empty-path-AF_UNIX-sockaddr");
- else {
- int printable_only = 1;
- p = s;
- while (p < e && *p != '\0') {
- printable_only = printable_only && ISPRINT(*p) && !ISSPACE(*p);
- p++;
- }
- t = p;
- while (p < e && *p == '\0')
- p++;
- if (printable_only && /* only printable, no space */
- t < e && /* NUL terminated */
- p == e) { /* no data after NUL */
- if (s == t)
- rb_str_cat2(ret, "empty-path-AF_UNIX-sockaddr");
- else if (s[0] == '/') /* absolute path */
- rb_str_cat2(ret, s);
- else
- rb_str_catf(ret, "AF_UNIX %s", s);
- }
- else {
- rb_str_cat2(ret, "AF_UNIX");
- e = (char *)addr->sun_path + sizeof(addr->sun_path);
- while (s < e && *(e-1) == '\0')
- e--;
- while (s < e)
- rb_str_catf(ret, ":%02x", (unsigned char)*s++);
- }
- if (addr->sun_path + sizeof(addr->sun_path) < (char*)&rai->addr + rai->sockaddr_len)
- rb_str_catf(ret, "(sockaddr %d bytes too long)",
- (int)(rai->sockaddr_len - (addr->sun_path + sizeof(addr->sun_path) - (char*)&rai->addr)));
- }
- break;
- }
-#endif
-
- default:
- {
- ID id = rsock_intern_family(rai->addr.ss_family);
- if (id == 0)
- rb_str_catf(ret, "unknown address family %d", rai->addr.ss_family);
- else
- rb_str_catf(ret, "%s address format unknown", rb_id2name(id));
- break;
- }
- }
- }
-
- return ret;
-}
-
-/*
- * call-seq:
- * addrinfo.inspect => string
- *
- * returns a string which shows addrinfo in human-readable form.
- *
- * Addrinfo.tcp("localhost", 80).inspect #=> "#<Addrinfo: 127.0.0.1:80 TCP (localhost:80)>"
- * Addrinfo.unix("/tmp/sock").inspect #=> "#<Addrinfo: /tmp/sock SOCK_STREAM>"
- *
- */
-static VALUE
-addrinfo_inspect(VALUE self)
-{
- rb_addrinfo_t *rai = get_addrinfo(self);
- int internet_p;
- VALUE ret;
-
- ret = rb_sprintf("#<%s: ", rb_obj_classname(self));
-
- inspect_sockaddr(self, ret);
-
- if (rai->pfamily && ai_get_afamily(rai) != rai->pfamily) {
- ID id = rsock_intern_protocol_family(rai->pfamily);
- if (id)
- rb_str_catf(ret, " %s", rb_id2name(id));
- else
- rb_str_catf(ret, " PF_\?\?\?(%d)", rai->pfamily);
- }
-
- internet_p = rai->pfamily == PF_INET;
-#ifdef INET6
- internet_p = internet_p || rai->pfamily == PF_INET6;
-#endif
- if (internet_p && rai->socktype == SOCK_STREAM &&
- (rai->protocol == 0 || rai->protocol == IPPROTO_TCP)) {
- rb_str_cat2(ret, " TCP");
- }
- else if (internet_p && rai->socktype == SOCK_DGRAM &&
- (rai->protocol == 0 || rai->protocol == IPPROTO_UDP)) {
- rb_str_cat2(ret, " UDP");
- }
- else {
- if (rai->socktype) {
- ID id = rsock_intern_socktype(rai->socktype);
- if (id)
- rb_str_catf(ret, " %s", rb_id2name(id));
- else
- rb_str_catf(ret, " SOCK_\?\?\?(%d)", rai->socktype);
- }
-
- if (rai->protocol) {
- if (internet_p) {
- ID id = rsock_intern_ipproto(rai->protocol);
- if (id)
- rb_str_catf(ret, " %s", rb_id2name(id));
- else
- goto unknown_protocol;
- }
- else {
- unknown_protocol:
- rb_str_catf(ret, " UNKNOWN_PROTOCOL(%d)", rai->protocol);
- }
- }
- }
-
- if (!NIL_P(rai->canonname)) {
- VALUE name = rai->canonname;
- rb_str_catf(ret, " %s", StringValueCStr(name));
- }
-
- if (!NIL_P(rai->inspectname)) {
- VALUE name = rai->inspectname;
- rb_str_catf(ret, " (%s)", StringValueCStr(name));
- }
-
- rb_str_buf_cat2(ret, ">");
- return ret;
-}
-
-/*
- * call-seq:
- * addrinfo.inspect_sockaddr => string
- *
- * returns a string which shows the sockaddr in _addrinfo_ with human-readable form.
- *
- * Addrinfo.tcp("localhost", 80).inspect_sockaddr #=> "127.0.0.1:80"
- * Addrinfo.tcp("ip6-localhost", 80).inspect_sockaddr #=> "[::1]:80"
- * Addrinfo.unix("/tmp/sock").inspect_sockaddr #=> "/tmp/sock"
- *
- */
-static VALUE
-addrinfo_inspect_sockaddr(VALUE self)
-{
- return inspect_sockaddr(self, rb_str_new("", 0));
-}
-
-/* :nodoc: */
-static VALUE
-addrinfo_mdump(VALUE self)
-{
- rb_addrinfo_t *rai = get_addrinfo(self);
- VALUE sockaddr, afamily, pfamily, socktype, protocol, canonname, inspectname;
- int afamily_int = ai_get_afamily(rai);
- ID id;
-
- id = rsock_intern_protocol_family(rai->pfamily);
- if (id == 0)
- rb_raise(rb_eSocket, "unknown protocol family: %d", rai->pfamily);
- pfamily = rb_id2str(id);
-
- if (rai->socktype == 0)
- socktype = INT2FIX(0);
- else {
- id = rsock_intern_socktype(rai->socktype);
- if (id == 0)
- rb_raise(rb_eSocket, "unknown socktype: %d", rai->socktype);
- socktype = rb_id2str(id);
- }
-
- if (rai->protocol == 0)
- protocol = INT2FIX(0);
- else if (IS_IP_FAMILY(afamily_int)) {
- id = rsock_intern_ipproto(rai->protocol);
- if (id == 0)
- rb_raise(rb_eSocket, "unknown IP protocol: %d", rai->protocol);
- protocol = rb_id2str(id);
- }
- else {
- rb_raise(rb_eSocket, "unknown protocol: %d", rai->protocol);
- }
-
- canonname = rai->canonname;
-
- inspectname = rai->inspectname;
-
- id = rsock_intern_family(afamily_int);
- if (id == 0)
- rb_raise(rb_eSocket, "unknown address family: %d", afamily_int);
- afamily = rb_id2str(id);
-
- switch(afamily_int) {
-#ifdef HAVE_SYS_UN_H
- case AF_UNIX:
- {
- struct sockaddr_un *su = (struct sockaddr_un *)&rai->addr;
- char *s, *e;
- s = su->sun_path;
- e = (char*)s + sizeof(su->sun_path);
- while (s < e && *(e-1) == '\0')
- e--;
- sockaddr = rb_str_new(s, e-s);
- break;
- }
-#endif
-
- default:
- {
- char hbuf[NI_MAXHOST], pbuf[NI_MAXSERV];
- int error;
- error = getnameinfo((struct sockaddr *)&rai->addr, rai->sockaddr_len,
- hbuf, sizeof(hbuf), pbuf, sizeof(pbuf),
- NI_NUMERICHOST|NI_NUMERICSERV);
- if (error) {
- rsock_raise_socket_error("getnameinfo", error);
- }
- sockaddr = rb_assoc_new(rb_str_new_cstr(hbuf), rb_str_new_cstr(pbuf));
- break;
- }
- }
-
- return rb_ary_new3(7, afamily, sockaddr, pfamily, socktype, protocol, canonname, inspectname);
-}
-
-/* :nodoc: */
-static VALUE
-addrinfo_mload(VALUE self, VALUE ary)
-{
- VALUE v;
- VALUE canonname, inspectname;
- int afamily, pfamily, socktype, protocol;
- struct sockaddr_storage ss;
- size_t len;
- rb_addrinfo_t *rai;
-
- if (check_addrinfo(self))
- rb_raise(rb_eTypeError, "already initialized socket address");
-
- ary = rb_convert_type(ary, T_ARRAY, "Array", "to_ary");
-
- v = rb_ary_entry(ary, 0);
- StringValue(v);
- if (rsock_family_to_int(RSTRING_PTR(v), RSTRING_LEN(v), &afamily) == -1)
- rb_raise(rb_eTypeError, "unexpected address family");
-
- v = rb_ary_entry(ary, 2);
- StringValue(v);
- if (rsock_family_to_int(RSTRING_PTR(v), RSTRING_LEN(v), &pfamily) == -1)
- rb_raise(rb_eTypeError, "unexpected protocol family");
-
- v = rb_ary_entry(ary, 3);
- if (v == INT2FIX(0))
- socktype = 0;
- else {
- StringValue(v);
- if (rsock_socktype_to_int(RSTRING_PTR(v), RSTRING_LEN(v), &socktype) == -1)
- rb_raise(rb_eTypeError, "unexpected socktype");
- }
-
- v = rb_ary_entry(ary, 4);
- if (v == INT2FIX(0))
- protocol = 0;
- else {
- StringValue(v);
- if (IS_IP_FAMILY(afamily)) {
- if (rsock_ipproto_to_int(RSTRING_PTR(v), RSTRING_LEN(v), &protocol) == -1)
- rb_raise(rb_eTypeError, "unexpected protocol");
- }
- else {
- rb_raise(rb_eTypeError, "unexpected protocol");
- }
- }
-
- v = rb_ary_entry(ary, 5);
- if (NIL_P(v))
- canonname = Qnil;
- else {
- StringValue(v);
- canonname = v;
- }
-
- v = rb_ary_entry(ary, 6);
- if (NIL_P(v))
- inspectname = Qnil;
- else {
- StringValue(v);
- inspectname = v;
- }
-
- v = rb_ary_entry(ary, 1);
- switch(afamily) {
-#ifdef HAVE_SYS_UN_H
- case AF_UNIX:
- {
- struct sockaddr_un uaddr;
- memset(&uaddr, 0, sizeof(uaddr));
- uaddr.sun_family = AF_UNIX;
-
- StringValue(v);
- if (sizeof(uaddr.sun_path) <= (size_t)RSTRING_LEN(v))
- rb_raise(rb_eSocket, "too long AF_UNIX path");
- memcpy(uaddr.sun_path, RSTRING_PTR(v), RSTRING_LEN(v));
- len = sizeof(uaddr);
- memcpy(&ss, &uaddr, len);
- break;
- }
-#endif
-
- default:
- {
- VALUE pair = rb_convert_type(v, T_ARRAY, "Array", "to_ary");
- struct addrinfo *res;
- int flags = AI_NUMERICHOST;
-#ifdef AI_NUMERICSERV
- flags |= AI_NUMERICSERV;
-#endif
- res = call_getaddrinfo(rb_ary_entry(pair, 0), rb_ary_entry(pair, 1),
- INT2NUM(pfamily), INT2NUM(socktype), INT2NUM(protocol),
- INT2NUM(flags), 1);
-
- len = res->ai_addrlen;
- memcpy(&ss, res->ai_addr, res->ai_addrlen);
- break;
- }
- }
-
- DATA_PTR(self) = rai = alloc_addrinfo();
- init_addrinfo(rai, (struct sockaddr *)&ss, len,
- pfamily, socktype, protocol,
- canonname, inspectname);
- return self;
-}
-
-/*
- * call-seq:
- * addrinfo.afamily => integer
- *
- * returns the address family as an integer.
- *
- * Addrinfo.tcp("localhost", 80).afamily == Socket::AF_INET #=> true
- *
- */
-static VALUE
-addrinfo_afamily(VALUE self)
-{
- rb_addrinfo_t *rai = get_addrinfo(self);
- return INT2NUM(ai_get_afamily(rai));
-}
-
-/*
- * call-seq:
- * addrinfo.pfamily => integer
- *
- * returns the protocol family as an integer.
- *
- * Addrinfo.tcp("localhost", 80).pfamily == Socket::PF_INET #=> true
- *
- */
-static VALUE
-addrinfo_pfamily(VALUE self)
-{
- rb_addrinfo_t *rai = get_addrinfo(self);
- return INT2NUM(rai->pfamily);
-}
-
-/*
- * call-seq:
- * addrinfo.socktype => integer
- *
- * returns the socket type as an integer.
- *
- * Addrinfo.tcp("localhost", 80).socktype == Socket::SOCK_STREAM #=> true
- *
- */
-static VALUE
-addrinfo_socktype(VALUE self)
-{
- rb_addrinfo_t *rai = get_addrinfo(self);
- return INT2NUM(rai->socktype);
-}
-
-/*
- * call-seq:
- * addrinfo.protocol => integer
- *
- * returns the socket type as an integer.
- *
- * Addrinfo.tcp("localhost", 80).protocol == Socket::IPPROTO_TCP #=> true
- *
- */
-static VALUE
-addrinfo_protocol(VALUE self)
-{
- rb_addrinfo_t *rai = get_addrinfo(self);
- return INT2NUM(rai->protocol);
-}
-
-/*
- * call-seq:
- * addrinfo.to_sockaddr => string
- *
- * returns the socket address as packed struct sockaddr string.
- *
- * Addrinfo.tcp("localhost", 80).to_sockaddr
- * #=> "\x02\x00\x00P\x7F\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00"
- *
- */
-static VALUE
-addrinfo_to_sockaddr(VALUE self)
-{
- rb_addrinfo_t *rai = get_addrinfo(self);
- VALUE ret;
- ret = rb_str_new((char*)&rai->addr, rai->sockaddr_len);
- OBJ_INFECT(ret, self);
- return ret;
-}
-
-/*
- * call-seq:
- * addrinfo.canonname => string or nil
- *
- * returns the canonical name as an string.
- *
- * nil is returned if no canonical name.
- *
- * The canonical name is set by Addrinfo.getaddrinfo when AI_CANONNAME is specified.
- *
- * list = Addrinfo.getaddrinfo("www.ruby-lang.org", 80, :INET, :STREAM, nil, Socket::AI_CANONNAME)
- * p list[0] #=> #<Addrinfo: 221.186.184.68:80 TCP carbon.ruby-lang.org (www.ruby-lang.org:80)>
- * p list[0].canonname #=> "carbon.ruby-lang.org"
- *
- */
-static VALUE
-addrinfo_canonname(VALUE self)
-{
- rb_addrinfo_t *rai = get_addrinfo(self);
- return rai->canonname;
-}
-
-/*
- * call-seq:
- * addrinfo.ip? => true or false
- *
- * returns true if addrinfo is internet (IPv4/IPv6) address.
- * returns false otherwise.
- *
- * Addrinfo.tcp("127.0.0.1", 80).ip? #=> true
- * Addrinfo.tcp("::1", 80).ip? #=> true
- * Addrinfo.unix("/tmp/sock").ip? #=> false
- *
- */
-static VALUE
-addrinfo_ip_p(VALUE self)
-{
- rb_addrinfo_t *rai = get_addrinfo(self);
- int family = ai_get_afamily(rai);
- return IS_IP_FAMILY(family) ? Qtrue : Qfalse;
-}
-
-/*
- * call-seq:
- * addrinfo.ipv4? => true or false
- *
- * returns true if addrinfo is IPv4 address.
- * returns false otherwise.
- *
- * Addrinfo.tcp("127.0.0.1", 80).ipv4? #=> true
- * Addrinfo.tcp("::1", 80).ipv4? #=> false
- * Addrinfo.unix("/tmp/sock").ipv4? #=> false
- *
- */
-static VALUE
-addrinfo_ipv4_p(VALUE self)
-{
- rb_addrinfo_t *rai = get_addrinfo(self);
- return ai_get_afamily(rai) == AF_INET ? Qtrue : Qfalse;
-}
-
-/*
- * call-seq:
- * addrinfo.ipv6? => true or false
- *
- * returns true if addrinfo is IPv6 address.
- * returns false otherwise.
- *
- * Addrinfo.tcp("127.0.0.1", 80).ipv6? #=> false
- * Addrinfo.tcp("::1", 80).ipv6? #=> true
- * Addrinfo.unix("/tmp/sock").ipv6? #=> false
- *
- */
-static VALUE
-addrinfo_ipv6_p(VALUE self)
-{
-#ifdef AF_INET6
- rb_addrinfo_t *rai = get_addrinfo(self);
- return ai_get_afamily(rai) == AF_INET6 ? Qtrue : Qfalse;
-#else
- return Qfalse;
-#endif
-}
-
-/*
- * call-seq:
- * addrinfo.unix? => true or false
- *
- * returns true if addrinfo is UNIX address.
- * returns false otherwise.
- *
- * Addrinfo.tcp("127.0.0.1", 80).unix? #=> false
- * Addrinfo.tcp("::1", 80).unix? #=> false
- * Addrinfo.unix("/tmp/sock").unix? #=> true
- *
- */
-static VALUE
-addrinfo_unix_p(VALUE self)
-{
- rb_addrinfo_t *rai = get_addrinfo(self);
-#ifdef AF_UNIX
- return ai_get_afamily(rai) == AF_UNIX ? Qtrue : Qfalse;
-#else
- return Qfalse;
-#endif
-}
-
-/*
- * call-seq:
- * addrinfo.getnameinfo => [nodename, service]
- * addrinfo.getnameinfo(flags) => [nodename, service]
- *
- * returns nodename and service as a pair of strings.
- * This converts struct sockaddr in addrinfo to textual representation.
- *
- * flags should be bitwise OR of Socket::NI_??? constants.
- *
- * Addrinfo.tcp("127.0.0.1", 80).getnameinfo #=> ["localhost", "www"]
- *
- * Addrinfo.tcp("127.0.0.1", 80).getnameinfo(Socket::NI_NUMERICSERV)
- * #=> ["localhost", "80"]
- */
-static VALUE
-addrinfo_getnameinfo(int argc, VALUE *argv, VALUE self)
-{
- rb_addrinfo_t *rai = get_addrinfo(self);
- VALUE vflags;
- char hbuf[1024], pbuf[1024];
- int flags, error;
-
- rb_scan_args(argc, argv, "01", &vflags);
-
- flags = NIL_P(vflags) ? 0 : NUM2INT(vflags);
-
- if (rai->socktype == SOCK_DGRAM)
- flags |= NI_DGRAM;
-
- error = getnameinfo((struct sockaddr *)&rai->addr, rai->sockaddr_len,
- hbuf, sizeof(hbuf), pbuf, sizeof(pbuf),
- flags);
- if (error) {
- rsock_raise_socket_error("getnameinfo", error);
- }
-
- return rb_assoc_new(rb_str_new2(hbuf), rb_str_new2(pbuf));
-}
-
-/*
- * call-seq:
- * addrinfo.ip_unpack => [addr, port]
- *
- * Returns the IP address and port number as 2-element array.
- *
- * Addrinfo.tcp("127.0.0.1", 80).ip_unpack #=> ["127.0.0.1", 80]
- * Addrinfo.tcp("::1", 80).ip_unpack #=> ["::1", 80]
- */
-static VALUE
-addrinfo_ip_unpack(VALUE self)
-{
- rb_addrinfo_t *rai = get_addrinfo(self);
- int family = ai_get_afamily(rai);
- VALUE vflags;
- VALUE ret, portstr;
-
- if (!IS_IP_FAMILY(family))
- rb_raise(rb_eSocket, "need IPv4 or IPv6 address");
-
- vflags = INT2NUM(NI_NUMERICHOST|NI_NUMERICSERV);
- ret = addrinfo_getnameinfo(1, &vflags, self);
- portstr = rb_ary_entry(ret, 1);
- rb_ary_store(ret, 1, INT2NUM(atoi(StringValueCStr(portstr))));
- return ret;
-}
-
-/*
- * call-seq:
- * addrinfo.ip_address => string
- *
- * Returns the IP address as a string.
- *
- * Addrinfo.tcp("127.0.0.1", 80).ip_address #=> "127.0.0.1"
- * Addrinfo.tcp("::1", 80).ip_address #=> "::1"
- */
-static VALUE
-addrinfo_ip_address(VALUE self)
-{
- rb_addrinfo_t *rai = get_addrinfo(self);
- int family = ai_get_afamily(rai);
- VALUE vflags;
- VALUE ret;
-
- if (!IS_IP_FAMILY(family))
- rb_raise(rb_eSocket, "need IPv4 or IPv6 address");
-
- vflags = INT2NUM(NI_NUMERICHOST|NI_NUMERICSERV);
- ret = addrinfo_getnameinfo(1, &vflags, self);
- return rb_ary_entry(ret, 0);
-}
-
-/*
- * call-seq:
- * addrinfo.ip_port => port
- *
- * Returns the port number as an integer.
- *
- * Addrinfo.tcp("127.0.0.1", 80).ip_port #=> 80
- * Addrinfo.tcp("::1", 80).ip_port #=> 80
- */
-static VALUE
-addrinfo_ip_port(VALUE self)
-{
- rb_addrinfo_t *rai = get_addrinfo(self);
- int family = ai_get_afamily(rai);
- int port;
-
- if (!IS_IP_FAMILY(family)) {
- bad_family:
-#ifdef AF_INET6
- rb_raise(rb_eSocket, "need IPv4 or IPv6 address");
-#else
- rb_raise(rb_eSocket, "need IPv4 address");
-#endif
- }
-
- switch (family) {
- case AF_INET:
- if (rai->sockaddr_len != sizeof(struct sockaddr_in))
- rb_raise(rb_eSocket, "unexpected sockaddr size for IPv4");
- port = ntohs(((struct sockaddr_in *)&rai->addr)->sin_port);
- break;
-
-#ifdef AF_INET6
- case AF_INET6:
- if (rai->sockaddr_len != sizeof(struct sockaddr_in6))
- rb_raise(rb_eSocket, "unexpected sockaddr size for IPv6");
- port = ntohs(((struct sockaddr_in6 *)&rai->addr)->sin6_port);
- break;
-#endif
-
- default:
- goto bad_family;
- }
-
- return INT2NUM(port);
-}
-
-static int
-extract_in_addr(VALUE self, uint32_t *addrp)
-{
- rb_addrinfo_t *rai = get_addrinfo(self);
- int family = ai_get_afamily(rai);
- if (family != AF_INET) return 0;
- *addrp = ntohl(((struct sockaddr_in *)&rai->addr)->sin_addr.s_addr);
- return 1;
-}
-
-/*
- * Returns true for IPv4 private address (10.0.0.0/8, 172.16.0.0/12, 192.168.0.0/16).
- * It returns false otherwise.
- */
-static VALUE
-addrinfo_ipv4_private_p(VALUE self)
-{
- uint32_t a;
- if (!extract_in_addr(self, &a)) return Qfalse;
- if ((a & 0xff000000) == 0x0a000000 || /* 10.0.0.0/8 */
- (a & 0xfff00000) == 0xac100000 || /* 172.16.0.0/12 */
- (a & 0xffff0000) == 0xc0a80000) /* 192.168.0.0/16 */
- return Qtrue;
- return Qfalse;
-}
-
-/*
- * Returns true for IPv4 loopback address (127.0.0.0/8).
- * It returns false otherwise.
- */
-static VALUE
-addrinfo_ipv4_loopback_p(VALUE self)
-{
- uint32_t a;
- if (!extract_in_addr(self, &a)) return Qfalse;
- if ((a & 0xff000000) == 0x7f000000) /* 127.0.0.0/8 */
- return Qtrue;
- return Qfalse;
-}
-
-/*
- * Returns true for IPv4 multicast address (224.0.0.0/4).
- * It returns false otherwise.
- */
-static VALUE
-addrinfo_ipv4_multicast_p(VALUE self)
-{
- uint32_t a;
- if (!extract_in_addr(self, &a)) return Qfalse;
- if ((a & 0xf0000000) == 0xe0000000) /* 224.0.0.0/4 */
- return Qtrue;
- return Qfalse;
-}
-
-#ifdef INET6
-
-static struct in6_addr *
-extract_in6_addr(VALUE self)
-{
- rb_addrinfo_t *rai = get_addrinfo(self);
- int family = ai_get_afamily(rai);
- if (family != AF_INET6) return NULL;
- return &((struct sockaddr_in6 *)&rai->addr)->sin6_addr;
-}
-
-/*
- * Returns true for IPv6 unspecified address (::).
- * It returns false otherwise.
- */
-static VALUE
-addrinfo_ipv6_unspecified_p(VALUE self)
-{
- struct in6_addr *addr = extract_in6_addr(self);
- if (addr && IN6_IS_ADDR_UNSPECIFIED(addr)) return Qtrue;
- return Qfalse;
-}
-
-/*
- * Returns true for IPv6 loopback address (::1).
- * It returns false otherwise.
- */
-static VALUE
-addrinfo_ipv6_loopback_p(VALUE self)
-{
- struct in6_addr *addr = extract_in6_addr(self);
- if (addr && IN6_IS_ADDR_LOOPBACK(addr)) return Qtrue;
- return Qfalse;
-}
-
-/*
- * Returns true for IPv6 multicast address (ff00::/8).
- * It returns false otherwise.
- */
-static VALUE
-addrinfo_ipv6_multicast_p(VALUE self)
-{
- struct in6_addr *addr = extract_in6_addr(self);
- if (addr && IN6_IS_ADDR_MULTICAST(addr)) return Qtrue;
- return Qfalse;
-}
-
-/*
- * Returns true for IPv6 link local address (ff80::/10).
- * It returns false otherwise.
- */
-static VALUE
-addrinfo_ipv6_linklocal_p(VALUE self)
-{
- struct in6_addr *addr = extract_in6_addr(self);
- if (addr && IN6_IS_ADDR_LINKLOCAL(addr)) return Qtrue;
- return Qfalse;
-}
-
-/*
- * Returns true for IPv6 site local address (ffc0::/10).
- * It returns false otherwise.
- */
-static VALUE
-addrinfo_ipv6_sitelocal_p(VALUE self)
-{
- struct in6_addr *addr = extract_in6_addr(self);
- if (addr && IN6_IS_ADDR_SITELOCAL(addr)) return Qtrue;
- return Qfalse;
-}
-
-/*
- * Returns true for IPv4-mapped IPv6 address (::ffff:0:0/80).
- * It returns false otherwise.
- */
-static VALUE
-addrinfo_ipv6_v4mapped_p(VALUE self)
-{
- struct in6_addr *addr = extract_in6_addr(self);
- if (addr && IN6_IS_ADDR_V4MAPPED(addr)) return Qtrue;
- return Qfalse;
-}
-
-/*
- * Returns true for IPv4-compatible IPv6 address (::/80).
- * It returns false otherwise.
- */
-static VALUE
-addrinfo_ipv6_v4compat_p(VALUE self)
-{
- struct in6_addr *addr = extract_in6_addr(self);
- if (addr && IN6_IS_ADDR_V4COMPAT(addr)) return Qtrue;
- return Qfalse;
-}
-
-/*
- * Returns true for IPv6 multicast node-local scope address.
- * It returns false otherwise.
- */
-static VALUE
-addrinfo_ipv6_mc_nodelocal_p(VALUE self)
-{
- struct in6_addr *addr = extract_in6_addr(self);
- if (addr && IN6_IS_ADDR_MC_NODELOCAL(addr)) return Qtrue;
- return Qfalse;
-}
-
-/*
- * Returns true for IPv6 multicast link-local scope address.
- * It returns false otherwise.
- */
-static VALUE
-addrinfo_ipv6_mc_linklocal_p(VALUE self)
-{
- struct in6_addr *addr = extract_in6_addr(self);
- if (addr && IN6_IS_ADDR_MC_LINKLOCAL(addr)) return Qtrue;
- return Qfalse;
-}
-
-/*
- * Returns true for IPv6 multicast site-local scope address.
- * It returns false otherwise.
- */
-static VALUE
-addrinfo_ipv6_mc_sitelocal_p(VALUE self)
-{
- struct in6_addr *addr = extract_in6_addr(self);
- if (addr && IN6_IS_ADDR_MC_SITELOCAL(addr)) return Qtrue;
- return Qfalse;
-}
-
-/*
- * Returns true for IPv6 multicast organization-local scope address.
- * It returns false otherwise.
- */
-static VALUE
-addrinfo_ipv6_mc_orglocal_p(VALUE self)
-{
- struct in6_addr *addr = extract_in6_addr(self);
- if (addr && IN6_IS_ADDR_MC_ORGLOCAL(addr)) return Qtrue;
- return Qfalse;
-}
-
-/*
- * Returns true for IPv6 multicast global scope address.
- * It returns false otherwise.
- */
-static VALUE
-addrinfo_ipv6_mc_global_p(VALUE self)
-{
- struct in6_addr *addr = extract_in6_addr(self);
- if (addr && IN6_IS_ADDR_MC_GLOBAL(addr)) return Qtrue;
- return Qfalse;
-}
-
-/*
- * Returns IPv4 address of IPv4 mapped/compatible IPv6 address.
- * It returns nil if +self+ is not IPv4 mapped/compatible IPv6 address.
- *
- * Addrinfo.ip("::192.0.2.3").ipv6_to_ipv4 #=> #<Addrinfo: 192.0.2.3>
- * Addrinfo.ip("::ffff:192.0.2.3").ipv6_to_ipv4 #=> #<Addrinfo: 192.0.2.3>
- * Addrinfo.ip("::1").ipv6_to_ipv4 #=> nil
- * Addrinfo.ip("192.0.2.3").ipv6_to_ipv4 #=> nil
- * Addrinfo.unix("/tmp/sock").ipv6_to_ipv4 #=> nil
- */
-static VALUE
-addrinfo_ipv6_to_ipv4(VALUE self)
-{
- rb_addrinfo_t *rai = get_addrinfo(self);
- struct in6_addr *addr;
- int family = ai_get_afamily(rai);
- if (family != AF_INET6) return Qnil;
- addr = &((struct sockaddr_in6 *)&rai->addr)->sin6_addr;
- if (IN6_IS_ADDR_V4MAPPED(addr) || IN6_IS_ADDR_V4COMPAT(addr)) {
- struct sockaddr_in sin4;
- MEMZERO(&sin4, struct sockaddr_in, 1);
- sin4.sin_family = AF_INET;
- SET_SIN_LEN(&sin4, sizeof(sin4));
- memcpy(&sin4.sin_addr, (char*)addr + sizeof(*addr) - sizeof(sin4.sin_addr), sizeof(sin4.sin_addr));
- return rsock_addrinfo_new((struct sockaddr *)&sin4, sizeof(sin4),
- PF_INET, rai->socktype, rai->protocol,
- rai->canonname, rai->inspectname);
- }
- else {
- return Qnil;
- }
-}
-
-#endif
-
-#ifdef HAVE_SYS_UN_H
-/*
- * call-seq:
- * addrinfo.unix_path => path
- *
- * Returns the socket path as a string.
- *
- * Addrinfo.unix("/tmp/sock").unix_path #=> "/tmp/sock"
- */
-static VALUE
-addrinfo_unix_path(VALUE self)
-{
- rb_addrinfo_t *rai = get_addrinfo(self);
- int family = ai_get_afamily(rai);
- struct sockaddr_un *addr;
- char *s, *e;
-
- if (family != AF_UNIX)
- rb_raise(rb_eSocket, "need AF_UNIX address");
-
- addr = (struct sockaddr_un *)&rai->addr;
-
- s = addr->sun_path;
- e = (char*)addr + rai->sockaddr_len;
- if (e < s)
- rb_raise(rb_eSocket, "too short AF_UNIX address");
- if (addr->sun_path + sizeof(addr->sun_path) < e)
- rb_raise(rb_eSocket, "too long AF_UNIX address");
- while (s < e && *(e-1) == '\0')
- e--;
- return rb_str_new(s, e-s);
-}
-#endif
-
-/*
- * call-seq:
- * Addrinfo.getaddrinfo(nodename, service, family, socktype, protocol, flags) => [addrinfo, ...]
- * Addrinfo.getaddrinfo(nodename, service, family, socktype, protocol) => [addrinfo, ...]
- * Addrinfo.getaddrinfo(nodename, service, family, socktype) => [addrinfo, ...]
- * Addrinfo.getaddrinfo(nodename, service, family) => [addrinfo, ...]
- * Addrinfo.getaddrinfo(nodename, service) => [addrinfo, ...]
- *
- * returns a list of addrinfo objects as an array.
- *
- * This method converts nodename (hostname) and service (port) to addrinfo.
- * Since the conversion is not unique, the result is a list of addrinfo objects.
- *
- * nodename or service can be nil if no conversion intended.
- *
- * family, socktype and protocol are hint for prefered protocol.
- * If the result will be used for a socket with SOCK_STREAM,
- * SOCK_STREAM should be specified as socktype.
- * If so, Addrinfo.getaddrinfo returns addrinfo list appropriate for SOCK_STREAM.
- * If they are omitted or nil is given, the result is not restricted.
- *
- * Similary, PF_INET6 as family restricts for IPv6.
- *
- * flags should be bitwise OR of Socket::AI_??? constants.
- *
- * Note that socktype should be specified whenever application knows the usage of the address.
- * Some platform causes an error when socktype is ommitted and servname is specified as an integer
- * because some port numbers, 512 for example, are ambiguous without socktype.
- *
- * Addrinfo.getaddrinfo("www.kame.net", 80, nil, :STREAM)
- * #=> [#<Addrinfo: 203.178.141.194:80 TCP (www.kame.net:80)>,
- * # #<Addrinfo: [2001:200:0:8002:203:47ff:fea5:3085]:80 TCP (www.kame.net:80)>]
- *
- */
-static VALUE
-addrinfo_s_getaddrinfo(int argc, VALUE *argv, VALUE self)
-{
- VALUE node, service, family, socktype, protocol, flags;
-
- rb_scan_args(argc, argv, "24", &node, &service, &family, &socktype, &protocol, &flags);
- return addrinfo_list_new(node, service, family, socktype, protocol, flags);
-}
-
-/*
- * call-seq:
- * Addrinfo.ip(host) => addrinfo
- *
- * returns an addrinfo object for IP address.
- *
- * The port, socktype, protocol of the result is filled by zero.
- * So, it is not appropriate to create a socket.
- *
- * Addrinfo.ip("localhost") #=> #<Addrinfo: 127.0.0.1 (localhost)>
- */
-static VALUE
-addrinfo_s_ip(VALUE self, VALUE host)
-{
- VALUE ret;
- rb_addrinfo_t *rai;
- ret = addrinfo_firstonly_new(host, Qnil,
- INT2NUM(PF_UNSPEC), INT2FIX(0), INT2FIX(0), INT2FIX(0));
- rai = get_addrinfo(ret);
- rai->socktype = 0;
- rai->protocol = 0;
- return ret;
-}
-
-/*
- * call-seq:
- * Addrinfo.tcp(host, port) => addrinfo
- *
- * returns an addrinfo object for TCP address.
- *
- * Addrinfo.tcp("localhost", "smtp") #=> #<Addrinfo: 127.0.0.1:25 TCP (localhost:smtp)>
- */
-static VALUE
-addrinfo_s_tcp(VALUE self, VALUE host, VALUE port)
-{
- return addrinfo_firstonly_new(host, port,
- INT2NUM(PF_UNSPEC), INT2NUM(SOCK_STREAM), INT2NUM(IPPROTO_TCP), INT2FIX(0));
-}
-
-/*
- * call-seq:
- * Addrinfo.udp(host, port) => addrinfo
- *
- * returns an addrinfo object for UDP address.
- *
- * Addrinfo.udp("localhost", "daytime") #=> #<Addrinfo: 127.0.0.1:13 UDP (localhost:daytime)>
- */
-static VALUE
-addrinfo_s_udp(VALUE self, VALUE host, VALUE port)
-{
- return addrinfo_firstonly_new(host, port,
- INT2NUM(PF_UNSPEC), INT2NUM(SOCK_DGRAM), INT2NUM(IPPROTO_UDP), INT2FIX(0));
-}
-
-#ifdef HAVE_SYS_UN_H
-
-/*
- * call-seq:
- * Addrinfo.unix(path [, socktype]) => addrinfo
- *
- * returns an addrinfo object for UNIX socket address.
- *
- * _socktype_ specifies the socket type.
- * If it is omitted, :STREAM is used.
- *
- * Addrinfo.unix("/tmp/sock") #=> #<Addrinfo: /tmp/sock SOCK_STREAM>
- * Addrinfo.unix("/tmp/sock", :DGRAM) #=> #<Addrinfo: /tmp/sock SOCK_DGRAM>
- */
-static VALUE
-addrinfo_s_unix(int argc, VALUE *argv, VALUE self)
-{
- VALUE path, vsocktype, addr;
- int socktype;
- rb_addrinfo_t *rai;
-
- rb_scan_args(argc, argv, "11", &path, &vsocktype);
-
- if (NIL_P(vsocktype))
- socktype = SOCK_STREAM;
- else
- socktype = rsock_socktype_arg(vsocktype);
-
- addr = addrinfo_s_allocate(rb_cAddrinfo);
- DATA_PTR(addr) = rai = alloc_addrinfo();
- init_unix_addrinfo(rai, path, socktype);
- OBJ_INFECT(addr, path);
- return addr;
-}
-
-#endif
-
-VALUE
-rsock_sockaddr_string_value(volatile VALUE *v)
-{
- VALUE val = *v;
- if (TYPE(val) == RUBY_T_DATA && IS_ADDRINFO(val)) {
- *v = addrinfo_to_sockaddr(val);
- }
- StringValue(*v);
- return *v;
-}
-
-char *
-rsock_sockaddr_string_value_ptr(volatile VALUE *v)
-{
- rsock_sockaddr_string_value(v);
- return RSTRING_PTR(*v);
-}
-
-VALUE
-rb_check_sockaddr_string_type(VALUE val)
-{
- if (TYPE(val) == RUBY_T_DATA && IS_ADDRINFO(val))
- return addrinfo_to_sockaddr(val);
- return rb_check_string_type(val);
-}
-
-VALUE
-rsock_fd_socket_addrinfo(int fd, struct sockaddr *addr, socklen_t len)
-{
- int family;
- int socktype;
- int ret;
- socklen_t optlen = sizeof(socktype);
-
- /* assumes protocol family and address family are identical */
- family = get_afamily(addr, len);
-
- ret = getsockopt(fd, SOL_SOCKET, SO_TYPE, (void*)&socktype, &optlen);
- if (ret == -1) {
- rb_sys_fail("getsockopt(SO_TYPE)");
- }
-
- return rsock_addrinfo_new(addr, len, family, socktype, 0, Qnil, Qnil);
-}
-
-VALUE
-rsock_io_socket_addrinfo(VALUE io, struct sockaddr *addr, socklen_t len)
-{
- rb_io_t *fptr;
-
- switch (TYPE(io)) {
- case T_FIXNUM:
- return rsock_fd_socket_addrinfo(FIX2INT(io), addr, len);
-
- case T_BIGNUM:
- return rsock_fd_socket_addrinfo(NUM2INT(io), addr, len);
-
- case T_FILE:
- GetOpenFile(io, fptr);
- return rsock_fd_socket_addrinfo(fptr->fd, addr, len);
-
- default:
- rb_raise(rb_eTypeError, "neither IO nor file descriptor");
- }
-}
-
-/*
- * Addrinfo class
- */
-void
-Init_addrinfo(void)
-{
- rb_cAddrinfo = rb_define_class("Addrinfo", rb_cData);
- rb_define_alloc_func(rb_cAddrinfo, addrinfo_s_allocate);
- rb_define_method(rb_cAddrinfo, "initialize", addrinfo_initialize, -1);
- rb_define_method(rb_cAddrinfo, "inspect", addrinfo_inspect, 0);
- rb_define_method(rb_cAddrinfo, "inspect_sockaddr", addrinfo_inspect_sockaddr, 0);
- rb_define_singleton_method(rb_cAddrinfo, "getaddrinfo", addrinfo_s_getaddrinfo, -1);
- rb_define_singleton_method(rb_cAddrinfo, "ip", addrinfo_s_ip, 1);
- rb_define_singleton_method(rb_cAddrinfo, "tcp", addrinfo_s_tcp, 2);
- rb_define_singleton_method(rb_cAddrinfo, "udp", addrinfo_s_udp, 2);
-#ifdef HAVE_SYS_UN_H
- rb_define_singleton_method(rb_cAddrinfo, "unix", addrinfo_s_unix, -1);
-#endif
-
- rb_define_method(rb_cAddrinfo, "afamily", addrinfo_afamily, 0);
- rb_define_method(rb_cAddrinfo, "pfamily", addrinfo_pfamily, 0);
- rb_define_method(rb_cAddrinfo, "socktype", addrinfo_socktype, 0);
- rb_define_method(rb_cAddrinfo, "protocol", addrinfo_protocol, 0);
- rb_define_method(rb_cAddrinfo, "canonname", addrinfo_canonname, 0);
-
- rb_define_method(rb_cAddrinfo, "ipv4?", addrinfo_ipv4_p, 0);
- rb_define_method(rb_cAddrinfo, "ipv6?", addrinfo_ipv6_p, 0);
- rb_define_method(rb_cAddrinfo, "unix?", addrinfo_unix_p, 0);
-
- rb_define_method(rb_cAddrinfo, "ip?", addrinfo_ip_p, 0);
- rb_define_method(rb_cAddrinfo, "ip_unpack", addrinfo_ip_unpack, 0);
- rb_define_method(rb_cAddrinfo, "ip_address", addrinfo_ip_address, 0);
- rb_define_method(rb_cAddrinfo, "ip_port", addrinfo_ip_port, 0);
-
- rb_define_method(rb_cAddrinfo, "ipv4_private?", addrinfo_ipv4_private_p, 0);
- rb_define_method(rb_cAddrinfo, "ipv4_loopback?", addrinfo_ipv4_loopback_p, 0);
- rb_define_method(rb_cAddrinfo, "ipv4_multicast?", addrinfo_ipv4_multicast_p, 0);
-
-#ifdef INET6
- rb_define_method(rb_cAddrinfo, "ipv6_unspecified?", addrinfo_ipv6_unspecified_p, 0);
- rb_define_method(rb_cAddrinfo, "ipv6_loopback?", addrinfo_ipv6_loopback_p, 0);
- rb_define_method(rb_cAddrinfo, "ipv6_multicast?", addrinfo_ipv6_multicast_p, 0);
- rb_define_method(rb_cAddrinfo, "ipv6_linklocal?", addrinfo_ipv6_linklocal_p, 0);
- rb_define_method(rb_cAddrinfo, "ipv6_sitelocal?", addrinfo_ipv6_sitelocal_p, 0);
- rb_define_method(rb_cAddrinfo, "ipv6_v4mapped?", addrinfo_ipv6_v4mapped_p, 0);
- rb_define_method(rb_cAddrinfo, "ipv6_v4compat?", addrinfo_ipv6_v4compat_p, 0);
- rb_define_method(rb_cAddrinfo, "ipv6_mc_nodelocal?", addrinfo_ipv6_mc_nodelocal_p, 0);
- rb_define_method(rb_cAddrinfo, "ipv6_mc_linklocal?", addrinfo_ipv6_mc_linklocal_p, 0);
- rb_define_method(rb_cAddrinfo, "ipv6_mc_sitelocal?", addrinfo_ipv6_mc_sitelocal_p, 0);
- rb_define_method(rb_cAddrinfo, "ipv6_mc_orglocal?", addrinfo_ipv6_mc_orglocal_p, 0);
- rb_define_method(rb_cAddrinfo, "ipv6_mc_global?", addrinfo_ipv6_mc_global_p, 0);
-
- rb_define_method(rb_cAddrinfo, "ipv6_to_ipv4", addrinfo_ipv6_to_ipv4, 0);
-#endif
-
-#ifdef HAVE_SYS_UN_H
- rb_define_method(rb_cAddrinfo, "unix_path", addrinfo_unix_path, 0);
-#endif
-
- rb_define_method(rb_cAddrinfo, "to_sockaddr", addrinfo_to_sockaddr, 0);
- rb_define_method(rb_cAddrinfo, "to_s", addrinfo_to_sockaddr, 0); /* compatibility for ruby before 1.9.2 */
-
- rb_define_method(rb_cAddrinfo, "getnameinfo", addrinfo_getnameinfo, -1);
-
- rb_define_method(rb_cAddrinfo, "marshal_dump", addrinfo_mdump, 0);
- rb_define_method(rb_cAddrinfo, "marshal_load", addrinfo_mload, 1);
-}
diff --git a/ext/socket/rubysocket.h b/ext/socket/rubysocket.h
deleted file mode 100644
index 27980c3874..0000000000
--- a/ext/socket/rubysocket.h
+++ /dev/null
@@ -1,278 +0,0 @@
-#ifndef RUBY_SOCKET_H
-#define RUBY_SOCKET_H 1
-
-#include "ruby/ruby.h"
-#include "ruby/io.h"
-#include "ruby/util.h"
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#ifdef HAVE_SYS_UIO_H
-#include <sys/uio.h>
-#endif
-
-#ifdef HAVE_XTI_H
-#include <xti.h>
-#endif
-
-#ifndef _WIN32
-#if defined(__BEOS__) && !defined(__HAIKU__) && !defined(BONE)
-# include <net/socket.h>
-#else
-# include <sys/socket.h>
-#endif
-#include <netinet/in.h>
-#ifdef HAVE_NETINET_IN_SYSTM_H
-# include <netinet/in_systm.h>
-#endif
-#ifdef HAVE_NETINET_TCP_H
-# include <netinet/tcp.h>
-#endif
-#ifdef HAVE_NETINET_UDP_H
-# include <netinet/udp.h>
-#endif
-#ifdef HAVE_ARPA_INET_H
-# include <arpa/inet.h>
-#endif
-#include <netdb.h>
-#endif
-#include <errno.h>
-#ifdef HAVE_SYS_UN_H
-#include <sys/un.h>
-#endif
-
-#if defined(HAVE_FCNTL)
-#ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#endif
-
-#ifdef HAVE_IFADDRS_H
-#include <ifaddrs.h>
-#endif
-#ifdef HAVE_SYS_IOCTL_H
-#include <sys/ioctl.h>
-#endif
-#ifdef HAVE_SYS_SOCKIO_H
-#include <sys/sockio.h>
-#endif
-#ifdef HAVE_NET_IF_H
-#include <net/if.h>
-#endif
-
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_UCRED_H
-#include <sys/ucred.h>
-#endif
-#ifdef HAVE_UCRED_H
-#include <ucred.h>
-#endif
-
-#ifndef EWOULDBLOCK
-#define EWOULDBLOCK EAGAIN
-#endif
-
-/*
- * workaround for NetBSD, OpenBSD and etc.
- * The problem is since 4.4BSD-Lite.
- * FreeBSD fix the problem at FreeBSD 2.2.0.
- * NetBSD fix the problem at NetBSD 3.0 by kern/29624.
- * OpenBSD fix the problem at OpenBSD 3.8.
- */
-#define pseudo_AF_FTIP pseudo_AF_RTIP
-
-#ifndef HAVE_GETADDRINFO
-# include "addrinfo.h"
-#endif
-#include "sockport.h"
-
-#ifndef NI_MAXHOST
-# define NI_MAXHOST 1025
-#endif
-#ifndef NI_MAXSERV
-# define NI_MAXSERV 32
-#endif
-
-#ifdef AF_INET6
-# define IS_IP_FAMILY(af) ((af) == AF_INET || (af) == AF_INET6)
-#else
-# define IS_IP_FAMILY(af) ((af) == AF_INET)
-#endif
-
-#ifndef HAVE_SOCKADDR_STORAGE
-/*
- * RFC 2553: protocol-independent placeholder for socket addresses
- */
-#define _SS_MAXSIZE 128
-#define _SS_ALIGNSIZE (sizeof(double))
-#define _SS_PAD1SIZE (_SS_ALIGNSIZE - sizeof(unsigned char) * 2)
-#define _SS_PAD2SIZE (_SS_MAXSIZE - sizeof(unsigned char) * 2 - \
- _SS_PAD1SIZE - _SS_ALIGNSIZE)
-
-struct sockaddr_storage {
-#ifdef HAVE_SA_LEN
- unsigned char ss_len; /* address length */
- unsigned char ss_family; /* address family */
-#else
- unsigned short ss_family;
-#endif
- char __ss_pad1[_SS_PAD1SIZE];
- double __ss_align; /* force desired structure storage alignment */
- char __ss_pad2[_SS_PAD2SIZE];
-};
-#endif
-
-#if defined(_AIX)
-#ifndef CMSG_SPACE
-# define CMSG_SPACE(len) (_CMSG_ALIGN(sizeof(struct cmsghdr)) + _CMSG_ALIGN(len))
-#endif
-#ifndef CMSG_LEN
-# define CMSG_LEN(len) (_CMSG_ALIGN(sizeof(struct cmsghdr)) + (len))
-#endif
-#endif
-
-#ifdef __BEOS__
-#undef close
-#define close closesocket
-#endif
-
-#define INET_CLIENT 0
-#define INET_SERVER 1
-#define INET_SOCKS 2
-
-extern int rsock_do_not_reverse_lookup;
-#define FMODE_NOREVLOOKUP 0x100
-
-extern VALUE rb_cBasicSocket;
-extern VALUE rb_cIPSocket;
-extern VALUE rb_cTCPSocket;
-extern VALUE rb_cTCPServer;
-extern VALUE rb_cUDPSocket;
-#ifdef HAVE_SYS_UN_H
-extern VALUE rb_cUNIXSocket;
-extern VALUE rb_cUNIXServer;
-#endif
-extern VALUE rb_cSocket;
-extern VALUE rb_cAddrinfo;
-extern VALUE rb_cSockOpt;
-
-extern VALUE rb_eSocket;
-
-#ifdef SOCKS
-extern VALUE rb_cSOCKSSocket;
-#ifdef SOCKS5
-#include <socks.h>
-#else
-void SOCKSinit();
-int Rconnect();
-#endif
-#endif
-
-#include "constdefs.h"
-
-#define BLOCKING_REGION(func, arg) (long)rb_thread_blocking_region((func), (arg), RUBY_UBF_IO, 0)
-
-#define SockAddrStringValue(v) rsock_sockaddr_string_value(&(v))
-#define SockAddrStringValuePtr(v) rsock_sockaddr_string_value_ptr(&(v))
-VALUE rsock_sockaddr_string_value(volatile VALUE *);
-char *rsock_sockaddr_string_value_ptr(volatile VALUE *);
-VALUE rb_check_sockaddr_string_type(VALUE);
-
-NORETURN(void rsock_raise_socket_error(const char *, int));
-
-int rsock_family_arg(VALUE domain);
-int rsock_socktype_arg(VALUE type);
-int rsock_level_arg(int family, VALUE level);
-int rsock_optname_arg(int family, int level, VALUE optname);
-int rsock_cmsg_type_arg(int family, int level, VALUE type);
-int rsock_shutdown_how_arg(VALUE how);
-
-int rsock_getfamily(int sockfd);
-
-int rb_getaddrinfo(const char *node, const char *service, const struct addrinfo *hints, struct addrinfo **res);
-int rb_getnameinfo(const struct sockaddr *sa, socklen_t salen, char *host, size_t hostlen, char *serv, size_t servlen, int flags);
-struct addrinfo *rsock_addrinfo(VALUE host, VALUE port, int socktype, int flags);
-struct addrinfo *rsock_getaddrinfo(VALUE host, VALUE port, struct addrinfo *hints, int socktype_hack);
-VALUE rsock_fd_socket_addrinfo(int fd, struct sockaddr *addr, socklen_t len);
-VALUE rsock_io_socket_addrinfo(VALUE io, struct sockaddr *addr, socklen_t len);
-
-VALUE rsock_addrinfo_new(struct sockaddr *addr, socklen_t len, int family, int socktype, int protocol, VALUE canonname, VALUE inspectname);
-
-VALUE rsock_make_ipaddr(struct sockaddr *addr);
-VALUE rsock_ipaddr(struct sockaddr *sockaddr, int norevlookup);
-VALUE rsock_make_hostent(VALUE host, struct addrinfo *addr, VALUE (*ipaddr)(struct sockaddr *, size_t));
-
-#ifdef HAVE_SYS_UN_H
-const char* rsock_unixpath(struct sockaddr_un *sockaddr, socklen_t len);
-VALUE rsock_unixaddr(struct sockaddr_un *sockaddr, socklen_t len);
-#endif
-
-int rsock_socket(int domain, int type, int proto);
-VALUE rsock_init_sock(VALUE sock, int fd);
-VALUE rsock_sock_s_socketpair(int argc, VALUE *argv, VALUE klass);
-VALUE rsock_init_inetsock(VALUE sock, VALUE remote_host, VALUE remote_serv, VALUE local_host, VALUE local_serv, int type);
-VALUE rsock_init_unixsock(VALUE sock, VALUE path, int server);
-
-struct rsock_send_arg {
- int fd, flags;
- VALUE mesg;
- struct sockaddr *to;
- socklen_t tolen;
-};
-
-VALUE rsock_sendto_blocking(void *data);
-VALUE rsock_send_blocking(void *data);
-VALUE rsock_bsock_send(int argc, VALUE *argv, VALUE sock);
-
-enum sock_recv_type {
- RECV_RECV, /* BasicSocket#recv(no from) */
- RECV_IP, /* IPSocket#recvfrom */
- RECV_UNIX, /* UNIXSocket#recvfrom */
- RECV_SOCKET /* Socket#recvfrom */
-};
-
-VALUE rsock_s_recvfrom_nonblock(VALUE sock, int argc, VALUE *argv, enum sock_recv_type from);
-VALUE rsock_s_recvfrom(VALUE sock, int argc, VALUE *argv, enum sock_recv_type from);
-
-int rsock_connect(int fd, const struct sockaddr *sockaddr, int len, int socks);
-
-VALUE rsock_s_accept(VALUE klass, int fd, struct sockaddr *sockaddr, socklen_t *len);
-VALUE rsock_s_accept_nonblock(VALUE klass, rb_io_t *fptr, struct sockaddr *sockaddr, socklen_t *len);
-
-VALUE rsock_sockopt_new(int family, int level, int optname, VALUE data);
-
-#ifdef HAVE_ST_MSG_CONTROL
-void rsock_discard_cmsg_resource(struct msghdr *mh);
-#endif
-
-void Init_basicsocket(void);
-void Init_ipsocket(void);
-void Init_tcpsocket(void);
-void Init_tcpserver(void);
-void Init_sockssocket(void);
-void Init_udpsocket(void);
-void Init_unixsocket(void);
-void Init_unixserver(void);
-void Init_socket_constants(void);
-void Init_ancdata(void);
-void Init_addrinfo(void);
-void Init_sockopt(void);
-void Init_socket_init(void);
-
-#endif
diff --git a/ext/socket/socket.c b/ext/socket/socket.c
index a2e14b32d2..1dcc7160e9 100644
--- a/ext/socket/socket.c
+++ b/ext/socket/socket.c
@@ -2,112 +2,2376 @@
socket.c -
+ $Author$
+ $Date$
created at: Thu Mar 31 12:21:29 JST 1994
- Copyright (C) 1993-2007 Yukihiro Matsumoto
+ Copyright (C) 1993-2001 Yukihiro Matsumoto
************************************************/
-#include "rubysocket.h"
+#include "ruby.h"
+#include "rubyio.h"
+#include "rubysig.h"
+#include "util.h"
+#include <stdio.h>
+#include <sys/types.h>
-static void
-setup_domain_and_type(VALUE domain, int *dv, VALUE type, int *tv)
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#ifdef HAVE_SYS_UIO_H
+#include <sys/uio.h>
+#endif
+
+#ifndef _WIN32
+#if defined(__BEOS__)
+# include <net/socket.h>
+#else
+# include <sys/socket.h>
+# define pseudo_AF_FTIP pseudo_AF_RTIP /* workaround for NetBSD and etc. */
+#endif
+#include <netinet/in.h>
+#ifdef HAVE_NETINET_IN_SYSTM_H
+# include <netinet/in_systm.h>
+#endif
+#ifdef HAVE_NETINET_TCP_H
+# include <netinet/tcp.h>
+#endif
+#ifdef HAVE_NETINET_UDP_H
+# include <netinet/udp.h>
+#endif
+#ifdef HAVE_ARPA_INET_H
+# include <arpa/inet.h>
+#endif
+#include <netdb.h>
+#endif
+#include <errno.h>
+#ifdef HAVE_SYS_UN_H
+#include <sys/un.h>
+#endif
+
+#if defined(HAVE_FCNTL)
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+#endif
+#ifndef EWOULDBLOCK
+#define EWOULDBLOCK EAGAIN
+#endif
+#ifndef HAVE_GETADDRINFO
+# include "addrinfo.h"
+#endif
+#include "sockport.h"
+
+#if defined(__vms)
+#include <tcp.h>
+#endif
+
+static int do_not_reverse_lookup = 0;
+
+VALUE rb_cBasicSocket;
+VALUE rb_cIPSocket;
+VALUE rb_cTCPSocket;
+VALUE rb_cTCPServer;
+VALUE rb_cUDPSocket;
+#ifdef AF_UNIX
+VALUE rb_cUNIXSocket;
+VALUE rb_cUNIXServer;
+#endif
+VALUE rb_cSocket;
+
+static VALUE rb_eSocket;
+
+#ifdef SOCKS
+VALUE rb_cSOCKSSocket;
+#ifdef SOCKS5
+#include <socks.h>
+#else
+void SOCKSinit();
+int Rconnect();
+#endif
+#endif
+
+#define INET_CLIENT 0
+#define INET_SERVER 1
+#define INET_SOCKS 2
+
+#ifndef HAVE_SOCKADDR_STORAGE
+/*
+ * RFC 2553: protocol-independent placeholder for socket addresses
+ */
+#define _SS_MAXSIZE 128
+#define _SS_ALIGNSIZE (sizeof(double))
+#define _SS_PAD1SIZE (_SS_ALIGNSIZE - sizeof(unsigned char) * 2)
+#define _SS_PAD2SIZE (_SS_MAXSIZE - sizeof(unsigned char) * 2 - \
+ _SS_PAD1SIZE - _SS_ALIGNSIZE)
+
+struct sockaddr_storage {
+#ifdef HAVE_SA_LEN
+ unsigned char ss_len; /* address length */
+ unsigned char ss_family; /* address family */
+#else
+ unsigned short ss_family;
+#endif
+ char __ss_pad1[_SS_PAD1SIZE];
+ double __ss_align; /* force desired structure storage alignment */
+ char __ss_pad2[_SS_PAD2SIZE];
+};
+#endif
+
+#if defined(INET6) && (defined(LOOKUP_ORDER_HACK_INET) || defined(LOOKUP_ORDER_HACK_INET6))
+#define LOOKUP_ORDERS 3
+static int lookup_order_table[LOOKUP_ORDERS] = {
+#if defined(LOOKUP_ORDER_HACK_INET)
+ PF_INET, PF_INET6, PF_UNSPEC,
+#elif defined(LOOKUP_ORDER_HACK_INET6)
+ PF_INET6, PF_INET, PF_UNSPEC,
+#else
+ /* should not happen */
+#endif
+};
+
+static int
+ruby_getaddrinfo(nodename, servname, hints, res)
+ char *nodename;
+ char *servname;
+ struct addrinfo *hints;
+ struct addrinfo **res;
+{
+ struct addrinfo tmp_hints;
+ int i, af, error;
+
+ if (hints->ai_family != PF_UNSPEC) {
+ return getaddrinfo(nodename, servname, hints, res);
+ }
+
+ for (i = 0; i < LOOKUP_ORDERS; i++) {
+ af = lookup_order_table[i];
+ MEMCPY(&tmp_hints, hints, struct addrinfo, 1);
+ tmp_hints.ai_family = af;
+ error = getaddrinfo(nodename, servname, &tmp_hints, res);
+ if (error) {
+ if (tmp_hints.ai_family == PF_UNSPEC) {
+ break;
+ }
+ }
+ else {
+ break;
+ }
+ }
+
+ return error;
+}
+#define getaddrinfo(node,serv,hints,res) ruby_getaddrinfo((node),(serv),(hints),(res))
+#endif
+
+#if defined(_AIX)
+static int
+ruby_getaddrinfo__aix(nodename, servname, hints, res)
+ char *nodename;
+ char *servname;
+ struct addrinfo *hints;
+ struct addrinfo **res;
+{
+ int error = getaddrinfo(nodename, servname, hints, res);
+ struct addrinfo *r;
+ if (error)
+ return error;
+ for (r = *res; r != NULL; r = r->ai_next) {
+ if (r->ai_addr->sa_family == 0)
+ r->ai_addr->sa_family = r->ai_family;
+ if (r->ai_addr->sa_len == 0)
+ r->ai_addr->sa_len = r->ai_addrlen;
+ }
+ return 0;
+}
+#undef getaddrinfo
+#define getaddrinfo(node,serv,hints,res) ruby_getaddrinfo__aix((node),(serv),(hints),(res))
+static int
+ruby_getnameinfo__aix(sa, salen, host, hostlen, serv, servlen, flags)
+ const struct sockaddr *sa;
+ size_t salen;
+ char *host;
+ size_t hostlen;
+ char *serv;
+ size_t servlen;
+ int flags;
+{
+ struct sockaddr_in6 *sa6;
+ u_int32_t *a6;
+
+ if (sa->sa_family == AF_INET6) {
+ sa6 = (struct sockaddr_in6 *)sa;
+ a6 = sa6->sin6_addr.u6_addr.u6_addr32;
+
+ if (a6[0] == 0 && a6[1] == 0 && a6[2] == 0 && a6[3] == 0) {
+ strncpy(host, "::", hostlen);
+ snprintf(serv, servlen, "%d", sa6->sin6_port);
+ return 0;
+ }
+ }
+ return getnameinfo(sa, salen, host, hostlen, serv, servlen, flags);
+}
+#undef getnameinfo
+#define getnameinfo(sa, salen, host, hostlen, serv, servlen, flags) \
+ ruby_getnameinfo__aix((sa), (salen), (host), (hostlen), (serv), (servlen), (flags))
+#ifndef CMSG_SPACE
+# define CMSG_SPACE(len) (_CMSG_ALIGN(sizeof(struct cmsghdr)) + _CMSG_ALIGN(len))
+#endif
+#ifndef CMSG_LEN
+# define CMSG_LEN(len) (_CMSG_ALIGN(sizeof(struct cmsghdr)) + (len))
+#endif
+#endif
+
+#ifdef HAVE_CLOSESOCKET
+#undef close
+#define close closesocket
+#endif
+
+static VALUE
+init_sock(sock, fd)
+ VALUE sock;
+ int fd;
{
- *dv = rsock_family_arg(domain);
- *tv = rsock_socktype_arg(type);
+ rb_io_t *fp;
+
+ MakeOpenFile(sock, fp);
+ fp->f = rb_fdopen(fd, "r");
+ fp->f2 = rb_fdopen(fd, "w");
+ fp->mode = FMODE_READWRITE;
+ rb_io_synchronized(fp);
+
+ return sock;
+}
+
+static VALUE
+bsock_s_for_fd(klass, fd)
+ VALUE klass, fd;
+{
+ rb_io_t *fptr;
+ VALUE sock = init_sock(rb_obj_alloc(klass), NUM2INT(fd));
+
+ GetOpenFile(sock, fptr);
+
+ return sock;
+}
+
+static VALUE
+bsock_shutdown(argc, argv, sock)
+ int argc;
+ VALUE *argv;
+ VALUE sock;
+{
+ VALUE howto;
+ int how;
+ rb_io_t *fptr;
+
+ if (rb_safe_level() >= 4 && !OBJ_TAINTED(sock)) {
+ rb_raise(rb_eSecurityError, "Insecure: can't shutdown socket");
+ }
+ rb_scan_args(argc, argv, "01", &howto);
+ if (howto == Qnil)
+ how = 2;
+ else {
+ how = NUM2INT(howto);
+ if (how < 0 || 2 < how) {
+ rb_raise(rb_eArgError, "`how' should be either 0, 1, 2");
+ }
+ }
+ GetOpenFile(sock, fptr);
+ if (shutdown(fileno(fptr->f), how) == -1)
+ rb_sys_fail(0);
+
+ return INT2FIX(0);
+}
+
+static VALUE
+bsock_close_read(sock)
+ VALUE sock;
+{
+ rb_io_t *fptr;
+
+ if (rb_safe_level() >= 4 && !OBJ_TAINTED(sock)) {
+ rb_raise(rb_eSecurityError, "Insecure: can't close socket");
+ }
+ GetOpenFile(sock, fptr);
+ shutdown(fileno(fptr->f), 0);
+ if (!(fptr->mode & FMODE_WRITABLE)) {
+ return rb_io_close(sock);
+ }
+ fptr->mode &= ~FMODE_READABLE;
+
+ return Qnil;
+}
+
+static VALUE
+bsock_close_write(sock)
+ VALUE sock;
+{
+ rb_io_t *fptr;
+
+ if (rb_safe_level() >= 4 && !OBJ_TAINTED(sock)) {
+ rb_raise(rb_eSecurityError, "Insecure: can't close socket");
+ }
+ GetOpenFile(sock, fptr);
+ if (!(fptr->mode & FMODE_READABLE)) {
+ return rb_io_close(sock);
+ }
+ shutdown(fileno(fptr->f2), 1);
+ fptr->mode &= ~FMODE_WRITABLE;
+
+ return Qnil;
}
/*
- * call-seq:
- * Socket.new(domain, socktype [, protocol]) => socket
+ * Document-method: setsockopt
+ * call-seq: setsockopt(level, optname, optval)
+ *
+ * Sets a socket option. These are protocol and system specific, see your
+ * local sytem documentation for details.
+ *
+ * === Parameters
+ * * +level+ is an integer, usually one of the SOL_ constants such as
+ * Socket::SOL_SOCKET, or a protocol level.
+ * * +optname+ is an integer, usually one of the SO_ constants, such
+ * as Socket::SO_REUSEADDR.
+ * * +optval+ is the value of the option, it is passed to the underlying
+ * setsockopt() as a pointer to a certain number of bytes. How this is
+ * done depends on the type:
+ * - Fixnum: value is assigned to an int, and a pointer to the int is
+ * passed, with length of sizeof(int).
+ * - true or false: 1 or 0 (respectively) is assigned to an int, and the
+ * int is passed as for a Fixnum. Note that +false+ must be passed,
+ * not +nil+.
+ * - String: the string's data and length is passed to the socket.
+ *
+ * === Examples
*
- * Creates a new socket object.
+ * Some socket options are integers with boolean values, in this case
+ * #setsockopt could be called like this:
+ * sock.setsockopt(Socket::SOL_SOCKET,Socket::SO_REUSEADDR, true)
*
- * _domain_ should be a communications domain such as: :INET, :INET6, :UNIX, etc.
+ * Some socket options are integers with numeric values, in this case
+ * #setsockopt could be called like this:
+ * sock.setsockopt(Socket::IPPROTO_IP, Socket::IP_TTL, 255)
*
- * _socktype_ should be a socket type such as: :STREAM, :DGRAM, :RAW, etc.
+ * Option values may be structs. Passing them can be complex as it involves
+ * examining your system headers to determine the correct definition. An
+ * example is an +ip_mreq+, which may be defined in your system headers as:
+ * struct ip_mreq {
+ * struct in_addr imr_multiaddr;
+ * struct in_addr imr_interface;
+ * };
+ *
+ * In this case #setsockopt could be called like this:
+ * optval = IPAddr.new("224.0.0.251") + Socket::INADDR_ANY
+ * sock.setsockopt(Socket::IPPROTO_IP, Socket::IP_ADD_MEMBERSHIP, optval)
+ *
+*/
+static VALUE
+bsock_setsockopt(sock, lev, optname, val)
+ VALUE sock, lev, optname, val;
+{
+ int level, option;
+ rb_io_t *fptr;
+ int i;
+ char *v;
+ int vlen;
+
+ rb_secure(2);
+ level = NUM2INT(lev);
+ option = NUM2INT(optname);
+
+ switch (TYPE(val)) {
+ case T_FIXNUM:
+ i = FIX2INT(val);
+ goto numval;
+ case T_FALSE:
+ i = 0;
+ goto numval;
+ case T_TRUE:
+ i = 1;
+ numval:
+ v = (char*)&i; vlen = sizeof(i);
+ break;
+ default:
+ StringValue(val);
+ v = RSTRING(val)->ptr;
+ vlen = RSTRING(val)->len;
+ break;
+ }
+
+ GetOpenFile(sock, fptr);
+ if (setsockopt(fileno(fptr->f), level, option, v, vlen) < 0)
+ rb_sys_fail(fptr->path);
+
+ return INT2FIX(0);
+}
+
+/*
+ * Document-method: getsockopt
+ * call-seq: getsockopt(level, optname)
*
- * _protocol_ should be a protocol defined in the domain.
- * This is optional.
- * If it is not given, 0 is used internally.
+ * Gets a socket option. These are protocol and system specific, see your
+ * local sytem documentation for details. The option is returned as
+ * a String with the data being the binary value of the socket option.
*
- * Socket.new(:INET, :STREAM) # TCP socket
- * Socket.new(:INET, :DGRAM) # UDP socket
- * Socket.new(:UNIX, :STREAM) # UNIX stream socket
- * Socket.new(:UNIX, :DGRAM) # UNIX datagram socket
+ * === Parameters
+ * * +level+ is an integer, usually one of the SOL_ constants such as
+ * Socket::SOL_SOCKET, or a protocol level.
+ * * +optname+ is an integer, usually one of the SO_ constants, such
+ * as Socket::SO_REUSEADDR.
+ *
+ * === Examples
+ *
+ * Some socket options are integers with boolean values, in this case
+ * #getsockopt could be called like this:
+ * optval = sock.getsockopt(Socket::SOL_SOCKET,Socket::SO_REUSEADDR)
+ * optval = optval.unpack "i"
+ * reuseaddr = optval[0] == 0 ? false : true
+ *
+ * Some socket options are integers with numeric values, in this case
+ * #getsockopt could be called like this:
+ * optval = sock.getsockopt(Socket::IPPROTO_IP, Socket::IP_TTL)
+ * ipttl = optval.unpack("i")[0]
+ *
+ * Option values may be structs. Decoding them can be complex as it involves
+ * examining your system headers to determine the correct definition. An
+ * example is a +struct linger+, which may be defined in your system headers
+ * as:
+ * struct linger {
+ * int l_onoff;
+ * int l_linger;
+ * };
+ *
+ * In this case #getsockopt could be called like this:
+ * optval = sock.getsockopt(Socket::SOL_SOCKET, Socket::SO_LINGER)
+ * onoff, linger = optval.unpack "ii"
+*/
+static VALUE
+bsock_getsockopt(sock, lev, optname)
+ VALUE sock, lev, optname;
+{
+#if !defined(__BEOS__)
+ int level, option;
+ socklen_t len;
+ char *buf;
+ rb_io_t *fptr;
+
+ level = NUM2INT(lev);
+ option = NUM2INT(optname);
+ len = 256;
+ buf = ALLOCA_N(char,len);
+ GetOpenFile(sock, fptr);
+
+ GetOpenFile(sock, fptr);
+ if (getsockopt(fileno(fptr->f), level, option, buf, &len) < 0)
+ rb_sys_fail(fptr->path);
+
+ return rb_str_new(buf, len);
+#else
+ rb_notimplement();
+#endif
+}
+
+static VALUE
+bsock_getsockname(sock)
+ VALUE sock;
+{
+ char buf[1024];
+ socklen_t len = sizeof buf;
+ rb_io_t *fptr;
+
+ GetOpenFile(sock, fptr);
+ if (getsockname(fileno(fptr->f), (struct sockaddr*)buf, &len) < 0)
+ rb_sys_fail("getsockname(2)");
+ return rb_str_new(buf, len);
+}
+
+static VALUE
+bsock_getpeername(sock)
+ VALUE sock;
+{
+ char buf[1024];
+ socklen_t len = sizeof buf;
+ rb_io_t *fptr;
+
+ GetOpenFile(sock, fptr);
+ if (getpeername(fileno(fptr->f), (struct sockaddr*)buf, &len) < 0)
+ rb_sys_fail("getpeername(2)");
+ return rb_str_new(buf, len);
+}
+
+static VALUE
+bsock_send(argc, argv, sock)
+ int argc;
+ VALUE *argv;
+ VALUE sock;
+{
+ VALUE mesg, to;
+ VALUE flags;
+ rb_io_t *fptr;
+ FILE *f;
+ int fd, n;
+
+ rb_secure(4);
+ rb_scan_args(argc, argv, "21", &mesg, &flags, &to);
+
+ StringValue(mesg);
+ if (!NIL_P(to)) StringValue(to);
+ GetOpenFile(sock, fptr);
+ f = GetWriteFile(fptr);
+ fd = fileno(f);
+ rb_thread_fd_writable(fd);
+ retry:
+ if (!NIL_P(to)) {
+ TRAP_BEG;
+ n = sendto(fd, RSTRING(mesg)->ptr, RSTRING(mesg)->len, NUM2INT(flags),
+ (struct sockaddr*)RSTRING(to)->ptr, RSTRING(to)->len);
+ TRAP_END;
+ }
+ else {
+ TRAP_BEG;
+ n = send(fd, RSTRING(mesg)->ptr, RSTRING(mesg)->len, NUM2INT(flags));
+ TRAP_END;
+ }
+ if (n < 0) {
+ if (rb_io_wait_writable(fd)) {
+ goto retry;
+ }
+ rb_sys_fail("send(2)");
+ }
+ return INT2FIX(n);
+}
+
+static VALUE ipaddr _((struct sockaddr*));
+#ifdef HAVE_SYS_UN_H
+static VALUE unixaddr _((struct sockaddr_un*, socklen_t));
+#endif
+
+enum sock_recv_type {
+ RECV_RECV, /* BasicSocket#recv(no from) */
+ RECV_IP, /* IPSocket#recvfrom */
+ RECV_UNIX, /* UNIXSocket#recvfrom */
+ RECV_SOCKET /* Socket#recvfrom */
+};
+
+static VALUE
+s_recvfrom(sock, argc, argv, from)
+ VALUE sock;
+ int argc;
+ VALUE *argv;
+ enum sock_recv_type from;
+{
+ rb_io_t *fptr;
+ VALUE str;
+ char buf[1024];
+ socklen_t alen = sizeof buf;
+ VALUE len, flg;
+ long buflen;
+ long slen;
+ int fd, flags;
+
+ rb_scan_args(argc, argv, "11", &len, &flg);
+
+ if (flg == Qnil) flags = 0;
+ else flags = NUM2INT(flg);
+ buflen = NUM2INT(len);
+
+ GetOpenFile(sock, fptr);
+ if (rb_read_pending(fptr->f)) {
+ rb_raise(rb_eIOError, "recv for buffered IO");
+ }
+ fd = fileno(fptr->f);
+
+ str = rb_tainted_str_new(0, buflen);
+
+ retry:
+ rb_str_locktmp(str);
+ rb_thread_wait_fd(fd);
+ TRAP_BEG;
+ slen = recvfrom(fd, RSTRING(str)->ptr, buflen, flags, (struct sockaddr*)buf, &alen);
+ TRAP_END;
+ rb_str_unlocktmp(str);
+
+ if (slen < 0) {
+ if (rb_io_wait_readable(fd)) {
+ goto retry;
+ }
+ rb_sys_fail("recvfrom(2)");
+ }
+ if (slen < RSTRING(str)->len) {
+ RSTRING(str)->len = slen;
+ RSTRING(str)->ptr[slen] = '\0';
+ }
+ rb_obj_taint(str);
+ switch (from) {
+ case RECV_RECV:
+ return (VALUE)str;
+ case RECV_IP:
+#if 0
+ if (alen != sizeof(struct sockaddr_in)) {
+ rb_raise(rb_eTypeError, "sockaddr size differs - should not happen");
+ }
+#endif
+ if (alen && alen != sizeof(buf)) /* OSX doesn't return a 'from' result from recvfrom for connection-oriented sockets */
+ return rb_assoc_new(str, ipaddr((struct sockaddr*)buf));
+ else
+ return rb_assoc_new(str, Qnil);
+
+#ifdef HAVE_SYS_UN_H
+ case RECV_UNIX:
+ return rb_assoc_new(str, unixaddr((struct sockaddr_un*)buf, alen));
+#endif
+ case RECV_SOCKET:
+ return rb_assoc_new(str, rb_str_new(buf, alen));
+ default:
+ rb_bug("s_recvfrom called with bad value");
+ }
+}
+
+static VALUE
+s_recvfrom_nonblock(VALUE sock, int argc, VALUE *argv, enum sock_recv_type from)
+{
+ rb_io_t *fptr;
+ VALUE str;
+ char buf[1024];
+ socklen_t alen = sizeof buf;
+ VALUE len, flg;
+ long buflen;
+ long slen;
+ int fd, flags;
+ VALUE addr = Qnil;
+
+ rb_scan_args(argc, argv, "11", &len, &flg);
+
+ if (flg == Qnil) flags = 0;
+ else flags = NUM2INT(flg);
+ buflen = NUM2INT(len);
+
+#ifdef MSG_DONTWAIT
+ /* MSG_DONTWAIT avoids the race condition between fcntl and recvfrom.
+ It is not portable, though. */
+ flags |= MSG_DONTWAIT;
+#endif
+
+ GetOpenFile(sock, fptr);
+ if (rb_read_pending(fptr->f)) {
+ rb_raise(rb_eIOError, "recvfrom for buffered IO");
+ }
+ fd = fileno(fptr->f);
+
+ str = rb_tainted_str_new(0, buflen);
+
+ rb_io_check_closed(fptr);
+ rb_io_set_nonblock(fptr);
+ slen = recvfrom(fd, RSTRING(str)->ptr, buflen, flags, (struct sockaddr*)buf, &alen);
+
+ if (slen < 0) {
+ rb_sys_fail("recvfrom(2)");
+ }
+ if (slen < RSTRING(str)->len) {
+ RSTRING(str)->len = slen;
+ RSTRING(str)->ptr[slen] = '\0';
+ }
+ rb_obj_taint(str);
+ switch (from) {
+ case RECV_RECV:
+ return str;
+
+ case RECV_IP:
+ if (alen && alen != sizeof(buf)) /* connection-oriented socket may not return a from result */
+ addr = ipaddr((struct sockaddr*)buf);
+ break;
+
+ case RECV_SOCKET:
+ addr = rb_str_new(buf, alen);
+ break;
+
+ default:
+ rb_bug("s_recvfrom_nonblock called with bad value");
+ }
+ return rb_assoc_new(str, addr);
+}
+
+static VALUE
+bsock_recv(argc, argv, sock)
+ int argc;
+ VALUE *argv;
+ VALUE sock;
+{
+ return s_recvfrom(sock, argc, argv, RECV_RECV);
+}
+
+/*
+ * call-seq:
+ * basicsocket.recv_nonblock(maxlen) => mesg
+ * basicsocket.recv_nonblock(maxlen, flags) => mesg
+ *
+ * Receives up to _maxlen_ bytes from +socket+ using recvfrom(2) after
+ * O_NONBLOCK is set for the underlying file descriptor.
+ * _flags_ is zero or more of the +MSG_+ options.
+ * The result, _mesg_, is the data received.
+ *
+ * When recvfrom(2) returns 0, Socket#recv_nonblock returns
+ * an empty string as data.
+ * The meaning depends on the socket: EOF on TCP, empty packet on UDP, etc.
+ *
+ * === Parameters
+ * * +maxlen+ - the number of bytes to receive from the socket
+ * * +flags+ - zero or more of the +MSG_+ options
+ *
+ * === Example
+ * serv = TCPServer.new("127.0.0.1", 0)
+ * af, port, host, addr = serv.addr
+ * c = TCPSocket.new(addr, port)
+ * s = serv.accept
+ * c.send "aaa", 0
+ * IO.select([s])
+ * p s.recv_nonblock(10) #=> "aaa"
+ *
+ * Refer to Socket#recvfrom for the exceptions that may be thrown if the call
+ * to _recv_nonblock_ fails.
+ *
+ * BasicSocket#recv_nonblock may raise any error corresponding to recvfrom(2) failure,
+ * including Errno::EAGAIN.
+ *
+ * === See
+ * * Socket#recvfrom
*/
+
static VALUE
-sock_initialize(int argc, VALUE *argv, VALUE sock)
+bsock_recv_nonblock(argc, argv, sock)
+ int argc;
+ VALUE *argv;
+ VALUE sock;
+{
+ return s_recvfrom_nonblock(sock, argc, argv, RECV_RECV);
+}
+
+static VALUE
+bsock_do_not_rev_lookup()
+{
+ return do_not_reverse_lookup?Qtrue:Qfalse;
+}
+
+static VALUE
+bsock_do_not_rev_lookup_set(self, val)
+ VALUE self, val;
+{
+ rb_secure(4);
+ do_not_reverse_lookup = RTEST(val);
+ return val;
+}
+
+static void
+make_ipaddr0(addr, buf, len)
+ struct sockaddr *addr;
+ char *buf;
+ size_t len;
+{
+ int error;
+
+ error = getnameinfo(addr, SA_LEN(addr), buf, len, NULL, 0, NI_NUMERICHOST);
+ if (error) {
+ rb_raise(rb_eSocket, "getnameinfo: %s", gai_strerror(error));
+ }
+}
+
+static VALUE
+make_ipaddr(addr)
+ struct sockaddr *addr;
+{
+ char buf[1024];
+
+ make_ipaddr0(addr, buf, sizeof(buf));
+ return rb_str_new2(buf);
+}
+
+static void
+make_inetaddr(host, buf, len)
+ long host;
+ char *buf;
+ size_t len;
+{
+ struct sockaddr_in sin;
+
+ MEMZERO(&sin, struct sockaddr_in, 1);
+ sin.sin_family = AF_INET;
+ SET_SIN_LEN(&sin, sizeof(sin));
+ sin.sin_addr.s_addr = host;
+ make_ipaddr0((struct sockaddr*)&sin, buf, len);
+}
+
+static int
+str_isnumber(p)
+ const char *p;
+{
+ char *ep;
+
+ if (!p || *p == '\0')
+ return 0;
+ ep = NULL;
+ (void)strtoul(p, &ep, 10);
+ if (ep && *ep == '\0')
+ return 1;
+ else
+ return 0;
+}
+
+static char *
+host_str(host, hbuf, len)
+ VALUE host;
+ char *hbuf;
+ size_t len;
+{
+ if (NIL_P(host)) {
+ return NULL;
+ }
+ else if (rb_obj_is_kind_of(host, rb_cInteger)) {
+ long i = NUM2LONG(host);
+
+ make_inetaddr(htonl(i), hbuf, len);
+ return hbuf;
+ }
+ else {
+ char *name;
+
+ SafeStringValue(host);
+ name = RSTRING(host)->ptr;
+ if (!name || *name == 0 || (name[0] == '<' && strcmp(name, "<any>") == 0)) {
+ make_inetaddr(INADDR_ANY, hbuf, len);
+ }
+ else if (name[0] == '<' && strcmp(name, "<broadcast>") == 0) {
+ make_inetaddr(INADDR_BROADCAST, hbuf, len);
+ }
+ else if (strlen(name) >= len) {
+ rb_raise(rb_eArgError, "hostname too long (%d)", strlen(name));
+ }
+ else {
+ strcpy(hbuf, name);
+ }
+ return hbuf;
+ }
+}
+
+static char *
+port_str(port, pbuf, len)
+ VALUE port;
+ char *pbuf;
+ size_t len;
+{
+ if (NIL_P(port)) {
+ return 0;
+ }
+ else if (FIXNUM_P(port)) {
+ snprintf(pbuf, len, "%ld", FIX2LONG(port));
+ return pbuf;
+ }
+ else {
+ char *serv;
+
+ SafeStringValue(port);
+ serv = RSTRING(port)->ptr;
+ if (strlen(serv) >= len) {
+ rb_raise(rb_eArgError, "service name too long (%d)", strlen(serv));
+ }
+ strcpy(pbuf, serv);
+ return pbuf;
+ }
+}
+
+#ifndef NI_MAXHOST
+# define 1025
+#endif
+#ifndef NI_MAXSERV
+# define 32
+#endif
+
+static struct addrinfo*
+sock_addrinfo(host, port, socktype, flags)
+ VALUE host, port;
+ int socktype, flags;
+{
+ struct addrinfo hints;
+ struct addrinfo* res = NULL;
+ char *hostp, *portp;
+ int error;
+ char hbuf[NI_MAXHOST], pbuf[NI_MAXSERV];
+
+ hostp = host_str(host, hbuf, sizeof(hbuf));
+ portp = port_str(port, pbuf, sizeof(pbuf));
+
+ if (socktype == 0 && flags == 0 && str_isnumber(portp)) {
+ socktype = SOCK_DGRAM;
+ }
+
+ MEMZERO(&hints, struct addrinfo, 1);
+ hints.ai_family = AF_UNSPEC;
+ hints.ai_socktype = socktype;
+ hints.ai_flags = flags;
+ error = getaddrinfo(hostp, portp, &hints, &res);
+ if (error) {
+ if (hostp && hostp[strlen(hostp)-1] == '\n') {
+ rb_raise(rb_eSocket, "newline at the end of hostname");
+ }
+ rb_raise(rb_eSocket, "getaddrinfo: %s", gai_strerror(error));
+ }
+
+#if defined(__APPLE__) && defined(__MACH__)
+ {
+ struct addrinfo *r;
+ r = res;
+ while (r) {
+ if (! r->ai_socktype) r->ai_socktype = hints.ai_socktype;
+ if (! r->ai_protocol) {
+ if (r->ai_socktype == SOCK_DGRAM) {
+ r->ai_protocol = IPPROTO_UDP;
+ } else if (r->ai_socktype == SOCK_STREAM) {
+ r->ai_protocol = IPPROTO_TCP;
+ }
+ }
+ r = r->ai_next;
+ }
+ }
+#endif
+ return res;
+}
+
+static VALUE
+ipaddr(sockaddr)
+ struct sockaddr *sockaddr;
+{
+ VALUE family, port, addr1, addr2;
+ VALUE ary;
+ int error;
+ char hbuf[1024], pbuf[1024];
+
+ switch (sockaddr->sa_family) {
+ case AF_UNSPEC:
+ family = rb_str_new2("AF_UNSPEC");
+ break;
+ case AF_INET:
+ family = rb_str_new2("AF_INET");
+ break;
+#ifdef INET6
+ case AF_INET6:
+ family = rb_str_new2("AF_INET6");
+ break;
+#endif
+#ifdef AF_LOCAL
+ case AF_LOCAL:
+ family = rb_str_new2("AF_LOCAL");
+ break;
+#elif AF_UNIX
+ case AF_UNIX:
+ family = rb_str_new2("AF_UNIX");
+ break;
+#endif
+ default:
+ sprintf(pbuf, "unknown:%d", sockaddr->sa_family);
+ family = rb_str_new2(pbuf);
+ break;
+ }
+ addr1 = Qnil;
+ if (!do_not_reverse_lookup) {
+ error = getnameinfo(sockaddr, SA_LEN(sockaddr), hbuf, sizeof(hbuf),
+ NULL, 0, 0);
+ if (! error) {
+ addr1 = rb_str_new2(hbuf);
+ }
+ }
+ error = getnameinfo(sockaddr, SA_LEN(sockaddr), hbuf, sizeof(hbuf),
+ pbuf, sizeof(pbuf), NI_NUMERICHOST | NI_NUMERICSERV);
+ if (error) {
+ rb_raise(rb_eSocket, "getnameinfo: %s", gai_strerror(error));
+ }
+ addr2 = rb_str_new2(hbuf);
+ if (addr1 == Qnil) {
+ addr1 = addr2;
+ }
+ port = INT2FIX(atoi(pbuf));
+ ary = rb_ary_new3(4, family, port, addr1, addr2);
+
+ return ary;
+}
+
+static int
+ruby_socket(domain, type, proto)
+ int domain, type, proto;
{
- VALUE domain, type, protocol;
int fd;
- int d, t;
- rb_scan_args(argc, argv, "21", &domain, &type, &protocol);
- if (NIL_P(protocol))
- protocol = INT2FIX(0);
+ fd = socket(domain, type, proto);
+ if (fd < 0) {
+ if (errno == EMFILE || errno == ENFILE) {
+ rb_gc();
+ fd = socket(domain, type, proto);
+ }
+ }
+ return fd;
+}
- rb_secure(3);
- setup_domain_and_type(domain, &d, type, &t);
- fd = rsock_socket(d, t, NUM2INT(protocol));
- if (fd < 0) rb_sys_fail("socket(2)");
+static int
+wait_connectable(fd)
+ int fd;
+{
+ int sockerr;
+ socklen_t sockerrlen;
+ fd_set fds_w;
+ fd_set fds_e;
+
+ for (;;) {
+ FD_ZERO(&fds_w);
+ FD_ZERO(&fds_e);
+
+ FD_SET(fd, &fds_w);
+ FD_SET(fd, &fds_e);
+
+ rb_thread_select(fd+1, 0, &fds_w, &fds_e, 0);
- return rsock_init_sock(sock, fd);
+ if (FD_ISSET(fd, &fds_w)) {
+ return 0;
+ }
+ else if (FD_ISSET(fd, &fds_e)) {
+ sockerrlen = sizeof(sockerr);
+ if (getsockopt(fd, SOL_SOCKET, SO_ERROR, (void *)&sockerr,
+ &sockerrlen) == 0) {
+ if (sockerr == 0)
+ continue; /* workaround for winsock */
+ errno = sockerr;
+ }
+ return -1;
+ }
+ }
+
+ return 0;
}
-#if defined HAVE_SOCKETPAIR
+#ifdef __CYGWIN__
+#define WAIT_IN_PROGRESS 10
+#endif
+#ifdef __APPLE__
+#define WAIT_IN_PROGRESS 10
+#endif
+#ifdef __linux__
+/* returns correct error */
+#define WAIT_IN_PROGRESS 0
+#endif
+#ifndef WAIT_IN_PROGRESS
+/* BSD origin code apparently has a problem */
+#define WAIT_IN_PROGRESS 1
+#endif
+
+static int
+ruby_connect(fd, sockaddr, len, socks)
+ int fd;
+ struct sockaddr *sockaddr;
+ int len;
+ int socks;
+{
+ int status;
+ int mode;
+#if WAIT_IN_PROGRESS > 0
+ int wait_in_progress = -1;
+ int sockerr;
+ socklen_t sockerrlen;
+#endif
+
+#if defined(HAVE_FCNTL)
+# if defined(F_GETFL)
+ mode = fcntl(fd, F_GETFL, 0);
+# else
+ mode = 0;
+# endif
+
+#ifdef O_NDELAY
+# define NONBLOCKING O_NDELAY
+#else
+#ifdef O_NBIO
+# define NONBLOCKING O_NBIO
+#else
+# define NONBLOCKING O_NONBLOCK
+#endif
+#endif
+#ifdef SOCKS5
+ if (!socks)
+#endif
+ fcntl(fd, F_SETFL, mode|NONBLOCKING);
+#endif /* HAVE_FCNTL */
+
+ for (;;) {
+#if defined(SOCKS) && !defined(SOCKS5)
+ if (socks) {
+ status = Rconnect(fd, sockaddr, len);
+ }
+ else
+#endif
+ {
+ status = connect(fd, sockaddr, len);
+ }
+ if (status < 0) {
+ switch (errno) {
+ case EAGAIN:
+#ifdef EINPROGRESS
+ case EINPROGRESS:
+#endif
+#if WAIT_IN_PROGRESS > 0
+ sockerrlen = sizeof(sockerr);
+ status = getsockopt(fd, SOL_SOCKET, SO_ERROR, (void *)&sockerr, &sockerrlen);
+ if (status) break;
+ if (sockerr) {
+ status = -1;
+ errno = sockerr;
+ break;
+ }
+#endif
+#ifdef EALREADY
+ case EALREADY:
+#endif
+#if WAIT_IN_PROGRESS > 0
+ wait_in_progress = WAIT_IN_PROGRESS;
+#endif
+ status = wait_connectable(fd);
+ if (status) {
+ break;
+ }
+ errno = 0;
+ continue;
+
+#if WAIT_IN_PROGRESS > 0
+ case EINVAL:
+ if (wait_in_progress-- > 0) {
+ /*
+ * connect() after EINPROGRESS returns EINVAL on
+ * some platforms, need to check true error
+ * status.
+ */
+ sockerrlen = sizeof(sockerr);
+ status = getsockopt(fd, SOL_SOCKET, SO_ERROR, (void *)&sockerr, &sockerrlen);
+ if (!status && !sockerr) {
+ struct timeval tv = {0, 100000};
+ rb_thread_wait_for(tv);
+ continue;
+ }
+ status = -1;
+ errno = sockerr;
+ }
+ break;
+#endif
+
+#ifdef EISCONN
+ case EISCONN:
+ status = 0;
+ errno = 0;
+ break;
+#endif
+ default:
+ break;
+ }
+ }
+#ifdef HAVE_FCNTL
+ fcntl(fd, F_SETFL, mode);
+#endif
+ return status;
+ }
+}
+
+struct inetsock_arg
+{
+ VALUE sock;
+ struct {
+ VALUE host, serv;
+ struct addrinfo *res;
+ } remote, local;
+ int type;
+ int fd;
+};
+
+static VALUE
+inetsock_cleanup(arg)
+ struct inetsock_arg *arg;
+{
+ if (arg->remote.res) {
+ freeaddrinfo(arg->remote.res);
+ arg->remote.res = 0;
+ }
+ if (arg->local.res) {
+ freeaddrinfo(arg->local.res);
+ arg->local.res = 0;
+ }
+ if (arg->fd >= 0) {
+ close(arg->fd);
+ }
+ return Qnil;
+}
+
+static VALUE
+init_inetsock_internal(arg)
+ struct inetsock_arg *arg;
+{
+ int type = arg->type;
+ struct addrinfo *res;
+ int fd, status = 0;
+ char *syscall;
+
+ arg->remote.res = sock_addrinfo(arg->remote.host, arg->remote.serv, SOCK_STREAM,
+ (type == INET_SERVER) ? AI_PASSIVE : 0);
+ /*
+ * Maybe also accept a local address
+ */
+
+ if (type != INET_SERVER && (!NIL_P(arg->local.host) || !NIL_P(arg->local.serv))) {
+ arg->local.res = sock_addrinfo(arg->local.host, arg->local.serv, SOCK_STREAM, 0);
+ }
+
+ arg->fd = fd = -1;
+ for (res = arg->remote.res; res; res = res->ai_next) {
+ status = ruby_socket(res->ai_family,res->ai_socktype,res->ai_protocol);
+ syscall = "socket(2)";
+ fd = status;
+ if (fd < 0) {
+ continue;
+ }
+ arg->fd = fd;
+ if (type == INET_SERVER) {
+#if !defined(_WIN32) && !defined(__CYGWIN__)
+ status = 1;
+ setsockopt(fd, SOL_SOCKET, SO_REUSEADDR,
+ (char*)&status, sizeof(status));
+#endif
+ status = bind(fd, res->ai_addr, res->ai_addrlen);
+ syscall = "bind(2)";
+ }
+ else {
+ if (arg->local.res) {
+ status = bind(fd, arg->local.res->ai_addr, arg->local.res->ai_addrlen);
+ syscall = "bind(2)";
+ }
+
+ if (status >= 0) {
+ status = ruby_connect(fd, res->ai_addr, res->ai_addrlen,
+ (type == INET_SOCKS));
+ syscall = "connect(2)";
+ }
+ }
+
+ if (status < 0) {
+ close(fd);
+ arg->fd = fd = -1;
+ continue;
+ } else
+ break;
+ }
+ if (status < 0) {
+ rb_sys_fail(syscall);
+ }
+
+ arg->fd = -1;
+
+ if (type == INET_SERVER)
+ listen(fd, 5);
+
+ /* create new instance */
+ return init_sock(arg->sock, fd);
+}
+
+static VALUE
+init_inetsock(sock, remote_host, remote_serv, local_host, local_serv, type)
+ VALUE sock, remote_host, remote_serv, local_host, local_serv;
+ int type;
+{
+ struct inetsock_arg arg;
+ arg.sock = sock;
+ arg.remote.host = remote_host;
+ arg.remote.serv = remote_serv;
+ arg.remote.res = 0;
+ arg.local.host = local_host;
+ arg.local.serv = local_serv;
+ arg.local.res = 0;
+ arg.type = type;
+ arg.fd = -1;
+ return rb_ensure(init_inetsock_internal, (VALUE)&arg,
+ inetsock_cleanup, (VALUE)&arg);
+}
+
+/*
+ * call-seq:
+ * TCPSocket.new(remote_host, remote_port, local_host=nil, local_port=nil)
+ *
+ * Opens a TCP connection to +remote_host+ on +remote_port+. If +local_host+
+ * and +local_port+ are specified, then those parameters are used on the local
+ * end to establish the connection.
+ */
static VALUE
-io_call_close(VALUE io)
+tcp_init(argc, argv, sock)
+ int argc;
+ VALUE *argv;
+ VALUE sock;
{
- return rb_funcall(io, rb_intern("close"), 0, 0);
+ VALUE remote_host, remote_serv;
+ VALUE local_host, local_serv;
+
+ rb_scan_args(argc, argv, "22", &remote_host, &remote_serv,
+ &local_host, &local_serv);
+
+ return init_inetsock(sock, remote_host, remote_serv,
+ local_host, local_serv, INET_CLIENT);
}
+#ifdef SOCKS
static VALUE
-io_close(VALUE io)
+socks_init(sock, host, serv)
+ VALUE sock, host, serv;
{
- return rb_rescue(io_call_close, io, 0, 0);
+ static init = 0;
+
+ if (init == 0) {
+ SOCKSinit("ruby");
+ init = 1;
+ }
+
+ return init_inetsock(sock, host, serv, Qnil, Qnil, INET_SOCKS);
}
+#ifdef SOCKS5
static VALUE
-pair_yield(VALUE pair)
+socks_s_close(sock)
+ VALUE sock;
{
- return rb_ensure(rb_yield, pair, io_close, rb_ary_entry(pair, 1));
+ rb_io_t *fptr;
+
+ if (rb_safe_level() >= 4 && !OBJ_TAINTED(sock)) {
+ rb_raise(rb_eSecurityError, "Insecure: can't close socket");
+ }
+ GetOpenFile(sock, fptr);
+ shutdown(fileno(fptr->f), 2);
+ shutdown(fileno(fptr->f2), 2);
+ return rb_io_close(sock);
}
#endif
+#endif
+
+struct hostent_arg {
+ VALUE host;
+ struct addrinfo* addr;
+ VALUE (*ipaddr)_((struct sockaddr*, size_t));
+};
+
+static VALUE
+make_hostent_internal(arg)
+ struct hostent_arg *arg;
+{
+ VALUE host = arg->host;
+ struct addrinfo* addr = arg->addr;
+ VALUE (*ipaddr)_((struct sockaddr*, size_t)) = arg->ipaddr;
+
+ struct addrinfo *ai;
+ struct hostent *h;
+ VALUE ary, names;
+ char **pch;
+ const char* hostp;
+ char hbuf[NI_MAXHOST];
+
+ ary = rb_ary_new();
+ if (addr->ai_canonname) {
+ hostp = addr->ai_canonname;
+ }
+ else {
+ hostp = host_str(host, hbuf, sizeof(hbuf));
+ }
+ rb_ary_push(ary, rb_str_new2(hostp));
+
+ if (addr->ai_canonname && (h = gethostbyname(addr->ai_canonname))) {
+ names = rb_ary_new();
+ if (h->h_aliases != NULL) {
+ for (pch = h->h_aliases; *pch; pch++) {
+ rb_ary_push(names, rb_str_new2(*pch));
+ }
+ }
+ }
+ else {
+ names = rb_ary_new2(0);
+ }
+ rb_ary_push(ary, names);
+ rb_ary_push(ary, INT2NUM(addr->ai_family));
+ for (ai = addr; ai; ai = ai->ai_next) {
+ /* Pushing all addresses regardless of address family is not the
+ * behaviour expected of gethostbyname(). All the addresses in struct
+ * hostent->h_addr_list must be of the same family.
+ */
+ if(ai->ai_family == addr->ai_family) {
+ rb_ary_push(ary, (*ipaddr)(ai->ai_addr, ai->ai_addrlen));
+ }
+ }
+
+ return ary;
+}
+
+static VALUE
+make_hostent(host, addr, ipaddr)
+ VALUE host;
+ struct addrinfo* addr;
+ VALUE (*ipaddr)_((struct sockaddr*, size_t));
+{
+ struct hostent_arg arg;
+
+ arg.host = host;
+ arg.addr = addr;
+ arg.ipaddr = ipaddr;
+ return rb_ensure(make_hostent_internal, (VALUE)&arg,
+ RUBY_METHOD_FUNC(freeaddrinfo), (VALUE)addr);
+}
+
+VALUE
+tcp_sockaddr(addr, len)
+ struct sockaddr *addr;
+ size_t len;
+{
+ return make_ipaddr(addr);
+}
+
+static VALUE
+tcp_s_gethostbyname(obj, host)
+ VALUE obj, host;
+{
+ rb_secure(3);
+ return make_hostent(host, sock_addrinfo(host, Qnil, SOCK_STREAM, AI_CANONNAME), tcp_sockaddr);
+}
+
+static VALUE
+tcp_svr_init(argc, argv, sock)
+ int argc;
+ VALUE *argv;
+ VALUE sock;
+{
+ VALUE arg1, arg2;
+
+ if (rb_scan_args(argc, argv, "11", &arg1, &arg2) == 2)
+ return init_inetsock(sock, arg1, arg2, Qnil, Qnil, INET_SERVER);
+ else
+ return init_inetsock(sock, Qnil, arg1, Qnil, Qnil, INET_SERVER);
+}
+
+static void
+make_fd_nonblock(int fd)
+{
+ int flags;
+#ifdef F_GETFL
+ flags = fcntl(fd, F_GETFL);
+ if (flags == -1) {
+ rb_sys_fail(0);
+ }
+#else
+ flags = 0;
+#endif
+ flags |= O_NONBLOCK;
+ if (fcntl(fd, F_SETFL, flags) == -1) {
+ rb_sys_fail(0);
+ }
+}
+
+static VALUE
+s_accept_nonblock(VALUE klass, rb_io_t *fptr, struct sockaddr *sockaddr, socklen_t *len)
+{
+ int fd2;
+
+ rb_secure(3);
+ rb_io_set_nonblock(fptr);
+ fd2 = accept(fileno(fptr->f), (struct sockaddr*)sockaddr, len);
+ if (fd2 < 0) {
+ rb_sys_fail("accept(2)");
+ }
+ make_fd_nonblock(fd2);
+ return init_sock(rb_obj_alloc(klass), fd2);
+}
+
+static VALUE
+s_accept(klass, fd, sockaddr, len)
+ VALUE klass;
+ int fd;
+ struct sockaddr *sockaddr;
+ socklen_t *len;
+{
+ int fd2;
+ int retry = 0;
+
+ rb_secure(3);
+ retry:
+ rb_thread_wait_fd(fd);
+#if defined(_nec_ews)
+ fd2 = accept(fd, sockaddr, len);
+#else
+ TRAP_BEG;
+ fd2 = accept(fd, sockaddr, len);
+ TRAP_END;
+#endif
+ if (fd2 < 0) {
+ switch (errno) {
+ case EMFILE:
+ case ENFILE:
+ if (retry) break;
+ rb_gc();
+ retry = 1;
+ goto retry;
+ case EWOULDBLOCK:
+ break;
+ default:
+ if (!rb_io_wait_readable(fd)) break;
+ retry = 0;
+ goto retry;
+ }
+ rb_sys_fail(0);
+ }
+ if (!klass) return INT2NUM(fd2);
+ return init_sock(rb_obj_alloc(klass), fd2);
+}
+
+static VALUE
+tcp_accept(sock)
+ VALUE sock;
+{
+ rb_io_t *fptr;
+ struct sockaddr_storage from;
+ socklen_t fromlen;
+
+ GetOpenFile(sock, fptr);
+ fromlen = sizeof(from);
+ return s_accept(rb_cTCPSocket, fileno(fptr->f),
+ (struct sockaddr*)&from, &fromlen);
+}
-#if defined HAVE_SOCKETPAIR
/*
* call-seq:
- * Socket.pair(domain, type, protocol) => [socket1, socket2]
- * Socket.socketpair(domain, type, protocol) => [socket1, socket2]
+ * tcpserver.accept_nonblock => tcpsocket
+ *
+ * Accepts an incoming connection using accept(2) after
+ * O_NONBLOCK is set for the underlying file descriptor.
+ * It returns an accepted TCPSocket for the incoming connection.
+ *
+ * === Example
+ * require 'socket'
+ * serv = TCPServer.new(2202)
+ * begin
+ * sock = serv.accept_nonblock
+ * rescue Errno::EAGAIN, Errno::EWOULDBLOCK, Errno::ECONNABORTED, Errno::EPROTO, Errno::EINTR
+ * IO.select([serv])
+ * retry
+ * end
+ * # sock is an accepted socket.
+ *
+ * Refer to Socket#accept for the exceptions that may be thrown if the call
+ * to TCPServer#accept_nonblock fails.
*
- * Creates a pair of sockets connected each other.
+ * TCPServer#accept_nonblock may raise any error corresponding to accept(2) failure,
+ * including Errno::EAGAIN.
+ *
+ * === See
+ * * TCPServer#accept
+ * * Socket#accept
+ */
+static VALUE
+tcp_accept_nonblock(sock)
+ VALUE sock;
+{
+ rb_io_t *fptr;
+ struct sockaddr_storage from;
+ socklen_t fromlen;
+
+ GetOpenFile(sock, fptr);
+ fromlen = sizeof(from);
+ return s_accept_nonblock(rb_cTCPSocket, fptr,
+ (struct sockaddr *)&from, &fromlen);
+}
+
+static VALUE
+tcp_sysaccept(sock)
+ VALUE sock;
+{
+ rb_io_t *fptr;
+ struct sockaddr_storage from;
+ socklen_t fromlen;
+
+ GetOpenFile(sock, fptr);
+ fromlen = sizeof(from);
+ return s_accept(0, fileno(fptr->f), (struct sockaddr*)&from, &fromlen);
+}
+
+#ifdef HAVE_SYS_UN_H
+struct unixsock_arg {
+ struct sockaddr_un *sockaddr;
+ int fd;
+};
+
+static VALUE
+unixsock_connect_internal(arg)
+ struct unixsock_arg *arg;
+{
+ return (VALUE)ruby_connect(arg->fd, arg->sockaddr, sizeof(*arg->sockaddr),
+ 0);
+}
+
+static VALUE
+init_unixsock(sock, path, server)
+ VALUE sock;
+ VALUE path;
+ int server;
+{
+ struct sockaddr_un sockaddr;
+ int fd, status;
+ rb_io_t *fptr;
+
+ SafeStringValue(path);
+ fd = ruby_socket(AF_UNIX, SOCK_STREAM, 0);
+ if (fd < 0) {
+ rb_sys_fail("socket(2)");
+ }
+
+ MEMZERO(&sockaddr, struct sockaddr_un, 1);
+ sockaddr.sun_family = AF_UNIX;
+ if (sizeof(sockaddr.sun_path) <= RSTRING(path)->len) {
+ rb_raise(rb_eArgError, "too long unix socket path (max: %dbytes)",
+ (int)sizeof(sockaddr.sun_path)-1);
+ }
+ strcpy(sockaddr.sun_path, StringValueCStr(path));
+
+ if (server) {
+ status = bind(fd, (struct sockaddr*)&sockaddr, sizeof(sockaddr));
+ }
+ else {
+ int prot;
+ struct unixsock_arg arg;
+ arg.sockaddr = &sockaddr;
+ arg.fd = fd;
+ status = rb_protect(unixsock_connect_internal, (VALUE)&arg, &prot);
+ if (prot) {
+ close(fd);
+ rb_jump_tag(prot);
+ }
+ }
+
+ if (status < 0) {
+ close(fd);
+ rb_sys_fail(sockaddr.sun_path);
+ }
+
+ if (server) listen(fd, 5);
+
+ init_sock(sock, fd);
+ GetOpenFile(sock, fptr);
+ if (server) {
+ fptr->path = strdup(RSTRING(path)->ptr);
+ }
+
+ return sock;
+}
+#endif
+
+static VALUE
+ip_addr(sock)
+ VALUE sock;
+{
+ rb_io_t *fptr;
+ struct sockaddr_storage addr;
+ socklen_t len = sizeof addr;
+
+ GetOpenFile(sock, fptr);
+
+ if (getsockname(fileno(fptr->f), (struct sockaddr*)&addr, &len) < 0)
+ rb_sys_fail("getsockname(2)");
+ return ipaddr((struct sockaddr*)&addr);
+}
+
+static VALUE
+ip_peeraddr(sock)
+ VALUE sock;
+{
+ rb_io_t *fptr;
+ struct sockaddr_storage addr;
+ socklen_t len = sizeof addr;
+
+ GetOpenFile(sock, fptr);
+
+ if (getpeername(fileno(fptr->f), (struct sockaddr*)&addr, &len) < 0)
+ rb_sys_fail("getpeername(2)");
+ return ipaddr((struct sockaddr*)&addr);
+}
+
+static VALUE
+ip_recvfrom(argc, argv, sock)
+ int argc;
+ VALUE *argv;
+ VALUE sock;
+{
+ return s_recvfrom(sock, argc, argv, RECV_IP);
+}
+
+static VALUE
+ip_s_getaddress(obj, host)
+ VALUE obj, host;
+{
+ struct sockaddr_storage addr;
+ struct addrinfo *res = sock_addrinfo(host, Qnil, SOCK_STREAM, 0);
+
+ /* just take the first one */
+ memcpy(&addr, res->ai_addr, res->ai_addrlen);
+ freeaddrinfo(res);
+
+ return make_ipaddr((struct sockaddr*)&addr);
+}
+
+static VALUE
+udp_init(argc, argv, sock)
+ int argc;
+ VALUE *argv;
+ VALUE sock;
+{
+ VALUE arg;
+ int socktype = AF_INET;
+ int fd;
+
+ rb_secure(3);
+ if (rb_scan_args(argc, argv, "01", &arg) == 1) {
+ socktype = NUM2INT(arg);
+ }
+ fd = ruby_socket(socktype, SOCK_DGRAM, 0);
+ if (fd < 0) {
+ rb_sys_fail("socket(2) - udp");
+ }
+
+ return init_sock(sock, fd);
+}
+
+struct udp_arg
+{
+ struct addrinfo *res;
+ int fd;
+};
+
+static VALUE
+udp_connect_internal(arg)
+ struct udp_arg *arg;
+{
+ int fd = arg->fd;
+ struct addrinfo *res;
+
+ for (res = arg->res; res; res = res->ai_next) {
+ if (ruby_connect(fd, res->ai_addr, res->ai_addrlen, 0) >= 0) {
+ return Qtrue;
+ }
+ }
+ return Qfalse;
+}
+
+static VALUE
+udp_connect(sock, host, port)
+ VALUE sock, host, port;
+{
+ rb_io_t *fptr;
+ struct udp_arg arg;
+ VALUE ret;
+
+ rb_secure(3);
+ arg.res = sock_addrinfo(host, port, SOCK_DGRAM, 0);
+ GetOpenFile(sock, fptr);
+ arg.fd = fileno(fptr->f);
+ ret = rb_ensure(udp_connect_internal, (VALUE)&arg,
+ RUBY_METHOD_FUNC(freeaddrinfo), (VALUE)arg.res);
+ if (!ret) rb_sys_fail("connect(2)");
+ return INT2FIX(0);
+}
+
+static VALUE
+udp_bind(sock, host, port)
+ VALUE sock, host, port;
+{
+ rb_io_t *fptr;
+ struct addrinfo *res0, *res;
+
+ rb_secure(3);
+ res0 = sock_addrinfo(host, port, SOCK_DGRAM, 0);
+ GetOpenFile(sock, fptr);
+ for (res = res0; res; res = res->ai_next) {
+ if (bind(fileno(fptr->f), res->ai_addr, res->ai_addrlen) < 0) {
+ continue;
+ }
+ freeaddrinfo(res0);
+ return INT2FIX(0);
+ }
+ freeaddrinfo(res0);
+ rb_sys_fail("bind(2)");
+ return INT2FIX(0);
+}
+
+static VALUE
+udp_send(argc, argv, sock)
+ int argc;
+ VALUE *argv;
+ VALUE sock;
+{
+ VALUE mesg, flags, host, port;
+ rb_io_t *fptr;
+ FILE *f;
+ int n;
+ struct addrinfo *res0, *res;
+
+ if (argc == 2 || argc == 3) {
+ return bsock_send(argc, argv, sock);
+ }
+ rb_secure(4);
+ rb_scan_args(argc, argv, "4", &mesg, &flags, &host, &port);
+
+ StringValue(mesg);
+ res0 = sock_addrinfo(host, port, SOCK_DGRAM, 0);
+ GetOpenFile(sock, fptr);
+ f = GetWriteFile(fptr);
+ for (res = res0; res; res = res->ai_next) {
+ retry:
+ n = sendto(fileno(f), RSTRING(mesg)->ptr, RSTRING(mesg)->len, NUM2INT(flags),
+ res->ai_addr, res->ai_addrlen);
+ if (n >= 0) {
+ freeaddrinfo(res0);
+ return INT2FIX(n);
+ }
+ if (rb_io_wait_writable(fileno(f))) {
+ goto retry;
+ }
+ }
+ freeaddrinfo(res0);
+ rb_sys_fail("sendto(2)");
+ return INT2FIX(n);
+}
+
+/*
+ * call-seq:
+ * udpsocket.recvfrom_nonblock(maxlen) => [mesg, sender_inet_addr]
+ * udpsocket.recvfrom_nonblock(maxlen, flags) => [mesg, sender_inet_addr]
+ *
+ * Receives up to _maxlen_ bytes from +udpsocket+ using recvfrom(2) after
+ * O_NONBLOCK is set for the underlying file descriptor.
+ * _flags_ is zero or more of the +MSG_+ options.
+ * The first element of the results, _mesg_, is the data received.
+ * The second element, _sender_inet_addr_, is an array to represent the sender address.
*
- * _domain_ should be a communications domain such as: :INET, :INET6, :UNIX, etc.
+ * When recvfrom(2) returns 0,
+ * Socket#recvfrom_nonblock returns an empty string as data.
+ * It means an empty packet.
+ *
+ * === Parameters
+ * * +maxlen+ - the number of bytes to receive from the socket
+ * * +flags+ - zero or more of the +MSG_+ options
+ *
+ * === Example
+ * require 'socket'
+ * s1 = UDPSocket.new
+ * s1.bind("127.0.0.1", 0)
+ * s2 = UDPSocket.new
+ * s2.bind("127.0.0.1", 0)
+ * s2.connect(*s1.addr.values_at(3,1))
+ * s1.connect(*s2.addr.values_at(3,1))
+ * s1.send "aaa", 0
+ * IO.select([s2])
+ * p s2.recvfrom_nonblock(10) #=> ["aaa", ["AF_INET", 33302, "localhost.localdomain", "127.0.0.1"]]
*
- * _socktype_ should be a socket type such as: :STREAM, :DGRAM, :RAW, etc.
+ * Refer to Socket#recvfrom for the exceptions that may be thrown if the call
+ * to _recvfrom_nonblock_ fails.
*
- * _protocol_ should be a protocol defined in the domain.
- * 0 is default protocol for the domain.
+ * UDPSocket#recvfrom_nonblock may raise any error corresponding to recvfrom(2) failure,
+ * including Errno::EAGAIN.
*
- * s1, s2 = Socket.pair(:UNIX, :DGRAM, 0)
- * s1.send "a", 0
- * s1.send "b", 0
- * p s2.recv(10) #=> "a"
- * p s2.recv(10) #=> "b"
+ * === See
+ * * Socket#recvfrom
+ */
+static VALUE
+udp_recvfrom_nonblock(int argc, VALUE *argv, VALUE sock)
+{
+ return s_recvfrom_nonblock(sock, argc, argv, RECV_IP);
+}
+
+#ifdef HAVE_SYS_UN_H
+static VALUE
+unix_init(sock, path)
+ VALUE sock, path;
+{
+ return init_unixsock(sock, path, 0);
+}
+
+static char *
+unixpath(struct sockaddr_un *sockaddr, socklen_t len)
+{
+ if (sockaddr->sun_path < (char*)sockaddr + len)
+ return sockaddr->sun_path;
+ else
+ return "";
+}
+
+static VALUE
+unix_path(sock)
+ VALUE sock;
+{
+ rb_io_t *fptr;
+
+ GetOpenFile(sock, fptr);
+ if (fptr->path == 0) {
+ struct sockaddr_un addr;
+ socklen_t len = sizeof(addr);
+ if (getsockname(fileno(fptr->f), (struct sockaddr*)&addr, &len) < 0)
+ rb_sys_fail(0);
+ fptr->path = strdup(unixpath(&addr, len));
+ }
+ return rb_str_new2(fptr->path);
+}
+
+static VALUE
+unix_svr_init(sock, path)
+ VALUE sock, path;
+{
+ return init_unixsock(sock, path, 1);
+}
+
+static VALUE
+unix_recvfrom(argc, argv, sock)
+ int argc;
+ VALUE *argv;
+ VALUE sock;
+{
+ return s_recvfrom(sock, argc, argv, RECV_UNIX);
+}
+
+#if defined(HAVE_ST_MSG_CONTROL) && defined(SCM_RIGHTS)
+#define FD_PASSING_BY_MSG_CONTROL 1
+#else
+#define FD_PASSING_BY_MSG_CONTROL 0
+#endif
+
+#if defined(HAVE_ST_MSG_ACCRIGHTS)
+#define FD_PASSING_BY_MSG_ACCRIGHTS 1
+#else
+#define FD_PASSING_BY_MSG_ACCRIGHTS 0
+#endif
+
+static VALUE
+unix_send_io(sock, val)
+ VALUE sock, val;
+{
+#if defined(HAVE_SENDMSG) && (FD_PASSING_BY_MSG_CONTROL || FD_PASSING_BY_MSG_ACCRIGHTS)
+ int fd;
+ rb_io_t *fptr;
+ struct msghdr msg;
+ struct iovec vec[1];
+ char buf[1];
+
+#if FD_PASSING_BY_MSG_CONTROL
+ struct {
+ struct cmsghdr hdr;
+ char pad[8+sizeof(int)+8];
+ } cmsg;
+#endif
+
+ if (rb_obj_is_kind_of(val, rb_cIO)) {
+ rb_io_t *valfptr;
+ GetOpenFile(val, valfptr);
+ fd = fileno(valfptr->f);
+ }
+ else if (FIXNUM_P(val)) {
+ fd = FIX2INT(val);
+ }
+ else {
+ rb_raise(rb_eTypeError, "neither IO nor file descriptor");
+ }
+
+ GetOpenFile(sock, fptr);
+
+ msg.msg_name = NULL;
+ msg.msg_namelen = 0;
+
+ /* Linux and Solaris doesn't work if msg_iov is NULL. */
+ buf[0] = '\0';
+ vec[0].iov_base = buf;
+ vec[0].iov_len = 1;
+ msg.msg_iov = vec;
+ msg.msg_iovlen = 1;
+
+#if FD_PASSING_BY_MSG_CONTROL
+ msg.msg_control = (caddr_t)&cmsg;
+ msg.msg_controllen = CMSG_LEN(sizeof(int));
+ msg.msg_flags = 0;
+ MEMZERO((char*)&cmsg, char, sizeof(cmsg));
+ cmsg.hdr.cmsg_len = CMSG_LEN(sizeof(int));
+ cmsg.hdr.cmsg_level = SOL_SOCKET;
+ cmsg.hdr.cmsg_type = SCM_RIGHTS;
+ *(int *)CMSG_DATA(&cmsg.hdr) = fd;
+#else
+ msg.msg_accrights = (caddr_t)&fd;
+ msg.msg_accrightslen = sizeof(fd);
+#endif
+
+ if (sendmsg(fileno(fptr->f), &msg, 0) == -1)
+ rb_sys_fail("sendmsg(2)");
+
+ return Qnil;
+#else
+ rb_notimplement();
+ return Qnil; /* not reached */
+#endif
+}
+
+#if defined(HAVE_RECVMSG) && (FD_PASSING_BY_MSG_CONTROL || FD_PASSING_BY_MSG_ACCRIGHTS)
+static void
+thread_read_select(fd)
+ int fd;
+{
+ fd_set fds;
+
+ FD_ZERO(&fds);
+ FD_SET(fd, &fds);
+ rb_thread_select(fd+1, &fds, 0, 0, 0);
+}
+#endif
+
+static VALUE
+unix_recv_io(argc, argv, sock)
+ int argc;
+ VALUE *argv;
+ VALUE sock;
+{
+#if defined(HAVE_RECVMSG) && (FD_PASSING_BY_MSG_CONTROL || FD_PASSING_BY_MSG_ACCRIGHTS)
+ VALUE klass, mode;
+ rb_io_t *fptr;
+ struct msghdr msg;
+ struct iovec vec[2];
+ char buf[1];
+
+ int fd;
+#if FD_PASSING_BY_MSG_CONTROL
+ struct {
+ struct cmsghdr hdr;
+ char pad[8+sizeof(int)+8];
+ } cmsg;
+#endif
+
+ rb_scan_args(argc, argv, "02", &klass, &mode);
+ if (argc == 0)
+ klass = rb_cIO;
+ if (argc <= 1)
+ mode = Qnil;
+
+ GetOpenFile(sock, fptr);
+
+ thread_read_select(fileno(fptr->f));
+
+ msg.msg_name = NULL;
+ msg.msg_namelen = 0;
+
+ vec[0].iov_base = buf;
+ vec[0].iov_len = sizeof(buf);
+ msg.msg_iov = vec;
+ msg.msg_iovlen = 1;
+
+#if FD_PASSING_BY_MSG_CONTROL
+ msg.msg_control = (caddr_t)&cmsg;
+ msg.msg_controllen = CMSG_SPACE(sizeof(int));
+ msg.msg_flags = 0;
+ cmsg.hdr.cmsg_len = CMSG_LEN(sizeof(int));
+ cmsg.hdr.cmsg_level = SOL_SOCKET;
+ cmsg.hdr.cmsg_type = SCM_RIGHTS;
+ *(int *)CMSG_DATA(&cmsg.hdr) = -1;
+#else
+ msg.msg_accrights = (caddr_t)&fd;
+ msg.msg_accrightslen = sizeof(fd);
+ fd = -1;
+#endif
+
+ if (recvmsg(fileno(fptr->f), &msg, 0) == -1)
+ rb_sys_fail("recvmsg(2)");
+
+#if FD_PASSING_BY_MSG_CONTROL
+ if (msg.msg_controllen != CMSG_SPACE(sizeof(int))) {
+ rb_raise(rb_eSocket,
+ "file descriptor was not passed (msg_controllen=%d, %d expected)",
+ msg.msg_controllen, CMSG_SPACE(sizeof(int)));
+ }
+ if (cmsg.hdr.cmsg_len != CMSG_LEN(sizeof(int))) {
+ rb_raise(rb_eSocket,
+ "file descriptor was not passed (cmsg_len=%d, %d expected)",
+ cmsg.hdr.cmsg_len, CMSG_LEN(sizeof(int)));
+ }
+ if (cmsg.hdr.cmsg_level != SOL_SOCKET) {
+ rb_raise(rb_eSocket,
+ "file descriptor was not passed (cmsg_level=%d, %d expected)",
+ cmsg.hdr.cmsg_level, SOL_SOCKET);
+ }
+ if (cmsg.hdr.cmsg_type != SCM_RIGHTS) {
+ rb_raise(rb_eSocket,
+ "file descriptor was not passed (cmsg_type=%d, %d expected)",
+ cmsg.hdr.cmsg_type, SCM_RIGHTS);
+ }
+#else
+ if (msg.msg_accrightslen != sizeof(fd)) {
+ rb_raise(rb_eSocket,
+ "file descriptor was not passed (accrightslen) : %d != %d",
+ msg.msg_accrightslen, sizeof(fd));
+ }
+#endif
+
+#if FD_PASSING_BY_MSG_CONTROL
+ fd = *(int *)CMSG_DATA(&cmsg.hdr);
+#endif
+
+ if (klass == Qnil)
+ return INT2FIX(fd);
+ else {
+ static ID for_fd = 0;
+ int ff_argc;
+ VALUE ff_argv[2];
+ if (!for_fd)
+ for_fd = rb_intern("for_fd");
+ ff_argc = mode == Qnil ? 1 : 2;
+ ff_argv[0] = INT2FIX(fd);
+ ff_argv[1] = mode;
+ return rb_funcall2(klass, for_fd, ff_argc, ff_argv);
+ }
+#else
+ rb_notimplement();
+ return Qnil; /* not reached */
+#endif
+}
+
+static VALUE
+unix_accept(sock)
+ VALUE sock;
+{
+ rb_io_t *fptr;
+ struct sockaddr_un from;
+ socklen_t fromlen;
+
+ GetOpenFile(sock, fptr);
+ fromlen = sizeof(struct sockaddr_un);
+ return s_accept(rb_cUNIXSocket, fileno(fptr->f),
+ (struct sockaddr*)&from, &fromlen);
+}
+
+/*
+ * call-seq:
+ * unixserver.accept_nonblock => unixsocket
+ *
+ * Accepts an incoming connection using accept(2) after
+ * O_NONBLOCK is set for the underlying file descriptor.
+ * It returns an accepted UNIXSocket for the incoming connection.
+ *
+ * === Example
+ * require 'socket'
+ * serv = UNIXServer.new("/tmp/sock")
+ * begin
+ * sock = serv.accept_nonblock
+ * rescue Errno::EAGAIN, Errno::EWOULDBLOCK, Errno::ECONNABORTED, Errno::EPROTO, Errno::EINTR
+ * IO.select([serv])
+ * retry
+ * end
+ * # sock is an accepted socket.
+ *
+ * Refer to Socket#accept for the exceptions that may be thrown if the call
+ * to UNIXServer#accept_nonblock fails.
*
+ * UNIXServer#accept_nonblock may raise any error corresponding to accept(2) failure,
+ * including Errno::EAGAIN.
+ *
+ * === See
+ * * UNIXServer#accept
+ * * Socket#accept
*/
-VALUE
-rsock_sock_s_socketpair(int argc, VALUE *argv, VALUE klass)
+static VALUE
+unix_accept_nonblock(sock)
+ VALUE sock;
{
- VALUE domain, type, protocol;
+ rb_io_t *fptr;
+ struct sockaddr_un from;
+ socklen_t fromlen;
+
+ GetOpenFile(sock, fptr);
+ fromlen = sizeof(from);
+ return s_accept_nonblock(rb_cUNIXSocket, fptr,
+ (struct sockaddr *)&from, &fromlen);
+}
+
+static VALUE
+unix_sysaccept(sock)
+ VALUE sock;
+{
+ rb_io_t *fptr;
+ struct sockaddr_un from;
+ socklen_t fromlen;
+
+ GetOpenFile(sock, fptr);
+ fromlen = sizeof(struct sockaddr_un);
+ return s_accept(0, fileno(fptr->f), (struct sockaddr*)&from, &fromlen);
+}
+
+static VALUE
+unixaddr(sockaddr, len)
+ struct sockaddr_un *sockaddr;
+ socklen_t len;
+{
+ return rb_assoc_new(rb_str_new2("AF_UNIX"),
+ rb_str_new2(unixpath(sockaddr, len)));
+}
+
+static VALUE
+unix_addr(sock)
+ VALUE sock;
+{
+ rb_io_t *fptr;
+ struct sockaddr_un addr;
+ socklen_t len = sizeof addr;
+
+ GetOpenFile(sock, fptr);
+
+ if (getsockname(fileno(fptr->f), (struct sockaddr*)&addr, &len) < 0)
+ rb_sys_fail("getsockname(2)");
+ return unixaddr(&addr, len);
+}
+
+static VALUE
+unix_peeraddr(sock)
+ VALUE sock;
+{
+ rb_io_t *fptr;
+ struct sockaddr_un addr;
+ socklen_t len = sizeof addr;
+
+ GetOpenFile(sock, fptr);
+
+ if (getpeername(fileno(fptr->f), (struct sockaddr*)&addr, &len) < 0)
+ rb_sys_fail("getpeername(2)");
+ return unixaddr(&addr, len);
+}
+#endif
+
+static void
+setup_domain_and_type(domain, dv, type, tv)
+ VALUE domain, type;
+ int *dv, *tv;
+{
+ VALUE tmp;
+ char *ptr;
+
+ tmp = rb_check_string_type(domain);
+ if (!NIL_P(tmp)) {
+ domain = tmp;
+ rb_check_safe_obj(domain);
+ ptr = RSTRING(domain)->ptr;
+ if (strcmp(ptr, "AF_INET") == 0)
+ *dv = AF_INET;
+#ifdef AF_UNIX
+ else if (strcmp(ptr, "AF_UNIX") == 0)
+ *dv = AF_UNIX;
+#endif
+#ifdef AF_ISO
+ else if (strcmp(ptr, "AF_ISO") == 0)
+ *dv = AF_ISO;
+#endif
+#ifdef AF_NS
+ else if (strcmp(ptr, "AF_NS") == 0)
+ *dv = AF_NS;
+#endif
+#ifdef AF_IMPLINK
+ else if (strcmp(ptr, "AF_IMPLINK") == 0)
+ *dv = AF_IMPLINK;
+#endif
+#ifdef PF_INET
+ else if (strcmp(ptr, "PF_INET") == 0)
+ *dv = PF_INET;
+#endif
+#ifdef PF_UNIX
+ else if (strcmp(ptr, "PF_UNIX") == 0)
+ *dv = PF_UNIX;
+#endif
+#ifdef PF_IMPLINK
+ else if (strcmp(ptr, "PF_IMPLINK") == 0)
+ *dv = PF_IMPLINK;
+ else if (strcmp(ptr, "AF_IMPLINK") == 0)
+ *dv = AF_IMPLINK;
+#endif
+#ifdef PF_AX25
+ else if (strcmp(ptr, "PF_AX25") == 0)
+ *dv = PF_AX25;
+#endif
+#ifdef PF_IPX
+ else if (strcmp(ptr, "PF_IPX") == 0)
+ *dv = PF_IPX;
+#endif
+ else
+ rb_raise(rb_eSocket, "unknown socket domain %s", ptr);
+ }
+ else {
+ *dv = NUM2INT(domain);
+ }
+ tmp = rb_check_string_type(type);
+ if (!NIL_P(tmp)) {
+ type = tmp;
+ rb_check_safe_obj(type);
+ ptr = RSTRING(type)->ptr;
+ if (strcmp(ptr, "SOCK_STREAM") == 0)
+ *tv = SOCK_STREAM;
+ else if (strcmp(ptr, "SOCK_DGRAM") == 0)
+ *tv = SOCK_DGRAM;
+#ifdef SOCK_RAW
+ else if (strcmp(ptr, "SOCK_RAW") == 0)
+ *tv = SOCK_RAW;
+#endif
+#ifdef SOCK_SEQPACKET
+ else if (strcmp(ptr, "SOCK_SEQPACKET") == 0)
+ *tv = SOCK_SEQPACKET;
+#endif
+#ifdef SOCK_RDM
+ else if (strcmp(ptr, "SOCK_RDM") == 0)
+ *tv = SOCK_RDM;
+#endif
+#ifdef SOCK_PACKET
+ else if (strcmp(ptr, "SOCK_PACKET") == 0)
+ *tv = SOCK_PACKET;
+#endif
+ else
+ rb_raise(rb_eSocket, "unknown socket type %s", ptr);
+ }
+ else {
+ *tv = NUM2INT(type);
+ }
+}
+
+static VALUE
+sock_initialize(sock, domain, type, protocol)
+ VALUE sock, domain, type, protocol;
+{
+ int fd;
+ int d, t;
+
+ rb_secure(3);
+ setup_domain_and_type(domain, &d, type, &t);
+ fd = ruby_socket(d, t, NUM2INT(protocol));
+ if (fd < 0) rb_sys_fail("socket(2)");
+
+ return init_sock(sock, fd);
+}
+
+static VALUE
+sock_s_socketpair(klass, domain, type, protocol)
+ VALUE klass, domain, type, protocol;
+{
+#if defined HAVE_SOCKETPAIR
int d, t, p, sp[2];
int ret;
- VALUE s1, s2, r;
-
- rb_scan_args(argc, argv, "21", &domain, &type, &protocol);
- if (NIL_P(protocol))
- protocol = INT2FIX(0);
setup_domain_and_type(domain, &d, type, &t);
p = NUM2INT(protocol);
@@ -120,16 +2384,31 @@ rsock_sock_s_socketpair(int argc, VALUE *argv, VALUE klass)
rb_sys_fail("socketpair(2)");
}
- s1 = rsock_init_sock(rb_obj_alloc(klass), sp[0]);
- s2 = rsock_init_sock(rb_obj_alloc(klass), sp[1]);
- r = rb_assoc_new(s1, s2);
- if (rb_block_given_p()) {
- return rb_ensure(pair_yield, r, io_close, s1);
- }
- return r;
-}
+ return rb_assoc_new(init_sock(rb_obj_alloc(klass), sp[0]),
+ init_sock(rb_obj_alloc(klass), sp[1]));
#else
-#define rsock_sock_s_socketpair rb_f_notimplement
+ rb_notimplement();
+#endif
+}
+
+#ifdef HAVE_SYS_UN_H
+static VALUE
+unix_s_socketpair(argc, argv, klass)
+ int argc;
+ VALUE *argv;
+ VALUE klass;
+{
+ VALUE domain, type, protocol;
+ domain = INT2FIX(PF_UNIX);
+
+ rb_scan_args(argc, argv, "02", &type, &protocol);
+ if (argc == 0)
+ type = INT2FIX(SOCK_STREAM);
+ if (argc <= 1)
+ protocol = INT2FIX(0);
+
+ return sock_s_socketpair(klass, domain, type, protocol);
+}
#endif
/*
@@ -244,21 +2523,21 @@ rsock_sock_s_socketpair(int argc, VALUE *argv, VALUE klass)
* * connect function in Microsoft's Winsock functions reference
*/
static VALUE
-sock_connect(VALUE sock, VALUE addr)
+sock_connect(sock, addr)
+ VALUE sock, addr;
{
rb_io_t *fptr;
- int fd, n;
+ int fd;
- SockAddrStringValue(addr);
+ StringValue(addr);
addr = rb_str_new4(addr);
GetOpenFile(sock, fptr);
- fd = fptr->fd;
- n = rsock_connect(fd, (struct sockaddr*)RSTRING_PTR(addr), RSTRING_LEN(addr), 0);
- if (n < 0) {
+ fd = fileno(fptr->f);
+ if (ruby_connect(fd, (struct sockaddr*)RSTRING(addr)->ptr, RSTRING(addr)->len, 0) < 0) {
rb_sys_fail("connect(2)");
}
- return INT2FIX(n);
+ return INT2FIX(0);
}
/*
@@ -278,12 +2557,12 @@ sock_connect(VALUE sock, VALUE addr)
* include Socket::Constants
* socket = Socket.new(AF_INET, SOCK_STREAM, 0)
* sockaddr = Socket.sockaddr_in(80, 'www.google.com')
- * begin # emulate blocking connect
+ * begin
* socket.connect_nonblock(sockaddr)
- * rescue IO::WaitWritable
- * IO.select(nil, [socket]) # wait 3-way handshake completion
+ * rescue Errno::EINPROGRESS
+ * IO.select(nil, [socket])
* begin
- * socket.connect_nonblock(sockaddr) # check connection failure
+ * socket.connect_nonblock(sockaddr)
* rescue Errno::EISCONN
* end
* end
@@ -296,27 +2575,22 @@ sock_connect(VALUE sock, VALUE addr)
* Socket#connect_nonblock may raise any error corresponding to connect(2) failure,
* including Errno::EINPROGRESS.
*
- * If the exception is Errno::EINPROGRESS,
- * it is extended by IO::WaitWritable.
- * So IO::WaitWritable can be used to rescue the exceptions for retrying connect_nonblock.
- *
* === See
* * Socket#connect
*/
static VALUE
-sock_connect_nonblock(VALUE sock, VALUE addr)
+sock_connect_nonblock(sock, addr)
+ VALUE sock, addr;
{
rb_io_t *fptr;
int n;
- SockAddrStringValue(addr);
+ StringValue(addr);
addr = rb_str_new4(addr);
GetOpenFile(sock, fptr);
rb_io_set_nonblock(fptr);
- n = connect(fptr->fd, (struct sockaddr*)RSTRING_PTR(addr), RSTRING_LEN(addr));
+ n = connect(fileno(fptr->f), (struct sockaddr*)RSTRING(addr)->ptr, RSTRING(addr)->len);
if (n < 0) {
- if (errno == EINPROGRESS)
- rb_mod_sys_fail(rb_mWaitWritable, "connect(2) would block");
rb_sys_fail("connect(2)");
}
@@ -403,13 +2677,14 @@ sock_connect_nonblock(VALUE sock, VALUE addr)
* * bind function in Microsoft's Winsock functions reference
*/
static VALUE
-sock_bind(VALUE sock, VALUE addr)
+sock_bind(sock, addr)
+ VALUE sock, addr;
{
rb_io_t *fptr;
- SockAddrStringValue(addr);
+ StringValue(addr);
GetOpenFile(sock, fptr);
- if (bind(fptr->fd, (struct sockaddr*)RSTRING_PTR(addr), RSTRING_LEN(addr)) < 0)
+ if (bind(fileno(fptr->f), (struct sockaddr*)RSTRING(addr)->ptr, RSTRING(addr)->len) < 0)
rb_sys_fail("bind(2)");
return INT2FIX(0);
@@ -486,7 +2761,8 @@ sock_bind(VALUE sock, VALUE addr)
* * listen function in Microsoft's Winsock functions reference
*/
static VALUE
-sock_listen(VALUE sock, VALUE log)
+sock_listen(sock, log)
+ VALUE sock, log;
{
rb_io_t *fptr;
int backlog;
@@ -494,7 +2770,7 @@ sock_listen(VALUE sock, VALUE log)
rb_secure(4);
backlog = NUM2INT(log);
GetOpenFile(sock, fptr);
- if (listen(fptr->fd, backlog) < 0)
+ if (listen(fileno(fptr->f), backlog) < 0)
rb_sys_fail("listen(2)");
return INT2FIX(0);
@@ -606,9 +2882,12 @@ sock_listen(VALUE sock, VALUE log)
* message.
*/
static VALUE
-sock_recvfrom(int argc, VALUE *argv, VALUE sock)
+sock_recvfrom(argc, argv, sock)
+ int argc;
+ VALUE *argv;
+ VALUE sock;
{
- return rsock_s_recvfrom(sock, argc, argv, RECV_SOCKET);
+ return s_recvfrom(sock, argc, argv, RECV_SOCKET);
}
/*
@@ -640,9 +2919,9 @@ sock_recvfrom(int argc, VALUE *argv, VALUE sock)
* socket.bind(sockaddr)
* socket.listen(5)
* client, client_sockaddr = socket.accept
- * begin # emulate blocking recvfrom
+ * begin
* pair = client.recvfrom_nonblock(20)
- * rescue IO::WaitReadable
+ * rescue Errno::EAGAIN, Errno::EWOULDBLOCK
* IO.select([client])
* retry
* end
@@ -664,11 +2943,7 @@ sock_recvfrom(int argc, VALUE *argv, VALUE sock)
* to _recvfrom_nonblock_ fails.
*
* Socket#recvfrom_nonblock may raise any error corresponding to recvfrom(2) failure,
- * including Errno::EWOULDBLOCK.
- *
- * If the exception is Errno::EWOULDBLOCK or Errno::AGAIN,
- * it is extended by IO::WaitReadable.
- * So IO::WaitReadable can be used to rescue the exceptions for retrying recvfrom_nonblock.
+ * including Errno::EAGAIN.
*
* === See
* * Socket#recvfrom
@@ -676,40 +2951,109 @@ sock_recvfrom(int argc, VALUE *argv, VALUE sock)
static VALUE
sock_recvfrom_nonblock(int argc, VALUE *argv, VALUE sock)
{
- return rsock_s_recvfrom_nonblock(sock, argc, argv, RECV_SOCKET);
+ return s_recvfrom_nonblock(sock, argc, argv, RECV_SOCKET);
}
/*
* call-seq:
- * socket.accept => [client_socket, client_addrinfo]
- *
- * Accepts a next connection.
- * Returns a new Socket object and Addrinfo object.
- *
- * serv = Socket.new(:INET, :STREAM, 0)
- * serv.listen(5)
- * c = Socket.new(:INET, :STREAM, 0)
- * c.connect(serv.local_address)
- * p serv.accept #=> [#<Socket:fd 6>, #<Addrinfo: 127.0.0.1:48555 TCP>]
- *
+ * socket.accept => [ socket, string ]
+ *
+ * Accepts an incoming connection returning an array containing a new
+ * Socket object and a string holding the +struct+ sockaddr information about
+ * the caller.
+ *
+ * === Example
+ * # In one script, start this first
+ * require 'socket'
+ * include Socket::Constants
+ * socket = Socket.new( AF_INET, SOCK_STREAM, 0 )
+ * sockaddr = Socket.pack_sockaddr_in( 2200, 'localhost' )
+ * socket.bind( sockaddr )
+ * socket.listen( 5 )
+ * client, client_sockaddr = socket.accept
+ * puts "The client said, '#{client.readline.chomp}'"
+ * client.puts "Hello from script one!"
+ * socket.close
+ *
+ * # In another script, start this second
+ * require 'socket'
+ * include Socket::Constants
+ * socket = Socket.new( AF_INET, SOCK_STREAM, 0 )
+ * sockaddr = Socket.pack_sockaddr_in( 2200, 'localhost' )
+ * socket.connect( sockaddr )
+ * socket.puts "Hello from script 2."
+ * puts "The server said, '#{socket.readline.chomp}'"
+ * socket.close
+ *
+ * === Unix-based Exceptions
+ * On unix-based based systems the following system exceptions may be raised if the
+ * call to _accept_ fails:
+ * * Errno::EAGAIN - O_NONBLOCK is set for the +socket+ file descriptor and no
+ * connections are parent to be accepted
+ * * Errno::EWOULDBLOCK - same as Errno::EAGAIN
+ * * Errno::EBADF - the +socket+ is not a valid file descriptor
+ * * Errno::ECONNABORTED - a connection has been aborted
+ * * Errno::EFAULT - the socket's internal address or address length parameter
+ * cannot be access or written
+ * * Errno::EINTR - the _accept_ method was interrupted by a signal that was
+ * caught before a valid connection arrived
+ * * Errno::EINVAL - the +socket+ is not accepting connections
+ * * Errno::EMFILE - OPEN_MAX file descriptors are currently open in the calling
+ * process
+ * * Errno::ENOBUFS - no buffer space is available
+ * * Errno::ENOMEM - there was insufficient memory available to complete the
+ * operation
+ * * Errno::ENOSR - there was insufficient STREAMS resources available to
+ * complete the operation
+ * * Errno::ENFILE - the maximum number of file descriptors in the system are
+ * already open
+ * * Errno::ENOTSOCK - the +socket+ does not refer to a socket
+ * * Errno::EOPNOTSUPP - the socket type for the calling +socket+ does not
+ * support accept connections
+ * * Errno::EPROTO - a protocol error has occurred
+ *
+ * === Windows Exceptions
+ * On Windows systems the following system exceptions may be raised if
+ * the call to _accept_ fails:
+ * * Errno::ECONNRESET - an incoming connection was indicated, but was
+ * terminated by the remote peer prior to accepting the connection
+ * * Errno::EFAULT - the socket's internal address or address length parameter
+ * is too small or is not a valid part of the user space address
+ * * Errno::EINVAL - the _listen_ method was not invoked prior to calling _accept_
+ * * Errno::EINPROGRESS - a blocking Windows Sockets 1.1 call is in progress or
+ * the service provider is still processing a callback function
+ * * Errno::EMFILE - the queue is not empty, upong etry to _accept_ and there are
+ * no socket descriptors available
+ * * Errno::ENETDOWN - the network is down
+ * * Errno::ENOBUFS - no buffer space is available
+ * * Errno::ENOTSOCK - +socket+ is not a socket
+ * * Errno::EOPNOTSUPP - +socket+ is not a type that supports connection-oriented
+ * service.
+ * * Errno::EWOULDBLOCK - +socket+ is marked as nonblocking and no connections are
+ * present to be accepted
+ *
+ * === See
+ * * accept manual pages on unix-based systems
+ * * accept function in Microsoft's Winsock functions reference
*/
static VALUE
-sock_accept(VALUE sock)
+sock_accept(sock)
+ VALUE sock;
{
rb_io_t *fptr;
VALUE sock2;
- struct sockaddr_storage buf;
+ char buf[1024];
socklen_t len = sizeof buf;
GetOpenFile(sock, fptr);
- sock2 = rsock_s_accept(rb_cSocket,fptr->fd,(struct sockaddr*)&buf,&len);
+ sock2 = s_accept(rb_cSocket,fileno(fptr->f),(struct sockaddr*)buf,&len);
- return rb_assoc_new(sock2, rsock_io_socket_addrinfo(sock2, (struct sockaddr*)&buf, len));
+ return rb_assoc_new(sock2, rb_str_new(buf, len));
}
/*
* call-seq:
- * socket.accept_nonblock => [client_socket, client_sockaddr]
+ * socket.accept_nonblock => [client_socket, client_sockaddr]
*
* Accepts an incoming connection using accept(2) after
* O_NONBLOCK is set for the underlying file descriptor.
@@ -726,16 +3070,16 @@ sock_accept(VALUE sock)
* sockaddr = Socket.sockaddr_in(2200, 'localhost')
* socket.bind(sockaddr)
* socket.listen(5)
- * begin # emulate blocking accept
+ * begin
* client_socket, client_sockaddr = socket.accept_nonblock
- * rescue IO::WaitReadable, Errno::EINTR
+ * rescue Errno::EAGAIN, Errno::EWOULDBLOCK, Errno::ECONNABORTED, Errno::EPROTO, Errno::EINTR
* IO.select([socket])
* retry
* end
* puts "The client said, '#{client_socket.readline.chomp}'"
* client_socket.puts "Hello from script one!"
* socket.close
- *
+ *
* # In another script, start this second
* require 'socket'
* include Socket::Constants
@@ -750,26 +3094,23 @@ sock_accept(VALUE sock)
* to _accept_nonblock_ fails.
*
* Socket#accept_nonblock may raise any error corresponding to accept(2) failure,
- * including Errno::EWOULDBLOCK.
- *
- * If the exception is Errno::EWOULDBLOCK, Errno::AGAIN, Errno::ECONNABORTED or Errno::EPROTO,
- * it is extended by IO::WaitReadable.
- * So IO::WaitReadable can be used to rescue the exceptions for retrying accept_nonblock.
+ * including Errno::EAGAIN.
*
* === See
* * Socket#accept
*/
static VALUE
-sock_accept_nonblock(VALUE sock)
+sock_accept_nonblock(sock)
+ VALUE sock;
{
rb_io_t *fptr;
VALUE sock2;
- struct sockaddr_storage buf;
+ char buf[1024];
socklen_t len = sizeof buf;
GetOpenFile(sock, fptr);
- sock2 = rsock_s_accept_nonblock(rb_cSocket, fptr, (struct sockaddr *)&buf, &len);
- return rb_assoc_new(sock2, rsock_io_socket_addrinfo(sock2, (struct sockaddr*)&buf, len));
+ sock2 = s_accept_nonblock(rb_cSocket, fptr, (struct sockaddr *)buf, &len);
+ return rb_assoc_new(sock2, rb_str_new(buf, len));
}
/*
@@ -812,38 +3153,26 @@ sock_accept_nonblock(VALUE sock)
* * Socket#accept
*/
static VALUE
-sock_sysaccept(VALUE sock)
+sock_sysaccept(sock)
+ VALUE sock;
{
rb_io_t *fptr;
VALUE sock2;
- struct sockaddr_storage buf;
+ char buf[1024];
socklen_t len = sizeof buf;
GetOpenFile(sock, fptr);
- sock2 = rsock_s_accept(0,fptr->fd,(struct sockaddr*)&buf,&len);
+ sock2 = s_accept(0,fileno(fptr->f),(struct sockaddr*)buf,&len);
- return rb_assoc_new(sock2, rsock_io_socket_addrinfo(sock2, (struct sockaddr*)&buf, len));
+ return rb_assoc_new(sock2, rb_str_new(buf, len));
}
#ifdef HAVE_GETHOSTNAME
-/*
- * call-seq:
- * Socket.gethostname => hostname
- *
- * Returns the hostname.
- *
- * Note that it is not guaranteed to be able to convert to IP address using gethostbyname, getaddrinfo, etc.
- *
- * p Socket.gethostname #=> "hal"
- *
- */
static VALUE
-sock_gethostname(VALUE obj)
+sock_gethostname(obj)
+ VALUE obj;
{
-#ifndef HOST_NAME_MAX
-# define HOST_NAME_MAX 1024
-#endif
- char buf[HOST_NAME_MAX+1];
+ char buf[1024];
rb_secure(3);
if (gethostname(buf, (int)sizeof buf - 1) < 0)
@@ -858,7 +3187,8 @@ sock_gethostname(VALUE obj)
#include <sys/utsname.h>
static VALUE
-sock_gethostname(VALUE obj)
+sock_gethostname(obj)
+ VALUE obj;
{
struct utsname un;
@@ -867,12 +3197,18 @@ sock_gethostname(VALUE obj)
return rb_str_new2(un.nodename);
}
#else
-#define sock_gethostname rb_f_notimplement
+static VALUE
+sock_gethostname(obj)
+ VALUE obj;
+{
+ rb_notimplement();
+}
#endif
#endif
static VALUE
-make_addrinfo(struct addrinfo *res0)
+make_addrinfo(res0)
+ struct addrinfo *res0;
{
VALUE base, ary;
struct addrinfo *res;
@@ -882,10 +3218,7 @@ make_addrinfo(struct addrinfo *res0)
}
base = rb_ary_new();
for (res = res0; res; res = res->ai_next) {
- ary = rsock_ipaddr(res->ai_addr, rsock_do_not_reverse_lookup);
- if (res->ai_canonname) {
- RARRAY_PTR(ary)[2] = rb_str_new2(res->ai_canonname);
- }
+ ary = ipaddr(res->ai_addr);
rb_ary_push(ary, INT2FIX(res->ai_family));
rb_ary_push(ary, INT2FIX(res->ai_socktype));
rb_ary_push(ary, INT2FIX(res->ai_protocol));
@@ -894,8 +3227,11 @@ make_addrinfo(struct addrinfo *res0)
return base;
}
-static VALUE
-sock_sockaddr(struct sockaddr *addr, size_t len)
+/* Returns a String containing the binary value of a struct sockaddr. */
+VALUE
+sock_sockaddr(addr, len)
+ struct sockaddr *addr;
+ size_t len;
{
char *ptr;
@@ -918,51 +3254,132 @@ sock_sockaddr(struct sockaddr *addr, size_t len)
}
/*
- * call-seq:
- * Socket.gethostbyname(hostname) => [official_hostname, alias_hostnames, address_family, *address_list]
+ * Document-class: IPSocket
*
- * Obtains the host information for _hostname_.
+ * IPSocket is the parent of TCPSocket and UDPSocket and implements
+ * functionality common to them.
*
- * p Socket.gethostbyname("hal") #=> ["localhost", ["hal"], 2, "\x7F\x00\x00\x01"]
+ * A number of APIs in IPSocket, Socket, and their descendants return an
+ * address as an array. The members of that array are:
+ * - address family: A string like "AF_INET" or "AF_INET6" if it is one of the
+ * commonly used families, the string "unknown:#" (where `#' is the address
+ * family number) if it is not one of the common ones. The strings map to
+ * the Socket::AF_* constants.
+ * - port: The port number.
+ * - name: Either the canonical name from looking the address up in the DNS, or
+ * the address in presentation format
+ * - address: The address in presentation format (a dotted decimal string for
+ * IPv4, a hex string for IPv6).
*
+ * The address and port can be used directly to create sockets and to bind or
+ * connect them to the address.
*/
-static VALUE
-sock_s_gethostbyname(VALUE obj, VALUE host)
-{
- rb_secure(3);
- return rsock_make_hostent(host, rsock_addrinfo(host, Qnil, SOCK_STREAM, AI_CANONNAME), sock_sockaddr);
-}
/*
- * call-seq:
- * Socket.gethostbyaddr(address_string [, address_family]) => hostent
+ * Document-class: Socket
+ *
+ * Socket contains a number of generally useful singleton methods and
+ * constants, as well as offering low-level interfaces that can be used to
+ * develop socket applications using protocols other than TCP, UDP, and UNIX
+ * domain sockets.
+ */
+
+/*
+ * Document-method: gethostbyname
+ * call-seq: Socket.gethostbyname(host) => hostent
+ *
+ * Resolve +host+ and return name and address information for it, similarly to
+ * gethostbyname(3). +host+ can be a domain name or the presentation format of
+ * an address.
+ *
+ * Returns an array of information similar to that found in a +struct hostent+:
+ * - cannonical name: the cannonical name for host in the DNS, or a
+ * string representing the address
+ * - aliases: an array of aliases for the canonical name, there may be no aliases
+ * - address family: usually one of Socket::AF_INET or Socket::AF_INET6
+ * - address: a string, the binary value of the +struct sockaddr+ for this name, in
+ * the indicated address family
+ * - ...: if there are multiple addresses for this host, a series of
+ * strings/+struct sockaddr+s may follow, not all necessarily in the same
+ * address family. Note that the fact that they may not be all in the same
+ * address family is a departure from the behaviour of gethostbyname(3).
+ *
+ * Note: I believe that the fact that the multiple addresses returned are not
+ * necessarily in the same address family may be a bug, since if this function
+ * actually called gethostbyname(3), ALL the addresses returned in the trailing
+ * address list (h_addr_list from struct hostent) would be of the same address
+ * family! Examples from my system, OS X 10.3:
+ *
+ * ["localhost", [], 30, "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001", "\177\000\000\001"]
+ * and
+ * ["ensemble.local", [], 30, "\376\200\000\004\000\000\000\000\002\003\223\377\376\255\010\214", "\300\250{\232" ]
+ *
+ * Similar information can be returned by Socket.getaddrinfo if called as:
*
- * Obtains the host information for _address_.
+ * Socket.getaddrinfo(+host+, 0, Socket::AF_UNSPEC, Socket::SOCK_STREAM, nil, Socket::AI_CANONNAME)
*
- * p Socket.gethostbyaddr([221,186,184,68].pack("CCCC"))
- * #=> ["carbon.ruby-lang.org", [], 2, "\xDD\xBA\xB8D"]
+ * == Examples
+ *
+ * Socket.gethostbyname "example.com"
+ * => ["example.com", [], 2, "\300\000\"\246"]
+ *
+ * This name has no DNS aliases, and a single IPv4 address.
+ *
+ * Socket.gethostbyname "smtp.telus.net"
+ * => ["smtp.svc.telus.net", ["smtp.telus.net"], 2, "\307\271\334\371"]
+ *
+ * This name is an an alias so the canonical name is returned, as well as the
+ * alias and a single IPv4 address.
+ *
+ * Socket.gethostbyname "localhost"
+ * => ["localhost", [], 30, "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001", "\177\000\000\001"]
+ *
+ * This machine has no aliases, returns an IPv6 address, and has an additional IPv4 address.
+ *
+ * +host+ can also be an IP address in presentation format, in which case a
+ * reverse lookup is done on the address:
+ *
+ * Socket.gethostbyname("127.0.0.1")
+ * => ["localhost", [], 2, "\177\000\000\001"]
+ *
+ * Socket.gethostbyname("192.0.34.166")
+ * => ["www.example.com", [], 2, "\300\000\"\246"]
+ *
+ *
+ * == See
+ * See: Socket.getaddrinfo
*/
static VALUE
-sock_s_gethostbyaddr(int argc, VALUE *argv)
+sock_s_gethostbyname(obj, host)
+ VALUE obj, host;
{
- VALUE addr, family;
+ rb_secure(3);
+ return make_hostent(host, sock_addrinfo(host, Qnil, SOCK_STREAM, AI_CANONNAME), sock_sockaddr);
+}
+
+static VALUE
+sock_s_gethostbyaddr(argc, argv)
+ int argc;
+ VALUE *argv;
+{
+ VALUE addr, type;
struct hostent *h;
struct sockaddr *sa;
char **pch;
VALUE ary, names;
int t = AF_INET;
- rb_scan_args(argc, argv, "11", &addr, &family);
+ rb_scan_args(argc, argv, "11", &addr, &type);
sa = (struct sockaddr*)StringValuePtr(addr);
- if (!NIL_P(family)) {
- t = rsock_family_arg(family);
+ if (!NIL_P(type)) {
+ t = NUM2INT(type);
}
#ifdef INET6
- else if (RSTRING_LEN(addr) == 16) {
+ else if (RSTRING(addr)->len == 16) {
t = AF_INET6;
}
#endif
- h = gethostbyaddr(RSTRING_PTR(addr), RSTRING_LEN(addr), t);
+ h = gethostbyaddr(RSTRING(addr)->ptr, RSTRING(addr)->len, t);
if (h == NULL) {
#ifdef HAVE_HSTRERROR
extern int h_errno;
@@ -993,119 +3410,215 @@ sock_s_gethostbyaddr(int argc, VALUE *argv)
}
/*
- * call-seq:
- * Socket.getservbyname(service_name) => port_number
- * Socket.getservbyname(service_name, protocol_name) => port_number
- *
- * Obtains the port number for _service_name_.
+ * Document-method: getservbyname
+ * call-seq: Socket.getservbyname(name, proto="tcp") => port
*
- * If _protocol_name_ is not given, "tcp" is assumed.
+ * +name+ is a service name ("ftp", "telnet", ...) and proto is a protocol name
+ * ("udp", "tcp", ...). '/etc/services' (or your system's equivalent) is
+ * searched for a service for +name+ and +proto+, and the port number is
+ * returned.
*
- * Socket.getservbyname("smtp") #=> 25
- * Socket.getservbyname("shell") #=> 514
- * Socket.getservbyname("syslog", "udp") #=> 514
- */
+ * Note that unlike Socket.getaddrinfo, +proto+ may not be specified using the
+ * Socket::SOCK_* constants, a string must must be used.
+ */
static VALUE
-sock_s_getservbyname(int argc, VALUE *argv)
+sock_s_getservbyaname(argc, argv)
+ int argc;
+ VALUE *argv;
{
VALUE service, proto;
struct servent *sp;
int port;
- const char *servicename, *protoname = "tcp";
rb_scan_args(argc, argv, "11", &service, &proto);
+ if (NIL_P(proto)) proto = rb_str_new2("tcp");
StringValue(service);
- if (!NIL_P(proto)) StringValue(proto);
- servicename = StringValueCStr(service);
- if (!NIL_P(proto)) protoname = StringValueCStr(proto);
- sp = getservbyname(servicename, protoname);
+ StringValue(proto);
+
+ sp = getservbyname(StringValueCStr(service), StringValueCStr(proto));
if (sp) {
port = ntohs(sp->s_port);
}
else {
+ char *s = RSTRING(service)->ptr;
char *end;
- port = STRTOUL(servicename, &end, 0);
+ port = strtoul(s, &end, 0);
if (*end != '\0') {
- rb_raise(rb_eSocket, "no such service %s/%s", servicename, protoname);
+ rb_raise(rb_eSocket, "no such service %s/%s", s, RSTRING(proto)->ptr);
}
}
return INT2FIX(port);
}
/*
- * call-seq:
- * Socket.getservbyport(port [, protocol_name]) => service
- *
- * Obtains the port number for _port_.
- *
- * If _protocol_name_ is not given, "tcp" is assumed.
- *
- * Socket.getservbyport(80) #=> "www"
- * Socket.getservbyport(514, "tcp") #=> "shell"
- * Socket.getservbyport(514, "udp") #=> "syslog"
- *
- */
-static VALUE
-sock_s_getservbyport(int argc, VALUE *argv)
-{
- VALUE port, proto;
- struct servent *sp;
- long portnum;
- const char *protoname = "tcp";
+Documentation should explain the following:
- rb_scan_args(argc, argv, "11", &port, &proto);
- portnum = NUM2LONG(port);
- if (portnum != (uint16_t)portnum) {
- const char *s = portnum > 0 ? "big" : "small";
- rb_raise(rb_eRangeError, "integer %ld too %s to convert into `int16_t'", portnum, s);
- }
- if (!NIL_P(proto)) protoname = StringValueCStr(proto);
+ $ pp Socket.getaddrinfo("", 1, Socket::AF_UNSPEC, Socket::SOCK_STREAM, 0, Socket::AI_PASSIVE)
+ [["AF_INET", 1, "0.0.0.0", "0.0.0.0", 2, 1, 6]]
- sp = getservbyport((int)htons((uint16_t)portnum), protoname);
- if (!sp) {
- rb_raise(rb_eSocket, "no such service for port %d/%s", (int)portnum, protoname);
- }
- return rb_tainted_str_new2(sp->s_name);
-}
+ $ pp Socket.getaddrinfo(nil, 1, Socket::AF_UNSPEC, Socket::SOCK_STREAM, 0, Socket::AI_PASSIVE)
+ [["AF_INET6", 1, "::", "::", 30, 1, 6],
+ ["AF_INET", 1, "0.0.0.0", "0.0.0.0", 2, 1, 6]]
+
+ $ pp Socket.getaddrinfo("localhost", 1, Socket::AF_UNSPEC, Socket::SOCK_STREAM, 0, Socket::AI_PASSIVE)
+ [["AF_INET6", 1, "localhost", "::1", 30, 1, 6],
+ ["AF_INET", 1, "localhost", "127.0.0.1", 2, 1, 6]]
+
+ $ pp Socket.getaddrinfo("ensemble.local.", 1, Socket::AF_UNSPEC, Socket::SOCK_STREAM, 0, Socket::AI_PASSIVE)
+ [["AF_INET", 1, "localhost", "192.168.123.154", 2, 1, 6]]
+
+Does it?
+
+API suggestion: this method has too many arguments, it would be backwards compatible and easier
+to understand if limit args were accepted as :family=>..., :flags=>...
+*/
/*
- * call-seq:
- * Socket.getaddrinfo(nodename, servname[, family[, socktype[, protocol[, flags]]]]) => array
+ * Document-method: getaddrinfo
+ * call-seq: Socket.getaddrinfo(host, service, family=nil, socktype=nil, protocol=nil, flags=nil) => addrinfo
+ *
+ * Return address information for +host+ and +port+. The remaining arguments
+ * are hints that limit the address information returned.
+ *
+ * This method corresponds closely to the POSIX.1g getaddrinfo() definition.
+ *
+ * === Parameters
+ * - +host+ is a host name or an address string (dotted decimal for IPv4, or a hex string
+ * for IPv6) for which to return information. A nil is also allowed, its meaning
+ * depends on +flags+, see below.
+ * - +service+ is a service name ("http", "ssh", ...), or
+ * a port number (80, 22, ...), see Socket.getservbyname for more
+ * information. A nil is also allowed, meaning zero.
+ * - +family+ limits the output to a specific address family, one of the
+ * Socket::AF_* constants. Socket::AF_INET (IPv4) and Socket::AF_INET6 (IPv6)
+ * are the most commonly used families. You will usually pass either nil or
+ * Socket::AF_UNSPEC, allowing the IPv6 information to be returned first if
+ * +host+ is reachable via IPv6, and IPv4 information otherwise. The two
+ * strings "AF_INET" or "AF_INET6" are also allowed, they are converted to
+ * their respective Socket::AF_* constants.
+ * - +socktype+ limits the output to a specific type of socket, one of the
+ * Socket::SOCK_* constants. Socket::SOCK_STREAM (for TCP) and
+ * Socket::SOCK_DGRAM (for UDP) are the most commonly used socket types. If
+ * nil, then information for all types of sockets supported by +service+ will
+ * be returned. You will usually know what type of socket you intend to
+ * create, and should pass that socket type in.
+ * - +protocol+ limits the output to a specific protocol numpber, one of the
+ * Socket::IPPROTO_* constants. It is usually implied by the socket type
+ * (Socket::SOCK_STREAM => Socket::IPPROTO_TCP, ...), if you pass other than
+ * nil you already know what this is for.
+ * - +flags+ is one of the Socket::AI_* constants. They mean:
+ * - Socket::AI_PASSIVE: when set, if +host+ is nil the 'any' address will be
+ * returned, Socket::INADDR_ANY or 0 for IPv4, "0::0" or "::" for IPv6. This
+ * address is suitable for use by servers that will bind their socket and do
+ * a passive listen, thus the name of the flag. Otherwise the local or
+ * loopback address will be returned, this is "127.0.0.1" for IPv4 and "::1'
+ * for IPv6.
+ * - ...
*
- * Obtains address information for _nodename_:_servname_.
*
- * _family_ should be an address family such as: :INET, :INET6, :UNIX, etc.
+ * === Returns
*
- * _socktype_ should be a socket type such as: :STREAM, :DGRAM, :RAW, etc.
+ * Returns an array of arrays, where each subarray contains:
+ * - address family, a string like "AF_INET" or "AF_INET6"
+ * - port number, the port number for +service+
+ * - host name, either a canonical name for +host+, or it's address in presentation
+ * format if the address could not be looked up.
+ * - host IP, the address of +host+ in presentation format
+ * - address family, as a numeric value (one of the Socket::AF_* constants).
+ * - socket type, as a numeric value (one of the Socket::SOCK_* constants).
+ * - protocol number, as a numeric value (one of the Socket::IPPROTO_* constants).
*
- * _protocol_ should be a protocol defined in the family.
- * 0 is default protocol for the family.
+ * The first four values are identical to what is commonly returned as an
+ * address array, see IPSocket for more information.
*
- * _flags_ should be bitwise OR of Socket::AI_* constants.
+ * === Examples
*
- * Socket.getaddrinfo("www.ruby-lang.org", "http", nil, :STREAM)
- * #=> [["AF_INET", 80, "carbon.ruby-lang.org", "221.186.184.68", 2, 1, 6]] # PF_INET/SOCK_STREAM/IPPROTO_TCP
+ * Not all input combinations are valid, and while there are many combinations,
+ * only a few cases are common.
*
- * Socket.getaddrinfo("localhost", nil)
- * #=> [["AF_INET", 0, "localhost", "127.0.0.1", 2, 1, 6], # PF_INET/SOCK_STREAM/IPPROTO_TCP
- * # ["AF_INET", 0, "localhost", "127.0.0.1", 2, 2, 17], # PF_INET/SOCK_DGRAM/IPPROTO_UDP
- * # ["AF_INET", 0, "localhost", "127.0.0.1", 2, 3, 0]] # PF_INET/SOCK_RAW/IPPROTO_IP
+ * A typical client will call getaddrinfo with the +host+ and +service+ it
+ * wants to connect to. It knows that it will attempt to connect with either
+ * TCP or UDP, and specifies +socktype+ accordingly. It loops through all
+ * returned addresses, and try to connect to them in turn:
*
+ * addrinfo = Socket::getaddrinfo('www.example.com', 'www', nil, Socket::SOCK_STREAM)
+ * addrinfo.each do |af, port, name, addr|
+ * begin
+ * sock = TCPSocket.new(addr, port)
+ * # ...
+ * exit 1
+ * rescue
+ * end
+ * end
+ *
+ * With UDP you don't know if connect suceeded, but if communication fails,
+ * the next address can be tried.
+ *
+ * A typical server will call getaddrinfo with a +host+ of nil, the +service+
+ * it listens to, and a +flags+ of Socket::AI_PASSIVE. It will listen for
+ * connections on the first returned address:
+ * addrinfo = Socket::getaddrinfo(nil, 'www', nil, Socket::SOCK_STREAM, nil, Socket::AI_PASSIVE)
+ * af, port, name, addr = addrinfo.first
+ * sock = TCPServer(addr, port)
+ * while( client = s.accept )
+ * # ...
+ * end
*/
static VALUE
-sock_s_getaddrinfo(int argc, VALUE *argv)
+sock_s_getaddrinfo(argc, argv)
+ int argc;
+ VALUE *argv;
{
VALUE host, port, family, socktype, protocol, flags, ret;
+ char hbuf[1024], pbuf[1024];
+ char *hptr, *pptr, *ap;
struct addrinfo hints, *res;
+ int error;
+ host = port = family = socktype = protocol = flags = Qnil;
rb_scan_args(argc, argv, "24", &host, &port, &family, &socktype, &protocol, &flags);
+ if (NIL_P(host)) {
+ hptr = NULL;
+ }
+ else {
+ strncpy(hbuf, StringValuePtr(host), sizeof(hbuf));
+ hbuf[sizeof(hbuf) - 1] = '\0';
+ hptr = hbuf;
+ }
+ if (NIL_P(port)) {
+ pptr = NULL;
+ }
+ else if (FIXNUM_P(port)) {
+ snprintf(pbuf, sizeof(pbuf), "%ld", FIX2LONG(port));
+ pptr = pbuf;
+ }
+ else {
+ strncpy(pbuf, StringValuePtr(port), sizeof(pbuf));
+ pbuf[sizeof(pbuf) - 1] = '\0';
+ pptr = pbuf;
+ }
MEMZERO(&hints, struct addrinfo, 1);
- hints.ai_family = NIL_P(family) ? PF_UNSPEC : rsock_family_arg(family);
+ if (NIL_P(family)) {
+ hints.ai_family = PF_UNSPEC;
+ }
+ else if (FIXNUM_P(family)) {
+ hints.ai_family = FIX2INT(family);
+ }
+ else if ((ap = StringValuePtr(family)) != 0) {
+ if (strcmp(ap, "AF_INET") == 0) {
+ hints.ai_family = PF_INET;
+ }
+#ifdef INET6
+ else if (strcmp(ap, "AF_INET6") == 0) {
+ hints.ai_family = PF_INET6;
+ }
+#endif
+ }
if (!NIL_P(socktype)) {
- hints.ai_socktype = rsock_socktype_arg(socktype);
+ hints.ai_socktype = NUM2INT(socktype);
}
if (!NIL_P(protocol)) {
hints.ai_protocol = NUM2INT(protocol);
@@ -1113,34 +3626,20 @@ sock_s_getaddrinfo(int argc, VALUE *argv)
if (!NIL_P(flags)) {
hints.ai_flags = NUM2INT(flags);
}
- res = rsock_getaddrinfo(host, port, &hints, 0);
+ error = getaddrinfo(hptr, pptr, &hints, &res);
+ if (error) {
+ rb_raise(rb_eSocket, "getaddrinfo: %s", gai_strerror(error));
+ }
ret = make_addrinfo(res);
freeaddrinfo(res);
return ret;
}
-/*
- * call-seq:
- * Socket.getnameinfo(sockaddr [, flags]) => [hostname, servicename]
- *
- * Obtains name information for _sockaddr_.
- *
- * _sockaddr_ should be one of follows.
- * - packed sockddr string such as Socket.sockaddr_in(80, "127.0.0.1")
- * - 3-elements array such as ["AF_INET", 80, "127.0.0.1"]
- * - 4-elements array such as ["AF_INET", 80, ignored, "127.0.0.1"]
- *
- * _flags_ should be bitwise OR of Socket::NI_* constants.
- *
- * Note that the last form is compatible with IPSocket#{addr,peeraddr}.
- *
- * Socket.getnameinfo(Socket.sockaddr_in(80, "127.0.0.1")) #=> ["localhost", "www"]
- * Socket.getnameinfo(["AF_INET", 80, "127.0.0.1"]) #=> ["localhost", "www"]
- * Socket.getnameinfo(["AF_INET", 80, "localhost", "127.0.0.1"]) #=> ["localhost", "www"]
- */
static VALUE
-sock_s_getnameinfo(int argc, VALUE *argv)
+sock_s_getnameinfo(argc, argv)
+ int argc;
+ VALUE *argv;
{
VALUE sa, af = Qnil, host = Qnil, port = Qnil, flags, tmp;
char *hptr, *pptr;
@@ -1150,6 +3649,7 @@ sock_s_getnameinfo(int argc, VALUE *argv)
int error;
struct sockaddr_storage ss;
struct sockaddr *sap;
+ char *ap;
sa = flags = Qnil;
rb_scan_args(argc, argv, "11", &sa, &flags);
@@ -1158,14 +3658,14 @@ sock_s_getnameinfo(int argc, VALUE *argv)
if (!NIL_P(flags)) {
fl = NUM2INT(flags);
}
- tmp = rb_check_sockaddr_string_type(sa);
+ tmp = rb_check_string_type(sa);
if (!NIL_P(tmp)) {
sa = tmp;
- if (sizeof(ss) < (size_t)RSTRING_LEN(sa)) {
+ if (sizeof(ss) < RSTRING(sa)->len) {
rb_raise(rb_eTypeError, "sockaddr length too big");
}
- memcpy(&ss, RSTRING_PTR(sa), RSTRING_LEN(sa));
- if ((size_t)RSTRING_LEN(sa) != SS_LEN(&ss)) {
+ memcpy(&ss, RSTRING(sa)->ptr, RSTRING(sa)->len);
+ if (RSTRING(sa)->len != SA_LEN((struct sockaddr*)&ss)) {
rb_raise(rb_eTypeError, "sockaddr size differs - should not happen");
}
sap = (struct sockaddr*)&ss;
@@ -1175,22 +3675,22 @@ sock_s_getnameinfo(int argc, VALUE *argv)
if (!NIL_P(tmp)) {
sa = tmp;
MEMZERO(&hints, struct addrinfo, 1);
- if (RARRAY_LEN(sa) == 3) {
- af = RARRAY_PTR(sa)[0];
- port = RARRAY_PTR(sa)[1];
- host = RARRAY_PTR(sa)[2];
+ if (RARRAY(sa)->len == 3) {
+ af = RARRAY(sa)->ptr[0];
+ port = RARRAY(sa)->ptr[1];
+ host = RARRAY(sa)->ptr[2];
}
- else if (RARRAY_LEN(sa) >= 4) {
- af = RARRAY_PTR(sa)[0];
- port = RARRAY_PTR(sa)[1];
- host = RARRAY_PTR(sa)[3];
+ else if (RARRAY(sa)->len >= 4) {
+ af = RARRAY(sa)->ptr[0];
+ port = RARRAY(sa)->ptr[1];
+ host = RARRAY(sa)->ptr[3];
if (NIL_P(host)) {
- host = RARRAY_PTR(sa)[2];
+ host = RARRAY(sa)->ptr[2];
}
else {
/*
* 4th element holds numeric form, don't resolve.
- * see rsock_ipaddr().
+ * see ipaddr().
*/
#ifdef AI_NUMERICHOST /* AIX 4.3.3 doesn't have AI_NUMERICHOST. */
hints.ai_flags |= AI_NUMERICHOST;
@@ -1199,7 +3699,7 @@ sock_s_getnameinfo(int argc, VALUE *argv)
}
else {
rb_raise(rb_eArgError, "array size should be 3 or 4, %ld given",
- RARRAY_LEN(sa));
+ RARRAY(sa)->len);
}
/* host */
if (NIL_P(host)) {
@@ -1226,8 +3726,23 @@ sock_s_getnameinfo(int argc, VALUE *argv)
}
hints.ai_socktype = (fl & NI_DGRAM) ? SOCK_DGRAM : SOCK_STREAM;
/* af */
- hints.ai_family = NIL_P(af) ? PF_UNSPEC : rsock_family_arg(af);
- error = rb_getaddrinfo(hptr, pptr, &hints, &res);
+ if (NIL_P(af)) {
+ hints.ai_family = PF_UNSPEC;
+ }
+ else if (FIXNUM_P(af)) {
+ hints.ai_family = FIX2INT(af);
+ }
+ else if ((ap = StringValuePtr(af)) != 0) {
+ if (strcmp(ap, "AF_INET") == 0) {
+ hints.ai_family = PF_INET;
+ }
+#ifdef INET6
+ else if (strcmp(ap, "AF_INET6") == 0) {
+ hints.ai_family = PF_INET6;
+ }
+#endif
+ }
+ error = getaddrinfo(hptr, pptr, &hints, &res);
if (error) goto error_exit_addr;
sap = res->ai_addr;
}
@@ -1236,16 +3751,16 @@ sock_s_getnameinfo(int argc, VALUE *argv)
}
call_nameinfo:
- error = rb_getnameinfo(sap, SA_LEN(sap), hbuf, sizeof(hbuf),
- pbuf, sizeof(pbuf), fl);
+ error = getnameinfo(sap, SA_LEN(sap), hbuf, sizeof(hbuf),
+ pbuf, sizeof(pbuf), fl);
if (error) goto error_exit_name;
if (res) {
for (r = res->ai_next; r; r = r->ai_next) {
char hbuf2[1024], pbuf2[1024];
sap = r->ai_addr;
- error = rb_getnameinfo(sap, SA_LEN(sap), hbuf2, sizeof(hbuf2),
- pbuf2, sizeof(pbuf2), fl);
+ error = getnameinfo(sap, SA_LEN(sap), hbuf2, sizeof(hbuf2),
+ pbuf2, sizeof(pbuf2), fl);
if (error) goto error_exit_name;
if (strcmp(hbuf, hbuf2) != 0|| strcmp(pbuf, pbuf2) != 0) {
freeaddrinfo(res);
@@ -1258,31 +3773,18 @@ sock_s_getnameinfo(int argc, VALUE *argv)
error_exit_addr:
if (res) freeaddrinfo(res);
- rsock_raise_socket_error("getaddrinfo", error);
+ rb_raise(rb_eSocket, "getaddrinfo: %s", gai_strerror(error));
error_exit_name:
if (res) freeaddrinfo(res);
- rsock_raise_socket_error("getnameinfo", error);
+ rb_raise(rb_eSocket, "getnameinfo: %s", gai_strerror(error));
}
-/*
- * call-seq:
- * Socket.sockaddr_in(port, host) => sockaddr
- * Socket.pack_sockaddr_in(port, host) => sockaddr
- *
- * Packs _port_ and _host_ as an AF_INET/AF_INET6 sockaddr string.
- *
- * Socket.sockaddr_in(80, "127.0.0.1")
- * #=> "\x02\x00\x00P\x7F\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00"
- *
- * Socket.sockaddr_in(80, "::1")
- * #=> "\n\x00\x00P\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00"
- *
- */
static VALUE
-sock_s_pack_sockaddr_in(VALUE self, VALUE port, VALUE host)
+sock_s_pack_sockaddr_in(self, port, host)
+ VALUE self, port, host;
{
- struct addrinfo *res = rsock_addrinfo(host, port, 0, 0);
+ struct addrinfo *res = sock_addrinfo(host, port, 0, 0);
VALUE addr = rb_str_new((char*)res->ai_addr, res->ai_addrlen);
freeaddrinfo(res);
@@ -1292,31 +3794,14 @@ sock_s_pack_sockaddr_in(VALUE self, VALUE port, VALUE host)
return addr;
}
-/*
- * call-seq:
- * Socket.unpack_sockaddr_in(sockaddr) => [port, ip_address]
- *
- * Unpacks _sockaddr_ into port and ip_address.
- *
- * _sockaddr_ should be a string or an addrinfo for AF_INET/AF_INET6.
- *
- * sockaddr = Socket.sockaddr_in(80, "127.0.0.1")
- * p sockaddr #=> "\x02\x00\x00P\x7F\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00"
- * p Socket.unpack_sockaddr_in(sockaddr) #=> [80, "127.0.0.1"]
- *
- */
static VALUE
-sock_s_unpack_sockaddr_in(VALUE self, VALUE addr)
+sock_s_unpack_sockaddr_in(self, addr)
+ VALUE self, addr;
{
struct sockaddr_in * sockaddr;
VALUE host;
- sockaddr = (struct sockaddr_in*)SockAddrStringValuePtr(addr);
- if (RSTRING_LEN(addr) <
- (char*)&((struct sockaddr *)sockaddr)->sa_family +
- sizeof(((struct sockaddr *)sockaddr)->sa_family) -
- (char*)sockaddr)
- rb_raise(rb_eArgError, "too short sockaddr");
+ sockaddr = (struct sockaddr_in*)StringValuePtr(addr);
if (((struct sockaddr *)sockaddr)->sa_family != AF_INET
#ifdef INET6
&& ((struct sockaddr *)sockaddr)->sa_family != AF_INET6
@@ -1328,25 +3813,15 @@ sock_s_unpack_sockaddr_in(VALUE self, VALUE addr)
rb_raise(rb_eArgError, "not an AF_INET sockaddr");
#endif
}
- host = rsock_make_ipaddr((struct sockaddr*)sockaddr);
+ host = make_ipaddr((struct sockaddr*)sockaddr);
OBJ_INFECT(host, addr);
return rb_assoc_new(INT2NUM(ntohs(sockaddr->sin_port)), host);
}
#ifdef HAVE_SYS_UN_H
-
-/*
- * call-seq:
- * Socket.sockaddr_un(path) => sockaddr
- * Socket.pack_sockaddr_un(path) => sockaddr
- *
- * Packs _path_ as an AF_UNIX sockaddr string.
- *
- * Socket.sockaddr_un("/tmp/sock") #=> "\x01\x00/tmp/sock\x00\x00..."
- *
- */
static VALUE
-sock_s_pack_sockaddr_un(VALUE self, VALUE path)
+sock_s_pack_sockaddr_un(self, path)
+ VALUE self, path;
{
struct sockaddr_un sockaddr;
char *sun_path;
@@ -1366,42 +3841,26 @@ sock_s_pack_sockaddr_un(VALUE self, VALUE path)
return addr;
}
-/*
- * call-seq:
- * Socket.unpack_sockaddr_un(sockaddr) => path
- *
- * Unpacks _sockaddr_ into path.
- *
- * _sockaddr_ should be a string or an addrinfo for AF_UNIX.
- *
- * sockaddr = Socket.sockaddr_un("/tmp/sock")
- * p Socket.unpack_sockaddr_un(sockaddr) #=> "/tmp/sock"
- *
- */
static VALUE
-sock_s_unpack_sockaddr_un(VALUE self, VALUE addr)
+sock_s_unpack_sockaddr_un(self, addr)
+ VALUE self, addr;
{
struct sockaddr_un * sockaddr;
- const char *sun_path;
+ char *sun_path;
VALUE path;
- sockaddr = (struct sockaddr_un*)SockAddrStringValuePtr(addr);
- if (RSTRING_LEN(addr) <
- (char*)&((struct sockaddr *)sockaddr)->sa_family +
- sizeof(((struct sockaddr *)sockaddr)->sa_family) -
- (char*)sockaddr)
- rb_raise(rb_eArgError, "too short sockaddr");
+ sockaddr = (struct sockaddr_un*)StringValuePtr(addr);
if (((struct sockaddr *)sockaddr)->sa_family != AF_UNIX) {
rb_raise(rb_eArgError, "not an AF_UNIX sockaddr");
}
- if (sizeof(struct sockaddr_un) < (size_t)RSTRING_LEN(addr)) {
- rb_raise(rb_eTypeError, "too long sockaddr_un - %ld longer than %d",
- RSTRING_LEN(addr), (int)sizeof(struct sockaddr_un));
+ if (sizeof(struct sockaddr_un) < RSTRING(addr)->len) {
+ rb_raise(rb_eTypeError, "too long sockaddr_un - %ld longer than %d",
+ RSTRING(addr)->len, sizeof(struct sockaddr_un));
}
- sun_path = rsock_unixpath(sockaddr, RSTRING_LEN(addr));
- if (sizeof(struct sockaddr_un) == RSTRING_LEN(addr) &&
+ sun_path = unixpath(sockaddr, RSTRING(addr)->len);
+ if (sizeof(struct sockaddr_un) == RSTRING(addr)->len &&
sun_path == sockaddr->sun_path &&
- sun_path + strlen(sun_path) == RSTRING_PTR(addr) + RSTRING_LEN(addr)) {
+ sun_path + strlen(sun_path) == RSTRING(addr)->ptr + RSTRING(addr)->len) {
rb_raise(rb_eArgError, "sockaddr_un.sun_path not NUL terminated");
}
path = rb_str_new2(sun_path);
@@ -1410,363 +3869,23 @@ sock_s_unpack_sockaddr_un(VALUE self, VALUE addr)
}
#endif
-#if defined(HAVE_GETIFADDRS) || defined(SIOCGLIFCONF) || defined(SIOCGIFCONF) || defined(_WIN32)
-static VALUE
-sockaddr_obj(struct sockaddr *addr)
-{
- socklen_t len;
-#if defined(AF_INET6) && defined(__KAME__)
- struct sockaddr_in6 addr6;
-#endif
-
- if (addr == NULL)
- return Qnil;
-
- switch (addr->sa_family) {
- case AF_INET:
- len = sizeof(struct sockaddr_in);
- break;
-
-#ifdef AF_INET6
- case AF_INET6:
- len = sizeof(struct sockaddr_in6);
-# ifdef __KAME__
- /* KAME uses the 2nd 16bit word of link local IPv6 address as interface index internally */
- /* http://orange.kame.net/dev/cvsweb.cgi/kame/IMPLEMENTATION */
- /* convert fe80:1::1 to fe80::1%1 */
- memcpy(&addr6, addr, len);
- addr = (struct sockaddr *)&addr6;
- if (IN6_IS_ADDR_LINKLOCAL(&addr6.sin6_addr) &&
- addr6.sin6_scope_id == 0 &&
- (addr6.sin6_addr.s6_addr[2] || addr6.sin6_addr.s6_addr[3])) {
- addr6.sin6_scope_id = (addr6.sin6_addr.s6_addr[2] << 8) | addr6.sin6_addr.s6_addr[3];
- addr6.sin6_addr.s6_addr[2] = 0;
- addr6.sin6_addr.s6_addr[3] = 0;
- }
-# endif
- break;
-#endif
-
-#ifdef HAVE_SYS_UN_H
- case AF_UNIX:
- len = sizeof(struct sockaddr_un);
- break;
-#endif
+static VALUE mConst;
- default:
- len = sizeof(struct sockaddr_in);
- break;
- }
-#ifdef SA_LEN
- if (len < SA_LEN(addr))
- len = SA_LEN(addr);
-#endif
-
- return rsock_addrinfo_new(addr, len, addr->sa_family, 0, 0, Qnil, Qnil);
-}
-#endif
-
-#if defined(HAVE_GETIFADDRS) || (defined(SIOCGLIFCONF) && defined(SIOCGLIFNUM) && !defined(__hpux)) || defined(SIOCGIFCONF) || defined(_WIN32)
-/*
- * call-seq:
- * Socket.ip_address_list => array
- *
- * Returns local IP addresses as an array.
- *
- * The array contains Addrinfo objects.
- *
- * pp Socket.ip_address_list
- * #=> [#<Addrinfo: 127.0.0.1>,
- * #<Addrinfo: 192.168.0.128>,
- * #<Addrinfo: ::1>,
- * ...]
- *
- */
-static VALUE
-socket_s_ip_address_list(VALUE self)
+static void
+sock_define_const(name, value)
+ char *name;
+ int value;
{
-#if defined(HAVE_GETIFADDRS)
- struct ifaddrs *ifp = NULL;
- struct ifaddrs *p;
- int ret;
- VALUE list;
-
- ret = getifaddrs(&ifp);
- if (ret == -1) {
- rb_sys_fail("getifaddrs");
- }
-
- list = rb_ary_new();
- for (p = ifp; p; p = p->ifa_next) {
- if (p->ifa_addr != NULL && IS_IP_FAMILY(p->ifa_addr->sa_family)) {
- rb_ary_push(list, sockaddr_obj(p->ifa_addr));
- }
- }
-
- freeifaddrs(ifp);
-
- return list;
-#elif defined(SIOCGLIFCONF) && defined(SIOCGLIFNUM) && !defined(__hpux)
- /* Solaris if_tcp(7P) */
- /* HP-UX has SIOCGLIFCONF too. But it uses differenet struct */
- int fd = -1;
- int ret;
- struct lifnum ln;
- struct lifconf lc;
- char *reason = NULL;
- int save_errno;
- int i;
- VALUE list = Qnil;
-
- lc.lifc_buf = NULL;
-
- fd = socket(AF_INET, SOCK_DGRAM, 0);
- if (fd == -1)
- rb_sys_fail("socket");
-
- memset(&ln, 0, sizeof(ln));
- ln.lifn_family = AF_UNSPEC;
-
- ret = ioctl(fd, SIOCGLIFNUM, &ln);
- if (ret == -1) {
- reason = "SIOCGLIFNUM";
- goto finish;
- }
-
- memset(&lc, 0, sizeof(lc));
- lc.lifc_family = AF_UNSPEC;
- lc.lifc_flags = 0;
- lc.lifc_len = sizeof(struct lifreq) * ln.lifn_count;
- lc.lifc_req = xmalloc(lc.lifc_len);
-
- ret = ioctl(fd, SIOCGLIFCONF, &lc);
- if (ret == -1) {
- reason = "SIOCGLIFCONF";
- goto finish;
- }
-
- close(fd);
- fd = -1;
-
- list = rb_ary_new();
- for (i = 0; i < ln.lifn_count; i++) {
- struct lifreq *req = &lc.lifc_req[i];
- if (IS_IP_FAMILY(req->lifr_addr.ss_family)) {
- rb_ary_push(list, sockaddr_obj((struct sockaddr *)&req->lifr_addr));
- }
- }
-
- finish:
- save_errno = errno;
- if (lc.lifc_buf != NULL)
- xfree(lc.lifc_req);
- if (fd != -1)
- close(fd);
- errno = save_errno;
-
- if (reason)
- rb_sys_fail(reason);
- return list;
-
-#elif defined(SIOCGIFCONF)
- int fd = -1;
- int ret;
-#define EXTRA_SPACE (sizeof(struct ifconf) + sizeof(struct sockaddr_storage))
- char initbuf[4096+EXTRA_SPACE];
- char *buf = initbuf;
- int bufsize;
- struct ifconf conf;
- struct ifreq *req;
- VALUE list = Qnil;
- const char *reason = NULL;
- int save_errno;
-
- fd = socket(AF_INET, SOCK_DGRAM, 0);
- if (fd == -1)
- rb_sys_fail("socket");
-
- bufsize = sizeof(initbuf);
- buf = initbuf;
-
- retry:
- conf.ifc_len = bufsize;
- conf.ifc_req = (struct ifreq *)buf;
-
- /* fprintf(stderr, "bufsize: %d\n", bufsize); */
-
- ret = ioctl(fd, SIOCGIFCONF, &conf);
- if (ret == -1) {
- reason = "SIOCGIFCONF";
- goto finish;
- }
-
- /* fprintf(stderr, "conf.ifc_len: %d\n", conf.ifc_len); */
-
- if (bufsize - EXTRA_SPACE < conf.ifc_len) {
- if (bufsize < conf.ifc_len) {
- /* NetBSD returns required size for all interfaces. */
- bufsize = conf.ifc_len + EXTRA_SPACE;
- }
- else {
- bufsize = bufsize << 1;
- }
- if (buf == initbuf)
- buf = NULL;
- buf = xrealloc(buf, bufsize);
- goto retry;
- }
-
- close(fd);
- fd = -1;
-
- list = rb_ary_new();
- req = conf.ifc_req;
- while ((char*)req < (char*)conf.ifc_req + conf.ifc_len) {
- struct sockaddr *addr = &req->ifr_addr;
- if (IS_IP_FAMILY(addr->sa_family)) {
- rb_ary_push(list, sockaddr_obj(addr));
- }
-#ifdef HAVE_SA_LEN
-# ifndef _SIZEOF_ADDR_IFREQ
-# define _SIZEOF_ADDR_IFREQ(r) \
- (sizeof(struct ifreq) + \
- (sizeof(struct sockaddr) < (r).ifr_addr.sa_len ? \
- (r).ifr_addr.sa_len - sizeof(struct sockaddr) : \
- 0))
-# endif
- req = (struct ifreq *)((char*)req + _SIZEOF_ADDR_IFREQ(*req));
-#else
- req = (struct ifreq *)((char*)req + sizeof(struct ifreq));
-#endif
- }
-
- finish:
-
- save_errno = errno;
- if (buf != initbuf)
- xfree(buf);
- if (fd != -1)
- close(fd);
- errno = save_errno;
-
- if (reason)
- rb_sys_fail(reason);
- return list;
-
-#undef EXTRA_SPACE
-#elif defined(_WIN32)
- typedef struct ip_adapter_unicast_address_st {
- unsigned LONG_LONG dummy0;
- struct ip_adapter_unicast_address_st *Next;
- struct {
- struct sockaddr *lpSockaddr;
- int iSockaddrLength;
- } Address;
- int dummy1;
- int dummy2;
- int dummy3;
- long dummy4;
- long dummy5;
- long dummy6;
- } ip_adapter_unicast_address_t;
- typedef struct ip_adapter_anycast_address_st {
- unsigned LONG_LONG dummy0;
- struct ip_adapter_anycast_address_st *Next;
- struct {
- struct sockaddr *lpSockaddr;
- int iSockaddrLength;
- } Address;
- } ip_adapter_anycast_address_t;
- typedef struct ip_adapter_addresses_st {
- unsigned LONG_LONG dummy0;
- struct ip_adapter_addresses_st *Next;
- void *dummy1;
- ip_adapter_unicast_address_t *FirstUnicastAddress;
- ip_adapter_anycast_address_t *FirstAnycastAddress;
- void *dummy2;
- void *dummy3;
- void *dummy4;
- void *dummy5;
- void *dummy6;
- BYTE dummy7[8];
- DWORD dummy8;
- DWORD dummy9;
- DWORD dummy10;
- DWORD IfType;
- int OperStatus;
- DWORD dummy12;
- DWORD dummy13[16];
- void *dummy14;
- } ip_adapter_addresses_t;
- typedef ULONG (WINAPI *GetAdaptersAddresses_t)(ULONG, ULONG, PVOID, ip_adapter_addresses_t *, PULONG);
- HMODULE h;
- GetAdaptersAddresses_t pGetAdaptersAddresses;
- ULONG len;
- DWORD ret;
- ip_adapter_addresses_t *adapters;
- VALUE list;
-
- h = LoadLibrary("iphlpapi.dll");
- if (!h)
- rb_notimplement();
- pGetAdaptersAddresses = (GetAdaptersAddresses_t)GetProcAddress(h, "GetAdaptersAddresses");
- if (!pGetAdaptersAddresses) {
- CloseHandle(h);
- rb_notimplement();
- }
-
- ret = pGetAdaptersAddresses(AF_UNSPEC, 0, NULL, NULL, &len);
- if (ret != ERROR_SUCCESS && ret != ERROR_BUFFER_OVERFLOW) {
- errno = rb_w32_map_errno(ret);
- CloseHandle(h);
- rb_sys_fail("GetAdaptersAddresses");
- }
- adapters = (ip_adapter_addresses_t *)ALLOCA_N(BYTE, len);
- ret = pGetAdaptersAddresses(AF_UNSPEC, 0, NULL, adapters, &len);
- if (ret != ERROR_SUCCESS) {
- errno = rb_w32_map_errno(ret);
- CloseHandle(h);
- rb_sys_fail("GetAdaptersAddresses");
- }
-
- list = rb_ary_new();
- for (; adapters; adapters = adapters->Next) {
- ip_adapter_unicast_address_t *uni;
- ip_adapter_anycast_address_t *any;
- if (adapters->OperStatus != 1) /* 1 means IfOperStatusUp */
- continue;
- for (uni = adapters->FirstUnicastAddress; uni; uni = uni->Next) {
-#ifndef INET6
- if (uni->Address.lpSockaddr->sa_family == AF_INET)
-#else
- if (IS_IP_FAMILY(uni->Address.lpSockaddr->sa_family))
-#endif
- rb_ary_push(list, sockaddr_obj(uni->Address.lpSockaddr));
- }
- for (any = adapters->FirstAnycastAddress; any; any = any->Next) {
-#ifndef INET6
- if (any->Address.lpSockaddr->sa_family == AF_INET)
-#else
- if (IS_IP_FAMILY(any->Address.lpSockaddr->sa_family))
-#endif
- rb_ary_push(list, sockaddr_obj(any->Address.lpSockaddr));
- }
- }
-
- CloseHandle(h);
- return list;
-#endif
+ rb_define_const(rb_cSocket, name, INT2FIX(value));
+ rb_define_const(mConst, name, INT2FIX(value));
}
-#else
-#define socket_s_ip_address_list rb_f_notimplement
-#endif
/*
* Class +Socket+ provides access to the underlying operating system
* socket implementations. It can be used to provide more operating system
* specific functionality than the protocol-specific socket classes but at the
* expense of greater complexity. In particular, the class handles addresses
- * using +struct+ sockaddr structures packed into Ruby strings, which can be
+ * using +struct sockaddr+ structures packed into Ruby strings, which can be
* a joy to manipulate.
*
* === Exception Handling
@@ -1789,13 +3908,90 @@ socket_s_ip_address_list(VALUE self)
void
Init_socket()
{
- Init_basicsocket();
+ rb_eSocket = rb_define_class("SocketError", rb_eStandardError);
+
+ rb_cBasicSocket = rb_define_class("BasicSocket", rb_cIO);
+ rb_undef_method(rb_cBasicSocket, "initialize");
+
+ rb_define_singleton_method(rb_cBasicSocket, "do_not_reverse_lookup",
+ bsock_do_not_rev_lookup, 0);
+ rb_define_singleton_method(rb_cBasicSocket, "do_not_reverse_lookup=",
+ bsock_do_not_rev_lookup_set, 1);
+ rb_define_singleton_method(rb_cBasicSocket, "for_fd", bsock_s_for_fd, 1);
+
+ rb_define_method(rb_cBasicSocket, "close_read", bsock_close_read, 0);
+ rb_define_method(rb_cBasicSocket, "close_write", bsock_close_write, 0);
+ rb_define_method(rb_cBasicSocket, "shutdown", bsock_shutdown, -1);
+ rb_define_method(rb_cBasicSocket, "setsockopt", bsock_setsockopt, 3);
+ rb_define_method(rb_cBasicSocket, "getsockopt", bsock_getsockopt, 2);
+ rb_define_method(rb_cBasicSocket, "getsockname", bsock_getsockname, 0);
+ rb_define_method(rb_cBasicSocket, "getpeername", bsock_getpeername, 0);
+ rb_define_method(rb_cBasicSocket, "send", bsock_send, -1);
+ rb_define_method(rb_cBasicSocket, "recv", bsock_recv, -1);
+ rb_define_method(rb_cBasicSocket, "recv_nonblock", bsock_recv_nonblock, -1);
+
+ rb_cIPSocket = rb_define_class("IPSocket", rb_cBasicSocket);
+ rb_define_global_const("IPsocket", rb_cIPSocket);
+ rb_define_method(rb_cIPSocket, "addr", ip_addr, 0);
+ rb_define_method(rb_cIPSocket, "peeraddr", ip_peeraddr, 0);
+ rb_define_method(rb_cIPSocket, "recvfrom", ip_recvfrom, -1);
+ rb_define_singleton_method(rb_cIPSocket, "getaddress", ip_s_getaddress, 1);
+
+ rb_cTCPSocket = rb_define_class("TCPSocket", rb_cIPSocket);
+ rb_define_global_const("TCPsocket", rb_cTCPSocket);
+ rb_define_singleton_method(rb_cTCPSocket, "gethostbyname", tcp_s_gethostbyname, 1);
+ rb_define_method(rb_cTCPSocket, "initialize", tcp_init, -1);
+
+#ifdef SOCKS
+ rb_cSOCKSSocket = rb_define_class("SOCKSSocket", rb_cTCPSocket);
+ rb_define_global_const("SOCKSsocket", rb_cSOCKSSocket);
+ rb_define_method(rb_cSOCKSSocket, "initialize", socks_init, 2);
+#ifdef SOCKS5
+ rb_define_method(rb_cSOCKSSocket, "close", socks_s_close, 0);
+#endif
+#endif
- rb_cSocket = rb_define_class("Socket", rb_cBasicSocket);
+ rb_cTCPServer = rb_define_class("TCPServer", rb_cTCPSocket);
+ rb_define_global_const("TCPserver", rb_cTCPServer);
+ rb_define_method(rb_cTCPServer, "accept", tcp_accept, 0);
+ rb_define_method(rb_cTCPServer, "accept_nonblock", tcp_accept_nonblock, 0);
+ rb_define_method(rb_cTCPServer, "sysaccept", tcp_sysaccept, 0);
+ rb_define_method(rb_cTCPServer, "initialize", tcp_svr_init, -1);
+ rb_define_method(rb_cTCPServer, "listen", sock_listen, 1);
+
+ rb_cUDPSocket = rb_define_class("UDPSocket", rb_cIPSocket);
+ rb_define_global_const("UDPsocket", rb_cUDPSocket);
+ rb_define_method(rb_cUDPSocket, "initialize", udp_init, -1);
+ rb_define_method(rb_cUDPSocket, "connect", udp_connect, 2);
+ rb_define_method(rb_cUDPSocket, "bind", udp_bind, 2);
+ rb_define_method(rb_cUDPSocket, "send", udp_send, -1);
+ rb_define_method(rb_cUDPSocket, "recvfrom_nonblock", udp_recvfrom_nonblock, -1);
+
+#ifdef HAVE_SYS_UN_H
+ rb_cUNIXSocket = rb_define_class("UNIXSocket", rb_cBasicSocket);
+ rb_define_global_const("UNIXsocket", rb_cUNIXSocket);
+ rb_define_method(rb_cUNIXSocket, "initialize", unix_init, 1);
+ rb_define_method(rb_cUNIXSocket, "path", unix_path, 0);
+ rb_define_method(rb_cUNIXSocket, "addr", unix_addr, 0);
+ rb_define_method(rb_cUNIXSocket, "peeraddr", unix_peeraddr, 0);
+ rb_define_method(rb_cUNIXSocket, "recvfrom", unix_recvfrom, -1);
+ rb_define_method(rb_cUNIXSocket, "send_io", unix_send_io, 1);
+ rb_define_method(rb_cUNIXSocket, "recv_io", unix_recv_io, -1);
+ rb_define_singleton_method(rb_cUNIXSocket, "socketpair", unix_s_socketpair, -1);
+ rb_define_singleton_method(rb_cUNIXSocket, "pair", unix_s_socketpair, -1);
+
+ rb_cUNIXServer = rb_define_class("UNIXServer", rb_cUNIXSocket);
+ rb_define_global_const("UNIXserver", rb_cUNIXServer);
+ rb_define_method(rb_cUNIXServer, "initialize", unix_svr_init, 1);
+ rb_define_method(rb_cUNIXServer, "accept", unix_accept, 0);
+ rb_define_method(rb_cUNIXServer, "accept_nonblock", unix_accept_nonblock, 0);
+ rb_define_method(rb_cUNIXServer, "sysaccept", unix_sysaccept, 0);
+ rb_define_method(rb_cUNIXServer, "listen", sock_listen, 1);
+#endif
- Init_socket_init();
+ rb_cSocket = rb_define_class("Socket", rb_cBasicSocket);
- rb_define_method(rb_cSocket, "initialize", sock_initialize, -1);
+ rb_define_method(rb_cSocket, "initialize", sock_initialize, 3);
rb_define_method(rb_cSocket, "connect", sock_connect, 1);
rb_define_method(rb_cSocket, "connect_nonblock", sock_connect_nonblock, 1);
rb_define_method(rb_cSocket, "bind", sock_bind, 1);
@@ -1807,13 +4003,12 @@ Init_socket()
rb_define_method(rb_cSocket, "recvfrom", sock_recvfrom, -1);
rb_define_method(rb_cSocket, "recvfrom_nonblock", sock_recvfrom_nonblock, -1);
- rb_define_singleton_method(rb_cSocket, "socketpair", rsock_sock_s_socketpair, -1);
- rb_define_singleton_method(rb_cSocket, "pair", rsock_sock_s_socketpair, -1);
+ rb_define_singleton_method(rb_cSocket, "socketpair", sock_s_socketpair, 3);
+ rb_define_singleton_method(rb_cSocket, "pair", sock_s_socketpair, 3);
rb_define_singleton_method(rb_cSocket, "gethostname", sock_gethostname, 0);
rb_define_singleton_method(rb_cSocket, "gethostbyname", sock_s_gethostbyname, 1);
rb_define_singleton_method(rb_cSocket, "gethostbyaddr", sock_s_gethostbyaddr, -1);
- rb_define_singleton_method(rb_cSocket, "getservbyname", sock_s_getservbyname, -1);
- rb_define_singleton_method(rb_cSocket, "getservbyport", sock_s_getservbyport, -1);
+ rb_define_singleton_method(rb_cSocket, "getservbyname", sock_s_getservbyaname, -1);
rb_define_singleton_method(rb_cSocket, "getaddrinfo", sock_s_getaddrinfo, -1);
rb_define_singleton_method(rb_cSocket, "getnameinfo", sock_s_getnameinfo, -1);
rb_define_singleton_method(rb_cSocket, "sockaddr_in", sock_s_pack_sockaddr_in, 2);
@@ -1825,11 +4020,702 @@ Init_socket()
rb_define_singleton_method(rb_cSocket, "unpack_sockaddr_un", sock_s_unpack_sockaddr_un, 1);
#endif
- rb_define_singleton_method(rb_cSocket, "ip_address_list", socket_s_ip_address_list, 0);
+ /* constants */
+ mConst = rb_define_module_under(rb_cSocket, "Constants");
+ sock_define_const("SOCK_STREAM", SOCK_STREAM);
+ sock_define_const("SOCK_DGRAM", SOCK_DGRAM);
+#ifdef SOCK_RAW
+ sock_define_const("SOCK_RAW", SOCK_RAW);
+#endif
+#ifdef SOCK_RDM
+ sock_define_const("SOCK_RDM", SOCK_RDM);
+#endif
+#ifdef SOCK_SEQPACKET
+ sock_define_const("SOCK_SEQPACKET", SOCK_SEQPACKET);
+#endif
+#ifdef SOCK_PACKET
+ sock_define_const("SOCK_PACKET", SOCK_PACKET);
+#endif
- /* defined here for rdoc */
- rb_define_method(rb_cTCPServer, "listen", sock_listen, 1);
-#ifdef HAVE_SYS_UN_H
- rb_define_method(rb_cUNIXServer, "listen", sock_listen, 1);
+ sock_define_const("AF_INET", AF_INET);
+#ifdef PF_INET
+ sock_define_const("PF_INET", PF_INET);
+#endif
+#ifdef AF_UNIX
+ sock_define_const("AF_UNIX", AF_UNIX);
+ sock_define_const("PF_UNIX", PF_UNIX);
+#endif
+#ifdef AF_AX25
+ sock_define_const("AF_AX25", AF_AX25);
+ sock_define_const("PF_AX25", PF_AX25);
+#endif
+#ifdef AF_IPX
+ sock_define_const("AF_IPX", AF_IPX);
+ sock_define_const("PF_IPX", PF_IPX);
+#endif
+#ifdef AF_APPLETALK
+ sock_define_const("AF_APPLETALK", AF_APPLETALK);
+ sock_define_const("PF_APPLETALK", PF_APPLETALK);
+#endif
+#ifdef AF_UNSPEC
+ sock_define_const("AF_UNSPEC", AF_UNSPEC);
+ sock_define_const("PF_UNSPEC", PF_UNSPEC);
+#endif
+#ifdef INET6
+ sock_define_const("AF_INET6", AF_INET6);
+#endif
+#ifdef INET6
+ sock_define_const("PF_INET6", PF_INET6);
+#endif
+#ifdef AF_LOCAL
+ sock_define_const("AF_LOCAL", AF_LOCAL);
+#endif
+#ifdef PF_LOCAL
+ sock_define_const("PF_LOCAL", PF_LOCAL);
+#endif
+#ifdef AF_IMPLINK
+ sock_define_const("AF_IMPLINK", AF_IMPLINK);
+#endif
+#ifdef PF_IMPLINK
+ sock_define_const("PF_IMPLINK", PF_IMPLINK);
+#endif
+#ifdef AF_PUP
+ sock_define_const("AF_PUP", AF_PUP);
+#endif
+#ifdef PF_PUP
+ sock_define_const("PF_PUP", PF_PUP);
+#endif
+#ifdef AF_CHAOS
+ sock_define_const("AF_CHAOS", AF_CHAOS);
+#endif
+#ifdef PF_CHAOS
+ sock_define_const("PF_CHAOS", PF_CHAOS);
+#endif
+#ifdef AF_NS
+ sock_define_const("AF_NS", AF_NS);
+#endif
+#ifdef PF_NS
+ sock_define_const("PF_NS", PF_NS);
+#endif
+#ifdef AF_ISO
+ sock_define_const("AF_ISO", AF_ISO);
+#endif
+#ifdef PF_ISO
+ sock_define_const("PF_ISO", PF_ISO);
+#endif
+#ifdef AF_OSI
+ sock_define_const("AF_OSI", AF_OSI);
+#endif
+#ifdef PF_OSI
+ sock_define_const("PF_OSI", PF_OSI);
+#endif
+#ifdef AF_ECMA
+ sock_define_const("AF_ECMA", AF_ECMA);
+#endif
+#ifdef PF_ECMA
+ sock_define_const("PF_ECMA", PF_ECMA);
+#endif
+#ifdef AF_DATAKIT
+ sock_define_const("AF_DATAKIT", AF_DATAKIT);
+#endif
+#ifdef PF_DATAKIT
+ sock_define_const("PF_DATAKIT", PF_DATAKIT);
+#endif
+#ifdef AF_CCITT
+ sock_define_const("AF_CCITT", AF_CCITT);
+#endif
+#ifdef PF_CCITT
+ sock_define_const("PF_CCITT", PF_CCITT);
+#endif
+#ifdef AF_SNA
+ sock_define_const("AF_SNA", AF_SNA);
+#endif
+#ifdef PF_SNA
+ sock_define_const("PF_SNA", PF_SNA);
+#endif
+#ifdef AF_DEC
+ sock_define_const("AF_DEC", AF_DEC);
+#endif
+#ifdef PF_DEC
+ sock_define_const("PF_DEC", PF_DEC);
+#endif
+#ifdef AF_DLI
+ sock_define_const("AF_DLI", AF_DLI);
+#endif
+#ifdef PF_DLI
+ sock_define_const("PF_DLI", PF_DLI);
+#endif
+#ifdef AF_LAT
+ sock_define_const("AF_LAT", AF_LAT);
+#endif
+#ifdef PF_LAT
+ sock_define_const("PF_LAT", PF_LAT);
+#endif
+#ifdef AF_HYLINK
+ sock_define_const("AF_HYLINK", AF_HYLINK);
+#endif
+#ifdef PF_HYLINK
+ sock_define_const("PF_HYLINK", PF_HYLINK);
+#endif
+#ifdef AF_ROUTE
+ sock_define_const("AF_ROUTE", AF_ROUTE);
+#endif
+#ifdef PF_ROUTE
+ sock_define_const("PF_ROUTE", PF_ROUTE);
+#endif
+#ifdef AF_LINK
+ sock_define_const("AF_LINK", AF_LINK);
+#endif
+#ifdef PF_LINK
+ sock_define_const("PF_LINK", PF_LINK);
+#endif
+#ifdef AF_COIP
+ sock_define_const("AF_COIP", AF_COIP);
+#endif
+#ifdef PF_COIP
+ sock_define_const("PF_COIP", PF_COIP);
+#endif
+#ifdef AF_CNT
+ sock_define_const("AF_CNT", AF_CNT);
+#endif
+#ifdef PF_CNT
+ sock_define_const("PF_CNT", PF_CNT);
+#endif
+#ifdef AF_SIP
+ sock_define_const("AF_SIP", AF_SIP);
+#endif
+#ifdef PF_SIP
+ sock_define_const("PF_SIP", PF_SIP);
+#endif
+#ifdef AF_NDRV
+ sock_define_const("AF_NDRV", AF_NDRV);
+#endif
+#ifdef PF_NDRV
+ sock_define_const("PF_NDRV", PF_NDRV);
+#endif
+#ifdef AF_ISDN
+ sock_define_const("AF_ISDN", AF_ISDN);
+#endif
+#ifdef PF_ISDN
+ sock_define_const("PF_ISDN", PF_ISDN);
+#endif
+#ifdef AF_NATM
+ sock_define_const("AF_NATM", AF_NATM);
+#endif
+#ifdef PF_NATM
+ sock_define_const("PF_NATM", PF_NATM);
+#endif
+#ifdef AF_SYSTEM
+ sock_define_const("AF_SYSTEM", AF_SYSTEM);
+#endif
+#ifdef PF_SYSTEM
+ sock_define_const("PF_SYSTEM", PF_SYSTEM);
+#endif
+#ifdef AF_NETBIOS
+ sock_define_const("AF_NETBIOS", AF_NETBIOS);
+#endif
+#ifdef PF_NETBIOS
+ sock_define_const("PF_NETBIOS", PF_NETBIOS);
+#endif
+#ifdef AF_PPP
+ sock_define_const("AF_PPP", AF_PPP);
+#endif
+#ifdef PF_PPP
+ sock_define_const("PF_PPP", PF_PPP);
+#endif
+#ifdef AF_ATM
+ sock_define_const("AF_ATM", AF_ATM);
+#endif
+#ifdef PF_ATM
+ sock_define_const("PF_ATM", PF_ATM);
+#endif
+#ifdef AF_NETGRAPH
+ sock_define_const("AF_NETGRAPH", AF_NETGRAPH);
+#endif
+#ifdef PF_NETGRAPH
+ sock_define_const("PF_NETGRAPH", PF_NETGRAPH);
+#endif
+#ifdef AF_MAX
+ sock_define_const("AF_MAX", AF_MAX);
+#endif
+#ifdef PF_MAX
+ sock_define_const("PF_MAX", PF_MAX);
+#endif
+#ifdef AF_E164
+ sock_define_const("AF_E164", AF_E164);
+#endif
+#ifdef PF_XTP
+ sock_define_const("PF_XTP", PF_XTP);
+#endif
+#ifdef PF_RTIP
+ sock_define_const("PF_RTIP", PF_RTIP);
+#endif
+#ifdef PF_PIP
+ sock_define_const("PF_PIP", PF_PIP);
+#endif
+#ifdef PF_KEY
+ sock_define_const("PF_KEY", PF_KEY);
+#endif
+
+ sock_define_const("MSG_OOB", MSG_OOB);
+#ifdef MSG_PEEK
+ sock_define_const("MSG_PEEK", MSG_PEEK);
+#endif
+#ifdef MSG_DONTROUTE
+ sock_define_const("MSG_DONTROUTE", MSG_DONTROUTE);
+#endif
+#ifdef MSG_EOR
+ sock_define_const("MSG_EOR", MSG_EOR);
+#endif
+#ifdef MSG_TRUNC
+ sock_define_const("MSG_TRUNC", MSG_TRUNC);
+#endif
+#ifdef MSG_CTRUNC
+ sock_define_const("MSG_CTRUNC", MSG_CTRUNC);
+#endif
+#ifdef MSG_WAITALL
+ sock_define_const("MSG_WAITALL", MSG_WAITALL);
+#endif
+#ifdef MSG_DONTWAIT
+ sock_define_const("MSG_DONTWAIT", MSG_DONTWAIT);
+#endif
+#ifdef MSG_EOF
+ sock_define_const("MSG_EOF", MSG_EOF);
+#endif
+#ifdef MSG_FLUSH
+ sock_define_const("MSG_FLUSH", MSG_FLUSH);
+#endif
+#ifdef MSG_HOLD
+ sock_define_const("MSG_HOLD", MSG_HOLD);
+#endif
+#ifdef MSG_SEND
+ sock_define_const("MSG_SEND", MSG_SEND);
+#endif
+#ifdef MSG_HAVEMORE
+ sock_define_const("MSG_HAVEMORE", MSG_HAVEMORE);
+#endif
+#ifdef MSG_RCVMORE
+ sock_define_const("MSG_RCVMORE", MSG_RCVMORE);
+#endif
+#ifdef MSG_COMPAT
+ sock_define_const("MSG_COMPAT", MSG_COMPAT);
+#endif
+
+ sock_define_const("SOL_SOCKET", SOL_SOCKET);
+#ifdef SOL_IP
+ sock_define_const("SOL_IP", SOL_IP);
+#endif
+#ifdef SOL_IPX
+ sock_define_const("SOL_IPX", SOL_IPX);
+#endif
+#ifdef SOL_AX25
+ sock_define_const("SOL_AX25", SOL_AX25);
+#endif
+#ifdef SOL_ATALK
+ sock_define_const("SOL_ATALK", SOL_ATALK);
+#endif
+#ifdef SOL_TCP
+ sock_define_const("SOL_TCP", SOL_TCP);
+#endif
+#ifdef SOL_UDP
+ sock_define_const("SOL_UDP", SOL_UDP);
+#endif
+
+#ifdef IPPROTO_IP
+ sock_define_const("IPPROTO_IP", IPPROTO_IP);
+#else
+ sock_define_const("IPPROTO_IP", 0);
+#endif
+#ifdef IPPROTO_ICMP
+ sock_define_const("IPPROTO_ICMP", IPPROTO_ICMP);
+#else
+ sock_define_const("IPPROTO_ICMP", 1);
+#endif
+#ifdef IPPROTO_IGMP
+ sock_define_const("IPPROTO_IGMP", IPPROTO_IGMP);
+#endif
+#ifdef IPPROTO_GGP
+ sock_define_const("IPPROTO_GGP", IPPROTO_GGP);
+#endif
+#ifdef IPPROTO_TCP
+ sock_define_const("IPPROTO_TCP", IPPROTO_TCP);
+#else
+ sock_define_const("IPPROTO_TCP", 6);
+#endif
+#ifdef IPPROTO_EGP
+ sock_define_const("IPPROTO_EGP", IPPROTO_EGP);
+#endif
+#ifdef IPPROTO_PUP
+ sock_define_const("IPPROTO_PUP", IPPROTO_PUP);
+#endif
+#ifdef IPPROTO_UDP
+ sock_define_const("IPPROTO_UDP", IPPROTO_UDP);
+#else
+ sock_define_const("IPPROTO_UDP", 17);
+#endif
+#ifdef IPPROTO_IDP
+ sock_define_const("IPPROTO_IDP", IPPROTO_IDP);
+#endif
+#ifdef IPPROTO_HELLO
+ sock_define_const("IPPROTO_HELLO", IPPROTO_HELLO);
+#endif
+#ifdef IPPROTO_ND
+ sock_define_const("IPPROTO_ND", IPPROTO_ND);
+#endif
+#ifdef IPPROTO_TP
+ sock_define_const("IPPROTO_TP", IPPROTO_TP);
+#endif
+#ifdef IPPROTO_XTP
+ sock_define_const("IPPROTO_XTP", IPPROTO_XTP);
+#endif
+#ifdef IPPROTO_EON
+ sock_define_const("IPPROTO_EON", IPPROTO_EON);
+#endif
+#ifdef IPPROTO_BIP
+ sock_define_const("IPPROTO_BIP", IPPROTO_BIP);
+#endif
+/**/
+#ifdef IPPROTO_RAW
+ sock_define_const("IPPROTO_RAW", IPPROTO_RAW);
+#else
+ sock_define_const("IPPROTO_RAW", 255);
+#endif
+#ifdef IPPROTO_MAX
+ sock_define_const("IPPROTO_MAX", IPPROTO_MAX);
+#endif
+
+ /* Some port configuration */
+#ifdef IPPORT_RESERVED
+ sock_define_const("IPPORT_RESERVED", IPPORT_RESERVED);
+#else
+ sock_define_const("IPPORT_RESERVED", 1024);
+#endif
+#ifdef IPPORT_USERRESERVED
+ sock_define_const("IPPORT_USERRESERVED", IPPORT_USERRESERVED);
+#else
+ sock_define_const("IPPORT_USERRESERVED", 5000);
+#endif
+ /* Some reserved IP v.4 addresses */
+#ifdef INADDR_ANY
+ sock_define_const("INADDR_ANY", INADDR_ANY);
+#else
+ sock_define_const("INADDR_ANY", 0x00000000);
+#endif
+#ifdef INADDR_BROADCAST
+ sock_define_const("INADDR_BROADCAST", INADDR_BROADCAST);
+#else
+ sock_define_const("INADDR_BROADCAST", 0xffffffff);
+#endif
+#ifdef INADDR_LOOPBACK
+ sock_define_const("INADDR_LOOPBACK", INADDR_LOOPBACK);
+#else
+ sock_define_const("INADDR_LOOPBACK", 0x7F000001);
+#endif
+#ifdef INADDR_UNSPEC_GROUP
+ sock_define_const("INADDR_UNSPEC_GROUP", INADDR_UNSPEC_GROUP);
+#else
+ sock_define_const("INADDR_UNSPEC_GROUP", 0xe0000000);
+#endif
+#ifdef INADDR_ALLHOSTS_GROUP
+ sock_define_const("INADDR_ALLHOSTS_GROUP", INADDR_ALLHOSTS_GROUP);
+#else
+ sock_define_const("INADDR_ALLHOSTS_GROUP", 0xe0000001);
+#endif
+#ifdef INADDR_MAX_LOCAL_GROUP
+ sock_define_const("INADDR_MAX_LOCAL_GROUP", INADDR_MAX_LOCAL_GROUP);
+#else
+ sock_define_const("INADDR_MAX_LOCAL_GROUP", 0xe00000ff);
+#endif
+#ifdef INADDR_NONE
+ sock_define_const("INADDR_NONE", INADDR_NONE);
+#else
+ sock_define_const("INADDR_NONE", 0xffffffff);
+#endif
+ /* IP [gs]etsockopt options */
+#ifdef IP_OPTIONS
+ sock_define_const("IP_OPTIONS", IP_OPTIONS);
+#endif
+#ifdef IP_HDRINCL
+ sock_define_const("IP_HDRINCL", IP_HDRINCL);
+#endif
+#ifdef IP_TOS
+ sock_define_const("IP_TOS", IP_TOS);
+#endif
+#ifdef IP_TTL
+ sock_define_const("IP_TTL", IP_TTL);
+#endif
+#ifdef IP_RECVOPTS
+ sock_define_const("IP_RECVOPTS", IP_RECVOPTS);
+#endif
+#ifdef IP_RECVRETOPTS
+ sock_define_const("IP_RECVRETOPTS", IP_RECVRETOPTS);
+#endif
+#ifdef IP_RECVDSTADDR
+ sock_define_const("IP_RECVDSTADDR", IP_RECVDSTADDR);
+#endif
+#ifdef IP_RETOPTS
+ sock_define_const("IP_RETOPTS", IP_RETOPTS);
+#endif
+#ifdef IP_MULTICAST_IF
+ sock_define_const("IP_MULTICAST_IF", IP_MULTICAST_IF);
+#endif
+#ifdef IP_MULTICAST_TTL
+ sock_define_const("IP_MULTICAST_TTL", IP_MULTICAST_TTL);
+#endif
+#ifdef IP_MULTICAST_LOOP
+ sock_define_const("IP_MULTICAST_LOOP", IP_MULTICAST_LOOP);
+#endif
+#ifdef IP_ADD_MEMBERSHIP
+ sock_define_const("IP_ADD_MEMBERSHIP", IP_ADD_MEMBERSHIP);
+#endif
+#ifdef IP_DROP_MEMBERSHIP
+ sock_define_const("IP_DROP_MEMBERSHIP", IP_DROP_MEMBERSHIP);
+#endif
+#ifdef IP_DEFAULT_MULTICAST_TTL
+ sock_define_const("IP_DEFAULT_MULTICAST_TTL", IP_DEFAULT_MULTICAST_TTL);
+#endif
+#ifdef IP_DEFAULT_MULTICAST_LOOP
+ sock_define_const("IP_DEFAULT_MULTICAST_LOOP", IP_DEFAULT_MULTICAST_LOOP);
+#endif
+#ifdef IP_MAX_MEMBERSHIPS
+ sock_define_const("IP_MAX_MEMBERSHIPS", IP_MAX_MEMBERSHIPS);
+#endif
+#ifdef SO_DEBUG
+ sock_define_const("SO_DEBUG", SO_DEBUG);
+#endif
+ sock_define_const("SO_REUSEADDR", SO_REUSEADDR);
+#ifdef SO_REUSEPORT
+ sock_define_const("SO_REUSEPORT", SO_REUSEPORT);
+#endif
+#ifdef SO_TYPE
+ sock_define_const("SO_TYPE", SO_TYPE);
+#endif
+#ifdef SO_ERROR
+ sock_define_const("SO_ERROR", SO_ERROR);
+#endif
+#ifdef SO_DONTROUTE
+ sock_define_const("SO_DONTROUTE", SO_DONTROUTE);
+#endif
+#ifdef SO_BROADCAST
+ sock_define_const("SO_BROADCAST", SO_BROADCAST);
+#endif
+#ifdef SO_SNDBUF
+ sock_define_const("SO_SNDBUF", SO_SNDBUF);
+#endif
+#ifdef SO_RCVBUF
+ sock_define_const("SO_RCVBUF", SO_RCVBUF);
+#endif
+#ifdef SO_KEEPALIVE
+ sock_define_const("SO_KEEPALIVE", SO_KEEPALIVE);
+#endif
+#ifdef SO_OOBINLINE
+ sock_define_const("SO_OOBINLINE", SO_OOBINLINE);
+#endif
+#ifdef SO_NO_CHECK
+ sock_define_const("SO_NO_CHECK", SO_NO_CHECK);
+#endif
+#ifdef SO_PRIORITY
+ sock_define_const("SO_PRIORITY", SO_PRIORITY);
+#endif
+#ifdef SO_LINGER
+ sock_define_const("SO_LINGER", SO_LINGER);
+#endif
+#ifdef SO_PASSCRED
+ sock_define_const("SO_PASSCRED", SO_PASSCRED);
+#endif
+#ifdef SO_PEERCRED
+ sock_define_const("SO_PEERCRED", SO_PEERCRED);
+#endif
+#ifdef SO_RCVLOWAT
+ sock_define_const("SO_RCVLOWAT", SO_RCVLOWAT);
+#endif
+#ifdef SO_SNDLOWAT
+ sock_define_const("SO_SNDLOWAT", SO_SNDLOWAT);
+#endif
+#ifdef SO_RCVTIMEO
+ sock_define_const("SO_RCVTIMEO", SO_RCVTIMEO);
+#endif
+#ifdef SO_SNDTIMEO
+ sock_define_const("SO_SNDTIMEO", SO_SNDTIMEO);
+#endif
+#ifdef SO_ACCEPTCONN
+ sock_define_const("SO_ACCEPTCONN", SO_ACCEPTCONN);
+#endif
+#ifdef SO_USELOOPBACK
+ sock_define_const("SO_USELOOPBACK", SO_USELOOPBACK);
+#endif
+#ifdef SO_ACCEPTFILTER
+ sock_define_const("SO_ACCEPTFILTER", SO_ACCEPTFILTER);
+#endif
+#ifdef SO_DONTTRUNC
+ sock_define_const("SO_DONTTRUNC", SO_DONTTRUNC);
+#endif
+#ifdef SO_WANTMORE
+ sock_define_const("SO_WANTMORE", SO_WANTMORE);
+#endif
+#ifdef SO_WANTOOBFLAG
+ sock_define_const("SO_WANTOOBFLAG", SO_WANTOOBFLAG);
+#endif
+#ifdef SO_NREAD
+ sock_define_const("SO_NREAD", SO_NREAD);
+#endif
+#ifdef SO_NKE
+ sock_define_const("SO_NKE", SO_NKE);
+#endif
+#ifdef SO_NOSIGPIPE
+ sock_define_const("SO_NOSIGPIPE", SO_NOSIGPIPE);
+#endif
+
+#ifdef SO_SECURITY_AUTHENTICATION
+ sock_define_const("SO_SECURITY_AUTHENTICATION", SO_SECURITY_AUTHENTICATION);
+#endif
+#ifdef SO_SECURITY_ENCRYPTION_TRANSPORT
+ sock_define_const("SO_SECURITY_ENCRYPTION_TRANSPORT", SO_SECURITY_ENCRYPTION_TRANSPORT);
+#endif
+#ifdef SO_SECURITY_ENCRYPTION_NETWORK
+ sock_define_const("SO_SECURITY_ENCRYPTION_NETWORK", SO_SECURITY_ENCRYPTION_NETWORK);
+#endif
+
+#ifdef SO_BINDTODEVICE
+ sock_define_const("SO_BINDTODEVICE", SO_BINDTODEVICE);
+#endif
+#ifdef SO_ATTACH_FILTER
+ sock_define_const("SO_ATTACH_FILTER", SO_ATTACH_FILTER);
+#endif
+#ifdef SO_DETACH_FILTER
+ sock_define_const("SO_DETACH_FILTER", SO_DETACH_FILTER);
+#endif
+#ifdef SO_PEERNAME
+ sock_define_const("SO_PEERNAME", SO_PEERNAME);
+#endif
+#ifdef SO_TIMESTAMP
+ sock_define_const("SO_TIMESTAMP", SO_TIMESTAMP);
+#endif
+
+#ifdef SOPRI_INTERACTIVE
+ sock_define_const("SOPRI_INTERACTIVE", SOPRI_INTERACTIVE);
+#endif
+#ifdef SOPRI_NORMAL
+ sock_define_const("SOPRI_NORMAL", SOPRI_NORMAL);
+#endif
+#ifdef SOPRI_BACKGROUND
+ sock_define_const("SOPRI_BACKGROUND", SOPRI_BACKGROUND);
+#endif
+
+#ifdef IPX_TYPE
+ sock_define_const("IPX_TYPE", IPX_TYPE);
+#endif
+
+#ifdef TCP_NODELAY
+ sock_define_const("TCP_NODELAY", TCP_NODELAY);
+#endif
+#ifdef TCP_MAXSEG
+ sock_define_const("TCP_MAXSEG", TCP_MAXSEG);
+#endif
+
+#ifdef EAI_ADDRFAMILY
+ sock_define_const("EAI_ADDRFAMILY", EAI_ADDRFAMILY);
+#endif
+#ifdef EAI_AGAIN
+ sock_define_const("EAI_AGAIN", EAI_AGAIN);
+#endif
+#ifdef EAI_BADFLAGS
+ sock_define_const("EAI_BADFLAGS", EAI_BADFLAGS);
+#endif
+#ifdef EAI_FAIL
+ sock_define_const("EAI_FAIL", EAI_FAIL);
+#endif
+#ifdef EAI_FAMILY
+ sock_define_const("EAI_FAMILY", EAI_FAMILY);
+#endif
+#ifdef EAI_MEMORY
+ sock_define_const("EAI_MEMORY", EAI_MEMORY);
+#endif
+#ifdef EAI_NODATA
+ sock_define_const("EAI_NODATA", EAI_NODATA);
+#endif
+#ifdef EAI_NONAME
+ sock_define_const("EAI_NONAME", EAI_NONAME);
+#endif
+#ifdef EAI_SERVICE
+ sock_define_const("EAI_SERVICE", EAI_SERVICE);
+#endif
+#ifdef EAI_SOCKTYPE
+ sock_define_const("EAI_SOCKTYPE", EAI_SOCKTYPE);
+#endif
+#ifdef EAI_SYSTEM
+ sock_define_const("EAI_SYSTEM", EAI_SYSTEM);
+#endif
+#ifdef EAI_BADHINTS
+ sock_define_const("EAI_BADHINTS", EAI_BADHINTS);
+#endif
+#ifdef EAI_PROTOCOL
+ sock_define_const("EAI_PROTOCOL", EAI_PROTOCOL);
+#endif
+#ifdef EAI_MAX
+ sock_define_const("EAI_MAX", EAI_MAX);
+#endif
+#ifdef AI_PASSIVE
+ sock_define_const("AI_PASSIVE", AI_PASSIVE);
+#endif
+#ifdef AI_CANONNAME
+ sock_define_const("AI_CANONNAME", AI_CANONNAME);
+#endif
+#ifdef AI_NUMERICHOST
+ sock_define_const("AI_NUMERICHOST", AI_NUMERICHOST);
+#endif
+#ifdef AI_MASK
+ sock_define_const("AI_MASK", AI_MASK);
+#endif
+#ifdef AI_ALL
+ sock_define_const("AI_ALL", AI_ALL);
+#endif
+#ifdef AI_V4MAPPED_CFG
+ sock_define_const("AI_V4MAPPED_CFG", AI_V4MAPPED_CFG);
+#endif
+#ifdef AI_ADDRCONFIG
+ sock_define_const("AI_ADDRCONFIG", AI_ADDRCONFIG);
+#endif
+#ifdef AI_V4MAPPED
+ sock_define_const("AI_V4MAPPED", AI_V4MAPPED);
+#endif
+#ifdef AI_DEFAULT
+ sock_define_const("AI_DEFAULT", AI_DEFAULT);
+#endif
+#ifdef NI_MAXHOST
+ sock_define_const("NI_MAXHOST", NI_MAXHOST);
+#endif
+#ifdef NI_MAXSERV
+ sock_define_const("NI_MAXSERV", NI_MAXSERV);
+#endif
+#ifdef NI_NOFQDN
+ sock_define_const("NI_NOFQDN", NI_NOFQDN);
+#endif
+#ifdef NI_NUMERICHOST
+ sock_define_const("NI_NUMERICHOST", NI_NUMERICHOST);
+#endif
+#ifdef NI_NAMEREQD
+ sock_define_const("NI_NAMEREQD", NI_NAMEREQD);
+#endif
+#ifdef NI_NUMERICSERV
+ sock_define_const("NI_NUMERICSERV", NI_NUMERICSERV);
+#endif
+#ifdef NI_DGRAM
+ sock_define_const("NI_DGRAM", NI_DGRAM);
+#endif
+#ifdef SHUT_RD
+ sock_define_const("SHUT_RD", SHUT_RD);
+#else
+ sock_define_const("SHUT_RD", 0);
+#endif
+#ifdef SHUT_WR
+ sock_define_const("SHUT_WR", SHUT_WR);
+#else
+ sock_define_const("SHUT_WR", 1);
+#endif
+#ifdef SHUT_RDWR
+ sock_define_const("SHUT_RDWR", SHUT_RDWR);
+#else
+ sock_define_const("SHUT_RDWR", 2);
#endif
}
diff --git a/ext/socket/sockport.h b/ext/socket/sockport.h
index 5f2fd24530..e1cddf53f4 100644
--- a/ext/socket/sockport.h
+++ b/ext/socket/sockport.h
@@ -3,6 +3,7 @@
sockport.h -
$Author$
+ $Date$
created at: Fri Apr 30 23:19:34 JST 1999
************************************************/
@@ -10,34 +11,25 @@
#ifndef SOCKPORT_H
#define SOCKPORT_H
-#ifdef SA_LEN
-# define SS_LEN(ss) (ss)->ss_len
-#else
+#ifndef SA_LEN
# ifdef HAVE_SA_LEN
# define SA_LEN(sa) (sa)->sa_len
-# define SS_LEN(ss) (ss)->ss_len
# else
-# ifdef AF_INET6
+# ifdef INET6
# define SA_LEN(sa) \
(((sa)->sa_family == AF_INET6) ? sizeof(struct sockaddr_in6) \
: sizeof(struct sockaddr))
-# define SS_LEN(ss) \
- (((ss)->ss_family == AF_INET6) ? sizeof(struct sockaddr_in6) \
- : sizeof(struct sockaddr))
# else
/* by tradition, sizeof(struct sockaddr) covers most of the sockaddrs */
# define SA_LEN(sa) (sizeof(struct sockaddr))
-# define SS_LEN(ss) (sizeof(struct sockaddr))
# endif
# endif
#endif
#ifdef HAVE_SA_LEN
-# define SET_SA_LEN(sa, len) (void)((sa)->sa_len = (len))
-# define SET_SS_LEN(ss, len) (void)((ss)->ss_len = (len))
+# define SET_SA_LEN(sa, len) (sa)->sa_len = (len)
#else
-# define SET_SA_LEN(sa, len) (void)(len)
-# define SET_SS_LEN(ss, len) (void)(len)
+# define SET_SA_LEN(sa, len) (len)
#endif
#ifdef HAVE_SIN_LEN
diff --git a/ext/socket/sockssocket.c b/ext/socket/sockssocket.c
deleted file mode 100644
index 71836f704d..0000000000
--- a/ext/socket/sockssocket.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/************************************************
-
- sockssocket.c -
-
- created at: Thu Mar 31 12:21:29 JST 1994
-
- Copyright (C) 1993-2007 Yukihiro Matsumoto
-
-************************************************/
-
-#include "rubysocket.h"
-
-#ifdef SOCKS
-static VALUE
-socks_init(VALUE sock, VALUE host, VALUE serv)
-{
- static int init = 0;
-
- if (init == 0) {
- SOCKSinit("ruby");
- init = 1;
- }
-
- return rsock_init_inetsock(sock, host, serv, Qnil, Qnil, INET_SOCKS);
-}
-
-#ifdef SOCKS5
-static VALUE
-socks_s_close(VALUE sock)
-{
- rb_io_t *fptr;
-
- if (rb_safe_level() >= 4 && !OBJ_TAINTED(sock)) {
- rb_raise(rb_eSecurityError, "Insecure: can't close socket");
- }
- GetOpenFile(sock, fptr);
- shutdown(fptr->fd, 2);
- return rb_io_close(sock);
-}
-#endif
-#endif
-
-/*
- * SOCKSSocket class
- */
-void
-Init_sockssocket(void)
-{
-#ifdef SOCKS
- rb_cSOCKSSocket = rb_define_class("SOCKSSocket", rb_cTCPSocket);
- rb_define_method(rb_cSOCKSSocket, "initialize", socks_init, 2);
-#ifdef SOCKS5
- rb_define_method(rb_cSOCKSSocket, "close", socks_s_close, 0);
-#endif
-#endif
-}
diff --git a/ext/socket/tcpserver.c b/ext/socket/tcpserver.c
deleted file mode 100644
index 59cd7dd3cc..0000000000
--- a/ext/socket/tcpserver.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/************************************************
-
- tcpserver.c -
-
- created at: Thu Mar 31 12:21:29 JST 1994
-
- Copyright (C) 1993-2007 Yukihiro Matsumoto
-
-************************************************/
-
-#include "rubysocket.h"
-
-/*
- * call-seq:
- * TCPServer.new([hostname,] port) => tcpserver
- *
- * Creates a new server socket bound to _port_.
- *
- * If _hostname_ is given, the socket is bound to it.
- *
- * serv = TCPServer.new("127.0.0.1", 28561)
- * s = serv.accept
- * s.puts Time.now
- * s.close
- */
-static VALUE
-tcp_svr_init(int argc, VALUE *argv, VALUE sock)
-{
- VALUE hostname, port;
-
- rb_scan_args(argc, argv, "011", &hostname, &port);
- return rsock_init_inetsock(sock, hostname, port, Qnil, Qnil, INET_SERVER);
-}
-
-/*
- * call-seq:
- * tcpserver.accept => tcpsocket
- *
- * TCPServer.open("127.0.0.1", 14641) {|serv|
- * s = serv.accept
- * s.puts Time.now
- * s.close
- * }
- *
- */
-static VALUE
-tcp_accept(VALUE sock)
-{
- rb_io_t *fptr;
- struct sockaddr_storage from;
- socklen_t fromlen;
-
- GetOpenFile(sock, fptr);
- fromlen = sizeof(from);
- return rsock_s_accept(rb_cTCPSocket, fptr->fd,
- (struct sockaddr*)&from, &fromlen);
-}
-
-/*
- * call-seq:
- * tcpserver.accept_nonblock => tcpsocket
- *
- * Accepts an incoming connection using accept(2) after
- * O_NONBLOCK is set for the underlying file descriptor.
- * It returns an accepted TCPSocket for the incoming connection.
- *
- * === Example
- * require 'socket'
- * serv = TCPServer.new(2202)
- * begin # emulate blocking accept
- * sock = serv.accept_nonblock
- * rescue IO::WaitReadable, Errno::EINTR
- * IO.select([serv])
- * retry
- * end
- * # sock is an accepted socket.
- *
- * Refer to Socket#accept for the exceptions that may be thrown if the call
- * to TCPServer#accept_nonblock fails.
- *
- * TCPServer#accept_nonblock may raise any error corresponding to accept(2) failure,
- * including Errno::EWOULDBLOCK.
- *
- * If the exception is Errno::EWOULDBLOCK, Errno::AGAIN, Errno::ECONNABORTED, Errno::EPROTO,
- * it is extended by IO::WaitReadable.
- * So IO::WaitReadable can be used to rescue the exceptions for retrying accept_nonblock.
- *
- * === See
- * * TCPServer#accept
- * * Socket#accept
- */
-static VALUE
-tcp_accept_nonblock(VALUE sock)
-{
- rb_io_t *fptr;
- struct sockaddr_storage from;
- socklen_t fromlen;
-
- GetOpenFile(sock, fptr);
- fromlen = sizeof(from);
- return rsock_s_accept_nonblock(rb_cTCPSocket, fptr,
- (struct sockaddr *)&from, &fromlen);
-}
-
-/*
- * call-seq:
- * tcpserver.sysaccept => file_descriptor
- *
- * Returns a file descriptor of a accepted connection.
- *
- * TCPServer.open("127.0.0.1", 28561) {|serv|
- * fd = serv.sysaccept
- * s = IO.for_fd(fd)
- * s.puts Time.now
- * s.close
- * }
- *
- */
-static VALUE
-tcp_sysaccept(VALUE sock)
-{
- rb_io_t *fptr;
- struct sockaddr_storage from;
- socklen_t fromlen;
-
- GetOpenFile(sock, fptr);
- fromlen = sizeof(from);
- return rsock_s_accept(0, fptr->fd, (struct sockaddr*)&from, &fromlen);
-}
-
-/*
- * TCPServer class
- */
-void
-Init_tcpserver(void)
-{
- rb_cTCPServer = rb_define_class("TCPServer", rb_cTCPSocket);
- rb_define_method(rb_cTCPServer, "accept", tcp_accept, 0);
- rb_define_method(rb_cTCPServer, "accept_nonblock", tcp_accept_nonblock, 0);
- rb_define_method(rb_cTCPServer, "sysaccept", tcp_sysaccept, 0);
- rb_define_method(rb_cTCPServer, "initialize", tcp_svr_init, -1);
-}
diff --git a/ext/socket/tcpsocket.c b/ext/socket/tcpsocket.c
deleted file mode 100644
index 1ab62459d1..0000000000
--- a/ext/socket/tcpsocket.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/************************************************
-
- tcpsocket.c -
-
- created at: Thu Mar 31 12:21:29 JST 1994
-
- Copyright (C) 1993-2007 Yukihiro Matsumoto
-
-************************************************/
-
-#include "rubysocket.h"
-
-/*
- * call-seq:
- * TCPSocket.new(remote_host, remote_port, local_host=nil, local_port=nil)
- *
- * Opens a TCP connection to +remote_host+ on +remote_port+. If +local_host+
- * and +local_port+ are specified, then those parameters are used on the local
- * end to establish the connection.
- */
-static VALUE
-tcp_init(int argc, VALUE *argv, VALUE sock)
-{
- VALUE remote_host, remote_serv;
- VALUE local_host, local_serv;
-
- rb_scan_args(argc, argv, "22", &remote_host, &remote_serv,
- &local_host, &local_serv);
-
- return rsock_init_inetsock(sock, remote_host, remote_serv,
- local_host, local_serv, INET_CLIENT);
-}
-
-static VALUE
-tcp_sockaddr(struct sockaddr *addr, size_t len)
-{
- return rsock_make_ipaddr(addr);
-}
-
-/*
- * call-seq:
- * TCPSocket.gethostbyname(hostname) => [official_hostname, alias_hostnames, address_family, *address_list]
- *
- * Lookups host information by _hostname_.
- *
- * TCPSocket.gethostbyname("localhost")
- * #=> ["localhost", ["hal"], 2, "127.0.0.1"]
- *
- */
-static VALUE
-tcp_s_gethostbyname(VALUE obj, VALUE host)
-{
- rb_secure(3);
- return rsock_make_hostent(host, rsock_addrinfo(host, Qnil, SOCK_STREAM, AI_CANONNAME),
- tcp_sockaddr);
-}
-
-/*
- * TCPSocket class
- */
-void
-Init_tcpsocket(void)
-{
- rb_cTCPSocket = rb_define_class("TCPSocket", rb_cIPSocket);
- rb_define_singleton_method(rb_cTCPSocket, "gethostbyname", tcp_s_gethostbyname, 1);
- rb_define_method(rb_cTCPSocket, "initialize", tcp_init, -1);
-}
diff --git a/ext/socket/udpsocket.c b/ext/socket/udpsocket.c
deleted file mode 100644
index ae1f70eb10..0000000000
--- a/ext/socket/udpsocket.c
+++ /dev/null
@@ -1,260 +0,0 @@
-/************************************************
-
- udpsocket.c -
-
- created at: Thu Mar 31 12:21:29 JST 1994
-
- Copyright (C) 1993-2007 Yukihiro Matsumoto
-
-************************************************/
-
-#include "rubysocket.h"
-
-/*
- * call-seq:
- * UDPSocket.new([address_family]) => socket
- *
- * Creates a new UDPSocket object.
- *
- * _address_family_ should be an integer, a string or a symbol:
- * Socket::AF_INET, "AF_INET", :INET, etc.
- *
- * UDPSocket.new #=> #<UDPSocket:fd 3>
- * UDPSocket.new(Socket::AF_INET6) #=> #<UDPSocket:fd 4>
- *
- */
-static VALUE
-udp_init(int argc, VALUE *argv, VALUE sock)
-{
- VALUE arg;
- int family = AF_INET;
- int fd;
-
- rb_secure(3);
- if (rb_scan_args(argc, argv, "01", &arg) == 1) {
- family = rsock_family_arg(arg);
- }
- fd = rsock_socket(family, SOCK_DGRAM, 0);
- if (fd < 0) {
- rb_sys_fail("socket(2) - udp");
- }
-
- return rsock_init_sock(sock, fd);
-}
-
-struct udp_arg
-{
- struct addrinfo *res;
- int fd;
-};
-
-static VALUE
-udp_connect_internal(struct udp_arg *arg)
-{
- int fd = arg->fd;
- struct addrinfo *res;
-
- for (res = arg->res; res; res = res->ai_next) {
- if (rsock_connect(fd, res->ai_addr, res->ai_addrlen, 0) >= 0) {
- return Qtrue;
- }
- }
- return Qfalse;
-}
-
-/*
- * call-seq:
- * udpsocket.connect(host, port) => 0
- *
- * Connects _udpsocket_ to _host_:_port_.
- *
- * This makes possible to send without destination address.
- *
- * u1 = UDPSocket.new
- * u1.bind("127.0.0.1", 4913)
- * u2 = UDPSocket.new
- * u2.connect("127.0.0.1", 4913)
- * u2.send "uuuu", 0
- * p u1.recvfrom(10) #=> ["uuuu", ["AF_INET", 33230, "localhost", "127.0.0.1"]]
- *
- */
-static VALUE
-udp_connect(VALUE sock, VALUE host, VALUE port)
-{
- rb_io_t *fptr;
- struct udp_arg arg;
- VALUE ret;
-
- rb_secure(3);
- arg.res = rsock_addrinfo(host, port, SOCK_DGRAM, 0);
- GetOpenFile(sock, fptr);
- arg.fd = fptr->fd;
- ret = rb_ensure(udp_connect_internal, (VALUE)&arg,
- RUBY_METHOD_FUNC(freeaddrinfo), (VALUE)arg.res);
- if (!ret) rb_sys_fail("connect(2)");
- return INT2FIX(0);
-}
-
-/*
- * call-seq:
- * udpsocket.bind(host, port) #=> 0
- *
- * Binds _udpsocket_ to _host_:_port_.
- *
- * u1 = UDPSocket.new
- * u1.bind("127.0.0.1", 4913)
- * u1.send "message-to-self", 0, "127.0.0.1", 4913
- * p u1.recvfrom(10) #=> ["message-to", ["AF_INET", 4913, "localhost", "127.0.0.1"]]
- *
- */
-static VALUE
-udp_bind(VALUE sock, VALUE host, VALUE port)
-{
- rb_io_t *fptr;
- struct addrinfo *res0, *res;
-
- rb_secure(3);
- res0 = rsock_addrinfo(host, port, SOCK_DGRAM, 0);
- GetOpenFile(sock, fptr);
- for (res = res0; res; res = res->ai_next) {
- if (bind(fptr->fd, res->ai_addr, res->ai_addrlen) < 0) {
- continue;
- }
- freeaddrinfo(res0);
- return INT2FIX(0);
- }
- freeaddrinfo(res0);
- rb_sys_fail("bind(2)");
- return INT2FIX(0);
-}
-
-/*
- * call-seq:
- * udpsocket.send(mesg, flags, host, port) => numbytes_sent
- * udpsocket.send(mesg, flags, sockaddr_to) => numbytes_sent
- * udpsocket.send(mesg, flags) => numbytes_sent
- *
- * Sends _mesg_ via _udpsocket_.
- *
- * _flags_ should be a bitwise OR of Socket::MSG_* constants.
- *
- * u1 = UDPSocket.new
- * u1.bind("127.0.0.1", 4913)
- *
- * u2 = UDPSocket.new
- * u2.send "hi", 0, "127.0.0.1", 4913
- *
- * mesg, addr = u1.recvfrom(10)
- * u1.send mesg, 0, addr[3], addr[1]
- *
- * p u2.recv(100) #=> "hi"
- *
- */
-static VALUE
-udp_send(int argc, VALUE *argv, VALUE sock)
-{
- VALUE flags, host, port;
- rb_io_t *fptr;
- int n;
- struct addrinfo *res0, *res;
- struct rsock_send_arg arg;
-
- if (argc == 2 || argc == 3) {
- return rsock_bsock_send(argc, argv, sock);
- }
- rb_secure(4);
- rb_scan_args(argc, argv, "4", &arg.mesg, &flags, &host, &port);
-
- StringValue(arg.mesg);
- res0 = rsock_addrinfo(host, port, SOCK_DGRAM, 0);
- GetOpenFile(sock, fptr);
- arg.fd = fptr->fd;
- arg.flags = NUM2INT(flags);
- for (res = res0; res; res = res->ai_next) {
- retry:
- arg.to = res->ai_addr;
- arg.tolen = res->ai_addrlen;
- rb_thread_fd_writable(arg.fd);
- n = (int)BLOCKING_REGION(rsock_sendto_blocking, &arg);
- if (n >= 0) {
- freeaddrinfo(res0);
- return INT2FIX(n);
- }
- if (rb_io_wait_writable(fptr->fd)) {
- goto retry;
- }
- }
- freeaddrinfo(res0);
- rb_sys_fail("sendto(2)");
- return INT2FIX(n);
-}
-
-/*
- * call-seq:
- * udpsocket.recvfrom_nonblock(maxlen) => [mesg, sender_inet_addr]
- * udpsocket.recvfrom_nonblock(maxlen, flags) => [mesg, sender_inet_addr]
- *
- * Receives up to _maxlen_ bytes from +udpsocket+ using recvfrom(2) after
- * O_NONBLOCK is set for the underlying file descriptor.
- * If _maxlen_ is ommitted, its default value is 65536.
- * _flags_ is zero or more of the +MSG_+ options.
- * The first element of the results, _mesg_, is the data received.
- * The second element, _sender_inet_addr_, is an array to represent the sender address.
- *
- * When recvfrom(2) returns 0,
- * Socket#recvfrom_nonblock returns an empty string as data.
- * It means an empty packet.
- *
- * === Parameters
- * * +maxlen+ - the number of bytes to receive from the socket
- * * +flags+ - zero or more of the +MSG_+ options
- *
- * === Example
- * require 'socket'
- * s1 = UDPSocket.new
- * s1.bind("127.0.0.1", 0)
- * s2 = UDPSocket.new
- * s2.bind("127.0.0.1", 0)
- * s2.connect(*s1.addr.values_at(3,1))
- * s1.connect(*s2.addr.values_at(3,1))
- * s1.send "aaa", 0
- * begin # emulate blocking recvfrom
- * p s2.recvfrom_nonblock(10) #=> ["aaa", ["AF_INET", 33302, "localhost.localdomain", "127.0.0.1"]]
- * rescue IO::WaitReadable
- * IO.select([s2])
- * retry
- * end
- *
- * Refer to Socket#recvfrom for the exceptions that may be thrown if the call
- * to _recvfrom_nonblock_ fails.
- *
- * UDPSocket#recvfrom_nonblock may raise any error corresponding to recvfrom(2) failure,
- * including Errno::EWOULDBLOCK.
- *
- * If the exception is Errno::EWOULDBLOCK or Errno::AGAIN,
- * it is extended by IO::WaitReadable.
- * So IO::WaitReadable can be used to rescue the exceptions for retrying recvfrom_nonblock.
- *
- * === See
- * * Socket#recvfrom
- */
-static VALUE
-udp_recvfrom_nonblock(int argc, VALUE *argv, VALUE sock)
-{
- return rsock_s_recvfrom_nonblock(sock, argc, argv, RECV_IP);
-}
-
-/*
- * UDPSocket class
- */
-void
-Init_udpsocket(void)
-{
- rb_cUDPSocket = rb_define_class("UDPSocket", rb_cIPSocket);
- rb_define_method(rb_cUDPSocket, "initialize", udp_init, -1);
- rb_define_method(rb_cUDPSocket, "connect", udp_connect, 2);
- rb_define_method(rb_cUDPSocket, "bind", udp_bind, 2);
- rb_define_method(rb_cUDPSocket, "send", udp_send, -1);
- rb_define_method(rb_cUDPSocket, "recvfrom_nonblock", udp_recvfrom_nonblock, -1);
-}
-
diff --git a/ext/socket/unixserver.c b/ext/socket/unixserver.c
deleted file mode 100644
index fa41cba02a..0000000000
--- a/ext/socket/unixserver.c
+++ /dev/null
@@ -1,151 +0,0 @@
-/************************************************
-
- unixserver.c -
-
- created at: Thu Mar 31 12:21:29 JST 1994
-
- Copyright (C) 1993-2007 Yukihiro Matsumoto
-
-************************************************/
-
-#include "rubysocket.h"
-
-#ifdef HAVE_SYS_UN_H
-/*
- * call-seq:
- * UNIXServer.new(path) => unixserver
- *
- * Creates a new UNIX server socket bound to _path_.
- *
- * serv = UNIXServer.new("/tmp/sock")
- * s = serv.accept
- * p s.read
- */
-static VALUE
-unix_svr_init(VALUE sock, VALUE path)
-{
- return rsock_init_unixsock(sock, path, 1);
-}
-
-/*
- * call-seq:
- * unixserver.accept => unixsocket
- *
- * Accepts a new connection.
- * It returns new UNIXSocket object.
- *
- * UNIXServer.open("/tmp/sock") {|serv|
- * UNIXSocket.open("/tmp/sock") {|c|
- * s = serv.accept
- * s.puts "hi"
- * s.close
- * p c.read #=> "hi\n"
- * }
- * }
- *
- */
-static VALUE
-unix_accept(VALUE sock)
-{
- rb_io_t *fptr;
- struct sockaddr_un from;
- socklen_t fromlen;
-
- GetOpenFile(sock, fptr);
- fromlen = sizeof(struct sockaddr_un);
- return rsock_s_accept(rb_cUNIXSocket, fptr->fd,
- (struct sockaddr*)&from, &fromlen);
-}
-
-/*
- * call-seq:
- * unixserver.accept_nonblock => unixsocket
- *
- * Accepts an incoming connection using accept(2) after
- * O_NONBLOCK is set for the underlying file descriptor.
- * It returns an accepted UNIXSocket for the incoming connection.
- *
- * === Example
- * require 'socket'
- * serv = UNIXServer.new("/tmp/sock")
- * begin # emulate blocking accept
- * sock = serv.accept_nonblock
- * rescue IO::WaitReadable, Errno::EINTR
- * IO.select([serv])
- * retry
- * end
- * # sock is an accepted socket.
- *
- * Refer to Socket#accept for the exceptions that may be thrown if the call
- * to UNIXServer#accept_nonblock fails.
- *
- * UNIXServer#accept_nonblock may raise any error corresponding to accept(2) failure,
- * including Errno::EWOULDBLOCK.
- *
- * If the exception is Errno::EWOULDBLOCK, Errno::AGAIN, Errno::ECONNABORTED or Errno::EPROTO,
- * it is extended by IO::WaitReadable.
- * So IO::WaitReadable can be used to rescue the exceptions for retrying accept_nonblock.
- *
- * === See
- * * UNIXServer#accept
- * * Socket#accept
- */
-static VALUE
-unix_accept_nonblock(VALUE sock)
-{
- rb_io_t *fptr;
- struct sockaddr_un from;
- socklen_t fromlen;
-
- GetOpenFile(sock, fptr);
- fromlen = sizeof(from);
- return rsock_s_accept_nonblock(rb_cUNIXSocket, fptr,
- (struct sockaddr *)&from, &fromlen);
-}
-
-/*
- * call-seq:
- * unixserver.sysaccept => file_descriptor
- *
- * Accepts a new connection.
- * It returns the new file descriptor which is an integer.
- *
- * UNIXServer.open("/tmp/sock") {|serv|
- * UNIXSocket.open("/tmp/sock") {|c|
- * fd = serv.sysaccept
- * s = IO.new(fd)
- * s.puts "hi"
- * s.close
- * p c.read #=> "hi\n"
- * }
- * }
- *
- */
-static VALUE
-unix_sysaccept(VALUE sock)
-{
- rb_io_t *fptr;
- struct sockaddr_un from;
- socklen_t fromlen;
-
- GetOpenFile(sock, fptr);
- fromlen = sizeof(struct sockaddr_un);
- return rsock_s_accept(0, fptr->fd, (struct sockaddr*)&from, &fromlen);
-}
-
-#endif
-
-/*
- * UNIXServer class
- */
-void
-Init_unixserver(void)
-{
-#ifdef HAVE_SYS_UN_H
- rb_cUNIXServer = rb_define_class("UNIXServer", rb_cUNIXSocket);
- rb_define_method(rb_cUNIXServer, "initialize", unix_svr_init, 1);
- rb_define_method(rb_cUNIXServer, "accept", unix_accept, 0);
- rb_define_method(rb_cUNIXServer, "accept_nonblock", unix_accept_nonblock, 0);
- rb_define_method(rb_cUNIXServer, "sysaccept", unix_sysaccept, 0);
-#endif
-}
diff --git a/ext/socket/unixsocket.c b/ext/socket/unixsocket.c
deleted file mode 100644
index df1a11d094..0000000000
--- a/ext/socket/unixsocket.c
+++ /dev/null
@@ -1,505 +0,0 @@
-/************************************************
-
- unixsocket.c -
-
- created at: Thu Mar 31 12:21:29 JST 1994
-
- Copyright (C) 1993-2007 Yukihiro Matsumoto
-
-************************************************/
-
-#include "rubysocket.h"
-
-#ifdef HAVE_SYS_UN_H
-struct unixsock_arg {
- struct sockaddr_un *sockaddr;
- int fd;
-};
-
-static VALUE
-unixsock_connect_internal(struct unixsock_arg *arg)
-{
- return (VALUE)rsock_connect(arg->fd, (struct sockaddr*)arg->sockaddr,
- sizeof(*arg->sockaddr), 0);
-}
-
-VALUE
-rsock_init_unixsock(VALUE sock, VALUE path, int server)
-{
- struct sockaddr_un sockaddr;
- int fd, status;
- rb_io_t *fptr;
-
- SafeStringValue(path);
- fd = rsock_socket(AF_UNIX, SOCK_STREAM, 0);
- if (fd < 0) {
- rb_sys_fail("socket(2)");
- }
-
- MEMZERO(&sockaddr, struct sockaddr_un, 1);
- sockaddr.sun_family = AF_UNIX;
- if (sizeof(sockaddr.sun_path) <= (size_t)RSTRING_LEN(path)) {
- rb_raise(rb_eArgError, "too long unix socket path (max: %dbytes)",
- (int)sizeof(sockaddr.sun_path)-1);
- }
- memcpy(sockaddr.sun_path, RSTRING_PTR(path), RSTRING_LEN(path));
-
- if (server) {
- status = bind(fd, (struct sockaddr*)&sockaddr, sizeof(sockaddr));
- }
- else {
- int prot;
- struct unixsock_arg arg;
- arg.sockaddr = &sockaddr;
- arg.fd = fd;
- status = rb_protect((VALUE(*)(VALUE))unixsock_connect_internal,
- (VALUE)&arg, &prot);
- if (prot) {
- close(fd);
- rb_jump_tag(prot);
- }
- }
-
- if (status < 0) {
- close(fd);
- rb_sys_fail(sockaddr.sun_path);
- }
-
- if (server) listen(fd, 5);
-
- rsock_init_sock(sock, fd);
- if (server) {
- GetOpenFile(sock, fptr);
- fptr->pathv = rb_str_new_frozen(path);
- }
-
- return sock;
-}
-
-/*
- * call-seq:
- * UNIXSocket.new(path) => unixsocket
- *
- * Creates a new UNIX client socket connected to _path_.
- *
- * s = UNIXSocket.new("/tmp/sock")
- * s.send "hello", 0
- *
- */
-static VALUE
-unix_init(VALUE sock, VALUE path)
-{
- return rsock_init_unixsock(sock, path, 0);
-}
-
-/*
- * call-seq:
- * unixsocket.path => path
- *
- * Returns the path of the local address of unixsocket.
- *
- * s = UNIXServer.new("/tmp/sock")
- * p s.path #=> "/tmp/sock"
- *
- */
-static VALUE
-unix_path(VALUE sock)
-{
- rb_io_t *fptr;
-
- GetOpenFile(sock, fptr);
- if (NIL_P(fptr->pathv)) {
- struct sockaddr_un addr;
- socklen_t len = sizeof(addr);
- if (getsockname(fptr->fd, (struct sockaddr*)&addr, &len) < 0)
- rb_sys_fail(0);
- fptr->pathv = rb_obj_freeze(rb_str_new_cstr(rsock_unixpath(&addr, len)));
- }
- return rb_str_dup(fptr->pathv);
-}
-
-/*
- * call-seq:
- * unixsocket.recvfrom(maxlen [, flags]) => [mesg, unixaddress]
- *
- * Receives a message via _unixsocket_.
- *
- * _maxlen_ is the maximum number of bytes to receive.
- *
- * _flags_ should be a bitwise OR of Socket::MSG_* constants.
- *
- * s1 = Socket.new(:UNIX, :DGRAM, 0)
- * s1_ai = Addrinfo.unix("/tmp/sock1")
- * s1.bind(s1_ai)
- *
- * s2 = Socket.new(:UNIX, :DGRAM, 0)
- * s2_ai = Addrinfo.unix("/tmp/sock2")
- * s2.bind(s2_ai)
- * s3 = UNIXSocket.for_fd(s2.fileno)
- *
- * s1.send "a", 0, s2_ai
- * p s3.recvfrom(10) #=> ["a", ["AF_UNIX", "/tmp/sock1"]]
- *
- */
-static VALUE
-unix_recvfrom(int argc, VALUE *argv, VALUE sock)
-{
- return rsock_s_recvfrom(sock, argc, argv, RECV_UNIX);
-}
-
-#if defined(HAVE_ST_MSG_CONTROL) && defined(SCM_RIGHTS)
-#define FD_PASSING_BY_MSG_CONTROL 1
-#else
-#define FD_PASSING_BY_MSG_CONTROL 0
-#endif
-
-#if defined(HAVE_ST_MSG_ACCRIGHTS)
-#define FD_PASSING_BY_MSG_ACCRIGHTS 1
-#else
-#define FD_PASSING_BY_MSG_ACCRIGHTS 0
-#endif
-
-struct iomsg_arg {
- int fd;
- struct msghdr msg;
-};
-
-static VALUE
-sendmsg_blocking(void *data)
-{
- struct iomsg_arg *arg = data;
- return sendmsg(arg->fd, &arg->msg, 0);
-}
-
-#if defined(HAVE_SENDMSG) && (FD_PASSING_BY_MSG_CONTROL || FD_PASSING_BY_MSG_ACCRIGHTS)
-/*
- * call-seq:
- * unixsocket.send_io(io) => nil
- *
- * Sends _io_ as file descriptor passing.
- *
- * s1, s2 = UNIXSocket.pair
- *
- * s1.send_io STDOUT
- * stdout = s2.recv_io
- *
- * p STDOUT.fileno #=> 1
- * p stdout.fileno #=> 6
- *
- * stdout.puts "hello" # outputs "hello\n" to standard output.
- */
-static VALUE
-unix_send_io(VALUE sock, VALUE val)
-{
- int fd;
- rb_io_t *fptr;
- struct iomsg_arg arg;
- struct iovec vec[1];
- char buf[1];
-
-#if FD_PASSING_BY_MSG_CONTROL
- struct {
- struct cmsghdr hdr;
- char pad[8+sizeof(int)+8];
- } cmsg;
-#endif
-
- if (rb_obj_is_kind_of(val, rb_cIO)) {
- rb_io_t *valfptr;
- GetOpenFile(val, valfptr);
- fd = valfptr->fd;
- }
- else if (FIXNUM_P(val)) {
- fd = FIX2INT(val);
- }
- else {
- rb_raise(rb_eTypeError, "neither IO nor file descriptor");
- }
-
- GetOpenFile(sock, fptr);
-
- arg.msg.msg_name = NULL;
- arg.msg.msg_namelen = 0;
-
- /* Linux and Solaris doesn't work if msg_iov is NULL. */
- buf[0] = '\0';
- vec[0].iov_base = buf;
- vec[0].iov_len = 1;
- arg.msg.msg_iov = vec;
- arg.msg.msg_iovlen = 1;
-
-#if FD_PASSING_BY_MSG_CONTROL
- arg.msg.msg_control = (caddr_t)&cmsg;
- arg.msg.msg_controllen = CMSG_LEN(sizeof(int));
- arg.msg.msg_flags = 0;
- MEMZERO((char*)&cmsg, char, sizeof(cmsg));
- cmsg.hdr.cmsg_len = CMSG_LEN(sizeof(int));
- cmsg.hdr.cmsg_level = SOL_SOCKET;
- cmsg.hdr.cmsg_type = SCM_RIGHTS;
- memcpy(CMSG_DATA(&cmsg.hdr), &fd, sizeof(int));
-#else
- arg.msg.msg_accrights = (caddr_t)&fd;
- arg.msg.msg_accrightslen = sizeof(fd);
-#endif
-
- arg.fd = fptr->fd;
- rb_thread_fd_writable(arg.fd);
- if ((int)BLOCKING_REGION(sendmsg_blocking, &arg) == -1)
- rb_sys_fail("sendmsg(2)");
-
- return Qnil;
-}
-#else
-#define unix_send_io rb_f_notimplement
-#endif
-
-static VALUE
-recvmsg_blocking(void *data)
-{
- struct iomsg_arg *arg = data;
- return recvmsg(arg->fd, &arg->msg, 0);
-}
-
-#if defined(HAVE_RECVMSG) && (FD_PASSING_BY_MSG_CONTROL || FD_PASSING_BY_MSG_ACCRIGHTS)
-/*
- * call-seq:
- * unixsocket.recv_io([klass [, mode]]) => io
- *
- * UNIXServer.open("/tmp/sock") {|serv|
- * UNIXSocket.open("/tmp/sock") {|c|
- * s = serv.accept
- *
- * c.send_io STDOUT
- * stdout = s.recv_io
- *
- * p STDOUT.fileno #=> 1
- * p stdout.fileno #=> 7
- *
- * stdout.puts "hello" # outputs "hello\n" to standard output.
- * }
- * }
- *
- */
-static VALUE
-unix_recv_io(int argc, VALUE *argv, VALUE sock)
-{
- VALUE klass, mode;
- rb_io_t *fptr;
- struct iomsg_arg arg;
- struct iovec vec[2];
- char buf[1];
-
- int fd;
-#if FD_PASSING_BY_MSG_CONTROL
- struct {
- struct cmsghdr hdr;
- char pad[8+sizeof(int)+8];
- } cmsg;
-#endif
-
- rb_scan_args(argc, argv, "02", &klass, &mode);
- if (argc == 0)
- klass = rb_cIO;
- if (argc <= 1)
- mode = Qnil;
-
- GetOpenFile(sock, fptr);
-
- arg.msg.msg_name = NULL;
- arg.msg.msg_namelen = 0;
-
- vec[0].iov_base = buf;
- vec[0].iov_len = sizeof(buf);
- arg.msg.msg_iov = vec;
- arg.msg.msg_iovlen = 1;
-
-#if FD_PASSING_BY_MSG_CONTROL
- arg.msg.msg_control = (caddr_t)&cmsg;
- arg.msg.msg_controllen = CMSG_SPACE(sizeof(int));
- arg.msg.msg_flags = 0;
- cmsg.hdr.cmsg_len = CMSG_LEN(sizeof(int));
- cmsg.hdr.cmsg_level = SOL_SOCKET;
- cmsg.hdr.cmsg_type = SCM_RIGHTS;
- fd = -1;
- memcpy(CMSG_DATA(&cmsg.hdr), &fd, sizeof(int));
-#else
- arg.msg.msg_accrights = (caddr_t)&fd;
- arg.msg.msg_accrightslen = sizeof(fd);
- fd = -1;
-#endif
-
- arg.fd = fptr->fd;
- rb_thread_wait_fd(arg.fd);
- if ((int)BLOCKING_REGION(recvmsg_blocking, &arg) == -1)
- rb_sys_fail("recvmsg(2)");
-
-#if FD_PASSING_BY_MSG_CONTROL
- if (arg.msg.msg_controllen < sizeof(struct cmsghdr)) {
- rb_raise(rb_eSocket,
- "file descriptor was not passed (msg_controllen=%d smaller than sizeof(struct cmsghdr)=%d)",
- (int)arg.msg.msg_controllen, (int)sizeof(struct cmsghdr));
- }
- if (cmsg.hdr.cmsg_level != SOL_SOCKET) {
- rb_raise(rb_eSocket,
- "file descriptor was not passed (cmsg_level=%d, %d expected)",
- cmsg.hdr.cmsg_level, SOL_SOCKET);
- }
- if (cmsg.hdr.cmsg_type != SCM_RIGHTS) {
- rb_raise(rb_eSocket,
- "file descriptor was not passed (cmsg_type=%d, %d expected)",
- cmsg.hdr.cmsg_type, SCM_RIGHTS);
- }
- if (arg.msg.msg_controllen < CMSG_LEN(sizeof(int))) {
- rb_raise(rb_eSocket,
- "file descriptor was not passed (msg_controllen=%d smaller than CMSG_LEN(sizeof(int))=%d)",
- (int)arg.msg.msg_controllen, (int)CMSG_LEN(sizeof(int)));
- }
- if (CMSG_SPACE(sizeof(int)) < arg.msg.msg_controllen) {
- rb_raise(rb_eSocket,
- "file descriptor was not passed (msg_controllen=%d bigger than CMSG_SPACE(sizeof(int))=%d)",
- (int)arg.msg.msg_controllen, (int)CMSG_SPACE(sizeof(int)));
- }
- if (cmsg.hdr.cmsg_len != CMSG_LEN(sizeof(int))) {
- rsock_discard_cmsg_resource(&arg.msg);
- rb_raise(rb_eSocket,
- "file descriptor was not passed (cmsg_len=%d, %d expected)",
- (int)cmsg.hdr.cmsg_len, (int)CMSG_LEN(sizeof(int)));
- }
-#else
- if (arg.msg.msg_accrightslen != sizeof(fd)) {
- rb_raise(rb_eSocket,
- "file descriptor was not passed (accrightslen) : %d != %d",
- arg.msg.msg_accrightslen, (int)sizeof(fd));
- }
-#endif
-
-#if FD_PASSING_BY_MSG_CONTROL
- memcpy(&fd, CMSG_DATA(&cmsg.hdr), sizeof(int));
-#endif
-
- if (klass == Qnil)
- return INT2FIX(fd);
- else {
- ID for_fd;
- int ff_argc;
- VALUE ff_argv[2];
- CONST_ID(for_fd, "for_fd");
- ff_argc = mode == Qnil ? 1 : 2;
- ff_argv[0] = INT2FIX(fd);
- ff_argv[1] = mode;
- return rb_funcall2(klass, for_fd, ff_argc, ff_argv);
- }
-}
-#else
-#define unix_recv_io rb_f_notimplement
-#endif
-
-/*
- * call-seq:
- * unixsocket.addr => [address_family, unix_path]
- *
- * Returns the local address as an array which contains
- * address_family and unix_path.
- *
- * Example
- * serv = UNIXServer.new("/tmp/sock")
- * p serv.addr #=> ["AF_UNIX", "/tmp/sock"]
- */
-static VALUE
-unix_addr(VALUE sock)
-{
- rb_io_t *fptr;
- struct sockaddr_un addr;
- socklen_t len = sizeof addr;
-
- GetOpenFile(sock, fptr);
-
- if (getsockname(fptr->fd, (struct sockaddr*)&addr, &len) < 0)
- rb_sys_fail("getsockname(2)");
- return rsock_unixaddr(&addr, len);
-}
-
-/*
- * call-seq:
- * unixsocket.peeraddr => [address_family, unix_path]
- *
- * Returns the remote address as an array which contains
- * address_family and unix_path.
- *
- * Example
- * serv = UNIXServer.new("/tmp/sock")
- * c = UNIXSocket.new("/tmp/sock")
- * p c.peeraddr #=> ["AF_UNIX", "/tmp/sock"]
- */
-static VALUE
-unix_peeraddr(VALUE sock)
-{
- rb_io_t *fptr;
- struct sockaddr_un addr;
- socklen_t len = sizeof addr;
-
- GetOpenFile(sock, fptr);
-
- if (getpeername(fptr->fd, (struct sockaddr*)&addr, &len) < 0)
- rb_sys_fail("getpeername(2)");
- return rsock_unixaddr(&addr, len);
-}
-
-/*
- * call-seq:
- * UNIXSocket.pair([type [, protocol]]) => [unixsocket1, unixsocket2]
- * UNIXSocket.socketpair([type [, protocol]]) => [unixsocket1, unixsocket2]
- *
- * Creates a pair of sockets connected each other.
- *
- * _socktype_ should be a socket type such as: :STREAM, :DGRAM, :RAW, etc.
- *
- * _protocol_ should be a protocol defined in the domain.
- * 0 is default protocol for the domain.
- *
- * s1, s2 = UNIXSocket.pair
- * s1.send "a", 0
- * s1.send "b", 0
- * p s2.recv(10) #=> "ab"
- *
- */
-static VALUE
-unix_s_socketpair(int argc, VALUE *argv, VALUE klass)
-{
- VALUE domain, type, protocol;
- domain = INT2FIX(PF_UNIX);
- VALUE args[3];
-
- rb_scan_args(argc, argv, "02", &type, &protocol);
- if (argc == 0)
- type = INT2FIX(SOCK_STREAM);
- if (argc <= 1)
- protocol = INT2FIX(0);
-
- args[0] = domain;
- args[1] = type;
- args[2] = protocol;
-
- return rsock_sock_s_socketpair(3, args, klass);
-}
-#endif
-
-/*
- * UNIXSocket class
- */
-void
-Init_unixsocket(void)
-{
-#ifdef HAVE_SYS_UN_H
- rb_cUNIXSocket = rb_define_class("UNIXSocket", rb_cBasicSocket);
- rb_define_method(rb_cUNIXSocket, "initialize", unix_init, 1);
- rb_define_method(rb_cUNIXSocket, "path", unix_path, 0);
- rb_define_method(rb_cUNIXSocket, "addr", unix_addr, 0);
- rb_define_method(rb_cUNIXSocket, "peeraddr", unix_peeraddr, 0);
- rb_define_method(rb_cUNIXSocket, "recvfrom", unix_recvfrom, -1);
- rb_define_method(rb_cUNIXSocket, "send_io", unix_send_io, 1);
- rb_define_method(rb_cUNIXSocket, "recv_io", unix_recv_io, -1);
- rb_define_singleton_method(rb_cUNIXSocket, "socketpair", unix_s_socketpair, -1);
- rb_define_singleton_method(rb_cUNIXSocket, "pair", unix_s_socketpair, -1);
-#endif
-}
diff --git a/ext/stringio/.cvsignore b/ext/stringio/.cvsignore
index 814345ece8..4088712231 100644
--- a/ext/stringio/.cvsignore
+++ b/ext/stringio/.cvsignore
@@ -1,4 +1,3 @@
Makefile
mkmf.log
*.def
-extconf.h
diff --git a/ext/stringio/README b/ext/stringio/README
index 10dd237de8..c4031f7e97 100644
--- a/ext/stringio/README
+++ b/ext/stringio/README
@@ -1,5 +1,6 @@
-*- rd -*-
$Author$
+$Date$
=begin
diff --git a/ext/stringio/depend b/ext/stringio/depend
index 338ebde529..cc9eae3f55 100644
--- a/ext/stringio/depend
+++ b/ext/stringio/depend
@@ -1,3 +1,2 @@
-stringio.o: stringio.c $(hdrdir)/ruby/ruby.h $(arch_hdrdir)/ruby/config.h \
- $(hdrdir)/ruby/defines.h $(hdrdir)/ruby/intern.h $(hdrdir)/ruby/io.h \
- $(hdrdir)/ruby/encoding.h
+stringio.o: stringio.c $(hdrdir)/ruby.h $(topdir)/config.h \
+ $(hdrdir)/defines.h $(hdrdir)/intern.h $(hdrdir)/rubyio.h
diff --git a/ext/stringio/stringio.c b/ext/stringio/stringio.c
index 7514264f6a..537fc19a4e 100644
--- a/ext/stringio/stringio.c
+++ b/ext/stringio/stringio.c
@@ -3,6 +3,7 @@
stringio.c -
$Author$
+ $Date$
$RoughId: stringio.c,v 1.13 2002/03/14 03:24:18 nobu Exp $
created at: Tue Feb 19 04:10:38 JST 2002
@@ -12,14 +13,16 @@
**********************************************************************/
#include "ruby.h"
-#include "ruby/io.h"
-#include "ruby/encoding.h"
+#include "rubyio.h"
+#include "re.h"
#if defined(HAVE_FCNTL_H) || defined(_WIN32)
#include <fcntl.h>
#elif defined(HAVE_SYS_FCNTL_H)
#include <sys/fcntl.h>
#endif
+#define STRIO_EOF FMODE_SYNC
+
struct StringIO {
VALUE string;
long pos;
@@ -28,9 +31,14 @@ struct StringIO {
int count;
};
+static struct StringIO* strio_alloc _((void));
static void strio_mark _((struct StringIO *));
static void strio_free _((struct StringIO *));
-static void strio_init(int, VALUE *, struct StringIO *);
+static struct StringIO* check_strio _((VALUE));
+static struct StringIO* get_strio _((VALUE));
+static struct StringIO* readable _((struct StringIO *));
+static struct StringIO* writable _((struct StringIO *));
+static void check_modifiable _((struct StringIO *));
#define IS_STRIO(obj) (RDATA(obj)->dmark == (RUBY_DATA_FUNC)strio_mark)
#define error_inval(msg) (errno = EINVAL, rb_sys_fail(msg))
@@ -48,7 +56,8 @@ strio_alloc()
}
static void
-strio_mark(struct StringIO *ptr)
+strio_mark(ptr)
+ struct StringIO *ptr;
{
if (ptr) {
rb_gc_mark(ptr->string);
@@ -56,7 +65,8 @@ strio_mark(struct StringIO *ptr)
}
static void
-strio_free(struct StringIO *ptr)
+strio_free(ptr)
+ struct StringIO *ptr;
{
if (--ptr->count <= 0) {
xfree(ptr);
@@ -64,7 +74,8 @@ strio_free(struct StringIO *ptr)
}
static struct StringIO*
-check_strio(VALUE self)
+check_strio(self)
+ VALUE self;
{
Check_Type(self, T_DATA);
if (!IS_STRIO(self)) {
@@ -75,7 +86,8 @@ check_strio(VALUE self)
}
static struct StringIO*
-get_strio(VALUE self)
+get_strio(self)
+ VALUE self;
{
struct StringIO *ptr = check_strio(self);
@@ -85,18 +97,6 @@ get_strio(VALUE self)
return ptr;
}
-static VALUE
-strio_substr(struct StringIO *ptr, long pos, long len)
-{
- VALUE str = ptr->string;
- rb_encoding *enc = rb_enc_get(str);
- long rlen = RSTRING_LEN(str) - pos;
-
- if (len > rlen) len = rlen;
- if (len < 0) len = 0;
- return rb_enc_str_new(RSTRING_PTR(str)+pos, len, enc);
-}
-
#define StringIO(obj) get_strio(obj)
#define CLOSED(ptr) (!((ptr)->flags & FMODE_READWRITE))
@@ -104,7 +104,8 @@ strio_substr(struct StringIO *ptr, long pos, long len)
#define WRITABLE(ptr) ((ptr)->flags & FMODE_WRITABLE)
static struct StringIO*
-readable(struct StringIO *ptr)
+readable(ptr)
+ struct StringIO *ptr;
{
if (!READABLE(ptr)) {
rb_raise(rb_eIOError, "not opened for reading");
@@ -113,7 +114,8 @@ readable(struct StringIO *ptr)
}
static struct StringIO*
-writable(struct StringIO *ptr)
+writable(ptr)
+ struct StringIO *ptr;
{
if (!WRITABLE(ptr)) {
rb_raise(rb_eIOError, "not opened for writing");
@@ -125,26 +127,97 @@ writable(struct StringIO *ptr)
}
static void
-check_modifiable(struct StringIO *ptr)
+check_modifiable(ptr)
+ struct StringIO *ptr;
{
if (OBJ_FROZEN(ptr->string)) {
rb_raise(rb_eIOError, "not modifiable string");
}
}
+static VALUE strio_s_allocate _((VALUE));
+static VALUE strio_s_open _((int, VALUE *, VALUE));
+static void strio_init _((int, VALUE *, struct StringIO *));
+static VALUE strio_initialize _((int, VALUE *, VALUE));
+static VALUE strio_finalize _((VALUE));
+static VALUE strio_self _((VALUE));
+static VALUE strio_false _((VALUE));
+static VALUE strio_nil _((VALUE));
+static VALUE strio_0 _((VALUE));
+static VALUE strio_first _((VALUE, VALUE));
+static VALUE strio_unimpl _((int, VALUE *, VALUE));
+static VALUE strio_get_string _((VALUE));
+static VALUE strio_set_string _((VALUE, VALUE));
+static VALUE strio_close _((VALUE));
+static VALUE strio_close_read _((VALUE));
+static VALUE strio_close_write _((VALUE));
+static VALUE strio_closed _((VALUE));
+static VALUE strio_closed_read _((VALUE));
+static VALUE strio_closed_write _((VALUE));
+static VALUE strio_eof _((VALUE));
+static VALUE strio_get_lineno _((VALUE));
+static VALUE strio_set_lineno _((VALUE, VALUE));
+static VALUE strio_get_pos _((VALUE));
+static VALUE strio_set_pos _((VALUE, VALUE));
+static VALUE strio_rewind _((VALUE));
+static VALUE strio_seek _((int, VALUE *, VALUE));
+static VALUE strio_get_sync _((VALUE));
+static VALUE strio_each_byte _((VALUE));
+static VALUE strio_each_char _((VALUE));
+static VALUE strio_getc _((VALUE));
+static VALUE strio_ungetc _((VALUE, VALUE));
+static VALUE strio_readchar _((VALUE));
+static VALUE strio_getline _((int, VALUE *, struct StringIO *));
+static VALUE strio_gets _((int, VALUE *, VALUE));
+static VALUE strio_readline _((int, VALUE *, VALUE));
+static VALUE strio_each _((int, VALUE *, VALUE));
+static VALUE strio_readlines _((int, VALUE *, VALUE));
+static VALUE strio_write _((VALUE, VALUE));
+static VALUE strio_putc _((VALUE, VALUE));
+static VALUE strio_read _((int, VALUE *, VALUE));
+static VALUE strio_size _((VALUE));
+static VALUE strio_truncate _((VALUE, VALUE));
+void Init_stringio _((void));
+
+/* Boyer-Moore search: copied from regex.c */
+static void bm_init_skip _((long *, const char *, long));
+static long bm_search _((const char *, long, const char *, long, const long *));
+
static VALUE
-strio_s_allocate(VALUE klass)
+strio_s_allocate(klass)
+ VALUE klass;
{
return Data_Wrap_Struct(klass, strio_mark, strio_free, 0);
}
/*
+ * call-seq: StringIO.open(string=""[, mode]) {|strio| ...}
+ *
+ * Equivalent to StringIO.new except that when it is called with a block, it
+ * yields with the new instance and closes it, and returns the result which
+ * returned from the block.
+ */
+static VALUE
+strio_s_open(argc, argv, klass)
+ int argc;
+ VALUE *argv;
+ VALUE klass;
+{
+ VALUE obj = rb_class_new_instance(argc, argv, klass);
+ if (!rb_block_given_p()) return obj;
+ return rb_ensure(rb_yield, obj, strio_finalize, obj);
+}
+
+/*
* call-seq: StringIO.new(string=""[, mode])
*
* Creates new StringIO instance from with _string_ and _mode_.
*/
static VALUE
-strio_initialize(int argc, VALUE *argv, VALUE self)
+strio_initialize(argc, argv, self)
+ int argc;
+ VALUE *argv;
+ VALUE self;
{
struct StringIO *ptr = check_strio(self);
@@ -157,10 +230,13 @@ strio_initialize(int argc, VALUE *argv, VALUE self)
}
static void
-strio_init(int argc, VALUE *argv, struct StringIO *ptr)
+strio_init(argc, argv, ptr)
+ int argc;
+ VALUE *argv;
+ struct StringIO *ptr;
{
VALUE string, mode;
- int trunc = 0;
+ int trunc = Qfalse;
switch (rb_scan_args(argc, argv, "02", &string, &mode)) {
case 2:
@@ -188,17 +264,16 @@ strio_init(int argc, VALUE *argv, struct StringIO *ptr)
ptr->flags = OBJ_FROZEN(string) ? FMODE_READABLE : FMODE_READWRITE;
break;
case 0:
- string = rb_enc_str_new("", 0, rb_default_external_encoding());
+ string = rb_str_new("", 0);
ptr->flags = FMODE_READWRITE;
break;
}
ptr->string = string;
- ptr->pos = 0;
- ptr->lineno = 0;
}
static VALUE
-strio_finalize(VALUE self)
+strio_finalize(self)
+ VALUE self;
{
struct StringIO *ptr = StringIO(self);
ptr->string = Qnil;
@@ -207,25 +282,11 @@ strio_finalize(VALUE self)
}
/*
- * call-seq: StringIO.open(string=""[, mode]) {|strio| ...}
- *
- * Equivalent to StringIO.new except that when it is called with a block, it
- * yields with the new instance and closes it, and returns the result which
- * returned from the block.
- */
-static VALUE
-strio_s_open(int argc, VALUE *argv, VALUE klass)
-{
- VALUE obj = rb_class_new_instance(argc, argv, klass);
- if (!rb_block_given_p()) return obj;
- return rb_ensure(rb_yield, obj, strio_finalize, obj);
-}
-
-/*
* Returns +false+. Just for compatibility to IO.
*/
static VALUE
-strio_false(VALUE self)
+strio_false(self)
+ VALUE self;
{
StringIO(self);
return Qfalse;
@@ -235,7 +296,8 @@ strio_false(VALUE self)
* Returns +nil+. Just for compatibility to IO.
*/
static VALUE
-strio_nil(VALUE self)
+strio_nil(self)
+ VALUE self;
{
StringIO(self);
return Qnil;
@@ -245,7 +307,8 @@ strio_nil(VALUE self)
* Returns *strio* itself. Just for compatibility to IO.
*/
static VALUE
-strio_self(VALUE self)
+strio_self(self)
+ VALUE self;
{
StringIO(self);
return self;
@@ -255,7 +318,8 @@ strio_self(VALUE self)
* Returns 0. Just for compatibility to IO.
*/
static VALUE
-strio_0(VALUE self)
+strio_0(self)
+ VALUE self;
{
StringIO(self);
return INT2FIX(0);
@@ -265,7 +329,8 @@ strio_0(VALUE self)
* Returns the argument unchanged. Just for compatibility to IO.
*/
static VALUE
-strio_first(VALUE self, VALUE arg)
+strio_first(self, arg)
+ VALUE self, arg;
{
StringIO(self);
return arg;
@@ -275,7 +340,10 @@ strio_first(VALUE self, VALUE arg)
* Raises NotImplementedError.
*/
static VALUE
-strio_unimpl(int argc, VALUE *argv, VALUE self)
+strio_unimpl(argc, argv, self)
+ int argc;
+ VALUE *argv;
+ VALUE self;
{
StringIO(self);
rb_notimplement();
@@ -288,7 +356,8 @@ strio_unimpl(int argc, VALUE *argv, VALUE self)
* Returns underlying String object, the subject of IO.
*/
static VALUE
-strio_get_string(VALUE self)
+strio_get_string(self)
+ VALUE self;
{
return StringIO(self)->string;
}
@@ -300,7 +369,8 @@ strio_get_string(VALUE self)
* Changes underlying String object, the subject of IO.
*/
static VALUE
-strio_set_string(VALUE self, VALUE string)
+strio_set_string(self, string)
+ VALUE self, string;
{
struct StringIO *ptr = StringIO(self);
@@ -321,7 +391,8 @@ strio_set_string(VALUE self, VALUE string)
* operations; an +IOError+ is raised if such an attempt is made.
*/
static VALUE
-strio_close(VALUE self)
+strio_close(self)
+ VALUE self;
{
struct StringIO *ptr = StringIO(self);
if (CLOSED(ptr)) {
@@ -339,7 +410,8 @@ strio_close(VALUE self)
* *strio* is not readable.
*/
static VALUE
-strio_close_read(VALUE self)
+strio_close_read(self)
+ VALUE self;
{
struct StringIO *ptr = StringIO(self);
if (!READABLE(ptr)) {
@@ -357,7 +429,8 @@ strio_close_read(VALUE self)
* *strio* is not writeable.
*/
static VALUE
-strio_close_write(VALUE self)
+strio_close_write(self)
+ VALUE self;
{
struct StringIO *ptr = StringIO(self);
if (!WRITABLE(ptr)) {
@@ -374,7 +447,8 @@ strio_close_write(VALUE self)
* Returns +true+ if *strio* is completely closed, +false+ otherwise.
*/
static VALUE
-strio_closed(VALUE self)
+strio_closed(self)
+ VALUE self;
{
struct StringIO *ptr = StringIO(self);
if (!CLOSED(ptr)) return Qfalse;
@@ -388,7 +462,8 @@ strio_closed(VALUE self)
* Returns +true+ if *strio* is not readable, +false+ otherwise.
*/
static VALUE
-strio_closed_read(VALUE self)
+strio_closed_read(self)
+ VALUE self;
{
struct StringIO *ptr = StringIO(self);
if (READABLE(ptr)) return Qfalse;
@@ -402,7 +477,8 @@ strio_closed_read(VALUE self)
* Returns +true+ if *strio* is not writable, +false+ otherwise.
*/
static VALUE
-strio_closed_write(VALUE self)
+strio_closed_write(self)
+ VALUE self;
{
struct StringIO *ptr = StringIO(self);
if (WRITABLE(ptr)) return Qfalse;
@@ -418,16 +494,18 @@ strio_closed_write(VALUE self)
* opened for reading or an +IOError+ will be raised.
*/
static VALUE
-strio_eof(VALUE self)
+strio_eof(self)
+ VALUE self;
{
struct StringIO *ptr = readable(StringIO(self));
- if (ptr->pos < RSTRING_LEN(ptr->string)) return Qfalse;
+ if (ptr->pos < RSTRING(ptr->string)->len) return Qfalse;
return Qtrue;
}
/* :nodoc: */
static VALUE
-strio_copy(VALUE copy, VALUE orig)
+strio_copy(copy, orig)
+ VALUE copy, orig;
{
struct StringIO *ptr;
@@ -454,7 +532,8 @@ strio_copy(VALUE copy, VALUE orig)
* newline. See also the <code>$.</code> variable.
*/
static VALUE
-strio_get_lineno(VALUE self)
+strio_get_lineno(self)
+ VALUE self;
{
return LONG2NUM(StringIO(self)->lineno);
}
@@ -467,7 +546,8 @@ strio_get_lineno(VALUE self)
* <code>$.</code> is updated only on the next read.
*/
static VALUE
-strio_set_lineno(VALUE self, VALUE lineno)
+strio_set_lineno(self, lineno)
+ VALUE self, lineno;
{
StringIO(self)->lineno = NUM2LONG(lineno);
return lineno;
@@ -494,7 +574,10 @@ strio_set_lineno(VALUE self, VALUE lineno)
* and _mode_ (see StringIO#new).
*/
static VALUE
-strio_reopen(int argc, VALUE *argv, VALUE self)
+strio_reopen(argc, argv, self)
+ int argc;
+ VALUE *argv;
+ VALUE self;
{
if (!OBJ_TAINTED(self)) rb_secure(4);
if (argc == 1 && TYPE(*argv) != T_STRING) {
@@ -512,7 +595,8 @@ strio_reopen(int argc, VALUE *argv, VALUE self)
* Returns the current offset (in bytes) of *strio*.
*/
static VALUE
-strio_get_pos(VALUE self)
+strio_get_pos(self)
+ VALUE self;
{
return LONG2NUM(StringIO(self)->pos);
}
@@ -524,7 +608,9 @@ strio_get_pos(VALUE self)
* Seeks to the given position (in bytes) in *strio*.
*/
static VALUE
-strio_set_pos(VALUE self, VALUE pos)
+strio_set_pos(self, pos)
+ VALUE self;
+ VALUE pos;
{
struct StringIO *ptr = StringIO(self);
long p = NUM2LONG(pos);
@@ -532,6 +618,7 @@ strio_set_pos(VALUE self, VALUE pos)
error_inval(0);
}
ptr->pos = p;
+ ptr->flags &= ~STRIO_EOF;
return pos;
}
@@ -543,11 +630,13 @@ strio_set_pos(VALUE self, VALUE pos)
* +lineno+ to zero.
*/
static VALUE
-strio_rewind(VALUE self)
+strio_rewind(self)
+ VALUE self;
{
struct StringIO *ptr = StringIO(self);
ptr->pos = 0;
ptr->lineno = 0;
+ ptr->flags &= ~STRIO_EOF;
return INT2FIX(0);
}
@@ -559,7 +648,10 @@ strio_rewind(VALUE self)
* the value of _whence_ (see IO#seek).
*/
static VALUE
-strio_seek(int argc, VALUE *argv, VALUE self)
+strio_seek(argc, argv, self)
+ int argc;
+ VALUE *argv;
+ VALUE self;
{
VALUE whence;
struct StringIO *ptr = StringIO(self);
@@ -577,7 +669,7 @@ strio_seek(int argc, VALUE *argv, VALUE self)
offset += ptr->pos;
break;
case 2:
- offset += RSTRING_LEN(ptr->string);
+ offset += RSTRING(ptr->string)->len;
break;
default:
error_inval("invalid whence");
@@ -586,6 +678,7 @@ strio_seek(int argc, VALUE *argv, VALUE self)
error_inval(0);
}
ptr->pos = offset;
+ ptr->flags &= ~STRIO_EOF;
return INT2FIX(0);
}
@@ -596,7 +689,8 @@ strio_seek(int argc, VALUE *argv, VALUE self)
* Returns +true+ always.
*/
static VALUE
-strio_get_sync(VALUE self)
+strio_get_sync(self)
+ VALUE self;
{
StringIO(self);
return Qtrue;
@@ -614,7 +708,8 @@ strio_get_sync(VALUE self)
* See IO#each_byte.
*/
static VALUE
-strio_each_byte(VALUE self)
+strio_each_byte(self)
+ VALUE self;
{
struct StringIO *ptr = readable(StringIO(self));
@@ -629,56 +724,37 @@ strio_each_byte(VALUE self)
/*
* call-seq:
- * strio.getc -> string or nil
+ * strio.getc -> fixnum or nil
*
* See IO#getc.
*/
static VALUE
-strio_getc(VALUE self)
-{
- struct StringIO *ptr = readable(StringIO(self));
- rb_encoding *enc = rb_enc_get(ptr->string);
- int len;
- char *p;
-
- if (ptr->pos >= RSTRING_LEN(ptr->string)) {
- return Qnil;
- }
- p = RSTRING_PTR(ptr->string)+ptr->pos;
- len = rb_enc_mbclen(p, RSTRING_END(ptr->string), enc);
- ptr->pos += len;
- return rb_enc_str_new(p, len, rb_enc_get(ptr->string));
-}
-
-/*
- * call-seq:
- * strio.getbyte -> fixnum or nil
- *
- * See IO#getbyte.
- */
-static VALUE
-strio_getbyte(VALUE self)
+strio_getc(self)
+ VALUE self;
{
struct StringIO *ptr = readable(StringIO(self));
int c;
- if (ptr->pos >= RSTRING_LEN(ptr->string)) {
+ if (ptr->pos >= RSTRING(ptr->string)->len) {
+ ptr->flags |= STRIO_EOF;
return Qnil;
}
- c = RSTRING_PTR(ptr->string)[ptr->pos++];
+ c = RSTRING(ptr->string)->ptr[ptr->pos++];
return CHR2FIX(c);
}
static void
-strio_extend(struct StringIO *ptr, long pos, long len)
+strio_extend(ptr, pos, len)
+ struct StringIO *ptr;
+ long pos, len;
{
long olen;
check_modifiable(ptr);
- olen = RSTRING_LEN(ptr->string);
+ olen = RSTRING(ptr->string)->len;
if (pos + len > olen) {
rb_str_resize(ptr->string, pos + len);
if (pos > olen)
- MEMZERO(RSTRING_PTR(ptr->string) + olen, char, pos - olen);
+ MEMZERO(RSTRING(ptr->string)->ptr + olen, char, pos - olen);
}
else {
rb_str_modify(ptr->string);
@@ -687,7 +763,7 @@ strio_extend(struct StringIO *ptr, long pos, long len)
/*
* call-seq:
- * strio.ungetc(string) -> nil
+ * strio.ungetc(integer) -> nil
*
* Pushes back one character (passed as a parameter) onto *strio*
* such that a subsequent buffered read will return it. Pushing back
@@ -696,95 +772,36 @@ strio_extend(struct StringIO *ptr, long pos, long len)
* In other case, there is no limitation for multiple pushbacks.
*/
static VALUE
-strio_ungetc(VALUE self, VALUE c)
+strio_ungetc(self, ch)
+ VALUE self, ch;
{
struct StringIO *ptr = readable(StringIO(self));
- long lpos, clen;
- char *p, *pend;
- rb_encoding *enc, *enc2;
-
- if (NIL_P(c)) return Qnil;
- if (FIXNUM_P(c)) {
- int cc = FIX2INT(c);
- char buf[16];
-
- enc = rb_enc_get(ptr->string);
- rb_enc_mbcput(cc, buf, enc);
- c = rb_enc_str_new(buf, rb_enc_codelen(cc, enc), enc);
- }
- else {
- SafeStringValue(c);
- enc = rb_enc_get(ptr->string);
- enc2 = rb_enc_get(c);
- if (enc != enc2 && enc != rb_ascii8bit_encoding()) {
- c = rb_str_conv_enc(c, enc2, enc);
+ int cc = NUM2INT(ch);
+ long len, pos = ptr->pos;
+
+ if (cc != EOF && pos > 0) {
+ if ((len = RSTRING(ptr->string)->len) < pos-- ||
+ (unsigned char)RSTRING(ptr->string)->ptr[pos] !=
+ (unsigned char)cc) {
+ strio_extend(ptr, pos, 1);
+ RSTRING(ptr->string)->ptr[pos] = cc;
+ OBJ_INFECT(ptr->string, self);
}
+ --ptr->pos;
+ ptr->flags &= ~STRIO_EOF;
}
- /* get logical position */
- lpos = 0; p = RSTRING_PTR(ptr->string); pend = p + ptr->pos;
- for (;;) {
- clen = rb_enc_mbclen(p, pend, enc);
- if (p+clen >= pend) break;
- p += clen;
- lpos++;
- }
- clen = p - RSTRING_PTR(ptr->string);
- rb_str_update(ptr->string, lpos, ptr->pos ? 1 : 0, c);
- ptr->pos = clen;
-
return Qnil;
}
/*
* call-seq:
- * strio.ungetbyte(fixnum) -> nil
- *
- * See IO#ungetbyte
- */
-static VALUE
-strio_ungetbyte(VALUE self, VALUE c)
-{
- struct StringIO *ptr = readable(StringIO(self));
- char buf[1], *cp = buf;
- long pos = ptr->pos, cl = 1;
- VALUE str = ptr->string;
-
- if (NIL_P(c)) return Qnil;
- if (FIXNUM_P(c)) {
- buf[0] = (char)FIX2INT(c);
- }
- else {
- SafeStringValue(c);
- cp = RSTRING_PTR(c);
- cl = RSTRING_LEN(c);
- if (cl == 0) return Qnil;
- }
- rb_str_modify(str);
- if (cl > pos) {
- char *s;
- long rest = RSTRING_LEN(str) - pos;
- rb_str_resize(str, rest + cl);
- s = RSTRING_PTR(str);
- memmove(s + cl, s + pos, rest);
- pos = 0;
- }
- else {
- pos -= cl;
- }
- memcpy(RSTRING_PTR(str) + pos, cp, cl);
- ptr->pos = pos;
- RB_GC_GUARD(c);
- return Qnil;
-}
-
-/*
- * call-seq:
- * strio.readchar -> string
+ * strio.readchar -> fixnum
*
* See IO#readchar.
*/
static VALUE
-strio_readchar(VALUE self)
+strio_readchar(self)
+ VALUE self;
{
VALUE c = strio_getc(self);
if (NIL_P(c)) rb_eof_error();
@@ -793,71 +810,44 @@ strio_readchar(VALUE self)
/*
* call-seq:
- * strio.readbyte -> fixnum
- *
- * See IO#readbyte.
- */
-static VALUE
-strio_readbyte(VALUE self)
-{
- VALUE c = strio_getbyte(self);
- if (NIL_P(c)) rb_eof_error();
- return c;
-}
-
-/*
- * call-seq:
* strio.each_char {|char| block } -> strio
*
* See IO#each_char.
*/
static VALUE
-strio_each_char(VALUE self)
+strio_each_char(self)
+ VALUE self;
{
- VALUE c;
+ struct StringIO *sio;
+ VALUE str;
+ const char *ptr;
+ size_t len;
RETURN_ENUMERATOR(self, 0, 0);
- while (!NIL_P(c = strio_getc(self))) {
- rb_yield(c);
- }
- return self;
-}
-
-/*
- * call-seq:
- * strio.each_codepoint {|c| block } -> strio
- *
- * See IO#each_codepoint.
- */
-static VALUE
-strio_each_codepoint(VALUE self)
-{
- struct StringIO *ptr;
- rb_encoding *enc;
- unsigned int c;
- int n;
+ sio = readable(StringIO(self));
+ str = sio->string;
+ ptr = RSTRING_PTR(str);
+ len = RSTRING_LEN(str);
- RETURN_ENUMERATOR(self, 0, 0);
+ while (sio->pos < len) {
+ int pos = sio->pos;
+ char c = ptr[pos];
+ int n = mbclen(c);
- ptr = readable(StringIO(self));
- enc = rb_enc_get(ptr->string);
- for (;;) {
- if (ptr->pos >= RSTRING_LEN(ptr->string)) {
- return self;
- }
+ if (len < pos + n) n = len - pos;
- c = rb_enc_codepoint_len(RSTRING_PTR(ptr->string)+ptr->pos,
- RSTRING_END(ptr->string), &n, enc);
- rb_yield(UINT2NUM(c));
- ptr->pos += n;
+ sio->pos += n;
+ rb_yield(rb_str_substr(str, pos, n));
}
return self;
}
-/* Boyer-Moore search: copied from regex.c */
static void
-bm_init_skip(long *skip, const char *pat, long m)
+bm_init_skip(skip, pat, m)
+ long *skip;
+ const char *pat;
+ long m;
{
int c;
@@ -870,7 +860,12 @@ bm_init_skip(long *skip, const char *pat, long m)
}
static long
-bm_search(const char *little, long llen, const char *big, long blen, const long *skip)
+bm_search(little, llen, big, blen, skip)
+ const char *little;
+ long llen;
+ const char *big;
+ long blen;
+ const long *skip;
{
long i, j, k;
@@ -889,75 +884,61 @@ bm_search(const char *little, long llen, const char *big, long blen, const long
}
static VALUE
-strio_getline(int argc, VALUE *argv, struct StringIO *ptr)
+strio_getline(argc, argv, ptr)
+ int argc;
+ VALUE *argv;
+ struct StringIO *ptr;
{
const char *s, *e, *p;
- long n, limit = 0;
+ long n;
VALUE str;
if (argc == 0) {
str = rb_rs;
}
else {
- VALUE lim, tmp;
-
- rb_scan_args(argc, argv, "11", &str, &lim);
- if (!NIL_P(lim)) limit = NUM2LONG(lim);
- else if (!NIL_P(str) && TYPE(str) != T_STRING) {
- tmp = rb_check_string_type(str);
- if (NIL_P(tmp)) {
- limit = NUM2LONG(str);
- if (limit == 0) return rb_str_new(0,0);
- str = rb_rs;
- }
- else {
- str = tmp;
- }
- }
- else if (!NIL_P(str)) {
- StringValue(str);
- }
+ rb_scan_args(argc, argv, "1", &str);
+ if (!NIL_P(str)) StringValue(str);
}
- if (ptr->pos >= (n = RSTRING_LEN(ptr->string))) {
+ if (ptr->pos >= (n = RSTRING(ptr->string)->len)) {
+ ptr->flags |= STRIO_EOF;
return Qnil;
}
- s = RSTRING_PTR(ptr->string);
- e = s + RSTRING_LEN(ptr->string);
+ s = RSTRING(ptr->string)->ptr;
+ e = s + RSTRING(ptr->string)->len;
s += ptr->pos;
- if (limit > 0 && s + limit < e) {
- e = s + limit;
- }
if (NIL_P(str)) {
- str = strio_substr(ptr, ptr->pos, e - s);
+ str = rb_str_substr(ptr->string, ptr->pos, e - s);
}
- else if ((n = RSTRING_LEN(str)) == 0) {
+ else if ((n = RSTRING(str)->len) == 0) {
p = s;
while (*p == '\n') {
if (++p == e) {
+ ptr->flags |= STRIO_EOF;
return Qnil;
}
}
s = p;
while ((p = memchr(p, '\n', e - p)) && (p != e)) {
if (*++p == '\n') {
- e = p + 1;
+ e = p;
break;
}
}
- str = strio_substr(ptr, s - RSTRING_PTR(ptr->string), e - s);
+ str = rb_str_substr(ptr->string, s - RSTRING(ptr->string)->ptr, e - s);
}
else if (n == 1) {
- if ((p = memchr(s, RSTRING_PTR(str)[0], e - s)) != 0) {
+ if ((p = memchr(s, RSTRING(str)->ptr[0], e - s)) != 0) {
e = p + 1;
}
- str = strio_substr(ptr, ptr->pos, e - s);
+ str = rb_str_substr(ptr->string, ptr->pos, e - s);
}
else {
if (n < e - s) {
if (e - s < 1024) {
for (p = s; p + n <= e; ++p) {
- if (MEMCMP(p, RSTRING_PTR(str), char, n) == 0) {
+ if (MEMCMP(p, RSTRING(str)->ptr, char, n) == 0) {
e = p + n;
break;
}
@@ -965,30 +946,31 @@ strio_getline(int argc, VALUE *argv, struct StringIO *ptr)
}
else {
long skip[1 << CHAR_BIT], pos;
- p = RSTRING_PTR(str);
+ p = RSTRING(str)->ptr;
bm_init_skip(skip, p, n);
if ((pos = bm_search(p, n, s, e - s, skip)) >= 0) {
e = s + pos + n;
}
}
}
- str = strio_substr(ptr, ptr->pos, e - s);
+ str = rb_str_substr(ptr->string, ptr->pos, e - s);
}
- ptr->pos = e - RSTRING_PTR(ptr->string);
+ ptr->pos = e - RSTRING(ptr->string)->ptr;
ptr->lineno++;
return str;
}
/*
* call-seq:
- * strio.gets(sep=$/) -> string or nil
- * strio.gets(limit) -> string or nil
- * strio.gets(sep, limit) -> string or nil
+ * strio.gets(sep_string=$/) -> string or nil
*
* See IO#gets.
*/
static VALUE
-strio_gets(int argc, VALUE *argv, VALUE self)
+strio_gets(argc, argv, self)
+ int argc;
+ VALUE *argv;
+ VALUE self;
{
VALUE str = strio_getline(argc, argv, readable(StringIO(self)));
@@ -998,14 +980,15 @@ strio_gets(int argc, VALUE *argv, VALUE self)
/*
* call-seq:
- * strio.readline(sep=$/) -> string
- * strio.readline(limit) -> string or nil
- * strio.readline(sep, limit) -> string or nil
+ * strio.readline(sep_string=$/) -> string
*
* See IO#readline.
*/
static VALUE
-strio_readline(int argc, VALUE *argv, VALUE self)
+strio_readline(argc, argv, self)
+ int argc;
+ VALUE *argv;
+ VALUE self;
{
VALUE line = strio_gets(argc, argv, self);
if (NIL_P(line)) rb_eof_error();
@@ -1014,17 +997,16 @@ strio_readline(int argc, VALUE *argv, VALUE self)
/*
* call-seq:
- * strio.each(sep=$/) {|line| block } -> strio
- * strio.each(limit) {|line| block } -> strio
- * strio.each(sep, limit) {|line| block } -> strio
- * strio.each_line(sep=$/) {|line| block } -> strio
- * strio.each_line(limit) {|line| block } -> strio
- * strio.each_line(sep,limit) {|line| block } -> strio
+ * strio.each(sep_string=$/) {|line| block } -> strio
+ * strio.each_line(sep_string=$/) {|line| block } -> strio
*
* See IO#each.
*/
static VALUE
-strio_each(int argc, VALUE *argv, VALUE self)
+strio_each(argc, argv, self)
+ int argc;
+ VALUE *argv;
+ VALUE self;
{
struct StringIO *ptr = StringIO(self);
VALUE line;
@@ -1039,14 +1021,15 @@ strio_each(int argc, VALUE *argv, VALUE self)
/*
* call-seq:
- * strio.readlines(sep=$/) -> array
- * strio.readlines(limit) -> array
- * strio.readlines(sep,limit) -> array
+ * strio.readlines(sep_string=$/) -> array
*
* See IO#readlines.
*/
static VALUE
-strio_readlines(int argc, VALUE *argv, VALUE self)
+strio_readlines(argc, argv, self)
+ int argc;
+ VALUE *argv;
+ VALUE self;
{
struct StringIO *ptr = StringIO(self);
VALUE ary = rb_ary_new(), line;
@@ -1067,33 +1050,27 @@ strio_readlines(int argc, VALUE *argv, VALUE self)
* Returns the number of bytes written. See IO#write.
*/
static VALUE
-strio_write(VALUE self, VALUE str)
+strio_write(self, str)
+ VALUE self, str;
{
struct StringIO *ptr = writable(StringIO(self));
long len, olen;
- rb_encoding *enc, *enc2;
if (TYPE(str) != T_STRING)
str = rb_obj_as_string(str);
- enc = rb_enc_get(ptr->string);
- enc2 = rb_enc_get(str);
- if (enc != enc2 && enc != rb_ascii8bit_encoding()) {
- str = rb_str_conv_enc(str, enc2, enc);
- }
- len = RSTRING_LEN(str);
- if (len == 0) return INT2FIX(0);
+ len = RSTRING(str)->len;
+ if (!len) return INT2FIX(0);
check_modifiable(ptr);
- olen = RSTRING_LEN(ptr->string);
+ olen = RSTRING(ptr->string)->len;
if (ptr->flags & FMODE_APPEND) {
ptr->pos = olen;
}
if (ptr->pos == olen) {
- rb_str_cat(ptr->string, RSTRING_PTR(str), len);
+ rb_str_cat(ptr->string, RSTRING(str)->ptr, len);
}
else {
strio_extend(ptr, ptr->pos, len);
- memmove(RSTRING_PTR(ptr->string)+ptr->pos, RSTRING_PTR(str), len);
- OBJ_INFECT(ptr->string, str);
+ rb_str_update(ptr->string, ptr->pos, len, str);
}
OBJ_INFECT(ptr->string, self);
ptr->pos += len;
@@ -1132,19 +1109,20 @@ strio_write(VALUE self, VALUE str)
* See IO#putc.
*/
static VALUE
-strio_putc(VALUE self, VALUE ch)
+strio_putc(self, ch)
+ VALUE self, ch;
{
struct StringIO *ptr = writable(StringIO(self));
int c = NUM2CHR(ch);
long olen;
check_modifiable(ptr);
- olen = RSTRING_LEN(ptr->string);
+ olen = RSTRING(ptr->string)->len;
if (ptr->flags & FMODE_APPEND) {
ptr->pos = olen;
}
strio_extend(ptr, ptr->pos, 1);
- RSTRING_PTR(ptr->string)[ptr->pos++] = c;
+ RSTRING(ptr->string)->ptr[ptr->pos++] = c;
OBJ_INFECT(ptr->string, self);
return ch;
}
@@ -1164,7 +1142,10 @@ strio_putc(VALUE self, VALUE ch)
* See IO#read.
*/
static VALUE
-strio_read(int argc, VALUE *argv, VALUE self)
+strio_read(argc, argv, self)
+ int argc;
+ VALUE *argv;
+ VALUE self;
{
struct StringIO *ptr = readable(StringIO(self));
VALUE str = Qnil;
@@ -1181,7 +1162,12 @@ strio_read(int argc, VALUE *argv, VALUE self)
if (len < 0) {
rb_raise(rb_eArgError, "negative length %ld given", len);
}
- if (len > 0 && ptr->pos >= RSTRING_LEN(ptr->string)) {
+ if (len > 0 && ptr->pos >= RSTRING(ptr->string)->len) {
+ ptr->flags |= STRIO_EOF;
+ if (!NIL_P(str)) rb_str_resize(str, 0);
+ return Qnil;
+ }
+ else if (ptr->flags & STRIO_EOF) {
if (!NIL_P(str)) rb_str_resize(str, 0);
return Qnil;
}
@@ -1190,8 +1176,9 @@ strio_read(int argc, VALUE *argv, VALUE self)
/* fall through */
case 0:
olen = -1;
- len = RSTRING_LEN(ptr->string);
+ len = RSTRING(ptr->string)->len;
if (len <= ptr->pos) {
+ ptr->flags |= STRIO_EOF;
if (NIL_P(str)) {
str = rb_str_new(0, 0);
}
@@ -1208,21 +1195,22 @@ strio_read(int argc, VALUE *argv, VALUE self)
rb_raise(rb_eArgError, "wrong number of arguments (%d for 0)", argc);
}
if (NIL_P(str)) {
- str = strio_substr(ptr, ptr->pos, len);
+ str = rb_str_substr(ptr->string, ptr->pos, len);
}
else {
- long rest = RSTRING_LEN(ptr->string) - ptr->pos;
+ long rest = RSTRING(ptr->string)->len - ptr->pos;
if (len > rest) len = rest;
rb_str_resize(str, len);
- MEMCPY(RSTRING_PTR(str), RSTRING_PTR(ptr->string) + ptr->pos, char, len);
+ MEMCPY(RSTRING(str)->ptr, RSTRING(ptr->string)->ptr + ptr->pos, char, len);
}
if (NIL_P(str)) {
- str = rb_str_new(0, 0);
+ if (!(ptr->flags & STRIO_EOF)) str = rb_str_new(0, 0);
len = 0;
}
else {
- ptr->pos += len = RSTRING_LEN(str);
+ ptr->pos += len = RSTRING(str)->len;
}
+ if (olen < 0 || olen > len) ptr->flags |= STRIO_EOF;
return str;
}
@@ -1234,10 +1222,13 @@ strio_read(int argc, VALUE *argv, VALUE self)
* returning +nil+, as well as IO#sysread does.
*/
static VALUE
-strio_sysread(int argc, VALUE *argv, VALUE self)
+strio_sysread(argc, argv, self)
+ int argc;
+ VALUE *argv;
+ VALUE self;
{
VALUE val = strio_read(argc, argv, self);
- if (NIL_P(val)) {
+ if (NIL_P(val) || RSTRING(val)->len == 0) {
rb_eof_error();
}
return val;
@@ -1245,6 +1236,9 @@ strio_sysread(int argc, VALUE *argv, VALUE self)
#define strio_syswrite strio_write
+/* call-seq: strio.path -> nil */
+#define strio_path strio_nil
+
/*
* call-seq:
* strio.isatty -> nil
@@ -1266,13 +1260,14 @@ strio_sysread(int argc, VALUE *argv, VALUE self)
* Returns the size of the buffer string.
*/
static VALUE
-strio_size(VALUE self)
+strio_size(self)
+ VALUE self;
{
VALUE string = StringIO(self)->string;
if (NIL_P(string)) {
rb_raise(rb_eIOError, "not opened");
}
- return ULONG2NUM(RSTRING_LEN(string));
+ return ULONG2NUM(RSTRING(string)->len);
}
/*
@@ -1283,67 +1278,23 @@ strio_size(VALUE self)
* must be opened for writing.
*/
static VALUE
-strio_truncate(VALUE self, VALUE len)
+strio_truncate(self, len)
+ VALUE self, len;
{
VALUE string = writable(StringIO(self))->string;
long l = NUM2LONG(len);
- long plen = RSTRING_LEN(string);
+ long plen = RSTRING(string)->len;
if (l < 0) {
error_inval("negative legnth");
}
rb_str_resize(string, l);
if (plen < l) {
- MEMZERO(RSTRING_PTR(string) + plen, char, l - plen);
+ MEMZERO(RSTRING(string)->ptr + plen, char, l - plen);
}
return len;
}
/*
- * call-seq:
- * strio.external_encoding => encoding
- *
- * Returns the Encoding object that represents the encoding of the file.
- * If strio is write mode and no encoding is specified, returns <code>nil</code>.
- */
-
-static VALUE
-strio_external_encoding(VALUE self)
-{
- return rb_enc_from_encoding(rb_enc_get(StringIO(self)->string));
-}
-
-/*
- * call-seq:
- * strio.internal_encoding => encoding
- *
- * Returns the Encoding of the internal string if conversion is
- * specified. Otherwise returns nil.
- */
-
-static VALUE
-strio_internal_encoding(VALUE self)
-{
- return Qnil;
-}
-
-/*
- * call-seq:
- * strio.set_encoding(ext_enc) => strio
- *
- * Tagged with the encoding specified.
- */
-
-static VALUE
-strio_set_encoding(VALUE self, VALUE ext_enc)
-{
- rb_encoding* enc;
- VALUE str = StringIO(self)->string;
- enc = rb_to_encoding(ext_enc);
- rb_enc_associate(str, enc);
- return self;
-}
-
-/*
* Pseudo I/O on String object.
*/
void
@@ -1382,6 +1333,7 @@ Init_stringio()
rb_define_method(StringIO, "sync", strio_get_sync, 0);
rb_define_method(StringIO, "sync=", strio_set_sync, 1);
rb_define_method(StringIO, "tell", strio_tell, 0);
+ rb_define_method(StringIO, "path", strio_path, 0);
rb_define_method(StringIO, "each", strio_each, -1);
rb_define_method(StringIO, "each_line", strio_each, -1);
@@ -1390,20 +1342,16 @@ Init_stringio()
rb_define_method(StringIO, "bytes", strio_each_byte, 0);
rb_define_method(StringIO, "each_char", strio_each_char, 0);
rb_define_method(StringIO, "chars", strio_each_char, 0);
- rb_define_method(StringIO, "each_codepoint", strio_each_codepoint, 0);
- rb_define_method(StringIO, "codepoints", strio_each_codepoint, 0);
rb_define_method(StringIO, "getc", strio_getc, 0);
+ rb_define_method(StringIO, "getbyte", strio_getc, 0);
rb_define_method(StringIO, "ungetc", strio_ungetc, 1);
- rb_define_method(StringIO, "ungetbyte", strio_ungetbyte, 1);
rb_define_method(StringIO, "readchar", strio_readchar, 0);
- rb_define_method(StringIO, "getbyte", strio_getbyte, 0);
- rb_define_method(StringIO, "readbyte", strio_readbyte, 0);
+ rb_define_method(StringIO, "readbyte", strio_readchar, 0);
rb_define_method(StringIO, "gets", strio_gets, -1);
rb_define_method(StringIO, "readline", strio_readline, -1);
rb_define_method(StringIO, "readlines", strio_readlines, -1);
rb_define_method(StringIO, "read", strio_read, -1);
rb_define_method(StringIO, "sysread", strio_sysread, -1);
- rb_define_method(StringIO, "readpartial", strio_sysread, -1);
rb_define_method(StringIO, "write", strio_write, 1);
rb_define_method(StringIO, "<<", strio_addstr, 1);
@@ -1420,8 +1368,4 @@ Init_stringio()
rb_define_method(StringIO, "size", strio_size, 0);
rb_define_method(StringIO, "length", strio_size, 0);
rb_define_method(StringIO, "truncate", strio_truncate, 1);
-
- rb_define_method(StringIO, "external_encoding", strio_external_encoding, 0);
- rb_define_method(StringIO, "internal_encoding", strio_internal_encoding, 0);
- rb_define_method(StringIO, "set_encoding", strio_set_encoding, 1);
}
diff --git a/ext/strscan/.cvsignore b/ext/strscan/.cvsignore
index 814345ece8..4088712231 100644
--- a/ext/strscan/.cvsignore
+++ b/ext/strscan/.cvsignore
@@ -1,4 +1,3 @@
Makefile
mkmf.log
*.def
-extconf.h
diff --git a/ext/strscan/depend b/ext/strscan/depend
index 76f6e0b18b..9199574c3f 100644
--- a/ext/strscan/depend
+++ b/ext/strscan/depend
@@ -1,2 +1 @@
-strscan.o: strscan.c $(hdrdir)/ruby.h $(hdrdir)/re.h $(hdrdir)/regex.h \
- $(hdrdir)/oniguruma.h $(topdir)/config.h $(hdrdir)/defines.h
+strscan.o: strscan.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
diff --git a/ext/strscan/strscan.c b/ext/strscan/strscan.c
index 490689b3d2..b5ee20282c 100644
--- a/ext/strscan/strscan.c
+++ b/ext/strscan/strscan.c
@@ -8,9 +8,8 @@
the Ruby License. For details, see the file COPYING.
*/
-#include "ruby/ruby.h"
-#include "ruby/re.h"
-#include "ruby/encoding.h"
+#include "ruby.h"
+#include "re.h"
#define STRSCAN_VERSION "0.7.0"
@@ -42,13 +41,13 @@ struct strscanner
#define MATCHED(s) (s)->flags |= FLAG_MATCHED
#define CLEAR_MATCH_STATUS(s) (s)->flags &= ~FLAG_MATCHED
-#define S_PBEG(s) (RSTRING_PTR((s)->str))
-#define S_LEN(s) (RSTRING_LEN((s)->str))
+#define S_PBEG(s) (RSTRING((s)->str)->ptr)
+#define S_LEN(s) (RSTRING((s)->str)->len)
#define S_PEND(s) (S_PBEG(s) + S_LEN(s))
#define CURPTR(s) (S_PBEG(s) + (s)->curr)
#define S_RESTLEN(s) (S_LEN(s) - (s)->curr)
-#define EOS_P(s) ((s)->curr >= RSTRING_LEN(p->str))
+#define EOS_P(s) ((s)->curr >= RSTRING(p->str)->len)
#define GET_SCANNER(obj,var) do {\
Data_Get_Struct(obj, struct strscanner, var);\
@@ -63,7 +62,7 @@ static VALUE infect _((VALUE str, struct strscanner *p));
static VALUE extract_range _((struct strscanner *p, long beg_i, long end_i));
static VALUE extract_beg_len _((struct strscanner *p, long beg_i, long len));
-void check_strscan _((VALUE obj));
+static void check_strscan _((VALUE obj));
static void strscan_mark _((struct strscanner *p));
static void strscan_free _((struct strscanner *p));
static VALUE strscan_s_allocate _((VALUE klass));
@@ -127,20 +126,12 @@ infect(VALUE str, struct strscanner *p)
}
static VALUE
-str_new(struct strscanner *p, const char *ptr, long len)
-{
- VALUE str = rb_str_new(ptr, len);
- rb_enc_copy(str, p->str);
- return str;
-}
-
-static VALUE
extract_range(struct strscanner *p, long beg_i, long end_i)
{
if (beg_i > S_LEN(p)) return Qnil;
if (end_i > S_LEN(p))
end_i = S_LEN(p);
- return infect(str_new(p, S_PBEG(p) + beg_i, end_i - beg_i), p);
+ return infect(rb_str_new(S_PBEG(p) + beg_i, end_i - beg_i), p);
}
static VALUE
@@ -149,7 +140,7 @@ extract_beg_len(struct strscanner *p, long beg_i, long len)
if (beg_i > S_LEN(p)) return Qnil;
if (beg_i + len > S_LEN(p))
len = S_LEN(p) - beg_i;
- return infect(str_new(p, S_PBEG(p) + beg_i, len), p);
+ return infect(rb_str_new(S_PBEG(p) + beg_i, len), p);
}
/* =======================================================================
@@ -165,8 +156,8 @@ strscan_mark(struct strscanner *p)
static void
strscan_free(struct strscanner *p)
{
- onig_region_free(&(p->regs), 0);
- ruby_xfree(p);
+ re_free_registers(&(p->regs));
+ free(p);
}
static VALUE
@@ -177,7 +168,7 @@ strscan_s_allocate(VALUE klass)
p = ALLOC(struct strscanner);
MEMZERO(p, struct strscanner, 1);
CLEAR_MATCH_STATUS(p);
- onig_region_init(&(p->regs));
+ MEMZERO(&(p->regs), struct re_registers, 1);
p->str = Qnil;
return Data_Wrap_Struct(klass, strscan_mark, strscan_free, p);
}
@@ -202,7 +193,7 @@ strscan_initialize(int argc, VALUE *argv, VALUE self)
return self;
}
-void
+static void
check_strscan(VALUE obj)
{
if (TYPE(obj) != T_DATA || RDATA(obj)->dmark != (RUBY_DATA_FUNC)strscan_mark) {
@@ -228,13 +219,12 @@ strscan_init_copy(VALUE vself, VALUE vorig)
check_strscan(vorig);
Data_Get_Struct(vorig, struct strscanner, orig);
if (self != orig) {
- self->flags = orig->flags;
- self->str = orig->str;
- self->prev = orig->prev;
- self->curr = orig->curr;
- onig_region_copy(&self->regs, &orig->regs);
+ self->flags = orig->flags;
+ self->str = orig->str;
+ self->prev = orig->prev;
+ self->curr = orig->curr;
+ re_copy_registers(&self->regs, &orig->regs);
}
-
return vself;
}
@@ -321,7 +311,8 @@ strscan_set_string(VALUE self, VALUE str)
Data_Get_Struct(self, struct strscanner, p);
StringValue(str);
- p->str = str;
+ p->str = rb_str_dup(str);
+ rb_obj_freeze(p->str);
p->curr = 0;
CLEAR_MATCH_STATUS(p);
return str;
@@ -402,11 +393,8 @@ strscan_set_pos(VALUE self, VALUE v)
static VALUE
strscan_do_scan(VALUE self, VALUE regex, int succptr, int getstr, int headonly)
{
- regex_t *rb_reg_prepare_re(VALUE re, VALUE str);
struct strscanner *p;
- regex_t *re;
int ret;
- int tmpreg;
Check_Type(regex, T_REGEXP);
GET_SCANNER(self, p);
@@ -415,31 +403,21 @@ strscan_do_scan(VALUE self, VALUE regex, int succptr, int getstr, int headonly)
if (S_RESTLEN(p) < 0) {
return Qnil;
}
- re = rb_reg_prepare_re(regex, p->str);
- tmpreg = re != RREGEXP(regex)->ptr;
- if (!tmpreg) RREGEXP(regex)->usecnt++;
-
+ rb_kcode_set_option(regex);
if (headonly) {
- ret = onig_match(re, (UChar* )CURPTR(p),
- (UChar* )(CURPTR(p) + S_RESTLEN(p)),
- (UChar* )CURPTR(p), &(p->regs), ONIG_OPTION_NONE);
+ ret = re_match(RREGEXP(regex)->ptr,
+ CURPTR(p), S_RESTLEN(p),
+ 0,
+ &(p->regs));
}
else {
- ret = onig_search(re,
- (UChar* )CURPTR(p), (UChar* )(CURPTR(p) + S_RESTLEN(p)),
- (UChar* )CURPTR(p), (UChar* )(CURPTR(p) + S_RESTLEN(p)),
- &(p->regs), ONIG_OPTION_NONE);
- }
- if (!tmpreg) RREGEXP(regex)->usecnt--;
- if (tmpreg) {
- if (RREGEXP(regex)->usecnt) {
- onig_free(re);
- }
- else {
- onig_free(RREGEXP(regex)->ptr);
- RREGEXP(regex)->ptr = re;
- }
+ ret = re_search(RREGEXP(regex)->ptr,
+ CURPTR(p), S_RESTLEN(p),
+ 0,
+ S_RESTLEN(p),
+ &(p->regs));
}
+ rb_kcode_reset_option();
if (ret == -2) rb_raise(ScanError, "regexp buffer overflow");
if (ret < 0) {
@@ -543,11 +521,11 @@ strscan_check(VALUE self, VALUE re)
}
/*
- * call-seq: scan_full(pattern, advance_pointer_p, return_string_p)
+ * call-seq: scan_full(pattern, return_string_p, advance_pointer_p)
*
* Tests whether the given +pattern+ is matched from the current scan pointer.
- * Advances the scan pointer if +advance_pointer_p+ is true.
* Returns the matched string if +return_string_p+ is true.
+ * Advances the scan pointer if +advance_pointer_p+ is true.
* The match register is affected.
*
* "full" means "#scan with full parameters".
@@ -558,6 +536,7 @@ strscan_scan_full(VALUE self, VALUE re, VALUE s, VALUE f)
return strscan_do_scan(self, re, RTEST(s), RTEST(f), 1);
}
+
/*
* call-seq: scan_until(pattern)
*
@@ -586,7 +565,7 @@ strscan_scan_until(VALUE self, VALUE re)
* s = StringScanner.new('test string')
* s.exist? /s/ # -> 3
* s.scan /test/ # -> "test"
- * s.exist? /s/ # -> 2
+ * s.exist? /s/ # -> 6
* s.exist? /e/ # -> nil
*/
static VALUE
@@ -637,12 +616,12 @@ strscan_check_until(VALUE self, VALUE re)
}
/*
- * call-seq: search_full(pattern, advance_pointer_p, return_string_p)
+ * call-seq: search_full(pattern, return_string_p, advance_pointer_p)
*
* Scans the string _until_ the +pattern+ is matched.
- * Advances the scan pointer if +advance_pointer_p+, otherwise not.
* Returns the matched string if +return_string_p+ is true, otherwise
* returns the number of bytes advanced.
+ * Advances the scan pointer if +advance_pointer_p+, otherwise not.
* This method does affect the match register.
*/
static VALUE
@@ -651,18 +630,26 @@ strscan_search_full(VALUE self, VALUE re, VALUE s, VALUE f)
return strscan_do_scan(self, re, RTEST(s), RTEST(f), 0);
}
+/* DANGEROUS; need to synchronize with regex.c */
static void
adjust_registers_to_matched(struct strscanner *p)
{
- onig_region_clear(&(p->regs));
- onig_region_set(&(p->regs), 0, 0, p->curr - p->prev);
+ if (p->regs.allocated == 0) {
+ p->regs.beg = ALLOC_N(int, RE_NREGS);
+ p->regs.end = ALLOC_N(int, RE_NREGS);
+ p->regs.allocated = RE_NREGS;
+ }
+ p->regs.num_regs = 1;
+ p->regs.beg[0] = 0;
+ p->regs.end[0] = p->curr - p->prev;
}
/*
* Scans one character and returns it.
- * This method is multibyte character sensitive.
+ * This method is multi-byte character sensitive.
+ * See also #get_byte.
*
- * s = StringScanner.new("ab")
+ * s = StringScanner.new('ab')
* s.getch # => "a"
* s.getch # => "b"
* s.getch # => nil
@@ -682,8 +669,7 @@ strscan_getch(VALUE self)
CLEAR_MATCH_STATUS(p);
if (EOS_P(p))
return Qnil;
-
- len = rb_enc_mbclen(CURPTR(p), S_PEND(p), rb_enc_get(p->str));
+ len = mbclen(*CURPTR(p));
if (p->curr + len > S_LEN(p)) {
len = S_LEN(p) - p->curr;
}
@@ -697,15 +683,14 @@ strscan_getch(VALUE self)
/*
* Scans one byte and returns it.
- * This method is not multibyte character sensitive.
- * See also: #getch.
+ * This method is NOT multi-byte character sensitive.
+ * See also #getch.
*
* s = StringScanner.new('ab')
* s.get_byte # => "a"
* s.get_byte # => "b"
* s.get_byte # => nil
*
- * $KCODE = 'EUC'
* s = StringScanner.new("\244\242")
* s.get_byte # => "\244"
* s.get_byte # => "\242"
@@ -718,9 +703,9 @@ strscan_get_byte(VALUE self)
GET_SCANNER(self, p);
CLEAR_MATCH_STATUS(p);
- if (EOS_P(p))
+ if (EOS_P(p)) {
return Qnil;
-
+ }
p->prev = p->curr;
p->curr++;
MATCHED(p);
@@ -758,13 +743,13 @@ strscan_peek(VALUE self, VALUE vlen)
long len;
GET_SCANNER(self, p);
-
len = NUM2LONG(vlen);
- if (EOS_P(p))
- return infect(str_new(p, "", 0), p);
-
- if (p->curr + len > S_LEN(p))
+ if (EOS_P(p)) {
+ return infect(rb_str_new("", 0), p);
+ }
+ if (p->curr + len > S_LEN(p)) {
len = S_LEN(p) - p->curr;
+ }
return extract_beg_len(p, p->curr, len);
}
@@ -788,7 +773,7 @@ strscan_peep(VALUE self, VALUE vlen)
* s.unscan
* s.scan(/../) # => "te"
* s.scan(/\d/) # => nil
- * s.unscan # ScanError: unscan failed: previous match record not exist
+ * s.unscan # ScanError: unscan failed: previous match had failed
*/
static VALUE
strscan_unscan(VALUE self)
@@ -796,8 +781,9 @@ strscan_unscan(VALUE self)
struct strscanner *p;
GET_SCANNER(self, p);
- if (! MATCHED_P(p))
- rb_raise(ScanError, "unscan failed: previous match record not exist");
+ if (! MATCHED_P(p)) {
+ rb_raise(ScanError, "unscan failed: previous match had failed");
+ }
p->curr = p->prev;
CLEAR_MATCH_STATUS(p);
return self;
@@ -905,6 +891,7 @@ strscan_matched(VALUE self)
GET_SCANNER(self, p);
if (! MATCHED_P(p)) return Qnil;
+
return extract_range(p, p->prev + p->regs.beg[0],
p->prev + p->regs.end[0]);
}
@@ -926,10 +913,22 @@ strscan_matched_size(VALUE self)
GET_SCANNER(self, p);
if (! MATCHED_P(p)) return Qnil;
+
return INT2NUM(p->regs.end[0] - p->regs.beg[0]);
}
/*
+ * Equivalent to #matched_size.
+ * This method is obsolete; use #matched_size instead.
+ */
+static VALUE
+strscan_matchedsize(VALUE self)
+{
+ rb_warning("StringScanner#matchedsize is obsolete; use #matched_size instead");
+ return strscan_matched_size(self);
+}
+
+/*
* call-seq: [](n)
*
* Return the n-th subgroup in the most recent match.
@@ -979,6 +978,7 @@ strscan_pre_match(VALUE self)
GET_SCANNER(self, p);
if (! MATCHED_P(p)) return Qnil;
+
return extract_range(p, 0, p->prev + p->regs.beg[0]);
}
@@ -998,6 +998,7 @@ strscan_post_match(VALUE self)
GET_SCANNER(self, p);
if (! MATCHED_P(p)) return Qnil;
+
return extract_range(p, p->prev + p->regs.end[0], S_LEN(p));
}
@@ -1012,7 +1013,7 @@ strscan_rest(VALUE self)
GET_SCANNER(self, p);
if (EOS_P(p)) {
- return infect(str_new(p, "", 0), p);
+ return infect(rb_str_new("", 0), p);
}
return extract_range(p, p->curr, S_LEN(p));
}
@@ -1030,6 +1031,7 @@ strscan_rest_size(VALUE self)
if (EOS_P(p)) {
return INT2FIX(0);
}
+
i = S_LEN(p) - p->curr;
return INT2FIX(i);
}
@@ -1083,7 +1085,7 @@ strscan_inspect(VALUE self)
len = snprintf(buf, BUFSIZE, "#<%s %ld/%ld @ %s>",
rb_class2name(CLASS_OF(self)),
p->curr, S_LEN(p),
- RSTRING_PTR(b));
+ RSTRING(b)->ptr);
return infect(rb_str_new(buf, len), p);
}
a = inspect1(p);
@@ -1091,8 +1093,8 @@ strscan_inspect(VALUE self)
len = snprintf(buf, BUFSIZE, "#<%s %ld/%ld %s @ %s>",
rb_class2name(CLASS_OF(self)),
p->curr, S_LEN(p),
- RSTRING_PTR(a),
- RSTRING_PTR(b));
+ RSTRING(a)->ptr,
+ RSTRING(b)->ptr);
return infect(rb_str_new(buf, len), p);
}
@@ -1243,7 +1245,7 @@ inspect2(struct strscanner *p)
* There are aliases to several of the methods.
*/
void
-Init_strscan()
+Init_strscan(void)
{
ID id_scanerr = rb_intern("ScanError");
VALUE tmp;
@@ -1305,6 +1307,7 @@ Init_strscan()
rb_define_method(StringScanner, "matched?", strscan_matched_p, 0);
rb_define_method(StringScanner, "matched", strscan_matched, 0);
rb_define_method(StringScanner, "matched_size", strscan_matched_size, 0);
+ rb_define_method(StringScanner, "matchedsize", strscan_matchedsize, 0);
rb_define_method(StringScanner, "[]", strscan_aref, 1);
rb_define_method(StringScanner, "pre_match", strscan_pre_match, 0);
rb_define_method(StringScanner, "post_match", strscan_post_match, 0);
diff --git a/ext/syck/.cvsignore b/ext/syck/.cvsignore
index 814345ece8..4088712231 100644
--- a/ext/syck/.cvsignore
+++ b/ext/syck/.cvsignore
@@ -1,4 +1,3 @@
Makefile
mkmf.log
*.def
-extconf.h
diff --git a/ext/syck/bytecode.c b/ext/syck/bytecode.c
index 25ba678300..567aaf52a8 100644
--- a/ext/syck/bytecode.c
+++ b/ext/syck/bytecode.c
@@ -4,10 +4,11 @@
* bytecode.re
*
* $Author$
+ * $Date$
*
* Copyright (C) 2003 why the lucky stiff
*/
-#include "ruby/ruby.h"
+#include "ruby.h"
#include "syck.h"
#include "gram.h"
@@ -164,7 +165,7 @@ sycklex_bytecode_utf8( YYSTYPE *sycklval, SyckParser *parser )
#line 165 "<stdout>"
{
YYCTYPE yych;
- unsigned int yyaccept = 0;
+ unsigned int yyaccept;
goto yy0;
++YYCURSOR;
yy0:
@@ -542,7 +543,7 @@ Directive:
#line 543 "<stdout>"
{
YYCTYPE yych;
- unsigned int yyaccept = 0;
+ unsigned int yyaccept;
goto yy45;
++YYCURSOR;
yy45:
diff --git a/ext/syck/emitter.c b/ext/syck/emitter.c
index 73ff5d7a0b..9c8ab8d49b 100644
--- a/ext/syck/emitter.c
+++ b/ext/syck/emitter.c
@@ -2,13 +2,14 @@
* emitter.c
*
* $Author$
+ * $Date$
*
* Copyright (C) 2003 why the lucky stiff
*
* All Base64 code from Ruby's pack.c.
- * Ruby is Copyright (C) 1993-2007 Yukihiro Matsumoto
+ * Ruby is Copyright (C) 1993-2003 Yukihiro Matsumoto
*/
-#include "ruby/ruby.h"
+#include "ruby.h"
#include <stdio.h>
#include <string.h>
@@ -97,7 +98,7 @@ syck_base64dec( char *s, long len )
}
}
*end = '\0';
- /*RSTRING_LEN(buf) = ptr - RSTRING_PTR(buf);*/
+ /*RSTRING(buf)->len = ptr - RSTRING(buf)->ptr;*/
return ptr;
}
@@ -105,7 +106,7 @@ syck_base64dec( char *s, long len )
* Allocate an emitter
*/
SyckEmitter *
-syck_new_emitter(void)
+syck_new_emitter()
{
SyckEmitter *e;
e = S_ALLOC( SyckEmitter );
@@ -281,10 +282,10 @@ syck_emitter_clear( SyckEmitter *e )
* Raw write to the emitter buffer.
*/
void
-syck_emitter_write( SyckEmitter *e, const char *str, long len )
+syck_emitter_write( SyckEmitter *e, char *str, long len )
{
long at;
- ASSERT( str != NULL );
+ ASSERT( str != NULL )
if ( e->buffer == NULL )
{
syck_emitter_clear( e );
@@ -391,7 +392,7 @@ syck_emit( SyckEmitter *e, st_data_t n )
/* Look for anchor */
if ( e->anchors != NULL &&
st_lookup( e->markers, n, (st_data_t *)&oid ) &&
- st_lookup( e->anchors, (st_data_t)oid, (void *)&anchor_name ) )
+ st_lookup( e->anchors, (st_data_t)oid, (st_data_t *)&anchor_name ) )
{
if ( e->anchored == NULL )
{
@@ -437,7 +438,7 @@ end_emit:
* and the implicit tag which would be assigned to this node. If a tag is
* required, write the tag.
*/
-void syck_emit_tag( SyckEmitter *e, const char *tag, const char *ignore )
+void syck_emit_tag( SyckEmitter *e, char *tag, char *ignore )
{
SyckLevel *lvl;
if ( tag == NULL ) return;
@@ -456,7 +457,7 @@ void syck_emit_tag( SyckEmitter *e, const char *tag, const char *ignore )
int skip = 4 + strlen( YAML_DOMAIN ) + 1;
syck_emitter_write( e, tag + skip, taglen - skip );
} else {
- const char *subd = tag + 4;
+ char *subd = tag + 4;
while ( *subd != ':' && *subd != '\0' ) subd++;
if ( *subd == ':' ) {
if ( subd - tag > ( strlen( YAML_DOMAIN ) + 5 ) &&
@@ -538,7 +539,7 @@ void syck_emit_indent( SyckEmitter *e )
* Basic printable test for LATIN-1 characters.
*/
int
-syck_scan_scalar( int req_width, const char *cursor, long len )
+syck_scan_scalar( int req_width, char *cursor, long len )
{
long i = 0, start = 0;
int flags = SCAN_NONE;
@@ -638,14 +639,13 @@ syck_scan_scalar( int req_width, const char *cursor, long len )
* All scalars should be emitted through this function, which determines an appropriate style,
* tag and indent.
*/
-void syck_emit_scalar( SyckEmitter *e, const char *tag, enum scalar_style force_style, int force_indent, int force_width,
- char keep_nl, const char *str, long len )
+void syck_emit_scalar( SyckEmitter *e, char *tag, enum scalar_style force_style, int force_indent, int force_width,
+ char keep_nl, char *str, long len )
{
enum scalar_style favor_style = scalar_literal;
SyckLevel *parent = syck_emitter_parent_level( e );
SyckLevel *lvl = syck_emitter_current_level( e );
int scan = 0;
- const char *match_implicit;
char *implicit;
if ( str == NULL ) str = "";
@@ -659,10 +659,10 @@ void syck_emit_scalar( SyckEmitter *e, const char *tag, enum scalar_style force_
}
scan = syck_scan_scalar( force_width, str, len );
- match_implicit = syck_match_implicit( str, len );
+ implicit = syck_match_implicit( str, len );
/* quote strings which default to implicits */
- implicit = syck_taguri( YAML_DOMAIN, match_implicit, strlen( match_implicit ) );
+ implicit = syck_taguri( YAML_DOMAIN, implicit, strlen( implicit ) );
if ( syck_tagcmp( tag, implicit ) != 0 && syck_tagcmp( tag, "tag:yaml.org,2002:str" ) == 0 ) {
force_style = scalar_2quote;
} else {
@@ -773,7 +773,7 @@ void syck_emit_scalar( SyckEmitter *e, const char *tag, enum scalar_style force_
}
void
-syck_emitter_escape( SyckEmitter *e, const char *src, long len )
+syck_emitter_escape( SyckEmitter *e, char *src, long len )
{
int i;
for( i = 0; i < len; i++ )
@@ -786,8 +786,8 @@ syck_emitter_escape( SyckEmitter *e, const char *src, long len )
else
{
syck_emitter_write( e, "x", 1 );
- syck_emitter_write( e, (const char *)hex_table + ((src[i] & 0xF0) >> 4), 1 );
- syck_emitter_write( e, (const char *)hex_table + (src[i] & 0x0F), 1 );
+ syck_emitter_write( e, (char *)hex_table + ((src[i] & 0xF0) >> 4), 1 );
+ syck_emitter_write( e, (char *)hex_table + (src[i] & 0x0F), 1 );
}
}
else
@@ -802,13 +802,12 @@ syck_emitter_escape( SyckEmitter *e, const char *src, long len )
/*
* Outputs a single-quoted block.
*/
-void
-syck_emit_1quoted( SyckEmitter *e, int width, const char *str, long len )
+void syck_emit_1quoted( SyckEmitter *e, int width, char *str, long len )
{
char do_indent = 0;
- const char *mark = str;
- const char *start = str;
- const char *end = str;
+ char *mark = str;
+ char *start = str;
+ char *end = str;
syck_emitter_write( e, "'", 1 );
while ( mark < str + len ) {
if ( do_indent ) {
@@ -850,13 +849,12 @@ syck_emit_1quoted( SyckEmitter *e, int width, const char *str, long len )
/*
* Outputs a double-quoted block.
*/
-void
-syck_emit_2quoted( SyckEmitter *e, int width, const char *str, long len )
+void syck_emit_2quoted( SyckEmitter *e, int width, char *str, long len )
{
char do_indent = 0;
- const char *mark = str;
- const char *start = str;
- const char *end = str;
+ char *mark = str;
+ char *start = str;
+ char *end = str;
syck_emitter_write( e, "\"", 1 );
while ( mark < str + len ) {
if ( do_indent > 0 ) {
@@ -911,12 +909,11 @@ syck_emit_2quoted( SyckEmitter *e, int width, const char *str, long len )
/*
* Outputs a literal block.
*/
-void
-syck_emit_literal( SyckEmitter *e, char keep_nl, const char *str, long len )
+void syck_emit_literal( SyckEmitter *e, char keep_nl, char *str, long len )
{
- const char *mark = str;
- const char *start = str;
- const char *end = str;
+ char *mark = str;
+ char *start = str;
+ char *end = str;
syck_emitter_write( e, "|", 1 );
if ( keep_nl == NL_CHOMP ) {
syck_emitter_write( e, "-", 1 );
@@ -947,12 +944,11 @@ syck_emit_literal( SyckEmitter *e, char keep_nl, const char *str, long len )
/*
* Outputs a folded block.
*/
-void
-syck_emit_folded( SyckEmitter *e, int width, char keep_nl, const char *str, long len )
+void syck_emit_folded( SyckEmitter *e, int width, char keep_nl, char *str, long len )
{
- const char *mark = str;
- const char *start = str;
- const char *end = str;
+ char *mark = str;
+ char *start = str;
+ char *end = str;
syck_emitter_write( e, ">", 1 );
if ( keep_nl == NL_CHOMP ) {
syck_emitter_write( e, "-", 1 );
@@ -997,7 +993,7 @@ syck_emit_folded( SyckEmitter *e, int width, char keep_nl, const char *str, long
/*
* Begins emission of a sequence.
*/
-void syck_emit_seq( SyckEmitter *e, const char *tag, enum seq_style style )
+void syck_emit_seq( SyckEmitter *e, char *tag, enum seq_style style )
{
SyckLevel *parent = syck_emitter_parent_level( e );
SyckLevel *lvl = syck_emitter_current_level( e );
@@ -1018,8 +1014,7 @@ void syck_emit_seq( SyckEmitter *e, const char *tag, enum seq_style style )
/*
* Begins emission of a mapping.
*/
-void
-syck_emit_map( SyckEmitter *e, const char *tag, enum map_style style )
+void syck_emit_map( SyckEmitter *e, char *tag, enum map_style style )
{
SyckLevel *parent = syck_emitter_parent_level( e );
SyckLevel *lvl = syck_emitter_current_level( e );
@@ -1223,10 +1218,10 @@ syck_emitter_mark_node( SyckEmitter *e, st_data_t n )
e->anchors = st_init_numtable();
}
- if ( ! st_lookup( e->anchors, (st_data_t)oid, (void *)&anchor_name ) )
+ if ( ! st_lookup( e->anchors, (st_data_t)oid, (st_data_t *)&anchor_name ) )
{
int idx = 0;
- const char *anc = ( e->anchor_format == NULL ? DEFAULT_ANCHOR_FORMAT : e->anchor_format );
+ char *anc = ( e->anchor_format == NULL ? DEFAULT_ANCHOR_FORMAT : e->anchor_format );
/*
* Second time hitting this object, let's give it an anchor
diff --git a/ext/syck/handler.c b/ext/syck/handler.c
index d76a72e5cc..56fe838fbd 100644
--- a/ext/syck/handler.c
+++ b/ext/syck/handler.c
@@ -2,11 +2,12 @@
* handler.c
*
* $Author$
+ * $Date$
*
* Copyright (C) 2003 why the lucky stiff
*/
-#include "ruby/ruby.h"
+#include "ruby.h"
#include "syck.h"
SYMID
@@ -36,7 +37,7 @@ syck_hdlr_add_anchor( SyckParser *p, char *a, SyckNode *n )
if ( p->bad_anchors != NULL )
{
SyckNode *bad;
- if ( st_lookup( p->bad_anchors, (st_data_t)a, (void *)&bad ) )
+ if ( st_lookup( p->bad_anchors, (st_data_t)a, (st_data_t *)&bad ) )
{
if ( n->kind != syck_str_kind )
{
@@ -49,7 +50,7 @@ syck_hdlr_add_anchor( SyckParser *p, char *a, SyckNode *n )
{
p->anchors = st_init_strtable();
}
- if ( st_lookup( p->anchors, (st_data_t)a, (void *)&ntmp ) )
+ if ( st_lookup( p->anchors, (st_data_t)a, (st_data_t *)&ntmp ) )
{
if ( ntmp != (void *)1 )
{
@@ -69,7 +70,7 @@ syck_hdlr_remove_anchor( SyckParser *p, char *a )
{
p->anchors = st_init_strtable();
}
- if ( st_delete( p->anchors, (void *)&atmp, (void *)&ntmp ) )
+ if ( st_delete( p->anchors, (st_data_t *)&atmp, (st_data_t *)&ntmp ) )
{
if ( ntmp != (void *)1 )
{
@@ -86,7 +87,7 @@ syck_hdlr_get_anchor( SyckParser *p, char *a )
if ( p->anchors != NULL )
{
- if ( st_lookup( p->anchors, (st_data_t)a, (void *)&n ) )
+ if ( st_lookup( p->anchors, (st_data_t)a, (st_data_t *)&n ) )
{
if ( n != (void *)1 )
{
@@ -99,7 +100,7 @@ syck_hdlr_get_anchor( SyckParser *p, char *a )
{
p->bad_anchors = st_init_strtable();
}
- if ( ! st_lookup( p->bad_anchors, (st_data_t)a, (void *)&n ) )
+ if ( ! st_lookup( p->bad_anchors, (st_data_t)a, (st_data_t *)&n ) )
{
n = (p->bad_anchor_handler)( p, a );
st_insert( p->bad_anchors, (st_data_t)a, (st_data_t)n );
@@ -144,7 +145,7 @@ syck_add_transfer( char *uri, SyckNode *n, int taguri )
}
char *
-syck_xprivate( const char *type_id, int type_len )
+syck_xprivate( char *type_id, int type_len )
{
char *uri = S_ALLOC_N( char, type_len + 14 );
uri[0] = '\0';
@@ -154,7 +155,7 @@ syck_xprivate( const char *type_id, int type_len )
}
char *
-syck_taguri( const char *domain, const char *type_id, int type_len )
+syck_taguri( char *domain, char *type_id, int type_len )
{
char *uri = S_ALLOC_N( char, strlen( domain ) + type_len + 14 );
uri[0] = '\0';
diff --git a/ext/syck/implicit.c b/ext/syck/implicit.c
index 126b896f18..d356faf7d9 100644
--- a/ext/syck/implicit.c
+++ b/ext/syck/implicit.c
@@ -4,11 +4,12 @@
* implicit.re
*
* $Author$
+ * $Date$
*
* Copyright (C) 2003 why the lucky stiff
*/
-#include "ruby/ruby.h"
+#include "ruby.h"
#include "syck.h"
#define YYCTYPE char
@@ -20,7 +21,7 @@
void
try_tag_implicit( SyckNode *n, int taguri )
{
- const char *tid = "";
+ char *tid = "";
switch ( n->kind )
{
case syck_str_kind:
@@ -44,10 +45,9 @@ try_tag_implicit( SyckNode *n, int taguri )
}
}
-const char *
-syck_match_implicit( const char *str, size_t len )
+char *syck_match_implicit( char *str, size_t len )
{
- const char *cursor, *limit, *marker = 0;
+ char *cursor, *limit, *marker;
cursor = str;
limit = str + len;
@@ -1585,7 +1585,7 @@ yy201: ++YYCURSOR;
/* Remove ending fragment and compare types */
int
-syck_tagcmp( const char *tag1, const char *tag2 )
+syck_tagcmp( char *tag1, char *tag2 )
{
if ( tag1 == tag2 ) return 1;
if ( tag1 == NULL || tag2 == NULL ) return 0;
@@ -1609,9 +1609,9 @@ syck_tagcmp( const char *tag1, const char *tag2 )
}
char *
-syck_type_id_to_uri( const char *type_id )
+syck_type_id_to_uri( char *type_id )
{
- const char *cursor, *limit, *marker = 0;
+ char *cursor, *limit, *marker;
cursor = type_id;
limit = type_id + strlen( type_id );
@@ -1620,7 +1620,7 @@ syck_type_id_to_uri( const char *type_id )
#line 1620 "<stdout>"
{
YYCTYPE yych;
- unsigned int yyaccept = 0;
+ unsigned int yyaccept;
goto yy202;
++YYCURSOR;
yy202:
diff --git a/ext/syck/node.c b/ext/syck/node.c
index fb98f655cc..28fc78c077 100644
--- a/ext/syck/node.c
+++ b/ext/syck/node.c
@@ -2,11 +2,12 @@
* node.c
*
* $Author$
+ * $Date$
*
* Copyright (C) 2003 why the lucky stiff
*/
-#include "ruby/ruby.h"
+#include "ruby.h"
#include "syck.h"
/*
@@ -45,7 +46,7 @@ syck_free_node( SyckNode *n )
}
SyckNode *
-syck_alloc_map(void)
+syck_alloc_map()
{
SyckNode *n;
struct SyckMap *m;
@@ -64,7 +65,7 @@ syck_alloc_map(void)
}
SyckNode *
-syck_alloc_seq(void)
+syck_alloc_seq()
{
SyckNode *n;
struct SyckSeq *s;
@@ -82,7 +83,7 @@ syck_alloc_seq(void)
}
SyckNode *
-syck_alloc_str(void)
+syck_alloc_str()
{
SyckNode *n;
struct SyckStr *s;
@@ -99,13 +100,13 @@ syck_alloc_str(void)
}
SyckNode *
-syck_new_str( const char *str, enum scalar_style style )
+syck_new_str( char *str, enum scalar_style style )
{
return syck_new_str2( str, strlen( str ), style );
}
SyckNode *
-syck_new_str2( const char *str, long len, enum scalar_style style )
+syck_new_str2( char *str, long len, enum scalar_style style )
{
SyckNode *n;
@@ -128,7 +129,7 @@ syck_replace_str( SyckNode *n, char *str, enum scalar_style style )
void
syck_replace_str2( SyckNode *n, char *str, long len, enum scalar_style style )
{
- if ( n->data.str->ptr != NULL )
+ if ( n->data.str != NULL )
{
S_FREE( n->data.str->ptr );
n->data.str->ptr = NULL;
diff --git a/ext/syck/rubyext.c b/ext/syck/rubyext.c
index 2f78b6ddaf..76e8279601 100644
--- a/ext/syck/rubyext.c
+++ b/ext/syck/rubyext.c
@@ -3,12 +3,12 @@
* rubyext.c
*
* $Author$
+ * $Date$
*
* Copyright (C) 2003-2005 why the lucky stiff
*/
-#include "ruby/ruby.h"
-#include "ruby/encoding.h"
+#include "ruby.h"
#include "syck.h"
#include <sys/types.h>
#include <time.h>
@@ -49,21 +49,21 @@ typedef struct {
/*
* symbols and constants
*/
-static ID s_new, s_utc, s_at, s_to_f, s_to_i, s_read, s_binmode, s_call, s_cmp, s_transfer, s_update, s_dup, s_haskey, s_match, s_keys, s_unpack, s_tr_bang, s_default_set, s_tag_read_class, s_tag_subclasses, s_resolver, s_push, s_emitter, s_level, s_detect_implicit, s_node_import, s_out, s_input, s_intern, s_transform, s_yaml_new, s_yaml_initialize, s_node_export, s_to_yaml, s_write, s_set_resolver, s_each;
-static ID s_tags, s_kind, s_name, s_options, s_type_id, s_type_id_set, s_style, s_style_set, s_value, s_value_set, s_parse;
+static ID s_new, s_utc, s_at, s_to_f, s_to_i, s_read, s_binmode, s_call, s_cmp, s_transfer, s_update, s_dup, s_haskey, s_match, s_keys, s_unpack, s_tr_bang, s_default_set, s_tag_read_class, s_tag_subclasses, s_resolver, s_push, s_emitter, s_level, s_detect_implicit, s_node_import, s_out, s_input, s_intern, s_transform, s_yaml_new, s_yaml_initialize, s_node_export, s_to_yaml, s_write, s_set_resolver;
+static ID s_tags, s_domain, s_kind, s_name, s_options, s_type_id, s_type_id_set, s_style, s_style_set, s_value, s_value_set;
static VALUE sym_model, sym_generic, sym_input, sym_bytecode;
static VALUE sym_scalar, sym_seq, sym_map;
static VALUE sym_1quote, sym_2quote, sym_fold, sym_literal, sym_plain, sym_inline;
-static VALUE cDate, cNode, cMap, cSeq, cScalar, cOut, cParser, cResolver, cPrivateType, cDomainType, cYObject, cBadAlias, cDefaultKey, cMergeKey, cEmitter, cDateTime;
+static VALUE cDate, cNode, cMap, cSeq, cScalar, cOut, cParser, cResolver, cPrivateType, cDomainType, cYObject, cBadAlias, cDefaultKey, cMergeKey, cEmitter;
static VALUE oDefaultResolver, oGenericResolver;
/*
* my private collection of numerical oddities.
*/
-static double S_zero(void) { return 0.0; }
-static double S_one(void) { return 1.0; }
-static double S_inf(void) { return S_one() / S_zero(); }
-static double S_nan(void) { return S_zero() / S_zero(); }
+static double S_zero() { return 0.0; }
+static double S_one() { return 1.0; }
+static double S_inf() { return S_one() / S_zero(); }
+static double S_nan() { return S_zero() / S_zero(); }
static VALUE syck_node_transform( VALUE );
@@ -71,7 +71,7 @@ static VALUE syck_node_transform( VALUE );
* handler prototypes
*/
SYMID rb_syck_load_handler _((SyckParser *, SyckNode *));
-void rb_syck_err_handler _((SyckParser *, const char *));
+void rb_syck_err_handler _((SyckParser *, char *));
SyckNode * rb_syck_bad_anchor_handler _((SyckParser *, char *));
void rb_syck_output_handler _((SyckEmitter *, char *, long));
void rb_syck_emitter_handler _((SyckEmitter *, st_data_t));
@@ -97,14 +97,14 @@ struct emitter_xtra {
* Convert YAML to bytecode
*/
VALUE
-rb_syck_compile(VALUE self, VALUE port)
+rb_syck_compile(self, port)
+ VALUE self, port;
{
SYMID oid;
int taint;
char *ret;
VALUE bc;
- bytestring_t *sav = NULL;
- void *data = NULL;
+ bytestring_t *sav;
SyckParser *parser = syck_new_parser();
taint = syck_parser_assign_io(parser, &port);
@@ -113,10 +113,7 @@ rb_syck_compile(VALUE self, VALUE port)
syck_parser_implicit_typing( parser, 0 );
syck_parser_taguri_expansion( parser, 0 );
oid = syck_parse( parser );
- if (!syck_lookup_sym( parser, oid, &data )) {
- rb_raise(rb_eSyntaxError, "root node <%lx> not found", oid);
- }
- sav = data;
+ syck_lookup_sym( parser, oid, (char **)&sav );
ret = S_ALLOCA_N( char, strlen( sav->buffer ) + 3 );
ret[0] = '\0';
@@ -153,8 +150,8 @@ rb_syck_io_str_read( char *buf, SyckIoStr *str, long max_size, long skip )
if (!NIL_P(str2))
{
StringValue(str2);
- len = RSTRING_LEN(str2);
- memcpy( buf + skip, RSTRING_PTR(str2), len );
+ len = RSTRING(str2)->len;
+ memcpy( buf + skip, RSTRING(str2)->ptr, len );
}
}
len += skip;
@@ -167,14 +164,16 @@ rb_syck_io_str_read( char *buf, SyckIoStr *str, long max_size, long skip )
* (returns tainted? boolean)
*/
int
-syck_parser_assign_io(SyckParser *parser, VALUE *pport)
+syck_parser_assign_io(parser, pport)
+ SyckParser *parser;
+ VALUE *pport;
{
int taint = Qtrue;
VALUE tmp, port = *pport;
if (!NIL_P(tmp = rb_check_string_type(port))) {
taint = OBJ_TAINTED(port); /* original taintedness */
port = tmp;
- syck_parser_str( parser, RSTRING_PTR(port), RSTRING_LEN(port), NULL );
+ syck_parser_str( parser, RSTRING(port)->ptr, RSTRING(port)->len, NULL );
}
else if (rb_respond_to(port, s_read)) {
if (rb_respond_to(port, s_binmode)) {
@@ -193,7 +192,8 @@ syck_parser_assign_io(SyckParser *parser, VALUE *pport)
* Get value in hash by key, forcing an empty hash if nil.
*/
VALUE
-syck_get_hash_aref(VALUE hsh, VALUE key)
+syck_get_hash_aref(hsh, key)
+ VALUE hsh, key;
{
VALUE val = rb_hash_aref( hsh, key );
if ( NIL_P( val ) )
@@ -207,17 +207,12 @@ syck_get_hash_aref(VALUE hsh, VALUE key)
/*
* creating timestamps
*/
-struct mktime_arg {
+SYMID
+rb_syck_mktime(str, len)
char *str;
long len;
-};
-
-SYMID
-mktime_do(struct mktime_arg *arg)
{
VALUE time;
- char *str = arg->str;
- long len = arg->len;
char *ptr = str;
VALUE year = INT2FIX(0);
VALUE mon = INT2FIX(0);
@@ -291,7 +286,7 @@ mktime_do(struct mktime_arg *arg)
if ( len > ptr - str && ( *ptr == '-' || *ptr == '+' ) )
{
time_t tz_offset = strtol(ptr, NULL, 10) * 3600;
- VALUE tmp;
+ time_t tmp;
while ( *ptr != ':' && *ptr != '\0' ) ptr++;
if ( *ptr == ':' )
@@ -309,9 +304,8 @@ mktime_do(struct mktime_arg *arg)
/* Make TZ time*/
time = rb_funcall(rb_cTime, s_utc, 6, year, mon, day, hour, min, sec);
- tmp = rb_funcall(time, s_to_i, 0);
- tmp = rb_funcall(tmp, '-', 1, LONG2FIX(tz_offset));
- return rb_funcall(rb_cTime, s_at, 2, tmp, LONG2NUM(usec));
+ tmp = NUM2LONG(rb_funcall(time, s_to_i, 0)) - tz_offset;
+ return rb_funcall(rb_cTime, s_at, 2, LONG2NUM(tmp), LONG2NUM(usec));
}
else
{
@@ -320,35 +314,13 @@ mktime_do(struct mktime_arg *arg)
}
}
-SYMID
-mktime_r(struct mktime_arg *arg)
-{
- if (!cDateTime) {
- /*
- * Load Date module
- */
- rb_require("date");
- cDateTime = rb_const_get(rb_cObject, rb_intern("DateTime"));
- }
- return rb_funcall(cDateTime, s_parse, 1, rb_str_new(arg->str, arg->len));
-}
-
-SYMID
-rb_syck_mktime(char *str, long len)
-{
- struct mktime_arg a;
-
- a.str = str;
- a.len = len;
- return rb_rescue2(mktime_do, (VALUE)&a, mktime_r, (VALUE)&a, rb_eArgError, NULL);
-}
-
/*
* handles merging of an array of hashes
* (see http://www.yaml.org/type/merge/)
*/
VALUE
-syck_merge_i(VALUE entry, VALUE hsh )
+syck_merge_i( entry, hsh )
+ VALUE entry, hsh;
{
VALUE tmp;
if ( !NIL_P(tmp = rb_check_convert_type(entry, T_HASH, "Hash", "to_hash")) )
@@ -363,7 +335,9 @@ syck_merge_i(VALUE entry, VALUE hsh )
* default handler for ruby.yaml.org types
*/
int
-yaml_org_handler( SyckNode *n, VALUE *ref )
+yaml_org_handler( n, ref )
+ SyckNode *n;
+ VALUE *ref;
{
char *type_id = n->type_id;
int transferred = 0;
@@ -547,7 +521,6 @@ yaml_org_handler( SyckNode *n, VALUE *ref )
else if ( strcmp( type_id, "str" ) == 0 )
{
obj = rb_str_new( n->data.str->ptr, n->data.str->len );
- rb_enc_associate(obj, rb_utf8_encoding());
}
else
{
@@ -602,7 +575,7 @@ yaml_org_handler( SyckNode *n, VALUE *ref )
VALUE dup = rb_funcall( tmph, s_dup, 0 );
tmp = rb_ary_reverse( tmp );
rb_ary_push( tmp, obj );
- rb_block_call( tmp, s_each, 0, 0, syck_merge_i, dup );
+ rb_iterate( rb_each, tmp, syck_merge_i, dup );
obj = dup;
skip_aset = 1;
}
@@ -633,7 +606,9 @@ static void syck_node_mark( SyckNode *n );
* - Converts data into native Ruby types
*/
SYMID
-rb_syck_load_handler(SyckParser *p, SyckNode *n)
+rb_syck_load_handler(p, n)
+ SyckParser *p;
+ SyckNode *n;
{
VALUE obj = Qnil;
struct parser_xtra *bonus = (struct parser_xtra *)p->bonus;
@@ -661,7 +636,7 @@ rb_syck_load_handler(SyckParser *p, SyckNode *n)
if ( bonus->taint) OBJ_TAINT( obj );
if ( bonus->proc != 0 ) rb_funcall(bonus->proc, s_call, 1, obj);
- rb_hash_aset(bonus->data, INT2FIX(RHASH_SIZE(bonus->data)), obj);
+ rb_hash_aset(bonus->data, INT2FIX(RHASH(bonus->data)->tbl->num_entries), obj);
return obj;
}
@@ -669,7 +644,9 @@ rb_syck_load_handler(SyckParser *p, SyckNode *n)
* friendly errors.
*/
void
-rb_syck_err_handler(SyckParser *p, const char *msg)
+rb_syck_err_handler(p, msg)
+ SyckParser *p;
+ char *msg;
{
char *endl = p->cursor;
@@ -677,7 +654,7 @@ rb_syck_err_handler(SyckParser *p, const char *msg)
endl++;
endl[0] = '\0';
- rb_raise(rb_eArgError, "%s on line %d, col %"PRIdPTRDIFF": `%s'",
+ rb_raise(rb_eArgError, "%s on line %d, col %d: `%s'",
msg,
p->linect,
p->cursor - p->lineptr,
@@ -688,7 +665,9 @@ rb_syck_err_handler(SyckParser *p, const char *msg)
* provide bad anchor object to the parser.
*/
SyckNode *
-rb_syck_bad_anchor_handler(SyckParser *p, char *a)
+rb_syck_bad_anchor_handler(p, a)
+ SyckParser *p;
+ char *a;
{
VALUE anchor_name = rb_str_new2( a );
SyckNode *badanc = syck_new_map( rb_str_new2( "name" ), anchor_name );
@@ -700,7 +679,8 @@ rb_syck_bad_anchor_handler(SyckParser *p, char *a)
* data loaded based on the model requested.
*/
void
-syck_set_model(VALUE p, VALUE input, VALUE model)
+syck_set_model( p, input, model )
+ VALUE p, input, model;
{
SyckParser *parser;
Data_Get_Struct(p, SyckParser, parser);
@@ -740,7 +720,8 @@ syck_st_mark_nodes( char *key, SyckNode *n, char *arg )
* mark parser nodes
*/
static void
-syck_mark_parser(SyckParser *parser)
+syck_mark_parser(parser)
+ SyckParser *parser;
{
struct parser_xtra *bonus = (struct parser_xtra *)parser->bonus;
rb_gc_mark_maybe(parser->root);
@@ -763,7 +744,8 @@ syck_mark_parser(SyckParser *parser)
* Free the parser and any bonus attachment.
*/
void
-rb_syck_free_parser(SyckParser *p)
+rb_syck_free_parser(p)
+ SyckParser *p;
{
S_FREE( p->bonus );
syck_free_parser(p);
@@ -774,7 +756,8 @@ rb_syck_free_parser(SyckParser *p)
*/
VALUE syck_parser_s_alloc _((VALUE));
VALUE
-syck_parser_s_alloc(VALUE class)
+syck_parser_s_alloc(class)
+ VALUE class;
{
VALUE pobj;
SyckParser *parser = syck_new_parser();
@@ -793,7 +776,10 @@ syck_parser_s_alloc(VALUE class)
* YAML::Syck::Parser.initialize( resolver, options )
*/
static VALUE
-syck_parser_initialize(int argc, VALUE *argv, VALUE self)
+syck_parser_initialize(argc, argv, self)
+ int argc;
+ VALUE *argv;
+ VALUE self;
{
VALUE options;
if (rb_scan_args(argc, argv, "01", &options) == 0)
@@ -813,7 +799,8 @@ syck_parser_initialize(int argc, VALUE *argv, VALUE self)
* YAML::Syck::Parser.bufsize = Integer
*/
static VALUE
-syck_parser_bufsize_set(VALUE self, VALUE size)
+syck_parser_bufsize_set( self, size )
+ VALUE self, size;
{
SyckParser *parser;
@@ -829,7 +816,8 @@ syck_parser_bufsize_set(VALUE self, VALUE size)
* YAML::Syck::Parser.bufsize => Integer
*/
static VALUE
-syck_parser_bufsize_get(VALUE self)
+syck_parser_bufsize_get( self )
+ VALUE self;
{
SyckParser *parser;
@@ -841,7 +829,10 @@ syck_parser_bufsize_get(VALUE self)
* YAML::Syck::Parser.load( IO or String )
*/
VALUE
-syck_parser_load(int argc, VALUE *argv, VALUE self)
+syck_parser_load(argc, argv, self)
+ int argc;
+ VALUE *argv;
+ VALUE self;
{
VALUE port, proc, model, input;
SyckParser *parser;
@@ -868,7 +859,10 @@ syck_parser_load(int argc, VALUE *argv, VALUE self)
* YAML::Syck::Parser.load_documents( IO or String ) { |doc| }
*/
VALUE
-syck_parser_load_documents(int argc, VALUE *argv, VALUE self)
+syck_parser_load_documents(argc, argv, self)
+ int argc;
+ VALUE *argv;
+ VALUE self;
{
VALUE port, proc, v, input, model;
SyckParser *parser;
@@ -909,7 +903,8 @@ syck_parser_load_documents(int argc, VALUE *argv, VALUE self)
* YAML::Syck::Parser#set_resolver
*/
VALUE
-syck_parser_set_resolver(VALUE self, VALUE resolver)
+syck_parser_set_resolver( self, resolver )
+ VALUE self, resolver;
{
rb_ivar_set( self, s_resolver, resolver );
return self;
@@ -919,7 +914,8 @@ syck_parser_set_resolver(VALUE self, VALUE resolver)
* YAML::Syck::Resolver.initialize
*/
static VALUE
-syck_resolver_initialize(VALUE self)
+syck_resolver_initialize( self )
+ VALUE self;
{
rb_ivar_set(self, s_tags, rb_hash_new());
return self;
@@ -929,7 +925,8 @@ syck_resolver_initialize(VALUE self)
* YAML::Syck::Resolver#add_type
*/
VALUE
-syck_resolver_add_type(VALUE self, VALUE taguri, VALUE cls)
+syck_resolver_add_type( self, taguri, cls )
+ VALUE self, taguri, cls;
{
VALUE tags = rb_attr_get(self, s_tags);
rb_hash_aset( tags, taguri, cls );
@@ -940,7 +937,8 @@ syck_resolver_add_type(VALUE self, VALUE taguri, VALUE cls)
* YAML::Syck::Resolver#use_types_at
*/
VALUE
-syck_resolver_use_types_at(VALUE self, VALUE hsh)
+syck_resolver_use_types_at( self, hsh )
+ VALUE self, hsh;
{
rb_ivar_set( self, s_tags, hsh );
return Qnil;
@@ -950,7 +948,8 @@ syck_resolver_use_types_at(VALUE self, VALUE hsh)
* YAML::Syck::Resolver#detect_implicit
*/
VALUE
-syck_resolver_detect_implicit(VALUE self, VALUE val)
+syck_resolver_detect_implicit( self, val )
+ VALUE self, val;
{
return rb_str_new2( "" );
}
@@ -959,10 +958,11 @@ syck_resolver_detect_implicit(VALUE self, VALUE val)
* YAML::Syck::Resolver#node_import
*/
VALUE
-syck_resolver_node_import(VALUE self, VALUE node)
+syck_resolver_node_import( self, node )
+ VALUE self, node;
{
SyckNode *n;
- VALUE obj = Qnil;
+ VALUE obj;
int i = 0;
Data_Get_Struct(node, SyckNode, n);
@@ -1008,7 +1008,7 @@ syck_resolver_node_import(VALUE self, VALUE node)
VALUE dup = rb_funcall( end, s_dup, 0 );
v = rb_ary_reverse( v );
rb_ary_push( v, obj );
- rb_block_call( v, s_each, 0, 0, syck_merge_i, dup );
+ rb_iterate( rb_each, v, syck_merge_i, dup );
obj = dup;
skip_aset = 1;
}
@@ -1039,15 +1039,16 @@ syck_resolver_node_import(VALUE self, VALUE node)
* Set instance variables
*/
VALUE
-syck_set_ivars(VALUE vars, VALUE obj)
+syck_set_ivars( vars, obj )
+ VALUE vars, obj;
{
VALUE ivname = rb_ary_entry( vars, 0 );
char *ivn;
StringValue( ivname );
- ivn = S_ALLOCA_N( char, RSTRING_LEN(ivname) + 2 );
+ ivn = S_ALLOCA_N( char, RSTRING(ivname)->len + 2 );
ivn[0] = '@';
ivn[1] = '\0';
- strncat( ivn, RSTRING_PTR(ivname), RSTRING_LEN(ivname) );
+ strncat( ivn, RSTRING(ivname)->ptr, RSTRING(ivname)->len );
rb_iv_set( obj, ivn, rb_ary_entry( vars, 1 ) );
return Qnil;
}
@@ -1056,12 +1057,13 @@ syck_set_ivars(VALUE vars, VALUE obj)
* YAML::Syck::Resolver#const_find
*/
VALUE
-syck_const_find(VALUE const_name)
+syck_const_find( const_name )
+ VALUE const_name;
{
VALUE tclass = rb_cObject;
VALUE tparts = rb_str_split( const_name, "::" );
int i = 0;
- for ( i = 0; i < RARRAY_LEN(tparts); i++ ) {
+ for ( i = 0; i < RARRAY(tparts)->len; i++ ) {
VALUE tpart = rb_to_id( rb_ary_entry( tparts, i ) );
if ( !rb_const_defined( tclass, tpart ) ) return Qnil;
tclass = rb_const_get( tclass, tpart );
@@ -1073,14 +1075,15 @@ syck_const_find(VALUE const_name)
* YAML::Syck::Resolver#transfer
*/
VALUE
-syck_resolver_transfer(VALUE self, VALUE type, VALUE val)
+syck_resolver_transfer( self, type, val )
+ VALUE self, type, val;
{
- if (NIL_P(type) || RSTRING_LEN(StringValue(type)) == 0)
+ if (NIL_P(type) || RSTRING(StringValue(type))->len == 0)
{
type = rb_funcall( self, s_detect_implicit, 1, val );
}
- if ( ! (NIL_P(type) || RSTRING_LEN(StringValue(type)) == 0) )
+ if ( ! (NIL_P(type) || RSTRING(StringValue(type))->len == 0) )
{
VALUE str_xprivate = rb_str_new2( "x-private" );
VALUE colon = rb_str_new2( ":" );
@@ -1097,7 +1100,7 @@ syck_resolver_transfer(VALUE self, VALUE type, VALUE val)
VALUE subclass_parts = rb_ary_new();
VALUE parts = rb_str_split( type, ":" );
- while ( RARRAY_LEN(parts) > 1 )
+ while ( RARRAY(parts)->len > 1 )
{
VALUE partial;
rb_ary_unshift( subclass_parts, rb_ary_pop( parts ) );
@@ -1115,7 +1118,7 @@ syck_resolver_transfer(VALUE self, VALUE type, VALUE val)
if ( ! NIL_P( target_class ) )
{
subclass = target_class;
- if ( RARRAY_LEN(subclass_parts) > 0 && rb_respond_to( target_class, s_tag_subclasses ) &&
+ if ( RARRAY(subclass_parts)->len > 0 && rb_respond_to( target_class, s_tag_subclasses ) &&
RTEST( rb_funcall( target_class, s_tag_subclasses, 0 ) ) )
{
VALUE subclass_v;
@@ -1174,7 +1177,7 @@ syck_resolver_transfer(VALUE self, VALUE type, VALUE val)
}
else if ( !NIL_P( obj ) && rb_obj_is_instance_of( val, rb_cHash ) )
{
- rb_block_call( val, s_each, 0, 0, syck_set_ivars, obj );
+ rb_iterate( rb_each, val, syck_set_ivars, obj );
}
}
else
@@ -1204,13 +1207,14 @@ syck_resolver_transfer(VALUE self, VALUE type, VALUE val)
* YAML::Syck::Resolver#tagurize
*/
VALUE
-syck_resolver_tagurize(VALUE self, VALUE val)
+syck_resolver_tagurize( self, val )
+ VALUE self, val;
{
VALUE tmp = rb_check_string_type(val);
if ( !NIL_P(tmp) )
{
- char *taguri = syck_type_id_to_uri( RSTRING_PTR(tmp) );
+ char *taguri = syck_type_id_to_uri( RSTRING(tmp)->ptr );
val = rb_str_new2( taguri );
S_FREE( taguri );
}
@@ -1222,15 +1226,16 @@ syck_resolver_tagurize(VALUE self, VALUE val)
* YAML::Syck::DefaultResolver#detect_implicit
*/
VALUE
-syck_defaultresolver_detect_implicit(VALUE self, VALUE val)
+syck_defaultresolver_detect_implicit( self, val )
+ VALUE self, val;
{
- const char *type_id;
+ char *type_id;
VALUE tmp = rb_check_string_type(val);
if ( !NIL_P(tmp) )
{
val = tmp;
- type_id = syck_match_implicit( RSTRING_PTR(val), RSTRING_LEN(val) );
+ type_id = syck_match_implicit( RSTRING(val)->ptr, RSTRING(val)->len );
return rb_str_new2( type_id );
}
@@ -1241,7 +1246,8 @@ syck_defaultresolver_detect_implicit(VALUE self, VALUE val)
* YAML::Syck::DefaultResolver#node_import
*/
VALUE
-syck_defaultresolver_node_import(VALUE self, VALUE node)
+syck_defaultresolver_node_import( self, node )
+ VALUE self, node;
{
SyckNode *n;
VALUE obj;
@@ -1257,7 +1263,8 @@ syck_defaultresolver_node_import(VALUE self, VALUE node)
* YAML::Syck::GenericResolver#node_import
*/
VALUE
-syck_genericresolver_node_import(VALUE self, VALUE node)
+syck_genericresolver_node_import( self, node )
+ VALUE self, node;
{
SyckNode *n;
int i = 0;
@@ -1274,7 +1281,6 @@ syck_genericresolver_node_import(VALUE self, VALUE node)
case syck_str_kind:
{
v = rb_str_new( n->data.str->ptr, n->data.str->len );
- rb_enc_associate(v, rb_utf8_encoding());
if ( n->data.str->style == scalar_1quote )
{
style = sym_1quote;
@@ -1335,7 +1341,8 @@ syck_genericresolver_node_import(VALUE self, VALUE node)
* YAML::Syck::BadAlias.initialize
*/
VALUE
-syck_badalias_initialize(VALUE self, VALUE val)
+syck_badalias_initialize( self, val )
+ VALUE self, val;
{
rb_iv_set( self, "@name", val );
return self;
@@ -1345,7 +1352,8 @@ syck_badalias_initialize(VALUE self, VALUE val)
* YAML::Syck::BadAlias.<=>
*/
VALUE
-syck_badalias_cmp(VALUE alias1, VALUE alias2)
+syck_badalias_cmp( alias1, alias2 )
+ VALUE alias1, alias2;
{
VALUE str1 = rb_ivar_get( alias1, s_name );
VALUE str2 = rb_ivar_get( alias2, s_name );
@@ -1357,7 +1365,8 @@ syck_badalias_cmp(VALUE alias1, VALUE alias2)
* YAML::DomainType.initialize
*/
VALUE
-syck_domaintype_initialize(VALUE self, VALUE domain, VALUE type_id, VALUE val)
+syck_domaintype_initialize( self, domain, type_id, val )
+ VALUE self, domain, type_id, val;
{
rb_iv_set( self, "@domain", domain );
rb_iv_set( self, "@type_id", type_id );
@@ -1369,7 +1378,8 @@ syck_domaintype_initialize(VALUE self, VALUE domain, VALUE type_id, VALUE val)
* YAML::Object.initialize
*/
VALUE
-syck_yobject_initialize(VALUE self, VALUE klass, VALUE ivars)
+syck_yobject_initialize( self, klass, ivars )
+ VALUE self, klass, ivars;
{
rb_iv_set( self, "@class", klass );
rb_iv_set( self, "@ivars", ivars );
@@ -1380,7 +1390,8 @@ syck_yobject_initialize(VALUE self, VALUE klass, VALUE ivars)
* YAML::PrivateType.initialize
*/
VALUE
-syck_privatetype_initialize(VALUE self, VALUE type_id, VALUE val)
+syck_privatetype_initialize( self, type_id, val )
+ VALUE self, type_id, val;
{
rb_iv_set( self, "@type_id", type_id );
rb_iv_set( self, "@value", val );
@@ -1391,7 +1402,8 @@ syck_privatetype_initialize(VALUE self, VALUE type_id, VALUE val)
* Mark node contents.
*/
static void
-syck_node_mark(SyckNode *n)
+syck_node_mark( n )
+ SyckNode *n;
{
int i;
rb_gc_mark_maybe( n->id );
@@ -1411,11 +1423,6 @@ syck_node_mark(SyckNode *n)
rb_gc_mark( syck_map_read( n, map_value, i ) );
}
break;
-
- case syck_str_kind:
- default:
- /* nothing */
- break;
}
#if 0 /* maybe needed */
if ( n->shortcut ) syck_node_mark( n->shortcut ); /* caution: maybe cyclic */
@@ -1426,7 +1433,8 @@ syck_node_mark(SyckNode *n)
* YAML::Syck::Scalar.allocate
*/
VALUE
-syck_scalar_alloc(VALUE class)
+syck_scalar_alloc( class )
+ VALUE class;
{
SyckNode *node = syck_alloc_str();
VALUE obj = Data_Wrap_Struct( class, syck_node_mark, syck_free_node, node );
@@ -1438,7 +1446,8 @@ syck_scalar_alloc(VALUE class)
* YAML::Syck::Scalar.initialize
*/
VALUE
-syck_scalar_initialize(VALUE self, VALUE type_id, VALUE val, VALUE style)
+syck_scalar_initialize( self, type_id, val, style )
+ VALUE self, type_id, val, style;
{
rb_iv_set( self, "@kind", sym_scalar );
rb_funcall( self, s_type_id_set, 1, type_id );
@@ -1451,7 +1460,8 @@ syck_scalar_initialize(VALUE self, VALUE type_id, VALUE val, VALUE style)
* YAML::Syck::Scalar.style=
*/
VALUE
-syck_scalar_style_set(VALUE self, VALUE style)
+syck_scalar_style_set( self, style )
+ VALUE self, style;
{
SyckNode *node;
Data_Get_Struct( self, SyckNode, node );
@@ -1489,14 +1499,15 @@ syck_scalar_style_set(VALUE self, VALUE style)
* YAML::Syck::Scalar.value=
*/
VALUE
-syck_scalar_value_set(VALUE self, VALUE val)
+syck_scalar_value_set( self, val )
+ VALUE self, val;
{
SyckNode *node;
Data_Get_Struct( self, SyckNode, node );
StringValue( val );
- node->data.str->ptr = syck_strndup( RSTRING_PTR(val), RSTRING_LEN(val) );
- node->data.str->len = RSTRING_LEN(val);
+ node->data.str->ptr = syck_strndup( RSTRING(val)->ptr, RSTRING(val)->len );
+ node->data.str->len = RSTRING(val)->len;
node->data.str->style = scalar_none;
rb_iv_set( self, "@value", val );
@@ -1507,7 +1518,8 @@ syck_scalar_value_set(VALUE self, VALUE val)
* YAML::Syck::Seq.allocate
*/
VALUE
-syck_seq_alloc(VALUE class)
+syck_seq_alloc( class )
+ VALUE class;
{
SyckNode *node;
VALUE obj;
@@ -1521,7 +1533,8 @@ syck_seq_alloc(VALUE class)
* YAML::Syck::Seq.initialize
*/
VALUE
-syck_seq_initialize(VALUE self, VALUE type_id, VALUE val, VALUE style)
+syck_seq_initialize( self, type_id, val, style )
+ VALUE self, type_id, val, style;
{
SyckNode *node;
Data_Get_Struct( self, SyckNode, node );
@@ -1537,7 +1550,8 @@ syck_seq_initialize(VALUE self, VALUE type_id, VALUE val, VALUE style)
* YAML::Syck::Seq.value=
*/
VALUE
-syck_seq_value_set(VALUE self, VALUE val)
+syck_seq_value_set( self, val )
+ VALUE self, val;
{
SyckNode *node;
Data_Get_Struct( self, SyckNode, node );
@@ -1546,7 +1560,7 @@ syck_seq_value_set(VALUE self, VALUE val)
if ( !NIL_P( val ) ) {
int i;
syck_seq_empty( node );
- for ( i = 0; i < RARRAY_LEN( val ); i++ )
+ for ( i = 0; i < RARRAY( val )->len; i++ )
{
syck_seq_add( node, rb_ary_entry(val, i) );
}
@@ -1560,7 +1574,8 @@ syck_seq_value_set(VALUE self, VALUE val)
* YAML::Syck::Seq.add
*/
VALUE
-syck_seq_add_m(VALUE self, VALUE val)
+syck_seq_add_m( self, val )
+ VALUE self, val;
{
SyckNode *node;
VALUE emitter = rb_ivar_get( self, s_emitter );
@@ -1579,7 +1594,8 @@ syck_seq_add_m(VALUE self, VALUE val)
* YAML::Syck::Seq.style=
*/
VALUE
-syck_seq_style_set(VALUE self, VALUE style)
+syck_seq_style_set( self, style )
+ VALUE self, style;
{
SyckNode *node;
Data_Get_Struct( self, SyckNode, node );
@@ -1601,7 +1617,8 @@ syck_seq_style_set(VALUE self, VALUE style)
* YAML::Syck::Map.allocate
*/
VALUE
-syck_map_alloc(VALUE class)
+syck_map_alloc( class )
+ VALUE class;
{
SyckNode *node;
VALUE obj;
@@ -1615,7 +1632,8 @@ syck_map_alloc(VALUE class)
* YAML::Syck::Map.initialize
*/
VALUE
-syck_map_initialize(VALUE self, VALUE type_id, VALUE val, VALUE style)
+syck_map_initialize( self, type_id, val, style )
+ VALUE self, type_id, val, style;
{
SyckNode *node;
Data_Get_Struct( self, SyckNode, node );
@@ -1631,7 +1649,7 @@ syck_map_initialize(VALUE self, VALUE type_id, VALUE val, VALUE style)
}
keys = rb_funcall( hsh, s_keys, 0 );
- for ( i = 0; i < RARRAY_LEN(keys); i++ )
+ for ( i = 0; i < RARRAY(keys)->len; i++ )
{
VALUE key = rb_ary_entry(keys, i);
syck_map_add( node, key, rb_hash_aref(hsh, key) );
@@ -1649,7 +1667,8 @@ syck_map_initialize(VALUE self, VALUE type_id, VALUE val, VALUE style)
* YAML::Syck::Map.value=
*/
VALUE
-syck_map_value_set(VALUE self, VALUE val)
+syck_map_value_set( self, val )
+ VALUE self, val;
{
SyckNode *node;
Data_Get_Struct( self, SyckNode, node );
@@ -1666,7 +1685,7 @@ syck_map_value_set(VALUE self, VALUE val)
syck_map_empty( node );
keys = rb_funcall( hsh, s_keys, 0 );
- for ( i = 0; i < RARRAY_LEN(keys); i++ )
+ for ( i = 0; i < RARRAY(keys)->len; i++ )
{
VALUE key = rb_ary_entry(keys, i);
syck_map_add( node, key, rb_hash_aref(hsh, key) );
@@ -1681,7 +1700,8 @@ syck_map_value_set(VALUE self, VALUE val)
* YAML::Syck::Map.add
*/
VALUE
-syck_map_add_m(VALUE self, VALUE key, VALUE val)
+syck_map_add_m( self, key, val )
+ VALUE self, key, val;
{
SyckNode *node;
VALUE emitter = rb_ivar_get( self, s_emitter );
@@ -1701,7 +1721,8 @@ syck_map_add_m(VALUE self, VALUE key, VALUE val)
* YAML::Syck::Map.style=
*/
VALUE
-syck_map_style_set(VALUE self, VALUE style)
+syck_map_style_set( self, style )
+ VALUE self, style;
{
SyckNode *node;
Data_Get_Struct( self, SyckNode, node );
@@ -1723,7 +1744,8 @@ syck_map_style_set(VALUE self, VALUE style)
* Cloning method for all node types
*/
VALUE
-syck_node_init_copy(VALUE copy, VALUE orig)
+syck_node_init_copy( copy, orig )
+ VALUE copy, orig;
{
SyckNode *copy_n;
SyckNode *orig_n;
@@ -1746,7 +1768,8 @@ syck_node_init_copy(VALUE copy, VALUE orig)
* YAML::Syck::Node#type_id=
*/
VALUE
-syck_node_type_id_set(VALUE self, VALUE type_id)
+syck_node_type_id_set( self, type_id )
+ VALUE self, type_id;
{
SyckNode *node;
Data_Get_Struct( self, SyckNode, node );
@@ -1755,7 +1778,7 @@ syck_node_type_id_set(VALUE self, VALUE type_id)
if ( !NIL_P( type_id ) ) {
StringValue( type_id );
- node->type_id = syck_strndup( RSTRING_PTR(type_id), RSTRING_LEN(type_id) );
+ node->type_id = syck_strndup( RSTRING(type_id)->ptr, RSTRING(type_id)->len );
}
rb_iv_set( self, "@type_id", type_id );
@@ -1766,10 +1789,11 @@ syck_node_type_id_set(VALUE self, VALUE type_id)
* YAML::Syck::Node.transform
*/
VALUE
-syck_node_transform(VALUE self)
+syck_node_transform( self )
+ VALUE self;
{
VALUE t;
- SyckNode *n = NULL;
+ SyckNode *n;
SyckNode *orig_n;
Data_Get_Struct(self, SyckNode, orig_n);
t = Data_Wrap_Struct( cNode, syck_node_mark, syck_free_node, 0 );
@@ -1822,7 +1846,9 @@ syck_node_transform(VALUE self)
* No one could possibly object.
*/
void
-rb_syck_emitter_handler(SyckEmitter *e, st_data_t data)
+rb_syck_emitter_handler(e, data)
+ SyckEmitter *e;
+ st_data_t data;
{
SyckNode *n;
Data_Get_Struct((VALUE)data, SyckNode, n);
@@ -1866,7 +1892,10 @@ rb_syck_emitter_handler(SyckEmitter *e, st_data_t data)
* Handle output from the emitter
*/
void
-rb_syck_output_handler(SyckEmitter * emitter, char *str, long len)
+rb_syck_output_handler( emitter, str, len )
+ SyckEmitter *emitter;
+ char *str;
+ long len;
{
struct emitter_xtra *bonus = (struct emitter_xtra *)emitter->bonus;
VALUE dest = bonus->port;
@@ -1882,7 +1911,8 @@ rb_syck_output_handler(SyckEmitter * emitter, char *str, long len)
* symbol table.
*/
void
-syck_out_mark(VALUE emitter, VALUE node)
+syck_out_mark( emitter, node )
+ VALUE emitter, node;
{
SyckEmitter *emitterPtr;
struct emitter_xtra *bonus;
@@ -1899,7 +1929,8 @@ syck_out_mark(VALUE emitter, VALUE node)
* Mark emitter values.
*/
static void
-syck_mark_emitter(SyckEmitter *emitter)
+syck_mark_emitter(emitter)
+ SyckEmitter *emitter;
{
struct emitter_xtra *bonus = (struct emitter_xtra *)emitter->bonus;
rb_gc_mark( bonus->oid );
@@ -1911,7 +1942,8 @@ syck_mark_emitter(SyckEmitter *emitter)
* Free the emitter and any bonus attachment.
*/
void
-rb_syck_free_emitter(SyckEmitter *e)
+rb_syck_free_emitter(e)
+ SyckEmitter *e;
{
S_FREE( e->bonus );
syck_free_emitter(e);
@@ -1922,7 +1954,8 @@ rb_syck_free_emitter(SyckEmitter *e)
*/
VALUE syck_emitter_s_alloc _((VALUE));
VALUE
-syck_emitter_s_alloc(VALUE class)
+syck_emitter_s_alloc(class)
+ VALUE class;
{
VALUE pobj;
SyckEmitter *emitter = syck_new_emitter();
@@ -1938,20 +1971,14 @@ syck_emitter_s_alloc(VALUE class)
return pobj;
}
-static VALUE
-id_hash_new(void)
-{
- VALUE hash;
- hash = rb_hash_new();
- rb_funcall(hash, rb_intern("compare_by_identity"), 0);
- return hash;
-}
-
/*
* YAML::Syck::Emitter.reset( options )
*/
VALUE
-syck_emitter_reset(int argc, VALUE *argv, VALUE self)
+syck_emitter_reset( argc, argv, self )
+ int argc;
+ VALUE *argv;
+ VALUE self;
{
VALUE options, tmp;
SyckEmitter *emitter;
@@ -1962,7 +1989,7 @@ syck_emitter_reset(int argc, VALUE *argv, VALUE self)
bonus->oid = Qnil;
bonus->port = rb_str_new2( "" );
- bonus->data = id_hash_new();
+ bonus->data = rb_hash_new();
if (rb_scan_args(argc, argv, "01", &options) == 0)
{
@@ -1993,7 +2020,10 @@ syck_emitter_reset(int argc, VALUE *argv, VALUE self)
* YAML::Syck::Emitter.emit( object_id ) { |out| ... }
*/
VALUE
-syck_emitter_emit(int argc, VALUE *argv, VALUE self)
+syck_emitter_emit( argc, argv, self )
+ int argc;
+ VALUE *argv;
+ VALUE self;
{
VALUE oid, proc;
SyckEmitter *emitter;
@@ -2033,7 +2063,8 @@ syck_emitter_emit(int argc, VALUE *argv, VALUE self)
* YAML::Syck::Emitter#node_export
*/
VALUE
-syck_emitter_node_export(VALUE self, VALUE node)
+syck_emitter_node_export( self, node )
+ VALUE self, node;
{
return rb_funcall( node, s_to_yaml, 1, self );
}
@@ -2042,7 +2073,8 @@ syck_emitter_node_export(VALUE self, VALUE node)
* YAML::Syck::Emitter#set_resolver
*/
VALUE
-syck_emitter_set_resolver(VALUE self, VALUE resolver)
+syck_emitter_set_resolver( self, resolver )
+ VALUE self, resolver;
{
rb_ivar_set( self, s_resolver, resolver );
return self;
@@ -2052,7 +2084,8 @@ syck_emitter_set_resolver(VALUE self, VALUE resolver)
* YAML::Syck::Out::initialize
*/
VALUE
-syck_out_initialize(VALUE self, VALUE emitter)
+syck_out_initialize( self, emitter )
+ VALUE self, emitter;
{
rb_ivar_set( self, s_emitter, emitter );
return self;
@@ -2062,7 +2095,10 @@ syck_out_initialize(VALUE self, VALUE emitter)
* YAML::Syck::Out::map
*/
VALUE
-syck_out_map(int argc, VALUE *argv, VALUE self)
+syck_out_map( argc, argv, self )
+ int argc;
+ VALUE *argv;
+ VALUE self;
{
VALUE type_id, style, map;
if (rb_scan_args(argc, argv, "11", &type_id, &style) == 1) {
@@ -2078,7 +2114,10 @@ syck_out_map(int argc, VALUE *argv, VALUE self)
* YAML::Syck::Out::seq
*/
VALUE
-syck_out_seq(int argc, VALUE *argv, VALUE self)
+syck_out_seq( argc, argv, self )
+ int argc;
+ VALUE *argv;
+ VALUE self;
{
VALUE type_id, style, seq;
if (rb_scan_args(argc, argv, "11", &type_id, &style) == 1) {
@@ -2096,10 +2135,15 @@ syck_out_scalar( self, type_id, str, style )
VALUE self, type_id, str, style;
*/
VALUE
-syck_out_scalar(int argc, VALUE *argv, VALUE self)
+syck_out_scalar( argc, argv, self )
+ int argc;
+ VALUE *argv;
+ VALUE self;
{
VALUE type_id, str, style, scalar;
- rb_scan_args(argc, argv, "21", &type_id, &str, &style);
+ if (rb_scan_args(argc, argv, "21", &type_id, &str, &style) == 2) {
+ style = Qnil;
+ }
scalar = rb_funcall( cScalar, s_new, 3, type_id, str, style );
syck_out_mark( rb_ivar_get( self, s_emitter ), scalar );
return scalar;
@@ -2151,8 +2195,6 @@ Init_syck()
s_transform = rb_intern( "transform" );
s_yaml_new = rb_intern("yaml_new");
s_yaml_initialize = rb_intern("yaml_initialize");
- s_each = rb_intern("each");
- s_parse = rb_intern("parse");
s_tags = rb_intern("@tags");
s_name = rb_intern("@name");
diff --git a/ext/syck/syck.c b/ext/syck/syck.c
index e0fc2bc244..a83c8813c1 100644
--- a/ext/syck/syck.c
+++ b/ext/syck/syck.c
@@ -2,10 +2,11 @@
* syck.c
*
* $Author$
+ * $Date$
*
* Copyright (C) 2003 why the lucky stiff
*/
-#include "ruby/ruby.h"
+#include "ruby.h"
#include <stdio.h>
#include <string.h>
@@ -18,11 +19,11 @@ void syck_parser_pop_level( SyckParser * );
* Custom assert
*/
void
-syck_assert( const char *file_name, unsigned line_num, const char *expr )
+syck_assert( char *file_name, unsigned line_num )
{
fflush( NULL );
- fprintf( stderr, "\nAssertion failed: %s, line %u: %s\n",
- file_name, line_num, expr );
+ fprintf( stderr, "\nAssertion failed: %s, line %u\n",
+ file_name, line_num );
fflush( stderr );
abort();
}
@@ -31,7 +32,7 @@ syck_assert( const char *file_name, unsigned line_num, const char *expr )
* Allocates and copies a string
*/
char *
-syck_strndup( const char *buf, long len )
+syck_strndup( char *buf, long len )
{
char *new = S_ALLOC_N( char, len + 1 );
S_MEMZERO( new, char, len + 1 );
@@ -154,7 +155,7 @@ syck_parser_set_root_on_error( SyckParser *p, SYMID roer )
* Allocate the parser
*/
SyckParser *
-syck_new_parser(void)
+syck_new_parser()
{
SyckParser *p;
p = S_ALLOC( SyckParser );
@@ -177,7 +178,7 @@ syck_new_parser(void)
}
int
-syck_add_sym( SyckParser *p, void *data )
+syck_add_sym( SyckParser *p, char *data )
{
SYMID id = 0;
if ( p->syms == NULL )
@@ -190,14 +191,10 @@ syck_add_sym( SyckParser *p, void *data )
}
int
-syck_lookup_sym( SyckParser *p, SYMID id, void **datap )
+syck_lookup_sym( SyckParser *p, SYMID id, char **data )
{
- st_data_t data;
- int ret;
if ( p->syms == NULL ) return 0;
- ret = st_lookup( p->syms, id, &data );
- if(ret) *datap = (void *)data;
- return ret;
+ return st_lookup( p->syms, id, (st_data_t *)data );
}
int
@@ -229,22 +226,6 @@ syck_st_free( SyckParser *p )
}
}
-typedef struct {
- long hash;
- char *buffer;
- long length;
- long remaining;
- int printed;
-} bytestring_t;
-
-int
-syck_st_free_syms( void *key, bytestring_t *sav, void *dummy )
-{
- S_FREE(sav->buffer);
- S_FREE(sav);
- return ST_CONTINUE;
-}
-
void
syck_free_parser( SyckParser *p )
{
@@ -253,7 +234,6 @@ syck_free_parser( SyckParser *p )
*/
if ( p->syms != NULL )
{
- st_foreach( p->syms, syck_st_free_syms, 0 );
st_free_table( p->syms );
p->syms = NULL;
}
@@ -514,9 +494,9 @@ syck_parse( SyckParser *p )
}
void
-syck_default_error_handler( SyckParser *p, const char *msg )
+syck_default_error_handler( SyckParser *p, char *msg )
{
- printf( "Error at [Line %d, Col %"PRIdPTRDIFF"]: %s\n",
+ printf( "Error at [Line %d, Col %d]: %s\n",
p->linect,
p->cursor - p->lineptr,
msg );
diff --git a/ext/syck/syck.h b/ext/syck/syck.h
index 81b3d67952..e7d07e9c0d 100644
--- a/ext/syck/syck.h
+++ b/ext/syck/syck.h
@@ -2,6 +2,7 @@
* syck.h
*
* $Author$
+ * $Date$
*
* Copyright (C) 2003 why the lucky stiff
*/
@@ -18,7 +19,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
-#include "ruby/st.h"
+#include "st.h"
#if defined(__cplusplus)
extern "C" {
@@ -32,11 +33,14 @@ extern "C" {
#endif
#if DEBUG
-void syck_assert( const char *, unsigned, const char * );
+ void syck_assert( char *, unsigned );
# define ASSERT(f) \
- (( f ) ? (void)0 : syck_assert( __FILE__, __LINE__, #f ))
+ if ( f ) \
+ {} \
+ else \
+ syck_assert( __FILE__, __LINE__ )
#else
-# define ASSERT(f) ((void)0)
+# define ASSERT(f)
#endif
#ifndef NULL
@@ -152,7 +156,7 @@ typedef struct _syck_str SyckIoStr;
typedef struct _syck_level SyckLevel;
typedef SYMID (*SyckNodeHandler)(SyckParser *, SyckNode *);
-typedef void (*SyckErrorHandler)(SyckParser *, const char *);
+typedef void (*SyckErrorHandler)(SyckParser *, char *);
typedef SyckNode * (*SyckBadAnchorHandler)(SyckParser *, char *);
typedef long (*SyckIoFileRead)(char *, SyckIoFile *, long, long);
typedef long (*SyckIoStrRead)(char *, SyckIoStr *, long, long);
@@ -342,57 +346,57 @@ SyckNode *syck_hdlr_add_anchor( SyckParser *, char *, SyckNode * );
void syck_hdlr_remove_anchor( SyckParser *, char * );
SyckNode *syck_hdlr_get_anchor( SyckParser *, char * );
void syck_add_transfer( char *, SyckNode *, int );
-char *syck_xprivate( const char *, int );
-char *syck_taguri( const char *, const char *, int );
-int syck_tagcmp( const char *, const char * );
-int syck_add_sym( SyckParser *, void * );
-int syck_lookup_sym( SyckParser *, SYMID, void ** );
+char *syck_xprivate( char *, int );
+char *syck_taguri( char *, char *, int );
+int syck_tagcmp( char *, char * );
+int syck_add_sym( SyckParser *, char * );
+int syck_lookup_sym( SyckParser *, SYMID, char ** );
int syck_try_implicit( SyckNode * );
-char *syck_type_id_to_uri( const char * );
+char *syck_type_id_to_uri( char * );
void try_tag_implicit( SyckNode *, int );
-const char *syck_match_implicit( const char *, size_t );
+char *syck_match_implicit( char *, size_t );
/*
* API prototypes
*/
-char *syck_strndup( const char *, long );
+char *syck_strndup( char *, long );
long syck_io_file_read( char *, SyckIoFile *, long, long );
long syck_io_str_read( char *, SyckIoStr *, long, long );
char *syck_base64enc( char *, long );
char *syck_base64dec( char *, long );
-SyckEmitter *syck_new_emitter(void);
+SyckEmitter *syck_new_emitter();
SYMID syck_emitter_mark_node( SyckEmitter *, st_data_t );
void syck_emitter_ignore_id( SyckEmitter *, SYMID );
void syck_output_handler( SyckEmitter *, SyckOutputHandler );
void syck_emitter_handler( SyckEmitter *, SyckEmitterHandler );
void syck_free_emitter( SyckEmitter * );
void syck_emitter_clear( SyckEmitter * );
-void syck_emitter_write( SyckEmitter *, const char *, long );
-void syck_emitter_escape( SyckEmitter *, const char *, long );
+void syck_emitter_write( SyckEmitter *, char *, long );
+void syck_emitter_escape( SyckEmitter *, char *, long );
void syck_emitter_flush( SyckEmitter *, long );
void syck_emit( SyckEmitter *, st_data_t );
-void syck_emit_scalar( SyckEmitter *, const char *, enum scalar_style, int, int, char, const char *, long );
-void syck_emit_1quoted( SyckEmitter *, int, const char *, long );
-void syck_emit_2quoted( SyckEmitter *, int, const char *, long );
-void syck_emit_folded( SyckEmitter *, int, char, const char *, long );
-void syck_emit_literal( SyckEmitter *, char, const char *, long );
-void syck_emit_seq( SyckEmitter *, const char *, enum seq_style );
+void syck_emit_scalar( SyckEmitter *, char *, enum scalar_style, int, int, char, char *, long );
+void syck_emit_1quoted( SyckEmitter *, int, char *, long );
+void syck_emit_2quoted( SyckEmitter *, int, char *, long );
+void syck_emit_folded( SyckEmitter *, int, char, char *, long );
+void syck_emit_literal( SyckEmitter *, char, char *, long );
+void syck_emit_seq( SyckEmitter *, char *, enum seq_style );
void syck_emit_item( SyckEmitter *, st_data_t );
-void syck_emit_map( SyckEmitter *, const char *, enum map_style );
+void syck_emit_map( SyckEmitter *, char *, enum map_style );
void syck_emit_end( SyckEmitter * );
-void syck_emit_tag( SyckEmitter *, const char *, const char * );
+void syck_emit_tag( SyckEmitter *, char *, char * );
void syck_emit_indent( SyckEmitter * );
SyckLevel *syck_emitter_current_level( SyckEmitter * );
SyckLevel *syck_emitter_parent_level( SyckEmitter * );
void syck_emitter_pop_level( SyckEmitter * );
void syck_emitter_add_level( SyckEmitter *, int, enum syck_level_status );
void syck_emitter_reset_levels( SyckEmitter * );
-SyckParser *syck_new_parser(void);
+SyckParser *syck_new_parser();
void syck_free_parser( SyckParser * );
void syck_parser_set_root_on_error( SyckParser *, SYMID );
void syck_parser_implicit_typing( SyckParser *, int );
void syck_parser_taguri_expansion( SyckParser *, int );
-int syck_scan_scalar( int, const char *, long );
+int syck_scan_scalar( int, char *, long );
void syck_parser_handler( SyckParser *, SyckNodeHandler );
void syck_parser_error_handler( SyckParser *, SyckErrorHandler );
void syck_parser_bad_anchor_handler( SyckParser *, SyckBadAnchorHandler );
@@ -407,20 +411,20 @@ void free_any_io( SyckParser * );
long syck_parser_read( SyckParser * );
long syck_parser_readlen( SyckParser *, long );
SYMID syck_parse( SyckParser * );
-void syck_default_error_handler( SyckParser *, const char * );
+void syck_default_error_handler( SyckParser *, char * );
SYMID syck_yaml2byte_handler( SyckParser *, SyckNode * );
char *syck_yaml2byte( char * );
/*
* Allocation prototypes
*/
-SyckNode *syck_alloc_map(void);
-SyckNode *syck_alloc_seq(void);
-SyckNode *syck_alloc_str(void);
+SyckNode *syck_alloc_map();
+SyckNode *syck_alloc_seq();
+SyckNode *syck_alloc_str();
void syck_free_node( SyckNode * );
void syck_free_members( SyckNode * );
-SyckNode *syck_new_str( const char *, enum scalar_style );
-SyckNode *syck_new_str2( const char *, long, enum scalar_style );
+SyckNode *syck_new_str( char *, enum scalar_style );
+SyckNode *syck_new_str2( char *, long, enum scalar_style );
void syck_replace_str( SyckNode *, char *, enum scalar_style );
void syck_replace_str2( SyckNode *, char *, long, enum scalar_style );
void syck_str_blow_away_commas( SyckNode * );
@@ -442,7 +446,7 @@ long syck_seq_count( SyckNode * );
/*
* Lexer prototypes
*/
-void syckerror( const char * );
+void syckerror( char * );
int syckparse( void * );
union YYSTYPE;
int sycklex( union YYSTYPE *, SyckParser * );
diff --git a/ext/syck/token.c b/ext/syck/token.c
index 1b26e66bdb..3c6cd1a9cf 100644
--- a/ext/syck/token.c
+++ b/ext/syck/token.c
@@ -4,10 +4,11 @@
* token.re
*
* $Author$
+ * $Date$
*
* Copyright (C) 2003 why the lucky stiff
*/
-#include "ruby/ruby.h"
+#include "ruby.h"
#include "syck.h"
#include "gram.h"
@@ -1116,7 +1117,7 @@ Directive:
#line 1117 "<stdout>"
{
YYCTYPE yych;
- unsigned int yyaccept = 0;
+ unsigned int yyaccept;
goto yy94;
++YYCURSOR;
yy94:
@@ -2713,7 +2714,7 @@ syckwrap()
}
void
-syckerror( const char *msg )
+syckerror( char *msg )
{
if ( syck_parser_ptr->error_handler == NULL )
syck_parser_ptr->error_handler = syck_default_error_handler;
diff --git a/ext/syck/yaml2byte.c b/ext/syck/yaml2byte.c
index 1b1ce26c49..821a3cd5b5 100644
--- a/ext/syck/yaml2byte.c
+++ b/ext/syck/yaml2byte.c
@@ -2,13 +2,14 @@
* yaml2byte.c
*
* $Author$
+ * $Date$
*
* Copyright (C) 2003 why the lucky stiff, clark evans
*
* WARNING WARNING WARNING --- THIS IS *NOT JUST* PLAYING
* ANYMORE! -- WHY HAS EMBRACED THIS AS THE REAL THING!
*/
-#include "ruby/ruby.h"
+#include "ruby.h"
#include <syck.h>
#include <assert.h>
#define YAMLBYTE_UTF8
@@ -34,7 +35,7 @@ typedef struct {
long remaining;
int printed;
} bytestring_t;
-bytestring_t *bytestring_alloc(void) {
+bytestring_t *bytestring_alloc() {
bytestring_t *ret;
/*TRACE0("bytestring_alloc()");*/
ret = S_ALLOC(bytestring_t);
@@ -128,7 +129,6 @@ syck_yaml2byte_handler(p, n)
char *finish;
bytestring_t *val = NULL;
bytestring_t *sav = NULL;
- void *data;
/*TRACE0("syck_yaml2byte_handler()");*/
val = bytestring_alloc();
if(n->anchor) bytestring_append(val,YAMLBYTE_ANCHOR, n->anchor, NULL);
@@ -189,7 +189,7 @@ syck_yaml2byte_handler(p, n)
for ( i = 0; i < n->data.list->idx; i++ )
{
oid = syck_seq_read( n, i );
- if (syck_lookup_sym( p, oid, &data )) sav = data;
+ syck_lookup_sym( p, oid, (char **)&sav );
bytestring_extend(val, sav);
}
bytestring_append(val,YAMLBYTE_END_BRANCH,NULL,NULL);
@@ -199,10 +199,10 @@ syck_yaml2byte_handler(p, n)
for ( i = 0; i < n->data.pairs->idx; i++ )
{
oid = syck_map_read( n, map_key, i );
- if (syck_lookup_sym( p, oid, &data )) sav = data;
+ syck_lookup_sym( p, oid, (char **)&sav );
bytestring_extend(val, sav);
oid = syck_map_read( n, map_value, i );
- if (syck_lookup_sym( p, oid, &data )) sav = data;
+ syck_lookup_sym( p, oid, (char **)&sav );
bytestring_extend(val, sav);
}
bytestring_append(val,YAMLBYTE_END_BRANCH,NULL,NULL);
@@ -218,8 +218,7 @@ syck_yaml2byte(char *yamlstr)
{
SYMID oid;
char *ret;
- bytestring_t *sav;
- void *data;
+ bytestring_t *sav;
SyckParser *parser = syck_new_parser();
syck_parser_str_auto( parser, yamlstr, NULL );
@@ -229,8 +228,7 @@ syck_yaml2byte(char *yamlstr)
syck_parser_taguri_expansion( parser, 1 );
oid = syck_parse( parser );
- if ( syck_lookup_sym( parser, oid, &data ) ) {
- sav = data;
+ if ( syck_lookup_sym( parser, oid, (char **)&sav ) == 1 ) {
ret = S_ALLOC_N( char, strlen( sav->buffer ) + 3 );
ret[0] = '\0';
strcat( ret, "D\n" );
diff --git a/ext/syslog/.cvsignore b/ext/syslog/.cvsignore
index 814345ece8..4088712231 100644
--- a/ext/syslog/.cvsignore
+++ b/ext/syslog/.cvsignore
@@ -1,4 +1,3 @@
Makefile
mkmf.log
*.def
-extconf.h
diff --git a/ext/syslog/syslog.c b/ext/syslog/syslog.c
index 1bd82bf7d0..477489ddfe 100644
--- a/ext/syslog/syslog.c
+++ b/ext/syslog/syslog.c
@@ -7,8 +7,8 @@
* $Id$
*/
-#include "ruby/ruby.h"
-#include "ruby/util.h"
+#include "ruby.h"
+#include "util.h"
#include <syslog.h>
/* Syslog class */
@@ -22,7 +22,6 @@ static void syslog_write(int pri, int argc, VALUE *argv)
{
VALUE str;
- rb_secure(4);
if (argc < 1) {
rb_raise(rb_eArgError, "no log message supplied");
}
@@ -33,13 +32,12 @@ static void syslog_write(int pri, int argc, VALUE *argv)
str = rb_f_sprintf(argc, argv);
- syslog(pri, "%s", RSTRING_PTR(str));
+ syslog(pri, "%s", RSTRING(str)->ptr);
}
/* Syslog module methods */
static VALUE mSyslog_close(VALUE self)
{
- rb_secure(4);
if (!syslog_opened) {
rb_raise(rb_eRuntimeError, "syslog not opened");
}
@@ -67,8 +65,12 @@ static VALUE mSyslog_open(int argc, VALUE *argv, VALUE self)
if (NIL_P(ident)) {
ident = rb_gv_get("$0");
}
+#ifdef SafeStringValue
SafeStringValue(ident);
- syslog_ident = strdup(RSTRING_PTR(ident));
+#else
+ Check_SafeStr(ident);
+#endif
+ syslog_ident = strdup(RSTRING(ident)->ptr);
if (NIL_P(opt)) {
syslog_options = LOG_PID | LOG_CONS;
@@ -130,7 +132,6 @@ static VALUE mSyslog_get_mask(VALUE self)
static VALUE mSyslog_set_mask(VALUE self, VALUE mask)
{
- rb_secure(4);
if (!syslog_opened) {
rb_raise(rb_eRuntimeError, "must open syslog before setting log mask");
}
@@ -220,12 +221,12 @@ define_syslog_shortcut_method(LOG_DEBUG, debug)
static VALUE mSyslogConstants_LOG_MASK(VALUE klass, VALUE pri)
{
- return INT2FIX(LOG_MASK(NUM2INT(pri)));
+ return INT2FIX(LOG_MASK(FIX2INT(pri)));
}
static VALUE mSyslogConstants_LOG_UPTO(VALUE klass, VALUE pri)
{
- return INT2FIX(LOG_UPTO(NUM2INT(pri)));
+ return INT2FIX(LOG_UPTO(FIX2INT(pri)));
}
/* Init for package syslog */
diff --git a/ext/syslog/test.rb b/ext/syslog/test.rb
new file mode 100644
index 0000000000..cfa33eff8f
--- /dev/null
+++ b/ext/syslog/test.rb
@@ -0,0 +1,164 @@
+#!/usr/bin/env ruby
+# $RoughId: test.rb,v 1.9 2002/02/25 08:20:14 knu Exp $
+# $Id$
+
+# Please only run this test on machines reasonable for testing.
+# If in doubt, ask your admin.
+
+require 'test/unit'
+
+# Prepend current directory to load path for testing.
+$:.unshift('.')
+
+require 'syslog'
+
+class TestSyslog < Test::Unit::TestCase
+ def test_new
+ assert_raises(NoMethodError) {
+ Syslog.new
+ }
+ end
+
+ def test_instance
+ sl1 = Syslog.instance
+ sl2 = Syslog.open
+ sl3 = Syslog.instance
+
+ assert_equal(Syslog, sl1)
+ assert_equal(Syslog, sl2)
+ assert_equal(Syslog, sl3)
+ ensure
+ Syslog.close if Syslog.opened?
+ end
+
+ def test_open
+ # default parameters
+ Syslog.open
+
+ assert_equal($0, Syslog.ident)
+ assert_equal(Syslog::LOG_PID | Syslog::LOG_CONS, Syslog.options)
+ assert_equal(Syslog::LOG_USER, Syslog.facility)
+
+ # open without close
+ assert_raises(RuntimeError) {
+ Syslog.open
+ }
+
+ Syslog.close
+
+ # given parameters
+ Syslog.open("foo", Syslog::LOG_NDELAY | Syslog::LOG_PERROR, Syslog::LOG_DAEMON)
+
+ assert_equal('foo', Syslog.ident)
+ assert_equal(Syslog::LOG_NDELAY | Syslog::LOG_PERROR, Syslog.options)
+ assert_equal(Syslog::LOG_DAEMON, Syslog.facility)
+
+ Syslog.close
+
+ # default parameters again (after close)
+ Syslog.open
+ Syslog.close
+
+ assert_equal(nil, Syslog.ident)
+ assert_equal(nil, Syslog.options)
+ assert_equal(nil, Syslog.facility)
+
+ # block
+ param = nil
+ Syslog.open { |param| }
+ assert_equal(Syslog, param)
+ ensure
+ Syslog.close if Syslog.opened?
+ end
+
+ def test_opened?
+ assert_equal(false, Syslog.opened?)
+
+ Syslog.open
+ assert_equal(true, Syslog.opened?)
+
+ Syslog.close
+ assert_equal(false, Syslog.opened?)
+
+ Syslog.open {
+ assert_equal(true, Syslog.opened?)
+ }
+
+ assert_equal(false, Syslog.opened?)
+ end
+
+ def test_close
+ assert_raises(RuntimeError) {
+ Syslog.close
+ }
+ end
+
+ def test_mask
+ assert_equal(nil, Syslog.mask)
+
+ Syslog.open
+
+ orig = Syslog.mask
+
+ Syslog.mask = Syslog.LOG_UPTO(Syslog::LOG_ERR)
+ assert_equal(Syslog.LOG_UPTO(Syslog::LOG_ERR), Syslog.mask)
+
+ Syslog.mask = Syslog.LOG_MASK(Syslog::LOG_CRIT)
+ assert_equal(Syslog.LOG_MASK(Syslog::LOG_CRIT), Syslog.mask)
+
+ Syslog.mask = orig
+ ensure
+ Syslog.close if Syslog.opened?
+ end
+
+ def test_log
+ stderr = IO::pipe
+
+ pid = fork {
+ stderr[0].close
+ STDERR.reopen(stderr[1])
+ stderr[1].close
+
+ options = Syslog::LOG_PERROR | Syslog::LOG_NDELAY
+
+ Syslog.open("syslog_test", options) { |sl|
+ sl.log(Syslog::LOG_NOTICE, "test1 - hello, %s!", "world")
+ sl.notice("test1 - hello, %s!", "world")
+ }
+
+ Syslog.open("syslog_test", options | Syslog::LOG_PID) { |sl|
+ sl.log(Syslog::LOG_CRIT, "test2 - pid")
+ sl.crit("test2 - pid")
+ }
+ exit!
+ }
+
+ stderr[1].close
+ Process.waitpid(pid)
+
+ # LOG_PERROR is not yet implemented on Cygwin.
+ return if RUBY_PLATFORM =~ /cygwin/
+
+ 2.times {
+ assert_equal("syslog_test: test1 - hello, world!\n", stderr[0].gets)
+ }
+
+ 2.times {
+ assert_equal(format("syslog_test[%d]: test2 - pid\n", pid), stderr[0].gets)
+ }
+ end
+
+ def test_inspect
+ Syslog.open { |sl|
+ assert_equal(format('<#%s: opened=true, ident="%s", options=%d, facility=%d, mask=%d>',
+ Syslog,
+ sl.ident,
+ sl.options,
+ sl.facility,
+ sl.mask),
+ sl.inspect)
+ }
+
+ assert_equal(format('<#%s: opened=false>', Syslog), Syslog.inspect)
+ end
+end
diff --git a/ext/thread/extconf.rb b/ext/thread/extconf.rb
new file mode 100644
index 0000000000..2f984efc6d
--- /dev/null
+++ b/ext/thread/extconf.rb
@@ -0,0 +1,9 @@
+require 'mkmf'
+
+enable_config('fastthread', true) or exit
+
+if with_config('mem-pools', true)
+ $CPPFLAGS << ' -DUSE_MEM_POOLS'
+end
+
+create_makefile("thread")
diff --git a/ext/thread/lib/thread.rb b/ext/thread/lib/thread.rb
new file mode 100644
index 0000000000..6c533aba39
--- /dev/null
+++ b/ext/thread/lib/thread.rb
@@ -0,0 +1,5 @@
+unless defined? Thread
+ fail "Thread not available for this ruby interpreter"
+end
+
+require 'thread.so'
diff --git a/ext/thread/thread.c b/ext/thread/thread.c
new file mode 100644
index 0000000000..68f172220a
--- /dev/null
+++ b/ext/thread/thread.c
@@ -0,0 +1,1182 @@
+/*
+ * Optimized Ruby Mutex implementation, loosely based on thread.rb by
+ * Yukihiro Matsumoto <matz@ruby-lang.org>
+ *
+ * Copyright 2006-2007 MenTaLguY <mental@rydia.net>
+ *
+ * RDoc taken from original.
+ *
+ * This file is made available under the same terms as Ruby.
+ */
+
+#include <ruby.h>
+#include <intern.h>
+#include <rubysig.h>
+
+static VALUE rb_cMutex;
+static VALUE rb_cConditionVariable;
+static VALUE rb_cQueue;
+static VALUE rb_cSizedQueue;
+
+static VALUE set_critical(VALUE value);
+
+static VALUE
+thread_exclusive(VALUE (*func)(ANYARGS), VALUE arg)
+{
+ VALUE critical = rb_thread_critical;
+
+ rb_thread_critical = 1;
+ return rb_ensure(func, arg, set_critical, (VALUE)critical);
+}
+
+/*
+ * call-seq:
+ * Thread.exclusive { block } => obj
+ *
+ * Wraps a block in Thread.critical, restoring the original value
+ * upon exit from the critical section, and returns the value of the
+ * block.
+ */
+
+static VALUE
+rb_thread_exclusive(void)
+{
+ return thread_exclusive(rb_yield, Qundef);
+}
+
+typedef struct _Entry {
+ VALUE value;
+ struct _Entry *next;
+} Entry;
+
+typedef struct _List {
+ Entry *entries;
+ Entry *last_entry;
+ Entry *entry_pool;
+ unsigned long size;
+} List;
+
+static void
+init_list(List *list)
+{
+ list->entries = NULL;
+ list->last_entry = NULL;
+ list->entry_pool = NULL;
+ list->size = 0;
+}
+
+static void
+mark_list(List *list)
+{
+ Entry *entry;
+ for (entry = list->entries; entry; entry = entry->next) {
+ rb_gc_mark(entry->value);
+ }
+}
+
+static void
+free_entries(Entry *first)
+{
+ Entry *next;
+ while (first) {
+ next = first->next;
+ xfree(first);
+ first = next;
+ }
+}
+
+static void
+finalize_list(List *list)
+{
+ free_entries(list->entries);
+ free_entries(list->entry_pool);
+}
+
+static void
+push_list(List *list, VALUE value)
+{
+ Entry *entry;
+
+ if (list->entry_pool) {
+ entry = list->entry_pool;
+ list->entry_pool = entry->next;
+ } else {
+ entry = ALLOC(Entry);
+ }
+
+ entry->value = value;
+ entry->next = NULL;
+
+ if (list->last_entry) {
+ list->last_entry->next = entry;
+ } else {
+ list->entries = entry;
+ }
+ list->last_entry = entry;
+
+ ++list->size;
+}
+
+static void
+push_multiple_list(List *list, VALUE *values, unsigned count)
+{
+ unsigned i;
+ for (i = 0; i < count; i++) {
+ push_list(list, values[i]);
+ }
+}
+
+static void
+recycle_entries(List *list, Entry *first_entry, Entry *last_entry)
+{
+#ifdef USE_MEM_POOLS
+ last_entry->next = list->entry_pool;
+ list->entry_pool = first_entry;
+#else
+ last_entry->next = NULL;
+ free_entries(first_entry);
+#endif
+}
+
+static VALUE
+shift_list(List *list)
+{
+ Entry *entry;
+ VALUE value;
+
+ entry = list->entries;
+ if (!entry) return Qnil;
+
+ list->entries = entry->next;
+ if (entry == list->last_entry) {
+ list->last_entry = NULL;
+ }
+
+ --list->size;
+
+ value = entry->value;
+ recycle_entries(list, entry, entry);
+
+ return value;
+}
+
+static void
+remove_one(List *list, VALUE value)
+{
+ Entry **ref;
+ Entry *prev;
+ Entry *entry;
+
+ for (ref = &list->entries, prev = NULL, entry = list->entries;
+ entry != NULL;
+ ref = &entry->next, prev = entry, entry = entry->next) {
+ if (entry->value == value) {
+ *ref = entry->next;
+ list->size--;
+ if (!entry->next) {
+ list->last_entry = prev;
+ }
+ recycle_entries(list, entry, entry);
+ break;
+ }
+ }
+}
+
+static void
+clear_list(List *list)
+{
+ if (list->last_entry) {
+ recycle_entries(list, list->entries, list->last_entry);
+ list->entries = NULL;
+ list->last_entry = NULL;
+ list->size = 0;
+ }
+}
+
+static VALUE
+array_from_list(List const *list)
+{
+ VALUE ary;
+ Entry *entry;
+ ary = rb_ary_new();
+ for (entry = list->entries; entry; entry = entry->next) {
+ rb_ary_push(ary, entry->value);
+ }
+ return ary;
+}
+
+static VALUE
+wake_thread(VALUE thread)
+{
+ return rb_thread_wakeup_alive(thread);
+}
+
+static VALUE
+run_thread(VALUE thread)
+{
+ thread = wake_thread(thread);
+ if (RTEST(thread) && !rb_thread_critical)
+ rb_thread_schedule();
+ return thread;
+}
+
+static VALUE
+wake_one(List *list)
+{
+ VALUE waking;
+
+ waking = Qnil;
+ while (list->entries && !RTEST(waking)) {
+ waking = wake_thread(shift_list(list));
+ }
+
+ return waking;
+}
+
+static VALUE
+wake_all(List *list)
+{
+ while (list->entries) {
+ wake_one(list);
+ }
+ return Qnil;
+}
+
+static VALUE
+wait_list_inner(List *list)
+{
+ push_list(list, rb_thread_current());
+ rb_thread_stop();
+ return Qnil;
+}
+
+static VALUE
+wait_list_cleanup(List *list)
+{
+ /* cleanup in case of spurious wakeups */
+ remove_one(list, rb_thread_current());
+ return Qnil;
+}
+
+static VALUE
+wait_list(List *list)
+{
+ return rb_ensure(wait_list_inner, (VALUE)list, wait_list_cleanup, (VALUE)list);
+}
+
+static void
+kill_waiting_threads(List *waiting)
+{
+ Entry *entry;
+
+ for (entry = waiting->entries; entry; entry = entry->next) {
+ rb_thread_kill(entry->value);
+ }
+}
+
+/*
+ * Document-class: Mutex
+ *
+ * Mutex implements a simple semaphore that can be used to coordinate access to
+ * shared data from multiple concurrent threads.
+ *
+ * Example:
+ *
+ * require 'thread'
+ * semaphore = Mutex.new
+ *
+ * a = Thread.new {
+ * semaphore.synchronize {
+ * # access shared resource
+ * }
+ * }
+ *
+ * b = Thread.new {
+ * semaphore.synchronize {
+ * # access shared resource
+ * }
+ * }
+ *
+ */
+
+typedef struct _Mutex {
+ VALUE owner;
+ List waiting;
+} Mutex;
+
+#define MUTEX_LOCKED_P(mutex) (RTEST((mutex)->owner) && rb_thread_alive_p((mutex)->owner))
+
+static void
+mark_mutex(Mutex *mutex)
+{
+ rb_gc_mark(mutex->owner);
+ mark_list(&mutex->waiting);
+}
+
+static void
+finalize_mutex(Mutex *mutex)
+{
+ finalize_list(&mutex->waiting);
+}
+
+static void
+free_mutex(Mutex *mutex)
+{
+ kill_waiting_threads(&mutex->waiting);
+ finalize_mutex(mutex);
+ xfree(mutex);
+}
+
+static void
+init_mutex(Mutex *mutex)
+{
+ mutex->owner = Qnil;
+ init_list(&mutex->waiting);
+}
+
+/*
+ * Document-method: new
+ * call-seq: Mutex.new
+ *
+ * Creates a new Mutex
+ *
+ */
+
+static VALUE
+rb_mutex_alloc(VALUE klass)
+{
+ Mutex *mutex;
+ mutex = ALLOC(Mutex);
+ init_mutex(mutex);
+ return Data_Wrap_Struct(klass, mark_mutex, free_mutex, mutex);
+}
+
+/*
+ * Document-method: locked?
+ * call-seq: locked?
+ *
+ * Returns +true+ if this lock is currently held by some thread.
+ *
+ */
+
+static VALUE
+rb_mutex_locked_p(VALUE self)
+{
+ Mutex *mutex;
+ Data_Get_Struct(self, Mutex, mutex);
+ return MUTEX_LOCKED_P(mutex) ? Qtrue : Qfalse;
+}
+
+/*
+ * Document-method: try_lock
+ * call-seq: try_lock
+ *
+ * Attempts to obtain the lock and returns immediately. Returns +true+ if the
+ * lock was granted.
+ *
+ */
+
+static VALUE
+rb_mutex_try_lock(VALUE self)
+{
+ Mutex *mutex;
+
+ Data_Get_Struct(self, Mutex, mutex);
+
+ if (MUTEX_LOCKED_P(mutex))
+ return Qfalse;
+
+ mutex->owner = rb_thread_current();
+ return Qtrue;
+}
+
+/*
+ * Document-method: lock
+ * call-seq: lock
+ *
+ * Attempts to grab the lock and waits if it isn't available.
+ *
+ */
+
+static VALUE
+lock_mutex(Mutex *mutex)
+{
+ VALUE current;
+ current = rb_thread_current();
+
+ rb_thread_critical = 1;
+
+ if (!MUTEX_LOCKED_P(mutex)) {
+ mutex->owner = current;
+ }
+ else {
+ do {
+ wait_list(&mutex->waiting);
+ rb_thread_critical = 1;
+ if (!MUTEX_LOCKED_P(mutex)) {
+ mutex->owner = current;
+ break;
+ }
+ } while (mutex->owner != current);
+ }
+
+ rb_thread_critical = 0;
+ return Qnil;
+}
+
+static VALUE
+rb_mutex_lock(VALUE self)
+{
+ Mutex *mutex;
+ Data_Get_Struct(self, Mutex, mutex);
+ lock_mutex(mutex);
+ return self;
+}
+
+/*
+ * Document-method: unlock
+ *
+ * Releases the lock. Returns +nil+ if ref wasn't locked.
+ *
+ */
+
+static VALUE
+unlock_mutex_inner(Mutex *mutex)
+{
+ VALUE waking;
+
+ if (mutex->owner != rb_thread_current()) {
+ rb_raise(rb_eThreadError, "not owner");
+ }
+
+ waking = wake_one(&mutex->waiting);
+ mutex->owner = waking;
+
+ return waking;
+}
+
+static VALUE
+set_critical(VALUE value)
+{
+ rb_thread_critical = (int)value;
+ return Qundef;
+}
+
+static VALUE
+unlock_mutex(Mutex *mutex)
+{
+ VALUE waking = thread_exclusive(unlock_mutex_inner, (VALUE)mutex);
+
+ if (!RTEST(waking)) {
+ return Qfalse;
+ }
+
+ run_thread(waking);
+
+ return Qtrue;
+}
+
+static VALUE
+rb_mutex_unlock(VALUE self)
+{
+ Mutex *mutex;
+ Data_Get_Struct(self, Mutex, mutex);
+
+ if (RTEST(unlock_mutex(mutex))) {
+ return self;
+ } else {
+ return Qnil;
+ }
+}
+
+/*
+ * Document-method: exclusive_unlock
+ * call-seq: exclusive_unlock { ... }
+ *
+ * If the mutex is locked, unlocks the mutex, wakes one waiting thread, and
+ * yields in a critical section.
+ *
+ */
+
+static VALUE
+rb_mutex_exclusive_unlock_inner(Mutex *mutex)
+{
+ VALUE waking;
+ waking = unlock_mutex_inner(mutex);
+ rb_yield(Qundef);
+ return waking;
+}
+
+static VALUE
+rb_mutex_exclusive_unlock(VALUE self)
+{
+ Mutex *mutex;
+ VALUE waking;
+ Data_Get_Struct(self, Mutex, mutex);
+
+ waking = thread_exclusive(rb_mutex_exclusive_unlock_inner, (VALUE)mutex);
+
+ if (!RTEST(waking)) {
+ return Qnil;
+ }
+
+ run_thread(waking);
+
+ return self;
+}
+
+/*
+ * Document-method: synchronize
+ * call-seq: synchronize { ... }
+ *
+ * Obtains a lock, runs the block, and releases the lock when the block
+ * completes. See the example under Mutex.
+ *
+ */
+
+static VALUE
+rb_mutex_synchronize(VALUE self)
+{
+ rb_mutex_lock(self);
+ return rb_ensure(rb_yield, Qundef, rb_mutex_unlock, self);
+}
+
+/*
+ * Document-class: ConditionVariable
+ *
+ * ConditionVariable objects augment class Mutex. Using condition variables,
+ * it is possible to suspend while in the middle of a critical section until a
+ * resource becomes available.
+ *
+ * Example:
+ *
+ * require 'thread'
+ *
+ * mutex = Mutex.new
+ * resource = ConditionVariable.new
+ *
+ * a = Thread.new {
+ * mutex.synchronize {
+ * # Thread 'a' now needs the resource
+ * resource.wait(mutex)
+ * # 'a' can now have the resource
+ * }
+ * }
+ *
+ * b = Thread.new {
+ * mutex.synchronize {
+ * # Thread 'b' has finished using the resource
+ * resource.signal
+ * }
+ * }
+ *
+ */
+
+typedef struct _ConditionVariable {
+ List waiting;
+} ConditionVariable;
+
+static void
+mark_condvar(ConditionVariable *condvar)
+{
+ mark_list(&condvar->waiting);
+}
+
+static void
+finalize_condvar(ConditionVariable *condvar)
+{
+ finalize_list(&condvar->waiting);
+}
+
+static void
+free_condvar(ConditionVariable *condvar)
+{
+ kill_waiting_threads(&condvar->waiting);
+ finalize_condvar(condvar);
+ xfree(condvar);
+}
+
+static void
+init_condvar(ConditionVariable *condvar)
+{
+ init_list(&condvar->waiting);
+}
+
+/*
+ * Document-method: new
+ * call-seq: ConditionVariable.new
+ *
+ * Creates a new ConditionVariable
+ *
+ */
+
+static VALUE
+rb_condvar_alloc(VALUE klass)
+{
+ ConditionVariable *condvar;
+
+ condvar = ALLOC(ConditionVariable);
+ init_condvar(condvar);
+
+ return Data_Wrap_Struct(klass, mark_condvar, free_condvar, condvar);
+}
+
+/*
+ * Document-method: wait
+ * call-seq: wait
+ *
+ * Releases the lock held in +mutex+ and waits; reacquires the lock on wakeup.
+ *
+ */
+
+static void
+wait_condvar(ConditionVariable *condvar, Mutex *mutex)
+{
+ VALUE waking;
+
+ rb_thread_critical = 1;
+ if (rb_thread_current() != mutex->owner) {
+ rb_thread_critical = 0;
+ rb_raise(rb_eThreadError, "not owner of the synchronization mutex");
+ }
+ waking = unlock_mutex_inner(mutex);
+ if (RTEST(waking)) {
+ wake_thread(waking);
+ }
+ rb_ensure(wait_list, (VALUE)&condvar->waiting, lock_mutex, (VALUE)mutex);
+}
+
+static VALUE
+legacy_exclusive_unlock(VALUE mutex)
+{
+ return rb_funcall(mutex, rb_intern("exclusive_unlock"), 0);
+}
+
+typedef struct {
+ ConditionVariable *condvar;
+ VALUE mutex;
+} legacy_wait_args;
+
+static VALUE
+legacy_wait(VALUE unused, legacy_wait_args *args)
+{
+ wait_list(&args->condvar->waiting);
+ rb_funcall(args->mutex, rb_intern("lock"), 0);
+ return Qnil;
+}
+
+static VALUE
+rb_condvar_wait(VALUE self, VALUE mutex_v)
+{
+ ConditionVariable *condvar;
+ Data_Get_Struct(self, ConditionVariable, condvar);
+
+ if (CLASS_OF(mutex_v) != rb_cMutex) {
+ /* interoperate with legacy mutex */
+ legacy_wait_args args;
+ args.condvar = condvar;
+ args.mutex = mutex_v;
+ rb_iterate(legacy_exclusive_unlock, mutex_v, legacy_wait, (VALUE)&args);
+ } else {
+ Mutex *mutex;
+ Data_Get_Struct(mutex_v, Mutex, mutex);
+ wait_condvar(condvar, mutex);
+ }
+
+ return self;
+}
+
+/*
+ * Document-method: broadcast
+ * call-seq: broadcast
+ *
+ * Wakes up all threads waiting for this condition.
+ *
+ */
+
+static VALUE
+rb_condvar_broadcast(VALUE self)
+{
+ ConditionVariable *condvar;
+
+ Data_Get_Struct(self, ConditionVariable, condvar);
+
+ thread_exclusive(wake_all, (VALUE)&condvar->waiting);
+ rb_thread_schedule();
+
+ return self;
+}
+
+/*
+ * Document-method: signal
+ * call-seq: signal
+ *
+ * Wakes up the first thread in line waiting for this condition.
+ *
+ */
+
+static void
+signal_condvar(ConditionVariable *condvar)
+{
+ VALUE waking = thread_exclusive(wake_one, (VALUE)&condvar->waiting);
+
+ if (RTEST(waking)) {
+ run_thread(waking);
+ }
+}
+
+static VALUE
+rb_condvar_signal(VALUE self)
+{
+ ConditionVariable *condvar;
+ Data_Get_Struct(self, ConditionVariable, condvar);
+ signal_condvar(condvar);
+ return self;
+}
+
+/*
+ * Document-class: Queue
+ *
+ * This class provides a way to synchronize communication between threads.
+ *
+ * Example:
+ *
+ * require 'thread'
+ *
+ * queue = Queue.new
+ *
+ * producer = Thread.new do
+ * 5.times do |i|
+ * sleep rand(i) # simulate expense
+ * queue << i
+ * puts "#{i} produced"
+ * end
+ * end
+ *
+ * consumer = Thread.new do
+ * 5.times do |i|
+ * value = queue.pop
+ * sleep rand(i/2) # simulate expense
+ * puts "consumed #{value}"
+ * end
+ * end
+ *
+ * consumer.join
+ *
+ */
+
+typedef struct _Queue {
+ Mutex mutex;
+ ConditionVariable value_available;
+ ConditionVariable space_available;
+ List values;
+ unsigned long capacity;
+} Queue;
+
+static void
+mark_queue(Queue *queue)
+{
+ mark_mutex(&queue->mutex);
+ mark_condvar(&queue->value_available);
+ mark_condvar(&queue->space_available);
+ mark_list(&queue->values);
+}
+
+static void
+finalize_queue(Queue *queue)
+{
+ finalize_mutex(&queue->mutex);
+ finalize_condvar(&queue->value_available);
+ finalize_condvar(&queue->space_available);
+ finalize_list(&queue->values);
+}
+
+static void
+free_queue(Queue *queue)
+{
+ kill_waiting_threads(&queue->mutex.waiting);
+ kill_waiting_threads(&queue->space_available.waiting);
+ kill_waiting_threads(&queue->value_available.waiting);
+ finalize_queue(queue);
+ xfree(queue);
+}
+
+static void
+init_queue(Queue *queue)
+{
+ init_mutex(&queue->mutex);
+ init_condvar(&queue->value_available);
+ init_condvar(&queue->space_available);
+ init_list(&queue->values);
+ queue->capacity = 0;
+}
+
+/*
+ * Document-method: new
+ * call-seq: new
+ *
+ * Creates a new queue.
+ *
+ */
+
+static VALUE
+rb_queue_alloc(VALUE klass)
+{
+ Queue *queue;
+ queue = ALLOC(Queue);
+ init_queue(queue);
+ return Data_Wrap_Struct(klass, mark_queue, free_queue, queue);
+}
+
+static VALUE
+rb_queue_marshal_load(VALUE self, VALUE data)
+{
+ Queue *queue;
+ VALUE array;
+ Data_Get_Struct(self, Queue, queue);
+
+ array = rb_marshal_load(data);
+ if (TYPE(array) != T_ARRAY) {
+ rb_raise(rb_eTypeError, "expected Array of queue data");
+ }
+ if (RARRAY(array)->len < 1) {
+ rb_raise(rb_eArgError, "missing capacity value");
+ }
+ queue->capacity = NUM2ULONG(rb_ary_shift(array));
+ push_multiple_list(&queue->values, RARRAY(array)->ptr, (unsigned)RARRAY(array)->len);
+
+ return self;
+}
+
+static VALUE
+rb_queue_marshal_dump(VALUE self)
+{
+ Queue *queue;
+ VALUE array;
+ Data_Get_Struct(self, Queue, queue);
+
+ array = array_from_list(&queue->values);
+ rb_ary_unshift(array, ULONG2NUM(queue->capacity));
+ return rb_marshal_dump(array, Qnil);
+}
+
+/*
+ * Document-method: clear
+ * call-seq: clear
+ *
+ * Removes all objects from the queue.
+ *
+ */
+
+static VALUE
+rb_queue_clear(VALUE self)
+{
+ Queue *queue;
+ Data_Get_Struct(self, Queue, queue);
+
+ lock_mutex(&queue->mutex);
+ clear_list(&queue->values);
+ signal_condvar(&queue->space_available);
+ unlock_mutex(&queue->mutex);
+
+ return self;
+}
+
+/*
+ * Document-method: empty?
+ * call-seq: empty?
+ *
+ * Returns +true+ if the queue is empty.
+ *
+ */
+
+static VALUE
+rb_queue_empty_p(VALUE self)
+{
+ Queue *queue;
+ VALUE result;
+ Data_Get_Struct(self, Queue, queue);
+
+ lock_mutex(&queue->mutex);
+ result = queue->values.size == 0 ? Qtrue : Qfalse;
+ unlock_mutex(&queue->mutex);
+
+ return result;
+}
+
+/*
+ * Document-method: length
+ * call-seq: length
+ *
+ * Returns the length of the queue.
+ *
+ */
+
+static VALUE
+rb_queue_length(VALUE self)
+{
+ Queue *queue;
+ VALUE result;
+ Data_Get_Struct(self, Queue, queue);
+
+ lock_mutex(&queue->mutex);
+ result = ULONG2NUM(queue->values.size);
+ unlock_mutex(&queue->mutex);
+
+ return result;
+}
+
+/*
+ * Document-method: num_waiting
+ * call-seq: num_waiting
+ *
+ * Returns the number of threads waiting on the queue.
+ *
+ */
+
+static VALUE
+rb_queue_num_waiting(VALUE self)
+{
+ Queue *queue;
+ VALUE result;
+ Data_Get_Struct(self, Queue, queue);
+
+ lock_mutex(&queue->mutex);
+ result = ULONG2NUM(queue->value_available.waiting.size +
+ queue->space_available.waiting.size);
+ unlock_mutex(&queue->mutex);
+
+ return result;
+}
+
+/*
+ * Document-method: pop
+ * call_seq: pop(non_block=false)
+ *
+ * Retrieves data from the queue. If the queue is empty, the calling thread is
+ * suspended until data is pushed onto the queue. If +non_block+ is true, the
+ * thread isn't suspended, and an exception is raised.
+ *
+ */
+
+static VALUE
+rb_queue_pop(int argc, VALUE *argv, VALUE self)
+{
+ Queue *queue;
+ int should_block;
+ VALUE result;
+ Data_Get_Struct(self, Queue, queue);
+
+ if (argc == 0) {
+ should_block = 1;
+ } else if (argc == 1) {
+ should_block = !RTEST(argv[0]);
+ } else {
+ rb_raise(rb_eArgError, "wrong number of arguments (%d for 1)", argc);
+ }
+
+ lock_mutex(&queue->mutex);
+ if (!queue->values.entries && !should_block) {
+ unlock_mutex(&queue->mutex);
+ rb_raise(rb_eThreadError, "queue empty");
+ }
+
+ while (!queue->values.entries) {
+ wait_condvar(&queue->value_available, &queue->mutex);
+ }
+
+ result = shift_list(&queue->values);
+ if (queue->capacity && queue->values.size < queue->capacity) {
+ signal_condvar(&queue->space_available);
+ }
+ unlock_mutex(&queue->mutex);
+
+ return result;
+}
+
+/*
+ * Document-method: push
+ * call-seq: push(obj)
+ *
+ * Pushes +obj+ to the queue.
+ *
+ */
+
+static VALUE
+rb_queue_push(VALUE self, VALUE value)
+{
+ Queue *queue;
+ Data_Get_Struct(self, Queue, queue);
+
+ lock_mutex(&queue->mutex);
+ while (queue->capacity && queue->values.size >= queue->capacity) {
+ wait_condvar(&queue->space_available, &queue->mutex);
+ }
+ push_list(&queue->values, value);
+ signal_condvar(&queue->value_available);
+ unlock_mutex(&queue->mutex);
+
+ return self;
+}
+
+/*
+ * Document-class: SizedQueue
+ *
+ * This class represents queues of specified size capacity. The push operation
+ * may be blocked if the capacity is full.
+ *
+ * See Queue for an example of how a SizedQueue works.
+ *
+ */
+
+/*
+ * Document-method: new
+ * call-seq: new
+ *
+ * Creates a fixed-length queue with a maximum size of +max+.
+ *
+ */
+
+/*
+ * Document-method: max
+ * call-seq: max
+ *
+ * Returns the maximum size of the queue.
+ *
+ */
+
+static VALUE
+rb_sized_queue_max(VALUE self)
+{
+ Queue *queue;
+ VALUE result;
+ Data_Get_Struct(self, Queue, queue);
+
+ lock_mutex(&queue->mutex);
+ result = ULONG2NUM(queue->capacity);
+ unlock_mutex(&queue->mutex);
+
+ return result;
+}
+
+/*
+ * Document-method: max=
+ * call-seq: max=(size)
+ *
+ * Sets the maximum size of the queue.
+ *
+ */
+
+static VALUE
+rb_sized_queue_max_set(VALUE self, VALUE value)
+{
+ Queue *queue;
+ unsigned long new_capacity;
+ unsigned long difference;
+ Data_Get_Struct(self, Queue, queue);
+
+ new_capacity = NUM2ULONG(value);
+
+ if (new_capacity < 1) {
+ rb_raise(rb_eArgError, "value must be positive");
+ }
+
+ lock_mutex(&queue->mutex);
+ if (queue->capacity && new_capacity > queue->capacity) {
+ difference = new_capacity - queue->capacity;
+ } else {
+ difference = 0;
+ }
+ queue->capacity = new_capacity;
+ for (; difference > 0; --difference) {
+ signal_condvar(&queue->space_available);
+ }
+ unlock_mutex(&queue->mutex);
+
+ return self;
+}
+
+/*
+ * Document-method: push
+ * call-seq: push(obj)
+ *
+ * Pushes +obj+ to the queue. If there is no space left in the queue, waits
+ * until space becomes available.
+ *
+ */
+
+/*
+ * Document-method: pop
+ * call-seq: pop(non_block=false)
+ *
+ * Retrieves data from the queue and runs a waiting thread, if any.
+ *
+ */
+
+/* for marshalling mutexes and condvars */
+
+static VALUE
+dummy_load(VALUE self, VALUE string)
+{
+ return Qnil;
+}
+
+static VALUE
+dummy_dump(VALUE self)
+{
+ return rb_str_new2("");
+}
+
+void
+Init_thread(void)
+{
+ rb_define_singleton_method(rb_cThread, "exclusive", rb_thread_exclusive, 0);
+
+ rb_cMutex = rb_define_class("Mutex", rb_cObject);
+ rb_define_alloc_func(rb_cMutex, rb_mutex_alloc);
+ rb_define_method(rb_cMutex, "marshal_load", dummy_load, 1);
+ rb_define_method(rb_cMutex, "marshal_dump", dummy_dump, 0);
+ rb_define_method(rb_cMutex, "locked?", rb_mutex_locked_p, 0);
+ rb_define_method(rb_cMutex, "try_lock", rb_mutex_try_lock, 0);
+ rb_define_method(rb_cMutex, "lock", rb_mutex_lock, 0);
+ rb_define_method(rb_cMutex, "unlock", rb_mutex_unlock, 0);
+ rb_define_method(rb_cMutex, "exclusive_unlock", rb_mutex_exclusive_unlock, 0);
+ rb_define_method(rb_cMutex, "synchronize", rb_mutex_synchronize, 0);
+
+ rb_cConditionVariable = rb_define_class("ConditionVariable", rb_cObject);
+ rb_define_alloc_func(rb_cConditionVariable, rb_condvar_alloc);
+ rb_define_method(rb_cConditionVariable, "marshal_load", dummy_load, 1);
+ rb_define_method(rb_cConditionVariable, "marshal_dump", dummy_dump, 0);
+ rb_define_method(rb_cConditionVariable, "wait", rb_condvar_wait, 1);
+ rb_define_method(rb_cConditionVariable, "broadcast", rb_condvar_broadcast, 0);
+ rb_define_method(rb_cConditionVariable, "signal", rb_condvar_signal, 0);
+
+ rb_cQueue = rb_define_class("Queue", rb_cObject);
+ rb_define_alloc_func(rb_cQueue, rb_queue_alloc);
+ rb_define_method(rb_cQueue, "marshal_load", rb_queue_marshal_load, 1);
+ rb_define_method(rb_cQueue, "marshal_dump", rb_queue_marshal_dump, 0);
+ rb_define_method(rb_cQueue, "clear", rb_queue_clear, 0);
+ rb_define_method(rb_cQueue, "empty?", rb_queue_empty_p, 0);
+ rb_define_method(rb_cQueue, "length", rb_queue_length, 0);
+ rb_define_method(rb_cQueue, "num_waiting", rb_queue_num_waiting, 0);
+ rb_define_method(rb_cQueue, "pop", rb_queue_pop, -1);
+ rb_define_method(rb_cQueue, "push", rb_queue_push, 1);
+ rb_alias(rb_cQueue, rb_intern("enq"), rb_intern("push"));
+ rb_alias(rb_cQueue, rb_intern("<<"), rb_intern("push"));
+ rb_alias(rb_cQueue, rb_intern("deq"), rb_intern("pop"));
+ rb_alias(rb_cQueue, rb_intern("shift"), rb_intern("pop"));
+ rb_alias(rb_cQueue, rb_intern("size"), rb_intern("length"));
+
+ rb_cSizedQueue = rb_define_class("SizedQueue", rb_cQueue);
+ rb_define_method(rb_cSizedQueue, "initialize", rb_sized_queue_max_set, 1);
+ rb_define_method(rb_cSizedQueue, "num_waiting", rb_queue_num_waiting, 0);
+ rb_define_method(rb_cSizedQueue, "pop", rb_queue_pop, -1);
+ rb_define_method(rb_cSizedQueue, "push", rb_queue_push, 1);
+ rb_define_method(rb_cSizedQueue, "max", rb_sized_queue_max, 0);
+ rb_define_method(rb_cSizedQueue, "max=", rb_sized_queue_max_set, 1);
+ rb_alias(rb_cSizedQueue, rb_intern("enq"), rb_intern("push"));
+ rb_alias(rb_cSizedQueue, rb_intern("<<"), rb_intern("push"));
+ rb_alias(rb_cSizedQueue, rb_intern("deq"), rb_intern("pop"));
+ rb_alias(rb_cSizedQueue, rb_intern("shift"), rb_intern("pop"));
+}
+
diff --git a/ext/tk/.cvsignore b/ext/tk/.cvsignore
index 90c83ed9b1..44e7f262dc 100644
--- a/ext/tk/.cvsignore
+++ b/ext/tk/.cvsignore
@@ -1,3 +1,3 @@
Makefile
+mkmf.log
*.log
-*.def
diff --git a/ext/tk/ChangeLog.tkextlib b/ext/tk/ChangeLog.tkextlib
index 4aa9cb61d6..8c5d01a954 100644
--- a/ext/tk/ChangeLog.tkextlib
+++ b/ext/tk/ChangeLog.tkextlib
@@ -1,28 +1,3 @@
-2009-07-12 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tkextlib/*: update release.
- Tcllib 1.8/Tklib 0.4.1 ==> Tcllib 1.11.1/Tklib 0.5
- BWidgets 1.7 ==> BWidgets 1.8
- TkTable 2.9 ==> TkTable 2.10
- TkTreeCtrl 2005-12-02 ==> TkTreeCtrl 2.2.9
- Tile 0.8.0/8.5.1 ==> Tile 0.8.3/8.6b1
- IncrTcl 2005-02-14 ==> IncrTcl 2008-12-15
- TclX 2005-02-07 ==> TclX 2008-12-15
- Trofs 0.4.3 ==> Trofs 0.4.4
-
---------------< ... some bug fixes ... >------------------
-
-Tue Nov 25 03:37:42 2008 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tkextlib/blt/tabset.rb,
- ext/tk/lib/tkextlib/blt/tabnotebook.rb:
- fix many bugs. Now, those work properly.
-
-Sat Nov 22 10:31:25 2008 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tkextlib/blt.rb, ext/tk/lib/tkextlib/blt/vector.rb:
- fix NameError bug.
-
2008-05-12 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tkextlib/tkDND/shape.rb: wrong package name.
diff --git a/ext/tk/MANUAL_tcltklib.eng b/ext/tk/MANUAL_tcltklib.eng
index c139947da4..6fa775b7de 100644
--- a/ext/tk/MANUAL_tcltklib.eng
+++ b/ext/tk/MANUAL_tcltklib.eng
@@ -140,7 +140,8 @@ module TclTklib
[module methods]
get_version()
: return an array of major, minor, release-type number,
- : and patchlevel of current Tcl/Tk library.
+ : number, release-type name, and patchlevel of current
+ : Tcl/Tk library.
mainloop(check_root = true)
: Starts the eventloop. If 'check_root' is true, this method
@@ -353,11 +354,6 @@ class TclTkIp
: to _eval and regist the command once, after that, the
: command can be called by _invoke.
- _cancel_eval(str)
- _cancel_eval_unwind(str)
- : (Tcl/Tk8.6 or later)
- : Call Tcl_CancelEval() function, and cancel evaluation.
-
_toUTF8(str, encoding=nil)
_fromUTF8(str, encoding=nil)
: Call the function (which is internal function of Tcl/Tk) to
diff --git a/ext/tk/MANUAL_tcltklib.eucj b/ext/tk/MANUAL_tcltklib.eucj
index 26b39f7943..7df42997b4 100644
--- a/ext/tk/MANUAL_tcltklib.eucj
+++ b/ext/tk/MANUAL_tcltklib.eucj
@@ -235,8 +235,8 @@ require "tcltklib" ¤¹¤ë¤È, °Ê²¼¤Î¥â¥¸¥å¡¼¥ë, ¥¯¥é¥¹¤¬ÍøÍѲÄǽ¤Ç¤¹.
¥â¥¸¥å¡¼¥ë¥á¥½¥Ã¥É
get_version()
- : Tcl/Tk ¤Î major, minor, release-type ÈÖ¹æ, patchlevel ¤ò
- : ÇÛÎó¤Ë¤·¤ÆÊÖ¤¹¡¥
+ : Tcl/Tk ¤Î major, minor, release-type ÈÖ¹æ, release-type ̾,
+ : patchlevel ¤òÇÛÎó¤Ë¤·¤ÆÊÖ¤¹¡¥
mainloop(check_root = true)
: ¥¤¥Ù¥ó¥È¥ë¡¼¥×¤òµ¯Æ°¤¹¤ë¡¥check_root ¤¬ true ¤Ç¤¢¤ì¤Ð¡¤
@@ -464,11 +464,6 @@ require "tcltklib" ¤¹¤ë¤È, °Ê²¼¤Î¥â¥¸¥å¡¼¥ë, ¥¯¥é¥¹¤¬ÍøÍѲÄǽ¤Ç¤¹.
: ¤·¤ÆÅÐÏ¿¤ËÀ®¸ù¤·¤µ¤¨¤¹¤ì¤Ð¡¤°Ê¹ß¤Ï _invoke ¤Ç¤âÍøÍѤÇ
: ¤­¤ë¤è¤¦¤Ë¤Ê¤ë¡¥
- _cancel_eval(str)
- _cancel_eval_unwind(str)
- : (Tcl/Tk8.6 or later)
- : Tcl_CancelEval() ´Ø¿ô¤ò¸Æ¤Ó½Ð¤·¡¤eval ¤Î¼Â¹Ô¤òÂǤÁÀڤ롥
-
_toUTF8(str, encoding=nil)
_fromUTF8(str, encoding=nil)
: Tcl/Tk ¤¬Æâ¢¤·¤Æ¤¤¤ë UTF8 ÊÑ´¹½èÍý¤ò¸Æ¤Ó½Ð¤¹¡¥
diff --git a/ext/tk/README.ActiveTcl b/ext/tk/README.ActiveTcl
index c0f9ef8fe4..3afb3f4cf6 100644
--- a/ext/tk/README.ActiveTcl
+++ b/ext/tk/README.ActiveTcl
@@ -3,22 +3,9 @@ ActiveTcl is ActiveState's quality-assured distribution of Tcl.
# see <http://www.activestate.com/Products/ActiveTcl/>
# <http://www.tcl.tk/>
-First of all, please try to configure without any options.
-"extconf.rb" searches ActiveTcl as default action.
-If you have ActiveTcl and standard (or your own) Tcl/Tk on your
-environment and don't want to use ActiveTcl on your Ruby/Tk, please
-use --without-ActiveTcl option.
-
-When "extconf.rb" fails to find your ActiveTcl libraries, please try
-the followings.
-
If you want to use ActiveTcl binary package as the Tcl/Tk libraries,
please use the following configure options.
- --with-ActiveTcl=<ActiveTcl_root>
- ( When without argument; no <ActiveTcl_root>; only '--with-ActiveTcl',
- it same to '--with-ActiveTcl=/opt/ActiveTcl*/lib' )
-
--with-tcl-dir=<ActiveTcl_root>
--with-tk-dir=<ActiveTcl_root>
diff --git a/ext/tk/README.tcltklib b/ext/tk/README.tcltklib
index 251348e91a..8c6dd5178f 100644
--- a/ext/tk/README.tcltklib
+++ b/ext/tk/README.tcltklib
@@ -1,53 +1,18 @@
To compile 'tcltklib', you must have Tcl/Tk libraries on your environment.
-Although 'extconf.rb' script searches Tcl/Tk libraries and header files
-(as default, searches tclConfig.sh/tkConfig.sh and use the defintions on
-those; ActiveTcl has high priority on searching unless --without-ActiveTcl),
+Although 'extconf.rb' script searches Tcl/Tk libraries and header files,
sometimes fails to find them. And then, 'tcltklib' cannot be compiled. If
Tcl/Tk libraries or header files are installed but are not found, you can
give the information by arguments of the 'configure' script. Please give
some or all of the following options.
- --with-tk-old-extconf use old "extconf.rb" (default: false).
- If current extconf.rb doesn't work properly
- (or your install process is based on old
- documant about Ruby/Tk install), please try
- this option.
-
- --with-ActiveTcl / --without-ActiveTcl
- --with-ActiveTcl=<dir> search ActiveTcl libraries (default: true).
- When true, try to find installed ActiveTcl.
- When <dir> is given, use it as the ActiveTcl's
- top directory (use <dir>/lib, and so on).
- Old "extconf.rb" doesn't support this option.
-
- --with-tk-shlib-search-path=<paths>
- teach the paths for loading shared-libraries
- to linker.
- <paths> is a path list with the same format
- as PATH environment variable.
- This option may be experimental.
- Old "extconf.rb" doesn't support this option.
-
--with-tcltkversion=<version>
force version of Tcl/Tk libaray
(e.g. libtcl8.4g.so ==> --with-tcltkversion=8.4g)
- --without-tcl-config / --without-tk-config
- --with-tclConfig-dir=<dir>
- --with-tkConfig-dir=<dir> the directory contains 'tclConfig.sh' and
- 'tkConfig.sh'.
- Current "extconf.rb" uses the information
- on tclConfig.sh/tkConfig.rb, if possible.
- Old "extconf.rb" doesn't support this option.
-
--with-tcllib=<libname> (e.g. libtcl8.4.so ==> --with-tcllib=tcl8.4)
--with-tklib=<libname> (e.g. libtk8.4.so ==> --with-tklib=tk8.4)
--enable-tcltk-stubs (if you force to enable stubs)
- On old "extconf.rb", default is false.
- On current "extconf.rb", default is true when
- tclConfig.sh/tkConfig.sh have TCL_STUB_LIB_SPEC
- /TK_STUB_LIB_SPEC, else default is false.
--with-tcl-dir=<path>
equal to "--with-tcl-include=<path>/include --with-tcl-lib=<path>/lib"
@@ -71,12 +36,6 @@ some or all of the following options.
When this option is given, it is assumed that
--enable-tcltk-framework option is given also.
- --with-tcl-framework-dir=<dir>
- Tcl framework directory (e.g. "/Library/Frameworks/Tcl.framework")
-
- --with-tk-framework-dir=<dir>
- Tk framework directory (e.g. "/Library/Frameworks/Tk.framework")
-
--with-tcl-framework-header=<dir>
Tcl framework headers directory
(e.g. "/Library/Frameworks/Tcl.framework/Headers")
@@ -113,7 +72,6 @@ options may be useful.
--enable-tcl-thread/--disable-tcl-thread
--with-tclConfig-file=<path of 'tclConfig.sh'>
- --with-tkConfig-file=<path of 'tkConfig.sh'>
It is not need that 'tclConfig.sh' is a normal Tcl/Tk's tclConfig.sh.
But the file is expected to include the line "TCL_THREADS=0" or "...=1".
diff --git a/ext/tk/config_list.in b/ext/tk/config_list.in
deleted file mode 100644
index ba61797e9b..0000000000
--- a/ext/tk/config_list.in
+++ /dev/null
@@ -1,37 +0,0 @@
-##############################################
-# configure options for Ruby/Tk
-# release date: 2009-07-28
-##############################################
-with tk-old-extconf
-with ActiveTcl
-with tk-shlib-search-path
-enable tcltk-stubs
-with tcltkversion
-with tcl-config
-with tk-config
-with tclConfig-dir
-with tkConfig-dir
-with tclConfig-file
-with tkConfig-file
-with tcllib
-with tklib
-with tcl-dir
-with tk-dir
-with tcl-include
-with tk-include
-with tcl-lib
-with tk-lib
-enable mac-tcltk-framework
-enable tcltk-framework
-with tcltk-framework
-with tcl-framework-dir
-with tk-framework-dir
-with tcl-framework-header
-with tk-framework-header
-with X11
-with X11-dir
-with X11-include
-with X11-lib
-enable pthread
-enable tcl-thread
-enable space-on-tk-libpath
diff --git a/ext/tk/depend b/ext/tk/depend
index f7ba3229c1..2cd9c400f7 100644
--- a/ext/tk/depend
+++ b/ext/tk/depend
@@ -1,2 +1,2 @@
-tcltklib.o: tcltklib.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h stubs.h
-stubs.o: stubs.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h stubs.h
+tcltklib.o: tcltklib.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
+stubs.o: stubs.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
diff --git a/ext/tk/extconf.rb b/ext/tk/extconf.rb
index e3deebda05..4807ea7b40 100644
--- a/ext/tk/extconf.rb
+++ b/ext/tk/extconf.rb
@@ -1,126 +1,76 @@
-##############################################################
# extconf.rb for tcltklib
-# release date: 2009-08-09
-##############################################################
-require 'mkmf'
-
-TkLib_Config = {}
-TkLib_Config['search_versions'] =
- %w[8.9 8.8 8.7 8.6 8.5 8.4 8.3 8.2 8.1 8.0 4.2]
-
-
-##############################################################
-# use old extconf.rb ?
-##############################################################
-if with_config('tk-old-extconf')
- require File.join(File.dirname(__FILE__), 'old-extconf.rb')
- exit
-end
-
-##############################################################
-# check configs
-##############################################################
-$cleanfiles << 'config_list'
-config_list_file = 'config_list'
-config_list_file_source = File.join(File.dirname(__FILE__),'config_list.in')
-if !File.exist?(config_list_file) ||
- File.ctime(config_list_file_source) > File.ctime(config_list_file)
- old_config_list_file = config_list_file_source
-else
- old_config_list_file = config_list_file
-end
-
-current_configs = {'with'=>{}, 'enable'=>{}}
-
-# setup keys by config_list.in
-IO.foreach(config_list_file_source){|line|
- line.chomp!
- line.lstrip!
- next if line.empty? || line =~ /^\#/ #
- mode, key, value = line.split(/\s+/, 3)
- value ||= ""
- current_configs[mode][key] = value rescue nil
-}
+require 'mkmf'
-# define current value of keys
-IO.foreach(old_config_list_file){|line|
- line.chomp!
- line.lstrip!
- next if line.empty? || line =~ /^\#/ #
- mode, key, value = line.split(/\s+/, 3)
- value ||= ""
- if current_configs[mode] && current_configs[mode].has_key?(key)
- current_configs[mode][key] = value
- end
-}
+#is_win32 = (/mswin32|mingw|cygwin|bccwin32/ =~ RUBY_PLATFORM)
+is_win32 = (/mswin|mingw|cygwin|bccwin|wince/ =~ RUBY_PLATFORM)
+#is_macosx = (/darwin/ =~ RUBY_PLATFORM)
-update_flag = false
-current_configs['with'].each_key{|key|
- if (value = with_config(key).to_s) != current_configs['with'][key]
- update_flag = true
- current_configs['with'][key] = value
- end
-}
-current_configs['enable'].each_key{|key|
- if (value = enable_config(key).to_s) != current_configs['enable'][key]
- update_flag = true
- current_configs['enable'][key] = value
+def find_framework(tcl_hdr, tk_hdr)
+ if framework_dir = with_config("tcltk-framework")
+ paths = [framework_dir]
+ else
+ unless tcl_hdr || tk_hdr ||
+ enable_config("tcltk-framework", false) ||
+ enable_config("mac-tcltk-framework", false)
+ return false
+ end
+ paths = ["/Library/Frameworks", "/System/Library/Frameworks"]
end
-}
-# update current_configs
-if update_flag || !File.exist?(config_list_file)
- open(config_list_file, 'w'){|fobj|
- fobj.print("# values of current configure options (generated by extconf.rb)\n");
- ['with', 'enable'].each{|mode|
- current_configs[mode].each_key{|key|
- fobj.print("#{mode} #{key} #{current_configs[mode][key]}\n")
- }
+ checking_for('Tcl/Tk Framework') {
+ paths.find{|dir|
+ dir.strip!
+ dir.chomp!('/')
+ (tcl_hdr || FileTest.directory?(dir + "/Tcl.framework/") ) &&
+ (tk_hdr || FileTest.directory?(dir + "/Tk.framework/") )
}
}
end
-if update_flag
- puts "Configure options for Ruby/Tk may be updated."
- puts "So, delete files which depend on old configs."
- File.delete(*Dir.glob("*.#{CONFIG['DLEXT']}"))
- File.delete(*Dir.glob("*.#{$OBJEXT}"))
- File.delete('Makefile') rescue nil
+tcl_framework_header = with_config("tcl-framework-header")
+tk_framework_header = with_config("tk-framework-header")
-else
- makefile = 'Makefile'
- if File.exist?(makefile) &&
- File.ctime(config_list_file) > File.ctime(makefile)
- # no need to update Makefile
- exit
- end
+tcltk_framework = find_framework(tcl_framework_header, tk_framework_header)
+
+unless is_win32
+ have_library("nsl", "t_open")
+ have_library("socket", "socket")
+ have_library("dl", "dlopen")
+ have_library("m", "log")
end
+tk_idir, tk_ldir = dir_config("tk")
+tcl_idir, tcl_ldir = dir_config("tcl")
+x11_idir, x11_ldir = dir_config("X11")
-##############################################################
-# fuctions
-##############################################################
-def is_win32?
- /mswin|mingw|cygwin|bccwin/ =~ RUBY_PLATFORM
-end
+tk_ldir2 = with_config("tk-lib")
+tcl_ldir2 = with_config("tcl-lib")
+x11_ldir2 = with_config("X11-lib")
-def is_macosx?
- /darwin/ =~ RUBY_PLATFORM
-end
+tk_ldir_list = [tk_ldir2, tk_ldir]
+tcl_ldir_list = [tcl_ldir2, tcl_ldir]
+
+tklib = with_config("tklib")
+tcllib = with_config("tcllib")
+stubs = enable_config("tcltk_stubs") || with_config("tcltk_stubs")
+
+tcltk_version = with_config("tcltkversion")
+
+use_X = with_config("X11", (! is_win32))
def check_tcltk_version(version)
- return [nil, nil] unless version.kind_of? String
+ return [nil, nil] unless version
version = version.strip
tclver = version.dup
tkver = version.dup
- dot = major = minor_dot = minor = plvl_dot = plvl = ext = nil
+ major = dot = minor = dot = plvl = ext = nil
if version =~ /^(\d)(\.?)(\d)(\.?)(\d*)(.*)$/
- major = $1; minor_dot = $2; minor = $3; plvl_dot = $4; plvl = $5; ext = $6
+ major = $1; minor_dot = $2; minor = $3; plvl_dot = $4; plvl = $5; ext = $6
dot = ! minor_dot.empty?
if plvl_dot.empty? && ! plvl.empty?
minor << plvl
@@ -144,595 +94,13 @@ def check_tcltk_version(version)
[tclver, tkver]
end
-def get_shlib_versions(major = 8, minor_max = 9, minor_min = 0, ext = "")
- if tclcfg = TkLib_Config["tclConfig_info"]
- major = tclcfg['TCL_MAJOR_VERSION'].to_i
- minor_min = tclcfg['TCL_MINOR_VERSION'].to_i
-
- elsif TkLib_Config["tcltkversion"]
- tclver, tkver = TkLib_Config["tcltkversion"]
- if tclver =~ /8\.?(\d)(.*)/
- minor_min = $1.to_i
- ext = $2
- else
- # unsupported version
- return [""]
- end
- end
-
- # if disable-stubs, version is fixed.
- minor_max = minor_min unless TkLib_Config["tcltk-stubs"]
-
- vers = []
- minor_max.downto(minor_min){|minor|
- vers << "#{major}.#{minor}#{ext}" unless ext.empty?
- vers << "#{major}.#{minor}"
- }
-
- vers << ""
-end
-
-def get_shlib_path_head
- path_head = []
- path_dirs = []
-
- if TkLib_Config["ActiveTcl"].kind_of?(String) # glob path
- path_dirs.concat Dir.glob(TkLib_Config["ActiveTcl"]).sort.reverse
- end
-
- if is_win32?
- if TkLib_Config["ActiveTcl"]
- path_head.concat ["c:/ActiveTcl", "c:/Program Files/ActiveTcl"]
- end
- path_head.concat [
- "c:/Tcl", "c:/Program Files/Tcl",
- "/Tcl", "/Program Files/Tcl"
- ]
- path_head.each{|dir| path_dirs << "#{dir}"}
-
- else
- [
- '/opt', '/pkg', '/share',
- '/usr/local/opt', '/usr/local/pkg', '/usr/local/share', '/usr/local',
- '/usr/opt', '/usr/pkg', '/usr/share', '/usr/contrib', '/usr'
- ].each{|dir|
- next unless File.directory?(dir)
-
- path_dirs << "#{dir}/lib"
- path_dirs << "#{dir}" unless Dir.glob("#{dir}/lib*.*").empty?
-
- dirnames = []
- if TkLib_Config["ActiveTcl"]
- dirnames.concat ["ActiveTcl","activeTcl","Activetcl","activetcl"]
- end
- dirnames.concat ["TclTk","Tcl_Tk","Tcl-Tk","tcltk","tcl_tk","tcl-tk"]
-
- dirnames.each{|name|
- path_dirs << "#{dir}/#{name}" if File.directory?("#{dir}/#{name}")
- path_head << "#{dir}/#{name}" unless Dir.glob("#{dir}/#{name}[-89_]*").empty?
- }
- }
- end
-
- unless TkLib_Config["space-on-tk-libpath"]
- path_head.delete_if{|path| path =~ / /}
- path_dirs.delete_if{|path| path =~ / /}
- end
-
- [path_head, path_dirs]
-end
-
-def find_macosx_framework
- use_framework = is_macosx? && TkLib_Config["ActiveTcl"]
-
- use_framework ||= (tcl_hdr = with_config("tcl-framework-header"))
- use_framework ||= (tk_hdr = with_config("tk-framework-header"))
- tcl_hdr = nil unless tcl_hdr.kind_of? String
- tk_hdr = nil unless tk_hdr.kind_of? String
- TkLib_Config["tcl-framework-header"] = tcl_hdr
- TkLib_Config["tk-framework-header"] = tk_hdr
-
- use_framework ||= (tcl_dir = with_config("tcl-framework-dir"))
- tcl_dir = nil unless tcl_dir.kind_of? String
- if !tcl_dir && tcl_hdr
- # e.g. /Library/Frameworks/Tcl.framework/Headers
- # ==> /Library/Frameworks/Tcl.framework
- tcl_dir = File.dirname(tcl_hdr.strip.chomp('/'))
- end
- TkLib_Config["tcl-framework-dir"] = tcl_dir
-
- use_framework ||= (tk_dir = with_config("tk-framework-dir"))
- tk_dir = nil unless tk_dir.kind_of? String
- if !tk_dir && tk_hdr
- # e.g. /Library/Frameworks/Tk.framework/Headers
- # ==> /Library/Frameworks/Tk.framework
- tk_dir = File.dirname(tk_hdr.strip.chomp('/'))
- end
- TkLib_Config["tk-framework-dir"] = tk_dir
-
- if tcl_dir && !tk_dir
- tk_dir = File.join(File.dirname(tcl_dir), 'Tk.framework')
- TkLib_Config["tk-framework-dir"] = tk_dir
- elsif !tcl_dir && tk_dir
- tcl_dir = File.join(File.dirname(tk_dir), 'Tcl.framework')
- TkLib_Config["tcl-framework-dir"] = tcl_dir
- end
- if tcl_dir && tk_dir
- TkLib_Config["tcltk-framework"] = File.dirname(tcl_dir) unless TkLib_Config["tcltk-framework"]
- return [tcl_dir, tk_dir]
- end
-
- # framework is disabled?
- if with_config("tcltk-framework") == false ||
- enable_config("tcltk-framework") == false
- return false
- end
-
- use_framework ||= (framework_dir = with_config("tcltk-framework"))
- if framework_dir.kind_of? String
- TkLib_Config["tcltk-framework"] = framework_dir.strip.chomp('/')
- return [File.join(TkLib_Config["tcltk-framework"], 'Tcl.framework'),
- File.join(TkLib_Config["tcltk-framework"], 'Tk.framework')]
- end
-
- unless enable_config("tcltk-framework", use_framework) ||
- enable_config("mac-tcltk-framework", use_framework)
- TkLib_Config["tcltk-framework"] = false
- return false
- end
-
- paths = [
- #"~/Library/Frameworks",
- "/Library/Frameworks",
- "/Network/Library/Frameworks", "/System/Library/Frameworks"
- ]
-
- paths.map{|dir| dir.strip.chomp('/')}.each{|dir|
- next unless File.directory?(tcldir = File.join(dir, "Tcl.framework"))
- next unless File.directory?(tkdir = File.join(dir, "Tk.framework"))
- TkLib_Config["tcltk-framework"] = dir
- return [tcldir, tkdir]
- }
-
- nil
-end
-
-def collect_tcltk_defs(tcl_defs_str, tk_defs_str)
- conflicts = [
- 'PACKAGE_NAME', 'PACKAGE_TARNAME', 'PACKAGE_VERSION',
- 'PACKAGE_STRING', 'PACKAGE_BUGREPORT'
- ]
-
- begin
- # Ruby 1.9.x or later
- arch_config_h = RbConfig.expand($arch_hdrdir + "/ruby/config.h")
- if File.exist?(arch_config_h)
- keys = []
- IO.foreach(arch_config_h){|line|
- if line =~ /^#define +([^ ]+)/
- keys << $1
- end
- }
- conflicts = keys
- end
- rescue
- # ignore, use default
- end
-
- if tcl_defs_str
- tcl_defs = tcl_defs_str.split(/ ?-D/).map{|s|
- s =~ /^([^=]+)(.*)$/
- [$1, $2]
- }
- else
- tcl_defs = []
- end
-
- if tk_defs_str
- tk_defs = tk_defs_str.split(/ ?-D/).map{|s|
- s =~ /^([^=]+)(.*)$/
- [$1, $2]
- }
- else
- tk_defs = []
- end
-
- defs = tcl_defs | tk_defs
-
- defs.delete_if{|name,value|
- conflicts.include?(name) ||
- ( (vtcl = tcl_defs.assoc(name)) && (vtk = tk_defs.assoc(name)) &&
- vtcl != vtk )
- }
-
- defs.map{|ary| s = ary.join(''); (s.strip.empty?)? "": "-D" << s}.join(' ')
-end
-
-def parse_tclConfig(file)
- # check tclConfig.sh/tkConfig.sh
- tbl = Hash.new{|h,k| h[k] = ""}
- return tbl unless file
- IO.foreach(file){|line|
- line.strip!
- next if line !~ /^([^\#=][^=]*)=(['"]|)(.*)\2$/
- key, val = $1, $3
- tbl[key] = val.gsub(/\$\{([^}]+)\}/){|s|
- subst = $1
- (tbl[subst])? tbl[subst]: s
- } rescue nil
- }
- tbl
-end
-
-def get_libpath(lib_flag, lib_spec)
- # get libpath fro {TCL,Tk}_LIB_FLAG and {TCL,Tk}_LIB_SPEC
- libpath = lib_spec.gsub(/(#{lib_flag}|-L)/, "").strip
-end
-
-def get_tclConfig_dirs
- config_dir = []
-
- if is_win32?
- if TkLib_Config["ActiveTcl"]
- dirs = []
- if TkLib_Config["ActiveTcl"].kind_of?(String)
- dirs << TkLib_Config["ActiveTcl"]
- end
- dirs.concat [
- "c:/ActiveTcl*/lib", "c:/Activetcl*/lib",
- "c:/activeTcl*/lib", "c:/activetcl*/lib",
- "c:/Tcl*/lib", "c:/tcl*/lib",
- "c:/Program Files/ActiveTcl*/lib", "c:/Program Files/Activetcl*/lib",
- "c:/Program Files/activeTcl*/lib", "c:/Program Files/activetcl*/lib",
- "c:/Program Files/Tcl*/lib", "c:/Program Files/tcl*/lib",
- "/ActiveTcl*/lib", "/Activetcl*/lib",
- "/activeTcl*/lib", "/activetcl*/lib",
- "/Tcl*/lib", "/tcl*/lib",
- "/Program Files/ActiveTcl*/lib", "/Program Files/Activetcl*/lib",
- "/Program Files/activeTcl*/lib", "/Program Files/activetcl*/lib",
- "/Program Files/Tcl*/lib", "/Program Files/tcl*/lib"
- ]
- else
- dirs = [
- "c:/Tcl*/lib", "c:/tcl*/lib",
- "c:/Program Files/Tcl*/lib", "c:/Program Files/tcl*/lib",
- "/Tcl*/lib", "/tcl*/lib",
- "/Program Files/Tcl*/lib", "/Program Files/tcl*/lib"
- ]
- end
- dirs.collect{|d| Dir.glob(d)}.flatten!
- dirs |= dirs
-
- ENV['PATH'].split(';').each{|dir|
- dirs << File.expand_path(File.join(dir, '..', 'lib'))
- dirs << dir
- dirs << File.expand_path(File.join(dir, '..'))
- }
-
- unless TkLib_Config["space-on-tk-libpath"]
- dirs.delete_if{|path| path =~ / /}
- end
-
- config_dir.concat(dirs.zip(dirs))
-
- elsif framework = find_macosx_framework()
- config_dir.unshift(framework)
-
- else
- if activeTcl = TkLib_Config['ActiveTcl']
- # check latest version at first
- config_dir.concat(Dir.glob(activeTcl).sort.reverse)
- end
-
- config_dir.concat [
- RbConfig::CONFIG['libdir'],
- File.join(RbConfig::CONFIG['exec_prefix'], 'lib'),
- File.join(RbConfig::CONFIG['prefix'], 'lib'),
- "/usr/local/opt/lib", "/usr/local/pkg/lib", "/usr/local/share/lib",
- "/usr/local/lib", "/usr/opt/lib", "/usr/pkg/lib",
- "/usr/share/lib", "/usr/contrib/lib", "/usr/lib"
- ]
-
- config_dir.concat [
- '/opt', '/pkg', '/share',
- '/usr/local/opt', '/usr/local/pkg', '/usr/local/share', '/usr/local',
- '/usr/opt', '/usr/pkg', '/usr/share', '/usr/contrib', '/usr'
- ].map{|dir|
- Dir.glob(dir + '/{TclTk,tcltk,Tcl,tcl,Tk,tk}[87]*/lib')
- Dir.glob(dir + '/{TclTk,tcltk,Tcl,tcl,Tk,tk}[87]*')
- Dir.glob(dir + '/{TclTk,tcltk,Tcl,tcl,Tk,tk}/lib')
- Dir.glob(dir + '/{TclTk,tcltk,Tcl,tcl,Tk,tk}')
- }.flatten!
-
- ENV['PATH'].split(':').each{|dir|
- config_dir << File.expand_path(File.join(dir, '..', 'lib'))
- }
-
- # for MacOS X
- #config_dir << "~/Library/Tcl"
- #config_dir.concat(Dir.glob("~/Library/Tcl/*").sort.reverse)
- config_dir << "/Library/Tcl"
- config_dir.concat(Dir.glob("/Library/Tcl/*").sort.reverse)
- config_dir << "/Network/Library/Tcl"
- config_dir.concat(Dir.glob("/Network/Library/Tcl/*").sort.reverse)
- config_dir << "/System/Library/Tcl"
- config_dir.concat(Dir.glob("/System/Library/Tcl/*").sort.reverse)
- [
- #"~/Library/Frameworks",
- "/Library/Frameworks",
- "/Network/Library/Frameworks", "/System/Library/Frameworks"
- ].each{|framework|
- config_dir << [File.expand_path(File.join(framework, 'Tcl.framework')),
- File.expand_path(File.join(framework, 'Tk.framework'))]
- }
- end
-
- config_dir
-end
-
-def search_tclConfig(*paths) # libdir list or [tcl-libdir|file, tk-libdir|file]
- TkLib_Config["tclConfig_paths"] = []
-
- paths.compact!
- if paths.empty?
- config_dir = get_tclConfig_dirs
- else
- # fixed tclConfig
- config_dir = []
- paths.each{|path|
- if path.kind_of?(Array)
- config_dir << path
- else
- dirs = Dir.glob(path)
- config_dir.concat(dirs.zip(dirs))
- end
- }
- end
-
- tclver, tkver = TkLib_Config['tcltkversion']
- conf = nil
-
- (config_dir | config_dir).map{|dir|
- if dir.kind_of? Array
- [dir[0].strip.chomp('/'), dir[1].strip.chomp('/')]
- else
- dir.strip.chomp('/')
- end
- }.each{|dir|
- print(".") # progress
- # print("check #{dir} ==>");
- if dir.kind_of? Array
- tcldir, tkdir = dir
- else
- tcldir = tkdir = dir
- end
-
- tails = ['Config-shared.sh', 'config-shared.sh', 'Config.sh', 'config.sh']
-
- if File.file?(tcldir)
- tclcfg_files = [tcldir] * tails.length
- else
- tclcfg_files = tails.map{|f| File.join(tcldir, 'tcl' << f)}
- end
-
- if File.file?(tkdir)
- tkcfg_files = [tkdir] * tails.length
- else
- tkcfg_files = tails.map{|f| File.join(tcldir, 'tk' << f)}
- end
-
- tclcfg_files.zip(tkcfg_files).uniq.each{|tclpath, tkpath|
- next if !File.exist?(tclpath) || !File.exist?(tkpath)
-
- # parse tclConfig.sh/tkConfig.sh
- tclconf = parse_tclConfig(tclpath)
- next if tclver && tclver !~ /^#{tclconf['TCL_MAJOR_VERSION']}(\.?)#{tclconf['TCL_MINOR_VERSION']}/
- tkconf = parse_tclConfig(tkpath)
- next if tkver && tkver !~ /^#{tkconf['TK_MAJOR_VERSION']}(\.?)#{tkconf['TK_MINOR_VERSION']}/
-
- # nativethread check
- if !TkLib_Config["ruby_with_thread"] && tclconf['TCL_THREADS'] == '1'
- puts "WARNIG: find #{tclpath.inspect}, but it WITH nativethread-support under ruby WITHOUT nativethread-support. So, ignore it."
- TkLib_Config["tcltk-NG-path"] << File.dirname(tclpath)
- next
- end
-
- # find tclConfig.sh & tkConfig.sh
- conf = [tclconf, tkconf] unless conf
-
- # check Tcl library
- if TkLib_Config["tcltk-stubs"]
- stub = "stub"
- tclfunc = "Tcl_InitStubs"
- tkfunc = "Tk_InitStubs"
- else
- stub = ""
- tclfunc = "Tcl_FindExecutable"
- tkfunc = "Tk_Init"
- end
- dir = File.dirname(tclpath)
- libpath = $LIBPATH
- tcllibs = nil
- begin
- tcllib_ok = Dir.glob(File.join(dir, "*tcl#{stub}#{tclconf['TCL_MAJOR_VERSION']}{.,}#{tclconf['TCL_MINOR_VERSION']}*.*")).find{|file|
- if file =~ /^.*(tcl#{stub}#{tclconf['TCL_MAJOR_VERSION']}(\.|)#{tclconf['TCL_MINOR_VERSION']}.*)\.[^.]*$/
- #puts "check #{file} #{$1} #{tclfunc} #{dir}"
- #find_library($1, tclfunc, dir)
- tcllibs = append_library($libs, $1)
- $LIBPATH = libpath | [dir]
- try_func(tclfunc, tcllibs)
- end
- }
- tklib_ok = Dir.glob(File.join(dir, "*tk#{stub}#{tkconf['TK_MAJOR_VERSION']}{.,}#{tkconf['TK_MINOR_VERSION']}*.*")).find{|file|
- if file =~ /^.*(tk#{stub}#{tkconf['TK_MAJOR_VERSION']}(\.|)#{tkconf['TK_MINOR_VERSION']}.*)\.[^.]*$/
- #puts "check #{file} #{$1} #{tkfunc} #{dir}"
- # find_library($1, tkfunc, dir)
- tklibs = append_library(tcllibs, $1)
- $LIBPATH = libpath | [dir]
- try_func(tkfunc, tklibs)
- end
- }
- ensure
- $LIBPATH = libpath
- end
-
- unless tcllib_ok && tklib_ok
- puts "WARNIG: find #{tclpath.inspect}, but cannot find valid Tcl/Tk libraries on the same directory. So, ignore it."
- TkLib_Config["tcltk-NG-path"] << File.dirname(tclpath)
- next
- end
-
- #return [tclpath, tkpath]
- # print(" #{[tclpath, tkpath].inspect}");
- TkLib_Config["tclConfig_paths"] << [tclpath, tkpath]
- }
-
- # print("\n");
- }
-
- if TkLib_Config["tclConfig_paths"].empty?
- [nil, nil]
- else
- # find tclConfig.sh and tkConfig.sh
- TkLib_Config["tclConfig_info"], TkLib_Config["tkConfig_info"] = conf
- TkLib_Config["tclConfig_paths"][0]
- end
-end
-
-def get_tclConfig(tclConfig_file, tkConfig_file, tclConfig_dir, tkConfig_dir)
- use_tclConfig = (tclConfig_file != false) && (tkConfig_file != false) &&
- (tclConfig_dir != false) && (tkConfig_dir != false)
-
- unless use_tclConfig
- puts("Don't use [tclConfig.sh, tkConfig.sh]")
- return [nil, nil]
- end
-
- tclConfig_file = nil unless tclConfig_file.kind_of? String
- tkConfig_file = nil unless tkConfig_file.kind_of? String
- tclConfig_dir = nil unless tclConfig_dir.kind_of? String
- tkConfig_dir = nil unless tkConfig_dir.kind_of? String
-
- unless tclConfig_dir
- if tclConfig_file
- tclConfig_dir = File.dirname(tclConfig_file)
- elsif tkConfig_dir
- tclConfig_dir = tkConfig_dir
- end
- end
- unless tkConfig_dir
- if tkConfig_file
- tkConfig_dir = File.dirname(tkConfig_file)
- elsif tclConfig_dir
- tkConfig_dir = tclConfig_dir
- end
- end
- tkConfig_dir ||= tclConfig_dir
-
- TkLib_Config["tclConfig-file"] = tclConfig_file
- TkLib_Config["tkConfig-file"] = tkConfig_file
- TkLib_Config["tclConfig-dir"] = tclConfig_dir
- TkLib_Config["tkConfig-dir"] = tkConfig_dir
-
- print("Search tclConfig.sh and tkConfig.sh.")
- if tclConfig_dir
- tclConfig, tkConfig =
- search_tclConfig([ ((tclConfig_file)? tclConfig_file: tclConfig_dir),
- ((tkConfig_file)? tkConfig_file: tkConfig_dir) ])
- else
- tclConfig, tkConfig = search_tclConfig()
- end
- print("\n")
- # TclConfig_Info = TkLib_Config["tclConfig_info"]
- # TkConfig_Info = TkLib_Config["tkConfig_info"]
-
- if tclConfig && tkConfig
- dirs = TkLib_Config["tclConfig_paths"].map{|tclpath, tkpath|
- File.dirname(tclpath)
- }
- dirs |= dirs
- puts("Valid tclConfig.sh and tkConfig.sh are found in #{dirs.inspect}")
- puts("Use [tclConfig.sh,tkConfig.sh] == ['#{tclConfig}','#{tkConfig}']")
- $LIBPATH |= [File.dirname(tclConfig)]
- $LIBPATH |= [File.dirname(tkConfig)]
- #TkLib_Config["tclConfig_paths"].each{|tclcfg, tkcfg|
- # $LIBPATH |= [File.dirname(tclcfg)] | [File.dirname(tkcfg)]
- #}
- else
- puts("Fail to find [tclConfig.sh, tkConfig.sh]")
- end
-
- [tclConfig, tkConfig]
-end
-
-def check_NG_path(path_list)
- path_list.find_all{|path| not TkLib_Config["tcltk-NG-path"].include?(path) }
-end
-
-def check_shlib_search_path(paths)
- if !paths || paths.empty?
- path_list = []
-
- #if TkLib_Config["ActiveTcl"]
- # path_list.concat Dir.glob(TkLib_Config["ActiveTcl"]).sort.reverse
- #end
- if TkLib_Config["ActiveTcl"].kind_of?(String) # glob path
- path_list.concat Dir.glob(TkLib_Config["ActiveTcl"]).sort.reverse
- end
-
- vers = get_shlib_versions
- path_head, path_dirs = get_shlib_path_head
-
- path_list.concat vers.map{|ver|
- path_head.map{|head|
- if ver.empty?
- head + "/lib"
- else
- dirs = []
-
- if !Dir.glob(head + "-*").empty?
- dirs << head + "-#{ver}/lib" if !Dir.glob(head + "-[89].*").empty?
- dirs << head + "-#{ver.delete('.')}/lib" if !Dir.glob(head + "-[89][0-9]*").empty?
- end
-
- if !Dir.glob(head + "[_-]*").empty?
- dirs << head + "_#{ver}/lib" if !Dir.glob(head + "_[89].*").empty?
- dirs << head + "-#{ver}/lib" if !Dir.glob(head + "-[89].*").empty?
- dirs << head + "_#{ver.delete('.')}/lib" if !Dir.glob(head + "_[89][0-9]*").empty?
- dirs << head + "-#{ver.delete('.')}/lib" if !Dir.glob(head + "-[89][0-9]*").empty?
- end
-
- dirs
- end
- }
- }.flatten!
-
- path_list.concat path_dirs
-
- else
- # paths is a string with PATH environment style
- path_list = paths.split((is_win32?)? ';': ':')
- end
-
- path_list = check_NG_path(path_list)
+def find_tcl(tcllib, stubs, version, *opt_paths)
+ default_paths = ["/usr/local/lib", "/usr/pkg/lib", "/usr/lib"]
+ default_paths << "/Tcl/lib" # default for ActiveTcl
- if is_win32?
- # exist-dir only
- path_list.each{|path|
- path = path.strip; $LIBPATH |= [path] if File.directory?(path)
- }
- else
- path_list.each{|path| $LIBPATH |= [path.strip] }
+ if (paths = opt_paths.compact).empty?
+ paths = default_paths
end
-end
-
-def search_vers_on_path(vers, path, *heads)
- files = Dir.glob(File.join(path, "*{#{heads.join(',')}}*.{#{CONFIG['LIBEXT']},#{CONFIG['DLEXT']}}"))
- vers.find_all{|ver| files.find{|f| f =~ /(#{ver}|#{ver.delete('.')})/} }
-end
-
-def find_tcl(tcllib, stubs, version, *opt_paths)
- print "Search Tcl library"
if stubs
func = "Tcl_InitStubs"
@@ -745,104 +113,37 @@ def find_tcl(tcllib, stubs, version, *opt_paths)
if version && ! version.empty?
versions = [version]
else
- versions = TkLib_Config['search_versions']
+ versions = %w[8.6 8.5 8.4 8.3 8.2 8.1 8.0 7.6]
end
- default_paths = []
-
- default_paths.concat [
- RbConfig::CONFIG['libdir'],
- File.join(RbConfig::CONFIG['exec_prefix'], 'lib'),
- File.join(RbConfig::CONFIG['prefix'], 'lib'),
- "/usr/local/lib", "/usr/pkg/lib", "/usr/contrib/lib", "/usr/lib"
- ].find_all{|dir| File.directory?(dir)}
-
- default_paths.concat [
- "c:/Tcl/lib", "c:/Program Files/Tcl/lib",
- "/Tcl/lib", "/Program Files/Tcl/lib"
- ].find_all{|dir| File.directory?(dir)}
-
- unless TkLib_Config["space-on-tk-libpath"]
- default_paths.delete_if{|path| path =~ / /}
+ if tcllib
+ st = find_library(tcllib, func, *paths)
+ else
+ st = versions.find { |ver|
+ find_library("#{lib}#{ver}", func, *paths) or
+ find_library("#{lib}#{ver.delete('.')}", func, *paths) or
+ find_library("#{lib}#{ver}g", func, *paths) or
+ find_library("#{lib}#{ver.delete('.')}g", func, *paths) or
+ find_library("tcl#{ver}", func, *paths) or
+ find_library("tcl#{ver.delete('.')}", func, *paths) or
+ find_library("tcl#{ver}g", func, *paths) or
+ find_library("tcl#{ver.delete('.')}g", func, *paths)
+ } || (!version && find_library(lib, func, *paths))
end
- if (paths = opt_paths.compact).empty?
- unless TclConfig_Info['config_file_path']
- paths = check_NG_path(default_paths)
-
- else
- # use definisions on tclConfig.sh
- TclConfig_Info['TCL_LIB_SPEC'].sub(TclConfig_Info['TCL_LIB_FLAG'],"").strip.sub("-L","") =~ /("|'|)([^"']+)\1/
- $LIBPATH |= [$2] unless $2.empty?
-
- if stubs
- if TclConfig_Info['TCL_SUPPORTS_STUBS'] == '0' ||
- TclConfig_Info['TCL_STUB_LIB_SPEC'].strip.empty?
- print(".\n") # progress
- puts "#{TclConfig_Info['config_file_path']} tells us that your Tcl/Tk library doesn't support stub."
- return false
- else
- #*** Probably, TCL_LIBS is a subset of TK_LIBS. ***
- unless is_win32? # ignore tclConfig on Windows
- # $LDFLAGS << ' ' << TclConfig_Info['TCL_LIBS']
- # $DLDFLAGS << ' ' << TclConfig_Info['TCL_LIBS']
- $LDFLAGS << ' ' << TclConfig_Info['TCL_STUB_LIB_SPEC']
- end
- end
- else
- #*** Probably, TCL_LIBS is a subset of TK_LIBS. ***
- unless is_win32? # ignore tclConfig on Windows
- # $LDFLAGS << ' ' << TclConfig_Info['TCL_LIBS']
- # $DLDFLAGS << ' ' << TclConfig_Info['TCL_LIBS']
- $LDFLAGS << ' ' << TclConfig_Info['TCL_LIB_SPEC']
- end
- end
-
- paths = [File.dirname(TclConfig_Info['config_file_path'])]
- versions = [TclConfig_Info['TCL_VERSION']]
- end
+ unless st
+ puts("Warning:: cannot find Tcl library. tcltklib will not be compiled (tcltklib is disabled on your Ruby == Ruby/Tk will not work). Please check configure options.")
end
-
- ret = paths.map{|path|
- if tcllib
- print(".")
- [path, find_library(tcllib, func, path)]
- else
- st = search_vers_on_path(versions, path, lib, 'tcl').find{|ver|
- (print(".");find_library("#{lib}#{ver}", func, path)) or
- (print(".");find_library("#{lib}#{ver.delete('.')}", func, path)) or
- (print(".");find_library("#{lib}#{ver}g", func, path)) or
- (print(".");find_library("#{lib}#{ver.delete('.')}g", func, path)) or
- (print(".");find_library("tcl#{ver}", func, path)) or
- (print(".");find_library("tcl#{ver.delete('.')}", func, path)) or
- (print(".");find_library("tcl#{ver}g", func, path)) or
- (print(".");find_library("tcl#{ver.delete('.')}g", func, path))
- } || (!version && (print(".");find_library(lib, func, path)))
- [path, st]
- end
- }
-
- print("\n") # progress
- ret
-end
-
-def parse_TK_LIBS(tklibs)
- sfx = "lib|shlib|dll|so"
- re = /(("|')[^"']+\.(#{sfx})\2|[^"' ]+\.(#{sfx})|-l("|')[^"']+\5|-l[^" ]+)/#'
-
- tklibs.scan(re).map{|lib,|
- if lib =~ /^("|')([^"]+)\.(#{sfx})\1/
- "\"-l#{$2}\""
- elsif lib =~ /([^" ]+)\.(#{sfx})/
- "-l#{$1}"
- else
- lib
- end
- }.join(' ')
+ st
end
def find_tk(tklib, stubs, version, *opt_paths)
- print "Search Tk library"
+ default_paths = ["/usr/local/lib", "/usr/pkg/lib", "/usr/lib"]
+ default_paths << "/Tcl/lib" # default for ActiveTcl
+
+ if (paths = opt_paths.compact).empty?
+ paths = default_paths
+ end
if stubs
func = "Tk_InitStubs"
@@ -855,231 +156,40 @@ def find_tk(tklib, stubs, version, *opt_paths)
if version && ! version.empty?
versions = [version]
else
- versions = TkLib_Config['search_versions']
- end
-
- default_paths = []
-
- default_paths.concat [
- RbConfig::CONFIG['libdir'],
- File.join(RbConfig::CONFIG['exec_prefix'], 'lib'),
- File.join(RbConfig::CONFIG['prefix'], 'lib'),
- "/usr/local/lib", "/usr/pkg/lib", "/usr/contrib/lib", "/usr/lib"
- ].find_all{|dir| File.directory?(dir)}
-
- default_paths.concat [
- "c:/Tcl/lib", "c:/Program Files/Tcl/lib",
- "/Tcl/lib", "/Program Files/Tcl/lib"
- ].find_all{|dir| File.directory?(dir)}
-
- unless TkLib_Config["space-on-tk-libpath"]
- default_paths.delete_if{|path| path =~ / /}
- end
-
- if (paths = opt_paths.compact).empty?
- unless TkConfig_Info['config_file_path']
- paths = check_NG_path(default_paths)
-
- else
- # use definisions on tkConfig.sh
- TkConfig_Info['TK_LIB_SPEC'].sub(TkConfig_Info['TK_LIB_FLAG'],"").strip.sub("-L","") =~ /("|'|)([^"']+)\1/
- $LIBPATH |= [$2] unless $2.empty?
-
- if stubs
- if TkConfig_Info['TK_STUB_LIB_SPEC'].strip.empty?
- print(".\n") # progress
- puts "#{TkConfig_Info['config_file_path']} tells us that your Tcl/Tk library doesn't support stub."
- return false
- else
- unless is_win32? # ignore tclConfig on Windows
- # $LDFLAGS << ' ' << parse_TK_LIBS(TkConfig_Info['TK_LIBS'])
- $LDFLAGS << ' ' << TkConfig_Info['TK_LIBS']
- # $DLDFLAGS << ' ' << parse_TK_LIBS(TkConfig_Info['TK_LIBS'])
- $LDFLAGS << ' ' << TkConfig_Info['TK_STUB_LIB_SPEC']
- end
- end
- else
- unless is_win32? # ignore tclConfig on Windows
- # $LDFLAGS << ' ' << parse_TK_LIBS(TkConfig_Info['TK_LIBS'])
- $LDFLAGS << ' ' << TkConfig_Info['TK_LIBS'] unless is_win32?
- # $DLDFLAGS << ' ' << parse_TK_LIBS(TkConfig_Info['TK_LIBS'])
- $LDFLAGS << ' ' << TkConfig_Info['TK_LIB_SPEC'] unless is_win32?
- end
- end
-
- paths = [File.dirname(TkConfig_Info['config_file_path'])]
- versions = [TkConfig_Info['TK_VERSION']]
- end
+ versions = %w[8.6 8.5 8.4 8.3 8.2 8.1 8.0 4.2]
end
- ret = paths.map{|path|
- if tklib
- print(".")
- [path, find_library(tklib, func, path)]
- else
- st = search_vers_on_path(versions, path, lib, 'tk').find{|ver|
- (print(".");find_library("#{lib}#{ver}", func, path)) or
- (print(".");find_library("#{lib}#{ver.delete('.')}", func, path)) or
- (print(".");find_library("#{lib}#{ver}g", func, path)) or
- (print(".");find_library("#{lib}#{ver.delete('.')}g", func, path)) or
- (print(".");find_library("tk#{ver}", func, path)) or
- (print(".");find_library("tk#{ver.delete('.')}", func, path)) or
- (print(".");find_library("tk#{ver}g", func, path)) or
- (print(".");find_library("tk#{ver.delete('.')}g", func, path))
- } || (!version && (print(".");find_library(lib, func, path)))
- [path, st]
- end
- }
-
- print("\n") # progress
- ret
-end
-
-def find_tcltk_library(tcllib, tklib, stubs, tclversion, tkversion,
- tcl_opt_paths, tk_opt_paths)
- ret = find_tcl(tcllib, stubs, tclversion, *tcl_opt_paths)
- unless ret && ret.find{|path, val| val}
- puts("Warning:: cannot find Tcl library. tcltklib will not be compiled (tcltklib is disabled on your Ruby == Ruby/Tk will not work). Please check configure options.")
- return false
- end
-
- ret = find_tk(tklib, stubs, tkversion, *tk_opt_paths)
- unless ret && ret.find{|path, val| val}
- puts("Warning:: cannot find Tk library. tcltklib will not be compiled (tcltklib is disabled on your Ruby == Ruby/Tk will not work). Please check configure options.")
- return false
- end
-
- true
-end
-
-def find_tcltk_header(tclver, tkver)
- base_dir = []
-
- base_dir.concat [
- File.join(RbConfig::CONFIG['prefix'], 'include'),
- "/usr/local/include", "/usr/pkg/include", "/usr/contrib/include",
- "/usr/include"
- ].find_all{|dir| File.directory?(dir)}
-
- base_dir.concat [
- "c:/Tcl/include", "c:/Program Files/Tcl/include",
- "/Tcl/include", "/Program Files/Tcl/include"
- ].find_all{|dir| File.directory?(dir)}
-
- unless TkLib_Config["space-on-tk-libpath"]
- base_dir.delete_if{|path| path =~ / /}
- end
-
- if TclConfig_Info['TCL_INCLUDE_SPEC'] &&
- have_tcl_h = try_cpp('tcl.h', TclConfig_Info['TCL_INCLUDE_SPEC'])
- $INCFLAGS << " " << TclConfig_Info['TCL_INCLUDE_SPEC']
- elsif have_tcl_h = have_header('tcl.h')
- # find
- else
- if tclver && ! tclver.empty?
- versions = [tclver]
- else
- versions = TkLib_Config['search_versions']
- end
- paths = base_dir.dup
- versions.each{|ver|
- paths.concat(base_dir.map{|dir|
- [dir + '/tcl' + ver, dir + '/tcl' + ver.delete('.')]
- }.flatten)
- }
- have_tcl_h = find_header('tcl.h', *paths)
- end
-
- if TkConfig_Info['TK_INCLUDE_SPEC'] &&
- have_tk_h = try_cpp('tk.h', TclConfig_Info['TK_INCLUDE_SPEC'])
- $INCFLAGS << " " << TkConfig_Info['TK_INCLUDE_SPEC']
- elsif have_tk_h = have_header('tk.h')
- # find
- else
- if tkver && ! tkver.empty?
- versions = [tkver]
- else
- versions = TkLib_Config['search_versions']
- end
- paths = base_dir.dup
- versions.each{|ver|
- paths.concat(base_dir.map{|dir|
- [dir + '/tk' + ver, dir + '/tk' + ver.delete('.')]
- }.flatten)
- }
- have_tk_h = find_header('tk.h', *paths)
- end
-
- have_tcl_h && have_tk_h
-end
-
-def setup_for_macosx_framework
- # search directory of header files
- if File.exist?(dir = File.join(TkLib_Config["tcltk-framework"],
- 'Tcl.framework', 'Headers'))
- TclConfig_Info['TCL_INCLUDE_SPEC'] = "-I#{dir} "
- TclConfig_Info['TK_INCLUDE_SPEC'] = "-I#{File.join(TkLib_Config['tcltk-framework'], 'Tk.framework', 'Headers')} "
+ if tklib
+ st = find_library(tklib, func, *paths)
else
- dir = Dir.glob(File.join(TkLib_Config["tcltk-framework"],
- 'Tcl.framework', '*', 'Headers'))
- TclConfig_Info['TCL_INCLUDE_SPEC'] = "-I#{dir[0]} " unless dir.empty?
- TclConfig_Info['TK_INCLUDE_SPEC'] = "-I#{Dir.glob(File.join(TkLib_Config['tcltk-framework'], 'Tk.framework', '*', 'Headers'))[0]} "
+ st = versions.find { |ver|
+ find_library("#{lib}#{ver}", func, *paths) or
+ find_library("#{lib}#{ver.delete('.')}", func, *paths) or
+ find_library("#{lib}#{ver}g", func, *paths) or
+ find_library("#{lib}#{ver.delete('.')}g", func, *paths) or
+ find_library("tk#{ver}", func, *paths) or
+ find_library("tk#{ver.delete('.')}", func, *paths) or
+ find_library("tk#{ver}g", func, *paths) or
+ find_library("tk#{ver.delete('.')}g", func, *paths)
+ } || (!version && find_library(lib, func, *paths))
end
- $LDFLAGS << ' -framework Tk -framework Tcl'
-
- if TkLib_Config["tcl-framework-header"]
- TclConfig_Info['TCL_INCLUDE_SPEC'] =
- "-I#{TkLib_Config["tcl-framework-header"]} "
- end
- if TkLib_Config["tk-framework-header"]
- TkConfig_Info['TK_INCLUDE_SPEC'] =
- "-I#{TkLib_Config["tk-framework-header"]} "
+ unless st
+ puts("Warning:: cannot find Tk library. tcltklib will not be compiled (tcltklib is disabled on your Ruby == Ruby/Tk will not work). Please check configure options.")
end
+ st
end
def find_X11(*opt_paths)
- defaults =
- [ "/usr/X11*/lib", "/usr/lib/X11*", "/usr/local/X11*", "/usr/openwin/lib" ]
- paths = []
- opt_paths.compact.each{|path| paths.concat(Dir.glob(path.strip.chomp('/')))}
- defaults.compact.each{|path| paths.concat(Dir.glob(path.strip.chomp('/')))}
+ default_paths =
+ [ "/usr/X11/lib", "/usr/lib/X11", "/usr/X11R6/lib", "/usr/openwin/lib" ]
+ paths = opt_paths.compact.concat(default_paths)
st = find_library("X11", "XOpenDisplay", *paths)
unless st
puts("Warning:: cannot find X11 library. tcltklib will not be compiled (tcltklib is disabled on your Ruby == Ruby/Tk will not work). Please check configure options. If your Tcl/Tk don't require X11, please try --without-X11.")
end
st
-end
-
-def search_X_libraries
- if TkConfig_Info['config_file_path']
- # use definitions on tkConfig.sh
- if TkConfig_Info['TK_XINCLUDES'] && TkConfig_Info['TK_XLIBSW'] &&
- !TkConfig_Info['TK_XINCLUDES'].strip.empty? &&
- !TkConfig_Info['TK_XLIBSW'].strip.empty?
- #use_X = true && with_config("X11", ! is_win32?)
- use_X = with_config("X11", true)
- else
- #use_X = false || with_config("X11", false)
- use_X = with_config("X11", false)
- end
- else
- # depend on configure options
- use_X = with_config("X11", !(is_win32? || TkLib_Config["tcltk-framework"]))
- end
-
- if use_X
- puts("Use X11 libraries.")
- x11_idir, x11_ldir = dir_config("X11")
- x11_ldir2 = with_config("X11-lib")
- unless find_X11(x11_ldir2, x11_ldir)
- puts("Can't find X11 libraries. So, can't make tcltklib.so which is required by Ruby/Tk.")
- exit
- end
- end
-
- use_X
-end
+end
def pthread_check()
tcl_major_ver = nil
@@ -1095,36 +205,60 @@ def pthread_check()
tcl_enable_thread = nil
end
- if TclConfig_Info['config_file_path']
+ if (tclConfig = with_config("tclConfig-file"))
if tcl_enable_thread == true
- puts("Warning: definiton of tclConfig.sh is ignored, because --enable-tcl-thread option is given.")
+ puts("Warning: --with-tclConfig-file option is ignored, because --enable-tcl-thread option is given.")
elsif tcl_enable_thread == false
- puts("Warning: definition of tclConfig.sh is ignored, because --disable-tcl-thread option is given.")
+ puts("Warning: --with-tclConfig-file option is ignored, because --disable-tcl-thread option is given.")
else
# tcl-thread is unknown and tclConfig.sh is given
- if TclConfig_Info['TCL_THREADS']
- tcl_enable_thread = (TclConfig_Info['TCL_THREADS'] == "1")
- else
- tcl_major_ver = TclConfig_Info['TCL_MAJOR_VERSION'].to_i
- tcl_minor_ver = TclConfig_Info['TCL_MINOR_VERSION'].to_i
- if tcl_major_ver < 8 || (tcl_major_ver == 8 && tcl_minor_ver == 0)
- tcl_enable_thread = false
+ begin
+ open(tclConfig, "r") do |cfg|
+ while line = cfg.gets()
+ if line =~ /^\s*TCL_THREADS=(0|1)/
+ tcl_enable_thread = ($1 == "1")
+ break
+ end
+
+ if line =~ /^\s*TCL_MAJOR_VERSION=("|')(\d+)\1/
+ tcl_major_ver = $2
+ if tcl_major_ver =~ /^[1-7]$/
+ tcl_enable_thread = false
+ break
+ end
+ if tcl_major_ver == "8" && tcl_minor_ver == "0"
+ tcl_enable_thread = false
+ break
+ end
+ end
+
+ if line =~ /^\s*TCL_MINOR_VERSION=("|')(\d+)\1/
+ tcl_minor_ver = $2
+ if tcl_major_ver == "8" && tcl_minor_ver == "0"
+ tcl_enable_thread = false
+ break
+ end
+ end
+ end
end
- end
- if tcl_enable_thread == nil
- # cannot find definition
- if tcl_major_ver
- puts("Warning: '#{TclConfig_Info['config_file_path']}' doesn't include TCL_THREADS definition.")
- else
- puts("Warning: '#{TclConfig_Info['config_file_path']}' may not be a tclConfig file.")
+ if tcl_enable_thread == nil
+ # not find definition
+ if tcl_major_ver
+ puts("Warning: '#{tclConfig}' doesn't include TCL_THREADS definition.")
+ else
+ puts("Warning: '#{tclConfig}' may not be a tclConfig file.")
+ end
+ tclConfig = false
end
+ rescue Exception
+ puts("Warning: fail to read '#{tclConfig}'!! --> ignore the file")
tclConfig = false
end
end
end
- if tcl_enable_thread == nil && !TclConfig_Info['config_file_path']
+ if tcl_enable_thread == nil && !tclConfig
# tcl-thread is unknown and tclConfig is unavailable
begin
try_run_available = try_run("int main() { exit(0); }")
@@ -1133,12 +267,12 @@ def pthread_check()
puts(%Q'\
*****************************************************************************
**
-** NATIVETHREAD SUPPORT CHECK WARNING:
+** PTHREAD SUPPORT CHECK WARNING:
**
-** We cannot check the consistency of nativethread support between
-** Ruby and the Tcl/Tk library in your environment (are you perhaps
-** cross-compiling?). If nativethread support for these 2 packages
-** is inconsistent you may find you get errors when running Ruby/Tk
+** We cannot check the consistency of pthread support between Ruby
+** and the Tcl/Tk library in your environment (are you perhaps
+** cross-compiling?). If pthread support for these 2 packages is
+** inconsistent you may find you get errors when running Ruby/Tk
** (e.g. hangs or segmentation faults). We strongly recommend
** you to check the consistency manually.
**
@@ -1152,7 +286,7 @@ def pthread_check()
# tcl-thread is unknown
if try_run(<<EOF)
#include <tcl.h>
-int main() {
+int main() {
Tcl_Interp *ip;
ip = Tcl_CreateInterp();
exit((Tcl_Eval(ip, "set tcl_platform(threaded)") == TCL_OK)? 0: 1);
@@ -1171,27 +305,26 @@ EOF
end
# check pthread mode
- if (TkLib_Config["ruby_with_thread"])
+ if (macro_defined?('HAVE_NATIVETHREAD', '#include "ruby.h"'))
# ruby -> enable
unless tcl_enable_thread
# ruby -> enable && tcl -> disable
puts(%Q'\
*****************************************************************************
**
-** NATIVETHREAD SUPPORT MODE WARNING:
+** PTHREAD SUPPORT MODE WARNING:
**
-** Ruby is compiled with --enable-pthread, but your Tcl/Tk library
-** seems to be compiled without nativethread support. Although you can
-** create the tcltklib library, this combination may cause errors (e.g.
-** hangs or segmentation faults). If you have no reason to keep the
-** current nativethread support status, we recommend you reconfigure and
-** recompile the libraries so that both or neither support nativethreads.
+** Ruby is compiled with --enable-pthread, but your Tcl/Tk library
+** seems to be compiled without pthread support. Although you can
+** create the tcltklib library, this combination may cause errors
+** (e.g. hangs or segmentation faults). If you have no reason to
+** keep the current pthread support status, we recommend you reconfigure
+** and recompile the libraries so that both or neither support pthreads.
**
-** If you want change the status of nativethread support, please recompile
-** Ruby without "--enable-pthread" configure option (If you use Ruby 1.9.x
-** or later, you cannot remove this option, because it requires native-
-** thread support.) or recompile Tcl/Tk with "--enable-threads" configure
-** option (if your Tcl/Tk is later than or equal to Tcl/Tk 8.1).
+** If you want change the status of pthread support, please recompile
+** Ruby without "--enable-pthread" configure option or recompile Tcl/Tk
+** with "--enable-threads" configure option (if your Tcl/Tk is later
+** than or equal to Tcl/Tk 8.1).
**
*****************************************************************************
')
@@ -1213,13 +346,13 @@ EOF
puts(%Q'\
*****************************************************************************
**
-** NATIVETHREAD SUPPORT MODE ERROR:
+** PTHREAD SUPPORT MODE ERROR:
**
-** Ruby is not compiled with --enable-pthread, but your Tcl/Tk
-** library seems to be compiled with nativethread support. This
+** Ruby is not compiled with --enable-pthread, but your Tcl/Tk
+** library seems to be compiled with pthread support. This
** combination may cause frequent hang or segmentation fault
** errors when Ruby/Tk is working. We recommend that you NEVER
-** create the library with such a combination of nativethread support.
+** create the library with such a combination of pthread support.
**
** Please recompile Ruby with the "--enable-pthread" configure option
** or recompile Tcl/Tk with the "--disable-threads" configure option.
@@ -1236,166 +369,44 @@ EOF
end
end
-##############################################################
-# main
-##############################################################
-# check header file
-print("check functions.")
-have_func("ruby_native_thread_p", "ruby.h")
-print(".") # progress
-have_func("rb_errinfo", "ruby.h")
-print(".") # progress
-have_func("rb_safe_level", "ruby.h")
-print(".") # progress
-have_func("rb_hash_lookup", "ruby.h")
-print(".") # progress
-have_func("rb_proc_new", "ruby.h")
-print(".") # progress
-have_func("rb_obj_untrust", "ruby.h")
-print(".") # progress
-have_func("rb_obj_taint", "ruby.h")
-print(".") # progress
-have_func("rb_set_safe_level_force", "ruby.h")
-print("\n") # progress
-
-print("check struct members.")
-have_struct_member("struct RArray", "ptr", "ruby.h")
-print(".") # progress
-have_struct_member("struct RArray", "len", "ruby.h")
-print("\n") # progress
-
-# check libraries
-unless is_win32?
- print("check libraries.")
- have_library("nsl", "t_open")
- print(".") # progress
- have_library("socket", "socket")
- print(".") # progress
- have_library("dl", "dlopen")
- print(".") # progress
- have_library("m", "log")
- print("\n") # progress
-end
-$CPPFLAGS += ' -D_WIN32' if /cygwin/ =~ RUBY_PLATFORM
-
-# Does ruby have nativethread ?
-TkLib_Config["ruby_with_thread"] =
- macro_defined?('HAVE_NATIVETHREAD', '#include "ruby.h"')
-
+tclver, tkver = check_tcltk_version(tcltk_version)
-#---------------------------------------------------
-# check requirement of Tcl/tk version
-tcltk_version = with_config("tcltkversion")
-tclver, tkver =
- TkLib_Config["tcltkversion"] = check_tcltk_version(tcltk_version)
-puts("Specified Tcl/Tk version is #{[tclver, tkver].inspect}") if tclver&&tkver
+if have_header("tcl.h") && have_header("tk.h") &&
+ ( tcltk_framework ||
+ ( ( !use_X || find_X11(x11_ldir2, x11_ldir) ) &&
+ find_tcl(tcllib, stubs, tclver, *tcl_ldir_list) &&
+ find_tk(tklib, stubs, tkver, *tk_ldir_list) ) )
+ $CPPFLAGS += ' -DUSE_TCL_STUBS -DUSE_TK_STUBS' if stubs
+ $CPPFLAGS += ' -D_WIN32' if /cygwin/ =~ RUBY_PLATFORM
-# use ActiveTcl ?
-#if activeTcl = with_config("ActiveTcl")
-if activeTcl = with_config("ActiveTcl", true)
- puts("Use ActiveTcl libraries (if available).")
- activeTcl = '/opt/ActiveTcl*/lib' unless activeTcl.kind_of? String
-end
-TkLib_Config["ActiveTcl"] = activeTcl
+ if tcltk_framework
+ if tcl_framework_header
+ $CPPFLAGS += " -I#{tcl_framework_header}"
+ else
+ $CPPFLAGS += " -I#{tcltk_framework}/Tcl.framework/Headers"
+ end
-# allow space chars on a libpath
-TkLib_Config["space-on-tk-libpath"] =
- enable_config("space-on-tk-libpath", ! is_win32?)
+ if tk_framework_header
+ $CPPFLAGS += " -I#{tk_framework_header}"
+ else
+ $CPPFLAGS += " -I#{tcltk_framework}/Tk.framework/Headers"
+ end
-# enable Tcl/Tk stubs?
-=begin
-if TclConfig_Info['TCL_STUB_LIB_SPEC'] && TkConfig_Info['TK_STUB_LIB_SPEC'] &&
- !TclConfig_Info['TCL_STUB_LIB_SPEC'].strip.empty? &&
- !TkConfig_Info['TK_STUB_LIB_SPEC'].strip.empty?
- stubs = true
- unless (st = enable_config("tcltk-stubs")).nil?
- stubs &&= st
- end
- unless (st = with_config("tcltk-stubs")).nil?
- stubs &&= st
+ $LDFLAGS += ' -framework Tk -framework Tcl'
end
-else
- stubs = enable_config("tcltk-stubs") || with_config("tcltk-stubs")
-end
-=end
-stubs = enable_config("tcltk-stubs") || with_config("tcltk-stubs")
-if (TkLib_Config["tcltk-stubs"] = stubs)
- puts("Compile with Tcl/Tk stubs.")
- $CPPFLAGS += ' -DUSE_TCL_STUBS -DUSE_TK_STUBS'
-end
-# directory configuration of Tcl/Tk libraries
-tk_idir, tk_ldir = dir_config("tk")
-tcl_idir, tcl_ldir = dir_config("tcl")
-
-tcl_idir = tk_idir unless tcl_idir
-tcl_ldir = tk_ldir unless tcl_ldir
-tk_idir = tcl_idir unless tk_idir
-tk_ldir = tcl_ldir unless tk_ldir
-
-# get tclConfig.sh/tkConfig.sh
-TkLib_Config["tcltk-NG-path"] = []
-tclcfg, tkcfg = get_tclConfig(with_config("tclConfig-file", true),
- with_config("tkConfig-file", true),
- with_config("tclConfig-dir", tcl_ldir || true),
- with_config("tkConfig-dir", tk_ldir || true))
-TclConfig_Info = TkLib_Config["tclConfig_info"] || {}
-TkConfig_Info = TkLib_Config["tkConfig_info"] || {}
-TclConfig_Info['config_file_path'] = tclcfg
-TkConfig_Info['config_file_path'] = tkcfg
-
-TclConfig_Info['TCL_INCLUDE_SPEC'] = "-I#{tcl_idir.quote}" if tcl_idir
-TkConfig_Info['TK_INCLUDE_SPEC'] = "-I#{tk_idir.quote}" if tk_idir
-
-tk_cfg_dir = File.dirname(TkConfig_Info['config_file_path']) rescue nil
-tcl_cfg_dir = File.dirname(TclConfig_Info['config_file_path']) rescue nil
+ if stubs or pthread_check
+ # create Makefile
-tk_ldir_list = [tk_ldir, tk_cfg_dir]
-tcl_ldir_list = [tcl_ldir, tcl_cfg_dir]
+ # for SUPPORT_STATUS
+ $INSTALLFILES ||= []
+ $INSTALLFILES << ["lib/tkextlib/SUPPORT_STATUS", "$(RUBYLIBDIR)", "lib"]
+ have_func("rb_hash_lookup", "ruby.h")
-# check tk_shlib_search_path
-check_shlib_search_path(with_config('tk-shlib-search-path'))
-
-# set TCL_DEFS and TK_DEFS
-# $CPPFLAGS += " #{TclConfig_Info['TCL_DEFS']}"
-# $CPPFLAGS += " #{TkConfig_Info['TK_DEFS']}"
-$CPPFLAGS += collect_tcltk_defs(TclConfig_Info['TCL_DEFS'], TkConfig_Info['TK_DEFS'])
-
-# MacOS X Frameworks?
-if TkLib_Config["tcltk-framework"]
- puts("Use MacOS X Frameworks.")
- setup_for_macosx_framework
-end
-
-# name of Tcl/Tk libraries
-tklib = with_config("tklib")
-tcllib = with_config("tcllib")
-
-# search X libraries
-use_X = search_X_libraries
-
-
-#---------------------------------------------------
-
-if (TkLib_Config["tcltk-framework"] ||
- ( find_tcltk_header(tclver, tkver) &&
- find_tcltk_library(tcllib, tklib, stubs, tclver, tkver,
- tcl_ldir_list, tk_ldir_list) ) ) &&
- (stubs || pthread_check())
- # create Makefile
-
- # for SUPPORT_STATUS
- $INSTALLFILES ||= []
- $INSTALLFILES << ["lib/tkextlib/SUPPORT_STATUS", "$(RUBYLIBDIR)", "lib"]
-
- # create
- $defs << %[-DRUBY_VERSION=\\"#{RUBY_VERSION}\\"]
- $defs << %[-DRUBY_RELEASE_DATE=\\"#{RUBY_RELEASE_DATE}\\"]
-
- create_makefile("tcltklib")
-
- puts "Find Tcl/Tk libraries. Make tcltklib.so which is required by Ruby/Tk."
-else
- puts "Can't find proper Tcl/Tk libraries. So, can't make tcltklib.so which is required by Ruby/Tk."
+ # create
+ $defs << %[-DRUBY_VERSION=\\"#{RUBY_VERSION}\\"]
+ $defs << %[-DRUBY_RELEASE_DATE=\\"#{RUBY_RELEASE_DATE}\\"]
+ create_makefile("tcltklib")
+ end
end
diff --git a/ext/tk/lib/multi-tk.rb b/ext/tk/lib/multi-tk.rb
index dc8a31e2e8..ec718678f0 100644
--- a/ext/tk/lib/multi-tk.rb
+++ b/ext/tk/lib/multi-tk.rb
@@ -28,20 +28,14 @@ class << TclTkIp
if Thread.current.group != ThreadGroup::Default
raise SecurityError, 'only ThreadGroup::Default can call TclTkIp.new'
end
- obj = __new__(*args)
- obj.instance_eval{
- @force_default_encoding ||= TkUtil.untrust([false])
- @encoding ||= TkUtil.untrust([nil])
- def @encoding.to_s; self.join(nil); end
- }
- obj
+ __new__(*args)
end
end
################################################
# use pseudo-toplevel feature of MultiTkIp ?
-if (!defined?(Use_PseudoToplevel_Feature_of_MultiTkIp) ||
+if (!defined?(Use_PseudoToplevel_Feature_of_MultiTkIp) ||
Use_PseudoToplevel_Feature_of_MultiTkIp)
module MultiTkIp_PseudoToplevel_Evaluable
#def pseudo_toplevel_eval(body = Proc.new)
@@ -73,9 +67,9 @@ if (!defined?(Use_PseudoToplevel_Feature_of_MultiTkIp) ||
def method_missing(id, *args)
begin
- has_top = (top = MultiTkIp.__getip.__pseudo_toplevel) &&
- top.respond_to?(:pseudo_toplevel_evaluable?) &&
- top.pseudo_toplevel_evaluable? &&
+ has_top = (top = MultiTkIp.__getip.__pseudo_toplevel) &&
+ top.respond_to?(:pseudo_toplevel_evaluable?) &&
+ top.pseudo_toplevel_evaluable? &&
top.respond_to?(id)
rescue Exception => e
has_top = false
@@ -118,58 +112,36 @@ MultiTkIp_OK.freeze
################################################
# methods for construction
class MultiTkIp
- class Command_Queue < Queue
- def initialize(interp)
- @interp = interp
- super()
- end
-
- def push(value)
- if !@interp || @interp.deleted?
- fail RuntimeError, "Tk interpreter is already deleted"
- end
- super(value)
- end
- alias << push
- alias enq push
-
- def close
- @interp = nil
- end
- end
- Command_Queue.freeze
-
BASE_DIR = File.dirname(__FILE__)
- WITH_RUBY_VM = Object.const_defined?(:RubyVM) && ::RubyVM.class == Class
- WITH_ENCODING = defined?(::Encoding.default_external)
- #WITH_ENCODING = Object.const_defined?(:Encoding) && ::Encoding.class == Class
+ WITH_RUBY_VM = Object.const_defined?(:VM) && ::VM.class == Class
+ WITH_ENCODING = Object.const_defined?(:Encoding) && ::Encoding.class == Class
- (@@SLAVE_IP_ID = ['slave'.freeze, TkUtil.untrust('0')]).instance_eval{
+ (@@SLAVE_IP_ID = ['slave'.freeze, '0'.taint]).instance_eval{
@mutex = Mutex.new
def mutex; @mutex; end
freeze
}
- @@IP_TABLE = TkUtil.untrust({}) unless defined?(@@IP_TABLE)
+ @@IP_TABLE = {}.taint unless defined?(@@IP_TABLE)
- @@INIT_IP_ENV = TkUtil.untrust([]) unless defined?(@@INIT_IP_ENV) # table of Procs
- @@ADD_TK_PROCS = TkUtil.untrust([]) unless defined?(@@ADD_TK_PROCS) # table of [name, args, body]
+ @@INIT_IP_ENV = [].taint unless defined?(@@INIT_IP_ENV) # table of Procs
+ @@ADD_TK_PROCS = [].taint unless defined?(@@ADD_TK_PROCS) # table of [name, args, body]
- @@TK_TABLE_LIST = TkUtil.untrust([]) unless defined?(@@TK_TABLE_LIST)
+ @@TK_TABLE_LIST = [].taint unless defined?(@@TK_TABLE_LIST)
unless defined?(@@TK_CMD_TBL)
- @@TK_CMD_TBL = TkUtil.untrust(Object.new)
+ @@TK_CMD_TBL = Object.new.taint
# @@TK_CMD_TBL.instance_variable_set('@tbl', {}.taint)
- tbl_obj = TkUtil.untrust(Hash.new{|hash,key|
- fail IndexError, "unknown command ID '#{key}'"
- })
- @@TK_CMD_TBL.instance_variable_set('@tbl', tbl_obj)
+ @@TK_CMD_TBL.instance_variable_set('@tbl', Hash.new{|hash,key|
+ fail IndexError,
+ "unknown command ID '#{key}'"
+ }.taint)
class << @@TK_CMD_TBL
allow = [
- '__send__', '__id__', 'freeze', 'inspect', 'kind_of?', 'object_id',
+ '__send__', '__id__', 'freeze', 'inspect', 'kind_of?', 'object_id',
'[]', '[]=', 'delete', 'each', 'has_key?'
]
instance_methods.each{|m| undef_method(m) unless allow.index(m.to_s)}
@@ -208,7 +180,7 @@ class MultiTkIp
def delete(idx, &blk)
# if gets an entry, is permited to delete
if self[idx]
- @tbl.delete(idx)
+ @tbl.delete(idx)
elsif blk
blk.call(idx)
else
@@ -244,10 +216,7 @@ class MultiTkIp
@@CB_ENTRY_CLASS = Class.new(TkCallbackEntry){
def initialize(ip, cmd)
@ip = ip
- @safe = safe = $SAFE
- # @cmd = cmd
- cmd = MultiTkIp._proc_on_safelevel(&cmd)
- @cmd = proc{|*args| cmd.call(safe, *args)}
+ @cmd = cmd
self.freeze
end
attr_reader :ip, :cmd
@@ -257,8 +226,8 @@ class MultiTkIp
def call(*args)
unless @ip.deleted?
current = Thread.current
- backup_ip = current[:callback_ip]
- current[:callback_ip] = @ip
+ backup_ip = current['callback_ip']
+ current['callback_ip'] = @ip
begin
ret = @ip.cb_eval(@cmd, *args)
fail ret if ret.kind_of?(Exception)
@@ -291,7 +260,7 @@ class MultiTkIp
fail e
end
ensure
- current[:callback_ip] = backup_ip
+ current['callback_ip'] = backup_ip
end
end
end
@@ -467,7 +436,7 @@ class MultiTkIp
rescue SystemExit => e
# delete IP
unless @interp.deleted?
- @slave_ip_tbl.each{|name, subip|
+ @slave_ip_tbl.each{|name, subip|
_destroy_slaves_of_slaveIP(subip)
begin
# subip._eval_without_enc("foreach i [after info] {after cancel $i}")
@@ -490,11 +459,11 @@ class MultiTkIp
next if subip.deleted?
end
end
- if subip.respond_to?(:safe_base?) && subip.safe_base? &&
+ if subip.respond_to?(:safe_base?) && subip.safe_base? &&
!subip.deleted?
# do 'exit' to call the delete_hook procedure
begin
- subip._eval_without_enc('exit')
+ subip._eval_without_enc('exit')
rescue Exception
end
else
@@ -569,11 +538,11 @@ class MultiTkIp
next if subip.deleted?
end
end
- if subip.respond_to?(:safe_base?) && subip.safe_base? &&
+ if subip.respond_to?(:safe_base?) && subip.safe_base? &&
!subip.deleted?
# do 'exit' to call the delete_hook procedure
begin
- subip._eval_without_enc('exit')
+ subip._eval_without_enc('exit')
rescue Exception
end
else
@@ -688,12 +657,12 @@ class MultiTkIp
case cmd
when 'set_safe_level'
begin
- safe_level = args[0] if safe_level < args[0]
+ safe_level = args[0] if safe_level < args[0]
rescue Exception
end
when 'call_mainloop'
thread = args.shift
- _check_and_return(thread,
+ _check_and_return(thread,
MultiTkIp_OK.new(_receiver_mainloop(*args)))
else
# ignore
@@ -701,8 +670,8 @@ class MultiTkIp
else
# procedure
- last_thread[thread] = _receiver_eval_proc(last_thread[thread],
- safe_level, thread,
+ last_thread[thread] = _receiver_eval_proc(last_thread[thread],
+ safe_level, thread,
cmd, *args)
end
end
@@ -713,35 +682,21 @@ class MultiTkIp
begin
loop do
sleep 1
- if @interp.deleted?
- receiver.kill
- @cmd_queue.close
- end
+ receiver.kill if @interp.deleted?
break unless receiver.alive?
end
rescue Exception
# ignore all kind of Exception
end
-
# receiver is dead
- retry_count = 3
loop do
- Thread.pass
- begin
- thread, cmd, *args = @cmd_queue.deq(true) # non-block
- rescue ThreadError
- # queue is empty
- retry_count -= 1
- break if retry_count <= 0
- sleep 0.5
- retry
- end
+ thread, cmd, *args = @cmd_queue.deq
next unless thread
if thread.alive?
if @interp.deleted?
thread.raise RuntimeError, 'the interpreter is already deleted'
else
- thread.raise RuntimeError,
+ thread.raise RuntimeError,
'the interpreter no longer receives command procedures'
end
end
@@ -774,15 +729,15 @@ class MultiTkIp
@@DEFAULT_MASTER = self.allocate
@@DEFAULT_MASTER.instance_eval{
- @tk_windows = TkUtil.untrust({})
+ @tk_windows = {}.taint
- @tk_table_list = TkUtil.untrust([])
+ @tk_table_list = [].taint
- @slave_ip_tbl = TkUtil.untrust({})
+ @slave_ip_tbl = {}.taint
- @slave_ip_top = TkUtil.untrust({})
+ @slave_ip_top = {}.taint
- @evloop_thread = TkUtil.untrust([])
+ @evloop_thread = [].taint
unless keys.kind_of? Hash
fail ArgumentError, "expecting a Hash object for the 2nd argument"
@@ -793,49 +748,19 @@ class MultiTkIp
else ### Ruby 1.9 !!!!!!!!!!!
@interp_thread = Thread.new{
current = Thread.current
- begin
- current[:interp] = interp = TclTkIp.new(name, _keys2opts(keys))
- rescue e
- current[:interp] = e
- raise e
- end
+ current[:interp] = interp = TclTkIp.new(name, _keys2opts(keys))
#sleep
current[:mutex] = mutex = Mutex.new
current[:root_check] = cond_var = ConditionVariable.new
- status = [nil]
- def status.value
- self[0]
- end
- def status.value=(val)
- self[0] = val
- end
- current[:status] = status
-
begin
- begin
- #TclTkLib.mainloop_abort_on_exception = false
- #Thread.current[:status].value = TclTkLib.mainloop(true)
- interp.mainloop_abort_on_exception = true
- current[:status].value = interp.mainloop(true)
- rescue SystemExit=>e
- current[:status].value = e
- rescue Exception=>e
- current[:status].value = e
- retry if interp.has_mainwindow?
- ensure
- mutex.synchronize{ cond_var.broadcast }
- end
-
- #Thread.current[:status].value = TclTkLib.mainloop(false)
- current[:status].value = interp.mainloop(false)
-
+ current[:status] = interp.mainloop(true)
+ rescue Exception=>e
+ current[:status] = e
ensure
- # interp must be deleted before the thread for interp is dead.
- # If not, raise Tcl_Panic on Tcl_AsyncDelete because async handler
- # deleted by the wrong thread.
- interp.delete
+ mutex.synchronize{ cond_var.broadcast }
end
+ current[:status] = interp.mainloop(false)
}
until @interp_thread[:interp]
Thread.pass
@@ -853,19 +778,13 @@ class MultiTkIp
end
end
- @interp.instance_eval{
- @force_default_encoding ||= TkUtil.untrust([false])
- @encoding ||= TkUtil.untrust([nil])
- def @encoding.to_s; self.join(nil); end
- }
-
@ip_name = nil
- @callback_status = TkUtil.untrust([])
+ @callback_status = [].taint
@system = Object.new
- @wait_on_mainloop = TkUtil.untrust([true, 0])
+ @wait_on_mainloop = [true, 0].taint
@threadgroup = Thread.current.group
@@ -873,7 +792,7 @@ class MultiTkIp
@safe_level = [$SAFE]
- @cmd_queue = MultiTkIp::Command_Queue.new(@interp)
+ @cmd_queue = Queue.new
@cmd_receiver, @receiver_watchdog = _create_receiver_and_watchdog(@safe_level[0])
@@ -890,13 +809,13 @@ class MultiTkIp
@pseudo_toplevel = [false, nil]
def self.__pseudo_toplevel
- Thread.current.group == ThreadGroup::Default &&
+ Thread.current.group == ThreadGroup::Default &&
MultiTkIp.__getip == @@DEFAULT_MASTER &&
self.__pseudo_toplevel_evaluable? && @pseudo_toplevel[1]
end
def self.__pseudo_toplevel=(m)
- unless (Thread.current.group == ThreadGroup::Default &&
+ unless (Thread.current.group == ThreadGroup::Default &&
MultiTkIp.__getip == @@DEFAULT_MASTER)
fail SecurityError, "no permission to manipulate"
end
@@ -920,7 +839,7 @@ class MultiTkIp
end
def self.__pseudo_toplevel_evaluable=(mode)
- unless (Thread.current.group == ThreadGroup::Default &&
+ unless (Thread.current.group == ThreadGroup::Default &&
MultiTkIp.__getip == @@DEFAULT_MASTER)
fail SecurityError, "no permission to manipulate"
end
@@ -947,7 +866,7 @@ class MultiTkIp
rescue @assign_request=>req
begin
req.ret[0] = req.target.instance_eval{
- @cmd_receiver, @receiver_watchdog =
+ @cmd_receiver, @receiver_watchdog =
_create_receiver_and_watchdog(@safe_level[0])
@threadgroup.add @cmd_receiver
@threadgroup.add @receiver_watchdog
@@ -1032,9 +951,8 @@ class MultiTkIp
begin
class << subclass
self.methods.each{|m|
- name = m.to_s
begin
- unless name == '__id__' || name == '__send__' || name == 'freeze'
+ unless m == '__id__' || m == '__send__' || m == 'freeze'
undef_method(m)
end
rescue Exception
@@ -1044,7 +962,7 @@ class MultiTkIp
end
ensure
subclass.freeze
- fail SecurityError,
+ fail SecurityError,
"cannot create subclass of MultiTkIp on a untrusted ThreadGroup"
end
end
@@ -1053,9 +971,9 @@ class MultiTkIp
######################################
@@SAFE_OPT_LIST = [
- 'accessPath'.freeze,
- 'statics'.freeze,
- 'nested'.freeze,
+ 'accessPath'.freeze,
+ 'statics'.freeze,
+ 'nested'.freeze,
'deleteHook'.freeze
].freeze
@@ -1068,7 +986,7 @@ class MultiTkIp
keys.each{|k,v|
k_str = k.to_s
if k_str == 'name'
- name = v
+ name = v
elsif k_str == 'safe'
safe = v
elsif @@SAFE_OPT_LIST.member?(k_str)
@@ -1140,8 +1058,8 @@ class MultiTkIp
# match display?
if assoc_display != new_keys['display']
if optkeys.key?(:display) || optkeys.key?('display')
- fail RuntimeError,
- "conflicting 'display'=>#{new_keys['display']} " +
+ fail RuntimeError,
+ "conflicting 'display'=>#{new_keys['display']} " +
"and display '#{assoc_display}' on 'use'=>#{new_keys['use']}"
else
new_keys['display'] = assoc_display
@@ -1208,14 +1126,14 @@ class MultiTkIp
fc.bindtags = fc.bindtags.unshift(tag)
TkFrame.new(fc, :bd=>0){|f|
- TkButton.new(f,
- :text=>'Delete', :bd=>1, :padx=>2, :pady=>0,
+ TkButton.new(f,
+ :text=>'Delete', :bd=>1, :padx=>2, :pady=>0,
:highlightthickness=>0, :command=>slave_delete_proc
).pack(:side=>:right, :fill=>:both)
f.pack(:side=>:right, :fill=>:both, :expand=>true)
}
- TkLabel.new(fc, :text=>msg, :padx=>2, :pady=>0,
+ TkLabel.new(fc, :text=>msg, :padx=>2, :pady=>0,
:anchor=>:w).pack(:side=>:left, :fill=>:both, :expand=>true)
fc.pack(:side=>:bottom, :fill=>:x)
@@ -1239,11 +1157,6 @@ class MultiTkIp
# safe interpreter
ip_name = _create_slave_ip_name
slave_ip = @interp.create_slave(ip_name, true)
- slave_ip.instance_eval{
- @force_default_encoding ||= TkUtil.untrust([false])
- @encoding ||= TkUtil.untrust([nil])
- def @encoding.to_s; self.join(nil); end
- }
@slave_ip_tbl[ip_name] = slave_ip
def slave_ip.safe_base?
true
@@ -1258,22 +1171,21 @@ class MultiTkIp
if tk_opts.key?('use')
@slave_ip_top[ip_name] = ''
else
- tk_opts, top_path = __create_safetk_frame(slave_ip, ip_name, app_name,
+ tk_opts, top_path = __create_safetk_frame(slave_ip, ip_name, app_name,
tk_opts)
@slave_ip_top[ip_name] = top_path
end
@interp._eval("::safe::loadTk #{ip_name} #{_keys2opts(tk_opts)}")
- @interp._invoke('__replace_slave_tk_commands__', ip_name)
else
@slave_ip_top[ip_name] = nil
end
if safe_opts.key?('deleteHook') || safe_opts.key?(:deleteHook)
- @interp._eval("::safe::interpConfigure #{ip_name} " +
+ @interp._eval("::safe::interpConfigure #{ip_name} " +
_keys2opts(safe_opts))
else
- @interp._eval("::safe::interpConfigure #{ip_name} " +
- _keys2opts(safe_opts) + '-deleteHook {' +
+ @interp._eval("::safe::interpConfigure #{ip_name} " +
+ _keys2opts(safe_opts) + '-deleteHook {' +
TkComm._get_eval_string(proc{|slave|
self._default_delete_hook(slave)
}) + '}')
@@ -1287,15 +1199,9 @@ class MultiTkIp
ip_name = _create_slave_ip_name
slave_ip = @interp.create_slave(ip_name, false)
- slave_ip.instance_eval{
- @force_default_encoding ||= TkUtil.untrust([false])
- @encoding ||= TkUtil.untrust([nil])
- def @encoding.to_s; self.join(nil); end
- }
slave_ip._invoke('set', 'argv0', name) if name.kind_of?(String)
slave_ip._invoke('set', 'argv', _keys2opts(keys))
@interp._invoke('load', '', 'Tk', ip_name)
- @interp._invoke('__replace_slave_tk_commands__', ip_name)
@slave_ip_tbl[ip_name] = slave_ip
[slave_ip, ip_name]
end
@@ -1343,12 +1249,12 @@ class MultiTkIp
@cb_error_proc = []
@evloop_thread = []
- TkUtil.untrust(@tk_windows) unless @tk_windows.tainted?
- TkUtil.untrust(@tk_table_list) unless @tk_table_list.tainted?
- TkUtil.untrust(@slave_ip_tbl) unless @slave_ip_tbl.tainted?
- TkUtil.untrust(@slave_ip_top) unless @slave_ip_top.tainted?
- TkUtil.untrust(@cb_error_proc) unless @cb_error_proc.tainted?
- TkUtil.untrust(@evloop_thread) unless @evloop_thread.tainted?
+ @tk_windows.taint unless @tk_windows.tainted?
+ @tk_table_list.taint unless @tk_table_list.tainted?
+ @slave_ip_tbl.taint unless @slave_ip_tbl.tainted?
+ @slave_ip_top.taint unless @slave_ip_top.tainted?
+ @cb_error_proc.taint unless @cb_error_proc.tainted?
+ @evloop_thread.taint unless @evloop_thread.tainted?
@callback_status = []
@@ -1362,22 +1268,9 @@ class MultiTkIp
# create master-ip
unless WITH_RUBY_VM
@interp = TclTkIp.new(name, _keys2opts(tk_opts))
- @interp.instance_eval{
- @force_default_encoding ||= TkUtil.untrust([false])
- @encoding ||= TkUtil.untrust([nil])
- def @encoding.to_s; self.join(nil); end
- }
-
else ### Ruby 1.9 !!!!!!!!!!!
-=begin
@interp_thread = Thread.new{
Thread.current[:interp] = interp = TclTkIp.new(name, _keys2opts(tk_opts))
- interp.instance_eval{
- @force_default_encoding ||= TkUtil.untrust([false])
- @encoding ||= TkUtil.untrust([nil])
- def @encoding.to_s; self.join(nil); end
- }
-
#sleep
TclTkLib.mainloop(true)
}
@@ -1386,83 +1279,20 @@ class MultiTkIp
end
# INTERP_THREAD.run
@interp = @interp_thread[:interp]
-=end
- @interp_thread = Thread.new{
- current = Thread.current
- begin
- current[:interp] = interp = TclTkIp.new(name, _keys2opts(tk_opts))
- rescue e
- current[:interp] = e
- raise e
- end
- #sleep
- #TclTkLib.mainloop(true)
- current[:mutex] = mutex = Mutex.new
- current[:root_check] = cond_ver = ConditionVariable.new
-
- status = [nil]
- def status.value
- self[0]
- end
- def status.value=(val)
- self[0] = val
- end
- current[:status] = status
-
- begin
- begin
- current[:status].value = interp.mainloop(true)
- rescue SystemExit=>e
- current[:status].value = e
- rescue Exception=>e
- current[:status].value = e
- retry if interp.has_mainwindow?
- ensure
- mutex.synchronize{ cond_var.broadcast }
- end
- current[:status].value = interp.mainloop(false)
- ensure
- interp.delete
- end
- }
- until @interp_thread[:interp]
- Thread.pass
- end
- # INTERP_THREAD.run
- @interp = @interp_thread[:interp]
-
- @evloop_thread[0] = @interp_thread
-
- def self.mainloop(check_root = true)
- begin
- TclTkLib.set_eventloop_window_mode(true)
- @interp_thread.value
- ensure
- TclTkLib.set_eventloop_window_mode(false)
- end
- end
end
- @interp.instance_eval{
- @force_default_encoding ||= TkUtil.untrust([false])
- @encoding ||= TkUtil.untrust([nil])
- def @encoding.to_s; self.join(nil); end
- }
-
@ip_name = nil
-
if safe
safe = $SAFE if safe < $SAFE
@safe_level = [safe]
else
@safe_level = [$SAFE]
end
-
else
# create slave-ip
if safeip || master.safe?
@safe_base = true
- @interp, @ip_name = master.__create_safe_slave_obj(safe_opts,
+ @interp, @ip_name = master.__create_safe_slave_obj(safe_opts,
name, tk_opts)
# @interp_thread = nil if RUBY_VERSION < '1.9.0' ### !!!!!!!!!!!
@interp_thread = nil unless WITH_RUBY_VM ### Ruby 1.9 !!!!!!!!!!!
@@ -1483,21 +1313,21 @@ class MultiTkIp
@safe_level = [master.safe_level]
end
end
- @set_alias_proc = proc{|name|
+ @set_alias_proc = proc{|name|
master._invoke('interp', 'alias', @ip_name, name, '', name)
}.freeze
end
@system = Object.new
- @wait_on_mainloop = TkUtil.untrust([true, 0])
- # @wait_on_mainloop = TkUtil.untrust([false, 0])
+ @wait_on_mainloop = [true, 0].taint
+ # @wait_on_mainloop = [false, 0].taint
@threadgroup = ThreadGroup.new
@pseudo_toplevel = [false, nil]
- @cmd_queue = MultiTkIp::Command_Queue.new(@interp)
+ @cmd_queue = Queue.new
=begin
@cmd_receiver, @receiver_watchdog = _create_receiver_and_watchdog(@safe_level[0])
@@ -1510,8 +1340,9 @@ class MultiTkIp
@@DEFAULT_MASTER.assign_receiver_and_watchdog(self)
@@IP_TABLE[@threadgroup] = self
- @@TK_TABLE_LIST.size.times{
- @tk_table_list << TkUtil.untrust({})
+ @@TK_TABLE_LIST.size.times{
+ (tbl = {}).tainted? || tbl.taint
+ @tk_table_list << tbl
}
_init_ip_internal(@@INIT_IP_ENV, @@ADD_TK_PROCS)
@@ -1559,17 +1390,6 @@ end
# get target IP
class MultiTkIp
- @@CALLBACK_SUBTHREAD = Class.new(Thread){
- def self.new(interp, &blk)
- super(interp){|ip| Thread.current[:callback_ip] = ip; blk.call}
- end
-
- @table = TkUtil.untrust(Hash.new{|h,k| h[k] = TkUtil.untrust([])})
- def self.table
- @table
- end
- }
-
def self._ip_id_
__getip._ip_id_
end
@@ -1580,18 +1400,15 @@ class MultiTkIp
def self.__getip
current = Thread.current
- if current.kind_of?(@@CALLBACK_SUBTHREAD)
- return current[:callback_ip]
- end
- if TclTkLib.mainloop_thread? != false && current[:callback_ip]
- return current[:callback_ip]
+ if TclTkLib.mainloop_thread? != false && current['callback_ip']
+ return current['callback_ip']
end
if current.group == ThreadGroup::Default
@@DEFAULT_MASTER
else
ip = @@IP_TABLE[current.group]
unless ip
- fail SecurityError,
+ fail SecurityError,
"cannot call Tk methods on #{Thread.current.inspect}"
end
ip
@@ -1605,11 +1422,11 @@ class << MultiTkIp
alias __new new
private :__new
- def new_master(safe=nil, keys={}, &blk)
+ def new_master(safe=nil, keys={})
if MultiTkIp::WITH_RUBY_VM
#### TODO !!!!!!
- fail RuntimeError,
- 'sorry, still not support multiple master-interpreters on RubyVM'
+ fail RuntimeError,
+ 'sorry, still not support multiple master-interpreters on Ruby VM'
end
if safe.kind_of?(Hash)
@@ -1627,17 +1444,15 @@ class << MultiTkIp
ip = __new(__getip, nil, keys)
#ip.eval_proc(proc{$SAFE=ip.safe_level; Proc.new}.call) if block_given?
- if block_given?
- #Thread.new{ip.eval_proc(proc{$SAFE=ip.safe_level; Proc.new}.call)}
- #Thread.new{ip.eval_proc(proc{$SAFE=ip.safe_level; yield}.call)}
- ip._proc_on_safelevel(&blk).call(ip.safe_level)
- end
+ if block_given?
+ Thread.new{ip.eval_proc(proc{$SAFE=ip.safe_level; Proc.new}.call)}
+ end
ip
end
alias new new_master
- def new_slave(safe=nil, keys={}, &blk)
+ def new_slave(safe=nil, keys={})
if safe.kind_of?(Hash)
keys = safe
elsif safe.kind_of?(Integer)
@@ -1654,15 +1469,13 @@ class << MultiTkIp
ip = __new(__getip, false, keys)
# ip.eval_proc(proc{$SAFE=ip.safe_level; Proc.new}.call) if block_given?
if block_given?
- #Thread.new{ip.eval_proc(proc{$SAFE=ip.safe_level; Proc.new}.call)}
- #Thread.new{ip.eval_proc(proc{$SAFE=ip.safe_level; yield}.call)}
- ip._proc_on_safelevel(&blk).call(ip.safe_level)
+ Thread.new{ip.eval_proc(proc{$SAFE=ip.safe_level; Proc.new}.call)}
end
ip
end
alias new_trusted_slave new_slave
- def new_safe_slave(safe=4, keys={}, &blk)
+ def new_safe_slave(safe=4, keys={})
if safe.kind_of?(Hash)
keys = safe
elsif safe.kind_of?(Integer)
@@ -1677,9 +1490,7 @@ class << MultiTkIp
ip = __new(__getip, true, keys)
# ip.eval_proc(proc{$SAFE=ip.safe_level; Proc.new}.call) if block_given?
if block_given?
- #Thread.new{ip.eval_proc(proc{$SAFE=ip.safe_level; Proc.new}.call)}
- #Thread.new{ip.eval_proc(proc{$SAFE=ip.safe_level; yield}.call)}
- ip._proc_on_safelevel(&blk).call(ip.safe_level)
+ Thread.new{ip.eval_proc(proc{$SAFE=ip.safe_level; Proc.new}.call)}
end
ip
end
@@ -1765,7 +1576,7 @@ class MultiTkIp
def slaves(all = false)
raise SecurityError, "no permission to manipulate" unless self.manipulable?
- @interp._invoke('interp','slaves').split.map!{|name|
+ @interp._invoke('interp','slaves').split.map!{|name|
if @slave_ip_tbl.key?(name)
@slave_ip_tbl[name]
elsif all
@@ -1812,8 +1623,9 @@ class MultiTkIp
end
def _add_new_tables
- (@@TK_TABLE_LIST.size - @tk_table_list.size).times{
- @tk_table_list << TkUtil.untrust({})
+ (@@TK_TABLE_LIST.size - @tk_table_list.size).times{
+ (tbl = {}).tainted? || tbl.taint
+ @tk_table_list << tbl
}
end
@@ -1848,7 +1660,7 @@ class MultiTkIp
def _init_ip_internal(init_ip_env, add_tk_procs)
#init_ip_env.each{|script| self.eval_proc{script.call(self)}}
init_ip_env.each{|script| self._init_ip_env(script)}
- add_tk_procs.each{|name, args, body|
+ add_tk_procs.each{|name, args, body|
if master?
@interp._invoke('proc', name, args, body) if args && body
else
@@ -1871,7 +1683,7 @@ class MultiTkIp
__getip._tk_table_list[id]
end
def self.create_table
- if __getip.slave?
+ if __getip.slave?
begin
raise SecurityError, "slave-IP has no permission creating a new table"
rescue SecurityError => e
@@ -1921,7 +1733,7 @@ class MultiTkIp
end
end
- # @@IP_TABLE.each{|tg, ip|
+ # @@IP_TABLE.each{|tg, ip|
# ip._init_ip_env(script)
# }
@@DEFAULT_MASTER.__init_ip_env__(@@IP_TABLE, script)
@@ -1933,7 +1745,7 @@ class MultiTkIp
else
name = name.to_s
@@ADD_TK_PROCS << [name, args, body]
- @@IP_TABLE.each{|tg, ip|
+ @@IP_TABLE.each{|tg, ip|
ip._add_tk_procs(name, args, body)
}
end
@@ -1942,11 +1754,11 @@ class MultiTkIp
def self.remove_tk_procs(*names)
names.each{|name|
name = name.to_s
- @@ADD_TK_PROCS.delete_if{|elem|
+ @@ADD_TK_PROCS.delete_if{|elem|
elem.kind_of?(Array) && elem[0].to_s == name
}
}
- @@IP_TABLE.each{|tg, ip|
+ @@IP_TABLE.each{|tg, ip|
ip._remove_tk_procs(*names)
}
end
@@ -1956,6 +1768,7 @@ class MultiTkIp
end
end
+
# for callback operation
class MultiTkIp
def self.cb_entry_class
@@ -1980,20 +1793,12 @@ class MultiTkIp
end
=end
def cb_eval(cmd, *args)
- self.eval_callback(*args,
- &_proc_on_safelevel{|*params|
- TkComm._get_eval_string(TkUtil.eval_cmd(cmd, *params))
- })
- end
-=begin
- def cb_eval(cmd, *args)
self.eval_callback(*args){|safe, *params|
$SAFE=safe if $SAFE < safe
# TkUtil.eval_cmd(cmd, *params)
TkComm._get_eval_string(TkUtil.eval_cmd(cmd, *params))
}
end
-=end
=begin
def cb_eval(cmd, *args)
@callback_status[0] ||= TkVariable.new
@@ -2053,7 +1858,7 @@ class MultiTkIp
end
def __pseudo_toplevel=(m)
- unless (Thread.current.group == ThreadGroup::Default &&
+ unless (Thread.current.group == ThreadGroup::Default &&
MultiTkIp.__getip == @@DEFAULT_MASTER)
fail SecurityError, "no permission to manipulate"
end
@@ -2077,7 +1882,7 @@ class MultiTkIp
end
def __pseudo_toplevel_evaluable=(mode)
- unless (Thread.current.group == ThreadGroup::Default &&
+ unless (Thread.current.group == ThreadGroup::Default &&
MultiTkIp.__getip == @@DEFAULT_MASTER)
fail SecurityError, "no permission to manipulate"
end
@@ -2088,48 +1893,6 @@ end
# evaluate a procedure on the proper interpreter
class MultiTkIp
- # instance & class method
- def _proc_on_safelevel(cmd=nil, &blk) # require a block for eval
- if cmd
- if cmd.kind_of?(Method)
- _proc_on_safelevel{|*args| cmd.call(*args)}
- else
- _proc_on_safelevel(&cmd)
- end
- else
- #Proc.new{|safe, *args| $SAFE=safe if $SAFE < safe; yield(*args)}
- Proc.new{|safe, *args|
- # avoid security error on Exception objects
- untrust_proc = proc{|err|
- begin
- err.untrust if err.respond_to?(:untrust)
- rescue SecurityError
- end
- err
- }
- $SAFE=safe if $SAFE < safe;
- begin
- yield(*args)
- rescue Exception => e
- fail untrust_proc.call(e)
- end
- }
- end
- end
- def MultiTkIp._proc_on_safelevel(cmd=nil, &blk)
- MultiTkIp.__getip._proc_on_safelevel(cmd, &blk)
- end
-
- def _proc_on_current_safelevel(cmd=nil, &blk) # require a block for eval
- safe = $SAFE
- cmd = _proc_on_safelevel(cmd, &blk)
- Proc.new{|*args| cmd.call(safe, *args)}
- end
- def MultiTkIp._proc_on_current_safelevel(cmd=nil, &blk)
- MultiTkIp.__getip._proc_on_current_safelevel(cmd, &blk)
- end
-
- ######################################
# instance method
def eval_proc_core(req_val, cmd, *args)
# check
@@ -2139,23 +1902,23 @@ class MultiTkIp
end
# on IP thread
- if @cmd_receiver == Thread.current ||
+ if @cmd_receiver == Thread.current ||
(!req_val && TclTkLib.mainloop_thread? != false) # callback
begin
ret = cmd.call(safe_level, *args)
rescue SystemExit => e
# exit IP
- warn("Warning: "+ e.inspect + " on " + self.inspect) if $DEBUG
+ warn("Warning: "+ $! + " on " + self.inspect) if $DEBUG
begin
self._eval_without_enc('exit')
- rescue Exception => e
+ rescue Exception
end
self.delete
ret = nil
rescue Exception => e
if $DEBUG
- warn("Warning: " + e.class.inspect +
- ((e.message.length > 0)? ' "' + e.message + '"': '') +
+ warn("Warning: " + e.class.inspect +
+ ((e.message.length > 0)? ' "' + e.message + '"': '') +
" on " + self.inspect)
end
=begin
@@ -2182,9 +1945,9 @@ class MultiTkIp
rescue Exception => e
# ignore
if $DEBUG
- warn("Warning: " + e.class.inspect +
- ((e.message.length > 0)? ' "' + e.message + '"': '') +
- " on " + self.inspect)
+ warn("Warning: " + e.class.inspect +
+ ((e.message.length > 0)? ' "' + e.message + '"': '') +
+ " on " + self.inspect)
end
return e
end
@@ -2200,7 +1963,7 @@ class MultiTkIp
return ret.value
rescue SystemExit => e
# exit IP
- warn("Warning: " + e.inspect + " on " + self.inspect) if $DEBUG
+ warn("Warning: " + $! + " on " + self.inspect) if $DEBUG
begin
self._eval_without_enc('exit')
rescue Exception
@@ -2213,9 +1976,9 @@ class MultiTkIp
end
rescue Exception => e
if $DEBUG
- warn("Warning: " + e.class.inspect +
- ((e.message.length > 0)? ' "' + e.message + '"': '') +
- " on " + self.inspect)
+ warn("Warning: " + e.class.inspect +
+ ((e.message.length > 0)? ' "' + e.message + '"': '') +
+ " on " + self.inspect)
end
return e
end
@@ -2223,80 +1986,25 @@ class MultiTkIp
end
private :eval_proc_core
-if false && WITH_RUBY_VM ### Ruby 1.9
- # Not stable, so disable this feature
- def eval_callback(*args)
- if block_given?
- cmd = Proc.new
- else
- cmd = args.shift
- end
- begin
- if @@CALLBACK_SUBTHREAD.table[self].index(Thread.current)
- last_th = nil
- else
- last_th = @@CALLBACK_SUBTHREAD.table[self][-1]
- end
- @@CALLBACK_SUBTHREAD.new(self){
- @@CALLBACK_SUBTHREAD.table[self] << Thread.current
- begin
- last_th.join if last_th
- eval_proc_core(false, cmd, *args)
- rescue Exception=>e
- e
- ensure
- @@CALLBACK_SUBTHREAD.table[self].delete(Thread.current)
- end
- }
- end
- end
-else ### Ruby 1.8
def eval_callback(*args)
if block_given?
cmd = Proc.new
else
cmd = args.shift
end
+ current = Thread.current
+ backup_ip = current['callback_ip']
+ current['callback_ip'] = self
begin
eval_proc_core(false, cmd, *args)
- rescue Exception=>e
- e
ensure
+ current['callback_ip'] = backup_ip
end
end
-end
- def eval_proc(*args, &blk)
- if block_given?
- cmd = _proc_on_safelevel(&blk)
- else
- unless (cmd = args.shift)
- fail ArgumentError, "A Proc or Method object is expected for 1st argument"
- end
- cmd = _proc_on_safelevel(&cmd)
- end
- if TclTkLib.mainloop_thread? == true
- # call from eventloop
- current = Thread.current
- backup_ip = current[:callback_ip]
- current[:callback_ip] = self
- begin
- eval_proc_core(false, cmd, *args)
- ensure
- current[:callback_ip] = backup_ip
- end
- else
- eval_proc_core(true,
- proc{|safe, *params|
- Thread.new{cmd.call(safe, *params)}.value
- },
- *args)
- end
- end
-=begin
def eval_proc(*args)
- # The scope of the eval-block of 'eval_proc' method is different from
- # the external. If you want to pass local values to the eval-block,
+ # The scope of the eval-block of 'eval_proc' method is different from
+ # the external. If you want to pass local values to the eval-block,
# use arguments of eval_proc method. They are passed to block-arguments.
if block_given?
cmd = Proc.new
@@ -2308,27 +2016,26 @@ end
if TclTkLib.mainloop_thread? == true
# call from eventloop
current = Thread.current
- backup_ip = current[:callback_ip]
- current[:callback_ip] = self
+ backup_ip = current['callback_ip']
+ current['callback_ip'] = self
begin
- eval_proc_core(false,
+ eval_proc_core(false,
proc{|safe, *params|
$SAFE=safe if $SAFE < safe
cmd.call(*params)
}, *args)
ensure
- current[:callback_ip] = backup_ip
+ current['callback_ip'] = backup_ip
end
else
- eval_proc_core(true,
- proc{|safe, *params|
+ eval_proc_core(true,
+ proc{|safe, *params|
$SAFE=safe if $SAFE < safe
Thread.new(*params, &cmd).value
},
*args)
end
end
-=end
alias call eval_proc
def bg_eval_proc(*args)
@@ -2342,8 +2049,8 @@ end
Thread.new{
eval_proc(cmd, *args)
=begin
- eval_proc_core(false,
- proc{|safe, *params|
+ eval_proc_core(false,
+ proc{|safe, *params|
$SAFE=safe if $SAFE < safe
Thread.new(*params, &cmd).value
},
@@ -2362,8 +2069,8 @@ end
raise RuntimeError, "A String object is expected for the 'cmd' argument"
end
- eval_proc_core(true,
- proc{|safe|
+ eval_proc_core(true,
+ proc{|safe|
Kernel.eval("$SAFE=#{safe} if $SAFE < #{safe};" << cmd,
*eval_args)
})
@@ -2376,8 +2083,8 @@ end
raise RuntimeError, "A String object is expected for the 'cmd' argument"
end
Thread.new{
- eval_proc_core(true,
- proc{|safe|
+ eval_proc_core(true,
+ proc{|safe|
Kernel.eval("$SAFE=#{safe} if $SAFE < #{safe};" << cmd,
*eval_args)
})
@@ -2462,11 +2169,6 @@ end
# event loop
# all master/slave IPs are controled by only one event-loop
-class MultiTkIp
- def self.default_master?
- __getip == @@DEFAULT_MASTER
- end
-end
class << MultiTkIp
def mainloop(check_root = true)
__getip.mainloop(check_root)
@@ -2726,8 +2428,7 @@ end
# depend on TclTkIp
class MultiTkIp
-# def mainloop(check_root = true, restart_on_dead = true)
- def mainloop(check_root = true, restart_on_dead = false)
+ def mainloop(check_root = true, restart_on_dead = true)
raise SecurityError, "no permission to manipulate" unless self.manipulable?
if WITH_RUBY_VM ### Ruby 1.9 !!!!!!!!!!!
@@ -2743,7 +2444,7 @@ class MultiTkIp
if $SAFE >= 4
_receiver_mainloop(check_root).join
else
- @cmd_queue.enq([@system, 'call_mainloop',
+ @cmd_queue.enq([@system, 'call_mainloop',
Thread.current, check_root])
Thread.stop
end
@@ -2756,7 +2457,7 @@ class MultiTkIp
end
rescue SystemExit => e
# exit IP
- warn("Warning: " + e.inspect + " on " + self.inspect) if $DEBUG
+ warn("Warning: " + $! + " on " + self.inspect) if $DEBUG
begin
self._eval_without_enc('exit')
rescue Exception
@@ -2764,9 +2465,9 @@ class MultiTkIp
self.delete
rescue StandardError => e
if $DEBUG
- warn("Warning: " + e.class.inspect +
- ((e.message.length > 0)? ' "' + e.message + '"': '') +
- " on " + self.inspect)
+ warn("Warning: " + e.class.inspect +
+ ((e.message.length > 0)? ' "' + e.message + '"': '') +
+ " on " + self.inspect)
end
return e
rescue Exception => e
@@ -2785,9 +2486,9 @@ class MultiTkIp
@interp.mainloop(check_root)
rescue StandardError => e
if $DEBUG
- warn("Warning: " + e.class.inspect +
- ((e.message.length > 0)? ' "' + e.message + '"': '') +
- " on " + self.inspect)
+ warn("Warning: " + e.class.inspect +
+ ((e.message.length > 0)? ' "' + e.message + '"': '') +
+ " on " + self.inspect)
end
end
=end
@@ -2812,7 +2513,7 @@ class MultiTkIp
@interp.mainloop(check_root)
rescue StandardError => e
if TclTkLib.mainloop_abort_on_exception != nil
- #STDERR.print("Warning: Tk mainloop receives ", $!.class.inspect,
+ #STDERR.print("Warning: Tk mainloop receives ", $!.class.inspect,
# " exception (ignore) : ", $!.message, "\n");
if $DEBUG
warn("Warning: Tk mainloop receives " << e.class.inspect <<
@@ -2823,7 +2524,7 @@ class MultiTkIp
rescue Exception => e
=begin
if TclTkLib.mainloop_abort_on_exception != nil
- #STDERR.print("Warning: Tk mainloop receives ", $!.class.inspect,
+ #STDERR.print("Warning: Tk mainloop receives ", $!.class.inspect,
# " exception (ignore) : ", $!.message, "\n");
if $DEBUG
warn("Warning: Tk mainloop receives " << e.class.inspect <<
@@ -2894,11 +2595,11 @@ class MultiTkIp
next if subip.deleted?
end
end
- if subip.respond_to?(:safe_base?) && subip.safe_base? &&
+ if subip.respond_to?(:safe_base?) && subip.safe_base? &&
!subip.deleted?
# do 'exit' to call the delete_hook procedure
begin
- subip._eval_without_enc('exit')
+ subip._eval_without_enc('exit')
rescue Exception
end
else
@@ -3192,7 +2893,7 @@ class MultiTkIp
def def_alias(slave, new_cmd, org_cmd, *args)
raise SecurityError, "no permission to manipulate" unless self.manipulable?
- ret = @interp._invoke('interp', 'alias', _slavearg(slave), new_cmd,
+ ret = @interp._invoke('interp', 'alias', _slavearg(slave), new_cmd,
'', org_cmd, *args)
(ret == new_cmd)? self: nil
end
@@ -3285,7 +2986,7 @@ class MultiTkIp
end
keys << _slavearg(slave)
if Tk::TCL_MAJOR_VERSION > 8 ||
- (Tk::TCL_MAJOR_VERSION == 8 && Tk::TCL_MINOR_VERSION >= 5)
+ (Tk::TCL_MAJOR_VERSION == 8 && Tk::TCL_MINOR_VERSION >= 5)
keys << '--'
end
keys << cmd
@@ -3306,7 +3007,7 @@ class MultiTkIp
keys << _slavearg(slave)
keys << '-global'
if Tk::TCL_MAJOR_VERSION > 8 ||
- (Tk::TCL_MAJOR_VERSION == 8 && Tk::TCL_MINOR_VERSION >= 5)
+ (Tk::TCL_MAJOR_VERSION == 8 && Tk::TCL_MINOR_VERSION >= 5)
keys << '--'
end
keys << cmd
@@ -3382,11 +3083,11 @@ class MultiTkIp
raise SecurityError, "no permission to manipulate" unless self.manipulable?
if slot
- num_or_str(@interp._invoke('interp', 'limit', _slavearg(slave),
+ num_or_str(@interp._invoke('interp', 'limit', _slavearg(slave),
limit_type, slot))
else
- l = @interp._split_tklist(@interp._invoke_without_enc('interp', 'limit',
- _slavearg(slave),
+ l = @interp._split_tklist(@interp._invoke_without_enc('interp', 'limit',
+ _slavearg(slave),
limit_type))
l.map!{|s| _fromUTF8(s)}
r = {}
@@ -3405,7 +3106,7 @@ class MultiTkIp
def recursion_limit(slave = '', limit = None)
raise SecurityError, "no permission to manipulate" unless self.manipulable?
- number(@interp._invoke('interp', 'recursionlimit',
+ number(@interp._invoke('interp', 'recursionlimit',
_slavearg(slave), limit))
end
def self.recursion_limit(slave = '', limit = None)
@@ -3515,7 +3216,7 @@ class MultiTkIp
ip = MultiTkIp.__getip
ip._eval('::safe::interpConfigure ' + @ip_name + ' ' + _keys2opts(slot))
else
- ip._eval('::safe::interpConfigure ' + @ip_name + ' ' +
+ ip._eval('::safe::interpConfigure ' + @ip_name + ' ' +
"-#{slot} #{_get_eval_string(value)}")
end
self
@@ -3525,7 +3226,7 @@ class MultiTkIp
ip = MultiTkIp.__getip
ret = {}
if slot
- conf = _lst2ary(ip._eval("::safe::interpConfigure " +
+ conf = _lst2ary(ip._eval("::safe::interpConfigure " +
@ip_name + " -#{slot}"))
if conf[0] == '-deleteHook'
=begin
@@ -3541,7 +3242,7 @@ class MultiTkIp
ret[conf[0][1..-1]] = conf[1]
end
else
- Hash[*_lst2ary(ip._eval("::safe::interpConfigure " +
+ Hash[*_lst2ary(ip._eval("::safe::interpConfigure " +
@ip_name))].each{|k, v|
if k == '-deleteHook'
=begin
@@ -3588,42 +3289,6 @@ class << MultiTkIp
def encoding_table
__getip.encoding_table
end
-
- def force_default_encoding=(mode)
- __getip.force_default_encoding=(mode)
- end
-
- def force_default_encoding?
- __getip.force_default_encoding?
- end
-
- def default_encoding=(enc)
- __getip.default_encoding=(enc)
- end
-
- def encoding=(enc)
- __getip.encoding=(enc)
- end
-
- def encoding_name
- __getip.encoding_name
- end
-
- def encoding_obj
- __getip.encoding_obj
- end
- alias encoding encoding_name
- alias default_encoding encoding_name
-
- def encoding_convertfrom(str, enc=None)
- __getip.encoding_convertfrom(str, enc)
- end
- alias encoding_convert_from encoding_convertfrom
-
- def encoding_convertto(str, enc=None)
- __getip.encoding_convertto(str, enc)
- end
- alias encoding_convert_to encoding_convertto
end
class MultiTkIp
def encoding_table
@@ -3674,48 +3339,20 @@ end
# remove methods for security
-=begin
-class MultiTkIp
- INTERP_THREAD = @@DEFAULT_MASTER.instance_variable_get('@interp_thread')
- INTERP_MUTEX = INTERP_THREAD[:mutex]
- INTERP_ROOT_CHECK = INTERP_THREAD[:root_check]
-
- # undef_method :instance_eval
- undef_method :instance_variable_get
- undef_method :instance_variable_set
-end
-
-module TkCore
- if MultiTkIp::WITH_RUBY_VM &&
- ! MultiTkIp::RUN_EVENTLOOP_ON_MAIN_THREAD ### check Ruby 1.9 !!!!!!!
- INTERP_THREAD = MultiTkIp::INTERP_THREAD
- INTERP_MUTEX = MultiTkIp::INTERP_MUTEX
- INTERP_ROOT_CHECK = MultiTkIp::INTERP_ROOT_CHECK
- end
-end
-class MultiTkIp
- remove_const(:INTERP_THREAD)
- remove_const(:INTERP_MUTEX)
- remove_const(:INTERP_ROOT_CHECK)
-end
-=end
-if MultiTkIp::WITH_RUBY_VM &&
+if MultiTkIp::WITH_RUBY_VM &&
! MultiTkIp::RUN_EVENTLOOP_ON_MAIN_THREAD ### check Ruby 1.9 !!!!!!!
class MultiTkIp
INTERP_THREAD = @@DEFAULT_MASTER.instance_variable_get('@interp_thread')
- INTERP_THREAD_STATUS = INTERP_THREAD[:status]
INTERP_MUTEX = INTERP_THREAD[:mutex]
INTERP_ROOT_CHECK = INTERP_THREAD[:root_check]
end
module TkCore
INTERP_THREAD = MultiTkIp::INTERP_THREAD
- INTERP_THREAD_STATUS = MultiTkIp::INTERP_THREAD_STATUS
INTERP_MUTEX = MultiTkIp::INTERP_MUTEX
INTERP_ROOT_CHECK = MultiTkIp::INTERP_ROOT_CHECK
end
class MultiTkIp
remove_const(:INTERP_THREAD)
- remove_const(:INTERP_THREAD_STATUS)
remove_const(:INTERP_MUTEX)
remove_const(:INTERP_ROOT_CHECK)
end
diff --git a/ext/tk/lib/remote-tk.rb b/ext/tk/lib/remote-tk.rb
index 0fa713359e..70115a60aa 100644
--- a/ext/tk/lib/remote-tk.rb
+++ b/ext/tk/lib/remote-tk.rb
@@ -10,8 +10,8 @@ class MultiTkIp; end
class RemoteTkIp < MultiTkIp; end
class MultiTkIp
- @@IP_TABLE = TkUtil.untrust({}) unless defined?(@@IP_TABLE)
- @@TK_TABLE_LIST = TkUtil.untrust([]) unless defined?(@@TK_TABLE_LIST)
+ @@IP_TABLE = {}.taint unless defined?(@@IP_TABLE)
+ @@TK_TABLE_LIST = [].taint unless defined?(@@TK_TABLE_LIST)
def self._IP_TABLE; @@IP_TABLE; end
def self._TK_TABLE_LIST; @@TK_TABLE_LIST; end
@@ -88,14 +88,10 @@ class RemoteTkIp
@slave_ip_tbl = {}
@slave_ip_top = {}
- @force_default_encoding ||= TkUtil.untrust([false])
- @encoding ||= TkUtil.untrust([nil])
- def @encoding.to_s; self.join(nil); end
-
- TkUtil.untrust(@tk_windows) unless @tk_windows.tainted?
- TkUtil.untrust(@tk_table_list) unless @tk_table_list.tainted?
- TkUtil.untrust(@slave_ip_tbl) unless @slave_ip_tbl.tainted?
- TkUtil.untrust(@slave_ip_top) unless @slave_ip_top.tainted?
+ @tk_windows.taint unless @tk_windows.tainted?
+ @tk_table_list.taint unless @tk_table_list.tainted?
+ @slave_ip_tbl.taint unless @slave_ip_tbl.tainted?
+ @slave_ip_top.taint unless @slave_ip_top.tainted?
@system = Object.new
@@ -118,8 +114,8 @@ class RemoteTkIp
@@DEFAULT_MASTER.assign_receiver_and_watchdog(self)
@@IP_TABLE[@threadgroup] = self
- @@TK_TABLE_LIST.size.times{
- (tbl = {}).tainted? || TkUtil.untrust(tbl)
+ @@TK_TABLE_LIST.size.times{
+ (tbl = {}).tainted? || tbl.taint
@tk_table_list << tbl
}
@@ -158,13 +154,13 @@ class RemoteTkIp
return nil if timeout < 1
@ret_val.value = ''
- @interp._invoke('send', '-async', @remote,
- 'send', '-async', Tk.appname,
+ @interp._invoke('send', '-async', @remote,
+ 'send', '-async', Tk.appname,
"set #{@ret_val.id} ready")
Tk.update
if @ret_val != 'ready'
(1..(timeout*5)).each{
- sleep 0.2
+ sleep 0.2
Tk.update
break if @ret_val == 'ready'
}
@@ -208,10 +204,10 @@ class RemoteTkIp
cmds = @interp._merge_tklist(*TkUtil::_conv_args([], enc_mode, *cmds))
if @displayof
if async
- @interp.__invoke('send', '-async', '-displayof', @displayof,
+ @interp.__invoke('send', '-async', '-displayof', @displayof,
'--', @remote, *cmds)
else
- @interp.__invoke('send', '-displayof', @displayof,
+ @interp.__invoke('send', '-displayof', @displayof,
'--', @remote, *cmds)
end
else
@@ -233,7 +229,7 @@ class RemoteTkIp
def is_rubytk?
return false if _appsend(false, false, 'info', 'command', 'ruby') == ""
- [ _appsend(false, false, 'ruby', 'RUBY_VERSION'),
+ [ _appsend(false, false, 'ruby', 'RUBY_VERSION'),
_appsend(false, false, 'set', 'tk_patchLevel') ]
end
@@ -302,7 +298,7 @@ class RemoteTkIp
raise SecurityError, "no permission to manipulate" unless self.manipulable?
if @displayof
- lst = @interp._invoke_without_enc('winfo', 'interps',
+ lst = @interp._invoke_without_enc('winfo', 'interps',
'-displayof', @displayof)
else
lst = @interp._invoke_without_enc('winfo', 'interps')
diff --git a/ext/tk/lib/tcltk.rb b/ext/tk/lib/tcltk.rb
index 2df3b2fd8c..7f6f41605d 100644
--- a/ext/tk/lib/tcltk.rb
+++ b/ext/tk/lib/tcltk.rb
@@ -84,7 +84,7 @@ end
# class TclTkInterpreter: tcl/tk interpreter
class TclTkInterpreter
- # initialize():
+ # initialize():
def initialize()
# generate interpreter object
@ip = TclTkIp.new()
@@ -181,7 +181,7 @@ end
# class TclTkObject: base class of the tcl/tk objects
class TclTkObject
- # initialize(ip, exp):
+ # initialize(ip, exp):
# ip: interpreter(TclTkIp)
# exp: tcl/tk representation
def initialize(ip, exp)
@@ -211,7 +211,7 @@ end
# class TclTkLibCommand: tcl/tk commands in the library
class TclTkLibCommand < TclTkCommand
- # initialize(ip, name):
+ # initialize(ip, name):
# ip: interpreter(TclTkInterpreter)
# name: command name (String)
def initialize(ip, name)
@@ -222,7 +222,7 @@ end
# class TclTkVariable: tcl/tk variable
class TclTkVariable < TclTkObject
- # initialize(interp, dat):
+ # initialize(interp, dat):
# interp: interpreter(TclTkInterpreter)
# dat: the value to set(String)
# if nil, not initialize variable
@@ -237,7 +237,7 @@ class TclTkVariable < TclTkObject
set(dat) if dat
end
- # although you can set/read variables by using set in tcl/tk,
+ # although you can set/refer variable by using set in tcl/tk,
# we provide the method for accessing variables
# set(data): set tcl/tk variable using `set'
@@ -255,7 +255,7 @@ end
# class TclTkWidget: tcl/tk widget
class TclTkWidget < TclTkCommand
- # initialize(*args):
+ # initialize(*args):
# *args: parameters
def initialize(*args)
if args[0].kind_of?(TclTkIp)
@@ -281,7 +281,7 @@ class TclTkWidget < TclTkCommand
# interp: interpreter(TclTkInterpreter)
# parent: parent widget
# command: widget generating tk command(label Åù)
- # *args: argument to the command
+ # *args: argument to the command
interp, parent, command, *args = args
# generate widget name
@@ -303,14 +303,14 @@ end
# class TclTkCallback: tcl/tk callbacks
class TclTkCallback < TclTkObject
- # initialize(interp, pr, arg):
+ # initialize(interp, pr, arg):
# interp: interpreter(TclTkInterpreter)
# pr: callback procedure(Proc)
# arg: string to pass as block parameters of pr
# bind command of tcl/tk uses % replacement for parameters
# pr can receive replaced data using block parameter
# its format is specified by arg string
- # You should not specify arg for the command like
+ # You should not specify arg for the command like
# scrollbar with -command option, which receives parameters
# without specifying any replacement
def initialize(interp, pr, arg = nil)
@@ -347,7 +347,7 @@ end
# class TclTkImage: tcl/tk images
class TclTkImage < TclTkCommand
- # initialize(interp, t, *args):
+ # initialize(interp, t, *args):
# generating image is done by TclTkImage.new()
# destrying is done by image delete (inconsistent, sigh)
# interp: interpreter(TclTkInterpreter)
diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb
index 7552abed91..c5d5b804d2 100644
--- a/ext/tk/lib/tk.rb
+++ b/ext/tk/lib/tk.rb
@@ -15,25 +15,12 @@ require 'thread'
class TclTkIp
# backup original (without encoding) _eval and _invoke
alias _eval_without_enc _eval
- alias __eval__ _eval
alias _invoke_without_enc _invoke
- alias __invoke__ _invoke
def _ip_id_
# for RemoteTkIp
''
end
-
- alias __initialize__ initialize
- private :__initialize__
-
- def initialize(*args)
- __initialize__(*args)
-
- @force_default_encoding ||= TkUtil.untrust([false])
- @encoding ||= TkUtil.untrust([nil])
- def @encoding.to_s; self.join(nil); end
- end
end
# define TkComm module (step 1: basic functions)
@@ -41,8 +28,8 @@ module TkComm
include TkUtil
extend TkUtil
- WidgetClassNames = TkUtil.untrust({})
- TkExtlibAutoloadModule = TkUtil.untrust([])
+ WidgetClassNames = {}.taint
+ TkExtlibAutoloadModule = [].taint
# None = Object.new ### --> definition is moved to TkUtil module
# def None.to_s
@@ -52,10 +39,7 @@ module TkComm
#Tk_CMDTBL = {}
#Tk_WINDOWS = {}
- Tk_IDs = [
- TkUtil.untrust("00000"), # [0]-cmdid
- TkUtil.untrust("00000") # [1]-winid
- ]
+ Tk_IDs = ["00000".taint, "00000".taint] # [0]-cmdid, [1]-winid
Tk_IDs.instance_eval{
@mutex = Mutex.new
def mutex; @mutex; end
@@ -75,13 +59,13 @@ module TkComm
Tk_WINDOWS.freeze
self.instance_eval{
- @cmdtbl = TkUtil.untrust([])
+ @cmdtbl = [].taint
}
unless const_defined?(:GET_CONFIGINFO_AS_ARRAY)
# GET_CONFIGINFO_AS_ARRAY = false => returns a Hash { opt =>val, ... }
# true => returns an Array [[opt,val], ... ]
- # val is a list which includes resource info.
+ # val is a list which includes resource info.
GET_CONFIGINFO_AS_ARRAY = true
end
unless const_defined?(:GET_CONFIGINFOwoRES_AS_ARRAY)
@@ -118,22 +102,15 @@ module TkComm
gen_class_name = ruby_class_name
classname_def = ''
else # ruby_class == nil
- if Tk.const_defined?(tk_class)
- Tk.const_get(tk_class) # auto_load
- ruby_class = WidgetClassNames[tk_class]
- end
-
- unless ruby_class
- mods = TkExtlibAutoloadModule.find_all{|m| m.const_defined?(tk_class)}
- mods.each{|mod|
- begin
- mod.const_get(tk_class) # auto_load
- break if (ruby_class = WidgetClassNames[tk_class])
- rescue LoadError
- # ignore load error
- end
- }
- end
+ mods = TkExtlibAutoloadModule.find_all{|m| m.const_defined?(tk_class)}
+ mods.each{|mod|
+ begin
+ mod.const_get(tk_class) # auto_load
+ break if (ruby_class = WidgetClassNames[tk_class])
+ rescue LoadError
+ # ignore load error
+ end
+ }
unless ruby_class
std_class = 'Tk' << tk_class
@@ -143,14 +120,6 @@ module TkComm
end
end
- unless ruby_class
- if Tk.const_defined?('TOPLEVEL_ALIASES') &&
- Tk::TOPLEVEL_ALIASES.const_defined?(std_class)
- Tk::TOPLEVEL_ALIASES.const_get(std_class) # auto_load
- ruby_class = WidgetClassNames[tk_class]
- end
- end
-
if ruby_class
# found
ruby_class_name = ruby_class.name
@@ -197,7 +166,7 @@ module TkComm
#{classname_def}
end"
end
- Object.class_eval "#{gen_class_name}.new('widgetname'=>'#{path}',
+ Object.class_eval "#{gen_class_name}.new('widgetname'=>'#{path}',
'without_creating'=>true)"
=end
base = Object
@@ -212,7 +181,7 @@ module TkComm
#{klass}"
end
}
- base.class_eval "#{gen_class_name}.new('widgetname'=>'#{path}',
+ base.class_eval "#{gen_class_name}.new('widgetname'=>'#{path}',
'without_creating'=>true)"
end
private :_genobj_for_tkwidget
@@ -253,7 +222,7 @@ module TkComm
val.to_i
when /\A\.\S*\z/
#Tk_WINDOWS[val] ? Tk_WINDOWS[val] : _genobj_for_tkwidget(val)
- TkCore::INTERP.tk_windows[val]?
+ TkCore::INTERP.tk_windows[val]?
TkCore::INTERP.tk_windows[val] : _genobj_for_tkwidget(val)
when /\Ai(_\d+_)?\d+\z/
TkImage::Tk_IMGTBL.mutex.synchronize{
@@ -458,7 +427,7 @@ else
def tk_split_list(str, depth=0, src_enc=true, dst_enc=true)
return [] if str == ""
- tk_split_escstr(str).collect{|token|
+ tk_split_escstr(str).collect{|token|
tk_split_sublist(token, depth - 1)
}
end
@@ -604,7 +573,7 @@ end
def window(val)
if val =~ /^\./
#Tk_WINDOWS[val]? Tk_WINDOWS[val] : _genobj_for_tkwidget(val)
- TkCore::INTERP.tk_windows[val]?
+ TkCore::INTERP.tk_windows[val]?
TkCore::INTERP.tk_windows[val] : _genobj_for_tkwidget(val)
else
nil
@@ -633,38 +602,14 @@ end
val
end
end
- private :bool, :number, :num_or_str, :num_or_nil, :string
- private :list, :simplelist, :window, :image_obj, :procedure
- module_function :bool, :number, :num_or_str, :num_or_nil, :string
+ private :bool, :number, :string, :num_or_str
+ private :list, :simplelist, :window, :procedure
+ module_function :bool, :number, :num_or_str, :string
module_function :list, :simplelist, :window, :image_obj, :procedure
- if (RUBY_VERSION.split('.').map{|n| n.to_i} <=> [1,8,7]) < 0
- def slice_ary(ary, size)
- sliced = []
- wk_ary = ary.dup
- until wk_ary.size.zero?
- sub_ary = []
- size.times{ sub_ary << wk_ary.shift }
- yield(sub_ary) if block_given?
- sliced << sub_ary
- end
- (block_given?)? ary: sliced
- end
- else
- def slice_ary(ary, size, &b)
- if b
- ary.each_slice(size, &b)
- else
- ary.each_slice(size).to_a
- end
- end
- end
- private :slice_ary
- module_function :slice_ary
-
def subst(str, *opts)
# opts := :nobackslashes | :nocommands | novariables
- tk_call('subst',
+ tk_call('subst',
*(opts.collect{|opt|
opt = opt.to_s
(opt[0] == ?-)? opt: '-' << opt
@@ -722,7 +667,7 @@ end
else
str = str.to_s() || ''
unless str.kind_of? String
- fail RuntimeError, "fail to convert the object to a string"
+ fail RuntimeError, "fail to convert the object to a string"
end
str = _toUTF8(str) if enc_mode
end
@@ -761,7 +706,7 @@ end
begin
obj = obj.to_s || ''
rescue
- fail RuntimeError, "fail to convert object '#{obj}' to string"
+ fail RuntimeError, "fail to convert object '#{obj}' to string"
end
(enc_mode)? _toUTF8(obj): obj
end
@@ -847,7 +792,7 @@ end
TkCore::INTERP.tk_cmd_tbl[id] = TkCore::INTERP.get_cb_entry(cmd)
end
@cmdtbl = [] unless defined? @cmdtbl
- TkUtil.untrust(@cmdtbl) unless @cmdtbl.tainted?
+ @cmdtbl.taint unless @cmdtbl.tainted?
@cmdtbl.push id
if local_cmdtbl && local_cmdtbl.kind_of?(Array)
@@ -980,7 +925,7 @@ module TkComm
def _bind_core(mode, what, context, cmd, *args)
id = install_bind(cmd, *args) if cmd
begin
- tk_call_without_enc(*(what + ["<#{tk_event_sequence(context)}>",
+ tk_call_without_enc(*(what + ["<#{tk_event_sequence(context)}>",
mode + id]))
rescue
uninstall_cmd(id) if cmd
@@ -1039,7 +984,7 @@ module TkComm
def _bind_core_for_event_class(klass, mode, what, context, cmd, *args)
id = install_bind_for_event_class(klass, cmd, *args) if cmd
begin
- tk_call_without_enc(*(what + ["<#{tk_event_sequence(context)}>",
+ tk_call_without_enc(*(what + ["<#{tk_event_sequence(context)}>",
mode + id]))
rescue
uninstall_cmd(id) if cmd
@@ -1065,8 +1010,8 @@ module TkComm
private :tk_event_sequence
private :_bind_core, :_bind, :_bind_append, :_bind_remove, :_bindinfo
- private :_bind_core_for_event_class, :_bind_for_event_class,
- :_bind_append_for_event_class, :_bind_remove_for_event_class,
+ private :_bind_core_for_event_class, :_bind_for_event_class,
+ :_bind_append_for_event_class, :_bind_remove_for_event_class,
:_bindinfo_for_event_class
#def bind(tagOrClass, context, cmd=Proc.new, *args)
@@ -1153,9 +1098,13 @@ module TkCore
include TkComm
extend TkComm
- WITH_RUBY_VM = Object.const_defined?(:RubyVM) && ::RubyVM.class == Class
- WITH_ENCODING = defined?(::Encoding.default_external) && true
- #WITH_ENCODING = Object.const_defined?(:Encoding) && ::Encoding.class == Class
+ WITH_RUBY_VM = Object.const_defined?(:VM) && ::VM.class == Class
+ WITH_ENCODING = Object.const_defined?(:Encoding) && ::Encoding.class == Class
+
+ unless self.const_defined? :RUN_EVENTLOOP_ON_MAIN_THREAD
+ ### Ruby 1.9 !!!!!!!!!!!!!!!!!!!!!!!!!!
+ RUN_EVENTLOOP_ON_MAIN_THREAD = false
+ end
unless self.const_defined? :INTERP
if self.const_defined? :IP_NAME
@@ -1174,51 +1123,8 @@ module TkCore
opts = ''
end
- unless self.const_defined? :RUN_EVENTLOOP_ON_MAIN_THREAD
- if WITH_RUBY_VM ### check Ruby 1.9 !!!!!!!
- # *** NEED TO FIX ***
- ip = TclTkIp.new(name, opts)
- if RUBY_PLATFORM =~ /cygwin/
- RUN_EVENTLOOP_ON_MAIN_THREAD = true
- INTERP = ip
- elsif ip._invoke_without_enc('tk', 'windowingsystem') == 'aqua' &&
- (TclTkLib.get_version<=>[8,4,TclTkLib::RELEASE_TYPE::FINAL,6]) > 0
- # *** KNOWN BUG ***
- # Main event loop thread of TkAqua (> Tk8.4.9) must be the main
- # application thread. So, ruby1.9 users must call Tk.mainloop on
- # the main application thread.
- #
- # *** ADD (2009/05/10) ***
- # In some cases (I don't know the description of conditions),
- # TkAqua 8.4.7 has a same kind of hang-up trouble.
- # So, if 8.4.7 or later, set RUN_EVENTLOOP_ON_MAIN_THREAD to true.
- # When you want to control this mode, please call the following
- # (set true/false as you want) before "require 'tk'".
- # ----------------------------------------------------------
- # module TkCore; RUN_EVENTLOOP_ON_MAIN_THREAD = true; end
- # ----------------------------------------------------------
- #
- RUN_EVENTLOOP_ON_MAIN_THREAD = true
- INTERP = ip
- else
- unless self.const_defined? :RUN_EVENTLOOP_ON_MAIN_THREAD
- RUN_EVENTLOOP_ON_MAIN_THREAD = false
- end
- if RUN_EVENTLOOP_ON_MAIN_THREAD
- INTERP = ip
- else
- ip.delete
- end
- end
- ip = nil
-
- else # Ruby 1.8.x
- RUN_EVENTLOOP_ON_MAIN_THREAD = false
- end
- end
-
if !WITH_RUBY_VM || RUN_EVENTLOOP_ON_MAIN_THREAD ### check Ruby 1.9 !!!!!!!
- INTERP = TclTkIp.new(name, opts) unless self.const_defined? :INTERP
+ INTERP = TclTkIp.new(name, opts)
else
INTERP_MUTEX = Mutex.new
INTERP_ROOT_CHECK = ConditionVariable.new
@@ -1229,42 +1135,17 @@ module TkCore
Thread.current[:interp] = e
raise e
end
-
- status = [nil]
- def status.value
- self[0]
- end
- def status.value=(val)
- self[0] = val
- end
-
- Thread.current[:status] = status
+ Thread.current[:status] = nil
#sleep
begin
- begin
- #TclTkLib.mainloop_abort_on_exception = false
- #Thread.current[:status].value = TclTkLib.mainloop(true)
- interp.mainloop_abort_on_exception = true
- Thread.current[:status].value = interp.mainloop(true)
- rescue SystemExit=>e
- Thread.current[:status].value = e
- rescue Exception=>e
- Thread.current[:status].value = e
- retry if interp.has_mainwindow?
- ensure
- INTERP_MUTEX.synchronize{ INTERP_ROOT_CHECK.broadcast }
- end
-
- #Thread.current[:status].value = TclTkLib.mainloop(false)
- Thread.current[:status].value = interp.mainloop(false)
-
+ Thread.current[:status] = TclTkLib.mainloop(true)
+ rescue Exception=>e
+ Thread.current[:status] = e
ensure
- # interp must be deleted before the thread for interp is dead.
- # If not, raise Tcl_Panic on Tcl_AsyncDelete because async handler
- # deleted by the wrong thread.
- interp.delete
+ INTERP_MUTEX.synchronize{ INTERP_ROOT_CHECK.broadcast }
end
+ Thread.current[:status] = TclTkLib.mainloop(false)
}
until INTERP_THREAD[:interp]
@@ -1274,22 +1155,17 @@ module TkCore
raise INTERP_THREAD[:interp] if INTERP_THREAD[:interp].kind_of? Exception
INTERP = INTERP_THREAD[:interp]
- INTERP_THREAD_STATUS = INTERP_THREAD[:status]
end
def INTERP.__getip
self
end
- def INTERP.default_master?
- true
- end
INTERP.instance_eval{
- # @tk_cmd_tbl = TkUtil.untrust({})
- @tk_cmd_tbl =
- TkUtil.untrust(Hash.new{|hash, key|
- fail IndexError, "unknown command ID '#{key}'"
- })
+ # @tk_cmd_tbl = {}.taint
+ @tk_cmd_tbl = Hash.new{|hash, key|
+ fail IndexError, "unknown command ID '#{key}'"
+ }.taint
def @tk_cmd_tbl.[]=(idx,val)
if self.has_key?(idx) && Thread.current.group != ThreadGroup::Default
fail SecurityError,"cannot change the entried command"
@@ -1297,16 +1173,12 @@ module TkCore
super(idx,val)
end
- @tk_windows = TkUtil.untrust({})
-
- @tk_table_list = TkUtil.untrust([])
+ @tk_windows = {}.taint
- @init_ip_env = TkUtil.untrust([]) # table of Procs
- @add_tk_procs = TkUtil.untrust([]) # table of [name, args, body]
+ @tk_table_list = [].taint
- @force_default_encoding ||= TkUtil.untrust([false])
- @encoding ||= TkUtil.untrust([nil])
- def @encoding.to_s; self.join(nil); end
+ @init_ip_env = [].taint # table of Procs
+ @add_tk_procs = [].taint # table of [name, args, body]
@cb_entry_class = Class.new(TkCallbackEntry){
class << self
@@ -1359,7 +1231,7 @@ module TkCore
end
def INTERP.create_table
id = @tk_table_list.size
- (tbl = {}).tainted? || TkUtil.untrust(tbl)
+ (tbl = {}).tainted? || tbl.taint
@tk_table_list << tbl
# obj = Object.new
# obj.instance_eval <<-EOD
@@ -1394,11 +1266,10 @@ module TkCore
def INTERP.remove_tk_procs(*names)
names.each{|name|
name = name.to_s
- @add_tk_procs.delete_if{|elem|
+ @add_tk_procs.delete_if{|elem|
elem.kind_of?(Array) && elem[0].to_s == name
}
- #self._invoke('rename', name, '')
- self.__invoke__('rename', name, '')
+ self._invoke('rename', name, '')
}
end
def INTERP.init_ip_internal
@@ -1408,13 +1279,8 @@ module TkCore
end
end
- unless self.const_defined? :RUN_EVENTLOOP_ON_MAIN_THREAD
- ### Ruby 1.9 !!!!!!!!!!!!!!!!!!!!!!!!!!
- RUN_EVENTLOOP_ON_MAIN_THREAD = false
- end
-
WIDGET_DESTROY_HOOK = '<WIDGET_DESTROY_HOOK>'
- INTERP._invoke_without_enc('event', 'add',
+ INTERP._invoke_without_enc('event', 'add',
"<#{WIDGET_DESTROY_HOOK}>", '<Destroy>')
INTERP._invoke_without_enc('bind', 'all', "<#{WIDGET_DESTROY_HOOK}>",
install_cmd(proc{|path|
@@ -1431,7 +1297,7 @@ module TkCore
end
}) << ' %W')
- INTERP.add_tk_procs(TclTkLib::FINALIZE_PROC_NAME, '',
+ INTERP.add_tk_procs(TclTkLib::FINALIZE_PROC_NAME, '',
"catch { bind all <#{WIDGET_DESTROY_HOOK}> {} }")
INTERP.add_tk_procs('rb_out', 'ns args', <<-'EOL')
@@ -1534,10 +1400,10 @@ module TkCore
fail(e)
rescue Exception => e
begin
- msg = _toUTF8(e.class.inspect) + ': ' +
- _toUTF8(e.message) + "\n" +
- "\n---< backtrace of Ruby side >-----\n" +
- _toUTF8(e.backtrace.join("\n")) +
+ msg = _toUTF8(e.class.inspect) + ': ' +
+ _toUTF8(e.message) + "\n" +
+ "\n---< backtrace of Ruby side >-----\n" +
+ _toUTF8(e.backtrace.join("\n")) +
"\n---< backtrace of Tk side >-------"
if TkCore::WITH_ENCODING
msg.force_encoding('utf-8')
@@ -1545,9 +1411,9 @@ module TkCore
msg.instance_variable_set(:@encoding, 'utf-8')
end
rescue Exception
- msg = e.class.inspect + ': ' + e.message + "\n" +
- "\n---< backtrace of Ruby side >-----\n" +
- e.backtrace.join("\n") +
+ msg = e.class.inspect + ': ' + e.message + "\n" +
+ "\n---< backtrace of Ruby side >-----\n" +
+ e.backtrace.join("\n") +
"\n---< backtrace of Tk side >-------"
end
# TkCore::INTERP._set_global_var('errorInfo', msg)
@@ -1560,15 +1426,15 @@ module TkCore
# arg = tk_split_list(arg_str)
arg = tk_split_simplelist(arg_str)
#_get_eval_string(TkUtil.eval_cmd(Tk_CMDTBL[arg.shift], *arg))
- #_get_eval_string(TkUtil.eval_cmd(TkCore::INTERP.tk_cmd_tbl[arg.shift],
+ #_get_eval_string(TkUtil.eval_cmd(TkCore::INTERP.tk_cmd_tbl[arg.shift],
# *arg))
# TkCore::INTERP.tk_cmd_tbl[arg.shift].call(*arg)
begin
TkCore::INTERP.tk_cmd_tbl[arg.shift].call(*arg)
rescue Exception => e
- raise(e, e.class.inspect + ': ' + e.message + "\n" +
- "\n---< backtrace of Ruby side >-----\n" +
- e.backtrace.join("\n") +
+ raise(e, e.class.inspect + ': ' + e.message + "\n" +
+ "\n---< backtrace of Ruby side >-----\n" +
+ e.backtrace.join("\n") +
"\n---< backtrace of Tk side >-------")
end
#=begin
@@ -1586,7 +1452,7 @@ module TkCore
# cb_obj.call(*arg)
# rescue
# trace = $!.backtrace
-# raise $!, "\n#{trace[0]}: #{$!.message} (#{$!.class})\n" +
+# raise $!, "\n#{trace[0]}: #{$!.message} (#{$!.class})\n" +
# "\tfrom #{trace[1..pos].join("\n\tfrom ")}"
# end
# end
@@ -1776,36 +1642,17 @@ module TkCore
end
def mainloop(check_root = true)
- if !TkCore::WITH_RUBY_VM
- TclTkLib.mainloop(check_root)
-
- elsif TkCore::RUN_EVENTLOOP_ON_MAIN_THREAD
- # if TclTkLib::WINDOWING_SYSTEM == 'aqua' &&
- #if TkCore::INTERP._invoke_without_enc('tk','windowingsystem')=='aqua' &&
- # Thread.current != Thread.main &&
- # (TclTkLib.get_version <=> [8,4,TclTkLib::RELEASE_TYPE::FINAL,9]) > 0
- # raise RuntimeError,
- # "eventloop on TkAqua ( > Tk8.4.9 ) works on the main thread only"
- #end
- if Thread.current != Thread.main
- raise RuntimeError, "Tk.mainloop is allowed on the main thread only"
- end
+ if !TkCore::WITH_RUBY_VM || TkCore::RUN_EVENTLOOP_ON_MAIN_THREAD
TclTkLib.mainloop(check_root)
-
else ### Ruby 1.9 !!!!!
- unless TkCore::INTERP.default_master?
- # [MultiTkIp] slave interp ?
- return TkCore::INTERP._thread_tkwait('window', '.') if check_root
- end
-
begin
TclTkLib.set_eventloop_window_mode(true)
if check_root
INTERP_MUTEX.synchronize{
INTERP_ROOT_CHECK.wait(INTERP_MUTEX)
- status = INTERP_THREAD_STATUS.value
- if status && TkCore::INTERP.default_master?
- INTERP_THREAD_STATUS.value = nil if $SAFE < 4
+ status = INTERP_THREAD[:status]
+ if status
+ INTERP_THREAD[:status] = nil
raise status if status.kind_of?(Exception)
end
}
@@ -1890,11 +1737,11 @@ module TkCore
if context.kind_of?(TkEvent::Event)
context.generate(win, ((keys)? keys: {}))
elsif keys
- tk_call_without_enc('event', 'generate', win,
- "<#{tk_event_sequence(context)}>",
+ tk_call_without_enc('event', 'generate', win,
+ "<#{tk_event_sequence(context)}>",
*hash_kv(keys, true))
else
- tk_call_without_enc('event', 'generate', win,
+ tk_call_without_enc('event', 'generate', win,
"<#{tk_event_sequence(context)}>")
end
nil
@@ -1991,7 +1838,7 @@ module TkCore
puts 'invoke args => ' + args.inspect if $DEBUG
### print "=> ", args.join(" ").inspect, "\n" if $DEBUG
begin
- # res = TkUtil.untrust(INTERP._invoke(*args))
+ # res = INTERP._invoke(*args).taint
# res = INTERP._invoke(enc_mode, *args)
res = _ip_invoke_core(enc_mode, *args)
# >>>>> _invoke returns a TAINTED string <<<<<
@@ -1999,9 +1846,9 @@ module TkCore
# err = $!
begin
args.unshift "unknown"
- #res = TkUtil.untrust(INTERP._invoke(*args))
- #res = INTERP._invoke(enc_mode, *args)
- res = _ip_invoke_core(enc_mode, *args)
+ #res = INTERP._invoke(*args).taint
+ #res = INTERP._invoke(enc_mode, *args)
+ res = _ip_invoke_core(enc_mode, *args)
# >>>>> _invoke returns a TAINTED string <<<<<
rescue StandardError => err2
fail err2 unless /^invalid command/ =~ err2.message
@@ -2083,7 +1930,7 @@ module Tk
TK_MAJOR_VERSION = major.to_i
TK_MINOR_VERSION = minor.to_i
- JAPANIZED_TK = (INTERP._invoke_without_enc("info", "commands",
+ JAPANIZED_TK = (INTERP._invoke_without_enc("info", "commands",
"kanji") != "").freeze
def Tk.const_missing(sym)
@@ -2112,14 +1959,14 @@ module Tk
fail SecurityError, "can't get #{sym} when $SAFE >= 4"
end
INTERP._invoke_without_enc('global', 'tcl_platform')
- Hash[*tk_split_simplelist(INTERP._invoke_without_enc('array', 'get',
+ Hash[*tk_split_simplelist(INTERP._invoke_without_enc('array', 'get',
'tcl_platform'))]
when :ENV
INTERP._invoke_without_enc('global', 'env')
Hash[*tk_split_simplelist(INTERP._invoke('array', 'get', 'env'))]
- #when :AUTO_PATH #<===
+ #when :AUTO_PATH #<===
# tk_split_simplelist(INTERP._invoke('set', 'auto_path'))
#when :AUTO_OLDPATH
@@ -2137,7 +1984,7 @@ module Tk
var_nam = 'tkPriv'
end
INTERP._invoke_without_enc('global', var_nam)
- Hash[*tk_split_simplelist(INTERP._invoke('array', 'get',
+ Hash[*tk_split_simplelist(INTERP._invoke('array', 'get',
var_nam))].each{|k,v|
k.freeze
case v
@@ -2293,7 +2140,7 @@ module Tk
end
def Tk.exit
- TkCore::INTERP.has_mainwindow? && tk_call_without_enc('destroy', '.')
+ tk_call_without_enc('destroy', '.')
end
################################################
@@ -2364,9 +2211,9 @@ module Tk
end
# NOTE::
- # If no eventloop-thread is running, "thread_update" method is same
- # to "update" method. Else, "thread_update" method waits to complete
- # idletask operation on the eventloop-thread.
+ # If no eventloop-thread is running, "thread_update" method is same
+ # to "update" method. Else, "thread_update" method waits to complete
+ # idletask operation on the eventloop-thread.
def Tk.thread_update(idle=nil)
if idle
tk_call_without_enc('thread_update', 'idletasks')
@@ -2438,7 +2285,7 @@ module Tk
def Tk.add_kinsoku(chars, mode='both')
begin
if /^8\.*/ === TK_VERSION && JAPANIZED_TK
- tk_split_simplelist(tk_call('kinsoku', 'add', mode,
+ tk_split_simplelist(tk_call('kinsoku', 'add', mode,
*(chars.split(''))))
else
[]
@@ -2450,7 +2297,7 @@ module Tk
def Tk.delete_kinsoku(chars, mode='both')
begin
if /^8\.*/ === TK_VERSION && JAPANIZED_TK
- tk_split_simplelist(tk_call('kinsoku', 'delete', mode,
+ tk_split_simplelist(tk_call('kinsoku', 'delete', mode,
*(chars.split(''))))
end
rescue
@@ -2460,7 +2307,7 @@ module Tk
def Tk.toUTF8(str, encoding = nil)
_toUTF8(str, encoding)
end
-
+
def Tk.fromUTF8(str, encoding = nil)
_fromUTF8(str, encoding)
end
@@ -2508,7 +2355,6 @@ if (/^(8\.[1-9]|9\.|[1-9][0-9])/ =~ Tk::TCL_VERSION && !Tk::JAPANIZED_TK)
BINARY_NAME = 'binary'.freeze
UTF8_NAME = 'utf-8'.freeze
DEFAULT_EXTERNAL_NAME = RubyEncoding.default_external.name.freeze
- DEFAULT_INTERNAL_NAME = RubyEncoding.default_internal.name.freeze rescue nil
BINARY = RubyEncoding.find(BINARY_NAME)
UNKNOWN = RubyEncoding.find('ASCII-8BIT')
@@ -2517,11 +2363,11 @@ if (/^(8\.[1-9]|9\.|[1-9][0-9])/ =~ Tk::TCL_VERSION && !Tk::JAPANIZED_TK)
ENCODING_TABLE = TkCore::INTERP.encoding_table
=begin
ENCODING_TABLE = {
- 'binary' => BINARY,
- # 'UNKNOWN-8BIT' => UNKNOWN,
+ 'binary' => BINARY,
+ # 'UNKNOWN-8BIT' => UNKNOWN,
}
- list = TkCore::INTERP._invoke_without_enc(ENCNAMES_CMD[0],
+ list = TkCore::INTERP._invoke_without_enc(ENCNAMES_CMD[0],
ENCNAMES_CMD[1])
TkCore::INTERP._split_tklist(list).each{|name|
begin
@@ -2569,7 +2415,7 @@ if (/^(8\.[1-9]|9\.|[1-9][0-9])/ =~ Tk::TCL_VERSION && !Tk::JAPANIZED_TK)
end
# Is it new ?
- list = TkCore::INTERP._invoke_without_enc(ENCNAMES_CMD[0],
+ list = TkCore::INTERP._invoke_without_enc(ENCNAMES_CMD[0],
ENCNAMES_CMD[1])
TkComm.simplelist(list).each{|name|
if ((enc == RubyEncoding.find(name)) rescue false)
@@ -2586,7 +2432,7 @@ if (/^(8\.[1-9]|9\.|[1-9][0-9])/ =~ Tk::TCL_VERSION && !Tk::JAPANIZED_TK)
# Is it new ?
if (enc_obj = (RubyEncoding.find(name) rescue false))
- list = TkCore::INTERP._invoke_without_enc(ENCNAMES_CMD[0],
+ list = TkCore::INTERP._invoke_without_enc(ENCNAMES_CMD[0],
ENCNAMES_CMD[1])
if TkComm.simplelist(list).index(name)
# Tk's encoding name ?
@@ -2646,9 +2492,8 @@ if (/^(8\.[1-9]|9\.|[1-9][0-9])/ =~ Tk::TCL_VERSION && !Tk::JAPANIZED_TK)
alias default_encoding encoding_name
def tk_encoding_names
- #TkComm.simplelist(TkCore::INTERP._invoke_without_enc(Tk::Encoding::ENCNAMES_CMD[0], Tk::Encoding::ENCNAMES_CMD[1]))
- TkComm.simplelist(TkCore::INTERP._invoke_without_enc('encoding', 'names'))
- end
+ TkComm.simplelist(TkCore::INTERP._invoke_without_enc(Tk::Encoding::ENCNAMES_CMD[0], Tk::Encoding::ENCNAMES_CMD[1]))
+ end
def encoding_names
self.tk_encoding_names.find_all{|name|
Tk::Encoding::ENCODING_TABLE.get_name(name) rescue false
@@ -2740,7 +2585,7 @@ if (/^(8\.[1-9]|9\.|[1-9][0-9])/ =~ Tk::TCL_VERSION && !Tk::JAPANIZED_TK)
else
str.instance_variable_set('@encoding', 'binary')
end
- ret = TkCore::INTERP._invoke_without_enc('encoding', 'convertfrom',
+ ret = TkCore::INTERP._invoke_without_enc('encoding', 'convertfrom',
enc, str)
if TkCore::WITH_ENCODING
ret.force_encoding('utf-8')
@@ -2754,7 +2599,7 @@ if (/^(8\.[1-9]|9\.|[1-9][0-9])/ =~ Tk::TCL_VERSION && !Tk::JAPANIZED_TK)
def encoding_convertto(str, enc=nil)
# str must be a UTF-8 string
enc = encoding_system_name unless enc
- ret = TkCore::INTERP._invoke_without_enc('encoding', 'convertto',
+ ret = TkCore::INTERP._invoke_without_enc('encoding', 'convertto',
enc, str)
#ret.instance_variable_set('@encoding', 'binary')
if TkCore::WITH_ENCODING
@@ -2781,16 +2626,16 @@ if (/^(8\.[1-9]|9\.|[1-9][0-9])/ =~ Tk::TCL_VERSION && !Tk::JAPANIZED_TK)
class TclTkIp
def force_default_encoding=(mode)
- @force_default_encoding[0] = (mode)? true: false
+ @force_default_encoding = (mode)? true: false
end
def force_default_encoding?
- @force_default_encoding[0] ||= false
+ @force_default_encoding ||= false
end
def default_encoding=(name)
- name = name.name if Tk::WITH_ENCODING && name.kind_of?(::Encoding)
- @encoding[0] = name.to_s.dup
+ name = name.name if name.kind_of?(::Encoding) if Tk::WITH_ENCODING
+ @encoding = name
end
# from tkencoding.rb by ttate@jaist.ac.jp
@@ -2801,16 +2646,16 @@ if (/^(8\.[1-9]|9\.|[1-9][0-9])/ =~ Tk::TCL_VERSION && !Tk::JAPANIZED_TK)
end
def encoding_name
- (@encoding[0])? @encoding[0].dup: nil
+ (@encoding)? @encoding.dup: nil
end
alias encoding encoding_name
alias default_encoding encoding_name
def encoding_obj
if Tk::WITH_ENCODING
- Tk::Encoding.tcl2rb_encoding(@encoding[0])
+ Tk::Encoding.tcl2rb_encoding(@encoding)
else
- (@encoding[0])? @encoding[0].dup: nil
+ (@encoding)? @encoding.dup: nil
end
end
@@ -2838,15 +2683,10 @@ if (/^(8\.[1-9]|9\.|[1-9][0-9])/ =~ Tk::TCL_VERSION && !Tk::JAPANIZED_TK)
enc_name ||= str.instance_variable_get(:@encoding)
- enc_name ||=
+ enc_name ||=
Tk::Encoding::ENCODING_TABLE.get_name(str.encoding) rescue nil
- if enc_name
- # str has its encoding information
- encstr = __toUTF8(str, enc_name)
- encstr.force_encoding(Tk::Encoding::UTF8_NAME)
- return encstr
- else
+ unless enc_name
# str.encoding isn't supported by Tk -> try to convert on Ruby
begin
return str.encode(Tk::Encoding::UTF8_NAME) # new string
@@ -2855,7 +2695,7 @@ if (/^(8\.[1-9]|9\.|[1-9][0-9])/ =~ Tk::TCL_VERSION && !Tk::JAPANIZED_TK)
end
end
- #enc_name ||=
+ #enc_name ||=
# Tk::Encoding::ENCODING_TABLE.get_name(Tk.encoding) rescue nil
enc_name ||= Tk::Encoding::ENCODING_TABLE.get_name(nil)
@@ -2876,7 +2716,7 @@ if (/^(8\.[1-9]|9\.|[1-9][0-9])/ =~ Tk::TCL_VERSION && !Tk::JAPANIZED_TK)
def _fromUTF8(str, enc = nil)
# str must be UTF-8 or binary.
enc_name = str.instance_variable_get(:@encoding)
- enc_name ||=
+ enc_name ||=
Tk::Encoding::ENCODING_TABLE.get_name(str.encoding) rescue nil
# is 'binary' encoding?
@@ -3066,7 +2906,7 @@ if (/^(8\.[1-9]|9\.|[1-9][0-9])/ =~ Tk::TCL_VERSION && !Tk::JAPANIZED_TK)
end
# estimate encoding
- unless TkCore::WITH_ENCODING
+ unless TkCore::WITH_ENCODING
case $KCODE
when /^e/i # EUC
Tk.encoding = 'euc-jp'
@@ -3099,16 +2939,14 @@ if (/^(8\.[1-9]|9\.|[1-9][0-9])/ =~ Tk::TCL_VERSION && !Tk::JAPANIZED_TK)
end
else ### Ruby 1.9 !!!!!!!!!!!!
- # loc_enc_obj = (::Encoding.find(::Encoding.locale_charmap) rescue Tk::Encoding::UNKNOWN)
- loc_enc_obj = ::Encoding.find("locale")
+ loc_enc_obj = ::Encoding.find(::Encoding.locale_charmap)
ext_enc_obj = ::Encoding.default_external
- int_enc_obj = ::Encoding.default_internal || ext_enc_obj
tksys_enc_name = Tk::Encoding::ENCODING_TABLE.get_name(Tk.encoding_system)
# p [Tk.encoding, Tk.encoding_system, loc_enc_obj, ext_enc_obj]
=begin
if ext_enc_obj == Tk::Encoding::UNKNOWN
- if defined? DEFAULT_TK_ENCODING
+ if defind? DEFAULT_TK_ENCODING
if DEFAULT_TK_ENCODING.kind_of?(::Encoding)
tk_enc_name = DEFAULT_TK_ENCODING.name
tksys_enc_name = DEFAULT_TK_ENCODING.name
@@ -3174,13 +3012,12 @@ if (/^(8\.[1-9]|9\.|[1-9][0-9])/ =~ Tk::TCL_VERSION && !Tk::JAPANIZED_TK)
enc_name = nil
rescue ArgumentError
enc_name = nil
- fail ArgumentError,
+ fail ArgumentError,
"DEFAULT_TK_ENCODING has an unknown encoding #{default_def}"
end
unless enc_name
- #if ext_enc_obj == Tk::Encoding::UNKNOWN
- if int_enc_obj == Tk::Encoding::UNKNOWN
+ if ext_enc_obj == Tk::Encoding::UNKNOWN
if loc_enc_obj == Tk::Encoding::UNKNOWN
# use Tk.encoding_system
enc_name = tksys_enc_name
@@ -3188,7 +3025,7 @@ if (/^(8\.[1-9]|9\.|[1-9][0-9])/ =~ Tk::TCL_VERSION && !Tk::JAPANIZED_TK)
# use locale_charmap
begin
loc_enc_name = Tk::Encoding::ENCODING_TABLE.get_name(loc_enc_obj)
- if loc_enc_name
+ if loc_enc_name && loc_enc_name != tksys_enc_name
# use locale_charmap
enc_name = loc_enc_name
else
@@ -3202,12 +3039,10 @@ if (/^(8\.[1-9]|9\.|[1-9][0-9])/ =~ Tk::TCL_VERSION && !Tk::JAPANIZED_TK)
end
else
begin
- #ext_enc_name = Tk::Encoding::ENCODING_TABLE.get_name(ext_enc_obj)
- #if ext_enc_name && ext_enc_name != tksys_enc_name
- int_enc_name = Tk::Encoding::ENCODING_TABLE.get_name(int_enc_obj)
- if int_enc_name
- # use default_internal
- enc_name = int_enc_name
+ ext_enc_name = Tk::Encoding::ENCODING_TABLE.get_name(ext_enc_obj)
+ if ext_enc_name && ext_enc_name != tksys_enc_name
+ # use default_external
+ enc_name = ext_enc_name
else
# use Tk.encoding_system
enc_name = tksys_enc_name
@@ -3351,19 +3186,19 @@ module TkTreatFont
if key
pathname = [win, tag, key].join(';')
- TkFont.used_on(pathname) ||
+ TkFont.used_on(pathname) ||
TkFont.init_widget_font(pathname, *__confinfo_cmd)
elsif optkeys.size == 1
pathname = [win, tag, optkeys[0]].join(';')
- TkFont.used_on(pathname) ||
+ TkFont.used_on(pathname) ||
TkFont.init_widget_font(pathname, *__confinfo_cmd)
else
fonts = {}
- optkeys.each{|k|
- k = k.to_s
- pathname = [win, tag, k].join(';')
- fonts[k] =
- TkFont.used_on(pathname) ||
+ optkeys.each{|key|
+ key = key.to_s
+ pathname = [win, tag, key].join(';')
+ fonts[key] =
+ TkFont.used_on(pathname) ||
TkFont.init_widget_font(pathname, *__confinfo_cmd)
}
fonts
@@ -3393,8 +3228,8 @@ module TkTreatFont
next
else
if fnt
- if (slot.key?(l_optkey) ||
- slot.key?(a_optkey) ||
+ if (slot.key?(l_optkey) ||
+ slot.key?(a_optkey) ||
slot.key?(k_optkey))
fnt = TkFont.new(fnt)
@@ -3405,7 +3240,7 @@ module TkTreatFont
fnt.latin_replace(lfnt) if lfnt
fnt.kanji_replace(kfnt) if kfnt
- fnt.call_font_configure([pathname, optkey],
+ fnt.call_font_configure([pathname, optkey],
*(__config_cmd << {}))
next
else
@@ -3430,7 +3265,7 @@ module TkTreatFont
kfnt = slot.delete(k_optkey)
if lfnt && kfnt
- TkFont.new(lfnt, kfnt).call_font_configure([pathname, optkey],
+ TkFont.new(lfnt, kfnt).call_font_configure([pathname, optkey],
*(__config_cmd << {}))
elsif lfnt
latinfont_configure([lfnt, optkey])
@@ -3487,7 +3322,7 @@ module TkTreatFont
if fobj.kind_of?(TkFont)
if ltn.kind_of?(TkFont)
conf = {}
- ltn.latin_configinfo.each{|k,val| conf[k] = val}
+ ltn.latin_configinfo.each{|key,val| conf[key] = val}
if keys
fobj.latin_configure(conf.update(keys))
else
@@ -3547,7 +3382,7 @@ module TkTreatFont
if fobj.kind_of?(TkFont)
if knj.kind_of?(TkFont)
conf = {}
- knj.kanji_configinfo.each{|k,val| conf[k] = val}
+ knj.kanji_configinfo.each{|key,val| conf[key] = val}
if keys
fobj.kanji_configure(conf.update(keys))
else
@@ -3588,7 +3423,7 @@ module TkTreatFont
def latinfont_copy(win, wintag=nil, winkey=nil, targetkey=nil)
if targetkey
- fontobj(targetkey).dup.call_font_configure([__pathname, targetkey],
+ fontobj(targetkey).dup.call_font_configure([__pathname, targetkey],
*(__config_cmd << {}))
else
fontobj.dup.call_font_configure(__pathname, *(__config_cmd << {}))
@@ -3613,7 +3448,7 @@ module TkTreatFont
def kanjifont_copy(win, wintag=nil, winkey=nil, targetkey=nil)
if targetkey
- fontobj(targetkey).dup.call_font_configure([__pathname, targetkey],
+ fontobj(targetkey).dup.call_font_configure([__pathname, targetkey],
*(__config_cmd << {}))
else
fontobj.dup.call_font_configure(__pathname, *(__config_cmd << {}))
@@ -3665,7 +3500,7 @@ module TkConfigMethod
private :__confinfo_cmd
def __configinfo_struct
- {:key=>0, :alias=>1, :db_name=>1, :db_class=>2,
+ {:key=>0, :alias=>1, :db_name=>1, :db_class=>2,
:default_value=>3, :current_value=>4}
end
private :__configinfo_struct
@@ -3692,10 +3527,10 @@ module TkConfigMethod
def __strval_optkeys
[
- 'text', 'label', 'show', 'data', 'file',
- 'activebackground', 'activeforeground', 'background',
- 'disabledforeground', 'disabledbackground', 'foreground',
- 'highlightbackground', 'highlightcolor', 'insertbackground',
+ 'text', 'label', 'show', 'data', 'file',
+ 'activebackground', 'activeforeground', 'background',
+ 'disabledforeground', 'disabledbackground', 'foreground',
+ 'highlightbackground', 'highlightcolor', 'insertbackground',
'selectbackground', 'selectforeground', 'troughcolor'
]
end
@@ -3781,17 +3616,11 @@ module TkConfigMethod
val
end
- def cget_tkstring(option)
- opt = option.to_s
- fail ArgumentError, "Invalid option `#{option.inspect}'" if opt.length == 0
- tk_call_without_enc(*(__cget_cmd << "-#{opt}"))
- end
-
def __cget_core(slot)
orig_slot = slot
slot = slot.to_s
-
- if slot.length == 0
+
+ if slot.length == 0
fail ArgumentError, "Invalid option `#{orig_slot.inspect}'"
end
@@ -4017,12 +3846,12 @@ module TkConfigMethod
def __configinfo_core(slot = nil)
if TkComm::GET_CONFIGINFO_AS_ARRAY
- if (slot &&
+ if (slot &&
slot.to_s =~ /^(|latin|ascii|kanji)(#{__font_optkeys.join('|')})$/)
fontkey = $2
# conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{fontkey}"))))
conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{fontkey}")), false, true)
- conf[__configinfo_struct[:key]] =
+ conf[__configinfo_struct[:key]] =
conf[__configinfo_struct[:key]][1..-1]
if ( ! __configinfo_struct[:alias] \
|| conf.size > __configinfo_struct[:alias] + 1 )
@@ -4034,7 +3863,7 @@ module TkConfigMethod
elsif ( __configinfo_struct[:alias] \
&& conf.size == __configinfo_struct[:alias] + 1 \
&& conf[__configinfo_struct[:alias]][0] == ?- )
- conf[__configinfo_struct[:alias]] =
+ conf[__configinfo_struct[:alias]] =
conf[__configinfo_struct[:alias]][1..-1]
end
conf
@@ -4084,7 +3913,7 @@ module TkConfigMethod
if ( __configinfo_struct[:default_value] \
&& conf[__configinfo_struct[:default_value]])
begin
- conf[__configinfo_struct[:default_value]] =
+ conf[__configinfo_struct[:default_value]] =
number(conf[__configinfo_struct[:default_value]])
rescue
conf[__configinfo_struct[:default_value]] = nil
@@ -4092,7 +3921,7 @@ module TkConfigMethod
end
if ( conf[__configinfo_struct[:current_value]] )
begin
- conf[__configinfo_struct[:current_value]] =
+ conf[__configinfo_struct[:current_value]] =
number(conf[__configinfo_struct[:current_value]])
rescue
conf[__configinfo_struct[:current_value]] = nil
@@ -4105,11 +3934,11 @@ module TkConfigMethod
if ( __configinfo_struct[:default_value] \
&& conf[__configinfo_struct[:default_value]])
- conf[__configinfo_struct[:default_value]] =
+ conf[__configinfo_struct[:default_value]] =
num_or_str(conf[__configinfo_struct[:default_value]])
end
if ( conf[__configinfo_struct[:current_value]] )
- conf[__configinfo_struct[:current_value]] =
+ conf[__configinfo_struct[:current_value]] =
num_or_str(conf[__configinfo_struct[:current_value]])
end
@@ -4120,7 +3949,7 @@ module TkConfigMethod
if ( __configinfo_struct[:default_value] \
&& conf[__configinfo_struct[:default_value]])
begin
- conf[__configinfo_struct[:default_value]] =
+ conf[__configinfo_struct[:default_value]] =
bool(conf[__configinfo_struct[:default_value]])
rescue
conf[__configinfo_struct[:default_value]] = nil
@@ -4128,7 +3957,7 @@ module TkConfigMethod
end
if ( conf[__configinfo_struct[:current_value]] )
begin
- conf[__configinfo_struct[:current_value]] =
+ conf[__configinfo_struct[:current_value]] =
bool(conf[__configinfo_struct[:current_value]])
rescue
conf[__configinfo_struct[:current_value]] = nil
@@ -4141,11 +3970,11 @@ module TkConfigMethod
if ( __configinfo_struct[:default_value] \
&& conf[__configinfo_struct[:default_value]])
- conf[__configinfo_struct[:default_value]] =
+ conf[__configinfo_struct[:default_value]] =
simplelist(conf[__configinfo_struct[:default_value]])
end
if ( conf[__configinfo_struct[:current_value]] )
- conf[__configinfo_struct[:current_value]] =
+ conf[__configinfo_struct[:current_value]] =
simplelist(conf[__configinfo_struct[:current_value]])
end
@@ -4156,12 +3985,12 @@ module TkConfigMethod
if ( __configinfo_struct[:default_value] \
&& conf[__configinfo_struct[:default_value]] \
&& conf[__configinfo_struct[:default_value]] =~ /^[0-9]/ )
- conf[__configinfo_struct[:default_value]] =
+ conf[__configinfo_struct[:default_value]] =
list(conf[__configinfo_struct[:default_value]])
end
if ( conf[__configinfo_struct[:current_value]] \
&& conf[__configinfo_struct[:current_value]] =~ /^[0-9]/ )
- conf[__configinfo_struct[:current_value]] =
+ conf[__configinfo_struct[:current_value]] =
list(conf[__configinfo_struct[:current_value]])
end
@@ -4192,16 +4021,15 @@ module TkConfigMethod
else
# conf = tk_split_list(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}"))))
- # conf = tk_split_list(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), 0, false, true)
- conf = tk_split_list(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), 1, false, true)
+ conf = tk_split_list(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), 0, false, true)
end
- conf[__configinfo_struct[:key]] =
+ conf[__configinfo_struct[:key]] =
conf[__configinfo_struct[:key]][1..-1]
if ( __configinfo_struct[:alias] \
&& conf.size == __configinfo_struct[:alias] + 1 \
&& conf[__configinfo_struct[:alias]][0] == ?- )
- conf[__configinfo_struct[:alias]] =
+ conf[__configinfo_struct[:alias]] =
conf[__configinfo_struct[:alias]][1..-1]
end
@@ -4212,7 +4040,7 @@ module TkConfigMethod
# conf = tk_split_simplelist(conflist)
ret = tk_split_simplelist(tk_call_without_enc(*__confinfo_cmd), false, false).collect{|conflist|
conf = tk_split_simplelist(conflist, false, true)
- conf[__configinfo_struct[:key]] =
+ conf[__configinfo_struct[:key]] =
conf[__configinfo_struct[:key]][1..-1]
optkey = conf[__configinfo_struct[:key]]
@@ -4248,7 +4076,7 @@ module TkConfigMethod
if ( __configinfo_struct[:default_value] \
&& conf[__configinfo_struct[:default_value]] )
begin
- conf[__configinfo_struct[:default_value]] =
+ conf[__configinfo_struct[:default_value]] =
number(conf[__configinfo_struct[:default_value]])
rescue
conf[__configinfo_struct[:default_value]] = nil
@@ -4256,7 +4084,7 @@ module TkConfigMethod
end
if ( conf[__configinfo_struct[:current_value]] )
begin
- conf[__configinfo_struct[:current_value]] =
+ conf[__configinfo_struct[:current_value]] =
number(conf[__configinfo_struct[:current_value]])
rescue
conf[__configinfo_struct[:current_value]] = nil
@@ -4266,11 +4094,11 @@ module TkConfigMethod
when /^(#{__numstrval_optkeys.join('|')})$/
if ( __configinfo_struct[:default_value] \
&& conf[__configinfo_struct[:default_value]] )
- conf[__configinfo_struct[:default_value]] =
+ conf[__configinfo_struct[:default_value]] =
num_or_str(conf[__configinfo_struct[:default_value]])
end
if ( conf[__configinfo_struct[:current_value]] )
- conf[__configinfo_struct[:current_value]] =
+ conf[__configinfo_struct[:current_value]] =
num_or_str(conf[__configinfo_struct[:current_value]])
end
@@ -4278,7 +4106,7 @@ module TkConfigMethod
if ( __configinfo_struct[:default_value] \
&& conf[__configinfo_struct[:default_value]] )
begin
- conf[__configinfo_struct[:default_value]] =
+ conf[__configinfo_struct[:default_value]] =
bool(conf[__configinfo_struct[:default_value]])
rescue
conf[__configinfo_struct[:default_value]] = nil
@@ -4286,7 +4114,7 @@ module TkConfigMethod
end
if ( conf[__configinfo_struct[:current_value]] )
begin
- conf[__configinfo_struct[:current_value]] =
+ conf[__configinfo_struct[:current_value]] =
bool(conf[__configinfo_struct[:current_value]])
rescue
conf[__configinfo_struct[:current_value]] = nil
@@ -4296,11 +4124,11 @@ module TkConfigMethod
when /^(#{__listval_optkeys.join('|')})$/
if ( __configinfo_struct[:default_value] \
&& conf[__configinfo_struct[:default_value]] )
- conf[__configinfo_struct[:default_value]] =
+ conf[__configinfo_struct[:default_value]] =
simplelist(conf[__configinfo_struct[:default_value]])
end
if ( conf[__configinfo_struct[:current_value]] )
- conf[__configinfo_struct[:current_value]] =
+ conf[__configinfo_struct[:current_value]] =
simplelist(conf[__configinfo_struct[:current_value]])
end
@@ -4308,12 +4136,12 @@ module TkConfigMethod
if ( __configinfo_struct[:default_value] \
&& conf[__configinfo_struct[:default_value]] \
&& conf[__configinfo_struct[:default_value]] =~ /^[0-9]/ )
- conf[__configinfo_struct[:default_value]] =
+ conf[__configinfo_struct[:default_value]] =
list(conf[__configinfo_struct[:default_value]])
end
if ( conf[__configinfo_struct[:current_value]] \
&& conf[__configinfo_struct[:current_value]] =~ /^[0-9]/ )
- conf[__configinfo_struct[:current_value]] =
+ conf[__configinfo_struct[:current_value]] =
list(conf[__configinfo_struct[:current_value]])
end
@@ -4340,20 +4168,20 @@ module TkConfigMethod
if ( __configinfo_struct[:default_value] \
&& conf[__configinfo_struct[:default_value]] )
if conf[__configinfo_struct[:default_value]].index('{')
- conf[__configinfo_struct[:default_value]] =
- tk_split_list(conf[__configinfo_struct[:default_value]])
+ conf[__configinfo_struct[:default_value]] =
+ tk_split_list(conf[__configinfo_struct[:default_value]])
else
- conf[__configinfo_struct[:default_value]] =
- tk_tcl2ruby(conf[__configinfo_struct[:default_value]])
+ conf[__configinfo_struct[:default_value]] =
+ tk_tcl2ruby(conf[__configinfo_struct[:default_value]])
end
end
if conf[__configinfo_struct[:current_value]]
if conf[__configinfo_struct[:current_value]].index('{')
- conf[__configinfo_struct[:current_value]] =
- tk_split_list(conf[__configinfo_struct[:current_value]])
+ conf[__configinfo_struct[:current_value]] =
+ tk_split_list(conf[__configinfo_struct[:current_value]])
else
- conf[__configinfo_struct[:current_value]] =
- tk_tcl2ruby(conf[__configinfo_struct[:current_value]])
+ conf[__configinfo_struct[:current_value]] =
+ tk_tcl2ruby(conf[__configinfo_struct[:current_value]])
end
end
end
@@ -4361,7 +4189,7 @@ module TkConfigMethod
if ( __configinfo_struct[:alias] \
&& conf.size == __configinfo_struct[:alias] + 1 \
&& conf[__configinfo_struct[:alias]][0] == ?- )
- conf[__configinfo_struct[:alias]] =
+ conf[__configinfo_struct[:alias]] =
conf[__configinfo_struct[:alias]][1..-1]
end
@@ -4383,8 +4211,8 @@ module TkConfigMethod
end
}
- __methodcall_optkeys.each{|optkey, m|
- ret << [optkey.to_s, '', '', '', self.__send__(m)]
+ __methodcall_optkeys.each{|optkey, method|
+ ret << [optkey.to_s, '', '', '', self.__send__(method)]
}
ret
@@ -4392,12 +4220,12 @@ module TkConfigMethod
end
else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
- if (slot &&
+ if (slot &&
slot.to_s =~ /^(|latin|ascii|kanji)(#{__font_optkeys.join('|')})$/)
fontkey = $2
# conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{fontkey}"))))
conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{fontkey}")), false, true)
- conf[__configinfo_struct[:key]] =
+ conf[__configinfo_struct[:key]] =
conf[__configinfo_struct[:key]][1..-1]
if ( ! __configinfo_struct[:alias] \
@@ -4411,7 +4239,7 @@ module TkConfigMethod
elsif ( __configinfo_struct[:alias] \
&& conf.size == __configinfo_struct[:alias] + 1 )
if conf[__configinfo_struct[:alias]][0] == ?-
- conf[__configinfo_struct[:alias]] =
+ conf[__configinfo_struct[:alias]] =
conf[__configinfo_struct[:alias]][1..-1]
end
{ conf[0] => conf[1] }
@@ -4422,7 +4250,7 @@ module TkConfigMethod
if slot
slot = slot.to_s
- alias_name, real_name = __optkey_aliases.find{|k,var| k.to_s == slot}
+ alias_name, real_name = __optkey_aliases.find{|k, v| k.to_s == slot}
if real_name
slot = real_name.to_s
end
@@ -4464,7 +4292,7 @@ module TkConfigMethod
if ( __configinfo_struct[:default_value] \
&& conf[__configinfo_struct[:default_value]] )
begin
- conf[__configinfo_struct[:default_value]] =
+ conf[__configinfo_struct[:default_value]] =
number(conf[__configinfo_struct[:default_value]])
rescue
conf[__configinfo_struct[:default_value]] = nil
@@ -4472,7 +4300,7 @@ module TkConfigMethod
end
if ( conf[__configinfo_struct[:current_value]] )
begin
- conf[__configinfo_struct[:current_value]] =
+ conf[__configinfo_struct[:current_value]] =
number(conf[__configinfo_struct[:current_value]])
rescue
conf[__configinfo_struct[:current_value]] = nil
@@ -4485,11 +4313,11 @@ module TkConfigMethod
if ( __configinfo_struct[:default_value] \
&& conf[__configinfo_struct[:default_value]] )
- conf[__configinfo_struct[:default_value]] =
+ conf[__configinfo_struct[:default_value]] =
num_or_str(conf[__configinfo_struct[:default_value]])
end
if ( conf[__configinfo_struct[:current_value]] )
- conf[__configinfo_struct[:current_value]] =
+ conf[__configinfo_struct[:current_value]] =
num_or_str(conf[__configinfo_struct[:current_value]])
end
@@ -4500,7 +4328,7 @@ module TkConfigMethod
if ( __configinfo_struct[:default_value] \
&& conf[__configinfo_struct[:default_value]] )
begin
- conf[__configinfo_struct[:default_value]] =
+ conf[__configinfo_struct[:default_value]] =
bool(conf[__configinfo_struct[:default_value]])
rescue
conf[__configinfo_struct[:default_value]] = nil
@@ -4508,7 +4336,7 @@ module TkConfigMethod
end
if ( conf[__configinfo_struct[:current_value]] )
begin
- conf[__configinfo_struct[:current_value]] =
+ conf[__configinfo_struct[:current_value]] =
bool(conf[__configinfo_struct[:current_value]])
rescue
conf[__configinfo_struct[:current_value]] = nil
@@ -4521,11 +4349,11 @@ module TkConfigMethod
if ( __configinfo_struct[:default_value] \
&& conf[__configinfo_struct[:default_value]] )
- conf[__configinfo_struct[:default_value]] =
+ conf[__configinfo_struct[:default_value]] =
simplelist(conf[__configinfo_struct[:default_value]])
end
if ( conf[__configinfo_struct[:current_value]] )
- conf[__configinfo_struct[:current_value]] =
+ conf[__configinfo_struct[:current_value]] =
simplelist(conf[__configinfo_struct[:current_value]])
end
@@ -4536,12 +4364,12 @@ module TkConfigMethod
if ( __configinfo_struct[:default_value] \
&& conf[__configinfo_struct[:default_value]] \
&& conf[__configinfo_struct[:default_value]] =~ /^[0-9]/ )
- conf[__configinfo_struct[:default_value]] =
+ conf[__configinfo_struct[:default_value]] =
list(conf[__configinfo_struct[:default_value]])
end
if ( conf[__configinfo_struct[:current_value]] \
&& conf[__configinfo_struct[:current_value]] =~ /^[0-9]/ )
- conf[__configinfo_struct[:current_value]] =
+ conf[__configinfo_struct[:current_value]] =
list(conf[__configinfo_struct[:current_value]])
end
@@ -4573,13 +4401,13 @@ module TkConfigMethod
# conf = tk_split_list(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}"))))
conf = tk_split_list(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), 0, false, true)
end
- conf[__configinfo_struct[:key]] =
+ conf[__configinfo_struct[:key]] =
conf[__configinfo_struct[:key]][1..-1]
if ( __configinfo_struct[:alias] \
&& conf.size == __configinfo_struct[:alias] + 1 )
if conf[__configinfo_struct[:alias]][0] == ?-
- conf[__configinfo_struct[:alias]] =
+ conf[__configinfo_struct[:alias]] =
conf[__configinfo_struct[:alias]][1..-1]
end
{ conf[0] => conf[1] }
@@ -4593,7 +4421,7 @@ module TkConfigMethod
# conf = tk_split_simplelist(conflist)
tk_split_simplelist(tk_call_without_enc(*__confinfo_cmd), false, false).each{|conflist|
conf = tk_split_simplelist(conflist, false, true)
- conf[__configinfo_struct[:key]] =
+ conf[__configinfo_struct[:key]] =
conf[__configinfo_struct[:key]][1..-1]
optkey = conf[__configinfo_struct[:key]]
@@ -4629,7 +4457,7 @@ module TkConfigMethod
if ( __configinfo_struct[:default_value] \
&& conf[__configinfo_struct[:default_value]] )
begin
- conf[__configinfo_struct[:default_value]] =
+ conf[__configinfo_struct[:default_value]] =
number(conf[__configinfo_struct[:default_value]])
rescue
conf[__configinfo_struct[:default_value]] = nil
@@ -4637,7 +4465,7 @@ module TkConfigMethod
end
if ( conf[__configinfo_struct[:current_value]] )
begin
- conf[__configinfo_struct[:current_value]] =
+ conf[__configinfo_struct[:current_value]] =
number(conf[__configinfo_struct[:current_value]])
rescue
conf[__configinfo_struct[:current_value]] = nil
@@ -4647,11 +4475,11 @@ module TkConfigMethod
when /^(#{__numstrval_optkeys.join('|')})$/
if ( __configinfo_struct[:default_value] \
&& conf[__configinfo_struct[:default_value]] )
- conf[__configinfo_struct[:default_value]] =
+ conf[__configinfo_struct[:default_value]] =
num_or_str(conf[__configinfo_struct[:default_value]])
end
if ( conf[__configinfo_struct[:current_value]] )
- conf[__configinfo_struct[:current_value]] =
+ conf[__configinfo_struct[:current_value]] =
num_or_str(conf[__configinfo_struct[:current_value]])
end
@@ -4659,7 +4487,7 @@ module TkConfigMethod
if ( __configinfo_struct[:default_value] \
&& conf[__configinfo_struct[:default_value]] )
begin
- conf[__configinfo_struct[:default_value]] =
+ conf[__configinfo_struct[:default_value]] =
bool(conf[__configinfo_struct[:default_value]])
rescue
conf[__configinfo_struct[:default_value]] = nil
@@ -4667,7 +4495,7 @@ module TkConfigMethod
end
if ( conf[__configinfo_struct[:current_value]] )
begin
- conf[__configinfo_struct[:current_value]] =
+ conf[__configinfo_struct[:current_value]] =
bool(conf[__configinfo_struct[:current_value]])
rescue
conf[__configinfo_struct[:current_value]] = nil
@@ -4677,11 +4505,11 @@ module TkConfigMethod
when /^(#{__listval_optkeys.join('|')})$/
if ( __configinfo_struct[:default_value] \
&& conf[__configinfo_struct[:default_value]] )
- conf[__configinfo_struct[:default_value]] =
+ conf[__configinfo_struct[:default_value]] =
simplelist(conf[__configinfo_struct[:default_value]])
end
if ( conf[__configinfo_struct[:current_value]] )
- conf[__configinfo_struct[:current_value]] =
+ conf[__configinfo_struct[:current_value]] =
simplelist(conf[__configinfo_struct[:current_value]])
end
@@ -4689,12 +4517,12 @@ module TkConfigMethod
if ( __configinfo_struct[:default_value] \
&& conf[__configinfo_struct[:default_value]] \
&& conf[__configinfo_struct[:default_value]] =~ /^[0-9]/ )
- conf[__configinfo_struct[:default_value]] =
+ conf[__configinfo_struct[:default_value]] =
list(conf[__configinfo_struct[:default_value]])
end
if ( conf[__configinfo_struct[:current_value]] \
&& conf[__configinfo_struct[:current_value]] =~ /^[0-9]/ )
- conf[__configinfo_struct[:current_value]] =
+ conf[__configinfo_struct[:current_value]] =
list(conf[__configinfo_struct[:current_value]])
end
@@ -4721,20 +4549,20 @@ module TkConfigMethod
if ( __configinfo_struct[:default_value] \
&& conf[__configinfo_struct[:default_value]] )
if conf[__configinfo_struct[:default_value]].index('{')
- conf[__configinfo_struct[:default_value]] =
- tk_split_list(conf[__configinfo_struct[:default_value]])
+ conf[__configinfo_struct[:default_value]] =
+ tk_split_list(conf[__configinfo_struct[:default_value]])
else
- conf[__configinfo_struct[:default_value]] =
- tk_tcl2ruby(conf[__configinfo_struct[:default_value]])
+ conf[__configinfo_struct[:default_value]] =
+ tk_tcl2ruby(conf[__configinfo_struct[:default_value]])
end
end
if conf[__configinfo_struct[:current_value]]
if conf[__configinfo_struct[:current_value]].index('{')
- conf[__configinfo_struct[:current_value]] =
- tk_split_list(conf[__configinfo_struct[:current_value]])
+ conf[__configinfo_struct[:current_value]] =
+ tk_split_list(conf[__configinfo_struct[:current_value]])
else
- conf[__configinfo_struct[:current_value]] =
- tk_tcl2ruby(conf[__configinfo_struct[:current_value]])
+ conf[__configinfo_struct[:current_value]] =
+ tk_tcl2ruby(conf[__configinfo_struct[:current_value]])
end
end
end
@@ -4742,7 +4570,7 @@ module TkConfigMethod
if ( __configinfo_struct[:alias] \
&& conf.size == __configinfo_struct[:alias] + 1 )
if conf[__configinfo_struct[:alias]][0] == ?-
- conf[__configinfo_struct[:alias]] =
+ conf[__configinfo_struct[:alias]] =
conf[__configinfo_struct[:alias]][1..-1]
end
ret[conf[0]] = conf[1]
@@ -4769,8 +4597,8 @@ module TkConfigMethod
end
}
- __methodcall_optkeys.each{|optkey, m|
- ret[optkey.to_s] = ['', '', '', self.__send__(m)]
+ __methodcall_optkeys.each{|optkey, method|
+ ret[optkey.to_s] = ['', '', '', self.__send__(method)]
}
ret
@@ -4804,22 +4632,22 @@ module TkConfigMethod
end
slot = conf[__configinfo_struct[:alias]]
end while(org_slot != slot)
- fail RuntimeError,
+ fail RuntimeError,
"there is a configure alias loop about '#{org_slot}'"
else
ret = {}
- configinfo().each{|cnf|
+ configinfo().each{|conf|
if ( ! __configinfo_struct[:alias] \
- || cnf.size > __configinfo_struct[:alias] + 1 )
- ret[cnf[0]] = cnf[-1]
+ || conf.size > __configinfo_struct[:alias] + 1 )
+ ret[conf[0]] = conf[-1]
end
}
ret
end
else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
ret = {}
- configinfo(slot).each{|key, cnf|
- ret[key] = cnf[-1] if cnf.kind_of?(Array)
+ configinfo(slot).each{|key, conf|
+ ret[key] = conf[-1] if conf.kind_of?(Array)
}
ret
end
@@ -4891,13 +4719,13 @@ class TkObject<TkKernel
cget(name)
rescue
if self.kind_of?(TkWindow)
- fail NameError,
+ fail NameError,
"unknown option '#{id}' for #{self.inspect} (deleted widget?)"
else
super(id, *args)
end
-# fail NameError,
-# "undefined local variable or method `#{name}' for #{self.to_s}",
+# fail NameError,
+# "undefined local variable or method `#{name}' for #{self.to_s}",
# error_at
end
else
@@ -4921,14 +4749,14 @@ class TkObject<TkKernel
if context.kind_of?(TkEvent::Event)
context.generate(self, ((keys)? keys: {}))
elsif keys
- #tk_call('event', 'generate', path,
+ #tk_call('event', 'generate', path,
# "<#{tk_event_sequence(context)}>", *hash_kv(keys))
- tk_call_without_enc('event', 'generate', path,
- "<#{tk_event_sequence(context)}>",
+ tk_call_without_enc('event', 'generate', path,
+ "<#{tk_event_sequence(context)}>",
*hash_kv(keys, true))
else
#tk_call('event', 'generate', path, "<#{tk_event_sequence(context)}>")
- tk_call_without_enc('event', 'generate', path,
+ tk_call_without_enc('event', 'generate', path,
"<#{tk_event_sequence(context)}>")
end
end
@@ -4951,7 +4779,6 @@ class TkWindow<TkObject
include TkWinfo
extend TkBindCore
include Tk::Wm_for_General
- include Tk::Busy
@@WIDGET_INSPECT_FULL = false
def TkWindow._widget_inspect_full_?
@@ -4962,10 +4789,10 @@ class TkWindow<TkObject
end
TkCommandNames = [].freeze
- ## ==> If TkCommandNames[0] is a string (not a null string),
- ## assume the string is a Tcl/Tk's create command of the widget class.
+ ## ==> If TkCommandNames[0] is a string (not a null string),
+ ## assume the string is a Tcl/Tk's create command of the widget class.
WidgetClassName = ''.freeze
- # WidgetClassNames[WidgetClassName] = self
+ # WidgetClassNames[WidgetClassName] = self
## ==> If self is a widget class, entry to the WidgetClassNames table.
def self.to_eval
self::WidgetClassName
@@ -4978,8 +4805,8 @@ class TkWindow<TkObject
widgetname = keys.delete('widgetname')
install_win(if parent then parent.path end, widgetname)
without_creating = keys.delete('without_creating')
- # if without_creating && !widgetname
- # fail ArgumentError,
+ # if without_creating && !widgetname
+ # fail ArgumentError,
# "if set 'without_creating' to true, need to define 'widgetname'"
# end
elsif keys
@@ -4987,8 +4814,8 @@ class TkWindow<TkObject
widgetname = keys.delete('widgetname')
install_win(if parent then parent.path end, widgetname)
without_creating = keys.delete('without_creating')
- # if without_creating && !widgetname
- # fail ArgumentError,
+ # if without_creating && !widgetname
+ # fail ArgumentError,
# "if set 'without_creating' to true, need to define 'widgetname'"
# end
else
@@ -5080,7 +4907,7 @@ class TkWindow<TkObject
tk_call_without_enc('destroy', @path)
rescue
# cannot rescue options error
- fail e
+ fail e
else
# re-create widget
tk_call_without_enc(cmd, @path, *hash_kv(keys, true))
@@ -5265,12 +5092,14 @@ class TkWindow<TkObject
TkGrid.columnconfigure(self, index, keys)
end
alias grid_columnconfigure grid_columnconfig
+ alias grid_column grid_columnconfig
def grid_rowconfig(index, keys)
#tk_call('grid', 'rowconfigure', epath, index, *hash_kv(keys))
TkGrid.rowconfigure(self, index, keys)
end
alias grid_rowconfigure grid_rowconfig
+ alias grid_row grid_rowconfig
def grid_columnconfiginfo(index, slot=nil)
#if slot
@@ -5300,22 +5129,6 @@ class TkWindow<TkObject
TkGrid.rowconfiginfo(self, index, slot)
end
- def grid_column(index, keys=nil)
- if keys.kind_of?(Hash)
- grid_columnconfigure(index, keys)
- else
- grid_columnconfiginfo(index, keys)
- end
- end
-
- def grid_row(index, keys=nil)
- if keys.kind_of?(Hash)
- grid_rowconfigure(index, keys)
- else
- grid_rowconfiginfo(index, keys)
- end
- end
-
def grid_info()
#list(tk_call('grid', 'info', epath))
TkGrid.info(self)
@@ -5352,9 +5165,9 @@ class TkWindow<TkObject
TkGrid.size(self)
end
- def grid_slaves(keys = nil)
+ def grid_slaves(args)
#list(tk_call('grid', 'slaves', epath, *hash_kv(args)))
- TkGrid.slaves(self, keys)
+ TkGrid.slaves(self, args)
end
def place(keys)
@@ -5399,7 +5212,7 @@ class TkWindow<TkObject
# conf[0] = conf[0][1..-1]
# conf
#else
- # tk_split_simplelist(tk_call('place',
+ # tk_split_simplelist(tk_call('place',
# 'configure', epath)).collect{|conflist|
# conf = tk_split_simplelist(conflist)
# conf[0] = conf[0][1..-1]
@@ -5609,7 +5422,7 @@ class TkWindow<TkObject
taglist
else
list(tk_call('bindtags', path)).collect{|tag|
- if tag.kind_of?(String)
+ if tag.kind_of?(String)
if cls = WidgetClassNames[tag]
cls
elsif btag = TkBindTag.id2obj(tag)
@@ -5653,7 +5466,7 @@ TkWidget = TkWindow
#Tk.freeze
module Tk
- RELEASE_DATE = '2009-08-04'.freeze
+ RELEASE_DATE = '2008-05-23'.freeze
autoload :AUTO_PATH, 'tk/variable'
autoload :TCL_PACKAGE_PATH, 'tk/variable'
diff --git a/ext/tk/lib/tk/autoload.rb b/ext/tk/lib/tk/autoload.rb
index 2ebee9ea24..0773f7708d 100644
--- a/ext/tk/lib/tk/autoload.rb
+++ b/ext/tk/lib/tk/autoload.rb
@@ -27,8 +27,6 @@ def TkPlace(*args); TkPlace.configure(*args); end
############################################
# classes on Tk module
module Tk
- autoload :Busy, 'tk/busy'
-
autoload :Button, 'tk/button'
autoload :Canvas, 'tk/canvas'
@@ -252,85 +250,78 @@ autoload :TkXIM, 'tk/xim'
module Tk
@TOPLEVEL_ALIAS_TABLE = {}
@TOPLEVEL_ALIAS_TABLE[:Tk] = {
- :TkButton => 'tk/button',
+ :TkButton => 'tk/button',
- :TkCanvas => 'tk/canvas',
+ :TkCanvas => 'tk/canvas',
- :TkCheckButton => 'tk/checkbutton',
- :TkCheckbutton => 'tk/checkbutton',
+ :TkCheckButton => 'tk/checkbutton',
+ :TkCheckbutton => 'tk/checkbutton',
- # :TkDialog => 'tk/dialog',
- # :TkDialog2 => 'tk/dialog',
- # :TkDialogObj => 'tk/dialog',
- # :TkWarning => 'tk/dialog',
- # :TkWarning2 => 'tk/dialog',
- # :TkWarningObj => 'tk/dialog',
+ # :TkDialog => 'tk/dialog',
+ # :TkDialog2 => 'tk/dialog',
+ # :TkDialogObj => 'tk/dialog',
+ # :TkWarning => 'tk/dialog',
+ # :TkWarning2 => 'tk/dialog',
+ # :TkWarningObj => 'tk/dialog',
- :TkEntry => 'tk/entry',
+ :TkEntry => 'tk/entry',
- :TkFrame => 'tk/frame',
+ :TkFrame => 'tk/frame',
- :TkLabel => 'tk/label',
+ :TkLabel => 'tk/label',
- :TkLabelFrame => 'tk/labelframe',
- :TkLabelframe => 'tk/labelframe',
+ :TkLabelFrame => 'tk/labelframe',
+ :TkLabelframe => 'tk/labelframe',
- :TkListbox => 'tk/listbox',
+ :TkListbox => 'tk/listbox',
- :TkMacResource => 'tk/macpkg',
+ :TkMacResource => 'tk/macpkg',
- :TkMenu => 'tk/menu',
- :TkMenuClone => 'tk/menu',
- :TkCloneMenu => 'tk/menu',
- # :TkSystemMenu => 'tk/menu',
- :TkSysMenu_Help => 'tk/menu',
- :TkSysMenu_System => 'tk/menu',
- :TkSysMenu_Apple => 'tk/menu',
- :TkMenubutton => 'tk/menu',
- :TkMenuButton => 'tk/menu',
- :TkOptionMenubutton => 'tk/menu',
- :TkOptionMenuButton => 'tk/menu',
+ :TkMenu => 'tk/menu',
+ :TkMenuClone => 'tk/menu',
+ :TkCloneMenu => 'tk/menu',
+ # :TkSystemMenu => 'tk/menu',
+ :TkSysMenu_Help => 'tk/menu',
+ :TkSysMenu_System => 'tk/menu',
+ :TkSysMenu_Apple => 'tk/menu',
+ :TkMenubutton => 'tk/menu',
+ :TkMenuButton => 'tk/menu',
+ :TkOptionMenubutton => 'tk/menu',
+ :TkOptionMenuButton => 'tk/menu',
- :TkMessage => 'tk/message',
+ :TkMessage => 'tk/message',
- :TkPanedWindow => 'tk/panedwindow',
- :TkPanedwindow => 'tk/panedwindow',
+ :TkPanedWindow => 'tk/panedwindow',
+ :TkPanedwindow => 'tk/panedwindow',
- :TkRadioButton => 'tk/radiobutton',
- :TkRadiobutton => 'tk/radiobutton',
+ :TkRadioButton => 'tk/radiobutton',
+ :TkRadiobutton => 'tk/radiobutton',
- # :TkRoot => 'tk/root',
+ # :TkRoot => 'tk/root',
- :TkScale => 'tk/scale',
+ :TkScale => 'tk/scale',
- :TkScrollbar => 'tk/scrollbar',
- :TkXScrollbar => 'tk/scrollbar',
- :TkYScrollbar => 'tk/scrollbar',
+ :TkScrollbar => 'tk/scrollbar',
+ :TkXScrollbar => 'tk/scrollbar',
+ :TkYScrollbar => 'tk/scrollbar',
- :TkSpinbox => 'tk/spinbox',
+ :TkSpinbox => 'tk/spinbox',
- :TkText => 'tk/text',
+ :TkText => 'tk/text',
- :TkToplevel => 'tk/toplevel',
+ :TkToplevel => 'tk/toplevel',
- :TkWinDDE => 'tk/winpkg',
- :TkWinRegistry => 'tk/winpkg',
+ :TkWinDDE => 'tk/winpkg',
+ :TkWinRegistry => 'tk/winpkg',
}
@TOPLEVEL_ALIAS_OWNER = {}
@TOPLEVEL_ALIAS_SETUP_PROC = {}
- @AUTOLOAD_FILE_SYM_TABLE = Hash.new{|h,k| h[k]={}} # TABLE[file][sym] -> obj
-
@current_default_widget_set = nil
-
- module TOPLEVEL_ALIASES; end
end
-class Object
- include Tk::TOPLEVEL_ALIASES
-end
############################################
# methods to control default widget set
@@ -352,387 +343,50 @@ class << Tk
_replace_toplevel_aliases(target)
end
- def widget_set_symbols
- @TOPLEVEL_ALIAS_TABLE.keys
- end
-
- def toplevel_aliases_on_widget_set(widget_set)
- if (tbl = @TOPLEVEL_ALIAS_TABLE[widget_set.to_sym])
- tbl.collect{|k, v| (v.nil?)? nil: k}.compact
- else
- fail ArgumentError, "unknown widget_set #{widget_set.to_sym.inspect}"
- end
- end
-
- def __toplevel_alias_setup_proc__(*target_list, &cmd)
- target_list.each{|target| @TOPLEVEL_ALIAS_SETUP_PROC[target.to_sym] = cmd}
- end
-
- def topobj_defined?(sym) #=> alias_filename or object or false
- Object.autoload?(sym) ||
- (Object.const_defined?(sym) && Object.const_get(sym))
- end
- def topalias_defined?(sym) #=> alias_filename or object or false
- Tk::TOPLEVEL_ALIASES.autoload?(sym) ||
- (Tk::TOPLEVEL_ALIASES.const_defined?(sym) &&
- Tk::TOPLEVEL_ALIASES.const_get(sym))
- end
- def define_topobj(sym, obj)
- if obj.kind_of? String
- # obj is an autoload path
- Object.autoload(sym, obj)
- unless Object.autoload?(sym)
- # file is autoloaded?
- if @AUTOLOAD_FILE_SYM_TABLE.has_key?(obj) &&
- (loaded_obj = @AUTOLOAD_FILE_SYM_TABLE[obj][sym])
- Object.const_set(sym, loaded_obj)
- else
- fail ArgumentError, "cannot define autoload file (already loaded?)"
- end
- end
- else
- # object
- Object.const_set(sym, obj)
- end
- end
- def define_topalias(sym, obj)
- if obj.kind_of? String
- # obj is an autoload path
- Tk::TOPLEVEL_ALIASES.autoload(sym, obj)
- unless Tk::TOPLEVEL_ALIASES.autoload?(sym)
- # file is autoloaded?
- if @AUTOLOAD_FILE_SYM_TABLE.has_key?(obj) &&
- (loaded_obj = @AUTOLOAD_FILE_SYM_TABLE[obj][sym])
- Tk::TOPLEVEL_ALIASES.const_set(sym, loaded_obj)
- else
- fail ArgumentError, "cannot define autoload file (already loaded?)"
- end
- end
- else
- # object
- Tk::TOPLEVEL_ALIASES.const_set(sym, obj)
- end
- end
- def replace_topobj(sym, obj) #=> old_obj (alias_filename or object) or nil
- if old_obj = topobj_defined?(sym)
- Object.class_eval{remove_const sym} rescue nil # ignore err
- end
- define_topobj(sym, obj)
- old_obj
- end
- def replace_topalias(sym, obj) #=> old_obj (alias_filename or object) or nil
- if old_obj = topalias_defined?(sym)
- Tk::TOPLEVEL_ALIASES.module_eval{remove_const sym} rescue nil #ignore err
- end
- define_topalias(sym, obj)
- old_obj
- end
- private :topobj_defined?, :topalias_defined?
- private :define_topobj, :define_topalias
- private :replace_topobj, :replace_topalias
-
- def __regist_toplevel_aliases__(target, obj, *symbols)
- # initial regist
+ def __set_toplevel_aliases__(target, obj, *symbols)
@TOPLEVEL_ALIAS_TABLE[target = target.to_sym] ||= {}
symbols.each{|sym|
@TOPLEVEL_ALIAS_TABLE[target][sym = sym.to_sym] = obj
- if !topalias_defined?(sym) || target == @current_default_widget_set
- @TOPLEVEL_ALIAS_OWNER[sym] = target
- replace_topalias(sym, obj)
- replace_topobj(sym, obj) unless obj.kind_of?(String) # NOT autoload
+ # if @current_default_widget_set == target
+ if @TOPLEVEL_ALIAS_OWNER[sym] == target
+ Object.class_eval{remove_const sym} if Object.const_defined?(sym)
+ Object.const_set(sym, obj)
end
}
end
- def regist_sym_for_loaded_file(auto, obj, sym)
- @AUTOLOAD_FILE_SYM_TABLE[auto][sym] = obj
-
- reg = /^#{Regexp.quote(auto)}(\.rb|\.so|)$/
- @TOPLEVEL_ALIAS_TABLE.each_key{|set|
- if @TOPLEVEL_ALIAS_TABLE[set][sym] =~ reg
- @TOPLEVEL_ALIAS_TABLE[set][sym] = obj
- if @TOPLEVEL_ALIAS_OWNER[sym].nil? || @TOPLEVEL_ALIAS_OWNER[sym] == set
- replace_topalias(sym, obj)
- replace_topobj(sym, obj) if set == @current_default_widget_set
- end
- end
- }
- if (f = Object.autoload?(sym)) && f =~ reg
- replace_topobj(sym, obj)
- end
- if (f = Tk::TOPLEVEL_ALIASES.autoload?(sym)) && f =~ reg
- replace_topalias(sym, obj)
- end
- end
- private :regist_sym_for_loaded_file
-
- def set_topalias(target, obj, sym)
- # obj is a kind of String : define autoload path
- # Class : use the class object
- if target == @current_default_widget_set
- case @TOPLEVEL_ALIAS_OWNER[sym]
- when false
- # Object::sym is out of control. --> not change
- # Make ALIAS::sym under control, because target widget set is current.
- # Keep OWNER[sym]
- @TOPLEVEL_ALIAS_TABLE[target][sym] = obj
- replace_topalias(sym, obj)
-
- when target
- if current_obj = topobj_defined?(sym)
- if current_obj == obj
- # Make current_obj under control.
- # Keep Object::sym.
- # Keep OWNER[sym].
- @TOPLEVEL_ALIAS_TABLE[target][sym] = obj
- replace_topalias(sym, obj)
-
- else # current_obj != obj
- if current_obj == topalias_defined?(sym)
- # Change controlled object
- # Keep OWNER[sym].
- @TOPLEVEL_ALIAS_TABLE[target][sym] = obj
- replace_topalias(sym, obj)
- replace_topobj(sym, obj)
-
- else # current_obj != topalias_defined?(sym)
- # Maybe current_obj is defined by user. --> OWNER[sym] = faise
- # Keep Object::sym.
- @TOPLEVEL_ALIAS_OWNER[sym] = false
- @TOPLEVEL_ALIAS_TABLE[target][sym] = obj
- replace_topalias(sym, obj)
- end
- end
-
- else # NOT topobj_defined?(sym)
- # New definition for sym at target.
- # Keep OWNER[sym].
- @TOPLEVEL_ALIAS_TABLE[target][sym] = obj
- replace_topalias(sym, obj)
- define_topobj(sym, obj)
- end
-
- when nil
- # New definition for sym at target.
- @TOPLEVEL_ALIAS_OWNER[sym] = target
- @TOPLEVEL_ALIAS_TABLE[target][sym] = obj
- replace_topalias(sym, obj)
-
- else # others
- # Maybe planning to make sym under control.
- @TOPLEVEL_ALIAS_OWNER[sym] = target
- @TOPLEVEL_ALIAS_TABLE[target][sym] = obj
- replace_topalias(sym, obj)
- replace_topobj(sym, obj)
- end
-
- else # target != @current_default_widget_set
- case @TOPLEVEL_ALIAS_OWNER[sym]
- when false
- # Object::sym is out of control. --> not change
- if topalias_defined?(sym)
- # ALIAS[sym] may be defined by other widget set.
- # Keep Object::sym (even if it is not defined)
- # Keep ALIAS[sym].
- # Keep OWNER[sym].
- @TOPLEVEL_ALIAS_TABLE[target][sym] = obj
-
- else # NOT topalias_defined?(sym)
- # Nobody controls ALIAS[sym].
- # At leaset, current widget set doesn't control ALIAS[sym].
- # Keep Object::sym (even if it is not defined)
- # Keep OWNER[sym].
- @TOPLEVEL_ALIAS_TABLE[target][sym] = obj
- define_topalias(sym, obj)
- end
-
- when target
- # Maybe change controlled object, because Object::sym is under control.
- # Keep OWNER[sym].
- @TOPLEVEL_ALIAS_TABLE[target][sym] = obj
- replace_topalias(sym, obj)
- replace_topobj(sym, obj)
-
- when nil
- # New definition for sym
- @TOPLEVEL_ALIAS_OWNER[sym] = target
- @TOPLEVEL_ALIAS_TABLE[target][sym] = obj
- replace_topalias(sym, obj)
- replace_topobj(sym, obj)
-
- else # others
- # An other widget set controls sym.
- # Keep Object::sym (even if it is not defined)
- # Keep ALIAS[sym].
- # Keep OWNER[sym].
- @TOPLEVEL_ALIAS_TABLE[target][sym] = obj
-
- end
- end
-
- sym
- end
- private :set_topalias
-
- def __set_toplevel_aliases__(target, obj, *symbols)
- # obj is a kind of String : define autoload path
- # Class : use the class object
- target = target.to_sym
- symbols.each{|sym| set_topalias(target, obj, sym.to_sym)}
- end
-
- def __set_loaded_toplevel_aliases__(autopath, target, obj, *symbols)
- # autopath is an autoload file
- # Currently, this method doesn't support that autoload loads
- # different toplevels between <basename>.rb and <basename>.so extension.
- shortpath = (autopath =~ /^(.*)(.rb|.so)$/)? $1: autopath
- target = target.to_sym
- symbols.map!{|sym| sym.to_sym}
-
- symbols.each{|sym| regist_sym_for_loaded_file(shortpath, obj, sym) }
- symbols.each{|sym| set_topalias(target, obj, sym)}
- end
-
- def backup_current_topdef(sym)
- return if (current = @current_default_widget_set).nil?
-
- case @TOPLEVEL_ALIAS_OWNER[sym]
- when false
- # Object::sym is out of control.
- if (cur_alias = topalias_defined?(sym)) && ! cur_alias.kind_of?(String)
- @TOPLEVEL_ALIAS_TABLE[current][sym] = cur_alias
- end
-
- when current
- if cur_obj = topobj_defined?(sym)
- if ! cur_obj.kind_of?(String) && (cur_alias = topalias_defined?(sym))
- if cur_alias.kind_of?(String)
- # Mayby, user replaced Object::sym.
- # Make Object::sym out of control.
- @TOPLEVEL_ALIAS_OWNER[sym] = false
- elsif cur_obj == cur_alias
- # Possibley, defined normally. Backup it
- @TOPLEVEL_ALIAS_TABLE[current][sym] = cur_alias
- else
- # Mayby, user replaced Object::sym.
- # Make Object::sym out of control.
- @TOPLEVEL_ALIAS_OWNER[sym] = false
- end
+ ###################################
+ private
+ def _replace_toplevel_aliases(target)
+ # check already autoloaded
+ if (table = @TOPLEVEL_ALIAS_TABLE[current = @current_default_widget_set])
+ table.each{|sym, file|
+ if !Object.autoload?(sym) && Object.const_defined?(sym) &&
+ @TOPLEVEL_ALIAS_TABLE[current][sym].kind_of?(String)
+ # autoload -> class
+ @TOPLEVEL_ALIAS_TABLE[current][sym] = Object.const_get(sym)
end
- else
- # Mayby, user replaced Object::sym.
- # Make Object::sym out of control.
- @TOPLEVEL_ALIAS_OWNER[sym] = false
- end
-
- when nil
- # Object::sym is out of control.
- if (cur_alias = topalias_defined?(sym)) && ! cur_alias.kind_of?(String)
- # Possibley, defined normally. Backup it.
- @TOPLEVEL_ALIAS_TABLE[current][sym] = cur_alias
- end
- else
- # No authority to control Object::sym and ALIASES::sym.
- # Do nothing.
+ }
end
- end
- private :backup_current_topdef
-
- def _replace_toplevel_aliases(target)
- # backup
- @TOPLEVEL_ALIAS_TABLE[target].each_key{|sym|
- backup_current_topdef(sym)
- }
- # replace
- @TOPLEVEL_ALIAS_TABLE[target].each_key{|sym|
- next if (obj = @TOPLEVEL_ALIAS_TABLE[target][sym]).nil?
- if @TOPLEVEL_ALIAS_OWNER[sym] == false
- # Object::sym is out of control. --> not change
- # Keep OWNER[sym].
- replace_topalias(sym, obj)
+ # setup autoloads
+ @TOPLEVEL_ALIAS_TABLE[target].each{|sym, file|
+ Object.class_eval{remove_const sym} if Object.const_defined?(sym)
+ if file.kind_of?(String)
+ # file => autoload target file
+ Object.autoload(sym, file)
else
- # New definition
- @TOPLEVEL_ALIAS_OWNER[sym] = target
- replace_topalias(sym, obj)
- replace_topobj(sym, obj)
+ # file => loaded class object
+ Object.const_set(sym, file)
end
+ @TOPLEVEL_ALIAS_OWNER[sym] = target
}
- # change default_widget_set
+ # update current alias
@current_default_widget_set = target
end
- private :_replace_toplevel_aliases
-
- def __import_toplevel_aliases__(target, *symbols)
- current = @current_default_widget_set
- symbols.each{|sym|
- sym = sym.to_sym
- if (obj = @TOPLEVEL_ALIAS_TABLE[target][sym]).nil?
- # remove
- @TOPLEVEL_ALIAS_TABLE[current].delete(sym)
- @TOPLEVEL_ALIAS_OWNER.delete(sym)
- Tk::TOPLEVEL_ALIASES.module_eval{remove_const sym} if topalias_defined?(sym)
- Object.class_eval{remove_const sym} if topobj_defined?(sym)
-
- elsif obj == false
- # remove, but OWNER[sym] <- false and not treat Object::sym
- @TOPLEVEL_ALIAS_TABLE[current].delete(sym)
- @TOPLEVEL_ALIAS_OWNER[sym] = false
- Tk::TOPLEVEL_ALIASES.module_eval{remove_const sym} if topalias_defined?(sym)
-
- elsif @TOPLEVEL_ALIAS_OWNER[sym] == false
- # Object::sym is out of control. --> not change
- # Keep OWNER[sym].
- @TOPLEVEL_ALIAS_TABLE[current][sym] = obj
- replace_topalias(sym, obj)
-
- else
- # new definition under control
- @TOPLEVEL_ALIAS_OWNER[sym] = current
- @TOPLEVEL_ALIAS_TABLE[current][sym] = obj
- replace_topalias(sym, obj)
- replace_topobj(sym, obj)
- end
- }
- end
-
- def __remove_toplevel_aliases__(*symbols)
- # remove toplevel aliases of current widget set
- current = @current_default_widget_set
- symbols.each{|sym|
- sym = sym.to_sym
- @TOPLEVEL_ALIAS_TABLE[current].delete(sym)
- @TOPLEVEL_ALIAS_OWNER.delete(sym)
- Tk::TOPLEVEL_ALIASES.module_eval{remove_const sym} if topalias_defined?(sym)
- Object.class_eval{remove_const sym} if topobj_defined?(sym)
- }
- end
-
- def __reset_toplevel_owner__(*symbols)
- symbols.each{|sym| @TOPLEVEL_ALIAS_OWNER.delete(sym.to_sym)}
- end
-
- def __disable_toplevel_control__(*symbols)
- symbols.each{|sym| @TOPLEVEL_ALIAS_OWNER[sym.to_sym] = false}
- end
-
- def __create_widget_set__(new_set, src_set={})
- new_set = new_set.to_sym
- if @TOPLEVEL_ALIAS_TABLE[new_set]
- fail RuntimeError, "A widget-set #{new_set.inspect} is already exist."
- end
- if src_set.kind_of?(Symbol)
- # new_set is an alias name of existed widget set.
- @TOPLEVEL_ALIAS_TABLE[new_set] = @TOPLEVEL_ALIAS_TABLE[src_set]
- else
- @TOPLEVEL_ALIAS_TABLE[new_set] = {}
- src_set.each{|sym, obj| set_topalias(new_set, obj, sym.to_sym) }
- end
- end
end
-
############################################
# setup default widget set => :Tk
Tk.default_widget_set = :Tk
@@ -740,14 +394,14 @@ Tk.default_widget_set = :Tk
############################################
# depend on the version of Tcl/Tk
-# major, minor, type, patchlevel = TclTkLib.get_version
+# major, minor, type, type_name, patchlevel = TclTkLib.get_version
############################################
# Ttk (Tile) support
=begin
-if major > 8 ||
- (major == 8 && minor > 5) ||
- (major == 8 && minor == 5 && type >= TclTkLib::RELEASE_TYPE::BETA)
+if major > 8 ||
+ (major == 8 && minor > 5) ||
+ (major == 8 && minor == 5 && type >= TclTkLib::RELEASE_TYPE::BETA)
# Tcl/Tk 8.5 beta or later
Object.autoload :Ttk, 'tkextlib/tile'
Tk.autoload :Tile, 'tkextlib/tile'
diff --git a/ext/tk/lib/tk/bindtag.rb b/ext/tk/lib/tk/bindtag.rb
index 23b4e0b7c3..88c8367a88 100644
--- a/ext/tk/lib/tk/bindtag.rb
+++ b/ext/tk/lib/tk/bindtag.rb
@@ -9,7 +9,7 @@ class TkBindTag
#BTagID_TBL = {}
BTagID_TBL = TkCore::INTERP.create_table
- (Tk_BINDTAG_ID = ["btag".freeze, TkUtil.untrust("00000")]).instance_eval{
+ (Tk_BINDTAG_ID = ["btag".freeze, "00000".taint]).instance_eval{
@mutex = Mutex.new
def mutex; @mutex; end
freeze
diff --git a/ext/tk/lib/tk/busy.rb b/ext/tk/lib/tk/busy.rb
deleted file mode 100644
index 7f4f89f524..0000000000
--- a/ext/tk/lib/tk/busy.rb
+++ /dev/null
@@ -1,118 +0,0 @@
-#
-# tk/busy.rb: support 'tk busy' command (Tcl/Tk8.6 or later)
-#
-require 'tk'
-
-module Tk::Busy
- include TkCore
- extend TkCore
- extend TkItemConfigMethod
-end
-
-class << Tk::Busy
- def __item_cget_cmd(win)
- # maybe need to override
- ['tk', 'busy', 'cget', win.path]
- end
- private :__item_cget_cmd
-
- def __item_config_cmd(win)
- # maybe need to override
- ['tk', 'busy', 'configure', win.path]
- end
- private :__item_config_cmd
-
- def __item_confinfo_cmd(win)
- # maybe need to override
- __item_config_cmd(win)
- end
- private :__item_confinfo_cmd
-
- alias cget_tkstring itemcget_tkstring
- alias cget itemcget
- alias cget_strict itemcget_strict
- alias configure itemconfigure
- alias configinfo itemconfiginfo
- alias current_configinfo current_itemconfiginfo
-
- private :itemcget_tkstring, :itemcget, :itemcget_strict
- private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
-
- def method_missing(id, *args)
- name = id.id2name
- case args.length
- when 1
- if name[-1] == ?=
- configure name[0..-2], args[0]
- args[0]
- else
- configure name, args[0]
- self
- end
- when 0
- begin
- cget(name)
- rescue
- super(id, *args)
- end
- else
- super(id, *args)
- end
- end
-
- def hold(win, keys={})
- tk_call_without_enc('tk', 'busy', 'hold', win, *hash_kv(keys))
- win
- end
-
- def forget(*wins)
- tk_call_without_enc('tk', 'busy', 'forget', *wins)
- self
- end
-
- def current(pat=None)
- list(tk_call('tk', 'busy', 'current', pat))
- end
-
- def status(win)
- bool(tk_call_without_enc('tk', 'busy', 'status', win))
- end
-end
-
-module Tk::Busy
- def busy_configinfo(option=nil)
- Tk::Busy.configinfo(self, option)
- end
-
- def busy_current_configinfo(option=nil)
- Tk::Busy.current_configinfo(self, option)
- end
-
- def busy_configure(option, value=None)
- Tk::Busy.configure(self, option, value)
- self
- end
-
- def busy_cget(option)
- Tk::Busy.configure(self, option)
- end
-
- def busy(keys={})
- Tk::Busy.hold(self, keys)
- self
- end
- alias busy_hold busy
-
- def busy_forget
- Tk::Busy.forget(self)
- self
- end
-
- def busy_current?
- ! Tk::Busy.current(self.path).empty?
- end
-
- def busy_status
- Tk::Busy.status(self)
- end
-end
diff --git a/ext/tk/lib/tk/button.rb b/ext/tk/lib/tk/button.rb
index 65233c91b6..770a5785bb 100644
--- a/ext/tk/lib/tk/button.rb
+++ b/ext/tk/lib/tk/button.rb
@@ -7,7 +7,7 @@ require 'tk/label'
class Tk::Button<Tk::Label
TkCommandNames = ['button'.freeze].freeze
WidgetClassName = 'Button'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
#def create_self(keys)
# if keys and keys != None
# tk_call_without_enc('button', @path, *hash_kv(keys, true))
@@ -27,5 +27,4 @@ class Tk::Button<Tk::Label
end
#TkButton = Tk::Button unless Object.const_defined? :TkButton
-#Tk.__set_toplevel_aliases__(:Tk, Tk::Button, :TkButton)
-Tk.__set_loaded_toplevel_aliases__('tk/button.rb', :Tk, Tk::Button, :TkButton)
+Tk.__set_toplevel_aliases__(:Tk, Tk::Button, :TkButton)
diff --git a/ext/tk/lib/tk/canvas.rb b/ext/tk/lib/tk/canvas.rb
index 602139e00a..36ea008a17 100644
--- a/ext/tk/lib/tk/canvas.rb
+++ b/ext/tk/lib/tk/canvas.rb
@@ -13,7 +13,7 @@ module TkCanvasItemConfig
def __item_strval_optkeys(id)
# maybe need to override
super(id) + [
- 'fill', 'activefill', 'disabledfill',
+ 'fill', 'activefill', 'disabledfill',
'outline', 'activeoutline', 'disabledoutline'
]
end
@@ -45,7 +45,7 @@ class Tk::Canvas<TkWindow
TkCommandNames = ['canvas'.freeze].freeze
WidgetClassName = 'Canvas'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def __destroy_hook__
TkcItem::CItemID_TBL.delete(@path)
@@ -117,7 +117,7 @@ class Tk::Canvas<TkWindow
end
def bbox(tagOrId, *tags)
- list(tk_send_without_enc('bbox', tagid(tagOrId),
+ list(tk_send_without_enc('bbox', tagid(tagOrId),
*tags.collect{|t| tagid(t)}))
end
@@ -172,7 +172,7 @@ class Tk::Canvas<TkWindow
alias canvas_y canvasy
def coords(tag, *args)
- if args.empty?
+ if args == []
tk_split_list(tk_send_without_enc('coords', tagid(tag)))
else
tk_send_without_enc('coords', tagid(tag), *(args.flatten))
@@ -181,7 +181,7 @@ class Tk::Canvas<TkWindow
end
def dchars(tag, first, last=None)
- tk_send_without_enc('dchars', tagid(tag),
+ tk_send_without_enc('dchars', tagid(tag),
_get_eval_enc_str(first), _get_eval_enc_str(last))
self
end
@@ -214,7 +214,7 @@ class Tk::Canvas<TkWindow
alias deltag dtag
def find(mode, *args)
- list(tk_send_without_enc('find', mode, *args)).collect!{|id|
+ list(tk_send_without_enc('find', mode, *args)).collect!{|id|
TkcItem.id2obj(self, id)
}
end
@@ -265,18 +265,12 @@ class Tk::Canvas<TkWindow
self
end
- def imove(tagOrId, idx, x, y)
- tk_send_without_enc('imove', tagid(tagOrId), idx, x, y)
- self
- end
- alias i_move imove
-
def index(tagOrId, idx)
number(tk_send_without_enc('index', tagid(tagOrId), idx))
end
def insert(tagOrId, index, string)
- tk_send_without_enc('insert', tagid(tagOrId), index,
+ tk_send_without_enc('insert', tagid(tagOrId), index,
_get_eval_enc_str(string))
self
end
@@ -306,7 +300,7 @@ class Tk::Canvas<TkWindow
fnt
end
else
- tk_tcl2ruby(_fromUTF8(tk_send_without_enc('itemcget', tagid(tagOrId),
+ tk_tcl2ruby(_fromUTF8(tk_send_without_enc('itemcget', tagid(tagOrId),
"-#{option}")))
end
end
@@ -321,16 +315,16 @@ class Tk::Canvas<TkWindow
|| key['latinfont'] || key['asciifont'] )
tagfont_configure(tagid(tagOrId), key.dup)
else
- _fromUTF8(tk_send_without_enc('itemconfigure', tagid(tagOrId),
+ _fromUTF8(tk_send_without_enc('itemconfigure', tagid(tagOrId),
*hash_kv(key, true)))
end
else
if ( key == 'coords' || key == :coords )
self.coords(tagOrId, value)
- elsif ( key == 'font' || key == :font ||
- key == 'kanjifont' || key == :kanjifont ||
- key == 'latinfont' || key == :latinfont ||
+ elsif ( key == 'font' || key == :font ||
+ key == 'kanjifont' || key == :kanjifont ||
+ key == 'latinfont' || key == :latinfont ||
key == 'asciifont' || key == :asciifont )
if value == None
tagfontobj(tagid(tagOrId))
@@ -338,7 +332,7 @@ class Tk::Canvas<TkWindow
tagfont_configure(tagid(tagOrId), {key=>value})
end
else
- _fromUTF8(tk_send_without_enc('itemconfigure', tagid(tagOrId),
+ _fromUTF8(tk_send_without_enc('itemconfigure', tagid(tagOrId),
"-#{key}", _get_eval_enc_str(value)))
end
end
@@ -395,16 +389,16 @@ class Tk::Canvas<TkWindow
else
if conf[3]
if conf[3].index('{')
- conf[3] = tk_split_list(conf[3])
+ conf[3] = tk_split_list(conf[3])
else
- conf[3] = tk_tcl2ruby(conf[3])
+ conf[3] = tk_tcl2ruby(conf[3])
end
end
if conf[4]
if conf[4].index('{')
- conf[4] = tk_split_list(conf[4])
+ conf[4] = tk_split_list(conf[4])
else
- conf[4] = tk_tcl2ruby(conf[4])
+ conf[4] = tk_tcl2ruby(conf[4])
end
end
end
@@ -427,8 +421,8 @@ class Tk::Canvas<TkWindow
when 'coords'
{'coords' => ['', '', '', self.coords(tagOrId)]}
when 'dash', 'activedash', 'disableddash'
- conf = tk_split_simplelist(tk_send_without_enc('itemconfigure',
- tagid(tagOrId),
+ conf = tk_split_simplelist(tk_send_without_enc('itemconfigure',
+ tagid(tagOrId),
"-#{key}"))
if conf[3] && conf[3] =~ /^[0-9]/
conf[3] = list(conf[3])
@@ -463,16 +457,16 @@ class Tk::Canvas<TkWindow
else
if conf[2]
if conf[2].index('{')
- conf[2] = tk_split_list(conf[2])
+ conf[2] = tk_split_list(conf[2])
else
- conf[2] = tk_tcl2ruby(conf[2])
+ conf[2] = tk_tcl2ruby(conf[2])
end
end
if conf[3]
if conf[3].index('{')
- conf[3] = tk_split_list(conf[3])
+ conf[3] = tk_split_list(conf[3])
else
- conf[3] = tk_tcl2ruby(conf[3])
+ conf[3] = tk_tcl2ruby(conf[3])
end
end
end
@@ -529,18 +523,11 @@ class Tk::Canvas<TkWindow
self
end
- def move(tag, dx, dy)
- tk_send_without_enc('move', tagid(tag), dx, dy)
+ def move(tag, x, y)
+ tk_send_without_enc('move', tagid(tag), x, y)
self
end
- def moveto(tag, x, y)
- # Tcl/Tk 8.6 or later
- tk_send_without_enc('moveto', tagid(tag), x, y)
- self
- end
- alias move_to moveto
-
def postscript(keys)
tk_send("postscript", *hash_kv(keys))
end
@@ -554,15 +541,6 @@ class Tk::Canvas<TkWindow
self
end
- def rchars(tag, first, last, str_or_coords)
- # Tcl/Tk 8.6 or later
- str_or_coords = str_or_coords.flatten if str_or_coords.kinad_of? Array
- tk_send_without_enc('rchars', tagid(tag), first, last, str_or_coords)
- self
- end
- alias replace_chars rchars
- alias replace_coords rchars
-
def scale(tag, x, y, xs, ys)
tk_send_without_enc('scale', tagid(tag), x, y, xs, ys)
self
@@ -603,8 +581,7 @@ class Tk::Canvas<TkWindow
end
#TkCanvas = Tk::Canvas unless Object.const_defined? :TkCanvas
-#Tk.__set_toplevel_aliases__(:Tk, Tk::Canvas, :TkCanvas)
-Tk.__set_loaded_toplevel_aliases__('tk/canvas.rb', :Tk, Tk::Canvas, :TkCanvas)
+Tk.__set_toplevel_aliases__(:Tk, Tk::Canvas, :TkCanvas)
class TkcItem<TkObject
@@ -699,7 +676,7 @@ class TkcItem<TkObject
fail RuntimeError, "#{self} is an abstract class"
end
args, fontkeys = _parse_create_args(args)
- idnum = tk_call_without_enc(canvas.path, 'create',
+ idnum = tk_call_without_enc(canvas.path, 'create',
self::CItemTypeName, *args)
canvas.itemconfigure(idnum, fontkeys) unless fontkeys.empty?
idnum.to_i # 'canvas item id' is an integer number
diff --git a/ext/tk/lib/tk/canvastag.rb b/ext/tk/lib/tk/canvastag.rb
index 495d92a9a8..49796d80b2 100644
--- a/ext/tk/lib/tk/canvastag.rb
+++ b/ext/tk/lib/tk/canvastag.rb
@@ -60,9 +60,6 @@ module TkcTagAccess
@c.itembindinfo(@id, seq)
end
- def cget_tkstring(option)
- @c.itemcget_tkstring(@id, option)
- end
def cget(option)
@c.itemcget(@id, option)
end
@@ -119,13 +116,6 @@ module TkcTagAccess
self
end
- def imove(idx, x, y)
- # Tcl/Tk 8.6 or later
- @c.imove(@id, idx, x, y)
- self
- end
- alias i_move imove
-
def index(idx)
@c.index(@id, idx)
end
@@ -145,13 +135,6 @@ module TkcTagAccess
self
end
- def moveto(x, y)
- # Tcl/Tk 8.6 or later
- @c.moveto(@id, x, y)
- self
- end
- alias move_to moveto
-
def raise(abovethis=None)
@c.raise(@id, abovethis)
self
@@ -162,14 +145,6 @@ module TkcTagAccess
self
end
- def rchars(first, last, str_or_coords)
- # Tcl/Tk 8.6 or later
- @c.rchars(@id, first, last, str_or_coords)
- self
- end
- alias replace_chars rchars
- alias replace_coords rchars
-
def select_adjust(index)
@c.select('adjust', @id, index)
self
@@ -228,7 +203,7 @@ class TkcTag<TkObject
CTagID_TBL = TkCore::INTERP.create_table
- (Tk_CanvasTag_ID = ['ctag'.freeze, TkUtil.untrust('00000')]).instance_eval{
+ (Tk_CanvasTag_ID = ['ctag'.freeze, '00000'.taint]).instance_eval{
@mutex = Mutex.new
def mutex; @mutex; end
freeze
@@ -243,7 +218,7 @@ class TkcTag<TkObject
CTagID_TBL.mutex.synchronize{
if CTagID_TBL[cpath]
CTagID_TBL[cpath][id]? CTagID_TBL[cpath][id]: id
- else
+ else
id
end
}
@@ -414,7 +389,7 @@ class TkcTagCurrent<TkcTagString
end
class TkcGroup<TkcTag
- (Tk_cGroup_ID = ['tkcg'.freeze, TkUtil.untrust('00000')]).instance_eval{
+ (Tk_cGroup_ID = ['tkcg'.freeze, '00000'.taint]).instance_eval{
@mutex = Mutex.new
def mutex; @mutex; end
freeze
@@ -439,7 +414,7 @@ class TkcGroup<TkcTag
include(*args) if args != []
end
#private :create_self
-
+
def include(*tags)
for i in tags
#i.addtag(@id)
diff --git a/ext/tk/lib/tk/checkbutton.rb b/ext/tk/lib/tk/checkbutton.rb
index b7449541c5..b1186a87ed 100644
--- a/ext/tk/lib/tk/checkbutton.rb
+++ b/ext/tk/lib/tk/checkbutton.rb
@@ -7,7 +7,7 @@ require 'tk/radiobutton'
class Tk::CheckButton<Tk::RadioButton
TkCommandNames = ['checkbutton'.freeze].freeze
WidgetClassName = 'Checkbutton'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
#def create_self(keys)
# if keys and keys != None
# tk_call_without_enc('checkbutton', @path, *hash_kv(keys, true))
@@ -26,7 +26,5 @@ end
Tk::Checkbutton = Tk::CheckButton
#TkCheckButton = Tk::CheckButton unless Object.const_defined? :TkCheckButton
#TkCheckbutton = Tk::Checkbutton unless Object.const_defined? :TkCheckbutton
-#Tk.__set_toplevel_aliases__(:Tk, Tk::CheckButton,
-# :TkCheckButton, :TkCheckbutton)
-Tk.__set_loaded_toplevel_aliases__('tk/checkbutton.rb', :Tk, Tk::CheckButton,
- :TkCheckButton, :TkCheckbutton)
+Tk.__set_toplevel_aliases__(:Tk, Tk::CheckButton,
+ :TkCheckButton, :TkCheckbutton)
diff --git a/ext/tk/lib/tk/composite.rb b/ext/tk/lib/tk/composite.rb
index e267c7a22b..883d43c3ea 100644
--- a/ext/tk/lib/tk/composite.rb
+++ b/ext/tk/lib/tk/composite.rb
@@ -1,5 +1,5 @@
#
-# tk/composite.rb :
+# tk/composite.rb :
#
require 'tk'
@@ -145,34 +145,16 @@ module TkComposite
str.chop << ' @epath=' << @epath.inspect << '>'
end
- def _get_opt_method_list(arg)
- m_set, m_cget, m_info = arg
- m_set = m_set.to_s
- m_cget = m_set if !m_cget && self.method(m_set).arity == -1
- m_cget = m_cget.to_s if m_cget
- m_info = m_info.to_s if m_info
- [m_set, m_cget, m_info]
- end
- private :_get_opt_method_list
-
def option_methods(*opts)
- if opts.size == 1 && opts[0].kind_of?(Hash)
- # {name => [m_set, m_cget, m_info], name => method} style
- opts[0].each{|name, arg|
- m_set, m_cget, m_info = _get_opt_method_list(arg)
- @option_methods[name.to_s] = {
- :set => m_set, :cget => m_cget, :info => m_info
- }
+ opts.each{|m_set, m_cget, m_info|
+ m_set = m_set.to_s
+ m_cget = m_set if !m_cget && self.method(m_set).arity == -1
+ m_cget = m_cget.to_s if m_cget
+ m_info = m_info.to_s if m_info
+ @option_methods[m_set] = {
+ :set => m_set, :cget => m_cget, :info => m_info
}
- else
- # [m_set, m_cget, m_info] or method style
- opts.each{|arg|
- m_set, m_cget, m_info = _get_opt_method_list(arg)
- @option_methods[m_set] = {
- :set => m_set, :cget => m_cget, :info => m_info
- }
- }
- end
+ }
end
def delegate_alias(alias_opt, option, *wins)
@@ -233,14 +215,6 @@ module TkComposite
end
private :__cget_delegates
- def cget_tkstring(slot)
- if (ret = __cget_delegates(slot)) == None
- super(slot)
- else
- _get_eval_string(ret)
- end
- end
-
def cget(slot)
if (ret = __cget_delegates(slot)) == None
super(slot)
@@ -384,7 +358,7 @@ module TkComposite
opt, wins = tbl[0]
next unless wins && wins[-1]
if slot == opt
- info_list.delete_if{|i| i[0] == slot} <<
+ info_list.delete_if{|i| i[0] == slot} <<
wins[-1].configinfo(slot)
else
info = wins[-1].configinfo(opt)
@@ -393,7 +367,7 @@ module TkComposite
end
else
opt, wins = tbl[-1]
- info_list.delete_if{|i| i[0] == slot} <<
+ info_list.delete_if{|i| i[0] == slot} <<
[slot, '', '', '', wins[-1].cget(opt)]
end
}
diff --git a/ext/tk/lib/tk/console.rb b/ext/tk/lib/tk/console.rb
index 64e257594c..26ce262caa 100644
--- a/ext/tk/lib/tk/console.rb
+++ b/ext/tk/lib/tk/console.rb
@@ -28,7 +28,7 @@ module TkConsole
# supports a Tcl script only
# I have no idea to support a Ruby script seamlessly.
#
- _fromUTF8(tk_call_without_enc('console', 'eval',
+ _fromUTF8(tk_call_without_enc('console', 'eval',
_get_eval_enc_str(tcl_script)))
end
def self.maininterp_eval(tcl_script)
@@ -36,7 +36,7 @@ module TkConsole
# supports a Tcl script only
# I have no idea to support a Ruby script seamlessly.
#
- _fromUTF8(tk_call_without_enc('consoleinterp', 'eval',
+ _fromUTF8(tk_call_without_enc('consoleinterp', 'eval',
_get_eval_enc_str(tcl_script)))
end
@@ -45,7 +45,7 @@ module TkConsole
# supports a Tcl script only
# I have no idea to support a Ruby script seamlessly.
#
- _fromUTF8(tk_call_without_enc('consoleinterp', 'record',
+ _fromUTF8(tk_call_without_enc('consoleinterp', 'record',
_get_eval_enc_str(tcl_script)))
end
diff --git a/ext/tk/lib/tk/dialog.rb b/ext/tk/lib/tk/dialog.rb
index 7ef7820699..180da101e3 100644
--- a/ext/tk/lib/tk/dialog.rb
+++ b/ext/tk/lib/tk/dialog.rb
@@ -18,11 +18,11 @@ class TkDialogObj < TkWindow
def _set_button_config(configs)
set_config = proc{|c,i|
if $VERBOSE && (c.has_key?('command') || c.has_key?(:command))
- STDERR.print("Warning: cannot give a command option " +
+ STDERR.print("Warning: cannot give a command option " +
"to the dialog button#{i}. It was removed.\n")
end
c.delete('command'); c.delete(:command)
- # @config << Kernel.format("%s.button%s configure %s; ",
+ # @config << Kernel.format("%s.button%s configure %s; ",
# @path, i, hash_kv(c).join(' '))
# @config << @path+'.button'+i.to_s+' configure '+hash_kv(c).join(' ')+'; '
@config << @path+'.button'+i.to_s+' configure '+
@@ -103,7 +103,7 @@ class TkDialogObj < TkWindow
#end
if @buttons.kind_of?(Array)
- _set_button_config(@buttons.collect{|cfg|
+ _set_button_config(@buttons.collect{|cfg|
(cfg.kind_of? Array)? cfg[1]: nil})
@buttons = @buttons.collect{|cfg| (cfg.kind_of? Array)? cfg[0]: cfg}
end
@@ -127,7 +127,7 @@ class TkDialogObj < TkWindow
=end
if @message_config.kind_of?(Hash)
- # @config << Kernel.format("%s.msg configure %s;",
+ # @config << Kernel.format("%s.msg configure %s;",
# @path, hash_kv(@message_config).join(' '))
# @config << @path+'.msg configure '+hash_kv(@message_config).join(' ')+';'
@config << @path+'.msg configure '+
@@ -135,7 +135,7 @@ class TkDialogObj < TkWindow
end
if @msgframe_config.kind_of?(Hash)
- # @config << Kernel.format("%s.top configure %s;",
+ # @config << Kernel.format("%s.top configure %s;",
# @path, hash_kv(@msgframe_config).join(' '))
# @config << @path+'.top configure '+hash_kv(@msgframe_config).join(' ')+';'
@config << @path+'.top configure '+
@@ -143,7 +143,7 @@ class TkDialogObj < TkWindow
end
if @btnframe_config.kind_of?(Hash)
- # @config << Kernel.format("%s.bot configure %s;",
+ # @config << Kernel.format("%s.bot configure %s;",
# @path, hash_kv(@btnframe_config).join(' '))
# @config << @path+'.bot configure '+hash_kv(@btnframe_config).join(' ')+';'
@config << @path+'.bot configure '+
@@ -151,7 +151,7 @@ class TkDialogObj < TkWindow
end
if @bitmap_config.kind_of?(Hash)
- # @config << Kernel.format("%s.bitmap configure %s;",
+ # @config << Kernel.format("%s.bitmap configure %s;",
# @path, hash_kv(@bitmap_config).join(' '))
# @config << @path+'.bitmap configure '+hash_kv(@bitmap_config).join(' ')+';'
@config << @path+'.bitmap configure '+
@@ -176,19 +176,19 @@ class TkDialogObj < TkWindow
# default_button = '{}' if default_button == nil
default_button = '' if default_button == nil
#Tk.ip_eval('eval {global '+@var.id+';'+@config+
- # 'set '+@var.id+' [tk_dialog '+
+ # 'set '+@var.id+' [tk_dialog '+
# @path+" "+@title+" {#{@message}} "+@bitmap+" "+
# String(default_button)+" "+@buttons.join(' ')+']}')
Tk.ip_eval(@config)
- # @val = Tk.ip_eval('tk_dialog ' + @path + ' ' + @title +
- # ' {' + @message + '} ' + @bitmap + ' ' +
+ # @val = Tk.ip_eval('tk_dialog ' + @path + ' ' + @title +
+ # ' {' + @message + '} ' + @bitmap + ' ' +
# String(default_button) + ' ' + @buttons.join(' ')).to_i
- # @val = Tk.ip_eval(self.class::TkCommandNames[0] + ' ' + @path + ' ' +
- # @title + ' {' + @message + '} ' + @bitmap + ' ' +
+ # @val = Tk.ip_eval(self.class::TkCommandNames[0] + ' ' + @path + ' ' +
+ # @title + ' {' + @message + '} ' + @bitmap + ' ' +
# String(default_button) + ' ' + @buttons.join(' ')).to_i
@val = Tk.ip_eval(array2tk_list([
- self.class::TkCommandNames[0],
- @path, @title, @message, @bitmap,
+ self.class::TkCommandNames[0],
+ @path, @title, @message, @bitmap,
String(default_button)
].concat(@buttons))).to_i
end
@@ -226,7 +226,7 @@ class TkDialogObj < TkWindow
return nil
end
def bitmap
- # returns a bitmap name or a bitmap file path
+ # returns a bitmap name or a bitmap file path
# (@ + path ; e.g. '@/usr/share/bitmap/sample.xbm')
return "info"
end
diff --git a/ext/tk/lib/tk/encodedstr.rb b/ext/tk/lib/tk/encodedstr.rb
index 59fbb1911d..02de0b0d85 100644
--- a/ext/tk/lib/tk/encodedstr.rb
+++ b/ext/tk/lib/tk/encodedstr.rb
@@ -67,11 +67,11 @@ module Tk
def initialize(str, enc = nil)
super(str)
- # @encoding = ( enc ||
- # ((self.class::Encoding)?
+ # @encoding = ( enc ||
+ # ((self.class::Encoding)?
# self.class::Encoding : Tk.encoding_system) )
enc ||= (self.class::Encoding)?
- self.class::Encoding :
+ self.class::Encoding :
((Tk.encoding)? Tk.encoding : Tk.encoding_system)
if TkCore::WITH_ENCODING
unless encobj = Tk::Encoding::ENCODING_TABLE.get_obj(enc)
diff --git a/ext/tk/lib/tk/entry.rb b/ext/tk/lib/tk/entry.rb
index d4aa03f2b6..8ce8def1e7 100644
--- a/ext/tk/lib/tk/entry.rb
+++ b/ext/tk/lib/tk/entry.rb
@@ -13,7 +13,7 @@ class Tk::Entry<Tk::Label
TkCommandNames = ['entry'.freeze].freeze
WidgetClassName = 'Entry'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
#def create_self(keys)
# super(__conv_vcmd_on_hash_kv(keys))
@@ -116,5 +116,4 @@ class Tk::Entry<Tk::Label
end
#TkEntry = Tk::Entry unless Object.const_defined? :TkEntry
-#Tk.__set_toplevel_aliases__(:Tk, Tk::Entry, :TkEntry)
-Tk.__set_loaded_toplevel_aliases__('tk/entry.rb', :Tk, Tk::Entry, :TkEntry)
+Tk.__set_toplevel_aliases__(:Tk, Tk::Entry, :TkEntry)
diff --git a/ext/tk/lib/tk/event.rb b/ext/tk/lib/tk/event.rb
index bf4e122322..d8aad6248b 100644
--- a/ext/tk/lib/tk/event.rb
+++ b/ext/tk/lib/tk/event.rb
@@ -8,7 +8,7 @@ end
########################
require 'tkutil'
-require 'tk' unless Object.const_defined? :TkComm
+require 'tk'
########################
@@ -53,39 +53,39 @@ module TkEvent
#-----+-------------------+------------------+-----------------------#
# ID | const | group_flag | context_name #
#-----+-------------------+------------------+-----------------------#
- [ 2, :KeyPress, Grp::KEY, 'KeyPress', 'Key' ],
- [ 3, :KeyRelease, Grp::KEY, 'KeyRelease' ],
- [ 4, :ButtonPress, Grp::BUTTON, 'ButtonPress', 'Button' ],
- [ 5, :ButtonRelease, Grp::BUTTON, 'ButtonRelease' ],
- [ 6, :MotionNotify, Grp::MOTION, 'Motion' ],
- [ 7, :EnterNotify, Grp::CROSSING, 'Enter' ],
- [ 8, :LeaveNotify, Grp::CROSSING, 'Leave' ],
- [ 9, :FocusIn, Grp::FOCUS, 'FocusIn' ],
- [ 10, :FocusOut, Grp::FOCUS, 'FocusOut' ],
- [ 11, :KeymapNotify, 0, ],
- [ 12, :Expose, Grp::EXPOSE, 'Expose' ],
- [ 13, :GraphicsExpose, Grp::EXPOSE, ],
- [ 14, :NoExpose, 0, ],
- [ 15, :VisibilityNotify, Grp::VISIBILITY, 'Visibility' ],
- [ 16, :CreateNotify, Grp::CREATE, 'Create' ],
- [ 17, :DestroyNotify, Grp::DESTROY, 'Destroy' ],
- [ 18, :UnmapNotify, Grp::UNMAP, 'Unmap' ],
- [ 19, :MapNotify, Grp::MAP, 'Map' ],
- [ 20, :MapRequest, Grp::MAPREQ, 'MapRequest' ],
- [ 21, :ReparentNotify, Grp::REPARENT, 'Reparent' ],
- [ 22, :ConfigureNotify, Grp::CONFIG, 'Configure' ],
- [ 23, :ConfigureRequest, Grp::CONFIGREQ, 'ConfigureRequest' ],
- [ 24, :GravityNotify, Grp::GRAVITY, 'Gravity' ],
- [ 25, :ResizeRequest, Grp::RESIZEREQ, 'ResizeRequest' ],
- [ 26, :CirculateNotify, Grp::CIRC, 'Circulate' ],
- [ 27, :CirculateRequest, 0, 'CirculateRequest' ],
- [ 28, :PropertyNotify, Grp::PROP, 'Property' ],
- [ 29, :SelectionClear, 0, ],
- [ 30, :SelectionRequest, 0, ],
- [ 31, :SelectionNotify, 0, ],
- [ 32, :ColormapNotify, Grp::COLORMAP, 'Colormap' ],
- [ 33, :ClientMessage, 0, ],
- [ 34, :MappingNotify, 0, ],
+ [ 2, :KeyPress, Grp::KEY, 'KeyPress', 'Key' ],
+ [ 3, :KeyRelease, Grp::KEY, 'KeyRelease' ],
+ [ 4, :ButtonPress, Grp::BUTTON, 'ButtonPress', 'Button' ],
+ [ 5, :ButtonRelease, Grp::BUTTON, 'ButtonRelease' ],
+ [ 6, :MotionNotify, Grp::MOTION, 'Motion' ],
+ [ 7, :EnterNotify, Grp::CROSSING, 'Enter' ],
+ [ 8, :LeaveNotify, Grp::CROSSING, 'Leave' ],
+ [ 9, :FocusIn, Grp::FOCUS, 'FocusIn' ],
+ [ 10, :FocusOut, Grp::FOCUS, 'FocusOut' ],
+ [ 11, :KeymapNotify, 0, ],
+ [ 12, :Expose, Grp::EXPOSE, 'Expose' ],
+ [ 13, :GraphicsExpose, Grp::EXPOSE, ],
+ [ 14, :NoExpose, 0, ],
+ [ 15, :VisibilityNotify, Grp::VISIBILITY, 'Visibility' ],
+ [ 16, :CreateNotify, Grp::CREATE, 'Create' ],
+ [ 17, :DestroyNotify, Grp::DESTROY, 'Destroy' ],
+ [ 18, :UnmapNotify, Grp::UNMAP, 'Unmap' ],
+ [ 19, :MapNotify, Grp::MAP, 'Map' ],
+ [ 20, :MapRequest, Grp::MAPREQ, 'MapRequest' ],
+ [ 21, :ReparentNotify, Grp::REPARENT, 'Reparent' ],
+ [ 22, :ConfigureNotify, Grp::CONFIG, 'Configure' ],
+ [ 23, :ConfigureRequest, Grp::CONFIGREQ, 'ConfigureRequest' ],
+ [ 24, :GravityNotify, Grp::GRAVITY, 'Gravity' ],
+ [ 25, :ResizeRequest, Grp::RESIZEREQ, 'ResizeRequest' ],
+ [ 26, :CirculateNotify, Grp::CIRC, 'Circulate' ],
+ [ 27, :CirculateRequest, 0, 'CirculateRequest' ],
+ [ 28, :PropertyNotify, Grp::PROP, 'Property' ],
+ [ 29, :SelectionClear, 0, ],
+ [ 30, :SelectionRequest, 0, ],
+ [ 31, :SelectionNotify, 0, ],
+ [ 32, :ColormapNotify, Grp::COLORMAP, 'Colormap' ],
+ [ 33, :ClientMessage, 0, ],
+ [ 34, :MappingNotify, 0, ],
[ 35, :VirtualEvent, Grp::VIRTUAL, ],
[ 36, :ActivateNotify, Grp::ACTIVATE, 'Activate' ],
[ 37, :DeactivateNotify, Grp::ACTIVATE, 'Deactivate' ],
@@ -153,12 +153,12 @@ module TkEvent
FIELD_FLAG = {
# key => flag
- 'above' => Grp::CONFIG,
+ 'above' => Grp::CONFIG,
'borderwidth' => (Grp::CREATE|Grp::CONFIG),
- 'button' => Grp::BUTTON,
- 'count' => Grp::EXPOSE,
- 'data' => (Grp::VIRTUAL|Grp::STRING_DATA),
- 'delta' => Grp::MWHEEL,
+ 'button' => Grp::BUTTON,
+ 'count' => Grp::EXPOSE,
+ 'data' => (Grp::VIRTUAL|Grp::STRING_DATA),
+ 'delta' => Grp::MWHEEL,
'detail' => (Grp::FOCUS|Grp::CROSSING),
'focus' => Grp::CROSSING,
'height' => (Grp::EXPOSE|Grp::CONFIG),
@@ -191,23 +191,23 @@ module TkEvent
}
FIELD_OPERATION = {
- 'root' => proc{|val|
+ 'root' => proc{|val|
begin
Tk.tk_call_without_enc('winfo', 'pathname', val)
val
rescue
nil
end
- },
+ },
- 'subwindow' => proc{|val|
+ 'subwindow' => proc{|val|
begin
Tk.tk_call_without_enc('winfo', 'pathname', val)
val
rescue
nil
end
- },
+ },
'window' => proc{|val| nil}
}
@@ -280,7 +280,7 @@ module TkEvent
Tk.event_generate(win, type_name, opts)
else
# If type is KEY event, focus should be set to target widget.
- # If not set, original widget will get the same event.
+ # If not set, original widget will get the same event.
# That will make infinite loop.
w = Tk.tk_call_without_enc('focus')
begin
@@ -296,58 +296,58 @@ module TkEvent
# [ <'%' subst-key char>, <proc type char>, <instance var (accessor) name>]
KEY_TBL = [
- [ ?#, ?n, :serial ],
- [ ?a, ?s, :above ],
- [ ?b, ?n, :num ],
- [ ?c, ?n, :count ],
- [ ?d, ?s, :detail ],
+ [ ?#, ?n, :serial ],
+ [ ?a, ?s, :above ],
+ [ ?b, ?n, :num ],
+ [ ?c, ?n, :count ],
+ [ ?d, ?s, :detail ],
# ?e
- [ ?f, ?b, :focus ],
+ [ ?f, ?b, :focus ],
# ?g
- [ ?h, ?n, :height ],
- [ ?i, ?s, :win_hex ],
+ [ ?h, ?n, :height ],
+ [ ?i, ?s, :win_hex ],
# ?j
- [ ?k, ?n, :keycode ],
+ [ ?k, ?n, :keycode ],
# ?l
- [ ?m, ?s, :mode ],
+ [ ?m, ?s, :mode ],
# ?n
- [ ?o, ?b, :override ],
- [ ?p, ?s, :place ],
+ [ ?o, ?b, :override ],
+ [ ?p, ?s, :place ],
# ?q
# ?r
- [ ?s, ?x, :state ],
- [ ?t, ?n, :time ],
+ [ ?s, ?x, :state ],
+ [ ?t, ?n, :time ],
# ?u
- [ ?v, ?n, :value_mask ],
- [ ?w, ?n, :width ],
- [ ?x, ?n, :x ],
- [ ?y, ?n, :y ],
+ [ ?v, ?n, :value_mask ],
+ [ ?w, ?n, :width ],
+ [ ?x, ?n, :x ],
+ [ ?y, ?n, :y ],
# ?z
- [ ?A, ?s, :char ],
- [ ?B, ?n, :borderwidth ],
+ [ ?A, ?s, :char ],
+ [ ?B, ?n, :borderwidth ],
# ?C
- [ ?D, ?n, :wheel_delta ],
- [ ?E, ?b, :send_event ],
+ [ ?D, ?n, :wheel_delta ],
+ [ ?E, ?b, :send_event ],
# ?F
# ?G
# ?H
# ?I
# ?J
- [ ?K, ?s, :keysym ],
+ [ ?K, ?s, :keysym ],
# ?L
# ?M
- [ ?N, ?n, :keysym_num ],
+ [ ?N, ?n, :keysym_num ],
# ?O
- [ ?P, ?s, :property ],
+ [ ?P, ?s, :property ],
# ?Q
- [ ?R, ?s, :rootwin_id ],
- [ ?S, ?s, :subwindow ],
- [ ?T, ?n, :type ],
+ [ ?R, ?s, :rootwin_id ],
+ [ ?S, ?s, :subwindow ],
+ [ ?T, ?n, :type ],
# ?U
# ?V
- [ ?W, ?w, :widget ],
- [ ?X, ?n, :x_root ],
- [ ?Y, ?n, :y_root ],
+ [ ?W, ?w, :widget ],
+ [ ?X, ?n, :x_root ],
+ [ ?Y, ?n, :y_root ],
# ?Z
nil
]
@@ -356,16 +356,16 @@ module TkEvent
# the subst-key string will be converted to a bytecode (128+idx).
LONGKEY_TBL = [
# for example, for %CTT and %CST subst-key on tkdnd-2.0
- # ['CTT', ?l, :drop_target_type],
- # ['CST', ?l, :drop_source_type],
+ # ['CTT', ?l, :drop_target_type],
+ # ['CST', ?l, :drop_source_type],
]
# [ <proc type char>, <proc/method to convert tcl-str to ruby-obj>]
PROC_TBL = [
- [ ?n, TkComm.method(:num_or_str) ],
- [ ?s, TkComm.method(:string) ],
- [ ?b, TkComm.method(:bool) ],
- [ ?w, TkComm.method(:window) ],
+ [ ?n, TkComm.method(:num_or_str) ],
+ [ ?s, TkComm.method(:string) ],
+ [ ?b, TkComm.method(:bool) ],
+ [ ?w, TkComm.method(:window) ],
[ ?x, proc{|val|
begin
@@ -374,7 +374,7 @@ module TkEvent
val
end
}
- ],
+ ],
nil
]
@@ -399,25 +399,25 @@ module TkEvent
# setup tables to be used by scan_args, _get_subst_key, _get_all_subst_keys
#
- # _get_subst_key() and _get_all_subst_keys() generates key-string
- # which describe how to convert callback arguments to ruby objects.
- # When binding parameters are given, use _get_subst_key().
- # But when no parameters are given, use _get_all_subst_keys() to
- # create a Event class object as a callback parameter.
+ # _get_subst_key() and _get_all_subst_keys() generates key-string
+ # which describe how to convert callback arguments to ruby objects.
+ # When binding parameters are given, use _get_subst_key().
+ # But when no parameters are given, use _get_all_subst_keys() to
+ # create a Event class object as a callback parameter.
#
- # scan_args() is used when doing callback. It convert arguments
- # ( which are Tcl strings ) to ruby objects based on the key string
- # that is generated by _get_subst_key() or _get_all_subst_keys().
+ # scan_args() is used when doing callback. It convert arguments
+ # ( which are Tcl strings ) to ruby objects based on the key string
+ # that is generated by _get_subst_key() or _get_all_subst_keys().
#
_setup_subst_table(KEY_TBL, PROC_TBL)
# _setup_subst_table(KEY_TBL, LONGKEY_TBL, PROC_TBL) # if use longname-keys
#
- # NOTE: The order of parameters which passed to callback procedure is
+ # NOTE: The order of parameters which passed to callback procedure is
# <extra_arg>, <extra_arg>, ... , <subst_arg>, <subst_arg>, ...
#
- # If you need support extra arguments given by Tcl/Tk,
+ # If you need support extra arguments given by Tcl/Tk,
# please override _get_extra_args_tbl
#
#def self._get_extra_args_tbl
@@ -436,15 +436,15 @@ module TkEvent
alias sendevent send_event
=end
ALIAS_TBL = {
- :button => :num,
- :data => :detail,
- :delta => :wheel_delta,
- :root => :rootwin_id,
- :rootx => :x_root,
- :root_x => :x_root,
- :rooty => :y_root,
- :root_y => :y_root,
- :sendevent => :send_event,
+ :button => :num,
+ :data => :detail,
+ :delta => :wheel_delta,
+ :root => :rootwin_id,
+ :rootx => :x_root,
+ :root_x => :x_root,
+ :rooty => :y_root,
+ :root_y => :y_root,
+ :sendevent => :send_event,
:window => :widget
}
@@ -482,26 +482,6 @@ module TkEvent
end
})
end
- elsif cmd.respond_to?(:arity) && cmd.arity == 0 # args.size == 0
- args = ''
- if cmd.kind_of?(String)
- id = cmd
- elsif cmd.kind_of?(TkCallbackEntry)
- id = install_cmd(cmd)
- else
- id = install_cmd(proc{
- begin
- TkUtil.eval_cmd(cmd)
- rescue Exception=>e
- if TkCore::INTERP.kind_of?(TclTkIp)
- fail e
- else
- # MultiTkIp
- fail Exception, "#{e.class}: #{e.message.dup}"
- end
- end
- })
- end
else
keys, args = klass._get_all_subst_keys
diff --git a/ext/tk/lib/tk/font.rb b/ext/tk/lib/tk/font.rb
index 03db850f96..62d628c132 100644
--- a/ext/tk/lib/tk/font.rb
+++ b/ext/tk/lib/tk/font.rb
@@ -11,7 +11,7 @@ class TkFont
TkCommandNames = ['font'.freeze].freeze
- (Tk_FontID = ["@font".freeze, TkUtil.untrust("00000")]).instance_eval{
+ (Tk_FontID = ["@font".freeze, "00000".taint]).instance_eval{
@mutex = Mutex.new
def mutex; @mutex; end
freeze
@@ -20,7 +20,7 @@ class TkFont
Tk_FontNameTBL = TkCore::INTERP.create_table
Tk_FontUseTBL = TkCore::INTERP.create_table
- TkCore::INTERP.init_ip_env{
+ TkCore::INTERP.init_ip_env{
Tk_FontNameTBL.mutex.synchronize{ Tk_FontNameTBL.clear }
Tk_FontUseTBL.mutex.synchronize{ Tk_FontUseTBL.clear }
}
@@ -66,8 +66,8 @@ class TkFont
knj = 'defaultgui'
when /Mincho:Helvetica-Bold-12/
# Tcl/Tk-JP for UNIX/X
- ltn, knj = tk_split_simplelist(tk_call('font', 'configure',
- 'Mincho:Helvetica-Bold-12',
+ ltn, knj = tk_split_simplelist(tk_call('font', 'configure',
+ 'Mincho:Helvetica-Bold-12',
'-compound'))
else
# unknown Tcl/Tk-JP
@@ -75,7 +75,7 @@ class TkFont
platform = Tk::PLATFORM['platform']
case platform
when 'unix'
- ltn = {'family'=>'Helvetica'.freeze,
+ ltn = {'family'=>'Helvetica'.freeze,
'size'=>-12, 'weight'=>'bold'.freeze}
#knj = 'k14'
#knj = '-misc-fixed-medium-r-normal--14-*-*-*-c-*-jisx0208.1983-0'
@@ -102,7 +102,7 @@ class TkFont
platform = Tk::PLATFORM['platform']
case platform
when 'unix'
- ltn = {'family'=>'Helvetica'.freeze,
+ ltn = {'family'=>'Helvetica'.freeze,
'size'=>-12, 'weight'=>'bold'.freeze}
when 'windows'
ltn = {'family'=>'MS Sans Serif'.freeze, 'size'=>8}
@@ -211,7 +211,7 @@ class TkFont
end
end
def TkFont.actual_hash(fnt, option=nil)
- Hash[TkFont.actual(fnt, option)]
+ Hash[TkFont.actual_hash(fnt, option)]
end
def TkFont.actual_displayof(fnt, win, option=nil)
@@ -224,7 +224,7 @@ class TkFont
end
end
def TkFont.actual_hash_displayof(fnt, option=nil)
- Hash[TkFont.actual_displayof(fnt, option)]
+ Hash[TkFont.actual_hash_displayof(fnt, option)]
end
def TkFont.configure(fnt, slot, value=None)
@@ -294,7 +294,7 @@ class TkFont
end
h = Hash[TkFont.metrics(fnt)]
- h.keys.each{|k|
+ h.keys.each{|k|
case TkFont::MetricsType[k.to_s]
when ?n
h[k] = TkComm::num_or_str(h[k])
@@ -331,7 +331,7 @@ class TkFont
end
h = Hash[TkFont.metrics_displayof(fnt, win, option)]
- h.keys.each{|k|
+ h.keys.each{|k|
case TkFont::MetricsType[k.to_s]
when ?n
h[k] = TkComm::num_or_str(h[k])
@@ -459,7 +459,7 @@ class TkFont
else
begin
compound = tk_split_simplelist(
- Hash[*tk_split_simplelist(tk_call('font', 'configure',
+ Hash[*tk_split_simplelist(tk_call('font', 'configure',
fnt))].collect{|k,v|
[k[1..-1], v]
}.assoc('compound')[1])
@@ -473,7 +473,7 @@ class TkFont
TkFont.new(fnt).call_font_configure([path, key], *args)
end
else
- TkFont.new(compound[0],
+ TkFont.new(compound[0],
compound[1]).call_font_configure([path, key], *args)
end
end
@@ -570,7 +570,7 @@ class TkFont
if JAPANIZED_TK
tk_call('font', 'create', @latinfont, '-charset', 'iso8859')
tk_call('font', 'create', @kanjifont, '-charset', 'jisx0208.1983')
- tk_call('font', 'create', @compoundfont,
+ tk_call('font', 'create', @compoundfont,
'-compound', [@latinfont, @kanjifont])
else
tk_call('font', 'create', @latinfont)
@@ -614,7 +614,7 @@ class TkFont
# compound font check
if Tk::TK_VERSION == '8.0' && JAPANIZED_TK
begin
- compound = tk_split_simplelist(tk_call('font', 'configure',
+ compound = tk_split_simplelist(tk_call('font', 'configure',
ltn, '-compound'))
if knj == nil
if compound != []
@@ -624,7 +624,7 @@ class TkFont
if compound != []
ltn = compound[0]
end
- compound = tk_split_simplelist(tk_call('font', 'configure',
+ compound = tk_split_simplelist(tk_call('font', 'configure',
knj, '-compound'))
if compound != []
knj = compound[1]
@@ -639,7 +639,7 @@ class TkFont
if Tk::TK_VERSION =~ /^4..*/
knj = DEFAULT_KANJI_FONT_NAME
else
- knj = ltn
+ knj = ltn
end
end
else
@@ -806,7 +806,7 @@ class TkFont
if font[:charset] || font['charset']
tk_call('font', 'create', @latinfont, *hash_kv(font))
else
- tk_call('font', 'create', @latinfont,
+ tk_call('font', 'create', @latinfont,
'-charset', 'iso8859', *hash_kv(font))
end
elsif font.kind_of? Array
@@ -815,7 +815,7 @@ class TkFont
elsif font.kind_of? TkFont
tk_call('font', 'create', @latinfont, '-copy', font.latin_font)
elsif font
- tk_call('font', 'create', @latinfont, '-copy', font,
+ tk_call('font', 'create', @latinfont, '-copy', font,
'-charset', 'iso8859')
else
tk_call('font', 'create', @latinfont, '-charset', 'iso8859')
@@ -851,7 +851,7 @@ class TkFont
if font[:charset] || font['charset']
tk_call('font', 'create', @kanjifont, *hash_kv(font))
else
- tk_call('font', 'create', @kanjifont,
+ tk_call('font', 'create', @kanjifont,
'-charset', 'jisx0208.1983', *hash_kv(font))
end
elsif font.kind_of? Array
@@ -860,7 +860,7 @@ class TkFont
elsif font.kind_of? TkFont
tk_call('font', 'create', @kanjifont, '-copy', font.kanji_font_id)
elsif font
- tk_call('font', 'create', @kanjifont, '-copy', font,
+ tk_call('font', 'create', @kanjifont, '-copy', font,
'-charset', 'jisx0208.1983')
else
tk_call('font', 'create', @kanjifont, '-charset', 'jisx0208.1983')
@@ -922,7 +922,7 @@ class TkFont
@fontslot = {'font'=>@compoundfont}
# @fontslot['font'] = @compoundfont
begin
- tk_call('font', 'create', @compoundfont,
+ tk_call('font', 'create', @compoundfont,
'-compound', [@latinfont, @kanjifont], *hash_kv(keys))
rescue RuntimeError => e
if ltn == knj
@@ -930,7 +930,7 @@ class TkFont
tk_call('font', 'delete', @latinfont)
create_latinfont(DEFAULT_LATIN_FONT_NAME)
opts = []
- Hash[*(tk_split_simplelist(tk_call('font', 'configure',
+ Hash[*(tk_split_simplelist(tk_call('font', 'configure',
@kanjifont)))].each{|k,v|
case k
when '-size', '-weight', '-slant', '-underline', '-overstrike'
@@ -938,14 +938,14 @@ class TkFont
end
}
tk_call('font', 'configure', @latinfont, *opts)
- tk_call('font', 'create', @compoundfont,
+ tk_call('font', 'create', @compoundfont,
'-compound', [@latinfont, @kanjifont], *hash_kv(keys))
elsif e.message =~ /ascii font .* specified/
tk_call('font', 'delete', @kanjifont)
create_kanjifont(DEFAULT_KANJI_FONT_NAME)
opts = []
- Hash[*(tk_split_simplelist(tk_call('font', 'configure',
+ Hash[*(tk_split_simplelist(tk_call('font', 'configure',
@latinfont)))].each{|k,v|
case k
when '-size', '-weight', '-slant', '-underline', '-overstrike'
@@ -953,7 +953,7 @@ class TkFont
end
}
tk_call('font', 'configure', @kanjifont, *opts)
- tk_call('font', 'create', @compoundfont,
+ tk_call('font', 'create', @compoundfont,
'-compound', [@latinfont, @kanjifont], *hash_kv(keys))
else
@@ -1392,7 +1392,7 @@ class TkFont
end
h = Hash[metrics(option)]
- h.keys.each{|k|
+ h.keys.each{|k|
case TkFont::MetricsType[k.to_s]
when ?n
h[k] = TkComm::num_or_str(h[k])
@@ -1424,7 +1424,7 @@ class TkFont
end
h = Hash[metrics_displayof(win, option)]
- h.keys.each{|k|
+ h.keys.each{|k|
case TkFont::MetricsType[k.to_s]
when ?n
h[k] = TkComm::num_or_str(h[k])
@@ -1459,7 +1459,7 @@ class TkFont
end
h = Hash[latin_metrics(option)]
- h.keys.each{|k|
+ h.keys.each{|k|
case TkFont::MetricsType[k.to_s]
when ?n
h[k] = TkComm::num_or_str(h[k])
@@ -1495,7 +1495,7 @@ class TkFont
end
h = Hash[latin_metrics_displayof(win, option)]
- h.keys.each{|k|
+ h.keys.each{|k|
case TkFont::MetricsType[k.to_s]
when ?n
h[k] = TkComm::num_or_str(h[k])
@@ -1532,7 +1532,7 @@ class TkFont
end
h = Hash[kanji_metrics(option)]
- h.keys.each{|k|
+ h.keys.each{|k|
case TkFont::MetricsType[k.to_s]
when ?n
h[k] = TkComm::num_or_str(h[k])
@@ -1570,7 +1570,7 @@ class TkFont
end
h = Hash[kanji_metrics_displayof(win, option)]
- h.keys.each{|k|
+ h.keys.each{|k|
case TkFont::MetricsType[k.to_s]
when ?n
h[k] = TkComm::num_or_str(h[k])
@@ -1586,7 +1586,7 @@ class TkFont
def reset_pointadjust
begin
if /^8\..*/ === Tk::TK_VERSION && JAPANIZED_TK
- configure('pointadjust' => latin_actual.assoc('size')[1].to_f /
+ configure('pointadjust' => latin_actual.assoc('size')[1].to_f /
kanji_actual.assoc('size')[1].to_f )
end
rescue
@@ -1659,8 +1659,8 @@ module TkFont::CoreMethods
''
end
else
- [['family',''], ['size',0], ['weight',''], ['slant',''],
- ['underline',false], ['overstrike',false], ['charset',''],
+ [['family',''], ['size',0], ['weight',''], ['slant',''],
+ ['underline',false], ['overstrike',false], ['charset',''],
['pointadjust',0]]
end
end
@@ -1672,7 +1672,7 @@ module TkFont::CoreMethods
""
elsif option
if win
- val = tk_call('font', 'actual', font,
+ val = tk_call('font', 'actual', font,
"-displayof", win, "-#{option}")
else
val = tk_call('font', 'actual', font, "-#{option}")
@@ -1687,7 +1687,7 @@ module TkFont::CoreMethods
end
else
l = tk_split_simplelist(if win
- tk_call('font', 'actual', font,
+ tk_call('font', 'actual', font,
"-displayof", win)
else
tk_call('font', 'actual', font)
@@ -1733,8 +1733,8 @@ module TkFont::CoreMethods
''
end
else
- [['family',''], ['size',0], ['weight',''], ['slant',''],
- ['underline',false], ['overstrike',false], ['charset',''],
+ [['family',''], ['size',0], ['weight',''], ['slant',''],
+ ['underline',false], ['overstrike',false], ['charset',''],
['pointadjust',1.0]]
end
else # ! TkComm::GET_CONFIGINFOwoRES_AS_ARRAY
@@ -1753,8 +1753,8 @@ module TkFont::CoreMethods
''
end
else
- {'family'=>'', 'size'=>0, 'weight'=>'', 'slant'=>'',
- 'underline'=>false, 'overstrike'=>false,
+ {'family'=>'', 'size'=>0, 'weight'=>'', 'slant'=>'',
+ 'underline'=>false, 'overstrike'=>false,
'charset'=>false, 'pointadjust'=>1.0}
end
end
@@ -1775,20 +1775,20 @@ module TkFont::CoreMethods
configure_core_tk8x(font, 'family', slot.delete('family'))
end
- if ((slot.key?('size') || slot.key?(:size)) &&
+ if ((slot.key?('size') || slot.key?(:size)) &&
padjust && !slot.key?('pointadjust') && !slot.key?(:pointadjust))
- tk_call('font', 'configure', font,
+ tk_call('font', 'configure', font,
'-pointadjust', padjust, *hash_kv(slot))
else
tk_call('font', 'configure', font, *hash_kv(slot))
end
elsif (slot == 'size' || slot == :size) && padjust != nil
- tk_call('font', 'configure', font,
+ tk_call('font', 'configure', font,
"-#{slot}", value, '-pointadjust', padjust)
elsif JAPANIZED_TK && (slot == 'family' || slot == :family)
# coumpund font?
begin
- compound = tk_split_simplelist(tk_call('font', 'configure',
+ compound = tk_split_simplelist(tk_call('font', 'configure',
font, '-compound'))
rescue
tk_call('font', 'configure', font, '-family', value)
@@ -1819,7 +1819,7 @@ module TkFont::CoreMethods
ensure
tk_call('font', 'delete', kfnt) if kfnt != ''
end
-
+
else
tk_call('font', 'configure', font, "-#{slot}", value)
end
@@ -2044,7 +2044,7 @@ module TkFont::CoreMethods
keys = self.configinfo
tk_call('font', 'delete', @compoundfont)
begin
- tk_call('font', 'create', @compoundfont,
+ tk_call('font', 'create', @compoundfont,
'-compound', [@latinfont, @kanjifont], *hash_kv(keys))
=begin
latinkeys = {}
@@ -2061,7 +2061,7 @@ module TkFont::CoreMethods
tk_call('font', 'delete', @latinfont)
if fnt_bup && fnt_bup != ''
tk_call('font', 'create', @latinfont, '-copy', fnt_bup)
- tk_call('font', 'create', @compoundfont,
+ tk_call('font', 'create', @compoundfont,
'-compound', [@latinfont, @kanjifont], *hash_kv(keys))
tk_call('font', 'delete', fnt_bup)
else
@@ -2082,7 +2082,7 @@ module TkFont::CoreMethods
# not exist? (deleted?) -> create font
tk_call('font', 'create', @compoundfont, *hash_kv(latinkeys))
end
- end
+ end
self
end
@@ -2112,20 +2112,20 @@ module TkFont::CoreMethods
keys = self.configinfo
tk_call('font', 'delete', @compoundfont)
begin
- tk_call('font', 'create', @compoundfont,
+ tk_call('font', 'create', @compoundfont,
'-compound', [@latinfont, @kanjifont], *hash_kv(keys))
rescue RuntimeError => e
tk_call('font', 'delete', @kanjifont)
if fnt_bup && fnt_bup != ''
tk_call('font', 'create', @kanjifont, '-copy', fnt_bup)
- tk_call('font', 'create', @compoundfont,
+ tk_call('font', 'create', @compoundfont,
'-compound', [@latinfont, @kanjifont], *hash_kv(keys))
tk_call('font', 'delete', fnt_bup)
else
fail e
end
end
- end
+ end
self
end
@@ -2137,7 +2137,7 @@ module TkFont::CoreMethods
font = '{}' if font == ''
if win
- number(tk_call('font', 'measure', font,
+ number(tk_call('font', 'measure', font,
'-displayof', win, text))
else
number(tk_call('font', 'measure', font, text))
@@ -2158,7 +2158,7 @@ module TkFont::CoreMethods
if option
if win
- number(tk_call('font', 'metrics', font,
+ number(tk_call('font', 'metrics', font,
"-displayof", win, "-#{option}"))
else
number(tk_call('font', 'metrics', font, "-#{option}"))
@@ -2199,7 +2199,7 @@ module TkFont::CoreMethods
alias measure_core measure_core_tk4x
alias metrics_core metrics_core_tk4x
- when /^8\.[0-9]/
+ when /^8\.[0-5]/
alias actual_core actual_core_tk8x
alias configure_core configure_core_tk8x
alias configinfo_core configinfo_core_tk8x
@@ -2304,12 +2304,12 @@ end
#######################################
# define system font names
#######################################
-if Tk::TCL_MAJOR_VERSION > 8 ||
+if Tk::TCL_MAJOR_VERSION > 8 ||
(Tk::TCL_MAJOR_VERSION == 8 && Tk::TCL_MINOR_VERSION >= 5)
# add standard fonts of Tcl/Tk 8.5+
TkFont::SYSTEM_FONT_NAMES.add [
- 'TkDefaultFont', 'TkTextFont', 'TkFixedFont', 'TkMenuFont',
- 'TkHeadingFont', 'TkCaptionFont', 'TkSmallCaptionFont',
+ 'TkDefaultFont', 'TkTextFont', 'TkFixedFont', 'TkMenuFont',
+ 'TkHeadingFont', 'TkCaptionFont', 'TkSmallCaptionFont',
'TkIconFont', 'TkTooltipFont'
]
end
@@ -2323,29 +2323,22 @@ TkFont::SYSTEM_FONT_NAMES.add [
# -- macintosh, macosx
TkFont::SYSTEM_FONT_NAMES.add ['system', 'application']
-if Tk::TCL_MAJOR_VERSION > 8 ||
+if Tk::TCL_MAJOR_VERSION > 8 ||
(Tk::TCL_MAJOR_VERSION == 8 && Tk::TCL_MINOR_VERSION >= 5)
TkFont::SYSTEM_FONT_NAMES.add ['menu']
end
# -- macosx (Aqua theme)
-if Tk::TCL_MAJOR_VERSION > 8 ||
+if Tk::TCL_MAJOR_VERSION > 8 ||
(Tk::TCL_MAJOR_VERSION == 8 && Tk::TCL_MINOR_VERSION >= 5)
TkFont::SYSTEM_FONT_NAMES.add [
- 'systemSystemFont', 'systemEmphasizedSystemFont',
- 'systemSmallSystemFont', 'systemSmallEmphasizedSystemFont',
- 'systemApplicationFont', 'systemLabelFont', 'systemViewsFont',
- 'systemMenuTitleFont', 'systemMenuItemFont', 'systemMenuItemMarkFont',
- 'systemMenuItemCmdKeyFont', 'systemWindowTitleFont',
- 'systemPushButtonFont', 'systemUtilityWindowTitleFont',
- 'systemAlertHeaderFont', 'systemToolbarFont', 'systemMiniSystemFont',
+ 'systemSystemFont', 'systemEmphasizedSystemFont',
+ 'systemSmallSystemFont', 'systemSmallEmphasizedSystemFont',
+ 'systemApplicationFont', 'systemLabelFont', 'systemViewsFont',
+ 'systemMenuTitleFont', 'systemMenuItemFont', 'systemMenuItemMarkFont',
+ 'systemMenuItemCmdKeyFont', 'systemWindowTitleFont',
+ 'systemPushButtonFont', 'systemUtilityWindowTitleFont',
+ 'systemAlertHeaderFont', 'systemToolbarFont', 'systemMiniSystemFont',
'systemDetailSystemFont', 'systemDetailEmphasizedSystemFont'
]
end
-
-#######################################
-# autoload
-#######################################
-class TkFont
- autoload :Chooser, 'tk/fontchooser'
-end
diff --git a/ext/tk/lib/tk/fontchooser.rb b/ext/tk/lib/tk/fontchooser.rb
deleted file mode 100644
index 092ffc04bf..0000000000
--- a/ext/tk/lib/tk/fontchooser.rb
+++ /dev/null
@@ -1,176 +0,0 @@
-#
-# tk/fontchooser.rb -- "tk fontchooser" support (Tcl/Tk8.6 or later)
-#
-require 'tk'
-require 'tk/font'
-
-module TkFont::Chooser
- extend TkCore
-end
-
-class << TkFont::Chooser
- def method_missing(id, *args)
- name = id.id2name
- case args.length
- when 1
- if name[-1] == ?=
- configure name[0..-2], args[0]
- args[0]
- else
- configure name, args[0]
- self
- end
- when 0
- begin
- cget(name)
- rescue
- super(id, *args)
- end
- else
- super(id, *args)
- end
- end
-
- def __configinfo_value(key, val)
- case key
- when 'parent'
- window(val)
- when 'title'
- val
- when 'font'
- if (lst = tk_split_simplelist(val)).size == 1
- lst[0]
- else
- lst.map{|elem| num_or_str(elem)}
- end
- when 'command'
- tk_tcl2ruby(val)
- when 'visible'
- bool(val)
- else # unkown
- val
- end
- end
- private :__configinfo_value
-
- def configinfo(option=nil)
- if !option && TkComm::GET_CONFIGINFOwoRES_AS_ARRAY
- lst = tk_split_simplelist(tk_call('tk', 'fontchooser', 'configure'))
- ret = []
- TkComm.slice_ary(lst, 2){|k, v|
- k = k[1..-1]
- ret << [k, __configinfo_value(k, v)]
- }
- ret
- else
- current_configinfo(option)
- end
- end
-
- def current_configinfo(option=nil)
- if option
- opt = option.to_s
- fail ArgumentError, "Invalid option `#{option.inspect}'" if opt.empty?
- __configinfo_value(option.to_s, tk_call('tk','fontchooser',
- 'configure',"-#{opt}"))
- else
- lst = tk_split_simplelist(tk_call('tk', 'fontchooser', 'configure'))
- ret = {}
- TkComm.slice_ary(lst, 2){|k, v|
- k = k[1..-1]
- ret[k] = __configinfo_value(k, v)
- }
- ret
- end
- end
-
- def configure(option, value=None)
- if option.kind_of? Hash
- tk_call('tk', 'fontchooser', 'configure',
- *hash_kv(_symbolkey2str(option)))
- else
- opt = option.to_s
- fail ArgumentError, "Invalid option `#{option.inspect}'" if opt.empty?
- tk_call('tk', 'fontchooser', 'configure', "-#{opt}", value)
- end
- self
- end
-
- def configure_cmd(slot, value)
- configure(slot, install_cmd(value))
- end
-
- def command(cmd=nil, &b)
- if cmd
- configure_cmd('command', cmd)
- elsif b
- configure_cmd('command', Proc.new(&b))
- else
- cget('command')
- end
- end
-
- def cget(slot)
- configinfo slot
- end
-
- def [](slot)
- cget slot
- end
-
- def []=(slot, val)
- configure slot, val
- val
- end
-
- def show
- tk_call('tk', 'fontchooser', 'show')
- self
- end
-
- def hide
- tk_call('tk', 'fontchooser', 'hide')
- self
- end
-
- def toggle
- cget(:visible) ? hide: show
- self
- end
-
- def set_for(target, title="Font")
- if target.kind_of? TkFont
- configs = {
- :font=>target.actual_hash,
- :command=>proc{|fnt, *args|
- target.configure(TkFont.actual_hash(fnt))
- }
- }
- elsif target.kind_of? Hash
- # key=>value list or OptionObj
- fnt = target[:font] rescue ''
- fnt = fnt.actual_hash if fnt.kind_of?(TkFont)
- configs = {
- :font => fnt,
- :command=>proc{|fnt, *args|
- target[:font] = TkFont.actual_hash(fnt)
- }
- }
- else
- configs = {
- :font=>target.cget_tkstring(:font),
- :command=>proc{|fnt, *args|
- target.font = TkFont.actual_hash_displayof(fnt, target)
- }
- }
- end
-
- configs[:title] = title if title
- configure(configs)
- target
- end
-
- def unset
- configure(:command, nil)
- end
-end
diff --git a/ext/tk/lib/tk/frame.rb b/ext/tk/lib/tk/frame.rb
index 5118939732..263b160f29 100644
--- a/ext/tk/lib/tk/frame.rb
+++ b/ext/tk/lib/tk/frame.rb
@@ -6,7 +6,7 @@ require 'tk'
class Tk::Frame<TkWindow
TkCommandNames = ['frame'.freeze].freeze
WidgetClassName = 'Frame'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
################# old version
# def initialize(parent=nil, keys=nil)
@@ -128,5 +128,4 @@ class Tk::Frame<TkWindow
end
#TkFrame = Tk::Frame unless Object.const_defined? :TkFrame
-#Tk.__set_toplevel_aliases__(:Tk, Tk::Frame, :TkFrame)
-Tk.__set_loaded_toplevel_aliases__('tk/frame.rb', :Tk, Tk::Frame, :TkFrame)
+Tk.__set_toplevel_aliases__(:Tk, Tk::Frame, :TkFrame)
diff --git a/ext/tk/lib/tk/grid.rb b/ext/tk/lib/tk/grid.rb
index e1e07c44fa..0dfd7263a7 100644
--- a/ext/tk/lib/tk/grid.rb
+++ b/ext/tk/lib/tk/grid.rb
@@ -101,15 +101,17 @@ module TkGrid
def columnconfigure(master, index, args)
# master = master.epath if master.kind_of?(TkObject)
master = _epath(master)
- tk_call_without_enc("grid", 'columnconfigure',
+ tk_call_without_enc("grid", 'columnconfigure',
master, index, *hash_kv(args))
end
+ alias column columnconfigure
def rowconfigure(master, index, args)
# master = master.epath if master.kind_of?(TkObject)
master = _epath(master)
tk_call_without_enc("grid", 'rowconfigure', master, index, *hash_kv(args))
end
+ alias row rowconfigure
def columnconfiginfo(master, index, slot=nil)
# master = master.epath if master.kind_of?(TkObject)
@@ -117,15 +119,15 @@ module TkGrid
if slot
case slot
when 'uniform', :uniform
- tk_call_without_enc('grid', 'columnconfigure',
+ tk_call_without_enc('grid', 'columnconfigure',
master, index, "-#{slot}")
else
- num_or_str(tk_call_without_enc('grid', 'columnconfigure',
+ num_or_str(tk_call_without_enc('grid', 'columnconfigure',
master, index, "-#{slot}"))
end
else
#ilist = list(tk_call_without_enc('grid','columnconfigure',master,index))
- ilist = simplelist(tk_call_without_enc('grid', 'columnconfigure',
+ ilist = simplelist(tk_call_without_enc('grid', 'columnconfigure',
master, index))
info = {}
while key = ilist.shift
@@ -146,15 +148,15 @@ module TkGrid
if slot
case slot
when 'uniform', :uniform
- tk_call_without_enc('grid', 'rowconfigure',
+ tk_call_without_enc('grid', 'rowconfigure',
master, index, "-#{slot}")
else
- num_or_str(tk_call_without_enc('grid', 'rowconfigure',
+ num_or_str(tk_call_without_enc('grid', 'rowconfigure',
master, index, "-#{slot}"))
end
else
#ilist = list(tk_call_without_enc('grid', 'rowconfigure', master, index))
- ilist = simplelist(tk_call_without_enc('grid', 'rowconfigure',
+ ilist = simplelist(tk_call_without_enc('grid', 'rowconfigure',
master, index))
info = {}
while key = ilist.shift
@@ -169,22 +171,6 @@ module TkGrid
end
end
- def column(master, index, keys=nil)
- if keys.kind_of?(Hash)
- columnconfigure(master, index, keys)
- else
- columnconfiginfo(master, index, keys)
- end
- end
-
- def row(master, index, keys=nil)
- if keys.kind_of?(Hash)
- rowconfigure(master, index, keys)
- else
- rowconfiginfo(master, index, keys)
- end
- end
-
def add(widget, *args)
configure(widget, *args)
end
@@ -242,7 +228,7 @@ module TkGrid
list(tk_call_without_enc('grid', 'size', master))
end
- def slaves(master, keys=nil)
+ def slaves(master, args)
# master = master.epath if master.kind_of?(TkObject)
master = _epath(master)
list(tk_call_without_enc('grid', 'slaves', master, *hash_kv(args)))
diff --git a/ext/tk/lib/tk/image.rb b/ext/tk/lib/tk/image.rb
index 39d63478a6..dffdc19644 100644
--- a/ext/tk/lib/tk/image.rb
+++ b/ext/tk/lib/tk/image.rb
@@ -11,7 +11,7 @@ class TkImage<TkObject
Tk_IMGTBL = TkCore::INTERP.create_table
- (Tk_Image_ID = ['i'.freeze, TkUtil.untrust('00000')]).instance_eval{
+ (Tk_Image_ID = ['i'.freeze, '00000'.taint]).instance_eval{
@mutex = Mutex.new
def mutex; @mutex; end
freeze
@@ -45,7 +45,7 @@ class TkImage<TkObject
keys.delete('imagename')
keys.delete('without_creating')
obj.instance_eval{
- tk_call_without_enc('image', 'create',
+ tk_call_without_enc('image', 'create',
@type, @path, *hash_kv(keys, true))
}
end
@@ -78,7 +78,7 @@ class TkImage<TkObject
}
end
unless without_creating
- tk_call_without_enc('image', 'create',
+ tk_call_without_enc('image', 'create',
@type, @path, *hash_kv(keys, true))
end
end
@@ -211,7 +211,7 @@ class TkPhotoImage<TkImage
end
def put(data, *opts)
- if opts.empty?
+ if opts == []
tk_send('put', data)
elsif opts.size == 1 && opts[0].kind_of?(Hash)
tk_send('put', data, *_photo_hash_kv(opts[0]))
diff --git a/ext/tk/lib/tk/itemconfig.rb b/ext/tk/lib/tk/itemconfig.rb
index 14396048ba..9c6a98d0f8 100644
--- a/ext/tk/lib/tk/itemconfig.rb
+++ b/ext/tk/lib/tk/itemconfig.rb
@@ -31,10 +31,10 @@ module TkItemConfigOptkeys
def __item_strval_optkeys(id)
# maybe need to override
[
- 'text', 'label', 'show', 'data', 'file', 'maskdata', 'maskfile',
- 'activebackground', 'activeforeground', 'background',
- 'disabledforeground', 'disabledbackground', 'foreground',
- 'highlightbackground', 'highlightcolor', 'insertbackground',
+ 'text', 'label', 'show', 'data', 'file', 'maskdata', 'maskfile',
+ 'activebackground', 'activeforeground', 'background',
+ 'disabledforeground', 'disabledbackground', 'foreground',
+ 'highlightbackground', 'highlightcolor', 'insertbackground',
'selectbackground', 'selectforeground', 'troughcolor'
]
end
@@ -148,7 +148,7 @@ module TkItemConfigMethod
def __item_configinfo_struct(id)
# maybe need to override
- {:key=>0, :alias=>1, :db_name=>1, :db_class=>2,
+ {:key=>0, :alias=>1, :db_name=>1, :db_class=>2,
:default_value=>3, :current_value=>4}
end
private :__item_configinfo_struct
@@ -162,13 +162,6 @@ module TkItemConfigMethod
################################################
-
- def itemcget_tkstring(tagOrId, option)
- opt = option.to_s
- fail ArgumentError, "Invalid option `#{option.inspect}'" if opt.length == 0
- tk_call_without_enc(*(__item_cget_cmd(tagid(tagOrId)) << "-#{opt}"))
- end
-
def __itemcget_core(tagOrId, option)
orig_opt = option
option = option.to_s
@@ -409,7 +402,7 @@ module TkItemConfigMethod
fontkey = $2
# conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{fontkey}"))))
conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{fontkey}")), false, true)
- conf[__item_configinfo_struct(tagid(tagOrId))[:key]] =
+ conf[__item_configinfo_struct(tagid(tagOrId))[:key]] =
conf[__item_configinfo_struct(tagid(tagOrId))[:key]][1..-1]
if ( ! __item_configinfo_struct(tagid(tagOrId))[:alias] \
|| conf.size > __item_configinfo_struct(tagid(tagOrId))[:alias] + 1 )
@@ -421,7 +414,7 @@ module TkItemConfigMethod
elsif ( __item_configinfo_struct(tagid(tagOrId))[:alias] \
&& conf.size == __item_configinfo_struct(tagid(tagOrId))[:alias] + 1 \
&& conf[__item_configinfo_struct(tagid(tagOrId))[:alias]][0] == ?- )
- conf[__item_configinfo_struct(tagid(tagOrId))[:alias]] =
+ conf[__item_configinfo_struct(tagid(tagOrId))[:alias]] =
conf[__item_configinfo_struct(tagid(tagOrId))[:alias]][1..-1]
end
conf
@@ -471,7 +464,7 @@ module TkItemConfigMethod
if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
&& conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
begin
- conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
+ conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
number(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
rescue
conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
@@ -479,7 +472,7 @@ module TkItemConfigMethod
end
if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
begin
- conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
+ conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
number(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
rescue
conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = nil
@@ -492,11 +485,11 @@ module TkItemConfigMethod
if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
&& conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
- conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
+ conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
num_or_str(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
end
if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
- conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
+ conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
num_or_str(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
end
@@ -507,7 +500,7 @@ module TkItemConfigMethod
if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
&& conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
begin
- conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
+ conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
bool(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
rescue
conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
@@ -515,7 +508,7 @@ module TkItemConfigMethod
end
if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
begin
- conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
+ conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
bool(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
rescue
conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = nil
@@ -528,11 +521,11 @@ module TkItemConfigMethod
if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
&& conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
- conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
+ conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
simplelist(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
end
if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
- conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
+ conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
simplelist(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
end
@@ -543,12 +536,12 @@ module TkItemConfigMethod
if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
&& conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] \
&& conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =~ /^[0-9]/ )
- conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
+ conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
list(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
end
if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] \
&& conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =~ /^[0-9]/ )
- conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
+ conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
list(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
end
@@ -581,13 +574,13 @@ module TkItemConfigMethod
# conf = tk_split_list(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))))
conf = tk_split_list(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), 0, false, true)
end
- conf[__item_configinfo_struct(tagid(tagOrId))[:key]] =
+ conf[__item_configinfo_struct(tagid(tagOrId))[:key]] =
conf[__item_configinfo_struct(tagid(tagOrId))[:key]][1..-1]
if ( __item_configinfo_struct(tagid(tagOrId))[:alias] \
&& conf.size == __item_configinfo_struct(tagid(tagOrId))[:alias] + 1 \
&& conf[__item_configinfo_struct(tagid(tagOrId))[:alias]][0] == ?- )
- conf[__item_configinfo_struct(tagid(tagOrId))[:alias]] =
+ conf[__item_configinfo_struct(tagid(tagOrId))[:alias]] =
conf[__item_configinfo_struct(tagid(tagOrId))[:alias]][1..-1]
end
@@ -598,7 +591,7 @@ module TkItemConfigMethod
# conf = tk_split_simplelist(conflist)
ret = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)))), false, false).collect{|conflist|
conf = tk_split_simplelist(conflist, false, true)
- conf[__item_configinfo_struct(tagid(tagOrId))[:key]] =
+ conf[__item_configinfo_struct(tagid(tagOrId))[:key]] =
conf[__item_configinfo_struct(tagid(tagOrId))[:key]][1..-1]
optkey = conf[__item_configinfo_struct(tagid(tagOrId))[:key]]
@@ -634,7 +627,7 @@ module TkItemConfigMethod
if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
&& conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
begin
- conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
+ conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
number(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
rescue
conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
@@ -642,7 +635,7 @@ module TkItemConfigMethod
end
if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
begin
- conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
+ conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
number(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
rescue
conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = nil
@@ -652,11 +645,11 @@ module TkItemConfigMethod
when /^(#{__item_numstrval_optkeys(tagid(tagOrId)).join('|')})$/
if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
&& conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
- conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
+ conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
num_or_str(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
end
if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
- conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
+ conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
num_or_str(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
end
@@ -664,7 +657,7 @@ module TkItemConfigMethod
if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
&& conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
begin
- conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
+ conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
bool(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
rescue
conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
@@ -672,7 +665,7 @@ module TkItemConfigMethod
end
if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
begin
- conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
+ conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
bool(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
rescue
conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = nil
@@ -682,11 +675,11 @@ module TkItemConfigMethod
when /^(#{__item_listval_optkeys(tagid(tagOrId)).join('|')})$/
if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
&& conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
- conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
+ conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
simplelist(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
end
if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
- conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
+ conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
simplelist(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
end
@@ -694,12 +687,12 @@ module TkItemConfigMethod
if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
&& conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] \
&& conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =~ /^[0-9]/ )
- conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
+ conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
list(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
end
if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] \
&& conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =~ /^[0-9]/ )
- conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
+ conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
list(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
end
@@ -726,20 +719,20 @@ module TkItemConfigMethod
if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
&& conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
if conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]].index('{')
- conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
- tk_split_list(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
+ conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
+ tk_split_list(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
else
- conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
- tk_tcl2ruby(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
+ conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
+ tk_tcl2ruby(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
end
end
if conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]]
if conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]].index('{')
- conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
- tk_split_list(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
+ conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
+ tk_split_list(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
else
- conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
- tk_tcl2ruby(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
+ conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
+ tk_tcl2ruby(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
end
end
end
@@ -747,7 +740,7 @@ module TkItemConfigMethod
if ( __item_configinfo_struct(tagid(tagOrId))[:alias] \
&& conf.size == __item_configinfo_struct(tagid(tagOrId))[:alias] + 1 \
&& conf[__item_configinfo_struct(tagid(tagOrId))[:alias]][0] == ?- )
- conf[__item_configinfo_struct(tagid(tagOrId))[:alias]] =
+ conf[__item_configinfo_struct(tagid(tagOrId))[:alias]] =
conf[__item_configinfo_struct(tagid(tagOrId))[:alias]][1..-1]
end
@@ -781,7 +774,7 @@ module TkItemConfigMethod
fontkey = $2
# conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{fontkey}"))))
conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{fontkey}")), false, true)
- conf[__item_configinfo_struct(tagid(tagOrId))[:key]] =
+ conf[__item_configinfo_struct(tagid(tagOrId))[:key]] =
conf[__item_configinfo_struct(tagid(tagOrId))[:key]][1..-1]
if ( ! __item_configinfo_struct(tagid(tagOrId))[:alias] \
@@ -795,7 +788,7 @@ module TkItemConfigMethod
elsif ( __item_configinfo_struct(tagid(tagOrId))[:alias] \
&& conf.size == __item_configinfo_struct(tagid(tagOrId))[:alias] + 1 )
if conf[__item_configinfo_struct(tagid(tagOrId))[:alias]][0] == ?-
- conf[__item_configinfo_struct(tagid(tagOrId))[:alias]] =
+ conf[__item_configinfo_struct(tagid(tagOrId))[:alias]] =
conf[__item_configinfo_struct(tagid(tagOrId))[:alias]][1..-1]
end
{ conf[0] => conf[1] }
@@ -848,7 +841,7 @@ module TkItemConfigMethod
if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
&& conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
begin
- conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
+ conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
number(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
rescue
conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
@@ -856,7 +849,7 @@ module TkItemConfigMethod
end
if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
begin
- conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
+ conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
number(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
rescue
conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = nil
@@ -869,11 +862,11 @@ module TkItemConfigMethod
if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
&& conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
- conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
+ conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
num_or_stre(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
end
if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
- conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
+ conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
num_or_str(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
end
@@ -884,7 +877,7 @@ module TkItemConfigMethod
if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
&& conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
begin
- conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
+ conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
bool(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
rescue
conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
@@ -892,7 +885,7 @@ module TkItemConfigMethod
end
if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
begin
- conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
+ conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
bool(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
rescue
conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = nil
@@ -905,11 +898,11 @@ module TkItemConfigMethod
if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
&& conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
- conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
+ conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
simplelist(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
end
if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
- conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
+ conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
simplelist(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
end
@@ -920,12 +913,12 @@ module TkItemConfigMethod
if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
&& conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] \
&& conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =~ /^[0-9]/ )
- conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
+ conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
list(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
end
if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] \
&& conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =~ /^[0-9]/ )
- conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
+ conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
list(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
end
@@ -958,13 +951,13 @@ module TkItemConfigMethod
# conf = tk_split_list(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))))
conf = tk_split_list(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), 0, false, true)
end
- conf[__item_configinfo_struct(tagid(tagOrId))[:key]] =
+ conf[__item_configinfo_struct(tagid(tagOrId))[:key]] =
conf[__item_configinfo_struct(tagid(tagOrId))[:key]][1..-1]
if ( __item_configinfo_struct(tagid(tagOrId))[:alias] \
&& conf.size == __item_configinfo_struct(tagid(tagOrId))[:alias] + 1 )
if conf[__item_configinfo_struct(tagid(tagOrId))[:alias]][0] == ?-
- conf[__item_configinfo_struct(tagid(tagOrId))[:alias]] =
+ conf[__item_configinfo_struct(tagid(tagOrId))[:alias]] =
conf[__item_configinfo_struct(tagid(tagOrId))[:alias]][1..-1]
end
{ conf[0] => conf[1] }
@@ -978,7 +971,7 @@ module TkItemConfigMethod
# conf = tk_split_simplelist(conflist)
tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)))), false, false).each{|conflist|
conf = tk_split_simplelist(conflist, false, true)
- conf[__item_configinfo_struct(tagid(tagOrId))[:key]] =
+ conf[__item_configinfo_struct(tagid(tagOrId))[:key]] =
conf[__item_configinfo_struct(tagid(tagOrId))[:key]][1..-1]
optkey = conf[__item_configinfo_struct(tagid(tagOrId))[:key]]
@@ -1014,7 +1007,7 @@ module TkItemConfigMethod
if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
&& conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
begin
- conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
+ conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
number(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
rescue
conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
@@ -1022,7 +1015,7 @@ module TkItemConfigMethod
end
if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
begin
- conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
+ conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
number(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
rescue
conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = nil
@@ -1032,11 +1025,11 @@ module TkItemConfigMethod
when /^(#{__item_numstrval_optkeys(tagid(tagOrId)).join('|')})$/
if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
&& conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
- conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
+ conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
num_or_str(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
end
if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
- conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
+ conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
num_or_str(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
end
@@ -1044,7 +1037,7 @@ module TkItemConfigMethod
if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
&& conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
begin
- conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
+ conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
bool(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
rescue
conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
@@ -1052,7 +1045,7 @@ module TkItemConfigMethod
end
if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
begin
- conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
+ conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
bool(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
rescue
conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = nil
@@ -1062,11 +1055,11 @@ module TkItemConfigMethod
when /^(#{__item_listval_optkeys(tagid(tagOrId)).join('|')})$/
if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
&& conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
- conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
+ conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
simplelist(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
end
if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
- conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
+ conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
simplelist(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
end
@@ -1074,12 +1067,12 @@ module TkItemConfigMethod
if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
&& conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] \
&& conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =~ /^[0-9]/ )
- conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
+ conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
list(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
end
if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] \
&& conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =~ /^[0-9]/ )
- conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
+ conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
list(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
end
@@ -1106,19 +1099,19 @@ module TkItemConfigMethod
if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
&& conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
if conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]].index('{')
- conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
- tk_split_list(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
+ conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
+ tk_split_list(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
else
- conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
+ conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
tk_tcl2ruby(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
end
end
if conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]]
if conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]].index('{')
- conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
- tk_split_list(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
+ conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
+ tk_split_list(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
else
- conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
+ conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
tk_tcl2ruby(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
end
end
@@ -1127,7 +1120,7 @@ module TkItemConfigMethod
if ( __item_configinfo_struct(tagid(tagOrId))[:alias] \
&& conf.size == __item_configinfo_struct(tagid(tagOrId))[:alias] + 1 )
if conf[__item_configinfo_struct(tagid(tagOrId))[:alias]][0] == ?-
- conf[__item_configinfo_struct(tagid(tagOrId))[:alias]] =
+ conf[__item_configinfo_struct(tagid(tagOrId))[:alias]] =
conf[__item_configinfo_struct(tagid(tagOrId))[:alias]][1..-1]
end
ret[conf[0]] = conf[1]
@@ -1194,7 +1187,7 @@ module TkItemConfigMethod
end
slot = conf[__item_configinfo_struct(tagid(tagOrId))[:alias]]
end while(org_slot != slot)
- fail RuntimeError,
+ fail RuntimeError,
"there is a configure alias loop about '#{org_slot}'"
else
ret = {}
diff --git a/ext/tk/lib/tk/itemfont.rb b/ext/tk/lib/tk/itemfont.rb
index b5da4fa1ef..4c5c917c57 100644
--- a/ext/tk/lib/tk/itemfont.rb
+++ b/ext/tk/lib/tk/itemfont.rb
@@ -32,22 +32,22 @@ module TkTreatItemFont
if key
pathname = [win, tag, key].join(';')
- TkFont.used_on(pathname) ||
- TkFont.init_widget_font(pathname,
+ TkFont.used_on(pathname) ||
+ TkFont.init_widget_font(pathname,
*(__item_confinfo_cmd(tagid(tagOrId))))
elsif optkeys.size == 1
pathname = [win, tag, optkeys[0]].join(';')
- TkFont.used_on(pathname) ||
- TkFont.init_widget_font(pathname,
+ TkFont.used_on(pathname) ||
+ TkFont.init_widget_font(pathname,
*(__item_confinfo_cmd(tagid(tagOrId))))
else
fonts = {}
optkeys.each{|key|
key = key.to_s
pathname = [win, tag, key].join(';')
- fonts[key] =
- TkFont.used_on(pathname) ||
- TkFont.init_widget_font(pathname,
+ fonts[key] =
+ TkFont.used_on(pathname) ||
+ TkFont.init_widget_font(pathname,
*(__item_confinfo_cmd(tagid(tagOrId))))
}
fonts
@@ -73,13 +73,13 @@ module TkTreatItemFont
slot.delete(a_optkey)
slot.delete(k_optkey)
- fnt.call_font_configure([pathname, optkey],
+ fnt.call_font_configure([pathname, optkey],
*(__item_config_cmd(tagid(tagOrId)) << {}))
next
else
if fnt
- if (slot.key?(l_optkey) ||
- slot.key?(a_optkey) ||
+ if (slot.key?(l_optkey) ||
+ slot.key?(a_optkey) ||
slot.key?(k_optkey))
fnt = TkFont.new(fnt)
@@ -90,7 +90,7 @@ module TkTreatItemFont
fnt.latin_replace(lfnt) if lfnt
fnt.kanji_replace(kfnt) if kfnt
- fnt.call_font_configure([pathname, optkey],
+ fnt.call_font_configure([pathname, optkey],
*(__item_config_cmd(tagid(tagOrId)) << {}))
next
else
@@ -115,7 +115,7 @@ module TkTreatItemFont
kfnt = slot.delete(k_optkey)
if lfnt && kfnt
- TkFont.new(lfnt, kfnt).call_font_configure([pathname, optkey],
+ TkFont.new(lfnt, kfnt).call_font_configure([pathname, optkey],
*(__item_config_cmd(tagid(tagOrId)) << {}))
elsif lfnt
latintagfont_configure([lfnt, optkey])
@@ -264,10 +264,10 @@ module TkTreatItemFont
end
if targetkey
- fnt.call_font_configure([__item_pathname(tagid(tagOrId)), targetkey],
+ fnt.call_font_configure([__item_pathname(tagid(tagOrId)), targetkey],
*(__item_config_cmd(tagid(tagOrId)) << {}))
else
- fnt.call_font_configure(__item_pathname(tagid(tagOrId)),
+ fnt.call_font_configure(__item_pathname(tagid(tagOrId)),
*(__item_config_cmd(tagid(tagOrId)) << {}))
end
self
@@ -276,10 +276,10 @@ module TkTreatItemFont
def latintagfont_copy(tagOrId, win, wintag=nil, winkey=nil, targetkey=nil)
if targetkey
- fontobj(targetkey).dup.call_font_configure([__item_pathname(tagid(tagOrId)), targetkey],
+ fontobj(targetkey).dup.call_font_configure([__item_pathname(tagid(tagOrId)), targetkey],
*(__item_config_cmd(tagid(tagOrId)) << {}))
else
- fontobj.dup.call_font_configure(__item_pathname(tagid(tagOrId)),
+ fontobj.dup.call_font_configure(__item_pathname(tagid(tagOrId)),
*(__item_config_cmd(tagid(tagOrId)) << {}))
end
@@ -302,10 +302,10 @@ module TkTreatItemFont
def kanjifont_copy(tagOrId, win, wintag=nil, winkey=nil, targetkey=nil)
if targetkey
- fontobj(targetkey).dup.call_font_configure([__item_pathname(tagid(tagOrId)), targetkey],
+ fontobj(targetkey).dup.call_font_configure([__item_pathname(tagid(tagOrId)), targetkey],
*(__item_config_cmd(tagid(tagOrId)) << {}))
else
- fontobj.dup.call_font_configure(__item_pathname(tagid(tagOrId)),
+ fontobj.dup.call_font_configure(__item_pathname(tagid(tagOrId)),
*(__item_config_cmd(tagid(tagOrId)) << {}))
end
diff --git a/ext/tk/lib/tk/kinput.rb b/ext/tk/lib/tk/kinput.rb
index b63f756def..a29dbcdb72 100644
--- a/ext/tk/lib/tk/kinput.rb
+++ b/ext/tk/lib/tk/kinput.rb
@@ -8,8 +8,8 @@ module TkKinput
extend Tk
TkCommandNames = [
- 'kinput_start'.freeze,
- 'kinput_send_spot'.freeze,
+ 'kinput_start'.freeze,
+ 'kinput_send_spot'.freeze,
'kanjiInput'.freeze
].freeze
@@ -47,7 +47,7 @@ module TkKinput
def TkKinput.attribute_info(win, slot=nil)
if slot
- conf = tk_split_list(tk_call('kanjiInput', 'attribute',
+ conf = tk_split_list(tk_call('kanjiInput', 'attribute',
win, "-#{slot}"))
conf[0] = conf[0][1..-1]
conf
diff --git a/ext/tk/lib/tk/label.rb b/ext/tk/lib/tk/label.rb
index 05e430e49b..80b3d778f1 100644
--- a/ext/tk/lib/tk/label.rb
+++ b/ext/tk/lib/tk/label.rb
@@ -6,7 +6,7 @@ require 'tk'
class Tk::Label<TkWindow
TkCommandNames = ['label'.freeze].freeze
WidgetClassName = 'Label'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
#def create_self(keys)
# if keys and keys != None
# tk_call_without_enc('label', @path, *hash_kv(keys, true))
@@ -18,5 +18,4 @@ class Tk::Label<TkWindow
end
#TkLabel = Tk::Label unless Object.const_defined? :TkLabel
-#Tk.__set_toplevel_aliases__(:Tk, Tk::Label, :TkLabel)
-Tk.__set_loaded_toplevel_aliases__('tk/label.rb', :Tk, Tk::Label, :TkLabel)
+Tk.__set_toplevel_aliases__(:Tk, Tk::Label, :TkLabel)
diff --git a/ext/tk/lib/tk/labelframe.rb b/ext/tk/lib/tk/labelframe.rb
index 6f679e55b5..995b5b7e72 100644
--- a/ext/tk/lib/tk/labelframe.rb
+++ b/ext/tk/lib/tk/labelframe.rb
@@ -7,7 +7,7 @@ require 'tk/frame'
class Tk::LabelFrame<Tk::Frame
TkCommandNames = ['labelframe'.freeze].freeze
WidgetClassName = 'Labelframe'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
#def create_self(keys)
# if keys and keys != None
# tk_call_without_enc('labelframe', @path, *hash_kv(keys, true))
@@ -26,6 +26,4 @@ end
Tk::Labelframe = Tk::LabelFrame
#TkLabelFrame = Tk::LabelFrame unless Object.const_defined? :TkLabelFrame
#TkLabelframe = Tk::Labelframe unless Object.const_defined? :TkLabelframe
-#Tk.__set_toplevel_aliases__(:Tk, Tk::LabelFrame, :TkLabelFrame, :TkLabelframe)
-Tk.__set_loaded_toplevel_aliases__('tk/labelframe.rb', :Tk, Tk::LabelFrame,
- :TkLabelFrame, :TkLabelframe)
+Tk.__set_toplevel_aliases__(:Tk, Tk::LabelFrame, :TkLabelFrame, :TkLabelframe)
diff --git a/ext/tk/lib/tk/listbox.rb b/ext/tk/lib/tk/listbox.rb
index 6742b2132c..bb039ffb0e 100644
--- a/ext/tk/lib/tk/listbox.rb
+++ b/ext/tk/lib/tk/listbox.rb
@@ -21,7 +21,7 @@ class Tk::Listbox<TkTextWin
TkCommandNames = ['listbox'.freeze].freeze
WidgetClassName = 'Listbox'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
#def create_self(keys)
# if keys and keys != None
@@ -92,7 +92,7 @@ class Tk::Listbox<TkTextWin
fail ArgumentError, 'an Array is expected'
end
tk_send_without_enc('delete', '0', 'end')
- tk_send_without_enc('insert', '0',
+ tk_send_without_enc('insert', '0',
*(vals.collect{|v| _get_eval_enc_str(v)}))
vals
end
@@ -110,7 +110,7 @@ class Tk::Listbox<TkTextWin
_fromUTF8(tk_send_without_enc('itemcget', index, "-#{key}"))
when 'font', 'kanjifont'
#fnt = tk_tcl2ruby(tk_send('itemcget', index, "-#{key}"))
- fnt = tk_tcl2ruby(_fromUTF8(tk_send_without_enc('itemcget', index,
+ fnt = tk_tcl2ruby(_fromUTF8(tk_send_without_enc('itemcget', index,
'-font')))
unless fnt.kind_of?(TkFont)
fnt = tagfontobj(index, fnt)
@@ -127,9 +127,9 @@ class Tk::Listbox<TkTextWin
end
def itemconfigure(index, key, val=None)
if key.kind_of? Hash
- if (key['font'] || key[:font] ||
- key['kanjifont'] || key[:kanjifont] ||
- key['latinfont'] || key[:latinfont] ||
+ if (key['font'] || key[:font] ||
+ key['kanjifont'] || key[:kanjifont] ||
+ key['latinfont'] || key[:latinfont] ||
key['asciifont'] || key[:asciifont] )
tagfont_configure(index, _symbolkey2str(key))
else
@@ -137,9 +137,9 @@ class Tk::Listbox<TkTextWin
end
else
- if (key == 'font' || key == :font ||
- key == 'kanjifont' || key == :kanjifont ||
- key == 'latinfont' || key == :latinfont ||
+ if (key == 'font' || key == :font ||
+ key == 'kanjifont' || key == :kanjifont ||
+ key == 'latinfont' || key == :latinfont ||
key == 'asciifont' || key == :asciifont )
if val == None
tagfontobj(index)
@@ -176,16 +176,16 @@ class Tk::Listbox<TkTextWin
else
if conf[3]
if conf[3].index('{')
- conf[3] = tk_split_list(conf[3])
+ conf[3] = tk_split_list(conf[3])
else
- conf[3] = tk_tcl2ruby(conf[3])
+ conf[3] = tk_tcl2ruby(conf[3])
end
end
if conf[4]
if conf[4].index('{')
- conf[4] = tk_split_list(conf[4])
+ conf[4] = tk_split_list(conf[4])
else
- conf[4] = tk_tcl2ruby(conf[4])
+ conf[4] = tk_tcl2ruby(conf[4])
end
end
end
@@ -224,16 +224,16 @@ class Tk::Listbox<TkTextWin
else
if conf[2]
if conf[2].index('{')
- conf[2] = tk_split_list(conf[2])
+ conf[2] = tk_split_list(conf[2])
else
- conf[2] = tk_tcl2ruby(conf[2])
+ conf[2] = tk_tcl2ruby(conf[2])
end
end
if conf[3]
if conf[3].index('{')
- conf[3] = tk_split_list(conf[3])
+ conf[3] = tk_split_list(conf[3])
else
- conf[3] = tk_tcl2ruby(conf[3])
+ conf[3] = tk_tcl2ruby(conf[3])
end
end
end
@@ -279,6 +279,4 @@ class Tk::Listbox<TkTextWin
end
#TkListbox = Tk::Listbox unless Object.const_defined? :TkListbox
-#Tk.__set_toplevel_aliases__(:Tk, Tk::Listbox, :TkListbox)
-Tk.__set_loaded_toplevel_aliases__('tk/listbox.rb', :Tk, Tk::Listbox,
- :TkListbox)
+Tk.__set_toplevel_aliases__(:Tk, Tk::Listbox, :TkListbox)
diff --git a/ext/tk/lib/tk/macpkg.rb b/ext/tk/lib/tk/macpkg.rb
index 3ca7953c13..67b0a4bb60 100644
--- a/ext/tk/lib/tk/macpkg.rb
+++ b/ext/tk/lib/tk/macpkg.rb
@@ -23,9 +23,7 @@ end
module Tk::MacResource
end
#TkMacResource = Tk::MacResource
-#Tk.__set_toplevel_aliases__(:Tk, Tk::MacResource, :TkMacResource)
-Tk.__set_loaded_toplevel_aliases__('tk/macpkg.rb', :Tk, Tk::MacResource,
- :TkMacResource)
+Tk.__set_toplevel_aliases__(:Tk, Tk::MacResource, :TkMacResource)
module Tk::MacResource
extend Tk
diff --git a/ext/tk/lib/tk/menu.rb b/ext/tk/lib/tk/menu.rb
index bcd250026d..3ae0548dd1 100644
--- a/ext/tk/lib/tk/menu.rb
+++ b/ext/tk/lib/tk/menu.rb
@@ -33,14 +33,13 @@ module TkMenuEntryConfig
end
private :__item_val2ruby_optkeys
- alias entrycget_tkstring itemcget_tkstring
alias entrycget itemcget
alias entrycget_strict itemcget_strict
alias entryconfigure itemconfigure
alias entryconfiginfo itemconfiginfo
alias current_entryconfiginfo current_itemconfiginfo
- private :itemcget_tkstring, :itemcget, :itemcget_strict
+ private :itemcget, :itemcget_strict
private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
end
@@ -51,7 +50,7 @@ class Tk::Menu<TkWindow
TkCommandNames = ['menu'.freeze].freeze
WidgetClassName = 'Menu'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
#def create_self(keys)
# if keys and keys != None
@@ -156,13 +155,13 @@ class Tk::Menu<TkWindow
_fromUTF8(tk_send_without_enc('invoke', _get_eval_enc_str(index)))
end
def insert(index, type, keys=nil)
- tk_send_without_enc('insert', _get_eval_enc_str(index),
+ tk_send_without_enc('insert', _get_eval_enc_str(index),
type, *hash_kv(keys, true))
self
end
def delete(first, last=nil)
if last
- tk_send_without_enc('delete', _get_eval_enc_str(first),
+ tk_send_without_enc('delete', _get_eval_enc_str(first),
_get_eval_enc_str(last))
else
tk_send_without_enc('delete', _get_eval_enc_str(first))
@@ -171,7 +170,7 @@ class Tk::Menu<TkWindow
end
def popup(x, y, index=nil)
if index
- tk_call_without_enc('tk_popup', path, x, y,
+ tk_call_without_enc('tk_popup', path, x, y,
_get_eval_enc_str(index))
else
tk_call_without_enc('tk_popup', path, x, y)
@@ -215,7 +214,7 @@ class Tk::Menu<TkWindow
def entrycget(index, key)
case key.to_s
when 'text', 'label', 'show'
- _fromUTF8(tk_send_without_enc('entrycget',
+ _fromUTF8(tk_send_without_enc('entrycget',
_get_eval_enc_str(index), "-#{key}"))
when 'font', 'kanjifont'
#fnt = tk_tcl2ruby(tk_send('entrycget', index, "-#{key}"))
@@ -235,20 +234,20 @@ class Tk::Menu<TkWindow
end
def entryconfigure(index, key, val=None)
if key.kind_of? Hash
- if (key['font'] || key[:font] ||
- key['kanjifont'] || key[:kanjifont] ||
- key['latinfont'] || key[:latinfont] ||
+ if (key['font'] || key[:font] ||
+ key['kanjifont'] || key[:kanjifont] ||
+ key['latinfont'] || key[:latinfont] ||
key['asciifont'] || key[:asciifont])
tagfont_configure(index, _symbolkey2str(key))
else
- tk_send_without_enc('entryconfigure', _get_eval_enc_str(index),
+ tk_send_without_enc('entryconfigure', _get_eval_enc_str(index),
*hash_kv(key, true))
end
else
- if (key == 'font' || key == :font ||
- key == 'kanjifont' || key == :kanjifont ||
- key == 'latinfont' || key == :latinfont ||
+ if (key == 'font' || key == :font ||
+ key == 'kanjifont' || key == :kanjifont ||
+ key == 'latinfont' || key == :latinfont ||
key == 'asciifont' || key == :asciifont )
if val == None
tagfontobj(index)
@@ -285,16 +284,16 @@ class Tk::Menu<TkWindow
else
if conf[3]
if conf[3].index('{')
- conf[3] = tk_split_list(conf[3])
+ conf[3] = tk_split_list(conf[3])
else
- conf[3] = tk_tcl2ruby(conf[3])
+ conf[3] = tk_tcl2ruby(conf[3])
end
end
if conf[4]
if conf[4].index('{')
- conf[4] = tk_split_list(conf[4])
+ conf[4] = tk_split_list(conf[4])
else
- conf[4] = tk_tcl2ruby(conf[4])
+ conf[4] = tk_tcl2ruby(conf[4])
end
end
end
@@ -332,16 +331,16 @@ class Tk::Menu<TkWindow
else
if conf[2]
if conf[2].index('{')
- conf[2] = tk_split_list(conf[2])
+ conf[2] = tk_split_list(conf[2])
else
- conf[2] = tk_tcl2ruby(conf[2])
+ conf[2] = tk_tcl2ruby(conf[2])
end
end
if conf[3]
if conf[3].index('{')
- conf[3] = tk_split_list(conf[3])
+ conf[3] = tk_split_list(conf[3])
else
- conf[3] = tk_tcl2ruby(conf[3])
+ conf[3] = tk_tcl2ruby(conf[3])
end
end
end
@@ -387,32 +386,8 @@ class Tk::Menu<TkWindow
end
#TkMenu = Tk::Menu unless Object.const_defined? :TkMenu
-#Tk.__set_toplevel_aliases__(:Tk, Tk::Menu, :TkMenu)
-Tk.__set_loaded_toplevel_aliases__('tk/menu.rb', :Tk, Tk::Menu, :TkMenu)
-
-
-module Tk::Menu::TkInternalFunction; end
-class << Tk::Menu::TkInternalFunction
- # These methods calls internal functions of Tcl/Tk.
- # So, They may not work on your Tcl/Tk.
- def next_menu(menu, dir='next')
- dir = dir.to_s
- case dir
- when 'next', 'forward', 'down'
- dir = 'right'
- when 'previous', 'backward', 'up'
- dir = 'left'
- end
-
- Tk.tk_call('::tk::MenuNextMenu', menu, dir)
- end
+Tk.__set_toplevel_aliases__(:Tk, Tk::Menu, :TkMenu)
- def next_entry(menu, delta)
- # delta is increment value of entry index.
- # For example, +1 denotes 'next entry' and -1 denotes 'previous entry'.
- Tk.tk_call('::tk::MenuNextEntry', menu, delta)
- end
-end
class Tk::MenuClone<Tk::Menu
=begin
@@ -471,9 +446,7 @@ end
Tk::CloneMenu = Tk::MenuClone
#TkMenuClone = Tk::MenuClone unless Object.const_defined? :TkMenuClone
#TkCloneMenu = Tk::CloneMenu unless Object.const_defined? :TkCloneMenu
-#Tk.__set_toplevel_aliases__(:Tk, Tk::MenuClone, :TkMenuClone, :TkCloneMenu)
-Tk.__set_loaded_toplevel_aliases__('tk/menu.rb', :Tk, Tk::MenuClone,
- :TkMenuClone, :TkCloneMenu)
+Tk.__set_toplevel_aliases__(:Tk, Tk::MenuClone, :TkMenuClone, :TkCloneMenu)
module Tk::SystemMenu
def initialize(parent, keys=nil)
@@ -507,9 +480,7 @@ class Tk::SysMenu_Help<Tk::Menu
SYSMENU_NAME = 'help'
end
#TkSysMenu_Help = Tk::SysMenu_Help unless Object.const_defined? :TkSysMenu_Help
-#Tk.__set_toplevel_aliases__(:Tk, Tk::SysMenu_Help, :TkSysMenu_Help)
-Tk.__set_loaded_toplevel_aliases__('tk/menu.rb', :Tk, Tk::SysMenu_Help,
- :TkSysMenu_Help)
+Tk.__set_toplevel_aliases__(:Tk, Tk::SysMenu_Help, :TkSysMenu_Help)
class Tk::SysMenu_System<Tk::Menu
@@ -518,9 +489,7 @@ class Tk::SysMenu_System<Tk::Menu
SYSMENU_NAME = 'system'
end
#TkSysMenu_System = Tk::SysMenu_System unless Object.const_defined? :TkSysMenu_System
-#Tk.__set_toplevel_aliases__(:Tk, Tk::SysMenu_System, :TkSysMenu_System)
-Tk.__set_loaded_toplevel_aliases__('tk/menu.rb', :Tk, Tk::SysMenu_System,
- :TkSysMenu_System)
+Tk.__set_toplevel_aliases__(:Tk, Tk::SysMenu_System, :TkSysMenu_System)
class Tk::SysMenu_Apple<Tk::Menu
@@ -529,31 +498,29 @@ class Tk::SysMenu_Apple<Tk::Menu
SYSMENU_NAME = 'apple'
end
#TkSysMenu_Apple = Tk::SysMenu_Apple unless Object.const_defined? :TkSysMenu_Apple
-#Tk.__set_toplevel_aliases__(:Tk, Tk::SysMenu_Apple, :TkSysMenu_Apple)
-Tk.__set_loaded_toplevel_aliases__('tk/menu.rb', :Tk, Tk::SysMenu_Apple,
- :TkSysMenu_Apple)
+Tk.__set_toplevel_aliases__(:Tk, Tk::SysMenu_Apple, :TkSysMenu_Apple)
class Tk::Menubutton<Tk::Label
TkCommandNames = ['menubutton'.freeze].freeze
WidgetClassName = 'Menubutton'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def create_self(keys)
if keys and keys != None
unless TkConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
# tk_call_without_enc('menubutton', @path, *hash_kv(keys, true))
- tk_call_without_enc(self.class::TkCommandNames[0], @path,
+ tk_call_without_enc(self.class::TkCommandNames[0], @path,
*hash_kv(keys, true))
else
begin
- tk_call_without_enc(self.class::TkCommandNames[0], @path,
+ tk_call_without_enc(self.class::TkCommandNames[0], @path,
*hash_kv(keys, true))
rescue
tk_call_without_enc(self.class::TkCommandNames[0], @path)
keys = __check_available_configure_options(keys)
unless keys.empty?
tk_call_without_enc('destroy', @path) rescue nil
- tk_call_without_enc(self.class::TkCommandNames[0], @path,
+ tk_call_without_enc(self.class::TkCommandNames[0], @path,
*hash_kv(keys, true))
end
end
@@ -574,9 +541,7 @@ end
Tk::MenuButton = Tk::Menubutton
#TkMenubutton = Tk::Menubutton unless Object.const_defined? :TkMenubutton
#TkMenuButton = Tk::MenuButton unless Object.const_defined? :TkMenuButton
-#Tk.__set_toplevel_aliases__(:Tk, Tk::Menubutton, :TkMenubutton, :TkMenuButton)
-Tk.__set_loaded_toplevel_aliases__('tk/menu.rb', :Tk, Tk::Menubutton,
- :TkMenubutton, :TkMenuButton)
+Tk.__set_toplevel_aliases__(:Tk, Tk::Menubutton, :TkMenubutton, :TkMenuButton)
class Tk::OptionMenubutton<Tk::Menubutton
@@ -604,17 +569,17 @@ class Tk::OptionMenubutton<Tk::Menubutton
keys = _symbolkey2str(keys)
parent = nil
- if !args.empty? && (args[0].kind_of?(TkWindow) || args[0] == nil)
+ if args[0].kind_of?(TkWindow) || args[0] == nil
keys.delete('parent') # ignore
- parent = args.shift
+ parent = args.shift
else
parent = keys.delete('parent')
end
@variable = nil
- if !args.empty? && (args[0].kind_of?(TkVariable) || args[0] == nil)
+ if args[0].kind_of?(TkVariable) || args[0] == nil
keys.delete('variable') # ignore
- @variable = args.shift
+ @variable = args.shift
else
@variable = keys.delete('variable')
end
@@ -628,7 +593,7 @@ class Tk::OptionMenubutton<Tk::Menubutton
end
install_win(if parent then parent.path end)
- @menu = OptionMenu.new(tk_call('tk_optionMenu',
+ @menu = OptionMenu.new(tk_call('tk_optionMenu',
@path, @variable.id, *args))
configure(keys) if keys
@@ -647,7 +612,7 @@ class Tk::OptionMenubutton<Tk::Menubutton
self
end
def add(value)
- @menu.add('radiobutton', 'variable'=>@variable,
+ @menu.add('radiobutton', 'variable'=>@variable,
'label'=>value, 'value'=>value)
self
end
@@ -658,7 +623,7 @@ class Tk::OptionMenubutton<Tk::Menubutton
@menu.invoke(index)
end
def insert(index, value)
- @menu.insert(index, 'radiobutton', 'variable'=>@variable,
+ @menu.insert(index, 'radiobutton', 'variable'=>@variable,
'label'=>value, 'value'=>value)
self
end
@@ -712,7 +677,5 @@ end
Tk::OptionMenuButton = Tk::OptionMenubutton
#TkOptionMenubutton = Tk::OptionMenubutton unless Object.const_defined? :TkOptionMenubutton
#TkOptionMenuButton = Tk::OptionMenuButton unless Object.const_defined? :TkOptionMenuButton
-#Tk.__set_toplevel_aliases__(:Tk, Tk::OptionMenubutton,
-# :TkOptionMenubutton, :TkOptionMenuButton)
-Tk.__set_loaded_toplevel_aliases__('tk/menu.rb', :Tk, Tk::OptionMenubutton,
- :TkOptionMenubutton, :TkOptionMenuButton)
+Tk.__set_toplevel_aliases__(:Tk, Tk::OptionMenubutton,
+ :TkOptionMenubutton, :TkOptionMenuButton)
diff --git a/ext/tk/lib/tk/menubar.rb b/ext/tk/lib/tk/menubar.rb
index 9d5571c470..ef9da809b9 100644
--- a/ext/tk/lib/tk/menubar.rb
+++ b/ext/tk/lib/tk/menubar.rb
@@ -2,7 +2,7 @@
# tk/menubar.rb
#
# Original version:
-# Copyright (C) 1998 maeda shugo. All rights reserved.
+# Copyright (C) 1998 maeda shugo. All rights reserved.
# This file can be distributed under the terms of the Ruby.
# Usage:
@@ -52,18 +52,18 @@
# {:label=>'Open', :command=>proc{puts('Open clicked')}, :underline=>0},
# '---',
# ['Check_A', TkVariable.new(true), 6],
-# {:type=>'checkbutton', :label=>'Check_B',
+# {:type=>'checkbutton', :label=>'Check_B',
# :variable=>TkVariable.new, :underline=>6},
# '---',
# ['Radio_X', [radio_var, 'x'], 6],
# ['Radio_Y', [radio_var, 'y'], 6],
# ['Radio_Z', [radio_var, 'z'], 6],
# '---',
-# ['cascade', [
-# ['sss', proc{p 'sss'}, 0],
-# ['ttt', proc{p 'ttt'}, 0],
-# ['uuu', proc{p 'uuu'}, 0],
-# ['vvv', proc{p 'vvv'}, 0],
+# ['cascade', [
+# ['sss', proc{p 'sss'}, 0],
+# ['ttt', proc{p 'ttt'}, 0],
+# ['uuu', proc{p 'uuu'}, 0],
+# ['vvv', proc{p 'vvv'}, 0],
# ], 0],
# '---',
# ['Quit', proc{exit}, 0]],
@@ -92,31 +92,25 @@ require 'tk/menuspec'
class TkMenubar<Tk::Frame
include TkComposite
include TkMenuSpec
-
- def initialize(parent = nil, spec = nil, options = {})
+
+ def initialize(parent = nil, spec = nil, options = nil)
if parent.kind_of? Hash
- options = parent
- parent = nil
- spec = (options.has_key?('spec'))? options.delete('spec'): nil
+ options = _symbolkey2str(parent)
+ spec = options.delete('spec')
+ super(options)
+ else
+ super(parent, options)
end
- _symbolkey2str(options)
- menuspec_opt = {}
- TkMenuSpec::MENUSPEC_OPTKEYS.each{|key|
- menuspec_opt[key] = options.delete(key) if options.has_key?(key)
- }
-
- super(parent, options)
-
@menus = []
-
- spec.each{|info| add_menu(info, menuspec_opt)} if spec
+
+ spec.each{|info| add_menu(info)} if spec
options.each{|key, value| configure(key, value)} if options
end
- def add_menu(menu_info, menuspec_opt={})
- mbtn, menu = _create_menubutton(@frame, menu_info, menuspec_opt)
+ def add_menu(menu_info)
+ mbtn, menu = _create_menubutton(@frame, menu_info)
submenus = _get_cascade_menus(menu).flatten
@@ -130,7 +124,7 @@ class TkMenubar<Tk::Frame
delegate('font', mbtn, menu, *submenus)
delegate('kanjifont', mbtn, menu, *submenus)
end
-
+
def [](index)
return @menus[index]
end
diff --git a/ext/tk/lib/tk/menuspec.rb b/ext/tk/lib/tk/menuspec.rb
index 9521a157d9..2a2eb9ba3c 100644
--- a/ext/tk/lib/tk/menuspec.rb
+++ b/ext/tk/lib/tk/menuspec.rb
@@ -3,50 +3,35 @@
# Hidethoshi NAGAI (nagai@ai.kyutech.ac.jp)
#
# based on tkmenubar.rb :
-# Copyright (C) 1998 maeda shugo. All rights reserved.
+# Copyright (C) 1998 maeda shugo. All rights reserved.
# This file can be distributed under the terms of the Ruby.
#
# The format of the menu_spec is:
-# [ menubutton_info, menubutton_info, ... ]
+# [ menu_info, menu_info, ... ]
#
-# The format of the menubutton_info is:
-# [ menubutton_info, entry_info, entry_info, ... ]
-#
-# And each format of *_info is:
+# And the format of the menu_info is:
# [
# [text, underline, configs], # menu button/entry (*1)
# [label, command, underline, accelerator, configs], # command entry
# [label, TkVar_obj, underline, accelerator, configs], # checkbutton entry
-# [label, [TkVar_obj, value],
+# [label, [TkVar_obj, value],
# underline, accelerator, configs], # radiobutton entry
-# [label, [[...menu_info...], [...menu_info...], ...],
+# [label, [[...menu_info...], [...menu_info...], ...],
# underline, accelerator, configs], # cascade entry (*2)
# '---', # separator
# ...
# ]
#
-# A menu_info is an array of menu entries:
-# [ entry_info, entry_info, ... ]
-#
-#
-# underline, accelerator, and configs are optional pearameters.
-# Hashes are OK instead of Arrays. Then the entry type ('command',
+# underline, accelerator, and configs are optional pearameters.
+# Hashes are OK instead of Arrays. Then the entry type ('command',
# 'checkbutton', 'radiobutton' or 'cascade') is given by 'type' key
# (e.g. :type=>'cascade'). When type is 'cascade', an array of menu_info
# is acceptable for 'menu' key (then, create sub-menu).
#
-# If the value of underline is true instead of an integer,
-# check whether the text/label string contains a '&' character.
-# When includes, the first '&' is removed and its following character is
-# converted the corresponding 'underline' option (first '&' is removed).
-# Else if the value of underline is a String or a Regexp,
-# use the result of label.index(underline) as the index of underline
-# (don't remove matched substring).
-#
# NOTE: (*1)
-# If you want to make special menus (*.help for UNIX, *.system for Win,
-# and *.apple for Mac), append 'menu_name'=>name (name is 'help' for UNIX,
-# 'system' for Win, and 'apple' for Mac) option to the configs hash of
+# If you want to make special menus (*.help for UNIX, *.system for Win,
+# and *.apple for Mac), append 'menu_name'=>name (name is 'help' for UNIX,
+# 'system' for Win, and 'apple' for Mac) option to the configs hash of
# menu button/entry information.
#
# NOTE: (*2)
@@ -54,11 +39,7 @@
# to the configs of the cascade entry.
module TkMenuSpec
- extend TkMenuSpec
-
- MENUSPEC_OPTKEYS = [ 'layout_proc' ]
-
- def _create_menu(parent, menu_info, menu_name = nil,
+ def _create_menu(parent, menu_info, menu_name = nil,
tearoff = false, default_opts = nil)
if tearoff.kind_of?(Hash)
default_opts = tearoff
@@ -78,7 +59,6 @@ module TkMenuSpec
end
tearoff = orig_opts.delete('tearoff') if orig_opts.key?('tearoff')
- tearoff = false unless tearoff # nil --> false
if menu_name
#menu = Tk::Menu.new(parent, :widgetname=>menu_name, :tearoff=>tearoff)
@@ -100,27 +80,10 @@ module TkMenuSpec
menu_opts.update(_symbolkey2str(options.delete('menu_config') || {}))
if item_type == 'cascade' && options['menu'].kind_of?(Array)
# create cascade menu
- submenu = _create_menu(menu, options['menu'], menu_name,
+ submenu = _create_menu(menu, options['menu'], menu_name,
tearoff, menu_opts)
options['menu'] = submenu
end
- case options['underline']
- when String, Regexp
- if options['label'] &&
- (idx = options['label'].index(options['underline']))
- options['underline'] = idx
- else
- options['underline'] = -1
- end
- when true
- if options['label'] && (idx = options['label'].index('&'))
- options['label'] = options['label'].dup
- options['label'][idx] = ''
- options['underline'] = idx
- else
- options['underline'] = -1
- end
- end
menu.add(item_type, options)
elsif item_info.kind_of?(Array)
@@ -154,7 +117,7 @@ module TkMenuSpec
menu_config = opts.delete('menu_config') || {}
menu_opts.update(_symbolkey2str(menu_config))
end
- submenu = _create_menu(menu, item_info[1], menu_name,
+ submenu = _create_menu(menu, item_info[1], menu_name,
tearoff, menu_opts)
options['menu'] = submenu
end
@@ -175,25 +138,6 @@ module TkMenuSpec
end
options.update(opts)
end
-
- case options['underline']
- when String, Regexp
- if options['label'] &&
- (idx = options['label'].index(options['underline']))
- options['underline'] = idx
- else
- options['underline'] = -1
- end
- when true
- if options['label'] && (idx = options['label'].index('&'))
- options['label'] = options['label'].dup
- options['label'][idx] = ''
- options['underline'] = idx
- else
- options['underline'] = -1
- end
- end
-
menu.add(item_type, options)
elsif /^-+$/ =~ item_info
@@ -211,7 +155,7 @@ module TkMenuSpec
def _use_menubar?(parent)
use_menubar = false
if parent.kind_of?(Tk::Root) || parent.kind_of?(Tk::Toplevel)
- true
+ true
elsif parent.current_configinfo.has_key?('menu')
true
else
@@ -233,7 +177,7 @@ module TkMenuSpec
end
private :_create_menu_for_menubar
- def _create_menubutton(parent, menu_info, tearoff=false, default_opts = {})
+ def _create_menubutton(parent, menu_info, tearoff=false, default_opts = nil)
btn_info = menu_info[0]
if tearoff.kind_of?(Hash)
@@ -242,49 +186,14 @@ module TkMenuSpec
end
if default_opts.kind_of?(Hash)
- default_opts = _symbolkey2str(default_opts)
-
- if default_opts.has_key?('layout_proc')
- layout_proc = default_opts.delete('layout_proc')
- end
-
- _vertical_mbar_bind_proc = proc{|m, dir|
- Tk::Menu::TkInternalFunction.next_menu(m, dir) rescue nil
- # ignore error when the internal function doesn't exist
- }
-
- case layout_proc
- when :vertical, 'vertical', :vertical_left, 'vertical_left'
- layout_proc = proc{|_parent, _mbtn|
- _mbtn.direction :right
- _mbtn.pack(:side=>:top, :fill=>:x)
-
- menu = _mbtn.menu
- menu.bind('Tab', _vertical_mbar_bind_proc, :widget, 'forward')
- menu.bind('Alt-Tab', _vertical_mbar_bind_proc, :widget, 'backward')
- }
- when :vertical_right, 'vertical_right'
- layout_proc = proc{|_parent, _mbtn|
- _mbtn.direction :left
- _mbtn.pack(:side=>:top, :fill=>:x)
-
- menu = _mbtn.menu
- menu.bind('Tab', _vertical_mbar_bind_proc, :widget, 'forward')
- menu.bind('Alt-Tab', _vertical_mbar_bind_proc, :widget, 'backward')
- }
- when :horizontal, 'horizontal'
- layout_proc = proc{|_parent, _mbtn| _mbtn.pack(:side=>:left)}
- else
- # do nothing
- end
+ keys = _symbolkey2str(default_opts)
+ else
+ keys = {}
end
- keys = (default_opts)? default_opts.dup: {}
-
tearoff = keys.delete('tearoff') if keys.key?('tearoff')
- tearoff = false unless tearoff # nil --> false
- if _use_menubar?(parent) && ! layout_proc
+ if _use_menubar?(parent)
# menubar by menu entries
mbar = _create_menu_for_menubar(parent)
@@ -293,57 +202,19 @@ module TkMenuSpec
if btn_info.kind_of?(Hash)
keys.update(_symbolkey2str(btn_info))
menu_name = keys.delete('menu_name')
- keys['label'] = keys.delete('text') || ''
-
- case keys['underline']
- when String, Regexp
- if idx = keys['label'].index(keys['underline'])
- keys['underline'] = idx
- else
- keys['underline'] = -1
- end
- when true
- if idx = keys['label'].index('&')
- keys['label'] = keys['label'].dup
- keys['label'][idx] = ''
- keys['underline'] = idx
- else
- keys['underline'] = -1
- end
- end
-
+ keys['label'] = keys.delete('text') if keys.key?('text')
elsif btn_info.kind_of?(Array)
keys['label'] = btn_info[0] if btn_info[0]
-
- case btn_info[1]
- when Integer
- keys['underline'] = btn_info[1]
- when String, Regexp
- if idx = keys['label'].index(btn_info[1])
- keys['underline'] = idx
- else
- keys['underline'] = -1
- end
- when true
- if idx = keys['label'].index('&')
- keys['label'] = keys['label'].dup
- keys['label'][idx] = ''
- keys['underline'] = idx
- else
- keys['underline'] = -1
- end
- end
-
+ keys['underline'] = btn_info[1] if btn_info[1]
if btn_info[2]&&btn_info[2].kind_of?(Hash)
keys.update(_symbolkey2str(btn_info[2]))
menu_name = keys.delete('menu_name')
end
-
else
keys = {:label=>btn_info}
end
- menu = _create_menu(mbar, menu_info[1..-1], menu_name,
+ menu = _create_menu(mbar, menu_info[1..-1], menu_name,
tearoff, default_opts)
menu.tearoff(tearoff)
@@ -363,42 +234,9 @@ module TkMenuSpec
if btn_info.kind_of?(Hash)
keys.update(_symbolkey2str(btn_info))
menu_name = keys.delete('menu_name')
- keys['text'] = keys.delete('label') || ''
- case keys['underline']
- when String, Regexp
- if idx = keys['text'].index(keys['underline'])
- keys['underline'] = idx
- else
- keys['underline'] = -1
- end
- when true
- if idx = keys['text'].index('&')
- keys['text'] = keys['text'].dup
- keys['text'][idx] = ''
- keys['underline'] = idx
- else
- keys['underline'] = -1
- end
- end
+ keys['text'] = keys.delete('label') if keys.key?('label')
mbtn.configure(keys)
-
elsif btn_info.kind_of?(Array)
- case btn_info[1]
- when String, Regexp
- if btn_info[0] && (idx = btn_info[0].index(btn_info[1]))
- btn_info[1] = idx
- else
- btn_info[1] = -1
- end
- when true
- if btn_info[0] && (idx = btn_info[0].index('&'))
- btn_info[0] = btn_info[0].dup
- btn_info[0][idx] = ''
- btn_info[1] = idx
- else
- btn_info[1] = -1
- end
- end
mbtn.configure('text', btn_info[0]) if btn_info[0]
mbtn.configure('underline', btn_info[1]) if btn_info[1]
# mbtn.configure('accelerator', btn_info[2]) if btn_info[2]
@@ -407,41 +245,22 @@ module TkMenuSpec
menu_name = keys.delete('menu_name')
mbtn.configure(keys)
end
-
else
mbtn.configure('text', btn_info)
end
- menu = _create_menu(mbtn, menu_info[1..-1], menu_name,
+ mbtn.pack('side' => 'left')
+
+ menu = _create_menu(mbtn, menu_info[1..-1], menu_name,
tearoff, default_opts)
+
mbtn.menu(menu)
- if layout_proc.kind_of?(Proc) || layout_proc.kind_of?(Method)
- # e.g. make a vertical menubar
- # :layout_proc => proc{|parent, btn| btn.pack(:side=>:top, :fill=>:x)}
- layout_proc.call(parent, mbtn)
- else
- mbtn.pack('side' => 'left')
- end
-
[mbtn, menu]
end
end
private :_create_menubutton
- def _create_menubar(parent, menu_spec, tearoff = false, opts = nil)
- if tearoff.kind_of?(Hash)
- opts = tearoff
- tearoff = false
- end
- tearoff = false unless tearoff # nil --> false
- menu_spec.each{|menu_info|
- _create_menubutton(parent, menu_info, tearoff, opts)
- }
- parent
- end
- private :_create_menubar
-
def _get_cascade_menus(menu)
menus = []
(0..(menu.index('last'))).each{|idx|
diff --git a/ext/tk/lib/tk/message.rb b/ext/tk/lib/tk/message.rb
index 5f73b3066f..946b68c704 100644
--- a/ext/tk/lib/tk/message.rb
+++ b/ext/tk/lib/tk/message.rb
@@ -7,7 +7,7 @@ require 'tk/label'
class Tk::Message<Tk::Label
TkCommandNames = ['message'.freeze].freeze
WidgetClassName = 'Message'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
#def create_self(keys)
# if keys and keys != None
# tk_call_without_enc('message', @path, *hash_kv(keys, true))
@@ -19,6 +19,4 @@ class Tk::Message<Tk::Label
end
#TkMessage = Tk::Message unless Object.const_defined? :TkMessage
-#Tk.__set_toplevel_aliases__(:Tk, Tk::Message, :TkMessage)
-Tk.__set_loaded_toplevel_aliases__('tk/message.rb', :Tk, Tk::Message,
- :TkMessage)
+Tk.__set_toplevel_aliases__(:Tk, Tk::Message, :TkMessage)
diff --git a/ext/tk/lib/tk/mngfocus.rb b/ext/tk/lib/tk/mngfocus.rb
index a05fb94f8e..1a2049c8a8 100644
--- a/ext/tk/lib/tk/mngfocus.rb
+++ b/ext/tk/lib/tk/mngfocus.rb
@@ -8,8 +8,8 @@ module TkManageFocus
extend Tk
TkCommandNames = [
- 'tk_focusFollowMouse'.freeze,
- 'tk_focusNext'.freeze,
+ 'tk_focusFollowMouse'.freeze,
+ 'tk_focusNext'.freeze,
'tk_focusPrev'.freeze
].freeze
diff --git a/ext/tk/lib/tk/msgcat.rb b/ext/tk/lib/tk/msgcat.rb
index 4abbcad85e..162953f425 100644
--- a/ext/tk/lib/tk/msgcat.rb
+++ b/ext/tk/lib/tk/msgcat.rb
@@ -11,13 +11,13 @@ class TkMsgCatalog < TkObject
#extend TkMsgCatalog
TkCommandNames = [
- '::msgcat::mc'.freeze,
- '::msgcat::mcmax'.freeze,
- '::msgcat::mclocale'.freeze,
- '::msgcat::mcpreferences'.freeze,
- '::msgcat::mcload'.freeze,
- '::msgcat::mcset'.freeze,
- '::msgcat::mcmset'.freeze,
+ '::msgcat::mc'.freeze,
+ '::msgcat::mcmax'.freeze,
+ '::msgcat::mclocale'.freeze,
+ '::msgcat::mcpreferences'.freeze,
+ '::msgcat::mcload'.freeze,
+ '::msgcat::mcset'.freeze,
+ '::msgcat::mcmset'.freeze,
'::msgcat::mcunknown'.freeze
].freeze
@@ -36,7 +36,7 @@ class TkMsgCatalog < TkObject
MSGCAT_EXT = '.msg'
- UNKNOWN_CBTBL = TkUtil.untrust(Hash.new{|hash,key| hash[key] = {}})
+ UNKNOWN_CBTBL = Hash.new{|hash,key| hash[key] = {}}.taint
TkCore::INTERP.add_tk_procs('::msgcat::mcunknown', 'args', <<-'EOL')
if {[set st [catch {eval {ruby_cmd TkMsgCatalog callback} [namespace current] $args} ret]] != 0} {
@@ -69,10 +69,10 @@ class TkMsgCatalog < TkObject
exit!(1)
rescue Exception => e
begin
- msg = _toUTF8(e.class.inspect) + ': ' +
- _toUTF8(e.message) + "\n" +
- "\n---< backtrace of Ruby side >-----\n" +
- _toUTF8(e.backtrace.join("\n")) +
+ msg = _toUTF8(e.class.inspect) + ': ' +
+ _toUTF8(e.message) + "\n" +
+ "\n---< backtrace of Ruby side >-----\n" +
+ _toUTF8(e.backtrace.join("\n")) +
"\n---< backtrace of Tk side >-------"
if TkCore::WITH_ENCODING
msg.force_encoding('utf-8')
@@ -80,9 +80,9 @@ class TkMsgCatalog < TkObject
msg.instance_variable_set(:@encoding, 'utf-8')
end
rescue Exception
- msg = e.class.inspect + ': ' + e.message + "\n" +
- "\n---< backtrace of Ruby side >-----\n" +
- e.backtrace.join("\n") +
+ msg = e.class.inspect + ': ' + e.message + "\n" +
+ "\n---< backtrace of Ruby side >-----\n" +
+ e.backtrace.join("\n") +
"\n---< backtrace of Tk side >-------"
end
fail(e, msg)
@@ -153,7 +153,7 @@ class TkMsgCatalog < TkObject
end
def translate(*args)
dst = args.collect{|src|
- @namespace.eval{tk_call_without_enc('::msgcat::mc',
+ @namespace.eval{tk_call_without_enc('::msgcat::mc',
_get_eval_string(src, true))}
}
Tk.UTF8_String(sprintf(*dst))
@@ -229,29 +229,29 @@ class TkMsgCatalog < TkObject
def self.set_translation(locale, src_str, trans_str=None, enc='utf-8')
if trans_str && trans_str != None
trans_str = Tk.UTF8_String(_toUTF8(trans_str, enc))
- Tk.UTF8_String(tk_call_without_enc('::msgcat::mcset',
- locale,
- _get_eval_string(src_str, true),
+ Tk.UTF8_String(tk_call_without_enc('::msgcat::mcset',
+ locale,
+ _get_eval_string(src_str, true),
trans_str))
else
- Tk.UTF8_String(tk_call_without_enc('::msgcat::mcset',
- locale,
+ Tk.UTF8_String(tk_call_without_enc('::msgcat::mcset',
+ locale,
_get_eval_string(src_str, true)))
end
end
def set_translation(locale, src_str, trans_str=None, enc='utf-8')
if trans_str && trans_str != None
- trans_str = Tk.UTF8_String(_toUTF8(trans_str, enc))
+ trans_str = Tk.UTF8_String(_toUTF8(trans_str, enc))
Tk.UTF8_String(@namespace.eval{
- tk_call_without_enc('::msgcat::mcset',
- locale,
- _get_eval_string(src_str, true),
+ tk_call_without_enc('::msgcat::mcset',
+ locale,
+ _get_eval_string(src_str, true),
trans_str)
})
else
Tk.UTF8_String(@namespace.eval{
- tk_call_without_enc('::msgcat::mcset',
- locale,
+ tk_call_without_enc('::msgcat::mcset',
+ locale,
_get_eval_string(src_str, true))})
end
end
@@ -261,7 +261,7 @@ class TkMsgCatalog < TkObject
list = []
trans_list.each{|src, trans|
if trans && trans != None
- list << _get_eval_string(src, true)
+ list << _get_eval_string(src, true)
list << Tk.UTF8_Stirng(_toUTF8(trans, enc))
else
list << _get_eval_string(src, true) << ''
@@ -274,7 +274,7 @@ class TkMsgCatalog < TkObject
list = []
trans_list.each{|src, trans|
if trans && trans != None
- list << _get_eval_string(src, true)
+ list << _get_eval_string(src, true)
list << Tk.UTF8_String(_toUTF8(trans, enc))
else
list << _get_eval_string(src, true) << ''
diff --git a/ext/tk/lib/tk/namespace.rb b/ext/tk/lib/tk/namespace.rb
index 4af891995e..20a8d65215 100644
--- a/ext/tk/lib/tk/namespace.rb
+++ b/ext/tk/lib/tk/namespace.rb
@@ -8,12 +8,12 @@ class TkNamespace < TkObject
extend Tk
TkCommandNames = [
- 'namespace'.freeze,
+ 'namespace'.freeze,
].freeze
Tk_Namespace_ID_TBL = TkCore::INTERP.create_table
- (Tk_Namespace_ID = ["ns".freeze, TkUtil.untrust("00000")]).instance_eval{
+ (Tk_Namespace_ID = ["ns".freeze, "00000".taint]).instance_eval{
@mutex = Mutex.new
def mutex; @mutex; end
freeze
@@ -46,7 +46,7 @@ class TkNamespace < TkObject
private :__config_cmd
def __configinfo_struct
- {:key=>0, :alias=>nil, :db_name=>nil, :db_class=>nil,
+ {:key=>0, :alias=>nil, :db_name=>nil, :db_class=>nil,
:default_value=>nil, :current_value=>2}
end
private :__configinfo_struct
@@ -122,8 +122,8 @@ class TkNamespace < TkObject
if TkComm::GET_CONFIGINFO_AS_ARRAY
Tk_Namespace_ID_TBL.mutex.synchronize{
- info.map!{|inf|
- if inf[0] == 'namespace' &&
+ info.map!{|inf|
+ if inf[0] == 'namespace' &&
TkNamespace::Tk_Namespace_ID_TBL.key?(inf[-1])
[inf[0], TkNamespace::Tk_Namespace_ID_TBL[inf[-1]]]
else
@@ -160,19 +160,19 @@ class TkNamespace < TkObject
def tk_call(*args)
#super('namespace', 'eval', @namespace, *args)
args = args.collect{|arg| (s = _get_eval_string(arg, true))? s: ''}
- super('namespace', 'eval', @namespace,
+ super('namespace', 'eval', @namespace,
TkCore::INTERP._merge_tklist(*args))
end
def tk_call_without_enc(*args)
#super('namespace', 'eval', @namespace, *args)
args = args.collect{|arg| (s = _get_eval_string(arg, true))? s: ''}
- super('namespace', 'eval', @namespace,
+ super('namespace', 'eval', @namespace,
TkCore::INTERP._merge_tklist(*args))
end
def tk_call_with_enc(*args)
#super('namespace', 'eval', @namespace, *args)
args = args.collect{|arg| (s = _get_eval_string(arg, true))? s: ''}
- super('namespace', 'eval', @namespace,
+ super('namespace', 'eval', @namespace,
TkCore::INTERP._merge_tklist(*args))
end
@@ -223,19 +223,19 @@ class TkNamespace < TkObject
def tk_call(*args)
#super('namespace', 'eval', @fullname, *args)
args = args.collect{|arg| (s = _get_eval_string(arg, true))? s: ''}
- super('namespace', 'eval', @fullname,
+ super('namespace', 'eval', @fullname,
TkCore::INTERP._merge_tklist(*args))
end
def tk_call_without_enc(*args)
#super('namespace', 'eval', @fullname, *args)
args = args.collect{|arg| (s = _get_eval_string(arg, true))? s: ''}
- super('namespace', 'eval', @fullname,
+ super('namespace', 'eval', @fullname,
TkCore::INTERP._merge_tklist(*args))
end
def tk_call_with_enc(*args)
#super('namespace', 'eval', @fullname, *args)
args = args.collect{|arg| (s = _get_eval_string(arg, true))? s: ''}
- super('namespace', 'eval', @fullname,
+ super('namespace', 'eval', @fullname,
TkCore::INTERP._merge_tklist(*args))
end
alias ns_tk_call tk_call
@@ -318,7 +318,7 @@ class TkNamespace < TkObject
else
fail ArgumentError, "String or Proc is expected"
end
- TkNamespace::NsCode.new(tk_call_without_enc('namespace', 'code',
+ TkNamespace::NsCode.new(tk_call_without_enc('namespace', 'code',
_get_eval_string(cmd, false)))
end
=end
@@ -350,8 +350,8 @@ class TkNamespace < TkObject
else
fail ArgumentError, "String or Proc is expected"
end
- TkNamespace::NsCode.new(tk_call_without_enc('namespace', 'code',
- _get_eval_string(cmd, false)),
+ TkNamespace::NsCode.new(tk_call_without_enc('namespace', 'code',
+ _get_eval_string(cmd, false)),
true)
end
diff --git a/ext/tk/lib/tk/optiondb.rb b/ext/tk/lib/tk/optiondb.rb
index 0f3be30ff7..186811d37d 100644
--- a/ext/tk/lib/tk/optiondb.rb
+++ b/ext/tk/lib/tk/optiondb.rb
@@ -8,7 +8,7 @@ module TkOptionDB
extend Tk
TkCommandNames = ['option'.freeze].freeze
- (CmdClassID = ['CMD_CLASS'.freeze, TkUtil.untrust('00000')]).instance_eval{
+ (CmdClassID = ['CMD_CLASS'.freeze, '00000'.taint]).instance_eval{
@mutex = Mutex.new
def mutex; @mutex; end
freeze
@@ -44,7 +44,7 @@ module TkOptionDB
def read_entries(file, f_enc=nil)
if TkCore::INTERP.safe?
- fail SecurityError,
+ fail SecurityError,
"can't call 'TkOptionDB.read_entries' on a safe interpreter"
end
@@ -86,7 +86,7 @@ module TkOptionDB
ent
end
module_function :read_entries
-
+
def read_with_encoding(file, f_enc=nil, pri=None)
# try to read the file as an OptionDB file
read_entries(file, f_enc).each{|pat, val|
@@ -136,7 +136,7 @@ module TkOptionDB
@@resource_proc_class.const_set(:CARRIER, '.'.freeze)
- @@resource_proc_class.instance_variable_set('@method_tbl',
+ @@resource_proc_class.instance_variable_set('@method_tbl',
TkCore::INTERP.create_table)
@@resource_proc_class.instance_variable_set('@add_method', false)
@@resource_proc_class.instance_variable_set('@safe_mode', 4)
@@ -144,7 +144,7 @@ module TkOptionDB
class << @@resource_proc_class
private :new
-=begin
+=begin
CARRIER = '.'.freeze
METHOD_TBL = TkCore::INTERP.create_table
ADD_METHOD = false
@@ -171,7 +171,7 @@ module TkOptionDB
def __check_proc_string__(str)
# If you want to check the proc_string, do it in this method.
- # Please define this in the block given to 'new_proc_class' method.
+ # Please define this in the block given to 'new_proc_class' method.
str
end
@@ -186,20 +186,20 @@ module TkOptionDB
unless TkComm._callback_entry?(res_proc)
#if id == :new || !(self::METHOD_TBL.has_key?(id) || self::ADD_METHOD)
if id == :new || !(@method_tbl.has_key?(id) || @add_method)
- raise NoMethodError,
+ raise NoMethodError,
"not support resource-proc '#{id.id2name}' for #{self.name}"
end
proc_str = proc_source
proc_str = '{' + proc_str + '}' unless /\A\{.*\}\Z/ =~ proc_str
#proc_str = __closed_block_check__(proc_str)
proc_str = __check_proc_string__(proc_str)
- res_proc = proc{
+ res_proc = proc{
begin
#eval("$SAFE = #{self::SAFE_MODE};\nProc.new" + proc_str)
eval("$SAFE = #{@safe_mode};\nProc.new" + proc_str)
rescue SyntaxError=>err
- raise SyntaxError,
- TkCore::INTERP._toUTF8(err.message.gsub(/\(eval\):\d:/,
+ raise SyntaxError,
+ TkCore::INTERP._toUTF8(err.message.gsub(/\(eval\):\d:/,
"(#{id.id2name}):"))
end
}.call
@@ -291,7 +291,7 @@ module TkOptionDB
cmd_klass.instance_variable_set('@method_tbl', TkCore::INTERP.create_table)
cmd_klass.instance_variable_set('@add_method', add)
cmd_klass.instance_variable_set('@safe_mode', safe)
- func.each{|f|
+ func.each{|f|
cmd_klass.instance_variable_get('@method_tbl')[f.to_s.intern] = nil
}
=begin
@@ -310,14 +310,14 @@ module TkOptionDB
# for security, make these methods invalid
class << klass
def __null_method(*args); nil; end
- [ :class_eval, :name, :superclass, :clone, :dup, :autoload, :autoload?,
- :ancestors, :const_defined?, :const_get, :const_set, :const_missing,
- :class_variables, :constants, :included_modules, :instance_methods,
- :method_defined?, :module_eval, :private_instance_methods,
- :protected_instance_methods, :public_instance_methods,
- :singleton_methods, :remove_const, :remove_method, :undef_method,
- :to_s, :inspect, :display, :method, :methods, :respond_to?,
- :instance_variable_get, :instance_variable_set, :instance_method,
+ [ :class_eval, :name, :superclass, :clone, :dup, :autoload, :autoload?,
+ :ancestors, :const_defined?, :const_get, :const_set, :const_missing,
+ :class_variables, :constants, :included_modules, :instance_methods,
+ :method_defined?, :module_eval, :private_instance_methods,
+ :protected_instance_methods, :public_instance_methods,
+ :singleton_methods, :remove_const, :remove_method, :undef_method,
+ :to_s, :inspect, :display, :method, :methods, :respond_to?,
+ :instance_variable_get, :instance_variable_set, :instance_method,
:instance_eval, :instance_exec, :instance_variables, :kind_of?, :is_a?,
:private_methods, :protected_methods, :public_methods ].each{|m|
alias_method(m, :__null_method)
@@ -331,7 +331,7 @@ module TkOptionDB
RAND_BASE_HEAD = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
RAND_BASE_CHAR = RAND_BASE_HEAD + 'abcdefghijklmnopqrstuvwxyz0123456789_'
def __get_random_basename
- name = '%s%03d' % [RAND_BASE_HEAD[rand(RAND_BASE_HEAD.size),1],
+ name = '%s%03d' % [RAND_BASE_HEAD[rand(RAND_BASE_HEAD.size),1],
RAND_BASE_CNT[0]]
len = RAND_BASE_CHAR.size
(6+rand(10)).times{
@@ -344,9 +344,9 @@ module TkOptionDB
private_class_method :__get_random_basename
# define new proc class :
- # If you want to modify the new class or create a new subclass,
- # you must do such operation in the block parameter.
- # Because the created class is flozen after evaluating the block.
+ # If you want to modify the new class or create a new subclass,
+ # you must do such operation in the block parameter.
+ # Because the created class is flozen after evaluating the block.
def new_proc_class(klass, func, safe = 4, add = false, parent = nil, &b)
new_klass = __create_new_class(klass, func, safe, add, parent)
new_klass.class_eval(&b) if block_given?
@@ -357,7 +357,7 @@ module TkOptionDB
module_function :new_proc_class
def eval_under_random_base(parent = nil, &b)
- new_klass = __create_new_class(__get_random_basename(),
+ new_klass = __create_new_class(__get_random_basename(),
[], 4, false, parent)
ret = new_klass.class_eval(&b) if block_given?
__remove_methods_of_proc_class(new_klass)
diff --git a/ext/tk/lib/tk/optionobj.rb b/ext/tk/lib/tk/optionobj.rb
index 29b06da0eb..8fe7e0ee5a 100644
--- a/ext/tk/lib/tk/optionobj.rb
+++ b/ext/tk/lib/tk/optionobj.rb
@@ -1,10 +1,10 @@
#
# tk/optionobj.rb : control options for a group of widgets
#
-# NOTE: If you want to use key-only option (no value),
-# use Tk::None for the value of the key-only option.
+# NOTE: If you want to use key-only option (no value),
+# use Tk::None for the value of the key-only option.
#
-# e.g. hash_kv({'aaa'=>1, 'bbb'=>Tk::None, 'ccc'=>3})
+# e.g. hash_kv({'aaa'=>1, 'bbb'=>Tk::None, 'ccc'=>3})
# => ["-aaa", 1, "-bbb", "-ccc", 3]
#
require 'tk'
@@ -36,7 +36,7 @@ module Tk
def _remove_win(win)
if win.kind_of?(Array)
widget, method = win
- @observ.delete_if{|x|
+ @observ.delete_if{|x|
if x.kind_of?(Array)
x[0] == widget
else
@@ -56,15 +56,15 @@ module Tk
private :_remove_win
def assign(*wins)
- # win :=
+ # win :=
# widget #==> call widget.configure(hash)
# [widget] #==> call widget.configure(hash)
# [widget, nil, {src=>target, ... }]
- # #==> call widget.configure(hash)
+ # #==> call widget.configure(hash)
# with converting hash-key
# [widget, method] #==> call widget.method(hash)
# [widget, method, {src=>target, ... }]
- # #==> call widget.method(hash)
+ # #==> call widget.method(hash)
# with converting hash-key
# [widget [receiver, method, arg, ... ]]
# #==> call receiver.method(arg, ... , hash)
@@ -74,7 +74,7 @@ module Tk
#
# src := option_name_on_optobj
#
- # target :=
+ # target :=
# nil #==> not use the src
# option_name_on_target_widget
# [ option_name_on_target_widget, ... ]
@@ -123,7 +123,7 @@ module Tk
next unless key
if key.kind_of?(Array)
key.each{|k| hash[k] = val}
- else
+ else
hash[key] = val
end
}
diff --git a/ext/tk/lib/tk/palette.rb b/ext/tk/lib/tk/palette.rb
index 9462bb0667..2d08d50f6a 100644
--- a/ext/tk/lib/tk/palette.rb
+++ b/ext/tk/lib/tk/palette.rb
@@ -9,8 +9,8 @@ module TkPalette
extend Tk
TkCommandNames = [
- 'tk_setPalette'.freeze,
- 'tk_bisque'.freeze,
+ 'tk_setPalette'.freeze,
+ 'tk_bisque'.freeze,
'tkDarken'.freeze
].freeze
diff --git a/ext/tk/lib/tk/panedwindow.rb b/ext/tk/lib/tk/panedwindow.rb
index 04407802ea..030144e677 100644
--- a/ext/tk/lib/tk/panedwindow.rb
+++ b/ext/tk/lib/tk/panedwindow.rb
@@ -6,7 +6,7 @@ require 'tk'
class Tk::PanedWindow<TkWindow
TkCommandNames = ['panedwindow'.freeze].freeze
WidgetClassName = 'Panedwindow'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
#def create_self(keys)
# if keys and keys != None
# tk_call_without_enc('panedwindow', @path, *hash_kv(keys, true))
@@ -128,10 +128,10 @@ class Tk::PanedWindow<TkWindow
# win = win.epath if win.kind_of?(TkObject)
win = _epath(win)
if key
- #conf = tk_split_list(tk_send_without_enc('paneconfigure',
+ #conf = tk_split_list(tk_send_without_enc('paneconfigure',
# win, "-#{key}"))
- conf = tk_split_list(tk_send_without_enc('paneconfigure',
- win, "-#{key}"),
+ conf = tk_split_list(tk_send_without_enc('paneconfigure',
+ win, "-#{key}"),
false, true)
conf[0] = conf[0][1..-1]
if conf[0] == 'hide'
@@ -140,10 +140,10 @@ class Tk::PanedWindow<TkWindow
end
conf
else
- #tk_split_simplelist(tk_send_without_enc('paneconfigure',
+ #tk_split_simplelist(tk_send_without_enc('paneconfigure',
# win)).collect{|conflist|
# conf = tk_split_simplelist(conflist)
- tk_split_simplelist(tk_send_without_enc('paneconfigure', win),
+ tk_split_simplelist(tk_send_without_enc('paneconfigure', win),
false, false).collect{|conflist|
conf = tk_split_simplelist(conflist, false, true)
conf[0] = conf[0][1..-1]
@@ -151,18 +151,18 @@ class Tk::PanedWindow<TkWindow
if conf[0] == 'hide'
conf[3] = bool(conf[3]) unless conf[3].empty?
elsif conf[3].index('{')
- conf[3] = tk_split_list(conf[3])
+ conf[3] = tk_split_list(conf[3])
else
- conf[3] = tk_tcl2ruby(conf[3])
+ conf[3] = tk_tcl2ruby(conf[3])
end
end
if conf[4]
if conf[0] == 'hide'
conf[4] = bool(conf[4]) unless conf[4].empty?
elsif conf[4].index('{')
- conf[4] = tk_split_list(conf[4])
+ conf[4] = tk_split_list(conf[4])
else
- conf[4] = tk_tcl2ruby(conf[4])
+ conf[4] = tk_tcl2ruby(conf[4])
end
end
conf[1] = conf[1][1..-1] if conf.size == 2 # alias info
@@ -173,10 +173,10 @@ class Tk::PanedWindow<TkWindow
# win = win.epath if win.kind_of?(TkObject)
win = _epath(win)
if key
- #conf = tk_split_list(tk_send_without_enc('paneconfigure',
+ #conf = tk_split_list(tk_send_without_enc('paneconfigure',
# win, "-#{key}"))
- conf = tk_split_list(tk_send_without_enc('paneconfigure',
- win, "-#{key}"),
+ conf = tk_split_list(tk_send_without_enc('paneconfigure',
+ win, "-#{key}"),
false, true)
key = conf.shift[1..-1]
if key == 'hide'
@@ -186,10 +186,10 @@ class Tk::PanedWindow<TkWindow
{ key => conf }
else
ret = {}
- #tk_split_simplelist(tk_send_without_enc('paneconfigure',
+ #tk_split_simplelist(tk_send_without_enc('paneconfigure',
# win)).each{|conflist|
# conf = tk_split_simplelist(conflist)
- tk_split_simplelist(tk_send_without_enc('paneconfigure', win),
+ tk_split_simplelist(tk_send_without_enc('paneconfigure', win),
false, false).each{|conflist|
conf = tk_split_simplelist(conflist, false, true)
key = conf.shift[1..-1]
@@ -197,18 +197,18 @@ class Tk::PanedWindow<TkWindow
if key == 'hide'
conf[2] = bool(conf[2]) unless conf[2].empty?
elsif conf[2].index('{')
- conf[2] = tk_split_list(conf[2])
+ conf[2] = tk_split_list(conf[2])
else
- conf[2] = tk_tcl2ruby(conf[2])
+ conf[2] = tk_tcl2ruby(conf[2])
end
end
if conf[3]
if key == 'hide'
conf[3] = bool(conf[3]) unless conf[3].empty?
elsif conf[3].index('{')
- conf[3] = tk_split_list(conf[3])
+ conf[3] = tk_split_list(conf[3])
else
- conf[3] = tk_tcl2ruby(conf[3])
+ conf[3] = tk_tcl2ruby(conf[3])
end
end
if conf.size == 1
@@ -254,7 +254,5 @@ end
Tk::Panedwindow = Tk::PanedWindow
#TkPanedWindow = Tk::PanedWindow unless Object.const_defined? :TkPanedWindow
#TkPanedwindow = Tk::Panedwindow unless Object.const_defined? :TkPanedwindow
-#Tk.__set_toplevel_aliases__(:Tk, Tk::PanedWindow,
-# :TkPanedWindow, :TkPanedwindow)
-Tk.__set_loaded_toplevel_aliases__('tk/panedwindow.rb', :Tk, Tk::PanedWindow,
- :TkPanedWindow, :TkPanedwindow)
+Tk.__set_toplevel_aliases__(:Tk, Tk::PanedWindow,
+ :TkPanedWindow, :TkPanedwindow)
diff --git a/ext/tk/lib/tk/place.rb b/ext/tk/lib/tk/place.rb
index 109d866fda..f7ebdfcbd6 100644
--- a/ext/tk/lib/tk/place.rb
+++ b/ext/tk/lib/tk/place.rb
@@ -35,9 +35,9 @@ module TkPlace
# win = win.epath if win.kind_of?(TkObject)
win = _epath(win)
if slot
- #conf = tk_split_list(tk_call_without_enc('place', 'configure',
+ #conf = tk_split_list(tk_call_without_enc('place', 'configure',
# win, "-#{slot}") )
- conf = tk_split_simplelist(tk_call_without_enc('place', 'configure',
+ conf = tk_split_simplelist(tk_call_without_enc('place', 'configure',
win, "-#{slot}") )
conf[0] = conf[0][1..-1]
conf[1] = tk_tcl2ruby(conf[1])
@@ -46,7 +46,7 @@ module TkPlace
conf[4] = tk_tcl2ruby(conf[1])
conf
else
- tk_split_simplelist(tk_call_without_enc('place', 'configure',
+ tk_split_simplelist(tk_call_without_enc('place', 'configure',
win)).collect{|conflist|
#conf = list(conflist)
conf = simplelist(conflist).collect!{|inf| tk_tcl2ruby(inf)}
@@ -63,16 +63,16 @@ module TkPlace
# win = win.epath if win.kind_of?(TkObject)
win = _epath(win)
if slot
- #conf = tk_split_list(tk_call_without_enc('place', 'configure',
+ #conf = tk_split_list(tk_call_without_enc('place', 'configure',
# win, "-#{slot}") )
- conf = tk_split_simplelist(tk_call_without_enc('place', 'configure',
+ conf = tk_split_simplelist(tk_call_without_enc('place', 'configure',
win, "-#{slot}") )
# { conf[0][1..-1] => conf[1] }
{ conf[0][1..-1] => tk_tcl2ruby(conf[4]) }
else
ret = {}
#tk_split_list(tk_call_without_enc('place','configure',win)).each{|conf|
- tk_split_simplelist(tk_call_without_enc('place', 'configure',
+ tk_split_simplelist(tk_call_without_enc('place', 'configure',
win)).each{|conf_list|
#ret[conf[0][1..-1]] = conf[1]
conf = simplelist(conf_list)
diff --git a/ext/tk/lib/tk/radiobutton.rb b/ext/tk/lib/tk/radiobutton.rb
index 627df6d9cf..1f864ec06b 100644
--- a/ext/tk/lib/tk/radiobutton.rb
+++ b/ext/tk/lib/tk/radiobutton.rb
@@ -7,7 +7,7 @@ require 'tk/button'
class Tk::RadioButton<Tk::Button
TkCommandNames = ['radiobutton'.freeze].freeze
WidgetClassName = 'Radiobutton'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
#def create_self(keys)
# if keys and keys != None
# tk_call_without_enc('radiobutton', @path, *hash_kv(keys, true))
@@ -67,7 +67,5 @@ end
Tk::Radiobutton = Tk::RadioButton
#TkRadioButton = Tk::RadioButton unless Object.const_defined? :TkRadioButton
#TkRadiobutton = Tk::Radiobutton unless Object.const_defined? :TkRadiobutton
-#Tk.__set_toplevel_aliases__(:Tk, Tk::RadioButton,
-# :TkRadioButton, :TkRadiobutton)
-Tk.__set_loaded_toplevel_aliases__('tk/radiobutton.rb', :Tk, Tk::RadioButton,
- :TkRadioButton, :TkRadiobutton)
+Tk.__set_toplevel_aliases__(:Tk, Tk::RadioButton,
+ :TkRadioButton, :TkRadiobutton)
diff --git a/ext/tk/lib/tk/root.rb b/ext/tk/lib/tk/root.rb
index b4f0bd107f..7237b4c614 100644
--- a/ext/tk/lib/tk/root.rb
+++ b/ext/tk/lib/tk/root.rb
@@ -16,7 +16,7 @@ class Tk::Root<TkWindow
def Root.new(keys=nil, &b)
unless TkCore::INTERP.tk_windows['.']
- TkCore::INTERP.tk_windows['.'] =
+ TkCore::INTERP.tk_windows['.'] =
super(:without_creating=>true, :widgetname=>'.'){}
end
root = TkCore::INTERP.tk_windows['.']
@@ -52,7 +52,7 @@ class Tk::Root<TkWindow
end
WidgetClassName = 'Tk'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def self.to_eval
# self::WidgetClassName
@@ -70,8 +70,8 @@ class Tk::Root<TkWindow
def add_menu(menu_info, tearoff=false, opts=nil)
# See tk/menuspec.rb for menu_info.
- # opts is a hash of default configs for all of cascade menus.
- # Configs of menu_info can override it.
+ # opts is a hash of default configs for all of cascade menus.
+ # Configs of menu_info can override it.
if tearoff.kind_of?(Hash)
opts = tearoff
tearoff = false
@@ -82,7 +82,7 @@ class Tk::Root<TkWindow
def add_menubar(menu_spec, tearoff=false, opts=nil)
# See tk/menuspec.rb for menu_spec.
# opts is a hash of default configs for all of cascade menus.
- # Configs of menu_spec can override it.
+ # Configs of menu_spec can override it.
menu_spec.each{|info| add_menu(info, tearoff, opts)}
self.menu
end
diff --git a/ext/tk/lib/tk/scale.rb b/ext/tk/lib/tk/scale.rb
index 0bdcead7f2..7e758d92f4 100644
--- a/ext/tk/lib/tk/scale.rb
+++ b/ext/tk/lib/tk/scale.rb
@@ -6,7 +6,7 @@ require 'tk'
class Tk::Scale<TkWindow
TkCommandNames = ['scale'.freeze].freeze
WidgetClassName = 'Scale'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def create_self(keys)
if keys and keys != None
@@ -16,11 +16,11 @@ class Tk::Scale<TkWindow
end
unless TkConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
#tk_call_without_enc('scale', @path, *hash_kv(keys, true))
- tk_call_without_enc(self.class::TkCommandNames[0], @path,
+ tk_call_without_enc(self.class::TkCommandNames[0], @path,
*hash_kv(keys, true))
else
begin
- tk_call_without_enc(self.class::TkCommandNames[0], @path,
+ tk_call_without_enc(self.class::TkCommandNames[0], @path,
*hash_kv(keys, true))
rescue
tk_call_without_enc(self.class::TkCommandNames[0], @path)
@@ -33,7 +33,7 @@ class Tk::Scale<TkWindow
configure(keys)
else
# re-create widget
- tk_call_without_enc(self.class::TkCommandNames[0], @path,
+ tk_call_without_enc(self.class::TkCommandNames[0], @path,
*hash_kv(keys, true))
end
end
@@ -69,7 +69,7 @@ class Tk::Scale<TkWindow
def configure(slot, value=None)
if (slot == 'command' || slot == :command)
configure('command'=>value)
- elsif slot.kind_of?(Hash) &&
+ elsif slot.kind_of?(Hash) &&
(slot.key?('command') || slot.key?(:command))
slot = _symbolkey2str(slot)
slot['command'] = _wrap_command_arg(slot.delete('command'))
@@ -108,5 +108,4 @@ class Tk::Scale<TkWindow
end
#TkScale = Tk::Scale unless Object.const_defined? :TkScale
-#Tk.__set_toplevel_aliases__(:Tk, Tk::Scale, :TkScale)
-Tk.__set_loaded_toplevel_aliases__('tk/scale.rb', :Tk, Tk::Scale, :TkScale)
+Tk.__set_toplevel_aliases__(:Tk, Tk::Scale, :TkScale)
diff --git a/ext/tk/lib/tk/scrollbar.rb b/ext/tk/lib/tk/scrollbar.rb
index c0ac201acb..87db46a9f9 100644
--- a/ext/tk/lib/tk/scrollbar.rb
+++ b/ext/tk/lib/tk/scrollbar.rb
@@ -6,11 +6,11 @@ require 'tk'
class Tk::Scrollbar<TkWindow
TkCommandNames = ['scrollbar'.freeze].freeze
WidgetClassName = 'Scrollbar'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def create_self(keys)
@assigned = []
- @scroll_proc = proc{|*args|
+ @scroll_proc = proc{|*args|
if self.orient == 'horizontal'
@assigned.each{|w| w.xview(*args)}
else # 'vertical'
@@ -21,11 +21,11 @@ class Tk::Scrollbar<TkWindow
if keys and keys != None
unless TkConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
#tk_call_without_enc('scrollbar', @path, *hash_kv(keys, true))
- tk_call_without_enc(self.class::TkCommandNames[0], @path,
+ tk_call_without_enc(self.class::TkCommandNames[0], @path,
*hash_kv(keys, true))
else
begin
- tk_call_without_enc(self.class::TkCommandNames[0], @path,
+ tk_call_without_enc(self.class::TkCommandNames[0], @path,
*hash_kv(keys, true))
rescue
tk_call_without_enc(self.class::TkCommandNames[0], @path)
@@ -38,7 +38,7 @@ class Tk::Scrollbar<TkWindow
configure(keys)
else
# re-create widget
- tk_call_without_enc(self.class::TkCommandNames[0], @path,
+ tk_call_without_enc(self.class::TkCommandNames[0], @path,
*hash_kv(keys, true))
end
end
@@ -148,9 +148,7 @@ class Tk::Scrollbar<TkWindow
end
#TkScrollbar = Tk::Scrollbar unless Object.const_defined? :TkScrollbar
-#Tk.__set_toplevel_aliases__(:Tk, Tk::Scrollbar, :TkScrollbar)
-Tk.__set_loaded_toplevel_aliases__('tk/scrollbar.rb', :Tk, Tk::Scrollbar,
- :TkScrollbar)
+Tk.__set_toplevel_aliases__(:Tk, Tk::Scrollbar, :TkScrollbar)
class Tk::XScrollbar<Tk::Scrollbar
@@ -163,9 +161,7 @@ class Tk::XScrollbar<Tk::Scrollbar
end
#TkXScrollbar = Tk::XScrollbar unless Object.const_defined? :TkXScrollbar
-#Tk.__set_toplevel_aliases__(:Tk, Tk::XScrollbar, :TkXScrollbar)
-Tk.__set_loaded_toplevel_aliases__('tk/scrollbar.rb', :Tk, Tk::XScrollbar,
- :TkXScrollbar)
+Tk.__set_toplevel_aliases__(:Tk, Tk::XScrollbar, :TkXScrollbar)
class Tk::YScrollbar<Tk::Scrollbar
@@ -178,6 +174,4 @@ class Tk::YScrollbar<Tk::Scrollbar
end
#TkYScrollbar = Tk::YScrollbar unless Object.const_defined? :TkYScrollbar
-#Tk.__set_toplevel_aliases__(:Tk, Tk::YScrollbar, :TkYScrollbar)
-Tk.__set_loaded_toplevel_aliases__('tk/scrollbar.rb', :Tk, Tk::YScrollbar,
- :TkYScrollbar)
+Tk.__set_toplevel_aliases__(:Tk, Tk::YScrollbar, :TkYScrollbar)
diff --git a/ext/tk/lib/tk/selection.rb b/ext/tk/lib/tk/selection.rb
index ba0a6f49f9..5caa6ef8ef 100644
--- a/ext/tk/lib/tk/selection.rb
+++ b/ext/tk/lib/tk/selection.rb
@@ -18,7 +18,7 @@ module TkSelection
end
def self.clear_on_display(win, sel=nil)
if sel
- tk_call_without_enc('selection', 'clear',
+ tk_call_without_enc('selection', 'clear',
'-displayof', win, '-selection', sel)
else
tk_call_without_enc('selection', 'clear', '-displayof', win)
@@ -35,7 +35,7 @@ module TkSelection
end
def self.get_on_display(win, keys=nil)
#tk_call('selection', 'get', '-displayof', win, *hash_kv(keys))
- _fromUTF8(tk_call_without_enc('selection', 'get', '-displayof',
+ _fromUTF8(tk_call_without_enc('selection', 'get', '-displayof',
win, *hash_kv(keys)))
end
def get(keys=nil)
@@ -65,7 +65,7 @@ module TkSelection
end
def self.get_owner_on_display(win, sel=nil)
if sel
- window(tk_call_without_enc('selection', 'own',
+ window(tk_call_without_enc('selection', 'own',
'-displayof', win, '-selection', sel))
else
window(tk_call_without_enc('selection', 'own', '-displayof', win))
diff --git a/ext/tk/lib/tk/spinbox.rb b/ext/tk/lib/tk/spinbox.rb
index f2917d60ca..34dc1904f7 100644
--- a/ext/tk/lib/tk/spinbox.rb
+++ b/ext/tk/lib/tk/spinbox.rb
@@ -8,20 +8,20 @@ require 'tk/entry'
class Tk::Spinbox<Tk::Entry
TkCommandNames = ['spinbox'.freeze].freeze
WidgetClassName = 'Spinbox'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
class SpinCommand < TkValidateCommand
class ValidateArgs < TkUtil::CallbackSubst
KEY_TBL = [
- [ ?d, ?s, :direction ],
- [ ?s, ?e, :current ],
- [ ?W, ?w, :widget ],
+ [ ?d, ?s, :direction ],
+ [ ?s, ?e, :current ],
+ [ ?W, ?w, :widget ],
nil
]
PROC_TBL = [
- [ ?s, TkComm.method(:string) ],
- [ ?w, TkComm.method(:window) ],
+ [ ?s, TkComm.method(:string) ],
+ [ ?w, TkComm.method(:window) ],
[ ?e, proc{|val|
#enc = Tk.encoding
@@ -32,7 +32,7 @@ class Tk::Spinbox<Tk::Entry
TkComm::string(val)
end
}
- ],
+ ],
nil
]
@@ -100,36 +100,13 @@ class Tk::Spinbox<Tk::Entry
tk_send_without_enc('identify', x, y)
end
- def invoke(elem)
- tk_send_without_enc('invoke', elem)
- self
- end
-
def spinup
- begin
- tk_send_without_enc('invoke', 'buttonup')
- rescue RuntimeError => e
- # old version of element?
- begin
- tk_send_without_enc('invoke', 'spinup')
- rescue
- fail e
- end
- end
+ tk_send_without_enc('invoke', 'spinup')
self
end
def spindown
- begin
- tk_send_without_enc('invoke', 'buttondown')
- rescue RuntimeError => e
- # old version of element?
- begin
- tk_send_without_enc('invoke', 'spinup')
- rescue
- fail e
- end
- end
+ tk_send_without_enc('invoke', 'spindown')
self
end
@@ -139,6 +116,4 @@ class Tk::Spinbox<Tk::Entry
end
#TkSpinbox = Tk::Spinbox unless Object.const_defined? :TkSpinbox
-#Tk.__set_toplevel_aliases__(:Tk, Tk::Spinbox, :TkSpinbox)
-Tk.__set_loaded_toplevel_aliases__('tk/spinbox.rb', :Tk, Tk::Spinbox,
- :TkSpinbox)
+Tk.__set_toplevel_aliases__(:Tk, Tk::Spinbox, :TkSpinbox)
diff --git a/ext/tk/lib/tk/text.rb b/ext/tk/lib/tk/text.rb
index bc2aa0a293..4ec82bed1d 100644
--- a/ext/tk/lib/tk/text.rb
+++ b/ext/tk/lib/tk/text.rb
@@ -29,9 +29,6 @@ module TkTextTagConfig
end
private :__item_pathname
- def tag_cget_tkstring(tagOrId, option)
- itemcget_tkstring(['tag', tagOrId], option)
- end
def tag_cget(tagOrId, option)
itemcget(['tag', tagOrId], option)
end
@@ -48,9 +45,6 @@ module TkTextTagConfig
current_itemconfiginfo(['tag', tagOrId], slot)
end
- def window_cget_tkstring(tagOrId, option)
- itemcget_tkstring(['window', tagOrId], option)
- end
def window_cget(tagOrId, option)
itemcget(['window', tagOrId], option)
end
@@ -67,7 +61,7 @@ module TkTextTagConfig
current_itemconfiginfo(['window', tagOrId], slot)
end
- private :itemcget_tkstring, :itemcget, :itemcget_strict
+ private :itemcget, :itemcget_strict
private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
end
@@ -257,7 +251,7 @@ class Tk::Text<TkTextWin
TkCommandNames = ['text'.freeze].freeze
WidgetClassName = 'Text'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def self.new(*args, &block)
obj = super(*args){}
@@ -287,7 +281,7 @@ class Tk::Text<TkTextWin
def create_self(keys)
#if keys and keys != None
# #tk_call_without_enc('text', @path, *hash_kv(keys, true))
- # tk_call_without_enc(self.class::TkCommandNames[0], @path,
+ # tk_call_without_enc(self.class::TkCommandNames[0], @path,
# *hash_kv(keys, true))
#else
# #tk_call_without_enc('text', @path)
@@ -312,7 +306,7 @@ class Tk::Text<TkTextWin
end
def index(idx)
- Tk::Text::IndexString.new(tk_send_without_enc('index',
+ Tk::Text::IndexString.new(tk_send_without_enc('index',
_get_eval_enc_str(idx)))
end
@@ -381,7 +375,7 @@ class Tk::Text<TkTextWin
def mark_gravity(mark, direction=nil)
if direction
- tk_send_without_enc('mark', 'gravity',
+ tk_send_without_enc('mark', 'gravity',
_get_eval_enc_str(mark), direction)
self
else
@@ -390,27 +384,27 @@ class Tk::Text<TkTextWin
end
def mark_set(mark, index)
- tk_send_without_enc('mark', 'set', _get_eval_enc_str(mark),
+ tk_send_without_enc('mark', 'set', _get_eval_enc_str(mark),
_get_eval_enc_str(index))
self
end
alias set_mark mark_set
def mark_unset(*marks)
- tk_send_without_enc('mark', 'unset',
+ tk_send_without_enc('mark', 'unset',
*(marks.collect{|mark| _get_eval_enc_str(mark)}))
self
end
alias unset_mark mark_unset
def mark_next(index)
- tagid2obj(_fromUTF8(tk_send_without_enc('mark', 'next',
+ tagid2obj(_fromUTF8(tk_send_without_enc('mark', 'next',
_get_eval_enc_str(index))))
end
alias next_mark mark_next
def mark_previous(index)
- tagid2obj(_fromUTF8(tk_send_without_enc('mark', 'previous',
+ tagid2obj(_fromUTF8(tk_send_without_enc('mark', 'previous',
_get_eval_enc_str(index))))
end
alias previous_mark mark_previous
@@ -418,11 +412,11 @@ class Tk::Text<TkTextWin
def image_cget_strict(index, slot)
case slot.to_s
when 'text', 'label', 'show', 'data', 'file'
- _fromUTF8(tk_send_without_enc('image', 'cget',
+ _fromUTF8(tk_send_without_enc('image', 'cget',
_get_eval_enc_str(index), "-#{slot}"))
else
- tk_tcl2ruby(_fromUTF8(tk_send_without_enc('image', 'cget',
- _get_eval_enc_str(index),
+ tk_tcl2ruby(_fromUTF8(tk_send_without_enc('image', 'cget',
+ _get_eval_enc_str(index),
"-#{slot}")))
end
end
@@ -451,13 +445,13 @@ class Tk::Text<TkTextWin
def image_configure(index, slot, value=None)
if slot.kind_of?(Hash)
- _fromUTF8(tk_send_without_enc('image', 'configure',
- _get_eval_enc_str(index),
+ _fromUTF8(tk_send_without_enc('image', 'configure',
+ _get_eval_enc_str(index),
*hash_kv(slot, true)))
else
- _fromUTF8(tk_send_without_enc('image', 'configure',
- _get_eval_enc_str(index),
- "-#{slot}",
+ _fromUTF8(tk_send_without_enc('image', 'configure',
+ _get_eval_enc_str(index),
+ "-#{slot}",
_get_eval_enc_str(value)))
end
self
@@ -487,16 +481,16 @@ class Tk::Text<TkTextWin
else
if conf[3]
if conf[3].index('{')
- conf[3] = tk_split_list(conf[3])
+ conf[3] = tk_split_list(conf[3])
else
- conf[3] = tk_tcl2ruby(conf[3])
+ conf[3] = tk_tcl2ruby(conf[3])
end
end
if conf[4]
if conf[4].index('{')
- conf[4] = tk_split_list(conf[4])
+ conf[4] = tk_split_list(conf[4])
else
- conf[4] = tk_tcl2ruby(conf[4])
+ conf[4] = tk_tcl2ruby(conf[4])
end
end
end
@@ -528,16 +522,16 @@ class Tk::Text<TkTextWin
else
if conf[2]
if conf[2].index('{')
- conf[2] = tk_split_list(conf[2])
+ conf[2] = tk_split_list(conf[2])
else
- conf[2] = tk_tcl2ruby(conf[2])
+ conf[2] = tk_tcl2ruby(conf[2])
end
end
if conf[3]
if conf[3].index('{')
- conf[3] = tk_split_list(conf[3])
+ conf[3] = tk_split_list(conf[3])
else
- conf[3] = tk_tcl2ruby(conf[3])
+ conf[3] = tk_tcl2ruby(conf[3])
end
end
end
@@ -626,7 +620,7 @@ class Tk::Text<TkTextWin
end
def compare(idx1, op, idx2)
- bool(tk_send_without_enc('compare', _get_eval_enc_str(idx1),
+ bool(tk_send_without_enc('compare', _get_eval_enc_str(idx1),
op, _get_eval_enc_str(idx2)))
end
@@ -649,7 +643,7 @@ class Tk::Text<TkTextWin
def count_info(idx1, idx2, update=true)
# Tk8.5 feature
opts = [
- :chars, :displaychars, :displayindices, :displaylines,
+ :chars, :displaychars, :displayindices, :displaylines,
:indices, :lines, :xpixels, :ypixels
]
if update
@@ -743,8 +737,8 @@ class Tk::Text<TkTextWin
end
def tag_add(tag, index1, index2=None)
- tk_send_without_enc('tag', 'add', _get_eval_enc_str(tag),
- _get_eval_enc_str(index1),
+ tk_send_without_enc('tag', 'add', _get_eval_enc_str(tag),
+ _get_eval_enc_str(index1),
_get_eval_enc_str(index2))
self
end
@@ -752,15 +746,15 @@ class Tk::Text<TkTextWin
alias add_tag tag_add
def tag_delete(*tags)
- tk_send_without_enc('tag', 'delete',
+ tk_send_without_enc('tag', 'delete',
*(tags.collect{|tag| _get_eval_enc_str(tag)}))
TkTextTag::TTagID_TBL.mutex.synchronize{
if TkTextTag::TTagID_TBL[@path]
tags.each{|tag|
if tag.kind_of?(TkTextTag)
- TkTextTag::TTagID_TBL[@path].delete(tag.id)
+ TkTextTag::TTagID_TBL[@path].delete(tag.id)
else
- TkTextTag::TTagID_TBL[@path].delete(tag)
+ TkTextTag::TTagID_TBL[@path].delete(tag)
end
}
end
@@ -813,7 +807,7 @@ class Tk::Text<TkTextWin
def tag_cget(tag, key)
case key.to_s
when 'text', 'label', 'show', 'data', 'file'
- tk_call_without_enc(@path, 'tag', 'cget',
+ tk_call_without_enc(@path, 'tag', 'cget',
_get_eval_enc_str(tag), "-#{key}")
when 'font', 'kanjifont'
#fnt = tk_tcl2ruby(tk_send('tag', 'cget', tag, "-#{key}"))
@@ -839,14 +833,14 @@ class Tk::Text<TkTextWin
|| key['latinfont'] || key['asciifont'] )
tagfont_configure(tag, key)
else
- tk_send_without_enc('tag', 'configure', _get_eval_enc_str(tag),
+ tk_send_without_enc('tag', 'configure', _get_eval_enc_str(tag),
*hash_kv(key, true))
end
else
- if key == 'font' || key == :font ||
+ if key == 'font' || key == :font ||
key == 'kanjifont' || key == :kanjifont ||
- key == 'latinfont' || key == :latinfont ||
+ key == 'latinfont' || key == :latinfont ||
key == 'asciifont' || key == :asciifont
if val == None
tagfontobj(tag)
@@ -854,7 +848,7 @@ class Tk::Text<TkTextWin
tagfont_configure(tag, {key=>val})
end
else
- tk_send_without_enc('tag', 'configure', _get_eval_enc_str(tag),
+ tk_send_without_enc('tag', 'configure', _get_eval_enc_str(tag),
"-#{key}", _get_eval_enc_str(val))
end
end
@@ -884,16 +878,16 @@ class Tk::Text<TkTextWin
else
if conf[3]
if conf[3].index('{')
- conf[3] = tk_split_list(conf[3])
+ conf[3] = tk_split_list(conf[3])
else
- conf[3] = tk_tcl2ruby(conf[3])
+ conf[3] = tk_tcl2ruby(conf[3])
end
end
if conf[4]
if conf[4].index('{')
- conf[4] = tk_split_list(conf[4])
+ conf[4] = tk_split_list(conf[4])
else
- conf[4] = tk_tcl2ruby(conf[4])
+ conf[4] = tk_tcl2ruby(conf[4])
end
end
end
@@ -932,16 +926,16 @@ class Tk::Text<TkTextWin
else
if conf[2]
if conf[2].index('{')
- conf[2] = tk_split_list(conf[2])
+ conf[2] = tk_split_list(conf[2])
else
- conf[2] = tk_tcl2ruby(conf[2])
+ conf[2] = tk_tcl2ruby(conf[2])
end
end
if conf[3]
if conf[3].index('{')
- conf[3] = tk_split_list(conf[3])
+ conf[3] = tk_split_list(conf[3])
else
- conf[3] = tk_tcl2ruby(conf[3])
+ conf[3] = tk_tcl2ruby(conf[3])
end
end
end
@@ -986,19 +980,19 @@ class Tk::Text<TkTextWin
=end
def tag_raise(tag, above=None)
- tk_send_without_enc('tag', 'raise', _get_eval_enc_str(tag),
+ tk_send_without_enc('tag', 'raise', _get_eval_enc_str(tag),
_get_eval_enc_str(above))
self
end
def tag_lower(tag, below=None)
- tk_send_without_enc('tag', 'lower', _get_eval_enc_str(tag),
+ tk_send_without_enc('tag', 'lower', _get_eval_enc_str(tag),
_get_eval_enc_str(below))
self
end
def tag_remove(tag, *indices)
- tk_send_without_enc('tag', 'remove', _get_eval_enc_str(tag),
+ tk_send_without_enc('tag', 'remove', _get_eval_enc_str(tag),
*(indices.collect{|idx| _get_eval_enc_str(idx)}))
self
end
@@ -1007,7 +1001,7 @@ class Tk::Text<TkTextWin
#l = tk_split_simplelist(tk_send_without_enc('tag', 'ranges',
# _get_eval_enc_str(tag)))
l = tk_split_simplelist(tk_send_without_enc('tag', 'ranges',
- _get_eval_enc_str(tag)),
+ _get_eval_enc_str(tag)),
false, true)
r = []
while key=l.shift
@@ -1017,18 +1011,18 @@ class Tk::Text<TkTextWin
end
def tag_nextrange(tag, first, last=None)
- simplelist(tk_send_without_enc('tag', 'nextrange',
- _get_eval_enc_str(tag),
- _get_eval_enc_str(first),
+ simplelist(tk_send_without_enc('tag', 'nextrange',
+ _get_eval_enc_str(tag),
+ _get_eval_enc_str(first),
_get_eval_enc_str(last))).collect{|idx|
Tk::Text::IndexString.new(idx)
}
end
def tag_prevrange(tag, first, last=None)
- simplelist(tk_send_without_enc('tag', 'prevrange',
- _get_eval_enc_str(tag),
- _get_eval_enc_str(first),
+ simplelist(tk_send_without_enc('tag', 'prevrange',
+ _get_eval_enc_str(tag),
+ _get_eval_enc_str(first),
_get_eval_enc_str(last))).collect{|idx|
Tk::Text::IndexString.new(idx)
}
@@ -1038,7 +1032,7 @@ class Tk::Text<TkTextWin
def window_cget(index, slot)
case slot.to_s
when 'text', 'label', 'show', 'data', 'file'
- _fromUTF8(tk_send_without_enc('window', 'cget',
+ _fromUTF8(tk_send_without_enc('window', 'cget',
_get_eval_enc_str(index), "-#{slot}"))
when 'font', 'kanjifont'
#fnt = tk_tcl2ruby(tk_send('window', 'cget', index, "-#{slot}"))
@@ -1082,12 +1076,12 @@ class Tk::Text<TkTextWin
slot['create'] = install_cmd(proc{_epath(p_create.call)})
end
end
- tk_send_without_enc('window', 'configure',
- _get_eval_enc_str(index),
+ tk_send_without_enc('window', 'configure',
+ _get_eval_enc_str(index),
*hash_kv(slot, true))
else
if slot == 'window' || slot == :window
- # id = value
+ # id = value
# value = id.epath if id.kind_of?(TkWindow)
value = _epath(value)
end
@@ -1107,8 +1101,8 @@ class Tk::Text<TkTextWin
value = install_cmd(proc{_epath(p_create.call)})
end
end
- tk_send_without_enc('window', 'configure',
- _get_eval_enc_str(index),
+ tk_send_without_enc('window', 'configure',
+ _get_eval_enc_str(index),
"-#{slot}", _get_eval_enc_str(value))
end
end
@@ -1135,16 +1129,16 @@ class Tk::Text<TkTextWin
else
if conf[3]
if conf[3].index('{')
- conf[3] = tk_split_list(conf[3])
+ conf[3] = tk_split_list(conf[3])
else
- conf[3] = tk_tcl2ruby(conf[3])
+ conf[3] = tk_tcl2ruby(conf[3])
end
end
if conf[4]
if conf[4].index('{')
- conf[4] = tk_split_list(conf[4])
+ conf[4] = tk_split_list(conf[4])
else
- conf[4] = tk_tcl2ruby(conf[4])
+ conf[4] = tk_tcl2ruby(conf[4])
end
end
end
@@ -1172,16 +1166,16 @@ class Tk::Text<TkTextWin
else
if conf[2]
if conf[2].index('{')
- conf[2] = tk_split_list(conf[2])
+ conf[2] = tk_split_list(conf[2])
else
- conf[2] = tk_tcl2ruby(conf[2])
+ conf[2] = tk_tcl2ruby(conf[2])
end
end
if conf[3]
if conf[3].index('{')
- conf[3] = tk_split_list(conf[3])
+ conf[3] = tk_split_list(conf[3])
else
- conf[3] = tk_tcl2ruby(conf[3])
+ conf[3] = tk_tcl2ruby(conf[3])
end
end
end
@@ -1237,11 +1231,11 @@ class Tk::Text<TkTextWin
# $KCODE == 'NONE'
if JAPANIZED_TK
- tk_call_without_enc('kstring', 'length',
+ tk_call_without_enc('kstring', 'length',
_get_eval_enc_str(txt)).to_i
else
begin
- tk_call_without_enc('encoding', 'convertto', 'ascii',
+ tk_call_without_enc('encoding', 'convertto', 'ascii',
_get_eval_enc_str(txt)).length
rescue StandardError, NameError
# sorry, I have no plan
@@ -1330,11 +1324,11 @@ class Tk::Text<TkTextWin
pos = _ktext_length(txt[0..(pos-1)]) if pos > 0
if pat.kind_of?(String)
#return [index(start + " + #{pos} chars"), pat.split('').length]
- return [index(start + " + #{pos} chars"),
+ return [index(start + " + #{pos} chars"),
_ktext_length(pat), pat.dup]
else
#return [index(start + " + #{pos} chars"), $&.split('').length]
- return [index(start + " + #{pos} chars"),
+ return [index(start + " + #{pos} chars"),
_ktext_length(match), match]
end
else
@@ -1348,11 +1342,11 @@ class Tk::Text<TkTextWin
pos = _ktext_length(txt[0..(pos-1)]) if pos > 0
if pat.kind_of?(String)
#return [index(start + " + #{pos} chars"), pat.split('').length]
- return [index(start + " + #{pos} chars"),
+ return [index(start + " + #{pos} chars"),
_ktext_length(pat), pat.dup]
else
#return [index(start + " + #{pos} chars"), $&.split('').length]
- return [index(start + " + #{pos} chars"),
+ return [index(start + " + #{pos} chars"),
_ktext_length(match), match]
end
else
@@ -1363,7 +1357,7 @@ class Tk::Text<TkTextWin
pos = _ktext_length(txt[0..(pos-1)]) if pos > 0
if pat.kind_of?(String)
#return [index("1.0 + #{pos} chars"), pat.split('').length]
- return [index("1.0 + #{pos} chars"),
+ return [index("1.0 + #{pos} chars"),
_ktext_length(pat), pat.dup]
else
#return [index("1.0 + #{pos} chars"), $&.split('').length]
@@ -1453,7 +1447,7 @@ class Tk::Text<TkTextWin
idx = str.index(/ /, i)
result.push str[i..(idx-1)]
i = idx + 1
-
+
# retrieve value
case result[-1]
when 'text'
@@ -1511,7 +1505,7 @@ class Tk::Text<TkTextWin
break
end
end
-
+
kvis = []
until result.empty?
kvis.push [result.shift, result.shift, result.shift]
@@ -1576,8 +1570,7 @@ class Tk::Text<TkTextWin
end
#TkText = Tk::Text unless Object.const_defined? :TkText
-#Tk.__set_toplevel_aliases__(:Tk, Tk::Text, :TkText)
-Tk.__set_loaded_toplevel_aliases__('tk/text.rb', :Tk, Tk::Text, :TkText)
+Tk.__set_toplevel_aliases__(:Tk, Tk::Text, :TkText)
#######################################
@@ -1594,8 +1587,7 @@ class Tk::Text::Peer < Tk::Text
def create_self(keys)
if keys and keys != None
- tk_call_without_enc(@src_text.path, 'peer', 'create',
- @path, *hash_kv(keys, true))
+ tk_call_without_enc(@src_text.path, 'peer', 'create', @path)
else
tk_call_without_enc(@src_text.path, 'peer', 'create', @path)
end
diff --git a/ext/tk/lib/tk/textimage.rb b/ext/tk/lib/tk/textimage.rb
index 99027a06fb..fb306a9c17 100644
--- a/ext/tk/lib/tk/textimage.rb
+++ b/ext/tk/lib/tk/textimage.rb
@@ -16,19 +16,19 @@ class TkTextImage<TkObject
@path = TkTextMark.new(@t, tk_call(@t.path, 'index', 'end - 1 chars'))
elsif index.kind_of? TkTextMark
if tk_call_without_enc(@t.path,'index',index.path) == tk_call_without_enc(@t.path,'index','end')
- @path = TkTextMark.new(@t, tk_call_without_enc(@t.path, 'index',
+ @path = TkTextMark.new(@t, tk_call_without_enc(@t.path, 'index',
'end - 1 chars'))
else
- @path = TkTextMark.new(@t, tk_call_without_enc(@t.path, 'index',
+ @path = TkTextMark.new(@t, tk_call_without_enc(@t.path, 'index',
index.path))
end
else
- @path = TkTextMark.new(@t, tk_call_without_enc(@t.path, 'index',
+ @path = TkTextMark.new(@t, tk_call_without_enc(@t.path, 'index',
_get_eval_enc_str(index)))
end
@path.gravity = 'left'
@index = @path.path
- @id = tk_call_without_enc(@t.path, 'image', 'create', @index,
+ @id = tk_call_without_enc(@t.path, 'image', 'create', @index,
*hash_kv(keys, true)).freeze
@path.gravity = 'right'
end
@@ -78,7 +78,7 @@ class TkTextImage<TkObject
end
def image=(value)
- tk_call_without_enc(@t.path, 'image', 'configure', @index, '-image',
+ tk_call_without_enc(@t.path, 'image', 'configure', @index, '-image',
_get_eval_enc_str(value))
#self
value
diff --git a/ext/tk/lib/tk/textmark.rb b/ext/tk/lib/tk/textmark.rb
index d1888c5e54..72c1ce1ab4 100644
--- a/ext/tk/lib/tk/textmark.rb
+++ b/ext/tk/lib/tk/textmark.rb
@@ -9,7 +9,7 @@ class TkTextMark<TkObject
TMarkID_TBL = TkCore::INTERP.create_table
- (Tk_TextMark_ID = ['mark'.freeze, TkUtil.untrust('00000')]).instance_eval{
+ (Tk_TextMark_ID = ['mark'.freeze, '00000'.taint]).instance_eval{
@mutex = Mutex.new
def mutex; @mutex; end
freeze
@@ -25,7 +25,7 @@ class TkTextMark<TkObject
if TMarkID_TBL[tpath]
TMarkID_TBL[tpath][id]? TMarkID_TBL[tpath][id]: id
else
- id
+ id
end
}
end
@@ -46,7 +46,7 @@ class TkTextMark<TkObject
TMarkID_TBL[@tpath] = {} unless TMarkID_TBL[@tpath]
TMarkID_TBL[@tpath][@id] = self
}
- tk_call_without_enc(@t.path, 'mark', 'set', @id,
+ tk_call_without_enc(@t.path, 'mark', 'set', @id,
_get_eval_enc_str(index))
@t._addtag id, self
end
@@ -100,7 +100,7 @@ class TkTextMark<TkObject
end
def set(where)
- tk_call_without_enc(@t.path, 'mark', 'set', @id,
+ tk_call_without_enc(@t.path, 'mark', 'set', @id,
_get_eval_enc_str(where))
self
end
@@ -159,7 +159,7 @@ class TkTextNamedMark<TkTextMark
end
if obj && index
- tk_call_without_enc(parent.path, 'mark', 'set', name,
+ tk_call_without_enc(parent.path, 'mark', 'set', name,
_get_eval_enc_str(index))
end
obj
@@ -175,7 +175,7 @@ class TkTextNamedMark<TkTextMark
@parent = @t = parent
@tpath = parent.path
@path = @id = name
- tk_call_without_enc(@t.path, 'mark', 'set', @id,
+ tk_call_without_enc(@t.path, 'mark', 'set', @id,
_get_eval_enc_str(index)) if index
@t._addtag @id, self
end
diff --git a/ext/tk/lib/tk/texttag.rb b/ext/tk/lib/tk/texttag.rb
index 96692014e4..b08d923ea1 100644
--- a/ext/tk/lib/tk/texttag.rb
+++ b/ext/tk/lib/tk/texttag.rb
@@ -11,7 +11,7 @@ class TkTextTag<TkObject
TTagID_TBL = TkCore::INTERP.create_table
- (Tk_TextTag_ID = ['tag'.freeze, TkUtil.untrust('00000')]).instance_eval{
+ (Tk_TextTag_ID = ['tag'.freeze, '00000'.taint]).instance_eval{
@mutex = Mutex.new
def mutex; @mutex; end
freeze
@@ -26,7 +26,7 @@ class TkTextTag<TkObject
TTagID_TBL.mutex.synchronize{
if TTagID_TBL[tpath]
TTagID_TBL[tpath][id]? TTagID_TBL[tpath][id]: id
- else
+ else
id
end
}
@@ -84,13 +84,13 @@ class TkTextTag<TkObject
end
def add(*indices)
- tk_call_without_enc(@t.path, 'tag', 'add', @id,
+ tk_call_without_enc(@t.path, 'tag', 'add', @id,
*(indices.collect{|idx| _get_eval_enc_str(idx)}))
self
end
def remove(*indices)
- tk_call_without_enc(@t.path, 'tag', 'remove', @id,
+ tk_call_without_enc(@t.path, 'tag', 'remove', @id,
*(indices.collect{|idx| _get_eval_enc_str(idx)}))
self
end
@@ -105,16 +105,16 @@ class TkTextTag<TkObject
end
def nextrange(first, last=None)
- simplelist(tk_call_without_enc(@t.path, 'tag', 'nextrange', @id,
- _get_eval_enc_str(first),
+ simplelist(tk_call_without_enc(@t.path, 'tag', 'nextrange', @id,
+ _get_eval_enc_str(first),
_get_eval_enc_str(last))).collect{|idx|
Tk::Text::IndexString.new(idx)
}
end
def prevrange(first, last=None)
- simplelist(tk_call_without_enc(@t.path, 'tag', 'prevrange', @id,
- _get_eval_enc_str(first),
+ simplelist(tk_call_without_enc(@t.path, 'tag', 'prevrange', @id,
+ _get_eval_enc_str(first),
_get_eval_enc_str(last))).collect{|idx|
Tk::Text::IndexString.new(idx)
}
@@ -129,9 +129,6 @@ class TkTextTag<TkObject
val
end
- def cget_tkstring(key)
- @t.tag_cget_tkstring @id, key
- end
def cget(key)
@t.tag_cget @id, key
end
@@ -145,7 +142,7 @@ class TkTextTag<TkObject
_fromUTF8(tk_call_without_enc(@t.path, 'tag', 'cget', @id, "-#{key}"))
when 'font', 'kanjifont'
#fnt = tk_tcl2ruby(tk_call(@t.path, 'tag', 'cget', @id, "-#{key}"))
- fnt = tk_tcl2ruby(_fromUTF8(tk_call_without_enc(@t.path, 'tag', 'cget',
+ fnt = tk_tcl2ruby(_fromUTF8(tk_call_without_enc(@t.path, 'tag', 'cget',
@id, '-font')))
unless fnt.kind_of?(TkFont)
fnt = tagfontobj(@id, fnt)
@@ -157,7 +154,7 @@ class TkTextTag<TkObject
fnt
end
else
- tk_tcl2ruby(_fromUTF8(tk_call_without_enc(@t.path, 'tag', 'cget',
+ tk_tcl2ruby(_fromUTF8(tk_call_without_enc(@t.path, 'tag', 'cget',
@id, "-#{key}")))
end
end
@@ -230,13 +227,13 @@ class TkTextTag<TkObject
end
def raise(above=None)
- tk_call_without_enc(@t.path, 'tag', 'raise', @id,
+ tk_call_without_enc(@t.path, 'tag', 'raise', @id,
_get_eval_enc_str(above))
self
end
def lower(below=None)
- tk_call_without_enc(@t.path, 'tag', 'lower', @id,
+ tk_call_without_enc(@t.path, 'tag', 'lower', @id,
_get_eval_enc_str(below))
self
end
diff --git a/ext/tk/lib/tk/textwindow.rb b/ext/tk/lib/tk/textwindow.rb
index 49327b2c81..004422e4f3 100644
--- a/ext/tk/lib/tk/textwindow.rb
+++ b/ext/tk/lib/tk/textwindow.rb
@@ -13,14 +13,14 @@ class TkTextWindow<TkObject
#end
@t = parent
if index == 'end' || index == :end
- @path = TkTextMark.new(@t, tk_call_without_enc(@t.path, 'index',
+ @path = TkTextMark.new(@t, tk_call_without_enc(@t.path, 'index',
'end - 1 chars'))
elsif index.kind_of?(TkTextMark)
if tk_call_without_enc(@t.path,'index',index.path) == tk_call_without_enc(@t.path,'index','end')
- @path = TkTextMark.new(@t, tk_call_without_enc(@t.path, 'index',
+ @path = TkTextMark.new(@t, tk_call_without_enc(@t.path, 'index',
'end - 1 chars'))
else
- @path = TkTextMark.new(@t, tk_call_without_enc(@t.path, 'index',
+ @path = TkTextMark.new(@t, tk_call_without_enc(@t.path, 'index',
index.path))
end
else
@@ -49,7 +49,7 @@ class TkTextWindow<TkObject
keys['create'] = install_cmd(proc{@id = @p_create.call; _epath(@id)})
end
end
- tk_call_without_enc(@t.path, 'window', 'create', @index,
+ tk_call_without_enc(@t.path, 'window', 'create', @index,
*hash_kv(keys, true))
@path.gravity = 'right'
end
@@ -80,7 +80,7 @@ class TkTextWindow<TkObject
if slot.kind_of?(Hash)
slot = _symbolkey2str(slot)
if slot['window']
- @id = slot['window']
+ @id = slot['window']
# slot['window'] = @id.epath if @id.kind_of?(TkWindow)
slot['window'] = _epath(@id) if @id
end
@@ -88,19 +88,19 @@ class TkTextWindow<TkObject
self.create=slot.delete('create')
end
if slot.size > 0
- tk_call_without_enc(@t.path, 'window', 'configure', @index,
+ tk_call_without_enc(@t.path, 'window', 'configure', @index,
*hash_kv(slot, true))
end
else
if slot == 'window' || slot == :window
- @id = value
+ @id = value
# value = @id.epath if @id.kind_of?(TkWindow)
value = _epath(@id) if @id
end
if slot == 'create' || slot == :create
self.create=value
else
- tk_call_without_enc(@t.path, 'window', 'configure', @index,
+ tk_call_without_enc(@t.path, 'window', 'configure', @index,
"-#{slot}", _get_eval_enc_str(value))
end
end
@@ -123,7 +123,7 @@ class TkTextWindow<TkObject
@id = value
# value = @id.epath if @id.kind_of?(TkWindow)
value = _epath(@id) if @id
- tk_call_without_enc(@t.path, 'window', 'configure', @index,
+ tk_call_without_enc(@t.path, 'window', 'configure', @index,
'-window', _get_eval_enc_str(value))
value
end
@@ -145,7 +145,7 @@ class TkTextWindow<TkObject
end
})
end
- tk_call_without_enc(@t.path, 'window', 'configure', @index,
+ tk_call_without_enc(@t.path, 'window', 'configure', @index,
'-create', _get_eval_enc_str(value))
value
end
diff --git a/ext/tk/lib/tk/timer.rb b/ext/tk/lib/tk/timer.rb
index ddfbfce9be..91840d0575 100644
--- a/ext/tk/lib/tk/timer.rb
+++ b/ext/tk/lib/tk/timer.rb
@@ -11,13 +11,13 @@ class TkTimer
TkCommandNames = ['after'.freeze].freeze
- (Tk_CBID = ['a'.freeze, TkUtil.untrust('00000')]).instance_eval{
+ (Tk_CBID = ['a'.freeze, '00000'.taint]).instance_eval{
@mutex = Mutex.new
def mutex; @mutex; end
freeze
}
- Tk_CBTBL = TkUtil.untrust({})
+ Tk_CBTBL = {}.taint
TkCore::INTERP.add_tk_procs('rb_after', 'id', <<-'EOL')
if {[set st [catch {eval {ruby_cmd TkTimer callback} $id} ret]] != 0} {
@@ -76,7 +76,7 @@ class TkTimer
rescue Interrupt
exit!(1)
rescue Exception => e
- if @cancel_on_exception &&
+ if @cancel_on_exception &&
@cancel_on_exception.find{|exc| e.kind_of?(exc)}
cancel
@return_value = e
@@ -180,12 +180,12 @@ class TkTimer
@after_script = nil
@cancel_on_exception = DEFAULT_IGNORE_EXCEPTIONS
- # Unless @cancel_on_exception, Ruby/Tk shows an error dialog box when
- # an excepsion is raised on TkTimer callback procedure.
- # If @cancel_on_exception is an array of exception classes and the raised
- # exception is included in the array, Ruby/Tk cancels executing TkTimer
- # callback procedures silently (TkTimer#cancel is called and no dialog is
- # shown).
+ # Unless @cancel_on_exception, Ruby/Tk shows an error dialog box when
+ # an excepsion is raised on TkTimer callback procedure.
+ # If @cancel_on_exception is an array of exception classes and the raised
+ # exception is included in the array, Ruby/Tk cancels executing TkTimer
+ # callback procedures silently (TkTimer#cancel is called and no dialog is
+ # shown).
if b
case args.size
@@ -229,7 +229,7 @@ class TkTimer
end
def current_status
- [@running, @current_sleep, @current_proc, @current_args,
+ [@running, @current_sleep, @current_proc, @current_args,
@do_loop, @cancel_on_exception]
end
@@ -428,7 +428,7 @@ class TkTimer
def restart(*restart_args, &b)
cancel if @running
- if restart_args.empty? && !b
+ if restart_args == [] && !b
start(@init_sleep, @init_proc, *@init_args)
else
start(*restart_args, &b)
@@ -484,11 +484,11 @@ class TkTimer
def at_end(*arg, &b)
if arg.empty?
- if b
+ if b
@at_end_proc = b
- else
+ else
# no proc
- return @at_end_proc
+ return @at_end_proc
end
else
fail ArgumentError, "wrong number of arguments" if arg.length != 1 || b
@@ -504,17 +504,17 @@ class TkTimer
unless @running
if @return_value.kind_of?(Exception)
- fail @return_value
+ fail @return_value
else
- return @return_value
+ return @return_value
end
end
@wait_var.wait(on_thread, check_root)
if @return_value.kind_of?(Exception)
- fail @return_value
+ fail @return_value
else
- @return_value
+ @return_value
end
end
def eventloop_wait(check_root = false)
@@ -628,12 +628,12 @@ class TkRTTimer < TkTimer
if @est_time
@est_time = Time.at(@est_time.to_i, @est_time.usec + sleep*1000)
else
- @est_time = Time.at(@cb_start_time.to_i,
+ @est_time = Time.at(@cb_start_time.to_i,
@cb_start_time.usec + sleep*1000)
end
now = Time.now
- real_sleep = ((@est_time.to_i - now.to_i + @offset_s)*1000.0 +
+ real_sleep = ((@est_time.to_i - now.to_i + @offset_s)*1000.0 +
(@est_time.usec - now.usec + @offset_u)/1000.0).round
if real_sleep <= 0
real_sleep = 0
@@ -653,7 +653,7 @@ class TkRTTimer < TkTimer
if @current_sleep == 0
@offset_list.push([
- @offset_s - @cb_start_time.to_i,
+ @offset_s - @cb_start_time.to_i,
@offset_u - @cb_start_time.usec
])
else
diff --git a/ext/tk/lib/tk/toplevel.rb b/ext/tk/lib/tk/toplevel.rb
index 30ef009517..bd6e8307f5 100644
--- a/ext/tk/lib/tk/toplevel.rb
+++ b/ext/tk/lib/tk/toplevel.rb
@@ -11,7 +11,7 @@ class Tk::Toplevel<TkWindow
TkCommandNames = ['toplevel'.freeze].freeze
WidgetClassName = 'Toplevel'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
################# old version
# def initialize(parent=nil, screen=nil, classname=nil, keys=nil)
@@ -38,7 +38,7 @@ class Tk::Toplevel<TkWindow
# s << "-class" << @classname if @classname
# s << "-colormap" << @colormap if @colormap
# s << "-container" << @container if @container
-# s << "-screen" << @screen if @screen
+# s << "-screen" << @screen if @screen
# s << "-use" << @use if @use
# s << "-visual" << @visual if @visual
# tk_call 'toplevel', @path, *s
@@ -113,7 +113,7 @@ class Tk::Toplevel<TkWindow
@use = keys['use']
@visual = keys['visual']
if !@classname && my_class_name
- keys['class'] = @classname = my_class_name
+ keys['class'] = @classname = my_class_name
end
if @classname.kind_of? TkBindTag
@db_class = @classname
@@ -127,7 +127,7 @@ class Tk::Toplevel<TkWindow
end
keys, cmds = _wm_command_option_chk(keys)
super(keys)
- cmds.each{|k,v|
+ cmds.each{|k,v|
if v.kind_of? Array
self.__send__(k,*v)
else
@@ -162,7 +162,7 @@ class Tk::Toplevel<TkWindow
keys = {}
end
if !@classname && my_class_name
- keys['class'] = @classname = my_class_name
+ keys['class'] = @classname = my_class_name
end
if @classname.kind_of? TkBindTag
@db_class = @classname
@@ -176,7 +176,7 @@ class Tk::Toplevel<TkWindow
end
keys, cmds = _wm_command_option_chk(keys)
super(parent, keys)
- cmds.each{|k,v|
+ cmds.each{|k,v|
if v.kind_of? Array
self.send(k,*v)
else
@@ -200,8 +200,8 @@ class Tk::Toplevel<TkWindow
def add_menu(menu_info, tearoff=false, opts=nil)
# See tk/menuspec.rb for menu_info.
- # opts is a hash of default configs for all of cascade menus.
- # Configs of menu_info can override it.
+ # opts is a hash of default configs for all of cascade menus.
+ # Configs of menu_info can override it.
if tearoff.kind_of?(Hash)
opts = tearoff
tearoff = false
@@ -212,7 +212,7 @@ class Tk::Toplevel<TkWindow
def add_menubar(menu_spec, tearoff=false, opts=nil)
# See tk/menuspec.rb for menu_spec.
# opts is a hash of default configs for all of cascade menus.
- # Configs of menu_spec can override it.
+ # Configs of menu_spec can override it.
menu_spec.each{|info| add_menu(info, tearoff, opts)}
self.menu
end
@@ -259,6 +259,4 @@ class Tk::Toplevel<TkWindow
end
#TkToplevel = Tk::Toplevel unless Object.const_defined? :TkToplevel
-#Tk.__set_toplevel_aliases__(:Tk, Tk::Toplevel, :TkToplevel)
-Tk.__set_loaded_toplevel_aliases__('tk/toplevel.rb', :Tk, Tk::Toplevel,
- :TkToplevel)
+Tk.__set_toplevel_aliases__(:Tk, Tk::Toplevel, :TkToplevel)
diff --git a/ext/tk/lib/tk/ttk_selector.rb b/ext/tk/lib/tk/ttk_selector.rb
index 522249e6a9..72ed637a38 100644
--- a/ext/tk/lib/tk/ttk_selector.rb
+++ b/ext/tk/lib/tk/ttk_selector.rb
@@ -5,92 +5,70 @@
# toplevel classes/modules
module Tk
@TOPLEVEL_ALIAS_TABLE[:Ttk] = {
- :TkButton => 'tkextlib/tile/tbutton',
+ :TkButton => 'tkextlib/tile/tbutton',
- :TkCheckbutton => 'tkextlib/tile/tcheckbutton',
- :TkCheckButton => 'tkextlib/tile/tcheckbutton',
+ :TkCheckbutton => 'tkextlib/tile/tcheckbutton',
+ :TkCheckButton => 'tkextlib/tile/tcheckbutton',
- # :TkDialog => 'tkextlib/tile/dialog',
+ # :TkDialog => 'tkextlib/tile/dialog',
- :TkEntry => 'tkextlib/tile/tentry',
+ :TkEntry => 'tkextlib/tile/tentry',
- :TkCombobox => 'tkextlib/tile/tcombobox',
+ :TkCombobox => 'tkextlib/tile/tcombobox',
- :TkFrame => 'tkextlib/tile/tframe',
+ :TkFrame => 'tkextlib/tile/tframe',
- :TkLabel => 'tkextlib/tile/tlabel',
+ :TkLabel => 'tkextlib/tile/tlabel',
- :TkLabelframe => 'tkextlib/tile/tlabelframe',
- :TkLabelFrame => 'tkextlib/tile/tlabelframe',
+ :TkLabelframe => 'tkextlib/tile/tlabelframe',
+ :TkLabelFrame => 'tkextlib/tile/tlabelframe',
- :TkMenubutton => 'tkextlib/tile/tmenubutton',
- :TkMenuButton => 'tkextlib/tile/tmenubutton',
+ :TkMenubutton => 'tkextlib/tile/tmenubutton',
+ :TkMenuButton => 'tkextlib/tile/tmenubutton',
- :TkNotebook => 'tkextlib/tile/tnotebook',
+ :TkNotebook => 'tkextlib/tile/tnotebook',
- # :TkPaned => 'tkextlib/tile/tpaned',
- :TkPanedwindow => 'tkextlib/tile/tpaned',
- :TkPanedWindow => 'tkextlib/tile/tpaned',
+ # :TkPaned => 'tkextlib/tile/tpaned',
+ :TkPanedwindow => 'tkextlib/tile/tpaned',
+ :TkPanedWindow => 'tkextlib/tile/tpaned',
- :TkProgressbar => 'tkextlib/tile/tprogressbar',
+ :TkProgressbar => 'tkextlib/tile/tprogressbar',
- :TkRadiobutton => 'tkextlib/tile/tradiobutton',
- :TkRadioButton => 'tkextlib/tile/tradiobutton',
+ :TkRadiobutton => 'tkextlib/tile/tradiobutton',
+ :TkRadioButton => 'tkextlib/tile/tradiobutton',
- :TkScale => 'tkextlib/tile/tscale',
- # :TkProgress => 'tkextlib/tile/tscale',
+ :TkScale => 'tkextlib/tile/tscale',
+ # :TkProgress => 'tkextlib/tile/tscale',
- :TkScrollbar => 'tkextlib/tile/tscrollbar',
- :TkXScrollbar => 'tkextlib/tile/tscrollbar',
- :TkYScrollbar => 'tkextlib/tile/tscrollbar',
+ :TkScrollbar => 'tkextlib/tile/tscrollbar',
+ :TkXScrollbar => 'tkextlib/tile/tscrollbar',
+ :TkYScrollbar => 'tkextlib/tile/tscrollbar',
- :TkSeparator => 'tkextlib/tile/tseparator',
+ :TkSeparator => 'tkextlib/tile/tseparator',
- :TkSizeGrip => 'tkextlib/tile/sizegrip',
- :TkSizegrip => 'tkextlib/tile/sizegrip',
+ :TkSizeGrip => 'tkextlib/tile/sizegrip',
+ :TkSizegrip => 'tkextlib/tile/sizegrip',
- # :TkSquare => 'tkextlib/tile/tsquare',
+ # :TkSquare => 'tkextlib/tile/tsquare',
- :TkTreeview => 'tkextlib/tile/treeview',
+ :TkTreeview => 'tkextlib/tile/treeview',
}
-
- # @TOPLEVEL_ALIAS_TABLE[:Tile] = @TOPLEVEL_ALIAS_TABLE[:Ttk]
- Tk.__create_widget_set__(:Tile, :Ttk)
-
- ############################################
- # depend on the version of Tcl/Tk
- major, minor, type, patchlevel = TclTkLib.get_version
-
- # ttk::spinbox is supported on Tcl/Tk8.6b1 or later
- if ([major,minor,type,patchlevel] <=>
- [8,6,TclTkLib::RELEASE_TYPE::BETA,1]) >= 0
- @TOPLEVEL_ALIAS_TABLE[:Ttk].update(
- :TkSpinbox => 'tkextlib/tile/tspinbox'
- )
- end
+ @TOPLEVEL_ALIAS_TABLE[:Tile] = @TOPLEVEL_ALIAS_TABLE[:Ttk]
################################################
# register some Ttk widgets as default
# (Ttk is a standard library on Tcl/Tk8.5+)
@TOPLEVEL_ALIAS_TABLE[:Ttk].each{|sym, file|
- #unless Tk::TOPLEVEL_ALIASES.autoload?(sym) || Tk::TOPLEVEL_ALIASES.const_defined?(sym)
- # @TOPLEVEL_ALIAS_OWNER[sym] = :Ttk
- # Tk::TOPLEVEL_ALIASES.autoload(sym, file)
- #end
- Tk.__regist_toplevel_aliases__(:Ttk, file, sym)
+ unless Object.autoload?(sym) || Object.const_defined?(sym)
+ Object.autoload(sym, file)
+ end
}
################################################
- # @TOPLEVEL_ALIAS_SETUP_PROC[:Tile] =
- # @TOPLEVEL_ALIAS_SETUP_PROC[:Ttk] = proc{|mod|
- # unless Tk.autoload?(:Tile) || Tk.const_defined?(:Tile)
- # Object.autoload :Ttk, 'tkextlib/tile'
- # Tk.autoload :Tile, 'tkextlib/tile'
- # end
- # }
- Tk.__toplevel_alias_setup_proc__(:Ttk, :Tile){|mod|
- unless Tk.autoload?(:Tile) || Tk.const_defined?(:Tile)
+ @TOPLEVEL_ALIAS_SETUP_PROC[:Tile] =
+ @TOPLEVEL_ALIAS_SETUP_PROC[:Ttk] = proc{|mod|
+ unless Tk.autoload?(:Tile) || Tk.const_defined?(:Tile)
Object.autoload :Ttk, 'tkextlib/tile'
Tk.autoload :Tile, 'tkextlib/tile'
end
diff --git a/ext/tk/lib/tk/validation.rb b/ext/tk/lib/tk/validation.rb
index 0ebd5c51b7..60bd433cdc 100644
--- a/ext/tk/lib/tk/validation.rb
+++ b/ext/tk/lib/tk/validation.rb
@@ -211,21 +211,21 @@ class TkValidateCommand
class ValidateArgs < TkUtil::CallbackSubst
KEY_TBL = [
- [ ?d, ?n, :action ],
- [ ?i, ?x, :index ],
- [ ?s, ?e, :current ],
- [ ?v, ?s, :type ],
- [ ?P, ?e, :value ],
- [ ?S, ?e, :string ],
- [ ?V, ?s, :triggered ],
- [ ?W, ?w, :widget ],
+ [ ?d, ?n, :action ],
+ [ ?i, ?x, :index ],
+ [ ?s, ?e, :current ],
+ [ ?v, ?s, :type ],
+ [ ?P, ?e, :value ],
+ [ ?S, ?e, :string ],
+ [ ?V, ?s, :triggered ],
+ [ ?W, ?w, :widget ],
nil
]
PROC_TBL = [
- [ ?n, TkComm.method(:number) ],
- [ ?s, TkComm.method(:string) ],
- [ ?w, TkComm.method(:window) ],
+ [ ?n, TkComm.method(:number) ],
+ [ ?s, TkComm.method(:string) ],
+ [ ?w, TkComm.method(:window) ],
[ ?e, proc{|val|
#enc = Tk.encoding
@@ -236,7 +236,7 @@ class TkValidateCommand
TkComm::string(val)
end
}
- ],
+ ],
[ ?x, proc{|val|
idx = TkComm::number(val)
@@ -246,7 +246,7 @@ class TkValidateCommand
idx
end
}
- ],
+ ],
nil
]
@@ -272,7 +272,7 @@ class TkValidateCommand
_setup_subst_table(KEY_TBL, PROC_TBL);
#
- # NOTE: The order of parameters which passed to callback procedure is
+ # NOTE: The order of parameters which passed to callback procedure is
# <extra_arg>, <extra_arg>, ... , <subst_arg>, <subst_arg>, ...
#
diff --git a/ext/tk/lib/tk/variable.rb b/ext/tk/lib/tk/variable.rb
index 6fc2ffdf2f..f738a96ee7 100644
--- a/ext/tk/lib/tk/variable.rb
+++ b/ext/tk/lib/tk/variable.rb
@@ -16,7 +16,7 @@ class TkVariable
#TkVar_ID_TBL = {}
TkVar_CB_TBL = TkCore::INTERP.create_table
TkVar_ID_TBL = TkCore::INTERP.create_table
- (Tk_VARIABLE_ID = ["v".freeze, TkUtil.untrust("00000")]).instance_eval{
+ (Tk_VARIABLE_ID = ["v".freeze, "00000".taint]).instance_eval{
@mutex = Mutex.new
def mutex; @mutex; end
freeze
@@ -26,10 +26,10 @@ class TkVariable
TkVar_ID_TBL.mutex.synchronize{ TkVar_ID_TBL.clear }
}
- major, minor, type, patchlevel = TclTkLib.get_version
+ major, minor, type, type_name, patchlevel = TclTkLib.get_version
USE_OLD_TRACE_OPTION_STYLE = (major < 8) || (major == 8 && minor < 4)
- #TkCore::INTERP.add_tk_procs('rb_var', 'args',
+ #TkCore::INTERP.add_tk_procs('rb_var', 'args',
# "ruby [format \"TkVariable.callback %%Q!%s!\" $args]")
TkCore::INTERP.add_tk_procs('rb_var', 'args', <<-'EOL')
if {[set st [catch {eval {ruby_cmd TkVariable callback} $args} ret]] != 0} {
@@ -65,10 +65,10 @@ class TkVariable
exit!(1)
rescue Exception => e
begin
- msg = _toUTF8(e.class.inspect) + ': ' +
- _toUTF8(e.message) + "\n" +
- "\n---< backtrace of Ruby side >-----\n" +
- _toUTF8(e.backtrace.join("\n")) +
+ msg = _toUTF8(e.class.inspect) + ': ' +
+ _toUTF8(e.message) + "\n" +
+ "\n---< backtrace of Ruby side >-----\n" +
+ _toUTF8(e.backtrace.join("\n")) +
"\n---< backtrace of Tk side >-------"
if TkCore::WITH_ENCODING
msg.force_encoding('utf-8')
@@ -76,9 +76,9 @@ class TkVariable
msg.instance_variable_set(:@encoding, 'utf-8')
end
rescue Exception
- msg = e.class.inspect + ': ' + e.message + "\n" +
- "\n---< backtrace of Ruby side >-----\n" +
- e.backtrace.join("\n") +
+ msg = e.class.inspect + ': ' + e.message + "\n" +
+ "\n---< backtrace of Ruby side >-----\n" +
+ e.backtrace.join("\n") +
"\n---< backtrace of Tk side >-------"
end
fail(e, msg)
@@ -94,7 +94,7 @@ class TkVariable
_get_eval_string(TkVar_CB_TBL[name1].trace_callback(name2,op))
rescue
trace = $!.backtrace
- raise $!, "\n#{trace[0]}: #{$!.message} (#{$!.class})\n" +
+ raise $!, "\n#{trace[0]}: #{$!.message} (#{$!.class})\n" +
"\tfrom #{trace[1..pos].join("\n\tfrom ")}"
end
=end
@@ -112,7 +112,7 @@ class TkVariable
end
#
- # default_value is available only when the variable is an assoc array.
+ # default_value is available only when the variable is an assoc array.
#
def default_value(val=nil, &b)
if b
@@ -322,7 +322,7 @@ class TkVariable
=begin
if val == []
- # INTERP._eval(format('global %s; set %s(0) 0; unset %s(0)',
+ # INTERP._eval(format('global %s; set %s(0) 0; unset %s(0)',
# @id, @id, @id))
elsif val.kind_of?(Array)
a = []
@@ -370,7 +370,7 @@ class TkVariable
else
INTERP._thread_vwait(@id)
end
- else
+ else
if check_root
INTERP._invoke_without_enc('tkwait', 'variable', @id)
else
@@ -421,7 +421,7 @@ class TkVariable
else
# array
index = elems.collect{|idx| _get_eval_string(idx, true)}.join(',')
- TkComm.bool(tk_call('info', 'exist', "#{@id}")) &&
+ TkComm.bool(tk_call('info', 'exist', "#{@id}")) &&
TkComm.bool(tk_call('info', 'exist', "#{@id}(#{index})"))
end
end
@@ -433,7 +433,7 @@ class TkVariable
#tk_split_simplelist(INTERP._eval("global #{@id}; array get #{@id}"))
INTERP._invoke_without_enc('global', @id)
#tk_split_simplelist(INTERP._fromUTF8(INTERP._invoke_without_enc('array', 'names', @id)))
- tk_split_simplelist(INTERP._invoke_without_enc('array', 'names', @id),
+ tk_split_simplelist(INTERP._invoke_without_enc('array', 'names', @id),
false, true)
end
@@ -484,9 +484,9 @@ if USE_TCLs_SET_VARIABLE_FUNCTIONS
if val.kind_of?(Hash)
self.clear
val.each{|k, v|
- #INTERP._set_global_var2(@id, _toUTF8(_get_eval_string(k)),
+ #INTERP._set_global_var2(@id, _toUTF8(_get_eval_string(k)),
# _toUTF8(_get_eval_string(v)))
- INTERP._set_global_var2(@id, _get_eval_string(k, true),
+ INTERP._set_global_var2(@id, _get_eval_string(k, true),
_get_eval_string(v, true))
}
self.value
@@ -494,11 +494,11 @@ if USE_TCLs_SET_VARIABLE_FUNCTIONS
=begin
INTERP._set_global_var(@id, '')
val.each{|v|
- #INTERP._set_variable(@id, _toUTF8(_get_eval_string(v)),
- INTERP._set_variable(@id, _get_eval_string(v, true),
- TclTkLib::VarAccessFlag::GLOBAL_ONLY |
+ #INTERP._set_variable(@id, _toUTF8(_get_eval_string(v)),
+ INTERP._set_variable(@id, _get_eval_string(v, true),
+ TclTkLib::VarAccessFlag::GLOBAL_ONLY |
TclTkLib::VarAccessFlag::LEAVE_ERR_MSG |
- TclTkLib::VarAccessFlag::APPEND_VALUE |
+ TclTkLib::VarAccessFlag::APPEND_VALUE |
TclTkLib::VarAccessFlag::LIST_ELEMENT)
}
self.value
@@ -535,9 +535,9 @@ if USE_TCLs_SET_VARIABLE_FUNCTIONS
val = val._value if !type && type != :variable && val.kind_of?(TkVariable)
index = args.collect{|idx| _get_eval_string(idx, true)}.join(',')
_fromUTF8(INTERP._set_global_var2(@id, index, _get_eval_string(val, true)))
- #_fromUTF8(INTERP._set_global_var2(@id, _toUTF8(_get_eval_string(index)),
+ #_fromUTF8(INTERP._set_global_var2(@id, _toUTF8(_get_eval_string(index)),
# _toUTF8(_get_eval_string(val))))
- #_fromUTF8(INTERP._set_global_var2(@id, _get_eval_string(index, true),
+ #_fromUTF8(INTERP._set_global_var2(@id, _get_eval_string(index, true),
# _get_eval_string(val, true)))
end
@@ -562,7 +562,7 @@ else
#INTERP._eval(Kernel.format('set %s', @id))
#INTERP._invoke_without_enc('set', @id)
rescue
- if INTERP._eval(Kernel.format('global %s; array exists %s',
+ if INTERP._eval(Kernel.format('global %s; array exists %s',
@id, @id)) != "1"
#if INTERP._eval(Kernel.format('array exists %s', @id)) != "1"
#if INTERP._invoke_without_enc('array', 'exists', @id) != "1"
@@ -583,7 +583,7 @@ else
#INTERP._eval(Kernel.format('set %s %s', @id, s))
#_fromUTF8(INTERP._invoke_without_enc('set', @id, _toUTF8(s)))
rescue
- if INTERP._eval(Kernel.format('global %s; array exists %s',
+ if INTERP._eval(Kernel.format('global %s; array exists %s',
@id, @id)) != "1"
#if INTERP._eval(Kernel.format('array exists %s', @id)) != "1"
#if INTERP._invoke_without_enc('array', 'exists', @id) != "1"
@@ -591,7 +591,7 @@ else
else
if val == []
INTERP._eval(Kernel.format('global %s; unset %s; set %s(0) 0; unset %s(0)', @id, @id, @id, @id))
- #INTERP._eval(Kernel.format('unset %s; set %s(0) 0; unset %s(0)',
+ #INTERP._eval(Kernel.format('unset %s; set %s(0) 0; unset %s(0)',
# @id, @id, @id))
#INTERP._invoke_without_enc('unset', @id)
#INTERP._invoke_without_enc('set', @id+'(0)', 0)
@@ -601,9 +601,9 @@ else
val.each_with_index{|e,i| a.push(i); a.push(array2tk_list(e, true))}
#s = '"' + a.join(" ").gsub(/[\[\]$"]/, '\\\\\&') + '"'
s = '"' + a.join(" ").gsub(/[\[\]$"\\]/, '\\\\\&') + '"'
- INTERP._eval(Kernel.format('global %s; unset %s; array set %s %s',
+ INTERP._eval(Kernel.format('global %s; unset %s; array set %s %s',
@id, @id, @id, s))
- #INTERP._eval(Kernel.format('unset %s; array set %s %s',
+ #INTERP._eval(Kernel.format('unset %s; array set %s %s',
# @id, @id, s))
#INTERP._invoke_without_enc('unset', @id)
#_fromUTF8(INTERP._invoke_without_enc('array','set', @id, _toUTF8(s)))
@@ -612,9 +612,9 @@ else
# .gsub(/[\[\]$"]/, '\\\\\&') + '"'
s = '"' + val.to_a.collect{|e| array2tk_list(e, true)}.join(" ")\
.gsub(/[\[\]$\\"]/, '\\\\\&') + '"'
- INTERP._eval(Kernel.format('global %s; unset %s; array set %s %s',
+ INTERP._eval(Kernel.format('global %s; unset %s; array set %s %s',
@id, @id, @id, s))
- #INTERP._eval(Kernel.format('unset %s; array set %s %s',
+ #INTERP._eval(Kernel.format('unset %s; array set %s %s',
# @id, @id, s))
#INTERP._invoke_without_enc('unset', @id)
#_fromUTF8(INTERP._invoke_without_enc('array','set', @id, _toUTF8(s)))
@@ -640,7 +640,7 @@ else
end
end
#INTERP._eval(Kernel.format('global %s; set %s(%s)', @id, @id, index))
- #INTERP._eval(Kernel.format('global %s; set %s(%s)',
+ #INTERP._eval(Kernel.format('global %s; set %s(%s)',
# @id, @id, _get_eval_string(index)))
#INTERP._eval(Kernel.format('set %s(%s)', @id, _get_eval_string(index)))
#INTERP._eval('set ' + @id + '(' + _get_eval_string(index) + ')')
@@ -651,13 +651,13 @@ else
type = default_element_value_type(args)
val = val._value if !type && type != :variable && val.kind_of?(TkVariable)
index = args.collect{|idx| _get_eval_string(idx)}.join(',')
- INTERP._eval(Kernel.format('global %s; set %s(%s) %s', @id, @id,
+ INTERP._eval(Kernel.format('global %s; set %s(%s) %s', @id, @id,
index, _get_eval_string(val)))
- #INTERP._eval(Kernel.format('global %s; set %s(%s) %s', @id, @id,
+ #INTERP._eval(Kernel.format('global %s; set %s(%s) %s', @id, @id,
# _get_eval_string(index), _get_eval_string(val)))
- #INTERP._eval(Kernel.format('set %s(%s) %s', @id,
+ #INTERP._eval(Kernel.format('set %s(%s) %s', @id,
# _get_eval_string(index), _get_eval_string(val)))
- #INTERP._eval('set ' + @id + '(' + _get_eval_string(index) + ') ' +
+ #INTERP._eval('set ' + @id + '(' + _get_eval_string(index) + ') ' +
# _get_eval_string(val))
end
@@ -669,7 +669,7 @@ else
else
index = elems.collect{|idx| _get_eval_string(idx, true)}.join(',')
INTERP._eval(Kernel.format('global %s; unset %s(%s)', @id, @id, index))
- #INTERP._eval(Kernel.format('global %s; unset %s(%s)',
+ #INTERP._eval(Kernel.format('global %s; unset %s(%s)',
# @id, @id, _get_eval_string(elem)))
#INTERP._eval(Kernel.format('unset %s(%s)', @id, tk_tcl2ruby(elem)))
#INTERP._eval('unset ' + @id + '(' + _get_eval_string(elem) + ')')
@@ -1239,14 +1239,6 @@ end
end
end
- def ===(other)
- if other.kind_of?(TkVariable)
- self.id == other.id
- else
- super
- end
- end
-
def zero?
numeric.zero?
end
@@ -1356,10 +1348,10 @@ end
TkVar_CB_TBL[@id] = self
@trace_opts = opts
if USE_OLD_TRACE_OPTION_STYLE
- Tk.tk_call_without_enc('trace', 'variable',
+ Tk.tk_call_without_enc('trace', 'variable',
@id, @trace_opts, 'rb_var ' << @id)
else
- Tk.tk_call_without_enc('trace', 'add', 'variable',
+ Tk.tk_call_without_enc('trace', 'add', 'variable',
@id, @trace_opts, 'rb_var ' << @id)
end
else
@@ -1367,19 +1359,19 @@ end
if USE_OLD_TRACE_OPTION_STYLE
opts.each_byte{|c| newopts.concat(c.chr) unless newopts.index(c.chr)}
if newopts != @trace_opts
- Tk.tk_call_without_enc('trace', 'vdelete',
+ Tk.tk_call_without_enc('trace', 'vdelete',
@id, @trace_opts, 'rb_var ' << @id)
@trace_opts.replace(newopts)
- Tk.tk_call_without_enc('trace', 'variable',
+ Tk.tk_call_without_enc('trace', 'variable',
@id, @trace_opts, 'rb_var ' << @id)
end
else
newopts |= opts
unless (newopts - @trace_opts).empty?
- Tk.tk_call_without_enc('trace', 'remove', 'variable',
+ Tk.tk_call_without_enc('trace', 'remove', 'variable',
@id, @trace_opts, 'rb_var ' << @id)
@trace_opts.replace(newopts)
- Tk.tk_call_without_enc('trace', 'add', 'variable',
+ Tk.tk_call_without_enc('trace', 'add', 'variable',
@id, @trace_opts, 'rb_var ' << @id)
end
end
@@ -1390,7 +1382,7 @@ end
def trace_element(elem, opts, cmd = Proc.new)
if @elem
- fail(RuntimeError,
+ fail(RuntimeError,
"invalid for a TkVariable which denotes an element of Tcl's array")
end
@@ -1402,10 +1394,10 @@ end
TkVar_CB_TBL[@id] = self
@trace_opts = opts
if USE_OLD_TRACE_OPTION_STYLE
- Tk.tk_call_without_enc('trace', 'add', 'variable',
+ Tk.tk_call_without_enc('trace', 'add', 'variable',
@id, @trace_opts, 'rb_var ' << @id)
else
- Tk.tk_call_without_enc('trace', 'variable',
+ Tk.tk_call_without_enc('trace', 'variable',
@id, @trace_opts, 'rb_var ' << @id)
end
else
@@ -1413,19 +1405,19 @@ end
if USE_OLD_TRACE_OPTION_STYLE
opts.each_byte{|c| newopts.concat(c.chr) unless newopts.index(c.chr)}
if newopts != @trace_opts
- Tk.tk_call_without_enc('trace', 'vdelete',
+ Tk.tk_call_without_enc('trace', 'vdelete',
@id, @trace_opts, 'rb_var ' << @id)
@trace_opts.replace(newopts)
- Tk.tk_call_without_enc('trace', 'variable',
+ Tk.tk_call_without_enc('trace', 'variable',
@id, @trace_opts, 'rb_var ' << @id)
end
else
newopts |= opts
unless (newopts - @trace_opts).empty?
- Tk.tk_call_without_enc('trace', 'remove', 'variable',
+ Tk.tk_call_without_enc('trace', 'remove', 'variable',
@id, @trace_opts, 'rb_var ' << @id)
@trace_opts.replace(newopts)
- Tk.tk_call_without_enc('trace', 'add', 'variable',
+ Tk.tk_call_without_enc('trace', 'add', 'variable',
@id, @trace_opts, 'rb_var ' << @id)
end
end
@@ -1442,7 +1434,7 @@ end
def trace_info_for_element(elem)
if @elem
- fail(RuntimeError,
+ fail(RuntimeError,
"invalid for a TkVariable which denotes an element of Tcl's array")
end
return [] unless @trace_elem
@@ -1476,7 +1468,7 @@ end
else
newopts = []
@trace_var.each_with_index{|e, i|
- if idx < 0 && e[1] == cmd &&
+ if idx < 0 && e[1] == cmd &&
e[0].size == opts.size && (e[0] - opts).empty?
# find
idx = i
@@ -1487,7 +1479,7 @@ end
end
if idx >= 0
- @trace_var.delete_at(idx)
+ @trace_var.delete_at(idx)
else
return self
end
@@ -1506,21 +1498,21 @@ end
diff = false
@trace_opts.each_byte{|c| break if (diff = ! newopts.index(c))}
if diff
- Tk.tk_call_without_enc('trace', 'vdelete',
+ Tk.tk_call_without_enc('trace', 'vdelete',
@id, @trace_opts, 'rb_var ' << @id)
@trace_opts.replace(newopts)
unless @trace_opts.empty?
- Tk.tk_call_without_enc('trace', 'variable',
+ Tk.tk_call_without_enc('trace', 'variable',
@id, @trace_opts, 'rb_var ' << @id)
end
end
else
unless (@trace_opts - newopts).empty?
- Tk.tk_call_without_enc('trace', 'remove', 'variable',
+ Tk.tk_call_without_enc('trace', 'remove', 'variable',
@id, @trace_opts, 'rb_var ' << @id)
@trace_opts.replace(newopts)
unless @trace_opts.empty?
- Tk.tk_call_without_enc('trace', 'add', 'variable',
+ Tk.tk_call_without_enc('trace', 'add', 'variable',
@id, @trace_opts, 'rb_var ' << @id)
end
end
@@ -1533,7 +1525,7 @@ end
def trace_remove_for_element(elem,opts,cmd)
if @elem
- fail(RuntimeError,
+ fail(RuntimeError,
"invalid for a TkVariable which denotes an element of Tcl's array")
end
return self unless @trace_elem.kind_of? Hash
@@ -1558,7 +1550,7 @@ end
}
else
@trace_elem[elem].each_with_index{|e, i|
- if idx < 0 && e[1] == cmd &&
+ if idx < 0 && e[1] == cmd &&
e[0].size == opts.size && (e[0] - opts).empty?
# find
idx = i
@@ -1575,7 +1567,7 @@ end
if USE_OLD_TRACE_OPTION_STYLE
newopts = ''
- @trace_var.each{|e|
+ @trace_var.each{|e|
e[0].each_byte{|c| newopts.concat(c.chr) unless newopts.index(c.chr)}
}
@trace_elem.each{|elem|
@@ -1599,21 +1591,21 @@ end
diff = false
@trace_opts.each_byte{|c| break if (diff = ! newopts.index(c))}
if diff
- Tk.tk_call_without_enc('trace', 'vdelete',
+ Tk.tk_call_without_enc('trace', 'vdelete',
@id, @trace_opts, 'rb_var ' << @id)
@trace_opts.replace(newopts)
unless @trace_opts.empty?
- Tk.tk_call_without_enc('trace', 'variable',
+ Tk.tk_call_without_enc('trace', 'variable',
@id, @trace_opts, 'rb_var ' << @id)
end
end
else
unless (@trace_opts - newopts).empty?
- Tk.tk_call_without_enc('trace', 'remove', 'variable',
+ Tk.tk_call_without_enc('trace', 'remove', 'variable',
@id, @trace_opts, 'rb_var ' << @id)
@trace_opts.replace(newopts)
unless @trace_opts.empty?
- Tk.tk_call_without_enc('trace', 'add', 'variable',
+ Tk.tk_call_without_enc('trace', 'add', 'variable',
@id, @trace_opts, 'rb_var ' << @id)
end
end
@@ -1629,7 +1621,7 @@ class TkVarAccess<TkVariable
def self.new(name, *args)
if name.kind_of?(TkVariable)
name.value = args[0] unless args.empty?
- return name
+ return name
end
name = name.to_s
@@ -1657,7 +1649,7 @@ class TkVarAccess<TkVariable
fail ArgumentError, "already exist as a scalar variable"
end
name.value = args[0] unless args.empty?
- return name
+ return name
end
name = name.to_s
diff --git a/ext/tk/lib/tk/virtevent.rb b/ext/tk/lib/tk/virtevent.rb
index c11e9692e7..ae31ac1f8f 100644
--- a/ext/tk/lib/tk/virtevent.rb
+++ b/ext/tk/lib/tk/virtevent.rb
@@ -9,7 +9,7 @@ class TkVirtualEvent<TkObject
TkCommandNames = ['event'.freeze].freeze
- (TkVirtualEventID = ["VirtEvent".freeze, TkUtil.untrust("00000")]).instance_eval{
+ (TkVirtualEventID = ["VirtEvent".freeze, "00000".taint]).instance_eval{
@mutex = Mutex.new
def mutex; @mutex; end
freeze
@@ -80,8 +80,8 @@ class TkVirtualEvent<TkObject
def _add_sequences(seq_ary)
unless seq_ary.empty?
- tk_call_without_enc('event', 'add', "<#{@id}>",
- *(seq_ary.collect{|seq|
+ tk_call_without_enc('event', 'add', "<#{@id}>",
+ *(seq_ary.collect{|seq|
"<#{tk_event_sequence(seq)}>"
}) )
end
@@ -100,14 +100,14 @@ class TkVirtualEvent<TkObject
end
def delete(*sequences)
- if sequences.empty?
+ if sequences == []
tk_call_without_enc('event', 'delete', "<#{@id}>")
TkVirtualEventTBL.mutex.synchronize{
TkVirtualEventTBL.delete(@id)
}
else
- tk_call_without_enc('event', 'delete', "<#{@id}>",
- *(sequences.collect{|seq|
+ tk_call_without_enc('event', 'delete', "<#{@id}>",
+ *(sequences.collect{|seq|
"<#{tk_event_sequence(seq)}>"
}) )
if tk_call_without_enc('event','info',"<#{@id}>").empty?
diff --git a/ext/tk/lib/tk/winfo.rb b/ext/tk/lib/tk/winfo.rb
index b10cfe6760..c649b4a0c9 100644
--- a/ext/tk/lib/tk/winfo.rb
+++ b/ext/tk/lib/tk/winfo.rb
@@ -14,7 +14,7 @@ module TkWinfo
def TkWinfo.atom(name, win=nil)
if win
- number(tk_call_without_enc('winfo', 'atom', '-displayof', win,
+ number(tk_call_without_enc('winfo', 'atom', '-displayof', win,
_get_eval_enc_str(name)))
else
number(tk_call_without_enc('winfo', 'atom', _get_eval_enc_str(name)))
@@ -26,7 +26,7 @@ module TkWinfo
def TkWinfo.atomname(id, win=nil)
if win
- _fromUTF8(tk_call_without_enc('winfo', 'atomname',
+ _fromUTF8(tk_call_without_enc('winfo', 'atomname',
'-displayof', win, id))
else
_fromUTF8(tk_call_without_enc('winfo', 'atomname', id))
@@ -67,7 +67,7 @@ module TkWinfo
def TkWinfo.containing(rootX, rootY, win=nil)
if win
- window(tk_call_without_enc('winfo', 'containing',
+ window(tk_call_without_enc('winfo', 'containing',
'-displayof', win, rootX, rootY))
else
window(tk_call_without_enc('winfo', 'containing', rootX, rootY))
@@ -128,7 +128,7 @@ module TkWinfo
false, true)
else
#tk_split_simplelist(tk_call_without_enc('winfo', 'interps'))
- tk_split_simplelist(tk_call_without_enc('winfo', 'interps'),
+ tk_split_simplelist(tk_call_without_enc('winfo', 'interps'),
false, true)
end
end
@@ -303,7 +303,7 @@ module TkWinfo
def TkWinfo.visualsavailable(win, includeids=false)
if includeids
- list(tk_call_without_enc('winfo', 'visualsavailable',
+ list(tk_call_without_enc('winfo', 'visualsavailable',
win, "includeids"))
else
list(tk_call_without_enc('winfo', 'visualsavailable', win))
diff --git a/ext/tk/lib/tk/winpkg.rb b/ext/tk/lib/tk/winpkg.rb
index 80e0439ace..89fb391c77 100644
--- a/ext/tk/lib/tk/winpkg.rb
+++ b/ext/tk/lib/tk/winpkg.rb
@@ -10,8 +10,7 @@ require 'tk'
module Tk::WinDDE
end
#TkWinDDE = Tk::WinDDE
-#Tk.__set_toplevel_aliases__(:Tk, Tk::WinDDE, :TkWinDDE)
-Tk.__set_loaded_toplevel_aliases__('tk/winpkg.rb', :Tk, Tk::WinDDE, :TkWinDDE)
+Tk.__set_toplevel_aliases__(:Tk, Tk::WinDDE, :TkWinDDE)
module Tk::WinDDE
extend Tk
@@ -46,7 +45,7 @@ module Tk::WinDDE
elsif args.size == 0
tk_call('dde', 'servername', force, exact, *hash_kv(keys))
else
- tk_call('dde', 'servername', force, exact,
+ tk_call('dde', 'servername', force, exact,
*((hash_kv(keys) << '--') + args))
end
else
@@ -87,16 +86,14 @@ module Tk::WinDDE
tk_call('dde', 'eval', -async, topic, cmd, *args)
end
- module_function :servername, :execute, :async_execute,
+ module_function :servername, :execute, :async_execute,
:poke, :request, :services, :eval
end
module Tk::WinRegistry
end
#TkWinRegistry = Tk::WinRegistry
-#Tk.__set_toplevel_aliases__(:Tk, Tk::WinRegistry, :TkWinRegistry)
-Tk.__set_loaded_toplevel_aliases__('tk/winpkg.rb', :Tk, Tk::WinRegistry,
- :TkWinRegistry)
+Tk.__set_toplevel_aliases__(:Tk, Tk::WinRegistry, :TkWinRegistry)
module Tk::WinRegistry
extend Tk
diff --git a/ext/tk/lib/tk/wm.rb b/ext/tk/lib/tk/wm.rb
index b1a2ed886a..0394296189 100644
--- a/ext/tk/lib/tk/wm.rb
+++ b/ext/tk/lib/tk/wm.rb
@@ -123,7 +123,7 @@ module Tk
TOPLEVEL_METHODCALL_OPTKEYS['focusmodel'] = 'focusmodel'
def Wm.forget(win)
- # Tcl/Tk 8.5+
+ # Tcl/Tk 8.5+
# work with dockable frames
tk_call_without_enc('wm', 'forget', win.epath)
win
@@ -200,7 +200,7 @@ module Tk
if imgs.empty?
win.instance_eval{
@wm_iconphoto = nil unless defined? @wm_iconphoto
- return @wm_iconphoto
+ return @wm_iconphoto
}
end
@@ -308,10 +308,10 @@ module Tk
def Wm.manage(win, use_id = nil)
# Tcl/Tk 8.5+ feature
# --------------------------------------------------------------
- # In the future release, I want to support to embed the 'win'
+ # In the future release, I want to support to embed the 'win'
# into the container which has window-id 'use-id'.
- # It may give users frexibility on controlling their GUI.
- # However, it may be difficult for current Tcl/Tk (Tcl/Tk8.5.1),
+ # It may give users frexibility on controlling their GUI.
+ # However, it may be difficult for current Tcl/Tk (Tcl/Tk8.5.1),
# because it seems to require to modify Tcl/Tk's source code.
# --------------------------------------------------------------
if use_id
diff --git a/ext/tk/lib/tk/xim.rb b/ext/tk/lib/tk/xim.rb
index c0126c5175..0ac8559bb9 100644
--- a/ext/tk/lib/tk/xim.rb
+++ b/ext/tk/lib/tk/xim.rb
@@ -12,14 +12,14 @@ module TkXIM
def TkXIM.useinputmethods(value = None, win = nil)
if value == None
if win
- bool(tk_call_without_enc('tk', 'useinputmethods',
+ bool(tk_call_without_enc('tk', 'useinputmethods',
'-displayof', win))
else
bool(tk_call_without_enc('tk', 'useinputmethods'))
end
else
if win
- bool(tk_call_without_enc('tk', 'useinputmethods',
+ bool(tk_call_without_enc('tk', 'useinputmethods',
'-displayof', win, value))
else
bool(tk_call_without_enc('tk', 'useinputmethods', value))
diff --git a/ext/tk/lib/tkextlib/ICONS/icons.rb b/ext/tk/lib/tkextlib/ICONS/icons.rb
index bd3180aa55..b430bae55d 100644
--- a/ext/tk/lib/tkextlib/ICONS/icons.rb
+++ b/ext/tk/lib/tkextlib/ICONS/icons.rb
@@ -34,10 +34,10 @@ module Tk
def self.create(*args) # icon, icon, ..., ?option=>value, ...?
if args[-1].kind_of?(Hash)
keys = args.pop
- icons = simplelist(tk_call('::icons::icons', 'create',
+ icons = simplelist(tk_call('::icons::icons', 'create',
*(hash_kv(keys) << (args.flatten))))
else
- icons = simplelist(tk_call('::icons::icons', 'create',
+ icons = simplelist(tk_call('::icons::icons', 'create',
args.flatten))
end
@@ -66,7 +66,7 @@ module Tk
def self.query(*args) # icon, icon, ..., ?option=>value, ...?
if args[-1].kind_of?(Hash)
keys = args.pop
- simplelist(tk_call('::icons::icons', 'query',
+ simplelist(tk_call('::icons::icons', 'query',
*(hash_kv(keys) << (args.flatten))))
else
simplelist(tk_call('::icons::icons', 'query', args.flatten))
@@ -121,7 +121,7 @@ module Tk
end
def query(keys={})
- list(simplelist(tk_call('::icons::icons', 'query',
+ list(simplelist(tk_call('::icons::icons', 'query',
*(hash_kv(keys) << @name))
)[0])
end
diff --git a/ext/tk/lib/tkextlib/ICONS/setup.rb b/ext/tk/lib/tkextlib/ICONS/setup.rb
index ee406c6ca0..ce0f0bd4d4 100644
--- a/ext/tk/lib/tkextlib/ICONS/setup.rb
+++ b/ext/tk/lib/tkextlib/ICONS/setup.rb
@@ -2,7 +2,7 @@
# setup.rb -- setup script before calling TkPackage.require()
#
# If you need some setup operations (for example, add a library path
-# to the library search path) before using Tcl/Tk library packages
-# wrapped by Ruby scripts in this directory, please write the setup
+# to the library search path) before using Tcl/Tk library packages
+# wrapped by Ruby scripts in this directory, please write the setup
# operations in this file.
#
diff --git a/ext/tk/lib/tkextlib/SUPPORT_STATUS b/ext/tk/lib/tkextlib/SUPPORT_STATUS
index 6b31ababb3..cfbe274c86 100644
--- a/ext/tk/lib/tkextlib/SUPPORT_STATUS
+++ b/ext/tk/lib/tkextlib/SUPPORT_STATUS
@@ -55,20 +55,18 @@ script may give you some hints about that.
===< support with some examples (may be beta quality) >=======================
-Tcllib 1.11.1
-Tklib 0.5 http://sourceforge.net/projects/tcllib ==> tcllib
- ( partial support; primary support target is Tklib)
+Tcllib 1.8
+Tklib 0.4.1 http://sourceforge.net/projects/tcllib ==> tcllib
IWidgets 4.0.2 http://sourceforge.net/projects/incrtcl ==> iwidgets
-BWidget 1.8 [ CVS/Hd(2009-07-02) ]
- http://sourceforge.net/projects/tcllib ==> bwidget
+BWidgets 1.7 http://sourceforge.net/projects/tcllib ==> bwidget
-TkTable 2.10 http://sourceforge.net/projects/tktable ==> tktable
+TkTable 2.9 http://sourceforge.net/projects/tktable ==> tktable
* see also <http://www.korus.hu/~fery/ruby/tktable.rb>
written by Ferenc Engard (ferenc@engard.hu)
-Vu widgets 2.3.0 http://sourceforge.net/projects/tktable ==> vu
+vu 2.3.0 http://sourceforge.net/projects/tktable ==> vu
TkHTML 2.0 http://www.hwaci.com/sw/tkhtml/ ==> tkHTML
@@ -82,25 +80,25 @@ BLT 2.4z http://sourceforge.net/projects/blt
(http://raa.ruby-lang.org/)
==> blt
-TkTreeCtrl 2.2.9
- http://tktreectrl.sourceforge.net/ ==> treectrl
+TkTreeCtrl CVS/Hd(2005-12-02)
+ http://sourceforge.net/projects/tktreectrl ==> treectrl
-Tile 0.8.3/8.6b1
+Tile 0.8.0/8.5.1
http://sourceforge.net/projects/tktable ==> tile
===< support (may be alpha or beta quality) >=================================
-IncrTcl CVS/Hd(2008-12-15)
+IncrTcl CVS/Hd(2005-02-14)
http://sourceforge.net/projects/incrtcl ==> itcl, itk
-TclX CVS/Hd(2008-12-15)
+TclX CVS/Hd(2005-02-07)
http://sourceforge.net/projects/tclx
==> tclx (partial support; infox command and
XPG/3 message catalogs only)
-Trofs 0.4.4 http://math.nist.gov/~DPorter/tcltk/trofs/
+Trofs 0.4.3 http://math.nist.gov/~DPorter/tcltk/trofs/
diff --git a/ext/tk/lib/tkextlib/blt.rb b/ext/tk/lib/tkextlib/blt.rb
index 8b132e41a7..115eb927ba 100644
--- a/ext/tk/lib/tkextlib/blt.rb
+++ b/ext/tk/lib/tkextlib/blt.rb
@@ -19,8 +19,6 @@ TkPackage.require('BLT')
module Tk
module BLT
TkComm::TkExtlibAutoloadModule.unshift(self)
- # Require autoload-symbols which is a same name as widget classname.
- # Those are used at TkComm._genobj_for_tkwidget method.
extend TkCore
@@ -28,14 +26,14 @@ module Tk
PATCH_LEVEL = tk_call('set', 'blt_patchLevel')
begin
- lib = TkCore::INTERP._invoke('set', 'blt_library')
+ lib = INTERP._invoke('set', 'blt_library')
rescue
lib = ''
end
LIBRARY = TkVarAccess.new('blt_library', lib)
begin
- lib = TkCore::INTERP._invoke('set', 'blt_libPath')
+ lib = INTERP._invoke('set', 'blt_libPath')
rescue
lib = ''
end
diff --git a/ext/tk/lib/tkextlib/blt/barchart.rb b/ext/tk/lib/tkextlib/blt/barchart.rb
index a86b91c959..cb481c5889 100644
--- a/ext/tk/lib/tkextlib/blt/barchart.rb
+++ b/ext/tk/lib/tkextlib/blt/barchart.rb
@@ -11,7 +11,7 @@ module Tk::BLT
class Barchart < TkWindow
TkCommandNames = ['::blt::barchart'.freeze].freeze
WidgetClassName = 'Barchart'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
include PlotComponent
include GraphCommand
@@ -22,7 +22,7 @@ module Tk::BLT
private :__boolval_optkeys
def __strval_optkeys
- ['text', 'label', 'title', 'file',
+ ['text', 'label', 'title', 'file',
'background', 'plotbackground']
end
private :__strval_optkeys
@@ -33,7 +33,7 @@ module Tk::BLT
private :__tkvariable_optkeys
=begin
- BarElement_ID = ['blt_barchart_bar'.freeze, TkUtil.untrust('00000')].freeze
+ BarElement_ID = ['blt_barchart_bar'.freeze, '00000'.taint].freeze
def bar(elem=nil, keys={})
if elem.kind_of?(Hash)
diff --git a/ext/tk/lib/tkextlib/blt/bitmap.rb b/ext/tk/lib/tkextlib/blt/bitmap.rb
index 3254b63116..23c6d2d064 100644
--- a/ext/tk/lib/tkextlib/blt/bitmap.rb
+++ b/ext/tk/lib/tkextlib/blt/bitmap.rb
@@ -14,7 +14,7 @@ module Tk::BLT
BITMAP_ID_TBL = TkCore::INTERP.create_table
- (BITMAP_ID = ['blt_bitmap_id'.freeze, TkUtil.untrust('00000')]).instance_eval{
+ (BITMAP_ID = ['blt_bitmap_id'.freeze, '00000'.taint]).instance_eval{
@mutex = Mutex.new
def mutex; @mutex; end
freeze
diff --git a/ext/tk/lib/tkextlib/blt/busy.rb b/ext/tk/lib/tkextlib/blt/busy.rb
index b5287fb5b7..2f807fcd9c 100644
--- a/ext/tk/lib/tkextlib/blt/busy.rb
+++ b/ext/tk/lib/tkextlib/blt/busy.rb
@@ -44,7 +44,6 @@ class << Tk::BLT::Busy
private :__item_config_cmd
undef itemcget
- undef itemcget_tkstring
alias configure itemconfigure
alias configinfo itemconfiginfo
alias current_configinfo current_itemconfiginfo
diff --git a/ext/tk/lib/tkextlib/blt/component.rb b/ext/tk/lib/tkextlib/blt/component.rb
index 20db035fdd..b2005b2f2b 100644
--- a/ext/tk/lib/tkextlib/blt/component.rb
+++ b/ext/tk/lib/tkextlib/blt/component.rb
@@ -22,15 +22,15 @@ module Tk::BLT
private :__item_numstrval_optkeys
def __item_boolval_optkeys(id)
- ['hide', 'under', 'descending', 'logscale', 'loose', 'showticks',
- 'titlealternate', 'scalesymbols', 'minor', 'raised',
+ ['hide', 'under', 'descending', 'logscale', 'loose', 'showticks',
+ 'titlealternate', 'scalesymbols', 'minor', 'raised',
'center', 'decoration', 'landscape', 'maxpect']
end
private :__item_boolval_optkeys
def __item_strval_optkeys(id)
- ['text', 'label', 'limits', 'title',
- 'show', 'file', 'maskdata', 'maskfile',
+ ['text', 'label', 'limits', 'title',
+ 'show', 'file', 'maskdata', 'maskfile',
'color', 'titlecolor', 'fill', 'outline', 'offdash']
end
private :__item_strval_optkeys
@@ -82,9 +82,6 @@ module Tk::BLT
end
private :__item_pathname
- def axis_cget_tkstring(id, option)
- ret = itemcget_tkstring(['axis', tagid(id)], option)
- end
def axis_cget(id, option)
ret = itemcget(['axis', tagid(id)], option)
end
@@ -97,7 +94,7 @@ module Tk::BLT
value = None
slot = _symbolkey2str(slot)
if cmd = slot.delete('command')
- slot['command'] = proc{|w, tick|
+ slot['command'] = proc{|w, tick|
cmd.call(TkComm.window(w), TkComm.num_or_str(tick))
}
end
@@ -106,7 +103,7 @@ module Tk::BLT
slot = args.pop
if slot == :command || slot == 'command'
cmd = value
- value = proc{|w, tick|
+ value = proc{|w, tick|
cmd.call(TkComm.window(w), TkComm.num_or_str(tick))
}
end
@@ -121,9 +118,6 @@ module Tk::BLT
current_itemconfiginfo(['axis', tagid(id)], slot)
end
- def crosshairs_cget_tkstring(option)
- itemcget_tkstring('crosshairs', option)
- end
def crosshairs_cget(option)
itemcget('crosshairs', option)
end
@@ -140,9 +134,6 @@ module Tk::BLT
current_itemconfiginfo('crosshairs', slot)
end
- def element_cget_tkstring(id, option)
- itemcget_tkstring(['element', tagid(id)], option)
- end
def element_cget(id, option)
itemcget(['element', tagid(id)], option)
end
@@ -167,9 +158,6 @@ module Tk::BLT
current_itemconfiginfo(['element', tagid(id)], slot)
end
- def bar_cget_tkstring(id, option)
- itemcget_tkstring(['bar', tagid(id)], option)
- end
def bar_cget(id, option)
itemcget(['bar', tagid(id)], option)
end
@@ -194,9 +182,6 @@ module Tk::BLT
current_itemconfiginfo(['bar', tagid(id)], slot)
end
- def line_cget_tkstring(id, option)
- itemcget_tkstring(['line', tagid(id)], option)
- end
def line_cget(id, option)
itemcget(['line', tagid(id)], option)
end
@@ -221,9 +206,6 @@ module Tk::BLT
current_itemconfiginfo(['line', tagid(id)], slot)
end
- def gridline_cget_tkstring(option)
- itemcget_tkstring('grid', option)
- end
def gridline_cget(option)
itemcget('grid', option)
end
@@ -240,9 +222,6 @@ module Tk::BLT
current_itemconfiginfo('grid', slot)
end
- def legend_cget_tkstring(option)
- itemcget_tkstring('legend', option)
- end
def legend_cget(option)
itemcget('legend', option)
end
@@ -259,9 +238,6 @@ module Tk::BLT
current_itemconfiginfo('legend', slot)
end
- def pen_cget_tkstring(id, option)
- itemcget_tkstring(['pen', tagid(id)], option)
- end
def pen_cget(id, option)
itemcget(['pen', tagid(id)], option)
end
@@ -286,9 +262,6 @@ module Tk::BLT
current_itemconfiginfo(['pen', tagid(id)], slot)
end
- def postscript_cget_tkstring(option)
- itemcget_tkstring('postscript', option)
- end
def postscript_cget(option)
itemcget('postscript', option)
end
@@ -305,9 +278,6 @@ module Tk::BLT
current_itemconfiginfo('postscript', slot)
end
- def marker_cget_tkstring(id, option)
- itemcget_tkstring(['marker', tagid(id)], option)
- end
def marker_cget(id, option)
itemcget(['marker', tagid(id)], option)
end
@@ -332,16 +302,12 @@ module Tk::BLT
current_itemconfiginfo(['marker', tagid(id)], slot)
end
- alias __itemcget_tkstring itemcget_tkstring
alias __itemcget itemcget
alias __itemcget_strict itemcget_strict
alias __itemconfiginfo itemconfiginfo
alias __current_itemconfiginfo current_itemconfiginfo
- private :__itemcget_tkstring, :__itemcget, :__itemconfiginfo, :__current_itemconfiginfo
+ private :__itemcget, :__itemconfiginfo, :__current_itemconfiginfo
- def itemcget_tkstring(tagOrId, option)
- __itemcget_tkstring(tagid(tagOrId), option)
- end
def itemcget_strict(tagOrId, option)
ret = __itemcget(tagid(tagOrId), option)
if option == 'bindtags' || option == :bindtags
@@ -407,13 +373,13 @@ module Tk::BLT
ret
end
- private :itemcget_tkstring, :itemcget, :itemcget_strict
+ private :itemcget, :itemcget_strict
private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
#################
class Axis < TkObject
- (OBJ_ID = ['blt_chart_axis'.freeze, TkUtil.untrust('00000')]).instance_eval{
+ (OBJ_ID = ['blt_chart_axis'.freeze, '00000'.taint]).instance_eval{
@mutex = Mutex.new
def mutex; @mutex; end
freeze
@@ -511,9 +477,6 @@ module Tk::BLT
@id
end
- def cget_tkstring(option)
- @chart.axis_cget_tkstring(@id, option)
- end
def cget(option)
@chart.axis_cget(@id, option)
end
@@ -557,7 +520,7 @@ module Tk::BLT
def name
@axis
end
-
+
def transform(val)
@chart.axis_transform(@id, val)
end
@@ -619,9 +582,6 @@ module Tk::BLT
@id
end
- def cget_tkstring(option)
- @chart.crosshair_cget_tkstring(option)
- end
def cget(option)
@chart.crosshair_cget(option)
end
@@ -671,7 +631,7 @@ module Tk::BLT
ElementID_TBL.mutex.synchronize{ ElementID_TBL.clear }
}
- (OBJ_ID = ['blt_chart_element'.freeze, TkUtil.untrust('00000')]).instance_eval{
+ (OBJ_ID = ['blt_chart_element'.freeze, '00000'.taint]).instance_eval{
@mutex = Mutex.new
def mutex; @mutex; end
freeze
@@ -769,10 +729,6 @@ module Tk::BLT
@id
end
- def cget_tkstring(option)
- # @chart.element_cget(@id, option)
- @chart.__send__(@typename + '_cget_tkstring', @id, option)
- end
def cget(option)
# @chart.element_cget(@id, option)
@chart.__send__(@typename + '_cget', @id, option)
@@ -877,9 +833,6 @@ module Tk::BLT
@id
end
- def cget_tkstring(option)
- @chart.gridline_cget_tkstring(option)
- end
def cget(option)
@chart.gridline_cget(option)
end
@@ -954,9 +907,6 @@ module Tk::BLT
@id
end
- def cget_tkstring(option)
- @chart.legend_cget_tkstring(option)
- end
def cget(option)
@chart.legend_cget(option)
end
@@ -990,7 +940,7 @@ module Tk::BLT
#################
class Pen < TkObject
- (OBJ_ID = ['blt_chart_pen'.freeze, TkUtil.untrust('00000')]).instance_eval{
+ (OBJ_ID = ['blt_chart_pen'.freeze, '00000'.taint]).instance_eval{
@mutex = Mutex.new
def mutex; @mutex; end
freeze
@@ -1086,9 +1036,6 @@ module Tk::BLT
@id
end
- def cget_tkstring(option)
- @chart.pen_cget_tkstring(@id, option)
- end
def cget(option)
@chart.pen_cget(@id, option)
end
@@ -1159,9 +1106,6 @@ module Tk::BLT
@id
end
- def cget_tkstring(option)
- @chart.postscript_cget_tkstring(option)
- end
def cget(option)
@chart.postscript_cget(option)
end
@@ -1277,7 +1221,7 @@ module Tk::BLT
fail RuntimeError, "#{self} is an abstract class"
end
args, fontkeys = _parse_create_args(keys)
- idnum = tk_call_without_enc(chart.path, 'marker', 'create',
+ idnum = tk_call_without_enc(chart.path, 'marker', 'create',
self::MarkerTypeName, *args)
chart.marker_configure(idnum, fontkeys) unless fontkeys.empty?
idnum.to_i # 'item id' is an integer number
@@ -1285,7 +1229,7 @@ module Tk::BLT
def self.create_type(chart, type, keys={})
args, fontkeys = _parse_create_args(keys)
- idnum = tk_call_without_enc(chart.path, 'marker', 'create',
+ idnum = tk_call_without_enc(chart.path, 'marker', 'create',
type, *args)
chart.marker_configure(idnum, fontkeys) unless fontkeys.empty?
id = idnum.to_i # 'item id' is an integer number
@@ -1325,9 +1269,6 @@ module Tk::BLT
@id
end
- def cget_tkstring(option)
- @chart.marker_cget_tkstring(@id, option)
- end
def cget(option)
@chart.marker_cget(@id, option)
end
@@ -1545,7 +1486,7 @@ module Tk::BLT
list(tk_send('axis', 'limits', tagid(id)))
end
def axis_names(*pats)
- simplelist(tk_send('axis', 'names',
+ simplelist(tk_send('axis', 'names',
*(pats.collect{|pat| tagid(pat)}))).collect{|axis|
Tk::BLT::PlotComponent::Axis.id2obj(self, axis)
}
@@ -1559,11 +1500,11 @@ module Tk::BLT
end
def axis_use(id, target=nil)
if target
- Tk::BLT::PlotComponent::Axis.id2obj(self,
- tk_send('axis', 'use',
+ Tk::BLT::PlotComponent::Axis.id2obj(self,
+ tk_send('axis', 'use',
tagid(id), tagid(target)))
else
- Tk::BLT::PlotComponent::Axis.id2obj(self,
+ Tk::BLT::PlotComponent::Axis.id2obj(self,
tk_send('axis', 'use', tagid(id)))
end
end
@@ -1603,10 +1544,10 @@ module Tk::BLT
def element_closest(x, y, var, *args)
if args[-1].kind_of?(Hash)
keys = args.pop
- bool(tk_send('element', 'closest', x, y, var,
+ bool(tk_send('element', 'closest', x, y, var,
*(hash_kv(keys).concat(args.collect{|id| tagid(id)}))))
else
- bool(tk_send('element', 'closest', x, y, var,
+ bool(tk_send('element', 'closest', x, y, var,
*(args.collect{|id| tagid(id)})))
end
end
@@ -1622,7 +1563,7 @@ module Tk::BLT
bool(tk_send('element', 'exists', tagid(id)))
end
def element_names(*pats)
- simplelist(tk_send('element', 'names',
+ simplelist(tk_send('element', 'names',
*(pats.collect{|pat| tagid(pat)}))).collect{|elem|
Tk::BLT::PlotComponent::Element.id2obj(self, elem)
}
@@ -1660,10 +1601,10 @@ module Tk::BLT
def bar_closest(x, y, var, *args)
if args[-1].kind_of?(Hash)
keys = args.pop
- bool(tk_send('bar', 'closest', x, y, var,
+ bool(tk_send('bar', 'closest', x, y, var,
*(hash_kv(keys).concat(args.collect{|id| tagid(id)}))))
else
- bool(tk_send('bar', 'closest', x, y, var,
+ bool(tk_send('bar', 'closest', x, y, var,
*(args.collect{|id| tagid(id)})))
end
end
@@ -1679,7 +1620,7 @@ module Tk::BLT
bool(tk_send('bar', 'exists', tagid(id)))
end
def bar_names(*pats)
- simplelist(tk_send('bar', 'names',
+ simplelist(tk_send('bar', 'names',
*(pats.collect{|pat| tagid(pat)}))).collect{|elem|
Tk::BLT::PlotComponent::Element.id2obj(self, elem)
}
@@ -1717,10 +1658,10 @@ module Tk::BLT
def line_closest(x, y, var, *args)
if args[-1].kind_of?(Hash)
keys = args.pop
- bool(tk_send('line', 'closest', x, y, var,
+ bool(tk_send('line', 'closest', x, y, var,
*(hash_kv(keys).concat(args.collect{|id| tagid(id)}))))
else
- bool(tk_send('line', 'closest', x, y, var,
+ bool(tk_send('line', 'closest', x, y, var,
*(args.collect{|id| tagid(id)})))
end
end
@@ -1736,7 +1677,7 @@ module Tk::BLT
bool(tk_send('line', 'exists', tagid(id)))
end
def line_names(*pats)
- simplelist(tk_send('line', 'names',
+ simplelist(tk_send('line', 'names',
*(pats.collect{|pat| tagid(pat)}))).collect{|elem|
Tk::BLT::PlotComponent::Element.id2obj(self, elem)
}
@@ -1782,7 +1723,7 @@ module Tk::BLT
keys.delete('without_creating')
end
- legend = self.class.new(parent, :without_creating=>true,
+ legend = self.class.new(parent, :without_creating=>true,
:widgetname=>widgetname)
class << legend
def __destroy_hook__
@@ -1799,24 +1740,24 @@ module Tk::BLT
end
def legend_activate(*pats)
- list(tk_send('legend', 'activate',
+ list(tk_send('legend', 'activate',
*(pats.collect{|pat| tagid(pat)}))).collect{|elem|
Tk::BLT::PlotComponent::Element.id2obj(self, elem)
}
end
def legend_deactivate(*pats)
- list(tk_send('legend', 'deactivate',
+ list(tk_send('legend', 'deactivate',
*(pats.collect{|pat| tagid(pat)}))).collect{|elem|
Tk::BLT::PlotComponent::Element.id2obj(self, elem)
}
end
def legend_get(pos, y=nil)
if y
- Tk::BLT::PlotComponent::Element.id2obj(self,
- tk_send('legend', 'get',
+ Tk::BLT::PlotComponent::Element.id2obj(self,
+ tk_send('legend', 'get',
_at(pos, y)))
else
- Tk::BLT::PlotComponent::Element.id2obj(self,
+ Tk::BLT::PlotComponent::Element.id2obj(self,
tk_send('legend', 'get', pos))
end
end
@@ -1832,7 +1773,7 @@ module Tk::BLT
self
end
def pen_names(*pats)
- simplelist(tk_send('pen', 'names',
+ simplelist(tk_send('pen', 'names',
*(pats.collect{|pat| tagid(pat)}))).collect{|pen|
Tk::BLT::PlotComponent::Pen.id2obj(self, pen)
}
@@ -1902,7 +1843,7 @@ module Tk::BLT
bool(tk_send('marker', 'exists', tagid(id)))
end
def marker_names(*pats)
- simplelist(tk_send('marker', 'names',
+ simplelist(tk_send('marker', 'names',
*(pats.collect{|pat| tagid(pat)}))).collect{|id|
Tk::BLT::PlotComponent::Marker.id2obj(self, id)
}
@@ -1913,9 +1854,6 @@ module Tk::BLT
###################
- def xaxis_cget_tkstring(option)
- itemcget_tkstring('xaxis', option)
- end
def xaxis_cget(option)
itemcget('xaxis', option)
end
@@ -1926,13 +1864,13 @@ module Tk::BLT
if slot.kind_of?(Hash)
slot = _symbolkey2str(slot)
if cmd = slot.delete('command')
- slot['command'] = proc{|w, tick|
+ slot['command'] = proc{|w, tick|
cmd.call(TkComm.window(w), TkComm.num_or_str(tick))
}
end
elsif slot == :command || slot == 'command'
cmd = value
- value = proc{|w, tick|
+ value = proc{|w, tick|
cmd.call(TkComm.window(w), TkComm.num_or_str(tick))
}
end
@@ -1980,17 +1918,14 @@ module Tk::BLT
end
def xaxis_use(target=nil)
if target
- Tk::BLT::PlotComponent::Axis.id2obj(self,
- tk_send('xaxis', 'use',
+ Tk::BLT::PlotComponent::Axis.id2obj(self,
+ tk_send('xaxis', 'use',
tagid(target)))
else
Tk::BLT::PlotComponent::Axis.id2obj(self, tk_send('xaxis', 'use'))
end
end
- def x2axis_cget_tkstring(option)
- itemcget_tkstring('x2axis', option)
- end
def x2axis_cget(option)
itemcget('x2axis', option)
end
@@ -2001,13 +1936,13 @@ module Tk::BLT
if slot.kind_of?(Hash)
slot = _symbolkey2str(slot)
if cmd = slot.delete('command')
- slot['command'] = proc{|w, tick|
+ slot['command'] = proc{|w, tick|
cmd.call(TkComm.window(w), TkComm.num_or_str(tick))
}
end
elsif slot == :command || slot == 'command'
cmd = value
- value = proc{|w, tick|
+ value = proc{|w, tick|
cmd.call(TkComm.window(w), TkComm.num_or_str(tick))
}
end
@@ -2055,17 +1990,14 @@ module Tk::BLT
end
def x2axis_use(target=nil)
if target
- Tk::BLT::PlotComponent::Axis.id2obj(self,
- tk_send('x2axis', 'use',
+ Tk::BLT::PlotComponent::Axis.id2obj(self,
+ tk_send('x2axis', 'use',
tagid(target)))
else
Tk::BLT::PlotComponent::Axis.id2obj(self, tk_send('x2axis', 'use'))
end
end
- def yaxis_cget_tkstring(option)
- itemcget_tkstring('yaxis', option)
- end
def yaxis_cget(option)
itemcget('yaxis', option)
end
@@ -2076,13 +2008,13 @@ module Tk::BLT
if slot.kind_of?(Hash)
slot = _symbolkey2str(slot)
if cmd = slot.delete('command')
- slot['command'] = proc{|w, tick|
+ slot['command'] = proc{|w, tick|
cmd.call(TkComm.window(w), TkComm.num_or_str(tick))
}
end
elsif slot == :command || slot == 'command'
cmd = value
- value = proc{|w, tick|
+ value = proc{|w, tick|
cmd.call(TkComm.window(w), TkComm.num_or_str(tick))
}
end
@@ -2130,17 +2062,14 @@ module Tk::BLT
end
def yaxis_use(target=nil)
if target
- Tk::BLT::PlotComponent::Axis.id2obj(self,
- tk_send('yaxis', 'use',
+ Tk::BLT::PlotComponent::Axis.id2obj(self,
+ tk_send('yaxis', 'use',
tagid(target)))
else
Tk::BLT::PlotComponent::Axis.id2obj(self, tk_send('yaxis', 'use'))
end
end
- def y2axis_cget_tkstring(option)
- itemcget_tkstring('y2axis', option)
- end
def y2axis_cget(option)
itemcget('y2axis', option)
end
@@ -2151,13 +2080,13 @@ module Tk::BLT
if slot.kind_of?(Hash)
slot = _symbolkey2str(slot)
if cmd = slot.delete('command')
- slot['command'] = proc{|w, tick|
+ slot['command'] = proc{|w, tick|
cmd.call(TkComm.window(w), TkComm.num_or_str(tick))
}
end
elsif slot == :command || slot == 'command'
cmd = value
- value = proc{|w, tick|
+ value = proc{|w, tick|
cmd.call(TkComm.window(w), TkComm.num_or_str(tick))
}
end
@@ -2205,8 +2134,8 @@ module Tk::BLT
end
def y2axis_use(target=nil)
if target
- Tk::BLT::PlotComponent::Axis.id2obj(self,
- tk_send('y2axis', 'use',
+ Tk::BLT::PlotComponent::Axis.id2obj(self,
+ tk_send('y2axis', 'use',
tagid(target)))
else
Tk::BLT::PlotComponent::Axis.id2obj(self, tk_send('y2axis', 'use'))
diff --git a/ext/tk/lib/tkextlib/blt/container.rb b/ext/tk/lib/tkextlib/blt/container.rb
index be05828d95..cdbec21f25 100644
--- a/ext/tk/lib/tkextlib/blt/container.rb
+++ b/ext/tk/lib/tkextlib/blt/container.rb
@@ -10,7 +10,7 @@ module Tk::BLT
class Container < TkWindow
TkCommandNames = ['::blt::container'.freeze].freeze
WidgetClassName = 'Container'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def __strval_optkeys
super() << 'name'
diff --git a/ext/tk/lib/tkextlib/blt/dragdrop.rb b/ext/tk/lib/tkextlib/blt/dragdrop.rb
index aa5c5654c2..201548504a 100644
--- a/ext/tk/lib/tkextlib/blt/dragdrop.rb
+++ b/ext/tk/lib/tkextlib/blt/dragdrop.rb
@@ -15,7 +15,7 @@ module Tk::BLT
class Token < TkWindow
WidgetClassName = 'DragDropToken'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def initialize(arg)
if arg.kind_of?(Hash) # arg is a hash includes the widgetpath of token
@@ -55,7 +55,6 @@ module Tk::BLT
private :__item_strval_optkeys
undef itemcget
- undef itemcget_tkstring
private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
def source_configure(win, slot, value=None)
@@ -78,7 +77,7 @@ module Tk::BLT
]
PROC_TBL = [
- [ ?w, TkComm.method(:window) ],
+ [ ?w, TkComm.method(:window) ],
nil
]
@@ -121,8 +120,8 @@ module Tk::BLT
]
PROC_TBL = [
- [ ?b, TkComm.method(:bool) ],
- [ ?w, TkComm.method(:window) ],
+ [ ?b, TkComm.method(:bool) ],
+ [ ?w, TkComm.method(:window) ],
nil
]
@@ -176,9 +175,9 @@ module Tk::BLT
]
PROC_TBL = [
- [ ?i, TkComm.method(:string) ],
- [ ?v, TkComm.method(:tk_tcl2ruby) ],
- [ ?w, TkComm.method(:window) ],
+ [ ?i, TkComm.method(:string) ],
+ [ ?v, TkComm.method(:tk_tcl2ruby) ],
+ [ ?w, TkComm.method(:window) ],
nil
]
@@ -204,14 +203,14 @@ module Tk::BLT
end
def self.source_handler(win, datatype, cmd=Proc.new, *args)
- _bind_for_event_class(DnD_Handle,
- ['::blt::drag&drop', 'source', win, 'handler'],
+ _bind_for_event_class(DnD_Handle,
+ ['::blt::drag&drop', 'source', win, 'handler'],
cmd, *args)
end
def self.target_handler(win, datatype, cmd=Proc.new, *args)
- _bind_for_event_class(DnD_Handle,
- ['::blt::drag&drop', 'target', win, 'handler'],
+ _bind_for_event_class(DnD_Handle,
+ ['::blt::drag&drop', 'target', win, 'handler'],
cmd, *args)
end
diff --git a/ext/tk/lib/tkextlib/blt/graph.rb b/ext/tk/lib/tkextlib/blt/graph.rb
index 6bd4424065..9ae99bff5c 100644
--- a/ext/tk/lib/tkextlib/blt/graph.rb
+++ b/ext/tk/lib/tkextlib/blt/graph.rb
@@ -11,7 +11,7 @@ module Tk::BLT
class Graph < TkWindow
TkCommandNames = ['::blt::graph'.freeze].freeze
WidgetClassName = 'Graph'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
include PlotComponent
include GraphCommand
@@ -27,7 +27,7 @@ module Tk::BLT
private :__strval_optkeys
=begin
- BarElement_ID = ['blt_graph_bar'.freeze, TkUtil.untrust('00000')].freeze
+ BarElement_ID = ['blt_graph_bar'.freeze, '00000'.taint].freeze
def bar(elem=nil, keys={})
if elem.kind_of?(Hash)
diff --git a/ext/tk/lib/tkextlib/blt/htext.rb b/ext/tk/lib/tkextlib/blt/htext.rb
index 878bd9982d..0d9cb30185 100644
--- a/ext/tk/lib/tkextlib/blt/htext.rb
+++ b/ext/tk/lib/tkextlib/blt/htext.rb
@@ -19,9 +19,8 @@ module Tk::BLT
TkCommandNames = ['::blt::htext'.freeze].freeze
WidgetClassName = 'Htext'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
- alias window_cget_tkstring itemcget_tkstring
alias window_cget itemcget
alias window_cget_strict itemcget_strict
alias window_configure itemconfigure
diff --git a/ext/tk/lib/tkextlib/blt/setup.rb b/ext/tk/lib/tkextlib/blt/setup.rb
index ee406c6ca0..ce0f0bd4d4 100644
--- a/ext/tk/lib/tkextlib/blt/setup.rb
+++ b/ext/tk/lib/tkextlib/blt/setup.rb
@@ -2,7 +2,7 @@
# setup.rb -- setup script before calling TkPackage.require()
#
# If you need some setup operations (for example, add a library path
-# to the library search path) before using Tcl/Tk library packages
-# wrapped by Ruby scripts in this directory, please write the setup
+# to the library search path) before using Tcl/Tk library packages
+# wrapped by Ruby scripts in this directory, please write the setup
# operations in this file.
#
diff --git a/ext/tk/lib/tkextlib/blt/stripchart.rb b/ext/tk/lib/tkextlib/blt/stripchart.rb
index 74093f1868..fe5afbb095 100644
--- a/ext/tk/lib/tkextlib/blt/stripchart.rb
+++ b/ext/tk/lib/tkextlib/blt/stripchart.rb
@@ -11,7 +11,7 @@ module Tk::BLT
class Stripchart < TkWindow
TkCommandNames = ['::blt::stripchart'.freeze].freeze
WidgetClassName = 'Stripchart'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
include PlotComponent
include GraphCommand
@@ -22,13 +22,13 @@ module Tk::BLT
private :__boolval_optkeys
def __strval_optkeys
- ['text', 'label', 'title', 'file',
+ ['text', 'label', 'title', 'file',
'background', 'plotbackground']
end
private :__strval_optkeys
=begin
- BarElement_ID = ['blt_stripchart_bar'.freeze, TkUtil.untrust('00000')].freeze
+ BarElement_ID = ['blt_stripchart_bar'.freeze, '00000'.taint].freeze
def bar(elem=nil, keys={})
if elem.kind_of?(Hash)
diff --git a/ext/tk/lib/tkextlib/blt/table.rb b/ext/tk/lib/tkextlib/blt/table.rb
index 205e29e6c5..dfa10269ed 100644
--- a/ext/tk/lib/tkextlib/blt/table.rb
+++ b/ext/tk/lib/tkextlib/blt/table.rb
@@ -26,9 +26,6 @@ module Tk::BLT
self
end
- def blt_table_cget_tkstring(*args)
- Tk::BLT::Table.cget_tkstring(self, *args)
- end
def blt_table_cget(*args)
Tk::BLT::Table.cget(self, *args)
end
@@ -95,9 +92,6 @@ module Tk::BLT
self
end
- def blt_table_itemcget_tkstring(*args)
- Tk::BLT::Table.itemcget_tkstring(self, *args)
- end
def blt_table_itemcget(*args)
Tk::BLT::Table.itemcget(self, *args)
end
@@ -147,14 +141,13 @@ class << Tk::BLT::Table
end
private :__item_pathname
- alias __itemcget_tkstring itemcget_tkstring
alias __itemcget itemcget
alias __itemcget_strict itemcget_strict
alias __itemconfigure itemconfigure
alias __itemconfiginfo itemconfiginfo
alias __current_itemconfiginfo current_itemconfiginfo
- private :__itemcget_tkstring, :__itemcget, :__itemcget_strict
+ private :__itemcget, :__itemcget_strict
private :__itemconfigure, :__itemconfiginfo, :__current_itemconfiginfo
def __boolval_optkeys
@@ -187,9 +180,6 @@ class << Tk::BLT::Table
############################################
- def cget_tkstring(container, option)
- __itemcget_tkstring([container], option)
- end
def cget(container, option)
__itemcget([container], option)
end
@@ -209,9 +199,6 @@ class << Tk::BLT::Table
__current_itemconfiginfo([container], *args)
end
- def itemcget_tkstring(container, item, option)
- __itemcget_tkstring([container, tagid(item)], option)
- end
def itemcget(container, item, option)
__itemcget([container, tagid(item)], option)
end
diff --git a/ext/tk/lib/tkextlib/blt/tabnotebook.rb b/ext/tk/lib/tkextlib/blt/tabnotebook.rb
index 82936c67d3..508fa2b82f 100644
--- a/ext/tk/lib/tkextlib/blt/tabnotebook.rb
+++ b/ext/tk/lib/tkextlib/blt/tabnotebook.rb
@@ -11,100 +11,11 @@ module Tk::BLT
class Tabnotebook < Tabset
TkCommandNames = ['::blt::tabnotebook'.freeze].freeze
WidgetClassName = 'Tabnotebook'.freeze
- WidgetClassNames[WidgetClassName] ||= self
-
- class Tab < Tk::BLT::Tabset::Tab
- def self.new(parent, pos=nil, name=nil, keys={})
- if pos.kind_of?(Hash)
- keys = pos
- name = nil
- pos = nil
- end
- if name.kind_of?(Hash)
- keys = name
- name = nil
- end
- obj = nil
- TabID_TBL.mutex.synchronize{
- if name && TabID_TBL[parent.path] && TabID_TBL[parent.path][name]
- obj = TabID_TBL[parent.path][name]
- if pos
- if pos.to_s == 'end'
- obj.move_after('end')
- else
- obj.move_before(pos)
- end
- end
- obj.configure if keys && ! keys.empty?
- else
- (obj = self.allocate).instance_eval{
- initialize(parent, pos, name, keys)
- TabID_TBL[@tpath] = {} unless TabID_TBL[@tpath]
- TabID_TBL[@tpath][@id] = self
- }
- end
- }
- obj
- end
-
- def initialize(parent, pos, name, keys)
- @t = parent
- @tpath = parent.path
- if name
- @path = @id = name
- unless (list(tk_call(@tpath, 'tab', 'names', @id)).empty?)
- if pos
- idx = tk_call(@tpath, 'index', @id)
- if pos.to_s == 'end'
- tk_call(@tpath, 'move', idx, 'after', 'end')
- else
- tk_call(@tpath, 'move', idx, 'before', pos)
- end
- end
- tk_call(@tpath, 'tab', 'configure', @id, keys)
- else
- fail ArgumentError, "can't find tab \"#{@id}\" in #{@t}"
- end
- else
- pos = 'end' unless pos
- @path = @id = tk_call(@tpath, 'insert', pos, keys)
- end
- end
- end
-
- #######################################
+ WidgetClassNames[WidgetClassName] = self
def get_tab(index)
- if (idx = tk_send_without_enc('id', tagindex(index))).empty?
- nil
- else
- Tk::BLT::Tabset::Tab.id2obj(self, idx)
- end
+ Tk::BLT::Tabset::Tab.id2obj(tk_send_without_enc('id', tagindex(index)))
end
alias get_id get_tab
-
- def get_tabobj(index)
- if (idx = tk_send_without_enc('id', tagindex(index))).empty?
- nil
- else
- Tk::BLT::Tabnotebook::Tab.new(self, nil, idx)
- end
- end
-
- alias index_name index
-
- def insert(pos=nil, keys={})
- if pos.kind_of?(Hash)
- keys = pos
- pos = nil
- end
- pos = 'end' if pos.nil?
- Tk::BLT::Tabnotebook::Tab.new(self, nil,
- tk_send('insert', tagindex(pos), keys))
-
- end
- undef :insert_tabs
-
- undef :tab_pageheight, :tab_pagewidth
end
end
diff --git a/ext/tk/lib/tkextlib/blt/tabset.rb b/ext/tk/lib/tkextlib/blt/tabset.rb
index c4716c7304..ca81ad8f95 100644
--- a/ext/tk/lib/tkextlib/blt/tabset.rb
+++ b/ext/tk/lib/tkextlib/blt/tabset.rb
@@ -13,7 +13,7 @@ module Tk::BLT
TabID_TBL = TkCore::INTERP.create_table
- (TabsetTab_ID = ['blt_tabset_tab'.freeze, TkUtil.untrust('00000')]).instance_eval{
+ (TabsetTab_ID = ['blt_tabset_tab'.freeze, '00000'.taint]).instance_eval{
@mutex = Mutex.new
def mutex; @mutex; end
freeze
@@ -27,7 +27,7 @@ module Tk::BLT
tpath = tabset.path
TabID_TBL.mutex.synchronize{
if TabID_TBL[tpath]
- TabID_TBL[tpath][id]? TabID_TBL[tpath][id]: id
+ TabID_TBL[tpath][id]? TabID_TBL[tpath]: id
else
id
end
@@ -48,13 +48,6 @@ module Tk::BLT
TabID_TBL.mutex.synchronize{
if name && TabID_TBL[parent.path] && TabID_TBL[parent.path][name]
obj = TabID_TBL[parent.path][name]
- if pos
- if pos.to_s == 'end'
- obj.move_after('end')
- else
- obj.move_before(pos)
- end
- end
obj.configure if keys && ! keys.empty?
else
(obj = self.allocate).instance_eval{
@@ -76,9 +69,9 @@ module Tk::BLT
if pos
idx = tk_call(@tpath, 'index', '-name', @id)
if pos.to_s == 'end'
- tk_call(@tpath, 'move', idx, 'after', 'end')
+ tk_call(@tpath, idx, 'moveto', 'after', 'end')
else
- tk_call(@tpath, 'move', idx, 'before', pos)
+ tk_call(@tpath, idx, 'moveto', 'before', pos)
end
end
tk_call(@tpath, 'tab', 'configure', @id, keys)
@@ -87,11 +80,11 @@ module Tk::BLT
tk_call(@tpath, 'insert', pos, @id, keys)
end
else
- pos = 'end' unless pos
TabsetTab_ID.mutex.synchronize{
@path = @id = TabsetTab_ID.join(TkCore::INTERP._ip_id_)
TabsetTab_ID[1].succ!
}
+ pos = 'end' unless pos
tk_call(@tpath, 'insert', pos, @id, keys)
end
end
@@ -132,9 +125,6 @@ module Tk::BLT
@t.tab_bindinfo(@id, context)
end
- def cget_tkstring(*args)
- @t.tab_cget_tkstring(@id, *args)
- end
def cget(*args)
@t.tab_cget(@id, *args)
end
@@ -183,10 +173,10 @@ module Tk::BLT
end
def perforation_highlight(mode)
- @t.perforation_highlight(self.index, mode)
+ @t.perforation.highlight(self.index, mode)
end
def perforation_invoke()
- @t.perforation_invoke(self.index)
+ @t.perforation.invoke(self.index)
end
def see()
@@ -213,7 +203,7 @@ module Tk::BLT
TkCommandNames = ['::blt::tabset'.freeze].freeze
WidgetClassName = 'Tabset'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def __destroy_hook__
Tk::BLT::Tabset::Tab::TabID_TBL.mutex.synchronize{
@@ -252,7 +242,6 @@ module Tk::BLT
end
private :__item_pathname
- alias tab_cget_tkstring itemcget_tkstring
alias tab_cget itemcget
alias tab_cget_strict itemcget_strict
alias tab_configure itemconfigure
@@ -346,43 +335,19 @@ module Tk::BLT
end
def get_tab(index)
- if (idx = tk_send_without_enc('get', tagindex(index))).empty?
- nil
- else
- Tk::BLT::Tabset::Tab.id2obj(self, idx)
- end
- end
- def get_tabobj(index)
- if (idx = tk_send_without_enc('get', tagindex(index))).empty?
- nil
- else
- Tk::BLT::Tabset::Tab.new(self, nil, name, {})
- end
+ Tk::BLT::Tabset::Tab.id2obj(tk_send_without_enc('get', tagindex(index)))
end
def index(str)
num_or_str(tk_send('index', str))
end
def index_name(tab)
- num_or_str(tk_send('index', '-name', tagid(tab)))
+ num_or_str(tk_send('index', '-mame', tagid(tab)))
end
def insert(pos, tab, keys={})
- pos = 'end' if pos.nil?
Tk::BLT::Tabset::Tab.new(self, tagindex(pos), tagid(tab), keys)
end
- def insert_tabs(pos, *tabs)
- pos = 'end' if pos.nil?
- if tabs[-1].kind_of?(Hash)
- keys = tabs.pop
- else
- keys = {}
- end
- fail ArgumentError, 'no tabs is given' if tabs.empty?
- tabs.map!{|tab| tagid(tab)}
- tk_send('insert', tagindex(pos), *(tabs + [keys]))
- tabs.collect{|tab| Tk::BLT::Tabset::Tab.new(self, nil, tagid(tab))}
- end
def invoke(index)
tk_send('invoke', tagindex(index))
@@ -398,31 +363,15 @@ module Tk::BLT
end
def nearest(x, y)
- Tk::BLT::Tabset::Tab.id2obj(self, num_or_str(tk_send_without_enc('nearest', x, y)))
+ Tk::BLT::Tabset::Tab.id2obj(num_or_str(tk_send_without_enc('nearest', x, y)))
end
- def perforation_activate(mode)
- tk_send('perforation', 'activate', mode)
- self
- end
- def perforation_highlight(index, *args)
- if args.empty?
- # index --> mode
- tk_send('perforation', 'highlight', index)
- elsif args.size == 1
- # args[0] --> mode
- tk_send('perforation', 'highlight', tagindex(index), args[0])
- else # Error: call to get Tcl's error message
- tk_send('perforation', 'highlight', tagindex(index), *args)
- end
+ def perforation_highlight(index, mode)
+ tk_send('perforation', 'highlight', tagindex(index), mode)
self
end
- def perforation_invoke(index=nil)
- if index
- tk_send('perforation', 'invoke', tagindex(index))
- else
- tk_send('perforation', 'invoke')
- end
+ def perforation_invoke(index)
+ tk_send('perforation', 'invoke', tagindex(index))
end
def scan_mark(x, y)
@@ -448,37 +397,14 @@ module Tk::BLT
self
end
- def tab_dockall
- tk_send('tab', 'dockall')
- self
- end
-
def tab_names(pat=None)
simplelist(tk_send('tab', 'names', pat)).collect{|name|
- Tk::BLT::Tabset::Tab.id2obj(self, name)
+ Tk::BLT::Tabset::Tab.id2obj(name)
}
end
- def tab_objs(pat=None)
- simplelist(tk_send('tab', 'names', pat)).collect{|name|
- Tk::BLT::Tabset::Tab.new(self, nil, name, {})
- }
- end
-
- def tab_ids(pat=None)
- simplelist(tk_send('tab', 'names', pat))
- end
-
- def tab_pageheight
- number(tk_send('tab', 'pageheight'))
- end
-
- def tab_pagewidth
- number(tk_send('tab', 'pagewidth'))
- end
-
- def tab_tearoff(index, parent=None)
- window(tk_send('tab', 'tearoff', tagindex(index), parent))
+ def tab_tearoff(index, name=None)
+ window(tk_send('tab', 'tearoff', tagindex(index), name))
end
def xscrollcommand(cmd=Proc.new)
diff --git a/ext/tk/lib/tkextlib/blt/ted.rb b/ext/tk/lib/tkextlib/blt/ted.rb
index 53ab9acdaa..670265fc78 100644
--- a/ext/tk/lib/tkextlib/blt/ted.rb
+++ b/ext/tk/lib/tkextlib/blt/ted.rb
@@ -30,12 +30,9 @@ module Tk::BLT
end
private :__item_config_cmd
- private :itemcget_tkstring, :itemcget, :itemcget_strict
+ private :itemcget, :itemcget_strict
private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
- def cget_tkstring(master, option)
- itemcget_tkstring(master, option)
- end
def cget(master, option)
itemcget(master, option)
end
diff --git a/ext/tk/lib/tkextlib/blt/tile.rb b/ext/tk/lib/tkextlib/blt/tile.rb
index c67cafd8d6..5f5242f299 100644
--- a/ext/tk/lib/tkextlib/blt/tile.rb
+++ b/ext/tk/lib/tkextlib/blt/tile.rb
@@ -8,10 +8,6 @@ require 'tkextlib/blt.rb'
module Tk::BLT
module Tile
- TkComm::TkExtlibAutoloadModule.unshift(self)
- # Require autoload-symbols which is a same name as widget classname.
- # Those are used at TkComm._genobj_for_tkwidget method.
-
autoload :Button, 'tkextlib/blt/tile/button.rb'
autoload :CheckButton, 'tkextlib/blt/tile/checkbutton.rb'
autoload :Checkbutton, 'tkextlib/blt/tile/checkbutton.rb'
diff --git a/ext/tk/lib/tkextlib/blt/tree.rb b/ext/tk/lib/tkextlib/blt/tree.rb
index da53a6ed04..77b85f1717 100644
--- a/ext/tk/lib/tkextlib/blt/tree.rb
+++ b/ext/tk/lib/tkextlib/blt/tree.rb
@@ -182,7 +182,7 @@ module Tk::BLT
def move(dest, keys={})
@tree.keys(@id, dest, keys)
self
- end
+ end
def next()
@tree.next(@id)
@@ -272,7 +272,7 @@ module Tk::BLT
TreeTagID_TBL.mutex.synchronize{ TreeTagID_TBL.clear }
}
- (TreeTag_ID = ['blt_tree_tag'.freeze, TkUtil.untrust('00000')]).instance_eval{
+ (TreeTag_ID = ['blt_tree_tag'.freeze, '00000'.taint]).instance_eval{
@mutex = Mutex.new
def mutex; @mutex; end
freeze
@@ -397,10 +397,10 @@ module Tk::BLT
NotifyID_TBL.mutex.synchronize{
if tree.kind_of?(Array)
# not create
- tpath = tree[0].path
+ tpath = tree[0].path
NotifyID_TBL[tpath] ||= {}
unless (obj = NotifyID_TBL[tpath][tree[1]])
- (NotifyID_TBL[tpath][tree[1]] =
+ (NotifyID_TBL[tpath][tree[1]] =
obj = self.allocate).instance_eval{
@parent = @tree = tree[0]
@tpath = @parent.path
@@ -438,7 +438,7 @@ module Tk::BLT
args = args.collect{|arg| '-' << arg.to_s}
args << proc{|id, type|
- cmd.call(Tk::BLT::Tree::Node.id2obj(@tree, id),
+ cmd.call(Tk::BLT::Tree::Node.id2obj(@tree, id),
((type[0] == ?-)? type[1..-1]: type))
}
@@ -509,7 +509,7 @@ module Tk::BLT
tpath = tree[0].path
TraceID_TBL[tpath] ||= {}
unless (obj = TraceID_TBL[tpath][tree[1]])
- (TraceID_TBL[tpath][tree[1]] =
+ (TraceID_TBL[tpath][tree[1]] =
obj = self.allocate).instance_eval{
@parent = @tree = tree
@tpath = @parent.path
@@ -541,8 +541,8 @@ module Tk::BLT
end
end
- @path = @id = tk_call(@tpath, 'trace', 'create', node, key, opts,
- proc{|t, id, k, ops|
+ @path = @id = tk_call(@tpath, 'trace', 'create', node, key, opts,
+ proc{|t, id, k, ops|
tobj = Tk::BLT::Tree.id2obj(t)
if tobj.kind_of?(Tk::BLT::Tree)
nobj = Tk::BLT::Tree::Node.id2obj(tobj, id)
@@ -578,7 +578,7 @@ module Tk::BLT
TreeID_TBL = TkCore::INTERP.create_table
- (Tree_ID = ['blt_tree'.freeze, TkUtil.untrust('00000')]).instance_eval{
+ (Tree_ID = ['blt_tree'.freeze, '00000'.taint]).instance_eval{
@mutex = Mutex.new
def mutex; @mutex; end
freeze
@@ -599,8 +599,8 @@ module Tk::BLT
'recurse'=>nil, 'tags'=>nil,
# sort command
- 'ascii'=>nil, 'decreasing'=>nil, 'disctionary'=>nil,
- 'integer'=>nil, 'real'=>nil, 'recurse'=>nil, 'reorder'=>nil,
+ 'ascii'=>nil, 'decreasing'=>nil, 'disctionary'=>nil,
+ 'integer'=>nil, 'real'=>nil, 'recurse'=>nil, 'reorder'=>nil,
}
end
@@ -624,7 +624,7 @@ module Tk::BLT
def self.new(name = nil)
TreeID_TBL.mutex.synchronize{
if name && TreeID_TBL[name]
- TreeID_TBL[name]
+ TreeID_TBL[name]
else
(obj = self.allocate).instance_eval{
initialize(name)
@@ -680,7 +680,7 @@ module Tk::BLT
end
def ancestor(node1, node2)
- Tk::BLT::Tree::Node.id2obj(self, tk_call('::blt::tree', 'ancestor',
+ Tk::BLT::Tree::Node.id2obj(self, tk_call('::blt::tree', 'ancestor',
tagid(node1), tagid(node2)))
end
@@ -701,14 +701,14 @@ module Tk::BLT
end
def copy(src, parent, keys={})
- id = tk_call('::blt::tree', 'copy', tagid(src), tagid(parent),
+ id = tk_call('::blt::tree', 'copy', tagid(src), tagid(parent),
__conv_keyonly_opts(keys))
Tk::BLT::Tree::Node.new(self, nil, 'node'=>id)
end
def copy_to(src, dest_tree, parent, keys={})
return copy(src, parent, keys={}) unless dest_tree
- id = tk_call('::blt::tree', 'copy', tagid(src), dest_tree,
+ id = tk_call('::blt::tree', 'copy', tagid(src), dest_tree,
tagid(parent), __conv_keyonly_opts(keys))
Tk::BLT::Tree::Node.new(dest_tree, nil, 'node'=>id)
end
@@ -751,7 +751,7 @@ module Tk::BLT
end
def find(node, keys={})
- simplelist(tk_call('::blt::tree', 'find', tagid(node),
+ simplelist(tk_call('::blt::tree', 'find', tagid(node),
__conv_keyonly_opts(keys))).collect{|n|
Tk::BLT::Tree::Node.id2obj(self, n)
}
@@ -775,7 +775,7 @@ module Tk::BLT
end
def index(node)
- Tk::BLT::Tree::Node.id2obj(self,
+ Tk::BLT::Tree::Node.id2obj(self,
tk_call('::blt::tree', 'index', tagid(node)))
end
@@ -785,11 +785,11 @@ module Tk::BLT
end
def ancestor?(node1, node2)
- bool(tk_call('::blt::tree', 'is', 'ancestor',
+ bool(tk_call('::blt::tree', 'is', 'ancestor',
tagid(node1), tagid(node2)))
end
def before?(node1, node2)
- bool(tk_call('::blt::tree', 'is', 'before',
+ bool(tk_call('::blt::tree', 'is', 'before',
tagid(node1), tagid(node2)))
end
def leaf?(node)
@@ -806,7 +806,7 @@ module Tk::BLT
if nodes.empty?
simplelist(tk_call('blt::tree', 'keys', tagid(node)))
else
- simplelist(tk_call('blt::tree', 'keys', tagid(node),
+ simplelist(tk_call('blt::tree', 'keys', tagid(node),
*(nodes.collect{|n| tagid(n)}))).collect{|lst|
simplelist(lst)
}
@@ -828,7 +828,7 @@ module Tk::BLT
end
def link(parent, node, keys={})
- ret = tk_call('::blt::tree', 'link', tagid(parent), tagid(node),
+ ret = tk_call('::blt::tree', 'link', tagid(parent), tagid(node),
__conv_keyonly_opts(keys))
(ret == '-1')? nil: Tk::BLT::Tree::Node.id2obj(self, ret)
end
@@ -902,7 +902,7 @@ module Tk::BLT
end
def restore(node, str, keys={})
- tk_call('::blt::tree', 'restore', tagid(node), str,
+ tk_call('::blt::tree', 'restore', tagid(node), str,
__conv_keyonly_opts(keys))
self
end
@@ -915,7 +915,7 @@ module Tk::BLT
end
def restore_from_file(node, file, keys={})
- tk_call('::blt::tree', 'restorefile', tagid(node), file,
+ tk_call('::blt::tree', 'restorefile', tagid(node), file,
__conv_keyonly_opts(keys))
self
end
@@ -923,13 +923,13 @@ module Tk::BLT
keys = __conv_keyonly_opts(keys)
keys.delete('overwrite')
keys.delete(:overwrite)
- tk_call('::blt::tree', 'restorefile', tagid(node), file,
+ tk_call('::blt::tree', 'restorefile', tagid(node), file,
'-overwrite', keys)
self
end
def root(node=None)
- Tk::BLT::Tree::Node.id2obj(self, tk_call('::blt::tree', 'root',
+ Tk::BLT::Tree::Node.id2obj(self, tk_call('::blt::tree', 'root',
tagid(node)))
end
@@ -958,7 +958,7 @@ module Tk::BLT
end
def tag_delete(tag, *nodes)
- tk_call(@path, 'tag', 'delete', tagid(tag),
+ tk_call(@path, 'tag', 'delete', tagid(tag),
*(nodes.collect{|n| tagid(n)}))
self
end
@@ -973,7 +973,7 @@ module Tk::BLT
end
def tag_get(node, *patterns)
- simplelist(tk_call(@tpath, 'tag', 'get', tagid(node),
+ simplelist(tk_call(@tpath, 'tag', 'get', tagid(node),
*(patterns.collect{|pat| tagid(pat)}))).collect{|str|
Tk::BLT::Tree::Tag.id2obj(self, str)
}
@@ -997,7 +997,7 @@ module Tk::BLT
end
def tag_unset(node, *tags)
- tk_call(@path, 'tag', 'unset', tagid(node),
+ tk_call(@path, 'tag', 'unset', tagid(node),
*(tags.collect{|t| tagid(t)}))
self
end
diff --git a/ext/tk/lib/tkextlib/blt/treeview.rb b/ext/tk/lib/tkextlib/blt/treeview.rb
index 046cf7f837..c5a5697186 100644
--- a/ext/tk/lib/tkextlib/blt/treeview.rb
+++ b/ext/tk/lib/tkextlib/blt/treeview.rb
@@ -95,9 +95,6 @@ module Tk::BLT::Treeview::ConfigMethod
end
private :__item_pathname
- def column_cget_tkstring(name, option)
- itemcget_tkstring(['column', name], option)
- end
def column_cget(name, option)
itemcget(['column', name], option)
end
@@ -114,9 +111,6 @@ module Tk::BLT::Treeview::ConfigMethod
current_itemconfiginfo(['column', name], slot)
end
- def button_cget_tkstring(option)
- itemcget_tkstring('button', option)
- end
def button_cget(option)
itemcget('button', option)
end
@@ -133,9 +127,6 @@ module Tk::BLT::Treeview::ConfigMethod
current_itemconfiginfo('button', slot)
end
- def entry_cget_tkstring(option)
- itemcget_tkstring('entry', option)
- end
def entry_cget(option)
ret = itemcget('entry', option)
if option == 'bindtags' || option == :bindtags
@@ -190,9 +181,6 @@ module Tk::BLT::Treeview::ConfigMethod
ret
end
- def sort_cget_tkstring(option)
- itemcget_tkstring('sort', option)
- end
def sort_cget(option)
itemcget('sort', option)
end
@@ -209,9 +197,6 @@ module Tk::BLT::Treeview::ConfigMethod
current_itemconfiginfo('sort', slot)
end
- def text_cget_tkstring(option)
- itemcget_tkstring('text', option)
- end
def text_cget(option)
itemcget('text', option)
end
@@ -228,14 +213,14 @@ module Tk::BLT::Treeview::ConfigMethod
current_itemconfiginfo('text', slot)
end
- private :itemcget_tkstring, :itemcget, :itemcget_strict
+ private :itemcget, :itemcget_strict
private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
end
class Tk::BLT::Treeview
TkCommandNames = ['::blt::treeview'.freeze].freeze
WidgetClassName = 'TreeView'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
include Scrollable
include ValidateConfigure
@@ -245,7 +230,7 @@ class Tk::BLT::Treeview
########################
def __boolval_optkeys
- ['autocreate', 'allowduplicates', 'exportselection', 'flat', 'hideroot',
+ ['autocreate', 'allowduplicates', 'exportselection', 'flat', 'hideroot',
'newtags', 'showtitles', 'sortselection']
end
private :__boolval_optkeys
@@ -260,17 +245,17 @@ class Tk::BLT::Treeview
class OpenCloseCommand < TkValidateCommand
class ValidateArgs < TkUtil::CallbackSubst
KEY_TBL = [
- [ ?W, ?w, :widget ],
- [ ?p, ?s, :name ],
- [ ?P, ?s, :fullpath ],
- [ ?#, ?x, :node_id ],
+ [ ?W, ?w, :widget ],
+ [ ?p, ?s, :name ],
+ [ ?P, ?s, :fullpath ],
+ [ ?#, ?x, :node_id ],
nil
]
PROC_TBL = [
- [ ?x, TkComm.method(:num_or_str) ],
- [ ?s, TkComm.method(:string) ],
- [ ?w, TkComm.method(:window) ],
+ [ ?x, TkComm.method(:num_or_str) ],
+ [ ?s, TkComm.method(:string) ],
+ [ ?w, TkComm.method(:window) ],
nil
]
@@ -478,7 +463,7 @@ class Tk::BLT::Treeview
self
end
def entry_children(tag, first=None, last=None)
- simplelist(tk_send('entry', 'children', tagid(tag),
+ simplelist(tk_send('entry', 'children', tagid(tag),
first, last)).collect{|id| tagid2obj(id)}
end
def entry_delete(tag, first=None, last=None)
@@ -515,17 +500,17 @@ class Tk::BLT::Treeview
class FindExecFlagValue < TkValidateCommand
class ValidateArgs < TkUtil::CallbackSubst
KEY_TBL = [
- [ ?W, ?w, :widget ],
- [ ?p, ?s, :name ],
- [ ?P, ?s, :fullpath ],
- [ ?#, ?x, :node_id ],
+ [ ?W, ?w, :widget ],
+ [ ?p, ?s, :name ],
+ [ ?P, ?s, :fullpath ],
+ [ ?#, ?x, :node_id ],
nil
]
PROC_TBL = [
- [ ?x, TkComm.method(:num_or_str) ],
- [ ?s, TkComm.method(:string) ],
- [ ?w, TkComm.method(:window) ],
+ [ ?x, TkComm.method(:num_or_str) ],
+ [ ?s, TkComm.method(:string) ],
+ [ ?w, TkComm.method(:window) ],
nil
]
@@ -661,7 +646,7 @@ class Tk::BLT::Treeview
}
end
def range_open(first, last)
- simplelist(tk_send('range', '-open',
+ simplelist(tk_send('range', '-open',
tagid(first), tagid(last))).collect{|id|
tagid2obj(id)
}
@@ -1044,7 +1029,7 @@ class Tk::BLT::Treeview::Node < TkObject
TreeNodeID_TBL = TkCore::INTERP.create_table
- (TreeNode_ID = ['blt_treeview_node'.freeze, TkUtil.untrust('00000')]).instance_eval{
+ (TreeNode_ID = ['blt_treeview_node'.freeze, '00000'.taint]).instance_eval{
@mutex = Mutex.new
def mutex; @mutex; end
freeze
@@ -1133,7 +1118,7 @@ class Tk::BLT::Treeview::Node < TkObject
at = keys.delete['at']
if parent
- if parent.kind_of?(Tk::BLT::Treeview::Node) ||
+ if parent.kind_of?(Tk::BLT::Treeview::Node) ||
parent.kind_of?(Tk::BLT::Treeview::Tag)
path = [get_full(parent.id)[0], name]
at = nil # ignore 'at' option
@@ -1165,7 +1150,7 @@ class Tk::BLT::Treeview::Tag < TkObject
TreeTagID_TBL = TkCore::INTERP.create_table
- (TreeTag_ID = ['blt_treeview_tag'.freeze, TkUtil.untrust('00000')]).instance_eval{
+ (TreeTag_ID = ['blt_treeview_tag'.freeze, '00000'.taint]).instance_eval{
@mutex = Mutex.new
def mutex; @mutex; end
freeze
@@ -1283,5 +1268,5 @@ end
class Tk::BLT::Hiertable
TkCommandNames = ['::blt::hiertable'.freeze].freeze
WidgetClassName = 'Hiertable'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
end
diff --git a/ext/tk/lib/tkextlib/blt/unix_dnd.rb b/ext/tk/lib/tkextlib/blt/unix_dnd.rb
index 8996f7c891..445002d7a5 100644
--- a/ext/tk/lib/tkextlib/blt/unix_dnd.rb
+++ b/ext/tk/lib/tkextlib/blt/unix_dnd.rb
@@ -30,12 +30,9 @@ module Tk::BLT
end
private :__item_config_cmd
- private :itemcget_tkstring, :itemcget, :itemcget_strict
+ private :itemcget, :itemcget_strict
private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
- def cget_tkstring(win, option)
- itemcget_tkstring(['cget', win], option)
- end
def cget(win, option)
itemcget(['cget', win], option)
end
@@ -52,9 +49,6 @@ module Tk::BLT
current_itemconfiginfo(['configure', win], slot)
end
- def token_cget_tkstring(win, option)
- itemcget_tkstring(['token', 'cget', win], option)
- end
def token_cget(win, option)
itemcget(['token', 'cget', win], option)
end
diff --git a/ext/tk/lib/tkextlib/blt/vector.rb b/ext/tk/lib/tkextlib/blt/vector.rb
index 742e901d3e..76c12a24e8 100644
--- a/ext/tk/lib/tkextlib/blt/vector.rb
+++ b/ext/tk/lib/tkextlib/blt/vector.rb
@@ -49,11 +49,11 @@ module Tk::BLT
size = size.join(':')
end
if size
- @id = TkCore::INTERP._invoke('::blt::vector', 'create',
- "#auto(#{size})", *hash_kv(keys))
+ @id = INTERP._invoke('::blt::vector', 'create',
+ "#auto(#{size})", *hash_kv(keys))
else
- @id = TkCore::INTERP._invoke('::blt::vector', 'create',
- "#auto", *hash_kv(keys))
+ @id = INTERP._invoke('::blt::vector', 'create',
+ "#auto", *hash_kv(keys))
end
TkVar_ID_TBL.mutex.synchronize{
@@ -68,7 +68,7 @@ module Tk::BLT
@trace_opts = nil
# teach Tk-ip that @id is global var
- TkCore::INTERP._invoke_without_enc('global', @id)
+ INTERP._invoke_without_enc('global', @id)
end
def destroy
@@ -250,7 +250,7 @@ module Tk::BLT
@trace_opts = nil
# teach Tk-ip that @id is global var
- TkCore::INTERP._invoke_without_enc('global', @id)
+ INTERP._invoke_without_enc('global', @id)
end
end
end
diff --git a/ext/tk/lib/tkextlib/blt/watch.rb b/ext/tk/lib/tkextlib/blt/watch.rb
index 292623ff58..219ff78e97 100644
--- a/ext/tk/lib/tkextlib/blt/watch.rb
+++ b/ext/tk/lib/tkextlib/blt/watch.rb
@@ -14,7 +14,7 @@ module Tk::BLT
WATCH_ID_TBL = TkCore::INTERP.create_table
- (BLT_WATCH_ID = ['blt_watch_id'.freeze, TkUtil.untrust('00000')]).instance_eval{
+ (BLT_WATCH_ID = ['blt_watch_id'.freeze, '00000'.taint]).instance_eval{
@mutex = Mutex.new
def mutex; @mutex; end
freeze
diff --git a/ext/tk/lib/tkextlib/blt/winop.rb b/ext/tk/lib/tkextlib/blt/winop.rb
index 03bdb60810..e371d28ab7 100644
--- a/ext/tk/lib/tkextlib/blt/winop.rb
+++ b/ext/tk/lib/tkextlib/blt/winop.rb
@@ -38,7 +38,7 @@ class << Tk::BLT::Winop
tk_call('::blt::winop', 'image', 'readjpeg', file, photo)
end
def image_resample(src, dest, horiz_filter=None, vert_filter=None)
- tk_call('::blt::winop', 'image', 'resample',
+ tk_call('::blt::winop', 'image', 'resample',
src, dest, horiz_filter, vert_filter)
end
def image_rotate(src, dest, angle)
@@ -47,9 +47,9 @@ class << Tk::BLT::Winop
def image_snap(win, photo, width=None, height=None)
tk_call('::blt::winop', 'image', 'snap', win, photo, width, height)
end
- def image_subsample(src, dest, x, y, width, height,
+ def image_subsample(src, dest, x, y, width, height,
horiz_filter=None, vert_filter=None)
- tk_call('::blt::winop', 'image', 'subsample',
+ tk_call('::blt::winop', 'image', 'subsample',
src, dest, x, y, width, height, horiz_filter, vert_filter)
end
@@ -66,13 +66,13 @@ class << Tk::BLT::Winop
end
def resample(src, dest, horiz_filter=None, vert_filter=None)
- tk_call('::blt::winop', 'resample',
+ tk_call('::blt::winop', 'resample',
src, dest, horiz_filter, vert_filter)
end
- def subsample(src, dest, x, y, width, height,
+ def subsample(src, dest, x, y, width, height,
horiz_filter=None, vert_filter=None)
- tk_call('::blt::winop', 'subsample',
+ tk_call('::blt::winop', 'subsample',
src, dest, x, y, width, height, horiz_filter, vert_filter)
end
diff --git a/ext/tk/lib/tkextlib/bwidget.rb b/ext/tk/lib/tkextlib/bwidget.rb
index 7a1eff51d8..62631d8b54 100644
--- a/ext/tk/lib/tkextlib/bwidget.rb
+++ b/ext/tk/lib/tkextlib/bwidget.rb
@@ -18,8 +18,6 @@ TkPackage.require('BWidget')
module Tk
module BWidget
TkComm::TkExtlibAutoloadModule.unshift(self)
- # Require autoload-symbols which is a same name as widget classname.
- # Those are used at TkComm._genobj_for_tkwidget method.
extend TkCore
diff --git a/ext/tk/lib/tkextlib/bwidget/arrowbutton.rb b/ext/tk/lib/tkextlib/bwidget/arrowbutton.rb
index 13fe9e59bf..770e5e9ef1 100644
--- a/ext/tk/lib/tkextlib/bwidget/arrowbutton.rb
+++ b/ext/tk/lib/tkextlib/bwidget/arrowbutton.rb
@@ -17,5 +17,5 @@ end
class Tk::BWidget::ArrowButton
TkCommandNames = ['ArrowButton'.freeze].freeze
WidgetClassName = 'ArrowButton'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
end
diff --git a/ext/tk/lib/tkextlib/bwidget/button.rb b/ext/tk/lib/tkextlib/bwidget/button.rb
index e139fb6708..8f3087d098 100644
--- a/ext/tk/lib/tkextlib/bwidget/button.rb
+++ b/ext/tk/lib/tkextlib/bwidget/button.rb
@@ -17,7 +17,7 @@ end
class Tk::BWidget::Button
TkCommandNames = ['Button'.freeze].freeze
WidgetClassName = 'Button'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def __strval_optkeys
super() << 'helptext'
diff --git a/ext/tk/lib/tkextlib/bwidget/buttonbox.rb b/ext/tk/lib/tkextlib/bwidget/buttonbox.rb
index a6de33c40c..8d6d212189 100644
--- a/ext/tk/lib/tkextlib/bwidget/buttonbox.rb
+++ b/ext/tk/lib/tkextlib/bwidget/buttonbox.rb
@@ -17,7 +17,7 @@ end
class Tk::BWidget::ButtonBox
TkCommandNames = ['ButtonBox'.freeze].freeze
WidgetClassName = 'ButtonBox'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
include TkItemConfigMethod
diff --git a/ext/tk/lib/tkextlib/bwidget/combobox.rb b/ext/tk/lib/tkextlib/bwidget/combobox.rb
index 16143dfbc6..1c58a4ccb0 100644
--- a/ext/tk/lib/tkextlib/bwidget/combobox.rb
+++ b/ext/tk/lib/tkextlib/bwidget/combobox.rb
@@ -21,12 +21,7 @@ class Tk::BWidget::ComboBox
TkCommandNames = ['ComboBox'.freeze].freeze
WidgetClassName = 'ComboBox'.freeze
- WidgetClassNames[WidgetClassName] ||= self
-
- def __boolval_optkeys
- super() << 'autocomplete' << 'autopost'
- end
- private :__boolval_optkeys
+ WidgetClassNames[WidgetClassName] = self
def get_listbox(&b)
win = window(tk_send_without_enc('getlistbox'))
@@ -40,12 +35,6 @@ class Tk::BWidget::ComboBox
win
end
- def clear_value
- tk_send_without_enc('clearvalue')
- self
- end
- alias clearvalue clear_value
-
def icursor(idx)
tk_send_without_enc('icursor', idx)
end
diff --git a/ext/tk/lib/tkextlib/bwidget/dialog.rb b/ext/tk/lib/tkextlib/bwidget/dialog.rb
index 3b0656f021..291ca4a962 100644
--- a/ext/tk/lib/tkextlib/bwidget/dialog.rb
+++ b/ext/tk/lib/tkextlib/bwidget/dialog.rb
@@ -18,17 +18,12 @@ end
class Tk::BWidget::Dialog
TkCommandNames = ['Dialog'.freeze].freeze
WidgetClassName = 'Dialog'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
include TkItemConfigMethod
- def __numstrval_optkeys
- super() << 'buttonwidth'
- end
- private :__numstrval_optkeys
-
def __strval_optkeys
- super() << 'title' << 'geometry'
+ super() << 'title'
end
private :__strval_optkeys
@@ -57,20 +52,13 @@ class Tk::BWidget::Dialog
def create_self(keys)
cmd = self.class::TkCommandNames[0]
if keys and keys != None
- tk_call_without_enc(cmd, @path, '-parent', @relative,
+ tk_call_without_enc(cmd, @path, '-parent', @relative,
*hash_kv(keys, true))
else
tk_call_without_enc(cmd, @path, '-parent', @relative)
end
end
- def cget_tkstring(slot)
- if slot.to_s == 'relative'
- super('parent')
- else
- super(slot)
- end
- end
def cget_strict(slot)
if slot.to_s == 'relative'
super('parent')
diff --git a/ext/tk/lib/tkextlib/bwidget/entry.rb b/ext/tk/lib/tkextlib/bwidget/entry.rb
index 8dc4496123..a56890f4e3 100644
--- a/ext/tk/lib/tkextlib/bwidget/entry.rb
+++ b/ext/tk/lib/tkextlib/bwidget/entry.rb
@@ -19,7 +19,7 @@ class Tk::BWidget::Entry
TkCommandNames = ['Entry'.freeze].freeze
WidgetClassName = 'Entry'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def __strval_optkeys
super() << 'helptext' << 'insertbackground'
diff --git a/ext/tk/lib/tkextlib/bwidget/label.rb b/ext/tk/lib/tkextlib/bwidget/label.rb
index e8d9352c62..88a504aa50 100644
--- a/ext/tk/lib/tkextlib/bwidget/label.rb
+++ b/ext/tk/lib/tkextlib/bwidget/label.rb
@@ -17,7 +17,7 @@ end
class Tk::BWidget::Label
TkCommandNames = ['Label'.freeze].freeze
WidgetClassName = 'Label'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def __strval_optkeys
super() << 'helptext'
diff --git a/ext/tk/lib/tkextlib/bwidget/labelentry.rb b/ext/tk/lib/tkextlib/bwidget/labelentry.rb
index 16e7b46933..95b40946a6 100644
--- a/ext/tk/lib/tkextlib/bwidget/labelentry.rb
+++ b/ext/tk/lib/tkextlib/bwidget/labelentry.rb
@@ -21,7 +21,7 @@ class Tk::BWidget::LabelEntry
TkCommandNames = ['LabelEntry'.freeze].freeze
WidgetClassName = 'LabelEntry'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def __strval_optkeys
super() << 'helptext' << 'insertbackground' << 'entryfg' << 'entrybg'
diff --git a/ext/tk/lib/tkextlib/bwidget/labelframe.rb b/ext/tk/lib/tkextlib/bwidget/labelframe.rb
index 0710f213f0..dc221806e4 100644
--- a/ext/tk/lib/tkextlib/bwidget/labelframe.rb
+++ b/ext/tk/lib/tkextlib/bwidget/labelframe.rb
@@ -18,7 +18,7 @@ end
class Tk::BWidget::LabelFrame
TkCommandNames = ['LabelFrame'.freeze].freeze
WidgetClassName = 'LabelFrame'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def __strval_optkeys
super() << 'helptext'
diff --git a/ext/tk/lib/tkextlib/bwidget/listbox.rb b/ext/tk/lib/tkextlib/bwidget/listbox.rb
index 930491c869..093fcb6fb3 100644
--- a/ext/tk/lib/tkextlib/bwidget/listbox.rb
+++ b/ext/tk/lib/tkextlib/bwidget/listbox.rb
@@ -11,7 +11,7 @@ module Tk
module BWidget
class ListBox < TkWindow
# is NOT a subclass of a listbox widget class.
- # because it constructed on a canvas widget.
+ # because it constructed on a canvas widget.
class Item < TkObject
end
@@ -25,11 +25,11 @@ class Tk::BWidget::ListBox
TkCommandNames = ['ListBox'.freeze].freeze
WidgetClassName = 'ListBox'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
class Event_for_Items < TkEvent::Event
def self._get_extra_args_tbl
- [
+ [
TkComm.method(:string) # item idenfier
]
end
@@ -60,7 +60,7 @@ class Tk::BWidget::ListBox
else
cmd = Proc.new
end
- _bind_for_event_class(Event_for_Items, [path, 'bindImage'],
+ _bind_for_event_class(Event_for_Items, [path, 'bindImage'],
context, cmd, *args)
self
end
@@ -76,7 +76,7 @@ class Tk::BWidget::ListBox
else
cmd = Proc.new
end
- _bind_append_for_event_class(Event_for_Items, [path, 'bindImage'],
+ _bind_append_for_event_class(Event_for_Items, [path, 'bindImage'],
context, cmd, *args)
self
end
@@ -101,7 +101,7 @@ class Tk::BWidget::ListBox
else
cmd = Proc.new
end
- _bind_for_event_class(Event_for_Items, [path, 'bindText'],
+ _bind_for_event_class(Event_for_Items, [path, 'bindText'],
context, cmd, *args)
self
end
@@ -117,7 +117,7 @@ class Tk::BWidget::ListBox
else
cmd = Proc.new
end
- _bind_append_for_event_class(Event_for_Items, [path, 'bindText'],
+ _bind_append_for_event_class(Event_for_Items, [path, 'bindText'],
context, cmd, *args)
self
end
@@ -183,19 +183,19 @@ class Tk::BWidget::ListBox
end
def selection_set(*args)
- tk_send_without_enc('selection', 'set',
+ tk_send_without_enc('selection', 'set',
*(args.collect{|item| tagid(item)}))
self
end
def selection_add(*args)
- tk_send_without_enc('selection', 'add',
+ tk_send_without_enc('selection', 'add',
*(args.collect{|item| tagid(item)}))
self
end
def selection_remove(*args)
- tk_send_without_enc('selection', 'remove',
+ tk_send_without_enc('selection', 'remove',
*(args.collect{|item| tagid(item)}))
self
end
@@ -212,7 +212,7 @@ class Tk::BWidget::ListBox::Item
ListItem_TBL = TkCore::INTERP.create_table
- (ListItem_ID = ['bw:item'.freeze, TkUtil.untrust('00000')]).instance_eval{
+ (ListItem_ID = ['bw:item'.freeze, '00000'.taint]).instance_eval{
@mutex = Mutex.new
def mutex; @mutex; end
freeze
@@ -237,7 +237,7 @@ class Tk::BWidget::ListBox::Item
if lbox.kind_of?(Tk::BWidget::ListBox)
@listbox = lbox
else
- fail RuntimeError,
+ fail RuntimeError,
"expect Tk::BWidget::ListBox or Tk::BWidget::ListBox::Item for 1st argument"
end
@@ -294,9 +294,6 @@ class Tk::BWidget::ListBox::Item
val
end
- def cget_tkstring(key)
- @listbox.itemcget_tkstring(@id, key)
- end
def cget(key)
@listbox.itemcget(@id, key)
end
diff --git a/ext/tk/lib/tkextlib/bwidget/mainframe.rb b/ext/tk/lib/tkextlib/bwidget/mainframe.rb
index 92253bd8d3..de66eaf81e 100644
--- a/ext/tk/lib/tkextlib/bwidget/mainframe.rb
+++ b/ext/tk/lib/tkextlib/bwidget/mainframe.rb
@@ -18,7 +18,7 @@ end
class Tk::BWidget::MainFrame
TkCommandNames = ['MainFrame'.freeze].freeze
WidgetClassName = 'MainFrame'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def __strval_optkeys
super() << 'progressfg'
@@ -111,10 +111,6 @@ class Tk::BWidget::MainFrame
win
end
- def get_menustate(tag)
- tk_send('getmenustate', tag) # return state name string
- end
-
def set_menustate(tag, state)
tk_send('setmenustate', tag, state)
self
diff --git a/ext/tk/lib/tkextlib/bwidget/messagedlg.rb b/ext/tk/lib/tkextlib/bwidget/messagedlg.rb
index 7b62614737..b88461baf7 100644
--- a/ext/tk/lib/tkextlib/bwidget/messagedlg.rb
+++ b/ext/tk/lib/tkextlib/bwidget/messagedlg.rb
@@ -17,7 +17,7 @@ end
class Tk::BWidget::MessageDlg
TkCommandNames = ['MessageDlg'.freeze].freeze
WidgetClassName = 'MessageDlg'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def initialize(parent=nil, keys=nil)
@relative = ''
@@ -185,7 +185,7 @@ class Tk::BWidget::MessageDlg
def create
# return the index of the pressed button, or nil if it is destroyed
- ret = num_or_str(tk_call(self.class::TkCommandNames[0],
+ ret = num_or_str(tk_call(self.class::TkCommandNames[0],
@path, *hash_kv(@keys)))
(ret < 0)? nil: ret
end
diff --git a/ext/tk/lib/tkextlib/bwidget/notebook.rb b/ext/tk/lib/tkextlib/bwidget/notebook.rb
index ed28bcd86a..423943619c 100644
--- a/ext/tk/lib/tkextlib/bwidget/notebook.rb
+++ b/ext/tk/lib/tkextlib/bwidget/notebook.rb
@@ -19,11 +19,11 @@ class Tk::BWidget::NoteBook
TkCommandNames = ['NoteBook'.freeze].freeze
WidgetClassName = 'NoteBook'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
class Event_for_Tabs < TkEvent::Event
def self._get_extra_args_tbl
- [
+ [
TkComm.method(:string) # page idenfier
]
end
@@ -57,7 +57,7 @@ class Tk::BWidget::NoteBook
else
cmd = Proc.new
end
- _bind_for_event_class(Event_for_Tabs, [path, 'bindtabs'],
+ _bind_for_event_class(Event_for_Tabs, [path, 'bindtabs'],
context, cmd, *args)
self
end
@@ -73,7 +73,7 @@ class Tk::BWidget::NoteBook
else
cmd = Proc.new
end
- _bind_append_for_event_class(Event_for_Tabs, [path, 'bindtabs'],
+ _bind_append_for_event_class(Event_for_Tabs, [path, 'bindtabs'],
context, cmd, *args)
self
end
diff --git a/ext/tk/lib/tkextlib/bwidget/pagesmanager.rb b/ext/tk/lib/tkextlib/bwidget/pagesmanager.rb
index 31bbf1fb8b..fbc2c11255 100644
--- a/ext/tk/lib/tkextlib/bwidget/pagesmanager.rb
+++ b/ext/tk/lib/tkextlib/bwidget/pagesmanager.rb
@@ -17,7 +17,7 @@ end
class Tk::BWidget::PagesManager
TkCommandNames = ['PagesManager'.freeze].freeze
WidgetClassName = 'PagesManager'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def tagid(id)
# id.to_s
diff --git a/ext/tk/lib/tkextlib/bwidget/panedwindow.rb b/ext/tk/lib/tkextlib/bwidget/panedwindow.rb
index 54cf06cbde..4d979fd523 100644
--- a/ext/tk/lib/tkextlib/bwidget/panedwindow.rb
+++ b/ext/tk/lib/tkextlib/bwidget/panedwindow.rb
@@ -17,12 +17,7 @@ end
class Tk::BWidget::PanedWindow
TkCommandNames = ['PanedWindow'.freeze].freeze
WidgetClassName = 'PanedWindow'.freeze
- WidgetClassNames[WidgetClassName] ||= self
-
- def __strval_optkeys
- super() << 'activator'
- end
- private :__strval_optkeys
+ WidgetClassNames[WidgetClassName] = self
def add(keys={})
window(tk_send('add', *hash_kv(keys)))
diff --git a/ext/tk/lib/tkextlib/bwidget/panelframe.rb b/ext/tk/lib/tkextlib/bwidget/panelframe.rb
index 1cbf914425..84bae0768b 100644
--- a/ext/tk/lib/tkextlib/bwidget/panelframe.rb
+++ b/ext/tk/lib/tkextlib/bwidget/panelframe.rb
@@ -17,7 +17,7 @@ end
class Tk::BWidget::PanelFrame
TkCommandNames = ['PanelFrame'.freeze].freeze
WidgetClassName = 'PanelFrame'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def __strval_optkeys
super() + ['panelforeground', 'panelbackground']
@@ -47,21 +47,11 @@ class Tk::BWidget::PanelFrame
end
def items
- simplelist(tk_send('items')).map{|w| window(w)}
+ list(tk_send('items'))
end
def remove(*wins)
tk_send('remove', *wins)
self
end
-
- def remove_with_destroy(*wins)
- tk_send('remove', '-destroy', *wins)
- self
- end
-
- def delete(*wins) # same to 'remove_with_destroy'
- tk_send('delete', *wins)
- self
- end
end
diff --git a/ext/tk/lib/tkextlib/bwidget/passwddlg.rb b/ext/tk/lib/tkextlib/bwidget/passwddlg.rb
index ea50c87cef..0b635d97bb 100644
--- a/ext/tk/lib/tkextlib/bwidget/passwddlg.rb
+++ b/ext/tk/lib/tkextlib/bwidget/passwddlg.rb
@@ -17,10 +17,10 @@ end
class Tk::BWidget::PasswdDlg
TkCommandNames = ['PasswdDlg'.freeze].freeze
WidgetClassName = 'PasswdDlg'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def __strval_optkeys
- super() << 'loginhelptext' << 'loginlabel' << 'logintext' <<
+ super() << 'loginhelptext' << 'loginlabel' << 'logintext' <<
'passwdlabel' << 'passwdtext'
end
private :__strval_optkeys
@@ -31,13 +31,13 @@ class Tk::BWidget::PasswdDlg
private :__boolval_optkeys
def __tkvariable_optkeys
- super() << 'loginhelpvar' << 'logintextvariable' <<
+ super() << 'loginhelpvar' << 'logintextvariable' <<
'passwdhelpvar' << 'passwdtextvariable'
end
private :__tkvariable_optkeys
def create
- login, passwd = simplelist(tk_call(self.class::TkCommandNames[0],
+ login, passwd = simplelist(tk_call(self.class::TkCommandNames[0],
@path, *hash_kv(@keys)))
[login, passwd]
end
diff --git a/ext/tk/lib/tkextlib/bwidget/progressbar.rb b/ext/tk/lib/tkextlib/bwidget/progressbar.rb
index 18eb67349b..0253ce2ada 100644
--- a/ext/tk/lib/tkextlib/bwidget/progressbar.rb
+++ b/ext/tk/lib/tkextlib/bwidget/progressbar.rb
@@ -16,5 +16,5 @@ end
class Tk::BWidget::ProgressBar
TkCommandNames = ['ProgressBar'.freeze].freeze
WidgetClassName = 'ProgressBar'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
end
diff --git a/ext/tk/lib/tkextlib/bwidget/progressdlg.rb b/ext/tk/lib/tkextlib/bwidget/progressdlg.rb
index 0c0c4540bc..32600255d5 100644
--- a/ext/tk/lib/tkextlib/bwidget/progressdlg.rb
+++ b/ext/tk/lib/tkextlib/bwidget/progressdlg.rb
@@ -19,7 +19,7 @@ end
class Tk::BWidget::ProgressDlg
TkCommandNames = ['ProgressDlg'.freeze].freeze
WidgetClassName = 'ProgressDlg'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def create_self(keys)
# NOT create widget for reusing the object
diff --git a/ext/tk/lib/tkextlib/bwidget/scrollableframe.rb b/ext/tk/lib/tkextlib/bwidget/scrollableframe.rb
index 5bd00d6870..010c960ec5 100644
--- a/ext/tk/lib/tkextlib/bwidget/scrollableframe.rb
+++ b/ext/tk/lib/tkextlib/bwidget/scrollableframe.rb
@@ -19,7 +19,7 @@ class Tk::BWidget::ScrollableFrame
TkCommandNames = ['ScrollableFrame'.freeze].freeze
WidgetClassName = 'ScrollableFrame'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def get_frame(&b)
win = window(tk_send_without_enc('getframe'))
diff --git a/ext/tk/lib/tkextlib/bwidget/scrolledwindow.rb b/ext/tk/lib/tkextlib/bwidget/scrolledwindow.rb
index ea5a18cc66..3599fd8459 100644
--- a/ext/tk/lib/tkextlib/bwidget/scrolledwindow.rb
+++ b/ext/tk/lib/tkextlib/bwidget/scrolledwindow.rb
@@ -17,17 +17,7 @@ end
class Tk::BWidget::ScrolledWindow
TkCommandNames = ['ScrolledWindow'.freeze].freeze
WidgetClassName = 'ScrolledWindow'.freeze
- WidgetClassNames[WidgetClassName] ||= self
-
- def __strval_optkeys
- super() << 'sides'
- end
- private :__strval_optkeys
-
- def __boolval_optkeys
- super() << 'managed'
- end
- private :__boolval_optkeys
+ WidgetClassNames[WidgetClassName] = self
def get_frame(&b)
win = window(tk_send_without_enc('getframe'))
diff --git a/ext/tk/lib/tkextlib/bwidget/scrollview.rb b/ext/tk/lib/tkextlib/bwidget/scrollview.rb
index ab27bc91cf..0546af2c43 100644
--- a/ext/tk/lib/tkextlib/bwidget/scrollview.rb
+++ b/ext/tk/lib/tkextlib/bwidget/scrollview.rb
@@ -16,7 +16,7 @@ end
class Tk::BWidget::ScrollView
TkCommandNames = ['ScrollView'.freeze].freeze
WidgetClassName = 'ScrollView'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def __strval_optkeys
super() << 'fill'
diff --git a/ext/tk/lib/tkextlib/bwidget/selectcolor.rb b/ext/tk/lib/tkextlib/bwidget/selectcolor.rb
index 456175e87e..0f9014f8de 100644
--- a/ext/tk/lib/tkextlib/bwidget/selectcolor.rb
+++ b/ext/tk/lib/tkextlib/bwidget/selectcolor.rb
@@ -24,7 +24,7 @@ class Tk::BWidget::SelectColor
TkCommandNames = ['SelectColor'.freeze].freeze
WidgetClassName = 'SelectColor'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def dialog(keys={})
newkeys = @keys.dup
@@ -57,7 +57,7 @@ class Tk::BWidget::SelectColor::Dialog
def create
@keys['type'] = 'dialog' # 'dialog' type returns color
- tk_call(Tk::BWidget::SelectColor::TkCommandNames[0],
+ tk_call(Tk::BWidget::SelectColor::TkCommandNames[0],
@path, *hash_kv(@keys))
end
end
@@ -67,7 +67,7 @@ class Tk::BWidget::SelectColor::Menubutton
keys = {} unless keys
keys = _symbolkey2str(keys)
keys['type'] = 'menubutton' # 'toolbar' type returns widget path
- window(tk_call(Tk::BWidget::SelectColor::TkCommandNames[0],
+ window(tk_call(Tk::BWidget::SelectColor::TkCommandNames[0],
@path, *hash_kv(keys)))
end
end
diff --git a/ext/tk/lib/tkextlib/bwidget/selectfont.rb b/ext/tk/lib/tkextlib/bwidget/selectfont.rb
index 23419cb0fa..e53eb3b5bc 100644
--- a/ext/tk/lib/tkextlib/bwidget/selectfont.rb
+++ b/ext/tk/lib/tkextlib/bwidget/selectfont.rb
@@ -23,18 +23,13 @@ class Tk::BWidget::SelectFont
TkCommandNames = ['SelectFont'.freeze].freeze
WidgetClassName = 'SelectFont'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def __strval_optkeys
super() << 'sampletext' << 'title'
end
private :__strval_optkeys
- def __boolval_optkeys
- super() << 'nosizes'
- end
- private :__boolval_optkeys
-
def __font_optkeys
[] # without fontobj operation
end
@@ -85,7 +80,7 @@ class Tk::BWidget::SelectFont::Toolbar
keys = {} unless keys
keys = _symbolkey2str(keys)
keys['type'] = 'toolbar' # 'toolbar' type returns widget path
- window(tk_call(Tk::BWidget::SelectFont::TkCommandNames[0],
+ window(tk_call(Tk::BWidget::SelectFont::TkCommandNames[0],
@path, *hash_kv(keys)))
end
end
diff --git a/ext/tk/lib/tkextlib/bwidget/separator.rb b/ext/tk/lib/tkextlib/bwidget/separator.rb
index 6d92321210..d9c3458e51 100644
--- a/ext/tk/lib/tkextlib/bwidget/separator.rb
+++ b/ext/tk/lib/tkextlib/bwidget/separator.rb
@@ -16,5 +16,5 @@ end
class Tk::BWidget::Separator
TkCommandNames = ['Separator'.freeze].freeze
WidgetClassName = 'Separator'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
end
diff --git a/ext/tk/lib/tkextlib/bwidget/setup.rb b/ext/tk/lib/tkextlib/bwidget/setup.rb
index ee406c6ca0..ce0f0bd4d4 100644
--- a/ext/tk/lib/tkextlib/bwidget/setup.rb
+++ b/ext/tk/lib/tkextlib/bwidget/setup.rb
@@ -2,7 +2,7 @@
# setup.rb -- setup script before calling TkPackage.require()
#
# If you need some setup operations (for example, add a library path
-# to the library search path) before using Tcl/Tk library packages
-# wrapped by Ruby scripts in this directory, please write the setup
+# to the library search path) before using Tcl/Tk library packages
+# wrapped by Ruby scripts in this directory, please write the setup
# operations in this file.
#
diff --git a/ext/tk/lib/tkextlib/bwidget/spinbox.rb b/ext/tk/lib/tkextlib/bwidget/spinbox.rb
index 0a45b045fb..48358baa5c 100644
--- a/ext/tk/lib/tkextlib/bwidget/spinbox.rb
+++ b/ext/tk/lib/tkextlib/bwidget/spinbox.rb
@@ -20,7 +20,7 @@ class Tk::BWidget::SpinBox
TkCommandNames = ['SpinBox'.freeze].freeze
WidgetClassName = 'SpinBox'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def __strval_optkeys
super() << 'helptext' << 'insertbackground' << 'entryfg' << 'entrybg'
diff --git a/ext/tk/lib/tkextlib/bwidget/statusbar.rb b/ext/tk/lib/tkextlib/bwidget/statusbar.rb
index 5c5dd43fe4..39c678d37e 100644
--- a/ext/tk/lib/tkextlib/bwidget/statusbar.rb
+++ b/ext/tk/lib/tkextlib/bwidget/statusbar.rb
@@ -17,10 +17,10 @@ end
class Tk::BWidget::StatusBar
TkCommandNames = ['StatusBar'.freeze].freeze
WidgetClassName = 'StatusBar'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def __boolval_optkeys
- super() << 'showresize' << 'showseparator' << 'showresizesep'
+ super() << 'showresize'
end
private :__boolval_optkeys
@@ -29,17 +29,7 @@ class Tk::BWidget::StatusBar
self
end
- def remove(*wins)
- tk_send('remove', *wins)
- self
- end
-
- def remove_with_destroy(*wins)
- tk_send('remove', '-destroy', *wins)
- self
- end
-
- def delete(*wins) # same to 'remove_with_destroy'
+ def delete(*wins)
tk_send('delete', *wins)
self
end
@@ -57,6 +47,6 @@ class Tk::BWidget::StatusBar
end
def items
- simplelist(tk_send('items')).map{|w| window(w)}
+ list(tk_send('items'))
end
end
diff --git a/ext/tk/lib/tkextlib/bwidget/titleframe.rb b/ext/tk/lib/tkextlib/bwidget/titleframe.rb
index 71879111c1..68534e66e9 100644
--- a/ext/tk/lib/tkextlib/bwidget/titleframe.rb
+++ b/ext/tk/lib/tkextlib/bwidget/titleframe.rb
@@ -17,7 +17,7 @@ end
class Tk::BWidget::TitleFrame
TkCommandNames = ['TitleFrame'.freeze].freeze
WidgetClassName = 'TitleFrame'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def get_frame(&b)
win = window(tk_send_without_enc('getframe'))
diff --git a/ext/tk/lib/tkextlib/bwidget/tree.rb b/ext/tk/lib/tkextlib/bwidget/tree.rb
index 089c482fe8..aed4512a73 100644
--- a/ext/tk/lib/tkextlib/bwidget/tree.rb
+++ b/ext/tk/lib/tkextlib/bwidget/tree.rb
@@ -22,11 +22,11 @@ class Tk::BWidget::Tree
TkCommandNames = ['Tree'.freeze].freeze
WidgetClassName = 'Tree'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
class Event_for_Items < TkEvent::Event
def self._get_extra_args_tbl
- [
+ [
TkComm.method(:string) # item idenfier
]
end
@@ -38,7 +38,7 @@ class Tk::BWidget::Tree
private :__strval_optkeys
def __boolval_optkeys
- super() << 'dragenabled' << 'dropenabled' <<
+ super() << 'dragenabled' << 'dropenabled' <<
'redraw' << 'selectfill' << 'showlines'
end
private :__boolval_optkeys
@@ -57,37 +57,6 @@ class Tk::BWidget::Tree
end
end
- def areabind(context, *args)
- if TkComm._callback_entry?(args[0]) || !block_given?
- cmd = args.shift
- else
- cmd = Proc.new
- end
- _bind_for_event_class(Event_for_Items, [path, 'bindArea'],
- context, cmd, *args)
- self
- end
-
- def areabind_append(context, *args)
- if TkComm._callback_entry?(args[0]) || !block_given?
- cmd = args.shift
- else
- cmd = Proc.new
- end
- _bind_append_for_event_class(Event_for_Items, [path, 'bindArea'],
- context, cmd, *args)
- self
- end
-
- def areabind_remove(*args)
- _bind_remove_for_event_class(Event_for_Items, [path, 'bindArea'], *args)
- self
- end
-
- def areabindinfo(*args)
- _bindinfo_for_event_class(Event_for_Items, [path, 'bindArea'], *args)
- end
-
#def imagebind(*args)
# _bind_for_event_class(Event_for_Items, [path, 'bindImage'], *args)
# self
@@ -99,7 +68,7 @@ class Tk::BWidget::Tree
else
cmd = Proc.new
end
- _bind_for_event_class(Event_for_Items, [path, 'bindImage'],
+ _bind_for_event_class(Event_for_Items, [path, 'bindImage'],
context, cmd, *args)
self
end
@@ -115,7 +84,7 @@ class Tk::BWidget::Tree
else
cmd = Proc.new
end
- _bind_append_for_event_class(Event_for_Items, [path, 'bindImage'],
+ _bind_append_for_event_class(Event_for_Items, [path, 'bindImage'],
context, cmd, *args)
self
end
@@ -140,7 +109,7 @@ class Tk::BWidget::Tree
else
cmd = Proc.new
end
- _bind_for_event_class(Event_for_Items, [path, 'bindText'],
+ _bind_for_event_class(Event_for_Items, [path, 'bindText'],
context, cmd, *args)
self
end
@@ -156,7 +125,7 @@ class Tk::BWidget::Tree
else
cmd = Proc.new
end
- _bind_append_for_event_class(Event_for_Items, [path, 'bindText'],
+ _bind_append_for_event_class(Event_for_Items, [path, 'bindText'],
context, cmd, *args)
self
end
@@ -189,16 +158,6 @@ class Tk::BWidget::Tree
bool(tk_send('exists', tagid(node)))
end
- def find(findinfo, confine=None)
- Tk::BWidget::Tree::Node.id2obj(self, tk_send(findinfo, confine))
- end
- def find_position(x, y, confine=None)
- self.find(_at(x,y), confine)
- end
- def find_line(linenum)
- self.find(linenum)
- end
-
def index(node)
num_or_str(tk_send('index', tagid(node)))
end
@@ -208,10 +167,6 @@ class Tk::BWidget::Tree
self
end
- def line(node)
- number(tk_send('line', tagid(node)))
- end
-
def move(parent, node, idx)
tk_send('move', tagid(parent), tagid(node), idx)
self
@@ -228,7 +183,7 @@ class Tk::BWidget::Tree
end
def open?(node)
- bool(self.itemcget(tagid(node), 'open'))
+ bool(@tree.itemcget(tagid(node), 'open'))
end
def open_tree(node, recurse=None)
@@ -251,7 +206,7 @@ class Tk::BWidget::Tree
end
def selection_add(*args)
- tk_send_without_enc('selection', 'add',
+ tk_send_without_enc('selection', 'add',
*(args.collect{|node| tagid(node)}))
self
end
@@ -266,30 +221,30 @@ class Tk::BWidget::Tree
end
def selection_include?(*args)
- bool(tk_send_without_enc('selection', 'get',
+ bool(tk_send_without_enc('selection', 'get',
*(args.collect{|node| tagid(node)})))
end
def selection_range(*args)
- tk_send_without_enc('selection', 'range',
+ tk_send_without_enc('selection', 'range',
*(args.collect{|node| tagid(node)}))
self
end
def selection_remove(*args)
- tk_send_without_enc('selection', 'remove',
+ tk_send_without_enc('selection', 'remove',
*(args.collect{|node| tagid(node)}))
self
end
def selection_set(*args)
- tk_send_without_enc('selection', 'set',
+ tk_send_without_enc('selection', 'set',
*(args.collect{|node| tagid(node)}))
self
end
def selection_toggle(*args)
- tk_send_without_enc('selection', 'toggle',
+ tk_send_without_enc('selection', 'toggle',
*(args.collect{|node| tagid(node)}))
self
end
@@ -309,7 +264,7 @@ class Tk::BWidget::Tree::Node
TreeNode_TBL = TkCore::INTERP.create_table
- (TreeNode_ID = ['bw:node'.freeze, TkUtil.untrust('00000')]).instance_eval{
+ (TreeNode_ID = ['bw:node'.freeze, '00000'.taint]).instance_eval{
@mutex = Mutex.new
def mutex; @mutex; end
freeze
@@ -343,7 +298,7 @@ class Tk::BWidget::Tree::Node
@tree = tree.tree
parent = tree.parent
else
- fail RuntimeError,
+ fail RuntimeError,
"expect Tk::BWidget::Tree or Tk::BWidget::Tree::Node for 1st argument"
end
@@ -400,9 +355,6 @@ class Tk::BWidget::Tree::Node
val
end
- def cget_tkstring(key)
- @tree.itemcget_tkstring(@id, key)
- end
def cget(key)
@tree.itemcget(@id, key)
end
@@ -498,3 +450,4 @@ class Tk::BWidget::Tree::Node
@tree.visible(@id)
end
end
+
diff --git a/ext/tk/lib/tkextlib/itcl/incr_tcl.rb b/ext/tk/lib/tkextlib/itcl/incr_tcl.rb
index 8f6bb33abe..2b75d62eb9 100644
--- a/ext/tk/lib/tkextlib/itcl/incr_tcl.rb
+++ b/ext/tk/lib/tkextlib/itcl/incr_tcl.rb
@@ -40,12 +40,12 @@ module Tk
class ItclObject < TkObject
ITCL_CLASSNAME = ''.freeze
- (ITCL_OBJ_ID = ['itclobj'.freeze, TkUtil.untrust('00000')]).instance_eval{
+ (ITCL_OBJ_ID = ['itclobj'.freeze, '00000'.taint]).instance_eval{
@mutex = Mutex.new
def mutex; @mutex; end
freeze
}
- ITCL_OBJ_TBL = TkUtil.untrust({})
+ ITCL_OBJ_TBL = {}.taint
def initialize(*args)
if (@klass = self.class::ITCL_CLASSNAME).empty?
diff --git a/ext/tk/lib/tkextlib/itcl/setup.rb b/ext/tk/lib/tkextlib/itcl/setup.rb
index 70b38e4916..5be0588703 100644
--- a/ext/tk/lib/tkextlib/itcl/setup.rb
+++ b/ext/tk/lib/tkextlib/itcl/setup.rb
@@ -2,8 +2,8 @@
# setup.rb -- setup script before calling TkPackage.require()
#
# If you need some setup operations (for example, add a library path
-# to the library search path) before using Tcl/Tk library packages
-# wrapped by Ruby scripts in this directory, please write the setup
+# to the library search path) before using Tcl/Tk library packages
+# wrapped by Ruby scripts in this directory, please write the setup
# operations in this file.
#
diff --git a/ext/tk/lib/tkextlib/itk/incr_tk.rb b/ext/tk/lib/tkextlib/itk/incr_tk.rb
index 989585e33b..e06deb552c 100644
--- a/ext/tk/lib/tkextlib/itk/incr_tk.rb
+++ b/ext/tk/lib/tkextlib/itk/incr_tk.rb
@@ -99,7 +99,7 @@ module Tk
def itk_option_define(name, resource, klass, init, config=None)
tk_call('itk_option', 'define', name, resource, klass, init, config)
end
-
+
def itk_option_remove(*args)
tk_call('itk_option', 'remove', *args)
end
@@ -111,7 +111,7 @@ module Tk
class Toplevel < Archetype
TkCommandNames = ['::itk::Toplevel'].freeze
WidgetClassName = 'Toplevel'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
include Wm
include TkMenuSpec
@@ -127,7 +127,7 @@ module Tk
class Widget < Archetype
TkCommandNames = ['::itk::Widget'].freeze
WidgetClassName = 'Widget'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
end
@@ -146,7 +146,7 @@ module Tk
ComponentID_TBL = TkCore::INTERP.create_table
- (Itk_Component_ID = ['itk:component'.freeze, TkUtil.untrust('00000')]).instance_eval{
+ (Itk_Component_ID = ['itk:component'.freeze, '00000'.taint]).instance_eval{
@mutex = Mutex.new
def mutex; @mutex; end
freeze
@@ -192,7 +192,7 @@ module Tk
ComponentID_TBL.mutex.synchronize{
if ComponentID_TBL.key?(master)
if ComponentID_TBL[master].key?(component)
- return ComponentID_TBL[master][component]
+ return ComponentID_TBL[master][component]
end
else
ComponentID_TBL[master] = {}
diff --git a/ext/tk/lib/tkextlib/itk/setup.rb b/ext/tk/lib/tkextlib/itk/setup.rb
index 544926efe0..e47b64adae 100644
--- a/ext/tk/lib/tkextlib/itk/setup.rb
+++ b/ext/tk/lib/tkextlib/itk/setup.rb
@@ -2,8 +2,8 @@
# setup.rb -- setup script before calling TkPackage.require()
#
# If you need some setup operations (for example, add a library path
-# to the library search path) before using Tcl/Tk library packages
-# wrapped by Ruby scripts in this directory, please write the setup
+# to the library search path) before using Tcl/Tk library packages
+# wrapped by Ruby scripts in this directory, please write the setup
# operations in this file.
#
diff --git a/ext/tk/lib/tkextlib/iwidgets/buttonbox.rb b/ext/tk/lib/tkextlib/iwidgets/buttonbox.rb
index 91e06d1b52..05d58c386f 100644
--- a/ext/tk/lib/tkextlib/iwidgets/buttonbox.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/buttonbox.rb
@@ -16,7 +16,7 @@ end
class Tk::Iwidgets::Buttonbox
TkCommandNames = ['::iwidgets::buttonbox'.freeze].freeze
WidgetClassName = 'Buttonbox'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
####################################
@@ -46,14 +46,13 @@ class Tk::Iwidgets::Buttonbox
end
end
- alias buttoncget_tkstring itemcget_tkstring
alias buttoncget itemcget
alias buttoncget_strict itemcget_strict
alias buttonconfigure itemconfigure
alias buttonconfiginfo itemconfiginfo
alias current_buttonconfiginfo current_itemconfiginfo
- private :itemcget_tkstring, :itemcget, :itemcget_strict
+ private :itemcget, :itemcget_strict
private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
####################################
diff --git a/ext/tk/lib/tkextlib/iwidgets/calendar.rb b/ext/tk/lib/tkextlib/iwidgets/calendar.rb
index a5478c7cc6..8495f0e29b 100644
--- a/ext/tk/lib/tkextlib/iwidgets/calendar.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/calendar.rb
@@ -16,11 +16,11 @@ end
class Tk::Iwidgets::Calendar
TkCommandNames = ['::iwidgets::calendar'.freeze].freeze
WidgetClassName = 'Calendar'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def __strval_optkeys
super() + [
- 'buttonforeground', 'outline', 'selectcolor',
+ 'buttonforeground', 'outline', 'selectcolor',
'weekdaybackground', 'weekendbackground'
]
end
diff --git a/ext/tk/lib/tkextlib/iwidgets/canvasprintbox.rb b/ext/tk/lib/tkextlib/iwidgets/canvasprintbox.rb
index 398eec3f1a..fa5e90ad05 100644
--- a/ext/tk/lib/tkextlib/iwidgets/canvasprintbox.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/canvasprintbox.rb
@@ -16,7 +16,7 @@ end
class Tk::Iwidgets::Canvasprintbox
TkCommandNames = ['::iwidgets::canvasprintbox'.freeze].freeze
WidgetClassName = 'Canvasprintbox'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def __strval_optkeys
super() << 'filename'
diff --git a/ext/tk/lib/tkextlib/iwidgets/canvasprintdialog.rb b/ext/tk/lib/tkextlib/iwidgets/canvasprintdialog.rb
index e64d8154ca..bbf507677c 100644
--- a/ext/tk/lib/tkextlib/iwidgets/canvasprintdialog.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/canvasprintdialog.rb
@@ -16,7 +16,7 @@ end
class Tk::Iwidgets::Canvasprintdialog
TkCommandNames = ['::iwidgets::canvasprintdialog'.freeze].freeze
WidgetClassName = 'Canvasprintdialog'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def get_output
tk_call(@path, 'getoutput')
diff --git a/ext/tk/lib/tkextlib/iwidgets/checkbox.rb b/ext/tk/lib/tkextlib/iwidgets/checkbox.rb
index a7476c824e..c85d356c55 100644
--- a/ext/tk/lib/tkextlib/iwidgets/checkbox.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/checkbox.rb
@@ -16,7 +16,7 @@ end
class Tk::Iwidgets::Checkbox
TkCommandNames = ['::iwidgets::checkbox'.freeze].freeze
WidgetClassName = 'Checkbox'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
####################################
@@ -46,14 +46,13 @@ class Tk::Iwidgets::Checkbox
end
end
- alias buttoncget_tkstring itemcget_tkstring
alias buttoncget itemcget
alias buttoncget_strict itemcget_strict
alias buttonconfigure itemconfigure
alias buttonconfiginfo itemconfiginfo
alias current_buttonconfiginfo current_itemconfiginfo
- private :itemcget_tkstring, :itemcget, :itemcget_strict
+ private :itemcget, :itemcget_strict
private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
####################################
diff --git a/ext/tk/lib/tkextlib/iwidgets/combobox.rb b/ext/tk/lib/tkextlib/iwidgets/combobox.rb
index 82dcf25d0b..a6d54d78fa 100644
--- a/ext/tk/lib/tkextlib/iwidgets/combobox.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/combobox.rb
@@ -16,7 +16,7 @@ end
class Tk::Iwidgets::Combobox
TkCommandNames = ['::iwidgets::combobox'.freeze].freeze
WidgetClassName = 'Combobox'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def __boolval_optkeys
super() << 'completion' << 'dropdown' << 'editable' << 'unique'
diff --git a/ext/tk/lib/tkextlib/iwidgets/dateentry.rb b/ext/tk/lib/tkextlib/iwidgets/dateentry.rb
index 98a0051e55..0a8897f50d 100644
--- a/ext/tk/lib/tkextlib/iwidgets/dateentry.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/dateentry.rb
@@ -16,5 +16,5 @@ end
class Tk::Iwidgets::Dateentry
TkCommandNames = ['::iwidgets::dateentry'.freeze].freeze
WidgetClassName = 'Dateentry'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
end
diff --git a/ext/tk/lib/tkextlib/iwidgets/datefield.rb b/ext/tk/lib/tkextlib/iwidgets/datefield.rb
index 50d5405a3b..632f3334dc 100644
--- a/ext/tk/lib/tkextlib/iwidgets/datefield.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/datefield.rb
@@ -16,7 +16,7 @@ end
class Tk::Iwidgets::Datefield
TkCommandNames = ['::iwidgets::datefield'.freeze].freeze
WidgetClassName = 'Datefield'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def __boolval_optkeys
super() << 'gmt'
diff --git a/ext/tk/lib/tkextlib/iwidgets/dialog.rb b/ext/tk/lib/tkextlib/iwidgets/dialog.rb
index 2d554ca7b5..8540eae1b5 100644
--- a/ext/tk/lib/tkextlib/iwidgets/dialog.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/dialog.rb
@@ -16,5 +16,5 @@ end
class Tk::Iwidgets::Dialog
TkCommandNames = ['::iwidgets::dialog'.freeze].freeze
WidgetClassName = 'Dialog'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
end
diff --git a/ext/tk/lib/tkextlib/iwidgets/dialogshell.rb b/ext/tk/lib/tkextlib/iwidgets/dialogshell.rb
index e880594532..8d43cc07ab 100644
--- a/ext/tk/lib/tkextlib/iwidgets/dialogshell.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/dialogshell.rb
@@ -16,7 +16,7 @@ end
class Tk::Iwidgets::Dialogshell
TkCommandNames = ['::iwidgets::dialogshell'.freeze].freeze
WidgetClassName = 'Dialogshell'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
####################################
@@ -46,14 +46,13 @@ class Tk::Iwidgets::Dialogshell
end
end
- alias buttoncget_tkstring itemcget_tkstring
alias buttoncget itemcget
alias buttoncget_strict itemcget_strict
alias buttonconfigure itemconfigure
alias buttonconfiginfo itemconfiginfo
alias current_buttonconfiginfo current_itemconfiginfo
- private :itemcget_tkstring, :itemcget, :itemcget_strict
+ private :itemcget, :itemcget_strict
private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
####################################
diff --git a/ext/tk/lib/tkextlib/iwidgets/disjointlistbox.rb b/ext/tk/lib/tkextlib/iwidgets/disjointlistbox.rb
index 07ab025cdf..9bc063ba69 100644
--- a/ext/tk/lib/tkextlib/iwidgets/disjointlistbox.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/disjointlistbox.rb
@@ -16,7 +16,7 @@ end
class Tk::Iwidgets::Disjointlistbox
TkCommandNames = ['::iwidgets::disjointlistbox'.freeze].freeze
WidgetClassName = 'Disjointlistbox'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def __strval_optkeys
super() << 'lhslabeltext' << 'rhslabeltext' << 'lhsbuttonlabel' << 'rhsbuttonlabel'
diff --git a/ext/tk/lib/tkextlib/iwidgets/entryfield.rb b/ext/tk/lib/tkextlib/iwidgets/entryfield.rb
index 3e7149a662..d53df216bf 100644
--- a/ext/tk/lib/tkextlib/iwidgets/entryfield.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/entryfield.rb
@@ -16,7 +16,7 @@ end
class Tk::Iwidgets::Entryfield
TkCommandNames = ['::iwidgets::entryfield'.freeze].freeze
WidgetClassName = 'Entryfield'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def __font_optkeys
super() << 'textfont'
@@ -30,16 +30,16 @@ class Tk::Iwidgets::Entryfield
class EntryfieldValidate < TkValidateCommand
#class CalCmdArgs < TkUtil::CallbackSubst
class ValidateArgs < TkUtil::CallbackSubst
- KEY_TBL = [
- [ ?c, ?s, :char ],
- [ ?P, ?s, :post ],
- [ ?S, ?s, :current ],
- [ ?W, ?w, :widget ],
+ KEY_TBL = [
+ [ ?c, ?s, :char ],
+ [ ?P, ?s, :post ],
+ [ ?S, ?s, :current ],
+ [ ?W, ?w, :widget ],
nil
]
- PROC_TBL = [
- [ ?s, TkComm.method(:string) ],
- [ ?w, TkComm.method(:window) ],
+ PROC_TBL = [
+ [ ?s, TkComm.method(:string) ],
+ [ ?w, TkComm.method(:window) ],
nil
]
diff --git a/ext/tk/lib/tkextlib/iwidgets/extbutton.rb b/ext/tk/lib/tkextlib/iwidgets/extbutton.rb
index e744fba91a..158d9d474a 100644
--- a/ext/tk/lib/tkextlib/iwidgets/extbutton.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/extbutton.rb
@@ -16,7 +16,7 @@ end
class Tk::Iwidgets::Extbutton
TkCommandNames = ['::iwidgets::extbutton'.freeze].freeze
WidgetClassName = 'Extbutton'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def __strval_optkeys
super() << 'bitmapforeground' << 'ringbackground'
diff --git a/ext/tk/lib/tkextlib/iwidgets/extfileselectionbox.rb b/ext/tk/lib/tkextlib/iwidgets/extfileselectionbox.rb
index 2ff15bb509..501f4c90a0 100644
--- a/ext/tk/lib/tkextlib/iwidgets/extfileselectionbox.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/extfileselectionbox.rb
@@ -16,11 +16,11 @@ end
class Tk::Iwidgets::Extfileselectionbox
TkCommandNames = ['::iwidgets::extfileselectionbox'.freeze].freeze
WidgetClassName = 'Extfileselectionbox'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def __strval_optkeys
super() + [
- 'dirslabel', 'fileslabel', 'filterlabel', 'mask', 'nomatchstring',
+ 'dirslabel', 'fileslabel', 'filterlabel', 'mask', 'nomatchstring',
'selectionlabel'
]
end
diff --git a/ext/tk/lib/tkextlib/iwidgets/extfileselectiondialog.rb b/ext/tk/lib/tkextlib/iwidgets/extfileselectiondialog.rb
index 509fdcf636..14388be7c4 100644
--- a/ext/tk/lib/tkextlib/iwidgets/extfileselectiondialog.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/extfileselectiondialog.rb
@@ -16,7 +16,7 @@ end
class Tk::Iwidgets::Extfileselectiondialog
TkCommandNames = ['::iwidgets::extfileselectiondialog'.freeze].freeze
WidgetClassName = 'Extfileselectiondialog'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def child_site
window(tk_call(@path, 'childsite'))
diff --git a/ext/tk/lib/tkextlib/iwidgets/feedback.rb b/ext/tk/lib/tkextlib/iwidgets/feedback.rb
index 29d04c8a5d..0a25237a24 100644
--- a/ext/tk/lib/tkextlib/iwidgets/feedback.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/feedback.rb
@@ -16,7 +16,7 @@ end
class Tk::Iwidgets::Feedback
TkCommandNames = ['::iwidgets::feedback'.freeze].freeze
WidgetClassName = 'Feedback'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def __strval_optkeys
super() << 'barcolor'
diff --git a/ext/tk/lib/tkextlib/iwidgets/fileselectionbox.rb b/ext/tk/lib/tkextlib/iwidgets/fileselectionbox.rb
index a425b53b5f..7b331d0b40 100644
--- a/ext/tk/lib/tkextlib/iwidgets/fileselectionbox.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/fileselectionbox.rb
@@ -16,11 +16,11 @@ end
class Tk::Iwidgets::Fileselectionbox
TkCommandNames = ['::iwidgets::fileselectionbox'.freeze].freeze
WidgetClassName = 'Fileselectionbox'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def __strval_optkeys
super() + [
- 'directory', 'dirslabel', 'fileslabel', 'filterlabel', 'mask',
+ 'directory', 'dirslabel', 'fileslabel', 'filterlabel', 'mask',
'nomatchstring', 'selectionlabel'
]
end
diff --git a/ext/tk/lib/tkextlib/iwidgets/fileselectiondialog.rb b/ext/tk/lib/tkextlib/iwidgets/fileselectiondialog.rb
index ebcdaf8c0b..50f459e56d 100644
--- a/ext/tk/lib/tkextlib/iwidgets/fileselectiondialog.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/fileselectiondialog.rb
@@ -16,7 +16,7 @@ end
class Tk::Iwidgets::Fileselectiondialog
TkCommandNames = ['::iwidgets::fileselectiondialog'.freeze].freeze
WidgetClassName = 'Fileselectiondialog'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def child_site
window(tk_call(@path, 'childsite'))
diff --git a/ext/tk/lib/tkextlib/iwidgets/finddialog.rb b/ext/tk/lib/tkextlib/iwidgets/finddialog.rb
index 3d522e07c8..75e219c37e 100644
--- a/ext/tk/lib/tkextlib/iwidgets/finddialog.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/finddialog.rb
@@ -16,11 +16,11 @@ end
class Tk::Iwidgets::Finddialog
TkCommandNames = ['::iwidgets::finddialog'.freeze].freeze
WidgetClassName = 'Finddialog'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def __strval_optkeys
super() + [
- 'patternbackground', 'patternforeground',
+ 'patternbackground', 'patternforeground',
'searchbackground', 'searchforeground'
]
end
diff --git a/ext/tk/lib/tkextlib/iwidgets/hierarchy.rb b/ext/tk/lib/tkextlib/iwidgets/hierarchy.rb
index cb9301d0c9..d9220fecbf 100644
--- a/ext/tk/lib/tkextlib/iwidgets/hierarchy.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/hierarchy.rb
@@ -20,7 +20,7 @@ class Tk::Iwidgets::Hierarchy
TkCommandNames = ['::iwidgets::hierarchy'.freeze].freeze
WidgetClassName = 'Hierarchy'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
####################################
@@ -64,15 +64,15 @@ class Tk::Iwidgets::Hierarchy
class IndicatorCommand < TkValidateCommand
class ValidateArgs < TkUtil::CallbackSubst
- KEY_TBL = [
- [ ?n, ?s, :node ],
- [ ?s, ?b, :status ],
+ KEY_TBL = [
+ [ ?n, ?s, :node ],
+ [ ?s, ?b, :status ],
nil
]
- PROC_TBL = [
- [ ?s, TkComm.method(:string) ],
- [ ?b, TkComm.method(:bool) ],
+ PROC_TBL = [
+ [ ?s, TkComm.method(:string) ],
+ [ ?b, TkComm.method(:bool) ],
nil
]
@@ -109,9 +109,9 @@ class Tk::Iwidgets::Hierarchy
class IconCommand < TkValidateCommand
class ValidateArgs < TkUtil::CallbackSubst
- KEY_TBL = [
- [ ?n, ?s, :node ],
- [ ?i, ?s, :icon ],
+ KEY_TBL = [
+ [ ?n, ?s, :node ],
+ [ ?i, ?s, :icon ],
nil
]
PROC_TBL = [ [ ?s, TkComm.method(:string) ], nil ]
@@ -270,7 +270,7 @@ class Tk::Iwidgets::Hierarchy
end
def compare(idx1, op, idx2)
- bool(tk_send_without_enc('compare', _get_eval_enc_str(idx1),
+ bool(tk_send_without_enc('compare', _get_eval_enc_str(idx1),
op, _get_eval_enc_str(idx2)))
end
diff --git a/ext/tk/lib/tkextlib/iwidgets/hyperhelp.rb b/ext/tk/lib/tkextlib/iwidgets/hyperhelp.rb
index d4ea1aac65..77b0e090cd 100644
--- a/ext/tk/lib/tkextlib/iwidgets/hyperhelp.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/hyperhelp.rb
@@ -16,7 +16,7 @@ end
class Tk::Iwidgets::Hyperhelp
TkCommandNames = ['::iwidgets::hyperhelp'.freeze].freeze
WidgetClassName = 'Hyperhelp'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def __strval_optkeys
super() << 'helpdir'
diff --git a/ext/tk/lib/tkextlib/iwidgets/labeledframe.rb b/ext/tk/lib/tkextlib/iwidgets/labeledframe.rb
index 6595398427..e77e85045d 100644
--- a/ext/tk/lib/tkextlib/iwidgets/labeledframe.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/labeledframe.rb
@@ -16,7 +16,7 @@ end
class Tk::Iwidgets::Labeledframe
TkCommandNames = ['::iwidgets::labeledframe'.freeze].freeze
WidgetClassName = 'Labeledframe'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def __strval_optkeys
super() << 'labeltext'
diff --git a/ext/tk/lib/tkextlib/iwidgets/labeledwidget.rb b/ext/tk/lib/tkextlib/iwidgets/labeledwidget.rb
index d36d42878d..99387710cb 100644
--- a/ext/tk/lib/tkextlib/iwidgets/labeledwidget.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/labeledwidget.rb
@@ -18,7 +18,7 @@ class Tk::Iwidgets::Labeledwidget
TkCommandNames = ['::iwidgets::labeledwidget'.freeze].freeze
WidgetClassName = 'Labeledwidget'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def __strval_optkeys
super() << 'labeltext'
diff --git a/ext/tk/lib/tkextlib/iwidgets/mainwindow.rb b/ext/tk/lib/tkextlib/iwidgets/mainwindow.rb
index ebf48021db..4b2541b997 100644
--- a/ext/tk/lib/tkextlib/iwidgets/mainwindow.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/mainwindow.rb
@@ -16,7 +16,7 @@ end
class Tk::Iwidgets::Mainwindow
TkCommandNames = ['::iwidgets::mainwindow'.freeze].freeze
WidgetClassName = 'Mainwindow'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def __boolval_optkeys
super() << 'helpline' << 'statusline'
diff --git a/ext/tk/lib/tkextlib/iwidgets/menubar.rb b/ext/tk/lib/tkextlib/iwidgets/menubar.rb
index f9a17d0b55..5aaefbe50d 100644
--- a/ext/tk/lib/tkextlib/iwidgets/menubar.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/menubar.rb
@@ -16,7 +16,7 @@ end
class Tk::Iwidgets::Menubar
TkCommandNames = ['::iwidgets::menubar'.freeze].freeze
WidgetClassName = 'Menubar'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def __strval_optkeys
super() << 'menubuttons'
@@ -61,14 +61,13 @@ class Tk::Iwidgets::Menubar
end
end
- alias menucget_tkstring itemcget_tkstring
alias menucget itemcget
alias menucget_strict itemcget_strict
alias menuconfigure itemconfigure
alias menuconfiginfo itemconfiginfo
alias current_menuconfiginfo current_itemconfiginfo
- private :itemcget_tkstring, :itemcget, :itemcget_strict
+ private :itemcget, :itemcget_strict
private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
####################################
diff --git a/ext/tk/lib/tkextlib/iwidgets/messagebox.rb b/ext/tk/lib/tkextlib/iwidgets/messagebox.rb
index 6adb53d941..98ac32900c 100644
--- a/ext/tk/lib/tkextlib/iwidgets/messagebox.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/messagebox.rb
@@ -16,7 +16,7 @@ end
class Tk::Iwidgets::Messagebox
TkCommandNames = ['::iwidgets::messagebox'.freeze].freeze
WidgetClassName = 'Messagebox'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
####################################
@@ -46,14 +46,13 @@ class Tk::Iwidgets::Messagebox
end
private :__item_boolval_optkeys
- alias typecget_tkstring itemcget_tkstring
alias typecget itemcget
alias typecget_strict itemcget_strict
alias typeconfigure itemconfigure
alias typeconfiginfo itemconfiginfo
alias current_typeconfiginfo current_itemconfiginfo
- private :itemcget_tkstring, :itemcget, :itemcget_strict
+ private :itemcget, :itemcget_strict
private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
####################################
diff --git a/ext/tk/lib/tkextlib/iwidgets/messagedialog.rb b/ext/tk/lib/tkextlib/iwidgets/messagedialog.rb
index 9aa590056f..c19b83e517 100644
--- a/ext/tk/lib/tkextlib/iwidgets/messagedialog.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/messagedialog.rb
@@ -16,5 +16,5 @@ end
class Tk::Iwidgets::Messagedialog
TkCommandNames = ['::iwidgets::messagedialog'.freeze].freeze
WidgetClassName = 'Messagedialog'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
end
diff --git a/ext/tk/lib/tkextlib/iwidgets/notebook.rb b/ext/tk/lib/tkextlib/iwidgets/notebook.rb
index 7ed4126a4d..03b50633df 100644
--- a/ext/tk/lib/tkextlib/iwidgets/notebook.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/notebook.rb
@@ -16,7 +16,7 @@ end
class Tk::Iwidgets::Notebook
TkCommandNames = ['::iwidgets::notebook'.freeze].freeze
WidgetClassName = 'Notebook'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
####################################
@@ -41,14 +41,13 @@ class Tk::Iwidgets::Notebook
end
end
- alias pagecget_tkstring itemcget_tkstring
alias pagecget itemcget
alias pagecget_strict itemcget_strict
alias pageconfigure itemconfigure
alias pageconfiginfo itemconfiginfo
alias current_pageconfiginfo current_itemconfiginfo
- private :itemcget_tkstring, :itemcget, :itemcget_strict
+ private :itemcget, :itemcget_strict
private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
####################################
diff --git a/ext/tk/lib/tkextlib/iwidgets/optionmenu.rb b/ext/tk/lib/tkextlib/iwidgets/optionmenu.rb
index 57a3cc7d2b..0c74440be7 100644
--- a/ext/tk/lib/tkextlib/iwidgets/optionmenu.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/optionmenu.rb
@@ -16,7 +16,7 @@ end
class Tk::Iwidgets::Optionmenu
TkCommandNames = ['::iwidgets::optionmenu'.freeze].freeze
WidgetClassName = 'Optionmenu'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def __boolval_optkeys
super() << 'cyclicon'
diff --git a/ext/tk/lib/tkextlib/iwidgets/panedwindow.rb b/ext/tk/lib/tkextlib/iwidgets/panedwindow.rb
index 65463cc85a..3bf73d69fe 100644
--- a/ext/tk/lib/tkextlib/iwidgets/panedwindow.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/panedwindow.rb
@@ -16,7 +16,7 @@ end
class Tk::Iwidgets::Panedwindow
TkCommandNames = ['::iwidgets::panedwindow'.freeze].freeze
WidgetClassName = 'Panedwindow'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
####################################
@@ -41,14 +41,13 @@ class Tk::Iwidgets::Panedwindow
end
end
- alias panecget_tkstring itemcget_tkstring
alias panecget itemcget
alias panecget_strict itemcget_strict
alias paneconfigure itemconfigure
alias paneconfiginfo itemconfiginfo
alias current_paneconfiginfo current_itemconfiginfo
- private :itemcget_tkstring, :itemcget, :itemcget_strict
+ private :itemcget, :itemcget_strict
private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
####################################
diff --git a/ext/tk/lib/tkextlib/iwidgets/promptdialog.rb b/ext/tk/lib/tkextlib/iwidgets/promptdialog.rb
index 7c7ff7ad62..620b14b5d5 100644
--- a/ext/tk/lib/tkextlib/iwidgets/promptdialog.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/promptdialog.rb
@@ -16,7 +16,7 @@ end
class Tk::Iwidgets::Promptdialog
TkCommandNames = ['::iwidgets::promptdialog'.freeze].freeze
WidgetClassName = 'Promptdialog'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
# index method is not available, because it shows index of the entry field
def default(name)
diff --git a/ext/tk/lib/tkextlib/iwidgets/pushbutton.rb b/ext/tk/lib/tkextlib/iwidgets/pushbutton.rb
index ae56788289..c21007ca6c 100644
--- a/ext/tk/lib/tkextlib/iwidgets/pushbutton.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/pushbutton.rb
@@ -16,7 +16,7 @@ end
class Tk::Iwidgets::Pushbutton
TkCommandNames = ['::iwidgets::pushbutton'.freeze].freeze
WidgetClassName = 'Pushbutton'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def __boolval_optkeys
super() << 'defaultring'
diff --git a/ext/tk/lib/tkextlib/iwidgets/radiobox.rb b/ext/tk/lib/tkextlib/iwidgets/radiobox.rb
index 21181777b5..e9d9521252 100644
--- a/ext/tk/lib/tkextlib/iwidgets/radiobox.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/radiobox.rb
@@ -16,7 +16,7 @@ end
class Tk::Iwidgets::Radiobox
TkCommandNames = ['::iwidgets::radiobox'.freeze].freeze
WidgetClassName = 'Radiobox'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
####################################
@@ -46,14 +46,13 @@ class Tk::Iwidgets::Radiobox
end
end
- alias buttoncget_tkstring itemcget_tkstring
alias buttoncget itemcget
alias buttoncget_strict itemcget_strict
alias buttonconfigure itemconfigure
alias buttonconfiginfo itemconfiginfo
alias current_buttonconfiginfo current_itemconfiginfo
- private :itemcget_tkstring, :itemcget, :itemcget_strict
+ private :itemcget, :itemcget_strict
private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
####################################
diff --git a/ext/tk/lib/tkextlib/iwidgets/scopedobject.rb b/ext/tk/lib/tkextlib/iwidgets/scopedobject.rb
index 056cd85322..bddef50841 100644
--- a/ext/tk/lib/tkextlib/iwidgets/scopedobject.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/scopedobject.rb
@@ -16,7 +16,7 @@ end
class Tk::Iwidgets::Scopedobject
TkCommandNames = ['::iwidgets::scopedobject'.freeze].freeze
WidgetClassName = 'Scopedobject'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def initialize(obj_name, keys={})
@path = tk_call(self.class::TkCommandNames[0], obj_name, *hash_kv(keys))
diff --git a/ext/tk/lib/tkextlib/iwidgets/scrolledcanvas.rb b/ext/tk/lib/tkextlib/iwidgets/scrolledcanvas.rb
index 935e04bbcc..67ad67d07e 100644
--- a/ext/tk/lib/tkextlib/iwidgets/scrolledcanvas.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/scrolledcanvas.rb
@@ -17,7 +17,7 @@ end
class Tk::Iwidgets::Scrolledcanvas
TkCommandNames = ['::iwidgets::scrolledcanvas'.freeze].freeze
WidgetClassName = 'Scrolledcanvas'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
################################
@@ -103,7 +103,7 @@ class Tk::Iwidgets::Scrolledcanvas
end
def bbox(tagOrId, *tags)
- list(tk_send_without_enc('bbox', tagid(tagOrId),
+ list(tk_send_without_enc('bbox', tagid(tagOrId),
*tags.collect{|t| tagid(t)}))
end
@@ -165,7 +165,7 @@ class Tk::Iwidgets::Scrolledcanvas
end
def dchars(tag, first, last=None)
- tk_send_without_enc('dchars', tagid(tag),
+ tk_send_without_enc('dchars', tagid(tag),
_get_eval_enc_str(first), _get_eval_enc_str(last))
self
end
@@ -176,7 +176,7 @@ class Tk::Iwidgets::Scrolledcanvas
tbl = TkcItem::CItemID_TBL[self.path]
}
if tbl
- find('withtag', *args).each{|item|
+ find('withtag', *args).each{|item|
if item.kind_of?(TkcItem)
TkcItem::CItemID_TBL.mutex.synchronize{
tbl.delete(item.id)
@@ -195,7 +195,7 @@ class Tk::Iwidgets::Scrolledcanvas
end
def find(mode, *args)
- list(tk_send_without_enc('find', mode, *args)).collect!{|id|
+ list(tk_send_without_enc('find', mode, *args)).collect!{|id|
TkcItem.id2obj(self, id)
}
end
@@ -251,7 +251,7 @@ class Tk::Iwidgets::Scrolledcanvas
end
def insert(tagOrId, index, string)
- tk_send_without_enc('insert', tagid(tagOrId), index,
+ tk_send_without_enc('insert', tagid(tagOrId), index,
_get_eval_enc_str(string))
self
end
diff --git a/ext/tk/lib/tkextlib/iwidgets/scrolledframe.rb b/ext/tk/lib/tkextlib/iwidgets/scrolledframe.rb
index 7b7b95df1c..8b47460357 100644
--- a/ext/tk/lib/tkextlib/iwidgets/scrolledframe.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/scrolledframe.rb
@@ -16,7 +16,7 @@ end
class Tk::Iwidgets::Scrolledframe
TkCommandNames = ['::iwidgets::scrolledframe'.freeze].freeze
WidgetClassName = 'Scrolledframe'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def child_site
window(tk_call(@path, 'childsite'))
diff --git a/ext/tk/lib/tkextlib/iwidgets/scrolledhtml.rb b/ext/tk/lib/tkextlib/iwidgets/scrolledhtml.rb
index dc2966bd48..9b69ef07fe 100644
--- a/ext/tk/lib/tkextlib/iwidgets/scrolledhtml.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/scrolledhtml.rb
@@ -16,7 +16,7 @@ end
class Tk::Iwidgets::Scrolledhtml
TkCommandNames = ['::iwidgets::scrolledhtml'.freeze].freeze
WidgetClassName = 'Scrolledhtml'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def __boolval_optkeys
super() << 'update'
diff --git a/ext/tk/lib/tkextlib/iwidgets/scrolledlistbox.rb b/ext/tk/lib/tkextlib/iwidgets/scrolledlistbox.rb
index 20a4cd1d36..7543d557e3 100644
--- a/ext/tk/lib/tkextlib/iwidgets/scrolledlistbox.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/scrolledlistbox.rb
@@ -17,7 +17,7 @@ end
class Tk::Iwidgets::Scrolledlistbox
TkCommandNames = ['::iwidgets::scrolledlistbox'.freeze].freeze
WidgetClassName = 'Scrolledlistbox'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def __strval_optkeys
super() << 'textbackground'
@@ -141,7 +141,7 @@ class Tk::Iwidgets::Scrolledlistbox
def get(first, last=nil)
if last
# tk_split_simplelist(_fromUTF8(tk_send_without_enc('get', first, last)))
- tk_split_simplelist(tk_send_without_enc('get', first, last),
+ tk_split_simplelist(tk_send_without_enc('get', first, last),
false, true)
else
_fromUTF8(tk_send_without_enc('get', first))
diff --git a/ext/tk/lib/tkextlib/iwidgets/scrolledtext.rb b/ext/tk/lib/tkextlib/iwidgets/scrolledtext.rb
index 69b7d314fd..d6436d202a 100644
--- a/ext/tk/lib/tkextlib/iwidgets/scrolledtext.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/scrolledtext.rb
@@ -17,7 +17,7 @@ end
class Tk::Iwidgets::Scrolledtext
TkCommandNames = ['::iwidgets::scrolledtext'.freeze].freeze
WidgetClassName = 'Scrolledtext'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def __strval_optkeys
super() << 'textbackground'
@@ -86,7 +86,7 @@ class Tk::Iwidgets::Scrolledtext
list(tk_send('bbox', index))
end
def compare(idx1, op, idx2)
- bool(tk_send_without_enc('compare', _get_eval_enc_str(idx1),
+ bool(tk_send_without_enc('compare', _get_eval_enc_str(idx1),
op, _get_eval_enc_str(idx2)))
end
@@ -116,18 +116,14 @@ class Tk::Iwidgets::Scrolledtext
get('-displaychars', *index)
end
- def image_cget_tkstring(index, slot)
- _fromUTF8(tk_send_without_enc('image', 'cget',
- _get_eval_enc_str(index), "-#{slot.to_s}"))
- end
def image_cget_strict(index, slot)
case slot.to_s
when 'text', 'label', 'show', 'data', 'file'
- _fromUTF8(tk_send_without_enc('image', 'cget',
+ _fromUTF8(tk_send_without_enc('image', 'cget',
_get_eval_enc_str(index), "-#{slot}"))
else
- tk_tcl2ruby(_fromUTF8(tk_send_without_enc('image', 'cget',
- _get_eval_enc_str(index),
+ tk_tcl2ruby(_fromUTF8(tk_send_without_enc('image', 'cget',
+ _get_eval_enc_str(index),
"-#{slot}")))
end
end
@@ -155,13 +151,13 @@ class Tk::Iwidgets::Scrolledtext
def image_configure(index, slot, value=None)
if slot.kind_of? Hash
- _fromUTF8(tk_send_without_enc('image', 'configure',
- _get_eval_enc_str(index),
+ _fromUTF8(tk_send_without_enc('image', 'configure',
+ _get_eval_enc_str(index),
*hash_kv(slot, true)))
else
- _fromUTF8(tk_send_without_enc('image', 'configure',
- _get_eval_enc_str(index),
- "-#{slot}",
+ _fromUTF8(tk_send_without_enc('image', 'configure',
+ _get_eval_enc_str(index),
+ "-#{slot}",
_get_eval_enc_str(value)))
end
self
@@ -191,16 +187,16 @@ class Tk::Iwidgets::Scrolledtext
else
if conf[3]
if conf[3].index('{')
- conf[3] = tk_split_list(conf[3])
+ conf[3] = tk_split_list(conf[3])
else
- conf[3] = tk_tcl2ruby(conf[3])
+ conf[3] = tk_tcl2ruby(conf[3])
end
end
if conf[4]
if conf[4].index('{')
- conf[4] = tk_split_list(conf[4])
+ conf[4] = tk_split_list(conf[4])
else
- conf[4] = tk_tcl2ruby(conf[4])
+ conf[4] = tk_tcl2ruby(conf[4])
end
end
end
@@ -232,16 +228,16 @@ class Tk::Iwidgets::Scrolledtext
else
if conf[2]
if conf[2].index('{')
- conf[2] = tk_split_list(conf[2])
+ conf[2] = tk_split_list(conf[2])
else
- conf[2] = tk_tcl2ruby(conf[2])
+ conf[2] = tk_tcl2ruby(conf[2])
end
end
if conf[3]
if conf[3].index('{')
- conf[3] = tk_split_list(conf[3])
+ conf[3] = tk_split_list(conf[3])
else
- conf[3] = tk_tcl2ruby(conf[3])
+ conf[3] = tk_tcl2ruby(conf[3])
end
end
end
@@ -302,7 +298,7 @@ class Tk::Iwidgets::Scrolledtext
def mark_gravity(mark, direction=nil)
if direction
- tk_send_without_enc('mark', 'gravity',
+ tk_send_without_enc('mark', 'gravity',
_get_eval_enc_str(mark), direction)
self
else
@@ -311,27 +307,27 @@ class Tk::Iwidgets::Scrolledtext
end
def mark_set(mark, index)
- tk_send_without_enc('mark', 'set', _get_eval_enc_str(mark),
+ tk_send_without_enc('mark', 'set', _get_eval_enc_str(mark),
_get_eval_enc_str(index))
self
end
alias set_mark mark_set
def mark_unset(*marks)
- tk_send_without_enc('mark', 'unset',
+ tk_send_without_enc('mark', 'unset',
*(marks.collect{|mark| _get_eval_enc_str(mark)}))
self
end
alias unset_mark mark_unset
def mark_next(index)
- tagid2obj(_fromUTF8(tk_send_without_enc('mark', 'next',
+ tagid2obj(_fromUTF8(tk_send_without_enc('mark', 'next',
_get_eval_enc_str(index))))
end
alias next_mark mark_next
def mark_previous(index)
- tagid2obj(_fromUTF8(tk_send_without_enc('mark', 'previous',
+ tagid2obj(_fromUTF8(tk_send_without_enc('mark', 'previous',
_get_eval_enc_str(index))))
end
alias previous_mark mark_previous
@@ -358,11 +354,11 @@ class Tk::Iwidgets::Scrolledtext
# $KCODE == 'NONE'
if JAPANIZED_TK
- tk_call_without_enc('kstring', 'length',
+ tk_call_without_enc('kstring', 'length',
_get_eval_enc_str(txt)).to_i
else
begin
- tk_call_without_enc('encoding', 'convertto', 'ascii',
+ tk_call_without_enc('encoding', 'convertto', 'ascii',
_get_eval_enc_str(txt)).length
rescue StandardError, NameError
# sorry, I have no plan
@@ -423,11 +419,11 @@ class Tk::Iwidgets::Scrolledtext
pos = _ktext_length(txt[0..(pos-1)]) if pos > 0
if pat.kind_of? String
#return [index(start + " + #{pos} chars"), pat.split('').length]
- return [index(start + " + #{pos} chars"),
+ return [index(start + " + #{pos} chars"),
_ktext_length(pat), pat.dup]
else
#return [index(start + " + #{pos} chars"), $&.split('').length]
- return [index(start + " + #{pos} chars"),
+ return [index(start + " + #{pos} chars"),
_ktext_length(match), match]
end
else
@@ -441,11 +437,11 @@ class Tk::Iwidgets::Scrolledtext
pos = _ktext_length(txt[0..(pos-1)]) if pos > 0
if pat.kind_of? String
#return [index(start + " + #{pos} chars"), pat.split('').length]
- return [index(start + " + #{pos} chars"),
+ return [index(start + " + #{pos} chars"),
_ktext_length(pat), pat.dup]
else
#return [index(start + " + #{pos} chars"), $&.split('').length]
- return [index(start + " + #{pos} chars"),
+ return [index(start + " + #{pos} chars"),
_ktext_length(match), match]
end
else
@@ -456,7 +452,7 @@ class Tk::Iwidgets::Scrolledtext
pos = _ktext_length(txt[0..(pos-1)]) if pos > 0
if pat.kind_of? String
#return [index("1.0 + #{pos} chars"), pat.split('').length]
- return [index("1.0 + #{pos} chars"),
+ return [index("1.0 + #{pos} chars"),
_ktext_length(pat), pat.dup]
else
#return [index("1.0 + #{pos} chars"), $&.split('').length]
diff --git a/ext/tk/lib/tkextlib/iwidgets/scrolledwidget.rb b/ext/tk/lib/tkextlib/iwidgets/scrolledwidget.rb
index 5ecd2d72d2..eef093d314 100644
--- a/ext/tk/lib/tkextlib/iwidgets/scrolledwidget.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/scrolledwidget.rb
@@ -16,5 +16,5 @@ end
class Tk::Iwidgets::Scrolledwidget
TkCommandNames = ['::iwidgets::scrolledwidget'.freeze].freeze
WidgetClassName = 'Scrolledwidget'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
end
diff --git a/ext/tk/lib/tkextlib/iwidgets/selectionbox.rb b/ext/tk/lib/tkextlib/iwidgets/selectionbox.rb
index eb8fe3ad52..bf9b5ec30a 100644
--- a/ext/tk/lib/tkextlib/iwidgets/selectionbox.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/selectionbox.rb
@@ -16,7 +16,7 @@ end
class Tk::Iwidgets::Selectionbox
TkCommandNames = ['::iwidgets::selectionbox'.freeze].freeze
WidgetClassName = 'Selectionbox'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def __boolval_optkeys
super() << 'itemson' << 'selectionon'
diff --git a/ext/tk/lib/tkextlib/iwidgets/selectiondialog.rb b/ext/tk/lib/tkextlib/iwidgets/selectiondialog.rb
index 45aecf3266..f772ecf8c2 100644
--- a/ext/tk/lib/tkextlib/iwidgets/selectiondialog.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/selectiondialog.rb
@@ -16,7 +16,7 @@ end
class Tk::Iwidgets::Selectiondialog
TkCommandNames = ['::iwidgets::selectiondialog'.freeze].freeze
WidgetClassName = 'Selectiondialog'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def child_site
window(tk_call(@path, 'childsite'))
diff --git a/ext/tk/lib/tkextlib/iwidgets/setup.rb b/ext/tk/lib/tkextlib/iwidgets/setup.rb
index ee406c6ca0..ce0f0bd4d4 100644
--- a/ext/tk/lib/tkextlib/iwidgets/setup.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/setup.rb
@@ -2,7 +2,7 @@
# setup.rb -- setup script before calling TkPackage.require()
#
# If you need some setup operations (for example, add a library path
-# to the library search path) before using Tcl/Tk library packages
-# wrapped by Ruby scripts in this directory, please write the setup
+# to the library search path) before using Tcl/Tk library packages
+# wrapped by Ruby scripts in this directory, please write the setup
# operations in this file.
#
diff --git a/ext/tk/lib/tkextlib/iwidgets/shell.rb b/ext/tk/lib/tkextlib/iwidgets/shell.rb
index c560e3ac29..dabf2e6f25 100644
--- a/ext/tk/lib/tkextlib/iwidgets/shell.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/shell.rb
@@ -16,7 +16,7 @@ end
class Tk::Iwidgets::Shell
TkCommandNames = ['::iwidgets::shell'.freeze].freeze
WidgetClassName = 'Shell'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def activate
tk_call(@path, 'activate') # may return val of deactibate method
diff --git a/ext/tk/lib/tkextlib/iwidgets/spindate.rb b/ext/tk/lib/tkextlib/iwidgets/spindate.rb
index b3de9ed989..2c98eb4629 100644
--- a/ext/tk/lib/tkextlib/iwidgets/spindate.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/spindate.rb
@@ -16,7 +16,7 @@ end
class Tk::Iwidgets::Spindate
TkCommandNames = ['::iwidgets::spindate'.freeze].freeze
WidgetClassName = 'Spindate'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def __boolval_optkeys
super() << 'dayon' << 'monthon' << 'yearon'
diff --git a/ext/tk/lib/tkextlib/iwidgets/spinint.rb b/ext/tk/lib/tkextlib/iwidgets/spinint.rb
index bede3bb1bf..5eb944d081 100644
--- a/ext/tk/lib/tkextlib/iwidgets/spinint.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/spinint.rb
@@ -16,7 +16,7 @@ end
class Tk::Iwidgets::Spinint
TkCommandNames = ['::iwidgets::spinint'.freeze].freeze
WidgetClassName = 'Spinint'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def __boolval_optkeys
super() << 'wrap'
diff --git a/ext/tk/lib/tkextlib/iwidgets/spinner.rb b/ext/tk/lib/tkextlib/iwidgets/spinner.rb
index d960996e22..aeee5c9038 100644
--- a/ext/tk/lib/tkextlib/iwidgets/spinner.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/spinner.rb
@@ -16,7 +16,7 @@ end
class Tk::Iwidgets::Spinner
TkCommandNames = ['::iwidgets::spinner'.freeze].freeze
WidgetClassName = 'Spinner'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
####################################
@@ -25,16 +25,16 @@ class Tk::Iwidgets::Spinner
class EntryfieldValidate < TkValidateCommand
#class CalCmdArgs < TkUtil::CallbackSubst
class ValidateArgs < TkUtil::CallbackSubst
- KEY_TBL = [
- [ ?c, ?s, :char ],
- [ ?P, ?s, :post ],
- [ ?S, ?s, :current ],
- [ ?W, ?w, :widget ],
+ KEY_TBL = [
+ [ ?c, ?s, :char ],
+ [ ?P, ?s, :post ],
+ [ ?S, ?s, :current ],
+ [ ?W, ?w, :widget ],
nil
]
- PROC_TBL = [
- [ ?s, TkComm.method(:string) ],
- [ ?w, TkComm.method(:window) ],
+ PROC_TBL = [
+ [ ?s, TkComm.method(:string) ],
+ [ ?w, TkComm.method(:window) ],
nil
]
diff --git a/ext/tk/lib/tkextlib/iwidgets/spintime.rb b/ext/tk/lib/tkextlib/iwidgets/spintime.rb
index 20f8197a09..0ff683ab56 100644
--- a/ext/tk/lib/tkextlib/iwidgets/spintime.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/spintime.rb
@@ -16,7 +16,7 @@ end
class Tk::Iwidgets::Spintime
TkCommandNames = ['::iwidgets::spintime'.freeze].freeze
WidgetClassName = 'Spintime'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def __boolval_optkeys
super() << 'houron' << 'militaryon' << 'minutelabel' << 'secondlabel'
diff --git a/ext/tk/lib/tkextlib/iwidgets/tabnotebook.rb b/ext/tk/lib/tkextlib/iwidgets/tabnotebook.rb
index f56efa9aaf..dbb90e5102 100644
--- a/ext/tk/lib/tkextlib/iwidgets/tabnotebook.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/tabnotebook.rb
@@ -16,7 +16,7 @@ end
class Tk::Iwidgets::Tabnotebook
TkCommandNames = ['::iwidgets::tabnotebook'.freeze].freeze
WidgetClassName = 'Tabnotebook'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
####################################
@@ -46,14 +46,13 @@ class Tk::Iwidgets::Tabnotebook
end
end
- alias pagecget_tkstring itemcget_tkstring
alias pagecget itemcget
alias pagecget_strict itemcget_strict
alias pageconfigure itemconfigure
alias pageconfiginfo itemconfiginfo
alias current_pageconfiginfo current_itemconfiginfo
- private :itemcget_tkstring, :itemcget, :itemcget_strict
+ private :itemcget, :itemcget_strict
private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
####################################
diff --git a/ext/tk/lib/tkextlib/iwidgets/tabset.rb b/ext/tk/lib/tkextlib/iwidgets/tabset.rb
index 501ead4964..300ba9dee0 100644
--- a/ext/tk/lib/tkextlib/iwidgets/tabset.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/tabset.rb
@@ -16,7 +16,7 @@ end
class Tk::Iwidgets::Tabset
TkCommandNames = ['::iwidgets::tabset'.freeze].freeze
WidgetClassName = 'Tabset'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
####################################
@@ -41,14 +41,13 @@ class Tk::Iwidgets::Tabset
end
end
- alias tabcget_tkstring itemcget_tkstring
alias tabcget itemcget
alias tabcget_strict itemcget_strict
alias tabconfigure itemconfigure
alias tabconfiginfo itemconfiginfo
alias current_tabconfiginfo current_itemconfiginfo
- private :itemcget_tkstring, :itemcget, :itemcget_strict
+ private :itemcget, :itemcget_strict
private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
####################################
@@ -117,9 +116,9 @@ class Tk::Iwidgets::Tabset
return
end
tabs_size = @canvas.winfo_width
- tab_start, tab_end = @canvas .
- find_overlapping(head, 0, head + delta, @canvas.winfo_height) .
- find_all{|id| @canvas.itemtype(id) == TkcPolygon} .
+ tab_start, tab_end = @canvas .
+ find_overlapping(head, 0, head + delta, @canvas.winfo_height) .
+ find_all{|id| @canvas.itemtype(id) == TkcPolygon} .
map!{|id| bbox = @canvas.bbox(id); [bbox[0], bbox[2]]} . max
when 'e', 'w'
@@ -128,9 +127,9 @@ class Tk::Iwidgets::Tabset
return
end
tabs_size = @canvas.winfo_height
- tab_start, tab_end = @canvas .
- find_overlapping(0, head, @canvas.winfo_width, head + delta) .
- find_all{|id| @canvas.itemtype(id) == TkcPolygon} .
+ tab_start, tab_end = @canvas .
+ find_overlapping(0, head, @canvas.winfo_width, head + delta) .
+ find_all{|id| @canvas.itemtype(id) == TkcPolygon} .
map!{|id| bbox = @canvas.bbox(id); [bbox[1], bbox[3]]} . max
end
diff --git a/ext/tk/lib/tkextlib/iwidgets/timeentry.rb b/ext/tk/lib/tkextlib/iwidgets/timeentry.rb
index b0afb3afd9..588da77dc8 100644
--- a/ext/tk/lib/tkextlib/iwidgets/timeentry.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/timeentry.rb
@@ -16,7 +16,7 @@ end
class Tk::Iwidgets::Timeentry
TkCommandNames = ['::iwidgets::timeentry'.freeze].freeze
WidgetClassName = 'Timeentry'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def __strval_optkeys
super() << 'closetext'
diff --git a/ext/tk/lib/tkextlib/iwidgets/timefield.rb b/ext/tk/lib/tkextlib/iwidgets/timefield.rb
index c34281d4ff..28e1504797 100644
--- a/ext/tk/lib/tkextlib/iwidgets/timefield.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/timefield.rb
@@ -16,7 +16,7 @@ end
class Tk::Iwidgets::Timefield
TkCommandNames = ['::iwidgets::timefield'.freeze].freeze
WidgetClassName = 'Timefield'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def __boolval_optkeys
super() << 'gmt'
diff --git a/ext/tk/lib/tkextlib/iwidgets/toolbar.rb b/ext/tk/lib/tkextlib/iwidgets/toolbar.rb
index 5b474c3816..17cfa62156 100644
--- a/ext/tk/lib/tkextlib/iwidgets/toolbar.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/toolbar.rb
@@ -16,7 +16,7 @@ end
class Tk::Iwidgets::Toolbar
TkCommandNames = ['::iwidgets::toolbar'.freeze].freeze
WidgetClassName = 'Toolbar'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def __tkvariable_optkeys
super() << 'helpvariable'
@@ -105,7 +105,7 @@ class Tk::Iwidgets::Toolbar
else
tag = Tk::Itk::Component.new(self)
end
- window(tk_call(@path, 'insert', index(idx), type,
+ window(tk_call(@path, 'insert', index(idx), type,
tagid(tag), *hash_kv(keys)))
tag
end
diff --git a/ext/tk/lib/tkextlib/iwidgets/watch.rb b/ext/tk/lib/tkextlib/iwidgets/watch.rb
index f10ec54cb2..ab2b687cf9 100644
--- a/ext/tk/lib/tkextlib/iwidgets/watch.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/watch.rb
@@ -16,7 +16,7 @@ end
class Tk::Iwidgets::Watch
TkCommandNames = ['::iwidgets::watch'.freeze].freeze
WidgetClassName = 'Watch'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def __boolval_optkeys
super() << 'showampm'
@@ -24,7 +24,7 @@ class Tk::Iwidgets::Watch
private :__boolval_optkeys
def __strval_optkeys
- super() << 'clockcolor' << 'hourcolor' << 'minutecolor' <<
+ super() << 'clockcolor' << 'hourcolor' << 'minutecolor' <<
'pivotcolor' << 'secondcolor' << 'tickcolor'
end
private :__strval_optkeys
diff --git a/ext/tk/lib/tkextlib/pkg_checker.rb b/ext/tk/lib/tkextlib/pkg_checker.rb
index ecc6bfa131..5002ed7ff8 100755
--- a/ext/tk/lib/tkextlib/pkg_checker.rb
+++ b/ext/tk/lib/tkextlib/pkg_checker.rb
@@ -151,7 +151,7 @@ def subdir_check(dir, verbose=false)
if err.empty?
print 'Ready : ', path, ' : require->', suc.inspect, "\n"
else
- print '*LACK : ', path, ' : require->', suc.inspect,
+ print '*LACK : ', path, ' : require->', suc.inspect,
' FAIL->', err.inspect, "\n"
end
end
@@ -176,7 +176,7 @@ Dir.chdir(dir)
if err.empty?
print 'Ready : ', f, ' : require->', suc.inspect, "\n"
else
- print '*LACK : ', f, ' : require->', suc.inspect,
+ print '*LACK : ', f, ' : require->', suc.inspect,
' FAIL->', err.inspect, "\n"
end
diff --git a/ext/tk/lib/tkextlib/setup.rb b/ext/tk/lib/tkextlib/setup.rb
index 79facc5ee3..12867e8f9c 100644
--- a/ext/tk/lib/tkextlib/setup.rb
+++ b/ext/tk/lib/tkextlib/setup.rb
@@ -1,8 +1,8 @@
#
# setup.rb -- setup script before using Tk extension libraries
#
-# If you need some setup operations for Tk extensions (for example,
-# modify the dynamic library path) required, please write the setup
-# operations in this file. This file is required at the last of
-# "require 'tk'".
+# If you need some setup operations for Tk extensions (for example,
+# modify the dynamic library path) required, please write the setup
+# operations in this file. This file is required at the last of
+# "require 'tk'".
#
diff --git a/ext/tk/lib/tkextlib/tcllib.rb b/ext/tk/lib/tkextlib/tcllib.rb
index 2831989759..c6138f4275 100644
--- a/ext/tk/lib/tkextlib/tcllib.rb
+++ b/ext/tk/lib/tkextlib/tcllib.rb
@@ -42,25 +42,19 @@ module Tk
module Tcllib
TkComm::TkExtlibAutoloadModule.unshift(self)
- # package:: autoscroll
- autoload :Autoscroll, 'tkextlib/tcllib/autoscroll'
-
# package:: ctext
autoload :CText, 'tkextlib/tcllib/ctext'
- # package:: cursor
- autoload :Cursor, 'tkextlib/tcllib/cursor'
-
- # package:: datefield
- autoload :Datefield, 'tkextlib/tcllib/datefield'
- autoload :DateField, 'tkextlib/tcllib/datefield'
-
# package:: getstring
autoload :GetString_Dialog, 'tkextlib/tcllib/getstring'
# package:: history
autoload :History, 'tkextlib/tcllib/history'
+ # package:: datefield
+ autoload :Datefield, 'tkextlib/tcllib/datefield'
+ autoload :DateField, 'tkextlib/tcllib/datefield'
+
# package:: ico
autoload :ICO, 'tkextlib/tcllib/ico'
@@ -68,21 +62,12 @@ module Tk
autoload :IP_Entry, 'tkextlib/tcllib/ip_entry'
autoload :IPEntry, 'tkextlib/tcllib/ip_entry'
- # package:: khim
- autoload :KHIM, 'tkextlib/tcllib/khim'
-
- # package:: ntext
- autoload :Ntext, 'tkextlib/tcllib/ntext'
+ # package:: swaplist
+ autoload :Swaplist_Dialog, 'tkextlib/tcllib/swaplist'
# package:: Plotchart
autoload :Plotchart, 'tkextlib/tcllib/plotchart'
- # package:: style
- autoload :Style, 'tkextlib/tcllib/style'
-
- # package:: swaplist
- autoload :Swaplist_Dialog, 'tkextlib/tcllib/swaplist'
-
# package:: tablelist
autoload :Tablelist, 'tkextlib/tcllib/tablelist'
autoload :TableList, 'tkextlib/tcllib/tablelist'
@@ -96,7 +81,7 @@ module Tk
autoload :Tooltip, 'tkextlib/tcllib/tooltip'
# package:: widget
- autoload :Widget, 'tkextlib/tcllib/widget'
+ autoload :Wdiget, 'tkextlib/tcllib/widget'
end
end
diff --git a/ext/tk/lib/tkextlib/tcllib/autoscroll.rb b/ext/tk/lib/tkextlib/tcllib/autoscroll.rb
index 2def59bf73..7db3c2e2b7 100644
--- a/ext/tk/lib/tkextlib/tcllib/autoscroll.rb
+++ b/ext/tk/lib/tkextlib/tcllib/autoscroll.rb
@@ -7,20 +7,20 @@
#
# (The following is the original description of the library.)
#
-# This package allows scrollbars to be mapped and unmapped as needed
-# depending on the size and content of the scrollbars scrolled widget.
-# The scrollbar must be managed by either pack or grid, other geometry
+# This package allows scrollbars to be mapped and unmapped as needed
+# depending on the size and content of the scrollbars scrolled widget.
+# The scrollbar must be managed by either pack or grid, other geometry
# managers are not supported.
#
-# When managed by pack, any geometry changes made in the scrollbars parent
-# between the time a scrollbar is unmapped, and when it is mapped will be
-# lost. It is an error to destroy any of the scrollbars siblings while the
-# scrollbar is unmapped. When managed by grid, if anything becomes gridded
-# in the same row and column the scrollbar occupied it will be replaced by
+# When managed by pack, any geometry changes made in the scrollbars parent
+# between the time a scrollbar is unmapped, and when it is mapped will be
+# lost. It is an error to destroy any of the scrollbars siblings while the
+# scrollbar is unmapped. When managed by grid, if anything becomes gridded
+# in the same row and column the scrollbar occupied it will be replaced by
# the scrollbar when remapped.
#
-# This package may be used on any scrollbar-like widget as long as it
-# supports the set subcommand in the same style as scrollbar. If the set
+# This package may be used on any scrollbar-like widget as long as it
+# supports the set subcommand in the same style as scrollbar. If the set
# subcommand is not used then this package will have no effect.
#
@@ -110,14 +110,14 @@ end
class Tk::Scrollbar
def autoscroll
- # Arranges for the already existing scrollbar to be mapped
+ # Arranges for the already existing scrollbar to be mapped
# and unmapped as needed.
#tk_call_without_enc('::autoscroll::autoscroll', @path)
Tk::Tcllib::Autoscroll.autoscroll(self)
self
end
def unautoscroll
- # Returns the scrollbar to its original static state.
+ # Returns the scrollbar to its original static state.
#tk_call_without_enc('::autoscroll::unautoscroll', @path)
Tk::Tcllib::Autoscroll.unautoscroll(self)
self
diff --git a/ext/tk/lib/tkextlib/tcllib/calendar.rb b/ext/tk/lib/tkextlib/tcllib/calendar.rb
deleted file mode 100644
index b6843df176..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/calendar.rb
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# tkextlib/tcllib/calendar.rb
-# by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-# * Part of tcllib extension
-# * calendar widget
-#
-
-require 'tk'
-require 'tkextlib/tcllib.rb'
-
-# TkPackage.require('widget::calendar', '0.9')
-TkPackage.require('widget::calendar')
-
-module Tk::Tcllib
- module Widget
- class Calendar < TkCanvas
- PACKAGE_NAME = 'widget::calendar'.freeze
- def self.package_name
- PACKAGE_NAME
- end
-
- def self.package_version
- begin
- TkPackage.require('widget::calendar')
- rescue
- ''
- end
- end
- end
- end
-end
-
-class Tk::Tcllib::Widget::Calendar
- TkCommandNames = ['::widget::calendar'.freeze].freeze
-
- def __boolval_optkeys
- super() << 'showpast'
- end
- private :__boolval_optkeys
-
- def create_self(keys)
- if keys and keys != None
- tk_call_without_enc(self.class::TkCommandNames[0], @path,
- *hash_kv(keys, true))
- else
- tk_call_without_enc(self.class::TkCommandNames[0], @path)
- end
- end
- private :create_self
-
- def get(what = 'all')
- tk_send('get', what)
- end
-end
diff --git a/ext/tk/lib/tkextlib/tcllib/canvas_sqmap.rb b/ext/tk/lib/tkextlib/tcllib/canvas_sqmap.rb
deleted file mode 100644
index 0bd59511c1..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/canvas_sqmap.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# tkextlib/tcllib/canvas.rb
-# by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-# * Part of tcllib extension
-# *
-#
-
-require 'tk'
-require 'tkextlib/tcllib.rb'
-
-# TkPackage.require('widget::canvas_sqmap', '0.2')
-TkPackage.require('widget::canvas_sqmap')
-
-module Tk::Tcllib
- module Widget
- class Canvas_Sqmap < Canvas
- TkCommandNames = ['::widget::canvas_sqmap'.freeze].freeze
-
- def image_set(cell, img)
- tk_send('image', 'set', cell, img)
- self
- end
-
- def image_unset(cell)
- tk_send('image', 'unset', cell)
- self
- end
-
- def flush
- tk_send('flush')
- self
- end
- end
- end
-end
diff --git a/ext/tk/lib/tkextlib/tcllib/canvas_zoom.rb b/ext/tk/lib/tkextlib/tcllib/canvas_zoom.rb
deleted file mode 100644
index e2a5061112..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/canvas_zoom.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# tkextlib/tcllib/canvas.rb
-# by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-# * Part of tcllib extension
-# *
-#
-
-require 'tk'
-require 'tkextlib/tcllib.rb'
-
-# TkPackage.require('widget::canvas_zoom', '0.1')
-TkPackage.require('widget::canvas_zoom')
-
-module Tk::Tcllib
- module Widget
- class Canvas_Zoom < Canvas
- TkCommandNames = ['::widget::canvas_zoom'.freeze].freeze
- end
- end
-end
diff --git a/ext/tk/lib/tkextlib/tcllib/chatwidget.rb b/ext/tk/lib/tkextlib/tcllib/chatwidget.rb
deleted file mode 100644
index 860b9e899b..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/chatwidget.rb
+++ /dev/null
@@ -1,151 +0,0 @@
-#
-# tkextlib/tcllib/chatwidget.rb
-# by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-# * Part of tcllib extension
-# * chatwidget - Provides a multi-paned view suitable for display of
-# chat room or irc channel information
-#
-
-require 'tk'
-require 'tkextlib/tcllib.rb'
-
-# TkPackage.require('chatwidget', '1.1.0')
-TkPackage.require('chatwidget')
-
-module Tk::Tcllib
- class ChatWidget < TkText
- PACKAGE_NAME = 'chatwidget'.freeze
- def self.package_name
- PACKAGE_NAME
- end
-
- def self.package_version
- begin
- TkPackage.require('chatwidget')
- rescue
- ''
- end
- end
- end
-end
-
-class Tk::Tcllib::ChatWidget
- TkCommandNames = ['::chatwidget::chatwidget'.freeze].freeze
-
- def show_topic
- tk_send_without_enc('topic', 'show')
- self
- end
-
- def hide_topic
- tk_send_without_enc('topic', 'hide')
- self
- end
-
- def set_topic(topic)
- tk_send('topic', 'set', topic)
- end
-
- def list_name
- tk_split_simplelist(tk_send('name', 'list'))
- end
-
- def list_name_full
- tk_split_simplelist(tk_send('name', 'list')).map{|lst|
- nick, *opts = tk_split_simplelist(lst)
- h_opt = {}
- opts.slice(2){|k, v| h_opt[k[1..-1]] = tk_tcl2ruby(v)}
- [nick, h_opt]
- }
- end
-
- def add_name(nick, opts={})
- tk_send('name', 'add', nick, *(hash_kv(opts)))
- end
-
- def delete_name(nick)
- tk_send('name', 'delete', nick)
- end
-
- def get_name(nick)
- lst = tk_send('name', 'get', nick)
- return nil if lst.empty?
- nick, *opts = tk_split_simplelist(lst)
- h_opt = {}
- opts.slice(2){|k, v| h_opt[k[1..-1]] = tk_tcl2ruby(v)}
- [nick, h_opt]
- end
-
- def message(msg, opts={})
- tk_send('message', msg, *(hash_kv(opts)))
- self
- end
-
- def _parse_hook_list(lst)
- tk_split_simplelist(lst).map{|hook|
- cmd, prior = tk_split_simplelist(hook)
- [procedure(cmd), number(prior)]
- }
- end
- private :_parse_hook_list
-
- def hook_add(type, *args, &blk) # args -> [prior, cmd], [prior], [cmd]
- #type -> 'message', 'post', 'names_group', 'names_nick', 'chatstate', 'url'
-
- if prior = args.shift
- if !prior.kind_of?(Numeric)
- cmd = prior
- if (prior = args.shift) && !prior.kind_of?(Numeric) # error
- args.unshift(prior)
- end
- args.unshift(cmd)
- end
- prior ||= 50 # default priority
- end
-
- cmd = args.shift || blk
-
- fail ArgumentError, "invalid arguments" unless args.empty?
- fail ArgumentError, "no callback is given" unless cmd
-
- _parse_hook_list(tk_send('hook', 'add', type, cmd, prior))
- end
-
- def hook_remove(type, cmd)
- #type -> 'message', 'post', 'names_group', 'names_nick', 'chatstate', 'url'
- _parse_hook_list(tk_send('hook', 'remove', type, cmd))
- end
-
- def hook_run(type, *cmd_args)
- #type -> 'message', 'post', 'names_group', 'names_nick', 'chatstate', 'url'
- tk_send('hook', 'run', type, *cmd_args)
- end
-
- def hook_list(type)
- #type -> 'message', 'post', 'names_group', 'names_nick', 'chatstate', 'url'
- _parse_hook_list(tk_send('hook', 'list', type))
- end
-
- def show_names
- tk_send('names', 'show')
- self
- end
-
- def hide_names
- tk_send('names', 'hide')
- self
- end
-
- def names_widget
- window(tk_send('names'))
- end
-
- def entry_widget
- window(tk_send('entry'))
- end
-
- def chat_widget
- window(tk_send('chat'))
- end
-end
diff --git a/ext/tk/lib/tkextlib/tcllib/crosshair.rb b/ext/tk/lib/tkextlib/tcllib/crosshair.rb
deleted file mode 100644
index 49b5361e4f..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/crosshair.rb
+++ /dev/null
@@ -1,117 +0,0 @@
-#
-# tkextlib/tcllib/crosshair.rb
-# by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-# * Part of tcllib extension
-# * Crosshairs for Tk canvas
-#
-
-require 'tk'
-require 'tkextlib/tcllib.rb'
-
-# TkPackage.require('crosshair', '1.0.2')
-TkPackage.require('crosshair')
-
-module Tk::Tcllib
- module Crosshair
- PACKAGE_NAME = 'crosshair'.freeze
- def self.package_name
- PACKAGE_NAME
- end
-
- def self.package_version
- begin
- TkPackage.require('crosshair')
- rescue
- ''
- end
- end
- end
-end
-
-module Tk::Tcllib::Crosshair
- include TkCore
- TkCommandNames = ['::crosshair::crosshair'.freeze].freeze
-
- def self.crosshair(w, keys={})
- Tk.tk_call('::crosshair::crosshair', w, *hash_kv(keys))
- w
- end
- def self.on(w, keys={})
- self.crosshair(w, keys)
- end
-
- def self.off(w)
- Tk.tk_call('::crosshair::off', w)
- w
- end
-
- def self.track_on(w, &b)
- Tk.tk_call('::crosshair::track_on', w, b)
- w
- end
-
- def self.track_off(w)
- Tk.tk_call('::crosshair::track_off', w)
- w
- end
-end
-
-class << Tk::Tcllib::Crosshair
- include TkComm
- include TkCanvasItemConfig
-
- def __item_methodcall_optkeys(id)
- {}
- end
- private :__item_methodcall_optkeys
-
- def __item_config_cmd(id)
- # maybe need to override
- ['::crosshair::configure', id]
- end
- private :__item_config_cmd
-
- private :itemcget_tkstring, :itemcget, :itemcget_strict
- private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
-
- def confugure(w, slot, value=None)
- itemconfigure(w, slot, value)
- end
- def confuginfo(w, slot = nil)
- itemconfiginfo(w, slot)
- end
- def current_configinfo(w, slot = nil)
- current_itemconfiginfo(w, slot)
- end
- def cget(w, slot)
- current_itemconfiginfo(w, slot).values[0]
- end
-end
-
-module Tk::Tcllib::Crosshair
- def crosshair_on(keys={})
- Tk::Tcllib::Crosshair.on(self, keys)
- end
- def crosshair_off
- Tk::Tcllib::Crosshair.off(self)
- end
- def crosshair_track_on(&b)
- Tk::Tcllib::Crosshair.track_on(self, &b)
- end
- def crosshair_track_off
- Tk::Tcllib::Crosshair.track_off(self)
- end
- def crosshair_configure(*args)
- Tk::Tcllib::Crosshair.configure(self, *args)
- end
- def crosshair_configinfo(slot = nil)
- Tk::Tcllib::Crosshair.configinfo(self, slot)
- end
- def crosshair_current_configinfo(slot = nil)
- Tk::Tcllib::Crosshair.current_configinfo(self, slot)
- end
- def crosshair_cget(slot)
- Tk::Tcllib::Crosshair.cget(self, slot)
- end
-end
diff --git a/ext/tk/lib/tkextlib/tcllib/ctext.rb b/ext/tk/lib/tkextlib/tcllib/ctext.rb
index 308847c233..9014037f3d 100644
--- a/ext/tk/lib/tkextlib/tcllib/ctext.rb
+++ b/ext/tk/lib/tkextlib/tcllib/ctext.rb
@@ -35,11 +35,11 @@ end
class Tk::Tcllib::CText
TkCommandNames = ['ctext'.freeze].freeze
WidgetClassName = 'Ctext'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def create_self(keys)
if keys and keys != None
- tk_call_without_enc(self.class::TkCommandNames[0], @path,
+ tk_call_without_enc(self.class::TkCommandNames[0], @path,
*hash_kv(keys, true))
else
tk_call_without_enc(self.class::TkCommandNames[0], @path)
@@ -48,7 +48,7 @@ class Tk::Tcllib::CText
private :create_self
def __strval_optkeys
- super() << 'linemapfg' << 'linemapbg' <<
+ super() << 'linemapfg' << 'linemapbg' <<
'linemap_select_fg' << 'linemap_select_bg'
end
private :__strval_optkeys
@@ -96,19 +96,19 @@ class Tk::Tcllib::CText
end
def add_highlight_class_for_special_chars(klass, col, *chrs)
- tk_call('ctext::addHighlightClassForSpecialChars',
+ tk_call('ctext::addHighlightClassForSpecialChars',
@path, klass, col, chrs.join(''))
self
end
def add_highlight_class_for_regexp(klass, col, tcl_regexp)
- tk_call('ctext::addHighlightClassForRegexp',
+ tk_call('ctext::addHighlightClassForRegexp',
@path, klass, col, tcl_regexp)
self
end
def add_highlight_class_with_only_char_start(klass, col, chr)
- tk_call('ctext::addHighlightClassWithOnlyCharStart',
+ tk_call('ctext::addHighlightClassWithOnlyCharStart',
@path, klass, col, chr)
self
end
diff --git a/ext/tk/lib/tkextlib/tcllib/cursor.rb b/ext/tk/lib/tkextlib/tcllib/cursor.rb
index 5c47f9709b..9bb828e8dd 100644
--- a/ext/tk/lib/tkextlib/tcllib/cursor.rb
+++ b/ext/tk/lib/tkextlib/tcllib/cursor.rb
@@ -44,8 +44,8 @@ module Tk
end
def self.cursor_display(parent=None)
- # Pops up a dialog with a listbox containing all the cursor names.
- # Selecting a cursor name will display it in that dialog.
+ # Pops up a dialog with a listbox containing all the cursor names.
+ # Selecting a cursor name will display it in that dialog.
# This is simply for viewing any available cursors on the platform .
#tk_call_without_enc('::cursor::display', parent)
Tk::Tcllib::Cursor.cursor_display(parent)
@@ -54,15 +54,15 @@ end
class TkWindow
def cursor_propagate(cursor)
- # Sets the cursor for self and all its descendants to cursor.
+ # Sets the cursor for self and all its descendants to cursor.
#tk_call_without_enc('::cursor::propagate', @path, cursor)
Tk::Tcllib::Cursor.cursor_propagate(self, cursor)
end
def cursor_restore(cursor = None)
- # Restore the original or previously set cursor for self and all its
- # descendants. If cursor is specified, that will be used if on any
- # widget that did not have a preset cursor (set by a previous call
- # to TkWindow#cursor_propagate).
+ # Restore the original or previously set cursor for self and all its
+ # descendants. If cursor is specified, that will be used if on any
+ # widget that did not have a preset cursor (set by a previous call
+ # to TkWindow#cursor_propagate).
#tk_call_without_enc('::cursor::restore', @path, cursor)
Tk::Tcllib::Cursor.cursor_restore(self, cursor)
end
diff --git a/ext/tk/lib/tkextlib/tcllib/dateentry.rb b/ext/tk/lib/tkextlib/tcllib/dateentry.rb
deleted file mode 100644
index 77038d95bc..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/dateentry.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-#
-# tkextlib/tcllib/dateentry.rb
-# by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-# * Part of tcllib extension
-# * dateentry widget
-#
-
-require 'tk'
-require 'tkextlib/tcllib.rb'
-
-# TkPackage.require('widget::dateentry', '0.91')
-TkPackage.require('widget::dateentry')
-
-module Tk::Tcllib
- module Widget
- class Dateentry < Tk::Tile::TEntry
- PACKAGE_NAME = 'widget::dateentry'.freeze
- def self.package_name
- PACKAGE_NAME
- end
-
- def self.package_version
- begin
- TkPackage.require('widget::dateentry')
- rescue
- ''
- end
- end
- end
- DateEntry = Dateentry
- end
-end
-
-class Tk::Tcllib::Widget::Dateentry
- TkCommandNames = ['::widget::dateentry'.freeze].freeze
-
- def __strval_optkeys
- super() << ['dateformat']
- end
- private :__strval_optkeys
-
- def create_self(keys)
- if keys and keys != None
- tk_call_without_enc(self.class::TkCommandNames[0], @path,
- *hash_kv(keys, true))
- else
- tk_call_without_enc(self.class::TkCommandNames[0], @path)
- end
- end
- private :create_self
-
- def post
- tk_send('post')
- self
- end
-
- def unpost
- tk_send('unpost')
- self
- end
-end
diff --git a/ext/tk/lib/tkextlib/tcllib/datefield.rb b/ext/tk/lib/tkextlib/tcllib/datefield.rb
index 4c2eae741e..2244dd7a9a 100644
--- a/ext/tk/lib/tkextlib/tcllib/datefield.rb
+++ b/ext/tk/lib/tkextlib/tcllib/datefield.rb
@@ -7,12 +7,12 @@
#
# (The following is the original description of the library.)
#
-# The datefield package provides the datefield widget which is an enhanced
-# text entry widget for the purpose of date entry. Only valid dates of the
+# The datefield package provides the datefield widget which is an enhanced
+# text entry widget for the purpose of date entry. Only valid dates of the
# form MM/DD/YYYY can be entered.
-#
-# The datefield widget is, in fact, just an entry widget with specialized
-# bindings. This means all the command and options for an entry widget apply
+#
+# The datefield widget is, in fact, just an entry widget with specialized
+# bindings. This means all the command and options for an entry widget apply
# equally here.
require 'tk'
@@ -47,7 +47,7 @@ class Tk::Tcllib::Datefield
def create_self(keys)
if keys and keys != None
- tk_call_without_enc(self.class::TkCommandNames[0], @path,
+ tk_call_without_enc(self.class::TkCommandNames[0], @path,
*hash_kv(keys, true))
else
tk_call_without_enc(self.class::TkCommandNames[0], @path)
diff --git a/ext/tk/lib/tkextlib/tcllib/diagrams.rb b/ext/tk/lib/tkextlib/tcllib/diagrams.rb
deleted file mode 100644
index d24ba9d232..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/diagrams.rb
+++ /dev/null
@@ -1,224 +0,0 @@
-#
-# tkextlib/tcllib/diagrams.rb
-# by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-# * Part of tcllib extension
-# * Draw diagrams
-#
-
-require 'tk'
-require 'tkextlib/tcllib.rb'
-
-# TkPackage.require('Diagrams', '0.3')
-TkPackage.require('Diagrams')
-
-module Tk::Tcllib
- module Diagrams
- PACKAGE_NAME = 'Diagrams'.freeze
- def self.package_name
- PACKAGE_NAME
- end
-
- def self.package_version
- begin
- TkPackage.require('Diagrams')
- rescue
- ''
- end
- end
- end
-end
-
-class << Tk::Tcllib::Diagrams
- include TkCore
-
- def drawin(canvas)
- tk_call('::Diagrams::drawin', canvas)
- canvas
- end
- alias draw_in drawin
-
- def saveps(filename)
- tk_call('::Diagrams::saveps', filename)
- filename
- end
- alias save_ps saveps
-
- def direction(dir)
- tk_call('::Diagrams::direction', dir)
- dir
- end
-
- def currentpos(pos)
- list(tk_call('::Diagrams::currentpos', pos))
- end
- alias current_pos currentpos
- alias currentpos= currentpos
- alias current_pos= currentpos
-
- def getpos(anchor, obj)
- list(tk_call('::Diagrams::getpos', anchor, obj))
- end
- alias get_pos getpos
-
- def position(x, y)
- list(tk_call('::Diagrams::position', x, y))
- end
-
- def box(text, width=nil, height=nil)
- if width || height
- width = '' unless width
- height = '' unless height
- list(tk_call('::Diagrams::box', text, width, height))
- else
- list(tk_call('::Diagrams::box', text))
- end
- end
-
- def plaintext(text, width=nil, height=nil)
- if width || height
- width = '' unless width
- height = '' unless height
- list(tk_call('::Diagrams::plaintext', text, width, height))
- else
- list(tk_call('::Diagrams::plaintext', text))
- end
- end
-
- def circle(text, radius=nil)
- if radius
- list(tk_call('::Diagrams::circle', text, radius))
- else
- list(tk_call('::Diagrams::circle', text))
- end
- end
-
- def slanted(text, width=nil, height=nil, angle=nil)
- if width || height || angle
- width = '' unless width
- height = '' unless height
- if angle
- list(tk_call('::Diagrams::slanted', text, width, height, angle))
- else
- list(tk_call('::Diagrams::slanted', text, width, height))
- end
- else
- list(tk_call('::Diagrams::slanted', text))
- end
- end
-
- def diamond(text, width=nil, height=nil)
- if width || height
- width = '' unless width
- height = '' unless height
- list(tk_call('::Diagrams::diamond', text, width, height))
- else
- list(tk_call('::Diagrams::diamond', text))
- end
- end
-
- def drum(text, width=nil, height=nil)
- if width || height
- width = '' unless width
- height = '' unless height
- list(tk_call('::Diagrams::drum', text, width, height))
- else
- list(tk_call('::Diagrams::drum', text))
- end
- end
-
- def arrow(text=nil, length=nil, head=nil)
- if length || head
- text = '' unless text
- length = '' unless length
- list(tk_call('::Diagrams::arrow', text, length, head))
- else
- if text
- list(tk_call('::Diagrams::arrow', text))
- else
- list(tk_call('::Diagrams::arrow'))
- end
- end
- end
-
- def line(*args)
- ary = []
- args.each{|arg|
- if arg.kind_of?(Array) && arg.length == 2 # [length, angle]
- ary.concat arg
- else # ["POSITION", x, y] or length or angle
- ary << arg
- end
- }
- list(tk_call('::Diagrams::line', *ary))
- end
-
- def bracket(dir, dist, from_pos, to_pos)
- list(tk_call('::Diagrams::bracket', dir, dist, from_pos, to_pos))
- end
-
- def attach(anchor=None)
- tk_call('::Diagrams::attach', anchor)
- end
-
- def color(name=None)
- tk_call('::Diagrams::color', name)
- end
-
- def fillcolor(name=None)
- tk_call('::Diagrams::fillcolor', name)
- end
-
- def textcolor(name=None)
- tk_call('::Diagrams::textcolor', name)
- end
-
- def usegap(mode=None)
- bool(tk_call('::Diagrams::usegap', mode))
- end
- alias use_gap usegap
-
- def xgap(val=None)
- number(tk_call('::Diagrams::xgap', val))
- end
-
- def ygap(val=None)
- number(tk_call('::Diagrams::ygap', val))
- end
-
- def textfont(fnt=None)
- tk_call('::Diagrams::textfont', fnt)
- end
-
- def linewidth(pixels=None)
- number(tk_call('::Diagrams::linewidth', pixels))
- end
-
- def linestyle(style=None)
- tk_call('::Diagrams::linestyle', style)
- end
-
- def pushstate
- tk_call('::Diagrams::pushstate')
- end
- alias push_state pushstate
-
- def popstate
- tk_call('::Diagrams::popstate')
- end
- alias pop_state popstate
-
- def computepos
- list(tk_call('::Diagrams::computepos'))
- end
- alias compute_pos computepos
-
- def boxcoords(x1, y1, x2, y2)
- list(tk_call('::Diagrams::boxcoords', x1, y1, x2, y2))
- end
-
- def moveobject(obj)
- list(tk_call('::Diagrams::moveobject', obj))
- end
- alias move_object moveobject
-end
diff --git a/ext/tk/lib/tkextlib/tcllib/dialog.rb b/ext/tk/lib/tkextlib/tcllib/dialog.rb
index 86a0ef2269..825621b5a1 100644
--- a/ext/tk/lib/tkextlib/tcllib/dialog.rb
+++ b/ext/tk/lib/tkextlib/tcllib/dialog.rb
@@ -41,7 +41,7 @@ class Tk::Tcllib::Widget::Dialog
def create_self(keys)
if keys and keys != None
- tk_call_without_enc(self.class::TkCommandNames[0], @path,
+ tk_call_without_enc(self.class::TkCommandNames[0], @path,
*hash_kv(keys, true))
else
tk_call_without_enc(self.class::TkCommandNames[0], @path)
diff --git a/ext/tk/lib/tkextlib/tcllib/getstring.rb b/ext/tk/lib/tkextlib/tcllib/getstring.rb
index 48711d3b66..fc5d8b26d9 100644
--- a/ext/tk/lib/tkextlib/tcllib/getstring.rb
+++ b/ext/tk/lib/tkextlib/tcllib/getstring.rb
@@ -34,7 +34,7 @@ end
class Tk::Tcllib::GetString_Dialog
TkCommandNames = ['::getstring::tk_getString'.freeze].freeze
WidgetClassName = 'TkSDialog'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def self.show(*args)
dialog = self.new(*args)
@@ -74,7 +74,7 @@ class Tk::Tcllib::GetString_Dialog
def show
@variable.value = ''
- @status = bool(tk_call(self.class::TkCommandNames[0],
+ @status = bool(tk_call(self.class::TkCommandNames[0],
@path, @variable, @text, *hash_kv(@keys)))
end
alias display show
diff --git a/ext/tk/lib/tkextlib/tcllib/ico.rb b/ext/tk/lib/tkextlib/tcllib/ico.rb
index 36a32c6b09..8c92926a4c 100644
--- a/ext/tk/lib/tkextlib/tcllib/ico.rb
+++ b/ext/tk/lib/tkextlib/tcllib/ico.rb
@@ -8,7 +8,7 @@
require 'tk'
require 'tk/image'
-#require 'tkextlib/tcllib.rb'
+require 'tkextlib/tcllib.rb'
# TkPackage.require('ico', '0.3')
TkPackage.require('ico')
@@ -38,39 +38,9 @@ class Tk::Tcllib::ICO
*hash_kv(keys, true)))
end
- def self.icons(file, keys=nil)
- tk_split_simplelist(tk_call_without_enc('::ico::icons', file,
- *hash_kv(keys, true))).map{|elem|
- num_or_str(elem)
- }
- end
-
- def self.get_members(file, name, keys=nil)
- tk_split_simplelist(tk_call_without_enc('::ico::getMembers', file, name,
- *hash_kv(keys, true))).map{|elem|
- name, width, height, bpp = tk_split_simplelist(elem)
- [name, number(width), number(height), number(bpp)]
- }
- end
-
def self.get(file, index, keys=nil)
tk_call_without_enc('::ico::getIcon', file, index, *hash_kv(keys, true))
end
- def self.get_icon(*args)
- get(*args)
- end
-
- def self.get_by_name(file, name, keys=nil)
- tk_call_without_enc('::ico::getIconByName', file, name,
- *hash_kv(keys, true))
- end
- def self.get_icon_by_name(*args)
- get_by_name(*args)
- end
-
- def self.get_fileicon(file, keys=nil)
- tk_call_without_enc('::ico::getFileIcon', file, *hash_kv(keys, true))
- end
def self.get_image(file, index, keys={})
keys = _symbolkey2str(keys)
@@ -80,23 +50,23 @@ class Tk::Tcllib::ICO
def self.get_data(file, index, keys={})
keys['format'] = 'data'
- tk_split_list(tk_call_without_enc('::ico::getIcon', file, index,
+ tk_split_list(tk_call_without_enc('::ico::getIcon', file, index,
*hash_kv(keys, true)))
end
def self.write(file, index, depth, data, keys=nil)
- tk_call_without_enc('::ico::writeIcon', file, index, depth, data,
+ tk_call_without_enc('::ico::writeIcon', file, index, depth, data,
*hash_kv(keys, true))
end
def self.copy(from_file, from_index, to_file, to_index, keys=nil)
- tk_call_without_enc('::ico::copyIcon',
- from_file, from_index, to_file, to_index,
+ tk_call_without_enc('::ico::copyIcon',
+ from_file, from_index, to_file, to_index,
*hash_kv(keys, true))
end
def self.exe_to_ico(exe_file, ico_file, keys=nil)
- tk_call_without_enc('::ico::copyIcon', exe_file, ico_file,
+ tk_call_without_enc('::ico::copyIcon', exe_file, ico_file,
*hash_kv(keys, true))
end
@@ -106,7 +76,7 @@ class Tk::Tcllib::ICO
def self.transparent_color(image, color)
if image.kind_of?(Array)
- tk_split_list(tk_call_without_enc('::ico::transparentColor',
+ tk_split_list(tk_call_without_enc('::ico::transparentColor',
image, color))
else
tk_call_without_enc('::ico::transparentColor', image, color)
@@ -129,7 +99,7 @@ class Tk::Tcllib::ICO
Tk_Image_ID[1].succ!
}
end
- tk_call_without_enc('::ico::getIcon', file, index, '-name', @path,
+ tk_call_without_enc('::ico::getIcon', file, index, '-name', @path,
'-format', 'image', *hash_kv(keys, true))
Tk_IMGTBL[@path] = self
end
diff --git a/ext/tk/lib/tkextlib/tcllib/ip_entry.rb b/ext/tk/lib/tkextlib/tcllib/ip_entry.rb
index e5e0f8d42d..c4b8240c04 100644
--- a/ext/tk/lib/tkextlib/tcllib/ip_entry.rb
+++ b/ext/tk/lib/tkextlib/tcllib/ip_entry.rb
@@ -7,7 +7,7 @@
#
# (The following is the original description of the library.)
#
-# This package provides a widget for the entering of a IP address.
+# This package provides a widget for the entering of a IP address.
# It guarantees a valid address at all times.
require 'tk'
@@ -33,22 +33,17 @@ module Tk
end
end
IPEntry = IP_Entry
-
- class IP_Entry6 < IP_Entry
- end
- IPEntry6 = IP_Entry6
- IP6_Entry = IP_Entry6
end
end
class Tk::Tcllib::IP_Entry
TkCommandNames = ['::ipentry::ipentry'.freeze].freeze
WidgetClassName = 'IPEntry'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def create_self(keys)
if keys and keys != None
- tk_call_without_enc(self.class::TkCommandNames[0], @path,
+ tk_call_without_enc(self.class::TkCommandNames[0], @path,
*hash_kv(keys, true))
else
tk_call_without_enc(self.class::TkCommandNames[0], @path)
@@ -69,7 +64,3 @@ class Tk::Tcllib::IP_Entry
tk_send_without_enc('insert', array2tk_list(ip.flatten))
end
end
-
-class Tk::Tcllib::IP_Entry6 < Tk::Tcllib::IP_Entry
- TkCommandNames = ['::ipentry::ipentry6'.freeze].freeze
-end
diff --git a/ext/tk/lib/tkextlib/tcllib/khim.rb b/ext/tk/lib/tkextlib/tcllib/khim.rb
deleted file mode 100644
index 00acff91d9..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/khim.rb
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-# tkextlib/tcllib/khim.rb
-# by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-# * Part of tcllib extension
-# * Kevin's Hacky Input Method
-#
-
-require 'tk'
-require 'tkextlib/tcllib.rb'
-
-# TkPackage.require('khim', '1.0')
-TkPackage.require('khim')
-
-module Tk::Tcllib
- class KHIM < TkToplevel
- PACKAGE_NAME = 'khim'.freeze
- def self.package_name
- PACKAGE_NAME
- end
-
- def self.package_version
- begin
- TkPackage.require('khim')
- rescue
- ''
- end
- end
- end
-end
-
-class Tk::Tcllib::KHIM
- TkCommandNames = ['::khim::getOptions'.freeze].freeze
-
- def self.get_options(parent='')
- path = parent + '.tcllib_widget_khim_dialog'
- self.new(:widgetname => path)
- end
-
- def self.get_config #=> cmd_string
- Tk.tk_call_without_enc('::khim::getConfig')
- end
-
- def self.set_config(*args)
- if args.length == 1
- # cmd_string generated by
- #Tk.ip_eval_without_enc(cmd_string)
- Tk.ip_eval(cmd_string)
- else
- # args for setConfig command
- #Tk.tk_call_without_enc('::khim::setConfig', *args)
- Tk.tk_call('::khim::setConfig', *args)
- end
- end
-
- def self.showHelp
- Tk::Tcllib::KHIM::Help.new
- end
-
- def create_self(keys=None)
- @db_class = @classname = nil
- super(None) # ignore keys
- end
-end
-
-class Tk::Tcllib::KHIM::Help < TkToplevel
- TkCommandNames = ['::khim::showHelp'.freeze].freeze
-end
diff --git a/ext/tk/lib/tkextlib/tcllib/menuentry.rb b/ext/tk/lib/tkextlib/tcllib/menuentry.rb
deleted file mode 100644
index f1eb2f295c..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/menuentry.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# tkextlib/tcllib/menuentry.rb
-# by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-# * Part of tcllib extension
-# * menuentry widget
-#
-
-require 'tk'
-require 'tkextlib/tcllib.rb'
-
-# TkPackage.require('widget::menuentry', '1.0')
-TkPackage.require('widget::menuentry')
-
-module Tk::Tcllib
- module Widget
- class Menuentry < Tk::Tile::TEntry
- PACKAGE_NAME = 'widget::menuentry'.freeze
- def self.package_name
- PACKAGE_NAME
- end
-
- def self.package_version
- begin
- TkPackage.require('widget::menuentry')
- rescue
- ''
- end
- end
- end
- MenuEntry = Menuentry
- end
-end
-
-class Tk::Tcllib::Widget::Menuentry
- TkCommandNames = ['::widget::menuentry'.freeze].freeze
-
- def create_self(keys)
- if keys and keys != None
- tk_call_without_enc(self.class::TkCommandNames[0], @path,
- *hash_kv(keys, true))
- else
- tk_call_without_enc(self.class::TkCommandNames[0], @path)
- end
- end
- private :create_self
-end
diff --git a/ext/tk/lib/tkextlib/tcllib/ntext.rb b/ext/tk/lib/tkextlib/tcllib/ntext.rb
deleted file mode 100644
index 7888ed4871..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/ntext.rb
+++ /dev/null
@@ -1,146 +0,0 @@
-#
-# tkextlib/tcllib/ntext.rb
-# by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-# * Part of tcllib extension
-# * Ntext bindtag
-#
-
-require 'tk'
-require 'tkextlib/tcllib.rb'
-
-# TkPackage.require('ntext', '0.81')
-TkPackage.require('ntext')
-
-module Tk::Tcllib
- Ntext = TkBindTag.new_by_name('Ntext')
-end
-
-# variables
-Tk::Tcllib::Ntext.instance_eval{
- # boolean
- @classicAnchor = TkVarAccess.new('::ntext::classicAnchor')
- @classicExtras = TkVarAccess.new('::ntext::classicExtras')
- @classicMouseSelect = TkVarAccess.new('::ntext::classicMouseSelect')
- @classicWordBreak = TkVarAccess.new('::ntext::classicWordBreak')
- @classicWrap = TkVarAccess.new('::ntext::classicWrap')
- @overwrite = TkVarAccess.new('::ntext::overwrite')
-
- # regexp
- @newWrapRegexp = TkVarAccess.new('::ntext::newWrapRegexp')
-
- # variables (advanced use)
- @tcl_match_wordBreakAfter = TkVarAccess.new('::ntext::tcl_match_wordBreakAfter')
- @tcl_match_wordBreakBefore = TkVarAccess.new('::ntext::tcl_match_wordBreakBefore')
- @tcl_match_endOfWord = TkVarAccess.new('::ntext::tcl_match_endOfWord')
- @tcl_match_startOfNextWord = TkVarAccess.new('::ntext::tcl_match_startOfNextWord')
- @tcl_match_startOfPreviousWord = TkVarAccess.new('::ntext::tcl_match_startOfPreviousWord')
-}
-
-class << Tk::Tcllib::Ntext
- def wrapIndent(txt, *args)
- TK.tk_call('::next::wrapIndent', txt, *args)
- end
-
- def initializeMatchPatterns
- TK.tk_call('::next::initializeMatchPatterns')
- self
- end
-
- def createMatchPatterns(*args)
- TK.tk_call('::next::createMatchPatterns', *args)
- self
- end
-
- # functions (advanced use)
- #ntext::new_wordBreakAfter
- #ntext::new_wordBreakBefore
- #ntext::new_endOfWord
- #ntext::new_startOfNextWord
- #ntext::new_startOfPreviousWord
-
- # accessor
- def classicAnchor
- @classicAnchor.bool
- end
- def classicAnchor=(mode)
- @classicAnchor.bool = mode
- end
-
- def classicExtras
- @classicExtras.bool
- end
- def classicExtras=(mode)
- @classicExtras.bool = mode
- end
-
- def classicMouseSelect
- @classicMouseSelect.bool
- end
- def classicMouseSelect=(mode)
- @classicMouseSelect.bool = mode
- end
-
- def classicWordBreak
- @classicWordBreak.bool
- end
- def classicWordBreak=(mode)
- @classicWordBreak.bool = mode
- end
-
- def classicWrap
- @classicWrap.bool
- end
- def classicWrap=(mode)
- @classicWrap.bool = mode
- end
-
- def overwrite
- @overwrite.bool
- end
- def overwrite=(mode)
- @classic.bool = mode
- end
-
- def newWrapRegexp
- @newWrapRegexp.value
- end
- def newWrapRegexp=(val)
- @newWrapRegexp.value = val
- end
-
- def tcl_match_wordBreakAfter
- @tcl_match_wordBreakAfter.value
- end
- def tcl_match_wordBreakAfter=(val)
- @tcl_match_wordBreakAfter.value = val
- end
-
- def tcl_match_wordBreakBefore
- @tcl_match_wordBreakBefore.value
- end
- def tcl_match_wordBreakBefore=(val)
- @tcl_match_wordBreakBefore.value = val
- end
-
- def tcl_match_endOfWord
- @tcl_match_endOfWord.value
- end
- def tcl_match_endOfWord=(val)
- @tcl_match_endOfWord.value = val
- end
-
- def tcl_match_startOfNextWord
- @tcl_match_startOfNextWord.value
- end
- def tcl_match_startOfNextWord=(val)
- @tcl_match_startOfNextWord.value = val
- end
-
- def tcl_match_startOfPreviousWord
- @tcl_match_startOfPreviousWord.value
- end
- def tcl_match_startOfPreviousWord=(val)
- @tcl_match_startOfPreviousWord.value = val
- end
-end
diff --git a/ext/tk/lib/tkextlib/tcllib/panelframe.rb b/ext/tk/lib/tkextlib/tcllib/panelframe.rb
index 020c51cbd1..2a4562e779 100644
--- a/ext/tk/lib/tkextlib/tcllib/panelframe.rb
+++ b/ext/tk/lib/tkextlib/tcllib/panelframe.rb
@@ -37,7 +37,7 @@ class Tk::Tcllib::Widget::PanelFrame
def create_self(keys)
if keys and keys != None
- tk_call_without_enc(self.class::TkCommandNames[0], @path,
+ tk_call_without_enc(self.class::TkCommandNames[0], @path,
*hash_kv(keys, true))
else
tk_call_without_enc(self.class::TkCommandNames[0], @path)
@@ -60,17 +60,11 @@ class Tk::Tcllib::Widget::PanelFrame
def remove(*wins)
tk_send('remove', *wins)
- self
end
def remove_destroy(*wins)
tk_send('remove', '-destroy', *wins)
- self
- end
-
- def delete(*wins)
- tk_send('delete', *wins)
- self
end
+ alias delete remove_destroy
def items
simplelist(tk_send('items')).collect!{|w| window(w)}
diff --git a/ext/tk/lib/tkextlib/tcllib/plotchart.rb b/ext/tk/lib/tkextlib/tcllib/plotchart.rb
index 6b7a526b75..06ab20f3e6 100644
--- a/ext/tk/lib/tkextlib/tcllib/plotchart.rb
+++ b/ext/tk/lib/tkextlib/tcllib/plotchart.rb
@@ -7,10 +7,10 @@
#
# (The following is the original description of the library.)
#
-# Plotchart is a Tcl-only package that focuses on the easy creation of
-# xy-plots, barcharts and other common types of graphical presentations.
-# The emphasis is on ease of use, rather than flexibility. The procedures
-# that create a plot use the entire canvas window, making the layout of the
+# Plotchart is a Tcl-only package that focuses on the easy creation of
+# xy-plots, barcharts and other common types of graphical presentations.
+# The emphasis is on ease of use, rather than flexibility. The procedures
+# that create a plot use the entire canvas window, making the layout of the
# plot completely automatic.
#
# This results in the creation of an xy-plot in, say, ten lines of code:
@@ -32,27 +32,27 @@
# $s title "Data series"
# --------------------------------------------------------------------
#
-# A drawback of the package might be that it does not do any data management.
-# So if the canvas that holds the plot is to be resized, the whole plot must
-# be redrawn. The advantage, though, is that it offers a number of plot and
+# A drawback of the package might be that it does not do any data management.
+# So if the canvas that holds the plot is to be resized, the whole plot must
+# be redrawn. The advantage, though, is that it offers a number of plot and
# chart types:
#
# * XY-plots like the one shown above with any number of data series.
-# * Stripcharts, a kind of XY-plots where the horizontal axis is adjusted
-# automatically. The result is a kind of sliding window on the data
+# * Stripcharts, a kind of XY-plots where the horizontal axis is adjusted
+# automatically. The result is a kind of sliding window on the data
# series.
# * Polar plots, where the coordinates are polar instead of cartesian.
-# * Isometric plots, where the scale of the coordinates in the two
-# directions is always the same, i.e. a circle in world coordinates
+# * Isometric plots, where the scale of the coordinates in the two
+# directions is always the same, i.e. a circle in world coordinates
# appears as a circle on the screen.
-# You can zoom in and out, as well as pan with these plots (Note: this
-# works best if no axes are drawn, the zooming and panning routines do
-# not distinguish the axes), using the mouse buttons with the control
+# You can zoom in and out, as well as pan with these plots (Note: this
+# works best if no axes are drawn, the zooming and panning routines do
+# not distinguish the axes), using the mouse buttons with the control
# key and the arrow keys with the control key.
# * Piecharts, with automatic scaling to indicate the proportions.
-# * Barcharts, with either vertical or horizontal bars, stacked bars or
+# * Barcharts, with either vertical or horizontal bars, stacked bars or
# bars side by side.
-# * Timecharts, where bars indicate a time period and milestones or other
+# * Timecharts, where bars indicate a time period and milestones or other
# important moments in time are represented by triangles.
# * 3D plots (both for displaying surfaces and 3D bars)
#
@@ -62,7 +62,6 @@ require 'tkextlib/tcllib.rb'
# TkPackage.require('Plotchart', '0.9')
# TkPackage.require('Plotchart', '1.1')
-# TkPackage.require('Plotchart', '1.6.3')
TkPackage.require('Plotchart')
module Tk
@@ -92,13 +91,13 @@ module Tk::Tcllib::Plotchart
end
def self.world_coordinates(w, *args) # args := xmin, ymin, xmax, ymax
- tk_call_without_enc('::Plotchart::worldCoordinates',
+ tk_call_without_enc('::Plotchart::worldCoordinates',
w.path, *(args.flatten))
end
- def self.world_3D_coordinates(w, *args)
+ def self.world_3D_coordinates(w, *args)
# args := xmin, ymin, zmin, xmax, ymax, zmax
- tk_call_without_enc('::Plotchart::world3DCoordinates',
+ tk_call_without_enc('::Plotchart::world3DCoordinates',
w.path, *(args.flatten))
end
@@ -110,29 +109,6 @@ module Tk::Tcllib::Plotchart
list(tk_call_without_enc('::Plotchart::coords3DToPixel', w.path, x, y, z))
end
- def self.plotconfig(*args)
- case args.length
- when 0, 1, 2
- # 0: (no args) --> list of chat types
- # 1: charttype --> list of components
- # 2: charttype, component --> list of properties
- simplelist(tk_call('::Plotchart::plotconfig', *args))
- when 3
- # 3: charttype, component, property --> current value
- tk_call('::Plotchart::plotconfig', *args)
- else
- # 4: charttype, component, property, value : set new value
- # 5+: Error on Tcl/Tk
- tk_call('::Plotchart::plotconfig', *args)
- nil
- end
- end
-
- def self.plotpack(w, dir, *plots)
- tk_call_without_enc('::Plotchart::plotpack', w.path, dir, *plots)
- w
- end
-
def self.polar_coordinates(w, radmax)
tk_call_without_enc('::Plotchart::polarCoordinates', w.path, radmax)
end
@@ -181,7 +157,8 @@ module Tk::Tcllib::Plotchart
if key.kind_of?(Hash)
tk_call_without_enc(@chart, 'xconfig', *hash_kv(key, true))
else
- tk_call(@chart, 'xconfig', "-#{key}",value)
+ tk_call_without_enc(@chart, 'xconfig',
+ "-#{key}", _get_eval_enc_str(value))
end
self
end
@@ -190,100 +167,27 @@ module Tk::Tcllib::Plotchart
if key.kind_of?(Hash)
tk_call_without_enc(@chart, 'yconfig', *hash_kv(key, true))
else
- tk_call(@chart, 'yconfig', "-#{key}", value)
- end
- self
- end
-
- def background(part, color_or_image, dir)
- tk_call_without_enc(@chart, 'background',
- part, color_or_image, dir)
- self
- end
-
- def xticklines(color=None)
- tk_call(@chart, 'xticklines', color)
- self
- end
-
- def yticklines(color=None)
- tk_call(@chart, 'yticklines', color)
- self
- end
-
- def legendconfig(key, value=None)
- if key.kind_of?(Hash)
- tk_call_without_enc(@chart, 'legendconfig', *hash_kv(key, true))
- else
- tk_call(@chart, 'legendconfig', "-#{key}", value)
- end
- self
- end
-
- def legend(series, text)
- tk_call_without_enc(@chart, 'legend',
- _get_eval_enc_str(series), _get_eval_enc_str(text))
- self
- end
-
- def balloon(*args) # args => (x, y, text, dir) or ([x, y], text, dir)
- if args[0].kind_of?(Array)
- # args => ([x, y], text, dir)
- x, y = args.shift
- else
- # args => (x, y, text, dir)
- x = args.shift
- y = args.shift
+ tk_call_without_enc(@chart, 'yconfig',
+ "-#{key}", _get_eval_enc_str(value))
end
-
- text, dir = args
-
- tk_call_without_enc(@chart, 'balloon', x, y,
- _get_eval_enc_str(text), dir)
- self
- end
-
- def balloonconfig(key, value=None)
- if key.kind_of?(Hash)
- tk_call_without_enc(@chart, 'balloonconfig', *hash_kv(key, true))
- else
- tk_call(@chart, 'balloonconfig', "-#{key}", value)
- end
- end
-
- def plaintext(*args) # args => (x, y, text, dir) or ([x, y], text, dir)
- if args[0].kind_of?(Array)
- # args => ([x, y], text, dir)
- x, y = args.shift
- else
- # args => (x, y, text, dir)
- x = args.shift
- y = args.shift
- end
-
- text, dir = args
-
- tk_call_without_enc(@chart, 'plaintext', x, y,
- _get_eval_enc_str(text), dir)
self
end
############################
-
def view_port(*args) # args := pxmin, pymin, pxmax, pymax
tk_call_without_enc('::Plotchart::viewPort', @path, *(args.flatten))
self
end
def world_coordinates(*args) # args := xmin, ymin, xmax, ymax
- tk_call_without_enc('::Plotchart::worldCoordinates',
+ tk_call_without_enc('::Plotchart::worldCoordinates',
@path, *(args.flatten))
self
end
- def world_3D_coordinates(*args)
+ def world_3D_coordinates(*args)
# args := xmin, ymin, zmin, xmax, ymax, zmax
- tk_call_without_enc('::Plotchart::world3DCoordinates',
+ tk_call_without_enc('::Plotchart::world3DCoordinates',
@path, *(args.flatten))
self
end
@@ -296,11 +200,6 @@ module Tk::Tcllib::Plotchart
list(tk_call_without_enc('::Plotchart::coords3DToPixel', @path, x, y, z))
end
- def plotpack(dir, *plots)
- tk_call_without_enc('::Plotchart::plotpack', @path, dir, *plots)
- self
- end
-
def polar_coordinates(radmax)
tk_call_without_enc('::Plotchart::polarCoordinates', @path, radmax)
self
@@ -330,7 +229,7 @@ module Tk::Tcllib::Plotchart
include ChartMethod
TkCommandNames = [
- 'canvas'.freeze,
+ 'canvas'.freeze,
'::Plotchart::createXYPlot'.freeze
].freeze
@@ -360,7 +259,7 @@ module Tk::Tcllib::Plotchart
def _create_chart
p self.class::TkCommandNames[1] if $DEBUG
- tk_call_without_enc(self.class::TkCommandNames[1], @path,
+ tk_call_without_enc(self.class::TkCommandNames[1], @path,
array2tk_list(@xaxis), array2tk_list(@yaxis))
end
private :_create_chart
@@ -382,27 +281,27 @@ module Tk::Tcllib::Plotchart
vals = array2tk_list(vals) if vals.kind_of?(Array)
clss = array2tk_list(clss) if clss.kind_of?(Array)
- tk_call(@chart, 'contourlines', xcrd, ycrd, vals, clss)
+ tk_call_without_enc(@chart, 'contourlines', xcrd, ycrd, vals, clss)
self
end
- def contourfill(xcrd, ycrd, vals, clss=None)
+ def contourfill(xcrd, ycrd, vals, klasses=None)
xcrd = array2tk_list(xcrd) if xcrd.kind_of?(Array)
ycrd = array2tk_list(ycrd) if ycrd.kind_of?(Array)
vals = array2tk_list(vals) if vals.kind_of?(Array)
clss = array2tk_list(clss) if clss.kind_of?(Array)
- tk_call(@chart, 'contourfill', xcrd, ycrd, vals, clss)
+ tk_call_without_enc(@chart, 'contourfill', xcrd, ycrd, vals, clss)
self
end
- def contourbox(xcrd, ycrd, vals, clss=None)
+ def contourbox(xcrd, ycrd, vals, klasses=None)
xcrd = array2tk_list(xcrd) if xcrd.kind_of?(Array)
ycrd = array2tk_list(ycrd) if ycrd.kind_of?(Array)
vals = array2tk_list(vals) if vals.kind_of?(Array)
clss = array2tk_list(clss) if clss.kind_of?(Array)
- tk_call(@chart, 'contourbox', xcrd, ycrd, vals, clss)
+ tk_call_without_enc(@chart, 'contourbox', xcrd, ycrd, vals, clss)
self
end
@@ -425,110 +324,26 @@ module Tk::Tcllib::Plotchart
if key.kind_of?(Hash)
tk_call_without_enc(@chart, 'dataconfig', series, *hash_kv(key, true))
else
- tk_call(@chart, 'dataconfig', series, "-#{key}", value)
+ tk_call_without_enc(@chart, 'dataconfig', series,
+ "-#{key}", _get_eval_enc_str(value))
end
end
-
- def rescale(xscale, yscale) # xscale|yscale => [newmin, newmax, newstep]
- tk_call_without_enc(@chart, 'rescale', xscale, yscale)
- self
- end
-
- def trend(series, xcrd, ycrd)
- tk_call_without_enc(@chart, 'trend',
- _get_eval_enc_str(series), xcrd, ycrd)
- self
- end
-
- def rchart(series, xcrd, ycrd)
- tk_call_without_enc(@chart, 'rchart',
- _get_eval_enc_str(series), xcrd, ycrd)
- self
- end
-
- def interval(series, xcrd, ymin, ymax, ycenter=None)
- tk_call(@chart, 'interval', series, xcrd, ymin, ymax, ycenter)
- self
- end
-
- def box_and_whiskers(series, xcrd, ycrd)
- tk_call_without_enc(@chart, 'box-and-whiskers',
- _get_eval_enc_str(series), xcrd, ycrd)
- self
- end
- alias box_whiskers box_and_whiskers
-
- def vectorconfig(series, key, value=None)
- if key.kind_of?(Hash)
- tk_call_without_enc(@chart, 'vectorconfig',
- _get_eval_enc_str(series), *hash_kv(key, true))
- else
- tk_call(@chart, 'vectorconfig', series, "-#{key}", value)
- end
- self
- end
-
- def vector(series, xcrd, ycrd, ucmp, vcmp)
- tk_call_without_enc(@chart, 'vector', _get_eval_enc_str(series),
- xcrd, ycrd, ucmp, vcmp)
- self
- end
-
- def dotconfig(series, key, value=None)
- if key.kind_of?(Hash)
- tk_call_without_enc(@chart, 'dotconfig',
- _get_eval_enc_str(series), *hash_kv(key, true))
- else
- tk_call(@chart, 'dotconfig', series, "-#{key}", value)
- end
- self
- end
-
- def dot(series, xcrd, ycrd, value)
- tk_call_without_enc(@chart, 'dot', _get_eval_enc_str(series),
- xcrd, ycrd, value)
- self
- end
end
############################
class Stripchart < XYPlot
TkCommandNames = [
- 'canvas'.freeze,
+ 'canvas'.freeze,
'::Plotchart::createStripchart'.freeze
].freeze
end
############################
- class TXPlot < XYPlot
- TkCommandNames = [
- 'canvas'.freeze,
- '::Plotchart::createTXPlot'.freeze
- ].freeze
- end
-
- ############################
- class XLogYPlot < XYPlot
- TkCommandNames = [
- 'canvas'.freeze,
- '::Plotchart::createXLogYPlot'.freeze
- ].freeze
- end
-
- ############################
- class Histogram < XYPlot
- TkCommandNames = [
- 'canvas'.freeze,
- '::Plotchart::createHistgram'.freeze
- ].freeze
- end
-
- ############################
class PolarPlot < Tk::Canvas
include ChartMethod
TkCommandNames = [
- 'canvas'.freeze,
+ 'canvas'.freeze,
'::Plotchart::createPolarplot'.freeze
].freeze
@@ -555,7 +370,7 @@ module Tk::Tcllib::Plotchart
def _create_chart
p self.class::TkCommandNames[1] if $DEBUG
- tk_call_without_enc(self.class::TkCommandNames[1], @path,
+ tk_call_without_enc(self.class::TkCommandNames[1], @path,
array2tk_list(@radius_data))
end
private :_create_chart
@@ -567,17 +382,17 @@ module Tk::Tcllib::Plotchart
end
def plot(series, radius, angle)
- tk_call_without_enc(@chart, 'plot', _get_eval_enc_str(series),
+ tk_call_without_enc(@chart, 'plot', _get_eval_enc_str(series),
radius, angle)
self
end
def dataconfig(series, key, value=None)
if key.kind_of?(Hash)
- tk_call_without_enc(@chart, 'dataconfig', _get_eval_enc_str(series),
- *hash_kv(key, true))
+ tk_call_without_enc(@chart, 'dataconfig', series, *hash_kv(key, true))
else
- tk_call(@chart, 'dataconfig', series, "-#{key}", value)
+ tk_call_without_enc(@chart, 'dataconfig', series,
+ "-#{key}", _get_eval_enc_str(value))
end
end
end
@@ -588,7 +403,7 @@ module Tk::Tcllib::Plotchart
include ChartMethod
TkCommandNames = [
- 'canvas'.freeze,
+ 'canvas'.freeze,
'::Plotchart::createIsometricPlot'.freeze
].freeze
@@ -631,8 +446,8 @@ module Tk::Tcllib::Plotchart
def _create_chart
p self.class::TkCommandNames[1] if $DEBUG
- tk_call_without_enc(self.class::TkCommandNames[1], @path,
- array2tk_list(@xaxis), array2tk_list(@yaxis),
+ tk_call_without_enc(self.class::TkCommandNames[1], @path,
+ array2tk_list(@xaxis), array2tk_list(@yaxis),
@stepsize)
end
private :_create_chart
@@ -668,7 +483,7 @@ module Tk::Tcllib::Plotchart
include ChartMethod
TkCommandNames = [
- 'canvas'.freeze,
+ 'canvas'.freeze,
'::Plotchart::create3DPlot'.freeze
].freeze
@@ -701,9 +516,9 @@ module Tk::Tcllib::Plotchart
def _create_chart
p self.class::TkCommandNames[1] if $DEBUG
- tk_call_without_enc(self.class::TkCommandNames[1], @path,
- array2tk_list(@xaxis),
- array2tk_list(@yaxis),
+ tk_call_without_enc(self.class::TkCommandNames[1], @path,
+ array2tk_list(@xaxis),
+ array2tk_list(@yaxis),
array2tk_list(@zaxis))
end
private :_create_chart
@@ -726,33 +541,15 @@ module Tk::Tcllib::Plotchart
self
end
- def plot_line(dat, color)
- # dat has to be provided as a 2 level array.
- # 1st level contains rows, drawn in y-direction,
- # and each row is an array whose elements are drawn in x-direction,
- # for the columns.
- tk_call_without_enc(@chart, 'plotline', dat, color)
- self
- end
-
def plot_data(dat)
- # dat has to be provided as a 2 level array.
- # 1st level contains rows, drawn in y-direction,
- # and each row is an array whose elements are drawn in x-direction,
- # for the columns.
+ # dat has to be provided as a 2 level array.
+ # 1st level contains rows, drawn in y-direction,
+ # and each row is an array whose elements are drawn in x-direction,
+ # for the columns.
tk_call_without_enc(@chart, 'plotdata', dat)
self
end
- def zconfig(key, value=None)
- if key.kind_of?(Hash)
- tk_call_without_enc(@chart, 'zconfig', *hash_kv(key, true))
- else
- tk_call(@chart, 'zconfig', "-#{key}", value)
- end
- self
- end
-
def colour(fill, border)
# configure the colours to use for polygon borders and inner area
tk_call_without_enc(@chart, 'colour', fill, border)
@@ -764,137 +561,11 @@ module Tk::Tcllib::Plotchart
end
############################
- class Barchart3D < Tk::Canvas
- include ChartMethod
-
- TkCommandNames = [
- 'canvas'.freeze,
- '::Plotchart::create3DBarchart'.freeze
- ].freeze
-
- def initialize(*args) # args := ([parent,] yaxis, nobars [, keys])
- # yaxis := Array of [minimum, maximum, stepsize]
- # nobars := number of bars
- if args[0].kind_of?(Array)
- @yaxis = args.shift
- @nobars = args.shift
-
- super(*args) # create canvas widget
- else
- parent = args.shift
-
- @yaxis = args.shift
- @nobars = args.shift
-
- if parent.kind_of?(Tk::Canvas)
- @path = parent.path
- else
- super(parent, *args) # create canvas widget
- end
- end
-
- @chart = _create_chart
- end
-
- def _create_chart
- p self.class::TkCommandNames[1] if $DEBUG
- tk_call_without_enc(self.class::TkCommandNames[1], @path,
- array2tk_list(@yaxis), @nobars)
- end
- private :_create_chart
-
- def plot(label, yvalue, color)
- tk_call_without_enc(@chart, 'plot', _get_eval_enc_str(label),
- _get_eval_enc_str(yvalue), color)
- self
- end
-
- def config(key, value=None)
- if key.kind_of?(Hash)
- tk_call_without_enc(@chart, 'config', *hash_kv(key, true))
- else
- tk_call(@chart, 'config', "-#{key}", value)
- end
- self
- end
- end
-
- ############################
- class RibbonChart3D < Tk::Canvas
- include ChartMethod
-
- TkCommandNames = [
- 'canvas'.freeze,
- '::Plotchart::create3DRibbonChart'.freeze
- ].freeze
-
- def initialize(*args) # args := ([parent,] names, yaxis, zaxis [, keys])
- # names := Array of the series
- # yaxis := Array of [minimum, maximum, stepsize]
- # zaxis := Array of [minimum, maximum, stepsize]
- if args[0].kind_of?(Array)
- @names = args.shift
- @yaxis = args.shift
- @zaxis = args.shift
-
- super(*args) # create canvas widget
- else
- parent = args.shift
-
- @names = args.shift
- @yaxis = args.shift
- @zaxis = args.shift
-
- if parent.kind_of?(Tk::Canvas)
- @path = parent.path
- else
- super(parent, *args) # create canvas widget
- end
- end
-
- @chart = _create_chart
- end
-
- def _create_chart
- p self.class::TkCommandNames[1] if $DEBUG
- tk_call_without_enc(self.class::TkCommandNames[1], @path,
- array2tk_list(@names),
- array2tk_list(@yaxis),
- array2tk_list(@zaxis))
- end
- private :_create_chart
-
- def line(*args) # xypairs, color
- color = args.pop # last argument is a color
- xypairs = TkComm.slice_ary(args.flatten, 2) # regenerate xypairs
- tk_call_without_enc(@chart, 'line', xypairs, color)
- self
- end
-
- def area(*args) # xypairs, color
- color = args.pop # last argument is a color
- xypairs = TkComm.slice_ary(args.flatten, 2) # regenerate xypairs
- tk_call_without_enc(@chart, 'area', xypairs, color)
- self
- end
-
- def zconfig(key, value=None)
- if key.kind_of?(Hash)
- tk_call_without_enc(@chart, 'zconfig', *hash_kv(key, true))
- else
- tk_call(@chart, 'zconfig',"-#{key}", value)
- end
- self
- end
- end
-
-
- ############################
class Piechart < Tk::Canvas
include ChartMethod
TkCommandNames = [
- 'canvas'.freeze,
+ 'canvas'.freeze,
'::Plotchart::createPiechart'.freeze
].freeze
@@ -915,76 +586,9 @@ module Tk::Tcllib::Plotchart
private :_create_chart
def plot(*dat) # argument is a list of [label, value]
- tk_call(@chart, 'plot', dat.flatten)
- self
- end
-
- def colours(*list)
- tk_call_without_enc(@chart, 'colours', *list)
- self
- end
- alias colors colours
- end
-
-
- ############################
- class Radialchart < Tk::Canvas
- include ChartMethod
-
- TkCommandNames = [
- 'canvas'.freeze,
- '::Plotchart::createRadialchart'.freeze
- ].freeze
-
- def initialize(*args) # args := ([parent,] names, scale, style [, keys])
- # radius_data := Array of [maximum_radius, stepsize]
- if args[0].kind_of?(Array)
- @names = args.shift
- @scale = args.shift
- @style = args.shift
-
- super(*args) # create canvas widget
- else
- parent = args.shift
-
- @names = args.shift
- @scale = args.shift
- @style = args.shift
-
- if parent.kind_of?(Tk::Canvas)
- @path = parent.path
- else
- super(parent, *args) # create canvas widget
- end
- end
-
- @chart = _create_chart
- end
-
- def _create_chart
- p self.class::TkCommandNames[1] if $DEBUG
- tk_call_without_enc(self.class::TkCommandNames[1], @path,
- array2tk_list(@names), @scale, @style)
- end
- private :_create_chart
-
- def __destroy_hook__
- Tk::Tcllib::Plotchart::PlotSeries::SeriesID_TBL.mutex.synchronize{
- Tk::Tcllib::Plotchart::PlotSeries::SeriesID_TBL.delete(@path)
- }
- end
-
- def plot(data, color, thickness)
- tk_call_without_enc(@chart, 'plot', _get_eval_enc_str(data),
- color, thickness)
- self
- end
-
- def colours(*list)
- tk_call_without_enc(@chart, 'colours', *list)
+ tk_call_without_enc(@chart, 'plot', dat.flatten)
self
end
- alias colors colours
end
############################
@@ -992,11 +596,11 @@ module Tk::Tcllib::Plotchart
include ChartMethod
TkCommandNames = [
- 'canvas'.freeze,
+ 'canvas'.freeze,
'::Plotchart::createBarchart'.freeze
].freeze
- def initialize(*args)
+ def initialize(*args)
# args := ([parent,] xlabels, ylabels [, series] [, keys])
# xlabels, ylabels := labels | axis ( depend on normal or horizontal )
# labels := Array of [label, label, ...]
@@ -1038,8 +642,8 @@ module Tk::Tcllib::Plotchart
def _create_chart
p self.class::TkCommandNames[1] if $DEBUG
- tk_call_without_enc(self.class::TkCommandNames[1], @path,
- array2tk_list(@xlabels), array2tk_list(@ylabels),
+ tk_call_without_enc(self.class::TkCommandNames[1], @path,
+ array2tk_list(@xlabels), array2tk_list(@ylabels),
@series_size)
end
private :_create_chart
@@ -1051,13 +655,13 @@ module Tk::Tcllib::Plotchart
end
def plot(series, dat, col=None)
- tk_call(@chart, 'plot', series, dat, col)
+ tk_call_without_enc(@chart, 'plot', series, dat, col)
self
end
def colours(*cols)
# set the colours to be used
- tk_call(@chart, 'colours', *cols)
+ tk_call_without_enc(@chart, 'colours', *cols)
self
end
alias colour colours
@@ -1068,108 +672,12 @@ module Tk::Tcllib::Plotchart
############################
class HorizontalBarchart < Barchart
TkCommandNames = [
- 'canvas'.freeze,
+ 'canvas'.freeze,
'::Plotchart::createHorizontalBarchart'.freeze
].freeze
end
############################
- class Boxplot < Tk::Canvas
- include ChartMethod
-
- TkCommandNames = [
- 'canvas'.freeze,
- '::Plotchart::createBoxplot'.freeze
- ].freeze
-
- def initialize(*args) # args := ([parent,] xaxis, ylabels [, keys])
- # xaxis := Array of [minimum, maximum, stepsize]
- # yaxis := List of labels for the y-axis
- if args[0].kind_of?(Array)
- @xaxis = args.shift
- @ylabels = args.shift
-
- super(*args) # create canvas widget
- else
- parent = args.shift
-
- @xaxis = args.shift
- @ylabels = args.shift
-
- if parent.kind_of?(Tk::Canvas)
- @path = parent.path
- else
- super(parent, *args) # create canvas widget
- end
- end
-
- @chart = _create_chart
- end
-
- def _create_chart
- p self.class::TkCommandNames[1] if $DEBUG
- tk_call_without_enc(self.class::TkCommandNames[1], @path,
- array2tk_list(@xaxis), array2tk_list(@ylabels))
- end
- private :_create_chart
-
- def __destroy_hook__
- Tk::Tcllib::Plotchart::PlotSeries::SeriesID_TBL.mutex.synchronize{
- Tk::Tcllib::Plotchart::PlotSeries::SeriesID_TBL.delete(@path)
- }
- end
-
- def plot(label, *values)
- tk_call(@chart, 'plot', label, values.flatten)
- self
- end
- end
-
- ############################
- class RightAxis < Tk::Canvas
- include ChartMethod
-
- TkCommandNames = [
- 'canvas'.freeze,
- '::Plotchart::createRightAxis'.freeze
- ].freeze
-
- def initialize(*args) # args := ([parent,] yaxis [, keys])
- # yaxis := Array of [minimum, maximum, stepsize]
- if args[0].kind_of?(Array)
- @yaxis = args.shift
-
- super(*args) # create canvas widget
- else
- parent = args.shift
-
- @yaxis = args.shift
-
- if parent.kind_of?(Tk::Canvas)
- @path = parent.path
- else
- super(parent, *args) # create canvas widget
- end
- end
-
- @chart = _create_chart
- end
-
- def _create_chart
- p self.class::TkCommandNames[1] if $DEBUG
- tk_call_without_enc(self.class::TkCommandNames[1], @path,
- array2tk_list(@yaxis))
- end
- private :_create_chart
-
- def __destroy_hook__
- Tk::Tcllib::Plotchart::PlotSeries::SeriesID_TBL.mutex.synchronize{
- Tk::Tcllib::Plotchart::PlotSeries::SeriesID_TBL.delete(@path)
- }
- end
- end
-
- ############################
class Timechart < Tk::Canvas
include ChartMethod
@@ -1209,66 +717,52 @@ module Tk::Tcllib::Plotchart
def _create_chart
p self.class::TkCommandNames[1] if $DEBUG
- tk_call_without_enc(self.class::TkCommandNames[1], @path,
+ tk_call_without_enc(self.class::TkCommandNames[1], @path,
@time_begin, @time_end, @items)
end
private :_create_chart
def period(txt, time_begin, time_end, col=None)
- tk_call(@chart, 'period', txt, time_begin, time_end, col)
+ tk_call_without_enc(@chart, 'period', txt, time_begin, time_end, col)
self
end
def milestone(txt, time, col=None)
- tk_call(@chart, 'milestone', txt, time, col)
+ tk_call_without_enc(@chart, 'milestone', txt, time, col)
self
end
def vertline(txt, time)
- tk_call(@chart, 'vertline', txt, time)
- self
- end
-
- def hscroll=(scr)
- tk_call_without_enc(@chart, 'hscroll', scr)
- scr
- end
- def hscroll(scr)
- tk_call_without_enc(@chart, 'hscroll', scr)
- self
- end
-
- def vscroll=(scr)
- tk_call_without_enc(@chart, 'vscroll', scr)
- scr
- end
- def vscroll(scr)
- tk_call_without_enc(@chart, 'vscroll', scr)
+ tk_call_without_enc(@chart, 'vertline', txt, time)
self
end
end
############################
- class Ganttchart < Tk::Canvas
+ class Gnattchart < Tk::Canvas
include ChartMethod
TkCommandNames = [
'canvas'.freeze,
- '::Plotchart::createGanttchart'.freeze
+ '::Plotchart::createGnattchart'.freeze
].freeze
def initialize(*args)
# args := ([parent,] time_begin, time_end, items [, text_width] [, keys])
# time_begin := String of time format (e.g. "1 january 2004")
# time_end := String of time format (e.g. "1 january 2004")
- # args := Expected/maximum number of items
- # ( This determines the vertical spacing. ),
- # Expected/maximum width of items,
- # Option Hash ( { key=>value, ... } )
+ # items := Expected/maximum number of items
+ # ( This determines the vertical spacing. )
if args[0].kind_of?(String)
@time_begin = args.shift
@time_end = args.shift
- @args = args
+ @items = args.shift
+
+ if args[0].kind_of?(Fixnum)
+ @text_width = args.shift
+ else
+ @text_width = None
+ end
super(*args) # create canvas widget
else
@@ -1276,7 +770,13 @@ module Tk::Tcllib::Plotchart
@time_begin = args.shift
@time_end = args.shift
- @args = args
+ @items = args.shift
+
+ if args[0].kind_of?(Fixnum)
+ @text_width = args.shift
+ else
+ @text_width = None
+ end
if parent.kind_of?(Tk::Canvas)
@path = parent.path
@@ -1290,25 +790,25 @@ module Tk::Tcllib::Plotchart
def _create_chart
p self.class::TkCommandNames[1] if $DEBUG
- tk_call(self.class::TkCommandNames[1], @path,
- @time_begin, @time_end, *args)
+ tk_call_without_enc(self.class::TkCommandNames[1], @path,
+ @time_begin, @time_end, @items, @text_width)
end
private :_create_chart
def task(txt, time_begin, time_end, completed=0.0)
- list(tk_call(@chart, 'task', txt, time_begin, time_end,
- completed)).collect!{|id|
+ list(tk_call_without_enc(@chart, 'task', txt, time_begin, time_end,
+ completed)).collect!{|id|
TkcItem.id2obj(self, id)
}
end
def milestone(txt, time, col=None)
- tk_call(@chart, 'milestone', txt, time, col)
+ tk_call_without_enc(@chart, 'milestone', txt, time, col)
self
end
def vertline(txt, time)
- tk_call(@chart, 'vertline', txt, time)
+ tk_call_without_enc(@chart, 'vertline', txt, time)
self
end
@@ -1316,41 +816,23 @@ module Tk::Tcllib::Plotchart
from_task = array2tk_list(from_task) if from_task.kind_of?(Array)
to_task = array2tk_list(to_task) if to_task.kind_of?(Array)
- tk_call(@chart, 'connect', from_task, to_task)
+ tk_call_without_enc(@chart, 'connect', from_task, to_task)
self
end
def summary(txt, tasks)
tasks = array2tk_list(tasks) if tasks.kind_of?(Array)
- tk_call(@chart, 'summary', tasks)
+ tk_call_without_enc(@chart, 'summary', tasks)
self
end
def color_of_part(keyword, newcolor)
- tk_call(@chart, 'color', keyword, newcolor)
+ tk_call_without_enc(@chart, 'color', keyword, newcolor)
self
end
def font_of_part(keyword, newfont)
- tk_call(@chart, 'font', keyword, newfont)
- self
- end
-
- def hscroll=(scr)
- tk_call_without_enc(@chart, 'hscroll', scr)
- scr
- end
- def hscroll(scr)
- tk_call_without_enc(@chart, 'hscroll', scr)
- self
- end
-
- def vscroll=(scr)
- tk_call_without_enc(@chart, 'vscroll', scr)
- scr
- end
- def vscroll(scr)
- tk_call_without_enc(@chart, 'vscroll', scr)
+ tk_call_without_enc(@chart, 'font', keyword, newfont)
self
end
end
@@ -1359,7 +841,7 @@ module Tk::Tcllib::Plotchart
class PlotSeries < TkObject
SeriesID_TBL = TkCore::INTERP.create_table
- (Series_ID = ['series'.freeze, TkUtil.untrust('00000')]).instance_eval{
+ (Series_ID = ['series'.freeze, '00000'.taint]).instance_eval{
@mutex = Mutex.new
def mutex; @mutex; end
freeze
diff --git a/ext/tk/lib/tkextlib/tcllib/ruler.rb b/ext/tk/lib/tkextlib/tcllib/ruler.rb
index d22dafa053..88ffb2c912 100644
--- a/ext/tk/lib/tkextlib/tcllib/ruler.rb
+++ b/ext/tk/lib/tkextlib/tcllib/ruler.rb
@@ -46,7 +46,7 @@ class Tk::Tcllib::Widget::Ruler
def create_self(keys)
if keys and keys != None
- tk_call_without_enc(self.class::TkCommandNames[0], @path,
+ tk_call_without_enc(self.class::TkCommandNames[0], @path,
*hash_kv(keys, true))
else
tk_call_without_enc(self.class::TkCommandNames[0], @path)
diff --git a/ext/tk/lib/tkextlib/tcllib/screenruler.rb b/ext/tk/lib/tkextlib/tcllib/screenruler.rb
index 75fa36b66d..1b4067e2f0 100644
--- a/ext/tk/lib/tkextlib/tcllib/screenruler.rb
+++ b/ext/tk/lib/tkextlib/tcllib/screenruler.rb
@@ -47,7 +47,7 @@ class Tk::Tcllib::Widget::ScreenRuler
def create_self(keys)
if keys and keys != None
- tk_call_without_enc(self.class::TkCommandNames[0], @path,
+ tk_call_without_enc(self.class::TkCommandNames[0], @path,
*hash_kv(keys, true))
else
tk_call_without_enc(self.class::TkCommandNames[0], @path)
diff --git a/ext/tk/lib/tkextlib/tcllib/scrolledwindow.rb b/ext/tk/lib/tkextlib/tcllib/scrolledwindow.rb
deleted file mode 100644
index c9488b4686..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/scrolledwindow.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# tkextlib/tcllib/scrolledwindow.rb
-# by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-# * Part of tcllib extension
-# * scrolledwindow widget
-#
-
-require 'tk'
-require 'tkextlib/tcllib.rb'
-
-# TkPackage.require('widget::scrolledwindow', '1.2')
-TkPackage.require('widget::scrolledwindow')
-
-module Tk::Tcllib
- module Widget
- class Scrolledwindow < Tk::Tile::TFrame
- PACKAGE_NAME = 'widget::scrolledwindow'.freeze
- def self.package_name
- PACKAGE_NAME
- end
-
- def self.package_version
- begin
- TkPackage.require('widget::scrolledwindow')
- rescue
- ''
- end
- end
- end
- ScrolledWindow = Scrolledwindow
- end
-end
-
-class Tk::Tcllib::Widget::ScrolledWindow
- TkCommandNames = ['::widget::scrolledwindow'.freeze].freeze
-
- def create_self(keys)
- if keys and keys != None
- tk_call_without_enc(self.class::TkCommandNames[0], @path,
- *hash_kv(keys, true))
- else
- tk_call_without_enc(self.class::TkCommandNames[0], @path)
- end
- end
- private :create_self
-
- def getframe
- window(tk_send_without_enc('getframe'))
- end
- alias get_frame getframe
-
- def setwidget(w)
- window(tk_send_without_enc('setwidget', w))
- end
- alias set_widget setwidget
-end
diff --git a/ext/tk/lib/tkextlib/tcllib/scrollwin.rb b/ext/tk/lib/tkextlib/tcllib/scrollwin.rb
index c9f6062fef..717728e34a 100644
--- a/ext/tk/lib/tkextlib/tcllib/scrollwin.rb
+++ b/ext/tk/lib/tkextlib/tcllib/scrollwin.rb
@@ -42,7 +42,7 @@ class Tk::Tcllib::Widget::ScrolledWindow
def create_self(keys)
if keys and keys != None
- tk_call_without_enc(self.class::TkCommandNames[0], @path,
+ tk_call_without_enc(self.class::TkCommandNames[0], @path,
*hash_kv(keys, true))
else
tk_call_without_enc(self.class::TkCommandNames[0], @path)
diff --git a/ext/tk/lib/tkextlib/tcllib/setup.rb b/ext/tk/lib/tkextlib/tcllib/setup.rb
index ee406c6ca0..ce0f0bd4d4 100644
--- a/ext/tk/lib/tkextlib/tcllib/setup.rb
+++ b/ext/tk/lib/tkextlib/tcllib/setup.rb
@@ -2,7 +2,7 @@
# setup.rb -- setup script before calling TkPackage.require()
#
# If you need some setup operations (for example, add a library path
-# to the library search path) before using Tcl/Tk library packages
-# wrapped by Ruby scripts in this directory, please write the setup
+# to the library search path) before using Tcl/Tk library packages
+# wrapped by Ruby scripts in this directory, please write the setup
# operations in this file.
#
diff --git a/ext/tk/lib/tkextlib/tcllib/statusbar.rb b/ext/tk/lib/tkextlib/tcllib/statusbar.rb
deleted file mode 100644
index 46a4b9d8b6..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/statusbar.rb
+++ /dev/null
@@ -1,79 +0,0 @@
-#
-# tkextlib/tcllib/statusbar.rb
-# by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-# * Part of tcllib extension
-# * statusbar widget
-#
-
-require 'tk'
-require 'tkextlib/tcllib.rb'
-
-# TkPackage.require('widget::statusbar', '1.2')
-TkPackage.require('widget::statusbar')
-
-module Tk::Tcllib
- module Widget
- class Statusbar < Tk::Tile::TFrame
- PACKAGE_NAME = 'widget::statusbar'.freeze
- def self.package_name
- PACKAGE_NAME
- end
-
- def self.package_version
- begin
- TkPackage.require('widget::statusbar')
- rescue
- ''
- end
- end
- end
- end
-end
-
-class Tk::Tcllib::Widget::Statusbar
- TkCommandNames = ['::widget::statusbar'.freeze].freeze
-
- def __boolval_optkeys
- super() << 'separator' << 'resize' << 'resizeseparator'
- end
- private :__boolval_optkeys
-
- def create_self(keys)
- if keys and keys != None
- tk_call_without_enc(self.class::TkCommandNames[0], @path,
- *hash_kv(keys, true))
- else
- tk_call_without_enc(self.class::TkCommandNames[0], @path)
- end
- end
- private :create_self
-
- def getframe
- window(tk_send_without_enc('getframe'))
- end
- alias get_frame getframe
-
- def add(w, keys={})
- window(tk_send_without_enc('setwidget', *(hash_kv(keys))))
- end
-
- def remove(*wins)
- tk_send_without_enc('remove', *wins)
- self
- end
-
- def remove_with_destroy(*wins)
- tk_send_without_enc('remove', '-destroy', *wins)
- self
- end
-
- def delete(*wins)
- tk_send_without_enc('delete', *wins)
- self
- end
-
- def items(pat=None)
- tk_split_list(tk_send('items', pat))
- end
-end
diff --git a/ext/tk/lib/tkextlib/tcllib/superframe.rb b/ext/tk/lib/tkextlib/tcllib/superframe.rb
index adc9c4adbd..35da37efbf 100644
--- a/ext/tk/lib/tkextlib/tcllib/superframe.rb
+++ b/ext/tk/lib/tkextlib/tcllib/superframe.rb
@@ -37,7 +37,7 @@ class Tk::Tcllib::Widget::SuperFrame
def create_self(keys)
if keys and keys != None
- tk_call_without_enc(self.class::TkCommandNames[0], @path,
+ tk_call_without_enc(self.class::TkCommandNames[0], @path,
*hash_kv(keys, true))
else
tk_call_without_enc(self.class::TkCommandNames[0], @path)
diff --git a/ext/tk/lib/tkextlib/tcllib/swaplist.rb b/ext/tk/lib/tkextlib/tcllib/swaplist.rb
index 7698640534..1c813e36da 100644
--- a/ext/tk/lib/tkextlib/tcllib/swaplist.rb
+++ b/ext/tk/lib/tkextlib/tcllib/swaplist.rb
@@ -33,7 +33,7 @@ end
class Tk::Tcllib::Swaplist_Dialog
TkCommandNames = ['::swaplist::swaplist'.freeze].freeze
WidgetClassName = 'Swaplist'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def self.show(*args)
dialog = self.new(*args)
@@ -44,7 +44,7 @@ class Tk::Tcllib::Swaplist_Dialog
self.show(*args)
end
- def initialize(*args)
+ def initialize(*args)
# args = (parent=nil, complete_list=[], selected_list=[], keys=nil)
keys = args.pop
if keys.kind_of?(Hash)
@@ -74,9 +74,9 @@ class Tk::Tcllib::Swaplist_Dialog
def show
@variable.value = ''
- @status = bool(tk_call(self.class::TkCommandNames[0],
- @path, @variable,
- @complete_list, @selected_list,
+ @status = bool(tk_call(self.class::TkCommandNames[0],
+ @path, @variable,
+ @complete_list, @selected_list,
*hash_kv(@keys)))
end
alias display show
diff --git a/ext/tk/lib/tkextlib/tcllib/tablelist.rb b/ext/tk/lib/tkextlib/tcllib/tablelist.rb
index b40f7a5b8b..efeb8fbbac 100644
--- a/ext/tk/lib/tkextlib/tcllib/tablelist.rb
+++ b/ext/tk/lib/tkextlib/tcllib/tablelist.rb
@@ -10,8 +10,7 @@ require 'tkextlib/tcllib.rb'
# check Tile extension :: If already loaded, use tablelist_tile.
unless defined? Tk::Tcllib::Tablelist_usingTile
- Tk::Tcllib::Tablelist_usingTile =
- TkPackage.provide('tile') || TkPackage.provide('Ttk')
+ Tk::Tcllib::Tablelist_usingTile = TkPackage.provide('tile')
end
if Tk::Tcllib::Tablelist_usingTile
@@ -21,8 +20,8 @@ if Tk::Tcllib::Tablelist_usingTile
else
# without Tile
- # TkPackage.require('tablelist', '4.2')
- TkPackage.require('tablelist')
+ # TkPackage.require('Tablelist', '4.2')
+ TkPackage.require('Tablelist')
require 'tkextlib/tcllib/tablelist_core'
end
diff --git a/ext/tk/lib/tkextlib/tcllib/tablelist_core.rb b/ext/tk/lib/tkextlib/tcllib/tablelist_core.rb
index 850e75d845..d7a6c97210 100644
--- a/ext/tk/lib/tkextlib/tcllib/tablelist_core.rb
+++ b/ext/tk/lib/tkextlib/tcllib/tablelist_core.rb
@@ -4,7 +4,7 @@
# by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
#
# * Part of tcllib extension
-# * This file is required by 'tkextlib/tcllib/tablelist.rb' or
+# * This file is required by 'tkextlib/tcllib/tablelist.rb' or
# 'tkextlib/tcllib/tablelist_tile.rb'.
#
@@ -54,7 +54,7 @@ module Tk::Tcllib::TablelistItemConfig
elsif idx =~ /([^,]+),([^,]+)/
row = $1, column = $2
[num_or_str(row), num_or_str(column)]
- else
+ else
num_or_str(idx)
end
end
@@ -67,9 +67,6 @@ module Tk::Tcllib::TablelistItemConfig
[self.path, mixed_id[0] + 'configure', _to_idx(mixed_id[1])]
end
- def cell_cget_tkstring(tagOrId, option)
- itemcget_tkstring(['cell', tagOrId], option)
- end
def cell_cget(tagOrId, option)
itemcget(['cell', tagOrId], option)
end
@@ -85,16 +82,12 @@ module Tk::Tcllib::TablelistItemConfig
def current_cell_configinfo(tagOrId, slot=nil)
current_itemconfiginfo(['cell', tagOrId], slot)
end
- alias cellcget_tkstring cell_cget_tkstring
alias cellcget cell_cget
alias cellcget_strict cell_cget_strict
alias cellconfigure cell_configure
alias cellconfiginfo cell_configinfo
alias current_cellconfiginfo current_cell_configinfo
- def column_cget_tkstring(tagOrId, option)
- itemcget_tkstring(['column', tagOrId], option)
- end
def column_cget(tagOrId, option)
itemcget(['column', tagOrId], option)
end
@@ -110,16 +103,12 @@ module Tk::Tcllib::TablelistItemConfig
def current_column_configinfo(tagOrId, slot=nil)
current_itemconfiginfo(['column', tagOrId], slot)
end
- alias columncget_tkstring column_cget_tkstring
alias columncget column_cget
alias columncget_strict column_cget_strict
alias columnconfigure column_configure
alias columnconfiginfo column_configinfo
alias current_columnconfiginfo current_column_configinfo
- def row_cget_tkstring(tagOrId, option)
- itemcget_tkstring(['row', tagOrId], option)
- end
def row_cget(tagOrId, option)
itemcget(['row', tagOrId], option)
end
@@ -135,14 +124,13 @@ module Tk::Tcllib::TablelistItemConfig
def current_row_configinfo(tagOrId, slot=nil)
current_itemconfiginfo(['row', tagOrId], slot)
end
- alias rowcget_tkstring row_cget_tkstring
alias rowcget row_cget
alias rowcget_strict row_cget_strict
alias rowconfigure row_configure
alias rowconfiginfo row_configinfo
alias current_rowconfiginfo current_row_configinfo
- private :itemcget_tkstring, :itemcget, :itemcget_strict
+ private :itemcget, :itemcget_strict
private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
end
@@ -152,11 +140,11 @@ class Tk::Tcllib::Tablelist
TkCommandNames = ['::tablelist::tablelist'.freeze].freeze
WidgetClassName = 'Tablelist'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def create_self(keys)
if keys and keys != None
- tk_call_without_enc(self.class::TkCommandNames[0], @path,
+ tk_call_without_enc(self.class::TkCommandNames[0], @path,
*hash_kv(keys, true))
else
tk_call_without_enc(self.class::TkCommandNames[0], @path)
@@ -177,16 +165,16 @@ class Tk::Tcllib::Tablelist
private :__strval_optkeys
def __boolval_optkeys
- super() - ['takefocus'] + [
- 'forceeditendcommand', 'movablecolumns', 'movablerows',
- 'protecttitlecolumns', 'resizablecolumns', 'setfocus',
+ super() + [
+ 'forceeditendcommand', 'movablecolumns', 'movablerows',
+ 'protecttitlecolumns', 'resizablecolumns',
'showarrow', 'showlabels', 'showseparators'
]
end
private :__boolval_optkeys
def __listval_optkeys
- super() + ['columns', 'columntitles']
+ super() + ['columns']
end
private :__listval_optkeys
@@ -198,21 +186,7 @@ class Tk::Tcllib::Tablelist
def __val2ruby_optkeys # { key=>proc, ... }
# The method is used to convert a opt-value to a ruby's object.
# When get the value of the option "key", "proc.call(value)" is called.
- super().update('stretch'=>proc{|v|
- (v == 'all')? v: simplelist(v)
- },
- 'takefocus'=>proc{|v|
- case v
- when '1'
- true
- when '0'
- false
- when ''
- nil
- else # cmd
- tk_tcl2ruby(cmd)
- end
- })
+ super().update('stretch'=>proc{|v| (v == 'all')? v: simplelist(v)})
end
private :__val2ruby_optkeys
@@ -220,20 +194,8 @@ class Tk::Tcllib::Tablelist
# The method is used to convert a ruby's object to a opt-value.
# When set the value of the option "key", "proc.call(value)" is called.
# That is, "-#{key} #{proc.call(value)}".
- super().update('stretch'=>proc{|v|
+ super().update('stretch'=>proc{|v|
(v.kind_of?(Array))? v.collect{|e| _to_idx(e)}: v
- },
- 'takefocus'=>proc{|v|
- case v
- when true
- '1'
- when false
- '0'
- when nil
- ''
- else
- _get_eval_string(v)
- end
})
end
private :__ruby2val_optkeys
@@ -249,15 +211,14 @@ class Tk::Tcllib::Tablelist
if id[0] == 'cell'
super(id) + ['title']
else
- super(id) - ['text'] + ['title', 'name']
+ super(id) - ['text'] + ['title']
end
end
private :__item_strval_optkeys
def __item_boolval_optkeys(id)
super(id) + [
- 'changesnipside', 'editable', 'hide', 'resizable', 'selectable',
- 'showarrow', 'showlinenumbers', 'stretchable', 'stretchwindow', 'wrap'
+ 'editable', 'hide', 'resizable', 'showarrow', 'stretchable',
]
end
private :__item_boolval_optkeys
@@ -288,7 +249,7 @@ class Tk::Tcllib::Tablelist
tk_send('activatecell', _to_idx(index))
self
end
- alias activatecell activate_cell
+ alias activatecell activate_cell
def get_attrib(name=nil)
if name && name != None
@@ -319,29 +280,12 @@ class Tk::Tcllib::Tablelist
TkBindTag.new_by_name(tk_send('bodytag'))
end
- def cancel_editing
+ def cancel_editing
tk_send('cancelediting')
self
end
alias cancelediting cancel_editing
- def get_cellattrib(name=nil)
- if name && name != None
- tk_send('cellattrib', name)
- else
- ret = []
- lst = simplelist(tk_send('cellattrib'))
- until lst.empty?
- ret << ( [lst.shift] << lst.shift )
- end
- ret
- end
- end
- def set_cellattrib(*args)
- tk_send('cellattrib', *(args.flatten))
- self
- end
-
def cellindex(idx)
_from_idx(tk_send('cellindex', _to_idx(idx)))
end
@@ -377,23 +321,6 @@ class Tk::Tcllib::Tablelist
self
end
- def get_columnattrib(name=nil)
- if name && name != None
- tk_send('columnattrib', name)
- else
- ret = []
- lst = simplelist(tk_send('columnattrib'))
- until lst.empty?
- ret << ( [lst.shift] << lst.shift )
- end
- ret
- end
- end
- def set_columnattrib(*args)
- tk_send('columnattrib', *(args.flatten))
- self
- end
-
def columncount
number(tk_send('columncount'))
end
@@ -402,83 +329,6 @@ class Tk::Tcllib::Tablelist
number(tk_send('columnindex', _to_idx(idx)))
end
- def columnwidth(idx, opt=nil)
- if opt
- number(tk_send('columnwidth', _to_idx(idx), "-#{opt}"))
- else
- number(tk_send('columnwidth', _to_idx(idx)))
- end
- end
- def requested_columnwidth(idx)
- columnwidth(idx, 'requested')
- end
- def stretched_columnwidth(idx)
- columnwidth(idx, 'stretched')
- end
- def total_columnwidth(idx)
- columnwidth(idx, 'total')
- end
-
- def configcelllist(lst) # lst ==> [idx, opt, val, idx, opt, val, ...]
- ary = []
- lst.slice(3){|idx, opt, val|
- ary << _to_idx(idx) << "-#{opt}" << val
- }
- tk_send('configcelllist', ary)
- self
- end
- alias config_celllist configcelllist
-
- def configcells(*args) # args ==> idx, opt, val, idx, opt, val, ...
- ary = []
- args.slice(3){|idx, opt, val|
- ary << _to_idx(idx) << "-#{opt}" << val
- }
- tk_send('configcells', *ary)
- self
- end
- alias config_cells configcells
-
- def configcolumnlist(lst) # lst ==> [idx, opt, val, idx, opt, val, ...]
- ary = []
- lst.slice(3){|idx, opt, val|
- ary << _to_idx(idx) << "-#{opt}" << val
- }
- tk_send('configcolumnlist', ary)
- self
- end
- alias config_columnlist configcolumnlist
-
- def configcolumns(*args) # args ==> idx, opt, val, idx, opt, val, ...
- ary = []
- args.slice(3){|idx, opt, val|
- ary << _to_idx(idx) << "-#{opt}" << val
- }
- tk_send('configcolumns', *ary)
- self
- end
- alias config_columns configcolumns
-
- def configrowlist(lst) # lst ==> [idx, opt, val, idx, opt, val, ...]
- ary = []
- lst.slice(3){|idx, opt, val|
- ary << _to_idx(idx) << "-#{opt}" << val
- }
- tk_send('configrowlist', ary)
- self
- end
- alias config_rowlist configrowlist
-
- def configrows(*args) # args ==> idx, opt, val, idx, opt, val, ...
- ary = []
- args.slice(3){|idx, opt, val|
- ary << _to_idx(idx) << "-#{opt}" << val
- }
- tk_send('configrows', *ary)
- self
- end
- alias config_rows configrows
-
def containing(y)
idx = num_or_str(tk_send('containing', y))
(idx.kind_of?(Fixnum) && idx < 0)? nil: idx
@@ -488,7 +338,7 @@ class Tk::Tcllib::Tablelist
idx = _from_idx(tk_send('containingcell', x, y))
if idx.kind_of?(Array)
[
- ((idx[0].kind_of?(Fixnum) && idx[0] < 0)? nil: idx[0]),
+ ((idx[0].kind_of?(Fixnum) && idx[0] < 0)? nil: idx[0]),
((idx[1].kind_of?(Fixnum) && idx[1] < 0)? nil: idx[1])
]
else
@@ -542,10 +392,6 @@ class Tk::Tcllib::Tablelist
end
alias editcell edit_cell
- def editwintag
- TkBindTag.new_by_name(tk_send('editwintag'))
- end
-
def editwinpath
window(tk_send('editwinpath'))
end
@@ -566,11 +412,6 @@ class Tk::Tcllib::Tablelist
end
alias finishediting finish_editing
- def formatinfo
- key, row, col = simplelist(tk_send('formatinfo'))
- [key, number(row), number(col)]
- end
-
def get(first, last=nil)
if first.kind_of?(Array)
simplelist(tk_send('get', first.collect{|idx| _to_idx(idx)})).collect!{|elem| simplelist(elem) }
@@ -614,22 +455,6 @@ class Tk::Tcllib::Tablelist
end
alias getkeys get_keys
- def has_attrib?(name)
- bool(tk_send('hasattrib', name))
- end
-
- def has_cellattrib?(idx, name)
- bool(tk_send('hascellattrib', _to_idx(idx), name))
- end
-
- def has_columnattrib?(idx, name)
- bool(tk_send('hascolumnattrib', _to_idx(idx), name))
- end
-
- def has_rowattrib?(idx, name)
- bool(tk_send('hasrowattrib', _to_idx(idx), name))
- end
-
def imagelabelpath(idx)
window(tk_send('imagelabelpath', _to_idx(idx)))
end
@@ -661,16 +486,6 @@ class Tk::Tcllib::Tablelist
end
alias insertlist insert_list
- def is_elem_snipped?(cellidx, tkvar)
- bool(tk_send('iselemsnipped', _to_idx(cellidx), tkvar))
- end
- alias elem_snipped? is_elem_snipped?
-
- def is_title_snipped?(colidx, tkvar)
- bool(tk_send('istitlesnipped', _to_idx(colidx), tkvar))
- end
- alias title_snipped? is_title_snipped?
-
def itemlistvar
TkVarAccess.new(tk_send('itemlistvar'))
end
@@ -683,10 +498,6 @@ class Tk::Tcllib::Tablelist
simplelist(tk_send('labels'))
end
- def labeltag
- TkBindTag.new_by_name(tk_send('labeltag'))
- end
-
def move(src, target)
tk_send('move', _to_idx(src), _to_idx(target))
self
@@ -724,23 +535,6 @@ class Tk::Tcllib::Tablelist
end
alias resetsortinfo reset_sortinfo
- def get_rowattrib(name=nil)
- if name && name != None
- tk_send('rowattrib', name)
- else
- ret = []
- lst = simplelist(tk_send('rowattrib'))
- until lst.empty?
- ret << ( [lst.shift] << lst.shift )
- end
- ret
- end
- end
- def set_rowattrib(*args)
- tk_send('rowattrib', *(args.flatten))
- self
- end
-
def scan_mark(x, y)
tk_send('scan', 'mark', x, y)
self
@@ -839,22 +633,7 @@ class Tk::Tcllib::Tablelist
self
end
-
- # default of 'labelcommand' option
- DEFAULT_labelcommand_value =
- DEFAULT_sortByColumn_cmd = '::tablelist::sortByColumn'
-
- # default of 'labelcommand2' option
- DEFAULT_labelcommand2_value =
- DEFAULT_addToSortColumns_cmd = '::tablelist::addToSortColumns'
-
- def sortByColumn_with_event_generate(idx)
- tk_call('::tablelist::sortByColumn', @path, _to_idx(idx))
- end
-
- def addToSortColumns_with_event_generate(idx)
- tk_call('::tablelist::addToSortColumns', @path, _to_idx(idx))
- end
+ DEFAULT_sortByColumn_cmd = '::tablelist::sortByColumn'
def sort_by_column(idx, order=nil)
if order
@@ -880,49 +659,15 @@ class Tk::Tcllib::Tablelist
self
end
- def sort_by_columnlist(idxlist, orderlist=None)
- # orderlist :: list of 'increasing' or 'decreasing'
- tk_send('sortbycolumnlist', idxlist.map{|idx| _to_idx(idx)}, orderlist)
- self
- end
-
def sortcolumn
idx = num_or_str(tk_send('sortcolum'))
(idx.kind_of?(Fixnum) && idx < 0)? nil: idx
end
- def sortcolumnlist
- simplelist(tk_send('sortcolumlist')).map{|col| num_or_str(col)}
- end
-
def sortorder
tk_send('sortorder')
end
- def sortorderlist
- simplelist(tk_send('sortorderlist'))
- end
-
- def toggle_columnhide(first, last=nil)
- if first.kind_of?(Array)
- tk_send('togglecolumnhide', first.collect{|idx| _to_idx(idx)})
- else
- first = _to_idx(first)
- last = (last)? _to_idx(last): first
- tk_send('togglecolumnhide', first, last)
- end
- end
-
- def toggle_rowhide(first, last=nil)
- if first.kind_of?(Array)
- tk_send('togglerowhide', first.collect{|idx| _to_idx(idx)})
- else
- first = _to_idx(first)
- last = (last)? _to_idx(last): first
- tk_send('togglerowhide', first, last)
- end
- end
-
def toggle_visibility(first, last=nil)
if first.kind_of?(Array)
tk_send('togglevisibility', first.collect{|idx| _to_idx(idx)})
@@ -935,26 +680,6 @@ class Tk::Tcllib::Tablelist
end
alias togglevisibility toggle_visibility
- def unset_attrib(name)
- tk_send('unsetattrib', name)
- self
- end
-
- def unset_cellattrib(idx, name)
- tk_send('unsetcellattrib', _to_idx(idx), name)
- self
- end
-
- def unset_columnattrib(idx, name)
- tk_send('unsetcolumnattrib', _to_idx(idx), name)
- self
- end
-
- def unset_rowattrib(idx, name)
- tk_send('unsetrowattrib', _to_idx(idx), name)
- self
- end
-
def windowpath(idx)
window(tk_send('windowpath', _to_idx(idx)))
end
@@ -967,18 +692,13 @@ class << Tk::Tcllib::Tablelist
window(Tk.tk_call('::tablelist::getTablelistPath', descendant))
end
- def getTablelistColumn(descendant)
- num_or_str(Tk.tk_call('::tablelist::getTablelistColumn', headerlabel))
- end
-
-
def convEventFields(descendant, x, y)
window(Tk.tk_call('::tablelist::convEventFields', descendant, x, y))
end
############################################################
- # with the BWidget package
+ # with the BWidget package
def addBWidgetEntry(name=None)
Tk.tk_call('::tablelist::addBWidgetEntry', name)
end
@@ -993,7 +713,7 @@ class << Tk::Tcllib::Tablelist
############################################################
- # with the Iwidgets ([incr Widgets]) package
+ # with the Iwidgets ([incr Widgets]) package
def addIncrEntryfield(name=None)
Tk.tk_call('::tablelist::addIncrEntry', name)
end
@@ -1047,16 +767,6 @@ class << Tk::Tcllib::Tablelist
Tk.tk_call('::tablelist::addTimeMentry', format, separator, gmt, name)
end
- def addDateTimeMentry(format, date_sep, time_sep, gmt=false, name=None)
- if gmt && gmt != None
- gmt = '-gmt'
- else
- gmt = None
- end
- Tk.tk_call('::tablelist::addDateTimeMentry',
- format, date_sep, time_sep, gmt, name)
- end
-
def addFixedPointMentry(count1, count2, comma=false, name=None)
if comma && comma != None
comma = '-comma'
diff --git a/ext/tk/lib/tkextlib/tcllib/tablelist_tile.rb b/ext/tk/lib/tkextlib/tcllib/tablelist_tile.rb
index 0a1458415e..0cb4eb735d 100644
--- a/ext/tk/lib/tkextlib/tcllib/tablelist_tile.rb
+++ b/ext/tk/lib/tkextlib/tcllib/tablelist_tile.rb
@@ -9,7 +9,7 @@ require 'tk'
require 'tkextlib/tcllib.rb'
# TkPackage.require('tablelist_tile', '4.2')
-TkPackage.require('tablelist_tile')
+TkPackage.require('Tablelist_tile')
unless defined? Tk::Tcllib::Tablelist_usingTile
Tk::Tcllib::Tablelist_usingTile = true
@@ -19,24 +19,6 @@ requrie 'tkextlib/tcllib/tablelist_core'
module Tk
module Tcllib
- class Tablelist
- # commands related to tile Themems
- def self.set_theme(theme)
- Tk.tk_call('::tablelist::setTheme', theme)
- end
-
- def self.get_current_theme
- Tk.tk_call('::tablelist::getCurrentTheme')
- end
-
- def self.get_theme_list
- TkComm.simplelist(Tk.tk_call('::tablelist::getThemes'))
- end
- def self.set_theme_defaults
- Tk.tk_call('::tablelist::setThemeDefaults')
- end
- end
-
Tablelist_Tile = Tablelist
TableList_Tile = Tablelist
end
diff --git a/ext/tk/lib/tkextlib/tcllib/tkpiechart.rb b/ext/tk/lib/tkextlib/tcllib/tkpiechart.rb
index 2f6e4b44fc..b366e0198b 100644
--- a/ext/tk/lib/tkextlib/tcllib/tkpiechart.rb
+++ b/ext/tk/lib/tkextlib/tcllib/tkpiechart.rb
@@ -52,7 +52,7 @@ module Tk::Tcllib::Tkpiechart
private :__config_cmd
def __configinfo_struct
- {:key=>0, :alias=>nil, :db_name=>nil, :db_class=>nil,
+ {:key=>0, :alias=>nil, :db_name=>nil, :db_class=>nil,
:default_value=>1, :current_value=>2}
end
private :__configinfo_struct
@@ -63,7 +63,7 @@ module Tk::Tcllib::Tkpiechart
private :__boolval_optkeys
def __strval_optkeys
- super() << 'bordercolor' << 'textbackground' <<
+ super() << 'bordercolor' << 'textbackground' <<
'widestvaluetext' << 'title'
end
private :__strval_optkeys
@@ -90,7 +90,7 @@ module Tk::Tcllib::Tkpiechart
def create_self(x, y, width, height, keys=None)
if keys and keys != None
- @tag_key = tk_call_without_enc('::stooop::new', 'pie',
+ @tag_key = tk_call_without_enc('::stooop::new', 'pie',
@c, x, y, *hash_kv(keys, true))
else
@tag_key = tk_call_without_enc('::stooop::new', 'pie', @c, x, y)
@@ -148,7 +148,7 @@ module Tk::Tcllib::Tkpiechart
end
def selected_slices
- tk_split_simplelist(tk_call_without_enc('pie::selectedSlices',
+ tk_split_simplelist(tk_call_without_enc('pie::selectedSlices',
@tag_key)).collect{|slice|
@slice_tbl[slice] || Slice.new(:no_create, self, slice)
}
@@ -212,7 +212,7 @@ module Tk::Tcllib::Tkpiechart
end
def size(share, disp=None)
- tk_call_without_enc('pie::sizeSlice',
+ tk_call_without_enc('pie::sizeSlice',
@pie.tag_key, @tag_key, share, disp)
self
end
@@ -236,7 +236,7 @@ module Tk::Tcllib::Tkpiechart
def create_self(keys=None)
if keys and keys != None
- @tag_key = tk_call_without_enc('::stooop::new', 'pieBoxLabeler',
+ @tag_key = tk_call_without_enc('::stooop::new', 'pieBoxLabeler',
*hash_kv(keys, true))
else
@tag_key = tk_call_without_enc('::stooop::new', 'pieBoxLabeler')
@@ -268,8 +268,8 @@ module Tk::Tcllib::Tkpiechart
def create_self(keys=None)
if keys and keys != None
- @tag_key = tk_call_without_enc('::stooop::new',
- 'piePeripheralLabeler',
+ @tag_key = tk_call_without_enc('::stooop::new',
+ 'piePeripheralLabeler',
*hash_kv(keys, true))
else
@tag_key = tk_call_without_enc('::stooop::new', 'piePeripheralLabeler')
@@ -296,11 +296,11 @@ module Tk::Tcllib::Tkpiechart
def create_self(x, y, keys=None)
if keys and keys != None
- @tag_key = tk_call_without_enc('::stooop::new', 'canvasLabel',
- @c, x, y, width, height,
+ @tag_key = tk_call_without_enc('::stooop::new', 'canvasLabel',
+ @c, x, y, width, height,
*hash_kv(keys, true))
else
- @tag_key = tk_call_without_enc('::stooop::new', 'canvasLabel',
+ @tag_key = tk_call_without_enc('::stooop::new', 'canvasLabel',
@c, x, y, width, height)
end
diff --git a/ext/tk/lib/tkextlib/tcllib/toolbar.rb b/ext/tk/lib/tkextlib/tcllib/toolbar.rb
deleted file mode 100644
index 6eae4eb3e1..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/toolbar.rb
+++ /dev/null
@@ -1,175 +0,0 @@
-#
-# tkextlib/tcllib/toolbar.rb
-# by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-# * Part of tcllib extension
-# * toolbar widget
-#
-
-require 'tk'
-require 'tkextlib/tcllib.rb'
-
-# TkPackage.require('widget::toolbar', '1.2')
-TkPackage.require('widget::toolbar')
-
-module Tk::Tcllib
- module Widget
- class Toolbar < TkWindow
- PACKAGE_NAME = 'widget::toolbar'.freeze
- def self.package_name
- PACKAGE_NAME
- end
-
- def self.package_version
- begin
- TkPackage.require('widget::toolbar')
- rescue
- ''
- end
- end
- end
-
- module ToolbarItemConfig
- include TkItemConfigMethod
- end
- end
-end
-
-
-class Tk::Tcllib::Widget::ToolbarItem < TkObject
- include TkTreatTagFont
-
- ToolbarItemID_TBL = TkCore::INTERP.create_table
-
- TkCore::INTERP.init_ip_env{
- TTagID_TBL.mutex.synchronize{ TTagID_TBL.clear }
- }
-
- def ToolbarItem.id2obj(tbar, id)
- tpath = tbar.path
- ToolbarItemID_TBL.mutex.synchronize{
- if ToolbarItemID_TBL[tpath]
- ToolbarItemID_TBL[tpath][id]? ToolbarItemID_TBL[tpath][id]: id
- else
- id
- end
- }
- end
-
- def initaialize(parent, *args)
- @parent = @t = parent
- @tpath = parent.path
-
- @path = @id = @t.tk_send('add', *args)
- # A same id is rejected by the Tcl function.
-
- ToolbarItemID_TBL.mutex.synchronize{
- ToolbarItemID_TBL[@id] = self
- ToolbarItemID_TBL[@tpath] = {} unless ToolbarItemID_TBL[@tpath]
- ToolbarItemID_TBL[@tpath][@id] = self
- }
- end
-
- def [](key)
- cget key
- end
-
- def []=(key,val)
- configure key, val
- val
- end
-
- def cget_tkstring(option)
- @t.itemcget_tkstring(@id, option)
- end
- def cget(option)
- @t.itemcget(@id, option)
- end
- def cget_strict(option)
- @t.itemcget_strict(@id, option)
- end
-
- def configure(key, value=None)
- @t.itemconfigure(@id, key, value)
- self
- end
-
- def configinfo(key=nil)
- @t.itemconfiginfo(@id, key)
- end
-
- def current_configinfo(key=nil)
- @t.current_itemconfiginfo(@id, key)
- end
-
- def delete
- @t.delete(@id)
- end
-
- def itemid
- @t.itemid(@id)
- end
-
- def remove
- @t.remove(@id)
- end
- def remove_with_destroy
- @t.remove_with_destroy(@id)
- end
-end
-
-class Tk::Tcllib::Widget::Toolbar
- include Tk::Tcllib::Widget::ToolbarItemConfig
-
- TkCommandNames = ['::widget::toolbar'.freeze].freeze
-
- def __destroy_hook__
- Tk::Tcllib::Widget::ToolbarItem::ToolbarItemID_TBL.mutex.synchronize{
- Tk::Tcllib::Widget::ToolbarItem::ToolbarItemID_TBL.delete(@path)
- }
- end
-
- def create_self(keys)
- if keys and keys != None
- tk_call_without_enc(self.class::TkCommandNames[0], @path,
- *hash_kv(keys, true))
- else
- tk_call_without_enc(self.class::TkCommandNames[0], @path)
- end
- end
- private :create_self
-
- def getframe
- window(tk_send('getframe'))
- end
- alias get_frame getframe
-
- def add(*args)
- Tk::Tcllib::Widget::Toolbar.new(self, *args)
- end
-
- def itemid(item)
- window(tk_send('itemid'))
- end
-
- def items(pattern)
- tk_split_simplelist(tk_send('items', pattern)).map{|id|
- Tk::Tcllib::Widget::ToolbarItem.id2obj(self, id)
- }
- end
-
- def remove(*items)
- tk_send('remove', *items)
- self
- end
-
- def remove_with_destroy(*items)
- tk_send('remove', '-destroy', *items)
- self
- end
-
- def delete(*items)
- tk_send('delete', *items)
- self
- end
-end
diff --git a/ext/tk/lib/tkextlib/tcllib/tooltip.rb b/ext/tk/lib/tkextlib/tcllib/tooltip.rb
index 070e63a7b5..4301b39fd3 100644
--- a/ext/tk/lib/tkextlib/tcllib/tooltip.rb
+++ b/ext/tk/lib/tkextlib/tcllib/tooltip.rb
@@ -3,7 +3,7 @@
# by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
#
# * Part of tcllib extension
-# * Provides tooltips, a small text message that is displayed when the
+# * Provides tooltips, a small text message that is displayed when the
# mouse hovers over a widget.
#
@@ -34,8 +34,6 @@ module Tk::Tcllib::Tooltip
extend TkCore
WidgetClassName = 'Tooltip'.freeze
- WidgetClassNames[WidgetClassName] ||= self
-
def self.database_classname
self::WidgetClassName
end
@@ -66,13 +64,6 @@ module Tk::Tcllib::Tooltip
self.delay(millisecs)
end
- def self.fade?
- bool(tk_call_without_enc('::tooltip::tooltip', 'fade'))
- end
- def self.fade(mode)
- tk_call_without_enc('::tooltip::tooltip', 'fade', mode)
- end
-
def self.disable
tk_call_without_enc('::tooltip::tooltip', 'disable')
false
@@ -95,7 +86,7 @@ module Tk::Tcllib::Tooltip
else
args = msg
end
- tk_call('::tooltip::tooltip', widget.path, *args)
+ tk_call_without_enc('::tooltip::tooltip', widget.path, *args)
end
def self.erase(widget)
diff --git a/ext/tk/lib/tkextlib/tcllib/widget.rb b/ext/tk/lib/tkextlib/tcllib/widget.rb
index 57fdf7a575..ed69f67ce6 100644
--- a/ext/tk/lib/tkextlib/tcllib/widget.rb
+++ b/ext/tk/lib/tkextlib/tcllib/widget.rb
@@ -26,41 +26,10 @@ module Tk::Tcllib
''
end
end
-
- #--- followings may be private functions of tklib
- def self.isa(compare_as, *args)
- begin
- return Tk.tk_call('::widget::isa', compare_as, *args)
- rescue => e
- if TkComm.bool(Tk.tk_call('info','command','::widget::isa')) ||
- ! TkComm.bool(Tk.tk_call('info','command','::widget::validate'))
- fail e
- end
- end
- Tk.tk_call('::widget::validate', compare_as, *args)
- end
- def self.validate(compare_as, *args)
- begin
- return Tk.tk_call('::widget::validate', compare_as, *args)
- rescue => e
- if TkComm.bool(Tk.tk_call('info','command','::widget::validate')) ||
- ! TkComm.bool(Tk.tk_call('info','command','::widget::isa'))
- fail e
- end
- end
- Tk.tk_call('::widget::isa', compare_as, *args)
- end
end
end
module Tk::Tcllib::Widget
- TkComm::TkExtlibAutoloadModule.unshift(self)
-
- autoload :Calendar, 'tkextlib/tcllib/calendar'
-
- autoload :Canvas_Sqmap, 'tkextlib/tcllib/canvas_sqmap'
- autoload :Canvas_Zoom, 'tkextlib/tcllib/canvas_zoom'
-
autoload :Dialog, 'tkextlib/tcllib/dialog'
autoload :Panelframe, 'tkextlib/tcllib/panelframe'
@@ -76,7 +45,4 @@ module Tk::Tcllib::Widget
autoload :Superframe, 'tkextlib/tcllib/superframe'
autoload :SuperFrame, 'tkextlib/tcllib/superframe'
-
- autoload :Toolbar, 'tkextlib/tcllib/toolbar'
- autoload :ToolbarItem, 'tkextlib/tcllib/toolbar'
end
diff --git a/ext/tk/lib/tkextlib/tclx/setup.rb b/ext/tk/lib/tkextlib/tclx/setup.rb
index ee406c6ca0..ce0f0bd4d4 100644
--- a/ext/tk/lib/tkextlib/tclx/setup.rb
+++ b/ext/tk/lib/tkextlib/tclx/setup.rb
@@ -2,7 +2,7 @@
# setup.rb -- setup script before calling TkPackage.require()
#
# If you need some setup operations (for example, add a library path
-# to the library search path) before using Tcl/Tk library packages
-# wrapped by Ruby scripts in this directory, please write the setup
+# to the library search path) before using Tcl/Tk library packages
+# wrapped by Ruby scripts in this directory, please write the setup
# operations in this file.
#
diff --git a/ext/tk/lib/tkextlib/tile.rb b/ext/tk/lib/tkextlib/tile.rb
index 6c11e212ae..60ea012cc0 100644
--- a/ext/tk/lib/tkextlib/tile.rb
+++ b/ext/tk/lib/tkextlib/tile.rb
@@ -16,39 +16,12 @@ require 'tkextlib/tile/setup.rb'
# TkPackage.require('tile', '0.4')
# TkPackage.require('tile', '0.6')
# TkPackage.require('tile', '0.7')
-if Tk::TK_MAJOR_VERSION > 8 ||
+if Tk::TK_MAJOR_VERSION > 8 ||
(Tk::TK_MAJOR_VERSION == 8 && Tk::TK_MINOR_VERSION >= 5)
- begin
- TkPackage.require('tile') # for compatibility (version check of 'tile')
- rescue RuntimeError
- # ignore, even if cannot find package 'tile'
- end
- pkgname = 'Ttk'
+ TkPackage.require('tile') # for compatibility (version check of 'tile')
+ verstr = TkPackage.require('Ttk')
else
- pkgname = 'tile'
-end
-
-begin
- verstr = TkPackage.require(pkgname)
-rescue RuntimeError
- # define dummy methods
- module Tk
- module Tile
- CANNOT_FIND_PACKAGE = true
- def self.const_missing(sym)
- TkPackage.require(PACKAGE_NAME)
- end
- def self.method_missing(*args)
- TkPackage.require(PACKAGE_NAME)
- end
- end
- end
- Tk.__cannot_find_tk_package_for_widget_set__(:Ttk, pkgname)
- if pkgname == 'Ttk'
- verstr = Tk::TK_PATCHLEVEL # dummy
- else
- verstr = '0.7' # dummy
- end
+ verstr = TkPackage.require('tile')
end
ver = verstr.split('.')
@@ -132,17 +105,17 @@ module Tk
def self.__define_LoadImages_proc_for_compatibility__!
# Ttk 8.5 (Tile 0.8) lost 'LoadImages' utility procedure.
- # So, some old scripts doen't work, because those scripts use the
- # procedure to define local styles.
- # Of course, rewriting such Tcl/Tk scripts isn't difficult for
- # Tcl/Tk users. However, it may be troublesome for Ruby/Tk users
+ # So, some old scripts doen't work, because those scripts use the
+ # procedure to define local styles.
+ # Of course, rewriting such Tcl/Tk scripts isn't difficult for
+ # Tcl/Tk users. However, it may be troublesome for Ruby/Tk users
# who use such Tcl/Tk scripts as it is.
- # This method may help Ruby/Tk users who don't want to modify old
+ # This method may help Ruby/Tk users who don't want to modify old
# Tcl/Tk scripts for the latest version of Ttk (Tile) extension.
- # This method defines a comaptible 'LoadImages' procedure on the
- # Tcl/Tk interpreter working under Ruby/Tk.
- # Please give attention to use this method. It may conflict with
- # some definitions on Tcl/Tk scripts.
+ # This method defines a comaptible 'LoadImages' procedure on the
+ # Tcl/Tk interpreter working under Ruby/Tk.
+ # Please give attention to use this method. It may conflict with
+ # some definitions on Tcl/Tk scripts.
klass_name = self.name
proc_name = 'LoadImages'
if Tk::Tile::USE_TTK_NAMESPACE
@@ -167,7 +140,7 @@ module Tk
next
end
TkNamespace.eval(ns){
- TkCore::INTERP.add_tk_procs(proc_name, 'imgdir {patterns {*.gif}}',
+ TkCore::INTERP.add_tk_procs(proc_name, 'imgdir {patterns {*.gif}}',
<<-'EOS')
foreach pattern $patterns {
foreach file [glob -directory $imgdir $pattern] {
@@ -193,7 +166,7 @@ module Tk
pat ||= TkComm::None
images = Hash[*TkComm.simplelist(Tk.tk_call(cmd, imgdir, pat))]
images.keys.each{|k|
- images[k] = TkPhotoImage.new(:imagename=>images[k],
+ images[k] = TkPhotoImage.new(:imagename=>images[k],
:without_creating=>true)
}
else ## TILE_SPEC_VERSION_ID >= 8
@@ -208,7 +181,7 @@ module Tk
Dir.glob(pat).each{|f|
img = File.basename(f, '.*')
unless TkComm.bool(Tk.info('exists', "images(#{img})"))
- Tk.tk_call('set', "images(#{img})",
+ Tk.tk_call('set', "images(#{img})",
Tk.tk_call('image', 'create', 'photo', '-file', f))
end
}
@@ -216,7 +189,7 @@ module Tk
}
images = Hash[*TkComm.simplelist(Tk.tk_call('array', 'get', 'images'))]
images.keys.each{|k|
- images[k] = TkPhotoImage.new(:imagename=>images[k],
+ images[k] = TkPhotoImage.new(:imagename=>images[k],
:without_creating=>true)
}
end
@@ -240,8 +213,8 @@ module Tk
begin
TkComm.simplelist(Tk.tk_call_without_enc(*cmd))
rescue
- TkComm.simplelist(Tk.tk_call('lsearch', '-all', '-inline',
- Tk::Tile::Style.theme_names,
+ TkComm.simplelist(Tk.tk_call('lsearch', '-all', '-inline',
+ Tk::Tile::Style.theme_names,
glob_ptn))
end
end
@@ -291,8 +264,8 @@ module Tk
Icon = 'TkIconFont'
TkFont::SYSTEM_FONT_NAMES.add [
- 'TkDefaultFont', 'TkTextFont', 'TkHeadingFont',
- 'TkCaptionFont', 'TkTooltipFont', 'TkFixedFont',
+ 'TkDefaultFont', 'TkTextFont', 'TkHeadingFont',
+ 'TkCaptionFont', 'TkTooltipFont', 'TkFixedFont',
'TkMenuFont', 'TkSmallCaptionFont', 'TkIconFont'
]
end
@@ -307,7 +280,7 @@ module Tk
until lst.empty?
if lst[0][0] == ?-
k = lst.shift[1..-1]
- children = lst.shift
+ children = lst.shift
children = _style_layout(children) if children.kind_of?(Array)
keys[k] = children
else
@@ -359,7 +332,7 @@ module Tk
end
alias tile_identify ttk_identify
- # remove instate/state/identify method
+ # remove instate/state/identify method
# to avoid the conflict with widget options
if Tk.const_defined?(:USE_OBSOLETE_TILE_STATE_METHOD) && Tk::USE_OBSOLETE_TILE_STATE_METHOD
alias instate ttk_instate
@@ -431,9 +404,6 @@ module Tk
autoload :TSeparator, 'tkextlib/tile/tseparator'
autoload :Separator, 'tkextlib/tile/tseparator'
- autoload :TSpinbox, 'tkextlib/tile/tspinbox'
- autoload :Spinbox, 'tkextlib/tile/tspinbox'
-
autoload :TSquare, 'tkextlib/tile/tsquare'
autoload :Square, 'tkextlib/tile/tsquare'
diff --git a/ext/tk/lib/tkextlib/tile/dialog.rb b/ext/tk/lib/tkextlib/tile/dialog.rb
index b112e6152b..ef2d1fe577 100644
--- a/ext/tk/lib/tkextlib/tile/dialog.rb
+++ b/ext/tk/lib/tkextlib/tile/dialog.rb
@@ -12,12 +12,6 @@ module Tk
end
end
-begin
- TkPackage.require('ttk::dialog') # this may be required.
-rescue RuntimeError
- # ignore
-end
-
class Tk::Tile::Dialog
TkCommandNames = ['::ttk::dialog'.freeze].freeze
diff --git a/ext/tk/lib/tkextlib/tile/setup.rb b/ext/tk/lib/tkextlib/tile/setup.rb
index ee406c6ca0..ce0f0bd4d4 100644
--- a/ext/tk/lib/tkextlib/tile/setup.rb
+++ b/ext/tk/lib/tkextlib/tile/setup.rb
@@ -2,7 +2,7 @@
# setup.rb -- setup script before calling TkPackage.require()
#
# If you need some setup operations (for example, add a library path
-# to the library search path) before using Tcl/Tk library packages
-# wrapped by Ruby scripts in this directory, please write the setup
+# to the library search path) before using Tcl/Tk library packages
+# wrapped by Ruby scripts in this directory, please write the setup
# operations in this file.
#
diff --git a/ext/tk/lib/tkextlib/tile/sizegrip.rb b/ext/tk/lib/tkextlib/tile/sizegrip.rb
index d7da0a4075..c5068919a4 100644
--- a/ext/tk/lib/tkextlib/tile/sizegrip.rb
+++ b/ext/tk/lib/tkextlib/tile/sizegrip.rb
@@ -13,20 +13,17 @@ module Tk
end
end
+Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Sizegrip, :TkSizegrip, :TkSizeGrip)
+
+
class Tk::Tile::SizeGrip < TkWindow
include Tk::Tile::TileWidget
TkCommandNames = ['::ttk::sizegrip'.freeze].freeze
WidgetClassName = 'TSizegrip'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def self.style(*args)
[self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
end
end
-
-#Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Sizegrip,
-# :TkSizegrip, :TkSizeGrip)
-Tk.__set_loaded_toplevel_aliases__('tkextlib/tile/sizegrip.rb',
- :Ttk, Tk::Tile::Sizegrip,
- :TkSizegrip, :TkSizeGrip)
diff --git a/ext/tk/lib/tkextlib/tile/style.rb b/ext/tk/lib/tkextlib/tile/style.rb
index f38deda503..ca7ee99c32 100644
--- a/ext/tk/lib/tkextlib/tile/style.rb
+++ b/ext/tk/lib/tkextlib/tile/style.rb
@@ -21,16 +21,16 @@ class << Tk::Tile::Style
TkCommandNames = ['style'.freeze].freeze
# --- Tk::Tile::Style.__define_wrapper_proc_for_compatibility__! ---
- # On Ttk (Tile) extension, 'style' command has imcompatible changes
- # depend on the version of the extention. It requires modifying the
- # Tcl/Tk scripts to define local styles. The rule for modification
- # is a simple one. But, if users want to keep compatibility between
- # versions of the extension, they will have to contrive to do that.
+ # On Ttk (Tile) extension, 'style' command has imcompatible changes
+ # depend on the version of the extention. It requires modifying the
+ # Tcl/Tk scripts to define local styles. The rule for modification
+ # is a simple one. But, if users want to keep compatibility between
+ # versions of the extension, they will have to contrive to do that.
# It may be troublesome, especially for Ruby/Tk users.
- # This method may help such work. This method make some definitions
- # on the Tcl/Tk interpreter to work with different version of style
- # command format. Please give attention to use this method. It may
- # conflict with some definitions on Tcl/Tk scripts.
+ # This method may help such work. This method make some definitions
+ # on the Tcl/Tk interpreter to work with different version of style
+ # command format. Please give attention to use this method. It may
+ # conflict with some definitions on Tcl/Tk scripts.
if Tk::Tile::TILE_SPEC_VERSION_ID < 7
def __define_wrapper_proc_for_compatibility__!
__define_themes_and_setTheme_proc__!
@@ -210,7 +210,7 @@ class << Tk::Tile::Style
end
def lookup(style, opt, state=None, fallback_value=None)
- tk_call(TkCommandNames[0], 'lookup', style,
+ tk_call(TkCommandNames[0], 'lookup', style,
'-' << opt.to_s, state, fallback_value)
end
@@ -233,8 +233,6 @@ class << Tk::Tile::Style
def element_create(name, type, *args)
if type == 'image' || type == :image
element_create_image(name, *args)
- elsif type == 'vsapi' || type == :vsapi
- element_create_vsapi(name, *args)
else
tk_call(TkCommandNames[0], 'element', 'create', name, type, *args)
end
@@ -255,7 +253,7 @@ class << Tk::Tile::Style
# probably, command format is tile 0.8+ (Tcl/Tk8.5+) style
if Tk::Tile::TILE_SPEC_VERSION_ID >= 8
if opts
- tk_call(TkCommandNames[0],
+ tk_call(TkCommandNames[0],
'element', 'create', name, 'image', spec, opts)
else
tk_call(TkCommandNames[0], 'element', 'create', name, 'image', spec)
@@ -264,7 +262,7 @@ class << Tk::Tile::Style
fail ArgumentError, 'illegal arguments' if opts.key?('map')
base = spec.shift
opts['map'] = spec
- tk_call(TkCommandNames[0],
+ tk_call(TkCommandNames[0],
'element', 'create', name, 'image', base, opts)
end
else
@@ -273,7 +271,7 @@ class << Tk::Tile::Style
spec = [spec, *(opts.delete('map'))] if opts.key?('map')
end
if opts
- tk_call(TkCommandNames[0],
+ tk_call(TkCommandNames[0],
'element', 'create', name, 'image', spec, opts)
else
tk_call(TkCommandNames[0], 'element', 'create', name, 'image', spec)
@@ -281,24 +279,6 @@ class << Tk::Tile::Style
end
end
- def element_create_vsapi(name, class_name, part_id, *args)
- # supported on Tcl/Tk 8.6 or later
-
- # argument check
- if (state_map = args.shift || None)
- if state_map.kind_of?(Hash)
- opts = _symbolkey2str(state_map)
- state_map = None
- end
- end
- opts = args.shift || None
- fail ArgumentError, "too many arguments" unless args.empty?
-
- # define a Microsoft Visual Styles element
- tk_call(TkCommandNames[0], 'element', 'create', name, 'vsapi',
- class_name, part_id, state_map, opts)
- end
-
def element_names()
list(tk_call(TkCommandNames[0], 'element', 'names'))
end
diff --git a/ext/tk/lib/tkextlib/tile/tbutton.rb b/ext/tk/lib/tkextlib/tile/tbutton.rb
index c852024842..5d7db10fe9 100644
--- a/ext/tk/lib/tkextlib/tile/tbutton.rb
+++ b/ext/tk/lib/tkextlib/tile/tbutton.rb
@@ -13,6 +13,9 @@ module Tk
end
end
+Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Button, :TkButton)
+
+
class Tk::Tile::TButton < Tk::Button
include Tk::Tile::TileWidget
@@ -22,13 +25,9 @@ class Tk::Tile::TButton < Tk::Button
TkCommandNames = ['::tbutton'.freeze].freeze
end
WidgetClassName = 'TButton'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def self.style(*args)
[self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
end
end
-
-#Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Button, :TkButton)
-Tk.__set_loaded_toplevel_aliases__('tkextlib/tile/tbutton.rb',
- :Ttk, Tk::Tile::Button, :TkButton)
diff --git a/ext/tk/lib/tkextlib/tile/tcheckbutton.rb b/ext/tk/lib/tkextlib/tile/tcheckbutton.rb
index 01751ede0f..172225fcec 100644
--- a/ext/tk/lib/tkextlib/tile/tcheckbutton.rb
+++ b/ext/tk/lib/tkextlib/tile/tcheckbutton.rb
@@ -15,6 +15,10 @@ module Tk
end
end
+Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Checkbutton,
+ :TkCheckbutton, :TkCheckButton)
+
+
class Tk::Tile::TCheckButton < Tk::CheckButton
include Tk::Tile::TileWidget
@@ -24,15 +28,9 @@ class Tk::Tile::TCheckButton < Tk::CheckButton
TkCommandNames = ['::tcheckbutton'.freeze].freeze
end
WidgetClassName = 'TCheckbutton'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def self.style(*args)
[self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
end
end
-
-#Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Checkbutton,
-# :TkCheckbutton, :TkCheckButton)
-Tk.__set_loaded_toplevel_aliases__('tkextlib/tile/tcheckbutton.rb',
- :Ttk, Tk::Tile::Checkbutton,
- :TkCheckbutton, :TkCheckButton)
diff --git a/ext/tk/lib/tkextlib/tile/tcombobox.rb b/ext/tk/lib/tkextlib/tile/tcombobox.rb
index b5ab827e2d..b64372f1c9 100644
--- a/ext/tk/lib/tkextlib/tile/tcombobox.rb
+++ b/ext/tk/lib/tkextlib/tile/tcombobox.rb
@@ -13,6 +13,9 @@ module Tk
end
end
+Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Combobox, :TkCombobox)
+
+
class Tk::Tile::TCombobox < Tk::Tile::TEntry
include Tk::Tile::TileWidget
@@ -22,7 +25,7 @@ class Tk::Tile::TCombobox < Tk::Tile::TEntry
TkCommandNames = ['::tcombobox'.freeze].freeze
end
WidgetClassName = 'TCombobox'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def __boolval_optkeys
super() << 'exportselection'
@@ -49,7 +52,3 @@ class Tk::Tile::TCombobox < Tk::Tile::TEntry
tk_send('set', val)
end
end
-
-#Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Combobox, :TkCombobox)
-Tk.__set_loaded_toplevel_aliases__('tkextlib/tile/tcombobox.rb',
- :Ttk, Tk::Tile::Combobox, :TkCombobox)
diff --git a/ext/tk/lib/tkextlib/tile/tentry.rb b/ext/tk/lib/tkextlib/tile/tentry.rb
index 8d2633a774..0bea98dcd9 100644
--- a/ext/tk/lib/tkextlib/tile/tentry.rb
+++ b/ext/tk/lib/tkextlib/tile/tentry.rb
@@ -13,6 +13,9 @@ module Tk
end
end
+Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Entry, :TkEntry)
+
+
class Tk::Tile::TEntry < Tk::Entry
include Tk::Tile::TileWidget
@@ -22,7 +25,7 @@ class Tk::Tile::TEntry < Tk::Entry
TkCommandNames = ['::tentry'.freeze].freeze
end
WidgetClassName = 'TEntry'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def __optkey_aliases
{:vcmd=>:validatecommand, :invcmd=>:invalidcommand}
@@ -43,7 +46,3 @@ class Tk::Tile::TEntry < Tk::Entry
[self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
end
end
-
-#Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Entry, :TkEntry)
-Tk.__set_loaded_toplevel_aliases__('tkextlib/tile/tentry.rb',
- :Ttk, Tk::Tile::Entry, :TkEntry)
diff --git a/ext/tk/lib/tkextlib/tile/tframe.rb b/ext/tk/lib/tkextlib/tile/tframe.rb
index d6d4312628..3b5f98bb6e 100644
--- a/ext/tk/lib/tkextlib/tile/tframe.rb
+++ b/ext/tk/lib/tkextlib/tile/tframe.rb
@@ -13,6 +13,9 @@ module Tk
end
end
+Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Frame, :TkFrame)
+
+
class Tk::Tile::TFrame < Tk::Frame
include Tk::Tile::TileWidget
@@ -22,13 +25,9 @@ class Tk::Tile::TFrame < Tk::Frame
TkCommandNames = ['::tframe'.freeze].freeze
end
WidgetClassName = 'TFrame'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def self.style(*args)
[self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
end
end
-
-#Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Frame, :TkFrame)
-Tk.__set_loaded_toplevel_aliases__('tkextlib/tile/tframe.rb',
- :Ttk, Tk::Tile::Frame, :TkFrame)
diff --git a/ext/tk/lib/tkextlib/tile/tlabel.rb b/ext/tk/lib/tkextlib/tile/tlabel.rb
index 55b98acc68..7d074d3842 100644
--- a/ext/tk/lib/tkextlib/tile/tlabel.rb
+++ b/ext/tk/lib/tkextlib/tile/tlabel.rb
@@ -13,6 +13,9 @@ module Tk
end
end
+Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Label, :TkLabel)
+
+
class Tk::Tile::TLabel < Tk::Label
include Tk::Tile::TileWidget
@@ -22,13 +25,9 @@ class Tk::Tile::TLabel < Tk::Label
TkCommandNames = ['::tlabel'.freeze].freeze
end
WidgetClassName = 'TLabel'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def self.style(*args)
[self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
end
end
-
-#Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Label, :TkLabel)
-Tk.__set_loaded_toplevel_aliases__('tkextlib/tile/tlabel.rb',
- :Ttk, Tk::Tile::Label, :TkLabel)
diff --git a/ext/tk/lib/tkextlib/tile/tlabelframe.rb b/ext/tk/lib/tkextlib/tile/tlabelframe.rb
index a34c98583f..cff66d8658 100644
--- a/ext/tk/lib/tkextlib/tile/tlabelframe.rb
+++ b/ext/tk/lib/tkextlib/tile/tlabelframe.rb
@@ -15,6 +15,10 @@ module Tk
end
end
+Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Labelframe,
+ :TkLabelframe, :TkLabelFrame)
+
+
class Tk::Tile::TLabelframe < Tk::Tile::TFrame
include Tk::Tile::TileWidget
@@ -24,15 +28,9 @@ class Tk::Tile::TLabelframe < Tk::Tile::TFrame
TkCommandNames = ['::tlabelframe'.freeze].freeze
end
WidgetClassName = 'TLabelframe'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def self.style(*args)
[self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
end
end
-
-#Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Labelframe,
-# :TkLabelframe, :TkLabelFrame)
-Tk.__set_loaded_toplevel_aliases__('tkextlib/tile/tlabelframe.rb',
- :Ttk, Tk::Tile::Labelframe,
- :TkLabelframe, :TkLabelFrame)
diff --git a/ext/tk/lib/tkextlib/tile/tmenubutton.rb b/ext/tk/lib/tkextlib/tile/tmenubutton.rb
index 1cf553ec8c..7c6ab28e52 100644
--- a/ext/tk/lib/tkextlib/tile/tmenubutton.rb
+++ b/ext/tk/lib/tkextlib/tile/tmenubutton.rb
@@ -15,6 +15,10 @@ module Tk
end
end
+Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Menubutton,
+ :TkMenubutton, :TkMenuButton)
+
+
class Tk::Tile::TMenubutton < Tk::Menubutton
include Tk::Tile::TileWidget
@@ -24,15 +28,9 @@ class Tk::Tile::TMenubutton < Tk::Menubutton
TkCommandNames = ['::tmenubutton'.freeze].freeze
end
WidgetClassName = 'TMenubutton'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def self.style(*args)
[self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
end
end
-
-#Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Menubutton,
-# :TkMenubutton, :TkMenuButton)
-Tk.__set_loaded_toplevel_aliases__('tkextlib/tile/tmenubutton.rb',
- :Ttk, Tk::Tile::Menubutton,
- :TkMenubutton, :TkMenuButton)
diff --git a/ext/tk/lib/tkextlib/tile/tnotebook.rb b/ext/tk/lib/tkextlib/tile/tnotebook.rb
index 9e27e2c1fd..4d65e363da 100644
--- a/ext/tk/lib/tkextlib/tile/tnotebook.rb
+++ b/ext/tk/lib/tkextlib/tile/tnotebook.rb
@@ -13,10 +13,13 @@ module Tk
end
end
+Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Notebook, :TkNotebook)
+
+
class Tk::Tile::TNotebook < TkWindow
################################
include TkItemConfigMethod
-
+
def __item_cget_cmd(id)
[self.path, 'tab', id]
end
@@ -43,11 +46,8 @@ class Tk::Tile::TNotebook < TkWindow
alias tabconfiginfo itemconfiginfo
alias current_tabconfiginfo current_itemconfiginfo
- def tabcget_tkstring(tagOrId, option)
- tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{option}")), false, true)[-1]
- end
def tabcget_strict(tagOrId, option)
- tabconfiginfo(tagOrId, option)[-1]
+ tabconfigure(tagOrId, option)[-1]
end
def tabcget(tagOrId, option)
unless TkItemConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
@@ -80,7 +80,7 @@ class Tk::Tile::TNotebook < TkWindow
TkCommandNames = ['::tnotebook'.freeze].freeze
end
WidgetClassName = 'TNotebook'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def self.style(*args)
[self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
@@ -109,11 +109,7 @@ class Tk::Tile::TNotebook < TkWindow
def forget(idx)
tk_send('forget', idx)
self
- end
-
- def hide(idx)
- tk_send('hide', idx)
- end
+ end
def index(idx)
number(tk_send('index', idx))
@@ -141,7 +137,3 @@ class Tk::Tile::TNotebook < TkWindow
list(tk_send('tabs'))
end
end
-
-#Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Notebook, :TkNotebook)
-Tk.__set_loaded_toplevel_aliases__('tkextlib/tile/tnotebook.rb',
- :Ttk, Tk::Tile::Notebook, :TkNotebook)
diff --git a/ext/tk/lib/tkextlib/tile/tpaned.rb b/ext/tk/lib/tkextlib/tile/tpaned.rb
index d6ad234559..d96ff43973 100644
--- a/ext/tk/lib/tkextlib/tile/tpaned.rb
+++ b/ext/tk/lib/tkextlib/tile/tpaned.rb
@@ -13,6 +13,10 @@ module Tk
end
end
+Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Panedwindow,
+ :TkPanedwindow, :TkPanedWindow)
+
+
class Tk::Tile::TPaned < TkWindow
include Tk::Tile::TileWidget
@@ -26,7 +30,7 @@ class Tk::Tile::TPaned < TkWindow
TkCommandNames = ['::tpaned'.freeze].freeze
end
WidgetClassName = 'TPaned'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def self.style(*args)
[self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
@@ -62,12 +66,6 @@ class Tk::Tile::TPaned < TkWindow
self
end
- def panecget_tkstring(pane, slot)
- pane = _epath(pane)
- tk_send_without_enc('pane', pane, "-#{slot}")
- end
- alias pane_cget_tkstring panecget_tkstring
-
def panecget_strict(pane, slot)
pane = _epath(pane)
tk_tcl2ruby(tk_send_without_enc('pane', pane, "-#{slot}"))
@@ -129,7 +127,7 @@ class Tk::Tile::TPaned < TkWindow
end
conf
else
- tk_split_simplelist(tk_send_without_enc('pane',
+ tk_split_simplelist(tk_send_without_enc('pane',
win)).collect{|conflist|
conf = tk_split_simplelist(conflist)
conf[0] = conf[0][1..-1]
@@ -137,18 +135,18 @@ class Tk::Tile::TPaned < TkWindow
if conf[0] == 'hide'
conf[3] = bool(conf[3]) unless conf[3].empty?
elsif conf[3].index('{')
- conf[3] = tk_split_list(conf[3])
+ conf[3] = tk_split_list(conf[3])
else
- conf[3] = tk_tcl2ruby(conf[3])
+ conf[3] = tk_tcl2ruby(conf[3])
end
end
if conf[4]
if conf[0] == 'hide'
conf[4] = bool(conf[4]) unless conf[4].empty?
elsif conf[4].index('{')
- conf[4] = tk_split_list(conf[4])
+ conf[4] = tk_split_list(conf[4])
else
- conf[4] = tk_tcl2ruby(conf[4])
+ conf[4] = tk_tcl2ruby(conf[4])
end
end
conf[1] = conf[1][1..-1] if conf.size == 2 # alias info
@@ -167,7 +165,7 @@ class Tk::Tile::TPaned < TkWindow
{ key => conf }
else
ret = {}
- tk_split_simplelist(tk_send_without_enc('pane',
+ tk_split_simplelist(tk_send_without_enc('pane',
win)).each{|conflist|
conf = tk_split_simplelist(conflist)
key = conf.shift[1..-1]
@@ -175,18 +173,18 @@ class Tk::Tile::TPaned < TkWindow
if key == 'hide'
conf[2] = bool(conf[2]) unless conf[2].empty?
elsif conf[2].index('{')
- conf[2] = tk_split_list(conf[2])
+ conf[2] = tk_split_list(conf[2])
else
- conf[2] = tk_tcl2ruby(conf[2])
+ conf[2] = tk_tcl2ruby(conf[2])
end
end
if conf[3]
if key == 'hide'
conf[3] = bool(conf[3]) unless conf[3].empty?
elsif conf[3].index('{')
- conf[3] = tk_split_list(conf[3])
+ conf[3] = tk_split_list(conf[3])
else
- conf[3] = tk_tcl2ruby(conf[3])
+ conf[3] = tk_tcl2ruby(conf[3])
end
end
if conf.size == 1
@@ -223,23 +221,11 @@ class Tk::Tile::TPaned < TkWindow
end
alias current_pane_configinfo current_paneconfiginfo
- def panes
- tk_split_simplelist(tk_send_without_enc('panes')).map{|w|
- (obj = window(w))? obj: w
- }
- end
-
def identify(x, y)
- num_or_nil(tk_send_without_enc('identify', x, y))
+ list(tk_send_without_enc('identify', x, y))
end
def sashpos(idx, newpos=None)
num_or_str(tk_send_without_enc('sashpos', idx, newpos))
end
end
-
-#Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Panedwindow,
-# :TkPanedwindow, :TkPanedWindow)
-Tk.__set_loaded_toplevel_aliases__('tkextlib/tile/tpaned.rb',
- :Ttk, Tk::Tile::Panedwindow,
- :TkPanedwindow, :TkPanedWindow)
diff --git a/ext/tk/lib/tkextlib/tile/tprogressbar.rb b/ext/tk/lib/tkextlib/tile/tprogressbar.rb
index 0c9d15e1b9..f786d370dd 100644
--- a/ext/tk/lib/tkextlib/tile/tprogressbar.rb
+++ b/ext/tk/lib/tkextlib/tile/tprogressbar.rb
@@ -13,6 +13,9 @@ module Tk
end
end
+Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Progressbar, :TkProgressbar)
+
+
class Tk::Tile::TProgressbar
include Tk::Tile::TileWidget
@@ -22,7 +25,7 @@ class Tk::Tile::TProgressbar
TkCommandNames = ['::tprogressbar'.freeze].freeze
end
WidgetClassName = 'TProgressbar'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def self.style(*args)
[self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
@@ -51,7 +54,3 @@ class Tk::Tile::TProgressbar
end
end
end
-
-#Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Progressbar, :TkProgressbar)
-Tk.__set_loaded_toplevel_aliases__('tkextlib/tile/tprogressbar.rb',
- :Ttk, Tk::Tile::Progressbar, :TkProgressbar)
diff --git a/ext/tk/lib/tkextlib/tile/tradiobutton.rb b/ext/tk/lib/tkextlib/tile/tradiobutton.rb
index 5dbf260666..d653a6d256 100644
--- a/ext/tk/lib/tkextlib/tile/tradiobutton.rb
+++ b/ext/tk/lib/tkextlib/tile/tradiobutton.rb
@@ -15,6 +15,10 @@ module Tk
end
end
+Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Radiobutton,
+ :TkRadiobutton, :TkRadioButton)
+
+
class Tk::Tile::TRadioButton < Tk::RadioButton
include Tk::Tile::TileWidget
@@ -24,15 +28,9 @@ class Tk::Tile::TRadioButton < Tk::RadioButton
TkCommandNames = ['::tradiobutton'.freeze].freeze
end
WidgetClassName = 'TRadiobutton'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def self.style(*args)
[self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
end
end
-
-#Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Radiobutton,
-# :TkRadiobutton, :TkRadioButton)
-Tk.__set_loaded_toplevel_aliases__('tkextlib/tile/tradiobutton.rb',
- :Ttk, Tk::Tile::Radiobutton,
- :TkRadiobutton, :TkRadioButton)
diff --git a/ext/tk/lib/tkextlib/tile/treeview.rb b/ext/tk/lib/tkextlib/tile/treeview.rb
index 70db3d6d78..c978a1a07b 100644
--- a/ext/tk/lib/tkextlib/tile/treeview.rb
+++ b/ext/tk/lib/tkextlib/tile/treeview.rb
@@ -12,12 +12,15 @@ module Tk
end
end
+Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Treeview, :TkTreeview)
+
+
module Tk::Tile::TreeviewConfig
include TkItemConfigMethod
def __item_configinfo_struct(id)
# maybe need to override
- {:key=>0, :alias=>nil, :db_name=>nil, :db_class=>nil,
+ {:key=>0, :alias=>nil, :db_name=>nil, :db_class=>nil,
:default_value=>nil, :current_value=>1}
end
private :__item_configinfo_struct
@@ -376,12 +379,12 @@ module Tk::Tile::TreeviewConfig
###################
def __item_cget_cmd(id)
- [self.path, *id]
+ [self.path, id[0], id[1]]
end
private :__item_cget_cmd
def __item_config_cmd(id)
- [self.path, *id]
+ [self.path, id[0], id[1]]
end
private :__item_config_cmd
@@ -448,7 +451,7 @@ module Tk::Tile::TreeviewConfig
def __item_val2ruby_optkeys(id)
case id[0]
when :item, 'item'
- {
+ {
'tags'=>proc{|arg_id, val|
simplelist(val).collect{|tag|
Tk::Tile::Treeview::Tag.id2obj(self, tag)
@@ -495,7 +498,7 @@ module Tk::Tile::TreeviewConfig
end
slot = conf[__item_configinfo_struct(tagid(tagOrId))[:alias]]
end while(org_slot != slot)
- fail RuntimeError,
+ fail RuntimeError,
"there is a configure alias loop about '#{org_slot}'"
else
ret = {}
@@ -516,20 +519,16 @@ module Tk::Tile::TreeviewConfig
end
end
- alias __itemcget_tkstring itemcget_tkstring
alias __itemcget itemcget
alias __itemcget_strict itemcget_strict
alias __itemconfigure itemconfigure
alias __itemconfiginfo itemconfiginfo
alias __current_itemconfiginfo current_itemconfiginfo
- private :__itemcget_tkstring, :__itemcget, :__itemcget_strict
+ private :__itemcget, :__itemcget_strict
private :__itemconfigure, :__itemconfiginfo, :__current_itemconfiginfo
# Treeview Item
- def itemcget_tkstring(tagOrId, option)
- __itemcget_tkstring([:item, tagOrId], option)
- end
def itemcget(tagOrId, option)
__itemcget([:item, tagOrId], option)
end
@@ -547,9 +546,6 @@ module Tk::Tile::TreeviewConfig
end
# Treeview Column
- def columncget_tkstring(tagOrId, option)
- __itemcget_tkstring([:column, tagOrId], option)
- end
def columncget(tagOrId, option)
__itemcget([:column, tagOrId], option)
end
@@ -565,7 +561,6 @@ module Tk::Tile::TreeviewConfig
def current_columnconfiginfo(tagOrId, slot=nil)
__current_itemconfiginfo([:column, tagOrId], slot)
end
- alias column_cget_tkstring columncget_tkstring
alias column_cget columncget
alias column_cget_strict columncget_strict
alias column_configure columnconfigure
@@ -573,19 +568,6 @@ module Tk::Tile::TreeviewConfig
alias current_column_configinfo current_columnconfiginfo
# Treeview Heading
- def headingcget_tkstring(tagOrId, option)
- if __tile_specific_item_optkeys([:heading, tagOrId]).index(option.to_s)
- begin
- # On tile-0.7.{2-8}, 'state' options has no '-' at its head.
- tk_call(*(__item_cget_cmd([:heading, tagOrId]) << option.to_s))
- rescue
- # Maybe, 'state' option has '-' in future.
- tk_call(*(__item_cget_cmd([:heading, tagOrId]) << "-#{option}"))
- end
- else
- __itemcget_tkstring([:heading, tagOrId], option)
- end
- end
def headingcget_strict(tagOrId, option)
if __tile_specific_item_optkeys([:heading, tagOrId]).index(option.to_s)
begin
@@ -648,7 +630,6 @@ module Tk::Tile::TreeviewConfig
def current_headingconfiginfo(tagOrId, slot=nil)
__current_itemconfiginfo([:heading, tagOrId], slot)
end
- alias heading_cget_tkstring headingcget_tkstring
alias heading_cget headingcget
alias heading_cget_strict headingcget_strict
alias heading_configure headingconfigure
@@ -656,25 +637,21 @@ module Tk::Tile::TreeviewConfig
alias current_heading_configinfo current_headingconfiginfo
# Treeview Tag
- def tagcget_tkstring(tagOrId, option)
- __itemcget_tkstring([:tag, :configure, tagOrId], option)
- end
def tagcget(tagOrId, option)
- __itemcget([:tag, :configure, tagOrId], option)
+ __itemcget([:tag, tagOrId], option)
end
def tagcget_strict(tagOrId, option)
- __itemcget_strict([:tag, :configure, tagOrId], option)
+ __itemcget_strict([:tag, tagOrId], option)
end
def tagconfigure(tagOrId, slot, value=None)
- __itemconfigure([:tag, :configure, tagOrId], slot, value)
+ __itemconfigure([:tag, tagOrId], slot, value)
end
def tagconfiginfo(tagOrId, slot=nil)
- __itemconfiginfo([:tag, :configure, tagOrId], slot)
+ __itemconfiginfo([:tag, tagOrId], slot)
end
def current_tagconfiginfo(tagOrId, slot=nil)
- __current_itemconfiginfo([:tag, :configure, tagOrId], slot)
+ __current_itemconfiginfo([:tag, tagOrId], slot)
end
- alias tag_cget_tkstring tagcget_tkstring
alias tag_cget tagcget
alias tag_cget_strict tagcget_strict
alias tag_configure tagconfigure
@@ -730,7 +707,7 @@ class Tk::Tile::Treeview::Item < TkObject
keys = _symbolkey2str(keys)
id = keys.delete('id')
if id
- num_or_str(tk_call(tree, 'insert',
+ num_or_str(tk_call(tree, 'insert',
parent_item, idx, '-id', id, *hash_kv(keys)))
else
num_or_str(tk_call(tree, 'insert', parent_item, idx, *hash_kv(keys)))
@@ -760,9 +737,6 @@ class Tk::Tile::Treeview::Item < TkObject
@id
end
- def cget_tkstring(option)
- @t.itemcget_tkstring(@id, option)
- end
def cget(option)
@t.itemcget(@id, option)
end
@@ -795,11 +769,6 @@ class Tk::Tile::Treeview::Item < TkObject
self
end
- def tag_has?(tag)
- @t.tag_has?(tag, @id)
- end
- alias has_tag? tag_has?
-
def bbox(column=None)
@t.bbox(@id, column)
end
@@ -938,7 +907,7 @@ class Tk::Tile::Treeview::Tag < TkObject
TagID_TBL = TkCore::INTERP.create_table
- (Tag_ID = ['tile_treeview_tag'.freeze, TkUtil.untrust('00000')]).instance_eval{
+ (Tag_ID = ['tile_treeview_tag'.freeze, '00000'.taint]).instance_eval{
@mutex = Mutex.new
def mutex; @mutex; end
freeze
@@ -974,18 +943,13 @@ class Tk::Tile::Treeview::Tag < TkObject
TagID_TBL[@tpath][@id] = self
}
if keys && keys != None
- tk_call_without_enc(@tpath, 'tag', 'configure', @id, *hash_kv(keys,true))
+ tk_call_without_enc(@tpath, 'tag', 'configure', *hash_kv(keys, true))
end
end
def id
@id
end
- def tag_has?(item)
- @t.tag_has?(@id, item)
- end
- alias added? tag_has?
-
def bind(seq, *args)
if TkComm._callback_entry?(args[0]) || !block_given?
cmd = args.shift
@@ -1015,9 +979,6 @@ class Tk::Tile::Treeview::Tag < TkObject
@t.tag_bindinfo(@id, seq)
end
- def cget_tkstring(option)
- @t.tagcget_tkstring(@id, option)
- end
def cget(option)
@t.tagcget(@id, option)
end
@@ -1053,7 +1014,7 @@ class Tk::Tile::Treeview < TkWindow
TkCommandNames = ['::treeview'.freeze].freeze
end
WidgetClassName = 'Treeview'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def __destroy_hook__
Tk::Tile::Treeview::Item::ItemID_TBL.mutex.synchronize{
@@ -1069,12 +1030,11 @@ class Tk::Tile::Treeview < TkWindow
end
def tagid(id)
- if id.kind_of?(Tk::Tile::Treeview::Item) ||
+ if id.kind_of?(Tk::Tile::Treeview::Item) ||
id.kind_of?(Tk::Tile::Treeview::Tag)
id.id
elsif id.kind_of?(Array)
- # size is 2 or 3
- id[0..-2] << _get_eval_string(id[-1])
+ [id[0], _get_eval_string(id[1])]
else
_get_eval_string(id)
end
@@ -1094,7 +1054,7 @@ class Tk::Tile::Treeview < TkWindow
}
end
def set_children(item, *items)
- tk_send_without_enc('children', item,
+ tk_send_without_enc('children', item,
array2tk_list(items.flatten, true))
self
end
@@ -1137,29 +1097,14 @@ class Tk::Tile::Treeview < TkWindow
end
end
- def identify_region(x, y)
- tk_send('identify', 'region', x, y)
- end
-
- def identify_item(x, y)
- id = tk_send('identify', 'item', x, y)
- (id.empty?)? nil: Tk::Tile::Treeview::Item.id2obj(self, id)
- end
-
- def identify_element(x, y)
- tk_send('identify', 'element', x, y)
- end
-
def row_identify(x, y)
id = tk_send('identify', 'row', x, y)
(id.empty?)? nil: Tk::Tile::Treeview::Item.id2obj(self, id)
end
- alias identify_row row_identify
def column_identify(x, y)
tk_send('identify', 'column', x, y)
end
- alias identify_column column_identify
def index(item)
number(tk_send('index', item))
@@ -1258,15 +1203,6 @@ class Tk::Tile::Treeview < TkWindow
self
end
- def tag_has?(tag, item)
- bool(tk_send('tag', 'has', tagid(tag), tagid(item)))
- end
- def tag_has(tag)
- tk_split_simplelist(tk_send('tag', 'has', tagid(tag))).collect{|id|
- Tk::Tile::Treeview::Item.id2obj(self, id)
- }
- end
-
def tag_bind(tag, seq, *args)
if TkComm._callback_entry?(args[0]) || !block_given?
cmd = args.shift
@@ -1300,7 +1236,3 @@ class Tk::Tile::Treeview < TkWindow
end
alias tagbindinfo tag_bindinfo
end
-
-#Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Treeview, :TkTreeview)
-Tk.__set_loaded_toplevel_aliases__('tkextlib/tile/treeview.rb',
- :Ttk, Tk::Tile::Treeview, :TkTreeview)
diff --git a/ext/tk/lib/tkextlib/tile/tscale.rb b/ext/tk/lib/tkextlib/tile/tscale.rb
index 7eefcef731..2c46fd9bd4 100644
--- a/ext/tk/lib/tkextlib/tile/tscale.rb
+++ b/ext/tk/lib/tkextlib/tile/tscale.rb
@@ -17,6 +17,9 @@ module Tk
end
end
+Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Scale, :TkScale)
+
+
class Tk::Tile::TScale < Tk::Scale
include Tk::Tile::TileWidget
@@ -26,13 +29,11 @@ class Tk::Tile::TScale < Tk::Scale
TkCommandNames = ['::tscale'.freeze].freeze
end
WidgetClassName = 'TScale'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def self.style(*args)
[self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
end
-
- alias identify ttk_identify
end
class Tk::Tile::TProgress < Tk::Tile::TScale
@@ -44,13 +45,9 @@ class Tk::Tile::TProgress < Tk::Tile::TScale
TkCommandNames = ['::tprogress'.freeze].freeze
end
WidgetClassName = 'TProgress'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def self.style(*args)
[self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
end
end
-
-#Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Scale, :TkScale)
-Tk.__set_loaded_toplevel_aliases__('tkextlib/tile/tscale.rb',
- :Ttk, Tk::Tile::Scale, :TkScale)
diff --git a/ext/tk/lib/tkextlib/tile/tscrollbar.rb b/ext/tk/lib/tkextlib/tile/tscrollbar.rb
index c6bba5810b..163b8f4713 100644
--- a/ext/tk/lib/tkextlib/tile/tscrollbar.rb
+++ b/ext/tk/lib/tkextlib/tile/tscrollbar.rb
@@ -13,6 +13,9 @@ module Tk
end
end
+Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Scrollbar, :TkScrollbar)
+
+
class Tk::Tile::TScrollbar < Tk::Scrollbar
include Tk::Tile::TileWidget
@@ -22,21 +25,13 @@ class Tk::Tile::TScrollbar < Tk::Scrollbar
TkCommandNames = ['::tscrollbar'.freeze].freeze
end
WidgetClassName = 'TScrollbar'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def self.style(*args)
[self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
end
-
- alias identify ttk_identify
end
-#Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Scrollbar, :TkScrollbar)
-Tk.__set_loaded_toplevel_aliases__('tkextlib/tile/tscrollbar.rb',
- :Ttk, Tk::Tile::Scrollbar, :TkScrollbar)
-
-#######################################################################
-
class Tk::Tile::XScrollbar < Tk::Tile::TScrollbar
def create_self(keys)
keys = {} unless keys
@@ -55,9 +50,5 @@ class Tk::Tile::YScrollbar < Tk::Tile::TScrollbar
private :create_self
end
-#Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::XScrollbar, :TkXScrollbar)
-#Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::YScrollbar, :TkYScrollbar)
-Tk.__set_loaded_toplevel_aliases__('tkextlib/tile/tscrollbar.rb',
- :Ttk, Tk::Tile::XScrollbar, :TkXScrollbar)
-Tk.__set_loaded_toplevel_aliases__('tkextlib/tile/tscrollbar.rb',
- :Ttk, Tk::Tile::YScrollbar, :TkYScrollbar)
+Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::XScrollbar, :TkXScrollbar)
+Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::YScrollbar, :TkYScrollbar)
diff --git a/ext/tk/lib/tkextlib/tile/tseparator.rb b/ext/tk/lib/tkextlib/tile/tseparator.rb
index ffd2f6f89f..30fae2c525 100644
--- a/ext/tk/lib/tkextlib/tile/tseparator.rb
+++ b/ext/tk/lib/tkextlib/tile/tseparator.rb
@@ -13,6 +13,9 @@ module Tk
end
end
+Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Separator, :TkSeparator)
+
+
class Tk::Tile::TSeparator < TkWindow
include Tk::Tile::TileWidget
@@ -22,13 +25,9 @@ class Tk::Tile::TSeparator < TkWindow
TkCommandNames = ['::tseparator'.freeze].freeze
end
WidgetClassName = 'TSeparator'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def self.style(*args)
[self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
end
end
-
-#Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Separator, :TkSeparator)
-Tk.__set_loaded_toplevel_aliases__('tkextlib/tile/tseparator.rb',
- :Ttk, Tk::Tile::Separator, :TkSeparator)
diff --git a/ext/tk/lib/tkextlib/tile/tspinbox.rb b/ext/tk/lib/tkextlib/tile/tspinbox.rb
deleted file mode 100644
index 2f2d73c5ab..0000000000
--- a/ext/tk/lib/tkextlib/tile/tspinbox.rb
+++ /dev/null
@@ -1,107 +0,0 @@
-#
-# ttk::spinbox widget (Tcl/Tk 8.6b1 or later)
-# by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-require 'tkextlib/tile.rb'
-
-module Tk
- module Tile
- class TSpinbox < Tk::Tile::TEntry
- end
- Spinbox = TSpinbox
- end
-end
-
-class Tk::Tile::TSpinbox < Tk::Tile::TEntry
- include Tk::Tile::TileWidget
-
- if Tk::Tile::USE_TTK_NAMESPACE
- TkCommandNames = ['::ttk::spinbox'.freeze].freeze
- else
- TkCommandNames = ['::tspinbox'.freeze].freeze
- end
- WidgetClassName = 'TSpinbox'.freeze
- WidgetClassNames[WidgetClassName] ||= self
-
- class SpinCommand < TkValidateCommand
- class ValidateArgs < TkUtil::CallbackSubst
- KEY_TBL = [
- [ ?d, ?s, :direction ],
- [ ?s, ?e, :current ],
- [ ?W, ?w, :widget ],
- nil
- ]
-
- PROC_TBL = [
- [ ?s, TkComm.method(:string) ],
- [ ?w, TkComm.method(:window) ],
-
- [ ?e, proc{|val|
- #enc = Tk.encoding
- enc = ((Tk.encoding)? Tk.encoding : Tk.encoding_system)
- if enc
- Tk.fromUTF8(TkComm::string(val), enc)
- else
- TkComm::string(val)
- end
- }
- ],
-
- nil
- ]
-
- _setup_subst_table(KEY_TBL, PROC_TBL);
-
- def self.ret_val(val)
- (val)? '1': '0'
- end
- end
-
- def self._config_keys
- ['command']
- end
- end
-
- def __validation_class_list
- super() << SpinCommand
- end
-
- Tk::ValidateConfigure.__def_validcmd(binding, SpinCommand)
-
- def __boolval_optkeys
- super() << 'wrap'
- end
- private :__boolval_optkeys
-
- def __strval_optkeys
- super() << 'buttonbackground' << 'format'
- end
- private :__strval_optkeys
-
- def __listval_optkeys
- super() << 'values'
- end
- private :__listval_optkeys
-
- def self.style(*args)
- [self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
- end
-
- def current
- number(tk_send_without_enc('current'))
- end
- def current=(idx)
- tk_send('current', idx)
- end
-
- def set(val)
- tk_send('set', val)
- end
-
- alias identify ttk_identify
-end
-
-#Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Spinbox, :TkSpinbox)
-Tk.__set_loaded_toplevel_aliases__('tkextlib/tile/tspinbox.rb',
- :Ttk, Tk::Tile::Spinbox, :TkSpinbox)
diff --git a/ext/tk/lib/tkextlib/tile/tsquare.rb b/ext/tk/lib/tkextlib/tile/tsquare.rb
index a81cd7b98a..600b55e4e7 100644
--- a/ext/tk/lib/tkextlib/tile/tsquare.rb
+++ b/ext/tk/lib/tkextlib/tile/tsquare.rb
@@ -22,7 +22,7 @@ class Tk::Tile::TSquare < TkWindow
TkCommandNames = ['::tsquare'.freeze].freeze
end
WidgetClassName = 'TSquare'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def self.style(*args)
[self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
diff --git a/ext/tk/lib/tkextlib/tkDND/setup.rb b/ext/tk/lib/tkextlib/tkDND/setup.rb
index ee406c6ca0..ce0f0bd4d4 100644
--- a/ext/tk/lib/tkextlib/tkDND/setup.rb
+++ b/ext/tk/lib/tkextlib/tkDND/setup.rb
@@ -2,7 +2,7 @@
# setup.rb -- setup script before calling TkPackage.require()
#
# If you need some setup operations (for example, add a library path
-# to the library search path) before using Tcl/Tk library packages
-# wrapped by Ruby scripts in this directory, please write the setup
+# to the library search path) before using Tcl/Tk library packages
+# wrapped by Ruby scripts in this directory, please write the setup
# operations in this file.
#
diff --git a/ext/tk/lib/tkextlib/tkDND/tkdnd.rb b/ext/tk/lib/tkextlib/tkDND/tkdnd.rb
index 97cdfc7f1c..9a9b2dc42c 100644
--- a/ext/tk/lib/tkextlib/tkDND/tkdnd.rb
+++ b/ext/tk/lib/tkextlib/tkDND/tkdnd.rb
@@ -30,30 +30,30 @@ module Tk
class DND_Subst < TkUtil::CallbackSubst
KEY_TBL = [
- [ ?a, ?l, :actions ],
- [ ?A, ?s, :action ],
- [ ?b, ?L, :codes ],
- [ ?c, ?s, :code ],
- [ ?d, ?l, :descriptions ],
- [ ?D, ?l, :data ],
- [ ?L, ?l, :source_types ],
- [ ?m, ?l, :modifiers ],
- [ ?t, ?l, :types ],
- [ ?T, ?s, :type ],
- [ ?W, ?w, :widget ],
- [ ?x, ?n, :x ],
- [ ?X, ?n, :x_root ],
- [ ?y, ?n, :y ],
- [ ?Y, ?n, :y_root ],
+ [ ?a, ?l, :actions ],
+ [ ?A, ?s, :action ],
+ [ ?b, ?L, :codes ],
+ [ ?c, ?s, :code ],
+ [ ?d, ?l, :descriptions ],
+ [ ?D, ?l, :data ],
+ [ ?L, ?l, :source_types ],
+ [ ?m, ?l, :modifiers ],
+ [ ?t, ?l, :types ],
+ [ ?T, ?s, :type ],
+ [ ?W, ?w, :widget ],
+ [ ?x, ?n, :x ],
+ [ ?X, ?n, :x_root ],
+ [ ?y, ?n, :y ],
+ [ ?Y, ?n, :y_root ],
nil
]
PROC_TBL = [
- [ ?n, TkComm.method(:num_or_str) ],
- [ ?s, TkComm.method(:string) ],
- [ ?l, TkComm.method(:list) ],
- [ ?L, TkComm.method(:simplelist) ],
- [ ?w, TkComm.method(:window) ],
+ [ ?n, TkComm.method(:num_or_str) ],
+ [ ?s, TkComm.method(:string) ],
+ [ ?l, TkComm.method(:list) ],
+ [ ?L, TkComm.method(:simplelist) ],
+ [ ?w, TkComm.method(:window) ],
nil
]
@@ -101,11 +101,11 @@ module Tk
#def dnd_bindtarget(type, event, cmd=Proc.new, prior=50, *args)
# event = tk_event_sequence(event)
# if prior.kind_of?(Numeric)
- # tk_call('dnd', 'bindtarget', @path, type, event,
- # install_bind_for_event_class(DND_Subst, cmd, *args),
+ # tk_call('dnd', 'bindtarget', @path, type, event,
+ # install_bind_for_event_class(DND_Subst, cmd, *args),
# prior)
# else
- # tk_call('dnd', 'bindtarget', @path, type, event,
+ # tk_call('dnd', 'bindtarget', @path, type, event,
# install_bind_for_event_class(DND_Subst, cmd, prior, *args))
# end
# self
@@ -123,11 +123,11 @@ module Tk
event = tk_event_sequence(event)
if prior.kind_of?(Numeric)
- tk_call('dnd', 'bindtarget', @path, type, event,
- install_bind_for_event_class(DND_Subst, cmd, *args),
+ tk_call('dnd', 'bindtarget', @path, type, event,
+ install_bind_for_event_class(DND_Subst, cmd, *args),
prior)
else
- tk_call('dnd', 'bindtarget', @path, type, event,
+ tk_call('dnd', 'bindtarget', @path, type, event,
install_bind_for_event_class(DND_Subst, cmd, prior, *args))
end
self
diff --git a/ext/tk/lib/tkextlib/tkHTML/htmlwidget.rb b/ext/tk/lib/tkextlib/tkHTML/htmlwidget.rb
index b9ee90aace..d893a83cf2 100644
--- a/ext/tk/lib/tkextlib/tkHTML/htmlwidget.rb
+++ b/ext/tk/lib/tkextlib/tkHTML/htmlwidget.rb
@@ -36,7 +36,7 @@ end
class Tk::HTML_Widget::ClippingWindow
WidgetClassName = 'HtmlClip'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
HtmlClip_TBL = TkCore::INTERP.create_table
@@ -73,7 +73,7 @@ class Tk::HTML_Widget::ClippingWindow
ppath = ppath2
end
-
+
parent = TkComm._genobj_for_tkwidget(ppath)
unless parent.kind_of?(Tk::HTML_Widget)
fail ArgumentError, "parent must be a Tk::HTML_Widget instance"
@@ -101,11 +101,11 @@ class Tk::HTML_Widget
TkCommandNames = ['html'.freeze].freeze
WidgetClassName = 'Html'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def create_self(keys)
if keys and keys != None
- tk_call_without_enc(self.class::TkCommandNames[0], @path,
+ tk_call_without_enc(self.class::TkCommandNames[0], @path,
*hash_kv(keys, true))
else
tk_call_without_enc(self.class::TkCommandNames[0], @path)
diff --git a/ext/tk/lib/tkextlib/tkHTML/setup.rb b/ext/tk/lib/tkextlib/tkHTML/setup.rb
index ee406c6ca0..ce0f0bd4d4 100644
--- a/ext/tk/lib/tkextlib/tkHTML/setup.rb
+++ b/ext/tk/lib/tkextlib/tkHTML/setup.rb
@@ -2,7 +2,7 @@
# setup.rb -- setup script before calling TkPackage.require()
#
# If you need some setup operations (for example, add a library path
-# to the library search path) before using Tcl/Tk library packages
-# wrapped by Ruby scripts in this directory, please write the setup
+# to the library search path) before using Tcl/Tk library packages
+# wrapped by Ruby scripts in this directory, please write the setup
# operations in this file.
#
diff --git a/ext/tk/lib/tkextlib/tkimg/setup.rb b/ext/tk/lib/tkextlib/tkimg/setup.rb
index ee406c6ca0..ce0f0bd4d4 100644
--- a/ext/tk/lib/tkextlib/tkimg/setup.rb
+++ b/ext/tk/lib/tkextlib/tkimg/setup.rb
@@ -2,7 +2,7 @@
# setup.rb -- setup script before calling TkPackage.require()
#
# If you need some setup operations (for example, add a library path
-# to the library search path) before using Tcl/Tk library packages
-# wrapped by Ruby scripts in this directory, please write the setup
+# to the library search path) before using Tcl/Tk library packages
+# wrapped by Ruby scripts in this directory, please write the setup
# operations in this file.
#
diff --git a/ext/tk/lib/tkextlib/tktable/setup.rb b/ext/tk/lib/tkextlib/tktable/setup.rb
index ee406c6ca0..ce0f0bd4d4 100644
--- a/ext/tk/lib/tkextlib/tktable/setup.rb
+++ b/ext/tk/lib/tkextlib/tktable/setup.rb
@@ -2,7 +2,7 @@
# setup.rb -- setup script before calling TkPackage.require()
#
# If you need some setup operations (for example, add a library path
-# to the library search path) before using Tcl/Tk library packages
-# wrapped by Ruby scripts in this directory, please write the setup
+# to the library search path) before using Tcl/Tk library packages
+# wrapped by Ruby scripts in this directory, please write the setup
# operations in this file.
#
diff --git a/ext/tk/lib/tkextlib/tktable/tktable.rb b/ext/tk/lib/tkextlib/tktable/tktable.rb
index bc7a6c9a2e..f6cf24b40f 100644
--- a/ext/tk/lib/tkextlib/tktable/tktable.rb
+++ b/ext/tk/lib/tkextlib/tktable/tktable.rb
@@ -74,9 +74,6 @@ module Tk::TkTable::ConfigMethod
end
private :__item_val2ruby_optkeys
- def tag_cget_tkstring(tagOrId, option)
- itemcget_tkstring(['tag', tagid(tagOrId)], option)
- end
def tag_cget(tagOrId, option)
itemcget(['tag', tagid(tagOrId)], option)
end
@@ -93,9 +90,6 @@ module Tk::TkTable::ConfigMethod
current_itemconfiginfo(['tag', tagid(tagOrId)], slot)
end
- def window_cget_tkstring(tagOrId, option)
- itemcget_tkstring(['window', tagid(tagOrId)], option)
- end
def window_cget(tagOrId, option)
itemcget(['window', tagid(tagOrId)], option)
end
@@ -120,7 +114,7 @@ module Tk::TkTable::ConfigMethod
current_itemconfiginfo(['window', tagid(tagOrId)], slot)
end
- private :itemcget_tkstring, :itemcget, :itemcget_strict
+ private :itemcget, :itemcget_strict
private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
end
@@ -131,7 +125,7 @@ class Tk::TkTable::CellTag
CellTagID_TBL = TkCore::INTERP.create_table
- (CellTag_ID = ['tktbl:celltag'.freeze, TkUtil.untrust('00000')]).instance_eval{
+ (CellTag_ID = ['tktbl:celltag'.freeze, '00000'.taint]).instance_eval{
@mutex = Mutex.new
def mutex; @mutex; end
freeze
@@ -203,9 +197,6 @@ class Tk::TkTable::CellTag
@t.tag_lower(@id, target)
end
- def cget_tkstring(key)
- @t.tag_cget_tkstring(@id, key)
- end
def cget(key)
@t.tag_cget(@id, key)
end
@@ -262,7 +253,7 @@ end
class Tk::TkTable
TkCommandNames = ['table'.freeze].freeze
WidgetClassName = 'Table'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
include Scrollable
include Tk::TkTable::ConfigMethod
@@ -291,21 +282,21 @@ class Tk::TkTable
class BrowseCommand < TkValidateCommand
class ValidateArgs < TkUtil::CallbackSubst
KEY_TBL = [
- [ ?c, ?n, :column ],
- [ ?C, ?s, :index ],
- [ ?i, ?x, :cursor ],
- [ ?r, ?n, :row ],
- [ ?s, ?s, :last_index ],
- [ ?S, ?s, :new_index ],
- [ ?W, ?w, :widget ],
+ [ ?c, ?n, :column ],
+ [ ?C, ?s, :index ],
+ [ ?i, ?x, :cursor ],
+ [ ?r, ?n, :row ],
+ [ ?s, ?s, :last_index ],
+ [ ?S, ?s, :new_index ],
+ [ ?W, ?w, :widget ],
nil
]
PROC_TBL = [
- [ ?n, TkComm.method(:number) ],
- [ ?x, TkComm.method(:num_or_str) ],
- [ ?s, TkComm.method(:string) ],
- [ ?w, TkComm.method(:window) ],
+ [ ?n, TkComm.method(:number) ],
+ [ ?x, TkComm.method(:num_or_str) ],
+ [ ?s, TkComm.method(:string) ],
+ [ ?w, TkComm.method(:window) ],
nil
]
@@ -342,21 +333,21 @@ class Tk::TkTable
class CellCommand < TkValidateCommand
class ValidateArgs < TkUtil::CallbackSubst
KEY_TBL = [
- [ ?c, ?n, :column ],
- [ ?C, ?s, :index ],
- [ ?i, ?m, :rw_mode ],
- [ ?r, ?n, :row ],
- [ ?s, ?v, :value ],
- [ ?W, ?w, :widget ],
+ [ ?c, ?n, :column ],
+ [ ?C, ?s, :index ],
+ [ ?i, ?m, :rw_mode ],
+ [ ?r, ?n, :row ],
+ [ ?s, ?v, :value ],
+ [ ?W, ?w, :widget ],
nil
]
PROC_TBL = [
- [ ?n, TkComm.method(:number) ],
- [ ?s, TkComm.method(:string) ],
- [ ?w, TkComm.method(:window) ],
- [ ?m, proc{|val| (val == '0')? (:r) : (:w)} ],
- [ ?v, proc{|val| TkComm.tk_tcl2ruby(val, true, false)} ],
+ [ ?n, TkComm.method(:number) ],
+ [ ?s, TkComm.method(:string) ],
+ [ ?w, TkComm.method(:window) ],
+ [ ?m, proc{|val| (val == '0')? (:r) : (:w)} ],
+ [ ?v, proc{|val| TkComm.tk_tcl2ruby(val, true, false)} ],
nil
]
@@ -393,19 +384,19 @@ class Tk::TkTable
class SelectionCommand < TkValidateCommand
class ValidateArgs < TkUtil::CallbackSubst
KEY_TBL = [
- [ ?c, ?n, :sel_columns ],
- [ ?C, ?s, :sel_area ],
- [ ?i, ?n, :total ],
- [ ?r, ?n, :sel_rows ],
- [ ?s, ?s, :value ],
- [ ?W, ?w, :widget ],
+ [ ?c, ?n, :sel_columns ],
+ [ ?C, ?s, :sel_area ],
+ [ ?i, ?n, :total ],
+ [ ?r, ?n, :sel_rows ],
+ [ ?s, ?s, :value ],
+ [ ?W, ?w, :widget ],
nil
]
PROC_TBL = [
- [ ?n, TkComm.method(:number) ],
- [ ?s, TkComm.method(:string) ],
- [ ?w, TkComm.method(:window) ],
+ [ ?n, TkComm.method(:number) ],
+ [ ?s, TkComm.method(:string) ],
+ [ ?w, TkComm.method(:window) ],
nil
]
@@ -442,22 +433,22 @@ class Tk::TkTable
class ValidateCommand < TkValidateCommand
class ValidateArgs < TkUtil::CallbackSubst
KEY_TBL = [
- [ ?c, ?n, :column ],
- [ ?C, ?s, :index ],
- [ ?i, ?x, :cursor ],
- [ ?r, ?n, :row ],
- [ ?s, ?v, :current_value ],
- [ ?S, ?v, :new_value ],
- [ ?W, ?w, :widget ],
+ [ ?c, ?n, :column ],
+ [ ?C, ?s, :index ],
+ [ ?i, ?x, :cursor ],
+ [ ?r, ?n, :row ],
+ [ ?s, ?v, :current_value ],
+ [ ?S, ?v, :new_value ],
+ [ ?W, ?w, :widget ],
nil
]
PROC_TBL = [
- [ ?n, TkComm.method(:number) ],
- [ ?x, TkComm.method(:num_or_str) ],
- [ ?s, TkComm.method(:string) ],
- [ ?w, TkComm.method(:window) ],
- [ ?v, proc{|val| TkComm.tk_tcl2ruby(val, true, false)} ],
+ [ ?n, TkComm.method(:number) ],
+ [ ?x, TkComm.method(:num_or_str) ],
+ [ ?s, TkComm.method(:string) ],
+ [ ?w, TkComm.method(:window) ],
+ [ ?v, proc{|val| TkComm.tk_tcl2ruby(val, true, false)} ],
nil
]
@@ -490,7 +481,7 @@ class Tk::TkTable
#################################
def __validation_class_list
- super() <<
+ super() <<
BrowseCommand << CellCommand << SelectionCommand << ValidateCommand
end
@@ -606,7 +597,7 @@ class Tk::TkTable
def hidden_list
simplelist(tk_send('hidden'))
- end
+ end
def hidden?(idx, *args)
if args.empty?
if (ret = tk_send('hidden', tagid(idx))) == ''
@@ -710,7 +701,7 @@ class Tk::TkTable
self
end
- def set(*pairs) # idx, val, idx, val, ...
+ def set(*pairs) # idx, val, idx, val, ...
args = []
0.step(pairs.size-1, 2){|i|
args << tagid(pairs[i])
@@ -719,7 +710,7 @@ class Tk::TkTable
tk_send('set', *args)
self
end
- def set_row(*pairs) # idx, val, idx, val, ...
+ def set_row(*pairs) # idx, val, idx, val, ...
args = []
0.step(pairs.size-1, 2){|i|
args << tagid(pairs[i])
@@ -728,7 +719,7 @@ class Tk::TkTable
tk_send('set', 'row', *args)
self
end
- def set_col(*pairs) # idx, val, idx, val, ...
+ def set_col(*pairs) # idx, val, idx, val, ...
args = []
0.step(pairs.size-1, 2){|i|
args << tagid(pairs[i])
@@ -745,7 +736,7 @@ class Tk::TkTable
pairs.each{|idx, val| args << tagid(idx) << val }
tk_send('set', *args)
else
- # idx, val, idx, val, ...
+ # idx, val, idx, val, ...
args = []
0.step(pairs.size-1, 2){|i|
args << tagid(pairs[i])
@@ -762,7 +753,7 @@ class Tk::TkTable
pairs.each{|idx, val| args << tagid(idx) << val }
tk_send('set', 'row', *args)
else
- # idx, val, idx, val, ...
+ # idx, val, idx, val, ...
args = []
0.step(pairs.size-1, 2){|i|
args << tagid(pairs[i])
@@ -779,7 +770,7 @@ class Tk::TkTable
pairs.each{|idx, val| args << idx << val }
tk_send('set', 'col', *args)
else
- # idx, val, idx, val, ...
+ # idx, val, idx, val, ...
args = []
0.step(pairs.size-1, 2){|i|
args << tagid(pairs[i])
@@ -807,7 +798,7 @@ class Tk::TkTable
[idx [rows, cols]]
end
def set_spans(*pairs)
- # idx, val, idx, val, ...
+ # idx, val, idx, val, ...
args = []
0.step(pairs.size-1, 2){|i|
args << tagid(pairs[i])
@@ -836,7 +827,7 @@ class Tk::TkTable
}
tk_send('spans', *args)
else
- # idx, val, idx, val, ...
+ # idx, val, idx, val, ...
args = []
0.step(pairs.size-1, 2){|i|
args << tagid(pairs[i])
@@ -903,9 +894,9 @@ class Tk::TkTable
Tk::TkTable::CellTag::CellTagID_TBL.mutex.synchronize{
if Tk::TkTable::CellTag::CellTagID_TBL[@path]
if tag.kind_of? Tk::TkTable::CellTag
- Tk::TkTable::CellTag::CellTagID_TBL[@path].delete(tag.id)
+ Tk::TkTable::CellTag::CellTagID_TBL[@path].delete(tag.id)
else
- Tk::TkTable::CellTag::CellTagID_TBL[@path].delete(tag)
+ Tk::TkTable::CellTag::CellTagID_TBL[@path].delete(tag)
end
end
}
diff --git a/ext/tk/lib/tkextlib/tktrans/setup.rb b/ext/tk/lib/tkextlib/tktrans/setup.rb
index ee406c6ca0..ce0f0bd4d4 100644
--- a/ext/tk/lib/tkextlib/tktrans/setup.rb
+++ b/ext/tk/lib/tkextlib/tktrans/setup.rb
@@ -2,7 +2,7 @@
# setup.rb -- setup script before calling TkPackage.require()
#
# If you need some setup operations (for example, add a library path
-# to the library search path) before using Tcl/Tk library packages
-# wrapped by Ruby scripts in this directory, please write the setup
+# to the library search path) before using Tcl/Tk library packages
+# wrapped by Ruby scripts in this directory, please write the setup
# operations in this file.
#
diff --git a/ext/tk/lib/tkextlib/treectrl/setup.rb b/ext/tk/lib/tkextlib/treectrl/setup.rb
index ee406c6ca0..ce0f0bd4d4 100644
--- a/ext/tk/lib/tkextlib/treectrl/setup.rb
+++ b/ext/tk/lib/tkextlib/treectrl/setup.rb
@@ -2,7 +2,7 @@
# setup.rb -- setup script before calling TkPackage.require()
#
# If you need some setup operations (for example, add a library path
-# to the library search path) before using Tcl/Tk library packages
-# wrapped by Ruby scripts in this directory, please write the setup
+# to the library search path) before using Tcl/Tk library packages
+# wrapped by Ruby scripts in this directory, please write the setup
# operations in this file.
#
diff --git a/ext/tk/lib/tkextlib/treectrl/tktreectrl.rb b/ext/tk/lib/tkextlib/treectrl/tktreectrl.rb
index 1879a531ae..e10e6e299e 100644
--- a/ext/tk/lib/tkextlib/treectrl/tktreectrl.rb
+++ b/ext/tk/lib/tkextlib/treectrl/tktreectrl.rb
@@ -32,14 +32,14 @@ module Tk
end
end
- HasColumnCreateCommand =
+ HasColumnCreateCommand =
(TkPackage.vcompare(self.package_version, '1.1') >= 0)
- # dummy ::
- # pkgIndex.tcl of TreeCtrl-1.0 doesn't support auto_load for
- # 'loupe' command (probably it is bug, I think).
- # So, calling a 'treectrl' command for loading the dll with
- # the auto_load facility.
+ # dummy ::
+ # pkgIndex.tcl of TreeCtrl-1.0 doesn't support auto_load for
+ # 'loupe' command (probably it is bug, I think).
+ # So, calling a 'treectrl' command for loading the dll with
+ # the auto_load facility.
begin
tk_call('treectrl')
rescue
@@ -48,7 +48,7 @@ module Tk
# NOTE: platform == 'unix' only
# img => TkPhotoImage
- # x, y => screen coords
+ # x, y => screen coords
# w, h => magnifier width and height
# zoom => zooming rate
Tk.tk_call_without_enc('loupe', img, x, y, w, h, zoom)
@@ -76,28 +76,28 @@ end
class Tk::TreeCtrl::NotifyEvent
# [ <'%' subst-key char>, <proc type char>, <instance var (accessor) name>]
KEY_TBL = [
- [ ?c, ?n, :item_num ],
- [ ?d, ?s, :detail ],
- [ ?D, ?l, :items ],
- [ ?e, ?e, :event ],
- [ ?I, ?n, :id ],
- [ ?l, ?n, :lower_bound ],
- [ ?p, ?n, :active_id ],
- [ ?P, ?e, :pattern ],
- [ ?S, ?l, :sel_items ],
- [ ?T, ?w, :widget ],
- [ ?u, ?n, :upper_bound ],
- [ ?W, ?o, :object ],
- [ ??, ?x, :parm_info ],
+ [ ?c, ?n, :item_num ],
+ [ ?d, ?s, :detail ],
+ [ ?D, ?l, :items ],
+ [ ?e, ?e, :event ],
+ [ ?I, ?n, :id ],
+ [ ?l, ?n, :lower_bound ],
+ [ ?p, ?n, :active_id ],
+ [ ?P, ?e, :pattern ],
+ [ ?S, ?l, :sel_items ],
+ [ ?T, ?w, :widget ],
+ [ ?u, ?n, :upper_bound ],
+ [ ?W, ?o, :object ],
+ [ ??, ?x, :parm_info ],
nil
]
# [ <proc type char>, <proc/method to convert tcl-str to ruby-obj>]
PROC_TBL = [
- [ ?n, TkComm.method(:num_or_str) ],
- [ ?s, TkComm.method(:string) ],
- [ ?l, TkComm.method(:list) ],
- [ ?w, TkComm.method(:window) ],
+ [ ?n, TkComm.method(:num_or_str) ],
+ [ ?s, TkComm.method(:string) ],
+ [ ?l, TkComm.method(:list) ],
+ [ ?w, TkComm.method(:window) ],
[ ?e, proc{|val|
case val
@@ -109,9 +109,9 @@ class Tk::TreeCtrl::NotifyEvent
val
end
}
- ],
+ ],
- [ ?o, proc{|val| TkComm.tk_tcl2ruby(val)} ],
+ [ ?o, proc{|val| TkComm.tk_tcl2ruby(val)} ],
[ ?x, proc{|val|
begin
@@ -132,7 +132,7 @@ class Tk::TreeCtrl::NotifyEvent
rescue
val
end
- } ],
+ } ],
nil
]
@@ -157,15 +157,15 @@ class Tk::TreeCtrl::NotifyEvent
# setup tables to be used by scan_args, _get_subst_key, _get_all_subst_keys
#
- # _get_subst_key() and _get_all_subst_keys() generates key-string
- # which describe how to convert callback arguments to ruby objects.
- # When binding parameters are given, use _get_subst_key().
- # But when no parameters are given, use _get_all_subst_keys() to
- # create a Event class object as a callback parameter.
+ # _get_subst_key() and _get_all_subst_keys() generates key-string
+ # which describe how to convert callback arguments to ruby objects.
+ # When binding parameters are given, use _get_subst_key().
+ # But when no parameters are given, use _get_all_subst_keys() to
+ # create a Event class object as a callback parameter.
#
- # scan_args() is used when doing callback. It convert arguments
- # ( which are Tcl strings ) to ruby objects based on the key string
- # that is generated by _get_subst_key() or _get_all_subst_keys().
+ # scan_args() is used when doing callback. It convert arguments
+ # ( which are Tcl strings ) to ruby objects based on the key string
+ # that is generated by _get_subst_key() or _get_all_subst_keys().
#
_setup_subst_table(KEY_TBL, PROC_TBL);
end
@@ -185,7 +185,7 @@ module Tk::TreeCtrl::ConfigMethod
if (obj.kind_of?(Tk::TreeCtrl::Column) ||
obj.kind_of?(Tk::TreeCtrl::Element) ||
obj.kind_of?(Tk::TreeCtrl::Item) ||
- obj.kind_of?(Tk::TreeCtrl::Style))
+ obj.kind_of?(Tk::TreeCtrl::Style))
obj = obj.id
end
@@ -236,7 +236,7 @@ module Tk::TreeCtrl::ConfigMethod
def __item_cget_cmd(mixed_id)
if mixed_id[0] == 'column' && mixed_id[1] == 'drag'
return [self.path, 'column', 'dragcget']
- end
+ end
if mixed_id[1].kind_of?(Array)
id = mixed_id[1]
@@ -255,7 +255,7 @@ module Tk::TreeCtrl::ConfigMethod
def __item_config_cmd(mixed_id)
if mixed_id[0] == 'column' && mixed_id[1] == 'drag'
return [self.path, 'column', 'dragconfigure']
- end
+ end
if mixed_id[1].kind_of?(Array)
id = mixed_id[1]
@@ -291,10 +291,10 @@ module Tk::TreeCtrl::ConfigMethod
def __item_configinfo_struct(id)
if id.kind_of?(Array) && id[0].to_s == 'notify'
- {:key=>0, :alias=>nil, :db_name=>nil, :db_class=>nil,
+ {:key=>0, :alias=>nil, :db_name=>nil, :db_class=>nil,
:default_value=>nil, :current_value=>1}
else
- {:key=>0, :alias=>1, :db_name=>1, :db_class=>2,
+ {:key=>0, :alias=>1, :db_name=>1, :db_class=>2,
:default_value=>3, :current_value=>4}
end
end
@@ -302,7 +302,7 @@ module Tk::TreeCtrl::ConfigMethod
def __item_font_optkeys(id)
- if id.kind_of?(Array) && (id[0] == 'element' ||
+ if id.kind_of?(Array) && (id[0] == 'element' ||
(id[0].kind_of?(Array) && id[0][1] == 'element'))
[]
else
@@ -322,7 +322,7 @@ module Tk::TreeCtrl::ConfigMethod
def __item_boolval_optkeys(id)
if id == 'debug'
- ['data', 'display', 'enable', 'span', 'textlayout']
+ ['data', 'display', 'enable']
elsif id == 'dragimage'
['visible']
elsif id == 'marquee'
@@ -330,20 +330,20 @@ module Tk::TreeCtrl::ConfigMethod
elsif id.kind_of?(Array)
case id[0]
when 'item'
- ['visible', 'wrap', 'open', 'returnid', 'visible']
+ ['button', 'visible']
when 'column'
if id[1] == 'drag'
['enable']
else
- ['button', 'expand', 'resize', 'squeeze', 'sunken',
+ ['button', 'expand', 'resize', 'squeeze', 'sunken',
'visible', 'widthhack']
end
when 'element'
- ['draw', 'filled', 'showfocus', 'clip', 'destroy']
+ ['draw', 'filled', 'showfocus', 'destroy']
when 'notify'
['active']
when 'style'
- ['detach', 'indent', 'visible']
+ ['detach']
else
if id[0].kind_of?(Array) && id[0][1] == 'element'
['filled', 'showfocus']
@@ -401,36 +401,19 @@ module Tk::TreeCtrl::ConfigMethod
end
private :__item_listval_optkeys
- def __item_val2ruby_optkeys(id)
- if id.kind_of?(Array)
- case id[0]
- when 'item'
- { 'button' => proc{|id,val| (val == 'auto')? val: TkComm.bool(val)} }
- else
- []
- end
- else
- []
- end
- end
- private :__item_val2ruby_optkeys
-
def __item_keyonly_optkeys(id) # { def_key=>(undef_key|nil), ... }
{
- 'notreally'=>nil,
+ 'notreally'=>nil,
'increasing'=>'decreasing',
- 'decreasing'=>'increasing',
+ 'decreasing'=>'increasing',
'ascii'=>nil,
- 'dictionary'=>nil,
- 'integer'=>nil,
+ 'dictionary'=>nil,
+ 'integer'=>nil,
'real'=>nil
}
end
private :__item_keyonly_optkeys
- def column_cget_tkstring(tagOrId, option)
- itemcget_tkstring(['column', tagOrId], option)
- end
def column_cget(tagOrId, option)
itemcget(['column', tagOrId], option)
end
@@ -447,9 +430,6 @@ module Tk::TreeCtrl::ConfigMethod
current_itemconfiginfo(['column', tagOrId], slot)
end
- def column_dragcget_tkstring(option)
- itemcget_tkstring(['column', 'drag'], option)
- end
def column_dragcget(option)
itemcget(['column', 'drag'], option)
end
@@ -466,9 +446,6 @@ module Tk::TreeCtrl::ConfigMethod
current_itemconfiginfo(['column', 'drag'], slot)
end
- def debug_cget_tkstring(option)
- itemcget_tkstring('debug', option)
- end
def debug_cget(option)
itemcget('debug', option)
end
@@ -485,9 +462,6 @@ module Tk::TreeCtrl::ConfigMethod
current_itemconfiginfo('debug', slot)
end
- def dragimage_cget_tkstring(option)
- itemcget_tkstring('dragimage', option)
- end
def dragimage_cget(option)
itemcget('dragimage', option)
end
@@ -504,9 +478,6 @@ module Tk::TreeCtrl::ConfigMethod
current_itemconfiginfo('dragimage', slot)
end
- def element_cget_tkstring(tagOrId, option)
- itemcget_tkstring(['element', tagOrId], option)
- end
def element_cget(tagOrId, option)
itemcget(['element', tagOrId], option)
end
@@ -523,9 +494,6 @@ module Tk::TreeCtrl::ConfigMethod
current_itemconfiginfo(['element', tagOrId], slot)
end
- def item_cget_tkstring(tagOrId, option)
- itemcget_tkstring(['item', tagOrId], option)
- end
def item_cget(tagOrId, option)
itemcget(['item', tagOrId], option)
end
@@ -542,9 +510,6 @@ module Tk::TreeCtrl::ConfigMethod
current_itemconfiginfo(['item', tagOrId], slot)
end
- def item_element_cget_tkstring(item, column, elem, option)
- itemcget_tkstring([['item', 'element'], [item, column, elem]], option)
- end
def item_element_cget(item, column, elem, option)
itemcget([['item', 'element'], [item, column, elem]], option)
end
@@ -561,9 +526,6 @@ module Tk::TreeCtrl::ConfigMethod
current_itemconfiginfo([['item', 'element'], [item, column, elem]], slot)
end
- def marquee_cget_tkstring(option)
- itemcget_tkstring('marquee', option)
- end
def marquee_cget(option)
itemcget('marquee', option)
end
@@ -580,11 +542,6 @@ module Tk::TreeCtrl::ConfigMethod
current_itemconfiginfo('marquee', slot)
end
- def notify_cget_tkstring(win, pattern, option)
- pattern = "<#{pattern}>"
- # "notify" doesn't have cget subcommand.
- tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(['notify', [win, pattern]])) << "-#{option}")), false, true)[-1]
- end
def notify_cget(win, pattern, option)
pattern = "<#{pattern}>"
# "notify" doesn't have cget subcommand.
@@ -614,9 +571,6 @@ module Tk::TreeCtrl::ConfigMethod
current_itemconfiginfo(['notify', [win, pattern]], slot)
end
- def style_cget_tkstring(tagOrId, option)
- itemcget_tkstring(['style', tagOrId], option)
- end
def style_cget(tagOrId, option)
itemcget(['style', tagOrId], option)
end
@@ -633,7 +587,7 @@ module Tk::TreeCtrl::ConfigMethod
current_itemconfiginfo(['style', tagOrId], slot)
end
- private :itemcget_tkstring, :itemcget, :itemcget_strict
+ private :itemcget, :itemcget_strict
private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
end
@@ -645,7 +599,7 @@ class Tk::TreeCtrl
TkCommandNames = ['treectrl'.freeze].freeze
WidgetClassName = 'TreeCtrl'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
#########################
@@ -675,9 +629,9 @@ class Tk::TreeCtrl
def __boolval_optkeys
[
- 'itemwidthequal', 'usetheme',
- 'showbuttons', 'showheader', 'showlines', 'showroot',
- 'showrootbutton', 'showrootlines', 'showrootchildbuttons'
+ 'itemwidthequal', 'usetheme',
+ 'showbuttons', 'showheader', 'showlines', 'showroot',
+ 'showrootbutton', 'showrootlines',
]
end
private :__boolval_optkeys
@@ -697,7 +651,7 @@ class Tk::TreeCtrl
def create_self(keys)
if keys and keys != None
- tk_call_without_enc(self.class::TkCommandNames[0], @path,
+ tk_call_without_enc(self.class::TkCommandNames[0], @path,
*hash_kv(keys, true))
else
tk_call_without_enc(self.class::TkCommandNames[0], @path)
@@ -726,7 +680,7 @@ class Tk::TreeCtrl
end
def collapse_recurse(*dsc)
- tk_send_without_enc('collapse', '-recurse',
+ tk_send_without_enc('collapse', '-recurse',
*(dsc.map!{|d| _get_eval_string(d, true)}))
self
end
@@ -977,7 +931,7 @@ class Tk::TreeCtrl
end
def item_collapse_recurse(item)
- tk_send_without_enc('item', 'collapse',
+ tk_send_without_enc('item', 'collapse',
_get_eval_string(item, true), '-recurse')
self
end
@@ -987,8 +941,8 @@ class Tk::TreeCtrl
end
def item_complex(item, *args)
- tk_send_without_enc('item', 'complex',
- _get_eval_string(item, true),
+ tk_send_without_enc('item', 'complex',
+ _get_eval_string(item, true),
*(args.map!{|arg| _get_eval_string(arg, true)}))
self
end
@@ -1054,12 +1008,12 @@ class Tk::TreeCtrl
def item_firstchild(parent, child=nil)
if child
- tk_send_without_enc('item', 'firstchild',
- _get_eval_string(parent, true),
+ tk_send_without_enc('item', 'firstchild',
+ _get_eval_string(parent, true),
_get_eval_string(child, true))
self
else
- id = num_or_str(tk_send_without_enc('item', 'firstchild',
+ id = num_or_str(tk_send_without_enc('item', 'firstchild',
_get_eval_string(parent, true)))
Tk::TreeCtrl::Item.id2obj(self, id)
end
@@ -1068,11 +1022,11 @@ class Tk::TreeCtrl
def item_hasbutton(item, st=None)
if st == None
- bool(tk_send_without_enc('item', 'hasbutton',
+ bool(tk_send_without_enc('item', 'hasbutton',
_get_eval_string(item, true)))
else
- tk_send_without_enc('item', 'hasbutton',
- _get_eval_string(item, true),
+ tk_send_without_enc('item', 'hasbutton',
+ _get_eval_string(item, true),
_get_eval_string(st))
self
end
@@ -1132,12 +1086,12 @@ class Tk::TreeCtrl
def item_lastchild(parent, child=nil)
if child
- tk_send_without_enc('item', 'lastchild',
+ tk_send_without_enc('item', 'lastchild',
_get_eval_string(parent, true),
_get_eval_string(child, true))
self
else
- id = num_or_str(tk_send_without_enc('item', 'lastchild',
+ id = num_or_str(tk_send_without_enc('item', 'lastchild',
_get_eval_string(parent, true)))
Tk::TreeCtrl::Item.id2obj(self, id)
end
@@ -1156,7 +1110,7 @@ class Tk::TreeCtrl
alias item_next_sibling item_nextsibling
def item_numchildren(item)
- number(tk_send_without_enc('item', 'numchildren',
+ number(tk_send_without_enc('item', 'numchildren',
_get_eval_string(item, true)))
end
alias item_num_children item_numchildren
@@ -1317,20 +1271,20 @@ class Tk::TreeCtrl
def item_style_set(item, column=nil, *args)
if args.empty?
if column
- id = tk_send_without_enc('item', 'style', 'set',
- _get_eval_string(item, true),
+ id = tk_send_without_enc('item', 'style', 'set',
+ _get_eval_string(item, true),
_get_eval_string(column, true))
Tk::TreeCtrl::Style.id2obj(self, id)
else
- list(tk_send_without_enc('item', 'style', 'set',
+ list(tk_send_without_enc('item', 'style', 'set',
_get_eval_string(item, true))).collect!{|id|
Tk::TreeCtrl::Style.id2obj(self, id)
}
end
else
- tk_send_without_enc('item', 'style', 'set',
- _get_eval_string(item, true),
- _get_eval_string(column, true),
+ tk_send_without_enc('item', 'style', 'set',
+ _get_eval_string(item, true),
+ _get_eval_string(column, true),
*(args.flatten.map!{|arg|
_get_eval_string(arg, true)
}))
@@ -1593,8 +1547,8 @@ class Tk::TreeCtrl
self
end
- def see(item, column=None, keys={})
- tk_send('see', item, column, *hash_kv(keys))
+ def see(item)
+ tk_send('see', item)
self
end
@@ -1686,8 +1640,8 @@ class Tk::TreeCtrl
tk_send('style', 'layout', style, elem, *hash_kv(keys))
self
else
- _conv_style_layout_val(keys,
- tk_send('style', 'layout',
+ _conv_style_layout_val(keys,
+ tk_send('style', 'layout',
style, elem, "-#{keys}"))
end
else
@@ -1732,7 +1686,7 @@ end
class Tk::TreeCtrl::Column < TkObject
TreeCtrlColumnID_TBL = TkCore::INTERP.create_table
- (TreeCtrlColumnID = ['treectrl_column'.freeze, TkUtil.untrust('00000')]).instance_eval{
+ (TreeCtrlColumnID = ['treectrl_column'.freeze, '00000'.taint]).instance_eval{
@mutex = Mutex.new
def mutex; @mutex; end
freeze
@@ -1763,7 +1717,7 @@ class Tk::TreeCtrl::Column < TkObject
keys = _symbolkey2str(keys)
Tk::TreeCtrl::Column::TreeCtrlColumnID.mutex.synchronize{
- @path = @id =
+ @path = @id =
keys.delete('tag') ||
Tk::TreeCtrl::Column::TreeCtrlColumnID.join(TkCore::INTERP._ip_id_)
Tk::TreeCtrl::Column::TreeCtrlColumnID[1].succ!
@@ -1772,7 +1726,7 @@ class Tk::TreeCtrl::Column < TkObject
keys['tag'] = @id
Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL.mutex.synchronize{
- Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL[@tpath] ||= {}
+ Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL[@tpath] ||= {}
Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL[@tpath][@id] = self
}
@@ -1787,9 +1741,6 @@ class Tk::TreeCtrl::Column < TkObject
@id.to_s.dup
end
- def cget_tkstring(opt)
- @tree.column_cget_tkstring(@tree.column_index(@id), opt)
- end
def cget(opt)
@tree.column_cget(@tree.column_index(@id), opt)
end
@@ -1838,7 +1789,7 @@ end
class Tk::TreeCtrl::Element < TkObject
TreeCtrlElementID_TBL = TkCore::INTERP.create_table
- (TreeCtrlElementID = ['treectrl_element'.freeze, TkUtil.untrust('00000')]).instance_eval{
+ (TreeCtrlElementID = ['treectrl_element'.freeze, '00000'.taint]).instance_eval{
@mutex = Mutex.new
def mutex; @mutex; end
freeze
@@ -1872,13 +1823,13 @@ class Tk::TreeCtrl::Element < TkObject
@tpath = parent.path
@type = type.to_s
Tk::TreeCtrl::Element::TreeCtrlElementID.mutex.synchronize{
- @path = @id =
+ @path = @id =
Tk::TreeCtrl::Element::TreeCtrlElementID.join(TkCore::INTERP._ip_id_)
Tk::TreeCtrl::Element::TreeCtrlElementID[1].succ!
}
Tk::TreeCtrl::Element::TreeCtrlElementID_TBL.mutex.synchronize{
- Tk::TreeCtrl::Element::TreeCtrlElementID_TBL[@tpath] ||= {}
+ Tk::TreeCtrl::Element::TreeCtrlElementID_TBL[@tpath] ||= {}
Tk::TreeCtrl::Element::TreeCtrlElementID_TBL[@tpath][@id] = self
}
@@ -1893,9 +1844,6 @@ class Tk::TreeCtrl::Element < TkObject
@id.dup
end
- def cget_tkstring(opt)
- @tree.element_cget_tkstring(@id, opt)
- end
def cget(opt)
@tree.element_cget(@id, opt)
end
@@ -1990,7 +1938,7 @@ class Tk::TreeCtrl::Item < TkObject
@path = @id = @tree.item_create(keys)
Tk::TreeCtrl::Item::TreeCtrlItemID_TBL.mutex.synchronize{
- Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[@tpath] ||= {}
+ Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[@tpath] ||= {}
Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[@tpath][@id] = self
}
end
@@ -2030,9 +1978,6 @@ class Tk::TreeCtrl::Item < TkObject
self
end
- def cget_tkstring(opt)
- @tree.item_cget_tkstring(@id, opt)
- end
def cget(opt)
@tree.item_cget(@id, opt)
end
@@ -2069,10 +2014,7 @@ class Tk::TreeCtrl::Item < TkObject
@tree.item_element_actual(@id, column, elem, key)
end
- def element_cget_tkstring(opt)
- @tree.item_element_cget(@id, opt)
- end
- def element_cget_tkstring(opt)
+ def element_cget(opt)
@tree.item_element_cget(@id, opt)
end
def element_cget_strict(opt)
@@ -2276,7 +2218,7 @@ end
class Tk::TreeCtrl::Style < TkObject
TreeCtrlStyleID_TBL = TkCore::INTERP.create_table
- (TreeCtrlStyleID = ['treectrl_style'.freeze, TkUtil.untrust('00000')]).instance_eval{
+ (TreeCtrlStyleID = ['treectrl_style'.freeze, '00000'.taint]).instance_eval{
@mutex = Mutex.new
def mutex; @mutex; end
freeze
@@ -2305,13 +2247,13 @@ class Tk::TreeCtrl::Style < TkObject
@tpath = parent.path
Tk::TreeCtrl::Style::TreeCtrlStyleID.mutex.synchronize{
- @path = @id =
+ @path = @id =
Tk::TreeCtrl::Style::TreeCtrlStyleID.join(TkCore::INTERP._ip_id_)
Tk::TreeCtrl::Style::TreeCtrlStyleID[1].succ!
}
Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL.mutex.synchronize{
- Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL[@tpath] ||= {}
+ Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL[@tpath] ||= {}
Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL[@tpath][@id] = self
}
@@ -2326,9 +2268,6 @@ class Tk::TreeCtrl::Style < TkObject
@id.dup
end
- def cget_tkstring(opt)
- @tree.style_cget_tkstring(@id, opt)
- end
def cget(opt)
@tree.style_cget(@id, opt)
end
diff --git a/ext/tk/lib/tkextlib/trofs/setup.rb b/ext/tk/lib/tkextlib/trofs/setup.rb
index ee406c6ca0..ce0f0bd4d4 100644
--- a/ext/tk/lib/tkextlib/trofs/setup.rb
+++ b/ext/tk/lib/tkextlib/trofs/setup.rb
@@ -2,7 +2,7 @@
# setup.rb -- setup script before calling TkPackage.require()
#
# If you need some setup operations (for example, add a library path
-# to the library search path) before using Tcl/Tk library packages
-# wrapped by Ruby scripts in this directory, please write the setup
+# to the library search path) before using Tcl/Tk library packages
+# wrapped by Ruby scripts in this directory, please write the setup
# operations in this file.
#
diff --git a/ext/tk/lib/tkextlib/version.rb b/ext/tk/lib/tkextlib/version.rb
index 3bc3ec5ae2..434ed11a2e 100644
--- a/ext/tk/lib/tkextlib/version.rb
+++ b/ext/tk/lib/tkextlib/version.rb
@@ -2,5 +2,5 @@
# release date of tkextlib
#
module Tk
- Tkextlib_RELEASE_DATE = '2009-07-12'.freeze
+ Tkextlib_RELEASE_DATE = '2008-05-23'.freeze
end
diff --git a/ext/tk/lib/tkextlib/vu/bargraph.rb b/ext/tk/lib/tkextlib/vu/bargraph.rb
index b9fcf925f3..27ff3c7cd0 100644
--- a/ext/tk/lib/tkextlib/vu/bargraph.rb
+++ b/ext/tk/lib/tkextlib/vu/bargraph.rb
@@ -19,7 +19,7 @@ require 'tkextlib/vu.rb'
class Tk::Vu::Bargraph < TkWindow
TkCommandNames = ['::vu::bargraph'.freeze].freeze
WidgetClassName = 'Bargraph'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
###############################
@@ -30,10 +30,10 @@ class Tk::Vu::Bargraph < TkWindow
def __strval_optkeys
super() + [
- 'title',
- 'barbackground', 'barcolor', 'barcolour',
- 'tickcolor', 'tickcolour',
- 'textcolor', 'textcolour',
+ 'title',
+ 'barbackground', 'barcolor', 'barcolour',
+ 'tickcolor', 'tickcolour',
+ 'textcolor', 'textcolour',
]
end
private :__strval_optkeys
diff --git a/ext/tk/lib/tkextlib/vu/charts.rb b/ext/tk/lib/tkextlib/vu/charts.rb
index 8569ac5541..ee4298fa1c 100644
--- a/ext/tk/lib/tkextlib/vu/charts.rb
+++ b/ext/tk/lib/tkextlib/vu/charts.rb
@@ -18,7 +18,7 @@ module Tk
private :__item_boolval_optkeys
def __item_strval_optkeys(id)
- super(id) << 'bar' << 'color' << 'outline' <<
+ super(id) << 'bar' << 'color' << 'outline' <<
'fill' << 'scaleline' << 'stripline'
end
private :__item_strval_optkeys
diff --git a/ext/tk/lib/tkextlib/vu/dial.rb b/ext/tk/lib/tkextlib/vu/dial.rb
index eca0bbb67c..e27a38ae42 100644
--- a/ext/tk/lib/tkextlib/vu/dial.rb
+++ b/ext/tk/lib/tkextlib/vu/dial.rb
@@ -19,7 +19,7 @@ require 'tkextlib/vu.rb'
class Tk::Vu::Dial < TkWindow
TkCommandNames = ['::vu::dial'.freeze].freeze
WidgetClassName = 'Dial'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
###############################
diff --git a/ext/tk/lib/tkextlib/vu/pie.rb b/ext/tk/lib/tkextlib/vu/pie.rb
index 6b0c485d8a..c1fb6857bf 100644
--- a/ext/tk/lib/tkextlib/vu/pie.rb
+++ b/ext/tk/lib/tkextlib/vu/pie.rb
@@ -37,7 +37,7 @@ end
class Tk::Vu::Pie < TkWindow
TkCommandNames = ['::vu::pie'.freeze].freeze
WidgetClassName = 'Pie'.freeze
- WidgetClassNames[WidgetClassName] ||= self
+ WidgetClassNames[WidgetClassName] = self
def __destroy_hook__
Tk::Vu::PieSlice::SliceID_TBL.delete(@path)
@@ -117,7 +117,7 @@ end
class Tk::Vu::PieSlice
SliceID_TBL = TkCore::INTERP.create_table
- (Pie_Slice_ID = ['vu:pie'.freeze, TkUtil.untrust('00000')]).instance_eval{
+ (Pie_Slice_ID = ['vu:pie'.freeze, '00000'.taint]).instance_eval{
@mutex = Mutex.new
def mutex; @mutex; end
freeze
@@ -173,10 +173,6 @@ class Tk::Vu::PieSlice
val
end
- def cget_tkstring(slot)
- @pie.itemcget_tkstring(@id, slot)
- end
-
def cget(slot)
@pie.itemcget(@id, slot)
end
diff --git a/ext/tk/lib/tkextlib/vu/setup.rb b/ext/tk/lib/tkextlib/vu/setup.rb
index ee406c6ca0..ce0f0bd4d4 100644
--- a/ext/tk/lib/tkextlib/vu/setup.rb
+++ b/ext/tk/lib/tkextlib/vu/setup.rb
@@ -2,7 +2,7 @@
# setup.rb -- setup script before calling TkPackage.require()
#
# If you need some setup operations (for example, add a library path
-# to the library search path) before using Tcl/Tk library packages
-# wrapped by Ruby scripts in this directory, please write the setup
+# to the library search path) before using Tcl/Tk library packages
+# wrapped by Ruby scripts in this directory, please write the setup
# operations in this file.
#
diff --git a/ext/tk/lib/tkextlib/vu/spinbox.rb b/ext/tk/lib/tkextlib/vu/spinbox.rb
index 7d6104f4d1..a7e40ea319 100644
--- a/ext/tk/lib/tkextlib/vu/spinbox.rb
+++ b/ext/tk/lib/tkextlib/vu/spinbox.rb
@@ -7,7 +7,7 @@
#
require 'tk'
-if (Tk::TK_MAJOR_VERSION < 8 ||
+if (Tk::TK_MAJOR_VERSION < 8 ||
(Tk::TK_MAJOR_VERSION == 8 && Tk::TK_MINOR_VERSION < 4))
# call setup script -- <libdir>/tkextlib/vu.rb
require 'tkextlib/vu.rb'
diff --git a/ext/tk/lib/tkextlib/winico/setup.rb b/ext/tk/lib/tkextlib/winico/setup.rb
index ee406c6ca0..ce0f0bd4d4 100644
--- a/ext/tk/lib/tkextlib/winico/setup.rb
+++ b/ext/tk/lib/tkextlib/winico/setup.rb
@@ -2,7 +2,7 @@
# setup.rb -- setup script before calling TkPackage.require()
#
# If you need some setup operations (for example, add a library path
-# to the library search path) before using Tcl/Tk library packages
-# wrapped by Ruby scripts in this directory, please write the setup
+# to the library search path) before using Tcl/Tk library packages
+# wrapped by Ruby scripts in this directory, please write the setup
# operations in this file.
#
diff --git a/ext/tk/lib/tkextlib/winico/winico.rb b/ext/tk/lib/tkextlib/winico/winico.rb
index 9160c2960f..00316fd441 100644
--- a/ext/tk/lib/tkextlib/winico/winico.rb
+++ b/ext/tk/lib/tkextlib/winico/winico.rb
@@ -46,7 +46,7 @@ class Tk::Winico
end
def self.info
- simplelist(Tk.tk_call('winico', 'info')).collect{|id|
+ simplelist(Tk.tk_call('winico', 'info')).collect{|id|
Tk::Winico.id2obj(id)
}
end
@@ -82,7 +82,7 @@ class Tk::Winico
elsif winico_id
@id = winico_id
else
- fail ArgumentError,
+ fail ArgumentError,
"must be given proper information from where loading icons"
end
@path = @id
@@ -96,7 +96,7 @@ class Tk::Winico
end
def set_window(win_id, *opts) # opts := ?'big'|'small'?, ?pos?
- # NOTE:: the window, which is denoted by win_id, MUST BE MAPPED.
+ # NOTE:: the window, which is denoted by win_id, MUST BE MAPPED.
# If not, then this may fail or crash.
tk_call('winico', 'setwindow', win_id, @id, *opts)
end
@@ -119,22 +119,22 @@ class Tk::Winico
class Winico_callback < TkValidateCommand
class ValidateArgs < TkUtil::CallbackSubst
KEY_TBL = [
- [ ?m, ?s, :message ],
- [ ?i, ?x, :icon ],
- [ ?x, ?n, :x ],
- [ ?y, ?n, :y ],
- [ ?X, ?n, :last_x ],
- [ ?Y, ?n, :last_y ],
- [ ?t, ?n, :tickcount ],
- [ ?w, ?n, :icon_idnum ],
- [ ?l, ?n, :msg_idnum ],
+ [ ?m, ?s, :message ],
+ [ ?i, ?x, :icon ],
+ [ ?x, ?n, :x ],
+ [ ?y, ?n, :y ],
+ [ ?X, ?n, :last_x ],
+ [ ?Y, ?n, :last_y ],
+ [ ?t, ?n, :tickcount ],
+ [ ?w, ?n, :icon_idnum ],
+ [ ?l, ?n, :msg_idnum ],
nil
]
PROC_TBL = [
- [ ?n, TkComm.method(:number) ],
- [ ?s, TkComm.method(:string) ],
- [ ?x, proc{|id|
+ [ ?n, TkComm.method(:number) ],
+ [ ?s, TkComm.method(:string) ],
+ [ ?x, proc{|id|
Tk::Winico::WinicoID_TBL.mutex.synchronize{
if Tk::Winico::WinicoID_TBL.key?(id)
obj = Tk::Winico::WinicoID_TBL[id]
@@ -146,7 +146,7 @@ class Tk::Winico
end
obj
}
- } ],
+ } ],
nil
]
diff --git a/ext/tk/old-extconf.rb b/ext/tk/old-extconf.rb
deleted file mode 100644
index ebc83a0c0b..0000000000
--- a/ext/tk/old-extconf.rb
+++ /dev/null
@@ -1,440 +0,0 @@
-# extconf.rb for tcltklib
-
-require 'mkmf'
-
-is_win32 = (/mswin|mingw|cygwin|bccwin/ =~ RUBY_PLATFORM)
-#is_macosx = (/darwin/ =~ RUBY_PLATFORM)
-
-have_func("ruby_native_thread_p", "ruby.h")
-have_func("rb_errinfo", "ruby.h")
-have_func("rb_safe_level", "ruby.h")
-have_struct_member("struct RArray", "ptr", "ruby.h")
-have_struct_member("struct RArray", "len", "ruby.h")
-
-def find_framework(tcl_hdr, tk_hdr)
- if framework_dir = with_config("tcltk-framework")
- paths = [framework_dir]
- else
- unless tcl_hdr || tk_hdr ||
- enable_config("tcltk-framework", false) ||
- enable_config("mac-tcltk-framework", false)
- return false
- end
- paths = ["/Library/Frameworks", "/System/Library/Frameworks"]
- end
-
- checking_for('Tcl/Tk Framework') {
- paths.find{|dir|
- dir.strip!
- dir.chomp!('/')
- (tcl_hdr || FileTest.directory?(dir + "/Tcl.framework/") ) &&
- (tk_hdr || FileTest.directory?(dir + "/Tk.framework/") )
- }
- }
-end
-
-tcl_framework_header = with_config("tcl-framework-header")
-tk_framework_header = with_config("tk-framework-header")
-
-tcltk_framework = find_framework(tcl_framework_header, tk_framework_header)
-
-unless is_win32
- have_library("nsl", "t_open")
- have_library("socket", "socket")
- have_library("dl", "dlopen")
- have_library("m", "log")
-end
-
-tk_idir, tk_ldir = dir_config("tk")
-tcl_idir, tcl_ldir = dir_config("tcl")
-x11_idir, x11_ldir = dir_config("X11")
-
-tk_ldir2 = with_config("tk-lib")
-tcl_ldir2 = with_config("tcl-lib")
-x11_ldir2 = with_config("X11-lib")
-
-tk_ldir_list = [tk_ldir2, tk_ldir]
-tcl_ldir_list = [tcl_ldir2, tcl_ldir]
-
-tklib = with_config("tklib")
-tcllib = with_config("tcllib")
-stubs = enable_config("tcltk_stubs") || with_config("tcltk_stubs")
-
-tcltk_version = with_config("tcltkversion")
-
-use_X = with_config("X11", (! is_win32))
-
-def parse_tclConfig(file)
- # check tclConfig.sh/tkConfig.sh
- tbl = {}
- IO.foreach(file){|line|
- line.strip!
- next if line !~ /^([^\#=][^=]*)=(['"]|)(.*)\2$/
- key, val = $1, $3
- tbl[key] = val.gsub(/\$\{([^}]+)\}/){|s| tbl[$1]} rescue nil
- }
- tbl
-end
-
-def check_tcltk_version(version)
- return [nil, nil] unless version
-
- version = version.strip
-
- tclver = version.dup
- tkver = version.dup
-
- major = dot = minor = dot = plvl = ext = nil
-
- if version =~ /^(\d)(\.?)(\d)(\.?)(\d*)(.*)$/
- major = $1; minor_dot = $2; minor = $3; plvl_dot = $4; plvl = $5; ext = $6
- dot = ! minor_dot.empty?
- if plvl_dot.empty? && ! plvl.empty?
- minor << plvl
- end
- elsif version =~ /^(\d)(\.?)(\d?)(.*)$/
- major = $1; minor_dot = $2; minor = $3; ext = $4
- dot = ! minor_dot.empty?
- else # unknown -> believe user
- return [tclver, tkver]
- end
-
- # check Tcl7.6 / Tk4.2 ?
- if major == "7" # Tcl7.6 ( not support Tclversion < 7.6 )
- # Tk4.2
- tkver = "4" + ((dot)? ".": "") + ((minor.empty)? "": "2") + ext
- elsif major == "4" # Tk4.2 ( not support Tkversion < 4.2 )
- # Tcl7.6
- tclver = "7" + ((dot)? ".": "") + ((minor.empty)? "": "6") + ext
- end
-
- [tclver, tkver]
-end
-
-def find_tcl(tcllib, stubs, version, *opt_paths)
- default_paths = ["/usr/local/lib", "/usr/pkg/lib", "/usr/lib"]
- default_paths << "/Tcl/lib" # default for ActiveTcl
-
- if (paths = opt_paths.compact).empty?
- paths = default_paths
- end
-
- if stubs
- func = "Tcl_InitStubs"
- lib = "tclstub"
- else
- func = "Tcl_FindExecutable"
- lib = "tcl"
- end
-
- if version && ! version.empty?
- versions = [version]
- else
- versions = %w[8.7 8.6 8.5 8.4 8.3 8.2 8.1 8.0 7.6]
- end
-
- if tcllib
- st = find_library(tcllib, func, *paths)
- else
- st = versions.find { |ver|
- find_library("#{lib}#{ver}", func, *paths) or
- find_library("#{lib}#{ver.delete('.')}", func, *paths) or
- find_library("#{lib}#{ver}g", func, *paths) or
- find_library("#{lib}#{ver.delete('.')}g", func, *paths) or
- find_library("tcl#{ver}", func, *paths) or
- find_library("tcl#{ver.delete('.')}", func, *paths) or
- find_library("tcl#{ver}g", func, *paths) or
- find_library("tcl#{ver.delete('.')}g", func, *paths)
- } || (!version && find_library(lib, func, *paths))
- end
-
- unless st
- puts("Warning:: cannot find Tcl library. tcltklib will not be compiled (tcltklib is disabled on your Ruby == Ruby/Tk will not work). Please check configure options.")
- end
- st
-end
-
-def find_tk(tklib, stubs, version, *opt_paths)
- default_paths = ["/usr/local/lib", "/usr/pkg/lib", "/usr/lib"]
- default_paths << "/Tcl/lib" # default for ActiveTcl
-
- if (paths = opt_paths.compact).empty?
- paths = default_paths
- end
-
- if stubs
- func = "Tk_InitStubs"
- lib = "tkstub"
- else
- func = "Tk_Init"
- lib = "tk"
- end
-
- if version && ! version.empty?
- versions = [version]
- else
- versions = %w[8.7 8.6 8.5 8.4 8.3 8.2 8.1 8.0 4.2]
- end
-
- if tklib
- st = find_library(tklib, func, *paths)
- else
- st = versions.find { |ver|
- find_library("#{lib}#{ver}", func, *paths) or
- find_library("#{lib}#{ver.delete('.')}", func, *paths) or
- find_library("#{lib}#{ver}g", func, *paths) or
- find_library("#{lib}#{ver.delete('.')}g", func, *paths) or
- find_library("tk#{ver}", func, *paths) or
- find_library("tk#{ver.delete('.')}", func, *paths) or
- find_library("tk#{ver}g", func, *paths) or
- find_library("tk#{ver.delete('.')}g", func, *paths)
- } || (!version && find_library(lib, func, *paths))
- end
-
- unless st
- puts("Warning:: cannot find Tk library. tcltklib will not be compiled (tcltklib is disabled on your Ruby == Ruby/Tk will not work). Please check configure options.")
- end
- st
-end
-
-def find_tcltk_header(tclver, tkver)
- base_dir = ['/usr/local/include', '/usr/pkg/include', '/usr/include']
- base_dir << '/Tcl/include' # default for ActiveTcl
-
- unless have_tcl_h = have_header('tcl.h')
- if tclver && ! tclver.empty?
- versions = [tclver]
- else
- versions = %w[8.7 8.6 8.5 8.4 8.3 8.2 8.1 8.0 7.6]
- end
- paths = base_dir.dup
- versions.each{|ver| paths.concat(base_dir.map{|dir| dir + '/tcl' + ver})}
- have_tcl_h = find_header('tcl.h', *paths)
- end
-
- unless have_tk_h = have_header("tk.h")
- if tkver && ! tkver.empty?
- versions = [tkver]
- else
- versions = %w[8.7 8.6 8.5 8.4 8.3 8.2 8.1 8.0 4.2]
- end
- paths = base_dir.dup
- versions.each{|ver| paths.concat(base_dir.map{|dir| dir + '/tk' + ver})}
- have_tk_h = find_header('tk.h', *paths)
- end
-
- have_tcl_h && have_tk_h
-end
-
-def find_X11(*opt_paths)
- default_paths =
- [ "/usr/X11/lib", "/usr/lib/X11", "/usr/X11R6/lib", "/usr/openwin/lib" ]
- paths = opt_paths.compact.concat(default_paths)
- st = find_library("X11", "XOpenDisplay", *paths)
- unless st
- puts("Warning:: cannot find X11 library. tcltklib will not be compiled (tcltklib is disabled on your Ruby == Ruby/Tk will not work). Please check configure options. If your Tcl/Tk don't require X11, please try --without-X11.")
- end
- st
-end
-
-def pthread_check()
- tcl_major_ver = nil
- tcl_minor_ver = nil
-
- # Is tcl-thread given by user ?
- case enable_config("tcl-thread")
- when true
- tcl_enable_thread = true
- when false
- tcl_enable_thread = false
- else
- tcl_enable_thread = nil
- end
-
- if (tclConfig = with_config("tclConfig-file"))
- if tcl_enable_thread == true
- puts("Warning: --with-tclConfig-file option is ignored, because --enable-tcl-thread option is given.")
- elsif tcl_enable_thread == false
- puts("Warning: --with-tclConfig-file option is ignored, because --disable-tcl-thread option is given.")
- else
- # tcl-thread is unknown and tclConfig.sh is given
- begin
- tbl = parse_tclConfig(tclConfig)
- if tbl['TCL_THREADS']
- tcl_enable_thread = (tbl['TCL_THREADS'] == "1")
- else
- tcl_major_ver = tbl['TCL_MAJOR_VERSION'].to_i
- tcl_minor_ver = tbl['TCL_MINOR_VERSION'].to_i
- if tcl_major_ver < 8 || (tcl_major_ver == 8 && tcl_minor_ver == 0)
- tcl_enable_thread = false
- end
- end
-
- if tcl_enable_thread == nil
- # cannot find definition
- if tcl_major_ver
- puts("Warning: '#{tclConfig}' doesn't include TCL_THREADS definition.")
- else
- puts("Warning: '#{tclConfig}' may not be a tclConfig file.")
- end
- tclConfig = false
- end
- rescue Exception
- puts("Warning: fail to read '#{tclConfig}'!! --> ignore the file")
- tclConfig = false
- end
- end
- end
-
- if tcl_enable_thread == nil && !tclConfig
- # tcl-thread is unknown and tclConfig is unavailable
- begin
- try_run_available = try_run("int main() { exit(0); }")
- rescue Exception
- # cannot try_run. Is CROSS-COMPILE environment?
- puts(%Q'\
-*****************************************************************************
-**
-** PTHREAD SUPPORT CHECK WARNING:
-**
-** We cannot check the consistency of pthread support between Ruby
-** and the Tcl/Tk library in your environment (are you perhaps
-** cross-compiling?). If pthread support for these 2 packages is
-** inconsistent you may find you get errors when running Ruby/Tk
-** (e.g. hangs or segmentation faults). We strongly recommend
-** you to check the consistency manually.
-**
-*****************************************************************************
-')
- return true
- end
- end
-
- if tcl_enable_thread == nil
- # tcl-thread is unknown
- if try_run(<<EOF)
-#include <tcl.h>
-int main() {
- Tcl_Interp *ip;
- ip = Tcl_CreateInterp();
- exit((Tcl_Eval(ip, "set tcl_platform(threaded)") == TCL_OK)? 0: 1);
-}
-EOF
- tcl_enable_thread = true
- elsif try_run(<<EOF)
-#include <tcl.h>
-static Tcl_ThreadDataKey dataKey;
-int main() { exit((Tcl_GetThreadData(&dataKey, 1) == dataKey)? 1: 0); }
-EOF
- tcl_enable_thread = true
- else
- tcl_enable_thread = false
- end
- end
-
- # check pthread mode
- if (macro_defined?('HAVE_NATIVETHREAD', '#include "ruby.h"'))
- # ruby -> enable
- unless tcl_enable_thread
- # ruby -> enable && tcl -> disable
- puts(%Q'\
-*****************************************************************************
-**
-** PTHREAD SUPPORT MODE WARNING:
-**
-** Ruby is compiled with --enable-pthread, but your Tcl/Tk library
-** seems to be compiled without pthread support. Although you can
-** create the tcltklib library, this combination may cause errors
-** (e.g. hangs or segmentation faults). If you have no reason to
-** keep the current pthread support status, we recommend you reconfigure
-** and recompile the libraries so that both or neither support pthreads.
-**
-** If you want change the status of pthread support, please recompile
-** Ruby without "--enable-pthread" configure option or recompile Tcl/Tk
-** with "--enable-threads" configure option (if your Tcl/Tk is later
-** than or equal to Tcl/Tk 8.1).
-**
-*****************************************************************************
-')
- end
-
- # ruby -> enable && tcl -> enable/disable
- if tcl_enable_thread
- $CPPFLAGS += ' -DWITH_TCL_ENABLE_THREAD=1'
- else
- $CPPFLAGS += ' -DWITH_TCL_ENABLE_THREAD=0'
- end
-
- return true
-
- else
- # ruby -> disable
- if tcl_enable_thread
- # ruby -> disable && tcl -> enable
- puts(%Q'\
-*****************************************************************************
-**
-** PTHREAD SUPPORT MODE ERROR:
-**
-** Ruby is not compiled with --enable-pthread, but your Tcl/Tk
-** library seems to be compiled with pthread support. This
-** combination may cause frequent hang or segmentation fault
-** errors when Ruby/Tk is working. We recommend that you NEVER
-** create the library with such a combination of pthread support.
-**
-** Please recompile Ruby with the "--enable-pthread" configure option
-** or recompile Tcl/Tk with the "--disable-threads" configure option.
-**
-*****************************************************************************
-')
- $CPPFLAGS += ' -DWITH_TCL_ENABLE_THREAD=1'
- return false
- else
- # ruby -> disable && tcl -> disable
- $CPPFLAGS += ' -DWITH_TCL_ENABLE_THREAD=0'
- return true
- end
- end
-end
-
-tclver, tkver = check_tcltk_version(tcltk_version)
-
-if ( tcltk_framework ||
- ( find_tcltk_header(tclver, tkver) &&
- ( !use_X || find_X11(x11_ldir2, x11_ldir) ) &&
- find_tcl(tcllib, stubs, tclver, *tcl_ldir_list) &&
- find_tk(tklib, stubs, tkver, *tk_ldir_list) ) )
- $CPPFLAGS += ' -DUSE_TCL_STUBS -DUSE_TK_STUBS' if stubs
- $CPPFLAGS += ' -D_WIN32' if /cygwin/ =~ RUBY_PLATFORM
-
- if tcltk_framework
- if tcl_framework_header
- $CPPFLAGS += " -I#{tcl_framework_header}"
- else
- $CPPFLAGS += " -I#{tcltk_framework}/Tcl.framework/Headers"
- end
-
- if tk_framework_header
- $CPPFLAGS += " -I#{tk_framework_header}"
- else
- $CPPFLAGS += " -I#{tcltk_framework}/Tk.framework/Headers"
- end
-
- $LDFLAGS += ' -framework Tk -framework Tcl'
- end
-
- if stubs or pthread_check
- # create Makefile
-
- # for SUPPORT_STATUS
- $INSTALLFILES ||= []
- $INSTALLFILES << ["lib/tkextlib/SUPPORT_STATUS", "$(RUBYLIBDIR)", "lib"]
-
- have_func("rb_hash_lookup", "ruby.h")
-
- # create
- $defs << %[-DRUBY_VERSION=\\"#{RUBY_VERSION}\\"]
- $defs << %[-DRUBY_RELEASE_DATE=\\"#{RUBY_RELEASE_DATE}\\"]
- create_makefile("tcltklib")
- end
-end
diff --git a/ext/tk/sample/24hr_clock.rb b/ext/tk/sample/24hr_clock.rb
index 29f84e0b40..60d8072c57 100644
--- a/ext/tk/sample/24hr_clock.rb
+++ b/ext/tk/sample/24hr_clock.rb
@@ -19,7 +19,7 @@ class Clock
@mark_color = 'black'
@submark_color = 'gray50'
- @c = TkCanvas.new(:width=>2*@size, :height=>2*@size,
+ @c = TkCanvas.new(:width=>2*@size, :height=>2*@size,
:scrollregion=>[-@size, -@size, @size, @size]
).pack(:fill=>:both, :expand=>true)
@@ -59,26 +59,26 @@ class Clock
def _create_marks
@mark_tag = TkcTag.new(@c)
- TkcLine.new(@c, 0, -0.90*@size, 0, -0.85*@size,
- :tags=>[@tag, @mark_tag],
+ TkcLine.new(@c, 0, -0.90*@size, 0, -0.85*@size,
+ :tags=>[@tag, @mark_tag],
:width=>@mark_width, :fill=>@mark_color)
- TkcLine.new(@c, 0.90*@size, 0, 0.85*@size, 0,
- :tags=>[@tag, @mark_tag],
+ TkcLine.new(@c, 0.90*@size, 0, 0.85*@size, 0,
+ :tags=>[@tag, @mark_tag],
:width=>@mark_width, :fill=>@mark_color)
- TkcLine.new(@c, 0, 0.90*@size, 0, 0.85*@size,
- :tags=>[@tag, @mark_tag],
+ TkcLine.new(@c, 0, 0.90*@size, 0, 0.85*@size,
+ :tags=>[@tag, @mark_tag],
:width=>@mark_width, :fill=>@mark_color)
- TkcLine.new(@c, -0.90*@size, 0, -0.85*@size, 0,
- :tags=>[@tag, @mark_tag],
+ TkcLine.new(@c, -0.90*@size, 0, -0.85*@size, 0,
+ :tags=>[@tag, @mark_tag],
:width=>@mark_width, :fill=>@mark_color)
- TkcText.new(@c, [0, -0.92*@size], :text=>0,
+ TkcText.new(@c, [0, -0.92*@size], :text=>0,
:anchor=>'s', :fill=>@mark_color)
- TkcText.new(@c, [0.92*@size, 0], :text=>@clock.div(4),
+ TkcText.new(@c, [0.92*@size, 0], :text=>@clock.div(4),
:anchor=>'w', :fill=>@mark_color)
- TkcText.new(@c, [0, 0.92*@size], :text=>@clock.div(2),
+ TkcText.new(@c, [0, 0.92*@size], :text=>@clock.div(2),
:anchor=>'n', :fill=>@mark_color)
- TkcText.new(@c, [-0.92*@size, 0], :text=>@clock.div(4)*3,
+ TkcText.new(@c, [-0.92*@size, 0], :text=>@clock.div(4)*3,
:anchor=>'e', :fill=>@mark_color)
[30.0, 60.0].each{|angle|
@@ -92,17 +92,17 @@ class Clock
x2 = 0.85*x_base
y2 = 0.85*y_base
- TkcLine.new(@c, x1, y1, x2, y2,
- :tags=>[@tag, @mark_tag],
+ TkcLine.new(@c, x1, y1, x2, y2,
+ :tags=>[@tag, @mark_tag],
:width=>@mark_width, :fill=>@mark_color)
- TkcLine.new(@c, x1, -y1, x2, -y2,
- :tags=>[@tag, @mark_tag],
+ TkcLine.new(@c, x1, -y1, x2, -y2,
+ :tags=>[@tag, @mark_tag],
:width=>@mark_width, :fill=>@mark_color)
- TkcLine.new(@c, -x1, y1, -x2, y2,
- :tags=>[@tag, @mark_tag],
+ TkcLine.new(@c, -x1, y1, -x2, y2,
+ :tags=>[@tag, @mark_tag],
:width=>@mark_width, :fill=>@mark_color)
- TkcLine.new(@c, -x1, -y1, -x2, -y2,
- :tags=>[@tag, @mark_tag],
+ TkcLine.new(@c, -x1, -y1, -x2, -y2,
+ :tags=>[@tag, @mark_tag],
:width=>@mark_width, :fill=>@mark_color)
x3 = 0.92*x_base
@@ -114,13 +114,13 @@ class Clock
dh = angle.to_i/30
end
- TkcText.new(@c, x3, -y3, :text=>dh,
+ TkcText.new(@c, x3, -y3, :text=>dh,
:anchor=>'sw', :fill=>@mark_color)
- TkcText.new(@c, x3, y3, :text=>@clock.div(2)-dh,
+ TkcText.new(@c, x3, y3, :text=>@clock.div(2)-dh,
:anchor=>'nw', :fill=>@mark_color)
- TkcText.new(@c, -x3, y3, :text=>@clock.div(2)+dh,
+ TkcText.new(@c, -x3, y3, :text=>@clock.div(2)+dh,
:anchor=>'ne', :fill=>@mark_color)
- TkcText.new(@c, -x3, -y3, :text=>@clock-dh,
+ TkcText.new(@c, -x3, -y3, :text=>@clock-dh,
:anchor=>'se', :fill=>@mark_color)
}
@@ -136,17 +136,17 @@ class Clock
x2 = 0.875*x_base
y2 = 0.875*y_base
- TkcLine.new(@c, x1, y1, x2, y2,
- :tags=>[@tag, @mark_tag],
+ TkcLine.new(@c, x1, y1, x2, y2,
+ :tags=>[@tag, @mark_tag],
:width=>@mark_width, :fill=>@submark_color)
- TkcLine.new(@c, x1, -y1, x2, -y2,
- :tags=>[@tag, @mark_tag],
+ TkcLine.new(@c, x1, -y1, x2, -y2,
+ :tags=>[@tag, @mark_tag],
:width=>@mark_width, :fill=>@submark_color)
- TkcLine.new(@c, -x1, y1, -x2, y2,
- :tags=>[@tag, @mark_tag],
+ TkcLine.new(@c, -x1, y1, -x2, y2,
+ :tags=>[@tag, @mark_tag],
:width=>@mark_width, :fill=>@submark_color)
- TkcLine.new(@c, -x1, -y1, -x2, -y2,
- :tags=>[@tag, @mark_tag],
+ TkcLine.new(@c, -x1, -y1, -x2, -y2,
+ :tags=>[@tag, @mark_tag],
:width=>@mark_width, :fill=>@submark_color)
}
end
@@ -162,48 +162,48 @@ class Clock
second_hand_width = 1 # 0.4*@cdot_size
@hour_hand_coords = [
- [0, -0.5*@cdot_size],
- [hour_hand_width, -0.5*@cdot_size-hour_hand_width],
- [hour_hand_width, -hour_hand_len+hour_hand_width],
- [0, -hour_hand_len],
- [-hour_hand_width, -hour_hand_len+hour_hand_width],
- [-hour_hand_width, -0.5*@cdot_size-hour_hand_width],
+ [0, -0.5*@cdot_size],
+ [hour_hand_width, -0.5*@cdot_size-hour_hand_width],
+ [hour_hand_width, -hour_hand_len+hour_hand_width],
+ [0, -hour_hand_len],
+ [-hour_hand_width, -hour_hand_len+hour_hand_width],
+ [-hour_hand_width, -0.5*@cdot_size-hour_hand_width],
]
@minute_hand_coords = [
- [0, -0.5*@cdot_size],
- [minute_hand_width, -0.5*@cdot_size - minute_hand_width],
- [minute_hand_width, -minute_hand_len+minute_hand_width],
- [0, -minute_hand_len],
- [-minute_hand_width, -minute_hand_len+minute_hand_width],
- [-minute_hand_width, -0.5*@cdot_size-minute_hand_width],
+ [0, -0.5*@cdot_size],
+ [minute_hand_width, -0.5*@cdot_size - minute_hand_width],
+ [minute_hand_width, -minute_hand_len+minute_hand_width],
+ [0, -minute_hand_len],
+ [-minute_hand_width, -minute_hand_len+minute_hand_width],
+ [-minute_hand_width, -0.5*@cdot_size-minute_hand_width],
]
@second_hand_coords = [
- [0, -0.5*@cdot_size],
- [second_hand_width, -0.5*@cdot_size - second_hand_width],
- [second_hand_width, -second_hand_len+second_hand_width],
- [0, -second_hand_len],
- [-second_hand_width, -second_hand_len+second_hand_width],
- [-second_hand_width, -0.5*@cdot_size-second_hand_width],
+ [0, -0.5*@cdot_size],
+ [second_hand_width, -0.5*@cdot_size - second_hand_width],
+ [second_hand_width, -second_hand_len+second_hand_width],
+ [0, -second_hand_len],
+ [-second_hand_width, -second_hand_len+second_hand_width],
+ [-second_hand_width, -0.5*@cdot_size-second_hand_width],
]
- @hour_hand = TkcPolygon.new(@c, @hour_hand_coords,
- :tags=>[@tag, @hand_tag],
- :outline=>@hour_hand_color,
+ @hour_hand = TkcPolygon.new(@c, @hour_hand_coords,
+ :tags=>[@tag, @hand_tag],
+ :outline=>@hour_hand_color,
:fill=>@hour_hand_color)
- @minute_hand = TkcPolygon.new(@c, @minute_hand_coords,
- :tags=>[@tag, @hand_tag],
- :outline=>@minute_hand_color,
+ @minute_hand = TkcPolygon.new(@c, @minute_hand_coords,
+ :tags=>[@tag, @hand_tag],
+ :outline=>@minute_hand_color,
:fill=>@minute_hand_color)
- @second_hand = TkcPolygon.new(@c, @second_hand_coords,
- :tags=>[@tag, @hand_tag],
- :outline=>@second_hand_color,
+ @second_hand = TkcPolygon.new(@c, @second_hand_coords,
+ :tags=>[@tag, @hand_tag],
+ :outline=>@second_hand_color,
:fill=>@second_hand_color)
- @center_dot = TkcOval.new(@c,
- [-@cdot_size, -@cdot_size],
- [@cdot_size, @cdot_size],
+ @center_dot = TkcOval.new(@c,
+ [-@cdot_size, -@cdot_size],
+ [@cdot_size, @cdot_size],
:outline=>@cdot_color, :fill=>@cdot_color)
end
private :_create_hands
@@ -269,8 +269,8 @@ class Clock
extent = -span/2.0
end
- pie = TkcArc.new(@c, @circle_coords, :tags=>[@tag],
- :outline=>'black', 'fill'=>color,
+ pie = TkcArc.new(@c, @circle_coords, :tags=>[@tag],
+ :outline=>'black', 'fill'=>color,
:start=>start, :extent=>extent)
_raise_hands
_raise_marks
diff --git a/ext/tk/sample/binding_sample.rb b/ext/tk/sample/binding_sample.rb
index 3c2eb5e1cb..693cc7de2f 100644
--- a/ext/tk/sample/binding_sample.rb
+++ b/ext/tk/sample/binding_sample.rb
@@ -43,7 +43,7 @@ class Button_clone < TkLabel
def invoke
if @command
- @command.call
+ @command.call
else
''
end
@@ -53,7 +53,7 @@ end
TkLabel.new(:text=><<EOT).pack
This is a sample of 'event binding'.
The first button is a normal button widget.
-And the second one is a normal label widget
+And the second one is a normal label widget
but with some bindings like a button widget.
EOT
@@ -66,7 +66,7 @@ TkFrame.new{|f|
TkLabel.new(f, :textvariable=>v).pack(:side=>:left)
}.pack
-TkButton.new(:text=>'normal Button widget',
+TkButton.new(:text=>'normal Button widget',
:command=>proc{
puts 'button is clicked!!'
lbl.text 'button is clicked!!'
@@ -75,7 +75,7 @@ TkButton.new(:text=>'normal Button widget',
pack(:fill=>:x, :expand=>true)
}
-Button_clone.new(:text=>'Label with Button binding',
+Button_clone.new(:text=>'Label with Button binding',
:command=>proc{
puts 'label is clicked!!'
lbl.text 'label is clicked!!'
diff --git a/ext/tk/sample/bindtag_sample.rb b/ext/tk/sample/bindtag_sample.rb
index b13364bb68..8c93b4a260 100644
--- a/ext/tk/sample/bindtag_sample.rb
+++ b/ext/tk/sample/bindtag_sample.rb
@@ -2,18 +2,18 @@
require 'tk'
TkLabel.new(:text=><<EOT, :justify=>:left).pack
-This is a sample of bindtags and usage of
-Tk.callback_break/Tk.callback_continue.
-Please check the work of following buttons
-(attend the difference between before/after
- pressing the bottom button), and see the
+This is a sample of bindtags and usage of
+Tk.callback_break/Tk.callback_continue.
+Please check the work of following buttons
+(attend the difference between before/after
+ pressing the bottom button), and see the
source code.
EOT
def set_class_bind
- TkButton.bind('ButtonPress-1',
+ TkButton.bind('ButtonPress-1',
proc{puts 'bind "ButtonPress-1" of TkButton class'})
- TkButton.bind('ButtonRelease-1',
+ TkButton.bind('ButtonRelease-1',
proc{puts 'bind "ButtonRelease-1" of TkButton class'})
end
@@ -23,21 +23,21 @@ r.bind('ButtonPress-1', proc{puts 'bind "ButtonPress-1" of root widget'})
r.bind('ButtonRelease-1', proc{puts 'bind "ButtonRelease-1" of root widget'})
# set 'all' binding
-TkBindTag::ALL.bind('ButtonPress-1',
+TkBindTag::ALL.bind('ButtonPress-1',
proc{puts 'bind "ButtonPress-1" of the tag "all"'})
-TkBindTag::ALL.bind('ButtonRelease-1',
+TkBindTag::ALL.bind('ButtonRelease-1',
proc{puts 'bind "ButtonRelease-1" of the tag "all"'})
# create buttons
-b1 = TkButton.new(:text=>'button-1',
+b1 = TkButton.new(:text=>'button-1',
:command=>proc{puts "command of button-1"}).pack
-b2 = TkButton.new(:text=>'button-2',
+b2 = TkButton.new(:text=>'button-2',
:command=>proc{puts "command of button-2"}).pack
-b3 = TkButton.new(:text=>'button-3',
+b3 = TkButton.new(:text=>'button-3',
:command=>proc{puts "command of button-3"}).pack
-b4 = TkButton.new(:text=>'button-4',
+b4 = TkButton.new(:text=>'button-4',
:command=>proc{puts "command of button-4"}).pack
-b5 = TkButton.new(:text=>'button-5',
+b5 = TkButton.new(:text=>'button-5',
:command=>proc{puts "command of button-5"}).pack
# set button binding
@@ -62,14 +62,14 @@ tag1.bind('ButtonPress-1', proc{puts 'bind "ButtonPress-1" of tag1'})
tag1.bind('ButtonRelease-1', proc{puts 'bind "ButtonRelease-1" of tag1'})
tag2 = TkBindTag.new
-tag2.bind('ButtonPress-1',
+tag2.bind('ButtonPress-1',
proc{
puts 'bind "ButtonPress-1" of tag2'
puts 'call Tk.callback_continue'
Tk.callback_continue
puts 'never see this message'
})
-tag2.bind('ButtonRelease-1',
+tag2.bind('ButtonRelease-1',
proc{
puts 'bind "ButtonRelease-1" of tag2'
puts 'call Tk.callback_continue'
@@ -78,14 +78,14 @@ tag2.bind('ButtonRelease-1',
})
tag3 = TkBindTag.new
-tag3.bind('ButtonPress-1',
+tag3.bind('ButtonPress-1',
proc{
puts 'bind "ButtonPress-1" of tag3'
puts 'call Tk.callback_break'
Tk.callback_break
puts 'never see this message'
})
-tag3.bind('ButtonRelease-1',
+tag3.bind('ButtonRelease-1',
proc{
puts 'bind "ButtonRelease-1" of tag3'
puts 'call Tk.callback_break'
@@ -117,7 +117,7 @@ p b4.bindtags
b5.bindtags([tag1, TkButton, tag2, b5])
# create button to set button class binding
-TkButton.new(:text=>'set binding to TkButton class',
+TkButton.new(:text=>'set binding to TkButton class',
:command=>proc{
puts 'call "set_class_bind"'
set_class_bind
diff --git a/ext/tk/sample/binstr_usage.rb b/ext/tk/sample/binstr_usage.rb
index fa81f98b5e..be8399ba51 100644
--- a/ext/tk/sample/binstr_usage.rb
+++ b/ext/tk/sample/binstr_usage.rb
@@ -13,7 +13,7 @@ However, when treats a binary sequence, the convert process makes troubles.
Tk::BinaryString class (subclass of Tk::EncodedString class) is the class \
to avoid such troubles. Please see the source code of this sample. \
-A Tk::BinaryString instance is used to create the image for the center button.
+A Tk::BinaryString instance is used to create the image for the center button.
EOM
ImgFile=[File.dirname(__FILE__), 'images','tcllogo.gif'].join(File::Separator)
diff --git a/ext/tk/sample/cd_timer.rb b/ext/tk/sample/cd_timer.rb
index e2611fbf23..9154e89bfe 100644
--- a/ext/tk/sample/cd_timer.rb
+++ b/ext/tk/sample/cd_timer.rb
@@ -7,23 +7,23 @@
require 'tk'
if ARGV.empty?
- $stderr.puts 'Error:: No time arguments for counting down'
+ $stderr.puts 'Error:: No time arguments for counting down'
exit(1)
end
width = 10
-TkButton.new(:text=>'exit',
+TkButton.new(:text=>'exit',
:command=>proc{exit}).pack(:side=>:bottom, :fill=>:x)
b = TkButton.new(:text=>'start').pack(:side=>:top, :fill=>:x)
f = TkFrame.new(:relief=>:ridge, :borderwidth=>2).pack(:fill=>:x)
-TkLabel.new(f, :relief=>:flat, :pady=>3,
- :background=>'black', :foreground=>'white',
+TkLabel.new(f, :relief=>:flat, :pady=>3,
+ :background=>'black', :foreground=>'white',
:text=>' elapsed: ').pack(:fill=>:x, :side=>:left, :expand=>true)
-now = TkLabel.new(f, :width=>width, :relief=>:flat, :pady=>3, :anchor=>:w,
- :background=>'black', :foreground=>'white',
+now = TkLabel.new(f, :width=>width, :relief=>:flat, :pady=>3, :anchor=>:w,
+ :background=>'black', :foreground=>'white',
:text=>'%4d:%02d.00' % [0, 0]).pack(:side=>:right)
timers = [ TkRTTimer.new(10){|tm|
@@ -41,9 +41,9 @@ timers = [ TkRTTimer.new(10){|tm|
ARGV.collect{|arg| (Float(arg) * 60).to_i}.sort.each_with_index{|time, idx|
f = TkFrame.new(:relief=>:ridge, :borderwidth=>2).pack(:fill=>:x)
- TkLabel.new(f, :relief=>:flat, :pady=>3,
+ TkLabel.new(f, :relief=>:flat, :pady=>3,
:text=>' %4d:%02d --> ' % (time.divmod(60))).pack(:side=>:left)
- l = TkLabel.new(f, :width=>width, :relief=>:flat, :pady=>3, :anchor=>:w,
+ l = TkLabel.new(f, :width=>width, :relief=>:flat, :pady=>3, :anchor=>:w,
:text=>'%4d:%02d' % (time.divmod(60))).pack(:side=>:right)
timers << TkRTTimer.new(1000){|tm|
t = (tm.return_value || time) - 1
diff --git a/ext/tk/sample/cmd_res_test.rb b/ext/tk/sample/cmd_res_test.rb
index 8df2e61af7..6e954f26ee 100644
--- a/ext/tk/sample/cmd_res_test.rb
+++ b/ext/tk/sample/cmd_res_test.rb
@@ -1,5 +1,5 @@
require 'tk'
-TkOptionDB.readfile(File.expand_path('cmd_resource',
+TkOptionDB.readfile(File.expand_path('cmd_resource',
File.dirname(__FILE__)))
f = TkFrame.new(:class=>'BtnFrame').pack
b = TkButton.new(:parent=>f, :widgetname=>'hello').pack
diff --git a/ext/tk/sample/demos-en/anilabel.rb b/ext/tk/sample/demos-en/anilabel.rb
index ebd84accd2..0b9bc7357e 100644
--- a/ext/tk/sample/demos-en/anilabel.rb
+++ b/ext/tk/sample/demos-en/anilabel.rb
@@ -4,7 +4,7 @@
# based on Tcl/Tk8.5a2 widget demos
if defined?($anilabel_demo) && $anilabel_demo
- $anilabel_demo.destroy
+ $anilabel_demo.destroy
$anilabel_demo = nil
end
@@ -47,7 +47,7 @@ TkFrame.new(base_frame) {|frame|
# create frame for label demo
f_left = TkLabelFrame.new(base_frame, :text=>'Scrolling Texts')
f_right = TkLabelFrame.new(base_frame, :text=>'GIF Image')
-Tk.pack(f_left, f_right, 'side'=>'left', 'expand'=>'yes', 'fill'=>'both',
+Tk.pack(f_left, f_right, 'side'=>'left', 'expand'=>'yes', 'fill'=>'both',
'padx'=>10, 'pady'=>10)
# animated label
@@ -85,7 +85,7 @@ class AnimatedImageLabel < AnimatedTextLabel
@btag.bind_append('Destroy'){
if @destroy_image
begin
- self.image.delete
+ self.image.delete
rescue
end
end
@@ -121,13 +121,13 @@ class AnimatedImageLabel < AnimatedTextLabel
end
# create labels
-l1 = AnimatedTextLabel.new(f_left, :borderwidth=>4, :relief=>:ridge,
+l1 = AnimatedTextLabel.new(f_left, :borderwidth=>4, :relief=>:ridge,
:font=>{:family=>'Courier', :size=>10})
-l2 = AnimatedTextLabel.new(f_left, :borderwidth=>4, :relief=>:groove,
+l2 = AnimatedTextLabel.new(f_left, :borderwidth=>4, :relief=>:groove,
:font=>{:family=>'Courier', :size=>10})
-l3 = AnimatedTextLabel.new(f_left, :borderwidth=>4, :relief=>:flat,
+l3 = AnimatedTextLabel.new(f_left, :borderwidth=>4, :relief=>:flat,
:font=>{:family=>'Courier', :size=>10}, :width=>18)
-Tk.pack(l1, l2, l3,
+Tk.pack(l1, l2, l3,
:side=>:top, :expand=>true, :anchor=>:w, :padx=>10, :pady=>10)
limg = AnimatedImageLabel.new(f_right, :borderwidth=>0)
diff --git a/ext/tk/sample/demos-en/aniwave.rb b/ext/tk/sample/demos-en/aniwave.rb
index 57d58193f6..63a04a7b98 100644
--- a/ext/tk/sample/demos-en/aniwave.rb
+++ b/ext/tk/sample/demos-en/aniwave.rb
@@ -5,7 +5,7 @@
# destroy toplevel widget for this demo script
if defined?($aniwave_demo) && $aniwave_demo
- $aniwave_demo.destroy
+ $aniwave_demo.destroy
$aniwave_demo = nil
end
@@ -51,11 +51,11 @@ class AnimatedWaveDemo
@direction = dir
# create canvas widget
- @c = TkCanvas.new(frame, :width=>300, :height=>200,
+ @c = TkCanvas.new(frame, :width=>300, :height=>200,
:background=>'black')
@c.pack(:padx=>10, :pady=>10, :expand=>true)
- # Creates a coordinates list of a wave.
+ # Creates a coordinates list of a wave.
@waveCoords = []
@backupCoords = []
n = 0
@@ -67,10 +67,10 @@ class AnimatedWaveDemo
# Create a smoothed line and arrange for its coordinates to be the
# contents of the variable waveCoords.
- @line = TkcLine.new(@c, @waveCoords,
+ @line = TkcLine.new(@c, @waveCoords,
:width=>1, :fill=>'green', :smooth=>true)
- # Main animation "loop".
+ # Main animation "loop".
# Theoretically 100 frames-per-second (==10ms between frames)
@timer = TkTimer.new(10){ basicMotion; reverser }
diff --git a/ext/tk/sample/demos-en/arrow.rb b/ext/tk/sample/demos-en/arrow.rb
index 452153d010..055cd2af3c 100644
--- a/ext/tk/sample/demos-en/arrow.rb
+++ b/ext/tk/sample/demos-en/arrow.rb
@@ -28,65 +28,65 @@ def arrowSetup(c)
# Create the arrow and outline.
c.delete('all')
- TkcLine.new(c, v.x1, v.y, v.x2, v.y,
- { 'width'=>10 * v.width,
- 'arrowshape'=>[10*v.a, 10*v.b, 10*v.c],
- 'arrow'=>'last'
+ TkcLine.new(c, v.x1, v.y, v.x2, v.y,
+ { 'width'=>10 * v.width,
+ 'arrowshape'=>[10*v.a, 10*v.b, 10*v.c],
+ 'arrow'=>'last'
}.update(v.bigLineStyle) )
xtip = v.x2 - 10*v.b
deltaY = 10*v.c + 5*v.width
- TkcLine.new(c, v.x2, v.y, xtip, v.y + deltaY,
- v.x2 - 10*v.a, v.y, xtip, v.y - deltaY, v.x2, v.y,
+ TkcLine.new(c, v.x2, v.y, xtip, v.y + deltaY,
+ v.x2 - 10*v.a, v.y, xtip, v.y - deltaY, v.x2, v.y,
'width'=>2, 'capstyle'=>'round', 'joinstyle'=>'round')
# Create the boxes for reshaping the line and arrowhead.
- TkcRectangle.new(c, v.x2-10*v.a-5, v.y-5, v.x2-10*v.a+5, v.y+5,
+ TkcRectangle.new(c, v.x2-10*v.a-5, v.y-5, v.x2-10*v.a+5, v.y+5,
{'tags'=>['box1', $arrowTag_box]}.update(v.boxStyle) )
- TkcRectangle.new(c, xtip-5, v.y-deltaY-5, xtip+5, v.y-deltaY+5,
+ TkcRectangle.new(c, xtip-5, v.y-deltaY-5, xtip+5, v.y-deltaY+5,
{'tags'=>['box2', $arrowTag_box]}.update(v.boxStyle) )
- TkcRectangle.new(c, v.x1-5, v.y-5*v.width-5, v.x1+5, v.y-5*v.width+5,
+ TkcRectangle.new(c, v.x1-5, v.y-5*v.width-5, v.x1+5, v.y-5*v.width+5,
{'tags'=>['box3', $arrowTag_box]}.update(v.boxStyle) )
c.itemconfigure cur, v.activeStyle if cur
# Create three arrows in actual size with the same parameters
TkcLine.new(c, v.x2+50, 0, v.x2+50, 1000, 'width'=>2)
tmp = v.x2+100
- TkcLine.new(c, tmp, v.y-125, tmp, v.y-75, 'width'=>v.width,
+ TkcLine.new(c, tmp, v.y-125, tmp, v.y-75, 'width'=>v.width,
'arrow'=>'both', 'arrowshape'=>[v.a, v.b, v.c])
- TkcLine.new(c, tmp-25, v.y, tmp+25, v.y, 'width'=>v.width,
+ TkcLine.new(c, tmp-25, v.y, tmp+25, v.y, 'width'=>v.width,
'arrow'=>'both', 'arrowshape'=>[v.a, v.b, v.c])
- TkcLine.new(c, tmp-25, v.y+75, tmp+25, v.y+125, 'width'=>v.width,
+ TkcLine.new(c, tmp-25, v.y+75, tmp+25, v.y+125, 'width'=>v.width,
'arrow'=>'both', 'arrowshape'=>[v.a, v.b, v.c])
- # Create a bunch of other arrows and text items showing the
+ # Create a bunch of other arrows and text items showing the
# current dimensions.
tmp = v.x2+10
- TkcLine.new(c, tmp, v.y-5*v.width, tmp, v.y-deltaY,
+ TkcLine.new(c, tmp, v.y-5*v.width, tmp, v.y-deltaY,
'arrow'=>'both', 'arrowshape'=>v.smallTips)
TkcText.new(c, v.x2+15, v.y-deltaY+5*v.c, 'text'=>v.c, 'anchor'=>'w')
tmp = v.x1-10
- TkcLine.new(c, tmp, v.y-5*v.width, tmp, v.y+5*v.width,
+ TkcLine.new(c, tmp, v.y-5*v.width, tmp, v.y+5*v.width,
'arrow'=>'both', 'arrowshape'=>v.smallTips)
TkcText.new(c, v.x1-15, v.y, 'text'=>v.width, 'anchor'=>'e')
tmp = v.y+5*v.width+10*v.c+10
- TkcLine.new(c, v.x2-10*v.a, tmp, v.x2, tmp,
+ TkcLine.new(c, v.x2-10*v.a, tmp, v.x2, tmp,
'arrow'=>'both', 'arrowshape'=>v.smallTips)
TkcText.new(c, v.x2-5*v.a, tmp+5, 'text'=>v.a, 'anchor'=>'n')
tmp = tmp+25
- TkcLine.new(c, v.x2-10*v.b, tmp, v.x2, tmp,
+ TkcLine.new(c, v.x2-10*v.b, tmp, v.x2, tmp,
'arrow'=>'both', 'arrowshape'=>v.smallTips)
TkcText.new(c, v.x2-5*v.b, tmp+5, 'text'=>v.b, 'anchor'=>'n')
if $tk_version =~ /^4.*/
- TkcText.new(c, v.x1, 310, 'text'=>"'width'=>#{v.width}", 'anchor'=>'w',
+ TkcText.new(c, v.x1, 310, 'text'=>"'width'=>#{v.width}", 'anchor'=>'w',
'font'=>'-*-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*')
- TkcText.new(c, v.x1, 330,
+ TkcText.new(c, v.x1, 330,
'text'=>"'arrowshape'=>[#{v.a}, #{v.b}, #{v.c}]",'anchor'=>'w',
'font'=>'-*-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*')
else
- TkcText.new(c, v.x1, 310, 'text'=>"'width'=>#{v.width}", 'anchor'=>'w',
+ TkcText.new(c, v.x1, 310, 'text'=>"'width'=>#{v.width}", 'anchor'=>'w',
'font'=>'Helvetica 18')
- TkcText.new(c, v.x1, 330,
+ TkcText.new(c, v.x1, 330,
'text'=>"'arrowshape'=>[#{v.a}, #{v.b}, #{v.c}]",
'anchor'=>'w', 'font'=>'Helvetica 18')
end
@@ -96,7 +96,7 @@ end
# toplevel widget
if defined?($arrow_demo) && $arrow_demo
- $arrow_demo.destroy
+ $arrow_demo.destroy
$arrow_demo = nil
end
@@ -110,7 +110,7 @@ $arrow_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($arrow_demo).pack(:fill=>:both, :expand=>true)
# label
-TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'5i', 'justify'=>'left',
+TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'5i', 'justify'=>'left',
'text'=>"This widget allows you to experiment with different widths and arrowhead shapes for lines in canvases. To change the line width or the shape of the arrowhead, drag any of the three boxes attached to the oversized arrow. The arrows on the right give examples at normal scale. The text at the bottom shows the configuration options as you'd enter them for a canvas line item."){
pack('side'=>'top')
}
@@ -133,15 +133,15 @@ $arrow_buttons = TkFrame.new(base_frame) {|frame|
}
$arrow_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-# canvas
-$arrow_canvas = TkCanvas.new(base_frame, 'width'=>500, 'height'=>350,
+# canvas
+$arrow_canvas = TkCanvas.new(base_frame, 'width'=>500, 'height'=>350,
'relief'=>'sunken', 'borderwidth'=>2)
$arrow_canvas.pack('expand'=>'yes', 'fill'=>'both')
-#
+#
unless Struct.const_defined?("ArrowInfo")
- $demo_arrowInfo = Struct.new("ArrowInfo", :a, :b, :c, :width, :motionProc,
- :x1, :x2, :y, :smallTips, :count,
+ $demo_arrowInfo = Struct.new("ArrowInfo", :a, :b, :c, :width, :motionProc,
+ :x1, :x2, :y, :smallTips, :count,
:bigLineStyle, :boxStyle, :activeStyle).new
end
$demo_arrowInfo.a = 8
@@ -159,7 +159,7 @@ if TkWinfo.depth($arrow_canvas) > 1
$demo_arrowInfo.boxStyle = {'fill'=>'', 'outline'=>'black', 'width'=>1}
$demo_arrowInfo.activeStyle = {'fill'=>'red', 'outline'=>'black', 'width'=>1}
else
- $demo_arrowInfo.bigLineStyle = {'fill'=>'black',
+ $demo_arrowInfo.bigLineStyle = {'fill'=>'black',
'stipple'=>'@'+[$demo_dir,'..','images','grey.25'].join(File::Separator)}
$demo_arrowInfo.boxStyle = {'fill'=>'', 'outline'=>'black', 'width'=>1}
$demo_arrowInfo.activeStyle = {'fill'=>'black','outline'=>'black','width'=>1}
@@ -170,16 +170,16 @@ $arrowTag_box.bind('Enter', proc{$arrow_canvas.itemconfigure('current', $demo_ar
$arrowTag_box.bind('Leave', proc{$arrow_canvas.itemconfigure('current', $demo_arrowInfo.boxStyle)})
$arrowTag_box.bind('B1-Enter', proc{})
$arrowTag_box.bind('B1-Leave', proc{})
-$arrow_canvas.itembind('box1', '1',
+$arrow_canvas.itembind('box1', '1',
proc{$demo_arrowInfo.motionProc \
= proc{|x,y| arrowMove1 $arrow_canvas, x, y}})
-$arrow_canvas.itembind('box2', '1',
+$arrow_canvas.itembind('box2', '1',
proc{$demo_arrowInfo.motionProc \
= proc{|x,y| arrowMove2 $arrow_canvas, x, y}})
-$arrow_canvas.itembind('box3', '1',
+$arrow_canvas.itembind('box3', '1',
proc{$demo_arrowInfo.motionProc \
= proc{|x,y| arrowMove3 $arrow_canvas, x, y}})
-$arrowTag_box.bind('B1-Motion',
+$arrowTag_box.bind('B1-Motion',
proc{|x,y| $demo_arrowInfo.motionProc.call(x,y)}, "%x %y")
$arrow_canvas.bind('Any-ButtonRelease-1', proc{arrowSetup $arrow_canvas})
diff --git a/ext/tk/sample/demos-en/bind.rb b/ext/tk/sample/demos-en/bind.rb
index c291e4730a..665592a2bc 100644
--- a/ext/tk/sample/demos-en/bind.rb
+++ b/ext/tk/sample/demos-en/bind.rb
@@ -8,7 +8,7 @@
# toplevel widget
if defined?($bind_demo) && $bind_demo
- $bind_demo.destroy
+ $bind_demo.destroy
$bind_demo = nil
end
@@ -38,15 +38,15 @@ TkFrame.new(base_frame) {|frame|
}.pack('side'=>'left', 'expand'=>'yes')
}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-# bind
+# bind
def tag_binding_for_bind_demo(tag, enter_style, leave_style)
tag.bind('Any-Enter', proc{tag.configure enter_style})
tag.bind('Any-Leave', proc{tag.configure leave_style})
end
-# text
+# text
txt = TkText.new(base_frame){|t|
- #
+ #
setgrid 'true'
#width 60
#height 24
@@ -59,9 +59,9 @@ txt = TkText.new(base_frame){|t|
}
pack('expand'=>'yes', 'fill'=>'both')
- #
+ #
if TkWinfo.depth($root).to_i > 1
- tagstyle_bold = {'background'=>'#43ce80', 'relief'=>'raised',
+ tagstyle_bold = {'background'=>'#43ce80', 'relief'=>'raised',
'borderwidth'=>1}
tagstyle_normal = {'background'=>'', 'relief'=>'flat'}
else
@@ -77,44 +77,44 @@ txt = TkText.new(base_frame){|t|
insert('end', "\n\n")
insert('end', '2. A simple two-dimensional plot that allows you to adjust the positions of the data points.', (d2 = TkTextTag.new(t)) )
insert('end', "\n\n")
- insert('end', '3. Anchoring and justification modes for text items.',
+ insert('end', '3. Anchoring and justification modes for text items.',
(d3 = TkTextTag.new(t)) )
insert('end', "\n\n")
- insert('end', '4. An editor for arrow-head shapes for line items.',
+ insert('end', '4. An editor for arrow-head shapes for line items.',
(d4 = TkTextTag.new(t)) )
insert('end', "\n\n")
- insert('end', '5. A ruler with facilities for editing tab stops.',
+ insert('end', '5. A ruler with facilities for editing tab stops.',
(d5 = TkTextTag.new(t)) )
insert('end', "\n\n")
- insert('end',
- '6. A grid that demonstrates how canvases can be scrolled.',
+ insert('end',
+ '6. A grid that demonstrates how canvases can be scrolled.',
(d6 = TkTextTag.new(t)) )
# binding
[d1, d2, d3, d4, d5, d6].each{|tag|
tag_binding_for_bind_demo(tag, tagstyle_bold, tagstyle_normal)
}
- d1.bind('1',
+ d1.bind('1',
proc{
eval_samplecode(`cat #{[$demo_dir,'items.rb'].join(File::Separator)}`, 'items.rb')
})
- d2.bind('1',
+ d2.bind('1',
proc{
eval_samplecode(`cat #{[$demo_dir,'plot.rb'].join(File::Separator)}`, 'plot.rb')
})
- d3.bind('1',
+ d3.bind('1',
proc{
eval_samplecode(`cat #{[$demo_dir,'ctext.rb'].join(File::Separator)}`, 'ctext.rb')
})
- d4.bind('1',
+ d4.bind('1',
proc{
eval_samplecode(`cat #{[$demo_dir,'arrow.rb'].join(File::Separator)}`, 'arrow.rb')
})
- d5.bind('1',
+ d5.bind('1',
proc{
eval_samplecode(`cat #{[$demo_dir,'ruler.rb'].join(File::Separator)}`, 'ruler.rb')
})
- d6.bind('1',
+ d6.bind('1',
proc{
eval_samplecode(`cat #{[$demo_dir,'cscroll.rb'].join(File::Separator)}`, 'cscroll.rb')
})
diff --git a/ext/tk/sample/demos-en/bitmap.rb b/ext/tk/sample/demos-en/bitmap.rb
index 858d067d0d..133adb0543 100644
--- a/ext/tk/sample/demos-en/bitmap.rb
+++ b/ext/tk/sample/demos-en/bitmap.rb
@@ -17,7 +17,7 @@
def bitmapRow(w,*args)
TkFrame.new(w){|row|
pack('side'=>'top', 'fill'=>'both')
- for bitmap in args
+ for bitmap in args
TkFrame.new(row){|base|
pack('side'=>'left', 'fill'=>'both', 'pady'=>'.25c', 'padx'=>'.25c')
TkLabel.new(base, 'text'=>bitmap, 'width'=>9).pack('side'=>'bottom')
@@ -29,7 +29,7 @@ end
# toplevel widget
if defined?($bitmap_demo) && $bitmap_demo
- $bitmap_demo.destroy
+ $bitmap_demo.destroy
$bitmap_demo = nil
end
@@ -43,7 +43,7 @@ $bitmap_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($bitmap_demo).pack(:fill=>:both, :expand=>true)
# label
-TkLabel.new(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left',
+TkLabel.new(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left',
'text'=>"This window displays all of Tk's built-in bitmaps, along with the names you can use for them in Tcl scripts."){
pack('side'=>'top')
}
@@ -66,7 +66,7 @@ $bitmap_buttons = TkFrame.new(base_frame) {|frame|
}
$bitmap_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-# frame
+# frame
TkFrame.new(base_frame){|f|
bitmapRow(f,'error','gray25','gray50','hourglass')
bitmapRow(f,'info','question','questhead','warning')
diff --git a/ext/tk/sample/demos-en/button.rb b/ext/tk/sample/demos-en/button.rb
index f63a2f3b06..5c03bd499b 100644
--- a/ext/tk/sample/demos-en/button.rb
+++ b/ext/tk/sample/demos-en/button.rb
@@ -6,20 +6,20 @@
# button widget demo (called by 'widget')
#
-# toplevel widget
+# toplevel widget
if defined?($button_demo) && $button_demo
- $button_demo.destroy
+ $button_demo.destroy
$button_demo = nil
end
-# demo toplevel widget
+# demo toplevel widget
$button_demo = TkToplevel.new {|w|
title("Button Demonstration")
iconname("button")
positionWindow(w)
}
-# label
+# label
msg = TkLabel.new($button_demo) {
font $kanji_font
wraplength '4i'
@@ -28,7 +28,7 @@ msg = TkLabel.new($button_demo) {
}
msg.pack('side'=>'top')
-# frame
+# frame
$button_buttons = Tk::Frame.new($button_demo) {|frame|
TkButton.new(frame) {
text 'Dismiss'
diff --git a/ext/tk/sample/demos-en/check.rb b/ext/tk/sample/demos-en/check.rb
index bf0b73476a..2951962a79 100644
--- a/ext/tk/sample/demos-en/check.rb
+++ b/ext/tk/sample/demos-en/check.rb
@@ -8,7 +8,7 @@
# toplevel widget
if defined?($check_demo) && $check_demo
- $check_demo.destroy
+ $check_demo.destroy
$check_demo = nil
end
@@ -21,7 +21,7 @@ $check_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($check_demo).pack(:fill=>:both, :expand=>true)
-# label
+# label
msg = TkLabel.new(base_frame) {
font $font
wraplength '4i'
@@ -30,12 +30,12 @@ msg = TkLabel.new(base_frame) {
}
msg.pack('side'=>'top')
-#
+#
wipers = TkVariable.new(0)
brakes = TkVariable.new(0)
sober = TkVariable.new(0)
-# frame
+# frame
TkFrame.new(base_frame) {|frame|
TkButton.new(frame) {
text 'Dismiss'
@@ -56,7 +56,7 @@ TkFrame.new(base_frame) {|frame|
TkButton.new(frame) {
text 'See Variables'
command proc{
- showVars(base_frame,
+ showVars(base_frame,
['wipers', wipers], ['brakes', brakes], ['sober', sober])
}
}.pack('side'=>'left', 'expand'=>'yes')
diff --git a/ext/tk/sample/demos-en/check2.rb b/ext/tk/sample/demos-en/check2.rb
index 4f7b1f07bc..faea748a87 100644
--- a/ext/tk/sample/demos-en/check2.rb
+++ b/ext/tk/sample/demos-en/check2.rb
@@ -4,7 +4,7 @@
# delete old toplevel widget
if defined?($check2_demo) && $check2_demo
- $check2_demo.destroy
+ $check2_demo.destroy
$check2_demo = nil
end
@@ -34,35 +34,35 @@ sober = TkVariable.new(0)
# frame
TkFrame.new(base_frame) {|frame|
- TkGrid(TkFrame.new(frame, :height=>2, :relief=>:sunken, :bd=>2),
+ TkGrid(TkFrame.new(frame, :height=>2, :relief=>:sunken, :bd=>2),
:columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
- TkGrid('x',
- TkButton.new(frame, :text=>'See Variables',
- :image=>$image['view'], :compound=>:left,
+ TkGrid('x',
+ TkButton.new(frame, :text=>'See Variables',
+ :image=>$image['view'], :compound=>:left,
:command=>proc{
- showVars($check2_demo,
- ['safety', safety], ['wipers', wipers],
+ showVars($check2_demo,
+ ['safety', safety], ['wipers', wipers],
['brakes', brakes], ['sober', sober])
- }),
- TkButton.new(frame, :text=>'See Code',
- :image=>$image['view'], :compound=>:left,
- :command=>proc{showCode 'check2'}),
- TkButton.new(frame, :text=>'Dismiss',
- :image=>$image['delete'], :compound=>:left,
+ }),
+ TkButton.new(frame, :text=>'See Code',
+ :image=>$image['view'], :compound=>:left,
+ :command=>proc{showCode 'check2'}),
+ TkButton.new(frame, :text=>'Dismiss',
+ :image=>$image['delete'], :compound=>:left,
:command=>proc{
tmppath = $check2_demo
$check2_demo = nil
$showVarsWin[tmppath.path] = nil
tmppath.destroy
- }),
+ }),
:padx=>4, :pady=>4)
frame.grid_columnconfigure(0, :weight=>1)
}.pack('side'=>'bottom', 'fill'=>'x')
# checkbutton
-TkCheckButton.new(base_frame, :text=>'Safety Check', :variable=>safety,
- :relief=>:flat, :onvalue=>'all', :offvalue=>'none',
+TkCheckButton.new(base_frame, :text=>'Safety Check', :variable=>safety,
+ :relief=>:flat, :onvalue=>'all', :offvalue=>'none',
:tristatevalue=>'partial'){
pack('side'=>'top', 'pady'=>2, 'anchor'=>'w')
}
@@ -70,7 +70,7 @@ TkCheckButton.new(base_frame, :text=>'Safety Check', :variable=>safety,
[ TkCheckButton.new(base_frame, 'text'=>'Wipers OK', 'variable'=>wipers),
TkCheckButton.new(base_frame, 'text'=>'Brakes OK', 'variable'=>brakes),
TkCheckButton.new(base_frame, 'text'=>'Driver Sober', 'variable'=>sober)
-].each{|w|
+].each{|w|
w.relief('flat')
w.pack('side'=>'top', 'padx'=>15, 'pady'=>2, 'anchor'=>'w')
}
diff --git a/ext/tk/sample/demos-en/clrpick.rb b/ext/tk/sample/demos-en/clrpick.rb
index 6da28cb112..431439d55d 100644
--- a/ext/tk/sample/demos-en/clrpick.rb
+++ b/ext/tk/sample/demos-en/clrpick.rb
@@ -9,7 +9,7 @@
# toplevel widget
if defined?($clrpick_demo) && $clrpick_demo
- $clrpick_demo.destroy
+ $clrpick_demo.destroy
$clrpick_demo = nil
end
@@ -47,10 +47,10 @@ Tk::Frame.new($clrpick_demo) {|frame|
}.pack('side'=>'left', 'expand'=>'yes')
}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-# button
+# button
# TkButton.new($clrpick_demo, 'text'=>'Set background color ...') {|b|
Tk::Button.new($clrpick_demo, 'text'=>'Set background color ...') {|b|
- command(proc{setColor $clrpick_demo, b, 'background',
+ command(proc{setColor $clrpick_demo, b, 'background',
['background', 'highlightbackground']})
pack('side'=>'top', 'anchor'=>'c', 'pady'=>'2m')
}
@@ -64,7 +64,7 @@ Tk::Button.new($clrpick_demo, 'text'=>'Set foreground color ...') {|b|
def setColor(w,button,name,options)
w.grab
initialColor = button[name]
- color = Tk.chooseColor('title'=>"Choose a #{name} color", 'parent'=>w,
+ color = Tk.chooseColor('title'=>"Choose a #{name} color", 'parent'=>w,
'initialcolor'=>initialColor)
if color != ""
setColor_helper(w,options,color)
diff --git a/ext/tk/sample/demos-en/colors.rb b/ext/tk/sample/demos-en/colors.rb
index b0ef9590b9..4300a660ae 100644
--- a/ext/tk/sample/demos-en/colors.rb
+++ b/ext/tk/sample/demos-en/colors.rb
@@ -9,7 +9,7 @@
# toplevel widget
if defined?($colors_demo) && $colors_demo
- $colors_demo.destroy
+ $colors_demo.destroy
$colors_demo = nil
end
diff --git a/ext/tk/sample/demos-en/combo.rb b/ext/tk/sample/demos-en/combo.rb
index d77660095c..0907d9e8ec 100644
--- a/ext/tk/sample/demos-en/combo.rb
+++ b/ext/tk/sample/demos-en/combo.rb
@@ -5,7 +5,7 @@
# based on "Id: combo.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp"
if defined?($combo_demo) && $combo_demo
- $combo_demo.destroy
+ $combo_demo.destroy
$combo_demo = nil
end
@@ -17,7 +17,7 @@ $combo_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($combo_demo).pack(:fill=>:both, :expand=>true)
-Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'5i', :justify=>:left,
+Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'5i', :justify=>:left,
:text=><<EOL).pack(:side=>:top, :fill=>:x)
Three different combo-boxes are displayed below. \
You can add characters to the first \
@@ -40,24 +40,24 @@ ozCity = TkVariable.new
Ttk::Frame.new(base_frame) {|frame|
sep = Ttk::Separator.new(frame)
Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
- TkGrid('x',
- Ttk::Button.new(frame, :text=>'See Variables',
- :image=>$image['view'], :compound=>:left,
+ TkGrid('x',
+ Ttk::Button.new(frame, :text=>'See Variables',
+ :image=>$image['view'], :compound=>:left,
:command=>proc{
- showVars(base_frame,
- ['firstVariable', firstValue],
- ['secondVariable', secondValue],
+ showVars(base_frame,
+ ['firstVariable', firstValue],
+ ['secondVariable', secondValue],
['ozCity', ozCity])
- }),
- Ttk::Button.new(frame, :text=>'See Code',
- :image=>$image['view'], :compound=>:left,
- :command=>proc{showCode 'combo'}),
- Ttk::Button.new(frame, :text=>'Dismiss',
- :image=>$image['delete'], :compound=>:left,
+ }),
+ Ttk::Button.new(frame, :text=>'See Code',
+ :image=>$image['view'], :compound=>:left,
+ :command=>proc{showCode 'combo'}),
+ Ttk::Button.new(frame, :text=>'Dismiss',
+ :image=>$image['delete'], :compound=>:left,
:command=>proc{
$combo_demo.destroy
$combo_demo = nil
- }),
+ }),
:padx=>4, :pady=>4)
grid_columnconfigure(0, :weight=>1)
pack(:side=>:bottom, :fill=>:x)
@@ -66,7 +66,7 @@ Ttk::Frame.new(base_frame) {|frame|
frame = Ttk::Frame.new(base_frame).pack(:fill=>:both, :expand=>true)
australianCities = [
- 'Canberra', 'Sydney', 'Melbourne', 'Perth', 'Adelaide', 'Brisbane',
+ 'Canberra', 'Sydney', 'Melbourne', 'Perth', 'Adelaide', 'Brisbane',
'Hobart', 'Darwin', 'Alice Springs'
]
@@ -80,17 +80,17 @@ Tk.pack(Ttk::Labelframe.new(frame, :text=>'Fully Editable'){|f|
w.values <<= w.value unless w.values.include?(w.value)
}
}.pack(:pady=>5, :padx=>10)
- },
+ },
Ttk::LabelFrame.new(frame, :text=>'Disabled'){|f|
Ttk::Combobox.new(f, :textvariable=>secondValue, :state=>:disabled) .
pack(:pady=>5, :padx=>10)
- },
+ },
Ttk::LabelFrame.new(frame, :text=>'Defined List Only'){|f|
- Ttk::Combobox.new(f, :textvariable=>ozCity, :state=>:readonly,
+ Ttk::Combobox.new(f, :textvariable=>ozCity, :state=>:readonly,
:values=>australianCities) .
pack(:pady=>5, :padx=>10)
- },
+ },
:side=>:top, :pady=>5, :padx=>10)
diff --git a/ext/tk/sample/demos-en/cscroll.rb b/ext/tk/sample/demos-en/cscroll.rb
index 40a3afc0ad..259ed3bd8c 100644
--- a/ext/tk/sample/demos-en/cscroll.rb
+++ b/ext/tk/sample/demos-en/cscroll.rb
@@ -8,7 +8,7 @@
# toplevel widget
if defined?($cscroll_demo) && $cscroll_demo
- $cscroll_demo.destroy
+ $cscroll_demo.destroy
$cscroll_demo = nil
end
@@ -22,7 +22,7 @@ $cscroll_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($cscroll_demo).pack(:fill=>:both, :expand=>true)
# label
-TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'4i',
+TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'4i',
'justify'=>'left', 'text'=>"This window displays a canvas widget that can be scrolled either using the scrollbars or by dragging with button 2 in the canvas. If you click button 1 on one of the rectangles, its indices will be printed on stdout."){
pack('side'=>'top')
}
@@ -45,7 +45,7 @@ $cscroll_buttons = TkFrame.new(base_frame) {|frame|
}
$cscroll_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-# frame
+# frame
unless $tk_version =~ /^4\.[01]/
$cscroll_grid = TkFrame.new(base_frame) {
pack('expand'=>'yes', 'fill'=>'both', 'padx'=>1, 'pady'=>1)
@@ -55,14 +55,14 @@ unless $tk_version =~ /^4\.[01]/
end
# canvas
-$cscroll_canvas = TkCanvas.new(base_frame,
+$cscroll_canvas = TkCanvas.new(base_frame,
'relief'=>'sunken', 'borderwidth'=>2,
'scrollregion'=>['-11c', '-11c', '50c', '20c']
) {|c|
if $tk_version =~ /^4\.[01]/
- pack('expand'=>'yes', 'fill'=>'both')
+ pack('expand'=>'yes', 'fill'=>'both')
else
- grid('in'=>$cscroll_grid, 'padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>0,
+ grid('in'=>$cscroll_grid, 'padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>0,
'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
end
@@ -71,18 +71,18 @@ $cscroll_canvas = TkCanvas.new(base_frame,
if $tk_version =~ /^4\.[01]/
pack('side'=>'right', 'fill'=>'y')
else
- grid('in'=>$cscroll_grid, 'padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>1,
+ grid('in'=>$cscroll_grid, 'padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>1,
'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
end
}
- TkScrollbar.new(base_frame, 'orient'=>'horiz',
+ TkScrollbar.new(base_frame, 'orient'=>'horiz',
'command'=>proc{|*args| c.xview(*args)}) {|hs|
c.xscrollcommand(proc{|first,last| hs.set first,last})
if $tk_version =~ /^4\.[01]/
- pack('side'=>'bottom', 'fill'=>'x')
+ pack('side'=>'bottom', 'fill'=>'x')
else
- grid('in'=>$cscroll_grid, 'padx'=>1, 'pady'=>1, 'row'=>1, 'column'=>0,
+ grid('in'=>$cscroll_grid, 'padx'=>1, 'pady'=>1, 'row'=>1, 'column'=>0,
'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
end
}
@@ -93,9 +93,9 @@ bg = $cscroll_canvas.configinfo('bg')[4]
x = -10+3*i
y = -10
(0..9).each{|j|
- TkcRectangle.new($cscroll_canvas, "#{x}c", "#{y}c", "#{x+2}c", "#{y+2}c",
+ TkcRectangle.new($cscroll_canvas, "#{x}c", "#{y}c", "#{x+2}c", "#{y+2}c",
'outline'=>'black', 'fill'=>bg, 'tags'=>'rect')
- TkcText.new($cscroll_canvas, "#{x+1}c", "#{y+1}c",
+ TkcText.new($cscroll_canvas, "#{x+1}c", "#{y+1}c",
'text'=>"#{i},#{j}", 'anchor'=>'center', 'tags'=>'text')
y += 3
}
@@ -106,7 +106,7 @@ $cscroll_canvas.itembind('all', 'Any-Leave', proc{scrollLeave $cscroll_canvas})
$cscroll_canvas.itembind('all', '1', proc{scrollButton $cscroll_canvas})
$cscroll_canvas.itembind('all', 'Any-Enter', proc{scrollEnter $cscroll_canvas})
$cscroll_canvas.bind('2', proc{|x,y| $cscroll_canvas.scan_mark(x,y)}, '%x %y')
-$cscroll_canvas.bind('B2-Motion',
+$cscroll_canvas.bind('B2-Motion',
proc{|x,y| $cscroll_canvas.scan_dragto(x,y)}, '%x %y')
def scrollEnter(c)
diff --git a/ext/tk/sample/demos-en/ctext.rb b/ext/tk/sample/demos-en/ctext.rb
index e04cb283f0..01374b0321 100644
--- a/ext/tk/sample/demos-en/ctext.rb
+++ b/ext/tk/sample/demos-en/ctext.rb
@@ -8,7 +8,7 @@
# toplevel widget
if defined?($ctext_demo) && $ctext_demo
- $ctext_demo.destroy
+ $ctext_demo.destroy
$ctext_demo = nil
end
@@ -22,7 +22,7 @@ $ctext_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($ctext_demo).pack(:fill=>:both, :expand=>true)
# label
-TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'5i', 'justify'=>'left',
+TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'5i', 'justify'=>'left',
'text'=>"This window displays a string of text to demonstrate the text facilities of canvas widgets. You can click in the boxes to adjust the position of the text relative to its positioning point or change its justification. The text also supports the following simple bindings for editing:
1. You can point, click, and type.
2. You can also select with button 1.
@@ -52,20 +52,20 @@ $ctext_buttons = TkFrame.new(base_frame) {|frame|
}
$ctext_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-# canvas
-$ctext_canvas = TkCanvas.new(base_frame, 'relief'=>'flat',
+# canvas
+$ctext_canvas = TkCanvas.new(base_frame, 'relief'=>'flat',
'borderwidth'=>0, 'width'=>500, 'height'=>350)
$ctext_canvas.pack('side'=>'top', 'expand'=>'yes', 'fill'=>'both')
-# font
+# font
if $tk_version =~ /^4.*/
textFont = '-*-Helvetica-Medium-R-Normal--*-240-*-*-*-*-*-*'
else
textFont = 'Helvetica 24'
end
-# canvas
-TkcRectangle.new($ctext_canvas, 245, 195, 255, 205,
+# canvas
+TkcRectangle.new($ctext_canvas, 245, 195, 255, 205,
'outline'=>'black', 'fill'=>'red')
ctag_text_param = {
@@ -83,24 +83,24 @@ $ctag_text.withtag(TkcText.new($ctext_canvas, 250, 200, ctag_text_param))
$ctag_text.bind('1', proc{|x,y| textB1Press $ctext_canvas,x,y}, "%x %y")
$ctag_text.bind('B1-Motion', proc{|x,y| textB1Move $ctext_canvas,x,y}, "%x %y")
-$ctag_text.bind('Shift-1',
- proc{|x,y| $ctext_canvas.seleect_adjust 'current', "@#{x},#{y}"},
+$ctag_text.bind('Shift-1',
+ proc{|x,y| $ctext_canvas.seleect_adjust 'current', "@#{x},#{y}"},
"%x %y")
-$ctag_text.bind('Shift-B1-Motion',
+$ctag_text.bind('Shift-B1-Motion',
proc{|x,y| textB1Move $ctext_canvas,x,y}, "%x %y")
$ctag_text.bind('KeyPress', proc{|a| textInsert $ctext_canvas,a}, "%A")
$ctag_text.bind('Return', proc{textInsert $ctext_canvas,"\n"})
$ctag_text.bind('Control-h', proc{textBs $ctext_canvas})
$ctag_text.bind('BackSpace', proc{textBs $ctext_canvas})
$ctag_text.bind('Delete', proc{textDel $ctext_canvas})
-$ctag_text.bind('2', proc{|x,y| textPaste $ctext_canvas, "@#{x},#{y}"},
+$ctag_text.bind('2', proc{|x,y| textPaste $ctext_canvas, "@#{x},#{y}"},
"%x %y")
-# Next, create some items that allow the text's anchor position
+# Next, create some items that allow the text's anchor position
# to be edited.
def mkTextConfig(w,x,y,option,value,color)
- item = TkcRectangle.new(w, x, y, x+30, y+30,
+ item = TkcRectangle.new(w, x, y, x+30, y+30,
'outline'=>'black', 'fill'=>color, 'width'=>1)
item.bind('1', proc{$ctag_text.configure option, value})
w.addtag_withtag('config', item)
@@ -118,15 +118,15 @@ mkTextConfig $ctext_canvas, x+60, y+30, 'anchor', 'w', color
mkTextConfig $ctext_canvas, x, y+60, 'anchor', 'ne', color
mkTextConfig $ctext_canvas, x+30, y+60, 'anchor', 'n', color
mkTextConfig $ctext_canvas, x+60, y+60, 'anchor', 'nw', color
-item = TkcRectangle.new($ctext_canvas, x+40, y+40, x+50, y+50,
+item = TkcRectangle.new($ctext_canvas, x+40, y+40, x+50, y+50,
'outline'=>'black', 'fill'=>'red')
item.bind('1', proc{$ctag_text.configure 'anchor', 'center'})
if $tk_version =~ /^4.*/
- TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Text Position',
- 'font'=>'-*-times-medium-r-normal--*-240-*-*-*-*-*-*',
+ TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Text Position',
+ 'font'=>'-*-times-medium-r-normal--*-240-*-*-*-*-*-*',
'anchor'=>'s', 'fill'=>'brown')
else
- TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Text Position',
+ TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Text Position',
'font'=>'Times 24', 'anchor'=>'s', 'fill'=>'brown')
end
@@ -140,18 +140,18 @@ mkTextConfig $ctext_canvas, x, y, 'justify', 'left', color
mkTextConfig $ctext_canvas, x+30, y, 'justify', 'center', color
mkTextConfig $ctext_canvas, x+60, y, 'justify', 'right', color
if $tk_version =~ /^4.*/
- TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Justification',
- 'font'=>'-*-times-medium-r-normal--*-240-*-*-*-*-*-*',
+ TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Justification',
+ 'font'=>'-*-times-medium-r-normal--*-240-*-*-*-*-*-*',
'anchor'=>'s', 'fill'=>'brown')
else
- TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Justification',
+ TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Justification',
'font'=>'Times 24', 'anchor'=>'s', 'fill'=>'brown')
end
$ctext_canvas.itembind('config', 'Enter', proc{textEnter $ctext_canvas})
-$ctext_canvas.itembind('config', 'Leave',
+$ctext_canvas.itembind('config', 'Leave',
proc{$ctext_canvas\
- .itemconfigure('current',
+ .itemconfigure('current',
'fill'=>$textConfigFill)})
$textConfigFill = ''
diff --git a/ext/tk/sample/demos-en/entry1.rb b/ext/tk/sample/demos-en/entry1.rb
index fac0afc243..6f5b10fb71 100644
--- a/ext/tk/sample/demos-en/entry1.rb
+++ b/ext/tk/sample/demos-en/entry1.rb
@@ -4,7 +4,7 @@
# toplevel widget
if defined?($entry1_demo) && $entry1_demo
- $entry1_demo.destroy
+ $entry1_demo.destroy
$entry1_demo = nil
end
@@ -43,13 +43,13 @@ TkFrame.new(base_frame) {|frame|
}.pack('side'=>'left', 'expand'=>'yes')
}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-#
+#
e1 = TkEntry.new(base_frame, 'relief'=>'sunken')
e2 = TkEntry.new(base_frame, 'relief'=>'sunken')
e3 = TkEntry.new(base_frame, 'relief'=>'sunken')
[e1,e2,e3].each{|w| w.pack('side'=>'top', 'padx'=>10, 'pady'=>5, 'fill'=>'x')}
-#
+#
e1.insert(0, 'Initial value')
e2.insert('end', "This entry contains a long value, much too long ")
e2.insert('end', "to fit in the window at one time, so long in fact ")
diff --git a/ext/tk/sample/demos-en/entry2.rb b/ext/tk/sample/demos-en/entry2.rb
index 05a6c83cfd..d67d04b56d 100644
--- a/ext/tk/sample/demos-en/entry2.rb
+++ b/ext/tk/sample/demos-en/entry2.rb
@@ -8,7 +8,7 @@
# toplevel widget
if defined?($entry2_demo) && $entry2_demo
- $entry2_demo.destroy
+ $entry2_demo.destroy
$entry2_demo = nil
end
@@ -82,7 +82,7 @@ TkFrame.new(base_frame, 'borderwidth'=>10) {|w|
e3.pack('side'=>'top', 'fill'=>'x')
s3.pack('side'=>'top', 'fill'=>'x')
- #
+ #
e1.insert(0, 'Initial value')
e2.insert('end', "This entry contains a long value, much too long ")
e2.insert('end', "to fit in the window at one time, so long in fact ")
diff --git a/ext/tk/sample/demos-en/entry3.rb b/ext/tk/sample/demos-en/entry3.rb
index d3bc629fdf..f7df3a5653 100644
--- a/ext/tk/sample/demos-en/entry3.rb
+++ b/ext/tk/sample/demos-en/entry3.rb
@@ -7,7 +7,7 @@
# based on Tcl/Tk8.4.4 widget demos
if defined?($entry3_demo) && $entry3_demo
- $entry3_demo.destroy
+ $entry3_demo.destroy
$entry3_demo = nil
end
@@ -19,8 +19,8 @@ $entry3_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($entry3_demo).pack(:fill=>:both, :expand=>true)
-TkLabel.new(base_frame,
- :font=>$font, :wraplength=>'5i', :justify=>:left,
+TkLabel.new(base_frame,
+ :font=>$font, :wraplength=>'5i', :justify=>:left,
:text=><<EOL).pack(:side=>:top)
Four different entries are displayed below. You can add characters \
by pointing, clicking and typing, though each is constrained in what \
@@ -63,8 +63,8 @@ TkFrame.new(base_frame){|f|
def focusAndFlash(widget, fg, bg, count=5)
return if count <= 0
if fg && !fg.empty? && bg && !bg.empty?
- TkTimer.new(200, count,
- proc{widget.configure(:foreground=>bg, :background=>fg)},
+ TkTimer.new(200, count,
+ proc{widget.configure(:foreground=>bg, :background=>fg)},
proc{widget.configure(:foreground=>fg, :background=>bg)}
).start
else
@@ -86,7 +86,7 @@ def focusAndFlash(widget, fg, bg, count=5)
end
l1 = TkLabelFrame.new(base_frame, :text=>"Integer Entry")
-TkEntry.new(l1, :validate=>:focus,
+TkEntry.new(l1, :validate=>:focus,
:vcmd=>[
proc{|s| s == '' || /^[+-]?\d+$/ =~ s }, '%P'
]) {|e|
@@ -97,7 +97,7 @@ TkEntry.new(l1, :validate=>:focus,
}
l2 = TkLabelFrame.new(base_frame, :text=>"Length-Constrained Entry")
-TkEntry.new(l2, :validate=>:key, :invcmd=>proc{Tk.bell},
+TkEntry.new(l2, :validate=>:key, :invcmd=>proc{Tk.bell},
:vcmd=>[proc{|s| s.length < 10}, '%P']
).pack(:fill=>:x, :expand=>true, :padx=>'1m', :pady=>'1m')
@@ -171,7 +171,7 @@ end
def validatePhoneChange(widget, vmode, idx, char)
return true if idx == nil
- Tk.after_idle(proc{widget.configure(:validate=>vmode,
+ Tk.after_idle(proc{widget.configure(:validate=>vmode,
:invcmd=>proc{Tk.bell})})
if !(idx<3 || idx==6 || idx==7 || idx==11 || idx>15) && char =~ /[0-9A-Za-z]/
widget.delete(idx)
@@ -179,17 +179,17 @@ def validatePhoneChange(widget, vmode, idx, char)
Tk.after_idle(proc{phoneSkipRight(widget, -1)})
return true
# Tk.update(true) # <- Don't work 'update' inter validation callback.
- # It depends on Tcl/Tk side (tested on Tcl/Tk8.5a1).
+ # It depends on Tcl/Tk side (tested on Tcl/Tk8.5a1).
end
return false
end
l3 = TkLabelFrame.new(base_frame, :text=>"US Phone-Number Entry")
-TkEntry.new(l3, :validate=>:key, :invcmd=>proc{Tk.bell},
- :textvariable=>entry3content,
+TkEntry.new(l3, :validate=>:key, :invcmd=>proc{Tk.bell},
+ :textvariable=>entry3content,
:vcmd=>[
- proc{|w,v,i,s| validatePhoneChange(w,v,i,s)},
+ proc{|w,v,i,s| validatePhoneChange(w,v,i,s)},
"%W %v %i %S"
]){|e|
# Click to focus goes to the first editable character...
@@ -205,9 +205,9 @@ TkEntry.new(l3, :validate=>:key, :invcmd=>proc{Tk.bell},
}
l4 = TkLabelFrame.new(base_frame, :text=>"Password Entry")
-TkEntry.new(l4, :validate=>:key, :show=>'*',
+TkEntry.new(l4, :validate=>:key, :show=>'*',
:vcmd=>[
- proc{|s| s.length <= 8},
+ proc{|s| s.length <= 8},
'%P'
]).pack(:fill=>:x, :expand=>true, :padx=>'1m', :pady=>'1m')
diff --git a/ext/tk/sample/demos-en/filebox.rb b/ext/tk/sample/demos-en/filebox.rb
index 0c284c11d4..676c347409 100644
--- a/ext/tk/sample/demos-en/filebox.rb
+++ b/ext/tk/sample/demos-en/filebox.rb
@@ -6,7 +6,7 @@
# toplevel widget
if defined?($filebox_demo) && $filebox_demo
- $filebox_demo.destroy
+ $filebox_demo.destroy
$filebox_demo = nil
end
@@ -49,7 +49,7 @@ TkFrame.new(base_frame) {|frame|
TkEntry.new(f, 'width'=>20) {|e|
pack('side'=>'left', 'expand'=>'yes', 'fill'=>'x')
- TkButton.new(f, 'text'=>'Browse ...',
+ TkButton.new(f, 'text'=>'Browse ...',
'command'=>proc{fileDialog base_frame,e,type})\
.pack('side'=>'left')
}
@@ -60,9 +60,9 @@ TkFrame.new(base_frame) {|frame|
$tk_strictMotif = TkVarAccess.new('tk_strictMotif')
if ($tk_platform['platform'] == 'unix')
- TkCheckButton.new(base_frame,
- 'text'=>'Use Motif Style Dialog',
- 'variable'=>$tk_strictMotif,
+ TkCheckButton.new(base_frame,
+ 'text'=>'Use Motif Style Dialog',
+ 'variable'=>$tk_strictMotif,
'onvalue'=>1, 'offvalue'=>0 ).pack('anchor'=>'c')
end
@@ -71,23 +71,23 @@ def fileDialog(w,ent,operation)
#
#--------------------------------------------------------
types = [
- ['Text files', ['.txt','.doc'] ],
- ['Text files', [], 'TEXT' ],
- ['Ruby Scripts', ['.rb'], 'TEXT' ],
- ['Tcl Scripts', ['.tcl'], 'TEXT' ],
- ['C Source Files', ['.c','.h'] ],
- ['All Source Files', ['.rb','.tcl','.c','.h'] ],
- ['Image Files', ['.gif'] ],
- ['Image Files', ['.jpeg','.jpg'] ],
- ['Image Files', [], ['GIFF','JPEG']],
+ ['Text files', ['.txt','.doc'] ],
+ ['Text files', [], 'TEXT' ],
+ ['Ruby Scripts', ['.rb'], 'TEXT' ],
+ ['Tcl Scripts', ['.tcl'], 'TEXT' ],
+ ['C Source Files', ['.c','.h'] ],
+ ['All Source Files', ['.rb','.tcl','.c','.h'] ],
+ ['Image Files', ['.gif'] ],
+ ['Image Files', ['.jpeg','.jpg'] ],
+ ['Image Files', [], ['GIFF','JPEG']],
['All files', '*' ]
]
if operation == 'open'
file = Tk.getOpenFile('filetypes'=>types, 'parent'=>w)
else
- file = Tk.getSaveFile('filetypes'=>types, 'parent'=>w,
- 'initialfile'=>'Untitled',
+ file = Tk.getSaveFile('filetypes'=>types, 'parent'=>w,
+ 'initialfile'=>'Untitled',
'defaultextension'=>'.txt')
end
if file != ""
diff --git a/ext/tk/sample/demos-en/floor.rb b/ext/tk/sample/demos-en/floor.rb
index eb8b23eb7d..7023f2a72e 100644
--- a/ext/tk/sample/demos-en/floor.rb
+++ b/ext/tk/sample/demos-en/floor.rb
@@ -21,7 +21,7 @@ def floorDisplay(w,active)
w.delete('all')
$activeFloor = active
- # First go through the three floors, displaying the backgrounds for
+ # First go through the three floors, displaying the backgrounds for
# each floor.
floor_bg1(w,$floor_colors['bg1'],$floor_colors['outline1'])
@@ -32,12 +32,12 @@ def floorDisplay(w,active)
w.raise("floor#{active}")
- # Create a dummy item just to mark this point in the display list,
+ # Create a dummy item just to mark this point in the display list,
# so we can insert highlights here.
TkcRectangle.new(w,0,100,1,101, 'fill'=>'', 'outline'=>'', 'tags'=>'marker')
- # Add the walls and labels for the active floor, along with
+ # Add the walls and labels for the active floor, along with
# transparent polygons that define the rooms on the floor.
# Make sure that the room polygons are on top.
@@ -302,7 +302,7 @@ def floor_bg3(w,fill,outline)
TkcLine.new(w,21,331,0,331, 'fill'=>outline, 'tags'=>['floor3','bg'])
TkcLine.new(w,21,331,21,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
TkcLine.new(w,96,133,21,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
- TkcLine.new(w,107,300,159,300,159,248,107,248,107,300,
+ TkcLine.new(w,107,300,159,300,159,248,107,248,107,300,
'fill'=>outline, 'tags'=>['floor3','bg'])
end
@@ -316,316 +316,316 @@ end
# color - Color to use for drawing foreground information.
def floor_fg1(w,color)
- i = TkcPolygon.new(w,375,246,375,172,341,172,341,246,
+ i = TkcPolygon.new(w,375,246,375,172,341,172,341,246,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '101'
$floorItems['101'] = i
- TkcText.new(w,358,209, 'text'=>'101', 'fill'=>color,
+ TkcText.new(w,358,209, 'text'=>'101', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,307,240,339,240,339,206,307,206,
+ i = TkcPolygon.new(w,307,240,339,240,339,206,307,206,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = 'Pub Lift1'
$floorItems['Pub Lift1'] = i
- TkcText.new(w,323,223, 'text'=>'Pub Lift1', 'fill'=>color,
+ TkcText.new(w,323,223, 'text'=>'Pub Lift1', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,339,205,307,205,307,171,339,171,
+ i = TkcPolygon.new(w,339,205,307,205,307,171,339,171,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = 'Priv Lift1'
$floorItems['Priv Lift1'] = i
- TkcText.new(w,323,188, 'text'=>'Priv Lift1', 'fill'=>color,
+ TkcText.new(w,323,188, 'text'=>'Priv Lift1', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,42,389,42,337,1,337,1,389,
+ i = TkcPolygon.new(w,42,389,42,337,1,337,1,389,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '110'
$floorItems['110'] = i
- TkcText.new(w,21.5,363, 'text'=>'110', 'fill'=>color,
+ TkcText.new(w,21.5,363, 'text'=>'110', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,59,389,59,385,90,385,90,337,44,337,44,389,
+ i = TkcPolygon.new(w,59,389,59,385,90,385,90,337,44,337,44,389,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '109'
$floorItems['109'] = i
- TkcText.new(w,67,363, 'text'=>'109', 'fill'=>color,
+ TkcText.new(w,67,363, 'text'=>'109', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,51,300,51,253,6,253,6,300,
+ i = TkcPolygon.new(w,51,300,51,253,6,253,6,300,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '111'
$floorItems['111'] = i
- TkcText.new(w,28.5,276.5, 'text'=>'111', 'fill'=>color,
+ TkcText.new(w,28.5,276.5, 'text'=>'111', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,98,248,98,309,79,309,79,248,
+ i = TkcPolygon.new(w,98,248,98,309,79,309,79,248,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '117B'
$floorItems['117B'] = i
- TkcText.new(w,88.5,278.5, 'text'=>'117B', 'fill'=>color,
+ TkcText.new(w,88.5,278.5, 'text'=>'117B', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,51,251,51,204,6,204,6,251,
+ i = TkcPolygon.new(w,51,251,51,204,6,204,6,251,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '112'
$floorItems['112'] = i
- TkcText.new(w,28.5,227.5, 'text'=>'112', 'fill'=>color,
+ TkcText.new(w,28.5,227.5, 'text'=>'112', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,6,156,51,156,51,203,6,203,
+ i = TkcPolygon.new(w,6,156,51,156,51,203,6,203,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '113'
$floorItems['113'] = i
- TkcText.new(w,28.5,179.5, 'text'=>'113', 'fill'=>color,
+ TkcText.new(w,28.5,179.5, 'text'=>'113', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,85,169,79,169,79,192,85,192,
+ i = TkcPolygon.new(w,85,169,79,169,79,192,85,192,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '117A'
$floorItems['117A'] = i
- TkcText.new(w,82,180.5, 'text'=>'117A', 'fill'=>color,
+ TkcText.new(w,82,180.5, 'text'=>'117A', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,77,302,77,168,53,168,53,302,
+ i = TkcPolygon.new(w,77,302,77,168,53,168,53,302,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '117'
$floorItems['117'] = i
- TkcText.new(w,65,235, 'text'=>'117', 'fill'=>color,
+ TkcText.new(w,65,235, 'text'=>'117', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,51,155,51,115,6,115,6,155,
+ i = TkcPolygon.new(w,51,155,51,115,6,115,6,155,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '114'
$floorItems['114'] = i
- TkcText.new(w,28.5,135, 'text'=>'114', 'fill'=>color,
+ TkcText.new(w,28.5,135, 'text'=>'114', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,95,115,53,115,53,168,95,168,
+ i = TkcPolygon.new(w,95,115,53,115,53,168,95,168,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '115'
$floorItems['115'] = i
- TkcText.new(w,74,141.5, 'text'=>'115', 'fill'=>color,
+ TkcText.new(w,74,141.5, 'text'=>'115', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,87,113,87,27,10,27,10,113,
+ i = TkcPolygon.new(w,87,113,87,27,10,27,10,113,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '116'
$floorItems['116'] = i
- TkcText.new(w,48.5,70, 'text'=>'116', 'fill'=>color,
+ TkcText.new(w,48.5,70, 'text'=>'116', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,89,91,128,91,128,113,89,131,
+ i = TkcPolygon.new(w,89,91,128,91,128,113,89,131,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '118'
$floorItems['118'] = i
- TkcText.new(w,108.5,102, 'text'=>'118', 'fill'=>color,
+ TkcText.new(w,108.5,102, 'text'=>'118', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
i = TkcPolygon.new(w,178,128,178,132,216,132,216,91,
- 163,91,163,112,149,112,149,128,
+ 163,91,163,112,149,112,149,128,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '120'
$floorItems['120'] = i
- TkcText.new(w,189.5,111.5, 'text'=>'120', 'fill'=>color,
+ TkcText.new(w,189.5,111.5, 'text'=>'120', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
i = TkcPolygon.new(w,79,193,87,193,87,169,136,169,136,192,
- 156,192,156,169,175,169,175,246,79,246,
+ 156,192,156,169,175,169,175,246,79,246,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '122'
$floorItems['122'] = i
- TkcText.new(w,131,207.5, 'text'=>'122', 'fill'=>color,
+ TkcText.new(w,131,207.5, 'text'=>'122', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,138,169,154,169,154,191,138,191,
+ i = TkcPolygon.new(w,138,169,154,169,154,191,138,191,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '121'
$floorItems['121'] = i
- TkcText.new(w,146,180, 'text'=>'121', 'fill'=>color,
+ TkcText.new(w,146,180, 'text'=>'121', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,99,300,126,300,126,309,99,309,
+ i = TkcPolygon.new(w,99,300,126,300,126,309,99,309,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '106A'
$floorItems['106A'] = i
- TkcText.new(w,112.5,304.5, 'text'=>'106A', 'fill'=>color,
+ TkcText.new(w,112.5,304.5, 'text'=>'106A', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,128,299,128,309,150,309,150,248,99,248,99,299,
+ i = TkcPolygon.new(w,128,299,128,309,150,309,150,248,99,248,99,299,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '105'
$floorItems['105'] = i
- TkcText.new(w,124.5,278.5, 'text'=>'105', 'fill'=>color,
+ TkcText.new(w,124.5,278.5, 'text'=>'105', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,174,309,174,300,152,300,152,309,
+ i = TkcPolygon.new(w,174,309,174,300,152,300,152,309,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '106B'
$floorItems['106B'] = i
- TkcText.new(w,163,304.5, 'text'=>'106B', 'fill'=>color,
+ TkcText.new(w,163,304.5, 'text'=>'106B', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,176,299,176,309,216,309,216,248,152,248,152,299,
+ i = TkcPolygon.new(w,176,299,176,309,216,309,216,248,152,248,152,299,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '104'
$floorItems['104'] = i
- TkcText.new(w,184,278.5, 'text'=>'104', 'fill'=>color,
+ TkcText.new(w,184,278.5, 'text'=>'104', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,138,385,138,337,91,337,91,385,
+ i = TkcPolygon.new(w,138,385,138,337,91,337,91,385,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '108'
$floorItems['108'] = i
- TkcText.new(w,114.5,361, 'text'=>'108', 'fill'=>color,
+ TkcText.new(w,114.5,361, 'text'=>'108', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,256,337,140,337,140,385,256,385,
+ i = TkcPolygon.new(w,256,337,140,337,140,385,256,385,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '107'
$floorItems['107'] = i
- TkcText.new(w,198,361, 'text'=>'107', 'fill'=>color,
+ TkcText.new(w,198,361, 'text'=>'107', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,300,353,300,329,260,329,260,353,
+ i = TkcPolygon.new(w,300,353,300,329,260,329,260,353,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = 'Smoking'
$floorItems['Smoking'] = i
- TkcText.new(w,280,341, 'text'=>'Smoking', 'fill'=>color,
+ TkcText.new(w,280,341, 'text'=>'Smoking', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,314,135,314,170,306,170,306,246,177,246,177,135,
+ i = TkcPolygon.new(w,314,135,314,170,306,170,306,246,177,246,177,135,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '123'
$floorItems['123'] = i
- TkcText.new(w,245.5,190.5, 'text'=>'123', 'fill'=>color,
+ TkcText.new(w,245.5,190.5, 'text'=>'123', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,217,248,301,248,301,326,257,326,257,310,217,310,
+ i = TkcPolygon.new(w,217,248,301,248,301,326,257,326,257,310,217,310,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '103'
$floorItems['103'] = i
- TkcText.new(w,259,287, 'text'=>'103', 'fill'=>color,
+ TkcText.new(w,259,287, 'text'=>'103', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,396,188,377,188,377,169,316,169,316,131,396,131,
+ i = TkcPolygon.new(w,396,188,377,188,377,169,316,169,316,131,396,131,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '124'
$floorItems['124'] = i
- TkcText.new(w,356,150, 'text'=>'124', 'fill'=>color,
+ TkcText.new(w,356,150, 'text'=>'124', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,397,226,407,226,407,189,377,189,377,246,397,246,
+ i = TkcPolygon.new(w,397,226,407,226,407,189,377,189,377,246,397,246,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '125'
$floorItems['125'] = i
- TkcText.new(w,392,217.5, 'text'=>'125', 'fill'=>color,
+ TkcText.new(w,392,217.5, 'text'=>'125', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,399,187,409,187,409,207,474,207,474,164,399,164,
+ i = TkcPolygon.new(w,399,187,409,187,409,207,474,207,474,164,399,164,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '126'
$floorItems['126'] = i
- TkcText.new(w,436.5,185.5, 'text'=>'126', 'fill'=>color,
+ TkcText.new(w,436.5,185.5, 'text'=>'126', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
i = TkcPolygon.new(w,409,209,409,229,399,229,399,253,
- 486,253,486,239,474,239,474,209,
+ 486,253,486,239,474,239,474,209,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '127'
$floorItems['127'] = i
- TkcText.new(w,436.5,'231', 'text'=>'127', 'fill'=>color,
+ TkcText.new(w,436.5,'231', 'text'=>'127', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
i = TkcPolygon.new(w,501,164,501,174,495,174,495,188,
- 490,188,490,204,476,204,476,164,
+ 490,188,490,204,476,204,476,164,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = 'MShower'
$floorItems['MShower'] = i
- TkcText.new(w,488.5,'184', 'text'=>'MShower', 'fill'=>color,
+ TkcText.new(w,488.5,'184', 'text'=>'MShower', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,497,176,513,176,513,204,492,204,492,190,497,190,
+ i = TkcPolygon.new(w,497,176,513,176,513,204,492,204,492,190,497,190,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = 'Closet'
$floorItems['Closet'] = i
- TkcText.new(w,502.5,190, 'text'=>'Closet', 'fill'=>color,
+ TkcText.new(w,502.5,190, 'text'=>'Closet', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,476,237,476,206,513,206,513,254,488,254,488,237,
+ i = TkcPolygon.new(w,476,237,476,206,513,206,513,254,488,254,488,237,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = 'WShower'
$floorItems['WShower'] = i
- TkcText.new(w,494.5,230, 'text'=>'WShower', 'fill'=>color,
+ TkcText.new(w,494.5,230, 'text'=>'WShower', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
i = TkcPolygon.new(w,486,131,558,131,558,135,724,135,724,166,
697,166,697,275,553,275,531,254,515,254,
- 515,174,503,174,503,161,486,161,
+ 515,174,503,174,503,161,486,161,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '130'
$floorItems['130'] = i
- TkcText.new(w,638.5,205, 'text'=>'130', 'fill'=>color,
+ TkcText.new(w,638.5,205, 'text'=>'130', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
i = TkcPolygon.new(w,308,242,339,242,339,248,342,248,
342,246,397,246,397,276,393,276,
- 393,309,300,309,300,248,308,248,
+ 393,309,300,309,300,248,308,248,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '102'
$floorItems['102'] = i
- TkcText.new(w,367.5,278.5, 'text'=>'102', 'fill'=>color,
+ TkcText.new(w,367.5,278.5, 'text'=>'102', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,397,255,486,255,486,276,397,276,
+ i = TkcPolygon.new(w,397,255,486,255,486,276,397,276,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '128'
$floorItems['128'] = i
- TkcText.new(w,441.5,265.5, 'text'=>'128', 'fill'=>color,
+ TkcText.new(w,441.5,265.5, 'text'=>'128', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
i = TkcPolygon.new(w,510,309,486,309,486,255,530,255,
552,277,561,277,561,325,510,325,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '129'
$floorItems['129'] = i
- TkcText.new(w,535.5,293, 'text'=>'129', 'fill'=>color,
+ TkcText.new(w,535.5,293, 'text'=>'129', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
i = TkcPolygon.new(w,696,281,740,281,740,387,642,387,
- 642,389,561,389,561,277,696,277,
+ 642,389,561,389,561,277,696,277,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '133'
$floorItems['133'] = i
- TkcText.new(w,628.5,335, 'text'=>'133', 'fill'=>color,
+ TkcText.new(w,628.5,335, 'text'=>'133', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,742,387,742,281,800,281,800,387,
+ i = TkcPolygon.new(w,742,387,742,281,800,281,800,387,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '132'
$floorItems['132'] = i
- TkcText.new(w,771,334, 'text'=>'132', 'fill'=>color,
+ TkcText.new(w,771,334, 'text'=>'132', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,800,168,800,280,699,280,699,168,
+ i = TkcPolygon.new(w,800,168,800,280,699,280,699,168,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '134'
$floorItems['134'] = i
- TkcText.new(w,749.5,224, 'text'=>'134', 'fill'=>color,
+ TkcText.new(w,749.5,224, 'text'=>'134', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,726,131,726,166,800,166,800,131,
+ i = TkcPolygon.new(w,726,131,726,166,800,166,800,131,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '135'
$floorItems['135'] = i
- TkcText.new(w,763,148.5, 'text'=>'135', 'fill'=>color,
+ TkcText.new(w,763,148.5, 'text'=>'135', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
i = TkcPolygon.new(w,340,360,335,363,331,365,326,366,304,366,
304,312,396,312,396,288,400,288,404,288,
409,290,413,292,418,297,421,302,422,309,
421,318,417,325,411,330,405,332,397,333,
344,333,340,334,336,336,335,338,332,342,
- 331,347,332,351,334,354,336,357,341,359,
+ 331,347,332,351,334,354,336,357,341,359,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = 'Ramona Stair'
$floorItems['Ramona Stair'] = i
- TkcText.new(w,368,323, 'text'=>'Ramona Stair', 'fill'=>color,
+ TkcText.new(w,368,323, 'text'=>'Ramona Stair', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
i = TkcPolygon.new(w,30,23,30,5,93,5,98,5,104,7,110,10,116,16,119,20,
- 122,28,123,32,123,68,220,68,220,87,90,87,90,23,
+ 122,28,123,32,123,68,220,68,220,87,90,87,90,23,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = 'University Stair'
$floorItems['University Stair'] = i
- TkcText.new(w,155,77.5, 'text'=>'University Stair', 'fill'=>color,
+ TkcText.new(w,155,77.5, 'text'=>'University Stair', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
i = TkcPolygon.new(w,282,37,295,40,312,49,323,56,337,70,352,56,
358,48,363,39,365,29,348,25,335,22,321,14,
300,5,283,1,260,0,246,0,242,2,236,4,231,8,
- 227,13,223,17,221,22,220,34,260,34,
+ 227,13,223,17,221,22,220,34,260,34,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = 'Plaza Stair'
$floorItems['Plaza Stair'] = i
- TkcText.new(w,317.5,28.5, 'text'=>'Plaza Stair', 'fill'=>color,
+ TkcText.new(w,317.5,28.5, 'text'=>'Plaza Stair', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
i = TkcPolygon.new(w,220,34,260,34,282,37,295,40,312,49,
323,56,337,70,350,83,365,94,377,100,
- 386,104,386,128,220,128,
+ 386,104,386,128,220,128,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = 'Plaza Deck'
$floorItems['Plaza Deck'] = i
- TkcText.new(w,303,81, 'text'=>'Plaza Deck', 'fill'=>color,
+ TkcText.new(w,303,81, 'text'=>'Plaza Deck', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
i = TkcPolygon.new(w,257,336,77,336,6,336,6,301,77,301,77,310,257,310,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '106'
$floorItems['106'] = i
- TkcText.new(w,131.5,318.5, 'text'=>'106', 'fill'=>color,
+ TkcText.new(w,131.5,318.5, 'text'=>'106', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
i = TkcPolygon.new(w,146,110,162,110,162,91,130,91,130,115,95,115,
95,128,114,128,114,151,157,151,157,153,112,153,
- 112,130,97,130,97,168,175,168,175,131,146,131,
+ 112,130,97,130,97,168,175,168,175,131,146,131,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '119'
$floorItems['119'] = i
- TkcText.new(w,143.5,133, 'text'=>'119', 'fill'=>color,
+ TkcText.new(w,143.5,133, 'text'=>'119', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
TkcLine.new(w,155,191,155,189, 'fill'=>color, 'tags'=>['floor1','wall'])
TkcLine.new(w,155,177,155,169, 'fill'=>color, 'tags'=>['floor1','wall'])
@@ -798,321 +798,321 @@ end
def floor_fg2(w,color)
i = TkcPolygon.new(w,748,188,755,188,755,205,758,205,758,222,
- 800,222,800,168,748,168,
+ 800,222,800,168,748,168,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '238'
$floorItems['238'] = i
- TkcText.new(w,774,195, 'text'=>'238', 'fill'=>color,
+ TkcText.new(w,774,195, 'text'=>'238', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
i = TkcPolygon.new(w,726,188,746,188,746,166,800,166,800,131,726,131,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '237'
$floorItems['237'] = i
- TkcText.new(w,763,148.5, 'text'=>'237', 'fill'=>color,
+ TkcText.new(w,763,148.5, 'text'=>'237', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
i = TkcPolygon.new(w,497,187,497,204,559,204,559,324,641,324,
643,324,643,291,641,291,641,205,696,205,
696,291,694,291,694,314,715,314,715,291,
- 715,205,755,205,755,190,724,190,724,187,
+ 715,205,755,205,755,190,724,190,724,187,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '246'
$floorItems['246'] = i
- TkcText.new(w,600,264, 'text'=>'246', 'fill'=>color,
+ TkcText.new(w,600,264, 'text'=>'246', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,694,279,643,279,643,314,694,314,
+ i = TkcPolygon.new(w,694,279,643,279,643,314,694,314,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '247'
$floorItems['247'] = i
- TkcText.new(w,668.5,296.5, 'text'=>'247', 'fill'=>color,
+ TkcText.new(w,668.5,296.5, 'text'=>'247', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
i = TkcPolygon.new(w,232,250,308,250,308,242,339,242,339,246,
397,246,397,255,476,255,476,250,482,250,559,250,
- 559,274,482,274,482,278,396,278,396,274,232,274,
+ 559,274,482,274,482,278,396,278,396,274,232,274,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '202'
$floorItems['202'] = i
- TkcText.new(w,285.5,260, 'text'=>'202', 'fill'=>color,
+ TkcText.new(w,285.5,260, 'text'=>'202', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
i = TkcPolygon.new(w,53,228,53,338,176,338,233,338,233,196,
306,196,306,180,175,180,175,169,156,169,
- 156,196,176,196,176,228,
+ 156,196,176,196,176,228,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '206'
$floorItems['206'] = i
- TkcText.new(w,143,267, 'text'=>'206', 'fill'=>color,
+ TkcText.new(w,143,267, 'text'=>'206', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,51,277,6,277,6,338,51,338,
+ i = TkcPolygon.new(w,51,277,6,277,6,338,51,338,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '212'
$floorItems['212'] = i
- TkcText.new(w,28.5,307.5, 'text'=>'212', 'fill'=>color,
+ TkcText.new(w,28.5,307.5, 'text'=>'212', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,557,276,486,276,486,309,510,309,510,325,557,325,
+ i = TkcPolygon.new(w,557,276,486,276,486,309,510,309,510,325,557,325,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '245'
$floorItems['245'] = i
- TkcText.new(w,521.5,300.5, 'text'=>'245', 'fill'=>color,
+ TkcText.new(w,521.5,300.5, 'text'=>'245', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,560,389,599,389,599,326,560,326,
+ i = TkcPolygon.new(w,560,389,599,389,599,326,560,326,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '244'
$floorItems['244'] = i
- TkcText.new(w,579.5,357.5, 'text'=>'244', 'fill'=>color,
+ TkcText.new(w,579.5,357.5, 'text'=>'244', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,601,389,601,326,643,326,643,389,
+ i = TkcPolygon.new(w,601,389,601,326,643,326,643,389,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '243'
$floorItems['243'] = i
- TkcText.new(w,622,357.5, 'text'=>'243', 'fill'=>color,
+ TkcText.new(w,622,357.5, 'text'=>'243', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,688,316,645,316,645,365,688,365,
+ i = TkcPolygon.new(w,688,316,645,316,645,365,688,365,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '242'
$floorItems['242'] = i
- TkcText.new(w,666.5,340.5, 'text'=>'242', 'fill'=>color,
+ TkcText.new(w,666.5,340.5, 'text'=>'242', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,802,367,759,367,759,226,802,226,
+ i = TkcPolygon.new(w,802,367,759,367,759,226,802,226,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = 'Barbecue Deck'
$floorItems['Barbecue Deck'] = i
- TkcText.new(w,780.5,296.5, 'text'=>'Barbecue Deck', 'fill'=>color,
+ TkcText.new(w,780.5,296.5, 'text'=>'Barbecue Deck', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,755,262,755,314,717,314,717,262,
+ i = TkcPolygon.new(w,755,262,755,314,717,314,717,262,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '240'
$floorItems['240'] = i
- TkcText.new(w,736,288, 'text'=>'240', 'fill'=>color,
+ TkcText.new(w,736,288, 'text'=>'240', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,755,316,689,316,689,365,755,365,
+ i = TkcPolygon.new(w,755,316,689,316,689,365,755,365,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '241'
$floorItems['241'] = i
- TkcText.new(w,722,340.5, 'text'=>'241', 'fill'=>color,
+ TkcText.new(w,722,340.5, 'text'=>'241', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,755,206,717,206,717,261,755,261,
+ i = TkcPolygon.new(w,755,206,717,206,717,261,755,261,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '239'
$floorItems['239'] = i
- TkcText.new(w,736,233.5, 'text'=>'239', 'fill'=>color,
+ TkcText.new(w,736,233.5, 'text'=>'239', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,695,277,643,277,643,206,695,206,
+ i = TkcPolygon.new(w,695,277,643,277,643,206,695,206,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '248'
$floorItems['248'] = i
- TkcText.new(w,669,241.5, 'text'=>'248', 'fill'=>color,
+ TkcText.new(w,669,241.5, 'text'=>'248', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,676,135,676,185,724,185,724,135,
+ i = TkcPolygon.new(w,676,135,676,185,724,185,724,135,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '236'
$floorItems['236'] = i
- TkcText.new(w,700,160, 'text'=>'236', 'fill'=>color,
+ TkcText.new(w,700,160, 'text'=>'236', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,675,135,635,135,635,145,628,145,628,185,675,185,
+ i = TkcPolygon.new(w,675,135,635,135,635,145,628,145,628,185,675,185,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '235'
$floorItems['235'] = i
- TkcText.new(w,651.5,160, 'text'=>'235', 'fill'=>color,
+ TkcText.new(w,651.5,160, 'text'=>'235', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
i = TkcPolygon.new(w,626,143,633,143,633,135,572,135,
- 572,143,579,143,579,185,626,185,
+ 572,143,579,143,579,185,626,185,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '234'
$floorItems['234'] = i
- TkcText.new(w,606,160, 'text'=>'234', 'fill'=>color,
+ TkcText.new(w,606,160, 'text'=>'234', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
i = TkcPolygon.new(w,557,135,571,135,571,145,578,145,
- 578,185,527,185,527,131,557,131,
+ 578,185,527,185,527,131,557,131,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '233'
$floorItems['233'] = i
- TkcText.new(w,552.5,158, 'text'=>'233', 'fill'=>color,
+ TkcText.new(w,552.5,158, 'text'=>'233', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
i = TkcPolygon.new(w,476,249,557,249,557,205,476,205,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '230'
$floorItems['230'] = i
- TkcText.new(w,516.5,227, 'text'=>'230', 'fill'=>color,
+ TkcText.new(w,516.5,227, 'text'=>'230', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,476,164,486,164,486,131,525,131,525,185,476,185,
+ i = TkcPolygon.new(w,476,164,486,164,486,131,525,131,525,185,476,185,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '232'
$floorItems['232'] = i
- TkcText.new(w,500.5,158, 'text'=>'232', 'fill'=>color,
+ TkcText.new(w,500.5,158, 'text'=>'232', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,476,186,495,186,495,204,476,204,
+ i = TkcPolygon.new(w,476,186,495,186,495,204,476,204,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '229'
$floorItems['229'] = i
- TkcText.new(w,485.5,195, 'text'=>'229', 'fill'=>color,
+ TkcText.new(w,485.5,195, 'text'=>'229', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,474,207,409,207,409,187,399,187,399,164,474,164,
+ i = TkcPolygon.new(w,474,207,409,207,409,187,399,187,399,164,474,164,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '227'
$floorItems['227'] = i
- TkcText.new(w,436.5,185.5, 'text'=>'227', 'fill'=>color,
+ TkcText.new(w,436.5,185.5, 'text'=>'227', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,399,228,399,253,474,253,474,209,409,209,409,228,
+ i = TkcPolygon.new(w,399,228,399,253,474,253,474,209,409,209,409,228,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '228'
$floorItems['228'] = i
- TkcText.new(w,436.5,231, 'text'=>'228', 'fill'=>color,
+ TkcText.new(w,436.5,231, 'text'=>'228', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,397,246,397,226,407,226,407,189,377,189,377,246,
+ i = TkcPolygon.new(w,397,246,397,226,407,226,407,189,377,189,377,246,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '226'
$floorItems['226'] = i
- TkcText.new(w,392,217.5, 'text'=>'226', 'fill'=>color,
+ TkcText.new(w,392,217.5, 'text'=>'226', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,377,169,316,169,316,131,397,131,397,188,377,188,
+ i = TkcPolygon.new(w,377,169,316,169,316,131,397,131,397,188,377,188,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '225'
$floorItems['225'] = i
- TkcText.new(w,356.5,150, 'text'=>'225', 'fill'=>color,
+ TkcText.new(w,356.5,150, 'text'=>'225', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,234,198,306,198,306,249,234,249,
+ i = TkcPolygon.new(w,234,198,306,198,306,249,234,249,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '224'
$floorItems['224'] = i
- TkcText.new(w,270,223.5, 'text'=>'224', 'fill'=>color,
+ TkcText.new(w,270,223.5, 'text'=>'224', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,270,179,306,179,306,170,314,170,314,135,270,135,
+ i = TkcPolygon.new(w,270,179,306,179,306,170,314,170,314,135,270,135,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '223'
$floorItems['223'] = i
- TkcText.new(w,292,157, 'text'=>'223', 'fill'=>color,
+ TkcText.new(w,292,157, 'text'=>'223', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,268,179,221,179,221,135,268,135,
+ i = TkcPolygon.new(w,268,179,221,179,221,135,268,135,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '222'
$floorItems['222'] = i
- TkcText.new(w,244.5,157, 'text'=>'222', 'fill'=>color,
+ TkcText.new(w,244.5,157, 'text'=>'222', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,177,179,219,179,219,135,177,135,
+ i = TkcPolygon.new(w,177,179,219,179,219,135,177,135,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '221'
$floorItems['221'] = i
- TkcText.new(w,198,157, 'text'=>'221', 'fill'=>color,
+ TkcText.new(w,198,157, 'text'=>'221', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,299,327,349,327,349,284,341,284,341,276,299,276,
+ i = TkcPolygon.new(w,299,327,349,327,349,284,341,284,341,276,299,276,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '204'
$floorItems['204'] = i
- TkcText.new(w,324,301.5, 'text'=>'204', 'fill'=>color,
+ TkcText.new(w,324,301.5, 'text'=>'204', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,234,276,297,276,297,327,257,327,257,338,234,338,
+ i = TkcPolygon.new(w,234,276,297,276,297,327,257,327,257,338,234,338,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '205'
$floorItems['205'] = i
- TkcText.new(w,265.5,307, 'text'=>'205', 'fill'=>color,
+ TkcText.new(w,265.5,307, 'text'=>'205', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
i = TkcPolygon.new(w,256,385,256,340,212,340,212,385,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '207'
$floorItems['207'] = i
- TkcText.new(w,234,362.5, 'text'=>'207', 'fill'=>color,
+ TkcText.new(w,234,362.5, 'text'=>'207', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,210,340,164,340,164,385,210,385,
+ i = TkcPolygon.new(w,210,340,164,340,164,385,210,385,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '208'
$floorItems['208'] = i
- TkcText.new(w,187,362.5, 'text'=>'208', 'fill'=>color,
+ TkcText.new(w,187,362.5, 'text'=>'208', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,115,340,162,340,162,385,115,385,
+ i = TkcPolygon.new(w,115,340,162,340,162,385,115,385,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '209'
$floorItems['209'] = i
- TkcText.new(w,138.5,362.5, 'text'=>'209', 'fill'=>color,
+ TkcText.new(w,138.5,362.5, 'text'=>'209', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,89,228,89,156,53,156,53,228,
+ i = TkcPolygon.new(w,89,228,89,156,53,156,53,228,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '217'
$floorItems['217'] = i
- TkcText.new(w,71,192, 'text'=>'217', 'fill'=>color,
+ TkcText.new(w,71,192, 'text'=>'217', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,89,169,97,169,97,190,89,190,
+ i = TkcPolygon.new(w,89,169,97,169,97,190,89,190,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '217A'
$floorItems['217A'] = i
- TkcText.new(w,93,179.5, 'text'=>'217A', 'fill'=>color,
+ TkcText.new(w,93,179.5, 'text'=>'217A', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,89,156,89,168,95,168,95,135,53,135,53,156,
+ i = TkcPolygon.new(w,89,156,89,168,95,168,95,135,53,135,53,156,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '216'
$floorItems['216'] = i
- TkcText.new(w,71,145.5, 'text'=>'216', 'fill'=>color,
+ TkcText.new(w,71,145.5, 'text'=>'216', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,51,179,51,135,6,135,6,179,
+ i = TkcPolygon.new(w,51,179,51,135,6,135,6,179,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '215'
$floorItems['215'] = i
- TkcText.new(w,28.5,157, 'text'=>'215', 'fill'=>color,
+ TkcText.new(w,28.5,157, 'text'=>'215', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,51,227,6,227,6,180,51,180,
+ i = TkcPolygon.new(w,51,227,6,227,6,180,51,180,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '214'
$floorItems['214'] = i
- TkcText.new(w,28.5,203.5, 'text'=>'214', 'fill'=>color,
+ TkcText.new(w,28.5,203.5, 'text'=>'214', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,51,275,6,275,6,229,51,229,
+ i = TkcPolygon.new(w,51,275,6,275,6,229,51,229,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '213'
$floorItems['213'] = i
- TkcText.new(w,28.5,252, 'text'=>'213', 'fill'=>color,
+ TkcText.new(w,28.5,252, 'text'=>'213', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,114,340,67,340,67,385,114,385,
+ i = TkcPolygon.new(w,114,340,67,340,67,385,114,385,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '210'
$floorItems['210'] = i
- TkcText.new(w,90.5,362.5, 'text'=>'210', 'fill'=>color,
+ TkcText.new(w,90.5,362.5, 'text'=>'210', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,59,389,59,385,65,385,65,340,1,340,1,389,
+ i = TkcPolygon.new(w,59,389,59,385,65,385,65,340,1,340,1,389,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '211'
$floorItems['211'] = i
- TkcText.new(w,33,364.5, 'text'=>'211', 'fill'=>color,
+ TkcText.new(w,33,364.5, 'text'=>'211', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,393,309,350,309,350,282,342,282,342,276,393,276,
+ i = TkcPolygon.new(w,393,309,350,309,350,282,342,282,342,276,393,276,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '203'
$floorItems['203'] = i
- TkcText.new(w,367.5,292.5, 'text'=>'203', 'fill'=>color,
+ TkcText.new(w,367.5,292.5, 'text'=>'203', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
i = TkcPolygon.new(w,99,191,91,191,91,226,174,226,174,198,
- 154,198,154,192,109,192,109,169,99,169,
+ 154,198,154,192,109,192,109,169,99,169,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '220'
$floorItems['220'] = i
- TkcText.new(w,132.5,208.5, 'text'=>'220', 'fill'=>color,
+ TkcText.new(w,132.5,208.5, 'text'=>'220', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,339,205,307,205,307,171,339,171,
+ i = TkcPolygon.new(w,339,205,307,205,307,171,339,171,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = 'Priv Lift2'
$floorItems['Priv Lift2'] = i
- TkcText.new(w,323,188, 'text'=>'Priv Lift2', 'fill'=>color,
+ TkcText.new(w,323,188, 'text'=>'Priv Lift2', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,307,240,339,240,339,206,307,206,
+ i = TkcPolygon.new(w,307,240,339,240,339,206,307,206,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = 'Pub Lift 2'
$floorItems['Pub Lift 2'] = i
- TkcText.new(w,323,223, 'text'=>'Pub Lift 2', 'fill'=>color,
+ TkcText.new(w,323,223, 'text'=>'Pub Lift 2', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,175,168,97,168,97,131,175,131,
+ i = TkcPolygon.new(w,175,168,97,168,97,131,175,131,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '218'
$floorItems['218'] = i
- TkcText.new(w,136,149.5, 'text'=>'218', 'fill'=>color,
+ TkcText.new(w,136,149.5, 'text'=>'218', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,154,191,111,191,111,169,154,169,
+ i = TkcPolygon.new(w,154,191,111,191,111,169,154,169,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '219'
$floorItems['219'] = i
- TkcText.new(w,132.5,180, 'text'=>'219', 'fill'=>color,
+ TkcText.new(w,132.5,180, 'text'=>'219', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,375,246,375,172,341,172,341,246,
+ i = TkcPolygon.new(w,375,246,375,172,341,172,341,246,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '201'
$floorItems['201'] = i
- TkcText.new(w,358,209, 'text'=>'201', 'fill'=>color,
+ TkcText.new(w,358,209, 'text'=>'201', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
TkcLine.new(w,641,186,678,186, 'fill'=>color, 'tags'=>['floor2','wall'])
TkcLine.new(w,757,350,757,367, 'fill'=>color, 'tags'=>['floor2','wall'])
@@ -1283,206 +1283,206 @@ def floor_fg3(w,color)
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = '316'
$floorItems['316'] = i
- TkcText.new(w,79.5,204, 'text'=>'316', 'fill'=>color,
+ TkcText.new(w,79.5,204, 'text'=>'316', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,115,368,162,368,162,323,115,323,
+ i = TkcPolygon.new(w,115,368,162,368,162,323,115,323,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = '309'
$floorItems['309'] = i
- TkcText.new(w,138.5,345.5, 'text'=>'309', 'fill'=>color,
+ TkcText.new(w,138.5,345.5, 'text'=>'309', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,164,323,164,368,211,368,211,323,
+ i = TkcPolygon.new(w,164,323,164,368,211,368,211,323,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = '308'
$floorItems['308'] = i
- TkcText.new(w,187.5,345.5, 'text'=>'308', 'fill'=>color,
+ TkcText.new(w,187.5,345.5, 'text'=>'308', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,256,368,212,368,212,323,256,323,
+ i = TkcPolygon.new(w,256,368,212,368,212,323,256,323,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = '307'
$floorItems['307'] = i
- TkcText.new(w,234,345.5, 'text'=>'307', 'fill'=>color,
+ TkcText.new(w,234,345.5, 'text'=>'307', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,244,276,297,276,297,327,260,327,260,321,244,321,
+ i = TkcPolygon.new(w,244,276,297,276,297,327,260,327,260,321,244,321,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = '305'
$floorItems['305'] = i
- TkcText.new(w,270.5,301.5, 'text'=>'305', 'fill'=>color,
+ TkcText.new(w,270.5,301.5, 'text'=>'305', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
i = TkcPolygon.new(w,251,219,251,203,244,203,244,219,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = '324B'
$floorItems['324B'] = i
- TkcText.new(w,247.5,211, 'text'=>'324B', 'fill'=>color,
+ TkcText.new(w,247.5,211, 'text'=>'324B', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,251,249,244,249,244,232,251,232,
+ i = TkcPolygon.new(w,251,249,244,249,244,232,251,232,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = '324A'
$floorItems['324A'] = i
- TkcText.new(w,247.5,240.5, 'text'=>'324A', 'fill'=>color,
+ TkcText.new(w,247.5,240.5, 'text'=>'324A', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,223,135,223,179,177,179,177,135,
+ i = TkcPolygon.new(w,223,135,223,179,177,179,177,135,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = '320'
$floorItems['320'] = i
- TkcText.new(w,200,157, 'text'=>'320', 'fill'=>color,
+ TkcText.new(w,200,157, 'text'=>'320', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,114,368,114,323,67,323,67,368,
+ i = TkcPolygon.new(w,114,368,114,323,67,323,67,368,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = '310'
$floorItems['310'] = i
- TkcText.new(w,90.5,345.5, 'text'=>'310', 'fill'=>color,
+ TkcText.new(w,90.5,345.5, 'text'=>'310', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,23,277,23,321,68,321,68,277,
+ i = TkcPolygon.new(w,23,277,23,321,68,321,68,277,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = '312'
$floorItems['312'] = i
- TkcText.new(w,45.5,299, 'text'=>'312', 'fill'=>color,
+ TkcText.new(w,45.5,299, 'text'=>'312', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,23,229,68,229,68,275,23,275,
+ i = TkcPolygon.new(w,23,229,68,229,68,275,23,275,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = '313'
$floorItems['313'] = i
- TkcText.new(w,45.5,252, 'text'=>'313', 'fill'=>color,
+ TkcText.new(w,45.5,252, 'text'=>'313', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,68,227,23,227,23,180,68,180,
+ i = TkcPolygon.new(w,68,227,23,227,23,180,68,180,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = '314'
$floorItems['314'] = i
- TkcText.new(w,40.5,203.5, 'text'=>'314', 'fill'=>color,
+ TkcText.new(w,40.5,203.5, 'text'=>'314', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,95,179,95,135,23,135,23,179,
+ i = TkcPolygon.new(w,95,179,95,135,23,135,23,179,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = '315'
$floorItems['315'] = i
- TkcText.new(w,59,157, 'text'=>'315', 'fill'=>color,
+ TkcText.new(w,59,157, 'text'=>'315', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,99,226,99,204,91,204,91,226,
+ i = TkcPolygon.new(w,99,226,99,204,91,204,91,226,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = '316B'
$floorItems['316B'] = i
- TkcText.new(w,95,215, 'text'=>'316B', 'fill'=>color,
+ TkcText.new(w,95,215, 'text'=>'316B', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,91,202,99,202,99,180,91,180,
+ i = TkcPolygon.new(w,91,202,99,202,99,180,91,180,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = '316A'
$floorItems['316A'] = i
- TkcText.new(w,95,191, 'text'=>'316A', 'fill'=>color,
+ TkcText.new(w,95,191, 'text'=>'316A', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
i = TkcPolygon.new(w,97,169,109,169,109,192,154,192,154,198,
- 174,198,174,226,101,226,101,179,97,179,
+ 174,198,174,226,101,226,101,179,97,179,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = '319'
$floorItems['319'] = i
- TkcText.new(w,141.5,209, 'text'=>'319', 'fill'=>color,
+ TkcText.new(w,141.5,209, 'text'=>'319', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,65,368,58,368,58,389,1,389,1,333,23,333,23,323,65,323,
+ i = TkcPolygon.new(w,65,368,58,368,58,389,1,389,1,333,23,333,23,323,65,323,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = '311'
$floorItems['311'] = i
- TkcText.new(w,29.5,361, 'text'=>'311', 'fill'=>color,
+ TkcText.new(w,29.5,361, 'text'=>'311', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,154,191,111,191,111,169,154,169,
+ i = TkcPolygon.new(w,154,191,111,191,111,169,154,169,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = '318'
$floorItems['318'] = i
- TkcText.new(w,132.5,180, 'text'=>'318', 'fill'=>color,
+ TkcText.new(w,132.5,180, 'text'=>'318', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,175,168,97,168,97,131,175,131,
+ i = TkcPolygon.new(w,175,168,97,168,97,131,175,131,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = '317'
$floorItems['317'] = i
- TkcText.new(w,136,149.5, 'text'=>'317', 'fill'=>color,
+ TkcText.new(w,136,149.5, 'text'=>'317', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,274,194,274,221,306,221,306,194,
+ i = TkcPolygon.new(w,274,194,274,221,306,221,306,194,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = '323'
$floorItems['323'] = i
- TkcText.new(w,290,207.5, 'text'=>'323', 'fill'=>color,
+ TkcText.new(w,290,207.5, 'text'=>'323', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,306,222,274,222,274,249,306,249,
+ i = TkcPolygon.new(w,306,222,274,222,274,249,306,249,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = '325'
$floorItems['325'] = i
- TkcText.new(w,290,235.5, 'text'=>'325', 'fill'=>color,
+ TkcText.new(w,290,235.5, 'text'=>'325', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,263,179,224,179,224,135,263,135,
+ i = TkcPolygon.new(w,263,179,224,179,224,135,263,135,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = '321'
$floorItems['321'] = i
- TkcText.new(w,243.5,157, 'text'=>'321', 'fill'=>color,
+ TkcText.new(w,243.5,157, 'text'=>'321', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
i = TkcPolygon.new(w,314,169,306,169,306,192,273,192,
- 264,181,264,135,314,135,
+ 264,181,264,135,314,135,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = '322'
$floorItems['322'] = i
- TkcText.new(w,293.5,163.5, 'text'=>'322', 'fill'=>color,
+ TkcText.new(w,293.5,163.5, 'text'=>'322', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,307,240,339,240,339,206,307,206,
+ i = TkcPolygon.new(w,307,240,339,240,339,206,307,206,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = 'Pub Lift3'
$floorItems['Pub Lift3'] = i
- TkcText.new(w,323,223, 'text'=>'Pub Lift3', 'fill'=>color,
+ TkcText.new(w,323,223, 'text'=>'Pub Lift3', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,339,205,307,205,307,171,339,171,
+ i = TkcPolygon.new(w,339,205,307,205,307,171,339,171,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = 'Priv Lift3'
$floorItems['Priv Lift3'] = i
- TkcText.new(w,323,188, 'text'=>'Priv Lift3', 'fill'=>color,
+ TkcText.new(w,323,188, 'text'=>'Priv Lift3', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,350,284,376,284,376,276,397,276,397,309,350,309,
+ i = TkcPolygon.new(w,350,284,376,284,376,276,397,276,397,309,350,309,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = '303'
$floorItems['303'] = i
- TkcText.new(w,373.5,292.5, 'text'=>'303', 'fill'=>color,
+ TkcText.new(w,373.5,292.5, 'text'=>'303', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
i = TkcPolygon.new(w,272,203,272,249,252,249,252,230,
- 244,230,244,221,252,221,252,203,
+ 244,230,244,221,252,221,252,203,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = '324'
$floorItems['324'] = i
- TkcText.new(w,262,226, 'text'=>'324', 'fill'=>color,
+ TkcText.new(w,262,226, 'text'=>'324', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,299,276,299,327,349,327,349,284,341,284,341,276,
+ i = TkcPolygon.new(w,299,276,299,327,349,327,349,284,341,284,341,276,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = '304'
$floorItems['304'] = i
- TkcText.new(w,324,301.5, 'text'=>'304', 'fill'=>color,
+ TkcText.new(w,324,301.5, 'text'=>'304', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,375,246,375,172,341,172,341,246,
+ i = TkcPolygon.new(w,375,246,375,172,341,172,341,246,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = '301'
$floorItems['301'] = i
- TkcText.new(w,358,209, 'text'=>'301', 'fill'=>color,
+ TkcText.new(w,358,209, 'text'=>'301', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,397,246,377,246,377,185,397,185,
+ i = TkcPolygon.new(w,397,246,377,246,377,185,397,185,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = '327'
$floorItems['327'] = i
- TkcText.new(w,387,215.5, 'text'=>'327', 'fill'=>color,
+ TkcText.new(w,387,215.5, 'text'=>'327', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,316,131,316,169,377,169,377,185,397,185,397,131,
+ i = TkcPolygon.new(w,316,131,316,169,377,169,377,185,397,185,397,131,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = '326'
$floorItems['326'] = i
- TkcText.new(w,365.5,150, 'text'=>'326', 'fill'=>color,
+ TkcText.new(w,365.5,150, 'text'=>'326', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
i = TkcPolygon.new(w,308,251,242,251,242,274,342,274,342,282,375, 282,
- 375,274,397,274,397,248,339,248,339,242,308,242,
+ 375,274,397,274,397,248,339,248,339,242,308,242,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = '302'
$floorItems['302'] = i
- TkcText.new(w,319.5,261, 'text'=>'302', 'fill'=>color,
+ TkcText.new(w,319.5,261, 'text'=>'302', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
i = TkcPolygon.new(w,70,321,242,321,242,200,259,200,259,203,272,203,
272,193,263,180,242,180,175,180,175,169,156,169,
156,196,177,196,177,228,107,228,70,228,70,275,107,275,
- 107,248,160,248,160,301,107,301,107,275,70,275,
+ 107,248,160,248,160,301,107,301,107,275,70,275,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = '306'
$floorItems['306'] = i
- TkcText.new(w,200.5,284.5, 'text'=>'306', 'fill'=>color,
+ TkcText.new(w,200.5,284.5, 'text'=>'306', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
TkcLine.new(w,341,275,341,283, 'fill'=>color, 'tags'=>['floor3','wall'])
TkcLine.new(w,162,197,155,197, 'fill'=>color, 'tags'=>['floor3','wall'])
@@ -1577,7 +1577,7 @@ end
# toplevel widget
if defined?($floor_demo) && $floor_demo
- $floor_demo.destroy
+ $floor_demo.destroy
$floor_demo = nil
end
@@ -1593,7 +1593,7 @@ $floor_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($floor_demo).pack(:fill=>:both, :expand=>true)
# label
-TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'8i', 'justify'=>'left',
+TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'8i', 'justify'=>'left',
'text'=>"This window contains a canvas widget showing the floorplan of Digital Equipment Corporation's Western Research Laboratory. It has three levels. At any given time one of the levels is active, meaning that you can see its room structure. To activate a level, click the left mouse button anywhere on it. As the mouse moves over the active level, the room under the mouse lights up and its room number appears in the \"Room:\" entry. You can also type a room number in the entry and the room will light up."){
pack('side'=>'top')
}
@@ -1616,18 +1616,18 @@ $floor_buttons = TkFrame.new(base_frame) {|frame|
}
$floor_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-#
+#
$floorLabels = {}
$floorItems = {}
-# canvas
+# canvas
if $tk_version =~ /^4\.[01]/
$floor_canvas_frame = TkFrame.new(base_frame,'bd'=>2,'relief'=>'sunken',
'highlightthickness'=>2)
- $floor_canvas = TkCanvas.new($floor_canvas_frame,
- 'width'=>900, 'height'=>500, 'borderwidth'=>0,
+ $floor_canvas = TkCanvas.new($floor_canvas_frame,
+ 'width'=>900, 'height'=>500, 'borderwidth'=>0,
'highlightthickness'=>0) {|c|
- TkScrollbar.new(base_frame, 'orient'=>'horiz',
+ TkScrollbar.new(base_frame, 'orient'=>'horiz',
'command'=>proc{|*args| c.xview(*args)}){|hs|
c.xscrollcommand(proc{|first,last| hs.set first,last})
pack('side'=>'bottom', 'fill'=>'x')
@@ -1648,20 +1648,20 @@ else
v = TkScrollbar.new(f, 'highlightthickness'=>0, 'orient'=>'vertical')
TkFrame.new(f, 'bd'=>2, 'relief'=>'sunken') {|f1|
- $floor_canvas = TkCanvas.new(f1, 'width'=>900, 'height'=>500,
- 'borderwidth'=>0,
+ $floor_canvas = TkCanvas.new(f1, 'width'=>900, 'height'=>500,
+ 'borderwidth'=>0,
'highlightthickness'=>0) {
xscrollcommand(proc{|first,last| h.set first,last})
yscrollcommand(proc{|first,last| v.set first,last})
pack('expand'=>'yes', 'fill'=>'both')
}
- grid('padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>0,
+ grid('padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>0,
'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
}
- v.grid('padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>1,
+ v.grid('padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>1,
'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
- h.grid('padx'=>1, 'pady'=>1, 'row'=>1, 'column'=>0,
+ h.grid('padx'=>1, 'pady'=>1, 'row'=>1, 'column'=>0,
'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
TkGrid.rowconfigure(f, 0, 'weight'=>1, 'minsize'=>0)
@@ -1678,7 +1678,7 @@ end
# Create an entry for displaying and typing in current room.
$currentRoom = TkVariable.new
-$floor_entry = TkEntry.new($floor_canvas, 'width'=>10, 'relief'=>'sunken',
+$floor_entry = TkEntry.new($floor_canvas, 'width'=>10, 'relief'=>'sunken',
'bd'=>2, 'textvariable'=>$currentRoom)
# Choose colors, then fill in the floorplan.
@@ -1715,7 +1715,7 @@ $floor_canvas.itembind('floor3', '1', proc{floorDisplay $floor_canvas,3})
$floor_canvas.itembind('room', 'Enter', proc{newRoom $floor_canvas})
$floor_canvas.itembind('room', 'Leave', proc{$currentRoom.value = ''})
$floor_canvas.bind('2', proc{|x,y| $floor_canvas.scan_mark x,y}, '%x %y')
-$floor_canvas.bind('B2-Motion',
+$floor_canvas.bind('B2-Motion',
proc{|x,y| $floor_canvas.scan_dragto x,y}, '%x %y')
$floor_canvas.bind('Destroy', proc{$currentRoom.unset})
$currentRoom.value = ''
diff --git a/ext/tk/sample/demos-en/floor2.rb b/ext/tk/sample/demos-en/floor2.rb
index 3bfa89a920..88b07aeee4 100644
--- a/ext/tk/sample/demos-en/floor2.rb
+++ b/ext/tk/sample/demos-en/floor2.rb
@@ -21,7 +21,7 @@ def floorDisplay2(w,active)
w.delete('all')
$activeFloor2 = active
- # First go through the three floors, displaying the backgrounds for
+ # First go through the three floors, displaying the backgrounds for
# each floor.
floor2_bg1(w,$floor2_colors['bg1'],$floor2_colors['outline1'])
@@ -32,12 +32,12 @@ def floorDisplay2(w,active)
w.raise("floor#{active}")
- # Create a dummy item just to mark this point in the display list,
+ # Create a dummy item just to mark this point in the display list,
# so we can insert highlights here.
w.create(TkcRectangle,0,100,1,101,'fill'=>'','outline'=>'','tags'=>'marker')
- # Add the walls and labels for the active floor, along with
+ # Add the walls and labels for the active floor, along with
# transparent polygons that define the rooms on the floor.
# Make sure that the room polygons are on top.
@@ -302,7 +302,7 @@ def floor2_bg3(w,fill,outline)
w.create(TkcLine,21,331,0,331, 'fill'=>outline, 'tags'=>['floor3','bg'])
w.create(TkcLine,21,331,21,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
w.create(TkcLine,96,133,21,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
- w.create(TkcLine,107,300,159,300,159,248,107,248,107,300,
+ w.create(TkcLine,107,300,159,300,159,248,107,248,107,300,
'fill'=>outline, 'tags'=>['floor3','bg'])
end
@@ -316,316 +316,316 @@ end
# color - Color to use for drawing foreground information.
def floor2_fg1(w,color)
- i = TkcPolygon.new(w,375,246,375,172,341,172,341,246,
+ i = TkcPolygon.new(w,375,246,375,172,341,172,341,246,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '101'
$floorItems2['101'] = i
- w.create(TkcText,358,209, 'text'=>'101', 'fill'=>color,
+ w.create(TkcText,358,209, 'text'=>'101', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,307,240,339,240,339,206,307,206,
+ i = TkcPolygon.new(w,307,240,339,240,339,206,307,206,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = 'Pub Lift1'
$floorItems2['Pub Lift1'] = i
- w.create(TkcText,323,223, 'text'=>'Pub Lift1', 'fill'=>color,
+ w.create(TkcText,323,223, 'text'=>'Pub Lift1', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,339,205,307,205,307,171,339,171,
+ i = TkcPolygon.new(w,339,205,307,205,307,171,339,171,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = 'Priv Lift1'
$floorItems2['Priv Lift1'] = i
- w.create(TkcText,323,188, 'text'=>'Priv Lift1', 'fill'=>color,
+ w.create(TkcText,323,188, 'text'=>'Priv Lift1', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,42,389,42,337,1,337,1,389,
+ i = TkcPolygon.new(w,42,389,42,337,1,337,1,389,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '110'
$floorItems2['110'] = i
- w.create(TkcText,21.5,363, 'text'=>'110', 'fill'=>color,
+ w.create(TkcText,21.5,363, 'text'=>'110', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,59,389,59,385,90,385,90,337,44,337,44,389,
+ i = TkcPolygon.new(w,59,389,59,385,90,385,90,337,44,337,44,389,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '109'
$floorItems2['109'] = i
- w.create(TkcText,67,363, 'text'=>'109', 'fill'=>color,
+ w.create(TkcText,67,363, 'text'=>'109', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,51,300,51,253,6,253,6,300,
+ i = TkcPolygon.new(w,51,300,51,253,6,253,6,300,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '111'
$floorItems2['111'] = i
- w.create(TkcText,28.5,276.5, 'text'=>'111', 'fill'=>color,
+ w.create(TkcText,28.5,276.5, 'text'=>'111', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,98,248,98,309,79,309,79,248,
+ i = TkcPolygon.new(w,98,248,98,309,79,309,79,248,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '117B'
$floorItems2['117B'] = i
- w.create(TkcText,88.5,278.5, 'text'=>'117B', 'fill'=>color,
+ w.create(TkcText,88.5,278.5, 'text'=>'117B', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,51,251,51,204,6,204,6,251,
+ i = TkcPolygon.new(w,51,251,51,204,6,204,6,251,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '112'
$floorItems2['112'] = i
- w.create(TkcText,28.5,227.5, 'text'=>'112', 'fill'=>color,
+ w.create(TkcText,28.5,227.5, 'text'=>'112', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,6,156,51,156,51,203,6,203,
+ i = TkcPolygon.new(w,6,156,51,156,51,203,6,203,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '113'
$floorItems2['113'] = i
- w.create(TkcText,28.5,179.5, 'text'=>'113', 'fill'=>color,
+ w.create(TkcText,28.5,179.5, 'text'=>'113', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,85,169,79,169,79,192,85,192,
+ i = TkcPolygon.new(w,85,169,79,169,79,192,85,192,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '117A'
$floorItems2['117A'] = i
- w.create(TkcText,82,180.5, 'text'=>'117A', 'fill'=>color,
+ w.create(TkcText,82,180.5, 'text'=>'117A', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,77,302,77,168,53,168,53,302,
+ i = TkcPolygon.new(w,77,302,77,168,53,168,53,302,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '117'
$floorItems2['117'] = i
- w.create(TkcText,65,235, 'text'=>'117', 'fill'=>color,
+ w.create(TkcText,65,235, 'text'=>'117', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,51,155,51,115,6,115,6,155,
+ i = TkcPolygon.new(w,51,155,51,115,6,115,6,155,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '114'
$floorItems2['114'] = i
- w.create(TkcText,28.5,135, 'text'=>'114', 'fill'=>color,
+ w.create(TkcText,28.5,135, 'text'=>'114', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,95,115,53,115,53,168,95,168,
+ i = TkcPolygon.new(w,95,115,53,115,53,168,95,168,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '115'
$floorItems2['115'] = i
- w.create(TkcText,74,141.5, 'text'=>'115', 'fill'=>color,
+ w.create(TkcText,74,141.5, 'text'=>'115', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,87,113,87,27,10,27,10,113,
+ i = TkcPolygon.new(w,87,113,87,27,10,27,10,113,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '116'
$floorItems2['116'] = i
- w.create(TkcText,48.5,70, 'text'=>'116', 'fill'=>color,
+ w.create(TkcText,48.5,70, 'text'=>'116', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,89,91,128,91,128,113,89,131,
+ i = TkcPolygon.new(w,89,91,128,91,128,113,89,131,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '118'
$floorItems2['118'] = i
- w.create(TkcText,108.5,102, 'text'=>'118', 'fill'=>color,
+ w.create(TkcText,108.5,102, 'text'=>'118', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
i = TkcPolygon.new(w,178,128,178,132,216,132,216,91,
- 163,91,163,112,149,112,149,128,
+ 163,91,163,112,149,112,149,128,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '120'
$floorItems2['120'] = i
- w.create(TkcText,189.5,111.5, 'text'=>'120', 'fill'=>color,
+ w.create(TkcText,189.5,111.5, 'text'=>'120', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
i = TkcPolygon.new(w,79,193,87,193,87,169,136,169,136,192,
- 156,192,156,169,175,169,175,246,79,246,
+ 156,192,156,169,175,169,175,246,79,246,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '122'
$floorItems2['122'] = i
- w.create(TkcText,131,207.5, 'text'=>'122', 'fill'=>color,
+ w.create(TkcText,131,207.5, 'text'=>'122', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,138,169,154,169,154,191,138,191,
+ i = TkcPolygon.new(w,138,169,154,169,154,191,138,191,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '121'
$floorItems2['121'] = i
- w.create(TkcText,146,180, 'text'=>'121', 'fill'=>color,
+ w.create(TkcText,146,180, 'text'=>'121', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,99,300,126,300,126,309,99,309,
+ i = TkcPolygon.new(w,99,300,126,300,126,309,99,309,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '106A'
$floorItems2['106A'] = i
- w.create(TkcText,112.5,304.5, 'text'=>'106A', 'fill'=>color,
+ w.create(TkcText,112.5,304.5, 'text'=>'106A', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,128,299,128,309,150,309,150,248,99,248,99,299,
+ i = TkcPolygon.new(w,128,299,128,309,150,309,150,248,99,248,99,299,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '105'
$floorItems2['105'] = i
- w.create(TkcText,124.5,278.5, 'text'=>'105', 'fill'=>color,
+ w.create(TkcText,124.5,278.5, 'text'=>'105', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,174,309,174,300,152,300,152,309,
+ i = TkcPolygon.new(w,174,309,174,300,152,300,152,309,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '106B'
$floorItems2['106B'] = i
- w.create(TkcText,163,304.5, 'text'=>'106B', 'fill'=>color,
+ w.create(TkcText,163,304.5, 'text'=>'106B', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,176,299,176,309,216,309,216,248,152,248,152,299,
+ i = TkcPolygon.new(w,176,299,176,309,216,309,216,248,152,248,152,299,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '104'
$floorItems2['104'] = i
- w.create(TkcText,184,278.5, 'text'=>'104', 'fill'=>color,
+ w.create(TkcText,184,278.5, 'text'=>'104', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,138,385,138,337,91,337,91,385,
+ i = TkcPolygon.new(w,138,385,138,337,91,337,91,385,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '108'
$floorItems2['108'] = i
- w.create(TkcText,114.5,361, 'text'=>'108', 'fill'=>color,
+ w.create(TkcText,114.5,361, 'text'=>'108', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,256,337,140,337,140,385,256,385,
+ i = TkcPolygon.new(w,256,337,140,337,140,385,256,385,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '107'
$floorItems2['107'] = i
- w.create(TkcText,198,361, 'text'=>'107', 'fill'=>color,
+ w.create(TkcText,198,361, 'text'=>'107', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,300,353,300,329,260,329,260,353,
+ i = TkcPolygon.new(w,300,353,300,329,260,329,260,353,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = 'Smoking'
$floorItems2['Smoking'] = i
- w.create(TkcText,280,341, 'text'=>'Smoking', 'fill'=>color,
+ w.create(TkcText,280,341, 'text'=>'Smoking', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,314,135,314,170,306,170,306,246,177,246,177,135,
+ i = TkcPolygon.new(w,314,135,314,170,306,170,306,246,177,246,177,135,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '123'
$floorItems2['123'] = i
- w.create(TkcText,245.5,190.5, 'text'=>'123', 'fill'=>color,
+ w.create(TkcText,245.5,190.5, 'text'=>'123', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,217,248,301,248,301,326,257,326,257,310,217,310,
+ i = TkcPolygon.new(w,217,248,301,248,301,326,257,326,257,310,217,310,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '103'
$floorItems2['103'] = i
- w.create(TkcText,259,287, 'text'=>'103', 'fill'=>color,
+ w.create(TkcText,259,287, 'text'=>'103', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,396,188,377,188,377,169,316,169,316,131,396,131,
+ i = TkcPolygon.new(w,396,188,377,188,377,169,316,169,316,131,396,131,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '124'
$floorItems2['124'] = i
- w.create(TkcText,356,150, 'text'=>'124', 'fill'=>color,
+ w.create(TkcText,356,150, 'text'=>'124', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,397,226,407,226,407,189,377,189,377,246,397,246,
+ i = TkcPolygon.new(w,397,226,407,226,407,189,377,189,377,246,397,246,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '125'
$floorItems2['125'] = i
- w.create(TkcText,392,217.5, 'text'=>'125', 'fill'=>color,
+ w.create(TkcText,392,217.5, 'text'=>'125', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,399,187,409,187,409,207,474,207,474,164,399,164,
+ i = TkcPolygon.new(w,399,187,409,187,409,207,474,207,474,164,399,164,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '126'
$floorItems2['126'] = i
- w.create(TkcText,436.5,185.5, 'text'=>'126', 'fill'=>color,
+ w.create(TkcText,436.5,185.5, 'text'=>'126', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
i = TkcPolygon.new(w,409,209,409,229,399,229,399,253,
- 486,253,486,239,474,239,474,209,
+ 486,253,486,239,474,239,474,209,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '127'
$floorItems2['127'] = i
- w.create(TkcText,436.5,'231', 'text'=>'127', 'fill'=>color,
+ w.create(TkcText,436.5,'231', 'text'=>'127', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
i = TkcPolygon.new(w,501,164,501,174,495,174,495,188,
- 490,188,490,204,476,204,476,164,
+ 490,188,490,204,476,204,476,164,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = 'MShower'
$floorItems2['MShower'] = i
- w.create(TkcText,488.5,'184', 'text'=>'MShower', 'fill'=>color,
+ w.create(TkcText,488.5,'184', 'text'=>'MShower', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,497,176,513,176,513,204,492,204,492,190,497,190,
+ i = TkcPolygon.new(w,497,176,513,176,513,204,492,204,492,190,497,190,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = 'Closet'
$floorItems2['Closet'] = i
- w.create(TkcText,502.5,190, 'text'=>'Closet', 'fill'=>color,
+ w.create(TkcText,502.5,190, 'text'=>'Closet', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,476,237,476,206,513,206,513,254,488,254,488,237,
+ i = TkcPolygon.new(w,476,237,476,206,513,206,513,254,488,254,488,237,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = 'WShower'
$floorItems2['WShower'] = i
- w.create(TkcText,494.5,230, 'text'=>'WShower', 'fill'=>color,
+ w.create(TkcText,494.5,230, 'text'=>'WShower', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
i = TkcPolygon.new(w,486,131,558,131,558,135,724,135,724,166,
697,166,697,275,553,275,531,254,515,254,
- 515,174,503,174,503,161,486,161,
+ 515,174,503,174,503,161,486,161,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '130'
$floorItems2['130'] = i
- w.create(TkcText,638.5,205, 'text'=>'130', 'fill'=>color,
+ w.create(TkcText,638.5,205, 'text'=>'130', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
i = TkcPolygon.new(w,308,242,339,242,339,248,342,248,
342,246,397,246,397,276,393,276,
- 393,309,300,309,300,248,308,248,
+ 393,309,300,309,300,248,308,248,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '102'
$floorItems2['102'] = i
- w.create(TkcText,367.5,278.5, 'text'=>'102', 'fill'=>color,
+ w.create(TkcText,367.5,278.5, 'text'=>'102', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,397,255,486,255,486,276,397,276,
+ i = TkcPolygon.new(w,397,255,486,255,486,276,397,276,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '128'
$floorItems2['128'] = i
- w.create(TkcText,441.5,265.5, 'text'=>'128', 'fill'=>color,
+ w.create(TkcText,441.5,265.5, 'text'=>'128', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
i = TkcPolygon.new(w,510,309,486,309,486,255,530,255,
552,277,561,277,561,325,510,325,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '129'
$floorItems2['129'] = i
- w.create(TkcText,535.5,293, 'text'=>'129', 'fill'=>color,
+ w.create(TkcText,535.5,293, 'text'=>'129', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
i = TkcPolygon.new(w,696,281,740,281,740,387,642,387,
- 642,389,561,389,561,277,696,277,
+ 642,389,561,389,561,277,696,277,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '133'
$floorItems2['133'] = i
- w.create(TkcText,628.5,335, 'text'=>'133', 'fill'=>color,
+ w.create(TkcText,628.5,335, 'text'=>'133', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,742,387,742,281,800,281,800,387,
+ i = TkcPolygon.new(w,742,387,742,281,800,281,800,387,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '132'
$floorItems2['132'] = i
- w.create(TkcText,771,334, 'text'=>'132', 'fill'=>color,
+ w.create(TkcText,771,334, 'text'=>'132', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,800,168,800,280,699,280,699,168,
+ i = TkcPolygon.new(w,800,168,800,280,699,280,699,168,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '134'
$floorItems2['134'] = i
- w.create(TkcText,749.5,224, 'text'=>'134', 'fill'=>color,
+ w.create(TkcText,749.5,224, 'text'=>'134', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,726,131,726,166,800,166,800,131,
+ i = TkcPolygon.new(w,726,131,726,166,800,166,800,131,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '135'
$floorItems2['135'] = i
- w.create(TkcText,763,148.5, 'text'=>'135', 'fill'=>color,
+ w.create(TkcText,763,148.5, 'text'=>'135', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
i = TkcPolygon.new(w,340,360,335,363,331,365,326,366,304,366,
304,312,396,312,396,288,400,288,404,288,
409,290,413,292,418,297,421,302,422,309,
421,318,417,325,411,330,405,332,397,333,
344,333,340,334,336,336,335,338,332,342,
- 331,347,332,351,334,354,336,357,341,359,
+ 331,347,332,351,334,354,336,357,341,359,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = 'Ramona Stair'
$floorItems2['Ramona Stair'] = i
- w.create(TkcText,368,323, 'text'=>'Ramona Stair', 'fill'=>color,
+ w.create(TkcText,368,323, 'text'=>'Ramona Stair', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
i = TkcPolygon.new(w,30,23,30,5,93,5,98,5,104,7,110,10,116,16,119,20,
- 122,28,123,32,123,68,220,68,220,87,90,87,90,23,
+ 122,28,123,32,123,68,220,68,220,87,90,87,90,23,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = 'University Stair'
$floorItems2['University Stair'] = i
- w.create(TkcText,155,77.5, 'text'=>'University Stair', 'fill'=>color,
+ w.create(TkcText,155,77.5, 'text'=>'University Stair', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
i = TkcPolygon.new(w,282,37,295,40,312,49,323,56,337,70,352,56,
358,48,363,39,365,29,348,25,335,22,321,14,
300,5,283,1,260,0,246,0,242,2,236,4,231,8,
- 227,13,223,17,221,22,220,34,260,34,
+ 227,13,223,17,221,22,220,34,260,34,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = 'Plaza Stair'
$floorItems2['Plaza Stair'] = i
- w.create(TkcText,317.5,28.5, 'text'=>'Plaza Stair', 'fill'=>color,
+ w.create(TkcText,317.5,28.5, 'text'=>'Plaza Stair', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
i = TkcPolygon.new(w,220,34,260,34,282,37,295,40,312,49,
323,56,337,70,350,83,365,94,377,100,
- 386,104,386,128,220,128,
+ 386,104,386,128,220,128,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = 'Plaza Deck'
$floorItems2['Plaza Deck'] = i
- w.create(TkcText,303,81, 'text'=>'Plaza Deck', 'fill'=>color,
+ w.create(TkcText,303,81, 'text'=>'Plaza Deck', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
i = TkcPolygon.new(w,257,336,77,336,6,336,6,301,77,301,77,310,257,310,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '106'
$floorItems2['106'] = i
- w.create(TkcText,131.5,318.5, 'text'=>'106', 'fill'=>color,
+ w.create(TkcText,131.5,318.5, 'text'=>'106', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
i = TkcPolygon.new(w,146,110,162,110,162,91,130,91,130,115,95,115,
95,128,114,128,114,151,157,151,157,153,112,153,
- 112,130,97,130,97,168,175,168,175,131,146,131,
+ 112,130,97,130,97,168,175,168,175,131,146,131,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '119'
$floorItems2['119'] = i
- w.create(TkcText,143.5,133, 'text'=>'119', 'fill'=>color,
+ w.create(TkcText,143.5,133, 'text'=>'119', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
w.create(TkcLine,155,191,155,189, 'fill'=>color, 'tags'=>['floor1','wall'])
w.create(TkcLine,155,177,155,169, 'fill'=>color, 'tags'=>['floor1','wall'])
@@ -798,321 +798,321 @@ end
def floor2_fg2(w,color)
i = TkcPolygon.new(w,748,188,755,188,755,205,758,205,758,222,
- 800,222,800,168,748,168,
+ 800,222,800,168,748,168,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '238'
$floorItems2['238'] = i
- w.create(TkcText,774,195, 'text'=>'238', 'fill'=>color,
+ w.create(TkcText,774,195, 'text'=>'238', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
i = TkcPolygon.new(w,726,188,746,188,746,166,800,166,800,131,726,131,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '237'
$floorItems2['237'] = i
- w.create(TkcText,763,148.5, 'text'=>'237', 'fill'=>color,
+ w.create(TkcText,763,148.5, 'text'=>'237', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
i = TkcPolygon.new(w,497,187,497,204,559,204,559,324,641,324,
643,324,643,291,641,291,641,205,696,205,
696,291,694,291,694,314,715,314,715,291,
- 715,205,755,205,755,190,724,190,724,187,
+ 715,205,755,205,755,190,724,190,724,187,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '246'
$floorItems2['246'] = i
- w.create(TkcText,600,264, 'text'=>'246', 'fill'=>color,
+ w.create(TkcText,600,264, 'text'=>'246', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,694,279,643,279,643,314,694,314,
+ i = TkcPolygon.new(w,694,279,643,279,643,314,694,314,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '247'
$floorItems2['247'] = i
- w.create(TkcText,668.5,296.5, 'text'=>'247', 'fill'=>color,
+ w.create(TkcText,668.5,296.5, 'text'=>'247', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
i = TkcPolygon.new(w,232,250,308,250,308,242,339,242,339,246,
397,246,397,255,476,255,476,250,482,250,559,250,
- 559,274,482,274,482,278,396,278,396,274,232,274,
+ 559,274,482,274,482,278,396,278,396,274,232,274,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '202'
$floorItems2['202'] = i
- w.create(TkcText,285.5,260, 'text'=>'202', 'fill'=>color,
+ w.create(TkcText,285.5,260, 'text'=>'202', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
i = TkcPolygon.new(w,53,228,53,338,176,338,233,338,233,196,
306,196,306,180,175,180,175,169,156,169,
- 156,196,176,196,176,228,
+ 156,196,176,196,176,228,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '206'
$floorItems2['206'] = i
- w.create(TkcText,143,267, 'text'=>'206', 'fill'=>color,
+ w.create(TkcText,143,267, 'text'=>'206', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,51,277,6,277,6,338,51,338,
+ i = TkcPolygon.new(w,51,277,6,277,6,338,51,338,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '212'
$floorItems2['212'] = i
- w.create(TkcText,28.5,307.5, 'text'=>'212', 'fill'=>color,
+ w.create(TkcText,28.5,307.5, 'text'=>'212', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,557,276,486,276,486,309,510,309,510,325,557,325,
+ i = TkcPolygon.new(w,557,276,486,276,486,309,510,309,510,325,557,325,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '245'
$floorItems2['245'] = i
- w.create(TkcText,521.5,300.5, 'text'=>'245', 'fill'=>color,
+ w.create(TkcText,521.5,300.5, 'text'=>'245', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,560,389,599,389,599,326,560,326,
+ i = TkcPolygon.new(w,560,389,599,389,599,326,560,326,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '244'
$floorItems2['244'] = i
- w.create(TkcText,579.5,357.5, 'text'=>'244', 'fill'=>color,
+ w.create(TkcText,579.5,357.5, 'text'=>'244', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,601,389,601,326,643,326,643,389,
+ i = TkcPolygon.new(w,601,389,601,326,643,326,643,389,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '243'
$floorItems2['243'] = i
- w.create(TkcText,622,357.5, 'text'=>'243', 'fill'=>color,
+ w.create(TkcText,622,357.5, 'text'=>'243', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,688,316,645,316,645,365,688,365,
+ i = TkcPolygon.new(w,688,316,645,316,645,365,688,365,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '242'
$floorItems2['242'] = i
- w.create(TkcText,666.5,340.5, 'text'=>'242', 'fill'=>color,
+ w.create(TkcText,666.5,340.5, 'text'=>'242', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,802,367,759,367,759,226,802,226,
+ i = TkcPolygon.new(w,802,367,759,367,759,226,802,226,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = 'Barbecue Deck'
$floorItems2['Barbecue Deck'] = i
- w.create(TkcText,780.5,296.5, 'text'=>'Barbecue Deck', 'fill'=>color,
+ w.create(TkcText,780.5,296.5, 'text'=>'Barbecue Deck', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,755,262,755,314,717,314,717,262,
+ i = TkcPolygon.new(w,755,262,755,314,717,314,717,262,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '240'
$floorItems2['240'] = i
- w.create(TkcText,736,288, 'text'=>'240', 'fill'=>color,
+ w.create(TkcText,736,288, 'text'=>'240', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,755,316,689,316,689,365,755,365,
+ i = TkcPolygon.new(w,755,316,689,316,689,365,755,365,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '241'
$floorItems2['241'] = i
- w.create(TkcText,722,340.5, 'text'=>'241', 'fill'=>color,
+ w.create(TkcText,722,340.5, 'text'=>'241', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,755,206,717,206,717,261,755,261,
+ i = TkcPolygon.new(w,755,206,717,206,717,261,755,261,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '239'
$floorItems2['239'] = i
- w.create(TkcText,736,233.5, 'text'=>'239', 'fill'=>color,
+ w.create(TkcText,736,233.5, 'text'=>'239', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,695,277,643,277,643,206,695,206,
+ i = TkcPolygon.new(w,695,277,643,277,643,206,695,206,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '248'
$floorItems2['248'] = i
- w.create(TkcText,669,241.5, 'text'=>'248', 'fill'=>color,
+ w.create(TkcText,669,241.5, 'text'=>'248', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,676,135,676,185,724,185,724,135,
+ i = TkcPolygon.new(w,676,135,676,185,724,185,724,135,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '236'
$floorItems2['236'] = i
- w.create(TkcText,700,160, 'text'=>'236', 'fill'=>color,
+ w.create(TkcText,700,160, 'text'=>'236', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,675,135,635,135,635,145,628,145,628,185,675,185,
+ i = TkcPolygon.new(w,675,135,635,135,635,145,628,145,628,185,675,185,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '235'
$floorItems2['235'] = i
- w.create(TkcText,651.5,160, 'text'=>'235', 'fill'=>color,
+ w.create(TkcText,651.5,160, 'text'=>'235', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
i = TkcPolygon.new(w,626,143,633,143,633,135,572,135,
- 572,143,579,143,579,185,626,185,
+ 572,143,579,143,579,185,626,185,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '234'
$floorItems2['234'] = i
- w.create(TkcText,606,160, 'text'=>'234', 'fill'=>color,
+ w.create(TkcText,606,160, 'text'=>'234', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
i = TkcPolygon.new(w,557,135,571,135,571,145,578,145,
- 578,185,527,185,527,131,557,131,
+ 578,185,527,185,527,131,557,131,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '233'
$floorItems2['233'] = i
- w.create(TkcText,552.5,158, 'text'=>'233', 'fill'=>color,
+ w.create(TkcText,552.5,158, 'text'=>'233', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
i = TkcPolygon.new(w,476,249,557,249,557,205,476,205,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '230'
$floorItems2['230'] = i
- w.create(TkcText,516.5,227, 'text'=>'230', 'fill'=>color,
+ w.create(TkcText,516.5,227, 'text'=>'230', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,476,164,486,164,486,131,525,131,525,185,476,185,
+ i = TkcPolygon.new(w,476,164,486,164,486,131,525,131,525,185,476,185,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '232'
$floorItems2['232'] = i
- w.create(TkcText,500.5,158, 'text'=>'232', 'fill'=>color,
+ w.create(TkcText,500.5,158, 'text'=>'232', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,476,186,495,186,495,204,476,204,
+ i = TkcPolygon.new(w,476,186,495,186,495,204,476,204,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '229'
$floorItems2['229'] = i
- w.create(TkcText,485.5,195, 'text'=>'229', 'fill'=>color,
+ w.create(TkcText,485.5,195, 'text'=>'229', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,474,207,409,207,409,187,399,187,399,164,474,164,
+ i = TkcPolygon.new(w,474,207,409,207,409,187,399,187,399,164,474,164,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '227'
$floorItems2['227'] = i
- w.create(TkcText,436.5,185.5, 'text'=>'227', 'fill'=>color,
+ w.create(TkcText,436.5,185.5, 'text'=>'227', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,399,228,399,253,474,253,474,209,409,209,409,228,
+ i = TkcPolygon.new(w,399,228,399,253,474,253,474,209,409,209,409,228,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '228'
$floorItems2['228'] = i
- w.create(TkcText,436.5,231, 'text'=>'228', 'fill'=>color,
+ w.create(TkcText,436.5,231, 'text'=>'228', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,397,246,397,226,407,226,407,189,377,189,377,246,
+ i = TkcPolygon.new(w,397,246,397,226,407,226,407,189,377,189,377,246,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '226'
$floorItems2['226'] = i
- w.create(TkcText,392,217.5, 'text'=>'226', 'fill'=>color,
+ w.create(TkcText,392,217.5, 'text'=>'226', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,377,169,316,169,316,131,397,131,397,188,377,188,
+ i = TkcPolygon.new(w,377,169,316,169,316,131,397,131,397,188,377,188,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '225'
$floorItems2['225'] = i
- w.create(TkcText,356.5,150, 'text'=>'225', 'fill'=>color,
+ w.create(TkcText,356.5,150, 'text'=>'225', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,234,198,306,198,306,249,234,249,
+ i = TkcPolygon.new(w,234,198,306,198,306,249,234,249,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '224'
$floorItems2['224'] = i
- w.create(TkcText,270,223.5, 'text'=>'224', 'fill'=>color,
+ w.create(TkcText,270,223.5, 'text'=>'224', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,270,179,306,179,306,170,314,170,314,135,270,135,
+ i = TkcPolygon.new(w,270,179,306,179,306,170,314,170,314,135,270,135,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '223'
$floorItems2['223'] = i
- w.create(TkcText,292,157, 'text'=>'223', 'fill'=>color,
+ w.create(TkcText,292,157, 'text'=>'223', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,268,179,221,179,221,135,268,135,
+ i = TkcPolygon.new(w,268,179,221,179,221,135,268,135,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '222'
$floorItems2['222'] = i
- w.create(TkcText,244.5,157, 'text'=>'222', 'fill'=>color,
+ w.create(TkcText,244.5,157, 'text'=>'222', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,177,179,219,179,219,135,177,135,
+ i = TkcPolygon.new(w,177,179,219,179,219,135,177,135,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '221'
$floorItems2['221'] = i
- w.create(TkcText,198,157, 'text'=>'221', 'fill'=>color,
+ w.create(TkcText,198,157, 'text'=>'221', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,299,327,349,327,349,284,341,284,341,276,299,276,
+ i = TkcPolygon.new(w,299,327,349,327,349,284,341,284,341,276,299,276,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '204'
$floorItems2['204'] = i
- w.create(TkcText,324,301.5, 'text'=>'204', 'fill'=>color,
+ w.create(TkcText,324,301.5, 'text'=>'204', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,234,276,297,276,297,327,257,327,257,338,234,338,
+ i = TkcPolygon.new(w,234,276,297,276,297,327,257,327,257,338,234,338,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '205'
$floorItems2['205'] = i
- w.create(TkcText,265.5,307, 'text'=>'205', 'fill'=>color,
+ w.create(TkcText,265.5,307, 'text'=>'205', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
i = TkcPolygon.new(w,256,385,256,340,212,340,212,385,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '207'
$floorItems2['207'] = i
- w.create(TkcText,234,362.5, 'text'=>'207', 'fill'=>color,
+ w.create(TkcText,234,362.5, 'text'=>'207', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,210,340,164,340,164,385,210,385,
+ i = TkcPolygon.new(w,210,340,164,340,164,385,210,385,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '208'
$floorItems2['208'] = i
- w.create(TkcText,187,362.5, 'text'=>'208', 'fill'=>color,
+ w.create(TkcText,187,362.5, 'text'=>'208', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,115,340,162,340,162,385,115,385,
+ i = TkcPolygon.new(w,115,340,162,340,162,385,115,385,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '209'
$floorItems2['209'] = i
- w.create(TkcText,138.5,362.5, 'text'=>'209', 'fill'=>color,
+ w.create(TkcText,138.5,362.5, 'text'=>'209', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,89,228,89,156,53,156,53,228,
+ i = TkcPolygon.new(w,89,228,89,156,53,156,53,228,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '217'
$floorItems2['217'] = i
- w.create(TkcText,71,192, 'text'=>'217', 'fill'=>color,
+ w.create(TkcText,71,192, 'text'=>'217', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,89,169,97,169,97,190,89,190,
+ i = TkcPolygon.new(w,89,169,97,169,97,190,89,190,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '217A'
$floorItems2['217A'] = i
- w.create(TkcText,93,179.5, 'text'=>'217A', 'fill'=>color,
+ w.create(TkcText,93,179.5, 'text'=>'217A', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,89,156,89,168,95,168,95,135,53,135,53,156,
+ i = TkcPolygon.new(w,89,156,89,168,95,168,95,135,53,135,53,156,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '216'
$floorItems2['216'] = i
- w.create(TkcText,71,145.5, 'text'=>'216', 'fill'=>color,
+ w.create(TkcText,71,145.5, 'text'=>'216', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,51,179,51,135,6,135,6,179,
+ i = TkcPolygon.new(w,51,179,51,135,6,135,6,179,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '215'
$floorItems2['215'] = i
- w.create(TkcText,28.5,157, 'text'=>'215', 'fill'=>color,
+ w.create(TkcText,28.5,157, 'text'=>'215', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,51,227,6,227,6,180,51,180,
+ i = TkcPolygon.new(w,51,227,6,227,6,180,51,180,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '214'
$floorItems2['214'] = i
- w.create(TkcText,28.5,203.5, 'text'=>'214', 'fill'=>color,
+ w.create(TkcText,28.5,203.5, 'text'=>'214', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,51,275,6,275,6,229,51,229,
+ i = TkcPolygon.new(w,51,275,6,275,6,229,51,229,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '213'
$floorItems2['213'] = i
- w.create(TkcText,28.5,252, 'text'=>'213', 'fill'=>color,
+ w.create(TkcText,28.5,252, 'text'=>'213', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,114,340,67,340,67,385,114,385,
+ i = TkcPolygon.new(w,114,340,67,340,67,385,114,385,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '210'
$floorItems2['210'] = i
- w.create(TkcText,90.5,362.5, 'text'=>'210', 'fill'=>color,
+ w.create(TkcText,90.5,362.5, 'text'=>'210', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,59,389,59,385,65,385,65,340,1,340,1,389,
+ i = TkcPolygon.new(w,59,389,59,385,65,385,65,340,1,340,1,389,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '211'
$floorItems2['211'] = i
- w.create(TkcText,33,364.5, 'text'=>'211', 'fill'=>color,
+ w.create(TkcText,33,364.5, 'text'=>'211', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,393,309,350,309,350,282,342,282,342,276,393,276,
+ i = TkcPolygon.new(w,393,309,350,309,350,282,342,282,342,276,393,276,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '203'
$floorItems2['203'] = i
- w.create(TkcText,367.5,292.5, 'text'=>'203', 'fill'=>color,
+ w.create(TkcText,367.5,292.5, 'text'=>'203', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
i = TkcPolygon.new(w,99,191,91,191,91,226,174,226,174,198,
- 154,198,154,192,109,192,109,169,99,169,
+ 154,198,154,192,109,192,109,169,99,169,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '220'
$floorItems2['220'] = i
- w.create(TkcText,132.5,208.5, 'text'=>'220', 'fill'=>color,
+ w.create(TkcText,132.5,208.5, 'text'=>'220', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,339,205,307,205,307,171,339,171,
+ i = TkcPolygon.new(w,339,205,307,205,307,171,339,171,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = 'Priv Lift2'
$floorItems2['Priv Lift2'] = i
- w.create(TkcText,323,188, 'text'=>'Priv Lift2', 'fill'=>color,
+ w.create(TkcText,323,188, 'text'=>'Priv Lift2', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,307,240,339,240,339,206,307,206,
+ i = TkcPolygon.new(w,307,240,339,240,339,206,307,206,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = 'Pub Lift 2'
$floorItems2['Pub Lift 2'] = i
- w.create(TkcText,323,223, 'text'=>'Pub Lift 2', 'fill'=>color,
+ w.create(TkcText,323,223, 'text'=>'Pub Lift 2', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,175,168,97,168,97,131,175,131,
+ i = TkcPolygon.new(w,175,168,97,168,97,131,175,131,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '218'
$floorItems2['218'] = i
- w.create(TkcText,136,149.5, 'text'=>'218', 'fill'=>color,
+ w.create(TkcText,136,149.5, 'text'=>'218', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,154,191,111,191,111,169,154,169,
+ i = TkcPolygon.new(w,154,191,111,191,111,169,154,169,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '219'
$floorItems2['219'] = i
- w.create(TkcText,132.5,180, 'text'=>'219', 'fill'=>color,
+ w.create(TkcText,132.5,180, 'text'=>'219', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,375,246,375,172,341,172,341,246,
+ i = TkcPolygon.new(w,375,246,375,172,341,172,341,246,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '201'
$floorItems2['201'] = i
- w.create(TkcText,358,209, 'text'=>'201', 'fill'=>color,
+ w.create(TkcText,358,209, 'text'=>'201', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
w.create(TkcLine,641,186,678,186, 'fill'=>color, 'tags'=>['floor2','wall'])
w.create(TkcLine,757,350,757,367, 'fill'=>color, 'tags'=>['floor2','wall'])
@@ -1283,206 +1283,206 @@ def floor2_fg3(w,color)
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = '316'
$floorItems2['316'] = i
- w.create(TkcText,79.5,204, 'text'=>'316', 'fill'=>color,
+ w.create(TkcText,79.5,204, 'text'=>'316', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,115,368,162,368,162,323,115,323,
+ i = TkcPolygon.new(w,115,368,162,368,162,323,115,323,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = '309'
$floorItems2['309'] = i
- w.create(TkcText,138.5,345.5, 'text'=>'309', 'fill'=>color,
+ w.create(TkcText,138.5,345.5, 'text'=>'309', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,164,323,164,368,211,368,211,323,
+ i = TkcPolygon.new(w,164,323,164,368,211,368,211,323,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = '308'
$floorItems2['308'] = i
- w.create(TkcText,187.5,345.5, 'text'=>'308', 'fill'=>color,
+ w.create(TkcText,187.5,345.5, 'text'=>'308', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,256,368,212,368,212,323,256,323,
+ i = TkcPolygon.new(w,256,368,212,368,212,323,256,323,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = '307'
$floorItems2['307'] = i
- w.create(TkcText,234,345.5, 'text'=>'307', 'fill'=>color,
+ w.create(TkcText,234,345.5, 'text'=>'307', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,244,276,297,276,297,327,260,327,260,321,244,321,
+ i = TkcPolygon.new(w,244,276,297,276,297,327,260,327,260,321,244,321,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = '305'
$floorItems2['305'] = i
- w.create(TkcText,270.5,301.5, 'text'=>'305', 'fill'=>color,
+ w.create(TkcText,270.5,301.5, 'text'=>'305', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
i = TkcPolygon.new(w,251,219,251,203,244,203,244,219,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = '324B'
$floorItems2['324B'] = i
- w.create(TkcText,247.5,211, 'text'=>'324B', 'fill'=>color,
+ w.create(TkcText,247.5,211, 'text'=>'324B', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,251,249,244,249,244,232,251,232,
+ i = TkcPolygon.new(w,251,249,244,249,244,232,251,232,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = '324A'
$floorItems2['324A'] = i
- w.create(TkcText,247.5,240.5, 'text'=>'324A', 'fill'=>color,
+ w.create(TkcText,247.5,240.5, 'text'=>'324A', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,223,135,223,179,177,179,177,135,
+ i = TkcPolygon.new(w,223,135,223,179,177,179,177,135,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = '320'
$floorItems2['320'] = i
- w.create(TkcText,200,157, 'text'=>'320', 'fill'=>color,
+ w.create(TkcText,200,157, 'text'=>'320', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,114,368,114,323,67,323,67,368,
+ i = TkcPolygon.new(w,114,368,114,323,67,323,67,368,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = '310'
$floorItems2['310'] = i
- w.create(TkcText,90.5,345.5, 'text'=>'310', 'fill'=>color,
+ w.create(TkcText,90.5,345.5, 'text'=>'310', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,23,277,23,321,68,321,68,277,
+ i = TkcPolygon.new(w,23,277,23,321,68,321,68,277,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = '312'
$floorItems2['312'] = i
- w.create(TkcText,45.5,299, 'text'=>'312', 'fill'=>color,
+ w.create(TkcText,45.5,299, 'text'=>'312', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,23,229,68,229,68,275,23,275,
+ i = TkcPolygon.new(w,23,229,68,229,68,275,23,275,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = '313'
$floorItems2['313'] = i
- w.create(TkcText,45.5,252, 'text'=>'313', 'fill'=>color,
+ w.create(TkcText,45.5,252, 'text'=>'313', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,68,227,23,227,23,180,68,180,
+ i = TkcPolygon.new(w,68,227,23,227,23,180,68,180,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = '314'
$floorItems2['314'] = i
- w.create(TkcText,40.5,203.5, 'text'=>'314', 'fill'=>color,
+ w.create(TkcText,40.5,203.5, 'text'=>'314', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,95,179,95,135,23,135,23,179,
+ i = TkcPolygon.new(w,95,179,95,135,23,135,23,179,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = '315'
$floorItems2['315'] = i
- w.create(TkcText,59,157, 'text'=>'315', 'fill'=>color,
+ w.create(TkcText,59,157, 'text'=>'315', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,99,226,99,204,91,204,91,226,
+ i = TkcPolygon.new(w,99,226,99,204,91,204,91,226,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = '316B'
$floorItems2['316B'] = i
- w.create(TkcText,95,215, 'text'=>'316B', 'fill'=>color,
+ w.create(TkcText,95,215, 'text'=>'316B', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,91,202,99,202,99,180,91,180,
+ i = TkcPolygon.new(w,91,202,99,202,99,180,91,180,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = '316A'
$floorItems2['316A'] = i
- w.create(TkcText,95,191, 'text'=>'316A', 'fill'=>color,
+ w.create(TkcText,95,191, 'text'=>'316A', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
i = TkcPolygon.new(w,97,169,109,169,109,192,154,192,154,198,
- 174,198,174,226,101,226,101,179,97,179,
+ 174,198,174,226,101,226,101,179,97,179,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = '319'
$floorItems2['319'] = i
- w.create(TkcText,141.5,209, 'text'=>'319', 'fill'=>color,
+ w.create(TkcText,141.5,209, 'text'=>'319', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,65,368,58,368,58,389,1,389,1,333,23,333,23,323,65,323,
+ i = TkcPolygon.new(w,65,368,58,368,58,389,1,389,1,333,23,333,23,323,65,323,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = '311'
$floorItems2['311'] = i
- w.create(TkcText,29.5,361, 'text'=>'311', 'fill'=>color,
+ w.create(TkcText,29.5,361, 'text'=>'311', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,154,191,111,191,111,169,154,169,
+ i = TkcPolygon.new(w,154,191,111,191,111,169,154,169,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = '318'
$floorItems2['318'] = i
- w.create(TkcText,132.5,180, 'text'=>'318', 'fill'=>color,
+ w.create(TkcText,132.5,180, 'text'=>'318', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,175,168,97,168,97,131,175,131,
+ i = TkcPolygon.new(w,175,168,97,168,97,131,175,131,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = '317'
$floorItems2['317'] = i
- w.create(TkcText,136,149.5, 'text'=>'317', 'fill'=>color,
+ w.create(TkcText,136,149.5, 'text'=>'317', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,274,194,274,221,306,221,306,194,
+ i = TkcPolygon.new(w,274,194,274,221,306,221,306,194,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = '323'
$floorItems2['323'] = i
- w.create(TkcText,290,207.5, 'text'=>'323', 'fill'=>color,
+ w.create(TkcText,290,207.5, 'text'=>'323', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,306,222,274,222,274,249,306,249,
+ i = TkcPolygon.new(w,306,222,274,222,274,249,306,249,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = '325'
$floorItems2['325'] = i
- w.create(TkcText,290,235.5, 'text'=>'325', 'fill'=>color,
+ w.create(TkcText,290,235.5, 'text'=>'325', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,263,179,224,179,224,135,263,135,
+ i = TkcPolygon.new(w,263,179,224,179,224,135,263,135,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = '321'
$floorItems2['321'] = i
- w.create(TkcText,243.5,157, 'text'=>'321', 'fill'=>color,
+ w.create(TkcText,243.5,157, 'text'=>'321', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
i = TkcPolygon.new(w,314,169,306,169,306,192,273,192,
- 264,181,264,135,314,135,
+ 264,181,264,135,314,135,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = '322'
$floorItems2['322'] = i
- w.create(TkcText,293.5,163.5, 'text'=>'322', 'fill'=>color,
+ w.create(TkcText,293.5,163.5, 'text'=>'322', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,307,240,339,240,339,206,307,206,
+ i = TkcPolygon.new(w,307,240,339,240,339,206,307,206,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = 'Pub Lift3'
$floorItems2['Pub Lift3'] = i
- w.create(TkcText,323,223, 'text'=>'Pub Lift3', 'fill'=>color,
+ w.create(TkcText,323,223, 'text'=>'Pub Lift3', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,339,205,307,205,307,171,339,171,
+ i = TkcPolygon.new(w,339,205,307,205,307,171,339,171,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = 'Priv Lift3'
$floorItems2['Priv Lift3'] = i
- w.create(TkcText,323,188, 'text'=>'Priv Lift3', 'fill'=>color,
+ w.create(TkcText,323,188, 'text'=>'Priv Lift3', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,350,284,376,284,376,276,397,276,397,309,350,309,
+ i = TkcPolygon.new(w,350,284,376,284,376,276,397,276,397,309,350,309,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = '303'
$floorItems2['303'] = i
- w.create(TkcText,373.5,292.5, 'text'=>'303', 'fill'=>color,
+ w.create(TkcText,373.5,292.5, 'text'=>'303', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
i = TkcPolygon.new(w,272,203,272,249,252,249,252,230,
- 244,230,244,221,252,221,252,203,
+ 244,230,244,221,252,221,252,203,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = '324'
$floorItems2['324'] = i
- w.create(TkcText,262,226, 'text'=>'324', 'fill'=>color,
+ w.create(TkcText,262,226, 'text'=>'324', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,299,276,299,327,349,327,349,284,341,284,341,276,
+ i = TkcPolygon.new(w,299,276,299,327,349,327,349,284,341,284,341,276,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = '304'
$floorItems2['304'] = i
- w.create(TkcText,324,301.5, 'text'=>'304', 'fill'=>color,
+ w.create(TkcText,324,301.5, 'text'=>'304', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,375,246,375,172,341,172,341,246,
+ i = TkcPolygon.new(w,375,246,375,172,341,172,341,246,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = '301'
$floorItems2['301'] = i
- w.create(TkcText,358,209, 'text'=>'301', 'fill'=>color,
+ w.create(TkcText,358,209, 'text'=>'301', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,397,246,377,246,377,185,397,185,
+ i = TkcPolygon.new(w,397,246,377,246,377,185,397,185,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = '327'
$floorItems2['327'] = i
- w.create(TkcText,387,215.5, 'text'=>'327', 'fill'=>color,
+ w.create(TkcText,387,215.5, 'text'=>'327', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,316,131,316,169,377,169,377,185,397,185,397,131,
+ i = TkcPolygon.new(w,316,131,316,169,377,169,377,185,397,185,397,131,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = '326'
$floorItems2['326'] = i
- w.create(TkcText,365.5,150, 'text'=>'326', 'fill'=>color,
+ w.create(TkcText,365.5,150, 'text'=>'326', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
i = TkcPolygon.new(w,308,251,242,251,242,274,342,274,342,282,375, 282,
- 375,274,397,274,397,248,339,248,339,242,308,242,
+ 375,274,397,274,397,248,339,248,339,242,308,242,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = '302'
$floorItems2['302'] = i
- w.create(TkcText,319.5,261, 'text'=>'302', 'fill'=>color,
+ w.create(TkcText,319.5,261, 'text'=>'302', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
i = TkcPolygon.new(w,70,321,242,321,242,200,259,200,259,203,272,203,
272,193,263,180,242,180,175,180,175,169,156,169,
156,196,177,196,177,228,107,228,70,228,70,275,107,275,
- 107,248,160,248,160,301,107,301,107,275,70,275,
+ 107,248,160,248,160,301,107,301,107,275,70,275,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = '306'
$floorItems2['306'] = i
- w.create(TkcText,200.5,284.5, 'text'=>'306', 'fill'=>color,
+ w.create(TkcText,200.5,284.5, 'text'=>'306', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
w.create(TkcLine,341,275,341,283, 'fill'=>color, 'tags'=>['floor3','wall'])
w.create(TkcLine,162,197,155,197, 'fill'=>color, 'tags'=>['floor3','wall'])
@@ -1577,7 +1577,7 @@ end
# toplevel widget
if defined?($floor2_demo) && $floor2_demo
- $floor2_demo.destroy
+ $floor2_demo.destroy
$floor2_demo = nil
end
@@ -1593,7 +1593,7 @@ $floor2_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($floor2_demo).pack(:fill=>:both, :expand=>true)
# label
-TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'8i', 'justify'=>'left',
+TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'8i', 'justify'=>'left',
'text'=>"This window contains a canvas widget showing the floorplan of Digital Equipment Corporation's Western Research Laboratory. It has three levels. At any given time one of the levels is active, meaning that you can see its room structure. To activate a level, click the left mouse button anywhere on it. As the mouse moves over the active level, the room under the mouse lights up and its room number appears in the \"Room:\" entry. You can also type a room number in the entry and the room will light up."){
pack('side'=>'top')
}
@@ -1616,18 +1616,18 @@ $floor2_buttons = TkFrame.new(base_frame) {|frame|
}
$floor2_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-#
+#
$floorLabels2 = {}
$floorItems2 = {}
-# canvas
+# canvas
if $tk_version =~ /^4\.[01]/
$floor2_canvas_frame = TkFrame.new(base_frame,'bd'=>2,'relief'=>'sunken',
'highlightthickness'=>2)
- $floor2_canvas = TkCanvas.new($floor2_canvas_frame,
- 'width'=>900, 'height'=>500, 'borderwidth'=>0,
+ $floor2_canvas = TkCanvas.new($floor2_canvas_frame,
+ 'width'=>900, 'height'=>500, 'borderwidth'=>0,
'highlightthickness'=>0) {|c|
- TkScrollbar.new(base_frame, 'orient'=>'horiz',
+ TkScrollbar.new(base_frame, 'orient'=>'horiz',
'command'=>proc{|*args| c.xview(*args)}){|hs|
c.xscrollcommand(proc{|first,last| hs.set first,last})
pack('side'=>'bottom', 'fill'=>'x')
@@ -1648,20 +1648,20 @@ else
v = TkScrollbar.new(f, 'highlightthickness'=>0, 'orient'=>'vertical')
TkFrame.new(f, 'bd'=>2, 'relief'=>'sunken') {|f1|
- $floor2_canvas = TkCanvas.new(f1, 'width'=>900, 'height'=>500,
- 'borderwidth'=>0,
+ $floor2_canvas = TkCanvas.new(f1, 'width'=>900, 'height'=>500,
+ 'borderwidth'=>0,
'highlightthickness'=>0) {
xscrollcommand(proc{|first,last| h.set first,last})
yscrollcommand(proc{|first,last| v.set first,last})
pack('expand'=>'yes', 'fill'=>'both')
}
- grid('padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>0,
+ grid('padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>0,
'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
}
- v.grid('padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>1,
+ v.grid('padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>1,
'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
- h.grid('padx'=>1, 'pady'=>1, 'row'=>1, 'column'=>0,
+ h.grid('padx'=>1, 'pady'=>1, 'row'=>1, 'column'=>0,
'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
TkGrid.rowconfigure(f, 0, 'weight'=>1, 'minsize'=>0)
@@ -1678,7 +1678,7 @@ end
# Create an entry for displaying and typing in current room.
$currentRoom2 = TkVariable.new
-$floor2_entry = TkEntry.new($floor2_canvas, 'width'=>10, 'relief'=>'sunken',
+$floor2_entry = TkEntry.new($floor2_canvas, 'width'=>10, 'relief'=>'sunken',
'bd'=>2, 'textvariable'=>$currentRoom2)
# Choose colors, then fill in the floorplan.
@@ -1715,7 +1715,7 @@ $floor2_canvas.itembind('floor3', '1', proc{floorDisplay2 $floor2_canvas,3})
$floor2_canvas.itembind('room', 'Enter', proc{newRoom2 $floor2_canvas})
$floor2_canvas.itembind('room', 'Leave', proc{$currentRoom2.value = ''})
$floor2_canvas.bind('2', proc{|x,y| $floor2_canvas.scan_mark x,y}, '%x %y')
-$floor2_canvas.bind('B2-Motion',
+$floor2_canvas.bind('B2-Motion',
proc{|x,y| $floor2_canvas.scan_dragto x,y}, '%x %y')
$floor2_canvas.bind('Destroy', proc{$currentRoom2.unset})
$currentRoom2.value = ''
diff --git a/ext/tk/sample/demos-en/form.rb b/ext/tk/sample/demos-en/form.rb
index abb3e0e10e..3119752b1c 100644
--- a/ext/tk/sample/demos-en/form.rb
+++ b/ext/tk/sample/demos-en/form.rb
@@ -4,7 +4,7 @@
# toplevel widget
if defined?($form_demo) && $form_demo
- $form_demo.destroy
+ $form_demo.destroy
$form_demo = nil
end
@@ -43,7 +43,7 @@ TkFrame.new(base_frame) {|frame|
}.pack('side'=>'left', 'expand'=>'yes')
}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-# entry
+# entry
form_data = []
(1..5).each{|i|
f = TkFrame.new(base_frame, 'bd'=>2)
@@ -54,7 +54,7 @@ form_data = []
form_data[i] = {'frame'=>f, 'entry'=>e, 'label'=>l}
}
-#
+#
form_data[1]['label'].text('Name:')
form_data[2]['label'].text('Address:')
form_data[5]['label'].text('Phone:')
diff --git a/ext/tk/sample/demos-en/goldberg.rb b/ext/tk/sample/demos-en/goldberg.rb
index d3956ef78c..c6fa37c09c 100644
--- a/ext/tk/sample/demos-en/goldberg.rb
+++ b/ext/tk/sample/demos-en/goldberg.rb
@@ -43,7 +43,7 @@
#>># lots of canvas create and move calls.
if defined?($goldberg_demo) && $goldberg_demo
- $goldberg_demo.destroy
+ $goldberg_demo.destroy
$goldberg_demo = nil
end
@@ -101,7 +101,7 @@ class TkGoldberg_Demo
@S['pause'] = TkVariable.new
@S['details'] = TkVariable.new(true)
- @S['mode'] = TkVariable.new(:MSTART, :symbol)
+ @S['mode'] = TkVariable.new(:MSTART, :symbol)
# :MSTART, :MGO, :MPAUSE, :MSSTEP, :MBSTEP, :MDONE, :MDEBUG
# 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10
@@ -132,19 +132,19 @@ class TkGoldberg_Demo
@XY = {}
@XY6 = {
- '-1'=>[366, 207], '-2'=>[349, 204], '-3'=>[359, 193], '-4'=>[375, 192],
+ '-1'=>[366, 207], '-2'=>[349, 204], '-3'=>[359, 193], '-4'=>[375, 192],
'-5'=>[340, 190], '-6'=>[349, 177], '-7'=>[366, 177], '-8'=>[380, 176],
- '-9'=>[332, 172], '-10'=>[342, 161], '-11'=>[357, 164],
- '-12'=>[372, 163], '-13'=>[381, 149], '-14'=>[364, 151],
- '-15'=>[349, 146], '-16'=>[333, 148], '0'=>[357, 219],
- '1'=>[359, 261], '2'=>[359, 291], '3'=>[359, 318], '4'=>[361, 324],
- '5'=>[365, 329], '6'=>[367, 334], '7'=>[367, 340], '8'=>[366, 346],
- '9'=>[364, 350], '10'=>[361, 355], '11'=>[359, 370], '12'=>[359, 391],
- '13,0'=>[360, 456], '13,1'=>[376, 456], '13,2'=>[346, 456],
- '13,3'=>[330, 456], '13,4'=>[353, 444], '13,5'=>[368, 443],
- '13,6'=>[339, 442], '13,7'=>[359, 431], '13,8'=>[380, 437],
- '13,9'=>[345, 428], '13,10'=>[328, 434], '13,11'=>[373, 424],
- '13,12'=>[331, 420], '13,13'=>[360, 417], '13,14'=>[345, 412],
+ '-9'=>[332, 172], '-10'=>[342, 161], '-11'=>[357, 164],
+ '-12'=>[372, 163], '-13'=>[381, 149], '-14'=>[364, 151],
+ '-15'=>[349, 146], '-16'=>[333, 148], '0'=>[357, 219],
+ '1'=>[359, 261], '2'=>[359, 291], '3'=>[359, 318], '4'=>[361, 324],
+ '5'=>[365, 329], '6'=>[367, 334], '7'=>[367, 340], '8'=>[366, 346],
+ '9'=>[364, 350], '10'=>[361, 355], '11'=>[359, 370], '12'=>[359, 391],
+ '13,0'=>[360, 456], '13,1'=>[376, 456], '13,2'=>[346, 456],
+ '13,3'=>[330, 456], '13,4'=>[353, 444], '13,5'=>[368, 443],
+ '13,6'=>[339, 442], '13,7'=>[359, 431], '13,8'=>[380, 437],
+ '13,9'=>[345, 428], '13,10'=>[328, 434], '13,11'=>[373, 424],
+ '13,12'=>[331, 420], '13,13'=>[360, 417], '13,14'=>[345, 412],
'13,15'=>[376, 410], '13,16'=>[360, 403]
}
@@ -161,11 +161,11 @@ class TkGoldberg_Demo
def do_display()
@ctrl = TkFrame.new(@parent, :relief=>:ridge, :bd=>2, :padx=>5, :pady=>5)
- @screen = TkFrame.new(@parent, :bd=>2,
- :relief=>:raised).pack(:side=>:left, :fill=>:both,
+ @screen = TkFrame.new(@parent, :bd=>2,
+ :relief=>:raised).pack(:side=>:left, :fill=>:both,
:expand=>true)
- @canvas = TkCanvas.new(@parent, :width=>850, :height=>700,
+ @canvas = TkCanvas.new(@parent, :width=>850, :height=>700,
:bg=>@C['bg'], :highlightthickness=>0){
scrollregion([0, 0, 1000, 1000]) # Kludge to move everything up
yview_moveto(0.05)
@@ -204,8 +204,8 @@ class TkGoldberg_Demo
command proc{showCode 'goldberg'}
}.pack('side'=>'left', 'padx'=>5)
- # @show = TkButton.new(frame, :text=>'>>', :command=>proc{show_ctrl},
- @show = Tk::Button.new(frame, :text=>'>>', :command=>proc{show_ctrl},
+ # @show = TkButton.new(frame, :text=>'>>', :command=>proc{show_ctrl},
+ @show = Tk::Button.new(frame, :text=>'>>', :command=>proc{show_ctrl},
:bg=>@C['bg'], :activebackground=>@C['bg'])
@show.pack('side'=>'left')
frame.place(:in=>@canvas, :relx=>1, :rely=>0, :anchor=>:ne)
@@ -214,34 +214,34 @@ class TkGoldberg_Demo
end
def do_ctrl_frame
- @start = Tk::Button.new(@parent, :text=>'Start', :bd=>6,
+ @start = Tk::Button.new(@parent, :text=>'Start', :bd=>6,
:command=>proc{do_button(0)})
if font = @start['font']
@start.font(font.weight('bold'))
end
- @pause = TkCheckbutton.new(@parent, :text=>'Pause', :font=>font,
- :command=>proc{do_button(1)}, :relief=>:raised,
+ @pause = TkCheckbutton.new(@parent, :text=>'Pause', :font=>font,
+ :command=>proc{do_button(1)}, :relief=>:raised,
:variable=>@S['pause'])
- @step = TkButton.new(@parent, :text=>'Single Step', :font=>font,
+ @step = TkButton.new(@parent, :text=>'Single Step', :font=>font,
:command=>proc{do_button(2)})
- @bstep = TkButton.new(@parent, :text=>'Big Step', :font=>font,
+ @bstep = TkButton.new(@parent, :text=>'Big Step', :font=>font,
:command=>proc{do_button(4)})
- @reset = TkButton.new(@parent, :text=>'Reset', :font=>font,
+ @reset = TkButton.new(@parent, :text=>'Reset', :font=>font,
:command=>proc{do_button(3)})
@details = TkFrame.new(@parent, :bd=>2, :relief=>:ridge)
- @detail = TkCheckbutton.new(@parent, :text=>'Details', :font=>font,
+ @detail = TkCheckbutton.new(@parent, :text=>'Details', :font=>font,
:relief=>:raised, :variable=>@S['details'])
- @msg_entry = TkEntry.new(@parent, :textvariable=>@S['message'],
+ @msg_entry = TkEntry.new(@parent, :textvariable=>@S['message'],
:justify=>:center)
- @speed_scale = TkScale.new(@parent, :orient=>:horizontal,
- :from=>1, :to=>10, :font=>font,
- :variable=>@S['speed'], :bd=>2,
+ @speed_scale = TkScale.new(@parent, :orient=>:horizontal,
+ :from=>1, :to=>10, :font=>font,
+ :variable=>@S['speed'], :bd=>2,
:relief=>:ridge, :showvalue=>false)
- @about = TkButton.new(@parent, :text=>'About',
+ @about = TkButton.new(@parent, :text=>'About',
:command=>proc{about}, :font=>font)
Tk.grid(@start, :in=>@ctrl, :row=>0, :sticky=>:ew)
@@ -269,17 +269,17 @@ class TkGoldberg_Demo
def do_detail_frame
@f_details = TkFrame.new(@details)
- @label = TkLabel.new(@f_details, :textvariable=>@S['cnt'],
+ @label = TkLabel.new(@f_details, :textvariable=>@S['cnt'],
:bd=>1, :relief=>:solid, :bg=>'white')
Tk.grid(@label, '-', '-', '-', :sticky=>:ew, :row=>0)
idx = 1
loop {
break unless respond_to?("move#{idx}")
- l = TkLabel.new(@f_details, :text=>idx, :anchor=>:e,
+ l = TkLabel.new(@f_details, :text=>idx, :anchor=>:e,
:width=>2, :bd=>1, :relief=>:solid, :bg=>'white')
@STEP[idx] = 0
- ll = TkLabel.new(@f_details, :textvariable=>@STEP.ref(idx),
+ ll = TkLabel.new(@f_details, :textvariable=>@STEP.ref(idx),
:width=>5, :bd=>1, :relief=>:solid, :bg=>'white')
row = (idx + 1)/2
col = ((idx + 1) & 1) * 2
@@ -383,7 +383,7 @@ class TkGoldberg_Demo
who = who.to_i
n = send("move#{who}")
if (n & 1).nonzero? # This guy still alive
- alive << who
+ alive << who
end
if (n & 2).nonzero? # Next guy is active
alive << (who + 1)
@@ -416,10 +416,10 @@ class TkGoldberg_Demo
# START HERE! banner
def draw0
color = @C['0']
- TkcText.new(@canvas, [579, 119], :text=>'START HERE!',
- :fill=>color, :anchor=>:w,
+ TkcText.new(@canvas, [579, 119], :text=>'START HERE!',
+ :fill=>color, :anchor=>:w,
:tag=>'I0', :font=>['Times Roman', 12, :italic, :bold])
- TkcLine.new(@canvas, [719, 119, 763, 119], :tag=>'I0', :fill=>color,
+ TkcLine.new(@canvas, [719, 119, 763, 119], :tag=>'I0', :fill=>color,
:width=>5, :arrow=>:last, :arrowshape=>[18, 18, 5])
@canvas.itembind('I0', '1'){ start }
end
@@ -433,7 +433,7 @@ class TkGoldberg_Demo
end
pos = [
- [673, 119], [678, 119], [683, 119], [688, 119],
+ [673, 119], [678, 119], [683, 119], [688, 119],
[693, 119], [688, 119], [683, 119], [678, 119]
]
step = step % pos.length
@@ -445,15 +445,15 @@ class TkGoldberg_Demo
def draw1
color = @C['1a']
color2 = @C['1b']
- TkcPolygon.new(@canvas,
- [ 844, 133, 800, 133, 800, 346, 820, 346,
- 820, 168, 844, 168, 844, 133 ],
+ TkcPolygon.new(@canvas,
+ [ 844, 133, 800, 133, 800, 346, 820, 346,
+ 820, 168, 844, 168, 844, 133 ],
:width=>3, :fill=>color, :outline=>'')
- TkcPolygon.new(@canvas,
- [ 771, 133, 685, 133, 685, 168, 751, 168,
- 751, 346, 771, 346, 771, 133 ],
+ TkcPolygon.new(@canvas,
+ [ 771, 133, 685, 133, 685, 168, 751, 168,
+ 751, 346, 771, 346, 771, 133 ],
:width=>3, :fill=>color, :outline=>'')
- TkcOval.new(@canvas, box(812, 122, 9),
+ TkcOval.new(@canvas, box(812, 122, 9),
:tag=>'I1', :fill=>color2, :outline=>'')
@canvas.itembind('I1', '1'){ start }
@@ -462,9 +462,9 @@ class TkGoldberg_Demo
def move1(step = nil)
step = get_step(1, step)
pos = [
- [807, 122], [802, 122], [797, 123], [793, 124], [789, 129], [785, 153],
- [785, 203], [785, 278, :x], [785, 367], [810, 392], [816, 438],
- [821, 503], [824, 585, :y], [838, 587], [848, 593], [857, 601],
+ [807, 122], [802, 122], [797, 123], [793, 124], [789, 129], [785, 153],
+ [785, 203], [785, 278, :x], [785, 367], [810, 392], [816, 438],
+ [821, 503], [824, 585, :y], [838, 587], [848, 593], [857, 601],
[-100, -100]
]
return 0 if step >= pos.length
@@ -480,40 +480,40 @@ class TkGoldberg_Demo
color = @C['2']
# Fulcrum
- TkcPolygon.new(@canvas, [750, 369, 740, 392, 760, 392],
+ TkcPolygon.new(@canvas, [750, 369, 740, 392, 760, 392],
:fill=>@C['fg'], :outline=>@C['fg'])
# Strike box
- TkcRectangle.new(@canvas, [628, 335, 660, 383],
+ TkcRectangle.new(@canvas, [628, 335, 660, 383],
:fill=>'', :outline=>@C['fg'])
(0..2).each{|y|
yy = 335 + y*16
- TkcBitmap.new(@canvas, [628, yy], :bitmap=>'gray25',
+ TkcBitmap.new(@canvas, [628, yy], :bitmap=>'gray25',
:anchor=>:nw, :foreground=>@C['fg'])
- TkcBitmap.new(@canvas, [644, yy], :bitmap=>'gray25',
+ TkcBitmap.new(@canvas, [644, yy], :bitmap=>'gray25',
:anchor=>:nw, :foreground=>@C['fg'])
}
# Lever
- TkcLine.new(@canvas, [702, 366, 798, 366],
+ TkcLine.new(@canvas, [702, 366, 798, 366],
:fill=>@C['fg'], :width=>6, :tag=>'I2_0')
# R strap
- TkcLine.new(@canvas, [712, 363, 712, 355],
+ TkcLine.new(@canvas, [712, 363, 712, 355],
:fill=>@C['fg'], :width=>3, :tag=>'I2_1')
# L strap
- TkcLine.new(@canvas, [705, 363, 705, 355],
+ TkcLine.new(@canvas, [705, 363, 705, 355],
:fill=>@C['fg'], :width=>3, :tag=>'I2_2')
# Match stick
- TkcLine.new(@canvas, [679, 356, 679, 360, 717, 360, 717, 356, 679, 356],
+ TkcLine.new(@canvas, [679, 356, 679, 360, 717, 360, 717, 356, 679, 356],
:fill=>@C['fg'], :width=>3, :tag=>'I2_3')
# Match head
- TkcPolygon.new(@canvas,
- [ 671, 352, 677.4, 353.9, 680, 358.5, 677.4, 363.1,
- 671, 365, 664.6, 363.1, 662, 358.5, 664.6, 353.9 ],
+ TkcPolygon.new(@canvas,
+ [ 671, 352, 677.4, 353.9, 680, 358.5, 677.4, 363.1,
+ 671, 365, 664.6, 363.1, 662, 358.5, 664.6, 353.9 ],
:fill=>color, :outline=>color, :tag=>'I2_4')
end
@@ -523,15 +523,15 @@ class TkGoldberg_Demo
stages = [0, 0, 1, 2, 0, 2, 1, 0, 1, 2, 0, 2, 1]
xy = []
xy[0] = [
- 686, 333, 692, 323, 682, 316, 674, 309, 671, 295, 668, 307,
+ 686, 333, 692, 323, 682, 316, 674, 309, 671, 295, 668, 307,
662, 318, 662, 328, 671, 336
]
xy[1] = [
- 687, 331, 698, 322, 703, 295, 680, 320, 668, 297, 663, 311,
+ 687, 331, 698, 322, 703, 295, 680, 320, 668, 297, 663, 311,
661, 327, 671, 335
]
xy[2] = [
- 686, 331, 704, 322, 688, 300, 678, 283, 678, 283, 674, 298,
+ 686, 331, 704, 322, 688, 300, 678, 283, 678, 283, 674, 298,
666, 309, 660, 324, 672, 336
]
@@ -542,7 +542,7 @@ class TkGoldberg_Demo
if step == 0 # Rotate the match
beta = 20
-
+
ox, oy = anchor('I2_0', :s) # Where to pivot
i = 0
@@ -567,23 +567,23 @@ class TkGoldberg_Demo
xy = [ [602, 296], [577, 174], [518, 174] ]
xy.each{|x, y| # 3 Pulleys
- TkcOval.new(@canvas, box(x, y, 13),
+ TkcOval.new(@canvas, box(x, y, 13),
:fill=>color, :outline=>@C['fg'], :width=>3)
TkcOval.new(@canvas, box(x, y, 2), :fill=>@C['fg'], :outline=>@C['fg'])
}
# Wall to flame
- TkcLine.new(@canvas, [750, 309, 670, 309], :tag=>'I3_s',
+ TkcLine.new(@canvas, [750, 309, 670, 309], :tag=>'I3_s',
:width=>3, :fill=>@C['fg'], :smooth=>true)
# Flame to pulley 1
- TkcLine.new(@canvas, [670, 309, 650, 309], :tag=>'I3_0',
+ TkcLine.new(@canvas, [670, 309, 650, 309], :tag=>'I3_0',
:width=>3, :fill=>@C['fg'], :smooth=>true)
- TkcLine.new(@canvas, [650, 309, 600, 309], :tag=>'I3_1',
+ TkcLine.new(@canvas, [650, 309, 600, 309], :tag=>'I3_1',
:width=>3, :fill=>@C['fg'], :smooth=>true)
# Pulley 1 half way to 2
- TkcLine.new(@canvas, [589, 296, 589, 235], :tag=>'I3_2',
+ TkcLine.new(@canvas, [589, 296, 589, 235], :tag=>'I3_2',
:width=>3, :fill=>@C['fg'])
# Pulley 1 other half to 2
@@ -593,26 +593,26 @@ class TkGoldberg_Demo
TkcLine.new(@canvas, [577, 161, 518, 161], :width=>3, :fill=>@C['fg'])
# Down to weight
- TkcLine.new(@canvas, [505, 174, 505, 205], :tag=>'I3_w',
+ TkcLine.new(@canvas, [505, 174, 505, 205], :tag=>'I3_w',
:width=>3, :fill=>@C['fg'])
# Draw the weight as 2 circles, two rectangles and 1 rounded rectangle
x1, y1, x2, y2 = [515, 207, 495, 207]
- TkcOval.new(@canvas, box(x1, y1, 6),
+ TkcOval.new(@canvas, box(x1, y1, 6),
:tag=>'I3_', :fill=>color2, :outline=>color2)
- TkcOval.new(@canvas, box(x2, y2, 6),
+ TkcOval.new(@canvas, box(x2, y2, 6),
:tag=>'I3_', :fill=>color2, :outline=>color2)
- TkcRectangle.new(@canvas, x1, y1 - 6, x2, y2 + 6,
+ TkcRectangle.new(@canvas, x1, y1 - 6, x2, y2 + 6,
:tag=>'I3_', :fill=>color2, :outline=>color2)
-
- TkcPolygon.new(@canvas, round_rect([492, 220, 518, 263], 15),
+
+ TkcPolygon.new(@canvas, round_rect([492, 220, 518, 263], 15),
:smooth=>true, :tag=>'I3_', :fill=>color2, :outline=>color2)
- TkcLine.new(@canvas, [500, 217, 511, 217],
+ TkcLine.new(@canvas, [500, 217, 511, 217],
:tag=>'I3_', :fill=>color2, :width=>10)
# Bottom weight target
- TkcLine.new(@canvas, [502, 393, 522, 393, 522, 465],
+ TkcLine.new(@canvas, [502, 393, 522, 393, 522, 465],
:tag=>'I3__', :fill=>@C['fg'], :joinstyle=>:miter, :width=>10)
end
@@ -655,7 +655,7 @@ class TkGoldberg_Demo
}
# Swing gate
- TkcLine.new(@canvas, [518, 464, 518, 428],
+ TkcLine.new(@canvas, [518, 464, 518, 428],
:tag=>'I4', :fill=>color, :width=>1)
end
@@ -682,7 +682,7 @@ class TkGoldberg_Demo
TkcPolygon.new(@canvas, xy, :fill=>color2, :outline=>@C['fg'], :width=>3)
xy = [
- 534.5, 445.5, 541, 440, 552, 436, 560, 436, 569, 440, 574, 446,
+ 534.5, 445.5, 541, 440, 552, 436, 560, 436, 569, 440, 574, 446,
575, 452, 574, 454, 566, 456, 554, 456, 545, 456, 537, 454, 530, 452
]
TkcPolygon.new(@canvas, xy, :tag=>['I5', 'I5_0'], :fill=>color)
@@ -692,7 +692,7 @@ class TkGoldberg_Demo
xy = box(540, 446, 2) # Eye
xy = [540, 444, 541, 445, 541, 447, 540, 448, 538, 447, 538, 445]
- TkcPolygon.new(@canvas, xy, :tag=>['I5', 'I5_2'], :fill=>@C['bg'],
+ TkcPolygon.new(@canvas, xy, :tag=>['I5', 'I5_2'], :fill=>@C['bg'],
:outline=>'', :smooth=>true)
xy = [538, 454, 535, 461] # Front leg
@@ -712,9 +712,9 @@ class TkGoldberg_Demo
step = get_step(5, step)
pos = [
- [553, 452], [533, 452], [513, 452], [493, 452], [473, 452],
- [463, 442, 30], [445.5, 441.5, 30], [425.5, 434.5, 30], [422, 414],
- [422, 394], [422, 374], [422, 354], [422, 334], [422, 314], [422, 294],
+ [553, 452], [533, 452], [513, 452], [493, 452], [473, 452],
+ [463, 442, 30], [445.5, 441.5, 30], [425.5, 434.5, 30], [422, 414],
+ [422, 394], [422, 374], [422, 354], [422, 334], [422, 314], [422, 294],
[422, 274, -30], [422, 260.5, -30, :x], [422.5, 248.5, -28], [425, 237]
]
@@ -735,16 +735,16 @@ class TkGoldberg_Demo
color = @C['6']
xy = [324, 130, 391, 204] # Ball holder
xy = round_rect(xy, 10)
- TkcPolygon.new(@canvas, xy, :smooth=>true,
+ TkcPolygon.new(@canvas, xy, :smooth=>true,
:outline=>@C['fg'], :width=>3, :fill=>color)
xy = [339, 204, 376, 253] # Below the ball holder
- TkcRectangle.new(@canvas, xy, :outline=>@C['fg'], :width=>3,
+ TkcRectangle.new(@canvas, xy, :outline=>@C['fg'], :width=>3,
:fill=>color, :tag=>'I6c')
xy = box(346, 339, 28)
TkcOval.new(@canvas, xy, :fill=>color, :outline=>'') # Roter
- TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>2, :style=>:arc,
+ TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>2, :style=>:arc,
:start=>80, :extent=>205)
- TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>2, :style=>:arc,
+ TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>2, :style=>:arc,
:start=>-41, :extent=>85)
xy = box(346, 339, 15) # Center of rotor
@@ -759,10 +759,10 @@ class TkGoldberg_Demo
TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>'')
xy = [
- 368, 356, 368, 403, 389, 403, 389, 464, 320, 464, 320, 403,
+ 368, 356, 368, 403, 389, 403, 389, 464, 320, 464, 320, 403,
352, 403, 352, 366
]
- TkcPolygon.new(@canvas, xy, :fill=>color, :outline=>'',
+ TkcPolygon.new(@canvas, xy, :fill=>color, :outline=>'',
:width=>2) # Below rotor
TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2)
xy = box(275, 342, 7) # On/off rotor
@@ -787,7 +787,7 @@ class TkGoldberg_Demo
loc = -i
color = colors[i]
x, y = @XY6["#{loc}"]
- TkcOval.new(@canvas, box(x, y, 5),
+ TkcOval.new(@canvas, box(x, y, 5),
:fill=>color, :outline=>color, :tag=>"I6_b#{i}")
}
draw6a(12) # The wheel
@@ -813,7 +813,7 @@ class TkGoldberg_Demo
@canvas.move('I6_', -7, 0)
if step == 1 # Poke a hole
xy = [348, 226, 365, 240]
- TkcRectangle.new(@canvas, xy, :fill=>@canvas.itemcget('I6c', :fill),
+ TkcRectangle.new(@canvas, xy, :fill=>@canvas.itemcget('I6c', :fill),
:outline=>'')
end
return 1
@@ -853,24 +853,24 @@ class TkGoldberg_Demo
def draw7
color = @C['7']
xy = [198, 306, 277, 374] # Box
- TkcRectangle.new(@canvas, xy, :outline=>@C['fg'], :width=>2,
+ TkcRectangle.new(@canvas, xy, :outline=>@C['fg'], :width=>2,
:fill=>color, :tag=>'I7z')
@canvas.lower('I7z')
xy = [275, 343, 230, 349]
- TkcLine.new(@canvas, xy, :tag=>'I7', :fill=>@C['fg'], :arrow=>:last,
+ TkcLine.new(@canvas, xy, :tag=>'I7', :fill=>@C['fg'], :arrow=>:last,
:arrowshape=>[23, 23, 8], :width=>6)
xy = [225, 324] # On button
x, y = xy
TkcOval.new(@canvas, box(x, y, 3), :fill=>@C['fg'], :outline=>@C['fg'])
xy = [218, 323] # On text
font = ['Times Roman', 8]
- TkcText.new(@canvas, xy, :text=>'on', :anchor=>:e,
+ TkcText.new(@canvas, xy, :text=>'on', :anchor=>:e,
:fill=>@C['fg'], :font=>font)
xy = [225, 350] # Off button
x, y = xy
TkcOval.new(@canvas, box(x, y, 3), :fill=>@C['fg'], :outline=>@C['fg'])
xy = [218, 349] # Off text
- TkcText.new(@canvas, xy, :text=>'off', :anchor=>:e,
+ TkcText.new(@canvas, xy, :text=>'off', :anchor=>:e,
:fill=>@C['fg'], :font=>font)
end
@@ -915,7 +915,7 @@ class TkGoldberg_Demo
xy = [280, 209, 296, 248]
TkcOval.new(@canvas, xy, :outline=>color, :fill=>color)
xy = [
- 288, 249, 252, 249, 260, 240, 280, 234,
+ 288, 249, 252, 249, 260, 240, 280, 234,
296, 234, 316, 240, 324, 249, 288, 249
]
TkcPolygon.new(@canvas, xy, :fill=>color, :smooth=>true)
@@ -924,16 +924,16 @@ class TkGoldberg_Demo
TkcPolygon.new(@canvas, xy, :fill=>color)
xy = [255, 206, 265, 234] # Fan blades
- TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'],
+ TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'],
:width=>3, :tag=>'I9_0')
xy = [255, 176, 265, 204]
- TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'],
+ TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'],
:width=>3, :tag=>'I9_0')
xy = [255, 206, 265, 220]
- TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'],
+ TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'],
:width=>1, :tag=>'I9_1')
xy = [255, 190, 265, 204]
- TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'],
+ TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'],
:width=>1, :tag=>'I9_1')
end
@@ -958,17 +958,17 @@ class TkGoldberg_Demo
color = @C['10a']
color2 = @C['10b']
xy = [191, 230, 233, 230, 233, 178, 191, 178] # Sail
- TkcPolygon.new(@canvas, xy, :fill=>color, :width=>3, :outline=>@C['fg'],
+ TkcPolygon.new(@canvas, xy, :fill=>color, :width=>3, :outline=>@C['fg'],
:tag=>'I10')
xy = box(209, 204, 31) # Front
- TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :style=>:pie,
+ TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :style=>:pie,
:start=>120, :extent=>120, :tag=>'I10')
- TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc,
+ TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc,
:start=>120, :extent=>120, :tag=>'I10')
xy = box(249, 204, 31) # Back
- TkcArc.new(@canvas, xy, :outline=>'', :fill=>@C['bg'], :width=>3,
+ TkcArc.new(@canvas, xy, :outline=>'', :fill=>@C['bg'], :width=>3,
:style=>:pie, :start=>120, :extent=>120, :tag=>'I10')
- TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc,
+ TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc,
:start=>120, :extent=>120, :tag=>'I10')
xy = [200, 171, 200, 249] # Mast
@@ -988,10 +988,10 @@ class TkGoldberg_Demo
TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3)
xy = box(239, 262, 17)
- TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc,
+ TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc,
:start=>95, :extent=>103)
xy = box(76, 266, 21)
- TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc,
+ TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc,
:extent=>190)
end
@@ -999,9 +999,9 @@ class TkGoldberg_Demo
step = get_step(10, step)
pos = [
- [195, 212], [193, 212], [190, 212], [186, 212], [181, 212], [176, 212],
- [171, 212], [166, 212], [161, 212], [156, 212], [151, 212], [147, 212],
- [142, 212], [137, 212], [132, 212, :x], [127, 212], [121, 212],
+ [195, 212], [193, 212], [190, 212], [186, 212], [181, 212], [176, 212],
+ [171, 212], [166, 212], [161, 212], [156, 212], [151, 212], [147, 212],
+ [142, 212], [137, 212], [132, 212, :x], [127, 212], [121, 212],
[116, 212], [111, 212]
]
@@ -1028,21 +1028,21 @@ class TkGoldberg_Demo
xy = [55, 504, 55, 591] # Bottom right side
TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3)
xy = box(71, 460, 48) # Outer loop
- TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc,
+ TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc,
:start=>110, :extent=>-290, :tag=>'I11i')
xy = box(71, 460, 16) # Inner loop
- TkcOval.new(@canvas, xy, :outline=>@C['fg'], :fill=>'',
+ TkcOval.new(@canvas, xy, :outline=>@C['fg'], :fill=>'',
:width=>3, :tag=>'I11i')
TkcOval.new(@canvas, xy, :outline=>@C['fg'], :fill=>@C['bg'], :width=>3)
xy = [23, 264, 23, 591] # Left side
TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3)
xy = box(1, 266, 23) # Top left curve
- TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3,
+ TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3,
:style=>:arc, :extent=>90)
xy = box(75, 235, 9) # The ball
- TkcOval.new(@canvas, xy, :fill=>color2, :outline=>'',
+ TkcOval.new(@canvas, xy, :fill=>color2, :outline=>'',
:width=>3, :tag=>'I11')
end
@@ -1050,8 +1050,8 @@ class TkGoldberg_Demo
step = get_step(11, step)
pos = [
- [75, 235], [70, 235], [65, 237], [56, 240], [46, 247], [38, 266],
- [38, 296], [38, 333], [38, 399], [38, 475], [74, 496], [105, 472],
+ [75, 235], [70, 235], [65, 237], [56, 240], [46, 247], [38, 266],
+ [38, 296], [38, 333], [38, 399], [38, 475], [74, 496], [105, 472],
[100, 437], [65, 423], [-100, -100], [38, 505], [38, 527, :x], [38, 591]
]
@@ -1065,11 +1065,11 @@ class TkGoldberg_Demo
# Hand
def draw12
xy = [
- 20, 637, 20, 617, 20, 610, 20, 590, 40, 590, 40, 590,
+ 20, 637, 20, 617, 20, 610, 20, 590, 40, 590, 40, 590,
60, 590, 60, 610, 60, 610
]
xy.concat([60, 610, 65, 620, 60, 631]) # Thumb
- xy.concat([60, 631, 60, 637, 60, 662, 60, 669, 52, 669,
+ xy.concat([60, 631, 60, 637, 60, 662, 60, 669, 52, 669,
56, 669, 50, 669, 50, 662, 50, 637])
y0 = 637 # Bumps for fingers
@@ -1079,7 +1079,7 @@ class TkGoldberg_Demo
x2 = x - 10
xy << x << y0 << x1 << y1 << x2 << y0
}
- TkcPolygon.new(@canvas, xy, :fill=>@C['12'], :outline=>@C['fg'],
+ TkcPolygon.new(@canvas, xy, :fill=>@C['12'], :outline=>@C['fg'],
:smooth=>true, :tag=>'I12', :width=>3)
end
@@ -1103,25 +1103,25 @@ class TkGoldberg_Demo
]
radii = [2, 9, 9, 8, 5, 5, 2]
- round_poly(@canvas, xy, radii, :width=>3,
+ round_poly(@canvas, xy, radii, :width=>3,
:outline=>@C['fg'], :fill=>color)
- round_poly(@canvas, xy2, radii, :width=>3,
+ round_poly(@canvas, xy2, radii, :width=>3,
:outline=>@C['fg'], :fill=>color)
xy = [56, 677]
x, y = xy
- TkcRectangle.new(@canvas, box(x, y, 4), :fill=>'', :outline=>@C['fg'],
+ TkcRectangle.new(@canvas, box(x, y, 4), :fill=>'', :outline=>@C['fg'],
:width=>3, :tag=>'I13')
xy = [809, 677]
x, y = xy
- TkcRectangle.new(@canvas, box(x, y, 4), :fill=>'', :outline=>@C['fg'],
+ TkcRectangle.new(@canvas, box(x, y, 4), :fill=>'', :outline=>@C['fg'],
:width=>3, :tag=>'I13R')
xy = [112, 687] # Label
- TkcText.new(@canvas, xy, :text=>'FAX', :fill=>@C['fg'],
+ TkcText.new(@canvas, xy, :text=>'FAX', :fill=>@C['fg'],
:font=>['Times Roman', 12, :bold])
xy = [762, 687]
- TkcText.new(@canvas, xy, :text=>'FAX', :fill=>@C['fg'],
+ TkcText.new(@canvas, xy, :text=>'FAX', :fill=>@C['fg'],
:font=>['Times Roman', 12, :bold])
xy = [138, 663, 148, 636, 178, 636] # Paper guide
@@ -1129,7 +1129,7 @@ class TkGoldberg_Demo
xy = [732, 663, 722, 636, 692, 636]
TkcLine.new(@canvas, xy, :smooth=>true, :fill=>@C['fg'], :width=>3)
- sine([149, 688, 720, 688], 5, 15,
+ sine([149, 688, 720, 688], 5, 15,
:tag=>'I13_s', :fill=>@C['fg'], :width=>3)
end
@@ -1159,17 +1159,17 @@ class TkGoldberg_Demo
def draw14
color = @C['14']
xy = [102, 661, 113, 632, 130, 618] # Left paper edge
- TkcLine.new(@canvas, xy, :smooth=>true, :fill=>color,
+ TkcLine.new(@canvas, xy, :smooth=>true, :fill=>color,
:width=>3, :tag=>'I14L_0')
xy = [148, 629, 125, 640, 124, 662] # Right paper edge
- TkcLine.new(@canvas, xy, :smooth=>true, :fill=>color,
+ TkcLine.new(@canvas, xy, :smooth=>true, :fill=>color,
:width=>3, :tag=>'I14L_1')
draw14a('L')
xy = [
768.0, 662.5, 767.991316225, 662.433786215, 767.926187912, 662.396880171
]
- TkcLine.new(@canvas, xy, :smooth=>true, :fill=>color,
+ TkcLine.new(@canvas, xy, :smooth=>true, :fill=>color,
:width=>3, :tag=>'I14R_0')
@canvas.lower('I14R_0')
# NB. these numbers are VERY sensitive, you must start with final size
@@ -1177,7 +1177,7 @@ class TkGoldberg_Demo
xy = [
745.947897349, 662.428358855, 745.997829056, 662.452239237, 746.0, 662.5
]
- TkcLine.new(@canvas, xy, :smooth=>true, :fill=>color,
+ TkcLine.new(@canvas, xy, :smooth=>true, :fill=>color,
:width=>3, :tag=>'I14R_1')
@canvas.lower('I14R_1')
end
@@ -1190,11 +1190,11 @@ class TkGoldberg_Demo
x3, y3, x4, y4, x5, y5 = xy2
zz = [
- x0, y0, x0, y0, xy, x2, y2, x2, y2,
+ x0, y0, x0, y0, xy, x2, y2, x2, y2,
x3, y3, x3, y3, xy2, x5, y5, x5, y5
].flatten
@canvas.delete("I14#{side}")
- TkcPolygon.new(@canvas, zz, :tag=>"I14#{side}", :smooth=>true,
+ TkcPolygon.new(@canvas, zz, :tag=>"I14#{side}", :smooth=>true,
:fill=>color, :outline=>color, :width=>3)
@canvas.lower("I14#{side}")
end
@@ -1247,7 +1247,7 @@ class TkGoldberg_Demo
xy = [765, 557, 784, 583]
TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>2)
- sine([658, 580, 765, 580], 3, 15,
+ sine([658, 580, 765, 580], 3, 15,
:tag=>'I15_s', :fill=>@C['fg'], :width=>3)
end
@@ -1286,7 +1286,7 @@ class TkGoldberg_Demo
xy = [722, 485, 791, 556]
TkcRectangle.new(@canvas, xy, :fill=>'', :outline=>@C['fg'], :width=>3)
xy = box(752, 515, 25) # Bell
- TkcOval.new(@canvas, xy, :fill=>color, :outline=>'black',
+ TkcOval.new(@canvas, xy, :fill=>color, :outline=>'black',
:tag=>'I16b', :width=>2)
xy = box(752, 515, 5) # Bell button
TkcOval.new(@canvas, xy, :fill=>'black', :outline=>'black', :tag=>'I16b')
@@ -1325,24 +1325,24 @@ class TkGoldberg_Demo
TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3)
xy = [664, 523, 717, 549] # Body
- TkcArc.new(@canvas, xy, :outline=>@C['fg'], :fill=>color, :width=>3,
+ TkcArc.new(@canvas, xy, :outline=>@C['fg'], :fill=>color, :width=>3,
:style=>:chord, :start=>128, :extent=>260, :tag=>'I17')
xy = [709, 554, 690, 543] # Paw
- TkcOval.new(@canvas, xy, :outline=>@C['fg'], :fill=>color,
+ TkcOval.new(@canvas, xy, :outline=>@C['fg'], :fill=>color,
:width=>3, :tag=>'I17')
xy = [657, 544, 676, 555]
- TkcOval.new(@canvas, xy, :outline=>@C['fg'], :fill=>color,
+ TkcOval.new(@canvas, xy, :outline=>@C['fg'], :fill=>color,
:width=>3, :tag=>'I17')
xy = box(660, 535, 15) # Lower face
- TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc,
+ TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc,
:start=>150, :extent=>240, :tag=>'I17_')
- TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :width=>1,
+ TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :width=>1,
:style=>:chord, :start=>150, :extent=>240, :tag=>'I17_')
xy = [674, 529, 670, 513, 662, 521, 658, 521, 650, 513, 647, 529] # Ears
TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
- TkcPolygon.new(@canvas, xy, :fill=>color, :outline=>'', :width=>1,
+ TkcPolygon.new(@canvas, xy, :fill=>color, :outline=>'', :width=>1,
:tag=>['I17_', 'I17_c'])
xy = [652, 542, 628, 539] # Whiskers
TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
@@ -1352,23 +1352,23 @@ class TkGoldberg_Demo
TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
xy = [668, 543, 687, 538]
- TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3,
+ TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3,
:tag=>['I17_', 'I17_w'])
xy = [668, 544, 688, 546]
- TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3,
+ TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3,
:tag=>['I17_', 'I17_w'])
xy = [668, 547, 688, 553]
- TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3,
+ TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3,
:tag=>['I17_', 'I17_w'])
xy = [649, 530, 654, 538, 659, 530] # Left eye
- TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2,
+ TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2,
:smooth=>true, :tag=>'I17')
xy = [671, 530, 666, 538, 661, 530] # Right eye
- TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2,
+ TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2,
:smooth=>true, :tag=>'I17')
xy = [655, 543, 660, 551, 665, 543] # Mouth
- TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2,
+ TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2,
:smooth=>true, :tag=>'I17')
end
@@ -1381,10 +1381,10 @@ class TkGoldberg_Demo
TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3,
:smooth=>true, :tag=>'I17_')
xy = box(654, 530, 4) # Left eye
- TkcOval.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :fill=>'',
+ TkcOval.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :fill=>'',
:tag=>'I17_')
xy = box(666, 530, 4) # Right eye
- TkcOval.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :fill=>'',
+ TkcOval.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :fill=>'',
:tag=>'I17_')
@canvas.move('I17_', 0, -20) # Move face up
@@ -1394,19 +1394,19 @@ class TkGoldberg_Demo
TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
xy = [ # Body
- 675, 506, 694, 489, 715, 513, 715, 513, 715, 513, 716, 525,
- 716, 525, 716, 525, 706, 530, 695, 530, 679, 535, 668, 527,
+ 675, 506, 694, 489, 715, 513, 715, 513, 715, 513, 716, 525,
+ 716, 525, 716, 525, 706, 530, 695, 530, 679, 535, 668, 527,
668, 527, 668, 527, 675, 522, 676, 517, 677, 512
]
- TkcPolygon.new(@canvas, xy, :fill=>@canvas.itemcget('I17_c', :fill),
- :outline=>@C['fg'], :width=>3, :smooth=>true,
+ TkcPolygon.new(@canvas, xy, :fill=>@canvas.itemcget('I17_c', :fill),
+ :outline=>@C['fg'], :width=>3, :smooth=>true,
:tag=>'I17_')
xy = [716, 514, 716, 554] # Back leg
TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
xy = [694, 532, 694, 554] # 2nd back leg
TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
xy = [715, 514, 718, 506, 719, 495, 716, 488] # Tail
- TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3,
+ TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3,
:smooth=>true, :tag=>'I17_')
@canvas.raise('I17w') # Make whiskers visible
@@ -1435,14 +1435,14 @@ class TkGoldberg_Demo
step = get_step(18, step)
pos = [
- [587, 506], [537, 506], [466, 506], [376, 506], [266, 506, :x],
+ [587, 506], [537, 506], [466, 506], [376, 506], [266, 506, :x],
[136, 506], [16, 506], [-100, -100]
]
b = []
b[0] = [490, 502, 719, 507, 524, 512] # Band collapsing
b[1] = [
- 491, 503, 524, 557, 563, 505, 559, 496, 546, 506, 551, 525,
+ 491, 503, 524, 557, 563, 505, 559, 496, 546, 506, 551, 525,
553, 536, 538, 534, 532, 519, 529, 499
]
b[2] = [
@@ -1473,54 +1473,54 @@ class TkGoldberg_Demo
color = @C['19']
xx = [[249, 181], [155, 118], [86, 55], [22, 0]]
xx.each{|x1, x2|
- TkcRectangle.new(@canvas, x1, 453, x2, 467,
+ TkcRectangle.new(@canvas, x1, 453, x2, 467,
:fill=>color, :outline=>'', :tag=>'I19')
- TkcLine.new(@canvas, x1, 453, x2, 453,
+ TkcLine.new(@canvas, x1, 453, x2, 453,
:fill=>@C['fg'], :width=>1) # Pipe top
- TkcLine.new(@canvas, x1, 467, x2, 467,
+ TkcLine.new(@canvas, x1, 467, x2, 467,
:fill=>@C['fg'], :width=>1) # Pipe bottom
}
@canvas.raise('I11i')
xy = box(168, 460, 16) # Bulge by the joint
TkcOval.new(@canvas, xy, :fill=>color, :outline=>'')
- TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1, :style=>:arc,
+ TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1, :style=>:arc,
:start=>21, :extent=>136)
- TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1, :style=>:arc,
+ TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1, :style=>:arc,
:start=>-21, :extent=>-130)
xy = [249, 447, 255, 473] # First joint 26x6
TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>1)
xy = box(257, 433, 34) # Bend up
- TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :width=>1,
+ TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :width=>1,
:style=>:pie, :start=>0, :extent=>-91)
- TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1,
+ TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1,
:style=>:arc, :start=>0, :extent=>-90)
xy = box(257, 433, 20)
- TkcArc.new(@canvas, xy, :outline=>'', :fill=>@C['bg'], :width=>1,
+ TkcArc.new(@canvas, xy, :outline=>'', :fill=>@C['bg'], :width=>1,
:style=>:pie, :start=>0, :extent=>-92)
- TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1,
+ TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1,
:style=>:arc, :start=>0, :extent=>-90)
xy = box(257, 421, 34) # Bend left
- TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :width=>1,
+ TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :width=>1,
:style=>:pie, :start=>0, :extent=>91)
- TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1,
+ TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1,
:style=>:arc, :start=>0, :extent=>90)
xy = box(257, 421, 20)
- TkcArc.new(@canvas, xy, :outline=>'', :fill=>@C['bg'], :width=>1,
+ TkcArc.new(@canvas, xy, :outline=>'', :fill=>@C['bg'], :width=>1,
:style=>:pie, :start=>0, :extent=>90)
- TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1,
+ TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1,
:style=>:arc, :start=>0, :extent=>90)
xy = box(243, 421, 34) # Bend down
- TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :width=>1,
+ TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :width=>1,
:style=>:pie, :start=>90, :extent=>90)
- TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1,
+ TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1,
:style=>:arc, :start=>90, :extent=>90)
xy = box(243, 421, 20)
- TkcArc.new(@canvas, xy, :outline=>'', :fill=>@C['bg'], :width=>1,
+ TkcArc.new(@canvas, xy, :outline=>'', :fill=>@C['bg'], :width=>1,
:style=>:pie, :start=>90, :extent=>90)
- TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1,
+ TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1,
:style=>:arc, :start=>90, :extent=>90)
xy = [270, 427, 296, 433] # 2nd joint bottom
@@ -1562,7 +1562,7 @@ class TkGoldberg_Demo
pos = [451, 462, 473, 484, 496, 504, 513, 523, 532]
freq = [20, 40, 40, 40, 40, 40, 40, 40, 40]
pos = [
- [451, 20], [462, 40], [473, 40], [484, 40], [496, 40],
+ [451, 20], [462, 40], [473, 40], [484, 40], [496, 40],
[504, 40], [513, 40], [523, 40], [532, 40, :x]
]
return 0 if step >= pos.length
@@ -1579,11 +1579,11 @@ class TkGoldberg_Demo
color = @C['20']
@canvas.delete('I20')
- sine([208, 428, 208, y], 4, f, :tag=>['I20', 'I20s'],
+ sine([208, 428, 208, y], 4, f, :tag=>['I20', 'I20s'],
:width=>3, :fill=>color, :smooth=>true)
- TkcLine.new(@canvas, @canvas.coords('I20s'), :width=>3,
+ TkcLine.new(@canvas, @canvas.coords('I20s'), :width=>3,
:fill=>color, :smooth=>1, :tag=>['I20', 'I20a'])
- TkcLine.new(@canvas, @canvas.coords('I20s'), :width=>3,
+ TkcLine.new(@canvas, @canvas.coords('I20s'), :width=>3,
:fill=>color, :smooth=>1, :tag=>['I20', 'I20b'])
@canvas.move('I20a', 8, 0)
@canvas.move('I20b', 16, 0)
@@ -1599,18 +1599,18 @@ class TkGoldberg_Demo
xy = [245, 490, 237, 535] # Right side
xy2 = [189, 535, 181, 490] # Left side
- TkcPolygon.new(@canvas, xy + xy2, :fill=>color, :outline=>'',
+ TkcPolygon.new(@canvas, xy + xy2, :fill=>color, :outline=>'',
:tag=>['I21', 'I21f'])
TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2, :tag=>'I21')
TkcLine.new(@canvas, xy2, :fill=>@C['fg'], :width=>2, :tag=>'I21')
xy = [182, 486, 244, 498] # Top
- TkcOval.new(@canvas, xy, :fill=>color, :outline=>'', :width=>2,
+ TkcOval.new(@canvas, xy, :fill=>color, :outline=>'', :width=>2,
:tag=>['I21', 'I21f'])
- TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'], :width=>2,
+ TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'], :width=>2,
:tag=>['I21', 'I21t'])
xy = [189, 532, 237, 540] # Bottom
- TkcOval.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>2,
+ TkcOval.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>2,
:tag=>['I21', 'I21b'])
end
@@ -1633,7 +1633,7 @@ class TkGoldberg_Demo
@canvas.itemconfigure('I21b', :fill=>@C['20'])
@canvas.delete('I21w')
- TkcPolygon.new(@canvas, x2, y2, x1, y1, xx1, yy1, xx2, yy1,
+ TkcPolygon.new(@canvas, x2, y2, x1, y1, xx1, yy1, xx2, yy1,
:tag=>['I21', 'I21w'], :outline=>'', :fill=>@C['20'])
@canvas.lower('I21w', 'I21')
@canvas.raise('I21b')
@@ -1669,21 +1669,21 @@ class TkGoldberg_Demo
color3 = @C['23c']
xy = [185, 623, 253, 650] # Block
- TkcRectangle.new(@canvas, xy, :fill=>'black', :outline=>@C['fg'],
+ TkcRectangle.new(@canvas, xy, :fill=>'black', :outline=>@C['fg'],
:width=>2, :tag=>'I23a')
xy = [187, 592, 241, 623] # Balloon
TkcOval.new(@canvas, xy, :outline=>'', :fill=>color, :tag=>'I23b')
- TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :tag=>'I23b',
+ TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :tag=>'I23b',
:style=>:arc, :start=>12, :extent=>336)
xy = [239, 604, 258, 589, 258, 625, 239, 610] # Balloon nozzle
TkcPolygon.new(@canvas, xy, :outline=>'', :fill=>color, :tag=>'I23b')
TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I23b')
xy = [285, 611, 250, 603] # Dart body
- TkcOval.new(@canvas, xy, :fill=>color2, :outline=>@C['fg'],
+ TkcOval.new(@canvas, xy, :fill=>color2, :outline=>@C['fg'],
:width=>3, :tag=>'I23d')
xy = [249, 596, 249, 618, 264, 607, 249, 596] # Dart tail
- TkcPolygon.new(@canvas, xy, :fill=>color3, :outline=>@C['fg'],
+ TkcPolygon.new(@canvas, xy, :fill=>color3, :outline=>@C['fg'],
:width=>3, :tag=>'I23d')
xy = [249, 607, 268, 607] # Dart detail
TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I23d')
@@ -1695,7 +1695,7 @@ class TkGoldberg_Demo
step = get_step(23, step)
pos = [
- [277, 607], [287, 607], [307, 607, :x], [347, 607], [407, 607],
+ [277, 607], [287, 607], [307, 607, :x], [347, 607], [407, 607],
[487, 607], [587, 607], [687, 607], [787, 607], [-100, -100]
]
@@ -1715,7 +1715,7 @@ class TkGoldberg_Demo
def draw24
color = @C['24a']
xy = [366, 518, 462, 665] # Balloon
- TkcOval.new(@canvas, xy, :fill=>color, :outline=>@C['fg'],
+ TkcOval.new(@canvas, xy, :fill=>color, :outline=>@C['fg'],
:width=>3, :tag=>'I24')
xy = [414, 666, 414, 729] # String
TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I24')
@@ -1724,16 +1724,16 @@ class TkGoldberg_Demo
:width=>3, :tag=>'I24')
xy = [387, 567, 390, 549, 404, 542] # Reflections
- TkcLine.new(@canvas, xy, :fill=>@C['fg'], :smooth=>true,
+ TkcLine.new(@canvas, xy, :fill=>@C['fg'], :smooth=>true,
:width=>2, :tag=>'I24')
xy = [395, 568, 399, 554, 413, 547]
- TkcLine.new(@canvas, xy, :fill=>@C['fg'], :smooth=>true,
+ TkcLine.new(@canvas, xy, :fill=>@C['fg'], :smooth=>true,
:width=>2, :tag=>'I24')
xy = [403, 570, 396, 555, 381, 553]
- TkcLine.new(@canvas, xy, :fill=>@C['fg'], :smooth=>true,
+ TkcLine.new(@canvas, xy, :fill=>@C['fg'], :smooth=>true,
:width=>2, :tag=>'I24')
xy = [408, 564, 402, 547, 386, 545]
- TkcLine.new(@canvas, xy, :fill=>@C['fg'], :smooth=>true,
+ TkcLine.new(@canvas, xy, :fill=>@C['fg'], :smooth=>true,
:width=>2, :tag=>'I24')
end
@@ -1746,16 +1746,16 @@ class TkGoldberg_Demo
if step == 0
@canvas.delete('I24') # Exploding balloon
xy = [
- 347, 465, 361, 557, 271, 503, 272, 503, 342, 574, 259, 594,
- 259, 593, 362, 626, 320, 737, 320, 740, 398, 691, 436, 738,
- 436, 739, 476, 679, 528, 701, 527, 702, 494, 627, 548, 613,
- 548, 613, 480, 574, 577, 473, 577, 473, 474, 538, 445, 508,
+ 347, 465, 361, 557, 271, 503, 272, 503, 342, 574, 259, 594,
+ 259, 593, 362, 626, 320, 737, 320, 740, 398, 691, 436, 738,
+ 436, 739, 476, 679, 528, 701, 527, 702, 494, 627, 548, 613,
+ 548, 613, 480, 574, 577, 473, 577, 473, 474, 538, 445, 508,
431, 441, 431, 440, 400, 502, 347, 465, 347, 465
]
- TkcPolygon.new(@canvas, xy, :tag=>'I24', :fill=>@C['24b'],
+ TkcPolygon.new(@canvas, xy, :tag=>'I24', :fill=>@C['24b'],
:outline=>@C['24a'], :width=>10, :smooth=>true)
msg = Tk.subst(@S['message'].value)
- TkcText.new(@canvas, centroid('I24'), :text=>msg, :tag=>['I24', 'I24t'],
+ TkcText.new(@canvas, centroid('I24'), :text=>msg, :tag=>['I24', 'I24t'],
:justify=>:center, :font=>['Times Roman', 18, :bold])
return 1
end
@@ -1786,8 +1786,8 @@ class TkGoldberg_Demo
if step >= 3
@canvas.delete('I24', 'I26')
- TkcText.new(@canvas, 430, 740, :anchor=>:s, :tag=>'I26',
- :text=>'click to continue',
+ TkcText.new(@canvas, 430, 740, :anchor=>:s, :tag=>'I26',
+ :text=>'click to continue',
:font=>['Times Roman', 24, :bold])
@canvas.bind('1', proc{reset})
return 4
@@ -1967,11 +1967,11 @@ class TkGoldberg_Demo
def sparkle(oxy, tag)
xy = [
- [299, 283], [298, 302], [295, 314], [271, 331],
+ [299, 283], [298, 302], [295, 314], [271, 331],
[239, 310], [242, 292], [256, 274], [281, 273]
]
xy.each{|x, y|
- TkcLine.new(@canvas, 271, 304, x, y,
+ TkcLine.new(@canvas, 271, 304, x, y,
:fill=>'white', :width=>3, :tag=>tag)
}
move_abs(tag, oxy)
diff --git a/ext/tk/sample/demos-en/icon.rb b/ext/tk/sample/demos-en/icon.rb
index bab40da214..a3921d2333 100644
--- a/ext/tk/sample/demos-en/icon.rb
+++ b/ext/tk/sample/demos-en/icon.rb
@@ -8,7 +8,7 @@
# toplevel widget
if defined?($icon_demo) && $icon_demo
- $icon_demo.destroy
+ $icon_demo.destroy
$icon_demo = nil
end
@@ -48,7 +48,7 @@ TkFrame.new(base_frame) {|frame|
}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-# image
+# image
flagup = \
TkBitmapImage.new('file'=>[$demo_dir,'..',
'images','flagup.xbm'].join(File::Separator),
diff --git a/ext/tk/sample/demos-en/image1.rb b/ext/tk/sample/demos-en/image1.rb
index 233cb963d1..a9072bb308 100644
--- a/ext/tk/sample/demos-en/image1.rb
+++ b/ext/tk/sample/demos-en/image1.rb
@@ -7,7 +7,7 @@
# toplevel widget
if defined?($image1_demo) && $image1_demo
- $image1_demo.destroy
+ $image1_demo.destroy
$image1_demo = nil
end
diff --git a/ext/tk/sample/demos-en/image2.rb b/ext/tk/sample/demos-en/image2.rb
index 13098af1b6..1975dd6b02 100644
--- a/ext/tk/sample/demos-en/image2.rb
+++ b/ext/tk/sample/demos-en/image2.rb
@@ -8,7 +8,7 @@
# toplevel widget
if defined?($image2_demo) && $image2_demo
- $image2_demo.destroy
+ $image2_demo.destroy
$image2_demo = nil
end
@@ -87,13 +87,13 @@ TkFrame.new(base_frame){|w|
}.pack('side'=>'top', 'anchor'=>'w')
-# image
+# image
[ TkFrame.new(base_frame, 'height'=>'3m', 'width'=>20),
TkLabel.new(base_frame, 'text'=>'Image:'),
TkLabel.new(base_frame, 'image'=>$image2a)
].each{|w| w.pack('side'=>'top', 'anchor'=>'w')}
-#
+#
def loadDir(w)
w.delete(0,'end')
Dir.glob([$dirName,'*'].join(File::Separator)).sort.each{|f|
diff --git a/ext/tk/sample/demos-en/image3.rb b/ext/tk/sample/demos-en/image3.rb
index edb6d231bf..43afab7ecd 100644
--- a/ext/tk/sample/demos-en/image3.rb
+++ b/ext/tk/sample/demos-en/image3.rb
@@ -8,7 +8,7 @@
# toplevel widget
if defined?($image3_demo) && $image3_demo
- $image3_demo.destroy
+ $image3_demo.destroy
$image3_demo = nil
end
@@ -21,7 +21,7 @@ $image3_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($image3_demo).pack(:fill=>:both, :expand=>true)
-#
+#
def loadDir3(w)
w.delete(0,'end')
Dir.glob([$dirName,'*'].join(File::Separator)).sort.each{|f|
@@ -37,10 +37,10 @@ end
# Arguments:
# w - Name of the toplevel window of the demo.
def selectAndLoadDir3(w, lbox)
- dir = Tk.chooseDirectory(:initialdir=>$dirName.value,
+ dir = Tk.chooseDirectory(:initialdir=>$dirName.value,
:parent=>w, :mustexist=>true)
if dir.length > 0
- $dirName.value = dir
+ $dirName.value = dir
loadDir3(lbox)
end
end
@@ -92,11 +92,11 @@ image3_f = TkFrame.new(base_frame).pack(:fill=>:both, :expand=>true)
image3_df = TkLabelFrame.new(base_frame, :text=>'Directory:')
-image3_ff = TkLabelFrame.new(base_frame, :text=>'File:',
+image3_ff = TkLabelFrame.new(base_frame, :text=>'File:',
:padx=>'2m', :pady=>'2m')
image3_lbx = TkListbox.new(image3_ff, :width=>20, :height=>10) {
pack(:side=>:left, :fill=>:y, :expand=>true)
- yscrollbar(TkScrollbar.new(image3_ff).pack(:side=>:left, :fill=>:y,
+ yscrollbar(TkScrollbar.new(image3_ff).pack(:side=>:left, :fill=>:y,
:expand=>true))
insert(0, *(%w(earth.gif earthris.gif teapot.ppm)))
bind('Double-1', proc{|x,y| loadImage(self, x, y)}, '%x %y')
@@ -107,7 +107,7 @@ image3_ent = TkEntry.new(image3_df, :width=>30, :textvariable=>$dirName){
bind('Return', proc{loadDir3(image3_lbx)})
}
-TkButton.new(image3_df, :pady=>0, :padx=>'2m', :text=>"Select Dir.",
+TkButton.new(image3_df, :pady=>0, :padx=>'2m', :text=>"Select Dir.",
:command=>proc{selectAndLoadDir3(image3_ent, image3_lbx)}) {
pack(:side=>:left, :fill=>:y, :padx=>[0, '2m'], :pady=>'2m')
}
@@ -119,7 +119,7 @@ image3_if = TkLabelFrame.new(base_frame, :text=>'Image:') {|f|
Tk.grid(image3_df, '-',
:sticky=>:ew, :padx=>'1m', :pady=>'1m', :in=>image3_f)
-Tk.grid(image3_ff, image3_if,
+Tk.grid(image3_ff, image3_if,
:sticky=>:nw, :padx=>'1m', :pady=>'1m', :in=>image3_f)
TkGrid.columnconfigure(image3_f, 1, :weight=>1)
diff --git a/ext/tk/sample/demos-en/items.rb b/ext/tk/sample/demos-en/items.rb
index 01a4072cb7..3fd44fd4f4 100644
--- a/ext/tk/sample/demos-en/items.rb
+++ b/ext/tk/sample/demos-en/items.rb
@@ -8,7 +8,7 @@
# toplevel widget
if defined?($items_demo) && $items_demo
- $items_demo.destroy
+ $items_demo.destroy
$items_demo = nil
end
@@ -49,7 +49,7 @@ TkFrame.new(base_frame) {|frame|
# frame
cvs = nil
TkFrame.new(base_frame) {|cf|
- # canvas
+ # canvas
cvs = TkCanvas.new(cf) {|c|
focus
scrollregion '0c 0c 30c 24c'
@@ -75,11 +75,11 @@ TkFrame.new(base_frame) {|cf|
c.pack('in'=>cf, 'expand'=>'yes', 'fill'=>'both')
else
- c.grid('in'=>cf, 'row'=>0, 'column'=>0,
+ c.grid('in'=>cf, 'row'=>0, 'column'=>0,
'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
- vs.grid('row'=>0, 'column'=>1,
+ vs.grid('row'=>0, 'column'=>1,
'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
- hs.grid('row'=>1, 'column'=>0,
+ hs.grid('row'=>1, 'column'=>0,
'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
TkGrid.rowconfigure(cf, 0, 'weight'=>1, 'minsize'=>0)
TkGrid.columnconfigure(cf, 0, 'weight'=>1, 'minsize'=>0)
@@ -115,13 +115,13 @@ else
green = 'black'
end
-# tag
+# tag
$tag_item = TkcGroup.new(cvs)
# Set up demos within each of the areas of the grid.
TkcText.new(cvs, '5c', '.2c', 'text'=>'Lines', 'anchor'=>'n')
-TkcLine.new(cvs, '1c', '1c', '3c', '1c', '1c', '4c', '3c', '4c',
- 'width'=>2, 'fill'=>blue, 'capstyle'=>'butt',
+TkcLine.new(cvs, '1c', '1c', '3c', '1c', '1c', '4c', '3c', '4c',
+ 'width'=>2, 'fill'=>blue, 'capstyle'=>'butt',
'join'=>'miter', 'tags'=>$tag_item )
TkcLine.new(cvs, '4.67c','1c','4.67c','4c', 'arrow'=>'last', 'tags'=>$tag_item)
TkcLine.new(cvs, '6.33c','1c','6.33c','4c', 'arrow'=>'both', 'tags'=>$tag_item)
@@ -129,38 +129,38 @@ TkcLine.new(cvs, '5c','6c','9c','6c','9c','1c','8c','1c','8c','4.8c','8.8c',
'4.8c','8.8c','1.2c','8.2c','1.2c','8.2c','4.6c','8.6c','4.6c',
'8.6c','1.4c','8.4c','1.4c','8.4c','4.4c',
'width'=>3, 'fill'=>red, 'tags'=>$tag_item )
-TkcLine.new(cvs, '1c','5c','7c','5c','7c','7c','9c','7c', 'width'=>'.5c',
+TkcLine.new(cvs, '1c','5c','7c','5c','7c','7c','9c','7c', 'width'=>'.5c',
'stipple'=>'@'+[$demo_dir,'..',
- 'images','gray25.xbm'].join(File::Separator),
+ 'images','gray25.xbm'].join(File::Separator),
'arrow'=>'both', 'arrowshape'=>'15 15 7', 'tags'=>$tag_item )
TkcLine.new(cvs, '1c','7c','1.75c','5.8c','2.5c','7c','3.25c','5.8c','4c','7c',
- 'width'=>'.5c', 'capstyle'=>'round', 'join'=>'round',
+ 'width'=>'.5c', 'capstyle'=>'round', 'join'=>'round',
'tags'=>$tag_item )
-TkcText.new(cvs, '15c', '.2c',
+TkcText.new(cvs, '15c', '.2c',
'text'=>'Curves (smoothed lines)', 'anchor'=>'n')
-TkcLine.new(cvs, '11c','4c','11.5c','1c','13.5c','1c','14c','4c',
+TkcLine.new(cvs, '11c','4c','11.5c','1c','13.5c','1c','14c','4c',
'smooth'=>'on', 'fill'=>blue, 'tags'=>$tag_item )
-TkcLine.new(cvs, '15.5c','1c','19.5c','1.5c','15.5c','4.5c','19.5c','4c',
+TkcLine.new(cvs, '15.5c','1c','19.5c','1.5c','15.5c','4.5c','19.5c','4c',
'smooth'=>'on', 'arrow'=>'both', 'width'=>3, 'tags'=>$tag_item )
-TkcLine.new(cvs, '12c','6c','13.5c','4.5c','16.5c','7.5c','18c','6c',
+TkcLine.new(cvs, '12c','6c','13.5c','4.5c','16.5c','7.5c','18c','6c',
'16.5c','4.5c','13.5c','7.5c','12c','6c',
- 'smooth'=>'on', 'width'=>'3m', 'capstyle'=>'round',
+ 'smooth'=>'on', 'width'=>'3m', 'capstyle'=>'round',
'stipple'=>'@'+[$demo_dir, '..',
- 'images', 'gray25.xbm'].join(File::Separator),
+ 'images', 'gray25.xbm'].join(File::Separator),
'fill'=>red, 'tags'=>$tag_item )
TkcText.new(cvs, '25c', '.2c', 'text'=>'Polygons', 'anchor'=>'n')
TkcPolygon.new(cvs, '21c','1.0c','22.5c','1.75c','24c','1.0c','23.25c','2.5c',
'24c','4.0c','22.5c','3.25c','21c','4.0c','21.75c','2.5c',
- 'fill'=>'green', 'outline'=>'black', 'width'=>4,
+ 'fill'=>'green', 'outline'=>'black', 'width'=>4,
'tags'=>$tag_item )
TkcPolygon.new(cvs, '25c','4c','25c','4c','25c','1c','26c','1c','27c','4c',
'28c','1c','29c','1c','29c','4c','29c','4c',
'fill'=>red, 'smooth'=>'on', 'tags'=> $tag_item)
TkcPolygon.new(cvs, '22c','4.5c','25c','4.5c','25c','6.75c','28c','6.75c',
'28c','5.25c','24c','5.25c','24c','6.0c','26c','6c','26c',
- '7.5c','22c','7.5c',
+ '7.5c','22c','7.5c',
'stipple'=>'@' + [$demo_dir, '..',
'images', 'gray25.xbm'].join(File::Separator),
'outline'=>'black', 'tags'=>$tag_item )
@@ -168,7 +168,7 @@ TkcPolygon.new(cvs, '22c','4.5c','25c','4.5c','25c','6.75c','28c','6.75c',
TkcText.new(cvs, '5c', '8.2c', 'text'=>'Rectangles', 'anchor'=>'n')
TkcRectangle.new(cvs, '1c','9.5c','4c','12.5c',
'outline'=>red, 'width'=>'3m', 'tags'=>$tag_item)
-TkcRectangle.new(cvs, '0.5c','13.5c','4.5c','15.5c',
+TkcRectangle.new(cvs, '0.5c','13.5c','4.5c','15.5c',
'fill'=>green, 'tags'=>$tag_item )
TkcRectangle.new(cvs, '6c','10c','9c','15c', 'outline'=>'',
'stipple'=>'@'+[$demo_dir,'..',
@@ -178,7 +178,7 @@ TkcRectangle.new(cvs, '6c','10c','9c','15c', 'outline'=>'',
TkcText.new(cvs, '15c', '8.2c', 'text'=>'Ovals', 'anchor'=>'n')
TkcOval.new(cvs, '11c','9.5c','14c','12.5c',
'outline'=>red, 'width'=>'3m', 'tags'=>$tag_item)
-TkcOval.new(cvs, '10.5c','13.5c','14.5c','15.5c',
+TkcOval.new(cvs, '10.5c','13.5c','14.5c','15.5c',
'fill'=>green, 'tags'=>$tag_item )
TkcOval.new(cvs, '16c','10c','19c','15c', 'outline'=>'',
'stipple'=>'@'+[$demo_dir,'..',
@@ -187,40 +187,40 @@ TkcOval.new(cvs, '16c','10c','19c','15c', 'outline'=>'',
TkcText.new(cvs, '25c', '8.2c', 'text'=>'Text', 'anchor'=>'n')
TkcRectangle.new(cvs, '22.4c','8.9c','22.6c','9.1c')
-TkcText.new(cvs, '22.5c', '9c', 'anchor'=>'n', 'font'=>font1, 'width'=>'4c',
+TkcText.new(cvs, '22.5c', '9c', 'anchor'=>'n', 'font'=>font1, 'width'=>'4c',
'text'=>'A short string of text, word-wrapped, justified left, and anchored north (at the top). The rectangles show the anchor points for each piece of text.', 'tags'=>$tag_item )
TkcRectangle.new(cvs, '25.4c','10.9c','25.6c','11.1c')
-TkcText.new(cvs, '25.5c', '11c', 'anchor'=>'w', 'font'=>font1, 'fill'=>blue,
+TkcText.new(cvs, '25.5c', '11c', 'anchor'=>'w', 'font'=>font1, 'fill'=>blue,
'text'=>"Several lines,\n each centered\nindividually,\nand all anchored\nat the left edge.", 'justify'=>'center', 'tags'=>$tag_item )
TkcRectangle.new(cvs, '24.9c','13.9c','25.1c','14.1c')
if $tk_version =~ /^4\.[01]/
- TkcText.new(cvs, '25c', '14c', 'anchor'=>'c', 'font'=>font2, 'fill'=>red,
+ TkcText.new(cvs, '25c', '14c', 'anchor'=>'c', 'font'=>font2, 'fill'=>red,
'stipple'=>'@' + [$demo_dir, '..',
'images', 'grey.5'].join(File::Separator),
'text'=>'Stippled characters', 'tags'=>$tag_item )
else
- TkcText.new(cvs, '25c', '14c', 'anchor'=>'c', 'font'=>font2, 'fill'=>red,
- 'stipple'=>'gray50', 'text'=>'Stippled characters',
+ TkcText.new(cvs, '25c', '14c', 'anchor'=>'c', 'font'=>font2, 'fill'=>red,
+ 'stipple'=>'gray50', 'text'=>'Stippled characters',
'tags'=>$tag_item )
end
TkcText.new(cvs, '5c', '16.2c', 'text'=>'Arcs', 'anchor'=>'n')
-TkcArc.new(cvs, '0.5c','17c','7c','20c', 'fill'=>green, 'outline'=>'black',
+TkcArc.new(cvs, '0.5c','17c','7c','20c', 'fill'=>green, 'outline'=>'black',
'start'=>45, 'extent'=>270, 'style'=>'pieslice', 'tags'=>$tag_item)
-#TkcArc.new(cvs, '6.5c','17c','9.5c','20c', 'width'=>'4m', 'style'=>'arc',
-# 'outline'=>blue, 'start'=>135, 'extent'=>270,
+#TkcArc.new(cvs, '6.5c','17c','9.5c','20c', 'width'=>'4m', 'style'=>'arc',
+# 'outline'=>blue, 'start'=>135, 'extent'=>270,
# 'outlinestipple'=>'@' + ['images', 'grey.25'].join(File::Separator),
# 'tags'=>$tag_item)
-TkcArc.new(cvs, '6.5c','17c','9.5c','20c', 'width'=>'4m', 'style'=>'arc',
- 'outline'=>blue, 'start'=>135, 'extent'=>270,
+TkcArc.new(cvs, '6.5c','17c','9.5c','20c', 'width'=>'4m', 'style'=>'arc',
+ 'outline'=>blue, 'start'=>135, 'extent'=>270,
'outlinestipple'=>'@'+[$demo_dir, '..',
'images','gray25.xbm'].join(File::Separator),
'tags'=>$tag_item)
-TkcArc.new(cvs, '0.5c','20c','9.5c','24c', 'width'=>'4m', 'style'=>'pieslice',
- 'fill'=>'', 'outline'=>red, 'start'=>225, 'extent'=>90,
+TkcArc.new(cvs, '0.5c','20c','9.5c','24c', 'width'=>'4m', 'style'=>'pieslice',
+ 'fill'=>'', 'outline'=>red, 'start'=>225, 'extent'=>90,
'tags'=>$tag_item)
TkcArc.new(cvs, '5.5c','20.5c','9.5c','23.5c', 'width'=>'4m', 'style'=>'chord',
- 'fill'=>blue, 'outline'=>'', 'start'=>45, 'extent'=>270,
+ 'fill'=>blue, 'outline'=>'', 'start'=>45, 'extent'=>270,
'tags'=>$tag_item)
TkcText.new(cvs, '15c', '16.2c', 'text'=>'Bitmaps', 'anchor'=>'n')
@@ -241,7 +241,7 @@ TkcBitmap.new(cvs, '17c','18.5c',
#TkcBitmap.new(cvs, '17c','21.5c',
# 'bitmap'=>'@' + ['images', 'letters'].join(File::Separator),
# 'tags'=>$tag_item)
-#
+#
TkcBitmap.new(cvs, '17c','21.5c') {
bitmap '@' + [$demo_dir, '..', 'images', 'letters.xbm'].join(File::Separator)
tags $tag_item
@@ -255,17 +255,17 @@ TkcText.new(cvs, '25c', '16.2c', 'text'=>'Windows', 'anchor'=>'n')
TkButton.new(cvs) {|b|
text 'Press Me'
command proc{butPress cvs, red}
- TkcWindow.new(cvs, '21c','18c',
+ TkcWindow.new(cvs, '21c','18c',
'window'=>b, 'anchor'=>'nw', 'tags'=>$tag_item)
}
TkEntry.new(cvs, 'width'=>20, 'relief'=>'sunken') {|e|
insert 'end', 'Edit this text'
- TkcWindow.new(cvs, '21c','21c',
+ TkcWindow.new(cvs, '21c','21c',
'window'=>e, 'anchor'=>'nw', 'tags'=>$tag_item)
}
-TkScale.new(cvs, 'from'=>0, 'to'=>100, 'length'=>'6c', 'sliderlength'=>'.4c',
+TkScale.new(cvs, 'from'=>0, 'to'=>100, 'length'=>'6c', 'sliderlength'=>'.4c',
'width'=>'.5c', 'tickinterval'=>0 ) {|scl|
- TkcWindow.new(cvs, '28.5c','17.5c',
+ TkcWindow.new(cvs, '28.5c','17.5c',
'window'=>scl, 'anchor'=>'n', 'tags'=>$tag_item)
}
TkcText.new(cvs, '21c', '17.9c', 'text'=>'Button:', 'anchor'=>'sw')
@@ -316,7 +316,7 @@ def itemLeave(c)
$restoreCmd.call if $restoreCmd
end
-# Utility methods for stroking out a rectangle and printing what's
+# Utility methods for stroking out a rectangle and printing what's
# underneath the rectangle's area.
def itemMark(c,x,y)
@@ -330,7 +330,7 @@ def itemStroke(c,x,y)
y = c.canvasy(y)
if $areaX1 != x && $areaY1 != y
c.delete 'area'
- c.addtag_withtag 'area', TkcRectangle.new(c, $areaX1, $areaY1, x, y,
+ c.addtag_withtag 'area', TkcRectangle.new(c, $areaX1, $areaY1, x, y,
'-outline', 'black')
$areaX2 = x
$areaY2 = y
@@ -371,11 +371,11 @@ def itemDrag(c,x,y)
$lastY = y
end
-# Method that's invoked when the button embedded in the canvas
+# Method that's invoked when the button embedded in the canvas
# is invoked.
def butPress(w,color)
- i = TkcText.new(w, '25c', '18.1c',
+ i = TkcText.new(w, '25c', '18.1c',
'text'=>'Ouch!!', 'fill'=>color, 'anchor'=>'n')
Tk.after(500, proc{w.delete i})
end
diff --git a/ext/tk/sample/demos-en/knightstour.rb b/ext/tk/sample/demos-en/knightstour.rb
index 6f96a5be10..618fce5f02 100644
--- a/ext/tk/sample/demos-en/knightstour.rb
+++ b/ext/tk/sample/demos-en/knightstour.rb
@@ -155,16 +155,16 @@ class Knights_Tour
frame = Ttk::Frame.new($knightstour)
sep = Ttk::Separator.new(frame)
Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
- TkGrid('x',
- Ttk::Button.new(frame, :text=>'See Code',
- :image=>$image['view'], :compound=>:left,
- :command=>proc{showCode 'knightstour'}),
- Ttk::Button.new(frame, :text=>'Dismiss',
- :image=>$image['delete'], :compound=>:left,
+ TkGrid('x',
+ Ttk::Button.new(frame, :text=>'See Code',
+ :image=>$image['view'], :compound=>:left,
+ :command=>proc{showCode 'knightstour'}),
+ Ttk::Button.new(frame, :text=>'Dismiss',
+ :image=>$image['delete'], :compound=>:left,
:command=>proc{
$knightstour.destroy
$knightstour = nil
- }),
+ }),
:padx=>4, :pady=>4)
frame.grid_columnconfigure(0, :weight=>1)
frame
@@ -176,7 +176,7 @@ class Knights_Tour
$knightstour.withdraw
base_f = Ttk::Frame.new($knightstour)
@board = Tk::Canvas.new(base_f, :width=>240, :height=>240)
- @log = Tk::Text.new(base_f, :width=>12, :height=>1,
+ @log = Tk::Text.new(base_f, :width=>12, :height=>1,
:font=>'Arial 8', :background=>'white')
scr = @log.yscrollbar(Ttk::Scrollbar.new(base_f))
@@ -186,13 +186,13 @@ class Knights_Tour
tool_f = Ttk::Frame.new($knightstour)
label = Ttk::Label.new(tool_f, :text=>'Speed')
- scale = Ttk::Scale.new(tool_f, :from=>8, :to=>2000, :variable=>@delay,
+ scale = Ttk::Scale.new(tool_f, :from=>8, :to=>2000, :variable=>@delay,
:command=>proc{|n| set_delay(n)})
- check = Ttk::Checkbutton.new(tool_f, :text=>'Repeat',
+ check = Ttk::Checkbutton.new(tool_f, :text=>'Repeat',
:variable=>@continuous)
- @start_btn = Ttk::Button.new(tool_f, :text=>'Start',
+ @start_btn = Ttk::Button.new(tool_f, :text=>'Start',
:command=>proc{tour()})
- @exit_btn = Ttk::Button.new(tool_f, :text=>'Exit',
+ @exit_btn = Ttk::Button.new(tool_f, :text=>'Exit',
:command=>proc{_exit()})
7.downto(0){|row|
@@ -205,16 +205,16 @@ class Knights_Tour
dfill = 'tan4'
end
coords = [col * 30 + 4, row * 30 + 4, col * 30 + 30, row * 30 + 30]
- @board.create(TkcRectangle, coords,
+ @board.create(TkcRectangle, coords,
:fill=>fill, :disabledfill=>dfill,
:width=>2, :state=>:disabled)
}
}
@knight_font = TkFont.new(:size=>-24)
- @knight = TkcText.new(@board, 0, 0, :font=>@knight_font,
- :text=>Tk::UTF8_String.new('\u265e'),
- :anchor=>'nw', # :tags=>'knight',
+ @knight = TkcText.new(@board, 0, 0, :font=>@knight_font,
+ :text=>Tk::UTF8_String.new('\u265e'),
+ :anchor=>'nw', # :tags=>'knight',
:fill=>'black', :activefill=>'#600000')
@knight.coords(@board.coords(rand(64)+1)[0..1])
@knight.bind('ButtonPress-1', '%W %x %y'){|w,x,y| drag_start(w,x,y)}
diff --git a/ext/tk/sample/demos-en/label.rb b/ext/tk/sample/demos-en/label.rb
index 5be06eafee..91e41e4a22 100644
--- a/ext/tk/sample/demos-en/label.rb
+++ b/ext/tk/sample/demos-en/label.rb
@@ -8,11 +8,11 @@
# toplevel widget
if defined?($label_demo) && $label_demo
- $label_demo.destroy
+ $label_demo.destroy
$label_demo = nil
end
-# demo toplevel widget
+# demo toplevel widget
$label_demo = TkToplevel.new {|w|
title("Label Demonstration")
iconname("label")
@@ -21,7 +21,7 @@ $label_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($label_demo).pack(:fill=>:both, :expand=>true)
-# label
+# label
msg = TkLabel.new(base_frame) {
font $font
wraplength '4i'
@@ -30,7 +30,7 @@ msg = TkLabel.new(base_frame) {
}
msg.pack('side'=>'top')
-# frame
+# frame
TkFrame.new(base_frame) {|frame|
TkButton.new(frame) {
text 'Dismiss'
@@ -48,15 +48,15 @@ TkFrame.new(base_frame) {|frame|
}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-# label demo
+# label demo
f_left = TkFrame.new(base_frame)
f_right = TkFrame.new(base_frame)
-[f_left, f_right].each{|w| w.pack('side'=>'left', 'expand'=>'yes',
+[f_left, f_right].each{|w| w.pack('side'=>'left', 'expand'=>'yes',
'padx'=>10, 'pady'=>10, 'fill'=>'both')}
-# label
+# label
[ TkLabel.new(f_left, 'text'=>'First label'),
- TkLabel.new(f_left, 'text'=>'Second label, raised',
+ TkLabel.new(f_left, 'text'=>'Second label, raised',
'relief'=>'raised'),
TkLabel.new(f_left, 'text'=>'Third label, sunken', 'relief'=>'sunken')
].each{|w| w.pack('side'=>'top', 'expand'=>'yes', 'pady'=>2, 'anchor'=>'w')}
diff --git a/ext/tk/sample/demos-en/labelframe.rb b/ext/tk/sample/demos-en/labelframe.rb
index ad968bc061..c912ff4c52 100644
--- a/ext/tk/sample/demos-en/labelframe.rb
+++ b/ext/tk/sample/demos-en/labelframe.rb
@@ -7,7 +7,7 @@
if defined?($labelframe_demo) && $labelframe_demo
- $labelframe_demo.destroy
+ $labelframe_demo.destroy
$labelframe_demo = nil
end
@@ -20,8 +20,8 @@ $labelframe_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($labelframe_demo).pack(:fill=>:both, :expand=>true)
# Some information
-TkLabel.new(base_frame,
- :font=>$font, :wraplength=>'4i', :justify=>:left,
+TkLabel.new(base_frame,
+ :font=>$font, :wraplength=>'4i', :justify=>:left,
:text=><<EOL).pack(:side=>:top)
Labelframes are used to group related widgets together. \
The label may be either plain text or another widget. \
@@ -45,17 +45,17 @@ TkFrame.new(base_frame){|f|
}
# Demo area
-w = TkFrame.new(base_frame).pack(:side=>:bottom, :fill=>:both,
+w = TkFrame.new(base_frame).pack(:side=>:bottom, :fill=>:both,
:expand=>true)
# A group of radiobuttons in a labelframe
-TkLabelFrame.new(w, :text=>'Value',
+TkLabelFrame.new(w, :text=>'Value',
:padx=>2, :pady=>2) {|f|
grid(:row=>0, :column=>0, :pady=>'2m', :padx=>'2m')
v = TkVariable.new
(1..4).each{|i|
- TkRadiobutton.new(f, :text=>"This is value #{i}",
+ TkRadiobutton.new(f, :text=>"This is value #{i}",
:variable=>v, :value=>i) {
pack(:side=>:top, :fill=>:x, :pady=>2)
}
@@ -78,7 +78,7 @@ def lfEnableButtons(w)
end
TkLabelFrame.new(w, :pady=>2, :padx=>2){|f|
- TkCheckButton.new(f, :widgetname=>'cb', :variable=>$lfdummy,
+ TkCheckButton.new(f, :widgetname=>'cb', :variable=>$lfdummy,
:text=>"Use this option.", :padx=>0) {|cb|
command proc{lfEnableButtons(f)}
f.labelwidget(cb)
diff --git a/ext/tk/sample/demos-en/mclist.rb b/ext/tk/sample/demos-en/mclist.rb
index 17019bb15b..a849eba515 100644
--- a/ext/tk/sample/demos-en/mclist.rb
+++ b/ext/tk/sample/demos-en/mclist.rb
@@ -6,7 +6,7 @@
# based on "Id: mclist.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp"
if defined?($mclist_demo) && $mclist_demo
- $mclist_demo.destroy
+ $mclist_demo.destroy
$mclist_demo = nil
end
@@ -19,8 +19,8 @@ $mclist_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($mclist_demo).pack(:fill=>:both, :expand=>true)
## Explanatory text
-Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i',
- :justify=>:left, :anchor=>'n', :padding=>[10, 2, 10, 6],
+Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i',
+ :justify=>:left, :anchor=>'n', :padding=>[10, 2, 10, 6],
:text=><<EOL).pack(:fill=>:x)
Ttk is the new Tk themed widget set. \
One of the widgets it includes is a tree widget, \
@@ -36,23 +36,23 @@ EOL
Ttk::Frame.new(base_frame) {|frame|
sep = Ttk::Separator.new(frame)
Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
- TkGrid('x',
- Ttk::Button.new(frame, :text=>'See Code',
- :image=>$image['view'], :compound=>:left,
- :command=>proc{showCode 'mclist'}),
- Ttk::Button.new(frame, :text=>'Dismiss',
- :image=>$image['delete'], :compound=>:left,
+ TkGrid('x',
+ Ttk::Button.new(frame, :text=>'See Code',
+ :image=>$image['view'], :compound=>:left,
+ :command=>proc{showCode 'mclist'}),
+ Ttk::Button.new(frame, :text=>'Dismiss',
+ :image=>$image['delete'], :compound=>:left,
:command=>proc{
$mclist_demo.destroy
$mclist_demo = nil
- }),
+ }),
:padx=>4, :pady=>4)
grid_columnconfigure(0, :weight=>1)
pack(:side=>:bottom, :fill=>:x)
}
container = Ttk::Frame.new(base_frame)
-tree = Ttk::Treeview.new(base_frame, :columns=>%w(country capital currency),
+tree = Ttk::Treeview.new(base_frame, :columns=>%w(country capital currency),
:show=>:headings)
if Tk.windowingsystem != 'aqua'
vsb = tree.yscrollbar(Ttk::Scrollbar.new(base_frame))
@@ -70,20 +70,20 @@ container.grid_rowconfigure(0, :weight=>1)
## The data we're going to insert
data = [
- ['Argentina', 'Buenos Aires', 'ARS'],
- ['Australia', 'Canberra', 'AUD'],
- ['Brazil', 'Brazilia', 'BRL'],
- ['Canada', 'Ottawa', 'CAD'],
- ['China', 'Beijing', 'CNY'],
- ['France', 'Paris', 'EUR'],
- ['Germany', 'Berlin', 'EUR'],
- ['India', 'New Delhi', 'INR'],
- ['Italy', 'Rome', 'EUR'],
- ['Japan', 'Tokyo', 'JPY'],
- ['Mexico', 'Mexico City', 'MXN'],
- ['Russia', 'Moscow', 'RUB'],
- ['South Africa', 'Pretoria', 'ZAR'],
- ['United Kingdom', 'London', 'GBP'],
+ ['Argentina', 'Buenos Aires', 'ARS'],
+ ['Australia', 'Canberra', 'AUD'],
+ ['Brazil', 'Brazilia', 'BRL'],
+ ['Canada', 'Ottawa', 'CAD'],
+ ['China', 'Beijing', 'CNY'],
+ ['France', 'Paris', 'EUR'],
+ ['Germany', 'Berlin', 'EUR'],
+ ['India', 'New Delhi', 'INR'],
+ ['Italy', 'Rome', 'EUR'],
+ ['Japan', 'Tokyo', 'JPY'],
+ ['Mexico', 'Mexico City', 'MXN'],
+ ['Russia', 'Moscow', 'RUB'],
+ ['South Africa', 'Pretoria', 'ZAR'],
+ ['United Kingdom', 'London', 'GBP'],
['United States', 'Washington, D.C.', 'USD'],
]
@@ -91,7 +91,7 @@ data = [
font = Ttk::Style.lookup(tree[:style], :font)
cols = %w(country capital currency)
cols.zip(%w(Country Capital Currency)).each{|col, name|
- tree.heading_configure(col, :text=>name,
+ tree.heading_configure(col, :text=>name,
:command=>proc{sort_by(tree, col, false)})
tree.column_configure(col, :width=>TkFont.measure(font, name))
}
@@ -109,8 +109,8 @@ data.each{|country, capital, currency|
## Code to do the sorting of the tree contents when clicked on
def sort_by(tree, col, direction)
- tree.children(nil).map!{|row| [tree.get(row, col), row.id]} .
- sort(&((direction)? proc{|x, y| y <=> x}: proc{|x, y| x <=> y})) .
+ tree.children(nil).map!{|row| [tree.get(row, col), row.id]} .
+ sort(&((direction)? proc{|x, y| y <=> x}: proc{|x, y| x <=> y})) .
each_with_index{|info, idx| tree.move(info[1], nil, idx)}
tree.heading_configure(col, :command=>proc{sort_by(tree, col, ! direction)})
diff --git a/ext/tk/sample/demos-en/menu.rb b/ext/tk/sample/demos-en/menu.rb
index a458dbbc14..bf6c22cb9d 100644
--- a/ext/tk/sample/demos-en/menu.rb
+++ b/ext/tk/sample/demos-en/menu.rb
@@ -4,7 +4,7 @@
# toplevel widget
if defined?($menu_demo) && $menu_demo
- $menu_demo.destroy
+ $menu_demo.destroy
$menu_demo = nil
end
@@ -54,7 +54,7 @@ TkFrame.new(base_frame) {|frame|
}.pack('side'=>'left', 'expand'=>'yes')
}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-# menu
+# menu
TkMenubutton.new($menu_frame, 'text'=>'File', 'underline'=>0) {|m|
pack('side'=>'left')
TkMenu.new(m, 'tearoff'=>false) {|file_menu|
@@ -86,8 +86,8 @@ TkMenubutton.new($menu_frame, 'text'=>'Basic', 'underline'=>0) {|m|
m.configure('menu'=>basic_menu)
add('command', 'label'=>'Long entry that does nothing')
['A','B','C','D','E','F','G'].each{|c|
- add('command', 'label'=>"Print letter \"#{c}\"",
- 'underline'=>14, 'accelerator'=>"Meta+#{c}",
+ add('command', 'label'=>"Print letter \"#{c}\"",
+ 'underline'=>14, 'accelerator'=>"Meta+#{c}",
'command'=>proc{print c,"\n"}, 'accelerator'=>"#{modifier}+#{c}")
$menu_demo.bind("#{modifier}-#{c.downcase}", proc{print c,"\n"})
}
@@ -98,17 +98,17 @@ TkMenubutton.new($menu_frame, 'text'=>'Cascades', 'underline'=>0) {|m|
pack('side'=>'left')
TkMenu.new(m, 'tearoff'=>false) {|cascade_menu|
m.configure('menu'=>cascade_menu)
- add('command', 'label'=>'Print hello',
- 'command'=>proc{print "Hello\n"},
+ add('command', 'label'=>'Print hello',
+ 'command'=>proc{print "Hello\n"},
'accelerator'=>"#{modifier}+H", 'underline'=>6)
$menu_demo.bind("#{modifier}-h", proc{print "Hello\n"})
- add('command', 'label'=>'Print goodbye',
- 'command'=>proc{print "Goodbye\n"},
+ add('command', 'label'=>'Print goodbye',
+ 'command'=>proc{print "Goodbye\n"},
'accelerator'=>"#{modifier}+G", 'underline'=>6)
$menu_demo.bind("#{modifier}-g", proc{print "Goodbye\n"})
TkMenu.new(cascade_menu, 'tearoff'=>false) {|cascade_check|
- cascade_menu.add('cascade', 'label'=>'Check buttons',
+ cascade_menu.add('cascade', 'label'=>'Check buttons',
'menu'=>cascade_check, 'underline'=>0)
oil = TkVariable.new(0)
add('check', 'label'=>'Oil checked', 'variable'=>oil)
@@ -119,18 +119,18 @@ TkMenubutton.new($menu_frame, 'text'=>'Cascades', 'underline'=>0) {|m|
lights = TkVariable.new(0)
add('check', 'label'=>'Lights checked', 'variable'=>lights)
add('separator')
- add('command', 'label'=>'Show current values',
- 'command'=>proc{showVars($menu_demo,
- ['oil', oil],
- ['trans', trans],
- ['brakes', brakes],
+ add('command', 'label'=>'Show current values',
+ 'command'=>proc{showVars($menu_demo,
+ ['oil', oil],
+ ['trans', trans],
+ ['brakes', brakes],
['lights', lights])} )
invoke 1
invoke 3
}
TkMenu.new(cascade_menu, 'tearoff'=>false) {|cascade_radio|
- cascade_menu.add('cascade', 'label'=>'Radio buttons',
+ cascade_menu.add('cascade', 'label'=>'Radio buttons',
'menu'=>cascade_radio, 'underline'=>0)
pointSize = TkVariable.new
add('radio', 'label'=>'10 point', 'variable'=>pointSize, 'value'=>10)
@@ -144,9 +144,9 @@ TkMenubutton.new($menu_frame, 'text'=>'Cascades', 'underline'=>0) {|m|
add('radio', 'label'=>'Bold', 'variable'=>style, 'value'=>'bold')
add('radio', 'label'=>'Italic', 'variable'=>style, 'value'=>'italic')
add('separator')
- add('command', 'label'=>'Show current values',
- 'command'=>proc{showVars($menu_demo,
- ['pointSize', pointSize],
+ add('command', 'label'=>'Show current values',
+ 'command'=>proc{showVars($menu_demo,
+ ['pointSize', pointSize],
['style', style])} )
invoke 1
invoke 7
@@ -158,15 +158,15 @@ TkMenubutton.new($menu_frame, 'text'=>'Icons', 'underline'=>0) {|m|
pack('side'=>'left')
TkMenu.new(m, 'tearoff'=>false) {|icon_menu|
m.configure('menu'=>icon_menu)
- add('command',
+ add('command',
'bitmap'=>'@'+[$demo_dir,'..',
'images','pattern.xbm'].join(File::Separator),
- 'command'=>proc{TkDialog.new('title'=>'Bitmap Menu Entry',
+ 'command'=>proc{TkDialog.new('title'=>'Bitmap Menu Entry',
'text'=>'The menu entry you invoked displays a bitmap rather than a text string. Other than this, it is just like any other menu entry.',
- 'bitmap'=>'', 'default'=>0,
+ 'bitmap'=>'', 'default'=>0,
'buttons'=>'Dismiss')} )
['info', 'questhead', 'error'].each{|icon|
- add('command', 'bitmap'=>icon,
+ add('command', 'bitmap'=>icon,
'command'=>proc{print "You invoked the #{icon} bitmap\n"})
}
}
@@ -178,7 +178,7 @@ TkMenubutton.new($menu_frame, 'text'=>'More', 'underline'=>0) {|m|
m.configure('menu'=>more_menu)
[ 'An entry','Another entry','Does nothing','Does almost nothing',
'Make life meaningful' ].each{|i|
- add('command', 'label'=>i,
+ add('command', 'label'=>i,
'command'=>proc{print "You invoked \"#{i}\"\n"})
}
}
@@ -189,7 +189,7 @@ TkMenubutton.new($menu_frame, 'text'=>'Colors', 'underline'=>0) {|m|
TkMenu.new(m) {|colors_menu|
m.configure('menu'=>colors_menu)
['red', 'orange', 'yellow', 'green', 'blue'].each{|c|
- add('command', 'label'=>c, 'background'=>c,
+ add('command', 'label'=>c, 'background'=>c,
'command'=>proc{print "You invoked \"#{c}\"\n"})
}
}
diff --git a/ext/tk/sample/demos-en/menu84.rb b/ext/tk/sample/demos-en/menu84.rb
index 4fc53962e7..4029ce5541 100644
--- a/ext/tk/sample/demos-en/menu84.rb
+++ b/ext/tk/sample/demos-en/menu84.rb
@@ -4,7 +4,7 @@
# toplevel widget
if defined?($menu84_demo) && $menu84_demo
- $menu84_demo.destroy
+ $menu84_demo.destroy
$menu84_demo = nil
end
@@ -36,9 +36,9 @@ TkLabel.new(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
menustatus = TkVariable.new(" ")
TkFrame.new(base_frame) {|frame|
- TkLabel.new(frame, 'textvariable'=>menustatus, 'relief'=>'sunken',
- 'bd'=>1, 'font'=>['Helvetica', '10'],
- 'anchor'=>'w').pack('side'=>'left', 'padx'=>2,
+ TkLabel.new(frame, 'textvariable'=>menustatus, 'relief'=>'sunken',
+ 'bd'=>1, 'font'=>['Helvetica', '10'],
+ 'anchor'=>'w').pack('side'=>'left', 'padx'=>2,
'expand'=>true, 'fill'=>'both')
pack('side'=>'bottom', 'fill'=>'x', 'pady'=>2)
}
@@ -92,8 +92,8 @@ TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
$menu84_frame.add('cascade', 'label'=>'Basic', 'menu'=>m, 'underline'=>0)
add('command', 'label'=>'Long entry that does nothing')
['A','B','C','D','E','F','G'].each{|c|
- add('command', 'label'=>"Print letter \"#{c}\"",
- 'underline'=>14, 'accelerator'=>"Meta+#{c}",
+ add('command', 'label'=>"Print letter \"#{c}\"",
+ 'underline'=>14, 'accelerator'=>"Meta+#{c}",
'command'=>proc{print c,"\n"}, 'accelerator'=>"#{modifier}+#{c}")
$menu84_demo.bind("#{modifier}-#{c.downcase}", proc{print c,"\n"})
}
@@ -101,17 +101,17 @@ TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
$menu84_frame.add('cascade', 'label'=>'Cascades', 'menu'=>m, 'underline'=>0)
- add('command', 'label'=>'Print hello',
- 'command'=>proc{print "Hello\n"},
+ add('command', 'label'=>'Print hello',
+ 'command'=>proc{print "Hello\n"},
'accelerator'=>"#{modifier}+H", 'underline'=>6)
$menu84_demo.bind("#{modifier}-h", proc{print "Hello\n"})
- add('command', 'label'=>'Print goodbye',
- 'command'=>proc{print "Goodbye\n"},
+ add('command', 'label'=>'Print goodbye',
+ 'command'=>proc{print "Goodbye\n"},
'accelerator'=>"#{modifier}+G", 'underline'=>6)
$menu84_demo.bind("#{modifier}-g", proc{print "Goodbye\n"})
TkMenu.new(m, 'tearoff'=>false) {|cascade_check|
- m.add('cascade', 'label'=>'Check buttons',
+ m.add('cascade', 'label'=>'Check buttons',
'menu'=>cascade_check, 'underline'=>0)
oil = TkVariable.new(0)
add('check', 'label'=>'Oil checked', 'variable'=>oil)
@@ -122,18 +122,18 @@ TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
lights = TkVariable.new(0)
add('check', 'label'=>'Lights checked', 'variable'=>lights)
add('separator')
- add('command', 'label'=>'Show current values',
- 'command'=>proc{showVars($menu84_demo,
- ['oil', oil],
- ['trans', trans],
- ['brakes', brakes],
+ add('command', 'label'=>'Show current values',
+ 'command'=>proc{showVars($menu84_demo,
+ ['oil', oil],
+ ['trans', trans],
+ ['brakes', brakes],
['lights', lights])} )
invoke 1
invoke 3
}
TkMenu.new(m, 'tearoff'=>false) {|cascade_radio|
- m.add('cascade', 'label'=>'Radio buttons',
+ m.add('cascade', 'label'=>'Radio buttons',
'menu'=>cascade_radio, 'underline'=>0)
pointSize = TkVariable.new
add('radio', 'label'=>'10 point', 'variable'=>pointSize, 'value'=>10)
@@ -147,9 +147,9 @@ TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
add('radio', 'label'=>'Bold', 'variable'=>style, 'value'=>'bold')
add('radio', 'label'=>'Italic', 'variable'=>style, 'value'=>'italic')
add('separator')
- add('command', 'label'=>'Show current values',
- 'command'=>proc{showVars($menu84_demo,
- ['pointSize', pointSize],
+ add('command', 'label'=>'Show current values',
+ 'command'=>proc{showVars($menu84_demo,
+ ['pointSize', pointSize],
['style', style])} )
invoke 1
invoke 7
@@ -158,15 +158,15 @@ TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
$menu84_frame.add('cascade', 'label'=>'Icons', 'menu'=>m, 'underline'=>0)
- add('command', 'hidemargin'=>1,
+ add('command', 'hidemargin'=>1,
'bitmap'=>'@'+[$demo_dir,'..',
'images','pattern.xbm'].join(File::Separator),
- 'command'=>proc{TkDialog.new('title'=>'Bitmap Menu Entry',
+ 'command'=>proc{TkDialog.new('title'=>'Bitmap Menu Entry',
'text'=>'The menu entry you invoked displays a bitmap rather than a text string. Other than this, it is just like any other menu entry.',
- 'bitmap'=>'', 'default'=>0,
+ 'bitmap'=>'', 'default'=>0,
'buttons'=>'Dismiss')} )
['info', 'questhead', 'error'].each{|icon|
- add('command', 'bitmap'=>icon, 'hidemargin'=>1,
+ add('command', 'bitmap'=>icon, 'hidemargin'=>1,
'command'=>proc{print "You invoked the #{icon} bitmap\n"})
}
@@ -177,19 +177,19 @@ TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
$menu84_frame.add('cascade', 'label'=>'More', 'menu'=>m, 'underline'=>0)
[ 'An entry','Another entry','Does nothing','Does almost nothing',
'Make life meaningful' ].each{|i|
- add('command', 'label'=>i,
+ add('command', 'label'=>i,
'command'=>proc{print "You invoked \"#{i}\"\n"})
}
- m.entryconfigure('Does almost nothing',
- 'bitmap'=>'questhead', 'compound'=>'left',
+ m.entryconfigure('Does almost nothing',
+ 'bitmap'=>'questhead', 'compound'=>'left',
'command'=>proc{
- TkDialog.new('title'=>'Compound Menu Entry',
+ TkDialog.new('title'=>'Compound Menu Entry',
'message'=>'The menu entry you invoked'+
'displays both a bitmap and '+
'a text string. Other than '+
'this, it isjust like any '+
- 'other menu entry.',
+ 'other menu entry.',
'buttons'=>['OK'], 'bitmap'=>'')
})
}
@@ -197,7 +197,7 @@ TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
TkMenu.new($menu84_frame) {|m|
$menu84_frame.add('cascade', 'label'=>'Colors', 'menu'=>m, 'underline'=>0)
['red', 'orange', 'yellow', 'green', 'blue'].each{|c|
- add('command', 'label'=>c, 'background'=>c,
+ add('command', 'label'=>c, 'background'=>c,
'command'=>proc{print "You invoked \"#{c}\"\n"})
}
}
diff --git a/ext/tk/sample/demos-en/menubu.rb b/ext/tk/sample/demos-en/menubu.rb
index 6e28e813b3..b37367e515 100644
--- a/ext/tk/sample/demos-en/menubu.rb
+++ b/ext/tk/sample/demos-en/menubu.rb
@@ -21,7 +21,7 @@ def optionMenu(menubutton, varName, firstValue, *rest)
for i in rest
menu.add 'radio', 'label'=>i, 'variable'=>varName
end
-
+
return menu
end
@@ -188,7 +188,7 @@ msg.pack('side'=>'top', 'padx'=>25, 'pady'=>25)
TkFrame.new(center) {|f|
menubuttonoptions = TkVariable.new
mbutton = TkMenubutton.new(f)
- options = optionMenu(mbutton, menubuttonoptions,
+ options = optionMenu(mbutton, menubuttonoptions,
'one', 'two', 'three')
mbutton.pack('side'=>'left', 'padx'=>25, 'pady'=>25)
paletteColor = TkVariable.new
diff --git a/ext/tk/sample/demos-en/msgbox.rb b/ext/tk/sample/demos-en/msgbox.rb
index d3d66bfeb0..62b1f2b985 100644
--- a/ext/tk/sample/demos-en/msgbox.rb
+++ b/ext/tk/sample/demos-en/msgbox.rb
@@ -7,7 +7,7 @@
# toplevel widget
if defined?($msgbox_demo) && $msgbox_demo
- $msgbox_demo.destroy
+ $msgbox_demo.destroy
$msgbox_demo = nil
end
@@ -49,9 +49,9 @@ TkFrame.new(base_frame) {|frame|
# frame
$msgbox_leftframe = TkFrame.new(base_frame)
$msgbox_rightframe = TkFrame.new(base_frame)
-$msgbox_leftframe .pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y',
+$msgbox_leftframe .pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y',
'pady'=>'.5c', 'padx'=>'.5c')
-$msgbox_rightframe.pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y',
+$msgbox_rightframe.pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y',
'pady'=>'.5c', 'padx'=>'.5c')
TkLabel.new($msgbox_leftframe, 'text'=>'Icon').pack('side'=>'top')
@@ -60,9 +60,9 @@ TkFrame.new($msgbox_leftframe, 'relief'=>'ridge', 'bd'=>1, 'height'=>2)\
$msgboxIcon = TkVariable.new('info')
['error', 'info', 'question', 'warning'].each {|icon|
- TkRadioButton.new($msgbox_leftframe, 'text'=>icon, 'variable'=>$msgboxIcon,
- 'relief'=>'flat', 'value'=>icon, 'width'=>16,
- 'anchor'=>'w').pack('side'=>'top', 'pady'=>2,
+ TkRadioButton.new($msgbox_leftframe, 'text'=>icon, 'variable'=>$msgboxIcon,
+ 'relief'=>'flat', 'value'=>icon, 'width'=>16,
+ 'anchor'=>'w').pack('side'=>'top', 'pady'=>2,
'anchor'=>'w', 'fill'=>'x')
}
@@ -71,20 +71,20 @@ TkFrame.new($msgbox_rightframe, 'relief'=>'ridge', 'bd'=>1, 'height'=>2)\
.pack('side'=>'top', 'fill'=>'x', 'expand'=>'no')
$msgboxType = TkVariable.new('ok')
-['abortretryignore', 'ok', 'okcancel',
+['abortretryignore', 'ok', 'okcancel',
'retrycancel', 'yesno', 'yesnocancel'].each {|type|
- TkRadioButton.new($msgbox_rightframe, 'text'=>type, 'variable'=>$msgboxType,
- 'relief'=>'flat', 'value'=>type, 'width'=>16,
- 'anchor'=>'w').pack('side'=>'top', 'pady'=>2,
+ TkRadioButton.new($msgbox_rightframe, 'text'=>type, 'variable'=>$msgboxType,
+ 'relief'=>'flat', 'value'=>type, 'width'=>16,
+ 'anchor'=>'w').pack('side'=>'top', 'pady'=>2,
'anchor'=>'w', 'fill'=>'x')
}
def showMessageBox(w)
- button = Tk.messageBox('icon'=>$msgboxIcon.value, 'type'=>$msgboxType.value,
+ button = Tk.messageBox('icon'=>$msgboxIcon.value, 'type'=>$msgboxType.value,
'title'=>'Message', 'parent'=>w,
'message'=>"This is a \"#{$msgboxType.value}\" type messagebox with the \"#{$msgboxIcon.value}\" icon")
- Tk.messageBox('icon'=>'info', 'type'=>'ok', 'parent'=>w,
+ Tk.messageBox('icon'=>'info', 'type'=>'ok', 'parent'=>w,
'message'=>"You have selected \"#{button}\"")
end
diff --git a/ext/tk/sample/demos-en/msgbox2.rb b/ext/tk/sample/demos-en/msgbox2.rb
index c227b59bb1..6fe6c778b3 100644
--- a/ext/tk/sample/demos-en/msgbox2.rb
+++ b/ext/tk/sample/demos-en/msgbox2.rb
@@ -7,7 +7,7 @@
# toplevel widget
if defined?($msgbox2_demo) && $msgbox2_demo
- $msgbox2_demo.destroy
+ $msgbox2_demo.destroy
$msgbox2_demo = nil
end
@@ -42,16 +42,16 @@ TkFrame.new(base_frame) {|frame|
TkButton.new(frame) {
text 'Message Box'
- command proc{showMessageBox2 $msgbox2_demo}
+ command proc{showMessageBox $msgbox2_demo}
}.pack('side'=>'left', 'expand'=>'yes')
}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
# frame
$msgbox_leftframe = TkFrame.new(base_frame)
$msgbox_rightframe = TkFrame.new(base_frame)
-$msgbox_leftframe .pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y',
+$msgbox_leftframe .pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y',
'pady'=>'.5c', 'padx'=>'.5c')
-$msgbox_rightframe.pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y',
+$msgbox_rightframe.pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y',
'pady'=>'.5c', 'padx'=>'.5c')
TkLabel.new($msgbox_leftframe, 'text'=>'Icon').pack('side'=>'top')
@@ -60,9 +60,9 @@ TkFrame.new($msgbox_leftframe, 'relief'=>'ridge', 'bd'=>1, 'height'=>2)\
$msgboxIcon = TkVariable.new('info')
['error', 'info', 'question', 'warning'].each {|icon|
- TkRadioButton.new($msgbox_leftframe, 'text'=>icon, 'variable'=>$msgboxIcon,
- 'relief'=>'flat', 'value'=>icon, 'width'=>16,
- 'anchor'=>'w').pack('side'=>'top', 'pady'=>2,
+ TkRadioButton.new($msgbox_leftframe, 'text'=>icon, 'variable'=>$msgboxIcon,
+ 'relief'=>'flat', 'value'=>icon, 'width'=>16,
+ 'anchor'=>'w').pack('side'=>'top', 'pady'=>2,
'anchor'=>'w', 'fill'=>'x')
}
@@ -71,21 +71,21 @@ TkFrame.new($msgbox_rightframe, 'relief'=>'ridge', 'bd'=>1, 'height'=>2)\
.pack('side'=>'top', 'fill'=>'x', 'expand'=>'no')
$msgboxType = TkVariable.new('ok')
-['abortretryignore', 'ok', 'okcancel',
+['abortretryignore', 'ok', 'okcancel',
'retrycancel', 'yesno', 'yesnocancel'].each {|type|
- TkRadioButton.new($msgbox_rightframe, 'text'=>type, 'variable'=>$msgboxType,
- 'relief'=>'flat', 'value'=>type, 'width'=>16,
- 'anchor'=>'w').pack('side'=>'top', 'pady'=>2,
+ TkRadioButton.new($msgbox_rightframe, 'text'=>type, 'variable'=>$msgboxType,
+ 'relief'=>'flat', 'value'=>type, 'width'=>16,
+ 'anchor'=>'w').pack('side'=>'top', 'pady'=>2,
'anchor'=>'w', 'fill'=>'x')
}
-def showMessageBox2(w)
- button = Tk.messageBox('icon'=>$msgboxIcon.value, 'type'=>$msgboxType.value,
+def showMessageBox(w)
+ button = Tk.messageBox('icon'=>$msgboxIcon.value, 'type'=>$msgboxType.value,
'title'=>'Message', 'parent'=>w,
'message'=>"\"#{$msgboxType.value}\" Type MessageBox",
'detail'=>"This is a \"#{$msgboxType.value}\" type messagebox with the \"#{$msgboxIcon.value}\" icon. Please click one of the following button.")
- Tk.messageBox('icon'=>'info', 'type'=>'ok', 'parent'=>w,
+ Tk.messageBox('icon'=>'info', 'type'=>'ok', 'parent'=>w,
'message'=>"You have selected \"#{button}\"")
end
diff --git a/ext/tk/sample/demos-en/paned1.rb b/ext/tk/sample/demos-en/paned1.rb
index d3d66d1b16..26941b84a8 100644
--- a/ext/tk/sample/demos-en/paned1.rb
+++ b/ext/tk/sample/demos-en/paned1.rb
@@ -6,7 +6,7 @@
# based on "Id: paned1.tcl,v 1.1 2002/02/22 14:07:01 dkf Exp"
if defined?($paned1_demo) && $paned1_demo
- $paned1_demo.destroy
+ $paned1_demo.destroy
$paned1_demo = nil
end
@@ -18,8 +18,8 @@ $paned1_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($paned1_demo).pack(:fill=>:both, :expand=>true)
-TkLabel.new(base_frame,
- :font=>$font, :wraplength=>'4i', :justify=>:left,
+TkLabel.new(base_frame,
+ :font=>$font, :wraplength=>'4i', :justify=>:left,
:text=><<EOL).pack(:side=>:top)
The sash between the two coloured windows below can be used to divide the area between them. Use the left mouse button to resize without redrawing by just moving the sash, and use the middle mouse button to resize opaquely (always redrawing the windows in each position.)
If your Tk library linked to Ruby doesn't include a 'panedwindow', this demo doesn't work. Please use later version of Tk which supports a 'panedwindow'.
@@ -40,7 +40,7 @@ TkFrame.new(base_frame){|f|
}
TkPanedwindow.new(base_frame, :orient=>:horizontal){|f|
- add(Tk::Label.new(f, :text=>"This is the\nleft side", :bg=>'yellow'),
+ add(Tk::Label.new(f, :text=>"This is the\nleft side", :bg=>'yellow'),
Tk::Label.new(f, :text=>"This is the\nright side", :bg=>'cyan'))
pack(:side=>:top, :expand=>true, :fill=>:both, :pady=>2, :padx=>'2m')
diff --git a/ext/tk/sample/demos-en/paned2.rb b/ext/tk/sample/demos-en/paned2.rb
index 02293b0309..0e62013886 100644
--- a/ext/tk/sample/demos-en/paned2.rb
+++ b/ext/tk/sample/demos-en/paned2.rb
@@ -6,7 +6,7 @@
# based on "Id: paned2.tcl,v 1.1 2002/02/22 14:07:01 dkf Exp"
if defined?($paned2_demo) && $paned2_demo
- $paned2_demo.destroy
+ $paned2_demo.destroy
$paned2_demo = nil
end
@@ -18,8 +18,8 @@ $paned2_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($paned2_demo).pack(:fill=>:both, :expand=>true)
-TkLabel.new(base_frame,
- :font=>$font, :wraplength=>'4i', :justify=>:left,
+TkLabel.new(base_frame,
+ :font=>$font, :wraplength=>'4i', :justify=>:left,
:text=><<EOL).pack(:side=>:top)
The sash between the two scrolled windows below can be used to divide the area between them. Use the left mouse button to resize without redrawing by just moving the sash, and use the middle mouse button to resize opaquely (always redrawing the windows in each position.)
If your Tk library linked to Ruby doesn't include a 'panedwindow', this demo doesn't work. Please use later version of Tk which supports a 'panedwindow'.
@@ -42,23 +42,23 @@ TkFrame.new(base_frame){|f|
paneList = TkVariable.new # define as normal variable (not array)
paneList.value = [ # ruby's array --> tcl's list
'List of Ruby/Tk Widgets',
- 'TkButton',
- 'TkCanvas',
- 'TkCheckbutton',
- 'TkEntry',
- 'TkFrame',
- 'TkLabel',
- 'TkLabelframe',
- 'TkListbox',
- 'TkMenu',
- 'TkMenubutton',
- 'TkMessage',
- 'TkPanedwindow',
- 'TkRadiobutton',
- 'TkScale',
- 'TkScrollbar',
- 'TkSpinbox',
- 'TkText',
+ 'TkButton',
+ 'TkCanvas',
+ 'TkCheckbutton',
+ 'TkEntry',
+ 'TkFrame',
+ 'TkLabel',
+ 'TkLabelframe',
+ 'TkListbox',
+ 'TkMenu',
+ 'TkMenubutton',
+ 'TkMessage',
+ 'TkPanedwindow',
+ 'TkRadiobutton',
+ 'TkScale',
+ 'TkScrollbar',
+ 'TkSpinbox',
+ 'TkText',
'TkToplevel'
]
@@ -69,13 +69,13 @@ TkPanedwindow.new(base_frame, :orient=>:vertical){|f|
add(TkFrame.new(f){|paned2_top|
TkListbox.new(paned2_top, :listvariable=>paneList) {
# Invert the first item to highlight it
- itemconfigure(0, :background=>self.cget(:foreground),
+ itemconfigure(0, :background=>self.cget(:foreground),
:foreground=>self.cget(:background) )
- yscrollbar(TkScrollbar.new(paned2_top).pack(:side=>:right,
+ yscrollbar(TkScrollbar.new(paned2_top).pack(:side=>:right,
:fill=>:y))
pack(:fill=>:both, :expand=>true)
}
- },
+ },
TkFrame.new(f, :height=>120) {|paned2_bottom|
# The bottom window is a text widget with scrollbar
diff --git a/ext/tk/sample/demos-en/pendulum.rb b/ext/tk/sample/demos-en/pendulum.rb
index 306ac94a21..5f7d361170 100644
--- a/ext/tk/sample/demos-en/pendulum.rb
+++ b/ext/tk/sample/demos-en/pendulum.rb
@@ -7,7 +7,7 @@
# destroy toplevel widget for this demo script
if defined?($pendulum_demo) && $pendulum_demo
- $pendulum_demo.destroy
+ $pendulum_demo.destroy
$pendulum_demo = nil
end
@@ -59,14 +59,14 @@ class PendulumAnimationDemo
# Create the canvas containing the graphical representation of the
# simulated system.
- @c = TkCanvas.new(@lf1, :width=>320, :height=>200, :background=>'white',
+ @c = TkCanvas.new(@lf1, :width=>320, :height=>200, :background=>'white',
:borderwidth=>2, :relief=>:sunken)
- TkcText.new(@c, 5, 5, :anchor=>:nw,
+ TkcText.new(@c, 5, 5, :anchor=>:nw,
:text=>'Click to Adjust Bob Start Position')
# Coordinates of these items don't matter; they will be set properly below
@plate = TkcLine.new(@c, 0, 25, 320, 25, :width=>2, :fill=>'grey50')
@rod = TkcLine.new(@c, 1, 1, 1, 1, :width=>3, :fill=>'black')
- @bob = TkcOval.new(@c, 1, 1, 2, 2,
+ @bob = TkcOval.new(@c, 1, 1, 2, 2,
:width=>3, :fill=>'yellow', :outline=>'black')
TkcOval.new(@c, 155, 20, 165, 30, :fill=>'grey50', :outline=>'')
@@ -76,22 +76,22 @@ class PendulumAnimationDemo
# Create the canvas containing the phase space graph; this consists of
# a line that gets gradually paler as it ages, which is an extremely
# effective visual trick.
- @k = TkCanvas.new(@lf2, :width=>320, :height=>200, :background=>'white',
+ @k = TkCanvas.new(@lf2, :width=>320, :height=>200, :background=>'white',
:borderwidth=>2, :relief=>:sunken)
@y_axis = TkcLine.new(@k, 160, 200, 160, 0, :fill=>'grey75', :arrow=>:last)
@x_axis = TkcLine.new(@k, 0, 100, 320, 100, :fill=>'grey75', :arrow=>:last)
@graph = {}
90.step(0, -10){|i|
- # Coordinates of these items don't matter;
+ # Coordinates of these items don't matter;
# they will be set properly below
@graph[i] = TkcLine.new(@k, 0, 0, 1, 1, :smooth=>true, :fill=>"grey#{i}")
}
# labels
- @label_theta = TkcText.new(@k, 0, 0, :anchor=>:ne,
+ @label_theta = TkcText.new(@k, 0, 0, :anchor=>:ne,
:text=>'q', :font=>'Symbol 8')
- @label_dtheta = TkcText.new(@k, 0, 0, :anchor=>:ne,
+ @label_dtheta = TkcText.new(@k, 0, 0, :anchor=>:ne,
:text=>'dq', :font=>'Symbol 8')
# pack
@@ -109,19 +109,19 @@ class PendulumAnimationDemo
# binding
@c.bindtags_unshift(btag = TkBindTag.new)
btag.bind('Destroy'){ @timer.stop }
- btag.bind('1', proc{|x, y| @timer.stop; showPendulum(x.to_i, y.to_i)},
+ btag.bind('1', proc{|x, y| @timer.stop; showPendulum(x.to_i, y.to_i)},
'%x %y')
btag.bind('B1-Motion', proc{|x, y| showPendulum(x.to_i, y.to_i)}, '%x %y')
- btag.bind('ButtonRelease-1',
- proc{|x, y| showPendulum(x.to_i, y.to_i); @timer.start },
+ btag.bind('ButtonRelease-1',
+ proc{|x, y| showPendulum(x.to_i, y.to_i); @timer.start },
'%x %y')
btag.bind('Configure', proc{|w| @plate.coords(0, 25, w.to_i, 25)}, '%w')
- @k.bind('Configure', proc{|h, w|
+ @k.bind('Configure', proc{|h, w|
h = h.to_i
w = w.to_i
- @psh = h/2;
+ @psh = h/2;
@psw = w/2
@x_axis.coords(2, @psh, w-2, @psh)
@y_axis.coords(@psw, h-2, @psw, 2)
@@ -142,9 +142,9 @@ class PendulumAnimationDemo
end
# This procedure makes the pendulum appear at the correct place on the
- # canvas. If the additional arguments x, y are passed instead of computing
- # the position of the pendulum from the length of the pendulum rod and its
- # angle, the length and angle are computed in reverse from the given
+ # canvas. If the additional arguments x, y are passed instead of computing
+ # the position of the pendulum from the length of the pendulum rod and its
+ # angle, the length and angle are computed in reverse from the given
# location (which is taken to be the centre of the pendulum bob.)
def showPendulum(x=nil, y=nil)
if x && y && (x != 160 || y != 25)
diff --git a/ext/tk/sample/demos-en/plot.rb b/ext/tk/sample/demos-en/plot.rb
index f70daa3fb2..628c9df584 100644
--- a/ext/tk/sample/demos-en/plot.rb
+++ b/ext/tk/sample/demos-en/plot.rb
@@ -8,7 +8,7 @@
# toplevel widget
if defined?($plot_demo) && $plot_demo
- $plot_demo.destroy
+ $plot_demo.destroy
$plot_demo = nil
end
@@ -22,7 +22,7 @@ $plot_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($plot_demo).pack(:fill=>:both, :expand=>true)
# label
-TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'4i', 'justify'=>'left',
+TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'4i', 'justify'=>'left',
'text'=>"This window displays a canvas widget containing a simple 2-dimensional plot. You can doctor the data by dragging any of the points with mouse button 1."){
pack('side'=>'top')
}
@@ -45,55 +45,55 @@ $plot_buttons = TkFrame.new(base_frame) {|frame|
}
$plot_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-# font
+# font
plotFont = '-*-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*'
-# canvas
+# canvas
$plot_canvas = TkCanvas.new(base_frame,'relief'=>'raised','width'=>450,'height'=>300)
$plot_canvas.pack('side'=>'top', 'fill'=>'x')
-# plot
+# plot
TkcLine.new($plot_canvas, 100, 250, 400, 250, 'width'=>2)
TkcLine.new($plot_canvas, 100, 250, 100, 50, 'width'=>2)
-TkcText.new($plot_canvas, 225, 20,
+TkcText.new($plot_canvas, 225, 20,
'text'=>"A Simple Plot", 'font'=>plotFont, 'fill'=>'brown')
(0..10).each {|i|
x = 100 + (i * 30)
TkcLine.new($plot_canvas, x, 250, x, 245, 'width'=>2)
- TkcText.new($plot_canvas, x, 254,
+ TkcText.new($plot_canvas, x, 254,
'text'=>10*i, 'font'=>plotFont, 'anchor'=>'n')
}
(0..5).each {|i|
y = 250 - (i * 40)
TkcLine.new($plot_canvas, 100, y, 105, y, 'width'=>2)
- TkcText.new($plot_canvas, 96, y,
+ TkcText.new($plot_canvas, 96, y,
'text'=>"#{i*50}.0", 'font'=>plotFont, 'anchor'=>'e')
}
for xx, yy in [[12,56],[20,94],[33,98],[32,120],[61,180],[75,160],[98,223]]
x = 100 + (3*xx)
y = 250 - (4*yy)/5
- item = TkcOval.new($plot_canvas, x-6, y-6, x+6, y+6,
+ item = TkcOval.new($plot_canvas, x-6, y-6, x+6, y+6,
'width'=>1, 'outline'=>'black', 'fill'=>'SkyBlue2')
item.addtag 'point'
end
-$plot_canvas.itembind('point', 'Any-Enter',
+$plot_canvas.itembind('point', 'Any-Enter',
proc{$plot_canvas.itemconfigure 'current','fill','red'})
-$plot_canvas.itembind('point', 'Any-Leave',
+$plot_canvas.itembind('point', 'Any-Leave',
proc{$plot_canvas.itemconfigure 'current','fill','SkyBlue2'})
-$plot_canvas.itembind('point', '1',
+$plot_canvas.itembind('point', '1',
proc{|x,y| plotDown $plot_canvas,x,y}, "%x %y")
-$plot_canvas.itembind('point', 'ButtonRelease-1',
+$plot_canvas.itembind('point', 'ButtonRelease-1',
proc{$plot_canvas.dtag 'selected'})
-$plot_canvas.bind('B1-Motion',
+$plot_canvas.bind('B1-Motion',
proc{|x,y| plotMove $plot_canvas,x,y}, "%x %y")
$plot = {'lastX'=>0, 'lastY'=>0}
# plotDown --
-# This method is invoked when the mouse is pressed over one of the
+# This method is invoked when the mouse is pressed over one of the
# data points. It sets up state to allow the point to be dragged.
#
# Arguments:
diff --git a/ext/tk/sample/demos-en/puzzle.rb b/ext/tk/sample/demos-en/puzzle.rb
index f16414aa4c..43c61f519f 100644
--- a/ext/tk/sample/demos-en/puzzle.rb
+++ b/ext/tk/sample/demos-en/puzzle.rb
@@ -8,7 +8,7 @@
# toplevel widget
if defined?($puzzle_demo) && $puzzle_demo
- $puzzle_demo.destroy
+ $puzzle_demo.destroy
$puzzle_demo = nil
end
@@ -70,7 +70,7 @@ end
# depend_on_button_width = true
depend_on_button_width = false
-
+
s = TkScrollbar.new(base_frame)
base = TkFrame.new(base_frame) {
width frameWidth
@@ -101,7 +101,7 @@ order = [3,1,6,2,5,7,15,13,4,11,8,9,14,10,12]
if depend_on_button_width && (w.winfo_reqwidth * 4 > base.width)
base.width = w.winfo_reqwidth * 4
end
- }.place('relx'=>$xpos[num], 'rely'=>$ypos[num],
+ }.place('relx'=>$xpos[num], 'rely'=>$ypos[num],
'relwidth'=>0.25, 'relheight'=>0.25)
}
$xpos['space'] = 0.75
diff --git a/ext/tk/sample/demos-en/radio.rb b/ext/tk/sample/demos-en/radio.rb
index bde31508e1..25cfac2134 100644
--- a/ext/tk/sample/demos-en/radio.rb
+++ b/ext/tk/sample/demos-en/radio.rb
@@ -8,7 +8,7 @@
# toplevel widget
if defined?($radio_demo) && $radio_demo
- $radio_demo.destroy
+ $radio_demo.destroy
$radio_demo = nil
end
@@ -21,7 +21,7 @@ $radio_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($radio_demo).pack(:fill=>:both, :expand=>true)
-# label
+# label
msg = TkLabel.new(base_frame) {
font $font
wraplength '4i'
@@ -30,11 +30,11 @@ msg = TkLabel.new(base_frame) {
}
msg.pack('side'=>'top')
-#
+#
size = TkVariable.new
color = TkVariable.new
-# frame
+# frame
TkFrame.new(base_frame) {|frame|
TkButton.new(frame) {
text 'Dismiss'
@@ -59,13 +59,13 @@ TkFrame.new(base_frame) {|frame|
}.pack('side'=>'left', 'expand'=>'yes')
}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-# frame
+# frame
f_left = TkFrame.new(base_frame)
f_right = TkFrame.new(base_frame)
f_left.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
f_right.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
-# radiobutton
+# radiobutton
[10, 12, 18, 24].each {|sz|
TkRadioButton.new(f_left) {
text "Point Size #{sz}"
diff --git a/ext/tk/sample/demos-en/radio2.rb b/ext/tk/sample/demos-en/radio2.rb
index 72fc2c610c..6c02aef0cf 100644
--- a/ext/tk/sample/demos-en/radio2.rb
+++ b/ext/tk/sample/demos-en/radio2.rb
@@ -8,7 +8,7 @@
# toplevel widget
if defined?($radio2_demo) && $radio2_demo
- $radio2_demo.destroy
+ $radio2_demo.destroy
$radio2_demo = nil
end
@@ -21,7 +21,7 @@ $radio2_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($radio2_demo).pack(:fill=>:both, :expand=>true)
-# label
+# label
msg = TkLabel.new(base_frame) {
font $font
wraplength '5i'
@@ -30,12 +30,12 @@ msg = TkLabel.new(base_frame) {
}
msg.pack('side'=>'top')
-#
+#
size = TkVariable.new
color = TkVariable.new
align = TkVariable.new
-# frame
+# frame
TkFrame.new(base_frame) {|frame|
TkButton.new(frame) {
text 'Dismiss'
@@ -55,24 +55,24 @@ TkFrame.new(base_frame) {|frame|
TkButton.new(frame) {
text 'See Variables'
command proc{
- showVars(base_frame,
+ showVars(base_frame,
['size', size], ['color', color], ['compound', align])
}
}.pack('side'=>'left', 'expand'=>'yes')
}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-# frame
-f_left = TkLabelFrame.new(base_frame, 'text'=>'Point Size',
+# frame
+f_left = TkLabelFrame.new(base_frame, 'text'=>'Point Size',
'pady'=>2, 'padx'=>2)
-f_mid = TkLabelFrame.new(base_frame, 'text'=>'Color',
+f_mid = TkLabelFrame.new(base_frame, 'text'=>'Color',
'pady'=>2, 'padx'=>2)
-f_right = TkLabelFrame.new(base_frame, 'text'=>'Alignment',
+f_right = TkLabelFrame.new(base_frame, 'text'=>'Alignment',
'pady'=>2, 'padx'=>2)
f_left.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
f_mid.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
f_right.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
-# radiobutton
+# radiobutton
[10, 12, 18, 24].each {|sz|
TkRadioButton.new(f_left) {
text "Point Size #{sz}"
@@ -92,15 +92,15 @@ f_right.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
}.pack('side'=>'top', 'pady'=>2, 'fill'=>'x')
}
-# label = TkLabel.new(f_right, 'text'=>'Label', 'bitmap'=>'questhead',
-label = Tk::Label.new(f_right, 'text'=>'Label', 'bitmap'=>'questhead',
+# label = TkLabel.new(f_right, 'text'=>'Label', 'bitmap'=>'questhead',
+label = Tk::Label.new(f_right, 'text'=>'Label', 'bitmap'=>'questhead',
'compound'=>'left')
label.configure('width'=>TkWinfo.reqwidth(label), 'compound'=>'top')
label.height(TkWinfo.reqheight(label))
abtn = ['Top', 'Left', 'Right', 'Bottom'].collect{|a|
lower = a.downcase
- TkRadioButton.new(f_right, 'text'=>a, 'variable'=>align, 'relief'=>'flat',
- 'value'=>lower, 'indicatoron'=>0, 'width'=>7,
+ TkRadioButton.new(f_right, 'text'=>a, 'variable'=>align, 'relief'=>'flat',
+ 'value'=>lower, 'indicatoron'=>0, 'width'=>7,
'command'=>proc{label.compound(align.value)})
}
diff --git a/ext/tk/sample/demos-en/radio3.rb b/ext/tk/sample/demos-en/radio3.rb
index 8a147edda7..9c9d75ef4a 100644
--- a/ext/tk/sample/demos-en/radio3.rb
+++ b/ext/tk/sample/demos-en/radio3.rb
@@ -8,7 +8,7 @@
# toplevel widget
if defined?($radio3_demo) && $radio3_demo
- $radio3_demo.destroy
+ $radio3_demo.destroy
$radio3_demo = nil
end
@@ -21,7 +21,7 @@ $radio3_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($radio3_demo).pack(:fill=>:both, :expand=>true)
-# label
+# label
msg = TkLabel.new(base_frame) {
font $font
wraplength '5i'
@@ -35,50 +35,50 @@ size = TkVariable.new
color = TkVariable.new
align = TkVariable.new
-# frame
+# frame
TkFrame.new(base_frame) {|frame|
- TkGrid(TkFrame.new(frame, :height=>2, :relief=>:sunken, :bd=>2),
+ TkGrid(TkFrame.new(frame, :height=>2, :relief=>:sunken, :bd=>2),
:columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
- TkGrid('x',
- TkButton.new(frame, :text=>'See Variables',
- :image=>$image['view'], :compound=>:left,
+ TkGrid('x',
+ TkButton.new(frame, :text=>'See Variables',
+ :image=>$image['view'], :compound=>:left,
:command=>proc{
- showVars(base_frame, ['size', size],
+ showVars(base_frame, ['size', size],
['color', color], ['compound', align])
- }),
- TkButton.new(frame, :text=>'See Code',
- :image=>$image['view'], :compound=>:left,
- :command=>proc{showCode 'radio3'}),
- TkButton.new(frame, :text=>'Dismiss',
- :image=>$image['delete'], :compound=>:left,
+ }),
+ TkButton.new(frame, :text=>'See Code',
+ :image=>$image['view'], :compound=>:left,
+ :command=>proc{showCode 'radio3'}),
+ TkButton.new(frame, :text=>'Dismiss',
+ :image=>$image['delete'], :compound=>:left,
:command=>proc{
tmppath = $radio3_demo
$radio3_demo = nil
$showVarsWin[tmppath.path] = nil
tmppath.destroy
- }),
+ }),
:padx=>4, :pady=>4)
frame.grid_columnconfigure(0, :weight=>1)
TkGrid(frame, :row=>3, :column=>0, :columnspan=>3, :sticky=>'nsew')
}
-# frame
-f_left = TkLabelFrame.new(base_frame, 'text'=>'Point Size',
+# frame
+f_left = TkLabelFrame.new(base_frame, 'text'=>'Point Size',
'pady'=>2, 'padx'=>2)
-f_mid = TkLabelFrame.new(base_frame, 'text'=>'Color',
+f_mid = TkLabelFrame.new(base_frame, 'text'=>'Color',
'pady'=>2, 'padx'=>2)
-f_right = TkLabelFrame.new(base_frame, 'text'=>'Alignment',
+f_right = TkLabelFrame.new(base_frame, 'text'=>'Alignment',
'pady'=>2, 'padx'=>2)
f_left .grid('column'=>0, 'row'=>1, 'pady'=>'.5c', 'padx'=>'.5c', 'rowspan'=>2)
f_mid .grid('column'=>1, 'row'=>1, 'pady'=>'.5c', 'padx'=>'.5c', 'rowspan'=>2)
f_right.grid('column'=>2, 'row'=>1, 'pady'=>'.5c', 'padx'=>'.5c')
-TkButton.new(base_frame, 'text'=>'Tristate',
+TkButton.new(base_frame, 'text'=>'Tristate',
'command'=>proc{size.value = 'multi'; color.value = 'multi'}){
grid('column'=>2, 'row'=>2, 'pady'=>'.5c', 'padx'=>'.5c')
}
-# radiobutton
+# radiobutton
[10, 12, 14, 18, 24].each {|sz|
TkRadioButton.new(f_left) {
text "Point Size #{sz}"
@@ -101,14 +101,14 @@ TkButton.new(base_frame, 'text'=>'Tristate',
}.pack('side'=>'top', 'pady'=>2, 'fill'=>'x')
}
-# label = TkLabel.new(f_right, 'text'=>'Label', 'bitmap'=>'questhead',
-label = Tk::Label.new(f_right, 'text'=>'Label', 'bitmap'=>'questhead',
+# label = TkLabel.new(f_right, 'text'=>'Label', 'bitmap'=>'questhead',
+label = Tk::Label.new(f_right, 'text'=>'Label', 'bitmap'=>'questhead',
'compound'=>'left')
label.configure('width'=>TkWinfo.reqwidth(label), 'compound'=>'top')
label.height(TkWinfo.reqheight(label))
a_btn = ['Top', 'Left', 'Right', 'Bottom'].collect{|a|
- TkRadioButton.new(f_right, 'text'=>a, 'variable'=>align, 'relief'=>'flat',
- 'value'=>a.downcase, 'indicatoron'=>0, 'width'=>7,
+ TkRadioButton.new(f_right, 'text'=>a, 'variable'=>align, 'relief'=>'flat',
+ 'value'=>a.downcase, 'indicatoron'=>0, 'width'=>7,
'command'=>proc{label.compound(align.value)})
}
diff --git a/ext/tk/sample/demos-en/ruler.rb b/ext/tk/sample/demos-en/ruler.rb
index a9773699f7..26cd4f3b1c 100644
--- a/ext/tk/sample/demos-en/ruler.rb
+++ b/ext/tk/sample/demos-en/ruler.rb
@@ -21,7 +21,7 @@ end
# toplevel widget
if defined?($ruler_demo) && $ruler_demo
- $ruler_demo.destroy
+ $ruler_demo.destroy
$ruler_demo = nil
end
@@ -35,7 +35,7 @@ $ruler_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($ruler_demo).pack(:fill=>:both, :expand=>true)
# label
-TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'5i', 'justify'=>'left',
+TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'5i', 'justify'=>'left',
'text'=>"This canvas widget shows a mock-up of a ruler. You can create tab stops by dragging them out of the well to the right of the ruler. You can also drag existing tab stops. If you drag a tab stop far enough up or down so that it turns dim, it will be deleted when you release the mouse button."){
pack('side'=>'top')
}
@@ -58,14 +58,14 @@ $ruler_buttons = TkFrame.new(base_frame) {|frame|
}
$ruler_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-# canvas
+# canvas
$ruler_canvas = TkCanvas.new(base_frame, 'width'=>'14.8c', 'height'=>'2.5c')
$ruler_canvas.pack('side'=>'top', 'fill'=>'x')
-#
+#
unless Struct.const_defined?("RulerInfo")
- $demo_rulerInfo = Struct.new("RulerInfo", :grid, :left, :right, :x, :y,
- :top, :bottom, :size, :normalStyle,
+ $demo_rulerInfo = Struct.new("RulerInfo", :grid, :left, :right, :x, :y,
+ :top, :bottom, :size, :normalStyle,
:activeStyle, :deleteStyle).new
end
$demo_rulerInfo.grid = '.25c'
@@ -77,17 +77,17 @@ $demo_rulerInfo.size = TkWinfo.fpixels($ruler_canvas, '.2c')
$demo_rulerInfo.normalStyle = {'fill'=>'black'}
if TkWinfo.depth($ruler_canvas) > 1
$demo_rulerInfo.activeStyle = {'fill'=>'red', 'stipple'=>''}
- $demo_rulerInfo.deleteStyle = {'fill'=>'red',
- 'stipple'=>'@'+[$demo_dir, '..',
+ $demo_rulerInfo.deleteStyle = {'fill'=>'red',
+ 'stipple'=>'@'+[$demo_dir, '..',
'images', 'gray25.xbm'].join(File::Separator)}
else
$demo_rulerInfo.activeStyle = {'fill'=>'black', 'stipple'=>''}
- $demo_rulerInfo.deleteStyle = {'fill'=>'black',
- 'stipple'=>'@'+[$demo_dir, '..',
+ $demo_rulerInfo.deleteStyle = {'fill'=>'black',
+ 'stipple'=>'@'+[$demo_dir, '..',
'images', 'gray25.xbm'].join(File::Separator)}
end
-TkcLine.new($ruler_canvas,
+TkcLine.new($ruler_canvas,
'1c', '0.5c', '1c', '1c', '13c', '1c', '13c', '0.5c', 'width'=>1)
(0..11).each{|i|
x = i+1
@@ -101,21 +101,21 @@ TkcLine.new($ruler_canvas,
$rulerTag_well = TkcTag.new($ruler_canvas)
$ruler_canvas\
.addtag_withtag($rulerTag_well,
- TkcRectangle.new($ruler_canvas,
- '13.2c', '1c', '13.8c', '0.5c',
- 'outline'=>'black',
+ TkcRectangle.new($ruler_canvas,
+ '13.2c', '1c', '13.8c', '0.5c',
+ 'outline'=>'black',
'fill'=>($ruler_canvas\
.configinfo('background'))[4]) )
$ruler_canvas\
.addtag_withtag($rulerTag_well,
- rulerMkTab($ruler_canvas,
- TkWinfo.pixels($ruler_canvas, '13.5c'),
+ rulerMkTab($ruler_canvas,
+ TkWinfo.pixels($ruler_canvas, '13.5c'),
TkWinfo.pixels($ruler_canvas, '.65c') ) )
$rulerTag_well.bind('1', proc{|x,y| rulerNewTab($ruler_canvas,x,y)}, '%x %y')
-$ruler_canvas.itembind('tab', '1',
+$ruler_canvas.itembind('tab', '1',
proc{|x,y| rulerSelectTab($ruler_canvas,x,y)}, '%x %y')
-$ruler_canvas.bind('B1-Motion',
+$ruler_canvas.bind('B1-Motion',
proc{|x,y| rulerMoveTab($ruler_canvas,x,y)}, '%x %y')
$ruler_canvas.bind('Any-ButtonRelease-1', proc{rulerReleaseTab($ruler_canvas)})
diff --git a/ext/tk/sample/demos-en/sayings.rb b/ext/tk/sample/demos-en/sayings.rb
index a4dcf37cdc..06ec7c1e75 100644
--- a/ext/tk/sample/demos-en/sayings.rb
+++ b/ext/tk/sample/demos-en/sayings.rb
@@ -9,7 +9,7 @@
# toplevel widget
if defined?($sayings_demo) && $sayings_demo
- $sayings_demo.destroy
+ $sayings_demo.destroy
$sayings_demo = nil
end
@@ -70,11 +70,11 @@ TkFrame.new(base_frame, 'borderwidth'=>10) {|w|
sayings_lbox.pack('expand'=>'yes', 'fill'=>'y')
else
- sayings_lbox.grid('row'=>0, 'column'=>0,
+ sayings_lbox.grid('row'=>0, 'column'=>0,
'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
- sv.grid('row'=>0, 'column'=>1,
+ sv.grid('row'=>0, 'column'=>1,
'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
- sh.grid('row'=>1, 'column'=>0,
+ sh.grid('row'=>1, 'column'=>0,
'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
TkGrid.rowconfigure(w, 0, 'weight'=>1, 'minsize'=>0)
TkGrid.columnconfigure(w, 0, 'weight'=>1, 'minsize'=>0)
diff --git a/ext/tk/sample/demos-en/search.rb b/ext/tk/sample/demos-en/search.rb
index 7fb40d88b2..e1fc565e9d 100644
--- a/ext/tk/sample/demos-en/search.rb
+++ b/ext/tk/sample/demos-en/search.rb
@@ -62,13 +62,13 @@ end
def textToggle(cmd1,sleep1,cmd2,sleep2)
sleep_list = [sleep2, sleep1]
- TkAfter.new(proc{sleep = sleep_list.shift; sleep_list.push(sleep); sleep},
+ TkAfter.new(proc{sleep = sleep_list.shift; sleep_list.push(sleep); sleep},
-1, cmd1, cmd2).start(sleep1)
end
# toplevel widget
if defined?($search_demo) && $search_demo
- $search_demo.destroy
+ $search_demo.destroy
$search_demo = nil
end
@@ -101,35 +101,35 @@ $search_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
# frame
TkFrame.new(base_frame) {|f|
- TkLabel.new(f, 'text'=>'File name:',
+ TkLabel.new(f, 'text'=>'File name:',
'width'=>13, 'anchor'=>'w').pack('side'=>'left')
$search_fileName = TkVariable.new
- TkEntry.new(f, 'width'=>40,
+ TkEntry.new(f, 'width'=>40,
'textvariable'=>$search_fileName) {
pack('side'=>'left')
bind('Return', proc{textLoadFile($search_text, $search_fileName.value)
$search_string_entry.focus})
focus
}
- TkButton.new(f, 'text'=>'Load File',
- 'command'=>proc{textLoadFile($search_text,
+ TkButton.new(f, 'text'=>'Load File',
+ 'command'=>proc{textLoadFile($search_text,
$search_fileName.value)})\
.pack('side'=>'left', 'pady'=>5, 'padx'=>10)
}.pack('side'=>'top', 'fill'=>'x')
TkFrame.new(base_frame) {|f|
- TkLabel.new(f, 'text'=>'Search string:',
+ TkLabel.new(f, 'text'=>'Search string:',
'width'=>13, 'anchor'=>'w').pack('side'=>'left')
$search_searchString = TkVariable.new
- $search_string_entry = TkEntry.new(f, 'width'=>40,
+ $search_string_entry = TkEntry.new(f, 'width'=>40,
'textvariable'=>$search_searchString) {
pack('side'=>'left')
- bind('Return', proc{textSearch($search_text, $search_searchString.value,
+ bind('Return', proc{textSearch($search_text, $search_searchString.value,
$search_Tag)})
}
- TkButton.new(f, 'text'=>'Highlight',
- 'command'=>proc{textSearch($search_text,
- $search_searchString.value,
+ TkButton.new(f, 'text'=>'Highlight',
+ 'command'=>proc{textSearch($search_text,
+ $search_searchString.value,
$search_Tag)}) {
pack('side'=>'left', 'pady'=>5, 'padx'=>10)
}
@@ -148,20 +148,20 @@ $search_text = TkText.new(base_frame, 'setgrid'=>true, 'wrap'=>'word') {|t|
if TkWinfo.depth($search_demo) > 1
textToggle(proc{
- $search_Tag.configure('background'=>'#ce5555',
+ $search_Tag.configure('background'=>'#ce5555',
'foreground'=>'white')
},
- 800,
+ 800,
proc{
$search_Tag.configure('background'=>'', 'foreground'=>'')
},
200 )
else
textToggle(proc{
- $search_Tag.configure('background'=>'black',
+ $search_Tag.configure('background'=>'black',
'foreground'=>'white')
},
- 800,
+ 800,
proc{
$search_Tag.configure('background'=>'', 'foreground'=>'')
},
diff --git a/ext/tk/sample/demos-en/spin.rb b/ext/tk/sample/demos-en/spin.rb
index d51b7e6619..c2a3a8949b 100644
--- a/ext/tk/sample/demos-en/spin.rb
+++ b/ext/tk/sample/demos-en/spin.rb
@@ -5,7 +5,7 @@
# based on Tcl/Tk8.4.4 widget demos
if defined?($spin_demo) && $spin_demo
- $spin_demo.destroy
+ $spin_demo.destroy
$spin_demo = nil
end
@@ -17,8 +17,8 @@ $spin_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($spin_demo).pack(:fill=>:both, :expand=>true)
-TkLabel.new(base_frame,
- :font=>$font, :wraplength=>'5i', :justify=>:left,
+TkLabel.new(base_frame,
+ :font=>$font, :wraplength=>'5i', :justify=>:left,
:text=><<EOL).pack(:side=>:top)
Three different spin-boxes are displayed below. \
You can add characters by pointing, clicking and typing. \
@@ -50,16 +50,16 @@ TkFrame.new(base_frame){|f|
}
australianCities = [
- 'Canberra', 'Sydney', 'Melbourne', 'Perth', 'Adelaide',
+ 'Canberra', 'Sydney', 'Melbourne', 'Perth', 'Adelaide',
'Brisbane', 'Hobart', 'Darwin', 'Alice Springs'
]
[
- TkSpinbox.new(base_frame, :from=>1, :to=>10, :width=>10, :validate=>:key,
+ TkSpinbox.new(base_frame, :from=>1, :to=>10, :width=>10, :validate=>:key,
:validatecommand=>[
proc{|s| s == '' || /^[+-]?\d+$/ =~ s }, '%P'
- ]),
- TkSpinbox.new(base_frame, :from=>0, :to=>3, :increment=>0.5,
- :format=>'%05.2f', :width=>10),
+ ]),
+ TkSpinbox.new(base_frame, :from=>0, :to=>3, :increment=>0.5,
+ :format=>'%05.2f', :width=>10),
TkSpinbox.new(base_frame, :values=>australianCities, :width=>10)
].each{|sbox| sbox.pack(:side=>:top, :pady=>5, :padx=>10)}
diff --git a/ext/tk/sample/demos-en/states.rb b/ext/tk/sample/demos-en/states.rb
index a5c01a867c..add0e84800 100644
--- a/ext/tk/sample/demos-en/states.rb
+++ b/ext/tk/sample/demos-en/states.rb
@@ -8,7 +8,7 @@
# toplevel widget
if defined?($states_demo) && $states_demo
- $states_demo.destroy
+ $states_demo.destroy
$states_demo = nil
end
@@ -63,16 +63,16 @@ TkFrame.new(base_frame, 'borderwidth'=>'.5c') {|w|
}.pack('side'=>'top', 'expand'=>'yes', 'fill'=>'y')
ins_data = [
- 'Alabama', 'Alaska', 'Arizona', 'Arkansas', 'California',
- 'Colorado', 'Connecticut', 'Delaware', 'Florida', 'Georgia',
- 'Hawaii', 'Idaho', 'Illinois',
- 'Indiana', 'Iowa', 'Kansas', 'Kentucky', 'Louisiana', 'Maine', 'Maryland',
- 'Massachusetts', 'Michigan', 'Minnesota', 'Mississippi', 'Missouri',
- 'Montana', 'Nebraska', 'Nevada', 'New_Hampshire', 'New_Jersey', 'New_Mexico',
- 'New_York', 'North_Carolina', 'North_Dakota',
- 'Ohio', 'Oklahoma', 'Oregon', 'Pennsylvania', 'Rhode_Island',
- 'South_Carolina', 'South_Dakota',
- 'Tennessee', 'Texas', 'Utah', 'Vermont', 'Virginia', 'Washington',
+ 'Alabama', 'Alaska', 'Arizona', 'Arkansas', 'California',
+ 'Colorado', 'Connecticut', 'Delaware', 'Florida', 'Georgia',
+ 'Hawaii', 'Idaho', 'Illinois',
+ 'Indiana', 'Iowa', 'Kansas', 'Kentucky', 'Louisiana', 'Maine', 'Maryland',
+ 'Massachusetts', 'Michigan', 'Minnesota', 'Mississippi', 'Missouri',
+ 'Montana', 'Nebraska', 'Nevada', 'New_Hampshire', 'New_Jersey', 'New_Mexico',
+ 'New_York', 'North_Carolina', 'North_Dakota',
+ 'Ohio', 'Oklahoma', 'Oregon', 'Pennsylvania', 'Rhode_Island',
+ 'South_Carolina', 'South_Dakota',
+ 'Tennessee', 'Texas', 'Utah', 'Vermont', 'Virginia', 'Washington',
'West_Virginia', 'Wisconsin', 'Wyoming'
]
diff --git a/ext/tk/sample/demos-en/style.rb b/ext/tk/sample/demos-en/style.rb
index 5c8777379e..c2fed23926 100644
--- a/ext/tk/sample/demos-en/style.rb
+++ b/ext/tk/sample/demos-en/style.rb
@@ -8,7 +8,7 @@
# toplevel widget
if defined?($style_demo) && $style_demo
- $style_demo.destroy
+ $style_demo.destroy
$style_demo = nil
end
@@ -38,9 +38,9 @@ TkFrame.new(base_frame) {|frame|
}.pack('side'=>'left', 'expand'=>'yes')
}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-# text
+# text
txt = TkText.new(base_frame){|t|
- #
+ #
setgrid 'true'
#width 70
#height 32
@@ -53,7 +53,7 @@ txt = TkText.new(base_frame){|t|
}
pack('expand'=>'yes', 'fill'=>'both')
- #
+ #
family = 'Courier'
if $tk_version =~ /^4.*/
@@ -76,44 +76,44 @@ txt = TkText.new(base_frame){|t|
# when /^8.*/
# unless $style_demo_do_first
# $style_demo_do_first = true
-# Tk.tk_call('font', 'create', '@bigascii',
+# Tk.tk_call('font', 'create', '@bigascii',
# '-copy', '-*-Courier-Bold-R-Normal--*-140-*-*-*-*-*-*')
-# Tk.tk_call('font', 'create', '@smallascii',
+# Tk.tk_call('font', 'create', '@smallascii',
# '-copy', '-Adobe-Helvetica-Bold-R-Normal-*-100-*')
-# Tk.tk_call('font', 'create', '@cBigFont',
+# Tk.tk_call('font', 'create', '@cBigFont',
# '-compound', '@bigascii @msg_knj')
-# Tk.tk_call('font', 'create', '@cSmallFont',
+# Tk.tk_call('font', 'create', '@cSmallFont',
# '-compound', '@smallascii @kanji')
# end
# style_tag_big = TkTextTag.new(t, 'font'=>'@cBigFont')
# style_tag_small = TkTextTag.new(t, 'font'=>'@cSmallFont')
# end
- #
+ #
if TkWinfo.depth($root).to_i > 1
style_tag_color1 = TkTextTag.new(t, 'background'=>'#a0b7ce')
style_tag_color2 = TkTextTag.new(t, 'foreground'=>'red')
style_tag_raised = TkTextTag.new(t, 'relief'=>'raised', 'borderwidth'=>1)
style_tag_sunken = TkTextTag.new(t, 'relief'=>'sunken', 'borderwidth'=>1)
else
- style_tag_color1 = TkTextTag.new(t, 'background'=>'black',
+ style_tag_color1 = TkTextTag.new(t, 'background'=>'black',
'foreground'=>'white')
- style_tag_color2 = TkTextTag.new(t, 'background'=>'black',
+ style_tag_color2 = TkTextTag.new(t, 'background'=>'black',
'foreground'=>'white')
- style_tag_raised = TkTextTag.new(t, 'background'=>'white',
+ style_tag_raised = TkTextTag.new(t, 'background'=>'white',
'relief'=>'raised', 'borderwidth'=>1)
- style_tag_sunken = TkTextTag.new(t, 'background'=>'white',
+ style_tag_sunken = TkTextTag.new(t, 'background'=>'white',
'relief'=>'sunken', 'borderwidth'=>1)
end
- #
+ #
if $tk_version =~ /^4\.[01]/
- style_tag_bgstipple = TkTextTag.new(t, 'background'=>'black',
- 'borderwidth'=>0,
+ style_tag_bgstipple = TkTextTag.new(t, 'background'=>'black',
+ 'borderwidth'=>0,
'bgstipple'=>'gray25')
else
- style_tag_bgstipple = TkTextTag.new(t, 'background'=>'black',
- 'borderwidth'=>0,
+ style_tag_bgstipple = TkTextTag.new(t, 'background'=>'black',
+ 'borderwidth'=>0,
'bgstipple'=>'gray12')
end
style_tag_fgstipple = TkTextTag.new(t, 'fgstipple'=>'gray50')
@@ -134,7 +134,7 @@ txt = TkText.new(base_frame){|t|
'lmargin1'=>'12m', 'lmargin2'=>'6m',
'rmargin'=>'10m')
- #
+ #
insert('end', 'Text widgets like this one allow you to display information in a
variety of styles. Display styles are controlled using a mechanism
called ')
diff --git a/ext/tk/sample/demos-en/text.rb b/ext/tk/sample/demos-en/text.rb
index 5794a85e87..3ce8cdfda8 100644
--- a/ext/tk/sample/demos-en/text.rb
+++ b/ext/tk/sample/demos-en/text.rb
@@ -8,7 +8,7 @@
# toplevel widget
if defined?($text_demo) && $text_demo
- $text_demo.destroy
+ $text_demo.destroy
$text_demo = nil
end
@@ -45,7 +45,7 @@ TkFrame.new(base_frame) {|frame|
}.pack('side'=>'left', 'expand'=>'yes')
}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-# text
+# text
TkText.new(base_frame){|t|
relief 'sunken'
bd 2
@@ -62,7 +62,7 @@ TkText.new(base_frame){|t|
}
pack('expand'=>'yes', 'fill'=>'both')
- #
+ #
insert('0.0', <<EOT)
This window is a text widget. It displays one or more lines of text
and allows you to edit the text. Here is a summary of the things you
diff --git a/ext/tk/sample/demos-en/textpeer.rb b/ext/tk/sample/demos-en/textpeer.rb
index 20192fcd05..c25ce15e5c 100644
--- a/ext/tk/sample/demos-en/textpeer.rb
+++ b/ext/tk/sample/demos-en/textpeer.rb
@@ -4,7 +4,7 @@
# based on Tcl/Tk8.5.0 widget demos
if defined?($textpeer_demo) && $textpeer_demo
- $textpeer_demo.destroy
+ $textpeer_demo.destroy
$textpeer_demo = nil
end
@@ -39,9 +39,9 @@ def makeClone(count, win, txt)
peer = TkText::Peer.new(txt, win, :widgetname=>"text#{cnt}")
sbar = TkScrollbar.new(win, :widgetname=>"sb#{cnt}")
peer.yscrollbar sbar
- b1 = TkButton.new(win, :widgetname=>"clone#{cnt}", :text=>'Make Peer',
+ b1 = TkButton.new(win, :widgetname=>"clone#{cnt}", :text=>'Make Peer',
:command=>proc{makeClone(count, win, peer)})
- b2 = TkButton.new(win, :widgetname=>"kill#{cnt}", :text=>'Delete Peer',
+ b2 = TkButton.new(win, :widgetname=>"kill#{cnt}", :text=>'Delete Peer',
:command=>proc{killClone(win, cnt)})
row = cnt * 2
TkGrid.configure(peer, sbar, b1, :sticky=>'nsew', :row=>row)
@@ -51,7 +51,7 @@ def makeClone(count, win, txt)
end
def killClone(win, cnt)
- Tk.destroy("#{win.path}.text#{cnt}", "#{win.path}.sb#{cnt}",
+ Tk.destroy("#{win.path}.text#{cnt}", "#{win.path}.sb#{cnt}",
"#{win.path}.clone#{cnt}", "#{win.path}.kill#{cnt}")
end
diff --git a/ext/tk/sample/demos-en/toolbar.rb b/ext/tk/sample/demos-en/toolbar.rb
index e7cbeb4235..5cf863717b 100644
--- a/ext/tk/sample/demos-en/toolbar.rb
+++ b/ext/tk/sample/demos-en/toolbar.rb
@@ -5,7 +5,7 @@
# based on "Id: toolbar.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp"
if defined?($toolbar_demo) && $toolbar_demo
- $toolbar_demo.destroy
+ $toolbar_demo.destroy
$toolbar_demo = nil
end
@@ -18,7 +18,7 @@ $toolbar_demo = TkToplevel.new {|w|
base_frame = Ttk::Frame.new($toolbar_demo).pack(:fill=>:both, :expand=>true)
if Tk.windowingsystem != 'aqua'
- msg = Ttk::Label.new(base_frame, :wraplength=>'4i',
+ msg = Ttk::Label.new(base_frame, :wraplength=>'4i',
:text=>Tk::UTF8_String.new(<<EOL))
This is a demonstration of how to do \
a toolbar that is styled correctly \
@@ -32,7 +32,7 @@ toolbar is no longer needed, just close it like any normal toplevel \
and it will reattach to the window it was torn off from.
EOL
else
- msg = Ttk::Label.new(base_frame, :wraplength=>'4i',
+ msg = Ttk::Label.new(base_frame, :wraplength=>'4i',
:text=>Tk::UTF8_String.new(<<EOL))
This is a demonstration of how to do \
a toolbar that is styled correctly. The buttons are configured to \
@@ -70,7 +70,7 @@ if Tk.windowingsystem != 'aqua'
w.grid_remove
self.wm_manage
# self.wm_title('Toolbar') # if you don't want to use its widget name as a window title.
- self.wm_protocol('WM_DELETE_WINDOW'){ self.untearoff(w) }
+ self.wm_protocol('WM_DELETE_WINDOW'){ self.untearoff(self) }
end
def tbar_base.untearoff(w)
self.wm_forget
@@ -83,25 +83,25 @@ end
text = TkText.new(base_frame, :width=>40, :height=>10)
## Toolbar contents
-tb_btn = Ttk::Button.new(tbar_base, :text=>'Button', :style=>'Toolbutton',
+tb_btn = Ttk::Button.new(tbar_base, :text=>'Button', :style=>'Toolbutton',
:command=>proc{text.insert(:end, "Button Pressed\n")})
-tb_chk = Ttk::Checkbutton.new(tbar_base, :text=>'Check', :style=>'Toolbutton',
- :variable=>(check = TkVariable.new),
+tb_chk = Ttk::Checkbutton.new(tbar_base, :text=>'Check', :style=>'Toolbutton',
+ :variable=>(check = TkVariable.new),
:command=>proc{
text.insert(:end, "Check is #{check.value}\n")
})
tb_mbtn = Ttk::Menubutton.new(tbar_base, :text=>'Menu')
-tb_combo = Ttk::Combobox.new(tbar_base, :value=>TkFont.families,
+tb_combo = Ttk::Combobox.new(tbar_base, :value=>TkFont.families,
:state=>:readonly)
tb_mbtn.menu(menu = Tk::Menu.new(tb_mbtn))
menu.add(:command, :label=>'Just', :command=>proc{text.insert(:end, "Just\n")})
menu.add(:command, :label=>'An', :command=>proc{text.insert(:end, "An\n")})
-menu.add(:command, :label=>'Example',
+menu.add(:command, :label=>'Example',
:command=>proc{text.insert(:end, "Example\n")})
tb_combo.bind('<ComboboxSelected>'){ text.font.family = tb_combo.get }
## Arrange contents
-Tk.grid(tb_btn, tb_chk, tb_mbtn, tb_combo,
+Tk.grid(tb_btn, tb_chk, tb_mbtn, tb_combo,
:in=>contents, :padx=>2, :sticky=>'ns')
Tk.grid(tbar_base, :sticky=>'ew')
Tk.grid(sep, :sticky=>'ew')
@@ -114,16 +114,16 @@ base_frame.grid_columnconfigure(text, :weight=>1)
Ttk::Frame.new(base_frame) {|frame|
sep = Ttk::Separator.new(frame)
Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
- TkGrid('x',
- Ttk::Button.new(frame, :text=>'See Code',
- :image=>$image['view'], :compound=>:left,
- :command=>proc{showCode 'toolbar'}),
- Ttk::Button.new(frame, :text=>'Dismiss',
- :image=>$image['delete'], :compound=>:left,
+ TkGrid('x',
+ Ttk::Button.new(frame, :text=>'See Code',
+ :image=>$image['view'], :compound=>:left,
+ :command=>proc{showCode 'toolbar'}),
+ Ttk::Button.new(frame, :text=>'Dismiss',
+ :image=>$image['delete'], :compound=>:left,
:command=>proc{
$toolbar_demo.destroy
$toolbar_demo = nil
- }),
+ }),
:padx=>4, :pady=>4)
grid_columnconfigure(0, :weight=>1)
Tk.grid(frame, :sticky=>'ew')
diff --git a/ext/tk/sample/demos-en/tree.rb b/ext/tk/sample/demos-en/tree.rb
index cd62ba8c9b..0c7f0e71a2 100644
--- a/ext/tk/sample/demos-en/tree.rb
+++ b/ext/tk/sample/demos-en/tree.rb
@@ -6,7 +6,7 @@
# based on "Id: tree.tcl,v 1.4 2007/12/13 15:27:07 dgp Exp"
if defined?($tree_demo) && $tree_demo
- $tree_demo.destroy
+ $tree_demo.destroy
$tree_demo = nil
end
@@ -19,8 +19,8 @@ $tree_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($tree_demo).pack(:fill=>:both, :expand=>true)
## Explanatory text
-Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i',
- :justify=>:left, :anchor=>'n', :padding=>[10, 2, 10, 6],
+Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i',
+ :justify=>:left, :anchor=>'n', :padding=>[10, 2, 10, 6],
:text=><<EOL).pack(:fill=>:x)
Ttk is the new Tk themed widget set. \
One of the widgets it includes is a tree widget, \
@@ -37,16 +37,16 @@ EOL
Ttk::Frame.new(base_frame) {|frame|
sep = Ttk::Separator.new(frame)
Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
- TkGrid('x',
- Ttk::Button.new(frame, :text=>'See Code',
- :image=>$image['view'], :compound=>:left,
- :command=>proc{showCode 'tree'}),
- Ttk::Button.new(frame, :text=>'Dismiss',
- :image=>$image['delete'], :compound=>:left,
+ TkGrid('x',
+ Ttk::Button.new(frame, :text=>'See Code',
+ :image=>$image['view'], :compound=>:left,
+ :command=>proc{showCode 'tree'}),
+ Ttk::Button.new(frame, :text=>'Dismiss',
+ :image=>$image['delete'], :compound=>:left,
:command=>proc{
$tree_demo.destroy
$tree_demo = nil
- }),
+ }),
:padx=>4, :pady=>4)
grid_columnconfigure(0, :weight=>1)
pack(:side=>:bottom, :fill=>:x)
@@ -55,7 +55,7 @@ Ttk::Frame.new(base_frame) {|frame|
## Code to populate the roots of the tree (can be more than one on Windows)
def populate_roots(tree)
TkComm.simplelist(Tk.tk_call('file', 'volumes')).sort.each{|dir|
- populate_tree(tree, tree.insert(nil, :end, :text=>dir,
+ populate_tree(tree, tree.insert(nil, :end, :text=>dir,
:values=>[dir, 'directory']))
}
end
@@ -68,7 +68,7 @@ def populate_tree(tree, node)
tree.delete(tree.children(node))
Dir.glob("#{path}/*").sort.each{|f|
type = File.ftype(f)
- id = tree.insert(node, :end,
+ id = tree.insert(node, :end,
:text=>File.basename(f), :values=>[f, type]).id
if type == 'directory'
## Make it so that this node is openable
@@ -94,7 +94,7 @@ def populate_tree(tree, node)
end
## Create the tree and set it up
-tree = Ttk::Treeview.new(base_frame, :columns=>%w(fullpath type size),
+tree = Ttk::Treeview.new(base_frame, :columns=>%w(fullpath type size),
:displaycolumns=>['size'])
if Tk.windowingsystem != 'aqua'
vsb = tree.yscrollbar(Ttk::Scrollbar.new(base_frame))
diff --git a/ext/tk/sample/demos-en/ttkbut.rb b/ext/tk/sample/demos-en/ttkbut.rb
index a784efcc08..b5780f589a 100644
--- a/ext/tk/sample/demos-en/ttkbut.rb
+++ b/ext/tk/sample/demos-en/ttkbut.rb
@@ -7,7 +7,7 @@
# based on "Id: ttkbut.tcl,v 1.4 2007/12/13 15:27:07 dgp Exp"
if defined?($ttkbut_demo) && $ttkbut_demo
- $ttkbut_demo.destroy
+ $ttkbut_demo.destroy
$ttkbut_demo = nil
end
@@ -19,7 +19,7 @@ $ttkbut_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($ttkbut_demo).pack(:fill=>:both, :expand=>true)
-Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i', :justify=>:left,
+Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i', :justify=>:left,
:text=><<EOL).pack(:side=>:top, :fill=>:x)
Ttk is the new Tk themed widget set. This is a Ttk themed label, \
and below are three groups of Ttk widgets in Ttk labelframes. \
@@ -34,11 +34,11 @@ EOL
## Add buttons for setting the theme
buttons = Ttk::Labelframe.new(base_frame, :text=>'Buttons')
# Ttk::Style.theme_names.each{|theme|
-# Ttk::Button.new(buttons, :text=>theme,
+# Ttk::Button.new(buttons, :text=>theme,
# :command=>proc{Ttk::Style.theme_use theme}).pack(:pady=>2)
# }
Ttk.themes.each{|theme|
- Ttk::Button.new(buttons, :text=>theme,
+ Ttk::Button.new(buttons, :text=>theme,
:command=>proc{Ttk.set_theme theme}).pack(:pady=>2)
}
@@ -62,9 +62,9 @@ end
## Set up the checkbutton group
checks = Ttk::Labelframe.new(base_frame, :text=>'Checkbuttons')
enabled = TkVariable.new(true)
-e = Ttk::Checkbutton.new(checks, :text=>'Enabled', :variable=>enabled,
+e = Ttk::Checkbutton.new(checks, :text=>'Enabled', :variable=>enabled,
:command=>proc{
- setState($ttkbut_demo,
+ setState($ttkbut_demo,
((enabled.bool)? "!disabled" : "disabled"),
e)
})
@@ -90,15 +90,15 @@ radios = Ttk::Labelframe.new(base_frame, :text=>'Radiobuttons')
happyness = TkVariable.new
-r1 = Ttk::Radiobutton.new(radios, :variable=>happyness,
+r1 = Ttk::Radiobutton.new(radios, :variable=>happyness,
:text=>'Great', :value=>'great')
-r2 = Ttk::Radiobutton.new(radios, :variable=>happyness,
+r2 = Ttk::Radiobutton.new(radios, :variable=>happyness,
:text=>'Good', :value=>'good')
-r3 = Ttk::Radiobutton.new(radios, :variable=>happyness,
+r3 = Ttk::Radiobutton.new(radios, :variable=>happyness,
:text=>'Ok', :value=>'ok')
-r4 = Ttk::Radiobutton.new(radios, :variable=>happyness,
+r4 = Ttk::Radiobutton.new(radios, :variable=>happyness,
:text=>'Poor', :value=>'poor')
-r5 = Ttk::Radiobutton.new(radios, :variable=>happyness,
+r5 = Ttk::Radiobutton.new(radios, :variable=>happyness,
:text=>'Awful', :value=>'awful')
Tk.pack(r1, r2, r3, r4, r5, :fill=>:x, :padx=>3, :pady=>2)
@@ -107,26 +107,26 @@ Tk.pack(r1, r2, r3, r4, r5, :fill=>:x, :padx=>3, :pady=>2)
Ttk::Frame.new(base_frame) {|frame|
sep = Ttk::Separator.new(frame)
Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
- TkGrid('x',
- Ttk::Button.new(frame, :text=>'See Variables',
- :image=>$image['view'], :compound=>:left,
+ TkGrid('x',
+ Ttk::Button.new(frame, :text=>'See Variables',
+ :image=>$image['view'], :compound=>:left,
:command=>proc{
- showVars(base_frame, ['enabled', enabled],
- ['cheese', cheese], ['tomato', tomato],
- ['basil', basil], ['oregano', oregano],
+ showVars(base_frame, ['enabled', enabled],
+ ['cheese', cheese], ['tomato', tomato],
+ ['basil', basil], ['oregano', oregano],
['happyness', happyness])
- }),
- Ttk::Button.new(frame, :text=>'See Code',
- :image=>$image['view'], :compound=>:left,
- :command=>proc{showCode 'ttkbut'}),
- Ttk::Button.new(frame, :text=>'Dismiss',
- :image=>$image['delete'], :compound=>:left,
+ }),
+ Ttk::Button.new(frame, :text=>'See Code',
+ :image=>$image['view'], :compound=>:left,
+ :command=>proc{showCode 'ttkbut'}),
+ Ttk::Button.new(frame, :text=>'Dismiss',
+ :image=>$image['delete'], :compound=>:left,
:command=>proc{
tmppath = $ttkbut_demo
$ttkbut_demo = nil
$showVarsWin[tmppath.path] = nil
tmppath.destroy
- }),
+ }),
:padx=>4, :pady=>4)
grid_columnconfigure(0, :weight=>1)
pack(:side=>:bottom, :fill=>:x, :expand=>true)
diff --git a/ext/tk/sample/demos-en/ttkmenu.rb b/ext/tk/sample/demos-en/ttkmenu.rb
index 9399568313..75ecdb09c4 100644
--- a/ext/tk/sample/demos-en/ttkmenu.rb
+++ b/ext/tk/sample/demos-en/ttkmenu.rb
@@ -6,7 +6,7 @@
# based on "Id: ttkmenu.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp"
if defined?($ttkmenu_demo) && $ttkmenu_demo
- $ttkmenu_demo.destroy
+ $ttkmenu_demo.destroy
$ttkmenu_demo = nil
end
@@ -18,7 +18,7 @@ $ttkmenu_demo = TkToplevel.new {|w|
base_frame = Ttk::Frame.new($ttkmenu_demo).pack(:fill=>:both, :expand=>true)
-Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i', :justify=>:left,
+Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i', :justify=>:left,
:text=><<EOL).pack(:side=>:top, :fill=>:x)
Ttk is the new Tk themed widget set, \
and one widget that is available in themed form is the menubutton. \
@@ -39,16 +39,16 @@ Ttk::Separator.new(base_frame).pack(:side=>:top, :fill=>:x)
Ttk::Frame.new($ttkmenu_demo) {|frame|
sep = Ttk::Separator.new(frame)
Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
- TkGrid('x',
- Ttk::Button.new(frame, :text=>'See Code',
- :image=>$image['view'], :compound=>:left,
- :command=>proc{showCode 'ttkmenu'}),
- Ttk::Button.new(frame, :text=>'Dismiss',
- :image=>$image['delete'], :compound=>:left,
+ TkGrid('x',
+ Ttk::Button.new(frame, :text=>'See Code',
+ :image=>$image['view'], :compound=>:left,
+ :command=>proc{showCode 'ttkmenu'}),
+ Ttk::Button.new(frame, :text=>'Dismiss',
+ :image=>$image['delete'], :compound=>:left,
:command=>proc{
$ttkmenu_demo.destroy
$ttkmenu_demo = nil
- }),
+ }),
:padx=>4, :pady=>4)
grid_columnconfigure(0, :weight=>1)
pack(:side=>:bottom, :fill=>:x)
diff --git a/ext/tk/sample/demos-en/ttknote.rb b/ext/tk/sample/demos-en/ttknote.rb
index bc0c7b369a..c2a22b447a 100644
--- a/ext/tk/sample/demos-en/ttknote.rb
+++ b/ext/tk/sample/demos-en/ttknote.rb
@@ -6,7 +6,7 @@
# based on "Id: ttknote.tcl,v 1.5 2007/12/13 15:27:07 dgp Exp"
if defined?($ttknote_demo) && $ttknote_demo
- $ttknote_demo.destroy
+ $ttknote_demo.destroy
$ttknote_demo = nil
end
@@ -20,16 +20,16 @@ $ttknote_demo = TkToplevel.new {|w|
Ttk::Frame.new($ttknote_demo) {|frame|
sep = Ttk::Separator.new(frame)
Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
- TkGrid('x',
- Ttk::Button.new(frame, :text=>'See Code',
- :image=>$image['view'], :compound=>:left,
- :command=>proc{showCode 'ttknote'}),
- Ttk::Button.new(frame, :text=>'Dismiss',
- :image=>$image['delete'], :compound=>:left,
+ TkGrid('x',
+ Ttk::Button.new(frame, :text=>'See Code',
+ :image=>$image['view'], :compound=>:left,
+ :command=>proc{showCode 'ttknote'}),
+ Ttk::Button.new(frame, :text=>'Dismiss',
+ :image=>$image['delete'], :compound=>:left,
:command=>proc{
$ttknote_demo.destroy
$ttknote_demo = nil
- }),
+ }),
:padx=>4, :pady=>4)
grid_columnconfigure(0, :weight=>1)
pack(:side=>:bottom, :fill=>:x)
@@ -38,13 +38,13 @@ Ttk::Frame.new($ttknote_demo) {|frame|
base_frame = Ttk::Frame.new($ttknote_demo).pack(:fill=>:both, :expand=>true)
## Make the notebook and set up Ctrl+Tab traversal
-notebook = Ttk::Notebook.new(base_frame).pack(:fill=>:both, :expand=>true,
+notebook = Ttk::Notebook.new(base_frame).pack(:fill=>:both, :expand=>true,
:padx=>2, :pady=>3)
notebook.enable_traversal
## Popuplate the first pane
f_msg = Ttk::Frame.new(notebook)
-msg_m = Ttk::Label.new(f_msg, :font=>$font, :wraplength=>'4i',
+msg_m = Ttk::Label.new(f_msg, :font=>$font, :wraplength=>'4i',
:justify=>:left, :anchor=>'n', :text=><<EOL)
Ttk is the new Tk themed widget set. \
One of the widgets it includes is the notebook widget, \
@@ -58,7 +58,7 @@ Note that the second tab is disabled, and cannot be selected.
EOL
neat = TkVariable.new
after_id = nil
-msg_b = Ttk::Button.new(f_msg, :text=>'Neat!', :underline=>0,
+msg_b = Ttk::Button.new(f_msg, :text=>'Neat!', :underline=>0,
:command=>proc{
neat.value = 'Yeah, I know...'
Tk.after_cancel(after_id) if after_id
diff --git a/ext/tk/sample/demos-en/ttkpane.rb b/ext/tk/sample/demos-en/ttkpane.rb
index 87c4dedeb2..56df613db4 100644
--- a/ext/tk/sample/demos-en/ttkpane.rb
+++ b/ext/tk/sample/demos-en/ttkpane.rb
@@ -5,7 +5,7 @@
# based on "Id: ttkpane.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp"
if defined?($ttkpane_demo) && $ttkpane_demo
- $ttkpane_demo.destroy
+ $ttkpane_demo.destroy
$ttkpane_demo = nil
end
@@ -17,7 +17,7 @@ $ttkpane_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($ttkpane_demo).pack(:fill=>:both, :expand=>true)
-Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i', :justify=>:left,
+Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i', :justify=>:left,
:text=><<EOL).pack(:side=>:top, :fill=>:x)
This demonstration shows off a nested set of themed paned windows. \
Their sizes can be changed by grabbing the area \
@@ -30,16 +30,16 @@ Ttk::Separator.new(base_frame).pack(:side=>:top, :fill=>:x)
Ttk::Frame.new(base_frame) {|frame|
sep = Ttk::Separator.new(frame)
Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
- TkGrid('x',
- Ttk::Button.new(frame, :text=>'See Code',
- :image=>$image['view'], :compound=>:left,
- :command=>proc{showCode 'ttkpane'}),
- Ttk::Button.new(frame, :text=>'Dismiss',
- :image=>$image['delete'], :compound=>:left,
+ TkGrid('x',
+ Ttk::Button.new(frame, :text=>'See Code',
+ :image=>$image['view'], :compound=>:left,
+ :command=>proc{showCode 'ttkpane'}),
+ Ttk::Button.new(frame, :text=>'Dismiss',
+ :image=>$image['delete'], :compound=>:left,
:command=>proc{
$ttkpane_demo.destroy
$ttkpane_demo = nil
- }),
+ }),
:padx=>4, :pady=>4)
grid_columnconfigure(0, :weight=>1)
pack(:side=>:bottom, :fill=>:x)
@@ -59,25 +59,25 @@ if Tk.windowingsystem == 'aqua'
end
# Fill the button pane
-Ttk::Button.new(left_top, :text=>'Press Me',
+Ttk::Button.new(left_top, :text=>'Press Me',
:command=>proc{
- Tk.messageBox(:type=>'ok', :icon=>'info', :message=>'Ouch!',
- :detail=>'That hurt...', :parent=>base_frame,
+ Tk.messageBox(:type=>'ok', :icon=>'info', :message=>'Ouch!',
+ :detail=>'That hurt...', :parent=>base_frame,
:title=>'Button Pressed')
}).pack(:padx=>2, :pady=>5)
zones_list = [
- [':Europe/Berlin'],
- [':America/Argentina/Buenos_Aires', ':America/Buenos_Aires'],
- [':Africa/Johannesburg'],
- [':Europe/London'],
- [':America/Los_Angeles'],
+ [':Europe/Berlin'],
+ [':America/Argentina/Buenos_Aires', ':America/Buenos_Aires'],
+ [':Africa/Johannesburg'],
+ [':Europe/London'],
+ [':America/Los_Angeles'],
[':Europe/Moscow'],
- [':America/New_York'],
- [':Asia/Singapore'],
- [':Australia/Sydney'],
- [':Asia/Tokyo'],
+ [':America/New_York'],
+ [':Asia/Singapore'],
+ [':Australia/Sydney'],
+ [':Asia/Tokyo'],
]
zones = []
@@ -155,7 +155,7 @@ time = TkVariable.new_hash
case tzinfo
when :tcl
update_proc = proc{|now, tz, label|
- time[label] = Tk.tk_call('clock', 'format', now.tv_sec,
+ time[label] = Tk.tk_call('clock', 'format', now.tv_sec,
'-timezone', tz, '-format', '%T')
}
when :tzinfo
@@ -176,7 +176,7 @@ end
zones.each_with_index{|(zone, label), idx|
Ttk::Separator.new(left_bot).pack(:fill=>:x) if idx > 0
Ttk::Label.new(left_bot, :text=>label, :anchor=>'w').pack(:fill=>:x)
- Ttk::Label.new(left_bot, :textvariable=>time.ref(label),
+ Ttk::Label.new(left_bot, :textvariable=>time.ref(label),
:anchor=>'w').pack(:fill=>:x)
}
diff --git a/ext/tk/sample/demos-en/ttkprogress.rb b/ext/tk/sample/demos-en/ttkprogress.rb
index c341a9385f..3eb9a64a4a 100644
--- a/ext/tk/sample/demos-en/ttkprogress.rb
+++ b/ext/tk/sample/demos-en/ttkprogress.rb
@@ -5,7 +5,7 @@
# based on "Id: ttkprogress.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp"
if defined?($ttkprogress_demo) && $ttkprogress_demo
- $ttkprogress_demo.destroy
+ $ttkprogress_demo.destroy
$ttkprogress_demo = nil
end
@@ -17,7 +17,7 @@ $ttkprogress_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($ttkprogress_demo).pack(:fill=>:both, :expand=>true)
-Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i', :justify=>:left,
+Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i', :justify=>:left,
:text=>Tk::UTF8_String.new(<<EOL)).pack(:side=>:top, :fill=>:x)
Below are two progress bars. \
The top one is a \\u201Cdeterminate\\u201D progress bar, \
@@ -32,16 +32,16 @@ EOL
Ttk::Frame.new(base_frame) {|frame|
sep = Ttk::Separator.new(frame)
Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
- TkGrid('x',
- Ttk::Button.new(frame, :text=>'See Code',
- :image=>$image['view'], :compound=>:left,
- :command=>proc{showCode 'ttkprogress'}),
- Ttk::Button.new(frame, :text=>'Dismiss',
- :image=>$image['delete'], :compound=>:left,
+ TkGrid('x',
+ Ttk::Button.new(frame, :text=>'See Code',
+ :image=>$image['view'], :compound=>:left,
+ :command=>proc{showCode 'ttkprogress'}),
+ Ttk::Button.new(frame, :text=>'Dismiss',
+ :image=>$image['delete'], :compound=>:left,
:command=>proc{
$ttkprogress_demo.destroy
$ttkprogress_demo = nil
- }),
+ }),
:padx=>4, :pady=>4)
grid_columnconfigure(0, :weight=>1)
pack(:side=>:bottom, :fill=>:x)
@@ -52,9 +52,9 @@ frame = Ttk::Frame.new(base_frame).pack(:fill=>:both, :expand=>true)
p1 = Ttk::Progressbar.new(frame, :mode=>:determinate)
p2 = Ttk::Progressbar.new(frame, :mode=>:indeterminate)
-start = Ttk::Button.new(frame, :text=>'Start Progress',
+start = Ttk::Button.new(frame, :text=>'Start Progress',
:command=>proc{ p1.start; p2.start })
-stop = Ttk::Button.new(frame, :text=>'Stop Progress',
+stop = Ttk::Button.new(frame, :text=>'Stop Progress',
:command=>proc{ p1.stop; p2.stop })
Tk.grid(p1, '-', :pady=>5, :padx=>10)
diff --git a/ext/tk/sample/demos-en/twind.rb b/ext/tk/sample/demos-en/twind.rb
index 60a345d0b4..65ee712ff7 100644
--- a/ext/tk/sample/demos-en/twind.rb
+++ b/ext/tk/sample/demos-en/twind.rb
@@ -8,7 +8,7 @@
# toplevel widget
if defined?($twind_demo) && $twind_demo
- $twind_demo.destroy
+ $twind_demo.destroy
$twind_demo = nil
end
@@ -41,10 +41,10 @@ $twind_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
# frame
$twind_text = nil
-TkFrame.new(base_frame, 'highlightthickness'=>2, 'borderwidth'=>2,
+TkFrame.new(base_frame, 'highlightthickness'=>2, 'borderwidth'=>2,
'relief'=>'sunken') {|f|
- $twind_text = TkText.new(f, 'setgrid'=>'true', 'font'=>$font,
- 'width'=>'70', 'height'=>35, 'wrap'=>'word',
+ $twind_text = TkText.new(f, 'setgrid'=>'true', 'font'=>$font,
+ 'width'=>'70', 'height'=>35, 'wrap'=>'word',
'highlightthickness'=>0, 'borderwidth'=>0 ){|t|
TkScrollbar.new(f) {|s|
command proc{|*args| t.yview(*args)}
@@ -53,12 +53,12 @@ TkFrame.new(base_frame, 'highlightthickness'=>2, 'borderwidth'=>2,
}.pack('expand'=>'yes', 'fill'=>'both')
}.pack('expand'=>'yes', 'fill'=>'both')
-#
-$tag_center = TkTextTag.new($twind_text,
+#
+$tag_center = TkTextTag.new($twind_text,
'justify' =>'center',
'spacing1'=>'5m',
'spacing3'=>'5m' )
-$tag_buttons = TkTextTag.new($twind_text,
+$tag_buttons = TkTextTag.new($twind_text,
'lmargin1'=>'1c',
'lmargin2'=>'1c',
'rmargin' =>'1c',
@@ -71,7 +71,7 @@ $twind_text.insert('end', "it. These are called \"embedded windows\", ")
$twind_text.insert('end', "and they can consist of arbitrary widgets. ")
$twind_text.insert('end', "For example, here are two embedded button ")
$twind_text.insert('end', "widgets. You can click on the first button to ")
-TkTextWindow.new($twind_text, 'end',
+TkTextWindow.new($twind_text, 'end',
'window'=>TkButton.new($twind_text) {
#text 'ON'
text 'Turn On'
@@ -81,7 +81,7 @@ TkTextWindow.new($twind_text, 'end',
$twind_text.insert('end', " horizontal scrolling, which also turns off ")
$twind_text.insert('end', "word wrapping. Or, you can click on the second ")
$twind_text.insert('end', "button to\n")
-TkTextWindow.new($twind_text, 'end',
+TkTextWindow.new($twind_text, 'end',
'window'=>TkButton.new($twind_text) {
#text 'OFF'
text 'Turn Off'
@@ -91,7 +91,7 @@ TkTextWindow.new($twind_text, 'end',
$twind_text.insert('end', " horizontal scrolling and turn back on word wrapping.\n\n")
$twind_text.insert('end', "Or, here is another example. If you ")
-TkTextWindow.new($twind_text, 'end',
+TkTextWindow.new($twind_text, 'end',
'window'=>TkButton.new($twind_text) {
text 'Click Here'
command proc{textWindPlot $twind_text}
@@ -102,7 +102,7 @@ $mark_plot = TkTextMark.new($twind_text, 'insert')
$mark_plot.gravity='left'
$twind_text.insert('end', " You can drag the data points around with the mouse, ")
$twind_text.insert('end', "or you can click here to ")
-TkTextWindow.new($twind_text, 'end',
+TkTextWindow.new($twind_text, 'end',
'window'=>TkButton.new($twind_text) {
text 'Delete'
command proc{textWindDel $twind_text}
@@ -124,7 +124,7 @@ $twind_text.insert('end', "changes the layout. Click on the button again ")
$twind_text.insert('end', "to restore the short string.\n")
-TkTextWindow.new($twind_text, 'end',
+TkTextWindow.new($twind_text, 'end',
'window'=>TkButton.new($twind_text) {|b|
text 'Default'
command proc{embDefBg $twind_text}
@@ -133,7 +133,7 @@ TkTextWindow.new($twind_text, 'end',
},
'padx'=>3 )
embToggle = TkVariable.new('Short')
-TkTextWindow.new($twind_text, 'end',
+TkTextWindow.new($twind_text, 'end',
'window'=>TkCheckButton.new($twind_text) {
textvariable embToggle
indicatoron 0
@@ -144,25 +144,25 @@ TkTextWindow.new($twind_text, 'end',
pady 5
padx 2
},
- 'padx'=>3,
+ 'padx'=>3,
'pady'=>2 )
-[ 'AntiqueWhite3', 'Bisque1', 'Bisque2', 'Bisque3', 'Bisque4',
- 'SlateBlue3', 'RoyalBlue1', 'SteelBlue2', 'DeepSkyBlue3', 'LightBlue1',
- 'DarkSlateGray1', 'Aquamarine2', 'DarkSeaGreen2', 'SeaGreen1',
- 'Yellow1', 'IndianRed1', 'IndianRed2', 'Tan1', 'Tan4'
+[ 'AntiqueWhite3', 'Bisque1', 'Bisque2', 'Bisque3', 'Bisque4',
+ 'SlateBlue3', 'RoyalBlue1', 'SteelBlue2', 'DeepSkyBlue3', 'LightBlue1',
+ 'DarkSlateGray1', 'Aquamarine2', 'DarkSeaGreen2', 'SeaGreen1',
+ 'Yellow1', 'IndianRed1', 'IndianRed2', 'Tan1', 'Tan4'
].each{|twind_color|
- TkTextWindow.new($twind_text, 'end',
+ TkTextWindow.new($twind_text, 'end',
'window'=>TkButton.new($twind_text) {
text twind_color
cursor 'top_left_arrow'
command proc{$twind_text.bg twind_color}
},
- 'padx'=>3,
+ 'padx'=>3,
'pady'=>2 )
}
-#
+#
def textWindOn (w,f)
if defined? $twind_scroll
begin
@@ -216,39 +216,39 @@ def textWindPlot (t)
TkcLine.new($twind_plot, 100, 250, 400, 250, 'width'=>2)
TkcLine.new($twind_plot, 100, 250, 100, 50, 'width'=>2)
- TkcText.new($twind_plot, 225, 20,
+ TkcText.new($twind_plot, 225, 20,
'text'=>"A Simple Plot", 'font'=>font, 'fill'=>'brown')
(0..10).each {|i|
x = 100 + (i * 30)
TkcLine.new($twind_plot, x, 250, x, 245, 'width'=>2)
- TkcText.new($twind_plot, x, 254,
+ TkcText.new($twind_plot, x, 254,
'text'=>10*i, 'font'=>font, 'anchor'=>'n')
}
(0..5).each {|i|
y = 250 - (i * 40)
TkcLine.new($twind_plot, 100, y, 105, y, 'width'=>2)
- TkcText.new($twind_plot, 96, y,
+ TkcText.new($twind_plot, 96, y,
'text'=>"#{i*50}.0", 'font'=>font, 'anchor'=>'e')
}
for xx, yy in [[12,56],[20,94],[33,98],[32,120],[61,180],[75,160],[98,223]]
x = 100 + (3*xx)
y = 250 - (4*yy)/5
- item = TkcOval.new($twind_plot, x-6, y-6, x+6, y+6,
+ item = TkcOval.new($twind_plot, x-6, y-6, x+6, y+6,
'width'=>1, 'outline'=>'black', 'fill'=>'SkyBlue2')
item.addtag 'point'
end
- $twind_plot.itembind('point', 'Any-Enter',
+ $twind_plot.itembind('point', 'Any-Enter',
proc{$twind_plot.itemconfigure 'current', 'fill', 'red'})
- $twind_plot.itembind('point', 'Any-Leave',
+ $twind_plot.itembind('point', 'Any-Leave',
proc{$twind_plot.itemconfigure 'current', 'fill', 'SkyBlue2'})
- $twind_plot.itembind('point', '1',
+ $twind_plot.itembind('point', '1',
proc{|x,y| embPlotDown $twind_plot,x,y}, "%x %y")
- $twind_plot.itembind('point', 'ButtonRelease-1',
+ $twind_plot.itembind('point', 'ButtonRelease-1',
proc{$twind_plot.dtag 'selected'})
- $twind_plot.bind('B1-Motion',
+ $twind_plot.bind('B1-Motion',
proc{|x,y| embPlotMove $twind_plot,x,y}, "%x %y")
while ($twind_text.get($mark_plot) =~ /[ \t\n]/)
$twind_text.delete $mark_plot
diff --git a/ext/tk/sample/demos-en/twind2.rb b/ext/tk/sample/demos-en/twind2.rb
index af7313dd82..43990c1151 100644
--- a/ext/tk/sample/demos-en/twind2.rb
+++ b/ext/tk/sample/demos-en/twind2.rb
@@ -4,7 +4,7 @@
# delete toplevel widget
if defined?($twind2_demo) && $twind2_demo
- $twind2_demo.destroy
+ $twind2_demo.destroy
$twind2_demo = nil
end
@@ -19,20 +19,20 @@ base_frame = TkFrame.new($twind2_demo).pack(:fill=>:both, :expand=>true)
# frame
$twind2_buttons = TkFrame.new(base_frame) {|frame|
- TkGrid(TkFrame.new(frame, :height=>2, :relief=>:sunken, :bd=>2),
+ TkGrid(TkFrame.new(frame, :height=>2, :relief=>:sunken, :bd=>2),
:columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
- TkGrid('x',
- TkButton.new(frame, :text=>'See Code',
- :image=>$image['view'], :compound=>:left,
- :command=>proc{showCode 'twind2'}),
- TkButton.new(frame, :text=>'Dismiss',
- :image=>$image['delete'], :compound=>:left,
+ TkGrid('x',
+ TkButton.new(frame, :text=>'See Code',
+ :image=>$image['view'], :compound=>:left,
+ :command=>proc{showCode 'twind2'}),
+ TkButton.new(frame, :text=>'Dismiss',
+ :image=>$image['delete'], :compound=>:left,
:command=>proc{
tmppath = $twind2_demo
$twind2_demo = nil
$showVarsWin[tmppath.path] = nil
tmppath.destroy
- }),
+ }),
:padx=>4, :pady=>4)
frame.grid_columnconfigure(0, :weight=>1)
}
@@ -40,11 +40,11 @@ $twind2_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
# frame
$twind2_text = nil
-TkFrame.new(base_frame, 'highlightthickness'=>2, 'borderwidth'=>2,
+TkFrame.new(base_frame, 'highlightthickness'=>2, 'borderwidth'=>2,
'relief'=>'sunken') {|f|
$twind2_text = TkText.new(f, 'setgrid'=>true, 'font'=>$font,
- # 'width'=>'70', 'height'=>35, 'wrap'=>'word',
- 'width'=>'70', 'height'=>35, 'wrap'=>'char',
+ # 'width'=>'70', 'height'=>35, 'wrap'=>'word',
+ 'width'=>'70', 'height'=>35, 'wrap'=>'char',
'highlightthickness'=>0, 'borderwidth'=>0 ){|t|
TkScrollbar.new(f) {|s|
command proc{|*args| t.yview(*args)}
@@ -54,11 +54,11 @@ TkFrame.new(base_frame, 'highlightthickness'=>2, 'borderwidth'=>2,
}.pack('expand'=>'yes', 'fill'=>'both')
# text tags
-$tag2_center = TkTextTag.new($twind2_text,
+$tag2_center = TkTextTag.new($twind2_text,
'justify' =>'center',
'spacing1'=>'5m',
'spacing3'=>'5m' )
-$tag2_buttons = TkTextTag.new($twind2_text,
+$tag2_buttons = TkTextTag.new($twind2_text,
'lmargin1'=>'1c',
'lmargin2'=>'1c',
'rmargin' =>'1c',
@@ -67,7 +67,7 @@ $tag2_buttons = TkTextTag.new($twind2_text,
'spacing3'=>0 )
# insert text
-$twind2_text.insert('end',
+$twind2_text.insert('end',
'A text widget can contain many different kinds of items, ')
$twind2_text.insert('end',
"both active and passive. It can lay these out in various ")
@@ -82,7 +82,7 @@ $twind2_text.insert('end', "it. These are called \"embedded windows\", ")
$twind2_text.insert('end', "and they can consist of arbitrary widgets. ")
$twind2_text.insert('end', "For example, here are two embedded button ")
$twind2_text.insert('end', "widgets. You can click on the first button to ")
-TkTextWindow.new($twind2_text, 'end',
+TkTextWindow.new($twind2_text, 'end',
'window'=>TkButton.new($twind2_text) {
text 'ON'
command proc{textWindOn2 $twind2_text,$twind2_buttons}
@@ -91,30 +91,30 @@ TkTextWindow.new($twind2_text, 'end',
$twind2_text.insert('end', " horizontal scrolling, which also turns off ")
$twind2_text.insert('end', "word wrapping. Or, you can click on the second ")
$twind2_text.insert('end', "button to\n")
-TkTextWindow.new($twind2_text, 'end',
+TkTextWindow.new($twind2_text, 'end',
'window'=>TkButton.new($twind2_text) {
text 'OFF'
command proc{textWindOff2 $twind2_text}
cursor 'top_left_arrow'
})
-$twind2_text.insert('end',
+$twind2_text.insert('end',
" horizontal scrolling and turn back on word wrapping.\n\n")
$twind2_text.insert('end', "Or, here is another example. If you ")
-TkTextWindow.new($twind2_text, 'end',
+TkTextWindow.new($twind2_text, 'end',
'window'=>TkButton.new($twind2_text) {
text 'Click Here'
command proc{textWindPlot2 $twind2_text}
cursor 'top_left_arrow'
})
-$twind2_text.insert('end',
+$twind2_text.insert('end',
" a canvas displaying an x-y plot will appear right here.")
$mark2_plot = TkTextMark.new($twind2_text, 'insert')
$mark2_plot.gravity='left'
-$twind2_text.insert('end',
+$twind2_text.insert('end',
" You can drag the data points around with the mouse, ")
$twind2_text.insert('end', "or you can click here to ")
-TkTextWindow.new($twind2_text, 'end',
+TkTextWindow.new($twind2_text, 'end',
'window'=>TkButton.new($twind2_text) {
text 'Delete'
command proc{textWindDel2 $twind2_text}
@@ -122,19 +122,19 @@ TkTextWindow.new($twind2_text, 'end',
})
$twind2_text.insert('end', " the plot again.\n\n")
-$twind2_text.insert('end',
+$twind2_text.insert('end',
"You may also find it useful to put embedded windows in ")
-$twind2_text.insert('end',
+$twind2_text.insert('end',
"a text without any actual text. In this case the ")
$twind2_text.insert('end', "text widget acts like a geometry manager. For ")
-$twind2_text.insert('end',
+$twind2_text.insert('end',
"example, here is a collection of buttons laid out ")
-$twind2_text.insert('end',
+$twind2_text.insert('end',
"neatly into rows by the text widget. These buttons ")
-$twind2_text.insert('end',
+$twind2_text.insert('end',
"can be used to change the background color of the ")
$twind2_text.insert('end', "text widget (\"Default\" restores the color to ")
-$twind2_text.insert('end',
+$twind2_text.insert('end',
"its default). If you click on the button labeled ")
$twind2_text.insert('end', "\"Short\", it changes to a longer string so that ")
$twind2_text.insert('end', "you can see how the text widget automatically ")
@@ -148,7 +148,7 @@ btn_default = TkButton.new($twind2_text) {|b|
}
TkTextWindow.new($twind2_text, 'end', 'window'=>btn_default, 'padx'=>3)
embToggle = TkVariable.new('Short')
-TkTextWindow.new($twind2_text, 'end',
+TkTextWindow.new($twind2_text, 'end',
'window'=>TkCheckButton.new($twind2_text) {
textvariable embToggle
indicatoron 0
@@ -159,21 +159,21 @@ TkTextWindow.new($twind2_text, 'end',
pady 5
padx 2
},
- 'padx'=>3,
+ 'padx'=>3,
'pady'=>2 )
-[ 'AntiqueWhite3', 'Bisque1', 'Bisque2', 'Bisque3', 'Bisque4',
- 'SlateBlue3', 'RoyalBlue1', 'SteelBlue2', 'DeepSkyBlue3', 'LightBlue1',
- 'DarkSlateGray1', 'Aquamarine2', 'DarkSeaGreen2', 'SeaGreen1',
- 'Yellow1', 'IndianRed1', 'IndianRed2', 'Tan1', 'Tan4'
+[ 'AntiqueWhite3', 'Bisque1', 'Bisque2', 'Bisque3', 'Bisque4',
+ 'SlateBlue3', 'RoyalBlue1', 'SteelBlue2', 'DeepSkyBlue3', 'LightBlue1',
+ 'DarkSlateGray1', 'Aquamarine2', 'DarkSeaGreen2', 'SeaGreen1',
+ 'Yellow1', 'IndianRed1', 'IndianRed2', 'Tan1', 'Tan4'
].each{|twind_color|
- TkTextWindow.new($twind2_text, 'end',
+ TkTextWindow.new($twind2_text, 'end',
'window'=>TkButton.new($twind2_text) {
text twind_color
cursor 'top_left_arrow'
command proc{$twind2_text.bg twind_color}
},
- 'padx'=>3,
+ 'padx'=>3,
'pady'=>2 )
}
@@ -187,54 +187,54 @@ $text_normal2['pad'] = $twind2_text.cget('padx')
$twind2_text.insert('end', "\nYou can also change the usual border width and ")
$twind2_text.insert('end', "highlightthickness and padding.\n")
-TkTextWindow.new($twind2_text, 'end',
- 'window'=>TkButton.new($twind2_text, :text=>"Big borders",
- :cursor=>'top_left_arrow',
+TkTextWindow.new($twind2_text, 'end',
+ 'window'=>TkButton.new($twind2_text, :text=>"Big borders",
+ :cursor=>'top_left_arrow',
'command'=>proc{
textWinBigB2 $twind2_text
}))
-TkTextWindow.new($twind2_text, 'end',
- 'window'=>TkButton.new($twind2_text, :text=>"Small borders",
- :cursor=>'top_left_arrow',
+TkTextWindow.new($twind2_text, 'end',
+ 'window'=>TkButton.new($twind2_text, :text=>"Small borders",
+ :cursor=>'top_left_arrow',
'command'=>proc{
textWinSmallB2 $twind2_text
}))
-TkTextWindow.new($twind2_text, 'end',
- 'window'=>TkButton.new($twind2_text, :text=>"Big highlight",
- :cursor=>'top_left_arrow',
+TkTextWindow.new($twind2_text, 'end',
+ 'window'=>TkButton.new($twind2_text, :text=>"Big highlight",
+ :cursor=>'top_left_arrow',
'command'=>proc{
textWinBigH2 $twind2_text
}))
-TkTextWindow.new($twind2_text, 'end',
+TkTextWindow.new($twind2_text, 'end',
'window'=>TkButton.new($twind2_text, :text=>"Small highlight",
- :cursor=>'top_left_arrow',
+ :cursor=>'top_left_arrow',
'command'=>proc{
textWinSmallH2 $twind2_text
}))
-TkTextWindow.new($twind2_text, 'end',
- 'window'=>TkButton.new($twind2_text, :text=>"Big pad",
- :cursor=>'top_left_arrow',
+TkTextWindow.new($twind2_text, 'end',
+ 'window'=>TkButton.new($twind2_text, :text=>"Big pad",
+ :cursor=>'top_left_arrow',
'command'=>proc{
textWinBigP2 $twind2_text
}))
-TkTextWindow.new($twind2_text, 'end',
- 'window'=>TkButton.new($twind2_text, :text=>"Small pad",
- :cursor=>'top_left_arrow',
+TkTextWindow.new($twind2_text, 'end',
+ 'window'=>TkButton.new($twind2_text, :text=>"Small pad",
+ :cursor=>'top_left_arrow',
'command'=>proc{
textWinSmallP2 $twind2_text
}))
-$twind2_text.insert('end',
+$twind2_text.insert('end',
"\n\nFinally, images fit comfortably in text widgets too:")
-TkTextImage.new($twind2_text, 'end',
+TkTextImage.new($twind2_text, 'end',
'image'=>TkBitmapImage.new(:file=>[
- $demo_dir, '..',
+ $demo_dir, '..',
'images', 'face.xbm'
].join(File::Separator)))
@@ -309,39 +309,39 @@ def textWindPlot2 (t)
TkcLine.new($twind2_plot, 100, 250, 400, 250, 'width'=>2)
TkcLine.new($twind2_plot, 100, 250, 100, 50, 'width'=>2)
- TkcText.new($twind2_plot, 225, 20,
+ TkcText.new($twind2_plot, 225, 20,
'text'=>"A Simple Plot", 'font'=>font, 'fill'=>'brown')
(0..10).each {|i|
x = 100 + (i * 30)
TkcLine.new($twind2_plot, x, 250, x, 245, 'width'=>2)
- TkcText.new($twind2_plot, x, 254,
+ TkcText.new($twind2_plot, x, 254,
'text'=>10*i, 'font'=>font, 'anchor'=>'n')
}
(0..5).each {|i|
y = 250 - (i * 40)
TkcLine.new($twind2_plot, 100, y, 105, y, 'width'=>2)
- TkcText.new($twind2_plot, 96, y,
+ TkcText.new($twind2_plot, 96, y,
'text'=>"#{i*50}.0", 'font'=>font, 'anchor'=>'e')
}
for xx, yy in [[12,56],[20,94],[33,98],[32,120],[61,180],[75,160],[98,223]]
x = 100 + (3*xx)
y = 250 - (4*yy)/5
- item = TkcOval.new($twind2_plot, x-6, y-6, x+6, y+6,
+ item = TkcOval.new($twind2_plot, x-6, y-6, x+6, y+6,
'width'=>1, 'outline'=>'black', 'fill'=>'SkyBlue2')
item.addtag 'point'
end
- $twind2_plot.itembind('point', 'Any-Enter',
+ $twind2_plot.itembind('point', 'Any-Enter',
proc{$twind2_plot.itemconfigure 'current', 'fill', 'red'})
- $twind2_plot.itembind('point', 'Any-Leave',
+ $twind2_plot.itembind('point', 'Any-Leave',
proc{$twind2_plot.itemconfigure 'current', 'fill', 'SkyBlue2'})
- $twind2_plot.itembind('point', '1',
+ $twind2_plot.itembind('point', '1',
proc{|x,y| embPlotDown2 $twind2_plot,x,y}, "%x %y")
- $twind2_plot.itembind('point', 'ButtonRelease-1',
+ $twind2_plot.itembind('point', 'ButtonRelease-1',
proc{$twind2_plot.dtag 'selected'})
- $twind2_plot.bind('B1-Motion',
+ $twind2_plot.bind('B1-Motion',
proc{|x,y| embPlotMove2 $twind2_plot,x,y}, "%x %y")
while ($twind2_text.get($mark2_plot) =~ /[ \t\n]/)
$twind2_text.delete $mark2_plot
diff --git a/ext/tk/sample/demos-en/unicodeout.rb b/ext/tk/sample/demos-en/unicodeout.rb
index ee7b5afa15..9c230a2536 100644
--- a/ext/tk/sample/demos-en/unicodeout.rb
+++ b/ext/tk/sample/demos-en/unicodeout.rb
@@ -6,7 +6,7 @@
# based on Tcl/Tk8.4.4 widget demos
if defined?($unicodeout_demo) && $unicodeout_demo
- $unicodeout_demo.destroy
+ $unicodeout_demo.destroy
$unicodeout_demo = nil
end
@@ -18,8 +18,8 @@ $unicodeout_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($unicodeout_demo).pack(:fill=>:both, :expand=>true)
-TkLabel.new(base_frame,
- :font=>$font, :wraplength=>'5.4i', :justify=>:left,
+TkLabel.new(base_frame,
+ :font=>$font, :wraplength=>'5.4i', :justify=>:left,
:text=><<EOL).pack(:side=>:top)
This is a sample of Tk's support for languages that use non-Western \
character sets. However, what you will actually see below depends \
@@ -32,10 +32,10 @@ the definition of @@font on the Unicodeout_SampleFrame class.
The strings are written in Tcl using UNICODE characters \
using the \\uXXXX escape so as to do so in a portable fashion.
-ATTENTION:
+ATTENTION:
The strings are converted to the encoded string objects \
(completed to rewrite Tcl's escapes) by Tk::UTF8_String method. \
-And the Tk::UTF8_String objects are passed to the label widgets.
+And the Tk::UTF8_String objects are passed to the label widgets.
EOL
TkFrame.new(base_frame){|f|
@@ -51,8 +51,8 @@ TkFrame.new(base_frame){|f|
}).pack(:side=>:left, :expand=>true)
}
-wait_msg = TkLabel.new(base_frame,
- :text=>"Please wait while loading fonts...",
+wait_msg = TkLabel.new(base_frame,
+ :text=>"Please wait while loading fonts...",
:font=>"Helvetica 12 italic").pack
class Unicodeout_SampleFrame < TkFrame
@@ -72,10 +72,10 @@ class Unicodeout_SampleFrame < TkFrame
def add_sample(lang, *args)
sample_txt = Tk::UTF8_String(args.join(''))
- l = TkLabel.new(self, :font=>@@font, :text=>lang+':',
+ l = TkLabel.new(self, :font=>@@font, :text=>lang+':',
:anchor=>:nw, :pady=>0)
- #s = TkLabel.new(self, :font=>@@font, :text=>sample_txt,
- s = TkLabel.new(self, :font=>TkFont.new(@@font), :text=>sample_txt,
+ #s = TkLabel.new(self, :font=>@@font, :text=>sample_txt,
+ s = TkLabel.new(self, :font=>TkFont.new(@@font), :text=>sample_txt,
:anchor=>:nw, :width=>30, :pady=>0)
Tk.grid(l, s, :sticky=>:ew, :pady=>0)
l.grid_config(:padx, '1m')
@@ -91,23 +91,23 @@ oldCursor = $unicodeout_demo.cursor
$unicodeout_demo.cursor('watch')
Tk.update
-f.add_sample('Arabic',
- '\uFE94\uFEF4\uFE91\uFEAE\uFECC\uFEDF\uFE8D\uFE94',
+f.add_sample('Arabic',
+ '\uFE94\uFEF4\uFE91\uFEAE\uFECC\uFEDF\uFE8D\uFE94',
'\uFEE4\uFEE0\uFEDC\uFEDF\uFE8D')
f.add_sample('Trad. Chinese', '\u4E2D\u570B\u7684\u6F22\u5B57')
f.add_sample('Simpl. Chinese', '\u6C49\u8BED')
-f.add_sample('Greek',
- '\u0395\u03BB\u03BB\u03B7\u03BD\u03B9\u03BA\u03AE ',
+f.add_sample('Greek',
+ '\u0395\u03BB\u03BB\u03B7\u03BD\u03B9\u03BA\u03AE ',
'\u03B3\u03BB\u03CE\u03C3\u03C3\u03B1')
-f.add_sample('Hebrew',
- '\u05DD\u05D9\u05DC\u05E9\u05D5\u05E8\u05D9 ',
+f.add_sample('Hebrew',
+ '\u05DD\u05D9\u05DC\u05E9\u05D5\u05E8\u05D9 ',
'\u05DC\u05D9\u05D0\u05E8\u05E9\u05D9')
-f.add_sample('Japanese',
- '\u65E5\u672C\u8A9E\u306E\u3072\u3089\u304C\u306A, ',
+f.add_sample('Japanese',
+ '\u65E5\u672C\u8A9E\u306E\u3072\u3089\u304C\u306A, ',
'\u6F22\u5B57\u3068\u30AB\u30BF\u30AB\u30CA')
f.add_sample('Korean', '\uB300\uD55C\uBBFC\uAD6D\uC758 \uD55C\uAE00')
-f.add_sample('Russian',
- '\u0420\u0443\u0441\u0441\u043A\u0438\u0439 ',
+f.add_sample('Russian',
+ '\u0420\u0443\u0441\u0441\u043A\u0438\u0439 ',
'\u044F\u0437\u044B\u043A')
wait_msg.destroy
diff --git a/ext/tk/sample/demos-en/widget b/ext/tk/sample/demos-en/widget
index 250c589116..9a0605d8b9 100644
--- a/ext/tk/sample/demos-en/widget
+++ b/ext/tk/sample/demos-en/widget
@@ -170,12 +170,9 @@ else
}
scr.command(proc{|*args| txt.yview(*args)})
# txt.pack('in'=>textFrame, 'expand'=>'yes', 'fill'=>'both', 'padx'=>1)
-# txt.pack('in'=>textFrame, 'expand'=>'yes', 'fill'=>'both')
+ txt.pack('in'=>textFrame, 'expand'=>'yes', 'fill'=>'both')
# textFrame.pack('expand'=>'yes', 'fill'=>'both', 'padx'=>1, 'pady'=>2)
textFrame.pack('expand'=>'yes', 'fill'=>'both')
- # $root.withdraw.deiconify
- Tk.update_idletasks
- txt.pack('in'=>textFrame, 'expand'=>'yes', 'fill'=>'both')
statusBar = TkFrame.new($root) {|f|
if $tk_version =~ /^4.*/
@@ -1038,7 +1035,7 @@ end
#
def aboutBox
Tk.messageBox('icon'=>'info', 'type'=>'ok', 'title'=>'About Widget Demo',
- 'message'=>"Ruby/Tk widget demonstration Ver.1.7.1-en\n\n" +
+ 'message'=>"Ruby/Tk widget demonstration Ver.1.7.0-en\n\n" +
"based on demos of Tk8.1 -- 8.5 " +
"( Copyright of Tcl/Tk demos:: " +
"(c) 1996-1997 Sun Microsystems, Inc. / " +
diff --git a/ext/tk/sample/demos-jp/anilabel.rb b/ext/tk/sample/demos-jp/anilabel.rb
index d2f5b12041..aee57f9f6a 100644
--- a/ext/tk/sample/demos-jp/anilabel.rb
+++ b/ext/tk/sample/demos-jp/anilabel.rb
@@ -6,7 +6,7 @@
# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($anilabel_demo) && $anilabel_demo
- $anilabel_demo.destroy
+ $anilabel_demo.destroy
$anilabel_demo = nil
end
@@ -50,7 +50,7 @@ TkFrame.new(base_frame) {|frame|
# label demo Íѥե졼¥àÀ¸À®
f_left = TkLabelFrame.new(base_frame, :text=>'Scrolling Texts')
f_right = TkLabelFrame.new(base_frame, :text=>'GIF Image')
-Tk.pack(f_left, f_right, 'side'=>'left', 'expand'=>'yes', 'fill'=>'both',
+Tk.pack(f_left, f_right, 'side'=>'left', 'expand'=>'yes', 'fill'=>'both',
'padx'=>10, 'pady'=>10)
# animated label
@@ -88,7 +88,7 @@ class AnimatedImageLabel < AnimatedTextLabel
@btag.bind_append('Destroy'){
if @destroy_image
begin
- self.image.delete
+ self.image.delete
rescue
end
end
@@ -124,13 +124,13 @@ class AnimatedImageLabel < AnimatedTextLabel
end
# label À¸À®
-l1 = AnimatedTextLabel.new(f_left, :borderwidth=>4, :relief=>:ridge,
+l1 = AnimatedTextLabel.new(f_left, :borderwidth=>4, :relief=>:ridge,
:font=>{:family=>'Courier', :size=>10})
-l2 = AnimatedTextLabel.new(f_left, :borderwidth=>4, :relief=>:groove,
+l2 = AnimatedTextLabel.new(f_left, :borderwidth=>4, :relief=>:groove,
:font=>{:family=>'Courier', :size=>10})
-l3 = AnimatedTextLabel.new(f_left, :borderwidth=>4, :relief=>:flat,
+l3 = AnimatedTextLabel.new(f_left, :borderwidth=>4, :relief=>:flat,
:font=>{:family=>'Courier', :size=>10}, :width=>18)
-Tk.pack(l1, l2, l3,
+Tk.pack(l1, l2, l3,
:side=>:top, :expand=>true, :anchor=>:w, :padx=>10, :pady=>10)
limg = AnimatedImageLabel.new(f_right, :borderwidth=>0)
diff --git a/ext/tk/sample/demos-jp/aniwave.rb b/ext/tk/sample/demos-jp/aniwave.rb
index 973c1be1e9..8fa14f65fe 100644
--- a/ext/tk/sample/demos-jp/aniwave.rb
+++ b/ext/tk/sample/demos-jp/aniwave.rb
@@ -6,7 +6,7 @@
# destroy toplevel widget for this demo script
if defined?($aniwave_demo) && $aniwave_demo
- $aniwave_demo.destroy
+ $aniwave_demo.destroy
$aniwave_demo = nil
end
@@ -53,11 +53,11 @@ class AnimatedWaveDemo
@direction = dir
# create canvas widget
- @c = TkCanvas.new(frame, :width=>300, :height=>200,
+ @c = TkCanvas.new(frame, :width=>300, :height=>200,
:background=>'black')
@c.pack(:padx=>10, :pady=>10, :expand=>true)
- # Creates a coordinates list of a wave.
+ # Creates a coordinates list of a wave.
@waveCoords = []
@backupCoords = []
n = 0
@@ -69,10 +69,10 @@ class AnimatedWaveDemo
# Create a smoothed line and arrange for its coordinates to be the
# contents of the variable waveCoords.
- @line = TkcLine.new(@c, @waveCoords,
+ @line = TkcLine.new(@c, @waveCoords,
:width=>1, :fill=>'green', :smooth=>true)
- # Main animation "loop".
+ # Main animation "loop".
# Theoretically 100 frames-per-second (==10ms between frames)
@timer = TkTimer.new(10){ basicMotion; reverser }
diff --git a/ext/tk/sample/demos-jp/arrow.rb b/ext/tk/sample/demos-jp/arrow.rb
index a1694d019d..3c49e67b09 100644
--- a/ext/tk/sample/demos-jp/arrow.rb
+++ b/ext/tk/sample/demos-jp/arrow.rb
@@ -25,65 +25,65 @@ def arrowSetup(c)
# Create the arrow and outline.
c.delete('all')
- TkcLine.new(c, v.x1, v.y, v.x2, v.y,
- { 'width'=>10 * v.width,
- 'arrowshape'=>[10*v.a, 10*v.b, 10*v.c],
- 'arrow'=>'last'
+ TkcLine.new(c, v.x1, v.y, v.x2, v.y,
+ { 'width'=>10 * v.width,
+ 'arrowshape'=>[10*v.a, 10*v.b, 10*v.c],
+ 'arrow'=>'last'
}.update(v.bigLineStyle) )
xtip = v.x2 - 10*v.b
deltaY = 10*v.c + 5*v.width
- TkcLine.new(c, v.x2, v.y, xtip, v.y + deltaY,
- v.x2 - 10*v.a, v.y, xtip, v.y - deltaY, v.x2, v.y,
+ TkcLine.new(c, v.x2, v.y, xtip, v.y + deltaY,
+ v.x2 - 10*v.a, v.y, xtip, v.y - deltaY, v.x2, v.y,
'width'=>2, 'capstyle'=>'round', 'joinstyle'=>'round')
# Create the boxes for reshaping the line and arrowhead.
- TkcRectangle.new(c, v.x2-10*v.a-5, v.y-5, v.x2-10*v.a+5, v.y+5,
+ TkcRectangle.new(c, v.x2-10*v.a-5, v.y-5, v.x2-10*v.a+5, v.y+5,
{'tags'=>['box1', $arrowTag_box]}.update(v.boxStyle) )
- TkcRectangle.new(c, xtip-5, v.y-deltaY-5, xtip+5, v.y-deltaY+5,
+ TkcRectangle.new(c, xtip-5, v.y-deltaY-5, xtip+5, v.y-deltaY+5,
{'tags'=>['box2', $arrowTag_box]}.update(v.boxStyle) )
- TkcRectangle.new(c, v.x1-5, v.y-5*v.width-5, v.x1+5, v.y-5*v.width+5,
+ TkcRectangle.new(c, v.x1-5, v.y-5*v.width-5, v.x1+5, v.y-5*v.width+5,
{'tags'=>['box3', $arrowTag_box]}.update(v.boxStyle) )
c.itemconfigure cur, v.activeStyle if cur
# Create three arrows in actual size with the same parameters
TkcLine.new(c, v.x2+50, 0, v.x2+50, 1000, 'width'=>2)
tmp = v.x2+100
- TkcLine.new(c, tmp, v.y-125, tmp, v.y-75, 'width'=>v.width,
+ TkcLine.new(c, tmp, v.y-125, tmp, v.y-75, 'width'=>v.width,
'arrow'=>'both', 'arrowshape'=>[v.a, v.b, v.c])
- TkcLine.new(c, tmp-25, v.y, tmp+25, v.y, 'width'=>v.width,
+ TkcLine.new(c, tmp-25, v.y, tmp+25, v.y, 'width'=>v.width,
'arrow'=>'both', 'arrowshape'=>[v.a, v.b, v.c])
- TkcLine.new(c, tmp-25, v.y+75, tmp+25, v.y+125, 'width'=>v.width,
+ TkcLine.new(c, tmp-25, v.y+75, tmp+25, v.y+125, 'width'=>v.width,
'arrow'=>'both', 'arrowshape'=>[v.a, v.b, v.c])
- # Create a bunch of other arrows and text items showing the
+ # Create a bunch of other arrows and text items showing the
# current dimensions.
tmp = v.x2+10
- TkcLine.new(c, tmp, v.y-5*v.width, tmp, v.y-deltaY,
+ TkcLine.new(c, tmp, v.y-5*v.width, tmp, v.y-deltaY,
'arrow'=>'both', 'arrowshape'=>v.smallTips)
TkcText.new(c, v.x2+15, v.y-deltaY+5*v.c, 'text'=>v.c, 'anchor'=>'w')
tmp = v.x1-10
- TkcLine.new(c, tmp, v.y-5*v.width, tmp, v.y+5*v.width,
+ TkcLine.new(c, tmp, v.y-5*v.width, tmp, v.y+5*v.width,
'arrow'=>'both', 'arrowshape'=>v.smallTips)
TkcText.new(c, v.x1-15, v.y, 'text'=>v.width, 'anchor'=>'e')
tmp = v.y+5*v.width+10*v.c+10
- TkcLine.new(c, v.x2-10*v.a, tmp, v.x2, tmp,
+ TkcLine.new(c, v.x2-10*v.a, tmp, v.x2, tmp,
'arrow'=>'both', 'arrowshape'=>v.smallTips)
TkcText.new(c, v.x2-5*v.a, tmp+5, 'text'=>v.a, 'anchor'=>'n')
tmp = tmp+25
- TkcLine.new(c, v.x2-10*v.b, tmp, v.x2, tmp,
+ TkcLine.new(c, v.x2-10*v.b, tmp, v.x2, tmp,
'arrow'=>'both', 'arrowshape'=>v.smallTips)
TkcText.new(c, v.x2-5*v.b, tmp+5, 'text'=>v.b, 'anchor'=>'n')
if $tk_version =~ /^4.*/
- TkcText.new(c, v.x1, 310, 'text'=>"'width'=>#{v.width}", 'anchor'=>'w',
+ TkcText.new(c, v.x1, 310, 'text'=>"'width'=>#{v.width}", 'anchor'=>'w',
'font'=>'-*-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*')
- TkcText.new(c, v.x1, 330,
+ TkcText.new(c, v.x1, 330,
'text'=>"'arrowshape'=>[#{v.a}, #{v.b}, #{v.c}]",'anchor'=>'w',
'font'=>'-*-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*')
else
- TkcText.new(c, v.x1, 310, 'text'=>"'width'=>#{v.width}", 'anchor'=>'w',
+ TkcText.new(c, v.x1, 310, 'text'=>"'width'=>#{v.width}", 'anchor'=>'w',
'font'=>'Helvetica 18')
- TkcText.new(c, v.x1, 330,
+ TkcText.new(c, v.x1, 330,
'text'=>"'arrowshape'=>[#{v.a}, #{v.b}, #{v.c}]",
'anchor'=>'w', 'font'=>'Helvetica 18')
end
@@ -93,7 +93,7 @@ end
# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($arrow_demo) && $arrow_demo
- $arrow_demo.destroy
+ $arrow_demo.destroy
$arrow_demo = nil
end
@@ -107,7 +107,7 @@ $arrow_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($arrow_demo).pack(:fill=>:both, :expand=>true)
# label À¸À®
-TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'5i', 'justify'=>'left',
+TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'5i', 'justify'=>'left',
'text'=>"¤³¤Î widget ¤Ç¡¢¥­¥ã¥ó¥Ð¥¹¤Ç»È¤ï¤ì¤ë¥é¥¤¥ó¤Ë¤Ä¤¤¤ÆÍÍ¡¹¤ÊÉý¤äÌð°õ¤ÎƬ¤Î·Á¤ò»î¤·¤Æ¤ß¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£Àþ¤ÎÉý¤äÌð°õ¤Î·Á¤òÊѤ¨¤ë¤Ë¤Ï¡¢³ÈÂ礵¤ì¤¿Ìð°õ¤Ë¤Ä¤¤¤Æ¤¤¤ë 3¤Ä¤Î»Í³Ñ¤ò¥É¥é¥Ã¥°¤·¤Æ¤¯¤À¤µ¤¤¡£±¦Â¦¤ÎÌð°õ¤ÏÉáÄ̤ÎÂ礭¤µ¤Ç¤Î¥µ¥ó¥×¥ë¤ò¼¨¤·¤Æ¤¤¤Þ¤¹¡£²¼¤Î¥Æ¥­¥¹¥È¤Ï¥é¥¤¥ó¥¢¥¤¥Æ¥à¤ËÂФ¹¤ëÀßÄꥪ¥×¥·¥ç¥ó¤Ç¤¹¡£"){
pack('side'=>'top')
}
@@ -132,14 +132,14 @@ $arrow_buttons = TkFrame.new(base_frame) {|frame|
$arrow_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
# canvas ÀßÄê
-$arrow_canvas = TkCanvas.new(base_frame, 'width'=>500, 'height'=>350,
+$arrow_canvas = TkCanvas.new(base_frame, 'width'=>500, 'height'=>350,
'relief'=>'sunken', 'borderwidth'=>2)
$arrow_canvas.pack('expand'=>'yes', 'fill'=>'both')
# ÃÍÀßÄê
unless Struct.const_defined?("ArrowInfo")
- $demo_arrowInfo = Struct.new("ArrowInfo", :a, :b, :c, :width, :motionProc,
- :x1, :x2, :y, :smallTips, :count,
+ $demo_arrowInfo = Struct.new("ArrowInfo", :a, :b, :c, :width, :motionProc,
+ :x1, :x2, :y, :smallTips, :count,
:bigLineStyle, :boxStyle, :activeStyle).new
end
$demo_arrowInfo.a = 8
@@ -157,7 +157,7 @@ if TkWinfo.depth($arrow_canvas) > 1
$demo_arrowInfo.boxStyle = {'fill'=>'', 'outline'=>'black', 'width'=>1}
$demo_arrowInfo.activeStyle = {'fill'=>'red', 'outline'=>'black', 'width'=>1}
else
- $demo_arrowInfo.bigLineStyle = {'fill'=>'black',
+ $demo_arrowInfo.bigLineStyle = {'fill'=>'black',
'stipple'=>'@'+[$demo_dir,'..','images','grey.25'].join(File::Separator)}
$demo_arrowInfo.boxStyle = {'fill'=>'', 'outline'=>'black', 'width'=>1}
$demo_arrowInfo.activeStyle = {'fill'=>'black','outline'=>'black','width'=>1}
@@ -168,16 +168,16 @@ $arrowTag_box.bind('Enter', proc{$arrow_canvas.itemconfigure('current', $demo_ar
$arrowTag_box.bind('Leave', proc{$arrow_canvas.itemconfigure('current', $demo_arrowInfo.boxStyle)})
$arrowTag_box.bind('B1-Enter', proc{})
$arrowTag_box.bind('B1-Leave', proc{})
-$arrow_canvas.itembind('box1', '1',
+$arrow_canvas.itembind('box1', '1',
proc{$demo_arrowInfo.motionProc \
= proc{|x,y| arrowMove1 $arrow_canvas, x, y}})
-$arrow_canvas.itembind('box2', '1',
+$arrow_canvas.itembind('box2', '1',
proc{$demo_arrowInfo.motionProc \
= proc{|x,y| arrowMove2 $arrow_canvas, x, y}})
-$arrow_canvas.itembind('box3', '1',
+$arrow_canvas.itembind('box3', '1',
proc{$demo_arrowInfo.motionProc \
= proc{|x,y| arrowMove3 $arrow_canvas, x, y}})
-$arrowTag_box.bind('B1-Motion',
+$arrowTag_box.bind('B1-Motion',
proc{|x,y| $demo_arrowInfo.motionProc.call(x,y)}, "%x %y")
$arrow_canvas.bind('Any-ButtonRelease-1', proc{arrowSetup $arrow_canvas})
diff --git a/ext/tk/sample/demos-jp/bind.rb b/ext/tk/sample/demos-jp/bind.rb
index 99e5c1718c..a1bcfdd2e7 100644
--- a/ext/tk/sample/demos-jp/bind.rb
+++ b/ext/tk/sample/demos-jp/bind.rb
@@ -5,7 +5,7 @@
# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($bind_demo) && $bind_demo
- $bind_demo.destroy
+ $bind_demo.destroy
$bind_demo = nil
end
@@ -59,7 +59,7 @@ txt = TkText.new(base_frame){|t|
# ¥¹¥¿¥¤¥ëÀßÄê
if TkWinfo.depth($root).to_i > 1
- tagstyle_bold = {'background'=>'#43ce80', 'relief'=>'raised',
+ tagstyle_bold = {'background'=>'#43ce80', 'relief'=>'raised',
'borderwidth'=>1}
tagstyle_normal = {'background'=>'', 'relief'=>'flat'}
else
@@ -75,44 +75,44 @@ txt = TkText.new(base_frame){|t|
insert('end', "\n\n")
insert('end', '2. ´Êñ¤Ê 2¼¡¸µ¤Î¥×¥í¥Ã¥È¡£¥Ç¡¼¥¿¤òɽ¤¹ÅÀ¤òư¤«¤¹¤³¤È¤¬¤Ç¤­¤ë¡£', (d2 = TkTextTag.new(t)) )
insert('end', "\n\n")
- insert('end', '3. ¥Æ¥­¥¹¥È¥¢¥¤¥Æ¥à¤Î¥¢¥ó¥«¡¼¤È¹Ô·¤¨¡£',
+ insert('end', '3. ¥Æ¥­¥¹¥È¥¢¥¤¥Æ¥à¤Î¥¢¥ó¥«¡¼¤È¹Ô·¤¨¡£',
(d3 = TkTextTag.new(t)) )
insert('end', "\n\n")
- insert('end', '4. ¥é¥¤¥ó¥¢¥¤¥Æ¥à¤Î¤¿¤á¤ÎÌð°õ¤ÎƬ¤Î·Á¤Î¥¨¥Ç¥£¥¿¡£',
+ insert('end', '4. ¥é¥¤¥ó¥¢¥¤¥Æ¥à¤Î¤¿¤á¤ÎÌð°õ¤ÎƬ¤Î·Á¤Î¥¨¥Ç¥£¥¿¡£',
(d4 = TkTextTag.new(t)) )
insert('end', "\n\n")
- insert('end', '5. ¥¿¥Ö¥¹¥È¥Ã¥×¤òÊѹ¹¤¹¤ë¤¿¤á¤Îµ¡Ç½¤Ä¤­¤Î¥ë¡¼¥é¡¼¡£',
+ insert('end', '5. ¥¿¥Ö¥¹¥È¥Ã¥×¤òÊѹ¹¤¹¤ë¤¿¤á¤Îµ¡Ç½¤Ä¤­¤Î¥ë¡¼¥é¡¼¡£',
(d5 = TkTextTag.new(t)) )
insert('end', "\n\n")
- insert('end',
- '6. ¥­¥ã¥ó¥Ð¥¹¤¬¤É¤¦¤ä¤Ã¤Æ¥¹¥¯¥í¡¼¥ë¤¹¤ë¤Î¤«¤ò¼¨¤¹¥°¥ê¥Ã¥É¡£',
+ insert('end',
+ '6. ¥­¥ã¥ó¥Ð¥¹¤¬¤É¤¦¤ä¤Ã¤Æ¥¹¥¯¥í¡¼¥ë¤¹¤ë¤Î¤«¤ò¼¨¤¹¥°¥ê¥Ã¥É¡£',
(d6 = TkTextTag.new(t)) )
# binding
[d1, d2, d3, d4, d5, d6].each{|tag|
tag_binding_for_bind_demo(tag, tagstyle_bold, tagstyle_normal)
}
- d1.bind('1',
+ d1.bind('1',
proc{
eval_samplecode(`cat #{[$demo_dir,'items.rb'].join(File::Separator)}`, 'items.rb')
})
- d2.bind('1',
+ d2.bind('1',
proc{
eval_samplecode(`cat #{[$demo_dir,'plot.rb'].join(File::Separator)}`, 'plot.rb')
})
- d3.bind('1',
+ d3.bind('1',
proc{
eval_samplecode(`cat #{[$demo_dir,'ctext.rb'].join(File::Separator)}`, 'ctext.rb')
})
- d4.bind('1',
+ d4.bind('1',
proc{
eval_samplecode(`cat #{[$demo_dir,'arrow.rb'].join(File::Separator)}`, 'arrow.rb')
})
- d5.bind('1',
+ d5.bind('1',
proc{
eval_samplecode(`cat #{[$demo_dir,'ruler.rb'].join(File::Separator)}`, 'ruler.rb')
})
- d6.bind('1',
+ d6.bind('1',
proc{
eval_samplecode(`cat #{[$demo_dir,'cscroll.rb'].join(File::Separator)}`, 'cscroll.rb')
})
diff --git a/ext/tk/sample/demos-jp/bitmap.rb b/ext/tk/sample/demos-jp/bitmap.rb
index 1193e8de24..b6b0e54bbe 100644
--- a/ext/tk/sample/demos-jp/bitmap.rb
+++ b/ext/tk/sample/demos-jp/bitmap.rb
@@ -15,7 +15,7 @@
def bitmapRow(w,*args)
TkFrame.new(w){|row|
pack('side'=>'top', 'fill'=>'both')
- for bitmap in args
+ for bitmap in args
TkFrame.new(row){|base|
pack('side'=>'left', 'fill'=>'both', 'pady'=>'.25c', 'padx'=>'.25c')
TkLabel.new(base, 'text'=>bitmap, 'width'=>9).pack('side'=>'bottom')
@@ -27,7 +27,7 @@ end
# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($bitmap_demo) && $bitmap_demo
- $bitmap_demo.destroy
+ $bitmap_demo.destroy
$bitmap_demo = nil
end
@@ -41,7 +41,7 @@ $bitmap_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($bitmap_demo).pack(:fill=>:both, :expand=>true)
# label À¸À®
-TkLabel.new(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left',
+TkLabel.new(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left',
'text'=>"¤³¤Î¥¦¥£¥ó¥É¥¦¤Ë¤Ï¡¢Tk ¤ËÁȤ߹þ¤Þ¤ì¤¿¤¹¤Ù¤Æ¤Î¥Ó¥Ã¥È¥Þ¥Ã¥×¤¬¡¢¤½¤ì¤é¤Î̾Á°¤È¶¦¤Ëɽ¼¨¤µ¤ì¤Æ¤¤¤Þ¤¹¡£Tcl ¤Î¥¹¥¯¥ê¥×¥ÈÃæ¤Ç¤Ï¡¢¤½¤ì¤¾¤ì¤Î̾Á°¤òÍѤ¤¤Æ»²¾È¤·¤Þ¤¹¡£"){
pack('side'=>'top')
}
diff --git a/ext/tk/sample/demos-jp/button.rb b/ext/tk/sample/demos-jp/button.rb
index 87ced45810..18e42008c9 100644
--- a/ext/tk/sample/demos-jp/button.rb
+++ b/ext/tk/sample/demos-jp/button.rb
@@ -6,7 +6,7 @@
# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($button_demo) && $button_demo
- $button_demo.destroy
+ $button_demo.destroy
$button_demo = nil
end
diff --git a/ext/tk/sample/demos-jp/check.rb b/ext/tk/sample/demos-jp/check.rb
index 762b99778b..b953e7f623 100644
--- a/ext/tk/sample/demos-jp/check.rb
+++ b/ext/tk/sample/demos-jp/check.rb
@@ -5,7 +5,7 @@
# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($check_demo) && $check_demo
- $check_demo.destroy
+ $check_demo.destroy
$check_demo = nil
end
@@ -54,7 +54,7 @@ TkFrame.new(base_frame) {|frame|
TkButton.new(frame) {
text 'ÊÑ¿ô»²¾È'
command proc{
- showVars(base_frame,
+ showVars(base_frame,
['wipers', wipers], ['brakes', brakes], ['sober', sober])
}
}.pack('side'=>'left', 'expand'=>'yes')
diff --git a/ext/tk/sample/demos-jp/check2.rb b/ext/tk/sample/demos-jp/check2.rb
index 9f845183f3..7f7cb9e932 100644
--- a/ext/tk/sample/demos-jp/check2.rb
+++ b/ext/tk/sample/demos-jp/check2.rb
@@ -5,7 +5,7 @@
# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($check2_demo) && $check2_demo
- $check2_demo.destroy
+ $check2_demo.destroy
$check2_demo = nil
end
@@ -35,35 +35,35 @@ sober = TkVariable.new(0)
# frame À¸À®
TkFrame.new(base_frame) {|frame|
- TkGrid(TkFrame.new(frame, :height=>2, :relief=>:sunken, :bd=>2),
+ TkGrid(TkFrame.new(frame, :height=>2, :relief=>:sunken, :bd=>2),
:columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
- TkGrid('x',
- TkButton.new(frame, :text=>'ÊÑ¿ô»²¾È',
- :image=>$image['view'], :compound=>:left,
+ TkGrid('x',
+ TkButton.new(frame, :text=>'ÊÑ¿ô»²¾È',
+ :image=>$image['view'], :compound=>:left,
:command=>proc{
- showVars($check2_demo,
- ['safety', safety], ['wipers', wipers],
+ showVars($check2_demo,
+ ['safety', safety], ['wipers', wipers],
['brakes', brakes], ['sober', sober])
- }),
- TkButton.new(frame, :text=>'¥³¡¼¥É»²¾È',
- :image=>$image['view'], :compound=>:left,
- :command=>proc{showCode 'check2'}),
- TkButton.new(frame, :text=>'ÊĤ¸¤ë',
- :image=>$image['delete'], :compound=>:left,
+ }),
+ TkButton.new(frame, :text=>'¥³¡¼¥É»²¾È',
+ :image=>$image['view'], :compound=>:left,
+ :command=>proc{showCode 'check2'}),
+ TkButton.new(frame, :text=>'ÊĤ¸¤ë',
+ :image=>$image['delete'], :compound=>:left,
:command=>proc{
tmppath = $check2_demo
$check2_demo = nil
$showVarsWin[tmppath.path] = nil
tmppath.destroy
- }),
+ }),
:padx=>4, :pady=>4)
frame.grid_columnconfigure(0, :weight=>1)
}.pack('side'=>'bottom', 'fill'=>'x')
# checkbutton À¸À®
-TkCheckButton.new(base_frame, :text=>'°ÂÁ´À­¸¡ºº', :variable=>safety,
- :relief=>:flat, :onvalue=>'all', :offvalue=>'none',
+TkCheckButton.new(base_frame, :text=>'°ÂÁ´À­¸¡ºº', :variable=>safety,
+ :relief=>:flat, :onvalue=>'all', :offvalue=>'none',
:tristatevalue=>'partial'){
pack('side'=>'top', 'pady'=>2, 'anchor'=>'w')
}
@@ -71,7 +71,7 @@ TkCheckButton.new(base_frame, :text=>'°ÂÁ´À­¸¡ºº', :variable=>safety,
[ TkCheckButton.new(base_frame, 'text'=>'¥ï¥¤¥Ñ¡¼ OK', 'variable'=>wipers),
TkCheckButton.new(base_frame, 'text'=>'¥Ö¥ì¡¼¥­ OK', 'variable'=>brakes),
TkCheckButton.new(base_frame, 'text'=>'±¿Å¾¼ê ÁÇÌÌ', 'variable'=>sober)
-].each{|w|
+].each{|w|
w.relief('flat')
w.pack('side'=>'top', 'padx'=>15, 'pady'=>2, 'anchor'=>'w')
}
diff --git a/ext/tk/sample/demos-jp/clrpick.rb b/ext/tk/sample/demos-jp/clrpick.rb
index c188723c5a..ce6b99ab94 100644
--- a/ext/tk/sample/demos-jp/clrpick.rb
+++ b/ext/tk/sample/demos-jp/clrpick.rb
@@ -7,7 +7,7 @@
# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($clrpick_demo) && $clrpick_demo
- $clrpick_demo.destroy
+ $clrpick_demo.destroy
$clrpick_demo = nil
end
@@ -47,7 +47,7 @@ Tk::Frame.new($clrpick_demo) {|frame|
# button À¸À®
# TkButton.new($clrpick_demo, 'text'=>'ÇØ·Ê¿§¤òÀßÄê ...') {|b|
Tk::Button.new($clrpick_demo, 'text'=>'ÇØ·Ê¿§¤òÀßÄê ...') {|b|
- command(proc{setColor $clrpick_demo, b, 'background',
+ command(proc{setColor $clrpick_demo, b, 'background',
['background', 'highlightbackground']})
pack('side'=>'top', 'anchor'=>'c', 'pady'=>'2m')
}
@@ -61,7 +61,7 @@ Tk::Button.new($clrpick_demo, 'text'=>'Á°·Ê¿§¤òÀßÄê ...') {|b|
def setColor(w,button,name,options)
w.grab
initialColor = button[name]
- color = Tk.chooseColor('title'=>"Choose a #{name} color", 'parent'=>w,
+ color = Tk.chooseColor('title'=>"Choose a #{name} color", 'parent'=>w,
'initialcolor'=>initialColor)
if color != ""
setColor_helper(w,options,color)
diff --git a/ext/tk/sample/demos-jp/colors.rb b/ext/tk/sample/demos-jp/colors.rb
index 9fcf0333b5..91817a947b 100644
--- a/ext/tk/sample/demos-jp/colors.rb
+++ b/ext/tk/sample/demos-jp/colors.rb
@@ -5,7 +5,7 @@
# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($colors_demo) && $colors_demo
- $colors_demo.destroy
+ $colors_demo.destroy
$colors_demo = nil
end
diff --git a/ext/tk/sample/demos-jp/combo.rb b/ext/tk/sample/demos-jp/combo.rb
index 2059662d48..da00d712ba 100644
--- a/ext/tk/sample/demos-jp/combo.rb
+++ b/ext/tk/sample/demos-jp/combo.rb
@@ -7,7 +7,7 @@
# based on "Id: combo.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp"
if defined?($combo_demo) && $combo_demo
- $combo_demo.destroy
+ $combo_demo.destroy
$combo_demo = nil
end
@@ -19,7 +19,7 @@ $combo_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($combo_demo).pack(:fill=>:both, :expand=>true)
-Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'5i', :justify=>:left,
+Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'5i', :justify=>:left,
:text=><<EOL).pack(:side=>:top, :fill=>:x)
°Ê²¼¤Ç¤Ï3¼ïÎà¤Î¥³¥ó¥Ü¥Ü¥Ã¥¯¥¹¤¬É½¼¨¤µ¤ì¤Æ¤¤¤Þ¤¹¡¥\
ºÇ½é¤Î¤â¤Î¤Ï¡¤¥¨¥ó¥È¥ê¥¦¥£¥¸¥§¥Ã¥È¤ÈƱ¤¸Íͤˡ¤\
@@ -42,24 +42,24 @@ ozCity = TkVariable.new
Ttk::Frame.new(base_frame) {|frame|
sep = Ttk::Separator.new(frame)
Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
- TkGrid('x',
- Ttk::Button.new(frame, :text=>'ÊÑ¿ô»²¾È',
- :image=>$image['view'], :compound=>:left,
+ TkGrid('x',
+ Ttk::Button.new(frame, :text=>'ÊÑ¿ô»²¾È',
+ :image=>$image['view'], :compound=>:left,
:command=>proc{
- showVars(base_frame,
- ['firstVariable', firstValue],
- ['secondVariable', secondValue],
+ showVars(base_frame,
+ ['firstVariable', firstValue],
+ ['secondVariable', secondValue],
['ozCity', ozCity])
- }),
- Ttk::Button.new(frame, :text=>'¥³¡¼¥É»²¾È',
- :image=>$image['view'], :compound=>:left,
- :command=>proc{showCode 'combo'}),
- Ttk::Button.new(frame, :text=>'ÊĤ¸¤ë',
- :image=>$image['delete'], :compound=>:left,
+ }),
+ Ttk::Button.new(frame, :text=>'¥³¡¼¥É»²¾È',
+ :image=>$image['view'], :compound=>:left,
+ :command=>proc{showCode 'combo'}),
+ Ttk::Button.new(frame, :text=>'ÊĤ¸¤ë',
+ :image=>$image['delete'], :compound=>:left,
:command=>proc{
$combo_demo.destroy
$combo_demo = nil
- }),
+ }),
:padx=>4, :pady=>4)
grid_columnconfigure(0, :weight=>1)
pack(:side=>:bottom, :fill=>:x)
@@ -68,7 +68,7 @@ Ttk::Frame.new(base_frame) {|frame|
frame = Ttk::Frame.new(base_frame).pack(:fill=>:both, :expand=>true)
australianCities = [
- '¥­¥ã¥ó¥Ù¥é', '¥·¥É¥Ë¡¼', '¥á¥ë¥Ü¥ë¥ó', '¥Ñ¡¼¥¹', '¥¢¥Ç¥ì¡¼¥É',
+ '¥­¥ã¥ó¥Ù¥é', '¥·¥É¥Ë¡¼', '¥á¥ë¥Ü¥ë¥ó', '¥Ñ¡¼¥¹', '¥¢¥Ç¥ì¡¼¥É',
'¥Ö¥ê¥¹¥Ù¡¼¥ó', '¥Û¥Ð¡¼¥È', '¥À¡¼¥¦¥£¥ó', '¥¢¥ê¥¹ ¥¹¥×¥ê¥ó¥°¥¹'
]
@@ -82,17 +82,17 @@ Tk.pack(Ttk::Labelframe.new(frame, :text=>'Fully Editable'){|f|
w.values <<= w.value unless w.values.include?(w.value)
}
}.pack(:pady=>5, :padx=>10)
- },
+ },
Ttk::LabelFrame.new(frame, :text=>'Disabled'){|f|
Ttk::Combobox.new(f, :textvariable=>secondValue, :state=>:disabled) .
pack(:pady=>5, :padx=>10)
- },
+ },
Ttk::LabelFrame.new(frame, :text=>'Defined List Only'){|f|
- Ttk::Combobox.new(f, :textvariable=>ozCity, :state=>:readonly,
+ Ttk::Combobox.new(f, :textvariable=>ozCity, :state=>:readonly,
:values=>australianCities) .
pack(:pady=>5, :padx=>10)
- },
+ },
:side=>:top, :pady=>5, :padx=>10)
diff --git a/ext/tk/sample/demos-jp/cscroll.rb b/ext/tk/sample/demos-jp/cscroll.rb
index 0a31f28b5e..845952679a 100644
--- a/ext/tk/sample/demos-jp/cscroll.rb
+++ b/ext/tk/sample/demos-jp/cscroll.rb
@@ -5,7 +5,7 @@
# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($cscroll_demo) && $cscroll_demo
- $cscroll_demo.destroy
+ $cscroll_demo.destroy
$cscroll_demo = nil
end
@@ -19,7 +19,7 @@ $cscroll_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($cscroll_demo).pack(:fill=>:both, :expand=>true)
# label À¸À®
-TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'4i',
+TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'4i',
'justify'=>'left', 'text'=>"¤³¤Î¥¦¥£¥ó¥É¥¦¤Ë¤Ï¥¹¥¯¥í¡¼¥ë¥Ð¡¼¤ä¥Þ¥¦¥¹¤Î¥Ü¥¿¥ó2 ¤Ç¥¹¥¯¥í¡¼¥ë¤Ç¤­¤ë¥­¥ã¥ó¥Ð¥¹ widget ¤¬É½¼¨¤µ¤ì¤Æ¤¤¤Þ¤¹¡£»Í³Ñ¤Î¾å¤Ç¥Ü¥¿¥ó1 ¤ò¥¯¥ê¥Ã¥¯¤¹¤ë¤È¡¢¤½¤Î¥¤¥ó¥Ç¥Ã¥¯¥¹¤¬É¸½à½ÐÎϤ˽ÐÎϤµ¤ì¤Þ¤¹¡£"){
pack('side'=>'top')
}
@@ -53,14 +53,14 @@ unless $tk_version =~ /^4\.[01]/
end
# canvas ÀßÄê
-$cscroll_canvas = TkCanvas.new(base_frame,
+$cscroll_canvas = TkCanvas.new(base_frame,
'relief'=>'sunken', 'borderwidth'=>2,
'scrollregion'=>['-11c', '-11c', '50c', '20c']
) {|c|
if $tk_version =~ /^4\.[01]/
- pack('expand'=>'yes', 'fill'=>'both')
+ pack('expand'=>'yes', 'fill'=>'both')
else
- grid('in'=>$cscroll_grid, 'padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>0,
+ grid('in'=>$cscroll_grid, 'padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>0,
'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
end
@@ -69,18 +69,18 @@ $cscroll_canvas = TkCanvas.new(base_frame,
if $tk_version =~ /^4\.[01]/
pack('side'=>'right', 'fill'=>'y')
else
- grid('in'=>$cscroll_grid, 'padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>1,
+ grid('in'=>$cscroll_grid, 'padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>1,
'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
end
}
- TkScrollbar.new(base_frame, 'orient'=>'horiz',
+ TkScrollbar.new(base_frame, 'orient'=>'horiz',
'command'=>proc{|*args| c.xview(*args)}) {|hs|
c.xscrollcommand(proc{|first,last| hs.set first,last})
if $tk_version =~ /^4\.[01]/
- pack('side'=>'bottom', 'fill'=>'x')
+ pack('side'=>'bottom', 'fill'=>'x')
else
- grid('in'=>$cscroll_grid, 'padx'=>1, 'pady'=>1, 'row'=>1, 'column'=>0,
+ grid('in'=>$cscroll_grid, 'padx'=>1, 'pady'=>1, 'row'=>1, 'column'=>0,
'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
end
}
@@ -91,9 +91,9 @@ bg = $cscroll_canvas.configinfo('bg')[4]
x = -10+3*i
y = -10
(0..9).each{|j|
- TkcRectangle.new($cscroll_canvas, "#{x}c", "#{y}c", "#{x+2}c", "#{y+2}c",
+ TkcRectangle.new($cscroll_canvas, "#{x}c", "#{y}c", "#{x+2}c", "#{y+2}c",
'outline'=>'black', 'fill'=>bg, 'tags'=>'rect')
- TkcText.new($cscroll_canvas, "#{x+1}c", "#{y+1}c",
+ TkcText.new($cscroll_canvas, "#{x+1}c", "#{y+1}c",
'text'=>"#{i},#{j}", 'anchor'=>'center', 'tags'=>'text')
y += 3
}
@@ -104,7 +104,7 @@ $cscroll_canvas.itembind('all', 'Any-Leave', proc{scrollLeave $cscroll_canvas})
$cscroll_canvas.itembind('all', '1', proc{scrollButton $cscroll_canvas})
$cscroll_canvas.itembind('all', 'Any-Enter', proc{scrollEnter $cscroll_canvas})
$cscroll_canvas.bind('2', proc{|x,y| $cscroll_canvas.scan_mark(x,y)}, '%x %y')
-$cscroll_canvas.bind('B2-Motion',
+$cscroll_canvas.bind('B2-Motion',
proc{|x,y| $cscroll_canvas.scan_dragto(x,y)}, '%x %y')
def scrollEnter(c)
diff --git a/ext/tk/sample/demos-jp/ctext.rb b/ext/tk/sample/demos-jp/ctext.rb
index 70c1cad1a7..05ca732cfd 100644
--- a/ext/tk/sample/demos-jp/ctext.rb
+++ b/ext/tk/sample/demos-jp/ctext.rb
@@ -5,7 +5,7 @@
# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($ctext_demo) && $ctext_demo
- $ctext_demo.destroy
+ $ctext_demo.destroy
$ctext_demo = nil
end
@@ -19,7 +19,7 @@ $ctext_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($ctext_demo).pack(:fill=>:both, :expand=>true)
# label À¸À®
-TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'5i', 'justify'=>'left',
+TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'5i', 'justify'=>'left',
'text'=>"¤³¤Î¥¦¥£¥ó¥É¥¦¤Ë¤Ï¥­¥ã¥ó¥Ð¥¹widget¤Î¥Æ¥­¥¹¥Èµ¡Ç½¤ò¥Ç¥â¤¹¤ë¤¿¤á¤Î¥Æ¥­¥¹¥Èʸ»úÎó¤¬É½¼¨¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¥Þ¥¦¥¹¤ò»Í³Ñ¤ÎÃæ¤Ë»ý¤Ã¤Æ¤¤¤­¡¢¥¯¥ê¥Ã¥¯¤¹¤ë¤È°ÌÃÖ¤®¤áÍѤÎÅÀ¤«¤é¤ÎÁêÂаÌÃÖ¤òÊѤ¨¤¿¤ê¡¢¹Ô·¤¨¤òÊѤ¨¤¿¤ê¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤Þ¤¿°Ê²¼¤Î¤è¤¦¤ÊÊÔ½¸¤Î¤¿¤á¤Î´Êñ¤Ê¥Ð¥¤¥ó¥Ç¥£¥ó¥°¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤¹¡£
1. ¥Þ¥¦¥¹¤ò»ý¤Ã¤Æ¤¤¤­¡¢¥¯¥ê¥Ã¥¯¤·¡¢ÆþÎϤǤ­¤Þ¤¹¡£
@@ -50,7 +50,7 @@ $ctext_buttons = TkFrame.new(base_frame) {|frame|
$ctext_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
# canvas À¸À®
-$ctext_canvas = TkCanvas.new(base_frame, 'relief'=>'flat',
+$ctext_canvas = TkCanvas.new(base_frame, 'relief'=>'flat',
'borderwidth'=>0, 'width'=>500, 'height'=>350)
$ctext_canvas.pack('side'=>'top', 'expand'=>'yes', 'fill'=>'both')
@@ -62,7 +62,7 @@ else
end
# canvas ÀßÄê
-TkcRectangle.new($ctext_canvas, 245, 195, 255, 205,
+TkcRectangle.new($ctext_canvas, 245, 195, 255, 205,
'outline'=>'black', 'fill'=>'red')
ctag_text_param = {
@@ -80,24 +80,24 @@ $ctag_text.withtag(TkcText.new($ctext_canvas, 250, 200, ctag_text_param))
$ctag_text.bind('1', proc{|x,y| textB1Press $ctext_canvas,x,y}, "%x %y")
$ctag_text.bind('B1-Motion', proc{|x,y| textB1Move $ctext_canvas,x,y}, "%x %y")
-$ctag_text.bind('Shift-1',
- proc{|x,y| $ctext_canvas.seleect_adjust 'current', "@#{x},#{y}"},
+$ctag_text.bind('Shift-1',
+ proc{|x,y| $ctext_canvas.seleect_adjust 'current', "@#{x},#{y}"},
"%x %y")
-$ctag_text.bind('Shift-B1-Motion',
+$ctag_text.bind('Shift-B1-Motion',
proc{|x,y| textB1Move $ctext_canvas,x,y}, "%x %y")
$ctag_text.bind('KeyPress', proc{|a| textInsert $ctext_canvas,a}, "%A")
$ctag_text.bind('Return', proc{textInsert $ctext_canvas,"\n"})
$ctag_text.bind('Control-h', proc{textBs $ctext_canvas})
$ctag_text.bind('BackSpace', proc{textBs $ctext_canvas})
$ctag_text.bind('Delete', proc{textDel $ctext_canvas})
-$ctag_text.bind('2', proc{|x,y| textPaste $ctext_canvas, "@#{x},#{y}"},
+$ctag_text.bind('2', proc{|x,y| textPaste $ctext_canvas, "@#{x},#{y}"},
"%x %y")
-# Next, create some items that allow the text's anchor position
+# Next, create some items that allow the text's anchor position
# to be edited.
def mkTextConfig(w,x,y,option,value,color)
- item = TkcRectangle.new(w, x, y, x+30, y+30,
+ item = TkcRectangle.new(w, x, y, x+30, y+30,
'outline'=>'black', 'fill'=>color, 'width'=>1)
item.bind('1', proc{$ctag_text.configure option, value})
w.addtag_withtag('config', item)
@@ -115,15 +115,15 @@ mkTextConfig $ctext_canvas, x+60, y+30, 'anchor', 'w', color
mkTextConfig $ctext_canvas, x, y+60, 'anchor', 'ne', color
mkTextConfig $ctext_canvas, x+30, y+60, 'anchor', 'n', color
mkTextConfig $ctext_canvas, x+60, y+60, 'anchor', 'nw', color
-item = TkcRectangle.new($ctext_canvas, x+40, y+40, x+50, y+50,
+item = TkcRectangle.new($ctext_canvas, x+40, y+40, x+50, y+50,
'outline'=>'black', 'fill'=>'red')
item.bind('1', proc{$ctag_text.configure 'anchor', 'center'})
if $tk_version =~ /^4.*/
- TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Text Position',
- 'font'=>'-*-times-medium-r-normal--*-240-*-*-*-*-*-*',
+ TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Text Position',
+ 'font'=>'-*-times-medium-r-normal--*-240-*-*-*-*-*-*',
'anchor'=>'s', 'fill'=>'brown')
else
- TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Text Position',
+ TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Text Position',
'font'=>'Times 24', 'anchor'=>'s', 'fill'=>'brown')
end
@@ -137,18 +137,18 @@ mkTextConfig $ctext_canvas, x, y, 'justify', 'left', color
mkTextConfig $ctext_canvas, x+30, y, 'justify', 'center', color
mkTextConfig $ctext_canvas, x+60, y, 'justify', 'right', color
if $tk_version =~ /^4.*/
- TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Justification',
- 'font'=>'-*-times-medium-r-normal--*-240-*-*-*-*-*-*',
+ TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Justification',
+ 'font'=>'-*-times-medium-r-normal--*-240-*-*-*-*-*-*',
'anchor'=>'s', 'fill'=>'brown')
else
- TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Justification',
+ TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Justification',
'font'=>'Times 24', 'anchor'=>'s', 'fill'=>'brown')
end
$ctext_canvas.itembind('config', 'Enter', proc{textEnter $ctext_canvas})
-$ctext_canvas.itembind('config', 'Leave',
+$ctext_canvas.itembind('config', 'Leave',
proc{$ctext_canvas\
- .itemconfigure('current',
+ .itemconfigure('current',
'fill'=>$textConfigFill)})
$textConfigFill = ''
diff --git a/ext/tk/sample/demos-jp/entry1.rb b/ext/tk/sample/demos-jp/entry1.rb
index eb71e87aec..2be29c18d3 100644
--- a/ext/tk/sample/demos-jp/entry1.rb
+++ b/ext/tk/sample/demos-jp/entry1.rb
@@ -5,7 +5,7 @@
# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($entry1_demo) && $entry1_demo
- $entry1_demo.destroy
+ $entry1_demo.destroy
$entry1_demo = nil
end
diff --git a/ext/tk/sample/demos-jp/entry2.rb b/ext/tk/sample/demos-jp/entry2.rb
index b5187ab508..2675b5d324 100644
--- a/ext/tk/sample/demos-jp/entry2.rb
+++ b/ext/tk/sample/demos-jp/entry2.rb
@@ -5,7 +5,7 @@
# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($entry2_demo) && $entry2_demo
- $entry2_demo.destroy
+ $entry2_demo.destroy
$entry2_demo = nil
end
diff --git a/ext/tk/sample/demos-jp/entry3.rb b/ext/tk/sample/demos-jp/entry3.rb
index 2728de0b93..6b9cd4cf37 100644
--- a/ext/tk/sample/demos-jp/entry3.rb
+++ b/ext/tk/sample/demos-jp/entry3.rb
@@ -8,7 +8,7 @@
# based on Tcl/Tk8.4.4 widget demos
if defined?($entry3_demo) && $entry3_demo
- $entry3_demo.destroy
+ $entry3_demo.destroy
$entry3_demo = nil
end
@@ -20,8 +20,8 @@ $entry3_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($entry3_demo).pack(:fill=>:both, :expand=>true)
-TkLabel.new(base_frame,
- :font=>$font, :wraplength=>'5i', :justify=>:left,
+TkLabel.new(base_frame,
+ :font=>$font, :wraplength=>'5i', :justify=>:left,
:text=><<EOL).pack(:side=>:top)
°Ê²¼¤Ë¤Ï£´¼ïÎà¤Î¥¨¥ó¥È¥ê¥Ü¥Ã¥¯¥¹¤¬É½¼¨¤µ¤ì¤Æ¤¤¤Þ¤¹¡¥³Æ¥¨¥ó¥È¥ê¥Ü¥Ã¥¯¥¹¤Ï¡¤\
¥Þ¥¦¥¹¥¯¥ê¥Ã¥¯¤ÇÁªÂò¤·Ê¸»ú¤òÂǤÁ¹þ¤à¤³¤È¤¬²Äǽ¤Ç¤¹¤¬¡¤¤½¤ì¤¾¤ì¤¬¤É¤Î¤è¤¦¤Ê\
@@ -68,20 +68,20 @@ TkFrame.new(base_frame){|f|
def focusAndFlash(widget, fg, bg, count=5)
return if count <= 0
if fg && !fg.empty? && bg && !bg.empty?
- TkTimer.new(200, count,
- proc{widget.configure(:foreground=>bg, :background=>fg)},
+ TkTimer.new(200, count,
+ proc{widget.configure(:foreground=>bg, :background=>fg)},
proc{widget.configure(:foreground=>fg, :background=>bg)}
).start
else
# TkTimer.new(150, 3){Tk.bell}.start
Tk.bell
- TkTimer.new(200, count,
- proc{widget.configure(:foreground=>'white',
- :background=>'black')},
- proc{widget.configure(:foreground=>'black',
+ TkTimer.new(200, count,
+ proc{widget.configure(:foreground=>'white',
+ :background=>'black')},
+ proc{widget.configure(:foreground=>'black',
:background=>'white')}
).at_end{begin
- widget.configure(:foreground=>fg,
+ widget.configure(:foreground=>fg,
:background=>bg)
rescue
# ignore
@@ -91,7 +91,7 @@ def focusAndFlash(widget, fg, bg, count=5)
end
l1 = TkLabelFrame.new(base_frame, :text=>"À°¿ô¥¨¥ó¥È¥ê")
-TkEntry.new(l1, :validate=>:focus,
+TkEntry.new(l1, :validate=>:focus,
:vcmd=>[
proc{|s| s == '' || /^[+-]?\d+$/ =~ s }, '%P'
]) {|e|
@@ -102,7 +102,7 @@ TkEntry.new(l1, :validate=>:focus,
}
l2 = TkLabelFrame.new(base_frame, :text=>"ŤµÀ©ÌóÉÕ¤­¥¨¥ó¥È¥ê")
-TkEntry.new(l2, :validate=>:key, :invcmd=>proc{Tk.bell},
+TkEntry.new(l2, :validate=>:key, :invcmd=>proc{Tk.bell},
:vcmd=>[proc{|s| s.length < 10}, '%P']
).pack(:fill=>:x, :expand=>true, :padx=>'1m', :pady=>'1m')
@@ -176,7 +176,7 @@ end
def validatePhoneChange(widget, vmode, idx, char)
return true if idx == nil
- Tk.after_idle(proc{widget.configure(:validate=>vmode,
+ Tk.after_idle(proc{widget.configure(:validate=>vmode,
:invcmd=>proc{Tk.bell})})
if !(idx<3 || idx==6 || idx==7 || idx==11 || idx>15) && char =~ /[0-9A-Za-z]/
widget.delete(idx)
@@ -191,10 +191,10 @@ end
l3 = TkLabelFrame.new(base_frame, :text=>"ÊÆ¹ñÅÅÏÃÈֹ楨¥ó¥È¥ê")
-TkEntry.new(l3, :validate=>:key, :invcmd=>proc{Tk.bell},
- :textvariable=>entry3content,
+TkEntry.new(l3, :validate=>:key, :invcmd=>proc{Tk.bell},
+ :textvariable=>entry3content,
:vcmd=>[
- proc{|w,v,i,s| validatePhoneChange(w,v,i,s)},
+ proc{|w,v,i,s| validatePhoneChange(w,v,i,s)},
"%W %v %i %S"
]){|e|
# Click to focus goes to the first editable character...
@@ -210,9 +210,9 @@ TkEntry.new(l3, :validate=>:key, :invcmd=>proc{Tk.bell},
}
l4 = TkLabelFrame.new(base_frame, :text=>"¥Ñ¥¹¥ï¡¼¥É¥¨¥ó¥È¥ê")
-TkEntry.new(l4, :validate=>:key, :show=>'*',
+TkEntry.new(l4, :validate=>:key, :show=>'*',
:vcmd=>[
- proc{|s| s.length <= 8},
+ proc{|s| s.length <= 8},
'%P'
]).pack(:fill=>:x, :expand=>true, :padx=>'1m', :pady=>'1m')
diff --git a/ext/tk/sample/demos-jp/filebox.rb b/ext/tk/sample/demos-jp/filebox.rb
index ffe5fbc5c6..b8846d08a0 100644
--- a/ext/tk/sample/demos-jp/filebox.rb
+++ b/ext/tk/sample/demos-jp/filebox.rb
@@ -5,7 +5,7 @@
# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($filebox_demo) && $entry2_demo
- $filebox_demo.destroy
+ $filebox_demo.destroy
$filebox_demo = nil
end
@@ -49,7 +49,7 @@ TkFrame.new(base_frame) {|frame|
TkEntry.new(f, 'width'=>20) {|e|
pack('side'=>'left', 'expand'=>'yes', 'fill'=>'x')
- TkButton.new(f, 'text'=>'Browse ...',
+ TkButton.new(f, 'text'=>'Browse ...',
'command'=>proc{fileDialog base_frame,e,type})\
.pack('side'=>'left')
}
@@ -60,9 +60,9 @@ TkFrame.new(base_frame) {|frame|
$tk_strictMotif = TkVarAccess.new('tk_strictMotif')
if ($tk_platform['platform'] == 'unix')
- TkCheckButton.new(base_frame,
- 'text'=>'Motif¥¹¥¿¥¤¥ë¤Î¥À¥¤¥¢¥í¥°¤òÍѤ¤¤ë',
- 'variable'=>$tk_strictMotif,
+ TkCheckButton.new(base_frame,
+ 'text'=>'Motif¥¹¥¿¥¤¥ë¤Î¥À¥¤¥¢¥í¥°¤òÍѤ¤¤ë',
+ 'variable'=>$tk_strictMotif,
'onvalue'=>1, 'offvalue'=>0 ).pack('anchor'=>'c')
end
@@ -71,23 +71,23 @@ def fileDialog(w,ent,operation)
#
#--------------------------------------------------------
types = [
- ['Text files', ['.txt','.doc'] ],
- ['Text files', [], 'TEXT' ],
- ['Ruby Scripts', ['.rb'], 'TEXT' ],
- ['Tcl Scripts', ['.tcl'], 'TEXT' ],
- ['C Source Files', ['.c','.h'] ],
- ['All Source Files', ['.rb','.tcl','.c','.h'] ],
- ['Image Files', ['.gif'] ],
- ['Image Files', ['.jpeg','.jpg'] ],
- ['Image Files', [], ['GIFF','JPEG']],
+ ['Text files', ['.txt','.doc'] ],
+ ['Text files', [], 'TEXT' ],
+ ['Ruby Scripts', ['.rb'], 'TEXT' ],
+ ['Tcl Scripts', ['.tcl'], 'TEXT' ],
+ ['C Source Files', ['.c','.h'] ],
+ ['All Source Files', ['.rb','.tcl','.c','.h'] ],
+ ['Image Files', ['.gif'] ],
+ ['Image Files', ['.jpeg','.jpg'] ],
+ ['Image Files', [], ['GIFF','JPEG']],
['All files', '*' ]
]
if operation == '³«¤¯'
file = Tk.getOpenFile('filetypes'=>types, 'parent'=>w)
else
- file = Tk.getSaveFile('filetypes'=>types, 'parent'=>w,
- 'initialfile'=>'Untitled',
+ file = Tk.getSaveFile('filetypes'=>types, 'parent'=>w,
+ 'initialfile'=>'Untitled',
'defaultextension'=>'.txt')
end
if file != ""
diff --git a/ext/tk/sample/demos-jp/floor.rb b/ext/tk/sample/demos-jp/floor.rb
index 78cc23a245..a2ec2e9969 100644
--- a/ext/tk/sample/demos-jp/floor.rb
+++ b/ext/tk/sample/demos-jp/floor.rb
@@ -18,7 +18,7 @@ def floorDisplay(w,active)
w.delete('all')
$activeFloor = active
- # First go through the three floors, displaying the backgrounds for
+ # First go through the three floors, displaying the backgrounds for
# each floor.
floor_bg1(w,$floor_colors['bg1'],$floor_colors['outline1'])
@@ -29,12 +29,12 @@ def floorDisplay(w,active)
w.raise("floor#{active}")
- # Create a dummy item just to mark this point in the display list,
+ # Create a dummy item just to mark this point in the display list,
# so we can insert highlights here.
TkcRectangle.new(w,0,100,1,101, 'fill'=>'', 'outline'=>'', 'tags'=>'marker')
- # Add the walls and labels for the active floor, along with
+ # Add the walls and labels for the active floor, along with
# transparent polygons that define the rooms on the floor.
# Make sure that the room polygons are on top.
@@ -299,7 +299,7 @@ def floor_bg3(w,fill,outline)
TkcLine.new(w,21,331,0,331, 'fill'=>outline, 'tags'=>['floor3','bg'])
TkcLine.new(w,21,331,21,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
TkcLine.new(w,96,133,21,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
- TkcLine.new(w,107,300,159,300,159,248,107,248,107,300,
+ TkcLine.new(w,107,300,159,300,159,248,107,248,107,300,
'fill'=>outline, 'tags'=>['floor3','bg'])
end
@@ -313,316 +313,316 @@ end
# color - Color to use for drawing foreground information.
def floor_fg1(w,color)
- i = TkcPolygon.new(w,375,246,375,172,341,172,341,246,
+ i = TkcPolygon.new(w,375,246,375,172,341,172,341,246,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '101'
$floorItems['101'] = i
- TkcText.new(w,358,209, 'text'=>'101', 'fill'=>color,
+ TkcText.new(w,358,209, 'text'=>'101', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,307,240,339,240,339,206,307,206,
+ i = TkcPolygon.new(w,307,240,339,240,339,206,307,206,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = 'Pub Lift1'
$floorItems['Pub Lift1'] = i
- TkcText.new(w,323,223, 'text'=>'Pub Lift1', 'fill'=>color,
+ TkcText.new(w,323,223, 'text'=>'Pub Lift1', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,339,205,307,205,307,171,339,171,
+ i = TkcPolygon.new(w,339,205,307,205,307,171,339,171,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = 'Priv Lift1'
$floorItems['Priv Lift1'] = i
- TkcText.new(w,323,188, 'text'=>'Priv Lift1', 'fill'=>color,
+ TkcText.new(w,323,188, 'text'=>'Priv Lift1', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,42,389,42,337,1,337,1,389,
+ i = TkcPolygon.new(w,42,389,42,337,1,337,1,389,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '110'
$floorItems['110'] = i
- TkcText.new(w,21.5,363, 'text'=>'110', 'fill'=>color,
+ TkcText.new(w,21.5,363, 'text'=>'110', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,59,389,59,385,90,385,90,337,44,337,44,389,
+ i = TkcPolygon.new(w,59,389,59,385,90,385,90,337,44,337,44,389,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '109'
$floorItems['109'] = i
- TkcText.new(w,67,363, 'text'=>'109', 'fill'=>color,
+ TkcText.new(w,67,363, 'text'=>'109', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,51,300,51,253,6,253,6,300,
+ i = TkcPolygon.new(w,51,300,51,253,6,253,6,300,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '111'
$floorItems['111'] = i
- TkcText.new(w,28.5,276.5, 'text'=>'111', 'fill'=>color,
+ TkcText.new(w,28.5,276.5, 'text'=>'111', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,98,248,98,309,79,309,79,248,
+ i = TkcPolygon.new(w,98,248,98,309,79,309,79,248,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '117B'
$floorItems['117B'] = i
- TkcText.new(w,88.5,278.5, 'text'=>'117B', 'fill'=>color,
+ TkcText.new(w,88.5,278.5, 'text'=>'117B', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,51,251,51,204,6,204,6,251,
+ i = TkcPolygon.new(w,51,251,51,204,6,204,6,251,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '112'
$floorItems['112'] = i
- TkcText.new(w,28.5,227.5, 'text'=>'112', 'fill'=>color,
+ TkcText.new(w,28.5,227.5, 'text'=>'112', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,6,156,51,156,51,203,6,203,
+ i = TkcPolygon.new(w,6,156,51,156,51,203,6,203,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '113'
$floorItems['113'] = i
- TkcText.new(w,28.5,179.5, 'text'=>'113', 'fill'=>color,
+ TkcText.new(w,28.5,179.5, 'text'=>'113', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,85,169,79,169,79,192,85,192,
+ i = TkcPolygon.new(w,85,169,79,169,79,192,85,192,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '117A'
$floorItems['117A'] = i
- TkcText.new(w,82,180.5, 'text'=>'117A', 'fill'=>color,
+ TkcText.new(w,82,180.5, 'text'=>'117A', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,77,302,77,168,53,168,53,302,
+ i = TkcPolygon.new(w,77,302,77,168,53,168,53,302,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '117'
$floorItems['117'] = i
- TkcText.new(w,65,235, 'text'=>'117', 'fill'=>color,
+ TkcText.new(w,65,235, 'text'=>'117', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,51,155,51,115,6,115,6,155,
+ i = TkcPolygon.new(w,51,155,51,115,6,115,6,155,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '114'
$floorItems['114'] = i
- TkcText.new(w,28.5,135, 'text'=>'114', 'fill'=>color,
+ TkcText.new(w,28.5,135, 'text'=>'114', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,95,115,53,115,53,168,95,168,
+ i = TkcPolygon.new(w,95,115,53,115,53,168,95,168,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '115'
$floorItems['115'] = i
- TkcText.new(w,74,141.5, 'text'=>'115', 'fill'=>color,
+ TkcText.new(w,74,141.5, 'text'=>'115', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,87,113,87,27,10,27,10,113,
+ i = TkcPolygon.new(w,87,113,87,27,10,27,10,113,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '116'
$floorItems['116'] = i
- TkcText.new(w,48.5,70, 'text'=>'116', 'fill'=>color,
+ TkcText.new(w,48.5,70, 'text'=>'116', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,89,91,128,91,128,113,89,131,
+ i = TkcPolygon.new(w,89,91,128,91,128,113,89,131,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '118'
$floorItems['118'] = i
- TkcText.new(w,108.5,102, 'text'=>'118', 'fill'=>color,
+ TkcText.new(w,108.5,102, 'text'=>'118', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
i = TkcPolygon.new(w,178,128,178,132,216,132,216,91,
- 163,91,163,112,149,112,149,128,
+ 163,91,163,112,149,112,149,128,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '120'
$floorItems['120'] = i
- TkcText.new(w,189.5,111.5, 'text'=>'120', 'fill'=>color,
+ TkcText.new(w,189.5,111.5, 'text'=>'120', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
i = TkcPolygon.new(w,79,193,87,193,87,169,136,169,136,192,
- 156,192,156,169,175,169,175,246,79,246,
+ 156,192,156,169,175,169,175,246,79,246,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '122'
$floorItems['122'] = i
- TkcText.new(w,131,207.5, 'text'=>'122', 'fill'=>color,
+ TkcText.new(w,131,207.5, 'text'=>'122', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,138,169,154,169,154,191,138,191,
+ i = TkcPolygon.new(w,138,169,154,169,154,191,138,191,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '121'
$floorItems['121'] = i
- TkcText.new(w,146,180, 'text'=>'121', 'fill'=>color,
+ TkcText.new(w,146,180, 'text'=>'121', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,99,300,126,300,126,309,99,309,
+ i = TkcPolygon.new(w,99,300,126,300,126,309,99,309,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '106A'
$floorItems['106A'] = i
- TkcText.new(w,112.5,304.5, 'text'=>'106A', 'fill'=>color,
+ TkcText.new(w,112.5,304.5, 'text'=>'106A', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,128,299,128,309,150,309,150,248,99,248,99,299,
+ i = TkcPolygon.new(w,128,299,128,309,150,309,150,248,99,248,99,299,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '105'
$floorItems['105'] = i
- TkcText.new(w,124.5,278.5, 'text'=>'105', 'fill'=>color,
+ TkcText.new(w,124.5,278.5, 'text'=>'105', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,174,309,174,300,152,300,152,309,
+ i = TkcPolygon.new(w,174,309,174,300,152,300,152,309,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '106B'
$floorItems['106B'] = i
- TkcText.new(w,163,304.5, 'text'=>'106B', 'fill'=>color,
+ TkcText.new(w,163,304.5, 'text'=>'106B', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,176,299,176,309,216,309,216,248,152,248,152,299,
+ i = TkcPolygon.new(w,176,299,176,309,216,309,216,248,152,248,152,299,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '104'
$floorItems['104'] = i
- TkcText.new(w,184,278.5, 'text'=>'104', 'fill'=>color,
+ TkcText.new(w,184,278.5, 'text'=>'104', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,138,385,138,337,91,337,91,385,
+ i = TkcPolygon.new(w,138,385,138,337,91,337,91,385,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '108'
$floorItems['108'] = i
- TkcText.new(w,114.5,361, 'text'=>'108', 'fill'=>color,
+ TkcText.new(w,114.5,361, 'text'=>'108', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,256,337,140,337,140,385,256,385,
+ i = TkcPolygon.new(w,256,337,140,337,140,385,256,385,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '107'
$floorItems['107'] = i
- TkcText.new(w,198,361, 'text'=>'107', 'fill'=>color,
+ TkcText.new(w,198,361, 'text'=>'107', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,300,353,300,329,260,329,260,353,
+ i = TkcPolygon.new(w,300,353,300,329,260,329,260,353,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = 'Smoking'
$floorItems['Smoking'] = i
- TkcText.new(w,280,341, 'text'=>'Smoking', 'fill'=>color,
+ TkcText.new(w,280,341, 'text'=>'Smoking', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,314,135,314,170,306,170,306,246,177,246,177,135,
+ i = TkcPolygon.new(w,314,135,314,170,306,170,306,246,177,246,177,135,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '123'
$floorItems['123'] = i
- TkcText.new(w,245.5,190.5, 'text'=>'123', 'fill'=>color,
+ TkcText.new(w,245.5,190.5, 'text'=>'123', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,217,248,301,248,301,326,257,326,257,310,217,310,
+ i = TkcPolygon.new(w,217,248,301,248,301,326,257,326,257,310,217,310,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '103'
$floorItems['103'] = i
- TkcText.new(w,259,287, 'text'=>'103', 'fill'=>color,
+ TkcText.new(w,259,287, 'text'=>'103', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,396,188,377,188,377,169,316,169,316,131,396,131,
+ i = TkcPolygon.new(w,396,188,377,188,377,169,316,169,316,131,396,131,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '124'
$floorItems['124'] = i
- TkcText.new(w,356,150, 'text'=>'124', 'fill'=>color,
+ TkcText.new(w,356,150, 'text'=>'124', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,397,226,407,226,407,189,377,189,377,246,397,246,
+ i = TkcPolygon.new(w,397,226,407,226,407,189,377,189,377,246,397,246,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '125'
$floorItems['125'] = i
- TkcText.new(w,392,217.5, 'text'=>'125', 'fill'=>color,
+ TkcText.new(w,392,217.5, 'text'=>'125', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,399,187,409,187,409,207,474,207,474,164,399,164,
+ i = TkcPolygon.new(w,399,187,409,187,409,207,474,207,474,164,399,164,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '126'
$floorItems['126'] = i
- TkcText.new(w,436.5,185.5, 'text'=>'126', 'fill'=>color,
+ TkcText.new(w,436.5,185.5, 'text'=>'126', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
i = TkcPolygon.new(w,409,209,409,229,399,229,399,253,
- 486,253,486,239,474,239,474,209,
+ 486,253,486,239,474,239,474,209,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '127'
$floorItems['127'] = i
- TkcText.new(w,436.5,'231', 'text'=>'127', 'fill'=>color,
+ TkcText.new(w,436.5,'231', 'text'=>'127', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
i = TkcPolygon.new(w,501,164,501,174,495,174,495,188,
- 490,188,490,204,476,204,476,164,
+ 490,188,490,204,476,204,476,164,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = 'MShower'
$floorItems['MShower'] = i
- TkcText.new(w,488.5,'184', 'text'=>'MShower', 'fill'=>color,
+ TkcText.new(w,488.5,'184', 'text'=>'MShower', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,497,176,513,176,513,204,492,204,492,190,497,190,
+ i = TkcPolygon.new(w,497,176,513,176,513,204,492,204,492,190,497,190,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = 'Closet'
$floorItems['Closet'] = i
- TkcText.new(w,502.5,190, 'text'=>'Closet', 'fill'=>color,
+ TkcText.new(w,502.5,190, 'text'=>'Closet', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,476,237,476,206,513,206,513,254,488,254,488,237,
+ i = TkcPolygon.new(w,476,237,476,206,513,206,513,254,488,254,488,237,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = 'WShower'
$floorItems['WShower'] = i
- TkcText.new(w,494.5,230, 'text'=>'WShower', 'fill'=>color,
+ TkcText.new(w,494.5,230, 'text'=>'WShower', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
i = TkcPolygon.new(w,486,131,558,131,558,135,724,135,724,166,
697,166,697,275,553,275,531,254,515,254,
- 515,174,503,174,503,161,486,161,
+ 515,174,503,174,503,161,486,161,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '130'
$floorItems['130'] = i
- TkcText.new(w,638.5,205, 'text'=>'130', 'fill'=>color,
+ TkcText.new(w,638.5,205, 'text'=>'130', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
i = TkcPolygon.new(w,308,242,339,242,339,248,342,248,
342,246,397,246,397,276,393,276,
- 393,309,300,309,300,248,308,248,
+ 393,309,300,309,300,248,308,248,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '102'
$floorItems['102'] = i
- TkcText.new(w,367.5,278.5, 'text'=>'102', 'fill'=>color,
+ TkcText.new(w,367.5,278.5, 'text'=>'102', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,397,255,486,255,486,276,397,276,
+ i = TkcPolygon.new(w,397,255,486,255,486,276,397,276,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '128'
$floorItems['128'] = i
- TkcText.new(w,441.5,265.5, 'text'=>'128', 'fill'=>color,
+ TkcText.new(w,441.5,265.5, 'text'=>'128', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
i = TkcPolygon.new(w,510,309,486,309,486,255,530,255,
552,277,561,277,561,325,510,325,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '129'
$floorItems['129'] = i
- TkcText.new(w,535.5,293, 'text'=>'129', 'fill'=>color,
+ TkcText.new(w,535.5,293, 'text'=>'129', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
i = TkcPolygon.new(w,696,281,740,281,740,387,642,387,
- 642,389,561,389,561,277,696,277,
+ 642,389,561,389,561,277,696,277,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '133'
$floorItems['133'] = i
- TkcText.new(w,628.5,335, 'text'=>'133', 'fill'=>color,
+ TkcText.new(w,628.5,335, 'text'=>'133', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,742,387,742,281,800,281,800,387,
+ i = TkcPolygon.new(w,742,387,742,281,800,281,800,387,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '132'
$floorItems['132'] = i
- TkcText.new(w,771,334, 'text'=>'132', 'fill'=>color,
+ TkcText.new(w,771,334, 'text'=>'132', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,800,168,800,280,699,280,699,168,
+ i = TkcPolygon.new(w,800,168,800,280,699,280,699,168,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '134'
$floorItems['134'] = i
- TkcText.new(w,749.5,224, 'text'=>'134', 'fill'=>color,
+ TkcText.new(w,749.5,224, 'text'=>'134', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,726,131,726,166,800,166,800,131,
+ i = TkcPolygon.new(w,726,131,726,166,800,166,800,131,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '135'
$floorItems['135'] = i
- TkcText.new(w,763,148.5, 'text'=>'135', 'fill'=>color,
+ TkcText.new(w,763,148.5, 'text'=>'135', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
i = TkcPolygon.new(w,340,360,335,363,331,365,326,366,304,366,
304,312,396,312,396,288,400,288,404,288,
409,290,413,292,418,297,421,302,422,309,
421,318,417,325,411,330,405,332,397,333,
344,333,340,334,336,336,335,338,332,342,
- 331,347,332,351,334,354,336,357,341,359,
+ 331,347,332,351,334,354,336,357,341,359,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = 'Ramona Stair'
$floorItems['Ramona Stair'] = i
- TkcText.new(w,368,323, 'text'=>'Ramona Stair', 'fill'=>color,
+ TkcText.new(w,368,323, 'text'=>'Ramona Stair', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
i = TkcPolygon.new(w,30,23,30,5,93,5,98,5,104,7,110,10,116,16,119,20,
- 122,28,123,32,123,68,220,68,220,87,90,87,90,23,
+ 122,28,123,32,123,68,220,68,220,87,90,87,90,23,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = 'University Stair'
$floorItems['University Stair'] = i
- TkcText.new(w,155,77.5, 'text'=>'University Stair', 'fill'=>color,
+ TkcText.new(w,155,77.5, 'text'=>'University Stair', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
i = TkcPolygon.new(w,282,37,295,40,312,49,323,56,337,70,352,56,
358,48,363,39,365,29,348,25,335,22,321,14,
300,5,283,1,260,0,246,0,242,2,236,4,231,8,
- 227,13,223,17,221,22,220,34,260,34,
+ 227,13,223,17,221,22,220,34,260,34,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = 'Plaza Stair'
$floorItems['Plaza Stair'] = i
- TkcText.new(w,317.5,28.5, 'text'=>'Plaza Stair', 'fill'=>color,
+ TkcText.new(w,317.5,28.5, 'text'=>'Plaza Stair', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
i = TkcPolygon.new(w,220,34,260,34,282,37,295,40,312,49,
323,56,337,70,350,83,365,94,377,100,
- 386,104,386,128,220,128,
+ 386,104,386,128,220,128,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = 'Plaza Deck'
$floorItems['Plaza Deck'] = i
- TkcText.new(w,303,81, 'text'=>'Plaza Deck', 'fill'=>color,
+ TkcText.new(w,303,81, 'text'=>'Plaza Deck', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
i = TkcPolygon.new(w,257,336,77,336,6,336,6,301,77,301,77,310,257,310,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '106'
$floorItems['106'] = i
- TkcText.new(w,131.5,318.5, 'text'=>'106', 'fill'=>color,
+ TkcText.new(w,131.5,318.5, 'text'=>'106', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
i = TkcPolygon.new(w,146,110,162,110,162,91,130,91,130,115,95,115,
95,128,114,128,114,151,157,151,157,153,112,153,
- 112,130,97,130,97,168,175,168,175,131,146,131,
+ 112,130,97,130,97,168,175,168,175,131,146,131,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels[i.id] = '119'
$floorItems['119'] = i
- TkcText.new(w,143.5,133, 'text'=>'119', 'fill'=>color,
+ TkcText.new(w,143.5,133, 'text'=>'119', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
TkcLine.new(w,155,191,155,189, 'fill'=>color, 'tags'=>['floor1','wall'])
TkcLine.new(w,155,177,155,169, 'fill'=>color, 'tags'=>['floor1','wall'])
@@ -795,321 +795,321 @@ end
def floor_fg2(w,color)
i = TkcPolygon.new(w,748,188,755,188,755,205,758,205,758,222,
- 800,222,800,168,748,168,
+ 800,222,800,168,748,168,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '238'
$floorItems['238'] = i
- TkcText.new(w,774,195, 'text'=>'238', 'fill'=>color,
+ TkcText.new(w,774,195, 'text'=>'238', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
i = TkcPolygon.new(w,726,188,746,188,746,166,800,166,800,131,726,131,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '237'
$floorItems['237'] = i
- TkcText.new(w,763,148.5, 'text'=>'237', 'fill'=>color,
+ TkcText.new(w,763,148.5, 'text'=>'237', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
i = TkcPolygon.new(w,497,187,497,204,559,204,559,324,641,324,
643,324,643,291,641,291,641,205,696,205,
696,291,694,291,694,314,715,314,715,291,
- 715,205,755,205,755,190,724,190,724,187,
+ 715,205,755,205,755,190,724,190,724,187,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '246'
$floorItems['246'] = i
- TkcText.new(w,600,264, 'text'=>'246', 'fill'=>color,
+ TkcText.new(w,600,264, 'text'=>'246', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,694,279,643,279,643,314,694,314,
+ i = TkcPolygon.new(w,694,279,643,279,643,314,694,314,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '247'
$floorItems['247'] = i
- TkcText.new(w,668.5,296.5, 'text'=>'247', 'fill'=>color,
+ TkcText.new(w,668.5,296.5, 'text'=>'247', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
i = TkcPolygon.new(w,232,250,308,250,308,242,339,242,339,246,
397,246,397,255,476,255,476,250,482,250,559,250,
- 559,274,482,274,482,278,396,278,396,274,232,274,
+ 559,274,482,274,482,278,396,278,396,274,232,274,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '202'
$floorItems['202'] = i
- TkcText.new(w,285.5,260, 'text'=>'202', 'fill'=>color,
+ TkcText.new(w,285.5,260, 'text'=>'202', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
i = TkcPolygon.new(w,53,228,53,338,176,338,233,338,233,196,
306,196,306,180,175,180,175,169,156,169,
- 156,196,176,196,176,228,
+ 156,196,176,196,176,228,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '206'
$floorItems['206'] = i
- TkcText.new(w,143,267, 'text'=>'206', 'fill'=>color,
+ TkcText.new(w,143,267, 'text'=>'206', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,51,277,6,277,6,338,51,338,
+ i = TkcPolygon.new(w,51,277,6,277,6,338,51,338,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '212'
$floorItems['212'] = i
- TkcText.new(w,28.5,307.5, 'text'=>'212', 'fill'=>color,
+ TkcText.new(w,28.5,307.5, 'text'=>'212', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,557,276,486,276,486,309,510,309,510,325,557,325,
+ i = TkcPolygon.new(w,557,276,486,276,486,309,510,309,510,325,557,325,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '245'
$floorItems['245'] = i
- TkcText.new(w,521.5,300.5, 'text'=>'245', 'fill'=>color,
+ TkcText.new(w,521.5,300.5, 'text'=>'245', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,560,389,599,389,599,326,560,326,
+ i = TkcPolygon.new(w,560,389,599,389,599,326,560,326,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '244'
$floorItems['244'] = i
- TkcText.new(w,579.5,357.5, 'text'=>'244', 'fill'=>color,
+ TkcText.new(w,579.5,357.5, 'text'=>'244', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,601,389,601,326,643,326,643,389,
+ i = TkcPolygon.new(w,601,389,601,326,643,326,643,389,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '243'
$floorItems['243'] = i
- TkcText.new(w,622,357.5, 'text'=>'243', 'fill'=>color,
+ TkcText.new(w,622,357.5, 'text'=>'243', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,688,316,645,316,645,365,688,365,
+ i = TkcPolygon.new(w,688,316,645,316,645,365,688,365,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '242'
$floorItems['242'] = i
- TkcText.new(w,666.5,340.5, 'text'=>'242', 'fill'=>color,
+ TkcText.new(w,666.5,340.5, 'text'=>'242', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,802,367,759,367,759,226,802,226,
+ i = TkcPolygon.new(w,802,367,759,367,759,226,802,226,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = 'Barbecue Deck'
$floorItems['Barbecue Deck'] = i
- TkcText.new(w,780.5,296.5, 'text'=>'Barbecue Deck', 'fill'=>color,
+ TkcText.new(w,780.5,296.5, 'text'=>'Barbecue Deck', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,755,262,755,314,717,314,717,262,
+ i = TkcPolygon.new(w,755,262,755,314,717,314,717,262,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '240'
$floorItems['240'] = i
- TkcText.new(w,736,288, 'text'=>'240', 'fill'=>color,
+ TkcText.new(w,736,288, 'text'=>'240', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,755,316,689,316,689,365,755,365,
+ i = TkcPolygon.new(w,755,316,689,316,689,365,755,365,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '241'
$floorItems['241'] = i
- TkcText.new(w,722,340.5, 'text'=>'241', 'fill'=>color,
+ TkcText.new(w,722,340.5, 'text'=>'241', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,755,206,717,206,717,261,755,261,
+ i = TkcPolygon.new(w,755,206,717,206,717,261,755,261,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '239'
$floorItems['239'] = i
- TkcText.new(w,736,233.5, 'text'=>'239', 'fill'=>color,
+ TkcText.new(w,736,233.5, 'text'=>'239', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,695,277,643,277,643,206,695,206,
+ i = TkcPolygon.new(w,695,277,643,277,643,206,695,206,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '248'
$floorItems['248'] = i
- TkcText.new(w,669,241.5, 'text'=>'248', 'fill'=>color,
+ TkcText.new(w,669,241.5, 'text'=>'248', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,676,135,676,185,724,185,724,135,
+ i = TkcPolygon.new(w,676,135,676,185,724,185,724,135,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '236'
$floorItems['236'] = i
- TkcText.new(w,700,160, 'text'=>'236', 'fill'=>color,
+ TkcText.new(w,700,160, 'text'=>'236', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,675,135,635,135,635,145,628,145,628,185,675,185,
+ i = TkcPolygon.new(w,675,135,635,135,635,145,628,145,628,185,675,185,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '235'
$floorItems['235'] = i
- TkcText.new(w,651.5,160, 'text'=>'235', 'fill'=>color,
+ TkcText.new(w,651.5,160, 'text'=>'235', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
i = TkcPolygon.new(w,626,143,633,143,633,135,572,135,
- 572,143,579,143,579,185,626,185,
+ 572,143,579,143,579,185,626,185,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '234'
$floorItems['234'] = i
- TkcText.new(w,606,160, 'text'=>'234', 'fill'=>color,
+ TkcText.new(w,606,160, 'text'=>'234', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
i = TkcPolygon.new(w,557,135,571,135,571,145,578,145,
- 578,185,527,185,527,131,557,131,
+ 578,185,527,185,527,131,557,131,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '233'
$floorItems['233'] = i
- TkcText.new(w,552.5,158, 'text'=>'233', 'fill'=>color,
+ TkcText.new(w,552.5,158, 'text'=>'233', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
i = TkcPolygon.new(w,476,249,557,249,557,205,476,205,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '230'
$floorItems['230'] = i
- TkcText.new(w,516.5,227, 'text'=>'230', 'fill'=>color,
+ TkcText.new(w,516.5,227, 'text'=>'230', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,476,164,486,164,486,131,525,131,525,185,476,185,
+ i = TkcPolygon.new(w,476,164,486,164,486,131,525,131,525,185,476,185,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '232'
$floorItems['232'] = i
- TkcText.new(w,500.5,158, 'text'=>'232', 'fill'=>color,
+ TkcText.new(w,500.5,158, 'text'=>'232', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,476,186,495,186,495,204,476,204,
+ i = TkcPolygon.new(w,476,186,495,186,495,204,476,204,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '229'
$floorItems['229'] = i
- TkcText.new(w,485.5,195, 'text'=>'229', 'fill'=>color,
+ TkcText.new(w,485.5,195, 'text'=>'229', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,474,207,409,207,409,187,399,187,399,164,474,164,
+ i = TkcPolygon.new(w,474,207,409,207,409,187,399,187,399,164,474,164,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '227'
$floorItems['227'] = i
- TkcText.new(w,436.5,185.5, 'text'=>'227', 'fill'=>color,
+ TkcText.new(w,436.5,185.5, 'text'=>'227', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,399,228,399,253,474,253,474,209,409,209,409,228,
+ i = TkcPolygon.new(w,399,228,399,253,474,253,474,209,409,209,409,228,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '228'
$floorItems['228'] = i
- TkcText.new(w,436.5,231, 'text'=>'228', 'fill'=>color,
+ TkcText.new(w,436.5,231, 'text'=>'228', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,397,246,397,226,407,226,407,189,377,189,377,246,
+ i = TkcPolygon.new(w,397,246,397,226,407,226,407,189,377,189,377,246,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '226'
$floorItems['226'] = i
- TkcText.new(w,392,217.5, 'text'=>'226', 'fill'=>color,
+ TkcText.new(w,392,217.5, 'text'=>'226', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,377,169,316,169,316,131,397,131,397,188,377,188,
+ i = TkcPolygon.new(w,377,169,316,169,316,131,397,131,397,188,377,188,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '225'
$floorItems['225'] = i
- TkcText.new(w,356.5,150, 'text'=>'225', 'fill'=>color,
+ TkcText.new(w,356.5,150, 'text'=>'225', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,234,198,306,198,306,249,234,249,
+ i = TkcPolygon.new(w,234,198,306,198,306,249,234,249,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '224'
$floorItems['224'] = i
- TkcText.new(w,270,223.5, 'text'=>'224', 'fill'=>color,
+ TkcText.new(w,270,223.5, 'text'=>'224', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,270,179,306,179,306,170,314,170,314,135,270,135,
+ i = TkcPolygon.new(w,270,179,306,179,306,170,314,170,314,135,270,135,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '223'
$floorItems['223'] = i
- TkcText.new(w,292,157, 'text'=>'223', 'fill'=>color,
+ TkcText.new(w,292,157, 'text'=>'223', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,268,179,221,179,221,135,268,135,
+ i = TkcPolygon.new(w,268,179,221,179,221,135,268,135,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '222'
$floorItems['222'] = i
- TkcText.new(w,244.5,157, 'text'=>'222', 'fill'=>color,
+ TkcText.new(w,244.5,157, 'text'=>'222', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,177,179,219,179,219,135,177,135,
+ i = TkcPolygon.new(w,177,179,219,179,219,135,177,135,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '221'
$floorItems['221'] = i
- TkcText.new(w,198,157, 'text'=>'221', 'fill'=>color,
+ TkcText.new(w,198,157, 'text'=>'221', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,299,327,349,327,349,284,341,284,341,276,299,276,
+ i = TkcPolygon.new(w,299,327,349,327,349,284,341,284,341,276,299,276,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '204'
$floorItems['204'] = i
- TkcText.new(w,324,301.5, 'text'=>'204', 'fill'=>color,
+ TkcText.new(w,324,301.5, 'text'=>'204', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,234,276,297,276,297,327,257,327,257,338,234,338,
+ i = TkcPolygon.new(w,234,276,297,276,297,327,257,327,257,338,234,338,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '205'
$floorItems['205'] = i
- TkcText.new(w,265.5,307, 'text'=>'205', 'fill'=>color,
+ TkcText.new(w,265.5,307, 'text'=>'205', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
i = TkcPolygon.new(w,256,385,256,340,212,340,212,385,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '207'
$floorItems['207'] = i
- TkcText.new(w,234,362.5, 'text'=>'207', 'fill'=>color,
+ TkcText.new(w,234,362.5, 'text'=>'207', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,210,340,164,340,164,385,210,385,
+ i = TkcPolygon.new(w,210,340,164,340,164,385,210,385,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '208'
$floorItems['208'] = i
- TkcText.new(w,187,362.5, 'text'=>'208', 'fill'=>color,
+ TkcText.new(w,187,362.5, 'text'=>'208', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,115,340,162,340,162,385,115,385,
+ i = TkcPolygon.new(w,115,340,162,340,162,385,115,385,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '209'
$floorItems['209'] = i
- TkcText.new(w,138.5,362.5, 'text'=>'209', 'fill'=>color,
+ TkcText.new(w,138.5,362.5, 'text'=>'209', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,89,228,89,156,53,156,53,228,
+ i = TkcPolygon.new(w,89,228,89,156,53,156,53,228,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '217'
$floorItems['217'] = i
- TkcText.new(w,71,192, 'text'=>'217', 'fill'=>color,
+ TkcText.new(w,71,192, 'text'=>'217', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,89,169,97,169,97,190,89,190,
+ i = TkcPolygon.new(w,89,169,97,169,97,190,89,190,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '217A'
$floorItems['217A'] = i
- TkcText.new(w,93,179.5, 'text'=>'217A', 'fill'=>color,
+ TkcText.new(w,93,179.5, 'text'=>'217A', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,89,156,89,168,95,168,95,135,53,135,53,156,
+ i = TkcPolygon.new(w,89,156,89,168,95,168,95,135,53,135,53,156,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '216'
$floorItems['216'] = i
- TkcText.new(w,71,145.5, 'text'=>'216', 'fill'=>color,
+ TkcText.new(w,71,145.5, 'text'=>'216', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,51,179,51,135,6,135,6,179,
+ i = TkcPolygon.new(w,51,179,51,135,6,135,6,179,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '215'
$floorItems['215'] = i
- TkcText.new(w,28.5,157, 'text'=>'215', 'fill'=>color,
+ TkcText.new(w,28.5,157, 'text'=>'215', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,51,227,6,227,6,180,51,180,
+ i = TkcPolygon.new(w,51,227,6,227,6,180,51,180,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '214'
$floorItems['214'] = i
- TkcText.new(w,28.5,203.5, 'text'=>'214', 'fill'=>color,
+ TkcText.new(w,28.5,203.5, 'text'=>'214', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,51,275,6,275,6,229,51,229,
+ i = TkcPolygon.new(w,51,275,6,275,6,229,51,229,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '213'
$floorItems['213'] = i
- TkcText.new(w,28.5,252, 'text'=>'213', 'fill'=>color,
+ TkcText.new(w,28.5,252, 'text'=>'213', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,114,340,67,340,67,385,114,385,
+ i = TkcPolygon.new(w,114,340,67,340,67,385,114,385,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '210'
$floorItems['210'] = i
- TkcText.new(w,90.5,362.5, 'text'=>'210', 'fill'=>color,
+ TkcText.new(w,90.5,362.5, 'text'=>'210', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,59,389,59,385,65,385,65,340,1,340,1,389,
+ i = TkcPolygon.new(w,59,389,59,385,65,385,65,340,1,340,1,389,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '211'
$floorItems['211'] = i
- TkcText.new(w,33,364.5, 'text'=>'211', 'fill'=>color,
+ TkcText.new(w,33,364.5, 'text'=>'211', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,393,309,350,309,350,282,342,282,342,276,393,276,
+ i = TkcPolygon.new(w,393,309,350,309,350,282,342,282,342,276,393,276,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '203'
$floorItems['203'] = i
- TkcText.new(w,367.5,292.5, 'text'=>'203', 'fill'=>color,
+ TkcText.new(w,367.5,292.5, 'text'=>'203', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
i = TkcPolygon.new(w,99,191,91,191,91,226,174,226,174,198,
- 154,198,154,192,109,192,109,169,99,169,
+ 154,198,154,192,109,192,109,169,99,169,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '220'
$floorItems['220'] = i
- TkcText.new(w,132.5,208.5, 'text'=>'220', 'fill'=>color,
+ TkcText.new(w,132.5,208.5, 'text'=>'220', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,339,205,307,205,307,171,339,171,
+ i = TkcPolygon.new(w,339,205,307,205,307,171,339,171,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = 'Priv Lift2'
$floorItems['Priv Lift2'] = i
- TkcText.new(w,323,188, 'text'=>'Priv Lift2', 'fill'=>color,
+ TkcText.new(w,323,188, 'text'=>'Priv Lift2', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,307,240,339,240,339,206,307,206,
+ i = TkcPolygon.new(w,307,240,339,240,339,206,307,206,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = 'Pub Lift 2'
$floorItems['Pub Lift 2'] = i
- TkcText.new(w,323,223, 'text'=>'Pub Lift 2', 'fill'=>color,
+ TkcText.new(w,323,223, 'text'=>'Pub Lift 2', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,175,168,97,168,97,131,175,131,
+ i = TkcPolygon.new(w,175,168,97,168,97,131,175,131,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '218'
$floorItems['218'] = i
- TkcText.new(w,136,149.5, 'text'=>'218', 'fill'=>color,
+ TkcText.new(w,136,149.5, 'text'=>'218', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,154,191,111,191,111,169,154,169,
+ i = TkcPolygon.new(w,154,191,111,191,111,169,154,169,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '219'
$floorItems['219'] = i
- TkcText.new(w,132.5,180, 'text'=>'219', 'fill'=>color,
+ TkcText.new(w,132.5,180, 'text'=>'219', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,375,246,375,172,341,172,341,246,
+ i = TkcPolygon.new(w,375,246,375,172,341,172,341,246,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels[i.id] = '201'
$floorItems['201'] = i
- TkcText.new(w,358,209, 'text'=>'201', 'fill'=>color,
+ TkcText.new(w,358,209, 'text'=>'201', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
TkcLine.new(w,641,186,678,186, 'fill'=>color, 'tags'=>['floor2','wall'])
TkcLine.new(w,757,350,757,367, 'fill'=>color, 'tags'=>['floor2','wall'])
@@ -1280,206 +1280,206 @@ def floor_fg3(w,color)
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = '316'
$floorItems['316'] = i
- TkcText.new(w,79.5,204, 'text'=>'316', 'fill'=>color,
+ TkcText.new(w,79.5,204, 'text'=>'316', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,115,368,162,368,162,323,115,323,
+ i = TkcPolygon.new(w,115,368,162,368,162,323,115,323,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = '309'
$floorItems['309'] = i
- TkcText.new(w,138.5,345.5, 'text'=>'309', 'fill'=>color,
+ TkcText.new(w,138.5,345.5, 'text'=>'309', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,164,323,164,368,211,368,211,323,
+ i = TkcPolygon.new(w,164,323,164,368,211,368,211,323,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = '308'
$floorItems['308'] = i
- TkcText.new(w,187.5,345.5, 'text'=>'308', 'fill'=>color,
+ TkcText.new(w,187.5,345.5, 'text'=>'308', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,256,368,212,368,212,323,256,323,
+ i = TkcPolygon.new(w,256,368,212,368,212,323,256,323,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = '307'
$floorItems['307'] = i
- TkcText.new(w,234,345.5, 'text'=>'307', 'fill'=>color,
+ TkcText.new(w,234,345.5, 'text'=>'307', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,244,276,297,276,297,327,260,327,260,321,244,321,
+ i = TkcPolygon.new(w,244,276,297,276,297,327,260,327,260,321,244,321,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = '305'
$floorItems['305'] = i
- TkcText.new(w,270.5,301.5, 'text'=>'305', 'fill'=>color,
+ TkcText.new(w,270.5,301.5, 'text'=>'305', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
i = TkcPolygon.new(w,251,219,251,203,244,203,244,219,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = '324B'
$floorItems['324B'] = i
- TkcText.new(w,247.5,211, 'text'=>'324B', 'fill'=>color,
+ TkcText.new(w,247.5,211, 'text'=>'324B', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,251,249,244,249,244,232,251,232,
+ i = TkcPolygon.new(w,251,249,244,249,244,232,251,232,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = '324A'
$floorItems['324A'] = i
- TkcText.new(w,247.5,240.5, 'text'=>'324A', 'fill'=>color,
+ TkcText.new(w,247.5,240.5, 'text'=>'324A', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,223,135,223,179,177,179,177,135,
+ i = TkcPolygon.new(w,223,135,223,179,177,179,177,135,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = '320'
$floorItems['320'] = i
- TkcText.new(w,200,157, 'text'=>'320', 'fill'=>color,
+ TkcText.new(w,200,157, 'text'=>'320', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,114,368,114,323,67,323,67,368,
+ i = TkcPolygon.new(w,114,368,114,323,67,323,67,368,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = '310'
$floorItems['310'] = i
- TkcText.new(w,90.5,345.5, 'text'=>'310', 'fill'=>color,
+ TkcText.new(w,90.5,345.5, 'text'=>'310', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,23,277,23,321,68,321,68,277,
+ i = TkcPolygon.new(w,23,277,23,321,68,321,68,277,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = '312'
$floorItems['312'] = i
- TkcText.new(w,45.5,299, 'text'=>'312', 'fill'=>color,
+ TkcText.new(w,45.5,299, 'text'=>'312', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,23,229,68,229,68,275,23,275,
+ i = TkcPolygon.new(w,23,229,68,229,68,275,23,275,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = '313'
$floorItems['313'] = i
- TkcText.new(w,45.5,252, 'text'=>'313', 'fill'=>color,
+ TkcText.new(w,45.5,252, 'text'=>'313', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,68,227,23,227,23,180,68,180,
+ i = TkcPolygon.new(w,68,227,23,227,23,180,68,180,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = '314'
$floorItems['314'] = i
- TkcText.new(w,40.5,203.5, 'text'=>'314', 'fill'=>color,
+ TkcText.new(w,40.5,203.5, 'text'=>'314', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,95,179,95,135,23,135,23,179,
+ i = TkcPolygon.new(w,95,179,95,135,23,135,23,179,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = '315'
$floorItems['315'] = i
- TkcText.new(w,59,157, 'text'=>'315', 'fill'=>color,
+ TkcText.new(w,59,157, 'text'=>'315', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,99,226,99,204,91,204,91,226,
+ i = TkcPolygon.new(w,99,226,99,204,91,204,91,226,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = '316B'
$floorItems['316B'] = i
- TkcText.new(w,95,215, 'text'=>'316B', 'fill'=>color,
+ TkcText.new(w,95,215, 'text'=>'316B', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,91,202,99,202,99,180,91,180,
+ i = TkcPolygon.new(w,91,202,99,202,99,180,91,180,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = '316A'
$floorItems['316A'] = i
- TkcText.new(w,95,191, 'text'=>'316A', 'fill'=>color,
+ TkcText.new(w,95,191, 'text'=>'316A', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
i = TkcPolygon.new(w,97,169,109,169,109,192,154,192,154,198,
- 174,198,174,226,101,226,101,179,97,179,
+ 174,198,174,226,101,226,101,179,97,179,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = '319'
$floorItems['319'] = i
- TkcText.new(w,141.5,209, 'text'=>'319', 'fill'=>color,
+ TkcText.new(w,141.5,209, 'text'=>'319', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,65,368,58,368,58,389,1,389,1,333,23,333,23,323,65,323,
+ i = TkcPolygon.new(w,65,368,58,368,58,389,1,389,1,333,23,333,23,323,65,323,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = '311'
$floorItems['311'] = i
- TkcText.new(w,29.5,361, 'text'=>'311', 'fill'=>color,
+ TkcText.new(w,29.5,361, 'text'=>'311', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,154,191,111,191,111,169,154,169,
+ i = TkcPolygon.new(w,154,191,111,191,111,169,154,169,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = '318'
$floorItems['318'] = i
- TkcText.new(w,132.5,180, 'text'=>'318', 'fill'=>color,
+ TkcText.new(w,132.5,180, 'text'=>'318', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,175,168,97,168,97,131,175,131,
+ i = TkcPolygon.new(w,175,168,97,168,97,131,175,131,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = '317'
$floorItems['317'] = i
- TkcText.new(w,136,149.5, 'text'=>'317', 'fill'=>color,
+ TkcText.new(w,136,149.5, 'text'=>'317', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,274,194,274,221,306,221,306,194,
+ i = TkcPolygon.new(w,274,194,274,221,306,221,306,194,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = '323'
$floorItems['323'] = i
- TkcText.new(w,290,207.5, 'text'=>'323', 'fill'=>color,
+ TkcText.new(w,290,207.5, 'text'=>'323', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,306,222,274,222,274,249,306,249,
+ i = TkcPolygon.new(w,306,222,274,222,274,249,306,249,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = '325'
$floorItems['325'] = i
- TkcText.new(w,290,235.5, 'text'=>'325', 'fill'=>color,
+ TkcText.new(w,290,235.5, 'text'=>'325', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,263,179,224,179,224,135,263,135,
+ i = TkcPolygon.new(w,263,179,224,179,224,135,263,135,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = '321'
$floorItems['321'] = i
- TkcText.new(w,243.5,157, 'text'=>'321', 'fill'=>color,
+ TkcText.new(w,243.5,157, 'text'=>'321', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
i = TkcPolygon.new(w,314,169,306,169,306,192,273,192,
- 264,181,264,135,314,135,
+ 264,181,264,135,314,135,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = '322'
$floorItems['322'] = i
- TkcText.new(w,293.5,163.5, 'text'=>'322', 'fill'=>color,
+ TkcText.new(w,293.5,163.5, 'text'=>'322', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,307,240,339,240,339,206,307,206,
+ i = TkcPolygon.new(w,307,240,339,240,339,206,307,206,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = 'Pub Lift3'
$floorItems['Pub Lift3'] = i
- TkcText.new(w,323,223, 'text'=>'Pub Lift3', 'fill'=>color,
+ TkcText.new(w,323,223, 'text'=>'Pub Lift3', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,339,205,307,205,307,171,339,171,
+ i = TkcPolygon.new(w,339,205,307,205,307,171,339,171,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = 'Priv Lift3'
$floorItems['Priv Lift3'] = i
- TkcText.new(w,323,188, 'text'=>'Priv Lift3', 'fill'=>color,
+ TkcText.new(w,323,188, 'text'=>'Priv Lift3', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,350,284,376,284,376,276,397,276,397,309,350,309,
+ i = TkcPolygon.new(w,350,284,376,284,376,276,397,276,397,309,350,309,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = '303'
$floorItems['303'] = i
- TkcText.new(w,373.5,292.5, 'text'=>'303', 'fill'=>color,
+ TkcText.new(w,373.5,292.5, 'text'=>'303', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
i = TkcPolygon.new(w,272,203,272,249,252,249,252,230,
- 244,230,244,221,252,221,252,203,
+ 244,230,244,221,252,221,252,203,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = '324'
$floorItems['324'] = i
- TkcText.new(w,262,226, 'text'=>'324', 'fill'=>color,
+ TkcText.new(w,262,226, 'text'=>'324', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,299,276,299,327,349,327,349,284,341,284,341,276,
+ i = TkcPolygon.new(w,299,276,299,327,349,327,349,284,341,284,341,276,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = '304'
$floorItems['304'] = i
- TkcText.new(w,324,301.5, 'text'=>'304', 'fill'=>color,
+ TkcText.new(w,324,301.5, 'text'=>'304', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,375,246,375,172,341,172,341,246,
+ i = TkcPolygon.new(w,375,246,375,172,341,172,341,246,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = '301'
$floorItems['301'] = i
- TkcText.new(w,358,209, 'text'=>'301', 'fill'=>color,
+ TkcText.new(w,358,209, 'text'=>'301', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,397,246,377,246,377,185,397,185,
+ i = TkcPolygon.new(w,397,246,377,246,377,185,397,185,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = '327'
$floorItems['327'] = i
- TkcText.new(w,387,215.5, 'text'=>'327', 'fill'=>color,
+ TkcText.new(w,387,215.5, 'text'=>'327', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,316,131,316,169,377,169,377,185,397,185,397,131,
+ i = TkcPolygon.new(w,316,131,316,169,377,169,377,185,397,185,397,131,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = '326'
$floorItems['326'] = i
- TkcText.new(w,365.5,150, 'text'=>'326', 'fill'=>color,
+ TkcText.new(w,365.5,150, 'text'=>'326', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
i = TkcPolygon.new(w,308,251,242,251,242,274,342,274,342,282,375, 282,
- 375,274,397,274,397,248,339,248,339,242,308,242,
+ 375,274,397,274,397,248,339,248,339,242,308,242,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = '302'
$floorItems['302'] = i
- TkcText.new(w,319.5,261, 'text'=>'302', 'fill'=>color,
+ TkcText.new(w,319.5,261, 'text'=>'302', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
i = TkcPolygon.new(w,70,321,242,321,242,200,259,200,259,203,272,203,
272,193,263,180,242,180,175,180,175,169,156,169,
156,196,177,196,177,228,107,228,70,228,70,275,107,275,
- 107,248,160,248,160,301,107,301,107,275,70,275,
+ 107,248,160,248,160,301,107,301,107,275,70,275,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels[i.id] = '306'
$floorItems['306'] = i
- TkcText.new(w,200.5,284.5, 'text'=>'306', 'fill'=>color,
+ TkcText.new(w,200.5,284.5, 'text'=>'306', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
TkcLine.new(w,341,275,341,283, 'fill'=>color, 'tags'=>['floor3','wall'])
TkcLine.new(w,162,197,155,197, 'fill'=>color, 'tags'=>['floor3','wall'])
@@ -1574,7 +1574,7 @@ end
# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($floor_demo) && $floor_demo
- $floor_demo.destroy
+ $floor_demo.destroy
$floor_demo = nil
end
@@ -1590,7 +1590,7 @@ $floor_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($floor_demo).pack(:fill=>:both, :expand=>true)
# label À¸À®
-TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'8i', 'justify'=>'left',
+TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'8i', 'justify'=>'left',
'text'=>"¤³¤Î¥¦¥£¥ó¥É¥¦¤Ë¤Ï¥Ç¥£¥¸¥¿¥ë¥¨¥¯¥¤¥Ã¥×¥á¥ó¥È¼Ò¤Î¥¦¥§¥¹¥¿¥ó¥ê¥µ¡¼¥Á¥é¥Ü¥é¥È¥ê (DECWRL) ¤Î´Ö¼è¤ê¤¬½ñ¤«¤ì¤¿¥­¥ã¥ó¥Ð¥¹ widget ¤¬Æþ¤Ã¤Æ¤¤¤Þ¤¹¡£¤³¤ì¤Ï 3³¬·ú¤Æ¤Ç¡¢¾ï¤Ë¤½¤Î¤¦¤Á¤Î1³¬Ê¬¤¬ÁªÂò¡¢¤Ä¤Þ¤ê¤½¤Î´Ö¼è¤ê¤¬É½¼¨¤µ¤ì¤ë¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£¤¢¤ë³¬¤òÁªÂò¤¹¤ë¤Ë¤Ï¡¢¤½¤Î¾å¤Ç¥Þ¥¦¥¹¤Îº¸¥Ü¥¿¥ó¤ò¥¯¥ê¥Ã¥¯¤·¤Æ¤¯¤À¤µ¤¤¡£¥Þ¥¦¥¹¤¬ÁªÂò¤µ¤ì¤Æ¤¤¤ë³¬¤Î¾å¤òư¤¯¤È¡¢¤½¤Î²¼¤Ë¤¢¤ëÉô²°¤Î¿§¤¬ÊѤï¤ê¡¢Éô²°Èֹ椬¡ÖÉô²°ÈÖ¹æ:¡×¥¨¥ó¥È¥ê¤Ëɽ¼¨¤µ¤ì¤Þ¤¹¡£¤Þ¤¿¡¢¥¨¥ó¥È¥ê¤ËÉô²°ÈÖ¹æ¤ò½ñ¤¯¤È¤½¤ÎÉô²°¤Î¿§¤¬ÊѤï¤ê¤Þ¤¹¡£"){
pack('side'=>'top')
}
@@ -1622,10 +1622,10 @@ $floorItems = {}
if $tk_version =~ /^4\.[01]/
$floor_canvas_frame = TkFrame.new(base_frame,'bd'=>2,'relief'=>'sunken',
'highlightthickness'=>2)
- $floor_canvas = TkCanvas.new($floor_canvas_frame,
- 'width'=>900, 'height'=>500, 'borderwidth'=>0,
+ $floor_canvas = TkCanvas.new($floor_canvas_frame,
+ 'width'=>900, 'height'=>500, 'borderwidth'=>0,
'highlightthickness'=>0) {|c|
- TkScrollbar.new(base_frame, 'orient'=>'horiz',
+ TkScrollbar.new(base_frame, 'orient'=>'horiz',
'command'=>proc{|*args| c.xview(*args)}){|hs|
c.xscrollcommand(proc{|first,last| hs.set first,last})
pack('side'=>'bottom', 'fill'=>'x')
@@ -1646,20 +1646,20 @@ else
v = TkScrollbar.new(f, 'highlightthickness'=>0, 'orient'=>'vertical')
TkFrame.new(f, 'bd'=>2, 'relief'=>'sunken') {|f1|
- $floor_canvas = TkCanvas.new(f1, 'width'=>900, 'height'=>500,
- 'borderwidth'=>0,
+ $floor_canvas = TkCanvas.new(f1, 'width'=>900, 'height'=>500,
+ 'borderwidth'=>0,
'highlightthickness'=>0) {
xscrollcommand(proc{|first,last| h.set first,last})
yscrollcommand(proc{|first,last| v.set first,last})
pack('expand'=>'yes', 'fill'=>'both')
}
- grid('padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>0,
+ grid('padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>0,
'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
}
- v.grid('padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>1,
+ v.grid('padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>1,
'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
- h.grid('padx'=>1, 'pady'=>1, 'row'=>1, 'column'=>0,
+ h.grid('padx'=>1, 'pady'=>1, 'row'=>1, 'column'=>0,
'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
TkGrid.rowconfigure(f, 0, 'weight'=>1, 'minsize'=>0)
@@ -1676,7 +1676,7 @@ end
# Create an entry for displaying and typing in current room.
$currentRoom = TkVariable.new
-$floor_entry = TkEntry.new($floor_canvas, 'width'=>10, 'relief'=>'sunken',
+$floor_entry = TkEntry.new($floor_canvas, 'width'=>10, 'relief'=>'sunken',
'bd'=>2, 'textvariable'=>$currentRoom)
# Choose colors, then fill in the floorplan.
@@ -1713,7 +1713,7 @@ $floor_canvas.itembind('floor3', '1', proc{floorDisplay $floor_canvas,3})
$floor_canvas.itembind('room', 'Enter', proc{newRoom $floor_canvas})
$floor_canvas.itembind('room', 'Leave', proc{$currentRoom.value = ''})
$floor_canvas.bind('2', proc{|x,y| $floor_canvas.scan_mark x,y}, '%x %y')
-$floor_canvas.bind('B2-Motion',
+$floor_canvas.bind('B2-Motion',
proc{|x,y| $floor_canvas.scan_dragto x,y}, '%x %y')
$floor_canvas.bind('Destroy', proc{$currentRoom.unset})
$currentRoom.value = ''
diff --git a/ext/tk/sample/demos-jp/floor2.rb b/ext/tk/sample/demos-jp/floor2.rb
index 92ace6b51a..d4381c5543 100644
--- a/ext/tk/sample/demos-jp/floor2.rb
+++ b/ext/tk/sample/demos-jp/floor2.rb
@@ -18,7 +18,7 @@ def floorDisplay2(w,active)
w.delete('all')
$activeFloor2 = active
- # First go through the three floors, displaying the backgrounds for
+ # First go through the three floors, displaying the backgrounds for
# each floor.
floor2_bg1(w,$floor2_colors['bg1'],$floor2_colors['outline1'])
@@ -29,12 +29,12 @@ def floorDisplay2(w,active)
w.raise("floor#{active}")
- # Create a dummy item just to mark this point in the display list,
+ # Create a dummy item just to mark this point in the display list,
# so we can insert highlights here.
w.create(TkcRectangle,0,100,1,101,'fill'=>'','outline'=>'','tags'=>'marker')
- # Add the walls and labels for the active floor, along with
+ # Add the walls and labels for the active floor, along with
# transparent polygons that define the rooms on the floor.
# Make sure that the room polygons are on top.
@@ -299,7 +299,7 @@ def floor2_bg3(w,fill,outline)
w.create(TkcLine,21,331,0,331, 'fill'=>outline, 'tags'=>['floor3','bg'])
w.create(TkcLine,21,331,21,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
w.create(TkcLine,96,133,21,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
- w.create(TkcLine,107,300,159,300,159,248,107,248,107,300,
+ w.create(TkcLine,107,300,159,300,159,248,107,248,107,300,
'fill'=>outline, 'tags'=>['floor3','bg'])
end
@@ -313,316 +313,316 @@ end
# color - Color to use for drawing foreground information.
def floor2_fg1(w,color)
- i = TkcPolygon.new(w,375,246,375,172,341,172,341,246,
+ i = TkcPolygon.new(w,375,246,375,172,341,172,341,246,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '101'
$floorItems2['101'] = i
- w.create(TkcText,358,209, 'text'=>'101', 'fill'=>color,
+ w.create(TkcText,358,209, 'text'=>'101', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,307,240,339,240,339,206,307,206,
+ i = TkcPolygon.new(w,307,240,339,240,339,206,307,206,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = 'Pub Lift1'
$floorItems2['Pub Lift1'] = i
- w.create(TkcText,323,223, 'text'=>'Pub Lift1', 'fill'=>color,
+ w.create(TkcText,323,223, 'text'=>'Pub Lift1', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,339,205,307,205,307,171,339,171,
+ i = TkcPolygon.new(w,339,205,307,205,307,171,339,171,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = 'Priv Lift1'
$floorItems2['Priv Lift1'] = i
- w.create(TkcText,323,188, 'text'=>'Priv Lift1', 'fill'=>color,
+ w.create(TkcText,323,188, 'text'=>'Priv Lift1', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,42,389,42,337,1,337,1,389,
+ i = TkcPolygon.new(w,42,389,42,337,1,337,1,389,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '110'
$floorItems2['110'] = i
- w.create(TkcText,21.5,363, 'text'=>'110', 'fill'=>color,
+ w.create(TkcText,21.5,363, 'text'=>'110', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,59,389,59,385,90,385,90,337,44,337,44,389,
+ i = TkcPolygon.new(w,59,389,59,385,90,385,90,337,44,337,44,389,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '109'
$floorItems2['109'] = i
- w.create(TkcText,67,363, 'text'=>'109', 'fill'=>color,
+ w.create(TkcText,67,363, 'text'=>'109', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,51,300,51,253,6,253,6,300,
+ i = TkcPolygon.new(w,51,300,51,253,6,253,6,300,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '111'
$floorItems2['111'] = i
- w.create(TkcText,28.5,276.5, 'text'=>'111', 'fill'=>color,
+ w.create(TkcText,28.5,276.5, 'text'=>'111', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,98,248,98,309,79,309,79,248,
+ i = TkcPolygon.new(w,98,248,98,309,79,309,79,248,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '117B'
$floorItems2['117B'] = i
- w.create(TkcText,88.5,278.5, 'text'=>'117B', 'fill'=>color,
+ w.create(TkcText,88.5,278.5, 'text'=>'117B', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,51,251,51,204,6,204,6,251,
+ i = TkcPolygon.new(w,51,251,51,204,6,204,6,251,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '112'
$floorItems2['112'] = i
- w.create(TkcText,28.5,227.5, 'text'=>'112', 'fill'=>color,
+ w.create(TkcText,28.5,227.5, 'text'=>'112', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,6,156,51,156,51,203,6,203,
+ i = TkcPolygon.new(w,6,156,51,156,51,203,6,203,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '113'
$floorItems2['113'] = i
- w.create(TkcText,28.5,179.5, 'text'=>'113', 'fill'=>color,
+ w.create(TkcText,28.5,179.5, 'text'=>'113', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,85,169,79,169,79,192,85,192,
+ i = TkcPolygon.new(w,85,169,79,169,79,192,85,192,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '117A'
$floorItems2['117A'] = i
- w.create(TkcText,82,180.5, 'text'=>'117A', 'fill'=>color,
+ w.create(TkcText,82,180.5, 'text'=>'117A', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,77,302,77,168,53,168,53,302,
+ i = TkcPolygon.new(w,77,302,77,168,53,168,53,302,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '117'
$floorItems2['117'] = i
- w.create(TkcText,65,235, 'text'=>'117', 'fill'=>color,
+ w.create(TkcText,65,235, 'text'=>'117', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,51,155,51,115,6,115,6,155,
+ i = TkcPolygon.new(w,51,155,51,115,6,115,6,155,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '114'
$floorItems2['114'] = i
- w.create(TkcText,28.5,135, 'text'=>'114', 'fill'=>color,
+ w.create(TkcText,28.5,135, 'text'=>'114', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,95,115,53,115,53,168,95,168,
+ i = TkcPolygon.new(w,95,115,53,115,53,168,95,168,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '115'
$floorItems2['115'] = i
- w.create(TkcText,74,141.5, 'text'=>'115', 'fill'=>color,
+ w.create(TkcText,74,141.5, 'text'=>'115', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,87,113,87,27,10,27,10,113,
+ i = TkcPolygon.new(w,87,113,87,27,10,27,10,113,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '116'
$floorItems2['116'] = i
- w.create(TkcText,48.5,70, 'text'=>'116', 'fill'=>color,
+ w.create(TkcText,48.5,70, 'text'=>'116', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,89,91,128,91,128,113,89,131,
+ i = TkcPolygon.new(w,89,91,128,91,128,113,89,131,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '118'
$floorItems2['118'] = i
- w.create(TkcText,108.5,102, 'text'=>'118', 'fill'=>color,
+ w.create(TkcText,108.5,102, 'text'=>'118', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
i = TkcPolygon.new(w,178,128,178,132,216,132,216,91,
- 163,91,163,112,149,112,149,128,
+ 163,91,163,112,149,112,149,128,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '120'
$floorItems2['120'] = i
- w.create(TkcText,189.5,111.5, 'text'=>'120', 'fill'=>color,
+ w.create(TkcText,189.5,111.5, 'text'=>'120', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
i = TkcPolygon.new(w,79,193,87,193,87,169,136,169,136,192,
- 156,192,156,169,175,169,175,246,79,246,
+ 156,192,156,169,175,169,175,246,79,246,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '122'
$floorItems2['122'] = i
- w.create(TkcText,131,207.5, 'text'=>'122', 'fill'=>color,
+ w.create(TkcText,131,207.5, 'text'=>'122', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,138,169,154,169,154,191,138,191,
+ i = TkcPolygon.new(w,138,169,154,169,154,191,138,191,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '121'
$floorItems2['121'] = i
- w.create(TkcText,146,180, 'text'=>'121', 'fill'=>color,
+ w.create(TkcText,146,180, 'text'=>'121', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,99,300,126,300,126,309,99,309,
+ i = TkcPolygon.new(w,99,300,126,300,126,309,99,309,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '106A'
$floorItems2['106A'] = i
- w.create(TkcText,112.5,304.5, 'text'=>'106A', 'fill'=>color,
+ w.create(TkcText,112.5,304.5, 'text'=>'106A', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,128,299,128,309,150,309,150,248,99,248,99,299,
+ i = TkcPolygon.new(w,128,299,128,309,150,309,150,248,99,248,99,299,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '105'
$floorItems2['105'] = i
- w.create(TkcText,124.5,278.5, 'text'=>'105', 'fill'=>color,
+ w.create(TkcText,124.5,278.5, 'text'=>'105', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,174,309,174,300,152,300,152,309,
+ i = TkcPolygon.new(w,174,309,174,300,152,300,152,309,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '106B'
$floorItems2['106B'] = i
- w.create(TkcText,163,304.5, 'text'=>'106B', 'fill'=>color,
+ w.create(TkcText,163,304.5, 'text'=>'106B', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,176,299,176,309,216,309,216,248,152,248,152,299,
+ i = TkcPolygon.new(w,176,299,176,309,216,309,216,248,152,248,152,299,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '104'
$floorItems2['104'] = i
- w.create(TkcText,184,278.5, 'text'=>'104', 'fill'=>color,
+ w.create(TkcText,184,278.5, 'text'=>'104', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,138,385,138,337,91,337,91,385,
+ i = TkcPolygon.new(w,138,385,138,337,91,337,91,385,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '108'
$floorItems2['108'] = i
- w.create(TkcText,114.5,361, 'text'=>'108', 'fill'=>color,
+ w.create(TkcText,114.5,361, 'text'=>'108', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,256,337,140,337,140,385,256,385,
+ i = TkcPolygon.new(w,256,337,140,337,140,385,256,385,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '107'
$floorItems2['107'] = i
- w.create(TkcText,198,361, 'text'=>'107', 'fill'=>color,
+ w.create(TkcText,198,361, 'text'=>'107', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,300,353,300,329,260,329,260,353,
+ i = TkcPolygon.new(w,300,353,300,329,260,329,260,353,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = 'Smoking'
$floorItems2['Smoking'] = i
- w.create(TkcText,280,341, 'text'=>'Smoking', 'fill'=>color,
+ w.create(TkcText,280,341, 'text'=>'Smoking', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,314,135,314,170,306,170,306,246,177,246,177,135,
+ i = TkcPolygon.new(w,314,135,314,170,306,170,306,246,177,246,177,135,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '123'
$floorItems2['123'] = i
- w.create(TkcText,245.5,190.5, 'text'=>'123', 'fill'=>color,
+ w.create(TkcText,245.5,190.5, 'text'=>'123', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,217,248,301,248,301,326,257,326,257,310,217,310,
+ i = TkcPolygon.new(w,217,248,301,248,301,326,257,326,257,310,217,310,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '103'
$floorItems2['103'] = i
- w.create(TkcText,259,287, 'text'=>'103', 'fill'=>color,
+ w.create(TkcText,259,287, 'text'=>'103', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,396,188,377,188,377,169,316,169,316,131,396,131,
+ i = TkcPolygon.new(w,396,188,377,188,377,169,316,169,316,131,396,131,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '124'
$floorItems2['124'] = i
- w.create(TkcText,356,150, 'text'=>'124', 'fill'=>color,
+ w.create(TkcText,356,150, 'text'=>'124', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,397,226,407,226,407,189,377,189,377,246,397,246,
+ i = TkcPolygon.new(w,397,226,407,226,407,189,377,189,377,246,397,246,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '125'
$floorItems2['125'] = i
- w.create(TkcText,392,217.5, 'text'=>'125', 'fill'=>color,
+ w.create(TkcText,392,217.5, 'text'=>'125', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,399,187,409,187,409,207,474,207,474,164,399,164,
+ i = TkcPolygon.new(w,399,187,409,187,409,207,474,207,474,164,399,164,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '126'
$floorItems2['126'] = i
- w.create(TkcText,436.5,185.5, 'text'=>'126', 'fill'=>color,
+ w.create(TkcText,436.5,185.5, 'text'=>'126', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
i = TkcPolygon.new(w,409,209,409,229,399,229,399,253,
- 486,253,486,239,474,239,474,209,
+ 486,253,486,239,474,239,474,209,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '127'
$floorItems2['127'] = i
- w.create(TkcText,436.5,'231', 'text'=>'127', 'fill'=>color,
+ w.create(TkcText,436.5,'231', 'text'=>'127', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
i = TkcPolygon.new(w,501,164,501,174,495,174,495,188,
- 490,188,490,204,476,204,476,164,
+ 490,188,490,204,476,204,476,164,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = 'MShower'
$floorItems2['MShower'] = i
- w.create(TkcText,488.5,'184', 'text'=>'MShower', 'fill'=>color,
+ w.create(TkcText,488.5,'184', 'text'=>'MShower', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,497,176,513,176,513,204,492,204,492,190,497,190,
+ i = TkcPolygon.new(w,497,176,513,176,513,204,492,204,492,190,497,190,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = 'Closet'
$floorItems2['Closet'] = i
- w.create(TkcText,502.5,190, 'text'=>'Closet', 'fill'=>color,
+ w.create(TkcText,502.5,190, 'text'=>'Closet', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,476,237,476,206,513,206,513,254,488,254,488,237,
+ i = TkcPolygon.new(w,476,237,476,206,513,206,513,254,488,254,488,237,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = 'WShower'
$floorItems2['WShower'] = i
- w.create(TkcText,494.5,230, 'text'=>'WShower', 'fill'=>color,
+ w.create(TkcText,494.5,230, 'text'=>'WShower', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
i = TkcPolygon.new(w,486,131,558,131,558,135,724,135,724,166,
697,166,697,275,553,275,531,254,515,254,
- 515,174,503,174,503,161,486,161,
+ 515,174,503,174,503,161,486,161,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '130'
$floorItems2['130'] = i
- w.create(TkcText,638.5,205, 'text'=>'130', 'fill'=>color,
+ w.create(TkcText,638.5,205, 'text'=>'130', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
i = TkcPolygon.new(w,308,242,339,242,339,248,342,248,
342,246,397,246,397,276,393,276,
- 393,309,300,309,300,248,308,248,
+ 393,309,300,309,300,248,308,248,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '102'
$floorItems2['102'] = i
- w.create(TkcText,367.5,278.5, 'text'=>'102', 'fill'=>color,
+ w.create(TkcText,367.5,278.5, 'text'=>'102', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,397,255,486,255,486,276,397,276,
+ i = TkcPolygon.new(w,397,255,486,255,486,276,397,276,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '128'
$floorItems2['128'] = i
- w.create(TkcText,441.5,265.5, 'text'=>'128', 'fill'=>color,
+ w.create(TkcText,441.5,265.5, 'text'=>'128', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
i = TkcPolygon.new(w,510,309,486,309,486,255,530,255,
552,277,561,277,561,325,510,325,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '129'
$floorItems2['129'] = i
- w.create(TkcText,535.5,293, 'text'=>'129', 'fill'=>color,
+ w.create(TkcText,535.5,293, 'text'=>'129', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
i = TkcPolygon.new(w,696,281,740,281,740,387,642,387,
- 642,389,561,389,561,277,696,277,
+ 642,389,561,389,561,277,696,277,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '133'
$floorItems2['133'] = i
- w.create(TkcText,628.5,335, 'text'=>'133', 'fill'=>color,
+ w.create(TkcText,628.5,335, 'text'=>'133', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,742,387,742,281,800,281,800,387,
+ i = TkcPolygon.new(w,742,387,742,281,800,281,800,387,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '132'
$floorItems2['132'] = i
- w.create(TkcText,771,334, 'text'=>'132', 'fill'=>color,
+ w.create(TkcText,771,334, 'text'=>'132', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,800,168,800,280,699,280,699,168,
+ i = TkcPolygon.new(w,800,168,800,280,699,280,699,168,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '134'
$floorItems2['134'] = i
- w.create(TkcText,749.5,224, 'text'=>'134', 'fill'=>color,
+ w.create(TkcText,749.5,224, 'text'=>'134', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
- i = TkcPolygon.new(w,726,131,726,166,800,166,800,131,
+ i = TkcPolygon.new(w,726,131,726,166,800,166,800,131,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '135'
$floorItems2['135'] = i
- w.create(TkcText,763,148.5, 'text'=>'135', 'fill'=>color,
+ w.create(TkcText,763,148.5, 'text'=>'135', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
i = TkcPolygon.new(w,340,360,335,363,331,365,326,366,304,366,
304,312,396,312,396,288,400,288,404,288,
409,290,413,292,418,297,421,302,422,309,
421,318,417,325,411,330,405,332,397,333,
344,333,340,334,336,336,335,338,332,342,
- 331,347,332,351,334,354,336,357,341,359,
+ 331,347,332,351,334,354,336,357,341,359,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = 'Ramona Stair'
$floorItems2['Ramona Stair'] = i
- w.create(TkcText,368,323, 'text'=>'Ramona Stair', 'fill'=>color,
+ w.create(TkcText,368,323, 'text'=>'Ramona Stair', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
i = TkcPolygon.new(w,30,23,30,5,93,5,98,5,104,7,110,10,116,16,119,20,
- 122,28,123,32,123,68,220,68,220,87,90,87,90,23,
+ 122,28,123,32,123,68,220,68,220,87,90,87,90,23,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = 'University Stair'
$floorItems2['University Stair'] = i
- w.create(TkcText,155,77.5, 'text'=>'University Stair', 'fill'=>color,
+ w.create(TkcText,155,77.5, 'text'=>'University Stair', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
i = TkcPolygon.new(w,282,37,295,40,312,49,323,56,337,70,352,56,
358,48,363,39,365,29,348,25,335,22,321,14,
300,5,283,1,260,0,246,0,242,2,236,4,231,8,
- 227,13,223,17,221,22,220,34,260,34,
+ 227,13,223,17,221,22,220,34,260,34,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = 'Plaza Stair'
$floorItems2['Plaza Stair'] = i
- w.create(TkcText,317.5,28.5, 'text'=>'Plaza Stair', 'fill'=>color,
+ w.create(TkcText,317.5,28.5, 'text'=>'Plaza Stair', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
i = TkcPolygon.new(w,220,34,260,34,282,37,295,40,312,49,
323,56,337,70,350,83,365,94,377,100,
- 386,104,386,128,220,128,
+ 386,104,386,128,220,128,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = 'Plaza Deck'
$floorItems2['Plaza Deck'] = i
- w.create(TkcText,303,81, 'text'=>'Plaza Deck', 'fill'=>color,
+ w.create(TkcText,303,81, 'text'=>'Plaza Deck', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
i = TkcPolygon.new(w,257,336,77,336,6,336,6,301,77,301,77,310,257,310,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '106'
$floorItems2['106'] = i
- w.create(TkcText,131.5,318.5, 'text'=>'106', 'fill'=>color,
+ w.create(TkcText,131.5,318.5, 'text'=>'106', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
i = TkcPolygon.new(w,146,110,162,110,162,91,130,91,130,115,95,115,
95,128,114,128,114,151,157,151,157,153,112,153,
- 112,130,97,130,97,168,175,168,175,131,146,131,
+ 112,130,97,130,97,168,175,168,175,131,146,131,
'fill'=>'', 'tags'=>['floor1','room'])
$floorLabels2[i.id] = '119'
$floorItems2['119'] = i
- w.create(TkcText,143.5,133, 'text'=>'119', 'fill'=>color,
+ w.create(TkcText,143.5,133, 'text'=>'119', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor1','label'])
w.create(TkcLine,155,191,155,189, 'fill'=>color, 'tags'=>['floor1','wall'])
w.create(TkcLine,155,177,155,169, 'fill'=>color, 'tags'=>['floor1','wall'])
@@ -795,321 +795,321 @@ end
def floor2_fg2(w,color)
i = TkcPolygon.new(w,748,188,755,188,755,205,758,205,758,222,
- 800,222,800,168,748,168,
+ 800,222,800,168,748,168,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '238'
$floorItems2['238'] = i
- w.create(TkcText,774,195, 'text'=>'238', 'fill'=>color,
+ w.create(TkcText,774,195, 'text'=>'238', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
i = TkcPolygon.new(w,726,188,746,188,746,166,800,166,800,131,726,131,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '237'
$floorItems2['237'] = i
- w.create(TkcText,763,148.5, 'text'=>'237', 'fill'=>color,
+ w.create(TkcText,763,148.5, 'text'=>'237', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
i = TkcPolygon.new(w,497,187,497,204,559,204,559,324,641,324,
643,324,643,291,641,291,641,205,696,205,
696,291,694,291,694,314,715,314,715,291,
- 715,205,755,205,755,190,724,190,724,187,
+ 715,205,755,205,755,190,724,190,724,187,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '246'
$floorItems2['246'] = i
- w.create(TkcText,600,264, 'text'=>'246', 'fill'=>color,
+ w.create(TkcText,600,264, 'text'=>'246', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,694,279,643,279,643,314,694,314,
+ i = TkcPolygon.new(w,694,279,643,279,643,314,694,314,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '247'
$floorItems2['247'] = i
- w.create(TkcText,668.5,296.5, 'text'=>'247', 'fill'=>color,
+ w.create(TkcText,668.5,296.5, 'text'=>'247', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
i = TkcPolygon.new(w,232,250,308,250,308,242,339,242,339,246,
397,246,397,255,476,255,476,250,482,250,559,250,
- 559,274,482,274,482,278,396,278,396,274,232,274,
+ 559,274,482,274,482,278,396,278,396,274,232,274,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '202'
$floorItems2['202'] = i
- w.create(TkcText,285.5,260, 'text'=>'202', 'fill'=>color,
+ w.create(TkcText,285.5,260, 'text'=>'202', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
i = TkcPolygon.new(w,53,228,53,338,176,338,233,338,233,196,
306,196,306,180,175,180,175,169,156,169,
- 156,196,176,196,176,228,
+ 156,196,176,196,176,228,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '206'
$floorItems2['206'] = i
- w.create(TkcText,143,267, 'text'=>'206', 'fill'=>color,
+ w.create(TkcText,143,267, 'text'=>'206', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,51,277,6,277,6,338,51,338,
+ i = TkcPolygon.new(w,51,277,6,277,6,338,51,338,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '212'
$floorItems2['212'] = i
- w.create(TkcText,28.5,307.5, 'text'=>'212', 'fill'=>color,
+ w.create(TkcText,28.5,307.5, 'text'=>'212', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,557,276,486,276,486,309,510,309,510,325,557,325,
+ i = TkcPolygon.new(w,557,276,486,276,486,309,510,309,510,325,557,325,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '245'
$floorItems2['245'] = i
- w.create(TkcText,521.5,300.5, 'text'=>'245', 'fill'=>color,
+ w.create(TkcText,521.5,300.5, 'text'=>'245', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,560,389,599,389,599,326,560,326,
+ i = TkcPolygon.new(w,560,389,599,389,599,326,560,326,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '244'
$floorItems2['244'] = i
- w.create(TkcText,579.5,357.5, 'text'=>'244', 'fill'=>color,
+ w.create(TkcText,579.5,357.5, 'text'=>'244', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,601,389,601,326,643,326,643,389,
+ i = TkcPolygon.new(w,601,389,601,326,643,326,643,389,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '243'
$floorItems2['243'] = i
- w.create(TkcText,622,357.5, 'text'=>'243', 'fill'=>color,
+ w.create(TkcText,622,357.5, 'text'=>'243', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,688,316,645,316,645,365,688,365,
+ i = TkcPolygon.new(w,688,316,645,316,645,365,688,365,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '242'
$floorItems2['242'] = i
- w.create(TkcText,666.5,340.5, 'text'=>'242', 'fill'=>color,
+ w.create(TkcText,666.5,340.5, 'text'=>'242', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,802,367,759,367,759,226,802,226,
+ i = TkcPolygon.new(w,802,367,759,367,759,226,802,226,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = 'Barbecue Deck'
$floorItems2['Barbecue Deck'] = i
- w.create(TkcText,780.5,296.5, 'text'=>'Barbecue Deck', 'fill'=>color,
+ w.create(TkcText,780.5,296.5, 'text'=>'Barbecue Deck', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,755,262,755,314,717,314,717,262,
+ i = TkcPolygon.new(w,755,262,755,314,717,314,717,262,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '240'
$floorItems2['240'] = i
- w.create(TkcText,736,288, 'text'=>'240', 'fill'=>color,
+ w.create(TkcText,736,288, 'text'=>'240', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,755,316,689,316,689,365,755,365,
+ i = TkcPolygon.new(w,755,316,689,316,689,365,755,365,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '241'
$floorItems2['241'] = i
- w.create(TkcText,722,340.5, 'text'=>'241', 'fill'=>color,
+ w.create(TkcText,722,340.5, 'text'=>'241', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,755,206,717,206,717,261,755,261,
+ i = TkcPolygon.new(w,755,206,717,206,717,261,755,261,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '239'
$floorItems2['239'] = i
- w.create(TkcText,736,233.5, 'text'=>'239', 'fill'=>color,
+ w.create(TkcText,736,233.5, 'text'=>'239', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,695,277,643,277,643,206,695,206,
+ i = TkcPolygon.new(w,695,277,643,277,643,206,695,206,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '248'
$floorItems2['248'] = i
- w.create(TkcText,669,241.5, 'text'=>'248', 'fill'=>color,
+ w.create(TkcText,669,241.5, 'text'=>'248', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,676,135,676,185,724,185,724,135,
+ i = TkcPolygon.new(w,676,135,676,185,724,185,724,135,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '236'
$floorItems2['236'] = i
- w.create(TkcText,700,160, 'text'=>'236', 'fill'=>color,
+ w.create(TkcText,700,160, 'text'=>'236', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,675,135,635,135,635,145,628,145,628,185,675,185,
+ i = TkcPolygon.new(w,675,135,635,135,635,145,628,145,628,185,675,185,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '235'
$floorItems2['235'] = i
- w.create(TkcText,651.5,160, 'text'=>'235', 'fill'=>color,
+ w.create(TkcText,651.5,160, 'text'=>'235', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
i = TkcPolygon.new(w,626,143,633,143,633,135,572,135,
- 572,143,579,143,579,185,626,185,
+ 572,143,579,143,579,185,626,185,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '234'
$floorItems2['234'] = i
- w.create(TkcText,606,160, 'text'=>'234', 'fill'=>color,
+ w.create(TkcText,606,160, 'text'=>'234', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
i = TkcPolygon.new(w,557,135,571,135,571,145,578,145,
- 578,185,527,185,527,131,557,131,
+ 578,185,527,185,527,131,557,131,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '233'
$floorItems2['233'] = i
- w.create(TkcText,552.5,158, 'text'=>'233', 'fill'=>color,
+ w.create(TkcText,552.5,158, 'text'=>'233', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
i = TkcPolygon.new(w,476,249,557,249,557,205,476,205,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '230'
$floorItems2['230'] = i
- w.create(TkcText,516.5,227, 'text'=>'230', 'fill'=>color,
+ w.create(TkcText,516.5,227, 'text'=>'230', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,476,164,486,164,486,131,525,131,525,185,476,185,
+ i = TkcPolygon.new(w,476,164,486,164,486,131,525,131,525,185,476,185,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '232'
$floorItems2['232'] = i
- w.create(TkcText,500.5,158, 'text'=>'232', 'fill'=>color,
+ w.create(TkcText,500.5,158, 'text'=>'232', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,476,186,495,186,495,204,476,204,
+ i = TkcPolygon.new(w,476,186,495,186,495,204,476,204,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '229'
$floorItems2['229'] = i
- w.create(TkcText,485.5,195, 'text'=>'229', 'fill'=>color,
+ w.create(TkcText,485.5,195, 'text'=>'229', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,474,207,409,207,409,187,399,187,399,164,474,164,
+ i = TkcPolygon.new(w,474,207,409,207,409,187,399,187,399,164,474,164,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '227'
$floorItems2['227'] = i
- w.create(TkcText,436.5,185.5, 'text'=>'227', 'fill'=>color,
+ w.create(TkcText,436.5,185.5, 'text'=>'227', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,399,228,399,253,474,253,474,209,409,209,409,228,
+ i = TkcPolygon.new(w,399,228,399,253,474,253,474,209,409,209,409,228,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '228'
$floorItems2['228'] = i
- w.create(TkcText,436.5,231, 'text'=>'228', 'fill'=>color,
+ w.create(TkcText,436.5,231, 'text'=>'228', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,397,246,397,226,407,226,407,189,377,189,377,246,
+ i = TkcPolygon.new(w,397,246,397,226,407,226,407,189,377,189,377,246,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '226'
$floorItems2['226'] = i
- w.create(TkcText,392,217.5, 'text'=>'226', 'fill'=>color,
+ w.create(TkcText,392,217.5, 'text'=>'226', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,377,169,316,169,316,131,397,131,397,188,377,188,
+ i = TkcPolygon.new(w,377,169,316,169,316,131,397,131,397,188,377,188,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '225'
$floorItems2['225'] = i
- w.create(TkcText,356.5,150, 'text'=>'225', 'fill'=>color,
+ w.create(TkcText,356.5,150, 'text'=>'225', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,234,198,306,198,306,249,234,249,
+ i = TkcPolygon.new(w,234,198,306,198,306,249,234,249,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '224'
$floorItems2['224'] = i
- w.create(TkcText,270,223.5, 'text'=>'224', 'fill'=>color,
+ w.create(TkcText,270,223.5, 'text'=>'224', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,270,179,306,179,306,170,314,170,314,135,270,135,
+ i = TkcPolygon.new(w,270,179,306,179,306,170,314,170,314,135,270,135,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '223'
$floorItems2['223'] = i
- w.create(TkcText,292,157, 'text'=>'223', 'fill'=>color,
+ w.create(TkcText,292,157, 'text'=>'223', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,268,179,221,179,221,135,268,135,
+ i = TkcPolygon.new(w,268,179,221,179,221,135,268,135,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '222'
$floorItems2['222'] = i
- w.create(TkcText,244.5,157, 'text'=>'222', 'fill'=>color,
+ w.create(TkcText,244.5,157, 'text'=>'222', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,177,179,219,179,219,135,177,135,
+ i = TkcPolygon.new(w,177,179,219,179,219,135,177,135,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '221'
$floorItems2['221'] = i
- w.create(TkcText,198,157, 'text'=>'221', 'fill'=>color,
+ w.create(TkcText,198,157, 'text'=>'221', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,299,327,349,327,349,284,341,284,341,276,299,276,
+ i = TkcPolygon.new(w,299,327,349,327,349,284,341,284,341,276,299,276,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '204'
$floorItems2['204'] = i
- w.create(TkcText,324,301.5, 'text'=>'204', 'fill'=>color,
+ w.create(TkcText,324,301.5, 'text'=>'204', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,234,276,297,276,297,327,257,327,257,338,234,338,
+ i = TkcPolygon.new(w,234,276,297,276,297,327,257,327,257,338,234,338,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '205'
$floorItems2['205'] = i
- w.create(TkcText,265.5,307, 'text'=>'205', 'fill'=>color,
+ w.create(TkcText,265.5,307, 'text'=>'205', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
i = TkcPolygon.new(w,256,385,256,340,212,340,212,385,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '207'
$floorItems2['207'] = i
- w.create(TkcText,234,362.5, 'text'=>'207', 'fill'=>color,
+ w.create(TkcText,234,362.5, 'text'=>'207', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,210,340,164,340,164,385,210,385,
+ i = TkcPolygon.new(w,210,340,164,340,164,385,210,385,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '208'
$floorItems2['208'] = i
- w.create(TkcText,187,362.5, 'text'=>'208', 'fill'=>color,
+ w.create(TkcText,187,362.5, 'text'=>'208', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,115,340,162,340,162,385,115,385,
+ i = TkcPolygon.new(w,115,340,162,340,162,385,115,385,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '209'
$floorItems2['209'] = i
- w.create(TkcText,138.5,362.5, 'text'=>'209', 'fill'=>color,
+ w.create(TkcText,138.5,362.5, 'text'=>'209', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,89,228,89,156,53,156,53,228,
+ i = TkcPolygon.new(w,89,228,89,156,53,156,53,228,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '217'
$floorItems2['217'] = i
- w.create(TkcText,71,192, 'text'=>'217', 'fill'=>color,
+ w.create(TkcText,71,192, 'text'=>'217', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,89,169,97,169,97,190,89,190,
+ i = TkcPolygon.new(w,89,169,97,169,97,190,89,190,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '217A'
$floorItems2['217A'] = i
- w.create(TkcText,93,179.5, 'text'=>'217A', 'fill'=>color,
+ w.create(TkcText,93,179.5, 'text'=>'217A', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,89,156,89,168,95,168,95,135,53,135,53,156,
+ i = TkcPolygon.new(w,89,156,89,168,95,168,95,135,53,135,53,156,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '216'
$floorItems2['216'] = i
- w.create(TkcText,71,145.5, 'text'=>'216', 'fill'=>color,
+ w.create(TkcText,71,145.5, 'text'=>'216', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,51,179,51,135,6,135,6,179,
+ i = TkcPolygon.new(w,51,179,51,135,6,135,6,179,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '215'
$floorItems2['215'] = i
- w.create(TkcText,28.5,157, 'text'=>'215', 'fill'=>color,
+ w.create(TkcText,28.5,157, 'text'=>'215', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,51,227,6,227,6,180,51,180,
+ i = TkcPolygon.new(w,51,227,6,227,6,180,51,180,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '214'
$floorItems2['214'] = i
- w.create(TkcText,28.5,203.5, 'text'=>'214', 'fill'=>color,
+ w.create(TkcText,28.5,203.5, 'text'=>'214', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,51,275,6,275,6,229,51,229,
+ i = TkcPolygon.new(w,51,275,6,275,6,229,51,229,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '213'
$floorItems2['213'] = i
- w.create(TkcText,28.5,252, 'text'=>'213', 'fill'=>color,
+ w.create(TkcText,28.5,252, 'text'=>'213', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,114,340,67,340,67,385,114,385,
+ i = TkcPolygon.new(w,114,340,67,340,67,385,114,385,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '210'
$floorItems2['210'] = i
- w.create(TkcText,90.5,362.5, 'text'=>'210', 'fill'=>color,
+ w.create(TkcText,90.5,362.5, 'text'=>'210', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,59,389,59,385,65,385,65,340,1,340,1,389,
+ i = TkcPolygon.new(w,59,389,59,385,65,385,65,340,1,340,1,389,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '211'
$floorItems2['211'] = i
- w.create(TkcText,33,364.5, 'text'=>'211', 'fill'=>color,
+ w.create(TkcText,33,364.5, 'text'=>'211', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,393,309,350,309,350,282,342,282,342,276,393,276,
+ i = TkcPolygon.new(w,393,309,350,309,350,282,342,282,342,276,393,276,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '203'
$floorItems2['203'] = i
- w.create(TkcText,367.5,292.5, 'text'=>'203', 'fill'=>color,
+ w.create(TkcText,367.5,292.5, 'text'=>'203', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
i = TkcPolygon.new(w,99,191,91,191,91,226,174,226,174,198,
- 154,198,154,192,109,192,109,169,99,169,
+ 154,198,154,192,109,192,109,169,99,169,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '220'
$floorItems2['220'] = i
- w.create(TkcText,132.5,208.5, 'text'=>'220', 'fill'=>color,
+ w.create(TkcText,132.5,208.5, 'text'=>'220', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,339,205,307,205,307,171,339,171,
+ i = TkcPolygon.new(w,339,205,307,205,307,171,339,171,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = 'Priv Lift2'
$floorItems2['Priv Lift2'] = i
- w.create(TkcText,323,188, 'text'=>'Priv Lift2', 'fill'=>color,
+ w.create(TkcText,323,188, 'text'=>'Priv Lift2', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,307,240,339,240,339,206,307,206,
+ i = TkcPolygon.new(w,307,240,339,240,339,206,307,206,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = 'Pub Lift 2'
$floorItems2['Pub Lift 2'] = i
- w.create(TkcText,323,223, 'text'=>'Pub Lift 2', 'fill'=>color,
+ w.create(TkcText,323,223, 'text'=>'Pub Lift 2', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,175,168,97,168,97,131,175,131,
+ i = TkcPolygon.new(w,175,168,97,168,97,131,175,131,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '218'
$floorItems2['218'] = i
- w.create(TkcText,136,149.5, 'text'=>'218', 'fill'=>color,
+ w.create(TkcText,136,149.5, 'text'=>'218', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,154,191,111,191,111,169,154,169,
+ i = TkcPolygon.new(w,154,191,111,191,111,169,154,169,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '219'
$floorItems2['219'] = i
- w.create(TkcText,132.5,180, 'text'=>'219', 'fill'=>color,
+ w.create(TkcText,132.5,180, 'text'=>'219', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
- i = TkcPolygon.new(w,375,246,375,172,341,172,341,246,
+ i = TkcPolygon.new(w,375,246,375,172,341,172,341,246,
'fill'=>'', 'tags'=>['floor2','room'])
$floorLabels2[i.id] = '201'
$floorItems2['201'] = i
- w.create(TkcText,358,209, 'text'=>'201', 'fill'=>color,
+ w.create(TkcText,358,209, 'text'=>'201', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor2','label'])
w.create(TkcLine,641,186,678,186, 'fill'=>color, 'tags'=>['floor2','wall'])
w.create(TkcLine,757,350,757,367, 'fill'=>color, 'tags'=>['floor2','wall'])
@@ -1280,206 +1280,206 @@ def floor2_fg3(w,color)
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = '316'
$floorItems2['316'] = i
- w.create(TkcText,79.5,204, 'text'=>'316', 'fill'=>color,
+ w.create(TkcText,79.5,204, 'text'=>'316', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,115,368,162,368,162,323,115,323,
+ i = TkcPolygon.new(w,115,368,162,368,162,323,115,323,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = '309'
$floorItems2['309'] = i
- w.create(TkcText,138.5,345.5, 'text'=>'309', 'fill'=>color,
+ w.create(TkcText,138.5,345.5, 'text'=>'309', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,164,323,164,368,211,368,211,323,
+ i = TkcPolygon.new(w,164,323,164,368,211,368,211,323,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = '308'
$floorItems2['308'] = i
- w.create(TkcText,187.5,345.5, 'text'=>'308', 'fill'=>color,
+ w.create(TkcText,187.5,345.5, 'text'=>'308', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,256,368,212,368,212,323,256,323,
+ i = TkcPolygon.new(w,256,368,212,368,212,323,256,323,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = '307'
$floorItems2['307'] = i
- w.create(TkcText,234,345.5, 'text'=>'307', 'fill'=>color,
+ w.create(TkcText,234,345.5, 'text'=>'307', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,244,276,297,276,297,327,260,327,260,321,244,321,
+ i = TkcPolygon.new(w,244,276,297,276,297,327,260,327,260,321,244,321,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = '305'
$floorItems2['305'] = i
- w.create(TkcText,270.5,301.5, 'text'=>'305', 'fill'=>color,
+ w.create(TkcText,270.5,301.5, 'text'=>'305', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
i = TkcPolygon.new(w,251,219,251,203,244,203,244,219,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = '324B'
$floorItems2['324B'] = i
- w.create(TkcText,247.5,211, 'text'=>'324B', 'fill'=>color,
+ w.create(TkcText,247.5,211, 'text'=>'324B', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,251,249,244,249,244,232,251,232,
+ i = TkcPolygon.new(w,251,249,244,249,244,232,251,232,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = '324A'
$floorItems2['324A'] = i
- w.create(TkcText,247.5,240.5, 'text'=>'324A', 'fill'=>color,
+ w.create(TkcText,247.5,240.5, 'text'=>'324A', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,223,135,223,179,177,179,177,135,
+ i = TkcPolygon.new(w,223,135,223,179,177,179,177,135,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = '320'
$floorItems2['320'] = i
- w.create(TkcText,200,157, 'text'=>'320', 'fill'=>color,
+ w.create(TkcText,200,157, 'text'=>'320', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,114,368,114,323,67,323,67,368,
+ i = TkcPolygon.new(w,114,368,114,323,67,323,67,368,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = '310'
$floorItems2['310'] = i
- w.create(TkcText,90.5,345.5, 'text'=>'310', 'fill'=>color,
+ w.create(TkcText,90.5,345.5, 'text'=>'310', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,23,277,23,321,68,321,68,277,
+ i = TkcPolygon.new(w,23,277,23,321,68,321,68,277,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = '312'
$floorItems2['312'] = i
- w.create(TkcText,45.5,299, 'text'=>'312', 'fill'=>color,
+ w.create(TkcText,45.5,299, 'text'=>'312', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,23,229,68,229,68,275,23,275,
+ i = TkcPolygon.new(w,23,229,68,229,68,275,23,275,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = '313'
$floorItems2['313'] = i
- w.create(TkcText,45.5,252, 'text'=>'313', 'fill'=>color,
+ w.create(TkcText,45.5,252, 'text'=>'313', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,68,227,23,227,23,180,68,180,
+ i = TkcPolygon.new(w,68,227,23,227,23,180,68,180,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = '314'
$floorItems2['314'] = i
- w.create(TkcText,40.5,203.5, 'text'=>'314', 'fill'=>color,
+ w.create(TkcText,40.5,203.5, 'text'=>'314', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,95,179,95,135,23,135,23,179,
+ i = TkcPolygon.new(w,95,179,95,135,23,135,23,179,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = '315'
$floorItems2['315'] = i
- w.create(TkcText,59,157, 'text'=>'315', 'fill'=>color,
+ w.create(TkcText,59,157, 'text'=>'315', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,99,226,99,204,91,204,91,226,
+ i = TkcPolygon.new(w,99,226,99,204,91,204,91,226,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = '316B'
$floorItems2['316B'] = i
- w.create(TkcText,95,215, 'text'=>'316B', 'fill'=>color,
+ w.create(TkcText,95,215, 'text'=>'316B', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,91,202,99,202,99,180,91,180,
+ i = TkcPolygon.new(w,91,202,99,202,99,180,91,180,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = '316A'
$floorItems2['316A'] = i
- w.create(TkcText,95,191, 'text'=>'316A', 'fill'=>color,
+ w.create(TkcText,95,191, 'text'=>'316A', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
i = TkcPolygon.new(w,97,169,109,169,109,192,154,192,154,198,
- 174,198,174,226,101,226,101,179,97,179,
+ 174,198,174,226,101,226,101,179,97,179,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = '319'
$floorItems2['319'] = i
- w.create(TkcText,141.5,209, 'text'=>'319', 'fill'=>color,
+ w.create(TkcText,141.5,209, 'text'=>'319', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,65,368,58,368,58,389,1,389,1,333,23,333,23,323,65,323,
+ i = TkcPolygon.new(w,65,368,58,368,58,389,1,389,1,333,23,333,23,323,65,323,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = '311'
$floorItems2['311'] = i
- w.create(TkcText,29.5,361, 'text'=>'311', 'fill'=>color,
+ w.create(TkcText,29.5,361, 'text'=>'311', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,154,191,111,191,111,169,154,169,
+ i = TkcPolygon.new(w,154,191,111,191,111,169,154,169,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = '318'
$floorItems2['318'] = i
- w.create(TkcText,132.5,180, 'text'=>'318', 'fill'=>color,
+ w.create(TkcText,132.5,180, 'text'=>'318', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,175,168,97,168,97,131,175,131,
+ i = TkcPolygon.new(w,175,168,97,168,97,131,175,131,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = '317'
$floorItems2['317'] = i
- w.create(TkcText,136,149.5, 'text'=>'317', 'fill'=>color,
+ w.create(TkcText,136,149.5, 'text'=>'317', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,274,194,274,221,306,221,306,194,
+ i = TkcPolygon.new(w,274,194,274,221,306,221,306,194,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = '323'
$floorItems2['323'] = i
- w.create(TkcText,290,207.5, 'text'=>'323', 'fill'=>color,
+ w.create(TkcText,290,207.5, 'text'=>'323', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,306,222,274,222,274,249,306,249,
+ i = TkcPolygon.new(w,306,222,274,222,274,249,306,249,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = '325'
$floorItems2['325'] = i
- w.create(TkcText,290,235.5, 'text'=>'325', 'fill'=>color,
+ w.create(TkcText,290,235.5, 'text'=>'325', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,263,179,224,179,224,135,263,135,
+ i = TkcPolygon.new(w,263,179,224,179,224,135,263,135,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = '321'
$floorItems2['321'] = i
- w.create(TkcText,243.5,157, 'text'=>'321', 'fill'=>color,
+ w.create(TkcText,243.5,157, 'text'=>'321', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
i = TkcPolygon.new(w,314,169,306,169,306,192,273,192,
- 264,181,264,135,314,135,
+ 264,181,264,135,314,135,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = '322'
$floorItems2['322'] = i
- w.create(TkcText,293.5,163.5, 'text'=>'322', 'fill'=>color,
+ w.create(TkcText,293.5,163.5, 'text'=>'322', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,307,240,339,240,339,206,307,206,
+ i = TkcPolygon.new(w,307,240,339,240,339,206,307,206,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = 'Pub Lift3'
$floorItems2['Pub Lift3'] = i
- w.create(TkcText,323,223, 'text'=>'Pub Lift3', 'fill'=>color,
+ w.create(TkcText,323,223, 'text'=>'Pub Lift3', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,339,205,307,205,307,171,339,171,
+ i = TkcPolygon.new(w,339,205,307,205,307,171,339,171,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = 'Priv Lift3'
$floorItems2['Priv Lift3'] = i
- w.create(TkcText,323,188, 'text'=>'Priv Lift3', 'fill'=>color,
+ w.create(TkcText,323,188, 'text'=>'Priv Lift3', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,350,284,376,284,376,276,397,276,397,309,350,309,
+ i = TkcPolygon.new(w,350,284,376,284,376,276,397,276,397,309,350,309,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = '303'
$floorItems2['303'] = i
- w.create(TkcText,373.5,292.5, 'text'=>'303', 'fill'=>color,
+ w.create(TkcText,373.5,292.5, 'text'=>'303', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
i = TkcPolygon.new(w,272,203,272,249,252,249,252,230,
- 244,230,244,221,252,221,252,203,
+ 244,230,244,221,252,221,252,203,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = '324'
$floorItems2['324'] = i
- w.create(TkcText,262,226, 'text'=>'324', 'fill'=>color,
+ w.create(TkcText,262,226, 'text'=>'324', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,299,276,299,327,349,327,349,284,341,284,341,276,
+ i = TkcPolygon.new(w,299,276,299,327,349,327,349,284,341,284,341,276,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = '304'
$floorItems2['304'] = i
- w.create(TkcText,324,301.5, 'text'=>'304', 'fill'=>color,
+ w.create(TkcText,324,301.5, 'text'=>'304', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,375,246,375,172,341,172,341,246,
+ i = TkcPolygon.new(w,375,246,375,172,341,172,341,246,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = '301'
$floorItems2['301'] = i
- w.create(TkcText,358,209, 'text'=>'301', 'fill'=>color,
+ w.create(TkcText,358,209, 'text'=>'301', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,397,246,377,246,377,185,397,185,
+ i = TkcPolygon.new(w,397,246,377,246,377,185,397,185,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = '327'
$floorItems2['327'] = i
- w.create(TkcText,387,215.5, 'text'=>'327', 'fill'=>color,
+ w.create(TkcText,387,215.5, 'text'=>'327', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
- i = TkcPolygon.new(w,316,131,316,169,377,169,377,185,397,185,397,131,
+ i = TkcPolygon.new(w,316,131,316,169,377,169,377,185,397,185,397,131,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = '326'
$floorItems2['326'] = i
- w.create(TkcText,365.5,150, 'text'=>'326', 'fill'=>color,
+ w.create(TkcText,365.5,150, 'text'=>'326', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
i = TkcPolygon.new(w,308,251,242,251,242,274,342,274,342,282,375, 282,
- 375,274,397,274,397,248,339,248,339,242,308,242,
+ 375,274,397,274,397,248,339,248,339,242,308,242,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = '302'
$floorItems2['302'] = i
- w.create(TkcText,319.5,261, 'text'=>'302', 'fill'=>color,
+ w.create(TkcText,319.5,261, 'text'=>'302', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
i = TkcPolygon.new(w,70,321,242,321,242,200,259,200,259,203,272,203,
272,193,263,180,242,180,175,180,175,169,156,169,
156,196,177,196,177,228,107,228,70,228,70,275,107,275,
- 107,248,160,248,160,301,107,301,107,275,70,275,
+ 107,248,160,248,160,301,107,301,107,275,70,275,
'fill'=>'', 'tags'=>['floor3','room'])
$floorLabels2[i.id] = '306'
$floorItems2['306'] = i
- w.create(TkcText,200.5,284.5, 'text'=>'306', 'fill'=>color,
+ w.create(TkcText,200.5,284.5, 'text'=>'306', 'fill'=>color,
'anchor'=>'c', 'tags'=>['floor3','label'])
w.create(TkcLine,341,275,341,283, 'fill'=>color, 'tags'=>['floor3','wall'])
w.create(TkcLine,162,197,155,197, 'fill'=>color, 'tags'=>['floor3','wall'])
@@ -1574,7 +1574,7 @@ end
# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($floor2_demo) && $floor2_demo
- $floor2_demo.destroy
+ $floor2_demo.destroy
$floor2_demo = nil
end
@@ -1590,7 +1590,7 @@ $floor2_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($floor2_demo).pack(:fill=>:both, :expand=>true)
# label À¸À®
-TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'8i', 'justify'=>'left',
+TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'8i', 'justify'=>'left',
'text'=>"¤³¤Î¥¦¥£¥ó¥É¥¦¤Ë¤Ï¥Ç¥£¥¸¥¿¥ë¥¨¥¯¥¤¥Ã¥×¥á¥ó¥È¼Ò¤Î¥¦¥§¥¹¥¿¥ó¥ê¥µ¡¼¥Á¥é¥Ü¥é¥È¥ê (DECWRL) ¤Î´Ö¼è¤ê¤¬½ñ¤«¤ì¤¿¥­¥ã¥ó¥Ð¥¹ widget ¤¬Æþ¤Ã¤Æ¤¤¤Þ¤¹¡£¤³¤ì¤Ï 3³¬·ú¤Æ¤Ç¡¢¾ï¤Ë¤½¤Î¤¦¤Á¤Î1³¬Ê¬¤¬ÁªÂò¡¢¤Ä¤Þ¤ê¤½¤Î´Ö¼è¤ê¤¬É½¼¨¤µ¤ì¤ë¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£¤¢¤ë³¬¤òÁªÂò¤¹¤ë¤Ë¤Ï¡¢¤½¤Î¾å¤Ç¥Þ¥¦¥¹¤Îº¸¥Ü¥¿¥ó¤ò¥¯¥ê¥Ã¥¯¤·¤Æ¤¯¤À¤µ¤¤¡£¥Þ¥¦¥¹¤¬ÁªÂò¤µ¤ì¤Æ¤¤¤ë³¬¤Î¾å¤òư¤¯¤È¡¢¤½¤Î²¼¤Ë¤¢¤ëÉô²°¤Î¿§¤¬ÊѤï¤ê¡¢Éô²°Èֹ椬¡ÖÉô²°ÈÖ¹æ:¡×¥¨¥ó¥È¥ê¤Ëɽ¼¨¤µ¤ì¤Þ¤¹¡£¤Þ¤¿¡¢¥¨¥ó¥È¥ê¤ËÉô²°ÈÖ¹æ¤ò½ñ¤¯¤È¤½¤ÎÉô²°¤Î¿§¤¬ÊѤï¤ê¤Þ¤¹¡£"){
pack('side'=>'top')
}
@@ -1622,10 +1622,10 @@ $floorItems2 = {}
if $tk_version =~ /^4\.[01]/
$floor2_canvas_frame = TkFrame.new(base_frame,'bd'=>2,'relief'=>'sunken',
'highlightthickness'=>2)
- $floor2_canvas = TkCanvas.new($floor2_canvas_frame,
- 'width'=>900, 'height'=>500, 'borderwidth'=>0,
+ $floor2_canvas = TkCanvas.new($floor2_canvas_frame,
+ 'width'=>900, 'height'=>500, 'borderwidth'=>0,
'highlightthickness'=>0) {|c|
- TkScrollbar.new(base_frame, 'orient'=>'horiz',
+ TkScrollbar.new(base_frame, 'orient'=>'horiz',
'command'=>proc{|*args| c.xview(*args)}){|hs|
c.xscrollcommand(proc{|first,last| hs.set first,last})
pack('side'=>'bottom', 'fill'=>'x')
@@ -1646,20 +1646,20 @@ else
v = TkScrollbar.new(f, 'highlightthickness'=>0, 'orient'=>'vertical')
TkFrame.new(f, 'bd'=>2, 'relief'=>'sunken') {|f1|
- $floor2_canvas = TkCanvas.new(f1, 'width'=>900, 'height'=>500,
- 'borderwidth'=>0,
+ $floor2_canvas = TkCanvas.new(f1, 'width'=>900, 'height'=>500,
+ 'borderwidth'=>0,
'highlightthickness'=>0) {
xscrollcommand(proc{|first,last| h.set first,last})
yscrollcommand(proc{|first,last| v.set first,last})
pack('expand'=>'yes', 'fill'=>'both')
}
- grid('padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>0,
+ grid('padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>0,
'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
}
- v.grid('padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>1,
+ v.grid('padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>1,
'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
- h.grid('padx'=>1, 'pady'=>1, 'row'=>1, 'column'=>0,
+ h.grid('padx'=>1, 'pady'=>1, 'row'=>1, 'column'=>0,
'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
TkGrid.rowconfigure(f, 0, 'weight'=>1, 'minsize'=>0)
@@ -1675,7 +1675,7 @@ end
# Create an entry for displaying and typing in current room.
$currentRoom2 = TkVariable.new
-$floor2_entry = TkEntry.new($floor2_canvas, 'width'=>10, 'relief'=>'sunken',
+$floor2_entry = TkEntry.new($floor2_canvas, 'width'=>10, 'relief'=>'sunken',
'bd'=>2, 'textvariable'=>$currentRoom2)
# Choose colors, then fill in the floorplan.
@@ -1712,7 +1712,7 @@ $floor2_canvas.itembind('floor3', '1', proc{floorDisplay2 $floor2_canvas,3})
$floor2_canvas.itembind('room', 'Enter', proc{newRoom2 $floor2_canvas})
$floor2_canvas.itembind('room', 'Leave', proc{$currentRoom2.value = ''})
$floor2_canvas.bind('2', proc{|x,y| $floor2_canvas.scan_mark x,y}, '%x %y')
-$floor2_canvas.bind('B2-Motion',
+$floor2_canvas.bind('B2-Motion',
proc{|x,y| $floor2_canvas.scan_dragto x,y}, '%x %y')
$floor2_canvas.bind('Destroy', proc{$currentRoom2.unset})
$currentRoom2.value = ''
diff --git a/ext/tk/sample/demos-jp/form.rb b/ext/tk/sample/demos-jp/form.rb
index 84ed94de88..4de7056764 100644
--- a/ext/tk/sample/demos-jp/form.rb
+++ b/ext/tk/sample/demos-jp/form.rb
@@ -5,7 +5,7 @@
# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($form_demo) && $form_demo
- $form_demo.destroy
+ $form_demo.destroy
$form_demo = nil
end
diff --git a/ext/tk/sample/demos-jp/goldberg.rb b/ext/tk/sample/demos-jp/goldberg.rb
index ea521b82ec..a81c7ec70c 100644
--- a/ext/tk/sample/demos-jp/goldberg.rb
+++ b/ext/tk/sample/demos-jp/goldberg.rb
@@ -44,7 +44,7 @@
#>># lots of canvas create and move calls.
if defined?($goldberg_demo) && $goldberg_demo
- $goldberg_demo.destroy
+ $goldberg_demo.destroy
$goldberg_demo = nil
end
@@ -103,7 +103,7 @@ class TkGoldberg_Demo
@S['pause'] = TkVariable.new
@S['details'] = TkVariable.new(true)
- @S['mode'] = TkVariable.new(:MSTART, :symbol)
+ @S['mode'] = TkVariable.new(:MSTART, :symbol)
# :MSTART, :MGO, :MPAUSE, :MSSTEP, :MBSTEP, :MDONE, :MDEBUG
# 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10
@@ -134,19 +134,19 @@ class TkGoldberg_Demo
@XY = {}
@XY6 = {
- '-1'=>[366, 207], '-2'=>[349, 204], '-3'=>[359, 193], '-4'=>[375, 192],
+ '-1'=>[366, 207], '-2'=>[349, 204], '-3'=>[359, 193], '-4'=>[375, 192],
'-5'=>[340, 190], '-6'=>[349, 177], '-7'=>[366, 177], '-8'=>[380, 176],
- '-9'=>[332, 172], '-10'=>[342, 161], '-11'=>[357, 164],
- '-12'=>[372, 163], '-13'=>[381, 149], '-14'=>[364, 151],
- '-15'=>[349, 146], '-16'=>[333, 148], '0'=>[357, 219],
- '1'=>[359, 261], '2'=>[359, 291], '3'=>[359, 318], '4'=>[361, 324],
- '5'=>[365, 329], '6'=>[367, 334], '7'=>[367, 340], '8'=>[366, 346],
- '9'=>[364, 350], '10'=>[361, 355], '11'=>[359, 370], '12'=>[359, 391],
- '13,0'=>[360, 456], '13,1'=>[376, 456], '13,2'=>[346, 456],
- '13,3'=>[330, 456], '13,4'=>[353, 444], '13,5'=>[368, 443],
- '13,6'=>[339, 442], '13,7'=>[359, 431], '13,8'=>[380, 437],
- '13,9'=>[345, 428], '13,10'=>[328, 434], '13,11'=>[373, 424],
- '13,12'=>[331, 420], '13,13'=>[360, 417], '13,14'=>[345, 412],
+ '-9'=>[332, 172], '-10'=>[342, 161], '-11'=>[357, 164],
+ '-12'=>[372, 163], '-13'=>[381, 149], '-14'=>[364, 151],
+ '-15'=>[349, 146], '-16'=>[333, 148], '0'=>[357, 219],
+ '1'=>[359, 261], '2'=>[359, 291], '3'=>[359, 318], '4'=>[361, 324],
+ '5'=>[365, 329], '6'=>[367, 334], '7'=>[367, 340], '8'=>[366, 346],
+ '9'=>[364, 350], '10'=>[361, 355], '11'=>[359, 370], '12'=>[359, 391],
+ '13,0'=>[360, 456], '13,1'=>[376, 456], '13,2'=>[346, 456],
+ '13,3'=>[330, 456], '13,4'=>[353, 444], '13,5'=>[368, 443],
+ '13,6'=>[339, 442], '13,7'=>[359, 431], '13,8'=>[380, 437],
+ '13,9'=>[345, 428], '13,10'=>[328, 434], '13,11'=>[373, 424],
+ '13,12'=>[331, 420], '13,13'=>[360, 417], '13,14'=>[345, 412],
'13,15'=>[376, 410], '13,16'=>[360, 403]
}
@@ -163,11 +163,11 @@ class TkGoldberg_Demo
def do_display()
@ctrl = TkFrame.new(@parent, :relief=>:ridge, :bd=>2, :padx=>5, :pady=>5)
- @screen = TkFrame.new(@parent, :bd=>2,
- :relief=>:raised).pack(:side=>:left, :fill=>:both,
+ @screen = TkFrame.new(@parent, :bd=>2,
+ :relief=>:raised).pack(:side=>:left, :fill=>:both,
:expand=>true)
- @canvas = TkCanvas.new(@parent, :width=>850, :height=>700,
+ @canvas = TkCanvas.new(@parent, :width=>850, :height=>700,
:bg=>@C['bg'], :highlightthickness=>0){
scrollregion([0, 0, 1000, 1000]) # Kludge to move everything up
yview_moveto(0.05)
@@ -206,8 +206,8 @@ class TkGoldberg_Demo
command proc{showCode 'goldberg'}
}.pack('side'=>'left', 'padx'=>5)
- # @show = TkButton.new(frame, :text=>'>>', :command=>proc{show_ctrl},
- @show = Tk::Button.new(frame, :text=>'>>', :command=>proc{show_ctrl},
+ # @show = TkButton.new(frame, :text=>'>>', :command=>proc{show_ctrl},
+ @show = Tk::Button.new(frame, :text=>'>>', :command=>proc{show_ctrl},
:bg=>@C['bg'], :activebackground=>@C['bg'])
@show.pack('side'=>'left')
frame.place(:in=>@canvas, :relx=>1, :rely=>0, :anchor=>:ne)
@@ -216,34 +216,34 @@ class TkGoldberg_Demo
end
def do_ctrl_frame
- @start = Tk::Button.new(@parent, :text=>'Start', :bd=>6,
+ @start = Tk::Button.new(@parent, :text=>'Start', :bd=>6,
:command=>proc{do_button(0)})
if font = @start['font']
@start.font(font.weight('bold'))
end
- @pause = TkCheckbutton.new(@parent, :text=>'Pause', :font=>font,
- :command=>proc{do_button(1)}, :relief=>:raised,
+ @pause = TkCheckbutton.new(@parent, :text=>'Pause', :font=>font,
+ :command=>proc{do_button(1)}, :relief=>:raised,
:variable=>@S['pause'])
- @step = TkButton.new(@parent, :text=>'Single Step', :font=>font,
+ @step = TkButton.new(@parent, :text=>'Single Step', :font=>font,
:command=>proc{do_button(2)})
- @bstep = TkButton.new(@parent, :text=>'Big Step', :font=>font,
+ @bstep = TkButton.new(@parent, :text=>'Big Step', :font=>font,
:command=>proc{do_button(4)})
- @reset = TkButton.new(@parent, :text=>'Reset', :font=>font,
+ @reset = TkButton.new(@parent, :text=>'Reset', :font=>font,
:command=>proc{do_button(3)})
@details = TkFrame.new(@parent, :bd=>2, :relief=>:ridge)
- @detail = TkCheckbutton.new(@parent, :text=>'Details', :font=>font,
+ @detail = TkCheckbutton.new(@parent, :text=>'Details', :font=>font,
:relief=>:raised, :variable=>@S['details'])
- @msg_entry = TkEntry.new(@parent, :textvariable=>@S['message'],
+ @msg_entry = TkEntry.new(@parent, :textvariable=>@S['message'],
:justify=>:center)
- @speed_scale = TkScale.new(@parent, :orient=>:horizontal,
- :from=>1, :to=>10, :font=>font,
- :variable=>@S['speed'], :bd=>2,
+ @speed_scale = TkScale.new(@parent, :orient=>:horizontal,
+ :from=>1, :to=>10, :font=>font,
+ :variable=>@S['speed'], :bd=>2,
:relief=>:ridge, :showvalue=>false)
- @about = TkButton.new(@parent, :text=>'About',
+ @about = TkButton.new(@parent, :text=>'About',
:command=>proc{about}, :font=>font)
Tk.grid(@start, :in=>@ctrl, :row=>0, :sticky=>:ew)
@@ -271,17 +271,17 @@ class TkGoldberg_Demo
def do_detail_frame
@f_details = TkFrame.new(@details)
- @label = TkLabel.new(@f_details, :textvariable=>@S['cnt'],
+ @label = TkLabel.new(@f_details, :textvariable=>@S['cnt'],
:bd=>1, :relief=>:solid, :bg=>'white')
Tk.grid(@label, '-', '-', '-', :sticky=>:ew, :row=>0)
idx = 1
loop {
break unless respond_to?("move#{idx}")
- l = TkLabel.new(@f_details, :text=>idx, :anchor=>:e,
+ l = TkLabel.new(@f_details, :text=>idx, :anchor=>:e,
:width=>2, :bd=>1, :relief=>:solid, :bg=>'white')
@STEP[idx] = 0
- ll = TkLabel.new(@f_details, :textvariable=>@STEP.ref(idx),
+ ll = TkLabel.new(@f_details, :textvariable=>@STEP.ref(idx),
:width=>5, :bd=>1, :relief=>:solid, :bg=>'white')
row = (idx + 1)/2
col = ((idx + 1) & 1) * 2
@@ -385,7 +385,7 @@ class TkGoldberg_Demo
who = who.to_i
n = send("move#{who}")
if (n & 1).nonzero? # This guy still alive
- alive << who
+ alive << who
end
if (n & 2).nonzero? # Next guy is active
alive << (who + 1)
@@ -418,12 +418,12 @@ class TkGoldberg_Demo
# START HERE! banner
def draw0
color = @C['0']
- TkcText.new(@canvas,
- # [579, 119], :text=>'START HERE!',
- [558, 119], :text=>'¤³¤³¤«¤é¥¹¥¿¡¼¥È¡ª',
- :fill=>color, :anchor=>:w,
+ TkcText.new(@canvas,
+ # [579, 119], :text=>'START HERE!',
+ [558, 119], :text=>'¤³¤³¤«¤é¥¹¥¿¡¼¥È¡ª',
+ :fill=>color, :anchor=>:w,
:tag=>'I0', :font=>['Times Roman', 12, :italic, :bold])
- TkcLine.new(@canvas, [719, 119, 763, 119], :tag=>'I0', :fill=>color,
+ TkcLine.new(@canvas, [719, 119, 763, 119], :tag=>'I0', :fill=>color,
:width=>5, :arrow=>:last, :arrowshape=>[18, 18, 5])
@canvas.itembind('I0', '1'){ start }
end
@@ -437,7 +437,7 @@ class TkGoldberg_Demo
end
pos = [
- [673, 119], [678, 119], [683, 119], [688, 119],
+ [673, 119], [678, 119], [683, 119], [688, 119],
[693, 119], [688, 119], [683, 119], [678, 119]
]
step = step % pos.length
@@ -449,15 +449,15 @@ class TkGoldberg_Demo
def draw1
color = @C['1a']
color2 = @C['1b']
- TkcPolygon.new(@canvas,
- [ 844, 133, 800, 133, 800, 346, 820, 346,
- 820, 168, 844, 168, 844, 133 ],
+ TkcPolygon.new(@canvas,
+ [ 844, 133, 800, 133, 800, 346, 820, 346,
+ 820, 168, 844, 168, 844, 133 ],
:width=>3, :fill=>color, :outline=>'')
- TkcPolygon.new(@canvas,
- [ 771, 133, 685, 133, 685, 168, 751, 168,
- 751, 346, 771, 346, 771, 133 ],
+ TkcPolygon.new(@canvas,
+ [ 771, 133, 685, 133, 685, 168, 751, 168,
+ 751, 346, 771, 346, 771, 133 ],
:width=>3, :fill=>color, :outline=>'')
- TkcOval.new(@canvas, box(812, 122, 9),
+ TkcOval.new(@canvas, box(812, 122, 9),
:tag=>'I1', :fill=>color2, :outline=>'')
@canvas.itembind('I1', '1'){ start }
@@ -466,9 +466,9 @@ class TkGoldberg_Demo
def move1(step = nil)
step = get_step(1, step)
pos = [
- [807, 122], [802, 122], [797, 123], [793, 124], [789, 129], [785, 153],
- [785, 203], [785, 278, :x], [785, 367], [810, 392], [816, 438],
- [821, 503], [824, 585, :y], [838, 587], [848, 593], [857, 601],
+ [807, 122], [802, 122], [797, 123], [793, 124], [789, 129], [785, 153],
+ [785, 203], [785, 278, :x], [785, 367], [810, 392], [816, 438],
+ [821, 503], [824, 585, :y], [838, 587], [848, 593], [857, 601],
[-100, -100]
]
return 0 if step >= pos.length
@@ -484,40 +484,40 @@ class TkGoldberg_Demo
color = @C['2']
# Fulcrum
- TkcPolygon.new(@canvas, [750, 369, 740, 392, 760, 392],
+ TkcPolygon.new(@canvas, [750, 369, 740, 392, 760, 392],
:fill=>@C['fg'], :outline=>@C['fg'])
# Strike box
- TkcRectangle.new(@canvas, [628, 335, 660, 383],
+ TkcRectangle.new(@canvas, [628, 335, 660, 383],
:fill=>'', :outline=>@C['fg'])
(0..2).each{|y|
yy = 335 + y*16
- TkcBitmap.new(@canvas, [628, yy], :bitmap=>'gray25',
+ TkcBitmap.new(@canvas, [628, yy], :bitmap=>'gray25',
:anchor=>:nw, :foreground=>@C['fg'])
- TkcBitmap.new(@canvas, [644, yy], :bitmap=>'gray25',
+ TkcBitmap.new(@canvas, [644, yy], :bitmap=>'gray25',
:anchor=>:nw, :foreground=>@C['fg'])
}
# Lever
- TkcLine.new(@canvas, [702, 366, 798, 366],
+ TkcLine.new(@canvas, [702, 366, 798, 366],
:fill=>@C['fg'], :width=>6, :tag=>'I2_0')
# R strap
- TkcLine.new(@canvas, [712, 363, 712, 355],
+ TkcLine.new(@canvas, [712, 363, 712, 355],
:fill=>@C['fg'], :width=>3, :tag=>'I2_1')
# L strap
- TkcLine.new(@canvas, [705, 363, 705, 355],
+ TkcLine.new(@canvas, [705, 363, 705, 355],
:fill=>@C['fg'], :width=>3, :tag=>'I2_2')
# Match stick
- TkcLine.new(@canvas, [679, 356, 679, 360, 717, 360, 717, 356, 679, 356],
+ TkcLine.new(@canvas, [679, 356, 679, 360, 717, 360, 717, 356, 679, 356],
:fill=>@C['fg'], :width=>3, :tag=>'I2_3')
# Match head
- TkcPolygon.new(@canvas,
- [ 671, 352, 677.4, 353.9, 680, 358.5, 677.4, 363.1,
- 671, 365, 664.6, 363.1, 662, 358.5, 664.6, 353.9 ],
+ TkcPolygon.new(@canvas,
+ [ 671, 352, 677.4, 353.9, 680, 358.5, 677.4, 363.1,
+ 671, 365, 664.6, 363.1, 662, 358.5, 664.6, 353.9 ],
:fill=>color, :outline=>color, :tag=>'I2_4')
end
@@ -527,15 +527,15 @@ class TkGoldberg_Demo
stages = [0, 0, 1, 2, 0, 2, 1, 0, 1, 2, 0, 2, 1]
xy = []
xy[0] = [
- 686, 333, 692, 323, 682, 316, 674, 309, 671, 295, 668, 307,
+ 686, 333, 692, 323, 682, 316, 674, 309, 671, 295, 668, 307,
662, 318, 662, 328, 671, 336
]
xy[1] = [
- 687, 331, 698, 322, 703, 295, 680, 320, 668, 297, 663, 311,
+ 687, 331, 698, 322, 703, 295, 680, 320, 668, 297, 663, 311,
661, 327, 671, 335
]
xy[2] = [
- 686, 331, 704, 322, 688, 300, 678, 283, 678, 283, 674, 298,
+ 686, 331, 704, 322, 688, 300, 678, 283, 678, 283, 674, 298,
666, 309, 660, 324, 672, 336
]
@@ -546,7 +546,7 @@ class TkGoldberg_Demo
if step == 0 # Rotate the match
beta = 20
-
+
ox, oy = anchor('I2_0', :s) # Where to pivot
i = 0
@@ -571,23 +571,23 @@ class TkGoldberg_Demo
xy = [ [602, 296], [577, 174], [518, 174] ]
xy.each{|x, y| # 3 Pulleys
- TkcOval.new(@canvas, box(x, y, 13),
+ TkcOval.new(@canvas, box(x, y, 13),
:fill=>color, :outline=>@C['fg'], :width=>3)
TkcOval.new(@canvas, box(x, y, 2), :fill=>@C['fg'], :outline=>@C['fg'])
}
# Wall to flame
- TkcLine.new(@canvas, [750, 309, 670, 309], :tag=>'I3_s',
+ TkcLine.new(@canvas, [750, 309, 670, 309], :tag=>'I3_s',
:width=>3, :fill=>@C['fg'], :smooth=>true)
# Flame to pulley 1
- TkcLine.new(@canvas, [670, 309, 650, 309], :tag=>'I3_0',
+ TkcLine.new(@canvas, [670, 309, 650, 309], :tag=>'I3_0',
:width=>3, :fill=>@C['fg'], :smooth=>true)
- TkcLine.new(@canvas, [650, 309, 600, 309], :tag=>'I3_1',
+ TkcLine.new(@canvas, [650, 309, 600, 309], :tag=>'I3_1',
:width=>3, :fill=>@C['fg'], :smooth=>true)
# Pulley 1 half way to 2
- TkcLine.new(@canvas, [589, 296, 589, 235], :tag=>'I3_2',
+ TkcLine.new(@canvas, [589, 296, 589, 235], :tag=>'I3_2',
:width=>3, :fill=>@C['fg'])
# Pulley 1 other half to 2
@@ -597,26 +597,26 @@ class TkGoldberg_Demo
TkcLine.new(@canvas, [577, 161, 518, 161], :width=>3, :fill=>@C['fg'])
# Down to weight
- TkcLine.new(@canvas, [505, 174, 505, 205], :tag=>'I3_w',
+ TkcLine.new(@canvas, [505, 174, 505, 205], :tag=>'I3_w',
:width=>3, :fill=>@C['fg'])
# Draw the weight as 2 circles, two rectangles and 1 rounded rectangle
x1, y1, x2, y2 = [515, 207, 495, 207]
- TkcOval.new(@canvas, box(x1, y1, 6),
+ TkcOval.new(@canvas, box(x1, y1, 6),
:tag=>'I3_', :fill=>color2, :outline=>color2)
- TkcOval.new(@canvas, box(x2, y2, 6),
+ TkcOval.new(@canvas, box(x2, y2, 6),
:tag=>'I3_', :fill=>color2, :outline=>color2)
- TkcRectangle.new(@canvas, x1, y1 - 6, x2, y2 + 6,
+ TkcRectangle.new(@canvas, x1, y1 - 6, x2, y2 + 6,
:tag=>'I3_', :fill=>color2, :outline=>color2)
-
- TkcPolygon.new(@canvas, round_rect([492, 220, 518, 263], 15),
+
+ TkcPolygon.new(@canvas, round_rect([492, 220, 518, 263], 15),
:smooth=>true, :tag=>'I3_', :fill=>color2, :outline=>color2)
- TkcLine.new(@canvas, [500, 217, 511, 217],
+ TkcLine.new(@canvas, [500, 217, 511, 217],
:tag=>'I3_', :fill=>color2, :width=>10)
# Bottom weight target
- TkcLine.new(@canvas, [502, 393, 522, 393, 522, 465],
+ TkcLine.new(@canvas, [502, 393, 522, 393, 522, 465],
:tag=>'I3__', :fill=>@C['fg'], :joinstyle=>:miter, :width=>10)
end
@@ -659,7 +659,7 @@ class TkGoldberg_Demo
}
# Swing gate
- TkcLine.new(@canvas, [518, 464, 518, 428],
+ TkcLine.new(@canvas, [518, 464, 518, 428],
:tag=>'I4', :fill=>color, :width=>1)
end
@@ -686,7 +686,7 @@ class TkGoldberg_Demo
TkcPolygon.new(@canvas, xy, :fill=>color2, :outline=>@C['fg'], :width=>3)
xy = [
- 534.5, 445.5, 541, 440, 552, 436, 560, 436, 569, 440, 574, 446,
+ 534.5, 445.5, 541, 440, 552, 436, 560, 436, 569, 440, 574, 446,
575, 452, 574, 454, 566, 456, 554, 456, 545, 456, 537, 454, 530, 452
]
TkcPolygon.new(@canvas, xy, :tag=>['I5', 'I5_0'], :fill=>color)
@@ -696,7 +696,7 @@ class TkGoldberg_Demo
xy = box(540, 446, 2) # Eye
xy = [540, 444, 541, 445, 541, 447, 540, 448, 538, 447, 538, 445]
- TkcPolygon.new(@canvas, xy, :tag=>['I5', 'I5_2'], :fill=>@C['bg'],
+ TkcPolygon.new(@canvas, xy, :tag=>['I5', 'I5_2'], :fill=>@C['bg'],
:outline=>'', :smooth=>true)
xy = [538, 454, 535, 461] # Front leg
@@ -716,9 +716,9 @@ class TkGoldberg_Demo
step = get_step(5, step)
pos = [
- [553, 452], [533, 452], [513, 452], [493, 452], [473, 452],
- [463, 442, 30], [445.5, 441.5, 30], [425.5, 434.5, 30], [422, 414],
- [422, 394], [422, 374], [422, 354], [422, 334], [422, 314], [422, 294],
+ [553, 452], [533, 452], [513, 452], [493, 452], [473, 452],
+ [463, 442, 30], [445.5, 441.5, 30], [425.5, 434.5, 30], [422, 414],
+ [422, 394], [422, 374], [422, 354], [422, 334], [422, 314], [422, 294],
[422, 274, -30], [422, 260.5, -30, :x], [422.5, 248.5, -28], [425, 237]
]
@@ -739,16 +739,16 @@ class TkGoldberg_Demo
color = @C['6']
xy = [324, 130, 391, 204] # Ball holder
xy = round_rect(xy, 10)
- TkcPolygon.new(@canvas, xy, :smooth=>true,
+ TkcPolygon.new(@canvas, xy, :smooth=>true,
:outline=>@C['fg'], :width=>3, :fill=>color)
xy = [339, 204, 376, 253] # Below the ball holder
- TkcRectangle.new(@canvas, xy, :outline=>@C['fg'], :width=>3,
+ TkcRectangle.new(@canvas, xy, :outline=>@C['fg'], :width=>3,
:fill=>color, :tag=>'I6c')
xy = box(346, 339, 28)
TkcOval.new(@canvas, xy, :fill=>color, :outline=>'') # Roter
- TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>2, :style=>:arc,
+ TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>2, :style=>:arc,
:start=>80, :extent=>205)
- TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>2, :style=>:arc,
+ TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>2, :style=>:arc,
:start=>-41, :extent=>85)
xy = box(346, 339, 15) # Center of rotor
@@ -763,10 +763,10 @@ class TkGoldberg_Demo
TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>'')
xy = [
- 368, 356, 368, 403, 389, 403, 389, 464, 320, 464, 320, 403,
+ 368, 356, 368, 403, 389, 403, 389, 464, 320, 464, 320, 403,
352, 403, 352, 366
]
- TkcPolygon.new(@canvas, xy, :fill=>color, :outline=>'',
+ TkcPolygon.new(@canvas, xy, :fill=>color, :outline=>'',
:width=>2) # Below rotor
TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2)
xy = box(275, 342, 7) # On/off rotor
@@ -791,7 +791,7 @@ class TkGoldberg_Demo
loc = -i
color = colors[i]
x, y = @XY6["#{loc}"]
- TkcOval.new(@canvas, box(x, y, 5),
+ TkcOval.new(@canvas, box(x, y, 5),
:fill=>color, :outline=>color, :tag=>"I6_b#{i}")
}
draw6a(12) # The wheel
@@ -817,7 +817,7 @@ class TkGoldberg_Demo
@canvas.move('I6_', -7, 0)
if step == 1 # Poke a hole
xy = [348, 226, 365, 240]
- TkcRectangle.new(@canvas, xy, :fill=>@canvas.itemcget('I6c', :fill),
+ TkcRectangle.new(@canvas, xy, :fill=>@canvas.itemcget('I6c', :fill),
:outline=>'')
end
return 1
@@ -857,24 +857,24 @@ class TkGoldberg_Demo
def draw7
color = @C['7']
xy = [198, 306, 277, 374] # Box
- TkcRectangle.new(@canvas, xy, :outline=>@C['fg'], :width=>2,
+ TkcRectangle.new(@canvas, xy, :outline=>@C['fg'], :width=>2,
:fill=>color, :tag=>'I7z')
@canvas.lower('I7z')
xy = [275, 343, 230, 349]
- TkcLine.new(@canvas, xy, :tag=>'I7', :fill=>@C['fg'], :arrow=>:last,
+ TkcLine.new(@canvas, xy, :tag=>'I7', :fill=>@C['fg'], :arrow=>:last,
:arrowshape=>[23, 23, 8], :width=>6)
xy = [225, 324] # On button
x, y = xy
TkcOval.new(@canvas, box(x, y, 3), :fill=>@C['fg'], :outline=>@C['fg'])
xy = [218, 323] # On text
font = ['Times Roman', 8]
- TkcText.new(@canvas, xy, :text=>'on', :anchor=>:e,
+ TkcText.new(@canvas, xy, :text=>'on', :anchor=>:e,
:fill=>@C['fg'], :font=>font)
xy = [225, 350] # Off button
x, y = xy
TkcOval.new(@canvas, box(x, y, 3), :fill=>@C['fg'], :outline=>@C['fg'])
xy = [218, 349] # Off text
- TkcText.new(@canvas, xy, :text=>'off', :anchor=>:e,
+ TkcText.new(@canvas, xy, :text=>'off', :anchor=>:e,
:fill=>@C['fg'], :font=>font)
end
@@ -919,7 +919,7 @@ class TkGoldberg_Demo
xy = [280, 209, 296, 248]
TkcOval.new(@canvas, xy, :outline=>color, :fill=>color)
xy = [
- 288, 249, 252, 249, 260, 240, 280, 234,
+ 288, 249, 252, 249, 260, 240, 280, 234,
296, 234, 316, 240, 324, 249, 288, 249
]
TkcPolygon.new(@canvas, xy, :fill=>color, :smooth=>true)
@@ -928,16 +928,16 @@ class TkGoldberg_Demo
TkcPolygon.new(@canvas, xy, :fill=>color)
xy = [255, 206, 265, 234] # Fan blades
- TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'],
+ TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'],
:width=>3, :tag=>'I9_0')
xy = [255, 176, 265, 204]
- TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'],
+ TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'],
:width=>3, :tag=>'I9_0')
xy = [255, 206, 265, 220]
- TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'],
+ TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'],
:width=>1, :tag=>'I9_1')
xy = [255, 190, 265, 204]
- TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'],
+ TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'],
:width=>1, :tag=>'I9_1')
end
@@ -962,17 +962,17 @@ class TkGoldberg_Demo
color = @C['10a']
color2 = @C['10b']
xy = [191, 230, 233, 230, 233, 178, 191, 178] # Sail
- TkcPolygon.new(@canvas, xy, :fill=>color, :width=>3, :outline=>@C['fg'],
+ TkcPolygon.new(@canvas, xy, :fill=>color, :width=>3, :outline=>@C['fg'],
:tag=>'I10')
xy = box(209, 204, 31) # Front
- TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :style=>:pie,
+ TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :style=>:pie,
:start=>120, :extent=>120, :tag=>'I10')
- TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc,
+ TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc,
:start=>120, :extent=>120, :tag=>'I10')
xy = box(249, 204, 31) # Back
- TkcArc.new(@canvas, xy, :outline=>'', :fill=>@C['bg'], :width=>3,
+ TkcArc.new(@canvas, xy, :outline=>'', :fill=>@C['bg'], :width=>3,
:style=>:pie, :start=>120, :extent=>120, :tag=>'I10')
- TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc,
+ TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc,
:start=>120, :extent=>120, :tag=>'I10')
xy = [200, 171, 200, 249] # Mast
@@ -992,10 +992,10 @@ class TkGoldberg_Demo
TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3)
xy = box(239, 262, 17)
- TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc,
+ TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc,
:start=>95, :extent=>103)
xy = box(76, 266, 21)
- TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc,
+ TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc,
:extent=>190)
end
@@ -1003,9 +1003,9 @@ class TkGoldberg_Demo
step = get_step(10, step)
pos = [
- [195, 212], [193, 212], [190, 212], [186, 212], [181, 212], [176, 212],
- [171, 212], [166, 212], [161, 212], [156, 212], [151, 212], [147, 212],
- [142, 212], [137, 212], [132, 212, :x], [127, 212], [121, 212],
+ [195, 212], [193, 212], [190, 212], [186, 212], [181, 212], [176, 212],
+ [171, 212], [166, 212], [161, 212], [156, 212], [151, 212], [147, 212],
+ [142, 212], [137, 212], [132, 212, :x], [127, 212], [121, 212],
[116, 212], [111, 212]
]
@@ -1032,21 +1032,21 @@ class TkGoldberg_Demo
xy = [55, 504, 55, 591] # Bottom right side
TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3)
xy = box(71, 460, 48) # Outer loop
- TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc,
+ TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc,
:start=>110, :extent=>-290, :tag=>'I11i')
xy = box(71, 460, 16) # Inner loop
- TkcOval.new(@canvas, xy, :outline=>@C['fg'], :fill=>'',
+ TkcOval.new(@canvas, xy, :outline=>@C['fg'], :fill=>'',
:width=>3, :tag=>'I11i')
TkcOval.new(@canvas, xy, :outline=>@C['fg'], :fill=>@C['bg'], :width=>3)
xy = [23, 264, 23, 591] # Left side
TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3)
xy = box(1, 266, 23) # Top left curve
- TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3,
+ TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3,
:style=>:arc, :extent=>90)
xy = box(75, 235, 9) # The ball
- TkcOval.new(@canvas, xy, :fill=>color2, :outline=>'',
+ TkcOval.new(@canvas, xy, :fill=>color2, :outline=>'',
:width=>3, :tag=>'I11')
end
@@ -1054,8 +1054,8 @@ class TkGoldberg_Demo
step = get_step(11, step)
pos = [
- [75, 235], [70, 235], [65, 237], [56, 240], [46, 247], [38, 266],
- [38, 296], [38, 333], [38, 399], [38, 475], [74, 496], [105, 472],
+ [75, 235], [70, 235], [65, 237], [56, 240], [46, 247], [38, 266],
+ [38, 296], [38, 333], [38, 399], [38, 475], [74, 496], [105, 472],
[100, 437], [65, 423], [-100, -100], [38, 505], [38, 527, :x], [38, 591]
]
@@ -1069,11 +1069,11 @@ class TkGoldberg_Demo
# Hand
def draw12
xy = [
- 20, 637, 20, 617, 20, 610, 20, 590, 40, 590, 40, 590,
+ 20, 637, 20, 617, 20, 610, 20, 590, 40, 590, 40, 590,
60, 590, 60, 610, 60, 610
]
xy.concat([60, 610, 65, 620, 60, 631]) # Thumb
- xy.concat([60, 631, 60, 637, 60, 662, 60, 669, 52, 669,
+ xy.concat([60, 631, 60, 637, 60, 662, 60, 669, 52, 669,
56, 669, 50, 669, 50, 662, 50, 637])
y0 = 637 # Bumps for fingers
@@ -1083,7 +1083,7 @@ class TkGoldberg_Demo
x2 = x - 10
xy << x << y0 << x1 << y1 << x2 << y0
}
- TkcPolygon.new(@canvas, xy, :fill=>@C['12'], :outline=>@C['fg'],
+ TkcPolygon.new(@canvas, xy, :fill=>@C['12'], :outline=>@C['fg'],
:smooth=>true, :tag=>'I12', :width=>3)
end
@@ -1107,25 +1107,25 @@ class TkGoldberg_Demo
]
radii = [2, 9, 9, 8, 5, 5, 2]
- round_poly(@canvas, xy, radii, :width=>3,
+ round_poly(@canvas, xy, radii, :width=>3,
:outline=>@C['fg'], :fill=>color)
- round_poly(@canvas, xy2, radii, :width=>3,
+ round_poly(@canvas, xy2, radii, :width=>3,
:outline=>@C['fg'], :fill=>color)
xy = [56, 677]
x, y = xy
- TkcRectangle.new(@canvas, box(x, y, 4), :fill=>'', :outline=>@C['fg'],
+ TkcRectangle.new(@canvas, box(x, y, 4), :fill=>'', :outline=>@C['fg'],
:width=>3, :tag=>'I13')
xy = [809, 677]
x, y = xy
- TkcRectangle.new(@canvas, box(x, y, 4), :fill=>'', :outline=>@C['fg'],
+ TkcRectangle.new(@canvas, box(x, y, 4), :fill=>'', :outline=>@C['fg'],
:width=>3, :tag=>'I13R')
xy = [112, 687] # Label
- TkcText.new(@canvas, xy, :text=>'FAX', :fill=>@C['fg'],
+ TkcText.new(@canvas, xy, :text=>'FAX', :fill=>@C['fg'],
:font=>['Times Roman', 12, :bold])
xy = [762, 687]
- TkcText.new(@canvas, xy, :text=>'FAX', :fill=>@C['fg'],
+ TkcText.new(@canvas, xy, :text=>'FAX', :fill=>@C['fg'],
:font=>['Times Roman', 12, :bold])
xy = [138, 663, 148, 636, 178, 636] # Paper guide
@@ -1133,7 +1133,7 @@ class TkGoldberg_Demo
xy = [732, 663, 722, 636, 692, 636]
TkcLine.new(@canvas, xy, :smooth=>true, :fill=>@C['fg'], :width=>3)
- sine([149, 688, 720, 688], 5, 15,
+ sine([149, 688, 720, 688], 5, 15,
:tag=>'I13_s', :fill=>@C['fg'], :width=>3)
end
@@ -1163,17 +1163,17 @@ class TkGoldberg_Demo
def draw14
color = @C['14']
xy = [102, 661, 113, 632, 130, 618] # Left paper edge
- TkcLine.new(@canvas, xy, :smooth=>true, :fill=>color,
+ TkcLine.new(@canvas, xy, :smooth=>true, :fill=>color,
:width=>3, :tag=>'I14L_0')
xy = [148, 629, 125, 640, 124, 662] # Right paper edge
- TkcLine.new(@canvas, xy, :smooth=>true, :fill=>color,
+ TkcLine.new(@canvas, xy, :smooth=>true, :fill=>color,
:width=>3, :tag=>'I14L_1')
draw14a('L')
xy = [
768.0, 662.5, 767.991316225, 662.433786215, 767.926187912, 662.396880171
]
- TkcLine.new(@canvas, xy, :smooth=>true, :fill=>color,
+ TkcLine.new(@canvas, xy, :smooth=>true, :fill=>color,
:width=>3, :tag=>'I14R_0')
@canvas.lower('I14R_0')
# NB. these numbers are VERY sensitive, you must start with final size
@@ -1181,7 +1181,7 @@ class TkGoldberg_Demo
xy = [
745.947897349, 662.428358855, 745.997829056, 662.452239237, 746.0, 662.5
]
- TkcLine.new(@canvas, xy, :smooth=>true, :fill=>color,
+ TkcLine.new(@canvas, xy, :smooth=>true, :fill=>color,
:width=>3, :tag=>'I14R_1')
@canvas.lower('I14R_1')
end
@@ -1194,11 +1194,11 @@ class TkGoldberg_Demo
x3, y3, x4, y4, x5, y5 = xy2
zz = [
- x0, y0, x0, y0, xy, x2, y2, x2, y2,
+ x0, y0, x0, y0, xy, x2, y2, x2, y2,
x3, y3, x3, y3, xy2, x5, y5, x5, y5
].flatten
@canvas.delete("I14#{side}")
- TkcPolygon.new(@canvas, zz, :tag=>"I14#{side}", :smooth=>true,
+ TkcPolygon.new(@canvas, zz, :tag=>"I14#{side}", :smooth=>true,
:fill=>color, :outline=>color, :width=>3)
@canvas.lower("I14#{side}")
end
@@ -1251,7 +1251,7 @@ class TkGoldberg_Demo
xy = [765, 557, 784, 583]
TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>2)
- sine([658, 580, 765, 580], 3, 15,
+ sine([658, 580, 765, 580], 3, 15,
:tag=>'I15_s', :fill=>@C['fg'], :width=>3)
end
@@ -1290,7 +1290,7 @@ class TkGoldberg_Demo
xy = [722, 485, 791, 556]
TkcRectangle.new(@canvas, xy, :fill=>'', :outline=>@C['fg'], :width=>3)
xy = box(752, 515, 25) # Bell
- TkcOval.new(@canvas, xy, :fill=>color, :outline=>'black',
+ TkcOval.new(@canvas, xy, :fill=>color, :outline=>'black',
:tag=>'I16b', :width=>2)
xy = box(752, 515, 5) # Bell button
TkcOval.new(@canvas, xy, :fill=>'black', :outline=>'black', :tag=>'I16b')
@@ -1329,24 +1329,24 @@ class TkGoldberg_Demo
TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3)
xy = [664, 523, 717, 549] # Body
- TkcArc.new(@canvas, xy, :outline=>@C['fg'], :fill=>color, :width=>3,
+ TkcArc.new(@canvas, xy, :outline=>@C['fg'], :fill=>color, :width=>3,
:style=>:chord, :start=>128, :extent=>260, :tag=>'I17')
xy = [709, 554, 690, 543] # Paw
- TkcOval.new(@canvas, xy, :outline=>@C['fg'], :fill=>color,
+ TkcOval.new(@canvas, xy, :outline=>@C['fg'], :fill=>color,
:width=>3, :tag=>'I17')
xy = [657, 544, 676, 555]
- TkcOval.new(@canvas, xy, :outline=>@C['fg'], :fill=>color,
+ TkcOval.new(@canvas, xy, :outline=>@C['fg'], :fill=>color,
:width=>3, :tag=>'I17')
xy = box(660, 535, 15) # Lower face
- TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc,
+ TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc,
:start=>150, :extent=>240, :tag=>'I17_')
- TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :width=>1,
+ TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :width=>1,
:style=>:chord, :start=>150, :extent=>240, :tag=>'I17_')
xy = [674, 529, 670, 513, 662, 521, 658, 521, 650, 513, 647, 529] # Ears
TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
- TkcPolygon.new(@canvas, xy, :fill=>color, :outline=>'', :width=>1,
+ TkcPolygon.new(@canvas, xy, :fill=>color, :outline=>'', :width=>1,
:tag=>['I17_', 'I17_c'])
xy = [652, 542, 628, 539] # Whiskers
TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
@@ -1356,23 +1356,23 @@ class TkGoldberg_Demo
TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
xy = [668, 543, 687, 538]
- TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3,
+ TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3,
:tag=>['I17_', 'I17_w'])
xy = [668, 544, 688, 546]
- TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3,
+ TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3,
:tag=>['I17_', 'I17_w'])
xy = [668, 547, 688, 553]
- TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3,
+ TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3,
:tag=>['I17_', 'I17_w'])
xy = [649, 530, 654, 538, 659, 530] # Left eye
- TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2,
+ TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2,
:smooth=>true, :tag=>'I17')
xy = [671, 530, 666, 538, 661, 530] # Right eye
- TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2,
+ TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2,
:smooth=>true, :tag=>'I17')
xy = [655, 543, 660, 551, 665, 543] # Mouth
- TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2,
+ TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2,
:smooth=>true, :tag=>'I17')
end
@@ -1385,10 +1385,10 @@ class TkGoldberg_Demo
TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3,
:smooth=>true, :tag=>'I17_')
xy = box(654, 530, 4) # Left eye
- TkcOval.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :fill=>'',
+ TkcOval.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :fill=>'',
:tag=>'I17_')
xy = box(666, 530, 4) # Right eye
- TkcOval.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :fill=>'',
+ TkcOval.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :fill=>'',
:tag=>'I17_')
@canvas.move('I17_', 0, -20) # Move face up
@@ -1398,19 +1398,19 @@ class TkGoldberg_Demo
TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
xy = [ # Body
- 675, 506, 694, 489, 715, 513, 715, 513, 715, 513, 716, 525,
- 716, 525, 716, 525, 706, 530, 695, 530, 679, 535, 668, 527,
+ 675, 506, 694, 489, 715, 513, 715, 513, 715, 513, 716, 525,
+ 716, 525, 716, 525, 706, 530, 695, 530, 679, 535, 668, 527,
668, 527, 668, 527, 675, 522, 676, 517, 677, 512
]
- TkcPolygon.new(@canvas, xy, :fill=>@canvas.itemcget('I17_c', :fill),
- :outline=>@C['fg'], :width=>3, :smooth=>true,
+ TkcPolygon.new(@canvas, xy, :fill=>@canvas.itemcget('I17_c', :fill),
+ :outline=>@C['fg'], :width=>3, :smooth=>true,
:tag=>'I17_')
xy = [716, 514, 716, 554] # Back leg
TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
xy = [694, 532, 694, 554] # 2nd back leg
TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
xy = [715, 514, 718, 506, 719, 495, 716, 488] # Tail
- TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3,
+ TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3,
:smooth=>true, :tag=>'I17_')
@canvas.raise('I17w') # Make whiskers visible
@@ -1439,14 +1439,14 @@ class TkGoldberg_Demo
step = get_step(18, step)
pos = [
- [587, 506], [537, 506], [466, 506], [376, 506], [266, 506, :x],
+ [587, 506], [537, 506], [466, 506], [376, 506], [266, 506, :x],
[136, 506], [16, 506], [-100, -100]
]
b = []
b[0] = [490, 502, 719, 507, 524, 512] # Band collapsing
b[1] = [
- 491, 503, 524, 557, 563, 505, 559, 496, 546, 506, 551, 525,
+ 491, 503, 524, 557, 563, 505, 559, 496, 546, 506, 551, 525,
553, 536, 538, 534, 532, 519, 529, 499
]
b[2] = [
@@ -1477,54 +1477,54 @@ class TkGoldberg_Demo
color = @C['19']
xx = [[249, 181], [155, 118], [86, 55], [22, 0]]
xx.each{|x1, x2|
- TkcRectangle.new(@canvas, x1, 453, x2, 467,
+ TkcRectangle.new(@canvas, x1, 453, x2, 467,
:fill=>color, :outline=>'', :tag=>'I19')
- TkcLine.new(@canvas, x1, 453, x2, 453,
+ TkcLine.new(@canvas, x1, 453, x2, 453,
:fill=>@C['fg'], :width=>1) # Pipe top
- TkcLine.new(@canvas, x1, 467, x2, 467,
+ TkcLine.new(@canvas, x1, 467, x2, 467,
:fill=>@C['fg'], :width=>1) # Pipe bottom
}
@canvas.raise('I11i')
xy = box(168, 460, 16) # Bulge by the joint
TkcOval.new(@canvas, xy, :fill=>color, :outline=>'')
- TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1, :style=>:arc,
+ TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1, :style=>:arc,
:start=>21, :extent=>136)
- TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1, :style=>:arc,
+ TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1, :style=>:arc,
:start=>-21, :extent=>-130)
xy = [249, 447, 255, 473] # First joint 26x6
TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>1)
xy = box(257, 433, 34) # Bend up
- TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :width=>1,
+ TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :width=>1,
:style=>:pie, :start=>0, :extent=>-91)
- TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1,
+ TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1,
:style=>:arc, :start=>0, :extent=>-90)
xy = box(257, 433, 20)
- TkcArc.new(@canvas, xy, :outline=>'', :fill=>@C['bg'], :width=>1,
+ TkcArc.new(@canvas, xy, :outline=>'', :fill=>@C['bg'], :width=>1,
:style=>:pie, :start=>0, :extent=>-92)
- TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1,
+ TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1,
:style=>:arc, :start=>0, :extent=>-90)
xy = box(257, 421, 34) # Bend left
- TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :width=>1,
+ TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :width=>1,
:style=>:pie, :start=>0, :extent=>91)
- TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1,
+ TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1,
:style=>:arc, :start=>0, :extent=>90)
xy = box(257, 421, 20)
- TkcArc.new(@canvas, xy, :outline=>'', :fill=>@C['bg'], :width=>1,
+ TkcArc.new(@canvas, xy, :outline=>'', :fill=>@C['bg'], :width=>1,
:style=>:pie, :start=>0, :extent=>90)
- TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1,
+ TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1,
:style=>:arc, :start=>0, :extent=>90)
xy = box(243, 421, 34) # Bend down
- TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :width=>1,
+ TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :width=>1,
:style=>:pie, :start=>90, :extent=>90)
- TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1,
+ TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1,
:style=>:arc, :start=>90, :extent=>90)
xy = box(243, 421, 20)
- TkcArc.new(@canvas, xy, :outline=>'', :fill=>@C['bg'], :width=>1,
+ TkcArc.new(@canvas, xy, :outline=>'', :fill=>@C['bg'], :width=>1,
:style=>:pie, :start=>90, :extent=>90)
- TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1,
+ TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1,
:style=>:arc, :start=>90, :extent=>90)
xy = [270, 427, 296, 433] # 2nd joint bottom
@@ -1566,7 +1566,7 @@ class TkGoldberg_Demo
pos = [451, 462, 473, 484, 496, 504, 513, 523, 532]
freq = [20, 40, 40, 40, 40, 40, 40, 40, 40]
pos = [
- [451, 20], [462, 40], [473, 40], [484, 40], [496, 40],
+ [451, 20], [462, 40], [473, 40], [484, 40], [496, 40],
[504, 40], [513, 40], [523, 40], [532, 40, :x]
]
return 0 if step >= pos.length
@@ -1583,11 +1583,11 @@ class TkGoldberg_Demo
color = @C['20']
@canvas.delete('I20')
- sine([208, 428, 208, y], 4, f, :tag=>['I20', 'I20s'],
+ sine([208, 428, 208, y], 4, f, :tag=>['I20', 'I20s'],
:width=>3, :fill=>color, :smooth=>true)
- TkcLine.new(@canvas, @canvas.coords('I20s'), :width=>3,
+ TkcLine.new(@canvas, @canvas.coords('I20s'), :width=>3,
:fill=>color, :smooth=>1, :tag=>['I20', 'I20a'])
- TkcLine.new(@canvas, @canvas.coords('I20s'), :width=>3,
+ TkcLine.new(@canvas, @canvas.coords('I20s'), :width=>3,
:fill=>color, :smooth=>1, :tag=>['I20', 'I20b'])
@canvas.move('I20a', 8, 0)
@canvas.move('I20b', 16, 0)
@@ -1603,18 +1603,18 @@ class TkGoldberg_Demo
xy = [245, 490, 237, 535] # Right side
xy2 = [189, 535, 181, 490] # Left side
- TkcPolygon.new(@canvas, xy + xy2, :fill=>color, :outline=>'',
+ TkcPolygon.new(@canvas, xy + xy2, :fill=>color, :outline=>'',
:tag=>['I21', 'I21f'])
TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2, :tag=>'I21')
TkcLine.new(@canvas, xy2, :fill=>@C['fg'], :width=>2, :tag=>'I21')
xy = [182, 486, 244, 498] # Top
- TkcOval.new(@canvas, xy, :fill=>color, :outline=>'', :width=>2,
+ TkcOval.new(@canvas, xy, :fill=>color, :outline=>'', :width=>2,
:tag=>['I21', 'I21f'])
- TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'], :width=>2,
+ TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'], :width=>2,
:tag=>['I21', 'I21t'])
xy = [189, 532, 237, 540] # Bottom
- TkcOval.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>2,
+ TkcOval.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>2,
:tag=>['I21', 'I21b'])
end
@@ -1637,7 +1637,7 @@ class TkGoldberg_Demo
@canvas.itemconfigure('I21b', :fill=>@C['20'])
@canvas.delete('I21w')
- TkcPolygon.new(@canvas, x2, y2, x1, y1, xx1, yy1, xx2, yy1,
+ TkcPolygon.new(@canvas, x2, y2, x1, y1, xx1, yy1, xx2, yy1,
:tag=>['I21', 'I21w'], :outline=>'', :fill=>@C['20'])
@canvas.lower('I21w', 'I21')
@canvas.raise('I21b')
@@ -1673,21 +1673,21 @@ class TkGoldberg_Demo
color3 = @C['23c']
xy = [185, 623, 253, 650] # Block
- TkcRectangle.new(@canvas, xy, :fill=>'black', :outline=>@C['fg'],
+ TkcRectangle.new(@canvas, xy, :fill=>'black', :outline=>@C['fg'],
:width=>2, :tag=>'I23a')
xy = [187, 592, 241, 623] # Balloon
TkcOval.new(@canvas, xy, :outline=>'', :fill=>color, :tag=>'I23b')
- TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :tag=>'I23b',
+ TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :tag=>'I23b',
:style=>:arc, :start=>12, :extent=>336)
xy = [239, 604, 258, 589, 258, 625, 239, 610] # Balloon nozzle
TkcPolygon.new(@canvas, xy, :outline=>'', :fill=>color, :tag=>'I23b')
TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I23b')
xy = [285, 611, 250, 603] # Dart body
- TkcOval.new(@canvas, xy, :fill=>color2, :outline=>@C['fg'],
+ TkcOval.new(@canvas, xy, :fill=>color2, :outline=>@C['fg'],
:width=>3, :tag=>'I23d')
xy = [249, 596, 249, 618, 264, 607, 249, 596] # Dart tail
- TkcPolygon.new(@canvas, xy, :fill=>color3, :outline=>@C['fg'],
+ TkcPolygon.new(@canvas, xy, :fill=>color3, :outline=>@C['fg'],
:width=>3, :tag=>'I23d')
xy = [249, 607, 268, 607] # Dart detail
TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I23d')
@@ -1699,7 +1699,7 @@ class TkGoldberg_Demo
step = get_step(23, step)
pos = [
- [277, 607], [287, 607], [307, 607, :x], [347, 607], [407, 607],
+ [277, 607], [287, 607], [307, 607, :x], [347, 607], [407, 607],
[487, 607], [587, 607], [687, 607], [787, 607], [-100, -100]
]
@@ -1719,7 +1719,7 @@ class TkGoldberg_Demo
def draw24
color = @C['24a']
xy = [366, 518, 462, 665] # Balloon
- TkcOval.new(@canvas, xy, :fill=>color, :outline=>@C['fg'],
+ TkcOval.new(@canvas, xy, :fill=>color, :outline=>@C['fg'],
:width=>3, :tag=>'I24')
xy = [414, 666, 414, 729] # String
TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I24')
@@ -1728,16 +1728,16 @@ class TkGoldberg_Demo
:width=>3, :tag=>'I24')
xy = [387, 567, 390, 549, 404, 542] # Reflections
- TkcLine.new(@canvas, xy, :fill=>@C['fg'], :smooth=>true,
+ TkcLine.new(@canvas, xy, :fill=>@C['fg'], :smooth=>true,
:width=>2, :tag=>'I24')
xy = [395, 568, 399, 554, 413, 547]
- TkcLine.new(@canvas, xy, :fill=>@C['fg'], :smooth=>true,
+ TkcLine.new(@canvas, xy, :fill=>@C['fg'], :smooth=>true,
:width=>2, :tag=>'I24')
xy = [403, 570, 396, 555, 381, 553]
- TkcLine.new(@canvas, xy, :fill=>@C['fg'], :smooth=>true,
+ TkcLine.new(@canvas, xy, :fill=>@C['fg'], :smooth=>true,
:width=>2, :tag=>'I24')
xy = [408, 564, 402, 547, 386, 545]
- TkcLine.new(@canvas, xy, :fill=>@C['fg'], :smooth=>true,
+ TkcLine.new(@canvas, xy, :fill=>@C['fg'], :smooth=>true,
:width=>2, :tag=>'I24')
end
@@ -1750,16 +1750,16 @@ class TkGoldberg_Demo
if step == 0
@canvas.delete('I24') # Exploding balloon
xy = [
- 347, 465, 361, 557, 271, 503, 272, 503, 342, 574, 259, 594,
- 259, 593, 362, 626, 320, 737, 320, 740, 398, 691, 436, 738,
- 436, 739, 476, 679, 528, 701, 527, 702, 494, 627, 548, 613,
- 548, 613, 480, 574, 577, 473, 577, 473, 474, 538, 445, 508,
+ 347, 465, 361, 557, 271, 503, 272, 503, 342, 574, 259, 594,
+ 259, 593, 362, 626, 320, 737, 320, 740, 398, 691, 436, 738,
+ 436, 739, 476, 679, 528, 701, 527, 702, 494, 627, 548, 613,
+ 548, 613, 480, 574, 577, 473, 577, 473, 474, 538, 445, 508,
431, 441, 431, 440, 400, 502, 347, 465, 347, 465
]
- TkcPolygon.new(@canvas, xy, :tag=>'I24', :fill=>@C['24b'],
+ TkcPolygon.new(@canvas, xy, :tag=>'I24', :fill=>@C['24b'],
:outline=>@C['24a'], :width=>10, :smooth=>true)
msg = Tk.subst(@S['message'].value)
- TkcText.new(@canvas, centroid('I24'), :text=>msg, :tag=>['I24', 'I24t'],
+ TkcText.new(@canvas, centroid('I24'), :text=>msg, :tag=>['I24', 'I24t'],
:justify=>:center, :font=>['Times Roman', 18, :bold])
return 1
end
@@ -1790,9 +1790,9 @@ class TkGoldberg_Demo
if step >= 3
@canvas.delete('I24', 'I26')
- TkcText.new(@canvas, 430, 735, :anchor=>:s, :tag=>'I26',
- #:text=>'click to continue',
- :text=>'¥¯¥ê¥Ã¥¯¤Ç¥ê¥»¥Ã¥È¤·¤Þ¤¹',
+ TkcText.new(@canvas, 430, 735, :anchor=>:s, :tag=>'I26',
+ #:text=>'click to continue',
+ :text=>'¥¯¥ê¥Ã¥¯¤Ç¥ê¥»¥Ã¥È¤·¤Þ¤¹',
:font=>['Times Roman', 20, :bold])
@canvas.bind('1', proc{reset})
return 4
@@ -1972,11 +1972,11 @@ class TkGoldberg_Demo
def sparkle(oxy, tag)
xy = [
- [299, 283], [298, 302], [295, 314], [271, 331],
+ [299, 283], [298, 302], [295, 314], [271, 331],
[239, 310], [242, 292], [256, 274], [281, 273]
]
xy.each{|x, y|
- TkcLine.new(@canvas, 271, 304, x, y,
+ TkcLine.new(@canvas, 271, 304, x, y,
:fill=>'white', :width=>3, :tag=>tag)
}
move_abs(tag, oxy)
diff --git a/ext/tk/sample/demos-jp/icon.rb b/ext/tk/sample/demos-jp/icon.rb
index 935519435b..a2ca6651dc 100644
--- a/ext/tk/sample/demos-jp/icon.rb
+++ b/ext/tk/sample/demos-jp/icon.rb
@@ -5,7 +5,7 @@
# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($icon_demo) && $icon_demo
- $icon_demo.destroy
+ $icon_demo.destroy
$icon_demo = nil
end
diff --git a/ext/tk/sample/demos-jp/image1.rb b/ext/tk/sample/demos-jp/image1.rb
index 10078c6c22..d9435cc1a2 100644
--- a/ext/tk/sample/demos-jp/image1.rb
+++ b/ext/tk/sample/demos-jp/image1.rb
@@ -5,7 +5,7 @@
# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($image1_demo) && $image1_demo
- $image1_demo.destroy
+ $image1_demo.destroy
$image1_demo = nil
end
diff --git a/ext/tk/sample/demos-jp/image2.rb b/ext/tk/sample/demos-jp/image2.rb
index 3e8b87461f..1bb2c9e9c3 100644
--- a/ext/tk/sample/demos-jp/image2.rb
+++ b/ext/tk/sample/demos-jp/image2.rb
@@ -5,7 +5,7 @@
# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($image2_demo) && $image2_demo
- $image2_demo.destroy
+ $image2_demo.destroy
$image2_demo = nil
end
diff --git a/ext/tk/sample/demos-jp/image3.rb b/ext/tk/sample/demos-jp/image3.rb
index 625e69a21d..12b8aafd8e 100644
--- a/ext/tk/sample/demos-jp/image3.rb
+++ b/ext/tk/sample/demos-jp/image3.rb
@@ -9,7 +9,7 @@
# toplevel widget
if defined?($image3_demo) && $image3_demo
- $image3_demo.destroy
+ $image3_demo.destroy
$image3_demo = nil
end
@@ -22,7 +22,7 @@ $image3_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($image3_demo).pack(:fill=>:both, :expand=>true)
-#
+#
def loadDir3(w)
w.delete(0,'end')
Dir.glob([$dirName,'*'].join(File::Separator)).sort.each{|f|
@@ -38,10 +38,10 @@ end
# Arguments:
# w - Name of the toplevel window of the demo.
def selectAndLoadDir3(w, lbox)
- dir = Tk.chooseDirectory(:initialdir=>$dirName.value,
+ dir = Tk.chooseDirectory(:initialdir=>$dirName.value,
:parent=>w, :mustexist=>true)
if dir.length > 0
- $dirName.value = dir
+ $dirName.value = dir
loadDir3(lbox)
end
end
@@ -94,11 +94,11 @@ image3_f = TkFrame.new(base_frame).pack(:fill=>:both, :expand=>true)
image3_df = TkLabelFrame.new(base_frame, :text=>'¥Ç¥£¥ì¥¯¥È¥ê:')
-image3_ff = TkLabelFrame.new(base_frame, :text=>'¥Õ¥¡¥¤¥ë:',
+image3_ff = TkLabelFrame.new(base_frame, :text=>'¥Õ¥¡¥¤¥ë:',
:padx=>'2m', :pady=>'2m')
image3_lbx = TkListbox.new(image3_ff, :width=>20, :height=>10) {
pack(:side=>:left, :fill=>:y, :expand=>true)
- yscrollbar(TkScrollbar.new(image3_ff).pack(:side=>:left, :fill=>:y,
+ yscrollbar(TkScrollbar.new(image3_ff).pack(:side=>:left, :fill=>:y,
:expand=>true))
insert(0, *(%w(earth.gif earthris.gif teapot.ppm)))
bind('Double-1', proc{|x,y| loadImage3(self, x, y)}, '%x %y')
@@ -109,7 +109,7 @@ image3_ent = TkEntry.new(image3_df, :width=>30, :textvariable=>$dirName){
bind('Return', proc{loadDir3(image3_lbx)})
}
-TkButton.new(image3_df, :pady=>0, :padx=>'2m', :text=>"¥Ç¥£¥ì¥¯¥È¥êÁªÂò",
+TkButton.new(image3_df, :pady=>0, :padx=>'2m', :text=>"¥Ç¥£¥ì¥¯¥È¥êÁªÂò",
:command=>proc{selectAndLoadDir3(image3_ent, image3_lbx)}) {
pack(:side=>:left, :fill=>:y, :padx=>[0, '2m'], :pady=>'2m')
}
@@ -121,7 +121,7 @@ image3_if = TkLabelFrame.new(base_frame, :text=>'¥¤¥á¡¼¥¸:') {|f|
Tk.grid(image3_df, '-',
:sticky=>:ew, :padx=>'1m', :pady=>'1m', :in=>image3_f)
-Tk.grid(image3_ff, image3_if,
+Tk.grid(image3_ff, image3_if,
:sticky=>:nw, :padx=>'1m', :pady=>'1m', :in=>image3_f)
TkGrid.columnconfigure(image3_f, 1, :weight=>1)
diff --git a/ext/tk/sample/demos-jp/items.rb b/ext/tk/sample/demos-jp/items.rb
index 4440905db8..64ceeff3ec 100644
--- a/ext/tk/sample/demos-jp/items.rb
+++ b/ext/tk/sample/demos-jp/items.rb
@@ -5,7 +5,7 @@
# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($items_demo) && $items_demo
- $items_demo.destroy
+ $items_demo.destroy
$items_demo = nil
end
@@ -73,11 +73,11 @@ TkFrame.new(base_frame) {|cf|
c.pack('in'=>cf, 'expand'=>'yes', 'fill'=>'both')
else
- c.grid('in'=>cf, 'row'=>0, 'column'=>0,
+ c.grid('in'=>cf, 'row'=>0, 'column'=>0,
'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
- vs.grid('row'=>0, 'column'=>1,
+ vs.grid('row'=>0, 'column'=>1,
'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
- hs.grid('row'=>1, 'column'=>0,
+ hs.grid('row'=>1, 'column'=>0,
'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
TkGrid.rowconfigure(cf, 0, 'weight'=>1, 'minsize'=>0)
TkGrid.columnconfigure(cf, 0, 'weight'=>1, 'minsize'=>0)
@@ -118,8 +118,8 @@ $tag_item = TkcGroup.new(cvs)
# Set up demos within each of the areas of the grid.
TkcText.new(cvs, '5c', '.2c', 'text'=>'¥é¥¤¥ó', 'anchor'=>'n')
-TkcLine.new(cvs, '1c', '1c', '3c', '1c', '1c', '4c', '3c', '4c',
- 'width'=>2, 'fill'=>blue, 'capstyle'=>'butt',
+TkcLine.new(cvs, '1c', '1c', '3c', '1c', '1c', '4c', '3c', '4c',
+ 'width'=>2, 'fill'=>blue, 'capstyle'=>'butt',
'join'=>'miter', 'tags'=>$tag_item )
TkcLine.new(cvs, '4.67c','1c','4.67c','4c', 'arrow'=>'last', 'tags'=>$tag_item)
TkcLine.new(cvs, '6.33c','1c','6.33c','4c', 'arrow'=>'both', 'tags'=>$tag_item)
@@ -127,38 +127,38 @@ TkcLine.new(cvs, '5c','6c','9c','6c','9c','1c','8c','1c','8c','4.8c','8.8c',
'4.8c','8.8c','1.2c','8.2c','1.2c','8.2c','4.6c','8.6c','4.6c',
'8.6c','1.4c','8.4c','1.4c','8.4c','4.4c',
'width'=>3, 'fill'=>red, 'tags'=>$tag_item )
-TkcLine.new(cvs, '1c','5c','7c','5c','7c','7c','9c','7c', 'width'=>'.5c',
+TkcLine.new(cvs, '1c','5c','7c','5c','7c','7c','9c','7c', 'width'=>'.5c',
'stipple'=>'@'+[$demo_dir,'..',
- 'images','gray25.xbm'].join(File::Separator),
+ 'images','gray25.xbm'].join(File::Separator),
'arrow'=>'both', 'arrowshape'=>'15 15 7', 'tags'=>$tag_item )
TkcLine.new(cvs, '1c','7c','1.75c','5.8c','2.5c','7c','3.25c','5.8c','4c','7c',
- 'width'=>'.5c', 'capstyle'=>'round', 'join'=>'round',
+ 'width'=>'.5c', 'capstyle'=>'round', 'join'=>'round',
'tags'=>$tag_item )
-TkcText.new(cvs, '15c', '.2c',
+TkcText.new(cvs, '15c', '.2c',
'text'=>'¶ÊÀþ (³ê¤é¤«¤Ë¤Ä¤Ê¤¤¤ÀľÀþ)', 'anchor'=>'n')
-TkcLine.new(cvs, '11c','4c','11.5c','1c','13.5c','1c','14c','4c',
+TkcLine.new(cvs, '11c','4c','11.5c','1c','13.5c','1c','14c','4c',
'smooth'=>'on', 'fill'=>blue, 'tags'=>$tag_item )
-TkcLine.new(cvs, '15.5c','1c','19.5c','1.5c','15.5c','4.5c','19.5c','4c',
+TkcLine.new(cvs, '15.5c','1c','19.5c','1.5c','15.5c','4.5c','19.5c','4c',
'smooth'=>'on', 'arrow'=>'both', 'width'=>3, 'tags'=>$tag_item )
-TkcLine.new(cvs, '12c','6c','13.5c','4.5c','16.5c','7.5c','18c','6c',
+TkcLine.new(cvs, '12c','6c','13.5c','4.5c','16.5c','7.5c','18c','6c',
'16.5c','4.5c','13.5c','7.5c','12c','6c',
- 'smooth'=>'on', 'width'=>'3m', 'capstyle'=>'round',
+ 'smooth'=>'on', 'width'=>'3m', 'capstyle'=>'round',
'stipple'=>'@'+[$demo_dir, '..',
- 'images', 'gray25.xbm'].join(File::Separator),
+ 'images', 'gray25.xbm'].join(File::Separator),
'fill'=>red, 'tags'=>$tag_item )
TkcText.new(cvs, '25c', '.2c', 'text'=>'¿³Ñ·Á', 'anchor'=>'n')
TkcPolygon.new(cvs, '21c','1.0c','22.5c','1.75c','24c','1.0c','23.25c','2.5c',
'24c','4.0c','22.5c','3.25c','21c','4.0c','21.75c','2.5c',
- 'fill'=>'green', 'outline'=>'black', 'width'=>4,
+ 'fill'=>'green', 'outline'=>'black', 'width'=>4,
'tags'=>$tag_item )
TkcPolygon.new(cvs, '25c','4c','25c','4c','25c','1c','26c','1c','27c','4c',
'28c','1c','29c','1c','29c','4c','29c','4c',
'fill'=>red, 'smooth'=>'on', 'tags'=> $tag_item)
TkcPolygon.new(cvs, '22c','4.5c','25c','4.5c','25c','6.75c','28c','6.75c',
'28c','5.25c','24c','5.25c','24c','6.0c','26c','6c','26c',
- '7.5c','22c','7.5c',
+ '7.5c','22c','7.5c',
'stipple'=>'@' + [$demo_dir, '..',
'images', 'gray25.xbm'].join(File::Separator),
'outline'=>'black', 'tags'=>$tag_item )
@@ -166,7 +166,7 @@ TkcPolygon.new(cvs, '22c','4.5c','25c','4.5c','25c','6.75c','28c','6.75c',
TkcText.new(cvs, '5c', '8.2c', 'text'=>'¶ë·Á', 'anchor'=>'n')
TkcRectangle.new(cvs, '1c','9.5c','4c','12.5c',
'outline'=>red, 'width'=>'3m', 'tags'=>$tag_item)
-TkcRectangle.new(cvs, '0.5c','13.5c','4.5c','15.5c',
+TkcRectangle.new(cvs, '0.5c','13.5c','4.5c','15.5c',
'fill'=>green, 'tags'=>$tag_item )
TkcRectangle.new(cvs, '6c','10c','9c','15c', 'outline'=>'',
'stipple'=>'@'+[$demo_dir,'..',
@@ -176,7 +176,7 @@ TkcRectangle.new(cvs, '6c','10c','9c','15c', 'outline'=>'',
TkcText.new(cvs, '15c', '8.2c', 'text'=>'Âʱß', 'anchor'=>'n')
TkcOval.new(cvs, '11c','9.5c','14c','12.5c',
'outline'=>red, 'width'=>'3m', 'tags'=>$tag_item)
-TkcOval.new(cvs, '10.5c','13.5c','14.5c','15.5c',
+TkcOval.new(cvs, '10.5c','13.5c','14.5c','15.5c',
'fill'=>green, 'tags'=>$tag_item )
TkcOval.new(cvs, '16c','10c','19c','15c', 'outline'=>'',
'stipple'=>'@'+[$demo_dir,'..',
@@ -185,40 +185,40 @@ TkcOval.new(cvs, '16c','10c','19c','15c', 'outline'=>'',
TkcText.new(cvs, '25c', '8.2c', 'text'=>'¥Æ¥­¥¹¥È', 'anchor'=>'n')
TkcRectangle.new(cvs, '22.4c','8.9c','22.6c','9.1c')
-TkcText.new(cvs, '22.5c', '9c', 'anchor'=>'n', 'font'=>font1, 'width'=>'4c',
+TkcText.new(cvs, '22.5c', '9c', 'anchor'=>'n', 'font'=>font1, 'width'=>'4c',
'text'=>'û¤¤¥Æ¥­¥¹¥È¡£¥ï¡¼¥É¥é¥Ã¥×¡¢º¸Â·¤¨¡¢¥¢¥ó¥«¡¼¤ÏËÌ(¾å)¡£¢¢¤Ï³Æ¥Æ¥­¥¹¥È¤Î¥¢¥ó¥«¡¼¥Ý¥¤¥ó¥È¤ò¼¨¤¹¡£', 'tags'=>$tag_item )
TkcRectangle.new(cvs, '25.4c','10.9c','25.6c','11.1c')
-TkcText.new(cvs, '25.5c', '11c', 'anchor'=>'w', 'font'=>font1, 'fill'=>blue,
+TkcText.new(cvs, '25.5c', '11c', 'anchor'=>'w', 'font'=>font1, 'fill'=>blue,
'text'=>"¤¤¤¯¤Ä¤«¤Î¹Ô¡£\n¤½¤ì¤¾¤ìÆÈΩ¤Ë\n¹Ô·¤¨¡£\nÁ´¤Æº¸Ã¼¤¬¥¢¥ó¥«¡¼¤µ¤ì¤Æ¤¤¤ë¡£", 'justify'=>'center', 'tags'=>$tag_item )
TkcRectangle.new(cvs, '24.9c','13.9c','25.1c','14.1c')
if $tk_version =~ /^4\.[01]/
- TkcText.new(cvs, '25c', '14c', 'anchor'=>'c', 'font'=>font2, 'fill'=>red,
+ TkcText.new(cvs, '25c', '14c', 'anchor'=>'c', 'font'=>font2, 'fill'=>red,
'stipple'=>'@' + [$demo_dir, '..',
'images', 'grey.5'].join(File::Separator),
'text'=>'Stippled characters', 'tags'=>$tag_item )
else
- TkcText.new(cvs, '25c', '14c', 'anchor'=>'c', 'font'=>font2, 'fill'=>red,
- 'stipple'=>'gray50', 'text'=>'Stippled characters',
+ TkcText.new(cvs, '25c', '14c', 'anchor'=>'c', 'font'=>font2, 'fill'=>red,
+ 'stipple'=>'gray50', 'text'=>'Stippled characters',
'tags'=>$tag_item )
end
TkcText.new(cvs, '5c', '16.2c', 'text'=>'¸Ì', 'anchor'=>'n')
-TkcArc.new(cvs, '0.5c','17c','7c','20c', 'fill'=>green, 'outline'=>'black',
+TkcArc.new(cvs, '0.5c','17c','7c','20c', 'fill'=>green, 'outline'=>'black',
'start'=>45, 'extent'=>270, 'style'=>'pieslice', 'tags'=>$tag_item)
-#TkcArc.new(cvs, '6.5c','17c','9.5c','20c', 'width'=>'4m', 'style'=>'arc',
-# 'outline'=>blue, 'start'=>135, 'extent'=>270,
+#TkcArc.new(cvs, '6.5c','17c','9.5c','20c', 'width'=>'4m', 'style'=>'arc',
+# 'outline'=>blue, 'start'=>135, 'extent'=>270,
# 'outlinestipple'=>'@' + ['images', 'grey.25'].join(File::Separator),
# 'tags'=>$tag_item)
-TkcArc.new(cvs, '6.5c','17c','9.5c','20c', 'width'=>'4m', 'style'=>'arc',
- 'outline'=>blue, 'start'=>135, 'extent'=>270,
+TkcArc.new(cvs, '6.5c','17c','9.5c','20c', 'width'=>'4m', 'style'=>'arc',
+ 'outline'=>blue, 'start'=>135, 'extent'=>270,
'outlinestipple'=>'@'+[$demo_dir, '..',
'images','gray25.xbm'].join(File::Separator),
'tags'=>$tag_item)
-TkcArc.new(cvs, '0.5c','20c','9.5c','24c', 'width'=>'4m', 'style'=>'pieslice',
- 'fill'=>'', 'outline'=>red, 'start'=>225, 'extent'=>90,
+TkcArc.new(cvs, '0.5c','20c','9.5c','24c', 'width'=>'4m', 'style'=>'pieslice',
+ 'fill'=>'', 'outline'=>red, 'start'=>225, 'extent'=>90,
'tags'=>$tag_item)
TkcArc.new(cvs, '5.5c','20.5c','9.5c','23.5c', 'width'=>'4m', 'style'=>'chord',
- 'fill'=>blue, 'outline'=>'', 'start'=>45, 'extent'=>270,
+ 'fill'=>blue, 'outline'=>'', 'start'=>45, 'extent'=>270,
'tags'=>$tag_item)
TkcText.new(cvs, '15c', '16.2c', 'text'=>'¥Ó¥Ã¥È¥Þ¥Ã¥×', 'anchor'=>'n')
@@ -253,17 +253,17 @@ TkcText.new(cvs, '25c', '16.2c', 'text'=>'¥¦¥£¥ó¥É¥¦', 'anchor'=>'n')
TkButton.new(cvs) {|b|
text '²¡¤·¤Æ¤Í'
command proc{butPress cvs, red}
- TkcWindow.new(cvs, '21c','18c',
+ TkcWindow.new(cvs, '21c','18c',
'window'=>b, 'anchor'=>'nw', 'tags'=>$tag_item)
}
TkEntry.new(cvs, 'width'=>20, 'relief'=>'sunken') {|e|
insert 'end', 'ÊÔ½¸¤·¤Æ¤Í'
- TkcWindow.new(cvs, '21c','21c',
+ TkcWindow.new(cvs, '21c','21c',
'window'=>e, 'anchor'=>'nw', 'tags'=>$tag_item)
}
-TkScale.new(cvs, 'from'=>0, 'to'=>100, 'length'=>'6c', 'sliderlength'=>'.4c',
+TkScale.new(cvs, 'from'=>0, 'to'=>100, 'length'=>'6c', 'sliderlength'=>'.4c',
'width'=>'.5c', 'tickinterval'=>0 ) {|scl|
- TkcWindow.new(cvs, '28.5c','17.5c',
+ TkcWindow.new(cvs, '28.5c','17.5c',
'window'=>scl, 'anchor'=>'n', 'tags'=>$tag_item)
}
TkcText.new(cvs, '21c', '17.9c', 'text'=>'¥Ü¥¿¥ó:', 'anchor'=>'sw')
@@ -314,7 +314,7 @@ def itemLeave(c)
$restoreCmd.call if $restoreCmd
end
-# Utility methods for stroking out a rectangle and printing what's
+# Utility methods for stroking out a rectangle and printing what's
# underneath the rectangle's area.
def itemMark(c,x,y)
@@ -328,7 +328,7 @@ def itemStroke(c,x,y)
y = c.canvasy(y)
if $areaX1 != x && $areaY1 != y
c.delete 'area'
- c.addtag_withtag 'area', TkcRectangle.new(c, $areaX1, $areaY1, x, y,
+ c.addtag_withtag 'area', TkcRectangle.new(c, $areaX1, $areaY1, x, y,
'-outline', 'black')
$areaX2 = x
$areaY2 = y
@@ -369,11 +369,11 @@ def itemDrag(c,x,y)
$lastY = y
end
-# Method that's invoked when the button embedded in the canvas
+# Method that's invoked when the button embedded in the canvas
# is invoked.
def butPress(w,color)
- i = TkcText.new(w, '25c', '18.1c',
+ i = TkcText.new(w, '25c', '18.1c',
'text'=>'¤¤¤Æ¤Æ!!', 'fill'=>color, 'anchor'=>'n')
Tk.after(500, proc{w.delete i})
end
diff --git a/ext/tk/sample/demos-jp/knightstour.rb b/ext/tk/sample/demos-jp/knightstour.rb
index ae0f13076e..d4595ea441 100644
--- a/ext/tk/sample/demos-jp/knightstour.rb
+++ b/ext/tk/sample/demos-jp/knightstour.rb
@@ -157,16 +157,16 @@ class Knights_Tour
frame = Ttk::Frame.new($knightstour)
sep = Ttk::Separator.new(frame)
Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
- TkGrid('x',
- Ttk::Button.new(frame, :text=>'¥³¡¼¥É»²¾È',
- :image=>$image['view'], :compound=>:left,
- :command=>proc{showCode 'knightstour'}),
- Ttk::Button.new(frame, :text=>'ÊĤ¸¤ë',
- :image=>$image['delete'], :compound=>:left,
+ TkGrid('x',
+ Ttk::Button.new(frame, :text=>'¥³¡¼¥É»²¾È',
+ :image=>$image['view'], :compound=>:left,
+ :command=>proc{showCode 'knightstour'}),
+ Ttk::Button.new(frame, :text=>'ÊĤ¸¤ë',
+ :image=>$image['delete'], :compound=>:left,
:command=>proc{
$knightstour.destroy
$knightstour = nil
- }),
+ }),
:padx=>4, :pady=>4)
frame.grid_columnconfigure(0, :weight=>1)
frame
@@ -178,7 +178,7 @@ class Knights_Tour
$knightstour.withdraw
base_f = Ttk::Frame.new($knightstour)
@board = Tk::Canvas.new(base_f, :width=>240, :height=>240)
- @log = Tk::Text.new(base_f, :width=>12, :height=>1,
+ @log = Tk::Text.new(base_f, :width=>12, :height=>1,
:font=>'Arial 8', :background=>'white')
scr = @log.yscrollbar(Ttk::Scrollbar.new(base_f))
@@ -188,13 +188,13 @@ class Knights_Tour
tool_f = Ttk::Frame.new($knightstour)
label = Ttk::Label.new(tool_f, :text=>'¼Â¹Ô®ÅÙ')
- scale = Ttk::Scale.new(tool_f, :from=>8, :to=>2000, :variable=>@delay,
+ scale = Ttk::Scale.new(tool_f, :from=>8, :to=>2000, :variable=>@delay,
:command=>proc{|n| set_delay(n)})
- check = Ttk::Checkbutton.new(tool_f, :text=>'È¿Éü',
+ check = Ttk::Checkbutton.new(tool_f, :text=>'È¿Éü',
:variable=>@continuous)
- @start_btn = Ttk::Button.new(tool_f, :text=>'³«»Ï',
+ @start_btn = Ttk::Button.new(tool_f, :text=>'³«»Ï',
:command=>proc{tour()})
- @exit_btn = Ttk::Button.new(tool_f, :text=>'½ªÎ»',
+ @exit_btn = Ttk::Button.new(tool_f, :text=>'½ªÎ»',
:command=>proc{_exit()})
7.downto(0){|row|
@@ -207,16 +207,16 @@ class Knights_Tour
dfill = 'tan4'
end
coords = [col * 30 + 4, row * 30 + 4, col * 30 + 30, row * 30 + 30]
- @board.create(TkcRectangle, coords,
+ @board.create(TkcRectangle, coords,
:fill=>fill, :disabledfill=>dfill,
:width=>2, :state=>:disabled)
}
}
@knight_font = TkFont.new(:size=>-24)
- @knight = TkcText.new(@board, 0, 0, :font=>@knight_font,
- :text=>Tk::UTF8_String.new('\u265e'),
- :anchor=>'nw', # :tags=>'knight',
+ @knight = TkcText.new(@board, 0, 0, :font=>@knight_font,
+ :text=>Tk::UTF8_String.new('\u265e'),
+ :anchor=>'nw', # :tags=>'knight',
:fill=>'black', :activefill=>'#600000')
@knight.coords(@board.coords(rand(64)+1)[0..1])
@knight.bind('ButtonPress-1', '%W %x %y'){|w,x,y| drag_start(w,x,y)}
diff --git a/ext/tk/sample/demos-jp/label.rb b/ext/tk/sample/demos-jp/label.rb
index 19105e6f71..2e6b3e7e57 100644
--- a/ext/tk/sample/demos-jp/label.rb
+++ b/ext/tk/sample/demos-jp/label.rb
@@ -5,7 +5,7 @@
# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($label_demo) && $label_demo
- $label_demo.destroy
+ $label_demo.destroy
$label_demo = nil
end
@@ -49,12 +49,12 @@ TkFrame.new(base_frame) {|frame|
# label demo Íѥե졼¥àÀ¸À®
f_left = TkFrame.new(base_frame)
f_right = TkFrame.new(base_frame)
-[f_left, f_right].each{|w| w.pack('side'=>'left', 'expand'=>'yes',
+[f_left, f_right].each{|w| w.pack('side'=>'left', 'expand'=>'yes',
'padx'=>10, 'pady'=>10, 'fill'=>'both')}
# label À¸À®
[ TkLabel.new(f_left, 'text'=>'ºÇ½é¤Î¥é¥Ù¥ë'),
- TkLabel.new(f_left, 'text'=>'2 ÈÖÌÜ¡£¤Á¤ç¤Ã¤ÈÉ⤭¾å¤¬¤é¤»¤Æ¤ß¤Þ¤·¤¿',
+ TkLabel.new(f_left, 'text'=>'2 ÈÖÌÜ¡£¤Á¤ç¤Ã¤ÈÉ⤭¾å¤¬¤é¤»¤Æ¤ß¤Þ¤·¤¿',
'relief'=>'raised'),
TkLabel.new(f_left, 'text'=>'3 ÈÖÌÜ¡£ÄÀ¤ó¤Ç¤¤¤Þ¤¹ ', 'relief'=>'sunken')
].each{|w| w.pack('side'=>'top', 'expand'=>'yes', 'pady'=>2, 'anchor'=>'w')}
diff --git a/ext/tk/sample/demos-jp/labelframe.rb b/ext/tk/sample/demos-jp/labelframe.rb
index cee504f4b6..11b0d27308 100644
--- a/ext/tk/sample/demos-jp/labelframe.rb
+++ b/ext/tk/sample/demos-jp/labelframe.rb
@@ -9,7 +9,7 @@
if defined?($labelframe_demo) && $labelframe_demo
- $labelframe_demo.destroy
+ $labelframe_demo.destroy
$labelframe_demo = nil
end
@@ -22,18 +22,18 @@ $labelframe_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($labelframe_demo).pack(:fill=>:both, :expand=>true)
# Some information
-TkLabel.new(base_frame,
- :font=>$font, :wraplength=>'4i', :justify=>:left,
+TkLabel.new(base_frame,
+ :font=>$font, :wraplength=>'4i', :justify=>:left,
:text=><<EOL).pack(:side=>:top)
-TkLabelFrame ¥¦¥£¥¸¥§¥Ã¥È¤Ï´ØÏ¢¤¹¤ë widget
+TkLabelFrame ¥¦¥£¥¸¥§¥Ã¥È¤Ï´ØÏ¢¤¹¤ë widget
·²¤ò¤Þ¤È¤á¤Æ¼è¤ê°·¤¦¤¿¤á¤ËÍѤ¤¤é¤ì¤Þ¤¹¡£¥é
¥Ù¥ë¤ÏÄ̾ï¤Îʸ»úÎó¤Ç¤â²¿¤é¤«¤Î¥¦¥£¥¸¥§¥Ã¥È
-¤Ç¤â¤«¤Þ¤¤¤Þ¤»¤ó¡£¤â¤·¤¢¤Ê¤¿¤¬»È¤Ã¤Æ¤¤¤ë
-Ruby ¤Ë¥ê¥ó¥¯¤µ¤ì¤Æ¤¤¤ë Tk ¥é¥¤¥Ö¥é¥ê¤¬
+¤Ç¤â¤«¤Þ¤¤¤Þ¤»¤ó¡£¤â¤·¤¢¤Ê¤¿¤¬»È¤Ã¤Æ¤¤¤ë
+Ruby ¤Ë¥ê¥ó¥¯¤µ¤ì¤Æ¤¤¤ë Tk ¥é¥¤¥Ö¥é¥ê¤¬
labelframe ¥¦¥£¥¸¥§¥Ã¥È¤ò¼ÂÁõ¤·¤Æ¤¤¤Ê¤¤
¾ì¹ç¡¢¤³¤Î¥Ç¥â¤Ï¤¦¤Þ¤¯Æ°¤«¤Ê¤¤¤Ï¤º¤Ç¤¹¡£
¤½¤Î¾ì¹ç¤Ë¤Ï labelframe ¥¦¥£¥¸¥§¥Ã¥È¤¬¼ÂÁõ
-¤µ¤ì¤Æ¤¤¤ë¤è¤¦¤Ê¤è¤ê¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤Î Tk
+¤µ¤ì¤Æ¤¤¤ë¤è¤¦¤Ê¤è¤ê¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤Î Tk
¤òÁȤ߹ç¤ï¤»¤Æ»î¤¹¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£
EOL
@@ -52,17 +52,17 @@ TkFrame.new(base_frame){|f|
}
# Demo area
-w = TkFrame.new(base_frame).pack(:side=>:bottom, :fill=>:both,
+w = TkFrame.new(base_frame).pack(:side=>:bottom, :fill=>:both,
:expand=>true)
# A group of radiobuttons in a labelframe
-TkLabelFrame.new(w, :text=>'ÁªÂòÃÍ',
+TkLabelFrame.new(w, :text=>'ÁªÂòÃÍ',
:padx=>2, :pady=>2) {|f|
grid(:row=>0, :column=>0, :pady=>'2m', :padx=>'2m')
v = TkVariable.new
(1..4).each{|i|
- TkRadiobutton.new(f, :text=>"This is value #{i}",
+ TkRadiobutton.new(f, :text=>"This is value #{i}",
:variable=>v, :value=>i) {
pack(:side=>:top, :fill=>:x, :pady=>2)
}
@@ -85,7 +85,7 @@ def lfEnableButtons(w)
end
TkLabelFrame.new(w, :pady=>2, :padx=>2){|f|
- TkCheckButton.new(f, :widgetname=>'cb', :variable=>$lfdummy,
+ TkCheckButton.new(f, :widgetname=>'cb', :variable=>$lfdummy,
:text=>"¥ª¥×¥·¥ç¥ó¤ò»ÈÍÑ", :padx=>0) {|cb|
command proc{lfEnableButtons(f)}
f.labelwidget(cb)
diff --git a/ext/tk/sample/demos-jp/mclist.rb b/ext/tk/sample/demos-jp/mclist.rb
index 37f5dfa8eb..a7834d2668 100644
--- a/ext/tk/sample/demos-jp/mclist.rb
+++ b/ext/tk/sample/demos-jp/mclist.rb
@@ -8,7 +8,7 @@
# based on "Id: mclist.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp"
if defined?($mclist_demo) && $mclist_demo
- $mclist_demo.destroy
+ $mclist_demo.destroy
$mclist_demo = nil
end
@@ -21,8 +21,8 @@ $mclist_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($mclist_demo).pack(:fill=>:both, :expand=>true)
## Explanatory text
-Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i',
- :justify=>:left, :anchor=>'n', :padding=>[10, 2, 10, 6],
+Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i',
+ :justify=>:left, :anchor=>'n', :padding=>[10, 2, 10, 6],
:text=><<EOL).pack(:fill=>:x)
Ttk¤È¤Ï¡¤¥Æ¡¼¥Þ»ØÄê²Äǽ¤Ê¿·¤·¤¤¥¦¥£¥¸¥§¥Ã¥È½¸¹ç¤Ç¤¹¡¥\
Ttk::Treeview¥¦¥£¥¸¥§¥Ã¥È¤Ï\
@@ -40,23 +40,23 @@ EOL
Ttk::Frame.new(base_frame) {|frame|
sep = Ttk::Separator.new(frame)
Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
- TkGrid('x',
- Ttk::Button.new(frame, :text=>'¥³¡¼¥É»²¾È',
- :image=>$image['view'], :compound=>:left,
- :command=>proc{showCode 'mclist'}),
- Ttk::Button.new(frame, :text=>'ÊĤ¸¤ë',
- :image=>$image['delete'], :compound=>:left,
+ TkGrid('x',
+ Ttk::Button.new(frame, :text=>'¥³¡¼¥É»²¾È',
+ :image=>$image['view'], :compound=>:left,
+ :command=>proc{showCode 'mclist'}),
+ Ttk::Button.new(frame, :text=>'ÊĤ¸¤ë',
+ :image=>$image['delete'], :compound=>:left,
:command=>proc{
$mclist_demo.destroy
$mclist_demo = nil
- }),
+ }),
:padx=>4, :pady=>4)
grid_columnconfigure(0, :weight=>1)
pack(:side=>:bottom, :fill=>:x)
}
container = Ttk::Frame.new(base_frame)
-tree = Ttk::Treeview.new(base_frame, :columns=>%w(country capital currency),
+tree = Ttk::Treeview.new(base_frame, :columns=>%w(country capital currency),
:show=>:headings)
if Tk.windowingsystem != 'aquq'
vsb = tree.yscrollbar(Ttk::Scrollbar.new(base_frame))
@@ -74,20 +74,20 @@ container.grid_rowconfigure(0, :weight=>1)
## The data we're going to insert
data = [
- ['¥¢¥ë¥¼¥ó¥Á¥ó', '¥Ö¥¨¥Î¥¹¥¢¥¤¥ì¥¹', 'ARS'],
- ['¥ª¡¼¥¹¥È¥é¥ê¥¢', '¥­¥ã¥ó¥Ù¥é', 'AUD'],
- ['¥Ö¥é¥¸¥ë', '¥Ö¥é¥¸¥ê¥¢', 'BRL'],
- ['¥«¥Ê¥À', '¥ª¥¿¥ï', 'CAD'],
- ['Ãæ¹ñ', 'Ë̵þ', 'CNY'],
- ['¥Õ¥é¥ó¥¹', '¥Ñ¥ê', 'EUR'],
- ['¥É¥¤¥Ä', '¥Ù¥ë¥ê¥ó', 'EUR'],
- ['¥¤¥ó¥É', '¥Ë¥å¡¼¥Ç¥ê¡¼', 'INR'],
- ['¥¤¥¿¥ê¥¢', '¥í¡¼¥Þ', 'EUR'],
- ['ÆüËÜ', 'Åìµþ', 'JPY'],
- ['¥á¥­¥·¥³', '¥á¥­¥·¥³¥·¥Æ¥£', 'MXN'],
- ['¥í¥·¥¢', '¥â¥¹¥¯¥ï', 'RUB'],
- ['Æî¥¢¥Õ¥ê¥«', '¥×¥ì¥È¥ê¥¢', 'ZAR'],
- ['±Ñ¹ñ', '¥í¥ó¥É¥ó', 'GBP'],
+ ['¥¢¥ë¥¼¥ó¥Á¥ó', '¥Ö¥¨¥Î¥¹¥¢¥¤¥ì¥¹', 'ARS'],
+ ['¥ª¡¼¥¹¥È¥é¥ê¥¢', '¥­¥ã¥ó¥Ù¥é', 'AUD'],
+ ['¥Ö¥é¥¸¥ë', '¥Ö¥é¥¸¥ê¥¢', 'BRL'],
+ ['¥«¥Ê¥À', '¥ª¥¿¥ï', 'CAD'],
+ ['Ãæ¹ñ', 'Ë̵þ', 'CNY'],
+ ['¥Õ¥é¥ó¥¹', '¥Ñ¥ê', 'EUR'],
+ ['¥É¥¤¥Ä', '¥Ù¥ë¥ê¥ó', 'EUR'],
+ ['¥¤¥ó¥É', '¥Ë¥å¡¼¥Ç¥ê¡¼', 'INR'],
+ ['¥¤¥¿¥ê¥¢', '¥í¡¼¥Þ', 'EUR'],
+ ['ÆüËÜ', 'Åìµþ', 'JPY'],
+ ['¥á¥­¥·¥³', '¥á¥­¥·¥³¥·¥Æ¥£', 'MXN'],
+ ['¥í¥·¥¢', '¥â¥¹¥¯¥ï', 'RUB'],
+ ['Æî¥¢¥Õ¥ê¥«', '¥×¥ì¥È¥ê¥¢', 'ZAR'],
+ ['±Ñ¹ñ', '¥í¥ó¥É¥ó', 'GBP'],
['¥¢¥á¥ê¥«', '¥ï¥·¥ó¥È¥ó D.C.', 'USD'],
]
@@ -95,7 +95,7 @@ data = [
font = Ttk::Style.lookup(tree[:style], :font)
cols = %w(country capital currency)
cols.zip(%w(¹ñ̾ ¼óÅÔ Ä̲ß)).each{|col, name|
- tree.heading_configure(col, :text=>name,
+ tree.heading_configure(col, :text=>name,
:command=>proc{sort_by(tree, col, false)})
tree.column_configure(col, :width=>TkFont.measure(font, name))
}
@@ -113,8 +113,8 @@ data.each{|country, capital, currency|
## Code to do the sorting of the tree contents when clicked on
def sort_by(tree, col, direction)
- tree.children(nil).map!{|row| [tree.get(row, col), row.id]} .
- sort(&((direction)? proc{|x, y| y <=> x}: proc{|x, y| x <=> y})) .
+ tree.children(nil).map!{|row| [tree.get(row, col), row.id]} .
+ sort(&((direction)? proc{|x, y| y <=> x}: proc{|x, y| x <=> y})) .
each_with_index{|info, idx| tree.move(info[1], nil, idx)}
tree.heading_configure(col, :command=>proc{sort_by(tree, col, ! direction)})
diff --git a/ext/tk/sample/demos-jp/menu.rb b/ext/tk/sample/demos-jp/menu.rb
index e38a467000..c3d95176b4 100644
--- a/ext/tk/sample/demos-jp/menu.rb
+++ b/ext/tk/sample/demos-jp/menu.rb
@@ -5,7 +5,7 @@
# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($menu_demo) && $menu_demo
- $menu_demo.destroy
+ $menu_demo.destroy
$menu_demo = nil
end
@@ -88,9 +88,9 @@ TkMenubutton.new($menu_frame, 'text'=>'Basic', 'underline'=>0) {|m|
m.configure('menu'=>basic_menu)
add('command', 'label'=>'²¿¤â¤·¤Ê¤¤Ä¹¤¤¥¨¥ó¥È¥ê')
['A','B','C','D','E','F','G'].each{|c|
- # add('command', 'label'=>"ʸ»ú \"#{c}\" ¤ò°õ»ú", 'underline'=>4,
- add('command', 'label'=>"Print letter \"#{c}\" (ʸ»ú \"#{c}\" ¤ò°õ»ú)",
- 'underline'=>14, 'accelerator'=>"Meta+#{c}",
+ # add('command', 'label'=>"ʸ»ú \"#{c}\" ¤ò°õ»ú", 'underline'=>4,
+ add('command', 'label'=>"Print letter \"#{c}\" (ʸ»ú \"#{c}\" ¤ò°õ»ú)",
+ 'underline'=>14, 'accelerator'=>"Meta+#{c}",
'command'=>proc{print c,"\n"}, 'accelerator'=>"#{modifier}+#{c}")
$menu_demo.bind("#{modifier}-#{c.downcase}", proc{print c,"\n"})
}
@@ -101,18 +101,18 @@ TkMenubutton.new($menu_frame, 'text'=>'Cascades', 'underline'=>0) {|m|
pack('side'=>'left')
TkMenu.new(m, 'tearoff'=>false) {|cascade_menu|
m.configure('menu'=>cascade_menu)
- add('command', 'label'=>'Print hello(¤³¤ó¤Ë¤Á¤Ï)',
- 'command'=>proc{print "Hello(¤³¤ó¤Ë¤Á¤Ï)\n"},
+ add('command', 'label'=>'Print hello(¤³¤ó¤Ë¤Á¤Ï)',
+ 'command'=>proc{print "Hello(¤³¤ó¤Ë¤Á¤Ï)\n"},
'accelerator'=>"#{modifier}+H", 'underline'=>6)
$menu_demo.bind("#{modifier}-h", proc{print "Hello(¤³¤ó¤Ë¤Á¤Ï)\n"})
- add('command', 'label'=>'Print goodbye(¤µ¤è¤¦¤Ê¤é)',
- 'command'=>proc{print "Goodbye(¤µ¤è¤¦¤Ê¤é)\n"},
+ add('command', 'label'=>'Print goodbye(¤µ¤è¤¦¤Ê¤é)',
+ 'command'=>proc{print "Goodbye(¤µ¤è¤¦¤Ê¤é)\n"},
'accelerator'=>"#{modifier}+G", 'underline'=>6)
$menu_demo.bind("#{modifier}-g", proc{print "Goodbye(¤µ¤è¤¦¤Ê¤é)\n"})
# TkMenu.new(m, 'tearoff'=>false) {|cascade_check|
TkMenu.new(cascade_menu, 'tearoff'=>false) {|cascade_check|
- cascade_menu.add('cascade', 'label'=>'Check buttons(¥Á¥§¥Ã¥¯¥Ü¥¿¥ó)',
+ cascade_menu.add('cascade', 'label'=>'Check buttons(¥Á¥§¥Ã¥¯¥Ü¥¿¥ó)',
'menu'=>cascade_check, 'underline'=>0)
oil = TkVariable.new(0)
add('check', 'label'=>'¥ª¥¤¥ëÅÀ¸¡', 'variable'=>oil)
@@ -123,11 +123,11 @@ TkMenubutton.new($menu_frame, 'text'=>'Cascades', 'underline'=>0) {|m|
lights = TkVariable.new(0)
add('check', 'label'=>'¥é¥¤¥ÈÅÀ¸¡', 'variable'=>lights)
add('separator')
- add('command', 'label'=>'¸½ºß¤ÎÃͤòɽ¼¨',
- 'command'=>proc{showVars($menu_demo,
- ['¥ª¥¤¥ëÅÀ¸¡', oil],
- ['¥È¥é¥ó¥¹¥ß¥Ã¥·¥ç¥óÅÀ¸¡', trans],
- ['¥Ö¥ì¡¼¥­ÅÀ¸¡', brakes],
+ add('command', 'label'=>'¸½ºß¤ÎÃͤòɽ¼¨',
+ 'command'=>proc{showVars($menu_demo,
+ ['¥ª¥¤¥ëÅÀ¸¡', oil],
+ ['¥È¥é¥ó¥¹¥ß¥Ã¥·¥ç¥óÅÀ¸¡', trans],
+ ['¥Ö¥ì¡¼¥­ÅÀ¸¡', brakes],
['¥é¥¤¥ÈÅÀ¸¡', lights])} )
invoke 1
invoke 3
@@ -135,7 +135,7 @@ TkMenubutton.new($menu_frame, 'text'=>'Cascades', 'underline'=>0) {|m|
#TkMenu.new(m, 'tearoff'=>false) {|cascade_radio|
TkMenu.new(cascade_menu, 'tearoff'=>false) {|cascade_radio|
- cascade_menu.add('cascade', 'label'=>'Radio buttons(¥é¥¸¥ª¥Ü¥¿¥ó)',
+ cascade_menu.add('cascade', 'label'=>'Radio buttons(¥é¥¸¥ª¥Ü¥¿¥ó)',
'menu'=>cascade_radio, 'underline'=>0)
pointSize = TkVariable.new
add('radio', 'label'=>'10 ¥Ý¥¤¥ó¥È', 'variable'=>pointSize, 'value'=>10)
@@ -149,9 +149,9 @@ TkMenubutton.new($menu_frame, 'text'=>'Cascades', 'underline'=>0) {|m|
add('radio', 'label'=>'¥Ü¡¼¥ë¥É', 'variable'=>style, 'value'=>'bold')
add('radio', 'label'=>'¥¤¥¿¥ê¥Ã¥¯', 'variable'=>style, 'value'=>'italic')
add('separator')
- add('command', 'label'=>'¸½ºß¤ÎÃͤòɽ¼¨',
- 'command'=>proc{showVars($menu_demo,
- ['¥Ý¥¤¥ó¥È¥µ¥¤¥º', pointSize],
+ add('command', 'label'=>'¸½ºß¤ÎÃͤòɽ¼¨',
+ 'command'=>proc{showVars($menu_demo,
+ ['¥Ý¥¤¥ó¥È¥µ¥¤¥º', pointSize],
['¥¹¥¿¥¤¥ë', style])} )
invoke 1
invoke 7
@@ -163,15 +163,15 @@ TkMenubutton.new($menu_frame, 'text'=>'Icons', 'underline'=>0) {|m|
pack('side'=>'left')
TkMenu.new(m, 'tearoff'=>false) {|icon_menu|
m.configure('menu'=>icon_menu)
- add('command',
+ add('command',
'bitmap'=>'@'+[$demo_dir,'..',
'images','pattern.xbm'].join(File::Separator),
- 'command'=>proc{TkDialog.new('title'=>'Bitmap Menu Entry',
+ 'command'=>proc{TkDialog.new('title'=>'Bitmap Menu Entry',
'text'=>'º£¤¢¤Ê¤¿¤¬ÁªÂò¤·¤¿¥á¥Ë¥å¡¼¤Î¹àÌܤϥƥ­¥¹¥È¤Ç¤Ï¤Ê¤¯¥Ó¥Ã¥È¥Þ¥Ã¥×¤òɽ¼¨¤·¤Æ¤¤¤Þ¤·¤¿¡£¤½¤ì°Ê³°¤ÎÅÀ¤Ç¤Ï¾¤Î¥á¥Ë¥å¡¼¹àÌܤÈÊѤï¤ê¤Þ¤»¤ó¡£',
- 'bitmap'=>'', 'default'=>0,
+ 'bitmap'=>'', 'default'=>0,
'buttons'=>'λ²ò')} )
['info', 'questhead', 'error'].each{|icon|
- add('command', 'bitmap'=>icon,
+ add('command', 'bitmap'=>icon,
'command'=>proc{print "You invoked the #{icon} bitmap\n"})
}
}
@@ -183,7 +183,7 @@ TkMenubutton.new($menu_frame, 'text'=>'More', 'underline'=>0) {|m|
m.configure('menu'=>more_menu)
[ '¥¨¥ó¥È¥ê','Ê̤Υ¨¥ó¥È¥ê','²¿¤â¤·¤Ê¤¤','¤Û¤È¤ó¤É²¿¤â¤·¤Ê¤¤',
'¿ÍÀ¸¤ò°ÕµÁ¤¢¤ë¤â¤Î¤Ë' ].each{|i|
- add('command', 'label'=>i,
+ add('command', 'label'=>i,
'command'=>proc{print "You invoked \"#{i}\"\n"})
}
}
@@ -194,7 +194,7 @@ TkMenubutton.new($menu_frame, 'text'=>'Colors', 'underline'=>0) {|m|
TkMenu.new(m) {|colors_menu|
m.configure('menu'=>colors_menu)
['red', 'orange', 'yellow', 'green', 'blue'].each{|c|
- add('command', 'label'=>c, 'background'=>c,
+ add('command', 'label'=>c, 'background'=>c,
'command'=>proc{print "You invoked \"#{c}\"\n"})
}
}
diff --git a/ext/tk/sample/demos-jp/menu84.rb b/ext/tk/sample/demos-jp/menu84.rb
index 094853a728..a631bacd43 100644
--- a/ext/tk/sample/demos-jp/menu84.rb
+++ b/ext/tk/sample/demos-jp/menu84.rb
@@ -5,7 +5,7 @@
# toplevel widget
if defined?($menu84_demo) && $menu84_demo
- $menu84_demo.destroy
+ $menu84_demo.destroy
$menu84_demo = nil
end
@@ -37,9 +37,9 @@ TkLabel.new(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
menustatus = TkVariable.new(" ")
TkFrame.new(base_frame) {|frame|
- TkLabel.new(frame, 'textvariable'=>menustatus, 'relief'=>'sunken',
- 'bd'=>1, 'font'=>['Helvetica', '10'],
- 'anchor'=>'w').pack('side'=>'left', 'padx'=>2,
+ TkLabel.new(frame, 'textvariable'=>menustatus, 'relief'=>'sunken',
+ 'bd'=>1, 'font'=>['Helvetica', '10'],
+ 'anchor'=>'w').pack('side'=>'left', 'padx'=>2,
'expand'=>true, 'fill'=>'both')
pack('side'=>'bottom', 'fill'=>'x', 'pady'=>2)
}
@@ -94,8 +94,8 @@ TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
$menu84_frame.add('cascade', 'label'=>'Basic', 'menu'=>m, 'underline'=>0)
add('command', 'label'=>'Long entry that does nothing')
['A','B','C','D','E','F','G'].each{|c|
- add('command', 'label'=>"Print letter \"#{c}\"",
- 'underline'=>14, 'accelerator'=>"Meta+#{c}",
+ add('command', 'label'=>"Print letter \"#{c}\"",
+ 'underline'=>14, 'accelerator'=>"Meta+#{c}",
'command'=>proc{print c,"\n"}, 'accelerator'=>"#{modifier}+#{c}")
$menu84_demo.bind("#{modifier}-#{c.downcase}", proc{print c,"\n"})
}
@@ -103,17 +103,17 @@ TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
$menu84_frame.add('cascade', 'label'=>'Cascades', 'menu'=>m, 'underline'=>0)
- add('command', 'label'=>'Print hello',
- 'command'=>proc{print "Hello\n"},
+ add('command', 'label'=>'Print hello',
+ 'command'=>proc{print "Hello\n"},
'accelerator'=>"#{modifier}+H", 'underline'=>6)
$menu84_demo.bind("#{modifier}-h", proc{print "Hello\n"})
- add('command', 'label'=>'Print goodbye',
- 'command'=>proc{print "Goodbye\n"},
+ add('command', 'label'=>'Print goodbye',
+ 'command'=>proc{print "Goodbye\n"},
'accelerator'=>"#{modifier}+G", 'underline'=>6)
$menu84_demo.bind("#{modifier}-g", proc{print "Goodbye\n"})
TkMenu.new(m, 'tearoff'=>false) {|cascade_check|
- m.add('cascade', 'label'=>'Check button',
+ m.add('cascade', 'label'=>'Check button',
'menu'=>cascade_check, 'underline'=>0)
oil = TkVariable.new(0)
add('check', 'label'=>'¥ª¥¤¥ë¸¡ºº', 'variable'=>oil)
@@ -124,18 +124,18 @@ TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
lights = TkVariable.new(0)
add('check', 'label'=>'¥é¥¤¥È¸¡ºº', 'variable'=>lights)
add('separator')
- add('command', 'label'=>'Show current values',
- 'command'=>proc{showVars($menu84_demo,
- ['¥ª¥¤¥ë', oil],
- ['¥È¥é¥ó¥¹¥ß¥Ã¥·¥ç¥ó', trans],
- ['¥Ö¥ì¡¼¥­', brakes],
+ add('command', 'label'=>'Show current values',
+ 'command'=>proc{showVars($menu84_demo,
+ ['¥ª¥¤¥ë', oil],
+ ['¥È¥é¥ó¥¹¥ß¥Ã¥·¥ç¥ó', trans],
+ ['¥Ö¥ì¡¼¥­', brakes],
['¥é¥¤¥È', lights])} )
invoke 1
invoke 3
}
TkMenu.new(m, 'tearoff'=>false) {|cascade_radio|
- m.add('cascade', 'label'=>'Radio buttons',
+ m.add('cascade', 'label'=>'Radio buttons',
'menu'=>cascade_radio, 'underline'=>0)
pointSize = TkVariable.new
add('radio', 'label'=>'10 point', 'variable'=>pointSize, 'value'=>10)
@@ -149,9 +149,9 @@ TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
add('radio', 'label'=>'Bold', 'variable'=>style, 'value'=>'bold')
add('radio', 'label'=>'Italic', 'variable'=>style, 'value'=>'italic')
add('separator')
- add('command', 'label'=>'¸½ºßÃͤÎɽ¼¨',
- 'command'=>proc{showVars($menu84_demo,
- ['pointSize', pointSize],
+ add('command', 'label'=>'¸½ºßÃͤÎɽ¼¨',
+ 'command'=>proc{showVars($menu84_demo,
+ ['pointSize', pointSize],
['style', style])} )
invoke 1
invoke 7
@@ -160,15 +160,15 @@ TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
$menu84_frame.add('cascade', 'label'=>'Icons', 'menu'=>m, 'underline'=>0)
- add('command', 'hidemargin'=>1,
+ add('command', 'hidemargin'=>1,
'bitmap'=>'@'+[$demo_dir,'..',
'images','pattern.xbm'].join(File::Separator),
- 'command'=>proc{TkDialog.new('title'=>'Bitmap Menu Entry',
+ 'command'=>proc{TkDialog.new('title'=>'Bitmap Menu Entry',
'text'=>'¤¢¤Ê¤¿¤¬ÁªÂò¤·¤¿¥á¥Ë¥å¡¼¹àÌܤϡ¢Ê¸»úÎó¤ÎÂå¤ï¤ê¤Ë¥Ó¥Ã¥È¥Þ¥Ã¥×¥¤¥á¡¼¥¸¤Ç¹àÌܤòɽ¼¨¤·¤¿¤â¤Î¤Ç¤¹¡£¤½¤ì°Ê³°¤ÎÅÀ¤Ç¤Ï¡¢¤Û¤«¤Î¥á¥Ë¥å¡¼¹àÌÜ¤È¤Î´Ö¤ÇÆÃ¤Ë°ã¤¤¤¬¤¢¤ë¤ï¤±¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£',
- 'bitmap'=>'', 'default'=>0,
+ 'bitmap'=>'', 'default'=>0,
'buttons'=>'ÊĤ¸¤ë')} )
['info', 'questhead', 'error'].each{|icon|
- add('command', 'bitmap'=>icon, 'hidemargin'=>1,
+ add('command', 'bitmap'=>icon, 'hidemargin'=>1,
'command'=>proc{print "You invoked the #{icon} bitmap\n"})
}
@@ -179,14 +179,14 @@ TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
$menu84_frame.add('cascade', 'label'=>'More', 'menu'=>m, 'underline'=>0)
[ 'An entry','Another entry','Does nothing','Does almost nothing',
'Make life meaningful' ].each{|i|
- add('command', 'label'=>i,
+ add('command', 'label'=>i,
'command'=>proc{print "You invoked \"#{i}\"\n"})
}
- m.entryconfigure('Does almost nothing',
- 'bitmap'=>'questhead', 'compound'=>'left',
+ m.entryconfigure('Does almost nothing',
+ 'bitmap'=>'questhead', 'compound'=>'left',
'command'=>proc{
- TkDialog.new('title'=>'Compound Menu Entry',
+ TkDialog.new('title'=>'Compound Menu Entry',
'message'=>'¤¢¤Ê¤¿¤¬ÁªÂò¤·¤¿¥á¥Ë¥å¡¼¹àÌܤϡ¢¥Ó¥Ã¥È¥Þ¥Ã¥×¥¤¥á¡¼¥¸¤Èʸ»úÎó¤È¤òƱ»þ¤Ë°ì¤Ä¤Î¹àÌܤËɽ¼¨¤¹¤ë¤è¤¦¤Ë¤·¤¿¤â¤Î¤Ç¤¹¡£¤½¤ì°Ê³°¤ÎÅÀ¤Ç¤Ï¡¢¤Û¤«¤Î¥á¥Ë¥å¡¼¹àÌÜ¤È¤Î´Ö¤ÇÆÃ¤Ë°ã¤¤¤¬¤¢¤ë¤ï¤±¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£',
'buttons'=>['λ²ò'], 'bitmap'=>'')
})
@@ -195,7 +195,7 @@ TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
TkMenu.new($menu84_frame) {|m|
$menu84_frame.add('cascade', 'label'=>'Colors', 'menu'=>m, 'underline'=>0)
['red', 'orange', 'yellow', 'green', 'blue'].each{|c|
- add('command', 'label'=>c, 'background'=>c,
+ add('command', 'label'=>c, 'background'=>c,
'command'=>proc{print "You invoked \"#{c}\"\n"})
}
}
diff --git a/ext/tk/sample/demos-jp/menu8x.rb b/ext/tk/sample/demos-jp/menu8x.rb
index 49aca6786d..9249f2491a 100644
--- a/ext/tk/sample/demos-jp/menu8x.rb
+++ b/ext/tk/sample/demos-jp/menu8x.rb
@@ -5,7 +5,7 @@
# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($menu8x_demo) && $menu8x_demo
- $menu8x_demo.destroy
+ $menu8x_demo.destroy
$menu8x_demo = nil
end
@@ -65,7 +65,7 @@ TkLabel.new(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
# ¾õÂÖɽ¼¨¤ÎÀ¸À®
$menu8xstatus = TkVariable.new(" ")
TkFrame.new(base_frame) {|frame|
- TkLabel.new(frame, 'textvariable'=>$menu8xstatus, 'relief'=>'sunken',
+ TkLabel.new(frame, 'textvariable'=>$menu8xstatus, 'relief'=>'sunken',
'bd'=>1, 'font'=>['Helvetica', '10'], 'anchor'=>'w')\
.pack('side'=>'left', 'padx'=>2, 'expand'=>'yes', 'fill'=>'both')
}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>2)
@@ -116,9 +116,9 @@ TkMenu.new($menu8x_demo, 'tearoff'=>false) {|m|
m.add('cascade', 'label'=>'Basic', 'menu'=>basic_menu, 'underline'=>0)
add('command', 'label'=>'²¿¤â¤·¤Ê¤¤Ä¹¤¤¥¨¥ó¥È¥ê')
['A','B','C','D','E','F','G'].each{|c|
- # add('command', 'label'=>"ʸ»ú \"#{c}\" ¤ò°õ»ú", 'underline'=>4,
- add('command', 'label'=>"Print letter \"#{c}\" (ʸ»ú \"#{c}\" ¤ò°õ»ú)",
- 'underline'=>14, 'accelerator'=>"Meta+#{c}",
+ # add('command', 'label'=>"ʸ»ú \"#{c}\" ¤ò°õ»ú", 'underline'=>4,
+ add('command', 'label'=>"Print letter \"#{c}\" (ʸ»ú \"#{c}\" ¤ò°õ»ú)",
+ 'underline'=>14, 'accelerator'=>"Meta+#{c}",
'command'=>proc{print c,"\n"}, 'accelerator'=>"#{modifier}+#{c}")
$menu8x_demo.bind("#{modifier}-#{c.downcase}", proc{print c,"\n"})
}
@@ -126,17 +126,17 @@ TkMenu.new($menu8x_demo, 'tearoff'=>false) {|m|
TkMenu.new(m, 'tearoff'=>false) {|cascade_menu|
m.add('cascade', 'label'=>'Cascades', 'menu'=>cascade_menu, 'underline'=>0)
- add('command', 'label'=>'Print hello(¤³¤ó¤Ë¤Á¤Ï)',
- 'command'=>proc{print "Hello(¤³¤ó¤Ë¤Á¤Ï)\n"},
+ add('command', 'label'=>'Print hello(¤³¤ó¤Ë¤Á¤Ï)',
+ 'command'=>proc{print "Hello(¤³¤ó¤Ë¤Á¤Ï)\n"},
'accelerator'=>"#{modifier}+H", 'underline'=>6)
$menu8x_demo.bind("#{modifier}-h", proc{print "Hello(¤³¤ó¤Ë¤Á¤Ï)\n"})
- add('command', 'label'=>'Print goodbye(¤µ¤è¤¦¤Ê¤é)',
- 'command'=>proc{print "Goodbye(¤µ¤è¤¦¤Ê¤é)\n"},
+ add('command', 'label'=>'Print goodbye(¤µ¤è¤¦¤Ê¤é)',
+ 'command'=>proc{print "Goodbye(¤µ¤è¤¦¤Ê¤é)\n"},
'accelerator'=>"#{modifier}+G", 'underline'=>6)
$menu8x_demo.bind("#{modifier}-g", proc{print "Goodbye(¤µ¤è¤¦¤Ê¤é)\n"})
TkMenu.new(m, 'tearoff'=>false) {|cascade_check|
- cascade_menu.add('cascade', 'label'=>'Check buttons(¥Á¥§¥Ã¥¯¥Ü¥¿¥ó)',
+ cascade_menu.add('cascade', 'label'=>'Check buttons(¥Á¥§¥Ã¥¯¥Ü¥¿¥ó)',
'menu'=>cascade_check, 'underline'=>0)
oil = TkVariable.new(0)
add('check', 'label'=>'¥ª¥¤¥ëÅÀ¸¡', 'variable'=>oil)
@@ -147,18 +147,18 @@ TkMenu.new($menu8x_demo, 'tearoff'=>false) {|m|
lights = TkVariable.new(0)
add('check', 'label'=>'¥é¥¤¥ÈÅÀ¸¡', 'variable'=>lights)
add('separator')
- add('command', 'label'=>'¸½ºß¤ÎÃͤòɽ¼¨',
- 'command'=>proc{showVars($menu8x_demo,
- ['¥ª¥¤¥ëÅÀ¸¡', oil],
- ['¥È¥é¥ó¥¹¥ß¥Ã¥·¥ç¥óÅÀ¸¡', trans],
- ['¥Ö¥ì¡¼¥­ÅÀ¸¡', brakes],
+ add('command', 'label'=>'¸½ºß¤ÎÃͤòɽ¼¨',
+ 'command'=>proc{showVars($menu8x_demo,
+ ['¥ª¥¤¥ëÅÀ¸¡', oil],
+ ['¥È¥é¥ó¥¹¥ß¥Ã¥·¥ç¥óÅÀ¸¡', trans],
+ ['¥Ö¥ì¡¼¥­ÅÀ¸¡', brakes],
['¥é¥¤¥ÈÅÀ¸¡', lights])} )
invoke 1
invoke 3
}
TkMenu.new(m, 'tearoff'=>false) {|cascade_radio|
- cascade_menu.add('cascade', 'label'=>'Radio buttons(¥é¥¸¥ª¥Ü¥¿¥ó)',
+ cascade_menu.add('cascade', 'label'=>'Radio buttons(¥é¥¸¥ª¥Ü¥¿¥ó)',
'menu'=>cascade_radio, 'underline'=>0)
pointSize = TkVariable.new
add('radio', 'label'=>'10 ¥Ý¥¤¥ó¥È', 'variable'=>pointSize, 'value'=>10)
@@ -172,9 +172,9 @@ TkMenu.new($menu8x_demo, 'tearoff'=>false) {|m|
add('radio', 'label'=>'¥Ü¡¼¥ë¥É', 'variable'=>style, 'value'=>'bold')
add('radio', 'label'=>'¥¤¥¿¥ê¥Ã¥¯', 'variable'=>style, 'value'=>'italic')
add('separator')
- add('command', 'label'=>'¸½ºß¤ÎÃͤòɽ¼¨',
- 'command'=>proc{showVars($menu8x_demo,
- ['¥Ý¥¤¥ó¥È¥µ¥¤¥º', pointSize],
+ add('command', 'label'=>'¸½ºß¤ÎÃͤòɽ¼¨',
+ 'command'=>proc{showVars($menu8x_demo,
+ ['¥Ý¥¤¥ó¥È¥µ¥¤¥º', pointSize],
['¥¹¥¿¥¤¥ë', style])} )
invoke 1
invoke 7
@@ -183,16 +183,16 @@ TkMenu.new($menu8x_demo, 'tearoff'=>false) {|m|
TkMenu.new(m, 'tearoff'=>false) {|icon_menu|
m.add('cascade', 'label'=>'Icons', 'menu'=>icon_menu, 'underline'=>0)
- add('command',
+ add('command',
'bitmap'=>'@'+[$demo_dir,'..',
'images','pattern.xbm'].join(File::Separator),
- 'hidemargin'=>1,
- 'command'=>proc{TkDialog.new('title'=>'Bitmap Menu Entry',
+ 'hidemargin'=>1,
+ 'command'=>proc{TkDialog.new('title'=>'Bitmap Menu Entry',
'text'=>'º£¤¢¤Ê¤¿¤¬ÁªÂò¤·¤¿¥á¥Ë¥å¡¼¤Î¹àÌܤϥƥ­¥¹¥È¤Ç¤Ï¤Ê¤¯¥Ó¥Ã¥È¥Þ¥Ã¥×¤òɽ¼¨¤·¤Æ¤¤¤Þ¤·¤¿¡£¤½¤ì°Ê³°¤ÎÅÀ¤Ç¤Ï¾¤Î¥á¥Ë¥å¡¼¹àÌܤÈÊѤï¤ê¤Þ¤»¤ó¡£',
- 'bitmap'=>'', 'default'=>0,
+ 'bitmap'=>'', 'default'=>0,
'buttons'=>'λ²ò')} )
['info', 'questhead', 'error'].each{|icon|
- add('command', 'bitmap'=>icon, 'hidemargin'=>1,
+ add('command', 'bitmap'=>icon, 'hidemargin'=>1,
'command'=>proc{print "You invoked the #{icon} bitmap\n"})
}
@@ -203,7 +203,7 @@ TkMenu.new($menu8x_demo, 'tearoff'=>false) {|m|
m.add('cascade', 'label'=>'More', 'menu'=>more_menu, 'underline'=>0)
[ '¥¨¥ó¥È¥ê','Ê̤Υ¨¥ó¥È¥ê','²¿¤â¤·¤Ê¤¤','¤Û¤È¤ó¤É²¿¤â¤·¤Ê¤¤',
'¿ÍÀ¸¤ò°ÕµÁ¤¢¤ë¤â¤Î¤Ë' ].each{|i|
- add('command', 'label'=>i,
+ add('command', 'label'=>i,
'command'=>proc{print "You invoked \"#{i}\"\n"})
}
}
@@ -211,7 +211,7 @@ TkMenu.new($menu8x_demo, 'tearoff'=>false) {|m|
TkMenu.new(m) {|colors_menu|
m.add('cascade', 'label'=>'Colors', 'menu'=>colors_menu, 'underline'=>1)
['red', 'orange', 'yellow', 'green', 'blue'].each{|c|
- add('command', 'label'=>c, 'background'=>c,
+ add('command', 'label'=>c, 'background'=>c,
'command'=>proc{print "You invoked \"#{c}\"\n"})
}
}
@@ -219,8 +219,8 @@ TkMenu.new($menu8x_demo, 'tearoff'=>false) {|m|
$menu8x_demo.configure('menu'=>m)
}
-TkMenu.bind('<MenuSelect>',
- proc{|w|
+TkMenu.bind('<MenuSelect>',
+ proc{|w|
begin
label = w.entrycget('active', 'label')
rescue
diff --git a/ext/tk/sample/demos-jp/menubu.rb b/ext/tk/sample/demos-jp/menubu.rb
index 78418ce3ea..90dc367305 100644
--- a/ext/tk/sample/demos-jp/menubu.rb
+++ b/ext/tk/sample/demos-jp/menubu.rb
@@ -17,7 +17,7 @@ def optionMenu(menubutton, varName, firstValue, *rest)
for i in rest
menu.add 'radio', 'label'=>i, 'variable'=>varName
end
-
+
return menu
end
@@ -189,7 +189,7 @@ msg.pack('side'=>'top', 'padx'=>25, 'pady'=>25)
TkFrame.new(center) {|f|
menubuttonoptions = TkVariable.new
mbutton = TkMenubutton.new(f)
- options = optionMenu(mbutton, menubuttonoptions,
+ options = optionMenu(mbutton, menubuttonoptions,
'one', 'two', 'three')
mbutton.pack('side'=>'left', 'padx'=>25, 'pady'=>25)
paletteColor = TkVariable.new
diff --git a/ext/tk/sample/demos-jp/msgbox.rb b/ext/tk/sample/demos-jp/msgbox.rb
index ed5d01252e..88380e08bd 100644
--- a/ext/tk/sample/demos-jp/msgbox.rb
+++ b/ext/tk/sample/demos-jp/msgbox.rb
@@ -5,7 +5,7 @@
# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($msgbox_demo) && $msgbox_demo
- $msgbox_demo.destroy
+ $msgbox_demo.destroy
$msgbox_demo = nil
end
@@ -48,9 +48,9 @@ TkFrame.new(base_frame) {|frame|
# frame À¸À®
$msgbox_leftframe = TkFrame.new(base_frame)
$msgbox_rightframe = TkFrame.new(base_frame)
-$msgbox_leftframe .pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y',
+$msgbox_leftframe .pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y',
'pady'=>'.5c', 'padx'=>'.5c')
-$msgbox_rightframe.pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y',
+$msgbox_rightframe.pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y',
'pady'=>'.5c', 'padx'=>'.5c')
TkLabel.new($msgbox_leftframe, 'text'=>'¥¢¥¤¥³¥ó').pack('side'=>'top')
@@ -59,9 +59,9 @@ TkFrame.new($msgbox_leftframe, 'relief'=>'ridge', 'bd'=>1, 'height'=>2)\
$msgboxIcon = TkVariable.new('info')
['error', 'info', 'question', 'warning'].each {|icon|
- TkRadioButton.new($msgbox_leftframe, 'text'=>icon, 'variable'=>$msgboxIcon,
- 'relief'=>'flat', 'value'=>icon, 'width'=>16,
- 'anchor'=>'w').pack('side'=>'top', 'pady'=>2,
+ TkRadioButton.new($msgbox_leftframe, 'text'=>icon, 'variable'=>$msgboxIcon,
+ 'relief'=>'flat', 'value'=>icon, 'width'=>16,
+ 'anchor'=>'w').pack('side'=>'top', 'pady'=>2,
'anchor'=>'w', 'fill'=>'x')
}
@@ -70,20 +70,20 @@ TkFrame.new($msgbox_rightframe, 'relief'=>'ridge', 'bd'=>1, 'height'=>2)\
.pack('side'=>'top', 'fill'=>'x', 'expand'=>'no')
$msgboxType = TkVariable.new('ok')
-['abortretryignore', 'ok', 'okcancel',
+['abortretryignore', 'ok', 'okcancel',
'retrycancel', 'yesno', 'yesnocancel'].each {|type|
- TkRadioButton.new($msgbox_rightframe, 'text'=>type, 'variable'=>$msgboxType,
- 'relief'=>'flat', 'value'=>type, 'width'=>16,
- 'anchor'=>'w').pack('side'=>'top', 'pady'=>2,
+ TkRadioButton.new($msgbox_rightframe, 'text'=>type, 'variable'=>$msgboxType,
+ 'relief'=>'flat', 'value'=>type, 'width'=>16,
+ 'anchor'=>'w').pack('side'=>'top', 'pady'=>2,
'anchor'=>'w', 'fill'=>'x')
}
def showMessageBox(w)
- button = Tk.messageBox('icon'=>$msgboxIcon.value, 'type'=>$msgboxType.value,
+ button = Tk.messageBox('icon'=>$msgboxIcon.value, 'type'=>$msgboxType.value,
'title'=>'Message', 'parent'=>w,
'message'=>"¤³¤ì¤Ï\"#{$msgboxType.value}\"¤È¤¤¤¦¼ïÎà¤Î¥á¥Ã¥»¡¼¥¸¥Ü¥Ã¥¯¥¹¤Ç¡¢\"#{$msgboxIcon.value}\"¤Î¥¢¥¤¥³¥ó¤¬É½¼¨¤µ¤ì¤Æ¤¤¤Þ¤¹¡£")
- Tk.messageBox('icon'=>'info', 'type'=>'ok', 'parent'=>w,
+ Tk.messageBox('icon'=>'info', 'type'=>'ok', 'parent'=>w,
'message'=>"¤¢¤Ê¤¿¤Ï \"#{button}\" ¤ò²¡¤·¤Þ¤·¤¿¤Í¡£")
end
diff --git a/ext/tk/sample/demos-jp/msgbox2.rb b/ext/tk/sample/demos-jp/msgbox2.rb
index 8c80e08d70..d61f25129a 100644
--- a/ext/tk/sample/demos-jp/msgbox2.rb
+++ b/ext/tk/sample/demos-jp/msgbox2.rb
@@ -5,7 +5,7 @@
# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($msgbox2_demo) && $msgbox2_demo
- $msgbox2_demo.destroy
+ $msgbox2_demo.destroy
$msgbox2_demo = nil
end
@@ -41,16 +41,16 @@ TkFrame.new(base_frame) {|frame|
TkButton.new(frame) {
text '¥á¥Ã¥»¡¼¥¸¥Ü¥Ã¥¯¥¹'
- command proc{showMessageBox2 $msgbox2_demo}
+ command proc{showMessageBox $msgbox2_demo}
}.pack('side'=>'left', 'expand'=>'yes')
}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
# frame À¸À®
$msgbox_leftframe = TkFrame.new(base_frame)
$msgbox_rightframe = TkFrame.new(base_frame)
-$msgbox_leftframe .pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y',
+$msgbox_leftframe .pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y',
'pady'=>'.5c', 'padx'=>'.5c')
-$msgbox_rightframe.pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y',
+$msgbox_rightframe.pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y',
'pady'=>'.5c', 'padx'=>'.5c')
TkLabel.new($msgbox_leftframe, 'text'=>'¥¢¥¤¥³¥ó').pack('side'=>'top')
@@ -59,9 +59,9 @@ TkFrame.new($msgbox_leftframe, 'relief'=>'ridge', 'bd'=>1, 'height'=>2)\
$msgboxIcon = TkVariable.new('info')
['error', 'info', 'question', 'warning'].each {|icon|
- TkRadioButton.new($msgbox_leftframe, 'text'=>icon, 'variable'=>$msgboxIcon,
- 'relief'=>'flat', 'value'=>icon, 'width'=>16,
- 'anchor'=>'w').pack('side'=>'top', 'pady'=>2,
+ TkRadioButton.new($msgbox_leftframe, 'text'=>icon, 'variable'=>$msgboxIcon,
+ 'relief'=>'flat', 'value'=>icon, 'width'=>16,
+ 'anchor'=>'w').pack('side'=>'top', 'pady'=>2,
'anchor'=>'w', 'fill'=>'x')
}
@@ -70,21 +70,21 @@ TkFrame.new($msgbox_rightframe, 'relief'=>'ridge', 'bd'=>1, 'height'=>2)\
.pack('side'=>'top', 'fill'=>'x', 'expand'=>'no')
$msgboxType = TkVariable.new('ok')
-['abortretryignore', 'ok', 'okcancel',
+['abortretryignore', 'ok', 'okcancel',
'retrycancel', 'yesno', 'yesnocancel'].each {|type|
- TkRadioButton.new($msgbox_rightframe, 'text'=>type, 'variable'=>$msgboxType,
- 'relief'=>'flat', 'value'=>type, 'width'=>16,
- 'anchor'=>'w').pack('side'=>'top', 'pady'=>2,
+ TkRadioButton.new($msgbox_rightframe, 'text'=>type, 'variable'=>$msgboxType,
+ 'relief'=>'flat', 'value'=>type, 'width'=>16,
+ 'anchor'=>'w').pack('side'=>'top', 'pady'=>2,
'anchor'=>'w', 'fill'=>'x')
}
-def showMessageBox2(w)
- button = Tk.messageBox('icon'=>$msgboxIcon.value, 'type'=>$msgboxType.value,
+def showMessageBox(w)
+ button = Tk.messageBox('icon'=>$msgboxIcon.value, 'type'=>$msgboxType.value,
'title'=>'Message', 'parent'=>w,
- 'message'=>"\"#{$msgboxType.value}\"¥¿¥¤¥×¤Î¥á¥Ã¥»¡¼¥¸¥Ü¥Ã¥¯¥¹",
+ 'message'=>"\"#{$msgboxType.value}\"¥¿¥¤¥×¤Î¥á¥Ã¥»¡¼¥¸¥Ü¥Ã¥¯¥¹",
'detail'=>"¤³¤ì¤Ï\"#{$msgboxType.value}\"¤È¤¤¤¦¼ïÎà¤Î¥á¥Ã¥»¡¼¥¸¥Ü¥Ã¥¯¥¹¤Ç¡¢\"#{$msgboxIcon.value}\"¤Î¥¢¥¤¥³¥ó¤¬É½¼¨¤µ¤ì¤Æ¤¤¤Þ¤¹¡£²¼¤Î¥Ü¥¿¥ó¤Î¤¤¤º¤ì¤«¤òÁªÂò¤·¤Æ¥¯¥ê¥Ã¥¯¤·¤Æ¤¯¤À¤µ¤¤¡£")
- Tk.messageBox('icon'=>'info', 'type'=>'ok', 'parent'=>w,
+ Tk.messageBox('icon'=>'info', 'type'=>'ok', 'parent'=>w,
'message'=>"¤¢¤Ê¤¿¤Ï \"#{button}\" ¤ò²¡¤·¤Þ¤·¤¿¤Í¡£")
end
diff --git a/ext/tk/sample/demos-jp/paned1.rb b/ext/tk/sample/demos-jp/paned1.rb
index 987a073086..f994e83ff1 100644
--- a/ext/tk/sample/demos-jp/paned1.rb
+++ b/ext/tk/sample/demos-jp/paned1.rb
@@ -8,7 +8,7 @@
# based on "Id: paned1.tcl,v 1.1 2002/02/22 14:07:01 dkf Exp"
if defined?($paned1_demo) && $paned1_demo
- $paned1_demo.destroy
+ $paned1_demo.destroy
$paned1_demo = nil
end
@@ -20,8 +20,8 @@ $paned1_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($paned1_demo).pack(:fill=>:both, :expand=>true)
-TkLabel.new(base_frame,
- :font=>$font, :wraplength=>'4i', :justify=>:left,
+TkLabel.new(base_frame,
+ :font=>$font, :wraplength=>'4i', :justify=>:left,
:text=><<EOL).pack(:side=>:top)
²¼¤Î¿§ÉÕ¤±¤µ¤ì¤¿Æó¤Ä¤Î¥¦¥£¥ó¥É¥¦¤Î´Ö¤Î»ÅÀÚ¤êÏȤϡ¢°ì¤Ä¤ÎÎΰè¤ò¤½¤ì¤¾¤ì¤Î¥¦¥£¥ó¥É¥¦¤Î¤¿¤á¤Ëʬ³ä¤¹¤ë¤¿¤á¤Î¤â¤Î¤Ç¤¹¡£º¸¥Ü¥¿¥ó¤Ç»ÅÀÚ¤ê¤òÁàºî¤¹¤ë¤È¡¢Ê¬³ä¥µ¥¤¥ºÊѹ¹¤ÎÁàºîÅÓÃæ¤Ç¤ÏºÆÉ½¼¨¤Ï¤Ê¤µ¤ì¤º¡¢³ÎÄꤵ¤»¤¿¤È¤­¤Ëɽ¼¨¤¬¹¹¿·¤µ¤ì¤Þ¤¹¡£¥Þ¥¦¥¹¤Ë¤è¤ë»ÅÀÚ¤ê¤ÎÁàºî¤ËÄɿ路¤Æ¥µ¥¤¥º¤òÊѹ¹¤·¤¿É½¼¨¤¬¤Ê¤ï¤ì¤ë¤è¤¦¤Ë¤·¤¿¤¤¾ì¹ç¤Ï¡¢¥Þ¥¦¥¹¤ÎÃæ±û¥Ü¥¿¥ó¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£
¤â¤·¤¢¤Ê¤¿¤¬»È¤Ã¤Æ¤¤¤ë Ruby ¤Ë¥ê¥ó¥¯¤µ¤ì¤Æ¤¤¤ë Tk ¥é¥¤¥Ö¥é¥ê¤¬ panedwindow ¤ò¼ÂÁõ¤·¤Æ¤¤¤Ê¤¤
@@ -45,7 +45,7 @@ TkFrame.new(base_frame){|f|
}
TkPanedwindow.new(base_frame, :orient=>:horizontal){|f|
- add(Tk::Label.new(f, :text=>"This is the\nleft side", :bg=>'yellow'),
+ add(Tk::Label.new(f, :text=>"This is the\nleft side", :bg=>'yellow'),
Tk::Label.new(f, :text=>"This is the\nright side", :bg=>'cyan'))
pack(:side=>:top, :expand=>true, :fill=>:both, :pady=>2, :padx=>'2m')
diff --git a/ext/tk/sample/demos-jp/paned2.rb b/ext/tk/sample/demos-jp/paned2.rb
index a1aee81690..cdc8253402 100644
--- a/ext/tk/sample/demos-jp/paned2.rb
+++ b/ext/tk/sample/demos-jp/paned2.rb
@@ -8,7 +8,7 @@
# based on "Id: paned2.tcl,v 1.1 2002/02/22 14:07:01 dkf Exp"
if defined?($paned2_demo) && $paned2_demo
- $paned2_demo.destroy
+ $paned2_demo.destroy
$paned2_demo = nil
end
@@ -20,8 +20,8 @@ $paned2_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($paned2_demo).pack(:fill=>:both, :expand=>true)
-TkLabel.new(base_frame,
- :font=>$font, :wraplength=>'4i', :justify=>:left,
+TkLabel.new(base_frame,
+ :font=>$font, :wraplength=>'4i', :justify=>:left,
:text=><<EOL).pack(:side=>:top)
²¼¤Î¥¹¥¯¥í¡¼¥ë¥Ð¡¼ÉÕ¤­¤Î¥¦¥£¥¸¥§¥Ã¥È¤¬ÃÖ¤«¤ì¤¿Æó¤Ä¤Î¥¦¥£¥ó¥É¥¦¤Î´Ö¤Î»ÅÀÚ¤êÏȤϡ¢°ì¤Ä¤ÎÎΰè¤ò¤½¤ì¤¾¤ì¤Î¥¦¥£¥ó¥É¥¦¤Î¤¿¤á¤Ëʬ³ä¤¹¤ë¤¿¤á¤Î¤â¤Î¤Ç¤¹¡£º¸¥Ü¥¿¥ó¤Ç»ÅÀÚ¤ê¤òÁàºî¤¹¤ë¤È¡¢Ê¬³ä¥µ¥¤¥ºÊѹ¹¤ÎÁàºîÅÓÃæ¤Ç¤ÏºÆÉ½¼¨¤Ï¤Ê¤µ¤ì¤º¡¢³ÎÄꤵ¤»¤¿¤È¤­¤Ëɽ¼¨¤¬¹¹¿·¤µ¤ì¤Þ¤¹¡£¥Þ¥¦¥¹¤Ë¤è¤ë»ÅÀÚ¤ê¤ÎÁàºî¤ËÄɿ路¤Æ¥µ¥¤¥º¤òÊѹ¹¤·¤¿É½¼¨¤¬¤Ê¤ï¤ì¤ë¤è¤¦¤Ë¤·¤¿¤¤¾ì¹ç¤Ï¡¢¥Þ¥¦¥¹¤ÎÃæ±û¥Ü¥¿¥ó¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£
¤â¤·¤¢¤Ê¤¿¤¬»È¤Ã¤Æ¤¤¤ë Ruby ¤Ë¥ê¥ó¥¯¤µ¤ì¤Æ¤¤¤ë Tk ¥é¥¤¥Ö¥é¥ê¤¬ panedwindow ¤ò¼ÂÁõ¤·¤Æ¤¤¤Ê¤¤
@@ -47,23 +47,23 @@ TkFrame.new(base_frame){|f|
paneList = TkVariable.new # define as normal variable (not array)
paneList.value = [ # ruby's array --> tcl's list
'Ruby/Tk ¤Î¥¦¥£¥¸¥§¥Ã¥È°ìÍ÷',
- 'TkButton',
- 'TkCanvas',
- 'TkCheckbutton',
- 'TkEntry',
- 'TkFrame',
- 'TkLabel',
- 'TkLabelframe',
- 'TkListbox',
- 'TkMenu',
- 'TkMenubutton',
- 'TkMessage',
- 'TkPanedwindow',
- 'TkRadiobutton',
- 'TkScale',
- 'TkScrollbar',
- 'TkSpinbox',
- 'TkText',
+ 'TkButton',
+ 'TkCanvas',
+ 'TkCheckbutton',
+ 'TkEntry',
+ 'TkFrame',
+ 'TkLabel',
+ 'TkLabelframe',
+ 'TkListbox',
+ 'TkMenu',
+ 'TkMenubutton',
+ 'TkMessage',
+ 'TkPanedwindow',
+ 'TkRadiobutton',
+ 'TkScale',
+ 'TkScrollbar',
+ 'TkSpinbox',
+ 'TkText',
'TkToplevel'
]
@@ -74,20 +74,20 @@ TkPanedwindow.new(base_frame, :orient=>:vertical){|f|
add(TkFrame.new(f){|paned2_top|
TkListbox.new(paned2_top, :listvariable=>paneList) {
# Invert the first item to highlight it
- itemconfigure(0, :background=>self.cget(:foreground),
+ itemconfigure(0, :background=>self.cget(:foreground),
:foreground=>self.cget(:background) )
- yscrollbar(TkScrollbar.new(paned2_top).pack(:side=>:right,
+ yscrollbar(TkScrollbar.new(paned2_top).pack(:side=>:right,
:fill=>:y))
pack(:fill=>:both, :expand=>true)
}
- },
+ },
TkFrame.new(f, :height=>120) {|paned2_bottom|
# The bottom window is a text widget with scrollbar
paned2_xscr = TkScrollbar.new(paned2_bottom)
paned2_yscr = TkScrollbar.new(paned2_bottom)
paned2_text = TkText.new(paned2_bottom, :width=>30, :wrap=>:non) {
- insert('1.0', '¤³¤³¤ËÇÛÃÖ¤µ¤ì¤Æ¤¤¤ë¤Î¤Ï¡¢' +
+ insert('1.0', '¤³¤³¤ËÇÛÃÖ¤µ¤ì¤Æ¤¤¤ë¤Î¤Ï¡¢' +
'¤´¤¯ÉáÄ̤Υƥ­¥¹¥È¥¦¥£¥¸¥§¥Ã¥È¤Ç¤¹¡£')
xscrollbar(paned2_xscr)
yscrollbar(paned2_yscr)
diff --git a/ext/tk/sample/demos-jp/pendulum.rb b/ext/tk/sample/demos-jp/pendulum.rb
index 48839aa58a..b115f5be2c 100644
--- a/ext/tk/sample/demos-jp/pendulum.rb
+++ b/ext/tk/sample/demos-jp/pendulum.rb
@@ -8,7 +8,7 @@
# destroy toplevel widget for this demo script
if defined?($pendulum_demo) && $pendulum_demo
- $pendulum_demo.destroy
+ $pendulum_demo.destroy
$pendulum_demo = nil
end
@@ -61,14 +61,14 @@ class PendulumAnimationDemo
# Create the canvas containing the graphical representation of the
# simulated system.
- @c = TkCanvas.new(@lf1, :width=>320, :height=>200, :background=>'white',
+ @c = TkCanvas.new(@lf1, :width=>320, :height=>200, :background=>'white',
:borderwidth=>2, :relief=>:sunken)
- TkcText.new(@c, 5, 5, :anchor=>:nw,
+ TkcText.new(@c, 5, 5, :anchor=>:nw,
:text=>'Click to Adjust Bob Start Position')
# Coordinates of these items don't matter; they will be set properly below
@plate = TkcLine.new(@c, 0, 25, 320, 25, :width=>2, :fill=>'grey50')
@rod = TkcLine.new(@c, 1, 1, 1, 1, :width=>3, :fill=>'black')
- @bob = TkcOval.new(@c, 1, 1, 2, 2,
+ @bob = TkcOval.new(@c, 1, 1, 2, 2,
:width=>3, :fill=>'yellow', :outline=>'black')
TkcOval.new(@c, 155, 20, 165, 30, :fill=>'grey50', :outline=>'')
@@ -78,22 +78,22 @@ class PendulumAnimationDemo
# Create the canvas containing the phase space graph; this consists of
# a line that gets gradually paler as it ages, which is an extremely
# effective visual trick.
- @k = TkCanvas.new(@lf2, :width=>320, :height=>200, :background=>'white',
+ @k = TkCanvas.new(@lf2, :width=>320, :height=>200, :background=>'white',
:borderwidth=>2, :relief=>:sunken)
@y_axis = TkcLine.new(@k, 160, 200, 160, 0, :fill=>'grey75', :arrow=>:last)
@x_axis = TkcLine.new(@k, 0, 100, 320, 100, :fill=>'grey75', :arrow=>:last)
@graph = {}
90.step(0, -10){|i|
- # Coordinates of these items don't matter;
+ # Coordinates of these items don't matter;
# they will be set properly below
@graph[i] = TkcLine.new(@k, 0, 0, 1, 1, :smooth=>true, :fill=>"grey#{i}")
}
# labels
- @label_theta = TkcText.new(@k, 0, 0, :anchor=>:ne,
+ @label_theta = TkcText.new(@k, 0, 0, :anchor=>:ne,
:text=>'q', :font=>'Symbol 8')
- @label_dtheta = TkcText.new(@k, 0, 0, :anchor=>:ne,
+ @label_dtheta = TkcText.new(@k, 0, 0, :anchor=>:ne,
:text=>'dq', :font=>'Symbol 8')
# pack
@@ -111,19 +111,19 @@ class PendulumAnimationDemo
# binding
@c.bindtags_unshift(btag = TkBindTag.new)
btag.bind('Destroy'){ @timer.stop }
- btag.bind('1', proc{|x, y| @timer.stop; showPendulum(x.to_i, y.to_i)},
+ btag.bind('1', proc{|x, y| @timer.stop; showPendulum(x.to_i, y.to_i)},
'%x %y')
btag.bind('B1-Motion', proc{|x, y| showPendulum(x.to_i, y.to_i)}, '%x %y')
- btag.bind('ButtonRelease-1',
- proc{|x, y| showPendulum(x.to_i, y.to_i); @timer.start },
+ btag.bind('ButtonRelease-1',
+ proc{|x, y| showPendulum(x.to_i, y.to_i); @timer.start },
'%x %y')
btag.bind('Configure', proc{|w| @plate.coords(0, 25, w.to_i, 25)}, '%w')
- @k.bind('Configure', proc{|h, w|
+ @k.bind('Configure', proc{|h, w|
h = h.to_i
w = w.to_i
- @psh = h/2;
+ @psh = h/2;
@psw = w/2
@x_axis.coords(2, @psh, w-2, @psh)
@y_axis.coords(@psw, h-2, @psw, 2)
@@ -144,9 +144,9 @@ class PendulumAnimationDemo
end
# This procedure makes the pendulum appear at the correct place on the
- # canvas. If the additional arguments x, y are passed instead of computing
- # the position of the pendulum from the length of the pendulum rod and its
- # angle, the length and angle are computed in reverse from the given
+ # canvas. If the additional arguments x, y are passed instead of computing
+ # the position of the pendulum from the length of the pendulum rod and its
+ # angle, the length and angle are computed in reverse from the given
# location (which is taken to be the centre of the pendulum bob.)
def showPendulum(x=nil, y=nil)
if x && y && (x != 160 || y != 25)
diff --git a/ext/tk/sample/demos-jp/plot.rb b/ext/tk/sample/demos-jp/plot.rb
index a49ed00df8..9ff71904cd 100644
--- a/ext/tk/sample/demos-jp/plot.rb
+++ b/ext/tk/sample/demos-jp/plot.rb
@@ -5,7 +5,7 @@
# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($plot_demo) && $plot_demo
- $plot_demo.destroy
+ $plot_demo.destroy
$plot_demo = nil
end
@@ -19,7 +19,7 @@ $plot_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($plot_demo).pack(:fill=>:both, :expand=>true)
# label À¸À®
-TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'4i', 'justify'=>'left',
+TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'4i', 'justify'=>'left',
'text'=>"¤³¤Î¥¦¥£¥ó¥É¥¦¤Ï´Êñ¤Ê2¼¡¸µ¤Î¥×¥í¥Ã¥È¤ò´Þ¤ó¤À¥­¥ã¥ó¥Ð¥¹ widget¤Ç¤¹¡£É½¼¨¤µ¤ì¤¿ÅÀ¤ò¥Þ¥¦¥¹¥Ü¥¿¥ó1¤Ç¥É¥é¥Ã¥°¤·¤Æ¥Ç¡¼¥¿¤ò¤¤¤¸¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£"){
pack('side'=>'top')
}
@@ -57,45 +57,45 @@ $plot_canvas.pack('side'=>'top', 'fill'=>'x')
# plot À¸À®
TkcLine.new($plot_canvas, 100, 250, 400, 250, 'width'=>2)
TkcLine.new($plot_canvas, 100, 250, 100, 50, 'width'=>2)
-TkcText.new($plot_canvas, 225, 20,
+TkcText.new($plot_canvas, 225, 20,
'text'=>"´Êñ¤Ê¥×¥í¥Ã¥È", 'font'=>plotFont, 'fill'=>'brown')
(0..10).each {|i|
x = 100 + (i * 30)
TkcLine.new($plot_canvas, x, 250, x, 245, 'width'=>2)
- TkcText.new($plot_canvas, x, 254,
+ TkcText.new($plot_canvas, x, 254,
'text'=>10*i, 'font'=>plotFont, 'anchor'=>'n')
}
(0..5).each {|i|
y = 250 - (i * 40)
TkcLine.new($plot_canvas, 100, y, 105, y, 'width'=>2)
- TkcText.new($plot_canvas, 96, y,
+ TkcText.new($plot_canvas, 96, y,
'text'=>"#{i*50}.0", 'font'=>plotFont, 'anchor'=>'e')
}
for xx, yy in [[12,56],[20,94],[33,98],[32,120],[61,180],[75,160],[98,223]]
x = 100 + (3*xx)
y = 250 - (4*yy)/5
- item = TkcOval.new($plot_canvas, x-6, y-6, x+6, y+6,
+ item = TkcOval.new($plot_canvas, x-6, y-6, x+6, y+6,
'width'=>1, 'outline'=>'black', 'fill'=>'SkyBlue2')
item.addtag 'point'
end
-$plot_canvas.itembind('point', 'Any-Enter',
+$plot_canvas.itembind('point', 'Any-Enter',
proc{$plot_canvas.itemconfigure 'current','fill','red'})
-$plot_canvas.itembind('point', 'Any-Leave',
+$plot_canvas.itembind('point', 'Any-Leave',
proc{$plot_canvas.itemconfigure 'current','fill','SkyBlue2'})
-$plot_canvas.itembind('point', '1',
+$plot_canvas.itembind('point', '1',
proc{|x,y| plotDown $plot_canvas,x,y}, "%x %y")
-$plot_canvas.itembind('point', 'ButtonRelease-1',
+$plot_canvas.itembind('point', 'ButtonRelease-1',
proc{$plot_canvas.dtag 'selected'})
-$plot_canvas.bind('B1-Motion',
+$plot_canvas.bind('B1-Motion',
proc{|x,y| plotMove $plot_canvas,x,y}, "%x %y")
$plot = {'lastX'=>0, 'lastY'=>0}
# plotDown --
-# This method is invoked when the mouse is pressed over one of the
+# This method is invoked when the mouse is pressed over one of the
# data points. It sets up state to allow the point to be dragged.
#
# Arguments:
diff --git a/ext/tk/sample/demos-jp/puzzle.rb b/ext/tk/sample/demos-jp/puzzle.rb
index 16d7ce497c..2febc2c55a 100644
--- a/ext/tk/sample/demos-jp/puzzle.rb
+++ b/ext/tk/sample/demos-jp/puzzle.rb
@@ -5,7 +5,7 @@
# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($puzzle_demo) && $puzzle_demo
- $puzzle_demo.destroy
+ $puzzle_demo.destroy
$puzzle_demo = nil
end
@@ -49,7 +49,7 @@ TkFrame.new(base_frame) {|frame|
# frame À¸À®
#
# Special trick: scrollbar widget ¤òÀ¸À®¤·¤Æ¤½¤Î trough color ¤òÍѤ¤¤ë¤³¤È¤Ç
-# ¶õÇòÉôʬ¤Î¤¿¤á¤Î°Å¿§¤òÁªÂò¤·¡¤ÀßÄꤹ¤ë
+# ¶õÇòÉôʬ¤Î¤¿¤á¤Î°Å¿§¤òÁªÂò¤·¡¤ÀßÄꤹ¤ë
#
begin
if Tk.windowingsystem() == 'aqua'
@@ -69,7 +69,7 @@ end
# depend_on_button_width = true
depend_on_button_width = false
-
+
s = TkScrollbar.new(base_frame)
base = TkFrame.new(base_frame) {
width frameWidth
@@ -103,7 +103,7 @@ order = [3,1,6,2,5,7,15,13,4,11,8,9,14,10,12]
if depend_on_button_width && (w.winfo_reqwidth * 4 > base.width)
base.width = w.winfo_reqwidth * 4
end
- }.place('relx'=>$xpos[num], 'rely'=>$ypos[num],
+ }.place('relx'=>$xpos[num], 'rely'=>$ypos[num],
'relwidth'=>0.25, 'relheight'=>0.25)
}
$xpos['space'] = 0.75
diff --git a/ext/tk/sample/demos-jp/radio.rb b/ext/tk/sample/demos-jp/radio.rb
index 3355f25116..a61ad46d9b 100644
--- a/ext/tk/sample/demos-jp/radio.rb
+++ b/ext/tk/sample/demos-jp/radio.rb
@@ -5,7 +5,7 @@
# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($radio_demo) && $radio_demo
- $radio_demo.destroy
+ $radio_demo.destroy
$radio_demo = nil
end
diff --git a/ext/tk/sample/demos-jp/radio2.rb b/ext/tk/sample/demos-jp/radio2.rb
index 91496beb6d..cf53e3e485 100644
--- a/ext/tk/sample/demos-jp/radio2.rb
+++ b/ext/tk/sample/demos-jp/radio2.rb
@@ -10,7 +10,7 @@
# toplevel widget
if defined?($radio2_demo) && $radio2_demo
- $radio2_demo.destroy
+ $radio2_demo.destroy
$radio2_demo = nil
end
@@ -23,7 +23,7 @@ $radio2_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($radio2_demo).pack(:fill=>:both, :expand=>true)
-# label
+# label
msg = TkLabel.new(base_frame) {
font $font
wraplength '5i'
@@ -32,12 +32,12 @@ msg = TkLabel.new(base_frame) {
}
msg.pack('side'=>'top')
-#
+#
size = TkVariable.new
color = TkVariable.new
align = TkVariable.new
-# frame
+# frame
TkFrame.new(base_frame) {|frame|
TkButton.new(frame) {
#text 'λ²ò'
@@ -58,24 +58,24 @@ TkFrame.new(base_frame) {|frame|
TkButton.new(frame) {
text 'ÊÑ¿ô»²¾È'
command proc{
- showVars(base_frame,
+ showVars(base_frame,
['size', size], ['color', color], ['compound', align])
}
}.pack('side'=>'left', 'expand'=>'yes')
}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-# frame
-f_left = TkLabelFrame.new(base_frame, 'text'=>'ʸ»ú¥µ¥¤¥º',
+# frame
+f_left = TkLabelFrame.new(base_frame, 'text'=>'ʸ»ú¥µ¥¤¥º',
'pady'=>2, 'padx'=>2)
-f_mid = TkLabelFrame.new(base_frame, 'text'=>'¿§',
+f_mid = TkLabelFrame.new(base_frame, 'text'=>'¿§',
'pady'=>2, 'padx'=>2)
-f_right = TkLabelFrame.new(base_frame, 'text'=>'¥Ó¥Ã¥È¥Þ¥Ã¥×ÇÛÃÖ',
+f_right = TkLabelFrame.new(base_frame, 'text'=>'¥Ó¥Ã¥È¥Þ¥Ã¥×ÇÛÃÖ',
'pady'=>2, 'padx'=>2)
f_left.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
f_mid.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
f_right.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
-# radiobutton
+# radiobutton
[10, 12, 18, 24].each {|sz|
TkRadioButton.new(f_left) {
text "¥Ý¥¤¥ó¥È¥µ¥¤¥º #{sz}"
@@ -95,15 +95,15 @@ f_right.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
}.pack('side'=>'top', 'pady'=>2, 'fill'=>'x')
}
-# label = TkLabel.new(f_right, 'text'=>'¥é¥Ù¥ë', 'bitmap'=>'questhead',
-label = Tk::Label.new(f_right, 'text'=>'¥é¥Ù¥ë', 'bitmap'=>'questhead',
+# label = TkLabel.new(f_right, 'text'=>'¥é¥Ù¥ë', 'bitmap'=>'questhead',
+label = Tk::Label.new(f_right, 'text'=>'¥é¥Ù¥ë', 'bitmap'=>'questhead',
'compound'=>'left')
label.configure('width'=>TkWinfo.reqwidth(label), 'compound'=>'top')
label.height(TkWinfo.reqheight(label))
abtn = ['Top', 'Left', 'Right', 'Bottom'].collect{|a|
lower = a.downcase
- TkRadioButton.new(f_right, 'text'=>a, 'variable'=>align, 'relief'=>'flat',
- 'value'=>lower, 'indicatoron'=>0, 'width'=>7,
+ TkRadioButton.new(f_right, 'text'=>a, 'variable'=>align, 'relief'=>'flat',
+ 'value'=>lower, 'indicatoron'=>0, 'width'=>7,
'command'=>proc{label.compound(align.value)})
}
diff --git a/ext/tk/sample/demos-jp/radio3.rb b/ext/tk/sample/demos-jp/radio3.rb
index 763c522448..4bbc1b31f5 100644
--- a/ext/tk/sample/demos-jp/radio3.rb
+++ b/ext/tk/sample/demos-jp/radio3.rb
@@ -10,7 +10,7 @@
# toplevel widget
if defined?($radio3_demo) && $radio3_demo
- $radio3_demo.destroy
+ $radio3_demo.destroy
$radio3_demo = nil
end
@@ -23,7 +23,7 @@ $radio3_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($radio3_demo).pack(:fill=>:both, :expand=>true)
-# label
+# label
msg = TkLabel.new(base_frame) {
font $font
wraplength '5i'
@@ -37,50 +37,50 @@ size = TkVariable.new
color = TkVariable.new
align = TkVariable.new
-# frame
+# frame
TkFrame.new(base_frame) {|frame|
- TkGrid(TkFrame.new(frame, :height=>2, :relief=>:sunken, :bd=>2),
+ TkGrid(TkFrame.new(frame, :height=>2, :relief=>:sunken, :bd=>2),
:columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
- TkGrid('x',
- TkButton.new(frame, :text=>'ÊÑ¿ô»²¾È',
- :image=>$image['view'], :compound=>:left,
+ TkGrid('x',
+ TkButton.new(frame, :text=>'ÊÑ¿ô»²¾È',
+ :image=>$image['view'], :compound=>:left,
:command=>proc{
- showVars(base_frame, ['size', size],
+ showVars(base_frame, ['size', size],
['color', color], ['compound', align])
- }),
- TkButton.new(frame, :text=>'¥³¡¼¥É»²¾È',
- :image=>$image['view'], :compound=>:left,
- :command=>proc{showCode 'radio3'}),
- TkButton.new(frame, :text=>'ÊĤ¸¤ë',
- :image=>$image['delete'], :compound=>:left,
+ }),
+ TkButton.new(frame, :text=>'¥³¡¼¥É»²¾È',
+ :image=>$image['view'], :compound=>:left,
+ :command=>proc{showCode 'radio3'}),
+ TkButton.new(frame, :text=>'ÊĤ¸¤ë',
+ :image=>$image['delete'], :compound=>:left,
:command=>proc{
tmppath = $radio3_demo
$radio3_demo = nil
$showVarsWin[tmppath.path] = nil
tmppath.destroy
- }),
+ }),
:padx=>4, :pady=>4)
frame.grid_columnconfigure(0, :weight=>1)
TkGrid(frame, :row=>3, :column=>0, :columnspan=>3, :sticky=>'nsew')
}
-# frame
-f_left = TkLabelFrame.new(base_frame, 'text'=>'ʸ»ú¥µ¥¤¥º',
+# frame
+f_left = TkLabelFrame.new(base_frame, 'text'=>'ʸ»ú¥µ¥¤¥º',
'pady'=>2, 'padx'=>2)
-f_mid = TkLabelFrame.new(base_frame, 'text'=>'¿§',
+f_mid = TkLabelFrame.new(base_frame, 'text'=>'¿§',
'pady'=>2, 'padx'=>2)
-f_right = TkLabelFrame.new(base_frame, 'text'=>'¥Ó¥Ã¥È¥Þ¥Ã¥×ÇÛÃÖ',
+f_right = TkLabelFrame.new(base_frame, 'text'=>'¥Ó¥Ã¥È¥Þ¥Ã¥×ÇÛÃÖ',
'pady'=>2, 'padx'=>2)
f_left .grid('column'=>0, 'row'=>1, 'pady'=>'.5c', 'padx'=>'.5c', 'rowspan'=>2)
f_mid .grid('column'=>1, 'row'=>1, 'pady'=>'.5c', 'padx'=>'.5c', 'rowspan'=>2)
f_right.grid('column'=>2, 'row'=>1, 'pady'=>'.5c', 'padx'=>'.5c')
-TkButton.new(base_frame, 'text'=>'¥È¥é¥¤¥¹¥Æ¡¼¥È',
+TkButton.new(base_frame, 'text'=>'¥È¥é¥¤¥¹¥Æ¡¼¥È',
'command'=>proc{size.value = 'multi'; color.value = 'multi'}){
grid('column'=>2, 'row'=>2, 'pady'=>'.5c', 'padx'=>'.5c')
}
-# radiobutton
+# radiobutton
[10, 12, 14, 18, 24].each {|sz|
TkRadioButton.new(f_left) {
text "¥Ý¥¤¥ó¥È¥µ¥¤¥º #{sz}"
@@ -103,14 +103,14 @@ TkButton.new(base_frame, 'text'=>'¥È¥é¥¤¥¹¥Æ¡¼¥È',
}.pack('side'=>'top', 'pady'=>2, 'fill'=>'x')
}
-# label = TkLabel.new(f_right, 'text'=>'¥é¥Ù¥ë', 'bitmap'=>'questhead',
-label = Tk::Label.new(f_right, 'text'=>'¥é¥Ù¥ë', 'bitmap'=>'questhead',
+# label = TkLabel.new(f_right, 'text'=>'¥é¥Ù¥ë', 'bitmap'=>'questhead',
+label = Tk::Label.new(f_right, 'text'=>'¥é¥Ù¥ë', 'bitmap'=>'questhead',
'compound'=>'left')
label.configure('width'=>TkWinfo.reqwidth(label), 'compound'=>'top')
label.height(TkWinfo.reqheight(label))
a_btn = ['Top', 'Left', 'Right', 'Bottom'].collect{|a|
- TkRadioButton.new(f_right, 'text'=>a, 'variable'=>align, 'relief'=>'flat',
- 'value'=>a.downcase, 'indicatoron'=>0, 'width'=>7,
+ TkRadioButton.new(f_right, 'text'=>a, 'variable'=>align, 'relief'=>'flat',
+ 'value'=>a.downcase, 'indicatoron'=>0, 'width'=>7,
'command'=>proc{label.compound(align.value)})
}
diff --git a/ext/tk/sample/demos-jp/ruler.rb b/ext/tk/sample/demos-jp/ruler.rb
index a721b95a6a..d6bc9e76d1 100644
--- a/ext/tk/sample/demos-jp/ruler.rb
+++ b/ext/tk/sample/demos-jp/ruler.rb
@@ -18,7 +18,7 @@ end
# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($ruler_demo) && $ruler_demo
- $ruler_demo.destroy
+ $ruler_demo.destroy
$ruler_demo = nil
end
@@ -32,7 +32,7 @@ $ruler_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($ruler_demo).pack(:fill=>:both, :expand=>true)
# label À¸À®
-TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'5i', 'justify'=>'left',
+TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'5i', 'justify'=>'left',
'text'=>"¤³¤Î¥­¥ã¥ó¥Ð¥¹widget¤Ï¥ë¡¼¥é¡¼¤ÎÌÏ·¿¤Ç¤¹¡£¥ë¡¼¥é¡¼¤Î±¦¤Ë¤¢¤ë¤Î¤Ï¥¿¥Ö¥¹¥È¥Ã¥×¤Î°æ¸Í¤Ç¡¢¤³¤³¤«¤é°ú¤ÃÄ¥¤Ã¤Æ¤¯¤ë¤³¤È¤Ë¤è¤Ã¤Æ¥¿¥Ö¥¹¥È¥Ã¥×¤òºî¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤Þ¤¿¡¢¤¹¤Ç¤Ë¤¢¤ë¥¿¥Ö¥¹¥È¥Ã¥×¤òư¤«¤¹¤³¤È¤â¤Ç¤­¤Þ¤¹¡£¥¿¥Ö¥¹¥È¥Ã¥×¤ò¾åÊý¤Þ¤¿¤Ï²¼Êý¤Ë¤«¤¹¤ì¤ÆÉ½¼¨¤µ¤ì¤ë¤Þ¤Ç¥É¥é¥Ã¥°¤¹¤ë¤È¡¢¥Þ¥¦¥¹¥Ü¥¿¥ó¤òÎ¥¤·¤¿»þ¤Ë¤½¤Î¥¿¥Ö¥¹¥È¥Ã¥×¤Ï¾Ã¤¨¤Þ¤¹¡£"){
pack('side'=>'top')
}
@@ -62,8 +62,8 @@ $ruler_canvas.pack('side'=>'top', 'fill'=>'x')
# ÃÍÀßÄê
unless Struct.const_defined?("RulerInfo")
- $demo_rulerInfo = Struct.new("RulerInfo", :grid, :left, :right, :x, :y,
- :top, :bottom, :size, :normalStyle,
+ $demo_rulerInfo = Struct.new("RulerInfo", :grid, :left, :right, :x, :y,
+ :top, :bottom, :size, :normalStyle,
:activeStyle, :deleteStyle).new
end
$demo_rulerInfo.grid = '.25c'
@@ -75,17 +75,17 @@ $demo_rulerInfo.size = TkWinfo.fpixels($ruler_canvas, '.2c')
$demo_rulerInfo.normalStyle = {'fill'=>'black'}
if TkWinfo.depth($ruler_canvas) > 1
$demo_rulerInfo.activeStyle = {'fill'=>'red', 'stipple'=>''}
- $demo_rulerInfo.deleteStyle = {'fill'=>'red',
- 'stipple'=>'@'+[$demo_dir, '..',
+ $demo_rulerInfo.deleteStyle = {'fill'=>'red',
+ 'stipple'=>'@'+[$demo_dir, '..',
'images', 'gray25.xbm'].join(File::Separator)}
else
$demo_rulerInfo.activeStyle = {'fill'=>'black', 'stipple'=>''}
- $demo_rulerInfo.deleteStyle = {'fill'=>'black',
- 'stipple'=>'@'+[$demo_dir, '..',
+ $demo_rulerInfo.deleteStyle = {'fill'=>'black',
+ 'stipple'=>'@'+[$demo_dir, '..',
'images', 'gray25.xbm'].join(File::Separator)}
end
-TkcLine.new($ruler_canvas,
+TkcLine.new($ruler_canvas,
'1c', '0.5c', '1c', '1c', '13c', '1c', '13c', '0.5c', 'width'=>1)
(0..11).each{|i|
x = i+1
@@ -99,21 +99,21 @@ TkcLine.new($ruler_canvas,
$rulerTag_well = TkcTag.new($ruler_canvas)
$ruler_canvas\
.addtag_withtag($rulerTag_well,
- TkcRectangle.new($ruler_canvas,
- '13.2c', '1c', '13.8c', '0.5c',
- 'outline'=>'black',
+ TkcRectangle.new($ruler_canvas,
+ '13.2c', '1c', '13.8c', '0.5c',
+ 'outline'=>'black',
'fill'=>($ruler_canvas\
.configinfo('background'))[4]) )
$ruler_canvas\
.addtag_withtag($rulerTag_well,
- rulerMkTab($ruler_canvas,
- TkWinfo.pixels($ruler_canvas, '13.5c'),
+ rulerMkTab($ruler_canvas,
+ TkWinfo.pixels($ruler_canvas, '13.5c'),
TkWinfo.pixels($ruler_canvas, '.65c') ) )
$rulerTag_well.bind('1', proc{|x,y| rulerNewTab($ruler_canvas,x,y)}, '%x %y')
-$ruler_canvas.itembind('tab', '1',
+$ruler_canvas.itembind('tab', '1',
proc{|x,y| rulerSelectTab($ruler_canvas,x,y)}, '%x %y')
-$ruler_canvas.bind('B1-Motion',
+$ruler_canvas.bind('B1-Motion',
proc{|x,y| rulerMoveTab($ruler_canvas,x,y)}, '%x %y')
$ruler_canvas.bind('Any-ButtonRelease-1', proc{rulerReleaseTab($ruler_canvas)})
diff --git a/ext/tk/sample/demos-jp/sayings.rb b/ext/tk/sample/demos-jp/sayings.rb
index b3bdbe0bc5..aa24b3a2ad 100644
--- a/ext/tk/sample/demos-jp/sayings.rb
+++ b/ext/tk/sample/demos-jp/sayings.rb
@@ -5,7 +5,7 @@
# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($sayings_demo) && $sayings_demo
- $sayings_demo.destroy
+ $sayings_demo.destroy
$sayings_demo = nil
end
@@ -67,11 +67,11 @@ TkFrame.new(base_frame, 'borderwidth'=>10) {|w|
sayings_lbox.pack('expand'=>'yes', 'fill'=>'y')
else
- sayings_lbox.grid('row'=>0, 'column'=>0,
+ sayings_lbox.grid('row'=>0, 'column'=>0,
'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
- sv.grid('row'=>0, 'column'=>1,
+ sv.grid('row'=>0, 'column'=>1,
'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
- sh.grid('row'=>1, 'column'=>0,
+ sh.grid('row'=>1, 'column'=>0,
'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
TkGrid.rowconfigure(w, 0, 'weight'=>1, 'minsize'=>0)
TkGrid.columnconfigure(w, 0, 'weight'=>1, 'minsize'=>0)
diff --git a/ext/tk/sample/demos-jp/search.rb b/ext/tk/sample/demos-jp/search.rb
index 293ae83910..9838ff5d19 100644
--- a/ext/tk/sample/demos-jp/search.rb
+++ b/ext/tk/sample/demos-jp/search.rb
@@ -58,13 +58,13 @@ end
def textToggle(cmd1,sleep1,cmd2,sleep2)
sleep_list = [sleep2, sleep1]
- TkAfter.new(proc{sleep = sleep_list.shift; sleep_list.push(sleep); sleep},
+ TkAfter.new(proc{sleep = sleep_list.shift; sleep_list.push(sleep); sleep},
-1, cmd1, cmd2).start(sleep1)
end
# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($search_demo) && $search_demo
- $search_demo.destroy
+ $search_demo.destroy
$search_demo = nil
end
@@ -98,35 +98,35 @@ $search_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
# frame À¸À®
TkFrame.new(base_frame) {|f|
- TkLabel.new(f, 'text'=>'¥Õ¥¡¥¤¥ë̾:',
+ TkLabel.new(f, 'text'=>'¥Õ¥¡¥¤¥ë̾:',
'width'=>13, 'anchor'=>'w').pack('side'=>'left')
$search_fileName = TkVariable.new
- TkEntry.new(f, 'width'=>40,
+ TkEntry.new(f, 'width'=>40,
'textvariable'=>$search_fileName) {
pack('side'=>'left')
bind('Return', proc{textLoadFile($search_text, $search_fileName.value)
$search_string_entry.focus})
focus
}
- TkButton.new(f, 'text'=>'ÆÉ¤ß¹þ¤ß',
- 'command'=>proc{textLoadFile($search_text,
+ TkButton.new(f, 'text'=>'ÆÉ¤ß¹þ¤ß',
+ 'command'=>proc{textLoadFile($search_text,
$search_fileName.value)})\
.pack('side'=>'left', 'pady'=>5, 'padx'=>10)
}.pack('side'=>'top', 'fill'=>'x')
TkFrame.new(base_frame) {|f|
- TkLabel.new(f, 'text'=>'¸¡º÷ʸ»úÎó:',
+ TkLabel.new(f, 'text'=>'¸¡º÷ʸ»úÎó:',
'width'=>13, 'anchor'=>'w').pack('side'=>'left')
$search_searchString = TkVariable.new
- $search_string_entry = TkEntry.new(f, 'width'=>40,
+ $search_string_entry = TkEntry.new(f, 'width'=>40,
'textvariable'=>$search_searchString) {
pack('side'=>'left')
- bind('Return', proc{textSearch($search_text, $search_searchString.value,
+ bind('Return', proc{textSearch($search_text, $search_searchString.value,
$search_Tag)})
}
- TkButton.new(f, 'text'=>'ȿž',
- 'command'=>proc{textSearch($search_text,
- $search_searchString.value,
+ TkButton.new(f, 'text'=>'ȿž',
+ 'command'=>proc{textSearch($search_text,
+ $search_searchString.value,
$search_Tag)}) {
pack('side'=>'left', 'pady'=>5, 'padx'=>10)
}
@@ -139,26 +139,26 @@ $search_text = TkText.new(base_frame, 'setgrid'=>true) {|t|
pack('side'=>'right', 'fill'=>'y')
}
pack('expand'=>'yes', 'fill'=>'both')
-}
+}
# Set up display styles for text highlighting.
if TkWinfo.depth($search_demo) > 1
textToggle(proc{
- $search_Tag.configure('background'=>'#ce5555',
+ $search_Tag.configure('background'=>'#ce5555',
'foreground'=>'white')
},
- 800,
+ 800,
proc{
$search_Tag.configure('background'=>'', 'foreground'=>'')
},
200 )
else
textToggle(proc{
- $search_Tag.configure('background'=>'black',
+ $search_Tag.configure('background'=>'black',
'foreground'=>'white')
},
- 800,
+ 800,
proc{
$search_Tag.configure('background'=>'', 'foreground'=>'')
},
diff --git a/ext/tk/sample/demos-jp/spin.rb b/ext/tk/sample/demos-jp/spin.rb
index 2bcc3217e6..8d4e33cda0 100644
--- a/ext/tk/sample/demos-jp/spin.rb
+++ b/ext/tk/sample/demos-jp/spin.rb
@@ -7,7 +7,7 @@
# based on Tcl/Tk8.4.4 widget demos
if defined?($spin_demo) && $spin_demo
- $spin_demo.destroy
+ $spin_demo.destroy
$spin_demo = nil
end
@@ -19,8 +19,8 @@ $spin_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($spin_demo).pack(:fill=>:both, :expand=>true)
-TkLabel.new(base_frame,
- :font=>$font, :wraplength=>'5i', :justify=>:left,
+TkLabel.new(base_frame,
+ :font=>$font, :wraplength=>'5i', :justify=>:left,
:text=><<EOL).pack(:side=>:top)
²¼¤Ë¤Ï£³¼ïÎà¤Î¥¹¥Ô¥ó¥Ü¥Ã¥¯¥¹¤¬É½¼¨¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
¤½¤ì¤¾¤ì¡¢¥Þ¥¦¥¹¤ÇÁªÂò¤·¤ÆÊ¸»ú¤òÆþÎϤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
@@ -38,7 +38,7 @@ Backspace ¤È Control-h ¤È¤ÏÆþÎÏ¥«¡¼¥½¥ë¤Îº¸Â¦¤Îʸ»ú¤ò
¤â¤·¤¢¤Ê¤¿¤¬»È¤Ã¤Æ¤¤¤ë Ruby ¤Ë¥ê¥ó¥¯¤µ¤ì¤Æ¤¤¤ë Tk ¥é¥¤
¥Ö¥é¥ê¤¬ spinbox ¥¦¥£¥¸¥§¥Ã¥È¤ò¼ÂÁõ¤·¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢¤³¤Î
¥Ç¥â¤Ï¤¦¤Þ¤¯Æ°¤«¤Ê¤¤¤Ï¤º¤Ç¤¹¡£¤½¤Î¾ì¹ç¤Ë¤Ï spinbox ¥¦¥£
-¥¸¥§¥Ã¥È¤¬¼ÂÁõ¤µ¤ì¤Æ¤¤¤ë¤è¤¦¤Ê¤è¤ê¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤Î Tk
+¥¸¥§¥Ã¥È¤¬¼ÂÁõ¤µ¤ì¤Æ¤¤¤ë¤è¤¦¤Ê¤è¤ê¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤Î Tk
¤òÁȤ߹ç¤ï¤»¤Æ»î¤¹¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£
EOL
@@ -56,16 +56,16 @@ TkFrame.new(base_frame){|f|
}
australianCities = [
- 'Canberra', 'Sydney', 'Melbourne', 'Perth', 'Adelaide',
+ 'Canberra', 'Sydney', 'Melbourne', 'Perth', 'Adelaide',
'Brisbane', 'Hobart', 'Darwin', 'Alice Springs'
]
[
- TkSpinbox.new(base_frame, :from=>1, :to=>10, :width=>10, :validate=>:key,
+ TkSpinbox.new(base_frame, :from=>1, :to=>10, :width=>10, :validate=>:key,
:validatecommand=>[
proc{|s| s == '' || /^[+-]?\d+$/ =~ s }, '%P'
- ]),
- TkSpinbox.new(base_frame, :from=>0, :to=>3, :increment=>0.5,
- :format=>'%05.2f', :width=>10),
+ ]),
+ TkSpinbox.new(base_frame, :from=>0, :to=>3, :increment=>0.5,
+ :format=>'%05.2f', :width=>10),
TkSpinbox.new(base_frame, :values=>australianCities, :width=>10)
].each{|sbox| sbox.pack(:side=>:top, :pady=>5, :padx=>10)}
diff --git a/ext/tk/sample/demos-jp/states.rb b/ext/tk/sample/demos-jp/states.rb
index f354d28d84..5e242b7c38 100644
--- a/ext/tk/sample/demos-jp/states.rb
+++ b/ext/tk/sample/demos-jp/states.rb
@@ -5,7 +5,7 @@
# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($states_demo) && $states_demo
- $states_demo.destroy
+ $states_demo.destroy
$states_demo = nil
end
diff --git a/ext/tk/sample/demos-jp/style.rb b/ext/tk/sample/demos-jp/style.rb
index 3189e1f6d8..66b6de0251 100644
--- a/ext/tk/sample/demos-jp/style.rb
+++ b/ext/tk/sample/demos-jp/style.rb
@@ -5,7 +5,7 @@
# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($style_demo) && $style_demo
- $style_demo.destroy
+ $style_demo.destroy
$style_demo = nil
end
@@ -76,13 +76,13 @@ txt = TkText.new(base_frame){|t|
# when /^8.*/
# unless $style_demo_do_first
# $style_demo_do_first = true
-# Tk.tk_call('font', 'create', '@bigascii',
+# Tk.tk_call('font', 'create', '@bigascii',
# '-copy', '-*-Courier-Bold-R-Normal--*-140-*-*-*-*-*-*')
-# Tk.tk_call('font', 'create', '@smallascii',
+# Tk.tk_call('font', 'create', '@smallascii',
# '-copy', '-Adobe-Helvetica-Bold-R-Normal-*-100-*')
-# Tk.tk_call('font', 'create', '@cBigFont',
+# Tk.tk_call('font', 'create', '@cBigFont',
# '-compound', '@bigascii @msg_knj')
-# Tk.tk_call('font', 'create', '@cSmallFont',
+# Tk.tk_call('font', 'create', '@cSmallFont',
# '-compound', '@smallascii @kanji')
# end
# style_tag_big = TkTextTag.new(t, 'font'=>'@cBigFont')
@@ -96,24 +96,24 @@ txt = TkText.new(base_frame){|t|
style_tag_raised = TkTextTag.new(t, 'relief'=>'raised', 'borderwidth'=>1)
style_tag_sunken = TkTextTag.new(t, 'relief'=>'sunken', 'borderwidth'=>1)
else
- style_tag_color1 = TkTextTag.new(t, 'background'=>'black',
+ style_tag_color1 = TkTextTag.new(t, 'background'=>'black',
'foreground'=>'white')
- style_tag_color2 = TkTextTag.new(t, 'background'=>'black',
+ style_tag_color2 = TkTextTag.new(t, 'background'=>'black',
'foreground'=>'white')
- style_tag_raised = TkTextTag.new(t, 'background'=>'white',
+ style_tag_raised = TkTextTag.new(t, 'background'=>'white',
'relief'=>'raised', 'borderwidth'=>1)
- style_tag_sunken = TkTextTag.new(t, 'background'=>'white',
+ style_tag_sunken = TkTextTag.new(t, 'background'=>'white',
'relief'=>'sunken', 'borderwidth'=>1)
end
# ¥Æ¥­¥¹¥È¥¿¥°ÀßÄê (¤½¤Î¾)
if $tk_version =~ /^4\.[01]/
- style_tag_bgstipple = TkTextTag.new(t, 'background'=>'black',
- 'borderwidth'=>0,
+ style_tag_bgstipple = TkTextTag.new(t, 'background'=>'black',
+ 'borderwidth'=>0,
'bgstipple'=>'gray25')
else
- style_tag_bgstipple = TkTextTag.new(t, 'background'=>'black',
- 'borderwidth'=>0,
+ style_tag_bgstipple = TkTextTag.new(t, 'background'=>'black',
+ 'borderwidth'=>0,
'bgstipple'=>'gray12')
end
style_tag_fgstipple = TkTextTag.new(t, 'fgstipple'=>'gray50')
@@ -217,9 +217,9 @@ X')
9. ¥Þ¡¼¥¸¥ó', style_tag_big)
insert('end', '¥Æ¥­¥¹¥È¤Îº¸Â¦¤Ë;ʬ¤Ê¶õÇò¤òÃÖ¤¯¤³¤È¤¬¤Ç¤­¤Þ¤¹:
')
- insert('end', '¤³¤ÎÃÊÍî¤Ï¥Þ¡¼¥¸¥ó¤Î»ÈÍÑÎã¤Ç¤¹¡£¥¹¥¯¥ê¡¼¥ó',
+ insert('end', '¤³¤ÎÃÊÍî¤Ï¥Þ¡¼¥¸¥ó¤Î»ÈÍÑÎã¤Ç¤¹¡£¥¹¥¯¥ê¡¼¥ó',
style_tag_margins)
- insert('end', '¾å¤ÇÀÞ¤êÊÖ¤µ¤ì¤ÆÉ½¼¨¤µ¤ì¤Æ¤¤¤ë1¹Ô¤Î¥Æ¥­¥¹¥È¤Ç¤¹¡£',
+ insert('end', '¾å¤ÇÀÞ¤êÊÖ¤µ¤ì¤ÆÉ½¼¨¤µ¤ì¤Æ¤¤¤ë1¹Ô¤Î¥Æ¥­¥¹¥È¤Ç¤¹¡£',
style_tag_margins)
insert('end', 'º¸Â¦¤Ë¤Ï2¼ïÎà¤Î¥Þ¡¼¥¸¥ó¤ò»ý¤Á¤Þ¤¹¡£', style_tag_margins)
insert('end', '1¹ÔÌܤËÂФ¹¤ë¤â¤Î¤È¡¢', style_tag_margins)
@@ -241,9 +241,9 @@ spacing3')
insert('end', '¤Î¶õ´Ö¤òÃÖ
¤¯¤«¤ò¼¨¤·¤Þ¤¹¡£
')
- insert('end', '¤³¤ì¤é¤Î¥¤¥ó¥Ç¥ó¥È¤µ¤ì¤¿ÃÊÍî¤Ï¤É¤Î¤è¤¦¤Ë',
+ insert('end', '¤³¤ì¤é¤Î¥¤¥ó¥Ç¥ó¥È¤µ¤ì¤¿ÃÊÍî¤Ï¤É¤Î¤è¤¦¤Ë',
style_tag_spacing)
- insert('end', '¥¹¥Ú¡¼¥·¥ó¥°¤¬¤¬¹Ô¤ï¤ì¤ë¤Î¤«¤ò¼¨¤·¤Þ¤¹¡£',
+ insert('end', '¥¹¥Ú¡¼¥·¥ó¥°¤¬¤¬¹Ô¤ï¤ì¤ë¤Î¤«¤ò¼¨¤·¤Þ¤¹¡£',
style_tag_spacing)
insert('end', '³ÆÃÊÍî¤Ï¼ÂºÝ¤Ï¥Æ¥­¥¹¥Èwidget', style_tag_spacing)
insert('end', '¤Î1¹Ô¤Ç¡¢widget¤Ë¤è¤Ã¤ÆÀÞ¤ê¾ö¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
@@ -253,11 +253,11 @@ spacing3')
insert('end', '¤³¤ì¤Ë¤è¤ê¡¢ÃÊÍî¤Î´Ö¤ËÂ礭¤Ê´Ö³Ö¤¬', style_tag_spacing)
insert('end', '¸ºß¤·¤Æ¤¤¤Þ¤¹¡£', style_tag_spacing)
insert('end', 'Spacing2¤Ï2point¤ËÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹¡£', style_tag_spacing)
- insert('end', '¤³¤ì¤ÇÃÊÍî¤ÎÃæ¤Ë¤Û¤ó¤Î¾¯¤·´Ö³Ö¤¬Â¸ºß¤·¤Æ¤¤¤Þ¤¹¡£',
+ insert('end', '¤³¤ì¤ÇÃÊÍî¤ÎÃæ¤Ë¤Û¤ó¤Î¾¯¤·´Ö³Ö¤¬Â¸ºß¤·¤Æ¤¤¤Þ¤¹¡£',
style_tag_spacing)
insert('end', 'Spacing3¤Ï¤³¤ÎÎã¤Ç¤Ï»ÈÍѤµ¤ì¤Æ¤¤¤Þ¤»¤ó¡£
', style_tag_spacing)
- insert('end', '´Ö³Ö¤¬¤É¤³¤Ë¤¢¤ë¤«¤ò¸«¤¿¤±¤ì¤Ð¡¢¤³¤ì¤é¤ÎÃÊÍî¤Î',
+ insert('end', '´Ö³Ö¤¬¤É¤³¤Ë¤¢¤ë¤«¤ò¸«¤¿¤±¤ì¤Ð¡¢¤³¤ì¤é¤ÎÃÊÍî¤Î',
style_tag_spacing)
insert('end', '¤Ê¤«¤Ç¥Æ¥­¥¹¥È¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£ÁªÂò¤Î', style_tag_spacing)
insert('end', 'ȿž¤·¤¿Éôʬ¤Ë¤Ï;ʬ¤Ë¤È¤é¤ì¤¿´Ö³Ö¤¬', style_tag_spacing)
diff --git a/ext/tk/sample/demos-jp/text.rb b/ext/tk/sample/demos-jp/text.rb
index ea15064830..0ae480eb00 100644
--- a/ext/tk/sample/demos-jp/text.rb
+++ b/ext/tk/sample/demos-jp/text.rb
@@ -5,7 +5,7 @@
# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($text_demo) && $text_demo
- $text_demo.destroy
+ $text_demo.destroy
$text_demo = nil
end
diff --git a/ext/tk/sample/demos-jp/textpeer.rb b/ext/tk/sample/demos-jp/textpeer.rb
index de604f1940..4967a99c92 100644
--- a/ext/tk/sample/demos-jp/textpeer.rb
+++ b/ext/tk/sample/demos-jp/textpeer.rb
@@ -5,7 +5,7 @@
# based on Tcl/Tk8.5.0 widget demos
if defined?($textpeer_demo) && $textpeer_demo
- $textpeer_demo.destroy
+ $textpeer_demo.destroy
$textpeer_demo = nil
end
@@ -43,11 +43,11 @@ def makeClone(count, win, txt)
peer = TkText::Peer.new(txt, win, :widgetname=>"text#{cnt}")
sbar = TkScrollbar.new(win, :widgetname=>"sb#{cnt}")
peer.yscrollbar sbar
- b1 = TkButton.new(win, :widgetname=>"clone#{cnt}",
- :text=>'¥Ô¥¢(peer)¤ÎºîÀ®',
+ b1 = TkButton.new(win, :widgetname=>"clone#{cnt}",
+ :text=>'¥Ô¥¢(peer)¤ÎºîÀ®',
:command=>proc{makeClone(count, win, peer)})
- b2 = TkButton.new(win, :widgetname=>"kill#{cnt}",
- :text=>'¥Ô¥¢(peer)¤Î¾Ãµî',
+ b2 = TkButton.new(win, :widgetname=>"kill#{cnt}",
+ :text=>'¥Ô¥¢(peer)¤Î¾Ãµî',
:command=>proc{killClone(win, cnt)})
row = cnt * 2
TkGrid.configure(peer, sbar, b1, :sticky=>'nsew', :row=>row)
@@ -57,7 +57,7 @@ def makeClone(count, win, txt)
end
def killClone(win, cnt)
- Tk.destroy("#{win.path}.text#{cnt}", "#{win.path}.sb#{cnt}",
+ Tk.destroy("#{win.path}.text#{cnt}", "#{win.path}.sb#{cnt}",
"#{win.path}.clone#{cnt}", "#{win.path}.kill#{cnt}")
end
diff --git a/ext/tk/sample/demos-jp/toolbar.rb b/ext/tk/sample/demos-jp/toolbar.rb
index 570d52704f..9cb3834c34 100644
--- a/ext/tk/sample/demos-jp/toolbar.rb
+++ b/ext/tk/sample/demos-jp/toolbar.rb
@@ -7,7 +7,7 @@
# based on "Id: toolbar.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp"
if defined?($toolbar_demo) && $toolbar_demo
- $toolbar_demo.destroy
+ $toolbar_demo.destroy
$toolbar_demo = nil
end
@@ -73,7 +73,7 @@ if Tk.windowingsystem != 'aqua'
w.grid_remove
self.wm_manage
# self.wm_title('Toolbar') # ¤â¤·¥¦¥£¥¸¥§¥Ã¥È̾¤ò¥¦¥£¥ó¥É¥¦¥¿¥¤¥È¥ë¤Ë¤·¤¿¤¯¤Ê¤¤¤Ê¤é¡¤¤³¤³¤ÇÀßÄꤷ¤Æ¤¯¤À¤µ¤¤
- self.wm_protocol('WM_DELETE_WINDOW'){ self.untearoff(w) }
+ self.wm_protocol('WM_DELETE_WINDOW'){ self.untearoff(self) }
end
def tbar_base.untearoff(w)
self.wm_forget
@@ -86,28 +86,28 @@ end
text = TkText.new(base_frame, :width=>40, :height=>10)
## Toolbar contents
-tb_btn = Ttk::Button.new(tbar_base, :text=>'¥Ü¥¿¥ó', :style=>'Toolbutton',
+tb_btn = Ttk::Button.new(tbar_base, :text=>'¥Ü¥¿¥ó', :style=>'Toolbutton',
:command=>proc{
text.insert(:end, "¥Ü¥¿¥ó¤¬²¡¤µ¤ì¤Þ¤·¤¿¡¥\n")
})
-tb_chk = Ttk::Checkbutton.new(tbar_base, :text=>'¥Á¥§¥Ã¥¯¥Ü¥¿¥ó',
- :style=>'Toolbutton',
- :variable=>(check = TkVariable.new),
+tb_chk = Ttk::Checkbutton.new(tbar_base, :text=>'¥Á¥§¥Ã¥¯¥Ü¥¿¥ó',
+ :style=>'Toolbutton',
+ :variable=>(check = TkVariable.new),
:command=>proc{
text.insert(:end, "¥Á¥§¥Ã¥¯¥Ü¥¿¥ó¤ÎÃͤÏ#{check.value}¤Ç¤¹¡¥\n")
})
tb_mbtn = Ttk::Menubutton.new(tbar_base, :text=>'¥á¥Ë¥å¡¼')
-tb_combo = Ttk::Combobox.new(tbar_base, :value=>TkFont.families,
+tb_combo = Ttk::Combobox.new(tbar_base, :value=>TkFont.families,
:state=>:readonly)
tb_mbtn.menu(menu = Tk::Menu.new(tb_mbtn))
menu.add(:command, :label=>'Just', :command=>proc{text.insert(:end, "Just\n")})
menu.add(:command, :label=>'An', :command=>proc{text.insert(:end, "An\n")})
-menu.add(:command, :label=>'Example',
+menu.add(:command, :label=>'Example',
:command=>proc{text.insert(:end, "Example\n")})
tb_combo.bind('<ComboboxSelected>'){ text.font.family = tb_combo.get }
## Arrange contents
-Tk.grid(tb_btn, tb_chk, tb_mbtn, tb_combo,
+Tk.grid(tb_btn, tb_chk, tb_mbtn, tb_combo,
:in=>contents, :padx=>2, :sticky=>'ns')
Tk.grid(tbar_base, :sticky=>'ew')
Tk.grid(sep, :sticky=>'ew')
@@ -120,16 +120,16 @@ base_frame.grid_columnconfigure(text, :weight=>1)
Ttk::Frame.new(base_frame) {|frame|
sep = Ttk::Separator.new(frame)
Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
- TkGrid('x',
- Ttk::Button.new(frame, :text=>'¥³¡¼¥É»²¾È',
- :image=>$image['view'], :compound=>:left,
- :command=>proc{showCode 'toolbar'}),
- Ttk::Button.new(frame, :text=>'ÊĤ¸¤ë',
- :image=>$image['delete'], :compound=>:left,
+ TkGrid('x',
+ Ttk::Button.new(frame, :text=>'¥³¡¼¥É»²¾È',
+ :image=>$image['view'], :compound=>:left,
+ :command=>proc{showCode 'toolbar'}),
+ Ttk::Button.new(frame, :text=>'ÊĤ¸¤ë',
+ :image=>$image['delete'], :compound=>:left,
:command=>proc{
$toolbar_demo.destroy
$toolbar_demo = nil
- }),
+ }),
:padx=>4, :pady=>4)
grid_columnconfigure(0, :weight=>1)
Tk.grid(frame, :sticky=>'ew')
diff --git a/ext/tk/sample/demos-jp/tree.rb b/ext/tk/sample/demos-jp/tree.rb
index 00d715282b..c3b4191144 100644
--- a/ext/tk/sample/demos-jp/tree.rb
+++ b/ext/tk/sample/demos-jp/tree.rb
@@ -8,7 +8,7 @@
# based on "Id: tree.tcl,v 1.4 2007/12/13 15:27:07 dgp Exp"
if defined?($tree_demo) && $tree_demo
- $tree_demo.destroy
+ $tree_demo.destroy
$tree_demo = nil
end
@@ -21,8 +21,8 @@ $tree_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($tree_demo).pack(:fill=>:both, :expand=>true)
## Explanatory text
-Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i',
- :justify=>:left, :anchor=>'n', :padding=>[10, 2, 10, 6],
+Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i',
+ :justify=>:left, :anchor=>'n', :padding=>[10, 2, 10, 6],
:text=><<EOL).pack(:fill=>:x)
Ttk¤È¤Ï¡¤¥Æ¡¼¥Þ»ØÄê²Äǽ¤Ê¿·¤·¤¤¥¦¥£¥¸¥§¥Ã¥È½¸¹ç¤Ç¤¹¡¥\
¤³¤Î¥µ¥ó¥×¥ë¤Ï¡¤¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î¤è¤¦¤Ê³¬ÁØÅª¤Ê¥Ç¡¼¥¿½¸¹ç¤ò\
@@ -38,16 +38,16 @@ EOL
Ttk::Frame.new(base_frame) {|frame|
sep = Ttk::Separator.new(frame)
Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
- TkGrid('x',
- Ttk::Button.new(frame, :text=>'¥³¡¼¥É»²¾È',
- :image=>$image['view'], :compound=>:left,
- :command=>proc{showCode 'tree'}),
- Ttk::Button.new(frame, :text=>'ÊĤ¸¤ë',
- :image=>$image['delete'], :compound=>:left,
+ TkGrid('x',
+ Ttk::Button.new(frame, :text=>'¥³¡¼¥É»²¾È',
+ :image=>$image['view'], :compound=>:left,
+ :command=>proc{showCode 'tree'}),
+ Ttk::Button.new(frame, :text=>'ÊĤ¸¤ë',
+ :image=>$image['delete'], :compound=>:left,
:command=>proc{
$tree_demo.destroy
$tree_demo = nil
- }),
+ }),
:padx=>4, :pady=>4)
grid_columnconfigure(0, :weight=>1)
pack(:side=>:bottom, :fill=>:x)
@@ -56,7 +56,7 @@ Ttk::Frame.new(base_frame) {|frame|
## Code to populate the roots of the tree (can be more than one on Windows)
def populate_roots(tree)
TkComm.simplelist(Tk.tk_call('file', 'volumes')).sort.each{|dir|
- populate_tree(tree, tree.insert(nil, :end, :text=>dir,
+ populate_tree(tree, tree.insert(nil, :end, :text=>dir,
:values=>[dir, 'directory']))
}
end
@@ -69,7 +69,7 @@ def populate_tree(tree, node)
tree.delete(tree.children(node))
Dir.glob("#{path}/*").sort.each{|f|
type = File.ftype(f)
- id = tree.insert(node, :end,
+ id = tree.insert(node, :end,
:text=>File.basename(f), :values=>[f, type]).id
if type == 'directory'
## Make it so that this node is openable
@@ -95,7 +95,7 @@ def populate_tree(tree, node)
end
## Create the tree and set it up
-tree = Ttk::Treeview.new(base_frame, :columns=>%w(fullpath type size),
+tree = Ttk::Treeview.new(base_frame, :columns=>%w(fullpath type size),
:displaycolumns=>['size'])
if Tk.windowingsystem != 'aqua'
vsb = tree.yscrollbar(Ttk::Scrollbar.new(base_frame))
diff --git a/ext/tk/sample/demos-jp/ttkbut.rb b/ext/tk/sample/demos-jp/ttkbut.rb
index 90ec3fce5b..4d577120bb 100644
--- a/ext/tk/sample/demos-jp/ttkbut.rb
+++ b/ext/tk/sample/demos-jp/ttkbut.rb
@@ -9,7 +9,7 @@
# based on "Id: ttkbut.tcl,v 1.4 2007/12/13 15:27:07 dgp Exp"
if defined?($ttkbut_demo) && $ttkbut_demo
- $ttkbut_demo.destroy
+ $ttkbut_demo.destroy
$ttkbut_demo = nil
end
@@ -21,7 +21,7 @@ $ttkbut_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($ttkbut_demo).pack(:fill=>:both, :expand=>true)
-Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i', :justify=>:left,
+Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i', :justify=>:left,
:text=><<EOL).pack(:side=>:top, :fill=>:x)
Ttk¤È¤Ï¡¤¥Æ¡¼¥Þ»ØÄê²Äǽ¤Ê¿·¤·¤¤¥¦¥£¥¸¥§¥Ã¥È½¸¹ç¤Ç¤¹¡¥\
º£¡¤¤¢¤Ê¤¿¤¬Ìܤˤ·¤Æ¤¤¤ë¤Î¤ÏTtk¤Î¥Æ¡¼¥Þ²½¥é¥Ù¥ë¤Ç¡¤\
@@ -40,11 +40,11 @@ EOL
## Add buttons for setting the theme
buttons = Ttk::Labelframe.new(base_frame, :text=>'¥Ü¥¿¥ó')
# Ttk::Style.theme_names.each{|theme|
-# Ttk::Button.new(buttons, :text=>theme,
+# Ttk::Button.new(buttons, :text=>theme,
# :command=>proc{Ttk::Style.theme_use theme}).pack(:pady=>2)
# }
Ttk.themes.each{|theme|
- Ttk::Button.new(buttons, :text=>theme,
+ Ttk::Button.new(buttons, :text=>theme,
:command=>proc{Ttk.set_theme theme}).pack(:pady=>2)
}
@@ -68,9 +68,9 @@ end
## Set up the checkbutton group
checks = Ttk::Labelframe.new(base_frame, :text=>'¥Á¥§¥Ã¥¯¥Ü¥¿¥ó')
enabled = TkVariable.new(true)
-e = Ttk::Checkbutton.new(checks, :text=>'Í­¸ú²½', :variable=>enabled,
+e = Ttk::Checkbutton.new(checks, :text=>'Í­¸ú²½', :variable=>enabled,
:command=>proc{
- setState($ttkbut_demo,
+ setState($ttkbut_demo,
((enabled.bool)? "!disabled" : "disabled"),
e)
})
@@ -96,15 +96,15 @@ radios = Ttk::Labelframe.new(base_frame, :text=>'¥é¥¸¥ª¥Ü¥¿¥ó')
happyness = TkVariable.new
-r1 = Ttk::Radiobutton.new(radios, :variable=>happyness,
+r1 = Ttk::Radiobutton.new(radios, :variable=>happyness,
:text=>'Great', :value=>'great')
-r2 = Ttk::Radiobutton.new(radios, :variable=>happyness,
+r2 = Ttk::Radiobutton.new(radios, :variable=>happyness,
:text=>'Good', :value=>'good')
-r3 = Ttk::Radiobutton.new(radios, :variable=>happyness,
+r3 = Ttk::Radiobutton.new(radios, :variable=>happyness,
:text=>'Ok', :value=>'ok')
-r4 = Ttk::Radiobutton.new(radios, :variable=>happyness,
+r4 = Ttk::Radiobutton.new(radios, :variable=>happyness,
:text=>'Poor', :value=>'poor')
-r5 = Ttk::Radiobutton.new(radios, :variable=>happyness,
+r5 = Ttk::Radiobutton.new(radios, :variable=>happyness,
:text=>'Awful', :value=>'awful')
Tk.pack(r1, r2, r3, r4, r5, :fill=>:x, :padx=>3, :pady=>2)
@@ -113,26 +113,26 @@ Tk.pack(r1, r2, r3, r4, r5, :fill=>:x, :padx=>3, :pady=>2)
Ttk::Frame.new(base_frame) {|frame|
sep = Ttk::Separator.new(frame)
Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
- TkGrid('x',
- Ttk::Button.new(frame, :text=>'ÊÑ¿ô»²¾È',
- :image=>$image['view'], :compound=>:left,
+ TkGrid('x',
+ Ttk::Button.new(frame, :text=>'ÊÑ¿ô»²¾È',
+ :image=>$image['view'], :compound=>:left,
:command=>proc{
- showVars(base_frame, ['Í­¸ú²½', enabled],
- ['¥Á¡¼¥º', cheese], ['¥È¥Þ¥È', tomato],
- ['¥Ð¥¸¥ë', basil], ['¥ª¥ì¥¬¥Î', oregano],
+ showVars(base_frame, ['Í­¸ú²½', enabled],
+ ['¥Á¡¼¥º', cheese], ['¥È¥Þ¥È', tomato],
+ ['¥Ð¥¸¥ë', basil], ['¥ª¥ì¥¬¥Î', oregano],
['¹¬Ê¡ÅÙ', happyness])
- }),
- Ttk::Button.new(frame, :text=>'¥³¡¼¥É»²¾È',
- :image=>$image['view'], :compound=>:left,
- :command=>proc{showCode 'ttkbut'}),
- Ttk::Button.new(frame, :text=>'ÊĤ¸¤ë',
- :image=>$image['delete'], :compound=>:left,
+ }),
+ Ttk::Button.new(frame, :text=>'¥³¡¼¥É»²¾È',
+ :image=>$image['view'], :compound=>:left,
+ :command=>proc{showCode 'ttkbut'}),
+ Ttk::Button.new(frame, :text=>'ÊĤ¸¤ë',
+ :image=>$image['delete'], :compound=>:left,
:command=>proc{
tmppath = $ttkbut_demo
$ttkbut_demo = nil
$showVarsWin[tmppath.path] = nil
tmppath.destroy
- }),
+ }),
:padx=>4, :pady=>4)
grid_columnconfigure(0, :weight=>1)
pack(:side=>:bottom, :fill=>:x, :expand=>true)
diff --git a/ext/tk/sample/demos-jp/ttkmenu.rb b/ext/tk/sample/demos-jp/ttkmenu.rb
index 9e78678c8e..d349b42d11 100644
--- a/ext/tk/sample/demos-jp/ttkmenu.rb
+++ b/ext/tk/sample/demos-jp/ttkmenu.rb
@@ -8,7 +8,7 @@
# based on "Id: ttkmenu.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp"
if defined?($ttkmenu_demo) && $ttkmenu_demo
- $ttkmenu_demo.destroy
+ $ttkmenu_demo.destroy
$ttkmenu_demo = nil
end
@@ -20,7 +20,7 @@ $ttkmenu_demo = TkToplevel.new {|w|
base_frame = Ttk::Frame.new($ttkmenu_demo).pack(:fill=>:both, :expand=>true)
-Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i', :justify=>:left,
+Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i', :justify=>:left,
:text=><<EOL).pack(:side=>:top, :fill=>:x)
Ttk¤È¤Ï¡¤¥Æ¡¼¥Þ»ØÄê²Äǽ¤Ê¿·¤·¤¤¥¦¥£¥¸¥§¥Ã¥È½¸¹ç¤Ç¤¹¡¥\
¤³¤ì¤Ë¤è¤ê¥Æ¡¼¥Þ¤ËÂбþ¤¹¤ë¤³¤È¤¬¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤Ã¤¿¥¦¥£¥¸¥§¥Ã¥È¤Î¤Ò¤È¤Ä¤Ë\
@@ -45,16 +45,16 @@ Ttk::Separator.new(base_frame).pack(:side=>:top, :fill=>:x)
Ttk::Frame.new($ttkmenu_demo) {|frame|
sep = Ttk::Separator.new(frame)
Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
- TkGrid('x',
- Ttk::Button.new(frame, :text=>'¥³¡¼¥É»²¾È',
- :image=>$image['view'], :compound=>:left,
- :command=>proc{showCode 'ttkmenu'}),
- Ttk::Button.new(frame, :text=>'ÊĤ¸¤ë',
- :image=>$image['delete'], :compound=>:left,
+ TkGrid('x',
+ Ttk::Button.new(frame, :text=>'¥³¡¼¥É»²¾È',
+ :image=>$image['view'], :compound=>:left,
+ :command=>proc{showCode 'ttkmenu'}),
+ Ttk::Button.new(frame, :text=>'ÊĤ¸¤ë',
+ :image=>$image['delete'], :compound=>:left,
:command=>proc{
$ttkmenu_demo.destroy
$ttkmenu_demo = nil
- }),
+ }),
:padx=>4, :pady=>4)
grid_columnconfigure(0, :weight=>1)
pack(:side=>:bottom, :fill=>:x)
diff --git a/ext/tk/sample/demos-jp/ttknote.rb b/ext/tk/sample/demos-jp/ttknote.rb
index f0cd258893..09cc7960a3 100644
--- a/ext/tk/sample/demos-jp/ttknote.rb
+++ b/ext/tk/sample/demos-jp/ttknote.rb
@@ -8,7 +8,7 @@
# based on "Id: ttknote.tcl,v 1.5 2007/12/13 15:27:07 dgp Exp"
if defined?($ttknote_demo) && $ttknote_demo
- $ttknote_demo.destroy
+ $ttknote_demo.destroy
$ttknote_demo = nil
end
@@ -22,16 +22,16 @@ $ttknote_demo = TkToplevel.new {|w|
Ttk::Frame.new($ttknote_demo) {|frame|
sep = Ttk::Separator.new(frame)
Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
- TkGrid('x',
- Ttk::Button.new(frame, :text=>'¥³¡¼¥É»²¾È',
- :image=>$image['view'], :compound=>:left,
- :command=>proc{showCode 'ttknote'}),
- Ttk::Button.new(frame, :text=>'ÊĤ¸¤ë',
- :image=>$image['delete'], :compound=>:left,
+ TkGrid('x',
+ Ttk::Button.new(frame, :text=>'¥³¡¼¥É»²¾È',
+ :image=>$image['view'], :compound=>:left,
+ :command=>proc{showCode 'ttknote'}),
+ Ttk::Button.new(frame, :text=>'ÊĤ¸¤ë',
+ :image=>$image['delete'], :compound=>:left,
:command=>proc{
$ttknote_demo.destroy
$ttknote_demo = nil
- }),
+ }),
:padx=>4, :pady=>4)
grid_columnconfigure(0, :weight=>1)
pack(:side=>:bottom, :fill=>:x)
@@ -40,13 +40,13 @@ Ttk::Frame.new($ttknote_demo) {|frame|
base_frame = Ttk::Frame.new($ttknote_demo).pack(:fill=>:both, :expand=>true)
## Make the notebook and set up Ctrl+Tab traversal
-notebook = Ttk::Notebook.new(base_frame).pack(:fill=>:both, :expand=>true,
+notebook = Ttk::Notebook.new(base_frame).pack(:fill=>:both, :expand=>true,
:padx=>2, :pady=>3)
notebook.enable_traversal
## Popuplate the first pane
f_msg = Ttk::Frame.new(notebook)
-msg_m = Ttk::Label.new(f_msg, :font=>$font, :wraplength=>'5i',
+msg_m = Ttk::Label.new(f_msg, :font=>$font, :wraplength=>'5i',
:justify=>:left, :anchor=>'n', :text=><<EOL)
Ttk¤È¤Ï¡¤¥Æ¡¼¥Þ»ØÄê²Äǽ¤Ê¿·¤·¤¤¥¦¥£¥¸¥§¥Ã¥È½¸¹ç¤Ç¤¹¡¥\
¤½¤ÎÃæ¤Ë´Þ¤Þ¤ì¤ë¥¦¥£¥¸¥§¥Ã¥È¤Î¤Ò¤È¤Ä¤Ë¥Î¡¼¥È¥Ö¥Ã¥¯¥¦¥£¥¸¥§¥Ã¥È¤¬¤¢¤ê¤Þ¤¹¡¥\
@@ -64,7 +64,7 @@ Ctrl+Tab¥­¡¼¤ÎÆþÎϤˤè¤Ã¤Æ¤â¹Ô¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡¥\
EOL
neat = TkVariable.new
after_id = nil
-msg_b = Ttk::Button.new(f_msg, :text=>'¤¹¤Æ¤­¤À¡ª(Neat!)', :underline=>6,
+msg_b = Ttk::Button.new(f_msg, :text=>'¤¹¤Æ¤­¤À¡ª(Neat!)', :underline=>6,
:command=>proc{
neat.value = '¤¢¤¡¡¤¤½¤Î¤È¤ª¤ê¤µ¡¥¡¥¡¥'
Tk.after_cancel(after_id) if after_id
diff --git a/ext/tk/sample/demos-jp/ttkpane.rb b/ext/tk/sample/demos-jp/ttkpane.rb
index a7b458a683..96670c0e5c 100644
--- a/ext/tk/sample/demos-jp/ttkpane.rb
+++ b/ext/tk/sample/demos-jp/ttkpane.rb
@@ -7,7 +7,7 @@
# based on "Id: ttkpane.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp"
if defined?($ttkpane_demo) && $ttkpane_demo
- $ttkpane_demo.destroy
+ $ttkpane_demo.destroy
$ttkpane_demo = nil
end
@@ -19,7 +19,7 @@ $ttkpane_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($ttkpane_demo).pack(:fill=>:both, :expand=>true)
-Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i', :justify=>:left,
+Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i', :justify=>:left,
:text=><<EOL).pack(:side=>:top, :fill=>:x)
¤³¤Î¥Ç¥â¤Ï¡¤Ëä¤á¹þ¤ß´Ø·¸¤Ë¤¢¤ë¥Æ¡¼¥ÞÉÕ¤­¥Ú¥¤¥ó¥É¥¦¥£¥ó¥É¥¦¤ò¼¨¤·¤Æ¤¤¤Þ¤¹¡¥\
¤½¤ì¤¾¤ì¤ÎÂ礭¤µ¤Ï¡¤´Þ¤Þ¤ì¤Æ¤¤¤ë¥Ú¥¤¥ó¤Î´Ö¤Ë¤¢¤ë¥¨¥ê¥¢¤ò¤Ä¤«¤ó¤Ç\
@@ -32,16 +32,16 @@ Ttk::Separator.new(base_frame).pack(:side=>:top, :fill=>:x)
Ttk::Frame.new(base_frame) {|frame|
sep = Ttk::Separator.new(frame)
Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
- TkGrid('x',
- Ttk::Button.new(frame, :text=>'¥³¡¼¥É»²¾È',
- :image=>$image['view'], :compound=>:left,
- :command=>proc{showCode 'ttkpane'}),
- Ttk::Button.new(frame, :text=>'ÊĤ¸¤ë',
- :image=>$image['delete'], :compound=>:left,
+ TkGrid('x',
+ Ttk::Button.new(frame, :text=>'¥³¡¼¥É»²¾È',
+ :image=>$image['view'], :compound=>:left,
+ :command=>proc{showCode 'ttkpane'}),
+ Ttk::Button.new(frame, :text=>'ÊĤ¸¤ë',
+ :image=>$image['delete'], :compound=>:left,
:command=>proc{
$ttkpane_demo.destroy
$ttkpane_demo = nil
- }),
+ }),
:padx=>4, :pady=>4)
grid_columnconfigure(0, :weight=>1)
pack(:side=>:bottom, :fill=>:x)
@@ -61,26 +61,26 @@ if Tk.windowingsystem == 'aqua'
end
# Fill the button pane
-Ttk::Button.new(left_top, :text=>'²¡¤·¤Æ¤Í',
+Ttk::Button.new(left_top, :text=>'²¡¤·¤Æ¤Í',
:command=>proc{
- Tk.messageBox(:type=>'ok', :icon=>'info',
- :message=>'¤¤¤Æ¤Æ¡ª',
- :detail=>'That hurt...', :parent=>base_frame,
+ Tk.messageBox(:type=>'ok', :icon=>'info',
+ :message=>'¤¤¤Æ¤Æ¡ª',
+ :detail=>'That hurt...', :parent=>base_frame,
:title=>'Button Pressed')
}).pack(:padx=>2, :pady=>5)
zones_list = [
- [':Europe/Berlin'],
- [':America/Argentina/Buenos_Aires', ':America/Buenos_Aires'],
- [':Africa/Johannesburg'],
- [':Europe/London'],
- [':America/Los_Angeles'],
+ [':Europe/Berlin'],
+ [':America/Argentina/Buenos_Aires', ':America/Buenos_Aires'],
+ [':Africa/Johannesburg'],
+ [':Europe/London'],
+ [':America/Los_Angeles'],
[':Europe/Moscow'],
- [':America/New_York'],
- [':Asia/Singapore'],
- [':Australia/Sydney'],
- [':Asia/Tokyo'],
+ [':America/New_York'],
+ [':Asia/Singapore'],
+ [':Australia/Sydney'],
+ [':Asia/Tokyo'],
]
zones = []
@@ -158,7 +158,7 @@ time = TkVariable.new_hash
case tzinfo
when :tcl
update_proc = proc{|now, tz, label|
- time[label] = Tk.tk_call('clock', 'format', now.tv_sec,
+ time[label] = Tk.tk_call('clock', 'format', now.tv_sec,
'-timezone', tz, '-format', '%T')
}
when :tzinfo
@@ -179,7 +179,7 @@ end
zones.each_with_index{|(zone, label), idx|
Ttk::Separator.new(left_bot).pack(:fill=>:x) if idx > 0
Ttk::Label.new(left_bot, :text=>label, :anchor=>'w').pack(:fill=>:x)
- Ttk::Label.new(left_bot, :textvariable=>time.ref(label),
+ Ttk::Label.new(left_bot, :textvariable=>time.ref(label),
:anchor=>'w').pack(:fill=>:x)
}
diff --git a/ext/tk/sample/demos-jp/ttkprogress.rb b/ext/tk/sample/demos-jp/ttkprogress.rb
index 82898bf50e..43a9cbcd7e 100644
--- a/ext/tk/sample/demos-jp/ttkprogress.rb
+++ b/ext/tk/sample/demos-jp/ttkprogress.rb
@@ -7,7 +7,7 @@
# based on "Id: ttkprogress.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp"
if defined?($ttkprogress_demo) && $ttkprogress_demo
- $ttkprogress_demo.destroy
+ $ttkprogress_demo.destroy
$ttkprogress_demo = nil
end
@@ -19,7 +19,7 @@ $ttkprogress_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($ttkprogress_demo).pack(:fill=>:both, :expand=>true)
-Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i', :justify=>:left,
+Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i', :justify=>:left,
:text=><<EOL).pack(:side=>:top, :fill=>:x)
²¼¤Ë¤¢¤ë¤Î¤ÏÆó¤Ä¤Î¥×¥í¥°¥ì¥¹¥Ð¡¼¤Ç¤¹¡¥\
¾å¤Î¤â¤Î¤Ï"determinate"¥¿¥¤¥×¤Î¥×¥í¥°¥ì¥¹¥Ð¡¼¤Ç¡¤\
@@ -37,16 +37,16 @@ EOL
Ttk::Frame.new(base_frame) {|frame|
sep = Ttk::Separator.new(frame)
Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
- TkGrid('x',
- Ttk::Button.new(frame, :text=>'¥³¡¼¥É»²¾È',
- :image=>$image['view'], :compound=>:left,
- :command=>proc{showCode 'ttkprogress'}),
- Ttk::Button.new(frame, :text=>'ÊĤ¸¤ë',
- :image=>$image['delete'], :compound=>:left,
+ TkGrid('x',
+ Ttk::Button.new(frame, :text=>'¥³¡¼¥É»²¾È',
+ :image=>$image['view'], :compound=>:left,
+ :command=>proc{showCode 'ttkprogress'}),
+ Ttk::Button.new(frame, :text=>'ÊĤ¸¤ë',
+ :image=>$image['delete'], :compound=>:left,
:command=>proc{
$ttkprogress_demo.destroy
$ttkprogress_demo = nil
- }),
+ }),
:padx=>4, :pady=>4)
grid_columnconfigure(0, :weight=>1)
pack(:side=>:bottom, :fill=>:x)
@@ -57,9 +57,9 @@ frame = Ttk::Frame.new(base_frame).pack(:fill=>:both, :expand=>true)
p1 = Ttk::Progressbar.new(frame, :mode=>:determinate)
p2 = Ttk::Progressbar.new(frame, :mode=>:indeterminate)
-start = Ttk::Button.new(frame, :text=>'Start Progress',
+start = Ttk::Button.new(frame, :text=>'Start Progress',
:command=>proc{ p1.start; p2.start })
-stop = Ttk::Button.new(frame, :text=>'Stop Progress',
+stop = Ttk::Button.new(frame, :text=>'Stop Progress',
:command=>proc{ p1.stop; p2.stop })
Tk.grid(p1, '-', :pady=>5, :padx=>10)
diff --git a/ext/tk/sample/demos-jp/twind.rb b/ext/tk/sample/demos-jp/twind.rb
index bd0b060754..faefaefd6e 100644
--- a/ext/tk/sample/demos-jp/twind.rb
+++ b/ext/tk/sample/demos-jp/twind.rb
@@ -5,7 +5,7 @@
# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($twind_demo) && $twind_demo
- $twind_demo.destroy
+ $twind_demo.destroy
$twind_demo = nil
end
@@ -39,10 +39,10 @@ $twind_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
# frame À¸À®
$twind_text = nil
-TkFrame.new(base_frame, 'highlightthickness'=>2, 'borderwidth'=>2,
+TkFrame.new(base_frame, 'highlightthickness'=>2, 'borderwidth'=>2,
'relief'=>'sunken') {|f|
- $twind_text = TkText.new(f, 'setgrid'=>'true', 'font'=>$font,
- 'width'=>'70', 'height'=>35, 'wrap'=>'word',
+ $twind_text = TkText.new(f, 'setgrid'=>'true', 'font'=>$font,
+ 'width'=>'70', 'height'=>35, 'wrap'=>'word',
'highlightthickness'=>0, 'borderwidth'=>0 ){|t|
TkScrollbar.new(f) {|s|
command proc{|*args| t.yview(*args)}
@@ -52,11 +52,11 @@ TkFrame.new(base_frame, 'highlightthickness'=>2, 'borderwidth'=>2,
}.pack('expand'=>'yes', 'fill'=>'both')
# ¥¿¥°À¸À®
-$tag_center = TkTextTag.new($twind_text,
+$tag_center = TkTextTag.new($twind_text,
'justify' =>'center',
'spacing1'=>'5m',
'spacing3'=>'5m' )
-$tag_buttons = TkTextTag.new($twind_text,
+$tag_buttons = TkTextTag.new($twind_text,
'lmargin1'=>'1c',
'lmargin2'=>'1c',
'rmargin' =>'1c',
@@ -65,14 +65,14 @@ $tag_buttons = TkTextTag.new($twind_text,
'spacing3'=>0 )
# ¥Æ¥­¥¹¥È¤ÎÀ¸À®
-$twind_text.insert('end',
+$twind_text.insert('end',
'¥Æ¥­¥¹¥Èwidget¾å¤Ë¾¤Îwidget¤òÁȤ߹þ¤à¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£')
$twind_text.insert('end',
'ÁȤ߹þ¤ß¥¦¥£¥ó¥É¥¦¤È¸Æ¤Ð¤ì¡¢Ç¤°Õ¤Îwidget¤¬²Äǽ¤Ç¤¹¡£')
$twind_text.insert('end',
'Î㤨¤Ð¡¢¤³¤³¤Ë2¤Ä¤Î¥Ü¥¿¥ówidget¤¬ÁȤ߹þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£')
$twind_text.insert('end', 'ºÇ½é¤Î¥Ü¥¿¥ó¤ò¥¯¥ê¥Ã¥¯¤¹¤È¿åÊ¿Êý¸þ¤Î¥¹¥¯¥í¡¼¥ë¤ò')
-TkTextWindow.new($twind_text, 'end',
+TkTextWindow.new($twind_text, 'end',
'window'=>TkButton.new($twind_text) {
#text 'ON'
text '¥ª¥ó'
@@ -81,7 +81,7 @@ TkTextWindow.new($twind_text, 'end',
})
$twind_text.insert('end', "¤Ë¤·¤Þ¤¹¡£¤Þ¤¿2¤Ä¤á¤Î¥Ü¥¿¥ó¤ò¥¯¥ê¥Ã¥¯¤¹¤ë¤È\n")
$twind_text.insert('end', '¿åÊ¿Êý¸þ¤Î¥¹¥¯¥í¡¼¥ë¤ò')
-TkTextWindow.new($twind_text, 'end',
+TkTextWindow.new($twind_text, 'end',
'window'=>TkButton.new($twind_text) {
#text 'OFF'
text '¥ª¥Õ'
@@ -91,7 +91,7 @@ TkTextWindow.new($twind_text, 'end',
$twind_text.insert('end', '¤Ë¤·¤Þ¤¹¡£')
$twind_text.insert('end', '¤â¤¦¤Ò¤È¤Ä¤ÎÎã¤Ç¤¹¡£')
-TkTextWindow.new($twind_text, 'end',
+TkTextWindow.new($twind_text, 'end',
'window'=>TkButton.new($twind_text) {
text '¤³¤³¤ò¥¯¥ê¥Ã¥¯'
command proc{textWindPlot $twind_text}
@@ -101,7 +101,7 @@ $twind_text.insert('end', '¤¹¤ë¤È¡¢x-y¥×¥í¥Ã¥È¤¬¤³¤³¤Ë¸½¤ì¤Þ¤¹¡£')
$mark_plot = TkTextMark.new($twind_text, 'insert')
$mark_plot.gravity='left'
$twind_text.insert('end', '¥Þ¥¦¥¹¤Ç¥Ç¡¼¥¿¤òÉÁ²è¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£')
-TkTextWindow.new($twind_text, 'end',
+TkTextWindow.new($twind_text, 'end',
'window'=>TkButton.new($twind_text) {
text '¾Ãµî'
command proc{textWindDel $twind_text}
@@ -125,7 +125,7 @@ $twind_text.insert('end', '¤â¤¦°ìÅÙÆ±¤¸¥Ü¥¿¥ó¤ò²¡¤¹¤È¸µ¤ËÌá¤ê¤Þ¤¹¡£
')
-TkTextWindow.new($twind_text, 'end',
+TkTextWindow.new($twind_text, 'end',
'window'=>TkButton.new($twind_text) {|b|
text '¥Ç¥Õ¥©¥ë¥È'
command proc{embDefBg $twind_text}
@@ -134,7 +134,7 @@ TkTextWindow.new($twind_text, 'end',
},
'padx'=>3 )
embToggle = TkVariable.new('Short')
-TkTextWindow.new($twind_text, 'end',
+TkTextWindow.new($twind_text, 'end',
'window'=>TkCheckButton.new($twind_text) {
textvariable embToggle
indicatoron 0
@@ -145,21 +145,21 @@ TkTextWindow.new($twind_text, 'end',
pady 5
padx 2
},
- 'padx'=>3,
+ 'padx'=>3,
'pady'=>2 )
-[ 'AntiqueWhite3', 'Bisque1', 'Bisque2', 'Bisque3', 'Bisque4',
- 'SlateBlue3', 'RoyalBlue1', 'SteelBlue2', 'DeepSkyBlue3', 'LightBlue1',
- 'DarkSlateGray1', 'Aquamarine2', 'DarkSeaGreen2', 'SeaGreen1',
- 'Yellow1', 'IndianRed1', 'IndianRed2', 'Tan1', 'Tan4'
+[ 'AntiqueWhite3', 'Bisque1', 'Bisque2', 'Bisque3', 'Bisque4',
+ 'SlateBlue3', 'RoyalBlue1', 'SteelBlue2', 'DeepSkyBlue3', 'LightBlue1',
+ 'DarkSlateGray1', 'Aquamarine2', 'DarkSeaGreen2', 'SeaGreen1',
+ 'Yellow1', 'IndianRed1', 'IndianRed2', 'Tan1', 'Tan4'
].each{|twind_color|
- TkTextWindow.new($twind_text, 'end',
+ TkTextWindow.new($twind_text, 'end',
'window'=>TkButton.new($twind_text) {
text twind_color
cursor 'top_left_arrow'
command proc{$twind_text.bg twind_color}
},
- 'padx'=>3,
+ 'padx'=>3,
'pady'=>2 )
}
@@ -217,39 +217,39 @@ def textWindPlot (t)
TkcLine.new($twind_plot, 100, 250, 400, 250, 'width'=>2)
TkcLine.new($twind_plot, 100, 250, 100, 50, 'width'=>2)
- TkcText.new($twind_plot, 225, 20,
+ TkcText.new($twind_plot, 225, 20,
'text'=>"A Simple Plot", 'font'=>font, 'fill'=>'brown')
(0..10).each {|i|
x = 100 + (i * 30)
TkcLine.new($twind_plot, x, 250, x, 245, 'width'=>2)
- TkcText.new($twind_plot, x, 254,
+ TkcText.new($twind_plot, x, 254,
'text'=>10*i, 'font'=>font, 'anchor'=>'n')
}
(0..5).each {|i|
y = 250 - (i * 40)
TkcLine.new($twind_plot, 100, y, 105, y, 'width'=>2)
- TkcText.new($twind_plot, 96, y,
+ TkcText.new($twind_plot, 96, y,
'text'=>"#{i*50}.0", 'font'=>font, 'anchor'=>'e')
}
for xx, yy in [[12,56],[20,94],[33,98],[32,120],[61,180],[75,160],[98,223]]
x = 100 + (3*xx)
y = 250 - (4*yy)/5
- item = TkcOval.new($twind_plot, x-6, y-6, x+6, y+6,
+ item = TkcOval.new($twind_plot, x-6, y-6, x+6, y+6,
'width'=>1, 'outline'=>'black', 'fill'=>'SkyBlue2')
item.addtag 'point'
end
- $twind_plot.itembind('point', 'Any-Enter',
+ $twind_plot.itembind('point', 'Any-Enter',
proc{$twind_plot.itemconfigure 'current', 'fill', 'red'})
- $twind_plot.itembind('point', 'Any-Leave',
+ $twind_plot.itembind('point', 'Any-Leave',
proc{$twind_plot.itemconfigure 'current', 'fill', 'SkyBlue2'})
- $twind_plot.itembind('point', '1',
+ $twind_plot.itembind('point', '1',
proc{|x,y| embPlotDown $twind_plot,x,y}, "%x %y")
- $twind_plot.itembind('point', 'ButtonRelease-1',
+ $twind_plot.itembind('point', 'ButtonRelease-1',
proc{$twind_plot.dtag 'selected'})
- $twind_plot.bind('B1-Motion',
+ $twind_plot.bind('B1-Motion',
proc{|x,y| embPlotMove $twind_plot,x,y}, "%x %y")
while ($twind_text.get($mark_plot) =~ /[ \t\n]/)
$twind_text.delete $mark_plot
diff --git a/ext/tk/sample/demos-jp/twind2.rb b/ext/tk/sample/demos-jp/twind2.rb
index 96000b0e14..2a26b28ef6 100644
--- a/ext/tk/sample/demos-jp/twind2.rb
+++ b/ext/tk/sample/demos-jp/twind2.rb
@@ -5,7 +5,7 @@
# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($twind2_demo) && $twind2_demo
- $twind2_demo.destroy
+ $twind2_demo.destroy
$twind2_demo = nil
end
@@ -20,20 +20,20 @@ base_frame = TkFrame.new($twind2_demo).pack(:fill=>:both, :expand=>true)
# frame À¸À®
$twind2_buttons = TkFrame.new(base_frame) {|frame|
- TkGrid(TkFrame.new(frame, :height=>2, :relief=>:sunken, :bd=>2),
+ TkGrid(TkFrame.new(frame, :height=>2, :relief=>:sunken, :bd=>2),
:columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
- TkGrid('x',
- TkButton.new(frame, :text=>'¥³¡¼¥É»²¾È',
- :image=>$image['view'], :compound=>:left,
- :command=>proc{showCode 'twind2'}),
- TkButton.new(frame, :text=>'ÊĤ¸¤ë',
- :image=>$image['delete'], :compound=>:left,
+ TkGrid('x',
+ TkButton.new(frame, :text=>'¥³¡¼¥É»²¾È',
+ :image=>$image['view'], :compound=>:left,
+ :command=>proc{showCode 'twind2'}),
+ TkButton.new(frame, :text=>'ÊĤ¸¤ë',
+ :image=>$image['delete'], :compound=>:left,
:command=>proc{
tmppath = $twind2_demo
$twind2_demo = nil
$showVarsWin[tmppath.path] = nil
tmppath.destroy
- }),
+ }),
:padx=>4, :pady=>4)
frame.grid_columnconfigure(0, :weight=>1)
}
@@ -41,11 +41,11 @@ $twind2_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
# frame À¸À®
$twind2_text = nil
-TkFrame.new(base_frame, 'highlightthickness'=>2, 'borderwidth'=>2,
+TkFrame.new(base_frame, 'highlightthickness'=>2, 'borderwidth'=>2,
'relief'=>'sunken') {|f|
$twind2_text = TkText.new(f, 'setgrid'=>true, 'font'=>$font,
- # 'width'=>'70', 'height'=>35, 'wrap'=>'word',
- 'width'=>'70', 'height'=>35, 'wrap'=>'char',
+ # 'width'=>'70', 'height'=>35, 'wrap'=>'word',
+ 'width'=>'70', 'height'=>35, 'wrap'=>'char',
'highlightthickness'=>0, 'borderwidth'=>0 ){|t|
TkScrollbar.new(f) {|s|
command proc{|*args| t.yview(*args)}
@@ -55,11 +55,11 @@ TkFrame.new(base_frame, 'highlightthickness'=>2, 'borderwidth'=>2,
}.pack('expand'=>'yes', 'fill'=>'both')
# ¥¿¥°À¸À®
-$tag2_center = TkTextTag.new($twind2_text,
+$tag2_center = TkTextTag.new($twind2_text,
'justify' =>'center',
'spacing1'=>'5m',
'spacing3'=>'5m' )
-$tag2_buttons = TkTextTag.new($twind2_text,
+$tag2_buttons = TkTextTag.new($twind2_text,
'lmargin1'=>'1c',
'lmargin2'=>'1c',
'rmargin' =>'1c',
@@ -86,7 +86,7 @@ $twind2_text.insert('end', 'Î㤨¤Ð¡¤¤³¤³¤Ë¤Ï£²¤Ä¤Î')
$twind2_text.insert('end', '¥Ü¥¿¥ó¥¦¥£¥¸¥§¥Ã¥È¤¬Ëä¤á¹þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£')
$twind2_text.insert('end', 'ºÇ½é¤Î¥Ü¥¿¥ó¤ò¥¯¥ê¥Ã¥¯¤¹¤ë¤È¡¢')
$twind2_text.insert('end', '¿åÊ¿Êý¸þ¤Î¥¹¥¯¥í¡¼¥ë¤ò ')
-TkTextWindow.new($twind2_text, 'end',
+TkTextWindow.new($twind2_text, 'end',
'window'=>TkButton.new($twind2_text) {
#text 'ON'
text '¥ª¥ó'
@@ -95,7 +95,7 @@ TkTextWindow.new($twind2_text, 'end',
})
$twind2_text.insert('end', "¤Ë¤·¤Þ¤¹¡£¤Þ¤¿¡¢£²¤Ä¤á¤Î¥Ü¥¿¥ó¤ò¥¯¥ê¥Ã¥¯¤¹¤ë¤È\n")
$twind2_text.insert('end', '¿åÊ¿Êý¸þ¤Î¥¹¥¯¥í¡¼¥ë¤ò')
-TkTextWindow.new($twind2_text, 'end',
+TkTextWindow.new($twind2_text, 'end',
'window'=>TkButton.new($twind2_text) {
#text 'OFF'
text '¥ª¥Õ'
@@ -105,7 +105,7 @@ TkTextWindow.new($twind2_text, 'end',
$twind2_text.insert('end', "¤Ë¤·¤Þ¤¹¡£\n\n")
$twind2_text.insert('end', '¼¡¤Ï¤â¤¦¤Ò¤È¤Ä¤ÎÎã¤Ç¤¹¡£')
-TkTextWindow.new($twind2_text, 'end',
+TkTextWindow.new($twind2_text, 'end',
'window'=>TkButton.new($twind2_text) {
text '¤³¤³¤ò¥¯¥ê¥Ã¥¯'
command proc{textWindPlot2 $twind2_text}
@@ -116,7 +116,7 @@ $mark2_plot = TkTextMark.new($twind2_text, 'insert')
$mark2_plot.gravity='left'
$twind2_text.insert('end', '¥Þ¥¦¥¹¤Ç¥É¥é¥Ã¥°¤¹¤ë¤³¤È¤Ç¡¢')
$twind2_text.insert('end', '¥×¥í¥Ã¥È¾å¤Î¥Ç¡¼¥¿ÅÀ¤ò°Üư¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£')
-TkTextWindow.new($twind2_text, 'end',
+TkTextWindow.new($twind2_text, 'end',
'window'=>TkButton.new($twind2_text) {
text '¾Ãµî'
command proc{textWindDel2 $twind2_text}
@@ -148,7 +148,7 @@ btn_default = TkButton.new($twind2_text) {|b|
}
TkTextWindow.new($twind2_text, 'end', 'window'=>btn_default, 'padx'=>3)
embToggle = TkVariable.new('Short')
-TkTextWindow.new($twind2_text, 'end',
+TkTextWindow.new($twind2_text, 'end',
'window'=>TkCheckButton.new($twind2_text) {
textvariable embToggle
indicatoron 0
@@ -159,21 +159,21 @@ TkTextWindow.new($twind2_text, 'end',
pady 5
padx 2
},
- 'padx'=>3,
+ 'padx'=>3,
'pady'=>2 )
-[ 'AntiqueWhite3', 'Bisque1', 'Bisque2', 'Bisque3', 'Bisque4',
- 'SlateBlue3', 'RoyalBlue1', 'SteelBlue2', 'DeepSkyBlue3', 'LightBlue1',
- 'DarkSlateGray1', 'Aquamarine2', 'DarkSeaGreen2', 'SeaGreen1',
- 'Yellow1', 'IndianRed1', 'IndianRed2', 'Tan1', 'Tan4'
+[ 'AntiqueWhite3', 'Bisque1', 'Bisque2', 'Bisque3', 'Bisque4',
+ 'SlateBlue3', 'RoyalBlue1', 'SteelBlue2', 'DeepSkyBlue3', 'LightBlue1',
+ 'DarkSlateGray1', 'Aquamarine2', 'DarkSeaGreen2', 'SeaGreen1',
+ 'Yellow1', 'IndianRed1', 'IndianRed2', 'Tan1', 'Tan4'
].each{|twind_color|
- TkTextWindow.new($twind2_text, 'end',
+ TkTextWindow.new($twind2_text, 'end',
'window'=>TkButton.new($twind2_text) {
text twind_color
cursor 'top_left_arrow'
command proc{$twind2_text.bg twind_color}
},
- 'padx'=>3,
+ 'padx'=>3,
'pady'=>2 )
}
@@ -187,44 +187,44 @@ $text_normal2['pad'] = $twind2_text.cget('padx')
$twind2_text.insert('end', "\nborder width ¤ä highlightthickness, ")
$twind2_text.insert('end', "padding ¤òÄ̾ï¤ÎÃͤ«¤éÊѹ¹¤¹¤ë¤³¤È¤â²Äǽ¤Ç¤¹¡£\n")
-TkTextWindow.new($twind2_text, 'end',
- 'window'=>TkButton.new($twind2_text, :text=>"Big borders",
- :cursor=>'top_left_arrow',
+TkTextWindow.new($twind2_text, 'end',
+ 'window'=>TkButton.new($twind2_text, :text=>"Big borders",
+ :cursor=>'top_left_arrow',
'command'=>proc{
textWinBigB2 $twind2_text
}))
-TkTextWindow.new($twind2_text, 'end',
- 'window'=>TkButton.new($twind2_text, :text=>"Small borders",
- :cursor=>'top_left_arrow',
+TkTextWindow.new($twind2_text, 'end',
+ 'window'=>TkButton.new($twind2_text, :text=>"Small borders",
+ :cursor=>'top_left_arrow',
'command'=>proc{
textWinSmallB2 $twind2_text
}))
-TkTextWindow.new($twind2_text, 'end',
- 'window'=>TkButton.new($twind2_text, :text=>"Big highlight",
- :cursor=>'top_left_arrow',
+TkTextWindow.new($twind2_text, 'end',
+ 'window'=>TkButton.new($twind2_text, :text=>"Big highlight",
+ :cursor=>'top_left_arrow',
'command'=>proc{
textWinBigH2 $twind2_text
}))
-TkTextWindow.new($twind2_text, 'end',
+TkTextWindow.new($twind2_text, 'end',
'window'=>TkButton.new($twind2_text, :text=>"Small highlight",
- :cursor=>'top_left_arrow',
+ :cursor=>'top_left_arrow',
'command'=>proc{
textWinSmallH2 $twind2_text
}))
-TkTextWindow.new($twind2_text, 'end',
- 'window'=>TkButton.new($twind2_text, :text=>"Big pad",
- :cursor=>'top_left_arrow',
+TkTextWindow.new($twind2_text, 'end',
+ 'window'=>TkButton.new($twind2_text, :text=>"Big pad",
+ :cursor=>'top_left_arrow',
'command'=>proc{
textWinBigP2 $twind2_text
}))
-TkTextWindow.new($twind2_text, 'end',
- 'window'=>TkButton.new($twind2_text, :text=>"Small pad",
- :cursor=>'top_left_arrow',
+TkTextWindow.new($twind2_text, 'end',
+ 'window'=>TkButton.new($twind2_text, :text=>"Small pad",
+ :cursor=>'top_left_arrow',
'command'=>proc{
textWinSmallP2 $twind2_text
}))
@@ -232,9 +232,9 @@ TkTextWindow.new($twind2_text, 'end',
$twind2_text.insert('end', "\n\n¹¹¤Ë¥¤¥á¡¼¥¸¤â¥Æ¥­¥¹¥È¥¦¥£¥¸¥§¥Ã¥È¤Ë")
$twind2_text.insert('end', "¤¦¤Þ¤¯ÇÛÃ֤Ǥ­¤Þ¤¹¡§")
-TkTextImage.new($twind2_text, 'end',
+TkTextImage.new($twind2_text, 'end',
'image'=>TkBitmapImage.new(:file=>[
- $demo_dir, '..',
+ $demo_dir, '..',
'images', 'face.xbm'
].join(File::Separator)))
@@ -309,39 +309,39 @@ def textWindPlot2 (t)
TkcLine.new($twind2_plot, 100, 250, 400, 250, 'width'=>2)
TkcLine.new($twind2_plot, 100, 250, 100, 50, 'width'=>2)
- TkcText.new($twind2_plot, 225, 20,
+ TkcText.new($twind2_plot, 225, 20,
'text'=>"A Simple Plot", 'font'=>font, 'fill'=>'brown')
(0..10).each {|i|
x = 100 + (i * 30)
TkcLine.new($twind2_plot, x, 250, x, 245, 'width'=>2)
- TkcText.new($twind2_plot, x, 254,
+ TkcText.new($twind2_plot, x, 254,
'text'=>10*i, 'font'=>font, 'anchor'=>'n')
}
(0..5).each {|i|
y = 250 - (i * 40)
TkcLine.new($twind2_plot, 100, y, 105, y, 'width'=>2)
- TkcText.new($twind2_plot, 96, y,
+ TkcText.new($twind2_plot, 96, y,
'text'=>"#{i*50}.0", 'font'=>font, 'anchor'=>'e')
}
for xx, yy in [[12,56],[20,94],[33,98],[32,120],[61,180],[75,160],[98,223]]
x = 100 + (3*xx)
y = 250 - (4*yy)/5
- item = TkcOval.new($twind2_plot, x-6, y-6, x+6, y+6,
+ item = TkcOval.new($twind2_plot, x-6, y-6, x+6, y+6,
'width'=>1, 'outline'=>'black', 'fill'=>'SkyBlue2')
item.addtag 'point'
end
- $twind2_plot.itembind('point', 'Any-Enter',
+ $twind2_plot.itembind('point', 'Any-Enter',
proc{$twind2_plot.itemconfigure 'current', 'fill', 'red'})
- $twind2_plot.itembind('point', 'Any-Leave',
+ $twind2_plot.itembind('point', 'Any-Leave',
proc{$twind2_plot.itemconfigure 'current', 'fill', 'SkyBlue2'})
- $twind2_plot.itembind('point', '1',
+ $twind2_plot.itembind('point', '1',
proc{|x,y| embPlotDown2 $twind2_plot,x,y}, "%x %y")
- $twind2_plot.itembind('point', 'ButtonRelease-1',
+ $twind2_plot.itembind('point', 'ButtonRelease-1',
proc{$twind2_plot.dtag 'selected'})
- $twind2_plot.bind('B1-Motion',
+ $twind2_plot.bind('B1-Motion',
proc{|x,y| embPlotMove2 $twind2_plot,x,y}, "%x %y")
while ($twind2_text.get($mark2_plot) =~ /[ \t\n]/)
$twind2_text.delete $mark2_plot
diff --git a/ext/tk/sample/demos-jp/unicodeout.rb b/ext/tk/sample/demos-jp/unicodeout.rb
index 4857cd131d..178077ec08 100644
--- a/ext/tk/sample/demos-jp/unicodeout.rb
+++ b/ext/tk/sample/demos-jp/unicodeout.rb
@@ -8,7 +8,7 @@
# based on Tcl/Tk8.4.4 widget demos
if defined?($unicodeout_demo) && $unicodeout_demo
- $unicodeout_demo.destroy
+ $unicodeout_demo.destroy
$unicodeout_demo = nil
end
@@ -20,8 +20,8 @@ $unicodeout_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($unicodeout_demo).pack(:fill=>:both, :expand=>true)
-TkLabel.new(base_frame,
- :font=>$font, :wraplength=>'5.4i', :justify=>:left,
+TkLabel.new(base_frame,
+ :font=>$font, :wraplength=>'5.4i', :justify=>:left,
:text=><<EOL).pack(:side=>:top)
¤³¤ì¤Ï¡¤Tk¤Ë¤ª¤±¤ëÈó²¤ÊÆÊ¸»ú½¸¹ç¤òÍѤ¤¤ë¸À¸ì¤ËÂФ¹¤ë¥µ¥Ý¡¼¥È¤Ë¤Ä¤¤¤Æ¤Î\
¥µ¥ó¥×¥ë¤Ç¤¹¡¥¤¿¤À¤·¡¤²¼¤Îɽ¼¨¤Ë¤ª¤¤¤Æ¤¢¤Ê¤¿¤¬¼ÂºÝ¤Ë¤É¤Î¤è¤¦¤Êɽ¼¨¤ò\
@@ -55,9 +55,9 @@ TkFrame.new(base_frame){|f|
}).pack(:side=>:left, :expand=>true)
}
-wait_msg = TkLabel.new(base_frame,
- :text=>"¥Õ¥©¥ó¥ÈÆÉ¤ß¹þ¤ß¤Î´°Î»¤Þ¤Ç" +
- "¤·¤Ð¤é¤¯¤ªÂÔ¤Á²¼¤µ¤¤¡¥¡¥¡¥",
+wait_msg = TkLabel.new(base_frame,
+ :text=>"¥Õ¥©¥ó¥ÈÆÉ¤ß¹þ¤ß¤Î´°Î»¤Þ¤Ç" +
+ "¤·¤Ð¤é¤¯¤ªÂÔ¤Á²¼¤µ¤¤¡¥¡¥¡¥",
:font=>"Helvetica 12 italic").pack
class Unicodeout_SampleFrame < TkFrame
@@ -77,10 +77,10 @@ class Unicodeout_SampleFrame < TkFrame
def add_sample(lang, *args)
sample_txt = Tk::UTF8_String(args.join(''))
- l = TkLabel.new(self, :font=>@@font, :text=>lang+':',
+ l = TkLabel.new(self, :font=>@@font, :text=>lang+':',
:anchor=>:nw, :pady=>0)
- #s = TkLabel.new(self, :font=>@@font, :text=>sample_txt,
- s = TkLabel.new(self, :font=>TkFont.new(@@font), :text=>sample_txt,
+ #s = TkLabel.new(self, :font=>@@font, :text=>sample_txt,
+ s = TkLabel.new(self, :font=>TkFont.new(@@font), :text=>sample_txt,
:anchor=>:nw, :width=>30, :pady=>0)
Tk.grid(l, s, :sticky=>:ew, :pady=>0)
l.grid_config(:padx, '1m')
@@ -96,23 +96,23 @@ oldCursor = $unicodeout_demo.cursor
$unicodeout_demo.cursor('watch')
Tk.update
-f.add_sample('Arabic',
- '\uFE94\uFEF4\uFE91\uFEAE\uFECC\uFEDF\uFE8D\uFE94',
+f.add_sample('Arabic',
+ '\uFE94\uFEF4\uFE91\uFEAE\uFECC\uFEDF\uFE8D\uFE94',
'\uFEE4\uFEE0\uFEDC\uFEDF\uFE8D')
f.add_sample('Trad. Chinese', '\u4E2D\u570B\u7684\u6F22\u5B57')
f.add_sample('Simpl. Chinese', '\u6C49\u8BED')
-f.add_sample('Greek',
- '\u0395\u03BB\u03BB\u03B7\u03BD\u03B9\u03BA\u03AE ',
+f.add_sample('Greek',
+ '\u0395\u03BB\u03BB\u03B7\u03BD\u03B9\u03BA\u03AE ',
'\u03B3\u03BB\u03CE\u03C3\u03C3\u03B1')
-f.add_sample('Hebrew',
- '\u05DD\u05D9\u05DC\u05E9\u05D5\u05E8\u05D9 ',
+f.add_sample('Hebrew',
+ '\u05DD\u05D9\u05DC\u05E9\u05D5\u05E8\u05D9 ',
'\u05DC\u05D9\u05D0\u05E8\u05E9\u05D9')
-f.add_sample('Japanese',
- '\u65E5\u672C\u8A9E\u306E\u3072\u3089\u304C\u306A, ',
+f.add_sample('Japanese',
+ '\u65E5\u672C\u8A9E\u306E\u3072\u3089\u304C\u306A, ',
'\u6F22\u5B57\u3068\u30AB\u30BF\u30AB\u30CA')
f.add_sample('Korean', '\uB300\uD55C\uBBFC\uAD6D\uC758 \uD55C\uAE00')
-f.add_sample('Russian',
- '\u0420\u0443\u0441\u0441\u043A\u0438\u0439 ',
+f.add_sample('Russian',
+ '\u0420\u0443\u0441\u0441\u043A\u0438\u0439 ',
'\u044F\u0437\u044B\u043A')
wait_msg.destroy
diff --git a/ext/tk/sample/demos-jp/widget b/ext/tk/sample/demos-jp/widget
index dfaa9c004e..8eb699e513 100644
--- a/ext/tk/sample/demos-jp/widget
+++ b/ext/tk/sample/demos-jp/widget
@@ -2,8 +2,7 @@
# -*- coding: euc-jp -*-
# ´Á»ú¥³¡¼¥ÉÀßÄê ( tk.rb ¤Î¥í¡¼¥É»þ¤Î encoding ¿äÄê/ÀßÄê¤Ë»È¤ï¤ì¤ë )
-#if RUBY_VERSION < '1.9.0' ### !!!!!!!!!!!!!!
-unless defined?(::Encoding.default_external)
+if RUBY_VERSION < '1.9.0' ### !!!!!!!!!!!!!!
$KCODE = 'euc'
else
DEFAULT_TK_ENCODING = 'EUC-JP'
@@ -190,14 +189,10 @@ else
yscrollcommand proc{|first,last| scr.set first,last}
}
scr.command(proc{|*args| txt.yview(*args)})
-
# txt.pack('in'=>textFrame, 'expand'=>'yes', 'fill'=>'both', 'padx'=>1)
-# txt.pack('in'=>textFrame, 'expand'=>'yes', 'fill'=>'both')
+ txt.pack('in'=>textFrame, 'expand'=>'yes', 'fill'=>'both')
# textFrame.pack('expand'=>'yes', 'fill'=>'both', 'padx'=>1, 'pady'=>2)
textFrame.pack('expand'=>'yes', 'fill'=>'both')
- # $root.withdraw.deiconify
- Tk.update_idletasks
- txt.pack('in'=>textFrame, 'expand'=>'yes', 'fill'=>'both')
statusBar = TkFrame.new($root) {|f|
if $tk_version =~ /^4.*/
@@ -886,12 +881,18 @@ def showCode1(demo)
$code_window.title("Demo code: #{file}")
$code_window.iconname(file)
- code = open([$demo_dir, file].join(File::Separator), 'r'){|fid| fid.read }
+# fid = open(file, 'r')
+ fid = open([$demo_dir, file].join(File::Separator), 'r')
$code_text.delete('1.0', 'end')
- code.force_encoding('EUC-JP') if defined?(::Encoding.default_external)
- $code_text.insert('1.0', code)
+ #$code_text.insert('1.0', `cat #{file}`)
+ $code_text.insert('1.0', fid.read)
+ #$code_mark = TkTextMark.new($code_text, '1.0')
+ #$code_text.set_insert('1.0')
TkTextMarkInsert.new($code_text,'1.0')
+
$set_linenum.call($code_text)
+
+ fid.close
end
def showCode2(demo)
@@ -972,12 +973,14 @@ def showCode2(demo)
$code_window.title("Demo code: #{file}")
$code_window.iconname(file)
- code = open([$demo_dir, file].join(File::Separator), 'r'){|fid| fid.read }
+ fid = open([$demo_dir, file].join(File::Separator), 'r')
$code_text.delete('1.0', 'end')
- code.force_encoding('EUC-JP') if defined?(::Encoding.default_external)
- $code_text.insert('1.0', code)
+ $code_text.insert('1.0', fid.read)
TkTextMarkInsert.new($code_text,'1.0')
+
$set_linenum.call($code_text)
+
+ fid.close
end
if $tk_major_ver < 8
@@ -1074,7 +1077,7 @@ end
#
def aboutBox
Tk.messageBox('icon'=>'info', 'type'=>'ok', 'title'=>'About Widget Demo',
- 'message'=>"Ruby/Tk ¥¦¥£¥¸¥§¥Ã¥È¥Ç¥â Ver.1.7.1-jp\n\n" +
+ 'message'=>"Ruby/Tk ¥¦¥£¥¸¥§¥Ã¥È¥Ç¥â Ver.1.7.0-jp\n\n" +
"based on demos of Tk8.1 -- 8.5 " +
"( Copyright of Tcl/Tk demos:: " +
"(c) 1996-1997 Sun Microsystems, Inc. / " +
diff --git a/ext/tk/sample/editable_listbox.rb b/ext/tk/sample/editable_listbox.rb
index 7a9ad4450b..99345da380 100644
--- a/ext/tk/sample/editable_listbox.rb
+++ b/ext/tk/sample/editable_listbox.rb
@@ -1,115 +1,28 @@
#
-# Tk::RbWidget::Editable_Listbox class
+# Editable_TkListbox class
#
# When "DoubleClick-1" on a listbox item, the entry box is opend on the
# item. And when hit "Return" key on the entry box after modifying the
-# text, the entry box is closed and the item is changed. Or when hit
+# text, the entry box is closed and the item is changed. Or when hit
# "Escape" key, the entry box is closed without modification.
#
# by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
#
require 'tk'
-module Tk
- module RbWidget
- class Editable_Listbox < TkListbox
- end
- end
-end
-
-
-class Tk::RbWidget::Editable_Listbox < TkListbox
- #------------------------------------
- BindTag = TkBindTag.new_by_name(self.to_s.gsub(/::/, '#'))
-
- BindTag.bind('FocusIn', :widget){|w|
- w.instance_eval{
- if idx = @ebox.pos
- see(idx) if bbox(idx).empty?
- @ebox.focus(true)
- end
- }
- }
-
- BindTag.bind('Double-1', :widget, :y){|w, y|
- w.instance_eval{ _ebox_placer(nearest(y)) }
- }
-
- BindTag.bind('Return', :widget){|w|
- w.instance_eval{
- if idx = index(:active)
- _ebox_placer(idx)
- end
- }
- }
- #------------------------------------
-
- def configure(*args)
- ret = super
-
- case cget(:state)
- when 'normal'
- # do nothing
- when 'disabled'
- _ebox_erase
- else # unknown
- # do nothing
-
- end
-
- ret
- end
-
- def _ebox_move(idx)
- return nil if cget(:state) == 'disabled'
- x, y, w, h = bbox(idx)
- return nil unless y && h
- @ebox.place(:x => 0, :relwidth => 1.0,
- :y => y - selectborderwidth,
- :height => h + 2 * selectborderwidth)
+class Editable_TkListbox < TkListbox
+ def _ebox_placer(coord_y)
+ idx = self.nearest(coord_y)
+ x, y, w, h = self.bbox(idx)
+ @ebox.place(:x => 0, :relwidth => 1.0,
+ :y => y - self.selectborderwidth,
+ :height => h + 2 * self.selectborderwidth)
@ebox.pos = idx
+ @ebox.value = self.listvariable.list[idx]
@ebox.focus
end
+ private :_ebox_placer
- def _ebox_placer(idx)
- return nil unless _ebox_move(idx)
- @ebox.value = listvariable.list[idx]
- @ebox.xview_moveto(self.xview[0])
- end
-
- def _ebox_erase
- @ebox.place_forget
- @ebox.pos = nil
- end
- private :_ebox_move, :_ebox_placer, :_ebox_erase
-
- def _setup_ebox_bindings
- # bindings for entry
- @ebox.bind('Return'){
- list = listvariable.list
- list[@ebox.pos] = @ebox.value if @ebox.pos
- listvariable.value = list
- _ebox_erase
- focus
- }
-
- @ebox.bind('Escape'){ _ebox_erase }
- end
- def _setup_listbox_bindings
- # bindings for listbox
- tags = bindtags
- bindtags(tags.insert(tags.index(self) + 1, self.class::BindTag))
- end
- private :_setup_ebox_bindings, :_setup_listbox_bindings
-
- def yview(*args)
- if !@ebox.pos || bbox(@ebox.pos).empty?
- @ebox.place_forget
- else
- _ebox_move(@ebox.pos)
- end
- super
- end
def create_self(keys)
super(keys)
@@ -119,30 +32,38 @@ class Tk::RbWidget::Editable_Listbox < TkListbox
end
@ebox = TkEntry.new(self){
- @pos = nil
+ @pos = -1
def self.pos; @pos; end
def self.pos=(idx); @pos = idx; end
}
- _setup_ebox_bindings
- _setup_listbox_bindings
+ @ebox.bind('Return'){
+ list = self.listvariable.list
+ list[@ebox.pos] = @ebox.value
+ self.listvariable.value = list
+ @ebox.place_forget
+ @ebox.pos = -1
+ }
+
+ @ebox.bind('Escape'){
+ @ebox.place_forget
+ @ebox.pos = -1
+ }
+
+ self.bind('Double-1', '%y'){|y| _ebox_placer(y) }
end
end
if $0 == __FILE__
- #lbox0 = TkListbox.new.pack(:side=>:left)
- #lbox0.insert(:end, 0,1,2,3,4,5,6,7,8,9,0,1,2,3)
-
scr = TkScrollbar.new.pack(:side=>:right, :fill=>:y)
- lbox1 = Tk::RbWidget::Editable_Listbox.new.pack(:side=>:left)
- lbox2 = Tk::RbWidget::Editable_Listbox.new.pack(:side=>:left)
+ lbox1 = Editable_TkListbox.new.pack(:side=>:left)
+ lbox2 = Editable_TkListbox.new.pack(:side=>:left)
scr.assign(lbox1, lbox2)
lbox1.insert(:end, *%w(a b c d e f g h i j k l m n))
lbox2.insert(:end, 0,1,2,3,4,5,6,7,8,9,0,1,2,3)
-
Tk.mainloop
end
diff --git a/ext/tk/sample/encstr_usage.rb b/ext/tk/sample/encstr_usage.rb
index 39dc9c4018..b22c2504ac 100644
--- a/ext/tk/sample/encstr_usage.rb
+++ b/ext/tk/sample/encstr_usage.rb
@@ -13,12 +13,12 @@ t3 = TkText.new(:height=>5).pack
src_str = IO.readlines(File.join(File.dirname(__FILE__),'iso2022-kr.txt')).join
-t1.insert('end',
+t1.insert('end',
"use neither Tk::EncodedString class nor Tk.encoding= method\n\n")
t1.insert('end', src_str)
enc_str = Tk::EncodedString(src_str, 'iso2022-kr')
-t2.insert('end',
+t2.insert('end',
"use Tk::EncodedString class (Tk.encoding => '#{Tk.encoding}')\n\n")
t2.insert('end', enc_str)
diff --git a/ext/tk/sample/figmemo_sample.rb b/ext/tk/sample/figmemo_sample.rb
index 25ec618fe8..1b6979d2dd 100644
--- a/ext/tk/sample/figmemo_sample.rb
+++ b/ext/tk/sample/figmemo_sample.rb
@@ -55,14 +55,14 @@ class PhotoCanvas < TkScrolledCanvas
USAGE = <<EOT
--- WHAT IS ---
-You can write comments on the loaded image, and save it as a Postscipt
-file (original image file is not modified). Each comment is drawn as a
-set of an indicator circle, an arrow, and a memo text. See the following
+You can write comments on the loaded image, and save it as a Postscipt
+file (original image file is not modified). Each comment is drawn as a
+set of an indicator circle, an arrow, and a memo text. See the following
how to write comments.
-This can save the list of memo texts to another file. It may useful to
+This can save the list of memo texts to another file. It may useful to
search the saved Postscript file by the comments on them.
-This may not support multibyte characters (multibyte texts are broken on
-a Postscript file). It depends on features of canvas widgets of Tcl/Tk
+This may not support multibyte characters (multibyte texts are broken on
+a Postscript file). It depends on features of canvas widgets of Tcl/Tk
libraries linked your Ruby/Tk. If you use Tcl/Tk8.0-jp (Japanized Tcl/Tk),
you can (possibly) get a Japanese Postscript file.
@@ -108,8 +108,8 @@ EOT
@border = 2
@selectborder = 1
@delta = @border + @selectborder
- @entry = TkEntry.new(self, :relief=>:ridge, :borderwidth=>@border,
- :selectborderwidth=>@selectborder,
+ @entry = TkEntry.new(self, :relief=>:ridge, :borderwidth=>@border,
+ :selectborderwidth=>@selectborder,
:highlightthickness=>0)
@entry.bind('Return'){@state.value = 0}
@@ -131,7 +131,7 @@ EOT
x = w.canvasx(x)
y = w.canvasy(y)
tag = nil
- w.find_overlapping(x - @overlap_d, y - @overlap_d,
+ w.find_overlapping(x - @overlap_d, y - @overlap_d,
x + @overlap_d, y + @overlap_d).find{|item|
! (item.tags.find{|name|
if name =~ /^(#{@memo_id_head}\d+)$/
@@ -161,8 +161,8 @@ EOT
def _state1(x,y) # set center
@mode = 1
- @target = TkcOval.new(self,
- [canvasx(x), canvasy(y)], [canvasx(x), canvasy(y)],
+ @target = TkcOval.new(self,
+ [canvasx(x), canvasy(y)], [canvasx(x), canvasy(y)],
:outline=>@col, :width=>3, :tags=>[@memo_id_tag])
@items << @target
@mark = [x,y]
@@ -175,16 +175,16 @@ EOT
@mode = 2
r = Integer(Math.sqrt((x-@mark[0])**2 + (y-@mark[1])**2))
- @target.coords([canvasx(@mark[0] - r), canvasy(@mark[1] - r)],
+ @target.coords([canvasx(@mark[0] - r), canvasy(@mark[1] - r)],
[canvasx(@mark[0] + r), canvasy(@mark[1] + r)])
end
def _state3(x,y) # set line start
@mode = 3
- @target = TkcLine.new(self,
- [canvasx(x), canvasy(y)], [canvasx(x), canvasy(y)],
- :arrow=>:first, :arrowshape=>[10, 14, 5],
+ @target = TkcLine.new(self,
+ [canvasx(x), canvasy(y)], [canvasx(x), canvasy(y)],
+ :arrow=>:first, :arrowshape=>[10, 14, 5],
:fill=>@col, :tags=>[@memo_id_tag])
@items << @target
@mark = [x, y]
@@ -196,7 +196,7 @@ EOT
def _state4(x,y) # create line
@mode = 4
- @target.coords([canvasx(@mark[0]), canvasy(@mark[1])],
+ @target.coords([canvasx(@mark[0]), canvasy(@mark[1])],
[canvasx(x), canvasy(y)])
end
@@ -232,8 +232,8 @@ EOT
@entry.value = ''
@entry.configure(:justify=>justify, :font=>@font, :foreground=>@col)
- ewin = TkcWindow.new(self, [canvasx(x)+dx, canvasy(y)+dy],
- :window=>@entry, :state=>:normal, :anchor=>anchor,
+ ewin = TkcWindow.new(self, [canvasx(x)+dx, canvasy(y)+dy],
+ :window=>@entry, :state=>:normal, :anchor=>anchor,
:tags=>[@memo_id_tag])
@entry.focus
@@ -243,9 +243,9 @@ EOT
ewin.delete
- @target = TkcText.new(self, [canvasx(x), canvasy(y)],
- :anchor=>anchor, :justify=>justify,
- :fill=>@col, :font=>@font, :text=>@entry.value,
+ @target = TkcText.new(self, [canvasx(x), canvasy(y)],
+ :anchor=>anchor, :justify=>justify,
+ :fill=>@col, :font=>@font, :text=>@entry.value,
:tags=>[@memo_id_tag])
_state0()
@@ -305,9 +305,9 @@ def open_file(canvas, fname)
end
filetypes = [
- ['GIF Files', '.gif'],
- ['GIF Files', [], 'GIFF'],
- ['PPM Files', '.ppm'],
+ ['GIF Files', '.gif'],
+ ['GIF Files', [], 'GIFF'],
+ ['PPM Files', '.ppm'],
['PGM Files', '.pgm']
]
@@ -339,7 +339,7 @@ def open_file(canvas, fname)
begin
canvas.load_photo(fpath)
rescue => e
- Tk.messageBox(:icon=>'error', :type=>'ok',
+ Tk.messageBox(:icon=>'error', :type=>'ok',
:message=>"Fail to read '#{fpath}'.\n#{e.message}")
end
@@ -354,11 +354,11 @@ def save_memo(canvas, fname)
initname = fname.value
if initname != '-'
initname = File.basename(initname, File.extname(initname))
- fpath = Tk.getSaveFile(:filetypes=>[ ['Text Files', '.txt'],
- ['ALL Files', '*'] ],
+ fpath = Tk.getSaveFile(:filetypes=>[ ['Text Files', '.txt'],
+ ['ALL Files', '*'] ],
:initialfile=>initname)
else
- fpath = Tk.getSaveFile(:filetypes=>[ ['Text Files', '.txt'],
+ fpath = Tk.getSaveFile(:filetypes=>[ ['Text Files', '.txt'],
['ALL Files', '*'] ])
end
return if fpath.empty?
@@ -366,7 +366,7 @@ def save_memo(canvas, fname)
begin
fid = open(fpath, 'w')
rescue => e
- Tk.messageBox(:icon=>'error', :type=>'ok',
+ Tk.messageBox(:icon=>'error', :type=>'ok',
:message=>"Fail to open '#{fname.value}'.\n#{e.message}")
end
@@ -384,24 +384,24 @@ def ps_print(canvas, fname)
initname = fname.value
if initname != '-'
initname = File.basename(initname, File.extname(initname))
- fpath = Tk.getSaveFile(:filetypes=>[ ['Postscript Files', '.ps'],
- ['ALL Files', '*'] ],
+ fpath = Tk.getSaveFile(:filetypes=>[ ['Postscript Files', '.ps'],
+ ['ALL Files', '*'] ],
:initialfile=>initname)
else
- fpath = Tk.getSaveFile(:filetypes=>[ ['Postscript Files', '.ps'],
+ fpath = Tk.getSaveFile(:filetypes=>[ ['Postscript Files', '.ps'],
['ALL Files', '*'] ])
end
return if fpath.empty?
bbox = canvas.bbox('all')
- canvas.postscript(:file=>fpath, :x=>bbox[0], :y=>bbox[1],
+ canvas.postscript(:file=>fpath, :x=>bbox[0], :y=>bbox[1],
:width=>bbox[2] - bbox[0], :height=>bbox[3] - bbox[1])
end
# --------------------------------
def quit(canvas)
- ret = Tk.messageBox(:icon=>'warning', :type=>'okcancel',
- :default=>'cancel',
+ ret = Tk.messageBox(:icon=>'warning', :type=>'okcancel',
+ :default=>'cancel',
:message=>'Realy quit? ')
exit if ret == 'ok'
end
@@ -413,11 +413,11 @@ root = TkRoot.new(:title=>'Fig Memo')
# create canvas frame
canvas = PhotoCanvas.new(root).pack(:fill=>:both, :expand=>true)
usage_frame = TkFrame.new(root, :relief=>:ridge, :borderwidth=>2)
-hide_btn = TkButton.new(usage_frame, :text=>'hide usage',
- :font=>{:size=>8}, :pady=>1,
+hide_btn = TkButton.new(usage_frame, :text=>'hide usage',
+ :font=>{:size=>8}, :pady=>1,
:command=>proc{usage_frame.unpack})
hide_btn.pack(:anchor=>'e', :padx=>5)
-usage = TkLabel.new(usage_frame, :text=>PhotoCanvas::USAGE,
+usage = TkLabel.new(usage_frame, :text=>PhotoCanvas::USAGE,
:font=>'Helvetica 8', :justify=>:left).pack
show_usage = proc{
@@ -426,20 +426,20 @@ show_usage = proc{
fname = TkVariable.new('-')
f = TkFrame.new(root, :relief=>:sunken, :borderwidth=>1).pack(:fill=>:x)
-label = TkLabel.new(f, :textvariable=>fname,
- :font=>{:size=>-12, :weight=>:bold},
+label = TkLabel.new(f, :textvariable=>fname,
+ :font=>{:size=>-12, :weight=>:bold},
:anchor=>'w').pack(:side=>:left, :fill=>:x, :padx=>10)
# create menu
mspec = [
- [ ['File', 0],
- ['Show Usage', proc{show_usage.call}, 5],
- '---',
- ['Open Image File', proc{open_file(canvas, fname)}, 0],
- ['Save Memo Texts', proc{save_memo(canvas, fname)}, 0],
- '---',
- ['Save Postscript', proc{ps_print(canvas, fname)}, 5],
- '---',
+ [ ['File', 0],
+ ['Show Usage', proc{show_usage.call}, 5],
+ '---',
+ ['Open Image File', proc{open_file(canvas, fname)}, 0],
+ ['Save Memo Texts', proc{save_memo(canvas, fname)}, 0],
+ '---',
+ ['Save Postscript', proc{ps_print(canvas, fname)}, 5],
+ '---',
['Quit', proc{quit(canvas)}, 0]
]
]
diff --git a/ext/tk/sample/irbtk.rb b/ext/tk/sample/irbtk.rb
index 70dd33e4da..53ef10d0d1 100644
--- a/ext/tk/sample/irbtk.rb
+++ b/ext/tk/sample/irbtk.rb
@@ -4,8 +4,8 @@
#
# If you want to use 'multi-tk.rb', give option '--multi-tk'.
# And if you want to use 'remote-tk.rb', give option '--remote-tk'.
-# If you want both, you don't need to give both options, because
-# 'remote-tk.rb' includes 'multi-tk.rb'.
+# If you want both, you don't need to give both options, because
+# 'remote-tk.rb' includes 'multi-tk.rb'.
# ( There is no trouble even if you give both options. )
#
require 'remote-tk' if ARGV.delete('--remote-tk')
diff --git a/ext/tk/sample/irbtkw.rbw b/ext/tk/sample/irbtkw.rbw
index 04de3a2022..3fb6dde626 100644
--- a/ext/tk/sample/irbtkw.rbw
+++ b/ext/tk/sample/irbtkw.rbw
@@ -48,20 +48,10 @@ console.yscrollbar(TkScrollbar.new(top, :width=>10).pack(:before=>console,
:side=>:right,
:expand=>false,
:fill=>:y))
-
-# save original I/O
-out = $stdout
-err = $stderr
-
irb_thread = nil
ev_loop = Thread.new{
- begin
- Tk.mainloop
- ensure
- $stdout = out
- $stderr = err
- irb_thread.kill if irb_thread
- end
+ Tk.mainloop
+ irb_thread.kill if irb_thread
}
# window position control
@@ -152,5 +142,5 @@ console.bind('Control-c'){
irb_thread.join
# exit
-ev_loop.kill
+ev_thread.kill
Tk.exit
diff --git a/ext/tk/sample/menubar1.rb b/ext/tk/sample/menubar1.rb
index a233c6e088..9fa1201d41 100644
--- a/ext/tk/sample/menubar1.rb
+++ b/ext/tk/sample/menubar1.rb
@@ -11,21 +11,21 @@ menu_spec = [
{:label=>'Open', :command=>proc{puts('Open clicked')}, :underline=>0},
'---',
['Check_A', TkVariable.new(true), 6],
- {:type=>'checkbutton', :label=>'Check_B',
+ {:type=>'checkbutton', :label=>'Check_B',
:variable=>TkVariable.new, :underline=>6},
'---',
['Radio_X', [radio_var, 'x'], 6, '', {:foreground=>'black'}],
['Radio_Y', [radio_var, 'y'], 6],
['Radio_Z', [radio_var, 'z'], 6],
'---',
- ['cascade', [
- ['sss', proc{p 'sss'}, 0],
- ['ttt', proc{p 'ttt'}, 0],
- ['uuu', proc{p 'uuu'}, 0],
- ['vvv', proc{p 'vvv'}, 0],
- ],
- 0, '',
- {:font=>'Courier 16 italic',
+ ['cascade', [
+ ['sss', proc{p 'sss'}, 0],
+ ['ttt', proc{p 'ttt'}, 0],
+ ['uuu', proc{p 'uuu'}, 0],
+ ['vvv', proc{p 'vvv'}, 0],
+ ],
+ 0, '',
+ {:font=>'Courier 16 italic',
:menu_config=>{:font=>'Times -18 bold', :foreground=>'black'}}],
'---',
['Quit', proc{exit}, 0]],
@@ -33,7 +33,7 @@ menu_spec = [
[['Edit', 0],
['Cut', proc{puts('Cut clicked')}, 2],
['Copy', proc{puts('Copy clicked')}, 0],
- ['Paste', proc{puts('Paste clicked')}, 0]],
+ ['Paste', proc{puts('Paste clicked')}, 0]],
[['Help', 0, {:menu_name=>'help'}],
['About This', proc{puts('Ruby/Tk menubar sample 1')}, 6]]
diff --git a/ext/tk/sample/menubar2.rb b/ext/tk/sample/menubar2.rb
index e3cd68eaef..4507d8b2fe 100644
--- a/ext/tk/sample/menubar2.rb
+++ b/ext/tk/sample/menubar2.rb
@@ -11,21 +11,21 @@ menu_spec = [
{:label=>'Open', :command=>proc{puts('Open clicked')}, :underline=>0},
'---',
['Check_A', TkVariable.new(true), 6],
- {:type=>'checkbutton', :label=>'Check_B',
+ {:type=>'checkbutton', :label=>'Check_B',
:variable=>TkVariable.new, :underline=>6},
'---',
['Radio_X', [radio_var, 'x'], 6, '', {:foreground=>'black'}],
['Radio_Y', [radio_var, 'y'], 6],
['Radio_Z', [radio_var, 'z'], 6],
'---',
- ['cascade', [
- ['sss', proc{p 'sss'}, 0],
- ['ttt', proc{p 'ttt'}, 0],
- ['uuu', proc{p 'uuu'}, 0],
- ['vvv', proc{p 'vvv'}, 0],
- ],
- 0, '',
- {:font=>'Courier 16 italic',
+ ['cascade', [
+ ['sss', proc{p 'sss'}, 0],
+ ['ttt', proc{p 'ttt'}, 0],
+ ['uuu', proc{p 'uuu'}, 0],
+ ['vvv', proc{p 'vvv'}, 0],
+ ],
+ 0, '',
+ {:font=>'Courier 16 italic',
:menu_config=>{:font=>'Times -18 bold', :foreground=>'black'}}],
'---',
['Quit', proc{exit}, 0]],
@@ -33,16 +33,16 @@ menu_spec = [
[['Edit', 0],
['Cut', proc{puts('Cut clicked')}, 2],
['Copy', proc{puts('Copy clicked')}, 0],
- ['Paste', proc{puts('Paste clicked')}, 0]],
+ ['Paste', proc{puts('Paste clicked')}, 0]],
[['Help', 0, {:menu_name=>'help'}],
['About This', proc{puts('Ruby/Tk menubar sample 2')}, 6]]
]
-mbar = Tk.root.add_menubar(menu_spec,
+mbar = Tk.root.add_menubar(menu_spec,
# followings are default configure options
'tearoff'=>'false',
- 'foreground'=>'grey40',
+ 'foreground'=>'grey40',
'activeforeground'=>'red',
'font'=>'Helvetia 12 bold')
# This (default configure options) is NOT same the following.
diff --git a/ext/tk/sample/menubar3.rb b/ext/tk/sample/menubar3.rb
deleted file mode 100644
index 129cfd779b..0000000000
--- a/ext/tk/sample/menubar3.rb
+++ /dev/null
@@ -1,72 +0,0 @@
-#
-# menubar sample 3 : vertical layout menubar; use frame and menubuttons
-#
-
-require 'tk'
-
-radio_var = TkVariable.new('y')
-
-menu_spec = [
- [['&File', true], # when underline option is ture, '&' index is the position
- {:label=>'Open', :command=>proc{puts('Open clicked')}, :underline=>0},
- '---',
- ['Check_A', TkVariable.new(true), 6],
- {:type=>'checkbutton', :label=>'Check_B',
- :variable=>TkVariable.new, :underline=>6},
- '---',
- ['Radio_X', [radio_var, 'x'], /[XYZ]/, '', {:foreground=>'black'}],
- ['Radio_Y', [radio_var, 'y'], /[XYZ]/],
- ['Radio_Z', [radio_var, 'z'], /[XYZ]/], # use Regexp for underline position
- '---',
- ['cascade', [
- ['sss', proc{p 'sss'}, 0],
- ['ttt', proc{p 'ttt'}, 0],
- ['uuu', proc{p 'uuu'}, 0],
- ['vvv', proc{p 'vvv'}, 0],
- ],
- 0, '',
- {:font=>'Courier 16 italic',
- :menu_config=>{:font=>'Times -18 bold', :foreground=>'black'}}],
- '---',
- ['Quit', proc{exit}, 0]],
-
- [['Edit', 0],
- ['Cut', proc{puts('Cut clicked')}, 2],
- ['Copy', proc{puts('Copy clicked')}, 0],
- ['Paste', proc{puts('Paste clicked')}, 0]],
-
- [['Help', 0, {:menu_name=>'help'}],
- ['About This', proc{puts('Ruby/Tk menubar sample 3')}, "This"]]
- # use string index for underline position
-]
-
-layout_proc = 'vertical'
-# The following procedure is same to 'layout_proc'=>'vertical'
-=begin
-layout_proc = proc{|parent, mbtn|
- mbtn.direction :right
- mbtn.pack(:side=>:top, :fill=>:x)
-
- menu = mbtn.menu
- cmd = proc{|m, dir|
- Tk::Menu::TkInternalFunction.next_menu(m, dir) rescue nil
- # ignore error when the internal function doesn't exist
- }
- menu.bind('Tab', cmd, :widget, 'forward')
- menu.bind('Alt-Tab', cmd, :widget, 'backward')
-}
-=end
-
-menubar = TkMenubar.new(nil, menu_spec,
- 'layout_proc'=>layout_proc,
- 'tearoff'=>false,
- 'foreground'=>'grey40',
- 'activeforeground'=>'red',
- 'font'=>'Helvetia 12 bold')
-menubar.pack('side'=>'left', 'fill'=>'y')
-
-TkText.new(:wrap=>'word').pack.insert('1.0', 'This sample script generates "Menu Sidebar".
-If "::tk::MenuNextMenuon" function is available your Tcl/Tk library, you will be able to move to the next menu by Tab key on the posted menu, or the previous menu by Alt + Tab key.
-Please read the sample source, and check how to override default configure options of menu entries on a menu_spec. Maybe, on windows, this menubar does not work properly about keyboard shortcuts. Then, please use "menu" option of root/toplevel widget (see sample/menubar3.rb).')
-
-Tk.mainloop
diff --git a/ext/tk/sample/msgs_rb/README b/ext/tk/sample/msgs_rb/README
index d986e031fd..2e3ff2a9c4 100644
--- a/ext/tk/sample/msgs_rb/README
+++ b/ext/tk/sample/msgs_rb/README
@@ -1,3 +1,3 @@
Message catalogs in this directory depend on Tcl/Tk's message catalogs.
Texts of each locale are copied from Tcl/Tk8.5a1 widget demos.
-Please refer to '../msgs_tk/README'.
+Please refer '../msgs_tk/README'.
diff --git a/ext/tk/sample/multi-ip_sample.rb b/ext/tk/sample/multi-ip_sample.rb
index eccf0201f8..8d6e1bc626 100644
--- a/ext/tk/sample/multi-ip_sample.rb
+++ b/ext/tk/sample/multi-ip_sample.rb
@@ -19,6 +19,7 @@ cmd = Proc.new{|txt|
else
root = TkRoot.new(:title=>'timer sample')
end
+
label = TkLabel.new(:parent=>root, :relief=>:raised, :width=>10) \
.pack(:side=>:bottom, :fill=>:both)
@@ -47,7 +48,6 @@ cmd = Proc.new{|txt|
b_start = TkButton.new(:text=>'Start', :state=>:disabled) {
pack(:side=>:left, :fill=>:both, :expand=>true)
}
-
b_stop = TkButton.new(:text=>'Stop', :state=>:normal) {
pack('side'=>'left', 'fill'=>'both', 'expand'=>'yes')
}
@@ -80,20 +80,19 @@ safe_slave2.eval_proc(cmd, 'safe2') # label -> .w00020
cmd.call('master') # label -> .w00024
#second_master = MultiTkIp.new(&cmd)
-#second_master = MultiTkIp.new(:safe=>2){p [:second_master, $SAFE]}
TkTimer.new(2000, -1, proc{p ['safe1', safe_slave1.deleted?]}).start
TkTimer.new(2000, -1, proc{p ['safe2', safe_slave2.deleted?]}).start
TkTimer.new(2000, -1, proc{p ['trusted', trusted_slave.deleted?]}).start
-TkTimer.new(5000, 1,
+TkTimer.new(5000, 1,
proc{
safe_slave1.eval_proc{Tk.root.destroy}
safe_slave1.delete
print "*** The safe_slave1 is deleted by the timer.\n"
}).start
-TkTimer.new(10000, 1,
+TkTimer.new(10000, 1,
proc{
trusted_slave.eval_proc{Tk.root.destroy}
trusted_slave.delete
diff --git a/ext/tk/sample/multi-ip_sample2.rb b/ext/tk/sample/multi-ip_sample2.rb
index 79c78dec4a..f4a45d8d9a 100644
--- a/ext/tk/sample/multi-ip_sample2.rb
+++ b/ext/tk/sample/multi-ip_sample2.rb
@@ -14,7 +14,7 @@ cmd = proc{|s|
sleep s
TkButton.new(:text=>'b2: p $SAFE', :command=>proc{p $SAFE}).pack(:fill=>:x)
sleep s
- TkButton.new(:text=>'b3: p MultiTkIp.ip_name',
+ TkButton.new(:text=>'b3: p MultiTkIp.ip_name',
:command=>proc{p MultiTkIp.ip_name}).pack(:fill=>:x)
sleep s
TkButton.new(:text=>'EXIT', :command=>proc{exit}).pack(:fill=>:x)
diff --git a/ext/tk/sample/optobj_sample.rb b/ext/tk/sample/optobj_sample.rb
index a781254a28..cafacbdd17 100644
--- a/ext/tk/sample/optobj_sample.rb
+++ b/ext/tk/sample/optobj_sample.rb
@@ -12,13 +12,13 @@ b1 = TkButton.new(f, :text=>'AAA').pack(:fill=>:x)
b2 = TkButton.new(f, :text=>'BBB').pack(:fill=>:x)
b3 = TkButton.new(f, :text=>'CCC').pack(:fill=>:x)
-optobj.assign( b1,
- [ b2, 'configure',
- { 'foreground'=>'background',
- 'background'=>'foreground' } ],
- [ b3, nil,
- { 'foreground'=>'background',
- 'activeforeground'=>nil,
+optobj.assign( b1,
+ [ b2, 'configure',
+ { 'foreground'=>'background',
+ 'background'=>'foreground' } ],
+ [ b3, nil,
+ { 'foreground'=>'background',
+ 'activeforeground'=>nil,
'background'=>['foreground', 'activeforeground'] } ] )
optobj.update('activeforeground'=>'yellow')
@@ -29,26 +29,26 @@ TkButton.new(f){
}
TkButton.new(f){
- configure( optobj.assign([self, nil,
- {'foreground'=>'activeforeground',
- 'background'=>'foreground',
+ configure( optobj.assign([self, nil,
+ {'foreground'=>'activeforeground',
+ 'background'=>'foreground',
'activeforeground'=>'background'}]) \
+ {:text=>'EEE', :relief=>:groove, :borderwidth=>5} )
pack(:fill=>:x)
}
-optobj.notify # To apply the convert_key ( 3rd element of widget info
- # (that is, {'foreground'=>'activeforeground', ,,, } )
- # of the 'EEE' button
+optobj.notify # To apply the convert_key ( 3rd element of widget info
+ # (that is, {'foreground'=>'activeforeground', ,,, } )
+ # of the 'EEE' button
-TkButton.new(f, :text=>'toggle',
+TkButton.new(f, :text=>'toggle',
:command=>proc{
fg = optobj['foreground']
bg = optobj['background']
optobj.configure('foreground'=>bg, 'background'=>fg)
}).pack(:fill=>:x, :pady=>10)
-TkButton.new(f, :text=>'exit',
+TkButton.new(f, :text=>'exit',
:command=>proc{exit}).pack(:fill=>:x, :pady=>10)
TkFrame.new{|f|
diff --git a/ext/tk/sample/propagate.rb b/ext/tk/sample/propagate.rb
index 66f14aeb72..800cef553d 100644
--- a/ext/tk/sample/propagate.rb
+++ b/ext/tk/sample/propagate.rb
@@ -3,7 +3,7 @@ require 'tk'
TkLabel.new(:text=>"Please click the bottom frame").pack
-f = TkFrame.new(:width=>400, :height=>100, :background=>'yellow',
+f = TkFrame.new(:width=>400, :height=>100, :background=>'yellow',
:relief=>'ridge', :borderwidth=>5).pack
# TkPack.propagate(f, false) # <== important!!
diff --git a/ext/tk/sample/remote-ip_sample.rb b/ext/tk/sample/remote-ip_sample.rb
index f6eed9e985..3696a20852 100644
--- a/ext/tk/sample/remote-ip_sample.rb
+++ b/ext/tk/sample/remote-ip_sample.rb
@@ -3,8 +3,8 @@ require 'remote-tk'
puts <<EOM
This sample controls the other Tk interpreter (Ruby/Tk, Tcl/Tk, and so on)
-which running on the other process. For this purpose, Ruby/Tk uses Tcl/Tk's
-'send' command. Availability of the command depends on your GUI environment.
+which running on the other process. For this purpose, Ruby/Tk uses Tcl/Tk's
+'send' command. Availability of the command depends on your GUI environment.
If this script doesn't work, please check your environment (see Tcl/Tk FAQ).
EOM
#'
@@ -19,15 +19,15 @@ ip = RemoteTkIp.new(wish)
ip.eval_proc{TkButton.new(:command=>proc{puts 'This procesure is on the controller-ip (Ruby/Tk)'}, :text=>'print on Ruby/Tk (controller-ip)').pack(:fill=>:x)}
ip.eval_proc{TkButton.new(:command=>'puts {This procesure is on the remote-ip (wish)}', :text=>'print on wish (remote-ip)').pack(:fill=>:x)}
-# If your remote-ip is Ruby/Tk, you can control the remote Ruby by
-# 'ruby' or 'ruby_eval' or 'ruby_cmd' on the Tk interpreter.
+# If your remote-ip is Ruby/Tk, you can control the remote Ruby by
+# 'ruby' or 'ruby_eval' or 'ruby_cmd' on the Tk interpreter.
if ip.is_rubytk?
ip.eval_proc{TkButton.new(:command=>'ruby {p 111; p Array.new(3,"ruby")}', :text=>'ruby cmd on the remote-ip').pack(:fill=>:x)}
end
ip.eval_proc{TkButton.new(:command=>'exit', :text=>'QUIT').pack(:fill=>:x)}
-TkButton.new(:command=>proc{exit}, :text=>'QUIT',
+TkButton.new(:command=>proc{exit}, :text=>'QUIT',
:padx=>10, :pady=>7).pack(:padx=>10, :pady=>7)
Tk.mainloop
diff --git a/ext/tk/sample/remote-ip_sample2.rb b/ext/tk/sample/remote-ip_sample2.rb
index d8cf3c7650..e12b2a96c9 100644
--- a/ext/tk/sample/remote-ip_sample2.rb
+++ b/ext/tk/sample/remote-ip_sample2.rb
@@ -17,23 +17,23 @@ ip = RemoteTkIp.new(app)
# setup remote-ip window
btns = []
ip.eval_proc{
- btns <<
+ btns <<
TkButton.new(:command=>proc{
puts 'This procesure is on the controller-ip (Ruby-side)'
- },
+ },
:text=>'print on controller-ip (Ruby-side)').pack(:fill=>:x)
- btns <<
+ btns <<
TkButton.new(:command=>
'puts {This procesure is on the remote-ip (Tk-side)}',
:text=>'print on remote-ip (Tk-side)').pack(:fill=>:x)
- btns <<
+ btns <<
TkButton.new(:command=>
'ruby {
puts "This procedure is on the remote-ip (Ruby-side)"
p Array.new(3,"ruby")
- }',
+ }',
:text=>'ruby cmd on the remote-ip').pack(:fill=>:x)
TkButton.new(:command=>'exit', :text=>'QUIT').pack(:fill=>:x)
@@ -41,15 +41,15 @@ ip.eval_proc{
# setup controller-ip window
btns.each_with_index{|btn, idx|
- # The scope of the eval-block of 'eval_proc' method is different from
- # the enternal. If you want to pass local values to the eval-block,
+ # The scope of the eval-block of 'eval_proc' method is different from
+ # the enternal. If you want to pass local values to the eval-block,
# use arguments of eval_proc method. They are passed to block-arguments.
- TkButton.new(:command=>proc{ip.eval_proc(btn){|b| b.flash}},
- :text=>"flash button-#{idx}",
+ TkButton.new(:command=>proc{ip.eval_proc(btn){|b| b.flash}},
+ :text=>"flash button-#{idx}",
:padx=>10).pack(:padx=>10, :pady=>2)
}
-TkButton.new(:command=>proc{exit}, :text=>'QUIT',
+TkButton.new(:command=>proc{exit}, :text=>'QUIT',
:padx=>10, :pady=>7).pack(:padx=>10, :pady=>7)
# start eventloop
diff --git a/ext/tk/sample/safe-tk.rb b/ext/tk/sample/safe-tk.rb
index 2aeae235df..e2289697e0 100644
--- a/ext/tk/sample/safe-tk.rb
+++ b/ext/tk/sample/safe-tk.rb
@@ -7,32 +7,29 @@ require "multi-tk"
TkLabel.new(:text=>'This is the Default Master Ipnterpreter').pack(:padx=>5, :pady=>3)
TkButton.new(:text=>'QUIT', :command=>proc{exit}).pack(:pady=>3)
-TkFrame.new(:borderwidth=>2, :height=>3,
+TkFrame.new(:borderwidth=>2, :height=>3,
:relief=>:sunken).pack(:fill=>:x, :expand=>true,
:padx=>10, :pady=>7)
-safe0_p = proc{|*args| p args}
-
###############################
puts "---- create a safe slave IP with Ruby's safe-level == 1 ----------"
-ip = MultiTkIp.new_safe_slave(1){|*args| safe0_p["safe_slave safe_level == #{$SAFE}", args]}
+ip = MultiTkIp.new_safe_slave(1)
puts "\n---- create procs ----------"
puts 'x = proc{p [\'proc x\', "$SAFE==#{$SAFE}"]; exit}'
-#x = proc{p ['proc x', "$SAFE==#{$SAFE}"]; exit}
x = proc{p ['proc x', "$SAFE==#{$SAFE}"]; exit}
-TkLabel.new(:text=>'x = proc{p [\'proc x\', "$SAFE==#{$SAFE}"]; exit}',
+TkLabel.new(:text=>'x = proc{p [\'proc x\', "$SAFE==#{$SAFE}"]; exit}',
:anchor=>:w).pack(:fill=>:x)
puts 'y = proc{|label| p [\'proc y\', "$SAFE==#{$SAFE}", label]; label.text($SAFE)}'
y = proc{|label| p ['proc y', "$SAFE==#{$SAFE}", label]; label.text($SAFE)}
-TkLabel.new(:text=>'y = proc{|label| p [\'proc y\', "$SAFE==#{$SAFE}", label]; label.text($SAFE)}',
+TkLabel.new(:text=>'y = proc{|label| p [\'proc y\', "$SAFE==#{$SAFE}", label]; label.text($SAFE)}',
:anchor=>:w).pack(:fill=>:x)
puts 'z = proc{p [\'proc z\', "$SAFE==#{$SAFE}"]; exit}'
z = proc{p ['proc z', "$SAFE==#{$SAFE}"]; exit}
-TkLabel.new(:text=>'z = proc{p [\'proc z\', "$SAFE==#{$SAFE}"]; exit}',
+TkLabel.new(:text=>'z = proc{p [\'proc z\', "$SAFE==#{$SAFE}"]; exit}',
:anchor=>:w).pack(:fill=>:x)
puts "\n---- call 1st eval_proc ----------"
@@ -45,14 +42,12 @@ p lbl = ip.eval_proc{
# TkLabel.new(f, :text=>" (<-- 'lbl' widget is here)").pack(:side=>:right)
l = TkLabel.new(f).pack(:side=>:right)
- TkButton.new(:text=>':command=>proc{l.text($SAFE)}',
+ TkButton.new(:text=>':command=>proc{l.text($SAFE)}',
:command=>proc{l.text($SAFE)}).pack(:fill=>:x, :padx=>5)
TkButton.new(:text=>':command=>x', :command=>x).pack(:fill=>:x, :padx=>5)
- TkButton.new(:text=>':command=>proc{exit}',
- :command=>proc{
- safe0_p["'exit' is called at $SAFE=#{$SAFE}"];exit}
- ).pack(:fill=>:x, :padx=>5)
- TkFrame.new(:borderwidth=>2, :height=>3,
+ TkButton.new(:text=>':command=>proc{exit}',
+ :command=>proc{exit}).pack(:fill=>:x, :padx=>5)
+ TkFrame.new(:borderwidth=>2, :height=>3,
:relief=>:sunken).pack(:fill=>:x, :expand=>true,
:padx=>10, :pady=>7)
l # return the label widget
@@ -67,33 +62,19 @@ p ip.eval_proc(proc{
f = TkFrame.new.pack
TkLabel.new(f, :text=>"$SAFE == ").pack(:side=>:left)
l = TkLabel.new(f, :text=>$SAFE).pack(:side=>:right)
- TkButton.new(:text=>':command=>proc{l.text($SAFE)}',
- :command=>proc{l.text($SAFE)}).pack(:fill=>:x,
+ TkButton.new(:text=>':command=>proc{l.text($SAFE)}',
+ :command=>proc{l.text($SAFE)}).pack(:fill=>:x,
:padx=>5)
- TkButton.new(:text=>':command=>proc{y.call(l)}',
- :command=>proc{y.call(l)}).pack(:fill=>:x,
+ TkButton.new(:text=>':command=>proc{y.call(l)}',
+ :command=>proc{y.call(l)}).pack(:fill=>:x,
:padx=>5)
- TkButton.new(:text=>':command=>proc{Proc.new(&y).call(l)}',
- :command=>proc{
- Proc.new(&y).call(l)
- }).pack(:fill=>:x, :padx=>5)
- TkButton.new(:text=>':command=>proc{MultiTkIp._proc_on_current_safelevel(y).call(l)}',
- :command=>proc{
- MultiTkIp._proc_on_current_safelevel(y).call(l)
- }).pack(:fill=>:x, :padx=>5)
-if false && Object.const_defined?(:RubyVM) && ::RubyVM.class == Class
TkButton.new(:text=>':command=>proc{Thread.new(l, &y).value}',
:command=>proc{
Thread.new(l, &y).value
}).pack(:fill=>:x, :padx=>5)
-else
- # KNOWN BUG::
- # Current multi-tk.rb cannot support long term threads on callbacks.
- # Such a thread freezes the Ruby/Tk process.
-end
- TkButton.new(:text=>':command=>proc{z.call}',
+ TkButton.new(:text=>':command=>proc{z.call}',
:command=>proc{z.call}).pack(:fill=>:x, :padx=>5)
- TkFrame.new(:borderwidth=>2, :height=>3,
+ TkFrame.new(:borderwidth=>2, :height=>3,
:relief=>:sunken).pack(:fill=>:x, :expand=>true,
:padx=>10, :pady=>7)
})
@@ -104,15 +85,15 @@ p bind = ip.eval_str('
f = TkFrame.new.pack
TkLabel.new(f, :text=>"$SAFE == ").pack(:side=>:left)
l = TkLabel.new(f, :text=>$SAFE).pack(:side=>:right)
- TkButton.new(:text=>":command=>proc{y.call(l)}",
+ TkButton.new(:text=>":command=>proc{y.call(l)}",
:command=>proc{y.call(l)}).pack(:fill=>:x, :padx=>5)
binding
', binding)
p ip.eval_str("
- TkButton.new(:text=>':command=>proc{ l.text = $SAFE }',
+ TkButton.new(:text=>':command=>proc{ l.text = $SAFE }',
:command=>proc{ l.text = $SAFE }).pack(:fill=>:x, :padx=>5)
- TkFrame.new(:borderwidth=>2, :height=>3,
+ TkFrame.new(:borderwidth=>2, :height=>3,
:relief=>:sunken).pack(:fill=>:x, :expand=>true,
:padx=>10, :pady=>7)
", bind)
@@ -125,7 +106,7 @@ p ip.eval_proc{
TkLabel.new(:text=>"3rd and 4th eval_proc : $SAFE == #{$SAFE}").pack
}
p ip.eval_proc{
- TkButton.new(:text=>':command=>proc{ lbl.text = $SAFE }',
+ TkButton.new(:text=>':command=>proc{ lbl.text = $SAFE }',
:command=>proc{ lbl.text = $SAFE }).pack(:fill=>:x, :padx=>5)
}
diff --git a/ext/tk/sample/scrollframe.rb b/ext/tk/sample/scrollframe.rb
index 6a9381d465..b0ac6d3874 100644
--- a/ext/tk/sample/scrollframe.rb
+++ b/ext/tk/sample/scrollframe.rb
@@ -1,19 +1,19 @@
#
-# Tk::RbWidget::ScrollFrame class
+# Tk::ScrollFrame class
#
# This widget class is a frame widget with scrollbars.
# The ScrollFrame doesn't propagate the size of embedded widgets.
# When it is configured, scrollregion of the container is changed.
#
-# Scrollbars can be toggled by Tk::RbWidget::ScrollFrame#vscroll & hscroll.
-# If horizontal or virtical scrollbar is turned off, the horizontal
+# Scrollbars can be toggled by Tk::ScrollFrame#vscroll & hscroll.
+# If horizontal or virtical scrollbar is turned off, the horizontal
# or virtical size of embedded widgets is propagated.
#
# Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
#
require 'tk'
-class Tk::RbWidget::ScrollFrame < TkFrame
+class Tk::ScrollFrame < TkFrame
include TkComposite
DEFAULT_WIDTH = 200
@@ -27,8 +27,8 @@ class Tk::RbWidget::ScrollFrame < TkFrame
@v_scroll = TkScrollbar.new(@frame, 'orient'=>'vertical')
# create a canvas widget
- @canvas = TkCanvas.new(@frame,
- :borderwidth=>0, :selectborderwidth=>0,
+ @canvas = TkCanvas.new(@frame,
+ :borderwidth=>0, :selectborderwidth=>0,
:highlightthickness=>0)
# allignment
@@ -209,38 +209,28 @@ end
# test
if __FILE__ == $0
- f = Tk::RbWidget::ScrollFrame.new(:scrollbarwidth=>10,
- :width=>300, :height=>200)
+ f = Tk::ScrollFrame.new(:scrollbarwidth=>10, :width=>300, :height=>200)
f.pack(:expand=>true, :fill=>:both)
TkButton.new(f, :text=>'foo button', :command=>proc{puts 'foo'}).pack
TkButton.new(f, :text=>'baaar button', :command=>proc{puts 'baaar'}).pack
TkButton.new(f, :text=>'baz button', :command=>proc{puts 'baz'}).pack
- TkButton.new(f, :text=>'hoge hoge button',
+ TkButton.new(f, :text=>'hoge hoge button',
:command=>proc{puts 'hoge hoge'}).pack(:side=>:bottom)
# f.hscroll(false)
- # add a text widget
Tk.after(3000){
t = TkText.new(f).pack(:expand=>true, :fill=>:both)
- t.insert(:end, "An example of Tk::RbWidget::ScrollFrame widget.\n\n")
- t.insert(:end, "Here is a text widget.\n")
- t.insert(:end, "Please resize the application window, ")
- t.insert(:end, "and try the scrollbars ")
- t.insert(:end, "to move the view of packed widgets.\n")
+ t.insert(:end, 'Here is a text widget')
}
- # remove a vertical scrollbar, and then the scrollframe is not scrollable.
Tk.after(6000){ f.vscroll(false) }
- # add a vertical scrollbar, and make the scrollframe scrollable.
Tk.after(9000){ f.vscroll(true) }
- # remove a horizontal scrollbar, and then the scrollframe is not scrollable.
Tk.after(12000){ f.hscroll(false) }
- # add a horizontal scrollbar, and make the scrollframe scrollable.
Tk.after(15000){ f.hscroll(true) }
Tk.mainloop
diff --git a/ext/tk/sample/tcltklib/sample1.rb b/ext/tk/sample/tcltklib/sample1.rb
index 1965781533..13df440751 100644
--- a/ext/tk/sample/tcltklib/sample1.rb
+++ b/ext/tk/sample/tcltklib/sample1.rb
@@ -1,5 +1,5 @@
#! /usr/local/bin/ruby -d
-# -*- encoding: euc-jp -*-
+#! /usr/local/bin/ruby
# -d ¥ª¥×¥·¥ç¥ó¤òÉÕ¤±¤ë¤È, ¥Ç¥Ð¥Ã¥°¾ðÊó¤òɽ¼¨¤¹¤ë.
# tcltk ¥é¥¤¥Ö¥é¥ê¤Î¥µ¥ó¥×¥ë
diff --git a/ext/tk/sample/tcltklib/sample2.rb b/ext/tk/sample/tcltklib/sample2.rb
index f187d6ce1d..110e81ebc4 100644
--- a/ext/tk/sample/tcltklib/sample2.rb
+++ b/ext/tk/sample/tcltklib/sample2.rb
@@ -23,37 +23,37 @@ $button, $canvas, $checkbutton, $frame, $label, $pack, $update, $wm =
"button", "canvas", "checkbutton", "frame", "label", "pack", "update", "wm")
class Othello
-
+
EMPTY = 0
BLACK = 1
WHITE = - BLACK
-
+
attr :in_com_turn
attr :game_over
-
+
class Board
-
+
include Observable
-
+
DIRECTIONS = [
[-1, -1], [-1, 0], [-1, 1],
[ 0, -1], [ 0, 1],
[ 1, -1], [ 1, 0], [ 1, 1]
]
-
+
attr_accessor :com_disk
-
+
def initialize(othello)
@othello = othello
reset
end
-
+
def notify_observers(*arg)
if @observer_peers != nil
super(*arg)
end
end
-
+
def reset
@data = [
[EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY],
@@ -68,19 +68,19 @@ class Othello
changed
notify_observers
end
-
+
def man_disk
return - @com_disk
end
-
+
def other_disk(disk)
return - disk
end
-
+
def get_disk(row, col)
return @data[row][col]
end
-
+
def reverse_to(row, col, my_disk, dir_y, dir_x)
y = row
x = col
@@ -100,7 +100,7 @@ class Othello
x -= dir_x
end until y == row && x == col
end
-
+
def put_disk(row, col, disk)
@data[row][col] = disk
changed
@@ -109,7 +109,7 @@ class Othello
reverse_to(row, col, disk, *dir)
end
end
-
+
def count_disk(disk)
num = 0
@data.each do |rows|
@@ -121,7 +121,7 @@ class Othello
end
return num
end
-
+
def count_point_to(row, col, my_disk, dir_y, dir_x)
return 0 if @data[row][col] != EMPTY
count = 0
@@ -140,7 +140,7 @@ class Othello
end
return 0
end
-
+
def count_point(row, col, my_disk)
count = 0
DIRECTIONS.each do |dir|
@@ -148,14 +148,14 @@ class Othello
end
return count
end
-
+
def corner?(row, col)
return (row == 0 && col == 0) ||
(row == 0 && col == 7) ||
(row == 7 && col == 0) ||
(row == 7 && col == 7)
end
-
+
def search(my_disk)
max = 0
max_row = nil
@@ -173,30 +173,30 @@ class Othello
return max_row, max_col
end
end #--------------------------> class Board ends here
-
+
class BoardView < TclTkWidget
-
+
BACK_GROUND_COLOR = "DarkGreen"
HILIT_BG_COLOR = "green"
BORDER_COLOR = "black"
BLACK_COLOR = "black"
WHITE_COLOR = "white"
STOP_COLOR = "red"
-
+
attr :left
attr :top
attr :right
attr :bottom
-
+
class Square
-
+
attr :oval, TRUE
attr :row
attr :col
-
+
def initialize(view, row, col)
@view = view
- @id = @view.e("create rectangle",
+ @id = @view.e("create rectangle",
*(view.tk_rect(view.left + col,
view.top + row,
view.left + col + 1,
@@ -219,7 +219,7 @@ class Othello
view.click_square(self)
}))
end
-
+
def blink(color)
@view.e("itemconfigure", @id, "-fill #{color}")
$update.e()
@@ -227,13 +227,13 @@ class Othello
@view.e("itemconfigure", @id, "-fill #{BACK_GROUND_COLOR}")
end
end #-----------------------> class Square ends here
-
+
def initialize(othello, board)
super($ip, $root, $canvas)
@othello = othello
@board = board
@board.add_observer(self)
-
+
@squares = Array.new(8)
for i in 0 .. 7
@squares[i] = Array.new(8)
@@ -242,7 +242,7 @@ class Othello
@top = 0.5
@right = @left + 8
@bottom = @top + 8
-
+
i = self.e("create rectangle", *tk_rect(@left, @top, @right, @bottom))
self.e("itemconfigure", i,
"-width 1m -outline #{BORDER_COLOR} -fill #{BACK_GROUND_COLOR}")
@@ -252,15 +252,15 @@ class Othello
@squares[row][col] = Square.new(self, row, col)
end
end
-
+
update
end
-
+
def tk_rect(left, top, right, bottom)
return left.to_s + "c", top.to_s + "c",
right.to_s + "c", bottom.to_s + "c"
end
-
+
def clear
each_square do |square|
if square.oval != nil
@@ -269,7 +269,7 @@ class Othello
end
end
end
-
+
def draw_disk(row, col, disk)
if disk == EMPTY
if @squares[row][col].oval != nil
@@ -278,7 +278,7 @@ class Othello
end
return
end
-
+
$update.e()
sleep(0.05)
oval = @squares[row][col].oval
@@ -299,7 +299,7 @@ class Othello
end
self.e("itemconfigure", oval, "-outline #{color} -fill #{color}")
end
-
+
def update(row = nil, col = nil)
if row && col
draw_disk(row, col, @board.get_disk(row, col))
@@ -311,7 +311,7 @@ class Othello
end
@othello.show_point
end
-
+
def each_square
@squares.each do |rows|
rows.each do |square|
@@ -319,7 +319,7 @@ class Othello
end
end
end
-
+
def click_square(square)
if @othello.in_com_turn || @othello.game_over ||
@board.count_point(square.row,
@@ -331,15 +331,15 @@ class Othello
@board.put_disk(square.row, square.col, @board.man_disk)
@othello.com_turn
end
-
+
private :draw_disk
public :update
end #----------------------> class BoardView ends here
-
+
def initialize
@msg_label = TclTkWidget.new($ip, $root, $label)
$pack.e(@msg_label)
-
+
@board = Board.new(self)
@board_view = BoardView.new(self, @board)
#### added by Y. Shigehiro
@@ -352,39 +352,39 @@ class Othello
"}")
#### ¤³¤³¤Þ¤Ç
$pack.e(@board_view, "-fill both -expand true")
-
+
panel = TclTkWidget.new($ip, $root, $frame)
-
+
@play_black = TclTkWidget.new($ip, panel, $checkbutton,
"-text {com is black} -command", TclTkCallback.new($ip, proc{
switch_side
}))
$pack.e(@play_black, "-side left")
-
+
quit = TclTkWidget.new($ip, panel, $button, "-text Quit -command",
TclTkCallback.new($ip, proc{
exit
}))
$pack.e(quit, "-side right -fill x")
-
+
reset = TclTkWidget.new($ip, panel, $button, "-text Reset -command",
TclTkCallback.new($ip, proc{
reset_game
}))
$pack.e(reset, "-side right -fill x")
-
+
$pack.e(panel, "-side bottom -fill x")
-
+
# root = Tk.root
$wm.e("title", $root, "Othello")
$wm.e("iconname", $root, "Othello")
-
+
@board.com_disk = WHITE
@game_over = FALSE
-
+
TclTk.mainloop
end
-
+
def switch_side
if @in_com_turn
@play_black.e("toggle")
@@ -393,7 +393,7 @@ class Othello
com_turn unless @game_over
end
end
-
+
def reset_game
if @board.com_disk == BLACK
@board.com_disk = WHITE
@@ -404,7 +404,7 @@ class Othello
$wm.e("title", $root, "Othello")
@game_over = FALSE
end
-
+
def com_turn
@in_com_turn = TRUE
$update.e()
diff --git a/ext/tk/sample/tkalignbox.rb b/ext/tk/sample/tkalignbox.rb
index fb1b58f458..32915a5e69 100644
--- a/ext/tk/sample/tkalignbox.rb
+++ b/ext/tk/sample/tkalignbox.rb
@@ -1,26 +1,19 @@
#
# tkalignbox.rb : align widgets with same width/height
-#
+#
# by Hidetoshi NAGAI
#
-# The box size depends on 'reqheight' and 'reqwidth' of contained widgets.
-# If you want to give the box size when those requested sizes are 0,
-# please set box.propagate = false (See the test routine at the tail of
+# The box size depends on 'reqheight' and 'reqwidth' of contained widgets.
+# If you want to give the box size when those requested sizes are 0,
+# please set box.propagate = false (See the test routine at the tail of
# this file).
require 'tk'
-module Tk
- module RbWidget
- class AlignBox < TkFrame
- end
- end
-end
-
-class Tk::RbWidget::AlignBox < TkFrame
+class TkAlignBox < TkFrame
def initialize(*args)
- if self.class == Tk::RbWidget::AlignBox
- fail RuntimeError, "Tk::AlignBox is an abstract class"
+ if self.class == TkAlignBox
+ fail RuntimeError, "TkAlignBox is an abstract class"
end
@padx = 0
@pady = 0
@@ -38,12 +31,12 @@ class Tk::RbWidget::AlignBox < TkFrame
end
def _set_framesize
- fail RuntimeError, "Tk::AlignBox is an abstract class"
+ fail RuntimeError, "TkAlignBox is an abstract class"
end
private :_set_framesize
def _place_config(widget, idx, cnt)
- fail RuntimeError, "Tk::AlignBox is an abstract class"
+ fail RuntimeError, "TkAlignBox is an abstract class"
end
private :_place_config
@@ -124,7 +117,7 @@ class Tk::RbWidget::AlignBox < TkFrame
attr_accessor :propagate
end
-class Tk::RbWidget::HBox < Tk::RbWidget::AlignBox
+class TkHBox < TkAlignBox
def _set_framesize
bd = self.borderwidth
self.width((@max_width + 2*@padx) * @widgets.size + 2*bd)
@@ -133,28 +126,28 @@ class Tk::RbWidget::HBox < Tk::RbWidget::AlignBox
private :_set_framesize
def _place_config(widget, idx, cnt)
- widget.place_in(self,
- 'relx'=>idx/cnt, 'x'=>@padx,
- 'rely'=>0, 'y'=>@pady,
- 'relwidth'=>1.0/cnt, 'width'=>-2*@padx,
+ widget.place_in(self,
+ 'relx'=>idx/cnt, 'x'=>@padx,
+ 'rely'=>0, 'y'=>@pady,
+ 'relwidth'=>1.0/cnt, 'width'=>-2*@padx,
'relheight'=>1.0, 'height'=>-2*@pady)
end
private :_place_config
end
-Tk::RbWidget::HLBox = Tk::RbWidget::HBox
+TkHLBox = TkHBox
-class Tk::RbWidget::HRBox < Tk::RbWidget::HBox
+class TkHRBox < TkHBox
def _place_config(widget, idx, cnt)
- widget.place_in(self,
- 'relx'=>(cnt - idx - 1)/cnt, 'x'=>@padx,
- 'rely'=>0, 'y'=>@pady,
- 'relwidth'=>1.0/cnt, 'width'=>-2*@padx,
+ widget.place_in(self,
+ 'relx'=>(cnt - idx - 1)/cnt, 'x'=>@padx,
+ 'rely'=>0, 'y'=>@pady,
+ 'relwidth'=>1.0/cnt, 'width'=>-2*@padx,
'relheight'=>1.0, 'height'=>-2*@pady)
end
private :_place_config
end
-class Tk::RbWidget::VBox < Tk::RbWidget::AlignBox
+class TkVBox < TkAlignBox
def _set_framesize
bd = self.borderwidth
self.width(@max_width + 2*@padx + 2*bd)
@@ -163,22 +156,22 @@ class Tk::RbWidget::VBox < Tk::RbWidget::AlignBox
private :_set_framesize
def _place_config(widget, idx, cnt)
- widget.place_in(self,
- 'relx'=>0, 'x'=>@padx,
- 'rely'=>idx/cnt, 'y'=>@pady,
- 'relwidth'=>1.0, 'width'=>-2*@padx,
+ widget.place_in(self,
+ 'relx'=>0, 'x'=>@padx,
+ 'rely'=>idx/cnt, 'y'=>@pady,
+ 'relwidth'=>1.0, 'width'=>-2*@padx,
'relheight'=>1.0/cnt, 'height'=>-2*@pady)
end
private :_place_config
end
-Tk::RbWidget::VTBox = Tk::RbWidget::VBox
+TkVTBox = TkVBox
-class Tk::RbWidget::VBBox < Tk::RbWidget::VBox
+class TkVBBox < TkVBox
def _place_config(widget, idx, cnt)
- widget.place_in(self,
- 'relx'=>0, 'x'=>@padx,
- 'rely'=>(cnt - idx - 1)/cnt, 'y'=>@pady,
- 'relwidth'=>1.0, 'width'=>-2*@padx,
+ widget.place_in(self,
+ 'relx'=>0, 'x'=>@padx,
+ 'rely'=>(cnt - idx - 1)/cnt, 'y'=>@pady,
+ 'relwidth'=>1.0, 'width'=>-2*@padx,
'relheight'=>1.0/cnt, 'height'=>-2*@pady)
end
private :_place_config
@@ -188,46 +181,43 @@ end
# test
################################################
if __FILE__ == $0
- f = Tk::RbWidget::HBox.new(:borderwidth=>3, :relief=>'ridge').pack
+ f = TkHBox.new(:borderwidth=>3, :relief=>'ridge').pack
f.add(TkButton.new(f, :text=>'a'),
TkButton.new(f, :text=>'aa', :font=>'Helvetica 16'),
TkButton.new(f, :text=>'aaa'),
TkButton.new(f, :text=>'aaaa'))
- f = Tk::RbWidget::HBox.new(:borderwidth=>3, :relief=>'ridge',
- :padx=>7, :pady=>3, :background=>'yellow').pack
+ f = TkHBox.new(:borderwidth=>3, :relief=>'ridge',
+ :padx=>7, :pady=>3, :background=>'yellow').pack
f.add(TkButton.new(f, :text=>'a'),
TkButton.new(f, :text=>'aa', :font=>'Helvetica 16'),
TkButton.new(f, :text=>'aaa'),
TkButton.new(f, :text=>'aaaa'))
- f = Tk::RbWidget::VBox.new(:borderwidth=>5,
- :relief=>'groove').pack(:fill=>:y, :expand=>true)
+ f = TkVBox.new(:borderwidth=>5, :relief=>'groove').pack
f.add(TkButton.new(f, :text=>'a'),
TkButton.new(f, :text=>'aa', :font=>'Helvetica 30'),
TkButton.new(f, :text=>'aaa'),
TkButton.new(f, :text=>'aaaa'))
- f = Tk::RbWidget::HRBox.new(:borderwidth=>3,
- :relief=>'raised').pack(:fill=>:x)
+ f = TkHRBox.new(:borderwidth=>3, :relief=>'raised').pack(:fill=>:x)
f.add(TkButton.new(f, :text=>'a'),
- TkButton.new(f, :text=>'aa'),
+ TkButton.new(f, :text=>'aa'),
TkButton.new(f, :text=>'aaa'))
- f = Tk::RbWidget::VBBox.new(:borderwidth=>3,
- :relief=>'ridge').pack(:fill=>:x)
+ f = TkVBBox.new(:borderwidth=>3, :relief=>'ridge').pack(:fill=>:x)
f.propagate = false
f.height 100
- f.add(TkFrame.new(f){|ff|
- TkButton.new(ff, :text=>'a').pack(:pady=>4, :padx=>6,
+ f.add(TkFrame.new(f){|ff|
+ TkButton.new(ff, :text=>'a').pack(:pady=>4, :padx=>6,
:fill=>:both, :expand=>true)
- },
- TkFrame.new(f){|ff|
- TkButton.new(ff, :text=>'aa').pack(:pady=>4, :padx=>6,
+ },
+ TkFrame.new(f){|ff|
+ TkButton.new(ff, :text=>'aa').pack(:pady=>4, :padx=>6,
:fill=>:both, :expand=>true)
- },
- TkFrame.new(f){|ff|
- TkButton.new(ff, :text=>'aaaa').pack(:pady=>4, :padx=>6,
+ },
+ TkFrame.new(f){|ff|
+ TkButton.new(ff, :text=>'aaaa').pack(:pady=>4, :padx=>6,
:fill=>:both, :expand=>true)
})
diff --git a/ext/tk/sample/tkballoonhelp.rb b/ext/tk/sample/tkballoonhelp.rb
index a9bd371db6..c2c95f771d 100644
--- a/ext/tk/sample/tkballoonhelp.rb
+++ b/ext/tk/sample/tkballoonhelp.rb
@@ -2,26 +2,16 @@
# tkballoonhelp.rb : simple balloon help widget
# by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
#
-# Add a balloon help to a widget.
-# This widget has only poor featureas. If you need more useful features,
+# Add a balloon help to a widget.
+# This widget has only poor featureas. If you need more useful features,
# please try to use the Tix extension of Tcl/Tk under Ruby/Tk.
-#
+#
# The interval time to display a balloon help is defined 'interval' option
-# (default is 750ms).
+# (default is 1000ms).
#
require 'tk'
-module Tk
- module RbWidget
- class BalloonHelp<TkLabel
- end
- end
-end
-class Tk::RbWidget::BalloonHelp<TkLabel
- DEFAULT_FOREGROUND = 'black'
- DEFAULT_BACKGROUND = 'white'
- DEFAULT_INTERVAL = 750
-
+class TkBalloonHelp<TkLabel
def _balloon_binding(interval)
@timer = TkAfter.new(interval, 1, proc{show})
def @timer.interval(val)
@@ -60,13 +50,10 @@ class Tk::RbWidget::BalloonHelp<TkLabel
@command = keys.delete('command')
- @interval = keys.delete('interval'){DEFAULT_INTERVAL}
+ @interval = keys.delete('interval'){1000}
_balloon_binding(@interval)
- # @label = TkLabel.new(@frame, 'background'=>'bisque').pack
- @label = TkLabel.new(@frame,
- 'foreground'=>DEFAULT_FOREGROUND,
- 'background'=>DEFAULT_BACKGROUND).pack
+ @label = TkLabel.new(@frame, 'background'=>'bisque').pack
@label.configure(_symbolkey2str(keys)) unless keys.empty?
@path = @label
end
@@ -100,10 +87,10 @@ class Tk::RbWidget::BalloonHelp<TkLabel
when 2
@command.call(x - TkWinfo.rootx(@parent), y - TkWinfo.rooty(@parent))
when 3
- @command.call(x - TkWinfo.rootx(@parent), y - TkWinfo.rooty(@parent),
+ @command.call(x - TkWinfo.rootx(@parent), y - TkWinfo.rooty(@parent),
self)
else
- @command.call(x - TkWinfo.rootx(@parent), y - TkWinfo.rooty(@parent),
+ @command.call(x - TkWinfo.rootx(@parent), y - TkWinfo.rooty(@parent),
self, @parent)
end
end
@@ -112,11 +99,11 @@ class Tk::RbWidget::BalloonHelp<TkLabel
@frame.raise
@org_cursor = @parent['cursor']
- @parent.cursor('crosshair')
+ @parent.cursor('crosshair')
end
def erase
- @parent.cursor(@org_cursor)
+ @parent.cursor(@org_cursor)
@frame.withdraw
end
@@ -131,42 +118,41 @@ end
if __FILE__ == $0
TkButton.new('text'=>'This button has a balloon help') {|b|
pack('fill'=>'x')
- Tk::RbWidget::BalloonHelp.new(b, 'text'=>' Message ')
+ TkBalloonHelp.new(b, 'text'=>' Message ')
}
TkButton.new('text'=>'This button has another balloon help') {|b|
pack('fill'=>'x')
- Tk::RbWidget::BalloonHelp.new(b,
- 'text'=>"CONFIGURED MESSAGE\nchange colors, and so on",
- 'interval'=>200, 'font'=>'courier',
- 'background'=>'gray', 'foreground'=>'red')
+ TkBalloonHelp.new(b, 'text'=>'configured message',
+ 'interval'=>200, 'font'=>'courier',
+ 'background'=>'gray', 'foreground'=>'red')
}
sb = TkScrollbox.new.pack(:fill=>:x)
sb.insert(:end, *%w(aaa bbb ccc ddd eee fff ggg hhh iii jjj kkk lll mmm))
=begin
# CASE1 : command takes no arguemnt
- bh = Tk::RbWidget::BalloonHelp.new(sb, :interval=>500,
- :relief=>:ridge, :background=>'white',
- :command=>proc{
- y = TkWinfo.pointery(sb) - TkWinfo.rooty(sb)
- bh.text "current index == #{sb.nearest(y)}"
- })
+ bh = TkBalloonHelp.new(sb, :interval=>500,
+ :relief=>:ridge, :background=>'white',
+ :command=>proc{
+ y = TkWinfo.pointery(sb) - TkWinfo.rooty(sb)
+ bh.text "current index == #{sb.nearest(y)}"
+ })
=end
=begin
# CASE2 : command takes 2 arguemnts
- bh = Tk::RbWidget::BalloonHelp.new(sb, :interval=>500,
- :relief=>:ridge, :background=>'white',
- :command=>proc{|x, y|
- bh.text "current index == #{sb.nearest(y)}"
- })
+ bh = TkBalloonHelp.new(sb, :interval=>500,
+ :relief=>:ridge, :background=>'white',
+ :command=>proc{|x, y|
+ bh.text "current index == #{sb.nearest(y)}"
+ })
=end
=begin
# CASE3 : command takes 3 arguemnts
- Tk::RbWidget::BalloonHelp.new(sb, :interval=>500,
- :relief=>:ridge, :background=>'white',
- :command=>proc{|x, y, bhelp|
- bhelp.text "current index == #{sb.nearest(y)}"
- })
+ TkBalloonHelp.new(sb, :interval=>500,
+ :relief=>:ridge, :background=>'white',
+ :command=>proc{|x, y, bhelp|
+ bhelp.text "current index == #{sb.nearest(y)}"
+ })
=end
=begin
# CASE4a : command is a Proc object and takes 4 arguemnts
@@ -174,16 +160,16 @@ if __FILE__ == $0
bhelp.text "current index == #{parent.nearest(y)}"
}
- Tk::RbWidget::BalloonHelp.new(sb, :interval=>500,
- :relief=>:ridge, :background=>'white',
- :command=>cmd)
+ TkBalloonHelp.new(sb, :interval=>500,
+ :relief=>:ridge, :background=>'white',
+ :command=>cmd)
sb2 = TkScrollbox.new.pack(:fill=>:x)
sb2.insert(:end, *%w(AAA BBB CCC DDD EEE FFF GGG HHH III JJJ KKK LLL MMM))
- Tk::RbWidget::BalloonHelp.new(sb2, :interval=>500,
- :padx=>5, :relief=>:raised,
- :background=>'gray25', :foreground=>'white',
- :command=>cmd)
+ TkBalloonHelp.new(sb2, :interval=>500,
+ :padx=>5, :relief=>:raised,
+ :background=>'gray25', :foreground=>'white',
+ :command=>cmd)
=end
#=begin
# CASE4b : command is a Method object and takes 4 arguemnts
@@ -192,16 +178,16 @@ if __FILE__ == $0
end
cmd = self.method(:set_msg)
- Tk::RbWidget::BalloonHelp.new(sb, :interval=>500,
- :relief=>:ridge, :background=>'white',
- :command=>cmd)
+ TkBalloonHelp.new(sb, :interval=>500,
+ :relief=>:ridge, :background=>'white',
+ :command=>cmd)
sb2 = TkScrollbox.new.pack(:fill=>:x)
sb2.insert(:end, *%w(AAA BBB CCC DDD EEE FFF GGG HHH III JJJ KKK LLL MMM))
- Tk::RbWidget::BalloonHelp.new(sb2, :interval=>500,
- :padx=>5, :relief=>:raised,
- :background=>'gray25', :foreground=>'white',
- :command=>cmd)
+ TkBalloonHelp.new(sb2, :interval=>500,
+ :padx=>5, :relief=>:raised,
+ :background=>'gray25', :foreground=>'white',
+ :command=>cmd)
#=end
Tk.mainloop
diff --git a/ext/tk/sample/tkbiff.rb b/ext/tk/sample/tkbiff.rb
index c0953a1b1b..c6699629cc 100644
--- a/ext/tk/sample/tkbiff.rb
+++ b/ext/tk/sample/tkbiff.rb
@@ -11,10 +11,10 @@ end
if ARGV.length == 0
if ENV['MAIL']
$spool = ENV['MAIL']
- else
+ else
$spool = '/var/spool/mail/' + ENV['USER']
end
-else
+else
$spool = ARGV[0]
end
@@ -40,7 +40,7 @@ class Mail
@body = []
while line = f.gets()
line.chop!
- next if /^From / =~ line # skip From-line
+ next if /^From / =~ line # skip From-line
break if /^$/ =~ line # end of header
if /^(\S+):\s*(.*)/ =~ line
@header[attr = $1.capitalize] = $2
diff --git a/ext/tk/sample/tkbrowse.rb b/ext/tk/sample/tkbrowse.rb
index 56d5a80fcf..4893f57f95 100644
--- a/ext/tk/sample/tkbrowse.rb
+++ b/ext/tk/sample/tkbrowse.rb
@@ -69,7 +69,7 @@ end
# Fill the listbox with a list of all the files in the directory (run
# the "ls" command to get that information).
-if ARGV.length>0
+if ARGV.length>0
dir = ARGV[0]
else
dir="."
diff --git a/ext/tk/sample/tkcombobox.rb b/ext/tk/sample/tkcombobox.rb
index 59db565f06..1840270951 100644
--- a/ext/tk/sample/tkcombobox.rb
+++ b/ext/tk/sample/tkcombobox.rb
@@ -1,20 +1,11 @@
#
-# tkcombobox.rb : auto scrollbox & combobox
-#
+# tkcombobox.rb : TkAutoScrollbox & TkCombobox
+#
# by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
#
require 'tk'
-module Tk
- module RbWidget
- class AutoScrollListbox < TkListbox
- end
- class Combobox < TkEntry
- end
- end
-end
-
-class Tk::RbWidget::AutoScrollListbox
+class TkAutoScrollbox < TkListbox
include TkComposite
@@up_bmp = TkBitmapImage.new(:data=><<EOD)
@@ -53,9 +44,9 @@ EOD
@lbox.yscrollcommand(proc{|*args| @scr.set(*args); _config_proc})
@scr.command(proc{|*args| @lbox.yview(*args); _config_proc})
- @up_arrow = TkLabel.new(@lbox, :image=>@@up_bmp,
+ @up_arrow = TkLabel.new(@lbox, :image=>@@up_bmp,
:relief=>:raised, :borderwidth=>1)
- @down_arrow = TkLabel.new(@lbox, :image=>@@down_bmp,
+ @down_arrow = TkLabel.new(@lbox, :image=>@@down_bmp,
:relief=>:raised, :borderwidth=>1)
_init_binding
@@ -87,7 +78,7 @@ EOD
def _show_down_arrow
unless @down_arrow.winfo_mapped?
- @down_arrow.pack(:side=>:bottom, :fill=>:x)
+ @down_arrow.pack(:side=>:bottom, :fill=>:x)
end
end
@@ -100,11 +91,11 @@ EOD
def _check_sel(cidx, tidx = nil, bidx = nil)
_set_sel(cidx)
unless tidx
- tidx = @lbox.nearest(0)
+ tidx = @lbox.nearest(0)
tidx += 1 if tidx > 0
end
unless bidx
- bidx = @lbox.nearest(10000)
+ bidx = @lbox.nearest(10000)
bidx -= 1 if bidx < @lbox.index('end') - 1
end
if cidx > bidx
@@ -206,7 +197,7 @@ EOD
@lbox.bind('Configure', proc{_config_proc})
@lbox.bind('Enter', proc{|y| _set_sel(@lbox.nearest(y))}, '%y')
- @lbox.bind('Motion', proc{|y|
+ @lbox.bind('Motion', proc{|y|
@up_timer.stop if @up_timer.running?
@down_timer.stop if @down_timer.running?
_check_sel(@lbox.nearest(y))
@@ -230,7 +221,7 @@ end
################################################
-class Tk::RbWidget::Combobox < TkEntry
+class TkCombobox < TkEntry
include TkComposite
@@down_btn_bmp = TkBitmapImage.new(:data=><<EOD)
@@ -250,7 +241,6 @@ static unsigned char up_arrow_bits[] = {
EOD
def _button_proc(dir = true)
- return if @ent.state == 'disabled'
@btn.relief(:sunken)
x = @frame.winfo_rootx
y = @frame.winfo_rooty
@@ -275,10 +265,9 @@ EOD
@top.grab
begin
- @wait_var.tkwait
- if (idx = @wait_var.to_i) >= 0
- # @ent.value = @lst.get(idx)
- _set_entry_value(@lst.get(idx))
+ @var.tkwait
+ if (idx = @var.to_i) >= 0
+ @ent.value = @lst.get(idx)
end
@top.withdraw
@btn.relief(:raised)
@@ -298,66 +287,19 @@ EOD
@btn.bind('1', proc{_button_proc(true)})
@btn.bind('3', proc{_button_proc(false)})
- @lst.bind('1', proc{|y| @wait_var.value = @lst.nearest(y)}, '%y')
- @lst.bind('Return', proc{@wait_var.value = @lst.curselection[0]})
+ @lst.bind('1', proc{|y| @var.value = @lst.nearest(y)}, '%y')
+ @lst.bind('Return', proc{@var.value = @lst.curselection[0]})
cancel = TkVirtualEvent.new('2', '3', 'Escape')
- @lst.bind(cancel, proc{@wait_var.value = -1})
+ @lst.bind(cancel, proc{@var.value = -1})
end
private :_init_bindings
- def _set_entry_value(val)
- @ent.textvariable.value = val
- end
- private :_set_entry_value
-
- #----------------------------------------------------
-
- def _state_control(value = None)
- if value == None
- # get
- @ent.state
- else
- # set
- @ent.state(value.to_s)
- case value = @ent.state # regulate 'state' string
- when 'normal', 'readonly'
- @btn.state 'normal'
- when 'disabled'
- @btn.state 'disabled'
- else
- # unknown : do nothing
- end
- end
- end
- private :_state_control
-
- def __methodcall_optkeys # { key=>method, ... }
- {'state' => :_state_control}
- end
- private :__methodcall_optkeys
-
- #----------------------------------------------------
-
- def _textvariable_control(var = None)
- if var == None
- # get
- ((var = @ent.textvariable) === @default_var)? nil: var
- else
- # set
- @var = var
- tk_send('configure', '-textvariable', (@var)? var: @default_var)
- end
- end
- private :_textvariable_control
-
- #----------------------------------------------------
-
def initialize_composite(keys={})
keys = _symbolkey2str(keys)
- @btn = TkLabel.new(@frame, :relief=>:raised, :borderwidth=>2,
- :image=>@@down_btn_bmp).pack(:side=>:right,
+ @btn = TkLabel.new(@frame, :relief=>:raised, :borderwidth=>3,
+ :image=>@@down_btn_bmp).pack(:side=>:right,
:ipadx=>2, :fill=>:y)
@ent = TkEntry.new(@frame).pack(:side=>:left)
@path = @ent.path
@@ -370,21 +312,16 @@ EOD
startwait = keys.delete('startwait'){300}
interval = keys.delete('interval'){150}
- @lst = Tk::RbWidget::AutoScrollListbox.new(@top, :scrollbar=>true,
- :startwait=>startwait,
- :interval=>interval)
- @lst.pack(:fill=>:both, :expand=>true)
+ @lst = TkAutoScrollbox.new(@top,
+ :startwait=>startwait,
+ :interval=>interval).pack(:fill=>:both,
+ :expand=>true)
@ent_list = []
- @wait_var = TkVariable.new
- @var = @default_var = TkVariable.new
-
- @ent.textvariable @default_var
+ @var = TkVariable.new
_init_bindings
- option_methods('textvariable' => :_textvariable_control)
-
delegate('DEFAULT', @ent)
delegate('height', @lst)
delegate('relief', @frame)
@@ -393,8 +330,6 @@ EOD
delegate('arrowrelief', @lst)
delegate('arrowborderwidth', @lst)
- delegate('state', false)
-
if mode = keys.delete('scrollbar')
scrollbar(mode)
end
@@ -460,14 +395,10 @@ end
# test
################################################
if __FILE__ == $0
-# e0 = Tk::RbWidget::Combobox.new.pack
-# e0.values(%w(aa bb cc dd ee ff gg hh ii jj kk ll mm nn oo pp qq rr ss tt uu))
-
v = TkVariable.new
- e = Tk::RbWidget::Combobox.new(:height=>7, :scrollbar=>true,
- :textvariable=>v,
- :arrowrelief=>:flat, :arrowborderwidth=>0,
- :startwait=>400, :interval=>200).pack
+ e = TkCombobox.new(:height=>7, :scrollbar=>true, :textvariable=>v,
+ :arrowrelief=>:flat, :arrowborderwidth=>0,
+ :startwait=>400, :interval=>200).pack
e.values(%w(aa bb cc dd ee ff gg hh ii jj kk ll mm nn oo pp qq rr ss tt uu))
#e.see(e.list_index('end') - 2)
e.value = 'cc'
@@ -477,19 +408,17 @@ if __FILE__ == $0
TkLabel.new(f, :font=>fnt, :textvariable=>v).pack(:side=>:left)
}.pack
- TkFrame.new(:relief=>:raised, :borderwidth=>2,
+ TkFrame.new(:relief=>:raised, :borderwidth=>2,
:height=>3).pack(:fill=>:x, :expand=>true, :padx=>5, :pady=>3)
- l = Tk::RbWidget::AutoScrollListbox.new(nil, :relief=>:groove,
- :borderwidth=>4,:height=>7,
- :width=>20).pack(:fill=>:both,
- :expand=>true)
+ l = TkAutoScrollbox.new(nil, :relief=>:groove, :borderwidth=>4,
+ :width=>20).pack(:fill=>:both, :expand=>true)
(0..20).each{|i| l.insert('end', "line #{i}")}
TkFrame.new(:relief=>:ridge, :borderwidth=>3){
- TkButton.new(self, :text=>'ON',
+ TkButton.new(self, :text=>'ON',
:command=>proc{l.scrollbar(true)}).pack(:side=>:left)
- TkButton.new(self, :text=>'OFF',
+ TkButton.new(self, :text=>'OFF',
:command=>proc{l.scrollbar(false)}).pack(:side=>:right)
pack(:fill=>:x)
}
diff --git a/ext/tk/sample/tkdialog.rb b/ext/tk/sample/tkdialog.rb
index eb8cd04796..00cc12ab11 100644
--- a/ext/tk/sample/tkdialog.rb
+++ b/ext/tk/sample/tkdialog.rb
@@ -8,7 +8,7 @@ top = TkFrame.new(root) {
}
msg = TkMessage.new(top) {
text "File main.c hasn't been saved to disk since \
-it was last modified. What should I do?"
+it was last modified. What should I do?"
justify 'center'
aspect 200
font '-Adobe-helvetica-medium-r-normal--*-240*'
diff --git a/ext/tk/sample/tkextlib/ICONS/viewIcons.rb b/ext/tk/sample/tkextlib/ICONS/viewIcons.rb
index 02ba19a629..fc88eb5c85 100644
--- a/ext/tk/sample/tkextlib/ICONS/viewIcons.rb
+++ b/ext/tk/sample/tkextlib/ICONS/viewIcons.rb
@@ -4,7 +4,7 @@
#
# -- Display icons from icon library.
#
-# -- Copy the clicked icon data (command string of creating
+# -- Copy the clicked icon data (command string of creating
# a TkPhotoImage instance) to the clipboard.
#
require 'tk'
@@ -27,7 +27,7 @@ class ViewIcons
ent_library = TkEntry.new(base, :width=>50, :textvariable=>@library)
ent_groups = TkEntry.new(base, :width=>50, :textvariable=>@groups)
- btn_browse = TkButton.new(base, :text=>'Browse',
+ btn_browse = TkButton.new(base, :text=>'Browse',
:command=>method(:select_icons))
btn_view = TkButton.new(base, :text=>'View',
:command=>method(:display_icons))
@@ -35,8 +35,8 @@ class ViewIcons
@column_btns = {}
6.step(20, 2){|i|
- @column_btns[i] = TkButton.new(columns,
- :text=>i.to_s, :width=>2,
+ @column_btns[i] = TkButton.new(columns,
+ :text=>i.to_s, :width=>2,
:command=>proc{set_columns(i)}
).pack(:side=>:left)
}
@@ -90,15 +90,15 @@ class ViewIcons
end
def _create_info_window
- @info_window = TkToplevel.new(:background=>'lightyellow', :borderwidth=>1,
+ @info_window = TkToplevel.new(:background=>'lightyellow', :borderwidth=>1,
:relief=>:solid){|w|
- lbl_name = TkLabel.new(w, :text=>'Name', :background=>'lightyellow',
+ lbl_name = TkLabel.new(w, :text=>'Name', :background=>'lightyellow',
:font=>@boldfont, :justify=>:left)
- lbl_grps = TkLabel.new(w, :text=>'Groups', :background=>'lightyellow',
+ lbl_grps = TkLabel.new(w, :text=>'Groups', :background=>'lightyellow',
:font=>@boldfont, :justify=>:left)
- lbl_type = TkLabel.new(w, :text=>'Type', :background=>'lightyellow',
+ lbl_type = TkLabel.new(w, :text=>'Type', :background=>'lightyellow',
:font=>@boldfont, :justify=>:left)
- lbl_size = TkLabel.new(w, :text=>'Size', :background=>'lightyellow',
+ lbl_size = TkLabel.new(w, :text=>'Size', :background=>'lightyellow',
:font=>@boldfont, :justify=>:left)
lbl_name.grid(:row=>0, :column=>0, :sticky=>:w)
@@ -192,7 +192,7 @@ class ViewIcons
def cancel_info
if @delay_timer
- @delay_timer.cancel
+ @delay_timer.cancel
@delay_timer = nil
end
@info_window.withdraw
@@ -242,9 +242,9 @@ class ViewIcons
TkClipboard.append(@command)
if Tk::PLATFORM['platform'] == 'unix'
- TkSelection.handle(Tk.root, method(:primary_transfer),
+ TkSelection.handle(Tk.root, method(:primary_transfer),
:selection=>'PRIMARY')
- TkSelection.set_owner(Tk.root, :selection=>'PRIMARY',
+ TkSelection.set_owner(Tk.root, :selection=>'PRIMARY',
:command=>method(:lost_selection))
end
@@ -256,17 +256,17 @@ class ViewIcons
bbox = @icons_window.bbox('all')
width = @controls.winfo_width - @icons_window.yscrollbar.winfo_width - 8
- @icons_window.configure(:width=>width, :scrollregion=>bbox,
- :xscrollincrement=>'0.1i',
+ @icons_window.configure(:width=>width, :scrollregion=>bbox,
+ :xscrollincrement=>'0.1i',
:yscrollincrement=>'0.1i')
end
def select_icons
- new_lib = Tk.getOpenFile(:initialdir=>@initial_dir,
- :initialfile=>'tkIcons',
- :title=>'Select Icon Library',
+ new_lib = Tk.getOpenFile(:initialdir=>@initial_dir,
+ :initialfile=>'tkIcons',
+ :title=>'Select Icon Library',
:filetypes=>[
- ['Icon Libraries', ['tkIcons*']],
+ ['Icon Libraries', ['tkIcons*']],
['All Files', ['*']]
])
@@ -280,7 +280,7 @@ class ViewIcons
row = 0
unless File.exist?(@library.value)
- Tk.messageBox(:icon=>'warning', :message=>'File does not exist',
+ Tk.messageBox(:icon=>'warning', :message=>'File does not exist',
:title=>'viewIcons')
return
end
diff --git a/ext/tk/sample/tkextlib/blt/barchart5.rb b/ext/tk/sample/tkextlib/blt/barchart5.rb
index 86101b200d..db181d10ca 100644
--- a/ext/tk/sample/tkextlib/blt/barchart5.rb
+++ b/ext/tk/sample/tkextlib/blt/barchart5.rb
@@ -2,7 +2,7 @@
require 'tk'
require 'tkextlib/blt'
-load File.join(File.dirname(File.expand_path(__FILE__)),
+load File.join(File.dirname(File.expand_path(__FILE__)),
'scripts', 'stipples.rb')
TkOption.add('*graph.x.Title', 'X Axis Label')
@@ -23,27 +23,27 @@ if visual != 'staticgray' && visual != 'grayscale'
end
htext = Tk::BLT::Htext.new(:widgetname=>'.htext', :text=><<EOD)
- This is an example of the barchart widget. The barchart has
- many components; x and y axis, legend, crosshairs, elements, etc.
+ This is an example of the barchart widget. The barchart has
+ many components; x and y axis, legend, crosshairs, elements, etc.
To create a postscript file "bar.ps", press the %%
ruby {
- b = TkButton.new(Tk::BLT::Htext::Htext_Widget.window,
- :widgetname=>'print', :text=>'Print',
+ b = TkButton.new(Tk::BLT::Htext::Htext_Widget.window,
+ :widgetname=>'print', :text=>'Print',
:command=>proc{
$graph.postsript(:output=>'bar.ps')
})
Tk::BLT::Htext::Htext_Widget.window.append(b)
}
-%% button.
+%% button.
%%
ruby {
- $graph = Tk::BLT::Barchart.new(:widgetname=>'.htext.graph',
+ $graph = Tk::BLT::Barchart.new(:widgetname=>'.htext.graph',
:relief=>:raised, :borderwidth=>2)
$graph.xaxis_configure(:rotate=>90, :stepsize=>0)
- Tk::BLT::Htext::Htext_Widget.window.append($graph,
+ Tk::BLT::Htext::Htext_Widget.window.append($graph,
:fill=>:both, :padx=>4)
}
@@ -51,8 +51,8 @@ htext = Tk::BLT::Htext.new(:widgetname=>'.htext', :text=><<EOD)
Hit the %%
ruby {
- b = TkButton.new(Tk::BLT::Htext::Htext_Widget.window,
- :widgetname=>'quit', :text=>'Quit',
+ b = TkButton.new(Tk::BLT::Htext::Htext_Widget.window,
+ :widgetname=>'quit', :text=>'Quit',
:command=>proc{ exit })
Tk::BLT::Htext::Htext_Widget.window.append(b)
}
@@ -86,7 +86,7 @@ x.seq(-5.0, 5.0, 0.2)
y.expr("sin(#{x})")
barWidth = 0.19
-$graph.element_create('sin', :relief=>:raised, :borderwidth=>1,
+$graph.element_create('sin', :relief=>:raised, :borderwidth=>1,
:x=>x, :y=>y, :barwidth=>barWidth)
Tk::BLT::Table.add(Tk.root, htext, :fill=>:both)
diff --git a/ext/tk/sample/tkextlib/blt/calendar.rb b/ext/tk/sample/tkextlib/blt/calendar.rb
index 86d34043dc..4fc6d64d9e 100644
--- a/ext/tk/sample/tkextlib/blt/calendar.rb
+++ b/ext/tk/sample/tkextlib/blt/calendar.rb
@@ -31,17 +31,17 @@ TkOption.add('*tile', texture2)
class BLT_Calendar_sample
@@monthInfo = [
nil, # dummy
- ['January', 31],
- ['February', 28],
- ['March', 31],
- ['April', 30],
- ['May', 31],
- ['June', 30],
- ['July', 31],
- ['August', 31],
- ['Septembar', 30],
- ['October', 31],
- ['November', 30],
+ ['January', 31],
+ ['February', 28],
+ ['March', 31],
+ ['April', 30],
+ ['May', 31],
+ ['June', 30],
+ ['July', 31],
+ ['August', 31],
+ ['Septembar', 30],
+ ['October', 31],
+ ['November', 30],
['December', 31]
]
@@ -53,23 +53,23 @@ class BLT_Calendar_sample
if TkComm.bool(Tk.info(:commands, '.calendar'))
Tk.destroy('.calendar')
end
- cal = Tk::BLT::Tile::Frame.new(:widgetname=>'.calendar',
- :classname=>'Calendar',
+ cal = Tk::BLT::Tile::Frame.new(:widgetname=>'.calendar',
+ :classname=>'Calendar',
:width=>'3i', :height=>'3i')
- mon = Tk::BLT::Tile::Label.new(cal, :font=>'Courier 14 bold',
- :text=>"#{@@monthInfo[today.month][0]} " +
+ mon = Tk::BLT::Tile::Label.new(cal, :font=>'Courier 14 bold',
+ :text=>"#{@@monthInfo[today.month][0]} " +
"#{today.year}")
Tk::BLT::Table.add(cal, mon, [1, 0], :cspan=>7, :pady=>10)
- week_f = Tk::BLT::Tile::Frame.new(cal, :widgetname=>'weekframe',
+ week_f = Tk::BLT::Tile::Frame.new(cal, :widgetname=>'weekframe',
:relief=>:sunken, :borderwidth=>1)
Tk::BLT::Table.add(cal, week_f, [2, 0], :columnspan=>7, :fill=>:both)
@@abbrDays.each_with_index{|dayName, idx|
- Tk::BLT::Table.add(cal,
- Tk::BLT::Tile::Label.new(cal, :text=>dayName,
- :font=>'Helvetica 12'),
+ Tk::BLT::Table.add(cal,
+ Tk::BLT::Tile::Label.new(cal, :text=>dayName,
+ :font=>'Helvetica 12'),
[2, idx], :pady=>2, :padx=>2)
}
@@ -83,11 +83,11 @@ class BLT_Calendar_sample
wkday += 7 if wkday < 0
while cnt <= numDays
- Tk::BLT::Table.add(cal,
+ Tk::BLT::Table.add(cal,
Tk::BLT::Tile::Label.new(cal, :text=>cnt){
- self.configure(:borderwidth=>1,
+ self.configure(:borderwidth=>1,
:relief=>:sunken) if cnt == today.day
- },
+ },
[week+3, wkday], :fill=>:both, :ipadx=>10, :ipady=>4)
cnt += 1
wkday += 1
@@ -98,11 +98,11 @@ class BLT_Calendar_sample
end
Tk::BLT::Tile::Frame.new(cal, :borderwidth=>1, :relief=>:sunken){|f|
- Tk::BLT::Table.add(f,
- Tk::BLT::Tile::Button.new(f, :widgetname=>'button',
- :command=>proc{exit},
- :borderwidth=>2,
- :text=>'Quit'),
+ Tk::BLT::Table.add(f,
+ Tk::BLT::Tile::Button.new(f, :widgetname=>'button',
+ :command=>proc{exit},
+ :borderwidth=>2,
+ :text=>'Quit'),
:padx=>4, :pady=>4)
Tk::BLT::Table.add(cal, f, [week+4, 5], :cspan=>2, :pady=>4)
}
diff --git a/ext/tk/sample/tkextlib/blt/graph6.rb b/ext/tk/sample/tkextlib/blt/graph6.rb
index b3eeb81231..f899b44115 100644
--- a/ext/tk/sample/tkextlib/blt/graph6.rb
+++ b/ext/tk/sample/tkextlib/blt/graph6.rb
@@ -6,55 +6,55 @@ require 'tkextlib/blt'
Tk::TCL_PRECISION.value = 15
[
- ['*Graph.Width', '10i'],
- ['*Graph.leftMargin', '.75i'],
- ['*Graph.Height', '6i'],
- ['*Graph.plotBackground', 'black'],
- ['*LineMarker.color', 'white'],
- ['*LineMarker.Dashes', 5],
- ['*TextMarker.foreground', 'white'],
- ['*TextMarker.Background', ''],
-
- ['*Graph.x.hide', true],
- ['*Graph.x.title', ''],
- ['*Graph.y.rotate', 90],
- # ['*Graph.y.stepSize', 2.0],
- ['*Graph.title', ''],
- ['*graph.Title', 'Example s27'],
- ['*graph.x.hide', false],
- ['*graph.topMargin', 0],
- ['*graph.bottomMargin', 0],
- ['*x.Title', 'Time'],
- ['*y.Title', 'Signals'],
- ['*Pixels', 1],
-
- ['*Reduce', 0.5],
- ['*bufferElements', false],
-
- ['*Element.color', 'green4'],
- ['*Element.ScaleSymbols', true],
- ['*Element.Color', 'grey70'],
- ['*Element.Symbol', :none],
- ['*Element.LineWidth', 1],
- # ['*Element.Smooth', :natural],
- ['*Element.Smooth', :catrom],
-
- ['*activeLine.LineWidth', 2],
- ['*activeLine.Color', 'white'],
- ['*activeLine.Color', 'green1'],
-
- # ['*Legend.Hide', true],
- ['*Legend.Position', :right],
- ['*Legend.Relief', :flat],
- ['*Legend.activeRelief', :sunken],
- ['*Legend.borderWidth', 2],
- #['*Legend.Font', '-*-helvetica-medium-r-*-*-10-*-*-*-*-*-*-*'],
- ['*Legend.Font', 'Helvetica -10'],
- ['*Grid.hide', false],
- ['*Grid.dashes', [1, 5]],
-
- # ['*foreground', 'white'],
- ['*zoomOutline.outline', 'yellow'],
+ ['*Graph.Width', '10i'],
+ ['*Graph.leftMargin', '.75i'],
+ ['*Graph.Height', '6i'],
+ ['*Graph.plotBackground', 'black'],
+ ['*LineMarker.color', 'white'],
+ ['*LineMarker.Dashes', 5],
+ ['*TextMarker.foreground', 'white'],
+ ['*TextMarker.Background', ''],
+
+ ['*Graph.x.hide', true],
+ ['*Graph.x.title', ''],
+ ['*Graph.y.rotate', 90],
+ # ['*Graph.y.stepSize', 2.0],
+ ['*Graph.title', ''],
+ ['*graph.Title', 'Example s27'],
+ ['*graph.x.hide', false],
+ ['*graph.topMargin', 0],
+ ['*graph.bottomMargin', 0],
+ ['*x.Title', 'Time'],
+ ['*y.Title', 'Signals'],
+ ['*Pixels', 1],
+
+ ['*Reduce', 0.5],
+ ['*bufferElements', false],
+
+ ['*Element.color', 'green4'],
+ ['*Element.ScaleSymbols', true],
+ ['*Element.Color', 'grey70'],
+ ['*Element.Symbol', :none],
+ ['*Element.LineWidth', 1],
+ # ['*Element.Smooth', :natural],
+ ['*Element.Smooth', :catrom],
+
+ ['*activeLine.LineWidth', 2],
+ ['*activeLine.Color', 'white'],
+ ['*activeLine.Color', 'green1'],
+
+ # ['*Legend.Hide', true],
+ ['*Legend.Position', :right],
+ ['*Legend.Relief', :flat],
+ ['*Legend.activeRelief', :sunken],
+ ['*Legend.borderWidth', 2],
+ #['*Legend.Font', '-*-helvetica-medium-r-*-*-10-*-*-*-*-*-*-*'],
+ ['*Legend.Font', 'Helvetica -10'],
+ ['*Grid.hide', false],
+ ['*Grid.dashes', [1, 5]],
+
+ # ['*foreground', 'white'],
+ ['*zoomOutline.outline', 'yellow'],
].each{|k, v| TkOption.add(k, v)}
##############################
@@ -71,7 +71,7 @@ class BLT_Graph_Demo
@top = Tk::BLT::Tile::Toplevel.new
=begin
- legend = Tk::BLT::Graph.new(@top, :widgetname=>'legend',
+ legend = Tk::BLT::Graph.new(@top, :widgetname=>'legend',
:without_creating=>true)
@graph.legend_configure(:position=>legend)
=end
@@ -81,7 +81,7 @@ class BLT_Graph_Demo
Tk::BLT::Table.add(@root, @graph, [0,0], :fill=>:both)
- @quit_btn = Tk::BLT::Tile::Button.new(:text=>' quit ', :background=>'red',
+ @quit_btn = Tk::BLT::Tile::Button.new(:text=>' quit ', :background=>'red',
:command=>proc{exit})
Tk::BLT::Table.add(@root, @quit_btn, [1,0], :anchor=>:e, :padx=>10)
@@ -90,9 +90,9 @@ class BLT_Graph_Demo
@graph.closest_point
@graph.print_key
- @graph.legend_bind(:all, 'ButtonRelease-1',
+ @graph.legend_bind(:all, 'ButtonRelease-1',
proc{|w| highlightTrace(w)}, '%W')
- @graph.legend_bind(:all, 'ButtonRelease-3',
+ @graph.legend_bind(:all, 'ButtonRelease-3',
proc{|w|
w.legend_deactivate('*')
active = w.element_activate
@@ -108,2098 +108,2098 @@ class BLT_Graph_Demo
(1..39).each{|i| @v[i] = Tk::BLT::Vector.new(:variable=>'')}
@x.set(<<-'EOD')
- 0 1e-10 2e-10 3e-10 4e-10 5e-10 6e-10 7e-10 8e-10 9e-10
- 1e-09 1.1e-09 1.2e-09 1.3e-09 1.4e-09 1.5e-09 1.6e-09 1.7e-09
- 1.8e-09 1.9e-09 2e-09 2.1e-09 2.2e-09 2.3e-09 2.4e-09 2.5e-09
- 2.6e-09 2.7e-09 2.8e-09 2.9e-09 3e-09 3.1e-09 3.2e-09 3.3e-09
- 3.4e-09 3.5e-09 3.6e-09 3.7e-09 3.8e-09 3.9e-09 4e-09 4.1e-09
- 4.2e-09 4.3e-09 4.4e-09 4.5e-09 4.6e-09 4.7e-09 4.8e-09
- 4.9e-09 5e-09 5.1e-09 5.2e-09 5.3e-09 5.4e-09 5.5e-09 5.6e-09
- 5.7e-09 5.8e-09 5.9e-09 6e-09 6.1e-09 6.2e-09 6.3e-09 6.4e-09
- 6.5e-09 6.6e-09 6.7e-09 6.8e-09 6.9e-09 7e-09 7.1e-09 7.2e-09
- 7.3e-09 7.4e-09 7.5e-09 7.6e-09 7.7e-09 7.8e-09 7.9e-09
- 8e-09 8.1e-09 8.2e-09 8.3e-09 8.4e-09 8.5e-09 8.6e-09 8.7e-09
- 8.8e-09 8.9e-09 9e-09 9.1e-09 9.2e-09 9.3e-09 9.4e-09 9.5e-09
- 9.6e-09 9.7e-09 9.8e-09 9.9e-09 1e-08 1.01e-08 1.02e-08
- 1.03e-08 1.04e-08 1.05e-08 1.06e-08 1.07e-08 1.08e-08 1.09e-08
- 1.1e-08 1.11e-08 1.12e-08 1.13e-08 1.14e-08 1.15e-08 1.16e-08
- 1.17e-08 1.18e-08 1.19e-08 1.2e-08 1.21e-08 1.22e-08 1.23e-08
- 1.24e-08 1.25e-08 1.26e-08 1.27e-08 1.28e-08 1.29e-08 1.3e-08
- 1.31e-08 1.32e-08 1.33e-08 1.34e-08 1.35e-08 1.36e-08 1.37e-08
- 1.38e-08 1.39e-08 1.4e-08 1.41e-08 1.42e-08 1.43e-08 1.44e-08
- 1.45e-08 1.46e-08 1.47e-08 1.48e-08 1.49e-08 1.5e-08 1.51e-08
- 1.52e-08 1.53e-08 1.54e-08 1.55e-08 1.56e-08 1.57e-08 1.58e-08
- 1.59e-08 1.6e-08 1.61e-08 1.62e-08 1.63e-08 1.64e-08 1.65e-08
- 1.66e-08 1.67e-08 1.68e-08 1.69e-08 1.7e-08 1.71e-08 1.72e-08
- 1.73e-08 1.74e-08 1.75e-08 1.76e-08 1.77e-08 1.78e-08 1.79e-08
- 1.8e-08 1.81e-08 1.82e-08 1.83e-08 1.84e-08 1.85e-08 1.86e-08
- 1.87e-08 1.88e-08 1.89e-08 1.9e-08 1.91e-08 1.92e-08 1.93e-08
- 1.94e-08 1.95e-08 1.96e-08 1.97e-08 1.98e-08 1.99e-08 2e-08
- 2.01e-08 2.02e-08 2.03e-08 2.04e-08 2.05e-08 2.06e-08 2.07e-08
- 2.08e-08 2.09e-08 2.1e-08 2.11e-08 2.12e-08 2.13e-08 2.14e-08
- 2.15e-08 2.16e-08 2.17e-08 2.18e-08 2.19e-08 2.2e-08 2.21e-08
- 2.22e-08 2.23e-08 2.24e-08 2.25e-08 2.26e-08 2.27e-08 2.28e-08
- 2.29e-08 2.3e-08 2.31e-08 2.32e-08 2.33e-08 2.34e-08 2.35e-08
- 2.36e-08 2.37e-08 2.38e-08 2.39e-08 2.4e-08 2.41e-08 2.42e-08
- 2.43e-08 2.44e-08 2.45e-08 2.46e-08 2.47e-08 2.48e-08 2.49e-08
- 2.5e-08 2.51e-08 2.52e-08 2.53e-08 2.54e-08 2.55e-08 2.56e-08
- 2.57e-08 2.58e-08 2.59e-08 2.6e-08 2.61e-08 2.62e-08 2.63e-08
- 2.64e-08 2.65e-08 2.66e-08 2.67e-08 2.68e-08 2.69e-08 2.7e-08
- 2.71e-08 2.72e-08 2.73e-08 2.74e-08 2.75e-08 2.76e-08 2.77e-08
- 2.78e-08 2.79e-08 2.8e-08 2.81e-08 2.82e-08 2.83e-08 2.84e-08
- 2.85e-08 2.86e-08 2.87e-08 2.88e-08 2.89e-08 2.9e-08 2.91e-08
- 2.92e-08 2.93e-08 2.94e-08 2.95e-08 2.96e-08 2.97e-08 2.98e-08
- 2.99e-08 3e-08 3.01e-08 3.02e-08 3.03e-08 3.04e-08 3.05e-08
- 3.06e-08 3.07e-08 3.08e-08 3.09e-08 3.1e-08 3.11e-08 3.12e-08
- 3.13e-08 3.14e-08 3.15e-08 3.16e-08 3.17e-08 3.18e-08 3.19e-08
- 3.2e-08 3.21e-08 3.22e-08 3.23e-08 3.24e-08 3.25e-08 3.26e-08
- 3.27e-08 3.28e-08 3.29e-08 3.3e-08 3.31e-08 3.32e-08 3.33e-08
- 3.34e-08 3.35e-08 3.36e-08 3.37e-08 3.38e-08 3.39e-08 3.4e-08
- 3.41e-08 3.42e-08 3.43e-08 3.44e-08 3.45e-08 3.46e-08 3.47e-08
- 3.48e-08 3.49e-08 3.5e-08 3.51e-08 3.52e-08 3.53e-08 3.54e-08
- 3.55e-08 3.56e-08 3.57e-08 3.58e-08 3.59e-08 3.6e-08
+ 0 1e-10 2e-10 3e-10 4e-10 5e-10 6e-10 7e-10 8e-10 9e-10
+ 1e-09 1.1e-09 1.2e-09 1.3e-09 1.4e-09 1.5e-09 1.6e-09 1.7e-09
+ 1.8e-09 1.9e-09 2e-09 2.1e-09 2.2e-09 2.3e-09 2.4e-09 2.5e-09
+ 2.6e-09 2.7e-09 2.8e-09 2.9e-09 3e-09 3.1e-09 3.2e-09 3.3e-09
+ 3.4e-09 3.5e-09 3.6e-09 3.7e-09 3.8e-09 3.9e-09 4e-09 4.1e-09
+ 4.2e-09 4.3e-09 4.4e-09 4.5e-09 4.6e-09 4.7e-09 4.8e-09
+ 4.9e-09 5e-09 5.1e-09 5.2e-09 5.3e-09 5.4e-09 5.5e-09 5.6e-09
+ 5.7e-09 5.8e-09 5.9e-09 6e-09 6.1e-09 6.2e-09 6.3e-09 6.4e-09
+ 6.5e-09 6.6e-09 6.7e-09 6.8e-09 6.9e-09 7e-09 7.1e-09 7.2e-09
+ 7.3e-09 7.4e-09 7.5e-09 7.6e-09 7.7e-09 7.8e-09 7.9e-09
+ 8e-09 8.1e-09 8.2e-09 8.3e-09 8.4e-09 8.5e-09 8.6e-09 8.7e-09
+ 8.8e-09 8.9e-09 9e-09 9.1e-09 9.2e-09 9.3e-09 9.4e-09 9.5e-09
+ 9.6e-09 9.7e-09 9.8e-09 9.9e-09 1e-08 1.01e-08 1.02e-08
+ 1.03e-08 1.04e-08 1.05e-08 1.06e-08 1.07e-08 1.08e-08 1.09e-08
+ 1.1e-08 1.11e-08 1.12e-08 1.13e-08 1.14e-08 1.15e-08 1.16e-08
+ 1.17e-08 1.18e-08 1.19e-08 1.2e-08 1.21e-08 1.22e-08 1.23e-08
+ 1.24e-08 1.25e-08 1.26e-08 1.27e-08 1.28e-08 1.29e-08 1.3e-08
+ 1.31e-08 1.32e-08 1.33e-08 1.34e-08 1.35e-08 1.36e-08 1.37e-08
+ 1.38e-08 1.39e-08 1.4e-08 1.41e-08 1.42e-08 1.43e-08 1.44e-08
+ 1.45e-08 1.46e-08 1.47e-08 1.48e-08 1.49e-08 1.5e-08 1.51e-08
+ 1.52e-08 1.53e-08 1.54e-08 1.55e-08 1.56e-08 1.57e-08 1.58e-08
+ 1.59e-08 1.6e-08 1.61e-08 1.62e-08 1.63e-08 1.64e-08 1.65e-08
+ 1.66e-08 1.67e-08 1.68e-08 1.69e-08 1.7e-08 1.71e-08 1.72e-08
+ 1.73e-08 1.74e-08 1.75e-08 1.76e-08 1.77e-08 1.78e-08 1.79e-08
+ 1.8e-08 1.81e-08 1.82e-08 1.83e-08 1.84e-08 1.85e-08 1.86e-08
+ 1.87e-08 1.88e-08 1.89e-08 1.9e-08 1.91e-08 1.92e-08 1.93e-08
+ 1.94e-08 1.95e-08 1.96e-08 1.97e-08 1.98e-08 1.99e-08 2e-08
+ 2.01e-08 2.02e-08 2.03e-08 2.04e-08 2.05e-08 2.06e-08 2.07e-08
+ 2.08e-08 2.09e-08 2.1e-08 2.11e-08 2.12e-08 2.13e-08 2.14e-08
+ 2.15e-08 2.16e-08 2.17e-08 2.18e-08 2.19e-08 2.2e-08 2.21e-08
+ 2.22e-08 2.23e-08 2.24e-08 2.25e-08 2.26e-08 2.27e-08 2.28e-08
+ 2.29e-08 2.3e-08 2.31e-08 2.32e-08 2.33e-08 2.34e-08 2.35e-08
+ 2.36e-08 2.37e-08 2.38e-08 2.39e-08 2.4e-08 2.41e-08 2.42e-08
+ 2.43e-08 2.44e-08 2.45e-08 2.46e-08 2.47e-08 2.48e-08 2.49e-08
+ 2.5e-08 2.51e-08 2.52e-08 2.53e-08 2.54e-08 2.55e-08 2.56e-08
+ 2.57e-08 2.58e-08 2.59e-08 2.6e-08 2.61e-08 2.62e-08 2.63e-08
+ 2.64e-08 2.65e-08 2.66e-08 2.67e-08 2.68e-08 2.69e-08 2.7e-08
+ 2.71e-08 2.72e-08 2.73e-08 2.74e-08 2.75e-08 2.76e-08 2.77e-08
+ 2.78e-08 2.79e-08 2.8e-08 2.81e-08 2.82e-08 2.83e-08 2.84e-08
+ 2.85e-08 2.86e-08 2.87e-08 2.88e-08 2.89e-08 2.9e-08 2.91e-08
+ 2.92e-08 2.93e-08 2.94e-08 2.95e-08 2.96e-08 2.97e-08 2.98e-08
+ 2.99e-08 3e-08 3.01e-08 3.02e-08 3.03e-08 3.04e-08 3.05e-08
+ 3.06e-08 3.07e-08 3.08e-08 3.09e-08 3.1e-08 3.11e-08 3.12e-08
+ 3.13e-08 3.14e-08 3.15e-08 3.16e-08 3.17e-08 3.18e-08 3.19e-08
+ 3.2e-08 3.21e-08 3.22e-08 3.23e-08 3.24e-08 3.25e-08 3.26e-08
+ 3.27e-08 3.28e-08 3.29e-08 3.3e-08 3.31e-08 3.32e-08 3.33e-08
+ 3.34e-08 3.35e-08 3.36e-08 3.37e-08 3.38e-08 3.39e-08 3.4e-08
+ 3.41e-08 3.42e-08 3.43e-08 3.44e-08 3.45e-08 3.46e-08 3.47e-08
+ 3.48e-08 3.49e-08 3.5e-08 3.51e-08 3.52e-08 3.53e-08 3.54e-08
+ 3.55e-08 3.56e-08 3.57e-08 3.58e-08 3.59e-08 3.6e-08
EOD
@v[1].set(<<-'EOD')
- 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
- 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
- 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
- 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
- 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
- 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
- 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
- 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
- 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
- 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
- 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
- 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
- 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+ 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+ 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+ 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+ 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+ 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+ 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+ 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+ 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+ 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+ 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+ 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+ 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+ 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
EOD
@v[2].set(<<-'EOD')
- 0 1 2 3 4 5 5 5 5 5 5 5 5 5 5 5 4 3 2 1 0 0 0 0 0 0 0 0
- 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
- 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
- 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
- 0 0 0 0 0 0 0 0 0 1 2 3 4 5 5 5 5 5 5 5 5 5 5 5 4 3 2 1
- 5.32907e-15 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
- 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
- 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
- 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 2 3 4 5 5
- 5 5 5 5 5 5 5 5 5 4 3 2 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
- 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
- 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
- 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
- 0 0
+ 0 1 2 3 4 5 5 5 5 5 5 5 5 5 5 5 4 3 2 1 0 0 0 0 0 0 0 0
+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+ 0 0 0 0 0 0 0 0 0 1 2 3 4 5 5 5 5 5 5 5 5 5 5 5 4 3 2 1
+ 5.32907e-15 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 2 3 4 5 5
+ 5 5 5 5 5 5 5 5 5 4 3 2 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+ 0 0
EOD
@v[3].set(<<-'EOD')
- 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 4 3 2 1 8.88178e-16
- 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
- 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
- 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
- 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
- 0 0 0 1 2 3 4 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
- 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
- 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
- 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
- 5 5 5 5 5 5 5 5 5 5 5 4 3 2 1 2.13718e-14 0 0 0 0 0 0 0
- 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
- 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
- 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
- 0 0 0 0
+ 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 4 3 2 1 8.88178e-16
+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+ 0 0 0 1 2 3 4 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+ 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+ 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+ 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+ 5 5 5 5 5 5 5 5 5 5 5 4 3 2 1 2.13718e-14 0 0 0 0 0 0 0
+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+ 0 0 0 0
EOD
@v[4].set(<<-'EOD')
- 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 2 3 4 5 5 5
- 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
- 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
- 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
- 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
- 5 4 3 2 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
- 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
- 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
- 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
- 0 0 0 0 0 0 0 0 0 1 2 3 4 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
- 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
- 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
- 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 2 3 4 5 5 5
+ 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+ 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+ 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+ 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+ 5 4 3 2 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+ 0 0 0 0 0 0 0 0 0 1 2 3 4 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+ 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+ 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+ 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
EOD
@v[5].set(<<-'EOD')
- 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 2 3 4 5 5 5
- 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
- 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
- 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
- 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
- 5 4 3 2 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
- 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
- 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
- 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
- 0 0 0 0 0 0 0 0 0 1 2 3 4 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
- 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
- 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
- 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 2 3 4 5 5 5
+ 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+ 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+ 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+ 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+ 5 4 3 2 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+ 0 0 0 0 0 0 0 0 0 1 2 3 4 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+ 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+ 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+ 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
EOD
@v[6].set(<<-'EOD')
- 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 4 3 2 1 8.88178e-16
- 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
- 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
- 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
- 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
- 0 0 0 1 2 3 4 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
- 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
- 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
- 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
- 5 5 5 5 5 5 5 5 5 5 5 4 3 2 1 2.13718e-14 0 0 0 0 0 0 0
- 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
- 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
- 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
- 0 0 0 0
+ 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 4 3 2 1 8.88178e-16
+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+ 0 0 0 1 2 3 4 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+ 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+ 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+ 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+ 5 5 5 5 5 5 5 5 5 5 5 4 3 2 1 2.13718e-14 0 0 0 0 0 0 0
+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+ 0 0 0 0
EOD
@v[7].set(<<-'EOD')
- 5 5.16904 4.84159 3.34542 0.317102 0.103304 0.0275721 0.0221534
- 0.017689 0.0142639 0.0113974 0.00918238 0.00742541 0.00616602
- 0.00481195 0.00397049 -0.0659889 -0.025671 0.165495 0.986891
- 3.05229 4.55511 4.91611 4.98192 4.99428 4.99833 4.99095
- 4.97295 4.95493 4.93428 4.90723 4.94799 4.98584 4.99566
- 4.99813 4.99907 4.99947 4.99965 4.99976 4.99984 4.99989
- 4.99992 4.99994 4.99996 4.99998 5.00002 5.00006 5.00002
- 4.99996 4.99994 4.99999 5.00003 5.00002 5 4.99997 4.99997
- 4.99997 4.99997 4.99997 4.99996 4.99997 4.99997 4.99998
- 4.99998 4.99999 5 5 5 5 5 5 5.00001 5.00001 5.00001 5.00001
- 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
- 5.00001 5.00001 5 5 5 5 5 5 5 4.99999 4.99999 4.99999 4.99999
- 4.99999 4.99999 4.99998 4.99998 4.99998 4.99999 4.99999
- 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
- 4.99999 4.99999 4.99999 4.99999 4.99999 5 5 5 5 5 5 5 5.16575
- 4.69986 2.43862 0.0230224 0.035229 -0.0210607 -0.0292766
- -0.0172693 -0.00271479 -0.000912251 -0.000349106 -0.000116866
- -4.24733e-05 -1.39536e-05 -3.01179e-05 -0.0657192 -0.0204835
- 0.183378 1.07181 3.118 4.46472 4.84158 4.94795 4.98173 4.99236
- 4.99762 5.01939 5.0433 5.05332 5.04959 5.03955 5.02851 5.02052
- 5.01422 5.00965 5.00631 5.00405 5.00248 5.00083 5.00012
- 5.00209 5.00387 5.00347 4.99917 4.99213 4.98411 4.97521
- 4.96332 4.94601 4.9304 4.94633 4.97936 4.99264 4.99685 4.99857
- 4.99925 4.99954 4.9997 4.99973 4.9997 4.99973 4.99979 4.99983
- 4.99986 4.99988 4.9999 4.9999 4.99992 4.99993 4.99994 4.99995
- 4.99996 4.99996 4.99997 4.99997 4.99998 4.99998 4.99998
- 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
- 5 5 5 5.00001 5.00001 5.00001 5.00001 5.00002 5.00002 5.00002
- 5.00002 5.00001 5.00001 5.00001 5 5 5 5 5 5 5 5 4.99999
- 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
- 4.99999 4.99999 4.99999 5 5 5.14242 4.76101 3.16003 0.299374
- 0.0645506 -0.000498424 -2.45108e-05 -2.27986e-05 -5.24401e-05
- -4.9884e-05 -4.92491e-05 -2.93354e-05 -3.21402e-05 -2.11851e-05
- -3.37925e-05 -0.0657892 -0.020563 0.182582 1.06058 3.12484
- 4.46552 4.84146 4.95102 4.98556 4.99472 4.99806 4.99909
- 4.99955 4.99976 4.99994 4.99992 5.00029 4.99967 4.99849
- 4.99736 4.99884 5.00099 5.00377 5.00215 4.99994 4.99893
- 4.99788 4.99862 5.00055 5.00134 5.00127 5.00073 5.00039
- 5.00018 5.00006 5.00001 4.99985 5.00026 5.00018 5.00003
- 4.99981 4.99985 4.99987 4.99985 4.99982 4.99982 4.99982
- 4.99983 4.99985 4.99987 4.99989 4.99991 4.99992 4.99994
- 4.99995 4.99995 4.99994 4.99994 4.99996 4.99999 5.00002
- 5.00008 5.00009 5.00006 5.00001 5 4.99999 4.99998 4.99997
- 4.99996 4.99997 4.99997 4.99998 4.99998 4.99999 4.99999
- 4.99999 5 5 5 5 5.00001 5.00001 5.00001 5.00001 5.00001
- 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
- 5 5 5 5 5 4.99999 4.99999 4.99999 4.99999 4.99998 4.99998
- 4.99998
+ 5 5.16904 4.84159 3.34542 0.317102 0.103304 0.0275721 0.0221534
+ 0.017689 0.0142639 0.0113974 0.00918238 0.00742541 0.00616602
+ 0.00481195 0.00397049 -0.0659889 -0.025671 0.165495 0.986891
+ 3.05229 4.55511 4.91611 4.98192 4.99428 4.99833 4.99095
+ 4.97295 4.95493 4.93428 4.90723 4.94799 4.98584 4.99566
+ 4.99813 4.99907 4.99947 4.99965 4.99976 4.99984 4.99989
+ 4.99992 4.99994 4.99996 4.99998 5.00002 5.00006 5.00002
+ 4.99996 4.99994 4.99999 5.00003 5.00002 5 4.99997 4.99997
+ 4.99997 4.99997 4.99997 4.99996 4.99997 4.99997 4.99998
+ 4.99998 4.99999 5 5 5 5 5 5 5.00001 5.00001 5.00001 5.00001
+ 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
+ 5.00001 5.00001 5 5 5 5 5 5 5 4.99999 4.99999 4.99999 4.99999
+ 4.99999 4.99999 4.99998 4.99998 4.99998 4.99999 4.99999
+ 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
+ 4.99999 4.99999 4.99999 4.99999 4.99999 5 5 5 5 5 5 5 5.16575
+ 4.69986 2.43862 0.0230224 0.035229 -0.0210607 -0.0292766
+ -0.0172693 -0.00271479 -0.000912251 -0.000349106 -0.000116866
+ -4.24733e-05 -1.39536e-05 -3.01179e-05 -0.0657192 -0.0204835
+ 0.183378 1.07181 3.118 4.46472 4.84158 4.94795 4.98173 4.99236
+ 4.99762 5.01939 5.0433 5.05332 5.04959 5.03955 5.02851 5.02052
+ 5.01422 5.00965 5.00631 5.00405 5.00248 5.00083 5.00012
+ 5.00209 5.00387 5.00347 4.99917 4.99213 4.98411 4.97521
+ 4.96332 4.94601 4.9304 4.94633 4.97936 4.99264 4.99685 4.99857
+ 4.99925 4.99954 4.9997 4.99973 4.9997 4.99973 4.99979 4.99983
+ 4.99986 4.99988 4.9999 4.9999 4.99992 4.99993 4.99994 4.99995
+ 4.99996 4.99996 4.99997 4.99997 4.99998 4.99998 4.99998
+ 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
+ 5 5 5 5.00001 5.00001 5.00001 5.00001 5.00002 5.00002 5.00002
+ 5.00002 5.00001 5.00001 5.00001 5 5 5 5 5 5 5 5 4.99999
+ 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
+ 4.99999 4.99999 4.99999 5 5 5.14242 4.76101 3.16003 0.299374
+ 0.0645506 -0.000498424 -2.45108e-05 -2.27986e-05 -5.24401e-05
+ -4.9884e-05 -4.92491e-05 -2.93354e-05 -3.21402e-05 -2.11851e-05
+ -3.37925e-05 -0.0657892 -0.020563 0.182582 1.06058 3.12484
+ 4.46552 4.84146 4.95102 4.98556 4.99472 4.99806 4.99909
+ 4.99955 4.99976 4.99994 4.99992 5.00029 4.99967 4.99849
+ 4.99736 4.99884 5.00099 5.00377 5.00215 4.99994 4.99893
+ 4.99788 4.99862 5.00055 5.00134 5.00127 5.00073 5.00039
+ 5.00018 5.00006 5.00001 4.99985 5.00026 5.00018 5.00003
+ 4.99981 4.99985 4.99987 4.99985 4.99982 4.99982 4.99982
+ 4.99983 4.99985 4.99987 4.99989 4.99991 4.99992 4.99994
+ 4.99995 4.99995 4.99994 4.99994 4.99996 4.99999 5.00002
+ 5.00008 5.00009 5.00006 5.00001 5 4.99999 4.99998 4.99997
+ 4.99996 4.99997 4.99997 4.99998 4.99998 4.99999 4.99999
+ 4.99999 5 5 5 5 5.00001 5.00001 5.00001 5.00001 5.00001
+ 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
+ 5 5 5 5 5 4.99999 4.99999 4.99999 4.99999 4.99998 4.99998
+ 4.99998
EOD
@v[8].set(<<-'EOD')
- 5 5.03758 5.04711 4.96911 4.20882 3.96295 4.01117 4.15521
- 4.2967 4.42274 4.5295 4.6176 4.69014 4.74831 4.7966 4.83537
- 4.80526 4.787 4.79295 4.88588 5.08978 5.15615 5.10778 5.07718
- 5.06652 5.08225 4.9744 4.52977 3.77452 2.69426 1.15294 0.245509
- 0.0981544 0.0567527 0.0367487 0.0252578 0.0180599 0.0133837
- 0.0101497 0.0078616 0.00620186 0.00499056 0.0041027 0.00344223
- 0.00295808 0.00260089 0.00229887 0.00200817 0.00176397 0.00160116
- 0.00147381 0.00134645 0.00125029 0.00116043 0.00107371 0.00101981
- 0.000965921 0.000912028 0.000858135 0.000804242 0.000761669
- 0.00072672 0.000691771 0.000656823 0.000621874 0.000588722
- 0.00057041 0.000552098 0.000533785 0.000515473 0.000497162
- 0.00047885 0.000460537 0.000442226 0.000423914 0.000405601
- 0.000388399 0.000378694 0.000368989 0.000359284 0.00034958
- 0.000339875 0.00033017 0.000320465 0.00031076 0.000301055
- 0.00029135 0.000282207 0.000276247 0.000270287 0.000264327
- 0.000258367 0.000252407 0.000246447 0.000240487 0.000234527
- 0.000228567 0.000222607 0.000217086 0.000213696 0.000210307
- 0.000206918 0.000203528 0.000200139 0.00019675 0.00019336
- 0.000189971 0.000186582 0.000183192 0.000179803 0.000176414
- 0.000173025 0.000169635 0.000166246 0.000162857 0.000159467
- 0.000156078 0.000152689 0.000149299 0.00014591 0.00014255
- 0.0316021 0.163272 0.348732 0.603651 0.35745 0.135965 0.0707354
- 0.0314595 0.0201047 0.00994945 0.00389601 0.00138839 0.00060778
- 0.000329648 0.000492396 -0.0732035 -0.0844077 -0.0789062
- -0.0390837 0.0197559 0.0183094 -0.00180099 -0.0189565 -0.0424144
- -0.0735904 -0.0892423 0.285039 1.13702 2.10809 2.95826 3.60164
- 4.0435 4.35771 4.57254 4.71769 4.81329 4.87534 4.91487 4.94264
- 4.97375 5.01526 5.06517 5.10154 5.06259 4.89005 4.5787 4.12226
- 3.46151 2.49023 1.2586 0.32725 0.116753 0.0701865 0.0455509
- 0.0286914 0.0178176 0.0117599 0.00902715 0.00760583 0.00637745
- 0.00543811 0.00439377 0.00352448 0.0030151 0.00285771 0.002465
- 0.00203114 0.00173004 0.0014839 0.00125177 0.00105327 0.000894905
- 0.000766372 0.000658894 0.000569105 0.000492114 0.000427938
- 0.000370217 0.000314758 0.000266569 0.000233726 0.000209048
- 0.000191957 0.000177169 0.000166604 0.000161 0.000157314
- 0.000143828 0.000130342 0.000116857 0.000103371 8.98855e-05
- 7.63998e-05 6.29141e-05 5.76583e-05 5.30027e-05 4.8347e-05
- 4.36913e-05 3.90357e-05 3.438e-05 2.97243e-05 2.72507e-05
- 2.59083e-05 2.45659e-05 2.32235e-05 2.18811e-05 2.05387e-05
- 1.91963e-05 1.78539e-05 1.65115e-05 1.51691e-05 1.38267e-05
- 1.24843e-05 1.11419e-05 9.79954e-06 8.51574e-06 7.69807e-06
- 6.8804e-06 6.06273e-06 5.24506e-06 0.0287318 0.0317111 -0.0320087
- -0.103609 0.0369639 0.0121128 0.00961197 0.00934971 0.00820853
- 0.00699769 0.00607002 0.00535541 0.00476552 0.00427601 0.00376357
- -0.073012 -0.0866964 -0.0809538 -0.038005 0.0277001 0.0188906
- 0.00614597 0.00373629 0.00489787 0.0146573 0.0191052 0.0151708
- 0.0124224 0.0105859 0.00879272 0.00729464 0.0070047 0.00449575
- -0.00626652 -0.0252417 -0.0147287 0.022538 0.0822905 0.0947372
- 0.0657516 0.0445506 0.0316753 0.0220971 0.0158101 0.0140971
- 0.0161498 0.0139876 0.0122447 0.0106994 0.009397 0.00822236
- 0.00686509 0.00797431 0.00751269 0.00671173 0.00595243 0.00524633
- 0.00459528 0.00401688 0.00350109 0.00303954 0.00260569 0.00222792
- 0.00191033 0.00163917 0.00140949 0.00121464 0.0010471 0.000900638
- 0.000768847 0.000645236 0.000524807 0.000460275 0.000442237
- 0.000446775 0.000397026 0.000301585 0.000228994 0.000190894
- 0.000166569 0.000152261 0.000137953 0.000123644 0.000109336
- 9.50281e-05 8.56557e-05 7.78437e-05 7.00318e-05 6.22198e-05
- 5.44079e-05 4.87539e-05 4.57761e-05 4.27982e-05 3.98203e-05
- 3.68425e-05 3.38646e-05 3.08868e-05 2.79089e-05 2.4931e-05
- 2.19532e-05 1.89753e-05 1.75244e-05 1.64095e-05 1.52946e-05
- 1.41797e-05 1.30648e-05 1.19499e-05 1.0835e-05 9.72011e-06
- 8.60521e-06 7.4903e-06 6.5117e-06 6.10334e-06 5.69497e-06
- 5.2866e-06 4.87824e-06 4.46987e-06 4.06151e-06 3.65314e-06
- 3.24477e-06
+ 5 5.03758 5.04711 4.96911 4.20882 3.96295 4.01117 4.15521
+ 4.2967 4.42274 4.5295 4.6176 4.69014 4.74831 4.7966 4.83537
+ 4.80526 4.787 4.79295 4.88588 5.08978 5.15615 5.10778 5.07718
+ 5.06652 5.08225 4.9744 4.52977 3.77452 2.69426 1.15294 0.245509
+ 0.0981544 0.0567527 0.0367487 0.0252578 0.0180599 0.0133837
+ 0.0101497 0.0078616 0.00620186 0.00499056 0.0041027 0.00344223
+ 0.00295808 0.00260089 0.00229887 0.00200817 0.00176397 0.00160116
+ 0.00147381 0.00134645 0.00125029 0.00116043 0.00107371 0.00101981
+ 0.000965921 0.000912028 0.000858135 0.000804242 0.000761669
+ 0.00072672 0.000691771 0.000656823 0.000621874 0.000588722
+ 0.00057041 0.000552098 0.000533785 0.000515473 0.000497162
+ 0.00047885 0.000460537 0.000442226 0.000423914 0.000405601
+ 0.000388399 0.000378694 0.000368989 0.000359284 0.00034958
+ 0.000339875 0.00033017 0.000320465 0.00031076 0.000301055
+ 0.00029135 0.000282207 0.000276247 0.000270287 0.000264327
+ 0.000258367 0.000252407 0.000246447 0.000240487 0.000234527
+ 0.000228567 0.000222607 0.000217086 0.000213696 0.000210307
+ 0.000206918 0.000203528 0.000200139 0.00019675 0.00019336
+ 0.000189971 0.000186582 0.000183192 0.000179803 0.000176414
+ 0.000173025 0.000169635 0.000166246 0.000162857 0.000159467
+ 0.000156078 0.000152689 0.000149299 0.00014591 0.00014255
+ 0.0316021 0.163272 0.348732 0.603651 0.35745 0.135965 0.0707354
+ 0.0314595 0.0201047 0.00994945 0.00389601 0.00138839 0.00060778
+ 0.000329648 0.000492396 -0.0732035 -0.0844077 -0.0789062
+ -0.0390837 0.0197559 0.0183094 -0.00180099 -0.0189565 -0.0424144
+ -0.0735904 -0.0892423 0.285039 1.13702 2.10809 2.95826 3.60164
+ 4.0435 4.35771 4.57254 4.71769 4.81329 4.87534 4.91487 4.94264
+ 4.97375 5.01526 5.06517 5.10154 5.06259 4.89005 4.5787 4.12226
+ 3.46151 2.49023 1.2586 0.32725 0.116753 0.0701865 0.0455509
+ 0.0286914 0.0178176 0.0117599 0.00902715 0.00760583 0.00637745
+ 0.00543811 0.00439377 0.00352448 0.0030151 0.00285771 0.002465
+ 0.00203114 0.00173004 0.0014839 0.00125177 0.00105327 0.000894905
+ 0.000766372 0.000658894 0.000569105 0.000492114 0.000427938
+ 0.000370217 0.000314758 0.000266569 0.000233726 0.000209048
+ 0.000191957 0.000177169 0.000166604 0.000161 0.000157314
+ 0.000143828 0.000130342 0.000116857 0.000103371 8.98855e-05
+ 7.63998e-05 6.29141e-05 5.76583e-05 5.30027e-05 4.8347e-05
+ 4.36913e-05 3.90357e-05 3.438e-05 2.97243e-05 2.72507e-05
+ 2.59083e-05 2.45659e-05 2.32235e-05 2.18811e-05 2.05387e-05
+ 1.91963e-05 1.78539e-05 1.65115e-05 1.51691e-05 1.38267e-05
+ 1.24843e-05 1.11419e-05 9.79954e-06 8.51574e-06 7.69807e-06
+ 6.8804e-06 6.06273e-06 5.24506e-06 0.0287318 0.0317111 -0.0320087
+ -0.103609 0.0369639 0.0121128 0.00961197 0.00934971 0.00820853
+ 0.00699769 0.00607002 0.00535541 0.00476552 0.00427601 0.00376357
+ -0.073012 -0.0866964 -0.0809538 -0.038005 0.0277001 0.0188906
+ 0.00614597 0.00373629 0.00489787 0.0146573 0.0191052 0.0151708
+ 0.0124224 0.0105859 0.00879272 0.00729464 0.0070047 0.00449575
+ -0.00626652 -0.0252417 -0.0147287 0.022538 0.0822905 0.0947372
+ 0.0657516 0.0445506 0.0316753 0.0220971 0.0158101 0.0140971
+ 0.0161498 0.0139876 0.0122447 0.0106994 0.009397 0.00822236
+ 0.00686509 0.00797431 0.00751269 0.00671173 0.00595243 0.00524633
+ 0.00459528 0.00401688 0.00350109 0.00303954 0.00260569 0.00222792
+ 0.00191033 0.00163917 0.00140949 0.00121464 0.0010471 0.000900638
+ 0.000768847 0.000645236 0.000524807 0.000460275 0.000442237
+ 0.000446775 0.000397026 0.000301585 0.000228994 0.000190894
+ 0.000166569 0.000152261 0.000137953 0.000123644 0.000109336
+ 9.50281e-05 8.56557e-05 7.78437e-05 7.00318e-05 6.22198e-05
+ 5.44079e-05 4.87539e-05 4.57761e-05 4.27982e-05 3.98203e-05
+ 3.68425e-05 3.38646e-05 3.08868e-05 2.79089e-05 2.4931e-05
+ 2.19532e-05 1.89753e-05 1.75244e-05 1.64095e-05 1.52946e-05
+ 1.41797e-05 1.30648e-05 1.19499e-05 1.0835e-05 9.72011e-06
+ 8.60521e-06 7.4903e-06 6.5117e-06 6.10334e-06 5.69497e-06
+ 5.2866e-06 4.87824e-06 4.46987e-06 4.06151e-06 3.65314e-06
+ 3.24477e-06
EOD
@v[9].set(<<-'EOD')
- 1.86175 1.99708 2.07867 2.01211 2.43309 3.27194 3.63896
- 3.90426 4.11074 4.27932 4.41496 4.52543 4.61491 4.68862
- 4.7479 4.79666 4.72895 4.68886 4.70354 4.81353 5.01568 5.14184
- 5.10482 5.07362 5.05143 5.03638 5.02323 5.01465 5.00853
- 5.00383 4.99985 5.00454 5.00652 5.00546 5.00411 5.003 5.00214
- 5.00151 5.00106 5.00073 5.0005 5.00034 5.00023 5.00015 5.0001
- 5.00005 5 5.00001 5.00005 5.00005 5.00003 5 4.99998 4.99996
- 4.99994 4.99995 4.99997 4.99998 5 5.00001 5.00002 5.00002
- 5.00003 5.00003 5.00003 5.00003 5.00003 5.00003 5.00002
- 5.00002 5.00001 5.00001 5.00001 5 5 5 4.99999 4.99999 4.99999
- 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99998
- 4.99998 4.99998 4.99999 4.99999 4.99999 4.99999 5 5 5 5
- 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
- 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
- 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
- 5.00001 5.00001 5.00001 5.00001 5.17392 4.94828 3.78491
- 1.52079 0.608874 0.244031 0.127087 0.0552995 0.0361032 0.0169025
- 0.006364 0.00217624 0.000921391 0.000457305 0.000786754
- -0.120016 -0.148054 -0.15898 -0.0801463 0.16463 0.174017
- 0.0799249 0.0318788 0.0129696 0.00483397 0.0025677 0.0042079
- 0.00350003 0.00178404 -8.72902e-05 -0.00128497 -0.00142213
- -0.00130018 -0.00106874 -0.000789207 -0.000824335 -0.00104518
- -0.00136799 -0.004366 -0.0102621 -0.0109254 -0.00649259
- -0.00194842 0.00029793 0.00148673 0.00221085 0.00228291
- 0.00185261 0.00139687 0.00148183 0.00562266 0.00844119 0.00754627
- 0.00657396 0.00591212 0.00539269 0.0049282 0.00448417 0.0040572
- 0.00363719 0.00320392 0.00279607 0.00243938 0.00211505 0.00182302
- 0.00156254 0.0013341 0.00113834 0.000971865 0.00082776 0.000706193
- 0.000602499 0.000515059 0.000441401 0.00037897 0.000325459
- 0.00028083 0.000242096 0.000207274 0.000176444 0.000150372
- 0.000126407 0.000103373 9.05522e-05 8.53555e-05 8.63685e-05
- 9.02593e-05 8.37346e-05 7.72099e-05 7.06852e-05 6.41605e-05
- 5.76358e-05 5.11112e-05 4.45865e-05 4.08176e-05 3.72497e-05
- 3.36818e-05 3.01138e-05 2.65459e-05 2.2978e-05 1.94101e-05
- 1.76154e-05 1.67399e-05 1.58645e-05 1.4989e-05 1.41136e-05
- 1.32381e-05 1.23626e-05 1.14872e-05 1.06117e-05 9.73629e-06
- 8.86083e-06 7.98538e-06 7.10993e-06 6.23447e-06 5.44363e-06
- 5.32578e-06 5.20792e-06 5.09007e-06 4.97222e-06 0.0784323
- 0.0474527 -0.0764232 -0.151146 0.0615785 0.0144489 0.00974161
- 0.00947176 0.00849005 0.00728201 0.00630581 0.00554032 0.00487809
- 0.00441504 0.00384139 -0.118943 -0.149894 -0.161173 -0.0825299
- 0.171686 0.176912 0.0816085 0.0335236 0.013791 0.0056976
- 0.00238833 0.00105348 0.000526199 0.00025969 0.000396026
- 0.000837835 0.00170131 0.00196699 -0.000553314 -0.0061621
- -0.0111895 -0.0142698 -0.0124608 -0.00795847 -0.00467822
- -0.0043058 -0.00874449 -0.0118584 -0.00871386 -0.00377892
- 1.95244e-05 0.00218952 0.00325486 0.00386497 0.00422837
- 0.00446883 0.00447065 0.00486647 0.00547838 0.00565398 0.00559092
- 0.00538752 0.00507015 0.00466305 0.00420756 0.00373465 0.00328404
- 0.00287059 0.00250057 0.00216124 0.00184861 0.00156815 0.00134624
- 0.00117857 0.00103412 0.0008948 0.000761012 0.000619853
- 0.000462614 0.000319965 0.000287666 0.000356415 0.000379946
- 0.000339183 0.00027972 0.000252982 0.000226244 0.000199507
- 0.000172769 0.000146031 0.000130097 0.000117578 0.000105059
- 9.25401e-05 8.00213e-05 7.11204e-05 6.67061e-05 6.22918e-05
- 5.78775e-05 5.34632e-05 4.90489e-05 4.46346e-05 4.02203e-05
- 3.5806e-05 3.13916e-05 2.69773e-05 2.4827e-05 2.31747e-05
- 2.15225e-05 1.98702e-05 1.8218e-05 1.65658e-05 1.49135e-05
- 1.32613e-05 1.1609e-05 9.95678e-06 8.50108e-06 7.86765e-06
- 7.23422e-06 6.60079e-06 5.96736e-06 5.33393e-06 4.7005e-06
- 4.06707e-06 3.43363e-06
+ 1.86175 1.99708 2.07867 2.01211 2.43309 3.27194 3.63896
+ 3.90426 4.11074 4.27932 4.41496 4.52543 4.61491 4.68862
+ 4.7479 4.79666 4.72895 4.68886 4.70354 4.81353 5.01568 5.14184
+ 5.10482 5.07362 5.05143 5.03638 5.02323 5.01465 5.00853
+ 5.00383 4.99985 5.00454 5.00652 5.00546 5.00411 5.003 5.00214
+ 5.00151 5.00106 5.00073 5.0005 5.00034 5.00023 5.00015 5.0001
+ 5.00005 5 5.00001 5.00005 5.00005 5.00003 5 4.99998 4.99996
+ 4.99994 4.99995 4.99997 4.99998 5 5.00001 5.00002 5.00002
+ 5.00003 5.00003 5.00003 5.00003 5.00003 5.00003 5.00002
+ 5.00002 5.00001 5.00001 5.00001 5 5 5 4.99999 4.99999 4.99999
+ 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99998
+ 4.99998 4.99998 4.99999 4.99999 4.99999 4.99999 5 5 5 5
+ 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
+ 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
+ 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
+ 5.00001 5.00001 5.00001 5.00001 5.17392 4.94828 3.78491
+ 1.52079 0.608874 0.244031 0.127087 0.0552995 0.0361032 0.0169025
+ 0.006364 0.00217624 0.000921391 0.000457305 0.000786754
+ -0.120016 -0.148054 -0.15898 -0.0801463 0.16463 0.174017
+ 0.0799249 0.0318788 0.0129696 0.00483397 0.0025677 0.0042079
+ 0.00350003 0.00178404 -8.72902e-05 -0.00128497 -0.00142213
+ -0.00130018 -0.00106874 -0.000789207 -0.000824335 -0.00104518
+ -0.00136799 -0.004366 -0.0102621 -0.0109254 -0.00649259
+ -0.00194842 0.00029793 0.00148673 0.00221085 0.00228291
+ 0.00185261 0.00139687 0.00148183 0.00562266 0.00844119 0.00754627
+ 0.00657396 0.00591212 0.00539269 0.0049282 0.00448417 0.0040572
+ 0.00363719 0.00320392 0.00279607 0.00243938 0.00211505 0.00182302
+ 0.00156254 0.0013341 0.00113834 0.000971865 0.00082776 0.000706193
+ 0.000602499 0.000515059 0.000441401 0.00037897 0.000325459
+ 0.00028083 0.000242096 0.000207274 0.000176444 0.000150372
+ 0.000126407 0.000103373 9.05522e-05 8.53555e-05 8.63685e-05
+ 9.02593e-05 8.37346e-05 7.72099e-05 7.06852e-05 6.41605e-05
+ 5.76358e-05 5.11112e-05 4.45865e-05 4.08176e-05 3.72497e-05
+ 3.36818e-05 3.01138e-05 2.65459e-05 2.2978e-05 1.94101e-05
+ 1.76154e-05 1.67399e-05 1.58645e-05 1.4989e-05 1.41136e-05
+ 1.32381e-05 1.23626e-05 1.14872e-05 1.06117e-05 9.73629e-06
+ 8.86083e-06 7.98538e-06 7.10993e-06 6.23447e-06 5.44363e-06
+ 5.32578e-06 5.20792e-06 5.09007e-06 4.97222e-06 0.0784323
+ 0.0474527 -0.0764232 -0.151146 0.0615785 0.0144489 0.00974161
+ 0.00947176 0.00849005 0.00728201 0.00630581 0.00554032 0.00487809
+ 0.00441504 0.00384139 -0.118943 -0.149894 -0.161173 -0.0825299
+ 0.171686 0.176912 0.0816085 0.0335236 0.013791 0.0056976
+ 0.00238833 0.00105348 0.000526199 0.00025969 0.000396026
+ 0.000837835 0.00170131 0.00196699 -0.000553314 -0.0061621
+ -0.0111895 -0.0142698 -0.0124608 -0.00795847 -0.00467822
+ -0.0043058 -0.00874449 -0.0118584 -0.00871386 -0.00377892
+ 1.95244e-05 0.00218952 0.00325486 0.00386497 0.00422837
+ 0.00446883 0.00447065 0.00486647 0.00547838 0.00565398 0.00559092
+ 0.00538752 0.00507015 0.00466305 0.00420756 0.00373465 0.00328404
+ 0.00287059 0.00250057 0.00216124 0.00184861 0.00156815 0.00134624
+ 0.00117857 0.00103412 0.0008948 0.000761012 0.000619853
+ 0.000462614 0.000319965 0.000287666 0.000356415 0.000379946
+ 0.000339183 0.00027972 0.000252982 0.000226244 0.000199507
+ 0.000172769 0.000146031 0.000130097 0.000117578 0.000105059
+ 9.25401e-05 8.00213e-05 7.11204e-05 6.67061e-05 6.22918e-05
+ 5.78775e-05 5.34632e-05 4.90489e-05 4.46346e-05 4.02203e-05
+ 3.5806e-05 3.13916e-05 2.69773e-05 2.4827e-05 2.31747e-05
+ 2.15225e-05 1.98702e-05 1.8218e-05 1.65658e-05 1.49135e-05
+ 1.32613e-05 1.1609e-05 9.95678e-06 8.50108e-06 7.86765e-06
+ 7.23422e-06 6.60079e-06 5.96736e-06 5.33393e-06 4.7005e-06
+ 4.06707e-06 3.43363e-06
EOD
@v[10].set(<<-'EOD')
- 1.86175 1.99308 2.16619 2.46661 3.09359 3.76864 4.31299
- 4.65564 4.83425 4.92153 4.96157 4.98063 4.98649 4.99039
- 4.9945 4.9972 4.96206 4.89882 4.83865 4.83202 4.91016 5.04479
- 5.06078 5.04827 5.03474 5.0246 5.01639 5.00996 5.00569 5.00239
- 5.00043 5.00296 5.00437 5.00382 5.00287 5.00208 5.00148
- 5.00104 5.00073 5.0005 5.00034 5.00023 5.00016 5.00011 5.00008
- 5.00007 5.00007 5.00004 5 4.99998 4.99998 4.99997 4.99998
- 4.99999 5 5 5.00001 5.00001 5.00001 5.00002 5.00002 5.00001
- 5.00001 5.00001 5.00001 5 5 5 5 5 5 4.99999 4.99999 4.99999
- 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
- 4.99999 4.99999 5 5 5 5 5 5 5 5 5 5.00001 5.00001 5.00001
- 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
- 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
- 5.00001 5.00001 5.00001 5.00001 5 5 5 5 5 5 5 5 5.10081
- 5.10949 4.98359 5.00733 5.15145 4.37298 2.36126 0.470759
- 0.0577238 0.0115884 0.00262611 0.000671499 0.000389038 0.000291291
- 0.000317347 -0.0167823 -0.0158344 -0.0140559 0.0104849 0.0865874
- 0.107813 0.0524688 0.0214369 0.00876443 0.00341595 0.00170778
- 0.00259042 0.0022241 0.00118519 1.10217e-06 -0.000784506
- -0.000948169 -0.000856256 -0.000696719 -0.000485987 -0.000724787
- -0.000981491 -0.001454 -0.00552498 -0.0114992 -0.0105266
- -0.00543527 -0.000982798 0.00127356 0.00224212 0.00275439
- 0.00281098 0.0025471 0.00230368 0.00222576 0.00485522 0.00729453
- 0.00691796 0.0062615 0.00573987 0.0052688 0.00481185 0.00436934
- 0.00394326 0.00352712 0.00309978 0.00270038 0.00235335 0.00203742
- 0.00175256 0.00150067 0.00128126 0.00109323 0.000933619
- 0.000795113 0.000678182 0.00057843 0.000494345 0.000423609
- 0.000363821 0.000312766 0.000269856 0.000232389 0.000198382
- 0.000168126 0.00014267 0.000119293 9.69034e-05 8.5669e-05
- 8.26828e-05 8.64066e-05 9.26665e-05 8.5454e-05 7.82416e-05
- 7.10291e-05 6.38167e-05 5.66043e-05 4.93918e-05 4.21794e-05
- 3.86073e-05 3.53007e-05 3.19941e-05 2.86876e-05 2.5381e-05
- 2.20744e-05 1.87678e-05 1.70933e-05 1.62648e-05 1.54363e-05
- 1.46079e-05 1.37794e-05 1.2951e-05 1.21225e-05 1.12941e-05
- 1.04656e-05 9.63716e-06 8.80871e-06 7.98026e-06 7.1518e-06
- 6.32335e-06 5.5374e-06 5.08959e-06 4.64178e-06 4.19397e-06
- 3.74616e-06 0.0438026 0.0242078 -0.0602019 -0.0840866 0.00148461
- -0.00292489 0.000442098 0.00219489 0.00281478 0.00290756
- 0.00277945 0.00263896 0.00240099 0.00223283 0.001947 -0.0153629
- -0.0148815 -0.0128673 0.0126017 0.0905161 0.11051 0.0538958
- 0.022562 0.00935726 0.00397422 0.00172534 0.000790207 0.000416322
- 0.000191632 0.000469721 0.0009779 0.00192566 0.00200688
- -0.0016502 -0.00733932 -0.0128113 -0.0147608 -0.0115456
- -0.00668995 -0.00401368 -0.00463908 -0.0101197 -0.0118993
- -0.0076276 -0.00262656 0.000813059 0.00264455 0.00350796
- 0.00399494 0.0043049 0.00451658 0.00444739 0.00503842 0.00559516
- 0.00568213 0.00556459 0.0053176 0.00496654 0.00454337 0.00408592
- 0.00362171 0.00317793 0.00277001 0.00240394 0.00207009 0.00176575
- 0.00149725 0.00129045 0.00114257 0.00101135 0.000871672
- 0.000723764 0.000580438 0.000427507 0.000296956 0.000281834
- 0.000376628 0.000412266 0.000367547 0.000295305 0.000264513
- 0.000233721 0.000202929 0.000172137 0.000141345 0.000124721
- 0.000112577 0.000100433 8.82893e-05 7.61453e-05 6.75517e-05
- 6.33609e-05 5.91701e-05 5.49792e-05 5.07884e-05 4.65976e-05
- 4.24067e-05 3.82159e-05 3.40251e-05 2.98342e-05 2.56434e-05
- 2.36401e-05 2.21181e-05 2.05961e-05 1.90741e-05 1.75521e-05
- 1.60301e-05 1.45081e-05 1.29861e-05 1.14641e-05 9.94208e-06
- 8.59252e-06 7.96439e-06 7.33626e-06 6.70813e-06 6.07999e-06
- 5.45186e-06 4.82373e-06 4.1956e-06 3.56747e-06
+ 1.86175 1.99308 2.16619 2.46661 3.09359 3.76864 4.31299
+ 4.65564 4.83425 4.92153 4.96157 4.98063 4.98649 4.99039
+ 4.9945 4.9972 4.96206 4.89882 4.83865 4.83202 4.91016 5.04479
+ 5.06078 5.04827 5.03474 5.0246 5.01639 5.00996 5.00569 5.00239
+ 5.00043 5.00296 5.00437 5.00382 5.00287 5.00208 5.00148
+ 5.00104 5.00073 5.0005 5.00034 5.00023 5.00016 5.00011 5.00008
+ 5.00007 5.00007 5.00004 5 4.99998 4.99998 4.99997 4.99998
+ 4.99999 5 5 5.00001 5.00001 5.00001 5.00002 5.00002 5.00001
+ 5.00001 5.00001 5.00001 5 5 5 5 5 5 4.99999 4.99999 4.99999
+ 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
+ 4.99999 4.99999 5 5 5 5 5 5 5 5 5 5.00001 5.00001 5.00001
+ 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
+ 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
+ 5.00001 5.00001 5.00001 5.00001 5 5 5 5 5 5 5 5 5.10081
+ 5.10949 4.98359 5.00733 5.15145 4.37298 2.36126 0.470759
+ 0.0577238 0.0115884 0.00262611 0.000671499 0.000389038 0.000291291
+ 0.000317347 -0.0167823 -0.0158344 -0.0140559 0.0104849 0.0865874
+ 0.107813 0.0524688 0.0214369 0.00876443 0.00341595 0.00170778
+ 0.00259042 0.0022241 0.00118519 1.10217e-06 -0.000784506
+ -0.000948169 -0.000856256 -0.000696719 -0.000485987 -0.000724787
+ -0.000981491 -0.001454 -0.00552498 -0.0114992 -0.0105266
+ -0.00543527 -0.000982798 0.00127356 0.00224212 0.00275439
+ 0.00281098 0.0025471 0.00230368 0.00222576 0.00485522 0.00729453
+ 0.00691796 0.0062615 0.00573987 0.0052688 0.00481185 0.00436934
+ 0.00394326 0.00352712 0.00309978 0.00270038 0.00235335 0.00203742
+ 0.00175256 0.00150067 0.00128126 0.00109323 0.000933619
+ 0.000795113 0.000678182 0.00057843 0.000494345 0.000423609
+ 0.000363821 0.000312766 0.000269856 0.000232389 0.000198382
+ 0.000168126 0.00014267 0.000119293 9.69034e-05 8.5669e-05
+ 8.26828e-05 8.64066e-05 9.26665e-05 8.5454e-05 7.82416e-05
+ 7.10291e-05 6.38167e-05 5.66043e-05 4.93918e-05 4.21794e-05
+ 3.86073e-05 3.53007e-05 3.19941e-05 2.86876e-05 2.5381e-05
+ 2.20744e-05 1.87678e-05 1.70933e-05 1.62648e-05 1.54363e-05
+ 1.46079e-05 1.37794e-05 1.2951e-05 1.21225e-05 1.12941e-05
+ 1.04656e-05 9.63716e-06 8.80871e-06 7.98026e-06 7.1518e-06
+ 6.32335e-06 5.5374e-06 5.08959e-06 4.64178e-06 4.19397e-06
+ 3.74616e-06 0.0438026 0.0242078 -0.0602019 -0.0840866 0.00148461
+ -0.00292489 0.000442098 0.00219489 0.00281478 0.00290756
+ 0.00277945 0.00263896 0.00240099 0.00223283 0.001947 -0.0153629
+ -0.0148815 -0.0128673 0.0126017 0.0905161 0.11051 0.0538958
+ 0.022562 0.00935726 0.00397422 0.00172534 0.000790207 0.000416322
+ 0.000191632 0.000469721 0.0009779 0.00192566 0.00200688
+ -0.0016502 -0.00733932 -0.0128113 -0.0147608 -0.0115456
+ -0.00668995 -0.00401368 -0.00463908 -0.0101197 -0.0118993
+ -0.0076276 -0.00262656 0.000813059 0.00264455 0.00350796
+ 0.00399494 0.0043049 0.00451658 0.00444739 0.00503842 0.00559516
+ 0.00568213 0.00556459 0.0053176 0.00496654 0.00454337 0.00408592
+ 0.00362171 0.00317793 0.00277001 0.00240394 0.00207009 0.00176575
+ 0.00149725 0.00129045 0.00114257 0.00101135 0.000871672
+ 0.000723764 0.000580438 0.000427507 0.000296956 0.000281834
+ 0.000376628 0.000412266 0.000367547 0.000295305 0.000264513
+ 0.000233721 0.000202929 0.000172137 0.000141345 0.000124721
+ 0.000112577 0.000100433 8.82893e-05 7.61453e-05 6.75517e-05
+ 6.33609e-05 5.91701e-05 5.49792e-05 5.07884e-05 4.65976e-05
+ 4.24067e-05 3.82159e-05 3.40251e-05 2.98342e-05 2.56434e-05
+ 2.36401e-05 2.21181e-05 2.05961e-05 1.90741e-05 1.75521e-05
+ 1.60301e-05 1.45081e-05 1.29861e-05 1.14641e-05 9.94208e-06
+ 8.59252e-06 7.96439e-06 7.33626e-06 6.70813e-06 6.07999e-06
+ 5.45186e-06 4.82373e-06 4.1956e-06 3.56747e-06
EOD
@v[11].set(<<-'EOD')
- 1.86175 1.73419 1.42874 1.04055 0.943004 0.268275 0.0826455
- 0.0388346 0.0214104 0.0135431 0.00961322 0.00712846 0.00588262
- 0.00432397 0.00377774 0.00270134 -0.00393731 -0.00542187
- -0.00126596 0.0113777 0.0134522 0.00477056 -0.00211067 -0.00229253
- -0.00173355 -0.00122404 -0.00113426 -0.000744931 -0.000520112
- -0.000410048 -0.000220439 0.000508104 5.15856e-05 -0.000112593
- -0.000118917 -9.57394e-05 -7.15727e-05 -5.11847e-05 -3.58275e-05
- -2.47166e-05 -1.68866e-05 -1.14082e-05 -7.66646e-06 -5.12139e-06
- -3.63426e-06 -3.01815e-06 -2.64862e-06 -1.4947e-06 -1.91403e-07
- -2.5763e-08 -7.73699e-07 -1.52164e-06 -1.07268e-06 -3.81696e-07
- 2.6727e-07 4.75489e-07 6.83708e-07 8.91926e-07 1.10014e-06
- 1.30836e-06 1.2482e-06 1.00726e-06 7.66311e-07 5.25364e-07
- 2.84417e-07 6.27857e-08 7.43904e-10 -6.12979e-08 -1.2334e-07
- -1.85382e-07 -2.47423e-07 -3.09465e-07 -3.71507e-07 -4.33549e-07
- -4.95591e-07 -5.57633e-07 -6.04571e-07 -5.4944e-07 -4.9431e-07
- -4.3918e-07 -3.84049e-07 -3.28919e-07 -2.73789e-07 -2.18659e-07
- -1.63528e-07 -1.08398e-07 -5.32678e-08 1.062e-09 5.08502e-08
- 1.00638e-07 1.50427e-07 2.00215e-07 2.50003e-07 2.99791e-07
- 3.4958e-07 3.99368e-07 4.49156e-07 4.98944e-07 5.34512e-07
- 5.01032e-07 4.67553e-07 4.34073e-07 4.00593e-07 3.67113e-07
- 3.33633e-07 3.00153e-07 2.66674e-07 2.33194e-07 1.99714e-07
- 1.66234e-07 1.32754e-07 9.92744e-08 6.57945e-08 3.23147e-08
- -1.16513e-09 -3.4645e-08 -6.81248e-08 -1.01605e-07 -1.35084e-07
- -1.68564e-07 -2.18729e-07 0.0114926 -0.0245378 -0.111828
- 0.0964775 1.61491 3.22668 4.22041 4.54492 4.82845 4.94868
- 4.98588 4.99609 4.9981 4.99908 4.99788 4.98395 4.99294 4.99724
- 5.01939 5.0471 5.00902 4.98194 4.98496 4.99188 4.99623 4.99862
- 5.00025 4.99974 4.99953 4.99946 4.99958 5.00012 4.99997
- 4.99992 4.99988 4.99985 4.9998 4.9997 4.9988 4.99806 4.99982
- 5.00143 5.00159 5.00098 5.00053 5.00028 5.00007 4.99977
- 4.99992 5.00005 5.00133 5.0009 4.99993 4.99972 4.99975 4.9998
- 4.99982 4.99983 4.99983 4.99983 4.99983 4.99984 4.99986
- 4.99987 4.99989 4.9999 4.99991 4.99992 4.99994 4.99995 4.99995
- 4.99996 4.99997 4.99997 4.99998 4.99998 4.99998 4.99998
- 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
- 5 5 5 5.00001 5.00001 5.00001 5.00002 5.00002 5.00002 5.00002
- 5.00002 5.00001 5.00001 5.00001 5 5 5 5 5 5 5 5 4.99999
- 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
- 4.99999 4.99999 4.99999 5 5 5.01457 4.99482 4.96561 4.99326
- 5.03452 5.00424 5.00101 5.00045 5.00004 4.99965 4.99997
- 4.99994 4.99958 4.99999 4.99936 4.9839 4.99248 4.99717 5.01976
- 5.04869 5.0087 4.98143 4.98488 4.99199 4.99622 4.9983 4.99928
- 4.99971 4.99986 5.00031 5.00022 5.00035 5.0001 4.99884 4.99811
- 4.99803 4.99887 5.00078 5.00151 5.00116 5.00007 4.99843
- 4.99915 5.00107 5.00168 5.00141 5.00092 5.00055 5.0003 5.00016
- 5.0001 5.00001 5.00016 5.0002 5.00009 4.99993 4.99975 4.99984
- 4.99991 4.99991 4.99982 4.99974 4.99974 4.99985 4.99995
- 4.99999 4.99998 5.00004 5.00013 5.00015 5.00007 4.99988
- 4.99982 4.99985 4.99995 5.00006 5.0002 5.00025 5.0002 5.00009
- 5.00006 5.00004 5.00002 5 4.99998 4.99997 4.99998 4.99998
- 4.99999 4.99999 4.99999 5 5 5 5 5 5.00001 5.00001 5.00001
- 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
- 5.00001 5.00001 5 5 5 5 5 4.99999 4.99999 4.99999 4.99999
- 4.99998 4.99998 4.99998
+ 1.86175 1.73419 1.42874 1.04055 0.943004 0.268275 0.0826455
+ 0.0388346 0.0214104 0.0135431 0.00961322 0.00712846 0.00588262
+ 0.00432397 0.00377774 0.00270134 -0.00393731 -0.00542187
+ -0.00126596 0.0113777 0.0134522 0.00477056 -0.00211067 -0.00229253
+ -0.00173355 -0.00122404 -0.00113426 -0.000744931 -0.000520112
+ -0.000410048 -0.000220439 0.000508104 5.15856e-05 -0.000112593
+ -0.000118917 -9.57394e-05 -7.15727e-05 -5.11847e-05 -3.58275e-05
+ -2.47166e-05 -1.68866e-05 -1.14082e-05 -7.66646e-06 -5.12139e-06
+ -3.63426e-06 -3.01815e-06 -2.64862e-06 -1.4947e-06 -1.91403e-07
+ -2.5763e-08 -7.73699e-07 -1.52164e-06 -1.07268e-06 -3.81696e-07
+ 2.6727e-07 4.75489e-07 6.83708e-07 8.91926e-07 1.10014e-06
+ 1.30836e-06 1.2482e-06 1.00726e-06 7.66311e-07 5.25364e-07
+ 2.84417e-07 6.27857e-08 7.43904e-10 -6.12979e-08 -1.2334e-07
+ -1.85382e-07 -2.47423e-07 -3.09465e-07 -3.71507e-07 -4.33549e-07
+ -4.95591e-07 -5.57633e-07 -6.04571e-07 -5.4944e-07 -4.9431e-07
+ -4.3918e-07 -3.84049e-07 -3.28919e-07 -2.73789e-07 -2.18659e-07
+ -1.63528e-07 -1.08398e-07 -5.32678e-08 1.062e-09 5.08502e-08
+ 1.00638e-07 1.50427e-07 2.00215e-07 2.50003e-07 2.99791e-07
+ 3.4958e-07 3.99368e-07 4.49156e-07 4.98944e-07 5.34512e-07
+ 5.01032e-07 4.67553e-07 4.34073e-07 4.00593e-07 3.67113e-07
+ 3.33633e-07 3.00153e-07 2.66674e-07 2.33194e-07 1.99714e-07
+ 1.66234e-07 1.32754e-07 9.92744e-08 6.57945e-08 3.23147e-08
+ -1.16513e-09 -3.4645e-08 -6.81248e-08 -1.01605e-07 -1.35084e-07
+ -1.68564e-07 -2.18729e-07 0.0114926 -0.0245378 -0.111828
+ 0.0964775 1.61491 3.22668 4.22041 4.54492 4.82845 4.94868
+ 4.98588 4.99609 4.9981 4.99908 4.99788 4.98395 4.99294 4.99724
+ 5.01939 5.0471 5.00902 4.98194 4.98496 4.99188 4.99623 4.99862
+ 5.00025 4.99974 4.99953 4.99946 4.99958 5.00012 4.99997
+ 4.99992 4.99988 4.99985 4.9998 4.9997 4.9988 4.99806 4.99982
+ 5.00143 5.00159 5.00098 5.00053 5.00028 5.00007 4.99977
+ 4.99992 5.00005 5.00133 5.0009 4.99993 4.99972 4.99975 4.9998
+ 4.99982 4.99983 4.99983 4.99983 4.99983 4.99984 4.99986
+ 4.99987 4.99989 4.9999 4.99991 4.99992 4.99994 4.99995 4.99995
+ 4.99996 4.99997 4.99997 4.99998 4.99998 4.99998 4.99998
+ 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
+ 5 5 5 5.00001 5.00001 5.00001 5.00002 5.00002 5.00002 5.00002
+ 5.00002 5.00001 5.00001 5.00001 5 5 5 5 5 5 5 5 4.99999
+ 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
+ 4.99999 4.99999 4.99999 5 5 5.01457 4.99482 4.96561 4.99326
+ 5.03452 5.00424 5.00101 5.00045 5.00004 4.99965 4.99997
+ 4.99994 4.99958 4.99999 4.99936 4.9839 4.99248 4.99717 5.01976
+ 5.04869 5.0087 4.98143 4.98488 4.99199 4.99622 4.9983 4.99928
+ 4.99971 4.99986 5.00031 5.00022 5.00035 5.0001 4.99884 4.99811
+ 4.99803 4.99887 5.00078 5.00151 5.00116 5.00007 4.99843
+ 4.99915 5.00107 5.00168 5.00141 5.00092 5.00055 5.0003 5.00016
+ 5.0001 5.00001 5.00016 5.0002 5.00009 4.99993 4.99975 4.99984
+ 4.99991 4.99991 4.99982 4.99974 4.99974 4.99985 4.99995
+ 4.99999 4.99998 5.00004 5.00013 5.00015 5.00007 4.99988
+ 4.99982 4.99985 4.99995 5.00006 5.0002 5.00025 5.0002 5.00009
+ 5.00006 5.00004 5.00002 5 4.99998 4.99997 4.99998 4.99998
+ 4.99999 4.99999 4.99999 5 5 5 5 5 5.00001 5.00001 5.00001
+ 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
+ 5.00001 5.00001 5 5 5 5 5 4.99999 4.99999 4.99999 4.99999
+ 4.99998 4.99998 4.99998
EOD
@v[12].set(<<-'EOD')
- 5 5.16975 4.78685 2.94241 0.126698 0.0487004 -0.00422591
- -0.00130689 -0.000486756 -0.000195875 -0.000108988 -6.66736e-05
- -7.26005e-05 -5.63608e-05 -3.81859e-05 -2.123e-05 -0.0646846
- -0.0184474 0.182248 1.06731 3.10988 4.46133 4.84133 4.95113
- 4.98364 4.99455 4.99694 4.99727 4.9994 4.99975 5.0001 5.00132
- 5.00089 5.00039 5.00019 5.00011 5.00006 5.00005 5.00004
- 5.00001 4.99992 4.99992 5.00002 5.00013 5.00017 5.00009
- 4.99992 4.99991 4.99994 4.99996 4.99998 4.99999 5.00001
- 5.00004 5.00006 5.00005 5.00004 5.00003 5.00002 5.00001
- 5 4.99999 4.99999 4.99998 4.99998 4.99997 4.99997 4.99998
- 4.99998 4.99998 4.99998 4.99999 4.99999 4.99999 4.99999
- 5 5 5 5 5 5 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
- 5.00002 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
- 5.00001 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 4.99999 4.99999
- 4.99999 4.99999 4.99999 4.99999 4.99999 5 5.14699 4.78074
- 3.19424 0.305663 0.0611255 -0.00179951 -0.0012032 0.000405978
- 0.000989399 0.000445194 0.000191447 8.30476e-05 3.96236e-05
- 1.91866e-05 1.70665e-05 -0.0655239 -0.0210234 0.1827 1.06848
- 3.11554 4.46518 4.84212 4.94853 4.98244 4.99434 4.9997 5.00081
- 5.00009 4.99972 4.99985 4.99974 4.9995 4.99949 4.99958 4.99973
- 4.99948 4.99914 4.99874 4.99946 5.00309 5.0091 5.01576 5.01835
- 5.01852 5.0176 5.01625 5.01479 5.01345 5.01264 5.011 5.01092
- 5.01344 5.01363 5.01289 5.01184 5.01071 5.00956 5.00848
- 5.00751 5.00663 5.00577 5.00497 5.00427 5.00365 5.0031 5.00264
- 5.00224 5.00191 5.00163 5.00138 5.00117 5.00099 5.00083
- 5.00071 5.00061 5.00053 5.00045 5.00037 5.00029 5.00022
- 5.00019 5.0002 5.00023 5.00024 5.00023 5.00023 5.00022 5.0002
- 5.00018 5.00016 5.00014 5.00011 5.00009 5.00007 5.00006
- 5.00005 5.00005 5.00004 5.00003 5.00002 5.00001 5.00001
- 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
- 5.00002 5.00002 5.00002 5.00002 5.00002 5.00002 5.00002
- 5.00002 5.00001 5.00001 5.00001 5.14298 4.79809 3.32704
- 0.498385 0.105773 0.0160646 0.0319912 0.0299434 0.0240102
- 0.0185844 0.0130411 0.0106532 0.00864871 0.00744519 0.00660887
- -0.0612913 -0.0203719 0.174998 0.991787 3.06292 4.60005
- 4.93058 4.98917 5.00033 4.9999 4.99909 4.9966 4.9955 4.99488
- 4.99374 4.9943 5.00131 5.00506 4.99311 4.96288 4.93567 4.92439
- 4.94236 4.9732 4.98864 4.99458 5.00031 5.00694 5.01525 5.01945
- 5.01998 5.01953 5.01874 5.01766 5.0164 5.01509 5.01326 5.01423
- 5.01455 5.01361 5.01245 5.01122 5.01002 5.00888 5.00783
- 5.00687 5.00596 5.00514 5.00442 5.00379 5.00325 5.00279
- 5.0024 5.00208 5.0018 5.00153 5.00126 5.00107 5.00094 5.00085
- 5.00078 5.00072 5.00063 5.00053 5.00042 5.00038 5.00034
- 5.0003 5.00027 5.00023 5.00021 5.00019 5.00017 5.00015 5.00013
- 5.00012 5.00011 5.0001 5.0001 5.00009 5.00008 5.00007 5.00007
- 5.00006 5.00005 5.00005 5.00004 5.00004 5.00003 5.00003
- 5.00002 5.00002 5.00002 5.00001 5.00001 5 5 5 5.00001 5.00001
- 5.00001 5.00002 5.00002 5.00002 5.00002
+ 5 5.16975 4.78685 2.94241 0.126698 0.0487004 -0.00422591
+ -0.00130689 -0.000486756 -0.000195875 -0.000108988 -6.66736e-05
+ -7.26005e-05 -5.63608e-05 -3.81859e-05 -2.123e-05 -0.0646846
+ -0.0184474 0.182248 1.06731 3.10988 4.46133 4.84133 4.95113
+ 4.98364 4.99455 4.99694 4.99727 4.9994 4.99975 5.0001 5.00132
+ 5.00089 5.00039 5.00019 5.00011 5.00006 5.00005 5.00004
+ 5.00001 4.99992 4.99992 5.00002 5.00013 5.00017 5.00009
+ 4.99992 4.99991 4.99994 4.99996 4.99998 4.99999 5.00001
+ 5.00004 5.00006 5.00005 5.00004 5.00003 5.00002 5.00001
+ 5 4.99999 4.99999 4.99998 4.99998 4.99997 4.99997 4.99998
+ 4.99998 4.99998 4.99998 4.99999 4.99999 4.99999 4.99999
+ 5 5 5 5 5 5 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
+ 5.00002 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
+ 5.00001 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 4.99999 4.99999
+ 4.99999 4.99999 4.99999 4.99999 4.99999 5 5.14699 4.78074
+ 3.19424 0.305663 0.0611255 -0.00179951 -0.0012032 0.000405978
+ 0.000989399 0.000445194 0.000191447 8.30476e-05 3.96236e-05
+ 1.91866e-05 1.70665e-05 -0.0655239 -0.0210234 0.1827 1.06848
+ 3.11554 4.46518 4.84212 4.94853 4.98244 4.99434 4.9997 5.00081
+ 5.00009 4.99972 4.99985 4.99974 4.9995 4.99949 4.99958 4.99973
+ 4.99948 4.99914 4.99874 4.99946 5.00309 5.0091 5.01576 5.01835
+ 5.01852 5.0176 5.01625 5.01479 5.01345 5.01264 5.011 5.01092
+ 5.01344 5.01363 5.01289 5.01184 5.01071 5.00956 5.00848
+ 5.00751 5.00663 5.00577 5.00497 5.00427 5.00365 5.0031 5.00264
+ 5.00224 5.00191 5.00163 5.00138 5.00117 5.00099 5.00083
+ 5.00071 5.00061 5.00053 5.00045 5.00037 5.00029 5.00022
+ 5.00019 5.0002 5.00023 5.00024 5.00023 5.00023 5.00022 5.0002
+ 5.00018 5.00016 5.00014 5.00011 5.00009 5.00007 5.00006
+ 5.00005 5.00005 5.00004 5.00003 5.00002 5.00001 5.00001
+ 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
+ 5.00002 5.00002 5.00002 5.00002 5.00002 5.00002 5.00002
+ 5.00002 5.00001 5.00001 5.00001 5.14298 4.79809 3.32704
+ 0.498385 0.105773 0.0160646 0.0319912 0.0299434 0.0240102
+ 0.0185844 0.0130411 0.0106532 0.00864871 0.00744519 0.00660887
+ -0.0612913 -0.0203719 0.174998 0.991787 3.06292 4.60005
+ 4.93058 4.98917 5.00033 4.9999 4.99909 4.9966 4.9955 4.99488
+ 4.99374 4.9943 5.00131 5.00506 4.99311 4.96288 4.93567 4.92439
+ 4.94236 4.9732 4.98864 4.99458 5.00031 5.00694 5.01525 5.01945
+ 5.01998 5.01953 5.01874 5.01766 5.0164 5.01509 5.01326 5.01423
+ 5.01455 5.01361 5.01245 5.01122 5.01002 5.00888 5.00783
+ 5.00687 5.00596 5.00514 5.00442 5.00379 5.00325 5.00279
+ 5.0024 5.00208 5.0018 5.00153 5.00126 5.00107 5.00094 5.00085
+ 5.00078 5.00072 5.00063 5.00053 5.00042 5.00038 5.00034
+ 5.0003 5.00027 5.00023 5.00021 5.00019 5.00017 5.00015 5.00013
+ 5.00012 5.00011 5.0001 5.0001 5.00009 5.00008 5.00007 5.00007
+ 5.00006 5.00005 5.00005 5.00004 5.00004 5.00003 5.00003
+ 5.00002 5.00002 5.00002 5.00001 5.00001 5 5 5 5.00001 5.00001
+ 5.00001 5.00002 5.00002 5.00002 5.00002
EOD
@v[13].set(<<-'EOD')
- 9.73784e-10 0.0189926 0.0926769 0.206309 0.111533 0.0953491
- 0.0426966 0.0214177 0.0117943 0.00741442 0.00528816 0.00398417
- 0.0032967 0.00266499 0.00206647 0.00158788 -0.0371391 -0.0439528
- -0.0408653 -0.0188706 0.0150241 0.0126852 0.00209817 -0.000239206
- -5.31488e-05 0.000876324 -0.00451221 -0.0165223 -0.0284127
- -0.0427584 -0.0502453 -0.0257366 -0.00903938 -0.00376456
- -0.00233385 -0.00169922 -0.00130397 -0.00102542 -0.000811435
- -0.000648115 -0.000529266 -0.00043795 -0.00036574 -0.00030716
- -0.00026221 -0.000229662 -0.000205112 -0.000181038 -0.000162045
- -0.000148988 -0.000137633 -0.000126278 -0.000115562 -0.000104976
- -9.49324e-05 -9.0585e-05 -8.62375e-05 -8.18901e-05 -7.75426e-05
- -7.31952e-05 -6.93752e-05 -6.59106e-05 -6.24461e-05 -5.89815e-05
- -5.55169e-05 -5.22412e-05 -5.05263e-05 -4.88114e-05 -4.70966e-05
- -4.53817e-05 -4.36668e-05 -4.19519e-05 -4.0237e-05 -3.85222e-05
- -3.68073e-05 -3.50924e-05 -3.34782e-05 -3.25442e-05 -3.16102e-05
- -3.06763e-05 -2.97423e-05 -2.88083e-05 -2.78744e-05 -2.69404e-05
- -2.60064e-05 -2.50725e-05 -2.41385e-05 -2.32635e-05 -2.27232e-05
- -2.21829e-05 -2.16426e-05 -2.11023e-05 -2.0562e-05 -2.00217e-05
- -1.94814e-05 -1.89411e-05 -1.84007e-05 -1.78604e-05 -1.73647e-05
- -1.70853e-05 -1.68059e-05 -1.65265e-05 -1.62471e-05 -1.59677e-05
- -1.56883e-05 -1.54089e-05 -1.51295e-05 -1.48501e-05 -1.45707e-05
- -1.42913e-05 -1.40119e-05 -1.37325e-05 -1.34531e-05 -1.31737e-05
- -1.28943e-05 -1.26149e-05 -1.23355e-05 -1.20561e-05 -1.17767e-05
- -1.14973e-05 -1.10954e-05 0.0152675 0.0228237 -0.00460678
- -0.0341525 0.0232109 -0.0138039 -0.0416538 -0.0458764 -0.0201967
- -0.00878316 -0.00379173 -0.00164621 -0.000785131 -0.00037575
- -0.000352375 -0.0545586 -0.0746881 -0.0771865 -0.05386 -0.0022199
- 0.0136703 0.00633526 0.00138826 -0.00108934 0.0038886 0.0298077
- 0.0475776 0.0481003 0.0464167 0.047818 0.042789 0.035207
- 0.0264423 0.0193959 0.0151614 0.00624257 -0.00913057 -0.0310696
- -0.0430238 0.016426 0.189762 0.49025 0.820116 1.13919 1.43549
- 1.70658 1.95183 2.17414 2.38506 2.5657 2.73958 2.97905 3.21403
- 3.43025 3.62645 3.8028 3.96002 4.09996 4.22443 4.33427 4.42886
- 4.51097 4.5817 4.64326 4.6957 4.74132 4.7797 4.81298 4.84102
- 4.86512 4.88523 4.90224 4.91649 4.92846 4.93868 4.94755
- 4.95483 4.96114 4.96682 4.97161 4.97502 4.9776 4.97944 4.98141
- 4.98319 4.98467 4.98585 4.9869 4.98796 4.98902 4.99008 4.99114
- 4.9922 4.99326 4.9938 4.99429 4.99479 4.99528 4.99578 4.99628
- 4.99677 4.99704 4.99718 4.99733 4.99747 4.99762 4.99777
- 4.99791 4.99806 4.9982 4.99835 4.9985 4.99864 4.99879 4.99893
- 4.99907 4.99916 4.99925 4.99934 4.99943 5.01473 4.92293
- 4.61974 4.0316 3.7835 3.74195 3.78344 3.87272 3.97386 4.07319
- 4.16686 4.25256 4.33126 4.40264 4.46697 4.49249 4.51807
- 4.55803 4.64055 4.78574 4.86074 4.88334 4.8999 4.91455 4.92814
- 4.93926 4.94761 4.95433 4.95907 4.9654 4.98317 5.0208 5.05134
- 4.85852 4.16041 3.00077 1.68376 0.672707 0.240838 0.0794725
- -0.0106347 -0.00879443 0.107196 0.368163 0.701424 1.03581
- 1.3601 1.6678 1.95731 2.22701 2.47544 2.69099 2.92327 3.16648
- 3.3877 3.59067 3.77344 3.93584 4.08066 4.20863 4.32065 4.41791
- 4.50211 4.57423 4.63614 4.68888 4.73377 4.7721 4.80519 4.83338
- 4.85732 4.87815 4.89514 4.90927 4.92108 4.93122 4.94014
- 4.94845 4.95601 4.96251 4.96576 4.969 4.97225 4.9755 4.97874
- 4.98087 4.98265 4.98442 4.9862 4.98797 4.98924 4.9899 4.99055
- 4.9912 4.99186 4.99251 4.99316 4.99381 4.99447 4.99512 4.99577
- 4.99609 4.99634 4.99659 4.99683 4.99708 4.99732 4.99757
- 4.99782 4.99806 4.99831 4.99853 4.99863 4.99873 4.99883
- 4.99893 4.99903 4.99913 4.99923 4.99933
+ 9.73784e-10 0.0189926 0.0926769 0.206309 0.111533 0.0953491
+ 0.0426966 0.0214177 0.0117943 0.00741442 0.00528816 0.00398417
+ 0.0032967 0.00266499 0.00206647 0.00158788 -0.0371391 -0.0439528
+ -0.0408653 -0.0188706 0.0150241 0.0126852 0.00209817 -0.000239206
+ -5.31488e-05 0.000876324 -0.00451221 -0.0165223 -0.0284127
+ -0.0427584 -0.0502453 -0.0257366 -0.00903938 -0.00376456
+ -0.00233385 -0.00169922 -0.00130397 -0.00102542 -0.000811435
+ -0.000648115 -0.000529266 -0.00043795 -0.00036574 -0.00030716
+ -0.00026221 -0.000229662 -0.000205112 -0.000181038 -0.000162045
+ -0.000148988 -0.000137633 -0.000126278 -0.000115562 -0.000104976
+ -9.49324e-05 -9.0585e-05 -8.62375e-05 -8.18901e-05 -7.75426e-05
+ -7.31952e-05 -6.93752e-05 -6.59106e-05 -6.24461e-05 -5.89815e-05
+ -5.55169e-05 -5.22412e-05 -5.05263e-05 -4.88114e-05 -4.70966e-05
+ -4.53817e-05 -4.36668e-05 -4.19519e-05 -4.0237e-05 -3.85222e-05
+ -3.68073e-05 -3.50924e-05 -3.34782e-05 -3.25442e-05 -3.16102e-05
+ -3.06763e-05 -2.97423e-05 -2.88083e-05 -2.78744e-05 -2.69404e-05
+ -2.60064e-05 -2.50725e-05 -2.41385e-05 -2.32635e-05 -2.27232e-05
+ -2.21829e-05 -2.16426e-05 -2.11023e-05 -2.0562e-05 -2.00217e-05
+ -1.94814e-05 -1.89411e-05 -1.84007e-05 -1.78604e-05 -1.73647e-05
+ -1.70853e-05 -1.68059e-05 -1.65265e-05 -1.62471e-05 -1.59677e-05
+ -1.56883e-05 -1.54089e-05 -1.51295e-05 -1.48501e-05 -1.45707e-05
+ -1.42913e-05 -1.40119e-05 -1.37325e-05 -1.34531e-05 -1.31737e-05
+ -1.28943e-05 -1.26149e-05 -1.23355e-05 -1.20561e-05 -1.17767e-05
+ -1.14973e-05 -1.10954e-05 0.0152675 0.0228237 -0.00460678
+ -0.0341525 0.0232109 -0.0138039 -0.0416538 -0.0458764 -0.0201967
+ -0.00878316 -0.00379173 -0.00164621 -0.000785131 -0.00037575
+ -0.000352375 -0.0545586 -0.0746881 -0.0771865 -0.05386 -0.0022199
+ 0.0136703 0.00633526 0.00138826 -0.00108934 0.0038886 0.0298077
+ 0.0475776 0.0481003 0.0464167 0.047818 0.042789 0.035207
+ 0.0264423 0.0193959 0.0151614 0.00624257 -0.00913057 -0.0310696
+ -0.0430238 0.016426 0.189762 0.49025 0.820116 1.13919 1.43549
+ 1.70658 1.95183 2.17414 2.38506 2.5657 2.73958 2.97905 3.21403
+ 3.43025 3.62645 3.8028 3.96002 4.09996 4.22443 4.33427 4.42886
+ 4.51097 4.5817 4.64326 4.6957 4.74132 4.7797 4.81298 4.84102
+ 4.86512 4.88523 4.90224 4.91649 4.92846 4.93868 4.94755
+ 4.95483 4.96114 4.96682 4.97161 4.97502 4.9776 4.97944 4.98141
+ 4.98319 4.98467 4.98585 4.9869 4.98796 4.98902 4.99008 4.99114
+ 4.9922 4.99326 4.9938 4.99429 4.99479 4.99528 4.99578 4.99628
+ 4.99677 4.99704 4.99718 4.99733 4.99747 4.99762 4.99777
+ 4.99791 4.99806 4.9982 4.99835 4.9985 4.99864 4.99879 4.99893
+ 4.99907 4.99916 4.99925 4.99934 4.99943 5.01473 4.92293
+ 4.61974 4.0316 3.7835 3.74195 3.78344 3.87272 3.97386 4.07319
+ 4.16686 4.25256 4.33126 4.40264 4.46697 4.49249 4.51807
+ 4.55803 4.64055 4.78574 4.86074 4.88334 4.8999 4.91455 4.92814
+ 4.93926 4.94761 4.95433 4.95907 4.9654 4.98317 5.0208 5.05134
+ 4.85852 4.16041 3.00077 1.68376 0.672707 0.240838 0.0794725
+ -0.0106347 -0.00879443 0.107196 0.368163 0.701424 1.03581
+ 1.3601 1.6678 1.95731 2.22701 2.47544 2.69099 2.92327 3.16648
+ 3.3877 3.59067 3.77344 3.93584 4.08066 4.20863 4.32065 4.41791
+ 4.50211 4.57423 4.63614 4.68888 4.73377 4.7721 4.80519 4.83338
+ 4.85732 4.87815 4.89514 4.90927 4.92108 4.93122 4.94014
+ 4.94845 4.95601 4.96251 4.96576 4.969 4.97225 4.9755 4.97874
+ 4.98087 4.98265 4.98442 4.9862 4.98797 4.98924 4.9899 4.99055
+ 4.9912 4.99186 4.99251 4.99316 4.99381 4.99447 4.99512 4.99577
+ 4.99609 4.99634 4.99659 4.99683 4.99708 4.99732 4.99757
+ 4.99782 4.99806 4.99831 4.99853 4.99863 4.99873 4.99883
+ 4.99893 4.99903 4.99913 4.99923 4.99933
EOD
@v[14].set(<<-'EOD')
- 1.86175 2.00147 1.85141 1.0654 0.275481 0.205547 0.0712627
- 0.0313387 0.0151431 0.00864531 0.00593861 0.00438111 0.0037479
- 0.00305857 0.00221221 0.0017081 -0.0896128 -0.109079 -0.121356
- -0.0542001 0.175821 0.177442 0.0814591 0.0333042 0.0134909
- 0.00625777 0.00100092 -0.00552776 -0.00411139 -0.00150395
- -0.000564784 3.48169e-05 -0.000287014 -0.000538515 -0.000456537
- -0.000325677 -0.000275468 -0.000166452 -8.27481e-05 -8.28704e-05
- -7.47644e-05 -4.60552e-05 -2.61481e-06 2.26359e-05 2.53852e-05
- -1.39853e-06 -4.23456e-05 -4.0907e-05 -2.8501e-05 -1.5945e-05
- -9.01122e-06 -2.07747e-06 1.49328e-06 4.38398e-06 6.84248e-06
- 4.76711e-06 2.69173e-06 6.16362e-07 -1.45901e-06 -3.53438e-06
- -4.14256e-06 -3.76238e-06 -3.3822e-06 -3.00202e-06 -2.62184e-06
- -2.24878e-06 -1.93456e-06 -1.62033e-06 -1.3061e-06 -9.91867e-07
- -6.77638e-07 -3.63409e-07 -4.91792e-08 2.6505e-07 5.7928e-07
- 8.93509e-07 1.16076e-06 1.11055e-06 1.06034e-06 1.01014e-06
- 9.59927e-07 9.09719e-07 8.59511e-07 8.09302e-07 7.59094e-07
- 7.08886e-07 6.58678e-07 5.99251e-07 4.87523e-07 3.75795e-07
- 2.64068e-07 1.5234e-07 4.06119e-08 -7.1116e-08 -1.82844e-07
- -2.94572e-07 -4.063e-07 -5.18027e-07 -6.08517e-07 -5.95879e-07
- -5.83241e-07 -5.70604e-07 -5.57966e-07 -5.45328e-07 -5.3269e-07
- -5.20053e-07 -5.07415e-07 -4.94777e-07 -4.8214e-07 -4.69502e-07
- -4.56864e-07 -4.44226e-07 -4.31589e-07 -4.18951e-07 -4.06313e-07
- -3.93676e-07 -3.81038e-07 -3.684e-07 -3.55762e-07 -3.43125e-07
- 1.06736e-05 0.0797407 0.0437947 -0.0645098 -0.0877312 0.0653203
- -0.00621184 -0.0353188 -0.0491378 -0.0251957 -0.0110996
- -0.00481123 -0.0020941 -0.000998038 -0.000478747 -0.000445332
- -0.102046 -0.135753 -0.154351 -0.0827509 0.163348 0.174012
- 0.0794822 0.0310624 0.0112213 0.00249061 0.00130764 0.00181315
- 0.00163875 0.00101454 0.000497435 0.000195258 5.31901e-05
- 2.4607e-05 6.62736e-05 7.90718e-05 4.0372e-05 -0.000141184
- -0.000280623 5.5608e-05 0.000799565 0.000920189 0.000931616
- 0.000494527 0.000162303 -8.24884e-05 -0.000183938 -0.000203899
- -0.000144788 -9.87063e-05 -0.000227929 2.93932e-05 0.000208563
- 1.88958e-06 -7.6335e-05 -0.000172472 -0.000165656 -0.000145889
- -0.000177311 -0.000191058 -0.000168287 -0.00015755 -0.00013142
- -8.10488e-05 -6.36115e-05 -7.8699e-05 -8.11282e-05 -7.98625e-05
- -5.98807e-05 -3.40879e-05 -1.95464e-05 -1.79247e-05 -4.45514e-05
- -7.47995e-05 -8.7682e-05 -7.50806e-05 -3.25561e-05 -4.34114e-05
- -7.69099e-05 -0.000141101 -0.00018743 -0.000148471 -5.06546e-05
- 0.000120195 0.000177635 0.000177052 0.000146344 9.75126e-05
- 8.31233e-05 6.8734e-05 5.43447e-05 3.99554e-05 2.55661e-05
- 1.11768e-05 -3.21253e-06 -3.88937e-06 -3.56628e-06 -3.24318e-06
- -2.92008e-06 -2.59699e-06 -2.27389e-06 -1.9508e-06 -1.73227e-06
- -1.56796e-06 -1.40365e-06 -1.23934e-06 -1.07503e-06 -9.10722e-07
- -7.46412e-07 -5.82101e-07 -4.1779e-07 -2.5348e-07 -8.91694e-08
- 7.51412e-08 2.39452e-07 4.03762e-07 5.95733e-07 1.00771e-06
- 1.41969e-06 1.83167e-06 2.24365e-06 0.0828257 0.231038 0.465438
- 1.54516 2.8461 3.19221 3.40395 3.6382 3.80758 3.93848 4.04882
- 4.15428 4.247 4.32917 4.40235 4.36941 4.397 4.48862 4.64552
- 4.86595 5.03475 5.0348 5.02627 5.01967 5.01542 5.00925 4.98613
- 4.9519 4.91581 4.87357 4.82302 4.80403 4.82565 4.86102 4.89483
- 4.92253 4.94428 4.96257 4.97608 4.98373 4.98823 4.99182
- 4.99437 4.99635 4.99745 4.99802 4.99843 4.99873 4.99895
- 4.99912 4.99925 4.99931 4.99962 4.99973 4.99972 4.99971
- 4.9997 4.99969 4.9997 4.99971 4.99973 4.99974 4.99976 4.99978
- 4.9998 4.99982 4.99985 4.99987 4.99989 4.9999 4.99991 4.99991
- 4.99993 4.99994 4.99997 5.00001 5.00006 5.00008 5.00006
- 5.00002 5 4.99999 4.99998 4.99997 4.99995 4.99995 4.99995
- 4.99995 4.99995 4.99995 4.99995 4.99996 4.99997 4.99997
- 4.99998 4.99999 5 5 5.00001 5.00002 5.00002 5.00002 5.00002
- 5.00002 5.00002 5.00002 5.00002 5.00002 5.00002 5.00001
- 5.00001 5.00001 5.00001 5.00001 5 5 5 4.99999 4.99999 4.99999
+ 1.86175 2.00147 1.85141 1.0654 0.275481 0.205547 0.0712627
+ 0.0313387 0.0151431 0.00864531 0.00593861 0.00438111 0.0037479
+ 0.00305857 0.00221221 0.0017081 -0.0896128 -0.109079 -0.121356
+ -0.0542001 0.175821 0.177442 0.0814591 0.0333042 0.0134909
+ 0.00625777 0.00100092 -0.00552776 -0.00411139 -0.00150395
+ -0.000564784 3.48169e-05 -0.000287014 -0.000538515 -0.000456537
+ -0.000325677 -0.000275468 -0.000166452 -8.27481e-05 -8.28704e-05
+ -7.47644e-05 -4.60552e-05 -2.61481e-06 2.26359e-05 2.53852e-05
+ -1.39853e-06 -4.23456e-05 -4.0907e-05 -2.8501e-05 -1.5945e-05
+ -9.01122e-06 -2.07747e-06 1.49328e-06 4.38398e-06 6.84248e-06
+ 4.76711e-06 2.69173e-06 6.16362e-07 -1.45901e-06 -3.53438e-06
+ -4.14256e-06 -3.76238e-06 -3.3822e-06 -3.00202e-06 -2.62184e-06
+ -2.24878e-06 -1.93456e-06 -1.62033e-06 -1.3061e-06 -9.91867e-07
+ -6.77638e-07 -3.63409e-07 -4.91792e-08 2.6505e-07 5.7928e-07
+ 8.93509e-07 1.16076e-06 1.11055e-06 1.06034e-06 1.01014e-06
+ 9.59927e-07 9.09719e-07 8.59511e-07 8.09302e-07 7.59094e-07
+ 7.08886e-07 6.58678e-07 5.99251e-07 4.87523e-07 3.75795e-07
+ 2.64068e-07 1.5234e-07 4.06119e-08 -7.1116e-08 -1.82844e-07
+ -2.94572e-07 -4.063e-07 -5.18027e-07 -6.08517e-07 -5.95879e-07
+ -5.83241e-07 -5.70604e-07 -5.57966e-07 -5.45328e-07 -5.3269e-07
+ -5.20053e-07 -5.07415e-07 -4.94777e-07 -4.8214e-07 -4.69502e-07
+ -4.56864e-07 -4.44226e-07 -4.31589e-07 -4.18951e-07 -4.06313e-07
+ -3.93676e-07 -3.81038e-07 -3.684e-07 -3.55762e-07 -3.43125e-07
+ 1.06736e-05 0.0797407 0.0437947 -0.0645098 -0.0877312 0.0653203
+ -0.00621184 -0.0353188 -0.0491378 -0.0251957 -0.0110996
+ -0.00481123 -0.0020941 -0.000998038 -0.000478747 -0.000445332
+ -0.102046 -0.135753 -0.154351 -0.0827509 0.163348 0.174012
+ 0.0794822 0.0310624 0.0112213 0.00249061 0.00130764 0.00181315
+ 0.00163875 0.00101454 0.000497435 0.000195258 5.31901e-05
+ 2.4607e-05 6.62736e-05 7.90718e-05 4.0372e-05 -0.000141184
+ -0.000280623 5.5608e-05 0.000799565 0.000920189 0.000931616
+ 0.000494527 0.000162303 -8.24884e-05 -0.000183938 -0.000203899
+ -0.000144788 -9.87063e-05 -0.000227929 2.93932e-05 0.000208563
+ 1.88958e-06 -7.6335e-05 -0.000172472 -0.000165656 -0.000145889
+ -0.000177311 -0.000191058 -0.000168287 -0.00015755 -0.00013142
+ -8.10488e-05 -6.36115e-05 -7.8699e-05 -8.11282e-05 -7.98625e-05
+ -5.98807e-05 -3.40879e-05 -1.95464e-05 -1.79247e-05 -4.45514e-05
+ -7.47995e-05 -8.7682e-05 -7.50806e-05 -3.25561e-05 -4.34114e-05
+ -7.69099e-05 -0.000141101 -0.00018743 -0.000148471 -5.06546e-05
+ 0.000120195 0.000177635 0.000177052 0.000146344 9.75126e-05
+ 8.31233e-05 6.8734e-05 5.43447e-05 3.99554e-05 2.55661e-05
+ 1.11768e-05 -3.21253e-06 -3.88937e-06 -3.56628e-06 -3.24318e-06
+ -2.92008e-06 -2.59699e-06 -2.27389e-06 -1.9508e-06 -1.73227e-06
+ -1.56796e-06 -1.40365e-06 -1.23934e-06 -1.07503e-06 -9.10722e-07
+ -7.46412e-07 -5.82101e-07 -4.1779e-07 -2.5348e-07 -8.91694e-08
+ 7.51412e-08 2.39452e-07 4.03762e-07 5.95733e-07 1.00771e-06
+ 1.41969e-06 1.83167e-06 2.24365e-06 0.0828257 0.231038 0.465438
+ 1.54516 2.8461 3.19221 3.40395 3.6382 3.80758 3.93848 4.04882
+ 4.15428 4.247 4.32917 4.40235 4.36941 4.397 4.48862 4.64552
+ 4.86595 5.03475 5.0348 5.02627 5.01967 5.01542 5.00925 4.98613
+ 4.9519 4.91581 4.87357 4.82302 4.80403 4.82565 4.86102 4.89483
+ 4.92253 4.94428 4.96257 4.97608 4.98373 4.98823 4.99182
+ 4.99437 4.99635 4.99745 4.99802 4.99843 4.99873 4.99895
+ 4.99912 4.99925 4.99931 4.99962 4.99973 4.99972 4.99971
+ 4.9997 4.99969 4.9997 4.99971 4.99973 4.99974 4.99976 4.99978
+ 4.9998 4.99982 4.99985 4.99987 4.99989 4.9999 4.99991 4.99991
+ 4.99993 4.99994 4.99997 5.00001 5.00006 5.00008 5.00006
+ 5.00002 5 4.99999 4.99998 4.99997 4.99995 4.99995 4.99995
+ 4.99995 4.99995 4.99995 4.99995 4.99996 4.99997 4.99997
+ 4.99998 4.99999 5 5 5.00001 5.00002 5.00002 5.00002 5.00002
+ 5.00002 5.00002 5.00002 5.00002 5.00002 5.00002 5.00001
+ 5.00001 5.00001 5.00001 5.00001 5 5 5 4.99999 4.99999 4.99999
EOD
@v[15].set(<<-'EOD')
- 1.86175 2.00199 2.08919 1.84314 1.08254 0.214737 0.0377351
- 0.00952455 0.00232763 0.000563614 0.000263477 0.000148642
- 0.000285086 0.000242592 7.34699e-05 -1.53467e-05 -0.0161874
- -0.0157876 -0.0141194 0.0132576 0.0903272 0.109938 0.0535295
- 0.0224216 0.00940945 0.00466825 -0.000649972 -0.00654752
- -0.00333248 -0.00103671 -0.000508276 -5.8896e-05 -0.00043938
- -0.000544704 -0.00044444 -0.000307093 -0.00024517 -0.000154538
- -8.78602e-05 -7.10461e-05 -6.06485e-05 -3.91039e-05 -8.45988e-06
- 9.43442e-06 1.28351e-05 -2.16734e-06 -2.6142e-05 -2.54768e-05
- -1.88997e-05 -1.17906e-05 -7.3808e-06 -2.97101e-06 1.19146e-07
- 2.94246e-06 5.38942e-06 3.88851e-06 2.38761e-06 8.86704e-07
- -6.14201e-07 -2.11511e-06 -2.59565e-06 -2.38885e-06 -2.18205e-06
- -1.97525e-06 -1.76845e-06 -1.56241e-06 -1.36258e-06 -1.16276e-06
- -9.62939e-07 -7.63116e-07 -5.63293e-07 -3.6347e-07 -1.63647e-07
- 3.61756e-08 2.35999e-07 4.35822e-07 6.07653e-07 5.90323e-07
- 5.72994e-07 5.55665e-07 5.38336e-07 5.21007e-07 5.03678e-07
- 4.86349e-07 4.6902e-07 4.51691e-07 4.34361e-07 4.11899e-07
- 3.60315e-07 3.08731e-07 2.57146e-07 2.05562e-07 1.53977e-07
- 1.02393e-07 5.08082e-08 -7.76222e-10 -5.23607e-08 -1.03945e-07
- -1.47815e-07 -1.54225e-07 -1.60635e-07 -1.67045e-07 -1.73455e-07
- -1.79864e-07 -1.86274e-07 -1.92684e-07 -1.99094e-07 -2.05504e-07
- -2.11914e-07 -2.18324e-07 -2.24734e-07 -2.31144e-07 -2.37554e-07
- -2.43964e-07 -2.50373e-07 -2.56783e-07 -2.63193e-07 -2.69603e-07
- -2.76013e-07 -2.82423e-07 2.92534e-06 0.0446777 0.024278
- -0.0518987 -0.0636547 0.00983929 -0.000518204 -0.000265194
- 0.000154772 0.000299538 3.12715e-05 -3.18225e-05 -2.48268e-05
- -1.16701e-05 -6.05117e-06 7.61116e-06 -0.0163668 -0.0158244
- -0.0141177 0.0100085 0.0857144 0.107784 0.051862 0.0204448
- 0.00629858 0.000967736 0.00121674 0.00190276 0.00154009
- 0.000860922 0.000410386 0.000164585 3.99493e-05 1.93797e-05
- 5.67594e-05 0.000110126 2.49925e-05 -7.17815e-05 -0.000142299
- -1.63109e-05 0.000439529 0.000562489 0.000594599 0.000326164
- 0.000126423 -4.26063e-05 -0.000122927 -0.000114152 -6.72706e-05
- -6.41242e-05 -0.000135588 2.61507e-05 0.000134036 6.43734e-06
- -4.6223e-05 -0.000112047 -0.000101388 -8.67847e-05 -0.000117664
- -0.000133957 -0.000116558 -0.000100873 -7.65448e-05 -4.44964e-05
- -3.6677e-05 -5.26632e-05 -5.45172e-05 -5.13545e-05 -3.73869e-05
- -1.99732e-05 -1.0907e-05 -1.10081e-05 -3.02609e-05 -5.18517e-05
- -6.13597e-05 -5.30706e-05 -2.39572e-05 -3.24146e-05 -5.70062e-05
- -0.000103448 -0.000135376 -0.0001024 -2.39007e-05 0.000110929
- 0.000151226 0.000142044 0.000105922 5.62834e-05 4.78476e-05
- 3.94117e-05 3.09759e-05 2.25401e-05 1.41042e-05 5.66837e-06
- -2.76747e-06 -3.08639e-06 -2.81341e-06 -2.54043e-06 -2.26745e-06
- -1.99447e-06 -1.72149e-06 -1.44851e-06 -1.26226e-06 -1.12096e-06
- -9.79661e-07 -8.38363e-07 -6.97065e-07 -5.55768e-07 -4.1447e-07
- -2.73173e-07 -1.31875e-07 9.42259e-09 1.5072e-07 2.92018e-07
- 4.33315e-07 5.74613e-07 7.10363e-07 8.01984e-07 8.93604e-07
- 9.85225e-07 1.07685e-06 0.04474 0.0928765 0.141327 0.0176048
- -0.071675 -0.0124613 0.989022 2.28104 3.40619 4.21417 4.67173
- 4.87438 4.96044 4.98996 4.99858 4.96672 4.89502 4.79391
- 4.76433 4.8387 4.98612 5.0161 5.01722 5.01437 5.01256 4.99827
- 4.95807 4.9209 4.88217 4.83006 4.78461 4.80759 4.85548 4.89604
- 4.9254 4.94617 4.96126 4.97374 4.98255 4.98792 4.99126 4.99361
- 4.99554 4.99699 4.99792 4.99846 4.99881 4.99905 4.99924
- 4.99938 4.99949 4.99955 4.9997 4.9998 4.99982 4.99982 4.99982
- 4.99982 4.99982 4.99983 4.99984 4.99985 4.99986 4.99987
- 4.99988 4.99989 4.9999 4.99992 4.99993 4.99994 4.99995 4.99995
- 4.99996 4.99996 4.99998 4.99999 5.00001 5.00002 5.00002
- 5.00001 5.00001 5 4.99999 4.99999 4.99998 4.99998 4.99998
- 4.99998 4.99998 4.99998 4.99998 4.99998 4.99998 4.99998
- 4.99999 4.99999 4.99999 4.99999 5 5 5 5 5 5 5.00001 5.00001
- 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
- 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
+ 1.86175 2.00199 2.08919 1.84314 1.08254 0.214737 0.0377351
+ 0.00952455 0.00232763 0.000563614 0.000263477 0.000148642
+ 0.000285086 0.000242592 7.34699e-05 -1.53467e-05 -0.0161874
+ -0.0157876 -0.0141194 0.0132576 0.0903272 0.109938 0.0535295
+ 0.0224216 0.00940945 0.00466825 -0.000649972 -0.00654752
+ -0.00333248 -0.00103671 -0.000508276 -5.8896e-05 -0.00043938
+ -0.000544704 -0.00044444 -0.000307093 -0.00024517 -0.000154538
+ -8.78602e-05 -7.10461e-05 -6.06485e-05 -3.91039e-05 -8.45988e-06
+ 9.43442e-06 1.28351e-05 -2.16734e-06 -2.6142e-05 -2.54768e-05
+ -1.88997e-05 -1.17906e-05 -7.3808e-06 -2.97101e-06 1.19146e-07
+ 2.94246e-06 5.38942e-06 3.88851e-06 2.38761e-06 8.86704e-07
+ -6.14201e-07 -2.11511e-06 -2.59565e-06 -2.38885e-06 -2.18205e-06
+ -1.97525e-06 -1.76845e-06 -1.56241e-06 -1.36258e-06 -1.16276e-06
+ -9.62939e-07 -7.63116e-07 -5.63293e-07 -3.6347e-07 -1.63647e-07
+ 3.61756e-08 2.35999e-07 4.35822e-07 6.07653e-07 5.90323e-07
+ 5.72994e-07 5.55665e-07 5.38336e-07 5.21007e-07 5.03678e-07
+ 4.86349e-07 4.6902e-07 4.51691e-07 4.34361e-07 4.11899e-07
+ 3.60315e-07 3.08731e-07 2.57146e-07 2.05562e-07 1.53977e-07
+ 1.02393e-07 5.08082e-08 -7.76222e-10 -5.23607e-08 -1.03945e-07
+ -1.47815e-07 -1.54225e-07 -1.60635e-07 -1.67045e-07 -1.73455e-07
+ -1.79864e-07 -1.86274e-07 -1.92684e-07 -1.99094e-07 -2.05504e-07
+ -2.11914e-07 -2.18324e-07 -2.24734e-07 -2.31144e-07 -2.37554e-07
+ -2.43964e-07 -2.50373e-07 -2.56783e-07 -2.63193e-07 -2.69603e-07
+ -2.76013e-07 -2.82423e-07 2.92534e-06 0.0446777 0.024278
+ -0.0518987 -0.0636547 0.00983929 -0.000518204 -0.000265194
+ 0.000154772 0.000299538 3.12715e-05 -3.18225e-05 -2.48268e-05
+ -1.16701e-05 -6.05117e-06 7.61116e-06 -0.0163668 -0.0158244
+ -0.0141177 0.0100085 0.0857144 0.107784 0.051862 0.0204448
+ 0.00629858 0.000967736 0.00121674 0.00190276 0.00154009
+ 0.000860922 0.000410386 0.000164585 3.99493e-05 1.93797e-05
+ 5.67594e-05 0.000110126 2.49925e-05 -7.17815e-05 -0.000142299
+ -1.63109e-05 0.000439529 0.000562489 0.000594599 0.000326164
+ 0.000126423 -4.26063e-05 -0.000122927 -0.000114152 -6.72706e-05
+ -6.41242e-05 -0.000135588 2.61507e-05 0.000134036 6.43734e-06
+ -4.6223e-05 -0.000112047 -0.000101388 -8.67847e-05 -0.000117664
+ -0.000133957 -0.000116558 -0.000100873 -7.65448e-05 -4.44964e-05
+ -3.6677e-05 -5.26632e-05 -5.45172e-05 -5.13545e-05 -3.73869e-05
+ -1.99732e-05 -1.0907e-05 -1.10081e-05 -3.02609e-05 -5.18517e-05
+ -6.13597e-05 -5.30706e-05 -2.39572e-05 -3.24146e-05 -5.70062e-05
+ -0.000103448 -0.000135376 -0.0001024 -2.39007e-05 0.000110929
+ 0.000151226 0.000142044 0.000105922 5.62834e-05 4.78476e-05
+ 3.94117e-05 3.09759e-05 2.25401e-05 1.41042e-05 5.66837e-06
+ -2.76747e-06 -3.08639e-06 -2.81341e-06 -2.54043e-06 -2.26745e-06
+ -1.99447e-06 -1.72149e-06 -1.44851e-06 -1.26226e-06 -1.12096e-06
+ -9.79661e-07 -8.38363e-07 -6.97065e-07 -5.55768e-07 -4.1447e-07
+ -2.73173e-07 -1.31875e-07 9.42259e-09 1.5072e-07 2.92018e-07
+ 4.33315e-07 5.74613e-07 7.10363e-07 8.01984e-07 8.93604e-07
+ 9.85225e-07 1.07685e-06 0.04474 0.0928765 0.141327 0.0176048
+ -0.071675 -0.0124613 0.989022 2.28104 3.40619 4.21417 4.67173
+ 4.87438 4.96044 4.98996 4.99858 4.96672 4.89502 4.79391
+ 4.76433 4.8387 4.98612 5.0161 5.01722 5.01437 5.01256 4.99827
+ 4.95807 4.9209 4.88217 4.83006 4.78461 4.80759 4.85548 4.89604
+ 4.9254 4.94617 4.96126 4.97374 4.98255 4.98792 4.99126 4.99361
+ 4.99554 4.99699 4.99792 4.99846 4.99881 4.99905 4.99924
+ 4.99938 4.99949 4.99955 4.9997 4.9998 4.99982 4.99982 4.99982
+ 4.99982 4.99982 4.99983 4.99984 4.99985 4.99986 4.99987
+ 4.99988 4.99989 4.9999 4.99992 4.99993 4.99994 4.99995 4.99995
+ 4.99996 4.99996 4.99998 4.99999 5.00001 5.00002 5.00002
+ 5.00001 5.00001 5 4.99999 4.99999 4.99998 4.99998 4.99998
+ 4.99998 4.99998 4.99998 4.99998 4.99998 4.99998 4.99998
+ 4.99999 4.99999 4.99999 4.99999 5 5 5 5 5 5 5.00001 5.00001
+ 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
+ 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
EOD
@v[16].set(<<-'EOD')
- 1.86175 1.73073 1.50572 1.89001 3.39004 4.36034 4.79012
- 4.93798 4.98305 4.99539 4.9979 4.99904 4.99772 4.9983 4.99935
- 4.99975 4.98837 4.99456 4.99728 5.01838 5.04568 5.00759
- 4.98112 4.98479 4.99197 4.99641 4.99747 4.99775 5.00043
- 5.0007 5.00035 5.00023 4.99976 5.00002 5.00007 5.0002 4.99993
- 5.00003 5.00021 5.00006 4.99993 4.99992 5.00002 5.00013
- 5.00017 5.00009 4.99992 4.99991 4.99993 4.99996 4.99998
- 4.99999 5.00001 5.00003 5.00005 5.00004 5.00004 5.00003
- 5.00002 5.00001 5 4.99999 4.99999 4.99998 4.99998 4.99997
- 4.99997 4.99998 4.99998 4.99998 4.99998 4.99999 4.99999
- 4.99999 4.99999 5 5 5 5 5 5 5.00001 5.00001 5.00001 5.00001
- 5.00001 5.00001 5.00002 5.00001 5.00001 5.00001 5.00001
- 5.00001 5.00001 5.00001 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
- 5 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
- 4.99999 5 5.01498 4.99342 4.96899 5.00301 5.02627 4.9977
- 4.99548 4.99757 5.00277 5.00245 5.0014 5.00069 5.00032 5.00014
- 5.00009 4.9867 4.99262 4.99607 5.01805 5.04713 5.00927 4.98184
- 4.98483 4.9914 4.99616 4.99902 4.9999 4.99987 4.99979 4.99981
- 4.99989 4.99994 4.99998 5.0002 5.00001 5.00008 5.00008 5.0001
- 5.00021 5.00032 5.00025 5.00019 5.00006 5.00007 4.99994
- 4.99997 4.99999 5.00023 5.00008 4.99993 4.99998 4.99986
- 4.99982 5.00003 4.99985 4.99996 5.00014 5 4.99984 4.99979
- 4.99982 4.99993 5.00008 5.00011 5.00002 4.99996 4.9999 4.99994
- 5.00001 5.00007 5.00009 4.99995 4.99978 4.99971 4.99976
- 4.99997 4.99996 4.99989 4.99972 4.99955 4.99953 4.99959
- 4.99976 4.9999 5.00005 5.00023 5.00039 5.00034 5.00029 5.00024
- 5.00019 5.00014 5.00009 5.00004 5.00003 5.00002 5.00001
- 5 5 4.99999 4.99998 4.99998 4.99998 4.99998 4.99998 4.99999
- 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 5 5 5 5
- 5.00001 5.00002 5.00003 5.00004 5.01564 5.03395 5.04932
- 5.11868 3.92502 1.31888 0.163888 0.0946876 0.0789578 0.0565084
- 0.0260333 0.0156986 0.00907667 0.00613629 0.00468417 -0.00174008
- -0.0021422 0.000586962 0.0124937 0.0147977 0.00838454 0.00039383
- -0.000522021 -0.000426598 -0.000290214 -0.00173713 -0.00384132
- -0.00382945 -0.00429219 -0.00580193 -0.00393246 0.0017543
- 0.00423045 0.00408931 0.0031976 0.00245457 0.00187293 0.00159068
- 0.00105697 0.000609902 0.000358825 0.000334125 0.000212708
- 0.000168116 8.97349e-05 5.21578e-05 3.84527e-05 2.93033e-05
- 2.10067e-05 1.59954e-05 1.13917e-05 5.49738e-06 2.77217e-05
- 6.51259e-06 -6.65468e-06 2.09837e-06 -6.617e-06 -4.80187e-06
- 1.55031e-06 4.26536e-06 7.69457e-07 -1.46213e-06 -7.25202e-07
- 3.26501e-06 6.55807e-06 7.524e-06 6.07209e-06 6.00701e-06
- 5.41166e-06 3.86573e-06 1.10651e-06 -2.74603e-06 -2.18566e-06
- 2.3658e-06 8.59956e-06 8.35046e-06 2.90621e-06 -8.75982e-07
- -1.87189e-06 -2.1528e-06 -1.94875e-06 -1.74471e-06 -1.54067e-06
- -1.33662e-06 -1.13258e-06 -8.40567e-07 -5.20743e-07 -2.00918e-07
- 1.18906e-07 4.38731e-07 6.11382e-07 6.01529e-07 5.91675e-07
- 5.81822e-07 5.71968e-07 5.62115e-07 5.52261e-07 5.42407e-07
- 5.32554e-07 5.227e-07 5.12847e-07 4.72812e-07 4.26137e-07
- 3.79462e-07 3.32786e-07 2.86111e-07 2.39436e-07 1.92761e-07
- 1.46086e-07 9.94107e-08 5.27356e-08 -2.77779e-10 -7.98079e-08
- -1.59338e-07 -2.38868e-07 -3.18398e-07 -3.97928e-07 -4.77458e-07
- -5.56988e-07 -6.36519e-07
+ 1.86175 1.73073 1.50572 1.89001 3.39004 4.36034 4.79012
+ 4.93798 4.98305 4.99539 4.9979 4.99904 4.99772 4.9983 4.99935
+ 4.99975 4.98837 4.99456 4.99728 5.01838 5.04568 5.00759
+ 4.98112 4.98479 4.99197 4.99641 4.99747 4.99775 5.00043
+ 5.0007 5.00035 5.00023 4.99976 5.00002 5.00007 5.0002 4.99993
+ 5.00003 5.00021 5.00006 4.99993 4.99992 5.00002 5.00013
+ 5.00017 5.00009 4.99992 4.99991 4.99993 4.99996 4.99998
+ 4.99999 5.00001 5.00003 5.00005 5.00004 5.00004 5.00003
+ 5.00002 5.00001 5 4.99999 4.99999 4.99998 4.99998 4.99997
+ 4.99997 4.99998 4.99998 4.99998 4.99998 4.99999 4.99999
+ 4.99999 4.99999 5 5 5 5 5 5 5.00001 5.00001 5.00001 5.00001
+ 5.00001 5.00001 5.00002 5.00001 5.00001 5.00001 5.00001
+ 5.00001 5.00001 5.00001 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+ 5 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
+ 4.99999 5 5.01498 4.99342 4.96899 5.00301 5.02627 4.9977
+ 4.99548 4.99757 5.00277 5.00245 5.0014 5.00069 5.00032 5.00014
+ 5.00009 4.9867 4.99262 4.99607 5.01805 5.04713 5.00927 4.98184
+ 4.98483 4.9914 4.99616 4.99902 4.9999 4.99987 4.99979 4.99981
+ 4.99989 4.99994 4.99998 5.0002 5.00001 5.00008 5.00008 5.0001
+ 5.00021 5.00032 5.00025 5.00019 5.00006 5.00007 4.99994
+ 4.99997 4.99999 5.00023 5.00008 4.99993 4.99998 4.99986
+ 4.99982 5.00003 4.99985 4.99996 5.00014 5 4.99984 4.99979
+ 4.99982 4.99993 5.00008 5.00011 5.00002 4.99996 4.9999 4.99994
+ 5.00001 5.00007 5.00009 4.99995 4.99978 4.99971 4.99976
+ 4.99997 4.99996 4.99989 4.99972 4.99955 4.99953 4.99959
+ 4.99976 4.9999 5.00005 5.00023 5.00039 5.00034 5.00029 5.00024
+ 5.00019 5.00014 5.00009 5.00004 5.00003 5.00002 5.00001
+ 5 5 4.99999 4.99998 4.99998 4.99998 4.99998 4.99998 4.99999
+ 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 5 5 5 5
+ 5.00001 5.00002 5.00003 5.00004 5.01564 5.03395 5.04932
+ 5.11868 3.92502 1.31888 0.163888 0.0946876 0.0789578 0.0565084
+ 0.0260333 0.0156986 0.00907667 0.00613629 0.00468417 -0.00174008
+ -0.0021422 0.000586962 0.0124937 0.0147977 0.00838454 0.00039383
+ -0.000522021 -0.000426598 -0.000290214 -0.00173713 -0.00384132
+ -0.00382945 -0.00429219 -0.00580193 -0.00393246 0.0017543
+ 0.00423045 0.00408931 0.0031976 0.00245457 0.00187293 0.00159068
+ 0.00105697 0.000609902 0.000358825 0.000334125 0.000212708
+ 0.000168116 8.97349e-05 5.21578e-05 3.84527e-05 2.93033e-05
+ 2.10067e-05 1.59954e-05 1.13917e-05 5.49738e-06 2.77217e-05
+ 6.51259e-06 -6.65468e-06 2.09837e-06 -6.617e-06 -4.80187e-06
+ 1.55031e-06 4.26536e-06 7.69457e-07 -1.46213e-06 -7.25202e-07
+ 3.26501e-06 6.55807e-06 7.524e-06 6.07209e-06 6.00701e-06
+ 5.41166e-06 3.86573e-06 1.10651e-06 -2.74603e-06 -2.18566e-06
+ 2.3658e-06 8.59956e-06 8.35046e-06 2.90621e-06 -8.75982e-07
+ -1.87189e-06 -2.1528e-06 -1.94875e-06 -1.74471e-06 -1.54067e-06
+ -1.33662e-06 -1.13258e-06 -8.40567e-07 -5.20743e-07 -2.00918e-07
+ 1.18906e-07 4.38731e-07 6.11382e-07 6.01529e-07 5.91675e-07
+ 5.81822e-07 5.71968e-07 5.62115e-07 5.52261e-07 5.42407e-07
+ 5.32554e-07 5.227e-07 5.12847e-07 4.72812e-07 4.26137e-07
+ 3.79462e-07 3.32786e-07 2.86111e-07 2.39436e-07 1.92761e-07
+ 1.46086e-07 9.94107e-08 5.27356e-08 -2.77779e-10 -7.98079e-08
+ -1.59338e-07 -2.38868e-07 -3.18398e-07 -3.97928e-07 -4.77458e-07
+ -5.56988e-07 -6.36519e-07
EOD
@v[17].set(<<-'EOD')
- 5 5.16963 4.84136 3.33754 0.316206 0.103113 0.0273341 0.0221102
- 0.0177008 0.0143758 0.0115203 0.00929231 0.00752716 0.00625439
- 0.00489872 0.00403656 -0.0657317 -0.0256467 0.165394 0.985963
- 3.05067 4.55799 4.89728 4.92464 4.8882 4.90592 4.97315 4.99241
- 4.99694 4.99845 4.99905 4.99939 4.99959 4.99971 4.9998 4.99986
- 4.9999 4.99993 4.99995 4.99996 4.99997 4.99998 4.99998 4.99999
- 4.99999 4.99999 4.99999 4.99999 5 5.00001 5.00003 5.00005
- 5.00004 5.00002 5 4.99999 4.99999 4.99998 4.99998 4.99997
- 4.99997 4.99998 4.99998 4.99999 4.99999 5 5 5 5 5 5.00001
- 5.00001 5.00001 5.00001 5.00001 5.00001 5.00002 5.00001
- 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5 5 5 5
- 5 5 5 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99998
- 4.99998 4.99998 4.99999 4.99999 4.99999 4.99999 4.99999
- 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
- 4.99999 4.99999 5 5 5 5 5 5 5.00025 5.1657 4.69981 2.43895
- 0.0229743 0.0351406 -0.0211974 -0.0312063 -0.0160331 -0.0021718
- -0.000766597 -0.000251052 -5.49363e-05 -3.36364e-06 -2.01983e-06
- -9.70575e-06 -0.0657007 -0.0205247 0.183332 1.07163 3.11839
- 4.46213 4.84163 4.95195 4.99159 5.02084 5.04029 5.04138
- 5.0271 5.00445 4.97957 4.95702 4.95231 4.97819 4.99191 4.9963
- 4.99822 4.99878 4.99903 4.99925 4.99942 4.9995 4.99954 4.99957
- 4.99961 4.99966 4.9997 4.99974 4.99977 4.99981 4.99983 4.99986
- 4.99988 4.9999 4.99991 4.99992 4.99994 4.99995 4.99995 4.99996
- 4.99997 4.99997 4.99998 4.99998 4.99998 4.99999 4.99999
- 4.99999 4.99999 4.99999 4.99999 4.99999 5 5 5 5 5 5 5 5
- 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5.00001 5.00001 5.00001
- 5.00002 5.00002 5.00002 5.00002 5.00002 5.00002 5.00002
- 5.00002 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
- 5.00001 5 5 5 4.99999 4.99998 4.99997 4.99996 5.14239 4.76219
- 3.16574 0.299969 0.0631609 -0.00118611 -0.00026052 -5.96333e-05
- -1.44904e-05 -4.3859e-06 -2.99454e-06 1.10547e-06 4.84662e-06
- 1.30971e-05 2.23082e-05 -0.0655844 -0.0204818 0.182507 1.05954
- 3.12277 4.46735 4.83915 4.94512 4.97679 4.98654 4.9966 5.00833
- 5.00776 5.00432 5.00199 5.00086 5.00033 5.00008 5 5.00001
- 5 5.00005 5.00002 4.99981 4.99991 4.99998 4.99979 4.99979
- 4.99984 4.9998 4.9998 5.00006 5.00002 5.00001 5 5 4.99992
- 4.99998 4.99999 5.00002 5.00014 4.99999 4.99987 4.99993
- 5.00003 5.00011 5.00005 4.99996 4.99987 4.99985 4.99994
- 5.00009 5.0001 5 4.99993 4.99997 5.00008 5.00015 5.00021
- 5.00021 5.00007 4.99978 4.99965 4.99973 4.9999 4.99992 4.99995
- 4.99997 4.99999 5.00001 5.00002 5.00001 5.00001 5.00001
- 5 5 5 5 5 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
- 4.99998 4.99998 4.99999 4.99999 4.99999 4.99999 4.99999
- 4.99999 4.99999 5 5 5 5 5 5.00001 5.00001 5.00001 5.00002
- 5.00002 5.00002
+ 5 5.16963 4.84136 3.33754 0.316206 0.103113 0.0273341 0.0221102
+ 0.0177008 0.0143758 0.0115203 0.00929231 0.00752716 0.00625439
+ 0.00489872 0.00403656 -0.0657317 -0.0256467 0.165394 0.985963
+ 3.05067 4.55799 4.89728 4.92464 4.8882 4.90592 4.97315 4.99241
+ 4.99694 4.99845 4.99905 4.99939 4.99959 4.99971 4.9998 4.99986
+ 4.9999 4.99993 4.99995 4.99996 4.99997 4.99998 4.99998 4.99999
+ 4.99999 4.99999 4.99999 4.99999 5 5.00001 5.00003 5.00005
+ 5.00004 5.00002 5 4.99999 4.99999 4.99998 4.99998 4.99997
+ 4.99997 4.99998 4.99998 4.99999 4.99999 5 5 5 5 5 5.00001
+ 5.00001 5.00001 5.00001 5.00001 5.00001 5.00002 5.00001
+ 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5 5 5 5
+ 5 5 5 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99998
+ 4.99998 4.99998 4.99999 4.99999 4.99999 4.99999 4.99999
+ 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
+ 4.99999 4.99999 5 5 5 5 5 5 5.00025 5.1657 4.69981 2.43895
+ 0.0229743 0.0351406 -0.0211974 -0.0312063 -0.0160331 -0.0021718
+ -0.000766597 -0.000251052 -5.49363e-05 -3.36364e-06 -2.01983e-06
+ -9.70575e-06 -0.0657007 -0.0205247 0.183332 1.07163 3.11839
+ 4.46213 4.84163 4.95195 4.99159 5.02084 5.04029 5.04138
+ 5.0271 5.00445 4.97957 4.95702 4.95231 4.97819 4.99191 4.9963
+ 4.99822 4.99878 4.99903 4.99925 4.99942 4.9995 4.99954 4.99957
+ 4.99961 4.99966 4.9997 4.99974 4.99977 4.99981 4.99983 4.99986
+ 4.99988 4.9999 4.99991 4.99992 4.99994 4.99995 4.99995 4.99996
+ 4.99997 4.99997 4.99998 4.99998 4.99998 4.99999 4.99999
+ 4.99999 4.99999 4.99999 4.99999 4.99999 5 5 5 5 5 5 5 5
+ 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5.00001 5.00001 5.00001
+ 5.00002 5.00002 5.00002 5.00002 5.00002 5.00002 5.00002
+ 5.00002 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
+ 5.00001 5 5 5 4.99999 4.99998 4.99997 4.99996 5.14239 4.76219
+ 3.16574 0.299969 0.0631609 -0.00118611 -0.00026052 -5.96333e-05
+ -1.44904e-05 -4.3859e-06 -2.99454e-06 1.10547e-06 4.84662e-06
+ 1.30971e-05 2.23082e-05 -0.0655844 -0.0204818 0.182507 1.05954
+ 3.12277 4.46735 4.83915 4.94512 4.97679 4.98654 4.9966 5.00833
+ 5.00776 5.00432 5.00199 5.00086 5.00033 5.00008 5 5.00001
+ 5 5.00005 5.00002 4.99981 4.99991 4.99998 4.99979 4.99979
+ 4.99984 4.9998 4.9998 5.00006 5.00002 5.00001 5 5 4.99992
+ 4.99998 4.99999 5.00002 5.00014 4.99999 4.99987 4.99993
+ 5.00003 5.00011 5.00005 4.99996 4.99987 4.99985 4.99994
+ 5.00009 5.0001 5 4.99993 4.99997 5.00008 5.00015 5.00021
+ 5.00021 5.00007 4.99978 4.99965 4.99973 4.9999 4.99992 4.99995
+ 4.99997 4.99999 5.00001 5.00002 5.00001 5.00001 5.00001
+ 5 5 5 5 5 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
+ 4.99998 4.99998 4.99999 4.99999 4.99999 4.99999 4.99999
+ 4.99999 4.99999 5 5 5 5 5 5.00001 5.00001 5.00001 5.00002
+ 5.00002 5.00002
EOD
@v[18].set(<<-'EOD')
- 5 5.0333 5.02472 4.92559 4.18383 3.93923 3.9961 4.14293
- 4.28591 4.41336 4.52157 4.61101 4.68472 4.7439 4.79294 4.83239
- 4.80697 4.78808 4.79322 4.8838 5.08529 5.21863 4.88852 3.90198
- 2.14586 0.383977 0.101103 0.0525711 0.0318287 0.020895 0.0146908
- 0.010831 0.00830272 0.00656377 0.00532066 0.00440078 0.00369956
- 0.00315713 0.00272614 0.00237965 0.00209659 0.00186339 0.00167014
- 0.0015081 0.00137172 0.00125607 0.00115393 0.00106076 0.000980166
- 0.000918015 0.000862837 0.00080766 0.000763488 0.000721541
- 0.000680825 0.000653026 0.000625226 0.000597426 0.000569627
- 0.000541827 0.000519087 0.000499756 0.000480424 0.000461093
- 0.000441761 0.000423291 0.000411941 0.00040059 0.00038924
- 0.000377889 0.000366539 0.000355188 0.000343838 0.000332487
- 0.000321137 0.000309786 0.000299055 0.000292509 0.000285963
- 0.000279417 0.000272871 0.000266325 0.000259779 0.000253233
- 0.000246686 0.00024014 0.000233594 0.000227387 0.0002231
- 0.000218813 0.000214526 0.00021024 0.000205953 0.000201666
- 0.000197379 0.000193092 0.000188805 0.000184519 0.000180526
- 0.000177963 0.0001754 0.000172837 0.000170274 0.000167711
- 0.000165148 0.000162585 0.000160022 0.000157459 0.000154895
- 0.000152332 0.000149769 0.000147206 0.000144643 0.00014208
- 0.000139517 0.000136954 0.000134391 0.000131828 0.000129265
- 0.000126702 0.000132838 0.0311184 0.163151 0.34986 0.604501
- 0.357125 0.136137 0.0711304 0.0346959 0.0212674 0.00872193
- 0.00252206 0.000455269 7.59332e-05 2.91532e-05 0.000320562
- -0.0720911 -0.0840491 -0.0791345 -0.0404143 0.0182035 -0.0235871
- -0.0426072 -0.0597501 0.00824773 0.481404 1.32496 2.11949
- 2.57317 2.58202 2.15054 1.33786 0.45702 0.153772 0.0913584
- 0.0604989 0.0421591 0.0271456 0.0170021 0.0115815 0.00907886
- 0.00742466 0.00626096 0.00531127 0.00450501 0.00381927 0.00323718
- 0.00274374 0.00232494 0.00196885 0.00166686 0.00141134 0.00119437
- 0.0010109 0.000855534 0.000723378 0.000611408 0.000516704
- 0.000436769 0.000369523 0.000313026 0.00026526 0.000223976
- 0.000188972 0.000159042 0.000134148 0.000112688 9.49738e-05
- 7.97877e-05 6.721e-05 5.65115e-05 4.77194e-05 4.03591e-05
- 3.42848e-05 2.92627e-05 2.50435e-05 2.1412e-05 1.84532e-05
- 1.58624e-05 1.34673e-05 1.14461e-05 1.00935e-05 9.12375e-06
- 8.50202e-06 7.81431e-06 7.20729e-06 6.73936e-06 6.3702e-06
- 5.90049e-06 5.43077e-06 4.96105e-06 4.49133e-06 4.02162e-06
- 3.5519e-06 3.08218e-06 2.79099e-06 2.51281e-06 2.23463e-06
- 1.95645e-06 1.67827e-06 1.40009e-06 1.12191e-06 1.01376e-06
- 9.9375e-07 9.73741e-07 9.53733e-07 9.33724e-07 9.13715e-07
- 8.93707e-07 8.73698e-07 8.5369e-07 8.33681e-07 8.13673e-07
- 7.93664e-07 7.73655e-07 7.53647e-07 7.21781e-07 5.956e-07
- 4.69419e-07 3.43239e-07 2.17058e-07 0.0284032 0.0374438
- -0.0157543 -0.0680497 0.0504768 0.0100294 0.00222261 0.000528697
- 0.000132929 3.99489e-05 2.46066e-05 4.56327e-06 -6.54853e-06
- 1.33783e-05 -3.68221e-05 -0.0724498 -0.0843663 -0.0792935
- -0.0406426 0.0200019 0.0426259 0.0220753 0.00668555 -0.000968483
- 0.024662 0.0383437 0.0911513 0.087848 0.0602076 0.0390559
- 0.0260573 0.0180444 0.012974 0.00985409 0.00788132 0.0064228
- 0.005545 0.00453571 0.00364245 0.00310278 0.00270523 0.00236439
- 0.0020945 0.00186808 0.00167493 0.00151731 0.00138594 0.00126945
- 0.00116695 0.0010762 0.000996366 0.000928387 0.000864414
- 0.000808258 0.000759574 0.000713865 0.000666712 0.000632716
- 0.000601262 0.000572163 0.000543986 0.000515253 0.0004897
- 0.000468112 0.000449313 0.000432981 0.000417911 0.000401307
- 0.000382712 0.000366678 0.000355736 0.000349171 0.000335727
- 0.000317091 0.000296086 0.000283543 0.000277366 0.000272233
- 0.000267001 0.000263147 0.000256699 0.000250251 0.000243803
- 0.000237355 0.000230907 0.000225424 0.000220247 0.000215069
- 0.000209892 0.000204714 0.000200213 0.000196548 0.000192884
- 0.00018922 0.000185556 0.000181892 0.000178228 0.000174564
- 0.0001709 0.000167236 0.000163572 0.000160824 0.000158279
- 0.000155733 0.000153187 0.000150641 0.000148095 0.000145549
- 0.000143003 0.000140457 0.000137911 0.000135457 0.000133386
- 0.000131315 0.000129245 0.000127174 0.000125103 0.000123032
- 0.000120961 0.000118891
+ 5 5.0333 5.02472 4.92559 4.18383 3.93923 3.9961 4.14293
+ 4.28591 4.41336 4.52157 4.61101 4.68472 4.7439 4.79294 4.83239
+ 4.80697 4.78808 4.79322 4.8838 5.08529 5.21863 4.88852 3.90198
+ 2.14586 0.383977 0.101103 0.0525711 0.0318287 0.020895 0.0146908
+ 0.010831 0.00830272 0.00656377 0.00532066 0.00440078 0.00369956
+ 0.00315713 0.00272614 0.00237965 0.00209659 0.00186339 0.00167014
+ 0.0015081 0.00137172 0.00125607 0.00115393 0.00106076 0.000980166
+ 0.000918015 0.000862837 0.00080766 0.000763488 0.000721541
+ 0.000680825 0.000653026 0.000625226 0.000597426 0.000569627
+ 0.000541827 0.000519087 0.000499756 0.000480424 0.000461093
+ 0.000441761 0.000423291 0.000411941 0.00040059 0.00038924
+ 0.000377889 0.000366539 0.000355188 0.000343838 0.000332487
+ 0.000321137 0.000309786 0.000299055 0.000292509 0.000285963
+ 0.000279417 0.000272871 0.000266325 0.000259779 0.000253233
+ 0.000246686 0.00024014 0.000233594 0.000227387 0.0002231
+ 0.000218813 0.000214526 0.00021024 0.000205953 0.000201666
+ 0.000197379 0.000193092 0.000188805 0.000184519 0.000180526
+ 0.000177963 0.0001754 0.000172837 0.000170274 0.000167711
+ 0.000165148 0.000162585 0.000160022 0.000157459 0.000154895
+ 0.000152332 0.000149769 0.000147206 0.000144643 0.00014208
+ 0.000139517 0.000136954 0.000134391 0.000131828 0.000129265
+ 0.000126702 0.000132838 0.0311184 0.163151 0.34986 0.604501
+ 0.357125 0.136137 0.0711304 0.0346959 0.0212674 0.00872193
+ 0.00252206 0.000455269 7.59332e-05 2.91532e-05 0.000320562
+ -0.0720911 -0.0840491 -0.0791345 -0.0404143 0.0182035 -0.0235871
+ -0.0426072 -0.0597501 0.00824773 0.481404 1.32496 2.11949
+ 2.57317 2.58202 2.15054 1.33786 0.45702 0.153772 0.0913584
+ 0.0604989 0.0421591 0.0271456 0.0170021 0.0115815 0.00907886
+ 0.00742466 0.00626096 0.00531127 0.00450501 0.00381927 0.00323718
+ 0.00274374 0.00232494 0.00196885 0.00166686 0.00141134 0.00119437
+ 0.0010109 0.000855534 0.000723378 0.000611408 0.000516704
+ 0.000436769 0.000369523 0.000313026 0.00026526 0.000223976
+ 0.000188972 0.000159042 0.000134148 0.000112688 9.49738e-05
+ 7.97877e-05 6.721e-05 5.65115e-05 4.77194e-05 4.03591e-05
+ 3.42848e-05 2.92627e-05 2.50435e-05 2.1412e-05 1.84532e-05
+ 1.58624e-05 1.34673e-05 1.14461e-05 1.00935e-05 9.12375e-06
+ 8.50202e-06 7.81431e-06 7.20729e-06 6.73936e-06 6.3702e-06
+ 5.90049e-06 5.43077e-06 4.96105e-06 4.49133e-06 4.02162e-06
+ 3.5519e-06 3.08218e-06 2.79099e-06 2.51281e-06 2.23463e-06
+ 1.95645e-06 1.67827e-06 1.40009e-06 1.12191e-06 1.01376e-06
+ 9.9375e-07 9.73741e-07 9.53733e-07 9.33724e-07 9.13715e-07
+ 8.93707e-07 8.73698e-07 8.5369e-07 8.33681e-07 8.13673e-07
+ 7.93664e-07 7.73655e-07 7.53647e-07 7.21781e-07 5.956e-07
+ 4.69419e-07 3.43239e-07 2.17058e-07 0.0284032 0.0374438
+ -0.0157543 -0.0680497 0.0504768 0.0100294 0.00222261 0.000528697
+ 0.000132929 3.99489e-05 2.46066e-05 4.56327e-06 -6.54853e-06
+ 1.33783e-05 -3.68221e-05 -0.0724498 -0.0843663 -0.0792935
+ -0.0406426 0.0200019 0.0426259 0.0220753 0.00668555 -0.000968483
+ 0.024662 0.0383437 0.0911513 0.087848 0.0602076 0.0390559
+ 0.0260573 0.0180444 0.012974 0.00985409 0.00788132 0.0064228
+ 0.005545 0.00453571 0.00364245 0.00310278 0.00270523 0.00236439
+ 0.0020945 0.00186808 0.00167493 0.00151731 0.00138594 0.00126945
+ 0.00116695 0.0010762 0.000996366 0.000928387 0.000864414
+ 0.000808258 0.000759574 0.000713865 0.000666712 0.000632716
+ 0.000601262 0.000572163 0.000543986 0.000515253 0.0004897
+ 0.000468112 0.000449313 0.000432981 0.000417911 0.000401307
+ 0.000382712 0.000366678 0.000355736 0.000349171 0.000335727
+ 0.000317091 0.000296086 0.000283543 0.000277366 0.000272233
+ 0.000267001 0.000263147 0.000256699 0.000250251 0.000243803
+ 0.000237355 0.000230907 0.000225424 0.000220247 0.000215069
+ 0.000209892 0.000204714 0.000200213 0.000196548 0.000192884
+ 0.00018922 0.000185556 0.000181892 0.000178228 0.000174564
+ 0.0001709 0.000167236 0.000163572 0.000160824 0.000158279
+ 0.000155733 0.000153187 0.000150641 0.000148095 0.000145549
+ 0.000143003 0.000140457 0.000137911 0.000135457 0.000133386
+ 0.000131315 0.000129245 0.000127174 0.000125103 0.000123032
+ 0.000120961 0.000118891
EOD
@v[19].set(<<-'EOD')
- 1.86175 1.99994 2.0833 2.01627 2.42503 3.25769 3.62134 3.88827
- 4.09688 4.26773 4.40529 4.51734 4.60827 4.68313 4.74346
- 4.79302 4.72815 4.68959 4.70421 4.81316 5.01375 5.14493
- 5.10305 5.0699 5.04484 5.03751 5.03348 5.02504 5.01799 5.01271
- 5.00895 5.00628 5.0044 5.00309 5.00216 5.00151 5.00105 5.00073
- 5.00051 5.00034 5.00023 5.00015 5.0001 5.00007 5.00003 4.99998
- 4.99993 4.99993 4.99995 4.99999 5.00001 5.00003 5.00002
- 5.00001 5 5 5 5 4.99999 4.99999 4.99999 5 5 5 5 5 5 5 5
- 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
- 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5.00017 5.17398
- 4.94779 3.78508 1.52302 0.608808 0.244311 0.126053 0.0597175
- 0.038422 0.0158174 0.00481338 0.00107847 0.000301256 0.000114861
- 0.00059489 -0.118904 -0.147478 -0.158986 -0.080544 0.165361
- 0.171378 0.0776087 0.0435738 0.0428235 0.0423755 0.0347695
- 0.0225061 0.0155539 0.0121357 0.0107997 0.0103976 0.0124406
- 0.016814 0.0167556 0.0149852 0.01459 0.0141182 0.0131934
- 0.0120286 0.0108692 0.0097184 0.00855881 0.00744912 0.00643877
- 0.00554044 0.00475165 0.00406535 0.00347158 0.00295981 0.00251995
- 0.00214318 0.00182101 0.00154613 0.00131196 0.0011119 0.000941587
- 0.000796999 0.000674582 0.000571283 0.000484276 0.000410649
- 0.000347005 0.000292984 0.000246715 0.000208143 0.00017489
- 0.000147412 0.000123854 0.000104332 8.77229e-05 7.40686e-05
- 6.2637e-05 5.32e-05 4.53946e-05 3.88343e-05 3.31864e-05
- 2.85905e-05 2.45725e-05 2.08671e-05 1.77301e-05 1.55911e-05
- 1.40153e-05 1.29421e-05 1.18693e-05 1.09815e-05 1.03484e-05
- 9.87664e-06 9.14446e-06 8.41228e-06 7.68011e-06 6.94793e-06
- 6.21575e-06 5.48357e-06 4.7514e-06 4.38454e-06 4.04432e-06
- 3.7041e-06 3.36388e-06 3.02366e-06 2.68344e-06 2.34322e-06
- 2.15196e-06 2.03791e-06 1.92386e-06 1.80982e-06 1.69577e-06
- 1.58173e-06 1.46768e-06 1.35363e-06 1.23959e-06 1.12554e-06
- 1.0115e-06 8.9745e-07 7.83404e-07 6.69358e-07 4.76113e-07
- -3.47071e-07 -1.17025e-06 -1.99344e-06 -2.81662e-06 0.0783754
- 0.0500262 -0.0659563 -0.120914 0.0815957 0.0154255 0.00347177
- 0.000840357 0.000214582 6.54655e-05 3.91709e-05 8.07396e-06
- -4.44265e-07 1.74384e-05 -4.52725e-05 -0.119379 -0.147984
- -0.159247 -0.0824604 0.169014 0.177628 0.0758742 0.010558
- -0.0346506 -0.0710288 -0.0838952 -0.0599521 -0.034568 -0.0181615
- -0.00968034 -0.00547115 -0.00333511 -0.00232468 -0.00181159
- -0.00143841 -0.00116601 -0.000839755 -0.000569764 -0.000578683
- -0.000490551 -0.000411712 -0.000437859 -0.000408185 -0.000356644
- -0.000311332 -0.000269006 -0.000221396 -0.000210054 -0.0001923
- -0.000175122 -0.000161039 -0.0001428 -0.000126123 -0.000127893
- -8.14516e-05 -0.000120166 -0.000154909 -0.000112733 -8.40377e-05
- -7.11342e-05 -8.09538e-05 -9.77789e-05 -9.82402e-05 -7.73531e-05
- -5.28255e-05 -3.1096e-05 -1.87967e-05 -1.96552e-05 -4.16655e-05
- -5.77185e-05 -5.24142e-05 -2.83153e-05 -1.90012e-05 -1.54415e-05
- -2.52569e-05 -6.23747e-05 -0.000130543 -0.000149394 -0.000110886
- -4.35517e-05 -4.17084e-05 -3.98651e-05 -3.80218e-05 -3.61785e-05
- -3.43352e-05 -3.36249e-05 -3.32729e-05 -3.29208e-05 -3.25687e-05
- -3.22166e-05 -3.17143e-05 -3.10258e-05 -3.03372e-05 -2.96486e-05
- -2.89601e-05 -2.82715e-05 -2.75829e-05 -2.68944e-05 -2.62058e-05
- -2.55173e-05 -2.48287e-05 -2.43043e-05 -2.38159e-05 -2.33276e-05
- -2.28393e-05 -2.2351e-05 -2.18626e-05 -2.13743e-05 -2.0886e-05
- -2.03977e-05 -1.99093e-05 -1.945e-05 -1.91122e-05 -1.87744e-05
- -1.84366e-05 -1.80987e-05 -1.77609e-05 -1.74231e-05 -1.70853e-05
- -1.67474e-05
+ 1.86175 1.99994 2.0833 2.01627 2.42503 3.25769 3.62134 3.88827
+ 4.09688 4.26773 4.40529 4.51734 4.60827 4.68313 4.74346
+ 4.79302 4.72815 4.68959 4.70421 4.81316 5.01375 5.14493
+ 5.10305 5.0699 5.04484 5.03751 5.03348 5.02504 5.01799 5.01271
+ 5.00895 5.00628 5.0044 5.00309 5.00216 5.00151 5.00105 5.00073
+ 5.00051 5.00034 5.00023 5.00015 5.0001 5.00007 5.00003 4.99998
+ 4.99993 4.99993 4.99995 4.99999 5.00001 5.00003 5.00002
+ 5.00001 5 5 5 5 4.99999 4.99999 4.99999 5 5 5 5 5 5 5 5
+ 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+ 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5.00017 5.17398
+ 4.94779 3.78508 1.52302 0.608808 0.244311 0.126053 0.0597175
+ 0.038422 0.0158174 0.00481338 0.00107847 0.000301256 0.000114861
+ 0.00059489 -0.118904 -0.147478 -0.158986 -0.080544 0.165361
+ 0.171378 0.0776087 0.0435738 0.0428235 0.0423755 0.0347695
+ 0.0225061 0.0155539 0.0121357 0.0107997 0.0103976 0.0124406
+ 0.016814 0.0167556 0.0149852 0.01459 0.0141182 0.0131934
+ 0.0120286 0.0108692 0.0097184 0.00855881 0.00744912 0.00643877
+ 0.00554044 0.00475165 0.00406535 0.00347158 0.00295981 0.00251995
+ 0.00214318 0.00182101 0.00154613 0.00131196 0.0011119 0.000941587
+ 0.000796999 0.000674582 0.000571283 0.000484276 0.000410649
+ 0.000347005 0.000292984 0.000246715 0.000208143 0.00017489
+ 0.000147412 0.000123854 0.000104332 8.77229e-05 7.40686e-05
+ 6.2637e-05 5.32e-05 4.53946e-05 3.88343e-05 3.31864e-05
+ 2.85905e-05 2.45725e-05 2.08671e-05 1.77301e-05 1.55911e-05
+ 1.40153e-05 1.29421e-05 1.18693e-05 1.09815e-05 1.03484e-05
+ 9.87664e-06 9.14446e-06 8.41228e-06 7.68011e-06 6.94793e-06
+ 6.21575e-06 5.48357e-06 4.7514e-06 4.38454e-06 4.04432e-06
+ 3.7041e-06 3.36388e-06 3.02366e-06 2.68344e-06 2.34322e-06
+ 2.15196e-06 2.03791e-06 1.92386e-06 1.80982e-06 1.69577e-06
+ 1.58173e-06 1.46768e-06 1.35363e-06 1.23959e-06 1.12554e-06
+ 1.0115e-06 8.9745e-07 7.83404e-07 6.69358e-07 4.76113e-07
+ -3.47071e-07 -1.17025e-06 -1.99344e-06 -2.81662e-06 0.0783754
+ 0.0500262 -0.0659563 -0.120914 0.0815957 0.0154255 0.00347177
+ 0.000840357 0.000214582 6.54655e-05 3.91709e-05 8.07396e-06
+ -4.44265e-07 1.74384e-05 -4.52725e-05 -0.119379 -0.147984
+ -0.159247 -0.0824604 0.169014 0.177628 0.0758742 0.010558
+ -0.0346506 -0.0710288 -0.0838952 -0.0599521 -0.034568 -0.0181615
+ -0.00968034 -0.00547115 -0.00333511 -0.00232468 -0.00181159
+ -0.00143841 -0.00116601 -0.000839755 -0.000569764 -0.000578683
+ -0.000490551 -0.000411712 -0.000437859 -0.000408185 -0.000356644
+ -0.000311332 -0.000269006 -0.000221396 -0.000210054 -0.0001923
+ -0.000175122 -0.000161039 -0.0001428 -0.000126123 -0.000127893
+ -8.14516e-05 -0.000120166 -0.000154909 -0.000112733 -8.40377e-05
+ -7.11342e-05 -8.09538e-05 -9.77789e-05 -9.82402e-05 -7.73531e-05
+ -5.28255e-05 -3.1096e-05 -1.87967e-05 -1.96552e-05 -4.16655e-05
+ -5.77185e-05 -5.24142e-05 -2.83153e-05 -1.90012e-05 -1.54415e-05
+ -2.52569e-05 -6.23747e-05 -0.000130543 -0.000149394 -0.000110886
+ -4.35517e-05 -4.17084e-05 -3.98651e-05 -3.80218e-05 -3.61785e-05
+ -3.43352e-05 -3.36249e-05 -3.32729e-05 -3.29208e-05 -3.25687e-05
+ -3.22166e-05 -3.17143e-05 -3.10258e-05 -3.03372e-05 -2.96486e-05
+ -2.89601e-05 -2.82715e-05 -2.75829e-05 -2.68944e-05 -2.62058e-05
+ -2.55173e-05 -2.48287e-05 -2.43043e-05 -2.38159e-05 -2.33276e-05
+ -2.28393e-05 -2.2351e-05 -2.18626e-05 -2.13743e-05 -2.0886e-05
+ -2.03977e-05 -1.99093e-05 -1.945e-05 -1.91122e-05 -1.87744e-05
+ -1.84366e-05 -1.80987e-05 -1.77609e-05 -1.74231e-05 -1.70853e-05
+ -1.67474e-05
EOD
@v[20].set(<<-'EOD')
- 1.86175 1.99724 2.17266 2.48439 3.15933 3.85231 4.38091
- 4.69033 4.85034 4.92851 4.96453 4.98188 4.98736 4.991 4.99482
- 4.9973 4.96422 4.89989 4.83907 4.83151 4.90868 5.04854 5.06104
- 5.04571 5.03219 5.03025 5.02273 5.01707 5.0123 5.0087 5.00611
- 5.00429 5.00301 5.00211 5.00148 5.00103 5.00072 5.0005 5.00035
- 5.00024 5.00016 5.00011 5.00007 5.00005 5.00003 5.00001
- 4.99999 4.99998 4.99998 4.99998 4.99998 4.99998 4.99999
- 5 5 5.00001 5.00001 5.00002 5.00002 5.00002 5.00002 5.00002
- 5.00002 5.00001 5.00001 5 5 5 5 5 5 4.99999 4.99999 4.99999
- 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
- 4.99999 4.99999 4.99999 5 5 5 5 5 5 5 5 5.00001 5.00001
- 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
- 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
- 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5 5 5 5
- 5 5 4.99981 5.10081 5.10903 4.98404 5.00999 5.14946 4.36501
- 2.23938 0.325144 0.00660272 -0.0102186 -0.0082401 -0.00556785
- -0.00374178 -0.00264763 -0.00202823 -0.0182241 -0.0169551
- -0.0150395 0.0103736 0.0877592 0.104382 0.0515938 0.0373818
- 0.0411547 0.0397009 0.0308946 0.0205793 0.0154037 0.0129191
- 0.0119327 0.011527 0.0124295 0.0161152 0.0161076 0.0145391
- 0.0144541 0.0139287 0.0129215 0.0117239 0.0105795 0.00942983
- 0.00827423 0.00718354 0.00619954 0.00532868 0.00456631 0.00390448
- 0.00333254 0.00284003 0.00241714 0.00205524 0.0017458 0.00148202
- 0.00125739 0.0010655 0.000902213 0.000763611 0.000646279
- 0.000547291 0.000463934 0.000393401 0.000332424 0.000280655
- 0.000236328 0.000199386 0.000167536 0.000141218 0.000118654
- 9.99559e-05 8.40479e-05 7.09694e-05 6.00188e-05 5.09786e-05
- 4.3502e-05 3.72191e-05 3.18114e-05 2.74071e-05 2.35539e-05
- 1.99967e-05 1.69871e-05 1.49449e-05 1.3451e-05 1.24492e-05
- 1.14256e-05 1.05669e-05 9.94487e-06 9.47514e-06 8.77318e-06
- 8.07123e-06 7.36927e-06 6.66731e-06 5.96536e-06 5.2634e-06
- 4.56144e-06 4.23044e-06 3.92649e-06 3.62254e-06 3.31858e-06
- 3.01463e-06 2.71068e-06 2.40673e-06 2.23063e-06 2.12082e-06
- 2.01102e-06 1.90121e-06 1.7914e-06 1.68159e-06 1.57178e-06
- 1.46197e-06 1.35216e-06 1.24235e-06 1.13255e-06 1.02274e-06
- 9.12929e-07 8.0312e-07 6.33171e-07 -1.51288e-08 -6.63428e-07
- -1.31173e-06 -1.96003e-06 0.0437517 0.0265689 -0.0515377
- -0.0658688 0.010727 -0.000511921 -8.36924e-05 2.13278e-05
- 1.45207e-05 4.54862e-06 -6.14726e-06 2.0062e-06 1.02709e-06
- 1.4152e-05 -3.08225e-05 -0.0166501 -0.0157139 -0.013957
- 0.0107537 0.0873717 0.111302 0.0454129 -0.00530142 -0.0468336
- -0.0790063 -0.0826944 -0.0534753 -0.0288705 -0.0149009 -0.00801592
- -0.0046342 -0.00291835 -0.00213019 -0.00170055 -0.001352
- -0.00110593 -0.000742655 -0.000532042 -0.000544742 -0.000479206
- -0.000407307 -0.000403575 -0.000366209 -0.000324161 -0.000286183
- -0.000247579 -0.000214281 -0.000203435 -0.000186896 -0.000171033
- -0.00015779 -0.000145259 -0.000128069 -0.000122647 -9.89398e-05
- -0.000114926 -0.000132195 -0.000107872 -8.91015e-05 -7.87996e-05
- -8.14061e-05 -8.9098e-05 -8.83368e-05 -7.6122e-05 -6.14668e-05
- -4.75402e-05 -3.81855e-05 -3.69696e-05 -4.78656e-05 -5.61346e-05
- -5.35007e-05 -4.1459e-05 -3.35411e-05 -2.52374e-05 -2.37479e-05
- -4.6406e-05 -9.41884e-05 -0.000109222 -8.52676e-05 -4.25166e-05
- -4.10125e-05 -3.95085e-05 -3.80045e-05 -3.65004e-05 -3.49964e-05
- -3.41627e-05 -3.3541e-05 -3.29193e-05 -3.22976e-05 -3.16758e-05
- -3.10334e-05 -3.03653e-05 -2.96971e-05 -2.9029e-05 -2.83609e-05
- -2.76928e-05 -2.70246e-05 -2.63565e-05 -2.56884e-05 -2.50203e-05
- -2.43521e-05 -2.38716e-05 -2.34324e-05 -2.29932e-05 -2.25539e-05
- -2.21147e-05 -2.16755e-05 -2.12362e-05 -2.0797e-05 -2.03578e-05
- -1.99186e-05 -1.95079e-05 -1.9217e-05 -1.8926e-05 -1.8635e-05
- -1.8344e-05 -1.8053e-05 -1.7762e-05 -1.74711e-05 -1.71801e-05
+ 1.86175 1.99724 2.17266 2.48439 3.15933 3.85231 4.38091
+ 4.69033 4.85034 4.92851 4.96453 4.98188 4.98736 4.991 4.99482
+ 4.9973 4.96422 4.89989 4.83907 4.83151 4.90868 5.04854 5.06104
+ 5.04571 5.03219 5.03025 5.02273 5.01707 5.0123 5.0087 5.00611
+ 5.00429 5.00301 5.00211 5.00148 5.00103 5.00072 5.0005 5.00035
+ 5.00024 5.00016 5.00011 5.00007 5.00005 5.00003 5.00001
+ 4.99999 4.99998 4.99998 4.99998 4.99998 4.99998 4.99999
+ 5 5 5.00001 5.00001 5.00002 5.00002 5.00002 5.00002 5.00002
+ 5.00002 5.00001 5.00001 5 5 5 5 5 5 4.99999 4.99999 4.99999
+ 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
+ 4.99999 4.99999 4.99999 5 5 5 5 5 5 5 5 5.00001 5.00001
+ 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
+ 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
+ 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5 5 5 5
+ 5 5 4.99981 5.10081 5.10903 4.98404 5.00999 5.14946 4.36501
+ 2.23938 0.325144 0.00660272 -0.0102186 -0.0082401 -0.00556785
+ -0.00374178 -0.00264763 -0.00202823 -0.0182241 -0.0169551
+ -0.0150395 0.0103736 0.0877592 0.104382 0.0515938 0.0373818
+ 0.0411547 0.0397009 0.0308946 0.0205793 0.0154037 0.0129191
+ 0.0119327 0.011527 0.0124295 0.0161152 0.0161076 0.0145391
+ 0.0144541 0.0139287 0.0129215 0.0117239 0.0105795 0.00942983
+ 0.00827423 0.00718354 0.00619954 0.00532868 0.00456631 0.00390448
+ 0.00333254 0.00284003 0.00241714 0.00205524 0.0017458 0.00148202
+ 0.00125739 0.0010655 0.000902213 0.000763611 0.000646279
+ 0.000547291 0.000463934 0.000393401 0.000332424 0.000280655
+ 0.000236328 0.000199386 0.000167536 0.000141218 0.000118654
+ 9.99559e-05 8.40479e-05 7.09694e-05 6.00188e-05 5.09786e-05
+ 4.3502e-05 3.72191e-05 3.18114e-05 2.74071e-05 2.35539e-05
+ 1.99967e-05 1.69871e-05 1.49449e-05 1.3451e-05 1.24492e-05
+ 1.14256e-05 1.05669e-05 9.94487e-06 9.47514e-06 8.77318e-06
+ 8.07123e-06 7.36927e-06 6.66731e-06 5.96536e-06 5.2634e-06
+ 4.56144e-06 4.23044e-06 3.92649e-06 3.62254e-06 3.31858e-06
+ 3.01463e-06 2.71068e-06 2.40673e-06 2.23063e-06 2.12082e-06
+ 2.01102e-06 1.90121e-06 1.7914e-06 1.68159e-06 1.57178e-06
+ 1.46197e-06 1.35216e-06 1.24235e-06 1.13255e-06 1.02274e-06
+ 9.12929e-07 8.0312e-07 6.33171e-07 -1.51288e-08 -6.63428e-07
+ -1.31173e-06 -1.96003e-06 0.0437517 0.0265689 -0.0515377
+ -0.0658688 0.010727 -0.000511921 -8.36924e-05 2.13278e-05
+ 1.45207e-05 4.54862e-06 -6.14726e-06 2.0062e-06 1.02709e-06
+ 1.4152e-05 -3.08225e-05 -0.0166501 -0.0157139 -0.013957
+ 0.0107537 0.0873717 0.111302 0.0454129 -0.00530142 -0.0468336
+ -0.0790063 -0.0826944 -0.0534753 -0.0288705 -0.0149009 -0.00801592
+ -0.0046342 -0.00291835 -0.00213019 -0.00170055 -0.001352
+ -0.00110593 -0.000742655 -0.000532042 -0.000544742 -0.000479206
+ -0.000407307 -0.000403575 -0.000366209 -0.000324161 -0.000286183
+ -0.000247579 -0.000214281 -0.000203435 -0.000186896 -0.000171033
+ -0.00015779 -0.000145259 -0.000128069 -0.000122647 -9.89398e-05
+ -0.000114926 -0.000132195 -0.000107872 -8.91015e-05 -7.87996e-05
+ -8.14061e-05 -8.9098e-05 -8.83368e-05 -7.6122e-05 -6.14668e-05
+ -4.75402e-05 -3.81855e-05 -3.69696e-05 -4.78656e-05 -5.61346e-05
+ -5.35007e-05 -4.1459e-05 -3.35411e-05 -2.52374e-05 -2.37479e-05
+ -4.6406e-05 -9.41884e-05 -0.000109222 -8.52676e-05 -4.25166e-05
+ -4.10125e-05 -3.95085e-05 -3.80045e-05 -3.65004e-05 -3.49964e-05
+ -3.41627e-05 -3.3541e-05 -3.29193e-05 -3.22976e-05 -3.16758e-05
+ -3.10334e-05 -3.03653e-05 -2.96971e-05 -2.9029e-05 -2.83609e-05
+ -2.76928e-05 -2.70246e-05 -2.63565e-05 -2.56884e-05 -2.50203e-05
+ -2.43521e-05 -2.38716e-05 -2.34324e-05 -2.29932e-05 -2.25539e-05
+ -2.21147e-05 -2.16755e-05 -2.12362e-05 -2.0797e-05 -2.03578e-05
+ -1.99186e-05 -1.95079e-05 -1.9217e-05 -1.8926e-05 -1.8635e-05
+ -1.8344e-05 -1.8053e-05 -1.7762e-05 -1.74711e-05 -1.71801e-05
EOD
@v[21].set(<<-'EOD')
- 1.86175 1.73273 1.42016 1.02483 0.944013 0.274107 0.0823742
- 0.0379366 0.020816 0.0132952 0.00955525 0.00717008 0.00592286
- 0.00437379 0.00383557 0.00273694 -0.0037467 -0.0054191 -0.00131454
- 0.0112179 0.0133918 0.00519747 -0.00260113 -0.00252847 -0.00181292
- 0.000183398 -0.000667607 -0.000750747 -0.000594314 -0.000433904
- -0.000308985 -0.000217858 -0.000152926 -0.000107454 -7.54076e-05
- -5.2675e-05 -3.66299e-05 -2.54341e-05 -1.75095e-05 -1.18848e-05
- -7.97289e-06 -5.30239e-06 -3.53615e-06 -2.38504e-06 -2.40158e-06
- -3.84485e-06 -5.29435e-06 -2.57099e-06 1.95189e-06 3.55083e-06
- 2.06179e-06 5.72753e-07 3.30469e-07 3.40296e-07 3.60221e-07
- 4.86081e-07 6.1194e-07 7.37799e-07 8.63659e-07 9.89518e-07
- 9.21274e-07 7.22275e-07 5.23276e-07 3.24277e-07 1.25278e-07
- -5.59467e-08 -9.03265e-08 -1.24706e-07 -1.59086e-07 -1.93466e-07
- -2.27846e-07 -2.62226e-07 -2.96605e-07 -3.30985e-07 -3.65365e-07
- -3.99745e-07 -4.24266e-07 -3.82163e-07 -3.40061e-07 -2.97959e-07
- -2.55857e-07 -2.13755e-07 -1.71652e-07 -1.2955e-07 -8.7448e-08
- -4.53457e-08 -3.24353e-09 3.76901e-08 7.19937e-08 1.06297e-07
- 1.40601e-07 1.74904e-07 2.09208e-07 2.43512e-07 2.77815e-07
- 3.12119e-07 3.46422e-07 3.80726e-07 4.04507e-07 3.77191e-07
- 3.49876e-07 3.22561e-07 2.95246e-07 2.67931e-07 2.40616e-07
- 2.13301e-07 1.85986e-07 1.58671e-07 1.31356e-07 1.04041e-07
- 7.67256e-08 4.94105e-08 2.20955e-08 -5.21962e-09 -3.25347e-08
- -5.98498e-08 -8.71649e-08 -1.1448e-07 -1.41795e-07 -1.6911e-07
- 7.87893e-06 0.0114592 -0.0245712 -0.111637 0.0961324 1.61168
- 3.22343 4.20442 4.53535 4.83834 4.95464 4.98874 4.99746
- 4.99883 4.99948 4.99815 4.98431 4.99298 4.99718 5.01948
- 5.04749 5.008 4.98243 4.98985 4.99781 4.99887 4.99679 4.99616
- 4.99743 4.99859 4.99936 4.99972 5.00058 5.00123 5.0002 4.99945
- 4.99983 4.9998 4.99966 4.99958 4.99956 4.99956 4.99956 4.99958
- 4.99961 4.99965 4.99969 4.99973 4.99977 4.9998 4.99983 4.99985
- 4.99987 4.99989 4.99991 4.99992 4.99993 4.99994 4.99995
- 4.99996 4.99997 4.99997 4.99998 4.99998 4.99998 4.99999
- 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 5 5 5 5
- 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5.00001 5.00001
- 5.00001 5.00002 5.00002 5.00002 5.00002 5.00002 5.00002
- 5.00002 5.00002 5.00001 5.00001 5.00001 5.00001 5.00001
- 5.00001 5.00001 5 5 5 4.99999 4.99998 4.99997 4.99996 5.01454
- 4.99566 4.96796 4.99819 5.03232 5.00034 4.99867 4.99937
- 4.99977 4.99992 4.99997 4.99999 5.00001 5.00021 4.99974
- 4.98462 4.99301 4.99723 5.01936 5.04807 5.00929 4.9789 4.97876
- 4.98244 4.9863 4.99575 5.0069 5.00863 5.00624 5.00357 5.0019
- 5.00098 5.00048 5.00025 5.00016 5.00011 5.00013 5.00009
- 4.99982 4.99994 5.00005 4.99994 4.99988 4.99989 4.99997
- 5.00003 5.00005 5.00002 5.00001 5.00001 5.00001 4.99993
- 4.99999 5 5.00021 4.99997 4.99981 5 5.00009 5.0001 5.00001
- 4.99991 4.9999 5 5.00011 5.00017 5.00018 5.00018 5.00014
- 5.00007 4.99999 4.9999 4.9999 5.00001 5.00016 5.00014 4.99999
- 4.99993 4.99999 5.00009 5.00007 5.00006 5.00004 5.00003
- 5.00001 5.00001 5 4.99999 4.99998 4.99997 4.99997 4.99997
- 4.99998 4.99998 4.99998 4.99998 4.99999 4.99999 4.99999
- 5 5 5 5 5 5 5.00001 5.00001 5.00001 5.00001 5.00001 5.00002
- 5.00002 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
- 5 5
+ 1.86175 1.73273 1.42016 1.02483 0.944013 0.274107 0.0823742
+ 0.0379366 0.020816 0.0132952 0.00955525 0.00717008 0.00592286
+ 0.00437379 0.00383557 0.00273694 -0.0037467 -0.0054191 -0.00131454
+ 0.0112179 0.0133918 0.00519747 -0.00260113 -0.00252847 -0.00181292
+ 0.000183398 -0.000667607 -0.000750747 -0.000594314 -0.000433904
+ -0.000308985 -0.000217858 -0.000152926 -0.000107454 -7.54076e-05
+ -5.2675e-05 -3.66299e-05 -2.54341e-05 -1.75095e-05 -1.18848e-05
+ -7.97289e-06 -5.30239e-06 -3.53615e-06 -2.38504e-06 -2.40158e-06
+ -3.84485e-06 -5.29435e-06 -2.57099e-06 1.95189e-06 3.55083e-06
+ 2.06179e-06 5.72753e-07 3.30469e-07 3.40296e-07 3.60221e-07
+ 4.86081e-07 6.1194e-07 7.37799e-07 8.63659e-07 9.89518e-07
+ 9.21274e-07 7.22275e-07 5.23276e-07 3.24277e-07 1.25278e-07
+ -5.59467e-08 -9.03265e-08 -1.24706e-07 -1.59086e-07 -1.93466e-07
+ -2.27846e-07 -2.62226e-07 -2.96605e-07 -3.30985e-07 -3.65365e-07
+ -3.99745e-07 -4.24266e-07 -3.82163e-07 -3.40061e-07 -2.97959e-07
+ -2.55857e-07 -2.13755e-07 -1.71652e-07 -1.2955e-07 -8.7448e-08
+ -4.53457e-08 -3.24353e-09 3.76901e-08 7.19937e-08 1.06297e-07
+ 1.40601e-07 1.74904e-07 2.09208e-07 2.43512e-07 2.77815e-07
+ 3.12119e-07 3.46422e-07 3.80726e-07 4.04507e-07 3.77191e-07
+ 3.49876e-07 3.22561e-07 2.95246e-07 2.67931e-07 2.40616e-07
+ 2.13301e-07 1.85986e-07 1.58671e-07 1.31356e-07 1.04041e-07
+ 7.67256e-08 4.94105e-08 2.20955e-08 -5.21962e-09 -3.25347e-08
+ -5.98498e-08 -8.71649e-08 -1.1448e-07 -1.41795e-07 -1.6911e-07
+ 7.87893e-06 0.0114592 -0.0245712 -0.111637 0.0961324 1.61168
+ 3.22343 4.20442 4.53535 4.83834 4.95464 4.98874 4.99746
+ 4.99883 4.99948 4.99815 4.98431 4.99298 4.99718 5.01948
+ 5.04749 5.008 4.98243 4.98985 4.99781 4.99887 4.99679 4.99616
+ 4.99743 4.99859 4.99936 4.99972 5.00058 5.00123 5.0002 4.99945
+ 4.99983 4.9998 4.99966 4.99958 4.99956 4.99956 4.99956 4.99958
+ 4.99961 4.99965 4.99969 4.99973 4.99977 4.9998 4.99983 4.99985
+ 4.99987 4.99989 4.99991 4.99992 4.99993 4.99994 4.99995
+ 4.99996 4.99997 4.99997 4.99998 4.99998 4.99998 4.99999
+ 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 5 5 5 5
+ 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5.00001 5.00001
+ 5.00001 5.00002 5.00002 5.00002 5.00002 5.00002 5.00002
+ 5.00002 5.00002 5.00001 5.00001 5.00001 5.00001 5.00001
+ 5.00001 5.00001 5 5 5 4.99999 4.99998 4.99997 4.99996 5.01454
+ 4.99566 4.96796 4.99819 5.03232 5.00034 4.99867 4.99937
+ 4.99977 4.99992 4.99997 4.99999 5.00001 5.00021 4.99974
+ 4.98462 4.99301 4.99723 5.01936 5.04807 5.00929 4.9789 4.97876
+ 4.98244 4.9863 4.99575 5.0069 5.00863 5.00624 5.00357 5.0019
+ 5.00098 5.00048 5.00025 5.00016 5.00011 5.00013 5.00009
+ 4.99982 4.99994 5.00005 4.99994 4.99988 4.99989 4.99997
+ 5.00003 5.00005 5.00002 5.00001 5.00001 5.00001 4.99993
+ 4.99999 5 5.00021 4.99997 4.99981 5 5.00009 5.0001 5.00001
+ 4.99991 4.9999 5 5.00011 5.00017 5.00018 5.00018 5.00014
+ 5.00007 4.99999 4.9999 4.9999 5.00001 5.00016 5.00014 4.99999
+ 4.99993 4.99999 5.00009 5.00007 5.00006 5.00004 5.00003
+ 5.00001 5.00001 5 4.99999 4.99998 4.99997 4.99997 4.99997
+ 4.99998 4.99998 4.99998 4.99998 4.99999 4.99999 4.99999
+ 5 5 5 5 5 5 5.00001 5.00001 5.00001 5.00001 5.00001 5.00002
+ 5.00002 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
+ 5 5
EOD
@v[22].set(<<-'EOD')
- 7.10441e-10 0.00107105 0.000637109 -0.00236346 -0.018079
- -0.0120077 -0.00217059 0.00266679 0.00403383 0.00403836
- 0.00356705 0.00303303 0.00244716 0.00198586 0.0016855 0.00136497
- -3.96022e-05 -0.000367409 -3.77079e-05 0.00194085 0.00506964
- -0.0400214 -0.0402572 0.0524434 0.286234 0.803011 1.44795
- 2.02473 2.54768 3.02748 3.4415 3.78287 4.09667 4.35152 4.53987
- 4.67614 4.77407 4.84319 4.89227 4.92702 4.95119 4.96764
- 4.97846 4.98557 4.98982 4.99209 4.99371 4.99569 4.99727
- 4.99802 4.99834 4.99867 4.99892 4.99915 4.99936 4.99939
- 4.99943 4.99946 4.9995 4.99953 4.99957 4.9996 4.99963 4.99967
- 4.9997 4.99973 4.99974 4.99975 4.99976 4.99977 4.99978 4.9998
- 4.99981 4.99982 4.99983 4.99984 4.99985 4.99986 4.99986
- 4.99986 4.99987 4.99987 4.99988 4.99988 4.99989 4.99989
- 4.9999 4.9999 4.9999 4.9999 4.99991 4.99991 4.99991 4.99991
- 4.99992 4.99992 4.99992 4.99992 4.99993 4.99993 4.99993
- 4.99993 4.99993 4.99993 4.99993 4.99993 4.99994 4.99994
- 4.99994 4.99994 4.99994 4.99994 4.99994 4.99994 4.99995
- 4.99995 4.99995 4.99995 4.99995 4.99995 4.99995 5.00145
- 5.00659 5.01209 5.01931 5.00279 4.99273 4.99217 4.99295
- 4.99471 4.99594 4.99696 4.9978 4.99844 4.99891 4.99924 4.99635
- 4.99699 4.99813 5.00068 5.00307 5.0588 4.96365 4.54012 3.6307
- 2.35176 1.0322 0.354379 0.115986 0.0435668 0.0245112 0.020786
- 0.0164656 0.0118409 0.00849698 0.00597078 0.0040105 0.0026076
- 0.0016597 0.00118185 0.00121067 0.00153587 0.00174836 0.00136519
- -0.000189116 -0.00315555 -0.00646603 -0.00898042 -0.010203
- -0.0110896 -0.0123764 -0.00953841 -0.00225795 0.000818314
- 0.00152252 0.00150269 0.00119025 0.000767068 0.000308852
- -3.79272e-05 -0.00019691 -0.000186642 -9.73653e-05 -8.49784e-06
- 2.04147e-05 -9.91086e-06 -1.55959e-05 -1.80499e-05 -1.77097e-05
- -1.51548e-05 -1.1978e-05 -9.84916e-06 -1.29728e-05 -1.67235e-05
- -1.74153e-05 -1.39958e-05 -5.92272e-06 -8.08216e-06 -1.53077e-05
- -2.92531e-05 -3.91049e-05 -2.98935e-05 -7.32122e-06 3.18534e-05
- 4.39134e-05 4.18753e-05 3.22759e-05 1.86766e-05 1.58432e-05
- 1.30098e-05 1.01765e-05 7.34312e-06 4.50975e-06 1.67639e-06
- -1.15697e-06 -1.23877e-06 -1.11991e-06 -1.00106e-06 -8.82208e-07
- -7.63355e-07 -6.44502e-07 -5.2565e-07 -4.29318e-07 -3.44661e-07
- -2.60004e-07 -1.75347e-07 -9.06904e-08 -6.03349e-09 7.86234e-08
- 1.6328e-07 2.47937e-07 3.32594e-07 4.17251e-07 5.01908e-07
- 5.86565e-07 6.71222e-07 7.36123e-07 6.43886e-07 5.5165e-07
- 4.59414e-07 3.67178e-07 0.000334759 -4.60833e-05 -0.00106139
- -0.00166624 0.000859563 0.00102606 0.00410037 0.00419931
- 0.00518997 0.00459791 0.00503125 0.00523877 0.00452158 0.00339924
- 0.00233399 0.000876915 0.000546439 0.000444299 0.000983968
- 0.00119304 -0.0429422 -0.0403983 0.0534896 0.288013 0.807345
- 1.44247 2.03448 2.57021 3.05049 3.47332 3.8131 4.1009 4.34677
- 4.53512 4.67127 4.76531 4.82526 4.86593 4.89586 4.91904
- 4.93806 4.95348 4.96597 4.97629 4.9843 4.98983 4.99335 4.9957
- 4.99741 4.99864 4.99946 4.99994 5.00047 5.00073 5.00086
- 5.00092 5.00094 5.00091 5.00087 5.00081 5.00074 5.00067
- 5.00059 5.00052 5.00046 5.0004 5.00034 5.0003 5.00026 5.00022
- 5.00019 5.00016 5.00014 5.00012 5.0001 5.00009 5.00007 5.00006
- 5.00006 5.00005 5.00004 5.00004 5.00004 5.00003 5.00003
- 5.00003 5.00002 5.00002 5.00002 5.00002 5.00001 5.00001
- 5.00001 5.00001 5.00001 5 5 5 5 4.99999 4.99999 4.99999
- 4.99999 4.99999 4.99999 5 5 5 5 5 5 5 5 5 5.00001 5.00001
- 5.00001 5.00001 5.00002 5.00002
+ 7.10441e-10 0.00107105 0.000637109 -0.00236346 -0.018079
+ -0.0120077 -0.00217059 0.00266679 0.00403383 0.00403836
+ 0.00356705 0.00303303 0.00244716 0.00198586 0.0016855 0.00136497
+ -3.96022e-05 -0.000367409 -3.77079e-05 0.00194085 0.00506964
+ -0.0400214 -0.0402572 0.0524434 0.286234 0.803011 1.44795
+ 2.02473 2.54768 3.02748 3.4415 3.78287 4.09667 4.35152 4.53987
+ 4.67614 4.77407 4.84319 4.89227 4.92702 4.95119 4.96764
+ 4.97846 4.98557 4.98982 4.99209 4.99371 4.99569 4.99727
+ 4.99802 4.99834 4.99867 4.99892 4.99915 4.99936 4.99939
+ 4.99943 4.99946 4.9995 4.99953 4.99957 4.9996 4.99963 4.99967
+ 4.9997 4.99973 4.99974 4.99975 4.99976 4.99977 4.99978 4.9998
+ 4.99981 4.99982 4.99983 4.99984 4.99985 4.99986 4.99986
+ 4.99986 4.99987 4.99987 4.99988 4.99988 4.99989 4.99989
+ 4.9999 4.9999 4.9999 4.9999 4.99991 4.99991 4.99991 4.99991
+ 4.99992 4.99992 4.99992 4.99992 4.99993 4.99993 4.99993
+ 4.99993 4.99993 4.99993 4.99993 4.99993 4.99994 4.99994
+ 4.99994 4.99994 4.99994 4.99994 4.99994 4.99994 4.99995
+ 4.99995 4.99995 4.99995 4.99995 4.99995 4.99995 5.00145
+ 5.00659 5.01209 5.01931 5.00279 4.99273 4.99217 4.99295
+ 4.99471 4.99594 4.99696 4.9978 4.99844 4.99891 4.99924 4.99635
+ 4.99699 4.99813 5.00068 5.00307 5.0588 4.96365 4.54012 3.6307
+ 2.35176 1.0322 0.354379 0.115986 0.0435668 0.0245112 0.020786
+ 0.0164656 0.0118409 0.00849698 0.00597078 0.0040105 0.0026076
+ 0.0016597 0.00118185 0.00121067 0.00153587 0.00174836 0.00136519
+ -0.000189116 -0.00315555 -0.00646603 -0.00898042 -0.010203
+ -0.0110896 -0.0123764 -0.00953841 -0.00225795 0.000818314
+ 0.00152252 0.00150269 0.00119025 0.000767068 0.000308852
+ -3.79272e-05 -0.00019691 -0.000186642 -9.73653e-05 -8.49784e-06
+ 2.04147e-05 -9.91086e-06 -1.55959e-05 -1.80499e-05 -1.77097e-05
+ -1.51548e-05 -1.1978e-05 -9.84916e-06 -1.29728e-05 -1.67235e-05
+ -1.74153e-05 -1.39958e-05 -5.92272e-06 -8.08216e-06 -1.53077e-05
+ -2.92531e-05 -3.91049e-05 -2.98935e-05 -7.32122e-06 3.18534e-05
+ 4.39134e-05 4.18753e-05 3.22759e-05 1.86766e-05 1.58432e-05
+ 1.30098e-05 1.01765e-05 7.34312e-06 4.50975e-06 1.67639e-06
+ -1.15697e-06 -1.23877e-06 -1.11991e-06 -1.00106e-06 -8.82208e-07
+ -7.63355e-07 -6.44502e-07 -5.2565e-07 -4.29318e-07 -3.44661e-07
+ -2.60004e-07 -1.75347e-07 -9.06904e-08 -6.03349e-09 7.86234e-08
+ 1.6328e-07 2.47937e-07 3.32594e-07 4.17251e-07 5.01908e-07
+ 5.86565e-07 6.71222e-07 7.36123e-07 6.43886e-07 5.5165e-07
+ 4.59414e-07 3.67178e-07 0.000334759 -4.60833e-05 -0.00106139
+ -0.00166624 0.000859563 0.00102606 0.00410037 0.00419931
+ 0.00518997 0.00459791 0.00503125 0.00523877 0.00452158 0.00339924
+ 0.00233399 0.000876915 0.000546439 0.000444299 0.000983968
+ 0.00119304 -0.0429422 -0.0403983 0.0534896 0.288013 0.807345
+ 1.44247 2.03448 2.57021 3.05049 3.47332 3.8131 4.1009 4.34677
+ 4.53512 4.67127 4.76531 4.82526 4.86593 4.89586 4.91904
+ 4.93806 4.95348 4.96597 4.97629 4.9843 4.98983 4.99335 4.9957
+ 4.99741 4.99864 4.99946 4.99994 5.00047 5.00073 5.00086
+ 5.00092 5.00094 5.00091 5.00087 5.00081 5.00074 5.00067
+ 5.00059 5.00052 5.00046 5.0004 5.00034 5.0003 5.00026 5.00022
+ 5.00019 5.00016 5.00014 5.00012 5.0001 5.00009 5.00007 5.00006
+ 5.00006 5.00005 5.00004 5.00004 5.00004 5.00003 5.00003
+ 5.00003 5.00002 5.00002 5.00002 5.00002 5.00001 5.00001
+ 5.00001 5.00001 5.00001 5 5 5 5 4.99999 4.99999 4.99999
+ 4.99999 4.99999 4.99999 5 5 5 5 5 5 5 5 5 5.00001 5.00001
+ 5.00001 5.00001 5.00002 5.00002
EOD
@v[23].set(<<-'EOD')
- 5 5.00284 5.01266 5.01895 4.98936 4.99575 4.99217 4.99545
- 4.99775 4.99894 4.99946 4.99968 4.99975 4.99977 4.99986
- 4.9999 4.99528 4.99808 5.00039 5.00392 5.00512 4.99985 4.99863
- 4.99942 4.99992 5.00017 4.99897 4.99803 4.99784 4.99739
- 4.99883 5.00365 5.00298 5.00133 5.00048 5.00019 5.00008
- 5.00005 5.00004 5.00003 5.00002 5.00002 5.00001 5.00001
- 5.00001 5.00001 5.00001 5 5 4.99999 4.99997 4.99995 4.99996
- 4.99998 5 5.00001 5.00001 5.00002 5.00002 5.00003 5.00003
- 5.00002 5.00002 5.00001 5.00001 5 5 5 5 5 4.99999 4.99999
- 4.99999 4.99999 4.99999 4.99999 4.99998 4.99999 4.99999
- 4.99999 4.99999 4.99999 4.99999 4.99999 5 5 5 5 5 5 5 5.00001
- 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00002
- 5.00002 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
- 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
- 5.00001 5 5 5 5 5 5 5 5.00217 5.00108 4.99547 4.99658 5.00667
- 4.99641 4.99532 4.99938 5.00328 5.00222 5.00114 5.00052
- 5.00024 5.00011 5.00009 4.99285 4.99591 4.99897 5.00403
- 5.00786 5.00318 4.99942 4.9992 4.99949 5.001 5.00408 5.00319
- 5.00063 4.99995 5.00014 4.99982 4.99832 4.99838 4.99865
- 4.99912 4.99836 4.99735 4.99606 4.99814 5.00958 5.02973
- 5.05293 5.06103 4.99342 4.80726 4.50744 4.07509 3.41358
- 2.37924 1.03194 0.261552 0.142392 0.0904482 0.0555071 0.0322869
- 0.018289 0.0113802 0.00875182 0.00757055 0.00629906 0.00523
- 0.00403349 0.0031953 0.00280864 0.00286119 0.00250389 0.00202815
- 0.001723 0.00147312 0.0012411 0.00104401 0.000886204 0.000758277
- 0.000651915 0.00056348 0.000487966 0.000424048 0.000365613
- 0.000308178 0.000258725 0.000228061 0.000207976 0.000198491
- 0.00018518 0.000172716 0.000163197 0.000155007 0.000141734
- 0.000128461 0.000115188 0.000101915 8.86417e-05 7.53686e-05
- 6.20956e-05 5.69164e-05 5.23275e-05 4.77385e-05 4.31495e-05
- 3.85605e-05 3.39716e-05 2.93826e-05 2.69449e-05 2.56224e-05
- 2.42999e-05 2.29774e-05 2.16549e-05 2.03324e-05 1.90099e-05
- 1.76873e-05 1.63648e-05 1.50423e-05 1.37198e-05 1.23973e-05
- 1.10748e-05 9.75232e-06 8.48447e-06 7.65129e-06 6.81811e-06
- 5.98494e-06 5.15176e-06 0.00056893 -0.00787906 -0.0217381
- -0.0370066 -0.00770505 0.00659312 0.00975477 0.00949456
- 0.00777552 0.00655645 0.00568776 0.00508782 0.00458121 0.00410187
- 0.00365665 0.0015121 0.00160863 0.00263181 0.00638941 0.00772607
- 0.00225583 0.0010843 0.000882939 0.000801563 0.00075632
- 0.000554992 0.000435131 0.0003474 0.000217667 0.000491602
- 0.0012267 0.00250446 0.000212058 -0.0174972 -0.0527527 -0.0479071
- 0.194908 1.45838 3.40677 4.49242 4.86894 4.97215 5.01218
- 5.04342 5.06228 5.03069 4.87169 4.57056 4.11523 3.38264
- 2.19691 0.715839 0.172818 0.102162 0.0627162 0.0363388 0.020289
- 0.0119414 0.00826608 0.0066417 0.00549092 0.00492505 0.00439443
- 0.0037156 0.00306471 0.00247451 0.00195965 0.0014822 0.0010815
- 0.000904464 0.0010514 0.00152308 0.00120752 0.000228447
- -0.00102833 -0.00116644 -0.00042067 4.78758e-05 5.09599e-05
- -4.45756e-05 -3.22966e-06 3.81163e-05 7.94622e-05 0.000120808
- 0.000162154 0.000161895 0.000148481 0.000135068 0.000121654
- 0.000108241 9.81453e-05 9.2164e-05 8.61827e-05 8.02014e-05
- 7.42201e-05 6.82388e-05 6.22576e-05 5.62763e-05 5.0295e-05
- 4.43137e-05 3.83324e-05 3.54323e-05 3.321e-05 3.09877e-05
- 2.87654e-05 2.65431e-05 2.43209e-05 2.20986e-05 1.98763e-05
- 1.7654e-05 1.54317e-05 1.34612e-05 1.25441e-05 1.1627e-05
- 1.07099e-05 9.79276e-06 8.87564e-06 7.95851e-06 7.04139e-06
- 6.12427e-06
+ 5 5.00284 5.01266 5.01895 4.98936 4.99575 4.99217 4.99545
+ 4.99775 4.99894 4.99946 4.99968 4.99975 4.99977 4.99986
+ 4.9999 4.99528 4.99808 5.00039 5.00392 5.00512 4.99985 4.99863
+ 4.99942 4.99992 5.00017 4.99897 4.99803 4.99784 4.99739
+ 4.99883 5.00365 5.00298 5.00133 5.00048 5.00019 5.00008
+ 5.00005 5.00004 5.00003 5.00002 5.00002 5.00001 5.00001
+ 5.00001 5.00001 5.00001 5 5 4.99999 4.99997 4.99995 4.99996
+ 4.99998 5 5.00001 5.00001 5.00002 5.00002 5.00003 5.00003
+ 5.00002 5.00002 5.00001 5.00001 5 5 5 5 5 4.99999 4.99999
+ 4.99999 4.99999 4.99999 4.99999 4.99998 4.99999 4.99999
+ 4.99999 4.99999 4.99999 4.99999 4.99999 5 5 5 5 5 5 5 5.00001
+ 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00002
+ 5.00002 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
+ 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
+ 5.00001 5 5 5 5 5 5 5 5.00217 5.00108 4.99547 4.99658 5.00667
+ 4.99641 4.99532 4.99938 5.00328 5.00222 5.00114 5.00052
+ 5.00024 5.00011 5.00009 4.99285 4.99591 4.99897 5.00403
+ 5.00786 5.00318 4.99942 4.9992 4.99949 5.001 5.00408 5.00319
+ 5.00063 4.99995 5.00014 4.99982 4.99832 4.99838 4.99865
+ 4.99912 4.99836 4.99735 4.99606 4.99814 5.00958 5.02973
+ 5.05293 5.06103 4.99342 4.80726 4.50744 4.07509 3.41358
+ 2.37924 1.03194 0.261552 0.142392 0.0904482 0.0555071 0.0322869
+ 0.018289 0.0113802 0.00875182 0.00757055 0.00629906 0.00523
+ 0.00403349 0.0031953 0.00280864 0.00286119 0.00250389 0.00202815
+ 0.001723 0.00147312 0.0012411 0.00104401 0.000886204 0.000758277
+ 0.000651915 0.00056348 0.000487966 0.000424048 0.000365613
+ 0.000308178 0.000258725 0.000228061 0.000207976 0.000198491
+ 0.00018518 0.000172716 0.000163197 0.000155007 0.000141734
+ 0.000128461 0.000115188 0.000101915 8.86417e-05 7.53686e-05
+ 6.20956e-05 5.69164e-05 5.23275e-05 4.77385e-05 4.31495e-05
+ 3.85605e-05 3.39716e-05 2.93826e-05 2.69449e-05 2.56224e-05
+ 2.42999e-05 2.29774e-05 2.16549e-05 2.03324e-05 1.90099e-05
+ 1.76873e-05 1.63648e-05 1.50423e-05 1.37198e-05 1.23973e-05
+ 1.10748e-05 9.75232e-06 8.48447e-06 7.65129e-06 6.81811e-06
+ 5.98494e-06 5.15176e-06 0.00056893 -0.00787906 -0.0217381
+ -0.0370066 -0.00770505 0.00659312 0.00975477 0.00949456
+ 0.00777552 0.00655645 0.00568776 0.00508782 0.00458121 0.00410187
+ 0.00365665 0.0015121 0.00160863 0.00263181 0.00638941 0.00772607
+ 0.00225583 0.0010843 0.000882939 0.000801563 0.00075632
+ 0.000554992 0.000435131 0.0003474 0.000217667 0.000491602
+ 0.0012267 0.00250446 0.000212058 -0.0174972 -0.0527527 -0.0479071
+ 0.194908 1.45838 3.40677 4.49242 4.86894 4.97215 5.01218
+ 5.04342 5.06228 5.03069 4.87169 4.57056 4.11523 3.38264
+ 2.19691 0.715839 0.172818 0.102162 0.0627162 0.0363388 0.020289
+ 0.0119414 0.00826608 0.0066417 0.00549092 0.00492505 0.00439443
+ 0.0037156 0.00306471 0.00247451 0.00195965 0.0014822 0.0010815
+ 0.000904464 0.0010514 0.00152308 0.00120752 0.000228447
+ -0.00102833 -0.00116644 -0.00042067 4.78758e-05 5.09599e-05
+ -4.45756e-05 -3.22966e-06 3.81163e-05 7.94622e-05 0.000120808
+ 0.000162154 0.000161895 0.000148481 0.000135068 0.000121654
+ 0.000108241 9.81453e-05 9.2164e-05 8.61827e-05 8.02014e-05
+ 7.42201e-05 6.82388e-05 6.22576e-05 5.62763e-05 5.0295e-05
+ 4.43137e-05 3.83324e-05 3.54323e-05 3.321e-05 3.09877e-05
+ 2.87654e-05 2.65431e-05 2.43209e-05 2.20986e-05 1.98763e-05
+ 1.7654e-05 1.54317e-05 1.34612e-05 1.25441e-05 1.1627e-05
+ 1.07099e-05 9.79276e-06 8.87564e-06 7.95851e-06 7.04139e-06
+ 6.12427e-06
EOD
@v[24].set(<<-'EOD')
- 5 5.01099 5.00866 4.97845 4.92369 4.9273 4.97413 4.9929
- 4.99826 4.99958 4.99978 5.00005 4.99968 4.99959 5.00014
- 4.99979 4.99914 4.99982 5.00023 5.00295 5.00664 4.99854
- 4.99647 5.00438 5.01722 5.03681 5.04766 5.04799 5.04867
- 5.04873 5.04685 5.04413 5.0367 5.02505 5.01726 5.01183 5.00806
- 5.00549 5.00371 5.00246 5.00162 5.00105 5.00069 5.00045
- 5.00031 5.00024 5.00019 5.00012 5.00007 5.00004 5.00001
- 4.99998 4.99999 4.99999 5 5.00001 5.00001 5.00002 5.00002
- 5.00003 5.00003 5.00003 5.00002 5.00002 5.00001 5.00001
- 5.00001 5 5 5 5 5 4.99999 4.99999 4.99999 4.99999 4.99999
- 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
- 5 5 5 5 5 5 5 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
- 5.00001 5.00002 5.00001 5.00001 5.00001 5.00001 5.00001
- 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
- 5.00001 5.00001 5.00001 5 5 5 5 5 5 5 5.00418 4.99953 4.99152
- 4.99807 5.00497 5.00112 5.00055 5.00038 5.00018 5.00006
- 5.00006 5.00007 5.00006 5.00004 5.00004 4.99853 4.99945
- 4.99998 5.00304 5.00935 5.00742 4.99181 4.97421 4.93603
- 4.8853 4.8927 4.93984 4.97458 4.99039 4.99614 4.99801 4.99851
- 4.99869 4.99924 5.00108 5.00181 5.00119 5.00059 5.00031
- 5.00022 5.00018 5.00011 5.00001 5.00006 4.99981 4.99977
- 4.99982 5.00012 4.99993 5.00008 5.00043 5.00048 5.00024
- 5.00008 4.99984 4.99993 5.00011 4.99996 4.9998 4.99977 4.9998
- 4.99993 5.00008 5.00011 5.00002 4.99995 4.99989 4.99993
- 5 5.00007 5.00009 4.99994 4.99977 4.9997 4.99975 4.99996
- 4.99996 4.99988 4.9997 4.99952 4.9995 4.99956 4.99973 4.99988
- 5.00005 5.00025 5.00042 5.00036 5.00031 5.00025 5.0002 5.00014
- 5.00009 5.00003 5.00002 5.00001 5.00001 5 4.99999 4.99998
- 4.99998 4.99997 4.99998 4.99998 4.99998 4.99998 4.99998
- 4.99998 4.99998 4.99999 4.99999 4.99999 4.99999 4.99999
- 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 5.00284
- 5.00442 5.00381 4.98997 4.99092 5.00733 5.07791 4.98237
- 4.86434 4.76835 4.74067 4.79278 4.85094 4.90068 4.93603
- 4.95698 4.96984 4.97856 4.98869 4.99904 5.0005 4.99524 5.00181
- 5.01878 5.05177 5.07986 4.98917 4.56217 3.68 2.3539 1.18541
- 0.505772 0.221044 0.115287 0.0760938 0.0589194 0.0476784
- 0.0457213 0.0412911 0.033889 0.0259741 0.0191452 0.0139018
- 0.0100235 0.00711788 0.00497657 0.00349368 0.00250021 0.00176179
- 0.00121843 0.000838368 0.000582711 0.000423458 0.000294608
- 0.000201251 0.000133748 8.6227e-05 5.44252e-05 3.30514e-05
- 1.93926e-05 1.09814e-05 5.29857e-06 1.92247e-06 3.08708e-07
- -3.74311e-07 -6.11121e-07 -7.27807e-07 -4.87604e-07 -4.80493e-07
- -9.15925e-07 -2.03774e-06 -4.01128e-06 -2.46644e-06 2.10626e-06
- 8.22422e-06 1.04922e-05 9.83047e-06 7.27106e-06 3.29654e-06
- -2.06736e-06 -2.18019e-06 -2.29303e-06 -2.40586e-06 -2.51869e-06
- -2.63153e-06 -2.24615e-06 -1.70325e-06 -1.16036e-06 -6.17468e-07
- -7.45754e-08 2.45198e-07 2.88285e-07 3.31373e-07 3.7446e-07
- 4.17548e-07 4.60635e-07 5.03723e-07 5.4681e-07 5.89898e-07
- 6.32985e-07 6.76073e-07 6.19054e-07 5.4001e-07 4.60967e-07
- 3.81923e-07 3.02879e-07 2.23836e-07 1.44792e-07 6.57488e-08
- -1.32948e-08 -9.23383e-08 -1.6698e-07 -2.23206e-07 -2.79432e-07
- -3.35658e-07 -3.91884e-07 -4.48109e-07 -5.04335e-07 -5.60561e-07
- -6.16787e-07
+ 5 5.01099 5.00866 4.97845 4.92369 4.9273 4.97413 4.9929
+ 4.99826 4.99958 4.99978 5.00005 4.99968 4.99959 5.00014
+ 4.99979 4.99914 4.99982 5.00023 5.00295 5.00664 4.99854
+ 4.99647 5.00438 5.01722 5.03681 5.04766 5.04799 5.04867
+ 5.04873 5.04685 5.04413 5.0367 5.02505 5.01726 5.01183 5.00806
+ 5.00549 5.00371 5.00246 5.00162 5.00105 5.00069 5.00045
+ 5.00031 5.00024 5.00019 5.00012 5.00007 5.00004 5.00001
+ 4.99998 4.99999 4.99999 5 5.00001 5.00001 5.00002 5.00002
+ 5.00003 5.00003 5.00003 5.00002 5.00002 5.00001 5.00001
+ 5.00001 5 5 5 5 5 4.99999 4.99999 4.99999 4.99999 4.99999
+ 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
+ 5 5 5 5 5 5 5 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
+ 5.00001 5.00002 5.00001 5.00001 5.00001 5.00001 5.00001
+ 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
+ 5.00001 5.00001 5.00001 5 5 5 5 5 5 5 5.00418 4.99953 4.99152
+ 4.99807 5.00497 5.00112 5.00055 5.00038 5.00018 5.00006
+ 5.00006 5.00007 5.00006 5.00004 5.00004 4.99853 4.99945
+ 4.99998 5.00304 5.00935 5.00742 4.99181 4.97421 4.93603
+ 4.8853 4.8927 4.93984 4.97458 4.99039 4.99614 4.99801 4.99851
+ 4.99869 4.99924 5.00108 5.00181 5.00119 5.00059 5.00031
+ 5.00022 5.00018 5.00011 5.00001 5.00006 4.99981 4.99977
+ 4.99982 5.00012 4.99993 5.00008 5.00043 5.00048 5.00024
+ 5.00008 4.99984 4.99993 5.00011 4.99996 4.9998 4.99977 4.9998
+ 4.99993 5.00008 5.00011 5.00002 4.99995 4.99989 4.99993
+ 5 5.00007 5.00009 4.99994 4.99977 4.9997 4.99975 4.99996
+ 4.99996 4.99988 4.9997 4.99952 4.9995 4.99956 4.99973 4.99988
+ 5.00005 5.00025 5.00042 5.00036 5.00031 5.00025 5.0002 5.00014
+ 5.00009 5.00003 5.00002 5.00001 5.00001 5 4.99999 4.99998
+ 4.99998 4.99997 4.99998 4.99998 4.99998 4.99998 4.99998
+ 4.99998 4.99998 4.99999 4.99999 4.99999 4.99999 4.99999
+ 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 5.00284
+ 5.00442 5.00381 4.98997 4.99092 5.00733 5.07791 4.98237
+ 4.86434 4.76835 4.74067 4.79278 4.85094 4.90068 4.93603
+ 4.95698 4.96984 4.97856 4.98869 4.99904 5.0005 4.99524 5.00181
+ 5.01878 5.05177 5.07986 4.98917 4.56217 3.68 2.3539 1.18541
+ 0.505772 0.221044 0.115287 0.0760938 0.0589194 0.0476784
+ 0.0457213 0.0412911 0.033889 0.0259741 0.0191452 0.0139018
+ 0.0100235 0.00711788 0.00497657 0.00349368 0.00250021 0.00176179
+ 0.00121843 0.000838368 0.000582711 0.000423458 0.000294608
+ 0.000201251 0.000133748 8.6227e-05 5.44252e-05 3.30514e-05
+ 1.93926e-05 1.09814e-05 5.29857e-06 1.92247e-06 3.08708e-07
+ -3.74311e-07 -6.11121e-07 -7.27807e-07 -4.87604e-07 -4.80493e-07
+ -9.15925e-07 -2.03774e-06 -4.01128e-06 -2.46644e-06 2.10626e-06
+ 8.22422e-06 1.04922e-05 9.83047e-06 7.27106e-06 3.29654e-06
+ -2.06736e-06 -2.18019e-06 -2.29303e-06 -2.40586e-06 -2.51869e-06
+ -2.63153e-06 -2.24615e-06 -1.70325e-06 -1.16036e-06 -6.17468e-07
+ -7.45754e-08 2.45198e-07 2.88285e-07 3.31373e-07 3.7446e-07
+ 4.17548e-07 4.60635e-07 5.03723e-07 5.4681e-07 5.89898e-07
+ 6.32985e-07 6.76073e-07 6.19054e-07 5.4001e-07 4.60967e-07
+ 3.81923e-07 3.02879e-07 2.23836e-07 1.44792e-07 6.57488e-08
+ -1.32948e-08 -9.23383e-08 -1.6698e-07 -2.23206e-07 -2.79432e-07
+ -3.35658e-07 -3.91884e-07 -4.48109e-07 -5.04335e-07 -5.60561e-07
+ -6.16787e-07
EOD
@v[25].set(<<-'EOD')
- 1.34824 1.35838 1.36465 1.34675 1.29167 1.23161 1.2201 1.2185
- 1.2181 1.21798 1.21793 1.21788 1.21785 1.21782 1.21779 1.21776
- 1.21655 1.21656 1.21669 1.21871 1.22421 1.22247 1.21858
- 1.2228 1.23803 1.27737 1.10647 0.395248 0.0600669 0.027687
- 0.0192374 0.015425 0.0130881 0.00977445 0.00696598 0.00491122
- 0.00341952 0.00237078 0.00162339 0.00109178 0.000726647
- 0.000478886 0.00031568 0.000207902 0.000143494 0.000109768
- 8.62987e-05 5.69775e-05 3.36547e-05 2.30356e-05 1.86108e-05
- 1.41861e-05 1.08293e-05 7.68835e-06 4.79593e-06 4.51019e-06
- 4.22444e-06 3.9387e-06 3.65295e-06 3.36721e-06 3.04559e-06
- 2.69981e-06 2.35403e-06 2.00825e-06 1.66247e-06 1.34508e-06
- 1.26225e-06 1.17941e-06 1.09657e-06 1.01373e-06 9.30893e-07
- 8.48054e-07 7.65216e-07 6.82378e-07 5.9954e-07 5.16702e-07
- 4.37489e-07 3.82774e-07 3.2806e-07 2.73346e-07 2.18632e-07
- 1.63917e-07 1.09203e-07 5.4489e-08 -2.2523e-10 -5.49395e-08
- -1.09654e-07 -1.52862e-07 -1.3079e-07 -1.08718e-07 -8.6646e-08
- -6.45739e-08 -4.25019e-08 -2.04298e-08 1.64229e-09 2.37144e-08
- 4.57864e-08 6.78585e-08 8.71693e-08 9.30725e-08 9.89758e-08
- 1.04879e-07 1.10782e-07 1.16685e-07 1.22589e-07 1.28492e-07
- 1.34395e-07 1.40298e-07 1.46201e-07 1.52105e-07 1.58008e-07
- 1.63911e-07 1.69814e-07 1.75718e-07 1.81621e-07 1.87524e-07
- 1.93427e-07 1.9933e-07 2.05234e-07 2.11137e-07 2.19788e-07
- 0.000393944 -0.000218983 -0.00105784 0.00172403 -0.00027134
- -0.000204147 8.79968e-06 5.93762e-05 5.83554e-05 4.13815e-05
- 3.71369e-05 3.03372e-05 2.25336e-05 1.5986e-05 1.07284e-05
- -7.5239e-05 5.60593e-05 6.97571e-05 0.000667617 0.000960856
- 0.00131749 -0.00759564 -0.0217897 -0.0450321 -0.076646 -0.128569
- -0.186391 -0.202175 -0.206953 -0.2082 -0.208416 -0.208669
- -0.208934 -0.209111 -0.209234 -0.209329 -0.209389 -0.209416
- -0.2094 -0.209329 -0.20926 -0.209204 -0.209208 -0.209285
- -0.209454 -0.209641 -0.20977 -0.209811 -0.209833 -0.209887
- -0.209653 -0.209127 -0.208893 -0.208811 -0.208777 -0.208758
- -0.208747 -0.20874 -0.208726 -0.208697 -0.208657 -0.208611
- -0.208565 -0.208524 -0.208488 -0.208451 -0.208412 -0.208373
- -0.208333 -0.208294 -0.208256 -0.208219 -0.208183 -0.208145
- -0.208107 -0.208066 -0.208029 -0.207993 -0.207959 -0.207923
- -0.207883 -0.207838 -0.207789 -0.207747 -0.20771 -0.207675
- -0.207642 -0.207605 -0.207568 -0.207531 -0.207494 -0.207457
- -0.20742 -0.207383 -0.207346 -0.207308 -0.207271 -0.207233
- -0.207196 -0.207158 -0.207121 -0.207084 -0.207046 -0.207009
- -0.206972 -0.206935 -0.206898 -0.206861 -0.206823 -0.206786
- -0.206749 -0.206712 -0.206675 -0.206638 -0.2066 -0.206563
- -0.206526 -0.206489 -0.206452 -0.206415 -0.203384 -0.20015
- -0.196872 -0.205024 -0.210727 -0.206779 -0.0685263 0.586138
- 1.4665 2.22945 2.77554 3.076 3.24926 3.34515 3.40164 3.43006
- 3.43713 3.43075 3.42886 3.4384 3.46567 3.49025 3.51287 3.53821
- 3.57841 3.39846 2.80753 2.22947 1.7549 1.30429 0.707786
- 0.303206 0.131352 0.0671706 0.0429955 0.032461 0.0257161
- 0.0239521 0.0217397 0.0179705 0.0138745 0.0102813 0.00749643
- 0.0054328 0.00386817 0.0027004 0.00189442 0.00135552 0.000954715
- 0.000659981 0.000453435 0.000313993 0.000231347 0.000159665
- 0.000108122 7.10528e-05 4.50233e-05 2.77892e-05 1.62765e-05
- 8.9893e-06 4.5471e-06 1.54614e-06 -1.6542e-07 -8.68508e-07
- -1.04369e-06 -9.63086e-07 -8.44294e-07 -6.57339e-07 -7.35885e-07
- -9.80056e-07 -1.39772e-06 -2.10199e-06 -1.37474e-06 6.13269e-07
- 3.3028e-06 4.60941e-06 4.91053e-06 4.14186e-06 2.45258e-06
- -8.7388e-09 -3.59647e-07 -7.10554e-07 -1.06146e-06 -1.41237e-06
- -1.76328e-06 -1.63073e-06 -1.34534e-06 -1.05995e-06 -7.74561e-07
- -4.8917e-07 -2.95733e-07 -2.16326e-07 -1.3692e-07 -5.75135e-08
- 2.18929e-08 1.01299e-07 1.80706e-07 2.60112e-07 3.39519e-07
- 4.18925e-07 4.98332e-07 4.83984e-07 4.4901e-07 4.14035e-07
- 3.79061e-07 3.44087e-07 3.09112e-07 2.74138e-07 2.39163e-07
- 2.04189e-07 1.69215e-07 1.26002e-07 4.83213e-08 -2.9359e-08
- -1.07039e-07 -1.8472e-07 -2.624e-07 -3.4008e-07 -4.1776e-07
- -4.95441e-07
+ 1.34824 1.35838 1.36465 1.34675 1.29167 1.23161 1.2201 1.2185
+ 1.2181 1.21798 1.21793 1.21788 1.21785 1.21782 1.21779 1.21776
+ 1.21655 1.21656 1.21669 1.21871 1.22421 1.22247 1.21858
+ 1.2228 1.23803 1.27737 1.10647 0.395248 0.0600669 0.027687
+ 0.0192374 0.015425 0.0130881 0.00977445 0.00696598 0.00491122
+ 0.00341952 0.00237078 0.00162339 0.00109178 0.000726647
+ 0.000478886 0.00031568 0.000207902 0.000143494 0.000109768
+ 8.62987e-05 5.69775e-05 3.36547e-05 2.30356e-05 1.86108e-05
+ 1.41861e-05 1.08293e-05 7.68835e-06 4.79593e-06 4.51019e-06
+ 4.22444e-06 3.9387e-06 3.65295e-06 3.36721e-06 3.04559e-06
+ 2.69981e-06 2.35403e-06 2.00825e-06 1.66247e-06 1.34508e-06
+ 1.26225e-06 1.17941e-06 1.09657e-06 1.01373e-06 9.30893e-07
+ 8.48054e-07 7.65216e-07 6.82378e-07 5.9954e-07 5.16702e-07
+ 4.37489e-07 3.82774e-07 3.2806e-07 2.73346e-07 2.18632e-07
+ 1.63917e-07 1.09203e-07 5.4489e-08 -2.2523e-10 -5.49395e-08
+ -1.09654e-07 -1.52862e-07 -1.3079e-07 -1.08718e-07 -8.6646e-08
+ -6.45739e-08 -4.25019e-08 -2.04298e-08 1.64229e-09 2.37144e-08
+ 4.57864e-08 6.78585e-08 8.71693e-08 9.30725e-08 9.89758e-08
+ 1.04879e-07 1.10782e-07 1.16685e-07 1.22589e-07 1.28492e-07
+ 1.34395e-07 1.40298e-07 1.46201e-07 1.52105e-07 1.58008e-07
+ 1.63911e-07 1.69814e-07 1.75718e-07 1.81621e-07 1.87524e-07
+ 1.93427e-07 1.9933e-07 2.05234e-07 2.11137e-07 2.19788e-07
+ 0.000393944 -0.000218983 -0.00105784 0.00172403 -0.00027134
+ -0.000204147 8.79968e-06 5.93762e-05 5.83554e-05 4.13815e-05
+ 3.71369e-05 3.03372e-05 2.25336e-05 1.5986e-05 1.07284e-05
+ -7.5239e-05 5.60593e-05 6.97571e-05 0.000667617 0.000960856
+ 0.00131749 -0.00759564 -0.0217897 -0.0450321 -0.076646 -0.128569
+ -0.186391 -0.202175 -0.206953 -0.2082 -0.208416 -0.208669
+ -0.208934 -0.209111 -0.209234 -0.209329 -0.209389 -0.209416
+ -0.2094 -0.209329 -0.20926 -0.209204 -0.209208 -0.209285
+ -0.209454 -0.209641 -0.20977 -0.209811 -0.209833 -0.209887
+ -0.209653 -0.209127 -0.208893 -0.208811 -0.208777 -0.208758
+ -0.208747 -0.20874 -0.208726 -0.208697 -0.208657 -0.208611
+ -0.208565 -0.208524 -0.208488 -0.208451 -0.208412 -0.208373
+ -0.208333 -0.208294 -0.208256 -0.208219 -0.208183 -0.208145
+ -0.208107 -0.208066 -0.208029 -0.207993 -0.207959 -0.207923
+ -0.207883 -0.207838 -0.207789 -0.207747 -0.20771 -0.207675
+ -0.207642 -0.207605 -0.207568 -0.207531 -0.207494 -0.207457
+ -0.20742 -0.207383 -0.207346 -0.207308 -0.207271 -0.207233
+ -0.207196 -0.207158 -0.207121 -0.207084 -0.207046 -0.207009
+ -0.206972 -0.206935 -0.206898 -0.206861 -0.206823 -0.206786
+ -0.206749 -0.206712 -0.206675 -0.206638 -0.2066 -0.206563
+ -0.206526 -0.206489 -0.206452 -0.206415 -0.203384 -0.20015
+ -0.196872 -0.205024 -0.210727 -0.206779 -0.0685263 0.586138
+ 1.4665 2.22945 2.77554 3.076 3.24926 3.34515 3.40164 3.43006
+ 3.43713 3.43075 3.42886 3.4384 3.46567 3.49025 3.51287 3.53821
+ 3.57841 3.39846 2.80753 2.22947 1.7549 1.30429 0.707786
+ 0.303206 0.131352 0.0671706 0.0429955 0.032461 0.0257161
+ 0.0239521 0.0217397 0.0179705 0.0138745 0.0102813 0.00749643
+ 0.0054328 0.00386817 0.0027004 0.00189442 0.00135552 0.000954715
+ 0.000659981 0.000453435 0.000313993 0.000231347 0.000159665
+ 0.000108122 7.10528e-05 4.50233e-05 2.77892e-05 1.62765e-05
+ 8.9893e-06 4.5471e-06 1.54614e-06 -1.6542e-07 -8.68508e-07
+ -1.04369e-06 -9.63086e-07 -8.44294e-07 -6.57339e-07 -7.35885e-07
+ -9.80056e-07 -1.39772e-06 -2.10199e-06 -1.37474e-06 6.13269e-07
+ 3.3028e-06 4.60941e-06 4.91053e-06 4.14186e-06 2.45258e-06
+ -8.7388e-09 -3.59647e-07 -7.10554e-07 -1.06146e-06 -1.41237e-06
+ -1.76328e-06 -1.63073e-06 -1.34534e-06 -1.05995e-06 -7.74561e-07
+ -4.8917e-07 -2.95733e-07 -2.16326e-07 -1.3692e-07 -5.75135e-08
+ 2.18929e-08 1.01299e-07 1.80706e-07 2.60112e-07 3.39519e-07
+ 4.18925e-07 4.98332e-07 4.83984e-07 4.4901e-07 4.14035e-07
+ 3.79061e-07 3.44087e-07 3.09112e-07 2.74138e-07 2.39163e-07
+ 2.04189e-07 1.69215e-07 1.26002e-07 4.83213e-08 -2.9359e-08
+ -1.07039e-07 -1.8472e-07 -2.624e-07 -3.4008e-07 -4.1776e-07
+ -4.95441e-07
EOD
@v[26].set(<<-'EOD')
- 7.10441e-10 0.000309731 -0.000308186 -0.001694 -0.00360784
- 8.40909e-05 0.00203175 0.0012896 0.000596548 0.000277191
- 0.000161134 0.000120439 8.4915e-05 9.49929e-05 6.18812e-05
- 1.65433e-05 1.89682e-05 3.97578e-05 4.95446e-05 0.000225325
- 0.000214579 -0.00230134 -0.000451102 0.00997237 0.0341443
- 0.0449314 0.0424411 0.0341996 0.0315315 0.0308892 0.0291614
- 0.024365 0.0190282 0.0188976 0.017238 0.0138526 0.0105645
- 0.00778548 0.00561753 0.0039871 0.00279554 0.00194075 0.0013468
- 0.000934775 0.000664723 0.000498911 0.000377384 0.000254183
- 0.000163421 0.000120773 9.65058e-05 7.22384e-05 5.60316e-05
- 4.14549e-05 2.79516e-05 2.57096e-05 2.34677e-05 2.12257e-05
- 1.89837e-05 1.67417e-05 1.46737e-05 1.27228e-05 1.07719e-05
- 8.82099e-06 6.87009e-06 5.0896e-06 4.71705e-06 4.34451e-06
- 3.97196e-06 3.59941e-06 3.22686e-06 2.85431e-06 2.48176e-06
- 2.10921e-06 1.73666e-06 1.36411e-06 1.02855e-06 9.42931e-07
- 8.57316e-07 7.71701e-07 6.86086e-07 6.00471e-07 5.14856e-07
- 4.29241e-07 3.43626e-07 2.58011e-07 1.72396e-07 9.85409e-08
- 9.14091e-08 8.42773e-08 7.71456e-08 7.00138e-08 6.2882e-08
- 5.57503e-08 4.86185e-08 4.14867e-08 3.4355e-08 2.72232e-08
- 2.05821e-08 1.63235e-08 1.2065e-08 7.80643e-09 3.54786e-09
- -7.10696e-10 -4.96926e-09 -9.22782e-09 -1.34864e-08 -1.77449e-08
- -2.20035e-08 -2.62621e-08 -3.05206e-08 -3.47792e-08 -3.90378e-08
- -4.32963e-08 -4.75549e-08 -5.18134e-08 -5.6072e-08 -6.03306e-08
- -6.45891e-08 -6.88477e-08 -8.76373e-06 0.000131607 -0.00021685
- -0.000433027 0.00047234 0.000211593 -0.000189601 3.2492e-05
- 0.000575955 7.72235e-05 -0.000285172 -0.000242061 -0.000135112
- -3.50117e-05 -2.75868e-05 5.48974e-05 1.80604e-07 5.48911e-05
- 3.97478e-05 0.000192909 0.000297932 0.00402253 -0.0122366
- -0.047853 -0.0963082 -0.108071 -0.0567275 -0.0239271 -0.0178628
- -0.0233027 -0.031853 -0.0400843 -0.0482725 -0.0576154 -0.0627218
- -0.0511236 -0.0279524 -0.0150986 -0.00931091 -0.00652876
- -0.00479286 -0.00344346 -0.00249578 -0.0019532 -0.00157977
- -0.00131848 -0.00111251 -0.000939229 -0.000797445 -0.000708384
- -0.000630452 -0.000539722 -0.000508862 -0.000480596 -0.000439484
- -0.000407217 -0.000363866 -0.000329506 -0.000318642 -0.000307362
- -0.000286511 -0.000266253 -0.000242943 -0.000218107 -0.000204661
- -0.00020241 -0.000194435 -0.000185062 -0.000173042 -0.000160549
- -0.000151407 -0.000145626 -0.000145976 -0.000147342 -0.000145288
- -0.000137979 -0.000124481 -0.000123218 -0.000127453 -0.000139006
- -0.000145486 -0.000129764 -9.82749e-05 -4.72596e-05 -3.08671e-05
- -3.28834e-05 -4.52254e-05 -6.25389e-05 -6.32516e-05 -6.39643e-05
- -6.4677e-05 -6.53897e-05 -6.61023e-05 -6.6815e-05 -6.75277e-05
- -6.61005e-05 -6.45173e-05 -6.29341e-05 -6.13509e-05 -5.97676e-05
- -5.81844e-05 -5.66012e-05 -5.54231e-05 -5.4455e-05 -5.3487e-05
- -5.25189e-05 -5.15508e-05 -5.05828e-05 -4.96147e-05 -4.86466e-05
- -4.76785e-05 -4.67105e-05 -4.57424e-05 -4.47743e-05 -4.38063e-05
- -4.28382e-05 -4.18821e-05 -4.10211e-05 -4.016e-05 -3.9299e-05
- -3.8438e-05 4.29885e-05 5.14113e-05 -0.000127986 -0.000611463
- -0.000149428 0.000882394 0.00297059 -0.00405825 -0.00591067
- -0.00546997 -0.00158744 0.00190677 0.00298403 0.00268595
- 0.00196161 0.00130289 0.000783347 0.000520683 0.000565306
- 0.00053419 -0.00224696 -0.000920818 0.0132755 0.0322504
- 0.0442808 0.0638615 0.0701007 0.0539356 0.0247771 0.056244
- 0.294266 0.831368 1.45424 2.02898 2.54559 2.9937 3.35333
- 3.72609 4.06363 4.32789 4.52413 4.66504 4.7652 4.83637 4.88631
- 4.92109 4.94464 4.96046 4.97218 4.98079 4.98679 4.99076
- 4.99361 4.99555 4.99686 4.99783 4.99853 4.99902 4.99936
- 4.99959 4.99973 4.99983 4.9999 4.99993 4.99996 4.99998 5
- 5.00001 5 4.99999 4.99997 4.99994 4.99993 4.99994 4.99996
- 4.99999 5.00004 5.00006 5.00005 5.00003 5.00002 5.00001
- 5 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
- 5 5 5 5 5 5 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
- 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
- 5 5 5 5 5 4.99999 4.99999 4.99999 4.99999 4.99999 4.99998
+ 7.10441e-10 0.000309731 -0.000308186 -0.001694 -0.00360784
+ 8.40909e-05 0.00203175 0.0012896 0.000596548 0.000277191
+ 0.000161134 0.000120439 8.4915e-05 9.49929e-05 6.18812e-05
+ 1.65433e-05 1.89682e-05 3.97578e-05 4.95446e-05 0.000225325
+ 0.000214579 -0.00230134 -0.000451102 0.00997237 0.0341443
+ 0.0449314 0.0424411 0.0341996 0.0315315 0.0308892 0.0291614
+ 0.024365 0.0190282 0.0188976 0.017238 0.0138526 0.0105645
+ 0.00778548 0.00561753 0.0039871 0.00279554 0.00194075 0.0013468
+ 0.000934775 0.000664723 0.000498911 0.000377384 0.000254183
+ 0.000163421 0.000120773 9.65058e-05 7.22384e-05 5.60316e-05
+ 4.14549e-05 2.79516e-05 2.57096e-05 2.34677e-05 2.12257e-05
+ 1.89837e-05 1.67417e-05 1.46737e-05 1.27228e-05 1.07719e-05
+ 8.82099e-06 6.87009e-06 5.0896e-06 4.71705e-06 4.34451e-06
+ 3.97196e-06 3.59941e-06 3.22686e-06 2.85431e-06 2.48176e-06
+ 2.10921e-06 1.73666e-06 1.36411e-06 1.02855e-06 9.42931e-07
+ 8.57316e-07 7.71701e-07 6.86086e-07 6.00471e-07 5.14856e-07
+ 4.29241e-07 3.43626e-07 2.58011e-07 1.72396e-07 9.85409e-08
+ 9.14091e-08 8.42773e-08 7.71456e-08 7.00138e-08 6.2882e-08
+ 5.57503e-08 4.86185e-08 4.14867e-08 3.4355e-08 2.72232e-08
+ 2.05821e-08 1.63235e-08 1.2065e-08 7.80643e-09 3.54786e-09
+ -7.10696e-10 -4.96926e-09 -9.22782e-09 -1.34864e-08 -1.77449e-08
+ -2.20035e-08 -2.62621e-08 -3.05206e-08 -3.47792e-08 -3.90378e-08
+ -4.32963e-08 -4.75549e-08 -5.18134e-08 -5.6072e-08 -6.03306e-08
+ -6.45891e-08 -6.88477e-08 -8.76373e-06 0.000131607 -0.00021685
+ -0.000433027 0.00047234 0.000211593 -0.000189601 3.2492e-05
+ 0.000575955 7.72235e-05 -0.000285172 -0.000242061 -0.000135112
+ -3.50117e-05 -2.75868e-05 5.48974e-05 1.80604e-07 5.48911e-05
+ 3.97478e-05 0.000192909 0.000297932 0.00402253 -0.0122366
+ -0.047853 -0.0963082 -0.108071 -0.0567275 -0.0239271 -0.0178628
+ -0.0233027 -0.031853 -0.0400843 -0.0482725 -0.0576154 -0.0627218
+ -0.0511236 -0.0279524 -0.0150986 -0.00931091 -0.00652876
+ -0.00479286 -0.00344346 -0.00249578 -0.0019532 -0.00157977
+ -0.00131848 -0.00111251 -0.000939229 -0.000797445 -0.000708384
+ -0.000630452 -0.000539722 -0.000508862 -0.000480596 -0.000439484
+ -0.000407217 -0.000363866 -0.000329506 -0.000318642 -0.000307362
+ -0.000286511 -0.000266253 -0.000242943 -0.000218107 -0.000204661
+ -0.00020241 -0.000194435 -0.000185062 -0.000173042 -0.000160549
+ -0.000151407 -0.000145626 -0.000145976 -0.000147342 -0.000145288
+ -0.000137979 -0.000124481 -0.000123218 -0.000127453 -0.000139006
+ -0.000145486 -0.000129764 -9.82749e-05 -4.72596e-05 -3.08671e-05
+ -3.28834e-05 -4.52254e-05 -6.25389e-05 -6.32516e-05 -6.39643e-05
+ -6.4677e-05 -6.53897e-05 -6.61023e-05 -6.6815e-05 -6.75277e-05
+ -6.61005e-05 -6.45173e-05 -6.29341e-05 -6.13509e-05 -5.97676e-05
+ -5.81844e-05 -5.66012e-05 -5.54231e-05 -5.4455e-05 -5.3487e-05
+ -5.25189e-05 -5.15508e-05 -5.05828e-05 -4.96147e-05 -4.86466e-05
+ -4.76785e-05 -4.67105e-05 -4.57424e-05 -4.47743e-05 -4.38063e-05
+ -4.28382e-05 -4.18821e-05 -4.10211e-05 -4.016e-05 -3.9299e-05
+ -3.8438e-05 4.29885e-05 5.14113e-05 -0.000127986 -0.000611463
+ -0.000149428 0.000882394 0.00297059 -0.00405825 -0.00591067
+ -0.00546997 -0.00158744 0.00190677 0.00298403 0.00268595
+ 0.00196161 0.00130289 0.000783347 0.000520683 0.000565306
+ 0.00053419 -0.00224696 -0.000920818 0.0132755 0.0322504
+ 0.0442808 0.0638615 0.0701007 0.0539356 0.0247771 0.056244
+ 0.294266 0.831368 1.45424 2.02898 2.54559 2.9937 3.35333
+ 3.72609 4.06363 4.32789 4.52413 4.66504 4.7652 4.83637 4.88631
+ 4.92109 4.94464 4.96046 4.97218 4.98079 4.98679 4.99076
+ 4.99361 4.99555 4.99686 4.99783 4.99853 4.99902 4.99936
+ 4.99959 4.99973 4.99983 4.9999 4.99993 4.99996 4.99998 5
+ 5.00001 5 4.99999 4.99997 4.99994 4.99993 4.99994 4.99996
+ 4.99999 5.00004 5.00006 5.00005 5.00003 5.00002 5.00001
+ 5 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
+ 5 5 5 5 5 5 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
+ 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
+ 5 5 5 5 5 4.99999 4.99999 4.99999 4.99999 4.99999 4.99998
EOD
@v[27].set(<<-'EOD')
- 5 4.99984 4.99796 4.99478 4.9889 4.98738 4.98896 4.99087
- 4.99262 4.99419 4.99552 4.99659 4.99743 4.99807 4.99855
- 4.9989 4.99894 4.99908 4.99935 5.00001 5.0007 5.00132 5.00032
- 4.99976 5.00134 5.00339 5.00315 5.00157 5.00091 5.00058
- 5.00012 4.99944 4.99886 4.9994 4.99934 4.99899 4.99876 4.99868
- 4.99872 4.99883 4.99898 4.99914 4.9993 4.99944 4.99956 4.99967
- 4.99976 4.99982 4.99986 4.9999 4.99993 4.99997 4.99997 4.99998
- 4.99998 4.99998 4.99998 4.99998 4.99998 4.99998 4.99998
- 4.99999 4.99999 4.99999 4.99999 5 5 5 5 5 5 5 5 5 5 5 5
- 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
- 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5.00009 5.00028 5.00015 4.99983
- 5.00036 4.99996 4.99834 4.99783 5.00383 5.00734 5.00387
- 5.00058 4.99893 4.99836 4.99832 4.99854 4.99873 4.99905
- 4.99927 4.99952 4.99969 4.99834 4.99536 4.99163 4.99073
- 5.0053 5.03631 5.03103 4.9008 4.62503 4.21887 3.70902 3.09967
- 2.35791 1.41912 0.519675 0.210458 0.131362 0.0980819 0.0708209
- 0.0471701 0.0323272 0.0253535 0.0199144 0.0152615 0.0117228
- 0.00917696 0.00738117 0.00609292 0.00512664 0.00436184 0.0037961
- 0.00331639 0.00289006 0.0025477 0.00226529 0.00202925 0.00182793
- 0.00165474 0.00150531 0.00137529 0.00125983 0.00115603 0.00106455
- 0.000982977 0.000911255 0.000846819 0.000790092 0.000738698
- 0.000692816 0.00065107 0.000613595 0.000579642 0.000548935
- 0.00052106 0.000495598 0.000472174 0.000450849 0.000431118
- 0.000412667 0.000395868 0.000381319 0.000368487 0.000357327
- 0.000344212 0.000330334 0.00031622 0.000303298 0.000295809
- 0.00028832 0.000280831 0.000273342 0.000265853 0.000258364
- 0.000250875 0.000245118 0.000239488 0.000233857 0.000228227
- 0.000222596 0.000216966 0.000211336 0.000207047 0.000203455
- 0.000199863 0.00019627 0.000192678 0.000189085 0.000185493
- 0.0001819 0.000178308 0.000174716 0.000171123 0.000167531
- 0.000163938 0.000160346 0.000156835 0.000153973 0.00015111
- 0.000148248 0.000145385 0.000296579 -3.96718e-05 -0.000449085
- 0.000323433 0.000750086 0.000268264 0.000149028 -0.000100249
- 7.00956e-05 0.00012605 0.00022592 0.000193036 0.000120453
- 8.07865e-05 7.65771e-05 -3.27828e-05 0.000116759 0.000169498
- 0.000409804 0.000414965 0.00092323 -0.00590633 -0.0175477
- -0.032433 -0.0559842 -0.0820373 0.0688484 0.626629 1.32929
- 2.01657 2.60925 3.12329 3.38952 3.14128 2.38463 1.23802
- 0.316019 0.107832 0.0694707 0.051837 0.035247 0.0209999
- 0.0116618 0.00967674 0.00789182 0.00574566 0.00386872 0.00258612
- 0.00167126 0.00104169 0.000641093 0.000401246 0.000277928
- 0.000171775 0.000102266 5.89376e-05 3.29258e-05 1.80463e-05
- 1.0057e-05 6.4571e-06 5.10093e-06 4.06791e-06 3.62716e-06
- 3.63321e-06 3.99625e-06 4.64368e-06 5.20886e-06 4.77728e-06
- 3.23919e-06 1.14113e-06 -1.29416e-06 -4.15607e-06 -1.88532e-06
- 5.24411e-06 1.38678e-05 1.28823e-05 3.6758e-06 -2.52285e-06
- -3.97133e-06 -4.03071e-06 -3.37154e-06 -2.71238e-06 -2.05321e-06
- -1.39404e-06 -7.34872e-07 -3.73325e-07 -1.05873e-07 1.61578e-07
- 4.2903e-07 6.96482e-07 8.18468e-07 7.60065e-07 7.01662e-07
- 6.43258e-07 5.84855e-07 5.26452e-07 4.68049e-07 4.09646e-07
- 3.51243e-07 2.9284e-07 2.34437e-07 1.71213e-07 1.06928e-07
- 4.2644e-08 -2.16403e-08 -8.59247e-08 -1.50209e-07 -2.14493e-07
- -2.78778e-07 -3.43062e-07 -4.07346e-07 -4.55065e-07 -4.3348e-07
- -4.11896e-07 -3.90311e-07 -3.68726e-07 -3.47141e-07 -3.25556e-07
- -3.03971e-07 -2.82386e-07
+ 5 4.99984 4.99796 4.99478 4.9889 4.98738 4.98896 4.99087
+ 4.99262 4.99419 4.99552 4.99659 4.99743 4.99807 4.99855
+ 4.9989 4.99894 4.99908 4.99935 5.00001 5.0007 5.00132 5.00032
+ 4.99976 5.00134 5.00339 5.00315 5.00157 5.00091 5.00058
+ 5.00012 4.99944 4.99886 4.9994 4.99934 4.99899 4.99876 4.99868
+ 4.99872 4.99883 4.99898 4.99914 4.9993 4.99944 4.99956 4.99967
+ 4.99976 4.99982 4.99986 4.9999 4.99993 4.99997 4.99997 4.99998
+ 4.99998 4.99998 4.99998 4.99998 4.99998 4.99998 4.99998
+ 4.99999 4.99999 4.99999 4.99999 5 5 5 5 5 5 5 5 5 5 5 5
+ 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+ 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5.00009 5.00028 5.00015 4.99983
+ 5.00036 4.99996 4.99834 4.99783 5.00383 5.00734 5.00387
+ 5.00058 4.99893 4.99836 4.99832 4.99854 4.99873 4.99905
+ 4.99927 4.99952 4.99969 4.99834 4.99536 4.99163 4.99073
+ 5.0053 5.03631 5.03103 4.9008 4.62503 4.21887 3.70902 3.09967
+ 2.35791 1.41912 0.519675 0.210458 0.131362 0.0980819 0.0708209
+ 0.0471701 0.0323272 0.0253535 0.0199144 0.0152615 0.0117228
+ 0.00917696 0.00738117 0.00609292 0.00512664 0.00436184 0.0037961
+ 0.00331639 0.00289006 0.0025477 0.00226529 0.00202925 0.00182793
+ 0.00165474 0.00150531 0.00137529 0.00125983 0.00115603 0.00106455
+ 0.000982977 0.000911255 0.000846819 0.000790092 0.000738698
+ 0.000692816 0.00065107 0.000613595 0.000579642 0.000548935
+ 0.00052106 0.000495598 0.000472174 0.000450849 0.000431118
+ 0.000412667 0.000395868 0.000381319 0.000368487 0.000357327
+ 0.000344212 0.000330334 0.00031622 0.000303298 0.000295809
+ 0.00028832 0.000280831 0.000273342 0.000265853 0.000258364
+ 0.000250875 0.000245118 0.000239488 0.000233857 0.000228227
+ 0.000222596 0.000216966 0.000211336 0.000207047 0.000203455
+ 0.000199863 0.00019627 0.000192678 0.000189085 0.000185493
+ 0.0001819 0.000178308 0.000174716 0.000171123 0.000167531
+ 0.000163938 0.000160346 0.000156835 0.000153973 0.00015111
+ 0.000148248 0.000145385 0.000296579 -3.96718e-05 -0.000449085
+ 0.000323433 0.000750086 0.000268264 0.000149028 -0.000100249
+ 7.00956e-05 0.00012605 0.00022592 0.000193036 0.000120453
+ 8.07865e-05 7.65771e-05 -3.27828e-05 0.000116759 0.000169498
+ 0.000409804 0.000414965 0.00092323 -0.00590633 -0.0175477
+ -0.032433 -0.0559842 -0.0820373 0.0688484 0.626629 1.32929
+ 2.01657 2.60925 3.12329 3.38952 3.14128 2.38463 1.23802
+ 0.316019 0.107832 0.0694707 0.051837 0.035247 0.0209999
+ 0.0116618 0.00967674 0.00789182 0.00574566 0.00386872 0.00258612
+ 0.00167126 0.00104169 0.000641093 0.000401246 0.000277928
+ 0.000171775 0.000102266 5.89376e-05 3.29258e-05 1.80463e-05
+ 1.0057e-05 6.4571e-06 5.10093e-06 4.06791e-06 3.62716e-06
+ 3.63321e-06 3.99625e-06 4.64368e-06 5.20886e-06 4.77728e-06
+ 3.23919e-06 1.14113e-06 -1.29416e-06 -4.15607e-06 -1.88532e-06
+ 5.24411e-06 1.38678e-05 1.28823e-05 3.6758e-06 -2.52285e-06
+ -3.97133e-06 -4.03071e-06 -3.37154e-06 -2.71238e-06 -2.05321e-06
+ -1.39404e-06 -7.34872e-07 -3.73325e-07 -1.05873e-07 1.61578e-07
+ 4.2903e-07 6.96482e-07 8.18468e-07 7.60065e-07 7.01662e-07
+ 6.43258e-07 5.84855e-07 5.26452e-07 4.68049e-07 4.09646e-07
+ 3.51243e-07 2.9284e-07 2.34437e-07 1.71213e-07 1.06928e-07
+ 4.2644e-08 -2.16403e-08 -8.59247e-08 -1.50209e-07 -2.14493e-07
+ -2.78778e-07 -3.43062e-07 -4.07346e-07 -4.55065e-07 -4.3348e-07
+ -4.11896e-07 -3.90311e-07 -3.68726e-07 -3.47141e-07 -3.25556e-07
+ -3.03971e-07 -2.82386e-07
EOD
@v[28].set(<<-'EOD')
- 0.368163 0.361756 0.327463 0.269513 0.149476 0.0805716 0.0501146
- 0.03403 0.0230886 0.0160474 0.0116071 0.00870013 0.00679614
- 0.00542384 0.00432512 0.00340653 -0.00129719 -0.00399429
- -0.00318719 0.00443085 0.0150156 0.0334147 0.0132288 -0.0189751
- -0.0508377 -0.0252174 -0.0142489 -0.00675908 -0.0038653
- -0.00243423 -0.00168891 -0.00120901 -0.000900426 -0.000685575
- -0.000557595 -0.000457268 -0.000377427 -0.000315269 -0.000266613
- -0.000228397 -0.000198283 -0.000174248 -0.000154886 -0.00013892
- -0.000125864 -0.000115189 -0.000105841 -9.66611e-05 -8.84262e-05
- -8.23872e-05 -7.74668e-05 -7.25463e-05 -6.79992e-05 -6.35276e-05
- -5.92413e-05 -5.68994e-05 -5.45574e-05 -5.22154e-05 -4.98735e-05
- -4.75315e-05 -4.54981e-05 -4.36726e-05 -4.18471e-05 -4.00216e-05
- -3.81961e-05 -3.64559e-05 -3.54209e-05 -3.43858e-05 -3.33508e-05
- -3.23157e-05 -3.12807e-05 -3.02456e-05 -2.92105e-05 -2.81755e-05
- -2.71404e-05 -2.61054e-05 -2.51232e-05 -2.44984e-05 -2.38736e-05
- -2.32487e-05 -2.26239e-05 -2.19991e-05 -2.13742e-05 -2.07494e-05
- -2.01246e-05 -1.94998e-05 -1.88749e-05 -1.82865e-05 -1.79044e-05
- -1.75224e-05 -1.71403e-05 -1.67582e-05 -1.63762e-05 -1.59941e-05
- -1.56121e-05 -1.523e-05 -1.4848e-05 -1.44659e-05 -1.41138e-05
- -1.39075e-05 -1.37011e-05 -1.34947e-05 -1.32883e-05 -1.30819e-05
- -1.28755e-05 -1.26691e-05 -1.24627e-05 -1.22563e-05 -1.205e-05
- -1.18436e-05 -1.16372e-05 -1.14308e-05 -1.12244e-05 -1.1018e-05
- -1.08116e-05 -1.06052e-05 -1.03988e-05 -1.01924e-05 -9.98605e-06
- -9.77966e-06 -2.85319e-05 0.00281092 0.00180106 -0.000981083
- 0.00551926 -0.00119763 -0.0295069 -0.0367677 0.064749 0.119022
- 0.0882007 0.0552062 0.03418 0.0223243 0.015545 0.011949
- 0.00757134 0.00667655 0.00583243 0.00644443 0.00650959 -0.0302575
- -0.0437806 -0.0355466 0.0381776 0.282109 0.674178 1.07582
- 1.45189 1.789 2.08649 2.34663 2.57245 2.81211 3.04778 3.2523
- 3.45877 3.65593 3.83396 3.9923 4.13368 4.25864 4.36719 4.46064
- 4.54086 4.60962 4.66835 4.71838 4.76094 4.79716 4.82796
- 4.85413 4.87634 4.89518 4.91116 4.92476 4.93631 4.94608
- 4.95434 4.9613 4.96715 4.97211 4.97638 4.98001 4.98312 4.98571
- 4.98795 4.98979 4.99138 4.99269 4.99381 4.99474 4.99551
- 4.99615 4.99668 4.99713 4.99752 4.99783 4.99811 4.99836
- 4.99858 4.99873 4.99884 4.99892 4.999 4.99907 4.99912 4.99916
- 4.99921 4.99926 4.99932 4.99937 4.99942 4.99948 4.99953
- 4.99956 4.99958 4.99961 4.99963 4.99966 4.99968 4.99971
- 4.99972 4.99973 4.99974 4.99975 4.99976 4.99977 4.99978
- 4.99979 4.9998 4.9998 4.99981 4.99982 4.99983 4.99984 4.99985
- 4.99986 4.99986 4.99987 4.99987 5.00498 5.00354 4.99359
- 4.98981 5.00498 5.00099 5.00041 5.00022 5.00015 5.00012
- 5.0001 5.00008 5.00005 5.00003 5 4.99431 4.99459 4.99591
- 5.00087 5.01029 5.03935 4.92784 4.51643 3.78356 2.68745
- 1.43417 0.583128 0.205094 0.0777337 0.0391566 0.02723 0.023883
- 0.018808 0.010165 0.00254623 -0.00377463 -0.0038097 0.00144145
- 0.00267231 0.00193045 0.00144538 0.00121758 0.00112893 0.00109424
- 0.0010226 0.000948072 0.000882573 0.000826996 0.000776391
- 0.000729719 0.000686499 0.000647333 0.000610108 0.000575631
- 0.000545069 0.000515485 0.000488514 0.000465316 0.000443215
- 0.000422454 0.00040292 0.00038488 0.000368472 0.000353628
- 0.000339643 0.000326197 0.000313483 0.000302884 0.000294038
- 0.000284003 0.000270941 0.000254925 0.000246511 0.000244089
- 0.000245538 0.000242099 0.000235728 0.000227482 0.000218001
- 0.000207257 0.000202127 0.000196997 0.000191868 0.000186738
- 0.000181608 0.00017758 0.000173899 0.000170219 0.000166538
- 0.000162857 0.000159576 0.00015679 0.000154005 0.000151219
- 0.000148433 0.000145647 0.000142861 0.000140076 0.00013729
- 0.000134504 0.000131718 0.000129603 0.000127635 0.000125668
- 0.0001237 0.000121732 0.000119765 0.000117797 0.000115829
- 0.000113862 0.000111894 0.000109993 0.000108372 0.000106751
- 0.00010513 0.000103509 0.000101887 0.000100266 9.86449e-05
- 9.70237e-05
+ 0.368163 0.361756 0.327463 0.269513 0.149476 0.0805716 0.0501146
+ 0.03403 0.0230886 0.0160474 0.0116071 0.00870013 0.00679614
+ 0.00542384 0.00432512 0.00340653 -0.00129719 -0.00399429
+ -0.00318719 0.00443085 0.0150156 0.0334147 0.0132288 -0.0189751
+ -0.0508377 -0.0252174 -0.0142489 -0.00675908 -0.0038653
+ -0.00243423 -0.00168891 -0.00120901 -0.000900426 -0.000685575
+ -0.000557595 -0.000457268 -0.000377427 -0.000315269 -0.000266613
+ -0.000228397 -0.000198283 -0.000174248 -0.000154886 -0.00013892
+ -0.000125864 -0.000115189 -0.000105841 -9.66611e-05 -8.84262e-05
+ -8.23872e-05 -7.74668e-05 -7.25463e-05 -6.79992e-05 -6.35276e-05
+ -5.92413e-05 -5.68994e-05 -5.45574e-05 -5.22154e-05 -4.98735e-05
+ -4.75315e-05 -4.54981e-05 -4.36726e-05 -4.18471e-05 -4.00216e-05
+ -3.81961e-05 -3.64559e-05 -3.54209e-05 -3.43858e-05 -3.33508e-05
+ -3.23157e-05 -3.12807e-05 -3.02456e-05 -2.92105e-05 -2.81755e-05
+ -2.71404e-05 -2.61054e-05 -2.51232e-05 -2.44984e-05 -2.38736e-05
+ -2.32487e-05 -2.26239e-05 -2.19991e-05 -2.13742e-05 -2.07494e-05
+ -2.01246e-05 -1.94998e-05 -1.88749e-05 -1.82865e-05 -1.79044e-05
+ -1.75224e-05 -1.71403e-05 -1.67582e-05 -1.63762e-05 -1.59941e-05
+ -1.56121e-05 -1.523e-05 -1.4848e-05 -1.44659e-05 -1.41138e-05
+ -1.39075e-05 -1.37011e-05 -1.34947e-05 -1.32883e-05 -1.30819e-05
+ -1.28755e-05 -1.26691e-05 -1.24627e-05 -1.22563e-05 -1.205e-05
+ -1.18436e-05 -1.16372e-05 -1.14308e-05 -1.12244e-05 -1.1018e-05
+ -1.08116e-05 -1.06052e-05 -1.03988e-05 -1.01924e-05 -9.98605e-06
+ -9.77966e-06 -2.85319e-05 0.00281092 0.00180106 -0.000981083
+ 0.00551926 -0.00119763 -0.0295069 -0.0367677 0.064749 0.119022
+ 0.0882007 0.0552062 0.03418 0.0223243 0.015545 0.011949
+ 0.00757134 0.00667655 0.00583243 0.00644443 0.00650959 -0.0302575
+ -0.0437806 -0.0355466 0.0381776 0.282109 0.674178 1.07582
+ 1.45189 1.789 2.08649 2.34663 2.57245 2.81211 3.04778 3.2523
+ 3.45877 3.65593 3.83396 3.9923 4.13368 4.25864 4.36719 4.46064
+ 4.54086 4.60962 4.66835 4.71838 4.76094 4.79716 4.82796
+ 4.85413 4.87634 4.89518 4.91116 4.92476 4.93631 4.94608
+ 4.95434 4.9613 4.96715 4.97211 4.97638 4.98001 4.98312 4.98571
+ 4.98795 4.98979 4.99138 4.99269 4.99381 4.99474 4.99551
+ 4.99615 4.99668 4.99713 4.99752 4.99783 4.99811 4.99836
+ 4.99858 4.99873 4.99884 4.99892 4.999 4.99907 4.99912 4.99916
+ 4.99921 4.99926 4.99932 4.99937 4.99942 4.99948 4.99953
+ 4.99956 4.99958 4.99961 4.99963 4.99966 4.99968 4.99971
+ 4.99972 4.99973 4.99974 4.99975 4.99976 4.99977 4.99978
+ 4.99979 4.9998 4.9998 4.99981 4.99982 4.99983 4.99984 4.99985
+ 4.99986 4.99986 4.99987 4.99987 5.00498 5.00354 4.99359
+ 4.98981 5.00498 5.00099 5.00041 5.00022 5.00015 5.00012
+ 5.0001 5.00008 5.00005 5.00003 5 4.99431 4.99459 4.99591
+ 5.00087 5.01029 5.03935 4.92784 4.51643 3.78356 2.68745
+ 1.43417 0.583128 0.205094 0.0777337 0.0391566 0.02723 0.023883
+ 0.018808 0.010165 0.00254623 -0.00377463 -0.0038097 0.00144145
+ 0.00267231 0.00193045 0.00144538 0.00121758 0.00112893 0.00109424
+ 0.0010226 0.000948072 0.000882573 0.000826996 0.000776391
+ 0.000729719 0.000686499 0.000647333 0.000610108 0.000575631
+ 0.000545069 0.000515485 0.000488514 0.000465316 0.000443215
+ 0.000422454 0.00040292 0.00038488 0.000368472 0.000353628
+ 0.000339643 0.000326197 0.000313483 0.000302884 0.000294038
+ 0.000284003 0.000270941 0.000254925 0.000246511 0.000244089
+ 0.000245538 0.000242099 0.000235728 0.000227482 0.000218001
+ 0.000207257 0.000202127 0.000196997 0.000191868 0.000186738
+ 0.000181608 0.00017758 0.000173899 0.000170219 0.000166538
+ 0.000162857 0.000159576 0.00015679 0.000154005 0.000151219
+ 0.000148433 0.000145647 0.000142861 0.000140076 0.00013729
+ 0.000134504 0.000131718 0.000129603 0.000127635 0.000125668
+ 0.0001237 0.000121732 0.000119765 0.000117797 0.000115829
+ 0.000113862 0.000111894 0.000109993 0.000108372 0.000106751
+ 0.00010513 0.000103509 0.000101887 0.000100266 9.86449e-05
+ 9.70237e-05
EOD
@v[29].set(<<-'EOD')
- 5 4.99899 4.99654 4.99327 4.9863 4.98954 4.99212 4.99378
- 4.9951 4.99624 4.99715 4.99786 4.99839 4.99879 4.99909 4.99931
- 4.99922 4.99933 4.99971 5.00064 5.00084 5.00123 4.99865
- 4.99853 4.99983 5.00457 5.00242 5.00105 5.00062 5.00042
- 4.99971 4.9994 4.9992 4.9996 4.99955 4.99932 4.99918 4.99915
- 4.99919 4.99927 4.99937 4.99948 4.99957 4.99966 4.99974
- 4.9998 4.99985 4.99989 4.99992 4.99993 4.99994 4.99994 4.99996
- 4.99998 5 5 5.00001 5.00001 5.00001 5.00002 5.00002 5.00001
- 5.00001 5.00001 5 5 5 5 4.99999 4.99999 4.99999 4.99999
- 4.99999 4.99999 4.99999 4.99998 4.99998 4.99999 4.99999
- 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 5 5 5 5
- 5 5 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
- 5.00002 5.00002 5.00001 5.00001 5.00001 5.00001 5.00001
- 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
- 5.00001 5.00001 5 5 5 5 5 5 4.9997 4.99998 4.99954 4.99963
- 5.00059 4.99945 4.99732 4.99957 5.00919 5.00558 5.00033
- 4.99851 4.9983 4.99854 4.99871 4.99928 4.99914 4.99939 4.99952
- 4.9998 4.99976 4.99744 4.99598 4.99478 4.99806 5.01911 5.04602
- 5.05469 5.01317 4.89484 4.69655 4.42036 4.06069 3.60793
- 3.12531 2.72975 2.45187 2.25081 2.09841 1.98509 1.90211
- 1.84084 1.79411 1.7574 1.72763 1.70283 1.68188 1.66389 1.64823
- 1.63438 1.62201 1.61088 1.60081 1.59163 1.58323 1.57549
- 1.56835 1.56173 1.55558 1.54985 1.54451 1.53951 1.53479
- 1.53035 1.52615 1.5222 1.51845 1.5149 1.51153 1.50834 1.50529
- 1.5024 1.49964 1.497 1.49449 1.49208 1.48977 1.48755 1.48542
- 1.48336 1.48138 1.47948 1.47765 1.4759 1.47419 1.47255 1.47096
- 1.46949 1.46823 1.46696 1.4657 1.46444 1.46317 1.46191 1.46065
- 1.45956 1.4585 1.45743 1.45636 1.45529 1.45422 1.45315 1.45226
- 1.45145 1.45064 1.44983 1.44902 1.44821 1.4474 1.44659 1.44579
- 1.44498 1.44417 1.44336 1.44255 1.44174 1.44094 1.44019
- 1.43944 1.43868 1.43793 1.43765 1.43679 1.43515 1.43405
- 1.43478 1.43387 1.43345 1.43184 1.43086 1.43021 1.43003
- 1.42988 1.42944 1.42883 1.42818 1.42702 1.42642 1.42595
- 1.42586 1.42616 1.42783 1.41733 1.38106 1.30738 1.3877 2.09819
- 3.05285 3.58059 3.77601 3.87609 4.02557 4.24887 4.4608 4.60411
- 4.72109 4.8255 4.90465 4.97379 5.01253 5.01532 5.01239 5.0092
- 5.00665 5.00474 5.00333 5.00232 5.00163 5.00117 5.00082
- 5.00057 5.00039 5.00027 5.00019 5.00013 5.00009 5.00006
- 5.00004 5.00003 5.00002 5.00001 5.00001 5 5 5 4.99998 4.99995
- 4.99992 4.99996 5.00005 5.00012 5.00008 4.99996 4.9999 4.99985
- 4.99986 4.99997 5.00021 5.0003 5.00024 5.00009 5.00007 5.00005
- 5.00003 5.00001 4.99998 4.99998 4.99998 4.99999 4.99999
- 5 5 5 5 5 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
- 5.00002 5.00002 5.00001 5.00001 5.00001 5.00001 5.00001
- 5.00001 5 5 5 5 5 4.99999 4.99999 4.99999 4.99999 4.99998
- 4.99998 4.99998
+ 5 4.99899 4.99654 4.99327 4.9863 4.98954 4.99212 4.99378
+ 4.9951 4.99624 4.99715 4.99786 4.99839 4.99879 4.99909 4.99931
+ 4.99922 4.99933 4.99971 5.00064 5.00084 5.00123 4.99865
+ 4.99853 4.99983 5.00457 5.00242 5.00105 5.00062 5.00042
+ 4.99971 4.9994 4.9992 4.9996 4.99955 4.99932 4.99918 4.99915
+ 4.99919 4.99927 4.99937 4.99948 4.99957 4.99966 4.99974
+ 4.9998 4.99985 4.99989 4.99992 4.99993 4.99994 4.99994 4.99996
+ 4.99998 5 5 5.00001 5.00001 5.00001 5.00002 5.00002 5.00001
+ 5.00001 5.00001 5 5 5 5 4.99999 4.99999 4.99999 4.99999
+ 4.99999 4.99999 4.99999 4.99998 4.99998 4.99999 4.99999
+ 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 5 5 5 5
+ 5 5 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
+ 5.00002 5.00002 5.00001 5.00001 5.00001 5.00001 5.00001
+ 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
+ 5.00001 5.00001 5 5 5 5 5 5 4.9997 4.99998 4.99954 4.99963
+ 5.00059 4.99945 4.99732 4.99957 5.00919 5.00558 5.00033
+ 4.99851 4.9983 4.99854 4.99871 4.99928 4.99914 4.99939 4.99952
+ 4.9998 4.99976 4.99744 4.99598 4.99478 4.99806 5.01911 5.04602
+ 5.05469 5.01317 4.89484 4.69655 4.42036 4.06069 3.60793
+ 3.12531 2.72975 2.45187 2.25081 2.09841 1.98509 1.90211
+ 1.84084 1.79411 1.7574 1.72763 1.70283 1.68188 1.66389 1.64823
+ 1.63438 1.62201 1.61088 1.60081 1.59163 1.58323 1.57549
+ 1.56835 1.56173 1.55558 1.54985 1.54451 1.53951 1.53479
+ 1.53035 1.52615 1.5222 1.51845 1.5149 1.51153 1.50834 1.50529
+ 1.5024 1.49964 1.497 1.49449 1.49208 1.48977 1.48755 1.48542
+ 1.48336 1.48138 1.47948 1.47765 1.4759 1.47419 1.47255 1.47096
+ 1.46949 1.46823 1.46696 1.4657 1.46444 1.46317 1.46191 1.46065
+ 1.45956 1.4585 1.45743 1.45636 1.45529 1.45422 1.45315 1.45226
+ 1.45145 1.45064 1.44983 1.44902 1.44821 1.4474 1.44659 1.44579
+ 1.44498 1.44417 1.44336 1.44255 1.44174 1.44094 1.44019
+ 1.43944 1.43868 1.43793 1.43765 1.43679 1.43515 1.43405
+ 1.43478 1.43387 1.43345 1.43184 1.43086 1.43021 1.43003
+ 1.42988 1.42944 1.42883 1.42818 1.42702 1.42642 1.42595
+ 1.42586 1.42616 1.42783 1.41733 1.38106 1.30738 1.3877 2.09819
+ 3.05285 3.58059 3.77601 3.87609 4.02557 4.24887 4.4608 4.60411
+ 4.72109 4.8255 4.90465 4.97379 5.01253 5.01532 5.01239 5.0092
+ 5.00665 5.00474 5.00333 5.00232 5.00163 5.00117 5.00082
+ 5.00057 5.00039 5.00027 5.00019 5.00013 5.00009 5.00006
+ 5.00004 5.00003 5.00002 5.00001 5.00001 5 5 5 4.99998 4.99995
+ 4.99992 4.99996 5.00005 5.00012 5.00008 4.99996 4.9999 4.99985
+ 4.99986 4.99997 5.00021 5.0003 5.00024 5.00009 5.00007 5.00005
+ 5.00003 5.00001 4.99998 4.99998 4.99998 4.99999 4.99999
+ 5 5 5 5 5 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
+ 5.00002 5.00002 5.00001 5.00001 5.00001 5.00001 5.00001
+ 5.00001 5 5 5 5 5 4.99999 4.99999 4.99999 4.99999 4.99998
+ 4.99998 4.99998
EOD
@v[30].set(<<-'EOD')
- 7.10441e-10 5.70385e-05 0.000226143 0.000131916 -0.000887764
- -8.01837e-05 -3.49653e-05 9.40039e-05 0.000118663 0.000108025
- 8.6059e-05 6.33268e-05 4.99295e-05 3.16843e-05 3.60692e-05
- 2.07572e-05 -8.6375e-05 3.44583e-05 8.07397e-05 0.000196296
- 0.000115615 -7.12768e-05 -0.000129812 -4.18679e-05 7.94364e-05
- 0.000182034 -5.41226e-05 -0.000451819 -0.000713937 -0.00129863
- -0.00262186 -0.00213417 -0.00133767 0.000775698 0.000969902
- 0.000549281 0.000280946 0.000140321 8.6919e-05 7.22446e-05
- 6.5631e-05 6.45263e-05 6.63087e-05 7.17391e-05 7.59042e-05
- 7.59172e-05 7.03353e-05 6.33558e-05 5.31136e-05 4.64278e-05
- 4.40594e-05 4.16909e-05 4.05674e-05 3.96957e-05 3.87875e-05
- 3.74977e-05 3.62079e-05 3.49181e-05 3.36283e-05 3.23385e-05
- 3.12427e-05 3.02775e-05 2.93124e-05 2.83472e-05 2.7382e-05
- 2.64613e-05 2.59077e-05 2.5354e-05 2.48004e-05 2.42468e-05
- 2.36931e-05 2.31395e-05 2.25859e-05 2.20322e-05 2.14786e-05
- 2.0925e-05 2.03916e-05 1.9995e-05 1.95984e-05 1.92019e-05
- 1.88053e-05 1.84087e-05 1.80122e-05 1.76156e-05 1.7219e-05
- 1.68225e-05 1.64259e-05 1.6051e-05 1.57991e-05 1.55471e-05
- 1.52952e-05 1.50433e-05 1.47913e-05 1.45394e-05 1.42875e-05
- 1.40356e-05 1.37836e-05 1.35317e-05 1.32978e-05 1.31513e-05
- 1.30048e-05 1.28583e-05 1.27118e-05 1.25653e-05 1.24188e-05
- 1.22724e-05 1.21259e-05 1.19794e-05 1.18329e-05 1.16864e-05
- 1.15399e-05 1.13934e-05 1.12469e-05 1.11005e-05 1.0954e-05
- 1.08075e-05 1.0661e-05 1.05145e-05 1.0368e-05 1.02215e-05
- 1.76447e-05 7.21516e-05 -3.59786e-05 -0.000159618 0.000156236
- 0.000135106 -0.000336402 -0.000302283 0.000699323 0.000473866
- -0.000156146 -0.000225625 -0.000123592 -3.78116e-05 8.47472e-06
- 2.43387e-06 -7.44762e-05 7.80111e-05 9.43608e-05 0.000170159
- 8.83919e-05 -0.00018802 -0.000373512 -0.000390597 0.000156875
- 0.0032343 0.00776304 -0.000566905 -0.00760695 -0.0159226
- -0.0245989 -0.0331402 -0.0100902 0.067837 0.266702 0.910818
- 1.82282 2.69714 3.43247 3.98325 4.32893 4.51529 4.67087
- 4.79288 4.87574 4.92797 4.95902 4.97655 4.98622 4.99195
- 4.99526 4.99735 4.9991 4.99974 4.99982 4.99974 4.99961 4.9995
- 4.99943 4.9994 4.9994 4.99942 4.99944 4.99948 4.99952 4.99956
- 4.99961 4.99965 4.9997 4.99974 4.99977 4.99981 4.99983 4.99986
- 4.99988 4.9999 4.99991 4.99992 4.99993 4.99994 4.99995 4.99995
- 4.99996 4.99997 4.99997 4.99998 4.99998 4.99999 4.99999
- 4.99999 5 5 5 5.00001 5.00001 5.00001 5.00001 5.00001 5
- 5 5 5 5 5 5 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
- 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
- 4.99999 4.99999 5 5.00019 4.99888 4.99663 4.99457 4.99902
- 5.00229 5.00323 5.00302 5.0023 5.0015 5.00085 5.00041 5.00013
- 4.99993 4.99979 4.99948 4.99954 4.99983 5.00055 5.00109
- 5.00009 4.9987 4.998 4.99755 4.99676 4.99618 5.01091 5.05272
- 5.04156 4.80112 4.27692 3.42343 2.23953 0.967179 0.429813
- 0.540757 1.32991 2.32147 3.14903 3.78143 4.22325 4.47978
- 4.59448 4.69875 4.79798 4.87419 4.92339 4.95249 4.97174
- 4.98408 4.99124 4.99478 4.99729 4.99868 4.9992 4.99941 4.99947
- 4.99946 4.99943 4.9994 4.99939 4.9994 4.99942 4.99946 4.99951
- 4.99956 4.99961 4.99967 4.99973 4.99977 4.9998 4.99981 4.99983
- 4.99984 4.99987 4.99992 5.00001 5.00005 5.00001 4.99994
- 4.99995 4.99995 4.99996 4.99996 4.99996 4.99997 4.99997
- 4.99997 4.99998 4.99998 4.99998 4.99998 4.99999 4.99999
- 4.99999 4.99999 5 5 5 5.00001 5.00001 5.00001 5.00001 5.00001
- 5.00001 5 5 5 5 5 5 5 5 4.99999 4.99999 4.99999 4.99999
- 4.99998 4.99998 4.99998
+ 7.10441e-10 5.70385e-05 0.000226143 0.000131916 -0.000887764
+ -8.01837e-05 -3.49653e-05 9.40039e-05 0.000118663 0.000108025
+ 8.6059e-05 6.33268e-05 4.99295e-05 3.16843e-05 3.60692e-05
+ 2.07572e-05 -8.6375e-05 3.44583e-05 8.07397e-05 0.000196296
+ 0.000115615 -7.12768e-05 -0.000129812 -4.18679e-05 7.94364e-05
+ 0.000182034 -5.41226e-05 -0.000451819 -0.000713937 -0.00129863
+ -0.00262186 -0.00213417 -0.00133767 0.000775698 0.000969902
+ 0.000549281 0.000280946 0.000140321 8.6919e-05 7.22446e-05
+ 6.5631e-05 6.45263e-05 6.63087e-05 7.17391e-05 7.59042e-05
+ 7.59172e-05 7.03353e-05 6.33558e-05 5.31136e-05 4.64278e-05
+ 4.40594e-05 4.16909e-05 4.05674e-05 3.96957e-05 3.87875e-05
+ 3.74977e-05 3.62079e-05 3.49181e-05 3.36283e-05 3.23385e-05
+ 3.12427e-05 3.02775e-05 2.93124e-05 2.83472e-05 2.7382e-05
+ 2.64613e-05 2.59077e-05 2.5354e-05 2.48004e-05 2.42468e-05
+ 2.36931e-05 2.31395e-05 2.25859e-05 2.20322e-05 2.14786e-05
+ 2.0925e-05 2.03916e-05 1.9995e-05 1.95984e-05 1.92019e-05
+ 1.88053e-05 1.84087e-05 1.80122e-05 1.76156e-05 1.7219e-05
+ 1.68225e-05 1.64259e-05 1.6051e-05 1.57991e-05 1.55471e-05
+ 1.52952e-05 1.50433e-05 1.47913e-05 1.45394e-05 1.42875e-05
+ 1.40356e-05 1.37836e-05 1.35317e-05 1.32978e-05 1.31513e-05
+ 1.30048e-05 1.28583e-05 1.27118e-05 1.25653e-05 1.24188e-05
+ 1.22724e-05 1.21259e-05 1.19794e-05 1.18329e-05 1.16864e-05
+ 1.15399e-05 1.13934e-05 1.12469e-05 1.11005e-05 1.0954e-05
+ 1.08075e-05 1.0661e-05 1.05145e-05 1.0368e-05 1.02215e-05
+ 1.76447e-05 7.21516e-05 -3.59786e-05 -0.000159618 0.000156236
+ 0.000135106 -0.000336402 -0.000302283 0.000699323 0.000473866
+ -0.000156146 -0.000225625 -0.000123592 -3.78116e-05 8.47472e-06
+ 2.43387e-06 -7.44762e-05 7.80111e-05 9.43608e-05 0.000170159
+ 8.83919e-05 -0.00018802 -0.000373512 -0.000390597 0.000156875
+ 0.0032343 0.00776304 -0.000566905 -0.00760695 -0.0159226
+ -0.0245989 -0.0331402 -0.0100902 0.067837 0.266702 0.910818
+ 1.82282 2.69714 3.43247 3.98325 4.32893 4.51529 4.67087
+ 4.79288 4.87574 4.92797 4.95902 4.97655 4.98622 4.99195
+ 4.99526 4.99735 4.9991 4.99974 4.99982 4.99974 4.99961 4.9995
+ 4.99943 4.9994 4.9994 4.99942 4.99944 4.99948 4.99952 4.99956
+ 4.99961 4.99965 4.9997 4.99974 4.99977 4.99981 4.99983 4.99986
+ 4.99988 4.9999 4.99991 4.99992 4.99993 4.99994 4.99995 4.99995
+ 4.99996 4.99997 4.99997 4.99998 4.99998 4.99999 4.99999
+ 4.99999 5 5 5 5.00001 5.00001 5.00001 5.00001 5.00001 5
+ 5 5 5 5 5 5 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
+ 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
+ 4.99999 4.99999 5 5.00019 4.99888 4.99663 4.99457 4.99902
+ 5.00229 5.00323 5.00302 5.0023 5.0015 5.00085 5.00041 5.00013
+ 4.99993 4.99979 4.99948 4.99954 4.99983 5.00055 5.00109
+ 5.00009 4.9987 4.998 4.99755 4.99676 4.99618 5.01091 5.05272
+ 5.04156 4.80112 4.27692 3.42343 2.23953 0.967179 0.429813
+ 0.540757 1.32991 2.32147 3.14903 3.78143 4.22325 4.47978
+ 4.59448 4.69875 4.79798 4.87419 4.92339 4.95249 4.97174
+ 4.98408 4.99124 4.99478 4.99729 4.99868 4.9992 4.99941 4.99947
+ 4.99946 4.99943 4.9994 4.99939 4.9994 4.99942 4.99946 4.99951
+ 4.99956 4.99961 4.99967 4.99973 4.99977 4.9998 4.99981 4.99983
+ 4.99984 4.99987 4.99992 5.00001 5.00005 5.00001 4.99994
+ 4.99995 4.99995 4.99996 4.99996 4.99996 4.99997 4.99997
+ 4.99997 4.99998 4.99998 4.99998 4.99998 4.99999 4.99999
+ 4.99999 4.99999 5 5 5 5.00001 5.00001 5.00001 5.00001 5.00001
+ 5.00001 5 5 5 5 5 5 5 5 4.99999 4.99999 4.99999 4.99999
+ 4.99998 4.99998 4.99998
EOD
@v[31].set(<<-'EOD')
- 1.8179e-09 -5.28841e-06 -1.44913e-05 -3.62932e-05 -9.75719e-05
- 0.000141781 3.73396e-05 -1.65603e-05 -1.5271e-05 -6.73884e-06
- 4.40157e-06 -4.85345e-06 -1.02964e-05 2.03126e-05 -1.89457e-05
- -8.75564e-06 7.67422e-06 4.71103e-06 1.29798e-05 6.13469e-06
- -1.14363e-05 -0.0394563 -0.0477298 -0.0622012 -0.0519225
- 0.262499 0.943611 1.67052 2.31017 2.84028 3.28467 3.61582
- 3.85887 4.13011 4.36511 4.54063 4.67013 4.76408 4.83263
- 4.8825 4.91837 4.94373 4.96117 4.97318 4.98093 4.98562 4.98906
- 4.99267 4.99539 4.99666 4.99731 4.99797 4.99844 4.99887
- 4.99927 4.99933 4.99938 4.99944 4.99949 4.99955 4.9996 4.99965
- 4.9997 4.99975 4.9998 4.99985 4.99986 4.99987 4.99989 4.9999
- 4.99991 4.99992 4.99993 4.99995 4.99996 4.99997 4.99998
- 4.99998 4.99999 4.99999 4.99999 4.99999 5 5 5 5 5.00001
- 5.00001 5.00001 5 5 5 5 5 5 4.99999 4.99999 4.99999 4.99999
- 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
- 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
- 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
- 4.99999 4.99997 5.00002 5.00004 5.0001 5.0001 4.99987 5.00009
- 5.00021 5.00002 5.00004 4.99988 5.00013 4.99993 5.00026
- 4.99973 5 5.00006 5.00009 5.00004 5.00004 5.04854 4.82711
- 4.04208 2.64155 0.838902 0.19014 0.0982549 0.0723197 0.0576863
- 0.0427644 0.0301979 0.020146 0.0135728 0.00980358 0.00774482
- 0.00586604 0.0036687 0.00211511 0.00121906 0.000647581 0.000828436
- 0.00190938 0.00224254 0.00199956 0.00165488 0.00135612 0.00113715
- 0.000984181 0.000877175 0.000789973 0.000741139 0.000689338
- 0.000625676 0.000586082 0.000550152 0.000529573 0.000505606
- 0.000482117 0.000460574 0.000441649 0.000424674 0.000408398
- 0.000391914 0.000376272 0.000361487 0.000348181 0.000336045
- 0.000324466 0.000313545 0.000303046 0.000293056 0.00028356
- 0.000274586 0.000266155 0.000258279 0.000250938 0.000243789
- 0.000236912 0.000230244 0.000224186 0.000219291 0.000215346
- 0.000212468 0.000207291 0.000200862 0.00019368 0.000186767
- 0.000183515 0.000180263 0.00017701 0.000173758 0.000170506
- 0.000167253 0.000164001 0.000161164 0.000158357 0.00015555
- 0.000152743 0.000149936 0.000147129 0.000144322 0.000142066
- 0.000140096 0.000138127 0.000136157 0.000134187 0.000132218
- 0.000130248 0.000128278 0.000126308 0.000124339 0.000122369
- 0.000120399 0.000118429 0.00011646 0.000114527 0.000112892
- 0.000111258 0.000109623 0.000107988 0.000103598 6.86052e-05
- 3.337e-05 7.00783e-05 0.000218764 0.000221318 0.000118593
- -0.000113962 5.78552e-05 9.42068e-05 0.000237037 0.000171302
- 0.0001033 6.16066e-05 5.52908e-05 6.30233e-05 7.01897e-05
- 8.48573e-05 0.000106859 8.37213e-05 -0.0391541 -0.047722
- -0.0618454 -0.0169804 0.345725 1.03426 1.74825 2.37152 2.88737
- 3.32173 3.66761 3.9707 4.17762 3.98832 3.30483 2.09737 0.710892
- 0.148159 0.0707463 0.0555808 0.045618 0.0319116 0.0199589
- 0.0133357 0.00898528 0.00586075 0.00375478 0.00245443 0.00156038
- 0.000962344 0.000590953 0.000375107 0.000250243 0.00015882
- 0.000100203 6.18122e-05 3.7372e-05 2.23009e-05 1.32569e-05
- 8.29437e-06 5.72457e-06 3.96832e-06 2.98935e-06 2.59699e-06
- 2.75024e-06 3.38689e-06 4.0453e-06 3.50095e-06 1.64988e-06
- -3.84371e-07 -2.03828e-06 -3.46401e-06 -1.24301e-06 4.63458e-06
- 1.14104e-05 1.02619e-05 2.15487e-06 -2.98487e-06 -3.67221e-06
- -2.94279e-06 -2.58649e-06 -2.23019e-06 -1.87389e-06 -1.5176e-06
- -1.1613e-06 -7.92127e-07 -4.18889e-07 -4.56502e-08 3.27588e-07
- 7.00827e-07 8.79539e-07 8.17025e-07 7.5451e-07 6.91996e-07
- 6.29481e-07 5.66966e-07 5.04452e-07 4.41937e-07 3.79422e-07
- 3.16908e-07 2.54393e-07 1.90078e-07 1.25366e-07 6.0654e-08
- -4.05776e-09 -6.87696e-08 -1.33481e-07 -1.98193e-07 -2.62905e-07
- -3.27617e-07 -3.92329e-07 -4.40392e-07 -4.18802e-07 -3.97213e-07
- -3.75624e-07 -3.54035e-07 -3.32446e-07 -3.10856e-07 -2.89267e-07
- -2.67678e-07
+ 1.8179e-09 -5.28841e-06 -1.44913e-05 -3.62932e-05 -9.75719e-05
+ 0.000141781 3.73396e-05 -1.65603e-05 -1.5271e-05 -6.73884e-06
+ 4.40157e-06 -4.85345e-06 -1.02964e-05 2.03126e-05 -1.89457e-05
+ -8.75564e-06 7.67422e-06 4.71103e-06 1.29798e-05 6.13469e-06
+ -1.14363e-05 -0.0394563 -0.0477298 -0.0622012 -0.0519225
+ 0.262499 0.943611 1.67052 2.31017 2.84028 3.28467 3.61582
+ 3.85887 4.13011 4.36511 4.54063 4.67013 4.76408 4.83263
+ 4.8825 4.91837 4.94373 4.96117 4.97318 4.98093 4.98562 4.98906
+ 4.99267 4.99539 4.99666 4.99731 4.99797 4.99844 4.99887
+ 4.99927 4.99933 4.99938 4.99944 4.99949 4.99955 4.9996 4.99965
+ 4.9997 4.99975 4.9998 4.99985 4.99986 4.99987 4.99989 4.9999
+ 4.99991 4.99992 4.99993 4.99995 4.99996 4.99997 4.99998
+ 4.99998 4.99999 4.99999 4.99999 4.99999 5 5 5 5 5.00001
+ 5.00001 5.00001 5 5 5 5 5 5 4.99999 4.99999 4.99999 4.99999
+ 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
+ 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
+ 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
+ 4.99999 4.99997 5.00002 5.00004 5.0001 5.0001 4.99987 5.00009
+ 5.00021 5.00002 5.00004 4.99988 5.00013 4.99993 5.00026
+ 4.99973 5 5.00006 5.00009 5.00004 5.00004 5.04854 4.82711
+ 4.04208 2.64155 0.838902 0.19014 0.0982549 0.0723197 0.0576863
+ 0.0427644 0.0301979 0.020146 0.0135728 0.00980358 0.00774482
+ 0.00586604 0.0036687 0.00211511 0.00121906 0.000647581 0.000828436
+ 0.00190938 0.00224254 0.00199956 0.00165488 0.00135612 0.00113715
+ 0.000984181 0.000877175 0.000789973 0.000741139 0.000689338
+ 0.000625676 0.000586082 0.000550152 0.000529573 0.000505606
+ 0.000482117 0.000460574 0.000441649 0.000424674 0.000408398
+ 0.000391914 0.000376272 0.000361487 0.000348181 0.000336045
+ 0.000324466 0.000313545 0.000303046 0.000293056 0.00028356
+ 0.000274586 0.000266155 0.000258279 0.000250938 0.000243789
+ 0.000236912 0.000230244 0.000224186 0.000219291 0.000215346
+ 0.000212468 0.000207291 0.000200862 0.00019368 0.000186767
+ 0.000183515 0.000180263 0.00017701 0.000173758 0.000170506
+ 0.000167253 0.000164001 0.000161164 0.000158357 0.00015555
+ 0.000152743 0.000149936 0.000147129 0.000144322 0.000142066
+ 0.000140096 0.000138127 0.000136157 0.000134187 0.000132218
+ 0.000130248 0.000128278 0.000126308 0.000124339 0.000122369
+ 0.000120399 0.000118429 0.00011646 0.000114527 0.000112892
+ 0.000111258 0.000109623 0.000107988 0.000103598 6.86052e-05
+ 3.337e-05 7.00783e-05 0.000218764 0.000221318 0.000118593
+ -0.000113962 5.78552e-05 9.42068e-05 0.000237037 0.000171302
+ 0.0001033 6.16066e-05 5.52908e-05 6.30233e-05 7.01897e-05
+ 8.48573e-05 0.000106859 8.37213e-05 -0.0391541 -0.047722
+ -0.0618454 -0.0169804 0.345725 1.03426 1.74825 2.37152 2.88737
+ 3.32173 3.66761 3.9707 4.17762 3.98832 3.30483 2.09737 0.710892
+ 0.148159 0.0707463 0.0555808 0.045618 0.0319116 0.0199589
+ 0.0133357 0.00898528 0.00586075 0.00375478 0.00245443 0.00156038
+ 0.000962344 0.000590953 0.000375107 0.000250243 0.00015882
+ 0.000100203 6.18122e-05 3.7372e-05 2.23009e-05 1.32569e-05
+ 8.29437e-06 5.72457e-06 3.96832e-06 2.98935e-06 2.59699e-06
+ 2.75024e-06 3.38689e-06 4.0453e-06 3.50095e-06 1.64988e-06
+ -3.84371e-07 -2.03828e-06 -3.46401e-06 -1.24301e-06 4.63458e-06
+ 1.14104e-05 1.02619e-05 2.15487e-06 -2.98487e-06 -3.67221e-06
+ -2.94279e-06 -2.58649e-06 -2.23019e-06 -1.87389e-06 -1.5176e-06
+ -1.1613e-06 -7.92127e-07 -4.18889e-07 -4.56502e-08 3.27588e-07
+ 7.00827e-07 8.79539e-07 8.17025e-07 7.5451e-07 6.91996e-07
+ 6.29481e-07 5.66966e-07 5.04452e-07 4.41937e-07 3.79422e-07
+ 3.16908e-07 2.54393e-07 1.90078e-07 1.25366e-07 6.0654e-08
+ -4.05776e-09 -6.87696e-08 -1.33481e-07 -1.98193e-07 -2.62905e-07
+ -3.27617e-07 -3.92329e-07 -4.40392e-07 -4.18802e-07 -3.97213e-07
+ -3.75624e-07 -3.54035e-07 -3.32446e-07 -3.10856e-07 -2.89267e-07
+ -2.67678e-07
EOD
@v[32].set(<<-'EOD')
- 1.10294 1.10297 1.10291 1.10277 1.10259 1.10294 1.10313
- 1.10306 1.10299 1.10296 1.10295 1.10295 1.10294 1.10294
- 1.10294 1.10294 1.10294 1.10294 1.10294 1.10296 1.10296
- 1.00547 0.998599 1.5201 2.49297 3.31258 3.73162 3.84757
- 3.92505 4.02965 4.16599 4.30294 4.41541 4.52886 4.64414
- 4.73865 4.81065 4.86391 4.90315 4.93188 4.95258 4.96726
- 4.97738 4.98436 4.98888 4.99162 4.99363 4.99573 4.99731
- 4.99804 4.99843 4.99881 4.99909 4.99934 4.99957 4.9996 4.99964
- 4.99967 4.9997 4.99973 4.99977 4.9998 4.99983 4.99986 4.99988
- 4.99991 4.99992 4.99992 4.99993 4.99994 4.99994 4.99995
- 4.99996 4.99996 4.99997 4.99997 4.99998 4.99998 4.99999
- 4.99999 4.99999 4.99999 5 5 5 5.00001 5.00001 5.00001 5.00001
- 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
- 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 4.99999 4.99999 4.99999
- 4.99999 4.99999 4.99999 4.99999 5.00028 4.99988 4.99968
- 5.00019 4.99987 5.00021 4.99973 4.99977 4.99996 4.99997
- 5.0002 4.99957 5.00026 4.99947 5.00074 5.00003 4.99987 4.99979
- 5.00008 4.99997 5.08794 5.05993 4.76875 3.99197 3.10174
- 2.5197 2.21771 2.04 1.92235 1.83874 1.77592 1.72665 1.686
- 1.65276 1.6286 1.61299 1.60039 1.58934 1.57954 1.57083 1.56306
- 1.55604 1.54963 1.54375 1.53832 1.53331 1.52865 1.52432
- 1.52026 1.51645 1.51287 1.50949 1.50629 1.50327 1.50039
- 1.49766 1.49505 1.49257 1.49019 1.48792 1.48574 1.48365
- 1.48164 1.47971 1.47784 1.47604 1.47431 1.47264 1.47102
- 1.46945 1.46794 1.46647 1.46505 1.46367 1.46233 1.46103
- 1.45976 1.45853 1.45733 1.45616 1.45502 1.45392 1.45284
- 1.45179 1.45076 1.44975 1.4488 1.44795 1.44711 1.44626 1.44541
- 1.44457 1.44372 1.44287 1.44212 1.44138 1.44063 1.43989
- 1.43914 1.4384 1.43766 1.43701 1.43641 1.43581 1.43522 1.43462
- 1.43402 1.43342 1.43282 1.43223 1.43163 1.43103 1.43043
- 1.42984 1.42924 1.42865 1.42808 1.42752 1.42695 1.42639
- 1.42584 1.42529 1.42472 1.42412 1.42365 1.42326 1.42304
- 1.42162 1.42082 1.42032 1.42029 1.42026 1.41995 1.41947
- 1.41894 1.41841 1.4179 1.41742 1.41699 1.41656 1.32097 1.30963
- 1.78765 2.64656 3.35764 3.747 3.86589 3.94217 4.04185 4.18453
- 4.3561 4.53439 4.68621 4.74905 4.77848 4.84629 4.91261 4.97541
- 5.01284 5.01548 5.01248 5.00924 5.00666 5.00475 5.00334
- 5.00234 5.00164 5.00118 5.00083 5.00058 5.0004 5.00028 5.00019
- 5.00013 5.00009 5.00007 5.00004 5.00003 5.00002 5.00001
- 5.00001 5.00001 5 5 4.99999 4.99995 4.99992 4.99996 5.00006
- 5.00012 5.00009 4.99997 4.9999 4.99985 4.99986 4.99997 5.00021
- 5.00031 5.00024 5.0001 5.00007 5.00005 5.00003 5.00001 4.99998
- 4.99998 4.99999 4.99999 4.99999 5 5 5 5 5 5.00001 5.00001
- 5.00001 5.00001 5.00001 5.00001 5.00002 5.00002 5.00001
- 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5 5 5 5
- 5 4.99999 4.99999 4.99999 4.99998 4.99998 4.99998
+ 1.10294 1.10297 1.10291 1.10277 1.10259 1.10294 1.10313
+ 1.10306 1.10299 1.10296 1.10295 1.10295 1.10294 1.10294
+ 1.10294 1.10294 1.10294 1.10294 1.10294 1.10296 1.10296
+ 1.00547 0.998599 1.5201 2.49297 3.31258 3.73162 3.84757
+ 3.92505 4.02965 4.16599 4.30294 4.41541 4.52886 4.64414
+ 4.73865 4.81065 4.86391 4.90315 4.93188 4.95258 4.96726
+ 4.97738 4.98436 4.98888 4.99162 4.99363 4.99573 4.99731
+ 4.99804 4.99843 4.99881 4.99909 4.99934 4.99957 4.9996 4.99964
+ 4.99967 4.9997 4.99973 4.99977 4.9998 4.99983 4.99986 4.99988
+ 4.99991 4.99992 4.99992 4.99993 4.99994 4.99994 4.99995
+ 4.99996 4.99996 4.99997 4.99997 4.99998 4.99998 4.99999
+ 4.99999 4.99999 4.99999 5 5 5 5.00001 5.00001 5.00001 5.00001
+ 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
+ 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 4.99999 4.99999 4.99999
+ 4.99999 4.99999 4.99999 4.99999 5.00028 4.99988 4.99968
+ 5.00019 4.99987 5.00021 4.99973 4.99977 4.99996 4.99997
+ 5.0002 4.99957 5.00026 4.99947 5.00074 5.00003 4.99987 4.99979
+ 5.00008 4.99997 5.08794 5.05993 4.76875 3.99197 3.10174
+ 2.5197 2.21771 2.04 1.92235 1.83874 1.77592 1.72665 1.686
+ 1.65276 1.6286 1.61299 1.60039 1.58934 1.57954 1.57083 1.56306
+ 1.55604 1.54963 1.54375 1.53832 1.53331 1.52865 1.52432
+ 1.52026 1.51645 1.51287 1.50949 1.50629 1.50327 1.50039
+ 1.49766 1.49505 1.49257 1.49019 1.48792 1.48574 1.48365
+ 1.48164 1.47971 1.47784 1.47604 1.47431 1.47264 1.47102
+ 1.46945 1.46794 1.46647 1.46505 1.46367 1.46233 1.46103
+ 1.45976 1.45853 1.45733 1.45616 1.45502 1.45392 1.45284
+ 1.45179 1.45076 1.44975 1.4488 1.44795 1.44711 1.44626 1.44541
+ 1.44457 1.44372 1.44287 1.44212 1.44138 1.44063 1.43989
+ 1.43914 1.4384 1.43766 1.43701 1.43641 1.43581 1.43522 1.43462
+ 1.43402 1.43342 1.43282 1.43223 1.43163 1.43103 1.43043
+ 1.42984 1.42924 1.42865 1.42808 1.42752 1.42695 1.42639
+ 1.42584 1.42529 1.42472 1.42412 1.42365 1.42326 1.42304
+ 1.42162 1.42082 1.42032 1.42029 1.42026 1.41995 1.41947
+ 1.41894 1.41841 1.4179 1.41742 1.41699 1.41656 1.32097 1.30963
+ 1.78765 2.64656 3.35764 3.747 3.86589 3.94217 4.04185 4.18453
+ 4.3561 4.53439 4.68621 4.74905 4.77848 4.84629 4.91261 4.97541
+ 5.01284 5.01548 5.01248 5.00924 5.00666 5.00475 5.00334
+ 5.00234 5.00164 5.00118 5.00083 5.00058 5.0004 5.00028 5.00019
+ 5.00013 5.00009 5.00007 5.00004 5.00003 5.00002 5.00001
+ 5.00001 5.00001 5 5 4.99999 4.99995 4.99992 4.99996 5.00006
+ 5.00012 5.00009 4.99997 4.9999 4.99985 4.99986 4.99997 5.00021
+ 5.00031 5.00024 5.0001 5.00007 5.00005 5.00003 5.00001 4.99998
+ 4.99998 4.99999 4.99999 4.99999 5 5 5 5 5 5.00001 5.00001
+ 5.00001 5.00001 5.00001 5.00001 5.00002 5.00002 5.00001
+ 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5 5 5 5
+ 5 4.99999 4.99999 4.99999 4.99998 4.99998 4.99998
EOD
@v[33].set(<<-'EOD')
- 5 5.00012 5.00023 5.0003 4.99972 4.99988 4.99984 4.99991
- 4.99996 4.99999 5.00008 5.00009 4.99986 5.00003 5.00007
- 4.99995 4.9999 4.99997 5.00013 5.00014 5.00013 4.99701 4.99763
- 4.99742 4.99998 5.02836 5.07262 4.96856 4.57267 3.85637
- 2.79544 1.45942 0.408016 0.084885 0.0271375 0.0119294 0.00707546
- 0.0051087 0.00373035 0.00264737 0.00186477 0.00130379 0.000915857
- 0.000653121 0.000483893 0.000380852 0.000302362 0.000219498
- 0.000154435 0.000121928 0.000104026 8.61242e-05 7.48526e-05
- 6.49216e-05 5.56238e-05 5.29689e-05 5.03139e-05 4.7659e-05
- 4.5004e-05 4.23491e-05 4.00356e-05 3.79522e-05 3.58687e-05
- 3.37852e-05 3.17018e-05 2.97592e-05 2.89804e-05 2.82016e-05
- 2.74228e-05 2.66441e-05 2.58653e-05 2.50865e-05 2.43077e-05
- 2.35289e-05 2.27501e-05 2.19714e-05 2.12346e-05 2.07821e-05
- 2.03295e-05 1.98769e-05 1.94244e-05 1.89718e-05 1.85192e-05
- 1.80667e-05 1.76141e-05 1.71615e-05 1.6709e-05 1.62828e-05
- 1.60061e-05 1.57294e-05 1.54527e-05 1.5176e-05 1.48993e-05
- 1.46226e-05 1.43459e-05 1.40692e-05 1.37925e-05 1.35158e-05
- 1.3262e-05 1.31191e-05 1.29761e-05 1.28332e-05 1.26903e-05
- 1.25474e-05 1.24045e-05 1.22615e-05 1.21186e-05 1.19757e-05
- 1.18328e-05 1.16898e-05 1.15469e-05 1.1404e-05 1.12611e-05
- 1.11182e-05 1.09752e-05 1.08323e-05 1.06894e-05 1.05465e-05
- 1.04036e-05 1.02606e-05 1.00185e-05 3.8343e-05 -3.06781e-05
- -0.000111758 0.000111673 0.000130815 -0.000210491 -0.000231304
- 0.000310226 0.000265303 3.0878e-05 -4.48405e-05 -1.2852e-05
- -7.84469e-06 3.29986e-05 -1.23286e-05 -6.07871e-05 5.35082e-05
- 7.69194e-05 0.000126221 6.57178e-05 0.00223349 -0.0148854
- -0.0476636 -0.0491447 0.220125 1.11174 2.03988 2.90209 3.61069
- 4.13554 4.50679 4.71501 4.83916 4.91027 4.95284 4.98086
- 4.99151 4.98651 4.97113 4.95075 4.93102 4.93683 4.95457
- 4.97071 4.98212 4.98948 4.99386 4.99636 4.99785 4.9987 4.99927
- 4.99989 5.00014 5.00007 4.99988 4.99982 4.99976 4.99973
- 4.99972 4.99972 4.99973 4.99974 4.99975 4.99977 4.99979
- 4.99981 4.99984 4.99986 4.99988 4.99989 4.99991 4.99992
- 4.99993 4.99994 4.99995 4.99996 4.99996 4.99997 4.99997
- 4.99998 4.99998 4.99998 4.99998 4.99999 4.99999 4.99999
- 4.99999 5 5 5 5.00001 5.00001 5.00001 5.00002 5.00001 5.00001
- 5.00001 5.00001 5.00001 5 5 5 5 5 5 5 5 4.99999 4.99999
- 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
- 4.99999 4.99999 4.99999 5 5.00012 4.99946 4.99839 4.99733
- 4.99948 5.00114 5.00158 5.00147 5.00113 5.00073 5.00043
- 5.0002 5.00006 4.99995 4.99986 4.99973 4.99976 4.9999 5.00029
- 5.00055 4.99704 4.99734 4.9972 5.00278 5.03354 5.07184 4.94057
- 4.51936 3.75638 2.60982 1.23803 0.315016 0.0796102 0.0252894
- 0.0165723 0.0827785 0.491298 1.40686 2.33436 3.1251 3.7691
- 4.22201 4.49976 4.68115 4.80513 4.88509 4.93208 4.95861
- 4.97579 4.98655 4.99268 4.99571 4.99771 4.99881 4.99929
- 4.99954 4.99965 4.9997 4.99971 4.99971 4.99971 4.99971 4.99972
- 4.99974 4.99976 4.99978 4.99981 4.99984 4.99987 4.99989
- 4.99991 4.99991 4.99992 4.99992 4.99993 4.99997 5.00003
- 5.00006 5.00004 5.00001 5 4.99999 4.99998 4.99998 4.99997
- 4.99997 4.99997 4.99998 4.99998 4.99998 4.99999 4.99999
- 4.99999 4.99999 5 5 5 5 5.00001 5.00001 5.00001 5.00001
- 5.00001 5.00001 5.00001 5.00001 5.00001 5 5 5 5 5 5 5 4.99999
- 4.99999 4.99999 4.99999 4.99998 4.99998
+ 5 5.00012 5.00023 5.0003 4.99972 4.99988 4.99984 4.99991
+ 4.99996 4.99999 5.00008 5.00009 4.99986 5.00003 5.00007
+ 4.99995 4.9999 4.99997 5.00013 5.00014 5.00013 4.99701 4.99763
+ 4.99742 4.99998 5.02836 5.07262 4.96856 4.57267 3.85637
+ 2.79544 1.45942 0.408016 0.084885 0.0271375 0.0119294 0.00707546
+ 0.0051087 0.00373035 0.00264737 0.00186477 0.00130379 0.000915857
+ 0.000653121 0.000483893 0.000380852 0.000302362 0.000219498
+ 0.000154435 0.000121928 0.000104026 8.61242e-05 7.48526e-05
+ 6.49216e-05 5.56238e-05 5.29689e-05 5.03139e-05 4.7659e-05
+ 4.5004e-05 4.23491e-05 4.00356e-05 3.79522e-05 3.58687e-05
+ 3.37852e-05 3.17018e-05 2.97592e-05 2.89804e-05 2.82016e-05
+ 2.74228e-05 2.66441e-05 2.58653e-05 2.50865e-05 2.43077e-05
+ 2.35289e-05 2.27501e-05 2.19714e-05 2.12346e-05 2.07821e-05
+ 2.03295e-05 1.98769e-05 1.94244e-05 1.89718e-05 1.85192e-05
+ 1.80667e-05 1.76141e-05 1.71615e-05 1.6709e-05 1.62828e-05
+ 1.60061e-05 1.57294e-05 1.54527e-05 1.5176e-05 1.48993e-05
+ 1.46226e-05 1.43459e-05 1.40692e-05 1.37925e-05 1.35158e-05
+ 1.3262e-05 1.31191e-05 1.29761e-05 1.28332e-05 1.26903e-05
+ 1.25474e-05 1.24045e-05 1.22615e-05 1.21186e-05 1.19757e-05
+ 1.18328e-05 1.16898e-05 1.15469e-05 1.1404e-05 1.12611e-05
+ 1.11182e-05 1.09752e-05 1.08323e-05 1.06894e-05 1.05465e-05
+ 1.04036e-05 1.02606e-05 1.00185e-05 3.8343e-05 -3.06781e-05
+ -0.000111758 0.000111673 0.000130815 -0.000210491 -0.000231304
+ 0.000310226 0.000265303 3.0878e-05 -4.48405e-05 -1.2852e-05
+ -7.84469e-06 3.29986e-05 -1.23286e-05 -6.07871e-05 5.35082e-05
+ 7.69194e-05 0.000126221 6.57178e-05 0.00223349 -0.0148854
+ -0.0476636 -0.0491447 0.220125 1.11174 2.03988 2.90209 3.61069
+ 4.13554 4.50679 4.71501 4.83916 4.91027 4.95284 4.98086
+ 4.99151 4.98651 4.97113 4.95075 4.93102 4.93683 4.95457
+ 4.97071 4.98212 4.98948 4.99386 4.99636 4.99785 4.9987 4.99927
+ 4.99989 5.00014 5.00007 4.99988 4.99982 4.99976 4.99973
+ 4.99972 4.99972 4.99973 4.99974 4.99975 4.99977 4.99979
+ 4.99981 4.99984 4.99986 4.99988 4.99989 4.99991 4.99992
+ 4.99993 4.99994 4.99995 4.99996 4.99996 4.99997 4.99997
+ 4.99998 4.99998 4.99998 4.99998 4.99999 4.99999 4.99999
+ 4.99999 5 5 5 5.00001 5.00001 5.00001 5.00002 5.00001 5.00001
+ 5.00001 5.00001 5.00001 5 5 5 5 5 5 5 5 4.99999 4.99999
+ 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
+ 4.99999 4.99999 4.99999 5 5.00012 4.99946 4.99839 4.99733
+ 4.99948 5.00114 5.00158 5.00147 5.00113 5.00073 5.00043
+ 5.0002 5.00006 4.99995 4.99986 4.99973 4.99976 4.9999 5.00029
+ 5.00055 4.99704 4.99734 4.9972 5.00278 5.03354 5.07184 4.94057
+ 4.51936 3.75638 2.60982 1.23803 0.315016 0.0796102 0.0252894
+ 0.0165723 0.0827785 0.491298 1.40686 2.33436 3.1251 3.7691
+ 4.22201 4.49976 4.68115 4.80513 4.88509 4.93208 4.95861
+ 4.97579 4.98655 4.99268 4.99571 4.99771 4.99881 4.99929
+ 4.99954 4.99965 4.9997 4.99971 4.99971 4.99971 4.99971 4.99972
+ 4.99974 4.99976 4.99978 4.99981 4.99984 4.99987 4.99989
+ 4.99991 4.99991 4.99992 4.99992 4.99993 4.99997 5.00003
+ 5.00006 5.00004 5.00001 5 4.99999 4.99998 4.99998 4.99997
+ 4.99997 4.99997 4.99998 4.99998 4.99998 4.99999 4.99999
+ 4.99999 4.99999 5 5 5 5 5.00001 5.00001 5.00001 5.00001
+ 5.00001 5.00001 5.00001 5.00001 5.00001 5 5 5 5 5 5 5 4.99999
+ 4.99999 4.99999 4.99999 4.99998 4.99998
EOD
@v[34].set(<<-'EOD')
- 5 5.00207 5.00813 5.01486 5.00156 5.0018 4.99861 4.99844
- 4.99888 4.9993 4.99956 4.99971 4.99979 4.99983 4.99987 4.99989
- 4.99671 4.9974 4.99864 5.00131 5.00377 5.0021 5.00039 4.99993
- 5.00004 5.0009 5.00109 4.99636 4.98617 4.96778 4.92047 4.89528
- 4.91112 4.9559 4.98286 4.99369 4.99812 4.99951 4.99994 5.00014
- 5.00008 4.99994 4.99984 4.99989 4.99998 5.00004 5.00004
- 5.00006 5.00005 5.00001 4.99997 4.99992 4.99993 4.99994
- 4.99996 4.99996 4.99996 4.99996 4.99996 4.99996 4.99996
- 4.99996 4.99996 4.99996 4.99996 4.99996 4.99996 4.99996
- 4.99997 4.99997 4.99997 4.99997 4.99997 4.99997 4.99997
- 4.99997 4.99997 4.99997 4.99997 4.99997 4.99997 4.99997
- 4.99997 4.99997 4.99997 4.99997 4.99997 4.99997 4.99997
- 4.99998 4.99998 4.99998 4.99998 4.99998 4.99998 4.99998
- 4.99998 4.99998 4.99998 4.99998 4.99998 4.99998 4.99998
- 4.99998 4.99998 4.99998 4.99998 4.99998 4.99998 4.99998
- 4.99998 4.99998 4.99998 4.99998 4.99998 4.99998 4.99998
- 4.99998 4.99998 4.99998 4.99998 5.00131 5.00072 4.9977 4.99811
- 5.00325 4.99647 4.98948 4.99459 5.00262 5.00276 5.00156
- 5.00072 5.0003 5.00013 4.99995 4.99668 4.99775 4.99917 5.00173
- 5.00386 5.00188 4.99888 4.99757 4.99951 5.01712 5.0557 5.07088
- 5.07704 5.07758 5.06958 5.04223 5.03331 5.0279 5.03408 5.07611
- 5.01911 4.68594 3.99152 2.92195 1.69878 0.809 0.344091 0.154663
- 0.0788717 0.0467212 0.0336168 0.0280514 0.0254947 0.024173
- 0.0223567 0.0220555 0.0271514 0.0295872 0.0296052 0.0283971
- 0.0264726 0.0241813 0.0218244 0.0195349 0.017368 0.0152495
- 0.013295 0.0115444 0.00996982 0.00857091 0.00733891 0.00627261
- 0.0053494 0.00456316 0.00388373 0.00331073 0.00282181 0.00240991
- 0.00206389 0.00177187 0.00152283 0.00131167 0.00112558 0.000954373
- 0.000805726 0.00069326 0.000600991 0.000525743 0.00047355
- 0.00044359 0.000434815 0.000436053 0.000402511 0.000368969
- 0.000335427 0.000301886 0.000268344 0.000234802 0.00020126
- 0.000184967 0.000169932 0.000154896 0.000139861 0.000124825
- 0.00010979 9.47546e-05 8.67896e-05 8.24901e-05 7.81906e-05
- 7.38911e-05 6.95915e-05 6.5292e-05 6.09925e-05 5.66929e-05
- 5.23934e-05 4.80939e-05 4.37943e-05 3.94948e-05 3.51953e-05
- 3.08957e-05 2.67968e-05 2.42936e-05 2.17904e-05 1.92872e-05
- 1.6784e-05 0.00125927 -0.00794344 -0.0305499 -0.0621697
- -0.0463796 -0.0224608 -0.00538381 0.00546086 0.0108675 0.012883
- 0.0131787 0.0127271 0.0119702 0.0110398 0.0100635 0.00649617
- 0.00489388 0.00545863 0.0098351 0.0167428 0.0126563 0.00697542
- 0.00427027 0.00330002 0.00390774 0.00408999 -0.00259143
- -0.0160578 -0.0451849 -0.0409651 0.1301 0.597429 1.3848
- 2.63426 3.81272 4.51373 4.8412 4.98731 4.88165 4.37165 3.40034
- 2.17681 1.12217 0.505129 0.219703 0.104992 0.0622333 0.0448317
- 0.0355782 0.0311867 0.0293529 0.0274615 0.0288739 0.0307845
- 0.0304909 0.029245 0.0273602 0.0251006 0.022697 0.0202765
- 0.0179357 0.0157106 0.0136562 0.0117951 0.0101273 0.00865784
- 0.00739394 0.00634364 0.00551356 0.00480538 0.00415747 0.00356084
- 0.00297585 0.00236711 0.00181853 0.00160713 0.00169822 0.00166542
- 0.00145504 0.00120252 0.00109259 0.000982658 0.00087273
- 0.000762802 0.000652874 0.000584068 0.000528263 0.000472458
- 0.000416653 0.000360848 0.000321155 0.000301442 0.000281729
- 0.000262016 0.000242303 0.00022259 0.000202877 0.000183164
- 0.000163451 0.000143738 0.000124025 0.000114582 0.000107399
- 0.000100216 9.30332e-05 8.58502e-05 7.86672e-05 7.14841e-05
- 6.43011e-05 5.7118e-05 4.9935e-05 4.35378e-05 4.04281e-05
- 3.73184e-05 3.42088e-05 3.10991e-05 2.79894e-05 2.48798e-05
- 2.17701e-05 1.86604e-05
+ 5 5.00207 5.00813 5.01486 5.00156 5.0018 4.99861 4.99844
+ 4.99888 4.9993 4.99956 4.99971 4.99979 4.99983 4.99987 4.99989
+ 4.99671 4.9974 4.99864 5.00131 5.00377 5.0021 5.00039 4.99993
+ 5.00004 5.0009 5.00109 4.99636 4.98617 4.96778 4.92047 4.89528
+ 4.91112 4.9559 4.98286 4.99369 4.99812 4.99951 4.99994 5.00014
+ 5.00008 4.99994 4.99984 4.99989 4.99998 5.00004 5.00004
+ 5.00006 5.00005 5.00001 4.99997 4.99992 4.99993 4.99994
+ 4.99996 4.99996 4.99996 4.99996 4.99996 4.99996 4.99996
+ 4.99996 4.99996 4.99996 4.99996 4.99996 4.99996 4.99996
+ 4.99997 4.99997 4.99997 4.99997 4.99997 4.99997 4.99997
+ 4.99997 4.99997 4.99997 4.99997 4.99997 4.99997 4.99997
+ 4.99997 4.99997 4.99997 4.99997 4.99997 4.99997 4.99997
+ 4.99998 4.99998 4.99998 4.99998 4.99998 4.99998 4.99998
+ 4.99998 4.99998 4.99998 4.99998 4.99998 4.99998 4.99998
+ 4.99998 4.99998 4.99998 4.99998 4.99998 4.99998 4.99998
+ 4.99998 4.99998 4.99998 4.99998 4.99998 4.99998 4.99998
+ 4.99998 4.99998 4.99998 4.99998 5.00131 5.00072 4.9977 4.99811
+ 5.00325 4.99647 4.98948 4.99459 5.00262 5.00276 5.00156
+ 5.00072 5.0003 5.00013 4.99995 4.99668 4.99775 4.99917 5.00173
+ 5.00386 5.00188 4.99888 4.99757 4.99951 5.01712 5.0557 5.07088
+ 5.07704 5.07758 5.06958 5.04223 5.03331 5.0279 5.03408 5.07611
+ 5.01911 4.68594 3.99152 2.92195 1.69878 0.809 0.344091 0.154663
+ 0.0788717 0.0467212 0.0336168 0.0280514 0.0254947 0.024173
+ 0.0223567 0.0220555 0.0271514 0.0295872 0.0296052 0.0283971
+ 0.0264726 0.0241813 0.0218244 0.0195349 0.017368 0.0152495
+ 0.013295 0.0115444 0.00996982 0.00857091 0.00733891 0.00627261
+ 0.0053494 0.00456316 0.00388373 0.00331073 0.00282181 0.00240991
+ 0.00206389 0.00177187 0.00152283 0.00131167 0.00112558 0.000954373
+ 0.000805726 0.00069326 0.000600991 0.000525743 0.00047355
+ 0.00044359 0.000434815 0.000436053 0.000402511 0.000368969
+ 0.000335427 0.000301886 0.000268344 0.000234802 0.00020126
+ 0.000184967 0.000169932 0.000154896 0.000139861 0.000124825
+ 0.00010979 9.47546e-05 8.67896e-05 8.24901e-05 7.81906e-05
+ 7.38911e-05 6.95915e-05 6.5292e-05 6.09925e-05 5.66929e-05
+ 5.23934e-05 4.80939e-05 4.37943e-05 3.94948e-05 3.51953e-05
+ 3.08957e-05 2.67968e-05 2.42936e-05 2.17904e-05 1.92872e-05
+ 1.6784e-05 0.00125927 -0.00794344 -0.0305499 -0.0621697
+ -0.0463796 -0.0224608 -0.00538381 0.00546086 0.0108675 0.012883
+ 0.0131787 0.0127271 0.0119702 0.0110398 0.0100635 0.00649617
+ 0.00489388 0.00545863 0.0098351 0.0167428 0.0126563 0.00697542
+ 0.00427027 0.00330002 0.00390774 0.00408999 -0.00259143
+ -0.0160578 -0.0451849 -0.0409651 0.1301 0.597429 1.3848
+ 2.63426 3.81272 4.51373 4.8412 4.98731 4.88165 4.37165 3.40034
+ 2.17681 1.12217 0.505129 0.219703 0.104992 0.0622333 0.0448317
+ 0.0355782 0.0311867 0.0293529 0.0274615 0.0288739 0.0307845
+ 0.0304909 0.029245 0.0273602 0.0251006 0.022697 0.0202765
+ 0.0179357 0.0157106 0.0136562 0.0117951 0.0101273 0.00865784
+ 0.00739394 0.00634364 0.00551356 0.00480538 0.00415747 0.00356084
+ 0.00297585 0.00236711 0.00181853 0.00160713 0.00169822 0.00166542
+ 0.00145504 0.00120252 0.00109259 0.000982658 0.00087273
+ 0.000762802 0.000652874 0.000584068 0.000528263 0.000472458
+ 0.000416653 0.000360848 0.000321155 0.000301442 0.000281729
+ 0.000262016 0.000242303 0.00022259 0.000202877 0.000183164
+ 0.000163451 0.000143738 0.000124025 0.000114582 0.000107399
+ 0.000100216 9.30332e-05 8.58502e-05 7.86672e-05 7.14841e-05
+ 6.43011e-05 5.7118e-05 4.9935e-05 4.35378e-05 4.04281e-05
+ 3.73184e-05 3.42088e-05 3.10991e-05 2.79894e-05 2.48798e-05
+ 2.17701e-05 1.86604e-05
EOD
@v[35].set(<<-'EOD')
- 7.24585e-12 2.21843e-05 3.20014e-05 1.25076e-05 -2.44947e-05
- 1.8425e-05 5.50546e-06 3.53025e-05 -1.07551e-05 -3.94383e-06
- -2.27848e-06 -9.04789e-05 7.44215e-05 -2.7662e-05 0.000200038
- -2.11998e-05 -2.09011e-05 2.37098e-05 2.18751e-05 -2.28422e-05
- -6.23659e-05 3.58241e-05 1.76386e-05 -4.28311e-05 0.000355626
- 0.00156903 0.00100999 -0.0085304 -0.02067 -0.0389485 -0.0651568
- -0.128475 -0.314362 -0.406837 -0.421558 -0.421277 -0.418176
- -0.414481 -0.410845 -0.407348 -0.403971 -0.400716 -0.397582
- -0.394563 -0.391658 -0.388866 -0.386178 -0.383585 -0.381094
- -0.378789 -0.376569 -0.37435 -0.372256 -0.370188 -0.36815
- -0.366422 -0.364694 -0.362967 -0.361239 -0.359511 -0.357888
- -0.356334 -0.354781 -0.353227 -0.351674 -0.350152 -0.348888
- -0.347625 -0.346361 -0.345098 -0.343834 -0.342571 -0.341307
- -0.340044 -0.33878 -0.337517 -0.336279 -0.335215 -0.334152
- -0.333088 -0.332024 -0.330961 -0.329897 -0.328833 -0.32777
- -0.326706 -0.325642 -0.324601 -0.323683 -0.322766 -0.321849
- -0.320932 -0.320014 -0.319097 -0.31818 -0.317263 -0.316345
- -0.315428 -0.314545 -0.313825 -0.313106 -0.312387 -0.311667
- -0.310948 -0.310228 -0.309509 -0.308789 -0.30807 -0.307351
- -0.306631 -0.305912 -0.305192 -0.304473 -0.303754 -0.303034
- -0.302315 -0.301595 -0.300876 -0.300157 -0.299437 -0.298716
- -0.29798 -0.297329 -0.296691 -0.295837 -0.29516 -0.294725
- -0.294044 -0.292917 -0.292351 -0.291965 -0.291365 -0.290687
- -0.290027 -0.289376 -0.288772 -0.288193 -0.287505 -0.286892
- -0.28626 -0.285714 -0.284545 -0.289246 -0.298717 -0.298492
- -0.214163 0.181451 0.0749974 0.0454707 0.0292987 0.0196837
- 0.0124119 0.00884715 0.00527181 0.00585821 0.0296361 0.169856
- 0.361207 0.538856 0.67469 0.685933 0.392802 0.17772 0.0813085
- 0.0424601 0.0246654 0.0175258 0.0144256 0.0129859 0.012205
- 0.0112846 0.010933 0.0134813 0.0147254 0.0147981 0.0142156
- 0.0132732 0.0121355 0.0109587 0.00981238 0.00872731 0.00767007
- 0.00669346 0.00581341 0.00502167 0.00431819 0.00369842 0.00316168
- 0.00269663 0.00230035 0.00195801 0.00166928 0.00142286 0.00121522
- 0.00104072 0.000893384 0.000767675 0.000661268 0.000567659
- 0.000481766 0.000407101 0.000350044 0.000302721 0.000263424
- 0.000236813 0.00022199 0.000218182 0.000219548 0.0002027
- 0.000185853 0.000169006 0.000152158 0.000135311 0.000118463
- 0.000101616 9.33782e-05 8.57685e-05 7.81588e-05 7.0549e-05
- 6.29393e-05 5.53296e-05 4.77199e-05 4.36954e-05 4.15296e-05
- 3.93637e-05 3.71978e-05 3.50319e-05 3.28661e-05 3.07002e-05
- 2.85343e-05 2.63685e-05 2.42026e-05 2.20367e-05 1.98709e-05
- 1.7705e-05 1.55391e-05 1.34772e-05 1.22416e-05 1.10061e-05
- 9.77055e-06 8.535e-06 0.000631271 -0.00362586 -0.0146235
- -0.0308486 -0.0237466 -0.0117522 -0.00304171 0.00251033
- 0.00531986 0.0063897 0.00657351 0.00636494 0.00599705 0.00553442
- 0.00505994 0.00330925 0.00246671 0.0027006 0.00473161 0.00830333
- 0.00649147 0.00356815 0.00217448 0.00187579 0.00270447 0.00219543
- -0.00546118 -0.0179576 -0.0445306 -0.0649309 0.0197935 0.473629
- 0.87268 0.269542 0.0086094 0.0844602 0.606456 1.04929 0.906014
- 0.916205 0.919425 0.872867 0.556244 0.262457 0.11838 0.0571226
- 0.0333451 0.0237133 0.0185096 0.0159617 0.0148663 0.0138683
- 0.0144081 0.0153797 0.0152551 0.0146487 0.0137192 0.0125973
- 0.0113996 0.0101903 0.00901851 0.00790495 0.00687502 0.00593994
- 0.00510092 0.00436111 0.00372439 0.0031945 0.00277537 0.00241888
- 0.002095 0.00179943 0.00150419 0.00119264 0.00090934 0.000802394
- 0.000852816 0.000838368 0.000730842 0.000601028 0.000546616
- 0.000492205 0.000437793 0.000383381 0.000328969 0.00029454
- 0.000266428 0.000238317 0.000210205 0.000182093 0.000162091
- 0.000152145 0.000142198 0.000132252 0.000122306 0.000112359
- 0.000102413 9.24665e-05 8.25201e-05 7.25738e-05 6.26274e-05
- 5.78553e-05 5.42216e-05 5.05878e-05 4.69541e-05 4.33204e-05
- 3.96867e-05 3.60529e-05 3.24192e-05 2.87855e-05 2.51518e-05
- 2.19153e-05 2.03406e-05 1.8766e-05 1.71913e-05 1.56167e-05
- 1.4042e-05 1.24674e-05 1.08927e-05 9.31806e-06
+ 7.24585e-12 2.21843e-05 3.20014e-05 1.25076e-05 -2.44947e-05
+ 1.8425e-05 5.50546e-06 3.53025e-05 -1.07551e-05 -3.94383e-06
+ -2.27848e-06 -9.04789e-05 7.44215e-05 -2.7662e-05 0.000200038
+ -2.11998e-05 -2.09011e-05 2.37098e-05 2.18751e-05 -2.28422e-05
+ -6.23659e-05 3.58241e-05 1.76386e-05 -4.28311e-05 0.000355626
+ 0.00156903 0.00100999 -0.0085304 -0.02067 -0.0389485 -0.0651568
+ -0.128475 -0.314362 -0.406837 -0.421558 -0.421277 -0.418176
+ -0.414481 -0.410845 -0.407348 -0.403971 -0.400716 -0.397582
+ -0.394563 -0.391658 -0.388866 -0.386178 -0.383585 -0.381094
+ -0.378789 -0.376569 -0.37435 -0.372256 -0.370188 -0.36815
+ -0.366422 -0.364694 -0.362967 -0.361239 -0.359511 -0.357888
+ -0.356334 -0.354781 -0.353227 -0.351674 -0.350152 -0.348888
+ -0.347625 -0.346361 -0.345098 -0.343834 -0.342571 -0.341307
+ -0.340044 -0.33878 -0.337517 -0.336279 -0.335215 -0.334152
+ -0.333088 -0.332024 -0.330961 -0.329897 -0.328833 -0.32777
+ -0.326706 -0.325642 -0.324601 -0.323683 -0.322766 -0.321849
+ -0.320932 -0.320014 -0.319097 -0.31818 -0.317263 -0.316345
+ -0.315428 -0.314545 -0.313825 -0.313106 -0.312387 -0.311667
+ -0.310948 -0.310228 -0.309509 -0.308789 -0.30807 -0.307351
+ -0.306631 -0.305912 -0.305192 -0.304473 -0.303754 -0.303034
+ -0.302315 -0.301595 -0.300876 -0.300157 -0.299437 -0.298716
+ -0.29798 -0.297329 -0.296691 -0.295837 -0.29516 -0.294725
+ -0.294044 -0.292917 -0.292351 -0.291965 -0.291365 -0.290687
+ -0.290027 -0.289376 -0.288772 -0.288193 -0.287505 -0.286892
+ -0.28626 -0.285714 -0.284545 -0.289246 -0.298717 -0.298492
+ -0.214163 0.181451 0.0749974 0.0454707 0.0292987 0.0196837
+ 0.0124119 0.00884715 0.00527181 0.00585821 0.0296361 0.169856
+ 0.361207 0.538856 0.67469 0.685933 0.392802 0.17772 0.0813085
+ 0.0424601 0.0246654 0.0175258 0.0144256 0.0129859 0.012205
+ 0.0112846 0.010933 0.0134813 0.0147254 0.0147981 0.0142156
+ 0.0132732 0.0121355 0.0109587 0.00981238 0.00872731 0.00767007
+ 0.00669346 0.00581341 0.00502167 0.00431819 0.00369842 0.00316168
+ 0.00269663 0.00230035 0.00195801 0.00166928 0.00142286 0.00121522
+ 0.00104072 0.000893384 0.000767675 0.000661268 0.000567659
+ 0.000481766 0.000407101 0.000350044 0.000302721 0.000263424
+ 0.000236813 0.00022199 0.000218182 0.000219548 0.0002027
+ 0.000185853 0.000169006 0.000152158 0.000135311 0.000118463
+ 0.000101616 9.33782e-05 8.57685e-05 7.81588e-05 7.0549e-05
+ 6.29393e-05 5.53296e-05 4.77199e-05 4.36954e-05 4.15296e-05
+ 3.93637e-05 3.71978e-05 3.50319e-05 3.28661e-05 3.07002e-05
+ 2.85343e-05 2.63685e-05 2.42026e-05 2.20367e-05 1.98709e-05
+ 1.7705e-05 1.55391e-05 1.34772e-05 1.22416e-05 1.10061e-05
+ 9.77055e-06 8.535e-06 0.000631271 -0.00362586 -0.0146235
+ -0.0308486 -0.0237466 -0.0117522 -0.00304171 0.00251033
+ 0.00531986 0.0063897 0.00657351 0.00636494 0.00599705 0.00553442
+ 0.00505994 0.00330925 0.00246671 0.0027006 0.00473161 0.00830333
+ 0.00649147 0.00356815 0.00217448 0.00187579 0.00270447 0.00219543
+ -0.00546118 -0.0179576 -0.0445306 -0.0649309 0.0197935 0.473629
+ 0.87268 0.269542 0.0086094 0.0844602 0.606456 1.04929 0.906014
+ 0.916205 0.919425 0.872867 0.556244 0.262457 0.11838 0.0571226
+ 0.0333451 0.0237133 0.0185096 0.0159617 0.0148663 0.0138683
+ 0.0144081 0.0153797 0.0152551 0.0146487 0.0137192 0.0125973
+ 0.0113996 0.0101903 0.00901851 0.00790495 0.00687502 0.00593994
+ 0.00510092 0.00436111 0.00372439 0.0031945 0.00277537 0.00241888
+ 0.002095 0.00179943 0.00150419 0.00119264 0.00090934 0.000802394
+ 0.000852816 0.000838368 0.000730842 0.000601028 0.000546616
+ 0.000492205 0.000437793 0.000383381 0.000328969 0.00029454
+ 0.000266428 0.000238317 0.000210205 0.000182093 0.000162091
+ 0.000152145 0.000142198 0.000132252 0.000122306 0.000112359
+ 0.000102413 9.24665e-05 8.25201e-05 7.25738e-05 6.26274e-05
+ 5.78553e-05 5.42216e-05 5.05878e-05 4.69541e-05 4.33204e-05
+ 3.96867e-05 3.60529e-05 3.24192e-05 2.87855e-05 2.51518e-05
+ 2.19153e-05 2.03406e-05 1.8766e-05 1.71913e-05 1.56167e-05
+ 1.4042e-05 1.24674e-05 1.08927e-05 9.31806e-06
EOD
@v[36].set(<<-'EOD')
- 5 5.01426 5.02852 5.01923 4.77685 4.56471 4.52338 4.56813
- 4.63122 4.693 4.74776 4.79385 4.83258 4.86358 4.88918 4.91021
- 4.90553 4.89733 4.89554 4.91953 5.00757 5.07101 5.06318
- 5.05241 5.05535 5.08042 5.07251 4.90973 4.56136 3.98637
- 3.237 2.67216 2.33678 2.13529 2.00544 1.91429 1.84638 1.79461
- 1.75338 1.71958 1.69175 1.6686 1.64918 1.63258 1.61836 1.60607
- 1.59506 1.58483 1.57575 1.56847 1.56193 1.55538 1.54968
- 1.54416 1.5388 1.53523 1.53165 1.52807 1.52449 1.52091 1.51771
- 1.51477 1.51182 1.50888 1.50593 1.50309 1.50113 1.49917
- 1.4972 1.49524 1.49328 1.49132 1.48935 1.48739 1.48543 1.48346
- 1.48157 1.48012 1.47868 1.47724 1.47579 1.47435 1.47291
- 1.47146 1.47002 1.46857 1.46713 1.46574 1.46462 1.4635 1.46238
- 1.46126 1.46014 1.45902 1.4579 1.45678 1.45567 1.45455 1.45349
- 1.45275 1.45201 1.45127 1.45053 1.44979 1.44905 1.44831
- 1.44757 1.44683 1.44609 1.44535 1.44461 1.44387 1.44313
- 1.44239 1.44165 1.44091 1.44017 1.43943 1.43869 1.43795
- 1.43721 1.43874 1.43976 1.43619 1.43182 1.43726 1.43084
- 1.42587 1.42383 1.42642 1.42728 1.42736 1.4271 1.42669 1.42621
- 1.42569 1.41703 1.41244 1.41019 1.41199 1.41833 1.42502
- 1.41504 1.37535 1.28381 1.44779 2.33713 3.25835 3.67554
- 3.84975 4.01125 4.2253 4.45433 4.62215 4.74478 4.82998 4.8868
- 4.92396 4.94768 4.96498 4.98537 5.0128 5.04467 5.06722 5.06535
- 5.01475 4.91956 4.80647 4.7242 4.7059 4.73552 4.76379 4.81684
- 4.87376 4.92276 4.96112 4.9884 5.0045 5.00999 5.00933 5.00619
- 5.00384 5.00342 5.00373 5.00362 5.00309 5.00272 5.00239
- 5.00204 5.00172 5.00146 5.00124 5.00105 5.00089 5.00076
- 5.00065 5.00057 5.00048 5.00041 5.00034 5.00028 5.00023
- 5.00019 5.00015 5.00015 5.00016 5.0002 5.00023 5.00021 5.00019
- 5.00017 5.00015 5.00012 5.0001 5.00008 5.00007 5.00006 5.00005
- 5.00004 5.00003 5.00002 5.00001 5.00001 5.00001 5.00001
- 5.00001 5.00001 5.00001 5.00002 5.00002 5.00002 5.00002
- 5.00002 5.00002 5.00002 5.00002 5.00002 5.00002 5.00001
- 5.00001 5.00001 5.00062 4.99506 4.9835 4.96726 4.9728 4.97877
- 4.98675 4.9966 5.00406 5.00679 5.00629 5.00561 5.00487 5.00429
- 5.00384 5.002 5.00164 5.00229 5.00484 5.00769 5.00019 5.00242
- 5.01319 5.0335 5.07265 5.10129 5.11485 5.12551 5.13953 5.16048
- 5.18862 5.22811 5.25656 5.25627 5.19975 4.9139 4.24745 3.43732
- 2.8202 2.43224 2.17409 2.01333 1.93951 1.94622 1.98861 2.02217
- 2.05383 2.08376 2.11184 2.13793 2.16191 2.18267 2.20502
- 2.22837 2.24958 2.26901 2.28648 2.302 2.31582 2.32802 2.33869
- 2.34795 2.35596 2.36282 2.3687 2.37371 2.37797 2.38161 2.38476
- 2.38743 2.3897 2.39168 2.39329 2.39463 2.39575 2.39671 2.39756
- 2.39835 2.39907 2.39968 2.39999 2.4003 2.40061 2.40091 2.40122
- 2.40142 2.40159 2.40176 2.40193 2.4021 2.40222 2.40228 2.40234
- 2.4024 2.40247 2.40253 2.40259 2.40265 2.40271 2.40277 2.40284
- 2.40287 2.40289 2.40291 2.40294 2.40296 2.40298 2.40301
- 2.40303 2.40305 2.40308 2.4031 2.40311 2.40312 2.40313 2.40314
- 2.40315 2.40316 2.40317 2.40318
+ 5 5.01426 5.02852 5.01923 4.77685 4.56471 4.52338 4.56813
+ 4.63122 4.693 4.74776 4.79385 4.83258 4.86358 4.88918 4.91021
+ 4.90553 4.89733 4.89554 4.91953 5.00757 5.07101 5.06318
+ 5.05241 5.05535 5.08042 5.07251 4.90973 4.56136 3.98637
+ 3.237 2.67216 2.33678 2.13529 2.00544 1.91429 1.84638 1.79461
+ 1.75338 1.71958 1.69175 1.6686 1.64918 1.63258 1.61836 1.60607
+ 1.59506 1.58483 1.57575 1.56847 1.56193 1.55538 1.54968
+ 1.54416 1.5388 1.53523 1.53165 1.52807 1.52449 1.52091 1.51771
+ 1.51477 1.51182 1.50888 1.50593 1.50309 1.50113 1.49917
+ 1.4972 1.49524 1.49328 1.49132 1.48935 1.48739 1.48543 1.48346
+ 1.48157 1.48012 1.47868 1.47724 1.47579 1.47435 1.47291
+ 1.47146 1.47002 1.46857 1.46713 1.46574 1.46462 1.4635 1.46238
+ 1.46126 1.46014 1.45902 1.4579 1.45678 1.45567 1.45455 1.45349
+ 1.45275 1.45201 1.45127 1.45053 1.44979 1.44905 1.44831
+ 1.44757 1.44683 1.44609 1.44535 1.44461 1.44387 1.44313
+ 1.44239 1.44165 1.44091 1.44017 1.43943 1.43869 1.43795
+ 1.43721 1.43874 1.43976 1.43619 1.43182 1.43726 1.43084
+ 1.42587 1.42383 1.42642 1.42728 1.42736 1.4271 1.42669 1.42621
+ 1.42569 1.41703 1.41244 1.41019 1.41199 1.41833 1.42502
+ 1.41504 1.37535 1.28381 1.44779 2.33713 3.25835 3.67554
+ 3.84975 4.01125 4.2253 4.45433 4.62215 4.74478 4.82998 4.8868
+ 4.92396 4.94768 4.96498 4.98537 5.0128 5.04467 5.06722 5.06535
+ 5.01475 4.91956 4.80647 4.7242 4.7059 4.73552 4.76379 4.81684
+ 4.87376 4.92276 4.96112 4.9884 5.0045 5.00999 5.00933 5.00619
+ 5.00384 5.00342 5.00373 5.00362 5.00309 5.00272 5.00239
+ 5.00204 5.00172 5.00146 5.00124 5.00105 5.00089 5.00076
+ 5.00065 5.00057 5.00048 5.00041 5.00034 5.00028 5.00023
+ 5.00019 5.00015 5.00015 5.00016 5.0002 5.00023 5.00021 5.00019
+ 5.00017 5.00015 5.00012 5.0001 5.00008 5.00007 5.00006 5.00005
+ 5.00004 5.00003 5.00002 5.00001 5.00001 5.00001 5.00001
+ 5.00001 5.00001 5.00001 5.00002 5.00002 5.00002 5.00002
+ 5.00002 5.00002 5.00002 5.00002 5.00002 5.00002 5.00001
+ 5.00001 5.00001 5.00062 4.99506 4.9835 4.96726 4.9728 4.97877
+ 4.98675 4.9966 5.00406 5.00679 5.00629 5.00561 5.00487 5.00429
+ 5.00384 5.002 5.00164 5.00229 5.00484 5.00769 5.00019 5.00242
+ 5.01319 5.0335 5.07265 5.10129 5.11485 5.12551 5.13953 5.16048
+ 5.18862 5.22811 5.25656 5.25627 5.19975 4.9139 4.24745 3.43732
+ 2.8202 2.43224 2.17409 2.01333 1.93951 1.94622 1.98861 2.02217
+ 2.05383 2.08376 2.11184 2.13793 2.16191 2.18267 2.20502
+ 2.22837 2.24958 2.26901 2.28648 2.302 2.31582 2.32802 2.33869
+ 2.34795 2.35596 2.36282 2.3687 2.37371 2.37797 2.38161 2.38476
+ 2.38743 2.3897 2.39168 2.39329 2.39463 2.39575 2.39671 2.39756
+ 2.39835 2.39907 2.39968 2.39999 2.4003 2.40061 2.40091 2.40122
+ 2.40142 2.40159 2.40176 2.40193 2.4021 2.40222 2.40228 2.40234
+ 2.4024 2.40247 2.40253 2.40259 2.40265 2.40271 2.40277 2.40284
+ 2.40287 2.40289 2.40291 2.40294 2.40296 2.40298 2.40301
+ 2.40303 2.40305 2.40308 2.4031 2.40311 2.40312 2.40313 2.40314
+ 2.40315 2.40316 2.40317 2.40318
EOD
@v[37].set(<<-'EOD')
- 5 5.01732 5.03181 5.05944 5.12686 5.20725 5.28103 5.31254
- 5.32901 5.33709 5.3408 5.34257 5.34311 5.34347 5.34386 5.34411
- 5.3406 5.33484 5.32942 5.32904 5.33644 5.34869 5.35001 5.34882
- 5.34758 5.34672 5.34599 5.34496 5.34364 5.34165 5.33712
- 5.33502 5.3366 5.34067 5.34306 5.34398 5.34434 5.34442 5.34443
- 5.34443 5.34441 5.34439 5.34437 5.34437 5.34438 5.34438
- 5.34438 5.34438 5.34438 5.34437 5.34437 5.34436 5.34436
- 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437
- 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437
- 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437
- 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437
- 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437
- 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437
- 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437
- 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437
- 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437
- 5.34437 5.34437 5.34437 5.34437 5.34437 5.35377 5.35451
- 5.34265 5.34488 5.35861 5.28622 4.90033 4.75027 4.89731
- 4.97098 4.99293 4.99832 4.99909 4.99956 4.99858 4.99829
- 4.9998 5.00035 5.0038 5.00989 5.00251 4.99438 4.9953 4.99761
- 4.99985 5.00152 5.0011 5.00046 4.99996 4.99925 4.99862 4.99919
- 4.99961 5.00048 5.00234 4.99654 4.98235 4.95936 4.83738
- 4.53021 4.21004 4.00593 3.91207 3.88059 3.87822 3.89117
- 3.91278 3.94044 3.97376 4.01152 4.05052 4.10679 4.17908
- 4.25673 4.33414 4.40875 4.47879 4.54342 4.60258 4.65595
- 4.70291 4.74414 4.78018 4.81185 4.83915 4.86291 4.88301
- 4.90048 4.91528 4.92802 4.9387 4.94777 4.95539 4.9618 4.96725
- 4.97195 4.97588 4.97932 4.98247 4.98512 4.98697 4.98831
- 4.98919 4.99015 4.99101 4.99169 4.99222 4.99282 4.99341
- 4.994 4.9946 4.99519 4.99578 4.99638 4.99667 4.99693 4.9972
- 4.99747 4.99773 4.998 4.99827 4.99841 4.99849 4.99856 4.99864
- 4.99872 4.9988 4.99888 4.99896 4.99904 4.99911 4.99919 4.99927
- 4.99935 4.99943 4.9995 4.99955 4.9996 4.99965 4.9997 5.00736
- 4.98252 4.87516 4.66727 4.49142 4.43103 4.4301 4.4571 4.49729
- 4.5407 4.5835 4.62363 4.66114 4.69577 4.72738 4.74632 4.75971
- 4.77576 4.80671 4.87073 4.91665 4.93252 4.94418 4.95331
- 4.96094 4.96727 4.97148 4.97471 4.97612 4.98276 5.00247
- 5.04086 5.08628 5.10673 5.08887 5.0564 5.02767 5.01336 4.99685
- 4.97422 4.90866 4.67035 4.33117 4.07888 3.94432 3.89105
- 3.88174 3.89292 3.91442 3.94564 3.98708 4.0355 4.09134 4.16315
- 4.24088 4.31918 4.39527 4.46693 4.53337 4.59405 4.6486 4.69693
- 4.73938 4.77617 4.80809 4.83551 4.85895 4.87894 4.89596
- 4.91081 4.92417 4.93651 4.94552 4.95198 4.9565 4.96096 4.96523
- 4.96972 4.97428 4.97868 4.98064 4.9826 4.98455 4.98651 4.98847
- 4.98967 4.99064 4.9916 4.99257 4.99353 4.99422 4.99457 4.99493
- 4.99528 4.99563 4.99598 4.99633 4.99668 4.99703 4.99738
- 4.99773 4.9979 4.99804 4.99817 4.9983 4.99843 4.99856 4.99869
- 4.99883 4.99896 4.99909 4.99921 4.99926 4.99931 4.99937
- 4.99942 4.99948 4.99953 4.99959 4.99964
+ 5 5.01732 5.03181 5.05944 5.12686 5.20725 5.28103 5.31254
+ 5.32901 5.33709 5.3408 5.34257 5.34311 5.34347 5.34386 5.34411
+ 5.3406 5.33484 5.32942 5.32904 5.33644 5.34869 5.35001 5.34882
+ 5.34758 5.34672 5.34599 5.34496 5.34364 5.34165 5.33712
+ 5.33502 5.3366 5.34067 5.34306 5.34398 5.34434 5.34442 5.34443
+ 5.34443 5.34441 5.34439 5.34437 5.34437 5.34438 5.34438
+ 5.34438 5.34438 5.34438 5.34437 5.34437 5.34436 5.34436
+ 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437
+ 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437
+ 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437
+ 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437
+ 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437
+ 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437
+ 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437
+ 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437
+ 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437
+ 5.34437 5.34437 5.34437 5.34437 5.34437 5.35377 5.35451
+ 5.34265 5.34488 5.35861 5.28622 4.90033 4.75027 4.89731
+ 4.97098 4.99293 4.99832 4.99909 4.99956 4.99858 4.99829
+ 4.9998 5.00035 5.0038 5.00989 5.00251 4.99438 4.9953 4.99761
+ 4.99985 5.00152 5.0011 5.00046 4.99996 4.99925 4.99862 4.99919
+ 4.99961 5.00048 5.00234 4.99654 4.98235 4.95936 4.83738
+ 4.53021 4.21004 4.00593 3.91207 3.88059 3.87822 3.89117
+ 3.91278 3.94044 3.97376 4.01152 4.05052 4.10679 4.17908
+ 4.25673 4.33414 4.40875 4.47879 4.54342 4.60258 4.65595
+ 4.70291 4.74414 4.78018 4.81185 4.83915 4.86291 4.88301
+ 4.90048 4.91528 4.92802 4.9387 4.94777 4.95539 4.9618 4.96725
+ 4.97195 4.97588 4.97932 4.98247 4.98512 4.98697 4.98831
+ 4.98919 4.99015 4.99101 4.99169 4.99222 4.99282 4.99341
+ 4.994 4.9946 4.99519 4.99578 4.99638 4.99667 4.99693 4.9972
+ 4.99747 4.99773 4.998 4.99827 4.99841 4.99849 4.99856 4.99864
+ 4.99872 4.9988 4.99888 4.99896 4.99904 4.99911 4.99919 4.99927
+ 4.99935 4.99943 4.9995 4.99955 4.9996 4.99965 4.9997 5.00736
+ 4.98252 4.87516 4.66727 4.49142 4.43103 4.4301 4.4571 4.49729
+ 4.5407 4.5835 4.62363 4.66114 4.69577 4.72738 4.74632 4.75971
+ 4.77576 4.80671 4.87073 4.91665 4.93252 4.94418 4.95331
+ 4.96094 4.96727 4.97148 4.97471 4.97612 4.98276 5.00247
+ 5.04086 5.08628 5.10673 5.08887 5.0564 5.02767 5.01336 4.99685
+ 4.97422 4.90866 4.67035 4.33117 4.07888 3.94432 3.89105
+ 3.88174 3.89292 3.91442 3.94564 3.98708 4.0355 4.09134 4.16315
+ 4.24088 4.31918 4.39527 4.46693 4.53337 4.59405 4.6486 4.69693
+ 4.73938 4.77617 4.80809 4.83551 4.85895 4.87894 4.89596
+ 4.91081 4.92417 4.93651 4.94552 4.95198 4.9565 4.96096 4.96523
+ 4.96972 4.97428 4.97868 4.98064 4.9826 4.98455 4.98651 4.98847
+ 4.98967 4.99064 4.9916 4.99257 4.99353 4.99422 4.99457 4.99493
+ 4.99528 4.99563 4.99598 4.99633 4.99668 4.99703 4.99738
+ 4.99773 4.9979 4.99804 4.99817 4.9983 4.99843 4.99856 4.99869
+ 4.99883 4.99896 4.99909 4.99921 4.99926 4.99931 4.99937
+ 4.99942 4.99948 4.99953 4.99959 4.99964
EOD
@v[38].set(<<-'EOD')
- 4.49849 4.53282 4.58329 4.66625 4.83345 4.97823 5.0207 5.01816
- 5.01116 5.00595 5.00296 5.00148 5.00073 5.00062 5.00033
- 5.0003 4.99864 4.99661 4.99652 4.99928 5.00361 5.12573 5.17251
- 5.22612 5.33479 5.44503 5.44432 5.44379 5.44334 5.443 5.44276
- 5.44258 5.44246 5.44238 5.44232 5.44228 5.44225 5.44223
- 5.44221 5.4422 5.44219 5.44219 5.44218 5.44218 5.44218 5.44218
- 5.44217 5.44217 5.44217 5.44217 5.44217 5.44217 5.44217
- 5.44217 5.44217 5.44217 5.44217 5.44217 5.44217 5.44217
- 5.44217 5.44217 5.44217 5.44217 5.44217 5.44217 5.44216
- 5.44216 5.44216 5.44216 5.44216 5.44216 5.44216 5.44216
- 5.44216 5.44216 5.44216 5.44216 5.44216 5.44216 5.44216
- 5.44216 5.44216 5.44216 5.44216 5.44215 5.44215 5.44215
- 5.44215 5.44215 5.44215 5.44215 5.44215 5.44215 5.44215
- 5.44215 5.44215 5.44215 5.44215 5.44215 5.44215 5.44215
- 5.44215 5.44215 5.44215 5.44215 5.44215 5.44215 5.44215
- 5.44214 5.44214 5.44214 5.44214 5.44214 5.44214 5.44214
- 5.44214 5.44214 5.44214 5.44214 5.44212 5.45159 5.45236
- 5.44064 5.44307 5.45616 5.38122 4.77163 3.53297 2.74466
- 2.34448 2.11802 1.9783 1.88656 1.82001 1.77389 1.72955 1.69632
- 1.66971 1.6526 1.65236 1.56034 1.53764 1.97139 2.75096 3.39212
- 3.74042 3.82345 3.85696 3.88547 3.91862 3.9585 4.00467 4.05903
- 4.1254 4.19533 4.26791 4.34517 4.42112 4.49238 4.55807 4.6179
- 4.6713 4.71815 4.75889 4.79418 4.82456 4.85062 4.87291 4.89196
- 4.90823 4.92209 4.93388 4.9439 4.95242 4.95968 4.96585 4.97108
- 4.9755 4.97923 4.98237 4.98503 4.98732 4.98927 4.99094 4.99233
- 4.99353 4.99452 4.99538 4.99608 4.99668 4.99718 4.9976 4.99794
- 4.99822 4.99847 4.99867 4.99884 4.99899 4.99913 4.99924
- 4.99932 4.99938 4.99943 4.99947 4.99951 4.99953 4.99955
- 4.99958 4.99961 4.99964 4.99967 4.99969 4.99972 4.99975
- 4.99977 4.99978 4.99979 4.99981 4.99982 4.99983 4.99985
- 4.99986 4.99986 4.99987 4.99987 4.99988 4.99988 4.99988
- 4.99989 4.99989 4.9999 4.9999 4.99991 4.99991 4.99992 4.99992
- 4.99993 4.99993 4.99993 4.99994 5.00381 5.00064 4.99246
- 4.99823 5.00349 5.00076 5.00033 5.00015 5.00009 5.00007
- 5.00005 5.00004 5.00003 5.00002 4.99988 4.99732 4.99728
- 4.9978 5.00187 5.00927 5.08712 5.07654 4.92855 4.4863 3.76162
- 3.00049 2.49834 2.20883 2.03492 1.92384 1.84676 1.79021
- 1.74716 1.7132 1.68576 1.66309 1.64406 1.62785 1.61383 1.60162
- 1.59081 1.58117 1.57253 1.56473 1.55765 1.55117 1.54527
- 1.53988 1.53485 1.53012 1.5257 1.5216 1.51773 1.51411 1.51071
- 1.50746 1.50438 1.50146 1.49868 1.49603 1.4935 1.49109 1.48878
- 1.48657 1.48445 1.48242 1.48046 1.47858 1.47677 1.47502
- 1.47333 1.4717 1.47012 1.46859 1.46711 1.46568 1.46428 1.46292
- 1.4616 1.46034 1.45923 1.45812 1.45701 1.4559 1.45479 1.45378
- 1.45279 1.45181 1.45082 1.44983 1.44893 1.44813 1.44732
- 1.44652 1.44571 1.44491 1.4441 1.4433 1.44249 1.44169 1.44089
- 1.44019 1.43951 1.43883 1.43815 1.43747 1.4368 1.43612 1.43544
- 1.43476 1.43408 1.43342 1.43283 1.43223 1.43163 1.43104
- 1.43044 1.42984 1.42924 1.42865
+ 4.49849 4.53282 4.58329 4.66625 4.83345 4.97823 5.0207 5.01816
+ 5.01116 5.00595 5.00296 5.00148 5.00073 5.00062 5.00033
+ 5.0003 4.99864 4.99661 4.99652 4.99928 5.00361 5.12573 5.17251
+ 5.22612 5.33479 5.44503 5.44432 5.44379 5.44334 5.443 5.44276
+ 5.44258 5.44246 5.44238 5.44232 5.44228 5.44225 5.44223
+ 5.44221 5.4422 5.44219 5.44219 5.44218 5.44218 5.44218 5.44218
+ 5.44217 5.44217 5.44217 5.44217 5.44217 5.44217 5.44217
+ 5.44217 5.44217 5.44217 5.44217 5.44217 5.44217 5.44217
+ 5.44217 5.44217 5.44217 5.44217 5.44217 5.44217 5.44216
+ 5.44216 5.44216 5.44216 5.44216 5.44216 5.44216 5.44216
+ 5.44216 5.44216 5.44216 5.44216 5.44216 5.44216 5.44216
+ 5.44216 5.44216 5.44216 5.44216 5.44215 5.44215 5.44215
+ 5.44215 5.44215 5.44215 5.44215 5.44215 5.44215 5.44215
+ 5.44215 5.44215 5.44215 5.44215 5.44215 5.44215 5.44215
+ 5.44215 5.44215 5.44215 5.44215 5.44215 5.44215 5.44215
+ 5.44214 5.44214 5.44214 5.44214 5.44214 5.44214 5.44214
+ 5.44214 5.44214 5.44214 5.44214 5.44212 5.45159 5.45236
+ 5.44064 5.44307 5.45616 5.38122 4.77163 3.53297 2.74466
+ 2.34448 2.11802 1.9783 1.88656 1.82001 1.77389 1.72955 1.69632
+ 1.66971 1.6526 1.65236 1.56034 1.53764 1.97139 2.75096 3.39212
+ 3.74042 3.82345 3.85696 3.88547 3.91862 3.9585 4.00467 4.05903
+ 4.1254 4.19533 4.26791 4.34517 4.42112 4.49238 4.55807 4.6179
+ 4.6713 4.71815 4.75889 4.79418 4.82456 4.85062 4.87291 4.89196
+ 4.90823 4.92209 4.93388 4.9439 4.95242 4.95968 4.96585 4.97108
+ 4.9755 4.97923 4.98237 4.98503 4.98732 4.98927 4.99094 4.99233
+ 4.99353 4.99452 4.99538 4.99608 4.99668 4.99718 4.9976 4.99794
+ 4.99822 4.99847 4.99867 4.99884 4.99899 4.99913 4.99924
+ 4.99932 4.99938 4.99943 4.99947 4.99951 4.99953 4.99955
+ 4.99958 4.99961 4.99964 4.99967 4.99969 4.99972 4.99975
+ 4.99977 4.99978 4.99979 4.99981 4.99982 4.99983 4.99985
+ 4.99986 4.99986 4.99987 4.99987 4.99988 4.99988 4.99988
+ 4.99989 4.99989 4.9999 4.9999 4.99991 4.99991 4.99992 4.99992
+ 4.99993 4.99993 4.99993 4.99994 5.00381 5.00064 4.99246
+ 4.99823 5.00349 5.00076 5.00033 5.00015 5.00009 5.00007
+ 5.00005 5.00004 5.00003 5.00002 4.99988 4.99732 4.99728
+ 4.9978 5.00187 5.00927 5.08712 5.07654 4.92855 4.4863 3.76162
+ 3.00049 2.49834 2.20883 2.03492 1.92384 1.84676 1.79021
+ 1.74716 1.7132 1.68576 1.66309 1.64406 1.62785 1.61383 1.60162
+ 1.59081 1.58117 1.57253 1.56473 1.55765 1.55117 1.54527
+ 1.53988 1.53485 1.53012 1.5257 1.5216 1.51773 1.51411 1.51071
+ 1.50746 1.50438 1.50146 1.49868 1.49603 1.4935 1.49109 1.48878
+ 1.48657 1.48445 1.48242 1.48046 1.47858 1.47677 1.47502
+ 1.47333 1.4717 1.47012 1.46859 1.46711 1.46568 1.46428 1.46292
+ 1.4616 1.46034 1.45923 1.45812 1.45701 1.4559 1.45479 1.45378
+ 1.45279 1.45181 1.45082 1.44983 1.44893 1.44813 1.44732
+ 1.44652 1.44571 1.44491 1.4441 1.4433 1.44249 1.44169 1.44089
+ 1.44019 1.43951 1.43883 1.43815 1.43747 1.4368 1.43612 1.43544
+ 1.43476 1.43408 1.43342 1.43283 1.43223 1.43163 1.43104
+ 1.43044 1.42984 1.42924 1.42865
EOD
@v[39].set(<<-'EOD')
- 5 5.01048 5.01221 4.98887 4.76261 4.54943 4.51564 4.56249
- 4.62621 4.68843 4.74374 4.79044 4.82972 4.86127 4.88724
- 4.90862 4.90791 4.89858 4.89589 4.91767 5.00405 5.16956
- 5.12391 4.7557 3.87953 3.01124 2.48482 2.20424 2.03812 1.92679
- 1.84956 1.79256 1.74907 1.71487 1.68724 1.6644 1.64513 1.6287
- 1.61446 1.60197 1.59095 1.58117 1.57245 1.5646 1.55752 1.55109
- 1.54516 1.53958 1.53444 1.53008 1.52606 1.52205 1.51843
- 1.5149 1.51146 1.50893 1.50639 1.50387 1.50133 1.4988 1.49651
- 1.49436 1.49222 1.49007 1.48793 1.48585 1.48433 1.4828 1.48128
- 1.47975 1.47823 1.4767 1.47518 1.47365 1.47213 1.4706 1.46912
- 1.46795 1.46678 1.46561 1.46444 1.46327 1.4621 1.46093 1.45976
- 1.45859 1.45741 1.45628 1.45534 1.45441 1.45347 1.45254
- 1.4516 1.45067 1.44973 1.4488 1.44786 1.44693 1.44604 1.44539
- 1.44475 1.4441 1.44345 1.44281 1.44216 1.44151 1.44086 1.44022
- 1.43957 1.43892 1.43828 1.43763 1.43698 1.43633 1.43569
- 1.43504 1.43439 1.43375 1.4331 1.43245 1.4318 1.43157 1.43089
- 1.43001 1.43042 1.42899 1.42439 1.42216 1.43447 1.44048
- 1.43705 1.43314 1.43039 1.42861 1.42739 1.42651 1.42548
- 1.42488 1.4243 1.42392 1.4235 1.32443 1.31149 1.78169 2.64844
- 3.43211 3.95252 4.20231 4.3746 4.49948 4.58929 4.65742 4.71183
- 4.77057 4.83196 4.88354 4.92894 4.96625 4.99235 5.00651
- 5.00941 5.00813 5.00689 5.00588 5.00504 5.00431 5.00368
- 5.00314 5.00268 5.00228 5.00194 5.00165 5.0014 5.00118 5.001
- 5.00085 5.00072 5.00061 5.00052 5.00044 5.00037 5.00031
- 5.00027 5.00022 5.00019 5.00016 5.00013 5.00011 5.00009
- 5.00008 5.00007 5.00006 5.00005 5.00004 5.00003 5.00003
- 5.00003 5.00002 5.00002 5.00002 5.00001 5.00001 5.00001
- 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
- 5.00001 5.00001 5 5 5 5 5 4.99999 4.99999 4.99999 4.99998
- 4.99998 4.99998 4.99998 4.99998 4.99998 4.99998 4.99999
- 4.99999 4.99999 4.99999 4.99999 4.99999 5 5 5 5 5.00001
- 5.00002 5.00003 5.00004 5.00022 4.99974 4.99942 4.99997
- 5.00063 5.00002 5.00003 4.99994 4.99998 4.99999 5 5 5 5
- 5 4.99981 4.99998 5.00004 5.00036 5.00049 5.12012 5.16315
- 5.19712 5.21835 4.87874 4.10151 3.31555 2.74207 2.38075
- 2.15872 2.01614 1.91886 1.84852 1.79401 1.75052 1.71508
- 1.68672 1.66467 1.64602 1.62985 1.61576 1.60343 1.59256
- 1.58287 1.57418 1.56632 1.55922 1.55282 1.54687 1.54132
- 1.53618 1.53143 1.52698 1.52282 1.51895 1.51527 1.5118 1.50851
- 1.5054 1.50244 1.49963 1.49695 1.4944 1.49196 1.48963 1.4874
- 1.48527 1.48322 1.48124 1.47934 1.47751 1.47574 1.47403
- 1.47239 1.4708 1.46926 1.46777 1.46632 1.46491 1.46355 1.46237
- 1.4612 1.46002 1.45884 1.45766 1.45659 1.45555 1.45451 1.45346
- 1.45242 1.45147 1.45062 1.44978 1.44894 1.44809 1.44725
- 1.4464 1.44556 1.44472 1.44387 1.44303 1.4423 1.44159 1.44088
- 1.44017 1.43947 1.43876 1.43805 1.43734 1.43664 1.43593
- 1.43524 1.43462 1.434 1.43338 1.43276 1.43213 1.43151 1.43089
- 1.43027
+ 5 5.01048 5.01221 4.98887 4.76261 4.54943 4.51564 4.56249
+ 4.62621 4.68843 4.74374 4.79044 4.82972 4.86127 4.88724
+ 4.90862 4.90791 4.89858 4.89589 4.91767 5.00405 5.16956
+ 5.12391 4.7557 3.87953 3.01124 2.48482 2.20424 2.03812 1.92679
+ 1.84956 1.79256 1.74907 1.71487 1.68724 1.6644 1.64513 1.6287
+ 1.61446 1.60197 1.59095 1.58117 1.57245 1.5646 1.55752 1.55109
+ 1.54516 1.53958 1.53444 1.53008 1.52606 1.52205 1.51843
+ 1.5149 1.51146 1.50893 1.50639 1.50387 1.50133 1.4988 1.49651
+ 1.49436 1.49222 1.49007 1.48793 1.48585 1.48433 1.4828 1.48128
+ 1.47975 1.47823 1.4767 1.47518 1.47365 1.47213 1.4706 1.46912
+ 1.46795 1.46678 1.46561 1.46444 1.46327 1.4621 1.46093 1.45976
+ 1.45859 1.45741 1.45628 1.45534 1.45441 1.45347 1.45254
+ 1.4516 1.45067 1.44973 1.4488 1.44786 1.44693 1.44604 1.44539
+ 1.44475 1.4441 1.44345 1.44281 1.44216 1.44151 1.44086 1.44022
+ 1.43957 1.43892 1.43828 1.43763 1.43698 1.43633 1.43569
+ 1.43504 1.43439 1.43375 1.4331 1.43245 1.4318 1.43157 1.43089
+ 1.43001 1.43042 1.42899 1.42439 1.42216 1.43447 1.44048
+ 1.43705 1.43314 1.43039 1.42861 1.42739 1.42651 1.42548
+ 1.42488 1.4243 1.42392 1.4235 1.32443 1.31149 1.78169 2.64844
+ 3.43211 3.95252 4.20231 4.3746 4.49948 4.58929 4.65742 4.71183
+ 4.77057 4.83196 4.88354 4.92894 4.96625 4.99235 5.00651
+ 5.00941 5.00813 5.00689 5.00588 5.00504 5.00431 5.00368
+ 5.00314 5.00268 5.00228 5.00194 5.00165 5.0014 5.00118 5.001
+ 5.00085 5.00072 5.00061 5.00052 5.00044 5.00037 5.00031
+ 5.00027 5.00022 5.00019 5.00016 5.00013 5.00011 5.00009
+ 5.00008 5.00007 5.00006 5.00005 5.00004 5.00003 5.00003
+ 5.00003 5.00002 5.00002 5.00002 5.00001 5.00001 5.00001
+ 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
+ 5.00001 5.00001 5 5 5 5 5 4.99999 4.99999 4.99999 4.99998
+ 4.99998 4.99998 4.99998 4.99998 4.99998 4.99998 4.99999
+ 4.99999 4.99999 4.99999 4.99999 4.99999 5 5 5 5 5.00001
+ 5.00002 5.00003 5.00004 5.00022 4.99974 4.99942 4.99997
+ 5.00063 5.00002 5.00003 4.99994 4.99998 4.99999 5 5 5 5
+ 5 4.99981 4.99998 5.00004 5.00036 5.00049 5.12012 5.16315
+ 5.19712 5.21835 4.87874 4.10151 3.31555 2.74207 2.38075
+ 2.15872 2.01614 1.91886 1.84852 1.79401 1.75052 1.71508
+ 1.68672 1.66467 1.64602 1.62985 1.61576 1.60343 1.59256
+ 1.58287 1.57418 1.56632 1.55922 1.55282 1.54687 1.54132
+ 1.53618 1.53143 1.52698 1.52282 1.51895 1.51527 1.5118 1.50851
+ 1.5054 1.50244 1.49963 1.49695 1.4944 1.49196 1.48963 1.4874
+ 1.48527 1.48322 1.48124 1.47934 1.47751 1.47574 1.47403
+ 1.47239 1.4708 1.46926 1.46777 1.46632 1.46491 1.46355 1.46237
+ 1.4612 1.46002 1.45884 1.45766 1.45659 1.45555 1.45451 1.45346
+ 1.45242 1.45147 1.45062 1.44978 1.44894 1.44809 1.44725
+ 1.4464 1.44556 1.44472 1.44387 1.44303 1.4423 1.44159 1.44088
+ 1.44017 1.43947 1.43876 1.43805 1.43734 1.43664 1.43593
+ 1.43524 1.43462 1.434 1.43338 1.43276 1.43213 1.43151 1.43089
+ 1.43027
EOD
end
diff --git a/ext/tk/sample/tkextlib/blt/graph7.rb b/ext/tk/sample/tkextlib/blt/graph7.rb
index 8b31b28c91..27fbe53d97 100644
--- a/ext/tk/sample/tkextlib/blt/graph7.rb
+++ b/ext/tk/sample/tkextlib/blt/graph7.rb
@@ -16,10 +16,10 @@ v_x.expr("random(#{v_x})")
v_y.expr("random(#{v_y})")
v_x.sort(v_y)
-plot = Tk::BLT::PlotComponent::Element.new(graph, :symbol=>:square,
- :color=>'green4', :fill=>'green2',
- :linewidth=>0, :outlinewidth=>1,
- :pixels=>4, :label=>'plot',
+plot = Tk::BLT::PlotComponent::Element.new(graph, :symbol=>:square,
+ :color=>'green4', :fill=>'green2',
+ :linewidth=>0, :outlinewidth=>1,
+ :pixels=>4, :label=>'plot',
:xdata=>v_x, :ydata=>v_y)
Tk.root.minsize(0, 0)
diff --git a/ext/tk/sample/tkextlib/blt/graph7a.rb b/ext/tk/sample/tkextlib/blt/graph7a.rb
index 8def766060..a014f72fc7 100644
--- a/ext/tk/sample/tkextlib/blt/graph7a.rb
+++ b/ext/tk/sample/tkextlib/blt/graph7a.rb
@@ -2,7 +2,7 @@
require 'tk'
require 'tkextlib/blt'
-file = File.join(File.dirname(File.expand_path(__FILE__)),
+file = File.join(File.dirname(File.expand_path(__FILE__)),
'images', 'buckskin.gif')
bgTexture = TkPhotoImage.new(:file=>file)
@@ -39,10 +39,10 @@ v_x.expr("random(#{v_x})")
v_y.expr("random(#{v_y})")
v_x.sort(v_y)
-plot = Tk::BLT::PlotComponent::Element.new(graph, :symbol=>:square,
- :color=>'green4', :fill=>'green2',
- :linewidth=>0, :outlinewidth=>1,
- :pixels=>4, :label=>'plot',
+plot = Tk::BLT::PlotComponent::Element.new(graph, :symbol=>:square,
+ :color=>'green4', :fill=>'green2',
+ :linewidth=>0, :outlinewidth=>1,
+ :pixels=>4, :label=>'plot',
:xdata=>v_x, :ydata=>v_y)
Tk.root.minsize(0, 0)
diff --git a/ext/tk/sample/tkextlib/blt/graph7b.rb b/ext/tk/sample/tkextlib/blt/graph7b.rb
index 8b00f154b2..c589f18d86 100644
--- a/ext/tk/sample/tkextlib/blt/graph7b.rb
+++ b/ext/tk/sample/tkextlib/blt/graph7b.rb
@@ -17,10 +17,10 @@ y = Array.new(length)
y[i] = rand
}
-plot = Tk::BLT::PlotComponent::Element.new(graph, :symbol=>:square,
- :color=>'green4', :fill=>'green2',
- :linewidth=>0, :outlinewidth=>1,
- :pixels=>4, :label=>'plot',
+plot = Tk::BLT::PlotComponent::Element.new(graph, :symbol=>:square,
+ :color=>'green4', :fill=>'green2',
+ :linewidth=>0, :outlinewidth=>1,
+ :pixels=>4, :label=>'plot',
:xdata=>x, :ydata=>y)
Tk.root.minsize(0, 0)
diff --git a/ext/tk/sample/tkextlib/blt/graph7c.rb b/ext/tk/sample/tkextlib/blt/graph7c.rb
index d4ed1a66ad..495b66f4af 100644
--- a/ext/tk/sample/tkextlib/blt/graph7c.rb
+++ b/ext/tk/sample/tkextlib/blt/graph7c.rb
@@ -21,10 +21,10 @@ y = Array.new(length)
v_x.set(x)
v_y.set(y)
-plot = Tk::BLT::PlotComponent::Element.new(graph, :symbol=>:square,
- :color=>'green4', :fill=>'green2',
- :linewidth=>0, :outlinewidth=>1,
- :pixels=>4, :label=>'plot',
+plot = Tk::BLT::PlotComponent::Element.new(graph, :symbol=>:square,
+ :color=>'green4', :fill=>'green2',
+ :linewidth=>0, :outlinewidth=>1,
+ :pixels=>4, :label=>'plot',
:xdata=>v_x, :ydata=>v_y)
Tk.root.minsize(0, 0)
diff --git a/ext/tk/sample/tkextlib/blt/pareto.rb b/ext/tk/sample/tkextlib/blt/pareto.rb
index bf9a1ec749..94d5f3f97f 100644
--- a/ext/tk/sample/tkextlib/blt/pareto.rb
+++ b/ext/tk/sample/tkextlib/blt/pareto.rb
@@ -8,21 +8,21 @@ require 'tkextlib/blt'
# The pareto chart mixes line and bar elements in the same graph.
# Each processing operating is represented by a bar element. The
# total accumulated defects is displayed with a single line element.
-b = Tk::BLT::Barchart.new(:title=>'Defects Found During Inspection',
- :font=>'Helvetica 12', :plotpady=>[12, 4],
+b = Tk::BLT::Barchart.new(:title=>'Defects Found During Inspection',
+ :font=>'Helvetica 12', :plotpady=>[12, 4],
:width=>'6i', :height=>'5i')
Tk::BLT::Table.add(Tk.root, b, :fill=>:both)
data = [
- ["Spot Weld", 82, 'yellow'],
- ["Lathe", 49, 'orange'],
- ["Gear Cut", 38, 'green'],
- ["Drill", 24, 'blue'],
- ["Grind", 17, 'red'],
- ["Lapping", 12, 'brown'],
- ["Press", 8, 'purple'],
- ["De-burr", 4, 'pink'],
- ["Packaging", 3, 'cyan'],
+ ["Spot Weld", 82, 'yellow'],
+ ["Lathe", 49, 'orange'],
+ ["Gear Cut", 38, 'green'],
+ ["Drill", 24, 'blue'],
+ ["Grind", 17, 'red'],
+ ["Lapping", 12, 'brown'],
+ ["Press", 8, 'purple'],
+ ["De-burr", 4, 'pink'],
+ ["Packaging", 3, 'cyan'],
["Other", 12, 'magenta']
]
@@ -41,8 +41,8 @@ labels = []
data.each{|label, value, color|
count += 1
- b.element_create(label, :xdata=>count, :ydata=>value, :foreground=>color,
- :relief=>:solid, :borderwidth=>1, :stipple=>pattern1,
+ b.element_create(label, :xdata=>count, :ydata=>value, :foreground=>color,
+ :relief=>:solid, :borderwidth=>1, :stipple=>pattern1,
:background=>'lightblue')
labels[count] = label
# Get the total number of defects.
@@ -51,7 +51,7 @@ data.each{|label, value, color|
xdata << count
}
-# Configure the coordinates of the accumulated defects,
+# Configure the coordinates of the accumulated defects,
# now that we know what they are.
b.element_configure('accum', :xdata=>xdata, :ydata=>ydata)
@@ -63,19 +63,19 @@ xdata.zip(ydata){|x, y|
else
text = '%.1f' % percent
end
- b.marker_create(:text, :coords=>[x, y], :text=>text, :font=>'Helvetica 10',
+ b.marker_create(:text, :coords=>[x, y], :text=>text, :font=>'Helvetica 10',
:foreground=>'red4', :anchor=>:center, :yoffset=>-5)
}
# Display an auxillary y-axis for percentages.
-b.axis_configure('y2', :hide=>false, :min=>0.0, :max=>100.0,
+b.axis_configure('y2', :hide=>false, :min=>0.0, :max=>100.0,
:title=>'Percentage')
# Title the y-axis
b.axis_configure('y', :title=>'Defects')
# Configure the x-axis to display the process names, instead of numbers.
-b.axis_configure('x', :title=>'Process', :rotate=>90, :subdivisions=>0,
+b.axis_configure('x', :title=>'Process', :rotate=>90, :subdivisions=>0,
:command=>proc{|w, val|
val = val.round
labels[val]? labels[val]: val
diff --git a/ext/tk/sample/tkextlib/blt/plot1b.rb b/ext/tk/sample/tkextlib/blt/plot1b.rb
index 8a3ce8216d..eb41e361f9 100644
--- a/ext/tk/sample/tkextlib/blt/plot1b.rb
+++ b/ext/tk/sample/tkextlib/blt/plot1b.rb
@@ -4,7 +4,7 @@ require 'tkextlib/blt'
graph = Tk::BLT::Graph.new.pack
plot = graph.element_create
-plot.configure(:linewidth=>0, :label=>'foo',
+plot.configure(:linewidth=>0, :label=>'foo',
:data=>[[1.0, 3.4], [1.1, 2.8], [1.2, 3.1], [1.4, 2.9]].flatten)
Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/blt/winop1.rb b/ext/tk/sample/tkextlib/blt/winop1.rb
index 97c31aa295..e94138cd94 100644
--- a/ext/tk/sample/tkextlib/blt/winop1.rb
+++ b/ext/tk/sample/tkextlib/blt/winop1.rb
@@ -2,7 +2,7 @@
require 'tk'
require 'tkextlib/blt'
-file = File.join(File.dirname(File.expand_path(__FILE__)),
+file = File.join(File.dirname(File.expand_path(__FILE__)),
'images', 'sample.gif')
if File.exist?(file)
src = TkPhotoImage.new(:file=>file)
@@ -30,9 +30,9 @@ Tk.root.background('white')
l_hdr = TkLabel.new(:text=>"#{iw} x #{ih}")
l_ftr = TkLabel.new(:text=>"#{r}%")
l_img = TkLabel.new(:image=>dst)
- Tk::BLT::Table.add(Tk.root,
- [0,i], l_hdr,
- [1,i], l_img,
+ Tk::BLT::Table.add(Tk.root,
+ [0,i], l_hdr,
+ [1,i], l_img,
[2,i], l_ftr)
Tk.update
}
diff --git a/ext/tk/sample/tkextlib/blt/winop2.rb b/ext/tk/sample/tkextlib/blt/winop2.rb
index d59c43ba22..1f674ee893 100644
--- a/ext/tk/sample/tkextlib/blt/winop2.rb
+++ b/ext/tk/sample/tkextlib/blt/winop2.rb
@@ -2,7 +2,7 @@
require 'tk'
require 'tkextlib/blt'
-file = File.join(File.dirname(File.expand_path(__FILE__)),
+file = File.join(File.dirname(File.expand_path(__FILE__)),
'images', 'qv100.t.gif')
if File.exist?(file)
src = TkPhotoImage.new(:file=>file)
diff --git a/ext/tk/sample/tkextlib/bwidget/basic.rb b/ext/tk/sample/tkextlib/bwidget/basic.rb
index 060baf8a6c..c1521651fd 100644
--- a/ext/tk/sample/tkextlib/bwidget/basic.rb
+++ b/ext/tk/sample/tkextlib/bwidget/basic.rb
@@ -29,37 +29,37 @@ module DemoBasic
end
def self._label(parent)
- lab = Tk::BWidget::Label.new(parent, :text=>'This is a Label widget',
+ lab = Tk::BWidget::Label.new(parent, :text=>'This is a Label widget',
:helptext=>'Label widget')
- chk = TkCheckbutton.new(parent, :text=>'Disabled',
- :variable=>@@var.ref(lab, 'state'),
- :onvalue=>'disabled', :offvalue=>'normal',
+ chk = TkCheckbutton.new(parent, :text=>'Disabled',
+ :variable=>@@var.ref(lab, 'state'),
+ :onvalue=>'disabled', :offvalue=>'normal',
:command=>proc{lab[:state] = @@var[lab, 'state']})
lab.pack(:anchor=>:w, :pady=>4)
chk.pack(:anchor=>:w)
end
def self._entry(parent)
- ent = Tk::BWidget::Entry.new(parent, :text=>'Press enter',
- :helptext=>'Entry widtet',
+ ent = Tk::BWidget::Entry.new(parent, :text=>'Press enter',
+ :helptext=>'Entry widtet',
:command=>proc{
@@var['entcmd'] = 'command called'
Tk.after(500, proc{@@var['entcmd'] = ''})
})
- chk1 = TkCheckbutton.new(parent, :text=>'Disabled',
- :variable=>@@var.ref(ent, 'state'),
- :onvalue=>'disabled', :offvalue=>'normal',
+ chk1 = TkCheckbutton.new(parent, :text=>'Disabled',
+ :variable=>@@var.ref(ent, 'state'),
+ :onvalue=>'disabled', :offvalue=>'normal',
:command=>proc{ent.state = @@var[ent, 'state']})
- chk2 = TkCheckbutton.new(parent, :text=>'Non editable',
- :variable=>@@var.ref(ent, 'editable'),
- :onvalue=>false, :offvalue=>true,
+ chk2 = TkCheckbutton.new(parent, :text=>'Non editable',
+ :variable=>@@var.ref(ent, 'editable'),
+ :onvalue=>false, :offvalue=>true,
:command=>proc{
ent.editable = @@var[ent, 'editable']
})
- lab = TkLabel.new(parent, :textvariable=>@@var.ref('entcmd'),
+ lab = TkLabel.new(parent, :textvariable=>@@var.ref('entcmd'),
:foreground=>'red')
ent.pack(:pady=>4, :anchor=>:w)
@@ -69,22 +69,22 @@ module DemoBasic
def self._button(parent)
frame = TkFrame.new(parent)
- but = Tk::BWidget::Button.new(frame, :text=>'Press me!',
- :repeatdelay=>300,
- :command=>proc{_butcmd('command')},
+ but = Tk::BWidget::Button.new(frame, :text=>'Press me!',
+ :repeatdelay=>300,
+ :command=>proc{_butcmd('command')},
:helptext=>'This is a Button widget')
sep1 = Tk::BWidget::Separator.new(frame, :orient=>:vertical)
- arr1 = Tk::BWidget::ArrowButton.new(frame, :type=>:button,
- :width=>25, :height=>25, :repeatdelay=>300,
- :command=>proc{_butcmd('command')},
+ arr1 = Tk::BWidget::ArrowButton.new(frame, :type=>:button,
+ :width=>25, :height=>25, :repeatdelay=>300,
+ :command=>proc{_butcmd('command')},
:helptext=>"This is an ArrowButton widget\nof type button")
sep2 = Tk::BWidget::Separator.new(frame, :orient=>:vertical)
- arr2 = Tk::BWidget::ArrowButton.new(frame, :type=>:arrow,
- :width=>25, :height=>25, :relief=>:sunken,
- :ipadx=>0, :ipady=>0, :repeatdelay=>300,
- :command=>proc{_butcmd('command')},
+ arr2 = Tk::BWidget::ArrowButton.new(frame, :type=>:arrow,
+ :width=>25, :height=>25, :relief=>:sunken,
+ :ipadx=>0, :ipady=>0, :repeatdelay=>300,
+ :command=>proc{_butcmd('command')},
:helptext=>"This is an ArrowButton widget\nof type arrow")
but.pack(:side=>:left, :padx=>4)
@@ -94,49 +94,49 @@ module DemoBasic
arr2.pack(:side=>:left, :padx=>4)
frame.pack
- Tk::BWidget::Separator.new(parent,
+ Tk::BWidget::Separator.new(parent,
:orient=>:horizontal).pack(:fill=>:x, :pady=>10)
- labf1 = Tk::BWidget::LabelFrame.new(parent, :text=>'Command',
- :side=>:top, :anchor=>:w,
+ labf1 = Tk::BWidget::LabelFrame.new(parent, :text=>'Command',
+ :side=>:top, :anchor=>:w,
:relief=>:sunken, :borderwidth=>1)
subf = labf1.get_frame
- chk1 = TkCheckbutton.new(subf, :text=>'Disabled',
- :variable=>@@var.ref('bstate'),
- :onvalue=>'disabled', :offvalue=>'normal',
- :command=>proc{_bstate(@@var['bstate'],
+ chk1 = TkCheckbutton.new(subf, :text=>'Disabled',
+ :variable=>@@var.ref('bstate'),
+ :onvalue=>'disabled', :offvalue=>'normal',
+ :command=>proc{_bstate(@@var['bstate'],
but, arr1, arr2)})
- chk2 = TkCheckbutton.new(subf, :text=>"Use armcommand/\ndisarmcommand",
- :variable=>@@var.ref('barmcmd'),
- :command=>proc{_barmcmd(@@var['barmcmd'],
+ chk2 = TkCheckbutton.new(subf, :text=>"Use armcommand/\ndisarmcommand",
+ :variable=>@@var.ref('barmcmd'),
+ :command=>proc{_barmcmd(@@var['barmcmd'],
but, arr1, arr2)})
Tk.pack(chk1, chk2, :anchor=>:w)
- label = TkLabel.new(parent, :textvariable=>@@var.ref('butcmd'),
+ label = TkLabel.new(parent, :textvariable=>@@var.ref('butcmd'),
:foreground=>'red').pack(:side=>:bottom, :pady=>4)
- labf2 = Tk::BWidget::LabelFrame.new(parent, :text=>'Direction',
- :side=>:top, :anchor=>:w,
+ labf2 = Tk::BWidget::LabelFrame.new(parent, :text=>'Direction',
+ :side=>:top, :anchor=>:w,
:relief=>:sunken, :borderwidth=>1)
subf = labf2.get_frame
@@var['bside'] = :top
[:top, :left, :bottom, :right].each{|dir|
- TkRadiobutton.new(subf, :text=>"#{dir} arrow",
- :variable=>@@var.ref('bside'), :value=>dir,
+ TkRadiobutton.new(subf, :text=>"#{dir} arrow",
+ :variable=>@@var.ref('bside'), :value=>dir,
:command=>proc{_bside(@@var['bside'], arr1, arr2)}
).pack(:anchor=>:w)
}
- labf3 = Tk::BWidget::LabelFrame.new(parent, :text=>'Relief',
- :side=>:top, :anchor=>:w,
+ labf3 = Tk::BWidget::LabelFrame.new(parent, :text=>'Relief',
+ :side=>:top, :anchor=>:w,
:relief=>:sunken, :borderwidth=>1)
subf = labf3.get_frame
@@var['brelief'] = :raised
[ %w(raised sunken ridge groove), %w(flat solid link)].each{|lrelief|
f = TkFrame.new(subf)
lrelief.each{|relief|
- TkRadiobutton.new(f, :text=>relief,
- :variable=>@@var.ref('brelief'), :value=>relief,
+ TkRadiobutton.new(f, :text=>relief,
+ :variable=>@@var.ref('brelief'), :value=>relief,
:command=>proc{
_brelief(@@var['brelief'], but, arr1, arr2)
}).pack(:anchor=>:w)
@@ -163,19 +163,19 @@ module DemoBasic
def self._barmcmd(value, but, arr1, arr2)
if TkComm.bool(value)
- but.configure(:armcommand=>proc{_butcmd('arm')},
- :disarmcommand=>proc{_butcmd('disarm')},
+ but.configure(:armcommand=>proc{_butcmd('arm')},
+ :disarmcommand=>proc{_butcmd('disarm')},
:command=>'')
[arr1, arr2].each{|arr|
- arr.configure(:armcommand=>proc{_butcmd('arm')},
- :disarmcommand=>proc{_butcmd('disarm')},
+ arr.configure(:armcommand=>proc{_butcmd('arm')},
+ :disarmcommand=>proc{_butcmd('disarm')},
:command=>'')
}
else
- but.configure(:armcommand=>'', :disarmcommand=>'',
+ but.configure(:armcommand=>'', :disarmcommand=>'',
:command=>proc{_butcmd('command')})
[arr1, arr2].each{|arr|
- arr.configure(:armcommand=>'', :disarmcommand=>'',
+ arr.configure(:armcommand=>'', :disarmcommand=>'',
:command=>proc{_butcmd('command')})
}
end
diff --git a/ext/tk/sample/tkextlib/bwidget/demo.rb b/ext/tk/sample/tkextlib/bwidget/demo.rb
index 3eb98818f3..785d2681a8 100644
--- a/ext/tk/sample/tkextlib/bwidget/demo.rb
+++ b/ext/tk/sample/tkextlib/bwidget/demo.rb
@@ -54,21 +54,21 @@ class BWidget_Demo
descmenu = [
'&File', 'all', 'file', 0, [
- ['command', 'E&xit', [], 'Exit BWidget demo', [],
+ ['command', 'E&xit', [], 'Exit BWidget demo', [],
{:command=>proc{exit}}]
- ],
+ ],
'&Options', 'all', 'options', 0, [
- ['checkbutton', 'Toolbar &1', ['all', 'option'],
- 'Show/hide toolbar 1', [],
- { :variable=>DemoVar.toolbar1,
+ ['checkbutton', 'Toolbar &1', ['all', 'option'],
+ 'Show/hide toolbar 1', [],
+ { :variable=>DemoVar.toolbar1,
:command=>proc{
DemoVar.mainframe.show_toolbar(0, DemoVar.toolbar1.value)
}
}
- ],
- ['checkbutton', 'Toolbar &2', ['all', 'option'],
- 'Show/hide toolbar 2', [],
- { :variable=>DemoVar.toolbar2,
+ ],
+ ['checkbutton', 'Toolbar &2', ['all', 'option'],
+ 'Show/hide toolbar 2', [],
+ { :variable=>DemoVar.toolbar2,
:command=>proc{
DemoVar.mainframe.show_toolbar(1, DemoVar.toolbar2.value)
}
@@ -81,8 +81,8 @@ class BWidget_Demo
DemoVar.prgindic.value = 0
DemoVar.mainframe = Tk::BWidget::MainFrame.new(
- :menu=>descmenu,
- :textvariable=>DemoVar.status,
+ :menu=>descmenu,
+ :textvariable=>DemoVar.status,
:progressvar=>DemoVar.prgindic
)
@@ -91,22 +91,22 @@ class BWidget_Demo
DemoVar.mainframe.add_toolbar{|tb1|
Tk::BWidget::ButtonBox.new(tb1, :spacing=>0, :padx=>1, :pady=>1){|bbox|
- add(:image=>Tk::BWidget::Bitmap.new('new'),
- :highlightthickness=>0, :takefocus=>0, :relief=>:link,
- :borderwidth=>1, :padx=>1, :pady=>1,
- :command=>proc{puts 'select "Create a new file" icon'},
+ add(:image=>Tk::BWidget::Bitmap.new('new'),
+ :highlightthickness=>0, :takefocus=>0, :relief=>:link,
+ :borderwidth=>1, :padx=>1, :pady=>1,
+ :command=>proc{puts 'select "Create a new file" icon'},
:helptext=>"Create a new file")
- add(:image=>Tk::BWidget::Bitmap.new('open'),
- :highlightthickness=>0, :takefocus=>0, :relief=>:link,
- :borderwidth=>1, :padx=>1, :pady=>1,
- :command=>proc{puts 'select "Open an existing file" icon'},
+ add(:image=>Tk::BWidget::Bitmap.new('open'),
+ :highlightthickness=>0, :takefocus=>0, :relief=>:link,
+ :borderwidth=>1, :padx=>1, :pady=>1,
+ :command=>proc{puts 'select "Open an existing file" icon'},
:helptext=>"Open an existing file")
- add(:image=>Tk::BWidget::Bitmap.new('save'),
- :highlightthickness=>0, :takefocus=>0, :relief=>:link,
- :borderwidth=>1, :padx=>1, :pady=>1,
- :command=>proc{puts 'select "Save file" icon'},
+ add(:image=>Tk::BWidget::Bitmap.new('save'),
+ :highlightthickness=>0, :takefocus=>0, :relief=>:link,
+ :borderwidth=>1, :padx=>1, :pady=>1,
+ :command=>proc{puts 'select "Save file" icon'},
:helptext=>"Save file")
pack(:side=>:left, :anchor=>:w)
@@ -119,22 +119,22 @@ class BWidget_Demo
DemoVar.prgindic.numeric += 1
Tk::BWidget::ButtonBox.new(tb1, :spacing=>0, :padx=>1, :pady=>1){|bbox|
- add(:image=>Tk::BWidget::Bitmap.new('cut'),
- :highlightthickness=>0, :takefocus=>0, :relief=>:link,
- :borderwidth=>1, :padx=>1, :pady=>1,
- :command=>proc{puts 'select "Cut selection" icon'},
+ add(:image=>Tk::BWidget::Bitmap.new('cut'),
+ :highlightthickness=>0, :takefocus=>0, :relief=>:link,
+ :borderwidth=>1, :padx=>1, :pady=>1,
+ :command=>proc{puts 'select "Cut selection" icon'},
:helptext=>"Cut selection")
- add(:image=>Tk::BWidget::Bitmap.new('copy'),
- :highlightthickness=>0, :takefocus=>0, :relief=>:link,
- :borderwidth=>1, :padx=>1, :pady=>1,
- :command=>proc{puts 'select "Copy selection" icon'},
+ add(:image=>Tk::BWidget::Bitmap.new('copy'),
+ :highlightthickness=>0, :takefocus=>0, :relief=>:link,
+ :borderwidth=>1, :padx=>1, :pady=>1,
+ :command=>proc{puts 'select "Copy selection" icon'},
:helptext=>"Copy selection")
- add(:image=>Tk::BWidget::Bitmap.new('paste'),
- :highlightthickness=>0, :takefocus=>0, :relief=>:link,
- :borderwidth=>1, :padx=>1, :pady=>1,
- :command=>proc{puts 'select "Paste selection" icon'},
+ add(:image=>Tk::BWidget::Bitmap.new('paste'),
+ :highlightthickness=>0, :takefocus=>0, :relief=>:link,
+ :borderwidth=>1, :padx=>1, :pady=>1,
+ :command=>proc{puts 'select "Paste selection" icon'},
:helptext=>"Paste selection")
pack(:side=>:left, :anchor=>:w)
@@ -145,7 +145,7 @@ class BWidget_Demo
DemoVar.prgindic.numeric += 1
tb2 = DemoVar.mainframe.add_toolbar
- DemoVar._wfont = Tk::BWidget::SelectFont::Toolbar.new(tb2,
+ DemoVar._wfont = Tk::BWidget::SelectFont::Toolbar.new(tb2,
:command=>proc{update_font(DemoVar._wfont[:font])}
)
DemoVar.font = DemoVar._wfont[:font]
@@ -213,18 +213,18 @@ class BWidget_Demo
top.withdraw
top.overrideredirect(true)
- ximg = TkLabel.new(top, :bitmap=>"@#{File.join(DEMODIR,'x1.xbm')}",
+ ximg = TkLabel.new(top, :bitmap=>"@#{File.join(DEMODIR,'x1.xbm')}",
:foreground=>'grey90', :background=>'white')
bwimg = TkLabel.new(ximg, :bitmap=>"@#{File.join(DEMODIR,'bwidget.xbm')}",
:foreground=>'grey90', :background=>'white')
frame = TkFrame.new(ximg, :background=>'white')
- TkLabel.new(frame, :text=>'Loading demo',
+ TkLabel.new(frame, :text=>'Loading demo',
:background=>'white', :font=>'times 8').pack
- TkLabel.new(frame, :textvariable=>DemoVar.prgtext,
+ TkLabel.new(frame, :textvariable=>DemoVar.prgtext,
:background=>'white', :font=>'times 8', :width=>35).pack
- Tk::BWidget::ProgressBar.new(frame, :width=>50, :height=>10,
- :background=>'white',
- :variable=>DemoVar.prgindic,
+ Tk::BWidget::ProgressBar.new(frame, :width=>50, :height=>10,
+ :background=>'white',
+ :variable=>DemoVar.prgindic,
:maximum=>10).pack
frame.place(:x=>0, :y=>0, :anchor=>:nw)
bwimg.place(:relx=>1, :rely=>1, :anchor=>:se)
diff --git a/ext/tk/sample/tkextlib/bwidget/dnd.rb b/ext/tk/sample/tkextlib/bwidget/dnd.rb
index b1b1cf60ff..1c8b036530 100644
--- a/ext/tk/sample/tkextlib/bwidget/dnd.rb
+++ b/ext/tk/sample/tkextlib/bwidget/dnd.rb
@@ -12,19 +12,19 @@ module DemoDnD
titf1 = Tk::BWidget::TitleFrame.new(frame, :text=>'Drag source')
subf = titf1.get_frame
- ent1 = Tk::BWidget::LabelEntry.new(subf, :label=>'Entry',
- :labelwidth=>14, :dragenabled=>true,
+ ent1 = Tk::BWidget::LabelEntry.new(subf, :label=>'Entry',
+ :labelwidth=>14, :dragenabled=>true,
:dragevent=>3)
- labf1 = Tk::BWidget::LabelFrame.new(subf, :text=>'Label (text)',
+ labf1 = Tk::BWidget::LabelFrame.new(subf, :text=>'Label (text)',
:width=>14)
f = labf1.get_frame
- lab = Tk::BWidget::Label.new(f, :text=>'Drag this text',
+ lab = Tk::BWidget::Label.new(f, :text=>'Drag this text',
:dragenabled=>true, :dragevent=>3).pack
- labf2 = Tk::BWidget::LabelFrame.new(subf, :text=>'Label (bitmap)',
+ labf2 = Tk::BWidget::LabelFrame.new(subf, :text=>'Label (bitmap)',
:width=>14)
f = labf2.get_frame
- lab = Tk::BWidget::Label.new(f, :bitmap=>'info',
+ lab = Tk::BWidget::Label.new(f, :bitmap=>'info',
:dragenabled=>true, :dragevent=>3).pack
Tk.pack(ent1, labf1, labf2, :side=>:top, :fill=>:x, :pady=>4)
@@ -32,11 +32,11 @@ module DemoDnD
titf2 = Tk::BWidget::TitleFrame.new(frame, :text=>'Drop targets')
subf = titf2.get_frame
- ent1 = Tk::BWidget::LabelEntry.new(subf, :label=>'Entry',
+ ent1 = Tk::BWidget::LabelEntry.new(subf, :label=>'Entry',
:labelwidth=>14, :dropenabled=>true)
labf1 = Tk::BWidget::LabelFrame.new(subf, :text=>'Label', :width=>14)
f = labf1.get_frame
- lab = Tk::BWidget::Label.new(f, :dropenabled=>true,
+ lab = Tk::BWidget::Label.new(f, :dropenabled=>true,
:highlightthickness=>1).pack(:fill=>:x)
Tk.pack(ent1, labf1, :side=>:top, :fill=>:x, :pady=>4)
Tk.pack(titf1, titf2, :pady=>4)
diff --git a/ext/tk/sample/tkextlib/bwidget/manager.rb b/ext/tk/sample/tkextlib/bwidget/manager.rb
index a59afb8b86..776cb3065b 100644
--- a/ext/tk/sample/tkextlib/bwidget/manager.rb
+++ b/ext/tk/sample/tkextlib/bwidget/manager.rb
@@ -32,19 +32,19 @@ module DemoManager
end
def self._mainframe(parent)
- labf1 = Tk::BWidget::LabelFrame.new(parent, :text=>'Toolbar',
- :side=>:top, :anchor=>:w,
+ labf1 = Tk::BWidget::LabelFrame.new(parent, :text=>'Toolbar',
+ :side=>:top, :anchor=>:w,
:relief=>:sunken, :borderwidth=>2)
subf = labf1.get_frame
- chk1 = TkCheckbutton.new(subf, :text=>'View toolbar 1',
- :variable=>DemoVar.toolbar1,
+ chk1 = TkCheckbutton.new(subf, :text=>'View toolbar 1',
+ :variable=>DemoVar.toolbar1,
:command=>proc{
DemoVar.mainframe.show_toolbar(
0, DemoVar.toolbar1.value
)
})
- chk2 = TkCheckbutton.new(subf, :text=>'View toolbar 2',
- :variable=>DemoVar.toolbar2,
+ chk2 = TkCheckbutton.new(subf, :text=>'View toolbar 2',
+ :variable=>DemoVar.toolbar2,
:command=>proc{
DemoVar.mainframe.show_toolbar(
1, DemoVar.toolbar2.value
@@ -54,12 +54,12 @@ module DemoManager
Tk.pack(chk1, chk2, :anchor=>:w, :fill=>:x)
labf1.pack(:fill=>:both)
- labf2 = Tk::BWidget::LabelFrame.new(parent, :text=>'Status bar',
- :side=>:top, :anchor=>:w,
+ labf2 = Tk::BWidget::LabelFrame.new(parent, :text=>'Status bar',
+ :side=>:top, :anchor=>:w,
:relief=>:sunken, :borderwidth=>2)
subf = labf2.get_frame
- chk1 = TkCheckbutton.new(subf, :text=>"Show Progress\nindicator",
- :justify=>:left, :variable=>@@progress,
+ chk1 = TkCheckbutton.new(subf, :text=>"Show Progress\nindicator",
+ :justify=>:left, :variable=>@@progress,
:command=>proc{ _show_progress })
chk1.pack(:anchor=>:w, :fill=>:x)
@@ -67,8 +67,8 @@ module DemoManager
end
def self._notebook(parent)
- TkCheckbutton.new(parent, :text=>'Homogeneous label',
- :variable=>@@homogeneous,
+ TkCheckbutton.new(parent, :text=>'Homogeneous label',
+ :variable=>@@homogeneous,
:command=>proc{
DemoVar.notebook[:homogeneous] = @@homogeneous.value
}).pack(:side=>:left, :anchor=>:n, :fill=>:x)
@@ -92,13 +92,13 @@ module DemoManager
sw.pack(:fill=>:both, :expand=>true)
}
- sw = Tk::BWidget::ScrolledWindow.new(pane3, :relief=>:sunken,
+ sw = Tk::BWidget::ScrolledWindow.new(pane3, :relief=>:sunken,
:borderwidth=>2)
sf = Tk::BWidget::ScrollableFrame.new(sw)
sw.set_widget(sf)
subf = sf.get_frame
lab = TkLabel.new(subf, :text=>'This is a ScrollableFrame')
- chk = TkCheckbutton.new(subf, :text=>'Constrained with',
+ chk = TkCheckbutton.new(subf, :text=>'Constrained with',
:variable=>@@constw, :command=>proc{
sf['constrainedwidth'] = @@constw.value
})
diff --git a/ext/tk/sample/tkextlib/bwidget/select.rb b/ext/tk/sample/tkextlib/bwidget/select.rb
index 3a1a810e14..ea24b47e2e 100644
--- a/ext/tk/sample/tkextlib/bwidget/select.rb
+++ b/ext/tk/sample/tkextlib/bwidget/select.rb
@@ -13,28 +13,28 @@ module DemoSelect
titf1 = Tk::BWidget::TitleFrame.new(frame, :text=>'SpinBox')
subf = titf1.get_frame
- spin = Tk::BWidget::SpinBox.new(subf, :range=>[1, 100, 1],
- :textvariable=>@@var.ref('spin', 'var'),
+ spin = Tk::BWidget::SpinBox.new(subf, :range=>[1, 100, 1],
+ :textvariable=>@@var.ref('spin', 'var'),
:helptext=>'This is the SpinBox')
- ent = Tk::BWidget::LabelEntry.new(subf, :label=>'Linked var',
- :labelwidth=>10, :labelanchor=>:w,
- :textvariable=>@@var.ref('spin', 'var'),
- :editable=>0,
+ ent = Tk::BWidget::LabelEntry.new(subf, :label=>'Linked var',
+ :labelwidth=>10, :labelanchor=>:w,
+ :textvariable=>@@var.ref('spin', 'var'),
+ :editable=>0,
:helptext=>"This is an Entry reflecting\nthe linked var of SpinBox")
- labf = Tk::BWidget::LabelFrame.new(subf, :text=>'Options',
- :side=>:top, :anchor=>:w,
- :relief=>:sunken, :borderwidth=>1,
+ labf = Tk::BWidget::LabelFrame.new(subf, :text=>'Options',
+ :side=>:top, :anchor=>:w,
+ :relief=>:sunken, :borderwidth=>1,
:helptext=>'Modify some options of SpinBox')
subf = labf.get_frame
- chk1 = TkCheckbutton.new(subf, :text=>'Non editable',
- :variable=>@@var.ref('spin', 'editable'),
- :onvalue=>false, :offvalue=>true,
+ chk1 = TkCheckbutton.new(subf, :text=>'Non editable',
+ :variable=>@@var.ref('spin', 'editable'),
+ :onvalue=>false, :offvalue=>true,
:command=>proc{
spin.editable(@@var['spin', 'editable'])
})
- chk2 = TkCheckbutton.new(subf, :text=>'Disabled',
- :variable=>@@var.ref('spin', 'state'),
- :onvalue=>'disabled', :offvalue=>'normal',
+ chk2 = TkCheckbutton.new(subf, :text=>'Disabled',
+ :variable=>@@var.ref('spin', 'state'),
+ :onvalue=>'disabled', :offvalue=>'normal',
:command=>proc{
spin.state(@@var['spin', 'state'])
})
@@ -47,28 +47,28 @@ module DemoSelect
combo = Tk::BWidget::ComboBox.new(subf,
:textvariable=>@@var.ref('combo', 'var'),
:values=>[
- 'first value', 'second value',
- 'third value', 'fourth value',
+ 'first value', 'second value',
+ 'third value', 'fourth value',
'fifth value'
- ],
+ ],
:helptext=>'This is the ComboBox')
- ent = Tk::BWidget::LabelEntry.new(subf, :label=>'Linked var',
- :labelwidth=>10, :labelanchor=>:w,
+ ent = Tk::BWidget::LabelEntry.new(subf, :label=>'Linked var',
+ :labelwidth=>10, :labelanchor=>:w,
:textvariable=>@@var.ref('combo', 'var'),
:editable=>0, :helptext=>"This is an Entry reflecting\nthe linked var of ComboBox")
- labf = Tk::BWidget::LabelFrame.new(subf, :text=>'Options', :side=>:top,
- :anchor=>:w, :relief=>:sunken,
+ labf = Tk::BWidget::LabelFrame.new(subf, :text=>'Options', :side=>:top,
+ :anchor=>:w, :relief=>:sunken,
:borderwidth=>1, :helptext=>'Modify some options of ComboBox')
subf = labf.get_frame
- chk1 = TkCheckbutton.new(subf, :text=>'Non editable',
- :variable=>@@var.ref('combo', 'editable'),
- :onvalue=>false, :offvalue=>true,
+ chk1 = TkCheckbutton.new(subf, :text=>'Non editable',
+ :variable=>@@var.ref('combo', 'editable'),
+ :onvalue=>false, :offvalue=>true,
:command=>proc{
combo.editable(@@var['combo', 'editable'])
})
- chk2 = TkCheckbutton.new(subf, :text=>'Disabled',
- :variable=>@@var.ref('combo', 'state'),
- :onvalue=>'disabled', :offvalue=>'normal',
+ chk2 = TkCheckbutton.new(subf, :text=>'Disabled',
+ :variable=>@@var.ref('combo', 'state'),
+ :onvalue=>'disabled', :offvalue=>'normal',
:command=>proc{
combo.state(@@var['combo', 'state'])
})
diff --git a/ext/tk/sample/tkextlib/bwidget/tmpldlg.rb b/ext/tk/sample/tkextlib/bwidget/tmpldlg.rb
index da2c9678c0..3d19c8d092 100644
--- a/ext/tk/sample/tkextlib/bwidget/tmpldlg.rb
+++ b/ext/tk/sample/tkextlib/bwidget/tmpldlg.rb
@@ -23,14 +23,14 @@ module DemoDialog
titf4 = Tk::BWidget::TitleFrame.new(frame, :text=>'Other dialog')
subf = titf1.get_frame
- cmd = proc{ TkOption.read_file(File.join(Tk::BWidget::LIBRARY, 'lang',
+ cmd = proc{ TkOption.read_file(File.join(Tk::BWidget::LIBRARY, 'lang',
@@resources.value + '.rc')) }
- Tk.pack(TkRadiobutton.new(subf, :text=>'English', :value=>'en',
- :variable=>@@resources, :command=>cmd),
- TkRadiobutton.new(subf, :text=>'French', :value=>'fr',
- :variable=>@@resources, :command=>cmd),
- TkRadiobutton.new(subf, :text=>'German', :value=>'de',
- :variable=>@@resources, :command=>cmd),
+ Tk.pack(TkRadiobutton.new(subf, :text=>'English', :value=>'en',
+ :variable=>@@resources, :command=>cmd),
+ TkRadiobutton.new(subf, :text=>'French', :value=>'fr',
+ :variable=>@@resources, :command=>cmd),
+ TkRadiobutton.new(subf, :text=>'German', :value=>'de',
+ :variable=>@@resources, :command=>cmd),
:side=>:left)
_tmpldlg(titf2.get_frame)
@@ -46,34 +46,34 @@ module DemoDialog
@@tmpl['side'] = :bottom
@@tmpl['anchor'] = :c
- labf1 = Tk::BWidget::LabelFrame.new(parent, :text=>'Button side',
- :side=>:top, :anchor=>:w,
+ labf1 = Tk::BWidget::LabelFrame.new(parent, :text=>'Button side',
+ :side=>:top, :anchor=>:w,
:relief=>:sunken, :borderwidth=>1)
subf = labf1.get_frame
- Tk.pack(TkRadiobutton.new(subf, :text=>'Bottom', :value=>:bottom,
- :variable=>@@tmpl.ref('side'), :anchor=>:w),
- TkRadiobutton.new(subf, :text=>'Left', :value=>:left,
- :variable=>@@tmpl.ref('side'), :anchor=>:w),
- TkRadiobutton.new(subf, :text=>'Right', :value=>:right,
- :variable=>@@tmpl.ref('side'), :anchor=>:w),
- TkRadiobutton.new(subf, :text=>'Top', :value=>:top,
- :variable=>@@tmpl.ref('side'), :anchor=>:w),
+ Tk.pack(TkRadiobutton.new(subf, :text=>'Bottom', :value=>:bottom,
+ :variable=>@@tmpl.ref('side'), :anchor=>:w),
+ TkRadiobutton.new(subf, :text=>'Left', :value=>:left,
+ :variable=>@@tmpl.ref('side'), :anchor=>:w),
+ TkRadiobutton.new(subf, :text=>'Right', :value=>:right,
+ :variable=>@@tmpl.ref('side'), :anchor=>:w),
+ TkRadiobutton.new(subf, :text=>'Top', :value=>:top,
+ :variable=>@@tmpl.ref('side'), :anchor=>:w),
:fill=>:x, :anchor=>:w)
- labf2 = Tk::BWidget::LabelFrame.new(parent, :text=>'Button anchor',
- :side=>:top, :anchor=>:w,
+ labf2 = Tk::BWidget::LabelFrame.new(parent, :text=>'Button anchor',
+ :side=>:top, :anchor=>:w,
:relief=>:sunken, :borderwidth=>1)
subf = labf2.get_frame
- Tk.pack(TkRadiobutton.new(subf, :text=>'North', :value=>:n,
- :variable=>@@tmpl.ref('anchor'), :anchor=>:w),
- TkRadiobutton.new(subf, :text=>'West', :value=>:w,
- :variable=>@@tmpl.ref('anchor'), :anchor=>:w),
- TkRadiobutton.new(subf, :text=>'East', :value=>:e,
- :variable=>@@tmpl.ref('anchor'), :anchor=>:w),
- TkRadiobutton.new(subf, :text=>'South', :value=>:s,
- :variable=>@@tmpl.ref('anchor'), :anchor=>:w),
- TkRadiobutton.new(subf, :text=>'Center', :value=>:c,
- :variable=>@@tmpl.ref('anchor'), :anchor=>:w),
+ Tk.pack(TkRadiobutton.new(subf, :text=>'North', :value=>:n,
+ :variable=>@@tmpl.ref('anchor'), :anchor=>:w),
+ TkRadiobutton.new(subf, :text=>'West', :value=>:w,
+ :variable=>@@tmpl.ref('anchor'), :anchor=>:w),
+ TkRadiobutton.new(subf, :text=>'East', :value=>:e,
+ :variable=>@@tmpl.ref('anchor'), :anchor=>:w),
+ TkRadiobutton.new(subf, :text=>'South', :value=>:s,
+ :variable=>@@tmpl.ref('anchor'), :anchor=>:w),
+ TkRadiobutton.new(subf, :text=>'Center', :value=>:c,
+ :variable=>@@tmpl.ref('anchor'), :anchor=>:w),
:fill=>:x, :anchor=>:w)
sep = Tk::BWidget::Separator.new(parent, :orient=>:horizontal)
@@ -88,44 +88,44 @@ module DemoDialog
@@msg['type'] = 'ok'
@@msg['icon'] = 'info'
- labf1 = Tk::BWidget::LabelFrame.new(parent, :text=>'Type', :side=>:top,
- :anchor=>:w, :relief=>:sunken,
+ labf1 = Tk::BWidget::LabelFrame.new(parent, :text=>'Type', :side=>:top,
+ :anchor=>:w, :relief=>:sunken,
:borderwidth=>1)
subf = labf1.get_frame
- Tk.pack(TkRadiobutton.new(subf, :text=>'Ok', :value=>'ok',
- :variable=>@@msg.ref('type'), :anchor=>:w),
- TkRadiobutton.new(subf, :text=>'Ok, Cancel', :value=>'okcancel',
- :variable=>@@msg.ref('type'), :anchor=>:w),
- TkRadiobutton.new(subf, :text=>'Retry, Cancel',
- :value=>'retrycancel',
- :variable=>@@msg.ref('type'), :anchor=>:w),
- TkRadiobutton.new(subf, :text=>'Yes, No', :value=>'yesno',
- :variable=>@@msg.ref('type'), :anchor=>:w),
- TkRadiobutton.new(subf, :text=>'Yes, No, Cancel',
- :value=>'yesnocancel',
- :variable=>@@msg.ref('type'), :anchor=>:w),
- TkRadiobutton.new(subf, :text=>'Abort, Retry, Ignore',
- :value=>'abortretryignore',
- :variable=>@@msg.ref('type'), :anchor=>:w),
+ Tk.pack(TkRadiobutton.new(subf, :text=>'Ok', :value=>'ok',
+ :variable=>@@msg.ref('type'), :anchor=>:w),
+ TkRadiobutton.new(subf, :text=>'Ok, Cancel', :value=>'okcancel',
+ :variable=>@@msg.ref('type'), :anchor=>:w),
+ TkRadiobutton.new(subf, :text=>'Retry, Cancel',
+ :value=>'retrycancel',
+ :variable=>@@msg.ref('type'), :anchor=>:w),
+ TkRadiobutton.new(subf, :text=>'Yes, No', :value=>'yesno',
+ :variable=>@@msg.ref('type'), :anchor=>:w),
+ TkRadiobutton.new(subf, :text=>'Yes, No, Cancel',
+ :value=>'yesnocancel',
+ :variable=>@@msg.ref('type'), :anchor=>:w),
+ TkRadiobutton.new(subf, :text=>'Abort, Retry, Ignore',
+ :value=>'abortretryignore',
+ :variable=>@@msg.ref('type'), :anchor=>:w),
:fill=>:x, :anchor=>:w)
- Tk.pack(TkRadiobutton.new(subf, :text=>'User', :value=>'user',
- :variable=>@@msg.ref('type'), :anchor=>:w),
+ Tk.pack(TkRadiobutton.new(subf, :text=>'User', :value=>'user',
+ :variable=>@@msg.ref('type'), :anchor=>:w),
Tk::BWidget::Entry.new(subf, :textvariable=>@@msg.ref('buttons')),
:side=>:left)
- labf2 = Tk::BWidget::LabelFrame.new(parent, :text=>'Icon', :side=>:top,
- :anchor=>:w, :relief=>:sunken,
+ labf2 = Tk::BWidget::LabelFrame.new(parent, :text=>'Icon', :side=>:top,
+ :anchor=>:w, :relief=>:sunken,
:borderwidth=>1)
subf = labf2.get_frame
- Tk.pack(TkRadiobutton.new(subf, :text=>'Information', :value=>'info',
- :variable=>@@msg.ref('icon'), :anchor=>:w),
- TkRadiobutton.new(subf, :text=>'Question', :value=>'question',
- :variable=>@@msg.ref('icon'), :anchor=>:w),
- TkRadiobutton.new(subf, :text=>'Warning', :value=>'warning',
- :variable=>@@msg.ref('icon'), :anchor=>:w),
- TkRadiobutton.new(subf, :text=>'Error', :value=>'error',
- :variable=>@@msg.ref('icon'), :anchor=>:w),
+ Tk.pack(TkRadiobutton.new(subf, :text=>'Information', :value=>'info',
+ :variable=>@@msg.ref('icon'), :anchor=>:w),
+ TkRadiobutton.new(subf, :text=>'Question', :value=>'question',
+ :variable=>@@msg.ref('icon'), :anchor=>:w),
+ TkRadiobutton.new(subf, :text=>'Warning', :value=>'warning',
+ :variable=>@@msg.ref('icon'), :anchor=>:w),
+ TkRadiobutton.new(subf, :text=>'Error', :value=>'error',
+ :variable=>@@msg.ref('icon'), :anchor=>:w),
:fill=>:x, :anchor=>:w)
sep = Tk::BWidget::Separator.new(parent, :orient=>:horizontal)
@@ -139,13 +139,13 @@ module DemoDialog
def self._stddlg(parent)
Tk.pack(TkButton.new(parent, :text=>'Select a color '){|w|
command(proc{DemoDialog._show_color(w)})
- },
- TkButton.new(parent, :text=>'Font selector dialog',
- :command=>proc{_show_fontdlg}),
- TkButton.new(parent, :text=>'Progression dialog',
- :command=>proc{_show_progdlg}),
- TkButton.new(parent, :text=>'Password dialog',
- :command=>proc{_show_passdlg}),
+ },
+ TkButton.new(parent, :text=>'Font selector dialog',
+ :command=>proc{_show_fontdlg}),
+ TkButton.new(parent, :text=>'Progression dialog',
+ :command=>proc{_show_progdlg}),
+ TkButton.new(parent, :text=>'Password dialog',
+ :command=>proc{_show_passdlg}),
:side=>:left, :padx=>5, :anchor=>:w)
end
@@ -158,15 +158,15 @@ module DemoDialog
end
def self._show_tmpldlg
- dlg = Tk::BWidget::Dialog.new(:relative=>Tk.root, :modal=>:local,
- :separator=>true, :title=>'Template dialog',
- :side=>@@tmpl['side'],
- :anchor=>@@tmpl['anchor'],
+ dlg = Tk::BWidget::Dialog.new(:relative=>Tk.root, :modal=>:local,
+ :separator=>true, :title=>'Template dialog',
+ :side=>@@tmpl['side'],
+ :anchor=>@@tmpl['anchor'],
:default=>0, :cancel=>1)
dlg.add('name'=>'ok')
dlg.add('name'=>'cancel')
- TkMessage.new(dlg.get_frame, :text=>"Template\nDialog", :justify=>:center,
- :anchor=>:c, :width=>80).pack(:fill=>:both, :expand=>true,
+ TkMessage.new(dlg.get_frame, :text=>"Template\nDialog", :justify=>:center,
+ :anchor=>:c, :width=>80).pack(:fill=>:both, :expand=>true,
:padx=>100, :pady=>100)
dlg.draw
dlg.destroy
@@ -174,16 +174,16 @@ module DemoDialog
def self._show_msgdlg
@@msgdlg.destroy if @@msgdlg
- @@msgdlg = Tk::BWidget::MessageDlg.new(:relative=>Tk.root,
- :message=>'Message for MessageBox',
- :type=>@@msg['type'],
- :icon=>@@msg['icon'],
+ @@msgdlg = Tk::BWidget::MessageDlg.new(:relative=>Tk.root,
+ :message=>'Message for MessageBox',
+ :type=>@@msg['type'],
+ :icon=>@@msg['icon'],
:buttons=>@@msg['buttons'])
@@msgdlg.create
end
def self._show_fontdlg
- font = Tk::BWidget::SelectFont.new(:relative=>Tk.root,
+ font = Tk::BWidget::SelectFont.new(:relative=>Tk.root,
:font=>DemoVar.font).create
DemoVar::Demo.update_font(font)
end
@@ -192,11 +192,11 @@ module DemoDialog
@@progmsg.value = "Compute in progress..."
@@progval.value = 0
- @@progdlg = Tk::BWidget::ProgressDlg.new(:relative=>Tk.root,
- :title=>'Wait...',
- :type=>'infinite', :width=>20,
- :textvariable=>@@progmsg,
- :variable=>@@progval,
+ @@progdlg = Tk::BWidget::ProgressDlg.new(:relative=>Tk.root,
+ :title=>'Wait...',
+ :type=>'infinite', :width=>20,
+ :textvariable=>@@progmsg,
+ :variable=>@@progval,
:stop=>'Stop') {
command(proc{self.destroy})
create
diff --git a/ext/tk/sample/tkextlib/bwidget/tree.rb b/ext/tk/sample/tkextlib/bwidget/tree.rb
index 9ef6569d16..e1fcaa774f 100644
--- a/ext/tk/sample/tkextlib/bwidget/tree.rb
+++ b/ext/tk/sample/tkextlib/bwidget/tree.rb
@@ -16,28 +16,28 @@ module DemoTree
pane = pw.add(:weight=>1)
title = Tk::BWidget::TitleFrame.new(pane, :text=>'Directory tree')
- sw = Tk::BWidget::ScrolledWindow.new(title.get_frame,
+ sw = Tk::BWidget::ScrolledWindow.new(title.get_frame,
:relief=>:sunken, :borderwidth=>2)
- tree = Tk::BWidget::Tree.new(sw, :relief=>:flat, :borderwidth=>0,
- :width=>15, :highlightthickness=>0,
- :redraw=>false, :dropenabled=>true,
- :dragenabled=>true, :dragevent=>3,
+ tree = Tk::BWidget::Tree.new(sw, :relief=>:flat, :borderwidth=>0,
+ :width=>15, :highlightthickness=>0,
+ :redraw=>false, :dropenabled=>true,
+ :dragenabled=>true, :dragevent=>3,
:droptypes=>[
'TREE_NODE', [
- :copy, [],
+ :copy, [],
:move, [],
:link, []
- ],
+ ],
'LISTBOX_ITEM', [
- :copy, [],
+ :copy, [],
:move, [],
:link, []
]
- ],
- :opencmd=>proc{|node|
+ ],
+ :opencmd=>proc{|node|
moddir(1, tree, node)
- },
- :closecmd=>proc{|node|
+ },
+ :closecmd=>proc{|node|
moddir(0, tree, node)
})
sw.set_widget(tree)
@@ -47,24 +47,24 @@ module DemoTree
pane = pw.add(:weight=>2)
lf = Tk::BWidget::TitleFrame.new(pane, :text=>'Content')
- sw = Tk::BWidget::ScrolledWindow.new(lf.get_frame,
- :scrollbar=>:horizontal,
- :auto=>:none, :relief=>:sunken,
+ sw = Tk::BWidget::ScrolledWindow.new(lf.get_frame,
+ :scrollbar=>:horizontal,
+ :auto=>:none, :relief=>:sunken,
:borderwidth=>2)
- list = Tk::BWidget::ListBox.new(sw, :relief=>:flat, :borderwidth=>0,
- :highlightthickness=>0, :width=>20,
- :multicolumn=>true, :redraw=>false,
- :dragevent=>3, :dropenabled=>true,
- :dragenabled=>true,
+ list = Tk::BWidget::ListBox.new(sw, :relief=>:flat, :borderwidth=>0,
+ :highlightthickness=>0, :width=>20,
+ :multicolumn=>true, :redraw=>false,
+ :dragevent=>3, :dropenabled=>true,
+ :dragenabled=>true,
:droptypes=>[
'TREE_NODE', [
- :copy, [],
+ :copy, [],
:move, [],
:link, []
- ],
+ ],
'LISTBOX_ITEM', [
- :copy, [],
+ :copy, [],
:move, [],
:link, []
]
@@ -77,43 +77,43 @@ module DemoTree
tree.textbind('ButtonPress-1',
proc{|node, ev| select('tree', 1, tree, list, node)})
- tree.textbind('Double-ButtonPress-1',
+ tree.textbind('Double-ButtonPress-1',
proc{|node, ev| select('tree', 2, tree, list, node)})
list.textbind('ButtonPress-1',
proc{|node, ev| select('list', 1, tree, list, node)})
- list.textbind('Double-ButtonPress-1',
+ list.textbind('Double-ButtonPress-1',
proc{|node, ev| select('list', 2, tree, list, node)})
- list.imagebind('Double-ButtonPress-1',
+ list.imagebind('Double-ButtonPress-1',
proc{|node, ev| select('list', 2, tree, list, node)})
- nb.itemconfigure('demoTree',
- :createcmd=>proc{|*args| init(tree, list, *args)},
+ nb.itemconfigure('demoTree',
+ :createcmd=>proc{|*args| init(tree, list, *args)},
:raisecmd=>proc{
- Tk.root.geometry =~
+ Tk.root.geometry =~
/\d+x\d+([+-]{1,2}\d+)([+-]{1,2}\d+)/
global_w = ($1 || 0).to_i
global_h = ($2 || 0).to_i
if @@top
- Tk::BWidget.place(@@top, 0, 0, :at,
+ Tk::BWidget.place(@@top, 0, 0, :at,
global_w - Tk.root.winfo_screenwidth, global_h)
@@top.deiconify
Tk.root.bind('Unmap', proc{@@top.withdraw})
Tk.root.bind('Map', proc{@@top.deiconify})
Tk.root.bind('Configure', proc{|w|
if w == Tk.root
- Tk.root.geometry =~
+ Tk.root.geometry =~
/\d+x\d+([+-]{1,2}\d+)([+-]{1,2}\d+)/
global_w = ($1 || 0).to_i
global_h = ($2 || 0).to_i
- Tk::BWidget.place(@@top, 0, 0, :at,
- global_w - Tk.root.winfo_screenwidth,
+ Tk::BWidget.place(@@top, 0, 0, :at,
+ global_w - Tk.root.winfo_screenwidth,
global_h)
end
}, '%W')
end
- },
+ },
:leavecmd=>proc{
@@top.withdraw if @@top
Tk.root.bind_remove('Unmap')
@@ -131,8 +131,8 @@ module DemoTree
rootdir = 'c:'
end
- tree.insert('end', 'root', 'home',
- :text=>rootdir, :data=>rootdir, :open=>true,
+ tree.insert('end', 'root', 'home',
+ :text=>rootdir, :data=>rootdir, :open=>true,
:image=>Tk::BWidget::Bitmap.new('openfold'))
getdir(tree, 'home', rootdir)
select('tree', 1, tree, list, 'home')
@@ -147,8 +147,8 @@ module DemoTree
@@top.resizable(false, false)
@@top.title('Drag rectangle to scroll directory tree')
@@top.transient(Tk.root)
- Tk::BWidget::ScrollView.new(@@top, :window=>tree, :fill=>'white',
- :width=>300, :height=>300, :relief=>:sunken,
+ Tk::BWidget::ScrollView.new(@@top, :window=>tree, :fill=>'white',
+ :width=>300, :height=>300, :relief=>:sunken,
:bd=>1).pack(:fill=>:both, :expand=>true)
end
@@ -156,11 +156,11 @@ module DemoTree
lentries = Dir.glob(File.join(path, '*')).sort
lfiles = []
lentries.each{|f|
- basename = File.basename(f)
+ basename = File.basename(f)
if File.directory?(f)
- Tk::BWidget::Tree::Node.new(tree, node,
- :index=>'end', :text=>basename,
- :image=>Tk::BWidget::Bitmap.new('folder'),
+ Tk::BWidget::Tree::Node.new(tree, node,
+ :index=>'end', :text=>basename,
+ :image=>Tk::BWidget::Bitmap.new('folder'),
:drawcross=>:allways, :data=>f)
@@count += 1
else
@@ -187,7 +187,7 @@ module DemoTree
def self.select(where, num, tree, list, node)
@@dblclick = true
if num == 1
- if (where == 'tree' &&
+ if (where == 'tree' &&
tree.selection_get.find{|x|
TkUtil._get_eval_string(x) == TkUtil._get_eval_string(node)
})
@@ -195,7 +195,7 @@ module DemoTree
Tk.after(500, proc{edit('tree', tree, list, node)})
return
end
- if (where == 'list' &&
+ if (where == 'list' &&
list.selection_get.find{|x|
TkUtil._get_eval_string(x) == TkUtil._get_eval_string(node)
})
@@ -230,13 +230,13 @@ module DemoTree
end
tree.nodes(node).each{|subnode|
- list.insert('end', subnode,
- :text=>tree.itemcget(subnode, :text),
+ list.insert('end', subnode,
+ :text=>tree.itemcget(subnode, :text),
:image=>Tk::BWidget::Bitmap.new('folder'))
}
TkComm.simplelist(dir).each{|f|
- Tk::BWidget::ListBox::Item.new(list, 'end', :text=>f,
+ Tk::BWidget::ListBox::Item.new(list, 'end', :text=>f,
:image=>Tk::BWidget::Bitmap.new('file'))
}
end
@@ -244,7 +244,7 @@ module DemoTree
def self.edit(where, tree, list, node)
return if @@dblclick
- if (where == 'tree' &&
+ if (where == 'tree' &&
tree.selection_get.find{|x|
TkUtil._get_eval_string(x) == TkUtil._get_eval_string(node)
})
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/calendar.rb b/ext/tk/sample/tkextlib/iwidgets/sample/calendar.rb
index bb09b4dfd3..4dd929c035 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/calendar.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/calendar.rb
@@ -2,9 +2,9 @@
require 'tk'
require 'tkextlib/iwidgets'
-Tk::Iwidgets::Calendar.new(:command=>proc{|arg| puts(arg.date)},
- :weekendbackground=>'mistyrose',
- :weekdaybackground=>'ghostwhite',
- :outline=>'black', :startday=>'wednesday',
+Tk::Iwidgets::Calendar.new(:command=>proc{|arg| puts(arg.date)},
+ :weekendbackground=>'mistyrose',
+ :weekdaybackground=>'ghostwhite',
+ :outline=>'black', :startday=>'wednesday',
:days=>%w(We Th Fr Sa Su Mo Tu)).pack
Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/combobox.rb b/ext/tk/sample/tkextlib/iwidgets/sample/combobox.rb
index 36847538d6..ec9c7a1df3 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/combobox.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/combobox.rb
@@ -5,11 +5,11 @@ require 'tkextlib/iwidgets'
#
# Non-editable Dropdown Combobox
#
-cb1 = Tk::Iwidgets::Combobox.new(:labeltext=>'Month:',
+cb1 = Tk::Iwidgets::Combobox.new(:labeltext=>'Month:',
:selectioncommand=>proc{
puts(cb1.get_curselection)
- },
- :editable=>false, :listheight=>185,
+ },
+ :editable=>false, :listheight=>185,
:popupcursor=>'hand1')
cb1.insert_list('end', *%w(Jan Feb Mar Apr May June Jul Aug Sept Oct Nov Dec))
@@ -18,7 +18,7 @@ cb1.insert_list('end', *%w(Jan Feb Mar Apr May June Jul Aug Sept Oct Nov Dec))
#
# Editable Dropdown Combobox
#
-cb2 = Tk::Iwidgets::Combobox.new(:labeltext=>'Operating System:',
+cb2 = Tk::Iwidgets::Combobox.new(:labeltext=>'Operating System:',
:selectioncommand=>proc{
puts(cb2.get_curselection)
})
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/dialogshell.rb b/ext/tk/sample/tkextlib/iwidgets/sample/dialogshell.rb
index 00ee99786c..197521e0a4 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/dialogshell.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/dialogshell.rb
@@ -8,7 +8,7 @@ ds.add('OK', :text=>'OK', :command=>proc{puts 'OK'; ds.deactivate})
ds.add('Cancel', :text=>'Cancel', :command=>proc{puts 'Cancel'; ds.deactivate})
ds.default('OK')
-TkButton.new(:text=>'ACTIVATE', :padx=>7, :pady=>7,
+TkButton.new(:text=>'ACTIVATE', :padx=>7, :pady=>7,
:command=>proc{puts ds.activate}).pack(:padx=>10, :pady=>10)
Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/disjointlistbox.rb b/ext/tk/sample/tkextlib/iwidgets/sample/disjointlistbox.rb
index 682c853e47..85c5d03d17 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/disjointlistbox.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/disjointlistbox.rb
@@ -2,7 +2,7 @@
require 'tk'
require 'tkextlib/iwidgets'
-djl = Tk::Iwidgets::Disjointlistbox.new.pack(:fill=>:both, :expand=>true,
+djl = Tk::Iwidgets::Disjointlistbox.new.pack(:fill=>:both, :expand=>true,
:padx=>10, :pady=>10)
djl.set_lhs(*[0,2,4,5])
djl.set_rhs(3,6)
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/entryfield-1.rb b/ext/tk/sample/tkextlib/iwidgets/sample/entryfield-1.rb
index 8563a0894d..856d883a92 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/entryfield-1.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/entryfield-1.rb
@@ -11,20 +11,20 @@ TkOption.add('*textBackground', 'white')
ef = Tk::Iwidgets::Entryfield.new(:command=>proc{puts "Return Pressed"})
-fef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Fixed:',
+fef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Fixed:',
:fixed=>10, :width=>12)
-nef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Numeric:',
+nef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Numeric:',
:validate=>:numeric, :width=>12)
-aef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Alphabetic:',
- :validate=>:alphabetic, :width=>12,
+aef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Alphabetic:',
+ :validate=>:alphabetic, :width=>12,
:invalid=>proc{
puts "Alphabetic contents invalid"
})
-pef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Password:', :width=>12,
- :show=>Tk::UTF8_String("\267"),
+pef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Password:', :width=>12,
+ :show=>Tk::UTF8_String("\267"),
## <=== utf8 character
:command=>proc{puts "Return Pressed"})
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/entryfield-2.rb b/ext/tk/sample/tkextlib/iwidgets/sample/entryfield-2.rb
index d8ccdf8555..4a4c2e7eb7 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/entryfield-2.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/entryfield-2.rb
@@ -4,11 +4,7 @@
# set $KCODE to 'utf' for a utf8 charecter
#
#########################################################
-unless defined?(::Encoding.default_external)
- $KCODE='utf'
-else
- DEFAULT_TK_ENCODING = 'UTF-8'
-end
+$KCODE='utf'
require 'tk'
require 'tkextlib/iwidgets'
@@ -17,19 +13,19 @@ TkOption.add('*textBackground', 'white')
ef = Tk::Iwidgets::Entryfield.new(:command=>proc{puts "Return Pressed"})
-fef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Fixed:',
+fef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Fixed:',
:fixed=>10, :width=>12)
-nef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Numeric:',
+nef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Numeric:',
:validate=>:numeric, :width=>12)
-aef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Alphabetic:',
- :validate=>:alphabetic, :width=>12,
+aef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Alphabetic:',
+ :validate=>:alphabetic, :width=>12,
:invalid=>proc{
puts "Alphabetic contents invalid"
})
-pef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Password:', :width=>12,
+pef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Password:', :width=>12,
:show=>"\267", ## <=== utf8 character
:command=>proc{puts "Return Pressed"})
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/entryfield-3.rb b/ext/tk/sample/tkextlib/iwidgets/sample/entryfield-3.rb
index 327f90893c..bddd542f64 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/entryfield-3.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/entryfield-3.rb
@@ -13,19 +13,19 @@ TkOption.add('*textBackground', 'white')
ef = Tk::Iwidgets::Entryfield.new(:command=>proc{puts "Return Pressed"})
-fef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Fixed:',
+fef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Fixed:',
:fixed=>10, :width=>12)
-nef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Numeric:',
+nef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Numeric:',
:validate=>:numeric, :width=>12)
-aef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Alphabetic:',
- :validate=>:alphabetic, :width=>12,
+aef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Alphabetic:',
+ :validate=>:alphabetic, :width=>12,
:invalid=>proc{
puts "Alphabetic contents invalid"
})
-pef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Password:', :width=>12,
+pef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Password:', :width=>12,
:show=>"\267", ## <=== utf8 character
:command=>proc{puts "Return Pressed"})
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/extbutton.rb b/ext/tk/sample/tkextlib/iwidgets/sample/extbutton.rb
index 4944c72ea5..6971052b60 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/extbutton.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/extbutton.rb
@@ -2,9 +2,9 @@
require 'tk'
require 'tkextlib/iwidgets'
-Tk::Iwidgets::Extbutton.new(:text=>'Bitmap example', :bitmap=>'info',
- :background=>'bisque', :activeforeground=>'red',
- :bitmapforeground=>'blue', :defaultring=>true,
+Tk::Iwidgets::Extbutton.new(:text=>'Bitmap example', :bitmap=>'info',
+ :background=>'bisque', :activeforeground=>'red',
+ :bitmapforeground=>'blue', :defaultring=>true,
:command=>proc{
puts "Bisque is beautiful"
}).pack(:expand=>true)
@@ -12,9 +12,9 @@ Tk::Iwidgets::Extbutton.new(:text=>'Bitmap example', :bitmap=>'info',
#img = TkPhotoImage.new(:file=>File.join(File.dirname(File.expand_path(__FILE__)), '../../../images/earthris.gif'))
img = TkPhotoImage.new(:file=>File.join(File.dirname(File.expand_path(__FILE__)), '../catalog_demo/images/clear.gif'))
-Tk::Iwidgets::Extbutton.new(:text=>'Image example', :relief=>:ridge,
- :image=>img, :imagepos=>:e, :font=>'9x15bold',
- :activebackground=>'lightyellow',
+Tk::Iwidgets::Extbutton.new(:text=>'Image example', :relief=>:ridge,
+ :image=>img, :imagepos=>:e, :font=>'9x15bold',
+ :activebackground=>'lightyellow',
:background=>'lightgreen').pack(:expand=>true)
Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/extfileselectionbox.rb b/ext/tk/sample/tkextlib/iwidgets/sample/extfileselectionbox.rb
index 63e4be2fee..4738084d9d 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/extfileselectionbox.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/extfileselectionbox.rb
@@ -2,7 +2,7 @@
require 'tk'
require 'tkextlib/iwidgets'
-Tk::Iwidgets::Extfileselectionbox.new.pack(:padx=>10, :pady=>10,
+Tk::Iwidgets::Extfileselectionbox.new.pack(:padx=>10, :pady=>10,
:fill=>:both, :expand=>true)
Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/fileselectionbox.rb b/ext/tk/sample/tkextlib/iwidgets/sample/fileselectionbox.rb
index 3a5b513bde..2ad3adb974 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/fileselectionbox.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/fileselectionbox.rb
@@ -2,7 +2,7 @@
require 'tk'
require 'tkextlib/iwidgets'
-Tk::Iwidgets::Fileselectionbox.new.pack(:padx=>10, :pady=>10,
+Tk::Iwidgets::Fileselectionbox.new.pack(:padx=>10, :pady=>10,
:fill=>:both, :expand=>true)
Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/hierarchy.rb b/ext/tk/sample/tkextlib/iwidgets/sample/hierarchy.rb
index 085070e652..ddb08d8b78 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/hierarchy.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/hierarchy.rb
@@ -10,16 +10,16 @@ def get_files(file)
}
end
-Tk::Iwidgets::Hierarchy.new(:querycommand=>proc{|arg| get_files(arg.node)},
- :visibleitems=>'30x15',
- :labeltext=>ENV['HOME']).pack(:side=>:left,
- :expand=>true,
+Tk::Iwidgets::Hierarchy.new(:querycommand=>proc{|arg| get_files(arg.node)},
+ :visibleitems=>'30x15',
+ :labeltext=>ENV['HOME']).pack(:side=>:left,
+ :expand=>true,
:fill=>:both)
-# Tk::Iwidgets::Hierarchy.new(:querycommand=>[proc{|n| get_files(n)}, '%n'],
-# :visibleitems=>'30x15',
-# :labeltext=>ENV['HOME']).pack(:side=>:left,
-# :expand=>true,
+# Tk::Iwidgets::Hierarchy.new(:querycommand=>[proc{|n| get_files(n)}, '%n'],
+# :visibleitems=>'30x15',
+# :labeltext=>ENV['HOME']).pack(:side=>:left,
+# :expand=>true,
# :fill=>:both)
Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/labeledwidget.rb b/ext/tk/sample/tkextlib/iwidgets/sample/labeledwidget.rb
index 577550af55..1d2e0a98a3 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/labeledwidget.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/labeledwidget.rb
@@ -2,11 +2,11 @@
require 'tk'
require 'tkextlib/iwidgets'
-lw = Tk::Iwidgets::Labeledwidget.new(:labeltext=>'Canvas Widget',
+lw = Tk::Iwidgets::Labeledwidget.new(:labeltext=>'Canvas Widget',
:labelpos=>:s)
lw.pack(:fill=>:both, :expand=>true, :padx=>10, :pady=>10)
-cw = TkCanvas.new(lw.child_site, :relief=>:raised, :width=>200, :height=>200,
+cw = TkCanvas.new(lw.child_site, :relief=>:raised, :width=>200, :height=>200,
:borderwidth=>3, :background=>:white)
cw.pack(:padx=>10, :pady=>10)
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/mainwindow.rb b/ext/tk/sample/tkextlib/iwidgets/sample/mainwindow.rb
index c9677f2270..b87a6d27f9 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/mainwindow.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/mainwindow.rb
@@ -4,55 +4,55 @@ require 'tkextlib/iwidgets'
mw = Tk::Iwidgets::Mainwindow.new
-mw.menubar.add(:menubutton, 'file', :text=>'File', :underline=>0,
+mw.menubar.add(:menubutton, 'file', :text=>'File', :underline=>0,
:padx=>8, :pady=>2, :menu=>[
- [:options, {:tearoff=>false}],
+ [:options, {:tearoff=>false}],
[:command, 'new', {
- :label=>'New', :underline=>0,
+ :label=>'New', :underline=>0,
:helpstr=>'Create a new file'
}
- ],
+ ],
[:command, 'open', {
- :label=>'Open ...', :underline=>0,
+ :label=>'Open ...', :underline=>0,
:helpstr=>'Open an existing file'
}
- ],
+ ],
[:command, 'save', {
- :label=>'Save', :underline=>0,
+ :label=>'Save', :underline=>0,
:helpstr=>'Save the current file'
}
- ],
+ ],
[:command, 'saveas', {
- :label=>'Save As', :underline=>5,
+ :label=>'Save As', :underline=>5,
:helpstr=>'Save the file as a different name'
}
- ],
+ ],
[:command, 'print', {
- :label=>'Print', :underline=>0,
+ :label=>'Print', :underline=>0,
:helpstr=>'Print the file'
}
- ],
+ ],
- [:separator, 'sep1'],
+ [:separator, 'sep1'],
[:command, 'close', {
- :label=>'Close', :underline=>0,
+ :label=>'Close', :underline=>0,
:helpstr=>'Close the file'
}
- ],
+ ],
- [:separator, 'sep2'],
+ [:separator, 'sep2'],
[:command, 'exit', {
- :label=>'Exit', :underline=>1,
+ :label=>'Exit', :underline=>1,
:helpstr=>'Exit this application'
}
- ],
+ ],
nil
])
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/menubar.rb b/ext/tk/sample/tkextlib/iwidgets/sample/menubar.rb
index e01275217d..891761adc1 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/menubar.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/menubar.rb
@@ -8,96 +8,96 @@ viewmode = TkVariable.new
menu_spec = [
[:menubutton, 'file', {
:text=>'File', :menu=>[
- [:options, {:tearoff=>false}],
+ [:options, {:tearoff=>false}],
[:command, 'new', {
- :label=>'New', :helpstr=>'Open new document',
+ :label=>'New', :helpstr=>'Open new document',
:command=>proc{puts 'NEW'}
}
- ],
+ ],
[:command, 'close', {
- :label=>'Close', :helpstr=>'Close current document',
+ :label=>'Close', :helpstr=>'Close current document',
:command=>proc{puts 'CLOSE'}
}
- ],
+ ],
- [:separator, 'sep1'],
+ [:separator, 'sep1'],
[:command, 'exit', {
- :label=>'Exit', :helpstr=>'Exit application',
+ :label=>'Exit', :helpstr=>'Exit application',
:command=>proc{exit}
}
]
]
}
- ],
+ ],
[:menubutton, 'edit', {
:text=>'Edit', :menu=>[
- [:options, {:tearoff=>false}],
+ [:options, {:tearoff=>false}],
[:command, 'undo', {
- :label=>'Undo', :underline=>0,
- :helpstr=>'Undo last command',
+ :label=>'Undo', :underline=>0,
+ :helpstr=>'Undo last command',
:command=>proc{puts 'UNDO'}
}
- ],
+ ],
- [:separator, 'sep2'],
+ [:separator, 'sep2'],
[:command, 'cut', {
- :label=>'Cut', :underline=>1,
- :helpstr=>'Cut selection to clipboard',
+ :label=>'Cut', :underline=>1,
+ :helpstr=>'Cut selection to clipboard',
:command=>proc{puts 'CUT'}
}
- ],
+ ],
[:command, 'copy', {
- :label=>'Copy', :underline=>1,
- :helpstr=>'Copy selection to clipboard',
+ :label=>'Copy', :underline=>1,
+ :helpstr=>'Copy selection to clipboard',
:command=>proc{puts 'COPY'}
}
- ],
+ ],
[:command, 'paste', {
- :label=>'Paste', :underline=>0,
- :helpstr=>'Paste clipboard contents',
+ :label=>'Paste', :underline=>0,
+ :helpstr=>'Paste clipboard contents',
:command=>proc{puts 'PASTE'}
}
]
]
}
- ],
+ ],
[:menubutton, 'options', {
:text=>'Options', :menu=>[
- [:options, {:tearoff=>false, :selectcolor=>'blue'}],
+ [:options, {:tearoff=>false, :selectcolor=>'blue'}],
[:radiobutton, 'byName', {
- :variable=>viewmode, :value=>'NAME',
- :label=>'by Name', :helpstr=>'View files by name order',
+ :variable=>viewmode, :value=>'NAME',
+ :label=>'by Name', :helpstr=>'View files by name order',
:command=>proc{puts 'NAME'}
}
- ],
+ ],
[:radiobutton, 'byDate', {
- :variable=>viewmode, :value=>'DATE',
- :label=>'by Date', :helpstr=>'View files by date order',
+ :variable=>viewmode, :value=>'DATE',
+ :label=>'by Date', :helpstr=>'View files by date order',
:command=>proc{puts 'DATE'}
}
- ],
+ ],
[:cascade, 'prefs', {
:label=>'Preferences', :menu=>[
[:command, 'colors', {
- :label=>'Colors...', :helpstr=>'Change text colors',
+ :label=>'Colors...', :helpstr=>'Change text colors',
:command=>proc{puts 'COLORS'}
}
- ],
+ ],
[:command, 'fonts', {
- :label=>'Fonts...', :helpstr=>'Change text font',
+ :label=>'Fonts...', :helpstr=>'Change text font',
:command=>proc{puts 'COLORS'}
}
]
@@ -109,7 +109,7 @@ menu_spec = [
]
]
-#mb = Tk::Iwidgets::Menubar.new(:helpvariable=>helpvar,
+#mb = Tk::Iwidgets::Menubar.new(:helpvariable=>helpvar,
# :menubuttons=>menu_spec)
mb = Tk::Iwidgets::Menubar.new(:helpvariable=>helpvar)
mb.configure(:menubuttons=>menu_spec)
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/menubar2.rb b/ext/tk/sample/tkextlib/iwidgets/sample/menubar2.rb
index 477c916e07..d6f2292650 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/menubar2.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/menubar2.rb
@@ -9,13 +9,13 @@ mb = Tk::Iwidgets::Menubar.new
mb.menubuttons = [
[:menubutton, 'file', {
:text=>'File', :menu=>[
- [:command, 'new', {:label=>'New'}],
- [:command, 'close', {:label=>'Close'}],
- [:separator, 'sep1'],
+ [:command, 'new', {:label=>'New'}],
+ [:command, 'close', {:label=>'Close'}],
+ [:separator, 'sep1'],
[:command, 'quit', {:label=>'Quit'}]
]
}
- ],
+ ],
[:menubutton, 'edit', {:text=>'Edit'}]
]
@@ -28,14 +28,14 @@ mb.add(:command, '.edit.paste', :label=>'Paste', :underline=>0)
mb.add(:menubutton, '.options', :text=>'Options', :menu=>[
[:radiobutton, 'byName', {
:variable=>viewmode, :value=>'NAME', :label=>'by Name'}
- ],
+ ],
[:radiobutton, 'byDate', {
:variable=>viewmode, :value=>'DATE', :label=>'by Date'}
]
])
mb.add(:cascade, '.options.prefs', :label=>'Preferences', :menu=>[
- [:command, 'colors', {:label=>'Colors...'}],
+ [:command, 'colors', {:label=>'Colors...'}],
[:command, 'fonts', {:label=>'Fonts...'}]
])
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/messagebox1.rb b/ext/tk/sample/tkextlib/iwidgets/sample/messagebox1.rb
index 87b2d38907..3221dbc30c 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/messagebox1.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/messagebox1.rb
@@ -2,9 +2,9 @@
require 'tk'
require 'tkextlib/iwidgets'
-mb = Tk::Iwidgets::Messagebox.new(:hscrollmode=>:dynamic,
- :labeltext=>'Messages', :labelpos=>:n,
- :height=>120, :width=>550,
+mb = Tk::Iwidgets::Messagebox.new(:hscrollmode=>:dynamic,
+ :labeltext=>'Messages', :labelpos=>:n,
+ :height=>120, :width=>550,
:savedir=>'/tmp', :textbackground=>'#d9d9d9')
mb.pack(:padx=>5, :pady=>5, :fill=>:both, :expand=>true)
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/messagebox2.rb b/ext/tk/sample/tkextlib/iwidgets/sample/messagebox2.rb
index 5278883568..2f0e3648a6 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/messagebox2.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/messagebox2.rb
@@ -2,9 +2,9 @@
require 'tk'
require 'tkextlib/iwidgets'
-mb = Tk::Iwidgets::Messagebox.new(:hscrollmode=>:dynamic,
- :labeltext=>'Messages', :labelpos=>:n,
- :height=>120, :width=>550,
+mb = Tk::Iwidgets::Messagebox.new(:hscrollmode=>:dynamic,
+ :labeltext=>'Messages', :labelpos=>:n,
+ :height=>120, :width=>550,
:savedir=>'/tmp', :textbackground=>'#d9d9d9')
mb.pack(:padx=>5, :pady=>5, :fill=>:both, :expand=>true)
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/messagedialog.rb b/ext/tk/sample/tkextlib/iwidgets/sample/messagedialog.rb
index 52799f206c..6c6bfbca3f 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/messagedialog.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/messagedialog.rb
@@ -7,8 +7,8 @@ mainloop = Thread.new{Tk.mainloop}
#
# Standard question message dialog used for confirmation.
#
-md = Tk::Iwidgets::Messagedialog.new(:title=>'Message Dialog',
- :text=>'Are you sure ? ',
+md = Tk::Iwidgets::Messagedialog.new(:title=>'Message Dialog',
+ :text=>'Are you sure ? ',
:bitmap=>'questhead', :modality=>:global)
md.buttonconfigure('OK', :text=>'Yes')
@@ -32,8 +32,8 @@ md.destroy
#
bmp = '@' + File.join(File.dirname(File.expand_path(__FILE__)), '../catalog_demo/images/text.xbm')
-cr = Tk::Iwidgets::Messagedialog.new(:title=>'Copyright',
- :bitmap=>bmp, :imagepos=>:n,
+cr = Tk::Iwidgets::Messagedialog.new(:title=>'Copyright',
+ :bitmap=>bmp, :imagepos=>:n,
:text=>"Copyright 200x XXX Corporation\nAll rights reserved")
cr.hide('Cancel')
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/notebook.rb b/ext/tk/sample/tkextlib/iwidgets/sample/notebook.rb
index 055312ec96..e33b81eb6f 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/notebook.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/notebook.rb
@@ -4,7 +4,7 @@ require 'tkextlib/iwidgets'
# Create the tabnotebook widget and pack it.
nb = Tk::Iwidgets::Notebook.new(:width=>100, :height=>100)
-nb.pack(:anchor=>:nw, :fill=>:both, :expand=>true,
+nb.pack(:anchor=>:nw, :fill=>:both, :expand=>true,
:side=>:left, :padx=>10, :pady=>10)
# Add two pages to the tabnotebook,
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/notebook2.rb b/ext/tk/sample/tkextlib/iwidgets/sample/notebook2.rb
index 41e9ce1bfc..649de4f024 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/notebook2.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/notebook2.rb
@@ -4,7 +4,7 @@ require 'tkextlib/iwidgets'
# Create the tabnotebook widget and pack it.
nb = Tk::Iwidgets::Notebook.new(:width=>100, :height=>100)
-nb.pack(:anchor=>:nw, :fill=>:both, :expand=>true,
+nb.pack(:anchor=>:nw, :fill=>:both, :expand=>true,
:side=>:top, :padx=>10, :pady=>0)
# Add two pages to the tabnotebook,
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/optionmenu.rb b/ext/tk/sample/tkextlib/iwidgets/sample/optionmenu.rb
index 2b921ffab9..1fd7a5bc05 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/optionmenu.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/optionmenu.rb
@@ -2,7 +2,7 @@
require 'tk'
require 'tkextlib/iwidgets'
-om = Tk::Iwidgets::Optionmenu.new(:labelmargin=>5, :labelpos=>:w,
+om = Tk::Iwidgets::Optionmenu.new(:labelmargin=>5, :labelpos=>:w,
:labeltext=>"Operating System :")
om.insert('end', 'Unix', 'VMS', 'Linux', 'OS/2', 'Windows NT', 'DOS')
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/panedwindow.rb b/ext/tk/sample/tkextlib/iwidgets/sample/panedwindow.rb
index 88fc401483..6e4458e508 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/panedwindow.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/panedwindow.rb
@@ -11,7 +11,7 @@ pw.add('bottom', :margin=>10, :minimum=>10)
pw.pack(:fill=>:both, :expand=>true)
pw.child_site_list.each{|pane|
- TkButton.new(pane, :text=>pane.path, :relief=>:raised,
+ TkButton.new(pane, :text=>pane.path, :relief=>:raised,
:borderwidth=>2).pack(:fill=>:both, :expand=>true)
}
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/panedwindow2.rb b/ext/tk/sample/tkextlib/iwidgets/sample/panedwindow2.rb
index 96987d529c..6779cb57db 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/panedwindow2.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/panedwindow2.rb
@@ -11,7 +11,7 @@ bottom = pw.add(:margin=>10, :minimum=>10)
pw.pack(:fill=>:both, :expand=>true)
pw.child_site_list.each{|pane|
- TkButton.new(pane, :text=>pane.path, :relief=>:raised,
+ TkButton.new(pane, :text=>pane.path, :relief=>:raised,
:borderwidth=>2).pack(:fill=>:both, :expand=>true)
}
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/promptdialog.rb b/ext/tk/sample/tkextlib/iwidgets/sample/promptdialog.rb
index d92a26ead9..2c643e56f7 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/promptdialog.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/promptdialog.rb
@@ -6,7 +6,7 @@ mainloop = Thread.new{Tk.mainloop}
TkOption.add('*textBackground', 'white')
-pd = Tk::Iwidgets::Promptdialog.new(:modality=>:global, :title=>'Password',
+pd = Tk::Iwidgets::Promptdialog.new(:modality=>:global, :title=>'Password',
:labeltext=>'Password:', :show=>'*')
pd.hide('Apply')
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/pushbutton.rb b/ext/tk/sample/tkextlib/iwidgets/sample/pushbutton.rb
index e76dda88c6..6e1c3fffe3 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/pushbutton.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/pushbutton.rb
@@ -2,8 +2,8 @@
require 'tk'
require 'tkextlib/iwidgets'
-Tk::Iwidgets::Pushbutton.new(:text=>'Hello',
- :command=>proc{puts 'Hello World'},
+Tk::Iwidgets::Pushbutton.new(:text=>'Hello',
+ :command=>proc{puts 'Hello World'},
:defaultring=>true).pack(:padx=>10, :pady=>10)
Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/scrolledframe.rb b/ext/tk/sample/tkextlib/iwidgets/sample/scrolledframe.rb
index e5bd90a1cb..5219847c9c 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/scrolledframe.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/scrolledframe.rb
@@ -2,7 +2,7 @@
require 'tk'
require 'tkextlib/iwidgets'
-sf = Tk::Iwidgets::Scrolledframe.new(:width=>150, :height=>180,
+sf = Tk::Iwidgets::Scrolledframe.new(:width=>150, :height=>180,
:labeltext=>'scrolledframe')
cs = sf.child_site
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/scrolledhtml.rb b/ext/tk/sample/tkextlib/iwidgets/sample/scrolledhtml.rb
index 2b675f802c..04334b8da8 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/scrolledhtml.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/scrolledhtml.rb
@@ -4,7 +4,7 @@ require 'tkextlib/iwidgets'
TkOption.add('*textBackground', 'white')
-sh = Tk::Iwidgets::Scrolledhtml.new(:fontname=>'helvetica',
+sh = Tk::Iwidgets::Scrolledhtml.new(:fontname=>'helvetica',
:linkcommand=>proc{|href|
sh.import_link(href)
})
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/scrolledlistbox.rb b/ext/tk/sample/tkextlib/iwidgets/sample/scrolledlistbox.rb
index bf2c60191f..0b69751911 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/scrolledlistbox.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/scrolledlistbox.rb
@@ -4,13 +4,13 @@ require 'tkextlib/iwidgets'
TkOption.add('*textBackground', 'white')
-slb = Tk::Iwidgets::Scrolledlistbox.new(:selectmode=>:single,
+slb = Tk::Iwidgets::Scrolledlistbox.new(:selectmode=>:single,
:vscrollmode=>:static,
:hscrollmode=>:dynamic,
- :labeltext=>'List',
+ :labeltext=>'List',
:selectioncommand=>proc{
puts(slb.get_curselection)
- },
+ },
:dblclickcommand=>proc{
puts('Double Click')
puts(slb.get_curselection)
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/scrolledtext.rb b/ext/tk/sample/tkextlib/iwidgets/sample/scrolledtext.rb
index 41498e67f7..dd1a99a829 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/scrolledtext.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/scrolledtext.rb
@@ -2,7 +2,7 @@
require 'tk'
require 'tkextlib/iwidgets'
-st = Tk::Iwidgets::Scrolledtext.new(:hscrollmode=>:dynamic, :wrap=>:none,
+st = Tk::Iwidgets::Scrolledtext.new(:hscrollmode=>:dynamic, :wrap=>:none,
:labeltext=>'Password File')
st.pack(:expand=>true, :fill=>:both, :padx=>10, :pady=>10)
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/selectionbox.rb b/ext/tk/sample/tkextlib/iwidgets/sample/selectionbox.rb
index 74684974b1..a5d623ae80 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/selectionbox.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/selectionbox.rb
@@ -4,12 +4,12 @@ require 'tkextlib/iwidgets'
TkOption.add('*textBackground', 'white')
-sb = Tk::Iwidgets::Selectionbox.new.pack(:padx=>10, :pady=>10,
+sb = Tk::Iwidgets::Selectionbox.new.pack(:padx=>10, :pady=>10,
:fill=>:both, :expand=>true)
sb.insert_items('end', *['Hello', 'Out There', 'World'])
-TkLabel.new(sb.child_site,
+TkLabel.new(sb.child_site,
:text=>'Child Site is Here').pack(:fill=>:x, :padx=>10, :pady=>10)
sb.insert_items(2, 'Cruel Cruel')
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/selectiondialog.rb b/ext/tk/sample/tkextlib/iwidgets/sample/selectiondialog.rb
index d53391f2f3..f40b419180 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/selectiondialog.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/selectiondialog.rb
@@ -4,7 +4,7 @@ require 'tkextlib/iwidgets'
mainloop = Thread.new{Tk.mainloop}
-TkButton.new(:text=>'QUIT',
+TkButton.new(:text=>'QUIT',
:command=>proc{Tk.root.destroy}).pack(:padx=>10, :pady=>10)
Tk::Iwidgets::Selectiondialog.new.activate
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/shell.rb b/ext/tk/sample/tkextlib/iwidgets/sample/shell.rb
index 6d01280141..c44b5554a6 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/shell.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/shell.rb
@@ -2,16 +2,16 @@
require 'tk'
require 'tkextlib/iwidgets'
-sh = Tk::Iwidgets::Shell.new(:modality=>:application,
+sh = Tk::Iwidgets::Shell.new(:modality=>:application,
:padx=>20, :pady=>20, :title=>'Shell')
-TkButton.new(:text=>'ACTIVATE', :padx=>7, :pady=>7,
+TkButton.new(:text=>'ACTIVATE', :padx=>7, :pady=>7,
:command=>proc{puts sh.activate}).pack(:padx=>10, :pady=>10)
TkLabel.new(sh.child_site, :text=>'SHELL').pack
-TkButton.new(sh.child_site, :text=>'YES',
+TkButton.new(sh.child_site, :text=>'YES',
:command=>proc{sh.deactivate 'press YES'}).pack(:fill=>:x)
-TkButton.new(sh.child_site, :text=>'NO',
+TkButton.new(sh.child_site, :text=>'NO',
:command=>proc{sh.deactivate 'press NO'}).pack(:fill=>:x)
Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/spinint.rb b/ext/tk/sample/tkextlib/iwidgets/sample/spinint.rb
index e2dde01b18..0bcdefb763 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/spinint.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/spinint.rb
@@ -4,7 +4,7 @@ require 'tkextlib/iwidgets'
TkOption.add('*textBackground', 'white')
-Tk::Iwidgets::Spinint.new(:labeltext=>'Temperature', :labelpos=>:w, :width=>5,
+Tk::Iwidgets::Spinint.new(:labeltext=>'Temperature', :labelpos=>:w, :width=>5,
:fixed=>true, :range=>[32, 212]).pack(:pady=>10)
Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/spinner.rb b/ext/tk/sample/tkextlib/iwidgets/sample/spinner.rb
index 6a20b0eb87..295d38ee96 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/spinner.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/spinner.rb
@@ -18,10 +18,10 @@ class Spinner_demo < TkWindow
end
def initialize(parent=nil)
- @spinner = Tk::Iwidgets::Spinner.new(parent, :labeltext=>'Month : ',
- :width=>10, :fixed=>10,
- :validate=>proc{|c| block_input},
- :decrement=>proc{spin_month -1},
+ @spinner = Tk::Iwidgets::Spinner.new(parent, :labeltext=>'Month : ',
+ :width=>10, :fixed=>10,
+ :validate=>proc{|c| block_input},
+ :decrement=>proc{spin_month -1},
:increment=>proc{spin_month 1})
@path = @spinner
@spinner.insert(0, Months[0])
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/tabnotebook.rb b/ext/tk/sample/tkextlib/iwidgets/sample/tabnotebook.rb
index 382b34d3ce..6f1ecc4fa4 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/tabnotebook.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/tabnotebook.rb
@@ -4,7 +4,7 @@ require 'tkextlib/iwidgets'
# Create the tabnotebook widget and pack it.
tn = Tk::Iwidgets::Tabnotebook.new(:width=>300, :height=>100)
-tn.pack(:anchor=>:nw, :fill=>:both, :expand=>true,
+tn.pack(:anchor=>:nw, :fill=>:both, :expand=>true,
:side=>:left, :padx=>10, :pady=>10)
# Add two pages to the tabnotebook,
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/tabnotebook2.rb b/ext/tk/sample/tkextlib/iwidgets/sample/tabnotebook2.rb
index 2689759bde..4a5eef5a8f 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/tabnotebook2.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/tabnotebook2.rb
@@ -4,7 +4,7 @@ require 'tkextlib/iwidgets'
# Create the tabnotebook widget and pack it.
tn = Tk::Iwidgets::Tabnotebook.new(:width=>300, :height=>100)
-tn.pack(:anchor=>:nw, :fill=>:both, :expand=>true,
+tn.pack(:anchor=>:nw, :fill=>:both, :expand=>true,
:side=>:top, :padx=>10, :pady=>0)
# Add two pages to the tabnotebook,
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/toolbar.rb b/ext/tk/sample/tkextlib/iwidgets/sample/toolbar.rb
index 608efd0af1..355466eb1a 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/toolbar.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/toolbar.rb
@@ -88,7 +88,7 @@ EOD
##########################################
-bmp_dir = File.join(File.dirname(File.expand_path(__FILE__)),
+bmp_dir = File.join(File.dirname(File.expand_path(__FILE__)),
'../catalog_demo/images')
##########################################
@@ -102,16 +102,16 @@ tb = Tk::Iwidgets::Toolbar.new(:helpvariable=>status_var)
##########################################
-tb.add(:button, :helpstr=>'Copy It', :image=>editcopy22,
+tb.add(:button, :helpstr=>'Copy It', :image=>editcopy22,
:balloonstr=>'Copy', :command=>proc{puts 'Copy It'})
-tb.add(:button, :helpstr=>'Cut It', :image=>editcut22,
+tb.add(:button, :helpstr=>'Cut It', :image=>editcut22,
:balloonstr=>'Cut', :command=>proc{puts 'Cut It'})
-tb.add(:button, :helpstr=>'Paste It', :image=>editpaste22,
+tb.add(:button, :helpstr=>'Paste It', :image=>editpaste22,
:balloonstr=>'Paste', :command=>proc{puts 'Paste It'})
-tb.add(:button, :helpstr=>'Delete It', :image=>editdelete22,
+tb.add(:button, :helpstr=>'Delete It', :image=>editdelete22,
:balloonstr=>'Delete', :command=>proc{puts 'Delete It'})
#--------------------------------
@@ -120,19 +120,19 @@ tb.add(:frame, :borderwidth=>1, :width=>10, :height=>10)
#--------------------------------
-tb.add(:radiobutton, :variable=>radio_var, :value=>'Box',
- :bitmap=>"@#{bmp_dir}/box.xbm",
- :helpstr=>'Radio Button #1', :balloonstr=>'Radio',
+tb.add(:radiobutton, :variable=>radio_var, :value=>'Box',
+ :bitmap=>"@#{bmp_dir}/box.xbm",
+ :helpstr=>'Radio Button #1', :balloonstr=>'Radio',
:command=>proc{puts 'Radio Button "Box"'})
-tb.add(:radiobutton, :variable=>radio_var, :value=>'Line',
- :bitmap=>"@#{bmp_dir}/line.xbm",
- :helpstr=>'Radio Button #2', :balloonstr=>'Radio',
+tb.add(:radiobutton, :variable=>radio_var, :value=>'Line',
+ :bitmap=>"@#{bmp_dir}/line.xbm",
+ :helpstr=>'Radio Button #2', :balloonstr=>'Radio',
:command=>proc{puts 'Radio Button "Line"'})
-tb.add(:radiobutton, :variable=>radio_var, :value=>'Oval',
- :bitmap=>"@#{bmp_dir}/oval.xbm",
- :helpstr=>'Radio Button #3', :balloonstr=>'Radio',
+tb.add(:radiobutton, :variable=>radio_var, :value=>'Oval',
+ :bitmap=>"@#{bmp_dir}/oval.xbm",
+ :helpstr=>'Radio Button #3', :balloonstr=>'Radio',
:command=>proc{puts 'Radio Button "Oval"'})
#--------------------------------
@@ -141,10 +141,10 @@ tb.add(:frame, :borderwidth=>1, :width=>10, :height=>10)
#--------------------------------
-tb.add(:checkbutton, :variable=>check_var1, :onvalue=>'yes', :offvalue=>'no',
+tb.add(:checkbutton, :variable=>check_var1, :onvalue=>'yes', :offvalue=>'no',
:image=>text22, :command=>proc{puts 'Checkbutton 1'})
-tb.add(:checkbutton, :variable=>check_var2, :onvalue=>'yes', :offvalue=>'no',
+tb.add(:checkbutton, :variable=>check_var2, :onvalue=>'yes', :offvalue=>'no',
:bitmap=>"@#{bmp_dir}/points.xbm", :command=>proc{puts 'Checkbutton 2'})
tb.pack(:side=>:top, :anchor=>:nw)
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/watch.rb b/ext/tk/sample/tkextlib/iwidgets/sample/watch.rb
index 2af53ba63b..808c798aec 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/watch.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/watch.rb
@@ -8,7 +8,7 @@ Thread.new{
trap('INT', 'DEFAULT')
}
-Tk::Iwidgets::Watch.new(:state=>:disabled, :showampm=>:no,
+Tk::Iwidgets::Watch.new(:state=>:disabled, :showampm=>:no,
:width=>155, :height=>155){|w|
w.pack(:padx=>10, :pady=>10, :fill=>:both, :expand=>true)
# TkTimer.new(1000, -1, proc{w.show; Tk.update}).start
diff --git a/ext/tk/sample/tkextlib/tcllib/datefield.rb b/ext/tk/sample/tkextlib/tcllib/datefield.rb
index 3550af7d23..cfeca0c6de 100644
--- a/ext/tk/sample/tkextlib/tcllib/datefield.rb
+++ b/ext/tk/sample/tkextlib/tcllib/datefield.rb
@@ -20,8 +20,8 @@ my_date1.trace('w'){
df = Tk::Tcllib::Datefield.new(:textvariable=>my_date1)
Tk.grid(TkLabel.new(:text=>'Enter a date:', :anchor=>:e), df, :sticky=>:ew)
-Tk.grid(TkLabel.new(:text=>'That date ia a:', :anchor=>:e),
- TkLabel.new(:textvariable=>my_date2, :relief=>:sunken, :width=>12),
+Tk.grid(TkLabel.new(:text=>'That date ia a:', :anchor=>:e),
+ TkLabel.new(:textvariable=>my_date2, :relief=>:sunken, :width=>12),
:sticky=>:ew)
df.set_focus
diff --git a/ext/tk/sample/tkextlib/tcllib/plotdemos1.rb b/ext/tk/sample/tkextlib/tcllib/plotdemos1.rb
index 7f35a3833c..053b0de085 100644
--- a/ext/tk/sample/tkextlib/tcllib/plotdemos1.rb
+++ b/ext/tk/sample/tkextlib/tcllib/plotdemos1.rb
@@ -23,7 +23,7 @@ Tk.pack(vc1,vc2,vc3, :fill=>:both, :side=>:top)
###############################
-s = Tk::Tcllib::Plotchart::XYPlot.new(c1, [0.0, 100.0, 10.0],
+s = Tk::Tcllib::Plotchart::XYPlot.new(c1, [0.0, 100.0, 10.0],
[0.0, 100.0, 20.0])
@@ -56,7 +56,7 @@ s.save_plot "aha.ps"
s = Tk::Tcllib::Plotchart::Piechart.new(c2)
-s.plot([ ["Long names", 10], ["Short names", 30],
+s.plot([ ["Long names", 10], ["Short names", 30],
["Average", 40], ["Ultra-short names", 5] ])
#
@@ -78,7 +78,7 @@ s.title "Cardioid"
###############################
-s = Tk::Tcllib::Plotchart::Barchart.new(hc1, %w(A B C D E),
+s = Tk::Tcllib::Plotchart::Barchart.new(hc1, %w(A B C D E),
[0.0, 10.0, 2.0], 2)
s.plot('series1', [1.0, 4.0, 6.0, 1.0, 7.0], 'red')
@@ -87,7 +87,7 @@ s.title "Arbitrary data"
###############################
-s = Tk::Tcllib::Plotchart::Barchart.new(hc2, %w(A B C D E),
+s = Tk::Tcllib::Plotchart::Barchart.new(hc2, %w(A B C D E),
[0.0, 20.0, 5.0], :stacked)
s.plot('series1', [1.0, 4.0, 6.0, 1.0, 7.0], 'red')
@@ -96,7 +96,7 @@ s.title "Stacked diagram"
###############################
-s = Tk::Tcllib::Plotchart::HorizontalBarchart.new(vc1, [0.0, 10.0, 2.0],
+s = Tk::Tcllib::Plotchart::HorizontalBarchart.new(vc1, [0.0, 10.0, 2.0],
%w(A B C D E), 2)
s.plot('series1', [1.0, 4.0, 6.0, 1.0, 7.0], 'red')
@@ -105,7 +105,7 @@ s.title "Arbitrary data"
###############################
-s = Tk::Tcllib::Plotchart::HorizontalBarchart.new(vc2, [0.0, 20.0, 5.0],
+s = Tk::Tcllib::Plotchart::HorizontalBarchart.new(vc2, [0.0, 20.0, 5.0],
%w(A B C D E), :stacked)
s.plot('series1', [1.0, 4.0, 6.0, 1.0, 7.0], 'red')
@@ -114,7 +114,7 @@ s.title "Stacked diagram"
###############################
-s = Tk::Tcllib::Plotchart::Timechart.new(vc3, "1 january 2004",
+s = Tk::Tcllib::Plotchart::Timechart.new(vc3, "1 january 2004",
"31 december 2004", 4)
s.period("Spring", "1 march 2004", "1 june 2004", 'green')
@@ -134,7 +134,7 @@ zc1 = TkCanvas.new(z, :background=>'white', :width=>400, :height=>300)
zc2 = TkCanvas.new(z, :background=>'white', :width=>400, :height=>250)
Tk.pack(zc1,zc2)
-s = Tk::Tcllib::Plotchart::Plot3D.new(zc1,
+s = Tk::Tcllib::Plotchart::Plot3D.new(zc1,
[0, 10, 3], [-10, 10, 10], [0, 10, 2.5])
s.title "3D Plot"
@@ -145,12 +145,12 @@ s.plot_function{|x, y|
3.0 * (1.0-(x1*x1+y1*y1))*(1.0-(x1*x1+y1*y1))
}
-s = Tk::Tcllib::Plotchart::Plot3D.new(zc2,
+s = Tk::Tcllib::Plotchart::Plot3D.new(zc2,
[0, 10, 3], [-10, 10, 10], [0, 10, 2.5])
s.title "3D Plot - data "
s.colour("green", "black")
-s.plot_data([ [1.0, 2.0, 1.0, 0.0],
- [1.1, 3.0, 1.1, -0.5],
+s.plot_data([ [1.0, 2.0, 1.0, 0.0],
+ [1.1, 3.0, 1.1, -0.5],
[3.0, 1.0, 4.0, 5.0] ])
###############################
diff --git a/ext/tk/sample/tkextlib/tcllib/plotdemos2.rb b/ext/tk/sample/tkextlib/tcllib/plotdemos2.rb
index cb657a40d8..33a6f29940 100644
--- a/ext/tk/sample/tkextlib/tcllib/plotdemos2.rb
+++ b/ext/tk/sample/tkextlib/tcllib/plotdemos2.rb
@@ -12,7 +12,7 @@ Tk.pack(c1,c2, :fill=>:both, :side=>:top)
###############################
# Set up a strip chart
###############################
-slipchart = Tk::Tcllib::Plotchart::Stripchart.new(c1, [0.0, 100.0, 10.0],
+slipchart = Tk::Tcllib::Plotchart::Stripchart.new(c1, [0.0, 100.0, 10.0],
[0.0, 100.0, 20.0])
TkTimer.new(500, -1, proc{|obj| # obj --> TkTimer object
@@ -34,7 +34,7 @@ slipchart.title "Aha!"
###############################
# Set up an isometric plot
###############################
-s = Tk::Tcllib::Plotchart::IsometricPlot.new(c2, [0.0, 100.0], [0.0, 200.0],
+s = Tk::Tcllib::Plotchart::IsometricPlot.new(c2, [0.0, 100.0], [0.0, 200.0],
:noaxes)
s.set_zoom_pan
@@ -50,8 +50,8 @@ s.plot('circle', [70.0, 70.0, 42.0])
h = TkToplevel.new(:title=>'h')
c = TkCanvas.new(h, :bg=>'white', :width=>400, :height=>200).pack(:fill=>:both)
-s = Tk::Tcllib::Plotchart::XYPlot.new(c, [0.0, 100.0, 10.0],
- [0.0, 100.0, 20.0])
+s = Tk::Tcllib::Plotchart::XYPlot.new(c, [0.0, 100.0, 10.0],
+ [0.0, 100.0, 20.0])
s.dataconfig('series1', :colour=>'red', :type=>:symbol)
s.dataconfig('series2', :colour=>'green', :type=>:both)
diff --git a/ext/tk/sample/tkextlib/tcllib/plotdemos3.rb b/ext/tk/sample/tkextlib/tcllib/plotdemos3.rb
index 66b8fe706a..2b5c7642bb 100644
--- a/ext/tk/sample/tkextlib/tcllib/plotdemos3.rb
+++ b/ext/tk/sample/tkextlib/tcllib/plotdemos3.rb
@@ -7,9 +7,9 @@ require 'tkextlib/tcllib/plotchart'
# Set up a strip chart
###############################
-Tk::Tcllib::Plotchart::Stripchart.new([0.0, 100.0, 10.0],
- [0.0, 100.0, 20.0],
- :background=>'white',
+Tk::Tcllib::Plotchart::Stripchart.new([0.0, 100.0, 10.0],
+ [0.0, 100.0, 20.0],
+ :background=>'white',
:width=>400, :height=>200){|chart|
title "Aha!"
pack(:fill=>:both, :side=>:top)
@@ -38,8 +38,8 @@ Tk::Tcllib::Plotchart::Stripchart.new([0.0, 100.0, 10.0],
###############################
# Set up an isometric plot
###############################
-Tk::Tcllib::Plotchart::IsometricPlot.new([0.0, 100.0], [0.0, 200.0], :noaxes,
- :background=>'white',
+Tk::Tcllib::Plotchart::IsometricPlot.new([0.0, 100.0], [0.0, 200.0], :noaxes,
+ :background=>'white',
:width=>400, :height=>200){|chart|
pack(:fill=>:both, :side=>:top)
set_zoom_pan
@@ -54,17 +54,17 @@ Tk::Tcllib::Plotchart::IsometricPlot.new([0.0, 100.0], [0.0, 200.0], :noaxes,
# Check the symbols
###############################
TkToplevel.new(:title=>'h'){|h|
- Tk::Tcllib::Plotchart::XYPlot.new(h, [0.0, 100.0, 10.0],
- [0.0, 100.0, 20.0],
- :bg=>'white',
+ Tk::Tcllib::Plotchart::XYPlot.new(h, [0.0, 100.0, 10.0],
+ [0.0, 100.0, 20.0],
+ :bg=>'white',
:width=>400, :height=>200){|chart|
pack(:fill=>:both)
yconfig(:format=>"%12.2e")
- series1 = Tk::Tcllib::Plotchart::PlotSeries.new(chart, :colour=>'red',
+ series1 = Tk::Tcllib::Plotchart::PlotSeries.new(chart, :colour=>'red',
:type=>:symbol)
- series2 = Tk::Tcllib::Plotchart::PlotSeries.new(chart, :colour=>'green',
+ series2 = Tk::Tcllib::Plotchart::PlotSeries.new(chart, :colour=>'green',
:type=>:both)
x = 5.0
diff --git a/ext/tk/sample/tkextlib/tcllib/xyplot.rb b/ext/tk/sample/tkextlib/tcllib/xyplot.rb
index 2aa101efcb..8f8c3eb880 100644
--- a/ext/tk/sample/tkextlib/tcllib/xyplot.rb
+++ b/ext/tk/sample/tkextlib/tcllib/xyplot.rb
@@ -5,7 +5,7 @@ require 'tkextlib/tcllib/plotchart'
TkCanvas.new(:background=>'white', :width=>400, :height=>200){|c|
pack(:fill=>:both)
- Tk::Tcllib::Plotchart::XYPlot.new(c, [0.0, 100.0, 10.0],
+ Tk::Tcllib::Plotchart::XYPlot.new(c, [0.0, 100.0, 10.0],
[0.0, 100.0, 20.0]){
[ [0.0, 32.0], [10.0, 50.0], [25.0, 60.0], [78.0, 11.0] ].each{|x, y|
plot('series1', x, y)
diff --git a/ext/tk/sample/tkextlib/tile/demo.rb b/ext/tk/sample/tkextlib/tile/demo.rb
index 260ca00022..633a072460 100644
--- a/ext/tk/sample/tkextlib/tile/demo.rb
+++ b/ext/tk/sample/tkextlib/tile/demo.rb
@@ -34,7 +34,7 @@ Tk.load_tclscript(File.join(demodir, 'repeater.tcl'))
# This forces an update of the available packages list. It's required
# for package names to find the themes in demos/themes/*.tcl
## Tk.tk_call(TkPackage.unknown_proc, 'Tcl', TkPackage.provide('Tcl'))
-## --> This doesn't work.
+## --> This doesn't work.
## Because, unknown_proc may be "command + some arguments".
Tk.ip_eval("#{TkPackage.unknown_proc} Tcl #{TkPackage.provide('Tcl')}")
@@ -45,18 +45,18 @@ TkRoot.new{
# The descriptive names of the builtin themes.
$THEMELIST = [
- ['default', 'Default'],
- ['classic', 'Classic'],
- ['alt', 'Revitalized'],
- ['winnative', 'Windows native'],
- ['xpnative', 'XP Native'],
- ['aqua', 'Aqua'],
+ ['default', 'Default'],
+ ['classic', 'Classic'],
+ ['alt', 'Revitalized'],
+ ['winnative', 'Windows native'],
+ ['xpnative', 'XP Native'],
+ ['aqua', 'Aqua'],
]
-$V = TkVariable.new_hash(:THEME => 'default',
- :COMPOUND => 'top',
- :CONSOLE => false,
- :MENURADIO1 => 'One',
+$V = TkVariable.new_hash(:THEME => 'default',
+ :COMPOUND => 'top',
+ :CONSOLE => false,
+ :MENURADIO1 => 'One',
:MENUCHECK1 => true,
:PBMODE => 'determinate',
:SELECTED => true,
@@ -84,8 +84,8 @@ end
def makeThemeControl(parent)
c = Tk::Tile::Labelframe.new(parent, :text=>'Theme')
$THEMELIST.each{|theme, name|
- b = Tk::Tile::Radiobutton.new(c, :text=>name, :value=>theme,
- :variable=>$V.ref(:THEME),
+ b = Tk::Tile::Radiobutton.new(c, :text=>name, :value=>theme,
+ :variable=>$V.ref(:THEME),
:command=>proc{setTheme(theme)})
b.grid(:sticky=>:ew)
unless (TkPackage.names.find{|n| n =~ /(tile|ttk)::theme::#{theme}/})
@@ -93,8 +93,8 @@ def makeThemeControl(parent)
end
}
$RUBY_THEMELIST.each{|theme, name, available|
- b = Tk::Tile::Radiobutton.new(c, :text=>name, :value=>theme,
- :variable=>$V.ref(:THEME),
+ b = Tk::Tile::Radiobutton.new(c, :text=>name, :value=>theme,
+ :variable=>$V.ref(:THEME),
:command=>proc{setTheme(theme)})
b.grid(:sticky=>:ew)
b.ttk_state(:disabled) unless available
@@ -105,14 +105,14 @@ end
def makeThemeMenu(parent)
m = TkMenu.new(parent)
$THEMELIST.each{|theme, name|
- m.add(:radiobutton, :label=>name, :variable=>$V.ref(:THEME),
+ m.add(:radiobutton, :label=>name, :variable=>$V.ref(:THEME),
:value=>theme, :command=>proc{setTheme(theme)})
unless (TkPackage.names.find{|n| n =~ /(tile|ttk)::theme::#{theme}/})
m.entryconfigure(:end, :state=>:disabled)
end
}
$RUBY_THEMELIST.each{|theme, name, available|
- m.add(:radiobutton, :label=>name, :variable=>$V.ref(:THEME),
+ m.add(:radiobutton, :label=>name, :variable=>$V.ref(:THEME),
:value=>theme, :command=>proc{setTheme(theme)})
m.entryconfigure(:end, :state=>:disabled) unless available
}
@@ -174,7 +174,7 @@ def sbstub(sb, cmd, num, units = 'units')
current = sb.get
sb.set(current[0] + delta * num, current[1] + delta * num)
end
-end
+end
# ... for debugging:
TkBindTag::ALL.bind('ButtonPress-3', proc{|w| $W = w}, '%W')
@@ -209,21 +209,21 @@ def makeToolbars
i = 0
$BUTTONS.each{|icon|
i += 1
- Tk::Tile::Button.new(tb, :text=>icon, :image=>$ICON[icon],
- :compound=>$V[:COMPOUND],
- :style=>:Toolbutton).grid(:row=>0, :column=>i,
+ Tk::Tile::Button.new(tb, :text=>icon, :image=>$ICON[icon],
+ :compound=>$V[:COMPOUND],
+ :style=>:Toolbutton).grid(:row=>0, :column=>i,
:sticky=>:news)
}
$CHECKBOXES.each{|icon|
i += 1
- Tk::Tile::Checkbutton.new(tb, :text=>icon, :image=>$ICON[icon],
- :variable=>$V.ref(icon),
- :compound=>$V[:COMPOUND],
- :style=>:Toolbutton).grid(:row=>0, :column=>i,
+ Tk::Tile::Checkbutton.new(tb, :text=>icon, :image=>$ICON[icon],
+ :variable=>$V.ref(icon),
+ :compound=>$V[:COMPOUND],
+ :style=>:Toolbutton).grid(:row=>0, :column=>i,
:sticky=>:news)
}
- mb = Tk::Tile::Menubutton.new(tb, :text=>'toolbar', :image=>$ICON['file'],
+ mb = Tk::Tile::Menubutton.new(tb, :text=>'toolbar', :image=>$ICON['file'],
:compound=>$V[:COMPOUND])
mb.configure(:menu=>makeCompoundMenu(mb))
i += 1
@@ -240,21 +240,21 @@ def makeToolbars
i = 0
$BUTTONS.each{|icon|
i += 1
- TkButton.new(tb, :text=>icon, :image=>$ICON[icon],
- :compound=>$V[:COMPOUND], :relief=>:flat,
- :overrelief=>:raised).grid(:row=>0, :column=>i,
+ TkButton.new(tb, :text=>icon, :image=>$ICON[icon],
+ :compound=>$V[:COMPOUND], :relief=>:flat,
+ :overrelief=>:raised).grid(:row=>0, :column=>i,
:sticky=>:news)
}
$CHECKBOXES.each{|icon|
i += 1
- TkCheckbutton.new(tb, :text=>icon, :image=>$ICON[icon],
- :variable=>$V.ref(icon), :compound=>$V[:COMPOUND],
- :indicatoron=>false, :selectcolor=>'', :relief=>:flat,
- :overrelief=>:raised).grid(:row=>0, :column=>i,
+ TkCheckbutton.new(tb, :text=>icon, :image=>$ICON[icon],
+ :variable=>$V.ref(icon), :compound=>$V[:COMPOUND],
+ :indicatoron=>false, :selectcolor=>'', :relief=>:flat,
+ :overrelief=>:raised).grid(:row=>0, :column=>i,
:sticky=>:news)
}
- mb = TkMenubutton.new(tb, :text=>'toolbar', :image=>$ICON['file'],
+ mb = TkMenubutton.new(tb, :text=>'toolbar', :image=>$ICON['file'],
:compound=>$V[:COMPOUND])
mb.configure(:menu=>makeCompoundMenu(mb))
i += 1
@@ -270,8 +270,8 @@ end
def makeCompoundMenu(mb)
menu = TkMenu.new(mb)
%w(text image none top bottom left right center).each{|str|
- menu.add(:radiobutton, :label=>Tk.tk_call('string', 'totitle', str),
- :variable=>$V.ref(:COMPOUND), :value=>str,
+ menu.add(:radiobutton, :label=>Tk.tk_call('string', 'totitle', str),
+ :variable=>$V.ref(:COMPOUND), :value=>str,
:command=>proc{ changeToolbars() })
}
menu
@@ -289,7 +289,7 @@ makeThemeControl(control).grid(:sticky=>:news, :padx=>6, :ipadx=>6)
control.grid_rowconfigure(99, :weight=>1)
def changeToolbars
- foreachWidget($TOOLBARS,
+ foreachWidget($TOOLBARS,
proc{|w|
begin
w.compound($V[:COMPOUND])
@@ -350,7 +350,7 @@ nb, client, scales, combo, tree, others = makeNotebook()
#
def fillMenu(menu)
%w(above below left right flush).each{|dir|
- menu.add(:command, :label=>Tk.tk_call('string', 'totitle', dir),
+ menu.add(:command, :label=>Tk.tk_call('string', 'totitle', dir),
:command=>proc{ menu.winfo_parent.direction(dir) })
}
menu.add(:cascade, :label=>'Submenu', :menu=>(submenu = TkMenu.new(menu)))
@@ -366,14 +366,14 @@ l = Tk::Tile::Labelframe.new(client, :text=>'Themed', :padding=>6)
r = TkLabelframe.new(client, :text=>'Standard', :padx=>6, :pady=>6)
## Styled frame
-cb = Tk::Tile::Checkbutton.new(l, :text=>'Checkbutton',
+cb = Tk::Tile::Checkbutton.new(l, :text=>'Checkbutton',
:variable=>$V.ref(:SELECTED), :underline=>2)
-rb1 = Tk::Tile::Radiobutton.new(l, :text=>'One', :variable=>$V.ref(:CHOICE),
+rb1 = Tk::Tile::Radiobutton.new(l, :text=>'One', :variable=>$V.ref(:CHOICE),
:value=>1, :underline=>0)
-rb2 = Tk::Tile::Radiobutton.new(l, :text=>'Two', :variable=>$V.ref(:CHOICE),
+rb2 = Tk::Tile::Radiobutton.new(l, :text=>'Two', :variable=>$V.ref(:CHOICE),
:value=>2)
-rb3 = Tk::Tile::Radiobutton.new(l, :text=>'Three',
- :variable=>$V.ref(:CHOICE),
+rb3 = Tk::Tile::Radiobutton.new(l, :text=>'Three',
+ :variable=>$V.ref(:CHOICE),
:value=>3, :underline=>0)
btn = Tk::Tile::Button.new(l, :text=>'Button', :underline=>0)
@@ -386,9 +386,9 @@ $entryText = TkVariable.new('Entry widget')
e = Tk::Tile::Entry.new(l, :textvariable=>$entryText)
e.selection_range(6, :end)
-ltext_f, ltext = scrolledWidget(l, TkText, true,
+ltext_f, ltext = scrolledWidget(l, TkText, true,
:width=>12, :height=>5, :wrap=>:none)
-# NOTE TO MAINTAINERS:
+# NOTE TO MAINTAINERS:
# The checkbuttons are -sticky ew / -expand x on purpose:
# it demonstrates one of the differences between TCheckbuttons
# and standard checkbuttons.
@@ -407,11 +407,11 @@ TkGrid.rowconfigure(l, 7, :weight=>1) # text widget (grid is a PITA)
## Orig frame
cb = TkCheckbutton.new(r, :text=>'Checkbutton', :variable=>$V.ref(:SELECTED))
-rb1 = TkRadiobutton.new(r, :text=>'One',
+rb1 = TkRadiobutton.new(r, :text=>'One',
:variable=>$V.ref(:CHOICE), :value=>1)
-rb2 = TkRadiobutton.new(r, :text=>'Two', :variable=>$V.ref(:CHOICE),
+rb2 = TkRadiobutton.new(r, :text=>'Two', :variable=>$V.ref(:CHOICE),
:value=>2, :underline=>1)
-rb3 = TkRadiobutton.new(r, :text=>'Three',
+rb3 = TkRadiobutton.new(r, :text=>'Three',
:variable=>$V.ref(:CHOICE), :value=>3)
btn = TkButton.new(r, :text=>'Button')
@@ -420,14 +420,14 @@ m = TkMenu.new(mb)
mb.menu(m)
$V[:rmbIndicatoron] = mb.indicatoron
m.add(:checkbutton, :label=>'Indicator?', #'
- :variable=>$V.ref(:rmbIndicatoron),
+ :variable=>$V.ref(:rmbIndicatoron),
:command=>proc{mb.indicatoron($V[:rmbIndicatoron])})
m.add(:separator)
fillMenu(m)
e = TkEntry.new(r, :textvariable=>$entryText)
-rtext_f, rtext = scrolledWidget(r, TkText, false,
+rtext_f, rtext = scrolledWidget(r, TkText, false,
:width=>12, :height=>5, :wrap=>:none)
Tk.grid(cb, :sticky=>:ew)
@@ -450,9 +450,9 @@ TkGrid.columnconfigure(client, [0, 1], :weight=>1)
# Add some text to the text boxes:
#
msgs = [
-"The cat crept into the crypt, crapped and crept out again",
-"Peter Piper picked a peck of pickled peppers",
-"How much wood would a woodchuck chuck if a woodchuck could chuck wood",
+"The cat crept into the crypt, crapped and crept out again",
+"Peter Piper picked a peck of pickled peppers",
+"How much wood would a woodchuck chuck if a woodchuck could chuck wood",
"He thrusts his fists against the posts and still insists he sees the ghosts",
"Who put the bomb in the bom-b-bom-b-bom,",
"Is this your sister's sixth zither, sir?",
@@ -493,8 +493,8 @@ if version?('0.6')
scale.command {|value| progress.value(value)}
vscale.command {|value| progress.inverted(vprogress, value) }
else
- # This would also work, but the Tk scale widgets
- # in the right hand pane cause some interference when
+ # This would also work, but the Tk scale widgets
+ # in the right hand pane cause some interference when
# in autoincrement/indeterminate mode.
#
progress.variable $V.ref(:SCALE)
@@ -609,10 +609,10 @@ scales.grid_rowconfigure(0, :weight=>1)
# Command box:
#
cmd = Tk::Tile::Frame.new($BASE)
-b_close = Tk::Tile::Button.new(cmd, :text=>'Close',
- :underline=>0, :default=>:normal,
+b_close = Tk::Tile::Button.new(cmd, :text=>'Close',
+ :underline=>0, :default=>:normal,
:command=>proc{Tk.root.destroy})
-b_help = Tk::Tile::Button.new(cmd, :text=>'Help', :underline=>0,
+b_help = Tk::Tile::Button.new(cmd, :text=>'Help', :underline=>0,
:default=>:normal, :command=>proc{showHelp()})
Tk.grid('x', b_close, b_help, :pady=>[6, 4], :padx=>4)
TkGrid.columnconfigure(cmd, 0, :weight=>1)
@@ -639,20 +639,20 @@ menu = TkMenu.new($BASE)
$ROOT.menu(menu)
m_file = TkMenu.new(menu, :tearoff=>0)
menu.add(:cascade, :label=>'File', :underline=>0, :menu=>m_file)
-m_file.add(:command, :label=>'Open', :underline=>0,
+m_file.add(:command, :label=>'Open', :underline=>0,
:compound=>:left, :image=>$ICON['open'])
-m_file.add(:command, :label=>'Save', :underline=>0,
+m_file.add(:command, :label=>'Save', :underline=>0,
:compound=>:left, :image=>$ICON['save'])
m_file.add(:separator)
m_f_test = TkMenu.new(menu, :tearoff=>0)
m_file.add(:cascade, :label=>'Test submenu', :underline=>0, :menu=>m_f_test)
-m_file.add(:checkbutton, :label=>'Text check', :underline=>5,
+m_file.add(:checkbutton, :label=>'Text check', :underline=>5,
:variable=>$V.ref(:MENUCHECK1))
m_file.insert(:end, :separator)
if Tk.windowingsystem != 'x11'
TkConsole.create
- m_file.insert(:end, :checkbutton, :label=>'Console', :underline=>5,
+ m_file.insert(:end, :checkbutton, :label=>'Console', :underline=>5,
:variable=>$V.ref(:CONSOLE), :command=>proc{toggle_console()})
def toggle_console
if TkComm.bool($V[:CONSOLE])
@@ -663,7 +663,7 @@ if Tk.windowingsystem != 'x11'
end
end
-m_file.add(:command, :label=>'Exit', :underline=>1,
+m_file.add(:command, :label=>'Exit', :underline=>1,
:command=>proc{Tk.event_generate(b_close, '<Invoke>')})
%w(One Two Three Four).each{|lbl|
@@ -672,7 +672,7 @@ m_file.add(:command, :label=>'Exit', :underline=>1,
# Add Theme menu.
#
-menu.add(:cascade, :label=>'Theme', :underline=>3,
+menu.add(:cascade, :label=>'Theme', :underline=>3,
:menu=>makeThemeMenu(menu))
setTheme($V[:THEME])
@@ -710,7 +710,7 @@ if version?('0.5')
tree.grid_rowconfigure(0, :weight=>1)
tree.grid_propagate(0)
- # Add initial tree node:
+ # Add initial tree node:
# Later nodes will be added in <<TreeviewOpen>> binding.
treeview.insert('', 0, :id=>'.', :text=>'Main Window', :open=>false,
:values=>[TkWinfo.classname('.')])
@@ -758,20 +758,20 @@ showDescription.bind('Enter', proc{|w| msg.text($Desc[w.path])}, '%W')
showDescription.bind('Leave', proc{|w| msg.text('')}, '%W')
[
- [ :trackStates, "Widget states...",
- "Display/modify widget state bits" ],
+ [ :trackStates, "Widget states...",
+ "Display/modify widget state bits" ],
- [ :scrollbarResizeDemo, "Scrollbar resize behavior...",
- "Shows how Tile and standard scrollbars differ when they're sized too large" ],
+ [ :scrollbarResizeDemo, "Scrollbar resize behavior...",
+ "Shows how Tile and standard scrollbars differ when they're sized too large" ],
- [ :trackFocus, "Track keyboard focus..." ,
+ [ :trackFocus, "Track keyboard focus..." ,
"Display the name of the widget that currently has focus" ],
[ :repeatDemo, "Repeating buttons...",
"Demonstrates custom classes (see demos/repeater.tcl)" ]
].each{|demo_cmd, label, description|
- b = Tk::Tile::Button.new(others, :text=>label,
+ b = Tk::Tile::Button.new(others, :text=>label,
:command=>proc{ self.__send__(demo_cmd) })
$Desc[b.path] = description
b.bindtags <<= showDescription
@@ -825,16 +825,16 @@ def trackFocus
$focus = TkToplevel.new(:title=>'Keyboard focus')
i = 0
[
- ["Focus widget:", :Widget],
- ["Class:", :WidgetClass],
- ["Next:", :WidgetNext],
- ["Grab:", :Grab],
+ ["Focus widget:", :Widget],
+ ["Class:", :WidgetClass],
+ ["Next:", :WidgetNext],
+ ["Grab:", :Grab],
["Status:", :GrabStatus]
].each{|label, var_index|
- Tk.grid(Tk::Tile::Label.new($focus, :text=>label, :anchor=>:e),
- Tk::Tile::Label.new($focus,
- :textvariable=>$FocusInf.ref(var_index),
- :width=>40, :anchor=>:w, :relief=>:groove),
+ Tk.grid(Tk::Tile::Label.new($focus, :text=>label, :anchor=>:e),
+ Tk::Tile::Label.new($focus,
+ :textvariable=>$FocusInf.ref(var_index),
+ :width=>40, :anchor=>:w, :relief=>:groove),
:sticky=>:ew)
i += 1
}
@@ -857,7 +857,7 @@ def focusMonitor
$FocusInf[:Grab] = grab_wins = Tk.current_grabs
unless grab_wins.empty?
$FocusInf[:GrabStatus] = grab_wins[0].grab_status
- else
+ else
$FocusInf[:GrabStatus] = ''
end
@@ -869,13 +869,13 @@ end
#
$Widget = TkVariable.new
-TkBindTag::ALL.bind('Control-Shift-ButtonPress-1',
+TkBindTag::ALL.bind('Control-Shift-ButtonPress-1',
proc{|w|
$Widget.value = w
updateStates()
Tk.callback_break
}, '%W')
-$states_list = %w(active disabled focus pressed selected
+$states_list = %w(active disabled focus pressed selected
background indeterminate invalid default)
$states_btns = {}
$states = nil
@@ -893,17 +893,17 @@ def trackStates
l_inf = Tk::Tile::Label.new($states, :text=>"Press Control-Shift-Button-1 on any widget")
- l_lw = Tk::Tile::Label.new($states, :text=>'Widget:',
+ l_lw = Tk::Tile::Label.new($states, :text=>'Widget:',
:anchor=>:e, :relief=>:groove)
- l_w = Tk::Tile::Label.new($states, :textvariable=>$Widget,
+ l_w = Tk::Tile::Label.new($states, :textvariable=>$Widget,
:anchor=>:w, :relief=>:groove)
Tk.grid(l_inf, '-', :sticky=>:ew, :padx=>6, :pady=>6)
Tk.grid(l_lw, l_w, :sticky=>:ew)
$states_list.each{|st|
- cb = Tk::Tile::Checkbutton.new($states, :text=>st,
- :variable=>$State.ref(st),
+ cb = Tk::Tile::Checkbutton.new($states, :text=>st,
+ :variable=>$State.ref(st),
:command=>proc{ changeState(st) })
$states_btns[st] = cb
Tk.grid('x', cb, :sticky=>:nsew)
@@ -914,7 +914,7 @@ def trackStates
f_cmd = Tk::Tile::Frame.new($states)
Tk.grid('x', f_cmd, :sticky=>:nse)
- b_close = Tk::Tile::Button.new(f_cmd, :text=>'Close',
+ b_close = Tk::Tile::Button.new(f_cmd, :text=>'Close',
:command=>proc{ $states.destroy })
Tk.grid('x', b_close, :padx=>4, :pady=>[6,4])
f_cmd.grid_columnconfigure(0, :weight=>1)
diff --git a/ext/tk/sample/tkextlib/tile/themes/kroc.rb b/ext/tk/sample/tkextlib/tile/themes/kroc.rb
index 72a7c6901d..27006d847f 100644
--- a/ext/tk/sample/tkextlib/tile/themes/kroc.rb
+++ b/ext/tk/sample/tkextlib/tile/themes/kroc.rb
@@ -1,5 +1,5 @@
#
-# kroc.rb
+# kroc.rb
#
# based on:
# >> kroc.tcl - Copyright (C) 2004 David Zolli <kroc@kroc.tk>
@@ -15,30 +15,30 @@ else
end
def kroc_rb_settings
- # Tk::Tile::Style.default(TkRoot, :background=>'#FCB64F',
+ # Tk::Tile::Style.default(TkRoot, :background=>'#FCB64F',
# :troughcolor=>'#F8C278', :borderwidth=>1)
# or
- # Tk::Tile::Style.default(Tk.root, :background=>'#FCB64F',
+ # Tk::Tile::Style.default(Tk.root, :background=>'#FCB64F',
# :troughcolor=>'#F8C278', :borderwidth=>1)
# or
- # Tk::Tile::Style.default('.', :background=>'#FCB64F',
+ # Tk::Tile::Style.default('.', :background=>'#FCB64F',
# :troughcolor=>'#F8C278', :borderwidth=>1)
# or
- # Tk::Tile::Style.default(nil, :background=>'#FCB64F',
+ # Tk::Tile::Style.default(nil, :background=>'#FCB64F',
# :troughcolor=>'#F8C278', :borderwidth=>1)
# or
- Tk::Tile::Style.default(:background=>'#FCB64F', :troughcolor=>'#F8C278',
+ Tk::Tile::Style.default(:background=>'#FCB64F', :troughcolor=>'#F8C278',
:borderwidth=>1)
- # Tk::Tile::Style.default(TkRoot, :font=>Tk::Tile::Font::Default,
+ # Tk::Tile::Style.default(TkRoot, :font=>Tk::Tile::Font::Default,
# :borderwidth=>1)
# or
- # Tk::Tile::Style.default(Tk.root, :font=>Tk::Tile::Font::Default,
+ # Tk::Tile::Style.default(Tk.root, :font=>Tk::Tile::Font::Default,
# :borderwidth=>1)
# or
- # Tk::Tile::Style.default('.', :font=>Tk::Tile::Font::Default,
+ # Tk::Tile::Style.default('.', :font=>Tk::Tile::Font::Default,
# :borderwidth=>1)
# or
- # Tk::Tile::Style.default(nil, :font=>Tk::Tile::Font::Default,
+ # Tk::Tile::Style.default(nil, :font=>Tk::Tile::Font::Default,
# :borderwidth=>1)
# or
Tk::Tile::Style.default(:font=>Tk::Tile::Font::Default, :borderwidth=>1)
@@ -57,37 +57,37 @@ def kroc_rb_settings
# Tk::Tile::Style.default('TButton', :padding=>[10,4])
Tk::Tile::Style.default(Tk::Tile::TButton, :padding=>[10,4])
- # Tk::Tile::Style.default('TNotebook.Tab',
- Tk::Tile::Style.default($TNotebook_Tab,
+ # Tk::Tile::Style.default('TNotebook.Tab',
+ Tk::Tile::Style.default($TNotebook_Tab,
:padding=>[10, 3], :font=>Tk::Tile::Font::Default)
- # Tk::Tile::Style.map('TNotebook.Tab',
- Tk::Tile::Style.map($TNotebook_Tab,
- :background=>[:selected, '#FCB64F', '', '#FFE6BA'],
- :foreground=>['', 'black'],
+ # Tk::Tile::Style.map('TNotebook.Tab',
+ Tk::Tile::Style.map($TNotebook_Tab,
+ :background=>[:selected, '#FCB64F', '', '#FFE6BA'],
+ :foreground=>['', 'black'],
:padding=>[:selected, [10, 6, 10, 3]])
- # Tk::Tile::Style.map('TScrollbar',
- Tk::Tile::Style.map(Tk::Tile::TScrollbar,
- :background=>[:pressed, '#694418'],
- :arrowcolor=>[:pressed, '#FEF7CB'],
+ # Tk::Tile::Style.map('TScrollbar',
+ Tk::Tile::Style.map(Tk::Tile::TScrollbar,
+ :background=>[:pressed, '#694418'],
+ :arrowcolor=>[:pressed, '#FEF7CB'],
:relief=>[:pressed, :sunken])
- # Tk::Tile::Style.layout('Vertical.TScrollbar',
- Tk::Tile::Style.layout(Tk::Tile.style('Vertical', Tk::Tile::TScrollbar),
+ # Tk::Tile::Style.layout('Vertical.TScrollbar',
+ Tk::Tile::Style.layout(Tk::Tile.style('Vertical', Tk::Tile::TScrollbar),
['Scrollbar.trough', {:children=>[
- 'Scrollbar.uparrow', {:side=>:top},
- 'Scrollbar.downarrow', {:side=>:bottom},
- 'Scrollbar.uparrow', {:side=>:bottom},
+ 'Scrollbar.uparrow', {:side=>:top},
+ 'Scrollbar.downarrow', {:side=>:bottom},
+ 'Scrollbar.uparrow', {:side=>:bottom},
'Scrollbar.thumb', {:side=>:top, :expand=>true}
]}
])
- # Tk::Tile::Style.layout('Horizontal.TScrollbar',
- Tk::Tile::Style.layout(Tk::Tile.style('Horizontal', Tk::Tile::TScrollbar),
+ # Tk::Tile::Style.layout('Horizontal.TScrollbar',
+ Tk::Tile::Style.layout(Tk::Tile.style('Horizontal', Tk::Tile::TScrollbar),
['Scrollbar.trough', {:children=>[
- 'Scrollbar.leftarrow', {:side=>:left},
- 'Scrollbar.rightarrow', {:side=>:right},
- 'Scrollbar.leftarrow', {:side=>:right},
+ 'Scrollbar.leftarrow', {:side=>:left},
+ 'Scrollbar.rightarrow', {:side=>:right},
+ 'Scrollbar.leftarrow', {:side=>:right},
'Scrollbar.thumb', {:side=>:left, :expand=>true}
]}
])
@@ -96,15 +96,15 @@ def kroc_rb_settings
# Elements:
#
if Tk::Tile::TILE_SPEC_VERSION_ID >= 8
- Tk::Tile::Style.element_create('Button.button',
- :image,
+ Tk::Tile::Style.element_create('Button.button',
+ :image,
[ $images['button-n'],
- :pressed, $images['button-p'],
- :active, $images['button-h'],
+ :pressed, $images['button-p'],
+ :active, $images['button-h'],
], :border=>3, :sticky=>:ew)
- Tk::Tile::Style.element_create('Checkbutton.indicator',
- :image,
+ Tk::Tile::Style.element_create('Checkbutton.indicator',
+ :image,
[ $images['check-nu'],
[:pressed, :selected],$images['check-nc'],
:pressed, $images['check-nu'],
@@ -113,8 +113,8 @@ def kroc_rb_settings
:selected, $images['check-nc'],
], :sticky=>:w)
- Tk::Tile::Style.element_create('Radiobutton.indicator',
- :image,
+ Tk::Tile::Style.element_create('Radiobutton.indicator',
+ :image,
[ $images['radio-nu'],
[:pressed,:selected],$images['radio-nc'],
:pressed, $images['radio-nu'],
@@ -124,14 +124,14 @@ def kroc_rb_settings
], :sticky=>:w)
elsif TkPackage.vcompare(Tk::Tile.package_version, '0.5') >= 0
- Tk::Tile::Style.element_create('Button.button',
+ Tk::Tile::Style.element_create('Button.button',
:image, $images['button-n'],
:map=>[
- :pressed, $images['button-p'],
- :active, $images['button-h'],
+ :pressed, $images['button-p'],
+ :active, $images['button-h'],
], :border=>3, :sticky=>:ew)
- Tk::Tile::Style.element_create('Checkbutton.indicator',
+ Tk::Tile::Style.element_create('Checkbutton.indicator',
:image, $images['check-nu'],
:map=>[
[:pressed, :selected],$images['check-nc'],
@@ -141,7 +141,7 @@ def kroc_rb_settings
:selected, $images['check-nc'],
], :sticky=>:w)
- Tk::Tile::Style.element_create('Radiobutton.indicator',
+ Tk::Tile::Style.element_create('Radiobutton.indicator',
:image, $images['radio-nu'],
:map=>[
[:pressed, :selected],$images['radio-nc'],
@@ -152,14 +152,14 @@ def kroc_rb_settings
], :sticky=>:w)
else # tile 0.4 or earlier
- Tk::Tile::Style.element_create('Button.button', :pixmap,
+ Tk::Tile::Style.element_create('Button.button', :pixmap,
:images=>[
- :pressed, $images['button-p'],
- :active, $images['button-h'],
+ :pressed, $images['button-p'],
+ :active, $images['button-h'],
'', $images['button-n']
], :border=>3, :tiling=>:tile)
- Tk::Tile::Style.element_create('Checkbutton.indicator', :pixmap,
+ Tk::Tile::Style.element_create('Checkbutton.indicator', :pixmap,
:images=>[
[:pressed, :selected],$images['check-nc'],
:pressed, $images['check-nu'],
@@ -169,7 +169,7 @@ def kroc_rb_settings
'', $images['check-nu'],
], :tiling=>:fixed)
- Tk::Tile::Style.element_create('Radiobutton.indicator', :pixmap,
+ Tk::Tile::Style.element_create('Radiobutton.indicator', :pixmap,
:images=>[
[:pressed, :selected],$images['radio-nc'],
:pressed, $images['radio-nu'],
@@ -184,7 +184,7 @@ def kroc_rb_settings
#
# Settings:
#
- # Tk::Tile::Style.layout(Tk::Tile::TButton,
+ # Tk::Tile::Style.layout(Tk::Tile::TButton,
Tk::Tile::Style.layout('TButton', [
'Button.button', {:children=>[
'Button.focus', {:children=>[
@@ -195,12 +195,12 @@ def kroc_rb_settings
]}
])
- # Tk::Tile::Style.layout(Tk::Tile::TCheckbutton,
+ # Tk::Tile::Style.layout(Tk::Tile::TCheckbutton,
Tk::Tile::Style.layout('TCheckbutton', [
'Checkbutton.background', # this is not needed in tile 0.5 or later
'Checkbutton.border', {:children=>[
'Checkbutton.padding', {:children=>[
- 'Checkbutton.indicator', {:side=>:left},
+ 'Checkbutton.indicator', {:side=>:left},
'Checkbutton.focus', {:side=>:left, :children=>[
'Checkbutton.label'
]}
@@ -208,12 +208,12 @@ def kroc_rb_settings
]}
])
- # Tk::Tile::Style.layout(Tk::Tile::TRadiobutton,
+ # Tk::Tile::Style.layout(Tk::Tile::TRadiobutton,
Tk::Tile::Style.layout('TRadiobutton', [
'Radiobutton.background', # this is not needed in tile 0.5 or later
'Radiobutton.border', {:children=>[
'Radiobutton.padding', {:children=>[
- 'Radiobutton.indicator', {:side=>:left},
+ 'Radiobutton.indicator', {:side=>:left},
'Radiobutton.focus', {:expand=>true, :sticky=>:w, :children=>[
'Radiobutton.label', {:side=>:right, :expand=>true}
]}
@@ -222,5 +222,5 @@ def kroc_rb_settings
])
end
-Tk::Tile::Style.theme_create('kroc-rb', :parent=>'alt',
+Tk::Tile::Style.theme_create('kroc-rb', :parent=>'alt',
:settings=>proc{ kroc_rb_settings() })
diff --git a/ext/tk/sample/tkextlib/tkHTML/hv.rb b/ext/tk/sample/tkextlib/tkHTML/hv.rb
index 920eb15f5a..a4d78ea5b1 100644
--- a/ext/tk/sample/tkextlib/tkHTML/hv.rb
+++ b/ext/tk/sample/tkextlib/tkHTML/hv.rb
@@ -5,7 +5,7 @@
#
# This application is used for testing the HTML widget. It can
# also server as an example of how to use the HTML widget.
-#
+#
require 'tk'
require 'tkextlib/tkHTML'
@@ -51,11 +51,11 @@ show_img = TkVariable.new(1)
# html[:fontcommand] = pick_font
pick_font = proc{|size, attrs|
puts "FontCmd: #{size} #{attrs}"
- [ ((attrs =~ /fixed/)? 'courier': 'charter'),
- (12 * (1.2**(size.to_f - 4.0))).to_i,
- ((attrs =~ /italic/)? 'italic': 'roman'),
- ((attrs =~ /bold/)? 'bold': 'normal') ].join(' ')
-}
+ [ ((attrs =~ /fixed/)? 'courier': 'charter'),
+ (12 * (1.2**(size.to_f - 4.0))).to_i,
+ ((attrs =~ /italic/)? 'italic': 'roman'),
+ ((attrs =~ /bold/)? 'bold': 'normal') ].join(' ')
+}
#
# This routine is called for each form element
@@ -126,7 +126,7 @@ script_cmd = proc{|*args|
# This routine is called for every <APPLET> markup
#
-applet_cmd = proc{|w, arglist|
+applet_cmd = proc{|w, arglist|
# puts "AppletCmd: w=#{w} arglist=#{arglist}"
TkLabel.new(w, :text=>"The Applet #{w}", :bd=>2, :relief=>raised)
}
@@ -134,12 +134,12 @@ applet_cmd = proc{|w, arglist|
#
# Construct the main HTML viewer
#
-html = Tk::HTML_Widget.new(:padx=>5, :pady=>9,
- :formcommand=>form_cmd,
- :imagecommand=>image_cmd,
- :scriptcommand=>script_cmd,
- :appletcommand=>applet_cmd,
- :underlinehyperlinks=>0,
+html = Tk::HTML_Widget.new(:padx=>5, :pady=>9,
+ :formcommand=>form_cmd,
+ :imagecommand=>image_cmd,
+ :scriptcommand=>script_cmd,
+ :appletcommand=>applet_cmd,
+ :underlinehyperlinks=>0,
:bg=>'white', :tablerelief=>:raised)
vscr = html.yscrollbar(TkScrollbar.new)
hscr = html.xscrollbar(TkScrollbar.new)
@@ -166,7 +166,7 @@ read_file = proc{|name|
rescue
ret = nil
fp = nil
- Tk.messageBox(:icon=>'error', :message=>"fail to open '#{name}'",
+ Tk.messageBox(:icon=>'error', :message=>"fail to open '#{name}'",
:type=>:ok)
ensure
fp.close if fp
@@ -221,7 +221,7 @@ html.clipping_window.bind('1', href_binding, '%x %y')
html.clipping_window.bind('B1-Motion', proc{|w, x, y|
w.selection_set(priv['mark'], "@#{x},#{y}")
TkClipboard.clear
- # avoid tkhtml0.0 errors
+ # avoid tkhtml0.0 errors
# anyone can fix this for tkhtml0.0
begin
TkClipboard.append(TkSelection.get)
@@ -235,7 +235,7 @@ html.clipping_window.bind('B1-Motion', proc{|w, x, y|
last_dir = Dir.pwd
sel_load = proc{
filetypes = [
- ['Html Files', ['.html', '.htm']],
+ ['Html Files', ['.html', '.htm']],
['All Files', '*']
]
@@ -268,15 +268,15 @@ Tk::HTML_Widget::ClippingWindow.bind('Motion', proc{|w, x, y|
# Setup menu
#
menu_spec = [
- [['File', 0],
- ['Open', sel_load, 0],
- ['Refresh', refresh, 0],
+ [['File', 0],
+ ['Open', sel_load, 0],
+ ['Refresh', refresh, 0],
'---',
- ['Exit', proc{exit}, 1]],
+ ['Exit', proc{exit}, 1]],
- [['View', 0],
- ['Underline Hyperlinks', ul_hyper],
- ['Show Table Structure', show_tbl],
+ [['View', 0],
+ ['Underline Hyperlinks', ul_hyper],
+ ['Show Table Structure', show_tbl],
['Show Images', show_img]]
]
@@ -285,7 +285,7 @@ mbar = Tk.root.add_menubar(menu_spec)
#
# Setup trace
#
-ul_hyper.trace('w', proc{
+ul_hyper.trace('w', proc{
html[:underlinehyperlinks] = ul_hyper.value
refresh.call
})
diff --git a/ext/tk/sample/tkextlib/tkHTML/ss.rb b/ext/tk/sample/tkextlib/tkHTML/ss.rb
index 45d4d87d69..1c13d7ac34 100644
--- a/ext/tk/sample/tkextlib/tkHTML/ss.rb
+++ b/ext/tk/sample/tkextlib/tkHTML/ss.rb
@@ -2,7 +2,7 @@
#
# This script implements the "ss" application. "ss" implements
# a presentation slide-show based on HTML slides.
-#
+#
require 'tk'
require 'tkextlib/tkHTML'
@@ -45,18 +45,18 @@ EOD
@key_block = false
- Tk::HTML_Widget::ClippingWindow.bind('1',
- proc{|w, ksym| key_press(w, ksym)},
+ Tk::HTML_Widget::ClippingWindow.bind('1',
+ proc{|w, ksym| key_press(w, ksym)},
'%W Down')
- Tk::HTML_Widget::ClippingWindow.bind('3',
- proc{|w, ksym| key_press(w, ksym)},
+ Tk::HTML_Widget::ClippingWindow.bind('3',
+ proc{|w, ksym| key_press(w, ksym)},
'%W Up')
- Tk::HTML_Widget::ClippingWindow.bind('2',
- proc{|w, ksym| key_press(w, ksym)},
+ Tk::HTML_Widget::ClippingWindow.bind('2',
+ proc{|w, ksym| key_press(w, ksym)},
'%W Down')
- Tk::HTML_Widget::ClippingWindow.bind('KeyPress',
- proc{|w, ksym| key_press(w, ksym)},
+ Tk::HTML_Widget::ClippingWindow.bind('KeyPress',
+ proc{|w, ksym| key_press(w, ksym)},
'%W %K')
############################################
@@ -64,37 +64,37 @@ EOD
# Build the half-size view of the page
#
menu_spec = [
- [['File', 0],
- ['Open', proc{sel_load()}, 0],
- ['Full Screen', proc{fullscreen()}, 0],
- ['Refresh', proc{refresh()}, 0],
+ [['File', 0],
+ ['Open', proc{sel_load()}, 0],
+ ['Full Screen', proc{fullscreen()}, 0],
+ ['Refresh', proc{refresh()}, 0],
'---',
['Exit', proc{exit}, 1]]
]
mbar = @root.add_menubar(menu_spec)
- @html = Tk::HTML_Widget.new(:width=>512, :height=>384,
- :padx=>5, :pady=>9,
+ @html = Tk::HTML_Widget.new(:width=>512, :height=>384,
+ :padx=>5, :pady=>9,
:formcommand=>proc{|*args| form_cmd(*args)},
:imagecommand=>proc{|*args|
image_cmd(1, *args)
- },
+ },
:scriptcommand=>proc{|*args|
script_cmd(*args)
- },
+ },
:appletcommand=>proc{|*args|
applet_cmd(*args)
- },
- :hyperlinkcommand=>proc{|*args|
+ },
+ :hyperlinkcommand=>proc{|*args|
hyper_cmd(*args)
- },
+ },
:fontcommand=>proc{|*args|
pick_font(*args)
- },
+ },
:appletcommand=>proc{|*args|
run_applet('small', *args)
- },
+ },
:bg=>'white', :tablerelief=>:raised)
@html.token_handler('meta', proc{|*args| meta(@html, *args)})
@@ -127,9 +127,9 @@ EOD
# html[:fontcommand] = pick_font
def pick_font(size, attrs)
# puts "FontCmd: #{size} #{attrs}"
- [ ((attrs =~ /fixed/)? 'courier': 'charter'),
- (12 * (1.2**(size.to_f - 4.0))).to_i,
- ((attrs =~ /italic/)? 'italic': 'roman'),
+ [ ((attrs =~ /fixed/)? 'courier': 'charter'),
+ (12 * (1.2**(size.to_f - 4.0))).to_i,
+ ((attrs =~ /italic/)? 'italic': 'roman'),
((attrs =~ /bold/)? 'bold': 'normal') ].join(' ')
end
@@ -139,9 +139,9 @@ EOD
baseFontSize = 24
# puts "FontCmd: #{size} #{attrs}"
- [ ((attrs =~ /fixed/)? 'courier': 'charter'),
- (baseFontSize * (1.2**(size.to_f - 4.0))).to_i,
- ((attrs =~ /italic/)? 'italic': 'roman'),
+ [ ((attrs =~ /fixed/)? 'courier': 'charter'),
+ (baseFontSize * (1.2**(size.to_f - 4.0))).to_i,
+ ((attrs =~ /italic/)? 'italic': 'roman'),
((attrs =~ /bold/)? 'bold': 'normal') ].join(' ')
end
@@ -244,7 +244,7 @@ EOD
#
def sel_load
filetypes = [
- ['Html Files', ['.html', '.htm']],
+ ['Html Files', ['.html', '.htm']],
['All Files', '*']
]
@@ -280,7 +280,7 @@ EOD
rescue
ret = nil
fp = nil
- Tk.messageBox(:icon=>'error', :message=>"fail to open '#{name}'",
+ Tk.messageBox(:icon=>'error', :message=>"fail to open '#{name}'",
:type=>:ok)
ensure
fp.close if fp
@@ -371,32 +371,32 @@ EOD
width = @root.winfo_screenwidth
height = @root.winfo_screenheight
- @fswin = TkToplevel.new(:overrideredirect=>true,
+ @fswin = TkToplevel.new(:overrideredirect=>true,
:geometry=>"#{width}x#{height}+0+0")
- @html_fs = Tk::HTML_Widget.new(@fswin, :padx=>5, :pady=>9,
+ @html_fs = Tk::HTML_Widget.new(@fswin, :padx=>5, :pady=>9,
:formcommand=>proc{|*args|
form_cmd(*args)
},
- :imagecommand=>proc{|*args|
+ :imagecommand=>proc{|*args|
image_cmd(0, *args)
- },
+ },
:scriptcommand=>proc{|*args|
script_cmd(*args)
- },
+ },
:appletcommand=>proc{|*args|
applet_cmd(*args)
- },
- :hyperlinkcommand=>proc{|*args|
+ },
+ :hyperlinkcommand=>proc{|*args|
hyper_cmd(*args)
- },
+ },
:appletcommand=>proc{|*args|
run_applet('big', *args)
- },
+ },
:fontcommand=>proc{|*args|
pick_font_fs(*args)
- },
- :bg=>'white', :tablerelief=>:raised,
+ },
+ :bg=>'white', :tablerelief=>:raised,
:cursor=>:tcross) {
pack(:fill=>:both, :expand=>true)
token_handler('meta', proc{|*args| meta(self, *args)})
diff --git a/ext/tk/sample/tkextlib/tkimg/demo.rb b/ext/tk/sample/tkextlib/tkimg/demo.rb
index d453e8ee9d..a0c4d1b64f 100644
--- a/ext/tk/sample/tkextlib/tkimg/demo.rb
+++ b/ext/tk/sample/tkextlib/tkimg/demo.rb
@@ -2,7 +2,7 @@
#
# Tk::Img demo
#
-# -- This script is based on demo.tcl of Tcl/Tk's 'Img' extention.
+# -- This script is based on demo.tcl of Tcl/Tk's 'Img' extention.
# Image data in this script is those of demo.tcl.
# Please read 'license_terms_of_Img_extension' file.
#
@@ -85,7 +85,7 @@ class TkImg_demo
Tk.update_idletasks
Tk.after(20, proc{update_animated_gif(w, :image, 0)})
rescue => e
- w.configure(:text=>"error displaying animated gif:\n#{e.message}",
+ w.configure(:text=>"error displaying animated gif:\n#{e.message}",
:image=>'', :relief=>:ridge)
end
w.pack
@@ -98,15 +98,15 @@ class TkImg_demo
TkLabel.new(@typeFrame[fmt], :text=>"#{fmt} : ").pack(:side=>:left)
end
begin
- f = TkFrame.new(@typeFrame[fmt],
+ f = TkFrame.new(@typeFrame[fmt],
:borderwidth=>2, :relief=>:ridge).pack(:side=>:left)
im = TkPhotoImage.new(:data=>data)
im['data'] = ''
TkLabel.new(f, :image=>im).pack
- TkLabel.new(f, :text=>type, :borderwidth=>0, :pady=>0, :padx=>2,
+ TkLabel.new(f, :text=>type, :borderwidth=>0, :pady=>0, :padx=>2,
:font=>'Helvetica 8').pack
rescue => e
- TkMessage.new(f, :text=>"error displaying #{type} image: #{e.message}",
+ TkMessage.new(f, :text=>"error displaying #{type} image: #{e.message}",
:aspect=>250).pack
end
Tk.update
diff --git a/ext/tk/sample/tkextlib/tktable/basic.rb b/ext/tk/sample/tkextlib/tktable/basic.rb
index dddbb776dc..0d2d48893a 100644
--- a/ext/tk/sample/tkextlib/tktable/basic.rb
+++ b/ext/tk/sample/tkextlib/tktable/basic.rb
@@ -3,7 +3,7 @@
## basic.rb
##
## This demo shows the basic use of the table widget
-##
+##
## ( based on 'basic.tcl' included source archive of tktable extension )
##
require 'tk'
@@ -22,19 +22,19 @@ cols = 8
lbl = TkLabel.new(:text=>"TkTable v1 Example")
-table = Tk::TkTable.new(:rows=>rows, :cols=>cols, :variable=>ary,
- :width=>6, :height=>6,
- :titlerows=>1, :titlecols=>2,
- :roworigin=>-1, :colorigin=>-2,
+table = Tk::TkTable.new(:rows=>rows, :cols=>cols, :variable=>ary,
+ :width=>6, :height=>6,
+ :titlerows=>1, :titlecols=>2,
+ :roworigin=>-1, :colorigin=>-2,
:rowstretchmode=>:last, :colstretchmode=>:last,
:rowtagcommand=>proc{|row|
row = Integer(row)
(row>0 && row%2 == 1)? 'OddRow': ''
- },
+ },
:coltagcommand=>proc{|col|
col = Integer(col)
(col>0 && col%2 == 1)? 'OddCol': ''
- },
+ },
:selectmode=>:extended, :sparsearray=>false)
sx = table.xscrollbar(TkScrollbar.new)
diff --git a/ext/tk/sample/tkextlib/tktable/buttons.rb b/ext/tk/sample/tkextlib/tktable/buttons.rb
index e35c137a28..b21e8673c2 100644
--- a/ext/tk/sample/tkextlib/tktable/buttons.rb
+++ b/ext/tk/sample/tkextlib/tktable/buttons.rb
@@ -14,11 +14,11 @@ tab = TkVariable.new_hash
rows = 20
cols = 20
-table = Tk::TkTable.new(:rows=>rows + 1, :cols=>cols + 1,
- :variable=>tab, :titlerows=>1, :titlecols=>1,
- :roworigin=>-1, :colorigin=>-1,
- :colwidth=>4, :width=>8, :height=>8,
- :cursor=>'top_left_arrow', :borderwidth=>2,
+table = Tk::TkTable.new(:rows=>rows + 1, :cols=>cols + 1,
+ :variable=>tab, :titlerows=>1, :titlecols=>1,
+ :roworigin=>-1, :colorigin=>-1,
+ :colwidth=>4, :width=>8, :height=>8,
+ :cursor=>'top_left_arrow', :borderwidth=>2,
:flashmode=>false, :state=>:disabled)
sx = table.xscrollbar(TkScrollbar.new)
@@ -67,7 +67,7 @@ table.bind('1', proc{|w, x, y|
0.step(cols){|j|
if i == 0
tab[-1,j] = j
- end
+ end
tab[i,j] = "OFF"
table.tag_cell('OFF', "#{i},#{j}")
}
diff --git a/ext/tk/sample/tkextlib/tktable/command.rb b/ext/tk/sample/tkextlib/tktable/command.rb
index e697ccf3bf..bf36159ccc 100644
--- a/ext/tk/sample/tkextlib/tktable/command.rb
+++ b/ext/tk/sample/tkextlib/tktable/command.rb
@@ -27,7 +27,7 @@ current = TkLabel.new(:textvariable=>cur_var, :width=>5)
ent_var = TkVariable.new
entry = TkEntry.new(:textvariable=>ent_var)
-table = Tk::TkTable.new(:rows=>rows, :cols=>cols,
+table = Tk::TkTable.new(:rows=>rows, :cols=>cols,
:command=>[proc{|mode, cell, val|
if (mode == :w)
data[cell] = val
@@ -38,10 +38,10 @@ table = Tk::TkTable.new(:rows=>rows, :cols=>cols,
'' # not exist
end
end
- }, '%i %C %s'],
- :width=>6, :height=>6,
- :titlerows=>1, :titlecols=>1,
- :roworigin=>-1, :colorigin=>-1,
+ }, '%i %C %s'],
+ :width=>6, :height=>6,
+ :titlerows=>1, :titlecols=>1,
+ :roworigin=>-1, :colorigin=>-1,
:rowstretchmode=>:last, :colstretchmode=>:last,
:rowtagcommand=>proc{|row|
row = Integer(row)
@@ -50,20 +50,20 @@ table = Tk::TkTable.new(:rows=>rows, :cols=>cols,
:coltagcommand=>proc{|col|
col = Integer(col)
(col>0 && col%2 == 1)? 'OddCol': ''
- },
- :selectmode=>:extended, :flashmode=>true,
+ },
+ :selectmode=>:extended, :flashmode=>true,
:rowstretch=>:unset, :colstretch=>:unset,
:browsecommand=>[proc{|w, s|
cur_var.value = s
ent_var.value = w.get(s)
- }, '%W %S'],
- :validate=>true,
- :validatecommand=>proc{|e|
+ }, '%W %S'],
+ :validate=>true,
+ :validatecommand=>proc{|e|
ent_var.value = e.new_value; true
})
=begin
:validatecommand=>[
- proc{|s|
+ proc{|s|
ent_var.value = s; true
}, '%S'])
=end
diff --git a/ext/tk/sample/tkextlib/tktable/debug.rb b/ext/tk/sample/tkextlib/tktable/debug.rb
index 016d5b353e..d5cd5e49ba 100644
--- a/ext/tk/sample/tkextlib/tktable/debug.rb
+++ b/ext/tk/sample/tkextlib/tktable/debug.rb
@@ -23,15 +23,15 @@ cols = 20
lbl = TkLabel.new(:text=>"TkTable v2 Example")
-table = Tk::TkTable.new(:rows=>rows, :cols=>cols, :variable=>ary,
- :width=>6, :height=>6,
- :titlerows=>1, :titlecols=>2,
- :roworigin=>-5, :colorigin=>-2,
+table = Tk::TkTable.new(:rows=>rows, :cols=>cols, :variable=>ary,
+ :width=>6, :height=>6,
+ :titlerows=>1, :titlecols=>2,
+ :roworigin=>-5, :colorigin=>-2,
:coltagcommand=>proc{|col|
col = Integer(col)
(col>0 && col%2 == 1)? 'OddCol': ''
- },
- :selectmode=>:extended, :flashmode=>true,
+ },
+ :selectmode=>:extended, :flashmode=>true,
:rowstretch=>:unset, :colstretch=>:unset,
:selecttitles=>false, :drawmode=>:single)
@@ -67,8 +67,8 @@ table.tag_cell('logo', [1,2], [2,3], [4,1])
table.tag_cell('dis', [2,1], [1,-1], [3,0])
table.set_width([-2,8], [-1,9], [0, 12], [4, 14])
-table.set([1,1], "multi-line\ntext\nmight be\ninteresting",
- [3,2], "more\nmulti-line\nplaying\n",
+table.set([1,1], "multi-line\ntext\nmight be\ninteresting",
+ [3,2], "more\nmulti-line\nplaying\n",
[2,2], "null\0byte")
# This is in the row span
diff --git a/ext/tk/sample/tkextlib/tktable/dynarows.rb b/ext/tk/sample/tkextlib/tktable/dynarows.rb
index cc72a021cf..d083e26559 100644
--- a/ext/tk/sample/tkextlib/tktable/dynarows.rb
+++ b/ext/tk/sample/tkextlib/tktable/dynarows.rb
@@ -5,7 +5,7 @@
## This demos shows the use of the validation mechanism of the table
## and uses the table's cache (no -command or -variable) with a cute
## dynamic row routine.
-##
+##
## ( based on 'dynarows.tcl' included source archive of tktable extension )
##
require 'tk'
@@ -24,7 +24,7 @@ def table_validate(w, idx)
begin
time = Tk.tk_call('clock', 'scan', val)
date = []
- Tk.tk_call('clock', 'format', time,
+ Tk.tk_call('clock', 'format', time,
:format=>'%m %d %Y').split(' ').each{|item|
date << item.sub(/^\s*0*/,'')
}
@@ -54,12 +54,12 @@ end
lbl = TkLabel.new(:text=>"Dynamic Date Validated Rows")
-table = Tk::TkTable.new(:rows=>2, :cols=>3, :cache=>1, :selecttype=>:row,
- :titlerows=>1, :titlecols=>1, :height=>5,
- :colstretch=>:unset, :rowstretch=>:unset,
- :autoclear=>true,
+table = Tk::TkTable.new(:rows=>2, :cols=>3, :cache=>1, :selecttype=>:row,
+ :titlerows=>1, :titlecols=>1, :height=>5,
+ :colstretch=>:unset, :rowstretch=>:unset,
+ :autoclear=>true,
:browsecommand=>[
- proc{|w,s| table_validate(w, s)},
+ proc{|w,s| table_validate(w, s)},
'%W %s'
])
table.set([0,1], 'Begin', [0,2], 'End', [1,0], '*')
diff --git a/ext/tk/sample/tkextlib/tktable/maxsize.rb b/ext/tk/sample/tkextlib/tktable/maxsize.rb
index 74e136c49c..aff68ff377 100644
--- a/ext/tk/sample/tkextlib/tktable/maxsize.rb
+++ b/ext/tk/sample/tkextlib/tktable/maxsize.rb
@@ -4,7 +4,7 @@
##
## This demo uses a really big table. The big startup time is in
## filling the table's Tcl array var.
-##
+##
## ( based on 'maxsize.tcl' included source archive of tktable extension )
##
require 'tk'
@@ -23,15 +23,15 @@ cols = 10
lbl = TkLabel.new(:text=>"TkTable v2 Example")
-table = Tk::TkTable.new(:rows=>rows, :cols=>cols, :variable=>ary,
- :width=>6, :height=>8,
- :titlerows=>1, :titlecols=>1,
+table = Tk::TkTable.new(:rows=>rows, :cols=>cols, :variable=>ary,
+ :width=>6, :height=>8,
+ :titlerows=>1, :titlecols=>1,
:coltagcommand=>proc{|col|
col = Integer(col)
(col>0 && col%2 == 1)? 'OddCol': ''
- },
- :selectmode=>:extended,
- :colstretch=>:unset, :rowstretch=>:unset,
+ },
+ :selectmode=>:extended,
+ :colstretch=>:unset, :rowstretch=>:unset,
:selecttitles=>false, :drawmode=>:slow)
sx = table.xscrollbar(TkScrollbar.new)
diff --git a/ext/tk/sample/tkextlib/tktable/spreadsheet.rb b/ext/tk/sample/tkextlib/tktable/spreadsheet.rb
index 2953b2e597..9da896f5a7 100644
--- a/ext/tk/sample/tkextlib/tktable/spreadsheet.rb
+++ b/ext/tk/sample/tkextlib/tktable/spreadsheet.rb
@@ -4,7 +4,7 @@
##
## This demos shows how you can simulate a 3D table
## and has other basic features to begin a basic spreadsheet
-##
+##
## ( based on 'spreadsheet.tcl' included source archive of tktable extension )
##
require 'tk'
@@ -67,15 +67,15 @@ optmenu = TkOptionMenubutton.new(page, *(%w(AA BB CC DD)))
fill_table(table_list, page.value)
fill_table(table_list, 'BB', Integer(rows/2), Integer(cols/2))
-table = Tk::TkTable.new(:rows=>rows, :cols=>cols, :width=>5, :height=>5,
- :variable=>table_list[page.value],
- :titlerows=>1, :titlecols=>1,
+table = Tk::TkTable.new(:rows=>rows, :cols=>cols, :width=>5, :height=>5,
+ :variable=>table_list[page.value],
+ :titlerows=>1, :titlecols=>1,
:coltagcommand=>proc{|n| colorize(n)},
- :flashmode=>true, :selectmode=>:extended,
- :colstretch=>:unset, :rowstretch=>:unset,
+ :flashmode=>true, :selectmode=>:extended,
+ :colstretch=>:unset, :rowstretch=>:unset,
:browsecommand=>proc{|e| cur_var.value = e.new_index})
-page.trace(:w, proc{|var, elem, op|
+page.trace(:w, proc{|var, elem, op|
changepage(table_list, table, entry, color, var, elem, op)
})
@@ -128,7 +128,7 @@ menu = TkMenu.new
m_file = TkMenu.new(menu)
Tk.root.menu(menu)
menu.add(:cascade, :label=>'File', :underline=>0, :menu=>m_file)
-m_file.add(:command, :label=>'Fill Array',
+m_file.add(:command, :label=>'Fill Array',
:command=>proc{ fill_table(table_list, page.value) })
m_file.add(:command, :label=>'Quit', :command=>proc{exit})
diff --git a/ext/tk/sample/tkextlib/tktable/tcllogo.gif b/ext/tk/sample/tkextlib/tktable/tcllogo.gif
index 4603d4ff41..4603d4ff41 100644..100755
--- a/ext/tk/sample/tkextlib/tktable/tcllogo.gif
+++ b/ext/tk/sample/tkextlib/tktable/tcllogo.gif
Binary files differ
diff --git a/ext/tk/sample/tkextlib/tktable/valid.rb b/ext/tk/sample/tkextlib/tktable/valid.rb
index 98e9c3855a..e5d3f11d84 100644
--- a/ext/tk/sample/tkextlib/tktable/valid.rb
+++ b/ext/tk/sample/tkextlib/tktable/valid.rb
@@ -4,7 +4,7 @@
##
## This demos shows the use of the validation mechanism of the table
## and uses the table's cache (no -command or -variable)
-##
+##
## ( based on 'valid.tcl' included source archive of tktable extension )
##
require 'tk'
@@ -53,12 +53,12 @@ end
lbl = TkLabel.new(:text=>"TkTable v1 Validated Table Example")
-table = Tk::TkTable.new(:rows=>rows, :cols=>cols, :cache=>1,
- :width=>5, :height=>5, :titlerows=>1, :titlecols=>1,
+table = Tk::TkTable.new(:rows=>rows, :cols=>cols, :cache=>1,
+ :width=>5, :height=>5, :titlerows=>1, :titlecols=>1,
:coltagcommand=>proc{|n| colorize(n)},
- :flashmode=>true, :selectmode=>:extended,
- :colstretch=>:unset, :rowstretch=>:unset,
- :validate=>true,
+ :flashmode=>true, :selectmode=>:extended,
+ :colstretch=>:unset, :rowstretch=>:unset,
+ :validate=>true,
:validatecommand=>proc{|e|
unless e.widget.tag_include?('title', e.index)
validate_proc(e.column, e.new_value)
diff --git a/ext/tk/sample/tkextlib/treectrl/bitmaps.rb b/ext/tk/sample/tkextlib/treectrl/bitmaps.rb
index 0d8b37b81e..745e6a2e5b 100644
--- a/ext/tk/sample/tkextlib/treectrl/bitmaps.rb
+++ b/ext/tk/sample/tkextlib/treectrl/bitmaps.rb
@@ -4,12 +4,12 @@
def demoBitmaps(t)
#if $Version_1_1_OrLater
if @has_bgimg
- t.configure(:showroot=>false, :showbuttons=>false, :showlines=>false,
- :selectmode=>:browse, :orient=>:horizontal, :wrap=>'5 items',
+ t.configure(:showroot=>false, :showbuttons=>false, :showlines=>false,
+ :selectmode=>:browse, :orient=>:horizontal, :wrap=>'5 items',
:showheader=>false, :backgroundimage=>@images['sky'])
else
- t.configure(:showroot=>false, :showbuttons=>false, :showlines=>false,
- :selectmode=>:browse, :orient=>:horizontal, :wrap=>'5 items',
+ t.configure(:showroot=>false, :showbuttons=>false, :showlines=>false,
+ :selectmode=>:browse, :orient=>:horizontal, :wrap=>'5 items',
:showheader=>false)
end
@@ -19,15 +19,15 @@ def demoBitmaps(t)
t.column_configure(0, :itembackground=>['gray90', []])
end
- t.element_create('elemTxt', :text,
+ t.element_create('elemTxt', :text,
:fill=>[@SystemHighlightText, ['selected', 'focus']])
- t.element_create('elemSelTxt', :rect, :showfocus=>true,
+ t.element_create('elemSelTxt', :rect, :showfocus=>true,
:fill=>[@SystemHighlight, ['selected', 'focus']])
- t.element_create('elemSelBmp', :rect, :outlinewidth=>4,
+ t.element_create('elemSelBmp', :rect, :outlinewidth=>4,
:outline=>[@SystemHighlight, ['selected', 'focus']])
- t.element_create('elemBmp', :bitmap,
- :foreground=>[@SystemHighlight, ['selected', 'focus']],
- :background=>'linen',
+ t.element_create('elemBmp', :bitmap,
+ :foreground=>[@SystemHighlight, ['selected', 'focus']],
+ :background=>'linen',
:bitmap=>['question' ['selected']])
s = t.style_create('STYLE', :orient=>:vertical)
@@ -42,7 +42,7 @@ def demoBitmaps(t)
t.defaultstyle = [s]
end
- bitmap_names = %w(error gray75 gray50 gray25 gray12
+ bitmap_names = %w(error gray75 gray50 gray25 gray12
hourglass info questhead question warning)
bitmap_names.each{|name|
@@ -60,15 +60,15 @@ def demoBitmaps(t)
t.item_style_set(i, 0, s)
t.item_text(i, 0, name)
if true
- t.item_element_configure(i, 0, 'elemBmp', :bitmap=>name,
- :foreground=>['brown', ''],
+ t.item_element_configure(i, 0, 'elemBmp', :bitmap=>name,
+ :foreground=>['brown', ''],
:background=>['', ''])
else
- t.item_element_configure(i, 0, 'elemBmp', :bitmap=>name,
+ t.item_element_configure(i, 0, 'elemBmp', :bitmap=>name,
:foreground=>[
- @SystemHighlight, ['selected', 'focus'],
+ @SystemHighlight, ['selected', 'focus'],
'brown', []
- ],
+ ],
:background=>['', []])
end
t.item_lastchild(:root, i)
diff --git a/ext/tk/sample/tkextlib/treectrl/demo.rb b/ext/tk/sample/tkextlib/treectrl/demo.rb
index 564a005bdc..eed95d0e1c 100644
--- a/ext/tk/sample/tkextlib/treectrl/demo.rb
+++ b/ext/tk/sample/tkextlib/treectrl/demo.rb
@@ -76,7 +76,7 @@ class TkTreeCtrl_demo
####################
- @tree2.bind('ButtonPress-3',
+ @tree2.bind('ButtonPress-3',
proc{|w, x, y, rootx, rooty|
show_list_popup(w, x, y, rootx, rooty)
}, '%W %x %y %X %Y')
@@ -94,7 +94,7 @@ class TkTreeCtrl_demo
####################
- @tree1.notify_bind(@tree1, 'Selection',
+ @tree1.notify_bind(@tree1, 'Selection',
proc{|c, t|
if c == 1
item = t.selection_get[0]
@@ -102,10 +102,10 @@ class TkTreeCtrl_demo
end
}, '%c %T')
- # When one item is selected in the demo list, display the styles in
+ # When one item is selected in the demo list, display the styles in
# that item.
# See DemoClear for why the tag "DontDelete" is used
- @tree2.notify_bind('DontDelete', 'Selection',
+ @tree2.notify_bind('DontDelete', 'Selection',
proc{|c, t|
display_styles_in_item(t.selection_get[0]) if c == 1
}, '%c %T')
@@ -156,13 +156,15 @@ class TkTreeCtrl_demo
@src_top = TkToplevel.new
f = TkFrame.new(@src_top, :borderwidth=>0)
case @thisPlatform
+ when 'macintosh', 'macos'
+ font = TkFont.new(['Geneva', 9])
when 'unix'
font = TkFont.new(['Courier', -12])
else
font = TkFont.new(['Courier', 9])
end
- @src_txt = TkText.new(f, :font=>font, :tabs=>font.measure('1234'),
+ @src_txt = TkText.new(f, :font=>font, :tabs=>font.measure('1234'),
:wrap=>:none)
xscr = @src_txt.xscrollbar(TkScrollbar.new(f))
yscr = @src_txt.yscrollbar(TkScrollbar.new(f))
@@ -196,6 +198,10 @@ class TkTreeCtrl_demo
def tree_plus_scrollbars_in_a_frame(parent, h, v)
f = TkFrame.new(parent, :borderwidth=>1, :relief=>:sunken)
case @thisPlatform
+ when 'macintosh'
+ font = TkFont.new(['Geneva', 9])
+ when 'macos'
+ font = TkFont.new(['Lucida Grande', 11])
when 'unix'
font = TkFont.new(['Helvetica', -12])
else
@@ -204,23 +210,23 @@ class TkTreeCtrl_demo
font = TkFont.new(['MS Sans', 8])
end
- tree = Tk::TreeCtrl.new(f, :highlightthickness=>0,
+ tree = Tk::TreeCtrl.new(f, :highlightthickness=>0,
:borderwidth=>0, :font=>font)
tree[:xscrollincrement] = 20
tree.debug_configure(:enable=>false, :display=>false)
if h
- h_scr = TkScrollbar.new(f, :orient=>:horizontal,
+ h_scr = TkScrollbar.new(f, :orient=>:horizontal,
:command=>proc{|*args| tree.xview(*args)})
- tree.notify_bind(h_scr, 'Scroll-x',
+ tree.notify_bind(h_scr, 'Scroll-x',
proc{|w, l, u| w.set(l, u)}, '%W %l %u')
h_scr.bind('ButtonPress-1', proc{tree.set_focus})
end
if v
- v_scr = TkScrollbar.new(f, :orient=>:vertical,
+ v_scr = TkScrollbar.new(f, :orient=>:vertical,
:command=>proc{|*args| tree.yview(*args)})
- tree.notify_bind(v_scr, 'Scroll-y',
+ tree.notify_bind(v_scr, 'Scroll-y',
proc{|w, l, u| w.set(l, u)}, '%W %l %u')
v_scr.bind('ButtonPress-1', proc{tree.set_focus})
end
@@ -238,7 +244,7 @@ class TkTreeCtrl_demo
Tk.root.title('Tk::TreeCtrl Demo')
case @thisPlatform
- when 'macosx'
+ when 'macintosh', 'macosx'
Tk.root.geometry('+40+40')
else
Tk.root.geometry('+0+30')
@@ -249,13 +255,13 @@ class TkTreeCtrl_demo
# Tree + scrollbar: demos
f1, @tree1 = tree_plus_scrollbars_in_a_frame(nil, false, true)
- @tree1.configure(:showbuttons=>false, :showlines=>:false,
+ @tree1.configure(:showbuttons=>false, :showlines=>:false,
:showroot=>false, :height=>100)
if $HasColumnCreate
- @tree1.column_create(:text=>'List of Demos',
+ @tree1.column_create(:text=>'List of Demos',
:expand=>true, :button=>false)
else
- @tree1.column_configure(0, :text=>'List of Demos',
+ @tree1.column_configure(0, :text=>'List of Demos',
:expand=>true, :button=>false)
end
@@ -263,10 +269,10 @@ class TkTreeCtrl_demo
f4, @tree4 = tree_plus_scrollbars_in_a_frame(nil, false, true)
@tree4.configure(:showroot=>false, :height=>140)
if $HasColumnCreate
- @tree4.column_create(:text=>'Elements and Styles',
+ @tree4.column_create(:text=>'Elements and Styles',
:expand=>true, :button=>false)
else
- @tree4.column_configure(0, :text=>'Elements and Styles',
+ @tree4.column_configure(0, :text=>'Elements and Styles',
:expand=>true, :button=>false)
end
@@ -274,10 +280,10 @@ class TkTreeCtrl_demo
f3, @tree3 = tree_plus_scrollbars_in_a_frame(nil, false, true)
@tree3.configure(:showroot=>false)
if $HasColumnCreate
- @tree3.column_create(:text=>'Styles in Item',
+ @tree3.column_create(:text=>'Styles in Item',
:expand=>true, :button=>false)
else
- @tree3.column_configure(0, :text=>'Styles in Item',
+ @tree3.column_configure(0, :text=>'Styles in Item',
:expand=>true, :button=>false)
end
@@ -290,7 +296,7 @@ class TkTreeCtrl_demo
# Tree + scrollbars
f2, @tree2 = tree_plus_scrollbars_in_a_frame(f2_base, true, true)
@tree2.configure(:indent=>19)
- @tree2.debug_configure(:enable=>false, :display=>true,
+ @tree2.debug_configure(:enable=>false, :display=>true,
:erasecolor=>'pink', :displaydelay=>30)
# Give it a big border to debug drawing
@@ -343,7 +349,7 @@ class TkTreeCtrl_demo
@popup[:show] = Hash.new{|h, k| h[k] = TkVariable.new}
menuspec = [
- [ 'Collapse', [], nil, '', {:menu_config=>{:tearoff=>false}} ],
+ [ 'Collapse', [], nil, '', {:menu_config=>{:tearoff=>false}} ],
[ 'Expand', [], nil, '', {:menu_config=>{:tearoff=>false}} ]
]
@@ -351,61 +357,61 @@ class TkTreeCtrl_demo
# if $Version_1_1_OrLater
if @has_bgimg
menuspec << \
- [ 'Background Image',
+ [ 'Background Image',
[
- [ 'none', [@popup[:bgimg], 'none'], nil, '',
- {:command=>proc{@tree2.backgroundimage = ''}} ],
- [ 'sky', [@popup[:bgimg], 'sky'], nil, '',
+ [ 'none', [@popup[:bgimg], 'none'], nil, '',
+ {:command=>proc{@tree2.backgroundimage = ''}} ],
+ [ 'sky', [@popup[:bgimg], 'sky'], nil, '',
{:command=>proc{
@tree2.backgroundimage = @images[@popup[:bgimg].value]}} ]
- ],
+ ],
nil, '', {:menu_config=>{:tearoff=>false}}
]
end
menuspec.concat([
- [ 'Background Mode',
+ [ 'Background Mode',
%w(column index row visindex).collect{|val|
- [ val, [@popup[:bgmode], val] , nil, '',
+ [ val, [@popup[:bgmode], val] , nil, '',
{:command=>proc{@tree2.backgroundmode = @popup[:bgmode].value}} ]
- },
+ },
nil, '', {:menu_config=>{:tearoff=>false}}
],
- [ 'Debug',
+ [ 'Debug',
[
- [ 'Data', @popup[:debug][:data], nil, '',
+ [ 'Data', @popup[:debug][:data], nil, '',
{:command=>proc{
@tree2.debug_configure(:data=>@popup[:debug][:data].value)
}
- } ],
- [ 'Display', @popup[:debug][:display], nil, '',
+ } ],
+ [ 'Display', @popup[:debug][:display], nil, '',
{:command=>proc{
@tree2.debug_configure(:display=>@popup[:debug][:display].value)
}
- } ],
- [ 'Enable', @popup[:debug][:enable], nil, '',
+ } ],
+ [ 'Enable', @popup[:debug][:enable], nil, '',
{:command=>proc{
@tree2.debug_configure(:enable=>@popup[:debug][:enable].value)
}
} ]
- ],
+ ],
nil, '', {:menu_config=>{:tearoff=>false}}
],
- [ 'Buffering',
+ [ 'Buffering',
[
- [ 'none', [@popup[:doublebuffer], 'none'], nil, '',
+ [ 'none', [@popup[:doublebuffer], 'none'], nil, '',
{:command=>proc{
@tree2.doublebuffer = @popup[:doublebuffer].value
}
- } ],
- [ 'item', [@popup[:doublebuffer], 'item'], nil, '',
+ } ],
+ [ 'item', [@popup[:doublebuffer], 'item'], nil, '',
{:command=>proc{
@tree2.doublebuffer = @popup[:doublebuffer].value
}
- } ],
- [ 'window', [@popup[:doublebuffer], 'window'], nil, '',
+ } ],
+ [ 'window', [@popup[:doublebuffer], 'window'], nil, '',
{:command=>proc{
@tree2.doublebuffer = @popup[:doublebuffer].value
}
@@ -414,62 +420,62 @@ class TkTreeCtrl_demo
nil, '', {:menu_config=>{:tearoff=>false}}
],
- [ 'Line style',
+ [ 'Line style',
[
- [ 'dot', [@popup[:linestyle], 'dot'], nil, '',
- {:command=>proc{@tree2.linestyle = @popup[:linestyle].value}} ],
- [ 'solid', [@popup[:linestyle], 'solid'], nil, '',
+ [ 'dot', [@popup[:linestyle], 'dot'], nil, '',
+ {:command=>proc{@tree2.linestyle = @popup[:linestyle].value}} ],
+ [ 'solid', [@popup[:linestyle], 'solid'], nil, '',
{:command=>proc{@tree2.linestyle = @popup[:linestyle].value}} ]
- ],
+ ],
nil, '', {:menu_config=>{:tearoff=>false}}
],
- [ 'Orient',
+ [ 'Orient',
[
- [ 'Horizontal', [@popup[:orient], 'horizontal'], nil, '',
- {:command=>proc{@tree2.orient = @popup[:orient].value}} ],
- [ 'Vertical', [@popup[:orient], 'vertical'], nil, '',
+ [ 'Horizontal', [@popup[:orient], 'horizontal'], nil, '',
+ {:command=>proc{@tree2.orient = @popup[:orient].value}} ],
+ [ 'Vertical', [@popup[:orient], 'vertical'], nil, '',
{:command=>proc{@tree2.orient = @popup[:orient].value}} ]
- ],
+ ],
nil, '', {:menu_config=>{:tearoff=>false}}
],
- [ 'Selectmode',
+ [ 'Selectmode',
%w(list browse extended multiple single).collect{|val|
- [ val, [@popup[:selectmode], val] , nil, '',
+ [ val, [@popup[:selectmode], val] , nil, '',
{:command=>proc{@tree2.selectmode = @popup[:selectmode].value}} ]
- },
+ },
nil, '', {:menu_config=>{:tearoff=>false}}
],
- [ 'Show',
+ [ 'Show',
[
- [ 'Buttons', @popup[:show][:buttons], nil, '',
+ [ 'Buttons', @popup[:show][:buttons], nil, '',
{:command=>proc{
@tree2.showbuttons = @popup[:show][:buttons].value
}
- } ],
- [ 'Header', @popup[:show][:header], nil, '',
+ } ],
+ [ 'Header', @popup[:show][:header], nil, '',
{:command=>proc{
@tree2.showheader = @popup[:show][:header].value
}
- } ],
- [ 'Lines', @popup[:show][:lines], nil, '',
+ } ],
+ [ 'Lines', @popup[:show][:lines], nil, '',
{:command=>proc{
@tree2.showlines = @popup[:show][:lines].value
}
- } ],
- [ 'Root', @popup[:show][:root], nil, '',
+ } ],
+ [ 'Root', @popup[:show][:root], nil, '',
{:command=>proc{
@tree2.showroot = @popup[:show][:root].value
}
- } ],
- [ 'Root Button', @popup[:show][:rootbutton], nil, '',
+ } ],
+ [ 'Root Button', @popup[:show][:rootbutton], nil, '',
{:command=>proc{
@tree2.showrootbutton = @popup[:show][:rootbutton].value
}
} ]
- ],
+ ],
nil, '', {:menu_config=>{:tearoff=>false}}
],
@@ -509,14 +515,14 @@ class TkTreeCtrl_demo
if id[0] == 'item'
item = id[1]
if $Version_1_1_OrLater
- m.add_command(:label=>"Item #{item}",
+ m.add_command(:label=>"Item #{item}",
:command=>proc{w.item_collapse(item)})
- m.add_command(:label=>"Item #{item} (recurse)",
+ m.add_command(:label=>"Item #{item} (recurse)",
:command=>proc{w.item_collapse_recurse(item)})
else
- m.add_command(:label=>"Item #{item}",
+ m.add_command(:label=>"Item #{item}",
:command=>proc{w.collapse(item)})
- m.add_command(:label=>"Item #{item} (recurse)",
+ m.add_command(:label=>"Item #{item} (recurse)",
:command=>proc{w.collapse_recurse(item)})
end
end
@@ -533,14 +539,14 @@ class TkTreeCtrl_demo
if id[0] == 'item'
item = id[1]
if $Version_1_1_OrLater
- m.add_command(:label=>"Item #{item}",
+ m.add_command(:label=>"Item #{item}",
:command=>proc{w.item_expand(item)})
- m.add_command(:label=>"Item #{item} (recurse)",
+ m.add_command(:label=>"Item #{item} (recurse)",
:command=>proc{w.item_expand_recurse(item)})
else
- m.add_command(:label=>"Item #{item}",
+ m.add_command(:label=>"Item #{item}",
:command=>proc{w.expand(item)})
- m.add_command(:label=>"Item #{item} (recurse)",
+ m.add_command(:label=>"Item #{item} (recurse)",
:command=>proc{w.expand_recurse(item)})
end
end
@@ -572,8 +578,8 @@ class TkTreeCtrl_demo
txt = w.column_cget(i, :text)
img_name = w.column_cget(i, :image)
img_name = @images.key(img_name) if img_name.kind_of?(TkImage)
- m.add_checkbutton(:variable=>@popup[:visible][i],
- :label=>"Column #{i} \"#{txt}\" [#{img_name}]",
+ m.add_checkbutton(:variable=>@popup[:visible][i],
+ :label=>"Column #{i} \"#{txt}\" [#{img_name}]",
:command=>proc{w.column_configure(i, :visible=>@popup[:visible][i].value)})
}
@@ -590,90 +596,90 @@ class TkTreeCtrl_demo
@popup[:justify] = TkVariable.new
menuspec = [
- [ 'Arrow',
+ [ 'Arrow',
[
- [ 'None', [@popup[:arrow], 'none'], nil, '',
+ [ 'None', [@popup[:arrow], 'none'], nil, '',
{:command=>proc{
@tree2.column_configure(@popup[:column].value, :arrow=>:none)
}
} ],
- [ 'Up', [@popup[:arrow], 'up'], nil, '',
+ [ 'Up', [@popup[:arrow], 'up'], nil, '',
{:command=>proc{
@tree2.column_configure(@popup[:column].value, :arrow=>:up)
}
} ],
- [ 'Down', [@popup[:arrow], 'down'], nil, '',
+ [ 'Down', [@popup[:arrow], 'down'], nil, '',
{:command=>proc{
@tree2.column_configure(@popup[:column].value, :arrow=>:down)
}
} ],
- '---',
+ '---',
- [ 'Side Left', [@popup[:arrowside], 'left'], nil, '',
+ [ 'Side Left', [@popup[:arrowside], 'left'], nil, '',
{:command=>proc{
- @tree2.column_configure(@popup[:column].value,
+ @tree2.column_configure(@popup[:column].value,
:arrowside=>:left)
}
} ],
- [ 'Side Right', [@popup[:arrowside], 'right'], nil, '',
+ [ 'Side Right', [@popup[:arrowside], 'right'], nil, '',
{:command=>proc{
- @tree2.column_configure(@popup[:column].value,
+ @tree2.column_configure(@popup[:column].value,
:arrowside=>:right)
}
} ],
- '---',
+ '---',
- [ 'Gravity Left', [@popup[:arrowgravity], 'left'], nil, '',
+ [ 'Gravity Left', [@popup[:arrowgravity], 'left'], nil, '',
{:command=>proc{
- @tree2.column_configure(@popup[:column].value,
+ @tree2.column_configure(@popup[:column].value,
:arrowgravity=>:left)
}
} ],
- [ 'Gravity Right', [@popup[:arrowgravity], 'right'], nil, '',
+ [ 'Gravity Right', [@popup[:arrowgravity], 'right'], nil, '',
{:command=>proc{
- @tree2.column_configure(@popup[:column].value,
+ @tree2.column_configure(@popup[:column].value,
:arrowgravity=>:right)
}
} ],
- ],
- nil, '', {:menu_config=>{:tearoff=>false}} ],
+ ],
+ nil, '', {:menu_config=>{:tearoff=>false}} ],
- [ 'Expand', @popup[:expand], nil, '',
+ [ 'Expand', @popup[:expand], nil, '',
{:command=>proc{
- @tree2.column_configure(@popup[:column].value,
+ @tree2.column_configure(@popup[:column].value,
:expand=>@popup[:expand].value)
}
} ],
- [ 'Squeeze', @popup[:squeeze], nil, '',
+ [ 'Squeeze', @popup[:squeeze], nil, '',
{:command=>proc{
- @tree2.column_configure(@popup[:column].value,
+ @tree2.column_configure(@popup[:column].value,
:squeeze=>@popup[:squeeze].value)
}
} ],
- [ 'Justify',
+ [ 'Justify',
[
- [ 'Left', [@popup[:justify], 'left'], nil, '',
+ [ 'Left', [@popup[:justify], 'left'], nil, '',
{:command=>proc{
@tree2.column_configure(@popup[:column].value, :justify=>:left)
}
} ],
- [ 'Center', [@popup[:justify], 'center'], nil, '',
+ [ 'Center', [@popup[:justify], 'center'], nil, '',
{:command=>proc{
- @tree2.column_configure(@popup[:column].value,
+ @tree2.column_configure(@popup[:column].value,
:justify=>:center)
}
} ],
- [ 'Right', [@popup[:justify], 'right'], nil, '',
+ [ 'Right', [@popup[:justify], 'right'], nil, '',
{:command=>proc{
- @tree2.column_configure(@popup[:column].value,
+ @tree2.column_configure(@popup[:column].value,
:justify=>:right)
}
} ]
- ],
+ ],
nil, '', {:menu_config=>{:tearoff=>false}} ]
]
@@ -707,7 +713,7 @@ class TkTreeCtrl_demo
def master._pub_display_styles_in_item(item)
display_styles_in_item(item)
end
- proc_disp_styles_in_item = proc{|item|
+ proc_disp_styles_in_item = proc{|item|
master._pub_display_styles_in_item(item)
}
@@ -771,15 +777,15 @@ class TkTreeCtrl_demo
def load_demo_scripts
# demo sources
[
- 'bitmaps',
- 'explorer',
- 'help',
- 'imovie',
- 'layout',
- 'mailwasher',
- 'outlook-folders',
- 'outlook-newgroup',
- 'random',
+ 'bitmaps',
+ 'explorer',
+ 'help',
+ 'imovie',
+ 'layout',
+ 'mailwasher',
+ 'outlook-folders',
+ 'outlook-newgroup',
+ 'random',
'www-options'
].each{|f|
@demo_scripts.load_demo(File.join(@ScriptDir, "#{f}.rb"))
@@ -789,18 +795,18 @@ class TkTreeCtrl_demo
###########################
def init_demo_list
- @tree1.element_create('e1', :text,
+ @tree1.element_create('e1', :text,
:fill=>[@SystemHighlightText, ['selected', 'focus']])
- @tree1.element_create('e2', :rect, :showfocus=>true,
+ @tree1.element_create('e2', :rect, :showfocus=>true,
:fill=>[
- @SystemHighlight, ['selected', 'focus'],
- 'gray', ['selected', '!focus'],
+ @SystemHighlight, ['selected', 'focus'],
+ 'gray', ['selected', '!focus'],
])
@tree1.style_create('s1')
@tree1.style_elements('s1', ['e2', 'e1'])
# Tk listbox has linespace + 1 height
- @tree1.style_layout('s1', 'e2', :union=>['e1'],
+ @tree1.style_layout('s1', 'e2', :union=>['e1'],
:ipadx=>2, :ipady=>[0, 1], :iexpand=>:e)
if $Version_1_1_OrLater
@@ -809,19 +815,19 @@ class TkTreeCtrl_demo
###
[
- ["Random #{@RandomN[0]} Items", :demoRandom, 'random.rb'],
- ["Random #{@RandomN[0]} Items, Button Images", :demoRandom2, 'random.rb'],
+ ["Random #{@RandomN[0]} Items", :demoRandom, 'random.rb'],
+ ["Random #{@RandomN[0]} Items, Button Images", :demoRandom2, 'random.rb'],
["Outlook Express (Folders)", :demoOutlookFolders, 'outlook-folders.rb'],
- ["Outlook Express (Newsgroup)", :demoOutlookNewsgroup, 'outlook-newgroup.rb'],
- ["Explorer (Details)", :demoExplorerDetails, 'explorer.rb'],
- ["Explorer (List)", :demoExplorerList, 'explorer.rb'],
- ["Explorer (Large icons)", :demoExplorerLargeIcons, 'explorer.rb'],
- ["Explorer (Small icons)", :demoExplorerSmallIcons, 'explorer.rb'],
- ["Internet Options", :demoInternetOptions, 'www-options.rb'],
- ["Help Contents", :demoHelpContents, 'help.rb'],
- ["Layout", :demoLayout, 'layout.rb'],
- ["MailWasher", :demoMailWasher, 'mailwasher.rb'],
- ["Bitmaps", :demoBitmaps, 'bitmaps.rb'],
+ ["Outlook Express (Newsgroup)", :demoOutlookNewsgroup, 'outlook-newgroup.rb'],
+ ["Explorer (Details)", :demoExplorerDetails, 'explorer.rb'],
+ ["Explorer (List)", :demoExplorerList, 'explorer.rb'],
+ ["Explorer (Large icons)", :demoExplorerLargeIcons, 'explorer.rb'],
+ ["Explorer (Small icons)", :demoExplorerSmallIcons, 'explorer.rb'],
+ ["Internet Options", :demoInternetOptions, 'www-options.rb'],
+ ["Help Contents", :demoHelpContents, 'help.rb'],
+ ["Layout", :demoLayout, 'layout.rb'],
+ ["MailWasher", :demoMailWasher, 'mailwasher.rb'],
+ ["Bitmaps", :demoBitmaps, 'bitmaps.rb'],
["iMovie", :demoIMovie, 'imovie.rb']
].each{|label, cmd, file|
item = @tree1.item_create
@@ -853,15 +859,15 @@ class TkTreeCtrl_demo
def display_styles_in_list
# Create elements and styles the first time this is called
if @tree4.style_names.empty?
- @tree4.element_create('e1', :text,
+ @tree4.element_create('e1', :text,
:fill=>[@SystemHighlightText,['selected','focus']])
- @tree4.element_create('e2', :text,
+ @tree4.element_create('e2', :text,
:fill=>[
- @SystemHighlightText, ['selected','focus'],
- '', ['selected','!focus'],
+ @SystemHighlightText, ['selected','focus'],
+ '', ['selected','!focus'],
'blue', []
])
- @tree4.element_create('e3', :rect, :showfocus=>true,
+ @tree4.element_create('e3', :rect, :showfocus=>true,
:fill=>[
@SystemHighlight, ['selected','focus'],
'gray', ['selected', '!focus']
@@ -874,13 +880,13 @@ class TkTreeCtrl_demo
@tree4.style_create('s2')
@tree4.style_elements('s2', ['e3', 'e1', 'e2'])
@tree4.style_layout('s2', 'e1', :padx=>[0,4])
- @tree4.style_layout('s2', 'e3', :union=>['e1', 'e2'],
+ @tree4.style_layout('s2', 'e3', :union=>['e1', 'e2'],
:ipadx=>1, :ipady=>[0,1])
end
# Clear the list
@tree4.item_delete(:all)
-
+
# One item for each element in the demo list
@tree2.element_names.sort.each{|elem|
if $Version_1_1_OrLater
@@ -892,7 +898,7 @@ class TkTreeCtrl_demo
@tree4.collapse(item)
end
@tree4.item_style_set(item, 0, 's1')
- @tree4.item_text(item, 0,
+ @tree4.item_text(item, 0,
"Element #{elem} (#{@tree2.element_type(elem)})")
# One item for each configuration option for this element
@@ -907,7 +913,7 @@ class TkTreeCtrl_demo
else
@tree4.item_style_set(item2, 0, 's2')
@tree4.item_complex(item2, [
- ['e1', {:text=>name}],
+ ['e1', {:text=>name}],
['e2', {:text=>current.inspect}]
])
end
@@ -942,7 +948,7 @@ class TkTreeCtrl_demo
@tree4.collapse(item2)
end
@tree4.item_style_set(item2, 0, 's1')
- @tree4.item_text(item2, 0,
+ @tree4.item_text(item2, 0,
"Element #{elem} (#{@tree2.element_type(elem)})")
# One item for each layout option for this element in this style
@@ -971,15 +977,15 @@ class TkTreeCtrl_demo
# Create elements and styles the first time this is called
if @tree3.style_names.empty?
- @tree3.element_create('e1', :text,
+ @tree3.element_create('e1', :text,
:fill=>[@SystemHighlightText,['selected','focus']])
- @tree3.element_create('e2', :text,
+ @tree3.element_create('e2', :text,
:fill=>[
- @SystemHighlightText, ['selected','focus'],
- '', ['selected','!focus'],
+ @SystemHighlightText, ['selected','focus'],
+ '', ['selected','!focus'],
'blue', []
])
- @tree3.element_create('e3', :rect, :showfocus=>true,
+ @tree3.element_create('e3', :rect, :showfocus=>true,
:fill=>[
@SystemHighlight, ['selected','focus'],
'gray', ['selected', '!focus']
@@ -992,7 +998,7 @@ class TkTreeCtrl_demo
@tree3.style_create('s2')
@tree3.style_elements('s2', ['e3', 'e1', 'e2'])
@tree3.style_layout('s2', 'e1', :padx=>[0,4])
- @tree3.style_layout('s2', 'e3', :union=>['e1', 'e2'],
+ @tree3.style_layout('s2', 'e3', :union=>['e1', 'e2'],
:ipadx=>1, :ipady=>[0,1])
end
# Clear the list
@@ -1008,7 +1014,7 @@ class TkTreeCtrl_demo
@tree3.collapse(item2)
end
@tree3.item_style_set(item2, 0, 's1')
- @tree3.item_element_configure(item2, 0, 'e1',
+ @tree3.item_element_configure(item2, 0, 'e1',
:text=>"Column #{column}: Style #{sty}")
button = false
@@ -1029,7 +1035,7 @@ class TkTreeCtrl_demo
@tree3.collapse(item3)
end
@tree3.item_style_set(item3, 0, 's1')
- @tree3.item_element_configure(item3, 0, 'e1',
+ @tree3.item_element_configure(item3, 0, 'e1',
:text=>"Element #{elem} (#{@tree2.element_type(elem)})")
# One item for each configuration option in this element
@@ -1046,13 +1052,13 @@ class TkTreeCtrl_demo
if sameAsMaster
@tree3.item_style_set(item4, 0, 's1')
@tree3.item_complex(item4, [
- ['e1',
+ ['e1',
{:text=>"#{name} #{current.inspect}"}]
])
else
@tree3.item_style_set(item4, 0, 's2')
@tree3.item_complex(item4, [
- ['e1', {:text=>name}],
+ ['e1', {:text=>name}],
['e2', {:text=>current.inspect}]
])
end
@@ -1112,28 +1118,28 @@ class TkTreeCtrl_demo
# Restore some happy defaults to the demo list
# if $Version_1_1_OrLater
if @has_bgimg
- @tree2.configure(:orient=>:vertical, :wrap=>'',
- :xscrollincrement=>0, :yscrollincrement=>0,
- :itemheight=>0, :showheader=>true,
- :background=>'white', :scrollmargin=>0,
- :xscrolldelay=>50, :yscrolldelay=>50,
- :openbuttonimage=>'', :closedbuttonimage=>'',
- :backgroundmode=>:row, :treecolumn=>0, :indent=>19,
+ @tree2.configure(:orient=>:vertical, :wrap=>'',
+ :xscrollincrement=>0, :yscrollincrement=>0,
+ :itemheight=>0, :showheader=>true,
+ :background=>'white', :scrollmargin=>0,
+ :xscrolldelay=>50, :yscrolldelay=>50,
+ :openbuttonimage=>'', :closedbuttonimage=>'',
+ :backgroundmode=>:row, :treecolumn=>0, :indent=>19,
:defaultstyle=>'', :backgroundimage=>'')
else
- @tree2.configure(:orient=>:vertical, :wrap=>'',
- :xscrollincrement=>0, :yscrollincrement=>0,
- :itemheight=>0, :showheader=>true,
- :background=>'white', :scrollmargin=>0,
- :xscrolldelay=>50, :yscrolldelay=>50,
- :openbuttonimage=>'', :closedbuttonimage=>'',
+ @tree2.configure(:orient=>:vertical, :wrap=>'',
+ :xscrollincrement=>0, :yscrollincrement=>0,
+ :itemheight=>0, :showheader=>true,
+ :background=>'white', :scrollmargin=>0,
+ :xscrolldelay=>50, :yscrolldelay=>50,
+ :openbuttonimage=>'', :closedbuttonimage=>'',
:backgroundmode=>:row, :treecolumn=>0, :indent=>19)
end
# Restore default bindings to the demo list
@tree2.bindtags = [ @tree2, Tk::TreeCtrl, @tree2.winfo_toplevel, :all ]
- @tree2.winfo_children.each{|w|
+ @tree2.winfo_children.each{|w|
w.destroy unless @non_clear_list.include?(w)
}
end
@@ -1147,8 +1153,8 @@ def cursor_window(top = nil)
top.destroy if top.kind_of?(TkWindow) && top.winfo_exist?
top = TkToplevel.new(:title=>'Cursor Window')
- c = TkCanvas.new(top, :background=>'white',
- :width=>50*10, :highlightthickness=>0,
+ c = TkCanvas.new(top, :background=>'white',
+ :width=>50*10, :highlightthickness=>0,
:borderwidth=>0).pack(:expand=>true, :fill=>:both)
cursors = %w(
X_cursor
@@ -1241,7 +1247,7 @@ def cursor_window(top = nil)
begin
c.cursor = cur
- r = TkcRectangle.new(c, x, y, x+50, y+40,
+ r = TkcRectangle.new(c, x, y, x+50, y+40,
:fill=>'gray90', :outline=>'black', :width=>2)
t = TkcText.new(c, x+50/2, y+4, :text=>cur, :anchor=>:n, :width=>42)
@@ -1278,10 +1284,10 @@ if Tk::PLATFORM['platform'] == 'unix' && Tk.windowingsystem != 'aqua'
loupe[:y] = 0 unless loupe[:y]
loupe[:auto] = true unless loupe[:auto]
loupe[:delay] = 500 unless loupe[:delay]
- loupe[:image] =
+ loupe[:image] =
TkPhotoImage.new(:width=>150, :height=>150) unless loupe[:image]
- top = TkToplevel.new(:geometry=>'-0+30',
+ top = TkToplevel.new(:geometry=>'-0+30',
:title=>'A little screen magnifier for X11')
TkLabel.new(top, :image=>loupe[:image]).pack
diff --git a/ext/tk/sample/tkextlib/treectrl/explorer.rb b/ext/tk/sample/tkextlib/treectrl/explorer.rb
index 1b8c2a8287..242777cbce 100644
--- a/ext/tk/sample/tkextlib/treectrl/explorer.rb
+++ b/ext/tk/sample/tkextlib/treectrl/explorer.rb
@@ -49,44 +49,44 @@ def demoExplorerDetails(t)
height = t.font.metrics(:linespace)
height = 18 if height < 18
- t.configure(:showroot=>false, :showbuttons=>false, :showlines=>false,
- :itemheight=>height, :selectmode=>:extended,
- :xscrollincrement=>20, :scrollmargin=>16,
+ t.configure(:showroot=>false, :showbuttons=>false, :showlines=>false,
+ :itemheight=>height, :selectmode=>:extended,
+ :xscrollincrement=>20, :scrollmargin=>16,
:xscrolldelay=>[500, 50], :yscrolldelay=>[500, 50])
init_pics('small-*')
if $HasColumnCreate
- t.column_create(:text=>'Name', :tag=>'name',
+ t.column_create(:text=>'Name', :tag=>'name',
:width=>200, :arrow=>:up, :arrowpad=>6)
- t.column_create(:text=>'Size', :tag=>'size', :justify=>:right,
+ t.column_create(:text=>'Size', :tag=>'size', :justify=>:right,
:width=>60, :arrowside=>:left, :arrowgravity=>:right)
t.column_create(:text=>'Type', :tag=>'type', :width=>120)
t.column_create(:text=>'Modified', :tag=>'modified', :width=>130)
else
- t.column_configure(0, :text=>'Name', :tag=>'name',
+ t.column_configure(0, :text=>'Name', :tag=>'name',
:width=>200, :arrow=>:up, :arrowpad=>6)
- t.column_configure(1, :text=>'Size', :tag=>'size', :justify=>:right,
+ t.column_configure(1, :text=>'Size', :tag=>'size', :justify=>:right,
:width=>60, :arrowside=>:left, :arrowgravity=>:right)
t.column_configure(2, :text=>'Type', :tag=>'type', :width=>120)
t.column_configure(3, :text=>'Modified', :tag=>'modified', :width=>130)
end
- t.element_create('e1', :image,
+ t.element_create('e1', :image,
:image=>[
- @sel_images['small-folder'], ['selected'],
+ @sel_images['small-folder'], ['selected'],
@images['small-folder'], []
])
- t.element_create('e2', :text, :lines=>1,
+ t.element_create('e2', :text, :lines=>1,
:fill=>[@SystemHighlightText, ['selected', 'focus']])
t.element_create('txtType', :text, :lines=>1)
- t.element_create('txtSize', :text, :lines=>1,
+ t.element_create('txtSize', :text, :lines=>1,
:datatype=>:integer, :format=>'%dKB')
- t.element_create('txtDate', :text, :lines=>1,
+ t.element_create('txtDate', :text, :lines=>1,
:datatype=>:time, :format=>'%d/%m/%y %I:%M %p')
t.element_create('e4', :rect, :showfocus=>true,
:fill=>[
- @SystemHighlight, ['selected', 'focus'],
+ @SystemHighlight, ['selected', 'focus'],
'gray', ['selected', '!focus']
])
@@ -116,23 +116,23 @@ def demoExplorerDetails(t)
@Priv[:sensitive, t] = [ ['name', 'styName', 'e1', 'e2'] ]
@Priv[:dragimage, t] = [ ['name', 'styName', 'e1', 'e2'] ]
- t.notify_bind(t, 'Edit-accept',
+ t.notify_bind(t, 'Edit-accept',
proc{|w, i, tt| w.item_text(i, 0, tt)}, '%T %I %t')
dir_proc = proc{|file|
item = t.item_create
t.item_style_set(item, 0, 'styName', 2, 'styType', 3, 'styDate')
- t.item_complex(item,
- [['e2', {:text=>File.basename(file)}]],
- [],
- [['txtType', {:text=>'Folder'}]],
+ t.item_complex(item,
+ [['e2', {:text=>File.basename(file)}]],
+ [],
+ [['txtType', {:text=>'Folder'}]],
[['txtDate', {:data=>File.mtime(file).tv_sec}]])
t.item_lastchild(:root, item)
}
file_proc = proc{|file|
item = t.item_create
- t.item_style_set(item, 0, 'styName', 1, 'stySize',
+ t.item_style_set(item, 0, 'styName', 1, 'stySize',
2, 'styType', 3, 'styDate')
ext = File.extname(file)
@@ -151,14 +151,14 @@ def demoExplorerDetails(t)
type = type[1..-1] << ' ' unless type.empty?
type << 'File'
- t.item_complex(item,
- [
- ['e1', {:image=>[@sel_images[img], ['selected'],
+ t.item_complex(item,
+ [
+ ['e1', {:image=>[@sel_images[img], ['selected'],
@images[img], []]}],
['e2', {:text=>File.basename(file)}]
- ],
- [ ['txtSize', {:data=>File.size(file)/1024 + 1}] ],
- [ ['txtType', {:text=>type}] ],
+ ],
+ [ ['txtSize', {:data=>File.size(file)/1024 + 1}] ],
+ [ ['txtType', {:text=>type}] ],
[ ['txtDate', {:data=>File.mtime(file).tv_sec}] ]
)
t.item_lastchild(:root, item)
@@ -167,7 +167,7 @@ def demoExplorerDetails(t)
demoExplorerAux(t, dir_proc, file_proc)
@SortColumn = 0
- t.notify_bind(t, 'Header-invoke',
+ t.notify_bind(t, 'Header-invoke',
proc{|w, c| explorerHeaderInvoke(t, w, c)}, '%T %C')
t.bindtags = [ t, 'TreeCtrlFileList', Tk::TreeCtrl, t.winfo_toplevel, :all ]
@@ -200,37 +200,37 @@ def explorerHeaderInvoke(t, w, c)
case t.column_cget(c, :tag)
when 'name'
if dirCount > 0
- t.item_sort(:root, order, {:last=>"root child #{lastDir}"},
+ t.item_sort(:root, order, {:last=>"root child #{lastDir}"},
{:column=>c, :dictionary=>true})
end
if dirCount < t.numitems - 1
- t.item_sort(:root, order, {:first=>"root child #{dirCount}"},
+ t.item_sort(:root, order, {:first=>"root child #{dirCount}"},
{:column=>c, :dictionary=>true})
end
when 'size'
if dirCount < t.numitems - 1
- t.item_sort(:root, order, {:first=>"root child #{dirCount}"},
- {:column=>c, :integer=>true},
+ t.item_sort(:root, order, {:first=>"root child #{dirCount}"},
+ {:column=>c, :integer=>true},
{:column=>'name', :dictionary=>true})
end
when 'type'
if dirCount < t.numitems - 1
- t.item_sort(:root, order, {:first=>"root child #{dirCount}"},
- {:column=>c, :dictionary=>true},
+ t.item_sort(:root, order, {:first=>"root child #{dirCount}"},
+ {:column=>c, :dictionary=>true},
{:column=>'name', :dictionary=>true})
end
when 'modified'
if dirCount > 0
- t.item_sort(:root, order, {:last=>"root child #{lastDir}"},
- {:column=>c, :integer=>true},
+ t.item_sort(:root, order, {:last=>"root child #{lastDir}"},
+ {:column=>c, :integer=>true},
{:column=>'name', :dictionary=>true})
end
if dirCount < t.numitems - 1
- t.item_sort(:root, order, {:first=>"root child #{dirCount}"},
- {:column=>c, :integer=>true},
+ t.item_sort(:root, order, {:first=>"root child #{dirCount}"},
+ {:column=>c, :integer=>true},
{:column=>'name', :dictionary=>true})
end
@@ -241,9 +241,9 @@ def demoExplorerLargeIcons(t)
# Item height is 32 for icon, 4 padding, 3 lines of text
itemHeight = 32 + 4 + t.font.metrics(:linespace) * 3
- t.configure(:showroot=>false, :showbuttons=>false, :showlines=>false,
- :selectmode=>:extended, :wrap=>:window, :orient=>:horizontal,
- :itemheight=>itemHeight, :showheader=>false, :scrollmargin=>16,
+ t.configure(:showroot=>false, :showbuttons=>false, :showlines=>false,
+ :selectmode=>:extended, :wrap=>:window, :orient=>:horizontal,
+ :itemheight=>itemHeight, :showheader=>false, :scrollmargin=>16,
:xscrolldelay=>[500, 50], :yscrolldelay=>[500, 50])
init_pics('big-*')
@@ -254,17 +254,17 @@ def demoExplorerLargeIcons(t)
t.column_configure(0, :width=>75)
end
- t.element_create('elemImg', :image,
+ t.element_create('elemImg', :image,
:image=>[
- @sel_images['big-folder'], ['selected'],
+ @sel_images['big-folder'], ['selected'],
@images['big-folder'], []
])
- t.element_create('elemTxt', :text, :justify=>:center,
- :lines=>1, :width=>71, :wrap=>:word,
+ t.element_create('elemTxt', :text, :justify=>:center,
+ :lines=>1, :width=>71, :wrap=>:word,
:fill=>[@SystemHighlightText, ['selected', 'focus']])
- t.element_create('elemSel', :rect, :showfocus=>true,
+ t.element_create('elemSel', :rect, :showfocus=>true,
:fill=>[
- @SystemHighlight, ['selected', 'focus'],
+ @SystemHighlight, ['selected', 'focus'],
'gray', ['selected']
])
@@ -272,7 +272,7 @@ def demoExplorerLargeIcons(t)
s = t.style_create('STYLE', :orient=>:vertical)
t.style_elements(s, ['elemSel', 'elemImg', 'elemTxt'])
t.style_layout(s, 'elemImg', :expand=>:we)
- t.style_layout(s, 'elemTxt',
+ t.style_layout(s, 'elemTxt',
:pady=>[4,0], :padx=>2, :squeeze=>:x, :expand=>:we)
t.style_layout(s, 'elemSel', :union=>['elemTxt'])
@@ -280,7 +280,7 @@ def demoExplorerLargeIcons(t)
@Priv[:sensitive, t] = [ [0, 'STYLE', 'elemImg', 'elemTxt'] ]
@Priv[:dragimage, t] = [ [0, 'STYLE', 'elemImg', 'elemTxt'] ]
- t.notify_bind(t, 'Edit-accept',
+ t.notify_bind(t, 'Edit-accept',
proc{|w, i, tt| w.item_text(i, 0, tt)}, '%T %I %t')
dir_proc = proc{|file|
@@ -310,9 +310,9 @@ def demoExplorerLargeIcons(t)
type = type[1..-1] << ' ' unless type.empty?
type << 'File'
- t.item_complex(item,
- [
- ['elemImg', {:image=>[@sel_images[img], ['selected'],
+ t.item_complex(item,
+ [
+ ['elemImg', {:image=>[@sel_images[img], ['selected'],
@images[img], []]}],
['elemTxt', {:text=>File.basename(file)}]
])
@@ -323,7 +323,7 @@ def demoExplorerLargeIcons(t)
t.activate(t.index('root firstchild'))
- t.notify_bind(t, 'ActiveItem',
+ t.notify_bind(t, 'ActiveItem',
proc{|w, a, c|
w.item_element_configure(a, 0, 'elemTxt', :lines=>'')
w.item_element_configure(c, 0, 'elemTxt', :lines=>3)
@@ -346,9 +346,9 @@ def demoExplorerList(t)
height = t.font.metrics(:linespace) + 2
height = 18 if height < 18
- t.configure(:showroot=>false, :showbuttons=>false, :showlines=>false,
- :itemheight=>height, :selectmode=>:extended, :wrap=>:window,
- :showheader=>false, :scrollmargin=>16,
+ t.configure(:showroot=>false, :showbuttons=>false, :showlines=>false,
+ :itemheight=>height, :selectmode=>:extended, :wrap=>:window,
+ :showheader=>false, :scrollmargin=>16,
:xscrolldelay=>[500, 50], :yscrolldelay=>[500, 50])
init_pics('small-*')
@@ -359,16 +359,16 @@ def demoExplorerList(t)
t.column_configure(0, :widthhack=>true)
end
- t.element_create('elemImg', :image,
+ t.element_create('elemImg', :image,
:image=>[
- @sel_images['small-folder'], ['selected'],
+ @sel_images['small-folder'], ['selected'],
@images['small-folder'], []
])
- t.element_create('elemTxt', :text, :lines=>1,
+ t.element_create('elemTxt', :text, :lines=>1,
:fill=>[@SystemHighlightText, ['selected', 'focus']])
- t.element_create('elemSel', :rect, :showfocus=>true,
+ t.element_create('elemSel', :rect, :showfocus=>true,
:fill=>[
- @SystemHighlight, ['selected', 'focus'],
+ @SystemHighlight, ['selected', 'focus'],
'gray', ['selected', '!focus']
])
@@ -383,7 +383,7 @@ def demoExplorerList(t)
@Priv[:sensitive, t] = [ [0, 'STYLE', 'elemImg', 'elemTxt'] ]
@Priv[:dragimage, t] = [ [0, 'STYLE', 'elemImg', 'elemTxt'] ]
- t.notify_bind(t, 'Edit-accept',
+ t.notify_bind(t, 'Edit-accept',
proc{|w, i, tt| w.item_text(i, 0, tt)}, '%T %I %t')
dir_proc = proc{|file|
@@ -413,9 +413,9 @@ def demoExplorerList(t)
type = type[1..-1] << ' ' unless type.empty?
type << 'File'
- t.item_complex(item,
- [
- ['elemImg', {:image=>[@sel_images[img], ['selected'],
+ t.item_complex(item,
+ [
+ ['elemImg', {:image=>[@sel_images[img], ['selected'],
@images[img], []]}],
['elemTxt', {:text=>File.basename(file)}]
])
diff --git a/ext/tk/sample/tkextlib/treectrl/help.rb b/ext/tk/sample/tkextlib/treectrl/help.rb
index 31ec9eb3f8..af026fc006 100644
--- a/ext/tk/sample/tkextlib/treectrl/help.rb
+++ b/ext/tk/sample/tkextlib/treectrl/help.rb
@@ -4,7 +4,7 @@
def demoHelpContents(t)
height = t.font.metrics(:linespace)
height = 18 if height < 18
- t.configure(:showroot=>false, :showbuttons=>false, :showlines=>false,
+ t.configure(:showroot=>false, :showbuttons=>false, :showlines=>false,
:itemheight=>height, :selectmode=>:browse)
init_pics('help-*')
@@ -20,16 +20,16 @@ def demoHelpContents(t)
t.element_create('e1', :image, :image=>@images['help-page'])
t.element_create('e2', :image, :image=>[
- @images['help-book-open'], ['open'],
- @images['help-book-closed'], [],
+ @images['help-book-open'], ['open'],
+ @images['help-book-closed'], [],
])
- t.element_create('e3', :text,
- :font=>[t.font.dup.underline(true), ['mouseover']],
+ t.element_create('e3', :text,
+ :font=>[t.font.dup.underline(true), ['mouseover']],
:fill=>[
- @SystemHighlightText, ['selected', 'focus'],
+ @SystemHighlightText, ['selected', 'focus'],
'blue', ['mouseover']
])
- t.element_create('e4', :rect, :showfocus=>true,
+ t.element_create('e4', :rect, :showfocus=>true,
:fill=>[@SystemHighlight, ['selected', 'focus']])
# book
@@ -49,21 +49,21 @@ def demoHelpContents(t)
parentList = [:root, '', '', '', '', '', '']
parent = :root
[
- [0, 's1', "Welcome to Help"],
- [0, 's2', "Introducing Windows 98"],
- [1, 's2', "How to Use Help"],
- [2, 's1', "Find a topic"],
+ [0, 's1', "Welcome to Help"],
+ [0, 's2', "Introducing Windows 98"],
+ [1, 's2', "How to Use Help"],
+ [2, 's1', "Find a topic"],
[2, 's1', "Get more out of help"],
[1, 's2', "Register Your Software"],
- [2, 's1', "Registering Windows 98 online"],
- [1, 's2', "What's New in Windows 98"],
- [2, 's1', "Innovative, easy-to-use features"],
- [2, 's1', "Improved reliability"],
- [2, 's1', "A faster operating system"],
- [2, 's1', "True Web integration"],
- [2, 's1', "More entertaining and fun"],
- [1, 's2', "If You're New to Windows 98"],
- [2, 's2', "Tips for Macintosh Users"],
+ [2, 's1', "Registering Windows 98 online"],
+ [1, 's2', "What's New in Windows 98"],
+ [2, 's1', "Innovative, easy-to-use features"],
+ [2, 's1', "Improved reliability"],
+ [2, 's1', "A faster operating system"],
+ [2, 's1', "True Web integration"],
+ [2, 's1', "More entertaining and fun"],
+ [1, 's2', "If You're New to Windows 98"],
+ [2, 's2', "Tips for Macintosh Users"],
[3, 's1', "Why does the mouse have two buttons?"]
].each{|depth, style, text|
item = t.item_create
@@ -81,7 +81,7 @@ def demoHelpContents(t)
treeCtrlHelp = TkBindTag.new
- treeCtrlHelp.bind('Double-ButtonPress-1',
+ treeCtrlHelp.bind('Double-ButtonPress-1',
proc{|w, x, y|
if w.identify(x, y)[0] == 'header'
Tk::TreeCtrl::BindCallback.doubleButton1(w, x, y)
@@ -91,25 +91,25 @@ def demoHelpContents(t)
Tk.callback_break
}, '%W %x %y')
- treeCtrlHelp.bind('ButtonPress-1',
+ treeCtrlHelp.bind('ButtonPress-1',
proc{|w, x, y|
helpButton1(w, x, y)
Tk.callback_break
}, '%W %x %y')
- treeCtrlHelp.bind('Button1-Motion',
+ treeCtrlHelp.bind('Button1-Motion',
proc{|w, x, y|
helpMotion1(w, x, y)
Tk.callback_break
}, '%W %x %y')
- treeCtrlHelp.bind('Button1-Leave',
+ treeCtrlHelp.bind('Button1-Leave',
proc{|w, x, y|
helpLeave1(w, x, y)
Tk.callback_break
}, '%W %x %y')
- treeCtrlHelp.bind('ButtonRelease-1',
+ treeCtrlHelp.bind('ButtonRelease-1',
proc{|w, x, y|
helpRelease1(w, x, y)
Tk.callback_break
@@ -119,7 +119,7 @@ def demoHelpContents(t)
treeCtrlHelp.bind('Leave', proc{|w, x, y| helpMotion(w, x, y) }, '%W %x %y')
- treeCtrlHelp.bind('KeyPress-Return',
+ treeCtrlHelp.bind('KeyPress-Return',
proc{|w, x, y|
if w.selection_get.length == 1
if $Version_1_1_OrLater
@@ -141,7 +141,7 @@ end
def demoHelpContents2(t)
height = t.font.metrics(:linespace)
height = 18 if height < 18
- t.configure(:showroot=>false, :showbuttons=>false, :showlines=>false,
+ t.configure(:showroot=>false, :showbuttons=>false, :showlines=>false,
:itemheight=>height, :selectmode=>:browse)
init_pics('help-*')
@@ -154,19 +154,19 @@ def demoHelpContents2(t)
t.element_create('e1', :image, :image=>@images['help-page'])
t.element_create('e2', :image, :image=>[
- @images['help-book-open'], ['open'],
- @images['help-book-closed'], [],
+ @images['help-book-open'], ['open'],
+ @images['help-book-closed'], [],
])
- t.element_create('e3', :text,
+ t.element_create('e3', :text,
:fill=>[
- @SystemHighlightText, ['selected', 'focus'],
+ @SystemHighlightText, ['selected', 'focus'],
'blue', []
])
- t.element_create('e4', :rect, :showfocus=>true,
+ t.element_create('e4', :rect, :showfocus=>true,
:fill=>[@SystemHighligh, ['selected', 'focus']])
- t.element_create('e5', :text, :font=>t.font.dup.underline(true),
+ t.element_create('e5', :text, :font=>t.font.dup.underline(true),
:fill=>[
- @SystemHighlightText, ['selected', 'focus'],
+ @SystemHighlightText, ['selected', 'focus'],
'blue', []
])
@@ -201,21 +201,21 @@ def demoHelpContents2(t)
parentList = [:root, '', '', '', '', '', '']
parent = :root
[
- [0, 's1', "Welcome to Help"],
- [0, 's2', "Introducing Windows 98"],
- [1, 's2', "How to Use Help"],
- [2, 's1' "Find a topic"],
+ [0, 's1', "Welcome to Help"],
+ [0, 's2', "Introducing Windows 98"],
+ [1, 's2', "How to Use Help"],
+ [2, 's1' "Find a topic"],
[2, 's1', "Get more out of help"],
[1, 's2', "Register Your Software"],
- [2, 's1', "Registering Windows 98 online"],
- [1, 's2', "What's New in Windows 98"],
- [2, 's1', "Innovative, easy-to-use features"],
- [2, 's1', "Improved reliability"],
- [2, 's1', "A faster operating system"],
- [2, 's1', "True Web integration"],
- [2, 's1', "More entertaining and fun"],
- [1, 's2', "If You're New to Windows 98"],
- [2, 's2', "Tips for Macintosh Users"],
+ [2, 's1', "Registering Windows 98 online"],
+ [1, 's2', "What's New in Windows 98"],
+ [2, 's1', "Innovative, easy-to-use features"],
+ [2, 's1', "Improved reliability"],
+ [2, 's1', "A faster operating system"],
+ [2, 's1', "True Web integration"],
+ [2, 's1', "More entertaining and fun"],
+ [1, 's2', "If You're New to Windows 98"],
+ [2, 's2', "Tips for Macintosh Users"],
[3, 's1', "Why does the mouse have two buttons?"]
].each{|depth, style, text|
item = t.item_create
@@ -233,7 +233,7 @@ def demoHelpContents2(t)
treeCtrlHelp = TkBindTag.new
- treeCtrlHelp.bind('Double-ButtonPress-1',
+ treeCtrlHelp.bind('Double-ButtonPress-1',
proc{|w, x, y|
if w.identify(x, y)[0] == 'header'
Tk::TreeCtrl::BindCallback.doubleButton1(w, x, y)
@@ -243,25 +243,25 @@ def demoHelpContents2(t)
Tk.callback_break
}, '%W %x %y')
- treeCtrlHelp.bind('ButtonPress-1',
+ treeCtrlHelp.bind('ButtonPress-1',
proc{|w, x, y|
helpButton1(w, x, y)
Tk.callback_break
}, '%W %x %y')
- treeCtrlHelp.bind('Button1-Motion',
+ treeCtrlHelp.bind('Button1-Motion',
proc{|w, x, y|
helpMotion1(w, x, y)
Tk.callback_break
}, '%W %x %y')
- treeCtrlHelp.bind('Button1-Leave',
+ treeCtrlHelp.bind('Button1-Leave',
proc{|w, x, y|
helpLeave1(w, x, y)
Tk.callback_break
}, '%W %x %y')
- treeCtrlHelp.bind('ButtonRelease-1',
+ treeCtrlHelp.bind('ButtonRelease-1',
proc{|w, x, y|
helpRelease1(w, x, y)
Tk.callback_break
@@ -271,7 +271,7 @@ def demoHelpContents2(t)
treeCtrlHelp.bind('Leave', proc{|w, x, y| helpMotion(w, x, y) }, '%W %x %y')
- treeCtrlHelp.bind('KeyPress-Return',
+ treeCtrlHelp.bind('KeyPress-Return',
proc{|w, x, y|
if w.selection_get.length == 1
w.item_toggle(w.selection_get[0])
diff --git a/ext/tk/sample/tkextlib/treectrl/imovie.rb b/ext/tk/sample/tkextlib/treectrl/imovie.rb
index 72134ebda6..d61bf9a7c3 100644
--- a/ext/tk/sample/tkextlib/treectrl/imovie.rb
+++ b/ext/tk/sample/tkextlib/treectrl/imovie.rb
@@ -2,8 +2,8 @@
# Demo: iMovie
#
def demoIMovie(t)
- t.configure(:showroot=>false, :showbuttons=>false, :showlines=>false,
- :selectmode=>:browse, :orient=>:horizontal, :wrap=>:window,
+ t.configure(:showroot=>false, :showbuttons=>false, :showlines=>false,
+ :selectmode=>:browse, :orient=>:horizontal, :wrap=>:window,
:showheader=>false, :background=>'#dcdcdc')
if $HasColumnCreate
@@ -26,24 +26,24 @@ def demoIMovie(t)
t.element_create('elemTime', :text, :font=>font1)
t.element_create('elemName', :text, :font=>font2, :lines=>1, :width=>80)
- t.element_create('elemRect', :rect, :outline=>'#827878', :outlinewidth=>1,
+ t.element_create('elemRect', :rect, :outline=>'#827878', :outlinewidth=>1,
:fill=>['#ffdc5a', ['selected'], 'white', []])
t.element_create('elemImg', :image)
- t.element_create('elemShadow', :rect, :outline=>'gray', :outlinewidth=>1,
+ t.element_create('elemShadow', :rect, :outline=>'gray', :outlinewidth=>1,
:open=>:wn)
s = t.style_create('STYLE', :orient=>:vertical)
t.style_elements(s, [
- 'elemShadow', 'elemRect', 'elemTime',
+ 'elemShadow', 'elemRect', 'elemTime',
'elemImg', 'elemName'
])
- t.style_layout(s, 'elemShadow', :detach=>true,
+ t.style_layout(s, 'elemShadow', :detach=>true,
:padx=>[1,2], :pady=>[1,2], :iexpand=>:es)
t.style_layout(s, 'elemTime', :padx=>[2,0])
t.style_layout(s, 'elemImg', :pady=>[0,1])
- t.style_layout(s, 'elemName', :expand=>:we, :ipady=>[0,2], :padx=>[0,3],
+ t.style_layout(s, 'elemName', :expand=>:we, :ipady=>[0,2], :padx=>[0,3],
:squeeze=>:x)
- t.style_layout(s, 'elemRect', :union=>['elemTime', 'elemImg', 'elemName'],
+ t.style_layout(s, 'elemRect', :union=>['elemTime', 'elemImg', 'elemName'],
:ipadx=>6, :padx=>[0,3], :pady=>[0,3])
# Set default item style
@@ -53,12 +53,12 @@ def demoIMovie(t)
(0..4).each{|i|
[
- ['15:20', 'Clip 1', @images['imovie-01']],
- ['19:18', 'Clip 2', @images['imovie-02']],
- ['07:20', 'Clip 3', @images['imovie-03']],
- ['07:20', 'Clip 4', @images['imovie-04']],
- ['07:20', 'Clip 5', @images['imovie-05']],
- ['07:20', 'Clip 6', @images['imovie-06']],
+ ['15:20', 'Clip 1', @images['imovie-01']],
+ ['19:18', 'Clip 2', @images['imovie-02']],
+ ['07:20', 'Clip 3', @images['imovie-03']],
+ ['07:20', 'Clip 4', @images['imovie-04']],
+ ['07:20', 'Clip 5', @images['imovie-05']],
+ ['07:20', 'Clip 6', @images['imovie-06']],
['07:20', 'Clip 7', @images['imovie-07']]
].each{|time, name, image|
item = t.item_create
@@ -110,7 +110,7 @@ def iMovieButton1(w, x, y)
Tk::TreeCtrl::BindCallback.entryOpen(w, i, 0, e)
ent = TkComm.window(w.path + '.entry')
unless exists
- ent.configure(:borderwidth=>0, :justify=>:center,
+ ent.configure(:borderwidth=>0, :justify=>:center,
:background=>'#ffdc5a')
x1, y1, x2, y2 = w.item_bbox(i, 0, e)
ent.place(:y=>y1 - 1)
diff --git a/ext/tk/sample/tkextlib/treectrl/layout.rb b/ext/tk/sample/tkextlib/treectrl/layout.rb
index 488abe2aa9..745ac86f36 100644
--- a/ext/tk/sample/tkextlib/treectrl/layout.rb
+++ b/ext/tk/sample/tkextlib/treectrl/layout.rb
@@ -2,7 +2,7 @@
# Demo: Layout
#
def demoLayout(t)
- t.configure(:showroot=>false, :showrootbutton=>true, :showbuttons=>true,
+ t.configure(:showroot=>false, :showrootbutton=>true, :showbuttons=>true,
:showlines=>true, :itemheight=>0, :selectmode=>:browse)
if $HasColumnCreate
@@ -12,10 +12,10 @@ def demoLayout(t)
end
t.element_create('e1', :rect, :width=>30, :height=>30, :fill=>'gray20')
- t.element_create('e2', :rect, :width=>30, :height=>30, :fill=>'gray40',
+ t.element_create('e2', :rect, :width=>30, :height=>30, :fill=>'gray40',
:outline=>'blue', :outlinewidth=>3)
t.element_create('e3', :rect, :fill=>'gray60')
- t.element_create('e4', :rect, :showfocus=>true,
+ t.element_create('e4', :rect, :showfocus=>true,
:fill=>[
@SystemHighlight, ['selected', 'focus'], 'gray80', []
])
@@ -31,9 +31,9 @@ def demoLayout(t)
t.style_layout(s, 'e3', :union=>['e1', 'e2'], :ipadx=>4, :ipady=>4, :pady=>2)
t.style_layout(s, 'e4', :detach=>true, :iexpand=>:es)
t.style_layout(s, 'e5', :detach=>true, :padx=>[2,0], :pady=>2, :iexpand=>:s)
- t.style_layout(s, 'e6', :detach=>true, :expand=>:ws,
+ t.style_layout(s, 'e6', :detach=>true, :expand=>:ws,
:padx=>[0,2], :pady=>[2,0])
- t.style_layout(s, 'e7', :detach=>true, :expand=>:wn,
+ t.style_layout(s, 'e7', :detach=>true, :expand=>:wn,
:padx=>[0,2], :pady=>[0,2])
if $Version_1_1_OrLater
@@ -53,7 +53,7 @@ def demoLayout(t)
t.item_style_set(i, 0, s)
t.item_lastchild(parent, i)
- ###
+ ###
s = t.style_create('s2')
t.style_elements(s, ['e4', 'e3', 'e1'])
@@ -77,7 +77,7 @@ def demoLayout(t)
t.item_style_set(i2, 0, s)
t.item_lastchild(i, i2)
- ###
+ ###
s = t.style_create('s3')
t.style_elements(s, ['e4', 'e3', 'e1', 'e5', 'e6'])
@@ -101,10 +101,10 @@ def demoLayout(t)
t.item_style_set(i2, 0, s)
t.item_lastchild(i, i2)
- ###
+ ###
- t.element_create('eb', :border, :background=>@SystemButtonFace,
- :relief=>[:sunken, ['selected'], :raised, []],
+ t.element_create('eb', :border, :background=>@SystemButtonFace,
+ :relief=>[:sunken, ['selected'], :raised, []],
:thickness=>2, :filled=>true)
t.element_create('et', :text)
@@ -134,11 +134,11 @@ def demoLayout(t)
t.item_text(i, 0, text)
t.item_lastchild(parent, i)
- ###
+ ###
styleNum = 5
- [
- [:horizontal, [:s, :ns, :n]],
+ [
+ [:horizontal, [:s, :ns, :n]],
[:vertical, [:e, :we, :w]]
].each{|orient, expandList|
expandList.each{|expand|
diff --git a/ext/tk/sample/tkextlib/treectrl/mailwasher.rb b/ext/tk/sample/tkextlib/treectrl/mailwasher.rb
index 1b51bb9b21..836e1e87de 100644
--- a/ext/tk/sample/tkextlib/treectrl/mailwasher.rb
+++ b/ext/tk/sample/tkextlib/treectrl/mailwasher.rb
@@ -7,8 +7,8 @@ def demoMailWasher(t)
height = t.font.metrics(:linespace) + 2
height = 18 if height < 18
- t.configure(:showroot=>false, :showrootbutton=>false, :showbuttons=>false,
- :showlines=>false, :itemheight=>height, :selectmode=>:browse,
+ t.configure(:showroot=>false, :showrootbutton=>false, :showbuttons=>false,
+ :showlines=>false, :itemheight=>height, :selectmode=>:browse,
:xscrollincrement=>1)
pad = 4
@@ -16,14 +16,14 @@ def demoMailWasher(t)
if $Version_1_1_OrLater
t.column_create(:text=>'Delete', :textpadx=>pad, :tag=>'delete')
t.column_create(:text=>'Bounce', :textpadx=>pad, :tag=>'bounce')
- t.column_create(:text=>'Status', :width=>80, :textpadx=>pad,
+ t.column_create(:text=>'Status', :width=>80, :textpadx=>pad,
:tag=>'status')
- t.column_create(:text=>'Size', :width=>40, :textpadx=>pad,
+ t.column_create(:text=>'Size', :width=>40, :textpadx=>pad,
:justify=>:right, :tag=>'size')
t.column_create(:text=>'From', :width=>140, :textpadx=>pad, :tag=>'from')
- t.column_create(:text=>'Subject', :width=>240, :textpadx=>pad,
+ t.column_create(:text=>'Subject', :width=>240, :textpadx=>pad,
:tag=>'subject')
- t.column_create(:text=>'Received', :textpadx=>pad, :arrow=>:up,
+ t.column_create(:text=>'Received', :textpadx=>pad, :arrow=>:up,
:arrowpad=>[4,0], :tag=>'received')
t.column_create(:text=>'Attachments', :textpadx=>pad, :tag=>'attachments')
@@ -36,38 +36,38 @@ def demoMailWasher(t)
else # TreeCtrl 1.0
t.column_configure(0, :text=>'Delete', :textpadx=>pad, :tag=>'delete')
t.column_configure(1, :text=>'Bounce', :textpadx=>pad, :tag=>'bounce')
- t.column_configure(2, :text=>'Status', :width=>80, :textpadx=>pad,
+ t.column_configure(2, :text=>'Status', :width=>80, :textpadx=>pad,
:tag=>'status')
- t.column_configure(3, :text=>'Size', :width=>40, :textpadx=>pad,
+ t.column_configure(3, :text=>'Size', :width=>40, :textpadx=>pad,
:justify=>:right, :tag=>'size')
- t.column_configure(4, :text=>'From', :width=>140, :textpadx=>pad,
+ t.column_configure(4, :text=>'From', :width=>140, :textpadx=>pad,
:tag=>'from')
- t.column_configure(5, :text=>'Subject', :width=>240, :textpadx=>pad,
+ t.column_configure(5, :text=>'Subject', :width=>240, :textpadx=>pad,
:tag=>'subject')
- t.column_configure(6, :text=>'Received', :textpadx=>pad, :arrow=>:up,
+ t.column_configure(6, :text=>'Received', :textpadx=>pad, :arrow=>:up,
:arrowpad=>[4,0], :tag=>'received')
- t.column_configure(7, :text=>'Attachments', :textpadx=>pad,
+ t.column_configure(7, :text=>'Attachments', :textpadx=>pad,
:tag=>'attachments')
t.element_create('imgOff', :image, :image=>@images['unchecked'])
t.element_create('imgOn', :image, :image=>@images['checked'])
end
- t.element_create('border', :rect, :open=>:nw, :outline=>'gray',
+ t.element_create('border', :rect, :open=>:nw, :outline=>'gray',
:outlinewidth=>1, :fill=>[@SystemHighlight, ['selected']])
- t.element_create('txtAny', :text, :lines=>1,
+ t.element_create('txtAny', :text, :lines=>1,
:fill=>[@SystemHighlightText, ['selected']])
- t.element_create('txtNone', :text, :text=>'none', :lines=>1,
+ t.element_create('txtNone', :text, :text=>'none', :lines=>1,
:fill=>[@SystemHighlightText, ['selected']])
- t.element_create('txtYes', :text, :text=>'yes', :lines=>1,
+ t.element_create('txtYes', :text, :text=>'yes', :lines=>1,
:fill=>[@SystemHighlightText, ['selected']])
- t.element_create('txtNormal', :text, :text=>'Normal', :lines=>1,
+ t.element_create('txtNormal', :text, :text=>'Normal', :lines=>1,
:fill=>[@SystemHighlightText, ['selected'], '#006800', []])
- t.element_create('txtPossSpam', :text, :text=>'Possible Spam', :lines=>1,
+ t.element_create('txtPossSpam', :text, :text=>'Possible Spam', :lines=>1,
:fill=>[@SystemHighlightText, ['selected'], '#787800', []])
- t.element_create('txtProbSpam', :text, :text=>'Probably Spam', :lines=>1,
+ t.element_create('txtProbSpam', :text, :text=>'Probably Spam', :lines=>1,
:fill=>[@SystemHighlightText, ['selected'], '#FF9000', []])
- t.element_create('txtBlacklist', :text, :text=>'Blacklisted', :lines=>1,
+ t.element_create('txtBlacklist', :text, :text=>'Blacklisted', :lines=>1,
:fill=>[@SystemHighlightText, ['selected'], '#FF5800', []])
if $Version_1_1_OrLater
@@ -96,16 +96,16 @@ def demoMailWasher(t)
}
[
- ['baldy@spammer.com', "Your hair is thinning"],
- ['flat@spammer.com', "Your breasts are too small"],
- ['tiny@spammer.com', "Your penis is too small"],
- ['dumbass@spammer.com', "You are not very smart"],
- ['bankrobber@spammer.com', "You need more money"],
- ['loser@spammer.com', "You need better friends"],
- ['gossip@spammer.com', "Find out what your coworkers think about you"],
+ ['baldy@spammer.com', "Your hair is thinning"],
+ ['flat@spammer.com', "Your breasts are too small"],
+ ['tiny@spammer.com', "Your penis is too small"],
+ ['dumbass@spammer.com', "You are not very smart"],
+ ['bankrobber@spammer.com', "You need more money"],
+ ['loser@spammer.com', "You need better friends"],
+ ['gossip@spammer.com', "Find out what your coworkers think about you"],
['whoami@spammer.com', "Find out what you think about yourself"],
- ['downsized@spammer.com', "You need a better job"],
- ['poorhouse@spammer.com', "Your mortgage is a joke"],
+ ['downsized@spammer.com', "You need a better job"],
+ ['poorhouse@spammer.com', "Your mortgage is a joke"],
['spam4ever@spammer.com', "You need more spam"]
].each{|frm, subj|
item = t.item_create
@@ -115,8 +115,8 @@ def demoMailWasher(t)
if $Version_1_1_OrLater
delete = [false, true][rand(2)]
bounce = [false, true][rand(2)]
- t.item_style_set(item,
- 0, 'styCheck', 1, 'styCheck', 2, status, 3, 'styAny',
+ t.item_style_set(item,
+ 0, 'styCheck', 1, 'styCheck', 2, status, 3, 'styAny',
4, 'styAny', 5, 'styAny', 6, 'styAny', 7, attachments)
t.item_state_forcolumn(item, 'delete', 'CHECK') if delete
t.item_state_forcolumn(item, 'bounce', 'CHECK') if bounce
@@ -124,8 +124,8 @@ def demoMailWasher(t)
else # TreeCtrl 1.0
delete = ['styOn', 'styOff'][rand(2)]
bounce = ['styOn', 'styOff'][rand(2)]
- t.item_style_set(item,
- 0, delete, 1, bounce, 2, status, 3, 'styAny',
+ t.item_style_set(item,
+ 0, delete, 1, bounce, 2, status, 3, 'styAny',
4, 'styAny', 5, 'styAny', 6, 'styAny', 7, attachments)
end
@@ -138,7 +138,7 @@ def demoMailWasher(t)
}
sortColumn = 6
- t.notify_bind(t, 'Header-invoke',
+ t.notify_bind(t, 'Header-invoke',
proc{|c, w|
if c == sortColumn
if w.column_cget(sortColumn, :arrow) == 'down'
@@ -162,35 +162,35 @@ def demoMailWasher(t)
w.column_configure(c, :arrow=>arrow)
case w.column_cget(c, :tag)
when 'bounce', 'delete'
- w.item_sort(:root, order,
- {
- :column=>c,
+ w.item_sort(:root, order,
+ {
+ :column=>c,
:command=>proc{|item1, item2|
compareOnOff(w, c, item1, item2)
}
- },
+ },
{ :column=>'subject', :dictionary=>true })
when 'status'
- w.item_sort(:root, order,
+ w.item_sort(:root, order,
{ :column=>c, :dictionary=>true })
when 'from'
- w.item_sort(:root, order,
- { :column=>c, :dictionary=>true },
+ w.item_sort(:root, order,
+ { :column=>c, :dictionary=>true },
{ :column=>'subject', :dictionary=>true })
when 'subject'
- w.item_sort(:root, order,
+ w.item_sort(:root, order,
{ :column=>c, :dictionary=>true })
when 'size'
- w.item_sort(:root, order,
- { :column=>c, :dictionary=>true },
+ w.item_sort(:root, order,
+ { :column=>c, :dictionary=>true },
{ :column=>'subject', :dictionary=>true })
when 'received'
- w.item_sort(:root, order,
- { :column=>c, :dictionary=>true },
+ w.item_sort(:root, order,
+ { :column=>c, :dictionary=>true },
{ :column=>'subject', :dictionary=>true })
when 'attachments'
- w.item_sort(:root, order,
- { :column=>c, :dictionary=>true },
+ w.item_sort(:root, order,
+ { :column=>c, :dictionary=>true },
{ :column=>'subject', :dictionary=>true })
end
}, '%C %T')
@@ -198,7 +198,7 @@ def demoMailWasher(t)
mailWasher = TkBindTag.new
if $Version_1_1_OrLater
- mailWasher.bind('ButtonPress-1',
+ mailWasher.bind('ButtonPress-1',
proc{|w, x, y|
id = w.identify(x, y)
if id.empty?
@@ -214,7 +214,7 @@ def demoMailWasher(t)
end
}, '%W %x %y')
else # TreeCtrl 1.0
- mailWasher.bind('ButtonPress-1',
+ mailWasher.bind('ButtonPress-1',
proc{|w, x, y|
id = w.identify(x, y)
if id.empty?
diff --git a/ext/tk/sample/tkextlib/treectrl/outlook-folders.rb b/ext/tk/sample/tkextlib/treectrl/outlook-folders.rb
index d966807866..c3af86868e 100644
--- a/ext/tk/sample/tkextlib/treectrl/outlook-folders.rb
+++ b/ext/tk/sample/tkextlib/treectrl/outlook-folders.rb
@@ -7,7 +7,7 @@ def demoOutlookFolders(t)
height = t.font.metrics(:linespace) + 2
height = 18 if height < 18
- t.configure(:itemheight=>height, :selectmode=>:browse, :showlines=>true,
+ t.configure(:itemheight=>height, :selectmode=>:browse, :showlines=>true,
:showroot=>true, :showrootbutton=>false, :showbuttons=>true)
if $HasColumnCreate
@@ -17,15 +17,15 @@ def demoOutlookFolders(t)
end
t.element_create('e1', :image)
- t.element_create('e2', :text, :lines=>1,
+ t.element_create('e2', :text, :lines=>1,
:fill=>[@SystemHighlightText, ['selected', 'focus']])
- t.element_create('e3', :text, :lines=>1, :font=>t.font.dup.weight(:bold),
+ t.element_create('e3', :text, :lines=>1, :font=>t.font.dup.weight(:bold),
:fill=>[@SystemHighlightText, ['selected', 'focus']])
t.element_create('e4', :text, :fill=>'blue')
t.element_create('e5', :image, :image=>@images['outlook-folder'])
- t.element_create('e6', :rect, :showfocus=>true,
+ t.element_create('e6', :rect, :showfocus=>true,
:fill=>[
- @SystemHighlight, ['selected', 'focus'],
+ @SystemHighlight, ['selected', 'focus'],
'gray', ['selected', '!focus']
])
@@ -60,28 +60,28 @@ def demoOutlookFolders(t)
t.style_layout(s, 'e6', :union=>['e3'], :iexpand=>:ns, :ipadx=>2)
t.item_style_set(:root, 0, 's1')
- t.item_complex(:root,
+ t.item_complex(:root,
[
- ['e1', {:image=>@images['outlook-main']}],
+ ['e1', {:image=>@images['outlook-main']}],
['e2', {:text=>'Outlook Express'}]
])
parentList = [:root, '', '', '', '', '', '']
parent = :root
[
- [0, :local, "Local Folders", true, 0],
- [1, :inbox, 'Inbox', false, 5],
- [1, :outbox, 'Outbox', false, 0],
- [1, :sent, "Sent Items", false, 0],
- [1, :deleted, "Deleted Items", false, 50],
- [1, :draft, 'Drafts', false, 0],
- [1, :folder, "Messages to Dad", false, 0],
- [1, :folder, "Messages to Sis", false, 0],
- [1, :folder, "Messages to Me", false, 0],
- [2, :folder, "2001", false, 0],
- [2, :folder, "2000", false, 0],
- [2, :folder, "1999", false, 0],
- [0, :server, "news.gmane.org", true, 0],
+ [0, :local, "Local Folders", true, 0],
+ [1, :inbox, 'Inbox', false, 5],
+ [1, :outbox, 'Outbox', false, 0],
+ [1, :sent, "Sent Items", false, 0],
+ [1, :deleted, "Deleted Items", false, 50],
+ [1, :draft, 'Drafts', false, 0],
+ [1, :folder, "Messages to Dad", false, 0],
+ [1, :folder, "Messages to Sis", false, 0],
+ [1, :folder, "Messages to Me", false, 0],
+ [2, :folder, "2001", false, 0],
+ [2, :folder, "2000", false, 0],
+ [2, :folder, "1999", false, 0],
+ [0, :server, "news.gmane.org", true, 0],
[1, :group, "gmane.comp.lang.lua.general", false, 498]
].each{|depth, img, text, button, unread|
if $Version_1_1_OrLater
@@ -93,7 +93,7 @@ def demoOutlookFolders(t)
if img == :folder
if unread != 0
t.item_style_set(item, 0, 's4')
- t.item_complex(item,
+ t.item_complex(item,
[['e3', {:text=>text}], ['e4', {:text=>"(#{unread})"}]])
else
t.item_style_set(item, 0, 's3')
@@ -102,17 +102,17 @@ def demoOutlookFolders(t)
else
if unread != 0
t.item_style_set(item, 0, 's2')
- t.item_complex(item,
+ t.item_complex(item,
[
- ['e1', {:image=>@images["outlook-#{img}"]}],
- ['e3', {:text=>text}],
+ ['e1', {:image=>@images["outlook-#{img}"]}],
+ ['e3', {:text=>text}],
['e4', {:text=>"(#{unread})"}]
])
else
t.item_style_set(item, 0, 's1')
- t.item_complex(item,
+ t.item_complex(item,
[
- ['e1', {:image=>@images["outlook-#{img}"]}],
+ ['e1', {:image=>@images["outlook-#{img}"]}],
['e2', {:text=>text}]
])
end
diff --git a/ext/tk/sample/tkextlib/treectrl/outlook-newgroup.rb b/ext/tk/sample/tkextlib/treectrl/outlook-newgroup.rb
index 3495522e5c..d7e7f7e004 100644
--- a/ext/tk/sample/tkextlib/treectrl/outlook-newgroup.rb
+++ b/ext/tk/sample/tkextlib/treectrl/outlook-newgroup.rb
@@ -6,7 +6,7 @@ def demoOutlookNewsgroup(t)
height = t.font.metrics(:linespace)
height = 18 if height < 18
- t.configure(:itemheight=>height, :selectmode=>:browse, :showlines=>false,
+ t.configure(:itemheight=>height, :selectmode=>:browse, :showlines=>false,
:showroot=>false, :showrootbutton=>false, :showbuttons=>true)
if $Version_1_1_OrLater
@@ -24,7 +24,7 @@ def demoOutlookNewsgroup(t)
t.column_configure(3, :text=>'Subject', :width=>250, :tag=>'subject')
t.column_configure(4, :text=>'From', :width=>150, :tag=>'from')
t.column_configure(5, :text=>'Sent', :width=>150, :tag=>'sent')
- t.column_configure(6, :text=>'Size', :width=>60, :justify=>:right,
+ t.column_configure(6, :text=>'Size', :width=>60, :justify=>:right,
:tag=>'size')
end
@@ -37,35 +37,35 @@ def demoOutlookNewsgroup(t)
# State for a message with unread descendants
t.state_define('unread')
- t.element_create('elemImg', :image,
+ t.element_create('elemImg', :image,
:image=>[
- @sel_images['outlook-read-2'],
- ['selected', 'read', 'unread', '!open'],
+ @sel_images['outlook-read-2'],
+ ['selected', 'read', 'unread', '!open'],
@images['outlook-read-2'], ['read', 'unread', '!open'],
- @sel_images['outlook-read'], ['selected', 'read'],
- @images['outlook-read'], ['read'],
- @sel_images['outlook-unread'], ['selected'],
+ @sel_images['outlook-read'], ['selected', 'read'],
+ @images['outlook-read'], ['read'],
+ @sel_images['outlook-unread'], ['selected'],
@images['outlook-unread'], []
])
- t.element_create('elemTxt', :text, :lines=>1,
- :fill=>[@SystemHighlightText, ['selected', 'focus']],
+ t.element_create('elemTxt', :text, :lines=>1,
+ :fill=>[@SystemHighlightText, ['selected', 'focus']],
:font=>[
- t.font.dup.weight(:bold), ['read', 'unread', '!open'],
+ t.font.dup.weight(:bold), ['read', 'unread', '!open'],
t.font.dup.weight(:bold), ['!read']
])
- t.element_create('sel.e', :rect, :open=>:e, :showfocus=>true,
+ t.element_create('sel.e', :rect, :open=>:e, :showfocus=>true,
:fill=>[
- @SystemHighlight, ['selected', 'focus'],
+ @SystemHighlight, ['selected', 'focus'],
'gray', ['selected', '!focus']
])
- t.element_create('sel.w', :rect, :open=>:w, :showfocus=>true,
+ t.element_create('sel.w', :rect, :open=>:w, :showfocus=>true,
:fill=>[
- @SystemHighlight, ['selected', 'focus'],
+ @SystemHighlight, ['selected', 'focus'],
'gray', ['selected', '!focus']
])
- t.element_create('sel.we', :rect, :open=>:we, :showfocus=>true,
+ t.element_create('sel.we', :rect, :open=>:we, :showfocus=>true,
:fill=>[
- @SystemHighlight, ['selected', 'focus'],
+ @SystemHighlight, ['selected', 'focus'],
'gray', ['selected', '!focus']
])
@@ -74,7 +74,7 @@ def demoOutlookNewsgroup(t)
t.style_elements(s, ['sel.e', 'elemImg', 'elemTxt'])
t.style_layout(s, 'elemImg', :expand=>:ns)
t.style_layout(s, 'elemTxt', :padx=>[2,6], :squeeze=>:x, :expand=>:ns)
- t.style_layout(s, 'sel.e', :union=>['elemTxt'],
+ t.style_layout(s, 'sel.e', :union=>['elemTxt'],
:iexpand=>:nes, :ipadx=>[2,0])
# Text
@@ -168,12 +168,12 @@ def demoOutlookNewsgroup(t)
}
# Do something when the selection changes
- t.notify_bind(t, 'Selection',
+ t.notify_bind(t, 'Selection',
proc{|w|
if w.selection_count == 1
# One item is selected
if @Message[:afterId][:id]
- Tk.after_cancel(@Message[:afterId][:id])
+ Tk.after_cancel(@Message[:afterId][:id])
end
@Message[:afterId][:item] = w.selection_get[0]
@Message[:afterId][:id] = Tk.after(500, proc{
@@ -208,7 +208,7 @@ def demoOutlookNewsgroup2(t)
height = t.font.metrics(:linespace)
height = 18 if height < 18
- t.configure(:itemheight=>height, :selectmode=>:browse, :showlines=>false,
+ t.configure(:itemheight=>height, :selectmode=>:browse, :showlines=>false,
:showroot=>false, :showrootbutton=>false, :showbuttons=>true)
if $Version_1_1_OrLater
@@ -226,7 +226,7 @@ def demoOutlookNewsgroup2(t)
t.column_configure(3, :text=>'Subject', :width=>250, :tag=>'subject')
t.column_configure(4, :text=>'From', :width=>150, :tag=>'from')
t.column_configure(5, :text=>'Sent', :width=>150, :tag=>'sent')
- t.column_configure(6, :text=>'Size', :width=>60, :justify=>:right,
+ t.column_configure(6, :text=>'Size', :width=>60, :justify=>:right,
:tag=>'size')
end
@@ -235,24 +235,24 @@ def demoOutlookNewsgroup2(t)
t.element_create('image.unread', :image, :image=>@images['outlook-unread'])
t.element_create('image.read', :image, :image=>@images['outlook-read'])
t.element_create('image.read2', :image, :image=>@images['outlook-read-2'])
- t.element_create('text.read', :text, :lines=>1,
+ t.element_create('text.read', :text, :lines=>1,
:fill=>[@SystemHighlightText, ['selected', 'focus']])
- t.element_create('text.unread', :text, :lines=>1,
- :fill=>[@SystemHighlightText, ['selected', 'focus']],
+ t.element_create('text.unread', :text, :lines=>1,
+ :fill=>[@SystemHighlightText, ['selected', 'focus']],
:font=>t.font.dup.weight(:bold))
- t.element_create('sel.e', :rect, :open=>:e, :showfocus=>true,
+ t.element_create('sel.e', :rect, :open=>:e, :showfocus=>true,
:fill=>[
- @SystemHighlight, ['selected', 'focus'],
+ @SystemHighlight, ['selected', 'focus'],
'gray', ['selected', '!focus']
])
- t.element_create('sel.w', :rect, :open=>:w, :showfocus=>true,
+ t.element_create('sel.w', :rect, :open=>:w, :showfocus=>true,
:fill=>[
- @SystemHighlight, ['selected', 'focus'],
+ @SystemHighlight, ['selected', 'focus'],
'gray', ['selected', '!focus']
])
- t.element_create('sel.we', :rect, :open=>:we, :showfocus=>true,
+ t.element_create('sel.we', :rect, :open=>:we, :showfocus=>true,
:fill=>[
- @SystemHighlight, ['selected', 'focus'],
+ @SystemHighlight, ['selected', 'focus'],
'gray', ['selected', '!focus']
])
@@ -261,7 +261,7 @@ def demoOutlookNewsgroup2(t)
t.style_elements(s, ['sel.e', 'image.unread', 'text.unread'])
t.style_layout(s, 'image.unread', :expand=>:ns)
t.style_layout(s, 'text.unread', :padx=>[2,6], :squeeze=>:x, :expand=>:ns)
- t.style_layout(s, 'sel.e', :union=>['text.unread'],
+ t.style_layout(s, 'sel.e', :union=>['text.unread'],
:iexpand=>:nes, :ipadx=>[2,0])
# Image + text
@@ -269,7 +269,7 @@ def demoOutlookNewsgroup2(t)
t.style_elements(s, ['sel.e', 'image.read', 'text.read'])
t.style_layout(s, 'image.read', :expand=>:ns)
t.style_layout(s, 'text.read', :padx=>[2,6], :squeeze=>:x, :expand=>:ns)
- t.style_layout(s, 'sel.e', :union=>['text.read'],
+ t.style_layout(s, 'sel.e', :union=>['text.read'],
:iexpand=>:nes, :ipadx=>[2,0])
# Image + text
@@ -277,7 +277,7 @@ def demoOutlookNewsgroup2(t)
t.style_elements(s, ['sel.e', 'image.read2', 'text.unread'])
t.style_layout(s, 'image.read2', :expand=>:ns)
t.style_layout(s, 'text.unread', :padx=>[2,6], :squeeze=>:x, :expand=>:ns)
- t.style_layout(s, 'sel.e', :union=>['text.unread'],
+ t.style_layout(s, 'sel.e', :union=>['text.unread'],
:iexpand=>:nes, :ipadx=>[2,0])
# Text
@@ -350,7 +350,7 @@ def demoOutlookNewsgroup2(t)
style = 'unread'
style2 = 'unread2'
end
- t.item_style_set(i, 3, style, 4, "#{style2}.we", 5, "#{style2}.we",
+ t.item_style_set(i, 3, style, 4, "#{style2}.we", 5, "#{style2}.we",
6, "#{style2}.w")
t.item_text(i, 3, subject, 4, from, 5, sent, 6, size)
if t.item_numchildren(i) > 0
@@ -359,24 +359,24 @@ def demoOutlookNewsgroup2(t)
}
# Do something when the selection changes
- t.notify_bind(t, 'Selection',
+ t.notify_bind(t, 'Selection',
proc{|w|
if w.selection_count == 1
i = t.selection_get[0]
unless @Message[:read][i]
if t.item_isopen(i) || !anyUnreadDescendants(t, i)
# unread -> read
- t.item_style_map(i, 'subject', 'read',
+ t.item_style_map(i, 'subject', 'read',
['text.unread', 'text.read'])
- t.item_style_map(i, 'from', 'read.we',
+ t.item_style_map(i, 'from', 'read.we',
['text.unread', 'text.read'])
- t.item_style_map(i, 'sent', 'read.we',
+ t.item_style_map(i, 'sent', 'read.we',
['text.unread', 'text.read'])
- t.item_style_map(i, 'size', 'read.w',
+ t.item_style_map(i, 'size', 'read.w',
['text.unread', 'text.read'])
else
# unread -> read2
- t.item_style_map(i, 'subject', 'read2',
+ t.item_style_map(i, 'subject', 'read2',
['text.unread', 'text.unread'])
end
@@ -386,34 +386,34 @@ def demoOutlookNewsgroup2(t)
end
}, '%T')
- t.notify_bind(t, 'Expand-after',
+ t.notify_bind(t, 'Expand-after',
proc{|w, i|
if @Messge[:read][i] && anyUnreadDescendants(t, i)
# read2 -> read
- t.item_style_map(i, 'subject', 'read',
+ t.item_style_map(i, 'subject', 'read',
['text.unread', 'text.read'])
# unread -> read
- t.item_style_map(i, 'from', 'read.we',
+ t.item_style_map(i, 'from', 'read.we',
['text.unread', 'text.read'])
- t.item_style_map(i, 'sent', 'read.we',
+ t.item_style_map(i, 'sent', 'read.we',
['text.unread', 'text.read'])
- t.item_style_map(i, 'size', 'read.w',
+ t.item_style_map(i, 'size', 'read.w',
['text.unread', 'text.read'])
end
}, '%T %I')
- t.notify_bind(t, 'Collapse-after',
+ t.notify_bind(t, 'Collapse-after',
proc{|w, i|
if @Messge[:read][i] && anyUnreadDescendants(t, i)
# read -> read2
- t.item_style_map(i, 'subject', 'read2',
+ t.item_style_map(i, 'subject', 'read2',
['text.read', 'text.unread'])
# read -> unread
- t.item_style_map(i, 'from', 'unread.we',
+ t.item_style_map(i, 'from', 'unread.we',
['text.read', 'text.unread'])
- t.item_style_map(i, 'sent', 'unread.we',
+ t.item_style_map(i, 'sent', 'unread.we',
['text.read', 'text.unread'])
- t.item_style_map(i, 'size', 'unread.w',
+ t.item_style_map(i, 'size', 'unread.w',
['text.read', 'text.unread'])
end
}, '%T %I')
diff --git a/ext/tk/sample/tkextlib/treectrl/random.rb b/ext/tk/sample/tkextlib/treectrl/random.rb
index 43aca63283..2c9e614aa5 100644
--- a/ext/tk/sample/tkextlib/treectrl/random.rb
+++ b/ext/tk/sample/tkextlib/treectrl/random.rb
@@ -1,4 +1,4 @@
-#
+#
def random_N
@RandomN[0] || 500
end
@@ -11,39 +11,39 @@ def demoRandom(t)
height = t.font.metrics(:linespace)
height = 18 if height < 18
- t.configure(:itemheight=>height, :selectmode=>:extended,
- :showroot=>true, :showrootbutton=>true, :showbuttons=>true,
- :showlines=>true, :scrollmargin=>16,
+ t.configure(:itemheight=>height, :selectmode=>:extended,
+ :showroot=>true, :showrootbutton=>true, :showbuttons=>true,
+ :showlines=>true, :scrollmargin=>16,
:xscrolldelay=>[500, 50], :yscrolldelay=>[500, 50])
if $Version_1_1_OrLater
- t.column_create(:expand=>true, :text=>'Item',
+ t.column_create(:expand=>true, :text=>'Item',
:itembackground=>['#e0e8f0', []], :tag=>'item')
- t.column_create(:text=>'Parent', :justify=>:center,
+ t.column_create(:text=>'Parent', :justify=>:center,
:itembackground=>['gray90', []], :tag=>'parent')
- t.column_create(:text=>'Depth', :justify=>:center,
+ t.column_create(:text=>'Depth', :justify=>:center,
:itembackground=>['linen', []], :tag=>'depth')
else # TreeCtrl 1.0
- t.column_configure(0, :expand=>true, :text=>'Item',
+ t.column_configure(0, :expand=>true, :text=>'Item',
:itembackground=>['#e0e8f0', []], :tag=>'item')
- t.column_configure(1, :text=>'Parent', :justify=>:center,
+ t.column_configure(1, :text=>'Parent', :justify=>:center,
:itembackground=>['gray90', []], :tag=>'parent')
- t.column_configure(2, :text=>'Depth', :justify=>:center,
+ t.column_configure(2, :text=>'Depth', :justify=>:center,
:itembackground=>['linen', []], :tag=>'depth')
end
t.element_create('e1', :image, :image=>[
- @images['folder-open'], ['open'],
+ @images['folder-open'], ['open'],
@images['folder-closed'], []
])
t.element_create('e2', :image, :image=>@images['small-file'])
- t.element_create('e3', :text,
+ t.element_create('e3', :text,
:fill=>[@SystemHighlightText, ['selected', 'focus']])
t.element_create('e4', :text, :fill=>'blue')
t.element_create('e6', :text)
- t.element_create('e5', :rect, :showfocus=>true,
+ t.element_create('e5', :rect, :showfocus=>true,
:fill=>[
- @SystemHighlight, ['selected', 'focus'],
+ @SystemHighlight, ['selected', 'focus'],
'gray', ['selected', '!focus']
])
@@ -65,11 +65,11 @@ def demoRandom(t)
t.style_layout(s, 'e6', :padx=>6, :expand=>:ns)
@Priv[:sensitive, t] = [
- [:item, 's1', 'e5', 'e1', 'e3'],
+ [:item, 's1', 'e5', 'e1', 'e3'],
[:item, 's2', 'e5', 'e2', 'e3']
]
@Priv[:dragimage, t] = [
- [:item, 's1', 'e1', 'e3'],
+ [:item, 's1', 'e1', 'e3'],
[:item, 's2', 'e2', 'e3']
]
@@ -108,16 +108,16 @@ def demoRandom(t)
t.item_hasbutton(item_i, true)
end
t.item_style_set(item_i, 0, 's1', 1, 's3', 2, 's3')
- t.item_complex(item_i,
- [ ['e3', {:text=>"Item #{i}"}],
- ['e4', {:text=>"(#{numChildren})"}] ],
- [ ['e6', {:text=>"#{t.item_parent(item_i)}"}] ],
+ t.item_complex(item_i,
+ [ ['e3', {:text=>"Item #{i}"}],
+ ['e4', {:text=>"(#{numChildren})"}] ],
+ [ ['e6', {:text=>"#{t.item_parent(item_i)}"}] ],
[ ['e6', {:text=>"#{t.depth(item_i)}"}] ])
else
t.item_style_set(item_i, 1, 's3', 2, 's3', 0, 's2')
- t.item_complex(item_i,
- [ ['e3', {:text=>"Item #{i}"}] ],
- [ ['e6', {:text=>"#{t.item_parent(item_i)}"}] ],
+ t.item_complex(item_i,
+ [ ['e3', {:text=>"Item #{i}"}] ],
+ [ ['e6', {:text=>"#{t.item_parent(item_i)}"}] ],
[ ['e6', {:text=>"#{t.depth(item_i)}"}] ])
end
}
@@ -125,46 +125,46 @@ def demoRandom(t)
treeCtrlRandom = TkBindTag.new
- treeCtrlRandom.bind('Double-ButtonPress-1',
+ treeCtrlRandom.bind('Double-ButtonPress-1',
proc{|w, x, y|
Tk::TreeCtrl::BindCallback.doubleButton1(w, x, y)
Tk.callback_break
}, '%W %x %y')
- treeCtrlRandom.bind('Control-ButtonPress-1',
+ treeCtrlRandom.bind('Control-ButtonPress-1',
proc{|w, x, y|
@Priv['selectMode'] = :toggle
randomButton1(w, x, y)
Tk.callback_break
}, '%W %x %y')
- treeCtrlRandom.bind('Shift-ButtonPress-1',
+ treeCtrlRandom.bind('Shift-ButtonPress-1',
proc{|w, x, y|
@Priv['selectMode'] = :add
randomButton1(w, x, y)
Tk.callback_break
}, '%W %x %y')
- treeCtrlRandom.bind('ButtonPress-1',
+ treeCtrlRandom.bind('ButtonPress-1',
proc{|w, x, y|
@Priv['selectMode'] = :set
randomButton1(w, x, y)
Tk.callback_break
}, '%W %x %y')
- treeCtrlRandom.bind('Button1-Motion',
+ treeCtrlRandom.bind('Button1-Motion',
proc{|w, x, y|
randomMotion1(w, x, y)
Tk.callback_break
}, '%W %x %y')
- treeCtrlRandom.bind('Button1-Leave',
+ treeCtrlRandom.bind('Button1-Leave',
proc{|w, x, y|
randomLeave1(w, x, y)
Tk.callback_break
}, '%W %x %y')
- treeCtrlRandom.bind('ButtonRelease-1',
+ treeCtrlRandom.bind('ButtonRelease-1',
proc{|w, x, y|
randomRelease1(w, x, y)
Tk.callback_break
@@ -363,7 +363,7 @@ def randomRelease1(t, x, y)
t.selection_modify('', @Priv[:drop])
t[:cursor] = ''
if @Priv[:drop] != ''
- randomDrop(t, @Priv[:drop], @Priv.list_element(:selection),
+ randomDrop(t, @Priv[:drop], @Priv.list_element(:selection),
@Priv[:drop, :pos])
end
end
@@ -479,7 +479,7 @@ def randomAutoScanCheck(t, x, y)
when 'drag', 'marquee'
randomMotion(t, x, y)
end
- @Priv[:autoscan, :afterId, t] =
+ @Priv[:autoscan, :afterId, t] =
Tk.after(delay, proc{ randomAutoScanCheckAux(t) })
end
return
@@ -502,7 +502,7 @@ def demoRandom2(t)
init_pics('mac-*')
- t.configure(:openbuttonimage=>@images['mac-collapse'],
- :closedbuttonimage=>@images['mac-expand'],
+ t.configure(:openbuttonimage=>@images['mac-collapse'],
+ :closedbuttonimage=>@images['mac-expand'],
:showlines=>false)
end
diff --git a/ext/tk/sample/tkextlib/treectrl/www-options.rb b/ext/tk/sample/tkextlib/treectrl/www-options.rb
index 6a3e9c2201..efa55ca06c 100644
--- a/ext/tk/sample/tkextlib/treectrl/www-options.rb
+++ b/ext/tk/sample/tkextlib/treectrl/www-options.rb
@@ -3,7 +3,7 @@ def demoInternetOptions (t)
height = t.font.metrics(:linespace) + 2
height = 18 if height < 18
- t.configure(:showroot=>false, :showbuttons=>false, :showlines=>false,
+ t.configure(:showroot=>false, :showbuttons=>false, :showlines=>false,
:itemheight=>height, :selectmode=>:browse)
init_pics('internet-*')
@@ -19,14 +19,14 @@ def demoInternetOptions (t)
t.state_define('on')
t.element_create('e1', :image, :image=>[
- @images['internet-check-on'], ['check', 'on'],
- @images['internet-check-off'], ['check'],
- @images['internet-radio-on'], ['radio', 'on'],
+ @images['internet-check-on'], ['check', 'on'],
+ @images['internet-check-off'], ['check'],
+ @images['internet-radio-on'], ['radio', 'on'],
@images['internet-radio-off'], ['radio']
])
- t.element_create('e2', :text,
+ t.element_create('e2', :text,
:fill=>[@SystemHighlightText, ['selected', 'focus']])
- t.element_create('e3', :rect, :showfocus=>true,
+ t.element_create('e3', :rect, :showfocus=>true,
:fill=>[@SystemHighlight, ['selected', 'focus']])
s = t.style_create('s1')
@@ -38,18 +38,18 @@ def demoInternetOptions (t)
parentList = [:root, '', '', '', '', '', '']
parent = :root
[
- [0, :print, "Printing", "", ""],
- [1, :off, "Print background colors and images", "o1", ""],
- [0, :search, "Search from Address bar", "", ""],
- [1, :search, "When searching", "", ""],
- [2, :off, "Display results, and go to the most likely sites",
- "o2", "r1"],
- [2, :off, "Do not search from the Address bar", "o3", "r1"],
- [2, :off, "Just display the results in the main window",
+ [0, :print, "Printing", "", ""],
+ [1, :off, "Print background colors and images", "o1", ""],
+ [0, :search, "Search from Address bar", "", ""],
+ [1, :search, "When searching", "", ""],
+ [2, :off, "Display results, and go to the most likely sites",
+ "o2", "r1"],
+ [2, :off, "Do not search from the Address bar", "o3", "r1"],
+ [2, :off, "Just display the results in the main window",
"o4", "r1"],
- [2, :on, "Just go to the most likely site", "o5", "r1"],
- [0, :security, "Security", "", ""],
- [1, :on, "Check for publisher's certificate revocation", "o5", ""],
+ [2, :on, "Just go to the most likely site", "o5", "r1"],
+ [0, :security, "Security", "", ""],
+ [1, :on, "Check for publisher's certificate revocation", "o5", ""],
[1, :off, "Check for server certificate revocation (requires restart)",
"o6", ""]
].each{|depth, setting, text, option, group|
@@ -73,7 +73,7 @@ def demoInternetOptions (t)
t.item_state_set(item, 'radio')
end
else
- t.item_element_configure(item, 0, 'e1',
+ t.item_element_configure(item, 0, 'e1',
:image=>@images["internet-#{setting}"])
end
t.item_lastchild(parentList[depth], item)
@@ -146,7 +146,7 @@ end
def demoInternetOptions_2(t)
height = t.font.metrics(:linespace) + 2
height = 18 if height < 18
- t.configure(:showroot=>false, :showbuttons=>false, :showlines=>false,
+ t.configure(:showroot=>false, :showbuttons=>false, :showlines=>false,
:itemheight=>height, :selectmode=>:browse)
init_pics('internet-*')
@@ -154,9 +154,9 @@ def demoInternetOptions_2(t)
t.column_configure(0, :text=>'Internet Options')
t.element_create('e1', :image)
- t.element_create('e2', :text,
+ t.element_create('e2', :text,
:fill=>[@SystemHighlightText, ['selected', 'focus']])
- t.element_create('e3', :rect, :showfocus=>true,
+ t.element_create('e3', :rect, :showfocus=>true,
:fill=>[@SystemHighlight, ['selected', 'focus']])
s = t.style_create('s1')
@@ -168,18 +168,18 @@ def demoInternetOptions_2(t)
parentList = [:root, '', '', '', '', '', '']
parent = :root
[
- [0, :print, "Printing", "", ""],
- [1, :off, "Print background colors and images", "o1", ""],
- [0, :search, "Search from Address bar", "", ""],
- [1, :search, "When searching", "", ""],
- [2, :off, "Display results, and go to the most likely sites",
- "o2", "r1"],
- [2, :off, "Do not search from the Address bar", "o3", "r1"],
- [2, :off, "Just display the results in the main window",
+ [0, :print, "Printing", "", ""],
+ [1, :off, "Print background colors and images", "o1", ""],
+ [0, :search, "Search from Address bar", "", ""],
+ [1, :search, "When searching", "", ""],
+ [2, :off, "Display results, and go to the most likely sites",
+ "o2", "r1"],
+ [2, :off, "Do not search from the Address bar", "o3", "r1"],
+ [2, :off, "Just display the results in the main window",
"o4", "r1"],
- [2, :on, "Just go to the most likely site", "o5", "r1"],
- [0, :security, "Security", "", ""],
- [1, :on, "Check for publisher's certificate revocation", "o5", ""],
+ [2, :on, "Just go to the most likely site", "o5", "r1"],
+ [0, :security, "Security", "", ""],
+ [1, :on, "Check for publisher's certificate revocation", "o5", ""],
[1, :off, "Check for server certificate revocation (requires restart)",
"o6", ""]
].each{|depth, setting, text, option, group|
@@ -201,7 +201,7 @@ def demoInternetOptions_2(t)
t.item_element_configure(item, 0, 'e1', :image=>img)
end
else
- t.item_element_configure(item, 0, 'e1',
+ t.item_element_configure(item, 0, 'e1',
:image=>@images["internet-#{setting}"])
end
t.item_lastchild(parentList[depth], item)
@@ -256,16 +256,16 @@ def optionButton1_2(w, x, y)
else
setting = :on
end
- w.item_element_configure(item, 0, 'e1',
+ w.item_element_configure(item, 0, 'e1',
:image=>@images["internet-check-#{setting}"])
@Option[:setting, item] = setting
else
# a radiobutton
current = @Option[:current, group]
return if current == item.to_s
- w.item_element_configure(current, 0, 'e1',
+ w.item_element_configure(current, 0, 'e1',
:image=>@images["internet-radio-off"])
- w.item_element_configure(item, 0, 'e1',
+ w.item_element_configure(item, 0, 'e1',
:image=>@images["internet-radio-on"])
@Option[:setting, item] = :on
@Option[:current, group] = item
diff --git a/ext/tk/sample/tkextlib/vu/canvItems.rb b/ext/tk/sample/tkextlib/vu/canvItems.rb
index 364f87613b..33acf4f7e7 100644
--- a/ext/tk/sample/tkextlib/vu/canvItems.rb
+++ b/ext/tk/sample/tkextlib/vu/canvItems.rb
@@ -9,63 +9,63 @@ xbm = File.join(File.dirname(File.expand_path(__FILE__)), 'm128_000.xbm')
sval = [ 11, 22, 33, 44, 55, 66, 77, 88, 99 ]
-l0 = TkLabel.new(:width=>128, :height=>128,
+l0 = TkLabel.new(:width=>128, :height=>128,
:bitmap=>"@#{xbm}", :relief=>:groove).pack(:side=>:left)
-c0 = TkCanvas.new(:width=>80, :height=>80,
- :insertwidth=>0, :highlightthickness=>0,
- :selectborderwidth=>0, :borderwidth=>2,
- :relief=>:ridge).place(:in=>l0, :relx=>0.5, :rely=>0.5,
+c0 = TkCanvas.new(:width=>80, :height=>80,
+ :insertwidth=>0, :highlightthickness=>0,
+ :selectborderwidth=>0, :borderwidth=>2,
+ :relief=>:ridge).place(:in=>l0, :relx=>0.5, :rely=>0.5,
:anchor=>:c)
-st = Tk::Vu::TkcStripchart.new(c0, 3, 3, 80, 80,
- :background=>"#b7c0d7", :fill=>'slategray3',
- :jumpscroll=>1, :outline=>'black',
- :scaleline=>'blue', :stripline=>'red',
+st = Tk::Vu::TkcStripchart.new(c0, 3, 3, 80, 80,
+ :background=>"#b7c0d7", :fill=>'slategray3',
+ :jumpscroll=>1, :outline=>'black',
+ :scaleline=>'blue', :stripline=>'red',
:selected=>1, :values=>sval)
-TkcText.create(c0, 40, 40,
+TkcText.create(c0, 40, 40,
:text=>Tk::TCL_PATCHLEVEL, :fill=>'cyan', :tags=>'text')
-l1 = TkLabel.new(:width=>128, :height=>128,
+l1 = TkLabel.new(:width=>128, :height=>128,
:bitmap=>"@#{xbm}", :relief=>:groove).pack(:side=>:left)
-c1 = TkCanvas.new(:width=>80, :height=>80,
- :insertwidth=>0, :highlightthickness=>0,
- :selectborderwidth=>0, :borderwidth=>2,
- :relief=>:ridge).place(:in=>l1, :relx=>0.5, :rely=>0.5,
+c1 = TkCanvas.new(:width=>80, :height=>80,
+ :insertwidth=>0, :highlightthickness=>0,
+ :selectborderwidth=>0, :borderwidth=>2,
+ :relief=>:ridge).place(:in=>l1, :relx=>0.5, :rely=>0.5,
:anchor=>:c)
-bar1 = Tk::Vu::TkcBarchart.new(c1, 3, 3, 80, 80,
- :background=>"#b7c0d7", :scalevalue=>10.0,
- :autocolor=>true, :selected=>1,
- :outline=>'black', :barline=>'yellow',
+bar1 = Tk::Vu::TkcBarchart.new(c1, 3, 3, 80, 80,
+ :background=>"#b7c0d7", :scalevalue=>10.0,
+ :autocolor=>true, :selected=>1,
+ :outline=>'black', :barline=>'yellow',
:scalelinestyle=>0)
-bar2 = Tk::Vu::TkcBarchart.new(c1, 53, 3, 80, 80,
- :background=>"#b7c0d7", :scalevalue=>10.0,
- :autocolor=>true, :selected=>1,
- :outline=>'black', :fill=>"#b7c0d7",
+bar2 = Tk::Vu::TkcBarchart.new(c1, 53, 3, 80, 80,
+ :background=>"#b7c0d7", :scalevalue=>10.0,
+ :autocolor=>true, :selected=>1,
+ :outline=>'black', :fill=>"#b7c0d7",
:barline=>'red', :scalelinestyle=>22)
-l2 = TkLabel.new(:width=>128, :height=>128,
+l2 = TkLabel.new(:width=>128, :height=>128,
:bitmap=>"@#{xbm}", :relief=>:groove).pack(:side=>:left)
-c2 = TkCanvas.new(:width=>80, :height=>80,
- :insertwidth=>0, :highlightthickness=>0,
- :selectborderwidth=>0, :borderwidth=>2,
- :relief=>:ridge).place(:in=>l2, :relx=>0.5, :rely=>0.5,
+c2 = TkCanvas.new(:width=>80, :height=>80,
+ :insertwidth=>0, :highlightthickness=>0,
+ :selectborderwidth=>0, :borderwidth=>2,
+ :relief=>:ridge).place(:in=>l2, :relx=>0.5, :rely=>0.5,
:anchor=>:c)
begin
- stick = Tk::Vu::TkcSticker.new(c2, 3, 3, 80, 80,
- :text=>"Tcl/Tk", :space=>0, :color=>'red',
- :outline=>'red', :font=>'Helvetica 14 bold',
- :fill=>'', :stipple=>'', :bar=>'blue',
- :orient=>:vertical, :anchor=>:s,
- :relheight=>1.0, :relwidth=>0.15,
+ stick = Tk::Vu::TkcSticker.new(c2, 3, 3, 80, 80,
+ :text=>"Tcl/Tk", :space=>0, :color=>'red',
+ :outline=>'red', :font=>'Helvetica 14 bold',
+ :fill=>'', :stipple=>'', :bar=>'blue',
+ :orient=>:vertical, :anchor=>:s,
+ :relheight=>1.0, :relwidth=>0.15,
:relx=>0.1, :rely=>0.0)
rescue
stick = nil
diff --git a/ext/tk/sample/tkextlib/vu/canvSticker.rb b/ext/tk/sample/tkextlib/vu/canvSticker.rb
index 85713ebcf3..e2cd604975 100644
--- a/ext/tk/sample/tkextlib/vu/canvSticker.rb
+++ b/ext/tk/sample/tkextlib/vu/canvSticker.rb
@@ -14,7 +14,7 @@ c = TkCanvas.new.pack
begin
st = Tk::Vu::TkcSticker.new(c, 0, 0, 10, 10)
rescue
- Tk.messageBox(:type=>'ok', :title=>"No sticker Item",
+ Tk.messageBox(:type=>'ok', :title=>"No sticker Item",
:message=>"This build of vu does not include the sticker item")
exit
end
@@ -56,7 +56,7 @@ steps << proc{
steps << proc{
puts 'A vertical bar appears in the lower right region and text jumps to the left.'
- st.configure(:anchor=>:n, :relw=>0.3, :relh=>0.7,
+ st.configure(:anchor=>:n, :relw=>0.3, :relh=>0.7,
:relx=>0.6, :rely=>0.3, :bar=>'red')
}
diff --git a/ext/tk/sample/tkextlib/vu/canvSticker2.rb b/ext/tk/sample/tkextlib/vu/canvSticker2.rb
index 3d9495ffb0..548a72c2cb 100644
--- a/ext/tk/sample/tkextlib/vu/canvSticker2.rb
+++ b/ext/tk/sample/tkextlib/vu/canvSticker2.rb
@@ -10,7 +10,7 @@ c = TkCanvas.new.pack
begin
st = Tk::Vu::TkcSticker.new(c, 0, 0, 10, 10)
rescue
- Tk.messageBox(:type=>'ok', :title=>"No sticker Item",
+ Tk.messageBox(:type=>'ok', :title=>"No sticker Item",
:message=>"This build of vu does not include the sticker item")
exit
end
@@ -22,7 +22,7 @@ c.destroy
#sti_conf = [ [10, 10, 180, 180], "Sticker äöüß@²³¼½¾", :center ]
#txt_conf = [ [210, 210], "Text äöüß@²³¼½¾", :center ]
-sti_conf = [ [10, 10, 350, 350],
+sti_conf = [ [10, 10, 350, 350],
Tk::UTF8_String('Sticker \u00E4\u00F6\u00FC\u00DF\u0040\u00B2\u00B3\u00BC\u00BD\u00BE'),
:center ]
txt_conf = [ [250, 250],
diff --git a/ext/tk/sample/tkextlib/vu/dial_demo.rb b/ext/tk/sample/tkextlib/vu/dial_demo.rb
index f1f2f110b1..09bd3e9186 100644
--- a/ext/tk/sample/tkextlib/vu/dial_demo.rb
+++ b/ext/tk/sample/tkextlib/vu/dial_demo.rb
@@ -12,61 +12,61 @@ v_rot = TkVariable.new
v_linked = TkVariable.new
v_needle = TkVariable.new
-volume = Tk::Vu::Dial.new(:label=>"Volume", :from=>-0.1, :to=>0.1,
- :resolution=>0.001, :minortickinterval=>0.01,
- :tickinterval=>0.1, :beginangle=>-20,
+volume = Tk::Vu::Dial.new(:label=>"Volume", :from=>-0.1, :to=>0.1,
+ :resolution=>0.001, :minortickinterval=>0.01,
+ :tickinterval=>0.1, :beginangle=>-20,
:endangle=>260, :variable=>v_volume)
-speed = Tk::Vu::Dial.new(:label=>"Speed", :from=>2000, :to=>100,
- :resolution=>10, :tickinterval=>100,
- :minortickinterval=>0, :variable=>v_speed,
+speed = Tk::Vu::Dial.new(:label=>"Speed", :from=>2000, :to=>100,
+ :resolution=>10, :tickinterval=>100,
+ :minortickinterval=>0, :variable=>v_speed,
:showtags=>:label, :showvalue=>false)
speed.set_tag_constrain(100, 'Fast', 2000, 'Slow')
-fwd = Tk::Vu::Dial.new(:from=>-10.0, :to=>-20.0, :resolution=>0.1,
- :tickinterval=>5.0, :minortickinterval=>1.0,
+fwd = Tk::Vu::Dial.new(:from=>-10.0, :to=>-20.0, :resolution=>0.1,
+ :tickinterval=>5.0, :minortickinterval=>1.0,
:variable=>v_dir)
-rev = Tk::Vu::Dial.new(:from=>-20.0, :to=>-10.0, :resolution=>0.1,
- :tickinterval=>5.0, :minortickinterval=>1.0,
+rev = Tk::Vu::Dial.new(:from=>-20.0, :to=>-10.0, :resolution=>0.1,
+ :tickinterval=>5.0, :minortickinterval=>1.0,
:variable=>v_dir)
-small = Tk::Vu::Dial.new(:font=>"Helvetica -10", :from=>0, :to=>10,
+small = Tk::Vu::Dial.new(:font=>"Helvetica -10", :from=>0, :to=>10,
:resolution=>0.05, :tickinterval=>2,
- :minortickinterval=>0.5, :radius=>20,
- :dialcolor=>'red2', :activebackground=>'red',
+ :minortickinterval=>0.5, :radius=>20,
+ :dialcolor=>'red2', :activebackground=>'red',
:variable=>v_rot)
-large = Tk::Vu::Dial.new(:font=>"Helvetica -8", :from=>0, :to=>10,
+large = Tk::Vu::Dial.new(:font=>"Helvetica -8", :from=>0, :to=>10,
:resolution=>0.05, :tickinterval=>1,
- :minortickinterval=>0.25, :radius=>40,
- :dialcolor=>'red2', :activebackground=>'red',
+ :minortickinterval=>0.25, :radius=>40,
+ :dialcolor=>'red2', :activebackground=>'red',
:variable=>v_rot)
-turn = Tk::Vu::Dial.new(:needlecolor=>'red', :label=>"Linked",
+turn = Tk::Vu::Dial.new(:needlecolor=>'red', :label=>"Linked",
:variable=>v_linked)
scale = TkScale.new(:label=>"Linked", :variable=>v_linked)
-d1 = Tk::Vu::Dial.new(:resolution=>0.0001, :from=>-0.1, :to=>0.1,
- :showvalue=>true, :minortickinterval=>0.01,
- :tickinterval=>0.1, :radius=>30, :label=>"Dial",
- :beginangle=>-20, :endangle=>260, :variable=>v_needle,
+d1 = Tk::Vu::Dial.new(:resolution=>0.0001, :from=>-0.1, :to=>0.1,
+ :showvalue=>true, :minortickinterval=>0.01,
+ :tickinterval=>0.1, :radius=>30, :label=>"Dial",
+ :beginangle=>-20, :endangle=>260, :variable=>v_needle,
:relief=>:raised)
-d2 = Tk::Vu::Dial.new(:resolution=>0.01, :from=>-0.1, :to=>0.1,
- :showvalue=>true, :minortickinterval=>0.01,
- :tickinterval=>0.1, :radius=>30, :label=>"Dial 2",
- :beginangle=>-20, :endangle=>260, :variable=>v_needle,
- :dialrelief=>:flat, :needlecolor=>'red',
+d2 = Tk::Vu::Dial.new(:resolution=>0.01, :from=>-0.1, :to=>0.1,
+ :showvalue=>true, :minortickinterval=>0.01,
+ :tickinterval=>0.1, :radius=>30, :label=>"Dial 2",
+ :beginangle=>-20, :endangle=>260, :variable=>v_needle,
+ :dialrelief=>:flat, :needlecolor=>'red',
:needletype=>:triangle, :relief=>:sunken)
-d3 = Tk::Vu::Dial.new(:resolution=>0.001, :from=>-0.1, :to=>0.1,
- :showvalue=>true, :minortickinterval=>0.01,
- :tickinterval=>0.1, :radius=>30, :label=>"Dial 3",
- :beginangle=>-20, :endangle=>260, :variable=>v_needle,
- :dialrelief=>:flat, :needlecolor=>'blue',
+d3 = Tk::Vu::Dial.new(:resolution=>0.001, :from=>-0.1, :to=>0.1,
+ :showvalue=>true, :minortickinterval=>0.01,
+ :tickinterval=>0.1, :radius=>30, :label=>"Dial 3",
+ :beginangle=>-20, :endangle=>260, :variable=>v_needle,
+ :dialrelief=>:flat, :needlecolor=>'blue',
:needletype=>:arc, :relief=>:ridge)
f_btns = TkFrame.new
diff --git a/ext/tk/sample/tkextlib/vu/oscilloscope.rb b/ext/tk/sample/tkextlib/vu/oscilloscope.rb
index 1efe13ce01..2015e46645 100644
--- a/ext/tk/sample/tkextlib/vu/oscilloscope.rb
+++ b/ext/tk/sample/tkextlib/vu/oscilloscope.rb
@@ -22,26 +22,26 @@ geo_t1 = [15, 88]
c = TkCanvas.new(:width=>220, :height=>190).pack(:fill=>:both, :expand=>true)
#---background
-TkcRectangle.new(c, geo_fr, :width=>4, :fill=>'aquamarine3',
+TkcRectangle.new(c, geo_fr, :width=>4, :fill=>'aquamarine3',
:tags=>['osc', 'frbg'])
#---channel 0
-ch0 = Tk::Vu::TkcStripchart.new(c, geo_ch0,
- :fill=>'', :jumpscroll=>false,
- :outline=>'', :scaleline=>'',
+ch0 = Tk::Vu::TkcStripchart.new(c, geo_ch0,
+ :fill=>'', :jumpscroll=>false,
+ :outline=>'', :scaleline=>'',
:stripline=>'cyan', :tags=>['osc', 'ch0'])
#---channel 1
-ch1 = Tk::Vu::TkcStripchart.new(c, geo_ch1,
- :fill=>'', :jumpscroll=>0,
- :outline=>'', :scaleline=>'',
+ch1 = Tk::Vu::TkcStripchart.new(c, geo_ch1,
+ :fill=>'', :jumpscroll=>0,
+ :outline=>'', :scaleline=>'',
:stripline=>'red', :tags=>['osc', 'ch1'])
#---frame
TkcRectangle.new(c, geo_fr, :width=>4, :tags=>['osc', 'frfg'])
#---position
-txt1 = TkcText.new(c, geo_t1, :text=>"B1-Motion: X:%X\tY:%Y",
+txt1 = TkcText.new(c, geo_t1, :text=>"B1-Motion: X:%X\tY:%Y",
:anchor=>:nw, :tags=>['osc', 'txt1'])
#---BINDINGS
diff --git a/ext/tk/sample/tkextlib/vu/pie.rb b/ext/tk/sample/tkextlib/vu/pie.rb
index c8f9276e4e..ed598d6233 100644
--- a/ext/tk/sample/tkextlib/vu/pie.rb
+++ b/ext/tk/sample/tkextlib/vu/pie.rb
@@ -26,13 +26,13 @@ quit_btn = TkButton.new(f, :text=>"Exit", :command=>proc{exit})
Tk.grid(pie, :sticky=>:news)
Tk.grid(f, :sticky=>:ew)
-Tk.pack(fast_btn, slow_btn, quit_btn,
+Tk.pack(fast_btn, slow_btn, quit_btn,
:in=>f, :side=>:left, :fill=>:both, :expand=>true, :padx=>6, :pady=>4)
Tk.root.grid_columnconfigure(0, :weight=>1)
Tk.root.grid_rowconfigure(0, :weight=>1)
-priv = {
+priv = {
:x=>0, :y=>0, :pie_in=>false, :angle=>pie[:angle], :origin=>pie[:origin]
}
@@ -46,9 +46,9 @@ pie.bind('ButtonPress-1', proc{|w, x, y|
pie.bind('B1-Motion', proc{|w, x, y|
if priv[:pie_in]
- w.configure(:angle=>priv[:angle] + (priv[:y] - y)/3,
- :origin=>(priv[:origin] +
- ((w.winfo_height/2.2 > y)? -1: 1) *
+ w.configure(:angle=>priv[:angle] + (priv[:y] - y)/3,
+ :origin=>(priv[:origin] +
+ ((w.winfo_height/2.2 > y)? -1: 1) *
(priv[:x] - x)/3) % 360)
end
}, '%W %x %y')
diff --git a/ext/tk/sample/tkextlib/vu/vu_demo.rb b/ext/tk/sample/tkextlib/vu/vu_demo.rb
index 358d32495f..d078ae16f2 100644
--- a/ext/tk/sample/tkextlib/vu/vu_demo.rb
+++ b/ext/tk/sample/tkextlib/vu/vu_demo.rb
@@ -9,13 +9,13 @@ puts "Show off barchart and dial widgets"
speed = TkVariable.new(0)
-dial = Tk::Vu::Dial.new(:resolution=>0.001, :from=>-0.1, :to=>0.1,
- :showvalue=>true, :minortickinterval=>0.01,
- :tickinterval=>0.1, :radius=>50, :label=>"Dial",
- :beginangle=>-20, :endangle=>260, :dialcolor=>'red3',
+dial = Tk::Vu::Dial.new(:resolution=>0.001, :from=>-0.1, :to=>0.1,
+ :showvalue=>true, :minortickinterval=>0.01,
+ :tickinterval=>0.1, :radius=>50, :label=>"Dial",
+ :beginangle=>-20, :endangle=>260, :dialcolor=>'red3',
:active=>'red2', :variable=>speed)
-bar = Tk::Vu::Bargraph.new(:from=>0, :to=>100, :relief=>:groove,
+bar = Tk::Vu::Bargraph.new(:from=>0, :to=>100, :relief=>:groove,
:border=>2, :label=>"Bar Chart")
#######################################
@@ -26,7 +26,7 @@ purple = 75
current = 50
def rand_bool
-
+
end
update = TkTimer.new(200, -1, proc{
@@ -61,7 +61,7 @@ Tk.grid('x', nobar, :sticky=>:ew, :padx=>4, :pady=>4)
Tk.grid(quit, '-', '-', :sticky=>:ew, :padx=>4, :pady=>4)
Tk.root.grid_columnconfigure(2, :weight=>1)
Tk.root.grid_rowconfigure(1, :weight=>1)
-
+
#######################################
Tk.mainloop
diff --git a/ext/tk/sample/tkfrom.rb b/ext/tk/sample/tkfrom.rb
index f51f7f5d85..2cece7337e 100644
--- a/ext/tk/sample/tkfrom.rb
+++ b/ext/tk/sample/tkfrom.rb
@@ -22,7 +22,7 @@ class Mail
@body = []
while line = f.gets()
$_.chop!
- next if /^From / =~ line # skip From-line
+ next if /^From / =~ line # skip From-line
break if /^$/ =~ line # end of header
if /^(\S+):\s*(.*)/ =~ line
@header[attr = $1.capitalize] = $2
diff --git a/ext/tk/sample/tkhello.rb b/ext/tk/sample/tkhello.rb
index 597c1f6242..3b505f4983 100644
--- a/ext/tk/sample/tkhello.rb
+++ b/ext/tk/sample/tkhello.rb
@@ -1,6 +1,6 @@
require "tk"
-TkButton.new(nil,
+TkButton.new(nil,
:text => 'hello',
:command => proc{print "hello\n"}).pack(:fill=>'x')
TkButton.new(nil,
diff --git a/ext/tk/sample/tkmenubutton.rb b/ext/tk/sample/tkmenubutton.rb
index 8ae1359425..37f6128fd9 100644
--- a/ext/tk/sample/tkmenubutton.rb
+++ b/ext/tk/sample/tkmenubutton.rb
@@ -7,56 +7,56 @@ require 'tk'
TkLabel.new(:text=>'Sample of TkMenubutton').pack(:side=>:top)
TkFrame.new{|f|
- pack(:side=>:top)
+ pack(:side=>:top)
- TkMenubutton.new(:parent=>f, :text=>'Right', :underline=>0,
+ TkMenubutton.new(:parent=>f, :text=>'Right', :underline=>0,
:direction=>:right, :relief=>:raised){|mb|
menu TkMenu.new(:parent=>mb, :tearoff=>0){
- add(:command, :label=>'Right menu: first item',
- :command=>proc{print 'You have selected the first item' +
+ add(:command, :label=>'Right menu: first item',
+ :command=>proc{print 'You have selected the first item' +
" from the Right menu.\n"})
- add(:command, :label=>'Right menu: second item',
- :command=>proc{print 'You have selected the second item' +
+ add(:command, :label=>'Right menu: second item',
+ :command=>proc{print 'You have selected the second item' +
" from the Right menu.\n"})
}
pack(:side=>:left, :padx=>25, :pady=>25)
}
- TkMenubutton.new(:parent=>f, :text=>'Below', :underline=>0,
+ TkMenubutton.new(:parent=>f, :text=>'Below', :underline=>0,
:direction=>:below, :relief=>:raised){|mb|
menu(TkMenu.new(:parent=>mb, :tearoff=>0){
- add(:command, :label=>'Below menu: first item',
- :command=>proc{print 'You have selected the first item' +
+ add(:command, :label=>'Below menu: first item',
+ :command=>proc{print 'You have selected the first item' +
" from the Below menu.\n"})
- add(:command, :label=>'Below menu: second item',
- :command=>proc{print 'You have selected the second item' +
+ add(:command, :label=>'Below menu: second item',
+ :command=>proc{print 'You have selected the second item' +
" from the Below menu.\n"})
})
pack(:side=>:left, :padx=>25, :pady=>25)
}
- TkMenubutton.new(:parent=>f, :text=>'Above', :underline=>0,
+ TkMenubutton.new(:parent=>f, :text=>'Above', :underline=>0,
:direction=>:above, :relief=>:raised){|mb|
menu TkMenu.new(:parent=>mb, :tearoff=>0){
- add(:command, :label=>'Above menu: first item',
- :command=>proc{print 'You have selected the first item' +
+ add(:command, :label=>'Above menu: first item',
+ :command=>proc{print 'You have selected the first item' +
" from the Above menu.\n"})
- add(:command, :label=>'Above menu: second item',
- :command=>proc{print 'You have selected the second item' +
+ add(:command, :label=>'Above menu: second item',
+ :command=>proc{print 'You have selected the second item' +
" from the Above menu.\n"})
}
pack(:side=>:left, :padx=>25, :pady=>25)
}
- TkMenubutton.new(:parent=>f, :text=>'Left', :underline=>0,
+ TkMenubutton.new(:parent=>f, :text=>'Left', :underline=>0,
:direction=>:left, :relief=>:raised){|mb|
menu(TkMenu.new(:parent=>mb, :tearoff=>0){
- add(:command, :label=>'Left menu: first item',
- :command=>proc{print 'You have selected the first item' +
+ add(:command, :label=>'Left menu: first item',
+ :command=>proc{print 'You have selected the first item' +
" from the Left menu.\n"})
- add(:command, :label=>'Left menu: second item',
- :command=>proc{print 'You have selected the second item' +
+ add(:command, :label=>'Left menu: second item',
+ :command=>proc{print 'You have selected the second item' +
" from the Left menu.\n"})
})
pack(:side=>:left, :padx=>25, :pady=>25)
@@ -64,20 +64,20 @@ TkFrame.new{|f|
}
############################
-TkFrame.new(:borderwidth=>2, :relief=>:sunken,
+TkFrame.new(:borderwidth=>2, :relief=>:sunken,
:height=>5).pack(:side=>:top, :fill=>:x, :padx=>20)
############################
TkLabel.new(:text=>'Sample of TkOptionMenu').pack(:side=>:top)
-colors = %w(Black red4 DarkGreen NavyBlue gray75 Red Green Blue gray50
+colors = %w(Black red4 DarkGreen NavyBlue gray75 Red Green Blue gray50
Yellow Cyan Magenta White Brown DarkSeaGreen DarkViolet)
TkFrame.new{|f|
- pack(:side=>:top)
+ pack(:side=>:top)
- b1 = TkOptionMenubutton .
- new(:parent=>f, :values=>%w(one two three)) .
+ b1 = TkOptionMenubutton .
+ new(:parent=>f, :values=>%w(one two three)) .
pack(:side=>:left, :padx=>25, :pady=>25)
b2 = TkOptionMenubutton.new(:parent=>f, :values=>colors) {|optMB|
@@ -96,7 +96,7 @@ TkFrame.new{|f|
put 'Black', *[14, 2, 16, 14]
put color, *[ 2, 2, 14, 14]
}
- optMB.entryconfigure(color, :hidemargin=>1,
+ optMB.entryconfigure(color, :hidemargin=>1,
:image=>no_sel, :selectimage=>sel)
}
optMB.menuconfigure(:tearoff, 1)
@@ -114,7 +114,7 @@ TkFrame.new{|f|
}
############################
-TkFrame.new(:borderwidth=>2, :relief=>:sunken,
+TkFrame.new(:borderwidth=>2, :relief=>:sunken,
:height=>5).pack(:side=>:top, :fill=>:x, :padx=>20)
############################
diff --git a/ext/tk/sample/tkmsgcat-load_rb.rb b/ext/tk/sample/tkmsgcat-load_rb.rb
index 98a91fadf4..5373e0086f 100644
--- a/ext/tk/sample/tkmsgcat-load_rb.rb
+++ b/ext/tk/sample/tkmsgcat-load_rb.rb
@@ -15,7 +15,7 @@ col_proc = TkComm.install_bind(proc{|w, color, frame, label|
TkComm.window(frame).background(color)
Tk.update
TkComm.window(label).text(
- msgcat["%1$s:: %2$s", 'Color',
+ msgcat["%1$s:: %2$s", 'Color',
color.capitalize])
w.flash; w.flash
Tk.callback_break;
@@ -23,7 +23,7 @@ col_proc = TkComm.install_bind(proc{|w, color, frame, label|
del_proc = TkComm.install_cmd(proc{top_win.destroy; top_win = nil})
-err_proc = TkComm.install_cmd(proc{fail(RuntimeError,
+err_proc = TkComm.install_cmd(proc{fail(RuntimeError,
msgcat['Application Error'])})
show_sample = proc{|loc|
@@ -38,10 +38,10 @@ show_sample = proc{|loc|
pack(:pady=>10, :padx=>10)
}
- lbl = TkLabel.new(top_win, :text=>msgcat["%1$s:: %2$s",
+ lbl = TkLabel.new(top_win, :text=>msgcat["%1$s:: %2$s",
'Color', '']).pack(:anchor=>'w')
- bg = TkFrame.new(top_win).pack(:ipadx=>20, :ipady=>10,
+ bg = TkFrame.new(top_win).pack(:ipadx=>20, :ipady=>10,
:expand=>true, :fill=>:both)
TkFrame.new(bg){|f|
@@ -53,9 +53,9 @@ show_sample = proc{|loc|
}.pack(:anchor=>'center', :pady=>15)
TkFrame.new(top_win){|f|
- TkButton.new(f, :text=>msgcat['Delete'],
+ TkButton.new(f, :text=>msgcat['Delete'],
:command=>del_proc).pack(:side=>:right, :padx=>5)
- TkButton.new(f, :text=>msgcat['Error'],
+ TkButton.new(f, :text=>msgcat['Error'],
:command=>err_proc).pack(:side=>:left, :padx=>5)
}.pack(:side=>:bottom, :fill=>:x)
@@ -67,7 +67,7 @@ show_sample = proc{|loc|
TkLabel.new(:text=>"Please click a locale.").pack(:padx=>5, :pady=>3)
TkFrame.new{|f|
- TkButton.new(f, :text=>msgcat['Exit'],
+ TkButton.new(f, :text=>msgcat['Exit'],
:command=>proc{exit}).pack(:side=>:right, :padx=>5)
}.pack(:side=>:bottom, :fill=>:x)
@@ -90,7 +90,7 @@ lbox.bind('ButtonRelease-1'){|ev|
lbox.insert('end', 'default')
-Dir.entries(msgcat_dir).sort.each{|f|
+Dir.entries(msgcat_dir).sort.each{|f|
if f =~ /^(.*).msg$/
lbox.insert('end', $1)
end
diff --git a/ext/tk/sample/tkmsgcat-load_rb2.rb b/ext/tk/sample/tkmsgcat-load_rb2.rb
index 05512a3131..55246545c8 100644
--- a/ext/tk/sample/tkmsgcat-load_rb2.rb
+++ b/ext/tk/sample/tkmsgcat-load_rb2.rb
@@ -15,7 +15,7 @@ col_proc = TkComm.install_bind(proc{|w, color, frame, label|
TkComm.window(frame).background(color)
Tk.update
TkComm.window(label).text(
- msgcat["%1$s:: %2$s", 'Color',
+ msgcat["%1$s:: %2$s", 'Color',
color.capitalize])
w.flash; w.flash
Tk.callback_break;
@@ -23,7 +23,7 @@ col_proc = TkComm.install_bind(proc{|w, color, frame, label|
del_proc = TkComm.install_cmd(proc{top_win.destroy; top_win = nil})
-err_proc = TkComm.install_cmd(proc{fail(RuntimeError,
+err_proc = TkComm.install_cmd(proc{fail(RuntimeError,
msgcat['Application Error'])})
show_sample = proc{|loc|
@@ -38,10 +38,10 @@ show_sample = proc{|loc|
pack(:pady=>10, :padx=>10)
}
- lbl = TkLabel.new(top_win, :text=>msgcat["%1$s:: %2$s",
+ lbl = TkLabel.new(top_win, :text=>msgcat["%1$s:: %2$s",
'Color', '']).pack(:anchor=>'w')
- bg = TkFrame.new(top_win).pack(:ipadx=>20, :ipady=>10,
+ bg = TkFrame.new(top_win).pack(:ipadx=>20, :ipady=>10,
:expand=>true, :fill=>:both)
TkFrame.new(bg){|f|
@@ -53,9 +53,9 @@ show_sample = proc{|loc|
}.pack(:anchor=>'center', :pady=>15)
TkFrame.new(top_win){|f|
- TkButton.new(f, :text=>msgcat['Delete'],
+ TkButton.new(f, :text=>msgcat['Delete'],
:command=>del_proc).pack(:side=>:right, :padx=>5)
- TkButton.new(f, :text=>msgcat['Error'],
+ TkButton.new(f, :text=>msgcat['Error'],
:command=>err_proc).pack(:side=>:left, :padx=>5)
}.pack(:side=>:bottom, :fill=>:x)
@@ -67,7 +67,7 @@ show_sample = proc{|loc|
TkLabel.new(:text=>"Please click a locale.").pack(:padx=>5, :pady=>3)
TkFrame.new{|f|
- TkButton.new(f, :text=>msgcat['Exit'],
+ TkButton.new(f, :text=>msgcat['Exit'],
:command=>proc{exit}).pack(:side=>:right, :padx=>5)
}.pack(:side=>:bottom, :fill=>:x)
@@ -90,7 +90,7 @@ lbox.bind('ButtonRelease-1'){|ev|
lbox.insert('end', 'default')
-Dir.entries(msgcat_dir).sort.each{|f|
+Dir.entries(msgcat_dir).sort.each{|f|
if f =~ /^(.*).msg$/
lbox.insert('end', $1)
end
diff --git a/ext/tk/sample/tkmsgcat-load_tk.rb b/ext/tk/sample/tkmsgcat-load_tk.rb
index 703f471e19..45d68e4e0b 100644
--- a/ext/tk/sample/tkmsgcat-load_tk.rb
+++ b/ext/tk/sample/tkmsgcat-load_tk.rb
@@ -14,7 +14,7 @@ col_proc = TkComm.install_bind(proc{|w, color, frame, label|
TkComm.window(frame).background(color)
Tk.update
TkComm.window(label).text(
- msgcat.mc("%1$s:: %2$s", 'Color',
+ msgcat.mc("%1$s:: %2$s", 'Color',
color.capitalize))
w.flash; w.flash
Tk.callback_break;
@@ -22,7 +22,7 @@ col_proc = TkComm.install_bind(proc{|w, color, frame, label|
del_proc = TkComm.install_cmd(proc{top_win.destroy; top_win = nil})
-err_proc = TkComm.install_cmd(proc{fail(RuntimeError,
+err_proc = TkComm.install_cmd(proc{fail(RuntimeError,
msgcat.mc('Application Error'))})
show_sample = proc{|loc|
@@ -36,10 +36,10 @@ show_sample = proc{|loc|
pack(:pady=>10, :padx=>10)
}
- lbl = TkLabel.new(top_win, :text=>msgcat.mc("%1$s:: %2$s",
+ lbl = TkLabel.new(top_win, :text=>msgcat.mc("%1$s:: %2$s",
'Color', '')).pack(:anchor=>'w')
- bg = TkFrame.new(top_win).pack(:ipadx=>20, :ipady=>10,
+ bg = TkFrame.new(top_win).pack(:ipadx=>20, :ipady=>10,
:expand=>true, :fill=>:both)
TkFrame.new(bg){|f|
@@ -48,7 +48,7 @@ show_sample = proc{|loc|
bind('ButtonRelease-1', col_proc, "#{col} #{bg.path} #{lbl.path}")
}.pack(:fill=>:x)
=begin
- TkButton.new(f, :text=>msgcat.mc(col),
+ TkButton.new(f, :text=>msgcat.mc(col),
:command=>proc{
bg.background col
lbl.text msgcat.mc("%1$s:: %2$s", 'Color', col.capitalize)
@@ -58,17 +58,17 @@ show_sample = proc{|loc|
}.pack(:anchor=>'center', :pady=>15)
TkFrame.new(top_win){|f|
- TkButton.new(f, :text=>msgcat.mc('Delete'),
+ TkButton.new(f, :text=>msgcat.mc('Delete'),
:command=>del_proc).pack(:side=>:right, :padx=>5)
- TkButton.new(f, :text=>msgcat.mc('Error'),
+ TkButton.new(f, :text=>msgcat.mc('Error'),
:command=>err_proc).pack(:side=>:left, :padx=>5)
=begin
- TkButton.new(f, :text=>msgcat.mc('Delete'),
+ TkButton.new(f, :text=>msgcat.mc('Delete'),
:command=>proc{
top_win.destroy
top_win = nil
}).pack(:side=>:right, :padx=>5)
- TkButton.new(f, :text=>msgcat.mc('Error'),
+ TkButton.new(f, :text=>msgcat.mc('Error'),
:command=>proc{
fail RuntimeError, msgcat.mc('Application Error')
}).pack(:side=>:left, :padx=>5)
@@ -83,7 +83,7 @@ show_sample = proc{|loc|
TkLabel.new(:text=>"Please click a locale.").pack(:padx=>5, :pady=>3)
TkFrame.new{|f|
- TkButton.new(f, :text=>msgcat.mc('Exit'),
+ TkButton.new(f, :text=>msgcat.mc('Exit'),
:command=>proc{exit}).pack(:side=>:right, :padx=>5)
}.pack(:side=>:bottom, :fill=>:x)
@@ -106,7 +106,7 @@ lbox.bind('ButtonRelease-1'){|ev|
lbox.insert('end', 'default')
-Dir.entries(msgcat_dir).sort.each{|f|
+Dir.entries(msgcat_dir).sort.each{|f|
if f =~ /^(.*).msg$/
lbox.insert('end', $1)
end
diff --git a/ext/tk/sample/tkmulticolumnlist.rb b/ext/tk/sample/tkmulticolumnlist.rb
index a1b3a1a2fa..255eb691e5 100644
--- a/ext/tk/sample/tkmulticolumnlist.rb
+++ b/ext/tk/sample/tkmulticolumnlist.rb
@@ -32,7 +32,7 @@ class TkMultiColumnList < TkText
# decide total width
@lbox_total = title_info.size
@width_total = 0
- title_info.each{|title, width, cmd|
+ title_info.each{|title, width, cmd|
@width_total += width.to_f
@title_cmd << cmd
}
@@ -54,28 +54,28 @@ class TkMultiColumnList < TkText
@command = nil
# virtical scrollbar
- @v_scroll = TkYScrollbar.new(@frame, 'highlightthickness'=>@h_l_thick,
- 'borderwidth'=>@scrbar_border,
+ @v_scroll = TkYScrollbar.new(@frame, 'highlightthickness'=>@h_l_thick,
+ 'borderwidth'=>@scrbar_border,
'width'=>@scrbar_width)
# horizontal scrollbar
- @h_scroll = TkXScrollbar.new(@frame, 'highlightthickness'=>@h_l_thick,
- 'borderwidth'=>@scrbar_border,
+ @h_scroll = TkXScrollbar.new(@frame, 'highlightthickness'=>@h_l_thick,
+ 'borderwidth'=>@scrbar_border,
'width'=>@scrbar_width)
# create base flames
- @c_title = TkCanvas.new(@frame, 'highlightthickness'=>@h_l_thick,
+ @c_title = TkCanvas.new(@frame, 'highlightthickness'=>@h_l_thick,
'width'=>@window_width)
@f_title = TkFrame.new(@c_title, 'width'=>@width_total)
- @w_title = TkcWindow.new(@c_title, 0, 0,
+ @w_title = TkcWindow.new(@c_title, 0, 0,
'window'=>@f_title, 'anchor'=>'nw')
- @c_lbox = TkCanvas.new(@frame, 'highlightthickness'=>@h_l_thick,
+ @c_lbox = TkCanvas.new(@frame, 'highlightthickness'=>@h_l_thick,
'width'=>@window_width)
@f_lbox = TkFrame.new(@c_lbox, 'width'=>@width_total)
@w_lbox = TkcWindow.new(@c_lbox, 0, 0, 'window'=>@f_lbox, 'anchor'=>'nw')
- @c_hscr = TkCanvas.new(@frame, 'highlightthickness'=>@h_l_thick,
+ @c_hscr = TkCanvas.new(@frame, 'highlightthickness'=>@h_l_thick,
'width'=>@window_width)
@f_hscr = TkFrame.new(@c_hscr, 'width'=>@width_total)
@w_hscr = TkcWindow.new(@c_hscr, 0, 0, 'window'=>@f_hscr, 'anchor'=>'nw')
@@ -99,28 +99,28 @@ class TkMultiColumnList < TkText
f = TkFrame.new(@f_title, 'width'=>width)
base = [f]
- title = TkLabel.new(f, 'text'=>label, 'borderwidth'=>@title_border,
+ title = TkLabel.new(f, 'text'=>label, 'borderwidth'=>@title_border,
'relief'=>'raised', 'highlightthickness'=>@h_l_thick)
title_binding(title, idx)
title.pack('fill'=>'x')
@title_list << title
- f.place('relx'=>@rel_list[idx], 'y'=>0, 'anchor'=>'nw', 'width'=>1,
- 'relheight'=>1.0,
+ f.place('relx'=>@rel_list[idx], 'y'=>0, 'anchor'=>'nw', 'width'=>1,
+ 'relheight'=>1.0,
'relwidth'=>@rel_list[idx+1] - @rel_list[idx])
# listbox field
f = TkFrame.new(@f_lbox, 'width'=>width)
base << f
- @lbox_list << TkText.new(f, 'highlightthickness'=>@h_l_thick,
- 'borderwidth'=>@lbox_border,
- 'takefocus'=>false,
+ @lbox_list << TkText.new(f, 'highlightthickness'=>@h_l_thick,
+ 'borderwidth'=>@lbox_border,
+ 'takefocus'=>false,
'wrap'=>'none') {
bindtags(bindtags - [TkText])
- @seltag = TkTextTag.new(self, 'background'=>'#b3b3b3',
+ @seltag = TkTextTag.new(self, 'background'=>'#b3b3b3',
'borderwidth'=>1, 'relief'=>'raised')
def self.nearest(y)
self.index("@1,#{y}").split('.')[0].to_i
@@ -151,17 +151,17 @@ class TkMultiColumnList < TkText
pack('fill'=>'both', 'expand'=>true)
}
- f.place('relx'=>@rel_list[idx], 'y'=>0, 'anchor'=>'nw', 'width'=>1,
+ f.place('relx'=>@rel_list[idx], 'y'=>0, 'anchor'=>'nw', 'width'=>1,
'relwidth'=>@rel_list[idx+1] - @rel_list[idx], 'relheight'=>1.0)
# scrollbar field
f = TkFrame.new(@f_hscr, 'width'=>width)
base << f
- @hscr_list << TkXScrollbar.new(f, 'width'=>@scrbar_width,
- 'borderwidth'=>@scrbar_border,
+ @hscr_list << TkXScrollbar.new(f, 'width'=>@scrbar_width,
+ 'borderwidth'=>@scrbar_border,
'highlightthickness'=>@h_l_thick
).pack('fill'=>'x', 'anchor'=>'w')
- f.place('relx'=>@rel_list[idx], 'y'=>0, 'anchor'=>'nw', 'width'=>1,
+ f.place('relx'=>@rel_list[idx], 'y'=>0, 'anchor'=>'nw', 'width'=>1,
'relwidth'=>@rel_list[idx+1] - @rel_list[idx])
@lbox_list[idx].xscrollbar(@hscr_list[idx])
@@ -171,23 +171,23 @@ class TkMultiColumnList < TkText
}
# pad
- @f_title_pad = TkFrame.new(@frame, 'relief'=>'raised',
- 'borderwidth'=>@title_border,
+ @f_title_pad = TkFrame.new(@frame, 'relief'=>'raised',
+ 'borderwidth'=>@title_border,
'highlightthickness'=>@h_l_thick)
- @f_scr_pad = TkFrame.new(@frame, 'relief'=>'sunken',
- 'borderwidth'=>1,
+ @f_scr_pad = TkFrame.new(@frame, 'relief'=>'sunken',
+ 'borderwidth'=>1,
'highlightthickness'=>@h_l_thick)
# height check
title_height = 0
- @title_list.each{|w|
+ @title_list.each{|w|
h = w.winfo_reqheight
title_height = h if title_height < h
}
hscr_height = 0
- @hscr_list.each{|w|
+ @hscr_list.each{|w|
h = w.winfo_reqheight
hscr_height = h if hscr_height < h
}
@@ -203,12 +203,12 @@ class TkMultiColumnList < TkText
@h_scroll.assign(@c_title, @c_lbox, @c_hscr)
# binding for listboxes
- @lbox_list.each_with_index{|l, idx|
- l.bind('Button-1', proc{|w, y|
+ @lbox_list.each_with_index{|l, idx|
+ l.bind('Button-1', proc{|w, y|
@frame.focus
select_line(w, w.nearest(y))
}, '%W %y')
- l.bind('B1-Motion', proc{|w, y|
+ l.bind('B1-Motion', proc{|w, y|
select_line(w, w.nearest(y))
}, '%W %y')
l.bind('Double-Button-1', proc{
@@ -218,11 +218,11 @@ class TkMultiColumnList < TkText
l.bind('Control-Home', proc{|w| select_line(w, 0)}, '%W')
l.bind('Control-End', proc{|w| select_line(w, 'end')}, '%W')
- l.bind('Button-2', proc{|x, y|
+ l.bind('Button-2', proc{|x, y|
@lbox_mark_x = x
@lbox_list.each{|lbox| lbox.scan_mark(x, y)}
}, '%x %y')
- l.bind('B2-Motion', proc{|x, y|
+ l.bind('B2-Motion', proc{|x, y|
@lbox_list.each{|lbox| lbox.scan_dragto(@lbox_mark_x, y)}
l.scan_dragto(x, y)
}, '%x %y')
@@ -265,8 +265,8 @@ class TkMultiColumnList < TkText
@f_scr_pad.grid('row'=>2, 'rowspan'=>2, 'column'=>2, 'sticky'=>'news')
# binding for 'Configure' event
- @c_lbox.bind('Configure',
- proc{|height, width| reconstruct(height, width)},
+ @c_lbox.bind('Configure',
+ proc{|height, width| reconstruct(height, width)},
'%h %w')
# set default receiver of method calls
@@ -386,7 +386,7 @@ class TkMultiColumnList < TkText
def titlefont(font)
@title_list.each{|label| label['font'] = font}
title_height = 0
- @title_list.each{|w|
+ @title_list.each{|w|
h = w.winfo_reqheight
title_height = h if title_height < h
}
@@ -523,7 +523,7 @@ class TkMultiColumnList < TkText
array[indices[0]] = line[label]
else
if line[label].kind_of? Array
- indices.each_with_index{|index, num|
+ indices.each_with_index{|index, num|
array[index] = line[label][num]
}
else
@@ -541,9 +541,9 @@ class TkMultiColumnList < TkText
indices.each{|index| lbox_ins[index] << line[index]}
end
}
- }
+ }
- @lbox_list.each_with_index{|lbox, index|
+ @lbox_list.each_with_index{|lbox, index|
lbox.insert(idx, cr + lbox_ins[index].join("\n")) if lbox_ins[index]
}
end
@@ -581,7 +581,7 @@ class TkMultiColumnList < TkText
(0..(@rel_list.size - 2)).each{|idx|
title, lbox, hscr = @base_list[idx]
title.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx])
- lbox.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx],
+ lbox.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx],
'relheight'=>1.0)
hscr.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx])
}
@@ -608,11 +608,11 @@ class TkMultiColumnList < TkText
# adjustment of rightside widget of the sash
title, lbox, hscr = @base_list[idx]
- title.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx],
+ title.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx],
'relx'=>@rel_list[idx])
- lbox.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx],
+ lbox.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx],
'relx'=>@rel_list[idx], 'relheight'=>1.0)
- hscr.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx],
+ hscr.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx],
'relx'=>@rel_list[idx])
# update reference position
@@ -636,34 +636,34 @@ class TkMultiColumnList < TkText
end
def title_binding(title, index)
- title.bind('Motion', proc{|w, x, idx| motion_cb(w, x, idx.to_i)},
+ title.bind('Motion', proc{|w, x, idx| motion_cb(w, x, idx.to_i)},
"%W %x #{index}")
- title.bind('Enter', proc{|w, x, idx| motion_cb(w, x, idx.to_i)},
+ title.bind('Enter', proc{|w, x, idx| motion_cb(w, x, idx.to_i)},
"%W %x #{index}")
title.bind('Leave', proc{|w| w.cursor ""}, "%W")
- title.bind('Button-1',
- proc{|w, x|
+ title.bind('Button-1',
+ proc{|w, x|
if @mode == :sash
@x = x
@frame_width = TkWinfo.width(@f_title).to_f
else
title.relief 'sunken'
end
- },
+ },
'%W %X')
- title.bind('ButtonRelease-1',
- proc{|w, x, idx|
+ title.bind('ButtonRelease-1',
+ proc{|w, x, idx|
i = idx.to_i
if @mode == :title && @title_cmd[i].kind_of?(Proc)
@title_cmd[i].call
end
title.relief 'raised'
motion_cb(w,x,i)
- },
+ },
"%W %x #{index}")
title.bind('B1-Motion', proc{|x| resize(x) if @mode == :sash}, "%X")
@@ -705,13 +705,13 @@ end
# test
################################################
if __FILE__ == $0
- l = TkMultiColumnList.new(nil, 200,
- [ ['L1', 200, proc{p 'click L1'}],
- ['L2', 100],
- ['L3', 200] ],
- 'width'=>350,
- #'titleforeground'=>'yellow',
- 'titleforeground'=>'white',
+ l = TkMultiColumnList.new(nil, 200,
+ [ ['L1', 200, proc{p 'click L1'}],
+ ['L2', 100],
+ ['L3', 200] ],
+ 'width'=>350,
+ #'titleforeground'=>'yellow',
+ 'titleforeground'=>'white',
#'titlebackground'=>'navy',
'titlebackground'=>'blue',
'titlefont'=>'courier'
@@ -719,7 +719,7 @@ if __FILE__ == $0
l.insert('end', [1,2,3])
l.insert('end', [4,5,6])
l.insert('end', [4,5,6], [4,5,6])
- l.insert('end', ['aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
+ l.insert('end', ['aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
'cccccccccccccccccccccccccccccccccccccccccccccccccccc'])
l.insert('end', [1,2,3])
diff --git a/ext/tk/sample/tkmultilistbox.rb b/ext/tk/sample/tkmultilistbox.rb
index 7791649c4b..6f956d0edb 100644
--- a/ext/tk/sample/tkmultilistbox.rb
+++ b/ext/tk/sample/tkmultilistbox.rb
@@ -35,10 +35,10 @@ class TkMultiListbox < TkListbox
# create base flames
@f_title = TkFrame.new(@frame, 'width'=>@width_total)
- @f_lbox = TkFrame.new(@frame,
+ @f_lbox = TkFrame.new(@frame,
'width'=>@width_total, 'height'=>lbox_height)
- @f_hscr = TkFrame.new(@frame, 'width'=>@width_total,
- 'height'=>@v_scroll.cget('width') +
+ @f_hscr = TkFrame.new(@frame, 'width'=>@width_total,
+ 'height'=>@v_scroll.cget('width') +
2 * @v_scroll.cget('borderwidth'))
# dummy label to keep the hight of title space
@@ -63,25 +63,25 @@ class TkMultiListbox < TkListbox
f = TkFrame.new(@f_title, 'width'=>width)
base = [f]
@title_list << TkLabel.new(f, 'text'=>label).pack('fill'=>'x')
- f.place('relx'=>@rel_list[idx], 'y'=>0, 'anchor'=>'nw', 'width'=>-6,
+ f.place('relx'=>@rel_list[idx], 'y'=>0, 'anchor'=>'nw', 'width'=>-6,
'relwidth'=>@rel_list[idx+1] - @rel_list[idx])
# listbox field
f = TkFrame.new(@f_lbox, 'width'=>width)
base << f
@lbox_list << TkListbox.new(f).pack('fill'=>'both', 'expand'=>true)
- f.place('relx'=>@rel_list[idx], 'y'=>0, 'anchor'=>'nw', 'width'=>-4,
+ f.place('relx'=>@rel_list[idx], 'y'=>0, 'anchor'=>'nw', 'width'=>-4,
'relwidth'=>@rel_list[idx+1] - @rel_list[idx], 'relheight'=>1.0)
# scrollbar field
f = TkFrame.new(@f_hscr, 'width'=>width)
base << f
- @hscr_list << TkScrollbar.new(f, 'orient'=>'horizontal') .
+ @hscr_list << TkScrollbar.new(f, 'orient'=>'horizontal') .
pack('fill'=>'x', 'anchor'=>'w')
- f.place('relx'=>@rel_list[idx], 'y'=>0, 'anchor'=>'nw', 'width'=>-4,
+ f.place('relx'=>@rel_list[idx], 'y'=>0, 'anchor'=>'nw', 'width'=>-4,
'relwidth'=>@rel_list[idx+1] - @rel_list[idx])
- @lbox_list[idx].xscrollcommand proc{|first, last|
+ @lbox_list[idx].xscrollcommand proc{|first, last|
@hscr_list[idx].set first, last
}
@hscr_list[idx].command proc{|*args| @lbox_list[idx].xview *args}
@@ -93,19 +93,19 @@ class TkMultiListbox < TkListbox
# create tab
@tab_list = [nil]
(1..(@rel_list.size - 2)).each{|idx|
- tab = TkFrame.new(@f_title, 'cursor'=>'sb_h_double_arrow',
+ tab = TkFrame.new(@f_title, 'cursor'=>'sb_h_double_arrow',
'width'=>6, 'borderwidth'=>2, 'relief'=>'raised')
@tab_list << tab
tab.place('relx'=>@rel_list[idx], 'anchor'=>'ne', 'relheight'=>0.95)
- tab.bind('Button-1',
- proc{|x| @x = x; @frame_width = TkWinfo.width(@f_title).to_f},
+ tab.bind('Button-1',
+ proc{|x| @x = x; @frame_width = TkWinfo.width(@f_title).to_f},
'%X')
tab.bind('B1-Motion', proc{|x, idx| resize(x, idx.to_i)}, "%X #{idx}")
}
# set control procedure for virtical scroll
@lbox_list.each{|lbox|
- lbox.yscrollcommand proc{|first, last|
+ lbox.yscrollcommand proc{|first, last|
@v_scroll.set first, last
}
}
@@ -118,17 +118,17 @@ class TkMultiListbox < TkListbox
@mode['extended'] = extended_mode_bindtag
@mode['multiple'] = multiple_mode_bindtag
@current_mode = 'browse'
- @lbox_list.each{|l|
- l.bind('Shift-Key-Left',
+ @lbox_list.each{|l|
+ l.bind('Shift-Key-Left',
proc{|w| focus_shift(w, -1); Tk.callback_break}, '%W')
- l.bind('Shift-Key-Right',
+ l.bind('Shift-Key-Right',
proc{|w| focus_shift(w, 1); Tk.callback_break}, '%W')
- l.bind('Button-2', proc{|x, y|
+ l.bind('Button-2', proc{|x, y|
@lbox_mark_x = x
@lbox_list.each{|lbox| lbox.scan_mark(x, y)}
}, '%x %y')
- l.bind('B2-Motion', proc{|x, y|
+ l.bind('B2-Motion', proc{|x, y|
@lbox_list.each{|lbox| lbox.scan_dragto(@lbox_mark_x, y)}
l.scan_dragto(x, y)
}, '%x %y')
@@ -189,7 +189,7 @@ class TkMultiListbox < TkListbox
# set 'mode' option of listboxes
def mode(sel_mode)
- @lbox_list.each{|l|
+ @lbox_list.each{|l|
tags = l.bindtags
tags = tags - [ @mode[@current_mode] ]
l.bindtags(tags.unshift(@mode[sel_mode]))
@@ -282,7 +282,7 @@ class TkMultiListbox < TkListbox
array[indices[0]] = line[label]
else
if line[label].kind_of? Array
- indices.each_with_index{|index, num|
+ indices.each_with_index{|index, num|
array[index] = line[label][num]
}
else
@@ -300,9 +300,9 @@ class TkMultiListbox < TkListbox
indices.each{|index| lbox_ins[index] << line[index]}
end
}
- }
+ }
- @lbox_list.each_with_index{|lbox, index|
+ @lbox_list.each_with_index{|lbox, index|
lbox.insert(idx, *lbox_ins[index]) if lbox_ins[index]
}
end
@@ -326,7 +326,7 @@ class TkMultiListbox < TkListbox
(0..(@rel_list.size - 2)).each{|idx|
title, lbox, hscr = @base_list[idx]
title.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx])
- lbox.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx],
+ lbox.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx],
'relheight'=>1.0)
hscr.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx])
@@ -356,11 +356,11 @@ class TkMultiListbox < TkListbox
# adjustment of rightside widget of the tab
title, lbox, hscr = @base_list[idx]
- title.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx],
+ title.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx],
'relx'=>@rel_list[idx])
- lbox.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx],
+ lbox.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx],
'relx'=>@rel_list[idx], 'relheight'=>1.0)
- hscr.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx],
+ hscr.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx],
'relx'=>@rel_list[idx])
# update reference position
@@ -370,11 +370,11 @@ class TkMultiListbox < TkListbox
#################################
def browse_mode_bindtag
t = TkBindTag.new
- t.bind('Button-1',
+ t.bind('Button-1',
proc{|w, y| w.focus; select_line(w, w.nearest(y))}, '%W %y')
t.bind('B1-Motion', proc{|w, y| select_line(w, w.nearest(y))}, '%W %y')
- t.bind('Shift-Button-1',
+ t.bind('Shift-Button-1',
proc{|w, y| active_line(w, w.nearest(y))}, '%W %y')
t.bind('Key-Up', proc{|w| select_shift(w, -1)}, '%W')
@@ -385,7 +385,7 @@ class TkMultiListbox < TkListbox
t.bind('space', proc{|w| select_line(w, w.index('active').to_i)}, '%W')
t.bind('Select', proc{|w| select_line(w, w.index('active').to_i)}, '%W')
- t.bind('Control-slash',
+ t.bind('Control-slash',
proc{|w| select_line(w, w.index('active').to_i)}, '%W')
t
@@ -394,12 +394,12 @@ class TkMultiListbox < TkListbox
########################
def single_mode_bindtag
t = TkBindTag.new
- t.bind('Button-1',
+ t.bind('Button-1',
proc{|w, y| w.focus; select_only(w, w.nearest(y))}, '%W %y')
- t.bind('ButtonRelease-1',
+ t.bind('ButtonRelease-1',
proc{|w, y| active_line(w, w.nearest(y))}, '%W %y')
- t.bind('Shift-Button-1',
+ t.bind('Shift-Button-1',
proc{|w, y| active_line(w, w.nearest(y))}, '%W %y')
t.bind('Key-Up', proc{|w| select_shift(w, -1)}, '%W')
@@ -410,9 +410,9 @@ class TkMultiListbox < TkListbox
t.bind('space', proc{|w| select_line(w, w.index('active').to_i)}, '%W')
t.bind('Select', proc{|w| select_line(w, w.index('active').to_i)}, '%W')
- t.bind('Control-slash',
+ t.bind('Control-slash',
proc{|w| select_line(w, w.index('active').to_i)}, '%W')
- t.bind('Control-backslash',
+ t.bind('Control-backslash',
proc{@lbox_list.each{|l| l.selection_clear(0, 'end')}})
t
@@ -421,22 +421,22 @@ class TkMultiListbox < TkListbox
########################
def extended_mode_bindtag
t = TkBindTag.new
- t.bind('Button-1',
+ t.bind('Button-1',
proc{|w, y| w.focus; select_only(w, w.nearest(y))}, '%W %y')
t.bind('B1-Motion', proc{|w, y| select_range(w, w.nearest(y))}, '%W %y')
- t.bind('ButtonRelease-1',
+ t.bind('ButtonRelease-1',
proc{|w, y| active_line(w, w.nearest(y))}, '%W %y')
- t.bind('Shift-Button-1',
+ t.bind('Shift-Button-1',
proc{|w, y| select_range(w, w.nearest(y))}, '%W %y')
- t.bind('Shift-B1-Motion',
+ t.bind('Shift-B1-Motion',
proc{|w, y| select_range(w, w.nearest(y))}, '%W %y')
- t.bind('Control-Button-1',
+ t.bind('Control-Button-1',
proc{|w, y| select_toggle(w, w.nearest(y))}, '%W %y')
- t.bind('Control-B1-Motion',
+ t.bind('Control-B1-Motion',
proc{|w, y| select_drag(w, w.nearest(y))}, '%W %y')
t.bind('Key-Up', proc{|w| active_shift(w, -1)}, '%W')
@@ -462,9 +462,9 @@ class TkMultiListbox < TkListbox
########################
def multiple_mode_bindtag
t = TkBindTag.new
- t.bind('Button-1',
+ t.bind('Button-1',
proc{|w, y| w.focus; select_line3(w, w.nearest(y))}, '%W %y')
- t.bind('ButtonRelease-1',
+ t.bind('ButtonRelease-1',
proc{|w, y| active_line(w, w.nearest(y))}, '%W %y')
t.bind('Key-Up', proc{|w| active_shift(w, -1)}, '%W')
@@ -624,15 +624,15 @@ end
# test
################################################
if __FILE__ == $0
- f = TkFrame.new(nil, 'width'=>300,
+ f = TkFrame.new(nil, 'width'=>300,
'height'=>200).pack('fill'=>'both', 'expand'=>'true')
#f = TkFrame.new.pack('fill'=>'both', 'expand'=>'true')
- l = TkMultiListbox.new(f, 150,
- [ ['L1', 100],
- ['L2', 200],
- ['L3', 50] ],
- 'titlefont'=>'courier',
- 'titleforeground'=>'yellow',
+ l = TkMultiListbox.new(f, 150,
+ [ ['L1', 100],
+ ['L2', 200],
+ ['L3', 50] ],
+ 'titlefont'=>'courier',
+ 'titleforeground'=>'yellow',
'titlebackground'=>'navy'
).pack('fill'=>'both', 'expand'=>true)
l.insert('end', [1,2,3])
diff --git a/ext/tk/sample/tkmultilistframe.rb b/ext/tk/sample/tkmultilistframe.rb
index 7c0aac9a9e..ef1a0a824d 100644
--- a/ext/tk/sample/tkmultilistframe.rb
+++ b/ext/tk/sample/tkmultilistframe.rb
@@ -32,7 +32,7 @@ class TkMultiListFrame < TkListbox
# decide total width
@lbox_total = title_info.size
@width_total = 0
- title_info.each{|title, width, cmd|
+ title_info.each{|title, width, cmd|
@width_total += width.to_f
@title_cmd << cmd
}
@@ -54,37 +54,37 @@ class TkMultiListFrame < TkListbox
# virtical scrollbar
=begin
- @v_scroll = TkScrollbar.new(@frame, 'highlightthickness'=>@h_l_thick,
- 'borderwidth'=>@scrbar_border,
+ @v_scroll = TkScrollbar.new(@frame, 'highlightthickness'=>@h_l_thick,
+ 'borderwidth'=>@scrbar_border,
'orient'=>'vertical', 'width'=>@scrbar_width)
=end
- @v_scroll = TkYScrollbar.new(@frame, 'highlightthickness'=>@h_l_thick,
- 'borderwidth'=>@scrbar_border,
+ @v_scroll = TkYScrollbar.new(@frame, 'highlightthickness'=>@h_l_thick,
+ 'borderwidth'=>@scrbar_border,
'width'=>@scrbar_width)
# horizontal scrollbar
=begin
- @h_scroll = TkScrollbar.new(@frame, 'highlightthickness'=>@h_l_thick,
- 'borderwidth'=>@scrbar_border,
+ @h_scroll = TkScrollbar.new(@frame, 'highlightthickness'=>@h_l_thick,
+ 'borderwidth'=>@scrbar_border,
'orient'=>'horizontal', 'width'=>@scrbar_width)
=end
- @h_scroll = TkXScrollbar.new(@frame, 'highlightthickness'=>@h_l_thick,
- 'borderwidth'=>@scrbar_border,
+ @h_scroll = TkXScrollbar.new(@frame, 'highlightthickness'=>@h_l_thick,
+ 'borderwidth'=>@scrbar_border,
'width'=>@scrbar_width)
# create base flames
- @c_title = TkCanvas.new(@frame, 'highlightthickness'=>@h_l_thick,
+ @c_title = TkCanvas.new(@frame, 'highlightthickness'=>@h_l_thick,
'width'=>@window_width)
@f_title = TkFrame.new(@c_title, 'width'=>@width_total)
- @w_title = TkcWindow.new(@c_title, 0, 0,
+ @w_title = TkcWindow.new(@c_title, 0, 0,
'window'=>@f_title, 'anchor'=>'nw')
- @c_lbox = TkCanvas.new(@frame, 'highlightthickness'=>@h_l_thick,
+ @c_lbox = TkCanvas.new(@frame, 'highlightthickness'=>@h_l_thick,
'width'=>@window_width)
@f_lbox = TkFrame.new(@c_lbox, 'width'=>@width_total)
@w_lbox = TkcWindow.new(@c_lbox, 0, 0, 'window'=>@f_lbox, 'anchor'=>'nw')
- @c_hscr = TkCanvas.new(@frame, 'highlightthickness'=>@h_l_thick,
+ @c_hscr = TkCanvas.new(@frame, 'highlightthickness'=>@h_l_thick,
'width'=>@window_width)
@f_hscr = TkFrame.new(@c_hscr, 'width'=>@width_total)
@w_hscr = TkcWindow.new(@c_hscr, 0, 0, 'window'=>@f_hscr, 'anchor'=>'nw')
@@ -108,45 +108,45 @@ class TkMultiListFrame < TkListbox
f = TkFrame.new(@f_title, 'width'=>width)
base = [f]
- title = TkLabel.new(f, 'text'=>label, 'borderwidth'=>@title_border,
+ title = TkLabel.new(f, 'text'=>label, 'borderwidth'=>@title_border,
'relief'=>'raised', 'highlightthickness'=>@h_l_thick)
title_binding(title, idx)
title.pack('fill'=>'x')
@title_list << title
- f.place('relx'=>@rel_list[idx], 'y'=>0, 'anchor'=>'nw', 'width'=>1,
- 'relheight'=>1.0,
+ f.place('relx'=>@rel_list[idx], 'y'=>0, 'anchor'=>'nw', 'width'=>1,
+ 'relheight'=>1.0,
'relwidth'=>@rel_list[idx+1] - @rel_list[idx])
# listbox field
f = TkFrame.new(@f_lbox, 'width'=>width)
base << f
- @lbox_list << TkListbox.new(f, 'highlightthickness'=>@h_l_thick,
+ @lbox_list << TkListbox.new(f, 'highlightthickness'=>@h_l_thick,
'borderwidth'=>@lbox_border
).pack('fill'=>'both', 'expand'=>true)
- f.place('relx'=>@rel_list[idx], 'y'=>0, 'anchor'=>'nw', 'width'=>1,
+ f.place('relx'=>@rel_list[idx], 'y'=>0, 'anchor'=>'nw', 'width'=>1,
'relwidth'=>@rel_list[idx+1] - @rel_list[idx], 'relheight'=>1.0)
# scrollbar field
f = TkFrame.new(@f_hscr, 'width'=>width)
base << f
=begin
- @hscr_list << TkScrollbar.new(f, 'orient'=>'horizontal',
- 'width'=>@scrbar_width,
- 'borderwidth'=>@scrbar_border,
+ @hscr_list << TkScrollbar.new(f, 'orient'=>'horizontal',
+ 'width'=>@scrbar_width,
+ 'borderwidth'=>@scrbar_border,
'highlightthickness'=>@h_l_thick
).pack('fill'=>'x', 'anchor'=>'w')
=end
- @hscr_list << TkXScrollbar.new(f, 'width'=>@scrbar_width,
- 'borderwidth'=>@scrbar_border,
+ @hscr_list << TkXScrollbar.new(f, 'width'=>@scrbar_width,
+ 'borderwidth'=>@scrbar_border,
'highlightthickness'=>@h_l_thick
).pack('fill'=>'x', 'anchor'=>'w')
- f.place('relx'=>@rel_list[idx], 'y'=>0, 'anchor'=>'nw', 'width'=>1,
+ f.place('relx'=>@rel_list[idx], 'y'=>0, 'anchor'=>'nw', 'width'=>1,
'relwidth'=>@rel_list[idx+1] - @rel_list[idx])
=begin
- @lbox_list[idx].xscrollcommand proc{|first, last|
+ @lbox_list[idx].xscrollcommand proc{|first, last|
@hscr_list[idx].set first, last
}
@hscr_list[idx].command proc{|*args| @lbox_list[idx].xview *args}
@@ -159,23 +159,23 @@ class TkMultiListFrame < TkListbox
# pad
# @f_title_pad = TkFrame.new(@frame)
- @f_title_pad = TkFrame.new(@frame, 'relief'=>'raised',
- 'borderwidth'=>@title_border,
+ @f_title_pad = TkFrame.new(@frame, 'relief'=>'raised',
+ 'borderwidth'=>@title_border,
'highlightthickness'=>@h_l_thick)
- @f_scr_pad = TkFrame.new(@frame, 'relief'=>'sunken',
- 'borderwidth'=>1,
+ @f_scr_pad = TkFrame.new(@frame, 'relief'=>'sunken',
+ 'borderwidth'=>1,
'highlightthickness'=>@h_l_thick)
# height check
title_height = 0
- @title_list.each{|w|
+ @title_list.each{|w|
h = w.winfo_reqheight
title_height = h if title_height < h
}
hscr_height = 0
- @hscr_list.each{|w|
+ @hscr_list.each{|w|
h = w.winfo_reqheight
hscr_height = h if hscr_height < h
}
@@ -187,7 +187,7 @@ class TkMultiListFrame < TkListbox
# set control procedure for virtical scroll
=begin
@lbox_list.each{|lbox|
- lbox.yscrollcommand proc{|first, last|
+ lbox.yscrollcommand proc{|first, last|
@v_scroll.set first, last
}
}
@@ -197,16 +197,16 @@ class TkMultiListFrame < TkListbox
# set control procedure for horizoncal scroll
=begin
- @c_title.xscrollcommand proc{|first, last|
+ @c_title.xscrollcommand proc{|first, last|
@h_scroll.set first, last
}
- @c_lbox.xscrollcommand proc{|first, last|
+ @c_lbox.xscrollcommand proc{|first, last|
@h_scroll.set first, last
}
- @c_hscr.xscrollcommand proc{|first, last|
+ @c_hscr.xscrollcommand proc{|first, last|
@h_scroll.set first, last
}
- @h_scroll.command proc{|*args|
+ @h_scroll.command proc{|*args|
@c_title.xview *args
@c_lbox.xview *args
@c_hscr.xview *args if @show_each_hscr
@@ -221,17 +221,17 @@ class TkMultiListFrame < TkListbox
@lbox_mode['extended'] = extended_mode_bindtag
@lbox_mode['multiple'] = multiple_mode_bindtag
@current_mode = 'browse'
- @lbox_list.each_with_index{|l, idx|
- l.bind('Shift-Key-Left',
+ @lbox_list.each_with_index{|l, idx|
+ l.bind('Shift-Key-Left',
proc{|w| focus_shift(w, -1); Tk.callback_break}, '%W')
- l.bind('Shift-Key-Right',
+ l.bind('Shift-Key-Right',
proc{|w| focus_shift(w, 1); Tk.callback_break}, '%W')
- l.bind('Button-2', proc{|x, y|
+ l.bind('Button-2', proc{|x, y|
@lbox_mark_x = x
@lbox_list.each{|lbox| lbox.scan_mark(x, y)}
}, '%x %y')
- l.bind('B2-Motion', proc{|x, y|
+ l.bind('B2-Motion', proc{|x, y|
@lbox_list.each{|lbox| lbox.scan_dragto(@lbox_mark_x, y)}
l.scan_dragto(x, y)
}, '%x %y')
@@ -270,8 +270,8 @@ class TkMultiListFrame < TkListbox
@f_scr_pad.grid('row'=>2, 'rowspan'=>2, 'column'=>2, 'sticky'=>'news')
# binding for 'Configure' event
- @c_lbox.bind('Configure',
- proc{|height, width| reconstruct(height, width)},
+ @c_lbox.bind('Configure',
+ proc{|height, width| reconstruct(height, width)},
'%h %w')
# set default receiver of method calls
@@ -316,7 +316,7 @@ class TkMultiListFrame < TkListbox
# set 'mode' option of listboxes
def mode(sel_mode)
- @lbox_list.each{|l|
+ @lbox_list.each{|l|
tags = l.bindtags
tags = tags - [ @lbox_mode[@current_mode] ]
l.bindtags(tags.unshift(@lbox_mode[sel_mode]))
@@ -395,7 +395,7 @@ class TkMultiListFrame < TkListbox
def titlefont(font)
@title_list.each{|label| label['font'] = font}
title_height = 0
- @title_list.each{|w|
+ @title_list.each{|w|
h = w.winfo_reqheight
title_height = h if title_height < h
}
@@ -498,7 +498,7 @@ class TkMultiListFrame < TkListbox
array[indices[0]] = line[label]
else
if line[label].kind_of? Array
- indices.each_with_index{|index, num|
+ indices.each_with_index{|index, num|
array[index] = line[label][num]
}
else
@@ -516,9 +516,9 @@ class TkMultiListFrame < TkListbox
indices.each{|index| lbox_ins[index] << line[index]}
end
}
- }
+ }
- @lbox_list.each_with_index{|lbox, index|
+ @lbox_list.each_with_index{|lbox, index|
lbox.insert(idx, *lbox_ins[index]) if lbox_ins[index]
}
end
@@ -560,7 +560,7 @@ class TkMultiListFrame < TkListbox
(0..(@rel_list.size - 2)).each{|idx|
title, lbox, hscr = @base_list[idx]
title.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx])
- lbox.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx],
+ lbox.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx],
'relheight'=>1.0)
hscr.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx])
}
@@ -587,11 +587,11 @@ class TkMultiListFrame < TkListbox
# adjustment of rightside widget of the sash
title, lbox, hscr = @base_list[idx]
- title.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx],
+ title.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx],
'relx'=>@rel_list[idx])
- lbox.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx],
+ lbox.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx],
'relx'=>@rel_list[idx], 'relheight'=>1.0)
- hscr.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx],
+ hscr.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx],
'relx'=>@rel_list[idx])
# update reference position
@@ -615,34 +615,34 @@ class TkMultiListFrame < TkListbox
end
def title_binding(title, index)
- title.bind('Motion', proc{|w, x, idx| motion_cb(w, x, idx.to_i)},
+ title.bind('Motion', proc{|w, x, idx| motion_cb(w, x, idx.to_i)},
"%W %x #{index}")
- title.bind('Enter', proc{|w, x, idx| motion_cb(w, x, idx.to_i)},
+ title.bind('Enter', proc{|w, x, idx| motion_cb(w, x, idx.to_i)},
"%W %x #{index}")
title.bind('Leave', proc{|w| w.cursor ""}, "%W")
- title.bind('Button-1',
- proc{|w, x|
+ title.bind('Button-1',
+ proc{|w, x|
if @mode == :sash
@x = x
@frame_width = TkWinfo.width(@f_title).to_f
else
title.relief 'sunken'
end
- },
+ },
'%W %X')
- title.bind('ButtonRelease-1',
- proc{|w, x, idx|
+ title.bind('ButtonRelease-1',
+ proc{|w, x, idx|
i = idx.to_i
if @mode == :title && @title_cmd[i].kind_of?(Proc)
@title_cmd[i].call
end
title.relief 'raised'
motion_cb(w,x,i)
- },
+ },
"%W %x #{index}")
title.bind('B1-Motion', proc{|x| resize(x) if @mode == :sash}, "%X")
@@ -651,11 +651,11 @@ class TkMultiListFrame < TkListbox
#################################
def browse_mode_bindtag
t = TkBindTag.new
- t.bind('Button-1',
+ t.bind('Button-1',
proc{|w, y| w.focus; select_line(w, w.nearest(y))}, '%W %y')
t.bind('B1-Motion', proc{|w, y| select_line(w, w.nearest(y))}, '%W %y')
- t.bind('Shift-Button-1',
+ t.bind('Shift-Button-1',
proc{|w, y| active_line(w, w.nearest(y))}, '%W %y')
t.bind('Key-Up', proc{|w| select_shift(w, -1)}, '%W')
@@ -666,7 +666,7 @@ class TkMultiListFrame < TkListbox
t.bind('space', proc{|w| select_line(w, w.index('active').to_i)}, '%W')
t.bind('Select', proc{|w| select_line(w, w.index('active').to_i)}, '%W')
- t.bind('Control-slash',
+ t.bind('Control-slash',
proc{|w| select_line(w, w.index('active').to_i)}, '%W')
t
@@ -675,12 +675,12 @@ class TkMultiListFrame < TkListbox
########################
def single_mode_bindtag
t = TkBindTag.new
- t.bind('Button-1',
+ t.bind('Button-1',
proc{|w, y| w.focus; select_only(w, w.nearest(y))}, '%W %y')
- t.bind('ButtonRelease-1',
+ t.bind('ButtonRelease-1',
proc{|w, y| active_line(w, w.nearest(y))}, '%W %y')
- t.bind('Shift-Button-1',
+ t.bind('Shift-Button-1',
proc{|w, y| active_line(w, w.nearest(y))}, '%W %y')
t.bind('Key-Up', proc{|w| select_shift(w, -1)}, '%W')
@@ -691,9 +691,9 @@ class TkMultiListFrame < TkListbox
t.bind('space', proc{|w| select_line(w, w.index('active').to_i)}, '%W')
t.bind('Select', proc{|w| select_line(w, w.index('active').to_i)}, '%W')
- t.bind('Control-slash',
+ t.bind('Control-slash',
proc{|w| select_line(w, w.index('active').to_i)}, '%W')
- t.bind('Control-backslash',
+ t.bind('Control-backslash',
proc{@lbox_list.each{|l| l.selection_clear(0, 'end')}})
t
@@ -702,22 +702,22 @@ class TkMultiListFrame < TkListbox
########################
def extended_mode_bindtag
t = TkBindTag.new
- t.bind('Button-1',
+ t.bind('Button-1',
proc{|w, y| w.focus; select_only(w, w.nearest(y))}, '%W %y')
t.bind('B1-Motion', proc{|w, y| select_range(w, w.nearest(y))}, '%W %y')
- t.bind('ButtonRelease-1',
+ t.bind('ButtonRelease-1',
proc{|w, y| active_line(w, w.nearest(y))}, '%W %y')
- t.bind('Shift-Button-1',
+ t.bind('Shift-Button-1',
proc{|w, y| select_range(w, w.nearest(y))}, '%W %y')
- t.bind('Shift-B1-Motion',
+ t.bind('Shift-B1-Motion',
proc{|w, y| select_range(w, w.nearest(y))}, '%W %y')
- t.bind('Control-Button-1',
+ t.bind('Control-Button-1',
proc{|w, y| select_toggle(w, w.nearest(y))}, '%W %y')
- t.bind('Control-B1-Motion',
+ t.bind('Control-B1-Motion',
proc{|w, y| select_drag(w, w.nearest(y))}, '%W %y')
t.bind('Key-Up', proc{|w| active_shift(w, -1)}, '%W')
@@ -743,9 +743,9 @@ class TkMultiListFrame < TkListbox
########################
def multiple_mode_bindtag
t = TkBindTag.new
- t.bind('Button-1',
+ t.bind('Button-1',
proc{|w, y| w.focus; select_line3(w, w.nearest(y))}, '%W %y')
- t.bind('ButtonRelease-1',
+ t.bind('ButtonRelease-1',
proc{|w, y| active_line(w, w.nearest(y))}, '%W %y')
t.bind('Key-Up', proc{|w| active_shift(w, -1)}, '%W')
@@ -905,13 +905,13 @@ end
# test
################################################
if __FILE__ == $0
- l = TkMultiListFrame.new(nil, 200,
- [ ['L1', 200, proc{p 'click L1'}],
- ['L2', 100],
- ['L3', 200] ],
- 'width'=>350,
- #'titleforeground'=>'yellow',
- 'titleforeground'=>'white',
+ l = TkMultiListFrame.new(nil, 200,
+ [ ['L1', 200, proc{p 'click L1'}],
+ ['L2', 100],
+ ['L3', 200] ],
+ 'width'=>350,
+ #'titleforeground'=>'yellow',
+ 'titleforeground'=>'white',
#'titlebackground'=>'navy',
'titlebackground'=>'blue',
'titlefont'=>'courier'
@@ -919,7 +919,7 @@ if __FILE__ == $0
l.insert('end', [1,2,3])
l.insert('end', [4,5,6])
l.insert('end', [4,5,6], [4,5,6])
- l.insert('end', ['aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
+ l.insert('end', ['aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
'cccccccccccccccccccccccccccccccccccccccccccccccccccc'])
l.insert('end', [1,2,3])
diff --git a/ext/tk/sample/tkoptdb-safeTk.rb b/ext/tk/sample/tkoptdb-safeTk.rb
index 3972577b0f..a06098323f 100644
--- a/ext/tk/sample/tkoptdb-safeTk.rb
+++ b/ext/tk/sample/tkoptdb-safeTk.rb
@@ -18,19 +18,19 @@ EOM
if ENV['LANG'] =~ /^ja/
# read Japanese resource
- ent = TkOptionDB.read_entries(File.expand_path('resource.ja',
+ ent = TkOptionDB.read_entries(File.expand_path('resource.ja',
File.dirname(__FILE__)),
'euc-jp')
else
# read English resource
- ent = TkOptionDB.read_entries(File.expand_path('resource.en',
+ ent = TkOptionDB.read_entries(File.expand_path('resource.en',
File.dirname(__FILE__)))
end
file = File.expand_path('tkoptdb.rb', File.dirname(__FILE__))
ip = MultiTkIp.new_safeTk{
- # When a block is given to 'new_safeTk' method,
+ # When a block is given to 'new_safeTk' method,
# the block is evaluated on $SAFE==4.
ent.each{|pat, val| Tk.tk_call('option', 'add', pat, val)}
}
@@ -38,22 +38,22 @@ ip = MultiTkIp.new_safeTk{
print "ip.eval_proc{$SAFE} ==> ", ip.eval_proc{$SAFE}, "\n"
print "\ncall 'ip.wait_on_mainloop = false'\n"
-print "If 'ip.wait_on_mainloop? == true', ",
- "when 'mainloop' is called on 'ip.eval_proc', ",
- "'ip.eval_proc' does't return while the root window exists.\n",
- "If you want to avoid that, set wait_on_mainloop to false. ",
- "Then the mainloop in the eval_proc returns soon ",
- "and the following steps are evaluated. \n",
- "If you hate the both of them, use 'ip.bg_eval_proc' or ",
+print "If 'ip.wait_on_mainloop? == true', ",
+ "when 'mainloop' is called on 'ip.eval_proc', ",
+ "'ip.eval_proc' does't return while the root window exists.\n",
+ "If you want to avoid that, set wait_on_mainloop to false. ",
+ "Then the mainloop in the eval_proc returns soon ",
+ "and the following steps are evaluated. \n",
+ "If you hate the both of them, use 'ip.bg_eval_proc' or ",
"wrap 'ip.eval_proc' by a thread.\n"
ip.wait_on_mainloop = false
ret = ip.eval_proc{
- # When a block is given to 'eval_proc' method,
+ # When a block is given to 'eval_proc' method,
# the block is evaluated on the IP's current safe level.
- # So, the followings raises an exception.
- # An Exception object of the exception is returned as a
+ # So, the followings raises an exception.
+ # An Exception object of the exception is returned as a
# return value of this method.
load file
@@ -64,7 +64,7 @@ print "If a proc object is given, the proc is evaluated on the safe-level which
safe0_cmd = Proc.new{
print 'safe0_cmd safe-level == ', $SAFE, "\n"
- # This proc object keeps current safe-level ($SAFE==0).
+ # This proc object keeps current safe-level ($SAFE==0).
load file
}
ip.eval_proc{safe0_cmd.call}
diff --git a/ext/tk/sample/tkoptdb.rb b/ext/tk/sample/tkoptdb.rb
index 75c21e7e47..47784ea238 100644
--- a/ext/tk/sample/tkoptdb.rb
+++ b/ext/tk/sample/tkoptdb.rb
@@ -2,21 +2,21 @@
#
# sample script of TkOptionDB
#
-# If 'LANG' environment variable's value is started by 'ja',
-# then read Japanese resource data and display Japanese button text.
-# In other case, read English resource data and display English text.
+# If 'LANG' environment variable's value is started by 'ja',
+# then read Japanese resource data and display Japanese button text.
+# In other case, read English resource data and display English text.
#
require "tk"
if __FILE__ == $0 || !TkCore::INTERP.safe?
if ENV['LANG'] =~ /^ja/
# read Japanese resource
- TkOptionDB.read_with_encoding(File.expand_path('resource.ja',
- File.dirname(__FILE__)),
+ TkOptionDB.read_with_encoding(File.expand_path('resource.ja',
+ File.dirname(__FILE__)),
'euc-jp')
else
# read English resource
- TkOptionDB.readfile(File.expand_path('resource.en',
+ TkOptionDB.readfile(File.expand_path('resource.en',
File.dirname(__FILE__)))
end
end
@@ -24,7 +24,7 @@ end
# 'show_msg' and 'bye_msg' procedures can be defined on BTN_CMD resource.
# Those procedures are called under $SAFE==2
cmd = TkOptionDB.new_proc_class(:BTN_CMD, [:show_msg, :bye_msg], 3) {
- # If you want to check resource string (str),
+ # If you want to check resource string (str),
# please define __check_proc_string__(str) like this.
class << self
def __check_proc_string__(str)
@@ -40,12 +40,12 @@ cmd = TkOptionDB.new_proc_class(:BTN_CMD, [:show_msg, :bye_msg], 3) {
# following two frame widgets use same database entry
TkFrame.new(:class=>'BtnFrame'){|f|
pack(:padx=>5, :pady=>5)
- TkButton.new(:parent=>f, :widgetname=>'hello'){
+ TkButton.new(:parent=>f, :widgetname=>'hello'){
command proc{
print "($SAFE=#{$SAFE} >>>) : "
cmd.show_msg(TkOptionDB.inspect)
print "(<<< $SAFE=#{$SAFE})"
- }
+ }
pack(:fill=>:x, :padx=>10, :pady=>10)
}
TkButton.new(:command=>proc{
@@ -53,7 +53,7 @@ TkFrame.new(:class=>'BtnFrame'){|f|
cmd.bye_msg
print "(<<< $SAFE=#{$SAFE} ) : "
exit
- },
+ },
:parent=>f, :widgetname=>'quit'){
pack(:fill=>:x, :padx=>10, :pady=>10)
}
@@ -62,12 +62,12 @@ TkFrame.new(:class=>'BtnFrame'){|f|
class BtnFrame < TkFrame; end
BtnFrame.new{|f|
pack(:padx=>5, :pady=>5)
- TkButton.new(:parent=>f, :widgetname=>'hello'){
+ TkButton.new(:parent=>f, :widgetname=>'hello'){
command proc{
print "($SAFE=#{$SAFE} >>>) : "
cmd.show_msg(TkOptionDB.inspect)
print "(<<< $SAFE=#{$SAFE})"
- }
+ }
pack(:fill=>:x, :padx=>10, :pady=>10)
}
TkButton.new(:command=>proc{
@@ -75,7 +75,7 @@ BtnFrame.new{|f|
cmd.bye_msg
print "(<<< $SAFE=#{$SAFE})"
exit
- },
+ },
:parent=>f, :widgetname=>'quit'){
pack(:fill=>:x, :padx=>10, :pady=>10)
}
@@ -84,12 +84,12 @@ BtnFrame.new{|f|
# if unknown class, use default option values
TkFrame.new(:class=>'BtnFrame2'){|f|
pack(:padx=>5, :pady=>5)
- TkButton.new(:parent=>f, :widgetname=>'hello'){
+ TkButton.new(:parent=>f, :widgetname=>'hello'){
command proc{
print "($SAFE=#{$SAFE} >>>) : "
cmd.show_msg(TkOptionDB.inspect)
print "(<<< $SAFE=#{$SAFE})"
- }
+ }
pack(:fill=>:x, :padx=>10, :pady=>10)
}
TkButton.new(:command=>proc{
@@ -97,7 +97,7 @@ TkFrame.new(:class=>'BtnFrame2'){|f|
cmd.bye_msg
print "(<<< $SAFE=#{$SAFE})"
exit
- },
+ },
:parent=>f, :widgetname=>'quit'){
pack(:fill=>:x, :padx=>10, :pady=>10)
}
diff --git a/ext/tk/sample/tkrttimer.rb b/ext/tk/sample/tkrttimer.rb
index 1f9cbd9eb5..0abd4ecbd2 100644
--- a/ext/tk/sample/tkrttimer.rb
+++ b/ext/tk/sample/tkrttimer.rb
@@ -8,24 +8,24 @@ root = TkRoot.new(:title=>'realtime timer sample')
f1 = TkFrame.new(:borderwidth=>2, :relief=>:ridge)
f1.pack(:side=>:bottom, :fill=>:both)
TkLabel.new(f1, :text=>'use TkTimer (TkAfter) class').pack(:anchor=>:center)
-label1 = TkLabel.new(:parent=>f1, :relief=>:raised,
+label1 = TkLabel.new(:parent=>f1, :relief=>:raised,
:width=>10).pack(:fill=>:both)
f2 = TkFrame.new(:borderwidth=>2, :relief=>:ridge)
f2.pack(:side=>:bottom, :fill=>:both)
TkLabel.new(f2, :text=>'use TkRTTimer class').pack
-label2 = TkLabel.new(:parent=>f2, :relief=>:raised,
+label2 = TkLabel.new(:parent=>f2, :relief=>:raised,
:width=>10).pack(:fill=>:both)
TkLabel.new(:padx=>10, :pady=>5, :justify=>'left', :text=><<EOT).pack
Interval setting of each timer object is 10 ms.
Each timer object counts up the value on each callback
(the value is not the clock data).
-The count of the TkTimer object is delayed by execution
+The count of the TkTimer object is delayed by execution
time of callbacks and inaccuracy of interval.
-On the other hand, the count of the TkRTTimer object is
-not delayed. Its callback interval is not accurate too.
-But it can compute error correction about the time when
+On the other hand, the count of the TkRTTimer object is
+not delayed. Its callback interval is not accurate too.
+But it can compute error correction about the time when
a callback should start.
EOT
diff --git a/ext/tk/sample/tktextframe.rb b/ext/tk/sample/tktextframe.rb
index b2b40c9138..bdab057d34 100644
--- a/ext/tk/sample/tktextframe.rb
+++ b/ext/tk/sample/tktextframe.rb
@@ -5,53 +5,9 @@
#
require 'tk'
-module Tk::ScrollbarComposite
+class TkTextFrame < TkText
include TkComposite
- def component_construct_keys
- # If a component requires options for construction,
- # return an Array of option-keys.
- []
- end
- private :component_construct_keys
-
- def create_component(keys={})
- # This method must return the created component widget.
- end
- private :create_component
-
- def component_delegates
- # if want to override defalut option-methods or delegates,
- # please define here.
- end
- private :component_delegates
-
- def define_delegates
- # option methods for scrollbars
- option_methods([:scrollbarwidth, :get_scrollbarwidth])
-
- # set receiver widgets for configure methods (with alias)
- delegate_alias('scrollbarrelief', 'relief', @h_scroll, @v_scroll)
- delegate_alias('framebackground', 'background',
- @frame, @h_scroll, @v_scroll)
- delegate_alias('activeframebackground', 'activebackground',
- @h_scroll, @v_scroll)
-
- # set receiver widgets for configure methods
- delegate('DEFAULT', @component)
- delegate('troughcolor', @h_scroll, @v_scroll)
- delegate('repeatdelay', @h_scroll, @v_scroll)
- delegate('repeatinterval', @h_scroll, @v_scroll)
- delegate('borderwidth', @frame)
- delegate('relief', @frame)
-
- component_delegates
- end
- private :define_delegates
-
- DEFAULT_VSCROLL = true
- DEFAULT_HSCROLL = true
-
def initialize_composite(keys={})
keys = _symbolkey2str(keys)
@@ -59,123 +15,55 @@ module Tk::ScrollbarComposite
@v_scroll = TkScrollbar.new(@frame, 'orient'=>'vertical')
@h_scroll = TkScrollbar.new(@frame, 'orient'=>'horizontal')
- # create a component
- construct_keys = {}
- ((component_construct_keys.map{|k| k.to_s}) & keys.keys).each{|k|
- construct_keys[k] = keys.delete(k)
- }
-
- # create a component (the component must be scrollable)
- @component = create_component(construct_keys)
+ # create a text widget
+ @text = TkText.new(@frame, 'wrap'=>'none')
# set default receiver of method calls
- @path = @component.path
+ @path = @text.path
# assign scrollbars
- @component.xscrollbar(@h_scroll)
- @component.yscrollbar(@v_scroll)
+ @text.xscrollbar(@h_scroll)
+ @text.yscrollbar(@v_scroll)
# allignment
TkGrid.rowconfigure(@frame, 0, 'weight'=>1, 'minsize'=>0)
TkGrid.columnconfigure(@frame, 0, 'weight'=>1, 'minsize'=>0)
- @component.grid('row'=>0, 'column'=>0, 'sticky'=>'news')
+ @text.grid('row'=>0, 'column'=>0, 'sticky'=>'news')
# scrollbars ON
- vscroll(keys.delete('vscroll'){self.class::DEFAULT_VSCROLL})
- hscroll(keys.delete('hscroll'){self.class::DEFAULT_HSCROLL})
-
- # do configure
- define_delegates
-
- # do configure
- configure keys unless keys.empty?
- end
- private :initialize_composite
-
- # get/set width of scrollbar
- def get_scrollbarwidth
- @v_scroll.width
- end
- def set_scrollbarwidth(width)
- @v_scroll.width(width)
- @h_scroll.width(width)
- end
- alias :scrollbarwidth :set_scrollbarwidth
-
- def hook_vscroll_on(*args); end
- def hook_vscroll_off(*args); end
- def hook_hscroll_on(*args); end
- def hook_hscroll_off(*args); end
- private :hook_vscroll_on,:hook_vscroll_off,:hook_hscroll_on,:hook_hscroll_off
-
- # vertical scrollbar : ON/OFF
- def vscroll(mode, *args)
- st = TkGrid.info(@v_scroll)
- if mode && st.size == 0 then
- @v_scroll.grid('row'=>0, 'column'=>1, 'sticky'=>'ns')
- hook_vscroll_on(*args)
- elsif !mode && st.size != 0 then
- @v_scroll.ungrid
- hook_vscroll_off(*args)
- end
- self
- end
-
- # horizontal scrollbar : ON/OFF
- def hscroll(mode, *args)
- st = TkGrid.info(@h_scroll)
- if mode && st.size == 0 then
- @h_scroll.grid('row'=>1, 'column'=>0, 'sticky'=>'ew')
- hook_hscroll_on(*args)
- elsif !mode && st.size != 0 then
- @h_scroll.ungrid
- hook_hscroll_off(*args)
- end
- self
- end
-end
-
-################################################
-
-class TkTextFrame < TkText
- include Tk::ScrollbarComposite
-
- # def component_construct_keys; []; end
- # private :component_construct_keys
-
- def create_component(keys={})
- # keys has options which are listed by component_construct_keys method.
- @text = TkText.new(@frame, 'wrap'=>'none')
- @text.configure(keys) unless keys.empty?
-
- # option methods for component
+ vscroll(keys.delete('vscroll'){true})
+ hscroll(keys.delete('hscroll'){true})
+
+ # set background of the text widget
+=begin
+ color = keys.delete('textbackground')
+ textbackground(color) if color
+=end
+ # please check the differences of the following definitions
option_methods(
- [:textbackground, nil, :textbg_info],
- :textborderwidth,
+ [:scrollbarwidth, :get_scrollbarwidth],
+ [:textbackground, nil, :textbg_info],
+ :textborderwidth,
:textrelief
)
- # return the created componet
- @text
- end
- private :create_component
+ # set receiver widgets for configure methods (with alias)
+ delegate_alias('scrollbarrelief', 'relief', @h_scroll, @v_scroll)
- # def component_delegates; end
- # private :component_delegates
+ # set receiver widgets for configure methods
+ delegate('DEFAULT', @text)
+ delegate('background', @frame, @h_scroll, @v_scroll)
+ delegate('activebackground', @h_scroll, @v_scroll)
+ delegate('troughcolor', @h_scroll, @v_scroll)
+ delegate('repeatdelay', @h_scroll, @v_scroll)
+ delegate('repeatinterval', @h_scroll, @v_scroll)
+ delegate('borderwidth', @frame)
+ delegate('relief', @frame)
- def hook_hscroll_on(wrap_mode=nil)
- if wrap_mode
- wrap wrap_mode
- else
- wrap 'none' # => self.wrap('none')
- end
- end
- def hook_hscroll_off(wrap_mode)
- wrap wrap_mode # => self.wrap(wrap_mode)
- end
- def hscroll(mode, wrap_mode="char")
- super
+ # do configure
+ configure keys unless keys.empty?
end
+ private :initialize_composite
# set background color of text widget
def textbackground(color = nil)
@@ -215,67 +103,60 @@ class TkTextFrame < TkText
def textrelief(type)
@text.relief(type)
end
+
+ # get/set width of scrollbar
+ def get_scrollbarwidth
+ @v_scroll.width
+ end
+ def set_scrollbarwidth(width)
+ @v_scroll.width(width)
+ @h_scroll.width(width)
+ end
+ alias :scrollbarwidth :set_scrollbarwidth
+
+ # vertical scrollbar : ON/OFF
+ def vscroll(mode)
+ st = TkGrid.info(@v_scroll)
+ if mode && st.size == 0 then
+ @v_scroll.grid('row'=>0, 'column'=>1, 'sticky'=>'ns')
+ elsif !mode && st.size != 0 then
+ @v_scroll.ungrid
+ end
+ self
+ end
+
+ # horizontal scrollbar : ON/OFF
+ def hscroll(mode, wrap_mode="char")
+ st = TkGrid.info(@h_scroll)
+ if mode && st.size == 0 then
+ @h_scroll.grid('row'=>1, 'column'=>0, 'sticky'=>'ew')
+ wrap 'none' # => self.wrap('none')
+ elsif !mode && st.size != 0 then
+ @h_scroll.ungrid
+ wrap wrap_mode # => self.wrap(wrap_mode)
+ end
+ self
+ end
end
+
################################################
# test
################################################
if __FILE__ == $0
- TkLabel.new(:text=>'TkTextFrame is an example of Tk::ScrollbarComposite module.').pack
f = TkFrame.new.pack('fill'=>'x')
#t = TkTextFrame.new.pack
- t = TkTextFrame.new(:textborderwidth=>3,
- :textrelief=>:ridge,
+ t = TkTextFrame.new(:textborderwidth=>3,
+ :textrelief=>:ridge,
:scrollbarrelief=>:ridge).pack
p t.configinfo
- TkButton.new(f, 'text'=>'vscr OFF',
+ TkButton.new(f, 'text'=>'vscr OFF',
'command'=>proc{t.vscroll(false)}).pack('side'=>'right')
- TkButton.new(f, 'text'=>'vscr ON',
+ TkButton.new(f, 'text'=>'vscr ON',
'command'=>proc{t.vscroll(true)}).pack('side'=>'right')
- TkButton.new(f, 'text'=>'hscr ON',
+ TkButton.new(f, 'text'=>'hscr ON',
'command'=>proc{t.hscroll(true)}).pack('side'=>'left')
- TkButton.new(f, 'text'=>'hscr OFF',
+ TkButton.new(f, 'text'=>'hscr OFF',
'command'=>proc{t.hscroll(false)}).pack('side'=>'left')
-
- ############################################
-
- # Tk.default_widget_set = :Ttk
-
- TkFrame.new.pack(:pady=>10)
- TkLabel.new(:text=>'The following is another example of Tk::ScrollbarComposite module.').pack
-
- #----------------------------------
- class ScrListbox < TkListbox
- include Tk::ScrollbarComposite
-
- DEFAULT_HSCROLL = false
-
- def create_component(keys={})
- TkListbox.new(@frame, keys)
- end
- private :create_component
- end
- #----------------------------------
-
- f = TkFrame.new.pack(:pady=>5)
- lbox = ScrListbox.new(f).pack(:side=>:left)
- lbox.value = %w(aa bb cc dd eeeeeeeeeeeeeeeeeeeeeeeeee ffffffffff gg hh ii jj kk ll mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm nn oo pp qq)
- fb = TkFrame.new(f).pack(:expand=>true, :fill=>:y, :padx=>5)
- TkButton.new(fb, 'text'=>'lbox hscr OFF',
- 'command'=>proc{lbox.hscroll(false)}).pack(:side=>:bottom,
- :fill=>:x)
- TkButton.new(fb, 'text'=>'lbox hscr ON',
- 'command'=>proc{lbox.hscroll(true)}).pack(:side=>:bottom,
- :fill=>:x)
- TkFrame.new(fb).pack(:pady=>5, :side=>:bottom)
- TkButton.new(fb, 'text'=>'lbox vscr OFF',
- 'command'=>proc{lbox.vscroll(false)}).pack(:side=>:bottom,
- :fill=>:x)
- TkButton.new(fb, 'text'=>'lbox vscr ON',
- 'command'=>proc{lbox.vscroll(true)}).pack(:side=>:bottom,
- :fill=>:x)
-
- ############################################
-
Tk.mainloop
end
diff --git a/ext/tk/sample/tktextio.rb b/ext/tk/sample/tktextio.rb
index 679a2b7142..9f012feada 100644
--- a/ext/tk/sample/tktextio.rb
+++ b/ext/tk/sample/tktextio.rb
@@ -3,15 +3,15 @@
# TkTextIO class :: handling I/O stream on a TkText widget
# by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
#
-# NOTE: TkTextIO supports 'character' (not 'byte') access only.
-# So, for example, TkTextIO#getc returns a character, TkTextIO#pos
-# means the character position, TkTextIO#read(size) counts by
+# NOTE: TkTextIO supports 'character' (not 'byte') access only.
+# So, for example, TkTextIO#getc returns a character, TkTextIO#pos
+# means the character position, TkTextIO#read(size) counts by
# characters, and so on.
-# Of course, it is available to make TkTextIO class to suuport
-# 'byte' access. However, it may break multi-byte characters.
+# Of course, it is available to make TkTextIO class to suuport
+# 'byte' access. However, it may break multi-byte characters.
# and then, displayed string on the text widget may be garbled.
-# I think that it is not good on the supposed situation of using
-# TkTextIO.
+# I think that it is not good on the supposed situation of using
+# TkTextIO.
#
require 'tk'
require 'tk/text'
@@ -24,14 +24,14 @@ class TkTextIO < TkText
OPT_DEFAULTS = {
'mode' => nil,
- 'overwrite' => false,
- 'text' => nil,
- 'show' => :pos,
- 'wrap' => 'char',
- 'sync' => true,
- 'prompt' => nil,
- 'prompt_cmd' => nil,
- 'hist_size' => 1000,
+ 'overwrite' => false,
+ 'text' => nil,
+ 'show' => :pos,
+ 'wrap' => 'char',
+ 'sync' => true,
+ 'prompt' => nil,
+ 'prompt_cmd' => nil,
+ 'hist_size' => 1000,
}
def create_self(keys)
@@ -46,7 +46,7 @@ class TkTextIO < TkText
@buf_size = 0
@buf_max = 1024
- @write_buf_queue, @write_buf_mutex,
+ @write_buf_queue, @write_buf_mutex,
@read_buf_queue, @read_buf_mutex = @@create_queues.call
@idle_flush = TkTimer.new(:idle, 1, proc{ @flusher.run rescue nil })
@@ -87,7 +87,7 @@ class TkTextIO < TkText
def _get_io_params(keys)
opts = {}
- self.class.const_get(:OPT_DEFAULTS).each{|k, v|
+ self.class.const_get(:OPT_DEFAULTS).each{|k, v|
if keys.has_key?(k)
opts[k] = keys.delete(k)
else
@@ -261,7 +261,7 @@ class TkTextIO < TkText
Tk.callback_break
end
end
- private :_cb_up, :_cb_down, :_cb_left, :_cb_backspace,
+ private :_cb_up, :_cb_down, :_cb_left, :_cb_backspace,
:_cb_ctrl_a, :_cb_ctrl_u
def _setup_console_bindings
@@ -484,7 +484,7 @@ class TkTextIO < TkText
Thread.pass
if @open[:w] || ! @write_buffer.empty?
@write_buf_mutex.synchronize {
- _sync_write_buf(@write_buffer)
+ _sync_write_buf(@write_buffer)
@write_buffer[0..-1] = ''
}
end
@@ -666,7 +666,7 @@ class TkTextIO < TkText
@txtpos.set('end - 1 char')
elsif rs == ''
@count_var.value # make it global
- idx = tksearch_with_count([:regexp], @count_var,
+ idx = tksearch_with_count([:regexp], @count_var,
"\n(\n)+", @txtpos, 'end - 1 char')
if idx
s = get(@txtpos, idx) << "\n"
@@ -779,9 +779,9 @@ class TkTextIO < TkText
end
def show_mode=(mode)
- # define show mode when file position is changed.
- # mode == :pos or "pos" or true :: see current file position.
- # mode == :insert or "insert" :: see insert cursor position.
+ # define show mode when file position is changed.
+ # mode == :pos or "pos" or true :: see current file position.
+ # mode == :insert or "insert" :: see insert cursor position.
# mode == nil or false :: do nothing
# else see 'mode' position ('mode' should be text index or mark)
case mode
@@ -921,9 +921,9 @@ if __FILE__ == $0
ev_loop = Thread.new{Tk.mainloop}
f = TkFrame.new.pack
- #tio = TkTextIO.new(f, :show=>:nil,
- #tio = TkTextIO.new(f, :show=>:pos,
- tio = TkTextIO.new(f, :show=>:insert,
+ #tio = TkTextIO.new(f, :show=>:nil,
+ #tio = TkTextIO.new(f, :show=>:pos,
+ tio = TkTextIO.new(f, :show=>:insert,
:text=>">>> This is an initial text line. <<<\n\n"){
# yscrollbar(TkScrollbar.new(f).pack(:side=>:right, :fill=>:y))
pack(:side=>:left, :fill=>:both, :expand=>true)
@@ -1045,12 +1045,12 @@ if __FILE__ == $0
num = 0
# io = TkTextIO.new(:mode=>:console, :prompt=>'').pack
#=begin
- io = TkTextIO.new(:mode=>:console,
+ io = TkTextIO.new(:mode=>:console,
:prompt_cmd=>proc{
s = "[#{num}]"
num += 1
s
- },
+ },
:prompt=>'-> ').pack
#=end
Thread.new{loop{sleep 2; io.puts 'hoge'}}
diff --git a/ext/tk/sample/tktimer2.rb b/ext/tk/sample/tktimer2.rb
index 125115e863..dd31bb098e 100644
--- a/ext/tk/sample/tktimer2.rb
+++ b/ext/tk/sample/tktimer2.rb
@@ -5,7 +5,7 @@ require "tk"
# new notation :
# * symbols are acceptable as keys or values of the option hash
-# * the parent widget can be given by :parent key on the option hash
+# * the parent widget can be given by :parent key on the option hash
root = TkRoot.new(:title=>'timer sample')
label = TkLabel.new(:parent=>root, :relief=>:raised, :width=>10) \
.pack(:side=>:bottom, :fill=>:both)
@@ -19,11 +19,11 @@ tick = proc{|aobj| #<== TkTimer object
}
timer = TkTimer.new(50, -1, tick).start(0, proc{ label.text('0.00'); 0 })
- # ==> repeat-interval : (about) 50 ms,
- # repeat : infinite (-1) times,
+ # ==> repeat-interval : (about) 50 ms,
+ # repeat : infinite (-1) times,
# repeat-procedure : tick (only one, in this case)
#
- # ==> wait-before-call-init-proc : 0 ms,
+ # ==> wait-before-call-init-proc : 0 ms,
# init_proc : proc{ label.text('0.00'); 0 }
#
# (0ms)-> init_proc ->(50ms)-> tick ->(50ms)-> tick ->....
diff --git a/ext/tk/sample/tktimer3.rb b/ext/tk/sample/tktimer3.rb
index 08e8a3cad4..e3bb4c3e4a 100644
--- a/ext/tk/sample/tktimer3.rb
+++ b/ext/tk/sample/tktimer3.rb
@@ -5,7 +5,7 @@ require "tk"
# new notation :
# * symbols are acceptable as keys or values of the option hash
-# * the parent widget can be given by :parent key on the option hash
+# * the parent widget can be given by :parent key on the option hash
root = TkRoot.new(:title=>'timer sample')
label = TkLabel.new(:parent=>root, :relief=>:raised, :width=>10) \
.pack(:side=>:bottom, :fill=>:both)
@@ -19,11 +19,11 @@ tick = proc{|aobj| #<== TkTimer object
}
timer = TkTimer.new(50, -1, tick).start(0, proc{ label.text('0.00'); 0 })
- # ==> repeat-interval : (about) 50 ms,
- # repeat : infinite (-1) times,
+ # ==> repeat-interval : (about) 50 ms,
+ # repeat : infinite (-1) times,
# repeat-procedure : tick (only one, in this case)
#
- # ==> wait-before-call-init-proc : 0 ms,
+ # ==> wait-before-call-init-proc : 0 ms,
# init_proc : proc{ label.text('0.00'); 0 }
#
# (0ms)-> init_proc ->(50ms)-> tick ->(50ms)-> tick ->....
diff --git a/ext/tk/sample/tktree.rb b/ext/tk/sample/tktree.rb
index 4eb7f60627..56b7211c88 100644
--- a/ext/tk/sample/tktree.rb
+++ b/ext/tk/sample/tktree.rb
@@ -3,10 +3,10 @@
#
# see <http://wiki.tcl.tk/10615>
#
-# Note: optional argument '-font' of the Tcl library is changed to
-# 'itemfont' on this Ruby library, because of avoiding font
-# operation trouble in 'initialize' method ( see the following
-# test script ).
+# Note: optional argument '-font' of the Tcl library is changed to
+# 'itemfont' on this Ruby library, because of avoiding font
+# operation trouble in 'initialize' method ( see the following
+# test script ).
#
##########################################################################
require 'tk'
@@ -68,9 +68,9 @@ end
if __FILE__ == $0
TkLabel.new(:text=><<EOL, :relief=>:ridge, :justify=>:left).pack
- This is a sample to use a Tcl library script on Ruby/Tk.
- This sample loads tktree.tcl (see <http://wiki.tcl.tk/10615>)
- and calls functions of the Tcl script.
+ This is a sample to use a Tcl library script on Ruby/Tk.
+ This sample loads tktree.tcl (see <http://wiki.tcl.tk/10615>)
+ and calls functions of the Tcl script.
EOL
items = %w(/group1/item1 /group1/item2 /group1/subgroup/item1 /group2/item1 /item1)
@@ -79,14 +79,14 @@ EOL
tr1.focus
items.each{|item|
- tr1.newitem(item,
+ tr1.newitem(item,
:command=>proc{Tk.messageBox(:message=>"#{item} executed")})
}
f = TkFrame.new.pack(:expand=>true, :fill=>:both)
- tr2 = TkTree.new(f, :bg=>'black', #:itemfont=>{:family=>'Times', :size=>14},
- :textcolor=>'red', :bd=>4, :relief=>:ridge,
- :selectbackground=>'darkBlue', :selectforeground=>'yellow',
+ tr2 = TkTree.new(f, :bg=>'black', #:itemfont=>{:family=>'Times', :size=>14},
+ :textcolor=>'red', :bd=>4, :relief=>:ridge,
+ :selectbackground=>'darkBlue', :selectforeground=>'yellow',
:selectborderwidth=>3, :linecolor=>'yellow') {
yscrollbar(TkScrollbar.new(f, :width=>10).pack(:side=>:right, :fill=>:y))
xscrollbar(TkScrollbar.new(f, :width=>10).pack(:side=>:bottom, :fill=>:x))
@@ -94,8 +94,8 @@ EOL
}
items.each{|item|
- tr2.newitem(item, :textcolor=>'green', :image=>'',
- :itemfont=>{:family=>'Times', :size=>10},
+ tr2.newitem(item, :textcolor=>'green', :image=>'',
+ :itemfont=>{:family=>'Times', :size=>10},
:command=>proc{Tk.messageBox(:message=>"#{item} executed")})
}
diff --git a/ext/tk/sample/ttk_wrapper.rb b/ext/tk/sample/ttk_wrapper.rb
index e4eb9c7964..1580668994 100644
--- a/ext/tk/sample/ttk_wrapper.rb
+++ b/ext/tk/sample/ttk_wrapper.rb
@@ -10,7 +10,7 @@ version = '0.1.3'
# parse commandline arguments
##########################################################################
require 'optparse'
-opt = OptionParser.new("Usage: #{$0} [options] rubytk_script" << "\n " <<
+opt = OptionParser.new("Usage: #{$0} [options] rubytk_script" << "\n " <<
"Ruby/Tk script wrapper. Use Ttk widgets as default.")
opt.version = version
@@ -21,7 +21,7 @@ OPTS[:theme] = 'default'
opt.on('-l', '--list', 'list available theme names'){|v| OPTS[:list] = true}
opt.on('-t', '--theme theme', 'theme name'){|v| OPTS[:theme] = v}
-opt.on('-d', '--themedir themes_dir', 'directory of theme definitions'){|v|
+opt.on('-d', '--themedir themes_dir', 'directory of theme definitions'){|v|
OPTS[:themedir] << v
}
opt.on('-r', '--rubytheme rb_theme', 'theme definition file (ruby script)'){|v|
@@ -42,7 +42,7 @@ begin
Tk.default_widget_set = :Ttk
rescue LoadError
if OPTS[:verbose]
- print "warning: fail to load 'Ttk' extension. use standard widgets.\n"
+ print "warning: fail to load 'Ttk' extension. use standard widgets.\n"
end
end
@@ -53,7 +53,7 @@ end
##########################################################################
# define Tcl/Tk procedures for compatibility.
-# those are required when want to use themes included
+# those are required when want to use themes included
# in "sample/tkextlib/tile/demo.rb".
##########################################################################
Tk::Tile.__define_LoadImages_proc_for_compatibility__!
@@ -111,7 +111,7 @@ TkItemConfigMethod.__set_IGNORE_UNKNOWN_CONFIGURE_OPTION__! true
# set theme of widget style
##########################################################################
if OPTS[:list] || OPTS[:verbose]
- print "supported theme names: #{Tk::Tile.themes.inspect}\n"
+ print "supported theme names: #{Tk::Tile.themes.inspect}\n"
exit if OPTS[:list] && ARGV.empty?
end
print "use theme: \"#{OPTS[:theme]}\"\n" if OPTS[:theme] && OPTS[:verbose]
@@ -122,7 +122,7 @@ Tk::Tile.set_theme(OPTS[:theme]) if OPTS[:theme]
##########################################################################
# replace $0 and $RPAGRAM_NAME
##########################################################################
-# When the expand_path of the target script is long, ruby sometimes
+# When the expand_path of the target script is long, ruby sometimes
# fails to set the path to $0 (the path string is trimmed).
# The following replaces $0 and $PROGNAME to avoid such trouble.
progname_obj = $0.dup
diff --git a/ext/tk/stubs.c b/ext/tk/stubs.c
index 4388fb294d..6d3b330f0e 100644
--- a/ext/tk/stubs.c
+++ b/ext/tk/stubs.c
@@ -92,7 +92,7 @@ static DL_HANDLE tcl_dll = (DL_HANDLE)0;
static DL_HANDLE tk_dll = (DL_HANDLE)0;
int
-#ifdef HAVE_PROTOTYPES
+#ifdef RUBY_VM
ruby_open_tcl_dll(char *appname)
#else
ruby_open_tcl_dll(appname)
@@ -179,7 +179,7 @@ ruby_open_tk_dll()
}
int
-#ifdef HAVE_PROTOTYPES
+#ifdef RUBY_VM
ruby_open_tcltk_dll(char *appname)
#else
ruby_open_tcltk_dll(appname)
@@ -203,7 +203,7 @@ tk_stubs_init_p()
Tcl_Interp *
-#ifdef HAVE_PROTOTYPES
+#ifdef RUBY_VM
ruby_tcl_create_ip_and_stubs_init(int *st)
#else
ruby_tcl_create_ip_and_stubs_init(st)
@@ -290,7 +290,7 @@ ruby_tcl_stubs_init()
}
int
-#ifdef HAVE_PROTOTYPES
+#ifdef RUBY_VM
ruby_tk_stubs_init(Tcl_Interp *tcl_ip)
#else
ruby_tk_stubs_init(tcl_ip)
@@ -318,7 +318,7 @@ ruby_tk_stubs_init(tcl_ip)
if ((*p_Tk_Init)(tcl_ip) == TCL_ERROR)
return FAIL_Tk_Init;
- if (!Tk_InitStubs(tcl_ip, (char *)"8.1", 0))
+ if (!Tk_InitStubs(tcl_ip, "8.1", 0))
return FAIL_Tk_InitStubs;
#ifdef __MACOS__
@@ -330,7 +330,7 @@ ruby_tk_stubs_init(tcl_ip)
}
int
-#ifdef HAVE_PROTOTYPES
+#ifdef RUBY_VM
ruby_tk_stubs_safeinit(Tcl_Interp *tcl_ip)
#else
ruby_tk_stubs_safeinit(tcl_ip)
@@ -357,7 +357,7 @@ ruby_tk_stubs_safeinit(tcl_ip)
if ((*p_Tk_SafeInit)(tcl_ip) == TCL_ERROR)
return FAIL_Tk_Init;
- if (!Tk_InitStubs(tcl_ip, (char *)"8.1", 0))
+ if (!Tk_InitStubs(tcl_ip, "8.1", 0))
return FAIL_Tk_InitStubs;
#ifdef __MACOS__
@@ -421,7 +421,7 @@ static int open_tcl_dll = 0;
static int call_tk_stubs_init = 0;
int
-#ifdef HAVE_PROTOTYPES
+#ifdef RUBY_VM
ruby_open_tcl_dll(char *appname)
#else
ruby_open_tcl_dll(appname)
@@ -450,7 +450,7 @@ ruby_open_tk_dll()
}
int
-#ifdef HAVE_PROTOTYPES
+#ifdef RUBY_VM
ruby_open_tcltk_dll(char *appname)
#else
ruby_open_tcltk_dll(appname)
@@ -473,7 +473,7 @@ tk_stubs_init_p()
}
Tcl_Interp *
-#ifdef HAVE_PROTOTYPES
+#ifdef RUBY_VM
ruby_tcl_create_ip_and_stubs_init(int *st)
#else
ruby_tcl_create_ip_and_stubs_init(st)
@@ -506,7 +506,7 @@ ruby_tcl_stubs_init()
}
int
-#ifdef HAVE_PROTOTYPES
+#ifdef RUBY_VM
ruby_tk_stubs_init(Tcl_Interp *tcl_ip)
#else
ruby_tk_stubs_init(tcl_ip)
@@ -527,7 +527,7 @@ ruby_tk_stubs_init(tcl_ip)
}
int
-#ifdef HAVE_PROTOTYPES
+#ifdef RUBY_VM
ruby_tk_stubs_safeinit(Tcl_Interp *tcl_ip)
#else
ruby_tk_stubs_safeinit(tcl_ip)
diff --git a/ext/tk/tcltklib.c b/ext/tk/tcltklib.c
index 2938536cda..8701cfef27 100644
--- a/ext/tk/tcltklib.c
+++ b/ext/tk/tcltklib.c
@@ -4,35 +4,18 @@
* Oct. 24, 1997 Y. Matsumoto
*/
-#define TCLTKLIB_RELEASE_DATE "2009-08-09"
+#define TCLTKLIB_RELEASE_DATE "2008-05-23"
#include "ruby.h"
-#ifdef HAVE_RUBY_ENCODING_H
-#include "ruby/encoding.h"
-#endif
-#ifndef HAVE_RUBY_RUBY_H
-#undef RUBY_RELEASE_DATE
-#include "version.h"
-#endif
-
#ifdef RUBY_VM
-static VALUE rb_thread_critical; /* dummy */
-int rb_thread_check_trap_pending();
+/* #include "ruby/ruby.h" */
+#include "ruby/signal.h"
+#include "ruby/encoding.h"
#else
-/* use rb_thread_critical on Ruby 1.8.x */
+/* #include "ruby.h" */
#include "rubysig.h"
-#endif
-
-#ifdef OBJ_UNTRUST
-#define RbTk_OBJ_UNTRUST(x) do {OBJ_TAINT(x); OBJ_UNTRUST(x);} while (0)
-#else
-#define RbTk_OBJ_UNTRUST(x) OBJ_TAINT(x)
-#endif
-
-#if defined(HAVE_RB_PROC_NEW) && !defined(RUBY_VM)
-/* Ruby 1.8 :: rb_proc_new() was hidden from intern.h at 2008/04/22 */
-extern VALUE rb_proc_new _((VALUE (*)(ANYARGS/* VALUE yieldarg[, VALUE procarg] */), VALUE));
+#include "version.h"
#endif
#undef EXTERN /* avoid conflict with tcl.h of tcl8.2 or before */
@@ -48,33 +31,19 @@ extern VALUE rb_proc_new _((VALUE (*)(ANYARGS/* VALUE yieldarg[, VALUE procarg]
#include <tcl.h>
#include <tk.h>
-#ifndef HAVE_RUBY_NATIVE_THREAD_P
-#define ruby_native_thread_p() is_ruby_native_thread()
-#undef RUBY_USE_NATIVE_THREAD
-#else
-#define RUBY_USE_NATIVE_THREAD 1
-#endif
-
-#ifndef HAVE_RB_ERRINFO
-#define rb_errinfo() (ruby_errinfo+0) /* cannot be l-value */
-#endif
-#ifndef HAVE_RB_SAFE_LEVEL
-#define rb_safe_level() (ruby_safe_level+0) /* cannot be l-value */
-#endif
-
#include "stubs.h"
#ifndef TCL_ALPHA_RELEASE
-#define TCL_ALPHA_RELEASE 0 /* "alpha" */
-#define TCL_BETA_RELEASE 1 /* "beta" */
-#define TCL_FINAL_RELEASE 2 /* "final" */
+#define TCL_ALPHA_RELEASE 0
+#define TCL_BETA_RELEASE 1
+#define TCL_FINAL_RELEASE 2
#endif
static struct {
int major;
int minor;
- int type; /* ALPHA==0, BETA==1, FINAL==2 */
int patchlevel;
+ int type;
} tcltk_version = {0, 0, 0, 0};
static void
@@ -109,14 +78,6 @@ set_tcltk_version()
# endif
#endif
-#ifndef CONST86
-# if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION <= 5 /* Tcl8.0.x -- 8.5.x */
-# define CONST86
-# else
-# define CONST86 CONST84
-# endif
-#endif
-
/* copied from eval.c */
#define TAG_RETURN 0x1
#define TAG_BREAK 0x2
@@ -140,16 +101,16 @@ fprintf(stderr, ARG1, ARG2, ARG3); fprintf(stderr, "\n"); fflush(stderr); }
*/
/* release date */
-static const char tcltklib_release_date[] = TCLTKLIB_RELEASE_DATE;
+const char tcltklib_release_date[] = TCLTKLIB_RELEASE_DATE;
/* finalize_proc_name */
-static const char finalize_hook_name[] = "INTERP_FINALIZE_HOOK";
+static char *finalize_hook_name = "INTERP_FINALIZE_HOOK";
static void ip_finalize _((Tcl_Interp*));
static int at_exit = 0;
-#ifdef HAVE_RUBY_ENCODING_H
+#ifdef RUBY_VM
static VALUE cRubyEncoding;
/* encoding */
@@ -212,15 +173,14 @@ static VALUE ip_invoke_real _((int, VALUE*, VALUE));
static VALUE ip_invoke _((int, VALUE*, VALUE));
static VALUE ip_invoke_with_position _((int, VALUE*, VALUE, Tcl_QueuePosition));
static VALUE tk_funcall _((VALUE(), int, VALUE*, VALUE));
-static VALUE callq_safelevel_handler _((VALUE, VALUE));
/* Tcl's object type */
#if TCL_MAJOR_VERSION >= 8
-static const char Tcl_ObjTypeName_ByteArray[] = "bytearray";
-static CONST86 Tcl_ObjType *Tcl_ObjType_ByteArray;
+static char *Tcl_ObjTypeName_ByteArray = "bytearray";
+static Tcl_ObjType *Tcl_ObjType_ByteArray;
-static const char Tcl_ObjTypeName_String[] = "string";
-static CONST86 Tcl_ObjType *Tcl_ObjType_String;
+static char *Tcl_ObjTypeName_String = "string";
+static Tcl_ObjType *Tcl_ObjType_String;
#if TCL_MAJOR_VERSION > 8 || (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION >= 1)
#define IS_TCL_BYTEARRAY(obj) ((obj)->typePtr == Tcl_ObjType_ByteArray)
@@ -235,7 +195,7 @@ static CONST86 Tcl_ObjType *Tcl_ObjType_String;
/* safe Tcl_Eval and Tcl_GlobalEval */
static int
-#ifdef HAVE_PROTOTYPES
+#ifdef RUBY_VM
tcl_eval(Tcl_Interp *interp, const char *cmd)
#else
tcl_eval(interp, cmd)
@@ -256,7 +216,7 @@ tcl_eval(interp, cmd)
#define Tcl_Eval tcl_eval
static int
-#ifdef HAVE_PROTOTYPES
+#ifdef RUBY_VM
tcl_global_eval(Tcl_Interp *interp, const char *cmd)
#else
tcl_global_eval(interp, cmd)
@@ -433,12 +393,11 @@ call_queue_mark(struct call_queue *q)
static VALUE eventloop_thread;
-static Tcl_Interp *eventloop_interp;
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
Tcl_ThreadId tk_eventloop_thread_id; /* native thread ID of Tcl interpreter */
#endif
static VALUE eventloop_stack;
-static int window_event_mode = ~0;
+static int window_event_mode = ( ~ TCL_IDLE_EVENTS | TCL_WINDOW_EVENTS );
static VALUE watchdog_thread;
@@ -450,15 +409,9 @@ Tcl_Interp *current_interp;
: USE_TOGGLE_WINDOW_MODE_FOR_IDLE 0
: DO_THREAD_SCHEDULE_AT_CALLBACK_DONE 0
*/
-#ifdef RUBY_USE_NATIVE_THREAD
-#define CONTROL_BY_STATUS_OF_RB_THREAD_WAITING_FOR_VALUE 1
-#define USE_TOGGLE_WINDOW_MODE_FOR_IDLE 0
-#define DO_THREAD_SCHEDULE_AT_CALLBACK_DONE 1
-#else /* ! RUBY_USE_NATIVE_THREAD */
#define CONTROL_BY_STATUS_OF_RB_THREAD_WAITING_FOR_VALUE 1
#define USE_TOGGLE_WINDOW_MODE_FOR_IDLE 0
#define DO_THREAD_SCHEDULE_AT_CALLBACK_DONE 0
-#endif
#if CONTROL_BY_STATUS_OF_RB_THREAD_WAITING_FOR_VALUE
static int have_rb_thread_waiting_for_value = 0;
@@ -471,14 +424,14 @@ static int have_rb_thread_waiting_for_value = 0;
* 'timer_tick' is a limit of one term of thread scheduling.
* If 'timer_tick' == 0, then not use the timer for thread scheduling.
*/
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
#define DEFAULT_EVENT_LOOP_MAX 800/*counts*/
#define DEFAULT_NO_EVENT_TICK 10/*counts*/
-#define DEFAULT_NO_EVENT_WAIT 1/*milliseconds ( 1 -- 999 ) */
+#define DEFAULT_NO_EVENT_WAIT 10/*milliseconds ( 1 -- 999 ) */
#define WATCHDOG_INTERVAL 10/*milliseconds ( 1 -- 999 ) */
#define DEFAULT_TIMER_TICK 0/*milliseconds ( 0 -- 999 ) */
#define NO_THREAD_INTERRUPT_TIME 100/*milliseconds ( 1 -- 999 ) */
-#else /* ! RUBY_USE_NATIVE_THREAD */
+#else /* ! RUBY_VM */
#define DEFAULT_EVENT_LOOP_MAX 800/*counts*/
#define DEFAULT_NO_EVENT_TICK 10/*counts*/
#define DEFAULT_NO_EVENT_WAIT 20/*milliseconds ( 1 -- 999 ) */
@@ -487,8 +440,6 @@ static int have_rb_thread_waiting_for_value = 0;
#define NO_THREAD_INTERRUPT_TIME 100/*milliseconds ( 1 -- 999 ) */
#endif
-#define EVENT_HANDLER_TIMEOUT 100/*milliseconds*/
-
static int event_loop_max = DEFAULT_EVENT_LOOP_MAX;
static int no_event_tick = DEFAULT_NO_EVENT_TICK;
static int no_event_wait = DEFAULT_NO_EVENT_WAIT;
@@ -722,7 +673,7 @@ struct tcltkip {
#if TCL_NAMESPACE_DEBUG
Tcl_Namespace *default_ns; /* default namespace */
#endif
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
Tcl_ThreadId tk_thread_id; /* native thread ID of Tcl interpreter */
#endif
int has_orig_exit; /* has original 'exit' command ? */
@@ -915,7 +866,7 @@ tcltkip_init_tk(interp)
}
#endif
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
ptr->tk_thread_id = Tcl_GetCurrentThread();
#endif
@@ -1072,12 +1023,12 @@ call_original_exit(ptr, state)
} else {
/* string interface */
- CONST84 char **argv;
+ char **argv;
#define USE_RUBY_ALLOC 0
#if USE_RUBY_ALLOC
- argv = ALLOC_N(char *, 3); /* XXXXXXXXXX */
+ argv = (char **)ALLOC_N(char *, 3); /* XXXXXXXXXX */
#else /* not USE_RUBY_ALLOC */
- argv = (CONST84 char **)ckalloc(sizeof(char *) * 3);
+ argv = (char **)ckalloc(sizeof(char *) * 3);
#if 0 /* use Tcl_Preserve/Release */
Tcl_Preserve((ClientData)argv); /* XXXXXXXX */
#endif
@@ -1087,7 +1038,8 @@ call_original_exit(ptr, state)
argv[1] = Tcl_GetStringFromObj(state_obj, (int*)NULL);
argv[2] = (char *)NULL;
- ptr->return_value = (*(info->proc))(info->clientData, ptr->ip, 2, argv);
+ ptr->return_value = (*(info->proc))(info->clientData, ptr->ip,
+ 2, (CONST84 char **)argv);
#if USE_RUBY_ALLOC
free(argv);
@@ -1186,7 +1138,7 @@ _timer_for_tcl(clientData)
/* tick_counter += event_loop_max; */
}
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
#if USE_TOGGLE_WINDOW_MODE_FOR_IDLE
static int
toggle_eventloop_window_mode_for_idle()
@@ -1216,7 +1168,7 @@ set_eventloop_window_mode(self, mode)
if (RTEST(mode)) {
window_event_mode = ~0;
} else {
- window_event_mode = ~TCL_WINDOW_EVENTS;
+ window_event_mode = ~(TCL_WINDOW_EVENTS | TCL_IDLE_EVENTS);
}
return mode;
@@ -1529,7 +1481,7 @@ static VALUE
lib_num_of_mainwindows(self)
VALUE self;
{
-#ifdef RUBY_USE_NATIVE_THREAD /* Ruby 1.9+ !!! */
+#ifdef RUBY_VM /* Ruby 1.9+ !!! */
return tk_funcall(lib_num_of_mainwindows_core, 0, (VALUE*)NULL, self);
#else
return lib_num_of_mainwindows_core(self, 0, (VALUE*)NULL);
@@ -1537,14 +1489,10 @@ lib_num_of_mainwindows(self)
}
-#ifdef RUBY_USE_NATIVE_THREAD /* Ruby 1.9+ !!! */
+#ifdef RUBY_VM /* Ruby 1.9+ !!! */
static VALUE
-#ifdef HAVE_PROTOTYPES
-call_DoOneEvent_core(VALUE flag_val)
-#else
call_DoOneEvent_core(flag_val)
VALUE flag_val;
-#endif
{
int flag;
@@ -1557,24 +1505,16 @@ call_DoOneEvent_core(flag_val)
}
static VALUE
-#ifdef HAVE_PROTOTYPES
-call_DoOneEvent(VALUE flag_val)
-#else
call_DoOneEvent(flag_val)
VALUE flag_val;
-#endif
{
return tk_funcall(call_DoOneEvent_core, 0, (VALUE*)NULL, flag_val);
}
#else /* Ruby 1.8- */
static VALUE
-#ifdef HAVE_PROTOTYPES
-call_DoOneEvent(VALUE flag_val)
-#else
call_DoOneEvent(flag_val)
VALUE flag_val;
-#endif
{
int flag;
@@ -1589,28 +1529,26 @@ call_DoOneEvent(flag_val)
static VALUE
-#ifdef HAVE_PROTOTYPES
-eventloop_sleep(VALUE dummy)
-#else
eventloop_sleep(dummy)
VALUE dummy;
-#endif
{
struct timeval t;
- if (no_event_wait <= 0) {
- return Qnil;
- }
-
- t.tv_sec = 0;
- t.tv_usec = (long)(no_event_wait*1000.0);
+ t.tv_sec = (time_t)0;
+ t.tv_usec = (time_t)(no_event_wait*1000.0);
#ifdef HAVE_NATIVETHREAD
-#ifndef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
+#if 0
if (!ruby_native_thread_p()) {
rb_bug("cross-thread violation on eventloop_sleep()");
}
#endif
+#else
+ if (!is_ruby_native_thread()) {
+ rb_bug("cross-thread violation on eventloop_sleep()");
+ }
+#endif
#endif
DUMP2("eventloop_sleep: rb_thread_wait_for() at thread : %lx", rb_thread_current());
@@ -1618,11 +1556,17 @@ eventloop_sleep(dummy)
DUMP2("eventloop_sleep: finish at thread : %lx", rb_thread_current());
#ifdef HAVE_NATIVETHREAD
-#ifndef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
+#if 0
if (!ruby_native_thread_p()) {
rb_bug("cross-thread violation on eventloop_sleep()");
}
#endif
+#else
+ if (!is_ruby_native_thread()) {
+ rb_bug("cross-thread violation on eventloop_sleep()");
+ }
+#endif
#endif
return Qnil;
@@ -1634,7 +1578,7 @@ eventloop_sleep(dummy)
static int
get_thread_alone_check_flag()
{
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
return 0;
#else
set_tcltk_version();
@@ -1666,53 +1610,6 @@ get_thread_alone_check_flag()
}
#endif
-#define TRAP_CHECK() do { \
- if (trap_check(check_var) == 0) return 0; \
-} while (0)
-
-static int
-trap_check(int *check_var)
-{
- DUMP1("trap check");
-
-#ifdef RUBY_VM
- if (rb_thread_check_trap_pending()) {
- if (check_var != (int*)NULL) {
- /* wait command */
- return 0;
- }
- else {
- rb_thread_check_ints();
- }
- }
-#else
- if (rb_trap_pending) {
- run_timer_flag = 0;
- if (rb_prohibit_interrupt || check_var != (int*)NULL) {
- /* pending or on wait command */
- return 0;
- } else {
- rb_trap_exec();
- }
- }
-#endif
-
- return 1;
-}
-
-static int
-check_eventloop_interp()
-{
- DUMP1("check eventloop_interp");
- if (eventloop_interp != (Tcl_Interp*)NULL
- && Tcl_InterpDeleted(eventloop_interp)) {
- DUMP2("eventloop_interp(%p) was deleted", eventloop_interp);
- return 1;
- }
-
- return 0;
-}
-
static int
lib_eventloop_core(check_root, update_flag, check_var, interp)
int check_root;
@@ -1733,8 +1630,8 @@ lib_eventloop_core(check_root, update_flag, check_var, interp)
if (update_flag) DUMP1("update loop start!!");
- t.tv_sec = 0;
- t.tv_usec = (long)(no_event_wait*1000.0);
+ t.tv_sec = (time_t)0;
+ t.tv_usec = (time_t)(no_event_wait*1000.0);
Tcl_DeleteTimerHandler(timer_token);
run_timer_flag = 0;
@@ -1754,8 +1651,6 @@ lib_eventloop_core(check_root, update_flag, check_var, interp)
#endif
for(;;) {
- if (check_eventloop_interp()) return 0;
-
#if USE_EVLOOP_THREAD_ALONE_CHECK_FLAG
if (thread_alone_check_flag && rb_thread_alone()) {
#else
@@ -1795,11 +1690,19 @@ lib_eventloop_core(check_root, update_flag, check_var, interp)
if (status) {
switch (status) {
case TAG_RAISE:
+#ifdef RUBY_VM
if (NIL_P(rb_errinfo())) {
+#else
+ if (NIL_P(ruby_errinfo)) {
+#endif
rbtk_pending_exception
= rb_exc_new2(rb_eException, "unknown exception");
} else {
+#ifdef RUBY_VM
rbtk_pending_exception = rb_errinfo();
+#else
+ rbtk_pending_exception = ruby_errinfo;
+#endif
if (!NIL_P(rbtk_pending_exception)) {
if (rbtk_eventloop_depth == 0) {
@@ -1814,10 +1717,18 @@ lib_eventloop_core(check_root, update_flag, check_var, interp)
break;
case TAG_FATAL:
+#ifdef RUBY_VM
if (NIL_P(rb_errinfo())) {
+#else
+ if (NIL_P(ruby_errinfo)) {
+#endif
rb_exc_raise(rb_exc_new2(rb_eFatal, "FATAL"));
} else {
+#ifdef RUBY_VM
rb_exc_raise(rb_errinfo());
+#else
+ rb_exc_raise(ruby_errinfo);
+#endif
}
}
}
@@ -1847,13 +1758,28 @@ lib_eventloop_core(check_root, update_flag, check_var, interp)
}
}
- TRAP_CHECK();
- if (check_eventloop_interp()) return 0;
+ DUMP1("trap check");
+ if (rb_trap_pending) {
+ run_timer_flag = 0;
+ if (rb_prohibit_interrupt || check_var != (int*)NULL) {
+ /* pending or on wait command */
+ return 0;
+ } else {
+ rb_trap_exec();
+ }
+ }
- DUMP1("check Root Widget");
+ DUMP1("check Root Widget");
if (check_root && tk_stubs_init_p() && Tk_GetNumMainWindows() == 0) {
run_timer_flag = 0;
- TRAP_CHECK();
+ if (rb_trap_pending) {
+ if (rb_prohibit_interrupt || check_var != (int*)NULL) {
+ /* pending or on wait command */
+ return 0;
+ } else {
+ rb_trap_exec();
+ }
+ }
return 1;
}
@@ -1893,7 +1819,7 @@ lib_eventloop_core(check_root, update_flag, check_var, interp)
if (NIL_P(eventloop_thread) || current == eventloop_thread) {
int st;
int status;
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
if (update_flag) {
st = RTEST(rb_protect(call_DoOneEvent,
INT2FIX(event_flag), &status));
@@ -1929,12 +1855,20 @@ lib_eventloop_core(check_root, update_flag, check_var, interp)
if (status) {
switch (status) {
case TAG_RAISE:
+#ifdef RUBY_VM
if (NIL_P(rb_errinfo())) {
+#else
+ if (NIL_P(ruby_errinfo)) {
+#endif
rbtk_pending_exception
= rb_exc_new2(rb_eException,
"unknown exception");
} else {
+#ifdef RUBY_VM
rbtk_pending_exception = rb_errinfo();
+#else
+ rbtk_pending_exception = ruby_errinfo;
+#endif
if (!NIL_P(rbtk_pending_exception)) {
if (rbtk_eventloop_depth == 0) {
@@ -1949,10 +1883,18 @@ lib_eventloop_core(check_root, update_flag, check_var, interp)
break;
case TAG_FATAL:
+#ifdef RUBY_VM
if (NIL_P(rb_errinfo())) {
+#else
+ if (NIL_P(ruby_errinfo)) {
+#endif
rb_exc_raise(rb_exc_new2(rb_eFatal, "FATAL"));
} else {
+#ifdef RUBY_VM
rb_exc_raise(rb_errinfo());
+#else
+ rb_exc_raise(ruby_errinfo);
+#endif
}
}
}
@@ -1963,7 +1905,16 @@ lib_eventloop_core(check_root, update_flag, check_var, interp)
return 0;
}
- TRAP_CHECK();
+ DUMP1("trap check");
+ if (rb_trap_pending) {
+ run_timer_flag = 0;
+ if (rb_prohibit_interrupt || check_var != (int*)NULL) {
+ /* pending or on wait command */
+ return 0;
+ } else {
+ rb_trap_exec();
+ }
+ }
if (check_var != (int*)NULL
&& !NIL_P(rbtk_pending_exception)) {
@@ -1993,12 +1944,20 @@ lib_eventloop_core(check_root, update_flag, check_var, interp)
if (status) {
switch (status) {
case TAG_RAISE:
+#ifdef RUBY_VM
if (NIL_P(rb_errinfo())) {
+#else
+ if (NIL_P(ruby_errinfo)) {
+#endif
rbtk_pending_exception
= rb_exc_new2(rb_eException,
"unknown exception");
} else {
+#ifdef RUBY_VM
rbtk_pending_exception = rb_errinfo();
+#else
+ rbtk_pending_exception = ruby_errinfo;
+#endif
if (!NIL_P(rbtk_pending_exception)) {
if (rbtk_eventloop_depth == 0) {
@@ -2013,11 +1972,19 @@ lib_eventloop_core(check_root, update_flag, check_var, interp)
break;
case TAG_FATAL:
+#ifdef RUBY_VM
if (NIL_P(rb_errinfo())) {
+#else
+ if (NIL_P(ruby_errinfo)) {
+#endif
rb_exc_raise(rb_exc_new2(rb_eFatal,
"FATAL"));
} else {
+#ifdef RUBY_VM
rb_exc_raise(rb_errinfo());
+#else
+ rb_exc_raise(ruby_errinfo);
+#endif
}
}
}
@@ -2034,13 +2001,28 @@ lib_eventloop_core(check_root, update_flag, check_var, interp)
return 1;
}
- TRAP_CHECK();
- if (check_eventloop_interp()) return 0;
+ DUMP1("trap check");
+ if (rb_trap_pending) {
+ run_timer_flag = 0;
+ if (rb_prohibit_interrupt || check_var != (int*)NULL) {
+ /* pending or on wait command */
+ return 0;
+ } else {
+ rb_trap_exec();
+ }
+ }
DUMP1("check Root Widget");
if (check_root && tk_stubs_init_p() && Tk_GetNumMainWindows() == 0) {
run_timer_flag = 0;
- TRAP_CHECK();
+ if (rb_trap_pending) {
+ if (rb_prohibit_interrupt || check_var != (int*)NULL) {
+ /* pending or on wait command */
+ return 0;
+ } else {
+ rb_trap_exec();
+ }
+ }
return 1;
}
@@ -2063,7 +2045,7 @@ lib_eventloop_core(check_root, update_flag, check_var, interp)
}
DUMP1("trap check & thread scheduling");
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
/* if (update_flag == 0) CHECK_INTS; */ /*XXXXXXXXXXXXX TODO !!!! */
#else
if (update_flag == 0) CHECK_INTS;
@@ -2114,19 +2096,35 @@ lib_eventloop_main(args)
switch (status) {
case TAG_RAISE:
+#ifdef RUBY_VM
if (NIL_P(rb_errinfo())) {
+#else
+ if (NIL_P(ruby_errinfo)) {
+#endif
rbtk_pending_exception
= rb_exc_new2(rb_eException, "unknown exception");
} else {
+#ifdef RUBY_VM
rbtk_pending_exception = rb_errinfo();
+#else
+ rbtk_pending_exception = ruby_errinfo;
+#endif
}
return Qnil;
case TAG_FATAL:
+#ifdef RUBY_VM
if (NIL_P(rb_errinfo())) {
+#else
+ if (NIL_P(ruby_errinfo)) {
+#endif
rbtk_pending_exception = rb_exc_new2(rb_eFatal, "FATAL");
} else {
+#ifdef RUBY_VM
rbtk_pending_exception = rb_errinfo();
+#else
+ rbtk_pending_exception = ruby_errinfo;
+#endif
}
return Qnil;
}
@@ -2172,11 +2170,8 @@ lib_eventloop_ensure(args)
break;
}
-#ifdef RUBY_VM
- if (RTEST(rb_funcall(eventloop_thread, ID_alive_p, 0, 0))) {
-#else
+ /* if (RTEST(rb_funcall(eventloop_thread, ID_alive_p, 0, 0))) { */
if (RTEST(rb_thread_alive_p(eventloop_thread))) {
-#endif
DUMP2("eventloop-enshure: wake up parent %lx", eventloop_thread);
rb_thread_wakeup(eventloop_thread);
@@ -2184,7 +2179,7 @@ lib_eventloop_ensure(args)
}
}
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
if (NIL_P(eventloop_thread)) {
tk_eventloop_thread_id = (Tcl_ThreadId) 0;
}
@@ -2213,7 +2208,7 @@ lib_eventloop_launcher(check_root, update_flag, check_var, interp)
tcl_stubs_check();
eventloop_thread = rb_thread_current();
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
tk_eventloop_thread_id = Tcl_GetCurrentThread();
#endif
@@ -2279,7 +2274,6 @@ ip_mainloop(argc, argv, self)
VALUE *argv;
VALUE self;
{
- volatile VALUE ret;
struct tcltkip *ptr = get_ip(self);
/* ip is deleted? */
@@ -2291,11 +2285,7 @@ ip_mainloop(argc, argv, self)
/* slave IP */
return Qnil;
}
-
- eventloop_interp = ptr->ip;
- ret = lib_mainloop(argc, argv, self);
- eventloop_interp = (Tcl_Interp*)NULL;
- return ret;
+ return lib_mainloop(argc, argv, self);
}
@@ -2319,10 +2309,10 @@ lib_watchdog_core(check_rootwidget)
int check = RTEST(check_rootwidget);
struct timeval t0, t1;
- t0.tv_sec = 0;
- t0.tv_usec = (long)((NO_THREAD_INTERRUPT_TIME)*1000.0);
- t1.tv_sec = 0;
- t1.tv_usec = (long)((WATCHDOG_INTERVAL)*1000.0);
+ t0.tv_sec = (time_t)0;
+ t0.tv_usec = (time_t)((NO_THREAD_INTERRUPT_TIME)*1000.0);
+ t1.tv_sec = (time_t)0;
+ t1.tv_usec = (time_t)((WATCHDOG_INTERVAL)*1000.0);
/* check other watchdog thread */
if (!NIL_P(watchdog_thread)) {
@@ -2371,7 +2361,7 @@ lib_watchdog_ensure(arg)
VALUE arg;
{
eventloop_thread = Qnil; /* stop eventloops */
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
tk_eventloop_thread_id = (Tcl_ThreadId) 0;
#endif
return Qnil;
@@ -2463,12 +2453,8 @@ _thread_call_proc(arg)
}
static VALUE
-#ifdef HAVE_PROTOTYPES
-_thread_call_proc_value(VALUE th)
-#else
_thread_call_proc_value(th)
VALUE th;
-#endif
{
return rb_funcall(th, ID_value, 0);
}
@@ -2503,11 +2489,8 @@ lib_thread_callback(argc, argv, self)
foundEvent = RTEST(lib_eventloop_launcher(/* not check root-widget */0, 0,
q->done, (Tcl_Interp*)NULL));
-#ifdef RUBY_VM
- if (RTEST(rb_funcall(th, ID_alive_p, 0))) {
-#else
+ /* if (RTEST(rb_funcall(th, ID_alive_p, 0))) { */
if (RTEST(rb_thread_alive_p(th))) {
-#endif
rb_funcall(th, ID_kill, 0);
ret = Qnil;
} else {
@@ -2520,10 +2503,17 @@ lib_thread_callback(argc, argv, self)
/* ckfree((char*)q); */
if (NIL_P(rbtk_pending_exception)) {
+#ifdef RUBY_VM
/* return rb_errinfo(); */
if (status) {
rb_exc_raise(rb_errinfo());
}
+#else
+ /* return ruby_errinfo; */
+ if (status) {
+ rb_exc_raise(ruby_errinfo);
+ }
+#endif
} else {
VALUE exc = rbtk_pending_exception;
rbtk_pending_exception = Qnil;
@@ -2705,14 +2695,10 @@ TkStringValue(obj)
}
static int
-#ifdef HAVE_PROTOTYPES
-tcl_protect_core(Tcl_Interp *interp, VALUE (*proc)(VALUE), VALUE data)
-#else
tcl_protect_core(interp, proc, data) /* should not raise exception */
Tcl_Interp *interp;
VALUE (*proc)();
VALUE data;
-#endif
{
volatile VALUE ret, exc = Qnil;
int status = 0;
@@ -2742,50 +2728,94 @@ tcl_protect_core(interp, proc, data) /* should not raise exception */
goto error;
error:
str = rb_str_new2("LocalJumpError: ");
+#ifdef RUBY_VM
rb_str_append(str, rb_obj_as_string(rb_errinfo()));
+#else
+ rb_str_append(str, rb_obj_as_string(ruby_errinfo));
+#endif
exc = rb_exc_new3(type, str);
break;
case TAG_RETRY:
+#ifdef RUBY_VM
if (NIL_P(rb_errinfo())) {
+#else
+ if (NIL_P(ruby_errinfo)) {
+#endif
DUMP1("rb_protect: retry");
exc = rb_exc_new2(eTkCallbackRetry, "retry jump error");
} else {
+#ifdef RUBY_VM
exc = rb_errinfo();
+#else
+ exc = ruby_errinfo;
+#endif
}
break;
case TAG_REDO:
+#ifdef RUBY_VM
if (NIL_P(rb_errinfo())) {
+#else
+ if (NIL_P(ruby_errinfo)) {
+#endif
DUMP1("rb_protect: redo");
exc = rb_exc_new2(eTkCallbackRedo, "redo jump error");
} else {
+#ifdef RUBY_VM
exc = rb_errinfo();
+#else
+ exc = ruby_errinfo;
+#endif
}
break;
case TAG_RAISE:
+#ifdef RUBY_VM
if (NIL_P(rb_errinfo())) {
+#else
+ if (NIL_P(ruby_errinfo)) {
+#endif
exc = rb_exc_new2(rb_eException, "unknown exception");
} else {
+#ifdef RUBY_VM
exc = rb_errinfo();
+#else
+ exc = ruby_errinfo;
+#endif
}
break;
case TAG_FATAL:
+#ifdef RUBY_VM
if (NIL_P(rb_errinfo())) {
+#else
+ if (NIL_P(ruby_errinfo)) {
+#endif
exc = rb_exc_new2(rb_eFatal, "FATAL");
} else {
+#ifdef RUBY_VM
exc = rb_errinfo();
+#else
+ exc = ruby_errinfo;
+#endif
}
break;
case TAG_THROW:
+#ifdef RUBY_VM
if (NIL_P(rb_errinfo())) {
+#else
+ if (NIL_P(ruby_errinfo)) {
+#endif
DUMP1("rb_protect: throw");
exc = rb_exc_new2(eTkCallbackThrow, "throw jump error");
} else {
+#ifdef RUBY_VM
exc = rb_errinfo();
+#else
+ exc = ruby_errinfo;
+#endif
}
break;
@@ -2889,26 +2919,26 @@ tcl_protect(interp, proc, data)
VALUE (*proc)();
VALUE data;
{
+ int old_trapflag = rb_trap_immediate;
int code;
#ifdef HAVE_NATIVETHREAD
-#ifndef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
+#if 0
if (!ruby_native_thread_p()) {
rb_bug("cross-thread violation on tcl_protect()");
}
#endif
+#else
+ if (!is_ruby_native_thread()) {
+ rb_bug("cross-thread violation on tcl_protect()");
+ }
+#endif
#endif
-#ifdef RUBY_VM
+ rb_trap_immediate = 0;
code = tcl_protect_core(interp, proc, data);
-#else
- do {
- int old_trapflag = rb_trap_immediate;
- rb_trap_immediate = 0;
- code = tcl_protect_core(interp, proc, data);
- rb_trap_immediate = old_trapflag;
- } while (0);
-#endif
+ rb_trap_immediate = old_trapflag;
return code;
}
@@ -3003,7 +3033,6 @@ ip_ruby_cmd_core(arg)
thr_crit_bup = rb_thread_critical;
rb_thread_critical = Qfalse;
ret = rb_apply(arg->receiver, arg->method, arg->args);
- DUMP2("rb_apply return:%lx", ret);
rb_thread_critical = thr_crit_bup;
DUMP1("finish ip_ruby_cmd_core");
@@ -3017,9 +3046,7 @@ ip_ruby_cmd_receiver_const_get(name)
char *name;
{
volatile VALUE klass = rb_cObject;
-#if 0
char *head, *tail;
-#endif
int state;
#if SUPPORT_NESTED_CONST_AS_IP_RUBY_CMD_RECEIVER
@@ -3069,9 +3096,8 @@ ip_ruby_cmd_receiver_get(str)
char *str;
{
volatile VALUE receiver;
-#if !SUPPORT_NESTED_CONST_AS_IP_RUBY_CMD_RECEIVER
+ volatile VALUE klass = rb_cObject;
int state;
-#endif
if (str[0] == ':' || ('A' <= str[0] && str[0] <= 'Z')) {
/* class | module | constant */
@@ -3187,20 +3213,26 @@ ip_ruby_cmd(clientData, interp, argc, argv)
/* get args */
args = rb_ary_new2(argc - 2);
+#ifdef RUBY_VM
+#else
+ RARRAY(args)->len = 0;
+#endif
for(i = 3; i < argc; i++) {
- VALUE s;
#if TCL_MAJOR_VERSION >= 8
str = Tcl_GetStringFromObj(argv[i], &len);
- s = rb_tainted_str_new(str, len);
-#else /* TCL_MAJOR_VERSION < 8 */
- str = argv[i];
- s = rb_tainted_str_new2(str);
-#endif
DUMP2("arg:%s",str);
-#ifndef HAVE_STRUCT_RARRAY_LEN
- rb_ary_push(args, s);
+#ifdef RUBY_VM
+ rb_ary_push(args, rb_tainted_str_new(str, len));
#else
- RARRAY(args)->ptr[RARRAY(args)->len++] = s;
+ RARRAY(args)->ptr[RARRAY(args)->len++] = rb_tainted_str_new(str, len);
+#endif
+#else /* TCL_MAJOR_VERSION < 8 */
+ DUMP2("arg:%s",argv[i]);
+#ifdef RUBY_VM
+ rb_ary_push(args, rb_tainted_str_new2(argv[i]));
+#else
+ RARRAY(args)->ptr[RARRAY(args)->len++] = rb_tainted_str_new2(argv[i]);
+#endif
#endif
}
@@ -3230,28 +3262,18 @@ ip_ruby_cmd(clientData, interp, argc, argv)
/*****************************/
static int
#if TCL_MAJOR_VERSION >= 8
-#ifdef HAVE_PROTOTYPES
-ip_InterpExitObjCmd(ClientData clientData, Tcl_Interp *interp,
- int argc, Tcl_Obj *CONST argv[])
-#else
ip_InterpExitObjCmd(clientData, interp, argc, argv)
ClientData clientData;
Tcl_Interp *interp;
int argc;
Tcl_Obj *CONST argv[];
-#endif
#else /* TCL_MAJOR_VERSION < 8 */
-#ifdef HAVE_PROTOTYPES
-ip_InterpExitCommand(ClientData clientData, Tcl_Interp *interp,
- int argc, char *argv[])
-#else
ip_InterpExitCommand(clientData, interp, argc, argv)
ClientData clientData;
Tcl_Interp *interp;
int argc;
char *argv[];
#endif
-#endif
{
DUMP1("start ip_InterpExitCommand");
if (interp != (Tcl_Interp*)NULL
@@ -3263,40 +3285,27 @@ ip_InterpExitCommand(clientData, interp, argc, argv)
Tcl_ResetResult(interp);
/* Tcl_Preserve(interp); */
/* Tcl_Eval(interp, "interp eval {} {destroy .}; interp delete {}"); */
- if (!Tcl_InterpDeleted(interp)) {
- ip_finalize(interp);
-
- Tcl_DeleteInterp(interp);
- Tcl_Release(interp);
- }
+ ip_finalize(interp);
+ Tcl_DeleteInterp(interp);
+ Tcl_Release(interp);
}
return TCL_OK;
}
static int
#if TCL_MAJOR_VERSION >= 8
-#ifdef HAVE_PROTOTYPES
-ip_RubyExitObjCmd(ClientData clientData, Tcl_Interp *interp,
- int argc, Tcl_Obj *CONST argv[])
-#else
ip_RubyExitObjCmd(clientData, interp, argc, argv)
ClientData clientData;
Tcl_Interp *interp;
int argc;
Tcl_Obj *CONST argv[];
-#endif
#else /* TCL_MAJOR_VERSION < 8 */
-#ifdef HAVE_PROTOTYPES
-ip_RubyExitCommand(ClientData clientData, Tcl_Interp *interp,
- int argc, char *argv[])
-#else
ip_RubyExitCommand(clientData, interp, argc, argv)
ClientData clientData;
Tcl_Interp *interp;
int argc;
char *argv[];
#endif
-#endif
{
int state;
char *cmd, *param;
@@ -3325,12 +3334,9 @@ ip_RubyExitCommand(clientData, interp, argc, argv)
Tcl_ResetResult(interp);
if (rb_safe_level() >= 4 || Tcl_IsSafe(interp)) {
- if (!Tcl_InterpDeleted(interp)) {
- ip_finalize(interp);
-
- Tcl_DeleteInterp(interp);
- Tcl_Release(interp);
- }
+ ip_finalize(interp);
+ Tcl_DeleteInterp(interp);
+ Tcl_Release(interp);
return TCL_OK;
}
@@ -3423,11 +3429,17 @@ ip_rbUpdateCommand(clientData, interp, objc, objv)
return TCL_ERROR;
}
#ifdef HAVE_NATIVETHREAD
-#ifndef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
+#if 0
if (!ruby_native_thread_p()) {
rb_bug("cross-thread violation on ip_ruby_eval()");
}
#endif
+#else
+ if (!is_ruby_native_thread()) {
+ rb_bug("cross-thread violation on ip_ruby_eval()");
+ }
+#endif
#endif
Tcl_ResetResult(interp);
@@ -3498,11 +3510,7 @@ ip_rbUpdateCommand(clientData, interp, objc, objv)
}
/* trap check */
-#ifdef RUBY_VM
- if (rb_thread_check_trap_pending()) {
-#else
if (rb_trap_pending) {
-#endif
Tcl_Release(interp);
return TCL_RETURN;
@@ -3570,7 +3578,6 @@ ip_rb_threadUpdateCommand(clientData, interp, objc, objv)
static CONST char *updateOptions[] = {"idletasks", (char *) NULL};
enum updateOptions {REGEXP_IDLETASKS};
volatile VALUE current_thread = rb_thread_current();
- struct timeval t;
DUMP1("Ruby's 'thread_update' is called");
if (interp == (Tcl_Interp*)NULL) {
@@ -3579,11 +3586,17 @@ ip_rb_threadUpdateCommand(clientData, interp, objc, objv)
return TCL_ERROR;
}
#ifdef HAVE_NATIVETHREAD
-#ifndef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
+#if 0
if (!ruby_native_thread_p()) {
rb_bug("cross-thread violation on ip_rb_threadUpdateCommand()");
}
#endif
+#else
+ if (!is_ruby_native_thread()) {
+ rb_bug("cross-thread violation on ip_rb_threadUpdateCommand()");
+ }
+#endif
#endif
if (rb_thread_alone()
@@ -3658,17 +3671,10 @@ ip_rb_threadUpdateCommand(clientData, interp, objc, objv)
DUMP1("set idle proc");
Tcl_DoWhenIdle(rb_threadUpdateProc, (ClientData) param);
- t.tv_sec = 0;
- t.tv_usec = (long)((EVENT_HANDLER_TIMEOUT)*1000.0);
-
while(!param->done) {
- DUMP1("wait for complete idle proc");
- /* rb_thread_stop(); */
- /* rb_thread_sleep_forever(); */
- rb_thread_wait_for(t);
- if (NIL_P(eventloop_thread)) {
- break;
- }
+ DUMP1("wait for complete idle proc");
+ /* rb_thread_stop(); */
+ rb_thread_sleep_forever();
}
#if 0 /* use Tcl_EventuallyFree */
@@ -3738,14 +3744,14 @@ VwaitVarProc(clientData, interp, name1, name2, flags)
#if TCL_MAJOR_VERSION >= 8
static int
ip_rbVwaitObjCmd(clientData, interp, objc, objv)
- ClientData clientData; /* Not used */
+ ClientData clientData;
Tcl_Interp *interp;
int objc;
Tcl_Obj *CONST objv[];
#else /* TCL_MAJOR_VERSION < 8 */
static int
ip_rbVwaitCommand(clientData, interp, objc, objv)
- ClientData clientData; /* Not used */
+ ClientData clientData;
Tcl_Interp *interp;
int objc;
char *objv[];
@@ -3779,11 +3785,17 @@ ip_rbVwaitCommand(clientData, interp, objc, objv)
Tcl_Preserve(interp);
#ifdef HAVE_NATIVETHREAD
-#ifndef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
+#if 0
if (!ruby_native_thread_p()) {
rb_bug("cross-thread violation on ip_rbVwaitCommand()");
}
#endif
+#else
+ if (!is_ruby_native_thread()) {
+ rb_bug("cross-thread violation on ip_rbVwaitCommand()");
+ }
+#endif
#endif
Tcl_ResetResult(interp);
@@ -3876,11 +3888,7 @@ ip_rbVwaitCommand(clientData, interp, objc, objv)
}
/* trap check */
-#ifdef RUBY_VM
- if (rb_thread_check_trap_pending()) {
-#else
if (rb_trap_pending) {
-#endif
#if TCL_MAJOR_VERSION >= 8
Tcl_DecrRefCount(objv[1]);
#endif
@@ -4018,10 +4026,10 @@ ip_rbTkWaitCommand(clientData, interp, objc, objv)
&& eventloop_thread != rb_thread_current()) {
#if TCL_MAJOR_VERSION >= 8
DUMP1("call ip_rb_threadTkWaitObjCmd");
- return ip_rb_threadTkWaitObjCmd((ClientData)tkwin, interp, objc, objv);
+ return ip_rb_threadTkWaitObjCmd(clientData, interp, objc, objv);
#else /* TCL_MAJOR_VERSION < 8 */
DUMP1("call ip_rb_threadTkWaitCommand");
- return ip_rb_threadTkWwaitCommand((ClientData)tkwin, interp, objc, objv);
+ return ip_rb_threadTkWwaitCommand(clientData, interp, objc, objv);
#endif
}
#endif
@@ -4169,11 +4177,7 @@ ip_rbTkWaitCommand(clientData, interp, objc, objv)
}
/* trap check */
-#ifdef RUBY_VM
- if (rb_thread_check_trap_pending()) {
-#else
- if (rb_trap_pending) {
-#endif
+ if (rb_trap_pending) {
Tcl_Release(interp);
return TCL_RETURN;
@@ -4233,11 +4237,7 @@ ip_rbTkWaitCommand(clientData, interp, objc, objv)
}
/* trap check */
-#ifdef RUBY_VM
- if (rb_thread_check_trap_pending()) {
-#else
- if (rb_trap_pending) {
-#endif
+ if (rb_trap_pending) {
#if TCL_MAJOR_VERSION >= 8
Tcl_DecrRefCount(objv[2]);
#endif
@@ -4332,11 +4332,7 @@ ip_rbTkWaitCommand(clientData, interp, objc, objv)
}
/* trap check */
-#ifdef RUBY_VM
- if (rb_thread_check_trap_pending()) {
-#else
- if (rb_trap_pending) {
-#endif
+ if (rb_trap_pending) {
Tcl_Release(interp);
return TCL_RETURN;
@@ -4445,7 +4441,7 @@ ip_rb_threadVwaitObjCmd(clientData, interp, objc, objv)
#else /* TCL_MAJOR_VERSION < 8 */
static int
ip_rb_threadVwaitCommand(clientData, interp, objc, objv)
- ClientData clientData; /* Not used */
+ ClientData clientData;
Tcl_Interp *interp;
int objc;
char *objv[];
@@ -4456,7 +4452,6 @@ ip_rb_threadVwaitCommand(clientData, interp, objc, objv)
int ret, dummy;
int thr_crit_bup;
volatile VALUE current_thread = rb_thread_current();
- struct timeval t;
DUMP1("Ruby's 'thread_vwait' is called");
if (interp == (Tcl_Interp*)NULL) {
@@ -4551,16 +4546,9 @@ ip_rb_threadVwaitCommand(clientData, interp, objc, objv)
return TCL_ERROR;
}
- t.tv_sec = 0;
- t.tv_usec = (long)((EVENT_HANDLER_TIMEOUT)*1000.0);
-
while(!param->done) {
- /* rb_thread_stop(); */
- /* rb_thread_sleep_forever(); */
- rb_thread_wait_for(t);
- if (NIL_P(eventloop_thread)) {
- break;
- }
+ /* rb_thread_stop(); */
+ rb_thread_sleep_forever();
}
thr_crit_bup = rb_thread_critical;
@@ -4619,7 +4607,6 @@ ip_rb_threadTkWaitCommand(clientData, interp, objc, objv)
int ret, dummy;
int thr_crit_bup;
volatile VALUE current_thread = rb_thread_current();
- struct timeval t;
DUMP1("Ruby's 'thread_tkwait' is called");
if (interp == (Tcl_Interp*)NULL) {
@@ -4631,8 +4618,6 @@ ip_rb_threadTkWaitCommand(clientData, interp, objc, objv)
if (rb_thread_alone() || eventloop_thread == current_thread) {
#if TCL_MAJOR_VERSION >= 8
DUMP1("call ip_rbTkWaitObjCmd");
- DUMP2("eventloop_thread %lx", eventloop_thread);
- DUMP2("current_thread %lx", current_thread);
return ip_rbTkWaitObjCmd(clientData, interp, objc, objv);
#else /* TCL_MAJOR_VERSION < 8 */
DUMP1("call rb_VwaitCommand");
@@ -4775,16 +4760,9 @@ ip_rb_threadTkWaitCommand(clientData, interp, objc, objv)
return TCL_ERROR;
}
- t.tv_sec = 0;
- t.tv_usec = (long)((EVENT_HANDLER_TIMEOUT)*1000.0);
-
while(!param->done) {
- /* rb_thread_stop(); */
- /* rb_thread_sleep_forever(); */
- rb_thread_wait_for(t);
- if (NIL_P(eventloop_thread)) {
- break;
- }
+ /* rb_thread_stop(); */
+ rb_thread_sleep_forever();
}
thr_crit_bup = rb_thread_critical;
@@ -4861,17 +4839,10 @@ ip_rb_threadTkWaitCommand(clientData, interp, objc, objv)
rb_thread_critical = thr_crit_bup;
- t.tv_sec = 0;
- t.tv_usec = (long)((EVENT_HANDLER_TIMEOUT)*1000.0);
-
while(param->done != TKWAIT_MODE_VISIBILITY) {
- if (param->done == TKWAIT_MODE_DESTROY) break;
- /* rb_thread_stop(); */
- /* rb_thread_sleep_forever(); */
- rb_thread_wait_for(t);
- if (NIL_P(eventloop_thread)) {
- break;
- }
+ if (param->done == TKWAIT_MODE_DESTROY) break;
+ /* rb_thread_stop(); */
+ rb_thread_sleep_forever();
}
thr_crit_bup = rb_thread_critical;
@@ -4983,16 +4954,9 @@ ip_rb_threadTkWaitCommand(clientData, interp, objc, objv)
rb_thread_critical = thr_crit_bup;
- t.tv_sec = 0;
- t.tv_usec = (long)((EVENT_HANDLER_TIMEOUT)*1000.0);
-
while(param->done != TKWAIT_MODE_DESTROY) {
- /* rb_thread_stop(); */
- /* rb_thread_sleep_forever(); */
- rb_thread_wait_for(t);
- if (NIL_P(eventloop_thread)) {
- break;
- }
+ /* rb_thread_stop(); */
+ rb_thread_sleep_forever();
}
Tcl_Release(window);
@@ -5102,13 +5066,11 @@ delete_slaves(ip)
slave = Tcl_GetSlave(ip, slave_name);
if (slave == (Tcl_Interp*)NULL) continue;
- if (!Tcl_InterpDeleted(slave)) {
- /* call ip_finalize */
- ip_finalize(slave);
+ /* call ip_finalize */
+ ip_finalize(slave);
- Tcl_DeleteInterp(slave);
- /* Tcl_Release(slave); */
- }
+ Tcl_DeleteInterp(slave);
+ /* Tcl_Release(slave); */
}
}
@@ -5146,12 +5108,10 @@ delete_slaves(ip)
slave = Tcl_GetSlave(ip, slave_name);
if (slave == (Tcl_Interp*)NULL) continue;
- if (!Tcl_InterpDeleted(slave)) {
- /* call ip_finalize */
- ip_finalize(slave);
+ /* call ip_finalize */
+ ip_finalize(slave);
- Tcl_DeleteInterp(slave);
- }
+ Tcl_DeleteInterp(slave);
}
}
}
@@ -5163,39 +5123,26 @@ delete_slaves(ip)
/* finalize operation */
static void
-#ifdef HAVE_PROTOTYPES
-lib_mark_at_exit(VALUE self)
-#else
lib_mark_at_exit(self)
VALUE self;
-#endif
{
at_exit = 1;
}
static int
#if TCL_MAJOR_VERSION >= 8
-#ifdef HAVE_PROTOTYPES
-ip_null_proc(ClientData clientData, Tcl_Interp *interp,
- int argc, Tcl_Obj *CONST argv[])
-#else
ip_null_proc(clientData, interp, argc, argv)
ClientData clientData;
Tcl_Interp *interp;
int argc;
Tcl_Obj *CONST argv[];
-#endif
#else /* TCL_MAJOR_VERSION < 8 */
-#ifdef HAVE_PROTOTYPES
-ip_null_proc(ClientData clientData, Tcl_Interp *interp, int argc, char *argv[])
-#else
ip_null_proc(clientData, interp, argc, argv)
ClientData clientData;
Tcl_Interp *interp;
int argc;
char *argv[];
#endif
-#endif
{
Tcl_ResetResult(interp);
return TCL_OK;
@@ -5274,9 +5221,7 @@ ip_finalize(ip)
}
/* delete root widget */
-#ifdef RUBY_VM
- /* cause SEGV on Ruby 1.9 */
-#else
+#if 1
DUMP1("check `destroy'");
if (Tcl_GetCommandInfo(ip, "destroy", &info)) {
DUMP1("call `destroy .'");
@@ -5376,12 +5321,9 @@ ip_free(ptr)
return;
}
- if (!Tcl_InterpDeleted(ptr->ip)) {
- ip_finalize(ptr->ip);
-
- Tcl_DeleteInterp(ptr->ip);
- Tcl_Release(ptr->ip);
- }
+ ip_finalize(ptr->ip);
+ Tcl_DeleteInterp(ptr->ip);
+ Tcl_Release(ptr->ip);
ptr->ip = (Tcl_Interp*)NULL;
free(ptr);
@@ -5412,11 +5354,11 @@ ip_replace_wait_commands(interp, mainWin)
#if TCL_MAJOR_VERSION >= 8
DUMP1("Tcl_CreateObjCommand(\"vwait\")");
Tcl_CreateObjCommand(interp, "vwait", ip_rbVwaitObjCmd,
- (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
+ (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
#else /* TCL_MAJOR_VERSION < 8 */
DUMP1("Tcl_CreateCommand(\"vwait\")");
Tcl_CreateCommand(interp, "vwait", ip_rbVwaitCommand,
- (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
+ (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
#endif
/* replace 'tkwait' command */
@@ -5434,11 +5376,11 @@ ip_replace_wait_commands(interp, mainWin)
#if TCL_MAJOR_VERSION >= 8
DUMP1("Tcl_CreateObjCommand(\"thread_vwait\")");
Tcl_CreateObjCommand(interp, "thread_vwait", ip_rb_threadVwaitObjCmd,
- (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
+ (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
#else /* TCL_MAJOR_VERSION < 8 */
DUMP1("Tcl_CreateCommand(\"thread_vwait\")");
Tcl_CreateCommand(interp, "thread_vwait", ip_rb_threadVwaitCommand,
- (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
+ (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
#endif
/* add 'thread_tkwait' command */
@@ -5476,72 +5418,6 @@ ip_replace_wait_commands(interp, mainWin)
}
-#if TCL_MAJOR_VERSION >= 8
-static int
-ip_rb_replaceSlaveTkCmdsObjCmd(clientData, interp, objc, objv)
- ClientData clientData;
- Tcl_Interp *interp;
- int objc;
- Tcl_Obj *CONST objv[];
-#else /* TCL_MAJOR_VERSION < 8 */
-static int
-ip_rb_replaceSlaveTkCmdsCommand(clientData, interp, objc, objv)
- ClientData clientData;
- Tcl_Interp *interp;
- int objc;
- char *objv[];
-#endif
-{
- char *slave_name;
- Tcl_Interp *slave;
- Tk_Window mainWin;
-
- if (objc != 2) {
-#ifdef Tcl_WrongNumArgs
- Tcl_WrongNumArgs(interp, 1, objv, "slave_name");
-#else
- char *nameString;
-#if TCL_MAJOR_VERSION >= 8
- nameString = Tcl_GetStringFromObj(objv[0], (int*)NULL);
-#else /* TCL_MAJOR_VERSION < 8 */
- nameString = objv[0];
-#endif
- Tcl_AppendResult(interp, "wrong number of arguments: should be \"",
- nameString, " slave_name\"", (char *) NULL);
-#endif
- }
-
-#if TCL_MAJOR_VERSION >= 8
- slave_name = Tcl_GetStringFromObj(objv[1], (int*)NULL);
-#else
- slave_name = objv[1];
-#endif
-
- slave = Tcl_GetSlave(interp, slave_name);
- if (slave == NULL) {
- Tcl_AppendResult(interp, "cannot find slave \"",
- slave_name, "\"", (char *)NULL);
- return TCL_ERROR;
- }
- mainWin = Tk_MainWindow(slave);
-
- /* replace 'exit' command --> 'interp_exit' command */
-#if TCL_MAJOR_VERSION >= 8
- DUMP1("Tcl_CreateObjCommand(\"exit\") --> \"interp_exit\"");
- Tcl_CreateObjCommand(slave, "exit", ip_InterpExitObjCmd,
- (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
-#else /* TCL_MAJOR_VERSION < 8 */
- DUMP1("Tcl_CreateCommand(\"exit\") --> \"interp_exit\"");
- Tcl_CreateCommand(slave, "exit", ip_InterpExitCommand,
- (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
-#endif
-
- /* replace vwait and tkwait */
- ip_replace_wait_commands(slave, mainWin);
-
- return TCL_OK;
-}
-
#if TCL_MAJOR_VERSION >= 8
static int ip_rbNamespaceObjCmd _((ClientData, Tcl_Interp *, int,
@@ -5564,7 +5440,7 @@ ip_rbNamespaceObjCmd(clientData, interp, objc, objv)
}
rbtk_eventloop_depth++;
- /* DUMP2("namespace wrapper enter depth == %d", rbtk_eventloop_depth); */
+ DUMP2("namespace wrapper enter depth == %d", rbtk_eventloop_depth);
if (info.isNativeObjectProc) {
ret = (*(info.objProc))(info.objClientData, interp, objc, objv);
@@ -5600,7 +5476,7 @@ ip_rbNamespaceObjCmd(clientData, interp, objc, objv)
#endif
}
- /* DUMP2("namespace wrapper exit depth == %d", rbtk_eventloop_depth); */
+ DUMP2("namespace wrapper exit depth == %d", rbtk_eventloop_depth);
rbtk_eventloop_depth--;
return ret;
@@ -5636,13 +5512,9 @@ ip_wrap_namespace_command(interp)
/* call when interpreter is deleted */
static void
-#ifdef HAVE_PROTOTYPES
-ip_CallWhenDeleted(ClientData clientData, Tcl_Interp *ip)
-#else
ip_CallWhenDeleted(clientData, ip)
ClientData clientData;
Tcl_Interp *ip;
-#endif
{
int thr_crit_bup;
/* Tk_Window main_win = (Tk_Window) clientData; */
@@ -5672,10 +5544,19 @@ ip_init(argc, argv, self)
Tk_Window mainWin = (Tk_Window)NULL;
/* security check */
+#ifdef RUBY_VM
if (rb_safe_level() >= 4) {
+#else
+ if (ruby_safe_level >= 4) {
+#endif
rb_raise(rb_eSecurityError,
"Cannot create a TclTkIp object at level %d",
- rb_safe_level());
+#ifdef RUBY_VM
+ rb_safe_level()
+#else
+ ruby_safe_level
+#endif
+ );
}
/* create object */
@@ -5683,7 +5564,7 @@ ip_init(argc, argv, self)
ptr = ALLOC(struct tcltkip);
/* ptr = (struct tcltkip *)ckalloc(sizeof(struct tcltkip)); */
DATA_PTR(self) = ptr;
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
ptr->tk_thread_id = 0;
#endif
ptr->ref_count = 0;
@@ -5766,7 +5647,6 @@ ip_init(argc, argv, self)
;
}
- st = ruby_tcl_stubs_init();
/* from Tcl_AppInit() */
if (with_tk) {
DUMP1("Tk_Init");
@@ -5794,7 +5674,7 @@ ip_init(argc, argv, self)
(Tcl_PackageInitProc *) NULL);
#endif
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
/* set Tk thread ID */
ptr->tk_thread_id = Tcl_GetCurrentThread();
#endif
@@ -5855,17 +5735,6 @@ ip_init(argc, argv, self)
/* wrap namespace command */
ip_wrap_namespace_command(ptr->ip);
- /* define command to replace commands which depend on slave's MainWindow */
-#if TCL_MAJOR_VERSION >= 8
- Tcl_CreateObjCommand(ptr->ip, "__replace_slave_tk_commands__",
- ip_rb_replaceSlaveTkCmdsObjCmd,
- (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
-#else /* TCL_MAJOR_VERSION < 8 */
- Tcl_CreateCommand(ptr->ip, "__replace_slave_tk_commands__",
- ip_rb_replaceSlaveTkCmdsCommand,
- (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
-#endif
-
/* set finalizer */
Tcl_CallWhenDeleted(ptr->ip, ip_CallWhenDeleted, (ClientData)mainWin);
@@ -5927,7 +5796,7 @@ ip_create_slave_core(interp, argc, argv)
#endif
/* create slave-ip */
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
/* slave->tk_thread_id = 0; */
slave->tk_thread_id = master->tk_thread_id; /* == current thread */
#endif
@@ -5969,17 +5838,6 @@ ip_create_slave_core(interp, argc, argv)
/* wrap namespace command */
ip_wrap_namespace_command(slave->ip);
- /* define command to replace cmds which depend on slave-slave's MainWin */
-#if TCL_MAJOR_VERSION >= 8
- Tcl_CreateObjCommand(slave->ip, "__replace_slave_tk_commands__",
- ip_rb_replaceSlaveTkCmdsObjCmd,
- (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
-#else /* TCL_MAJOR_VERSION < 8 */
- Tcl_CreateCommand(slave->ip, "__replace_slave_tk_commands__",
- ip_rb_replaceSlaveTkCmdsCommand,
- (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
-#endif
-
/* set finalizer */
Tcl_CallWhenDeleted(slave->ip, ip_CallWhenDeleted, (ClientData)mainWin);
@@ -6274,8 +6132,7 @@ ip_delete(self)
int thr_crit_bup;
struct tcltkip *ptr = get_ip(self);
- /* if (ptr == (struct tcltkip *)NULL || ptr->ip == (Tcl_Interp*)NULL) { */
- if (deleted_ip(ptr)) {
+ if (ptr == (struct tcltkip *)NULL || ptr->ip == (Tcl_Interp*)NULL) {
DUMP1("delete deleted IP");
return Qnil;
}
@@ -6283,14 +6140,12 @@ ip_delete(self)
thr_crit_bup = rb_thread_critical;
rb_thread_critical = Qtrue;
- DUMP1("delete interp");
- if (!Tcl_InterpDeleted(ptr->ip)) {
- DUMP1("call ip_finalize");
- ip_finalize(ptr->ip);
+ DUMP1("call ip_finalize");
+ ip_finalize(ptr->ip);
- Tcl_DeleteInterp(ptr->ip);
- Tcl_Release(ptr->ip);
- }
+ DUMP1("delete interp");
+ Tcl_DeleteInterp(ptr->ip);
+ Tcl_Release(ptr->ip);
rb_thread_critical = thr_crit_bup;
@@ -6368,6 +6223,10 @@ get_str_from_obj(obj)
int len, binary = 0;
const char *s;
volatile VALUE str;
+#if TCL_MAJOR_VERSION > 8 || (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION >= 4)
+ int len2;
+ const char *s2;
+#endif
#if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 0
s = Tcl_GetStringFromObj(obj, &len);
@@ -6376,7 +6235,7 @@ get_str_from_obj(obj)
/* TCL_VERSION 8.1 -- 8.3 */
if (Tcl_GetCharLength(obj) != Tcl_UniCharLen(Tcl_GetUnicode(obj))) {
/* possibly binary string */
- s = (char *)Tcl_GetByteArrayFromObj(obj, &len);
+ s = Tcl_GetByteArrayFromObj(obj, &len);
binary = 1;
} else {
/* possibly text string */
@@ -6384,7 +6243,7 @@ get_str_from_obj(obj)
}
#else /* TCL_VERSION >= 8.4 */
if (IS_TCL_BYTEARRAY(obj)) {
- s = (char *)Tcl_GetByteArrayFromObj(obj, &len);
+ s = Tcl_GetByteArrayFromObj(obj, &len);
binary = 1;
} else {
s = Tcl_GetStringFromObj(obj, &len);
@@ -6394,13 +6253,13 @@ get_str_from_obj(obj)
#endif
str = s ? rb_str_new(s, len) : rb_str_new2("");
if (binary) {
-#ifdef HAVE_RUBY_ENCODING_H
+#ifdef RUBY_VM
rb_enc_associate_index(str, ENCODING_INDEX_BINARY);
#endif
rb_ivar_set(str, ID_at_enc, ENCODING_NAME_BINARY);
#if TCL_MAJOR_VERSION > 8 || (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION >= 1)
} else {
-#ifdef HAVE_RUBY_ENCODING_H
+#ifdef RUBY_VM
rb_enc_associate_index(str, ENCODING_INDEX_UTF8);
#endif
rb_ivar_set(str, ID_at_enc, ENCODING_NAME_UTF8);
@@ -6424,19 +6283,19 @@ get_obj_from_str(str)
StringValue(enc);
if (strcmp(RSTRING_PTR(enc), "binary") == 0) {
/* binary string */
- return Tcl_NewByteArrayObj((const unsigned char *)s, RSTRING_LEN(str));
+ return Tcl_NewByteArrayObj(s, RSTRING_LEN(str));
} else {
/* text string */
return Tcl_NewStringObj(s, RSTRING_LEN(str));
}
-#ifdef HAVE_RUBY_ENCODING_H
+#ifdef RUBY_VM
} else if (rb_enc_get_index(str) == ENCODING_INDEX_BINARY) {
/* binary string */
- return Tcl_NewByteArrayObj((const unsigned char *)s, RSTRING_LEN(str));
+ return Tcl_NewByteArrayObj(s, RSTRING_LEN(str));
#endif
- } else if (memchr(s, 0, RSTRING_LEN(str))) {
+ } else if (strlen(s) != RSTRING_LEN(str)) {
/* probably binary string */
- return Tcl_NewByteArrayObj((const unsigned char *)s, RSTRING_LEN(str));
+ return Tcl_NewByteArrayObj(s, RSTRING_LEN(str));
} else {
/* probably text string */
return Tcl_NewStringObj(s, RSTRING_LEN(str));
@@ -6456,7 +6315,7 @@ ip_get_result_string_obj(interp)
retObj = Tcl_GetObjResult(interp);
Tcl_IncrRefCount(retObj);
strval = get_str_from_obj(retObj);
- RbTk_OBJ_UNTRUST(strval);
+ OBJ_TAINT(strval);
Tcl_ResetResult(interp);
Tcl_DecrRefCount(retObj);
return strval;
@@ -6502,13 +6361,8 @@ call_queue_handler(evPtr, flags)
DUMP1("process it on current event-loop");
}
-#ifdef RUBY_VM
- if (RTEST(rb_funcall(thread, ID_alive_p, 0))
- && ! RTEST(rb_funcall(thread, ID_stop_p, 0))) {
-#else
if (RTEST(rb_thread_alive_p(thread))
&& ! RTEST(rb_funcall(thread, ID_stop_p, 0))) {
-#endif
DUMP1("caller is not yet ready to receive the result -> pending");
return 0;
}
@@ -6557,11 +6411,8 @@ call_queue_handler(evPtr, flags)
q->thread = (VALUE)NULL;
/* back to caller */
-#ifdef RUBY_VM
- if (RTEST(rb_funcall(thread, ID_alive_p, 0, 0))) {
-#else
+ /* if (RTEST(rb_funcall(thread, ID_alive_p, 0, 0))) { */
if (RTEST(rb_thread_alive_p(thread))) {
-#endif
DUMP2("back to caller (caller thread:%lx)", thread);
DUMP2(" (current thread:%lx)", rb_thread_current());
#if CONTROL_BY_STATUS_OF_RB_THREAD_WAITING_FOR_VALUE
@@ -6599,7 +6450,6 @@ tk_funcall(func, argc, argv, obj)
volatile VALUE ip_obj = obj;
volatile VALUE result;
volatile VALUE ret;
- struct timeval t;
if (!NIL_P(ip_obj) && rb_obj_is_kind_of(ip_obj, tcltkip_class)) {
ptr = get_ip(ip_obj);
@@ -6608,7 +6458,7 @@ tk_funcall(func, argc, argv, obj)
ptr = (struct tcltkip *)NULL;
}
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
if (ptr) {
/* on Tcl interpreter */
is_tk_evloop_thread = (ptr->tk_thread_id == (Tcl_ThreadId) 0
@@ -6684,7 +6534,7 @@ tk_funcall(func, argc, argv, obj)
/* add the handler to Tcl event queue */
DUMP1("add handler");
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
if (ptr && ptr->tk_thread_id) {
/* Tcl_ThreadQueueEvent(ptr->tk_thread_id,
&(callq->ev), TCL_QUEUE_HEAD); */
@@ -6709,21 +6559,12 @@ tk_funcall(func, argc, argv, obj)
rb_thread_critical = thr_crit_bup;
/* wait for the handler to be processed */
- t.tv_sec = 0;
- t.tv_usec = (long)((EVENT_HANDLER_TIMEOUT)*1000.0);
-
- DUMP2("callq wait for handler (current thread:%lx)", current);
+ DUMP2("wait for handler (current thread:%lx)", current);
while(*alloc_done >= 0) {
- DUMP2("*** callq wait for handler (current thread:%lx)", current);
+ DUMP2("*** wait for handler (current thread:%lx)", current);
/* rb_thread_stop(); */
- /* rb_thread_sleep_forever(); */
- rb_thread_wait_for(t);
- DUMP2("*** callq wakeup (current thread:%lx)", current);
- DUMP2("*** (eventloop thread:%lx)", eventloop_thread);
- if (NIL_P(eventloop_thread)) {
- DUMP1("*** callq lost eventloop thread");
- break;
- }
+ rb_thread_sleep_forever();
+ DUMP2("*** wakeup (current thread:%lx)", current);
}
DUMP2("back from handler (current thread:%lx)", current);
@@ -6785,12 +6626,8 @@ struct call_eval_info {
};
static VALUE
-#ifdef HAVE_PROTOTYPES
-call_tcl_eval(VALUE arg)
-#else
call_tcl_eval(arg)
VALUE arg;
-#endif
{
struct call_eval_info *inf = (struct call_eval_info *)arg;
@@ -6844,19 +6681,35 @@ ip_eval_real(self, cmd_str, cmd_len)
ret = rb_protect(call_tcl_eval, (VALUE)&inf, &status);
switch(status) {
case TAG_RAISE:
+#ifdef RUBY_VM
if (NIL_P(rb_errinfo())) {
+#else
+ if (NIL_P(ruby_errinfo)) {
+#endif
rbtk_pending_exception = rb_exc_new2(rb_eException,
"unknown exception");
} else {
+#ifdef RUBY_VM
rbtk_pending_exception = rb_errinfo();
+#else
+ rbtk_pending_exception = ruby_errinfo;
+#endif
}
break;
case TAG_FATAL:
+#ifdef RUBY_VM
if (NIL_P(rb_errinfo())) {
+#else
+ if (NIL_P(ruby_errinfo)) {
+#endif
rbtk_pending_exception = rb_exc_new2(rb_eFatal, "FATAL");
} else {
+#ifdef RUBY_VM
rbtk_pending_exception = rb_errinfo();
+#else
+ rbtk_pending_exception = ruby_errinfo;
+#endif
}
}
#endif
@@ -6871,26 +6724,11 @@ ip_eval_real(self, cmd_str, cmd_len)
return rbtk_pending_exception;
}
- /* if (ptr->return_value == TCL_ERROR) { */
- if (ptr->return_value != TCL_OK) {
+ if (ptr->return_value == TCL_ERROR) {
if (event_loop_abort_on_exc > 0 && !Tcl_InterpDeleted(ptr->ip)) {
volatile VALUE exc;
-
- switch (ptr->return_value) {
- case TCL_RETURN:
- exc = create_ip_exc(self, eTkCallbackReturn,
- "ip_eval_real receives TCL_RETURN");
- case TCL_BREAK:
- exc = create_ip_exc(self, eTkCallbackBreak,
- "ip_eval_real receives TCL_BREAK");
- case TCL_CONTINUE:
- exc = create_ip_exc(self, eTkCallbackContinue,
- "ip_eval_real receives TCL_CONTINUE");
- default:
- exc = create_ip_exc(self, rb_eRuntimeError, "%s",
- Tcl_GetStringResult(ptr->ip));
- }
-
+ exc = create_ip_exc(self, rb_eRuntimeError,
+ "%s", Tcl_GetStringResult(ptr->ip));
rbtk_release_ip(ptr);
rb_thread_critical = thr_crit_bup;
return exc;
@@ -6932,23 +6770,10 @@ ip_eval_real(self, cmd_str, cmd_len)
return rbtk_pending_exception;
}
- /* if (ptr->return_value == TCL_ERROR) { */
- if (ptr->return_value != TCL_OK) {
+ if (ptr->return_value == TCL_ERROR) {
volatile VALUE exc;
- switch (ptr->return_value) {
- case TCL_RETURN:
- exc = create_ip_exc(self, eTkCallbackReturn,
- "ip_eval_real receives TCL_RETURN");
- case TCL_BREAK:
- exc = create_ip_exc(self, eTkCallbackBreak,
- "ip_eval_real receives TCL_BREAK");
- case TCL_CONTINUE:
- exc = create_ip_exc(self, eTkCallbackContinue,
- "ip_eval_real receives TCL_CONTINUE");
- default:
- exc = create_ip_exc(self, rb_eRuntimeError, "%s", ptr->ip->result);
- }
+ exc = create_ip_exc(self, rb_eRuntimeError, "%s", ptr->ip->result);
rbtk_release_ip(ptr);
return exc;
@@ -6998,13 +6823,8 @@ eval_queue_handler(evPtr, flags)
DUMP1("process it on current event-loop");
}
-#ifdef RUBY_VM
- if (RTEST(rb_funcall(thread, ID_alive_p, 0))
- && ! RTEST(rb_funcall(thread, ID_stop_p, 0))) {
-#else
if (RTEST(rb_thread_alive_p(thread))
&& ! RTEST(rb_funcall(thread, ID_stop_p, 0))) {
-#endif
DUMP1("caller is not yet ready to receive the result -> pending");
return 0;
}
@@ -7025,11 +6845,17 @@ eval_queue_handler(evPtr, flags)
/* check safe-level */
if (rb_safe_level() != q->safe_level) {
#ifdef HAVE_NATIVETHREAD
-#ifndef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
+#if 0
if (!ruby_native_thread_p()) {
rb_bug("cross-thread violation on eval_queue_handler()");
}
#endif
+#else
+ if (!is_ruby_native_thread()) {
+ rb_bug("cross-thread violation on eval_queue_handler()");
+ }
+#endif
#endif
/* q_dat = Data_Wrap_Struct(rb_cData,0,-1,q); */
q_dat = Data_Wrap_Struct(rb_cData,eval_queue_mark,-1,q);
@@ -7057,11 +6883,8 @@ eval_queue_handler(evPtr, flags)
q->thread = (VALUE)NULL;
/* back to caller */
-#ifdef RUBY_VM
- if (RTEST(rb_funcall(thread, ID_alive_p, 0, 0))) {
-#else
+ /* if (RTEST(rb_funcall(thread, ID_alive_p, 0, 0))) { */
if (RTEST(rb_thread_alive_p(thread))) {
-#endif
DUMP2("back to caller (caller thread:%lx)", thread);
DUMP2(" (current thread:%lx)", rb_thread_current());
#if CONTROL_BY_STATUS_OF_RB_THREAD_WAITING_FOR_VALUE
@@ -7089,7 +6912,7 @@ ip_eval(self, str)
VALUE str;
{
struct eval_queue *evq;
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
struct tcltkip *ptr;
#endif
char *eval_str;
@@ -7100,24 +6923,18 @@ ip_eval(self, str)
volatile VALUE result;
volatile VALUE ret;
Tcl_QueuePosition position;
- struct timeval t;
thr_crit_bup = rb_thread_critical;
rb_thread_critical = Qtrue;
StringValue(str);
rb_thread_critical = thr_crit_bup;
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
ptr = get_ip(ip_obj);
- DUMP2("eval status: ptr->tk_thread_id %p", ptr->tk_thread_id);
- DUMP2("eval status: Tcl_GetCurrentThread %p", Tcl_GetCurrentThread());
-#else
- DUMP2("status: Tcl_GetCurrentThread %p", Tcl_GetCurrentThread());
#endif
- DUMP2("status: eventloopt_thread %lx", eventloop_thread);
if (
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
(ptr->tk_thread_id == 0 || ptr->tk_thread_id == Tcl_GetCurrentThread())
&&
#endif
@@ -7180,7 +6997,7 @@ ip_eval(self, str)
/* add the handler to Tcl event queue */
DUMP1("add handler");
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
if (ptr->tk_thread_id) {
/* Tcl_ThreadQueueEvent(ptr->tk_thread_id, &(evq->ev), position); */
Tcl_ThreadQueueEvent(ptr->tk_thread_id, (Tcl_Event*)evq, position);
@@ -7202,21 +7019,12 @@ ip_eval(self, str)
rb_thread_critical = thr_crit_bup;
/* wait for the handler to be processed */
- t.tv_sec = 0;
- t.tv_usec = (long)((EVENT_HANDLER_TIMEOUT)*1000.0);
-
- DUMP2("evq wait for handler (current thread:%lx)", current);
+ DUMP2("wait for handler (current thread:%lx)", current);
while(*alloc_done >= 0) {
- DUMP2("*** evq wait for handler (current thread:%lx)", current);
+ DUMP2("*** wait for handler (current thread:%lx)", current);
/* rb_thread_stop(); */
- /* rb_thread_sleep_forever(); */
- rb_thread_wait_for(t);
- DUMP2("*** evq wakeup (current thread:%lx)", current);
- DUMP2("*** (eventloop thread:%lx)", eventloop_thread);
- if (NIL_P(eventloop_thread)) {
- DUMP1("*** evq lost eventloop thread");
- break;
- }
+ rb_thread_sleep_forever();
+ DUMP2("*** wakeup (current thread:%lx)", current);
}
DUMP2("back from handler (current thread:%lx)", current);
@@ -7262,71 +7070,6 @@ ip_eval(self, str)
}
-static int
-ip_cancel_eval_core(interp, msg, flag)
- Tcl_Interp *interp;
- VALUE msg;
- int flag;
-{
-#if TCL_MAJOR_VERSION < 8 || (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION < 6)
- rb_raise(rb_eNotImpError,
- "cancel_eval is supported Tcl/Tk8.6 or later.");
-#else
- Tcl_Obj *msg_obj;
-
- if (NIL_P(msg)) {
- msg_obj = NULL;
- } else {
- msg_obj = Tcl_NewStringObj(RSTRING_PTR(msg), RSTRING_LEN(msg));
- Tcl_IncrRefCount(msg_obj);
- }
-
- return Tcl_CancelEval(interp, msg_obj, 0, flag);
-#endif
-}
-
-static VALUE
-ip_cancel_eval(argc, argv, self)
- int argc;
- VALUE *argv;
- VALUE self;
-{
- VALUE retval;
-
- if (rb_scan_args(argc, argv, "01", &retval) == 0) {
- retval = Qnil;
- }
- if (ip_cancel_eval_core(get_ip(self)->ip, retval, 0) == TCL_OK) {
- return Qtrue;
- } else {
- return Qfalse;
- }
-}
-
-#ifndef TCL_CANCEL_UNWIND
-#define TCL_CANCEL_UNWIND 0x100000
-#endif
-static VALUE
-ip_cancel_eval_unwind(argc, argv, self)
- int argc;
- VALUE *argv;
- VALUE self;
-{
- int flag = 0;
- VALUE retval;
-
- if (rb_scan_args(argc, argv, "01", &retval) == 0) {
- retval = Qnil;
- }
-
- flag |= TCL_CANCEL_UNWIND;
- if (ip_cancel_eval_core(get_ip(self)->ip, retval, flag) == TCL_OK) {
- return Qtrue;
- } else {
- return Qfalse;
- }
-}
-
/* restart Tk */
static VALUE
lib_restart_core(interp, argc, argv)
@@ -7476,7 +7219,7 @@ lib_toUTF8_core(ip_obj, src, encodename)
if (TYPE(str) == T_STRING) {
volatile VALUE enc;
-#ifdef HAVE_RUBY_ENCODING_H
+#ifdef RUBY_VM
enc = rb_funcall(rb_obj_encoding(str), ID_to_s, 0, 0);
#else
enc = rb_attr_get(str, ID_at_enc);
@@ -7506,7 +7249,7 @@ lib_toUTF8_core(ip_obj, src, encodename)
} else {
StringValue(enc);
if (strcmp(RSTRING_PTR(enc), "binary") == 0) {
-#ifdef HAVE_RUBY_ENCODING_H
+#ifdef RUBY_VM
rb_enc_associate_index(str, ENCODING_INDEX_BINARY);
#endif
rb_ivar_set(str, ID_at_enc, ENCODING_NAME_BINARY);
@@ -7526,7 +7269,7 @@ lib_toUTF8_core(ip_obj, src, encodename)
} else {
StringValue(encodename);
if (strcmp(RSTRING_PTR(encodename), "binary") == 0) {
-#ifdef HAVE_RUBY_ENCODING_H
+#ifdef RUBY_VM
rb_enc_associate_index(str, ENCODING_INDEX_BINARY);
#endif
rb_ivar_set(str, ID_at_enc, ENCODING_NAME_BINARY);
@@ -7563,11 +7306,11 @@ lib_toUTF8_core(ip_obj, src, encodename)
/* str = rb_tainted_str_new2(Tcl_DStringValue(&dstr)); */
/* str = rb_str_new2(Tcl_DStringValue(&dstr)); */
str = rb_str_new(Tcl_DStringValue(&dstr), Tcl_DStringLength(&dstr));
-#ifdef HAVE_RUBY_ENCODING_H
+#ifdef RUBY_VM
rb_enc_associate_index(str, ENCODING_INDEX_UTF8);
#endif
- if (taint_flag) RbTk_OBJ_UNTRUST(str);
rb_ivar_set(str, ID_at_enc, ENCODING_NAME_UTF8);
+ if (taint_flag) OBJ_TAINT(str);
/*
if (encoding != (Tcl_Encoding)NULL) {
@@ -7656,14 +7399,14 @@ lib_fromUTF8_core(ip_obj, src, encodename)
if (!NIL_P(enc)) {
StringValue(enc);
if (strcmp(RSTRING_PTR(enc), "binary") == 0) {
-#ifdef HAVE_RUBY_ENCODING_H
+#ifdef RUBY_VM
rb_enc_associate_index(str, ENCODING_INDEX_BINARY);
#endif
rb_ivar_set(str, ID_at_enc, ENCODING_NAME_BINARY);
rb_thread_critical = thr_crit_bup;
return str;
}
-#ifdef HAVE_RUBY_ENCODING_H
+#ifdef RUBY_VM
} else if (rb_enc_get_index(str) == ENCODING_INDEX_BINARY) {
rb_enc_associate_index(str, ENCODING_INDEX_BINARY);
rb_ivar_set(str, ID_at_enc, ENCODING_NAME_BINARY);
@@ -7708,11 +7451,11 @@ lib_fromUTF8_core(ip_obj, src, encodename)
StringValue(str);
tclstr = Tcl_NewStringObj(RSTRING_PTR(str), RSTRING_LEN(str));
Tcl_IncrRefCount(tclstr);
- s = (char*)Tcl_GetByteArrayFromObj(tclstr, &len);
+ s = Tcl_GetByteArrayFromObj(tclstr, &len);
str = rb_tainted_str_new(s, len);
s = (char*)NULL;
Tcl_DecrRefCount(tclstr);
-#ifdef HAVE_RUBY_ENCODING_H
+#ifdef RUBY_VM
rb_enc_associate_index(str, ENCODING_INDEX_BINARY);
#endif
rb_ivar_set(str, ID_at_enc, ENCODING_NAME_BINARY);
@@ -7754,7 +7497,7 @@ lib_fromUTF8_core(ip_obj, src, encodename)
/* str = rb_tainted_str_new2(Tcl_DStringValue(&dstr)); */
/* str = rb_str_new2(Tcl_DStringValue(&dstr)); */
str = rb_str_new(Tcl_DStringValue(&dstr), Tcl_DStringLength(&dstr));
-#ifdef HAVE_RUBY_ENCODING_H
+#ifdef RUBY_VM
if (interp) {
/* can access encoding_table of TclTkIp */
/* -> try to use encoding_table */
@@ -7767,10 +7510,10 @@ lib_fromUTF8_core(ip_obj, src, encodename)
rb_enc_associate_index(str, rb_enc_find_index(RSTRING_PTR(encodename)));
}
#endif
-
- if (taint_flag) RbTk_OBJ_UNTRUST(str);
rb_ivar_set(str, ID_at_enc, encodename);
+ if (taint_flag) OBJ_TAINT(str);
+
/*
if (encoding != (Tcl_Encoding)NULL) {
Tcl_FreeEncoding(encoding);
@@ -7862,8 +7605,8 @@ lib_UTF_backslash_core(self, str, all_bs)
}
str = rb_str_new(dst_buf, dst_len);
- if (taint_flag) RbTk_OBJ_UNTRUST(str);
-#ifdef HAVE_RUBY_ENCODING_H
+ if (taint_flag) OBJ_TAINT(str);
+#ifdef RUBY_VM
rb_enc_associate_index(str, ENCODING_INDEX_UTF8);
#endif
rb_ivar_set(str, ID_at_enc, ENCODING_NAME_UTF8);
@@ -7964,12 +7707,8 @@ struct invoke_info {
};
static VALUE
-#ifdef HAVE_PROTOTYPES
-invoke_tcl_proc(VALUE arg)
-#else
invoke_tcl_proc(arg)
VALUE arg;
-#endif
{
struct invoke_info *inf = (struct invoke_info *)arg;
int i, len;
@@ -8172,19 +7911,35 @@ ip_invoke_core(interp, argc, argv)
ret = rb_protect(invoke_tcl_proc, (VALUE)&inf, &status);
switch(status) {
case TAG_RAISE:
+#ifdef RUBY_VM
if (NIL_P(rb_errinfo())) {
+#else
+ if (NIL_P(ruby_errinfo)) {
+#endif
rbtk_pending_exception = rb_exc_new2(rb_eException,
"unknown exception");
} else {
+#ifdef RUBY_VM
rbtk_pending_exception = rb_errinfo();
+#else
+ rbtk_pending_exception = ruby_errinfo;
+#endif
}
break;
case TAG_FATAL:
+#ifdef RUBY_VM
if (NIL_P(rb_errinfo())) {
+#else
+ if (NIL_P(ruby_errinfo)) {
+#endif
rbtk_pending_exception = rb_exc_new2(rb_eFatal, "FATAL");
} else {
+#ifdef RUBY_VM
rbtk_pending_exception = rb_errinfo();
+#else
+ rbtk_pending_exception = ruby_errinfo;
+#endif
}
}
@@ -8284,24 +8039,11 @@ ip_invoke_core(interp, argc, argv)
rb_thread_critical = thr_crit_bup;
- /* if (ptr->return_value == TCL_ERROR) { */
- if (ptr->return_value != TCL_OK) {
+ if (ptr->return_value == TCL_ERROR) {
if (event_loop_abort_on_exc > 0 && !Tcl_InterpDeleted(ptr->ip)) {
- switch (ptr->return_value) {
- case TCL_RETURN:
- return create_ip_exc(interp, eTkCallbackReturn,
- "ip_invoke_core receives TCL_RETURN");
- case TCL_BREAK:
- return create_ip_exc(interp, eTkCallbackBreak,
- "ip_invoke_core receives TCL_BREAK");
- case TCL_CONTINUE:
- return create_ip_exc(interp, eTkCallbackContinue,
- "ip_invoke_core receives TCL_CONTINUE");
- default:
- return create_ip_exc(interp, rb_eRuntimeError, "%s",
- Tcl_GetStringResult(ptr->ip));
- }
+ return create_ip_exc(interp, rb_eRuntimeError,
+ "%s", Tcl_GetStringResult(ptr->ip));
} else {
if (event_loop_abort_on_exc < 0) {
rb_warning("%s (ignore)", Tcl_GetStringResult(ptr->ip));
@@ -8488,13 +8230,8 @@ invoke_queue_handler(evPtr, flags)
DUMP1("process it on current event-loop");
}
-#ifdef RUBY_VM
- if (RTEST(rb_funcall(thread, ID_alive_p, 0))
- && ! RTEST(rb_funcall(thread, ID_stop_p, 0))) {
-#else
if (RTEST(rb_thread_alive_p(thread))
&& ! RTEST(rb_funcall(thread, ID_stop_p, 0))) {
-#endif
DUMP1("caller is not yet ready to receive the result -> pending");
return 0;
}
@@ -8542,11 +8279,8 @@ invoke_queue_handler(evPtr, flags)
q->thread = (VALUE)NULL;
/* back to caller */
-#ifdef RUBY_VM
- if (RTEST(rb_funcall(thread, ID_alive_p, 0, 0))) {
-#else
+ /* if (RTEST(rb_funcall(thread, ID_alive_p, 0, 0))) { */
if (RTEST(rb_thread_alive_p(thread))) {
-#endif
DUMP2("back to caller (caller thread:%lx)", thread);
DUMP2(" (current thread:%lx)", rb_thread_current());
#if CONTROL_BY_STATUS_OF_RB_THREAD_WAITING_FOR_VALUE
@@ -8576,7 +8310,7 @@ ip_invoke_with_position(argc, argv, obj, position)
Tcl_QueuePosition position;
{
struct invoke_queue *ivq;
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
struct tcltkip *ptr;
#endif
int *alloc_done;
@@ -8585,7 +8319,6 @@ ip_invoke_with_position(argc, argv, obj, position)
volatile VALUE ip_obj = obj;
volatile VALUE result;
volatile VALUE ret;
- struct timeval t;
#if TCL_MAJOR_VERSION >= 8
Tcl_Obj **av = (Tcl_Obj **)NULL;
@@ -8597,17 +8330,15 @@ ip_invoke_with_position(argc, argv, obj, position)
rb_raise(rb_eArgError, "command name missing");
}
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
ptr = get_ip(ip_obj);
- DUMP2("invoke status: ptr->tk_thread_id %p", ptr->tk_thread_id);
- DUMP2("invoke status: Tcl_GetCurrentThread %p", Tcl_GetCurrentThread());
-#else
- DUMP2("status: Tcl_GetCurrentThread %p", Tcl_GetCurrentThread());
+ DUMP2("status: ptr->tk_thread_id %d", ptr->tk_thread_id);
#endif
+ DUMP2("status: Tcl_GetCurrentThread %d", Tcl_GetCurrentThread());
DUMP2("status: eventloopt_thread %lx", eventloop_thread);
if (
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
(ptr->tk_thread_id == 0 || ptr->tk_thread_id == Tcl_GetCurrentThread())
&&
#endif
@@ -8663,7 +8394,7 @@ ip_invoke_with_position(argc, argv, obj, position)
/* add the handler to Tcl event queue */
DUMP1("add handler");
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
if (ptr->tk_thread_id) {
/* Tcl_ThreadQueueEvent(ptr->tk_thread_id, &(ivq->ev), position); */
Tcl_ThreadQueueEvent(ptr->tk_thread_id, (Tcl_Event*)ivq, position);
@@ -8686,25 +8417,15 @@ ip_invoke_with_position(argc, argv, obj, position)
rb_thread_critical = thr_crit_bup;
/* wait for the handler to be processed */
- t.tv_sec = 0;
- t.tv_usec = (long)((EVENT_HANDLER_TIMEOUT)*1000.0);
-
- DUMP2("ivq wait for handler (current thread:%lx)", current);
+ DUMP2("wait for handler (current thread:%lx)", current);
while(*alloc_done >= 0) {
- /* rb_thread_stop(); */
- /* rb_thread_sleep_forever(); */
- rb_thread_wait_for(t);
- DUMP2("*** ivq wakeup (current thread:%lx)", current);
- DUMP2("*** (eventloop thread:%lx)", eventloop_thread);
- if (NIL_P(eventloop_thread)) {
- DUMP1("*** ivq lost eventloop thread");
- break;
- }
+ /* rb_thread_stop(); */
+ rb_thread_sleep_forever();
}
DUMP2("back from handler (current thread:%lx)", current);
/* get result & free allocated memory */
- ret = RARRAY_PTR(result)[0];
+ ret = RARRAY(result)->ptr[0];
#if 0 /* use Tcl_EventuallyFree */
Tcl_EventuallyFree((ClientData)alloc_done, TCL_DYNAMIC); /* XXXXXXXX */
#else
@@ -8837,7 +8558,7 @@ ip_get_variable2_core(interp, argc, argv)
Tcl_IncrRefCount(ret);
strval = get_str_from_obj(ret);
- RbTk_OBJ_UNTRUST(strval);
+ OBJ_TAINT(strval);
Tcl_DecrRefCount(ret);
/* Tcl_Release(ptr->ip); */
@@ -8976,7 +8697,7 @@ ip_set_variable2_core(interp, argc, argv)
Tcl_IncrRefCount(ret);
strval = get_str_from_obj(ret);
- RbTk_OBJ_UNTRUST(strval);
+ OBJ_TAINT(strval);
Tcl_DecrRefCount(ret);
/* Tcl_Release(ptr->ip); */
@@ -9199,7 +8920,7 @@ lib_split_tklist_core(ip_obj, list_str)
volatile VALUE ary, elem;
int idx;
int taint_flag = OBJ_TAINTED(list_str);
-#ifdef HAVE_RUBY_ENCODING_H
+#ifdef RUBY_VM
int list_enc_idx;
volatile VALUE list_ivar_enc;
#endif
@@ -9217,7 +8938,7 @@ lib_split_tklist_core(ip_obj, list_str)
}
StringValue(list_str);
-#ifdef HAVE_RUBY_ENCODING_H
+#ifdef RUBY_VM
list_enc_idx = rb_enc_get_index(list_str);
list_ivar_enc = rb_ivar_get(list_str, ID_at_enc);
#endif
@@ -9253,15 +8974,13 @@ lib_split_tklist_core(ip_obj, list_str)
rb_thread_critical = Qtrue;
ary = rb_ary_new2(objc);
- if (taint_flag) RbTk_OBJ_UNTRUST(ary);
+ if (taint_flag) OBJ_TAINT(ary);
old_gc = rb_gc_disable();
for(idx = 0; idx < objc; idx++) {
elem = get_str_from_obj(objv[idx]);
- if (taint_flag) RbTk_OBJ_UNTRUST(elem);
-
-#ifdef HAVE_RUBY_ENCODING_H
+#ifdef RUBY_VM
if (rb_enc_get_index(elem) == ENCODING_INDEX_BINARY) {
rb_enc_associate_index(elem, ENCODING_INDEX_BINARY);
rb_ivar_set(elem, ID_at_enc, ENCODING_NAME_BINARY);
@@ -9270,6 +8989,7 @@ lib_split_tklist_core(ip_obj, list_str)
rb_ivar_set(elem, ID_at_enc, list_ivar_enc);
}
#endif
+ if (taint_flag) OBJ_TAINT(elem);
/* RARRAY(ary)->ptr[idx] = elem; */
rb_ary_push(ary, elem);
}
@@ -9301,7 +9021,7 @@ lib_split_tklist_core(ip_obj, list_str)
}
ary = rb_ary_new2(argc);
- if (taint_flag) RbTk_OBJ_UNTRUST(ary);
+ if (taint_flag) OBJ_TAINT(ary);
old_gc = rb_gc_disable();
@@ -9421,7 +9141,7 @@ lib_merge_tklist(argc, argv, obj)
/* create object */
str = rb_str_new(result, dst - result - 1);
- if (taint_flag) RbTk_OBJ_UNTRUST(str);
+ if (taint_flag) OBJ_TAINT(str);
#if 0 /* use Tcl_EventuallyFree */
Tcl_EventuallyFree((ClientData)result, TCL_DYNAMIC); /* XXXXXXXX */
#else
@@ -9469,7 +9189,7 @@ lib_conv_listelement(self, src)
#endif
rb_str_resize(dst, len);
- if (taint_flag) RbTk_OBJ_UNTRUST(dst);
+ if (taint_flag) OBJ_TAINT(dst);
rb_thread_critical = thr_crit_bup;
@@ -9480,30 +9200,28 @@ static VALUE
lib_getversion(self)
VALUE self;
{
- set_tcltk_version();
-
- return rb_ary_new3(4, INT2NUM(tcltk_version.major),
- INT2NUM(tcltk_version.minor),
- INT2NUM(tcltk_version.type),
- INT2NUM(tcltk_version.patchlevel));
-}
+ volatile VALUE type_name;
-static VALUE
-lib_get_reltype_name(self)
- VALUE self;
-{
set_tcltk_version();
switch(tcltk_version.type) {
case TCL_ALPHA_RELEASE:
- return rb_str_new2("alpha");
+ type_name = rb_str_new2("alpha");
+ break;
case TCL_BETA_RELEASE:
- return rb_str_new2("beta");
+ type_name = rb_str_new2("beta");
+ break;
case TCL_FINAL_RELEASE:
- return rb_str_new2("final");
+ type_name = rb_str_new2("final");
+ break;
default:
- rb_raise(rb_eRuntimeError, "tcltklib has invalid release type number");
+ type_name = rb_str_new2("unknown");
}
+
+ return rb_ary_new3(5, INT2NUM(tcltk_version.major),
+ INT2NUM(tcltk_version.minor),
+ INT2NUM(tcltk_version.type), type_name,
+ INT2NUM(tcltk_version.patchlevel));
}
@@ -9578,7 +9296,7 @@ create_dummy_encoding_for_tk_core(interp, name, error_mode)
VALUE name;
VALUE error_mode;
{
- get_ip(interp);
+ struct tcltkip *ptr = get_ip(interp);
rb_secure(4);
@@ -9595,7 +9313,7 @@ create_dummy_encoding_for_tk_core(interp, name, error_mode)
}
#endif
-#ifdef HAVE_RUBY_ENCODING_H
+#ifdef RUBY_VM
if (RTEST(rb_define_dummy_encoding(RSTRING_PTR(name)))) {
int idx = rb_enc_find_index(StringValueCStr(name));
return rb_enc_from_encoding(rb_enc_from_index(idx));
@@ -9620,7 +9338,7 @@ create_dummy_encoding_for_tk(interp, name)
}
-#ifdef HAVE_RUBY_ENCODING_H
+#ifdef RUBY_VM
static int
update_encoding_table(table, interp, error_mode)
VALUE table;
@@ -9706,22 +9424,14 @@ encoding_table_get_name_core(table, enc_arg, error_mode)
enc = rb_funcall(interp, ID_encoding_name, 0, 0);
}
}
- /* 2nd: Encoding.default_internal */
- if (NIL_P(enc)) {
- enc = rb_enc_default_internal();
- }
- /* 3rd: encoding system of Tcl/Tk */
+ /* 2nd: encoding system of Tcl/Tk */
if (NIL_P(enc)) {
enc = rb_str_new2(Tcl_GetEncodingName((Tcl_Encoding)NULL));
}
- /* 4th: Encoding.default_external */
+ /* 3rd: Encoding.default_external */
if (NIL_P(enc)) {
enc = rb_enc_default_external();
}
- /* 5th: Encoding.locale_charmap */
- if (NIL_P(enc)) {
- enc = rb_locale_charmap(rb_cEncoding);
- }
if (RTEST(rb_obj_is_kind_of(enc, cRubyEncoding))) {
/* Ruby's Encoding object */
@@ -9802,7 +9512,7 @@ encoding_table_get_obj_core(table, enc, error_mode)
}
}
-#else /* ! HAVE_RUBY_ENCODING_H */
+#else /* ! RUBY_VM */
#if TCL_MAJOR_VERSION > 8 || (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION >= 1)
static int
update_encoding_table(table, interp, error_mode)
@@ -9812,10 +9522,11 @@ update_encoding_table(table, interp, error_mode)
{
struct tcltkip *ptr;
int retry = 0;
- int i, objc;
+ int i, idx, objc;
Tcl_Obj **objv;
Tcl_Obj *enc_list;
volatile VALUE encname = Qnil;
+ volatile VALUE encobj = Qnil;
/* interpreter check */
if (NIL_P(interp)) return 0;
@@ -9857,6 +9568,7 @@ encoding_table_get_name_core(table, enc, error_mode)
VALUE error_mode;
{
volatile VALUE name = Qnil;
+ int retry = 0;
enc = rb_funcall(enc, ID_to_s, 0, 0);
name = rb_hash_lookup(table, enc);
@@ -9927,10 +9639,9 @@ encoding_table_get_obj(table, enc)
return encoding_table_get_obj_core(table, enc, Qtrue);
}
-#ifdef HAVE_RUBY_ENCODING_H
+#ifdef RUBY_VM
static VALUE
-create_encoding_table_core(arg, interp)
- VALUE arg;
+create_encoding_table(interp)
VALUE interp;
{
struct tcltkip *ptr = get_ip(interp);
@@ -9941,11 +9652,7 @@ create_encoding_table_core(arg, interp)
Tcl_Obj **objv;
Tcl_Obj *enc_list;
-#ifdef HAVE_RB_SET_SAFE_LEVEL_FORCE
- rb_set_safe_level_force(0);
-#else
- rb_set_safe_level(0);
-#endif
+ rb_secure(4);
/* set 'binary' encoding */
encobj = rb_enc_from_encoding(rb_enc_from_index(ENCODING_INDEX_BINARY));
@@ -10022,11 +9729,10 @@ create_encoding_table_core(arg, interp)
return table;
}
-#else /* ! HAVE_RUBY_ENCODING_H */
+#else /* ! RUBY_VM */
#if TCL_MAJOR_VERSION > 8 || (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION >= 1)
static VALUE
-create_encoding_table_core(arg, interp)
- VALUE arg;
+create_encoding_table(interp)
VALUE interp;
{
struct tcltkip *ptr = get_ip(interp);
@@ -10067,8 +9773,7 @@ create_encoding_table_core(arg, interp)
#else /* Tcl/Tk 7.x or 8.0 */
static VALUE
-create_encoding_table_core(arg, interp)
- VALUE arg;
+create_encoding_table(interp)
VALUE interp;
{
volatile VALUE table = rb_hash_new();
@@ -10080,14 +9785,6 @@ create_encoding_table_core(arg, interp)
#endif
static VALUE
-create_encoding_table(interp)
- VALUE interp;
-{
- return rb_funcall(rb_proc_new(create_encoding_table_core, interp),
- ID_call, 0);
-}
-
-static VALUE
ip_get_encoding_table(interp)
VALUE interp;
{
@@ -10265,9 +9962,9 @@ Init_tcltklib()
/* --------------------------------------------------------------- */
-#ifdef HAVE_RUBY_ENCODING_H
+#ifdef RUBY_VM
rb_global_variable(&cRubyEncoding);
- cRubyEncoding = rb_path2class("Encoding");
+ cRubyEncoding = rb_const_get(rb_cObject, rb_intern("Encoding"));
ENCODING_INDEX_UTF8 = rb_enc_to_index(rb_utf8_encoding());
ENCODING_INDEX_BINARY = rb_enc_find_index("binary");
@@ -10303,24 +10000,6 @@ Init_tcltklib()
/* --------------------------------------------------------------- */
-#ifdef __WIN32__
-#define TK_WINDOWING_SYSTEM "win32"
-#else
-#ifdef MAC_TCL
-#define TK_WINDOWING_SYSTEM "classic"
-#else
-#ifdef MAC_OSX_TK
-#define TK_WINDOWING_SYSTEM "aqua"
-#else
-#define TK_WINDOWING_SYSTEM "x11"
-#endif
-#endif
-#endif
- rb_define_const(lib, "WINDOWING_SYSTEM",
- rb_obj_freeze(rb_str_new2(TK_WINDOWING_SYSTEM)));
-
- /* --------------------------------------------------------------- */
-
rb_define_const(ev_flag, "NONE", INT2FIX(0));
rb_define_const(ev_flag, "WINDOW", INT2FIX(TCL_WINDOW_EVENTS));
rb_define_const(ev_flag, "FILE", INT2FIX(TCL_FILE_EVENTS));
@@ -10350,8 +10029,6 @@ Init_tcltklib()
/* --------------------------------------------------------------- */
rb_define_module_function(lib, "get_version", lib_getversion, -1);
- rb_define_module_function(lib, "get_release_type_name",
- lib_get_reltype_name, -1);
rb_define_const(release_type, "ALPHA", INT2FIX(TCL_ALPHA_RELEASE));
rb_define_const(release_type, "BETA", INT2FIX(TCL_BETA_RELEASE));
@@ -10466,8 +10143,6 @@ Init_tcltklib()
rb_define_method(ip, "has_mainwindow?", ip_has_mainwindow_p, 0);
rb_define_method(ip, "invalid_namespace?", ip_has_invalid_namespace_p, 0);
rb_define_method(ip, "_eval", ip_eval, 1);
- rb_define_method(ip, "_cancel_eval", ip_cancel_eval, -1);
- rb_define_method(ip, "_cancel_eval_unwind", ip_cancel_eval_unwind, -1);
rb_define_method(ip, "_toUTF8", ip_toUTF8, -1);
rb_define_method(ip, "_fromUTF8", ip_fromUTF8, -1);
rb_define_method(ip, "_thread_vwait", ip_thread_vwait, 1);
@@ -10530,13 +10205,12 @@ Init_tcltklib()
/* --------------------------------------------------------------- */
eventloop_thread = Qnil;
- eventloop_interp = (Tcl_Interp*)NULL;
#ifndef DEFAULT_EVENTLOOP_DEPTH
#define DEFAULT_EVENTLOOP_DEPTH 7
#endif
eventloop_stack = rb_ary_new2(DEFAULT_EVENTLOOP_DEPTH);
- RbTk_OBJ_UNTRUST(eventloop_stack);
+ OBJ_TAINT(eventloop_stack);
watchdog_thread = Qnil;
@@ -10544,10 +10218,12 @@ Init_tcltklib()
/* --------------------------------------------------------------- */
-#ifdef HAVE_NATIVETHREAD
/* if ruby->nativethread-supprt and tcltklib->doen't,
the following will cause link-error. */
+#ifdef RUBY_VM
ruby_native_thread_p();
+#else
+ is_ruby_native_thread();
#endif
/* --------------------------------------------------------------- */
@@ -10577,8 +10253,6 @@ Init_tcltklib()
Tcl_ObjType_String = Tcl_GetObjType(Tcl_ObjTypeName_String);
/* --------------------------------------------------------------- */
-
- (void)call_original_exit;
}
/* eof */
diff --git a/ext/tk/tkutil/extconf.rb b/ext/tk/tkutil/extconf.rb
index 57de973c0a..015bc3a45e 100644
--- a/ext/tk/tkutil/extconf.rb
+++ b/ext/tk/tkutil/extconf.rb
@@ -7,12 +7,7 @@ end
if has_tk
require 'mkmf'
-
have_func("rb_obj_instance_exec", "ruby.h")
- have_func("rb_obj_untrust", "ruby.h")
- have_func("rb_obj_taint", "ruby.h")
- have_func("rb_sym_to_s", "ruby.h")
have_func("strndup", "string.h")
-
create_makefile('tkutil')
end
diff --git a/ext/tk/tkutil/tkutil.c b/ext/tk/tkutil/tkutil.c
index 25011bb473..00d719143b 100644
--- a/ext/tk/tkutil/tkutil.c
+++ b/ext/tk/tkutil/tkutil.c
@@ -7,19 +7,18 @@
************************************************/
-#define TKUTIL_RELEASE_DATE "2009-07-12"
+#define TKUTIL_RELEASE_DATE "2008-05-23"
#include "ruby.h"
-#ifdef RUBY_VM
-static VALUE rb_thread_critical; /* dummy */
-#else
-/* On Ruby 1.8.x, use rb_thread_critical (defined at rubysig.h) */
-#include "rubysig.h"
-#endif
-#ifdef HAVE_RUBY_ST_H
+#ifdef RUBY_VM /* Ruby 1.9 */
+/* #include "ruby/ruby.h" */
+#include "ruby/signal.h"
#include "ruby/st.h"
#else
+/* #include "ruby.h" */
+#include "rubysig.h"
+#include "version.h"
#include "st.h"
#endif
@@ -60,9 +59,6 @@ static unsigned long CALLBACK_ID_NUM = 0;
/*************************************/
-#if defined(HAVE_RB_OBJ_INSTANCE_EXEC) && !defined(RUBY_VM)
-extern VALUE rb_obj_instance_exec _((int, VALUE*, VALUE));
-#endif
static VALUE
tk_s_new(argc, argv, klass)
int argc;
@@ -87,34 +83,12 @@ static VALUE
tkNone_to_s(self)
VALUE self;
{
- return rb_str_new2("");
-}
-
-static VALUE
-tkNone_inspect(self)
- VALUE self;
-{
return rb_str_new2("None");
}
/*************************************/
static VALUE
-tk_obj_untrust(self, obj)
- VALUE self;
- VALUE obj;
-{
-#ifdef HAVE_RB_OBJ_TAINT
- rb_obj_taint(obj);
-#endif
-#ifdef HAVE_RB_OBJ_UNTRUST
- rb_obj_untrust(obj);
-#endif
-
- return obj;
-}
-
-static VALUE
tk_eval_cmd(argc, argv, self)
int argc;
VALUE argv[];
@@ -143,8 +117,8 @@ tk_do_callback(argc, argv, self)
ID_call, argc - 1, argv + 1);
}
-static const char cmd_id_head[] = "ruby_cmd TkUtil callback ";
-static const char cmd_id_prefix[] = "cmd";
+static char *cmd_id_head = "ruby_cmd TkUtil callback ";
+static char *cmd_id_prefix = "cmd";
static VALUE
tk_install_cmd_core(cmd)
@@ -231,7 +205,6 @@ fromDefaultEnc_toUTF8(str, self)
return tk_toUTF8(1, argv, self);
}
-#if 0
static VALUE
fromUTF8_toDefaultEnc(str, self)
VALUE str;
@@ -242,7 +215,6 @@ fromUTF8_toDefaultEnc(str, self)
argv[0] = str;
return tk_fromUTF8(1, argv, self);
}
-#endif
static int
to_strkey(key, value, hash)
@@ -819,7 +791,7 @@ get_eval_string_core(obj, enc_flag, self)
return fromDefaultEnc_toUTF8(rb_str_new2(rb_id2name(SYM2ID(obj))), self);
}
} else {
-#ifdef HAVE_RB_SYM_TO_S
+#ifdef RUBY_VM
return rb_sym_to_s(obj);
#else
return rb_str_new2(rb_id2name(SYM2ID(obj)));
@@ -996,14 +968,12 @@ tcl2rb_bool(self, value)
}
}
-#if 0
static VALUE
tkstr_to_dec(value)
VALUE value;
{
return rb_cstr_to_inum(RSTRING_PTR(value), 10, 1);
}
-#endif
static VALUE
tkstr_to_int(value)
@@ -1100,18 +1070,6 @@ tcl2rb_num_or_str(self, value)
rb_eArgError, 0);
}
-static VALUE
-tcl2rb_num_or_nil(self, value)
- VALUE self;
- VALUE value;
-{
- rb_check_type(value, T_STRING);
-
- if (RSTRING_LEN(value) == 0) return Qnil;
-
- return tkstr_to_number(value);
-}
-
/*************************************/
@@ -1119,8 +1077,8 @@ tcl2rb_num_or_nil(self, value)
struct cbsubst_info {
int full_subst_length;
int keylen[CBSUBST_TBL_MAX];
- char *key[CBSUBST_TBL_MAX];
- char type[CBSUBST_TBL_MAX];
+ unsigned char *key[CBSUBST_TBL_MAX];
+ unsigned char type[CBSUBST_TBL_MAX];
ID ivar[CBSUBST_TBL_MAX];
VALUE proc;
VALUE aliases;
@@ -1142,9 +1100,9 @@ subst_free(ptr)
if (ptr) {
for(i = 0; i < CBSUBST_TBL_MAX; i++) {
- if (ptr->key[i] != NULL) {
+ if (ptr->key[i] != (unsigned char *)NULL) {
free(ptr->key[i]);
- ptr->key[i] = NULL;
+ ptr->key[i] = (unsigned char *)NULL;
}
}
free(ptr);
@@ -1164,7 +1122,7 @@ allocate_cbsubst_info()
for(idx = 0; idx < CBSUBST_TBL_MAX; idx++) {
inf->keylen[idx] = 0;
- inf->key[idx] = NULL;
+ inf->key[idx] = (unsigned char *) NULL;
inf->type[idx] = '\0';
inf->ivar[idx] = (ID) 0;
}
@@ -1282,7 +1240,7 @@ cbsubst_sym_to_subst(self, sym)
{
struct cbsubst_info *inf;
const char *str;
- char *buf, *ptr;
+ unsigned char *buf, *ptr;
int idx, len;
ID id;
volatile VALUE ret;
@@ -1315,7 +1273,7 @@ cbsubst_sym_to_subst(self, sym)
ptr += len;
} else {
/* single char */
- *(ptr++) = (unsigned char)idx;
+ *(ptr++) = idx;
}
*(ptr++) = ' ';
@@ -1336,7 +1294,7 @@ cbsubst_get_subst_arg(argc, argv, self)
{
struct cbsubst_info *inf;
const char *str;
- char *buf, *ptr;
+ unsigned char *buf, *ptr;
int i, idx, len;
ID id;
volatile VALUE arg_sym, ret;
@@ -1381,7 +1339,7 @@ cbsubst_get_subst_arg(argc, argv, self)
ptr += len;
} else {
/* single char */
- *(ptr++) = (unsigned char)idx;
+ *(ptr++) = idx;
}
*(ptr++) = ' ';
@@ -1406,7 +1364,7 @@ cbsubst_get_subst_key(self, str)
volatile VALUE ret;
VALUE keyval;
int i, len, keylen, idx;
- char *buf, *ptr, *key;
+ unsigned char *buf, *ptr, *key;
list = rb_funcall(cTclTkLib, ID_split_tklist, 1, str);
len = RARRAY_LEN(list);
@@ -1414,11 +1372,11 @@ cbsubst_get_subst_key(self, str)
Data_Get_Struct(rb_const_get(self, ID_SUBST_INFO),
struct cbsubst_info, inf);
- ptr = buf = ALLOC_N(char, inf->full_subst_length + len + 1);
+ ptr = buf = ALLOC_N(unsigned char, inf->full_subst_length + len + 1);
for(i = 0; i < len; i++) {
keyval = RARRAY_PTR(list)[i];
- key = RSTRING_PTR(keyval);
+ key = (unsigned char*)RSTRING_PTR(keyval);
if (*key == '%') {
if (*(key + 2) == '\0') {
/* single char */
@@ -1428,7 +1386,7 @@ cbsubst_get_subst_key(self, str)
keylen = RSTRING_LEN(keyval) - 1;
for(idx = 0; idx < CBSUBST_TBL_MAX; idx++) {
if (inf->keylen[idx] != keylen) continue;
- if ((unsigned char)inf->key[idx][0] != (unsigned char)*(key + 1)) continue;
+ if (inf->key[idx][0] != *(key + 1)) continue;
if (strncmp(inf->key[idx], key + 1, keylen)) continue;
break;
}
@@ -1444,7 +1402,7 @@ cbsubst_get_subst_key(self, str)
}
*ptr = '\0';
- ret = rb_str_new2(buf);
+ ret = rb_str_new2((const char*)buf);
free(buf);
return ret;
}
@@ -1454,16 +1412,16 @@ cbsubst_get_all_subst_keys(self)
VALUE self;
{
struct cbsubst_info *inf;
- char *buf, *ptr;
- char *keys_buf, *keys_ptr;
+ unsigned char *buf, *ptr;
+ unsigned char *keys_buf, *keys_ptr;
int idx, len;
volatile VALUE ret;
Data_Get_Struct(rb_const_get(self, ID_SUBST_INFO),
struct cbsubst_info, inf);
- ptr = buf = ALLOC_N(char, inf->full_subst_length + 1);
- keys_ptr = keys_buf = ALLOC_N(char, CBSUBST_TBL_MAX + 1);
+ ptr = buf = ALLOC_N(unsigned char, inf->full_subst_length + 1);
+ keys_ptr = keys_buf = ALLOC_N(unsigned char, CBSUBST_TBL_MAX + 1);
for(idx = 0; idx < CBSUBST_TBL_MAX; idx++) {
if (inf->ivar[idx] == (ID) 0) continue;
@@ -1487,7 +1445,7 @@ cbsubst_get_all_subst_keys(self)
*ptr = '\0';
*keys_ptr = '\0';
- ret = rb_ary_new3(2, rb_str_new2(keys_buf), rb_str_new2(buf));
+ ret = rb_ary_new3(2, rb_str_new2(keys_buf), rb_str_new2((const char*)buf));
free(buf);
free(keys_buf);
@@ -1795,7 +1753,7 @@ Init_tkutil()
TK_None = rb_obj_alloc(rb_cObject);
rb_define_const(mTK, "None", TK_None);
rb_define_singleton_method(TK_None, "to_s", tkNone_to_s, 0);
- rb_define_singleton_method(TK_None, "inspect", tkNone_inspect, 0);
+ rb_define_singleton_method(TK_None, "inspect", tkNone_to_s, 0);
OBJ_FREEZE(TK_None);
/* --------------------- */
@@ -1803,8 +1761,6 @@ Init_tkutil()
CALLBACK_TABLE = rb_hash_new();
/* --------------------- */
- rb_define_singleton_method(mTK, "untrust", tk_obj_untrust, 1);
-
rb_define_singleton_method(mTK, "eval_cmd", tk_eval_cmd, -1);
rb_define_singleton_method(mTK, "callback", tk_do_callback, -1);
rb_define_singleton_method(mTK, "install_cmd", tk_install_cmd, -1);
@@ -1821,7 +1777,6 @@ Init_tkutil()
rb_define_singleton_method(mTK, "number", tcl2rb_number, 1);
rb_define_singleton_method(mTK, "string", tcl2rb_string, 1);
rb_define_singleton_method(mTK, "num_or_str", tcl2rb_num_or_str, 1);
- rb_define_singleton_method(mTK, "num_or_nil", tcl2rb_num_or_nil, 1);
rb_define_method(mTK, "_toUTF8", tk_toUTF8, -1);
rb_define_method(mTK, "_fromUTF8", tk_fromUTF8, -1);
@@ -1835,7 +1790,6 @@ Init_tkutil()
rb_define_method(mTK, "number", tcl2rb_number, 1);
rb_define_method(mTK, "string", tcl2rb_string, 1);
rb_define_method(mTK, "num_or_str", tcl2rb_num_or_str, 1);
- rb_define_method(mTK, "num_or_nil", tcl2rb_num_or_nil, 1);
/* --------------------- */
rb_global_variable(&ENCODING_NAME_UTF8);
diff --git a/ext/win32ole/doc/win32ole.rd b/ext/win32ole/doc/win32ole.rd
new file mode 100644
index 0000000000..c563ce5d5b
--- /dev/null
+++ b/ext/win32ole/doc/win32ole.rd
@@ -0,0 +1,294 @@
+=begin
+= Win32OLE extension module
+
+== WIN32OLE
+=== Constants
+: VERSION
+ The version number of WIN32OLE.
+
+: ARGV
+ The argument of the method invoked recently.
+ This constant is used to get value of argument
+ when the argument is passed by reference.
+
+=== Class Method
+: connect(oleserver)
+ returns running OLE automation object or WIN32OLE object from moniker.
+
+: const_load(ole [,obj])
+ defines the constants of OLE automation
+ server as 'obj' class constants. If 'obj' omitted, the default
+ is WIN32OLE.
+
+: new(oleserver)
+ returns OLE Automation object.
+
+: ole_free(obj)
+ invokes Release method of Dispatch interface of WIN32OLE object.
+ This method should not be used because this method exists for debugging WIN32OLE.
+
+: ole_reference_count(obj)
+ returns reference counter of Dispatch interface.
+ This method should not be used because this method exists for debugging WIN32OLE.
+
+: ole_show_help(info [,helpcontext])
+ displays helpfile.
+ The first argument specifies WIN32OLE_TYPE object or WIN32OLE_METHOD object
+ or helpfile.
+
+=== Method
+: self[property]
+ gets property of OLE object.
+
+: self[property]=
+ sets property of OLE object.
+
+: _invoke(dispid, args, types)
+ runs the early binding method.
+ The dispid specifies Dispatch ID, args specifies the array of arguments,
+ types specifies array of the type of arguments.
+
+: each {...}
+ Iterates over each item of OLE collection which has IEnumVARIANT
+ interface.
+
+: invoke(method, args,...)
+ runs OLE method.
+
+: ole_func_methods
+ returns array of WIN32OLE_METHOD object which corresponds with function.
+
+: ole_get_methods
+ returns array of WIN32OLE_METHOD object which corresponds with get properties.
+
+: ole_method(method)
+ returns WIN32OLE_METHOD object which coreesponds with method
+ which specified by argument.
+
+: ole_method_help(method)
+ alias of ole_method.
+
+: ole_methods
+ returns WIN32OLE_METHOD object which coreesponds with method.
+
+: ole_obj_help
+ returns WIN32OLE_TYPE object.
+
+: ole_put_methods
+ returns array of WIN32OLE_METHOD object which corresponds with put properties.
+
+: setproperty(property, key, val)
+ set property of OLE object.
+ This method is used when the property has argument.
+
+ For example, in VB
+ obj.item("key") = val
+ in Win32OLE
+ obj.setproperty("item", "key", val)
+
+
+== WIN32OLE_EVENT class
+
+=== Class Method
+
+: new(ole, interface)
+ The new class method creates OLE event sink object to connect ole.
+ The ole must be WIN32OLE object, and interface is the interface
+ name of event.
+
+: message_loop
+ The message_loop class method translates and dispatches Windows
+ message.
+
+=== Method
+: on_event([event]){...}
+ defines the callback of event.
+ If event omitted, defines the callback of all events.
+
+: on_event_with_outargs([event]) {...}
+ defines the callback of event.
+ If you want modify argument in callback,
+
+== WIN32OLE_METHOD
+
+=== Class Methods
+: new(win32ole_type, method)
+ creates WIN32OLE_METHOD object.
+
+=== Methods
+: dispid
+ returns Dispatch ID.
+
+: event?
+ returns true if the method is event.
+
+: event_interface
+ returns interface name of event if the method is event.
+
+: helpcontext
+ returns help context.
+
+: helpfile
+ returns help file.
+
+: invkind
+ returns invkind.
+
+: invoke_kind
+ returns invoke kind string.
+
+: name
+ returns name of method.
+
+: offset_vtbl
+ returns the offset of Vtbl.
+
+: params
+ returns array of WIN32OLE_PARAM object.
+
+: return_type
+ returns string of return value type of method.
+
+: return_vtype
+ returns number of return value type of method.
+
+: return_type_detail
+ returns detail information of return value type of method.
+
+: size_params
+ returns the size of arguments.
+
+: size_opt_params
+ returns the size of optional arguments.
+
+: visible?
+ returns true if the method is public.
+
+== WIN32OLE_PARAM
+: default
+ returns default value.
+
+: input?
+ returns true if argument is input.
+
+: optional?
+ returns true if argument is optional.
+
+: output?
+ returns true if argument is output.
+
+: name
+ returns name.
+
+: ole_type
+ returns type of argument.
+
+: ole_type_detail
+ returns detail information of type of argument.
+
+: retval?
+ returns true if argument is return value.
+
+== WIN32OLE_TYPE
+=== Class Methods
+: new(typelibrary, class)
+ returns WIN32OLE_TYPE object.
+
+: ole_classes(typelibrary)
+ returns array of WIN32OLE_TYPE objects defined by Type Library.
+
+: progids
+ returns array of ProgID.
+
+: typelibs
+ returns array of type libraries.
+
+=== Methods
+: guid
+ returns GUID.
+
+: helpfile
+ returns helpfile.
+
+: helpcontext
+ returns helpcontext.
+
+: helpstring
+ returns help string.
+
+: major_version
+ returns major version.
+
+: minor_version
+ returns minor version.
+
+: name
+ returns name.
+
+: ole_methods
+ returns array of WIN32OLE_METHOD objects.
+
+: ole_type
+ returns type of class.
+
+: progid
+ returns ProgID if it exists. If not found, then returns nil.
+
+: src_type
+ returns source class when the OLE class is 'Alias'.
+
+: typekind
+ returns number which represents type.
+
+: variables
+ returns array of variables defined in OLE class.
+
+: visible?
+ returns true if the OLE class is public.
+
+== WIN32OLE_VARIABLE
+=== Methods
+: name
+ returns the name.
+
+: ole_type
+ returns type
+
+: ole_type_detail
+ returns detail information of type.
+
+: value
+ returns value.
+
+: variable_kind
+ returns variable kind string.
+
+: varkind
+ returns the number which represents variable kind.
+
+== WIN32OLE::VARIANT
+=== Constants
+ *VT_I4
+ *VT_R4
+ *VT_R8
+ *VT_CY
+ *VT_DATE
+ *VT_BSTR
+ *VT_USERDEFINED
+ *VT_PTR
+ *VT_DISPATCH
+ *VT_ERROR
+ *VT_BOOL
+ *VT_VARIANT
+ *VT_UNKNOWN
+ *VT_I1
+ *VT_UI1
+ *VT_UI2
+ *VT_UI4
+ *VT_INT
+ *VT_UINT
+ *VT_ARRAY
+ *VT_BYREF
+
+=end
+
diff --git a/ext/win32ole/extconf.rb b/ext/win32ole/extconf.rb
index b4f09fc7c0..cee922554a 100644
--- a/ext/win32ole/extconf.rb
+++ b/ext/win32ole/extconf.rb
@@ -1,6 +1,7 @@
#----------------------------------
# extconf.rb
# $Revision$
+# $Date$
#----------------------------------
require 'mkmf'
@@ -19,14 +20,11 @@ end
def create_win32ole_makefile
if have_library("ole32") and
have_library("oleaut32") and
- have_library("uuid") and
+ have_library("uuid") and
have_library("user32") and
have_library("kernel32") and
have_library("advapi32") and
have_header("windows.h")
- unless have_type("IMultiLanguage2", "mlang.h")
- have_type("IMultiLanguage", "mlang.h")
- end
create_makefile("win32ole")
create_docfile(SRCFILES)
else
@@ -34,9 +32,8 @@ def create_win32ole_makefile
end
end
-
case RUBY_PLATFORM
-when /mswin/
+when /mswin32/
$CFLAGS += ' /W3'
when /cygwin/, /mingw/
$defs << '-DNONAMELESSUNION'
diff --git a/ext/win32ole/sample/excel1.rb b/ext/win32ole/sample/excel1.rb
index c8cd38e732..e366a52839 100644
--- a/ext/win32ole/sample/excel1.rb
+++ b/ext/win32ole/sample/excel1.rb
@@ -1,33 +1,22 @@
require 'win32ole'
+#application = WIN32OLE.new('Excel.Application.5')
application = WIN32OLE.new('Excel.Application')
application.visible = TRUE
workbook = application.Workbooks.Add();
worksheet = workbook.Worksheets(1);
-
-=begin
worksheet.Range("A1:D1").value = ["North","South","East","West"];
worksheet.Range("A2:B2").value = [5.2, 10];
-
worksheet.Range("C2").value = 8;
worksheet.Range("D2").value = 20;
-=end
-
-worksheet.Range("A1:B2").value = [["North","South"],
- [5.2, 10]];
-
-vals = WIN32OLE_VARIANT.new([["East","West"],
- [8, 20]],
- WIN32OLE::VARIANT::VT_ARRAY)
-worksheet.Range("C1:D2").value = vals
range = worksheet.Range("A1:D2");
range.Select
chart = workbook.Charts.Add;
workbook.saved = TRUE;
-sleep 0.5
+
application.ActiveWorkbook.Close(0);
application.Quit();
diff --git a/ext/win32ole/sample/excel2.rb b/ext/win32ole/sample/excel2.rb
index dbe4178051..46f459b36b 100644
--- a/ext/win32ole/sample/excel2.rb
+++ b/ext/win32ole/sample/excel2.rb
@@ -9,14 +9,14 @@ excel = WIN32OLE.new("excel.application")
# Create and rotate the chart
-excel.visible = TRUE;
+excel['Visible'] = TRUE;
excel.Workbooks.Add();
-excel.Range("a1").value = 3;
-excel.Range("a2").value = 2;
-excel.Range("a3").value = 1;
+excel.Range("a1")['Value'] = 3;
+excel.Range("a2")['Value'] = 2;
+excel.Range("a3")['Value'] = 1;
excel.Range("a1:a3").Select();
excelchart = excel.Charts.Add();
-excelchart.type = ChartTypeVal;
+excelchart['Type'] = ChartTypeVal;
i = 30
i.step(180, 10) do |rot|
diff --git a/ext/win32ole/sample/ieconst.rb b/ext/win32ole/sample/ieconst.rb
index 2c6a7a383c..234272c7ed 100644
--- a/ext/win32ole/sample/ieconst.rb
+++ b/ext/win32ole/sample/ieconst.rb
@@ -20,7 +20,7 @@ end
# Remark!!! CONSTANTS has not tested enoughly!!!
# CONSTANTS is alpha release.
# If there are constants which first letter is not [a-zA-Z],
-# like a '_Foo', then maybe you can access the value by
+# like a '_Foo', then maybe you can access the value by
# using CONSTANTS['_Foo']
#------------------------------------------------------------
IE_CONST::CONSTANTS.each do |k, v|
diff --git a/ext/win32ole/sample/ienavi.rb b/ext/win32ole/sample/ienavi.rb
index 8b279ddaae..c7fa3f5ec2 100644
--- a/ext/win32ole/sample/ienavi.rb
+++ b/ext/win32ole/sample/ienavi.rb
@@ -26,7 +26,7 @@ ev = WIN32OLE_EVENT.new(ie, 'DWebBrowserEvents')
ev.on_event {|*args| default_handler(*args)}
ev.on_event("NavigateComplete") {|url| navigate(url)}
-ev.on_event("Quit") {|*args| stop_msg_loop}
+ev.on_event("Quit") {|*args| stop_msg_loop}
$LOOP = TRUE
while ($LOOP)
diff --git a/ext/win32ole/sample/ienavi2.rb b/ext/win32ole/sample/ienavi2.rb
deleted file mode 100644
index 67977e28ab..0000000000
--- a/ext/win32ole/sample/ienavi2.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-require 'win32ole'
-
-class IEHandler
- attr_reader :loop
- def initialize
- @urls = []
- @loop = true
- end
- def method_missing(event, *args)
- case event
- when "BeforeNavigate2"
- puts "Now Navigate #{args[1]}..."
- end
- end
- def onNavigateComplete2(pdisp, url)
- @urls << url
- end
- def onOnQuit
- puts "Now Stop IE..."
- @loop = false
- end
- def put_urls
- puts "You Navigated the URLs ..."
- @urls.each_with_index do |url, i|
- puts "(#{i+1}) #{url}"
- end
- end
-end
-
-ie = WIN32OLE.new('InternetExplorer.Application')
-ie.visible = true
-ie.gohome
-
-ev = WIN32OLE_EVENT.new(ie)
-ev.handler = IEHandler.new
-
-while (ev.handler.loop)
- WIN32OLE_EVENT.message_loop
-end
-ev.handler.put_urls
diff --git a/ext/win32ole/sample/oledirs.rb b/ext/win32ole/sample/oledirs.rb
index dbacc2131d..1c77e76f14 100644
--- a/ext/win32ole/sample/oledirs.rb
+++ b/ext/win32ole/sample/oledirs.rb
@@ -7,7 +7,7 @@ require "win32ole"
def listup(items)
# items.each do |i|
for i in items
- puts i.name
+ puts i.name
end
end
diff --git a/ext/win32ole/sample/olegen.rb b/ext/win32ole/sample/olegen.rb
index 4ec576ca50..48d86893fe 100644
--- a/ext/win32ole/sample/olegen.rb
+++ b/ext/win32ole/sample/olegen.rb
@@ -1,5 +1,6 @@
#-----------------------------
# olegen.rb
+# $Date$
# $Revision$
#-----------------------------
@@ -49,7 +50,7 @@ class WIN32COMGen
ts = ''
typedetails.each do |t|
case t
- when 'CARRAY', 'VOID', 'UINT', 'RESULT', 'DECIMAL', 'I8', 'UI8'
+ when 'CARRAY', 'VOID', 'UINT', 'RESULT', 'DECIMAL', 'I8', 'UI8'
# raise "Sorry type\"" + t + "\" not supported"
ts << "\"??? NOT SUPPORTED TYPE:`#{t}'\""
when 'USERDEFINED', 'Unknown Type 9'
@@ -80,7 +81,7 @@ class WIN32COMGen
generate_argtype(param.ole_type_detail)
}.join(", ")
if proptypes
- types += ", " if types.size > 0
+ types += ", " if types.size > 0
types += generate_argtype(proptypes)
end
types
@@ -97,8 +98,8 @@ class WIN32COMGen
end
def generate_method_help(method, type = nil)
- str = " # "
- if type
+ str = " # "
+ if type
str += type
else
str += method.return_type
@@ -123,7 +124,7 @@ class WIN32COMGen
def generate_method_args_help(method)
args = []
method.params.each_with_index {|param, i|
- h = " # #{param.ole_type} arg#{i} --- #{param.name}"
+ h = " # #{param.ole_type} arg#{i} --- #{param.name}"
inout = []
inout.push "IN" if param.input?
inout.push "OUT" if param.output?
@@ -166,14 +167,14 @@ class WIN32COMGen
method.visible? &&
method.size_params > 0
}.each do |method|
- types = method.return_type_detail
+ types = method.return_type_detail
io.puts "\n"
io.puts generate_method_help(method, types[0])
io.puts " def #{method.name}"
if klass.ole_type == "Class"
- io.print " OLEProperty.new(@dispatch, #{method.dispid}, ["
+ io.print " OLEProperty.new(@dispatch, #{method.dispid}, ["
else
- io.print " OLEProperty.new(self, #{method.dispid}, ["
+ io.print " OLEProperty.new(self, #{method.dispid}, ["
end
io.print generate_argtypes(method, nil)
io.print "], ["
@@ -230,7 +231,7 @@ class WIN32COMGen
v.visible? && v.variable_kind == 'CONSTANT'
}.each do |v|
io.print " "
- io.print v.name.sub(/^./){$&.upcase}
+ io.print v.name.sub(/^./){|c| c.upcase}
io.print " = "
io.puts v.value
end
@@ -320,8 +321,8 @@ STR
ole_classes(typelib).select{|klass|
klass.visible? &&
- (klass.ole_type == "Class" ||
- klass.ole_type == "Interface" ||
+ (klass.ole_type == "Class" ||
+ klass.ole_type == "Interface" ||
klass.ole_type == "Dispatch" ||
klass.ole_type == "Enum")
}.each do |klass|
@@ -329,7 +330,7 @@ STR
end
begin
@ole.quit if @ole
- rescue
+ rescue
end
end
end
diff --git a/ext/win32ole/sample/xml.rb b/ext/win32ole/sample/xml.rb
index 4b1a54dc75..b95d6d5275 100644
--- a/ext/win32ole/sample/xml.rb
+++ b/ext/win32ole/sample/xml.rb
@@ -1,11 +1,11 @@
-#
+#
# This file created by olegen.rb as following.
# ruby olegen.rb 'Microsoft XML, version 2.0' > xml.rb
-#
+#
require 'win32ole'
require 'win32ole/property'
-#
+#
module IXMLDOMImplementation
include WIN32OLE::VARIANT
attr_reader :lastargs
@@ -343,7 +343,7 @@ module OLEtagDOMNodeType
NODE_NOTATION = 12
end
-#
+#
module IXMLDOMNodeList
include WIN32OLE::VARIANT
attr_reader :lastargs
@@ -380,7 +380,7 @@ module IXMLDOMNodeList
end
end
-#
+#
module IXMLDOMNamedNodeMap
include WIN32OLE::VARIANT
attr_reader :lastargs
@@ -464,7 +464,7 @@ module IXMLDOMNamedNodeMap
end
end
-#
+#
module IXMLDOMDocument
include WIN32OLE::VARIANT
attr_reader :lastargs
@@ -1040,7 +1040,7 @@ module IXMLDOMDocument
end
end
-#
+#
module IXMLDOMDocumentType
include WIN32OLE::VARIANT
attr_reader :lastargs
@@ -1368,7 +1368,7 @@ module IXMLDOMDocumentType
end
end
-#
+#
module IXMLDOMElement
include WIN32OLE::VARIANT
attr_reader :lastargs
@@ -1752,7 +1752,7 @@ module IXMLDOMElement
end
end
-#
+#
module IXMLDOMAttribute
include WIN32OLE::VARIANT
attr_reader :lastargs
@@ -2080,7 +2080,7 @@ module IXMLDOMAttribute
end
end
-#
+#
module IXMLDOMDocumentFragment
include WIN32OLE::VARIANT
attr_reader :lastargs
@@ -2384,7 +2384,7 @@ module IXMLDOMDocumentFragment
end
end
-#
+#
module IXMLDOMText
include WIN32OLE::VARIANT
attr_reader :lastargs
@@ -2771,7 +2771,7 @@ module IXMLDOMText
end
end
-#
+#
module IXMLDOMCharacterData
include WIN32OLE::VARIANT
attr_reader :lastargs
@@ -3149,7 +3149,7 @@ module IXMLDOMCharacterData
end
end
-#
+#
module IXMLDOMComment
include WIN32OLE::VARIANT
attr_reader :lastargs
@@ -3527,7 +3527,7 @@ module IXMLDOMComment
end
end
-#
+#
module IXMLDOMCDATASection
include WIN32OLE::VARIANT
attr_reader :lastargs
@@ -3914,7 +3914,7 @@ module IXMLDOMCDATASection
end
end
-#
+#
module IXMLDOMProcessingInstruction
include WIN32OLE::VARIANT
attr_reader :lastargs
@@ -4242,7 +4242,7 @@ module IXMLDOMProcessingInstruction
end
end
-#
+#
module IXMLDOMEntityReference
include WIN32OLE::VARIANT
attr_reader :lastargs
@@ -4608,7 +4608,7 @@ module IXMLDOMParseError
end
end
-#
+#
module IXMLDOMNotation
include WIN32OLE::VARIANT
attr_reader :lastargs
@@ -4928,7 +4928,7 @@ module IXMLDOMNotation
end
end
-#
+#
module IXMLDOMEntity
include WIN32OLE::VARIANT
attr_reader :lastargs
diff --git a/ext/win32ole/tests/oleserver.rb b/ext/win32ole/tests/oleserver.rb
new file mode 100644
index 0000000000..bf721373e5
--- /dev/null
+++ b/ext/win32ole/tests/oleserver.rb
@@ -0,0 +1,10 @@
+require 'win32ole'
+def oletypelib_name(pat)
+ WIN32OLE_TYPE.typelibs.each do |lib|
+ return lib if pat =~ lib
+ end
+end
+module OLESERVER
+ MS_EXCEL_TYPELIB = oletypelib_name(/^Microsoft Excel .* Object Library$/)
+ MS_XML_TYPELIB = oletypelib_name(/^Microsoft XML/)
+end
diff --git a/ext/win32ole/tests/testNIL2VTEMPTY.rb b/ext/win32ole/tests/testNIL2VTEMPTY.rb
new file mode 100644
index 0000000000..555d35fbf3
--- /dev/null
+++ b/ext/win32ole/tests/testNIL2VTEMPTY.rb
@@ -0,0 +1,28 @@
+# This is test script to check that WIN32OLE should convert nil to VT_EMPTY in second try.
+# [ruby-talk:137054]
+
+require 'win32ole'
+require 'test/unit'
+
+class TestNIL2VT_EMPTY < Test::Unit::TestCase
+ def setup
+ fs = WIN32OLE.new('Scripting.FileSystemObject')
+ @path = fs.GetFolder(".").path
+ end
+ def test_openSchema
+ con = nil
+ begin
+ con = WIN32OLE.new('ADODB.Connection')
+ con.connectionString = "Provider=MSDASQL;Extended Properties="
+ con.connectionString +="\"DRIVER={Microsoft Text Driver (*.txt; *.csv)};DBQ=#{@path}\""
+ con.open
+ rescue
+ con = nil
+ end
+ if con
+ rs = con.openSchema(4, [nil,nil,"DUMMY", "TABLE"])
+ assert(rs)
+ end
+ end
+end
+
diff --git a/ext/win32ole/tests/testOLEEVENT.rb b/ext/win32ole/tests/testOLEEVENT.rb
new file mode 100644
index 0000000000..0901158642
--- /dev/null
+++ b/ext/win32ole/tests/testOLEEVENT.rb
@@ -0,0 +1,91 @@
+require 'rubyunit'
+require 'win32ole'
+
+class TestWIN32OLE_EVENT < RUNIT::TestCase
+ def setup
+ @excel = WIN32OLE.new("Excel.Application")
+ @excel.visible = true
+ @event = ""
+ @event2 = ""
+ end
+ def test_on_event
+ book = @excel.workbooks.Add
+ value = ""
+ begin
+ ev = WIN32OLE_EVENT.new(book, 'WorkbookEvents')
+ ev.on_event('SheetChange'){|arg1, arg2|
+ begin
+ value = arg1.value
+ rescue
+ value = $!.message
+ end
+ }
+ book.Worksheets(1).Range("A1").value = "OK"
+ ensure
+ book.saved = true
+ end
+ assert_equal("OK", value)
+ end
+
+ def handler1
+ @event += "handler1"
+ end
+ def handler2
+ @event += "handler2"
+ end
+
+ def handler3
+ @event += "handler3"
+ end
+
+ def test_on_event2
+ book = @excel.workbooks.Add
+ begin
+ ev = WIN32OLE_EVENT.new(book, 'WorkbookEvents')
+ ev.on_event('SheetChange'){|arg1, arg2|
+ handler1
+ }
+ ev.on_event('SheetChange'){|arg1, arg2|
+ handler2
+ }
+ book.Worksheets(1).Range("A1").value = "OK"
+ ensure
+ book.saved = true
+ end
+ assert_equal("handler2", @event)
+ end
+
+ def test_on_event3
+ book = @excel.workbooks.Add
+ begin
+ ev = WIN32OLE_EVENT.new(book, 'WorkbookEvents')
+ ev.on_event{ handler1 }
+ ev.on_event{ handler2 }
+ book.Worksheets(1).Range("A1").value = "OK"
+ ensure
+ book.saved = true
+ end
+ assert_equal("handler2", @event)
+ end
+
+ def test_on_event4
+ book = @excel.workbooks.Add
+ begin
+ ev = WIN32OLE_EVENT.new(book, 'WorkbookEvents')
+ ev.on_event{ handler1 }
+ ev.on_event{ handler2 }
+ ev.on_event('SheetChange'){|arg1, arg2| handler3 }
+ book.Worksheets(1).Range("A1").value = "OK"
+ ensure
+ book.saved = true
+ end
+ assert_equal("handler3", @event)
+ end
+
+ def teardown
+ @excel.quit
+ @excel = nil
+ GC.start
+ end
+end
+
diff --git a/ext/win32ole/tests/testOLEMETHOD.rb b/ext/win32ole/tests/testOLEMETHOD.rb
new file mode 100644
index 0000000000..390c9999f8
--- /dev/null
+++ b/ext/win32ole/tests/testOLEMETHOD.rb
@@ -0,0 +1,92 @@
+# You need RubyUnit and MS Excel and MSI to run this test script
+
+require 'rubyunit'
+
+require 'win32ole'
+require 'oleserver'
+
+class TestOLEMETHOD < RUNIT::TestCase
+ include OLESERVER
+ def setup
+ @excel_app = WIN32OLE_TYPE.new(MS_EXCEL_TYPELIB, 'Application')
+ end
+ def test_s_new
+ m = WIN32OLE_METHOD.new(@excel_app, 'Quit')
+ assert_instance_of(WIN32OLE_METHOD, m)
+ m = WIN32OLE_METHOD.new(@excel_app, 'WorkbookOpen')
+ assert_instance_of(WIN32OLE_METHOD, m)
+ m = WIN32OLE_METHOD.new(@excel_app, 'workbookopen')
+ assert_instance_of(WIN32OLE_METHOD, m)
+ end
+ def test_name
+ m = WIN32OLE_METHOD.new(@excel_app, 'Quit')
+ assert_equal('Quit', m.name)
+ end
+ def test_to_s
+ m = WIN32OLE_METHOD.new(@excel_app, 'Quit')
+ assert_equal('Quit', "#{m}")
+ end
+ def test_return_type
+ m = WIN32OLE_METHOD.new(@excel_app, 'ActiveCell')
+ assert_equal('Range', m.return_type)
+ m = WIN32OLE_METHOD.new(@excel_app, 'ActivePrinter')
+ assert_equal('BSTR', m.return_type)
+ end
+ def test_return_vtype
+ m = WIN32OLE_METHOD.new(@excel_app, 'ActiveCell')
+ assert_equal(WIN32OLE::VARIANT::VT_PTR, m.return_vtype)
+ m = WIN32OLE_METHOD.new(@excel_app, 'ActivePrinter')
+ assert_equal(WIN32OLE::VARIANT::VT_BSTR, m.return_vtype)
+ end
+ def test_return_type_detail
+ m = WIN32OLE_METHOD.new(@excel_app, 'ActiveCell')
+ assert_equal(['PTR', 'USERDEFINED', 'Range'], m.return_type_detail)
+ m = WIN32OLE_METHOD.new(@excel_app, 'ActivePrinter')
+ assert_equal(['BSTR'], m.return_type_detail)
+ end
+
+ def test_invoke_kind
+ m = WIN32OLE_METHOD.new(@excel_app, 'ActiveCell')
+ assert_equal('PROPERTYGET', m.invoke_kind)
+ end
+ def test_visible
+ m = WIN32OLE_METHOD.new(@excel_app, 'ActiveCell')
+ assert(m.visible?)
+ m = WIN32OLE_METHOD.new(@excel_app, 'AddRef')
+ assert(!m.visible?)
+ end
+ def test_event
+ m = WIN32OLE_METHOD.new(@excel_app, 'WorkbookOpen')
+ assert(m.event?)
+ m = WIN32OLE_METHOD.new(@excel_app, 'ActiveCell')
+ assert(!m.event?)
+ end
+ def test_event_interface
+ m = WIN32OLE_METHOD.new(@excel_app, 'WorkbookOpen')
+ assert_equal('AppEvents', m.event_interface)
+ m = WIN32OLE_METHOD.new(@excel_app, 'ActiveCell')
+ assert_nil(m.event_interface)
+ end
+ def test_helpstring
+ domdoc = WIN32OLE_TYPE.new(MS_XML_TYPELIB, 'DOMDocument')
+ m = WIN32OLE_METHOD.new(domdoc, 'abort')
+ assert_equal('abort an asynchronous download', m.helpstring)
+ end
+ def test_helpfile
+ m = WIN32OLE_METHOD.new(@excel_app, 'ActiveCell')
+ assert_match(/VBAXL.*\.(HLP|CHM)$/i, m.helpfile)
+ end
+ def test_helpcontext
+ m = WIN32OLE_METHOD.new(@excel_app, 'ActiveCell')
+ assert(m.helpcontext > 0)
+ end
+ def test_offset_vtbl
+ m = WIN32OLE_METHOD.new(@excel_app, 'QueryInterface')
+ assert_equal(0, m.offset_vtbl)
+ end
+ def test_dispid
+ tobj = WIN32OLE_TYPE.new('Microsoft Shell Controls And Automation', 'FolderItem2')
+ method = WIN32OLE_METHOD.new(tobj, 'InvokeVerb')
+ assert_equal(1610743824, method.dispid)
+ end
+end
diff --git a/ext/win32ole/tests/testOLEPARAM.rb b/ext/win32ole/tests/testOLEPARAM.rb
new file mode 100644
index 0000000000..4014fadbfc
--- /dev/null
+++ b/ext/win32ole/tests/testOLEPARAM.rb
@@ -0,0 +1,65 @@
+# You need RubyUnit and MS Excel and MSI to run this test script
+
+require 'rubyunit'
+
+require 'win32ole'
+require 'oleserver'
+
+class TestOLEPARAM < RUNIT::TestCase
+ include OLESERVER
+ def test_name
+ classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+ sh = classes.find {|c| c.name == 'Worksheet'}
+ saveas = sh.ole_methods.find {|m| m.name == 'SaveAs'}
+ param_names = saveas.params.collect{|p| p.name}
+ assert(param_names.size > 0)
+ assert(param_names.include?('Filename'))
+ end
+ def test_to_s
+ classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+ sh = classes.find {|c| c.name == 'Worksheet'}
+ saveas = sh.ole_methods.find {|m| m.name == 'SaveAs'}
+ param_names = saveas.params.collect{|p| "#{p}"}
+ assert(param_names.include?('Filename'))
+ end
+ def test_ole_type
+ classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+ methods = classes.find {|c| c.name == 'Worksheet'}.ole_methods
+ f = methods.find {|m| m.name == 'SaveAs'}
+ assert_equal('BSTR', f.params[0].ole_type)
+ methods = classes.find {|c| c.name == 'Workbook'}.ole_methods
+ f = methods.find {|m| m.name == 'SaveAs'}
+ assert_equal('XlSaveAsAccessMode', f.params[6].ole_type)
+ end
+ def test_ole_type_detail
+ classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+ methods = classes.find {|c| c.name == 'Worksheet'}.ole_methods
+ f = methods.find {|m| m.name == 'SaveAs'}
+ assert_equal(['BSTR'], f.params[0].ole_type_detail)
+ methods = classes.find {|c| c.name == 'Workbook'}.ole_methods
+ f = methods.find {|m| m.name == 'SaveAs'}
+ assert_equal(['USERDEFINED', 'XlSaveAsAccessMode'], f.params[6].ole_type_detail)
+ end
+ def test_input
+ classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+ methods = classes.find {|c| c.name == 'Worksheet'}.ole_methods
+ f = methods.find {|m| m.name == 'SaveAs'}
+ assert(f.params[0].input?)
+ end
+
+ def test_output
+ classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+ methods = classes.find {|c| c.name == 'Worksheet'}.ole_methods
+ f = methods.find {|m| m.name == 'SaveAs'}
+ assert(!f.params[0].output?)
+ end
+ def test_optional
+ classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+ methods = classes.find {|c| c.name == 'Worksheet'}.ole_methods
+ f = methods.find {|m| m.name == 'SaveAs'}
+ assert(!f.params[0].optional?)
+ methods = classes.find {|c| c.name == 'Workbook'}.ole_methods
+ f = methods.find {|m| m.name == 'SaveAs'}
+ assert(f.params[0].optional?)
+ end
+end
diff --git a/ext/win32ole/tests/testOLETYPE.rb b/ext/win32ole/tests/testOLETYPE.rb
new file mode 100644
index 0000000000..d4eb1146e1
--- /dev/null
+++ b/ext/win32ole/tests/testOLETYPE.rb
@@ -0,0 +1,96 @@
+# You need RubyUnit and MS Excel and MSI to run this test script
+
+require 'rubyunit'
+
+require 'win32ole'
+require 'oleserver'
+
+class TestOLETYPE < RUNIT::TestCase
+ include OLESERVER
+ def test_s_new
+ type = WIN32OLE_TYPE.new(MS_EXCEL_TYPELIB, 'Application')
+ assert_instance_of(WIN32OLE_TYPE, type)
+ end
+ def test_s_ole_classes
+ classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+ assert(classes.size > 0)
+ end
+ def test_s_typelibs
+ libs = WIN32OLE_TYPE.typelibs
+ assert(libs.include?(MS_EXCEL_TYPELIB))
+ assert(libs.include?(MS_XML_TYPELIB))
+ end
+ def test_s_progids
+ progids = WIN32OLE_TYPE.progids
+ assert(progids.include?('Excel.Application'))
+ end
+ def test_name
+ classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+ class_names = classes.collect{|c|
+ c.name
+ }
+ assert(class_names.include?('Application'))
+ end
+
+ def test_class_to_s
+ classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+ class_names = classes.collect{|c|
+ "#{c}"
+ }
+ assert(class_names.include?('Application'))
+ end
+
+ def test_ole_type
+ classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+ app = classes.find {|c| c.name == 'Application'}
+ assert_equal('Class', app.ole_type)
+ app = classes.find {|c| c.name == '_Application'}
+ assert_equal('Dispatch', app.ole_type)
+ end
+ def test_typekind
+ classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+ app = classes.find {|c| c.name == 'Application'}
+ assert_equal(5, app.typekind)
+ end
+ def test_visible
+ classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+ app = classes.find {|c| c.name == 'Application'}
+ assert(app.visible?)
+ app = classes.find {|c| c.name == 'IAppEvents'}
+ assert(!app.visible?)
+ end
+ def test_src_type
+ classes = WIN32OLE_TYPE.ole_classes(MS_XML_TYPELIB)
+ domnode = classes.find {|c| c.name == 'DOMNodeType'}
+ assert_equal('tagDOMNodeType', domnode.src_type)
+ end
+ def test_helpstring
+ classes = WIN32OLE_TYPE.ole_classes(MS_XML_TYPELIB)
+ domdoc = classes.find {|c| c.name == 'DOMDocument'}
+ assert_equal('W3C-DOM XML Document', domdoc.helpstring)
+ end
+ def test_variables
+ classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+ xlchart = classes.find {|c| c.name == 'XlChartType'}
+ assert(xlchart.variables.size > 0)
+ end
+ def test_ole_methods
+ classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+ worksheet = classes.find {|c| c.name == 'Worksheet'}
+ assert(worksheet.ole_methods.size > 0)
+ end
+ def test_helpfile
+ classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+ worksheet = classes.find {|c| c.name == 'Worksheet'}
+ assert_match(/VBAXL.*\.(CHM|HLP)$/, worksheet.helpfile)
+ end
+ def test_helpcontext
+ classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+ worksheet = classes.find {|c| c.name == 'Worksheet'}
+ assert_equal(131088, worksheet.helpcontext)
+ end
+ def test_to_s
+ type = WIN32OLE_TYPE.new(MS_EXCEL_TYPELIB, 'Application')
+ assert_equal("Application", "#{type}");
+ end
+end
diff --git a/ext/win32ole/tests/testOLEVARIABLE.rb b/ext/win32ole/tests/testOLEVARIABLE.rb
new file mode 100644
index 0000000000..b4bb0b57d9
--- /dev/null
+++ b/ext/win32ole/tests/testOLEVARIABLE.rb
@@ -0,0 +1,49 @@
+# You need RubyUnit and MS Excel and MSI to run this test script
+
+require 'rubyunit'
+
+require 'win32ole'
+require 'oleserver'
+
+class TestOLEVARIABLE < RUNIT::TestCase
+ include OLESERVER
+ def test_name
+ classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+ chart = classes.find {|c| c.name == 'XlChartType'}
+ var_names = chart.variables.collect {|m| m.name}
+ assert(var_names.size > 0)
+ assert(var_names.include?('xl3DColumn'))
+ end
+ def test_to_s
+ classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+ chart = classes.find {|c| c.name == 'XlChartType'}
+ var_names = chart.variables.collect {|m| "#{m}"}
+ assert(var_names.size > 0)
+ assert(var_names.include?('xl3DColumn'))
+ end
+ def test_ole_type
+ classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+ chart = classes.find {|c| c.name == 'XlChartType'}
+ var = chart.variables.find {|m| m.name == 'xl3DColumn'}
+ assert_equal('INT', var.ole_type)
+ end
+ def test_ole_type_detail
+ classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+ chart = classes.find {|c| c.name == 'XlChartType'}
+ var = chart.variables.find {|m| m.name == 'xl3DColumn'}
+ assert_equal(['INT'], var.ole_type_detail)
+ end
+
+ def test_value
+ classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+ chart = classes.find {|c| c.name == 'XlChartType'}
+ var = chart.variables.find {|m| m.name == 'xl3DColumn'}
+ assert_equal(-4100, var.value)
+ end
+ def test_visible
+ classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+ chart = classes.find {|c| c.name == 'XlChartType'}
+ var = chart.variables.find {|m| m.name == 'xl3DColumn'}
+ assert(var.visible?)
+ end
+end
diff --git a/ext/win32ole/tests/testVARIANT.rb b/ext/win32ole/tests/testVARIANT.rb
new file mode 100644
index 0000000000..f274778f27
--- /dev/null
+++ b/ext/win32ole/tests/testVARIANT.rb
@@ -0,0 +1,32 @@
+# You need RubyUnit and MS Excel and MSI to run this test script
+
+require 'rubyunit'
+
+require 'win32ole'
+
+class TestWin32OLE_VARIANT < RUNIT::TestCase
+ include WIN32OLE::VARIANT
+ def test_variant
+ assert_equal(2, VT_I2)
+ assert_equal(3, VT_I4)
+ assert_equal(4, VT_R4)
+ assert_equal(5, VT_R8)
+ assert_equal(6, VT_CY)
+ assert_equal(7, VT_DATE)
+ assert_equal(8, VT_BSTR)
+ assert_equal(9, VT_DISPATCH)
+ assert_equal(10, VT_ERROR)
+ assert_equal(11, VT_BOOL)
+ assert_equal(12, VT_VARIANT)
+ assert_equal(13, VT_UNKNOWN)
+ assert_equal(16, VT_I1)
+ assert_equal(17, VT_UI1)
+ assert_equal(18, VT_UI2)
+ assert_equal(19, VT_UI4)
+ assert_equal(22, VT_INT)
+ assert_equal(23, VT_UINT)
+ assert_equal(0x2000, VT_ARRAY)
+ assert_equal(0x4000, VT_BYREF)
+ end
+end
+
diff --git a/ext/win32ole/tests/testWIN32OLE.rb b/ext/win32ole/tests/testWIN32OLE.rb
new file mode 100644
index 0000000000..5c01507377
--- /dev/null
+++ b/ext/win32ole/tests/testWIN32OLE.rb
@@ -0,0 +1,372 @@
+# You need RubyUnit and MS Excel and MSI to run this test script
+
+require 'runit/testcase'
+require 'runit/cui/testrunner'
+
+require 'win32ole'
+require 'oleserver'
+
+module EXCEL_CONST
+end
+
+module CONST1
+end
+
+module CONST2
+end
+
+module CONST3
+end
+
+class TestWin32OLE < RUNIT::TestCase
+ include OLESERVER
+ def setup
+ @excel = WIN32OLE.new("Excel.Application")
+ @excel.visible = true
+ end
+ def test_s_new
+ assert_instance_of(WIN32OLE, @excel)
+ end
+ def test_s_new_DCOM
+ rexcel = WIN32OLE.new("Excel.Application", "localhost")
+ assert_instance_of(WIN32OLE, rexcel)
+ rexcel.visible = true
+ rexcel.quit
+ end
+ def test_s_new_from_clsid
+ excel = WIN32OLE.new("{00024500-0000-0000-C000-000000000046}")
+ assert_instance_of(WIN32OLE, excel)
+ excel.quit
+ exc = assert_exception(WIN32OLERuntimeError) {
+ WIN32OLE.new("{000}")
+ }
+ assert_match(/unknown OLE server: `\{000\}'/, exc.message)
+ end
+ def test_s_connect
+ excel2 = WIN32OLE.connect('Excel.Application')
+ assert_instance_of(WIN32OLE, excel2)
+ end
+
+ def test_s_const_load
+ assert(!defined?(EXCEL_CONST::XlTop))
+ WIN32OLE.const_load(@excel, EXCEL_CONST)
+ assert_equal(-4160, EXCEL_CONST::XlTop)
+
+ assert(!defined?(CONST1::XlTop))
+ WIN32OLE.const_load(MS_EXCEL_TYPELIB, CONST1)
+ assert_equal(-4160, CONST1::XlTop)
+ end
+
+ def test_s_codepage
+ assert_equal(WIN32OLE::CP_ACP, WIN32OLE.codepage)
+ end
+
+ def test_s_codepage_set
+ WIN32OLE.codepage = WIN32OLE::CP_UTF8
+ assert_equal(WIN32OLE::CP_UTF8, WIN32OLE.codepage)
+ WIN32OLE.codepage = WIN32OLE::CP_ACP
+ end
+
+ def test_const_CP_ACP
+ assert_equal(0, WIN32OLE::CP_ACP)
+ end
+
+ def test_const_CP_OEMCP
+ assert_equal(1, WIN32OLE::CP_OEMCP)
+ end
+
+ def test_const_CP_MACCP
+ assert_equal(2, WIN32OLE::CP_MACCP)
+ end
+
+ def test_const_CP_THREAD_ACP
+ assert_equal(3, WIN32OLE::CP_THREAD_ACP)
+ end
+
+ def test_const_CP_SYMBOL
+ assert_equal(42, WIN32OLE::CP_SYMBOL)
+ end
+
+ def test_const_CP_UTF7
+ assert_equal(65000, WIN32OLE::CP_UTF7)
+ end
+
+ def test_const_CP_UTF8
+ assert_equal(65001, WIN32OLE::CP_UTF8)
+ end
+
+ def test_s_codepage_changed
+ book = @excel.workbooks.add
+ sheet = book.worksheets(1)
+ begin
+ WIN32OLE.codepage = WIN32OLE::CP_UTF8
+ sheet.range("A1").value = [0x3042].pack("U*")
+ val = sheet.range("A1").value
+ assert_equal("\343\201\202", val)
+ WIN32OLE.codepage = WIN32OLE::CP_ACP
+ val = sheet.range("A1").value
+ assert_equal("\202\240", val)
+ ensure
+ book.saved = true
+ end
+ end
+
+ def test_get_win32ole_object
+ workbooks = @excel.Workbooks;
+ assert_instance_of(WIN32OLE, workbooks)
+ end
+ def test_each
+ workbooks = @excel.Workbooks
+ assert_no_exception {
+ i = 0;
+ workbooks.each do |workbook|
+ print i += 1
+ end
+ }
+ workbooks.add
+ workbooks.add
+ i = 0
+ workbooks.each do |workbook|
+ i+=1
+ end
+ assert_equal(2, i)
+ workbooks.each do |workbook|
+ workbook.saved = true
+ end
+ end
+ def test_setproperty_bracket
+ book = @excel.workbooks.add
+ sheet = book.worksheets(1)
+ begin
+ sheet.range("A1")['Value'] = 10
+ assert_equal(10, sheet.range("A1").value)
+ sheet['Cells', 1, 2] = 10
+ assert_equal(10, sheet.range("B1").value)
+ assert_equal(10, sheet['Cells', 1, 2].value)
+ ensure
+ book.saved = true
+ end
+ end
+ def test_convert_bignum
+ book = @excel.workbooks.add
+ sheet = book.worksheets(1)
+ begin
+ sheet.range("A1").value = 999999999
+ sheet.range("A2").value = 9999999999
+ sheet.range("A3").value = "=A1*10 + 9"
+ assert_equal(9999999999, sheet.range("A2").value)
+ assert_equal(9999999999, sheet.range("A3").value)
+
+ ensure
+ book.saved = true
+ end
+ end
+
+ def test_ole_invoke_with_named_arg
+ book = @excel.workbooks.add
+ sheets = book.worksheets
+ sheet = book.worksheets(1)
+ num = sheets.count
+ begin
+ sheets.add({'count' => 2, 'after'=>sheet})
+ assert_equal(2, sheets.count - num);
+ ensure
+ book.saved = true
+ end
+ end
+
+ def test_ole_invoke_with_named_arg_last
+ book = @excel.workbooks.add
+ sheets = book.worksheets
+ sheet = book.worksheets(1)
+ num = sheets.count
+ begin
+ sheets.add(sheet, {'count' => 2})
+ assert_equal(2, sheets.count - num);
+ ensure
+ book.saved = true
+ end
+ end
+
+ def test_setproperty
+ @excel.setproperty('Visible', false)
+ assert_equal(false, @excel.Visible)
+ @excel.setproperty('Visible', true)
+ assert_equal(true, @excel.Visible)
+ book = @excel.workbooks.add
+ sheet = book.worksheets(1)
+ begin
+ sheet.setproperty('Cells', 1, 2, 10)
+ assert_equal(10, sheet.range("B1").value)
+ ensure
+ book.saved = true
+ end
+ end
+ def test_no_exist_property
+ isok = false
+ begin
+ @excel.unknown_prop = 1
+ rescue WIN32OLERuntimeError
+ isok = true
+ end
+ assert(isok)
+
+ isok = false
+ begin
+ @excel['unknown_prop'] = 2
+ rescue WIN32OLERuntimeError
+ isok = true
+ end
+ assert(isok)
+ end
+
+ def test_setproperty_with_equal
+ book = @excel.workbooks.add
+ sheet = book.worksheets(1)
+ begin
+ sheet.range("B1").value = 10
+ assert_equal(10, sheet.range("B1").value)
+ sheet.range("C1:D1").value = [11, 12]
+ assert_equal(11, sheet.range("C1").value)
+ assert_equal(12, sheet.range("D1").value)
+ ensure
+ book.saved = true
+ end
+ end
+ def test_invoke
+ workbooks = @excel.invoke( 'workbooks' )
+ assert_instance_of(WIN32OLE, workbooks)
+ book = workbooks.invoke( 'add' )
+ assert_instance_of(WIN32OLE, book)
+ end
+ def test_ole_methods
+ methods = @excel.ole_methods
+ method_names = methods.collect{|m| m.name}
+ assert(method_names.include?("Quit"))
+ end
+ def test_ole_func_methods
+ methods = @excel.ole_func_methods
+ assert(methods.size > 0)
+ method_names = methods.collect{|m| m.name}
+ assert(method_names.include?("Quit"))
+ end
+ def test_ole_put_methods
+ methods = @excel.ole_put_methods
+ assert(methods.size > 0)
+ method_names = methods.collect{|m| m.name}
+ assert(method_names.include?("Visible"))
+ end
+ def test_ole_get_methods
+ methods = @excel.ole_get_methods
+ assert(methods.size > 0)
+ method_names = methods.collect{|m| m.name}
+ assert(method_names.include?("Visible"))
+ end
+ def test_ole_method_help
+ quit_info = @excel.ole_method_help("Quit")
+ assert_equal(0, quit_info.size_params)
+ assert_equal(0, quit_info.size_opt_params)
+
+ workbooks = @excel.Workbooks
+ add_info = workbooks.ole_method_help("Add")
+ assert_equal(1, add_info.size_params)
+ assert_equal(1, add_info.size_opt_params)
+ assert(add_info.params[0].input?)
+ assert(add_info.params[0].optional?)
+ assert_equal('VARIANT', add_info.params[0].ole_type)
+ end
+ def teardown
+ @excel.quit
+ @excel = nil
+ GC.start
+ end
+end
+
+class TestWin32OLE_WITH_MSI < RUNIT::TestCase
+ def setup
+ installer = WIN32OLE.new("WindowsInstaller.Installer")
+ @record = installer.CreateRecord(2)
+ end
+
+ # Sorry, this test fails.
+ # Win32OLE does not support this style to set property.
+ # Use Win32OLE#setproperty or Win32OLE#[]= .
+ # def test_invoke
+ # @record.invoke("StringData", 1, 'cccc')
+ # assert_equal('cccc', @record.StringData(1))
+ # end
+
+ def test_setproperty
+ @record.setproperty( "StringData", 1, 'dddd')
+ assert_equal('dddd', @record.StringData(1))
+ end
+ def test_bracket_equal_with_arg
+ @record[ "StringData", 1 ] = 'ffff'
+ assert_equal('ffff', @record.StringData(1))
+ end
+
+ def test__invoke
+ shell=WIN32OLE.new('Shell.Application')
+ assert_equal(shell.NameSpace(0).title, shell._invoke(0x60020002, [0], [WIN32OLE::VARIANT::VT_VARIANT]).title)
+ end
+end
+
+# ---------------------
+#
+# a subclass of Win32OLE
+# override new() and connect()
+class MyExcel<WIN32OLE
+ def MyExcel.new
+ super "Excel.Application"
+ end
+ def MyExcel.connect
+ super "Excel.Application"
+ end
+end
+
+class TestMyExcel < TestWin32OLE
+#
+# because we overrided new() and connect()
+# we need to change the test.
+# also, because the class will be different
+#
+ def setup
+ @excel = MyExcel.new
+ @excel.visible = true
+ end
+ def test_s_new
+ assert_instance_of(MyExcel, @excel)
+ end
+ def test_s_connect
+ excel2 = MyExcel.connect
+ assert_instance_of(MyExcel, excel2)
+ end
+#
+# const_load didn't like to be called twice,
+# and I don't know how to undefine something in Ruby yet
+# so, hide the test.
+#
+ private :test_s_const_load
+end
+
+if $0 == __FILE__
+ puts "Now Test Win32OLE version #{WIN32OLE::VERSION}"
+ if ARGV.size == 0
+ suite = RUNIT::TestSuite.new
+ suite.add_test(TestWin32OLE.suite)
+ suite.add_test(TestMyExcel.suite)
+ begin
+ installer = WIN32OLE.new("WindowsInstaller.Installer")
+ suite.add_test(TestWin32OLE_WITH_MSI.suite)
+ rescue
+ puts "Skip some test with MSI"
+ end
+ else
+ suite = RUNIT::TestSuite.new
+ ARGV.each do |testmethod|
+ suite.add_test(TestWin32OLE.new(testmethod))
+ end
+ end
+ RUNIT::CUI::TestRunner.quiet_mode = true
+ RUNIT::CUI::TestRunner.run(suite)
+end
diff --git a/ext/win32ole/tests/test_ole_methods.rb b/ext/win32ole/tests/test_ole_methods.rb
new file mode 100644
index 0000000000..ca1c03b010
--- /dev/null
+++ b/ext/win32ole/tests/test_ole_methods.rb
@@ -0,0 +1,36 @@
+#
+# This is test for [ruby-talk:196897]
+#
+begin
+ require 'win32ole'
+rescue LoadError
+end
+require "test/unit"
+
+if defined?(WIN32OLE)
+ class TestWIN32OLE_FOR_PROPERTYPUTREF < Test::Unit::TestCase
+
+ def setup
+ @obj = WIN32OLE.new('Scripting.Dictionary')
+ end
+
+ def test_ole_methods
+ x = @obj.ole_methods.select {|m|
+ m.invoke_kind == 'PROPERTYPUTREF'
+ }
+ assert(x.size > 0)
+ assert_equal(1, x.size)
+ assert_equal('Item', x[0].name)
+ end
+
+ def test_ole_put_methods
+ x = @obj.ole_put_methods.select {|m|
+ m.invoke_kind == 'PROPERTYPUTREF'
+ }
+ assert(x.size > 0)
+ assert_equal(1, x.size)
+ assert_equal('Item', x[0].name)
+ end
+
+ end
+end
diff --git a/ext/win32ole/tests/test_propertyputref.rb b/ext/win32ole/tests/test_propertyputref.rb
new file mode 100644
index 0000000000..befc35ca9c
--- /dev/null
+++ b/ext/win32ole/tests/test_propertyputref.rb
@@ -0,0 +1,19 @@
+require 'test/unit'
+require 'win32ole'
+
+class TestWIN32OLE_PROPERTYPUTREF < Test::Unit::TestCase
+ def setup
+ begin
+ @sapi = WIN32OLE.new('SAPI.SpVoice')
+ rescue WIN32OLERuntimeError
+ @sapi = nil
+ end
+ end
+ def test_sapi
+ if @sapi
+ new_id = @sapi.getvoices.item(2).Id
+ @sapi.voice = @sapi.getvoices.item(2)
+ assert_equal(new_id, @sapi.voice.Id)
+ end
+ end
+end
diff --git a/ext/win32ole/tests/test_word.rb b/ext/win32ole/tests/test_word.rb
new file mode 100644
index 0000000000..53a6c521ba
--- /dev/null
+++ b/ext/win32ole/tests/test_word.rb
@@ -0,0 +1,37 @@
+#
+# This is test for [ruby-Bugs#3237]
+#
+begin
+ require 'win32ole'
+rescue LoadError
+end
+require "test/unit"
+
+if defined?(WIN32OLE)
+ class TestWIN32OLE_WITH_WORD < Test::Unit::TestCase
+
+ def setup
+ begin
+ @obj = WIN32OLE.new('Word.Application')
+ rescue WIN32OLERuntimeError
+ @obj = nil
+ end
+ end
+
+ def test_ole_methods
+ if @obj
+ @obj.visible = true
+ @obj.wordbasic.disableAutoMacros(true)
+ assert(true)
+ end
+ end
+
+ def teardown
+ if @obj
+ @obj.quit
+ @obj = nil
+ end
+ end
+
+ end
+end
diff --git a/ext/win32ole/tests/testall.rb b/ext/win32ole/tests/testall.rb
new file mode 100644
index 0000000000..d45541f571
--- /dev/null
+++ b/ext/win32ole/tests/testall.rb
@@ -0,0 +1,15 @@
+require 'rubyunit'
+require 'win32ole'
+puts "Now Test Win32OLE version #{WIN32OLE::VERSION}"
+# RUNIT::CUI::TestRunner.quiet_mode = true
+require "testWIN32OLE"
+require "testOLETYPE"
+require "testOLEPARAM"
+require "testOLEMETHOD"
+require "testOLEVARIABLE"
+require "testVARIANT"
+require "testNIL2VTEMPTY"
+require "test_ole_methods.rb"
+require "test_propertyputref.rb"
+require "test_word.rb"
+# require "testOLEEVENT"
diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c
index 66f9b4cc8a..7844b41ad4 100644
--- a/ext/win32ole/win32ole.c
+++ b/ext/win32ole/win32ole.c
@@ -12,22 +12,16 @@
*/
/*
+ $Date$
modified for win32ole (ruby) by Masaki.Suketa <masaki.suketa@nifty.ne.jp>
*/
-#include "ruby/ruby.h"
-#include "ruby/st.h"
-#include "ruby/encoding.h"
-#include <ctype.h>
+#include "ruby.h"
+#include "st.h"
#include <windows.h>
#include <ocidl.h>
#include <olectl.h>
#include <ole2.h>
-#if defined(HAVE_TYPE_IMULTILANGUAGE2) || defined(HAVE_TYPE_IMULTILANGUAGE)
-#include <mlang.h>
-#endif
-#include <stdlib.h>
-#include <math.h>
#ifdef HAVE_STDARG_PROTOTYPES
#include <stdarg.h>
#define va_init_list(a,b) va_start(a,b)
@@ -35,7 +29,7 @@
#include <varargs.h>
#define va_init_list(a,b) va_start(a)
#endif
-#include <objidl.h>
+
#define DOUT fprintf(stderr,"[%d]\n",__LINE__)
#define DOUTS(x) fprintf(stderr,"[%d]:" #x "=%s\n",__LINE__,x)
@@ -60,39 +54,6 @@
#define V_BOOL(X) V_UNION(X,boolVal)
#endif
-#ifndef V_I1REF
-#define V_I1REF(X) V_UNION(X, pcVal)
-#endif
-
-#ifndef U_UI2REF
-#define V_UI2REF(X) V_UNION(X, puiVal)
-#endif
-
-#ifndef V_INT
-#define V_INT(X) V_UNION(X, intVal)
-#endif
-
-#ifndef V_INTREF
-#define V_INTREF(X) V_UNION(X, pintVal)
-#endif
-
-#ifndef V_UINT
-#define V_UINT(X) V_UNION(X, uintVal)
-#endif
-
-#ifndef V_UINTREF
-#define V_UINTREF(X) V_UNION(X, puintVal)
-#endif
-
-/*
- * unfortunately IID_IMultiLanguage2 is not included in any libXXX.a
- * in Cygwin(mingw32).
- */
-#if defined(__CYGWIN__) || defined(__MINGW32__)
-#undef IID_IMultiLanguage2
-const IID IID_IMultiLanguage2 = {0xDCCFC164, 0x2B38, 0x11d2, {0xB7, 0xEC, 0x00, 0xC0, 0x4F, 0x8F, 0x5D, 0x9A}};
-#endif
-
#define OLE_RELEASE(X) (X) ? ((X)->lpVtbl->Release(X)) : 0
#define OLE_ADDREF(X) (X) ? ((X)->lpVtbl->AddRef(X)) : 0
@@ -101,7 +62,7 @@ const IID IID_IMultiLanguage2 = {0xDCCFC164, 0x2B38, 0x11d2, {0xB7, 0xEC, 0x00,
#define OLE_RELEASE_TYPEATTR(X, Y) ((X)->lpVtbl->ReleaseTypeAttr((X), (Y)))
#define OLE_FREE(x) {\
- if(g_ole_initialized == TRUE) {\
+ if(gOLEInitialized == Qtrue) {\
if(x) {\
OLE_RELEASE(x);\
(x) = 0;\
@@ -116,28 +77,15 @@ const IID IID_IMultiLanguage2 = {0xDCCFC164, 0x2B38, 0x11d2, {0xB7, 0xEC, 0x00,
}\
}
-#ifdef HAVE_LONG_LONG
-#define I8_2_NUM LL2NUM
-#define UI8_2_NUM ULL2NUM
-#define NUM2I8 NUM2LL
-#define NUM2UI8 NUM2ULL
-#else
-#define I8_2_NUM INT2NUM
-#define UI8_2_NUM UINT2NUM
-#define NUM2I8 NUM2INT
-#define NUM2UI8 NUM2UINT
-#endif
-
#define WC2VSTR(x) ole_wc2vstr((x), TRUE)
-#define WIN32OLE_VERSION "1.4.1"
+#define WIN32OLE_VERSION "0.7.5"
typedef HRESULT (STDAPICALLTYPE FNCOCREATEINSTANCEEX)
(REFCLSID, IUnknown*, DWORD, COSERVERINFO*, DWORD, MULTI_QI*);
typedef HWND (WINAPI FNHTMLHELP)(HWND hwndCaller, LPCSTR pszFile,
UINT uCommand, DWORD dwData);
-typedef BOOL (FNENUMSYSEMCODEPAGES) (CODEPAGE_ENUMPROC, DWORD);
typedef struct {
struct IEventSinkVtbl * lpVtbl;
} IEventSink, *PEVENTSINK;
@@ -184,49 +132,31 @@ typedef struct tagIEVENTSINKOBJ {
DWORD m_cRef;
IID m_iid;
int m_event_id;
+ DWORD m_dwCookie;
+ IConnectionPoint *pConnectionPoint;
ITypeInfo *pTypeInfo;
+ int *ptr_freed;
}IEVENTSINKOBJ, *PIEVENTSINKOBJ;
VALUE cWIN32OLE;
-VALUE cWIN32OLE_TYPELIB;
VALUE cWIN32OLE_TYPE;
VALUE cWIN32OLE_VARIABLE;
VALUE cWIN32OLE_METHOD;
VALUE cWIN32OLE_PARAM;
VALUE cWIN32OLE_EVENT;
-VALUE cWIN32OLE_VARIANT;
-VALUE eWIN32OLERuntimeError;
+VALUE eWIN32OLE_RUNTIME_ERROR;
VALUE mWIN32OLE_VARIANT;
-VALUE cWIN32OLE_PROPERTY;
static VALUE ary_ole_event;
static ID id_events;
-static BOOL g_ole_initialized = FALSE;
-static BOOL g_cp_installed = FALSE;
-static BOOL g_lcid_installed = FALSE;
+static BOOL gOLEInitialized = Qfalse;
static HINSTANCE ghhctrl = NULL;
static HINSTANCE gole32 = NULL;
static FNCOCREATEINSTANCEEX *gCoCreateInstanceEx = NULL;
static VALUE com_hash;
static IDispatchVtbl com_vtbl;
-static UINT cWIN32OLE_cp = CP_ACP;
-static LCID cWIN32OLE_lcid = LOCALE_SYSTEM_DEFAULT;
-static rb_encoding *cWIN32OLE_enc;
-static UINT g_cp_to_check = CP_ACP;
-static char g_lcid_to_check[8 + 1];
+static UINT cWIN32OLE_cp = CP_ACP;
static VARTYPE g_nil_to = VT_ERROR;
-static st_table *enc2cp_table;
-static IMessageFilterVtbl message_filter;
-static IMessageFilter imessage_filter = { &message_filter };
-static IMessageFilter* previous_filter;
-
-#if defined(HAVE_TYPE_IMULTILANGUAGE2)
-static IMultiLanguage2 *pIMultiLanguage = NULL;
-#elif defined(HAVE_TYPE_IMULTILANGUAGE)
-static IMultiLanguage *pIMultiLanguage = NULL;
-#else
-#define pIMultiLanguage NULL /* dummy */
-#endif
struct oledata {
IDispatch *pDispatch;
@@ -254,9 +184,8 @@ struct oleparamdata {
};
struct oleeventdata {
- DWORD dwCookie;
- IConnectionPoint *pConnectionPoint;
- long event_id;
+ IEVENTSINKOBJ *pEvent;
+ int freed;
};
struct oleparam {
@@ -264,399 +193,16 @@ struct oleparam {
OLECHAR** pNamedArgs;
};
-struct olevariantdata {
- VARIANT realvar;
- VARIANT var;
-};
-
-
-static HRESULT ( STDMETHODCALLTYPE QueryInterface )(IDispatch __RPC_FAR *, REFIID riid, void __RPC_FAR *__RPC_FAR *ppvObject);
-static ULONG ( STDMETHODCALLTYPE AddRef )(IDispatch __RPC_FAR * This);
-static ULONG ( STDMETHODCALLTYPE Release )(IDispatch __RPC_FAR * This);
-static HRESULT ( STDMETHODCALLTYPE GetTypeInfoCount )(IDispatch __RPC_FAR * This, UINT __RPC_FAR *pctinfo);
-static HRESULT ( STDMETHODCALLTYPE GetTypeInfo )(IDispatch __RPC_FAR * This, UINT iTInfo, LCID lcid, ITypeInfo __RPC_FAR *__RPC_FAR *ppTInfo);
-static HRESULT ( STDMETHODCALLTYPE GetIDsOfNames )(IDispatch __RPC_FAR * This, REFIID riid, LPOLESTR __RPC_FAR *rgszNames, UINT cNames, LCID lcid, DISPID __RPC_FAR *rgDispId);
-static HRESULT ( STDMETHODCALLTYPE Invoke )( IDispatch __RPC_FAR * This, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS __RPC_FAR *pDispParams, VARIANT __RPC_FAR *pVarResult, EXCEPINFO __RPC_FAR *pExcepInfo, UINT __RPC_FAR *puArgErr);
-static IDispatch* val2dispatch(VALUE val);
-static double rbtime2vtdate(VALUE tmobj);
-static VALUE vtdate2rbtime(double date);
-static rb_encoding *ole_cp2encoding(UINT cp);
-static UINT ole_encoding2cp(rb_encoding *enc);
-NORETURN(static void failed_load_conv51932(void));
-#ifndef pIMultiLanguage
-static void load_conv_function51932(void);
-#endif
-static UINT ole_init_cp(void);
-static char *ole_wc2mb(LPWSTR pw);
-static VALUE ole_hresult2msg(HRESULT hr);
-static void ole_freeexceptinfo(EXCEPINFO *pExInfo);
-static VALUE ole_excepinfo2msg(EXCEPINFO *pExInfo);
-static void ole_raise(HRESULT hr, VALUE ecs, const char *fmt, ...);
-static void ole_initialize();
-static void ole_msg_loop();
-static void ole_free(struct oledata *pole);
-static void oletype_free(struct oletypedata *poletype);
-static void olemethod_free(struct olemethoddata *polemethod);
-static void olevariable_free(struct olevariabledata *polevar);
-static void oleparam_free(struct oleparamdata *pole);
-static LPWSTR ole_vstr2wc(VALUE vstr);
-static LPWSTR ole_mb2wc(char *pm, int len);
-static VALUE ole_wc2vstr(LPWSTR pw, BOOL isfree);
-static VALUE ole_ary_m_entry(VALUE val, long *pid);
-static void * get_ptr_of_variant(VARIANT *pvar);
-static VALUE is_all_index_under(long *pid, long *pub, long dim);
-static void ole_set_safe_array(long n, SAFEARRAY *psa, long *pid, long *pub, VALUE val, long dim, VARTYPE vt);
-static long dimension(VALUE val);
-static long ary_len_of_dim(VALUE ary, long dim);
-static HRESULT ole_val_ary2variant_ary(VALUE val, VARIANT *var, VARTYPE vt);
-static void ole_val2variant(VALUE val, VARIANT *var);
-static void ole_val2variant_ex(VALUE val, VARIANT *var, VARTYPE vt);
-static void ole_val2ptr_variant(VALUE val, VARIANT *var);
-static void ole_set_byref(VARIANT *realvar, VARIANT *var, VARTYPE vt);
-static void ole_val2olevariantdata(VALUE val, VARTYPE vt, struct olevariantdata *pvar);
-static void ole_val2variant2(VALUE val, VARIANT *var);
-static VALUE make_inspect(const char *class_name, VALUE detail);
-static VALUE default_inspect(VALUE self, const char *class_name);
-static VALUE ole_set_member(VALUE self, IDispatch *dispatch);
-static VALUE fole_s_allocate(VALUE klass);
-static VALUE create_win32ole_object(VALUE klass, IDispatch *pDispatch, int argc, VALUE *argv);
-static VALUE ary_new_dim(VALUE myary, long *pid, long *plb, long dim);
-static void ary_store_dim(VALUE myary, long *pid, long *plb, long dim, VALUE val);
-static VALUE ole_variant2val(VARIANT *pvar);
-static LONG reg_open_key(HKEY hkey, const char *name, HKEY *phkey);
-static LONG reg_open_vkey(HKEY hkey, VALUE key, HKEY *phkey);
-static VALUE reg_enum_key(HKEY hkey, DWORD i);
-static VALUE reg_get_val(HKEY hkey, const char *subkey);
-static VALUE reg_get_typelib_file_path(HKEY hkey);
-static VALUE typelib_file_from_clsid(VALUE ole);
-static VALUE typelib_file_from_typelib(VALUE ole);
-static VALUE typelib_file(VALUE ole);
-static void ole_const_load(ITypeLib *pTypeLib, VALUE klass, VALUE self);
-static HRESULT clsid_from_remote(VALUE host, VALUE com, CLSID *pclsid);
-static VALUE ole_create_dcom(int argc, VALUE *argv, VALUE self);
-static VALUE ole_bind_obj(VALUE moniker, int argc, VALUE *argv, VALUE self);
-static VALUE fole_s_connect(int argc, VALUE *argv, VALUE self);
-static VALUE fole_s_const_load(int argc, VALUE *argv, VALUE self);
-static VALUE ole_types_from_typelib(ITypeLib *pTypeLib, VALUE classes);
-static ULONG reference_count(struct oledata * pole);
-static VALUE fole_s_reference_count(VALUE self, VALUE obj);
-static VALUE fole_s_free(VALUE self, VALUE obj);
-static HWND ole_show_help(VALUE helpfile, VALUE helpcontext);
-static VALUE fole_s_show_help(int argc, VALUE *argv, VALUE self);
-static VALUE fole_s_get_code_page(VALUE self);
-static BOOL CALLBACK installed_code_page_proc(LPTSTR str);
-static BOOL code_page_installed(UINT cp);
-static VALUE fole_s_set_code_page(VALUE self, VALUE vcp);
-static VALUE fole_s_get_locale(VALUE self);
-static BOOL CALLBACK installed_lcid_proc(LPTSTR str);
-static BOOL lcid_installed(LCID lcid);
-static VALUE fole_s_set_locale(VALUE self, VALUE vlcid);
-static VALUE fole_s_create_guid(VALUE self);
-static VALUE fole_initialize(int argc, VALUE *argv, VALUE self);
-static VALUE hash2named_arg(VALUE pair, struct oleparam* pOp);
-static VALUE set_argv(VARIANTARG* realargs, unsigned int beg, unsigned int end);
-static VALUE ole_invoke(int argc, VALUE *argv, VALUE self, USHORT wFlags, BOOL is_bracket);
-static VALUE fole_invoke(int argc, VALUE *argv, VALUE self);
-static VALUE ole_invoke2(VALUE self, VALUE dispid, VALUE args, VALUE types, USHORT dispkind);
-static VALUE fole_invoke2(VALUE self, VALUE dispid, VALUE args, VALUE types);
-static VALUE fole_getproperty2(VALUE self, VALUE dispid, VALUE args, VALUE types);
-static VALUE fole_setproperty2(VALUE self, VALUE dispid, VALUE args, VALUE types);
-static VALUE fole_setproperty_with_bracket(int argc, VALUE *argv, VALUE self);
-static VALUE fole_setproperty(int argc, VALUE *argv, VALUE self);
-static VALUE fole_getproperty_with_bracket(int argc, VALUE *argv, VALUE self);
-static VALUE ole_propertyput(VALUE self, VALUE property, VALUE value);
-static VALUE fole_free(VALUE self);
-static VALUE ole_each_sub(VALUE pEnumV);
-static VALUE ole_ienum_free(VALUE pEnumV);
-static VALUE fole_each(VALUE self);
-static VALUE fole_missing(int argc, VALUE *argv, VALUE self);
-static VALUE ole_method_sub(VALUE self, ITypeInfo *pOwnerTypeInfo, ITypeInfo *pTypeInfo, VALUE name);
-static VALUE olemethod_from_typeinfo(VALUE self, ITypeInfo *pTypeInfo, VALUE name);
-static VALUE ole_methods_sub(ITypeInfo *pOwnerTypeInfo, ITypeInfo *pTypeInfo, VALUE methods, int mask);
-static VALUE ole_methods_from_typeinfo(ITypeInfo *pTypeInfo, int mask);
-static HRESULT typeinfo_from_ole(struct oledata *pole, ITypeInfo **ppti);
-static VALUE ole_methods(VALUE self, int mask);
-static VALUE fole_methods(VALUE self);
-static VALUE fole_get_methods(VALUE self);
-static VALUE fole_put_methods(VALUE self);
-static VALUE fole_func_methods(VALUE self);
-static VALUE ole_type_from_itypeinfo(ITypeInfo *pTypeInfo);
-static VALUE fole_type(VALUE self);
-static VALUE make_oletypelib_obj(VALUE guid, VALUE major_version, VALUE minor_version);
-static VALUE ole_typelib_from_itypelib(ITypeLib *pTypeLib);
-static VALUE ole_typelib_from_itypeinfo(ITypeInfo *pTypeInfo);
-static VALUE fole_typelib(VALUE self);
-static VALUE fole_query_interface(VALUE self, VALUE str_iid);
-static VALUE fole_respond_to(VALUE self, VALUE method);
-static HRESULT ole_docinfo_from_type(ITypeInfo *pTypeInfo, BSTR *name, BSTR *helpstr, DWORD *helpcontext, BSTR *helpfile);
-static VALUE ole_usertype2val(ITypeInfo *pTypeInfo, TYPEDESC *pTypeDesc, VALUE typedetails);
-static VALUE ole_ptrtype2val(ITypeInfo *pTypeInfo, TYPEDESC *pTypeDesc, VALUE typedetails);
-static VALUE ole_typedesc2val(ITypeInfo *pTypeInfo, TYPEDESC *pTypeDesc, VALUE typedetails);
-static VALUE fole_method_help(VALUE self, VALUE cmdname);
-static VALUE fole_activex_initialize(VALUE self);
-static VALUE foletype_s_ole_classes(VALUE self, VALUE typelib);
-static VALUE foletype_s_typelibs(VALUE self);
-static VALUE foletype_s_progids(VALUE self);
-static VALUE foletype_s_allocate(VALUE klass);
-static VALUE oletype_set_member(VALUE self, ITypeInfo *pTypeInfo, VALUE name);
-static VALUE oleclass_from_typelib(VALUE self, ITypeLib *pTypeLib, VALUE oleclass);
-static VALUE oletypelib_set_member(VALUE self, VALUE typelib, VALUE guid, VALUE version);
-static VALUE foletypelib_s_typelibs(VALUE self);
-static VALUE make_version_str(VALUE major, VALUE minor);
-static VALUE oletypelib_search_registry2(VALUE self, VALUE args);
-static VALUE oletypelib_search_registry(VALUE self, VALUE typelib);
-static VALUE foletypelib_initialize(VALUE self, VALUE args);
-static VALUE foletypelib_guid(VALUE self);
-static VALUE foletypelib_name(VALUE self);
-static VALUE foletypelib_version(VALUE self);
-static VALUE foletypelib_major_version(VALUE self);
-static VALUE foletypelib_minor_version(VALUE self);
-static VALUE oletypelib_path(VALUE guid, VALUE version);
-static VALUE foletypelib_path(VALUE self);
-static void oletypelib2itypelib(VALUE self, ITypeLib **ppTypeLib);
-static VALUE foletypelib_visible(VALUE self);
-static VALUE foletypelib_library_name(VALUE self);
-static VALUE foletypelib_ole_types(VALUE self);
-static VALUE foletypelib_inspect(VALUE self);
-static VALUE foletype_initialize(VALUE self, VALUE typelib, VALUE oleclass);
-static VALUE foletype_name(VALUE self);
-static VALUE ole_ole_type(ITypeInfo *pTypeInfo);
-static VALUE foletype_ole_type(VALUE self);
-static VALUE ole_type_guid(ITypeInfo *pTypeInfo);
-static VALUE foletype_guid(VALUE self);
-static VALUE ole_type_progid(ITypeInfo *pTypeInfo);
-static VALUE foletype_progid(VALUE self);
-static VALUE ole_type_visible(ITypeInfo *pTypeInfo);
-static VALUE foletype_visible(VALUE self);
-static VALUE ole_type_major_version(ITypeInfo *pTypeInfo);
-static VALUE foletype_major_version(VALUE self);
-static VALUE ole_type_minor_version(ITypeInfo *pTypeInfo);
-static VALUE foletype_minor_version(VALUE self);
-static VALUE ole_type_typekind(ITypeInfo *pTypeInfo);
-static VALUE foletype_typekind(VALUE self);
-static VALUE ole_type_helpstring(ITypeInfo *pTypeInfo);
-static VALUE foletype_helpstring(VALUE self);
-static VALUE ole_type_src_type(ITypeInfo *pTypeInfo);
-static VALUE foletype_src_type(VALUE self);
-static VALUE ole_type_helpfile(ITypeInfo *pTypeInfo);
-static VALUE foletype_helpfile(VALUE self);
-static VALUE ole_type_helpcontext(ITypeInfo *pTypeInfo);
-static VALUE foletype_helpcontext(VALUE self);
-static VALUE foletype_ole_typelib(VALUE self);
-static VALUE ole_type_impl_ole_types(ITypeInfo *pTypeInfo, int implflags);
-static VALUE foletype_impl_ole_types(VALUE self);
-static VALUE foletype_source_ole_types(VALUE self);
-static VALUE foletype_default_event_sources(VALUE self);
-static VALUE foletype_default_ole_types(VALUE self);
-static VALUE foletype_inspect(VALUE self);
-static VALUE ole_variables(ITypeInfo *pTypeInfo);
-static VALUE foletype_variables(VALUE self);
-static VALUE foletype_methods(VALUE self);
-static VALUE folevariable_name(VALUE self);
-static VALUE ole_variable_ole_type(ITypeInfo *pTypeInfo, UINT var_index);
-static VALUE folevariable_ole_type(VALUE self);
-static VALUE ole_variable_ole_type_detail(ITypeInfo *pTypeInfo, UINT var_index);
-static VALUE folevariable_ole_type_detail(VALUE self);
-static VALUE ole_variable_value(ITypeInfo *pTypeInfo, UINT var_index);
-static VALUE folevariable_value(VALUE self);
-static VALUE ole_variable_visible(ITypeInfo *pTypeInfo, UINT var_index);
-static VALUE folevariable_visible(VALUE self);
-static VALUE ole_variable_kind(ITypeInfo *pTypeInfo, UINT var_index);
-static VALUE folevariable_variable_kind(VALUE self);
-static VALUE ole_variable_varkind(ITypeInfo *pTypeInfo, UINT var_index);
-static VALUE folevariable_varkind(VALUE self);
-static VALUE folevariable_inspect(VALUE self);
-static VALUE olemethod_set_member(VALUE self, ITypeInfo *pTypeInfo, ITypeInfo *pOwnerTypeInfo, int index, VALUE name);
-static VALUE folemethod_s_allocate(VALUE klass);
-static VALUE folemethod_initialize(VALUE self, VALUE oletype, VALUE method);
-static VALUE folemethod_name(VALUE self);
-static VALUE ole_method_return_type(ITypeInfo *pTypeInfo, UINT method_index);
-static VALUE folemethod_return_type(VALUE self);
-static VALUE ole_method_return_vtype(ITypeInfo *pTypeInfo, UINT method_index);
-static VALUE folemethod_return_vtype(VALUE self);
-static VALUE ole_method_return_type_detail(ITypeInfo *pTypeInfo, UINT method_index);
-static VALUE folemethod_return_type_detail(VALUE self);
-static VALUE ole_method_invkind(ITypeInfo *pTypeInfo, UINT method_index);
-static VALUE ole_method_invoke_kind(ITypeInfo *pTypeInfo, UINT method_index);
-static VALUE folemethod_invkind(VALUE self);
-static VALUE folemethod_invoke_kind(VALUE self);
-static VALUE ole_method_visible(ITypeInfo *pTypeInfo, UINT method_index);
-static VALUE folemethod_visible(VALUE self);
-static VALUE ole_method_event(ITypeInfo *pTypeInfo, UINT method_index, VALUE method_name);
-static VALUE folemethod_event(VALUE self);
-static VALUE folemethod_event_interface(VALUE self);
-static VALUE ole_method_docinfo_from_type(ITypeInfo *pTypeInfo, UINT method_index, BSTR *name, BSTR *helpstr, DWORD *helpcontext, BSTR *helpfile);
-static VALUE ole_method_helpstring(ITypeInfo *pTypeInfo, UINT method_index);
-static VALUE folemethod_helpstring(VALUE self);
-static VALUE ole_method_helpfile(ITypeInfo *pTypeInfo, UINT method_index);
-static VALUE folemethod_helpfile(VALUE self);
-static VALUE ole_method_helpcontext(ITypeInfo *pTypeInfo, UINT method_index);
-static VALUE folemethod_helpcontext(VALUE self);
-static VALUE ole_method_dispid(ITypeInfo *pTypeInfo, UINT method_index);
-static VALUE folemethod_dispid(VALUE self);
-static VALUE ole_method_offset_vtbl(ITypeInfo *pTypeInfo, UINT method_index);
-static VALUE folemethod_offset_vtbl(VALUE self);
-static VALUE ole_method_size_params(ITypeInfo *pTypeInfo, UINT method_index);
-static VALUE folemethod_size_params(VALUE self);
-static VALUE ole_method_size_opt_params(ITypeInfo *pTypeInfo, UINT method_index);
-static VALUE folemethod_size_opt_params(VALUE self);
-static VALUE ole_method_params(ITypeInfo *pTypeInfo, UINT method_index);
-static VALUE folemethod_params(VALUE self);
-static VALUE folemethod_inspect(VALUE self);
-static VALUE foleparam_name(VALUE self);
-static VALUE ole_param_ole_type(ITypeInfo *pTypeInfo, UINT method_index, UINT index);
-static VALUE foleparam_ole_type(VALUE self);
-static VALUE ole_param_ole_type_detail(ITypeInfo *pTypeInfo, UINT method_index, UINT index);
-static VALUE foleparam_ole_type_detail(VALUE self);
-static VALUE ole_param_flag_mask(ITypeInfo *pTypeInfo, UINT method_index, UINT index, USHORT mask);
-static VALUE foleparam_input(VALUE self);
-static VALUE foleparam_output(VALUE self);
-static VALUE foleparam_optional(VALUE self);
-static VALUE foleparam_retval(VALUE self);
-static VALUE ole_param_default(ITypeInfo *pTypeInfo, UINT method_index, UINT index);
-static VALUE foleparam_default(VALUE self);
-static VALUE foleparam_inspect(VALUE self);
-static long ole_search_event_at(VALUE ary, VALUE ev);
-static VALUE ole_search_event(VALUE ary, VALUE ev, BOOL *is_default);
-static VALUE ole_search_handler_method(VALUE handler, VALUE ev, BOOL *is_default_handler);
-static void ole_delete_event(VALUE ary, VALUE ev);
-static void hash2ptr_dispparams(VALUE hash, ITypeInfo *pTypeInfo, DISPID dispid, DISPPARAMS *pdispparams);
-static VALUE hash2result(VALUE hash);
-static void ary2ptr_dispparams(VALUE ary, DISPPARAMS *pdispparams);
-static VALUE exec_callback(VALUE arg);
-static VALUE rescue_callback(VALUE arg);
-static HRESULT find_iid(VALUE ole, char *pitf, IID *piid, ITypeInfo **ppTypeInfo);
-static HRESULT find_coclass(ITypeInfo *pTypeInfo, TYPEATTR *pTypeAttr, ITypeInfo **pTypeInfo2, TYPEATTR **pTypeAttr2);
-static HRESULT find_default_source_from_typeinfo(ITypeInfo *pTypeInfo, TYPEATTR *pTypeAttr, ITypeInfo **ppTypeInfo);
-static HRESULT find_default_source(VALUE ole, IID *piid, ITypeInfo **ppTypeInfo);
-static void ole_event_free(struct oleeventdata *poleev);
-static VALUE fev_s_allocate(VALUE klass);
-static VALUE ev_advise(int argc, VALUE *argv, VALUE self);
-static VALUE fev_initialize(int argc, VALUE *argv, VALUE self);
-static VALUE fev_s_msg_loop(VALUE klass);
-static void add_event_call_back(VALUE obj, VALUE event, VALUE data);
-static VALUE ev_on_event(int argc, VALUE *argv, VALUE self, VALUE is_ary_arg);
-static VALUE fev_on_event(int argc, VALUE *argv, VALUE self);
-static VALUE fev_on_event_with_outargs(int argc, VALUE *argv, VALUE self);
-static VALUE fev_off_event(int argc, VALUE *argv, VALUE self);
-static VALUE fev_unadvise(VALUE self);
-static VALUE fev_set_handler(VALUE self, VALUE val);
-static VALUE fev_get_handler(VALUE self);
-static VALUE evs_push(VALUE ev);
-static VALUE evs_delete(long i);
-static VALUE evs_entry(long i);
-static VALUE evs_length();
-static void olevariant_free(struct olevariantdata *pvar);
-static VALUE folevariant_s_allocate(VALUE klass);
-static VALUE folevariant_s_array(VALUE klass, VALUE dims, VALUE vvt);
-static VALUE folevariant_initialize(VALUE self, VALUE args);
-static long *ary2safe_array_index(int ary_size, VALUE *ary, SAFEARRAY *psa);
-static void unlock_safe_array(SAFEARRAY *psa);
-static SAFEARRAY *get_locked_safe_array(VALUE val);
-static VALUE folevariant_ary_aref(int argc, VALUE *argv, VALUE self);
-static VOID * val2variant_ptr(VALUE val, VARIANT *var, VARTYPE vt);
-static VALUE folevariant_ary_aset(int argc, VALUE *argv, VALUE self);
-static VALUE folevariant_value(VALUE self);
-static VALUE folevariant_vartype(VALUE self);
-static VALUE folevariant_set_value(VALUE self, VALUE val);
-static void init_enc2cp();
-static void free_enc2cp();
+static VALUE folemethod_s_allocate _((VALUE));
+static VALUE olemethod_set_member _((VALUE, ITypeInfo *, ITypeInfo *, int, VALUE));
+static VALUE foletype_s_allocate _((VALUE));
+static VALUE oletype_set_member _((VALUE, ITypeInfo *, VALUE));
+static VALUE olemethod_from_typeinfo _((VALUE, ITypeInfo *, VALUE));
+static HRESULT ole_docinfo_from_type _((ITypeInfo *, BSTR *, BSTR *, DWORD *, BSTR *));
+static char *ole_wc2mb(LPWSTR);
+static VALUE ole_variant2val(VARIANT*);
+static void ole_val2variant(VALUE, VARIANT*);
-static HRESULT (STDMETHODCALLTYPE mf_QueryInterface)(
- IMessageFilter __RPC_FAR * This,
- /* [in] */ REFIID riid,
- /* [iid_is][out] */ void __RPC_FAR *__RPC_FAR *ppvObject)
-{
- if (MEMCMP(riid, &IID_IUnknown, GUID, 1) == 0
- || MEMCMP(riid, &IID_IMessageFilter, GUID, 1) == 0)
- {
- *ppvObject = &message_filter;
- return S_OK;
- }
- return E_NOINTERFACE;
-}
-
-static ULONG (STDMETHODCALLTYPE mf_AddRef)(
- IMessageFilter __RPC_FAR * This)
-{
- return 1;
-}
-
-static ULONG (STDMETHODCALLTYPE mf_Release)(
- IMessageFilter __RPC_FAR * This)
-{
- return 1;
-}
-
-static DWORD (STDMETHODCALLTYPE mf_HandleInComingCall)(
- IMessageFilter __RPC_FAR * pThis,
- DWORD dwCallType, //Type of incoming call
- HTASK threadIDCaller, //Task handle calling this task
- DWORD dwTickCount, //Elapsed tick count
- LPINTERFACEINFO lpInterfaceInfo //Pointer to INTERFACEINFO structure
- )
-{
-#ifdef DEBUG_MESSAGEFILTER
- printf("incoming %08X, %08X, %d\n", dwCallType, threadIDCaller, dwTickCount);
- fflush(stdout);
-#endif
- switch (dwCallType)
- {
- case CALLTYPE_ASYNC:
- case CALLTYPE_TOPLEVEL_CALLPENDING:
- case CALLTYPE_ASYNC_CALLPENDING:
- if (rb_during_gc()) {
- return SERVERCALL_RETRYLATER;
- }
- break;
- default:
- break;
- }
- if (previous_filter) {
- return previous_filter->lpVtbl->HandleInComingCall(previous_filter,
- dwCallType,
- threadIDCaller,
- dwTickCount,
- lpInterfaceInfo);
- }
- return SERVERCALL_ISHANDLED;
-}
-
-static DWORD (STDMETHODCALLTYPE mf_RetryRejectedCall)(
- IMessageFilter* pThis,
- HTASK threadIDCallee, //Server task handle
- DWORD dwTickCount, //Elapsed tick count
- DWORD dwRejectType //Returned rejection message
- )
-{
- if (previous_filter) {
- return previous_filter->lpVtbl->RetryRejectedCall(previous_filter,
- threadIDCallee,
- dwTickCount,
- dwRejectType);
- }
- return 1000;
-}
-
-static DWORD (STDMETHODCALLTYPE mf_MessagePending)(
- IMessageFilter* pThis,
- HTASK threadIDCallee, //Called applications task handle
- DWORD dwTickCount, //Elapsed tick count
- DWORD dwPendingType //Call type
- )
-{
- if (rb_during_gc()) {
- return PENDINGMSG_WAITNOPROCESS;
- }
- if (previous_filter) {
- return previous_filter->lpVtbl->MessagePending(previous_filter,
- threadIDCallee,
- dwTickCount,
- dwPendingType);
- }
- return PENDINGMSG_WAITNOPROCESS;
-}
-
typedef struct _Win32OLEIDispatch
{
IDispatch dispatch;
@@ -725,9 +271,7 @@ static HRESULT ( STDMETHODCALLTYPE GetIDsOfNames )(
/* [in] */ LCID lcid,
/* [size_is][out] */ DISPID __RPC_FAR *rgDispId)
{
- /*
Win32OLEIDispatch* p = (Win32OLEIDispatch*)This;
- */
char* psz = ole_wc2mb(*rgszNames); // support only one method
*rgDispId = rb_intern(psz);
free(psz);
@@ -766,7 +310,8 @@ static /* [local] */ HRESULT ( STDMETHODCALLTYPE Invoke )(
}
static IDispatch*
-val2dispatch(VALUE val)
+val2dispatch(val)
+ VALUE val;
{
struct st_table *tbl = DATA_PTR(com_hash);
Win32OLEIDispatch* pdisp;
@@ -786,271 +331,150 @@ val2dispatch(VALUE val)
return &pdisp->dispatch;
}
-static double
-rbtime2vtdate(VALUE tmobj)
+static void
+time2d(hh, mm, ss, pv)
+ int hh, mm, ss;
+ double *pv;
{
- SYSTEMTIME st;
- double t = 0;
- memset(&st, 0, sizeof(SYSTEMTIME));
- st.wYear = FIX2INT(rb_funcall(tmobj, rb_intern("year"), 0));
- st.wMonth = FIX2INT(rb_funcall(tmobj, rb_intern("month"), 0));
- st.wDay = FIX2INT(rb_funcall(tmobj, rb_intern("mday"), 0));
- st.wHour = FIX2INT(rb_funcall(tmobj, rb_intern("hour"), 0));
- st.wMinute = FIX2INT(rb_funcall(tmobj, rb_intern("min"), 0));
- st.wSecond = FIX2INT(rb_funcall(tmobj, rb_intern("sec"), 0));
- st.wMilliseconds = FIX2INT(rb_funcall(tmobj, rb_intern("nsec"), 0)) / 1000000;
- SystemTimeToVariantTime(&st, &t);
- return t;
+ *pv = (hh * 60.0 * 60.0 + mm * 60.0 + ss) / 86400.0;
}
-static VALUE
-vtdate2rbtime(double date)
+static void
+d2time(v, hh, mm, ss)
+ double v;
+ int *hh, *mm, *ss;
{
- SYSTEMTIME st;
- VALUE v;
- VariantTimeToSystemTime(date, &st);
+ double d_hh, d_mm, d_ss;
+ int i_hh, i_mm, i_ss;
- v = rb_funcall(rb_cTime, rb_intern("new"), 6,
- INT2FIX(st.wYear),
- INT2FIX(st.wMonth),
- INT2FIX(st.wDay),
- INT2FIX(st.wHour),
- INT2FIX(st.wMinute),
- INT2FIX(st.wSecond));
- if (st.wMilliseconds > 0) {
- return rb_funcall(v, rb_intern("+"), 1, rb_float_new((double)(st.wMilliseconds / 1000.0)));
- }
- return v;
-}
+ double d = v * 86400.0;
-#define ENC_MACHING_CP(enc,encname,cp) if(strcasecmp(rb_enc_name((enc)),(encname)) == 0) return cp
+ d_hh = d / 3600.0;
+ i_hh = (int)d_hh;
-static UINT ole_encoding2cp(rb_encoding *enc)
-{
- /*
- * Is there any better solution to convert
- * Ruby encoding to Windows codepage???
- */
- ENC_MACHING_CP(enc, "Big5", 950);
- ENC_MACHING_CP(enc, "CP51932", 51932);
- ENC_MACHING_CP(enc, "CP850", 850);
- ENC_MACHING_CP(enc, "CP852", 852);
- ENC_MACHING_CP(enc, "CP855", 855);
- ENC_MACHING_CP(enc, "CP949", 949);
- ENC_MACHING_CP(enc, "EUC-JP", 20932);
- ENC_MACHING_CP(enc, "EUC-KR", 51949);
- ENC_MACHING_CP(enc, "EUC-TW", 51950);
- ENC_MACHING_CP(enc, "GB18030", 54936);
- ENC_MACHING_CP(enc, "GB2312", 51936);
- ENC_MACHING_CP(enc, "GBK", 936);
- ENC_MACHING_CP(enc, "IBM437", 437);
- ENC_MACHING_CP(enc, "IBM737", 737);
- ENC_MACHING_CP(enc, "IBM775", 775);
- ENC_MACHING_CP(enc, "IBM852", 852);
- ENC_MACHING_CP(enc, "IBM855", 855);
- ENC_MACHING_CP(enc, "IBM857", 857);
- ENC_MACHING_CP(enc, "IBM860", 860);
- ENC_MACHING_CP(enc, "IBM861", 861);
- ENC_MACHING_CP(enc, "IBM862", 862);
- ENC_MACHING_CP(enc, "IBM863", 863);
- ENC_MACHING_CP(enc, "IBM864", 864);
- ENC_MACHING_CP(enc, "IBM865", 865);
- ENC_MACHING_CP(enc, "IBM866", 866);
- ENC_MACHING_CP(enc, "IBM869", 869);
- ENC_MACHING_CP(enc, "ISO-2022-JP", 50220);
- ENC_MACHING_CP(enc, "ISO-8859-1", 28591);
- ENC_MACHING_CP(enc, "ISO-8859-15", 28605);
- ENC_MACHING_CP(enc, "ISO-8859-2", 28592);
- ENC_MACHING_CP(enc, "ISO-8859-3", 28593);
- ENC_MACHING_CP(enc, "ISO-8859-4", 28594);
- ENC_MACHING_CP(enc, "ISO-8859-5", 28595);
- ENC_MACHING_CP(enc, "ISO-8859-6", 28596);
- ENC_MACHING_CP(enc, "ISO-8859-7", 28597);
- ENC_MACHING_CP(enc, "ISO-8859-8", 28598);
- ENC_MACHING_CP(enc, "ISO-8859-9", 28599);
- ENC_MACHING_CP(enc, "KOI8-R", 20866);
- ENC_MACHING_CP(enc, "KOI8-U", 21866);
- ENC_MACHING_CP(enc, "Shift_JIS", 932);
- ENC_MACHING_CP(enc, "UTF-16BE", 1201);
- ENC_MACHING_CP(enc, "UTF-16LE", 1200);
- ENC_MACHING_CP(enc, "UTF-7", 65000);
- ENC_MACHING_CP(enc, "UTF-8", 65001);
- ENC_MACHING_CP(enc, "Windows-1250", 1250);
- ENC_MACHING_CP(enc, "Windows-1251", 1251);
- ENC_MACHING_CP(enc, "Windows-1252", 1252);
- ENC_MACHING_CP(enc, "Windows-1253", 1253);
- ENC_MACHING_CP(enc, "Windows-1254", 1254);
- ENC_MACHING_CP(enc, "Windows-1255", 1255);
- ENC_MACHING_CP(enc, "Windows-1256", 1256);
- ENC_MACHING_CP(enc, "Windows-1257", 1257);
- ENC_MACHING_CP(enc, "Windows-1258", 1258);
- ENC_MACHING_CP(enc, "Windows-31J", 932);
- ENC_MACHING_CP(enc, "Windows-874", 874);
- ENC_MACHING_CP(enc, "eucJP-ms", 20932);
- return CP_ACP;
+ d = d - i_hh * 3600.0;
+
+ d_mm = d / 60.0;
+ i_mm = (int)d_mm;
+
+ d = d - i_mm * 60.0;
+
+ d_ss = d * 10.0 + 5;
+
+ i_ss = (int)d_ss / 10;
+
+ if(i_ss == 60) {
+ i_mm += 1;
+ i_ss = 0;
+ }
+
+ if (i_mm == 60) {
+ i_hh += 1;
+ i_mm = 0;
+ }
+ if (i_hh == 24) {
+ i_hh = 0;
+ }
+
+ *hh = i_hh;
+ *mm = i_mm;
+ *ss = i_ss;
}
static void
-failed_load_conv51932(void)
+civil2jd(y, m, d, jd)
+ int y, m, d;
+ long *jd;
{
- rb_raise(eWIN32OLERuntimeError, "fail to load convert function for CP51932");
+ long a, b;
+ if (m <= 2) {
+ y -= 1;
+ m += 12;
+ }
+ a = (long)(y / 100.0);
+ b = 2 - a + (long)(a / 4.0);
+ *jd = (long)(365.25 * (double)(y + 4716))
+ + (long)(30.6001 * (m + 1))
+ + d + b - 1524;
}
-#ifndef pIMultiLanguage
static void
-load_conv_function51932(void)
-{
- HRESULT hr = E_NOINTERFACE;
- void *p;
- if (!pIMultiLanguage) {
-#if defined(HAVE_TYPE_IMULTILANGUAGE2)
- hr = CoCreateInstance(&CLSID_CMultiLanguage, NULL, CLSCTX_INPROC_SERVER,
- &IID_IMultiLanguage2, &p);
-#elif defined(HAVE_TYPE_IMULTILANGUAGE)
- hr = CoCreateInstance(&CLSID_CMultiLanguage, NULL, CLSCTX_INPROC_SERVER,
- &IID_IMultiLanguage, &p);
-#endif
- if (FAILED(hr)) {
- failed_load_conv51932();
- }
- pIMultiLanguage = p;
+jd2civil(day, yy, mm, dd)
+ long day;
+ int *yy, *mm, *dd;
+{
+ long x, a, b, c, d, e;
+ x = (long)(((double)day - 1867216.25) / 36524.25);
+ a = day + 1 + x - (long)(x / 4.0);
+ b = a + 1524;
+ c = (long)(((double)b -122.1) /365.25);
+ d = (long)(365.25 * c);
+ e = (long)((double)(b - d) / 30.6001);
+ *dd = b - d - (long)(30.6001 * e);
+ if (e <= 13) {
+ *mm = e - 1;
+ *yy = c - 4716;
+ }
+ else {
+ *mm = e - 13;
+ *yy = c - 4715;
}
}
-#else
-#define load_conv_function51932() failed_load_conv51932()
-#endif
-
-#define conv_51932(cp) ((cp) == 51932 && (load_conv_function51932(), 1))
static void
-set_ole_codepage(UINT cp)
+double2time(v, y, m, d, hh, mm, ss)
+ double v;
+ int *y, *m, *d, *hh, *mm, *ss;
{
- if (code_page_installed(cp)) {
- cWIN32OLE_cp = cp;
- } else {
- switch(cp) {
- case CP_ACP:
- case CP_OEMCP:
- case CP_MACCP:
- case CP_THREAD_ACP:
- case CP_SYMBOL:
- case CP_UTF7:
- case CP_UTF8:
- cWIN32OLE_cp = cp;
- break;
- case 51932:
- cWIN32OLE_cp = cp;
- load_conv_function51932();
- break;
- default:
- rb_raise(eWIN32OLERuntimeError, "codepage should be WIN32OLE::CP_ACP, WIN32OLE::CP_OEMCP, WIN32OLE::CP_MACCP, WIN32OLE::CP_THREAD_ACP, WIN32OLE::CP_SYMBOL, WIN32OLE::CP_UTF7, WIN32OLE::CP_UTF8, or installed codepage.");
- break;
- }
- }
- cWIN32OLE_enc = ole_cp2encoding(cWIN32OLE_cp);
-}
+ long day;
+ double t;
+ day = (long)v;
+ t = v - day;
+ jd2civil(2415019 + day, y, m, d);
-static UINT
-ole_init_cp(void)
-{
- UINT cp;
- rb_encoding *encdef;
- encdef = rb_default_internal_encoding();
- if (!encdef) {
- encdef = rb_default_external_encoding();
- }
- cp = ole_encoding2cp(encdef);
- set_ole_codepage(cp);
- return cp;
+ d2time(t, hh, mm, ss);
}
-struct myCPINFOEX {
- UINT MaxCharSize;
- BYTE DefaultChar[2];
- BYTE LeadByte[12];
- WCHAR UnicodeDefaultChar;
- UINT CodePage;
- char CodePageName[MAX_PATH];
-};
-
-static rb_encoding *
-ole_cp2encoding(UINT cp)
-{
- static BOOL (*pGetCPInfoEx)(UINT, DWORD, struct myCPINFOEX *) = NULL;
- struct myCPINFOEX* buf;
- VALUE enc_name;
- char *enc_cstr;
- int idx;
-
- if (!code_page_installed(cp)) {
- switch(cp) {
- case CP_ACP:
- cp = GetACP();
- break;
- case CP_OEMCP:
- cp = GetOEMCP();
- break;
- case CP_MACCP:
- case CP_THREAD_ACP:
- if (!pGetCPInfoEx) {
- pGetCPInfoEx = (BOOL (*)(UINT, DWORD, struct myCPINFOEX *))
- GetProcAddress(GetModuleHandle("kernel32"), "GetCPInfoEx");
- if (!pGetCPInfoEx) {
- pGetCPInfoEx = (void*)-1;
- }
- }
- buf = ALLOCA_N(struct myCPINFOEX, 1);
- ZeroMemory(buf, sizeof(struct myCPINFOEX));
- if (pGetCPInfoEx == (void*)-1 || !pGetCPInfoEx(cp, 0, buf)) {
- rb_raise(eWIN32OLERuntimeError, "cannot map codepage to encoding.");
- break; /* never reach here */
- }
- cp = buf->CodePage;
- break;
- case CP_SYMBOL:
- case CP_UTF7:
- case CP_UTF8:
- break;
- case 51932:
- load_conv_function51932();
- break;
- default:
- rb_raise(eWIN32OLERuntimeError, "codepage should be WIN32OLE::CP_ACP, WIN32OLE::CP_OEMCP, WIN32OLE::CP_MACCP, WIN32OLE::CP_THREAD_ACP, WIN32OLE::CP_SYMBOL, WIN32OLE::CP_UTF7, WIN32OLE::CP_UTF8, or installed codepage.");
- break;
- }
- }
+static double
+time_object2date(tmobj)
+ VALUE tmobj;
+{
+ long y, m, d, hh, mm, ss;
+ long day;
+ double t;
+ y = FIX2INT(rb_funcall(tmobj, rb_intern("year"), 0));
+ m = FIX2INT(rb_funcall(tmobj, rb_intern("month"), 0));
+ d = FIX2INT(rb_funcall(tmobj, rb_intern("mday"), 0));
+ hh = FIX2INT(rb_funcall(tmobj, rb_intern("hour"), 0));
+ mm = FIX2INT(rb_funcall(tmobj, rb_intern("min"), 0));
+ ss = FIX2INT(rb_funcall(tmobj, rb_intern("sec"), 0));
+ civil2jd(y, m, d, &day);
+ time2d(hh, mm, ss, &t);
+ return t + day - 2415019;
+}
- enc_name = rb_sprintf("CP%d", cp);
- idx = rb_enc_find_index(enc_cstr = StringValueCStr(enc_name));
- if (idx < 0)
- idx = rb_define_dummy_encoding(enc_cstr);
- return rb_enc_from_index(idx);
+static VALUE
+date2time_str(date)
+ double date;
+{
+ int y, m, d, hh, mm, ss;
+ char szTime[20];
+ double2time(date, &y, &m, &d, &hh, &mm, &ss);
+ sprintf(szTime,
+ "%4.4d/%02.2d/%02.2d %02.2d:%02.2d:%02.2d",
+ y, m, d, hh, mm, ss);
+ return rb_str_new2(szTime);
}
+static void ole_val2variant();
+
static char *
-ole_wc2mb(LPWSTR pw)
+ole_wc2mb(pw)
+ LPWSTR pw;
{
+ int size;
LPSTR pm;
- int size = 0;
- if (conv_51932(cWIN32OLE_cp)) {
-#ifndef pIMultiLanguage
- DWORD dw = 0;
- HRESULT hr = pIMultiLanguage->lpVtbl->ConvertStringFromUnicode(pIMultiLanguage,
- &dw, cWIN32OLE_cp, pw, NULL, NULL, &size);
- if (FAILED(hr)) {
- ole_raise(hr, eWIN32OLERuntimeError, "fail to convert Unicode to CP%d", cWIN32OLE_cp);
- }
- pm = ALLOC_N(char, size + 1);
- hr = pIMultiLanguage->lpVtbl->ConvertStringFromUnicode(pIMultiLanguage,
- &dw, cWIN32OLE_cp, pw, NULL, pm, &size);
- if (FAILED(hr)) {
- ole_raise(hr, eWIN32OLERuntimeError, "fail to convert Unicode to CP%d", cWIN32OLE_cp);
- }
- pm[size] = '\0';
-#endif
- return pm;
- }
size = WideCharToMultiByte(cWIN32OLE_cp, 0, pw, -1, NULL, 0, NULL, NULL);
if (size) {
pm = ALLOC_N(char, size + 1);
@@ -1065,7 +489,8 @@ ole_wc2mb(LPWSTR pw)
}
static VALUE
-ole_hresult2msg(HRESULT hr)
+ole_hresult2msg(hr)
+ HRESULT hr;
{
VALUE msg = Qnil;
char *p_msg = NULL;
@@ -1073,13 +498,13 @@ ole_hresult2msg(HRESULT hr)
DWORD dwCount;
char strhr[100];
- sprintf(strhr, " HRESULT error code:0x%08x\n ", (unsigned)hr);
+ sprintf(strhr, " HRESULT error code:0x%08lx\n ", hr);
msg = rb_str_new2(strhr);
dwCount = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
FORMAT_MESSAGE_FROM_SYSTEM |
FORMAT_MESSAGE_IGNORE_INSERTS,
- NULL, hr, cWIN32OLE_lcid,
+ NULL, hr, LOCALE_SYSTEM_DEFAULT,
(LPTSTR)&p_msg, 0, NULL);
if (dwCount > 0) {
term = p_msg + strlen(p_msg);
@@ -1098,7 +523,8 @@ ole_hresult2msg(HRESULT hr)
}
static void
-ole_freeexceptinfo(EXCEPINFO *pExInfo)
+ole_freeexceptinfo(pExInfo)
+ EXCEPINFO *pExInfo;
{
SysFreeString(pExInfo->bstrDescription);
SysFreeString(pExInfo->bstrSource);
@@ -1106,7 +532,8 @@ ole_freeexceptinfo(EXCEPINFO *pExInfo)
}
static VALUE
-ole_excepinfo2msg(EXCEPINFO *pExInfo)
+ole_excepinfo2msg(pExInfo)
+ EXCEPINFO *pExInfo;
{
char error_code[40];
char *pSource = NULL;
@@ -1148,7 +575,15 @@ ole_excepinfo2msg(EXCEPINFO *pExInfo)
}
static void
+#ifdef HAVE_STDARG_PROTOTYPES
ole_raise(HRESULT hr, VALUE ecs, const char *fmt, ...)
+#else
+ole_raise(hr, exc, fmt, va_alist)
+ HRESULT hr;
+ VALUE exc;
+ const char *fmt;
+ va_dcl
+#endif
{
va_list args;
char buf[BUFSIZ];
@@ -1170,7 +605,7 @@ void
ole_uninitialize()
{
OleUninitialize();
- g_ole_initialized = FALSE;
+ gOLEInitialized = Qfalse;
}
static void
@@ -1178,23 +613,18 @@ ole_initialize()
{
HRESULT hr;
- if(g_ole_initialized == FALSE) {
+ if(gOLEInitialized == Qfalse) {
hr = OleInitialize(NULL);
if(FAILED(hr)) {
ole_raise(hr, rb_eRuntimeError, "fail: OLE initialize");
}
- g_ole_initialized = TRUE;
+ gOLEInitialized = Qtrue;
/*
* In some situation, OleUninitialize does not work fine. ;-<
*/
/*
atexit((void (*)(void))ole_uninitialize);
*/
- hr = CoRegisterMessageFilter(&imessage_filter, &previous_filter);
- if(FAILED(hr)) {
- previous_filter = NULL;
- ole_raise(hr, rb_eRuntimeError, "fail: install OLE MessageFilter");
- }
}
}
@@ -1208,21 +638,24 @@ ole_msg_loop() {
}
static void
-ole_free(struct oledata *pole)
+ole_free(pole)
+ struct oledata *pole;
{
OLE_FREE(pole->pDispatch);
free(pole);
}
static void
-oletype_free(struct oletypedata *poletype)
+oletype_free(poletype)
+ struct oletypedata *poletype;
{
OLE_FREE(poletype->pTypeInfo);
free(poletype);
}
static void
-olemethod_free(struct olemethoddata *polemethod)
+olemethod_free(polemethod)
+ struct olemethoddata *polemethod;
{
OLE_FREE(polemethod->pTypeInfo);
OLE_FREE(polemethod->pOwnerTypeInfo);
@@ -1230,97 +663,28 @@ olemethod_free(struct olemethoddata *polemethod)
}
static void
-olevariable_free(struct olevariabledata *polevar)
+olevariable_free(polevar)
+ struct olevariabledata *polevar;
{
OLE_FREE(polevar->pTypeInfo);
free(polevar);
}
static void
-oleparam_free(struct oleparamdata *pole)
+oleparam_free(pole)
+ struct oleparamdata *pole;
{
OLE_FREE(pole->pTypeInfo);
free(pole);
}
-
-static LPWSTR
-ole_vstr2wc(VALUE vstr)
-{
- rb_encoding *enc;
- int cp;
- int size = 0;
- LPWSTR pw;
- st_data_t data;
- enc = rb_enc_get(vstr);
-
- if (st_lookup(enc2cp_table, (st_data_t)enc, &data)) {
- cp = data;
- } else {
- cp = ole_encoding2cp(enc);
- if (code_page_installed(cp) ||
- cp == CP_ACP ||
- cp == CP_OEMCP ||
- cp == CP_MACCP ||
- cp == CP_THREAD_ACP ||
- cp == CP_SYMBOL ||
- cp == CP_UTF7 ||
- cp == CP_UTF8 ||
- cp == 51932) {
- st_insert(enc2cp_table, (st_data_t)enc, (st_data_t)cp);
- } else {
- rb_raise(eWIN32OLERuntimeError, "not installed Windows codepage(%d) according to `%s'", cp, rb_enc_name(enc));
- }
- }
- if (conv_51932(cp)) {
-#ifndef pIMultiLanguage
- DWORD dw = 0;
- int len = RSTRING_LEN(vstr);
- HRESULT hr = pIMultiLanguage->lpVtbl->ConvertStringToUnicode(pIMultiLanguage,
- &dw, cp, RSTRING_PTR(vstr), &len, NULL, &size);
- if (FAILED(hr)) {
- ole_raise(hr, eWIN32OLERuntimeError, "fail to convert CP%d to Unicode", cp);
- }
- pw = SysAllocStringLen(NULL, size);
- len = RSTRING_LEN(vstr);
- hr = pIMultiLanguage->lpVtbl->ConvertStringToUnicode(pIMultiLanguage,
- &dw, cp, RSTRING_PTR(vstr), &len, pw, &size);
- if (FAILED(hr)) {
- ole_raise(hr, eWIN32OLERuntimeError, "fail to convert CP%d to Unicode", cp);
- }
-#endif
- return pw;
- }
- size = MultiByteToWideChar(cp, 0, RSTRING_PTR(vstr), RSTRING_LEN(vstr), NULL, 0);
- pw = SysAllocStringLen(NULL, size);
- MultiByteToWideChar(cp, 0, RSTRING_PTR(vstr), RSTRING_LEN(vstr), pw, size);
- return pw;
-}
-
static LPWSTR
-ole_mb2wc(char *pm, int len)
+ole_mb2wc(pm, len)
+ char *pm;
+ int len;
{
- int size = 0;
+ int size;
LPWSTR pw;
-
- if (conv_51932(cWIN32OLE_cp)) {
-#ifndef pIMultiLanguage
- DWORD dw = 0;
- int n = len;
- HRESULT hr = pIMultiLanguage->lpVtbl->ConvertStringToUnicode(pIMultiLanguage,
- &dw, cWIN32OLE_cp, pm, &n, NULL, &size);
- if (FAILED(hr)) {
- ole_raise(hr, eWIN32OLERuntimeError, "fail to convert CP%d to Unicode", cWIN32OLE_cp);
- }
- pw = SysAllocStringLen(NULL, size);
- hr = pIMultiLanguage->lpVtbl->ConvertStringToUnicode(pIMultiLanguage,
- &dw, cWIN32OLE_cp, pm, &n, pw, &size);
- if (FAILED(hr)) {
- ole_raise(hr, eWIN32OLERuntimeError, "fail to convert CP%d to Unicode", cWIN32OLE_cp);
- }
-#endif
- return pw;
- }
size = MultiByteToWideChar(cWIN32OLE_cp, 0, pm, len, NULL, 0);
pw = SysAllocStringLen(NULL, size - 1);
MultiByteToWideChar(cWIN32OLE_cp, 0, pm, len, pw, size);
@@ -1328,10 +692,12 @@ ole_mb2wc(char *pm, int len)
}
static VALUE
-ole_wc2vstr(LPWSTR pw, BOOL isfree)
+ole_wc2vstr(pw, isfree)
+ LPWSTR pw;
+ BOOL isfree;
{
char *p = ole_wc2mb(pw);
- VALUE vstr = rb_enc_str_new(p, strlen(p), cWIN32OLE_enc);
+ VALUE vstr = rb_str_new2(p);
if(isfree)
SysFreeString(pw);
free(p);
@@ -1339,7 +705,9 @@ ole_wc2vstr(LPWSTR pw, BOOL isfree)
}
static VALUE
-ole_ary_m_entry(VALUE val, long *pid)
+ole_ary_m_entry(val, pid)
+ VALUE val;
+ long *pid;
{
VALUE obj = Qnil;
int i = 0;
@@ -1351,230 +719,40 @@ ole_ary_m_entry(VALUE val, long *pid)
return obj;
}
-static void *
-get_ptr_of_variant(VARIANT *pvar)
-{
- switch(V_VT(pvar)) {
- case VT_UI1:
- return &V_UI1(pvar);
- break;
- case VT_I2:
- return &V_I2(pvar);
- break;
- case VT_UI2:
- return &V_UI2(pvar);
- break;
- case VT_I4:
- return &V_I4(pvar);
- break;
- case VT_UI4:
- return &V_UI4(pvar);
- break;
- case VT_R4:
- return &V_R4(pvar);
- break;
- case VT_R8:
- return &V_R8(pvar);
- break;
-#if (_MSC_VER >= 1300) || defined(__CYGWIN__) || defined(__MINGW32__)
- case VT_I8:
- return &V_I8(pvar);
- break;
- case VT_UI8:
- return &V_UI8(pvar);
- break;
-#endif
- case VT_INT:
- return &V_INT(pvar);
- break;
- case VT_UINT:
- return &V_UINT(pvar);
- break;
- case VT_CY:
- return &V_CY(pvar);
- break;
- case VT_DATE:
- return &V_DATE(pvar);
- break;
- case VT_BSTR:
- return V_BSTR(pvar);
- break;
- case VT_DISPATCH:
- return V_DISPATCH(pvar);
- break;
- case VT_ERROR:
- return &V_ERROR(pvar);
- break;
- case VT_BOOL:
- return &V_BOOL(pvar);
- break;
- case VT_UNKNOWN:
- return V_UNKNOWN(pvar);
- break;
- case VT_ARRAY:
- return &V_ARRAY(pvar);
- break;
- default:
- return NULL;
- break;
- }
-}
-
-static VALUE
-is_all_index_under(long *pid, long *pub, long dim)
-{
- long i = 0;
- for (i = 0; i < dim; i++) {
- if (pid[i] > pub[i]) {
- return Qfalse;
- }
- }
- return Qtrue;
-}
-
static void
-ole_set_safe_array(long n, SAFEARRAY *psa, long *pid, long *pub, VALUE val, long dim, VARTYPE vt)
+ole_set_safe_array(n, psa, pid, pub, val, dim)
+ long n;
+ SAFEARRAY *psa;
+ long *pid;
+ long *pub;
+ VALUE val;
+ long dim;
{
VALUE val1;
- HRESULT hr = S_OK;
VARIANT var;
- VOID *p = NULL;
- long i = n;
- while(i >= 0) {
+ VariantInit(&var);
+ if(n < 0) return;
+ if(n == dim) {
val1 = ole_ary_m_entry(val, pid);
- VariantInit(&var);
- p = val2variant_ptr(val1, &var, vt);
- if (is_all_index_under(pid, pub, dim) == Qtrue) {
- if ((V_VT(&var) == VT_DISPATCH && V_DISPATCH(&var) == NULL) ||
- (V_VT(&var) == VT_UNKNOWN && V_UNKNOWN(&var) == NULL)) {
- rb_raise(eWIN32OLERuntimeError, "element of array does not have IDispatch or IUnknown Interface");
- }
- hr = SafeArrayPutElement(psa, pid, p);
- }
- if (FAILED(hr)) {
- ole_raise(hr, rb_eRuntimeError, "failed to SafeArrayPutElement");
- }
- pid[i] += 1;
- if (pid[i] > pub[i]) {
- pid[i] = 0;
- i -= 1;
- } else {
- i = dim - 1;
- }
- }
-}
-
-static long
-dimension(VALUE val) {
- long dim = 0;
- long dim1 = 0;
- long len = 0;
- long i = 0;
- if (TYPE(val) == T_ARRAY) {
- len = RARRAY_LEN(val);
- for (i = 0; i < len; i++) {
- dim1 = dimension(rb_ary_entry(val, i));
- if (dim < dim1) {
- dim = dim1;
- }
- }
- dim += 1;
- }
- return dim;
-}
-
-static long
-ary_len_of_dim(VALUE ary, long dim) {
- long ary_len = 0;
- long ary_len1 = 0;
- long len = 0;
- long i = 0;
- VALUE val;
- if (dim == 0) {
- if (TYPE(ary) == T_ARRAY) {
- ary_len = RARRAY_LEN(ary);
- }
- } else {
- if (TYPE(ary) == T_ARRAY) {
- len = RARRAY_LEN(ary);
- for (i = 0; i < len; i++) {
- val = rb_ary_entry(ary, i);
- ary_len1 = ary_len_of_dim(val, dim-1);
- if (ary_len < ary_len1) {
- ary_len = ary_len1;
- }
- }
- }
- }
- return ary_len;
-}
-
-static HRESULT
-ole_val_ary2variant_ary(VALUE val, VARIANT *var, VARTYPE vt)
-{
- long dim = 0;
- int i = 0;
- HRESULT hr = S_OK;
-
- SAFEARRAYBOUND *psab = NULL;
- SAFEARRAY *psa = NULL;
- long *pub, *pid;
-
- Check_Type(val, T_ARRAY);
-
- dim = dimension(val);
-
- psab = ALLOC_N(SAFEARRAYBOUND, dim);
- pub = ALLOC_N(long, dim);
- pid = ALLOC_N(long, dim);
-
- if(!psab || !pub || !pid) {
- if(pub) free(pub);
- if(psab) free(psab);
- if(pid) free(pid);
- rb_raise(rb_eRuntimeError, "memory allocation error");
- }
-
- for (i = 0; i < dim; i++) {
- psab[i].cElements = ary_len_of_dim(val, i);
- psab[i].lLbound = 0;
- pub[i] = psab[i].cElements - 1;
- pid[i] = 0;
- }
- /* Create and fill VARIANT array */
- if ((vt & ~VT_BYREF) == VT_ARRAY) {
- vt = (vt | VT_VARIANT);
- }
- psa = SafeArrayCreate((VARTYPE)(vt & VT_TYPEMASK), dim, psab);
- if (psa == NULL)
- hr = E_OUTOFMEMORY;
- else
- hr = SafeArrayLock(psa);
- if (SUCCEEDED(hr)) {
- ole_set_safe_array(dim-1, psa, pid, pub, val, dim, (VARTYPE)(vt & VT_TYPEMASK));
- hr = SafeArrayUnlock(psa);
+ ole_val2variant(val1, &var);
+ SafeArrayPutElement(psa, pid, &var);
}
-
- if(pub) free(pub);
- if(psab) free(psab);
- if(pid) free(pid);
-
- if (SUCCEEDED(hr)) {
- V_VT(var) = vt;
- V_ARRAY(var) = psa;
+ pid[n] += 1;
+ if (pid[n] < pub[n]) {
+ ole_set_safe_array(dim, psa, pid, pub, val, dim);
}
else {
- if (psa != NULL)
- SafeArrayDestroy(psa);
+ pid[n] = 0;
+ ole_set_safe_array(n-1, psa, pid, pub, val, dim);
}
- return hr;
}
static void
-ole_val2variant(VALUE val, VARIANT *var)
+ole_val2variant(val, var)
+ VALUE val;
+ VARIANT *var;
{
struct oledata *pole;
- struct olevariantdata *pvar;
if(rb_obj_is_kind_of(val, cWIN32OLE)) {
Data_Get_Struct(val, struct oledata, pole);
OLE_ADDREF(pole->pDispatch);
@@ -1582,24 +760,73 @@ ole_val2variant(VALUE val, VARIANT *var)
V_DISPATCH(var) = pole->pDispatch;
return;
}
- if (rb_obj_is_kind_of(val, cWIN32OLE_VARIANT)) {
- Data_Get_Struct(val, struct olevariantdata, pvar);
- VariantCopy(var, &(pvar->var));
- return;
- }
-
if (rb_obj_is_kind_of(val, rb_cTime)) {
V_VT(var) = VT_DATE;
- V_DATE(var) = rbtime2vtdate(val);
+ V_DATE(var) = time_object2date(val);
return;
}
switch (TYPE(val)) {
case T_ARRAY:
- ole_val_ary2variant_ary(val, var, VT_VARIANT|VT_ARRAY);
+ {
+ VALUE val1;
+ long dim = 0;
+ int i = 0;
+
+ HRESULT hr;
+ SAFEARRAYBOUND *psab;
+ SAFEARRAY *psa;
+ long *pub, *pid;
+
+ val1 = val;
+ while(TYPE(val1) == T_ARRAY) {
+ val1 = rb_ary_entry(val1, 0);
+ dim += 1;
+ }
+ psab = ALLOC_N(SAFEARRAYBOUND, dim);
+ pub = ALLOC_N(long, dim);
+ pid = ALLOC_N(long, dim);
+
+ if(!psab || !pub || !pid) {
+ if(pub) free(pub);
+ if(psab) free(psab);
+ if(pid) free(pid);
+ rb_raise(rb_eRuntimeError, "memory allocation error");
+ }
+ val1 = val;
+ i = 0;
+ while(TYPE(val1) == T_ARRAY) {
+ psab[i].cElements = RARRAY(val1)->len;
+ psab[i].lLbound = 0;
+ pub[i] = psab[i].cElements;
+ pid[i] = 0;
+ i ++;
+ val1 = rb_ary_entry(val1, 0);
+ }
+ /* Create and fill VARIANT array */
+ psa = SafeArrayCreate(VT_VARIANT, dim, psab);
+ if (psa == NULL)
+ hr = E_OUTOFMEMORY;
+ else
+ hr = SafeArrayLock(psa);
+ if (SUCCEEDED(hr)) {
+ ole_set_safe_array(dim-1, psa, pid, pub, val, dim-1);
+ hr = SafeArrayUnlock(psa);
+ }
+ if(pub) free(pub);
+ if(psab) free(psab);
+ if(pid) free(pid);
+
+ if (SUCCEEDED(hr)) {
+ V_VT(var) = VT_VARIANT | VT_ARRAY;
+ V_ARRAY(var) = psa;
+ }
+ else if (psa != NULL)
+ SafeArrayDestroy(psa);
break;
+ }
case T_STRING:
V_VT(var) = VT_BSTR;
- V_BSTR(var) = ole_vstr2wc(val);
+ V_BSTR(var) = ole_mb2wc(StringValuePtr(val), -1);
break;
case T_FIXNUM:
V_VT(var) = VT_I4;
@@ -1637,290 +864,9 @@ ole_val2variant(VALUE val, VARIANT *var)
}
static void
-ole_val2variant_ex(VALUE val, VARIANT *var, VARTYPE vt)
-{
- if (val == Qnil) {
- if (vt == VT_VARIANT) {
- ole_val2variant2(val, var);
- } else {
- V_VT(var) = (vt & ~VT_BYREF);
- if (V_VT(var) == VT_DISPATCH) {
- V_DISPATCH(var) = NULL;
- } else if (V_VT(var) == VT_UNKNOWN) {
- V_UNKNOWN(var) = NULL;
- }
- }
- return;
- }
-#if (_MSC_VER >= 1300) || defined(__CYGWIN__) || defined(__MINGW32__)
- switch(vt & ~VT_BYREF) {
- case VT_I8:
- V_VT(var) = VT_I8;
- V_I8(var) = NUM2I8 (val);
- break;
- case VT_UI8:
- V_VT(var) = VT_UI8;
- V_UI8(var) = NUM2UI8(val);
- break;
- default:
- ole_val2variant2(val, var);
- break;
- }
-#else /* (_MSC_VER >= 1300) || defined(__CYGWIN__) || defined(__MINGW32__) */
- ole_val2variant2(val, var);
-#endif
-}
-
-static void
-ole_val2ptr_variant(VALUE val, VARIANT *var)
-{
- switch (TYPE(val)) {
- case T_STRING:
- if (V_VT(var) == (VT_BSTR | VT_BYREF)) {
- *V_BSTRREF(var) = ole_vstr2wc(val);
- }
- break;
- case T_FIXNUM:
- switch(V_VT(var)) {
- case (VT_UI1 | VT_BYREF) :
- *V_UI1REF(var) = NUM2CHR(val);
- break;
- case (VT_I2 | VT_BYREF) :
- *V_I2REF(var) = (short)NUM2INT(val);
- break;
- case (VT_I4 | VT_BYREF) :
- *V_I4REF(var) = NUM2INT(val);
- break;
- case (VT_R4 | VT_BYREF) :
- *V_R4REF(var) = (float)NUM2INT(val);
- break;
- case (VT_R8 | VT_BYREF) :
- *V_R8REF(var) = NUM2INT(val);
- break;
- default:
- break;
- }
- break;
- case T_FLOAT:
- switch(V_VT(var)) {
- case (VT_I2 | VT_BYREF) :
- *V_I2REF(var) = (short)NUM2INT(val);
- break;
- case (VT_I4 | VT_BYREF) :
- *V_I4REF(var) = NUM2INT(val);
- break;
- case (VT_R4 | VT_BYREF) :
- *V_R4REF(var) = (float)NUM2DBL(val);
- break;
- case (VT_R8 | VT_BYREF) :
- *V_R8REF(var) = NUM2DBL(val);
- break;
- default:
- break;
- }
- break;
- case T_BIGNUM:
- if (V_VT(var) == (VT_R8 | VT_BYREF)) {
- *V_R8REF(var) = rb_big2dbl(val);
- }
- break;
- case T_TRUE:
- if (V_VT(var) == (VT_BOOL | VT_BYREF)) {
- *V_BOOLREF(var) = VARIANT_TRUE;
- }
- break;
- case T_FALSE:
- if (V_VT(var) == (VT_BOOL | VT_BYREF)) {
- *V_BOOLREF(var) = VARIANT_FALSE;
- }
- break;
- default:
- break;
- }
-}
-
-static void
-ole_set_byref(VARIANT *realvar, VARIANT *var, VARTYPE vt)
-{
- V_VT(var) = vt;
- if (vt == (VT_VARIANT|VT_BYREF)) {
- V_VARIANTREF(var) = realvar;
- } else {
- if (V_VT(realvar) != (vt & ~VT_BYREF)) {
- rb_raise(eWIN32OLERuntimeError, "variant type mismatch");
- }
- switch(vt & ~VT_BYREF) {
- case VT_I1:
- V_I1REF(var) = &V_I1(realvar);
- break;
- case VT_UI1:
- V_UI1REF(var) = &V_UI1(realvar);
- break;
- case VT_I2:
- V_I2REF(var) = &V_I2(realvar);
- break;
- case VT_UI2:
- V_UI2REF(var) = &V_UI2(realvar);
- break;
- case VT_I4:
- V_I4REF(var) = &V_I4(realvar);
- break;
- case VT_UI4:
- V_UI4REF(var) = &V_UI4(realvar);
- break;
- case VT_R4:
- V_R4REF(var) = &V_R4(realvar);
- break;
- case VT_R8:
- V_R8REF(var) = &V_R8(realvar);
- break;
-
-#if (_MSC_VER >= 1300)
- case VT_I8:
- V_I8REF(var) = &V_I8(realvar);
- break;
- case VT_UI8:
- V_UI8REF(var) = &V_UI8(realvar);
- break;
-#endif
- case VT_INT:
- V_INTREF(var) = &V_INT(realvar);
- break;
-
- case VT_UINT:
- V_UINTREF(var) = &V_UINT(realvar);
- break;
-
- case VT_CY:
- V_CYREF(var) = &V_CY(realvar);
- break;
- case VT_DATE:
- V_DATEREF(var) = &V_DATE(realvar);
- break;
- case VT_BSTR:
- V_BSTRREF(var) = &V_BSTR(realvar);
- break;
- case VT_DISPATCH:
- V_DISPATCHREF(var) = &V_DISPATCH(realvar);
- break;
- case VT_ERROR:
- V_ERRORREF(var) = &V_ERROR(realvar);
- break;
- case VT_BOOL:
- V_BOOLREF(var) = &V_BOOL(realvar);
- break;
- case VT_UNKNOWN:
- V_UNKNOWNREF(var) = &V_UNKNOWN(realvar);
- break;
- case VT_ARRAY:
- V_ARRAYREF(var) = &V_ARRAY(realvar);
- break;
- default:
- rb_raise(eWIN32OLERuntimeError, "unknown type specified(setting BYREF):%d", vt);
- break;
- }
- }
-}
-
-static void
-ole_val2olevariantdata(VALUE val, VARTYPE vt, struct olevariantdata *pvar)
-{
- HRESULT hr = S_OK;
-
- if (((vt & ~VT_BYREF) == (VT_ARRAY | VT_UI1)) && TYPE(val) == T_STRING) {
- long len = RSTRING_LEN(val);
- void *pdest = NULL;
- SAFEARRAY *p = NULL;
- SAFEARRAY *psa = SafeArrayCreateVector(VT_UI1, 0, len);
- if (!psa) {
- rb_raise(rb_eRuntimeError, "fail to SafeArrayCreateVector");
- }
- hr = SafeArrayAccessData(psa, &pdest);
- if (SUCCEEDED(hr)) {
- memcpy(pdest, RSTRING_PTR(val), len);
- SafeArrayUnaccessData(psa);
- V_VT(&(pvar->realvar)) = (vt & ~VT_BYREF);
- p = V_ARRAY(&(pvar->realvar));
- if (p != NULL) {
- SafeArrayDestroy(p);
- }
- V_ARRAY(&(pvar->realvar)) = psa;
- if (vt & VT_BYREF) {
- V_VT(&(pvar->var)) = vt;
- V_ARRAYREF(&(pvar->var)) = &(V_ARRAY(&(pvar->realvar)));
- } else {
- hr = VariantCopy(&(pvar->var), &(pvar->realvar));
- }
- } else {
- if (psa)
- SafeArrayDestroy(psa);
- }
- } else if (vt & VT_ARRAY) {
- if (val == Qnil) {
- V_VT(&(pvar->var)) = vt;
- if (vt & VT_BYREF) {
- V_ARRAYREF(&(pvar->var)) = &(V_ARRAY(&(pvar->realvar)));
- }
- } else {
- hr = ole_val_ary2variant_ary(val, &(pvar->realvar), (VARTYPE)(vt & ~VT_BYREF));
- if (SUCCEEDED(hr)) {
- if (vt & VT_BYREF) {
- V_VT(&(pvar->var)) = vt;
- V_ARRAYREF(&(pvar->var)) = &(V_ARRAY(&(pvar->realvar)));
- } else {
- hr = VariantCopy(&(pvar->var), &(pvar->realvar));
- }
- }
- }
-#if (_MSC_VER >= 1300) || defined(__CYGWIN__) || defined(__MINGW32__)
- } else if ( (vt & ~VT_BYREF) == VT_I8 || (vt & ~VT_BYREF) == VT_UI8) {
- ole_val2variant_ex(val, &(pvar->realvar), (vt & ~VT_BYREF));
- ole_val2variant_ex(val, &(pvar->var), (vt & ~VT_BYREF));
- V_VT(&(pvar->var)) = vt;
- if (vt & VT_BYREF) {
- ole_set_byref(&(pvar->realvar), &(pvar->var), vt);
- }
-#endif
- } else {
- if (val == Qnil) {
- V_VT(&(pvar->var)) = vt;
- if (vt == (VT_BYREF | VT_VARIANT)) {
- ole_set_byref(&(pvar->realvar), &(pvar->var), vt);
- } else {
- V_VT(&(pvar->realvar)) = vt & ~VT_BYREF;
- if (vt & VT_BYREF) {
- ole_set_byref(&(pvar->realvar), &(pvar->var), vt);
- }
- }
- } else {
- ole_val2variant_ex(val, &(pvar->realvar), (VARTYPE)(vt & ~VT_BYREF));
- if (vt == (VT_BYREF | VT_VARIANT)) {
- ole_set_byref(&(pvar->realvar), &(pvar->var), vt);
- } else if (vt & VT_BYREF) {
- if ( (vt & ~VT_BYREF) != V_VT(&(pvar->realvar))) {
- hr = VariantChangeTypeEx(&(pvar->realvar), &(pvar->realvar),
- cWIN32OLE_lcid, 0, (VARTYPE)(vt & ~VT_BYREF));
- }
- if (SUCCEEDED(hr)) {
- ole_set_byref(&(pvar->realvar), &(pvar->var), vt);
- }
- } else {
- if (vt == V_VT(&(pvar->realvar))) {
- hr = VariantCopy(&(pvar->var), &(pvar->realvar));
- } else {
- hr = VariantChangeTypeEx(&(pvar->var), &(pvar->realvar),
- cWIN32OLE_lcid, 0, vt);
- }
- }
- }
- }
- if (FAILED(hr)) {
- ole_raise(hr, eWIN32OLERuntimeError, "failed to change type");
- }
-}
-
-static void
-ole_val2variant2(VALUE val, VARIANT *var)
+ole_val2variant2(val, var)
+ VALUE val;
+ VARIANT *var;
{
g_nil_to = VT_EMPTY;
ole_val2variant(val, var);
@@ -1928,26 +874,9 @@ ole_val2variant2(VALUE val, VARIANT *var)
}
static VALUE
-make_inspect(const char *class_name, VALUE detail)
-{
- VALUE str;
- str = rb_str_new2("#<");
- rb_str_cat2(str, class_name);
- rb_str_cat2(str, ":");
- rb_str_concat(str, detail);
- rb_str_cat2(str, ">");
- return str;
-}
-
-static VALUE
-default_inspect(VALUE self, const char *class_name)
-{
- VALUE detail = rb_funcall(self, rb_intern("to_s"), 0);
- return make_inspect(class_name, detail);
-}
-
-static VALUE
-ole_set_member(VALUE self, IDispatch *dispatch)
+ole_set_member(self, dispatch)
+ VALUE self;
+ IDispatch * dispatch;
{
struct oledata *pole;
Data_Get_Struct(self, struct oledata, pole);
@@ -1959,9 +888,10 @@ ole_set_member(VALUE self, IDispatch *dispatch)
return self;
}
-
+static VALUE fole_s_allocate _((VALUE));
static VALUE
-fole_s_allocate(VALUE klass)
+fole_s_allocate(klass)
+ VALUE klass;
{
struct oledata *pole;
VALUE obj;
@@ -1972,7 +902,11 @@ fole_s_allocate(VALUE klass)
}
static VALUE
-create_win32ole_object(VALUE klass, IDispatch *pDispatch, int argc, VALUE *argv)
+create_win32ole_object(klass, pDispatch, argc, argv)
+ VALUE klass;
+ IDispatch *pDispatch;
+ int argc;
+ VALUE *argv;
{
VALUE obj = fole_s_allocate(klass);
ole_set_member(obj, pDispatch);
@@ -1980,40 +914,8 @@ create_win32ole_object(VALUE klass, IDispatch *pDispatch, int argc, VALUE *argv)
}
static VALUE
-ary_new_dim(VALUE myary, long *pid, long *plb, long dim) {
- long i;
- VALUE obj = Qnil;
- VALUE pobj = Qnil;
- long *ids = ALLOC_N(long, dim);
- if (!ids) {
- rb_raise(rb_eRuntimeError, "memory allocation error");
- }
- for(i = 0; i < dim; i++) {
- ids[i] = pid[i] - plb[i];
- }
- obj = myary;
- pobj = myary;
- for(i = 0; i < dim-1; i++) {
- obj = rb_ary_entry(pobj, ids[i]);
- if (obj == Qnil) {
- rb_ary_store(pobj, ids[i], rb_ary_new());
- }
- obj = rb_ary_entry(pobj, ids[i]);
- pobj = obj;
- }
- if (ids) free(ids);
- return obj;
-}
-
-static void
-ary_store_dim(VALUE myary, long *pid, long *plb, long dim, VALUE val) {
- long id = pid[dim - 1] - plb[dim - 1];
- VALUE obj = ary_new_dim(myary, pid, plb, dim);
- rb_ary_store(obj, id, val);
-}
-
-static VALUE
-ole_variant2val(VARIANT *pvar)
+ole_variant2val(pvar)
+ VARIANT *pvar;
{
VALUE obj = Qnil;
HRESULT hr;
@@ -2022,70 +924,75 @@ ole_variant2val(VARIANT *pvar)
if(V_ISARRAY(pvar)) {
SAFEARRAY *psa = V_ISBYREF(pvar) ? *V_ARRAYREF(pvar) : V_ARRAY(pvar);
- UINT i = 0;
- long *pid, *plb, *pub;
+ long i;
+ long *pID, *pLB, *pUB;
VARIANT variant;
VALUE val;
- UINT dim = 0;
+ VALUE val2;
+ int dim = 0;
+
if (!psa) {
return obj;
}
dim = SafeArrayGetDim(psa);
+
VariantInit(&variant);
V_VT(&variant) = (V_VT(pvar) & ~VT_ARRAY) | VT_BYREF;
- pid = ALLOC_N(long, dim);
- plb = ALLOC_N(long, dim);
- pub = ALLOC_N(long, dim);
+ pID = ALLOC_N(long, dim);
+ pLB = ALLOC_N(long, dim);
+ pUB = ALLOC_N(long, dim);
- if(!pid || !plb || !pub) {
- if(pid) free(pid);
- if(plb) free(plb);
- if(pub) free(pub);
+ if(!pID || !pLB || !pUB) {
+ if(pID) free(pID);
+ if(pLB) free(pLB);
+ if(pUB) free(pUB);
rb_raise(rb_eRuntimeError, "memory allocation error");
}
+ obj = Qnil;
+
for(i = 0; i < dim; ++i) {
- SafeArrayGetLBound(psa, i+1, &plb[i]);
- SafeArrayGetLBound(psa, i+1, &pid[i]);
- SafeArrayGetUBound(psa, i+1, &pub[i]);
+ SafeArrayGetLBound(psa, i+1, &pLB[i]);
+ SafeArrayGetLBound(psa, i+1, &pID[i]);
+ SafeArrayGetUBound(psa, i+1, &pUB[i]);
}
+
hr = SafeArrayLock(psa);
if (SUCCEEDED(hr)) {
- obj = rb_ary_new();
- i = 0;
- while (i < dim) {
- ary_new_dim(obj, pid, plb, dim);
- hr = SafeArrayPtrOfIndex(psa, pid, &V_BYREF(&variant));
- if (SUCCEEDED(hr)) {
- val = ole_variant2val(&variant);
- ary_store_dim(obj, pid, plb, dim, val);
- }
- for (i = 0; i < dim; ++i) {
- if (++pid[i] <= pub[i])
+ val2 = rb_ary_new();
+ while (i >= 0) {
+ hr = SafeArrayPtrOfIndex(psa, pID, &V_BYREF(&variant));
+ if (FAILED(hr))
+ break;
+
+ val = ole_variant2val(&variant);
+ rb_ary_push(val2, val);
+ for (i = dim-1 ; i >= 0 ; --i) {
+ if (++pID[i] <= pUB[i])
break;
- pid[i] = plb[i];
+
+ pID[i] = pLB[i];
+ if (i > 0) {
+ if (obj == Qnil)
+ obj = rb_ary_new();
+ rb_ary_push(obj, val2);
+ val2 = rb_ary_new();
+ }
}
}
SafeArrayUnlock(psa);
}
- if(pid) free(pid);
- if(plb) free(plb);
- if(pub) free(pub);
- return obj;
+ if(pID) free(pID);
+ if(pLB) free(pLB);
+ if(pUB) free(pUB);
+ return (obj == Qnil) ? val2 : obj;
}
switch(V_VT(pvar) & ~VT_BYREF){
case VT_EMPTY:
break;
case VT_NULL:
break;
- case VT_I1:
- if(V_ISBYREF(pvar))
- obj = INT2NUM((long)*V_I1REF(pvar));
- else
- obj = INT2NUM((long)V_I1(pvar));
- break;
-
case VT_UI1:
if(V_ISBYREF(pvar))
obj = INT2NUM((long)*V_UI1REF(pvar));
@@ -2100,13 +1007,6 @@ ole_variant2val(VARIANT *pvar)
obj = INT2NUM((long)V_I2(pvar));
break;
- case VT_UI2:
- if(V_ISBYREF(pvar))
- obj = INT2NUM((long)*V_UI2REF(pvar));
- else
- obj = INT2NUM((long)V_UI2(pvar));
- break;
-
case VT_I4:
if(V_ISBYREF(pvar))
obj = INT2NUM((long)*V_I4REF(pvar));
@@ -2114,50 +1014,6 @@ ole_variant2val(VARIANT *pvar)
obj = INT2NUM((long)V_I4(pvar));
break;
- case VT_UI4:
- if(V_ISBYREF(pvar))
- obj = INT2NUM((long)*V_UI4REF(pvar));
- else
- obj = INT2NUM((long)V_UI4(pvar));
- break;
-
- case VT_INT:
- if(V_ISBYREF(pvar))
- obj = INT2NUM((long)*V_INTREF(pvar));
- else
- obj = INT2NUM((long)V_INT(pvar));
- break;
-
- case VT_UINT:
- if(V_ISBYREF(pvar))
- obj = INT2NUM((long)*V_UINTREF(pvar));
- else
- obj = INT2NUM((long)V_UINT(pvar));
- break;
-
-#if (_MSC_VER >= 1300) || defined(__CYGWIN__) || defined(__MINGW32__)
- case VT_I8:
- if(V_ISBYREF(pvar))
-#if (_MSC_VER >= 1300)
- obj = I8_2_NUM(*V_I8REF(pvar));
-#else
- obj = Qnil;
-#endif
- else
- obj = I8_2_NUM(V_I8(pvar));
- break;
- case VT_UI8:
- if(V_ISBYREF(pvar))
-#if (_MSC_VER >= 1300)
- obj = UI8_2_NUM(*V_UI8REF(pvar));
-#else
- obj = Qnil;
-#endif
- else
- obj = UI8_2_NUM(V_UI8(pvar));
- break;
-#endif /* (_MSC_VER >= 1300) || defined(__CYGWIN__) || defined(__MINGW32__) */
-
case VT_R4:
if(V_ISBYREF(pvar))
obj = rb_float_new(*V_R4REF(pvar));
@@ -2174,10 +1030,13 @@ ole_variant2val(VARIANT *pvar)
case VT_BSTR:
{
+ char *p;
if(V_ISBYREF(pvar))
- obj = ole_wc2vstr(*V_BSTRREF(pvar), FALSE);
+ p = ole_wc2mb(*V_BSTRREF(pvar));
else
- obj = ole_wc2vstr(V_BSTR(pvar), FALSE);
+ p = ole_wc2mb(V_BSTR(pvar));
+ obj = rb_str_new2(p);
+ if(p) free(p);
break;
}
@@ -2213,10 +1072,10 @@ ole_variant2val(VARIANT *pvar)
case VT_UNKNOWN:
{
+
/* get IDispatch interface from IUnknown interface */
IUnknown *punk;
IDispatch *pDispatch;
- void *p;
HRESULT hr;
if (V_ISBYREF(pvar))
@@ -2225,9 +1084,9 @@ ole_variant2val(VARIANT *pvar)
punk = V_UNKNOWN(pvar);
if(punk != NULL) {
- hr = punk->lpVtbl->QueryInterface(punk, &IID_IDispatch, &p);
+ hr = punk->lpVtbl->QueryInterface(punk, &IID_IDispatch,
+ (void **)&pDispatch);
if(SUCCEEDED(hr)) {
- pDispatch = p;
obj = create_win32ole_object(cWIN32OLE, pDispatch, 0, 0);
}
}
@@ -2242,7 +1101,7 @@ ole_variant2val(VARIANT *pvar)
else
date = V_DATE(pvar);
- obj = vtdate2rbtime(date);
+ obj = date2time_str(date);
break;
}
case VT_CY:
@@ -2252,9 +1111,11 @@ ole_variant2val(VARIANT *pvar)
VARIANT variant;
VariantInit(&variant);
hr = VariantChangeTypeEx(&variant, pvar,
- cWIN32OLE_lcid, 0, VT_BSTR);
+ LOCALE_SYSTEM_DEFAULT, 0, VT_BSTR);
if (SUCCEEDED(hr) && V_VT(&variant) == VT_BSTR) {
- obj = ole_wc2vstr(V_BSTR(&variant), FALSE);
+ char *p = ole_wc2mb(V_BSTR(&variant));
+ obj = rb_str_new2(p);
+ if(p) free(p);
}
VariantClear(&variant);
break;
@@ -2263,23 +1124,30 @@ ole_variant2val(VARIANT *pvar)
return obj;
}
-static LONG
-reg_open_key(HKEY hkey, const char *name, HKEY *phkey)
+
+static LONG reg_open_key(hkey, name, phkey)
+ HKEY hkey;
+ const char *name;
+ HKEY *phkey;
{
return RegOpenKeyEx(hkey, name, 0, KEY_READ, phkey);
}
-static LONG
-reg_open_vkey(HKEY hkey, VALUE key, HKEY *phkey)
+static LONG reg_open_vkey(hkey, key, phkey)
+ HKEY hkey;
+ VALUE key;
+ HKEY *phkey;
{
return reg_open_key(hkey, StringValuePtr(key), phkey);
}
static VALUE
-reg_enum_key(HKEY hkey, DWORD i)
+reg_enum_key(hkey, i)
+ HKEY hkey;
+ DWORD i;
{
char buf[BUFSIZ + 1];
- DWORD size_buf = sizeof(buf);
+ DWORD size_buf = sizeof(buf) - 1;
FILETIME ft;
LONG err = RegEnumKeyEx(hkey, i, buf, &size_buf,
NULL, NULL, NULL, &ft);
@@ -2291,84 +1159,59 @@ reg_enum_key(HKEY hkey, DWORD i)
}
static VALUE
-reg_get_val(HKEY hkey, const char *subkey)
-{
- char *pbuf;
- DWORD dwtype = 0;
- LONG size = 0;
- VALUE val = Qnil;
- LONG err = RegQueryValueEx(hkey, subkey, NULL, &dwtype, NULL, &size);
-
- if (err == ERROR_SUCCESS) {
- pbuf = ALLOC_N(char, size + 1);
- err = RegQueryValueEx(hkey, subkey, NULL, &dwtype, pbuf, &size);
- if (err == ERROR_SUCCESS) {
- pbuf[size] = '\0';
- val = rb_str_new2(pbuf);
- }
- free(pbuf);
- }
- return val;
-}
-
-static VALUE
-reg_get_val2(HKEY hkey, const char *subkey)
+reg_get_val(hkey, subkey)
+ HKEY hkey;
+ const char *subkey;
{
- HKEY hsubkey;
- LONG err;
- VALUE val = Qnil;
- err = RegOpenKeyEx(hkey, subkey, 0, KEY_READ, &hsubkey);
+ char buf[BUFSIZ + 1];
+ LONG size_buf = sizeof(buf) - 1;
+ LONG err = RegQueryValue(hkey, subkey, buf, &size_buf);
if (err == ERROR_SUCCESS) {
- val = reg_get_val(hsubkey, NULL);
- RegCloseKey(hsubkey);
- }
- if (val == Qnil) {
- val = reg_get_val(hkey, subkey);
- }
- return val;
-}
-
-static VALUE
-reg_get_typelib_file_path(HKEY hkey)
-{
- VALUE path = Qnil;
- path = reg_get_val2(hkey, "win32");
- if (path == Qnil) {
- path = reg_get_val2(hkey, "win16");
+ buf[BUFSIZ] = '\0';
+ return rb_str_new2(buf);
}
- return path;
+ return Qnil;
}
static VALUE
-typelib_file_from_clsid(VALUE ole)
+typelib_file_from_clsid(ole)
+ VALUE ole;
{
+ OLECHAR *pbuf;
+ CLSID clsid;
+ HRESULT hr;
HKEY hroot, hclsid;
LONG err;
VALUE typelib;
- char path[MAX_PATH + 1];
+ VALUE vclsid;
+ char *pclsid = NULL;
+ pbuf = ole_mb2wc(StringValuePtr(ole), -1);
+ hr = CLSIDFromProgID(pbuf, &clsid);
+ SysFreeString(pbuf);
+ if (FAILED(hr)) {
+ return Qnil;
+ }
+ StringFromCLSID(&clsid, &pbuf);
+ vclsid = WC2VSTR(pbuf);
err = reg_open_key(HKEY_CLASSES_ROOT, "CLSID", &hroot);
if (err != ERROR_SUCCESS) {
return Qnil;
}
- err = reg_open_key(hroot, StringValuePtr(ole), &hclsid);
+ err = reg_open_key(hroot, StringValuePtr(vclsid), &hclsid);
if (err != ERROR_SUCCESS) {
RegCloseKey(hroot);
return Qnil;
}
- typelib = reg_get_val2(hclsid, "InprocServer32");
+ typelib = reg_get_val(hclsid, "InprocServer32");
RegCloseKey(hroot);
RegCloseKey(hclsid);
- if (typelib != Qnil) {
- ExpandEnvironmentStrings(StringValuePtr(typelib), path, sizeof(path));
- path[MAX_PATH] = '\0';
- typelib = rb_str_new2(path);
- }
return typelib;
}
static VALUE
-typelib_file_from_typelib(VALUE ole)
+typelib_file_from_typelib(ole)
+ VALUE ole;
{
HKEY htypelib, hclsid, hversion, hlang;
double fver;
@@ -2398,7 +1241,7 @@ typelib_file_from_typelib(VALUE ole)
if (ver == Qnil)
break;
err = reg_open_vkey(hclsid, ver, &hversion);
- if (err != ERROR_SUCCESS || fver > atof(StringValuePtr(ver)))
+ if (err != ERROR_SUCCESS || fver > atof(StringValuePtr(ver)))
continue;
fver = atof(StringValuePtr(ver));
typelib = reg_get_val(hversion, NULL);
@@ -2411,7 +1254,7 @@ typelib_file_from_typelib(VALUE ole)
break;
err = reg_open_vkey(hversion, lang, &hlang);
if (err == ERROR_SUCCESS) {
- if ((file = reg_get_typelib_file_path(hlang)) != Qnil)
+ if ((file = reg_get_val(hlang, "win32")) != Qnil)
found = TRUE;
RegCloseKey(hlang);
}
@@ -2426,7 +1269,8 @@ typelib_file_from_typelib(VALUE ole)
}
static VALUE
-typelib_file(VALUE ole)
+typelib_file(ole)
+ VALUE ole;
{
VALUE file = typelib_file_from_clsid(ole);
if (file != Qnil) {
@@ -2436,7 +1280,10 @@ typelib_file(VALUE ole)
}
static void
-ole_const_load(ITypeLib *pTypeLib, VALUE klass, VALUE self)
+ole_const_load(pTypeLib, klass, self)
+ ITypeLib *pTypeLib;
+ VALUE klass;
+ VALUE self;
{
unsigned int count;
unsigned int index;
@@ -2499,7 +1346,10 @@ ole_const_load(ITypeLib *pTypeLib, VALUE klass, VALUE self)
}
static HRESULT
-clsid_from_remote(VALUE host, VALUE com, CLSID *pclsid)
+clsid_from_remote(host, com, pclsid)
+ VALUE host;
+ VALUE com;
+ CLSID *pclsid;
{
HKEY hlm;
HKEY hpid;
@@ -2521,7 +1371,7 @@ clsid_from_remote(VALUE host, VALUE com, CLSID *pclsid)
hr = HRESULT_FROM_WIN32(err);
else {
len = sizeof(clsid);
- err = RegQueryValueEx(hpid, (LPBYTE)"", NULL, &dwtype, clsid, &len);
+ err = RegQueryValueEx(hpid, "", NULL, &dwtype, clsid, &len);
if (err == ERROR_SUCCESS && dwtype == REG_SZ) {
pbuf = ole_mb2wc(clsid, -1);
hr = CLSIDFromString(pbuf, pclsid);
@@ -2537,7 +1387,10 @@ clsid_from_remote(VALUE host, VALUE com, CLSID *pclsid)
}
static VALUE
-ole_create_dcom(int argc, VALUE *argv, VALUE self)
+ole_create_dcom(argc, argv, self)
+ int argc;
+ VALUE *argv;
+ VALUE self;
{
VALUE ole, host, others;
HRESULT hr;
@@ -2559,7 +1412,7 @@ ole_create_dcom(int argc, VALUE *argv, VALUE self)
rb_raise(rb_eRuntimeError, "CoCreateInstanceEx is not supported in this environment");
rb_scan_args(argc, argv, "2*", &ole, &host, &others);
- pbuf = ole_vstr2wc(ole);
+ pbuf = ole_mb2wc(StringValuePtr(ole), -1);
hr = CLSIDFromProgID(pbuf, &clsid);
if (FAILED(hr))
hr = clsid_from_remote(host, ole, &clsid);
@@ -2567,17 +1420,17 @@ ole_create_dcom(int argc, VALUE *argv, VALUE self)
hr = CLSIDFromString(pbuf, &clsid);
SysFreeString(pbuf);
if (FAILED(hr))
- ole_raise(hr, eWIN32OLERuntimeError,
+ ole_raise(hr, eWIN32OLE_RUNTIME_ERROR,
"unknown OLE server: `%s'",
StringValuePtr(ole));
memset(&serverinfo, 0, sizeof(COSERVERINFO));
- serverinfo.pwszName = ole_vstr2wc(host);
+ serverinfo.pwszName = ole_mb2wc(StringValuePtr(host), -1);
memset(&multi_qi, 0, sizeof(MULTI_QI));
multi_qi.pIID = &IID_IDispatch;
hr = gCoCreateInstanceEx(&clsid, NULL, clsctx, &serverinfo, 1, &multi_qi);
SysFreeString(serverinfo.pwszName);
if (FAILED(hr))
- ole_raise(hr, eWIN32OLERuntimeError,
+ ole_raise(hr, eWIN32OLE_RUNTIME_ERROR,
"failed to create DCOM server `%s' in `%s'",
StringValuePtr(ole),
StringValuePtr(host));
@@ -2587,12 +1440,15 @@ ole_create_dcom(int argc, VALUE *argv, VALUE self)
}
static VALUE
-ole_bind_obj(VALUE moniker, int argc, VALUE *argv, VALUE self)
+ole_bind_obj(moniker, argc, argv, self)
+ VALUE moniker;
+ int argc;
+ VALUE *argv;
+ VALUE self;
{
IBindCtx *pBindCtx;
IMoniker *pMoniker;
IDispatch *pDispatch;
- void *p;
HRESULT hr;
OLECHAR *pbuf;
ULONG eaten = 0;
@@ -2601,27 +1457,27 @@ ole_bind_obj(VALUE moniker, int argc, VALUE *argv, VALUE self)
hr = CreateBindCtx(0, &pBindCtx);
if(FAILED(hr)) {
- ole_raise(hr, eWIN32OLERuntimeError,
+ ole_raise(hr, eWIN32OLE_RUNTIME_ERROR,
"failed to create bind context");
}
- pbuf = ole_vstr2wc(moniker);
+ pbuf = ole_mb2wc(StringValuePtr(moniker), -1);
hr = MkParseDisplayName(pBindCtx, pbuf, &eaten, &pMoniker);
SysFreeString(pbuf);
if(FAILED(hr)) {
OLE_RELEASE(pBindCtx);
- ole_raise(hr, eWIN32OLERuntimeError,
+ ole_raise(hr, eWIN32OLE_RUNTIME_ERROR,
"failed to parse display name of moniker `%s'",
StringValuePtr(moniker));
}
hr = pMoniker->lpVtbl->BindToObject(pMoniker, pBindCtx, NULL,
- &IID_IDispatch, &p);
- pDispatch = p;
+ &IID_IDispatch,
+ (void**)&pDispatch);
OLE_RELEASE(pMoniker);
OLE_RELEASE(pBindCtx);
if(FAILED(hr)) {
- ole_raise(hr, eWIN32OLERuntimeError,
+ ole_raise(hr, eWIN32OLE_RUNTIME_ERROR,
"failed to bind moniker `%s'",
StringValuePtr(moniker));
}
@@ -2638,7 +1494,10 @@ ole_bind_obj(VALUE moniker, int argc, VALUE *argv, VALUE self)
* WIN32OLE.connect('Excel.Application') # => WIN32OLE object which represents running Excel.
*/
static VALUE
-fole_s_connect(int argc, VALUE *argv, VALUE self)
+fole_s_connect(argc, argv, self)
+ int argc;
+ VALUE *argv;
+ VALUE self;
{
VALUE svr_name;
VALUE others;
@@ -2646,7 +1505,6 @@ fole_s_connect(int argc, VALUE *argv, VALUE self)
CLSID clsid;
OLECHAR *pBuf;
IDispatch *pDispatch;
- void *p;
IUnknown *pUnknown;
rb_secure(4);
@@ -2654,14 +1512,13 @@ fole_s_connect(int argc, VALUE *argv, VALUE self)
ole_initialize();
rb_scan_args(argc, argv, "1*", &svr_name, &others);
- SafeStringValue(svr_name);
- if (rb_safe_level() > 0 && OBJ_TAINTED(svr_name)) {
- rb_raise(rb_eSecurityError, "Insecure Object Connection - %s",
- StringValuePtr(svr_name));
+ if (ruby_safe_level > 0 && OBJ_TAINTED(svr_name)) {
+ rb_raise(rb_eSecurityError, "Insecure Object Connection - %s",
+ StringValuePtr(svr_name));
}
/* get CLSID from OLE server name */
- pBuf = ole_vstr2wc(svr_name);
+ pBuf = ole_mb2wc(StringValuePtr(svr_name), -1);
hr = CLSIDFromProgID(pBuf, &clsid);
if(FAILED(hr)) {
hr = CLSIDFromString(pBuf, &clsid);
@@ -2673,14 +1530,14 @@ fole_s_connect(int argc, VALUE *argv, VALUE self)
hr = GetActiveObject(&clsid, 0, &pUnknown);
if (FAILED(hr)) {
- ole_raise(hr, eWIN32OLERuntimeError,
+ ole_raise(hr, eWIN32OLE_RUNTIME_ERROR,
"OLE server `%s' not running", StringValuePtr(svr_name));
}
- hr = pUnknown->lpVtbl->QueryInterface(pUnknown, &IID_IDispatch, &p);
- pDispatch = p;
+ hr = pUnknown->lpVtbl->QueryInterface(pUnknown, &IID_IDispatch,
+ (void **)&pDispatch);
if(FAILED(hr)) {
OLE_RELEASE(pUnknown);
- ole_raise(hr, eWIN32OLERuntimeError,
+ ole_raise(hr, eWIN32OLE_RUNTIME_ERROR,
"failed to create WIN32OLE server `%s'",
StringValuePtr(svr_name));
}
@@ -2720,7 +1577,10 @@ fole_s_connect(int argc, VALUE *argv, VALUE self)
* puts MSO::MsoLineSingle # => 1
*/
static VALUE
-fole_s_const_load(int argc, VALUE *argv, VALUE self)
+fole_s_const_load(argc, argv, self)
+ int argc;
+ VALUE *argv;
+ VALUE self;
{
VALUE ole;
VALUE klass;
@@ -2731,7 +1591,7 @@ fole_s_const_load(int argc, VALUE *argv, VALUE self)
HRESULT hr;
OLECHAR *pBuf;
VALUE file;
- LCID lcid = cWIN32OLE_lcid;
+ LCID lcid = LOCALE_SYSTEM_DEFAULT;
rb_secure(4);
rb_scan_args(argc, argv, "11", &ole, &klass);
@@ -2766,11 +1626,11 @@ fole_s_const_load(int argc, VALUE *argv, VALUE self)
if (file == Qnil) {
file = ole;
}
- pBuf = ole_vstr2wc(file);
+ pBuf = ole_mb2wc(StringValuePtr(file), -1);
hr = LoadTypeLibEx(pBuf, REGKIND_NONE, &pTypeLib);
SysFreeString(pBuf);
if (FAILED(hr))
- ole_raise(hr, eWIN32OLERuntimeError, "failed to LoadTypeLibEx");
+ ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to LoadTypeLibEx");
if(TYPE(klass) != T_NIL) {
ole_const_load(pTypeLib, klass, self);
}
@@ -2786,7 +1646,9 @@ fole_s_const_load(int argc, VALUE *argv, VALUE self)
}
static VALUE
-ole_types_from_typelib(ITypeLib *pTypeLib, VALUE classes)
+ole_classes_from_typelib(pTypeLib, classes)
+ ITypeLib *pTypeLib;
+ VALUE classes;
{
long count;
@@ -2818,7 +1680,8 @@ ole_types_from_typelib(ITypeLib *pTypeLib, VALUE classes)
}
static ULONG
-reference_count(struct oledata * pole)
+reference_count(pole)
+ struct oledata * pole;
{
ULONG n = 0;
if(pole->pDispatch) {
@@ -2837,7 +1700,9 @@ reference_count(struct oledata * pole)
* exists only for debugging WIN32OLE.
*/
static VALUE
-fole_s_reference_count(VALUE self, VALUE obj)
+fole_s_reference_count(self, obj)
+ VALUE self;
+ VALUE obj;
{
struct oledata * pole;
OLEData_Get_Struct(obj, pole);
@@ -2854,7 +1719,9 @@ fole_s_reference_count(VALUE self, VALUE obj)
* The return value is reference counter of OLE object.
*/
static VALUE
-fole_s_free(VALUE self, VALUE obj)
+fole_s_free(self, obj)
+ VALUE self;
+ VALUE obj;
{
ULONG n = 0;
struct oledata * pole;
@@ -2868,7 +1735,9 @@ fole_s_free(VALUE self, VALUE obj)
}
static HWND
-ole_show_help(VALUE helpfile, VALUE helpcontext)
+ole_show_help(helpfile, helpcontext)
+ VALUE helpfile;
+ VALUE helpcontext;
{
FNHTMLHELP *pfnHtmlHelp;
HWND hwnd = 0;
@@ -2900,7 +1769,10 @@ ole_show_help(VALUE helpfile, VALUE helpcontext)
* WIN32OLE.ole_show_help(typeobj)
*/
static VALUE
-fole_s_show_help(int argc, VALUE *argv, VALUE self)
+fole_s_show_help(argc, argv, self)
+ int argc;
+ VALUE *argv;
+ VALUE self;
{
VALUE target;
VALUE helpcontext;
@@ -2939,179 +1811,51 @@ fole_s_show_help(int argc, VALUE *argv, VALUE self)
* WIN32OLE.codepage # => WIN32OLE::CP_ACP
*/
static VALUE
-fole_s_get_code_page(VALUE self)
+fole_s_get_code_page(self)
+ VALUE self;
{
return INT2FIX(cWIN32OLE_cp);
}
-static BOOL CALLBACK
-installed_code_page_proc(LPTSTR str) {
- if (strtoul(str, NULL, 10) == g_cp_to_check) {
- g_cp_installed = TRUE;
- return FALSE;
- }
- return TRUE;
-}
-
-static BOOL
-code_page_installed(UINT cp)
-{
- g_cp_installed = FALSE;
- g_cp_to_check = cp;
- EnumSystemCodePages(installed_code_page_proc, CP_INSTALLED);
- return g_cp_installed;
-}
-
/*
* call-seq:
* WIN32OLE.codepage = CP
*
- * Sets current codepage.
- * The WIN32OLE.codepage is initialized according to
- * Encoding.default_internal.
- * If Encoding.default_internal is nil then WIN32OLE.codepage
- * is initialized according to Encoding.default_external.
- *
+ * Sets current codepage.
* WIN32OLE.codepage = WIN32OLE::CP_UTF8
- * WIN32OLE.codepage = 65001
*/
static VALUE
-fole_s_set_code_page(VALUE self, VALUE vcp)
+fole_s_set_code_page(self, vcp)
+ VALUE self;
+ VALUE vcp;
{
UINT cp = FIX2INT(vcp);
- set_ole_codepage(cp);
- /*
- * Should this method return old codepage?
- */
- return Qnil;
-}
-/*
- * call-seq:
- * WIN32OLE.locale -> locale id.
- *
- * Returns current locale id (lcid). The default locale is
- * LOCALE_SYSTEM_DEFAULT.
- *
- * lcid = WIN32OLE.locale
- */
-static VALUE
-fole_s_get_locale(VALUE self)
-{
- return INT2FIX(cWIN32OLE_lcid);
-}
-
-static BOOL
-CALLBACK installed_lcid_proc(LPTSTR str)
-{
- if (strcmp(str, g_lcid_to_check) == 0) {
- g_lcid_installed = TRUE;
- return FALSE;
+ switch(cp) {
+ case CP_ACP:
+ case CP_OEMCP:
+ case CP_MACCP:
+ case CP_THREAD_ACP:
+ case CP_SYMBOL:
+ case CP_UTF7:
+ case CP_UTF8:
+ cWIN32OLE_cp = cp;
+ break;
+ default:
+ rb_raise(eWIN32OLE_RUNTIME_ERROR, "codepage should be WIN32OLE::CP_ACP, WIN32OLE::CP_OEMCP, WIN32OLE::CP_MACCP, WIN32OLE::CP_THREAD_ACP, WIN32OLE::CP_SYMBOL, WIN32OLE::CP_UTF7, WIN32OLE::CP_UTF8");
+ break;
}
- return TRUE;
-}
-
-static BOOL
-lcid_installed(LCID lcid)
-{
- g_lcid_installed = FALSE;
- snprintf(g_lcid_to_check, sizeof(g_lcid_to_check), "%08lx", lcid);
- EnumSystemLocales(installed_lcid_proc, LCID_INSTALLED);
- return g_lcid_installed;
-}
-/*
- * call-seq:
- * WIN32OLE.locale = lcid
- *
- * Sets current locale id (lcid).
- *
- * WIN32OLE.locale = 1033 # set locale English(U.S)
- * obj = WIN32OLE_VARIANT.new("$100,000", WIN32OLE::VARIANT::VT_CY)
- *
- */
-static VALUE
-fole_s_set_locale(VALUE self, VALUE vlcid)
-{
- LCID lcid = FIX2INT(vlcid);
- if (lcid_installed(lcid)) {
- cWIN32OLE_lcid = lcid;
- } else {
- switch (lcid) {
- case LOCALE_SYSTEM_DEFAULT:
- case LOCALE_USER_DEFAULT:
- cWIN32OLE_lcid = lcid;
- break;
- default:
- rb_raise(eWIN32OLERuntimeError, "not installed locale: %u", (unsigned int)lcid);
- }
- }
+ /*
+ * Should this method return old codepage?
+ */
return Qnil;
}
-/*
- * call-seq:
- * WIN32OLE.create_guid
- *
- * Creates GUID.
- * WIN32OLE.create_guid # => {1CB530F1-F6B1-404D-BCE6-1959BF91F4A8}
- */
-static VALUE
-fole_s_create_guid(VALUE self)
-{
- GUID guid;
- HRESULT hr;
- OLECHAR bstr[80];
- int len = 0;
- hr = CoCreateGuid(&guid);
- if (FAILED(hr)) {
- ole_raise(hr, eWIN32OLERuntimeError, "failed to create GUID");
- }
- len = StringFromGUID2(&guid, bstr, sizeof(bstr)/sizeof(OLECHAR));
- if (len == 0) {
- rb_raise(rb_eRuntimeError, "failed to create GUID(buffer over)");
- }
- return ole_wc2vstr(bstr, FALSE);
-}
-
/*
* Document-class: WIN32OLE
*
* <code>WIN32OLE</code> objects represent OLE Automation object in Ruby.
- *
- * By using WIN32OLE, you can access OLE server like VBScript.
- *
- * Here is sample script.
- *
- * require 'win32ole'
- *
- * excel = WIN32OLE.new('Excel.Application')
- * excel.visible = true
- * workbook = excel.Workbooks.Add();
- * worksheet = workbook.Worksheets(1);
- * worksheet.Range("A1:D1").value = ["North","South","East","West"];
- * worksheet.Range("A2:B2").value = [5.2, 10];
- * worksheet.Range("C2").value = 8;
- * worksheet.Range("D2").value = 20;
- *
- * range = worksheet.Range("A1:D2");
- * range.select
- * chart = workbook.Charts.Add;
- *
- * workbook.saved = true;
- *
- * excel.ActiveWorkbook.Close(0);
- * excel.Quit();
- *
- * Unfortunately, Win32OLE doesn't support the argument passed by
- * reference directly.
- * Instead, Win32OLE provides WIN32OLE::ARGV.
- * If you want to get the result value of argument passed by reference,
- * you can use WIN32OLE::ARGV.
- *
- * oleobj.method(arg1, arg2, refargv3)
- * puts WIN32OLE::ARGV[2] # the value of refargv3 after called oleobj.method
- *
*/
/*
@@ -3128,7 +1872,10 @@ fole_s_create_guid(VALUE self)
* WIN32OLE.new('{00024500-0000-0000-C000-000000000046}') # => Excel OLE Automation WIN32OLE object.
*/
static VALUE
-fole_initialize(int argc, VALUE *argv, VALUE self)
+fole_initialize(argc, argv, self)
+ int argc;
+ VALUE *argv;
+ VALUE self;
{
VALUE svr_name;
VALUE host;
@@ -3137,19 +1884,17 @@ fole_initialize(int argc, VALUE *argv, VALUE self)
CLSID clsid;
OLECHAR *pBuf;
IDispatch *pDispatch;
- void *p;
+
rb_secure(4);
rb_call_super(0, 0);
rb_scan_args(argc, argv, "11*", &svr_name, &host, &others);
- SafeStringValue(svr_name);
- if (rb_safe_level() > 0 && OBJ_TAINTED(svr_name)) {
+ if (ruby_safe_level > 0 && OBJ_TAINTED(svr_name)) {
rb_raise(rb_eSecurityError, "Insecure Object Creation - %s",
StringValuePtr(svr_name));
}
if (!NIL_P(host)) {
- SafeStringValue(host);
- if (rb_safe_level() > 0 && OBJ_TAINTED(host)) {
+ if (ruby_safe_level > 0 && OBJ_TAINTED(host)) {
rb_raise(rb_eSecurityError, "Insecure Object Creation - %s",
StringValuePtr(svr_name));
}
@@ -3157,44 +1902,45 @@ fole_initialize(int argc, VALUE *argv, VALUE self)
}
/* get CLSID from OLE server name */
- pBuf = ole_vstr2wc(svr_name);
+ pBuf = ole_mb2wc(StringValuePtr(svr_name), -1);
hr = CLSIDFromProgID(pBuf, &clsid);
if(FAILED(hr)) {
hr = CLSIDFromString(pBuf, &clsid);
}
SysFreeString(pBuf);
if(FAILED(hr)) {
- ole_raise(hr, eWIN32OLERuntimeError,
+ ole_raise(hr, eWIN32OLE_RUNTIME_ERROR,
"unknown OLE server: `%s'",
StringValuePtr(svr_name));
}
/* get IDispatch interface */
hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER | CLSCTX_LOCAL_SERVER,
- &IID_IDispatch, &p);
- pDispatch = p;
+ &IID_IDispatch, (void**)&pDispatch);
if(FAILED(hr)) {
- ole_raise(hr, eWIN32OLERuntimeError,
+ ole_raise(hr, eWIN32OLE_RUNTIME_ERROR,
"failed to create WIN32OLE object from `%s'",
StringValuePtr(svr_name));
}
-
+
ole_set_member(self, pDispatch);
return self;
}
static VALUE
-hash2named_arg(VALUE pair, struct oleparam* pOp)
+hash2named_arg(pair, pOp)
+ VALUE pair;
+ struct oleparam* pOp;
{
unsigned int index, i;
VALUE key, value;
index = pOp->dp.cNamedArgs;
- /*---------------------------------------------
- the data-type of key must be String or Symbol
- -----------------------------------------------*/
+ /*-------------------------------------
+ the data-type of key must be String
+ ---------------------------------------*/
key = rb_ary_entry(pair, 0);
- if(TYPE(key) != T_STRING && TYPE(key) != T_SYMBOL) {
+ if(TYPE(key) != T_STRING) {
/* clear name of dispatch parameters */
for(i = 1; i < index + 1; i++) {
SysFreeString(pOp->pNamedArgs[i]);
@@ -3204,14 +1950,11 @@ hash2named_arg(VALUE pair, struct oleparam* pOp)
VariantClear(&(pOp->dp.rgvarg[i]));
}
/* raise an exception */
- rb_raise(rb_eTypeError, "wrong argument type (expected String or Symbol)");
- }
- if (TYPE(key) == T_SYMBOL) {
- key = rb_sym_to_s(key);
+ Check_Type(key, T_STRING);
}
/* pNamedArgs[0] is <method name>, so "index + 1" */
- pOp->pNamedArgs[index + 1] = ole_vstr2wc(key);
+ pOp->pNamedArgs[index + 1] = ole_mb2wc(StringValuePtr(key), -1);
value = rb_ary_entry(pair, 1);
VariantInit(&(pOp->dp.rgvarg[index]));
@@ -3222,7 +1965,9 @@ hash2named_arg(VALUE pair, struct oleparam* pOp)
}
static VALUE
-set_argv(VARIANTARG* realargs, unsigned int beg, unsigned int end)
+set_argv(realargs, beg, end)
+ VARIANTARG* realargs;
+ unsigned int beg, end;
{
VALUE argv = rb_const_get(cWIN32OLE, rb_intern("ARGV"));
@@ -3236,9 +1981,13 @@ set_argv(VARIANTARG* realargs, unsigned int beg, unsigned int end)
}
static VALUE
-ole_invoke(int argc, VALUE *argv, VALUE self, USHORT wFlags, BOOL is_bracket)
+ole_invoke(argc, argv, self, wFlags)
+ int argc;
+ VALUE *argv;
+ VALUE self;
+ USHORT wFlags;
{
- LCID lcid = cWIN32OLE_lcid;
+ LCID lcid = LOCALE_SYSTEM_DEFAULT;
struct oledata *pole;
HRESULT hr;
VALUE cmd;
@@ -3259,7 +2008,6 @@ ole_invoke(int argc, VALUE *argv, VALUE self, USHORT wFlags, BOOL is_bracket)
unsigned int cNamedArgs;
int n;
struct oleparam op;
- struct olevariantdata *pvar;
memset(&excepinfo, 0, sizeof(EXCEPINFO));
VariantInit(&result);
@@ -3270,30 +2018,18 @@ ole_invoke(int argc, VALUE *argv, VALUE self, USHORT wFlags, BOOL is_bracket)
op.dp.cArgs = 0;
rb_scan_args(argc, argv, "1*", &cmd, &paramS);
- if(TYPE(cmd) != T_STRING && TYPE(cmd) != T_SYMBOL && !is_bracket) {
- rb_raise(rb_eTypeError, "method is wrong type (expected String or Symbol)");
- }
- if (TYPE(cmd) == T_SYMBOL) {
- cmd = rb_sym_to_s(cmd);
- }
OLEData_Get_Struct(self, pole);
if(!pole->pDispatch) {
rb_raise(rb_eRuntimeError, "failed to get dispatch interface");
}
- if (is_bracket) {
- DispID = DISPID_VALUE;
- argc += 1;
- rb_ary_unshift(paramS, cmd);
- } else {
- wcmdname = ole_vstr2wc(cmd);
- hr = pole->pDispatch->lpVtbl->GetIDsOfNames( pole->pDispatch, &IID_NULL,
- &wcmdname, 1, lcid, &DispID);
- SysFreeString(wcmdname);
- if(FAILED(hr)) {
- ole_raise(hr, eWIN32OLERuntimeError,
- "unknown property or method: `%s'",
- StringValuePtr(cmd));
- }
+ wcmdname = ole_mb2wc(StringValuePtr(cmd), -1);
+ hr = pole->pDispatch->lpVtbl->GetIDsOfNames( pole->pDispatch, &IID_NULL,
+ &wcmdname, 1, lcid, &DispID);
+ SysFreeString(wcmdname);
+ if(FAILED(hr)) {
+ ole_raise(hr, eWIN32OLE_RUNTIME_ERROR,
+ "unknown property or method `%s'",
+ StringValuePtr(cmd));
}
/* pick up last argument of method */
@@ -3310,10 +2046,10 @@ ole_invoke(int argc, VALUE *argv, VALUE self, USHORT wFlags, BOOL is_bracket)
op.dp.cArgs = cNamedArgs + argc - 2;
op.pNamedArgs = ALLOCA_N(OLECHAR*, cNamedArgs + 1);
op.dp.rgvarg = ALLOCA_N(VARIANTARG, op.dp.cArgs);
- rb_block_call(param, rb_intern("each"), 0, 0, hash2named_arg, (VALUE)&op);
+ rb_iterate(rb_each, param, hash2named_arg, (VALUE)&op);
pDispID = ALLOCA_N(DISPID, cNamedArgs + 1);
- op.pNamedArgs[0] = ole_vstr2wc(cmd);
+ op.pNamedArgs[0] = ole_mb2wc(StringValuePtr(cmd), -1);
hr = pole->pDispatch->lpVtbl->GetIDsOfNames(pole->pDispatch,
&IID_NULL,
op.pNamedArgs,
@@ -3328,7 +2064,7 @@ ole_invoke(int argc, VALUE *argv, VALUE self, USHORT wFlags, BOOL is_bracket)
for(i = 0; i < op.dp.cArgs; i++ ) {
VariantClear(&op.dp.rgvarg[i]);
}
- ole_raise(hr, eWIN32OLERuntimeError,
+ ole_raise(hr, eWIN32OLE_RUNTIME_ERROR,
"failed to get named argument info: `%s'",
StringValuePtr(cmd));
}
@@ -3352,20 +2088,17 @@ ole_invoke(int argc, VALUE *argv, VALUE self, USHORT wFlags, BOOL is_bracket)
VariantInit(&realargs[n]);
VariantInit(&op.dp.rgvarg[n]);
param = rb_ary_entry(paramS, i-cNamedArgs);
- if (rb_obj_is_kind_of(param, cWIN32OLE_VARIANT)) {
- Data_Get_Struct(param, struct olevariantdata, pvar);
- VariantCopy(&op.dp.rgvarg[n], &(pvar->var));
- } else {
- ole_val2variant(param, &realargs[n]);
- V_VT(&op.dp.rgvarg[n]) = VT_VARIANT | VT_BYREF;
- V_VARIANTREF(&op.dp.rgvarg[n]) = &realargs[n];
- }
+
+ ole_val2variant(param, &realargs[n]);
+ V_VT(&op.dp.rgvarg[n]) = VT_VARIANT | VT_BYREF;
+ V_VARIANTREF(&op.dp.rgvarg[n]) = &realargs[n];
+
}
}
/* apparent you need to call propput, you need this */
if (wFlags & DISPATCH_PROPERTYPUT) {
if (op.dp.cArgs == 0)
- ole_raise(ResultFromScode(E_INVALIDARG), eWIN32OLERuntimeError, "argument error");
+ return ResultFromScode(E_INVALIDARG);
op.dp.cNamedArgs = 1;
op.dp.rgdispidNamedArgs = ALLOCA_N( DISPID, 1 );
@@ -3375,7 +2108,6 @@ ole_invoke(int argc, VALUE *argv, VALUE self, USHORT wFlags, BOOL is_bracket)
hr = pole->pDispatch->lpVtbl->Invoke(pole->pDispatch, DispID,
&IID_NULL, lcid, wFlags, &op.dp,
&result, &excepinfo, &argErr);
-
if (FAILED(hr)) {
/* retry to call args by value */
if(op.dp.cArgs >= cNamedArgs) {
@@ -3407,14 +2139,12 @@ ole_invoke(int argc, VALUE *argv, VALUE self, USHORT wFlags, BOOL is_bracket)
&IID_NULL, lcid, wFlags,
&op.dp, NULL,
&excepinfo, &argErr);
-
}
for(i = cNamedArgs; i < op.dp.cArgs; i++) {
n = op.dp.cArgs - i + cNamedArgs - 1;
VariantClear(&op.dp.rgvarg[n]);
}
}
-
if (FAILED(hr)) {
/* retry after converting nil to VT_EMPTY */
if (op.dp.cArgs > cNamedArgs) {
@@ -3442,13 +2172,6 @@ ole_invoke(int argc, VALUE *argv, VALUE self, USHORT wFlags, BOOL is_bracket)
}
/* clear dispatch parameter */
if(op.dp.cArgs > cNamedArgs) {
- for(i = cNamedArgs; i < op.dp.cArgs; i++) {
- n = op.dp.cArgs - i + cNamedArgs - 1;
- param = rb_ary_entry(paramS, i-cNamedArgs);
- if (rb_obj_is_kind_of(param, cWIN32OLE_VARIANT)) {
- ole_val2variant(param, &realargs[n]);
- }
- }
set_argv(realargs, cNamedArgs, op.dp.cArgs);
}
else {
@@ -3459,9 +2182,8 @@ ole_invoke(int argc, VALUE *argv, VALUE self, USHORT wFlags, BOOL is_bracket)
if (FAILED(hr)) {
v = ole_excepinfo2msg(&excepinfo);
- ole_raise(hr, eWIN32OLERuntimeError, "(in OLE method `%s': )%s",
- StringValuePtr(cmd),
- StringValuePtr(v));
+ ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "%s%s",
+ StringValuePtr(cmd), StringValuePtr(v));
}
obj = ole_variant2val(&result);
VariantClear(&result);
@@ -3482,13 +2204,21 @@ ole_invoke(int argc, VALUE *argv, VALUE self, USHORT wFlags, BOOL is_bracket)
*
*/
static VALUE
-fole_invoke(int argc, VALUE *argv, VALUE self)
+fole_invoke(argc, argv, self)
+ int argc;
+ VALUE *argv;
+ VALUE self;
{
- return ole_invoke(argc, argv, self, DISPATCH_METHOD|DISPATCH_PROPERTYGET, FALSE);
+ return ole_invoke(argc, argv, self, DISPATCH_METHOD|DISPATCH_PROPERTYGET);
}
static VALUE
-ole_invoke2(VALUE self, VALUE dispid, VALUE args, VALUE types, USHORT dispkind)
+ole_invoke2(self, dispid, args, types, dispkind)
+ VALUE self;
+ VALUE dispid;
+ VALUE args;
+ VALUE types;
+ USHORT dispkind;
{
HRESULT hr;
struct oledata *pole;
@@ -3511,7 +2241,7 @@ ole_invoke2(VALUE self, VALUE dispid, VALUE args, VALUE types, USHORT dispkind)
VariantInit(&result);
OLEData_Get_Struct(self, pole);
- dispParams.cArgs = RARRAY_LEN(args);
+ dispParams.cArgs = RARRAY(args)->len;
dispParams.rgvarg = ALLOCA_N(VARIANTARG, dispParams.cArgs);
realargs = ALLOCA_N(VARIANTARG, dispParams.cArgs);
for (i = 0, j = dispParams.cArgs - 1; i < (int)dispParams.cArgs; i++, j--)
@@ -3542,7 +2272,7 @@ ole_invoke2(VALUE self, VALUE dispid, VALUE args, VALUE types, USHORT dispkind)
SAFEARRAYBOUND rgsabound[1];
Check_Type(param, T_ARRAY);
rgsabound[0].lLbound = 0;
- rgsabound[0].cElements = RARRAY_LEN(param);
+ rgsabound[0].cElements = RARRAY(param)->len;
v = vt & ~(VT_ARRAY | VT_BYREF);
V_ARRAY(&realargs[i]) = SafeArrayCreate(v, 1, rgsabound);
V_VT(&realargs[i]) = VT_ARRAY | v;
@@ -3560,7 +2290,7 @@ ole_invoke2(VALUE self, VALUE dispid, VALUE args, VALUE types, USHORT dispkind)
if (v != VT_VARIANT)
{
VariantChangeTypeEx(&velem, &velem,
- cWIN32OLE_lcid, 0, v);
+ LOCALE_SYSTEM_DEFAULT, 0, v);
}
switch (v)
{
@@ -3599,7 +2329,7 @@ ole_invoke2(VALUE self, VALUE dispid, VALUE args, VALUE types, USHORT dispkind)
if ((vt & (~VT_BYREF)) != VT_VARIANT)
{
hr = VariantChangeTypeEx(&realargs[i], &realargs[i],
- cWIN32OLE_lcid, 0,
+ LOCALE_SYSTEM_DEFAULT, 0,
(VARTYPE)(vt & (~VT_BYREF)));
if (hr != S_OK)
{
@@ -3655,15 +2385,14 @@ ole_invoke2(VALUE self, VALUE dispid, VALUE args, VALUE types, USHORT dispkind)
}
hr = pole->pDispatch->lpVtbl->Invoke(pole->pDispatch, NUM2INT(dispid),
- &IID_NULL, cWIN32OLE_lcid,
+ &IID_NULL, LOCALE_SYSTEM_DEFAULT,
dispkind,
&dispParams, &result,
&excepinfo, &argErr);
if (FAILED(hr)) {
v = ole_excepinfo2msg(&excepinfo);
- ole_raise(hr, eWIN32OLERuntimeError, "(in OLE method `<dispatch id:%d>': )%s",
- NUM2INT(dispid),
+ ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "_invoke %s",
StringValuePtr(v));
}
@@ -3690,7 +2419,11 @@ ole_invoke2(VALUE self, VALUE dispid, VALUE args, VALUE types, USHORT dispkind)
* excel._invoke(302, [], []) # same effect as excel.Quit
*/
static VALUE
-fole_invoke2(VALUE self, VALUE dispid, VALUE args, VALUE types)
+fole_invoke2(self, dispid, args, types)
+ VALUE self;
+ VALUE dispid;
+ VALUE args;
+ VALUE types;
{
return ole_invoke2(self, dispid, args, types, DISPATCH_METHOD);
}
@@ -3708,7 +2441,11 @@ fole_invoke2(VALUE self, VALUE dispid, VALUE args, VALUE types)
* puts excel._getproperty(558, [], []) # same effect as puts excel.visible
*/
static VALUE
-fole_getproperty2(VALUE self, VALUE dispid, VALUE args, VALUE types)
+fole_getproperty2(self, dispid, args, types)
+ VALUE self;
+ VALUE dispid;
+ VALUE args;
+ VALUE types;
{
return ole_invoke2(self, dispid, args, types, DISPATCH_PROPERTYGET);
}
@@ -3726,78 +2463,59 @@ fole_getproperty2(VALUE self, VALUE dispid, VALUE args, VALUE types)
* excel._setproperty(558, [true], [WIN32OLE::VARIANT::VT_BOOL]) # same effect as excel.visible = true
*/
static VALUE
-fole_setproperty2(VALUE self, VALUE dispid, VALUE args, VALUE types)
+fole_setproperty2(self, dispid, args, types)
+ VALUE self;
+ VALUE dispid;
+ VALUE args;
+ VALUE types;
{
return ole_invoke2(self, dispid, args, types, DISPATCH_PROPERTYPUT);
}
/*
* call-seq:
- * WIN32OLE[a1, a2, ...]=val
- *
- * Sets the value to WIN32OLE object specified by a1, a2, ...
- *
- * dict = WIN32OLE.new('Scripting.Dictionary')
- * dict.add('ruby', 'RUBY')
- * dict['ruby'] = 'Ruby'
- * puts dict['ruby'] # => 'Ruby'
- *
- * Remark: You can not use this method to set the property value.
- *
- * excel = WIN32OLE.new('Excel.Application')
- * # excel['Visible'] = true # This is error !!!
- * excel.Visible = true # You should to use this style to set the property.
- *
- */
-static VALUE
-fole_setproperty_with_bracket(int argc, VALUE *argv, VALUE self)
-{
- return ole_invoke(argc, argv, self, DISPATCH_PROPERTYPUT, TRUE);
-}
-
-/*
- * call-seq:
+ * WIN32OLE['property']=val
* WIN32OLE.setproperty('property', [arg1, arg2,...] val)
*
* Sets property of OLE object.
* When you want to set property with argument, you can use this method.
*
* excel = WIN32OLE.new('Excel.Application')
- * excel.Visible = true
+ * excel['Visible'] = true
* book = excel.workbooks.add
* sheet = book.worksheets(1)
* sheet.setproperty('Cells', 1, 2, 10) # => The B1 cell value is 10.
*/
static VALUE
-fole_setproperty(int argc, VALUE *argv, VALUE self)
+fole_setproperty(argc, argv, self)
+ int argc;
+ VALUE *argv;
+ VALUE self;
{
- return ole_invoke(argc, argv, self, DISPATCH_PROPERTYPUT, FALSE);
+ return ole_invoke(argc, argv, self, DISPATCH_PROPERTYPUT);
}
/*
* call-seq:
- * WIN32OLE[a1,a2,...]
+ * WIN32OLE['property']
*
- * Returns the value of Collection specified by a1, a2,....
+ * Returns property of OLE object.
*
- * dict = WIN32OLE.new('Scripting.Dictionary')
- * dict.add('ruby', 'Ruby')
- * puts dict['ruby'] # => 'Ruby' (same as `puts dict.item('ruby')')
- *
- * Remark: You can not use this method to get the property.
* excel = WIN32OLE.new('Excel.Application')
- * # puts excel['Visible'] This is error !!!
- * puts excel.Visible # You should to use this style to get the property.
- *
+ * puts excel['Visible'] # => false
*/
static VALUE
-fole_getproperty_with_bracket(int argc, VALUE *argv, VALUE self)
+fole_getproperty(argc, argv, self)
+ int argc;
+ VALUE *argv;
+ VALUE self;
{
- return ole_invoke(argc, argv, self, DISPATCH_PROPERTYGET, TRUE);
+ return ole_invoke(argc, argv, self, DISPATCH_PROPERTYGET);
}
static VALUE
-ole_propertyput(VALUE self, VALUE property, VALUE value)
+ole_propertyput(self, property, value)
+ VALUE self, property, value;
{
struct oledata *pole;
unsigned argErr;
@@ -3811,7 +2529,7 @@ ole_propertyput(VALUE self, VALUE property, VALUE value)
VARIANTARG propertyValue[2];
OLECHAR* pBuf[1];
VALUE v;
- LCID lcid = cWIN32OLE_lcid;
+ LCID lcid = LOCALE_SYSTEM_DEFAULT;
dispParams.rgdispidNamedArgs = &dispIDParam;
dispParams.rgvarg = propertyValue;
dispParams.cNamedArgs = 1;
@@ -3824,14 +2542,14 @@ ole_propertyput(VALUE self, VALUE property, VALUE value)
OLEData_Get_Struct(self, pole);
/* get ID from property name */
- pBuf[0] = ole_vstr2wc(property);
+ pBuf[0] = ole_mb2wc(StringValuePtr(property), -1);
hr = pole->pDispatch->lpVtbl->GetIDsOfNames(pole->pDispatch, &IID_NULL,
pBuf, 1, lcid, &dispID);
SysFreeString(pBuf[0]);
pBuf[0] = NULL;
if(FAILED(hr)) {
- ole_raise(hr, eWIN32OLERuntimeError,
+ ole_raise(hr, eWIN32OLE_RUNTIME_ERROR,
"unknown property or method: `%s'",
StringValuePtr(property));
}
@@ -3846,9 +2564,7 @@ ole_propertyput(VALUE self, VALUE property, VALUE value)
}
if (FAILED(hr)) {
v = ole_excepinfo2msg(&excepinfo);
- ole_raise(hr, eWIN32OLERuntimeError, "(in setting property `%s': )%s",
- StringValuePtr(property),
- StringValuePtr(v));
+ ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, StringValuePtr(v));
}
return Qnil;
}
@@ -3863,7 +2579,8 @@ ole_propertyput(VALUE self, VALUE property, VALUE value)
*
*/
static VALUE
-fole_free(VALUE self)
+fole_free(self)
+ VALUE self;
{
struct oledata *pole;
rb_secure(4);
@@ -3874,7 +2591,8 @@ fole_free(VALUE self)
}
static VALUE
-ole_each_sub(VALUE pEnumV)
+ole_each_sub(pEnumV)
+ VALUE pEnumV;
{
VARIANT variant;
VALUE obj = Qnil;
@@ -3890,7 +2608,8 @@ ole_each_sub(VALUE pEnumV)
}
static VALUE
-ole_ienum_free(VALUE pEnumV)
+ole_ienum_free(pEnumV)
+ VALUE pEnumV;
{
IEnumVARIANT *pEnum = (IEnumVARIANT *)pEnumV;
OLE_RELEASE(pEnum);
@@ -3912,9 +2631,10 @@ ole_ienum_free(VALUE pEnumV)
* end
*/
static VALUE
-fole_each(VALUE self)
+fole_each(self)
+ VALUE self;
{
- LCID lcid = cWIN32OLE_lcid;
+ LCID lcid = LOCALE_SYSTEM_DEFAULT;
struct oledata *pole;
@@ -3924,9 +2644,6 @@ fole_each(VALUE self)
VARIANT result;
HRESULT hr;
IEnumVARIANT *pEnum = NULL;
- void *p;
-
- RETURN_ENUMERATOR(self, 0, 0);
VariantInit(&result);
dispParams.rgvarg = NULL;
@@ -3944,20 +2661,17 @@ fole_each(VALUE self)
if (FAILED(hr)) {
VariantClear(&result);
- ole_raise(hr, eWIN32OLERuntimeError, "failed to get IEnum Interface");
+ ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to get IEnum Interface");
}
- if (V_VT(&result) == VT_UNKNOWN) {
+ if (V_VT(&result) == VT_UNKNOWN)
hr = V_UNKNOWN(&result)->lpVtbl->QueryInterface(V_UNKNOWN(&result),
&IID_IEnumVARIANT,
- &p);
- pEnum = p;
- } else if (V_VT(&result) == VT_DISPATCH) {
+ (void**)&pEnum);
+ else if (V_VT(&result) == VT_DISPATCH)
hr = V_DISPATCH(&result)->lpVtbl->QueryInterface(V_DISPATCH(&result),
&IID_IEnumVARIANT,
- &p);
- pEnum = p;
- }
+ (void**)&pEnum);
if (FAILED(hr) || !pEnum) {
VariantClear(&result);
ole_raise(hr, rb_eRuntimeError, "failed to get IEnum Interface");
@@ -3975,10 +2689,13 @@ fole_each(VALUE self)
* Calls WIN32OLE#invoke method.
*/
static VALUE
-fole_missing(int argc, VALUE *argv, VALUE self)
+fole_missing(argc, argv, self)
+ int argc;
+ VALUE *argv;
+ VALUE self;
{
ID id;
- const char* mname;
+ char* mname;
int n;
id = rb_to_id(argv[0]);
mname = rb_id2name(id);
@@ -3987,18 +2704,22 @@ fole_missing(int argc, VALUE *argv, VALUE self)
}
n = strlen(mname);
if(mname[n-1] == '=') {
- argv[0] = rb_enc_str_new(mname, n-1, cWIN32OLE_enc);
+ argv[0] = rb_str_new(mname, n-1);
return ole_propertyput(self, argv[0], argv[1]);
}
else {
- argv[0] = rb_enc_str_new(mname, n, cWIN32OLE_enc);
- return ole_invoke(argc, argv, self, DISPATCH_METHOD|DISPATCH_PROPERTYGET, FALSE);
+ argv[0] = rb_str_new2(mname);
+ return ole_invoke(argc, argv, self, DISPATCH_METHOD|DISPATCH_PROPERTYGET);
}
}
static VALUE
-ole_method_sub(VALUE self, ITypeInfo *pOwnerTypeInfo, ITypeInfo *pTypeInfo, VALUE name)
+ole_method_sub(self, pOwnerTypeInfo, pTypeInfo, name)
+ VALUE self;
+ ITypeInfo *pOwnerTypeInfo;
+ ITypeInfo *pTypeInfo;
+ VALUE name;
{
HRESULT hr;
TYPEATTR *pTypeAttr;
@@ -4009,7 +2730,7 @@ ole_method_sub(VALUE self, ITypeInfo *pOwnerTypeInfo, ITypeInfo *pTypeInfo, VALU
VALUE method = Qnil;
hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
if (FAILED(hr)) {
- ole_raise(hr, eWIN32OLERuntimeError, "failed to GetTypeAttr");
+ ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetTypeAttr");
}
for(i = 0; i < pTypeAttr->cFuncs && method == Qnil; i++) {
hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, i, &pFuncDesc);
@@ -4035,7 +2756,10 @@ ole_method_sub(VALUE self, ITypeInfo *pOwnerTypeInfo, ITypeInfo *pTypeInfo, VALU
}
static VALUE
-olemethod_from_typeinfo(VALUE self, ITypeInfo *pTypeInfo, VALUE name)
+olemethod_from_typeinfo(self, pTypeInfo, name)
+ VALUE self;
+ ITypeInfo *pTypeInfo;
+ VALUE name;
{
HRESULT hr;
TYPEATTR *pTypeAttr;
@@ -4045,7 +2769,7 @@ olemethod_from_typeinfo(VALUE self, ITypeInfo *pTypeInfo, VALUE name)
VALUE method = Qnil;
hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
if (FAILED(hr)) {
- ole_raise(hr, eWIN32OLERuntimeError, "failed to GetTypeAttr");
+ ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetTypeAttr");
}
method = ole_method_sub(self, 0, pTypeInfo, name);
if (method != Qnil) {
@@ -4066,7 +2790,11 @@ olemethod_from_typeinfo(VALUE self, ITypeInfo *pTypeInfo, VALUE name)
}
static VALUE
-ole_methods_sub(ITypeInfo *pOwnerTypeInfo, ITypeInfo *pTypeInfo, VALUE methods, int mask)
+ole_methods_sub(pOwnerTypeInfo, pTypeInfo, methods, mask)
+ ITypeInfo *pOwnerTypeInfo;
+ ITypeInfo *pTypeInfo;
+ VALUE methods;
+ int mask;
{
HRESULT hr;
TYPEATTR *pTypeAttr;
@@ -4077,7 +2805,7 @@ ole_methods_sub(ITypeInfo *pOwnerTypeInfo, ITypeInfo *pTypeInfo, VALUE methods,
WORD i;
hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
if (FAILED(hr)) {
- ole_raise(hr, eWIN32OLERuntimeError, "failed to GetTypeAttr");
+ ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetTypeAttr");
}
for(i = 0; i < pTypeAttr->cFuncs; i++) {
pstr = NULL;
@@ -4106,7 +2834,9 @@ ole_methods_sub(ITypeInfo *pOwnerTypeInfo, ITypeInfo *pTypeInfo, VALUE methods,
}
static VALUE
-ole_methods_from_typeinfo(ITypeInfo *pTypeInfo, int mask)
+ole_methods_from_typeinfo(pTypeInfo, mask)
+ ITypeInfo *pTypeInfo;
+ int mask;
{
HRESULT hr;
TYPEATTR *pTypeAttr;
@@ -4116,7 +2846,7 @@ ole_methods_from_typeinfo(ITypeInfo *pTypeInfo, int mask)
VALUE methods = rb_ary_new();
hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
if (FAILED(hr)) {
- ole_raise(hr, eWIN32OLERuntimeError, "failed to GetTypeAttr");
+ ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetTypeAttr");
}
ole_methods_sub(0, pTypeInfo, methods, mask);
@@ -4135,7 +2865,9 @@ ole_methods_from_typeinfo(ITypeInfo *pTypeInfo, int mask)
}
static HRESULT
-typeinfo_from_ole(struct oledata *pole, ITypeInfo **ppti)
+typeinfo_from_ole(pole, ppti)
+ struct oledata *pole;
+ ITypeInfo **ppti;
{
ITypeInfo *pTypeInfo;
ITypeLib *pTypeLib;
@@ -4143,7 +2875,7 @@ typeinfo_from_ole(struct oledata *pole, ITypeInfo **ppti)
VALUE type;
UINT i;
UINT count;
- LCID lcid = cWIN32OLE_lcid;
+ LCID lcid = LOCALE_SYSTEM_DEFAULT;
HRESULT hr = pole->pDispatch->lpVtbl->GetTypeInfo(pole->pDispatch,
0, lcid, &pTypeInfo);
if(FAILED(hr)) {
@@ -4176,7 +2908,9 @@ typeinfo_from_ole(struct oledata *pole, ITypeInfo **ppti)
}
static VALUE
-ole_methods(VALUE self, int mask)
+ole_methods(self,mask)
+ VALUE self;
+ int mask;
{
ITypeInfo *pTypeInfo;
HRESULT hr;
@@ -4206,7 +2940,8 @@ ole_methods(VALUE self, int mask)
*
*/
static VALUE
-fole_methods(VALUE self)
+fole_methods( self )
+ VALUE self;
{
return ole_methods( self, INVOKE_FUNC | INVOKE_PROPERTYGET | INVOKE_PROPERTYPUT | INVOKE_PROPERTYPUTREF);
}
@@ -4222,7 +2957,8 @@ fole_methods(VALUE self)
* properties = excel.ole_get_methods
*/
static VALUE
-fole_get_methods(VALUE self)
+fole_get_methods( self )
+ VALUE self;
{
return ole_methods( self, INVOKE_PROPERTYGET);
}
@@ -4238,9 +2974,10 @@ fole_get_methods(VALUE self)
* properties = excel.ole_put_methods
*/
static VALUE
-fole_put_methods(VALUE self)
+fole_put_methods( self )
+ VALUE self;
{
- return ole_methods( self, INVOKE_PROPERTYPUT|INVOKE_PROPERTYPUTREF);
+ return ole_methods( self, INVOKE_PROPERTYPUT | INVOKE_PROPERTYPUTREF);
}
/*
@@ -4248,58 +2985,39 @@ fole_put_methods(VALUE self)
* WIN32OLE#ole_func_methods
*
* Returns the array of WIN32OLE_METHOD object .
- * The element of the array is property (settable) of WIN32OLE object.
+ * The element of the array is functional method of WIN32OLE object.
*
* excel = WIN32OLE.new('Excel.Application')
* properties = excel.ole_func_methods
*
*/
static VALUE
-fole_func_methods(VALUE self)
+fole_func_methods( self )
+ VALUE self;
{
return ole_methods( self, INVOKE_FUNC);
}
-static VALUE
-ole_type_from_itypeinfo(ITypeInfo *pTypeInfo)
-{
- ITypeLib *pTypeLib;
- VALUE type = Qnil;
- HRESULT hr;
- unsigned int index;
- BSTR bstr;
-
- hr = pTypeInfo->lpVtbl->GetContainingTypeLib( pTypeInfo, &pTypeLib, &index );
- if(FAILED(hr)) {
- return Qnil;
- }
- hr = pTypeLib->lpVtbl->GetDocumentation( pTypeLib, index,
- &bstr, NULL, NULL, NULL);
- OLE_RELEASE(pTypeLib);
- if (FAILED(hr)) {
- return Qnil;
- }
- type = foletype_s_allocate(cWIN32OLE_TYPE);
- oletype_set_member(type, pTypeInfo, WC2VSTR(bstr));
- return type;
-}
-
/*
* call-seq:
- * WIN32OLE#ole_type
+ * WIN32OLE#ole_obj_help
*
* Returns WIN32OLE_TYPE object.
*
* excel = WIN32OLE.new('Excel.Application')
- * tobj = excel.ole_type
+ * tobj = excel.ole_obj_help
*/
static VALUE
-fole_type(VALUE self)
+fole_obj_help( self )
+ VALUE self;
{
+ unsigned int index;
ITypeInfo *pTypeInfo;
+ ITypeLib *pTypeLib;
HRESULT hr;
struct oledata *pole;
- LCID lcid = cWIN32OLE_lcid;
+ BSTR bstr;
+ LCID lcid = LOCALE_SYSTEM_DEFAULT;
VALUE type = Qnil;
OLEData_Get_Struct(self, pole);
@@ -4308,182 +3026,30 @@ fole_type(VALUE self)
if(FAILED(hr)) {
ole_raise(hr, rb_eRuntimeError, "failed to GetTypeInfo");
}
- type = ole_type_from_itypeinfo(pTypeInfo);
- OLE_RELEASE(pTypeInfo);
- if (type == Qnil) {
- rb_raise(rb_eRuntimeError, "failed to create WIN32OLE_TYPE obj from ITypeInfo");
- }
- return type;
-}
-
-static VALUE
-make_oletypelib_obj(VALUE guid, VALUE major_version, VALUE minor_version)
-{
- VALUE args = rb_ary_new();
- rb_ary_push(args, guid);
- rb_ary_push(args, major_version);
- rb_ary_push(args, minor_version);
- return rb_apply(cWIN32OLE_TYPELIB, rb_intern("new"), args);
-}
-
-static VALUE
-ole_typelib_from_itypelib(ITypeLib *pTypeLib)
-{
- TLIBATTR *pTLibAttr;
- OLECHAR bstr[80];
- VALUE guid = Qnil;
- VALUE major;
- VALUE minor;
- int len = 0;
- HRESULT hr = S_OK;
- hr = pTypeLib->lpVtbl->GetLibAttr(pTypeLib, &pTLibAttr);
- if (FAILED(hr)) {
- return Qnil;
- }
- len = StringFromGUID2(&pTLibAttr->guid, bstr, sizeof(bstr)/sizeof(OLECHAR));
- if (len > 3) {
- guid = ole_wc2vstr(bstr, FALSE);
- }
- major = INT2NUM(pTLibAttr->wMajorVerNum);
- minor = INT2NUM(pTLibAttr->wMinorVerNum);
- pTypeLib->lpVtbl->ReleaseTLibAttr(pTypeLib, pTLibAttr);
- if (guid == Qnil) {
- return Qnil;
- }
- return make_oletypelib_obj(guid, major, minor);
-}
-
-
-static VALUE
-ole_typelib_from_itypeinfo(ITypeInfo *pTypeInfo)
-{
- HRESULT hr;
- ITypeLib *pTypeLib;
- unsigned int index;
- VALUE retval = Qnil;
-
- hr = pTypeInfo->lpVtbl->GetContainingTypeLib(pTypeInfo, &pTypeLib, &index);
+ hr = pTypeInfo->lpVtbl->GetContainingTypeLib( pTypeInfo, &pTypeLib, &index );
if(FAILED(hr)) {
- return Qnil;
+ OLE_RELEASE(pTypeInfo);
+ ole_raise(hr, rb_eRuntimeError, "failed to GetContainingTypeLib");
}
- retval = ole_typelib_from_itypelib(pTypeLib);
- OLE_RELEASE(pTypeLib);
- return retval;
-}
-
-/*
- * call-seq:
- * WIN32OLE#ole_typelib -> The WIN32OLE_TYPELIB object
- *
- * Returns the WIN32OLE_TYPELIB object. The object represents the
- * type library which contains the WIN32OLE object.
- *
- * excel = WIN32OLE.new('Excel.Application')
- * tlib = excel.ole_typelib
- * puts tlib.name # -> 'Microsoft Excel 9.0 Object Library'
- */
-static VALUE
-fole_typelib(VALUE self)
-{
- struct oledata *pole;
- HRESULT hr;
- ITypeInfo *pTypeInfo;
- LCID lcid = cWIN32OLE_lcid;
- VALUE vtlib = Qnil;
-
- OLEData_Get_Struct(self, pole);
- hr = pole->pDispatch->lpVtbl->GetTypeInfo(pole->pDispatch,
- 0, lcid, &pTypeInfo);
- if(FAILED(hr)) {
- ole_raise(hr, rb_eRuntimeError, "failed to GetTypeInfo");
+ hr = pTypeLib->lpVtbl->GetDocumentation( pTypeLib, index,
+ &bstr, NULL, NULL, NULL);
+ if (SUCCEEDED(hr)) {
+ type = foletype_s_allocate(cWIN32OLE_TYPE);
+ oletype_set_member(type, pTypeInfo, WC2VSTR(bstr));
}
- vtlib = ole_typelib_from_itypeinfo(pTypeInfo);
+ OLE_RELEASE(pTypeLib);
OLE_RELEASE(pTypeInfo);
- if (vtlib == Qnil) {
- rb_raise(rb_eRuntimeError, "failed to get type library info.");
- }
- return vtlib;
-}
-/*
- * call-seq:
- * WIN32OLE#ole_query_interface(iid) -> WIN32OLE object
- *
- * Returns WIN32OLE object for a specific dispatch or dual
- * interface specified by iid.
- *
- * ie = WIN32OLE.new('InternetExplorer.Application')
- * ie_web_app = ie.ole_query_interface('{0002DF05-0000-0000-C000-000000000046}') # => WIN32OLE object for dispinterface IWebBrowserApp
- */
-static VALUE
-fole_query_interface(VALUE self, VALUE str_iid)
-{
- HRESULT hr;
- OLECHAR *pBuf;
- IID iid;
- struct oledata *pole;
- IDispatch *pDispatch;
- void *p;
-
- pBuf = ole_vstr2wc(str_iid);
- hr = CLSIDFromString(pBuf, &iid);
- SysFreeString(pBuf);
- if(FAILED(hr)) {
- ole_raise(hr, eWIN32OLERuntimeError,
- "invalid iid: `%s'",
- StringValuePtr(str_iid));
- }
-
- OLEData_Get_Struct(self, pole);
- if(!pole->pDispatch) {
- rb_raise(rb_eRuntimeError, "failed to get dispatch interface");
- }
-
- hr = pole->pDispatch->lpVtbl->QueryInterface(pole->pDispatch, &iid,
- &p);
- if(FAILED(hr)) {
- ole_raise(hr, eWIN32OLERuntimeError,
- "failed to get interface `%s'",
- StringValuePtr(str_iid));
- }
-
- pDispatch = p;
- return create_win32ole_object(cWIN32OLE, pDispatch, 0, 0);
-}
-
-/*
- * call-seq:
- * WIN32OLE#ole_respond_to?(method) -> true or false
- *
- * Returns true when OLE object has OLE method, otherwise returns false.
- *
- * ie = WIN32OLE.new('InternetExplorer.Application')
- * ie.ole_respond_to?("gohome") => true
- */
-static VALUE
-fole_respond_to(VALUE self, VALUE method)
-{
- struct oledata *pole;
- BSTR wcmdname;
- DISPID DispID;
- HRESULT hr;
- rb_secure(4);
- if(TYPE(method) != T_STRING && TYPE(method) != T_SYMBOL) {
- rb_raise(rb_eTypeError, "wrong argument type (expected String or Symbol)");
- }
- if (TYPE(method) == T_SYMBOL) {
- method = rb_sym_to_s(method);
- }
- OLEData_Get_Struct(self, pole);
- wcmdname = ole_vstr2wc(method);
- hr = pole->pDispatch->lpVtbl->GetIDsOfNames( pole->pDispatch, &IID_NULL,
- &wcmdname, 1, cWIN32OLE_lcid, &DispID);
- SysFreeString(wcmdname);
- return SUCCEEDED(hr) ? Qtrue : Qfalse;
+ return type;
}
static HRESULT
-ole_docinfo_from_type(ITypeInfo *pTypeInfo, BSTR *name, BSTR *helpstr, DWORD *helpcontext, BSTR *helpfile)
+ole_docinfo_from_type(pTypeInfo, name, helpstr, helpcontext, helpfile)
+ ITypeInfo *pTypeInfo;
+ BSTR *name;
+ BSTR *helpstr;
+ DWORD *helpcontext;
+ BSTR *helpfile;
{
HRESULT hr;
ITypeLib *pTypeLib;
@@ -4506,7 +3072,10 @@ ole_docinfo_from_type(ITypeInfo *pTypeInfo, BSTR *name, BSTR *helpstr, DWORD *he
}
static VALUE
-ole_usertype2val(ITypeInfo *pTypeInfo, TYPEDESC *pTypeDesc, VALUE typedetails)
+ole_usertype2val(pTypeInfo, pTypeDesc, typedetails)
+ ITypeInfo *pTypeInfo;
+ TYPEDESC *pTypeDesc;
+ VALUE typedetails;
{
HRESULT hr;
BSTR bstr;
@@ -4530,132 +3099,146 @@ ole_usertype2val(ITypeInfo *pTypeInfo, TYPEDESC *pTypeDesc, VALUE typedetails)
return type;
}
+static VALUE ole_typedesc2val();
static VALUE
-ole_ptrtype2val(ITypeInfo *pTypeInfo, TYPEDESC *pTypeDesc, VALUE typedetails)
+ole_ptrtype2val(pTypeInfo, pTypeDesc, typedetails)
+ ITypeInfo *pTypeInfo;
+ TYPEDESC *pTypeDesc;
+ VALUE typedetails;
{
TYPEDESC *p = pTypeDesc;
VALUE type = rb_str_new2("");
-
- if (p->vt == VT_PTR || p->vt == VT_SAFEARRAY) {
+ while(p->vt == VT_PTR || p->vt == VT_SAFEARRAY) {
p = V_UNION1(p, lptdesc);
- type = ole_typedesc2val(pTypeInfo, p, typedetails);
+ if(strlen(StringValuePtr(type)) == 0) {
+ type = ole_typedesc2val(pTypeInfo, p, typedetails);
+ } else {
+ rb_str_cat(type, ",", 1);
+ rb_str_concat(type, ole_typedesc2val(pTypeInfo, p, typedetails));
+ }
}
return type;
}
static VALUE
-ole_typedesc2val(ITypeInfo *pTypeInfo, TYPEDESC *pTypeDesc, VALUE typedetails)
+ole_typedesc2val(pTypeInfo, pTypeDesc, typedetails)
+ ITypeInfo *pTypeInfo;
+ TYPEDESC *pTypeDesc;
+ VALUE typedetails;
{
VALUE str;
- VALUE typestr = Qnil;
switch(pTypeDesc->vt) {
case VT_I2:
- typestr = rb_str_new2("I2");
- break;
+ if(typedetails != Qnil)
+ rb_ary_push(typedetails, rb_str_new2("I2"));
+ return rb_str_new2("I2");
case VT_I4:
- typestr = rb_str_new2("I4");
- break;
+ if(typedetails != Qnil)
+ rb_ary_push(typedetails, rb_str_new2("I4"));
+ return rb_str_new2("I4");
case VT_R4:
- typestr = rb_str_new2("R4");
- break;
+ if(typedetails != Qnil)
+ rb_ary_push(typedetails, rb_str_new2("R4"));
+ return rb_str_new2("R4");
case VT_R8:
- typestr = rb_str_new2("R8");
- break;
+ if(typedetails != Qnil)
+ rb_ary_push(typedetails, rb_str_new2("R8"));
+ return rb_str_new2("R8");
case VT_CY:
- typestr = rb_str_new2("CY");
- break;
+ if(typedetails != Qnil)
+ rb_ary_push(typedetails, rb_str_new2("CY"));
+ return rb_str_new2("CY");
case VT_DATE:
- typestr = rb_str_new2("DATE");
- break;
+ if(typedetails != Qnil)
+ rb_ary_push(typedetails, rb_str_new2("DATE"));
+ return rb_str_new2("DATE");
case VT_BSTR:
- typestr = rb_str_new2("BSTR");
- break;
+ if(typedetails != Qnil)
+ rb_ary_push(typedetails, rb_str_new2("BSTR"));
+ return rb_str_new2("BSTR");
case VT_BOOL:
- typestr = rb_str_new2("BOOL");
- break;
+ if(typedetails != Qnil)
+ rb_ary_push(typedetails, rb_str_new2("BOOL"));
+ return rb_str_new2("BOOL");
case VT_VARIANT:
- typestr = rb_str_new2("VARIANT");
- break;
+ if(typedetails != Qnil)
+ rb_ary_push(typedetails, rb_str_new2("VARIANT"));
+ return rb_str_new2("VARIANT");
case VT_DECIMAL:
- typestr = rb_str_new2("DECIMAL");
- break;
+ if(typedetails != Qnil)
+ rb_ary_push(typedetails, rb_str_new2("DECIMAL"));
+ return rb_str_new2("DECIMAL");
case VT_I1:
- typestr = rb_str_new2("I1");
- break;
+ if(typedetails != Qnil)
+ rb_ary_push(typedetails, rb_str_new2("I1"));
+ return rb_str_new2("I1");
case VT_UI1:
- typestr = rb_str_new2("UI1");
- break;
+ if(typedetails != Qnil)
+ rb_ary_push(typedetails, rb_str_new2("UI1"));
+ return rb_str_new2("UI1");
case VT_UI2:
- typestr = rb_str_new2("UI2");
- break;
+ if(typedetails != Qnil)
+ rb_ary_push(typedetails, rb_str_new2("UI2"));
+ return rb_str_new2("UI2");
case VT_UI4:
- typestr = rb_str_new2("UI4");
- break;
-#if (_MSC_VER >= 1300) || defined(__CYGWIN__) || defined(__MINGW32__)
+ if(typedetails != Qnil)
+ rb_ary_push(typedetails, rb_str_new2("UI4"));
+ return rb_str_new2("UI4");
case VT_I8:
- typestr = rb_str_new2("I8");
- break;
+ if(typedetails != Qnil)
+ rb_ary_push(typedetails, rb_str_new2("I8"));
+ return rb_str_new2("I8");
case VT_UI8:
- typestr = rb_str_new2("UI8");
- break;
-#endif
+ if(typedetails != Qnil)
+ rb_ary_push(typedetails, rb_str_new2("UI8"));
+ return rb_str_new2("UI8");
case VT_INT:
- typestr = rb_str_new2("INT");
- break;
+ if(typedetails != Qnil)
+ rb_ary_push(typedetails, rb_str_new2("INT"));
+ return rb_str_new2("INT");
case VT_UINT:
- typestr = rb_str_new2("UINT");
- break;
+ if(typedetails != Qnil)
+ rb_ary_push(typedetails, rb_str_new2("UINT"));
+ return rb_str_new2("UINT");
case VT_VOID:
- typestr = rb_str_new2("VOID");
- break;
+ if(typedetails != Qnil)
+ rb_ary_push(typedetails, rb_str_new2("VOID"));
+ return rb_str_new2("VOID");
case VT_HRESULT:
- typestr = rb_str_new2("HRESULT");
- break;
+ if(typedetails != Qnil)
+ rb_ary_push(typedetails, rb_str_new2("HRESULT"));
+ return rb_str_new2("HRESULT");
case VT_PTR:
- typestr = rb_str_new2("PTR");
if(typedetails != Qnil)
- rb_ary_push(typedetails, typestr);
+ rb_ary_push(typedetails, rb_str_new2("PTR"));
return ole_ptrtype2val(pTypeInfo, pTypeDesc, typedetails);
case VT_SAFEARRAY:
- typestr = rb_str_new2("SAFEARRAY");
if(typedetails != Qnil)
- rb_ary_push(typedetails, typestr);
+ rb_ary_push(typedetails, rb_str_new2("SAFEARRAY"));
return ole_ptrtype2val(pTypeInfo, pTypeDesc, typedetails);
case VT_CARRAY:
- typestr = rb_str_new2("CARRAY");
- break;
+ if(typedetails != Qnil)
+ rb_ary_push(typedetails, rb_str_new2("CARRAY"));
+ return rb_str_new2("CARRAY");
case VT_USERDEFINED:
- typestr = rb_str_new2("USERDEFINED");
- if (typedetails != Qnil)
- rb_ary_push(typedetails, typestr);
+ if(typedetails != Qnil)
+ rb_ary_push(typedetails, rb_str_new2("USERDEFINED"));
str = ole_usertype2val(pTypeInfo, pTypeDesc, typedetails);
if (str != Qnil) {
return str;
}
- return typestr;
+ return rb_str_new2("USERDEFINED");
case VT_UNKNOWN:
- typestr = rb_str_new2("UNKNOWN");
- break;
+ return rb_str_new2("UNKNOWN");
case VT_DISPATCH:
- typestr = rb_str_new2("DISPATCH");
- break;
- case VT_ERROR:
- typestr = rb_str_new2("ERROR");
- break;
- case VT_LPWSTR:
- typestr = rb_str_new2("LPWSTR");
- break;
- case VT_LPSTR:
- typestr = rb_str_new2("LPSTR");
- break;
+ if(typedetails != Qnil)
+ rb_ary_push(typedetails, rb_str_new2("DISPATCH"));
+ return rb_str_new2("DISPATCH");
default:
- typestr = rb_str_new2("Unknown Type ");
- rb_str_concat(typestr, rb_fix2str(INT2FIX(pTypeDesc->vt), 10));
- break;
+ str = rb_str_new2("Unknown Type ");
+ rb_str_concat(str, rb_fix2str(INT2FIX(pTypeDesc->vt), 10));
+ return str;
}
- if (typedetails != Qnil)
- rb_ary_push(typedetails, typestr);
- return typestr;
}
/*
@@ -4670,14 +3253,17 @@ ole_typedesc2val(ITypeInfo *pTypeInfo, TYPEDESC *pTypeDesc, VALUE typedetails)
*
*/
static VALUE
-fole_method_help(VALUE self, VALUE cmdname)
+fole_method_help( self, cmdname )
+ VALUE self;
+ VALUE cmdname;
{
ITypeInfo *pTypeInfo;
HRESULT hr;
struct oledata *pole;
VALUE method, obj;
+ LCID lcid = LOCALE_SYSTEM_DEFAULT;
- SafeStringValue(cmdname);
+ Check_SafeStr(cmdname);
OLEData_Get_Struct(self, pole);
hr = typeinfo_from_ole(pole, &pTypeInfo);
if(FAILED(hr))
@@ -4686,7 +3272,7 @@ fole_method_help(VALUE self, VALUE cmdname)
obj = olemethod_from_typeinfo(method, pTypeInfo, cmdname);
OLE_RELEASE(pTypeInfo);
if (obj == Qnil)
- rb_raise(eWIN32OLERuntimeError, "not found %s",
+ rb_raise(eWIN32OLE_RUNTIME_ERROR, "not found %s",
StringValuePtr(cmdname));
return obj;
}
@@ -4702,7 +3288,7 @@ fole_method_help(VALUE self, VALUE cmdname)
* created with MFC should be initialized by calling
* IPersistXXX::InitNew.
*
- * If and only if you received the exception "HRESULT error code:
+ * If and only if you recieved the exception "HRESULT error code:
* 0x8000ffff catastrophic failure", try this method before
* invoking any ole_method.
*
@@ -4712,18 +3298,18 @@ fole_method_help(VALUE self, VALUE cmdname)
*
*/
static VALUE
-fole_activex_initialize(VALUE self)
+fole_activex_initialize(self)
+ VALUE self;
{
struct oledata *pole;
IPersistMemory *pPersistMemory;
- void *p;
HRESULT hr = S_OK;
OLEData_Get_Struct(self, pole);
- hr = pole->pDispatch->lpVtbl->QueryInterface(pole->pDispatch, &IID_IPersistMemory, &p);
- pPersistMemory = p;
+ hr = pole->pDispatch->lpVtbl->QueryInterface(pole->pDispatch, &IID_IPersistMemory,
+ (void **)&pPersistMemory);
if (SUCCEEDED(hr)) {
hr = pPersistMemory->lpVtbl->InitNew(pPersistMemory);
OLE_RELEASE(pPersistMemory);
@@ -4733,7 +3319,7 @@ fole_activex_initialize(VALUE self)
}
if (FAILED(hr)) {
- ole_raise(hr, eWIN32OLERuntimeError, "fail to initialize ActiveX control");
+ ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "fail to initialize ActiveX control");
}
return Qnil;
@@ -4744,20 +3330,35 @@ fole_activex_initialize(VALUE self)
* WIN32OLE_TYPE.ole_classes(typelib)
*
* Returns array of WIN32OLE_TYPE objects defined by the <i>typelib</i> type library.
- * This method will be OBSOLETE. Use WIN32OLE_TYPELIB.new(typelib).ole_classes instead.
*/
static VALUE
-foletype_s_ole_classes(VALUE self, VALUE typelib)
+foletype_s_ole_classes(self, typelib)
+ VALUE self;
+ VALUE typelib;
{
- VALUE obj;
+ VALUE file, classes;
+ OLECHAR * pbuf;
+ ITypeLib *pTypeLib;
+ HRESULT hr;
- /*
- rb_warn("%s is obsolete; use %s instead.",
- "WIN32OLE_TYPE.ole_classes",
- "WIN32OLE_TYPELIB.new(typelib).ole_types");
- */
- obj = rb_funcall(cWIN32OLE_TYPELIB, rb_intern("new"), 1, typelib);
- return rb_funcall(obj, rb_intern("ole_types"), 0);
+ rb_secure(4);
+ classes = rb_ary_new();
+ if(TYPE(typelib) == T_STRING) {
+ file = typelib_file(typelib);
+ if (file == Qnil) {
+ file = typelib;
+ }
+ pbuf = ole_mb2wc(StringValuePtr(file), -1);
+ hr = LoadTypeLibEx(pbuf, REGKIND_NONE, &pTypeLib);
+ if (FAILED(hr))
+ ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to LoadTypeLibEx");
+ SysFreeString(pbuf);
+ ole_classes_from_typelib(pTypeLib, classes);
+ OLE_RELEASE(pTypeLib);
+ } else {
+ rb_raise(rb_eTypeError, "1st argument should be TypeLib string");
+ }
+ return classes;
}
/*
@@ -4765,18 +3366,48 @@ foletype_s_ole_classes(VALUE self, VALUE typelib)
* WIN32OLE_TYPE.typelibs
*
* Returns array of type libraries.
- * This method will be OBSOLETE. Use WIN32OLE_TYPELIB.typelibs.collect{|t| t.name} instead.
*
*/
static VALUE
-foletype_s_typelibs(VALUE self)
+foletype_s_typelibs(self)
+ VALUE self;
{
- /*
- rb_warn("%s is obsolete. use %s instead.",
- "WIN32OLE_TYPE.typelibs",
- "WIN32OLE_TYPELIB.typelibs.collect{t|t.name}");
- */
- return rb_eval_string("WIN32OLE_TYPELIB.typelibs.collect{|t|t.name}");
+ HKEY htypelib, hclsid;
+ double fversion;
+ DWORD i, j;
+ LONG err;
+ VALUE clsid;
+ VALUE ver;
+ VALUE v = Qnil;
+ VALUE typelibs = rb_ary_new();
+
+ err = reg_open_key(HKEY_CLASSES_ROOT, "TypeLib", &htypelib);
+ if(err != ERROR_SUCCESS) {
+ return typelibs;
+ }
+ for(i = 0; ; i++) {
+ clsid = reg_enum_key(htypelib, i);
+ if (clsid == Qnil)
+ break;
+ err = reg_open_vkey(htypelib, clsid, &hclsid);
+ if (err != ERROR_SUCCESS)
+ continue;
+ fversion = 0;
+ for(j = 0; ; j++) {
+ ver = reg_enum_key(hclsid, j);
+ if (ver == Qnil)
+ break;
+ if (fversion > atof(StringValuePtr(ver)))
+ continue;
+ fversion = atof(StringValuePtr(ver));
+ if ( (v = reg_get_val(hclsid, StringValuePtr(ver))) != Qnil ) {
+ rb_ary_push(typelibs, v);
+ }
+ }
+ RegCloseKey(hclsid);
+ }
+ RegCloseKey(htypelib);
+ return typelibs;
}
/*
@@ -4786,7 +3417,8 @@ foletype_s_typelibs(VALUE self)
* Returns array of ProgID.
*/
static VALUE
-foletype_s_progids(VALUE self)
+foletype_s_progids(self)
+ VALUE self;
{
HKEY hclsids, hclsid;
DWORD i;
@@ -4806,9 +3438,9 @@ foletype_s_progids(VALUE self)
err = reg_open_vkey(hclsids, clsid, &hclsid);
if (err != ERROR_SUCCESS)
continue;
- if ((v = reg_get_val2(hclsid, "ProgID")) != Qnil)
+ if ((v = reg_get_val(hclsid, "ProgID")) != Qnil)
rb_ary_push(progids, v);
- if ((v = reg_get_val2(hclsid, "VersionIndependentProgID")) != Qnil)
+ if ((v = reg_get_val(hclsid, "VersionIndependentProgID")) != Qnil)
rb_ary_push(progids, v);
RegCloseKey(hclsid);
}
@@ -4817,7 +3449,8 @@ foletype_s_progids(VALUE self)
}
static VALUE
-foletype_s_allocate(VALUE klass)
+foletype_s_allocate(klass)
+ VALUE klass;
{
struct oletypedata *poletype;
VALUE obj;
@@ -4828,7 +3461,10 @@ foletype_s_allocate(VALUE klass)
}
static VALUE
-oletype_set_member(VALUE self, ITypeInfo *pTypeInfo, VALUE name)
+oletype_set_member(self, pTypeInfo, name)
+ VALUE self;
+ ITypeInfo *pTypeInfo;
+ VALUE name;
{
struct oletypedata *ptype;
Data_Get_Struct(self, struct oletypedata, ptype);
@@ -4839,7 +3475,10 @@ oletype_set_member(VALUE self, ITypeInfo *pTypeInfo, VALUE name)
}
static VALUE
-oleclass_from_typelib(VALUE self, ITypeLib *pTypeLib, VALUE oleclass)
+oleclass_from_typelib(self, pTypeLib, oleclass)
+ VALUE self;
+ ITypeLib *pTypeLib;
+ VALUE oleclass;
{
long count;
@@ -4871,529 +3510,6 @@ oleclass_from_typelib(VALUE self, ITypeLib *pTypeLib, VALUE oleclass)
}
/*
- * Document-class: WIN32OLE_TYPELIB
- *
- * <code>WIN32OLE_TYPELIB</code> objects represent OLE tyblib information.
- */
-
-
-static VALUE
-oletypelib_set_member(VALUE self, VALUE typelib, VALUE guid, VALUE version)
-{
- rb_ivar_set(self, rb_intern("name"), typelib);
- rb_ivar_set(self, rb_intern("guid"), guid);
- rb_ivar_set(self, rb_intern("version"), version);
- return self;
-}
-
-/*
- * call-seq:
- *
- * WIN32OLE_TYPELIB.typelibs
- *
- * Returns the array of WIN32OLE_TYPELIB object.
- *
- * tlibs = WIN32OLE_TYPELIB.typelibs
- *
- */
-static VALUE
-foletypelib_s_typelibs(VALUE self)
-{
- HKEY htypelib, hguid;
- DWORD i, j;
- LONG err;
- VALUE guid;
- VALUE version;
- VALUE name = Qnil;
- VALUE typelibs = rb_ary_new();
- VALUE typelib = Qnil;
-
- err = reg_open_key(HKEY_CLASSES_ROOT, "TypeLib", &htypelib);
- if(err != ERROR_SUCCESS) {
- return typelibs;
- }
- for(i = 0; ; i++) {
- guid = reg_enum_key(htypelib, i);
- if (guid == Qnil)
- break;
- err = reg_open_vkey(htypelib, guid, &hguid);
- if (err != ERROR_SUCCESS)
- continue;
- for(j = 0; ; j++) {
- version = reg_enum_key(hguid, j);
- if (version == Qnil)
- break;
- if ( (name = reg_get_val2(hguid, StringValuePtr(version))) != Qnil ) {
- typelib = rb_funcall(cWIN32OLE_TYPELIB, rb_intern("allocate"), 0);
- oletypelib_set_member(typelib, name, guid, version);
- rb_ary_push(typelibs, typelib);
- }
- }
- RegCloseKey(hguid);
- }
- RegCloseKey(htypelib);
- return typelibs;
-}
-
-static VALUE
-make_version_str(VALUE major, VALUE minor)
-{
- VALUE version_str = Qnil;
- VALUE minor_str = Qnil;
- if (major == Qnil) {
- return Qnil;
- }
- version_str = rb_String(major);
- if (minor != Qnil) {
- minor_str = rb_String(minor);
- rb_str_cat2(version_str, ".");
- rb_str_append(version_str, minor_str);
- }
- return version_str;
-}
-
-static VALUE
-oletypelib_search_registry2(VALUE self, VALUE args)
-{
- HKEY htypelib, hguid, hversion;
- double fver;
- DWORD j;
- LONG err;
- VALUE found = Qfalse;
- VALUE tlib;
- VALUE ver;
- VALUE version_str;
- VALUE version = Qnil;
- VALUE typelib = Qnil;
-
- VALUE guid = rb_ary_entry(args, 0);
- version_str = make_version_str(rb_ary_entry(args, 1), rb_ary_entry(args, 2));
-
- err = reg_open_key(HKEY_CLASSES_ROOT, "TypeLib", &htypelib);
- if(err != ERROR_SUCCESS) {
- return Qfalse;
- }
- err = reg_open_vkey(htypelib, guid, &hguid);
- if (err != ERROR_SUCCESS) {
- RegCloseKey(htypelib);
- return Qfalse;
- }
- if (version_str != Qnil) {
- err = reg_open_vkey(hguid, version_str, &hversion);
- if (err == ERROR_SUCCESS) {
- tlib = reg_get_val(hversion, NULL);
- if (tlib != Qnil) {
- typelib = tlib;
- version = version_str;
- }
- }
- RegCloseKey(hversion);
- } else {
- fver = 0.0;
- for(j = 0; ;j++) {
- ver = reg_enum_key(hguid, j);
- if (ver == Qnil)
- break;
- err = reg_open_vkey(hguid, ver, &hversion);
- if (err != ERROR_SUCCESS)
- continue;
- tlib = reg_get_val(hversion, NULL);
- if (tlib == Qnil) {
- RegCloseKey(hversion);
- continue;
- }
- if (fver < atof(StringValuePtr(ver))) {
- fver = atof(StringValuePtr(ver));
- version = ver;
- typelib = tlib;
- }
- RegCloseKey(hversion);
- }
- }
- RegCloseKey(hguid);
- RegCloseKey(htypelib);
- if (typelib != Qnil) {
- found = Qtrue;
- oletypelib_set_member(self, typelib, guid, version);
- }
- return found;
-}
-
-static VALUE
-oletypelib_search_registry(VALUE self, VALUE typelib)
-{
- HKEY htypelib, hguid, hversion;
- DWORD i, j;
- LONG err;
- VALUE found = Qfalse;
- VALUE tlib;
- VALUE guid;
- VALUE ver;
-
- err = reg_open_key(HKEY_CLASSES_ROOT, "TypeLib", &htypelib);
- if(err != ERROR_SUCCESS) {
- return Qfalse;
- }
- for(i = 0; !found; i++) {
- guid = reg_enum_key(htypelib, i);
- if (guid == Qnil)
- break;
- err = reg_open_vkey(htypelib, guid, &hguid);
- if (err != ERROR_SUCCESS)
- continue;
- for(j = 0; found == Qfalse; j++) {
- ver = reg_enum_key(hguid, j);
- if (ver == Qnil)
- break;
- err = reg_open_vkey(hguid, ver, &hversion);
- if (err != ERROR_SUCCESS)
- continue;
- tlib = reg_get_val(hversion, NULL);
- if (tlib == Qnil) {
- RegCloseKey(hversion);
- continue;
- }
- if (rb_str_cmp(typelib, tlib) == 0) {
- oletypelib_set_member(self, typelib, guid, ver);
- found = Qtrue;
- }
- RegCloseKey(hversion);
- }
- RegCloseKey(hguid);
- }
- RegCloseKey(htypelib);
- return found;
-}
-
-/*
- * call-seq:
- * WIN32OLE_TYPELIB.new(typelib [, version1, version2]) -> WIN32OLE_TYPELIB object
- *
- * Returns a new WIN32OLE_TYPELIB object.
- *
- * The first argument <i>typelib</i> specifies OLE type library name or GUID or
- * OLE library file.
- * The second argument is major version or version of the type library.
- * The third argument is minor version.
- * The second argument and third argument are optional.
- * If the first argument is type library name, then the second and third argument
- * are ignored.
- *
- * tlib1 = WIN32OLE_TYPELIB.new('Microsoft Excel 9.0 Object Library')
- * tlib2 = WIN32OLE_TYPELIB.new('{00020813-0000-0000-C000-000000000046}')
- * tlib3 = WIN32OLE_TYPELIB.new('{00020813-0000-0000-C000-000000000046}', 1.3)
- * tlib4 = WIN32OLE_TYPELIB.new('{00020813-0000-0000-C000-000000000046}', 1, 3)
- * tlib5 = WIN32OLE_TYPELIB.new("C:\\WINNT\\SYSTEM32\\SHELL32.DLL")
- * puts tlib1.name # -> 'Microsoft Excel 9.0 Object Library'
- * puts tlib2.name # -> 'Microsoft Excel 9.0 Object Library'
- * puts tlib3.name # -> 'Microsoft Excel 9.0 Object Library'
- * puts tlib4.name # -> 'Microsoft Excel 9.0 Object Library'
- * puts tlib5.name # -> 'Microsoft Shell Controls And Automation'
- *
- */
-static VALUE
-foletypelib_initialize(VALUE self, VALUE args)
-{
- VALUE found = Qfalse;
- VALUE typelib = Qnil;
- int len = 0;
- OLECHAR * pbuf;
- ITypeLib *pTypeLib;
- VALUE retval;
- HRESULT hr = S_OK;
-
- len = RARRAY_LEN(args);
- if (len < 1 || len > 3) {
- rb_raise(rb_eArgError, "wrong number of arguments (%d for 1..3)", len);
- }
-
- typelib = rb_ary_entry(args, 0);
-
- SafeStringValue(typelib);
-
- found = oletypelib_search_registry(self, typelib);
- if (found == Qfalse) {
- found = oletypelib_search_registry2(self, args);
- }
- if (found == Qfalse) {
- pbuf = ole_vstr2wc(typelib);
- hr = LoadTypeLibEx(pbuf, REGKIND_NONE, &pTypeLib);
- SysFreeString(pbuf);
- if (SUCCEEDED(hr)) {
- retval = ole_typelib_from_itypelib(pTypeLib);
- OLE_RELEASE(pTypeLib);
- if (retval != Qnil) {
- found = Qtrue;
- oletypelib_set_member(self,
- rb_ivar_get(retval, rb_intern("name")),
- rb_ivar_get(retval, rb_intern("guid")),
- rb_ivar_get(retval, rb_intern("version")));
- }
- }
- }
-
- if (found == Qfalse) {
- rb_raise(eWIN32OLERuntimeError, "not found type library `%s`",
- StringValuePtr(typelib));
- }
- return self;
-}
-
-/*
- * call-seq:
- * WIN32OLE_TYPELIB#guid -> The guid string.
- *
- * Returns guid string which specifies type library.
- *
- * tlib = WIN32OLE_TYPELIB.new('Microsoft Excel 9.0 Object Library')
- * guid = tlib.guid # -> '{00020813-0000-0000-C000-000000000046}'
- */
-static VALUE
-foletypelib_guid(VALUE self)
-{
- return rb_ivar_get(self, rb_intern("guid"));
-}
-
-/*
- * call-seq:
- * WIN32OLE_TYPELIB#name -> The type library name
- *
- * Returns the type library name.
- *
- * tlib = WIN32OLE_TYPELIB.new('Microsoft Excel 9.0 Object Library')
- * name = tlib.name # -> 'Microsoft Excel 9.0 Object Library'
- */
-static VALUE
-foletypelib_name(VALUE self)
-{
- VALUE name = rb_ivar_get(self, rb_intern("name"));
- return rb_enc_str_new(StringValuePtr(name), strlen(StringValuePtr(name)), cWIN32OLE_enc);
-}
-
-/*
- * call-seq:
- * WIN32OLE_TYPELIB#version -> The type library version.
- *
- * Returns the type library version.
- *
- * tlib = WIN32OLE_TYPELIB.new('Microsoft Excel 9.0 Object Library')
- * puts tlib.version #-> 1.3
- */
-static VALUE
-foletypelib_version(VALUE self)
-{
- VALUE ver = rb_ivar_get(self, rb_intern("version"));
- return rb_Float(ver);
-}
-
-/*
- * call-seq:
- * WIN32OLE_TYPELIB#major_version -> The type library major version.
- *
- * Returns the type library major version.
- *
- * tlib = WIN32OLE_TYPELIB.new('Microsoft Excel 9.0 Object Library')
- * puts tlib.major_version # -> 1
- */
-static VALUE
-foletypelib_major_version(VALUE self)
-{
- VALUE ver = rb_ivar_get(self, rb_intern("version"));
- VALUE ary = rb_str_split(ver, ".");
- return rb_Integer(rb_ary_entry(ary, 0));
-}
-
-/*
- * call-seq:
- * WIN32OLE_TYPELIB#minor_version -> The type library minor version.
- *
- * Returns the type library minor version.
- *
- * tlib = WIN32OLE_TYPELIB.new('Microsoft Excel 9.0 Object Library')
- * puts tlib.minor_version # -> 3
- */
-static VALUE
-foletypelib_minor_version(VALUE self)
-{
- VALUE ver = rb_ivar_get(self, rb_intern("version"));
- VALUE ary = rb_str_split(ver, ".");
- return rb_Integer(rb_ary_entry(ary, 1));
-}
-
-static VALUE
-oletypelib_path(VALUE guid, VALUE version)
-{
- int k;
- LONG err;
- HKEY hkey;
- HKEY hlang;
- VALUE lang;
- VALUE path = Qnil;
-
- VALUE key = rb_str_new2("TypeLib\\");
- rb_str_concat(key, guid);
- rb_str_cat2(key, "\\");
- rb_str_concat(key, version);
-
- err = reg_open_vkey(HKEY_CLASSES_ROOT, key, &hkey);
- if (err != ERROR_SUCCESS) {
- return Qnil;
- }
- for(k = 0; path == Qnil; k++) {
- lang = reg_enum_key(hkey, k);
- if (lang == Qnil)
- break;
- err = reg_open_vkey(hkey, lang, &hlang);
- if (err == ERROR_SUCCESS) {
- path = reg_get_typelib_file_path(hlang);
- RegCloseKey(hlang);
- }
- }
- RegCloseKey(hkey);
- return path;
-}
-
-/*
- * call-seq:
- * WIN32OLE_TYPELIB#path -> The type library file path.
- *
- * Returns the type library file path.
- *
- * tlib = WIN32OLE_TYPELIB.new('Microsoft Excel 9.0 Object Library')
- * puts tlib.path #-> 'C:\...\EXCEL9.OLB'
- */
-static VALUE
-foletypelib_path(VALUE self)
-{
- VALUE guid = rb_ivar_get(self, rb_intern("guid"));
- VALUE version = rb_ivar_get(self, rb_intern("version"));
- return oletypelib_path(guid, version);
-}
-
-static void
-oletypelib2itypelib(VALUE self, ITypeLib **ppTypeLib)
-{
- VALUE path = Qnil;
- OLECHAR *pbuf;
- HRESULT hr = S_OK;
- path = rb_funcall(self, rb_intern("path"), 0);
- if (path != Qnil) {
- pbuf = ole_vstr2wc(path);
- hr = LoadTypeLibEx(pbuf, REGKIND_NONE, ppTypeLib);
- SysFreeString(pbuf);
- if (FAILED(hr))
- ole_raise(hr, eWIN32OLERuntimeError, "failed to LoadTypeLibEx from `%s'",
- StringValuePtr(path));
- } else {
- rb_raise(eWIN32OLERuntimeError, "failed to get type library path");
- }
-}
-
-/*
- * call-seq:
- * WIN32OLE_TYPELIB#visible?
- *
- * Returns true if the type library information is not hidden.
- * If wLibFlags of TLIBATTR is 0 or LIBFLAG_FRESTRICTED or LIBFLAG_FHIDDEN,
- * the method returns false, otherwise, returns true.
- * If the method fails to access the TLIBATTR information, then
- * WIN32OLERuntimeError is raised.
- *
- * tlib = WIN32OLE_TYPELIB.new('Microsoft Excel 9.0 Object Library')
- * tlib.visible? # => true
- */
-static VALUE
-foletypelib_visible(VALUE self)
-{
- HRESULT hr;
- ITypeLib *pTypeLib = NULL;
- VALUE visible = Qtrue;
- TLIBATTR *pTLibAttr;
-
- oletypelib2itypelib(self, &pTypeLib);
-
- hr = pTypeLib->lpVtbl->GetLibAttr(pTypeLib, &pTLibAttr);
- if (FAILED(hr)) {
- OLE_RELEASE(pTypeLib);
- ole_raise(hr, eWIN32OLERuntimeError, "failed to get TLIBATTR information");
- }
- if ((pTLibAttr->wLibFlags == 0) ||
- (pTLibAttr->wLibFlags & LIBFLAG_FRESTRICTED) ||
- (pTLibAttr->wLibFlags & LIBFLAG_FHIDDEN)) {
- visible = Qfalse;
- }
- pTypeLib->lpVtbl->ReleaseTLibAttr(pTypeLib, pTLibAttr);
- OLE_RELEASE(pTypeLib);
- return visible;
-}
-
-/*
- * call-seq:
- * WIN32OLE_TYPELIB#library_name
- *
- * Returns library name.
- * If the method fails to access library name, WIN32OLERuntimeError is raised.
- *
- * tlib = WIN32OLE_TYPELIB.new('Microsoft Excel 9.0 Object Library')
- * tlib.library_name # => Excel
- */
-static VALUE
-foletypelib_library_name(VALUE self)
-{
- HRESULT hr;
- ITypeLib *pTypeLib = NULL;
- VALUE libname = Qnil;
- BSTR bstr;
-
- oletypelib2itypelib(self, &pTypeLib);
- hr = pTypeLib->lpVtbl->GetDocumentation(pTypeLib, -1,
- &bstr, NULL, NULL, NULL);
- if (FAILED(hr)) {
- OLE_RELEASE(pTypeLib);
- ole_raise(hr, eWIN32OLERuntimeError, "failed to get library name");
- }
- OLE_RELEASE(pTypeLib);
- libname = WC2VSTR(bstr);
- return libname;
-}
-
-
-/*
- * call-seq:
- * WIN32OLE_TYPELIB#ole_types -> The array of WIN32OLE_TYPE object included the type library.
- *
- * Returns the type library file path.
- *
- * tlib = WIN32OLE_TYPELIB.new('Microsoft Excel 9.0 Object Library')
- * classes = tlib.ole_types.collect{|k| k.name} # -> ['AddIn', 'AddIns' ...]
- */
-static VALUE
-foletypelib_ole_types(VALUE self)
-{
- ITypeLib *pTypeLib = NULL;
- VALUE classes = rb_ary_new();
- oletypelib2itypelib(self, &pTypeLib);
- ole_types_from_typelib(pTypeLib, classes);
- OLE_RELEASE(pTypeLib);
- return classes;
-}
-
-/*
- * call-seq:
- * WIN32OLE_TYPELIB#inspect -> String
- *
- * Returns the type library name with class name.
- *
- * tlib = WIN32OLE_TYPELIB.new('Microsoft Excel 9.0 Object Library')
- * tlib.inspect # => "<#WIN32OLE_TYPELIB:Microsoft Excel 9.0 Object Library>"
- */
-static VALUE
-foletypelib_inspect(VALUE self)
-{
- return default_inspect(self, "WIN32OLE_TYPELIB");
-}
-
-/*
* Document-class: WIN32OLE_TYPE
*
* <code>WIN32OLE_TYPE</code> objects represent OLE type libarary information.
@@ -5411,27 +3527,30 @@ foletypelib_inspect(VALUE self)
* # => WIN32OLE_TYPE object of Application class of Excel.
*/
static VALUE
-foletype_initialize(VALUE self, VALUE typelib, VALUE oleclass)
+foletype_initialize(self, typelib, oleclass)
+ VALUE self;
+ VALUE typelib;
+ VALUE oleclass;
{
VALUE file;
OLECHAR * pbuf;
ITypeLib *pTypeLib;
HRESULT hr;
- SafeStringValue(oleclass);
- SafeStringValue(typelib);
+ Check_SafeStr(oleclass);
+ Check_SafeStr(typelib);
file = typelib_file(typelib);
if (file == Qnil) {
file = typelib;
}
- pbuf = ole_vstr2wc(file);
+ pbuf = ole_mb2wc(StringValuePtr(file), -1);
hr = LoadTypeLibEx(pbuf, REGKIND_NONE, &pTypeLib);
if (FAILED(hr))
- ole_raise(hr, eWIN32OLERuntimeError, "failed to LoadTypeLibEx");
+ ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to LoadTypeLibEx");
SysFreeString(pbuf);
if (oleclass_from_typelib(self, pTypeLib, oleclass) == Qfalse) {
OLE_RELEASE(pTypeLib);
- rb_raise(eWIN32OLERuntimeError, "not found `%s` in `%s`",
+ rb_raise(eWIN32OLE_RUNTIME_ERROR, "not found `%s` in `%s`",
StringValuePtr(oleclass), StringValuePtr(typelib));
}
OLE_RELEASE(pTypeLib);
@@ -5447,13 +3566,15 @@ foletype_initialize(VALUE self, VALUE typelib, VALUE oleclass)
* puts tobj.name # => Application
*/
static VALUE
-foletype_name(VALUE self)
+foletype_name(self)
+ VALUE self;
{
return rb_ivar_get(self, rb_intern("name"));
}
static VALUE
-ole_ole_type(ITypeInfo *pTypeInfo)
+ole_ole_type(pTypeInfo)
+ ITypeInfo *pTypeInfo;
{
HRESULT hr;
TYPEATTR *pTypeAttr;
@@ -5507,7 +3628,8 @@ ole_ole_type(ITypeInfo *pTypeInfo)
* puts tobj.ole_type # => Class
*/
static VALUE
-foletype_ole_type(VALUE self)
+foletype_ole_type(self)
+ VALUE self;
{
struct oletypedata *ptype;
Data_Get_Struct(self, struct oletypedata, ptype);
@@ -5515,7 +3637,8 @@ foletype_ole_type(VALUE self)
}
static VALUE
-ole_type_guid(ITypeInfo *pTypeInfo)
+ole_type_guid(pTypeInfo)
+ ITypeInfo *pTypeInfo;
{
HRESULT hr;
TYPEATTR *pTypeAttr;
@@ -5542,7 +3665,8 @@ ole_type_guid(ITypeInfo *pTypeInfo)
* puts tobj.guid # => {00024500-0000-0000-C000-000000000046}
*/
static VALUE
-foletype_guid(VALUE self)
+foletype_guid(self)
+ VALUE self;
{
struct oletypedata *ptype;
Data_Get_Struct(self, struct oletypedata, ptype);
@@ -5550,7 +3674,8 @@ foletype_guid(VALUE self)
}
static VALUE
-ole_type_progid(ITypeInfo *pTypeInfo)
+ole_type_progid(pTypeInfo)
+ ITypeInfo *pTypeInfo;
{
HRESULT hr;
TYPEATTR *pTypeAttr;
@@ -5560,7 +3685,7 @@ ole_type_progid(ITypeInfo *pTypeInfo)
if (FAILED(hr))
return progid;
hr = ProgIDFromCLSID(&pTypeAttr->guid, &pbuf);
- if (SUCCEEDED(hr)) {
+ if (SUCCEEDED(hr)) {
progid = ole_wc2vstr(pbuf, FALSE);
CoTaskMemFree(pbuf);
}
@@ -5577,7 +3702,8 @@ ole_type_progid(ITypeInfo *pTypeInfo)
* puts tobj.progid # => Excel.Application.9
*/
static VALUE
-foletype_progid(VALUE self)
+foletype_progid(self)
+ VALUE self;
{
struct oletypedata *ptype;
Data_Get_Struct(self, struct oletypedata, ptype);
@@ -5586,7 +3712,8 @@ foletype_progid(VALUE self)
static VALUE
-ole_type_visible(ITypeInfo *pTypeInfo)
+ole_type_visible(pTypeInfo)
+ ITypeInfo *pTypeInfo;
{
HRESULT hr;
TYPEATTR *pTypeAttr;
@@ -5612,7 +3739,8 @@ ole_type_visible(ITypeInfo *pTypeInfo)
* puts tobj.visible # => true
*/
static VALUE
-foletype_visible(VALUE self)
+foletype_visible(self)
+ VALUE self;
{
struct oletypedata *ptype;
Data_Get_Struct(self, struct oletypedata, ptype);
@@ -5620,14 +3748,15 @@ foletype_visible(VALUE self)
}
static VALUE
-ole_type_major_version(ITypeInfo *pTypeInfo)
+ole_type_major_version(pTypeInfo)
+ ITypeInfo *pTypeInfo;
{
VALUE ver;
TYPEATTR *pTypeAttr;
HRESULT hr;
hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
if (FAILED(hr))
- ole_raise(hr, eWIN32OLERuntimeError, "failed to GetTypeAttr");
+ ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetTypeAttr");
ver = INT2FIX(pTypeAttr->wMajorVerNum);
OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
return ver;
@@ -5642,7 +3771,8 @@ ole_type_major_version(ITypeInfo *pTypeInfo)
* puts tobj.major_version # => 8
*/
static VALUE
-foletype_major_version(VALUE self)
+foletype_major_version(self)
+ VALUE self;
{
struct oletypedata *ptype;
Data_Get_Struct(self, struct oletypedata, ptype);
@@ -5650,14 +3780,15 @@ foletype_major_version(VALUE self)
}
static VALUE
-ole_type_minor_version(ITypeInfo *pTypeInfo)
+ole_type_minor_version(pTypeInfo)
+ ITypeInfo *pTypeInfo;
{
VALUE ver;
TYPEATTR *pTypeAttr;
HRESULT hr;
hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
if (FAILED(hr))
- ole_raise(hr, eWIN32OLERuntimeError, "failed to GetTypeAttr");
+ ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetTypeAttr");
ver = INT2FIX(pTypeAttr->wMinorVerNum);
OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
return ver;
@@ -5672,7 +3803,8 @@ ole_type_minor_version(ITypeInfo *pTypeInfo)
* puts tobj.minor_version # => 2
*/
static VALUE
-foletype_minor_version(VALUE self)
+foletype_minor_version(self)
+ VALUE self;
{
struct oletypedata *ptype;
Data_Get_Struct(self, struct oletypedata, ptype);
@@ -5680,14 +3812,15 @@ foletype_minor_version(VALUE self)
}
static VALUE
-ole_type_typekind(ITypeInfo *pTypeInfo)
+ole_type_typekind(pTypeInfo)
+ ITypeInfo *pTypeInfo;
{
VALUE typekind;
TYPEATTR *pTypeAttr;
HRESULT hr;
hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
if (FAILED(hr))
- ole_raise(hr, eWIN32OLERuntimeError, "failed to GetTypeAttr");
+ ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetTypeAttr");
typekind = INT2FIX(pTypeAttr->typekind);
OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
return typekind;
@@ -5703,7 +3836,8 @@ ole_type_typekind(ITypeInfo *pTypeInfo)
*
*/
static VALUE
-foletype_typekind(VALUE self)
+foletype_typekind(self)
+ VALUE self;
{
struct oletypedata *ptype;
Data_Get_Struct(self, struct oletypedata, ptype);
@@ -5711,7 +3845,8 @@ foletype_typekind(VALUE self)
}
static VALUE
-ole_type_helpstring(ITypeInfo *pTypeInfo)
+ole_type_helpstring(pTypeInfo)
+ ITypeInfo *pTypeInfo;
{
HRESULT hr;
BSTR bhelpstr;
@@ -5731,7 +3866,8 @@ ole_type_helpstring(ITypeInfo *pTypeInfo)
* puts tobj.helpstring # => Web Browser interface
*/
static VALUE
-foletype_helpstring(VALUE self)
+foletype_helpstring(self)
+ VALUE self;
{
struct oletypedata *ptype;
Data_Get_Struct(self, struct oletypedata, ptype);
@@ -5739,7 +3875,8 @@ foletype_helpstring(VALUE self)
}
static VALUE
-ole_type_src_type(ITypeInfo *pTypeInfo)
+ole_type_src_type(pTypeInfo)
+ ITypeInfo *pTypeInfo;
{
HRESULT hr;
TYPEATTR *pTypeAttr;
@@ -5766,7 +3903,8 @@ ole_type_src_type(ITypeInfo *pTypeInfo)
*
*/
static VALUE
-foletype_src_type(VALUE self)
+foletype_src_type(self)
+ VALUE self;
{
struct oletypedata *ptype;
Data_Get_Struct(self, struct oletypedata, ptype);
@@ -5774,7 +3912,8 @@ foletype_src_type(VALUE self)
}
static VALUE
-ole_type_helpfile(ITypeInfo *pTypeInfo)
+ole_type_helpfile(pTypeInfo)
+ ITypeInfo *pTypeInfo;
{
HRESULT hr;
BSTR bhelpfile;
@@ -5795,7 +3934,8 @@ ole_type_helpfile(ITypeInfo *pTypeInfo)
*
*/
static VALUE
-foletype_helpfile(VALUE self)
+foletype_helpfile(self)
+ VALUE self;
{
struct oletypedata *ptype;
Data_Get_Struct(self, struct oletypedata, ptype);
@@ -5803,7 +3943,8 @@ foletype_helpfile(VALUE self)
}
static VALUE
-ole_type_helpcontext(ITypeInfo *pTypeInfo)
+ole_type_helpcontext(pTypeInfo)
+ ITypeInfo *pTypeInfo;
{
HRESULT hr;
DWORD helpcontext;
@@ -5823,158 +3964,17 @@ ole_type_helpcontext(ITypeInfo *pTypeInfo)
* puts tobj.helpfile # => 131185
*/
static VALUE
-foletype_helpcontext(VALUE self)
+foletype_helpcontext(self)
+ VALUE self;
{
struct oletypedata *ptype;
Data_Get_Struct(self, struct oletypedata, ptype);
return ole_type_helpcontext(ptype->pTypeInfo);
}
-/*
- * call-seq:
- * WIN32OLE_TYPE#ole_typelib
- *
- * Returns the WIN32OLE_TYPELIB object which is including the WIN32OLE_TYPE
- * object. If it is not found, then returns nil.
- * tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Worksheet')
- * puts tobj.ole_typelib # => 'Microsoft Excel 9.0 Object Library'
- */
-static VALUE
-foletype_ole_typelib(VALUE self)
-{
- struct oletypedata *ptype;
- Data_Get_Struct(self, struct oletypedata, ptype);
- return ole_typelib_from_itypeinfo(ptype->pTypeInfo);
-}
-
-static VALUE
-ole_type_impl_ole_types(ITypeInfo *pTypeInfo, int implflags)
-{
- HRESULT hr;
- ITypeInfo *pRefTypeInfo;
- HREFTYPE href;
- WORD i;
- VALUE type;
- TYPEATTR *pTypeAttr;
- int flags;
-
- VALUE types = rb_ary_new();
- hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
- if (FAILED(hr)) {
- return types;
- }
- for (i = 0; i < pTypeAttr->cImplTypes; i++) {
- hr = pTypeInfo->lpVtbl->GetImplTypeFlags(pTypeInfo, i, &flags);
- if (FAILED(hr))
- continue;
-
- hr = pTypeInfo->lpVtbl->GetRefTypeOfImplType(pTypeInfo, i, &href);
- if (FAILED(hr))
- continue;
- hr = pTypeInfo->lpVtbl->GetRefTypeInfo(pTypeInfo, href, &pRefTypeInfo);
- if (FAILED(hr))
- continue;
-
- if ((flags & implflags) == implflags) {
- type = ole_type_from_itypeinfo(pRefTypeInfo);
- if (type != Qnil) {
- rb_ary_push(types, type);
- }
- }
-
- OLE_RELEASE(pRefTypeInfo);
- }
- OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
- return types;
-}
-
-/*
- * call-seq:
- * WIN32OLE_TYPE#implemented_ole_types
- *
- * Returns the array of WIN32OLE_TYPE object which is implemented by the WIN32OLE_TYPE
- * object.
- * tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Worksheet')
- * p tobj.implemented_ole_types # => [_Worksheet, DocEvents]
- */
static VALUE
-foletype_impl_ole_types(VALUE self)
-{
- struct oletypedata *ptype;
- Data_Get_Struct(self, struct oletypedata, ptype);
- return ole_type_impl_ole_types(ptype->pTypeInfo, 0);
-}
-
-/*
- * call-seq:
- * WIN32OLE_TYPE#source_ole_types
- *
- * Returns the array of WIN32OLE_TYPE object which is implemented by the WIN32OLE_TYPE
- * object and having IMPLTYPEFLAG_FSOURCE.
- * tobj = WIN32OLE_TYPE.new('Microsoft Internet Controls', "InternetExplorer")
- * p tobj.source_ole_types
- * # => [#<WIN32OLE_TYPE:DWebBrowserEvents2>, #<WIN32OLE_TYPE:DWebBrowserEvents>]
- */
-static VALUE
-foletype_source_ole_types(VALUE self)
-{
- struct oletypedata *ptype;
- Data_Get_Struct(self, struct oletypedata, ptype);
- return ole_type_impl_ole_types(ptype->pTypeInfo, IMPLTYPEFLAG_FSOURCE);
-}
-
-/*
- * call-seq:
- * WIN32OLE_TYPE#default_event_sources
- *
- * Returns the array of WIN32OLE_TYPE object which is implemented by the WIN32OLE_TYPE
- * object and having IMPLTYPEFLAG_FSOURCE and IMPLTYPEFLAG_FDEFAULT.
- * tobj = WIN32OLE_TYPE.new('Microsoft Internet Controls', "InternetExplorer")
- * p tobj.default_event_sources # => [#<WIN32OLE_TYPE:DWebBrowserEvents2>]
- */
-static VALUE
-foletype_default_event_sources(VALUE self)
-{
- struct oletypedata *ptype;
- Data_Get_Struct(self, struct oletypedata, ptype);
- return ole_type_impl_ole_types(ptype->pTypeInfo, IMPLTYPEFLAG_FSOURCE|IMPLTYPEFLAG_FDEFAULT);
-}
-
-/*
- * call-seq:
- * WIN32OLE_TYPE#default_ole_types
- *
- * Returns the array of WIN32OLE_TYPE object which is implemented by the WIN32OLE_TYPE
- * object and having IMPLTYPEFLAG_FDEFAULT.
- * tobj = WIN32OLE_TYPE.new('Microsoft Internet Controls', "InternetExplorer")
- * p tobj.default_ole_types
- * # => [#<WIN32OLE_TYPE:IWebBrowser2>, #<WIN32OLE_TYPE:DWebBrowserEvents2>]
- */
-static VALUE
-foletype_default_ole_types(VALUE self)
-{
- struct oletypedata *ptype;
- Data_Get_Struct(self, struct oletypedata, ptype);
- return ole_type_impl_ole_types(ptype->pTypeInfo, IMPLTYPEFLAG_FDEFAULT);
-}
-
-/*
- * call-seq:
- * WIN32OLE_TYPE#inspect -> String
- *
- * Returns the type name with class name.
- *
- * ie = WIN32OLE.new('InternetExplorer.Application')
- * ie.ole_type.inspect => #<WIN32OLE_TYPE:IWebBrowser2>
- */
-static VALUE
-foletype_inspect(VALUE self)
-{
- return default_inspect(self, "WIN32OLE_TYPE");
-}
-
-static VALUE
-ole_variables(ITypeInfo *pTypeInfo)
+ole_variables(pTypeInfo)
+ ITypeInfo *pTypeInfo;
{
HRESULT hr;
TYPEATTR *pTypeAttr;
@@ -5988,7 +3988,7 @@ ole_variables(ITypeInfo *pTypeInfo)
VALUE variables = rb_ary_new();
hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
if (FAILED(hr)) {
- ole_raise(hr, eWIN32OLERuntimeError, "failed to GetTypeAttr");
+ ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetTypeAttr");
}
for(i = 0; i < pTypeAttr->cVars; i++) {
@@ -6038,7 +4038,8 @@ ole_variables(ITypeInfo *pTypeInfo)
*
*/
static VALUE
-foletype_variables(VALUE self)
+foletype_variables(self)
+ VALUE self;
{
struct oletypedata *ptype;
Data_Get_Struct(self, struct oletypedata, ptype);
@@ -6058,7 +4059,10 @@ foletype_variables(VALUE self)
* # => ['Activate', 'Copy', 'Delete',....]
*/
static VALUE
-foletype_methods(VALUE self)
+foletype_methods(argc, argv, self)
+ int argc;
+ VALUE *argv;
+ VALUE self;
{
struct oletypedata *ptype;
Data_Get_Struct(self, struct oletypedata, ptype);
@@ -6092,20 +4096,23 @@ foletype_methods(VALUE self)
*
*/
static VALUE
-folevariable_name(VALUE self)
+folevariable_name(self)
+ VALUE self;
{
return rb_ivar_get(self, rb_intern("name"));
}
static VALUE
-ole_variable_ole_type(ITypeInfo *pTypeInfo, UINT var_index)
+ole_variable_ole_type(pTypeInfo, var_index)
+ ITypeInfo *pTypeInfo;
+ UINT var_index;
{
VARDESC *pVarDesc;
HRESULT hr;
VALUE type;
hr = pTypeInfo->lpVtbl->GetVarDesc(pTypeInfo, var_index, &pVarDesc);
if (FAILED(hr))
- ole_raise(hr, eWIN32OLERuntimeError, "failed to GetVarDesc");
+ ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetVarDesc");
type = ole_typedesc2val(pTypeInfo, &(pVarDesc->elemdescVar.tdesc), Qnil);
pTypeInfo->lpVtbl->ReleaseVarDesc(pTypeInfo, pVarDesc);
return type;
@@ -6132,7 +4139,8 @@ ole_variable_ole_type(ITypeInfo *pTypeInfo, UINT var_index)
*
*/
static VALUE
-folevariable_ole_type(VALUE self)
+folevariable_ole_type(self)
+ VALUE self;
{
struct olevariabledata *pvar;
Data_Get_Struct(self, struct olevariabledata, pvar);
@@ -6140,14 +4148,16 @@ folevariable_ole_type(VALUE self)
}
static VALUE
-ole_variable_ole_type_detail(ITypeInfo *pTypeInfo, UINT var_index)
+ole_variable_ole_type_detail(pTypeInfo, var_index)
+ ITypeInfo *pTypeInfo;
+ UINT var_index;
{
VARDESC *pVarDesc;
HRESULT hr;
VALUE type = rb_ary_new();
hr = pTypeInfo->lpVtbl->GetVarDesc(pTypeInfo, var_index, &pVarDesc);
if (FAILED(hr))
- ole_raise(hr, eWIN32OLERuntimeError, "failed to GetVarDesc");
+ ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetVarDesc");
ole_typedesc2val(pTypeInfo, &(pVarDesc->elemdescVar.tdesc), type);
pTypeInfo->lpVtbl->ReleaseVarDesc(pTypeInfo, pVarDesc);
return type;
@@ -6166,7 +4176,8 @@ ole_variable_ole_type_detail(ITypeInfo *pTypeInfo, UINT var_index)
*
*/
static VALUE
-folevariable_ole_type_detail(VALUE self)
+folevariable_ole_type_detail(self)
+ VALUE self;
{
struct olevariabledata *pvar;
Data_Get_Struct(self, struct olevariabledata, pvar);
@@ -6174,7 +4185,9 @@ folevariable_ole_type_detail(VALUE self)
}
static VALUE
-ole_variable_value(ITypeInfo *pTypeInfo, UINT var_index)
+ole_variable_value(pTypeInfo, var_index)
+ ITypeInfo *pTypeInfo;
+ UINT var_index;
{
VARDESC *pVarDesc;
HRESULT hr;
@@ -6198,7 +4211,7 @@ ole_variable_value(ITypeInfo *pTypeInfo, UINT var_index)
* tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'XlSheetType')
* variables = tobj.variables
* variables.each do |variable|
- * puts "#{variable.name} #{variable.value}"
+ * puts "#{variable.name} = #{variable.value}"
* end
*
* The result of above script is following:
@@ -6210,7 +4223,8 @@ ole_variable_value(ITypeInfo *pTypeInfo, UINT var_index)
*
*/
static VALUE
-folevariable_value(VALUE self)
+folevariable_value(self)
+ VALUE self;
{
struct olevariabledata *pvar;
Data_Get_Struct(self, struct olevariabledata, pvar);
@@ -6218,7 +4232,9 @@ folevariable_value(VALUE self)
}
static VALUE
-ole_variable_visible(ITypeInfo *pTypeInfo, UINT var_index)
+ole_variable_visible(pTypeInfo, var_index)
+ ITypeInfo *pTypeInfo;
+ UINT var_index;
{
VARDESC *pVarDesc;
HRESULT hr;
@@ -6256,7 +4272,8 @@ ole_variable_visible(ITypeInfo *pTypeInfo, UINT var_index)
*
*/
static VALUE
-folevariable_visible(VALUE self)
+folevariable_visible(self)
+ VALUE self;
{
struct olevariabledata *pvar;
Data_Get_Struct(self, struct olevariabledata, pvar);
@@ -6264,7 +4281,9 @@ folevariable_visible(VALUE self)
}
static VALUE
-ole_variable_kind(ITypeInfo *pTypeInfo, UINT var_index)
+ole_variable_kind(pTypeInfo, var_index)
+ ITypeInfo *pTypeInfo;
+ UINT var_index;
{
VARDESC *pVarDesc;
HRESULT hr;
@@ -6312,7 +4331,8 @@ ole_variable_kind(ITypeInfo *pTypeInfo, UINT var_index)
* xlWorksheet CONSTANT
*/
static VALUE
-folevariable_variable_kind(VALUE self)
+folevariable_variable_kind(self)
+ VALUE self;
{
struct olevariabledata *pvar;
Data_Get_Struct(self, struct olevariabledata, pvar);
@@ -6320,7 +4340,9 @@ folevariable_variable_kind(VALUE self)
}
static VALUE
-ole_variable_varkind(ITypeInfo *pTypeInfo, UINT var_index)
+ole_variable_varkind(pTypeInfo, var_index)
+ ITypeInfo *pTypeInfo;
+ UINT var_index;
{
VARDESC *pVarDesc;
HRESULT hr;
@@ -6352,7 +4374,8 @@ ole_variable_varkind(ITypeInfo *pTypeInfo, UINT var_index)
* xlWorksheet 2
*/
static VALUE
-folevariable_varkind(VALUE self)
+folevariable_varkind(self)
+ VALUE self;
{
struct olevariabledata *pvar;
Data_Get_Struct(self, struct olevariabledata, pvar);
@@ -6360,29 +4383,18 @@ folevariable_varkind(VALUE self)
}
/*
- * call-seq:
- * WIN32OLE_VARIABLE#inspect -> String
- *
- * Returns the OLE variable name and the value with class name.
- *
- */
-static VALUE
-folevariable_inspect(VALUE self)
-{
- VALUE detail = rb_funcall(self, rb_intern("to_s"), 0);
- rb_str_cat2(detail, "=");
- rb_str_concat(detail, rb_funcall(rb_funcall(self, rb_intern("value"), 0), rb_intern("inspect"), 0));
- return make_inspect("WIN32OLE_VARIABLE", detail);
-}
-
-/*
* Document-class: WIN32OLE_METHOD
*
* <code>WIN32OLE_METHOD</code> objects represent OLE method information.
*/
static VALUE
-olemethod_set_member(VALUE self, ITypeInfo *pTypeInfo, ITypeInfo *pOwnerTypeInfo, int index, VALUE name)
+olemethod_set_member(self, pTypeInfo, pOwnerTypeInfo, index, name)
+ VALUE self;
+ ITypeInfo *pTypeInfo;
+ ITypeInfo *pOwnerTypeInfo;
+ int index;
+ VALUE name;
{
struct olemethoddata *pmethod;
Data_Get_Struct(self, struct olemethoddata, pmethod);
@@ -6396,7 +4408,8 @@ olemethod_set_member(VALUE self, ITypeInfo *pTypeInfo, ITypeInfo *pOwnerTypeInfo
}
static VALUE
-folemethod_s_allocate(VALUE klass)
+folemethod_s_allocate(klass)
+ VALUE klass;
{
struct olemethoddata *pmethod;
VALUE obj;
@@ -6423,16 +4436,19 @@ folemethod_s_allocate(VALUE klass)
* method = WIN32OLE_METHOD.new(tobj, 'SaveAs')
*/
static VALUE
-folemethod_initialize(VALUE self, VALUE oletype, VALUE method)
+folemethod_initialize(self, oletype, method)
+ VALUE self;
+ VALUE oletype;
+ VALUE method;
{
struct oletypedata *ptype;
VALUE obj = Qnil;
if (rb_obj_is_kind_of(oletype, cWIN32OLE_TYPE)) {
- SafeStringValue(method);
+ Check_SafeStr(method);
Data_Get_Struct(oletype, struct oletypedata, ptype);
obj = olemethod_from_typeinfo(self, ptype->pTypeInfo, method);
if (obj == Qnil) {
- rb_raise(eWIN32OLERuntimeError, "not found %s",
+ rb_raise(eWIN32OLE_RUNTIME_ERROR, "not found %s",
StringValuePtr(method));
}
}
@@ -6454,13 +4470,16 @@ folemethod_initialize(VALUE self, VALUE oletype, VALUE method)
*
*/
static VALUE
-folemethod_name(VALUE self)
+folemethod_name(self)
+ VALUE self;
{
return rb_ivar_get(self, rb_intern("name"));
}
static VALUE
-ole_method_return_type(ITypeInfo *pTypeInfo, UINT method_index)
+ole_method_return_type(pTypeInfo, method_index)
+ ITypeInfo *pTypeInfo;
+ UINT method_index;
{
FUNCDESC *pFuncDesc;
HRESULT hr;
@@ -6468,7 +4487,7 @@ ole_method_return_type(ITypeInfo *pTypeInfo, UINT method_index)
hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
if (FAILED(hr))
- ole_raise(hr, eWIN32OLERuntimeError, "failed to GetFuncDesc");
+ ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetFuncDesc");
type = ole_typedesc2val(pTypeInfo, &(pFuncDesc->elemdescFunc.tdesc), Qnil);
pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
@@ -6486,7 +4505,8 @@ ole_method_return_type(ITypeInfo *pTypeInfo, UINT method_index)
*
*/
static VALUE
-folemethod_return_type(VALUE self)
+folemethod_return_type(self)
+ VALUE self;
{
struct olemethoddata *pmethod;
Data_Get_Struct(self, struct olemethoddata, pmethod);
@@ -6494,19 +4514,21 @@ folemethod_return_type(VALUE self)
}
static VALUE
-ole_method_return_vtype(ITypeInfo *pTypeInfo, UINT method_index)
+ole_method_return_vtype(pTypeInfo, method_index)
+ ITypeInfo *pTypeInfo;
+ UINT method_index;
{
FUNCDESC *pFuncDesc;
HRESULT hr;
- VALUE vvt;
+ VALUE vt;
hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
if (FAILED(hr))
- ole_raise(hr, eWIN32OLERuntimeError, "failed to GetFuncDesc");
+ ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetFuncDesc");
- vvt = INT2FIX(pFuncDesc->elemdescFunc.tdesc.vt);
+ vt = INT2FIX(pFuncDesc->elemdescFunc.tdesc.vt);
pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
- return vvt;
+ return vt;
}
/*
@@ -6520,7 +4542,8 @@ ole_method_return_vtype(ITypeInfo *pTypeInfo, UINT method_index)
*
*/
static VALUE
-folemethod_return_vtype(VALUE self)
+folemethod_return_vtype(self)
+ VALUE self;
{
struct olemethoddata *pmethod;
Data_Get_Struct(self, struct olemethoddata, pmethod);
@@ -6528,7 +4551,9 @@ folemethod_return_vtype(VALUE self)
}
static VALUE
-ole_method_return_type_detail(ITypeInfo *pTypeInfo, UINT method_index)
+ole_method_return_type_detail(pTypeInfo, method_index)
+ ITypeInfo *pTypeInfo;
+ UINT method_index;
{
FUNCDESC *pFuncDesc;
HRESULT hr;
@@ -6554,7 +4579,8 @@ ole_method_return_type_detail(ITypeInfo *pTypeInfo, UINT method_index)
* p method.return_type_detail # => ["PTR", "USERDEFINED", "Workbook"]
*/
static VALUE
-folemethod_return_type_detail(VALUE self)
+folemethod_return_type_detail(self)
+ VALUE self;
{
struct olemethoddata *pmethod;
Data_Get_Struct(self, struct olemethoddata, pmethod);
@@ -6562,21 +4588,25 @@ folemethod_return_type_detail(VALUE self)
}
static VALUE
-ole_method_invkind(ITypeInfo *pTypeInfo, UINT method_index)
+ole_method_invkind(pTypeInfo, method_index)
+ ITypeInfo *pTypeInfo;
+ UINT method_index;
{
FUNCDESC *pFuncDesc;
HRESULT hr;
VALUE invkind;
hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
if(FAILED(hr))
- ole_raise(hr, eWIN32OLERuntimeError, "failed to GetFuncDesc");
+ ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetFuncDesc");
invkind = INT2FIX(pFuncDesc->invkind);
pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
return invkind;
}
static VALUE
-ole_method_invoke_kind(ITypeInfo *pTypeInfo, UINT method_index)
+ole_method_invoke_kind(pTypeInfo, method_index)
+ ITypeInfo *pTypeInfo;
+ WORD method_index;
{
VALUE type = rb_str_new2("UNKNOWN");
VALUE invkind = ole_method_invkind(pTypeInfo, method_index);
@@ -6606,7 +4636,8 @@ ole_method_invoke_kind(ITypeInfo *pTypeInfo, UINT method_index)
*
*/
static VALUE
-folemethod_invkind(VALUE self)
+folemethod_invkind(self)
+ VALUE self;
{
struct olemethoddata *pmethod;
Data_Get_Struct(self, struct olemethoddata, pmethod);
@@ -6625,7 +4656,8 @@ folemethod_invkind(VALUE self)
* puts method.invoke_kind # => "FUNC"
*/
static VALUE
-folemethod_invoke_kind(VALUE self)
+folemethod_invoke_kind(self)
+ VALUE self;
{
struct olemethoddata *pmethod;
Data_Get_Struct(self, struct olemethoddata, pmethod);
@@ -6633,7 +4665,9 @@ folemethod_invoke_kind(VALUE self)
}
static VALUE
-ole_method_visible(ITypeInfo *pTypeInfo, UINT method_index)
+ole_method_visible(pTypeInfo, method_index)
+ ITypeInfo *pTypeInfo;
+ UINT method_index;
{
FUNCDESC *pFuncDesc;
HRESULT hr;
@@ -6662,7 +4696,8 @@ ole_method_visible(ITypeInfo *pTypeInfo, UINT method_index)
* puts method.visible? # => true
*/
static VALUE
-folemethod_visible(VALUE self)
+folemethod_visible(self)
+ VALUE self;
{
struct olemethoddata *pmethod;
Data_Get_Struct(self, struct olemethoddata, pmethod);
@@ -6670,7 +4705,10 @@ folemethod_visible(VALUE self)
}
static VALUE
-ole_method_event(ITypeInfo *pTypeInfo, UINT method_index, VALUE method_name)
+ole_method_event(pTypeInfo, method_index, method_name)
+ ITypeInfo *pTypeInfo;
+ WORD method_index;
+ VALUE method_name;
{
TYPEATTR *pTypeAttr;
HRESULT hr;
@@ -6744,7 +4782,8 @@ ole_method_event(ITypeInfo *pTypeInfo, UINT method_index, VALUE method_name)
*
*/
static VALUE
-folemethod_event(VALUE self)
+folemethod_event(self)
+ VALUE self;
{
struct olemethoddata *pmethod;
Data_Get_Struct(self, struct olemethoddata, pmethod);
@@ -6765,7 +4804,8 @@ folemethod_event(VALUE self)
* puts method.event_interface # => WorkbookEvents
*/
static VALUE
-folemethod_event_interface(VALUE self)
+folemethod_event_interface(self)
+ VALUE self;
{
BSTR name;
struct olemethoddata *pmethod;
@@ -6780,14 +4820,14 @@ folemethod_event_interface(VALUE self)
}
static VALUE
-ole_method_docinfo_from_type(
- ITypeInfo *pTypeInfo,
- UINT method_index,
- BSTR *name,
- BSTR *helpstr,
- DWORD *helpcontext,
- BSTR *helpfile
- )
+ole_method_docinfo_from_type(pTypeInfo, method_index, name, helpstr,
+ helpcontext, helpfile)
+ ITypeInfo *pTypeInfo;
+ UINT method_index;
+ BSTR *name;
+ BSTR *helpstr;
+ DWORD *helpcontext;
+ BSTR *helpfile;
{
FUNCDESC *pFuncDesc;
HRESULT hr;
@@ -6802,7 +4842,9 @@ ole_method_docinfo_from_type(
}
static VALUE
-ole_method_helpstring(ITypeInfo *pTypeInfo, UINT method_index)
+ole_method_helpstring(pTypeInfo, method_index)
+ ITypeInfo *pTypeInfo;
+ UINT method_index;
{
HRESULT hr;
BSTR bhelpstring;
@@ -6825,7 +4867,8 @@ ole_method_helpstring(ITypeInfo *pTypeInfo, UINT method_index)
*
*/
static VALUE
-folemethod_helpstring(VALUE self)
+folemethod_helpstring(self)
+ VALUE self;
{
struct olemethoddata *pmethod;
Data_Get_Struct(self, struct olemethoddata, pmethod);
@@ -6833,7 +4876,9 @@ folemethod_helpstring(VALUE self)
}
static VALUE
-ole_method_helpfile(ITypeInfo *pTypeInfo, UINT method_index)
+ole_method_helpfile(pTypeInfo, method_index)
+ ITypeInfo *pTypeInfo;
+ UINT method_index;
{
HRESULT hr;
BSTR bhelpfile;
@@ -6855,7 +4900,8 @@ ole_method_helpfile(ITypeInfo *pTypeInfo, UINT method_index)
* puts method.helpfile # => C:\...\VBAXL9.CHM
*/
static VALUE
-folemethod_helpfile(VALUE self)
+folemethod_helpfile(self)
+ VALUE self;
{
struct olemethoddata *pmethod;
Data_Get_Struct(self, struct olemethoddata, pmethod);
@@ -6864,7 +4910,9 @@ folemethod_helpfile(VALUE self)
}
static VALUE
-ole_method_helpcontext(ITypeInfo *pTypeInfo, UINT method_index)
+ole_method_helpcontext(pTypeInfo, method_index)
+ ITypeInfo *pTypeInfo;
+ UINT method_index;
{
HRESULT hr;
DWORD helpcontext = 0;
@@ -6885,7 +4933,8 @@ ole_method_helpcontext(ITypeInfo *pTypeInfo, UINT method_index)
* puts method.helpcontext # => 65717
*/
static VALUE
-folemethod_helpcontext(VALUE self)
+folemethod_helpcontext(self)
+ VALUE self;
{
struct olemethoddata *pmethod;
Data_Get_Struct(self, struct olemethoddata, pmethod);
@@ -6893,7 +4942,9 @@ folemethod_helpcontext(VALUE self)
}
static VALUE
-ole_method_dispid(ITypeInfo *pTypeInfo, UINT method_index)
+ole_method_dispid(pTypeInfo, method_index)
+ ITypeInfo *pTypeInfo;
+ UINT method_index;
{
FUNCDESC *pFuncDesc;
HRESULT hr;
@@ -6916,7 +4967,8 @@ ole_method_dispid(ITypeInfo *pTypeInfo, UINT method_index)
* puts method.dispid # => 181
*/
static VALUE
-folemethod_dispid(VALUE self)
+folemethod_dispid(self)
+ VALUE self;
{
struct olemethoddata *pmethod;
Data_Get_Struct(self, struct olemethoddata, pmethod);
@@ -6924,7 +4976,9 @@ folemethod_dispid(VALUE self)
}
static VALUE
-ole_method_offset_vtbl(ITypeInfo *pTypeInfo, UINT method_index)
+ole_method_offset_vtbl(pTypeInfo, method_index)
+ ITypeInfo *pTypeInfo;
+ UINT method_index;
{
FUNCDESC *pFuncDesc;
HRESULT hr;
@@ -6947,7 +5001,8 @@ ole_method_offset_vtbl(ITypeInfo *pTypeInfo, UINT method_index)
* puts method.offset_vtbl # => 40
*/
static VALUE
-folemethod_offset_vtbl(VALUE self)
+folemethod_offset_vtbl(self)
+ VALUE self;
{
struct olemethoddata *pmethod;
Data_Get_Struct(self, struct olemethoddata, pmethod);
@@ -6955,7 +5010,9 @@ folemethod_offset_vtbl(VALUE self)
}
static VALUE
-ole_method_size_params(ITypeInfo *pTypeInfo, UINT method_index)
+ole_method_size_params(pTypeInfo, method_index)
+ ITypeInfo *pTypeInfo;
+ UINT method_index;
{
FUNCDESC *pFuncDesc;
HRESULT hr;
@@ -6979,7 +5036,8 @@ ole_method_size_params(ITypeInfo *pTypeInfo, UINT method_index)
*
*/
static VALUE
-folemethod_size_params(VALUE self)
+folemethod_size_params(self)
+ VALUE self;
{
struct olemethoddata *pmethod;
Data_Get_Struct(self, struct olemethoddata, pmethod);
@@ -6987,7 +5045,9 @@ folemethod_size_params(VALUE self)
}
static VALUE
-ole_method_size_opt_params(ITypeInfo *pTypeInfo, UINT method_index)
+ole_method_size_opt_params(pTypeInfo, method_index)
+ ITypeInfo *pTypeInfo;
+ UINT method_index;
{
FUNCDESC *pFuncDesc;
HRESULT hr;
@@ -7010,7 +5070,8 @@ ole_method_size_opt_params(ITypeInfo *pTypeInfo, UINT method_index)
* puts method.size_opt_params # => 4
*/
static VALUE
-folemethod_size_opt_params(VALUE self)
+folemethod_size_opt_params(self)
+ VALUE self;
{
struct olemethoddata *pmethod;
Data_Get_Struct(self, struct olemethoddata, pmethod);
@@ -7018,7 +5079,9 @@ folemethod_size_opt_params(VALUE self)
}
static VALUE
-ole_method_params(ITypeInfo *pTypeInfo, UINT method_index)
+ole_method_params(pTypeInfo, method_index)
+ ITypeInfo *pTypeInfo;
+ UINT method_index;
{
FUNCDESC *pFuncDesc;
HRESULT hr;
@@ -7057,7 +5120,6 @@ ole_method_params(ITypeInfo *pTypeInfo, UINT method_index)
return params;
}
-
/*
* call-seq:
* WIN32OLE_METHOD#params
@@ -7071,7 +5133,8 @@ ole_method_params(ITypeInfo *pTypeInfo, UINT method_index)
* TextVisualLayout]
*/
static VALUE
-folemethod_params(VALUE self)
+folemethod_params(self)
+ VALUE self;
{
struct olemethoddata *pmethod;
Data_Get_Struct(self, struct olemethoddata, pmethod);
@@ -7079,19 +5142,6 @@ folemethod_params(VALUE self)
}
/*
- * call-seq:
- * WIN32OLE_METHOD#inspect -> String
- *
- * Returns the method name with class name.
- *
- */
-static VALUE
-folemethod_inspect(VALUE self)
-{
- return default_inspect(self, "WIN32OLE_METHOD");
-}
-
-/*
* Document-class: WIN32OLE_PARAM
*
* <code>WIN32OLE_PARAM</code> objects represent param information of
@@ -7109,17 +5159,21 @@ folemethod_inspect(VALUE self)
* puts param1.name # => Filename
*/
static VALUE
-foleparam_name(VALUE self)
+foleparam_name(self)
+ VALUE self;
{
return rb_ivar_get(self, rb_intern("name"));
}
static VALUE
-ole_param_ole_type(ITypeInfo *pTypeInfo, UINT method_index, UINT index)
+ole_param_ole_type(pTypeInfo, method_index, index)
+ ITypeInfo *pTypeInfo;
+ UINT method_index;
+ UINT index;
{
FUNCDESC *pFuncDesc;
HRESULT hr;
- VALUE type = rb_str_new2("unknown type");
+ VALUE type = rb_str_new2("UNKNOWN");
hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
if (FAILED(hr))
return type;
@@ -7140,7 +5194,8 @@ ole_param_ole_type(ITypeInfo *pTypeInfo, UINT method_index, UINT index)
* puts param1.ole_type # => VARIANT
*/
static VALUE
-foleparam_ole_type(VALUE self)
+foleparam_ole_type(self)
+ VALUE self;
{
struct oleparamdata *pparam;
Data_Get_Struct(self, struct oleparamdata, pparam);
@@ -7149,7 +5204,10 @@ foleparam_ole_type(VALUE self)
}
static VALUE
-ole_param_ole_type_detail(ITypeInfo *pTypeInfo, UINT method_index, UINT index)
+ole_param_ole_type_detail(pTypeInfo, method_index, index)
+ ITypeInfo *pTypeInfo;
+ UINT method_index;
+ UINT index;
{
FUNCDESC *pFuncDesc;
HRESULT hr;
@@ -7174,7 +5232,8 @@ ole_param_ole_type_detail(ITypeInfo *pTypeInfo, UINT method_index, UINT index)
* p param1.ole_type_detail # => ["PTR", "USERDEFINED", "Range"]
*/
static VALUE
-foleparam_ole_type_detail(VALUE self)
+foleparam_ole_type_detail(self)
+ VALUE self;
{
struct oleparamdata *pparam;
Data_Get_Struct(self, struct oleparamdata, pparam);
@@ -7183,7 +5242,11 @@ foleparam_ole_type_detail(VALUE self)
}
static VALUE
-ole_param_flag_mask(ITypeInfo *pTypeInfo, UINT method_index, UINT index, USHORT mask)
+ole_param_flag_mask(pTypeInfo, method_index, index, mask)
+ ITypeInfo *pTypeInfo;
+ UINT method_index;
+ UINT index;
+ USHORT mask;
{
FUNCDESC *pFuncDesc;
HRESULT hr;
@@ -7207,7 +5270,8 @@ ole_param_flag_mask(ITypeInfo *pTypeInfo, UINT method_index, UINT index, USHORT
* param1 = method.params[0]
* puts param1.input? # => true
*/
-static VALUE foleparam_input(VALUE self)
+static VALUE foleparam_input(self)
+ VALUE self;
{
struct oleparamdata *pparam;
Data_Get_Struct(self, struct oleparamdata, pparam);
@@ -7234,7 +5298,8 @@ static VALUE foleparam_input(VALUE self)
* Headers false
* Processed true
*/
-static VALUE foleparam_output(VALUE self)
+static VALUE foleparam_output(self)
+ VALUE self;
{
struct oleparamdata *pparam;
Data_Get_Struct(self, struct oleparamdata, pparam);
@@ -7252,7 +5317,8 @@ static VALUE foleparam_output(VALUE self)
* param1 = method.params[0]
* puts "#{param1.name} #{param1.optional?}" # => Filename true
*/
-static VALUE foleparam_optional(VALUE self)
+static VALUE foleparam_optional(self)
+ VALUE self;
{
struct oleparamdata *pparam;
Data_Get_Struct(self, struct oleparamdata, pparam);
@@ -7271,7 +5337,8 @@ static VALUE foleparam_optional(VALUE self)
* param = method.params[0]
* puts "#{param.name} #{param.retval?}" # => name true
*/
-static VALUE foleparam_retval(VALUE self)
+static VALUE foleparam_retval(self)
+ VALUE self;
{
struct oleparamdata *pparam;
Data_Get_Struct(self, struct oleparamdata, pparam);
@@ -7280,7 +5347,10 @@ static VALUE foleparam_retval(VALUE self)
}
static VALUE
-ole_param_default(ITypeInfo *pTypeInfo, UINT method_index, UINT index)
+ole_param_default(pTypeInfo, method_index, index)
+ ITypeInfo *pTypeInfo;
+ UINT method_index;
+ UINT index;
{
FUNCDESC *pFuncDesc;
ELEMDESC *pElemDesc;
@@ -7331,7 +5401,8 @@ ole_param_default(ITypeInfo *pTypeInfo, UINT method_index, UINT index)
* TextCodepage
* TextVisualLayout
*/
-static VALUE foleparam_default(VALUE self)
+static VALUE foleparam_default(self)
+ VALUE self;
{
struct oleparamdata *pparam;
Data_Get_Struct(self, struct oleparamdata, pparam);
@@ -7339,26 +5410,7 @@ static VALUE foleparam_default(VALUE self)
pparam->index);
}
-/*
- * call-seq:
- * WIN32OLE_PARAM#inspect -> String
- *
- * Returns the parameter name with class name. If the parameter has default value,
- * then returns name=value string with class name.
- *
- */
-static VALUE
-foleparam_inspect(VALUE self)
-{
- VALUE detail = foleparam_name(self);
- VALUE defval = foleparam_default(self);
- if (defval != Qnil) {
- rb_str_cat2(detail, "=");
- rb_str_concat(detail, rb_funcall(defval, rb_intern("inspect"), 0));
- }
- return make_inspect("WIN32OLE_PARAM", detail);
-}
-
+
/*
* Document-class: WIN32OLE_EVENT
*
@@ -7427,24 +5479,20 @@ STDMETHODIMP EVENTSINK_GetTypeInfo(
}
STDMETHODIMP EVENTSINK_GetIDsOfNames(
- PEVENTSINK pEventSink,
+ PEVENTSINK pEV,
REFIID riid,
OLECHAR **szNames,
UINT cNames,
LCID lcid,
DISPID *pDispID
) {
- ITypeInfo *pTypeInfo;
- PIEVENTSINKOBJ pEV = (PIEVENTSINKOBJ)pEventSink;
- pTypeInfo = pEV->pTypeInfo;
- if (pTypeInfo) {
- return pTypeInfo->lpVtbl->GetIDsOfNames(pTypeInfo, szNames, cNames, pDispID);
- }
return DISP_E_UNKNOWNNAME;
}
static long
-ole_search_event_at(VALUE ary, VALUE ev)
+ole_search_event_at(ary, ev)
+ VALUE ary;
+ VALUE ev;
{
VALUE event;
VALUE def_event;
@@ -7452,7 +5500,7 @@ ole_search_event_at(VALUE ary, VALUE ev)
long i, len;
long ret = -1;
def_event = Qnil;
- len = RARRAY_LEN(ary);
+ len = RARRAY(ary)->len;
for(i = 0; i < len; i++) {
event = rb_ary_entry(ary, i);
event_name = rb_ary_entry(event, 1);
@@ -7471,15 +5519,18 @@ ole_search_event_at(VALUE ary, VALUE ev)
}
static VALUE
-ole_search_event(VALUE ary, VALUE ev, BOOL *is_default)
+ole_search_event(ary, ev, is_default)
+ VALUE ary;
+ VALUE ev;
+ BOOL *is_default;
{
VALUE event;
VALUE def_event;
VALUE event_name;
- int i, len;
+ long i, len;
*is_default = FALSE;
def_event = Qnil;
- len = RARRAY_LEN(ary);
+ len = RARRAY(ary)->len;
for(i = 0; i < len; i++) {
event = rb_ary_entry(ary, i);
event_name = rb_ary_entry(event, 1);
@@ -7494,114 +5545,92 @@ ole_search_event(VALUE ary, VALUE ev, BOOL *is_default)
}
return def_event;
}
-static VALUE
-ole_search_handler_method(VALUE handler, VALUE ev, BOOL *is_default_handler)
-{
- VALUE mid;
-
- *is_default_handler = FALSE;
- mid = rb_to_id(rb_sprintf("on%s", StringValuePtr(ev)));
- if (rb_respond_to(handler, mid)) {
- return mid;
- }
- mid = rb_intern("method_missing");
- if (rb_respond_to(handler, mid)) {
- *is_default_handler = TRUE;
- return mid;
- }
- return Qnil;
-}
static void
-ole_delete_event(VALUE ary, VALUE ev)
-{
- long at = -1;
- at = ole_search_event_at(ary, ev);
- if (at >= 0) {
- rb_ary_delete_at(ary, at);
- }
-}
-
-static void
-hash2ptr_dispparams(VALUE hash, ITypeInfo *pTypeInfo, DISPID dispid, DISPPARAMS *pdispparams)
-{
- BSTR *bstrs;
- HRESULT hr;
- UINT len, i;
- VARIANT *pvar;
+val2ptr_variant(val, var)
VALUE val;
- VALUE key;
- len = 0;
- bstrs = ALLOCA_N(BSTR, pdispparams->cArgs + 1);
- hr = pTypeInfo->lpVtbl->GetNames(pTypeInfo, dispid,
- bstrs, pdispparams->cArgs + 1,
- &len);
- if (FAILED(hr))
- return;
-
- for (i = 0; i < len - 1; i++) {
- key = WC2VSTR(bstrs[i + 1]);
- val = rb_hash_aref(hash, INT2FIX(i));
- if (val == Qnil)
- val = rb_hash_aref(hash, key);
- if (val == Qnil)
- val = rb_hash_aref(hash, rb_str_intern(key));
- pvar = &pdispparams->rgvarg[pdispparams->cArgs-i-1];
- ole_val2ptr_variant(val, pvar);
- }
-}
-
-static VALUE
-hash2result(VALUE hash)
+ VARIANT *var;
{
- VALUE ret = Qnil;
- ret = rb_hash_aref(hash, rb_str_new2("return"));
- if (ret == Qnil)
- ret = rb_hash_aref(hash, rb_str_intern(rb_str_new2("return")));
- return ret;
+ switch (TYPE(val)) {
+ case T_STRING:
+ if (V_VT(var) == (VT_BSTR | VT_BYREF)) {
+ *V_BSTRREF(var) = ole_mb2wc(StringValuePtr(val), -1);
+ }
+ break;
+ case T_FIXNUM:
+ switch(V_VT(var)) {
+ case (VT_UI1 | VT_BYREF) :
+ *V_UI1REF(var) = NUM2CHR(val);
+ break;
+ case (VT_I2 | VT_BYREF) :
+ *V_I2REF(var) = (short)NUM2INT(val);
+ break;
+ case (VT_I4 | VT_BYREF) :
+ *V_I4REF(var) = NUM2INT(val);
+ break;
+ case (VT_R4 | VT_BYREF) :
+ *V_R4REF(var) = (float)NUM2INT(val);
+ break;
+ case (VT_R8 | VT_BYREF) :
+ *V_R8REF(var) = NUM2INT(val);
+ break;
+ default:
+ break;
+ }
+ break;
+ case T_FLOAT:
+ switch(V_VT(var)) {
+ case (VT_I2 | VT_BYREF) :
+ *V_I2REF(var) = (short)NUM2INT(val);
+ break;
+ case (VT_I4 | VT_BYREF) :
+ *V_I4REF(var) = NUM2INT(val);
+ break;
+ case (VT_R4 | VT_BYREF) :
+ *V_R4REF(var) = (float)NUM2DBL(val);
+ break;
+ case (VT_R8 | VT_BYREF) :
+ *V_R8REF(var) = NUM2DBL(val);
+ break;
+ default:
+ break;
+ }
+ break;
+ case T_BIGNUM:
+ if (V_VT(var) == (VT_R8 | VT_BYREF)) {
+ *V_R8REF(var) = rb_big2dbl(val);
+ }
+ break;
+ case T_TRUE:
+ if (V_VT(var) == (VT_BOOL | VT_BYREF)) {
+ *V_BOOLREF(var) = VARIANT_TRUE;
+ }
+ break;
+ case T_FALSE:
+ if (V_VT(var) == (VT_BOOL | VT_BYREF)) {
+ *V_BOOLREF(var) = VARIANT_FALSE;
+ }
+ break;
+ default:
+ break;
+ }
}
static void
-ary2ptr_dispparams(VALUE ary, DISPPARAMS *pdispparams)
+ary2ptr_dispparams(ary, pdispparams)
+ VALUE ary;
+ DISPPARAMS *pdispparams;
{
int i;
VALUE v;
VARIANT *pvar;
- for(i = 0; i < RARRAY_LEN(ary) && (unsigned int) i < pdispparams->cArgs; i++) {
+ for(i = 0; i < RARRAY(ary)->len && (unsigned int) i < pdispparams->cArgs; i++) {
v = rb_ary_entry(ary, i);
pvar = &pdispparams->rgvarg[pdispparams->cArgs-i-1];
- ole_val2ptr_variant(v, pvar);
+ val2ptr_variant(v, pvar);
}
}
-static VALUE
-exec_callback(VALUE arg)
-{
- VALUE *parg = (VALUE *)arg;
- VALUE handler = parg[0];
- VALUE mid = parg[1];
- VALUE args = parg[2];
- return rb_apply(handler, mid, args);
-}
-
-static VALUE
-rescue_callback(VALUE arg)
-{
-
- VALUE error;
- VALUE e = rb_errinfo();
- VALUE bt = rb_funcall(e, rb_intern("backtrace"), 0);
- VALUE msg = rb_funcall(e, rb_intern("message"), 0);
- bt = rb_ary_entry(bt, 0);
- error = rb_sprintf("%s: %s (%s)\n", StringValuePtr(bt), StringValuePtr(msg), rb_obj_classname(e));
- rb_write_error(StringValuePtr(error));
- rb_backtrace();
- ruby_finalize();
- exit(-1);
-
- return Qnil;
-}
-
STDMETHODIMP EVENTSINK_Invoke(
PEVENTSINK pEventSink,
DISPID dispid,
@@ -7620,17 +5649,13 @@ STDMETHODIMP EVENTSINK_Invoke(
unsigned int i;
ITypeInfo *pTypeInfo;
VARIANT *pvar;
- VALUE ary, obj, event, args, outargv, ev, result;
- VALUE handler = Qnil;
- VALUE arg[3];
- VALUE mid;
- VALUE is_outarg = Qfalse;
+ VALUE ary, obj, event, handler, args, argv, ev, result;
BOOL is_default_handler = FALSE;
- int state;
PIEVENTSINKOBJ pEV = (PIEVENTSINKOBJ)pEventSink;
pTypeInfo = pEV->pTypeInfo;
- obj = evs_entry(pEV->m_event_id);
+
+ obj = rb_ary_entry(ary_ole_event, pEV->m_event_id);
if (!rb_obj_is_kind_of(obj, cWIN32OLE_EVENT)) {
return NOERROR;
}
@@ -7646,21 +5671,9 @@ STDMETHODIMP EVENTSINK_Invoke(
}
ev = WC2VSTR(bstr);
event = ole_search_event(ary, ev, &is_default_handler);
- if (TYPE(event) == T_ARRAY) {
- handler = rb_ary_entry(event, 0);
- mid = rb_intern("call");
- is_outarg = rb_ary_entry(event, 3);
- } else {
- handler = rb_ivar_get(obj, rb_intern("handler"));
- if (handler == Qnil) {
- return NOERROR;
- }
- mid = ole_search_handler_method(handler, ev, &is_default_handler);
- }
- if (handler == Qnil || mid == Qnil) {
- return NOERROR;
+ if (NIL_P(event)) {
+ return NOERROR;
}
-
args = rb_ary_new();
if (is_default_handler) {
rb_ary_push(args, ev);
@@ -7671,31 +5684,16 @@ STDMETHODIMP EVENTSINK_Invoke(
pvar = &pdispparams->rgvarg[pdispparams->cArgs-i-1];
rb_ary_push(args, ole_variant2val(pvar));
}
- outargv = Qnil;
- if (is_outarg == Qtrue) {
- outargv = rb_ary_new();
- rb_ary_push(args, outargv);
- }
+ handler = rb_ary_entry(event, 0);
- /*
- * if exception raised in event callback,
- * then you receive cfp consistency error.
- * to avoid this error we use begin rescue end.
- * and the exception raised then error message print
- * and exit ruby process by Win32OLE itself.
- */
- arg[0] = handler;
- arg[1] = mid;
- arg[2] = args;
- result = rb_protect(exec_callback, (VALUE)arg, &state);
- if (state != 0) {
- rescue_callback(Qnil);
+ if (rb_ary_entry(event, 3) == Qtrue) {
+ argv = rb_ary_new();
+ rb_ary_push(args, argv);
+ result = rb_apply(handler, rb_intern("call"), args);
+ ary2ptr_dispparams(argv, pdispparams);
}
- if(TYPE(result) == T_HASH) {
- hash2ptr_dispparams(result, pTypeInfo, dispid, pdispparams);
- result = hash2result(result);
- }else if (is_outarg == Qtrue && TYPE(outargv) == T_ARRAY) {
- ary2ptr_dispparams(outargv, pdispparams);
+ else {
+ result = rb_apply(handler, rb_intern("call"), args);
}
if (pvarResult) {
@@ -7724,7 +5722,10 @@ EVENTSINK_Constructor() {
pEv->lpVtbl = &vtEventSink;
pEv->m_cRef = 0;
pEv->m_event_id = 0;
+ pEv->m_dwCookie = 0;
+ pEv->pConnectionPoint = NULL;
pEv->pTypeInfo = NULL;
+ pEv->ptr_freed = NULL;
return pEv;
}
@@ -7732,14 +5733,17 @@ void EVENTSINK_Destructor(
PIEVENTSINKOBJ pEVObj
) {
if(pEVObj != NULL) {
- OLE_RELEASE(pEVObj->pTypeInfo);
+ *(pEVObj->ptr_freed) = 1;
free(pEVObj);
- pEVObj = NULL;
}
}
static HRESULT
-find_iid(VALUE ole, char *pitf, IID *piid, ITypeInfo **ppTypeInfo)
+find_iid(ole, pitf, piid, ppTypeInfo)
+ VALUE ole;
+ char *pitf;
+ IID *piid;
+ ITypeInfo **ppTypeInfo;
{
HRESULT hr;
IDispatch *pDispatch;
@@ -7758,7 +5762,7 @@ find_iid(VALUE ole, char *pitf, IID *piid, ITypeInfo **ppTypeInfo)
char *pstr;
BOOL is_found = FALSE;
- LCID lcid = cWIN32OLE_lcid;
+ LCID lcid = LOCALE_SYSTEM_DEFAULT;
OLEData_Get_Struct(ole, pole);
@@ -7849,130 +5853,22 @@ find_iid(VALUE ole, char *pitf, IID *piid, ITypeInfo **ppTypeInfo)
return hr;
}
-static HRESULT
-find_coclass(
- ITypeInfo *pTypeInfo,
- TYPEATTR *pTypeAttr,
- ITypeInfo **pCOTypeInfo,
- TYPEATTR **pCOTypeAttr)
-{
- HRESULT hr = E_NOINTERFACE;
- ITypeLib *pTypeLib;
- int count;
- BOOL found = FALSE;
- ITypeInfo *pTypeInfo2;
- TYPEATTR *pTypeAttr2;
- int flags;
- int i,j;
- HREFTYPE href;
- ITypeInfo *pRefTypeInfo;
- TYPEATTR *pRefTypeAttr;
-
- hr = pTypeInfo->lpVtbl->GetContainingTypeLib(pTypeInfo, &pTypeLib, NULL);
- if (FAILED(hr)) {
- return hr;
- }
- count = pTypeLib->lpVtbl->GetTypeInfoCount(pTypeLib);
- for (i = 0; i < count && !found; i++) {
- hr = pTypeLib->lpVtbl->GetTypeInfo(pTypeLib, i, &pTypeInfo2);
- if (FAILED(hr))
- continue;
- hr = OLE_GET_TYPEATTR(pTypeInfo2, &pTypeAttr2);
- if (FAILED(hr)) {
- OLE_RELEASE(pTypeInfo2);
- continue;
- }
- if (pTypeAttr2->typekind != TKIND_COCLASS) {
- OLE_RELEASE_TYPEATTR(pTypeInfo2, pTypeAttr2);
- OLE_RELEASE(pTypeInfo2);
- continue;
- }
- for (j = 0; j < pTypeAttr2->cImplTypes && !found; j++) {
- hr = pTypeInfo2->lpVtbl->GetImplTypeFlags(pTypeInfo2, j, &flags);
- if (FAILED(hr))
- continue;
- if (!(flags & IMPLTYPEFLAG_FDEFAULT))
- continue;
- hr = pTypeInfo2->lpVtbl->GetRefTypeOfImplType(pTypeInfo2, j, &href);
- if (FAILED(hr))
- continue;
- hr = pTypeInfo2->lpVtbl->GetRefTypeInfo(pTypeInfo2, href, &pRefTypeInfo);
- if (FAILED(hr))
- continue;
- hr = OLE_GET_TYPEATTR(pRefTypeInfo, &pRefTypeAttr);
- if (FAILED(hr)) {
- OLE_RELEASE(pRefTypeInfo);
- continue;
- }
- if (IsEqualGUID(&(pTypeAttr->guid), &(pRefTypeAttr->guid))) {
- found = TRUE;
- }
- }
- if (!found) {
- OLE_RELEASE_TYPEATTR(pTypeInfo2, pTypeAttr2);
- OLE_RELEASE(pTypeInfo2);
- }
- }
- OLE_RELEASE(pTypeLib);
- if (found) {
- *pCOTypeInfo = pTypeInfo2;
- *pCOTypeAttr = pTypeAttr2;
- hr = S_OK;
- } else {
- hr = E_NOINTERFACE;
- }
- return hr;
-}
-
static HRESULT
-find_default_source_from_typeinfo(
- ITypeInfo *pTypeInfo,
- TYPEATTR *pTypeAttr,
- ITypeInfo **ppTypeInfo)
-{
- int i = 0;
- HRESULT hr = E_NOINTERFACE;
- int flags;
- HREFTYPE hRefType;
- /* Enumerate all implemented types of the COCLASS */
- for (i = 0; i < pTypeAttr->cImplTypes; i++) {
- hr = pTypeInfo->lpVtbl->GetImplTypeFlags(pTypeInfo, i, &flags);
- if (FAILED(hr))
- continue;
-
- /*
- looking for the [default] [source]
- we just hope that it is a dispinterface :-)
- */
- if ((flags & IMPLTYPEFLAG_FDEFAULT) &&
- (flags & IMPLTYPEFLAG_FSOURCE)) {
-
- hr = pTypeInfo->lpVtbl->GetRefTypeOfImplType(pTypeInfo,
- i, &hRefType);
- if (FAILED(hr))
- continue;
- hr = pTypeInfo->lpVtbl->GetRefTypeInfo(pTypeInfo,
- hRefType, ppTypeInfo);
- if (SUCCEEDED(hr))
- break;
- }
- }
- return hr;
-}
-
-static HRESULT
-find_default_source(VALUE ole, IID *piid, ITypeInfo **ppTypeInfo)
+find_default_source(ole, piid, ppTypeInfo)
+ VALUE ole;
+ IID *piid;
+ ITypeInfo **ppTypeInfo;
{
HRESULT hr;
IProvideClassInfo2 *pProvideClassInfo2;
IProvideClassInfo *pProvideClassInfo;
- void *p;
IDispatch *pDispatch;
ITypeInfo *pTypeInfo;
- ITypeInfo *pTypeInfo2 = NULL;
TYPEATTR *pTypeAttr;
- TYPEATTR *pTypeAttr2 = NULL;
+ int i;
+ int iFlags;
+ HREFTYPE hRefType;
struct oledata *pole;
@@ -7980,52 +5876,58 @@ find_default_source(VALUE ole, IID *piid, ITypeInfo **ppTypeInfo)
pDispatch = pole->pDispatch;
hr = pDispatch->lpVtbl->QueryInterface(pDispatch,
&IID_IProvideClassInfo2,
- &p);
+ (void**)&pProvideClassInfo2);
if (SUCCEEDED(hr)) {
- pProvideClassInfo2 = p;
hr = pProvideClassInfo2->lpVtbl->GetGUID(pProvideClassInfo2,
GUIDKIND_DEFAULT_SOURCE_DISP_IID,
piid);
OLE_RELEASE(pProvideClassInfo2);
- if (SUCCEEDED(hr)) {
- hr = find_iid(ole, NULL, piid, ppTypeInfo);
- }
- }
- if (SUCCEEDED(hr)) {
- return hr;
+ return find_iid(ole, NULL, piid, ppTypeInfo);
}
hr = pDispatch->lpVtbl->QueryInterface(pDispatch,
&IID_IProvideClassInfo,
- &p);
- if (SUCCEEDED(hr)) {
- pProvideClassInfo = p;
- hr = pProvideClassInfo->lpVtbl->GetClassInfo(pProvideClassInfo,
- &pTypeInfo);
- OLE_RELEASE(pProvideClassInfo);
- }
- if (FAILED(hr)) {
- hr = pDispatch->lpVtbl->GetTypeInfo(pDispatch, 0, cWIN32OLE_lcid, &pTypeInfo );
- }
+ (void**)&pProvideClassInfo);
+ if (FAILED(hr))
+ return hr;
+
+ hr = pProvideClassInfo->lpVtbl->GetClassInfo(pProvideClassInfo,
+ &pTypeInfo);
+ OLE_RELEASE(pProvideClassInfo);
if (FAILED(hr))
return hr;
+
hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
if (FAILED(hr)) {
OLE_RELEASE(pTypeInfo);
return hr;
}
+ /* Enumerate all implemented types of the COCLASS */
+ for (i = 0; i < pTypeAttr->cImplTypes; i++) {
+ hr = pTypeInfo->lpVtbl->GetImplTypeFlags(pTypeInfo, i, &iFlags);
+ if (FAILED(hr))
+ continue;
- *ppTypeInfo = 0;
- hr = find_default_source_from_typeinfo(pTypeInfo, pTypeAttr, ppTypeInfo);
- if (!*ppTypeInfo) {
- hr = find_coclass(pTypeInfo, pTypeAttr, &pTypeInfo2, &pTypeAttr2);
- if (SUCCEEDED(hr)) {
- hr = find_default_source_from_typeinfo(pTypeInfo2, pTypeAttr2, ppTypeInfo);
- OLE_RELEASE_TYPEATTR(pTypeInfo2, pTypeAttr2);
- OLE_RELEASE(pTypeInfo2);
- }
+ /*
+ looking for the [default] [source]
+ we just hope that it is a dispinterface :-)
+ */
+ if ((iFlags & IMPLTYPEFLAG_FDEFAULT) &&
+ (iFlags & IMPLTYPEFLAG_FSOURCE)) {
+
+ hr = pTypeInfo->lpVtbl->GetRefTypeOfImplType(pTypeInfo,
+ i, &hRefType);
+ if (FAILED(hr))
+ continue;
+ hr = pTypeInfo->lpVtbl->GetRefTypeInfo(pTypeInfo,
+ hRefType, ppTypeInfo);
+ if (SUCCEEDED(hr))
+ break;
+ }
}
+
OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
OLE_RELEASE(pTypeInfo);
+
/* Now that would be a bad surprise, if we didn't find it, wouldn't it? */
if (!*ppTypeInfo) {
if (SUCCEEDED(hr))
@@ -8047,45 +5949,72 @@ find_default_source(VALUE ole, IID *piid, ITypeInfo **ppTypeInfo)
}
static void
-ole_event_free(struct oleeventdata *poleev)
+ole_event_free(poleev)
+ struct oleeventdata *poleev;
{
- if (poleev->pConnectionPoint) {
- poleev->pConnectionPoint->lpVtbl->Unadvise(poleev->pConnectionPoint, poleev->dwCookie);
- OLE_RELEASE(poleev->pConnectionPoint);
- poleev->pConnectionPoint = NULL;
+ ITypeInfo *pti = NULL;
+ IConnectionPoint *pcp = NULL;
+
+ if (poleev->freed == 1) {
+ /*
+ * this return create memory leak.
+ * but poleev->pEvent->pConnectionPoint shoul'd not be freed
+ * until poleev-> freed == 0.
+ */
+ return;
+ }
+ if(poleev->pEvent) {
+ pti = poleev->pEvent->pTypeInfo;
+ if(pti) OLE_RELEASE(pti);
+ pcp = poleev->pEvent->pConnectionPoint;
+ if(pcp) {
+ pcp->lpVtbl->Unadvise(pcp, poleev->pEvent->m_dwCookie);
+ OLE_RELEASE(pcp);
+ }
+ free(poleev);
}
- free(poleev);
}
+static VALUE fev_s_allocate _((VALUE));
static VALUE
-fev_s_allocate(VALUE klass)
+fev_s_allocate(klass)
+ VALUE klass;
{
VALUE obj;
struct oleeventdata *poleev;
obj = Data_Make_Struct(klass,struct oleeventdata,0,ole_event_free,poleev);
- poleev->dwCookie = 0;
- poleev->pConnectionPoint = NULL;
- poleev->event_id = 0;
+ poleev->pEvent = NULL;
return obj;
}
+/*
+ * call-seq:
+ * WIN32OLE_EVENT.new(ole, event) #=> WIN32OLE_EVENT object.
+ *
+ * Returns OLE event object.
+ * The first argument specifies WIN32OLE object.
+ * The second argument specifies OLE event name.
+ * ie = WIN32OLE.new('InternetExplorer.Application')
+ * ev = WIN32OLE_EVENT.new(ie, 'DWebBrowserEvents')
+ */
static VALUE
-ev_advise(int argc, VALUE *argv, VALUE self)
+fev_initialize(argc, argv, self)
+ int argc;
+ VALUE *argv;
+ VALUE self;
{
-
VALUE ole, itf;
struct oledata *pole;
char *pitf;
HRESULT hr;
IID iid;
- ITypeInfo *pTypeInfo = 0;
+ ITypeInfo *pTypeInfo;
IDispatch *pDispatch;
IConnectionPointContainer *pContainer;
IConnectionPoint *pConnectionPoint;
IEVENTSINKOBJ *pIEV;
- DWORD dwCookie;
+ DWORD dwCookie = 0;
struct oleeventdata *poleev;
- void *p;
rb_secure(4);
rb_scan_args(argc, argv, "11", &ole, &itf);
@@ -8095,11 +6024,11 @@ ev_advise(int argc, VALUE *argv, VALUE self)
}
if(TYPE(itf) != T_NIL) {
- if (rb_safe_level() > 0 && OBJ_TAINTED(itf)) {
+ if (ruby_safe_level > 0 && OBJ_TAINTED(itf)) {
rb_raise(rb_eSecurityError, "Insecure Event Creation - %s",
StringValuePtr(itf));
}
- SafeStringValue(itf);
+ Check_SafeStr(itf);
pitf = StringValuePtr(itf);
hr = find_iid(ole, pitf, &iid, &pTypeInfo);
}
@@ -8114,13 +6043,12 @@ ev_advise(int argc, VALUE *argv, VALUE self)
pDispatch = pole->pDispatch;
hr = pDispatch->lpVtbl->QueryInterface(pDispatch,
&IID_IConnectionPointContainer,
- &p);
+ (void**)&pContainer);
if (FAILED(hr)) {
OLE_RELEASE(pTypeInfo);
ole_raise(hr, rb_eRuntimeError,
"failed to query IConnectionPointContainer");
}
- pContainer = p;
hr = pContainer->lpVtbl->FindConnectionPoint(pContainer,
&iid,
@@ -8140,33 +6068,15 @@ ev_advise(int argc, VALUE *argv, VALUE self)
}
Data_Get_Struct(self, struct oleeventdata, poleev);
- pIEV->m_event_id
- = NUM2INT(evs_length());
- pIEV->pTypeInfo = pTypeInfo;
- poleev->dwCookie = dwCookie;
- poleev->pConnectionPoint = pConnectionPoint;
- poleev->event_id = pIEV->m_event_id;
-
- return self;
-}
-
-/*
- * call-seq:
- * WIN32OLE_EVENT.new(ole, event) #=> WIN32OLE_EVENT object.
- *
- * Returns OLE event object.
- * The first argument specifies WIN32OLE object.
- * The second argument specifies OLE event name.
- * ie = WIN32OLE.new('InternetExplorer.Application')
- * ev = WIN32OLE_EVENT.new(ie, 'DWebBrowserEvents')
- */
-static VALUE
-fev_initialize(int argc, VALUE *argv, VALUE self)
-{
- ev_advise(argc, argv, self);
- evs_push(self);
- rb_ivar_set(self, id_events, rb_ary_new());
- fev_set_handler(self, Qnil);
+ poleev->pEvent = pIEV;
+ poleev->pEvent->m_event_id
+ = NUM2INT(rb_funcall(ary_ole_event, rb_intern("length"), 0));
+ poleev->pEvent->pConnectionPoint = pConnectionPoint;
+ poleev->pEvent->pTypeInfo = pTypeInfo;
+ poleev->pEvent->m_dwCookie = dwCookie;
+ poleev->freed = 0;
+ poleev->pEvent->ptr_freed = &(poleev->freed);
+ rb_ary_push(ary_ole_event, self);
return self;
}
@@ -8177,7 +6087,8 @@ fev_initialize(int argc, VALUE *argv, VALUE self)
* Translates and dispatches Windows message.
*/
static VALUE
-fev_s_msg_loop(VALUE klass)
+fev_s_msg_loop(klass)
+ VALUE klass;
{
ole_msg_loop();
return Qnil;
@@ -8185,34 +6096,35 @@ fev_s_msg_loop(VALUE klass)
static void
-add_event_call_back(VALUE obj, VALUE event, VALUE data)
+add_event_call_back(obj, event, data)
+ VALUE obj;
+ VALUE event;
+ VALUE data;
{
+ long at;
VALUE events = rb_ivar_get(obj, id_events);
if (NIL_P(events) || TYPE(events) != T_ARRAY) {
events = rb_ary_new();
rb_ivar_set(obj, id_events, events);
}
- ole_delete_event(events, event);
+ at = ole_search_event_at(events, event);
+ if (at > -1) {
+ rb_ary_delete_at(events, at);
+ }
rb_ary_push(events, data);
}
static VALUE
-ev_on_event(int argc, VALUE *argv, VALUE self, VALUE is_ary_arg)
+ev_on_event(argc, argv, self, is_ary_arg)
+ int argc;
+ VALUE *argv;
+ VALUE self;
+ VALUE is_ary_arg;
{
- struct oleeventdata *poleev;
VALUE event, args, data;
- Data_Get_Struct(self, struct oleeventdata, poleev);
- if (poleev->pConnectionPoint == NULL) {
- rb_raise(eWIN32OLERuntimeError, "IConnectionPoint not found. You must call advise at first.");
- }
rb_scan_args(argc, argv, "01*", &event, &args);
if(!NIL_P(event)) {
- if(TYPE(event) != T_STRING && TYPE(event) != T_SYMBOL) {
- rb_raise(rb_eTypeError, "wrong argument type (expected String or Symbol)");
- }
- if (TYPE(event) == T_SYMBOL) {
- event = rb_sym_to_s(event);
- }
+ Check_SafeStr(event);
}
data = rb_ary_new3(4, rb_block_proc(), event, args, is_ary_arg);
add_event_call_back(self, event, data);
@@ -8225,31 +6137,15 @@ ev_on_event(int argc, VALUE *argv, VALUE self, VALUE is_ary_arg)
*
* Defines the callback event.
* If argument is omitted, this method defines the callback of all events.
- * If you want to modify reference argument in callback, return hash in
- * callback. If you want to return value to OLE server as result of callback
- * use `return' or :return.
- *
* ie = WIN32OLE.new('InternetExplorer.Application')
- * ev = WIN32OLE_EVENT.new(ie)
+ * ev = WIN32OLE_EVENT.new(ie, 'DWebBrowserEvents')
* ev.on_event("NavigateComplete") {|url| puts url}
- * ev.on_event() {|ev, *args| puts "#{ev} fired"}
- *
- * ev.on_event("BeforeNavigate2") {|*args|
- * ...
- * # set true to BeforeNavigate reference argument `Cancel'.
- * # Cancel is 7-th argument of BeforeNavigate,
- * # so you can use 6 as key of hash instead of 'Cancel'.
- * # The argument is counted from 0.
- * # The hash key of 0 means first argument.)
- * {:Cancel => true} # or {'Cancel' => true} or {6 => true}
- * }
- *
- * ev.on_event(...) {|*args|
- * {:return => 1, :xxx => yyy}
- * }
*/
static VALUE
-fev_on_event(int argc, VALUE *argv, VALUE self)
+fev_on_event(argc, argv, self)
+ int argc;
+ VALUE *argv;
+ VALUE self;
{
return ev_on_event(argc, argv, self, Qfalse);
}
@@ -8260,619 +6156,26 @@ fev_on_event(int argc, VALUE *argv, VALUE self)
*
* Defines the callback of event.
* If you want modify argument in callback,
- * you could use this method instead of WIN32OLE_EVENT#on_event.
- *
- * ie = WIN32OLE.new('InternetExplorer.Application')
- * ev = WIN32OLE_EVENT.new(ie)
- * ev.on_event_with_outargs('BeforeNavigate2') {|*args|
- * args.last[6] = true
- * }
+ * you should use this method instead of WIN32OLE_EVENT#on_event.
*/
static VALUE
-fev_on_event_with_outargs(int argc, VALUE *argv, VALUE self)
+fev_on_event_with_outargs(argc, argv, self)
+ int argc;
+ VALUE *argv;
+ VALUE self;
{
return ev_on_event(argc, argv, self, Qtrue);
}
-/*
- * call-seq:
- * WIN32OLE_EVENT#off_event([event])
- *
- * removes the callback of event.
- *
- * ie = WIN32OLE.new('InternetExplorer.Application')
- * ev = WIN32OLE_EVENT.new(ie)
- * ev.on_event('BeforeNavigate2') {|*args|
- * args.last[6] = true
- * }
- * ...
- * ev.off_event('BeforeNavigate2')
- * ...
- */
-static VALUE
-fev_off_event(int argc, VALUE *argv, VALUE self)
-{
- VALUE event = Qnil;
- VALUE events;
-
- rb_secure(4);
- rb_scan_args(argc, argv, "01", &event);
- if(!NIL_P(event)) {
- if(TYPE(event) != T_STRING && TYPE(event) != T_SYMBOL) {
- rb_raise(rb_eTypeError, "wrong argument type (expected String or Symbol)");
- }
- if (TYPE(event) == T_SYMBOL) {
- event = rb_sym_to_s(event);
- }
- }
- events = rb_ivar_get(self, id_events);
- if (NIL_P(events)) {
- return Qnil;
- }
- ole_delete_event(events, event);
- return Qnil;
-}
-
-/*
- * call-seq:
- * WIN32OLE_EVENT#unadvise -> nil
- *
- * disconnects OLE server. If this method called, then the WIN32OLE_EVENT object
- * does not receive the OLE server event any more.
- * This method is trial implementation.
- *
- * ie = WIN32OLE.new('InternetExplorer.Application')
- * ev = WIN32OLE_EVENT.new(ie)
- * ev.on_event() {...}
- * ...
- * ev.unadvise
- *
- */
-static VALUE
-fev_unadvise(VALUE self)
-{
- struct oleeventdata *poleev;
- Data_Get_Struct(self, struct oleeventdata, poleev);
- if (poleev->pConnectionPoint) {
- ole_msg_loop();
- evs_delete(poleev->event_id);
- poleev->pConnectionPoint->lpVtbl->Unadvise(poleev->pConnectionPoint, poleev->dwCookie);
- OLE_RELEASE(poleev->pConnectionPoint);
- poleev->pConnectionPoint = NULL;
- }
- return Qnil;
-}
-
-static VALUE
-evs_push(VALUE ev)
-{
- return rb_ary_push(ary_ole_event, ev);
-}
-
-static VALUE
-evs_delete(long i)
-{
- rb_ary_store(ary_ole_event, i, Qnil);
- return Qnil;
-}
-
-static VALUE
-evs_entry(long i)
-{
- return rb_ary_entry(ary_ole_event, i);
-}
-
-static VALUE
-evs_length()
-{
- return rb_funcall(ary_ole_event, rb_intern("length"), 0);
-}
-
-/*
- * call-seq:
- * WIN32OLE_EVENT#handler=
- *
- * sets event handler object. If handler object has onXXX
- * method according to XXX event, then onXXX method is called
- * when XXX event occurs.
- *
- * If handler object has method_missing and there is no
- * method according to the event, then method_missing
- * called and 1-st argument is event name.
- *
- * If handler object has onXXX method and there is block
- * defined by WIN32OLE_EVENT#on_event('XXX'){},
- * then block is executed but handler object method is not called
- * when XXX event occurs.
- *
- * class Handler
- * def onStatusTextChange(text)
- * puts "StatusTextChanged"
- * end
- * def onPropertyChange(prop)
- * puts "PropertyChanged"
- * end
- * def method_missing(ev, *arg)
- * puts "other event #{ev}"
- * end
- * end
- *
- * handler = Handler.new
- * ie = WIN32OLE.new('InternetExplorer.Application')
- * ev = WIN32OLE_EVENT.new(ie)
- * ev.on_event("StatusTextChange") {|*args|
- * puts "this block executed."
- * puts "handler.onStatusTextChange method is not called."
- * }
- * ev.handler = handler
- *
- */
-static VALUE
-fev_set_handler(VALUE self, VALUE val)
-{
- return rb_ivar_set(self, rb_intern("handler"), val);
-}
-
-/*
- * call-seq:
- * WIN32OLE_EVENT#handler
- *
- * returns handler object.
- *
- */
-static VALUE
-fev_get_handler(VALUE self)
-{
- return rb_ivar_get(self, rb_intern("handler"));
-}
-
-static void
-olevariant_free(struct olevariantdata *pvar)
-{
- VariantClear(&(pvar->realvar));
- VariantClear(&(pvar->var));
- free(pvar);
-}
-
-static VALUE
-folevariant_s_allocate(VALUE klass)
-{
- struct olevariantdata *pvar;
- VALUE obj;
- ole_initialize();
- obj = Data_Make_Struct(klass,struct olevariantdata,0,olevariant_free,pvar);
- VariantInit(&(pvar->var));
- VariantInit(&(pvar->realvar));
- return obj;
-}
-
-/*
- * call-seq:
- * WIN32OLE_VARIANT.array(ary, vt)
- *
- * Returns Ruby object wrapping OLE variant whose variant type is VT_ARRAY.
- * The first argument should be Array object which specifies dimensions
- * and each size of dimensions of OLE array.
- * The second argument specifies variant type of the element of OLE array.
- *
- * The following create 2 dimensions OLE array. The first dimensions size
- * is 3, and the second is 4.
- *
- * ole_ary = WIN32OLE_VARIANT.array([3,4], VT_I4)
- * ruby_ary = ole_ary.value # => [[0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0]]
- *
- */
-static VALUE
-folevariant_s_array(VALUE klass, VALUE elems, VALUE vvt)
-{
- VALUE obj = Qnil;
- VARTYPE vt;
- struct olevariantdata *pvar;
- SAFEARRAYBOUND *psab = NULL;
- SAFEARRAY *psa = NULL;
- UINT dim = 0;
- UINT i = 0;
-
- ole_initialize();
-
- vt = NUM2UINT(vvt);
- vt = (vt | VT_ARRAY);
- Check_Type(elems, T_ARRAY);
- obj = folevariant_s_allocate(klass);
-
- Data_Get_Struct(obj, struct olevariantdata, pvar);
- dim = RARRAY_LEN(elems);
-
- psab = ALLOC_N(SAFEARRAYBOUND, dim);
-
- if(!psab) {
- rb_raise(rb_eRuntimeError, "memory allocation error");
- }
-
- for (i = 0; i < dim; i++) {
- psab[i].cElements = FIX2INT(rb_ary_entry(elems, i));
- psab[i].lLbound = 0;
- }
-
- psa = SafeArrayCreate((VARTYPE)(vt & VT_TYPEMASK), dim, psab);
- if (psa == NULL) {
- if (psab) free(psab);
- rb_raise(rb_eRuntimeError, "memory allocation error(SafeArrayCreate)");
- }
-
- V_VT(&(pvar->var)) = vt;
- if (vt & VT_BYREF) {
- V_VT(&(pvar->realvar)) = (vt & ~VT_BYREF);
- V_ARRAY(&(pvar->realvar)) = psa;
- V_ARRAYREF(&(pvar->var)) = &(V_ARRAY(&(pvar->realvar)));
- } else {
- V_ARRAY(&(pvar->var)) = psa;
- }
- if (psab) free(psab);
- return obj;
-}
-
-/*
- * call-seq:
- * WIN32OLE_VARIANT.new(val, vartype) #=> WIN32OLE_VARIANT object.
- *
- * Returns Ruby object wrapping OLE variant.
- * The first argument specifies Ruby object to convert OLE variant variable.
- * The second argument specifies VARIANT type.
- * In some situation, you need the WIN32OLE_VARIANT object to pass OLE method
- *
- * shell = WIN32OLE.new("Shell.Application")
- * folder = shell.NameSpace("C:\\Windows")
- * item = folder.ParseName("tmp.txt")
- * # You can't use Ruby String object to call FolderItem.InvokeVerb.
- * # Instead, you have to use WIN32OLE_VARIANT object to call the method.
- * shortcut = WIN32OLE_VARIANT.new("Create Shortcut(\&S)")
- * item.invokeVerb(shortcut)
- *
- */
-static VALUE
-folevariant_initialize(VALUE self, VALUE args)
-{
- int len = 0;
- VARIANT var;
- VALUE val;
- VALUE vvt;
- VARTYPE vt;
- struct olevariantdata *pvar;
-
- len = RARRAY_LEN(args);
- if (len < 1 || len > 3) {
- rb_raise(rb_eArgError, "wrong number of arguments (%d for 1..3)", len);
- }
- VariantInit(&var);
- val = rb_ary_entry(args, 0);
-
- if(!rb_obj_is_kind_of(val, cWIN32OLE) &&
- !rb_obj_is_kind_of(val, cWIN32OLE_VARIANT) &&
- !rb_obj_is_kind_of(val, rb_cTime)) {
- switch (TYPE(val)) {
- case T_ARRAY:
- case T_STRING:
- case T_FIXNUM:
- case T_BIGNUM:
- case T_FLOAT:
- case T_TRUE:
- case T_FALSE:
- case T_NIL:
- break;
- default:
- rb_raise(rb_eTypeError, "can not convert WIN32OLE_VARIANT from type %s",
- rb_obj_classname(val));
- }
- }
-
- Data_Get_Struct(self, struct olevariantdata, pvar);
- if (len == 1) {
- ole_val2variant(val, &(pvar->var));
- } else {
- vvt = rb_ary_entry(args, 1);
- vt = NUM2INT(vvt);
- ole_val2olevariantdata(val, vt, pvar);
- }
- vt = V_VT(&pvar->var);
- return self;
-}
-
-static SAFEARRAY *
-get_locked_safe_array(VALUE val)
-{
- struct olevariantdata *pvar;
- SAFEARRAY *psa = NULL;
- HRESULT hr;
- Data_Get_Struct(val, struct olevariantdata, pvar);
- if (!(V_VT(&(pvar->var)) & VT_ARRAY)) {
- rb_raise(rb_eTypeError, "variant type is not VT_ARRAY.");
- }
- psa = V_ISBYREF(&(pvar->var)) ? *V_ARRAYREF(&(pvar->var)) : V_ARRAY(&(pvar->var));
- if (psa == NULL) {
- return psa;
- }
- hr = SafeArrayLock(psa);
- if (FAILED(hr)) {
- ole_raise(hr, rb_eRuntimeError, "failed to SafeArrayLock");
- }
- return psa;
-}
-
-static long *
-ary2safe_array_index(int ary_size, VALUE *ary, SAFEARRAY *psa)
-{
- long dim;
- long *pid;
- long i;
- dim = SafeArrayGetDim(psa);
- if (dim != ary_size) {
- rb_raise(rb_eArgError, "unmatch number of indices");
- }
- pid = ALLOC_N(long, dim);
- if (pid == NULL) {
- rb_raise(rb_eRuntimeError, "failed to allocate memory for indices");
- }
- for (i = 0; i < dim; i++) {
- pid[i] = NUM2INT(ary[i]);
- }
- return pid;
-}
-
-static void
-unlock_safe_array(SAFEARRAY *psa)
-{
- HRESULT hr;
- hr = SafeArrayUnlock(psa);
- if (FAILED(hr)) {
- ole_raise(hr, rb_eRuntimeError, "failed to SafeArrayUnlock");
- }
-}
-
-/*
- * call-seq:
- * WIN32OLE_VARIANT[i,j,...] #=> element of OLE array.
- *
- * Returns the element of WIN32OLE_VARIANT object(OLE array).
- * This method is available only when the variant type of
- * WIN32OLE_VARIANT object is VT_ARRAY.
- *
- * REMARK:
- * The all indicies should be 0 or natural number and
- * lower than or equal to max indicies.
- * (This point is different with Ruby Array indicies.)
- *
- * obj = WIN32OLE_VARIANT.new([[1,2,3],[4,5,6]])
- * p obj[0,0] # => 1
- * p obj[1,0] # => 4
- * p obj[2,0] # => WIN32OLERuntimeError
- * p obj[0, -1] # => WIN32OLERuntimeError
- *
- */
-static VALUE
-folevariant_ary_aref(int argc, VALUE *argv, VALUE self)
-{
- struct olevariantdata *pvar;
- SAFEARRAY *psa;
- VALUE val = Qnil;
- VARIANT variant;
- long *pid;
- HRESULT hr;
-
- Data_Get_Struct(self, struct olevariantdata, pvar);
- if (!V_ISARRAY(&(pvar->var))) {
- rb_raise(eWIN32OLERuntimeError,
- "`[]' is not available for this variant type object");
- }
- psa = get_locked_safe_array(self);
- if (psa == NULL) {
- return val;
- }
-
- pid = ary2safe_array_index(argc, argv, psa);
-
- VariantInit(&variant);
- V_VT(&variant) = (V_VT(&(pvar->var)) & ~VT_ARRAY) | VT_BYREF;
- hr = SafeArrayPtrOfIndex(psa, pid, &V_BYREF(&variant));
- if (FAILED(hr)) {
- ole_raise(hr, eWIN32OLERuntimeError, "failed to SafeArrayPtrOfIndex");
- }
- val = ole_variant2val(&variant);
-
- unlock_safe_array(psa);
- if (pid) free(pid);
- return val;
-}
-
-static VOID *
-val2variant_ptr(VALUE val, VARIANT *var, VARTYPE vt)
-{
- VOID *p = NULL;
- HRESULT hr = S_OK;
- ole_val2variant_ex(val, var, vt);
- if ((vt & ~VT_BYREF) == VT_VARIANT) {
- p = var;
- } else {
- if ( (vt & ~VT_BYREF) != V_VT(var)) {
- hr = VariantChangeTypeEx(var, var,
- cWIN32OLE_lcid, 0, (VARTYPE)(vt & ~VT_BYREF));
- if (FAILED(hr)) {
- ole_raise(hr, rb_eRuntimeError, "failed to change type");
- }
- }
- p = get_ptr_of_variant(var);
- }
- if (p == NULL) {
- rb_raise(rb_eRuntimeError, "failed to get pointer of variant");
- }
- return p;
-}
-
-/*
- * call-seq:
- * WIN32OLE_VARIANT[i,j,...] = val #=> set the element of OLE array
- *
- * Set the element of WIN32OLE_VARIANT object(OLE array) to val.
- * This method is available only when the variant type of
- * WIN32OLE_VARIANT object is VT_ARRAY.
- *
- * REMARK:
- * The all indicies should be 0 or natural number and
- * lower than or equal to max indicies.
- * (This point is different with Ruby Array indicies.)
- *
- * obj = WIN32OLE_VARIANT.new([[1,2,3],[4,5,6]])
- * obj[0,0] = 7
- * obj[1,0] = 8
- * p obj.value # => [[7,2,3], [8,5,6]]
- * obj[2,0] = 9 # => WIN32OLERuntimeError
- * obj[0, -1] = 9 # => WIN32OLERuntimeError
- *
- */
-static VALUE
-folevariant_ary_aset(int argc, VALUE *argv, VALUE self)
-{
- struct olevariantdata *pvar;
- SAFEARRAY *psa;
- VARIANT var;
- VARTYPE vt;
- long *pid;
- HRESULT hr;
- VOID *p = NULL;
-
- Data_Get_Struct(self, struct olevariantdata, pvar);
- if (!V_ISARRAY(&(pvar->var))) {
- rb_raise(eWIN32OLERuntimeError,
- "`[]' is not available for this variant type object");
- }
- psa = get_locked_safe_array(self);
- if (psa == NULL) {
- rb_raise(rb_eRuntimeError, "failed to get SafeArray pointer");
- }
-
- pid = ary2safe_array_index(argc-1, argv, psa);
-
- VariantInit(&var);
- vt = (V_VT(&(pvar->var)) & ~VT_ARRAY);
- p = val2variant_ptr(argv[argc-1], &var, vt);
- if ((V_VT(&var) == VT_DISPATCH && V_DISPATCH(&var) == NULL) ||
- (V_VT(&var) == VT_UNKNOWN && V_UNKNOWN(&var) == NULL)) {
- rb_raise(eWIN32OLERuntimeError, "argument does not have IDispatch or IUnknown Interface");
- }
- hr = SafeArrayPutElement(psa, pid, p);
- if (FAILED(hr)) {
- ole_raise(hr, eWIN32OLERuntimeError, "failed to SafeArrayPutElement");
- }
-
- unlock_safe_array(psa);
- if (pid) free(pid);
- return argv[argc-1];
-}
-
-/*
- * call-seq:
- * WIN32OLE_VARIANT.value #=> Ruby object.
- *
- * Returns Ruby object value from OLE variant.
- * obj = WIN32OLE_VARIANT.new(1, WIN32OLE::VARIANT::VT_BSTR)
- * obj.value # => "1" (not Fixnum object, but String object "1")
- *
- */
-static VALUE
-folevariant_value(VALUE self)
-{
- struct olevariantdata *pvar;
- VALUE val = Qnil;
- VARTYPE vt;
- int dim;
- SAFEARRAY *psa;
- Data_Get_Struct(self, struct olevariantdata, pvar);
-
- val = ole_variant2val(&(pvar->var));
- vt = V_VT(&(pvar->var));
-
- if ((vt & ~VT_BYREF) == (VT_UI1|VT_ARRAY)) {
- if (vt & VT_BYREF) {
- psa = *V_ARRAYREF(&(pvar->var));
- } else {
- psa = V_ARRAY(&(pvar->var));
- }
- if (!psa) {
- return val;
- }
- dim = SafeArrayGetDim(psa);
- if (dim == 1) {
- val = rb_funcall(val, rb_intern("pack"), 1, rb_str_new2("C*"));
- }
- }
- return val;
-}
-
-/*
- * call-seq:
- * WIN32OLE_VARIANT.vartype #=> OLE variant type.
- *
- * Returns OLE variant type.
- * obj = WIN32OLE_VARIANT.new("string")
- * obj.vartype # => WIN32OLE::VARIANT::VT_BSTR
- *
- */
-static VALUE
-folevariant_vartype(VALUE self)
-{
- struct olevariantdata *pvar;
- Data_Get_Struct(self, struct olevariantdata, pvar);
- return INT2FIX(V_VT(&pvar->var));
-}
-
-/*
- * call-seq:
- * WIN32OLE_VARIANT.value = val #=> set WIN32OLE_VARIANT value to val.
- *
- * Sets variant value to val. If the val type does not match variant value
- * type(vartype), then val is changed to match variant value type(vartype)
- * before setting val.
- * Thie method is not available when vartype is VT_ARRAY(except VT_UI1|VT_ARRAY).
- * If the vartype is VT_UI1|VT_ARRAY, the val should be String object.
- *
- * obj = WIN32OLE_VARIANT.new(1) # obj.vartype is WIN32OLE::VARIANT::VT_I4
- * obj.value = 3.2 # 3.2 is changed to 3 when setting value.
- * p obj.value # => 3
- */
-static VALUE
-folevariant_set_value(VALUE self, VALUE val)
-{
- struct olevariantdata *pvar;
- VARTYPE vt;
- Data_Get_Struct(self, struct olevariantdata, pvar);
- vt = V_VT(&(pvar->var));
- if (V_ISARRAY(&(pvar->var)) && ((vt & ~VT_BYREF) != (VT_UI1|VT_ARRAY) || TYPE(val) != T_STRING)) {
- rb_raise(eWIN32OLERuntimeError,
- "`value=' is not available for this variant type object");
- }
- ole_val2olevariantdata(val, vt, pvar);
- return Qnil;
-}
-
-static void
-init_enc2cp()
-{
- enc2cp_table = st_init_numtable();
-}
-
-static void
-free_enc2cp()
-{
- st_free_table(enc2cp_table);
-}
void
Init_win32ole()
{
+ rb_global_variable(&ary_ole_event);
ary_ole_event = rb_ary_new();
- rb_gc_register_mark_object(ary_ole_event);
id_events = rb_intern("events");
+ rb_global_variable(&com_hash);
com_vtbl.QueryInterface = QueryInterface;
com_vtbl.AddRef = AddRef;
com_vtbl.Release = Release;
@@ -8880,16 +6183,7 @@ Init_win32ole()
com_vtbl.GetTypeInfo = GetTypeInfo;
com_vtbl.GetIDsOfNames = GetIDsOfNames;
com_vtbl.Invoke = Invoke;
-
- message_filter.QueryInterface = mf_QueryInterface;
- message_filter.AddRef = mf_AddRef;
- message_filter.Release = mf_Release;
- message_filter.HandleInComingCall = mf_HandleInComingCall;
- message_filter.RetryRejectedCall = mf_RetryRejectedCall;
- message_filter.MessagePending = mf_MessagePending;
-
com_hash = Data_Wrap_Struct(rb_cData, rb_mark_hash, st_free_table, st_init_numtable());
- rb_gc_register_mark_object(com_hash);
cWIN32OLE = rb_define_class("WIN32OLE", rb_cObject);
@@ -8905,18 +6199,16 @@ Init_win32ole()
rb_define_singleton_method(cWIN32OLE, "ole_show_help", fole_s_show_help, -1);
rb_define_singleton_method(cWIN32OLE, "codepage", fole_s_get_code_page, 0);
rb_define_singleton_method(cWIN32OLE, "codepage=", fole_s_set_code_page, 1);
- rb_define_singleton_method(cWIN32OLE, "locale", fole_s_get_locale, 0);
- rb_define_singleton_method(cWIN32OLE, "locale=", fole_s_set_locale, 1);
- rb_define_singleton_method(cWIN32OLE, "create_guid", fole_s_create_guid, 0);
+
rb_define_method(cWIN32OLE, "invoke", fole_invoke, -1);
- rb_define_method(cWIN32OLE, "[]", fole_getproperty_with_bracket, -1);
+ rb_define_method(cWIN32OLE, "[]", fole_getproperty, -1);
rb_define_method(cWIN32OLE, "_invoke", fole_invoke2, 3);
rb_define_method(cWIN32OLE, "_getproperty", fole_getproperty2, 3);
rb_define_method(cWIN32OLE, "_setproperty", fole_setproperty2, 3);
/* support propput method that takes an argument */
- rb_define_method(cWIN32OLE, "[]=", fole_setproperty_with_bracket, -1);
+ rb_define_method(cWIN32OLE, "[]=", fole_setproperty, -1);
rb_define_method(cWIN32OLE, "ole_free", fole_free, 0);
@@ -8933,30 +6225,20 @@ Init_win32ole()
rb_define_method(cWIN32OLE, "ole_method", fole_method_help, 1);
rb_define_alias(cWIN32OLE, "ole_method_help", "ole_method");
+ rb_define_method(cWIN32OLE, "ole_obj_help", fole_obj_help, 0);
rb_define_method(cWIN32OLE, "ole_activex_initialize", fole_activex_initialize, 0);
- rb_define_method(cWIN32OLE, "ole_type", fole_type, 0);
- rb_define_alias(cWIN32OLE, "ole_obj_help", "ole_type");
- rb_define_method(cWIN32OLE, "ole_typelib", fole_typelib, 0);
- rb_define_method(cWIN32OLE, "ole_query_interface", fole_query_interface, 1);
- rb_define_method(cWIN32OLE, "ole_respond_to?", fole_respond_to, 1);
rb_define_const(cWIN32OLE, "VERSION", rb_str_new2(WIN32OLE_VERSION));
rb_define_const(cWIN32OLE, "ARGV", rb_ary_new());
-
- rb_define_const(cWIN32OLE, "CP_ACP", INT2FIX(CP_ACP));
- rb_define_const(cWIN32OLE, "CP_OEMCP", INT2FIX(CP_OEMCP));
- rb_define_const(cWIN32OLE, "CP_MACCP", INT2FIX(CP_MACCP));
- rb_define_const(cWIN32OLE, "CP_THREAD_ACP", INT2FIX(CP_THREAD_ACP));
- rb_define_const(cWIN32OLE, "CP_SYMBOL", INT2FIX(CP_SYMBOL));
- rb_define_const(cWIN32OLE, "CP_UTF7", INT2FIX(CP_UTF7));
- rb_define_const(cWIN32OLE, "CP_UTF8", INT2FIX(CP_UTF8));
-
- rb_define_const(cWIN32OLE, "LOCALE_SYSTEM_DEFAULT", INT2FIX(LOCALE_SYSTEM_DEFAULT));
- rb_define_const(cWIN32OLE, "LOCALE_USER_DEFAULT", INT2FIX(LOCALE_USER_DEFAULT));
+ rb_define_const(cWIN32OLE, "CP_ACP" ,INT2FIX(CP_ACP));
+ rb_define_const(cWIN32OLE, "CP_OEMCP" ,INT2FIX(CP_OEMCP));
+ rb_define_const(cWIN32OLE, "CP_MACCP" ,INT2FIX(CP_MACCP));
+ rb_define_const(cWIN32OLE, "CP_THREAD_ACP",INT2FIX(CP_THREAD_ACP));
+ rb_define_const(cWIN32OLE, "CP_SYMBOL" ,INT2FIX(CP_SYMBOL));
+ rb_define_const(cWIN32OLE, "CP_UTF7" ,INT2FIX(CP_UTF7));
+ rb_define_const(cWIN32OLE, "CP_UTF8" ,INT2FIX(CP_UTF8));
mWIN32OLE_VARIANT = rb_define_module_under(cWIN32OLE, "VARIANT");
- rb_define_const(mWIN32OLE_VARIANT, "VT_EMPTY", INT2FIX(VT_EMPTY));
- rb_define_const(mWIN32OLE_VARIANT, "VT_NULL", INT2FIX(VT_NULL));
rb_define_const(mWIN32OLE_VARIANT, "VT_I2", INT2FIX(VT_I2));
rb_define_const(mWIN32OLE_VARIANT, "VT_I4", INT2FIX(VT_I4));
rb_define_const(mWIN32OLE_VARIANT, "VT_R4", INT2FIX(VT_R4));
@@ -8975,30 +6257,10 @@ Init_win32ole()
rb_define_const(mWIN32OLE_VARIANT, "VT_UI1", INT2FIX(VT_UI1));
rb_define_const(mWIN32OLE_VARIANT, "VT_UI2", INT2FIX(VT_UI2));
rb_define_const(mWIN32OLE_VARIANT, "VT_UI4", INT2FIX(VT_UI4));
-#if (_MSC_VER >= 1300) || defined(__CYGWIN__) || defined(__MINGW32__)
- rb_define_const(mWIN32OLE_VARIANT, "VT_I8", INT2FIX(VT_I8));
- rb_define_const(mWIN32OLE_VARIANT, "VT_UI8", INT2FIX(VT_UI8));
-#endif
rb_define_const(mWIN32OLE_VARIANT, "VT_INT", INT2FIX(VT_INT));
rb_define_const(mWIN32OLE_VARIANT, "VT_UINT", INT2FIX(VT_UINT));
rb_define_const(mWIN32OLE_VARIANT, "VT_ARRAY", INT2FIX(VT_ARRAY));
rb_define_const(mWIN32OLE_VARIANT, "VT_BYREF", INT2FIX(VT_BYREF));
-
- cWIN32OLE_TYPELIB = rb_define_class("WIN32OLE_TYPELIB", rb_cObject);
- rb_define_singleton_method(cWIN32OLE_TYPELIB, "typelibs", foletypelib_s_typelibs, 0);
- rb_define_method(cWIN32OLE_TYPELIB, "initialize", foletypelib_initialize, -2);
- rb_define_method(cWIN32OLE_TYPELIB, "guid", foletypelib_guid, 0);
- rb_define_method(cWIN32OLE_TYPELIB, "name", foletypelib_name, 0);
- rb_define_method(cWIN32OLE_TYPELIB, "version", foletypelib_version, 0);
- rb_define_method(cWIN32OLE_TYPELIB, "major_version", foletypelib_major_version, 0);
- rb_define_method(cWIN32OLE_TYPELIB, "minor_version", foletypelib_minor_version, 0);
- rb_define_method(cWIN32OLE_TYPELIB, "path", foletypelib_path, 0);
- rb_define_method(cWIN32OLE_TYPELIB, "ole_types", foletypelib_ole_types, 0);
- rb_define_alias(cWIN32OLE_TYPELIB, "ole_classes", "ole_types");
- rb_define_method(cWIN32OLE_TYPELIB, "visible?", foletypelib_visible, 0);
- rb_define_method(cWIN32OLE_TYPELIB, "library_name", foletypelib_library_name, 0);
- rb_define_alias(cWIN32OLE_TYPELIB, "to_s", "name");
- rb_define_method(cWIN32OLE_TYPELIB, "inspect", foletypelib_inspect, 0);
cWIN32OLE_TYPE = rb_define_class("WIN32OLE_TYPE", rb_cObject);
rb_define_singleton_method(cWIN32OLE_TYPE, "ole_classes", foletype_s_ole_classes, 1);
@@ -9012,6 +6274,7 @@ Init_win32ole()
rb_define_method(cWIN32OLE_TYPE, "progid", foletype_progid, 0);
rb_define_method(cWIN32OLE_TYPE, "visible?", foletype_visible, 0);
rb_define_alias(cWIN32OLE_TYPE, "to_s", "name");
+
rb_define_method(cWIN32OLE_TYPE, "major_version", foletype_major_version, 0);
rb_define_method(cWIN32OLE_TYPE, "minor_version", foletype_minor_version, 0);
rb_define_method(cWIN32OLE_TYPE, "typekind", foletype_typekind, 0);
@@ -9020,13 +6283,7 @@ Init_win32ole()
rb_define_method(cWIN32OLE_TYPE, "helpfile", foletype_helpfile, 0);
rb_define_method(cWIN32OLE_TYPE, "helpcontext", foletype_helpcontext, 0);
rb_define_method(cWIN32OLE_TYPE, "variables", foletype_variables, 0);
- rb_define_method(cWIN32OLE_TYPE, "ole_methods", foletype_methods, 0);
- rb_define_method(cWIN32OLE_TYPE, "ole_typelib", foletype_ole_typelib, 0);
- rb_define_method(cWIN32OLE_TYPE, "implemented_ole_types", foletype_impl_ole_types, 0);
- rb_define_method(cWIN32OLE_TYPE, "source_ole_types", foletype_source_ole_types, 0);
- rb_define_method(cWIN32OLE_TYPE, "default_event_sources", foletype_default_event_sources, 0);
- rb_define_method(cWIN32OLE_TYPE, "default_ole_types", foletype_default_ole_types, 0);
- rb_define_method(cWIN32OLE_TYPE, "inspect", foletype_inspect, 0);
+ rb_define_method(cWIN32OLE_TYPE, "ole_methods", foletype_methods, -1);
cWIN32OLE_VARIABLE = rb_define_class("WIN32OLE_VARIABLE", rb_cObject);
rb_define_method(cWIN32OLE_VARIABLE, "name", folevariable_name, 0);
@@ -9036,12 +6293,12 @@ Init_win32ole()
rb_define_method(cWIN32OLE_VARIABLE, "visible?", folevariable_visible, 0);
rb_define_method(cWIN32OLE_VARIABLE, "variable_kind", folevariable_variable_kind, 0);
rb_define_method(cWIN32OLE_VARIABLE, "varkind", folevariable_varkind, 0);
- rb_define_method(cWIN32OLE_VARIABLE, "inspect", folevariable_inspect, 0);
rb_define_alias(cWIN32OLE_VARIABLE, "to_s", "name");
cWIN32OLE_METHOD = rb_define_class("WIN32OLE_METHOD", rb_cObject);
rb_define_alloc_func(cWIN32OLE_METHOD, folemethod_s_allocate);
rb_define_method(cWIN32OLE_METHOD, "initialize", folemethod_initialize, 2);
+
rb_define_method(cWIN32OLE_METHOD, "name", folemethod_name, 0);
rb_define_method(cWIN32OLE_METHOD, "return_type", folemethod_return_type, 0);
rb_define_method(cWIN32OLE_METHOD, "return_vtype", folemethod_return_vtype, 0);
@@ -9060,7 +6317,6 @@ Init_win32ole()
rb_define_method(cWIN32OLE_METHOD, "size_opt_params", folemethod_size_opt_params, 0);
rb_define_method(cWIN32OLE_METHOD, "params", folemethod_params, 0);
rb_define_alias(cWIN32OLE_METHOD, "to_s", "name");
- rb_define_method(cWIN32OLE_METHOD, "inspect", folemethod_inspect, 0);
cWIN32OLE_PARAM = rb_define_class("WIN32OLE_PARAM", rb_cObject);
rb_define_method(cWIN32OLE_PARAM, "name", foleparam_name, 0);
@@ -9072,35 +6328,14 @@ Init_win32ole()
rb_define_method(cWIN32OLE_PARAM, "retval?", foleparam_retval, 0);
rb_define_method(cWIN32OLE_PARAM, "default", foleparam_default, 0);
rb_define_alias(cWIN32OLE_PARAM, "to_s", "name");
- rb_define_method(cWIN32OLE_PARAM, "inspect", foleparam_inspect, 0);
cWIN32OLE_EVENT = rb_define_class("WIN32OLE_EVENT", rb_cObject);
- rb_define_singleton_method(cWIN32OLE_EVENT, "message_loop", fev_s_msg_loop, 0);
+
rb_define_alloc_func(cWIN32OLE_EVENT, fev_s_allocate);
rb_define_method(cWIN32OLE_EVENT, "initialize", fev_initialize, -1);
+ rb_define_singleton_method(cWIN32OLE_EVENT, "message_loop", fev_s_msg_loop, 0);
+
rb_define_method(cWIN32OLE_EVENT, "on_event", fev_on_event, -1);
rb_define_method(cWIN32OLE_EVENT, "on_event_with_outargs", fev_on_event_with_outargs, -1);
- rb_define_method(cWIN32OLE_EVENT, "off_event", fev_off_event, -1);
- rb_define_method(cWIN32OLE_EVENT, "unadvise", fev_unadvise, 0);
- rb_define_method(cWIN32OLE_EVENT, "handler=", fev_set_handler, 1);
- rb_define_method(cWIN32OLE_EVENT, "handler", fev_get_handler, 0);
-
- cWIN32OLE_VARIANT = rb_define_class("WIN32OLE_VARIANT", rb_cObject);
- rb_define_alloc_func(cWIN32OLE_VARIANT, folevariant_s_allocate);
- rb_define_singleton_method(cWIN32OLE_VARIANT, "array", folevariant_s_array, 2);
- rb_define_method(cWIN32OLE_VARIANT, "initialize", folevariant_initialize, -2);
- rb_define_method(cWIN32OLE_VARIANT, "value", folevariant_value, 0);
- rb_define_method(cWIN32OLE_VARIANT, "value=", folevariant_set_value, 1);
- rb_define_method(cWIN32OLE_VARIANT, "vartype", folevariant_vartype, 0);
- rb_define_method(cWIN32OLE_VARIANT, "[]", folevariant_ary_aref, -1);
- rb_define_method(cWIN32OLE_VARIANT, "[]=", folevariant_ary_aset, -1);
- rb_define_const(cWIN32OLE_VARIANT, "Empty", rb_funcall(cWIN32OLE_VARIANT, rb_intern("new"), 2, Qnil, INT2FIX(VT_EMPTY)));
- rb_define_const(cWIN32OLE_VARIANT, "Null", rb_funcall(cWIN32OLE_VARIANT, rb_intern("new"), 2, Qnil, INT2FIX(VT_NULL)));
- rb_define_const(cWIN32OLE_VARIANT, "Nothing", rb_funcall(cWIN32OLE_VARIANT, rb_intern("new"), 2, Qnil, INT2FIX(VT_DISPATCH)));
-
- eWIN32OLERuntimeError = rb_define_class("WIN32OLERuntimeError", rb_eRuntimeError);
-
- init_enc2cp();
- atexit((void (*)(void))free_enc2cp);
- ole_init_cp();
+ eWIN32OLE_RUNTIME_ERROR = rb_define_class("WIN32OLERuntimeError", rb_eRuntimeError);
}
diff --git a/ext/zlib/.cvsignore b/ext/zlib/.cvsignore
index 814345ece8..4088712231 100644
--- a/ext/zlib/.cvsignore
+++ b/ext/zlib/.cvsignore
@@ -1,4 +1,3 @@
Makefile
mkmf.log
*.def
-extconf.h
diff --git a/ext/zlib/doc/zlib.rd b/ext/zlib/doc/zlib.rd
index 0a5e2d0abf..6a36dc7fed 100644
--- a/ext/zlib/doc/zlib.rd
+++ b/ext/zlib/doc/zlib.rd
@@ -543,12 +543,6 @@ GzipReader should be used with associating an instance of IO class
must respond to flush method. While `sync' mode is true,
the compression ratio decreases sharply.
---- Zlib::GzipFile#path
-
- Returns the path string of the associated IO-like object. This
- method is only defined when the IO-like object responds to
- #path().
-
== Zlib::GzipFile::Error
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index 8f23bcff21..d4c5028920 100644
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -9,7 +9,6 @@
#include <ruby.h>
#include <zlib.h>
#include <time.h>
-#include <ruby/encoding.h>
#define RUBY_ZLIB_VERSION "0.6.0"
@@ -32,170 +31,163 @@
/*--------- Prototypes --------*/
-static NORETURN(void raise_zlib_error(int, const char*));
-static VALUE rb_zlib_version(VALUE);
-static VALUE do_checksum(int, VALUE*, uLong (*)(uLong, const Bytef*, uInt));
-static VALUE rb_zlib_adler32(int, VALUE*, VALUE);
-static VALUE rb_zlib_crc32(int, VALUE*, VALUE);
-static VALUE rb_zlib_crc_table(VALUE);
-static voidpf zlib_mem_alloc(voidpf, uInt, uInt);
-static void zlib_mem_free(voidpf, voidpf);
-static void finalizer_warn(const char*);
+static NORETURN(void raise_zlib_error _((int, const char *)));
+static VALUE rb_zlib_version _((VALUE));
+static VALUE do_checksum _((int, VALUE*, uLong (*) _((uLong, const Bytef*, uInt))));
+static VALUE rb_zlib_adler32 _((int, VALUE*, VALUE));
+static VALUE rb_zlib_crc32 _((int, VALUE*, VALUE));
+static VALUE rb_zlib_crc_table _((VALUE));
+static voidpf zlib_mem_alloc _((voidpf, uInt, uInt));
+static void zlib_mem_free _((voidpf, voidpf));
+static void finalizer_warn _((const char*));
struct zstream;
struct zstream_funcs;
-static void zstream_init(struct zstream*, const struct zstream_funcs*);
-static void zstream_expand_buffer(struct zstream*);
-static void zstream_expand_buffer_into(struct zstream*, int);
-static void zstream_append_buffer(struct zstream*, const Bytef*, int);
-static VALUE zstream_detach_buffer(struct zstream*);
-static VALUE zstream_shift_buffer(struct zstream*, int);
-static void zstream_buffer_ungets(struct zstream*, const Bytef*, int);
-static void zstream_buffer_ungetbyte(struct zstream*, int);
-static void zstream_append_input(struct zstream*, const Bytef*, unsigned int);
-static void zstream_discard_input(struct zstream*, unsigned int);
-static void zstream_reset_input(struct zstream*);
-static void zstream_passthrough_input(struct zstream*);
-static VALUE zstream_detach_input(struct zstream*);
-static void zstream_reset(struct zstream*);
-static VALUE zstream_end(struct zstream*);
-static void zstream_run(struct zstream*, Bytef*, uInt, int);
-static VALUE zstream_sync(struct zstream*, Bytef*, uInt);
-static void zstream_mark(struct zstream*);
-static void zstream_free(struct zstream*);
-static VALUE zstream_new(VALUE, const struct zstream_funcs*);
-static struct zstream *get_zstream(VALUE);
-static void zstream_finalize(struct zstream*);
-
-static VALUE rb_zstream_end(VALUE);
-static VALUE rb_zstream_reset(VALUE);
-static VALUE rb_zstream_finish(VALUE);
-static VALUE rb_zstream_flush_next_in(VALUE);
-static VALUE rb_zstream_flush_next_out(VALUE);
-static VALUE rb_zstream_avail_out(VALUE);
-static VALUE rb_zstream_set_avail_out(VALUE, VALUE);
-static VALUE rb_zstream_avail_in(VALUE);
-static VALUE rb_zstream_total_in(VALUE);
-static VALUE rb_zstream_total_out(VALUE);
-static VALUE rb_zstream_data_type(VALUE);
-static VALUE rb_zstream_adler(VALUE);
-static VALUE rb_zstream_finished_p(VALUE);
-static VALUE rb_zstream_closed_p(VALUE);
-
-static VALUE rb_deflate_s_allocate(VALUE);
-static VALUE rb_deflate_initialize(int, VALUE*, VALUE);
-static VALUE rb_deflate_init_copy(VALUE, VALUE);
-static VALUE deflate_run(VALUE);
-static VALUE rb_deflate_s_deflate(int, VALUE*, VALUE);
-static void do_deflate(struct zstream*, VALUE, int);
-static VALUE rb_deflate_deflate(int, VALUE*, VALUE);
-static VALUE rb_deflate_addstr(VALUE, VALUE);
-static VALUE rb_deflate_flush(int, VALUE*, VALUE);
-static VALUE rb_deflate_params(VALUE, VALUE, VALUE);
-static VALUE rb_deflate_set_dictionary(VALUE, VALUE);
-
-static VALUE inflate_run(VALUE);
-static VALUE rb_inflate_s_allocate(VALUE);
-static VALUE rb_inflate_initialize(int, VALUE*, VALUE);
-static VALUE rb_inflate_s_inflate(VALUE, VALUE);
-static void do_inflate(struct zstream*, VALUE);
-static VALUE rb_inflate_inflate(VALUE, VALUE);
-static VALUE rb_inflate_addstr(VALUE, VALUE);
-static VALUE rb_inflate_sync(VALUE, VALUE);
-static VALUE rb_inflate_sync_point_p(VALUE);
-static VALUE rb_inflate_set_dictionary(VALUE, VALUE);
+static void zstream_init _((struct zstream*, const struct zstream_funcs *));
+static void zstream_expand_buffer _((struct zstream*));
+static void zstream_expand_buffer_into _((struct zstream*, int));
+static void zstream_append_buffer _((struct zstream*, const char*, int));
+static VALUE zstream_detach_buffer _((struct zstream*));
+static VALUE zstream_shift_buffer _((struct zstream*, int));
+static void zstream_buffer_ungetc _((struct zstream*, int));
+static void zstream_append_input _((struct zstream*, const char*, unsigned int));
+static void zstream_discard_input _((struct zstream*, unsigned int));
+static void zstream_reset_input _((struct zstream*));
+static void zstream_passthrough_input _((struct zstream*));
+static VALUE zstream_detach_input _((struct zstream*));
+static void zstream_reset _((struct zstream*));
+static VALUE zstream_end _((struct zstream*));
+static void zstream_run _((struct zstream*, Bytef*, uInt, int));
+static VALUE zstream_sync _((struct zstream*, Bytef*, uInt));
+static void zstream_mark _((struct zstream*));
+static void zstream_free _((struct zstream*));
+static VALUE zstream_new _((VALUE, const struct zstream_funcs*));
+static struct zstream *get_zstream _((VALUE));
+static void zstream_finalize _((struct zstream*));
+
+static VALUE rb_zstream_end _((VALUE));
+static VALUE rb_zstream_reset _((VALUE));
+static VALUE rb_zstream_finish _((VALUE));
+static VALUE rb_zstream_flush_next_in _((VALUE));
+static VALUE rb_zstream_flush_next_out _((VALUE));
+static VALUE rb_zstream_avail_out _((VALUE));
+static VALUE rb_zstream_set_avail_out _((VALUE, VALUE));
+static VALUE rb_zstream_avail_in _((VALUE));
+static VALUE rb_zstream_total_in _((VALUE));
+static VALUE rb_zstream_total_out _((VALUE));
+static VALUE rb_zstream_data_type _((VALUE));
+static VALUE rb_zstream_adler _((VALUE));
+static VALUE rb_zstream_finished_p _((VALUE));
+static VALUE rb_zstream_closed_p _((VALUE));
+
+static VALUE rb_deflate_s_allocate _((VALUE));
+static VALUE rb_deflate_initialize _((int, VALUE*, VALUE));
+static VALUE rb_deflate_init_copy _((VALUE, VALUE));
+static VALUE deflate_run _((VALUE));
+static VALUE rb_deflate_s_deflate _((int, VALUE*, VALUE));
+static void do_deflate _((struct zstream*, VALUE, int));
+static VALUE rb_deflate_deflate _((int, VALUE*, VALUE));
+static VALUE rb_deflate_addstr _((VALUE, VALUE));
+static VALUE rb_deflate_flush _((int, VALUE*, VALUE));
+static VALUE rb_deflate_params _((VALUE, VALUE, VALUE));
+static VALUE rb_deflate_set_dictionary _((VALUE, VALUE));
+
+static VALUE inflate_run _((VALUE));
+static VALUE rb_inflate_s_allocate _((VALUE));
+static VALUE rb_inflate_initialize _((int, VALUE*, VALUE));
+static VALUE rb_inflate_s_inflate _((VALUE, VALUE));
+static void do_inflate _((struct zstream*, VALUE));
+static VALUE rb_inflate_inflate _((VALUE, VALUE));
+static VALUE rb_inflate_addstr _((VALUE, VALUE));
+static VALUE rb_inflate_sync _((VALUE, VALUE));
+static VALUE rb_inflate_sync_point_p _((VALUE));
+static VALUE rb_inflate_set_dictionary _((VALUE, VALUE));
#if GZIP_SUPPORT
struct gzfile;
-static void gzfile_mark(struct gzfile*);
-static void gzfile_free(struct gzfile*);
-static VALUE gzfile_new(VALUE, const struct zstream_funcs*, void (*) _((struct gzfile*)));
-static void gzfile_reset(struct gzfile*);
-static void gzfile_close(struct gzfile*, int);
-static void gzfile_write_raw(struct gzfile*);
-static VALUE gzfile_read_raw_partial(VALUE);
-static VALUE gzfile_read_raw_rescue(VALUE);
-static VALUE gzfile_read_raw(struct gzfile*);
-static int gzfile_read_raw_ensure(struct gzfile*, int);
-static char *gzfile_read_raw_until_zero(struct gzfile*, long);
-static unsigned int gzfile_get16(const unsigned char*);
-static unsigned long gzfile_get32(const unsigned char*);
-static void gzfile_set32(unsigned long n, unsigned char*);
-static void gzfile_make_header(struct gzfile*);
-static void gzfile_make_footer(struct gzfile*);
-static void gzfile_read_header(struct gzfile*);
-static void gzfile_check_footer(struct gzfile*);
-static void gzfile_write(struct gzfile*, Bytef*, uInt);
-static long gzfile_read_more(struct gzfile*);
-static void gzfile_calc_crc(struct gzfile*, VALUE);
-static VALUE gzfile_read(struct gzfile*, int);
-static VALUE gzfile_read_all(struct gzfile*);
-static void gzfile_ungets(struct gzfile*, const Bytef*, int);
-static void gzfile_ungetbyte(struct gzfile*, int);
-static VALUE gzfile_writer_end_run(VALUE);
-static void gzfile_writer_end(struct gzfile*);
-static VALUE gzfile_reader_end_run(VALUE);
-static void gzfile_reader_end(struct gzfile*);
-static void gzfile_reader_rewind(struct gzfile*);
-static VALUE gzfile_reader_get_unused(struct gzfile*);
-static struct gzfile *get_gzfile(VALUE);
-static VALUE gzfile_ensure_close(VALUE);
-static VALUE rb_gzfile_s_wrap(int, VALUE*, VALUE);
-static VALUE gzfile_s_open(int, VALUE*, VALUE, const char*);
-
-static VALUE rb_gzfile_to_io(VALUE);
-static VALUE rb_gzfile_crc(VALUE);
-static VALUE rb_gzfile_mtime(VALUE);
-static VALUE rb_gzfile_level(VALUE);
-static VALUE rb_gzfile_os_code(VALUE);
-static VALUE rb_gzfile_orig_name(VALUE);
-static VALUE rb_gzfile_comment(VALUE);
-static VALUE rb_gzfile_lineno(VALUE);
-static VALUE rb_gzfile_set_lineno(VALUE, VALUE);
-static VALUE rb_gzfile_set_mtime(VALUE, VALUE);
-static VALUE rb_gzfile_set_orig_name(VALUE, VALUE);
-static VALUE rb_gzfile_set_comment(VALUE, VALUE);
-static VALUE rb_gzfile_close(VALUE);
-static VALUE rb_gzfile_finish(VALUE);
-static VALUE rb_gzfile_closed_p(VALUE);
-static VALUE rb_gzfile_eof_p(VALUE);
-static VALUE rb_gzfile_sync(VALUE);
-static VALUE rb_gzfile_set_sync(VALUE, VALUE);
-static VALUE rb_gzfile_total_in(VALUE);
-static VALUE rb_gzfile_total_out(VALUE);
-static VALUE rb_gzfile_path(VALUE);
-
-static VALUE rb_gzwriter_s_allocate(VALUE);
-static VALUE rb_gzwriter_s_open(int, VALUE*, VALUE);
-static VALUE rb_gzwriter_initialize(int, VALUE*, VALUE);
-static VALUE rb_gzwriter_flush(int, VALUE*, VALUE);
-static VALUE rb_gzwriter_write(VALUE, VALUE);
-static VALUE rb_gzwriter_putc(VALUE, VALUE);
-
-static VALUE rb_gzreader_s_allocate(VALUE);
-static VALUE rb_gzreader_s_open(int, VALUE*, VALUE);
-static VALUE rb_gzreader_initialize(int, VALUE*, VALUE);
-static VALUE rb_gzreader_rewind(VALUE);
-static VALUE rb_gzreader_unused(VALUE);
-static VALUE rb_gzreader_read(int, VALUE*, VALUE);
-static VALUE rb_gzreader_getc(VALUE);
-static VALUE rb_gzreader_readchar(VALUE);
-static VALUE rb_gzreader_each_byte(VALUE);
-static VALUE rb_gzreader_ungetc(VALUE, VALUE);
-static VALUE rb_gzreader_ungetbyte(VALUE, VALUE);
-static void gzreader_skip_linebreaks(struct gzfile*);
-static VALUE gzreader_gets(int, VALUE*, VALUE);
-static VALUE rb_gzreader_gets(int, VALUE*, VALUE);
-static VALUE rb_gzreader_readline(int, VALUE*, VALUE);
-static VALUE rb_gzreader_each(int, VALUE*, VALUE);
-static VALUE rb_gzreader_readlines(int, VALUE*, VALUE);
+static void gzfile_mark _((struct gzfile*));
+static void gzfile_free _((struct gzfile*));
+static VALUE gzfile_new _((VALUE, const struct zstream_funcs*, void (*) _((struct gzfile*))));
+static void gzfile_reset _((struct gzfile*));
+static void gzfile_close _((struct gzfile*, int));
+static void gzfile_write_raw _((struct gzfile*));
+static VALUE gzfile_read_raw _((struct gzfile*));
+static int gzfile_read_raw_ensure _((struct gzfile*, int));
+static char *gzfile_read_raw_until_zero _((struct gzfile*, long));
+static unsigned int gzfile_get16 _((const unsigned char*));
+static unsigned long gzfile_get32 _((const unsigned char*));
+static void gzfile_set32 _((unsigned long n, unsigned char*));
+static void gzfile_make_header _((struct gzfile*));
+static void gzfile_make_footer _((struct gzfile*));
+static void gzfile_read_header _((struct gzfile*));
+static void gzfile_check_footer _((struct gzfile*));
+static void gzfile_write _((struct gzfile*, Bytef*, uInt));
+static long gzfile_read_more _((struct gzfile*));
+static void gzfile_calc_crc _((struct gzfile*, VALUE));
+static VALUE gzfile_read _((struct gzfile*, int));
+static VALUE gzfile_read_all _((struct gzfile*));
+static void gzfile_ungetc _((struct gzfile*, int));
+static VALUE gzfile_writer_end_run _((VALUE));
+static void gzfile_writer_end _((struct gzfile*));
+static VALUE gzfile_reader_end_run _((VALUE));
+static void gzfile_reader_end _((struct gzfile*));
+static void gzfile_reader_rewind _((struct gzfile*));
+static VALUE gzfile_reader_get_unused _((struct gzfile*));
+static struct gzfile *get_gzfile _((VALUE));
+static VALUE gzfile_ensure_close _((VALUE));
+static VALUE rb_gzfile_s_wrap _((int, VALUE*, VALUE));
+static VALUE gzfile_s_open _((int, VALUE*, VALUE, const char*));
+
+static VALUE rb_gzfile_to_io _((VALUE));
+static VALUE rb_gzfile_crc _((VALUE));
+static VALUE rb_gzfile_mtime _((VALUE));
+static VALUE rb_gzfile_level _((VALUE));
+static VALUE rb_gzfile_os_code _((VALUE));
+static VALUE rb_gzfile_orig_name _((VALUE));
+static VALUE rb_gzfile_comment _((VALUE));
+static VALUE rb_gzfile_lineno _((VALUE));
+static VALUE rb_gzfile_set_lineno _((VALUE, VALUE));
+static VALUE rb_gzfile_set_mtime _((VALUE, VALUE));
+static VALUE rb_gzfile_set_orig_name _((VALUE, VALUE));
+static VALUE rb_gzfile_set_comment _((VALUE, VALUE));
+static VALUE rb_gzfile_close _((VALUE));
+static VALUE rb_gzfile_finish _((VALUE));
+static VALUE rb_gzfile_closed_p _((VALUE));
+static VALUE rb_gzfile_eof_p _((VALUE));
+static VALUE rb_gzfile_sync _((VALUE));
+static VALUE rb_gzfile_set_sync _((VALUE, VALUE));
+static VALUE rb_gzfile_total_in _((VALUE));
+static VALUE rb_gzfile_total_out _((VALUE));
+
+static VALUE rb_gzwriter_s_allocate _((VALUE));
+static VALUE rb_gzwriter_s_open _((int, VALUE*, VALUE));
+static VALUE rb_gzwriter_initialize _((int, VALUE*, VALUE));
+static VALUE rb_gzwriter_flush _((int, VALUE*, VALUE));
+static VALUE rb_gzwriter_write _((VALUE, VALUE));
+static VALUE rb_gzwriter_putc _((VALUE, VALUE));
+
+static VALUE rb_gzreader_s_allocate _((VALUE));
+static VALUE rb_gzreader_s_open _((int, VALUE*, VALUE));
+static VALUE rb_gzreader_initialize _((VALUE, VALUE));
+static VALUE rb_gzreader_rewind _((VALUE));
+static VALUE rb_gzreader_unused _((VALUE));
+static VALUE rb_gzreader_read _((int, VALUE*, VALUE));
+static VALUE rb_gzreader_getc _((VALUE));
+static VALUE rb_gzreader_readchar _((VALUE));
+static VALUE rb_gzreader_each_byte _((VALUE));
+static VALUE rb_gzreader_ungetc _((VALUE, VALUE));
+static void gzreader_skip_linebreaks _((struct gzfile*));
+static VALUE gzreader_gets _((int, VALUE*, VALUE));
+static VALUE rb_gzreader_gets _((int, VALUE*, VALUE));
+static VALUE rb_gzreader_readline _((int, VALUE*, VALUE));
+static VALUE rb_gzreader_each _((int, VALUE*, VALUE));
+static VALUE rb_gzreader_readlines _((int, VALUE*, VALUE));
#endif /* GZIP_SUPPORT */
-void Init_zlib(void);
+void Init_zlib _((void));
+
-int rb_io_extract_encoding_option(VALUE opt, rb_encoding **enc_p, rb_encoding **enc2_p);
-VALUE rb_str_conv_enc_opts(VALUE, rb_encoding*, rb_encoding*, int, VALUE);
/*--------- Exceptions --------*/
@@ -203,7 +195,9 @@ static VALUE cZError, cStreamEnd, cNeedDict;
static VALUE cStreamError, cDataError, cMemError, cBufError, cVersionError;
static void
-raise_zlib_error(int err, const char *msg)
+raise_zlib_error(err, msg)
+ int err;
+ const char *msg;
{
VALUE exc;
@@ -251,7 +245,8 @@ raise_zlib_error(int err, const char *msg)
/*--- Warning (in finalizer) ---*/
static void
-finalizer_warn(const char *msg)
+finalizer_warn(msg)
+ const char *msg;
{
fprintf(stderr, "zlib(finalizer): %s\n", msg);
}
@@ -263,7 +258,8 @@ finalizer_warn(const char *msg)
* Returns the string which represents the version of zlib library.
*/
static VALUE
-rb_zlib_version(VALUE klass)
+rb_zlib_version(klass)
+ VALUE klass;
{
VALUE str;
@@ -276,7 +272,7 @@ static VALUE
do_checksum(argc, argv, func)
int argc;
VALUE *argv;
- uLong (*func)(uLong, const Bytef*, uInt);
+ uLong (*func) _((uLong, const Bytef *, uInt));
{
VALUE str, vsum;
unsigned long sum;
@@ -298,7 +294,7 @@ do_checksum(argc, argv, func)
}
else {
StringValue(str);
- sum = func(sum, (Bytef*)RSTRING_PTR(str), RSTRING_LEN(str));
+ sum = func(sum, RSTRING(str)->ptr, RSTRING(str)->len);
}
return rb_uint2inum(sum);
}
@@ -313,7 +309,10 @@ do_checksum(argc, argv, func)
* FIXME: expression.
*/
static VALUE
-rb_zlib_adler32(int argc, VALUE *argv, VALUE klass)
+rb_zlib_adler32(argc, argv, klass)
+ int argc;
+ VALUE *argv;
+ VALUE klass;
{
return do_checksum(argc, argv, adler32);
}
@@ -328,7 +327,10 @@ rb_zlib_adler32(int argc, VALUE *argv, VALUE klass)
* FIXME: expression.
*/
static VALUE
-rb_zlib_crc32(int argc, VALUE *argv, VALUE klass)
+rb_zlib_crc32(argc, argv, klass)
+ int argc;
+ VALUE *argv;
+ VALUE klass;
{
return do_checksum(argc, argv, crc32);
}
@@ -337,7 +339,8 @@ rb_zlib_crc32(int argc, VALUE *argv, VALUE klass)
* Returns the table for calculating CRC checksum as an array.
*/
static VALUE
-rb_zlib_crc_table(VALUE obj)
+rb_zlib_crc_table(obj)
+ VALUE obj;
{
const unsigned long *crctbl;
VALUE dst;
@@ -363,9 +366,9 @@ struct zstream {
VALUE input;
z_stream stream;
const struct zstream_funcs {
- int (*reset)(z_streamp);
- int (*end)(z_streamp);
- int (*run)(z_streamp, int);
+ int (*reset) _((z_streamp));
+ int (*end) _((z_streamp));
+ int (*run) _((z_streamp, int));
} *func;
};
@@ -396,19 +399,24 @@ static const struct zstream_funcs inflate_funcs = {
static voidpf
-zlib_mem_alloc(voidpf opaque, uInt items, uInt size)
+zlib_mem_alloc(opaque, items, size)
+ voidpf opaque;
+ uInt items, size;
{
return xmalloc(items * size);
}
static void
-zlib_mem_free(voidpf opaque, voidpf address)
+zlib_mem_free(opaque, address)
+ voidpf opaque, address;
{
- xfree(address);
+ free(address);
}
static void
-zstream_init(struct zstream *z, const struct zstream_funcs *func)
+zstream_init(z, func)
+ struct zstream *z;
+ const struct zstream_funcs *func;
{
z->flags = 0;
z->buf = Qnil;
@@ -429,7 +437,8 @@ zstream_init(struct zstream *z, const struct zstream_funcs *func)
#define zstream_init_inflate(z) zstream_init((z), &inflate_funcs)
static void
-zstream_expand_buffer(struct zstream *z)
+zstream_expand_buffer(z)
+ struct zstream *z;
{
long inc;
@@ -438,13 +447,13 @@ zstream_expand_buffer(struct zstream *z)
rb_str_buf_new makes a zero-length string. */
z->buf = rb_str_new(0, ZSTREAM_INITIAL_BUFSIZE);
z->buf_filled = 0;
- z->stream.next_out = (Bytef*)RSTRING_PTR(z->buf);
+ z->stream.next_out = RSTRING(z->buf)->ptr;
z->stream.avail_out = ZSTREAM_INITIAL_BUFSIZE;
RBASIC(z->buf)->klass = 0;
return;
}
- if (RSTRING_LEN(z->buf) - z->buf_filled >= ZSTREAM_AVAIL_OUT_STEP_MAX) {
+ if (RSTRING(z->buf)->len - z->buf_filled >= ZSTREAM_AVAIL_OUT_STEP_MAX) {
/* to keep other threads from freezing */
z->stream.avail_out = ZSTREAM_AVAIL_OUT_STEP_MAX;
}
@@ -457,42 +466,47 @@ zstream_expand_buffer(struct zstream *z)
z->stream.avail_out = (inc < ZSTREAM_AVAIL_OUT_STEP_MAX) ?
inc : ZSTREAM_AVAIL_OUT_STEP_MAX;
}
- z->stream.next_out = (Bytef*)RSTRING_PTR(z->buf) + z->buf_filled;
+ z->stream.next_out = RSTRING(z->buf)->ptr + z->buf_filled;
}
static void
-zstream_expand_buffer_into(struct zstream *z, int size)
+zstream_expand_buffer_into(z, size)
+ struct zstream *z;
+ int size;
{
if (NIL_P(z->buf)) {
/* I uses rb_str_new here not rb_str_buf_new because
rb_str_buf_new makes a zero-length string. */
z->buf = rb_str_new(0, size);
z->buf_filled = 0;
- z->stream.next_out = (Bytef*)RSTRING_PTR(z->buf);
+ z->stream.next_out = RSTRING(z->buf)->ptr;
z->stream.avail_out = size;
RBASIC(z->buf)->klass = 0;
}
else if (z->stream.avail_out != size) {
rb_str_resize(z->buf, z->buf_filled + size);
- z->stream.next_out = (Bytef*)RSTRING_PTR(z->buf) + z->buf_filled;
+ z->stream.next_out = RSTRING(z->buf)->ptr + z->buf_filled;
z->stream.avail_out = size;
}
}
static void
-zstream_append_buffer(struct zstream *z, const Bytef *src, int len)
+zstream_append_buffer(z, src, len)
+ struct zstream *z;
+ const char *src;
+ int len;
{
if (NIL_P(z->buf)) {
z->buf = rb_str_buf_new(len);
- rb_str_buf_cat(z->buf, (const char*)src, len);
+ rb_str_buf_cat(z->buf, src, len);
z->buf_filled = len;
- z->stream.next_out = (Bytef*)RSTRING_PTR(z->buf);
+ z->stream.next_out = RSTRING(z->buf)->ptr;
z->stream.avail_out = 0;
RBASIC(z->buf)->klass = 0;
return;
}
- if (RSTRING_LEN(z->buf) < z->buf_filled + len) {
+ if (RSTRING(z->buf)->len < z->buf_filled + len) {
rb_str_resize(z->buf, z->buf_filled + len);
z->stream.avail_out = 0;
}
@@ -504,16 +518,17 @@ zstream_append_buffer(struct zstream *z, const Bytef *src, int len)
z->stream.avail_out = 0;
}
}
- memcpy(RSTRING_PTR(z->buf) + z->buf_filled, src, len);
+ memcpy(RSTRING(z->buf)->ptr + z->buf_filled, src, len);
z->buf_filled += len;
- z->stream.next_out = (Bytef*)RSTRING_PTR(z->buf) + z->buf_filled;
+ z->stream.next_out = RSTRING(z->buf)->ptr + z->buf_filled;
}
#define zstream_append_buffer2(z,v) \
- zstream_append_buffer((z),(Bytef*)RSTRING_PTR(v),RSTRING_LEN(v))
+ zstream_append_buffer((z),RSTRING(v)->ptr,RSTRING(v)->len)
static VALUE
-zstream_detach_buffer(struct zstream *z)
+zstream_detach_buffer(z)
+ struct zstream *z;
{
VALUE dst;
@@ -534,7 +549,9 @@ zstream_detach_buffer(struct zstream *z)
}
static VALUE
-zstream_shift_buffer(struct zstream *z, int len)
+zstream_shift_buffer(z, len)
+ struct zstream *z;
+ int len;
{
VALUE dst;
@@ -542,13 +559,13 @@ zstream_shift_buffer(struct zstream *z, int len)
return zstream_detach_buffer(z);
}
- dst = rb_str_subseq(z->buf, 0, len);
+ dst = rb_str_substr(z->buf, 0, len);
RBASIC(dst)->klass = rb_cString;
z->buf_filled -= len;
- memmove(RSTRING_PTR(z->buf), RSTRING_PTR(z->buf) + len,
+ memmove(RSTRING(z->buf)->ptr, RSTRING(z->buf)->ptr + len,
z->buf_filled);
- z->stream.next_out = (Bytef*)RSTRING_PTR(z->buf) + z->buf_filled;
- z->stream.avail_out = RSTRING_LEN(z->buf) - z->buf_filled;
+ z->stream.next_out = RSTRING(z->buf)->ptr + z->buf_filled;
+ z->stream.avail_out = RSTRING(z->buf)->len - z->buf_filled;
if (z->stream.avail_out > ZSTREAM_AVAIL_OUT_STEP_MAX) {
z->stream.avail_out = ZSTREAM_AVAIL_OUT_STEP_MAX;
}
@@ -557,30 +574,16 @@ zstream_shift_buffer(struct zstream *z, int len)
}
static void
-zstream_buffer_ungets(struct zstream *z, const Bytef *b, int len)
-{
- if (NIL_P(z->buf) || RSTRING_LEN(z->buf) - z->buf_filled == 0) {
- zstream_expand_buffer_into(z, len);
- }
-
- memmove(RSTRING_PTR(z->buf) + len, RSTRING_PTR(z->buf), z->buf_filled);
- memmove(RSTRING_PTR(z->buf), b, len);
- z->buf_filled+=len;
- if (z->stream.avail_out > 0) {
- z->stream.next_out+=len;
- z->stream.avail_out-=len;
- }
-}
-
-static void
-zstream_buffer_ungetbyte(struct zstream *z, int c)
+zstream_buffer_ungetc(z, c)
+ struct zstream *z;
+ int c;
{
- if (NIL_P(z->buf) || RSTRING_LEN(z->buf) - z->buf_filled == 0) {
+ if (NIL_P(z->buf) || RSTRING(z->buf)->len - z->buf_filled == 0) {
zstream_expand_buffer(z);
}
- memmove(RSTRING_PTR(z->buf) + 1, RSTRING_PTR(z->buf), z->buf_filled);
- RSTRING_PTR(z->buf)[0] = (char)c;
+ memmove(RSTRING(z->buf)->ptr + 1, RSTRING(z->buf)->ptr, z->buf_filled);
+ RSTRING(z->buf)->ptr[0] = (char)c;
z->buf_filled++;
if (z->stream.avail_out > 0) {
z->stream.next_out++;
@@ -589,44 +592,51 @@ zstream_buffer_ungetbyte(struct zstream *z, int c)
}
static void
-zstream_append_input(struct zstream *z, const Bytef *src, unsigned int len)
+zstream_append_input(z, src, len)
+ struct zstream *z;
+ const char *src;
+ unsigned int len;
{
if (len <= 0) return;
if (NIL_P(z->input)) {
z->input = rb_str_buf_new(len);
- rb_str_buf_cat(z->input, (const char*)src, len);
+ rb_str_buf_cat(z->input, src, len);
RBASIC(z->input)->klass = 0;
}
else {
- rb_str_buf_cat(z->input, (const char*)src, len);
+ rb_str_buf_cat(z->input, src, len);
}
}
#define zstream_append_input2(z,v)\
- zstream_append_input((z), (Bytef*)RSTRING_PTR(v), RSTRING_LEN(v))
+ zstream_append_input((z), RSTRING(v)->ptr, RSTRING(v)->len)
static void
-zstream_discard_input(struct zstream *z, unsigned int len)
+zstream_discard_input(z, len)
+ struct zstream *z;
+ unsigned int len;
{
- if (NIL_P(z->input) || RSTRING_LEN(z->input) <= len) {
+ if (NIL_P(z->input) || RSTRING(z->input)->len <= len) {
z->input = Qnil;
}
else {
- memmove(RSTRING_PTR(z->input), RSTRING_PTR(z->input) + len,
- RSTRING_LEN(z->input) - len);
- rb_str_resize(z->input, RSTRING_LEN(z->input) - len);
+ memmove(RSTRING(z->input)->ptr, RSTRING(z->input)->ptr + len,
+ RSTRING(z->input)->len - len);
+ rb_str_resize(z->input, RSTRING(z->input)->len - len);
}
}
static void
-zstream_reset_input(struct zstream *z)
+zstream_reset_input(z)
+ struct zstream *z;
{
z->input = Qnil;
}
static void
-zstream_passthrough_input(struct zstream *z)
+zstream_passthrough_input(z)
+ struct zstream *z;
{
if (!NIL_P(z->input)) {
zstream_append_buffer2(z, z->input);
@@ -635,7 +645,8 @@ zstream_passthrough_input(struct zstream *z)
}
static VALUE
-zstream_detach_input(struct zstream *z)
+zstream_detach_input(z)
+ struct zstream *z;
{
VALUE dst;
@@ -647,12 +658,12 @@ zstream_detach_input(struct zstream *z)
RBASIC(dst)->klass = rb_cString;
}
z->input = Qnil;
- RBASIC(dst)->klass = rb_cString;
return dst;
}
static void
-zstream_reset(struct zstream *z)
+zstream_reset(z)
+ struct zstream *z;
{
int err;
@@ -669,7 +680,8 @@ zstream_reset(struct zstream *z)
}
static VALUE
-zstream_end(struct zstream *z)
+zstream_end(z)
+ struct zstream *z;
{
int err;
@@ -692,20 +704,24 @@ zstream_end(struct zstream *z)
}
static void
-zstream_run(struct zstream *z, Bytef *src, uInt len, int flush)
+zstream_run(z, src, len, flush)
+ struct zstream *z;
+ Bytef *src;
+ uInt len;
+ int flush;
{
uInt n;
int err;
- volatile VALUE guard = Qnil;
+ volatile VALUE guard;
if (NIL_P(z->input) && len == 0) {
- z->stream.next_in = (Bytef*)"";
+ z->stream.next_in = "";
z->stream.avail_in = 0;
}
else {
zstream_append_input(z, src, len);
- z->stream.next_in = (Bytef*)RSTRING_PTR(z->input);
- z->stream.avail_in = RSTRING_LEN(z->input);
+ z->stream.next_in = RSTRING(z->input)->ptr;
+ z->stream.avail_in = RSTRING(z->input)->len;
/* keep reference to `z->input' so as not to be garbage collected
after zstream_reset_input() and prevent `z->stream.next_in'
from dangling. */
@@ -717,9 +733,6 @@ zstream_run(struct zstream *z, Bytef *src, uInt len, int flush)
}
for (;;) {
- /* VC allocates err and guard to same address. accessing err and guard
- in same scope prevents it. */
- RB_GC_GUARD(guard);
n = z->stream.avail_out;
err = z->func->run(&z->stream, flush);
z->buf_filled += n - z->stream.avail_out;
@@ -757,24 +770,27 @@ zstream_run(struct zstream *z, Bytef *src, uInt len, int flush)
}
static VALUE
-zstream_sync(struct zstream *z, Bytef *src, uInt len)
+zstream_sync(z, src, len)
+ struct zstream *z;
+ Bytef *src;
+ uInt len;
{
VALUE rest;
int err;
if (!NIL_P(z->input)) {
- z->stream.next_in = (Bytef*)RSTRING_PTR(z->input);
- z->stream.avail_in = RSTRING_LEN(z->input);
+ z->stream.next_in = RSTRING(z->input)->ptr;
+ z->stream.avail_in = RSTRING(z->input)->len;
err = inflateSync(&z->stream);
if (err == Z_OK) {
zstream_discard_input(z,
- RSTRING_LEN(z->input) - z->stream.avail_in);
+ RSTRING(z->input)->len - z->stream.avail_in);
zstream_append_input(z, src, len);
return Qtrue;
}
zstream_reset_input(z);
if (err != Z_DATA_ERROR) {
- rest = rb_str_new((char*)z->stream.next_in, z->stream.avail_in);
+ rest = rb_str_new(z->stream.next_in, z->stream.avail_in);
raise_zlib_error(err, z->stream.msg);
}
}
@@ -789,21 +805,23 @@ zstream_sync(struct zstream *z, Bytef *src, uInt len)
return Qtrue;
}
if (err != Z_DATA_ERROR) {
- rest = rb_str_new((char*)z->stream.next_in, z->stream.avail_in);
+ rest = rb_str_new(z->stream.next_in, z->stream.avail_in);
raise_zlib_error(err, z->stream.msg);
}
return Qfalse;
}
static void
-zstream_mark(struct zstream *z)
+zstream_mark(z)
+ struct zstream *z;
{
rb_gc_mark(z->buf);
rb_gc_mark(z->input);
}
static void
-zstream_finalize(struct zstream *z)
+zstream_finalize(z)
+ struct zstream *z;
{
int err = z->func->end(&z->stream);
if (err == Z_STREAM_ERROR)
@@ -813,16 +831,19 @@ zstream_finalize(struct zstream *z)
}
static void
-zstream_free(struct zstream *z)
+zstream_free(z)
+ struct zstream *z;
{
if (ZSTREAM_IS_READY(z)) {
zstream_finalize(z);
}
- xfree(z);
+ free(z);
}
static VALUE
-zstream_new(VALUE klass, const struct zstream_funcs *funcs)
+zstream_new(klass, funcs)
+ VALUE klass;
+ const struct zstream_funcs *funcs;
{
VALUE obj;
struct zstream *z;
@@ -837,7 +858,8 @@ zstream_new(VALUE klass, const struct zstream_funcs *funcs)
#define zstream_inflate_new(klass) zstream_new((klass), &inflate_funcs)
static struct zstream *
-get_zstream(VALUE obj)
+get_zstream(obj)
+ VALUE obj;
{
struct zstream *z;
@@ -917,7 +939,8 @@ get_zstream(VALUE obj)
* exception.
*/
static VALUE
-rb_zstream_end(VALUE obj)
+rb_zstream_end(obj)
+ VALUE obj;
{
zstream_end(get_zstream(obj));
return Qnil;
@@ -928,7 +951,8 @@ rb_zstream_end(VALUE obj)
* are discarded.
*/
static VALUE
-rb_zstream_reset(VALUE obj)
+rb_zstream_reset(obj)
+ VALUE obj;
{
zstream_reset(get_zstream(obj));
return Qnil;
@@ -939,12 +963,13 @@ rb_zstream_reset(VALUE obj)
* Zlib::Inflate#finish for details of this behavior.
*/
static VALUE
-rb_zstream_finish(VALUE obj)
+rb_zstream_finish(obj)
+ VALUE obj;
{
struct zstream *z = get_zstream(obj);
VALUE dst;
- zstream_run(z, (Bytef*)"", 0, Z_FINISH);
+ zstream_run(z, "", 0, Z_FINISH);
dst = zstream_detach_buffer(z);
OBJ_INFECT(dst, obj);
@@ -955,7 +980,8 @@ rb_zstream_finish(VALUE obj)
* Flushes input buffer and returns all data in that buffer.
*/
static VALUE
-rb_zstream_flush_next_in(VALUE obj)
+rb_zstream_flush_next_in(obj)
+ VALUE obj;
{
struct zstream *z;
VALUE dst;
@@ -970,7 +996,8 @@ rb_zstream_flush_next_in(VALUE obj)
* Flushes output buffer and returns all data in that buffer.
*/
static VALUE
-rb_zstream_flush_next_out(VALUE obj)
+rb_zstream_flush_next_out(obj)
+ VALUE obj;
{
struct zstream *z;
VALUE dst;
@@ -986,7 +1013,8 @@ rb_zstream_flush_next_out(VALUE obj)
* space is allocated automatically, this method returns 0 normally.
*/
static VALUE
-rb_zstream_avail_out(VALUE obj)
+rb_zstream_avail_out(obj)
+ VALUE obj;
{
struct zstream *z;
Data_Get_Struct(obj, struct zstream, z);
@@ -1000,7 +1028,8 @@ rb_zstream_avail_out(VALUE obj)
* method.
*/
static VALUE
-rb_zstream_set_avail_out(VALUE obj, VALUE size)
+rb_zstream_set_avail_out(obj, size)
+ VALUE obj, size;
{
struct zstream *z = get_zstream(obj);
@@ -1013,18 +1042,20 @@ rb_zstream_set_avail_out(VALUE obj, VALUE size)
* Returns bytes of data in the input buffer. Normally, returns 0.
*/
static VALUE
-rb_zstream_avail_in(VALUE obj)
+rb_zstream_avail_in(obj)
+ VALUE obj;
{
struct zstream *z;
Data_Get_Struct(obj, struct zstream, z);
- return INT2FIX(NIL_P(z->input) ? 0 : (int)(RSTRING_LEN(z->input)));
+ return INT2FIX(NIL_P(z->input) ? 0 : (int)(RSTRING(z->input)->len));
}
/*
* Returns the total bytes of the input data to the stream. FIXME
*/
static VALUE
-rb_zstream_total_in(VALUE obj)
+rb_zstream_total_in(obj)
+ VALUE obj;
{
return rb_uint2inum(get_zstream(obj)->stream.total_in);
}
@@ -1033,7 +1064,8 @@ rb_zstream_total_in(VALUE obj)
* Returns the total bytes of the output data from the stream. FIXME
*/
static VALUE
-rb_zstream_total_out(VALUE obj)
+rb_zstream_total_out(obj)
+ VALUE obj;
{
return rb_uint2inum(get_zstream(obj)->stream.total_out);
}
@@ -1044,7 +1076,8 @@ rb_zstream_total_out(VALUE obj)
* <tt>Zlib::UNKNOWN</tt>.
*/
static VALUE
-rb_zstream_data_type(VALUE obj)
+rb_zstream_data_type(obj)
+ VALUE obj;
{
return INT2FIX(get_zstream(obj)->stream.data_type);
}
@@ -1053,7 +1086,8 @@ rb_zstream_data_type(VALUE obj)
* Returns the adler-32 checksum.
*/
static VALUE
-rb_zstream_adler(VALUE obj)
+rb_zstream_adler(obj)
+ VALUE obj;
{
return rb_uint2inum(get_zstream(obj)->stream.adler);
}
@@ -1062,7 +1096,8 @@ rb_zstream_adler(VALUE obj)
* Returns true if the stream is finished.
*/
static VALUE
-rb_zstream_finished_p(VALUE obj)
+rb_zstream_finished_p(obj)
+ VALUE obj;
{
return ZSTREAM_IS_FINISHED(get_zstream(obj)) ? Qtrue : Qfalse;
}
@@ -1071,7 +1106,8 @@ rb_zstream_finished_p(VALUE obj)
* Returns true if the stream is closed.
*/
static VALUE
-rb_zstream_closed_p(VALUE obj)
+rb_zstream_closed_p(obj)
+ VALUE obj;
{
struct zstream *z;
Data_Get_Struct(obj, struct zstream, z);
@@ -1100,7 +1136,8 @@ rb_zstream_closed_p(VALUE obj)
static VALUE
-rb_deflate_s_allocate(VALUE klass)
+rb_deflate_s_allocate(klass)
+ VALUE klass;
{
return zstream_deflate_new(klass);
}
@@ -1115,7 +1152,10 @@ rb_deflate_s_allocate(VALUE klass)
* TODO: document better!
*/
static VALUE
-rb_deflate_initialize(int argc, VALUE *argv, VALUE obj)
+rb_deflate_initialize(argc, argv, obj)
+ int argc;
+ VALUE *argv;
+ VALUE obj;
{
struct zstream *z;
VALUE level, wbits, memlevel, strategy;
@@ -1139,7 +1179,8 @@ rb_deflate_initialize(int argc, VALUE *argv, VALUE obj)
* Duplicates the deflate stream.
*/
static VALUE
-rb_deflate_init_copy(VALUE self, VALUE orig)
+rb_deflate_init_copy(self, orig)
+ VALUE self, orig;
{
struct zstream *z1, *z2;
int err;
@@ -1160,12 +1201,13 @@ rb_deflate_init_copy(VALUE self, VALUE orig)
}
static VALUE
-deflate_run(VALUE args)
+deflate_run(args)
+ VALUE args;
{
- struct zstream *z = (struct zstream*)((VALUE*)args)[0];
- VALUE src = ((VALUE*)args)[1];
+ struct zstream *z = (struct zstream *)((VALUE *)args)[0];
+ VALUE src = ((VALUE *)args)[1];
- zstream_run(z, (Bytef*)RSTRING_PTR(src), RSTRING_LEN(src), Z_FINISH);
+ zstream_run(z, RSTRING(src)->ptr, RSTRING(src)->len, Z_FINISH);
return zstream_detach_buffer(z);
}
@@ -1190,7 +1232,10 @@ deflate_run(VALUE args)
*
*/
static VALUE
-rb_deflate_s_deflate(int argc, VALUE *argv, VALUE klass)
+rb_deflate_s_deflate(argc, argv, klass)
+ int argc;
+ VALUE *argv;
+ VALUE klass;
{
struct zstream z;
VALUE src, level, dst, args[2];
@@ -1216,15 +1261,18 @@ rb_deflate_s_deflate(int argc, VALUE *argv, VALUE klass)
}
static void
-do_deflate(struct zstream *z, VALUE src, int flush)
+do_deflate(z, src, flush)
+ struct zstream *z;
+ VALUE src;
+ int flush;
{
if (NIL_P(src)) {
- zstream_run(z, (Bytef*)"", 0, Z_FINISH);
+ zstream_run(z, "", 0, Z_FINISH);
return;
}
StringValue(src);
- if (flush != Z_NO_FLUSH || RSTRING_LEN(src) > 0) { /* prevent BUF_ERROR */
- zstream_run(z, (Bytef*)RSTRING_PTR(src), RSTRING_LEN(src), flush);
+ if (flush != Z_NO_FLUSH || RSTRING(src)->len > 0) { /* prevent BUF_ERROR */
+ zstream_run(z, RSTRING(src)->ptr, RSTRING(src)->len, flush);
}
}
@@ -1243,7 +1291,10 @@ do_deflate(struct zstream *z, VALUE src, int flush)
* TODO: document better!
*/
static VALUE
-rb_deflate_deflate(int argc, VALUE *argv, VALUE obj)
+rb_deflate_deflate(argc, argv, obj)
+ int argc;
+ VALUE *argv;
+ VALUE obj;
{
struct zstream *z = get_zstream(obj);
VALUE src, flush, dst;
@@ -1265,7 +1316,8 @@ rb_deflate_deflate(int argc, VALUE *argv, VALUE obj)
* preserved in output buffer.
*/
static VALUE
-rb_deflate_addstr(VALUE obj, VALUE src)
+rb_deflate_addstr(obj, src)
+ VALUE obj, src;
{
OBJ_INFECT(obj, src);
do_deflate(get_zstream(obj), src, Z_NO_FLUSH);
@@ -1282,7 +1334,10 @@ rb_deflate_addstr(VALUE obj, VALUE src)
* TODO: document better!
*/
static VALUE
-rb_deflate_flush(int argc, VALUE *argv, VALUE obj)
+rb_deflate_flush(argc, argv, obj)
+ int argc;
+ VALUE *argv;
+ VALUE obj;
{
struct zstream *z = get_zstream(obj);
VALUE v_flush, dst;
@@ -1291,7 +1346,7 @@ rb_deflate_flush(int argc, VALUE *argv, VALUE obj)
rb_scan_args(argc, argv, "01", &v_flush);
flush = FIXNUMARG(v_flush, Z_SYNC_FLUSH);
if (flush != Z_NO_FLUSH) { /* prevent Z_BUF_ERROR */
- zstream_run(z, (Bytef*)"", 0, flush);
+ zstream_run(z, "", 0, flush);
}
dst = zstream_detach_buffer(z);
@@ -1309,7 +1364,8 @@ rb_deflate_flush(int argc, VALUE *argv, VALUE obj)
* TODO: document better!
*/
static VALUE
-rb_deflate_params(VALUE obj, VALUE v_level, VALUE v_strategy)
+rb_deflate_params(obj, v_level, v_strategy)
+ VALUE obj, v_level, v_strategy;
{
struct zstream *z = get_zstream(obj);
int level, strategy;
@@ -1318,7 +1374,6 @@ rb_deflate_params(VALUE obj, VALUE v_level, VALUE v_strategy)
level = ARG_LEVEL(v_level);
strategy = ARG_STRATEGY(v_strategy);
- zstream_run(z, (Bytef*)"", 0, Z_SYNC_FLUSH);
err = deflateParams(&z->stream, level, strategy);
while (err == Z_BUF_ERROR) {
rb_warning("deflateParams() returned Z_BUF_ERROR");
@@ -1342,7 +1397,8 @@ rb_deflate_params(VALUE obj, VALUE v_level, VALUE v_strategy)
* TODO: document better!
*/
static VALUE
-rb_deflate_set_dictionary(VALUE obj, VALUE dic)
+rb_deflate_set_dictionary(obj, dic)
+ VALUE obj, dic;
{
struct zstream *z = get_zstream(obj);
VALUE src = dic;
@@ -1351,7 +1407,7 @@ rb_deflate_set_dictionary(VALUE obj, VALUE dic)
OBJ_INFECT(obj, dic);
StringValue(src);
err = deflateSetDictionary(&z->stream,
- (Bytef*)RSTRING_PTR(src), RSTRING_LEN(src));
+ RSTRING(src)->ptr, RSTRING(src)->len);
if (err != Z_OK) {
raise_zlib_error(err, z->stream.msg);
}
@@ -1373,7 +1429,8 @@ rb_deflate_set_dictionary(VALUE obj, VALUE dic)
static VALUE
-rb_inflate_s_allocate(VALUE klass)
+rb_inflate_s_allocate(klass)
+ VALUE klass;
{
return zstream_inflate_new(klass);
}
@@ -1387,7 +1444,10 @@ rb_inflate_s_allocate(VALUE klass)
* TODO: document better!
*/
static VALUE
-rb_inflate_initialize(int argc, VALUE *argv, VALUE obj)
+rb_inflate_initialize(argc, argv, obj)
+ int argc;
+ VALUE *argv;
+ VALUE obj;
{
struct zstream *z;
VALUE wbits;
@@ -1406,13 +1466,14 @@ rb_inflate_initialize(int argc, VALUE *argv, VALUE obj)
}
static VALUE
-inflate_run(VALUE args)
+inflate_run(args)
+ VALUE args;
{
- struct zstream *z = (struct zstream*)((VALUE*)args)[0];
- VALUE src = ((VALUE*)args)[1];
+ struct zstream *z = (struct zstream *)((VALUE *)args)[0];
+ VALUE src = ((VALUE *)args)[1];
- zstream_run(z, (Bytef*)RSTRING_PTR(src), RSTRING_LEN(src), Z_SYNC_FLUSH);
- zstream_run(z, (Bytef*)"", 0, Z_FINISH); /* for checking errors */
+ zstream_run(z, RSTRING(src)->ptr, RSTRING(src)->len, Z_SYNC_FLUSH);
+ zstream_run(z, "", 0, Z_FINISH); /* for checking errors */
return zstream_detach_buffer(z);
}
@@ -1434,7 +1495,8 @@ inflate_run(VALUE args)
*
*/
static VALUE
-rb_inflate_s_inflate(VALUE obj, VALUE src)
+rb_inflate_s_inflate(obj, src)
+ VALUE obj, src;
{
struct zstream z;
VALUE dst, args[2];
@@ -1457,15 +1519,17 @@ rb_inflate_s_inflate(VALUE obj, VALUE src)
}
static void
-do_inflate(struct zstream *z, VALUE src)
+do_inflate(z, src)
+ struct zstream *z;
+ VALUE src;
{
if (NIL_P(src)) {
- zstream_run(z, (Bytef*)"", 0, Z_FINISH);
+ zstream_run(z, "", 0, Z_FINISH);
return;
}
StringValue(src);
- if (RSTRING_LEN(src) > 0) { /* prevent Z_BUF_ERROR */
- zstream_run(z, (Bytef*)RSTRING_PTR(src), RSTRING_LEN(src), Z_SYNC_FLUSH);
+ if (RSTRING(src)->len > 0) { /* prevent Z_BUF_ERROR */
+ zstream_run(z, RSTRING(src)->ptr, RSTRING(src)->len, Z_SYNC_FLUSH);
}
}
@@ -1484,7 +1548,8 @@ do_inflate(struct zstream *z, VALUE src)
* TODO: document better!
*/
static VALUE
-rb_inflate_inflate(VALUE obj, VALUE src)
+rb_inflate_inflate(obj, src)
+ VALUE obj, src;
{
struct zstream *z = get_zstream(obj);
VALUE dst;
@@ -1521,7 +1586,8 @@ rb_inflate_inflate(VALUE obj, VALUE src)
* preserved in output buffer.
*/
static VALUE
-rb_inflate_addstr(VALUE obj, VALUE src)
+rb_inflate_addstr(obj, src)
+ VALUE obj, src;
{
struct zstream *z = get_zstream(obj);
@@ -1552,13 +1618,14 @@ rb_inflate_addstr(VALUE obj, VALUE src)
* following data of full flush point is preserved in the buffer.
*/
static VALUE
-rb_inflate_sync(VALUE obj, VALUE src)
+rb_inflate_sync(obj, src)
+ VALUE obj, src;
{
struct zstream *z = get_zstream(obj);
OBJ_INFECT(obj, src);
StringValue(src);
- return zstream_sync(z, (Bytef*)RSTRING_PTR(src), RSTRING_LEN(src));
+ return zstream_sync(z, RSTRING(src)->ptr, RSTRING(src)->len);
}
/*
@@ -1569,7 +1636,8 @@ rb_inflate_sync(VALUE obj, VALUE src)
* <tt>:)</tt>
*/
static VALUE
-rb_inflate_sync_point_p(VALUE obj)
+rb_inflate_sync_point_p(obj)
+ VALUE obj;
{
struct zstream *z = get_zstream(obj);
int err;
@@ -1591,7 +1659,8 @@ rb_inflate_sync_point_p(VALUE obj)
* TODO: document better!
*/
static VALUE
-rb_inflate_set_dictionary(VALUE obj, VALUE dic)
+rb_inflate_set_dictionary(obj, dic)
+ VALUE obj, dic;
{
struct zstream *z = get_zstream(obj);
VALUE src = dic;
@@ -1600,7 +1669,7 @@ rb_inflate_set_dictionary(VALUE obj, VALUE dic)
OBJ_INFECT(obj, dic);
StringValue(src);
err = inflateSetDictionary(&z->stream,
- (Bytef*)RSTRING_PTR(src), RSTRING_LEN(src));
+ RSTRING(src)->ptr, RSTRING(src)->len);
if (err != Z_OK) {
raise_zlib_error(err, z->stream.msg);
}
@@ -1654,7 +1723,7 @@ rb_inflate_set_dictionary(VALUE obj, VALUE dic)
#define OS_CODE OS_UNIX
#endif
-static ID id_write, id_read, id_readpartial, id_flush, id_seek, id_close, id_path;
+static ID id_write, id_read, id_flush, id_seek, id_close;
static VALUE cGzError, cNoFooter, cCRCError, cLengthError;
@@ -1673,15 +1742,7 @@ struct gzfile {
int lineno;
int ungetc;
void (*end)(struct gzfile *);
- rb_encoding *enc;
- rb_encoding *enc2;
- rb_econv_t *ec;
- int ecflags;
- VALUE ecopts;
- char *cbuf;
- VALUE path;
};
-#define GZFILE_CBUF_CAPA 10
#define GZFILE_FLAG_SYNC ZSTREAM_FLAG_UNUSED
#define GZFILE_FLAG_HEADER_FINISHED (ZSTREAM_FLAG_UNUSED << 1)
@@ -1694,18 +1755,18 @@ struct gzfile {
static void
-gzfile_mark(struct gzfile *gz)
+gzfile_mark(gz)
+ struct gzfile *gz;
{
rb_gc_mark(gz->io);
rb_gc_mark(gz->orig_name);
rb_gc_mark(gz->comment);
zstream_mark(&gz->z);
- rb_gc_mark(gz->ecopts);
- rb_gc_mark(gz->path);
}
static void
-gzfile_free(struct gzfile *gz)
+gzfile_free(gz)
+ struct gzfile *gz;
{
struct zstream *z = &gz->z;
@@ -1715,17 +1776,14 @@ gzfile_free(struct gzfile *gz)
}
zstream_finalize(z);
}
- if (gz->cbuf) {
- xfree(gz->cbuf);
- }
- xfree(gz);
+ free(gz);
}
static VALUE
gzfile_new(klass, funcs, endfunc)
VALUE klass;
const struct zstream_funcs *funcs;
- void (*endfunc)(struct gzfile *);
+ void (*endfunc) _((struct gzfile *));
{
VALUE obj;
struct gzfile *gz;
@@ -1742,13 +1800,6 @@ gzfile_new(klass, funcs, endfunc)
gz->lineno = 0;
gz->ungetc = 0;
gz->end = endfunc;
- gz->enc = rb_default_external_encoding();
- gz->enc2 = 0;
- gz->ec = NULL;
- gz->ecflags = 0;
- gz->ecopts = Qnil;
- gz->cbuf = 0;
- gz->path = Qnil;
return obj;
}
@@ -1757,21 +1808,19 @@ gzfile_new(klass, funcs, endfunc)
#define gzfile_reader_new(gz) gzfile_new((gz),&inflate_funcs,gzfile_reader_end)
static void
-gzfile_reset(struct gzfile *gz)
+gzfile_reset(gz)
+ struct gzfile *gz;
{
zstream_reset(&gz->z);
gz->crc = crc32(0, Z_NULL, 0);
gz->lineno = 0;
gz->ungetc = 0;
- if (gz->ec) {
- rb_econv_close(gz->ec);
- gz->ec = rb_econv_open_opts(gz->enc2->name, gz->enc->name,
- gz->ecflags, gz->ecopts);
- }
}
static void
-gzfile_close(struct gzfile *gz, int closeflag)
+gzfile_close(gz, closeflag)
+ struct gzfile *gz;
+ int closeflag;
{
VALUE io = gz->io;
@@ -1785,7 +1834,8 @@ gzfile_close(struct gzfile *gz, int closeflag)
}
static void
-gzfile_write_raw(struct gzfile *gz)
+gzfile_write_raw(gz)
+ struct gzfile *gz;
{
VALUE str;
@@ -1800,44 +1850,26 @@ gzfile_write_raw(struct gzfile *gz)
}
static VALUE
-gzfile_read_raw_partial(VALUE arg)
+gzfile_read_raw(gz)
+ struct gzfile *gz;
{
- struct gzfile *gz = (struct gzfile*)arg;
VALUE str;
- str = rb_funcall(gz->io, id_readpartial, 1, INT2FIX(GZFILE_READ_SIZE));
- Check_Type(str, T_STRING);
- return str;
-}
-
-static VALUE
-gzfile_read_raw_rescue(VALUE arg)
-{
- struct gzfile *gz = (struct gzfile*)arg;
- VALUE str = Qnil;
- if (rb_obj_is_kind_of(rb_errinfo(), rb_eNoMethodError)) {
- str = rb_funcall(gz->io, id_read, 1, INT2FIX(GZFILE_READ_SIZE));
- if (!NIL_P(str)) {
- Check_Type(str, T_STRING);
- }
+ str = rb_funcall(gz->io, id_read, 1, INT2FIX(GZFILE_READ_SIZE));
+ if (!NIL_P(str)) {
+ Check_Type(str, T_STRING);
}
- return str; /* return nil when EOFError */
-}
-
-static VALUE
-gzfile_read_raw(struct gzfile *gz)
-{
- return rb_rescue2(gzfile_read_raw_partial, (VALUE)gz,
- gzfile_read_raw_rescue, (VALUE)gz,
- rb_eEOFError, rb_eNoMethodError, (VALUE)0);
+ return str;
}
static int
-gzfile_read_raw_ensure(struct gzfile *gz, int size)
+gzfile_read_raw_ensure(gz, size)
+ struct gzfile *gz;
+ int size;
{
VALUE str;
- while (NIL_P(gz->z.input) || RSTRING_LEN(gz->z.input) < size) {
+ while (NIL_P(gz->z.input) || RSTRING(gz->z.input)->len < size) {
str = gzfile_read_raw(gz);
if (NIL_P(str)) return Qfalse;
zstream_append_input2(&gz->z, str);
@@ -1846,27 +1878,30 @@ gzfile_read_raw_ensure(struct gzfile *gz, int size)
}
static char *
-gzfile_read_raw_until_zero(struct gzfile *gz, long offset)
+gzfile_read_raw_until_zero(gz, offset)
+ struct gzfile *gz;
+ long offset;
{
VALUE str;
char *p;
for (;;) {
- p = memchr(RSTRING_PTR(gz->z.input) + offset, '\0',
- RSTRING_LEN(gz->z.input) - offset);
+ p = memchr(RSTRING(gz->z.input)->ptr + offset, '\0',
+ RSTRING(gz->z.input)->len - offset);
if (p) break;
str = gzfile_read_raw(gz);
if (NIL_P(str)) {
rb_raise(cGzError, "unexpected end of file");
}
- offset = RSTRING_LEN(gz->z.input);
+ offset = RSTRING(gz->z.input)->len;
zstream_append_input2(&gz->z, str);
}
return p;
}
static unsigned int
-gzfile_get16(const unsigned char *src)
+gzfile_get16(src)
+ const unsigned char *src;
{
unsigned int n;
n = *(src++) & 0xff;
@@ -1875,7 +1910,8 @@ gzfile_get16(const unsigned char *src)
}
static unsigned long
-gzfile_get32(const unsigned char *src)
+gzfile_get32(src)
+ const unsigned char *src;
{
unsigned long n;
n = *(src++) & 0xff;
@@ -1886,7 +1922,9 @@ gzfile_get32(const unsigned char *src)
}
static void
-gzfile_set32(unsigned long n, unsigned char *dst)
+gzfile_set32(n, dst)
+ unsigned long n;
+ unsigned char *dst;
{
*(dst++) = n & 0xff;
*(dst++) = (n >> 8) & 0xff;
@@ -1895,9 +1933,10 @@ gzfile_set32(unsigned long n, unsigned char *dst)
}
static void
-gzfile_make_header(struct gzfile *gz)
+gzfile_make_header(gz)
+ struct gzfile *gz;
{
- Bytef buf[10]; /* the size of gzip header */
+ unsigned char buf[10]; /* the size of gzip header */
unsigned char flags = 0, extraflags = 0;
if (!NIL_P(gz->orig_name)) {
@@ -1928,20 +1967,21 @@ gzfile_make_header(struct gzfile *gz)
if (!NIL_P(gz->orig_name)) {
zstream_append_buffer2(&gz->z, gz->orig_name);
- zstream_append_buffer(&gz->z, (Bytef*)"\0", 1);
+ zstream_append_buffer(&gz->z, "\0", 1);
}
if (!NIL_P(gz->comment)) {
zstream_append_buffer2(&gz->z, gz->comment);
- zstream_append_buffer(&gz->z, (Bytef*)"\0", 1);
+ zstream_append_buffer(&gz->z, "\0", 1);
}
gz->z.flags |= GZFILE_FLAG_HEADER_FINISHED;
}
static void
-gzfile_make_footer(struct gzfile *gz)
+gzfile_make_footer(gz)
+ struct gzfile *gz;
{
- Bytef buf[8]; /* 8 is the size of gzip footer */
+ unsigned char buf[8]; /* 8 is the size of gzip footer */
gzfile_set32(gz->crc, buf);
gzfile_set32(gz->z.stream.total_in, &buf[4]);
@@ -1950,7 +1990,8 @@ gzfile_make_footer(struct gzfile *gz)
}
static void
-gzfile_read_header(struct gzfile *gz)
+gzfile_read_header(gz)
+ struct gzfile *gz;
{
const unsigned char *head;
long len;
@@ -1960,7 +2001,7 @@ gzfile_read_header(struct gzfile *gz)
rb_raise(cGzError, "not in gzip format");
}
- head = (unsigned char*)RSTRING_PTR(gz->z.input);
+ head = RSTRING(gz->z.input)->ptr;
if (head[0] != GZ_MAGIC1 || head[1] != GZ_MAGIC2) {
rb_raise(cGzError, "not in gzip format");
@@ -1998,7 +2039,7 @@ gzfile_read_header(struct gzfile *gz)
if (!gzfile_read_raw_ensure(gz, 2)) {
rb_raise(cGzError, "unexpected end of file");
}
- len = gzfile_get16((Bytef*)RSTRING_PTR(gz->z.input));
+ len = gzfile_get16(RSTRING(gz->z.input)->ptr);
if (!gzfile_read_raw_ensure(gz, 2 + len)) {
rb_raise(cGzError, "unexpected end of file");
}
@@ -2006,26 +2047,27 @@ gzfile_read_header(struct gzfile *gz)
}
if (flags & GZ_FLAG_ORIG_NAME) {
p = gzfile_read_raw_until_zero(gz, 0);
- len = p - RSTRING_PTR(gz->z.input);
- gz->orig_name = rb_str_new(RSTRING_PTR(gz->z.input), len);
+ len = p - RSTRING(gz->z.input)->ptr;
+ gz->orig_name = rb_str_new(RSTRING(gz->z.input)->ptr, len);
OBJ_TAINT(gz->orig_name); /* for safe */
zstream_discard_input(&gz->z, len + 1);
}
if (flags & GZ_FLAG_COMMENT) {
p = gzfile_read_raw_until_zero(gz, 0);
- len = p - RSTRING_PTR(gz->z.input);
- gz->comment = rb_str_new(RSTRING_PTR(gz->z.input), len);
+ len = p - RSTRING(gz->z.input)->ptr;
+ gz->comment = rb_str_new(RSTRING(gz->z.input)->ptr, len);
OBJ_TAINT(gz->comment); /* for safe */
zstream_discard_input(&gz->z, len + 1);
}
- if (gz->z.input != Qnil && RSTRING_LEN(gz->z.input) > 0) {
+ if (gz->z.input != Qnil && RSTRING(gz->z.input)->len > 0) {
zstream_run(&gz->z, 0, 0, Z_SYNC_FLUSH);
}
}
static void
-gzfile_check_footer(struct gzfile *gz)
+gzfile_check_footer(gz)
+ struct gzfile *gz;
{
unsigned long crc, length;
@@ -2035,8 +2077,8 @@ gzfile_check_footer(struct gzfile *gz)
rb_raise(cNoFooter, "footer is not found");
}
- crc = gzfile_get32((Bytef*)RSTRING_PTR(gz->z.input));
- length = gzfile_get32((Bytef*)RSTRING_PTR(gz->z.input) + 4);
+ crc = gzfile_get32(RSTRING(gz->z.input)->ptr);
+ length = gzfile_get32(RSTRING(gz->z.input)->ptr + 4);
gz->z.stream.total_in += 8; /* to rewind correctly */
zstream_discard_input(&gz->z, 8);
@@ -2050,7 +2092,10 @@ gzfile_check_footer(struct gzfile *gz)
}
static void
-gzfile_write(struct gzfile *gz, Bytef *str, uInt len)
+gzfile_write(gz, str, len)
+ struct gzfile *gz;
+ Bytef *str;
+ uInt len;
{
if (!(gz->z.flags & GZFILE_FLAG_HEADER_FINISHED)) {
gzfile_make_header(gz);
@@ -2065,7 +2110,8 @@ gzfile_write(struct gzfile *gz, Bytef *str, uInt len)
}
static long
-gzfile_read_more(struct gzfile *gz)
+gzfile_read_more(gz)
+ struct gzfile *gz;
{
volatile VALUE str;
@@ -2077,8 +2123,8 @@ gzfile_read_more(struct gzfile *gz)
}
break;
}
- if (RSTRING_LEN(str) > 0) { /* prevent Z_BUF_ERROR */
- zstream_run(&gz->z, (Bytef*)RSTRING_PTR(str), RSTRING_LEN(str),
+ if (RSTRING(str)->len > 0) { /* prevent Z_BUF_ERROR */
+ zstream_run(&gz->z, RSTRING(str)->ptr, RSTRING(str)->len,
Z_SYNC_FLUSH);
}
if (gz->z.buf_filled > 0) break;
@@ -2087,38 +2133,24 @@ gzfile_read_more(struct gzfile *gz)
}
static void
-gzfile_calc_crc(struct gzfile *gz, VALUE str)
+gzfile_calc_crc(gz, str)
+ struct gzfile *gz;
+ VALUE str;
{
- if (RSTRING_LEN(str) <= gz->ungetc) {
- gz->ungetc -= RSTRING_LEN(str);
+ if (RSTRING(str)->len <= gz->ungetc) {
+ gz->ungetc -= RSTRING(str)->len;
}
else {
- gz->crc = crc32(gz->crc, (Bytef*)RSTRING_PTR(str) + gz->ungetc,
- RSTRING_LEN(str) - gz->ungetc);
+ gz->crc = crc32(gz->crc, RSTRING(str)->ptr + gz->ungetc,
+ RSTRING(str)->len - gz->ungetc);
gz->ungetc = 0;
}
}
static VALUE
-gzfile_newstr(struct gzfile *gz, VALUE str)
-{
- if (!gz->enc2) {
- rb_enc_associate(str, gz->enc);
- OBJ_TAINT(str); /* for safe */
- return str;
- }
- if (gz->ec && rb_enc_dummy_p(gz->enc2)) {
- str = rb_econv_str_convert(gz->ec, str, ECONV_PARTIAL_INPUT);
- rb_enc_associate(str, gz->enc);
- OBJ_TAINT(str);
- return str;
- }
- return rb_str_conv_enc_opts(str, gz->enc2, gz->enc,
- gz->ecflags, gz->ecopts);
-}
-
-static VALUE
-gzfile_read(struct gzfile *gz, int len)
+gzfile_read(gz, len)
+ struct gzfile *gz;
+ int len;
{
VALUE dst;
@@ -2138,54 +2170,14 @@ gzfile_read(struct gzfile *gz, int len)
dst = zstream_shift_buffer(&gz->z, len);
gzfile_calc_crc(gz, dst);
- return dst;
-}
-static VALUE
-gzfile_readpartial(struct gzfile *gz, int len, VALUE outbuf)
-{
- VALUE dst;
-
- if (len < 0)
- rb_raise(rb_eArgError, "negative length %d given", len);
-
- if (!NIL_P(outbuf))
- OBJ_TAINT(outbuf);
-
- if (len == 0) {
- if (NIL_P(outbuf))
- return rb_str_new(0, 0);
- else {
- rb_str_resize(outbuf, 0);
- return outbuf;
- }
- }
- while (!ZSTREAM_IS_FINISHED(&gz->z) && gz->z.buf_filled == 0) {
- gzfile_read_more(gz);
- }
- if (GZFILE_IS_FINISHED(gz)) {
- if (!(gz->z.flags & GZFILE_FLAG_FOOTER_FINISHED)) {
- gzfile_check_footer(gz);
- }
- if (!NIL_P(outbuf))
- rb_str_resize(outbuf, 0);
- rb_raise(rb_eEOFError, "end of file reached");
- }
-
- dst = zstream_shift_buffer(&gz->z, len);
- gzfile_calc_crc(gz, dst);
-
- if (!NIL_P(outbuf)) {
- rb_str_resize(outbuf, RSTRING_LEN(dst));
- memcpy(RSTRING_PTR(outbuf), RSTRING_PTR(dst), RSTRING_LEN(dst));
- dst = outbuf;
- }
OBJ_TAINT(dst); /* for safe */
return dst;
}
static VALUE
-gzfile_read_all(struct gzfile *gz)
+gzfile_read_all(gz)
+ struct gzfile *gz;
{
VALUE dst;
@@ -2201,72 +2193,23 @@ gzfile_read_all(struct gzfile *gz)
dst = zstream_detach_buffer(&gz->z);
gzfile_calc_crc(gz, dst);
- OBJ_TAINT(dst);
- return gzfile_newstr(gz, dst);
-}
-
-static VALUE
-gzfile_getc(struct gzfile *gz)
-{
- VALUE buf, dst = 0;
- int len;
-
- len = rb_enc_mbmaxlen(gz->enc);
- while (!ZSTREAM_IS_FINISHED(&gz->z) && gz->z.buf_filled < len) {
- gzfile_read_more(gz);
- }
- if (GZFILE_IS_FINISHED(gz)) {
- if (!(gz->z.flags & GZFILE_FLAG_FOOTER_FINISHED)) {
- gzfile_check_footer(gz);
- }
- return Qnil;
- }
-
- if (gz->ec && rb_enc_dummy_p(gz->enc2)) {
- const unsigned char *ss, *sp, *se;
- unsigned char *ds, *dp, *de;
- rb_econv_result_t res;
-
- if (!gz->cbuf) {
- gz->cbuf = ALLOC_N(char, GZFILE_CBUF_CAPA);
- }
- ss = sp = (const unsigned char*)RSTRING_PTR(gz->z.buf);
- se = sp + gz->z.buf_filled;
- ds = dp = (unsigned char *)gz->cbuf;
- de = (unsigned char *)ds + GZFILE_CBUF_CAPA;
- res = rb_econv_convert(gz->ec, &sp, se, &dp, de, ECONV_PARTIAL_INPUT|ECONV_AFTER_OUTPUT);
- rb_econv_check_error(gz->ec);
- dst = zstream_shift_buffer(&gz->z, sp - ss);
- gzfile_calc_crc(gz, dst);
- dst = rb_str_new(gz->cbuf, dp - ds);
- rb_enc_associate(dst, gz->enc);
- OBJ_TAINT(dst);
- return dst;
- }
- else {
- buf = gz->z.buf;
- len = rb_enc_mbclen(RSTRING_PTR(buf), RSTRING_END(buf), gz->enc);
- dst = gzfile_read(gz, len);
- return gzfile_newstr(gz, dst);
- }
-}
-static void
-gzfile_ungets(struct gzfile *gz, const Bytef *b, int len)
-{
- zstream_buffer_ungets(&gz->z, b, len);
- gz->ungetc+=len;
+ OBJ_TAINT(dst); /* for safe */
+ return dst;
}
static void
-gzfile_ungetbyte(struct gzfile *gz, int c)
+gzfile_ungetc(gz, c)
+ struct gzfile *gz;
+ int c;
{
- zstream_buffer_ungetbyte(&gz->z, c);
+ zstream_buffer_ungetc(&gz->z, c);
gz->ungetc++;
}
static VALUE
-gzfile_writer_end_run(VALUE arg)
+gzfile_writer_end_run(arg)
+ VALUE arg;
{
struct gzfile *gz = (struct gzfile *)arg;
@@ -2274,7 +2217,7 @@ gzfile_writer_end_run(VALUE arg)
gzfile_make_header(gz);
}
- zstream_run(&gz->z, (Bytef*)"", 0, Z_FINISH);
+ zstream_run(&gz->z, "", 0, Z_FINISH);
gzfile_make_footer(gz);
gzfile_write_raw(gz);
@@ -2282,7 +2225,8 @@ gzfile_writer_end_run(VALUE arg)
}
static void
-gzfile_writer_end(struct gzfile *gz)
+gzfile_writer_end(gz)
+ struct gzfile *gz;
{
if (ZSTREAM_IS_CLOSING(&gz->z)) return;
gz->z.flags |= ZSTREAM_FLAG_CLOSING;
@@ -2291,7 +2235,8 @@ gzfile_writer_end(struct gzfile *gz)
}
static VALUE
-gzfile_reader_end_run(VALUE arg)
+gzfile_reader_end_run(arg)
+ VALUE arg;
{
struct gzfile *gz = (struct gzfile *)arg;
@@ -2304,7 +2249,8 @@ gzfile_reader_end_run(VALUE arg)
}
static void
-gzfile_reader_end(struct gzfile *gz)
+gzfile_reader_end(gz)
+ struct gzfile *gz;
{
if (ZSTREAM_IS_CLOSING(&gz->z)) return;
gz->z.flags |= ZSTREAM_FLAG_CLOSING;
@@ -2313,13 +2259,14 @@ gzfile_reader_end(struct gzfile *gz)
}
static void
-gzfile_reader_rewind(struct gzfile *gz)
+gzfile_reader_rewind(gz)
+ struct gzfile *gz;
{
long n;
n = gz->z.stream.total_in;
if (!NIL_P(gz->z.input)) {
- n += RSTRING_LEN(gz->z.input);
+ n += RSTRING(gz->z.input)->len;
}
rb_funcall(gz->io, id_seek, 2, rb_int2inum(-n), INT2FIX(1));
@@ -2327,7 +2274,8 @@ gzfile_reader_rewind(struct gzfile *gz)
}
static VALUE
-gzfile_reader_get_unused(struct gzfile *gz)
+gzfile_reader_get_unused(gz)
+ struct gzfile *gz;
{
VALUE str;
@@ -2344,7 +2292,8 @@ gzfile_reader_get_unused(struct gzfile *gz)
}
static struct gzfile *
-get_gzfile(VALUE obj)
+get_gzfile(obj)
+ VALUE obj;
{
struct gzfile *gz;
@@ -2370,7 +2319,8 @@ get_gzfile(VALUE obj)
static VALUE
-gzfile_ensure_close(VALUE obj)
+gzfile_ensure_close(obj)
+ VALUE obj;
{
struct gzfile *gz;
@@ -2385,7 +2335,10 @@ gzfile_ensure_close(VALUE obj)
* See Zlib::GzipReader#wrap and Zlib::GzipWriter#wrap.
*/
static VALUE
-rb_gzfile_s_wrap(int argc, VALUE *argv, VALUE klass)
+rb_gzfile_s_wrap(argc, argv, klass)
+ int argc;
+ VALUE *argv;
+ VALUE klass;
{
VALUE obj = rb_class_new_instance(argc, argv, klass);
@@ -2401,7 +2354,11 @@ rb_gzfile_s_wrap(int argc, VALUE *argv, VALUE klass)
* See Zlib::GzipReader#open and Zlib::GzipWriter#open.
*/
static VALUE
-gzfile_s_open(int argc, VALUE *argv, VALUE klass, const char *mode)
+gzfile_s_open(argc, argv, klass, mode)
+ int argc;
+ VALUE *argv;
+ VALUE klass;
+ const char *mode;
{
VALUE io, filename;
@@ -2409,7 +2366,9 @@ gzfile_s_open(int argc, VALUE *argv, VALUE klass, const char *mode)
rb_raise(rb_eArgError, "wrong number of arguments (0 for 1)");
}
filename = argv[0];
- io = rb_file_open_str(filename, mode);
+ SafeStringValue(filename);
+ io = rb_file_open(RSTRING(filename)->ptr, mode);
+
argv[0] = io;
return rb_gzfile_s_wrap(argc, argv, klass);
}
@@ -2418,7 +2377,8 @@ gzfile_s_open(int argc, VALUE *argv, VALUE klass, const char *mode)
* Same as IO.
*/
static VALUE
-rb_gzfile_to_io(VALUE obj)
+rb_gzfile_to_io(obj)
+ VALUE obj;
{
return get_gzfile(obj)->io;
}
@@ -2427,7 +2387,8 @@ rb_gzfile_to_io(VALUE obj)
* Returns CRC value of the uncompressed data.
*/
static VALUE
-rb_gzfile_crc(VALUE obj)
+rb_gzfile_crc(obj)
+ VALUE obj;
{
return rb_uint2inum(get_gzfile(obj)->crc);
}
@@ -2436,7 +2397,8 @@ rb_gzfile_crc(VALUE obj)
* Returns last modification time recorded in the gzip file header.
*/
static VALUE
-rb_gzfile_mtime(VALUE obj)
+rb_gzfile_mtime(obj)
+ VALUE obj;
{
return rb_time_new(get_gzfile(obj)->mtime, (time_t)0);
}
@@ -2445,7 +2407,8 @@ rb_gzfile_mtime(VALUE obj)
* Returns compression level.
*/
static VALUE
-rb_gzfile_level(VALUE obj)
+rb_gzfile_level(obj)
+ VALUE obj;
{
return INT2FIX(get_gzfile(obj)->level);
}
@@ -2454,7 +2417,8 @@ rb_gzfile_level(VALUE obj)
* Returns OS code number recorded in the gzip file header.
*/
static VALUE
-rb_gzfile_os_code(VALUE obj)
+rb_gzfile_os_code(obj)
+ VALUE obj;
{
return INT2FIX(get_gzfile(obj)->os_code);
}
@@ -2464,7 +2428,8 @@ rb_gzfile_os_code(VALUE obj)
* original filename is not present.
*/
static VALUE
-rb_gzfile_orig_name(VALUE obj)
+rb_gzfile_orig_name(obj)
+ VALUE obj;
{
VALUE str = get_gzfile(obj)->orig_name;
if (!NIL_P(str)) {
@@ -2479,7 +2444,8 @@ rb_gzfile_orig_name(VALUE obj)
* is not present.
*/
static VALUE
-rb_gzfile_comment(VALUE obj)
+rb_gzfile_comment(obj)
+ VALUE obj;
{
VALUE str = get_gzfile(obj)->comment;
if (!NIL_P(str)) {
@@ -2493,7 +2459,8 @@ rb_gzfile_comment(VALUE obj)
* ???
*/
static VALUE
-rb_gzfile_lineno(VALUE obj)
+rb_gzfile_lineno(obj)
+ VALUE obj;
{
return INT2NUM(get_gzfile(obj)->lineno);
}
@@ -2502,7 +2469,8 @@ rb_gzfile_lineno(VALUE obj)
* ???
*/
static VALUE
-rb_gzfile_set_lineno(VALUE obj, VALUE lineno)
+rb_gzfile_set_lineno(obj, lineno)
+ VALUE obj, lineno;
{
struct gzfile *gz = get_gzfile(obj);
gz->lineno = NUM2INT(lineno);
@@ -2513,7 +2481,8 @@ rb_gzfile_set_lineno(VALUE obj, VALUE lineno)
* ???
*/
static VALUE
-rb_gzfile_set_mtime(VALUE obj, VALUE mtime)
+rb_gzfile_set_mtime(obj, mtime)
+ VALUE obj, mtime;
{
struct gzfile *gz = get_gzfile(obj);
VALUE val;
@@ -2522,7 +2491,7 @@ rb_gzfile_set_mtime(VALUE obj, VALUE mtime)
rb_raise(cGzError, "header is already written");
}
- if (FIXNUM_P(mtime)) {
+ if (FIXNUM_P(time)) {
gz->mtime = FIX2INT(mtime);
}
else {
@@ -2536,7 +2505,8 @@ rb_gzfile_set_mtime(VALUE obj, VALUE mtime)
* ???
*/
static VALUE
-rb_gzfile_set_orig_name(VALUE obj, VALUE str)
+rb_gzfile_set_orig_name(obj, str)
+ VALUE obj, str;
{
struct gzfile *gz = get_gzfile(obj);
VALUE s;
@@ -2546,9 +2516,9 @@ rb_gzfile_set_orig_name(VALUE obj, VALUE str)
rb_raise(cGzError, "header is already written");
}
s = rb_str_dup(rb_str_to_str(str));
- p = memchr(RSTRING_PTR(s), '\0', RSTRING_LEN(s));
+ p = memchr(RSTRING(s)->ptr, '\0', RSTRING(s)->len);
if (p) {
- rb_str_resize(s, p - RSTRING_PTR(s));
+ rb_str_resize(s, p - RSTRING(s)->ptr);
}
gz->orig_name = s;
return str;
@@ -2558,7 +2528,8 @@ rb_gzfile_set_orig_name(VALUE obj, VALUE str)
* ???
*/
static VALUE
-rb_gzfile_set_comment(VALUE obj, VALUE str)
+rb_gzfile_set_comment(obj, str)
+ VALUE obj, str;
{
struct gzfile *gz = get_gzfile(obj);
VALUE s;
@@ -2568,9 +2539,9 @@ rb_gzfile_set_comment(VALUE obj, VALUE str)
rb_raise(cGzError, "header is already written");
}
s = rb_str_dup(rb_str_to_str(str));
- p = memchr(RSTRING_PTR(s), '\0', RSTRING_LEN(s));
+ p = memchr(RSTRING(s)->ptr, '\0', RSTRING(s)->len);
if (p) {
- rb_str_resize(s, p - RSTRING_PTR(s));
+ rb_str_resize(s, p - RSTRING(s)->ptr);
}
gz->comment = s;
return str;
@@ -2581,7 +2552,8 @@ rb_gzfile_set_comment(VALUE obj, VALUE str)
* associated IO object. Returns the associated IO object.
*/
static VALUE
-rb_gzfile_close(VALUE obj)
+rb_gzfile_close(obj)
+ VALUE obj;
{
struct gzfile *gz = get_gzfile(obj);
VALUE io;
@@ -2597,7 +2569,8 @@ rb_gzfile_close(VALUE obj)
* object.
*/
static VALUE
-rb_gzfile_finish(VALUE obj)
+rb_gzfile_finish(obj)
+ VALUE obj;
{
struct gzfile *gz = get_gzfile(obj);
VALUE io;
@@ -2611,7 +2584,8 @@ rb_gzfile_finish(VALUE obj)
* Same as IO.
*/
static VALUE
-rb_gzfile_closed_p(VALUE obj)
+rb_gzfile_closed_p(obj)
+ VALUE obj;
{
struct gzfile *gz;
Data_Get_Struct(obj, struct gzfile, gz);
@@ -2622,7 +2596,8 @@ rb_gzfile_closed_p(VALUE obj)
* ???
*/
static VALUE
-rb_gzfile_eof_p(VALUE obj)
+rb_gzfile_eof_p(obj)
+ VALUE obj;
{
struct gzfile *gz = get_gzfile(obj);
return GZFILE_IS_FINISHED(gz) ? Qtrue : Qfalse;
@@ -2632,7 +2607,8 @@ rb_gzfile_eof_p(VALUE obj)
* Same as IO.
*/
static VALUE
-rb_gzfile_sync(VALUE obj)
+rb_gzfile_sync(obj)
+ VALUE obj;
{
return (get_gzfile(obj)->z.flags & GZFILE_FLAG_SYNC) ? Qtrue : Qfalse;
}
@@ -2645,7 +2621,8 @@ rb_gzfile_sync(VALUE obj)
* decreases sharply.
*/
static VALUE
-rb_gzfile_set_sync(VALUE obj, VALUE mode)
+rb_gzfile_set_sync(obj, mode)
+ VALUE obj, mode;
{
struct gzfile *gz = get_gzfile(obj);
@@ -2662,7 +2639,8 @@ rb_gzfile_set_sync(VALUE obj, VALUE mode)
* ???
*/
static VALUE
-rb_gzfile_total_in(VALUE obj)
+rb_gzfile_total_in(obj)
+ VALUE obj;
{
return rb_uint2inum(get_gzfile(obj)->z.stream.total_in);
}
@@ -2671,41 +2649,13 @@ rb_gzfile_total_in(VALUE obj)
* ???
*/
static VALUE
-rb_gzfile_total_out(VALUE obj)
+rb_gzfile_total_out(obj)
+ VALUE obj;
{
struct gzfile *gz = get_gzfile(obj);
return rb_uint2inum(gz->z.stream.total_out - gz->z.buf_filled);
}
-/*
- * Document-method: path
- *
- * call-seq: path
- *
- * Returns the path string of the associated IO-like object. This
- * method is only defined when the IO-like object responds to #path().
- */
-static VALUE
-rb_gzfile_path(VALUE obj)
-{
- struct gzfile *gz;
- Data_Get_Struct(obj, struct gzfile, gz);
- return gz->path;
-}
-
-static void
-rb_gzfile_ecopts(struct gzfile *gz, VALUE opts)
-{
- if (!NIL_P(opts)) {
- rb_io_extract_encoding_option(opts, &gz->enc, &gz->enc2);
- }
- if (gz->enc2) {
- gz->ecflags = rb_econv_prepare_opts(opts, &opts);
- gz->ec = rb_econv_open_opts(gz->enc2->name, gz->enc->name,
- gz->ecflags, opts);
- gz->ecopts = opts;
- }
-}
/* ------------------------------------------------------------------------- */
@@ -2737,7 +2687,8 @@ rb_gzfile_ecopts(struct gzfile *gz, VALUE opts)
*/
static VALUE
-rb_gzwriter_s_allocate(VALUE klass)
+rb_gzwriter_s_allocate(klass)
+ VALUE klass;
{
return gzfile_writer_new(klass);
}
@@ -2750,7 +2701,10 @@ rb_gzwriter_s_allocate(VALUE klass)
* this method are found in Zlib::GzipWriter.new and Zlib::GzipWriter#wrap.
*/
static VALUE
-rb_gzwriter_s_open(int argc, VALUE *argv, VALUE klass)
+rb_gzwriter_s_open(argc, argv, klass)
+ int argc;
+ VALUE *argv;
+ VALUE klass;
{
return gzfile_s_open(argc, argv, klass, "wb");
}
@@ -2764,17 +2718,15 @@ rb_gzwriter_s_open(int argc, VALUE *argv, VALUE klass)
* +write+ method that behaves same as write method in IO class.
*/
static VALUE
-rb_gzwriter_initialize(int argc, VALUE *argv, VALUE obj)
+rb_gzwriter_initialize(argc, argv, obj)
+ int argc;
+ VALUE *argv;
+ VALUE obj;
{
struct gzfile *gz;
- VALUE io, level, strategy, opt = Qnil;
+ VALUE io, level, strategy;
int err;
- if (argc > 1) {
- opt = rb_check_convert_type(argv[argc-1], T_HASH, "Hash", "to_hash");
- if (!NIL_P(opt)) argc--;
- }
-
rb_scan_args(argc, argv, "12", &io, &level, &strategy);
Data_Get_Struct(obj, struct gzfile, gz);
@@ -2787,12 +2739,6 @@ rb_gzwriter_initialize(int argc, VALUE *argv, VALUE obj)
}
gz->io = io;
ZSTREAM_READY(&gz->z);
- rb_gzfile_ecopts(gz, opt);
-
- if (rb_respond_to(io, id_path)) {
- gz->path = rb_funcall(gz->io, id_path, 0);
- rb_define_singleton_method(obj, "path", rb_gzfile_path, 0);
- }
return obj;
}
@@ -2805,7 +2751,10 @@ rb_gzwriter_initialize(int argc, VALUE *argv, VALUE obj)
* +flush+ is omitted. It is no use giving flush <tt>Zlib::NO_FLUSH</tt>.
*/
static VALUE
-rb_gzwriter_flush(int argc, VALUE *argv, VALUE obj)
+rb_gzwriter_flush(argc, argv, obj)
+ int argc;
+ VALUE *argv;
+ VALUE obj;
{
struct gzfile *gz = get_gzfile(obj);
VALUE v_flush;
@@ -2815,7 +2764,7 @@ rb_gzwriter_flush(int argc, VALUE *argv, VALUE obj)
flush = FIXNUMARG(v_flush, Z_SYNC_FLUSH);
if (flush != Z_NO_FLUSH) { /* prevent Z_BUF_ERROR */
- zstream_run(&gz->z, (Bytef*)"", 0, flush);
+ zstream_run(&gz->z, "", 0, flush);
}
gzfile_write_raw(gz);
@@ -2829,29 +2778,29 @@ rb_gzwriter_flush(int argc, VALUE *argv, VALUE obj)
* Same as IO.
*/
static VALUE
-rb_gzwriter_write(VALUE obj, VALUE str)
+rb_gzwriter_write(obj, str)
+ VALUE obj, str;
{
struct gzfile *gz = get_gzfile(obj);
- if (TYPE(str) != T_STRING)
+ if (TYPE(str) != T_STRING) {
str = rb_obj_as_string(str);
- if (gz->enc2 && gz->enc2 != rb_ascii8bit_encoding()) {
- str = rb_str_conv_enc(str, rb_enc_get(str), gz->enc2);
}
- gzfile_write(gz, (Bytef*)RSTRING_PTR(str), RSTRING_LEN(str));
- return INT2FIX(RSTRING_LEN(str));
+ gzfile_write(gz, RSTRING(str)->ptr, RSTRING(str)->len);
+ return INT2FIX(RSTRING(str)->len);
}
/*
* Same as IO.
*/
static VALUE
-rb_gzwriter_putc(VALUE obj, VALUE ch)
+rb_gzwriter_putc(obj, ch)
+ VALUE obj, ch;
{
struct gzfile *gz = get_gzfile(obj);
char c = NUM2CHR(ch);
- gzfile_write(gz, (Bytef*)&c, 1);
+ gzfile_write(gz, &c, 1);
return ch;
}
@@ -2937,7 +2886,8 @@ rb_gzwriter_putc(VALUE obj, VALUE ch)
*/
static VALUE
-rb_gzreader_s_allocate(VALUE klass)
+rb_gzreader_s_allocate(klass)
+ VALUE klass;
{
return gzfile_reader_new(klass);
}
@@ -2950,7 +2900,10 @@ rb_gzreader_s_allocate(VALUE klass)
* are in Zlib::GzipReader.new and ZLib::GzipReader.wrap.
*/
static VALUE
-rb_gzreader_s_open(int argc, VALUE *argv, VALUE klass)
+rb_gzreader_s_open(argc, argv, klass)
+ int argc;
+ VALUE *argv;
+ VALUE klass;
{
return gzfile_s_open(argc, argv, klass, "rb");
}
@@ -2966,18 +2919,13 @@ rb_gzreader_s_open(int argc, VALUE *argv, VALUE klass)
* exception.
*/
static VALUE
-rb_gzreader_initialize(int argc, VALUE *argv, VALUE obj)
+rb_gzreader_initialize(obj, io)
+ VALUE obj, io;
{
- VALUE io, opt = Qnil;
struct gzfile *gz;
int err;
Data_Get_Struct(obj, struct gzfile, gz);
- if (argc > 1) {
- opt = rb_check_convert_type(argv[argc-1], T_HASH, "Hash", "to_hash");
- if (!NIL_P(opt)) argc--;
- }
- rb_scan_args(argc, argv, "1", &io);
/* this is undocumented feature of zlib */
err = inflateInit2(&gz->z.stream, -MAX_WBITS);
@@ -2987,12 +2935,6 @@ rb_gzreader_initialize(int argc, VALUE *argv, VALUE obj)
gz->io = io;
ZSTREAM_READY(&gz->z);
gzfile_read_header(gz);
- rb_gzfile_ecopts(gz, opt);
-
- if (rb_respond_to(io, id_path)) {
- gz->path = rb_funcall(gz->io, id_path, 0);
- rb_define_singleton_method(obj, "path", rb_gzfile_path, 0);
- }
return obj;
}
@@ -3002,7 +2944,8 @@ rb_gzreader_initialize(int argc, VALUE *argv, VALUE obj)
* object. The associated IO object needs to respond to the +seek+ method.
*/
static VALUE
-rb_gzreader_rewind(VALUE obj)
+rb_gzreader_rewind(obj)
+ VALUE obj;
{
struct gzfile *gz = get_gzfile(obj);
gzfile_reader_rewind(gz);
@@ -3014,7 +2957,8 @@ rb_gzreader_rewind(VALUE obj)
* +nil+ if the whole gzip file is not parsed yet.
*/
static VALUE
-rb_gzreader_unused(VALUE obj)
+rb_gzreader_unused(obj)
+ VALUE obj;
{
struct gzfile *gz;
Data_Get_Struct(obj, struct gzfile, gz);
@@ -3025,7 +2969,10 @@ rb_gzreader_unused(VALUE obj)
* See Zlib::GzipReader documentation for a description.
*/
static VALUE
-rb_gzreader_read(int argc, VALUE *argv, VALUE obj)
+rb_gzreader_read(argc, argv, obj)
+ int argc;
+ VALUE *argv;
+ VALUE obj;
{
struct gzfile *gz = get_gzfile(obj);
VALUE vlen;
@@ -3044,70 +2991,18 @@ rb_gzreader_read(int argc, VALUE *argv, VALUE obj)
}
/*
- * call-seq:
- * gzipreader.readpartial(maxlen [, outbuf]) => string, outbuf
- *
- * Reads at most <i>maxlen</i> bytes from the gziped stream but
- * it blocks only if <em>gzipreader</em> has no data immediately available.
- * If the optional <i>outbuf</i> argument is present,
- * it must reference a String, which will receive the data.
- * It raises <code>EOFError</code> on end of file.
- */
-static VALUE
-rb_gzreader_readpartial(int argc, VALUE *argv, VALUE obj)
-{
- struct gzfile *gz = get_gzfile(obj);
- VALUE vlen, outbuf;
- int len;
-
- rb_scan_args(argc, argv, "11", &vlen, &outbuf);
-
- len = NUM2INT(vlen);
- if (len < 0) {
- rb_raise(rb_eArgError, "negative length %d given", len);
- }
- if (!NIL_P(outbuf))
- Check_Type(outbuf, T_STRING);
- return gzfile_readpartial(gz, len, outbuf);
-}
-
-/*
* See Zlib::GzipReader documentation for a description.
*/
static VALUE
-rb_gzreader_getc(VALUE obj)
-{
- struct gzfile *gz = get_gzfile(obj);
-
- return gzfile_getc(gz);
-}
-
-/*
- * See Zlib::GzipReader documentation for a description.
- */
-static VALUE
-rb_gzreader_readchar(VALUE obj)
-{
- VALUE dst;
- dst = rb_gzreader_getc(obj);
- if (NIL_P(dst)) {
- rb_raise(rb_eEOFError, "end of file reached");
- }
- return dst;
-}
-
-/*
- * See Zlib::GzipReader documentation for a description.
- */
-static VALUE
-rb_gzreader_getbyte(VALUE obj)
+rb_gzreader_getc(obj)
+ VALUE obj;
{
struct gzfile *gz = get_gzfile(obj);
VALUE dst;
dst = gzfile_read(gz, 1);
if (!NIL_P(dst)) {
- dst = INT2FIX((unsigned int)(RSTRING_PTR(dst)[0]) & 0xff);
+ dst = INT2FIX((unsigned int)(RSTRING(dst)->ptr[0]) & 0xff);
}
return dst;
}
@@ -3116,10 +3011,11 @@ rb_gzreader_getbyte(VALUE obj)
* See Zlib::GzipReader documentation for a description.
*/
static VALUE
-rb_gzreader_readbyte(VALUE obj)
+rb_gzreader_readchar(obj)
+ VALUE obj;
{
VALUE dst;
- dst = rb_gzreader_getbyte(obj);
+ dst = rb_gzreader_getc(obj);
if (NIL_P(dst)) {
rb_raise(rb_eEOFError, "end of file reached");
}
@@ -3130,12 +3026,10 @@ rb_gzreader_readbyte(VALUE obj)
* See Zlib::GzipReader documentation for a description.
*/
static VALUE
-rb_gzreader_each_char(VALUE obj)
+rb_gzreader_each_byte(obj)
+ VALUE obj;
{
VALUE c;
-
- RETURN_ENUMERATOR(obj, 0, 0);
-
while (!NIL_P(c = rb_gzreader_getc(obj))) {
rb_yield(c);
}
@@ -3146,50 +3040,17 @@ rb_gzreader_each_char(VALUE obj)
* See Zlib::GzipReader documentation for a description.
*/
static VALUE
-rb_gzreader_each_byte(VALUE obj)
-{
- VALUE c;
-
- RETURN_ENUMERATOR(obj, 0, 0);
-
- while (!NIL_P(c = rb_gzreader_getbyte(obj))) {
- rb_yield(c);
- }
- return Qnil;
-}
-
-/*
- * See Zlib::GzipReader documentation for a description.
- */
-static VALUE
-rb_gzreader_ungetc(VALUE obj, VALUE s)
-{
- struct gzfile *gz;
-
- if (FIXNUM_P(s))
- return rb_gzreader_ungetbyte(obj, s);
- gz = get_gzfile(obj);
- StringValue(s);
- if (gz->enc2 && gz->enc2 != rb_ascii8bit_encoding()) {
- s = rb_str_conv_enc(s, rb_enc_get(s), gz->enc2);
- }
- gzfile_ungets(gz, (const Bytef*)RSTRING_PTR(s), RSTRING_LEN(s));
- return Qnil;
-}
-
-/*
- * See Zlib::GzipReader documentation for a description.
- */
-static VALUE
-rb_gzreader_ungetbyte(VALUE obj, VALUE ch)
+rb_gzreader_ungetc(obj, ch)
+ VALUE obj, ch;
{
struct gzfile *gz = get_gzfile(obj);
- gzfile_ungetbyte(gz, NUM2CHR(ch));
+ gzfile_ungetc(gz, NUM2CHR(ch));
return Qnil;
}
static void
-gzreader_skip_linebreaks(struct gzfile *gz)
+gzreader_skip_linebreaks(gz)
+ struct gzfile *gz;
{
VALUE str;
char *p;
@@ -3200,7 +3061,7 @@ gzreader_skip_linebreaks(struct gzfile *gz)
gzfile_read_more(gz);
}
n = 0;
- p = RSTRING_PTR(gz->z.buf);
+ p = RSTRING(gz->z.buf)->ptr;
while (n++, *(p++) == '\n') {
if (n >= gz->z.buf_filled) {
@@ -3211,7 +3072,7 @@ gzreader_skip_linebreaks(struct gzfile *gz)
gzfile_read_more(gz);
}
n = 0;
- p = RSTRING_PTR(gz->z.buf);
+ p = RSTRING(gz->z.buf)->ptr;
}
}
@@ -3220,20 +3081,25 @@ gzreader_skip_linebreaks(struct gzfile *gz)
}
static void
-rscheck(const char *rsptr, long rslen, VALUE rs)
+rscheck(rsptr, rslen, rs)
+ char *rsptr;
+ long rslen;
+ VALUE rs;
{
- if (RSTRING_PTR(rs) != rsptr && RSTRING_LEN(rs) != rslen)
+ if (RSTRING(rs)->ptr != rsptr && RSTRING(rs)->len != rslen)
rb_raise(rb_eRuntimeError, "rs modified");
}
static VALUE
-gzreader_gets(int argc, VALUE *argv, VALUE obj)
+gzreader_gets(argc, argv, obj)
+ int argc;
+ VALUE *argv;
+ VALUE obj;
{
struct gzfile *gz = get_gzfile(obj);
volatile VALUE rs;
VALUE dst;
- const char *rsptr;
- char *p, *res;
+ char *rsptr, *p, *res;
long rslen, n;
int rspara;
@@ -3249,19 +3115,19 @@ gzreader_gets(int argc, VALUE *argv, VALUE obj)
if (NIL_P(rs)) {
dst = gzfile_read_all(gz);
- if (RSTRING_LEN(dst) != 0) gz->lineno++;
+ if (RSTRING(dst)->len != 0) gz->lineno++;
else
- return Qnil;
+ return Qnil;
return dst;
}
- if (RSTRING_LEN(rs) == 0) {
+ if (RSTRING(rs)->len == 0) {
rsptr = "\n\n";
rslen = 2;
rspara = 1;
} else {
- rsptr = RSTRING_PTR(rs);
- rslen = RSTRING_LEN(rs);
+ rsptr = RSTRING(rs)->ptr;
+ rslen = RSTRING(rs)->len;
rspara = 0;
}
@@ -3277,13 +3143,13 @@ gzreader_gets(int argc, VALUE *argv, VALUE obj)
gzfile_read_more(gz);
}
- p = RSTRING_PTR(gz->z.buf);
+ p = RSTRING(gz->z.buf)->ptr;
n = rslen;
for (;;) {
if (n > gz->z.buf_filled) {
if (ZSTREAM_IS_FINISHED(&gz->z)) break;
gzfile_read_more(gz);
- p = RSTRING_PTR(gz->z.buf) + n - rslen;
+ p = RSTRING(gz->z.buf)->ptr + n - rslen;
}
if (!rspara) rscheck(rsptr, rslen, rs);
res = memchr(p, rsptr[0], (gz->z.buf_filled - n + 1));
@@ -3303,14 +3169,17 @@ gzreader_gets(int argc, VALUE *argv, VALUE obj)
gzreader_skip_linebreaks(gz);
}
- return gzfile_newstr(gz, dst);
+ return dst;
}
/*
* See Zlib::GzipReader documentation for a description.
*/
static VALUE
-rb_gzreader_gets(int argc, VALUE *argv, VALUE obj)
+rb_gzreader_gets(argc, argv, obj)
+ int argc;
+ VALUE *argv;
+ VALUE obj;
{
VALUE dst;
dst = gzreader_gets(argc, argv, obj);
@@ -3324,7 +3193,10 @@ rb_gzreader_gets(int argc, VALUE *argv, VALUE obj)
* See Zlib::GzipReader documentation for a description.
*/
static VALUE
-rb_gzreader_readline(int argc, VALUE *argv, VALUE obj)
+rb_gzreader_readline(argc, argv, obj)
+ int argc;
+ VALUE *argv;
+ VALUE obj;
{
VALUE dst;
dst = rb_gzreader_gets(argc, argv, obj);
@@ -3338,12 +3210,12 @@ rb_gzreader_readline(int argc, VALUE *argv, VALUE obj)
* See Zlib::GzipReader documentation for a description.
*/
static VALUE
-rb_gzreader_each(int argc, VALUE *argv, VALUE obj)
+rb_gzreader_each(argc, argv, obj)
+ int argc;
+ VALUE *argv;
+ VALUE obj;
{
VALUE str;
-
- RETURN_ENUMERATOR(obj, 0, 0);
-
while (!NIL_P(str = gzreader_gets(argc, argv, obj))) {
rb_yield(str);
}
@@ -3354,7 +3226,10 @@ rb_gzreader_each(int argc, VALUE *argv, VALUE obj)
* See Zlib::GzipReader documentation for a description.
*/
static VALUE
-rb_gzreader_readlines(int argc, VALUE *argv, VALUE obj)
+rb_gzreader_readlines(argc, argv, obj)
+ int argc;
+ VALUE *argv;
+ VALUE obj;
{
VALUE str, dst;
dst = rb_ary_new();
@@ -3447,8 +3322,7 @@ rb_gzreader_readlines(int argc, VALUE *argv, VALUE obj)
* Zlib::OS_UNKNOWN
* The return values of Zlib::GzipFile#os_code method.
*/
-void
-Init_zlib()
+void Init_zlib()
{
VALUE mZlib, cZStream, cDeflate, cInflate;
#if GZIP_SUPPORT
@@ -3541,11 +3415,9 @@ Init_zlib()
#if GZIP_SUPPORT
id_write = rb_intern("write");
id_read = rb_intern("read");
- id_readpartial = rb_intern("readpartial");
id_flush = rb_intern("flush");
id_seek = rb_intern("seek");
id_close = rb_intern("close");
- id_path = rb_intern("path");
cGzipFile = rb_define_class_under(mZlib, "GzipFile", rb_cObject);
cGzError = rb_define_class_under(cGzipFile, "Error", cZError);
@@ -3597,25 +3469,18 @@ Init_zlib()
rb_define_singleton_method(cGzipReader, "open", rb_gzreader_s_open,-1);
rb_define_alloc_func(cGzipReader, rb_gzreader_s_allocate);
- rb_define_method(cGzipReader, "initialize", rb_gzreader_initialize, -1);
+ rb_define_method(cGzipReader, "initialize", rb_gzreader_initialize, 1);
rb_define_method(cGzipReader, "rewind", rb_gzreader_rewind, 0);
rb_define_method(cGzipReader, "unused", rb_gzreader_unused, 0);
rb_define_method(cGzipReader, "read", rb_gzreader_read, -1);
- rb_define_method(cGzipReader, "readpartial", rb_gzreader_readpartial, -1);
rb_define_method(cGzipReader, "getc", rb_gzreader_getc, 0);
- rb_define_method(cGzipReader, "getbyte", rb_gzreader_getbyte, 0);
rb_define_method(cGzipReader, "readchar", rb_gzreader_readchar, 0);
- rb_define_method(cGzipReader, "readbyte", rb_gzreader_readbyte, 0);
rb_define_method(cGzipReader, "each_byte", rb_gzreader_each_byte, 0);
- rb_define_method(cGzipReader, "each_char", rb_gzreader_each_char, 0);
- rb_define_method(cGzipReader, "bytes", rb_gzreader_each_byte, 0);
rb_define_method(cGzipReader, "ungetc", rb_gzreader_ungetc, 1);
- rb_define_method(cGzipReader, "ungetbyte", rb_gzreader_ungetbyte, 1);
rb_define_method(cGzipReader, "gets", rb_gzreader_gets, -1);
rb_define_method(cGzipReader, "readline", rb_gzreader_readline, -1);
rb_define_method(cGzipReader, "each", rb_gzreader_each, -1);
rb_define_method(cGzipReader, "each_line", rb_gzreader_each, -1);
- rb_define_method(cGzipReader, "lines", rb_gzreader_each, -1);
rb_define_method(cGzipReader, "readlines", rb_gzreader_readlines, -1);
rb_define_const(mZlib, "OS_CODE", INT2FIX(OS_CODE));
diff --git a/file.c b/file.c
index a212668f95..ba490c0894 100644
--- a/file.c
+++ b/file.c
@@ -3,9 +3,10 @@
file.c -
$Author$
+ $Date$
created at: Mon Nov 15 12:24:34 JST 1993
- Copyright (C) 1993-2007 Yukihiro Matsumoto
+ Copyright (C) 1993-2003 Yukihiro Matsumoto
Copyright (C) 2000 Network Applied Communication Laboratory, Inc.
Copyright (C) 2000 Information-technology Promotion Agency, Japan
@@ -19,9 +20,10 @@
#include <sys/cygwin.h>
#endif
-#include "ruby/ruby.h"
-#include "ruby/io.h"
-#include "ruby/util.h"
+#include "ruby.h"
+#include "rubyio.h"
+#include "rubysig.h"
+#include "util.h"
#include "dln.h"
#ifdef HAVE_UNISTD_H
@@ -31,7 +33,7 @@
#ifdef HAVE_SYS_FILE_H
# include <sys/file.h>
#else
-int flock(int, int);
+int flock _((int, int));
#endif
#ifdef HAVE_SYS_PARAM_H
@@ -41,10 +43,10 @@ int flock(int, int);
# define MAXPATHLEN 1024
#endif
-#include <ctype.h>
-
#include <time.h>
+VALUE rb_time_new _((time_t, time_t));
+
#ifdef HAVE_UTIME_H
#include <utime.h>
#elif defined HAVE_SYS_UTIME_H
@@ -55,6 +57,10 @@ int flock(int, int);
#include <pwd.h>
#endif
+#ifndef HAVE_STRING_H
+char *strrchr _((const char*,const char));
+#endif
+
#include <sys/types.h>
#include <sys/stat.h>
@@ -62,13 +68,12 @@ int flock(int, int);
#include <sys/mkdev.h>
#endif
-#if defined(HAVE_FCNTL_H)
-#include <fcntl.h>
-#endif
-
#if !defined HAVE_LSTAT && !defined lstat
#define lstat stat
#endif
+#if !HAVE_FSEEKO && !defined(fseeko)
+# define fseeko fseek
+#endif
#ifdef __BEOS__ /* should not change ID if -1 */
static int
@@ -101,87 +106,54 @@ VALUE rb_cFile;
VALUE rb_mFileTest;
VALUE rb_cStat;
-#define insecure_obj_p(obj, level) (level >= 4 || (level > 0 && OBJ_TAINTED(obj)))
-
-static VALUE
-rb_get_path_check(VALUE obj, int level)
-{
- VALUE tmp;
- ID to_path;
-
- if (insecure_obj_p(obj, level)) {
- rb_insecure_operation();
- }
- tmp = rb_check_string_type(obj);
- if (!NIL_P(tmp)) goto exit;
-
- CONST_ID(to_path, "to_path");
- if (rb_respond_to(obj, to_path)) {
- tmp = rb_funcall(obj, to_path, 0, 0);
- }
- else {
- tmp = obj;
- }
- exit:
- StringValueCStr(tmp);
- if (obj != tmp && insecure_obj_p(tmp, level)) {
- rb_insecure_operation();
- }
- return rb_str_new4(tmp);
-}
-
-VALUE
-rb_get_path_no_checksafe(VALUE obj)
-{
- return rb_get_path_check(obj, 0);
-}
-
-VALUE
-rb_get_path(VALUE obj)
-{
- return rb_get_path_check(obj, rb_safe_level());
-}
-
+static long apply2files _((void (*)(const char *, void *), VALUE, void *));
static long
-apply2files(void (*func)(const char *, void *), VALUE vargs, void *arg)
+apply2files(func, vargs, arg)
+ void (*func)_((const char *, void *));
+ VALUE vargs;
+ void *arg;
{
long i;
- volatile VALUE path;
+ VALUE path;
+ struct RArray *args = RARRAY(vargs);
- rb_secure(4);
- for (i=0; i<RARRAY_LEN(vargs); i++) {
- path = rb_get_path(RARRAY_PTR(vargs)[i]);
+ for (i=0; i<args->len; i++) {
+ path = args->ptr[i];
+ SafeStringValue(path);
(*func)(StringValueCStr(path), arg);
}
- return RARRAY_LEN(vargs);
+ return args->len;
}
/*
* call-seq:
* file.path -> filename
- *
+ *
* Returns the pathname used to create <i>file</i> as a string. Does
* not normalize the name.
- *
+ *
* File.new("testfile").path #=> "testfile"
* File.new("/tmp/../tmp/xxx", "w").path #=> "/tmp/../tmp/xxx"
- *
+ *
*/
static VALUE
-rb_file_path(VALUE obj)
+rb_file_path(obj)
+ VALUE obj;
{
rb_io_t *fptr;
fptr = RFILE(rb_io_taint_check(obj))->fptr;
rb_io_check_initialized(fptr);
- if (NIL_P(fptr->pathv)) return Qnil;
- return rb_obj_taint(rb_str_dup(fptr->pathv));
+ if (!fptr->path) return Qnil;
+ return rb_tainted_str_new2(fptr->path);
}
static VALUE
-stat_new_0(VALUE klass, struct stat *st)
+stat_new_0(klass, st)
+ VALUE klass;
+ struct stat *st;
{
struct stat *nst = 0;
@@ -189,17 +161,19 @@ stat_new_0(VALUE klass, struct stat *st)
nst = ALLOC(struct stat);
*nst = *st;
}
- return Data_Wrap_Struct(klass, NULL, -1, nst);
+ return Data_Wrap_Struct(klass, NULL, free, nst);
}
static VALUE
-stat_new(struct stat *st)
+stat_new(st)
+ struct stat *st;
{
return stat_new_0(rb_cStat, st);
}
static struct stat*
-get_stat(VALUE self)
+get_stat(self)
+ VALUE self;
{
struct stat* st;
Data_Get_Struct(self, struct stat, st);
@@ -207,15 +181,13 @@ get_stat(VALUE self)
return st;
}
-static struct timespec stat_mtimespec(struct stat *st);
-
/*
* call-seq:
* stat <=> other_stat => -1, 0, 1
- *
+ *
* Compares <code>File::Stat</code> objects by comparing their
* respective modification times.
- *
+ *
* f1 = File.new("f1", "w")
* sleep 1
* f2 = File.new("f2", "w")
@@ -223,36 +195,49 @@ static struct timespec stat_mtimespec(struct stat *st);
*/
static VALUE
-rb_stat_cmp(VALUE self, VALUE other)
+rb_stat_cmp(self, other)
+ VALUE self, other;
{
if (rb_obj_is_kind_of(other, rb_obj_class(self))) {
- struct timespec ts1 = stat_mtimespec(get_stat(self));
- struct timespec ts2 = stat_mtimespec(get_stat(other));
- if (ts1.tv_sec == ts2.tv_sec) {
- if (ts1.tv_nsec == ts2.tv_nsec) return INT2FIX(0);
- if (ts1.tv_nsec < ts2.tv_nsec) return INT2FIX(-1);
- return INT2FIX(1);
- }
- if (ts1.tv_sec < ts2.tv_sec) return INT2FIX(-1);
- return INT2FIX(1);
+ time_t t1 = get_stat(self)->st_mtime;
+ time_t t2 = get_stat(other)->st_mtime;
+ if (t1 == t2)
+ return INT2FIX(0);
+ else if (t1 < t2)
+ return INT2FIX(-1);
+ else
+ return INT2FIX(1);
}
return Qnil;
}
-#define ST2UINT(val) ((val) & ~(~1UL << (sizeof(val) * CHAR_BIT - 1)))
+static VALUE rb_stat_dev _((VALUE));
+static VALUE rb_stat_ino _((VALUE));
+static VALUE rb_stat_mode _((VALUE));
+static VALUE rb_stat_nlink _((VALUE));
+static VALUE rb_stat_uid _((VALUE));
+static VALUE rb_stat_gid _((VALUE));
+static VALUE rb_stat_rdev _((VALUE));
+static VALUE rb_stat_size _((VALUE));
+static VALUE rb_stat_blksize _((VALUE));
+static VALUE rb_stat_blocks _((VALUE));
+static VALUE rb_stat_atime _((VALUE));
+static VALUE rb_stat_mtime _((VALUE));
+static VALUE rb_stat_ctime _((VALUE));
/*
* call-seq:
* stat.dev => fixnum
- *
+ *
* Returns an integer representing the device on which <i>stat</i>
* resides.
- *
+ *
* File.stat("testfile").dev #=> 774
*/
static VALUE
-rb_stat_dev(VALUE self)
+rb_stat_dev(self)
+ VALUE self;
{
return INT2NUM(get_stat(self)->st_dev);
}
@@ -260,16 +245,17 @@ rb_stat_dev(VALUE self)
/*
* call-seq:
* stat.dev_major => fixnum
- *
+ *
* Returns the major part of <code>File_Stat#dev</code> or
* <code>nil</code>.
- *
+ *
* File.stat("/dev/fd1").dev_major #=> 2
* File.stat("/dev/tty").dev_major #=> 5
*/
static VALUE
-rb_stat_dev_major(VALUE self)
+rb_stat_dev_major(self)
+ VALUE self;
{
#if defined(major)
long dev = get_stat(self)->st_dev;
@@ -282,16 +268,17 @@ rb_stat_dev_major(VALUE self)
/*
* call-seq:
* stat.dev_minor => fixnum
- *
+ *
* Returns the minor part of <code>File_Stat#dev</code> or
* <code>nil</code>.
- *
+ *
* File.stat("/dev/fd1").dev_minor #=> 1
* File.stat("/dev/tty").dev_minor #=> 0
*/
static VALUE
-rb_stat_dev_minor(VALUE self)
+rb_stat_dev_minor(self)
+ VALUE self;
{
#if defined(minor)
long dev = get_stat(self)->st_dev;
@@ -301,20 +288,22 @@ rb_stat_dev_minor(VALUE self)
#endif
}
+
/*
* call-seq:
* stat.ino => fixnum
- *
+ *
* Returns the inode number for <i>stat</i>.
- *
+ *
* File.stat("testfile").ino #=> 1083669
- *
+ *
*/
static VALUE
-rb_stat_ino(VALUE self)
+rb_stat_ino(self)
+ VALUE self;
{
-#if SIZEOF_STRUCT_STAT_ST_INO > SIZEOF_LONG
+#ifdef HUGE_ST_INO
return ULL2NUM(get_stat(self)->st_ino);
#else
return ULONG2NUM(get_stat(self)->st_ino);
@@ -324,86 +313,97 @@ rb_stat_ino(VALUE self)
/*
* call-seq:
* stat.mode => fixnum
- *
+ *
* Returns an integer representing the permission bits of
* <i>stat</i>. The meaning of the bits is platform dependent; on
* Unix systems, see <code>stat(2)</code>.
- *
+ *
* File.chmod(0644, "testfile") #=> 1
* s = File.stat("testfile")
* sprintf("%o", s.mode) #=> "100644"
*/
static VALUE
-rb_stat_mode(VALUE self)
+rb_stat_mode(self)
+ VALUE self;
{
- return UINT2NUM(ST2UINT(get_stat(self)->st_mode));
+#ifdef __BORLANDC__
+ return UINT2NUM((unsigned short)(get_stat(self)->st_mode));
+#else
+ return UINT2NUM(get_stat(self)->st_mode);
+#endif
}
/*
* call-seq:
* stat.nlink => fixnum
- *
+ *
* Returns the number of hard links to <i>stat</i>.
- *
+ *
* File.stat("testfile").nlink #=> 1
* File.link("testfile", "testfile.bak") #=> 0
* File.stat("testfile").nlink #=> 2
- *
+ *
*/
static VALUE
-rb_stat_nlink(VALUE self)
+rb_stat_nlink(self)
+ VALUE self;
{
return UINT2NUM(get_stat(self)->st_nlink);
}
+
/*
* call-seq:
* stat.uid => fixnum
- *
+ *
* Returns the numeric user id of the owner of <i>stat</i>.
- *
+ *
* File.stat("testfile").uid #=> 501
- *
+ *
*/
static VALUE
-rb_stat_uid(VALUE self)
+rb_stat_uid(self)
+ VALUE self;
{
- return UIDT2NUM(get_stat(self)->st_uid);
+ return UINT2NUM(get_stat(self)->st_uid);
}
/*
* call-seq:
* stat.gid => fixnum
- *
+ *
* Returns the numeric group id of the owner of <i>stat</i>.
- *
+ *
* File.stat("testfile").gid #=> 500
- *
+ *
*/
static VALUE
-rb_stat_gid(VALUE self)
+rb_stat_gid(self)
+ VALUE self;
{
- return GIDT2NUM(get_stat(self)->st_gid);
+ return UINT2NUM(get_stat(self)->st_gid);
}
+
/*
* call-seq:
* stat.rdev => fixnum or nil
- *
+ *
* Returns an integer representing the device type on which
* <i>stat</i> resides. Returns <code>nil</code> if the operating
* system doesn't support this feature.
- *
+ *
* File.stat("/dev/fd1").rdev #=> 513
* File.stat("/dev/tty").rdev #=> 1280
*/
static VALUE
-rb_stat_rdev(VALUE self)
+rb_stat_rdev(self)
+ VALUE self;
{
#ifdef HAVE_ST_RDEV
return ULONG2NUM(get_stat(self)->st_rdev);
@@ -415,16 +415,17 @@ rb_stat_rdev(VALUE self)
/*
* call-seq:
* stat.rdev_major => fixnum
- *
+ *
* Returns the major part of <code>File_Stat#rdev</code> or
* <code>nil</code>.
- *
+ *
* File.stat("/dev/fd1").rdev_major #=> 2
* File.stat("/dev/tty").rdev_major #=> 5
*/
static VALUE
-rb_stat_rdev_major(VALUE self)
+rb_stat_rdev_major(self)
+ VALUE self;
{
#if defined(HAVE_ST_RDEV) && defined(major)
long rdev = get_stat(self)->st_rdev;
@@ -437,16 +438,17 @@ rb_stat_rdev_major(VALUE self)
/*
* call-seq:
* stat.rdev_minor => fixnum
- *
+ *
* Returns the minor part of <code>File_Stat#rdev</code> or
* <code>nil</code>.
- *
+ *
* File.stat("/dev/fd1").rdev_minor #=> 1
* File.stat("/dev/tty").rdev_minor #=> 0
*/
static VALUE
-rb_stat_rdev_minor(VALUE self)
+rb_stat_rdev_minor(self)
+ VALUE self;
{
#if defined(HAVE_ST_RDEV) && defined(minor)
long rdev = get_stat(self)->st_rdev;
@@ -459,14 +461,15 @@ rb_stat_rdev_minor(VALUE self)
/*
* call-seq:
* stat.size => fixnum
- *
+ *
* Returns the size of <i>stat</i> in bytes.
- *
+ *
* File.stat("testfile").size #=> 66
*/
static VALUE
-rb_stat_size(VALUE self)
+rb_stat_size(self)
+ VALUE self;
{
return OFFT2NUM(get_stat(self)->st_size);
}
@@ -474,16 +477,17 @@ rb_stat_size(VALUE self)
/*
* call-seq:
* stat.blksize => integer or nil
- *
+ *
* Returns the native file system's block size. Will return <code>nil</code>
* on platforms that don't support this information.
- *
+ *
* File.stat("testfile").blksize #=> 4096
- *
+ *
*/
static VALUE
-rb_stat_blksize(VALUE self)
+rb_stat_blksize(self)
+ VALUE self;
{
#ifdef HAVE_ST_BLKSIZE
return ULONG2NUM(get_stat(self)->st_blksize);
@@ -495,149 +499,78 @@ rb_stat_blksize(VALUE self)
/*
* call-seq:
* stat.blocks => integer or nil
- *
+ *
* Returns the number of native file system blocks allocated for this
- * file, or <code>nil</code> if the operating system doesn't
+ * file, or <code>nil</code> if the operating system doesn't
* support this feature.
- *
+ *
* File.stat("testfile").blocks #=> 2
*/
static VALUE
-rb_stat_blocks(VALUE self)
+rb_stat_blocks(self)
+ VALUE self;
{
-#ifdef HAVE_STRUCT_STAT_ST_BLOCKS
-# if SIZEOF_STRUCT_STAT_ST_BLOCKS > SIZEOF_LONG
- return ULL2NUM(get_stat(self)->st_blocks);
-# else
+#ifdef HAVE_ST_BLOCKS
return ULONG2NUM(get_stat(self)->st_blocks);
-# endif
#else
return Qnil;
#endif
}
-static struct timespec
-stat_atimespec(struct stat *st)
-{
- struct timespec ts;
- ts.tv_sec = st->st_atime;
-#if defined(HAVE_STRUCT_STAT_ST_ATIM)
- ts.tv_nsec = st->st_atim.tv_nsec;
-#elif defined(HAVE_STRUCT_STAT_ST_ATIMESPEC)
- ts.tv_nsec = st->st_atimespec.tv_nsec;
-#elif defined(HAVE_STRUCT_STAT_ST_ATIMENSEC)
- ts.tv_nsec = st->st_atimensec;
-#else
- ts.tv_nsec = 0;
-#endif
- return ts;
-}
-
-static VALUE
-stat_atime(struct stat *st)
-{
- struct timespec ts = stat_atimespec(st);
- return rb_time_nano_new(ts.tv_sec, ts.tv_nsec);
-}
-
-static struct timespec
-stat_mtimespec(struct stat *st)
-{
- struct timespec ts;
- ts.tv_sec = st->st_mtime;
-#if defined(HAVE_STRUCT_STAT_ST_MTIM)
- ts.tv_nsec = st->st_mtim.tv_nsec;
-#elif defined(HAVE_STRUCT_STAT_ST_MTIMESPEC)
- ts.tv_nsec = st->st_mtimespec.tv_nsec;
-#elif defined(HAVE_STRUCT_STAT_ST_MTIMENSEC)
- ts.tv_nsec = st->st_mtimensec;
-#else
- ts.tv_nsec = 0;
-#endif
- return ts;
-}
-
-static VALUE
-stat_mtime(struct stat *st)
-{
- struct timespec ts = stat_mtimespec(st);
- return rb_time_nano_new(ts.tv_sec, ts.tv_nsec);
-}
-
-static struct timespec
-stat_ctimespec(struct stat *st)
-{
- struct timespec ts;
- ts.tv_sec = st->st_ctime;
-#if defined(HAVE_STRUCT_STAT_ST_CTIM)
- ts.tv_nsec = st->st_ctim.tv_nsec;
-#elif defined(HAVE_STRUCT_STAT_ST_CTIMESPEC)
- ts.tv_nsec = st->st_ctimespec.tv_nsec;
-#elif defined(HAVE_STRUCT_STAT_ST_CTIMENSEC)
- ts.tv_nsec = st->st_ctimensec;
-#else
- ts.tv_nsec = 0;
-#endif
- return ts;
-}
-
-static VALUE
-stat_ctime(struct stat *st)
-{
- struct timespec ts = stat_ctimespec(st);
- return rb_time_nano_new(ts.tv_sec, ts.tv_nsec);
-}
/*
* call-seq:
* stat.atime => time
- *
+ *
* Returns the last access time for this file as an object of class
* <code>Time</code>.
- *
+ *
* File.stat("testfile").atime #=> Wed Dec 31 18:00:00 CST 1969
- *
+ *
*/
static VALUE
-rb_stat_atime(VALUE self)
+rb_stat_atime(self)
+ VALUE self;
{
- return stat_atime(get_stat(self));
+ return rb_time_new(get_stat(self)->st_atime, 0);
}
/*
* call-seq:
* stat.mtime -> aTime
- *
+ *
* Returns the modification time of <i>stat</i>.
- *
+ *
* File.stat("testfile").mtime #=> Wed Apr 09 08:53:14 CDT 2003
- *
+ *
*/
static VALUE
-rb_stat_mtime(VALUE self)
+rb_stat_mtime(self)
+ VALUE self;
{
- return stat_mtime(get_stat(self));
+ return rb_time_new(get_stat(self)->st_mtime, 0);
}
/*
* call-seq:
* stat.ctime -> aTime
- *
+ *
* Returns the change time for <i>stat</i> (that is, the time
* directory information about the file was changed, not the file
* itself).
- *
+ *
* File.stat("testfile").ctime #=> Wed Apr 09 08:53:14 CDT 2003
- *
+ *
*/
static VALUE
-rb_stat_ctime(VALUE self)
+rb_stat_ctime(self)
+ VALUE self;
{
- return stat_ctime(get_stat(self));
+ return rb_time_new(get_stat(self)->st_ctime, 0);
}
/*
@@ -647,21 +580,22 @@ rb_stat_ctime(VALUE self)
* Produce a nicely formatted description of <i>stat</i>.
*
* File.stat("/etc/passwd").inspect
- * #=> "#<File::Stat dev=0xe000005, ino=1078078, mode=0100644,
- * # nlink=1, uid=0, gid=0, rdev=0x0, size=1374, blksize=4096,
- * # blocks=8, atime=Wed Dec 10 10:16:12 CST 2003,
- * # mtime=Fri Sep 12 15:41:41 CDT 2003,
- * # ctime=Mon Oct 27 11:20:27 CST 2003>"
+ * #=> "#<File::Stat dev=0xe000005, ino=1078078, mode=0100644,
+ * nlink=1, uid=0, gid=0, rdev=0x0, size=1374, blksize=4096,
+ * blocks=8, atime=Wed Dec 10 10:16:12 CST 2003,
+ * mtime=Fri Sep 12 15:41:41 CDT 2003,
+ * ctime=Mon Oct 27 11:20:27 CST 2003>"
*/
static VALUE
-rb_stat_inspect(VALUE self)
+rb_stat_inspect(self)
+ VALUE self;
{
VALUE str;
- size_t i;
+ int i;
static const struct {
const char *name;
- VALUE (*func)(VALUE);
+ VALUE (*func)_((VALUE));
} member[] = {
{"dev", rb_stat_dev},
{"ino", rb_stat_ino},
@@ -678,12 +612,6 @@ rb_stat_inspect(VALUE self)
{"ctime", rb_stat_ctime},
};
- struct stat* st;
- Data_Get_Struct(self, struct stat, st);
- if (!st) {
- return rb_sprintf("#<%s: uninitialized>", rb_obj_classname(self));
- }
-
str = rb_str_buf_new2("#<");
rb_str_buf_cat2(str, rb_obj_classname(self));
rb_str_buf_cat2(str, " ");
@@ -698,10 +626,16 @@ rb_stat_inspect(VALUE self)
rb_str_buf_cat2(str, "=");
v = (*member[i].func)(self);
if (i == 2) { /* mode */
- rb_str_catf(str, "0%lo", NUM2ULONG(v));
+ char buf[32];
+
+ sprintf(buf, "0%lo", NUM2ULONG(v));
+ rb_str_buf_cat2(str, buf);
}
else if (i == 0 || i == 6) { /* dev/rdev */
- rb_str_catf(str, "0x%lx", NUM2ULONG(v));
+ char buf[32];
+
+ sprintf(buf, "0x%lx", NUM2ULONG(v));
+ rb_str_buf_cat2(str, buf);
}
else {
rb_str_append(str, rb_inspect(v));
@@ -714,25 +648,29 @@ rb_stat_inspect(VALUE self)
}
static int
-rb_stat(VALUE file, struct stat *st)
+rb_stat(file, st)
+ VALUE file;
+ struct stat *st;
{
VALUE tmp;
- rb_secure(2);
tmp = rb_check_convert_type(file, T_FILE, "IO", "to_io");
if (!NIL_P(tmp)) {
rb_io_t *fptr;
+ rb_secure(2);
GetOpenFile(tmp, fptr);
- return fstat(fptr->fd, st);
+ return fstat(fileno(fptr->f), st);
}
- FilePathValue(file);
+ SafeStringValue(file);
return stat(StringValueCStr(file), st);
}
#ifdef _WIN32
static HANDLE
-w32_io_info(VALUE *file, BY_HANDLE_FILE_INFORMATION *st)
+w32_io_info(file, st)
+ VALUE *file;
+ BY_HANDLE_FILE_INFORMATION *st;
{
VALUE tmp;
HANDLE f, ret = 0;
@@ -742,11 +680,11 @@ w32_io_info(VALUE *file, BY_HANDLE_FILE_INFORMATION *st)
rb_io_t *fptr;
GetOpenFile(tmp, fptr);
- f = (HANDLE)rb_w32_get_osfhandle(fptr->fd);
+ f = (HANDLE)rb_w32_get_osfhandle(fileno(fptr->f));
if (f == (HANDLE)-1) return INVALID_HANDLE_VALUE;
}
else {
- FilePathValue(*file);
+ SafeStringValue(*file);
f = CreateFile(StringValueCStr(*file), 0,
FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING,
rb_w32_iswin95() ? 0 : FILE_FLAG_BACKUP_SEMANTICS, NULL);
@@ -765,23 +703,23 @@ w32_io_info(VALUE *file, BY_HANDLE_FILE_INFORMATION *st)
/*
* call-seq:
* File.stat(file_name) => stat
- *
+ *
* Returns a <code>File::Stat</code> object for the named file (see
* <code>File::Stat</code>).
- *
+ *
* File.stat("testfile").mtime #=> Tue Apr 08 12:58:04 CDT 2003
- *
+ *
*/
static VALUE
-rb_file_s_stat(VALUE klass, VALUE fname)
+rb_file_s_stat(klass, fname)
+ VALUE klass, fname;
{
struct stat st;
- rb_secure(4);
- FilePathValue(fname);
+ SafeStringValue(fname);
if (rb_stat(fname, &st) < 0) {
- rb_sys_fail(RSTRING_PTR(fname));
+ rb_sys_fail(StringValueCStr(fname));
}
return stat_new(&st);
}
@@ -789,28 +727,28 @@ rb_file_s_stat(VALUE klass, VALUE fname)
/*
* call-seq:
* ios.stat => stat
- *
+ *
* Returns status information for <em>ios</em> as an object of type
* <code>File::Stat</code>.
- *
+ *
* f = File.new("testfile")
* s = f.stat
* "%o" % s.mode #=> "100644"
* s.blksize #=> 4096
* s.atime #=> Wed Apr 09 08:53:54 CDT 2003
- *
+ *
*/
static VALUE
-rb_io_stat(VALUE obj)
+rb_io_stat(obj)
+ VALUE obj;
{
rb_io_t *fptr;
struct stat st;
-#define rb_sys_fail_path(path) rb_sys_fail(NIL_P(path) ? 0 : RSTRING_PTR(path))
GetOpenFile(obj, fptr);
- if (fstat(fptr->fd, &st) == -1) {
- rb_sys_fail_path(fptr->pathv);
+ if (fstat(fileno(fptr->f), &st) == -1) {
+ rb_sys_fail(fptr->path);
}
return stat_new(&st);
}
@@ -818,27 +756,27 @@ rb_io_stat(VALUE obj)
/*
* call-seq:
* File.lstat(file_name) => stat
- *
+ *
* Same as <code>File::stat</code>, but does not follow the last symbolic
* link. Instead, reports on the link itself.
- *
+ *
* File.symlink("testfile", "link2test") #=> 0
* File.stat("testfile").size #=> 66
* File.lstat("link2test").size #=> 8
* File.stat("link2test").size #=> 66
- *
+ *
*/
static VALUE
-rb_file_s_lstat(VALUE klass, VALUE fname)
+rb_file_s_lstat(klass, fname)
+ VALUE klass, fname;
{
#ifdef HAVE_LSTAT
struct stat st;
- rb_secure(2);
- FilePathValue(fname);
+ SafeStringValue(fname);
if (lstat(StringValueCStr(fname), &st) == -1) {
- rb_sys_fail(RSTRING_PTR(fname));
+ rb_sys_fail(RSTRING(fname)->ptr);
}
return stat_new(&st);
#else
@@ -846,13 +784,14 @@ rb_file_s_lstat(VALUE klass, VALUE fname)
#endif
}
+
/*
* call-seq:
* file.lstat => stat
- *
+ *
* Same as <code>IO#stat</code>, but does not follow the last symbolic
* link. Instead, reports on the link itself.
- *
+ *
* File.symlink("testfile", "link2test") #=> 0
* File.stat("testfile").size #=> 66
* f = File.new("link2test")
@@ -861,7 +800,8 @@ rb_file_s_lstat(VALUE klass, VALUE fname)
*/
static VALUE
-rb_file_lstat(VALUE obj)
+rb_file_lstat(obj)
+ VALUE obj;
{
#ifdef HAVE_LSTAT
rb_io_t *fptr;
@@ -869,9 +809,9 @@ rb_file_lstat(VALUE obj)
rb_secure(2);
GetOpenFile(obj, fptr);
- if (NIL_P(fptr->pathv)) return Qnil;
- if (lstat(RSTRING_PTR(fptr->pathv), &st) == -1) {
- rb_sys_fail_path(fptr->pathv);
+ if (!fptr->path) return Qnil;
+ if (lstat(fptr->path, &st) == -1) {
+ rb_sys_fail(fptr->path);
}
return stat_new(&st);
#else
@@ -881,11 +821,12 @@ rb_file_lstat(VALUE obj)
#ifndef HAVE_GROUP_MEMBER
static int
-group_member(GETGROUPS_T gid)
+group_member(gid)
+ GETGROUPS_T gid;
{
#ifndef _WIN32
if (getgid() == gid || getegid() == gid)
- return TRUE;
+ return Qtrue;
# ifdef HAVE_GETGROUPS
# ifndef NGROUPS
@@ -902,11 +843,11 @@ group_member(GETGROUPS_T gid)
anum = getgroups(NGROUPS, gary);
while (--anum >= 0)
if (gary[anum] == gid)
- return TRUE;
+ return Qtrue;
}
# endif
#endif
- return FALSE;
+ return Qfalse;
}
#endif
@@ -920,11 +861,13 @@ group_member(GETGROUPS_T gid)
#ifndef HAVE_EACCESS
int
-eaccess(const char *path, int mode)
+eaccess(path, mode)
+ const char *path;
+ int mode;
{
#ifdef USE_GETEUID
struct stat st;
- rb_uid_t euid;
+ int euid;
if (stat(path, &st) < 0) return -1;
@@ -968,34 +911,11 @@ eaccess(const char *path, int mode)
* those used in <code>File::Stat</code>. It exists as a standalone
* module, and its methods are also insinuated into the <code>File</code>
* class. (Note that this is not done by inclusion: the interpreter cheats).
- *
+ *
*/
-/*
- * File.directory?(file_name) => true or false
- * File.directory?(file_name) => true or false
- *
- * Returns <code>true</code> if the named file is a directory,
- * <code>false</code> otherwise.
- *
- * File.directory?(".")
- */
-
-/*
- * Document-method: exist?
- *
- * call-seq:
- * Dir.exist?(file_name) => true or false
- * Dir.exists?(file_name) => true or false
- *
- * Returns <code>true</code> if the named file is a directory,
- * <code>false</code> otherwise.
- *
- */
/*
- * Document-method: directory?
- *
* call-seq:
* File.directory?(file_name) => true or false
*
@@ -1005,8 +925,9 @@ eaccess(const char *path, int mode)
* File.directory?(".")
*/
-VALUE
-rb_file_directory_p(VALUE obj, VALUE fname)
+static VALUE
+test_d(obj, fname)
+ VALUE obj, fname;
{
#ifndef S_ISDIR
# define S_ISDIR(m) ((m & S_IFMT) == S_IFDIR)
@@ -1027,7 +948,8 @@ rb_file_directory_p(VALUE obj, VALUE fname)
*/
static VALUE
-rb_file_pipe_p(VALUE obj, VALUE fname)
+test_p(obj, fname)
+ VALUE obj, fname;
{
#ifdef S_IFIFO
# ifndef S_ISFIFO
@@ -1051,11 +973,20 @@ rb_file_pipe_p(VALUE obj, VALUE fname)
*/
static VALUE
-rb_file_symlink_p(VALUE obj, VALUE fname)
+test_l(obj, fname)
+ VALUE obj, fname;
{
#ifndef S_ISLNK
# ifdef _S_ISLNK
# define S_ISLNK(m) _S_ISLNK(m)
+# elif defined __BORLANDC__
+# ifdef _S_IFLNK
+# define S_ISLNK(m) (((unsigned short)(m) & S_IFMT) == _S_IFLNK)
+# else
+# ifdef S_IFLNK
+# define S_ISLNK(m) (((unsigned short)(m) & S_IFMT) == S_IFLNK)
+# endif
+# endif
# else
# ifdef _S_IFLNK
# define S_ISLNK(m) ((m & S_IFMT) == _S_IFLNK)
@@ -1070,8 +1001,7 @@ rb_file_symlink_p(VALUE obj, VALUE fname)
#ifdef S_ISLNK
struct stat st;
- rb_secure(2);
- FilePathValue(fname);
+ SafeStringValue(fname);
if (lstat(StringValueCStr(fname), &st) < 0) return Qfalse;
if (S_ISLNK(st.st_mode)) return Qtrue;
#endif
@@ -1087,11 +1017,20 @@ rb_file_symlink_p(VALUE obj, VALUE fname)
*/
static VALUE
-rb_file_socket_p(VALUE obj, VALUE fname)
+test_S(obj, fname)
+ VALUE obj, fname;
{
#ifndef S_ISSOCK
# ifdef _S_ISSOCK
# define S_ISSOCK(m) _S_ISSOCK(m)
+# elif defined __BORLANDC__
+# ifdef _S_IFSOCK
+# define S_ISSOCK(m) (((unsigned short)(m) & S_IFMT) == _S_IFSOCK)
+# else
+# ifdef S_IFSOCK
+# define S_ISSOCK(m) (((unsigned short)(m) & S_IFMT) == S_IFSOCK)
+# endif
+# endif
# else
# ifdef _S_IFSOCK
# define S_ISSOCK(m) ((m & S_IFMT) == _S_IFSOCK)
@@ -1121,7 +1060,8 @@ rb_file_socket_p(VALUE obj, VALUE fname)
*/
static VALUE
-rb_file_blockdev_p(VALUE obj, VALUE fname)
+test_b(obj, fname)
+ VALUE obj, fname;
{
#ifndef S_ISBLK
# ifdef S_IFBLK
@@ -1148,7 +1088,8 @@ rb_file_blockdev_p(VALUE obj, VALUE fname)
* Returns <code>true</code> if the named file is a character device.
*/
static VALUE
-rb_file_chardev_p(VALUE obj, VALUE fname)
+test_c(obj, fname)
+ VALUE obj, fname;
{
#ifndef S_ISCHR
# define S_ISCHR(m) ((m & S_IFMT) == S_IFCHR)
@@ -1162,16 +1103,18 @@ rb_file_chardev_p(VALUE obj, VALUE fname)
return Qfalse;
}
+
/*
* call-seq:
* File.exist?(file_name) => true or false
- * File.exists?(file_name) => true or false
+ * File.exists?(file_name) => true or false (obsolete)
*
* Return <code>true</code> if the named file exists.
*/
static VALUE
-rb_file_exist_p(VALUE obj, VALUE fname)
+test_e(obj, fname)
+ VALUE obj, fname;
{
struct stat st;
@@ -1188,10 +1131,10 @@ rb_file_exist_p(VALUE obj, VALUE fname)
*/
static VALUE
-rb_file_readable_p(VALUE obj, VALUE fname)
+test_r(obj, fname)
+ VALUE obj, fname;
{
- rb_secure(2);
- FilePathValue(fname);
+ SafeStringValue(fname);
if (eaccess(StringValueCStr(fname), R_OK) < 0) return Qfalse;
return Qtrue;
}
@@ -1205,49 +1148,14 @@ rb_file_readable_p(VALUE obj, VALUE fname)
*/
static VALUE
-rb_file_readable_real_p(VALUE obj, VALUE fname)
+test_R(obj, fname)
+ VALUE obj, fname;
{
- rb_secure(2);
- FilePathValue(fname);
+ SafeStringValue(fname);
if (access(StringValueCStr(fname), R_OK) < 0) return Qfalse;
return Qtrue;
}
-#ifndef S_IRUGO
-# define S_IRUGO (S_IRUSR | S_IRGRP | S_IROTH)
-#endif
-
-#ifndef S_IWUGO
-# define S_IWUGO (S_IWUSR | S_IWGRP | S_IWOTH)
-#endif
-
-/*
- * call-seq:
- * File.world_readable?(file_name) => fixnum or nil
- *
- * If <i>file_name</i> is readable by others, returns an integer
- * representing the file permission bits of <i>file_name</i>. Returns
- * <code>nil</code> otherwise. The meaning of the bits is platform
- * dependent; on Unix systems, see <code>stat(2)</code>.
- *
- * File.world_readable?("/etc/passwd") # => 420
- * m = File.world_readable?("/etc/passwd")
- * sprintf("%o", m) # => "644"
- */
-
-static VALUE
-rb_file_world_readable_p(VALUE obj, VALUE fname)
-{
-#ifdef S_IROTH
- struct stat st;
-
- if (rb_stat(fname, &st) < 0) return Qnil;
- if ((st.st_mode & (S_IROTH)) == S_IROTH) {
- return UINT2NUM(st.st_mode & (S_IRUGO|S_IWUGO|S_IXUGO));
- }
-#endif
- return Qnil;
-}
/*
* call-seq:
@@ -1258,10 +1166,10 @@ rb_file_world_readable_p(VALUE obj, VALUE fname)
*/
static VALUE
-rb_file_writable_p(VALUE obj, VALUE fname)
+test_w(obj, fname)
+ VALUE obj, fname;
{
- rb_secure(2);
- FilePathValue(fname);
+ SafeStringValue(fname);
if (eaccess(StringValueCStr(fname), W_OK) < 0) return Qfalse;
return Qtrue;
}
@@ -1275,44 +1183,16 @@ rb_file_writable_p(VALUE obj, VALUE fname)
*/
static VALUE
-rb_file_writable_real_p(VALUE obj, VALUE fname)
+test_W(obj, fname)
+ VALUE obj, fname;
{
- rb_secure(2);
- FilePathValue(fname);
+ SafeStringValue(fname);
if (access(StringValueCStr(fname), W_OK) < 0) return Qfalse;
return Qtrue;
}
/*
* call-seq:
- * File.world_writable?(file_name) => fixnum or nil
- *
- * If <i>file_name</i> is writable by others, returns an integer
- * representing the file permission bits of <i>file_name</i>. Returns
- * <code>nil</code> otherwise. The meaning of the bits is platform
- * dependent; on Unix systems, see <code>stat(2)</code>.
- *
- * File.world_writable?("/tmp") #=> 511
- * m = File.world_writable?("/tmp")
- * sprintf("%o", m) #=> "777"
- */
-
-static VALUE
-rb_file_world_writable_p(VALUE obj, VALUE fname)
-{
-#ifdef S_IWOTH
- struct stat st;
-
- if (rb_stat(fname, &st) < 0) return Qnil;
- if ((st.st_mode & (S_IWOTH)) == S_IWOTH) {
- return UINT2NUM(st.st_mode & (S_IRUGO|S_IWUGO|S_IXUGO));
- }
-#endif
- return Qnil;
-}
-
-/*
- * call-seq:
* File.executable?(file_name) => true or false
*
* Returns <code>true</code> if the named file is executable by the effective
@@ -1320,10 +1200,10 @@ rb_file_world_writable_p(VALUE obj, VALUE fname)
*/
static VALUE
-rb_file_executable_p(VALUE obj, VALUE fname)
+test_x(obj, fname)
+ VALUE obj, fname;
{
- rb_secure(2);
- FilePathValue(fname);
+ SafeStringValue(fname);
if (eaccess(StringValueCStr(fname), X_OK) < 0) return Qfalse;
return Qtrue;
}
@@ -1337,10 +1217,10 @@ rb_file_executable_p(VALUE obj, VALUE fname)
*/
static VALUE
-rb_file_executable_real_p(VALUE obj, VALUE fname)
+test_X(obj, fname)
+ VALUE obj, fname;
{
- rb_secure(2);
- FilePathValue(fname);
+ SafeStringValue(fname);
if (access(StringValueCStr(fname), X_OK) < 0) return Qfalse;
return Qtrue;
}
@@ -1358,7 +1238,8 @@ rb_file_executable_real_p(VALUE obj, VALUE fname)
*/
static VALUE
-rb_file_file_p(VALUE obj, VALUE fname)
+test_f(obj, fname)
+ VALUE obj, fname;
{
struct stat st;
@@ -1376,7 +1257,8 @@ rb_file_file_p(VALUE obj, VALUE fname)
*/
static VALUE
-rb_file_zero_p(VALUE obj, VALUE fname)
+test_z(obj, fname)
+ VALUE obj, fname;
{
struct stat st;
@@ -1394,7 +1276,8 @@ rb_file_zero_p(VALUE obj, VALUE fname)
*/
static VALUE
-rb_file_size_p(VALUE obj, VALUE fname)
+test_s(obj, fname)
+ VALUE obj, fname;
{
struct stat st;
@@ -1413,7 +1296,8 @@ rb_file_size_p(VALUE obj, VALUE fname)
*/
static VALUE
-rb_file_owned_p(VALUE obj, VALUE fname)
+test_owned(obj, fname)
+ VALUE obj, fname;
{
struct stat st;
@@ -1423,7 +1307,8 @@ rb_file_owned_p(VALUE obj, VALUE fname)
}
static VALUE
-rb_file_rowned_p(VALUE obj, VALUE fname)
+test_rowned(obj, fname)
+ VALUE obj, fname;
{
struct stat st;
@@ -1442,7 +1327,8 @@ rb_file_rowned_p(VALUE obj, VALUE fname)
*/
static VALUE
-rb_file_grpowned_p(VALUE obj, VALUE fname)
+test_grpowned(obj, fname)
+ VALUE obj, fname;
{
#ifndef _WIN32
struct stat st;
@@ -1455,12 +1341,13 @@ rb_file_grpowned_p(VALUE obj, VALUE fname)
#if defined(S_ISUID) || defined(S_ISGID) || defined(S_ISVTX)
static VALUE
-check3rdbyte(VALUE fname, int mode)
+check3rdbyte(fname, mode)
+ VALUE fname;
+ int mode;
{
struct stat st;
- rb_secure(2);
- FilePathValue(fname);
+ SafeStringValue(fname);
if (stat(StringValueCStr(fname), &st) < 0) return Qfalse;
if (st.st_mode & mode) return Qtrue;
return Qfalse;
@@ -1475,7 +1362,8 @@ check3rdbyte(VALUE fname, int mode)
*/
static VALUE
-rb_file_suid_p(VALUE obj, VALUE fname)
+test_suid(obj, fname)
+ VALUE obj, fname;
{
#ifdef S_ISUID
return check3rdbyte(fname, S_ISUID);
@@ -1492,7 +1380,8 @@ rb_file_suid_p(VALUE obj, VALUE fname)
*/
static VALUE
-rb_file_sgid_p(VALUE obj, VALUE fname)
+test_sgid(obj, fname)
+ VALUE obj, fname;
{
#ifdef S_ISGID
return check3rdbyte(fname, S_ISGID);
@@ -1509,7 +1398,8 @@ rb_file_sgid_p(VALUE obj, VALUE fname)
*/
static VALUE
-rb_file_sticky_p(VALUE obj, VALUE fname)
+test_sticky(obj, fname)
+ VALUE obj, fname;
{
#ifdef S_ISVTX
return check3rdbyte(fname, S_ISVTX);
@@ -1536,7 +1426,8 @@ rb_file_sticky_p(VALUE obj, VALUE fname)
*/
static VALUE
-rb_file_identical_p(VALUE obj, VALUE fname1, VALUE fname2)
+test_identical(obj, fname1, fname2)
+ VALUE obj, fname1, fname2;
{
#ifndef DOSISH
struct stat st1, st2;
@@ -1567,16 +1458,16 @@ rb_file_identical_p(VALUE obj, VALUE fname1, VALUE fname2)
if (!f1 || !f2) return Qfalse;
if (rb_w32_iswin95()) return Qfalse;
#else
- FilePathValue(fname1);
+ SafeStringValue(fname1);
fname1 = rb_str_new4(fname1);
- FilePathValue(fname2);
- if (access(RSTRING_PTR(fname1), 0)) return Qfalse;
- if (access(RSTRING_PTR(fname2), 0)) return Qfalse;
+ SafeStringValue(fname2);
+ if (access(RSTRING(fname1)->ptr, 0)) return Qfalse;
+ if (access(RSTRING(fname2)->ptr, 0)) return Qfalse;
#endif
fname1 = rb_file_expand_path(fname1, Qnil);
fname2 = rb_file_expand_path(fname2, Qnil);
- if (RSTRING_LEN(fname1) != RSTRING_LEN(fname2)) return Qfalse;
- if (rb_memcicmp(RSTRING_PTR(fname1), RSTRING_PTR(fname2), RSTRING_LEN(fname1)))
+ if (RSTRING(fname1)->len != RSTRING(fname2)->len) return Qfalse;
+ if (rb_memcicmp(RSTRING(fname1)->ptr, RSTRING(fname2)->ptr, RSTRING(fname1)->len))
return Qfalse;
#endif
return Qtrue;
@@ -1590,19 +1481,19 @@ rb_file_identical_p(VALUE obj, VALUE fname1, VALUE fname2)
*/
static VALUE
-rb_file_s_size(VALUE klass, VALUE fname)
+rb_file_s_size(klass, fname)
+ VALUE klass, fname;
{
struct stat st;
- if (rb_stat(fname, &st) < 0) {
- FilePathValue(fname);
- rb_sys_fail(RSTRING_PTR(fname));
- }
+ if (rb_stat(fname, &st) < 0)
+ rb_sys_fail(StringValueCStr(fname));
return OFFT2NUM(st.st_size);
}
static VALUE
-rb_file_ftype(const struct stat *st)
+rb_file_ftype(st)
+ struct stat *st;
{
const char *t;
@@ -1639,33 +1530,33 @@ rb_file_ftype(const struct stat *st)
t = "unknown";
}
- return rb_usascii_str_new2(t);
+ return rb_str_new2(t);
}
/*
* call-seq:
* File.ftype(file_name) => string
- *
+ *
* Identifies the type of the named file; the return string is one of
* ``<code>file</code>'', ``<code>directory</code>'',
* ``<code>characterSpecial</code>'', ``<code>blockSpecial</code>'',
* ``<code>fifo</code>'', ``<code>link</code>'',
* ``<code>socket</code>'', or ``<code>unknown</code>''.
- *
+ *
* File.ftype("testfile") #=> "file"
* File.ftype("/dev/tty") #=> "characterSpecial"
* File.ftype("/tmp/.X11-unix/X0") #=> "socket"
*/
static VALUE
-rb_file_s_ftype(VALUE klass, VALUE fname)
+rb_file_s_ftype(klass, fname)
+ VALUE klass, fname;
{
struct stat st;
- rb_secure(2);
- FilePathValue(fname);
+ SafeStringValue(fname);
if (lstat(StringValueCStr(fname), &st) == -1) {
- rb_sys_fail(RSTRING_PTR(fname));
+ rb_sys_fail(RSTRING(fname)->ptr);
}
return rb_file_ftype(&st);
@@ -1674,170 +1565,147 @@ rb_file_s_ftype(VALUE klass, VALUE fname)
/*
* call-seq:
* File.atime(file_name) => time
- *
+ *
* Returns the last access time for the named file as a Time object).
- *
+ *
* File.atime("testfile") #=> Wed Apr 09 08:51:48 CDT 2003
- *
+ *
*/
static VALUE
-rb_file_s_atime(VALUE klass, VALUE fname)
+rb_file_s_atime(klass, fname)
+ VALUE klass, fname;
{
struct stat st;
- if (rb_stat(fname, &st) < 0) {
- FilePathValue(fname);
- rb_sys_fail(RSTRING_PTR(fname));
- }
- return stat_atime(&st);
+ if (rb_stat(fname, &st) < 0)
+ rb_sys_fail(StringValueCStr(fname));
+ return rb_time_new(st.st_atime, 0);
}
/*
* call-seq:
* file.atime => time
- *
+ *
* Returns the last access time (a <code>Time</code> object)
* for <i>file</i>, or epoch if <i>file</i> has not been accessed.
- *
+ *
* File.new("testfile").atime #=> Wed Dec 31 18:00:00 CST 1969
- *
+ *
*/
static VALUE
-rb_file_atime(VALUE obj)
+rb_file_atime(obj)
+ VALUE obj;
{
rb_io_t *fptr;
struct stat st;
GetOpenFile(obj, fptr);
- if (fstat(fptr->fd, &st) == -1) {
- rb_sys_fail_path(fptr->pathv);
+ if (fstat(fileno(fptr->f), &st) == -1) {
+ rb_sys_fail(fptr->path);
}
- return stat_atime(&st);
+ return rb_time_new(st.st_atime, 0);
}
/*
* call-seq:
* File.mtime(file_name) => time
- *
+ *
* Returns the modification time for the named file as a Time object.
- *
+ *
* File.mtime("testfile") #=> Tue Apr 08 12:58:04 CDT 2003
- *
+ *
*/
static VALUE
-rb_file_s_mtime(VALUE klass, VALUE fname)
+rb_file_s_mtime(klass, fname)
+ VALUE klass, fname;
{
struct stat st;
- if (rb_stat(fname, &st) < 0) {
- FilePathValue(fname);
- rb_sys_fail(RSTRING_PTR(fname));
- }
- return stat_mtime(&st);
+ if (rb_stat(fname, &st) < 0)
+ rb_sys_fail(RSTRING(fname)->ptr);
+ return rb_time_new(st.st_mtime, 0);
}
/*
* call-seq:
* file.mtime -> time
- *
+ *
* Returns the modification time for <i>file</i>.
- *
+ *
* File.new("testfile").mtime #=> Wed Apr 09 08:53:14 CDT 2003
- *
+ *
*/
static VALUE
-rb_file_mtime(VALUE obj)
+rb_file_mtime(obj)
+ VALUE obj;
{
rb_io_t *fptr;
struct stat st;
GetOpenFile(obj, fptr);
- if (fstat(fptr->fd, &st) == -1) {
- rb_sys_fail_path(fptr->pathv);
+ if (fstat(fileno(fptr->f), &st) == -1) {
+ rb_sys_fail(fptr->path);
}
- return stat_mtime(&st);
+ return rb_time_new(st.st_mtime, 0);
}
/*
* call-seq:
* File.ctime(file_name) => time
- *
+ *
* Returns the change time for the named file (the time at which
* directory information about the file was changed, not the file
* itself).
- *
+ *
* File.ctime("testfile") #=> Wed Apr 09 08:53:13 CDT 2003
- *
+ *
*/
static VALUE
-rb_file_s_ctime(VALUE klass, VALUE fname)
+rb_file_s_ctime(klass, fname)
+ VALUE klass, fname;
{
struct stat st;
- if (rb_stat(fname, &st) < 0) {
- FilePathValue(fname);
- rb_sys_fail(RSTRING_PTR(fname));
- }
- return stat_ctime(&st);
+ if (rb_stat(fname, &st) < 0)
+ rb_sys_fail(RSTRING(fname)->ptr);
+ return rb_time_new(st.st_ctime, 0);
}
/*
* call-seq:
* file.ctime -> time
- *
+ *
* Returns the change time for <i>file</i> (that is, the time directory
* information about the file was changed, not the file itself).
- *
+ *
* File.new("testfile").ctime #=> Wed Apr 09 08:53:14 CDT 2003
- *
- */
-
-static VALUE
-rb_file_ctime(VALUE obj)
-{
- rb_io_t *fptr;
- struct stat st;
-
- GetOpenFile(obj, fptr);
- if (fstat(fptr->fd, &st) == -1) {
- rb_sys_fail_path(fptr->pathv);
- }
- return stat_ctime(&st);
-}
-
-/*
- * call-seq:
- * file.size => integer
- *
- * Returns the size of <i>file</i> in bytes.
- *
- * File.new("testfile").size #=> 66
- *
+ *
*/
static VALUE
-rb_file_size(VALUE obj)
+rb_file_ctime(obj)
+ VALUE obj;
{
rb_io_t *fptr;
struct stat st;
GetOpenFile(obj, fptr);
- if (fptr->mode & FMODE_WRITABLE) {
- rb_io_flush(obj);
+ if (fstat(fileno(fptr->f), &st) == -1) {
+ rb_sys_fail(fptr->path);
}
- if (fstat(fptr->fd, &st) == -1) {
- rb_sys_fail_path(fptr->pathv);
- }
- return OFFT2NUM(st.st_size);
+ return rb_time_new(st.st_ctime, 0);
}
+static void chmod_internal _((const char *, void *));
static void
-chmod_internal(const char *path, void *mode)
+chmod_internal(path, mode)
+ const char *path;
+ void *mode;
{
if (chmod(path, *(int *)mode) < 0)
rb_sys_fail(path);
@@ -1846,18 +1714,20 @@ chmod_internal(const char *path, void *mode)
/*
* call-seq:
* File.chmod(mode_int, file_name, ... ) -> integer
- *
+ *
* Changes permission bits on the named file(s) to the bit pattern
* represented by <i>mode_int</i>. Actual effects are operating system
* dependent (see the beginning of this section). On Unix systems, see
* <code>chmod(2)</code> for details. Returns the number of files
* processed.
- *
+ *
* File.chmod(0644, "testfile", "out") #=> 2
*/
static VALUE
-rb_file_s_chmod(int argc, VALUE *argv)
+rb_file_s_chmod(argc, argv)
+ int argc;
+ VALUE *argv;
{
VALUE vmode;
VALUE rest;
@@ -1875,18 +1745,19 @@ rb_file_s_chmod(int argc, VALUE *argv)
/*
* call-seq:
* file.chmod(mode_int) => 0
- *
+ *
* Changes permission bits on <i>file</i> to the bit pattern
* represented by <i>mode_int</i>. Actual effects are platform
* dependent; on Unix systems, see <code>chmod(2)</code> for details.
* Follows symbolic links. Also see <code>File#lchmod</code>.
- *
+ *
* f = File.new("out", "w");
* f.chmod(0644) #=> 0
*/
static VALUE
-rb_file_chmod(VALUE obj, VALUE vmode)
+rb_file_chmod(obj, vmode)
+ VALUE obj, vmode;
{
rb_io_t *fptr;
int mode;
@@ -1896,20 +1767,23 @@ rb_file_chmod(VALUE obj, VALUE vmode)
GetOpenFile(obj, fptr);
#ifdef HAVE_FCHMOD
- if (fchmod(fptr->fd, mode) == -1)
- rb_sys_fail_path(fptr->pathv);
+ if (fchmod(fileno(fptr->f), mode) == -1)
+ rb_sys_fail(fptr->path);
#else
- if (NIL_P(fptr->pathv)) return Qnil;
- if (chmod(RSTRING_PTR(fptr->pathv), mode) == -1)
- rb_sys_fail_path(fptr->pathv);
+ if (!fptr->path) return Qnil;
+ if (chmod(fptr->path, mode) == -1)
+ rb_sys_fail(fptr->path);
#endif
return INT2FIX(0);
}
#if defined(HAVE_LCHMOD)
+static void lchmod_internal _((const char *, void *));
static void
-lchmod_internal(const char *path, void *mode)
+lchmod_internal(path, mode)
+ const char *path;
+ void *mode;
{
if (lchmod(path, (int)(VALUE)mode) < 0)
rb_sys_fail(path);
@@ -1918,15 +1792,17 @@ lchmod_internal(const char *path, void *mode)
/*
* call-seq:
* File.lchmod(mode_int, file_name, ...) => integer
- *
+ *
* Equivalent to <code>File::chmod</code>, but does not follow symbolic
* links (so it will change the permissions associated with the link,
* not the file referenced by the link). Often not available.
- *
+ *
*/
static VALUE
-rb_file_s_lchmod(int argc, VALUE *argv)
+rb_file_s_lchmod(argc, argv)
+ int argc;
+ VALUE *argv;
{
VALUE vmode;
VALUE rest;
@@ -1940,18 +1816,27 @@ rb_file_s_lchmod(int argc, VALUE *argv)
return LONG2FIX(n);
}
#else
-#define rb_file_s_lchmod rb_f_notimplement
+static VALUE
+rb_file_s_lchmod(argc, argv)
+ int argc;
+ VALUE *argv;
+{
+ rb_notimplement();
+ return Qnil; /* not reached */
+}
#endif
struct chown_args {
- rb_uid_t owner;
- rb_gid_t group;
+ int owner, group;
};
+static void chown_internal _((const char *, void *));
static void
-chown_internal(const char *path, void *arg)
+chown_internal(path, argp)
+ const char *path;
+ void *argp;
{
- struct chown_args *args = arg;
+ struct chown_args *args = (struct chown_args *)argp;
if (chown(path, args->owner, args->group) < 0)
rb_sys_fail(path);
}
@@ -1959,20 +1844,22 @@ chown_internal(const char *path, void *arg)
/*
* call-seq:
* File.chown(owner_int, group_int, file_name,... ) -> integer
- *
+ *
* Changes the owner and group of the named file(s) to the given
* numeric owner and group id's. Only a process with superuser
* privileges may change the owner of a file. The current owner of a
* file may change the file's group to any group to which the owner
* belongs. A <code>nil</code> or -1 owner or group id is ignored.
* Returns the number of files processed.
- *
+ *
* File.chown(nil, 100, "testfile")
- *
+ *
*/
static VALUE
-rb_file_s_chown(int argc, VALUE *argv)
+rb_file_s_chown(argc, argv)
+ int argc;
+ VALUE *argv;
{
VALUE o, g, rest;
struct chown_args arg;
@@ -1984,13 +1871,13 @@ rb_file_s_chown(int argc, VALUE *argv)
arg.owner = -1;
}
else {
- arg.owner = NUM2UIDT(o);
+ arg.owner = NUM2INT(o);
}
if (NIL_P(g)) {
arg.group = -1;
}
else {
- arg.group = NUM2GIDT(g);
+ arg.group = NUM2INT(g);
}
n = apply2files(chown_internal, rest, &arg);
@@ -2000,20 +1887,21 @@ rb_file_s_chown(int argc, VALUE *argv)
/*
* call-seq:
* file.chown(owner_int, group_int ) => 0
- *
+ *
* Changes the owner and group of <i>file</i> to the given numeric
* owner and group id's. Only a process with superuser privileges may
* change the owner of a file. The current owner of a file may change
* the file's group to any group to which the owner belongs. A
* <code>nil</code> or -1 owner or group id is ignored. Follows
* symbolic links. See also <code>File#lchown</code>.
- *
+ *
* File.new("testfile").chown(502, 1000)
- *
+ *
*/
static VALUE
-rb_file_chown(VALUE obj, VALUE owner, VALUE group)
+rb_file_chown(obj, owner, group)
+ VALUE obj, owner, group;
{
rb_io_t *fptr;
int o, g;
@@ -2022,40 +1910,46 @@ rb_file_chown(VALUE obj, VALUE owner, VALUE group)
o = NIL_P(owner) ? -1 : NUM2INT(owner);
g = NIL_P(group) ? -1 : NUM2INT(group);
GetOpenFile(obj, fptr);
-#ifndef HAVE_FCHOWN
- if (NIL_P(fptr->pathv)) return Qnil;
- if (chown(RSTRING_PTR(fptr->pathv), o, g) == -1)
- rb_sys_fail_path(fptr->pathv);
+#if defined(DJGPP) || defined(__CYGWIN32__) || defined(_WIN32) || defined(__EMX__)
+ if (!fptr->path) return Qnil;
+ if (chown(fptr->path, o, g) == -1)
+ rb_sys_fail(fptr->path);
#else
- if (fchown(fptr->fd, o, g) == -1)
- rb_sys_fail_path(fptr->pathv);
+ if (fchown(fileno(fptr->f), o, g) == -1)
+ rb_sys_fail(fptr->path);
#endif
return INT2FIX(0);
}
-#if defined(HAVE_LCHOWN)
+#if defined(HAVE_LCHOWN) && !defined(__CHECKER__)
+static void lchown_internal _((const char *, void *));
static void
-lchown_internal(const char *path, void *arg)
+lchown_internal(path, argp)
+ const char *path;
+ void *argp;
{
- struct chown_args *args = arg;
+ struct chown_args *args = (struct chown_args *)argp;
if (lchown(path, args->owner, args->group) < 0)
rb_sys_fail(path);
}
+
/*
* call-seq:
* file.lchown(owner_int, group_int, file_name,..) => integer
- *
+ *
* Equivalent to <code>File::chown</code>, but does not follow symbolic
* links (so it will change the owner associated with the link, not the
* file referenced by the link). Often not available. Returns number
* of files in the argument list.
- *
+ *
*/
static VALUE
-rb_file_s_lchown(int argc, VALUE *argv)
+rb_file_s_lchown(argc, argv)
+ int argc;
+ VALUE *argv;
{
VALUE o, g, rest;
struct chown_args arg;
@@ -2067,101 +1961,73 @@ rb_file_s_lchown(int argc, VALUE *argv)
arg.owner = -1;
}
else {
- arg.owner = NUM2UIDT(o);
+ arg.owner = NUM2INT(o);
}
if (NIL_P(g)) {
arg.group = -1;
}
else {
- arg.group = NUM2GIDT(g);
+ arg.group = NUM2INT(g);
}
n = apply2files(lchown_internal, rest, &arg);
return LONG2FIX(n);
}
#else
-#define rb_file_s_lchown rb_f_notimplement
+static VALUE
+rb_file_s_lchown(argc, argv)
+ int argc;
+ VALUE *argv;
+{
+ rb_notimplement();
+}
#endif
-struct timespec rb_time_timespec(VALUE time);
+struct timeval rb_time_timeval();
-struct utime_args {
- const struct timespec* tsp;
- VALUE atime, mtime;
-};
+static void utime_internal _((const char *, void *));
-#if defined DOSISH || defined __CYGWIN__
-NORETURN(static void utime_failed(const char *, const struct timespec *, VALUE, VALUE));
+#if defined(HAVE_UTIMES) && !defined(__CHECKER__)
static void
-utime_failed(const char *path, const struct timespec *tsp, VALUE atime, VALUE mtime)
+utime_internal(path, arg)
+ const char *path;
+ void *arg;
{
- if (tsp && errno == EINVAL) {
- VALUE e[2], a = Qnil, m = Qnil;
- int d = 0;
- if (!NIL_P(atime)) {
- a = rb_inspect(atime);
- }
- if (!NIL_P(mtime) && mtime != atime && !rb_equal(atime, mtime)) {
- m = rb_inspect(mtime);
- }
- if (NIL_P(a)) e[0] = m;
- else if (NIL_P(m) || rb_str_cmp(a, m) == 0) e[0] = a;
- else {
- e[0] = rb_str_plus(a, rb_str_new_cstr(" or "));
- rb_str_append(e[0], m);
- d = 1;
- }
- if (!NIL_P(e[0])) {
- if (path) {
- if (!d) e[0] = rb_str_dup(e[0]);
- rb_str_cat2(rb_str_cat2(e[0], " for "), path);
- }
- e[1] = INT2FIX(EINVAL);
- rb_exc_raise(rb_class_new_instance(2, e, rb_eSystemCallError));
- }
- errno = EINVAL;
- }
- rb_sys_fail(path);
+ struct timeval *tvp = arg;
+ if (utimes(path, tvp) < 0)
+ rb_sys_fail(path);
}
-#else
-#define utime_failed(path, tsp, atime, mtime) rb_sys_fail(path)
-#endif
-#if defined(HAVE_UTIMES)
+/*
+ * call-seq:
+ * File.utime(atime, mtime, file_name,...) => integer
+ *
+ * Sets the access and modification times of each
+ * named file to the first two arguments. Returns
+ * the number of file names in the argument list.
+ */
-static void
-utime_internal(const char *path, void *arg)
-{
- struct utime_args *v = arg;
- const struct timespec *tsp = v->tsp;
- struct timeval tvbuf[2], *tvp = NULL;
-
-#ifdef HAVE_UTIMENSAT
- static int try_utimensat = 1;
-
- if (try_utimensat) {
- if (utimensat(AT_FDCWD, path, tsp, 0) < 0) {
- if (errno == ENOSYS) {
- try_utimensat = 0;
- goto no_utimensat;
- }
- utime_failed(path, tsp, v->atime, v->mtime);
- }
- return;
- }
-no_utimensat:
-#endif
+static VALUE
+rb_file_s_utime(argc, argv)
+ int argc;
+ VALUE *argv;
+{
+ VALUE atime, mtime, rest;
+ struct timeval tvs[2], *tvp = NULL;
+ long n;
- if (tsp) {
- tvbuf[0].tv_sec = tsp[0].tv_sec;
- tvbuf[0].tv_usec = (int)(tsp[0].tv_nsec / 1000);
- tvbuf[1].tv_sec = tsp[1].tv_sec;
- tvbuf[1].tv_usec = (int)(tsp[1].tv_nsec / 1000);
- tvp = tvbuf;
+ rb_secure(2);
+ rb_scan_args(argc, argv, "2*", &atime, &mtime, &rest);
+
+ if (!NIL_P(atime) || !NIL_P(mtime)) {
+ tvp = tvs;
+ tvp[0] = rb_time_timeval(atime);
+ tvp[1] = rb_time_timeval(mtime);
}
- if (utimes(path, tvp) < 0)
- utime_failed(path, tsp, v->atime, v->mtime);
+
+ n = apply2files(utime_internal, rest, tvp);
+ return LONG2FIX(n);
}
#else
@@ -2174,168 +2040,139 @@ struct utimbuf {
#endif
static void
-utime_internal(const char *path, void *arg)
+utime_internal(path, arg)
+ const char *path;
+ void *arg;
{
- struct utime_args *v = arg;
- const struct timespec *tsp = v->tsp;
- struct utimbuf utbuf, *utp = NULL;
- if (tsp) {
- utbuf.actime = tsp[0].tv_sec;
- utbuf.modtime = tsp[1].tv_sec;
- utp = &utbuf;
- }
+ struct utimbuf *utp = arg;
if (utime(path, utp) < 0)
- utime_failed(path, tsp, v->atime, v->mtime);
+ rb_sys_fail(path);
}
-#endif
-
-/*
- * call-seq:
- * File.utime(atime, mtime, file_name,...) => integer
- *
- * Sets the access and modification times of each
- * named file to the first two arguments. Returns
- * the number of file names in the argument list.
- */
-
static VALUE
-rb_file_s_utime(int argc, VALUE *argv)
+rb_file_s_utime(argc, argv)
+ int argc;
+ VALUE *argv;
{
- VALUE rest;
- struct utime_args args;
- struct timespec tss[2], *tsp = NULL;
+ VALUE atime, mtime, rest;
long n;
+ struct timeval tv;
+ struct utimbuf utbuf, *utp = NULL;
- rb_secure(2);
- rb_scan_args(argc, argv, "2*", &args.atime, &args.mtime, &rest);
+ rb_scan_args(argc, argv, "2*", &atime, &mtime, &rest);
- if (!NIL_P(args.atime) || !NIL_P(args.mtime)) {
- tsp = tss;
- tsp[0] = rb_time_timespec(args.atime);
- tsp[1] = rb_time_timespec(args.mtime);
+ if (!NIL_P(atime) || !NIL_P(mtime)) {
+ utp = &utbuf;
+ tv = rb_time_timeval(atime);
+ utp->actime = tv.tv_sec;
+ tv = rb_time_timeval(mtime);
+ utp->modtime = tv.tv_sec;
}
- args.tsp = tsp;
- n = apply2files(utime_internal, rest, &args);
+ n = apply2files(utime_internal, rest, utp);
return LONG2FIX(n);
}
-NORETURN(static void sys_fail2(VALUE,VALUE));
+#endif
+
+NORETURN(static void sys_fail2 _((VALUE,VALUE)));
static void
-sys_fail2(VALUE s1, VALUE s2)
+sys_fail2(s1, s2)
+ VALUE s1, s2;
{
char *buf;
-#ifdef MAX_PATH
- const int max_pathlen = MAX_PATH;
-#else
- const int max_pathlen = MAXPATHLEN;
-#endif
- const char *e1, *e2;
- int len = 5;
- long l1 = RSTRING_LEN(s1), l2 = RSTRING_LEN(s2);
+ int len;
- e1 = e2 = "";
- if (l1 > max_pathlen) {
- l1 = max_pathlen - 3;
- e1 = "...";
- len += 3;
- }
- if (l2 > max_pathlen) {
- l2 = max_pathlen - 3;
- e2 = "...";
- len += 3;
- }
- len += (int)l1 + (int)l2;
+ len = RSTRING(s1)->len + RSTRING(s2)->len + 5;
buf = ALLOCA_N(char, len);
- snprintf(buf, len, "(%.*s%s, %.*s%s)",
- (int)l1, RSTRING_PTR(s1), e1,
- (int)l2, RSTRING_PTR(s2), e2);
+ snprintf(buf, len, "%s or %s", RSTRING(s1)->ptr, RSTRING(s2)->ptr);
rb_sys_fail(buf);
}
-#ifdef HAVE_LINK
/*
* call-seq:
* File.link(old_name, new_name) => 0
- *
+ *
* Creates a new name for an existing file using a hard link. Will not
* overwrite <i>new_name</i> if it already exists (raising a subclass
* of <code>SystemCallError</code>). Not available on all platforms.
- *
+ *
* File.link("testfile", ".testfile") #=> 0
* IO.readlines(".testfile")[0] #=> "This is line one\n"
*/
static VALUE
-rb_file_s_link(VALUE klass, VALUE from, VALUE to)
+rb_file_s_link(klass, from, to)
+ VALUE klass, from, to;
{
- rb_secure(2);
- FilePathValue(from);
- FilePathValue(to);
+#ifdef HAVE_LINK
+ SafeStringValue(from);
+ SafeStringValue(to);
if (link(StringValueCStr(from), StringValueCStr(to)) < 0) {
sys_fail2(from, to);
}
return INT2FIX(0);
-}
#else
-#define rb_file_s_link rb_f_notimplement
+ rb_notimplement();
+ return Qnil; /* not reached */
#endif
+}
-#ifdef HAVE_SYMLINK
/*
* call-seq:
* File.symlink(old_name, new_name) => 0
- *
+ *
* Creates a symbolic link called <i>new_name</i> for the existing file
* <i>old_name</i>. Raises a <code>NotImplemented</code> exception on
* platforms that do not support symbolic links.
- *
+ *
* File.symlink("testfile", "link2test") #=> 0
- *
+ *
*/
static VALUE
-rb_file_s_symlink(VALUE klass, VALUE from, VALUE to)
+rb_file_s_symlink(klass, from, to)
+ VALUE klass, from, to;
{
- rb_secure(2);
- FilePathValue(from);
- FilePathValue(to);
+#ifdef HAVE_SYMLINK
+ SafeStringValue(from);
+ SafeStringValue(to);
if (symlink(StringValueCStr(from), StringValueCStr(to)) < 0) {
sys_fail2(from, to);
}
return INT2FIX(0);
-}
#else
-#define rb_file_s_symlink rb_f_notimplement
+ rb_notimplement();
+ return Qnil; /* not reached */
#endif
+}
-#ifdef HAVE_READLINK
/*
* call-seq:
* File.readlink(link_name) -> file_name
- *
+ *
* Returns the name of the file referenced by the given link.
* Not available on all platforms.
- *
+ *
* File.symlink("testfile", "link2test") #=> 0
* File.readlink("link2test") #=> "testfile"
*/
static VALUE
-rb_file_s_readlink(VALUE klass, VALUE path)
+rb_file_s_readlink(klass, path)
+ VALUE klass, path;
{
+#ifdef HAVE_READLINK
char *buf;
int size = 100;
- ssize_t rv;
+ int rv;
VALUE v;
- rb_secure(2);
- FilePathValue(path);
+ SafeStringValue(path);
buf = xmalloc(size);
- while ((rv = readlink(RSTRING_PTR(path), buf, size)) == size
+ while ((rv = readlink(RSTRING(path)->ptr, buf, size)) == size
#ifdef _AIX
|| (rv < 0 && errno == ERANGE) /* quirky behavior of GPFS */
#endif
@@ -2344,20 +2181,24 @@ rb_file_s_readlink(VALUE klass, VALUE path)
buf = xrealloc(buf, size);
}
if (rv < 0) {
- xfree(buf);
- rb_sys_fail_path(path);
+ free(buf);
+ rb_sys_fail(RSTRING(path)->ptr);
}
v = rb_tainted_str_new(buf, rv);
- xfree(buf);
+ free(buf);
return v;
-}
#else
-#define rb_file_s_readlink rb_f_notimplement
+ rb_notimplement();
+ return Qnil; /* not reached */
#endif
+}
+static void unlink_internal _((const char *, void *));
static void
-unlink_internal(const char *path, void *arg)
+unlink_internal(path, arg)
+ const char *path;
+ void *arg;
{
if (unlink(path) < 0)
rb_sys_fail(path);
@@ -2367,14 +2208,15 @@ unlink_internal(const char *path, void *arg)
* call-seq:
* File.delete(file_name, ...) => integer
* File.unlink(file_name, ...) => integer
- *
+ *
* Deletes the named files, returning the number of names
* passed as arguments. Raises an exception on any error.
* See also <code>Dir::rmdir</code>.
*/
static VALUE
-rb_file_s_unlink(VALUE klass, VALUE args)
+rb_file_s_unlink(klass, args)
+ VALUE klass, args;
{
long n;
@@ -2386,21 +2228,21 @@ rb_file_s_unlink(VALUE klass, VALUE args)
/*
* call-seq:
* File.rename(old_name, new_name) => 0
- *
+ *
* Renames the given file to the new name. Raises a
* <code>SystemCallError</code> if the file cannot be renamed.
- *
+ *
* File.rename("afile", "afile.bak") #=> 0
*/
static VALUE
-rb_file_s_rename(VALUE klass, VALUE from, VALUE to)
+rb_file_s_rename(klass, from, to)
+ VALUE klass, from, to;
{
const char *src, *dst;
+ SafeStringValue(from);
+ SafeStringValue(to);
- rb_secure(2);
- FilePathValue(from);
- FilePathValue(to);
src = StringValueCStr(from);
dst = StringValueCStr(to);
#if defined __CYGWIN__
@@ -2429,19 +2271,21 @@ rb_file_s_rename(VALUE klass, VALUE from, VALUE to)
* call-seq:
* File.umask() => integer
* File.umask(integer) => integer
- *
+ *
* Returns the current umask value for this process. If the optional
* argument is given, set the umask to that value and return the
* previous value. Umask values are <em>subtracted</em> from the
* default permissions, so a umask of <code>0222</code> would make a
* file read-only for everyone.
- *
+ *
* File.umask(0006) #=> 18
* File.umask #=> 6
*/
static VALUE
-rb_file_s_umask(int argc, VALUE *argv)
+rb_file_s_umask(argc, argv)
+ int argc;
+ VALUE *argv;
{
int omask = 0;
@@ -2470,27 +2314,34 @@ rb_file_s_umask(int argc, VALUE *argv)
#define isdirsep(x) ((x) == '/')
#endif
-#ifndef USE_NTFS
#if defined _WIN32 || defined __CYGWIN__
#define USE_NTFS 1
#else
#define USE_NTFS 0
#endif
+
+#ifdef DOSISH_DRIVE_LETTER
+#include <ctype.h>
#endif
#if USE_NTFS
-#define istrailinggarbage(x) ((x) == '.' || (x) == ' ')
+#define istrailinggabage(x) ((x) == '.' || (x) == ' ')
#else
-#define istrailinggarbage(x) 0
+#define istrailinggabage(x) 0
#endif
#ifndef CharNext /* defined as CharNext[AW] on Windows. */
-# define CharNext(p) ((p) + 1)
+# if defined(DJGPP)
+# define CharNext(p) ((p) + mblen(p, MB_CUR_MAX))
+# else
+# define CharNext(p) ((p) + 1)
+# endif
#endif
#ifdef DOSISH_DRIVE_LETTER
static inline int
-has_drive_letter(const char *buf)
+has_drive_letter(buf)
+ const char *buf;
{
if (ISALPHA(buf[0]) && buf[1] == ':') {
return 1;
@@ -2501,7 +2352,8 @@ has_drive_letter(const char *buf)
}
static char*
-getcwdofdrv(int drv)
+getcwdofdrv(drv)
+ int drv;
{
char drive[4];
char *drvcwd, *oldcwd;
@@ -2518,7 +2370,7 @@ getcwdofdrv(int drv)
if (chdir(drive) == 0) {
drvcwd = my_getcwd();
chdir(oldcwd);
- xfree(oldcwd);
+ free(oldcwd);
}
else {
/* perhaps the drive is not exist. we return only drive letter */
@@ -2529,7 +2381,8 @@ getcwdofdrv(int drv)
#endif
static inline char *
-skiproot(const char *path)
+skiproot(path)
+ const char *path;
{
#ifdef DOSISH_DRIVE_LETTER
if (has_drive_letter(path)) path += 2;
@@ -2540,7 +2393,8 @@ skiproot(const char *path)
#define nextdirsep rb_path_next
char *
-rb_path_next(const char *s)
+rb_path_next(s)
+ const char *s;
{
while (*s && !isdirsep(*s)) {
s = CharNext(s);
@@ -2548,15 +2402,16 @@ rb_path_next(const char *s)
return (char *)s;
}
-#if defined(DOSISH_UNC) || defined(DOSISH_DRIVE_LETTER)
+#if defined(DOSISH_UNC) || defined(DOSISH_DRIVE_LETTER)
#define skipprefix rb_path_skip_prefix
#else
#define skipprefix(path) (path)
#endif
char *
-rb_path_skip_prefix(const char *path)
+rb_path_skip_prefix(path)
+ const char *path;
{
-#if defined(DOSISH_UNC) || defined(DOSISH_DRIVE_LETTER)
+#if defined(DOSISH_UNC) || defined(DOSISH_DRIVE_LETTER)
#ifdef DOSISH_UNC
if (isdirsep(path[0]) && isdirsep(path[1])) {
path += 2;
@@ -2576,7 +2431,8 @@ rb_path_skip_prefix(const char *path)
#define strrdirsep rb_path_last_separator
char *
-rb_path_last_separator(const char *path)
+rb_path_last_separator(path)
+ const char *path;
{
char *last = NULL;
while (*path) {
@@ -2594,7 +2450,8 @@ rb_path_last_separator(const char *path)
}
static char *
-chompdirsep(const char *path)
+chompdirsep(path)
+ const char *path;
{
while (*path) {
if (isdirsep(*path)) {
@@ -2610,7 +2467,8 @@ chompdirsep(const char *path)
}
char *
-rb_path_end(const char *path)
+rb_path_end(path)
+ const char *path;
{
if (isdirsep(*path)) path++;
return chompdirsep(path);
@@ -2622,9 +2480,9 @@ ntfs_tail(const char *path)
{
while (*path == '.') path++;
while (*path && *path != ':') {
- if (istrailinggarbage(*path)) {
+ if (istrailinggabage(*path)) {
const char *last = path++;
- while (istrailinggarbage(*path)) path++;
+ while (istrailinggabage(*path)) path++;
if (!*path || *path == ':') return (char *)last;
}
else if (isdirsep(*path)) {
@@ -2642,7 +2500,7 @@ ntfs_tail(const char *path)
#endif
#define BUFCHECK(cond) do {\
- bdiff = p - buf;\
+ long bdiff = p - buf;\
if (cond) {\
do {buflen *= 2;} while (cond);\
rb_str_resize(result, buflen);\
@@ -2653,91 +2511,74 @@ ntfs_tail(const char *path)
} while (0)
#define BUFINIT() (\
- p = buf = RSTRING_PTR(result),\
- buflen = RSTRING_LEN(result),\
+ p = buf = RSTRING(result)->ptr,\
+ buflen = RSTRING(result)->len,\
pend = p + buflen)
-#define SET_EXTERNAL_ENCODING() (\
- (void)(extenc || (extenc = rb_default_external_encoding())),\
- rb_enc_associate(result, extenc))
-
-static int is_absolute_path(const char*);
-
-VALUE
-rb_home_dir(const char *user, VALUE result)
-{
- const char *dir;
- char *buf;
-#if defined DOSISH || defined __CYGWIN__
- char *p;
+#if !defined(TOLOWER)
+#define TOLOWER(c) (ISUPPER(c) ? tolower(c) : (c))
#endif
- long dirlen;
- if (!user || !*user) {
- if (!(dir = getenv("HOME"))) {
- rb_raise(rb_eArgError, "couldn't find HOME environment -- expanding `~'");
- }
- dirlen = strlen(dir);
- rb_str_resize(result, dirlen);
- memcpy(buf = RSTRING_PTR(result), dir, dirlen);
- }
- else {
-#ifdef HAVE_PWD_H
- struct passwd *pwPtr = getpwnam(user);
- if (!pwPtr) {
- endpwent();
- rb_raise(rb_eArgError, "user %s doesn't exist", user);
- }
- dirlen = strlen(pwPtr->pw_dir);
- rb_str_resize(result, dirlen);
- strcpy(buf = RSTRING_PTR(result), pwPtr->pw_dir);
- endpwent();
-#else
- return Qnil;
-#endif
- }
-#if defined DOSISH || defined __CYGWIN__
- for (p = buf; *p; p = CharNext(p)) {
- if (*p == '\\') {
- *p = '/';
- }
- }
-#endif
- return result;
-}
+static int is_absolute_path _((const char*));
static VALUE
-file_expand_path(VALUE fname, VALUE dname, int abs_mode, VALUE result)
+file_expand_path(fname, dname, result)
+ VALUE fname, dname, result;
{
const char *s, *b;
char *buf, *p, *pend, *root;
- size_t buflen, dirlen, bdiff;
+ long buflen, dirlen;
int tainted;
- rb_encoding *extenc = 0;
- FilePathValue(fname);
s = StringValuePtr(fname);
BUFINIT();
tainted = OBJ_TAINTED(fname);
- if (s[0] == '~' && abs_mode == 0) { /* execute only if NOT absolute_path() */
- tainted = 1;
+ if (s[0] == '~') {
if (isdirsep(s[1]) || s[1] == '\0') {
- buf = 0;
- rb_str_set_len(result, 0);
- if (*++s) ++s;
+ const char *dir = getenv("HOME");
+
+ if (!dir) {
+ rb_raise(rb_eArgError, "couldn't find HOME environment -- expanding `%s'", s);
+ }
+ dirlen = strlen(dir);
+ BUFCHECK(dirlen > buflen);
+ strcpy(buf, dir);
+#if defined DOSISH || defined __CYGWIN__
+ for (p = buf; *p; p = CharNext(p)) {
+ if (*p == '\\') {
+ *p = '/';
+ }
+ }
+#else
+ p = buf + strlen(dir);
+#endif
+ s++;
+ tainted = 1;
}
else {
+#ifdef HAVE_PWD_H
+ struct passwd *pwPtr;
+ s++;
+#endif
s = nextdirsep(b = s);
BUFCHECK(bdiff + (s-b) >= buflen);
memcpy(p, b, s-b);
- rb_str_set_len(result, s-b);
- buf = p + 1;
p += s-b;
+ *p = '\0';
+#ifdef HAVE_PWD_H
+ pwPtr = getpwnam(buf);
+ if (!pwPtr) {
+ endpwent();
+ rb_raise(rb_eArgError, "user %s doesn't exist", buf);
+ }
+ dirlen = strlen(pwPtr->pw_dir);
+ BUFCHECK(dirlen > buflen);
+ strcpy(buf, pwPtr->pw_dir);
+ p = buf + strlen(pwPtr->pw_dir);
+ endpwent();
+#endif
}
- rb_home_dir(buf, result);
- BUFINIT();
- p = pend;
}
#ifdef DOSISH_DRIVE_LETTER
/* skip drive letter */
@@ -2749,13 +2590,12 @@ file_expand_path(VALUE fname, VALUE dname, int abs_mode, VALUE result)
memcpy(p, s, 2);
p += 2;
s += 2;
- rb_enc_copy(result, fname);
}
else {
/* specified drive, but not full path */
int same = 0;
if (!NIL_P(dname)) {
- file_expand_path(dname, Qnil, abs_mode, result);
+ file_expand_path(dname, Qnil, result);
BUFINIT();
if (has_drive_letter(p) && TOLOWER(p[0]) == TOLOWER(s[0])) {
/* ok, same drive */
@@ -2769,8 +2609,7 @@ file_expand_path(VALUE fname, VALUE dname, int abs_mode, VALUE result)
dirlen = strlen(dir);
BUFCHECK(dirlen > buflen);
strcpy(buf, dir);
- xfree(dir);
- SET_EXTERNAL_ENCODING();
+ free(dir);
}
p = chompdirsep(skiproot(buf));
s += 2;
@@ -2779,7 +2618,7 @@ file_expand_path(VALUE fname, VALUE dname, int abs_mode, VALUE result)
#endif
else if (!is_absolute_path(s)) {
if (!NIL_P(dname)) {
- file_expand_path(dname, Qnil, abs_mode, result);
+ file_expand_path(dname, Qnil, result);
BUFINIT();
}
else {
@@ -2789,8 +2628,7 @@ file_expand_path(VALUE fname, VALUE dname, int abs_mode, VALUE result)
dirlen = strlen(dir);
BUFCHECK(dirlen > buflen);
strcpy(buf, dir);
- xfree(dir);
- SET_EXTERNAL_ENCODING();
+ free(dir);
}
#if defined DOSISH || defined __CYGWIN__
if (isdirsep(*s)) {
@@ -2808,16 +2646,12 @@ file_expand_path(VALUE fname, VALUE dname, int abs_mode, VALUE result)
p = buf + (s - b);
BUFCHECK(bdiff >= buflen);
memset(buf, '/', p - buf);
- rb_enc_copy(result, fname);
}
if (p > buf && p[-1] == '/')
--p;
- else {
- BUFCHECK(bdiff + 1 >= buflen);
+ else
*p = '/';
- }
- BUFCHECK(bdiff + 1 >= buflen);
p[1] = 0;
root = skipprefix(buf);
@@ -2845,7 +2679,7 @@ file_expand_path(VALUE fname, VALUE dname, int abs_mode, VALUE result)
}
#if USE_NTFS
else {
- do ++s; while (istrailinggarbage(*s));
+ do *++s; while (istrailinggabage(*s));
}
#endif
break;
@@ -2865,7 +2699,7 @@ file_expand_path(VALUE fname, VALUE dname, int abs_mode, VALUE result)
--s;
case ' ': {
const char *e = s;
- while (istrailinggarbage(*s)) s++;
+ while (istrailinggabage(*s)) s++;
if (!*s) {
s = e;
goto endpath;
@@ -2896,18 +2730,12 @@ file_expand_path(VALUE fname, VALUE dname, int abs_mode, VALUE result)
if (s > b) {
#if USE_NTFS
- static const char prime[] = ":$DATA";
- enum {prime_len = sizeof(prime) -1};
endpath:
- if (s > b + prime_len && strncasecmp(s - prime_len, prime, prime_len) == 0) {
+ if (s > b + 6 && strncasecmp(s - 6, ":$DATA", 6) == 0) {
/* alias of stream */
/* get rid of a bug of x64 VC++ */
- if (*(s - (prime_len+1)) == ':') {
- s -= prime_len + 1; /* prime */
- }
- else if (memchr(b, ':', s - prime_len - b)) {
- s -= prime_len; /* alternative */
- }
+ if (*(s-7) == ':') s -= 7; /* prime */
+ else if (memchr(b, ':', s - 6 - b)) s -= 6; /* alternative */
}
#endif
BUFCHECK(bdiff + (s-b) >= buflen);
@@ -2916,7 +2744,7 @@ file_expand_path(VALUE fname, VALUE dname, int abs_mode, VALUE result)
}
if (p == skiproot(buf) - 1) p++;
-#if USE_NTFS && defined __WIN32__
+#if USE_NTFS
*p = '\0';
if ((s = strrdirsep(b = buf)) != 0 && !strpbrk(s, "*?")) {
size_t len;
@@ -2937,7 +2765,7 @@ file_expand_path(VALUE fname, VALUE dname, int abs_mode, VALUE result)
*p = '\\';
strlcat(w32buf, p, sizeof(w32buf));
len = strlen(p);
- if (len > 4 && STRCASECMP(p + len - 4, ".lnk") != 0) {
+ if (len > 4 && strcasecmp(p + len - 4, ".lnk") != 0) {
lnk_added = 1;
strlcat(w32buf, ".lnk", sizeof(w32buf));
}
@@ -2950,7 +2778,7 @@ file_expand_path(VALUE fname, VALUE dname, int abs_mode, VALUE result)
len = strlen(wfd.cFileName);
#ifdef __CYGWIN__
if (lnk_added && len > 4 &&
- STRCASECMP(wfd.cFileName + len - 4, ".lnk") == 0) {
+ strcasecmp(wfd.cFileName + len - 4, ".lnk") == 0) {
wfd.cFileName[len -= 4] = '\0';
}
#else
@@ -2971,20 +2799,20 @@ file_expand_path(VALUE fname, VALUE dname, int abs_mode, VALUE result)
if (tainted) OBJ_TAINT(result);
rb_str_set_len(result, p - buf);
- rb_enc_check(fname, result);
return result;
}
VALUE
-rb_file_expand_path(VALUE fname, VALUE dname)
+rb_file_expand_path(fname, dname)
+ VALUE fname, dname;
{
- return file_expand_path(fname, dname, 0, rb_usascii_str_new(0, MAXPATHLEN + 2));
+ return file_expand_path(fname, dname, rb_str_new(0, MAXPATHLEN + 2));
}
/*
* call-seq:
* File.expand_path(file_name [, dir_string] ) -> abs_file_name
- *
+ *
* Converts a pathname to an absolute pathname. Relative paths are
* referenced from the current working directory of the process unless
* <i>dir_string</i> is given, in which case it will be used as the
@@ -2993,13 +2821,15 @@ rb_file_expand_path(VALUE fname, VALUE dname)
* directory (the environment variable <code>HOME</code> must be set
* correctly). ``<code>~</code><i>user</i>'' expands to the named
* user's home directory.
- *
+ *
* File.expand_path("~oracle/bin") #=> "/home/oracle/bin"
* File.expand_path("../../bin", "/tmp/x") #=> "/bin"
*/
VALUE
-rb_file_s_expand_path(int argc, VALUE *argv)
+rb_file_s_expand_path(argc, argv)
+ int argc;
+ VALUE *argv;
{
VALUE fname, dname;
@@ -3011,54 +2841,21 @@ rb_file_s_expand_path(int argc, VALUE *argv)
return rb_file_expand_path(fname, dname);
}
-VALUE
-rb_file_absolute_path(VALUE fname, VALUE dname)
-{
- return file_expand_path(fname, dname, 1, rb_usascii_str_new(0, MAXPATHLEN + 2));
-}
-
-/*
- * call-seq:
- * File.absolute_path(file_name [, dir_string] ) -> abs_file_name
- *
- * Converts a pathname to an absolute pathname. Relative paths are
- * referenced from the current working directory of the process unless
- * <i>dir_string</i> is given, in which case it will be used as the
- * starting point. If the given pathname starts with a ``<code>~</code>''
- * it is NOT expanded, it is treated as a normal directory name.
- *
- * File.absolute_path("~oracle/bin") #=> "<relative_path>/~oracle/bin"
- */
-
-VALUE
-rb_file_s_absolute_path(int argc, VALUE *argv)
-{
- VALUE fname, dname;
-
- if (argc == 1) {
- return rb_file_absolute_path(argv[0], Qnil);
- }
- rb_scan_args(argc, argv, "11", &fname, &dname);
-
- return rb_file_absolute_path(fname, dname);
-}
-
-static size_t
-rmext(const char *p, long l1, const char *e)
+static int
+rmext(p, l1, e)
+ const char *p, *e;
+ int l1;
{
- long l0, l2;
+ int l2;
if (!e) return 0;
- for (l0 = 0; l0 < l1; ++l0) {
- if (p[l0] != '.') break;
- }
l2 = strlen(e);
if (l2 == 2 && e[1] == '*') {
unsigned char c = *e;
e = p + l1;
do {
- if (e <= p + l0) return 0;
+ if (e <= p) return 0;
} while (*--e != c);
return e - p;
}
@@ -3078,33 +2875,35 @@ rmext(const char *p, long l1, const char *e)
/*
* call-seq:
* File.basename(file_name [, suffix] ) -> base_name
- *
+ *
* Returns the last component of the filename given in <i>file_name</i>,
* which must be formed using forward slashes (``<code>/</code>'')
* regardless of the separator used on the local file system. If
* <i>suffix</i> is given and present at the end of <i>file_name</i>,
* it is removed.
- *
+ *
* File.basename("/home/gumby/work/ruby.rb") #=> "ruby.rb"
* File.basename("/home/gumby/work/ruby.rb", ".rb") #=> "ruby"
*/
static VALUE
-rb_file_s_basename(int argc, VALUE *argv)
+rb_file_s_basename(argc, argv)
+ int argc;
+ VALUE *argv;
{
VALUE fname, fext, basename;
const char *name, *p;
#if defined DOSISH_DRIVE_LETTER || defined DOSISH_UNC
const char *root;
#endif
- long f, n;
+ int f, n;
if (rb_scan_args(argc, argv, "11", &fname, &fext) == 2) {
StringValue(fext);
}
- FilePathStringValue(fname);
- if (RSTRING_LEN(fname) == 0 || !*(name = RSTRING_PTR(fname)))
- return rb_str_new_shared(fname);
+ StringValue(fname);
+ if (RSTRING(fname)->len == 0 || !*(name = RSTRING(fname)->ptr))
+ return fname;
name = skipprefix(name);
#if defined DOSISH_DRIVE_LETTER || defined DOSISH_UNC
root = name;
@@ -3146,10 +2945,9 @@ rb_file_s_basename(int argc, VALUE *argv)
if (NIL_P(fext) || !(f = rmext(p, n, StringValueCStr(fext)))) {
f = n;
}
- if (f == RSTRING_LEN(fname)) return rb_str_new_shared(fname);
+ if (f == RSTRING_LEN(fname)) return fname;
}
basename = rb_str_new(p, f);
- rb_enc_copy(basename, fname);
OBJ_INFECT(basename, fname);
return basename;
}
@@ -3157,22 +2955,22 @@ rb_file_s_basename(int argc, VALUE *argv)
/*
* call-seq:
* File.dirname(file_name ) -> dir_name
- *
+ *
* Returns all components of the filename given in <i>file_name</i>
* except the last one. The filename must be formed using forward
* slashes (``<code>/</code>'') regardless of the separator used on the
* local file system.
- *
+ *
* File.dirname("/home/gumby/work/ruby.rb") #=> "/home/gumby/work"
*/
static VALUE
-rb_file_s_dirname(VALUE klass, VALUE fname)
+rb_file_s_dirname(klass, fname)
+ VALUE klass, fname;
{
const char *name, *root, *p;
VALUE dirname;
- FilePathStringValue(fname);
name = StringValueCStr(fname);
root = skiproot(name);
#ifdef DOSISH_UNC
@@ -3187,7 +2985,7 @@ rb_file_s_dirname(VALUE klass, VALUE fname)
p = root;
}
if (p == name)
- return rb_usascii_str_new2(".");
+ return rb_str_new2(".");
#ifdef DOSISH_DRIVE_LETTER
if (has_drive_letter(name) && isdirsep(*(name + 2))) {
const char *top = skiproot(name + 2);
@@ -3201,7 +2999,6 @@ rb_file_s_dirname(VALUE klass, VALUE fname)
if (has_drive_letter(name) && root == name + 2 && p - name == 2)
rb_str_cat(dirname, ".", 1);
#endif
- rb_enc_copy(dirname, fname);
OBJ_INFECT(dirname, fname);
return dirname;
}
@@ -3209,24 +3006,24 @@ rb_file_s_dirname(VALUE klass, VALUE fname)
/*
* call-seq:
* File.extname(path) -> string
- *
+ *
* Returns the extension (the portion of file name in <i>path</i>
* after the period).
- *
+ *
* File.extname("test.rb") #=> ".rb"
* File.extname("a/b/d/test.rb") #=> ".rb"
* File.extname("test") #=> ""
* File.extname(".profile") #=> ""
- *
+ *
*/
static VALUE
-rb_file_s_extname(VALUE klass, VALUE fname)
+rb_file_s_extname(klass, fname)
+ VALUE klass, fname;
{
const char *name, *p, *e;
VALUE extname;
- FilePathStringValue(fname);
name = StringValueCStr(fname);
p = strrdirsep(name); /* get the last path component */
if (!p)
@@ -3235,12 +3032,11 @@ rb_file_s_extname(VALUE klass, VALUE fname)
name = ++p;
e = 0;
- while (*p && *p == '.') p++;
while (*p) {
- if (*p == '.' || istrailinggarbage(*p)) {
+ if (*p == '.' || istrailinggabage(*p)) {
#if USE_NTFS
const char *last = p++, *dot = last;
- while (istrailinggarbage(*p)) {
+ while (istrailinggabage(*p)) {
if (*p == '.') dot = p;
p++;
}
@@ -3248,7 +3044,7 @@ rb_file_s_extname(VALUE klass, VALUE fname)
p = last;
break;
}
- if (*last == '.' || dot > last) e = dot;
+ e = dot;
continue;
#else
e = p; /* get the last dot of the last component */
@@ -3266,196 +3062,185 @@ rb_file_s_extname(VALUE klass, VALUE fname)
if (!e || e == name || e+1 == p) /* no dot, or the only dot is first or end? */
return rb_str_new(0, 0);
extname = rb_str_new(e, p - e); /* keep the dot, too! */
- rb_enc_copy(extname, fname);
OBJ_INFECT(extname, fname);
return extname;
}
/*
* call-seq:
- * File.path(path) -> string
- *
- * Returns the string representation of the path
- *
- * File.path("/dev/null") #=> "/dev/null"
- * File.path(Pathname.new("/tmp")) #=> "/tmp"
- *
- */
-
-static VALUE
-rb_file_s_path(VALUE klass, VALUE fname)
-{
- return rb_get_path(fname);
-}
-
-/*
- * call-seq:
* File.split(file_name) => array
- *
+ *
* Splits the given string into a directory and a file component and
* returns them in a two-element array. See also
* <code>File::dirname</code> and <code>File::basename</code>.
- *
+ *
* File.split("/home/gumby/.profile") #=> ["/home/gumby", ".profile"]
*/
static VALUE
-rb_file_s_split(VALUE klass, VALUE path)
+rb_file_s_split(klass, path)
+ VALUE klass, path;
{
- FilePathStringValue(path); /* get rid of converting twice */
+ StringValue(path); /* get rid of converting twice */
return rb_assoc_new(rb_file_s_dirname(Qnil, path), rb_file_s_basename(1,&path));
}
static VALUE separator;
-static VALUE rb_file_join(VALUE ary, VALUE sep);
+static VALUE rb_file_join _((VALUE ary, VALUE sep));
static VALUE
-file_inspect_join(VALUE ary, VALUE argp, int recur)
+file_inspect_join(ary, arg)
+ VALUE ary;
+ VALUE *arg;
{
- VALUE *arg = (VALUE *)argp;
- if (recur || ary == arg[0]) rb_raise(rb_eArgError, "recursive array");
return rb_file_join(arg[0], arg[1]);
}
static VALUE
-rb_file_join(VALUE ary, VALUE sep)
+rb_file_join(ary, sep)
+ VALUE ary, sep;
{
long len, i;
+ int taint = 0;
VALUE result, tmp;
const char *name, *tail;
- if (RARRAY_LEN(ary) == 0) return rb_str_new(0, 0);
+ if (RARRAY(ary)->len == 0) return rb_str_new(0, 0);
+ if (OBJ_TAINTED(ary)) taint = 1;
+ if (OBJ_TAINTED(sep)) taint = 1;
len = 1;
- for (i=0; i<RARRAY_LEN(ary); i++) {
- if (TYPE(RARRAY_PTR(ary)[i]) == T_STRING) {
- len += RSTRING_LEN(RARRAY_PTR(ary)[i]);
+ for (i=0; i<RARRAY(ary)->len; i++) {
+ if (TYPE(RARRAY(ary)->ptr[i]) == T_STRING) {
+ len += RSTRING(RARRAY(ary)->ptr[i])->len;
}
else {
len += 10;
}
}
- if (!NIL_P(sep)) {
- StringValue(sep);
- len += RSTRING_LEN(sep) * RARRAY_LEN(ary) - 1;
+ if (!NIL_P(sep) && TYPE(sep) == T_STRING) {
+ len += RSTRING(sep)->len * RARRAY(ary)->len - 1;
}
result = rb_str_buf_new(len);
- OBJ_INFECT(result, ary);
- for (i=0; i<RARRAY_LEN(ary); i++) {
- tmp = RARRAY_PTR(ary)[i];
+ for (i=0; i<RARRAY(ary)->len; i++) {
+ tmp = RARRAY(ary)->ptr[i];
switch (TYPE(tmp)) {
case T_STRING:
break;
case T_ARRAY:
- if (ary == tmp) {
- rb_raise(rb_eArgError, "recursive array");
+ if (rb_inspecting_p(tmp)) {
+ tmp = rb_str_new2("[...]");
}
else {
VALUE args[2];
args[0] = tmp;
args[1] = sep;
- tmp = rb_exec_recursive(file_inspect_join, ary, (VALUE)args);
+ tmp = rb_protect_inspect(file_inspect_join, ary, (VALUE)args);
}
break;
default:
- FilePathStringValue(tmp);
+ StringValueCStr(tmp);
}
name = StringValueCStr(result);
if (i > 0 && !NIL_P(sep)) {
tail = chompdirsep(name);
- if (RSTRING_PTR(tmp) && isdirsep(RSTRING_PTR(tmp)[0])) {
- rb_str_set_len(result, tail - name);
+ if (RSTRING(tmp)->ptr && isdirsep(RSTRING(tmp)->ptr[0])) {
+ RSTRING(result)->len = tail - name;
}
else if (!*tail) {
rb_str_buf_append(result, sep);
}
}
rb_str_buf_append(result, tmp);
+ if (OBJ_TAINTED(tmp)) taint = 1;
}
+ if (taint) OBJ_TAINT(result);
return result;
}
/*
* call-seq:
* File.join(string, ...) -> path
- *
+ *
* Returns a new string formed by joining the strings using
* <code>File::SEPARATOR</code>.
- *
+ *
* File.join("usr", "mail", "gumby") #=> "usr/mail/gumby"
- *
+ *
*/
static VALUE
-rb_file_s_join(VALUE klass, VALUE args)
+rb_file_s_join(klass, args)
+ VALUE klass, args;
{
return rb_file_join(args, separator);
}
-#if defined(HAVE_TRUNCATE) || defined(HAVE_CHSIZE)
/*
* call-seq:
* File.truncate(file_name, integer) => 0
- *
+ *
* Truncates the file <i>file_name</i> to be at most <i>integer</i>
* bytes long. Not available on all platforms.
- *
+ *
* f = File.new("out", "w")
* f.write("1234567890") #=> 10
* f.close #=> nil
* File.truncate("out", 5) #=> 0
* File.size("out") #=> 5
- *
+ *
*/
static VALUE
-rb_file_s_truncate(VALUE klass, VALUE path, VALUE len)
+rb_file_s_truncate(klass, path, len)
+ VALUE klass, path, len;
{
off_t pos;
rb_secure(2);
pos = NUM2OFFT(len);
- FilePathValue(path);
+ SafeStringValue(path);
+
#ifdef HAVE_TRUNCATE
if (truncate(StringValueCStr(path), pos) < 0)
- rb_sys_fail(RSTRING_PTR(path));
-#else /* defined(HAVE_CHSIZE) */
+ rb_sys_fail(RSTRING(path)->ptr);
+#else
+# ifdef HAVE_CHSIZE
{
int tmpfd;
# ifdef _WIN32
if ((tmpfd = open(StringValueCStr(path), O_RDWR)) < 0) {
- rb_sys_fail(RSTRING_PTR(path));
+ rb_sys_fail(RSTRING(path)->ptr);
}
# else
if ((tmpfd = open(StringValueCStr(path), 0)) < 0) {
- rb_sys_fail(RSTRING_PTR(path));
+ rb_sys_fail(RSTRING(path)->ptr);
}
# endif
if (chsize(tmpfd, pos) < 0) {
close(tmpfd);
- rb_sys_fail(RSTRING_PTR(path));
+ rb_sys_fail(RSTRING(path)->ptr);
}
close(tmpfd);
}
+# else
+ rb_notimplement();
+# endif
#endif
return INT2FIX(0);
}
-#else
-#define rb_file_s_truncate rb_f_notimplement
-#endif
-#if defined(HAVE_FTRUNCATE) || defined(HAVE_CHSIZE)
/*
* call-seq:
* file.truncate(integer) => 0
- *
+ *
* Truncates <i>file</i> to at most <i>integer</i> bytes. The file
* must be opened for writing. Not available on all platforms.
- *
+ *
* f = File.new("out", "w")
* f.syswrite("1234567890") #=> 10
* f.truncate(5) #=> 0
@@ -3464,9 +3249,11 @@ rb_file_s_truncate(VALUE klass, VALUE path, VALUE len)
*/
static VALUE
-rb_file_truncate(VALUE obj, VALUE len)
+rb_file_truncate(obj, len)
+ VALUE obj, len;
{
rb_io_t *fptr;
+ FILE *f;
off_t pos;
rb_secure(2);
@@ -3475,19 +3262,22 @@ rb_file_truncate(VALUE obj, VALUE len)
if (!(fptr->mode & FMODE_WRITABLE)) {
rb_raise(rb_eIOError, "not opened for writing");
}
- rb_io_flush(obj);
+ f = GetWriteFile(fptr);
+ fflush(f);
+ fseeko(f, (off_t)0, SEEK_CUR);
#ifdef HAVE_FTRUNCATE
- if (ftruncate(fptr->fd, pos) < 0)
- rb_sys_fail_path(fptr->pathv);
-#else /* defined(HAVE_CHSIZE) */
- if (chsize(fptr->fd, pos) < 0)
- rb_sys_fail(fptr->pathv);
+ if (ftruncate(fileno(f), pos) < 0)
+ rb_sys_fail(fptr->path);
+#else
+# ifdef HAVE_CHSIZE
+ if (chsize(fileno(f), pos) < 0)
+ rb_sys_fail(fptr->path);
+# else
+ rb_notimplement();
+# endif
#endif
return INT2FIX(0);
}
-#else
-#define rb_file_truncate rb_f_notimplement
-#endif
# ifndef LOCK_SH
# define LOCK_SH 1
@@ -3505,35 +3295,65 @@ rb_file_truncate(VALUE obj, VALUE len)
#ifdef __CYGWIN__
#include <winerror.h>
extern unsigned long __attribute__((stdcall)) GetLastError(void);
-#endif
-static VALUE
-rb_thread_flock(void *data)
+static int
+cygwin_flock(int fd, int op)
{
-#ifdef __CYGWIN__
int old_errno = errno;
-#endif
- int *op = data, ret = flock(op[0], op[1]);
-
-#ifdef __CYGWIN__
+ int ret = flock(fd, op);
if (GetLastError() == ERROR_NOT_LOCKED) {
ret = 0;
errno = old_errno;
}
+ return ret;
+}
+# define flock(fd, op) cygwin_flock(fd, op)
#endif
- return (VALUE)ret;
+
+static int
+rb_thread_flock(fd, op, fptr)
+ int fd, op;
+ rb_io_t *fptr;
+{
+ if (rb_thread_alone() || (op & LOCK_NB)) {
+ int ret;
+ TRAP_BEG;
+ ret = flock(fd, op);
+ TRAP_END;
+ return ret;
+ }
+ op |= LOCK_NB;
+ while (flock(fd, op) < 0) {
+ switch (errno) {
+ case EAGAIN:
+ case EACCES:
+#if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
+ case EWOULDBLOCK:
+#endif
+ rb_thread_polling(); /* busy wait */
+ rb_io_check_closed(fptr);
+ continue;
+ default:
+ return -1;
+ }
+ }
+ return 0;
}
+#ifdef __CYGWIN__
+# undef flock
+#endif
+#define flock(fd, op) rb_thread_flock(fd, op, fptr)
/*
* call-seq:
* file.flock (locking_constant ) => 0 or false
- *
+ *
* Locks or unlocks a file according to <i>locking_constant</i> (a
* logical <em>or</em> of the values in the table below).
* Returns <code>false</code> if <code>File::LOCK_NB</code> is
* specified and the operation would otherwise have blocked. Not
* available on all platforms.
- *
+ *
* Locking constants (in class File):
*
* LOCK_EX | Exclusive lock. Only one process may hold an
@@ -3549,78 +3369,62 @@ rb_thread_flock(void *data)
*
* Example:
*
- * # update a counter using write lock
- * # don't use "w" because it truncates the file before lock.
- * File.open("counter", File::RDWR|File::CREAT, 0644) {|f|
- * f.flock(File::LOCK_EX)
- * value = f.read.to_i + 1
- * f.rewind
- * f.write("#{value}\n")
- * f.flush
- * f.truncate(f.pos)
- * }
- *
- * # read the counter using read lock
- * File.open("counter", "r") {|f|
- * f.flock(File::LOCK_SH)
- * p f.read
- * }
- *
+ * File.new("testfile").flock(File::LOCK_UN) #=> 0
+ *
*/
static VALUE
-rb_file_flock(VALUE obj, VALUE operation)
+rb_file_flock(obj, operation)
+ VALUE obj;
+ VALUE operation;
{
+#ifndef __CHECKER__
rb_io_t *fptr;
- int op[2], op1;
+ int op;
rb_secure(2);
- op[1] = op1 = NUM2INT(operation);
+ op = NUM2INT(operation);
GetOpenFile(obj, fptr);
- op[0] = fptr->fd;
if (fptr->mode & FMODE_WRITABLE) {
- rb_io_flush(obj);
+ fflush(GetWriteFile(fptr));
}
- while ((int)rb_thread_blocking_region(rb_thread_flock, op, RUBY_UBF_IO, 0) < 0) {
+ retry:
+ if (flock(fileno(fptr->f), op) < 0) {
switch (errno) {
case EAGAIN:
case EACCES:
#if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
case EWOULDBLOCK:
#endif
- if (op1 & LOCK_NB) return Qfalse;
- rb_thread_polling();
- rb_io_check_closed(fptr);
- continue;
-
+ return Qfalse;
case EINTR:
#if defined(ERESTART)
case ERESTART:
#endif
- break;
-
- default:
- rb_sys_fail_path(fptr->pathv);
+ goto retry;
}
+ rb_sys_fail(fptr->path);
}
+#endif
return INT2FIX(0);
}
#undef flock
static void
-test_check(int n, int argc, VALUE *argv)
+test_check(n, argc, argv)
+ int n, argc;
+ VALUE *argv;
{
int i;
- rb_secure(2);
n+=1;
if (n != argc) rb_raise(rb_eArgError, "wrong number of arguments (%d for %d)", argc, n);
for (i=1; i<n; i++) {
switch (TYPE(argv[i])) {
case T_STRING:
default:
- FilePathValue(argv[i]);
+ SafeStringValue(argv[i]);
break;
case T_FILE:
break;
@@ -3633,11 +3437,11 @@ test_check(int n, int argc, VALUE *argv)
/*
* call-seq:
* test(int_cmd, file1 [, file2] ) => obj
- *
+ *
* Uses the integer <i>aCmd</i> to perform various tests on
* <i>file1</i> (first table below) or on <i>file1</i> and
* <i>file2</i> (second table).
- *
+ *
* File tests on a single file:
*
* Test Returns Meaning
@@ -3655,7 +3459,7 @@ test_check(int n, int argc, VALUE *argv)
* ?k | boolean | True if file1 exists and has the sticky bit set
* ?l | boolean | True if file1 exists and is a symbolic link
* ?M | Time | Last modification time for file1
- * ?o | boolean | True if file1 exists and is owned by
+ * ?o | boolean | True if file1 exists and is owned by
* | | the caller's effective uid
* ?O | boolean | True if file1 exists and is owned by
* | | the caller's real uid
@@ -3690,108 +3494,113 @@ test_check(int n, int argc, VALUE *argv)
*/
static VALUE
-rb_f_test(int argc, VALUE *argv)
+rb_f_test(argc, argv)
+ int argc;
+ VALUE *argv;
{
int cmd;
if (argc == 0) rb_raise(rb_eArgError, "wrong number of arguments");
+#if 0 /* 1.7 behavior? */
+ if (argc == 1) {
+ return RTEST(argv[0]) ? Qtrue : Qfalse;
+ }
+#endif
cmd = NUM2CHR(argv[0]);
- if (cmd == 0) goto unknown;
+ if (cmd == 0) return Qfalse;
if (strchr("bcdefgGkloOprRsSuwWxXz", cmd)) {
CHECK(1);
switch (cmd) {
case 'b':
- return rb_file_blockdev_p(0, argv[1]);
+ return test_b(0, argv[1]);
case 'c':
- return rb_file_chardev_p(0, argv[1]);
+ return test_c(0, argv[1]);
case 'd':
- return rb_file_directory_p(0, argv[1]);
+ return test_d(0, argv[1]);
case 'a':
case 'e':
- return rb_file_exist_p(0, argv[1]);
+ return test_e(0, argv[1]);
case 'f':
- return rb_file_file_p(0, argv[1]);
+ return test_f(0, argv[1]);
case 'g':
- return rb_file_sgid_p(0, argv[1]);
+ return test_sgid(0, argv[1]);
case 'G':
- return rb_file_grpowned_p(0, argv[1]);
+ return test_grpowned(0, argv[1]);
case 'k':
- return rb_file_sticky_p(0, argv[1]);
+ return test_sticky(0, argv[1]);
case 'l':
- return rb_file_symlink_p(0, argv[1]);
+ return test_l(0, argv[1]);
case 'o':
- return rb_file_owned_p(0, argv[1]);
+ return test_owned(0, argv[1]);
case 'O':
- return rb_file_rowned_p(0, argv[1]);
+ return test_rowned(0, argv[1]);
case 'p':
- return rb_file_pipe_p(0, argv[1]);
+ return test_p(0, argv[1]);
case 'r':
- return rb_file_readable_p(0, argv[1]);
+ return test_r(0, argv[1]);
case 'R':
- return rb_file_readable_real_p(0, argv[1]);
+ return test_R(0, argv[1]);
case 's':
- return rb_file_size_p(0, argv[1]);
+ return test_s(0, argv[1]);
case 'S':
- return rb_file_socket_p(0, argv[1]);
+ return test_S(0, argv[1]);
case 'u':
- return rb_file_suid_p(0, argv[1]);
+ return test_suid(0, argv[1]);
case 'w':
- return rb_file_writable_p(0, argv[1]);
+ return test_w(0, argv[1]);
case 'W':
- return rb_file_world_writable_p(0, argv[1]);
+ return test_W(0, argv[1]);
case 'x':
- return rb_file_executable_p(0, argv[1]);
+ return test_x(0, argv[1]);
case 'X':
- return rb_file_executable_real_p(0, argv[1]);
+ return test_X(0, argv[1]);
case 'z':
- return rb_file_zero_p(0, argv[1]);
+ return test_z(0, argv[1]);
}
}
if (strchr("MAC", cmd)) {
struct stat st;
- VALUE fname = argv[1];
CHECK(1);
- if (rb_stat(fname, &st) == -1) {
- FilePathValue(fname);
- rb_sys_fail(RSTRING_PTR(fname));
+ if (rb_stat(argv[1], &st) == -1) {
+ rb_sys_fail(RSTRING(argv[1])->ptr);
}
switch (cmd) {
case 'A':
- return stat_atime(&st);
+ return rb_time_new(st.st_atime, 0);
case 'M':
- return stat_mtime(&st);
+ return rb_time_new(st.st_mtime, 0);
case 'C':
- return stat_ctime(&st);
+ return rb_time_new(st.st_ctime, 0);
}
}
if (cmd == '-') {
CHECK(2);
- return rb_file_identical_p(0, argv[1], argv[2]);
+ return test_identical(0, argv[1], argv[2]);
}
if (strchr("=<>", cmd)) {
@@ -3815,18 +3624,13 @@ rb_f_test(int argc, VALUE *argv)
return Qfalse;
}
}
- unknown:
/* unknown command */
- if (ISPRINT(cmd)) {
- rb_raise(rb_eArgError, "unknown command ?%c", cmd);
- }
- else {
- rb_raise(rb_eArgError, "unknown command ?\\x%02X", cmd);
- }
+ rb_raise(rb_eArgError, "unknown command ?%c", cmd);
return Qnil; /* not reached */
}
+
/*
* Document-class: File::Stat
*
@@ -3841,8 +3645,10 @@ rb_f_test(int argc, VALUE *argv)
* meaningful on all systems. See also <code>Kernel#test</code>.
*/
+static VALUE rb_stat_s_alloc _((VALUE));
static VALUE
-rb_stat_s_alloc(VALUE klass)
+rb_stat_s_alloc(klass)
+ VALUE klass;
{
return stat_new_0(klass, 0);
}
@@ -3857,17 +3663,18 @@ rb_stat_s_alloc(VALUE klass)
*/
static VALUE
-rb_stat_init(VALUE obj, VALUE fname)
+rb_stat_init(obj, fname)
+ VALUE obj, fname;
{
struct stat st, *nst;
- rb_secure(2);
- FilePathValue(fname);
+ SafeStringValue(fname);
+
if (stat(StringValueCStr(fname), &st) == -1) {
- rb_sys_fail(RSTRING_PTR(fname));
+ rb_sys_fail(RSTRING(fname)->ptr);
}
if (DATA_PTR(obj)) {
- xfree(DATA_PTR(obj));
+ free(DATA_PTR(obj));
DATA_PTR(obj) = NULL;
}
nst = ALLOC(struct stat);
@@ -3879,7 +3686,8 @@ rb_stat_init(VALUE obj, VALUE fname)
/* :nodoc: */
static VALUE
-rb_stat_init_copy(VALUE copy, VALUE orig)
+rb_stat_init_copy(copy, orig)
+ VALUE copy, orig;
{
struct stat *nst;
@@ -3890,7 +3698,7 @@ rb_stat_init_copy(VALUE copy, VALUE orig)
rb_raise(rb_eTypeError, "wrong argument class");
}
if (DATA_PTR(copy)) {
- xfree(DATA_PTR(copy));
+ free(DATA_PTR(copy));
DATA_PTR(copy) = 0;
}
if (DATA_PTR(orig)) {
@@ -3905,19 +3713,20 @@ rb_stat_init_copy(VALUE copy, VALUE orig)
/*
* call-seq:
* stat.ftype => string
- *
+ *
* Identifies the type of <i>stat</i>. The return string is one of:
* ``<code>file</code>'', ``<code>directory</code>'',
* ``<code>characterSpecial</code>'', ``<code>blockSpecial</code>'',
* ``<code>fifo</code>'', ``<code>link</code>'',
* ``<code>socket</code>'', or ``<code>unknown</code>''.
- *
+ *
* File.stat("/dev/tty").ftype #=> "characterSpecial"
- *
+ *
*/
static VALUE
-rb_stat_ftype(VALUE obj)
+rb_stat_ftype(obj)
+ VALUE obj;
{
return rb_file_ftype(get_stat(obj));
}
@@ -3925,16 +3734,17 @@ rb_stat_ftype(VALUE obj)
/*
* call-seq:
* stat.directory? => true or false
- *
+ *
* Returns <code>true</code> if <i>stat</i> is a directory,
* <code>false</code> otherwise.
- *
+ *
* File.stat("testfile").directory? #=> false
* File.stat(".").directory? #=> true
*/
static VALUE
-rb_stat_d(VALUE obj)
+rb_stat_d(obj)
+ VALUE obj;
{
if (S_ISDIR(get_stat(obj)->st_mode)) return Qtrue;
return Qfalse;
@@ -3943,13 +3753,14 @@ rb_stat_d(VALUE obj)
/*
* call-seq:
* stat.pipe? => true or false
- *
+ *
* Returns <code>true</code> if the operating system supports pipes and
* <i>stat</i> is a pipe; <code>false</code> otherwise.
*/
static VALUE
-rb_stat_p(VALUE obj)
+rb_stat_p(obj)
+ VALUE obj;
{
#ifdef S_IFIFO
if (S_ISFIFO(get_stat(obj)->st_mode)) return Qtrue;
@@ -3961,22 +3772,23 @@ rb_stat_p(VALUE obj)
/*
* call-seq:
* stat.symlink? => true or false
- *
+ *
* Returns <code>true</code> if <i>stat</i> is a symbolic link,
* <code>false</code> if it isn't or if the operating system doesn't
* support this feature. As <code>File::stat</code> automatically
* follows symbolic links, <code>symlink?</code> will always be
* <code>false</code> for an object returned by
* <code>File::stat</code>.
- *
+ *
* File.symlink("testfile", "alink") #=> 0
* File.stat("alink").symlink? #=> false
* File.lstat("alink").symlink? #=> true
- *
+ *
*/
static VALUE
-rb_stat_l(VALUE obj)
+rb_stat_l(obj)
+ VALUE obj;
{
#ifdef S_ISLNK
if (S_ISLNK(get_stat(obj)->st_mode)) return Qtrue;
@@ -3987,17 +3799,18 @@ rb_stat_l(VALUE obj)
/*
* call-seq:
* stat.socket? => true or false
- *
+ *
* Returns <code>true</code> if <i>stat</i> is a socket,
* <code>false</code> if it isn't or if the operating system doesn't
* support this feature.
- *
+ *
* File.stat("testfile").socket? #=> false
- *
+ *
*/
static VALUE
-rb_stat_S(VALUE obj)
+rb_stat_S(obj)
+ VALUE obj;
{
#ifdef S_ISSOCK
if (S_ISSOCK(get_stat(obj)->st_mode)) return Qtrue;
@@ -4009,18 +3822,19 @@ rb_stat_S(VALUE obj)
/*
* call-seq:
* stat.blockdev? => true or false
- *
+ *
* Returns <code>true</code> if the file is a block device,
* <code>false</code> if it isn't or if the operating system doesn't
* support this feature.
- *
+ *
* File.stat("testfile").blockdev? #=> false
* File.stat("/dev/hda1").blockdev? #=> true
- *
+ *
*/
static VALUE
-rb_stat_b(VALUE obj)
+rb_stat_b(obj)
+ VALUE obj;
{
#ifdef S_ISBLK
if (S_ISBLK(get_stat(obj)->st_mode)) return Qtrue;
@@ -4032,17 +3846,18 @@ rb_stat_b(VALUE obj)
/*
* call-seq:
* stat.chardev? => true or false
- *
+ *
* Returns <code>true</code> if the file is a character device,
* <code>false</code> if it isn't or if the operating system doesn't
* support this feature.
- *
+ *
* File.stat("/dev/tty").chardev? #=> true
- *
+ *
*/
static VALUE
-rb_stat_c(VALUE obj)
+rb_stat_c(obj)
+ VALUE obj;
{
if (S_ISCHR(get_stat(obj)->st_mode)) return Qtrue;
@@ -4052,24 +3867,26 @@ rb_stat_c(VALUE obj)
/*
* call-seq:
* stat.owned? => true or false
- *
+ *
* Returns <code>true</code> if the effective user id of the process is
* the same as the owner of <i>stat</i>.
- *
+ *
* File.stat("testfile").owned? #=> true
* File.stat("/etc/passwd").owned? #=> false
- *
+ *
*/
static VALUE
-rb_stat_owned(VALUE obj)
+rb_stat_owned(obj)
+ VALUE obj;
{
if (get_stat(obj)->st_uid == geteuid()) return Qtrue;
return Qfalse;
}
static VALUE
-rb_stat_rowned(VALUE obj)
+rb_stat_rowned(obj)
+ VALUE obj;
{
if (get_stat(obj)->st_uid == getuid()) return Qtrue;
return Qfalse;
@@ -4078,17 +3895,18 @@ rb_stat_rowned(VALUE obj)
/*
* call-seq:
* stat.grpowned? => true or false
- *
+ *
* Returns true if the effective group id of the process is the same as
* the group id of <i>stat</i>. On Windows NT, returns <code>false</code>.
- *
+ *
* File.stat("testfile").grpowned? #=> true
* File.stat("/etc/passwd").grpowned? #=> false
- *
+ *
*/
static VALUE
-rb_stat_grpowned(VALUE obj)
+rb_stat_grpowned(obj)
+ VALUE obj;
{
#ifndef _WIN32
if (group_member(get_stat(obj)->st_gid)) return Qtrue;
@@ -4099,16 +3917,17 @@ rb_stat_grpowned(VALUE obj)
/*
* call-seq:
* stat.readable? => true or false
- *
+ *
* Returns <code>true</code> if <i>stat</i> is readable by the
* effective user id of this process.
- *
+ *
* File.stat("testfile").readable? #=> true
- *
+ *
*/
static VALUE
-rb_stat_r(VALUE obj)
+rb_stat_r(obj)
+ VALUE obj;
{
struct stat *st = get_stat(obj);
@@ -4129,19 +3948,22 @@ rb_stat_r(VALUE obj)
return Qtrue;
}
+
+
/*
* call-seq:
* stat.readable_real? -> true or false
- *
+ *
* Returns <code>true</code> if <i>stat</i> is readable by the real
* user id of this process.
- *
+ *
* File.stat("testfile").readable_real? #=> true
- *
+ *
*/
static VALUE
-rb_stat_R(VALUE obj)
+rb_stat_R(obj)
+ VALUE obj;
{
struct stat *st = get_stat(obj);
@@ -4163,44 +3985,19 @@ rb_stat_R(VALUE obj)
}
/*
- * call-seq:
- * stat.world_readable? => fixnum or nil
- *
- * If <i>stat</i> is readable by others, returns an integer
- * representing the file permission bits of <i>stat</i>. Returns
- * <code>nil</code> otherwise. The meaning of the bits is platform
- * dependent; on Unix systems, see <code>stat(2)</code>.
- *
- * m = File.stat("/etc/passwd").world_readable? # => 420
- * sprintf("%o", m) # => "644"
- */
-
-static VALUE
-rb_stat_wr(VALUE obj)
-{
-#ifdef S_IROTH
- if ((get_stat(obj)->st_mode & (S_IROTH)) == S_IROTH) {
- return UINT2NUM(get_stat(obj)->st_mode & (S_IRUGO|S_IWUGO|S_IXUGO));
- }
- else {
- return Qnil;
- }
-#endif
-}
-
-/*
* call-seq:
* stat.writable? -> true or false
- *
+ *
* Returns <code>true</code> if <i>stat</i> is writable by the
* effective user id of this process.
- *
+ *
* File.stat("testfile").writable? #=> true
- *
+ *
*/
static VALUE
-rb_stat_w(VALUE obj)
+rb_stat_w(obj)
+ VALUE obj;
{
struct stat *st = get_stat(obj);
@@ -4224,16 +4021,17 @@ rb_stat_w(VALUE obj)
/*
* call-seq:
* stat.writable_real? -> true or false
- *
+ *
* Returns <code>true</code> if <i>stat</i> is writable by the real
* user id of this process.
- *
+ *
* File.stat("testfile").writable_real? #=> true
- *
+ *
*/
static VALUE
-rb_stat_W(VALUE obj)
+rb_stat_W(obj)
+ VALUE obj;
{
struct stat *st = get_stat(obj);
@@ -4255,46 +4053,21 @@ rb_stat_W(VALUE obj)
}
/*
- * call-seq:
- * stat.world_writable? => fixnum or nil
- *
- * If <i>stat</i> is writable by others, returns an integer
- * representing the file permission bits of <i>stat</i>. Returns
- * <code>nil</code> otherwise. The meaning of the bits is platform
- * dependent; on Unix systems, see <code>stat(2)</code>.
- *
- * m = File.stat("/tmp").world_writable? # => 511
- * sprintf("%o", m) # => "777"
- */
-
-static VALUE
-rb_stat_ww(VALUE obj)
-{
-#ifdef S_IROTH
- if ((get_stat(obj)->st_mode & (S_IWOTH)) == S_IWOTH) {
- return UINT2NUM(get_stat(obj)->st_mode & (S_IRUGO|S_IWUGO|S_IXUGO));
- }
- else {
- return Qnil;
- }
-#endif
-}
-
-/*
* call-seq:
* stat.executable? => true or false
- *
+ *
* Returns <code>true</code> if <i>stat</i> is executable or if the
* operating system doesn't distinguish executable files from
* nonexecutable files. The tests are made using the effective owner of
* the process.
- *
+ *
* File.stat("testfile").executable? #=> false
- *
+ *
*/
static VALUE
-rb_stat_x(VALUE obj)
+rb_stat_x(obj)
+ VALUE obj;
{
struct stat *st = get_stat(obj);
@@ -4320,13 +4093,15 @@ rb_stat_x(VALUE obj)
/*
* call-seq:
* stat.executable_real? => true or false
- *
+ *
* Same as <code>executable?</code>, but tests using the real owner of
* the process.
*/
+
static VALUE
-rb_stat_X(VALUE obj)
+rb_stat_X(obj)
+ VALUE obj;
{
struct stat *st = get_stat(obj);
@@ -4352,16 +4127,17 @@ rb_stat_X(VALUE obj)
/*
* call-seq:
* stat.file? => true or false
- *
+ *
* Returns <code>true</code> if <i>stat</i> is a regular file (not
* a device file, pipe, socket, etc.).
- *
+ *
* File.stat("testfile").file? #=> true
- *
+ *
*/
static VALUE
-rb_stat_f(VALUE obj)
+rb_stat_f(obj)
+ VALUE obj;
{
if (S_ISREG(get_stat(obj)->st_mode)) return Qtrue;
return Qfalse;
@@ -4370,33 +4146,36 @@ rb_stat_f(VALUE obj)
/*
* call-seq:
* stat.zero? => true or false
- *
+ *
* Returns <code>true</code> if <i>stat</i> is a zero-length file;
* <code>false</code> otherwise.
- *
+ *
* File.stat("testfile").zero? #=> false
- *
+ *
*/
static VALUE
-rb_stat_z(VALUE obj)
+rb_stat_z(obj)
+ VALUE obj;
{
if (get_stat(obj)->st_size == 0) return Qtrue;
return Qfalse;
}
+
/*
* call-seq:
* state.size => integer
- *
+ *
* Returns the size of <i>stat</i> in bytes.
- *
+ *
* File.stat("testfile").size #=> 66
- *
+ *
*/
static VALUE
-rb_stat_s(VALUE obj)
+rb_stat_s(obj)
+ VALUE obj;
{
off_t size = get_stat(obj)->st_size;
@@ -4407,16 +4186,17 @@ rb_stat_s(VALUE obj)
/*
* call-seq:
* stat.setuid? => true or false
- *
+ *
* Returns <code>true</code> if <i>stat</i> has the set-user-id
* permission bit set, <code>false</code> if it doesn't or if the
* operating system doesn't support this feature.
- *
+ *
* File.stat("/bin/su").setuid? #=> true
*/
static VALUE
-rb_stat_suid(VALUE obj)
+rb_stat_suid(obj)
+ VALUE obj;
{
#ifdef S_ISUID
if (get_stat(obj)->st_mode & S_ISUID) return Qtrue;
@@ -4427,17 +4207,18 @@ rb_stat_suid(VALUE obj)
/*
* call-seq:
* stat.setgid? => true or false
- *
+ *
* Returns <code>true</code> if <i>stat</i> has the set-group-id
* permission bit set, <code>false</code> if it doesn't or if the
* operating system doesn't support this feature.
- *
+ *
* File.stat("/usr/sbin/lpc").setgid? #=> true
- *
+ *
*/
static VALUE
-rb_stat_sgid(VALUE obj)
+rb_stat_sgid(obj)
+ VALUE obj;
{
#ifdef S_ISGID
if (get_stat(obj)->st_mode & S_ISGID) return Qtrue;
@@ -4448,17 +4229,18 @@ rb_stat_sgid(VALUE obj)
/*
* call-seq:
* stat.sticky? => true or false
- *
+ *
* Returns <code>true</code> if <i>stat</i> has its sticky bit set,
* <code>false</code> if it doesn't or if the operating system doesn't
* support this feature.
- *
+ *
* File.stat("testfile").sticky? #=> false
- *
+ *
*/
static VALUE
-rb_stat_sticky(VALUE obj)
+rb_stat_sticky(obj)
+ VALUE obj;
{
#ifdef S_ISVTX
if (get_stat(obj)->st_mode & S_ISVTX) return Qtrue;
@@ -4469,13 +4251,16 @@ rb_stat_sticky(VALUE obj)
VALUE rb_mFConst;
void
-rb_file_const(const char *name, VALUE value)
+rb_file_const(name, value)
+ const char *name;
+ VALUE value;
{
rb_define_const(rb_mFConst, name, value);
}
static int
-is_absolute_path(const char *path)
+is_absolute_path(path)
+ const char *path;
{
#ifdef DOSISH_DRIVE_LETTER
if (has_drive_letter(path) && isdirsep(path[2])) return 1;
@@ -4499,10 +4284,12 @@ is_absolute_path(const char *path)
#if ENABLE_PATH_CHECK
static int
-path_check_0(VALUE path, int execpath)
+path_check_0(fpath, execpath)
+ VALUE fpath;
+ int execpath;
{
struct stat st;
- const char *p0 = StringValueCStr(path);
+ const char *p0 = StringValueCStr(fpath);
char *p = 0, *s;
if (!is_absolute_path(p0)) {
@@ -4510,11 +4297,11 @@ path_check_0(VALUE path, int execpath)
VALUE newpath;
newpath = rb_str_new2(buf);
- xfree(buf);
+ free(buf);
rb_str_cat2(newpath, "/");
rb_str_cat2(newpath, p0);
- p0 = RSTRING_PTR(path = newpath);
+ p0 = RSTRING(fpath = newpath)->ptr;
}
for (;;) {
#ifndef S_IWOTH
@@ -4524,7 +4311,7 @@ path_check_0(VALUE path, int execpath)
#ifdef S_ISVTX
&& !(p && execpath && (st.st_mode & S_ISVTX))
#endif
- && !access(p0, W_OK)) {
+ ) {
rb_warn("Insecure world writable dir %s in %sPATH, mode 0%o",
p0, (execpath ? "" : "LOAD_"), st.st_mode);
if (p) *p = '/';
@@ -4540,17 +4327,19 @@ path_check_0(VALUE path, int execpath)
#endif
static int
-fpath_check(const char *path)
+fpath_check(path)
+ const char *path;
{
#if ENABLE_PATH_CHECK
- return path_check_0(rb_str_new2(path), FALSE);
+ return path_check_0(rb_str_new2(path), Qfalse);
#else
return 1;
#endif
}
int
-rb_path_check(const char *path)
+rb_path_check(path)
+ const char *path;
{
#if ENABLE_PATH_CHECK
const char *p0, *p, *pend;
@@ -4564,7 +4353,7 @@ rb_path_check(const char *path)
if (!p) p = pend;
for (;;) {
- if (!path_check_0(rb_str_new(p0, p - p0), TRUE)) {
+ if (!path_check_0(rb_str_new(p0, p - p0), Qtrue)) {
return 0; /* not safe */
}
p0 = p + 1;
@@ -4576,189 +4365,170 @@ rb_path_check(const char *path)
return 1;
}
+#if defined(__MACOS__) || defined(riscos)
static int
-file_load_ok(const char *path)
+is_macos_native_path(path)
+ const char *path;
{
- int ret = 1;
- int fd = open(path, O_RDONLY);
- if (fd == -1) return 0;
-#if !defined DOSISH
- {
- struct stat st;
- if (fstat(fd, &st) || !S_ISREG(st.st_mode)) {
- ret = 0;
- }
- }
-#endif
- (void)close(fd);
- return ret;
-}
-
-int
-rb_file_load_ok(const char *path)
-{
- return file_load_ok(path);
+ if (strchr(path, ':')) return 1;
+ return 0;
}
+#endif
static int
-is_explicit_relative(const char *path)
+file_load_ok(file)
+ const char *file;
{
- if (*path++ != '.') return 0;
- if (*path == '.') path++;
- return isdirsep(*path);
-}
-
-VALUE rb_get_load_path(void);
+ FILE *f;
-static VALUE
-copy_path_class(VALUE path, VALUE orig)
-{
- RBASIC(path)->klass = rb_obj_class(orig);
- OBJ_FREEZE(path);
- return path;
+ if (!file) return 0;
+ f = fopen(file, "r");
+ if (f == NULL) return 0;
+ fclose(f);
+ return 1;
}
-int
-rb_find_file_ext(VALUE *filep, const char *const *ext)
-{
- return rb_find_file_ext_safe(filep, ext, rb_safe_level());
-}
+extern VALUE rb_load_path;
int
-rb_find_file_ext_safe(VALUE *filep, const char *const *ext, int safe_level)
+rb_find_file_ext(filep, ext)
+ VALUE *filep;
+ const char * const *ext;
{
- const char *f = StringValueCStr(*filep);
- VALUE fname = *filep, load_path, tmp;
- long i, j, fnlen;
- int expanded = 0;
-
- if (!ext[0]) return 0;
+ const char *path, *found;
+ const char *f = RSTRING(*filep)->ptr;
+ VALUE fname;
+ long i, j;
if (f[0] == '~') {
fname = rb_file_expand_path(*filep, Qnil);
- if (safe_level >= 1 && OBJ_TAINTED(fname)) {
+ if (rb_safe_level() >= 2 && OBJ_TAINTED(fname)) {
rb_raise(rb_eSecurityError, "loading from unsafe file %s", f);
}
- f = RSTRING_PTR(fname);
+ OBJ_FREEZE(fname);
+ f = StringValueCStr(fname);
*filep = fname;
- expanded = 1;
}
- if (expanded || is_absolute_path(f) || is_explicit_relative(f)) {
- if (safe_level >= 1 && !fpath_check(f)) {
- rb_raise(rb_eSecurityError, "loading from unsafe path %s", f);
- }
- if (!expanded) fname = rb_file_expand_path(fname, Qnil);
- fnlen = RSTRING_LEN(fname);
+ if (is_absolute_path(f)) {
for (i=0; ext[i]; i++) {
+ fname = rb_str_dup(*filep);
rb_str_cat2(fname, ext[i]);
- if (file_load_ok(RSTRING_PTR(fname))) {
- *filep = copy_path_class(fname, *filep);
- return (int)(i+1);
+ OBJ_FREEZE(fname);
+ if (file_load_ok(StringValueCStr(fname))) {
+ *filep = fname;
+ return i+1;
}
- rb_str_set_len(fname, fnlen);
}
return 0;
}
- if (safe_level >= 4) {
- rb_raise(rb_eSecurityError, "loading from non-absolute path %s", f);
- }
+ if (!rb_load_path) return 0;
- RB_GC_GUARD(load_path) = rb_get_load_path();
- if (!load_path) return 0;
-
- fname = rb_str_dup(*filep);
- RBASIC(fname)->klass = 0;
- fnlen = RSTRING_LEN(fname);
- tmp = rb_str_tmp_new(MAXPATHLEN + 2);
- for (j=0; ext[j]; j++) {
- rb_str_cat2(fname, ext[j]);
- for (i = 0; i < RARRAY_LEN(load_path); i++) {
- VALUE str = RARRAY_PTR(load_path)[i];
-
- RB_GC_GUARD(str) = rb_get_path_check(str, safe_level);
- if (RSTRING_LEN(str) == 0) continue;
- file_expand_path(fname, str, 0, tmp);
- if (file_load_ok(RSTRING_PTR(tmp))) {
- *filep = copy_path_class(tmp, *filep);
- return (int)(j+1);
+ Check_Type(rb_load_path, T_ARRAY);
+ for (i=0;i<RARRAY(rb_load_path)->len;i++) {
+ VALUE str = RARRAY(rb_load_path)->ptr[i];
+
+ SafeStringValue(str);
+ if (RSTRING(str)->len == 0) continue;
+ path = RSTRING(str)->ptr;
+ for (j=0; ext[j]; j++) {
+ fname = rb_str_dup(*filep);
+ rb_str_cat2(fname, ext[j]);
+ OBJ_FREEZE(fname);
+ found = dln_find_file(StringValueCStr(fname), path);
+ if (found && file_load_ok(found)) {
+ *filep = fname;
+ return j+1;
}
- FL_UNSET(tmp, FL_TAINT | FL_UNTRUSTED);
}
- rb_str_set_len(fname, fnlen);
}
- RB_GC_GUARD(load_path);
return 0;
}
VALUE
-rb_find_file(VALUE path)
-{
- return rb_find_file_safe(path, rb_safe_level());
-}
-
-VALUE
-rb_find_file_safe(VALUE path, int safe_level)
+rb_find_file(path)
+ VALUE path;
{
- VALUE tmp, load_path;
+ VALUE tmp;
const char *f = StringValueCStr(path);
- int expanded = 0;
+ const char *lpath;
if (f[0] == '~') {
- tmp = rb_file_expand_path(path, Qnil);
- if (safe_level >= 1 && OBJ_TAINTED(tmp)) {
+ path = rb_file_expand_path(path, Qnil);
+ if (rb_safe_level() >= 1 && OBJ_TAINTED(path)) {
+ rb_raise(rb_eSecurityError, "loading from unsafe path %s", f);
+ }
+ OBJ_FREEZE(path);
+ f = StringValueCStr(path);
+ }
+
+#if defined(__MACOS__) || defined(riscos)
+ if (is_macos_native_path(f)) {
+ if (rb_safe_level() >= 1 && !fpath_check(f)) {
rb_raise(rb_eSecurityError, "loading from unsafe file %s", f);
}
- path = copy_path_class(tmp, path);
- f = RSTRING_PTR(path);
- expanded = 1;
+ if (file_load_ok(f)) return path;
}
+#endif
- if (expanded || is_absolute_path(f) || is_explicit_relative(f)) {
- if (safe_level >= 1 && !fpath_check(f)) {
- rb_raise(rb_eSecurityError, "loading from unsafe path %s", f);
+ if (is_absolute_path(f)) {
+ if (rb_safe_level() >= 1 && !fpath_check(f)) {
+ rb_raise(rb_eSecurityError, "loading from unsafe file %s", f);
}
- if (!file_load_ok(f)) return 0;
- if (!expanded)
- path = copy_path_class(rb_file_expand_path(path, Qnil), path);
- return path;
+ if (file_load_ok(f)) return path;
}
- if (safe_level >= 4) {
+ if (rb_safe_level() >= 4) {
rb_raise(rb_eSecurityError, "loading from non-absolute path %s", f);
}
- RB_GC_GUARD(load_path) = rb_get_load_path();
- if (load_path) {
+ if (rb_load_path) {
long i;
- tmp = rb_str_tmp_new(MAXPATHLEN + 2);
- for (i = 0; i < RARRAY_LEN(load_path); i++) {
- VALUE str = RARRAY_PTR(load_path)[i];
- RB_GC_GUARD(str) = rb_get_path_check(str, safe_level);
- if (RSTRING_LEN(str) > 0) {
- file_expand_path(path, str, 0, tmp);
- f = RSTRING_PTR(tmp);
- if (file_load_ok(f)) goto found;
+ Check_Type(rb_load_path, T_ARRAY);
+ tmp = rb_ary_new();
+ for (i=0;i<RARRAY(rb_load_path)->len;i++) {
+ VALUE str = RARRAY(rb_load_path)->ptr[i];
+ SafeStringValue(str);
+ if (RSTRING(str)->len > 0) {
+ rb_ary_push(tmp, str);
}
}
- return 0;
+ tmp = rb_ary_join(tmp, rb_str_new2(PATH_SEP));
+ if (RSTRING(tmp)->len == 0) {
+ lpath = 0;
+ }
+ else {
+ lpath = RSTRING(tmp)->ptr;
+ }
}
else {
- return 0; /* no path, no load */
+ lpath = 0;
}
- found:
- if (safe_level >= 1 && !fpath_check(f)) {
+ if (!lpath) {
+ return 0; /* no path, no load */
+ }
+ if (!(f = dln_find_file(f, lpath))) {
+ return 0;
+ }
+ if (rb_safe_level() >= 1 && !fpath_check(f)) {
rb_raise(rb_eSecurityError, "loading from unsafe file %s", f);
}
-
- return copy_path_class(tmp, path);
+ if (file_load_ok(f)) {
+ tmp = rb_str_new2(f);
+ OBJ_FREEZE(tmp);
+ return tmp;
+ }
+ return 0;
}
static void
-define_filetest_function(const char *name, VALUE (*func)(ANYARGS), int argc)
+define_filetest_function(name, func, argc)
+ const char *name;
+ VALUE (*func)();
+ int argc;
{
rb_define_module_function(rb_mFileTest, name, func, argc);
rb_define_singleton_method(rb_cFile, name, func, argc);
@@ -4771,7 +4541,7 @@ define_filetest_function(const char *name, VALUE (*func)(ANYARGS), int argc)
* <code>File</code> includes the methods of module
* <code>FileTest</code> as class methods, allowing you to write (for
* example) <code>File.exist?("foo")</code>.
- *
+ *
* In the description of File methods,
* <em>permission bits</em> are a platform-specific
* set of bits that indicate permissions of a file. On Unix-based
@@ -4779,7 +4549,7 @@ define_filetest_function(const char *name, VALUE (*func)(ANYARGS), int argc)
* owner, the group, and the rest of the world. For each of these
* entities, permissions may be set to read, write, or execute the
* file:
- *
+ *
* The permission bits <code>0644</code> (in octal) would thus be
* interpreted as read/write for owner, and read-only for group and
* other. Higher-order bits may also be used to indicate the type of
@@ -4787,7 +4557,7 @@ define_filetest_function(const char *name, VALUE (*func)(ANYARGS), int argc)
* special features. If the permissions are for a directory, the
* meaning of the execute bit changes; when set the directory can be
* searched.
- *
+ *
* On non-Posix operating systems, there may be only the ability to
* make a file read-only or read-write. In this case, the remaining
* permission bits will be synthesized to resemble typical values. For
@@ -4798,41 +4568,39 @@ define_filetest_function(const char *name, VALUE (*func)(ANYARGS), int argc)
*/
void
-Init_File(void)
+Init_File()
{
rb_mFileTest = rb_define_module("FileTest");
rb_cFile = rb_define_class("File", rb_cIO);
- define_filetest_function("directory?", rb_file_directory_p, 1);
- define_filetest_function("exist?", rb_file_exist_p, 1);
- define_filetest_function("exists?", rb_file_exist_p, 1);
- define_filetest_function("readable?", rb_file_readable_p, 1);
- define_filetest_function("readable_real?", rb_file_readable_real_p, 1);
- define_filetest_function("world_readable?", rb_file_world_readable_p, 1);
- define_filetest_function("writable?", rb_file_writable_p, 1);
- define_filetest_function("writable_real?", rb_file_writable_real_p, 1);
- define_filetest_function("world_writable?", rb_file_world_writable_p, 1);
- define_filetest_function("executable?", rb_file_executable_p, 1);
- define_filetest_function("executable_real?", rb_file_executable_real_p, 1);
- define_filetest_function("file?", rb_file_file_p, 1);
- define_filetest_function("zero?", rb_file_zero_p, 1);
- define_filetest_function("size?", rb_file_size_p, 1);
+ define_filetest_function("directory?", test_d, 1);
+ define_filetest_function("exist?", test_e, 1);
+ define_filetest_function("exists?", test_e, 1); /* temporary */
+ define_filetest_function("readable?", test_r, 1);
+ define_filetest_function("readable_real?", test_R, 1);
+ define_filetest_function("writable?", test_w, 1);
+ define_filetest_function("writable_real?", test_W, 1);
+ define_filetest_function("executable?", test_x, 1);
+ define_filetest_function("executable_real?", test_X, 1);
+ define_filetest_function("file?", test_f, 1);
+ define_filetest_function("zero?", test_z, 1);
+ define_filetest_function("size?", test_s, 1);
define_filetest_function("size", rb_file_s_size, 1);
- define_filetest_function("owned?", rb_file_owned_p, 1);
- define_filetest_function("grpowned?", rb_file_grpowned_p, 1);
+ define_filetest_function("owned?", test_owned, 1);
+ define_filetest_function("grpowned?", test_grpowned, 1);
- define_filetest_function("pipe?", rb_file_pipe_p, 1);
- define_filetest_function("symlink?", rb_file_symlink_p, 1);
- define_filetest_function("socket?", rb_file_socket_p, 1);
+ define_filetest_function("pipe?", test_p, 1);
+ define_filetest_function("symlink?", test_l, 1);
+ define_filetest_function("socket?", test_S, 1);
- define_filetest_function("blockdev?", rb_file_blockdev_p, 1);
- define_filetest_function("chardev?", rb_file_chardev_p, 1);
+ define_filetest_function("blockdev?", test_b, 1);
+ define_filetest_function("chardev?", test_c, 1);
- define_filetest_function("setuid?", rb_file_suid_p, 1);
- define_filetest_function("setgid?", rb_file_sgid_p, 1);
- define_filetest_function("sticky?", rb_file_sticky_p, 1);
+ define_filetest_function("setuid?", test_suid, 1);
+ define_filetest_function("setgid?", test_sgid, 1);
+ define_filetest_function("sticky?", test_sticky, 1);
- define_filetest_function("identical?", rb_file_identical_p, 2);
+ define_filetest_function("identical?", test_identical, 2);
rb_define_singleton_method(rb_cFile, "stat", rb_file_s_stat, 1);
rb_define_singleton_method(rb_cFile, "lstat", rb_file_s_lstat, 1);
@@ -4858,20 +4626,18 @@ Init_File(void)
rb_define_singleton_method(rb_cFile, "umask", rb_file_s_umask, -1);
rb_define_singleton_method(rb_cFile, "truncate", rb_file_s_truncate, 2);
rb_define_singleton_method(rb_cFile, "expand_path", rb_file_s_expand_path, -1);
- rb_define_singleton_method(rb_cFile, "absolute_path", rb_file_s_absolute_path, -1);
rb_define_singleton_method(rb_cFile, "basename", rb_file_s_basename, -1);
rb_define_singleton_method(rb_cFile, "dirname", rb_file_s_dirname, 1);
rb_define_singleton_method(rb_cFile, "extname", rb_file_s_extname, 1);
- rb_define_singleton_method(rb_cFile, "path", rb_file_s_path, 1);
- separator = rb_obj_freeze(rb_usascii_str_new2("/"));
+ separator = rb_obj_freeze(rb_str_new2("/"));
rb_define_const(rb_cFile, "Separator", separator);
rb_define_const(rb_cFile, "SEPARATOR", separator);
rb_define_singleton_method(rb_cFile, "split", rb_file_s_split, 1);
rb_define_singleton_method(rb_cFile, "join", rb_file_s_join, -2);
#ifdef DOSISH
- rb_define_const(rb_cFile, "ALT_SEPARATOR", rb_obj_freeze(rb_usascii_str_new2("\\")));
+ rb_define_const(rb_cFile, "ALT_SEPARATOR", rb_obj_freeze(rb_str_new2("\\")));
#else
rb_define_const(rb_cFile, "ALT_SEPARATOR", Qnil);
#endif
@@ -4883,7 +4649,6 @@ Init_File(void)
rb_define_method(rb_cFile, "atime", rb_file_atime, 0);
rb_define_method(rb_cFile, "mtime", rb_file_mtime, 0);
rb_define_method(rb_cFile, "ctime", rb_file_ctime, 0);
- rb_define_method(rb_cFile, "size", rb_file_size, 0);
rb_define_method(rb_cFile, "chmod", rb_file_chmod, 1);
rb_define_method(rb_cFile, "chown", rb_file_chown, 2);
@@ -4899,7 +4664,6 @@ Init_File(void)
rb_file_const("LOCK_NB", INT2FIX(LOCK_NB));
rb_define_method(rb_cFile, "path", rb_file_path, 0);
- rb_define_method(rb_cFile, "to_path", rb_file_path, 0);
rb_define_global_function("test", rb_f_test, -1);
rb_cStat = rb_define_class_under(rb_cFile, "Stat", rb_cObject);
@@ -4936,10 +4700,8 @@ Init_File(void)
rb_define_method(rb_cStat, "directory?", rb_stat_d, 0);
rb_define_method(rb_cStat, "readable?", rb_stat_r, 0);
rb_define_method(rb_cStat, "readable_real?", rb_stat_R, 0);
- rb_define_method(rb_cStat, "world_readable?", rb_stat_wr, 0);
rb_define_method(rb_cStat, "writable?", rb_stat_w, 0);
rb_define_method(rb_cStat, "writable_real?", rb_stat_W, 0);
- rb_define_method(rb_cStat, "world_writable?", rb_stat_ww, 0);
rb_define_method(rb_cStat, "executable?", rb_stat_x, 0);
rb_define_method(rb_cStat, "executable_real?", rb_stat_X, 0);
rb_define_method(rb_cStat, "file?", rb_stat_f, 0);
diff --git a/gc.c b/gc.c
index dc8916b885..6199939ab6 100644
--- a/gc.c
+++ b/gc.c
@@ -3,22 +3,21 @@
gc.c -
$Author$
+ $Date$
created at: Tue Oct 5 09:44:46 JST 1993
- Copyright (C) 1993-2007 Yukihiro Matsumoto
+ Copyright (C) 1993-2003 Yukihiro Matsumoto
Copyright (C) 2000 Network Applied Communication Laboratory, Inc.
Copyright (C) 2000 Information-technology Promotion Agency, Japan
**********************************************************************/
-#include "ruby/ruby.h"
-#include "ruby/st.h"
-#include "ruby/re.h"
-#include "ruby/io.h"
-#include "ruby/util.h"
-#include "eval_intern.h"
-#include "vm_core.h"
-#include "gc.h"
+#include "ruby.h"
+#include "rubysig.h"
+#include "st.h"
+#include "node.h"
+#include "env.h"
+#include "re.h"
#include <stdio.h>
#include <setjmp.h>
#include <sys/types.h>
@@ -35,23 +34,14 @@
#include <windows.h>
#endif
-#ifdef HAVE_VALGRIND_MEMCHECK_H
-# include <valgrind/memcheck.h>
-# ifndef VALGRIND_MAKE_MEM_DEFINED
-# define VALGRIND_MAKE_MEM_DEFINED(p, n) VALGRIND_MAKE_READABLE(p, n)
-# endif
-# ifndef VALGRIND_MAKE_MEM_UNDEFINED
-# define VALGRIND_MAKE_MEM_UNDEFINED(p, n) VALGRIND_MAKE_WRITABLE(p, n)
-# endif
-#else
-# define VALGRIND_MAKE_MEM_DEFINED(p, n) /* empty */
-# define VALGRIND_MAKE_MEM_UNDEFINED(p, n) /* empty */
-#endif
-
-int rb_io_fptr_finalize(struct rb_io_t*);
+void re_free_registers _((struct re_registers*));
+void rb_io_fptr_finalize _((struct rb_io_t*));
#define rb_setjmp(env) RUBY_SETJMP(env)
#define rb_jmp_buf rb_jmpbuf_t
+#ifdef __CYGWIN__
+int _setjmp(), _longjmp();
+#endif
/* Make alloca work the best possible way. */
#ifdef __GNUC__
@@ -64,9 +54,7 @@ int rb_io_fptr_finalize(struct rb_io_t*);
# ifdef HAVE_ALLOCA_H
# include <alloca.h>
# else
-# ifdef _AIX
- #pragma alloca
-# else
+# ifndef _AIX
# ifndef alloca /* predefined by HP cc +Olibcalls */
void *alloca ();
# endif
@@ -75,382 +63,31 @@ void *alloca ();
#endif /* __GNUC__ */
#ifndef GC_MALLOC_LIMIT
-#define GC_MALLOC_LIMIT 8000000
-#endif
-
-#define nomem_error GET_VM()->special_exceptions[ruby_error_nomemory]
-
-#define MARK_STACK_MAX 1024
-
-int ruby_gc_debug_indent = 0;
-
-/* for GC profile */
-#define GC_PROFILE_MORE_DETAIL 0
-typedef struct gc_profile_record {
- double gc_time;
- double gc_mark_time;
- double gc_sweep_time;
- double gc_invoke_time;
-
- size_t heap_use_slots;
- size_t heap_live_objects;
- size_t heap_free_objects;
- size_t heap_total_objects;
- size_t heap_use_size;
- size_t heap_total_size;
-
- int have_finalize;
-
- size_t allocate_increase;
- size_t allocate_limit;
-} gc_profile_record;
-
-static double
-getrusage_time(void)
-{
-#ifdef RUSAGE_SELF
- struct rusage usage;
- struct timeval time;
- getrusage(RUSAGE_SELF, &usage);
- time = usage.ru_utime;
- return time.tv_sec + time.tv_usec * 1e-6;
-#elif defined _WIN32
- FILETIME creation_time, exit_time, kernel_time, user_time;
- ULARGE_INTEGER ui;
- LONG_LONG q;
- double t;
-
- if (GetProcessTimes(GetCurrentProcess(),
- &creation_time, &exit_time, &kernel_time, &user_time) == 0)
- {
- return 0.0;
- }
- memcpy(&ui, &user_time, sizeof(FILETIME));
- q = ui.QuadPart / 10L;
- t = (DWORD)(q % 1000000L) * 1e-6;
- q /= 1000000L;
-#ifdef __GNUC__
- t += q;
-#else
- t += (double)(DWORD)(q >> 16) * (1 << 16);
- t += (DWORD)q & ~(~0 << 16);
-#endif
- return t;
-#else
- return 0.0;
-#endif
-}
-
-#define GC_PROF_TIMER_START do {\
- if (objspace->profile.run) {\
- if (!objspace->profile.record) {\
- objspace->profile.size = 1000;\
- objspace->profile.record = malloc(sizeof(gc_profile_record) * objspace->profile.size);\
- }\
- if (count >= objspace->profile.size) {\
- objspace->profile.size += 1000;\
- objspace->profile.record = realloc(objspace->profile.record, sizeof(gc_profile_record) * objspace->profile.size);\
- }\
- if (!objspace->profile.record) {\
- rb_bug("gc_profile malloc or realloc miss");\
- }\
- MEMZERO(&objspace->profile.record[count], gc_profile_record, 1);\
- gc_time = getrusage_time();\
- objspace->profile.record[count].gc_invoke_time = gc_time - objspace->profile.invoke_time;\
- }\
- } while(0)
-
-#define GC_PROF_TIMER_STOP do {\
- if (objspace->profile.run) {\
- gc_time = getrusage_time() - gc_time;\
- if (gc_time < 0) gc_time = 0;\
- objspace->profile.record[count].gc_time = gc_time;\
- objspace->profile.count++;\
- }\
- } while(0)
-
-#if GC_PROFILE_MORE_DETAIL
-#define INIT_GC_PROF_PARAMS double gc_time = 0, mark_time = 0, sweep_time = 0;\
- size_t count = objspace->profile.count
-
-#define GC_PROF_MARK_TIMER_START do {\
- if (objspace->profile.run) {\
- mark_time = getrusage_time();\
- }\
- } while(0)
-
-#define GC_PROF_MARK_TIMER_STOP do {\
- if (objspace->profile.run) {\
- mark_time = getrusage_time() - mark_time;\
- if (mark_time < 0) mark_time = 0;\
- objspace->profile.record[count].gc_mark_time = mark_time;\
- }\
- } while(0)
-
-#define GC_PROF_SWEEP_TIMER_START do {\
- if (objspace->profile.run) {\
- sweep_time = getrusage_time();\
- }\
- } while(0)
-
-#define GC_PROF_SWEEP_TIMER_STOP do {\
- if (objspace->profile.run) {\
- sweep_time = getrusage_time() - sweep_time;\
- if (sweep_time < 0) sweep_time = 0;\
- objspace->profile.record[count].gc_sweep_time = sweep_time;\
- }\
- } while(0)
-#define GC_PROF_SET_MALLOC_INFO do {\
- if (objspace->profile.run) {\
- gc_profile_record *record = &objspace->profile.record[objspace->profile.count];\
- record->allocate_increase = malloc_increase;\
- record->allocate_limit = malloc_limit; \
- }\
- } while(0)
-#define GC_PROF_SET_HEAP_INFO do {\
- if (objspace->profile.run) {\
- gc_profile_record *record = &objspace->profile.record[objspace->profile.count];\
- record->heap_use_slots = heaps_used;\
- record->heap_live_objects = live;\
- record->heap_free_objects = freed; \
- record->heap_total_objects = heaps_used * HEAP_OBJ_LIMIT;\
- record->have_finalize = final_list ? Qtrue : Qfalse;\
- record->heap_use_size = live * sizeof(RVALUE); \
- record->heap_total_size = heaps_used * (HEAP_OBJ_LIMIT * sizeof(RVALUE));\
- }\
- } while(0)
+#if defined(MSDOS) || defined(__human68k__)
+#define GC_MALLOC_LIMIT 200000
#else
-#define INIT_GC_PROF_PARAMS double gc_time = 0;\
- size_t count = objspace->profile.count
-#define GC_PROF_MARK_TIMER_START
-#define GC_PROF_MARK_TIMER_STOP
-#define GC_PROF_SWEEP_TIMER_START
-#define GC_PROF_SWEEP_TIMER_STOP
-#define GC_PROF_SET_MALLOC_INFO
-#define GC_PROF_SET_HEAP_INFO do {\
- if (objspace->profile.run) {\
- gc_profile_record *record = &objspace->profile.record[objspace->profile.count];\
- record->heap_total_objects = heaps_used * HEAP_OBJ_LIMIT;\
- record->heap_use_size = live * sizeof(RVALUE); \
- record->heap_total_size = heaps_used * HEAP_SIZE;\
- }\
- } while(0)
-#endif
-
-
-#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__CYGWIN__)
-#pragma pack(push, 1) /* magic for reducing sizeof(RVALUE): 24 -> 20 */
-#endif
-
-typedef struct RVALUE {
- union {
- struct {
- VALUE flags; /* always 0 for freed obj */
- struct RVALUE *next;
- } free;
- struct RBasic basic;
- struct RObject object;
- struct RClass klass;
- struct RFloat flonum;
- struct RString string;
- struct RArray array;
- struct RRegexp regexp;
- struct RHash hash;
- struct RData data;
- struct RTypedData typeddata;
- struct RStruct rstruct;
- struct RBignum bignum;
- struct RFile file;
- struct RNode node;
- struct RMatch match;
- struct RRational rational;
- struct RComplex complex;
- } as;
-#ifdef GC_DEBUG
- const char *file;
- int line;
-#endif
-} RVALUE;
-
-#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__CYGWIN__)
-#pragma pack(pop)
-#endif
-
-struct heaps_slot {
- void *membase;
- RVALUE *slot;
- size_t limit;
-};
-
-#define HEAP_MIN_SLOTS 10000
-#define FREE_MIN 4096
-
-struct gc_list {
- VALUE *varptr;
- struct gc_list *next;
-};
-
-#define CALC_EXACT_MALLOC_SIZE 0
-
-typedef struct rb_objspace {
- struct {
- size_t limit;
- size_t increase;
-#if CALC_EXACT_MALLOC_SIZE
- size_t allocated_size;
- size_t allocations;
-#endif
- } malloc_params;
- struct {
- size_t increment;
- struct heaps_slot *ptr;
- size_t length;
- size_t used;
- RVALUE *freelist;
- RVALUE *range[2];
- RVALUE *freed;
- } heap;
- struct {
- int dont_gc;
- int during_gc;
- } flags;
- struct {
- st_table *table;
- RVALUE *deferred;
- } final;
- struct {
- VALUE buffer[MARK_STACK_MAX];
- VALUE *ptr;
- int overflow;
- } markstack;
- struct {
- int run;
- gc_profile_record *record;
- size_t count;
- size_t size;
- double invoke_time;
- } profile;
- struct gc_list *global_list;
- unsigned int count;
- int gc_stress;
-} rb_objspace_t;
-
-#if defined(ENABLE_VM_OBJSPACE) && ENABLE_VM_OBJSPACE
-#define rb_objspace (*GET_VM()->objspace)
-static int ruby_initial_gc_stress = 0;
-int *ruby_initial_gc_stress_ptr = &ruby_initial_gc_stress;
-#else
-static rb_objspace_t rb_objspace = {{GC_MALLOC_LIMIT}, {HEAP_MIN_SLOTS}};
-int *ruby_initial_gc_stress_ptr = &rb_objspace.gc_stress;
+#define GC_MALLOC_LIMIT 8000000
#endif
-#define malloc_limit objspace->malloc_params.limit
-#define malloc_increase objspace->malloc_params.increase
-#define heap_slots objspace->heap.slots
-#define heaps objspace->heap.ptr
-#define heaps_length objspace->heap.length
-#define heaps_used objspace->heap.used
-#define freelist objspace->heap.freelist
-#define lomem objspace->heap.range[0]
-#define himem objspace->heap.range[1]
-#define heaps_inc objspace->heap.increment
-#define heaps_freed objspace->heap.freed
-#define dont_gc objspace->flags.dont_gc
-#define during_gc objspace->flags.during_gc
-#define finalizer_table objspace->final.table
-#define deferred_final_list objspace->final.deferred
-#define mark_stack objspace->markstack.buffer
-#define mark_stack_ptr objspace->markstack.ptr
-#define mark_stack_overflow objspace->markstack.overflow
-#define global_List objspace->global_list
-#define ruby_gc_stress objspace->gc_stress
-
-#define need_call_final (finalizer_table && finalizer_table->num_entries)
-
-#if defined(ENABLE_VM_OBJSPACE) && ENABLE_VM_OBJSPACE
-rb_objspace_t *
-rb_objspace_alloc(void)
-{
- rb_objspace_t *objspace = malloc(sizeof(rb_objspace_t));
- memset(objspace, 0, sizeof(*objspace));
- malloc_limit = GC_MALLOC_LIMIT;
- ruby_gc_stress = ruby_initial_gc_stress;
-
- return objspace;
-}
#endif
-/* tiny heap size */
-/* 32KB */
-/*#define HEAP_SIZE 0x8000 */
-/* 128KB */
-/*#define HEAP_SIZE 0x20000 */
-/* 64KB */
-/*#define HEAP_SIZE 0x10000 */
-/* 16KB */
-#define HEAP_SIZE 0x4000
-/* 8KB */
-/*#define HEAP_SIZE 0x2000 */
-/* 4KB */
-/*#define HEAP_SIZE 0x1000 */
-/* 2KB */
-/*#define HEAP_SIZE 0x800 */
-
-#define HEAP_OBJ_LIMIT (HEAP_SIZE / sizeof(struct RVALUE))
-
-extern VALUE rb_cMutex;
-extern st_table *rb_class_tbl;
-
-int ruby_disable_gc_stress = 0;
+static unsigned long malloc_increase = 0;
+static unsigned long malloc_limit = GC_MALLOC_LIMIT;
+static void run_final();
+static VALUE nomem_error;
+static void garbage_collect();
-static void run_final(rb_objspace_t *objspace, VALUE obj);
-static int garbage_collect(rb_objspace_t *objspace);
+int ruby_gc_stress = 0;
void
-rb_global_variable(VALUE *var)
-{
- rb_gc_register_address(var);
-}
-
-static void *
-ruby_memerror_body(void *dummy)
+rb_memerror()
{
- rb_memerror();
- return 0;
-}
-
-static void
-ruby_memerror(void)
-{
- if (ruby_thread_has_gvl_p()) {
- rb_memerror();
- }
- else {
- if (ruby_native_thread_p()) {
- rb_thread_call_with_gvl(ruby_memerror_body, 0);
- }
- else {
- /* no ruby thread */
- fprintf(stderr, "[FATAL] failed to allocate memory\n");
- exit(EXIT_FAILURE);
- }
- }
-}
+ static int recurse = 0;
-void
-rb_memerror(void)
-{
- rb_thread_t *th = GET_THREAD();
- if (!nomem_error ||
- (rb_thread_raised_p(th, RAISED_NOMEMORY) && rb_safe_level() < 4)) {
+ if (!nomem_error || (recurse > 0 && rb_safe_level() < 4)) {
fprintf(stderr, "[FATAL] failed to allocate memory\n");
- exit(EXIT_FAILURE);
+ exit(1);
}
- if (rb_thread_raised_p(th, RAISED_NOMEMORY)) {
- rb_thread_raised_clear(th);
- GET_THREAD()->errinfo = nomem_error;
- JUMP_TAG(TAG_RAISE);
- }
- rb_thread_raised_set(th, RAISED_NOMEMORY);
+ recurse++;
rb_exc_raise(nomem_error);
}
@@ -462,9 +99,9 @@ rb_memerror(void)
*/
static VALUE
-gc_stress_get(VALUE self)
+gc_stress_get(self)
+ VALUE self;
{
- rb_objspace_t *objspace = &rb_objspace;
return ruby_gc_stress ? Qtrue : Qfalse;
}
@@ -481,269 +118,93 @@ gc_stress_get(VALUE self)
*/
static VALUE
-gc_stress_set(VALUE self, VALUE flag)
+gc_stress_set(self, bool)
+ VALUE self, bool;
{
- rb_objspace_t *objspace = &rb_objspace;
rb_secure(2);
- ruby_gc_stress = RTEST(flag);
- return flag;
-}
-
-/*
- * call-seq:
- * GC::Profiler.enable? => true or false
- *
- * returns current status of GC profile mode.
- */
-
-static VALUE
-gc_profile_enable_get(VALUE self)
-{
- rb_objspace_t *objspace = &rb_objspace;
- return objspace->profile.run;
-}
-
-/*
- * call-seq:
- * GC::Profiler.enable => nil
- *
- * updates GC profile mode.
- * start profiler for GC.
- *
- */
-
-static VALUE
-gc_profile_enable(void)
-{
- rb_objspace_t *objspace = &rb_objspace;
-
- objspace->profile.run = TRUE;
- return Qnil;
+ ruby_gc_stress = RTEST(bool);
+ return bool;
}
-/*
- * call-seq:
- * GC::Profiler.disable => nil
- *
- * updates GC profile mode.
- * stop profiler for GC.
- *
- */
-
-static VALUE
-gc_profile_disable(void)
-{
- rb_objspace_t *objspace = &rb_objspace;
-
- objspace->profile.run = FALSE;
- return Qnil;
-}
-
-/*
- * call-seq:
- * GC::Profiler.clear => nil
- *
- * clear before profile data.
- *
- */
-
-static VALUE
-gc_profile_clear(void)
-{
- rb_objspace_t *objspace = &rb_objspace;
- MEMZERO(objspace->profile.record, gc_profile_record, objspace->profile.size);
- objspace->profile.count = 0;
- return Qnil;
-}
-
-static void *
-negative_size_allocation_error_with_gvl(void *ptr)
-{
- rb_raise(rb_eNoMemError, "%s", (const char *)ptr);
- return 0; /* should not be reached */
-}
-
-static void
-negative_size_allocation_error(const char *msg)
-{
- if (ruby_thread_has_gvl_p()) {
- rb_raise(rb_eNoMemError, "%s", msg);
- }
- else {
- if (ruby_native_thread_p()) {
- rb_thread_call_with_gvl(negative_size_allocation_error_with_gvl, (void *)msg);
- }
- else {
- fprintf(stderr, "[FATAL] %s\n", msg);
- exit(EXIT_FAILURE);
- }
- }
-}
-
-static void *
-gc_with_gvl(void *ptr)
-{
- return (void *)(VALUE)garbage_collect((rb_objspace_t *)ptr);
-}
-
-static int
-garbage_collect_with_gvl(rb_objspace_t *objspace)
-{
- if (ruby_thread_has_gvl_p()) {
- return garbage_collect(objspace);
- }
- else {
- if (ruby_native_thread_p()) {
- return (int)(VALUE)rb_thread_call_with_gvl(gc_with_gvl, (void *)objspace);
- }
- else {
- /* no ruby thread */
- fprintf(stderr, "[FATAL] failed to allocate memory\n");
- exit(EXIT_FAILURE);
- }
- }
-}
-
-static void *
-vm_xmalloc(rb_objspace_t *objspace, size_t size)
+void *
+ruby_xmalloc(size)
+ long size;
{
void *mem;
- if ((ssize_t)size < 0) {
- negative_size_allocation_error("negative allocation size (or too big)");
+ if (size < 0) {
+ rb_raise(rb_eNoMemError, "negative allocation size (or too big)");
}
if (size == 0) size = 1;
+ malloc_increase += size;
-#if CALC_EXACT_MALLOC_SIZE
- size += sizeof(size_t);
-#endif
-
- if ((ruby_gc_stress && !ruby_disable_gc_stress) ||
- (malloc_increase+size) > malloc_limit) {
- garbage_collect_with_gvl(objspace);
+ if (ruby_gc_stress || malloc_increase > malloc_limit) {
+ garbage_collect();
}
- mem = malloc(size);
+ RUBY_CRITICAL(mem = malloc(size));
if (!mem) {
- if (garbage_collect_with_gvl(objspace)) {
- mem = malloc(size);
- }
+ garbage_collect();
+ RUBY_CRITICAL(mem = malloc(size));
if (!mem) {
- ruby_memerror();
+ rb_memerror();
}
}
- malloc_increase += size;
-
-#if CALC_EXACT_MALLOC_SIZE
- objspace->malloc_params.allocated_size += size;
- objspace->malloc_params.allocations++;
- ((size_t *)mem)[0] = size;
- mem = (size_t *)mem + 1;
-#endif
return mem;
}
-static void *
-vm_xrealloc(rb_objspace_t *objspace, void *ptr, size_t size)
+void *
+ruby_xcalloc(n, size)
+ long n, size;
{
void *mem;
- if ((ssize_t)size < 0) {
- negative_size_allocation_error("negative re-allocation size");
- }
- if (!ptr) return ruby_xmalloc(size);
- if (size == 0) size = 1;
- if (ruby_gc_stress && !ruby_disable_gc_stress)
- garbage_collect_with_gvl(objspace);
-
-#if CALC_EXACT_MALLOC_SIZE
- size += sizeof(size_t);
- objspace->malloc_params.allocated_size -= size;
- ptr = (size_t *)ptr - 1;
-#endif
-
- mem = realloc(ptr, size);
- if (!mem) {
- if (garbage_collect_with_gvl(objspace)) {
- mem = realloc(ptr, size);
- }
- if (!mem) {
- ruby_memerror();
- }
- }
- malloc_increase += size;
-
-#if CALC_EXACT_MALLOC_SIZE
- objspace->malloc_params.allocated_size += size;
- ((size_t *)mem)[0] = size;
- mem = (size_t *)mem + 1;
-#endif
+ mem = xmalloc(n * size);
+ memset(mem, 0, n * size);
return mem;
}
-static void
-vm_xfree(rb_objspace_t *objspace, void *ptr)
-{
-#if CALC_EXACT_MALLOC_SIZE
- size_t size;
- ptr = ((size_t *)ptr) - 1;
- size = ((size_t*)ptr)[0];
- objspace->malloc_params.allocated_size -= size;
- objspace->malloc_params.allocations--;
-#endif
-
- free(ptr);
-}
-
void *
-ruby_xmalloc(size_t size)
+ruby_xrealloc(ptr, size)
+ void *ptr;
+ long size;
{
- return vm_xmalloc(&rb_objspace, size);
-}
+ void *mem;
-void *
-ruby_xmalloc2(size_t n, size_t size)
-{
- size_t len = size * n;
- if (n != 0 && size != len / n) {
- rb_raise(rb_eArgError, "malloc: possible integer overflow");
+ if (size < 0) {
+ rb_raise(rb_eArgError, "negative re-allocation size");
+ }
+ if (!ptr) return xmalloc(size);
+ if (size == 0) size = 1;
+ malloc_increase += size;
+ if (ruby_gc_stress) garbage_collect();
+ RUBY_CRITICAL(mem = realloc(ptr, size));
+ if (!mem) {
+ garbage_collect();
+ RUBY_CRITICAL(mem = realloc(ptr, size));
+ if (!mem) {
+ rb_memerror();
+ }
}
- return vm_xmalloc(&rb_objspace, len);
-}
-
-void *
-ruby_xcalloc(size_t n, size_t size)
-{
- void *mem = ruby_xmalloc2(n, size);
- memset(mem, 0, n * size);
return mem;
}
-void *
-ruby_xrealloc(void *ptr, size_t size)
-{
- return vm_xrealloc(&rb_objspace, ptr, size);
-}
-
-void *
-ruby_xrealloc2(void *ptr, size_t n, size_t size)
-{
- size_t len = size * n;
- if (n != 0 && size != len / n) {
- rb_raise(rb_eArgError, "realloc: possible integer overflow");
- }
- return ruby_xrealloc(ptr, len);
-}
-
void
-ruby_xfree(void *x)
+ruby_xfree(x)
+ void *x;
{
if (x)
- vm_xfree(&rb_objspace, x);
+ RUBY_CRITICAL(free(x));
}
+extern int ruby_in_compile;
+static int dont_gc;
+static int during_gc;
+static int need_call_final = 0;
+static st_table *finalizer_table = 0;
+
/*
* call-seq:
@@ -759,13 +220,12 @@ ruby_xfree(void *x)
*/
VALUE
-rb_gc_enable(void)
+rb_gc_enable()
{
- rb_objspace_t *objspace = &rb_objspace;
int old = dont_gc;
- dont_gc = FALSE;
- return old ? Qtrue : Qfalse;
+ dont_gc = Qfalse;
+ return old;
}
/*
@@ -781,28 +241,25 @@ rb_gc_enable(void)
*/
VALUE
-rb_gc_disable(void)
+rb_gc_disable()
{
- rb_objspace_t *objspace = &rb_objspace;
int old = dont_gc;
- dont_gc = TRUE;
- return old ? Qtrue : Qfalse;
+ dont_gc = Qtrue;
+ return old;
}
VALUE rb_mGC;
-void
-rb_gc_register_mark_object(VALUE obj)
-{
- VALUE ary = GET_THREAD()->vm->mark_object_ary;
- rb_ary_push(ary, obj);
-}
+static struct gc_list {
+ VALUE *varptr;
+ struct gc_list *next;
+} *global_List = 0;
void
-rb_gc_register_address(VALUE *addr)
+rb_gc_register_address(addr)
+ VALUE *addr;
{
- rb_objspace_t *objspace = &rb_objspace;
struct gc_list *tmp;
tmp = ALLOC(struct gc_list);
@@ -812,14 +269,14 @@ rb_gc_register_address(VALUE *addr)
}
void
-rb_gc_unregister_address(VALUE *addr)
+rb_gc_unregister_address(addr)
+ VALUE *addr;
{
- rb_objspace_t *objspace = &rb_objspace;
struct gc_list *tmp = global_List;
if (tmp->varptr == addr) {
global_List = tmp->next;
- xfree(tmp);
+ RUBY_CRITICAL(free(tmp));
return;
}
while (tmp->next) {
@@ -827,86 +284,125 @@ rb_gc_unregister_address(VALUE *addr)
struct gc_list *t = tmp->next;
tmp->next = tmp->next->next;
- xfree(t);
+ RUBY_CRITICAL(free(t));
break;
}
tmp = tmp->next;
}
}
+#undef GC_DEBUG
-static void
-allocate_heaps(rb_objspace_t *objspace, size_t next_heaps_length)
+void
+rb_global_variable(var)
+ VALUE *var;
{
- struct heaps_slot *p;
- size_t size;
+ rb_gc_register_address(var);
+}
- size = next_heaps_length*sizeof(struct heaps_slot);
+#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__CYGWIN__)
+#pragma pack(push, 1) /* magic for reducing sizeof(RVALUE): 24 -> 20 */
+#endif
- if (heaps_used > 0) {
- p = (struct heaps_slot *)realloc(heaps, size);
- if (p) heaps = p;
- }
- else {
- p = heaps = (struct heaps_slot *)malloc(size);
- }
+typedef struct RVALUE {
+ union {
+ struct {
+ unsigned long flags; /* always 0 for freed obj */
+ struct RVALUE *next;
+ } free;
+ struct RBasic basic;
+ struct RObject object;
+ struct RClass klass;
+ struct RFloat flonum;
+ struct RString string;
+ struct RArray array;
+ struct RRegexp regexp;
+ struct RHash hash;
+ struct RData data;
+ struct RStruct rstruct;
+ struct RBignum bignum;
+ struct RFile file;
+ struct RNode node;
+ struct RMatch match;
+ struct RVarmap varmap;
+ struct SCOPE scope;
+ } as;
+#ifdef GC_DEBUG
+ char *file;
+ int line;
+#endif
+} RVALUE;
- if (p == 0) {
- during_gc = 0;
- rb_memerror();
- }
- heaps_length = next_heaps_length;
-}
+#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__CYGWIN__)
+#pragma pack(pop)
+#endif
-static void
-assign_heap_slot(rb_objspace_t *objspace)
-{
- RVALUE *p, *pend, *membase;
- size_t hi, lo, mid;
- size_t objs;
+static RVALUE *freelist = 0;
+static RVALUE *deferred_final_list = 0;
+
+#define HEAPS_INCREMENT 10
+static struct heaps_slot {
+ void *membase;
+ RVALUE *slot;
+ int limit;
+} *heaps;
+static int heaps_length = 0;
+static int heaps_used = 0;
- objs = HEAP_OBJ_LIMIT;
- p = (RVALUE*)malloc(HEAP_SIZE);
+#define HEAP_MIN_SLOTS 10000
+static int heap_slots = HEAP_MIN_SLOTS;
- if (p == 0) {
- during_gc = 0;
- rb_memerror();
- }
+#define FREE_MIN 4096
- membase = p;
- if ((VALUE)p % sizeof(RVALUE) != 0) {
- p = (RVALUE*)((VALUE)p + sizeof(RVALUE) - ((VALUE)p % sizeof(RVALUE)));
- if ((HEAP_SIZE - HEAP_OBJ_LIMIT * sizeof(RVALUE)) < (size_t)((char*)p - (char*)membase)) {
- objs--;
- }
+static RVALUE *himem, *lomem;
+
+static void
+add_heap()
+{
+ RVALUE *p, *pend;
+
+ if (heaps_used == heaps_length) {
+ /* Realloc heaps */
+ struct heaps_slot *p;
+ int length;
+
+ heaps_length += HEAPS_INCREMENT;
+ length = heaps_length*sizeof(struct heaps_slot);
+ RUBY_CRITICAL(
+ if (heaps_used > 0) {
+ p = (struct heaps_slot *)realloc(heaps, length);
+ if (p) heaps = p;
+ }
+ else {
+ p = heaps = (struct heaps_slot *)malloc(length);
+ });
+ if (p == 0) rb_memerror();
}
- lo = 0;
- hi = heaps_used;
- while (lo < hi) {
- register RVALUE *mid_membase;
- mid = (lo + hi) / 2;
- mid_membase = heaps[mid].membase;
- if (mid_membase < membase) {
- lo = mid + 1;
- }
- else if (mid_membase > membase) {
- hi = mid;
- }
- else {
- rb_bug("same heap slot is allocated: %p at %"PRIuVALUE, (void *)membase, (VALUE)mid);
+ for (;;) {
+ RUBY_CRITICAL(p = (RVALUE*)malloc(sizeof(RVALUE)*(heap_slots+1)));
+ if (p == 0) {
+ if (heap_slots == HEAP_MIN_SLOTS) {
+ rb_memerror();
+ }
+ heap_slots = HEAP_MIN_SLOTS;
+ continue;
}
+ heaps[heaps_used].membase = p;
+ if ((VALUE)p % sizeof(RVALUE) == 0)
+ heap_slots += 1;
+ else
+ p = (RVALUE*)((VALUE)p + sizeof(RVALUE) - ((VALUE)p % sizeof(RVALUE)));
+ heaps[heaps_used].slot = p;
+ heaps[heaps_used].limit = heap_slots;
+ break;
}
- if (hi < heaps_used) {
- MEMMOVE(&heaps[hi+1], &heaps[hi], struct heaps_slot, heaps_used - hi);
- }
- heaps[hi].membase = membase;
- heaps[hi].slot = p;
- heaps[hi].limit = objs;
- pend = p + objs;
+ pend = p + heap_slots;
if (lomem == 0 || lomem > p) lomem = p;
if (himem < pend) himem = pend;
heaps_used++;
+ heap_slots *= 1.8;
+ if (heap_slots <= 0) heap_slots = HEAP_MIN_SLOTS;
while (p < pend) {
p->as.free.flags = 0;
@@ -915,169 +411,34 @@ assign_heap_slot(rb_objspace_t *objspace)
p++;
}
}
-
-static void
-init_heap(rb_objspace_t *objspace)
-{
- size_t add, i;
-
- add = HEAP_MIN_SLOTS / HEAP_OBJ_LIMIT;
-
- if (!add) {
- add = 1;
- }
-
- if ((heaps_used + add) > heaps_length) {
- allocate_heaps(objspace, heaps_used + add);
- }
-
- for (i = 0; i < add; i++) {
- assign_heap_slot(objspace);
- }
- heaps_inc = 0;
- objspace->profile.invoke_time = getrusage_time();
-}
-
-
-static void
-set_heaps_increment(rb_objspace_t *objspace)
-{
- size_t next_heaps_length = (size_t)(heaps_used * 1.8);
-
- if (next_heaps_length == heaps_used) {
- next_heaps_length++;
- }
-
- heaps_inc = next_heaps_length - heaps_used;
-
- if (next_heaps_length > heaps_length) {
- allocate_heaps(objspace, next_heaps_length);
- }
-}
-
-static int
-heaps_increment(rb_objspace_t *objspace)
-{
- if (heaps_inc > 0) {
- assign_heap_slot(objspace);
- heaps_inc--;
- return TRUE;
- }
- return FALSE;
-}
-
#define RANY(o) ((RVALUE*)(o))
-static VALUE
-rb_newobj_from_heap(rb_objspace_t *objspace)
+VALUE
+rb_newobj()
{
VALUE obj;
- if ((ruby_gc_stress && !ruby_disable_gc_stress) || !freelist) {
- if (!heaps_increment(objspace) && !garbage_collect(objspace)) {
- during_gc = 0;
- rb_memerror();
- }
- }
+ if (during_gc)
+ rb_bug("object allocation during garbage collection phase");
+
+ if (ruby_gc_stress || !freelist) garbage_collect();
obj = (VALUE)freelist;
freelist = freelist->as.free.next;
-
MEMZERO((void*)obj, RVALUE, 1);
#ifdef GC_DEBUG
- RANY(obj)->file = rb_sourcefile();
- RANY(obj)->line = rb_sourceline();
+ RANY(obj)->file = ruby_sourcefile;
+ RANY(obj)->line = ruby_sourceline;
#endif
-
return obj;
}
-#if USE_VALUE_CACHE
-static VALUE
-rb_fill_value_cache(rb_thread_t *th)
-{
- rb_objspace_t *objspace = &rb_objspace;
- int i;
- VALUE rv;
-
- /* LOCK */
- for (i=0; i<RUBY_VM_VALUE_CACHE_SIZE; i++) {
- VALUE v = rb_newobj_from_heap(objspace);
-
- th->value_cache[i] = v;
- RBASIC(v)->flags = FL_MARK;
- }
- th->value_cache_ptr = &th->value_cache[0];
- rv = rb_newobj_from_heap(objspace);
- /* UNLOCK */
- return rv;
-}
-#endif
-
-int
-rb_during_gc(void)
-{
- rb_objspace_t *objspace = &rb_objspace;
- return during_gc;
-}
-
VALUE
-rb_newobj(void)
-{
-#if USE_VALUE_CACHE || (defined(ENABLE_VM_OBJSPACE) && ENABLE_VM_OBJSPACE)
- rb_thread_t *th = GET_THREAD();
-#endif
-#if USE_VALUE_CACHE
- VALUE v = *th->value_cache_ptr;
-#endif
-#if defined(ENABLE_VM_OBJSPACE) && ENABLE_VM_OBJSPACE
- rb_objspace_t *objspace = th->vm->objspace;
-#else
- rb_objspace_t *objspace = &rb_objspace;
-#endif
-
- if (during_gc) {
- dont_gc = 1;
- during_gc = 0;
- rb_bug("object allocation during garbage collection phase");
- }
-
-#if USE_VALUE_CACHE
- if (v) {
- RBASIC(v)->flags = 0;
- th->value_cache_ptr++;
- }
- else {
- v = rb_fill_value_cache(th);
- }
-
-#if defined(GC_DEBUG)
- printf("cache index: %d, v: %p, th: %p\n",
- th->value_cache_ptr - th->value_cache, v, th);
-#endif
- return v;
-#else
- return rb_newobj_from_heap(objspace);
-#endif
-}
-
-NODE*
-rb_node_newnode(enum node_type type, VALUE a0, VALUE a1, VALUE a2)
-{
- NODE *n = (NODE*)rb_newobj();
-
- n->flags |= T_NODE;
- nd_set_type(n, type);
-
- n->u1.value = a0;
- n->u2.value = a1;
- n->u3.value = a2;
-
- return n;
-}
-
-VALUE
-rb_data_object_alloc(VALUE klass, void *datap, RUBY_DATA_FUNC dmark, RUBY_DATA_FUNC dfree)
+rb_data_object_alloc(klass, datap, dmark, dfree)
+ VALUE klass;
+ void *datap;
+ RUBY_DATA_FUNC dmark;
+ RUBY_DATA_FUNC dfree;
{
NEWOBJ(data, struct RData);
if (klass) Check_Type(klass, T_CLASS);
@@ -1089,114 +450,108 @@ rb_data_object_alloc(VALUE klass, void *datap, RUBY_DATA_FUNC dmark, RUBY_DATA_F
return (VALUE)data;
}
-VALUE
-rb_data_typed_object_alloc(VALUE klass, void *datap, const rb_data_type_t *type)
-{
- NEWOBJ(data, struct RTypedData);
-
- if (klass) Check_Type(klass, T_CLASS);
-
- OBJSETUP(data, klass, T_DATA);
-
- data->data = datap;
- data->typed_flag = 1;
- data->type = type;
+extern st_table *rb_class_tbl;
+VALUE *rb_gc_stack_start = 0;
+#ifdef __ia64
+VALUE *rb_gc_register_stack_start = 0;
+#endif
- return (VALUE)data;
-}
+#ifdef DJGPP
+/* set stack size (http://www.delorie.com/djgpp/v2faq/faq15_9.html) */
+unsigned int _stklen = 0x180000; /* 1.5 kB */
+#endif
-size_t
-rb_objspace_data_type_memsize(VALUE obj)
-{
- if (RTYPEDDATA_P(obj)) {
- return RTYPEDDATA_TYPE(obj)->dsize(RTYPEDDATA_DATA(obj));
- }
- else {
- return 0;
- }
-}
+#if defined(DJGPP) || defined(_WIN32_WCE)
+static unsigned int STACK_LEVEL_MAX = 65535;
+#elif defined(__human68k__)
+unsigned int _stacksize = 262144;
+# define STACK_LEVEL_MAX (_stacksize - 4096)
+# undef HAVE_GETRLIMIT
+#elif defined(HAVE_GETRLIMIT) || defined(_WIN32)
+static unsigned int STACK_LEVEL_MAX = 655300;
+#else
+# define STACK_LEVEL_MAX 655300
+#endif
-const char *
-rb_objspace_data_type_name(VALUE obj)
+#ifdef C_ALLOCA
+# define SET_STACK_END VALUE stack_end; alloca(0);
+# define STACK_END (&stack_end)
+#else
+# if defined(__GNUC__) && defined(USE_BUILTIN_FRAME_ADDRESS) && !defined(__ia64)
+# if ( __GNUC__ == 3 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3
+__attribute__ ((noinline))
+# endif
+static void
+stack_end_address(VALUE **stack_end_p)
{
- if (RTYPEDDATA_P(obj)) {
- return RTYPEDDATA_TYPE(obj)->wrap_struct_name;
- }
- else {
- return 0;
- }
+ VALUE stack_end;
+ *stack_end_p = &stack_end;
}
-
-#ifdef __ia64
-#define SET_STACK_END (SET_MACHINE_STACK_END(&th->machine_stack_end), th->machine_register_stack_end = rb_ia64_bsp())
-#else
-#define SET_STACK_END SET_MACHINE_STACK_END(&th->machine_stack_end)
+# define SET_STACK_END VALUE *stack_end; stack_end_address(&stack_end)
+# else
+# define SET_STACK_END VALUE *stack_end = alloca(1)
+# endif
+# define STACK_END (stack_end)
#endif
-
-#define STACK_START (th->machine_stack_start)
-#define STACK_END (th->machine_stack_end)
-#define STACK_LEVEL_MAX (th->machine_stack_maxsize/sizeof(VALUE))
-
#if STACK_GROW_DIRECTION < 0
-# define STACK_LENGTH (size_t)(STACK_START - STACK_END)
+# define STACK_LENGTH (rb_gc_stack_start - STACK_END)
#elif STACK_GROW_DIRECTION > 0
-# define STACK_LENGTH (size_t)(STACK_END - STACK_START + 1)
+# define STACK_LENGTH (STACK_END - rb_gc_stack_start + 1)
#else
-# define STACK_LENGTH ((STACK_END < STACK_START) ? (size_t)(STACK_START - STACK_END) \
- : (size_t)(STACK_END - STACK_START + 1))
+# define STACK_LENGTH ((STACK_END < rb_gc_stack_start) ? rb_gc_stack_start - STACK_END\
+ : STACK_END - rb_gc_stack_start + 1)
#endif
-#if !STACK_GROW_DIRECTION
-int ruby_stack_grow_direction;
-int
-ruby_get_stack_grow_direction(volatile VALUE *addr)
+#if STACK_GROW_DIRECTION > 0
+# define STACK_UPPER(x, a, b) a
+#elif STACK_GROW_DIRECTION < 0
+# define STACK_UPPER(x, a, b) b
+#else
+static int grow_direction;
+static int
+stack_grow_direction(addr)
+ VALUE *addr;
{
- VALUE *end;
- SET_MACHINE_STACK_END(&end);
+ SET_STACK_END;
- if (end > addr) return ruby_stack_grow_direction = 1;
- return ruby_stack_grow_direction = -1;
+ if (STACK_END > addr) return grow_direction = 1;
+ return grow_direction = -1;
}
+# define stack_growup_p(x) ((grow_direction ? grow_direction : stack_grow_direction(x)) > 0)
+# define STACK_UPPER(x, a, b) (stack_growup_p(x) ? a : b)
#endif
#define GC_WATER_MARK 512
-size_t
-ruby_stack_length(VALUE **p)
+#define CHECK_STACK(ret) do {\
+ SET_STACK_END;\
+ (ret) = (STACK_LENGTH > STACK_LEVEL_MAX + GC_WATER_MARK);\
+} while (0)
+
+int
+ruby_stack_length(p)
+ VALUE **p;
{
- rb_thread_t *th = GET_THREAD();
SET_STACK_END;
- if (p) *p = STACK_UPPER(STACK_END, STACK_START, STACK_END);
+ if (p) *p = STACK_UPPER(STACK_END, rb_gc_stack_start, STACK_END);
return STACK_LENGTH;
}
-static int
-stack_check(void)
+int
+ruby_stack_check()
{
int ret;
- rb_thread_t *th = GET_THREAD();
- SET_STACK_END;
- ret = STACK_LENGTH > STACK_LEVEL_MAX - GC_WATER_MARK;
-#ifdef __ia64
- if (!ret) {
- ret = (VALUE*)rb_ia64_bsp() - th->machine_register_stack_start >
- th->machine_register_stack_maxsize/sizeof(VALUE) - GC_WATER_MARK;
- }
-#endif
+
+ CHECK_STACK(ret);
return ret;
}
-int
-ruby_stack_check(void)
-{
-#if defined(POSIX_SIGNAL) && defined(SIGSEGV) && defined(HAVE_SIGALTSTACK)
- return 0;
-#else
- return stack_check();
-#endif
-}
+#define MARK_STACK_MAX 1024
+static VALUE mark_stack[MARK_STACK_MAX];
+static VALUE *mark_stack_ptr;
+static int mark_stack_overflow;
static void
-init_mark_stack(rb_objspace_t *objspace)
+init_mark_stack()
{
mark_stack_overflow = 0;
mark_stack_ptr = mark_stack;
@@ -1204,22 +559,65 @@ init_mark_stack(rb_objspace_t *objspace)
#define MARK_STACK_EMPTY (mark_stack_ptr == mark_stack)
-static void gc_mark(rb_objspace_t *objspace, VALUE ptr, int lev);
-static void gc_mark_children(rb_objspace_t *objspace, VALUE ptr, int lev);
+static st_table *source_filenames;
+
+char *
+rb_source_filename(f)
+ const char *f;
+{
+ st_data_t name;
+
+ if (!st_lookup(source_filenames, (st_data_t)f, &name)) {
+ long len = strlen(f) + 1;
+ char *ptr = ALLOC_N(char, len + 1);
+ name = (st_data_t)ptr;
+ *ptr++ = 0;
+ MEMCPY(ptr, f, char, len);
+ st_add_direct(source_filenames, (st_data_t)ptr, name);
+ return ptr;
+ }
+ return (char *)name + 1;
+}
+
+static void
+mark_source_filename(f)
+ char *f;
+{
+ if (f) {
+ f[-1] = 1;
+ }
+}
+
+static int
+sweep_source_filename(key, value)
+ char *key, *value;
+{
+ if (*value) {
+ *value = 0;
+ return ST_CONTINUE;
+ }
+ else {
+ free(value);
+ return ST_DELETE;
+ }
+}
+
+static void gc_mark _((VALUE ptr, int lev));
+static void gc_mark_children _((VALUE ptr, int lev));
static void
-gc_mark_all(rb_objspace_t *objspace)
+gc_mark_all()
{
RVALUE *p, *pend;
- size_t i;
+ int i;
- init_mark_stack(objspace);
+ init_mark_stack();
for (i = 0; i < heaps_used; i++) {
p = heaps[i].slot; pend = p + heaps[i].limit;
while (p < pend) {
if ((p->as.basic.flags & FL_MARK) &&
(p->as.basic.flags != FL_MARK)) {
- gc_mark_children(objspace, (VALUE)p, 0);
+ gc_mark_children((VALUE)p, 0);
}
p++;
}
@@ -1227,228 +625,134 @@ gc_mark_all(rb_objspace_t *objspace)
}
static void
-gc_mark_rest(rb_objspace_t *objspace)
+gc_mark_rest()
{
VALUE tmp_arry[MARK_STACK_MAX];
VALUE *p;
p = (mark_stack_ptr - mark_stack) + tmp_arry;
- MEMCPY(tmp_arry, mark_stack, VALUE, p - tmp_arry);
+ MEMCPY(tmp_arry, mark_stack, VALUE, MARK_STACK_MAX);
- init_mark_stack(objspace);
- while (p != tmp_arry) {
+ init_mark_stack();
+ while(p != tmp_arry){
p--;
- gc_mark_children(objspace, *p, 0);
+ gc_mark_children(*p, 0);
}
}
static inline int
-is_pointer_to_heap(rb_objspace_t *objspace, void *ptr)
+is_pointer_to_heap(ptr)
+ void *ptr;
{
register RVALUE *p = RANY(ptr);
- register struct heaps_slot *heap;
- register size_t hi, lo, mid;
-
- if (p < lomem || p > himem) return FALSE;
- if ((VALUE)p % sizeof(RVALUE) != 0) return FALSE;
-
- /* check if p looks like a pointer using bsearch*/
- lo = 0;
- hi = heaps_used;
- while (lo < hi) {
- mid = (lo + hi) / 2;
- heap = &heaps[mid];
- if (heap->slot <= p) {
- if (p < heap->slot + heap->limit)
- return TRUE;
- lo = mid + 1;
- }
- else {
- hi = mid;
- }
+ register RVALUE *heap_org;
+ register long i;
+
+ if (p < lomem || p > himem) return Qfalse;
+ if ((VALUE)p % sizeof(RVALUE) != 0) return Qfalse;
+
+ /* check if p looks like a pointer */
+ for (i=0; i < heaps_used; i++) {
+ heap_org = heaps[i].slot;
+ if (heap_org <= p && p < heap_org + heaps[i].limit)
+ return Qtrue;
}
- return FALSE;
+ return Qfalse;
}
static void
-mark_locations_array(rb_objspace_t *objspace, register VALUE *x, register long n)
+mark_locations_array(x, n)
+ register VALUE *x;
+ register long n;
{
VALUE v;
while (n--) {
v = *x;
- VALGRIND_MAKE_MEM_DEFINED(&v, sizeof(v));
- if (is_pointer_to_heap(objspace, (void *)v)) {
- gc_mark(objspace, v, 0);
+ if (is_pointer_to_heap((void *)v)) {
+ gc_mark(v, 0);
}
x++;
}
}
-static void
-gc_mark_locations(rb_objspace_t *objspace, VALUE *start, VALUE *end)
+void
+rb_gc_mark_locations(start, end)
+ VALUE *start, *end;
{
long n;
- if (end <= start) return;
n = end - start;
- mark_locations_array(objspace, start, n);
-}
-
-void
-rb_gc_mark_locations(VALUE *start, VALUE *end)
-{
- gc_mark_locations(&rb_objspace, start, end);
+ mark_locations_array(start,n);
}
-#define rb_gc_mark_locations(start, end) gc_mark_locations(objspace, start, end)
-
-struct mark_tbl_arg {
- rb_objspace_t *objspace;
- int lev;
-};
-
static int
-mark_entry(ID key, VALUE value, st_data_t data)
-{
- struct mark_tbl_arg *arg = (void*)data;
- gc_mark(arg->objspace, value, arg->lev);
- return ST_CONTINUE;
-}
-
-static void
-mark_tbl(rb_objspace_t *objspace, st_table *tbl, int lev)
-{
- struct mark_tbl_arg arg;
- if (!tbl) return;
- arg.objspace = objspace;
- arg.lev = lev;
- st_foreach(tbl, mark_entry, (st_data_t)&arg);
-}
-
-static int
-mark_key(VALUE key, VALUE value, st_data_t data)
+mark_entry(key, value, lev)
+ ID key;
+ VALUE value;
+ int lev;
{
- struct mark_tbl_arg *arg = (void*)data;
- gc_mark(arg->objspace, key, arg->lev);
+ gc_mark(value, lev);
return ST_CONTINUE;
}
static void
-mark_set(rb_objspace_t *objspace, st_table *tbl, int lev)
+mark_tbl(tbl, lev)
+ st_table *tbl;
+ int lev;
{
- struct mark_tbl_arg arg;
if (!tbl) return;
- arg.objspace = objspace;
- arg.lev = lev;
- st_foreach(tbl, mark_key, (st_data_t)&arg);
+ st_foreach(tbl, mark_entry, lev);
}
void
-rb_mark_set(st_table *tbl)
+rb_mark_tbl(tbl)
+ st_table *tbl;
{
- mark_set(&rb_objspace, tbl, 0);
+ mark_tbl(tbl, 0);
}
static int
-mark_keyvalue(VALUE key, VALUE value, st_data_t data)
-{
- struct mark_tbl_arg *arg = (void*)data;
- gc_mark(arg->objspace, key, arg->lev);
- gc_mark(arg->objspace, value, arg->lev);
- return ST_CONTINUE;
-}
-
-static void
-mark_hash(rb_objspace_t *objspace, st_table *tbl, int lev)
-{
- struct mark_tbl_arg arg;
- if (!tbl) return;
- arg.objspace = objspace;
- arg.lev = lev;
- st_foreach(tbl, mark_keyvalue, (st_data_t)&arg);
-}
-
-void
-rb_mark_hash(st_table *tbl)
-{
- mark_hash(&rb_objspace, tbl, 0);
-}
-
-static void
-mark_method_entry(rb_objspace_t *objspace, const rb_method_entry_t *me, int lev)
-{
- const rb_method_definition_t *def = me->def;
-
- gc_mark(objspace, me->klass, lev);
- if (!def) return;
- switch (def->type) {
- case VM_METHOD_TYPE_ISEQ:
- gc_mark(objspace, def->body.iseq->self, lev);
- break;
- case VM_METHOD_TYPE_BMETHOD:
- gc_mark(objspace, def->body.proc, lev);
- break;
- default:
- break; /* ignore */
- }
-}
-
-void
-rb_gc_mark_method_entry(const rb_method_entry_t *me)
-{
- mark_method_entry(&rb_objspace, me, 0);
-}
-
-static int
-mark_method_entry_i(ID key, const rb_method_entry_t *me, st_data_t data)
+mark_keyvalue(key, value, lev)
+ VALUE key;
+ VALUE value;
+ int lev;
{
- struct mark_tbl_arg *arg = (void*)data;
- mark_method_entry(arg->objspace, me, arg->lev);
+ gc_mark(key, lev);
+ gc_mark(value, lev);
return ST_CONTINUE;
}
static void
-mark_m_tbl(rb_objspace_t *objspace, st_table *tbl, int lev)
+mark_hash(tbl, lev)
+ st_table *tbl;
+ int lev;
{
- struct mark_tbl_arg arg;
if (!tbl) return;
- arg.objspace = objspace;
- arg.lev = lev;
- st_foreach(tbl, mark_method_entry_i, (st_data_t)&arg);
-}
-
-static int
-free_method_entry_i(ID key, rb_method_entry_t *me, st_data_t data)
-{
- rb_free_method_entry(me);
- return ST_CONTINUE;
-}
-
-static void
-free_m_table(st_table *tbl)
-{
- st_foreach(tbl, free_method_entry_i, 0);
- st_free_table(tbl);
+ st_foreach(tbl, mark_keyvalue, lev);
}
void
-rb_mark_tbl(st_table *tbl)
+rb_mark_hash(tbl)
+ st_table *tbl;
{
- mark_tbl(&rb_objspace, tbl, 0);
+ mark_hash(tbl, 0);
}
void
-rb_gc_mark_maybe(VALUE obj)
+rb_gc_mark_maybe(obj)
+ VALUE obj;
{
- if (is_pointer_to_heap(&rb_objspace, (void *)obj)) {
- gc_mark(&rb_objspace, obj, 0);
+ if (is_pointer_to_heap((void *)obj)) {
+ gc_mark(obj, 0);
}
}
#define GC_LEVEL_MAX 250
static void
-gc_mark(rb_objspace_t *objspace, VALUE ptr, int lev)
+gc_mark(ptr, lev)
+ VALUE ptr;
+ int lev;
{
register RVALUE *obj;
@@ -1458,7 +762,7 @@ gc_mark(rb_objspace_t *objspace, VALUE ptr, int lev)
if (obj->as.basic.flags & FL_MARK) return; /* already marked */
obj->as.basic.flags |= FL_MARK;
- if (lev > GC_LEVEL_MAX || (lev == 0 && stack_check())) {
+ if (lev > GC_LEVEL_MAX || (lev == 0 && ruby_stack_check())) {
if (!mark_stack_overflow) {
if (mark_stack_ptr - mark_stack < MARK_STACK_MAX) {
*mark_stack_ptr = ptr;
@@ -1470,17 +774,20 @@ gc_mark(rb_objspace_t *objspace, VALUE ptr, int lev)
}
return;
}
- gc_mark_children(objspace, ptr, lev+1);
+ gc_mark_children(ptr, lev+1);
}
void
-rb_gc_mark(VALUE ptr)
+rb_gc_mark(ptr)
+ VALUE ptr;
{
- gc_mark(&rb_objspace, ptr, 0);
+ gc_mark(ptr, 0);
}
static void
-gc_mark_children(rb_objspace_t *objspace, VALUE ptr, int lev)
+gc_mark_children(ptr, lev)
+ VALUE ptr;
+ int lev;
{
register RVALUE *obj = RANY(ptr);
@@ -1498,47 +805,47 @@ gc_mark_children(rb_objspace_t *objspace, VALUE ptr, int lev)
rb_mark_generic_ivar(ptr);
}
- switch (BUILTIN_TYPE(obj)) {
+ switch (obj->as.basic.flags & T_MASK) {
case T_NIL:
case T_FIXNUM:
rb_bug("rb_gc_mark() called for broken object");
break;
case T_NODE:
+ mark_source_filename(obj->as.node.nd_file);
switch (nd_type(obj)) {
case NODE_IF: /* 1,2,3 */
case NODE_FOR:
case NODE_ITER:
+ case NODE_CREF:
case NODE_WHEN:
case NODE_MASGN:
case NODE_RESCUE:
case NODE_RESBODY:
case NODE_CLASS:
- case NODE_BLOCK_PASS:
- gc_mark(objspace, (VALUE)obj->as.node.u2.node, lev);
+ gc_mark((VALUE)obj->as.node.u2.node, lev);
/* fall through */
case NODE_BLOCK: /* 1,3 */
- case NODE_OPTBLOCK:
case NODE_ARRAY:
case NODE_DSTR:
case NODE_DXSTR:
case NODE_DREGX:
case NODE_DREGX_ONCE:
+ case NODE_FBODY:
case NODE_ENSURE:
case NODE_CALL:
case NODE_DEFS:
case NODE_OP_ASGN1:
- case NODE_ARGS:
- gc_mark(objspace, (VALUE)obj->as.node.u1.node, lev);
+ gc_mark((VALUE)obj->as.node.u1.node, lev);
/* fall through */
case NODE_SUPER: /* 3 */
case NODE_FCALL:
case NODE_DEFN:
- case NODE_ARGS_AUX:
+ case NODE_NEWLINE:
ptr = (VALUE)obj->as.node.u3.node;
goto again;
- case NODE_WHILE:
+ case NODE_WHILE: /* 1,2 */
case NODE_UNTIL:
case NODE_AND:
case NODE_OR:
@@ -1555,21 +862,22 @@ gc_mark_children(rb_objspace_t *objspace, VALUE ptr, int lev)
case NODE_MODULE:
case NODE_ALIAS:
case NODE_VALIAS:
- case NODE_ARGSCAT:
- gc_mark(objspace, (VALUE)obj->as.node.u1.node, lev);
+ case NODE_ARGS:
+ gc_mark((VALUE)obj->as.node.u1.node, lev);
/* fall through */
+ case NODE_METHOD: /* 2 */
+ case NODE_NOT:
case NODE_GASGN:
case NODE_LASGN:
case NODE_DASGN:
case NODE_DASGN_CURR:
case NODE_IASGN:
- case NODE_IASGN2:
+ case NODE_CVDECL:
case NODE_CVASGN:
case NODE_COLON3:
case NODE_OPT_N:
case NODE_EVSTR:
case NODE_UNDEF:
- case NODE_POSTEXE:
ptr = (VALUE)obj->as.node.u2.node;
goto again;
@@ -1586,18 +894,20 @@ gc_mark_children(rb_objspace_t *objspace, VALUE ptr, int lev)
case NODE_COLON2:
case NODE_SPLAT:
case NODE_TO_ARY:
+ case NODE_SVALUE:
ptr = (VALUE)obj->as.node.u1.node;
goto again;
case NODE_SCOPE: /* 2,3 */
+ case NODE_BLOCK_PASS:
case NODE_CDECL:
- case NODE_OPT_ARG:
- gc_mark(objspace, (VALUE)obj->as.node.u3.node, lev);
+ gc_mark((VALUE)obj->as.node.u3.node, lev);
ptr = (VALUE)obj->as.node.u2.node;
goto again;
case NODE_ZARRAY: /* - */
case NODE_ZSUPER:
+ case NODE_CFUNC:
case NODE_VCALL:
case NODE_GVAR:
case NODE_LVAR:
@@ -1612,184 +922,150 @@ gc_mark_children(rb_objspace_t *objspace, VALUE ptr, int lev)
case NODE_NIL:
case NODE_TRUE:
case NODE_FALSE:
- case NODE_ERRINFO:
+ case NODE_ATTRSET:
case NODE_BLOCK_ARG:
+ case NODE_POSTEXE:
break;
case NODE_ALLOCA:
- mark_locations_array(objspace,
- (VALUE*)obj->as.node.u1.value,
+ mark_locations_array((VALUE*)obj->as.node.u1.value,
obj->as.node.u3.cnt);
ptr = (VALUE)obj->as.node.u2.node;
goto again;
default: /* unlisted NODE */
- if (is_pointer_to_heap(objspace, obj->as.node.u1.node)) {
- gc_mark(objspace, (VALUE)obj->as.node.u1.node, lev);
+ if (is_pointer_to_heap(obj->as.node.u1.node)) {
+ gc_mark((VALUE)obj->as.node.u1.node, lev);
}
- if (is_pointer_to_heap(objspace, obj->as.node.u2.node)) {
- gc_mark(objspace, (VALUE)obj->as.node.u2.node, lev);
+ if (is_pointer_to_heap(obj->as.node.u2.node)) {
+ gc_mark((VALUE)obj->as.node.u2.node, lev);
}
- if (is_pointer_to_heap(objspace, obj->as.node.u3.node)) {
- gc_mark(objspace, (VALUE)obj->as.node.u3.node, lev);
+ if (is_pointer_to_heap(obj->as.node.u3.node)) {
+ gc_mark((VALUE)obj->as.node.u3.node, lev);
}
}
return; /* no need to mark class. */
}
- gc_mark(objspace, obj->as.basic.klass, lev);
- switch (BUILTIN_TYPE(obj)) {
+ gc_mark(obj->as.basic.klass, lev);
+ switch (obj->as.basic.flags & T_MASK) {
case T_ICLASS:
case T_CLASS:
case T_MODULE:
- mark_m_tbl(objspace, RCLASS_M_TBL(obj), lev);
- mark_tbl(objspace, RCLASS_IV_TBL(obj), lev);
- ptr = RCLASS_SUPER(obj);
+ mark_tbl(obj->as.klass.m_tbl, lev);
+ mark_tbl(obj->as.klass.iv_tbl, lev);
+ ptr = obj->as.klass.super;
goto again;
case T_ARRAY:
if (FL_TEST(obj, ELTS_SHARED)) {
- ptr = obj->as.array.as.heap.aux.shared;
+ ptr = obj->as.array.aux.shared;
goto again;
}
else {
- long i, len = RARRAY_LEN(obj);
- VALUE *ptr = RARRAY_PTR(obj);
+ long i, len = obj->as.array.len;
+ VALUE *ptr = obj->as.array.ptr;
+
for (i=0; i < len; i++) {
- gc_mark(objspace, *ptr++, lev);
+ gc_mark(*ptr++, lev);
}
}
break;
case T_HASH:
- mark_hash(objspace, obj->as.hash.ntbl, lev);
+ mark_hash(obj->as.hash.tbl, lev);
ptr = obj->as.hash.ifnone;
goto again;
case T_STRING:
#define STR_ASSOC FL_USER3 /* copied from string.c */
- if (FL_TEST(obj, RSTRING_NOEMBED) && FL_ANY(obj, ELTS_SHARED|STR_ASSOC)) {
- ptr = obj->as.string.as.heap.aux.shared;
+ if (FL_TEST(obj, ELTS_SHARED|STR_ASSOC)) {
+ ptr = obj->as.string.aux.shared;
goto again;
}
break;
case T_DATA:
- if (RTYPEDDATA_P(obj)) {
- if (obj->as.typeddata.type->dmark) (*obj->as.typeddata.type->dmark)(DATA_PTR(obj));
- }
- else {
- if (obj->as.data.dmark) (*obj->as.data.dmark)(DATA_PTR(obj));
- }
+ if (obj->as.data.dmark) (*obj->as.data.dmark)(DATA_PTR(obj));
break;
case T_OBJECT:
- {
- long i, len = ROBJECT_NUMIV(obj);
- VALUE *ptr = ROBJECT_IVPTR(obj);
- for (i = 0; i < len; i++) {
- gc_mark(objspace, *ptr++, lev);
- }
- }
+ mark_tbl(obj->as.object.iv_tbl, lev);
break;
case T_FILE:
- if (obj->as.file.fptr) {
- gc_mark(objspace, obj->as.file.fptr->pathv, lev);
- gc_mark(objspace, obj->as.file.fptr->tied_io_for_writing, lev);
- gc_mark(objspace, obj->as.file.fptr->writeconv_asciicompat, lev);
- gc_mark(objspace, obj->as.file.fptr->writeconv_pre_ecopts, lev);
- gc_mark(objspace, obj->as.file.fptr->encs.ecopts, lev);
- gc_mark(objspace, obj->as.file.fptr->write_lock, lev);
- }
- break;
-
case T_REGEXP:
- gc_mark(objspace, obj->as.regexp.src, lev);
- break;
-
case T_FLOAT:
case T_BIGNUM:
- case T_ZOMBIE:
+ case T_BLKTAG:
break;
case T_MATCH:
- gc_mark(objspace, obj->as.match.regexp, lev);
if (obj->as.match.str) {
ptr = obj->as.match.str;
goto again;
}
break;
- case T_RATIONAL:
- gc_mark(objspace, obj->as.rational.num, lev);
- gc_mark(objspace, obj->as.rational.den, lev);
- break;
+ case T_VARMAP:
+ gc_mark(obj->as.varmap.val, lev);
+ ptr = (VALUE)obj->as.varmap.next;
+ goto again;
+
+ case T_SCOPE:
+ if (obj->as.scope.local_vars && (obj->as.scope.flags & SCOPE_MALLOC)) {
+ int n = obj->as.scope.local_tbl[0]+1;
+ VALUE *vars = &obj->as.scope.local_vars[-1];
- case T_COMPLEX:
- gc_mark(objspace, obj->as.complex.real, lev);
- gc_mark(objspace, obj->as.complex.imag, lev);
+ while (n--) {
+ gc_mark(*vars++, lev);
+ }
+ }
break;
case T_STRUCT:
{
- long len = RSTRUCT_LEN(obj);
- VALUE *ptr = RSTRUCT_PTR(obj);
+ long len = obj->as.rstruct.len;
+ VALUE *ptr = obj->as.rstruct.ptr;
while (len--) {
- gc_mark(objspace, *ptr++, lev);
+ gc_mark(*ptr++, lev);
}
}
break;
default:
- rb_bug("rb_gc_mark(): unknown data type 0x%x(%p) %s",
- BUILTIN_TYPE(obj), (void *)obj,
- is_pointer_to_heap(objspace, obj) ? "corrupted object" : "non object");
+ rb_bug("rb_gc_mark(): unknown data type 0x%lx(0x%lx) %s",
+ obj->as.basic.flags & T_MASK, obj,
+ is_pointer_to_heap(obj) ? "corrupted object" : "non object");
}
}
-static int obj_free(rb_objspace_t *, VALUE);
-
-static inline void
-add_freelist(rb_objspace_t *objspace, RVALUE *p)
-{
- VALGRIND_MAKE_MEM_UNDEFINED((void*)p, sizeof(RVALUE));
- p->as.free.flags = 0;
- p->as.free.next = freelist;
- freelist = p;
-}
+static void obj_free _((VALUE));
static void
-finalize_list(rb_objspace_t *objspace, RVALUE *p)
+finalize_list(p)
+ RVALUE *p;
{
while (p) {
RVALUE *tmp = p->as.free.next;
- run_final(objspace, (VALUE)p);
+ run_final((VALUE)p);
if (!FL_TEST(p, FL_SINGLETON)) { /* not freeing page */
- add_freelist(objspace, p);
- }
- else {
- struct heaps_slot *slot = (struct heaps_slot *)RDATA(p)->dmark;
- slot->limit--;
+ p->as.free.flags = 0;
+ p->as.free.next = freelist;
+ freelist = p;
}
p = tmp;
}
}
static void
-free_unused_heaps(rb_objspace_t *objspace)
+free_unused_heaps()
{
- size_t i, j;
- RVALUE *last = 0;
+ int i, j;
for (i = j = 1; j < heaps_used; i++) {
if (heaps[i].limit == 0) {
- if (!last) {
- last = heaps[i].membase;
- }
- else {
- free(heaps[i].membase);
- }
+ free(heaps[i].membase);
heaps_used--;
}
else {
@@ -1799,63 +1075,71 @@ free_unused_heaps(rb_objspace_t *objspace)
j++;
}
}
- if (last) {
- if (last < heaps_freed) {
- free(heaps_freed);
- heaps_freed = last;
- }
- else {
- free(last);
- }
- }
}
+void rb_gc_abort_threads(void);
+
static void
-gc_sweep(rb_objspace_t *objspace)
+gc_sweep()
{
RVALUE *p, *pend, *final_list;
- size_t freed = 0;
- size_t i;
- size_t live = 0, free_min = 0, do_heap_free = 0;
-
- do_heap_free = (size_t)((heaps_used * HEAP_OBJ_LIMIT) * 0.65);
- free_min = (size_t)((heaps_used * HEAP_OBJ_LIMIT) * 0.2);
+ int freed = 0;
+ int i;
+ unsigned long live = 0;
+ unsigned long free_min = 0;
- if (free_min < FREE_MIN) {
- do_heap_free = heaps_used * HEAP_OBJ_LIMIT;
+ for (i = 0; i < heaps_used; i++) {
+ free_min += heaps[i].limit;
+ }
+ free_min = free_min * 0.2;
+ if (free_min < FREE_MIN)
free_min = FREE_MIN;
+
+ if (ruby_in_compile && ruby_parser_stack_on_heap()) {
+ /* should not reclaim nodes during compilation
+ if yacc's semantic stack is not allocated on machine stack */
+ for (i = 0; i < heaps_used; i++) {
+ p = heaps[i].slot; pend = p + heaps[i].limit;
+ while (p < pend) {
+ if (!(p->as.basic.flags&FL_MARK) && BUILTIN_TYPE(p) == T_NODE)
+ gc_mark((VALUE)p, 0);
+ p++;
+ }
+ }
+ }
+
+ mark_source_filename(ruby_sourcefile);
+ if (source_filenames) {
+ st_foreach(source_filenames, sweep_source_filename, 0);
}
freelist = 0;
final_list = deferred_final_list;
deferred_final_list = 0;
for (i = 0; i < heaps_used; i++) {
- size_t free_num = 0, final_num = 0;
+ int n = 0;
RVALUE *free = freelist;
RVALUE *final = final_list;
- int deferred;
p = heaps[i].slot; pend = p + heaps[i].limit;
while (p < pend) {
if (!(p->as.basic.flags & FL_MARK)) {
- if (p->as.basic.flags &&
- ((deferred = obj_free(objspace, (VALUE)p)) ||
- ((FL_TEST(p, FL_FINALIZE)) && need_call_final))) {
- if (!deferred) {
- p->as.free.flags = T_ZOMBIE;
- RDATA(p)->dfree = 0;
- }
- p->as.free.flags |= FL_MARK;
+ if (p->as.basic.flags) {
+ obj_free((VALUE)p);
+ }
+ if (need_call_final && FL_TEST(p, FL_FINALIZE)) {
+ p->as.free.flags = FL_MARK; /* remain marked */
p->as.free.next = final_list;
final_list = p;
- final_num++;
}
else {
- add_freelist(objspace, p);
- free_num++;
+ p->as.free.flags = 0;
+ p->as.free.next = freelist;
+ freelist = p;
}
+ n++;
}
- else if (BUILTIN_TYPE(p) == T_ZOMBIE) {
+ else if (RBASIC(p)->flags == FL_MARK) {
/* objects to be finalized */
/* do nothing remain marked */
}
@@ -1865,71 +1149,51 @@ gc_sweep(rb_objspace_t *objspace)
}
p++;
}
- if (final_num + free_num == heaps[i].limit && freed > do_heap_free) {
+ if (n == heaps[i].limit && freed > free_min) {
RVALUE *pp;
+ heaps[i].limit = 0;
for (pp = final_list; pp != final; pp = pp->as.free.next) {
- RDATA(pp)->dmark = (void *)&heaps[i];
pp->as.free.flags |= FL_SINGLETON; /* freeing page mark */
}
- heaps[i].limit = final_num;
-
freelist = free; /* cancel this page from freelist */
}
else {
- freed += free_num;
+ freed += n;
}
}
- GC_PROF_SET_MALLOC_INFO;
if (malloc_increase > malloc_limit) {
- malloc_limit += (size_t)((malloc_increase - malloc_limit) * (double)live / (live + freed));
+ malloc_limit += (malloc_increase - malloc_limit) * (double)live / (live + freed);
if (malloc_limit < GC_MALLOC_LIMIT) malloc_limit = GC_MALLOC_LIMIT;
}
malloc_increase = 0;
if (freed < free_min) {
- set_heaps_increment(objspace);
- heaps_increment(objspace);
+ add_heap();
}
during_gc = 0;
/* clear finalization list */
if (final_list) {
- GC_PROF_SET_HEAP_INFO;
deferred_final_list = final_list;
- RUBY_VM_SET_FINALIZER_INTERRUPT(GET_THREAD());
- }
- else{
- free_unused_heaps(objspace);
- GC_PROF_SET_HEAP_INFO;
+ return;
}
+ free_unused_heaps();
}
void
-rb_gc_force_recycle(VALUE p)
-{
- rb_objspace_t *objspace = &rb_objspace;
- add_freelist(objspace, (RVALUE *)p);
-}
-
-static inline void
-make_deferred(RVALUE *p)
-{
- p->as.basic.flags = (p->as.basic.flags & ~T_MASK) | T_ZOMBIE;
-}
-
-static inline void
-make_io_deferred(RVALUE *p)
+rb_gc_force_recycle(p)
+ VALUE p;
{
- rb_io_t *fptr = p->as.file.fptr;
- make_deferred(p);
- p->as.data.dfree = (void (*)(void*))rb_io_fptr_finalize;
- p->as.data.data = fptr;
+ RANY(p)->as.free.flags = 0;
+ RANY(p)->as.free.next = freelist;
+ freelist = RANY(p);
}
-static int
-obj_free(rb_objspace_t *objspace, VALUE obj)
+static void
+obj_free(obj)
+ VALUE obj;
{
- switch (BUILTIN_TYPE(obj)) {
+ switch (RANY(obj)->as.basic.flags & T_MASK) {
case T_NIL:
case T_FIXNUM:
case T_TRUE:
@@ -1940,205 +1204,226 @@ obj_free(rb_objspace_t *objspace, VALUE obj)
if (FL_TEST(obj, FL_EXIVAR)) {
rb_free_generic_ivar((VALUE)obj);
- FL_UNSET(obj, FL_EXIVAR);
}
- switch (BUILTIN_TYPE(obj)) {
+ switch (RANY(obj)->as.basic.flags & T_MASK) {
case T_OBJECT:
- if (!(RANY(obj)->as.basic.flags & ROBJECT_EMBED) &&
- RANY(obj)->as.object.as.heap.ivptr) {
- xfree(RANY(obj)->as.object.as.heap.ivptr);
+ if (RANY(obj)->as.object.iv_tbl) {
+ st_free_table(RANY(obj)->as.object.iv_tbl);
}
break;
case T_MODULE:
case T_CLASS:
rb_clear_cache_by_class((VALUE)obj);
- free_m_table(RCLASS_M_TBL(obj));
- if (RCLASS_IV_TBL(obj)) {
- st_free_table(RCLASS_IV_TBL(obj));
- }
- if (RCLASS_IV_INDEX_TBL(obj)) {
- st_free_table(RCLASS_IV_INDEX_TBL(obj));
+ st_free_table(RANY(obj)->as.klass.m_tbl);
+ if (RANY(obj)->as.object.iv_tbl) {
+ st_free_table(RANY(obj)->as.object.iv_tbl);
}
- xfree(RANY(obj)->as.klass.ptr);
break;
case T_STRING:
- rb_str_free(obj);
+ if (RANY(obj)->as.string.ptr && !FL_TEST(obj, ELTS_SHARED)) {
+ RUBY_CRITICAL(free(RANY(obj)->as.string.ptr));
+ }
break;
case T_ARRAY:
- rb_ary_free(obj);
+ if (RANY(obj)->as.array.ptr && !FL_TEST(obj, ELTS_SHARED)) {
+ RUBY_CRITICAL(free(RANY(obj)->as.array.ptr));
+ }
break;
case T_HASH:
- if (RANY(obj)->as.hash.ntbl) {
- st_free_table(RANY(obj)->as.hash.ntbl);
+ if (RANY(obj)->as.hash.tbl) {
+ st_free_table(RANY(obj)->as.hash.tbl);
}
break;
case T_REGEXP:
if (RANY(obj)->as.regexp.ptr) {
- onig_free(RANY(obj)->as.regexp.ptr);
+ re_free_pattern(RANY(obj)->as.regexp.ptr);
+ }
+ if (RANY(obj)->as.regexp.str) {
+ RUBY_CRITICAL(free(RANY(obj)->as.regexp.str));
}
break;
case T_DATA:
if (DATA_PTR(obj)) {
- if (RTYPEDDATA_P(obj)) {
- RDATA(obj)->dfree = RANY(obj)->as.typeddata.type->dfree;
- }
if ((long)RANY(obj)->as.data.dfree == -1) {
- xfree(DATA_PTR(obj));
+ RUBY_CRITICAL(free(DATA_PTR(obj)));
}
else if (RANY(obj)->as.data.dfree) {
- make_deferred(RANY(obj));
- return 1;
+ (*RANY(obj)->as.data.dfree)(DATA_PTR(obj));
}
}
break;
case T_MATCH:
- if (RANY(obj)->as.match.rmatch) {
- struct rmatch *rm = RANY(obj)->as.match.rmatch;
- onig_region_free(&rm->regs, 0);
- if (rm->char_offset)
- xfree(rm->char_offset);
- xfree(rm);
+ if (RANY(obj)->as.match.regs) {
+ re_free_registers(RANY(obj)->as.match.regs);
+ RUBY_CRITICAL(free(RANY(obj)->as.match.regs));
}
break;
case T_FILE:
if (RANY(obj)->as.file.fptr) {
- make_io_deferred(RANY(obj));
- return 1;
+ rb_io_fptr_finalize(RANY(obj)->as.file.fptr);
+ RUBY_CRITICAL(free(RANY(obj)->as.file.fptr));
}
break;
- case T_RATIONAL:
- case T_COMPLEX:
- break;
case T_ICLASS:
/* iClass shares table with the module */
break;
case T_FLOAT:
+ case T_VARMAP:
+ case T_BLKTAG:
break;
case T_BIGNUM:
- if (!(RBASIC(obj)->flags & RBIGNUM_EMBED_FLAG) && RBIGNUM_DIGITS(obj)) {
- xfree(RBIGNUM_DIGITS(obj));
+ if (RANY(obj)->as.bignum.digits) {
+ RUBY_CRITICAL(free(RANY(obj)->as.bignum.digits));
}
break;
case T_NODE:
switch (nd_type(obj)) {
case NODE_SCOPE:
if (RANY(obj)->as.node.u1.tbl) {
- xfree(RANY(obj)->as.node.u1.tbl);
+ RUBY_CRITICAL(free(RANY(obj)->as.node.u1.tbl));
}
break;
case NODE_ALLOCA:
- xfree(RANY(obj)->as.node.u1.node);
+ RUBY_CRITICAL(free(RANY(obj)->as.node.u1.node));
break;
}
- break; /* no need to free iv_tbl */
+ return; /* no need to free iv_tbl */
+
+ case T_SCOPE:
+ if (RANY(obj)->as.scope.local_vars &&
+ RANY(obj)->as.scope.flags != SCOPE_ALLOCA) {
+ VALUE *vars = RANY(obj)->as.scope.local_vars-1;
+ if (!(RANY(obj)->as.scope.flags & SCOPE_CLONE) && vars[0] == 0)
+ RUBY_CRITICAL(free(RANY(obj)->as.scope.local_tbl));
+ if (RANY(obj)->as.scope.flags & SCOPE_MALLOC)
+ RUBY_CRITICAL(free(vars));
+ }
+ break;
case T_STRUCT:
- if ((RBASIC(obj)->flags & RSTRUCT_EMBED_LEN_MASK) == 0 &&
- RANY(obj)->as.rstruct.as.heap.ptr) {
- xfree(RANY(obj)->as.rstruct.as.heap.ptr);
+ if (RANY(obj)->as.rstruct.ptr) {
+ RUBY_CRITICAL(free(RANY(obj)->as.rstruct.ptr));
}
break;
default:
- rb_bug("gc_sweep(): unknown data type 0x%x(%p)",
- BUILTIN_TYPE(obj), (void*)obj);
+ rb_bug("gc_sweep(): unknown data type 0x%lx(0x%lx)",
+ RANY(obj)->as.basic.flags & T_MASK, obj);
}
-
- return 0;
}
-#define GC_NOTIFY 0
-
-void rb_vm_mark(void *ptr);
-
-static void
-mark_current_machine_context(rb_objspace_t *objspace, rb_thread_t *th)
+void
+rb_gc_mark_frame(frame)
+ struct FRAME *frame;
{
- rb_jmp_buf save_regs_gc_mark;
- VALUE *stack_start, *stack_end;
+ gc_mark((VALUE)frame->node, 0);
+}
- SET_STACK_END;
-#if STACK_GROW_DIRECTION < 0
- stack_start = th->machine_stack_end;
- stack_end = th->machine_stack_start;
-#elif STACK_GROW_DIRECTION > 0
- stack_start = th->machine_stack_start;
- stack_end = th->machine_stack_end + 1;
+#ifdef __GNUC__
+#if defined(__human68k__) || defined(DJGPP)
+#undef rb_setjmp
+#undef rb_jmp_buf
+#if defined(__human68k__)
+typedef unsigned long rb_jmp_buf[8];
+__asm__ (".even\n\
+_rb_setjmp:\n\
+ move.l 4(sp),a0\n\
+ movem.l d3-d7/a3-a5,(a0)\n\
+ moveq.l #0,d0\n\
+ rts");
#else
- if (th->machine_stack_end < th->machine_stack_start) {
- stack_start = th->machine_stack_end;
- stack_end = th->machine_stack_start;
- }
- else {
- stack_start = th->machine_stack_start;
- stack_end = th->machine_stack_end + 1;
- }
-#endif
-
- FLUSH_REGISTER_WINDOWS;
- /* This assumes that all registers are saved into the jmp_buf (and stack) */
- rb_setjmp(save_regs_gc_mark);
- mark_locations_array(objspace,
- (VALUE*)save_regs_gc_mark,
- sizeof(save_regs_gc_mark) / sizeof(VALUE));
-
- rb_gc_mark_locations(stack_start, stack_end);
-#ifdef __ia64
- rb_gc_mark_locations(th->machine_register_stack_start, th->machine_register_stack_end);
+#if defined(DJGPP)
+typedef unsigned long rb_jmp_buf[6];
+__asm__ (".align 4\n\
+_rb_setjmp:\n\
+ pushl %ebp\n\
+ movl %esp,%ebp\n\
+ movl 8(%ebp),%ebp\n\
+ movl %eax,(%ebp)\n\
+ movl %ebx,4(%ebp)\n\
+ movl %ecx,8(%ebp)\n\
+ movl %edx,12(%ebp)\n\
+ movl %esi,16(%ebp)\n\
+ movl %edi,20(%ebp)\n\
+ popl %ebp\n\
+ xorl %eax,%eax\n\
+ ret");
#endif
-#if defined(__mc68000__)
- mark_locations_array((VALUE*)((char*)STACK_END + 2),
- (STACK_START - STACK_END));
#endif
-}
-
-void rb_gc_mark_encodings(void);
+int rb_setjmp (rb_jmp_buf);
+#endif /* __human68k__ or DJGPP */
+#endif /* __GNUC__ */
-static int
-garbage_collect(rb_objspace_t *objspace)
+static void
+garbage_collect()
{
struct gc_list *list;
- rb_thread_t *th = GET_THREAD();
- INIT_GC_PROF_PARAMS;
-
- if (GC_NOTIFY) printf("start garbage_collect()\n");
+ struct FRAME * volatile frame; /* gcc 2.7.2.3 -O2 bug?? */
+ jmp_buf save_regs_gc_mark;
+ SET_STACK_END;
- if (!heaps) {
- return FALSE;
+#ifdef HAVE_NATIVETHREAD
+ if (!is_ruby_native_thread()) {
+ rb_bug("cross-thread violation on rb_gc()");
}
-
+#endif
if (dont_gc || during_gc) {
if (!freelist) {
- if (!heaps_increment(objspace)) {
- set_heaps_increment(objspace);
- heaps_increment(objspace);
- }
+ add_heap();
}
- return TRUE;
+ return;
}
+ if (during_gc) return;
during_gc++;
- objspace->count++;
-
- GC_PROF_TIMER_START;
- GC_PROF_MARK_TIMER_START;
- SET_STACK_END;
- init_mark_stack(objspace);
+ init_mark_stack();
- th->vm->self ? rb_gc_mark(th->vm->self) : rb_vm_mark(th->vm);
+ gc_mark((VALUE)ruby_current_node, 0);
+ /* mark frame stack */
+ for (frame = ruby_frame; frame; frame = frame->prev) {
+ rb_gc_mark_frame(frame);
+ if (frame->tmp) {
+ struct FRAME *tmp = frame->tmp;
+ while (tmp) {
+ rb_gc_mark_frame(tmp);
+ tmp = tmp->prev;
+ }
+ }
+ }
+ gc_mark((VALUE)ruby_scope, 0);
+ gc_mark((VALUE)ruby_dyna_vars, 0);
if (finalizer_table) {
- mark_tbl(objspace, finalizer_table, 0);
+ mark_tbl(finalizer_table, 0);
}
- mark_current_machine_context(objspace, th);
-
+ FLUSH_REGISTER_WINDOWS;
+ /* This assumes that all registers are saved into the jmp_buf (and stack) */
+ rb_setjmp(save_regs_gc_mark);
+ mark_locations_array((VALUE*)save_regs_gc_mark, sizeof(save_regs_gc_mark) / sizeof(VALUE *));
+#if STACK_GROW_DIRECTION < 0
+ rb_gc_mark_locations((VALUE*)STACK_END, rb_gc_stack_start);
+#elif STACK_GROW_DIRECTION > 0
+ rb_gc_mark_locations(rb_gc_stack_start, (VALUE*)STACK_END + 1);
+#else
+ if ((VALUE*)STACK_END < rb_gc_stack_start)
+ rb_gc_mark_locations((VALUE*)STACK_END, rb_gc_stack_start);
+ else
+ rb_gc_mark_locations(rb_gc_stack_start, (VALUE*)STACK_END + 1);
+#endif
+#ifdef __ia64
+ /* mark backing store (flushed register window on the stack) */
+ /* the basic idea from guile GC code */
+ rb_gc_mark_locations(rb_gc_register_stack_start, (VALUE*)rb_ia64_bsp());
+#endif
+#if defined(__human68k__) || defined(__mc68000__)
+ rb_gc_mark_locations((VALUE*)((char*)STACK_END + 2),
+ (VALUE*)((char*)rb_gc_stack_start + 2));
+#endif
rb_gc_mark_threads();
- rb_gc_mark_symbols();
- rb_gc_mark_encodings();
/* mark protected global variables */
for (list = global_List; list; list = list->next) {
@@ -2147,7 +1432,8 @@ garbage_collect(rb_objspace_t *objspace)
rb_mark_end_proc();
rb_gc_mark_global_tbl();
- mark_tbl(objspace, rb_class_tbl, 0);
+ rb_mark_tbl(rb_class_tbl);
+ rb_gc_mark_trap_list();
/* mark generic instance variables for special constants */
rb_mark_generic_ivar_tbl();
@@ -2155,53 +1441,28 @@ garbage_collect(rb_objspace_t *objspace)
rb_gc_mark_parser();
/* gc_mark objects whose marking are not completed*/
- while (!MARK_STACK_EMPTY) {
- if (mark_stack_overflow) {
- gc_mark_all(objspace);
- }
- else {
- gc_mark_rest(objspace);
+ do {
+ while (!MARK_STACK_EMPTY) {
+ if (mark_stack_overflow){
+ gc_mark_all();
+ }
+ else {
+ gc_mark_rest();
+ }
}
- }
- GC_PROF_MARK_TIMER_STOP;
+ rb_gc_abort_threads();
+ } while (!MARK_STACK_EMPTY);
- GC_PROF_SWEEP_TIMER_START;
- gc_sweep(objspace);
- GC_PROF_SWEEP_TIMER_STOP;
-
- GC_PROF_TIMER_STOP;
- if (GC_NOTIFY) printf("end garbage_collect()\n");
- return TRUE;
-}
-
-int
-rb_garbage_collect(void)
-{
- return garbage_collect(&rb_objspace);
+ gc_sweep();
}
void
-rb_gc_mark_machine_stack(rb_thread_t *th)
+rb_gc()
{
- rb_objspace_t *objspace = &rb_objspace;
-#if STACK_GROW_DIRECTION < 0
- rb_gc_mark_locations(th->machine_stack_end, th->machine_stack_start);
-#elif STACK_GROW_DIRECTION > 0
- rb_gc_mark_locations(th->machine_stack_start, th->machine_stack_end);
-#else
- if (th->machine_stack_start < th->machine_stack_end) {
- rb_gc_mark_locations(th->machine_stack_start, th->machine_stack_end);
- }
- else {
- rb_gc_mark_locations(th->machine_stack_end, th->machine_stack_start);
- }
-#endif
-#ifdef __ia64
- rb_gc_mark_locations(th->machine_register_stack_start, th->machine_register_stack_end);
-#endif
+ garbage_collect();
+ rb_gc_finalize_deferred();
}
-
/*
* call-seq:
* GC.start => nil
@@ -2213,18 +1474,128 @@ rb_gc_mark_machine_stack(rb_thread_t *th)
*/
VALUE
-rb_gc_start(void)
+rb_gc_start()
{
rb_gc();
return Qnil;
}
-#undef Init_stack
+void
+ruby_set_stack_size(size)
+ size_t size;
+{
+#ifndef STACK_LEVEL_MAX
+ STACK_LEVEL_MAX = size / sizeof(VALUE);
+#endif
+}
void
-Init_stack(volatile VALUE *addr)
+Init_stack(addr)
+ VALUE *addr;
+{
+#ifdef __ia64
+ if (rb_gc_register_stack_start == 0) {
+# if defined(__FreeBSD__)
+ /*
+ * FreeBSD/ia64 currently does not have a way for a process to get the
+ * base address for the RSE backing store, so hardcode it.
+ */
+ rb_gc_register_stack_start = (4ULL<<61);
+# elif defined(HAVE___LIBC_IA64_REGISTER_BACKING_STORE_BASE)
+# pragma weak __libc_ia64_register_backing_store_base
+ extern unsigned long __libc_ia64_register_backing_store_base;
+ rb_gc_register_stack_start = (VALUE*)__libc_ia64_register_backing_store_base;
+# endif
+ }
+ {
+ VALUE *bsp = (VALUE*)rb_ia64_bsp();
+ if (rb_gc_register_stack_start == 0 ||
+ bsp < rb_gc_register_stack_start) {
+ rb_gc_register_stack_start = bsp;
+ }
+ }
+#endif
+#if defined(_WIN32) || defined(__CYGWIN__)
+ MEMORY_BASIC_INFORMATION m;
+ memset(&m, 0, sizeof(m));
+ VirtualQuery(&m, &m, sizeof(m));
+ rb_gc_stack_start =
+ STACK_UPPER((VALUE *)&m, (VALUE *)m.BaseAddress,
+ (VALUE *)((char *)m.BaseAddress + m.RegionSize) - 1);
+#elif defined(STACK_END_ADDRESS)
+ {
+ extern void *STACK_END_ADDRESS;
+ rb_gc_stack_start = STACK_END_ADDRESS;
+ }
+#else
+ if (!addr) addr = (void *)&addr;
+ STACK_UPPER(&addr, addr, ++addr);
+ if (rb_gc_stack_start) {
+ if (STACK_UPPER(&addr,
+ rb_gc_stack_start > addr,
+ rb_gc_stack_start < addr))
+ rb_gc_stack_start = addr;
+ return;
+ }
+ rb_gc_stack_start = addr;
+#endif
+#ifdef HAVE_GETRLIMIT
+ {
+ struct rlimit rlim;
+
+ if (getrlimit(RLIMIT_STACK, &rlim) == 0) {
+ unsigned int space = rlim.rlim_cur/5;
+
+ if (space > 1024*1024) space = 1024*1024;
+ STACK_LEVEL_MAX = (rlim.rlim_cur - space) / sizeof(VALUE);
+ }
+ }
+#endif
+}
+
+void ruby_init_stack(VALUE *addr
+#ifdef __ia64
+ , void *bsp
+#endif
+ )
{
- ruby_init_stack(addr);
+ if (!rb_gc_stack_start ||
+ STACK_UPPER(&addr,
+ rb_gc_stack_start > addr,
+ rb_gc_stack_start < addr)) {
+ rb_gc_stack_start = addr;
+ }
+#ifdef __ia64
+ if (!rb_gc_register_stack_start ||
+ (VALUE*)bsp < rb_gc_register_stack_start) {
+ rb_gc_register_stack_start = (VALUE*)bsp;
+ }
+#endif
+#ifdef HAVE_GETRLIMIT
+ {
+ struct rlimit rlim;
+
+ if (getrlimit(RLIMIT_STACK, &rlim) == 0) {
+ unsigned int space = rlim.rlim_cur/5;
+
+ if (space > 1024*1024) space = 1024*1024;
+ STACK_LEVEL_MAX = (rlim.rlim_cur - space) / sizeof(VALUE);
+ }
+ }
+#elif defined _WIN32
+ {
+ MEMORY_BASIC_INFORMATION mi;
+ DWORD size;
+ DWORD space;
+
+ if (VirtualQuery(&mi, &mi, sizeof(mi))) {
+ size = (char *)mi.BaseAddress - (char *)mi.AllocationBase;
+ space = size / 5;
+ if (space > 1024*1024) space = 1024*1024;
+ STACK_LEVEL_MAX = (size - space) / sizeof(VALUE);
+ }
+ }
+#endif
}
/*
@@ -2259,133 +1630,50 @@ Init_stack(volatile VALUE *addr)
*/
void
-Init_heap(void)
+Init_heap()
{
- init_heap(&rb_objspace);
-}
-
-/*
- * rb_objspace_each_objects() is special C API to walk through
- * Ruby object space. This C API is too difficult to use it.
- * To be frank, you should not use it. Or you need to read the
- * source code of this function and understand what this function does.
- *
- * 'callback' will be called several times (the number of heap slot,
- * at current implementation) with:
- * vstart: a pointer to the first living object of the heap_slot.
- * vend: a pointer to next to the valid heap_slot area.
- * stride: a distance to next VALUE.
- *
- * If callback() returns non-zero, the iteration will be stopped.
- *
- * This is a sample callback code to iterate liveness objects:
- *
- * int
- * sample_callback(void *vstart, void *vend, int stride, void *data) {
- * VALUE v = (VALUE)vstart;
- * for (; v != (VALUE)vend; v += stride) {
- * if (RBASIC(v)->flasgs) { // liveness check
- * // do something with live object 'v'
- * }
- * return 0; // continue to iteration
- * }
- *
- * Note: 'vstart' is not a top of heap_slot. This point the first
- * living object to grasp at least one object to avoid GC issue.
- * This means that you can not walk through all Ruby object slot
- * including freed object slot.
- *
- * Note: On this implementation, 'stride' is same as sizeof(RVALUE).
- * However, there are possibilities to pass variable values with
- * 'stride' with some reasons. You must use stride instead of
- * use some constant value in the iteration.
- */
-void
-rb_objspace_each_objects(int (*callback)(void *vstart, void *vend,
- size_t stride, void *d),
- void *data)
-{
- size_t i;
- RVALUE *membase = 0;
- RVALUE *pstart, *pend;
- rb_objspace_t *objspace = &rb_objspace;
- volatile VALUE v;
-
- i = 0;
- while (i < heaps_used) {
- while (0 < i && (uintptr_t)membase < (uintptr_t)heaps[i-1].membase)
- i--;
- while (i < heaps_used && (uintptr_t)heaps[i].membase <= (uintptr_t)membase )
- i++;
- if (heaps_used <= i)
- break;
- membase = heaps[i].membase;
-
- pstart = heaps[i].slot;
- pend = pstart + heaps[i].limit;
-
- for (; pstart != pend; pstart++) {
- if (pstart->as.basic.flags) {
- v = (VALUE)pstart; /* acquire to save this object */
- break;
- }
- }
- if (pstart != pend) {
- if ((*callback)(pstart, pend, sizeof(RVALUE), data)) {
- return;
- }
- }
+ if (!rb_gc_stack_start) {
+ Init_stack(0);
}
-
- return;
+ add_heap();
}
-struct os_each_struct {
- size_t num;
+static VALUE
+os_obj_of(of)
VALUE of;
-};
-
-static int
-os_obj_of_i(void *vstart, void *vend, size_t stride, void *data)
{
- struct os_each_struct *oes = (struct os_each_struct *)data;
- RVALUE *p = (RVALUE *)vstart, *pend = (RVALUE *)vend;
+ int i;
+ int n = 0;
volatile VALUE v;
- for (; p != pend; p++) {
- if (p->as.basic.flags) {
- switch (BUILTIN_TYPE(p)) {
- case T_NONE:
- case T_ICLASS:
- case T_NODE:
- case T_ZOMBIE:
- continue;
- case T_CLASS:
- if (FL_TEST(p, FL_SINGLETON))
- continue;
- default:
- if (!p->as.basic.klass) continue;
- v = (VALUE)p;
- if (!oes->of || rb_obj_is_kind_of(v, oes->of)) {
- rb_yield(v);
- oes->num++;
+ for (i = 0; i < heaps_used; i++) {
+ RVALUE *p, *pend;
+
+ p = heaps[i].slot; pend = p + heaps[i].limit;
+ for (;p < pend; p++) {
+ if (p->as.basic.flags) {
+ switch (BUILTIN_TYPE(p)) {
+ case T_NONE:
+ case T_ICLASS:
+ case T_VARMAP:
+ case T_SCOPE:
+ case T_NODE:
+ continue;
+ case T_CLASS:
+ if (FL_TEST(p, FL_SINGLETON)) continue;
+ default:
+ if (!p->as.basic.klass) continue;
+ v = (VALUE)p;
+ if (!of || rb_obj_is_kind_of(v, of)) {
+ rb_yield(v);
+ n++;
+ }
}
}
}
}
- return 0;
-}
-
-static VALUE
-os_obj_of(VALUE of)
-{
- struct os_each_struct oes;
-
- oes.num = 0;
- oes.of = of;
- rb_objspace_each_objects(os_obj_of_i, &oes);
- return SIZET2NUM(oes.num);
+ return INT2FIX(n);
}
/*
@@ -2422,7 +1710,10 @@ os_obj_of(VALUE of)
*/
static VALUE
-os_each_obj(int argc, VALUE *argv, VALUE os)
+os_each_obj(argc, argv, os)
+ int argc;
+ VALUE *argv;
+ VALUE os;
{
VALUE of;
@@ -2437,6 +1728,60 @@ os_each_obj(int argc, VALUE *argv, VALUE os)
return os_obj_of(of);
}
+static VALUE finalizers;
+
+/* deprecated
+ */
+
+static VALUE
+add_final(os, block)
+ VALUE os, block;
+{
+ rb_warn("ObjectSpace::add_finalizer is deprecated; use define_finalizer");
+ if (!rb_respond_to(block, rb_intern("call"))) {
+ rb_raise(rb_eArgError, "wrong type argument %s (should be callable)",
+ rb_obj_classname(block));
+ }
+ rb_ary_push(finalizers, block);
+ return block;
+}
+
+/*
+ * deprecated
+ */
+static VALUE
+rm_final(os, block)
+ VALUE os, block;
+{
+ rb_warn("ObjectSpace::remove_finalizer is deprecated; use undefine_finalizer");
+ rb_ary_delete(finalizers, block);
+ return block;
+}
+
+/*
+ * deprecated
+ */
+static VALUE
+finals()
+{
+ rb_warn("ObjectSpace::finalizers is deprecated");
+ return finalizers;
+}
+
+/*
+ * deprecated
+ */
+
+static VALUE
+call_final(os, obj)
+ VALUE os, obj;
+{
+ rb_warn("ObjectSpace::call_finalizer is deprecated; use define_finalizer");
+ need_call_final = 1;
+ FL_SET(obj, FL_FINALIZE);
+ return obj;
+}
+
/*
* call-seq:
* ObjectSpace.undefine_finalizer(obj)
@@ -2446,14 +1791,12 @@ os_each_obj(int argc, VALUE *argv, VALUE os)
*/
static VALUE
-undefine_final(VALUE os, VALUE obj)
+undefine_final(os, obj)
+ VALUE os, obj;
{
- rb_objspace_t *objspace = &rb_objspace;
- if (OBJ_FROZEN(obj)) rb_error_frozen("object");
if (finalizer_table) {
st_delete(finalizer_table, (st_data_t*)&obj, 0);
}
- FL_UNSET(obj, FL_FINALIZE);
return obj;
}
@@ -2467,13 +1810,14 @@ undefine_final(VALUE os, VALUE obj)
*/
static VALUE
-define_final(int argc, VALUE *argv, VALUE os)
+define_final(argc, argv, os)
+ int argc;
+ VALUE *argv;
+ VALUE os;
{
- rb_objspace_t *objspace = &rb_objspace;
VALUE obj, block, table;
rb_scan_args(argc, argv, "11", &obj, &block);
- if (OBJ_FROZEN(obj)) rb_error_frozen("object");
if (argc == 1) {
block = rb_block_proc();
}
@@ -2481,14 +1825,10 @@ define_final(int argc, VALUE *argv, VALUE os)
rb_raise(rb_eArgError, "wrong type argument %s (should be callable)",
rb_obj_classname(block));
}
- if (!FL_ABLE(obj)) {
- rb_raise(rb_eArgError, "cannot define finalizer for %s",
- rb_obj_classname(obj));
- }
- RBASIC(obj)->flags |= FL_FINALIZE;
+ need_call_final = 1;
+ FL_SET(obj, FL_FINALIZE);
- block = rb_ary_new3(2, INT2FIX(rb_safe_level()), block);
- OBJ_FREEZE(block);
+ block = rb_ary_new3(2, INT2FIX(ruby_safe_level), block);
if (!finalizer_table) {
finalizer_table = st_init_numtable();
@@ -2497,17 +1837,15 @@ define_final(int argc, VALUE *argv, VALUE os)
rb_ary_push(table, block);
}
else {
- table = rb_ary_new3(1, block);
- RBASIC(table)->klass = 0;
- st_add_direct(finalizer_table, obj, table);
+ st_add_direct(finalizer_table, obj, rb_ary_new3(1, block));
}
return block;
}
void
-rb_gc_copy_finalizer(VALUE dest, VALUE obj)
+rb_gc_copy_finalizer(dest, obj)
+ VALUE dest, obj;
{
- rb_objspace_t *objspace = &rb_objspace;
VALUE table;
if (!finalizer_table) return;
@@ -2515,163 +1853,102 @@ rb_gc_copy_finalizer(VALUE dest, VALUE obj)
if (st_lookup(finalizer_table, obj, &table)) {
st_insert(finalizer_table, dest, table);
}
- FL_SET(dest, FL_FINALIZE);
+ RBASIC(dest)->flags |= FL_FINALIZE;
}
static VALUE
-run_single_final(VALUE arg)
+run_single_final(args)
+ VALUE *args;
{
- VALUE *args = (VALUE *)arg;
rb_eval_cmd(args[0], args[1], (int)args[2]);
return Qnil;
}
static void
-run_final(rb_objspace_t *objspace, VALUE obj)
+run_final(obj)
+ VALUE obj;
{
long i;
- int status;
+ int status, critical_save = rb_thread_critical;
VALUE args[3], table, objid;
- RUBY_DATA_FUNC free_func = 0;
objid = rb_obj_id(obj); /* make obj into id */
- RBASIC(obj)->klass = 0;
-
- if (RTYPEDDATA_P(obj)) {
- free_func = RTYPEDDATA_TYPE(obj)->dfree;
- }
- else {
- free_func = RDATA(obj)->dfree;
- }
- if (free_func) {
- (*free_func)(DATA_PTR(obj));
- }
-
- if (finalizer_table &&
- st_delete(finalizer_table, (st_data_t*)&obj, &table)) {
- args[1] = 0;
- args[2] = (VALUE)rb_safe_level();
- if (!args[1] && RARRAY_LEN(table) > 0) {
- args[1] = rb_obj_freeze(rb_ary_new3(1, objid));
- }
- for (i=0; i<RARRAY_LEN(table); i++) {
- VALUE final = RARRAY_PTR(table)[i];
- args[0] = RARRAY_PTR(final)[1];
- args[2] = FIX2INT(RARRAY_PTR(final)[0]);
- rb_protect(run_single_final, (VALUE)args, &status);
+ rb_thread_critical = Qtrue;
+ args[1] = 0;
+ args[2] = (VALUE)ruby_safe_level;
+ for (i=0; i<RARRAY(finalizers)->len; i++) {
+ args[0] = RARRAY(finalizers)->ptr[i];
+ if (!args[1]) args[1] = rb_ary_new3(1, objid);
+ rb_protect((VALUE(*)_((VALUE)))run_single_final, (VALUE)args, &status);
+ }
+ if (finalizer_table && st_delete(finalizer_table, (st_data_t*)&obj, &table)) {
+ for (i=0; i<RARRAY(table)->len; i++) {
+ VALUE final = RARRAY(table)->ptr[i];
+ args[0] = RARRAY(final)->ptr[1];
+ if (!args[1]) args[1] = rb_ary_new3(1, objid);
+ args[2] = FIX2INT(RARRAY(final)->ptr[0]);
+ rb_protect((VALUE(*)_((VALUE)))run_single_final, (VALUE)args, &status);
}
}
+ rb_thread_critical = critical_save;
}
-static void
-finalize_deferred(rb_objspace_t *objspace)
+void
+rb_gc_finalize_deferred()
{
RVALUE *p = deferred_final_list;
- deferred_final_list = 0;
+ deferred_final_list = 0;
if (p) {
- finalize_list(objspace, p);
- }
-}
-
-static void
-gc_finalize_deferred(rb_objspace_t *objspace)
-{
- finalize_deferred(objspace);
- free_unused_heaps(objspace);
-}
-
-void
-rb_gc_finalize_deferred(void)
-{
- gc_finalize_deferred(&rb_objspace);
-}
-
-static int
-chain_finalized_object(st_data_t key, st_data_t val, st_data_t arg)
-{
- RVALUE *p = (RVALUE *)key, **final_list = (RVALUE **)arg;
- if (p->as.basic.flags & FL_FINALIZE) {
- if (BUILTIN_TYPE(p) != T_ZOMBIE) {
- p->as.free.flags = FL_MARK | T_ZOMBIE; /* remain marked */
- RDATA(p)->dfree = 0;
- }
- p->as.free.next = *final_list;
- *final_list = p;
- return ST_CONTINUE;
- }
- else {
- return ST_DELETE;
+ finalize_list(p);
+ free_unused_heaps();
}
}
void
-rb_gc_call_finalizer_at_exit(void)
+rb_gc_call_finalizer_at_exit()
{
- rb_objspace_t *objspace = &rb_objspace;
RVALUE *p, *pend;
- RVALUE *final_list = 0;
- size_t i;
+ int i;
/* run finalizers */
- if (finalizer_table) {
- finalize_deferred(objspace);
- while (finalizer_table->num_entries > 0) {
- st_foreach(finalizer_table, chain_finalized_object,
- (st_data_t)&final_list);
- if (!(p = final_list)) break;
- do {
- final_list = p->as.free.next;
- run_final(objspace, (VALUE)p);
- } while ((p = final_list) != 0);
+ if (need_call_final) {
+ p = deferred_final_list;
+ deferred_final_list = 0;
+ finalize_list(p);
+ for (i = 0; i < heaps_used; i++) {
+ p = heaps[i].slot; pend = p + heaps[i].limit;
+ while (p < pend) {
+ if (FL_TEST(p, FL_FINALIZE)) {
+ FL_UNSET(p, FL_FINALIZE);
+ p->as.basic.klass = 0;
+ run_final((VALUE)p);
+ }
+ p++;
+ }
}
- st_free_table(finalizer_table);
- finalizer_table = 0;
}
- /* finalizers are part of garbage collection */
- during_gc++;
/* run data object's finalizers */
for (i = 0; i < heaps_used; i++) {
p = heaps[i].slot; pend = p + heaps[i].limit;
while (p < pend) {
if (BUILTIN_TYPE(p) == T_DATA &&
- DATA_PTR(p) && RANY(p)->as.data.dfree &&
- RANY(p)->as.basic.klass != rb_cThread && RANY(p)->as.basic.klass != rb_cMutex) {
+ DATA_PTR(p) && RANY(p)->as.data.dfree) {
p->as.free.flags = 0;
- if (RTYPEDDATA_P(p)) {
- RDATA(p)->dfree = RANY(p)->as.typeddata.type->dfree;
- }
if ((long)RANY(p)->as.data.dfree == -1) {
- xfree(DATA_PTR(p));
+ RUBY_CRITICAL(free(DATA_PTR(p)));
}
else if (RANY(p)->as.data.dfree) {
- make_deferred(RANY(p));
- RANY(p)->as.free.next = final_list;
- final_list = p;
+ (*RANY(p)->as.data.dfree)(DATA_PTR(p));
}
}
else if (BUILTIN_TYPE(p) == T_FILE) {
- if (RANY(p)->as.file.fptr) {
- make_io_deferred(RANY(p));
- RANY(p)->as.free.next = final_list;
- final_list = p;
- }
+ p->as.free.flags = 0;
+ rb_io_fptr_finalize(RANY(p)->as.file.fptr);
}
p++;
}
}
- during_gc = 0;
- if (final_list) {
- finalize_list(objspace, final_list);
- }
-}
-
-void
-rb_gc(void)
-{
- rb_objspace_t *objspace = &rb_objspace;
- garbage_collect(objspace);
- gc_finalize_deferred(objspace);
}
/*
@@ -2688,21 +1965,14 @@ rb_gc(void)
*/
static VALUE
-id2ref(VALUE obj, VALUE objid)
+id2ref(obj, objid)
+ VALUE obj, objid;
{
-#if SIZEOF_LONG == SIZEOF_VOIDP
-#define NUM2PTR(x) NUM2ULONG(x)
-#elif SIZEOF_LONG_LONG == SIZEOF_VOIDP
-#define NUM2PTR(x) NUM2ULL(x)
-#endif
- rb_objspace_t *objspace = &rb_objspace;
- VALUE ptr;
- void *p0;
+ unsigned long ptr, p0;
+ int type;
rb_secure(4);
- ptr = NUM2PTR(objid);
- p0 = (void *)ptr;
-
+ p0 = ptr = NUM2ULONG(objid);
if (ptr == Qtrue) return Qtrue;
if (ptr == Qfalse) return Qfalse;
if (ptr == Qnil) return Qnil;
@@ -2712,16 +1982,16 @@ id2ref(VALUE obj, VALUE objid)
if ((ptr % sizeof(RVALUE)) == (4 << 2)) {
ID symid = ptr / sizeof(RVALUE);
if (rb_id2name(symid) == 0)
- rb_raise(rb_eRangeError, "%p is not symbol id value", p0);
- return ID2SYM(symid);
+ rb_raise(rb_eRangeError, "%p is not symbol id value", p0);
+ return ID2SYM(symid);
}
- if (!is_pointer_to_heap(objspace, (void *)ptr) ||
- BUILTIN_TYPE(ptr) > T_FIXNUM || BUILTIN_TYPE(ptr) == T_ICLASS) {
- rb_raise(rb_eRangeError, "%p is not id value", p0);
+ if (!is_pointer_to_heap((void *)ptr)||
+ (type = BUILTIN_TYPE(ptr)) >= T_BLKTAG || type == T_ICLASS) {
+ rb_raise(rb_eRangeError, "0x%lx is not id value", p0);
}
if (BUILTIN_TYPE(ptr) == 0 || RBASIC(ptr)->klass == 0) {
- rb_raise(rb_eRangeError, "%p is recycled object", p0);
+ rb_raise(rb_eRangeError, "0x%lx is recycled object", p0);
}
return (VALUE)ptr;
}
@@ -2788,283 +2058,9 @@ rb_obj_id(VALUE obj)
return (SYM2ID(obj) * sizeof(RVALUE) + (4 << 2)) | FIXNUM_FLAG;
}
if (SPECIAL_CONST_P(obj)) {
- return LONG2NUM((SIGNED_VALUE)obj);
- }
- return (VALUE)((SIGNED_VALUE)obj|FIXNUM_FLAG);
-}
-
-static int
-set_zero(st_data_t key, st_data_t val, st_data_t arg)
-{
- VALUE k = (VALUE)key;
- VALUE hash = (VALUE)arg;
- rb_hash_aset(hash, k, INT2FIX(0));
- return ST_CONTINUE;
-}
-
-/*
- * call-seq:
- * ObjectSpace.count_objects([result_hash]) -> hash
- *
- * Counts objects for each type.
- *
- * It returns a hash as:
- * {:TOTAL=>10000, :FREE=>3011, :T_OBJECT=>6, :T_CLASS=>404, ...}
- *
- * If the optional argument, result_hash, is given,
- * it is overwritten and returned.
- * This is intended to avoid probe effect.
- *
- * The contents of the returned hash is implementation defined.
- * It may be changed in future.
- *
- * This method is not expected to work except C Ruby.
- *
- */
-
-static VALUE
-count_objects(int argc, VALUE *argv, VALUE os)
-{
- rb_objspace_t *objspace = &rb_objspace;
- size_t counts[T_MASK+1];
- size_t freed = 0;
- size_t total = 0;
- size_t i;
- VALUE hash;
-
- if (rb_scan_args(argc, argv, "01", &hash) == 1) {
- if (TYPE(hash) != T_HASH)
- rb_raise(rb_eTypeError, "non-hash given");
- }
-
- for (i = 0; i <= T_MASK; i++) {
- counts[i] = 0;
- }
-
- for (i = 0; i < heaps_used; i++) {
- RVALUE *p, *pend;
-
- p = heaps[i].slot; pend = p + heaps[i].limit;
- for (;p < pend; p++) {
- if (p->as.basic.flags) {
- counts[BUILTIN_TYPE(p)]++;
- }
- else {
- freed++;
- }
- }
- total += heaps[i].limit;
- }
-
- if (hash == Qnil) {
- hash = rb_hash_new();
- }
- else if (!RHASH_EMPTY_P(hash)) {
- st_foreach(RHASH_TBL(hash), set_zero, hash);
- }
- rb_hash_aset(hash, ID2SYM(rb_intern("TOTAL")), SIZET2NUM(total));
- rb_hash_aset(hash, ID2SYM(rb_intern("FREE")), SIZET2NUM(freed));
-
- for (i = 0; i <= T_MASK; i++) {
- VALUE type;
- switch (i) {
-#define COUNT_TYPE(t) case t: type = ID2SYM(rb_intern(#t)); break;
- COUNT_TYPE(T_NONE);
- COUNT_TYPE(T_OBJECT);
- COUNT_TYPE(T_CLASS);
- COUNT_TYPE(T_MODULE);
- COUNT_TYPE(T_FLOAT);
- COUNT_TYPE(T_STRING);
- COUNT_TYPE(T_REGEXP);
- COUNT_TYPE(T_ARRAY);
- COUNT_TYPE(T_HASH);
- COUNT_TYPE(T_STRUCT);
- COUNT_TYPE(T_BIGNUM);
- COUNT_TYPE(T_FILE);
- COUNT_TYPE(T_DATA);
- COUNT_TYPE(T_MATCH);
- COUNT_TYPE(T_COMPLEX);
- COUNT_TYPE(T_RATIONAL);
- COUNT_TYPE(T_NIL);
- COUNT_TYPE(T_TRUE);
- COUNT_TYPE(T_FALSE);
- COUNT_TYPE(T_SYMBOL);
- COUNT_TYPE(T_FIXNUM);
- COUNT_TYPE(T_UNDEF);
- COUNT_TYPE(T_NODE);
- COUNT_TYPE(T_ICLASS);
- COUNT_TYPE(T_ZOMBIE);
-#undef COUNT_TYPE
- default: type = INT2NUM(i); break;
- }
- if (counts[i])
- rb_hash_aset(hash, type, SIZET2NUM(counts[i]));
- }
-
- return hash;
-}
-
-/*
- * call-seq:
- * GC.count -> Integer
- *
- * The number of times GC occured.
- *
- * It returns the number of times GC occured since the process started.
- *
- */
-
-static VALUE
-gc_count(VALUE self)
-{
- return UINT2NUM((&rb_objspace)->count);
-}
-
-#if CALC_EXACT_MALLOC_SIZE
-/*
- * call-seq:
- * GC.malloc_allocated_size -> Integer
- *
- * The allocated size by malloc().
- *
- * It returns the allocated size by malloc().
- */
-
-static VALUE
-gc_malloc_allocated_size(VALUE self)
-{
- return UINT2NUM((&rb_objspace)->malloc_params.allocated_size);
-}
-
-/*
- * call-seq:
- * GC.malloc_allocations -> Integer
- *
- * The number of allocated memory object by malloc().
- *
- * It returns the number of allocated memory object by malloc().
- */
-
-static VALUE
-gc_malloc_allocations(VALUE self)
-{
- return UINT2NUM((&rb_objspace)->malloc_params.allocations);
-}
-#endif
-
-static VALUE
-gc_profile_record_get(void)
-{
- VALUE prof;
- VALUE gc_profile = rb_ary_new();
- size_t i;
- rb_objspace_t *objspace = (&rb_objspace);
-
- if (!objspace->profile.run) {
- return Qnil;
- }
-
- for (i =0; i < objspace->profile.count; i++) {
- prof = rb_hash_new();
- rb_hash_aset(prof, ID2SYM(rb_intern("GC_TIME")), DBL2NUM(objspace->profile.record[i].gc_time));
- rb_hash_aset(prof, ID2SYM(rb_intern("GC_INVOKE_TIME")), DBL2NUM(objspace->profile.record[i].gc_invoke_time));
- rb_hash_aset(prof, ID2SYM(rb_intern("HEAP_USE_SIZE")), rb_uint2inum(objspace->profile.record[i].heap_use_size));
- rb_hash_aset(prof, ID2SYM(rb_intern("HEAP_TOTAL_SIZE")), rb_uint2inum(objspace->profile.record[i].heap_total_size));
- rb_hash_aset(prof, ID2SYM(rb_intern("HEAP_TOTAL_OBJECTS")), rb_uint2inum(objspace->profile.record[i].heap_total_objects));
-#if GC_PROFILE_MORE_DETAIL
- rb_hash_aset(prof, ID2SYM(rb_intern("GC_MARK_TIME")), DBL2NUM(objspace->profile.record[i].gc_mark_time));
- rb_hash_aset(prof, ID2SYM(rb_intern("GC_SWEEP_TIME")), DBL2NUM(objspace->profile.record[i].gc_sweep_time));
- rb_hash_aset(prof, ID2SYM(rb_intern("ALLOCATE_INCREASE")), rb_uint2inum(objspace->profile.record[i].allocate_increase));
- rb_hash_aset(prof, ID2SYM(rb_intern("ALLOCATE_LIMIT")), rb_uint2inum(objspace->profile.record[i].allocate_limit));
- rb_hash_aset(prof, ID2SYM(rb_intern("HEAP_USE_SLOTS")), rb_uint2inum(objspace->profile.record[i].heap_use_slots));
- rb_hash_aset(prof, ID2SYM(rb_intern("HEAP_LIVE_OBJECTS")), rb_uint2inum(objspace->profile.record[i].heap_live_objects));
- rb_hash_aset(prof, ID2SYM(rb_intern("HEAP_FREE_OBJECTS")), rb_uint2inum(objspace->profile.record[i].heap_free_objects));
- rb_hash_aset(prof, ID2SYM(rb_intern("HAVE_FINALIZE")), objspace->profile.record[i].have_finalize);
-#endif
- rb_ary_push(gc_profile, prof);
- }
-
- return gc_profile;
-}
-
-/*
- * call-seq:
- * GC::Profiler.result -> string
- *
- * Report profile data to string.
- *
- * It returns a string as:
- * GC 1 invokes.
- * Index Invoke Time(sec) Use Size(byte) Total Size(byte) Total Object GC time(ms)
- * 1 0.012 159240 212940 10647 0.00000000000001530000
- */
-
-static VALUE
-gc_profile_result(void)
-{
- rb_objspace_t *objspace = &rb_objspace;
- VALUE record;
- VALUE result;
- int i;
-
- record = gc_profile_record_get();
- if (objspace->profile.run && objspace->profile.count) {
- result = rb_sprintf("GC %d invokes.\n", NUM2INT(gc_count(0)));
- rb_str_cat2(result, "Index Invoke Time(sec) Use Size(byte) Total Size(byte) Total Object GC Time(ms)\n");
- for (i = 0; i < (int)RARRAY_LEN(record); i++) {
- VALUE r = RARRAY_PTR(record)[i];
- rb_str_catf(result, "%5d %19.3f %20d %20d %20d %30.20f\n",
- i+1, NUM2DBL(rb_hash_aref(r, ID2SYM(rb_intern("GC_INVOKE_TIME")))),
- NUM2INT(rb_hash_aref(r, ID2SYM(rb_intern("HEAP_USE_SIZE")))),
- NUM2INT(rb_hash_aref(r, ID2SYM(rb_intern("HEAP_TOTAL_SIZE")))),
- NUM2INT(rb_hash_aref(r, ID2SYM(rb_intern("HEAP_TOTAL_OBJECTS")))),
- NUM2DBL(rb_hash_aref(r, ID2SYM(rb_intern("GC_TIME"))))*1000);
- }
-#if GC_PROFILE_MORE_DETAIL
- rb_str_cat2(result, "\n\n");
- rb_str_cat2(result, "More detail.\n");
- rb_str_cat2(result, "Index Allocate Increase Allocate Limit Use Slot Have Finalize Mark Time(ms) Sweep Time(ms)\n");
- for (i = 0; i < (int)RARRAY_LEN(record); i++) {
- VALUE r = RARRAY_PTR(record)[i];
- rb_str_catf(result, "%5d %17d %17d %9d %14s %25.20f %25.20f\n",
- i+1, NUM2INT(rb_hash_aref(r, ID2SYM(rb_intern("ALLOCATE_INCREASE")))),
- NUM2INT(rb_hash_aref(r, ID2SYM(rb_intern("ALLOCATE_LIMIT")))),
- NUM2INT(rb_hash_aref(r, ID2SYM(rb_intern("HEAP_USE_SLOTS")))),
- rb_hash_aref(r, ID2SYM(rb_intern("HAVE_FINALIZE")))? "true" : "false",
- NUM2DBL(rb_hash_aref(r, ID2SYM(rb_intern("GC_MARK_TIME"))))*1000,
- NUM2DBL(rb_hash_aref(r, ID2SYM(rb_intern("GC_SWEEP_TIME"))))*1000);
- }
-#endif
- }
- else {
- result = rb_str_new2("");
- }
- return result;
-}
-
-
-/*
- * call-seq:
- * GC::Profiler.report
- *
- * GC::Profiler.result display
- *
- */
-
-static VALUE
-gc_profile_report(int argc, VALUE *argv, VALUE self)
-{
- VALUE out;
-
- if (argc == 0) {
- out = rb_stdout;
+ return LONG2NUM((long)obj);
}
- else {
- rb_scan_args(argc, argv, "01", &out);
- }
- rb_io_write(out, gc_profile_result());
-
- return Qnil;
+ return (VALUE)((long)obj|FIXNUM_FLAG);
}
/*
@@ -3074,10 +2070,9 @@ gc_profile_report(int argc, VALUE *argv, VALUE self)
*/
void
-Init_GC(void)
+Init_GC()
{
VALUE rb_mObSpace;
- VALUE rb_mProfiler;
rb_mGC = rb_define_module("GC");
rb_define_singleton_method(rb_mGC, "start", rb_gc_start, 0);
@@ -3085,38 +2080,32 @@ Init_GC(void)
rb_define_singleton_method(rb_mGC, "disable", rb_gc_disable, 0);
rb_define_singleton_method(rb_mGC, "stress", gc_stress_get, 0);
rb_define_singleton_method(rb_mGC, "stress=", gc_stress_set, 1);
- rb_define_singleton_method(rb_mGC, "count", gc_count, 0);
rb_define_method(rb_mGC, "garbage_collect", rb_gc_start, 0);
- rb_mProfiler = rb_define_module_under(rb_mGC, "Profiler");
- rb_define_singleton_method(rb_mProfiler, "enabled?", gc_profile_enable_get, 0);
- rb_define_singleton_method(rb_mProfiler, "enable", gc_profile_enable, 0);
- rb_define_singleton_method(rb_mProfiler, "disable", gc_profile_disable, 0);
- rb_define_singleton_method(rb_mProfiler, "clear", gc_profile_clear, 0);
- rb_define_singleton_method(rb_mProfiler, "result", gc_profile_result, 0);
- rb_define_singleton_method(rb_mProfiler, "report", gc_profile_report, -1);
-
rb_mObSpace = rb_define_module("ObjectSpace");
rb_define_module_function(rb_mObSpace, "each_object", os_each_obj, -1);
rb_define_module_function(rb_mObSpace, "garbage_collect", rb_gc_start, 0);
+ rb_define_module_function(rb_mObSpace, "add_finalizer", add_final, 1);
+ rb_define_module_function(rb_mObSpace, "remove_finalizer", rm_final, 1);
+ rb_define_module_function(rb_mObSpace, "finalizers", finals, 0);
+ rb_define_module_function(rb_mObSpace, "call_finalizer", call_final, 1);
rb_define_module_function(rb_mObSpace, "define_finalizer", define_final, -1);
rb_define_module_function(rb_mObSpace, "undefine_finalizer", undefine_final, 1);
rb_define_module_function(rb_mObSpace, "_id2ref", id2ref, 1);
- nomem_error = rb_exc_new3(rb_eNoMemError,
- rb_obj_freeze(rb_str_new2("failed to allocate memory")));
- OBJ_TAINT(nomem_error);
- OBJ_FREEZE(nomem_error);
+ rb_gc_register_address(&rb_mObSpace);
+ rb_global_variable(&finalizers);
+ rb_gc_unregister_address(&rb_mObSpace);
+ finalizers = rb_ary_new();
- rb_define_method(rb_mKernel, "__id__", rb_obj_id, 0);
- rb_define_method(rb_mKernel, "object_id", rb_obj_id, 0);
+ source_filenames = st_init_strtable();
- rb_define_module_function(rb_mObSpace, "count_objects", count_objects, -1);
+ rb_global_variable(&nomem_error);
+ nomem_error = rb_exc_new2(rb_eNoMemError, "failed to allocate memory");
-#if CALC_EXACT_MALLOC_SIZE
- rb_define_singleton_method(rb_mGC, "malloc_allocated_size", gc_malloc_allocated_size, 0);
- rb_define_singleton_method(rb_mGC, "malloc_allocations", gc_malloc_allocations, 0);
-#endif
+ rb_define_method(rb_mKernel, "hash", rb_obj_id, 0);
+ rb_define_method(rb_mKernel, "__id__", rb_obj_id, 0);
+ rb_define_method(rb_mKernel, "object_id", rb_obj_id, 0);
}
diff --git a/gc.h b/gc.h
deleted file mode 100644
index 29fd6b407c..0000000000
--- a/gc.h
+++ /dev/null
@@ -1,75 +0,0 @@
-
-#ifndef RUBY_GC_H
-#define RUBY_GC_H 1
-
-#if defined(__i386) && defined(__GNUC__)
-#define SET_MACHINE_STACK_END(p) __asm__("mov %%esp, %0" : "=r" (*p))
-#else
-NOINLINE(void rb_gc_set_stack_end(VALUE **stack_end_p));
-#define SET_MACHINE_STACK_END(p) rb_gc_set_stack_end(p)
-#define USE_CONSERVATIVE_STACK_END
-#endif
-
-/* for GC debug */
-
-#ifndef RUBY_MARK_FREE_DEBUG
-#define RUBY_MARK_FREE_DEBUG 0
-#endif
-
-#if RUBY_MARK_FREE_DEBUG
-extern int ruby_gc_debug_indent;
-
-static void
-rb_gc_debug_indent(void)
-{
- printf("%*s", ruby_gc_debug_indent, "");
-}
-
-static void
-rb_gc_debug_body(char *mode, char *msg, int st, void *ptr)
-{
- if (st == 0) {
- ruby_gc_debug_indent--;
- }
- rb_gc_debug_indent();
- printf("%s: %s %s (%p)\n", mode, st ? "->" : "<-", msg, ptr);
-
- if (st) {
- ruby_gc_debug_indent++;
- }
-
- fflush(stdout);
-}
-
-#define RUBY_MARK_ENTER(msg) rb_gc_debug_body("mark", msg, 1, ptr)
-#define RUBY_MARK_LEAVE(msg) rb_gc_debug_body("mark", msg, 0, ptr)
-#define RUBY_FREE_ENTER(msg) rb_gc_debug_body("free", msg, 1, ptr)
-#define RUBY_FREE_LEAVE(msg) rb_gc_debug_body("free", msg, 0, ptr)
-#define RUBY_GC_INFO rb_gc_debug_indent(); printf
-
-#else
-#define RUBY_MARK_ENTER(msg)
-#define RUBY_MARK_LEAVE(msg)
-#define RUBY_FREE_ENTER(msg)
-#define RUBY_FREE_LEAVE(msg)
-#define RUBY_GC_INFO if(0)printf
-#endif
-
-#define RUBY_MARK_UNLESS_NULL(ptr) if(RTEST(ptr)){rb_gc_mark(ptr);}
-#define RUBY_FREE_UNLESS_NULL(ptr) if(ptr){ruby_xfree(ptr);}
-
-#if STACK_GROW_DIRECTION > 0
-# define STACK_UPPER(x, a, b) a
-#elif STACK_GROW_DIRECTION < 0
-# define STACK_UPPER(x, a, b) b
-#else
-RUBY_EXTERN int ruby_stack_grow_direction;
-int ruby_get_stack_grow_direction(VALUE *addr);
-# define stack_growup_p(x) ( \
- (ruby_stack_grow_direction ? \
- ruby_stack_grow_direction : \
- ruby_get_stack_grow_direction(x)) > 0)
-# define STACK_UPPER(x, a, b) (stack_growup_p(x) ? a : b)
-#endif
-
-#endif /* RUBY_GC_H */
diff --git a/gem_prelude.rb b/gem_prelude.rb
deleted file mode 100644
index ca865aabdc..0000000000
--- a/gem_prelude.rb
+++ /dev/null
@@ -1,310 +0,0 @@
-# depends on: array.rb dir.rb env.rb file.rb hash.rb module.rb regexp.rb
-# vim: filetype=ruby
-
-# NOTICE: Ruby is during initialization here.
-# * Encoding.default_external does not reflects -E.
-# * Should not expect Encoding.default_internal.
-# * Locale encoding is available.
-
-if defined?(Gem) then
-
- # :stopdoc:
-
- module Kernel
-
- def gem(gem_name, *version_requirements)
- Gem.push_gem_version_on_load_path(gem_name, *version_requirements)
- end
-
- end
-
- module Gem
-
- ConfigMap = {
- :EXEEXT => RbConfig::CONFIG["EXEEXT"],
- :RUBY_SO_NAME => RbConfig::CONFIG["RUBY_SO_NAME"],
- :arch => RbConfig::CONFIG["arch"],
- :bindir => RbConfig::CONFIG["bindir"],
- :libdir => RbConfig::CONFIG["libdir"],
- :ruby_install_name => RbConfig::CONFIG["ruby_install_name"],
- :ruby_version => RbConfig::CONFIG["ruby_version"],
- :rubylibprefix => RbConfig::CONFIG["rubylibprefix"],
- :sitedir => RbConfig::CONFIG["sitedir"],
- :sitelibdir => RbConfig::CONFIG["sitelibdir"],
- }
-
- def self.dir
- @gem_home ||= nil
- set_home(ENV['GEM_HOME'] || default_dir) unless @gem_home
- @gem_home
- end
-
- def self.path
- @gem_path ||= nil
- unless @gem_path
- paths = [ENV['GEM_PATH'] || default_path]
- paths << APPLE_GEM_HOME if defined? APPLE_GEM_HOME
- set_paths(paths.compact.join(File::PATH_SEPARATOR))
- end
- @gem_path
- end
-
- def self.post_install(&hook)
- @post_install_hooks << hook
- end
-
- def self.post_uninstall(&hook)
- @post_uninstall_hooks << hook
- end
-
- def self.pre_install(&hook)
- @pre_install_hooks << hook
- end
-
- def self.pre_uninstall(&hook)
- @pre_uninstall_hooks << hook
- end
-
- def self.set_home(home)
- home = home.gsub File::ALT_SEPARATOR, File::SEPARATOR if File::ALT_SEPARATOR
- @gem_home = home
- end
-
- def self.set_paths(gpaths)
- if gpaths
- @gem_path = gpaths.split(File::PATH_SEPARATOR)
-
- if File::ALT_SEPARATOR then
- @gem_path.map! do |path|
- path.gsub File::ALT_SEPARATOR, File::SEPARATOR
- end
- end
-
- @gem_path << Gem.dir
- else
- # TODO: should this be Gem.default_path instead?
- @gem_path = [Gem.dir]
- end
-
- @gem_path.uniq!
- end
-
- def self.user_home
- @user_home ||= File.expand_path("~")
- rescue
- if File::ALT_SEPARATOR then
- "C:/"
- else
- "/"
- end
- end
-
- # begin rubygems/defaults
- # NOTE: this require will be replaced with in-place eval before compilation.
- require 'lib/rubygems/defaults.rb'
- # end rubygems/defaults
-
-
- ##
- # Methods before this line will be removed when QuickLoader is replaced
- # with the real RubyGems
-
- GEM_PRELUDE_METHODS = Gem.methods(false)
-
- begin
- verbose, debug = $VERBOSE, $DEBUG
- $VERBOSE = $DEBUG = nil
-
- begin
- require 'rubygems/defaults/operating_system'
- rescue ::LoadError
- end
-
- if defined?(RUBY_ENGINE) then
- begin
- require "rubygems/defaults/#{RUBY_ENGINE}"
- rescue ::LoadError
- end
- end
- ensure
- $VERBOSE, $DEBUG = verbose, debug
- end
-
- module QuickLoader
-
- @loaded_full_rubygems_library = false
-
- def self.load_full_rubygems_library
- return if @loaded_full_rubygems_library
-
- @loaded_full_rubygems_library = true
-
- class << Gem
- Gem::GEM_PRELUDE_METHODS.each do |method_name|
- undef_method method_name
- end
- undef_method :const_missing
- undef_method :method_missing
- end
-
- Kernel.module_eval do
- undef_method :gem if method_defined? :gem
- end
-
- $".delete path_to_full_rubygems_library
- $".each do |path|
- if /#{Regexp.escape File::SEPARATOR}rubygems\.rb\z/ =~ path
- raise LoadError, "another rubygems is already loaded from #{path}"
- end
- end
- require 'rubygems'
- end
-
- def self.fake_rubygems_as_loaded
- path = path_to_full_rubygems_library
- $" << path unless $".include?(path)
- end
-
- def self.path_to_full_rubygems_library
- installed_path = File.join(Gem::ConfigMap[:rubylibprefix], Gem::ConfigMap[:ruby_version])
- if $:.include?(installed_path)
- return File.join(installed_path, 'rubygems.rb')
- else # e.g., on test-all
- $:.each do |dir|
- if File.exist?( path = File.join(dir, 'rubygems.rb') )
- return path
- end
- end
- raise LoadError, 'rubygems.rb'
- end
- end
-
- GemPaths = {}
- GemVersions = {}
-
- def push_gem_version_on_load_path(gem_name, *version_requirements)
- if version_requirements.empty?
- unless GemPaths.has_key?(gem_name) then
- raise Gem::LoadError, "Could not find RubyGem #{gem_name} (>= 0)\n"
- end
-
- # highest version gems already active
- return false
- else
- if version_requirements.length > 1 then
- QuickLoader.load_full_rubygems_library
- return gem(gem_name, *version_requirements)
- end
-
- requirement, version = version_requirements[0].split
- requirement.strip!
-
- if loaded_version = GemVersions[gem_name] then
- case requirement
- when ">", ">=" then
- return false if
- (loaded_version <=> Gem.integers_for(version)) >= 0
- when "~>" then
- required_version = Gem.integers_for version
-
- return false if loaded_version.first == required_version.first
- end
- end
-
- QuickLoader.load_full_rubygems_library
- gem gem_name, *version_requirements
- end
- end
-
- def integers_for(gem_version)
- numbers = gem_version.split(".").collect {|n| n.to_i}
- numbers.pop while numbers.last == 0
- numbers << 0 if numbers.empty?
- numbers
- end
-
- def push_all_highest_version_gems_on_load_path
- Gem.path.each do |path|
- gems_directory = File.join(path, "gems")
-
- if File.exist?(gems_directory) then
- Dir.entries(gems_directory).each do |gem_directory_name|
- next if gem_directory_name == "." || gem_directory_name == ".."
-
- dash = gem_directory_name.rindex("-")
- next if dash.nil?
-
- gem_name = gem_directory_name[0...dash]
- current_version = GemVersions[gem_name]
- new_version = integers_for(gem_directory_name[dash+1..-1])
-
- if current_version then
- if (current_version <=> new_version) == -1 then
- GemVersions[gem_name] = new_version
- GemPaths[gem_name] = File.join(gems_directory, gem_directory_name)
- end
- else
- GemVersions[gem_name] = new_version
- GemPaths[gem_name] = File.join(gems_directory, gem_directory_name)
- end
- end
- end
- end
-
- require_paths = []
-
- GemPaths.each_value do |path|
- if File.exist?(file = File.join(path, ".require_paths")) then
- paths = File.read(file).split.map do |require_path|
- File.join path, require_path
- end
-
- require_paths.concat paths
- else
- require_paths << file if File.exist?(file = File.join(path, "bin"))
- require_paths << file if File.exist?(file = File.join(path, "lib"))
- end
- end
-
- # "tag" the first require_path inserted into the $LOAD_PATH to enable
- # indexing correctly with rubygems proper when it inserts an explicitly
- # gem version
- unless require_paths.empty? then
- require_paths.first.instance_variable_set(:@gem_prelude_index, true)
- end
- # gem directories must come after -I and ENV['RUBYLIB']
- $:[$:.index(ConfigMap[:sitelibdir]),0] = require_paths
- end
-
- def const_missing(constant)
- QuickLoader.load_full_rubygems_library
-
- if Gem.const_defined?(constant) then
- Gem.const_get constant
- else
- super
- end
- end
-
- def method_missing(method, *args, &block)
- QuickLoader.load_full_rubygems_library
- super unless Gem.respond_to?(method)
- Gem.send(method, *args, &block)
- end
- end
-
- extend QuickLoader
-
- end
-
- begin
- Gem.push_all_highest_version_gems_on_load_path
- Gem::QuickLoader.fake_rubygems_as_loaded
- rescue Exception => e
- puts "Error loading gem paths on load path in gem_prelude"
- puts e
- puts e.backtrace.join("\n")
- end
-
-end
-
diff --git a/golf_prelude.rb b/golf_prelude.rb
deleted file mode 100644
index 4363b496f0..0000000000
--- a/golf_prelude.rb
+++ /dev/null
@@ -1,114 +0,0 @@
-class Object
- @@golf_hash = {}
- def method_missing m, *a, &b
- t = @@golf_hash[ [m,self.class] ] ||= matching_methods(m)[0]
- if t && b
- __send__(t, *a) {|*args|
- b.binding.eval("proc{|golf_matchdata| $~ = golf_matchdata }").call($~) if $~
- b.call(*args)
- }
- else
- t ? __send__(t, *a, &b) : super
- end
- end
-
- def matching_methods(s='', m=callable_methods)
- r=/^#{s.to_s.gsub(/./){"(.*?)"+Regexp.escape($&)}}/
- m.grep(r).sort_by do |i|
- i.to_s.match(r).captures.map(&:size) << i
- end
- end
-
- def self.const_missing c
- t = @@golf_hash[ [c,self.class] ] ||= matching_methods(c,constants)[0]
- t and return const_get(t)
- raise NameError, "uninitialized constant #{c}", caller(1)
- end
-
- def shortest_abbreviation(s='', m=callable_methods)
- s=s.to_s
- our_case = (?A..?Z)===s[0]
- if m.index(s.to_sym)
- 1.upto(s.size){|z|s.scan(/./).combination(z).map{|trial|
- next unless ((?A..?Z)===trial[0]) == our_case
- trial*=''
- return trial if matching_methods(trial,m)[0].to_s==s
- }}
- else
- nil
- end
- end
-
- def callable_methods
- self.class == Object ? methods + private_methods : methods
- end
-
- private
-
- def h(a='H', b='w', c='!')
- puts "#{a}ello, #{b}orld#{c}"
- end
-
- alias say puts
-
- def do_while
- 0 while yield
- end
-
- def do_until
- 0 until yield
- end
-end
-
-class Array
- alias old_to_s to_s
- alias to_s join
-end
-
-class FalseClass
- alias old_to_s to_s
- def to_s
- ""
- end
-end
-
-class Integer
- alias each times
- include Enumerable
-end
-
-class String
- alias / split
-
- def to_a
- split('')
- end
-
- (Array.instance_methods-instance_methods-[:to_ary,:transpose,:flatten,:flatten!,:compact,:compact!,:assoc,:rassoc]).each{|meth|
- eval"
- def #{meth}(*args, &block)
- a=to_a
- result = a.#{meth}(*args, &block)
- replace(a.join)
- if result.class == Array
- Integer===result[0] ? result.pack('c*') : result.join
- elsif result.class == Enumerator
- result.map(&:join).to_enum
- else
- result
- end
- end"
- }
-end
-
-class Enumerator
- alias old_to_s to_s
- (Array.instance_methods-instance_methods-[:replace]+[:to_s]).each{|meth|
- eval"
- def #{meth}(*args, &block)
- to_a.#{meth}(*args, &block)
- end"
- }
- alias old_inspect inspect
- alias inspect old_to_s
-end
diff --git a/goruby.c b/goruby.c
deleted file mode 100644
index 17be654800..0000000000
--- a/goruby.c
+++ /dev/null
@@ -1,24 +0,0 @@
-void Init_golf(void);
-#define ruby_run_node goruby_run_node
-#include "main.c"
-#undef ruby_run_node
-
-RUBY_EXTERN int ruby_run_node(void*);
-RUBY_EXTERN void ruby_init_ext(const char *name, void (*init)(void));
-
-static VALUE
-init_golf(VALUE arg)
-{
- ruby_init_ext("golf", Init_golf);
- return arg;
-}
-
-int
-goruby_run_node(void *arg)
-{
- int state;
- if (NIL_P(rb_protect(init_golf, Qtrue, &state))) {
- return state == EXIT_SUCCESS ? EXIT_FAILURE : state;
- }
- return ruby_run_node(arg);
-}
diff --git a/hash.c b/hash.c
index ce8af6c6d9..3f269becb5 100644
--- a/hash.c
+++ b/hash.c
@@ -3,29 +3,40 @@
hash.c -
$Author$
+ $Date$
created at: Mon Nov 22 18:51:18 JST 1993
- Copyright (C) 1993-2007 Yukihiro Matsumoto
+ Copyright (C) 1993-2003 Yukihiro Matsumoto
Copyright (C) 2000 Network Applied Communication Laboratory, Inc.
Copyright (C) 2000 Information-technology Promotion Agency, Japan
**********************************************************************/
-#include "ruby/ruby.h"
-#include "ruby/st.h"
-#include "ruby/util.h"
+#include "ruby.h"
+#include "st.h"
+#include "util.h"
+#include "rubysig.h"
#ifdef __APPLE__
#include <crt_externs.h>
#endif
-static VALUE rb_hash_s_try_convert(VALUE, VALUE);
-
#define HASH_DELETED FL_USER1
#define HASH_PROC_DEFAULT FL_USER2
+static void
+rb_hash_modify(hash)
+ VALUE hash;
+{
+ if (!RHASH(hash)->tbl) rb_raise(rb_eTypeError, "uninitialized Hash");
+ if (OBJ_FROZEN(hash)) rb_error_frozen("hash");
+ if (!OBJ_TAINTED(hash) && rb_safe_level() >= 4)
+ rb_raise(rb_eSecurityError, "Insecure: can't modify hash");
+}
+
VALUE
-rb_hash_freeze(VALUE hash)
+rb_hash_freeze(hash)
+ VALUE hash;
{
return rb_obj_freeze(hash);
}
@@ -33,58 +44,57 @@ rb_hash_freeze(VALUE hash)
VALUE rb_cHash;
static VALUE envtbl;
-static ID id_hash, id_yield, id_default;
+static ID id_hash, id_call, id_default;
+
+static VALUE
+eql(args)
+ VALUE *args;
+{
+ return (VALUE)rb_eql(args[0], args[1]);
+}
static int
-rb_any_cmp(VALUE a, VALUE b)
+rb_any_cmp(a, b)
+ VALUE a, b;
{
+ VALUE args[2];
+
if (a == b) return 0;
if (FIXNUM_P(a) && FIXNUM_P(b)) {
return a != b;
}
if (TYPE(a) == T_STRING && RBASIC(a)->klass == rb_cString &&
TYPE(b) == T_STRING && RBASIC(b)->klass == rb_cString) {
- return rb_str_hash_cmp(a, b);
+ return rb_str_cmp(a, b);
}
if (a == Qundef || b == Qundef) return -1;
if (SYMBOL_P(a) && SYMBOL_P(b)) {
return a != b;
}
- return !rb_eql(a, b);
+ args[0] = a;
+ args[1] = b;
+ return !rb_with_disable_interrupt(eql, (VALUE)args);
}
VALUE
-rb_hash(VALUE obj)
+rb_hash(obj)
+ VALUE obj;
{
- VALUE hval = rb_funcall(obj, id_hash, 0);
- retry:
- switch (TYPE(hval)) {
- case T_FIXNUM:
- return hval;
-
- case T_BIGNUM:
- return LONG2FIX(((long*)(RBIGNUM_DIGITS(hval)))[0]);
-
- default:
- hval = rb_to_int(hval);
- goto retry;
- }
+ return rb_funcall(obj, id_hash, 0);
}
static int
-rb_any_hash(VALUE a)
+rb_any_hash(a)
+ VALUE a;
{
VALUE hval;
- VALUE hnum;
+ int hnum;
switch (TYPE(a)) {
case T_FIXNUM:
case T_SYMBOL:
- case T_NIL:
- case T_FALSE:
- case T_TRUE:
- hnum = rb_hash_end(rb_hash_start((unsigned int)a));
+ hnum = (int)a;
break;
case T_STRING:
@@ -92,23 +102,21 @@ rb_any_hash(VALUE a)
break;
default:
- hval = rb_hash(a);
- hnum = FIX2LONG(hval);
+ hval = rb_funcall(a, id_hash, 0);
+ if (!FIXNUM_P(hval)) {
+ hval = rb_funcall(hval, '%', 1, INT2FIX(536870923));
+ }
+ hnum = (int)FIX2LONG(hval);
}
hnum <<= 1;
- return (int)RSHIFT(hnum, 1);
+ return RSHIFT(hnum, 1);
}
-static const struct st_hash_type objhash = {
+static struct st_hash_type objhash = {
rb_any_cmp,
rb_any_hash,
};
-static const struct st_hash_type identhash = {
- st_numcmp,
- st_numhash,
-};
-
typedef int st_foreach_func(st_data_t, st_data_t, st_data_t);
struct foreach_safe_arg {
@@ -118,7 +126,9 @@ struct foreach_safe_arg {
};
static int
-foreach_safe_i(st_data_t key, st_data_t value, struct foreach_safe_arg *arg)
+foreach_safe_i(key, value, arg)
+ st_data_t key, value;
+ struct foreach_safe_arg *arg;
{
int status;
@@ -131,7 +141,10 @@ foreach_safe_i(st_data_t key, st_data_t value, struct foreach_safe_arg *arg)
}
void
-st_foreach_safe(st_table *table, int (*func)(ANYARGS), st_data_t a)
+st_foreach_safe(table, func, a)
+ st_table *table;
+ int (*func)();
+ st_data_t a;
{
struct foreach_safe_arg arg;
@@ -152,37 +165,40 @@ struct hash_foreach_arg {
};
static int
-hash_foreach_iter(st_data_t key, st_data_t value, struct hash_foreach_arg *arg)
+hash_foreach_iter(key, value, arg)
+ VALUE key, value;
+ struct hash_foreach_arg *arg;
{
int status;
st_table *tbl;
- tbl = RHASH(arg->hash)->ntbl;
- if ((VALUE)key == Qundef) return ST_CONTINUE;
- status = (*arg->func)((VALUE)key, (VALUE)value, arg->arg);
- if (RHASH(arg->hash)->ntbl != tbl) {
+ tbl = RHASH(arg->hash)->tbl;
+ if (key == Qundef) return ST_CONTINUE;
+ status = (*arg->func)(key, value, arg->arg);
+ if (RHASH(arg->hash)->tbl != tbl) {
rb_raise(rb_eRuntimeError, "rehash occurred during iteration");
}
switch (status) {
case ST_DELETE:
- st_delete_safe(tbl, &key, 0, Qundef);
+ st_delete_safe(tbl, (st_data_t*)&key, 0, Qundef);
FL_SET(arg->hash, HASH_DELETED);
case ST_CONTINUE:
- break;
+ break;
case ST_STOP:
- return ST_STOP;
+ return ST_STOP;
}
return ST_CHECK;
}
static VALUE
-hash_foreach_ensure(VALUE hash)
+hash_foreach_ensure(hash)
+ VALUE hash;
{
RHASH(hash)->iter_lev--;
if (RHASH(hash)->iter_lev == 0) {
if (FL_TEST(hash, HASH_DELETED)) {
- st_cleanup_safe(RHASH(hash)->ntbl, Qundef);
+ st_cleanup_safe(RHASH(hash)->tbl, Qundef);
FL_UNSET(hash, HASH_DELETED);
}
}
@@ -190,21 +206,23 @@ hash_foreach_ensure(VALUE hash)
}
static VALUE
-hash_foreach_call(struct hash_foreach_arg *arg)
+hash_foreach_call(arg)
+ struct hash_foreach_arg *arg;
{
- if (st_foreach(RHASH(arg->hash)->ntbl, hash_foreach_iter, (st_data_t)arg)) {
+ if (st_foreach(RHASH(arg->hash)->tbl, hash_foreach_iter, (st_data_t)arg)) {
rb_raise(rb_eRuntimeError, "hash modified during iteration");
}
return Qnil;
}
void
-rb_hash_foreach(VALUE hash, int (*func)(ANYARGS), VALUE farg)
+rb_hash_foreach(hash, func, farg)
+ VALUE hash;
+ int (*func)();
+ VALUE farg;
{
struct hash_foreach_arg arg;
- if (!RHASH(hash)->ntbl)
- return;
RHASH(hash)->iter_lev++;
arg.hash = hash;
arg.func = (rb_foreach_func *)func;
@@ -212,8 +230,11 @@ rb_hash_foreach(VALUE hash, int (*func)(ANYARGS), VALUE farg)
rb_ensure(hash_foreach_call, (VALUE)&arg, hash_foreach_ensure, hash);
}
+static VALUE hash_alloc0 _((VALUE));
+static VALUE hash_alloc _((VALUE));
static VALUE
-hash_alloc(VALUE klass)
+hash_alloc0(klass)
+ VALUE klass;
{
NEWOBJ(hash, struct RHash);
OBJSETUP(hash, klass, T_HASH);
@@ -223,49 +244,21 @@ hash_alloc(VALUE klass)
return (VALUE)hash;
}
-VALUE
-rb_hash_new(void)
-{
- return hash_alloc(rb_cHash);
-}
-
-VALUE
-rb_hash_dup(VALUE hash)
+static VALUE
+hash_alloc(klass)
+ VALUE klass;
{
- NEWOBJ(ret, struct RHash);
- DUPSETUP(ret, hash);
+ VALUE hash = hash_alloc0(klass);
- if (!RHASH_EMPTY_P(hash))
- ret->ntbl = st_copy(RHASH(hash)->ntbl);
- if (FL_TEST(hash, HASH_PROC_DEFAULT)) {
- FL_SET(ret, HASH_PROC_DEFAULT);
- }
- ret->ifnone = RHASH(hash)->ifnone;
- return (VALUE)ret;
-}
-
-static void
-rb_hash_modify_check(VALUE hash)
-{
- if (OBJ_FROZEN(hash)) rb_error_frozen("hash");
- if (!OBJ_UNTRUSTED(hash) && rb_safe_level() >= 4)
- rb_raise(rb_eSecurityError, "Insecure: can't modify hash");
-}
+ RHASH(hash)->tbl = st_init_table(&objhash);
-struct st_table *
-rb_hash_tbl(VALUE hash)
-{
- if (!RHASH(hash)->ntbl) {
- RHASH(hash)->ntbl = st_init_table(&objhash);
- }
- return RHASH(hash)->ntbl;
+ return hash;
}
-static void
-rb_hash_modify(VALUE hash)
+VALUE
+rb_hash_new()
{
- rb_hash_modify_check(hash);
- rb_hash_tbl(hash);
+ return hash_alloc(rb_cHash);
}
/*
@@ -304,7 +297,10 @@ rb_hash_modify(VALUE hash)
*/
static VALUE
-rb_hash_initialize(int argc, VALUE *argv, VALUE hash)
+rb_hash_initialize(argc, argv, hash)
+ int argc;
+ VALUE *argv;
+ VALUE hash;
{
VALUE ifnone;
@@ -326,34 +322,31 @@ rb_hash_initialize(int argc, VALUE *argv, VALUE hash)
/*
* call-seq:
- * Hash[ key, value, ... ] => hash
- * Hash[ [ [key, value], ... ] ] => hash
- * Hash[ object ] => hash
+ * Hash[ [key =>|, value]* ] => hash
*
* Creates a new hash populated with the given objects. Equivalent to
- * the literal <code>{ <i>key</i> => <i>value</i>, ... }</code>. In the first
- * form, keys and values occur in pairs, so there must be an even number of arguments.
- * The second and third form take a single argument which is either
- * an array of key-value pairs or an object convertible to a hash.
- *
- * Hash["a", 100, "b", 200] #=> {"a"=>100, "b"=>200}
- * Hash[ [ ["a", 100], ["b", 200] ] ] #=> {"a"=>100, "b"=>200}
- * Hash["a" => 100, "b" => 200] #=> {"a"=>100, "b"=>200}
+ * the literal <code>{ <i>key</i>, <i>value</i>, ... }</code>. Keys and
+ * values occur in pairs, so there must be an even number of arguments.
+ *
+ * Hash["a", 100, "b", 200] #=> {"a"=>100, "b"=>200}
+ * Hash["a" => 100, "b" => 200] #=> {"a"=>100, "b"=>200}
+ * { "a" => 100, "b" => 200 } #=> {"a"=>100, "b"=>200}
*/
static VALUE
-rb_hash_s_create(int argc, VALUE *argv, VALUE klass)
+rb_hash_s_create(argc, argv, klass)
+ int argc;
+ VALUE *argv;
+ VALUE klass;
{
VALUE hash, tmp;
int i;
if (argc == 1) {
- tmp = rb_hash_s_try_convert(Qnil, argv[0]);
+ tmp = rb_check_convert_type(argv[0], T_HASH, "Hash", "to_hash");
if (!NIL_P(tmp)) {
- hash = hash_alloc(klass);
- if (RHASH(tmp)->ntbl) {
- RHASH(hash)->ntbl = st_copy(RHASH(tmp)->ntbl);
- }
+ hash = hash_alloc0(klass);
+ RHASH(hash)->tbl = st_copy(RHASH(tmp)->tbl);
return hash;
}
@@ -364,16 +357,10 @@ rb_hash_s_create(int argc, VALUE *argv, VALUE klass)
hash = hash_alloc(klass);
for (i = 0; i < RARRAY_LEN(tmp); ++i) {
VALUE v = rb_check_array_type(RARRAY_PTR(tmp)[i]);
- VALUE key, val = Qnil;
-
+
if (NIL_P(v)) continue;
- switch (RARRAY_LEN(v)) {
- case 2:
- val = RARRAY_PTR(v)[1];
- case 1:
- key = RARRAY_PTR(v)[0];
- rb_hash_aset(hash, key, val);
- }
+ if (RARRAY_LEN(v) < 1 || 2 < RARRAY_LEN(v)) continue;
+ rb_hash_aset(hash, RARRAY_PTR(v)[0], RARRAY_PTR(v)[1]);
}
return hash;
}
@@ -391,33 +378,17 @@ rb_hash_s_create(int argc, VALUE *argv, VALUE klass)
}
static VALUE
-to_hash(VALUE hash)
+to_hash(hash)
+ VALUE hash;
{
return rb_convert_type(hash, T_HASH, "Hash", "to_hash");
}
-/*
- * call-seq:
- * Hash.try_convert(obj) -> hash or nil
- *
- * Try to convert <i>obj</i> into a hash, using to_hash method.
- * Returns converted hash or nil if <i>obj</i> cannot be converted
- * for any reason.
- *
- * Hash.try_convert({1=>2}) # => {1=>2}
- * Hash.try_convert("1=>2") # => nil
- */
-static VALUE
-rb_hash_s_try_convert(VALUE dummy, VALUE hash)
-{
- return rb_check_convert_type(hash, T_HASH, "Hash", "to_hash");
-}
-
static int
-rb_hash_rehash_i(VALUE key, VALUE value, VALUE arg)
+rb_hash_rehash_i(key, value, tbl)
+ VALUE key, value;
+ st_table *tbl;
{
- st_table *tbl = (st_table *)arg;
-
if (key != Qundef) st_insert(tbl, key, value);
return ST_CONTINUE;
}
@@ -430,7 +401,7 @@ rb_hash_rehash_i(VALUE key, VALUE value, VALUE arg)
* values of key objects have changed since they were inserted, this
* method will reindex <i>hsh</i>. If <code>Hash#rehash</code> is
* called while an iterator is traversing the hash, an
- * <code>RuntimeError</code> will be raised in the iterator.
+ * <code>IndexError</code> will be raised in the iterator.
*
* a = [ "a", "b" ]
* c = [ "c", "d" ]
@@ -443,20 +414,16 @@ rb_hash_rehash_i(VALUE key, VALUE value, VALUE arg)
*/
static VALUE
-rb_hash_rehash(VALUE hash)
+rb_hash_rehash(hash)
+ VALUE hash;
{
st_table *tbl;
- if (RHASH(hash)->iter_lev > 0) {
- rb_raise(rb_eRuntimeError, "rehash during iteration");
- }
- rb_hash_modify_check(hash);
- if (!RHASH(hash)->ntbl)
- return hash;
- tbl = st_init_table_with_size(RHASH(hash)->ntbl->type, RHASH(hash)->ntbl->num_entries);
- rb_hash_foreach(hash, rb_hash_rehash_i, (VALUE)tbl);
- st_free_table(RHASH(hash)->ntbl);
- RHASH(hash)->ntbl = tbl;
+ rb_hash_modify(hash);
+ tbl = st_init_table_with_size(&objhash, RHASH(hash)->tbl->num_entries);
+ rb_hash_foreach(hash, rb_hash_rehash_i, (st_data_t)tbl);
+ st_free_table(RHASH(hash)->tbl);
+ RHASH(hash)->tbl = tbl;
return hash;
}
@@ -476,33 +443,29 @@ rb_hash_rehash(VALUE hash)
*/
VALUE
-rb_hash_aref(VALUE hash, VALUE key)
+rb_hash_aref(hash, key)
+ VALUE hash, key;
{
VALUE val;
- if (!RHASH(hash)->ntbl || !st_lookup(RHASH(hash)->ntbl, key, &val)) {
+ if (!st_lookup(RHASH(hash)->tbl, key, &val)) {
return rb_funcall(hash, id_default, 1, key);
}
return val;
}
VALUE
-rb_hash_lookup2(VALUE hash, VALUE key, VALUE def)
+rb_hash_lookup(hash, key)
+ VALUE hash, key;
{
VALUE val;
- if (!RHASH(hash)->ntbl || !st_lookup(RHASH(hash)->ntbl, key, &val)) {
- return def; /* without Hash#default */
+ if (!st_lookup(RHASH(hash)->tbl, key, &val)) {
+ return Qnil; /* without Hash#default */
}
return val;
}
-VALUE
-rb_hash_lookup(VALUE hash, VALUE key)
-{
- return rb_hash_lookup2(hash, key, Qnil);
-}
-
/*
* call-seq:
* hsh.fetch(key [, default] ) => obj
@@ -510,7 +473,7 @@ rb_hash_lookup(VALUE hash, VALUE key)
*
* Returns a value from the hash for the given key. If the key can't be
* found, there are several options: With no other arguments, it will
- * raise an <code>KeyError</code> exception; if <i>default</i> is
+ * raise an <code>IndexError</code> exception; if <i>default</i> is
* given, then that will be returned; if the optional code block is
* specified, then that will be run and its result returned.
*
@@ -527,13 +490,16 @@ rb_hash_lookup(VALUE hash, VALUE key)
*
* <em>produces:</em>
*
- * prog.rb:2:in `fetch': key not found (KeyError)
+ * prog.rb:2:in `fetch': key not found (IndexError)
* from prog.rb:2
*
*/
static VALUE
-rb_hash_fetch_m(int argc, VALUE *argv, VALUE hash)
+rb_hash_fetch(argc, argv, hash)
+ int argc;
+ VALUE *argv;
+ VALUE hash;
{
VALUE key, if_none;
VALUE val;
@@ -545,22 +511,16 @@ rb_hash_fetch_m(int argc, VALUE *argv, VALUE hash)
if (block_given && argc == 2) {
rb_warn("block supersedes default value argument");
}
- if (!RHASH(hash)->ntbl || !st_lookup(RHASH(hash)->ntbl, key, &val)) {
+ if (!st_lookup(RHASH(hash)->tbl, key, &val)) {
if (block_given) return rb_yield(key);
if (argc == 1) {
- rb_raise(rb_eKeyError, "key not found");
+ rb_raise(rb_eIndexError, "key not found");
}
return if_none;
}
return val;
}
-VALUE
-rb_hash_fetch(VALUE hash, VALUE key)
-{
- return rb_hash_fetch_m(1, &key, hash);
-}
-
/*
* call-seq:
* hsh.default(key=nil) => obj
@@ -583,21 +543,24 @@ rb_hash_fetch(VALUE hash, VALUE key)
*/
static VALUE
-rb_hash_default(int argc, VALUE *argv, VALUE hash)
+rb_hash_default(argc, argv, hash)
+ int argc;
+ VALUE *argv;
+ VALUE hash;
{
VALUE key;
rb_scan_args(argc, argv, "01", &key);
if (FL_TEST(hash, HASH_PROC_DEFAULT)) {
if (argc == 0) return Qnil;
- return rb_funcall(RHASH(hash)->ifnone, id_yield, 2, hash, key);
+ return rb_funcall(RHASH(hash)->ifnone, id_call, 2, hash, key);
}
return RHASH(hash)->ifnone;
}
/*
* call-seq:
- * hsh.default = obj => obj
+ * hsh.default = obj => hsh
*
* Sets the default value, the value returned for a key that does not
* exist in the hash. It is not possible to set the a default to a
@@ -616,7 +579,8 @@ rb_hash_default(int argc, VALUE *argv, VALUE hash)
*/
static VALUE
-rb_hash_set_default(VALUE hash, VALUE ifnone)
+rb_hash_set_default(hash, ifnone)
+ VALUE hash, ifnone;
{
rb_hash_modify(hash);
RHASH(hash)->ifnone = ifnone;
@@ -640,7 +604,8 @@ rb_hash_set_default(VALUE hash, VALUE ifnone)
static VALUE
-rb_hash_default_proc(VALUE hash)
+rb_hash_default_proc(hash)
+ VALUE hash;
{
if (FL_TEST(hash, HASH_PROC_DEFAULT)) {
return RHASH(hash)->ifnone;
@@ -648,44 +613,11 @@ rb_hash_default_proc(VALUE hash)
return Qnil;
}
-VALUE rb_obj_is_proc(VALUE proc);
-
-/*
- * call-seq:
- * hsh.default_proc = proc_obj => proc_obj
- *
- * Sets the default proc to be executed on each key lookup.
- *
- * h.default_proc = proc do |hash, key|
- * hash[key] = key + key
- * end
- * h[2] #=> 4
- * h["cat"] #=> "catcat"
- */
-
-static VALUE
-rb_hash_set_default_proc(VALUE hash, VALUE proc)
-{
- VALUE b;
-
- rb_hash_modify(hash);
- b = rb_check_convert_type(proc, T_DATA, "Proc", "to_proc");
- if (NIL_P(b) || !rb_obj_is_proc(b)) {
- rb_raise(rb_eTypeError,
- "wrong default_proc type %s (expected Proc)",
- rb_obj_classname(proc));
- }
- proc = b;
- RHASH(hash)->ifnone = proc;
- FL_SET(hash, HASH_PROC_DEFAULT);
- return proc;
-}
-
static int
-key_i(VALUE key, VALUE value, VALUE arg)
+index_i(key, value, args)
+ VALUE key, value;
+ VALUE *args;
{
- VALUE *args = (VALUE *)arg;
-
if (rb_equal(value, args[0])) {
args[1] = key;
return ST_STOP;
@@ -693,55 +625,75 @@ key_i(VALUE key, VALUE value, VALUE arg)
return ST_CONTINUE;
}
+static VALUE
+rb_hash_delete_key(hash, key)
+ VALUE hash, key;
+{
+ st_data_t ktmp = (st_data_t)key, val;
+
+ if (RHASH(hash)->iter_lev > 0) {
+ if (st_delete_safe(RHASH(hash)->tbl, &ktmp, &val, Qundef)) {
+ FL_SET(hash, HASH_DELETED);
+ return (VALUE)val;
+ }
+ }
+ else if (st_delete(RHASH(hash)->tbl, &ktmp, &val))
+ return (VALUE)val;
+ return Qundef;
+}
+
/*
* call-seq:
- * hsh.key(value) => key
+ * hsh.index(value) => key
*
* Returns the key for a given value. If not found, returns <code>nil</code>.
*
* h = { "a" => 100, "b" => 200 }
- * h.key(200) #=> "b"
- * h.key(999) #=> nil
+ * h.index(200) #=> "b"
+ * h.index(999) #=> nil
*
*/
static VALUE
-rb_hash_key(VALUE hash, VALUE value)
+rb_hash_index(hash, value)
+ VALUE hash, value;
{
VALUE args[2];
args[0] = value;
args[1] = Qnil;
- rb_hash_foreach(hash, key_i, (VALUE)args);
+ rb_hash_foreach(hash, index_i, (st_data_t)args);
return args[1];
}
-/* :nodoc: */
-static VALUE
-rb_hash_index(VALUE hash, VALUE value)
-{
- rb_warn("Hash#index is deprecated; use Hash#key");
- return rb_hash_key(hash, value);
-}
+/*
+ * call-seq:
+ * hsh.indexes(key, ...) => array
+ * hsh.indices(key, ...) => array
+ *
+ * Deprecated in favor of <code>Hash#select</code>.
+ *
+ */
static VALUE
-rb_hash_delete_key(VALUE hash, VALUE key)
+rb_hash_indexes(argc, argv, hash)
+ int argc;
+ VALUE *argv;
+ VALUE hash;
{
- st_data_t ktmp = (st_data_t)key, val;
+ VALUE indexes;
+ int i;
- if (!RHASH(hash)->ntbl)
- return Qundef;
- if (RHASH(hash)->iter_lev > 0) {
- if (st_delete_safe(RHASH(hash)->ntbl, &ktmp, &val, Qundef)) {
- FL_SET(hash, HASH_DELETED);
- return (VALUE)val;
- }
+ rb_warn("Hash#%s is deprecated; use Hash#values_at",
+ rb_id2name(rb_frame_last_func()));
+ indexes = rb_ary_new2(argc);
+ for (i=0; i<argc; i++) {
+ RARRAY(indexes)->ptr[i] = rb_hash_aref(hash, argv[i]);
+ RARRAY(indexes)->len++;
}
- else if (st_delete(RHASH(hash)->ntbl, &ktmp, &val))
- return (VALUE)val;
- return Qundef;
+ return indexes;
}
/*
@@ -750,10 +702,9 @@ rb_hash_delete_key(VALUE hash, VALUE key)
* hsh.delete(key) {| key | block } => value
*
* Deletes and returns a key-value pair from <i>hsh</i> whose key is
- * equal to <i>key</i>. If the key is not found, returns the
- * <em>default value</em>. If the optional code block is given and the
- * key is not found, pass in the key and return the result of
- * <i>block</i>.
+ * equal to <i>key</i>. If the key is not found, returns <code>nil</code>.
+ * If the optional code block is given and the key is not found,
+ * pass in the key and return the result of <i>block</i>.
*
* h = { "a" => 100, "b" => 200 }
* h.delete("a") #=> 100
@@ -763,7 +714,8 @@ rb_hash_delete_key(VALUE hash, VALUE key)
*/
VALUE
-rb_hash_delete(VALUE hash, VALUE key)
+rb_hash_delete(hash, key)
+ VALUE hash, key;
{
VALUE val;
@@ -782,10 +734,10 @@ struct shift_var {
};
static int
-shift_i(VALUE key, VALUE value, VALUE arg)
+shift_i(key, value, var)
+ VALUE key, value;
+ struct shift_var *var;
{
- struct shift_var *var = (struct shift_var *)arg;
-
if (key == Qundef) return ST_CONTINUE;
if (var->key != Qundef) return ST_STOP;
var->key = key;
@@ -794,10 +746,10 @@ shift_i(VALUE key, VALUE value, VALUE arg)
}
static int
-shift_i_safe(VALUE key, VALUE value, VALUE arg)
+shift_i_safe(key, value, var)
+ VALUE key, value;
+ struct shift_var *var;
{
- struct shift_var *var = (struct shift_var *)arg;
-
if (key == Qundef) return ST_CONTINUE;
var->key = key;
var->val = value;
@@ -818,23 +770,31 @@ shift_i_safe(VALUE key, VALUE value, VALUE arg)
*/
static VALUE
-rb_hash_shift(VALUE hash)
+rb_hash_shift(hash)
+ VALUE hash;
{
struct shift_var var;
rb_hash_modify(hash);
var.key = Qundef;
- rb_hash_foreach(hash, RHASH(hash)->iter_lev > 0 ? shift_i_safe : shift_i,
- (VALUE)&var);
+ if (RHASH(hash)->iter_lev > 0) {
+ rb_hash_foreach(hash, shift_i_safe, (st_data_t)&var);
+ if (var.key != Qundef) {
+ st_data_t key = var.key;
+ if (st_delete_safe(RHASH(hash)->tbl, &key, 0, Qundef)) {
+ FL_SET(hash, HASH_DELETED);
+ }
+ }
+ }
+ else {
+ rb_hash_foreach(hash, shift_i, (st_data_t)&var);
+ }
if (var.key != Qundef) {
- if (RHASH(hash)->iter_lev > 0) {
- rb_hash_delete_key(hash, var.key);
- }
return rb_assoc_new(var.key, var.val);
}
else if (FL_TEST(hash, HASH_PROC_DEFAULT)) {
- return rb_funcall(RHASH(hash)->ifnone, id_yield, 2, hash, Qnil);
+ return rb_funcall(RHASH(hash)->ifnone, id_call, 2, hash, Qnil);
}
else {
return RHASH(hash)->ifnone;
@@ -842,7 +802,8 @@ rb_hash_shift(VALUE hash)
}
static int
-delete_if_i(VALUE key, VALUE value, VALUE hash)
+delete_if_i(key, value, hash)
+ VALUE key, value, hash;
{
if (key == Qundef) return ST_CONTINUE;
if (RTEST(rb_yield_values(2, key, value))) {
@@ -864,7 +825,8 @@ delete_if_i(VALUE key, VALUE value, VALUE hash)
*/
VALUE
-rb_hash_delete_if(VALUE hash)
+rb_hash_delete_if(hash)
+ VALUE hash;
{
RETURN_ENUMERATOR(hash, 0, 0);
rb_hash_modify(hash);
@@ -881,17 +843,15 @@ rb_hash_delete_if(VALUE hash)
*/
VALUE
-rb_hash_reject_bang(VALUE hash)
+rb_hash_reject_bang(hash)
+ VALUE hash;
{
- st_index_t n;
+ int n;
RETURN_ENUMERATOR(hash, 0, 0);
- rb_hash_modify(hash);
- if (!RHASH(hash)->ntbl)
- return Qnil;
- n = RHASH(hash)->ntbl->num_entries;
- rb_hash_foreach(hash, delete_if_i, hash);
- if (n == RHASH(hash)->ntbl->num_entries) return Qnil;
+ n = RHASH(hash)->tbl->num_entries;
+ rb_hash_delete_if(hash);
+ if (n == RHASH(hash)->tbl->num_entries) return Qnil;
return hash;
}
@@ -906,11 +866,22 @@ rb_hash_reject_bang(VALUE hash)
*/
static VALUE
-rb_hash_reject(VALUE hash)
+rb_hash_reject(hash)
+ VALUE hash;
{
return rb_hash_delete_if(rb_obj_dup(hash));
}
+static int
+select_i(key, value, result)
+ VALUE key, value, result;
+{
+ if (key == Qundef) return ST_CONTINUE;
+ if (RTEST(rb_yield_values(2, key, value)))
+ rb_ary_push(result, rb_assoc_new(key, value));
+ return ST_CONTINUE;
+}
+
/*
* call-seq:
* hsh.values_at(key, ...) => array
@@ -923,9 +894,12 @@ rb_hash_reject(VALUE hash)
*/
VALUE
-rb_hash_values_at(int argc, VALUE *argv, VALUE hash)
+rb_hash_values_at(argc, argv, hash)
+ int argc;
+ VALUE *argv;
+ VALUE hash;
{
- VALUE result = rb_ary_new2(argc);
+ VALUE result = rb_ary_new();
long i;
for (i=0; i<argc; i++) {
@@ -934,39 +908,34 @@ rb_hash_values_at(int argc, VALUE *argv, VALUE hash)
return result;
}
-static int
-select_i(VALUE key, VALUE value, VALUE result)
-{
- if (key == Qundef) return ST_CONTINUE;
- if (RTEST(rb_yield_values(2, key, value)))
- rb_hash_aset(result, key, value);
- return ST_CONTINUE;
-}
-
/*
* call-seq:
- * hsh.select {|key, value| block} => a_hash
+ * hsh.select {|key, value| block} => array
*
- * Returns a new hash consisting of entries which the block returns true.
+ * Returns a new array consisting of <code>[key,value]</code>
+ * pairs for which the block returns true.
+ * Also see <code>Hash.values_at</code>.
*
* h = { "a" => 100, "b" => 200, "c" => 300 }
- * h.select {|k,v| k > "a"} #=> {"b" => 200, "c" => 300}
- * h.select {|k,v| v < 200} #=> {"a" => 100}
+ * h.select {|k,v| k > "a"} #=> [["b", 200], ["c", 300]]
+ * h.select {|k,v| v < 200} #=> [["a", 100]]
*/
VALUE
-rb_hash_select(VALUE hash)
+rb_hash_select(hash)
+ VALUE hash;
{
VALUE result;
RETURN_ENUMERATOR(hash, 0, 0);
- result = rb_hash_new();
+ result = rb_ary_new();
rb_hash_foreach(hash, select_i, result);
return result;
}
static int
-clear_i(VALUE key, VALUE value, VALUE dummy)
+clear_i(key, value, dummy)
+ VALUE key, value, dummy;
{
return ST_DELETE;
}
@@ -983,16 +952,12 @@ clear_i(VALUE key, VALUE value, VALUE dummy)
*/
static VALUE
-rb_hash_clear(VALUE hash)
+rb_hash_clear(hash)
+ VALUE hash;
{
- rb_hash_modify_check(hash);
- if (!RHASH(hash)->ntbl)
- return hash;
- if (RHASH(hash)->ntbl->num_entries > 0) {
- if (RHASH(hash)->iter_lev > 0)
- rb_hash_foreach(hash, clear_i, 0);
- else
- st_clear(RHASH(hash)->ntbl);
+ rb_hash_modify(hash);
+ if (RHASH(hash)->tbl->num_entries > 0) {
+ rb_hash_foreach(hash, clear_i, 0);
}
return hash;
@@ -1017,23 +982,22 @@ rb_hash_clear(VALUE hash)
*/
VALUE
-rb_hash_aset(VALUE hash, VALUE key, VALUE val)
+rb_hash_aset(hash, key, val)
+ VALUE hash, key, val;
{
rb_hash_modify(hash);
- if (hash == key) {
- rb_raise(rb_eArgError, "recursive key for hash");
- }
- if (RHASH(hash)->ntbl->type == &identhash || rb_obj_class(key) != rb_cString) {
- st_insert(RHASH(hash)->ntbl, key, val);
+ if (TYPE(key) != T_STRING || st_lookup(RHASH(hash)->tbl, key, 0)) {
+ st_insert(RHASH(hash)->tbl, key, val);
}
else {
- st_insert2(RHASH(hash)->ntbl, key, val, rb_str_new4);
+ st_add_direct(RHASH(hash)->tbl, rb_str_new4(key), val);
}
return val;
}
static int
-replace_i(VALUE key, VALUE val, VALUE hash)
+replace_i(key, val, hash)
+ VALUE key, val, hash;
{
if (key != Qundef) {
rb_hash_aset(hash, key, val);
@@ -1055,15 +1019,12 @@ replace_i(VALUE key, VALUE val, VALUE hash)
*/
static VALUE
-rb_hash_replace(VALUE hash, VALUE hash2)
+rb_hash_replace(hash, hash2)
+ VALUE hash, hash2;
{
hash2 = to_hash(hash2);
if (hash == hash2) return hash;
rb_hash_clear(hash);
- if (RHASH(hash2)->ntbl) {
- rb_hash_tbl(hash);
- RHASH(hash)->ntbl->type = RHASH(hash2)->ntbl->type;
- }
rb_hash_foreach(hash2, replace_i, hash);
RHASH(hash)->ifnone = RHASH(hash2)->ifnone;
if (FL_TEST(hash2, HASH_PROC_DEFAULT)) {
@@ -1090,11 +1051,10 @@ rb_hash_replace(VALUE hash, VALUE hash2)
*/
static VALUE
-rb_hash_size(VALUE hash)
+rb_hash_size(hash)
+ VALUE hash;
{
- if (!RHASH(hash)->ntbl)
- return INT2FIX(0);
- return INT2FIX(RHASH(hash)->ntbl->num_entries);
+ return INT2FIX(RHASH(hash)->tbl->num_entries);
}
@@ -1109,13 +1069,17 @@ rb_hash_size(VALUE hash)
*/
static VALUE
-rb_hash_empty_p(VALUE hash)
+rb_hash_empty_p(hash)
+ VALUE hash;
{
- return RHASH_EMPTY_P(hash) ? Qtrue : Qfalse;
+ if (RHASH(hash)->tbl->num_entries == 0)
+ return Qtrue;
+ return Qfalse;
}
static int
-each_value_i(VALUE key, VALUE value)
+each_value_i(key, value)
+ VALUE key, value;
{
if (key == Qundef) return ST_CONTINUE;
rb_yield(value);
@@ -1139,7 +1103,8 @@ each_value_i(VALUE key, VALUE value)
*/
static VALUE
-rb_hash_each_value(VALUE hash)
+rb_hash_each_value(hash)
+ VALUE hash;
{
RETURN_ENUMERATOR(hash, 0, 0);
rb_hash_foreach(hash, each_value_i, 0);
@@ -1147,7 +1112,8 @@ rb_hash_each_value(VALUE hash)
}
static int
-each_key_i(VALUE key, VALUE value)
+each_key_i(key, value)
+ VALUE key, value;
{
if (key == Qundef) return ST_CONTINUE;
rb_yield(key);
@@ -1170,7 +1136,8 @@ each_key_i(VALUE key, VALUE value)
* b
*/
static VALUE
-rb_hash_each_key(VALUE hash)
+rb_hash_each_key(hash)
+ VALUE hash;
{
RETURN_ENUMERATOR(hash, 0, 0);
rb_hash_foreach(hash, each_key_i, 0);
@@ -1178,7 +1145,43 @@ rb_hash_each_key(VALUE hash)
}
static int
-each_pair_i(VALUE key, VALUE value)
+each_pair_i(key, value)
+ VALUE key, value;
+{
+ if (key == Qundef) return ST_CONTINUE;
+ rb_yield_values(2, key, value);
+ return ST_CONTINUE;
+}
+
+/*
+ * call-seq:
+ * hsh.each_pair {| key_value_array | block } -> hsh
+ *
+ * Calls <i>block</i> once for each key in <i>hsh</i>, passing the key
+ * and value as parameters.
+ *
+ * h = { "a" => 100, "b" => 200 }
+ * h.each_pair {|key, value| puts "#{key} is #{value}" }
+ *
+ * <em>produces:</em>
+ *
+ * a is 100
+ * b is 200
+ *
+ */
+
+static VALUE
+rb_hash_each_pair(hash)
+ VALUE hash;
+{
+ RETURN_ENUMERATOR(hash, 0, 0);
+ rb_hash_foreach(hash, each_pair_i, 0);
+ return hash;
+}
+
+static int
+each_i(key, value)
+ VALUE key, value;
{
if (key == Qundef) return ST_CONTINUE;
rb_yield(rb_assoc_new(key, value));
@@ -1188,10 +1191,12 @@ each_pair_i(VALUE key, VALUE value)
/*
* call-seq:
* hsh.each {| key, value | block } -> hsh
- * hsh.each_pair {| key, value | block } -> hsh
*
- * Calls <i>block</i> once for each key in <i>hsh</i>, passing the key-value
- * pair as parameters.
+ * Calls <i>block</i> once for each key in <i>hsh</i>, passing the key
+ * and value to the block as a two-element array. Because of the assignment
+ * semantics of block parameters, these elements will be split out if the
+ * block has two formal parameters. Also see <code>Hash.each_pair</code>, which
+ * will be marginally more efficient for blocks with two parameters.
*
* h = { "a" => 100, "b" => 200 }
* h.each {|key, value| puts "#{key} is #{value}" }
@@ -1204,15 +1209,17 @@ each_pair_i(VALUE key, VALUE value)
*/
static VALUE
-rb_hash_each_pair(VALUE hash)
+rb_hash_each(hash)
+ VALUE hash;
{
RETURN_ENUMERATOR(hash, 0, 0);
- rb_hash_foreach(hash, each_pair_i, 0);
+ rb_hash_foreach(hash, each_i, 0);
return hash;
}
static int
-to_a_i(VALUE key, VALUE value, VALUE ary)
+to_a_i(key, value, ary)
+ VALUE key, value, ary;
{
if (key == Qundef) return ST_CONTINUE;
rb_ary_push(ary, rb_assoc_new(key, value));
@@ -1227,28 +1234,54 @@ to_a_i(VALUE key, VALUE value, VALUE ary)
* value</i> <code>]</code> arrays.
*
* h = { "c" => 300, "a" => 100, "d" => 400, "c" => 300 }
- * h.to_a #=> [["c", 300], ["a", 100], ["d", 400]]
+ * h.to_a #=> [["a", 100], ["c", 300], ["d", 400]]
*/
static VALUE
-rb_hash_to_a(VALUE hash)
+rb_hash_to_a(hash)
+ VALUE hash;
{
VALUE ary;
ary = rb_ary_new();
rb_hash_foreach(hash, to_a_i, ary);
- OBJ_INFECT(ary, hash);
+ if (OBJ_TAINTED(hash)) OBJ_TAINT(ary);
return ary;
}
+/*
+ * call-seq:
+ * hsh.sort => array
+ * hsh.sort {| a, b | block } => array
+ *
+ * Converts <i>hsh</i> to a nested array of <code>[</code> <i>key,
+ * value</i> <code>]</code> arrays and sorts it, using
+ * <code>Array#sort</code>.
+ *
+ * h = { "a" => 20, "b" => 30, "c" => 10 }
+ * h.sort #=> [["a", 20], ["b", 30], ["c", 10]]
+ * h.sort {|a,b| a[1]<=>b[1]} #=> [["c", 10], ["a", 20], ["b", 30]]
+ *
+ */
+
+static VALUE
+rb_hash_sort(hash)
+ VALUE hash;
+{
+ VALUE entries = rb_hash_to_a(hash);
+ rb_ary_sort_bang(entries);
+ return entries;
+}
+
static int
-inspect_i(VALUE key, VALUE value, VALUE str)
+inspect_i(key, value, str)
+ VALUE key, value, str;
{
VALUE str2;
if (key == Qundef) return ST_CONTINUE;
- if (RSTRING_LEN(str) > 1) {
+ if (RSTRING(str)->len > 1) {
rb_str_cat2(str, ", ");
}
str2 = rb_inspect(key);
@@ -1263,11 +1296,11 @@ inspect_i(VALUE key, VALUE value, VALUE str)
}
static VALUE
-inspect_hash(VALUE hash, VALUE dummy, int recur)
+inspect_hash(hash)
+ VALUE hash;
{
VALUE str;
- if (recur) return rb_usascii_str_new2("{...}");
str = rb_str_buf_new2("{");
rb_hash_foreach(hash, inspect_i, str);
rb_str_buf_cat2(str, "}");
@@ -1278,21 +1311,47 @@ inspect_hash(VALUE hash, VALUE dummy, int recur)
/*
* call-seq:
- * hsh.to_s => string
* hsh.inspect => string
*
* Return the contents of this hash as a string.
+ */
+
+static VALUE
+rb_hash_inspect(hash)
+ VALUE hash;
+{
+ if (RHASH(hash)->tbl == 0 || RHASH(hash)->tbl->num_entries == 0)
+ return rb_str_new2("{}");
+ if (rb_inspecting_p(hash)) return rb_str_new2("{...}");
+ return rb_protect_inspect(inspect_hash, hash, 0);
+}
+
+static VALUE
+to_s_hash(hash)
+ VALUE hash;
+{
+ return rb_ary_to_s(rb_hash_to_a(hash));
+}
+
+/*
+ * call-seq:
+ * hsh.to_s => string
+ *
+ * Converts <i>hsh</i> to a string by converting the hash to an array
+ * of <code>[</code> <i>key, value</i> <code>]</code> pairs and then
+ * converting that array to a string using <code>Array#join</code> with
+ * the default separator.
*
* h = { "c" => 300, "a" => 100, "d" => 400, "c" => 300 }
- * h.to_s #=> "{\"c\"=>300, \"a\"=>100, \"d\"=>400}"
+ * h.to_s #=> "a100c300d400"
*/
static VALUE
-rb_hash_inspect(VALUE hash)
+rb_hash_to_s(hash)
+ VALUE hash;
{
- if (RHASH_EMPTY_P(hash))
- return rb_usascii_str_new2("{}");
- return rb_exec_recursive(inspect_hash, hash, 0);
+ if (rb_inspecting_p(hash)) return rb_str_new2("{...}");
+ return rb_protect_inspect(to_s_hash, hash, 0);
}
/*
@@ -1303,13 +1362,15 @@ rb_hash_inspect(VALUE hash)
*/
static VALUE
-rb_hash_to_hash(VALUE hash)
+rb_hash_to_hash(hash)
+ VALUE hash;
{
return hash;
}
static int
-keys_i(VALUE key, VALUE value, VALUE ary)
+keys_i(key, value, ary)
+ VALUE key, value, ary;
{
if (key == Qundef) return ST_CONTINUE;
rb_ary_push(ary, key);
@@ -1329,7 +1390,8 @@ keys_i(VALUE key, VALUE value, VALUE ary)
*/
static VALUE
-rb_hash_keys(VALUE hash)
+rb_hash_keys(hash)
+ VALUE hash;
{
VALUE ary;
@@ -1340,7 +1402,8 @@ rb_hash_keys(VALUE hash)
}
static int
-values_i(VALUE key, VALUE value, VALUE ary)
+values_i(key, value, ary)
+ VALUE key, value, ary;
{
if (key == Qundef) return ST_CONTINUE;
rb_ary_push(ary, value);
@@ -1360,7 +1423,8 @@ values_i(VALUE key, VALUE value, VALUE ary)
*/
static VALUE
-rb_hash_values(VALUE hash)
+rb_hash_values(hash)
+ VALUE hash;
{
VALUE ary;
@@ -1386,21 +1450,20 @@ rb_hash_values(VALUE hash)
*/
static VALUE
-rb_hash_has_key(VALUE hash, VALUE key)
+rb_hash_has_key(hash, key)
+ VALUE hash;
+ VALUE key;
{
- if (!RHASH(hash)->ntbl)
- return Qfalse;
- if (st_lookup(RHASH(hash)->ntbl, key, 0)) {
+ if (st_lookup(RHASH(hash)->tbl, key, 0)) {
return Qtrue;
}
return Qfalse;
}
static int
-rb_hash_search_value(VALUE key, VALUE value, VALUE arg)
+rb_hash_search_value(key, value, data)
+ VALUE key, value, *data;
{
- VALUE *data = (VALUE *)arg;
-
if (key == Qundef) return ST_CONTINUE;
if (rb_equal(value, data[1])) {
data[0] = Qtrue;
@@ -1423,26 +1486,30 @@ rb_hash_search_value(VALUE key, VALUE value, VALUE arg)
*/
static VALUE
-rb_hash_has_value(VALUE hash, VALUE val)
+rb_hash_has_value(hash, val)
+ VALUE hash;
+ VALUE val;
{
VALUE data[2];
data[0] = Qfalse;
data[1] = val;
- rb_hash_foreach(hash, rb_hash_search_value, (VALUE)data);
+ rb_hash_foreach(hash, rb_hash_search_value, (st_data_t)data);
return data[0];
}
struct equal_data {
- VALUE result;
+ int result;
st_table *tbl;
int eql;
};
static int
-eql_i(VALUE key, VALUE val1, VALUE arg)
+eql_i(key, val1, data)
+ VALUE key;
+ VALUE val1;
+ struct equal_data *data;
{
- struct equal_data *data = (struct equal_data *)arg;
VALUE val2;
if (key == Qundef) return ST_CONTINUE;
@@ -1450,28 +1517,34 @@ eql_i(VALUE key, VALUE val1, VALUE arg)
data->result = Qfalse;
return ST_STOP;
}
- if (!(data->eql ? rb_eql(val1, val2) : (int)rb_equal(val1, val2))) {
+ if (!(data->eql ? rb_eql(val1, val2) : rb_equal(val1, val2))) {
data->result = Qfalse;
return ST_STOP;
}
return ST_CONTINUE;
}
+static VALUE recursive_eql _((VALUE, VALUE, int));
static VALUE
-recursive_eql(VALUE hash, VALUE dt, int recur)
+recursive_eql(hash, dt, recur)
+ VALUE hash;
+ VALUE dt;
+ int recur;
{
struct equal_data *data;
- if (recur) return Qtrue; /* Subtle! */
+ if (recur) return Qfalse;
data = (struct equal_data*)dt;
data->result = Qtrue;
- rb_hash_foreach(hash, eql_i, dt);
+ rb_hash_foreach(hash, eql_i, (st_data_t)data);
return data->result;
}
static VALUE
-hash_equal(VALUE hash1, VALUE hash2, int eql)
+hash_equal(hash1, hash2, eql)
+ VALUE hash1, hash2;
+ int eql; /* compare default value if true */
{
struct equal_data data;
@@ -1480,26 +1553,19 @@ hash_equal(VALUE hash1, VALUE hash2, int eql)
if (!rb_respond_to(hash2, rb_intern("to_hash"))) {
return Qfalse;
}
- if (eql)
- return rb_eql(hash2, hash1);
- else
- return rb_equal(hash2, hash1);
+ return rb_equal(hash2, hash1);
}
- if (RHASH_SIZE(hash1) != RHASH_SIZE(hash2))
- return Qfalse;
- if (!RHASH(hash1)->ntbl || !RHASH(hash2)->ntbl)
- return Qtrue;
- if (RHASH(hash1)->ntbl->type != RHASH(hash2)->ntbl->type)
- return Qfalse;
-#if 0
- if (!(rb_equal(RHASH(hash1)->ifnone, RHASH(hash2)->ifnone) &&
- FL_TEST(hash1, HASH_PROC_DEFAULT) == FL_TEST(hash2, HASH_PROC_DEFAULT)))
+ if (RHASH(hash1)->tbl->num_entries != RHASH(hash2)->tbl->num_entries)
return Qfalse;
-#endif
+ if (eql) {
+ if (!(rb_equal(RHASH(hash1)->ifnone, RHASH(hash2)->ifnone) &&
+ FL_TEST(hash1, HASH_PROC_DEFAULT) == FL_TEST(hash2, HASH_PROC_DEFAULT)))
+ return Qfalse;
+ }
- data.tbl = RHASH(hash2)->ntbl;
+ data.tbl = RHASH(hash2)->tbl;
data.eql = eql;
- return rb_exec_recursive_paired(recursive_eql, hash1, hash2, (VALUE)&data);
+ return rb_exec_recursive(recursive_eql, hash1, (VALUE)&data);
}
/*
@@ -1522,66 +1588,76 @@ hash_equal(VALUE hash1, VALUE hash2, int eql)
*/
static VALUE
-rb_hash_equal(VALUE hash1, VALUE hash2)
+rb_hash_equal(hash1, hash2)
+ VALUE hash1, hash2;
{
- return hash_equal(hash1, hash2, FALSE);
-}
-
-/*
- * call-seq:
- * hash.eql?(other) -> true or false
- *
- * Returns <code>true</code> if <i>hash</i> and <i>other</i> are
- * both hashes with the same content.
- */
-
-static VALUE
-rb_hash_eql(VALUE hash1, VALUE hash2)
-{
- return hash_equal(hash1, hash2, TRUE);
+ return hash_equal(hash1, hash2, Qfalse);
}
static int
-hash_i(VALUE key, VALUE val, VALUE arg)
+hash_i(key, val, hval)
+ VALUE key;
+ VALUE val;
+ int *hval;
{
- VALUE *hval = (VALUE *)arg;
-
if (key == Qundef) return ST_CONTINUE;
- *hval ^= rb_hash_end(rb_hash_uint(rb_hash_start(rb_hash(key)), rb_hash(val)));
+ *hval ^= rb_hash(key);
+ *hval ^= rb_hash(val);
return ST_CONTINUE;
}
+static VALUE recursive_hash _((VALUE, VALUE, int));
static VALUE
-recursive_hash(VALUE hash, VALUE dummy, int recur)
+recursive_hash(hash, dummy, recur)
+ VALUE hash;
+ VALUE dummy;
+ int recur;
{
- VALUE hval;
+ int hval;
if (recur) {
- rb_raise(rb_eArgError, "recursive key for hash");
+ return LONG2FIX(0);
}
- if (!RHASH(hash)->ntbl)
- return LONG2FIX(0);
- hval = RHASH(hash)->ntbl->num_entries;
- rb_hash_foreach(hash, hash_i, (VALUE)&hval);
+ hval = RHASH(hash)->tbl->num_entries;
+ rb_hash_foreach(hash, hash_i, (st_data_t)&hval);
return INT2FIX(hval);
}
/*
* call-seq:
- * hsh.hash -> fixnum
+ * array.hash -> fixnum
*
- * Compute a hash-code for this hash. Two hashes with the same content
+ * Compute a hash-code for this array. Two arrays with the same content
* will have the same hash code (and will compare using <code>eql?</code>).
*/
static VALUE
-rb_hash_hash(VALUE hash)
+rb_hash_hash(hash)
+ VALUE hash;
{
return rb_exec_recursive(recursive_hash, hash, 0);
}
+
+/*
+ * call-seq:
+ * hash.eql?(other) -> true or false
+ *
+ * Returns <code>true</code> if <i>hash</i> and <i>other</i> are
+ * both hashes with the same content.
+ */
+
+static VALUE
+rb_hash_eql(hash1, hash2)
+ VALUE hash1, hash2;
+{
+ return hash_equal(hash1, hash2, Qtrue);
+}
+
static int
-rb_hash_invert_i(VALUE key, VALUE value, VALUE hash)
+rb_hash_invert_i(key, value, hash)
+ VALUE key, value;
+ VALUE hash;
{
if (key == Qundef) return ST_CONTINUE;
rb_hash_aset(hash, value, key);
@@ -1596,12 +1672,13 @@ rb_hash_invert_i(VALUE key, VALUE value, VALUE hash)
* the keys as values.
*
* h = { "n" => 100, "m" => 100, "y" => 300, "d" => 200, "a" => 0 }
- * h.invert #=> {0=>"a", 100=>"m", 200=>"d", 300=>"y"}
+ * h.invert #=> {0=>"a", 100=>"n", 200=>"d", 300=>"y"}
*
*/
static VALUE
-rb_hash_invert(VALUE hash)
+rb_hash_invert(hash)
+ VALUE hash;
{
VALUE h = rb_hash_new();
@@ -1610,21 +1687,25 @@ rb_hash_invert(VALUE hash)
}
static int
-rb_hash_update_i(VALUE key, VALUE value, VALUE hash)
+rb_hash_update_i(key, value, hash)
+ VALUE key, value;
+ VALUE hash;
{
if (key == Qundef) return ST_CONTINUE;
- st_insert(RHASH(hash)->ntbl, key, value);
+ rb_hash_aset(hash, key, value);
return ST_CONTINUE;
}
static int
-rb_hash_update_block_i(VALUE key, VALUE value, VALUE hash)
+rb_hash_update_block_i(key, value, hash)
+ VALUE key, value;
+ VALUE hash;
{
if (key == Qundef) return ST_CONTINUE;
if (rb_hash_has_key(hash, key)) {
value = rb_yield_values(3, key, rb_hash_aref(hash, key), value);
}
- st_insert(RHASH(hash)->ntbl, key, value);
+ rb_hash_aset(hash, key, value);
return ST_CONTINUE;
}
@@ -1652,9 +1733,9 @@ rb_hash_update_block_i(VALUE key, VALUE value, VALUE hash)
*/
static VALUE
-rb_hash_update(VALUE hash1, VALUE hash2)
+rb_hash_update(hash1, hash2)
+ VALUE hash1, hash2;
{
- rb_hash_modify(hash1);
hash2 = to_hash(hash2);
if (rb_block_given_p()) {
rb_hash_foreach(hash2, rb_hash_update_block_i, hash1);
@@ -1682,162 +1763,12 @@ rb_hash_update(VALUE hash1, VALUE hash2)
*/
static VALUE
-rb_hash_merge(VALUE hash1, VALUE hash2)
+rb_hash_merge(hash1, hash2)
+ VALUE hash1, hash2;
{
return rb_hash_update(rb_obj_dup(hash1), hash2);
}
-static int
-assoc_i(VALUE key, VALUE val, VALUE arg)
-{
- VALUE *args = (VALUE *)arg;
-
- if (key == Qundef) return ST_CONTINUE;
- if (RTEST(rb_equal(args[0], key))) {
- args[1] = rb_assoc_new(key, val);
- return ST_STOP;
- }
- return ST_CONTINUE;
-}
-
-/*
- * call-seq:
- * hash.assoc(obj) -> an_array or nil
- *
- * Searches through the hash comparing _obj_ with the key using <code>==</code>.
- * Returns the key-value pair (two elements array) or +nil+
- * if no match is found. See <code>Array#assoc</code>.
- *
- * h = {"colors" => ["red", "blue", "green"],
- * "letters" => ["a", "b", "c" ]}
- * h.assoc("letters") #=> ["letters", ["a", "b", "c"]]
- * h.assoc("foo") #=> nil
- */
-
-VALUE
-rb_hash_assoc(VALUE hash, VALUE obj)
-{
- VALUE args[2];
-
- args[0] = obj;
- args[1] = Qnil;
- rb_hash_foreach(hash, assoc_i, (VALUE)args);
- return args[1];
-}
-
-static int
-rassoc_i(VALUE key, VALUE val, VALUE arg)
-{
- VALUE *args = (VALUE *)arg;
-
- if (key == Qundef) return ST_CONTINUE;
- if (RTEST(rb_equal(args[0], val))) {
- args[1] = rb_assoc_new(key, val);
- return ST_STOP;
- }
- return ST_CONTINUE;
-}
-
-/*
- * call-seq:
- * hash.rassoc(key) -> an_array or nil
- *
- * Searches through the hash comparing _obj_ with the value using <code>==</code>.
- * Returns the first key-value pair (two elements array) that matches. See
- * also <code>Array#rassoc</code>.
- *
- * a = {1=> "one", 2 => "two", 3 => "three", "ii" => "two"}
- * a.rassoc("two") #=> [2, "two"]
- * a.rassoc("four") #=> nil
- */
-
-VALUE
-rb_hash_rassoc(VALUE hash, VALUE obj)
-{
- VALUE args[2];
-
- args[0] = obj;
- args[1] = Qnil;
- rb_hash_foreach(hash, rassoc_i, (VALUE)args);
- return args[1];
-}
-
-/*
- * call-seq:
- * hash.flatten -> an_array
- * hash.flatten(level) -> an_array
- *
- * Returns a new array that is a one-dimensional flattening of this
- * hash. That is, for every key or value that is an array, extract
- * its elements into the new array. Unlike Array#flatten, this
- * method does not flatten recursively by default. If the optional
- * <i>level</i> argument determines the level of recursion to flatten.
- *
- * a = {1=> "one", 2 => [2,"two"], 3 => "three"}
- * a.flatten # => [1, "one", 2, [2, "two"], 3, "three"]
- * a.flatten(2) # => [1, "one", 2, 2, "two", 3, "three"]
- */
-
-static VALUE
-rb_hash_flatten(int argc, VALUE *argv, VALUE hash)
-{
- VALUE ary, tmp;
-
- ary = rb_hash_to_a(hash);
- if (argc == 0) {
- argc = 1;
- tmp = INT2FIX(1);
- argv = &tmp;
- }
- rb_funcall2(ary, rb_intern("flatten!"), argc, argv);
- return ary;
-}
-
-/*
- * call-seq:
- * hsh.compare_by_identity => hsh
- *
- * Makes <i>hsh</i> to compare its keys by their identity, i.e. it
- * will consider exact same objects as same keys.
- *
- * h1 = { "a" => 100, "b" => 200, :c => "c" }
- * h1["a"] #=> 100
- * h1.compare_by_identity
- * h1.compare_by_identity? #=> true
- * h1["a"] #=> nil # different objects.
- * h1[:c] #=> "c" # same symbols are all same.
- *
- */
-
-static VALUE
-rb_hash_compare_by_id(VALUE hash)
-{
- rb_hash_modify(hash);
- RHASH(hash)->ntbl->type = &identhash;
- rb_hash_rehash(hash);
- return hash;
-}
-
-/*
- * call-seq:
- * hsh.compare_by_identity? => true or false
- *
- * Returns <code>true</code> if <i>hsh</i> will compare its keys by
- * their identity. Also see <code>Hash#compare_by_identity</code>.
- *
- */
-
-static VALUE
-rb_hash_compare_by_id_p(VALUE hash)
-{
- if (!RHASH(hash)->ntbl)
- return Qfalse;
- if (RHASH(hash)->ntbl->type == &identhash) {
- return Qtrue;
- }
- return Qfalse;
-}
-
static int path_tainted = -1;
static char **origenviron;
@@ -1857,39 +1788,36 @@ extern char **environ;
#define GET_ENVIRON(e) (e)
#define FREE_ENVIRON(e)
#endif
-#ifdef ENV_IGNORECASE
-#define ENVMATCH(s1, s2) (STRCASECMP(s1, s2) == 0)
-#define ENVNMATCH(s1, s2, n) (STRNCASECMP(s1, s2, n) == 0)
-#else
-#define ENVMATCH(n1, n2) (strcmp(n1, n2) == 0)
-#define ENVNMATCH(s1, s2, n) (memcmp(s1, s2, n) == 0)
-#endif
static VALUE
-env_str_new(const char *ptr, long len)
+env_str_new(ptr, len)
+ const char *ptr;
+ long len;
{
- VALUE str = rb_locale_str_new(ptr, len);
+ VALUE str = rb_tainted_str_new(ptr, len);
rb_obj_freeze(str);
return str;
}
static VALUE
-env_str_new2(const char *ptr)
+env_str_new2(ptr)
+ const char *ptr;
{
if (!ptr) return Qnil;
return env_str_new(ptr, strlen(ptr));
}
static VALUE
-env_delete(VALUE obj, VALUE name)
+env_delete(obj, name)
+ VALUE obj, name;
{
char *nam, *val;
rb_secure(4);
SafeStringValue(name);
- nam = RSTRING_PTR(name);
- if (memchr(nam, '\0', RSTRING_LEN(name))) {
+ nam = RSTRING(name)->ptr;
+ if (strlen(nam) != RSTRING(name)->len) {
rb_raise(rb_eArgError, "bad environment variable name");
}
val = getenv(nam);
@@ -1897,7 +1825,12 @@ env_delete(VALUE obj, VALUE name)
VALUE value = env_str_new2(val);
ruby_setenv(nam, 0);
- if (ENVMATCH(nam, PATH_ENV)) {
+#ifdef ENV_IGNORECASE
+ if (strcasecmp(nam, PATH_ENV) == 0)
+#else
+ if (strcmp(nam, PATH_ENV) == 0)
+#endif
+ {
path_tainted = 0;
}
return value;
@@ -1906,7 +1839,8 @@ env_delete(VALUE obj, VALUE name)
}
static VALUE
-env_delete_m(VALUE obj, VALUE name)
+env_delete_m(obj, name)
+ VALUE obj, name;
{
VALUE val;
@@ -1916,19 +1850,25 @@ env_delete_m(VALUE obj, VALUE name)
}
static VALUE
-rb_f_getenv(VALUE obj, VALUE name)
+rb_f_getenv(obj, name)
+ VALUE obj, name;
{
char *nam, *env;
rb_secure(4);
SafeStringValue(name);
- nam = RSTRING_PTR(name);
- if (memchr(nam, '\0', RSTRING_LEN(name))) {
+ nam = RSTRING(name)->ptr;
+ if (strlen(nam) != RSTRING(name)->len) {
rb_raise(rb_eArgError, "bad environment variable name");
}
env = getenv(nam);
if (env) {
- if (ENVMATCH(nam, PATH_ENV) && !rb_env_path_tainted()) {
+#ifdef ENV_IGNORECASE
+ if (strcasecmp(nam, PATH_ENV) == 0 && !rb_env_path_tainted())
+#else
+ if (strcmp(nam, PATH_ENV) == 0 && !rb_env_path_tainted())
+#endif
+ {
VALUE str = rb_str_new2(env);
rb_obj_freeze(str);
@@ -1940,7 +1880,9 @@ rb_f_getenv(VALUE obj, VALUE name)
}
static VALUE
-env_fetch(int argc, VALUE *argv)
+env_fetch(argc, argv)
+ int argc;
+ VALUE *argv;
{
VALUE key, if_none;
long block_given;
@@ -1953,31 +1895,36 @@ env_fetch(int argc, VALUE *argv)
rb_warn("block supersedes default value argument");
}
SafeStringValue(key);
- nam = RSTRING_PTR(key);
- if (memchr(nam, '\0', RSTRING_LEN(key))) {
+ nam = RSTRING(key)->ptr;
+ if (strlen(nam) != RSTRING(key)->len) {
rb_raise(rb_eArgError, "bad environment variable name");
}
env = getenv(nam);
if (!env) {
if (block_given) return rb_yield(key);
if (argc == 1) {
- rb_raise(rb_eKeyError, "key not found");
+ rb_raise(rb_eIndexError, "key not found");
}
return if_none;
}
- if (ENVMATCH(nam, PATH_ENV) && !rb_env_path_tainted())
+#ifdef ENV_IGNORECASE
+ if (strcasecmp(nam, PATH_ENV) == 0 && !rb_env_path_tainted())
+#else
+ if (strcmp(nam, PATH_ENV) == 0 && !rb_env_path_tainted())
+#endif
return rb_str_new2(env);
return env_str_new2(env);
}
static void
-path_tainted_p(char *path)
+path_tainted_p(path)
+ char *path;
{
path_tainted = rb_path_check(path)?0:1;
}
int
-rb_env_path_tainted(void)
+rb_env_path_tainted()
{
if (path_tainted < 0) {
path_tainted_p(getenv(PATH_ENV));
@@ -1987,14 +1934,21 @@ rb_env_path_tainted(void)
#if !defined(_WIN32) && !(defined(HAVE_SETENV) && defined(HAVE_UNSETENV))
static int
-envix(const char *nam)
+envix(nam)
+ const char *nam;
{
register int i, len = strlen(nam);
char **env;
env = GET_ENVIRON(environ);
for (i = 0; env[i]; i++) {
- if (ENVNMATCH(env[i],nam,len) && env[i][len] == '=')
+ if (
+#ifdef ENV_IGNORECASE
+ strncasecmp(env[i],nam,len) == 0
+#else
+ memcmp(env[i],nam,len) == 0
+#endif
+ && env[i][len] == '=')
break; /* memcmp must come first to avoid */
} /* potential SEGV's */
FREE_ENVIRON(environ);
@@ -2003,7 +1957,9 @@ envix(const char *nam)
#endif
void
-ruby_setenv(const char *name, const char *value)
+ruby_setenv(name, value)
+ const char *name;
+ const char *value;
{
#if defined(_WIN32)
/* The sane way to deal with the environment.
@@ -2051,7 +2007,7 @@ ruby_setenv(const char *name, const char *value)
char **envp = origenviron;
while (*envp && *envp != environ[i]) envp++;
if (!*envp)
- xfree(environ[i]);
+ free(environ[i]);
if (!value) {
while (environ[i]) {
environ[i] = environ[i+1];
@@ -2067,18 +2023,31 @@ ruby_setenv(const char *name, const char *value)
}
len = strlen(name) + strlen(value) + 2;
environ[i] = ALLOC_N(char, len);
+#ifndef MSDOS
snprintf(environ[i],len,"%s=%s",name,value); /* all that work just for this */
+#else
+ /* MS-DOS requires environment variable names to be in uppercase */
+ /* [Tom Dinger, 27 August 1990: Well, it doesn't _require_ it, but
+ * some utilities and applications may break because they only look
+ * for upper case strings. (Fixed strupr() bug here.)]
+ */
+ strcpy(environ[i],name); strupr(environ[i]);
+ sprintf(environ[i] + strlen(name),"=%s", value);
+#endif /* MSDOS */
+
#endif /* WIN32 */
}
void
-ruby_unsetenv(const char *name)
+ruby_unsetenv(name)
+ const char *name;
{
ruby_setenv(name, 0);
}
static VALUE
-env_aset(VALUE obj, VALUE nm, VALUE val)
+env_aset(obj, nm, val)
+ VALUE obj, nm, val;
{
char *name, *value;
@@ -2090,17 +2059,22 @@ env_aset(VALUE obj, VALUE nm, VALUE val)
env_delete(obj, nm);
return Qnil;
}
+
StringValue(nm);
StringValue(val);
- name = RSTRING_PTR(nm);
- value = RSTRING_PTR(val);
- if (memchr(name, '\0', RSTRING_LEN(nm)))
+ name = RSTRING(nm)->ptr;
+ value = RSTRING(val)->ptr;
+ if (strlen(name) != RSTRING(nm)->len)
rb_raise(rb_eArgError, "bad environment variable name");
- if (memchr(value, '\0', RSTRING_LEN(val)))
+ if (strlen(value) != RSTRING(val)->len)
rb_raise(rb_eArgError, "bad environment variable value");
ruby_setenv(name, value);
- if (ENVMATCH(name, PATH_ENV)) {
+#ifdef ENV_IGNORECASE
+ if (strcasecmp(name, PATH_ENV) == 0) {
+#else
+ if (strcmp(name, PATH_ENV) == 0) {
+#endif
if (OBJ_TAINTED(val)) {
/* already tainted, no check */
path_tainted = 1;
@@ -2114,7 +2088,7 @@ env_aset(VALUE obj, VALUE nm, VALUE val)
}
static VALUE
-env_keys(void)
+env_keys()
{
char **env;
VALUE ary;
@@ -2134,21 +2108,22 @@ env_keys(void)
}
static VALUE
-env_each_key(VALUE ehash)
+env_each_key(ehash)
+ VALUE ehash;
{
VALUE keys;
long i;
RETURN_ENUMERATOR(ehash, 0, 0);
keys = env_keys(); /* rb_secure(4); */
- for (i=0; i<RARRAY_LEN(keys); i++) {
- rb_yield(RARRAY_PTR(keys)[i]);
+ for (i=0; i<RARRAY(keys)->len; i++) {
+ rb_yield(RARRAY(keys)->ptr[i]);
}
return ehash;
}
static VALUE
-env_values(void)
+env_values()
{
VALUE ary;
char **env;
@@ -2168,28 +2143,29 @@ env_values(void)
}
static VALUE
-env_each_value(VALUE ehash)
+env_each_value(ehash)
+ VALUE ehash;
{
VALUE values;
long i;
RETURN_ENUMERATOR(ehash, 0, 0);
values = env_values(); /* rb_secure(4); */
- for (i=0; i<RARRAY_LEN(values); i++) {
- rb_yield(RARRAY_PTR(values)[i]);
+ for (i=0; i<RARRAY(values)->len; i++) {
+ rb_yield(RARRAY(values)->ptr[i]);
}
return ehash;
}
static VALUE
-env_each_pair(VALUE ehash)
+env_each_i(ehash, values)
+ VALUE ehash;
+ int values;
{
char **env;
VALUE ary;
long i;
- RETURN_ENUMERATOR(ehash, 0, 0);
-
rb_secure(4);
ary = rb_ary_new();
env = GET_ENVIRON(environ);
@@ -2203,14 +2179,36 @@ env_each_pair(VALUE ehash)
}
FREE_ENVIRON(environ);
- for (i=0; i<RARRAY_LEN(ary); i+=2) {
- rb_yield(rb_assoc_new(RARRAY_PTR(ary)[i], RARRAY_PTR(ary)[i+1]));
+ for (i=0; i<RARRAY(ary)->len; i+=2) {
+ if (values) {
+ rb_yield_values(2, RARRAY(ary)->ptr[i], RARRAY(ary)->ptr[i+1]);
+ }
+ else {
+ rb_yield(rb_assoc_new(RARRAY(ary)->ptr[i], RARRAY(ary)->ptr[i+1]));
+ }
}
return ehash;
}
static VALUE
-env_reject_bang(VALUE ehash)
+env_each(ehash)
+ VALUE ehash;
+{
+ RETURN_ENUMERATOR(ehash, 0, 0);
+ return env_each_i(ehash, Qfalse);
+}
+
+static VALUE
+env_each_pair(ehash)
+ VALUE ehash;
+{
+ RETURN_ENUMERATOR(ehash, 0, 0);
+ return env_each_i(ehash, Qtrue);
+}
+
+static VALUE
+env_reject_bang(ehash)
+ VALUE ehash;
{
volatile VALUE keys;
long i;
@@ -2218,12 +2216,12 @@ env_reject_bang(VALUE ehash)
RETURN_ENUMERATOR(ehash, 0, 0);
keys = env_keys(); /* rb_secure(4); */
- for (i=0; i<RARRAY_LEN(keys); i++) {
- VALUE val = rb_f_getenv(Qnil, RARRAY_PTR(keys)[i]);
+ for (i=0; i<RARRAY(keys)->len; i++) {
+ VALUE val = rb_f_getenv(Qnil, RARRAY(keys)->ptr[i]);
if (!NIL_P(val)) {
- if (RTEST(rb_yield_values(2, RARRAY_PTR(keys)[i], val))) {
- FL_UNSET(RARRAY_PTR(keys)[i], FL_TAINT);
- env_delete(Qnil, RARRAY_PTR(keys)[i]);
+ if (RTEST(rb_yield_values(2, RARRAY(keys)->ptr[i], val))) {
+ FL_UNSET(RARRAY(keys)->ptr[i], FL_TAINT);
+ env_delete(Qnil, RARRAY(keys)->ptr[i]);
del++;
}
}
@@ -2233,7 +2231,8 @@ env_reject_bang(VALUE ehash)
}
static VALUE
-env_delete_if(VALUE ehash)
+env_delete_if(ehash)
+ VALUE ehash;
{
RETURN_ENUMERATOR(ehash, 0, 0);
env_reject_bang(ehash);
@@ -2241,7 +2240,9 @@ env_delete_if(VALUE ehash)
}
static VALUE
-env_values_at(int argc, VALUE *argv)
+env_values_at(argc, argv)
+ int argc;
+ VALUE *argv;
{
VALUE result;
long i;
@@ -2255,14 +2256,15 @@ env_values_at(int argc, VALUE *argv)
}
static VALUE
-env_select(VALUE ehash)
+env_select(ehash)
+ VALUE ehash;
{
VALUE result;
char **env;
RETURN_ENUMERATOR(ehash, 0, 0);
rb_secure(4);
- result = rb_hash_new();
+ result = rb_ary_new();
env = GET_ENVIRON(environ);
while (*env) {
char *s = strchr(*env, '=');
@@ -2270,7 +2272,7 @@ env_select(VALUE ehash)
VALUE k = env_str_new(*env, s-*env);
VALUE v = env_str_new2(s+1);
if (RTEST(rb_yield_values(2, k, v))) {
- rb_hash_aset(result, k, v);
+ rb_ary_push(result, rb_assoc_new(k, v));
}
}
env++;
@@ -2280,30 +2282,30 @@ env_select(VALUE ehash)
return result;
}
-VALUE
-rb_env_clear(void)
+static VALUE
+env_clear()
{
volatile VALUE keys;
long i;
keys = env_keys(); /* rb_secure(4); */
- for (i=0; i<RARRAY_LEN(keys); i++) {
- VALUE val = rb_f_getenv(Qnil, RARRAY_PTR(keys)[i]);
+ for (i=0; i<RARRAY(keys)->len; i++) {
+ VALUE val = rb_f_getenv(Qnil, RARRAY(keys)->ptr[i]);
if (!NIL_P(val)) {
- env_delete(Qnil, RARRAY_PTR(keys)[i]);
+ env_delete(Qnil, RARRAY(keys)->ptr[i]);
}
}
return envtbl;
}
static VALUE
-env_to_s(void)
+env_to_s()
{
- return rb_usascii_str_new2("ENV");
+ return rb_str_new2("ENV");
}
static VALUE
-env_inspect(void)
+env_inspect()
{
char **env;
VALUE str, i;
@@ -2334,7 +2336,7 @@ env_inspect(void)
}
static VALUE
-env_to_a(void)
+env_to_a()
{
char **env;
VALUE ary;
@@ -2355,13 +2357,13 @@ env_to_a(void)
}
static VALUE
-env_none(void)
+env_none()
{
return Qnil;
}
static VALUE
-env_size(void)
+env_size()
{
int i;
char **env;
@@ -2375,7 +2377,7 @@ env_size(void)
}
static VALUE
-env_empty_p(void)
+env_empty_p()
{
char **env;
@@ -2390,46 +2392,34 @@ env_empty_p(void)
}
static VALUE
-env_has_key(VALUE env, VALUE key)
+env_has_key(env, key)
+ VALUE env, key;
{
char *s;
rb_secure(4);
s = StringValuePtr(key);
- if (memchr(s, '\0', RSTRING_LEN(key)))
+ if (strlen(s) != RSTRING(key)->len)
rb_raise(rb_eArgError, "bad environment variable name");
if (getenv(s)) return Qtrue;
return Qfalse;
}
static VALUE
-env_assoc(VALUE env, VALUE key)
-{
- char *s, *e;
-
- rb_secure(4);
- s = StringValuePtr(key);
- if (memchr(s, '\0', RSTRING_LEN(key)))
- rb_raise(rb_eArgError, "bad environment variable name");
- e = getenv(s);
- if (e) return rb_assoc_new(key, rb_tainted_str_new2(e));
- return Qnil;
-}
-
-static VALUE
-env_has_value(VALUE dmy, VALUE obj)
+env_has_value(dmy, value)
+ VALUE dmy, value;
{
char **env;
rb_secure(4);
- obj = rb_check_string_type(obj);
- if (NIL_P(obj)) return Qnil;
+ value = rb_check_string_type(value);
+ if (NIL_P(value)) return Qfalse;
env = GET_ENVIRON(environ);
while (*env) {
char *s = strchr(*env, '=');
if (s++) {
long len = strlen(s);
- if (RSTRING_LEN(obj) == len && strncmp(s, RSTRING_PTR(obj), len) == 0) {
+ if (RSTRING(value)->len == len && strncmp(s, RSTRING(value)->ptr, len) == 0) {
FREE_ENVIRON(environ);
return Qtrue;
}
@@ -2441,22 +2431,23 @@ env_has_value(VALUE dmy, VALUE obj)
}
static VALUE
-env_rassoc(VALUE dmy, VALUE obj)
+env_index(dmy, value)
+ VALUE dmy, value;
{
char **env;
+ VALUE str;
rb_secure(4);
- obj = rb_check_string_type(obj);
- if (NIL_P(obj)) return Qnil;
+ StringValue(value);
env = GET_ENVIRON(environ);
while (*env) {
char *s = strchr(*env, '=');
if (s++) {
long len = strlen(s);
- if (RSTRING_LEN(obj) == len && strncmp(s, RSTRING_PTR(obj), len) == 0) {
- VALUE result = rb_assoc_new(rb_tainted_str_new(*env, s-*env-1), obj);
+ if (RSTRING(value)->len == len && strncmp(s, RSTRING(value)->ptr, len) == 0) {
+ str = env_str_new(*env, s-*env-1);
FREE_ENVIRON(environ);
- return result;
+ return str;
}
}
env++;
@@ -2466,39 +2457,32 @@ env_rassoc(VALUE dmy, VALUE obj)
}
static VALUE
-env_key(VALUE dmy, VALUE value)
+env_indexes(argc, argv)
+ int argc;
+ VALUE *argv;
{
- char **env;
- VALUE str;
+ int i;
+ VALUE indexes = rb_ary_new2(argc);
+ rb_warn("ENV.%s is deprecated; use ENV.values_at",
+ rb_id2name(rb_frame_last_func()));
rb_secure(4);
- StringValue(value);
- env = GET_ENVIRON(environ);
- while (*env) {
- char *s = strchr(*env, '=');
- if (s++) {
- long len = strlen(s);
- if (RSTRING_LEN(value) == len && strncmp(s, RSTRING_PTR(value), len) == 0) {
- str = env_str_new(*env, s-*env-1);
- FREE_ENVIRON(environ);
- return str;
- }
+ for (i=0;i<argc;i++) {
+ VALUE tmp = rb_check_string_type(argv[i]);
+ if (NIL_P(tmp)) {
+ RARRAY(indexes)->ptr[i] = Qnil;
}
- env++;
+ else {
+ RARRAY(indexes)->ptr[i] = env_str_new2(getenv(RSTRING(tmp)->ptr));
+ }
+ RARRAY(indexes)->len = i+1;
}
- FREE_ENVIRON(environ);
- return Qnil;
-}
-static VALUE
-env_index(VALUE dmy, VALUE value)
-{
- rb_warn("ENV.index is deprecated; use ENV.key");
- return env_key(dmy, value);
+ return indexes;
}
static VALUE
-env_to_hash(void)
+env_to_hash()
{
char **env;
VALUE hash;
@@ -2519,13 +2503,13 @@ env_to_hash(void)
}
static VALUE
-env_reject(void)
+env_reject()
{
return rb_hash_delete_if(env_to_hash());
}
static VALUE
-env_shift(void)
+env_shift()
{
char **env;
@@ -2535,7 +2519,7 @@ env_shift(void)
char *s = strchr(*env, '=');
if (s) {
VALUE key = env_str_new(*env, s-*env);
- VALUE val = env_str_new2(getenv(RSTRING_PTR(key)));
+ VALUE val = env_str_new2(getenv(RSTRING(key)->ptr));
env_delete(Qnil, key);
return rb_assoc_new(key, val);
}
@@ -2545,13 +2529,14 @@ env_shift(void)
}
static VALUE
-env_invert(void)
+env_invert()
{
return rb_hash_invert(env_to_hash());
}
static int
-env_replace_i(VALUE key, VALUE val, VALUE keys)
+env_replace_i(key, val, keys)
+ VALUE key, val, keys;
{
if (key != Qundef) {
env_aset(Qnil, key, val);
@@ -2563,7 +2548,8 @@ env_replace_i(VALUE key, VALUE val, VALUE keys)
}
static VALUE
-env_replace(VALUE env, VALUE hash)
+env_replace(env, hash)
+ VALUE env, hash;
{
volatile VALUE keys;
long i;
@@ -2573,14 +2559,15 @@ env_replace(VALUE env, VALUE hash)
hash = to_hash(hash);
rb_hash_foreach(hash, env_replace_i, keys);
- for (i=0; i<RARRAY_LEN(keys); i++) {
- env_delete(env, RARRAY_PTR(keys)[i]);
+ for (i=0; i<RARRAY(keys)->len; i++) {
+ env_delete(env, RARRAY(keys)->ptr[i]);
}
return env;
}
static int
-env_update_i(VALUE key, VALUE val)
+env_update_i(key, val)
+ VALUE key, val;
{
if (key != Qundef) {
if (rb_block_given_p()) {
@@ -2592,7 +2579,8 @@ env_update_i(VALUE key, VALUE val)
}
static VALUE
-env_update(VALUE env, VALUE hash)
+env_update(env, hash)
+ VALUE env, hash;
{
rb_secure(4);
if (env == hash) return env;
@@ -2612,16 +2600,45 @@ env_update(VALUE env, VALUE hash)
* keys that do not exist in the hash. By default, that value is
* <code>nil</code>.
*
+ * <code>Hash</code> uses <code>key.eql?</code> to test keys for equality.
+ * If you need to use instances of your own classes as keys in a <code>Hash</code>,
+ * it is recommended that you define both the <code>eql?</code> and <code>hash</code>
+ * methods. The <code>hash</code> method must have the property that
+ * <code>a.eql?(b)</code> implies <code>a.hash == b.hash</code>.
+ *
+ * class MyClass
+ * attr_reader :str
+ * def initialize(str)
+ * @str = str
+ * end
+ * def eql?(o)
+ * o.is_a?(MyClass) && str == o.str
+ * end
+ * def hash
+ * @str.hash
+ * end
+ * end
+ *
+ * a = MyClass.new("some string")
+ * b = MyClass.new("some string")
+ * a.eql? b #=> true
+ *
+ * h = {}
+ *
+ * h[a] = 1
+ * h[a] #=> 1
+ * h[b] #=> 1
+ *
+ * h[b] = 2
+ * h[a] #=> 2
+ * h[b] #=> 2
*/
void
-Init_Hash(void)
+Init_Hash()
{
-#undef rb_intern
-#define rb_intern(str) rb_intern_const(str)
-
id_hash = rb_intern("hash");
- id_yield = rb_intern("yield");
+ id_call = rb_intern("call");
id_default = rb_intern("default");
rb_cHash = rb_define_class("Hash", rb_cObject);
@@ -2630,37 +2647,37 @@ Init_Hash(void)
rb_define_alloc_func(rb_cHash, hash_alloc);
rb_define_singleton_method(rb_cHash, "[]", rb_hash_s_create, -1);
- rb_define_singleton_method(rb_cHash, "try_convert", rb_hash_s_try_convert, 1);
rb_define_method(rb_cHash,"initialize", rb_hash_initialize, -1);
rb_define_method(rb_cHash,"initialize_copy", rb_hash_replace, 1);
rb_define_method(rb_cHash,"rehash", rb_hash_rehash, 0);
rb_define_method(rb_cHash,"to_hash", rb_hash_to_hash, 0);
rb_define_method(rb_cHash,"to_a", rb_hash_to_a, 0);
+ rb_define_method(rb_cHash,"to_s", rb_hash_to_s, 0);
rb_define_method(rb_cHash,"inspect", rb_hash_inspect, 0);
- rb_define_alias(rb_cHash, "to_s", "inspect");
rb_define_method(rb_cHash,"==", rb_hash_equal, 1);
rb_define_method(rb_cHash,"[]", rb_hash_aref, 1);
rb_define_method(rb_cHash,"hash", rb_hash_hash, 0);
rb_define_method(rb_cHash,"eql?", rb_hash_eql, 1);
- rb_define_method(rb_cHash,"fetch", rb_hash_fetch_m, -1);
+ rb_define_method(rb_cHash,"fetch", rb_hash_fetch, -1);
rb_define_method(rb_cHash,"[]=", rb_hash_aset, 2);
rb_define_method(rb_cHash,"store", rb_hash_aset, 2);
rb_define_method(rb_cHash,"default", rb_hash_default, -1);
rb_define_method(rb_cHash,"default=", rb_hash_set_default, 1);
rb_define_method(rb_cHash,"default_proc", rb_hash_default_proc, 0);
- rb_define_method(rb_cHash,"default_proc=", rb_hash_set_default_proc, 1);
- rb_define_method(rb_cHash,"key", rb_hash_key, 1);
rb_define_method(rb_cHash,"index", rb_hash_index, 1);
+ rb_define_method(rb_cHash,"indexes", rb_hash_indexes, -1);
+ rb_define_method(rb_cHash,"indices", rb_hash_indexes, -1);
rb_define_method(rb_cHash,"size", rb_hash_size, 0);
rb_define_method(rb_cHash,"length", rb_hash_size, 0);
rb_define_method(rb_cHash,"empty?", rb_hash_empty_p, 0);
+ rb_define_method(rb_cHash,"each", rb_hash_each, 0);
rb_define_method(rb_cHash,"each_value", rb_hash_each_value, 0);
rb_define_method(rb_cHash,"each_key", rb_hash_each_key, 0);
rb_define_method(rb_cHash,"each_pair", rb_hash_each_pair, 0);
- rb_define_method(rb_cHash,"each", rb_hash_each_pair, 0);
+ rb_define_method(rb_cHash,"sort", rb_hash_sort, 0);
rb_define_method(rb_cHash,"keys", rb_hash_keys, 0);
rb_define_method(rb_cHash,"values", rb_hash_values, 0);
@@ -2678,9 +2695,6 @@ Init_Hash(void)
rb_define_method(rb_cHash,"replace", rb_hash_replace, 1);
rb_define_method(rb_cHash,"merge!", rb_hash_update, 1);
rb_define_method(rb_cHash,"merge", rb_hash_merge, 1);
- rb_define_method(rb_cHash, "assoc", rb_hash_assoc, 1);
- rb_define_method(rb_cHash, "rassoc", rb_hash_rassoc, 1);
- rb_define_method(rb_cHash, "flatten", rb_hash_flatten, -1);
rb_define_method(rb_cHash,"include?", rb_hash_has_key, 1);
rb_define_method(rb_cHash,"member?", rb_hash_has_key, 1);
@@ -2689,9 +2703,7 @@ Init_Hash(void)
rb_define_method(rb_cHash,"key?", rb_hash_has_key, 1);
rb_define_method(rb_cHash,"value?", rb_hash_has_value, 1);
- rb_define_method(rb_cHash,"compare_by_identity", rb_hash_compare_by_id, 0);
- rb_define_method(rb_cHash,"compare_by_identity?", rb_hash_compare_by_id_p, 0);
-
+#ifndef __MACOS__ /* environment variables nothing on MacOS. */
origenviron = environ;
envtbl = rb_obj_alloc(rb_cObject);
rb_extend_object(envtbl, rb_mEnumerable);
@@ -2700,13 +2712,13 @@ Init_Hash(void)
rb_define_singleton_method(envtbl,"fetch", env_fetch, -1);
rb_define_singleton_method(envtbl,"[]=", env_aset, 2);
rb_define_singleton_method(envtbl,"store", env_aset, 2);
- rb_define_singleton_method(envtbl,"each", env_each_pair, 0);
+ rb_define_singleton_method(envtbl,"each", env_each, 0);
rb_define_singleton_method(envtbl,"each_pair", env_each_pair, 0);
rb_define_singleton_method(envtbl,"each_key", env_each_key, 0);
rb_define_singleton_method(envtbl,"each_value", env_each_value, 0);
rb_define_singleton_method(envtbl,"delete", env_delete_m, 1);
rb_define_singleton_method(envtbl,"delete_if", env_delete_if, 0);
- rb_define_singleton_method(envtbl,"clear", rb_env_clear, 0);
+ rb_define_singleton_method(envtbl,"clear", env_clear, 0);
rb_define_singleton_method(envtbl,"reject", env_reject, 0);
rb_define_singleton_method(envtbl,"reject!", env_reject_bang, 0);
rb_define_singleton_method(envtbl,"select", env_select, 0);
@@ -2718,8 +2730,9 @@ Init_Hash(void)
rb_define_singleton_method(envtbl,"rehash", env_none, 0);
rb_define_singleton_method(envtbl,"to_a", env_to_a, 0);
rb_define_singleton_method(envtbl,"to_s", env_to_s, 0);
- rb_define_singleton_method(envtbl,"key", env_key, 1);
rb_define_singleton_method(envtbl,"index", env_index, 1);
+ rb_define_singleton_method(envtbl,"indexes", env_indexes, -1);
+ rb_define_singleton_method(envtbl,"indices", env_indexes, -1);
rb_define_singleton_method(envtbl,"size", env_size, 0);
rb_define_singleton_method(envtbl,"length", env_size, 0);
rb_define_singleton_method(envtbl,"empty?", env_empty_p, 0);
@@ -2733,8 +2746,10 @@ Init_Hash(void)
rb_define_singleton_method(envtbl,"key?", env_has_key, 1);
rb_define_singleton_method(envtbl,"value?", env_has_value, 1);
rb_define_singleton_method(envtbl,"to_hash", env_to_hash, 0);
- rb_define_singleton_method(envtbl,"assoc", env_assoc, 1);
- rb_define_singleton_method(envtbl,"rassoc", env_rassoc, 1);
rb_define_global_const("ENV", envtbl);
+#else /* __MACOS__ */
+ envtbl = rb_hash_s_new(0, NULL, rb_cHash);
+ rb_define_global_const("ENV", envtbl);
+#endif /* ifndef __MACOS__ environment variables nothing on MacOS. */
}
diff --git a/ia64.s b/ia64.s
index 92415b4e97..ba5241daf2 100644
--- a/ia64.s
+++ b/ia64.s
@@ -6,15 +6,6 @@
// void rb_ia64_flushrs(void) { __builtin_ia64_flushrs(); }
// void *rb_ia64_bsp(void) { return __builtin_ia64_bsp(); }
//
-// Note that rb_ia64_flushrs and rb_ia64_bsp works in its own stack frame.
-// It's because BSP is updated by br.call/brl.call (not alloc instruction).
-// So rb_ia64_flushrs flushes stack frames including caller's one.
-// rb_ia64_bsp returns the address next to caller's register stack frame.
-//
-// See also
-// Intel Itanium Architecture Software Developer's Manual
-// Volume 2: System Architecture.
-//
.file "ia64.c"
.text
.align 16
diff --git a/id.c b/id.c
deleted file mode 100644
index 2111751a37..0000000000
--- a/id.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/**********************************************************************
-
- id.c -
-
- $Author$
- created at: Thu Jul 12 04:37:51 2007
-
- Copyright (C) 2004-2007 Koichi Sasada
-
-**********************************************************************/
-
-#include "ruby/ruby.h"
-
-#include "id.h"
-
-static void
-Init_id(void)
-{
-#undef rb_intern
-#define rb_intern(str) rb_intern_const(str)
- rb_encoding *enc = rb_usascii_encoding();
-
- REGISTER_SYMID(idNULL, "");
- REGISTER_SYMID(idIFUNC, "<IFUNC>");
- REGISTER_SYMID(idCFUNC, "<CFUNC>");
- REGISTER_SYMID(idRespond_to, "respond_to?");
-
- REGISTER_SYMID(id_core_set_method_alias, "core#set_method_alias");
- REGISTER_SYMID(id_core_set_variable_alias, "core#set_variable_alias");
- REGISTER_SYMID(id_core_undef_method, "core#undef_method");
- REGISTER_SYMID(id_core_define_method, "core#define_method");
- REGISTER_SYMID(id_core_define_singleton_method, "core#define_singleton_method");
- REGISTER_SYMID(id_core_set_postexe, "core#set_postexe");
-
- REGISTER_SYMID(idEach, "each");
- REGISTER_SYMID(idLength, "length");
- REGISTER_SYMID(idSize, "size");
- REGISTER_SYMID(idLambda, "lambda");
- REGISTER_SYMID(idIntern, "intern");
- REGISTER_SYMID(idGets, "gets");
- REGISTER_SYMID(idSucc, "succ");
- REGISTER_SYMID(idMethodMissing, "method_missing");
-#if SUPPORT_JOKE
- REGISTER_SYMID(idBitblt, "bitblt");
- REGISTER_SYMID(idAnswer, "the_answer_to_life_the_universe_and_everything");
-#endif
- REGISTER_SYMID(idSend, "send");
- REGISTER_SYMID(id__send__, "__send__");
- REGISTER_SYMID(idInitialize, "initialize");
-}
diff --git a/include/ruby.h b/include/ruby.h
deleted file mode 100644
index dd7e2b8e59..0000000000
--- a/include/ruby.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/**********************************************************************
-
- ruby.h -
-
- $Author$
- created at: Sun 10 12:06:15 Jun JST 2007
-
- Copyright (C) 2007-2008 Yukihiro Matsumoto
-
-**********************************************************************/
-
-#ifndef RUBY_H
-#define RUBY_H 1
-
-#define HAVE_RUBY_DEFINES_H 1
-#define HAVE_RUBY_ENCODING_H 1
-#define HAVE_RUBY_INTERN_H 1
-#define HAVE_RUBY_IO_H 1
-#define HAVE_RUBY_MISSING_H 1
-#define HAVE_RUBY_VM_H 1
-#define HAVE_RUBY_ONIGURUMA_H 1
-#define HAVE_RUBY_RE_H 1
-#define HAVE_RUBY_REGEX_H 1
-#define HAVE_RUBY_RUBY_H 1
-#define HAVE_RUBY_ST_H 1
-#define HAVE_RUBY_UTIL_H 1
-#define HAVE_RUBY_VM_H 1
-#ifdef _WIN32
-#define HAVE_RUBY_WIN32_H 1
-#endif
-
-#include "ruby/ruby.h"
-
-#endif /* RUBY_H */
diff --git a/include/ruby/backward/rubyio.h b/include/ruby/backward/rubyio.h
deleted file mode 100644
index d5246db546..0000000000
--- a/include/ruby/backward/rubyio.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#if defined __GNUC__
-#warning use "ruby/io.h" instead of "rubyio.h"
-#elif defined _MSC_VER || defined __BORLANDC__
-#pragma message("warning: use \"ruby/io.h\" instead of \"rubyio.h\"")
-#endif
-#include "ruby/io.h"
diff --git a/include/ruby/backward/rubysig.h b/include/ruby/backward/rubysig.h
deleted file mode 100644
index 3952f7e85e..0000000000
--- a/include/ruby/backward/rubysig.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/**********************************************************************
-
- rubysig.h -
-
- $Author$
- $Date$
- created at: Wed Aug 16 01:15:38 JST 1995
-
- Copyright (C) 1993-2008 Yukihiro Matsumoto
-
-**********************************************************************/
-
-#if defined __GNUC__
-#warning rubysig.h is obsolete
-#elif defined _MSC_VER || defined __BORLANDC__
-#pragma message("warning: rubysig.h is obsolete")
-#endif
-
-#ifndef RUBYSIG_H
-#define RUBYSIG_H
-#include "ruby/ruby.h"
-
-#if defined(__cplusplus)
-extern "C" {
-#if 0
-} /* satisfy cc-mode */
-#endif
-#endif
-
-struct rb_blocking_region_buffer;
-DEPRECATED(RUBY_EXTERN struct rb_blocking_region_buffer *rb_thread_blocking_region_begin(void));
-DEPRECATED(RUBY_EXTERN void rb_thread_blocking_region_end(struct rb_blocking_region_buffer *));
-#define TRAP_BEG do {struct rb_blocking_region_buffer *__region = rb_thread_blocking_region_begin();
-#define TRAP_END rb_thread_blocking_region_end(__region);} while (0)
-#define RUBY_CRITICAL(statements) do {statements;} while (0)
-#define DEFER_INTS (0)
-#define ENABLE_INTS (1)
-#define ALLOW_INTS do {CHECK_INTS;} while (0)
-#define CHECK_INTS rb_thread_check_ints()
-
-#if defined(__cplusplus)
-#if 0
-{ /* satisfy cc-mode */
-#endif
-} /* extern "C" { */
-#endif
-
-#endif
diff --git a/include/ruby/backward/st.h b/include/ruby/backward/st.h
deleted file mode 100644
index 514128e616..0000000000
--- a/include/ruby/backward/st.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#if defined __GNUC__
-#warning use "ruby/st.h" instead of bare "st.h"
-#elif defined _MSC_VER || defined __BORLANDC__
-#pragma message("warning: use \"ruby/st.h\" instead of bare \"st.h\"")
-#endif
-#include "ruby/st.h"
diff --git a/include/ruby/backward/util.h b/include/ruby/backward/util.h
deleted file mode 100644
index 6b47940ddc..0000000000
--- a/include/ruby/backward/util.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#if defined __GNUC__
-#warning use "ruby/util.h" instead of bare "util.h"
-#elif defined _MSC_VER || defined __BORLANDC__
-#pragma message("warning: use \"ruby/util.h\" instead of bare \"util.h\"")
-#endif
-#include "ruby/util.h"
diff --git a/include/ruby/defines.h b/include/ruby/defines.h
deleted file mode 100644
index 70b1685804..0000000000
--- a/include/ruby/defines.h
+++ /dev/null
@@ -1,305 +0,0 @@
-/************************************************
-
- defines.h -
-
- $Author$
- created at: Wed May 18 00:21:44 JST 1994
-
-************************************************/
-
-#ifndef RUBY_DEFINES_H
-#define RUBY_DEFINES_H 1
-
-#if defined(__cplusplus)
-extern "C" {
-#if 0
-} /* satisfy cc-mode */
-#endif
-#endif
-
-#define RUBY
-
-#include <stdlib.h>
-#ifdef __cplusplus
-# ifndef HAVE_PROTOTYPES
-# define HAVE_PROTOTYPES 1
-# endif
-# ifndef HAVE_STDARG_PROTOTYPES
-# define HAVE_STDARG_PROTOTYPES 1
-# endif
-#endif
-
-#undef _
-#ifdef HAVE_PROTOTYPES
-# define _(args) args
-#else
-# define _(args) ()
-#endif
-
-#undef __
-#ifdef HAVE_STDARG_PROTOTYPES
-# define __(args) args
-#else
-# define __(args) ()
-#endif
-
-#ifdef __cplusplus
-#define ANYARGS ...
-#else
-#define ANYARGS
-#endif
-
-#define xmalloc ruby_xmalloc
-#define xmalloc2 ruby_xmalloc2
-#define xcalloc ruby_xcalloc
-#define xrealloc ruby_xrealloc
-#define xrealloc2 ruby_xrealloc2
-#define xfree ruby_xfree
-
-void *xmalloc(size_t);
-void *xmalloc2(size_t,size_t);
-void *xcalloc(size_t,size_t);
-void *xrealloc(void*,size_t);
-void *xrealloc2(void*,size_t,size_t);
-void xfree(void*);
-
-#define STRINGIZE(expr) STRINGIZE0(expr)
-#ifndef STRINGIZE0
-#define STRINGIZE0(expr) #expr
-#endif
-
-#if SIZEOF_LONG_LONG > 0
-# define LONG_LONG long long
-#elif SIZEOF___INT64 > 0
-# define HAVE_LONG_LONG 1
-# define LONG_LONG __int64
-# undef SIZEOF_LONG_LONG
-# define SIZEOF_LONG_LONG SIZEOF___INT64
-#endif
-
-#if SIZEOF_INT*2 <= SIZEOF_LONG_LONG
-# define BDIGIT unsigned int
-# define SIZEOF_BDIGITS SIZEOF_INT
-# define BDIGIT_DBL unsigned LONG_LONG
-# define BDIGIT_DBL_SIGNED LONG_LONG
-#elif SIZEOF_INT*2 <= SIZEOF_LONG
-# define BDIGIT unsigned int
-# define SIZEOF_BDIGITS SIZEOF_INT
-# define BDIGIT_DBL unsigned long
-# define BDIGIT_DBL_SIGNED long
-#elif SIZEOF_SHORT*2 <= SIZEOF_LONG
-# define BDIGIT unsigned short
-# define SIZEOF_BDIGITS SIZEOF_SHORT
-# define BDIGIT_DBL unsigned long
-# define BDIGIT_DBL_SIGNED long
-#else
-# define BDIGIT unsigned short
-# define SIZEOF_BDIGITS (SIZEOF_LONG/2)
-# define BDIGIT_DBL unsigned long
-# define BDIGIT_DBL_SIGNED long
-#endif
-
-#ifdef __CYGWIN__
-#undef _WIN32
-#endif
-
-#if defined(_WIN32) || defined(__EMX__)
-#define DOSISH 1
-# define DOSISH_DRIVE_LETTER
-#endif
-
-#ifdef AC_APPLE_UNIVERSAL_BUILD
-#undef WORDS_BIGENDIAN
-#ifdef __BIG_ENDIAN__
-#define WORDS_BIGENDIAN
-#endif
-#endif
-
-#ifdef __NeXT__
-/* NextStep, OpenStep, Rhapsody */
-#ifndef S_IRUSR
-#define S_IRUSR 0000400 /* read permission, owner */
-#endif
-#ifndef S_IRGRP
-#define S_IRGRP 0000040 /* read permission, group */
-#endif
-#ifndef S_IROTH
-#define S_IROTH 0000004 /* read permission, other */
-#endif
-#ifndef S_IWUSR
-#define S_IWUSR 0000200 /* write permission, owner */
-#endif
-#ifndef S_IWGRP
-#define S_IWGRP 0000020 /* write permission, group */
-#endif
-#ifndef S_IWOTH
-#define S_IWOTH 0000002 /* write permission, other */
-#endif
-#ifndef S_IXUSR
-#define S_IXUSR 0000100 /* execute/search permission, owner */
-#endif
-#ifndef S_IXGRP
-#define S_IXGRP 0000010 /* execute/search permission, group */
-#endif
-#ifndef S_IXOTH
-#define S_IXOTH 0000001 /* execute/search permission, other */
-#endif
-#ifndef S_IRWXU
-#define S_IRWXU 0000700 /* read, write, execute permissions, owner */
-#endif
-#ifndef S_IRWXG
-#define S_IRWXG 0000070 /* read, write, execute permissions, group */
-#endif
-#ifndef S_IRWXO
-#define S_IRWXO 0000007 /* read, write, execute permissions, other */
-#endif
-#ifndef S_ISBLK
-#define S_ISBLK(mode) (((mode) & (0170000)) == (0060000))
-#endif
-#ifndef S_ISCHR
-#define S_ISCHR(mode) (((mode) & (0170000)) == (0020000))
-#endif
-#ifndef S_ISDIR
-#define S_ISDIR(mode) (((mode) & (0170000)) == (0040000))
-#endif
-#ifndef S_ISFIFO
-#define S_ISFIFO(mode) (((mode) & (0170000)) == (0010000))
-#endif
-#ifndef S_ISREG
-#define S_ISREG(mode) (((mode) & (0170000)) == (0100000))
-#endif
-#ifndef __APPLE__
-/* NextStep, OpenStep (but not Rhapsody) */
-#ifndef GETPGRP_VOID
-#define GETPGRP_VOID 1
-#endif
-#ifndef WNOHANG
-#define WNOHANG 01
-#endif
-#ifndef WUNTRACED
-#define WUNTRACED 02
-#endif
-#ifndef X_OK
-#define X_OK 1
-#endif
-#endif /* __APPLE__ */
-#endif /* NeXT */
-
-#ifdef _WIN32
-#include "ruby/win32.h"
-#endif
-
-#if defined(__BEOS__) && !defined(__HAIKU__) && !defined(BONE)
-#include <net/socket.h> /* intern.h needs fd_set definition */
-#elif defined (__SYMBIAN32__) && defined (HAVE_SYS_SELECT_H)
-# include <sys/select.h>
-#endif
-
-#ifdef __SYMBIAN32__
-# define FALSE 0
-# define TRUE 1
-#endif
-
-#ifdef RUBY_EXPORT
-#undef RUBY_EXTERN
-
-#ifndef FALSE
-# define FALSE 0
-#elif FALSE
-# error FALSE must be false
-#endif
-#ifndef TRUE
-# define TRUE 1
-#elif !TRUE
-# error TRUE must be true
-#endif
-
-#endif
-
-#ifndef RUBY_EXTERN
-#define RUBY_EXTERN extern
-#endif
-
-#ifndef EXTERN
-#define EXTERN RUBY_EXTERN /* deprecated */
-#endif
-
-#ifndef RUBY_MBCHAR_MAXSIZE
-#define RUBY_MBCHAR_MAXSIZE INT_MAX
- /* MB_CUR_MAX will not work well in C locale */
-#endif
-
-#if defined(sparc) || defined(__sparc__)
-static inline void
-flush_register_windows(void)
-{
- asm
-#ifdef __GNUC__
- volatile
-#endif
-# if defined(__sparc_v9__) || defined(__sparcv9) || defined(__arch64__)
- ("flushw")
-# else
- ("ta 0x03")
-# endif /* trap always to flush register windows if we are on a Sparc system */
- ;
-}
-# define FLUSH_REGISTER_WINDOWS flush_register_windows()
-#elif defined(__ia64)
-void *rb_ia64_bsp(void);
-void rb_ia64_flushrs(void);
-# define FLUSH_REGISTER_WINDOWS rb_ia64_flushrs()
-#else
-# define FLUSH_REGISTER_WINDOWS ((void)0)
-#endif
-
-#if defined(DOSISH)
-#define PATH_SEP ";"
-#else
-#define PATH_SEP ":"
-#endif
-#define PATH_SEP_CHAR PATH_SEP[0]
-
-#define PATH_ENV "PATH"
-
-#if defined(DOSISH) && !defined(__EMX__)
-#define ENV_IGNORECASE
-#endif
-
-#ifndef CASEFOLD_FILESYSTEM
-# if defined DOSISH
-# define CASEFOLD_FILESYSTEM 1
-# else
-# define CASEFOLD_FILESYSTEM 0
-# endif
-#endif
-
-#ifndef DLEXT_MAXLEN
-#define DLEXT_MAXLEN 4
-#endif
-
-#ifndef RUBY_PLATFORM
-#define RUBY_PLATFORM "unknown-unknown"
-#endif
-
-#ifndef RUBY_ALIAS_FUNCTION_TYPE
-#define RUBY_ALIAS_FUNCTION_TYPE(type, prot, name, args) \
- type prot {return name args;}
-#endif
-#ifndef RUBY_ALIAS_FUNCTION_VOID
-#define RUBY_ALIAS_FUNCTION_VOID(prot, name, args) \
- void prot {name args;}
-#endif
-#ifndef RUBY_ALIAS_FUNCTION
-#define RUBY_ALIAS_FUNCTION(prot, name, args) \
- RUBY_ALIAS_FUNCTION_TYPE(VALUE, prot, name, args)
-#endif
-
-#if defined(__cplusplus)
-#if 0
-{ /* satisfy cc-mode */
-#endif
-} /* extern "C" { */
-#endif
-
-#endif /* RUBY_DEFINES_H */
diff --git a/include/ruby/encoding.h b/include/ruby/encoding.h
deleted file mode 100644
index 9be412ddf2..0000000000
--- a/include/ruby/encoding.h
+++ /dev/null
@@ -1,303 +0,0 @@
-/**********************************************************************
-
- encoding.h -
-
- $Author: matz $
- created at: Thu May 24 11:49:41 JST 2007
-
- Copyright (C) 2007 Yukihiro Matsumoto
-
-**********************************************************************/
-
-#ifndef RUBY_ENCODING_H
-#define RUBY_ENCODING_H 1
-
-#include <stdarg.h>
-#include "ruby/oniguruma.h"
-
-#define ENCODING_INLINE_MAX 1023
-#define ENCODING_SHIFT (FL_USHIFT+10)
-#define ENCODING_MASK (((VALUE)ENCODING_INLINE_MAX)<<ENCODING_SHIFT)
-
-#define ENCODING_SET_INLINED(obj,i) do {\
- RBASIC(obj)->flags &= ~ENCODING_MASK;\
- RBASIC(obj)->flags |= (VALUE)(i) << ENCODING_SHIFT;\
-} while (0)
-#define ENCODING_SET(obj,i) do {\
- VALUE rb_encoding_set_obj = (obj); \
- int encoding_set_enc_index = (i); \
- if (encoding_set_enc_index < ENCODING_INLINE_MAX) \
- ENCODING_SET_INLINED(rb_encoding_set_obj, encoding_set_enc_index); \
- else \
- rb_enc_set_index(rb_encoding_set_obj, encoding_set_enc_index); \
-} while (0)
-
-#define ENCODING_GET_INLINED(obj) (int)((RBASIC(obj)->flags & ENCODING_MASK)>>ENCODING_SHIFT)
-#define ENCODING_GET(obj) \
- (ENCODING_GET_INLINED(obj) != ENCODING_INLINE_MAX ? \
- ENCODING_GET_INLINED(obj) : \
- rb_enc_get_index(obj))
-
-#define ENCODING_IS_ASCII8BIT(obj) (ENCODING_GET_INLINED(obj) == 0)
-
-#define ENCODING_MAXNAMELEN 42
-
-#define ENC_CODERANGE_MASK ((int)(FL_USER8|FL_USER9))
-#define ENC_CODERANGE_UNKNOWN 0
-#define ENC_CODERANGE_7BIT ((int)FL_USER8)
-#define ENC_CODERANGE_VALID ((int)FL_USER9)
-#define ENC_CODERANGE_BROKEN ((int)(FL_USER8|FL_USER9))
-#define ENC_CODERANGE(obj) ((int)RBASIC(obj)->flags & ENC_CODERANGE_MASK)
-#define ENC_CODERANGE_ASCIIONLY(obj) (ENC_CODERANGE(obj) == ENC_CODERANGE_7BIT)
-#define ENC_CODERANGE_SET(obj,cr) (RBASIC(obj)->flags = \
- (RBASIC(obj)->flags & ~ENC_CODERANGE_MASK) | (cr))
-#define ENC_CODERANGE_CLEAR(obj) ENC_CODERANGE_SET(obj,0)
-
-/* assumed ASCII compatibility */
-#define ENC_CODERANGE_AND(a, b) \
- (a == ENC_CODERANGE_7BIT ? b : \
- a == ENC_CODERANGE_VALID ? (b == ENC_CODERANGE_7BIT ? ENC_CODERANGE_VALID : b) : \
- ENC_CODERANGE_UNKNOWN)
-
-#define ENCODING_CODERANGE_SET(obj, encindex, cr) \
- do { \
- VALUE rb_encoding_coderange_obj = (obj); \
- ENCODING_SET(rb_encoding_coderange_obj, (encindex)); \
- ENC_CODERANGE_SET(rb_encoding_coderange_obj, (cr)); \
- } while (0)
-
-typedef OnigEncodingType rb_encoding;
-
-int rb_enc_replicate(const char *, rb_encoding *);
-int rb_define_dummy_encoding(const char *);
-#define rb_enc_to_index(enc) ((enc) ? ENC_TO_ENCINDEX(enc) : 0)
-int rb_enc_get_index(VALUE obj);
-void rb_enc_set_index(VALUE obj, int encindex);
-int rb_enc_find_index(const char *name);
-int rb_to_encoding_index(VALUE);
-rb_encoding* rb_to_encoding(VALUE);
-rb_encoding* rb_enc_get(VALUE);
-rb_encoding* rb_enc_compatible(VALUE,VALUE);
-rb_encoding* rb_enc_check(VALUE,VALUE);
-VALUE rb_enc_associate_index(VALUE, int);
-VALUE rb_enc_associate(VALUE, rb_encoding*);
-void rb_enc_copy(VALUE dst, VALUE src);
-
-VALUE rb_enc_str_new(const char*, long, rb_encoding*);
-VALUE rb_enc_reg_new(const char*, long, rb_encoding*, int);
-PRINTF_ARGS(VALUE rb_enc_sprintf(rb_encoding *, const char*, ...), 2, 3);
-VALUE rb_enc_vsprintf(rb_encoding *, const char*, va_list);
-long rb_enc_strlen(const char*, const char*, rb_encoding*);
-char* rb_enc_nth(const char*, const char*, long, rb_encoding*);
-VALUE rb_obj_encoding(VALUE);
-VALUE rb_enc_str_buf_cat(VALUE str, const char *ptr, long len, rb_encoding *enc);
-
-VALUE rb_external_str_new_with_enc(const char *ptr, long len, rb_encoding *);
-VALUE rb_str_export_to_enc(VALUE, rb_encoding *);
-VALUE rb_str_conv_enc(VALUE str, rb_encoding *from, rb_encoding *to);
-
-/* index -> rb_encoding */
-rb_encoding* rb_enc_from_index(int idx);
-
-/* name -> rb_encoding */
-rb_encoding * rb_enc_find(const char *name);
-
-/* rb_encoding * -> name */
-#define rb_enc_name(enc) (enc)->name
-
-/* rb_encoding * -> minlen/maxlen */
-#define rb_enc_mbminlen(enc) (enc)->min_enc_len
-#define rb_enc_mbmaxlen(enc) (enc)->max_enc_len
-
-/* -> mbclen (no error notification: 0 < ret <= e-p, no exception) */
-int rb_enc_mbclen(const char *p, const char *e, rb_encoding *enc);
-
-/* -> mbclen (only for valid encoding) */
-int rb_enc_fast_mbclen(const char *p, const char *e, rb_encoding *enc);
-
-/* -> chlen, invalid or needmore */
-int rb_enc_precise_mbclen(const char *p, const char *e, rb_encoding *enc);
-#define MBCLEN_CHARFOUND_P(ret) ONIGENC_MBCLEN_CHARFOUND_P(ret)
-#define MBCLEN_CHARFOUND_LEN(ret) ONIGENC_MBCLEN_CHARFOUND_LEN(ret)
-#define MBCLEN_INVALID_P(ret) ONIGENC_MBCLEN_INVALID_P(ret)
-#define MBCLEN_NEEDMORE_P(ret) ONIGENC_MBCLEN_NEEDMORE_P(ret)
-#define MBCLEN_NEEDMORE_LEN(ret) ONIGENC_MBCLEN_NEEDMORE_LEN(ret)
-
-/* -> 0x00..0x7f, -1 */
-int rb_enc_ascget(const char *p, const char *e, int *len, rb_encoding *enc);
-
-
-/* -> code (and len) or raise exception */
-unsigned int rb_enc_codepoint_len(const char *p, const char *e, int *len, rb_encoding *enc);
-
-/* prototype for obsolete function */
-unsigned int rb_enc_codepoint(const char *p, const char *e, rb_encoding *enc);
-/* overriding macro */
-#define rb_enc_codepoint(p,e,enc) rb_enc_codepoint_len((p),(e),0,(enc))
-#define rb_enc_mbc_to_codepoint(p, e, enc) ONIGENC_MBC_TO_CODE(enc,(UChar*)(p),(UChar*)(e))
-
-/* -> codelen>0 or raise exception */
-int rb_enc_codelen(int code, rb_encoding *enc);
-
-/* code,ptr,encoding -> write buf */
-#define rb_enc_mbcput(c,buf,enc) ONIGENC_CODE_TO_MBC(enc,c,(UChar*)(buf))
-
-/* start, ptr, end, encoding -> prev_char */
-#define rb_enc_prev_char(s,p,e,enc) (char *)onigenc_get_prev_char_head(enc,(UChar*)(s),(UChar*)(p),(UChar*)(e))
-/* start, ptr, end, encoding -> next_char */
-#define rb_enc_left_char_head(s,p,e,enc) (char *)onigenc_get_left_adjust_char_head(enc,(UChar*)(s),(UChar*)(p),(UChar*)(e))
-#define rb_enc_right_char_head(s,p,e,enc) (char *)onigenc_get_right_adjust_char_head(enc,(UChar*)(s),(UChar*)(p),(UChar*)(e))
-
-/* ptr, ptr, encoding -> newline_or_not */
-#define rb_enc_is_newline(p,end,enc) ONIGENC_IS_MBC_NEWLINE(enc,(UChar*)(p),(UChar*)(end))
-
-#define rb_enc_isctype(c,t,enc) ONIGENC_IS_CODE_CTYPE(enc,c,t)
-#define rb_enc_isascii(c,enc) ONIGENC_IS_CODE_ASCII(c)
-#define rb_enc_isalpha(c,enc) ONIGENC_IS_CODE_ALPHA(enc,c)
-#define rb_enc_islower(c,enc) ONIGENC_IS_CODE_LOWER(enc,c)
-#define rb_enc_isupper(c,enc) ONIGENC_IS_CODE_UPPER(enc,c)
-#define rb_enc_ispunct(c,enc) ONIGENC_IS_CODE_PUNCT(enc,c)
-#define rb_enc_isalnum(c,enc) ONIGENC_IS_CODE_ALNUM(enc,c)
-#define rb_enc_isprint(c,enc) ONIGENC_IS_CODE_PRINT(enc,c)
-#define rb_enc_isspace(c,enc) ONIGENC_IS_CODE_SPACE(enc,c)
-#define rb_enc_isdigit(c,enc) ONIGENC_IS_CODE_DIGIT(enc,c)
-
-#define rb_enc_asciicompat(enc) (rb_enc_mbminlen(enc)==1 && !rb_enc_dummy_p(enc))
-
-int rb_enc_casefold(char *to, const char *p, const char *e, rb_encoding *enc);
-int rb_enc_toupper(int c, rb_encoding *enc);
-int rb_enc_tolower(int c, rb_encoding *enc);
-ID rb_intern3(const char*, long, rb_encoding*);
-ID rb_interned_id_p(const char *, long, rb_encoding *);
-int rb_enc_symname_p(const char*, rb_encoding*);
-int rb_enc_str_coderange(VALUE);
-long rb_str_coderange_scan_restartable(const char*, const char*, rb_encoding*, int*);
-int rb_enc_str_asciionly_p(VALUE);
-#define rb_enc_str_asciicompat_p(str) rb_enc_asciicompat(rb_enc_get(str))
-VALUE rb_enc_from_encoding(rb_encoding *enc);
-rb_encoding *rb_ascii8bit_encoding(void);
-rb_encoding *rb_utf8_encoding(void);
-rb_encoding *rb_usascii_encoding(void);
-rb_encoding *rb_locale_encoding(void);
-rb_encoding *rb_filesystem_encoding(void);
-rb_encoding *rb_default_external_encoding(void);
-rb_encoding *rb_default_internal_encoding(void);
-int rb_ascii8bit_encindex(void);
-int rb_utf8_encindex(void);
-int rb_usascii_encindex(void);
-VALUE rb_enc_default_external(void);
-VALUE rb_enc_default_internal(void);
-void rb_enc_set_default_external(VALUE encoding);
-void rb_enc_set_default_internal(VALUE encoding);
-VALUE rb_locale_charmap(VALUE klass);
-long rb_memsearch(const void*,long,const void*,long,rb_encoding*);
-
-RUBY_EXTERN VALUE rb_cEncoding;
-#define ENC_DUMMY_FLAG (1<<24)
-#define ENC_INDEX_MASK (~(~0U<<24))
-
-#define ENC_TO_ENCINDEX(enc) ((enc)->ruby_encoding_index & ENC_INDEX_MASK)
-
-#define ENC_DUMMY_P(enc) ((enc)->ruby_encoding_index & ENC_DUMMY_FLAG)
-#define ENC_SET_DUMMY(enc) ((enc)->ruby_encoding_index |= ENC_DUMMY_FLAG)
-
-static inline int
-rb_enc_dummy_p(rb_encoding *enc)
-{
- return ENC_DUMMY_P(enc) != 0;
-}
-
-/* econv stuff */
-
-typedef enum {
- econv_invalid_byte_sequence,
- econv_undefined_conversion,
- econv_destination_buffer_full,
- econv_source_buffer_empty,
- econv_finished,
- econv_after_output,
- econv_incomplete_input
-} rb_econv_result_t;
-
-typedef struct rb_econv_t rb_econv_t;
-
-VALUE rb_str_encode(VALUE str, VALUE to, int ecflags, VALUE ecopts);
-int rb_econv_has_convpath_p(const char* from_encoding, const char* to_encoding);
-
-int rb_econv_prepare_opts(VALUE opthash, VALUE *ecopts);
-
-rb_econv_t *rb_econv_open(const char *source_encoding, const char *destination_encoding, int ecflags);
-rb_econv_t *rb_econv_open_opts(const char *source_encoding, const char *destination_encoding, int ecflags, VALUE ecopts);
-
-rb_econv_result_t rb_econv_convert(rb_econv_t *ec,
- const unsigned char **source_buffer_ptr, const unsigned char *source_buffer_end,
- unsigned char **destination_buffer_ptr, unsigned char *destination_buffer_end,
- int flags);
-void rb_econv_close(rb_econv_t *ec);
-
-/* result: 0:success -1:failure */
-int rb_econv_set_replacement(rb_econv_t *ec, const unsigned char *str, size_t len, const char *encname);
-
-/* result: 0:success -1:failure */
-int rb_econv_decorate_at_first(rb_econv_t *ec, const char *decorator_name);
-int rb_econv_decorate_at_last(rb_econv_t *ec, const char *decorator_name);
-
-VALUE rb_econv_open_exc(const char *senc, const char *denc, int ecflags);
-
-/* result: 0:success -1:failure */
-int rb_econv_insert_output(rb_econv_t *ec,
- const unsigned char *str, size_t len, const char *str_encoding);
-
-/* encoding that rb_econv_insert_output doesn't need conversion */
-const char *rb_econv_encoding_to_insert_output(rb_econv_t *ec);
-
-/* raise an error if the last rb_econv_convert is error */
-void rb_econv_check_error(rb_econv_t *ec);
-
-/* returns an exception object or nil */
-VALUE rb_econv_make_exception(rb_econv_t *ec);
-
-int rb_econv_putbackable(rb_econv_t *ec);
-void rb_econv_putback(rb_econv_t *ec, unsigned char *p, int n);
-
-/* returns the corresponding ASCII compatible encoding for encname,
- * or NULL if encname is not ASCII incompatible encoding. */
-const char *rb_econv_asciicompat_encoding(const char *encname);
-
-VALUE rb_econv_str_convert(rb_econv_t *ec, VALUE src, int flags);
-VALUE rb_econv_substr_convert(rb_econv_t *ec, VALUE src, long byteoff, long bytesize, int flags);
-VALUE rb_econv_str_append(rb_econv_t *ec, VALUE src, VALUE dst, int flags);
-VALUE rb_econv_substr_append(rb_econv_t *ec, VALUE src, long byteoff, long bytesize, VALUE dst, int flags);
-
-void rb_econv_binmode(rb_econv_t *ec);
-
-/* flags for rb_econv_open */
-
-#define ECONV_ERROR_HANDLER_MASK 0x000000ff
-
-#define ECONV_INVALID_MASK 0x0000000f
-#define ECONV_INVALID_REPLACE 0x00000002
-
-#define ECONV_UNDEF_MASK 0x000000f0
-#define ECONV_UNDEF_REPLACE 0x00000020
-#define ECONV_UNDEF_HEX_CHARREF 0x00000030
-
-#define ECONV_DECORATOR_MASK 0x0000ff00
-
-#define ECONV_UNIVERSAL_NEWLINE_DECORATOR 0x00000100
-#define ECONV_CRLF_NEWLINE_DECORATOR 0x00001000
-#define ECONV_CR_NEWLINE_DECORATOR 0x00002000
-#define ECONV_XML_TEXT_DECORATOR 0x00004000
-#define ECONV_XML_ATTR_CONTENT_DECORATOR 0x00008000
-
-#define ECONV_STATEFUL_DECORATOR_MASK 0x00f00000
-#define ECONV_XML_ATTR_QUOTE_DECORATOR 0x00100000
-
-/* end of flags for rb_econv_open */
-
-/* flags for rb_econv_convert */
-#define ECONV_PARTIAL_INPUT 0x00010000
-#define ECONV_AFTER_OUTPUT 0x00020000
-/* end of flags for rb_econv_convert */
-
-#endif /* RUBY_ENCODING_H */
diff --git a/include/ruby/intern.h b/include/ruby/intern.h
deleted file mode 100644
index 9ebf5d6c5e..0000000000
--- a/include/ruby/intern.h
+++ /dev/null
@@ -1,830 +0,0 @@
-/**********************************************************************
-
- intern.h -
-
- $Author$
- created at: Thu Jun 10 14:22:17 JST 1993
-
- Copyright (C) 1993-2007 Yukihiro Matsumoto
- Copyright (C) 2000 Network Applied Communication Laboratory, Inc.
- Copyright (C) 2000 Information-technology Promotion Agency, Japan
-
-**********************************************************************/
-
-#ifndef RUBY_INTERN_H
-#define RUBY_INTERN_H 1
-
-#if defined(__cplusplus)
-extern "C" {
-#if 0
-} /* satisfy cc-mode */
-#endif
-#endif
-
-#ifdef HAVE_STDARG_PROTOTYPES
-# include <stdarg.h>
-#else
-# include <varargs.h>
-#endif
-#include "ruby/st.h"
-
-/*
- * Functions and variables that are used by more than one source file of
- * the kernel.
- */
-
-#define ID_ALLOCATOR 1
-
-/* array.c */
-void rb_mem_clear(register VALUE*, register long);
-VALUE rb_assoc_new(VALUE, VALUE);
-VALUE rb_check_array_type(VALUE);
-VALUE rb_ary_new(void);
-VALUE rb_ary_new2(long);
-VALUE rb_ary_new3(long,...);
-VALUE rb_ary_new4(long, const VALUE *);
-VALUE rb_ary_tmp_new(long);
-void rb_ary_free(VALUE);
-VALUE rb_ary_freeze(VALUE);
-VALUE rb_ary_aref(int, VALUE*, VALUE);
-VALUE rb_ary_subseq(VALUE, long, long);
-void rb_ary_store(VALUE, long, VALUE);
-VALUE rb_ary_dup(VALUE);
-VALUE rb_ary_to_ary(VALUE);
-VALUE rb_ary_to_s(VALUE);
-VALUE rb_ary_push(VALUE, VALUE);
-VALUE rb_ary_pop(VALUE);
-VALUE rb_ary_shift(VALUE);
-VALUE rb_ary_unshift(VALUE, VALUE);
-VALUE rb_ary_entry(VALUE, long);
-VALUE rb_ary_each(VALUE);
-VALUE rb_ary_join(VALUE, VALUE);
-VALUE rb_ary_print_on(VALUE, VALUE);
-VALUE rb_ary_reverse(VALUE);
-VALUE rb_ary_sort(VALUE);
-VALUE rb_ary_sort_bang(VALUE);
-VALUE rb_ary_delete(VALUE, VALUE);
-VALUE rb_ary_delete_at(VALUE, long);
-VALUE rb_ary_clear(VALUE);
-VALUE rb_ary_plus(VALUE, VALUE);
-VALUE rb_ary_concat(VALUE, VALUE);
-VALUE rb_ary_assoc(VALUE, VALUE);
-VALUE rb_ary_rassoc(VALUE, VALUE);
-VALUE rb_ary_includes(VALUE, VALUE);
-VALUE rb_ary_cmp(VALUE, VALUE);
-VALUE rb_ary_replace(VALUE copy, VALUE orig);
-VALUE rb_get_values_at(VALUE, long, int, VALUE*, VALUE(*)(VALUE,long));
-/* bignum.c */
-VALUE rb_big_new(long, int);
-int rb_bigzero_p(VALUE x);
-VALUE rb_big_clone(VALUE);
-void rb_big_2comp(VALUE);
-VALUE rb_big_norm(VALUE);
-void rb_big_resize(VALUE big, long len);
-VALUE rb_uint2big(VALUE);
-VALUE rb_int2big(SIGNED_VALUE);
-VALUE rb_uint2inum(VALUE);
-VALUE rb_int2inum(SIGNED_VALUE);
-VALUE rb_cstr_to_inum(const char*, int, int);
-VALUE rb_str_to_inum(VALUE, int, int);
-VALUE rb_cstr2inum(const char*, int);
-VALUE rb_str2inum(VALUE, int);
-VALUE rb_big2str(VALUE, int);
-VALUE rb_big2str0(VALUE, int, int);
-SIGNED_VALUE rb_big2long(VALUE);
-#define rb_big2int(x) rb_big2long(x)
-VALUE rb_big2ulong(VALUE);
-#define rb_big2uint(x) rb_big2ulong(x)
-#if HAVE_LONG_LONG
-VALUE rb_ll2inum(LONG_LONG);
-VALUE rb_ull2inum(unsigned LONG_LONG);
-LONG_LONG rb_big2ll(VALUE);
-unsigned LONG_LONG rb_big2ull(VALUE);
-#endif /* HAVE_LONG_LONG */
-void rb_quad_pack(char*,VALUE);
-VALUE rb_quad_unpack(const char*,int);
-int rb_uv_to_utf8(char[6],unsigned long);
-VALUE rb_dbl2big(double);
-double rb_big2dbl(VALUE);
-VALUE rb_big_cmp(VALUE, VALUE);
-VALUE rb_big_eq(VALUE, VALUE);
-VALUE rb_big_plus(VALUE, VALUE);
-VALUE rb_big_minus(VALUE, VALUE);
-VALUE rb_big_mul(VALUE, VALUE);
-VALUE rb_big_div(VALUE, VALUE);
-VALUE rb_big_modulo(VALUE, VALUE);
-VALUE rb_big_divmod(VALUE, VALUE);
-VALUE rb_big_pow(VALUE, VALUE);
-VALUE rb_big_and(VALUE, VALUE);
-VALUE rb_big_or(VALUE, VALUE);
-VALUE rb_big_xor(VALUE, VALUE);
-VALUE rb_big_lshift(VALUE, VALUE);
-VALUE rb_big_rshift(VALUE, VALUE);
-/* rational.c */
-VALUE rb_rational_raw(VALUE, VALUE);
-#define rb_rational_raw1(x) rb_rational_raw(x, INT2FIX(1))
-#define rb_rational_raw2(x,y) rb_rational_raw(x, y)
-VALUE rb_rational_new(VALUE, VALUE);
-#define rb_rational_new1(x) rb_rational_new(x, INT2FIX(1))
-#define rb_rational_new2(x,y) rb_rational_new(x, y)
-VALUE rb_Rational(VALUE, VALUE);
-#define rb_Rational1(x) rb_Rational(x, INT2FIX(1))
-#define rb_Rational2(x,y) rb_Rational(x, y)
-/* complex.c */
-VALUE rb_complex_raw(VALUE, VALUE);
-#define rb_complex_raw1(x) rb_complex_raw(x, INT2FIX(0))
-#define rb_complex_raw2(x,y) rb_complex_raw(x, y)
-VALUE rb_complex_new(VALUE, VALUE);
-#define rb_complex_new1(x) rb_complex_new(x, INT2FIX(0))
-#define rb_complex_new2(x,y) rb_complex_new(x, y)
-VALUE rb_complex_polar(VALUE, VALUE);
-VALUE rb_Complex(VALUE, VALUE);
-#define rb_Complex1(x) rb_Complex(x, INT2FIX(0))
-#define rb_Complex2(x,y) rb_Complex(x, y)
-/* class.c */
-VALUE rb_class_boot(VALUE);
-VALUE rb_class_new(VALUE);
-VALUE rb_mod_init_copy(VALUE, VALUE);
-VALUE rb_class_init_copy(VALUE, VALUE);
-VALUE rb_singleton_class_clone(VALUE);
-void rb_singleton_class_attached(VALUE,VALUE);
-VALUE rb_make_metaclass(VALUE, VALUE);
-void rb_check_inheritable(VALUE);
-VALUE rb_class_inherited(VALUE, VALUE);
-VALUE rb_define_class_id(ID, VALUE);
-VALUE rb_define_class_id_under(VALUE, ID, VALUE);
-VALUE rb_module_new(void);
-VALUE rb_define_module_id(ID);
-VALUE rb_define_module_id_under(VALUE, ID);
-VALUE rb_mod_included_modules(VALUE);
-VALUE rb_mod_include_p(VALUE, VALUE);
-VALUE rb_mod_ancestors(VALUE);
-VALUE rb_class_instance_methods(int, VALUE*, VALUE);
-VALUE rb_class_public_instance_methods(int, VALUE*, VALUE);
-VALUE rb_class_protected_instance_methods(int, VALUE*, VALUE);
-VALUE rb_class_private_instance_methods(int, VALUE*, VALUE);
-VALUE rb_obj_singleton_methods(int, VALUE*, VALUE);
-void rb_define_method_id(VALUE, ID, VALUE (*)(ANYARGS), int);
-void rb_frozen_class_p(VALUE);
-void rb_undef(VALUE, ID);
-void rb_define_protected_method(VALUE, const char*, VALUE (*)(ANYARGS), int);
-void rb_define_private_method(VALUE, const char*, VALUE (*)(ANYARGS), int);
-void rb_define_singleton_method(VALUE, const char*, VALUE(*)(ANYARGS), int);
-VALUE rb_singleton_class(VALUE);
-/* compar.c */
-int rb_cmpint(VALUE, VALUE, VALUE);
-NORETURN(void rb_cmperr(VALUE, VALUE));
-/* cont.c */
-VALUE rb_fiber_new(VALUE (*)(ANYARGS), VALUE);
-VALUE rb_fiber_resume(VALUE fib, int argc, VALUE *args);
-VALUE rb_fiber_yield(int argc, VALUE *args);
-VALUE rb_fiber_current(void);
-VALUE rb_fiber_alive_p(VALUE);
-/* enum.c */
-/* enumerator.c */
-VALUE rb_enumeratorize(VALUE, VALUE, int, VALUE *);
-#define RETURN_ENUMERATOR(obj, argc, argv) do { \
- if (!rb_block_given_p()) \
- return rb_enumeratorize(obj, ID2SYM(rb_frame_this_func()), \
- argc, argv); \
- } while (0)
-/* error.c */
-VALUE rb_exc_new(VALUE, const char*, long);
-VALUE rb_exc_new2(VALUE, const char*);
-VALUE rb_exc_new3(VALUE, VALUE);
-PRINTF_ARGS(NORETURN(void rb_loaderror(const char*, ...)), 1, 2);
-PRINTF_ARGS(NORETURN(void rb_name_error(ID, const char*, ...)), 2, 3);
-NORETURN(void rb_invalid_str(const char*, const char*));
-PRINTF_ARGS(void rb_compile_error(const char*, int, const char*, ...), 3, 4);
-PRINTF_ARGS(void rb_compile_error_append(const char*, ...), 1, 2);
-NORETURN(void rb_load_fail(const char*));
-NORETURN(void rb_error_frozen(const char*));
-void rb_check_frozen(VALUE);
-/* eval.c */
-int rb_sourceline(void);
-const char *rb_sourcefile(void);
-
-#if defined(NFDBITS) && defined(HAVE_RB_FD_INIT)
-typedef struct {
- int maxfd;
- fd_set *fdset;
-} rb_fdset_t;
-
-void rb_fd_init(volatile rb_fdset_t *);
-void rb_fd_term(rb_fdset_t *);
-void rb_fd_zero(rb_fdset_t *);
-void rb_fd_set(int, rb_fdset_t *);
-void rb_fd_clr(int, rb_fdset_t *);
-int rb_fd_isset(int, const rb_fdset_t *);
-void rb_fd_copy(rb_fdset_t *, const fd_set *, int);
-int rb_fd_select(int, rb_fdset_t *, rb_fdset_t *, rb_fdset_t *, struct timeval *);
-
-#define rb_fd_ptr(f) ((f)->fdset)
-#define rb_fd_max(f) ((f)->maxfd)
-
-#elif defined(_WIN32)
-
-typedef struct {
- int capa;
- fd_set *fdset;
-} rb_fdset_t;
-
-void rb_fd_init(volatile rb_fdset_t *);
-void rb_fd_term(rb_fdset_t *);
-#define rb_fd_zero(f) ((f)->fdset->fd_count = 0)
-void rb_fd_set(int, rb_fdset_t *);
-#define rb_fd_clr(n, f) rb_w32_fdclr(n, (f)->fdset)
-#define rb_fd_isset(n, f) rb_w32_fdisset(n, (f)->fdset)
-#define rb_fd_select(n, rfds, wfds, efds, timeout) rb_w32_select(n, (rfds) ? ((rb_fdset_t*)rfds)->fdset : NULL, (wfds) ? ((rb_fdset_t*)wfds)->fdset : NULL, (efds) ? ((rb_fdset_t*)efds)->fdset: NULL, timeout)
-#define rb_fd_resize(n, f) (void)(f)
-
-#define rb_fd_ptr(f) ((f)->fdset)
-#define rb_fd_max(f) ((f)->fdset->fd_count)
-
-#else
-
-typedef fd_set rb_fdset_t;
-#define rb_fd_zero(f) FD_ZERO(f)
-#define rb_fd_set(n, f) FD_SET(n, f)
-#define rb_fd_clr(n, f) FD_CLR(n, f)
-#define rb_fd_isset(n, f) FD_ISSET(n, f)
-#define rb_fd_copy(d, s, n) (*(d) = *(s))
-#define rb_fd_resize(n, f) (void)(f)
-#define rb_fd_ptr(f) (f)
-#define rb_fd_init(f) FD_ZERO(f)
-#define rb_fd_term(f) (void)(f)
-#define rb_fd_max(f) FD_SETSIZE
-#define rb_fd_select(n, rfds, wfds, efds, timeout) select(n, rfds, wfds, efds, timeout)
-
-#endif
-
-NORETURN(void rb_exc_raise(VALUE));
-NORETURN(void rb_exc_fatal(VALUE));
-VALUE rb_f_exit(int,VALUE*);
-VALUE rb_f_abort(int,VALUE*);
-void rb_remove_method(VALUE, const char*);
-void rb_remove_method_id(VALUE, ID);
-#define rb_disable_super(klass, name) ((void)0)
-#define rb_enable_super(klass, name) ((void)0)
-#define HAVE_RB_DEFINE_ALLOC_FUNC 1
-typedef VALUE (*rb_alloc_func_t)(VALUE);
-void rb_define_alloc_func(VALUE, rb_alloc_func_t);
-void rb_undef_alloc_func(VALUE);
-rb_alloc_func_t rb_get_alloc_func(VALUE);
-void rb_clear_cache(void);
-void rb_clear_cache_by_class(VALUE);
-void rb_alias(VALUE, ID, ID);
-void rb_attr(VALUE,ID,int,int,int);
-int rb_method_boundp(VALUE, ID, int);
-int rb_method_basic_definition_p(VALUE, ID);
-VALUE rb_eval_cmd(VALUE, VALUE, int);
-int rb_obj_respond_to(VALUE, ID, int);
-int rb_respond_to(VALUE, ID);
-VALUE rb_f_notimplement(int argc, VALUE *argv, VALUE obj);
-void rb_interrupt(void);
-VALUE rb_apply(VALUE, ID, VALUE);
-void rb_backtrace(void);
-ID rb_frame_this_func(void);
-VALUE rb_obj_instance_eval(int, VALUE*, VALUE);
-VALUE rb_obj_instance_exec(int, VALUE*, VALUE);
-VALUE rb_mod_module_eval(int, VALUE*, VALUE);
-VALUE rb_mod_module_exec(int, VALUE*, VALUE);
-void rb_load(VALUE, int);
-void rb_load_protect(VALUE, int, int*);
-NORETURN(void rb_jump_tag(int));
-int rb_provided(const char*);
-int rb_feature_provided(const char *, const char **);
-void rb_provide(const char*);
-VALUE rb_f_require(VALUE, VALUE);
-VALUE rb_require_safe(VALUE, int);
-void rb_obj_call_init(VALUE, int, VALUE*);
-VALUE rb_class_new_instance(int, VALUE*, VALUE);
-VALUE rb_block_proc(void);
-VALUE rb_f_lambda(void);
-VALUE rb_proc_new(VALUE (*)(ANYARGS/* VALUE yieldarg[, VALUE procarg] */), VALUE);
-VALUE rb_proc_call(VALUE, VALUE);
-VALUE rb_proc_call_with_block(VALUE, int argc, VALUE *argv, VALUE);
-int rb_proc_arity(VALUE);
-VALUE rb_binding_new(void);
-VALUE rb_obj_method(VALUE, VALUE);
-VALUE rb_method_call(int, VALUE*, VALUE);
-int rb_mod_method_arity(VALUE, ID);
-int rb_obj_method_arity(VALUE, ID);
-VALUE rb_protect(VALUE (*)(VALUE), VALUE, int*);
-void rb_set_end_proc(void (*)(VALUE), VALUE);
-void rb_mark_end_proc(void);
-void rb_exec_end_proc(void);
-void Init_jump(void);
-void ruby_finalize(void);
-NORETURN(void ruby_stop(int));
-int ruby_cleanup(volatile int);
-void rb_gc_mark_threads(void);
-void rb_thread_schedule(void);
-void rb_thread_wait_fd(int);
-int rb_thread_fd_writable(int);
-void rb_thread_fd_close(int);
-int rb_thread_alone(void);
-void rb_thread_polling(void);
-void rb_thread_sleep(int);
-void rb_thread_sleep_forever(void);
-VALUE rb_thread_stop(void);
-VALUE rb_thread_wakeup(VALUE);
-VALUE rb_thread_run(VALUE);
-VALUE rb_thread_kill(VALUE);
-VALUE rb_thread_create(VALUE (*)(ANYARGS), void*);
-int rb_thread_select(int, fd_set *, fd_set *, fd_set *, struct timeval *);
-int rb_thread_fd_select(int, rb_fdset_t *, rb_fdset_t *, rb_fdset_t *, struct timeval *);
-void rb_thread_wait_for(struct timeval);
-VALUE rb_thread_current(void);
-VALUE rb_thread_main(void);
-VALUE rb_thread_local_aref(VALUE, ID);
-VALUE rb_thread_local_aset(VALUE, ID, VALUE);
-void rb_thread_atfork(void);
-void rb_thread_atfork_before_exec(void);
-VALUE rb_exec_recursive(VALUE(*)(VALUE, VALUE, int),VALUE,VALUE);
-VALUE rb_exec_recursive_paired(VALUE(*)(VALUE, VALUE, int),VALUE,VALUE,VALUE);
-/* file.c */
-VALUE rb_file_s_expand_path(int, VALUE *);
-VALUE rb_file_expand_path(VALUE, VALUE);
-VALUE rb_file_s_absolute_path(int, VALUE *);
-VALUE rb_file_absolute_path(VALUE, VALUE);
-void rb_file_const(const char*, VALUE);
-int rb_file_load_ok(const char *);
-int rb_find_file_ext_safe(VALUE*, const char* const*, int);
-VALUE rb_find_file_safe(VALUE, int);
-int rb_find_file_ext(VALUE*, const char* const*);
-VALUE rb_find_file(VALUE);
-char *rb_path_next(const char *);
-char *rb_path_skip_prefix(const char *);
-char *rb_path_last_separator(const char *);
-char *rb_path_end(const char *);
-VALUE rb_file_directory_p(VALUE,VALUE);
-/* gc.c */
-void ruby_set_stack_size(size_t);
-NORETURN(void rb_memerror(void));
-int ruby_stack_check(void);
-size_t ruby_stack_length(VALUE**);
-int rb_during_gc(void);
-void rb_gc_mark_locations(VALUE*, VALUE*);
-void rb_mark_tbl(struct st_table*);
-void rb_mark_set(struct st_table*);
-void rb_mark_hash(struct st_table*);
-void rb_gc_mark_maybe(VALUE);
-void rb_gc_mark(VALUE);
-void rb_gc_force_recycle(VALUE);
-void rb_gc(void);
-void rb_gc_copy_finalizer(VALUE,VALUE);
-void rb_gc_finalize_deferred(void);
-void rb_gc_call_finalizer_at_exit(void);
-VALUE rb_gc_enable(void);
-VALUE rb_gc_disable(void);
-VALUE rb_gc_start(void);
-#define Init_stack(addr) ruby_init_stack(addr)
-/* hash.c */
-void st_foreach_safe(struct st_table *, int (*)(ANYARGS), st_data_t);
-void rb_hash_foreach(VALUE, int (*)(ANYARGS), VALUE);
-VALUE rb_hash(VALUE);
-VALUE rb_hash_new(void);
-VALUE rb_hash_dup(VALUE);
-VALUE rb_hash_freeze(VALUE);
-VALUE rb_hash_aref(VALUE, VALUE);
-VALUE rb_hash_lookup(VALUE, VALUE);
-VALUE rb_hash_lookup2(VALUE, VALUE, VALUE);
-VALUE rb_hash_fetch(VALUE, VALUE);
-VALUE rb_hash_aset(VALUE, VALUE, VALUE);
-VALUE rb_hash_delete_if(VALUE);
-VALUE rb_hash_delete(VALUE,VALUE);
-struct st_table *rb_hash_tbl(VALUE);
-int rb_path_check(const char*);
-int rb_env_path_tainted(void);
-VALUE rb_env_clear(void);
-/* io.c */
-#define rb_defout rb_stdout
-RUBY_EXTERN VALUE rb_fs;
-RUBY_EXTERN VALUE rb_output_fs;
-RUBY_EXTERN VALUE rb_rs;
-RUBY_EXTERN VALUE rb_default_rs;
-RUBY_EXTERN VALUE rb_output_rs;
-VALUE rb_io_write(VALUE, VALUE);
-VALUE rb_io_gets(VALUE);
-VALUE rb_io_getbyte(VALUE);
-VALUE rb_io_ungetc(VALUE, VALUE);
-VALUE rb_io_ungetbyte(VALUE, VALUE);
-VALUE rb_io_close(VALUE);
-VALUE rb_io_flush(VALUE);
-VALUE rb_io_eof(VALUE);
-VALUE rb_io_binmode(VALUE);
-VALUE rb_io_ascii8bit_binmode(VALUE);
-VALUE rb_io_addstr(VALUE, VALUE);
-VALUE rb_io_printf(int, VALUE*, VALUE);
-VALUE rb_io_print(int, VALUE*, VALUE);
-VALUE rb_io_puts(int, VALUE*, VALUE);
-VALUE rb_io_fdopen(int, int, const char*);
-VALUE rb_io_get_io(VALUE);
-VALUE rb_file_open(const char*, const char*);
-VALUE rb_file_open_str(VALUE, const char*);
-VALUE rb_gets(void);
-void rb_write_error(const char*);
-void rb_write_error2(const char*, long);
-void rb_close_before_exec(int lowfd, int maxhint, VALUE noclose_fds);
-int rb_pipe(int *pipes);
-/* marshal.c */
-VALUE rb_marshal_dump(VALUE, VALUE);
-VALUE rb_marshal_load(VALUE);
-void rb_marshal_define_compat(VALUE newclass, VALUE oldclass, VALUE (*dumper)(VALUE), VALUE (*loader)(VALUE, VALUE));
-/* numeric.c */
-void rb_num_zerodiv(void);
-#define RB_NUM_COERCE_FUNCS_NEED_OPID 1
-VALUE rb_num_coerce_bin(VALUE, VALUE, ID);
-VALUE rb_num_coerce_cmp(VALUE, VALUE, ID);
-VALUE rb_num_coerce_relop(VALUE, VALUE, ID);
-VALUE rb_float_new(double);
-VALUE rb_num2fix(VALUE);
-VALUE rb_fix2str(VALUE, int);
-VALUE rb_dbl_cmp(double, double);
-/* object.c */
-int rb_eql(VALUE, VALUE);
-VALUE rb_any_to_s(VALUE);
-VALUE rb_inspect(VALUE);
-VALUE rb_obj_is_instance_of(VALUE, VALUE);
-VALUE rb_obj_is_kind_of(VALUE, VALUE);
-VALUE rb_obj_alloc(VALUE);
-VALUE rb_obj_clone(VALUE);
-VALUE rb_obj_dup(VALUE);
-VALUE rb_obj_init_copy(VALUE,VALUE);
-VALUE rb_obj_taint(VALUE);
-VALUE rb_obj_tainted(VALUE);
-VALUE rb_obj_untaint(VALUE);
-VALUE rb_obj_untrust(VALUE);
-VALUE rb_obj_untrusted(VALUE);
-VALUE rb_obj_trust(VALUE);
-VALUE rb_obj_freeze(VALUE);
-VALUE rb_obj_frozen_p(VALUE);
-VALUE rb_obj_id(VALUE);
-VALUE rb_obj_class(VALUE);
-VALUE rb_class_real(VALUE);
-VALUE rb_class_inherited_p(VALUE, VALUE);
-VALUE rb_convert_type(VALUE,int,const char*,const char*);
-VALUE rb_check_convert_type(VALUE,int,const char*,const char*);
-VALUE rb_check_to_integer(VALUE, const char *);
-VALUE rb_check_to_float(VALUE);
-VALUE rb_to_int(VALUE);
-VALUE rb_Integer(VALUE);
-VALUE rb_to_float(VALUE);
-VALUE rb_Float(VALUE);
-VALUE rb_String(VALUE);
-VALUE rb_Array(VALUE);
-double rb_cstr_to_dbl(const char*, int);
-double rb_str_to_dbl(VALUE, int);
-/* parse.y */
-RUBY_EXTERN int ruby_sourceline;
-RUBY_EXTERN char *ruby_sourcefile;
-ID rb_id_attrset(ID);
-void rb_gc_mark_parser(void);
-int rb_is_const_id(ID);
-int rb_is_instance_id(ID);
-int rb_is_class_id(ID);
-int rb_is_local_id(ID);
-int rb_is_junk_id(ID);
-int rb_symname_p(const char*);
-int rb_sym_interned_p(VALUE);
-void rb_gc_mark_symbols(void);
-VALUE rb_backref_get(void);
-void rb_backref_set(VALUE);
-VALUE rb_lastline_get(void);
-void rb_lastline_set(VALUE);
-VALUE rb_sym_all_symbols(void);
-/* process.c */
-void rb_last_status_set(int status, rb_pid_t pid);
-VALUE rb_last_status_get(void);
-struct rb_exec_arg {
- int argc;
- VALUE *argv;
- const char *prog;
- VALUE options;
- VALUE redirect_fds;
-};
-int rb_proc_exec_n(int, VALUE*, const char*);
-int rb_proc_exec(const char*);
-VALUE rb_exec_arg_init(int argc, VALUE *argv, int accept_shell, struct rb_exec_arg *e);
-int rb_exec_arg_addopt(struct rb_exec_arg *e, VALUE key, VALUE val);
-void rb_exec_arg_fixup(struct rb_exec_arg *e);
-int rb_run_exec_options(const struct rb_exec_arg *e, struct rb_exec_arg *s);
-int rb_run_exec_options_err(const struct rb_exec_arg *e, struct rb_exec_arg *s, char*, size_t);
-int rb_exec(const struct rb_exec_arg*);
-int rb_exec_err(const struct rb_exec_arg*, char*, size_t);
-rb_pid_t rb_fork(int*, int (*)(void*), void*, VALUE);
-rb_pid_t rb_fork_err(int*, int (*)(void*, char*, size_t), void*, VALUE, char*, size_t);
-VALUE rb_f_exec(int,VALUE*);
-rb_pid_t rb_waitpid(rb_pid_t pid, int *status, int flags);
-void rb_syswait(rb_pid_t pid);
-rb_pid_t rb_spawn(int, VALUE*);
-rb_pid_t rb_spawn_err(int, VALUE*, char*, size_t);
-VALUE rb_proc_times(VALUE);
-VALUE rb_detach_process(rb_pid_t pid);
-/* range.c */
-VALUE rb_range_new(VALUE, VALUE, int);
-VALUE rb_range_beg_len(VALUE, long*, long*, long, int);
-int rb_range_values(VALUE range, VALUE *begp, VALUE *endp, int *exclp);
-/* random.c */
-unsigned int rb_genrand_int32(void);
-double rb_genrand_real(void);
-void rb_reset_random_seed(void);
-VALUE rb_random_bytes(VALUE rnd, long n);
-VALUE rb_random_int(VALUE rnd, VALUE max);
-unsigned int rb_random_int32(VALUE rnd);
-double rb_random_real(VALUE rnd);
-/* re.c */
-#define rb_memcmp memcmp
-int rb_memcicmp(const void*,const void*,long);
-void rb_match_busy(VALUE);
-VALUE rb_reg_nth_defined(int, VALUE);
-VALUE rb_reg_nth_match(int, VALUE);
-int rb_reg_backref_number(VALUE match, VALUE backref);
-VALUE rb_reg_last_match(VALUE);
-VALUE rb_reg_match_pre(VALUE);
-VALUE rb_reg_match_post(VALUE);
-VALUE rb_reg_match_last(VALUE);
-#define HAVE_RB_REG_NEW_STR 1
-VALUE rb_reg_new_str(VALUE, int);
-VALUE rb_reg_new(const char *, long, int);
-VALUE rb_reg_match(VALUE, VALUE);
-VALUE rb_reg_match2(VALUE);
-int rb_reg_options(VALUE);
-void rb_set_kcode(const char*);
-const char* rb_get_kcode(void);
-/* ruby.c */
-#define rb_argv rb_get_argv()
-RUBY_EXTERN VALUE rb_argv0;
-VALUE rb_get_argv(void);
-void *rb_load_file(const char*);
-void ruby_script(const char*);
-void ruby_prog_init(void);
-void ruby_set_argv(int, char**);
-void *ruby_process_options(int, char**);
-void ruby_init_loadpath(void);
-void ruby_incpush(const char*);
-/* signal.c */
-VALUE rb_f_kill(int, VALUE*);
-void rb_gc_mark_trap_list(void);
-#ifdef POSIX_SIGNAL
-#define posix_signal ruby_posix_signal
-RETSIGTYPE (*posix_signal(int, RETSIGTYPE (*)(int)))(int);
-#endif
-void ruby_sig_finalize(void);
-void rb_trap_exit(void);
-void rb_trap_exec(void);
-const char *ruby_signal_name(int);
-void ruby_default_signal(int);
-/* sprintf.c */
-VALUE rb_f_sprintf(int, const VALUE*);
-PRINTF_ARGS(VALUE rb_sprintf(const char*, ...), 1, 2);
-VALUE rb_vsprintf(const char*, va_list);
-PRINTF_ARGS(VALUE rb_str_catf(VALUE, const char*, ...), 2, 3);
-VALUE rb_str_vcatf(VALUE, const char*, va_list);
-VALUE rb_str_format(int, const VALUE *, VALUE);
-/* string.c */
-VALUE rb_str_new(const char*, long);
-VALUE rb_str_new_cstr(const char*);
-VALUE rb_str_new2(const char*);
-VALUE rb_str_new_shared(VALUE);
-VALUE rb_str_new3(VALUE);
-VALUE rb_str_new_frozen(VALUE);
-VALUE rb_str_new4(VALUE);
-VALUE rb_str_new_with_class(VALUE, const char*, long);
-VALUE rb_str_new5(VALUE, const char*, long);
-VALUE rb_tainted_str_new_cstr(const char*);
-VALUE rb_tainted_str_new(const char*, long);
-VALUE rb_tainted_str_new2(const char*);
-VALUE rb_external_str_new(const char*, long);
-VALUE rb_external_str_new_cstr(const char*);
-VALUE rb_locale_str_new(const char*, long);
-VALUE rb_locale_str_new_cstr(const char*);
-VALUE rb_str_buf_new(long);
-VALUE rb_str_buf_new_cstr(const char*);
-VALUE rb_str_buf_new2(const char*);
-VALUE rb_str_tmp_new(long);
-VALUE rb_usascii_str_new(const char*, long);
-VALUE rb_usascii_str_new_cstr(const char*);
-VALUE rb_usascii_str_new2(const char*);
-void rb_str_free(VALUE);
-void rb_str_shared_replace(VALUE, VALUE);
-VALUE rb_str_buf_append(VALUE, VALUE);
-VALUE rb_str_buf_cat(VALUE, const char*, long);
-VALUE rb_str_buf_cat2(VALUE, const char*);
-VALUE rb_str_buf_cat_ascii(VALUE, const char*);
-VALUE rb_obj_as_string(VALUE);
-VALUE rb_check_string_type(VALUE);
-VALUE rb_str_dup(VALUE);
-VALUE rb_str_locktmp(VALUE);
-VALUE rb_str_unlocktmp(VALUE);
-VALUE rb_str_dup_frozen(VALUE);
-#define rb_str_dup_frozen rb_str_new_frozen
-VALUE rb_str_plus(VALUE, VALUE);
-VALUE rb_str_times(VALUE, VALUE);
-long rb_str_sublen(VALUE, long);
-VALUE rb_str_substr(VALUE, long, long);
-VALUE rb_str_subseq(VALUE, long, long);
-void rb_str_modify(VALUE);
-VALUE rb_str_freeze(VALUE);
-void rb_str_set_len(VALUE, long);
-VALUE rb_str_resize(VALUE, long);
-VALUE rb_str_cat(VALUE, const char*, long);
-VALUE rb_str_cat2(VALUE, const char*);
-VALUE rb_str_append(VALUE, VALUE);
-VALUE rb_str_concat(VALUE, VALUE);
-int rb_memhash(const void *ptr, long len);
-VALUE rb_hash_start(VALUE);
-VALUE rb_hash_uint32(VALUE, unsigned int);
-VALUE rb_hash_uint(VALUE, VALUE);
-VALUE rb_hash_end(VALUE);
-int rb_str_hash(VALUE);
-int rb_str_hash_cmp(VALUE,VALUE);
-int rb_str_comparable(VALUE, VALUE);
-int rb_str_cmp(VALUE, VALUE);
-VALUE rb_str_equal(VALUE str1, VALUE str2);
-VALUE rb_str_drop_bytes(VALUE, long);
-void rb_str_update(VALUE, long, long, VALUE);
-VALUE rb_str_replace(VALUE, VALUE);
-VALUE rb_str_inspect(VALUE);
-VALUE rb_str_dump(VALUE);
-VALUE rb_str_split(VALUE, const char*);
-void rb_str_associate(VALUE, VALUE);
-VALUE rb_str_associated(VALUE);
-void rb_str_setter(VALUE, ID, VALUE*);
-VALUE rb_str_intern(VALUE);
-VALUE rb_sym_to_s(VALUE);
-VALUE rb_str_length(VALUE);
-long rb_str_offset(VALUE, long);
-size_t rb_str_capacity(VALUE);
-#if defined __GNUC__
-#define rb_str_new_cstr(str) __extension__ ( \
-{ \
- (__builtin_constant_p(str)) ? \
- rb_str_new(str, (long)strlen(str)) : \
- rb_str_new_cstr(str); \
-})
-#define rb_tainted_str_new_cstr(str) __extension__ ( \
-{ \
- (__builtin_constant_p(str)) ? \
- rb_tainted_str_new(str, (long)strlen(str)) : \
- rb_tainted_str_new_cstr(str); \
-})
-#define rb_usascii_str_new_cstr(str) __extension__ ( \
-{ \
- (__builtin_constant_p(str)) ? \
- rb_usascii_str_new(str, (long)strlen(str)) : \
- rb_usascii_str_new_cstr(str); \
-})
-#define rb_external_str_new_cstr(str) __extension__ ( \
-{ \
- (__builtin_constant_p(str)) ? \
- rb_external_str_new(str, (long)strlen(str)) : \
- rb_external_str_new_cstr(str); \
-})
-#define rb_locale_str_new_cstr(str) __extension__ ( \
-{ \
- (__builtin_constant_p(str)) ? \
- rb_locale_str_new(str, (long)strlen(str)) : \
- rb_locale_str_new_cstr(str); \
-})
-#define rb_str_buf_new_cstr(str) __extension__ ( \
-{ \
- (__builtin_constant_p(str)) ? \
- rb_str_buf_cat(rb_str_buf_new((long)strlen(str)), \
- str, (long)strlen(str)) : \
- rb_str_buf_new_cstr(str); \
-})
-#define rb_str_buf_cat2(str, ptr) __extension__ ( \
-{ \
- (__builtin_constant_p(ptr)) ? \
- rb_str_buf_cat(str, ptr, (long)strlen(ptr)) : \
- rb_str_buf_cat2(str, ptr); \
-})
-#define rb_str_cat2(str, ptr) __extension__ ( \
-{ \
- (__builtin_constant_p(ptr)) ? \
- rb_str_cat(str, ptr, (long)strlen(ptr)) : \
- rb_str_cat2(str, ptr); \
-})
-#define rb_exc_new2(klass, ptr) __extension__ ( \
-{ \
- (__builtin_constant_p(ptr)) ? \
- rb_exc_new(klass, ptr, (long)strlen(ptr)) : \
- rb_exc_new2(klass, ptr); \
-})
-#endif
-#define rb_str_new2 rb_str_new_cstr
-#define rb_str_new3 rb_str_new_shared
-#define rb_str_new4 rb_str_new_frozen
-#define rb_str_new5 rb_str_new_with_class
-#define rb_tainted_str_new2 rb_tainted_str_new_cstr
-#define rb_str_buf_new2 rb_str_buf_new_cstr
-#define rb_usascii_str_new2 rb_usascii_str_new_cstr
-/* struct.c */
-VALUE rb_struct_new(VALUE, ...);
-VALUE rb_struct_define(const char*, ...);
-VALUE rb_struct_alloc(VALUE, VALUE);
-VALUE rb_struct_initialize(VALUE, VALUE);
-VALUE rb_struct_aref(VALUE, VALUE);
-VALUE rb_struct_aset(VALUE, VALUE, VALUE);
-VALUE rb_struct_getmember(VALUE, ID);
-VALUE rb_struct_iv_get(VALUE, const char*);
-VALUE rb_struct_s_members(VALUE);
-VALUE rb_struct_members(VALUE);
-VALUE rb_struct_alloc_noinit(VALUE);
-VALUE rb_struct_define_without_accessor(const char *, VALUE, rb_alloc_func_t, ...);
-/* thread.c */
-typedef void rb_unblock_function_t(void *);
-typedef VALUE rb_blocking_function_t(void *);
-void rb_thread_check_ints(void);
-int rb_thread_interrupted(VALUE thval);
-VALUE rb_thread_blocking_region(rb_blocking_function_t *func, void *data1,
- rb_unblock_function_t *ubf, void *data2);
-#define RUBY_UBF_IO ((rb_unblock_function_t *)-1)
-#define RUBY_UBF_PROCESS ((rb_unblock_function_t *)-1)
-VALUE rb_mutex_new(void);
-VALUE rb_mutex_locked_p(VALUE mutex);
-VALUE rb_mutex_try_lock(VALUE mutex);
-VALUE rb_mutex_lock(VALUE mutex);
-VALUE rb_mutex_unlock(VALUE mutex);
-VALUE rb_mutex_sleep(VALUE self, VALUE timeout);
-VALUE rb_mutex_synchronize(VALUE mutex, VALUE (*func)(VALUE arg), VALUE arg);
-VALUE rb_barrier_new(void);
-VALUE rb_barrier_wait(VALUE self);
-VALUE rb_barrier_release(VALUE self);
-VALUE rb_barrier_destroy(VALUE self);
-/* time.c */
-VALUE rb_time_new(time_t, long);
-VALUE rb_time_nano_new(time_t, long);
-VALUE rb_time_num_new(VALUE, VALUE);
-/* variable.c */
-VALUE rb_mod_name(VALUE);
-VALUE rb_class_path(VALUE);
-void rb_set_class_path(VALUE, VALUE, const char*);
-void rb_set_class_path_string(VALUE, VALUE, VALUE);
-VALUE rb_path_to_class(VALUE);
-VALUE rb_path2class(const char*);
-void rb_name_class(VALUE, ID);
-VALUE rb_class_name(VALUE);
-void rb_autoload(VALUE, ID, const char*);
-VALUE rb_autoload_load(VALUE, ID);
-VALUE rb_autoload_p(VALUE, ID);
-void rb_gc_mark_global_tbl(void);
-VALUE rb_f_trace_var(int, VALUE*);
-VALUE rb_f_untrace_var(int, VALUE*);
-VALUE rb_f_global_variables(void);
-void rb_alias_variable(ID, ID);
-struct st_table* rb_generic_ivar_table(VALUE);
-void rb_copy_generic_ivar(VALUE,VALUE);
-void rb_mark_generic_ivar(VALUE);
-void rb_mark_generic_ivar_tbl(void);
-void rb_free_generic_ivar(VALUE);
-VALUE rb_ivar_get(VALUE, ID);
-VALUE rb_ivar_set(VALUE, ID, VALUE);
-VALUE rb_ivar_defined(VALUE, ID);
-void rb_ivar_foreach(VALUE, int (*)(ANYARGS), st_data_t);
-VALUE rb_iv_set(VALUE, const char*, VALUE);
-VALUE rb_iv_get(VALUE, const char*);
-VALUE rb_attr_get(VALUE, ID);
-VALUE rb_obj_instance_variables(VALUE);
-VALUE rb_obj_remove_instance_variable(VALUE, VALUE);
-void *rb_mod_const_at(VALUE, void*);
-void *rb_mod_const_of(VALUE, void*);
-VALUE rb_const_list(void*);
-VALUE rb_mod_constants(int, VALUE *, VALUE);
-VALUE rb_mod_remove_const(VALUE, VALUE);
-int rb_const_defined(VALUE, ID);
-int rb_const_defined_at(VALUE, ID);
-int rb_const_defined_from(VALUE, ID);
-VALUE rb_const_get(VALUE, ID);
-VALUE rb_const_get_at(VALUE, ID);
-VALUE rb_const_get_from(VALUE, ID);
-void rb_const_set(VALUE, ID, VALUE);
-VALUE rb_mod_const_missing(VALUE,VALUE);
-VALUE rb_cvar_defined(VALUE, ID);
-void rb_cvar_set(VALUE, ID, VALUE);
-VALUE rb_cvar_get(VALUE, ID);
-void rb_cv_set(VALUE, const char*, VALUE);
-VALUE rb_cv_get(VALUE, const char*);
-void rb_define_class_variable(VALUE, const char*, VALUE);
-VALUE rb_mod_class_variables(VALUE);
-VALUE rb_mod_remove_cvar(VALUE, VALUE);
-/* version.c */
-void ruby_show_version(void);
-void ruby_show_copyright(void);
-
-ID rb_frame_callee(void);
-VALUE rb_str_succ(VALUE);
-VALUE rb_time_succ(VALUE);
-void rb_frame_pop(void);
-int rb_frame_method_id_and_class(ID *idp, VALUE *klassp);
-
-#if defined(__cplusplus)
-#if 0
-{ /* satisfy cc-mode */
-#endif
-} /* extern "C" { */
-#endif
-
-#endif /* RUBY_INTERN_H */
diff --git a/include/ruby/io.h b/include/ruby/io.h
deleted file mode 100644
index 45384db586..0000000000
--- a/include/ruby/io.h
+++ /dev/null
@@ -1,176 +0,0 @@
-/**********************************************************************
-
- rubyio.h -
-
- $Author$
- created at: Fri Nov 12 16:47:09 JST 1993
-
- Copyright (C) 1993-2007 Yukihiro Matsumoto
-
-**********************************************************************/
-
-#ifndef RUBY_IO_H
-#define RUBY_IO_H 1
-
-#if defined(__cplusplus)
-extern "C" {
-#if 0
-} /* satisfy cc-mode */
-#endif
-#endif
-
-#include <stdio.h>
-#include <errno.h>
-#include "ruby/encoding.h"
-
-#if defined(HAVE_STDIO_EXT_H)
-#include <stdio_ext.h>
-#endif
-
-typedef struct rb_io_t {
- int fd; /* file descriptor */
- FILE *stdio_file; /* stdio ptr for read/write if available */
- int mode; /* mode flags: FMODE_XXXs */
- rb_pid_t pid; /* child's pid (for pipes) */
- int lineno; /* number of lines read */
- VALUE pathv; /* pathname for file */
- void (*finalize)(struct rb_io_t*,int); /* finalize proc */
-
- char *wbuf; /* wbuf_off + wbuf_len <= wbuf_capa */
- int wbuf_off;
- int wbuf_len;
- int wbuf_capa;
-
- char *rbuf; /* rbuf_off + rbuf_len <= rbuf_capa */
- int rbuf_off;
- int rbuf_len;
- int rbuf_capa;
-
- VALUE tied_io_for_writing;
-
- /*
- * enc enc2 read action write action
- * NULL NULL force_encoding(default_external) write the byte sequence of str
- * e1 NULL force_encoding(e1) convert str.encoding to e1
- * e1 e2 convert from e2 to e1 convert str.encoding to e2
- */
- struct rb_io_enc_t {
- rb_encoding *enc;
- rb_encoding *enc2;
- int ecflags;
- VALUE ecopts;
- } encs;
-
- rb_econv_t *readconv;
- char *cbuf; /* cbuf_off + cbuf_len <= cbuf_capa */
- int cbuf_off;
- int cbuf_len;
- int cbuf_capa;
-
- rb_econv_t *writeconv;
- VALUE writeconv_asciicompat;
- int writeconv_pre_ecflags;
- VALUE writeconv_pre_ecopts;
- int writeconv_initialized;
-
- VALUE write_lock;
-} rb_io_t;
-
-#define HAVE_RB_IO_T 1
-
-#define FMODE_READABLE 0x00000001
-#define FMODE_WRITABLE 0x00000002
-#define FMODE_READWRITE (FMODE_READABLE|FMODE_WRITABLE)
-#define FMODE_BINMODE 0x00000004
-#define FMODE_SYNC 0x00000008
-#define FMODE_TTY 0x00000010
-#define FMODE_DUPLEX 0x00000020
-#define FMODE_APPEND 0x00000040
-#define FMODE_CREATE 0x00000080
-/* #define FMODE_NOREVLOOKUP 0x00000100 */
-#define FMODE_WSPLIT 0x00000200
-#define FMODE_WSPLIT_INITIALIZED 0x00000400
-#define FMODE_TRUNC 0x00000800
-#define FMODE_TEXTMODE 0x00001000
-#define FMODE_EOF 0x00002000
-/* #define FMODE_PREP 0x00010000 */
-#define FMODE_SETENC_BY_BOM 0x00100000
-
-#define GetOpenFile(obj,fp) rb_io_check_closed((fp) = RFILE(rb_io_taint_check(obj))->fptr)
-
-#define MakeOpenFile(obj, fp) do {\
- if (RFILE(obj)->fptr) {\
- rb_io_close(obj);\
- free(RFILE(obj)->fptr);\
- RFILE(obj)->fptr = 0;\
- }\
- fp = 0;\
- fp = RFILE(obj)->fptr = ALLOC(rb_io_t);\
- fp->fd = -1;\
- fp->stdio_file = NULL;\
- fp->mode = 0;\
- fp->pid = 0;\
- fp->lineno = 0;\
- fp->pathv = Qnil;\
- fp->finalize = 0;\
- fp->wbuf = NULL;\
- fp->wbuf_off = 0;\
- fp->wbuf_len = 0;\
- fp->wbuf_capa = 0;\
- fp->rbuf = NULL;\
- fp->rbuf_off = 0;\
- fp->rbuf_len = 0;\
- fp->rbuf_capa = 0;\
- fp->readconv = NULL;\
- fp->cbuf = NULL;\
- fp->cbuf_off = 0;\
- fp->cbuf_len = 0;\
- fp->cbuf_capa = 0;\
- fp->writeconv = NULL;\
- fp->writeconv_asciicompat = Qnil;\
- fp->writeconv_pre_ecflags = 0;\
- fp->writeconv_pre_ecopts = Qnil;\
- fp->writeconv_initialized = 0;\
- fp->tied_io_for_writing = 0;\
- fp->encs.enc = NULL;\
- fp->encs.enc2 = NULL;\
- fp->encs.ecflags = 0;\
- fp->encs.ecopts = Qnil;\
- fp->write_lock = 0;\
-} while (0)
-
-FILE *rb_io_stdio_file(rb_io_t *fptr);
-
-FILE *rb_fdopen(int, const char*);
-int rb_io_modestr_fmode(const char *modestr);
-int rb_io_modestr_oflags(const char *modestr);
-int rb_io_oflags_fmode(int oflags);
-void rb_io_check_writable(rb_io_t*);
-void rb_io_check_readable(rb_io_t*);
-int rb_io_fptr_finalize(rb_io_t*);
-void rb_io_synchronized(rb_io_t*);
-void rb_io_check_initialized(rb_io_t*);
-void rb_io_check_closed(rb_io_t*);
-int rb_io_wait_readable(int);
-int rb_io_wait_writable(int);
-void rb_io_set_nonblock(rb_io_t *fptr);
-
-/* compatibility for ruby 1.8 and older */
-#define rb_io_mode_flags(modestr) rb_io_modestr_fmode(modestr)
-#define rb_io_modenum_flags(oflags) rb_io_oflags_fmode(oflags)
-
-VALUE rb_io_taint_check(VALUE);
-NORETURN(void rb_eof_error(void));
-
-void rb_io_read_check(rb_io_t*);
-int rb_io_read_pending(rb_io_t*);
-void rb_read_check(FILE*);
-
-#if defined(__cplusplus)
-#if 0
-{ /* satisfy cc-mode */
-#endif
-} /* extern "C" { */
-#endif
-
-#endif /* RUBY_IO_H */
diff --git a/include/ruby/missing.h b/include/ruby/missing.h
deleted file mode 100644
index d553f1c738..0000000000
--- a/include/ruby/missing.h
+++ /dev/null
@@ -1,178 +0,0 @@
-/************************************************
-
- missing.h - prototype for *.c in ./missing, and
- for missing timeval struct
-
- $Author$
- created at: Sat May 11 23:46:03 JST 2002
-
-************************************************/
-
-#ifndef RUBY_MISSING_H
-#define RUBY_MISSING_H 1
-
-#if defined(__cplusplus)
-extern "C" {
-#if 0
-} /* satisfy cc-mode */
-#endif
-#endif
-
-#if defined(HAVE_SYS_TIME_H)
-# include <sys/time.h>
-#elif !defined(_WIN32)
-# define time_t long
-struct timeval {
- time_t tv_sec; /* seconds */
- long tv_usec; /* microseconds */
-};
-#endif
-#if defined(HAVE_SYS_TYPES_H)
-# include <sys/types.h>
-#endif
-
-#if !defined(HAVE_STRUCT_TIMESPEC)
-struct timespec {
- time_t tv_sec; /* seconds */
- long tv_nsec; /* nanoseconds */
-};
-#endif
-
-#ifndef RUBY_EXTERN
-#define RUBY_EXTERN extern
-#endif
-
-#ifndef HAVE_ACOSH
-RUBY_EXTERN double acosh(double);
-RUBY_EXTERN double asinh(double);
-RUBY_EXTERN double atanh(double);
-#endif
-
-#ifndef HAVE_CRYPT
-RUBY_EXTERN char *crypt(const char *, const char *);
-#endif
-
-#ifndef HAVE_DUP2
-RUBY_EXTERN int dup2(int, int);
-#endif
-
-#ifndef HAVE_EACCESS
-RUBY_EXTERN int eaccess(const char*, int);
-#endif
-
-#ifndef HAVE_FINITE
-RUBY_EXTERN int finite(double);
-#endif
-
-#ifndef HAVE_FLOCK
-RUBY_EXTERN int flock(int, int);
-#endif
-
-/*
-#ifndef HAVE_FREXP
-RUBY_EXTERN double frexp(double, int *);
-#endif
-*/
-
-#ifndef HAVE_HYPOT
-RUBY_EXTERN double hypot(double, double);
-#endif
-
-#ifndef HAVE_ERF
-RUBY_EXTERN double erf(double);
-RUBY_EXTERN double erfc(double);
-#endif
-
-#ifndef HAVE_TGAMMA
-RUBY_EXTERN double tgamma(double);
-#endif
-
-#ifndef HAVE_LGAMMA_R
-RUBY_EXTERN double lgamma_r(double, int *);
-#endif
-
-#ifndef HAVE_CBRT
-RUBY_EXTERN double cbrt(double);
-#endif
-
-#ifndef isinf
-# ifndef HAVE_ISINF
-# if defined(HAVE_FINITE) && defined(HAVE_ISNAN)
-# define isinf(x) (!finite(x) && !isnan(x))
-# else
-RUBY_EXTERN int isinf(double);
-# endif
-# endif
-#endif
-
-#ifndef HAVE_ISNAN
-RUBY_EXTERN int isnan(double);
-#endif
-
-/*
-#ifndef HAVE_MEMCMP
-RUBY_EXTERN int memcmp(const void *, const void *, size_t);
-#endif
-*/
-
-#ifndef HAVE_MEMMOVE
-RUBY_EXTERN void *memmove(void *, const void *, size_t);
-#endif
-
-/*
-#ifndef HAVE_MODF
-RUBY_EXTERN double modf(double, double *);
-#endif
-*/
-
-#ifndef HAVE_STRCHR
-RUBY_EXTERN char *strchr(const char *, int);
-RUBY_EXTERN char *strrchr(const char *, int);
-#endif
-
-#ifndef HAVE_STRERROR
-RUBY_EXTERN char *strerror(int);
-#endif
-
-#ifndef HAVE_STRSTR
-RUBY_EXTERN char *strstr(const char *, const char *);
-#endif
-
-/*
-#ifndef HAVE_STRTOL
-RUBY_EXTERN long strtol(const char *, char **, int);
-#endif
-*/
-
-#if defined HAVE_VSNPRINTF || defined HAVE_SNPRINTF
-# include <stdarg.h>
-#endif
-#ifndef HAVE_SNPRINTF
-RUBY_EXTERN int snprintf(char *, size_t n, char const *, ...);
-#endif
-#ifndef HAVE_VSNPRINTF
-# if _MSC_VER >= 1300
-# pragma warning(disable: 4273)
-# endif
-RUBY_EXTERN int vsnprintf(char *, size_t n, char const *, va_list);
-# if _MSC_VER >= 1300
-# pragma warning(default: 4273)
-# endif
-#endif
-
-#ifndef HAVE_STRLCPY
-RUBY_EXTERN size_t strlcpy(char *, const char*, size_t);
-#endif
-
-#ifndef HAVE_STRLCAT
-RUBY_EXTERN size_t strlcat(char *, const char*, size_t);
-#endif
-
-#if defined(__cplusplus)
-#if 0
-{ /* satisfy cc-mode */
-#endif
-} /* extern "C" { */
-#endif
-
-#endif /* RUBY_MISSING_H */
diff --git a/include/ruby/oniguruma.h b/include/ruby/oniguruma.h
deleted file mode 100644
index 52f0c687ef..0000000000
--- a/include/ruby/oniguruma.h
+++ /dev/null
@@ -1,793 +0,0 @@
-#ifndef ONIGURUMA_H
-#define ONIGURUMA_H
-/**********************************************************************
- oniguruma.h - Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2007 K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifdef __cplusplus
-extern "C" {
-#if 0
-} /* satisfy cc-mode */
-#endif
-#endif
-
-#define ONIGURUMA
-#define ONIGURUMA_VERSION_MAJOR 5
-#define ONIGURUMA_VERSION_MINOR 9
-#define ONIGURUMA_VERSION_TEENY 1
-
-#ifdef __cplusplus
-# ifndef HAVE_PROTOTYPES
-# define HAVE_PROTOTYPES 1
-# endif
-# ifndef HAVE_STDARG_PROTOTYPES
-# define HAVE_STDARG_PROTOTYPES 1
-# endif
-#endif
-
-/* escape Mac OS X/Xcode 2.4/gcc 4.0.1 problem */
-#if defined(__APPLE__) && defined(__GNUC__) && __GNUC__ >= 4
-# ifndef HAVE_STDARG_PROTOTYPES
-# define HAVE_STDARG_PROTOTYPES 1
-# endif
-#endif
-
-#ifdef HAVE_STDARG_H
-# ifndef HAVE_STDARG_PROTOTYPES
-# define HAVE_STDARG_PROTOTYPES 1
-# endif
-#endif
-
-#ifndef P_
-#if defined(__STDC__) || defined(_WIN32)
-# define P_(args) args
-#else
-# define P_(args) ()
-#endif
-#endif
-
-#ifndef PV_
-#ifdef HAVE_STDARG_PROTOTYPES
-# define PV_(args) args
-#else
-# define PV_(args) ()
-#endif
-#endif
-
-#ifndef ONIG_EXTERN
-#ifdef RUBY_EXTERN
-#define ONIG_EXTERN RUBY_EXTERN
-#else
-#if defined(_WIN32) && !defined(__GNUC__)
-#if defined(EXPORT) || defined(RUBY_EXPORT)
-#define ONIG_EXTERN extern __declspec(dllexport)
-#else
-#define ONIG_EXTERN extern __declspec(dllimport)
-#endif
-#endif
-#endif
-#endif
-
-#ifndef ONIG_EXTERN
-#define ONIG_EXTERN extern
-#endif
-
-/* PART: character encoding */
-
-#ifndef ONIG_ESCAPE_UCHAR_COLLISION
-#define UChar OnigUChar
-#endif
-
-typedef unsigned char OnigUChar;
-typedef unsigned int OnigCodePoint;
-typedef unsigned int OnigCtype;
-typedef size_t OnigDistance;
-
-#define ONIG_INFINITE_DISTANCE ~((OnigDistance )0)
-
-typedef unsigned int OnigCaseFoldType; /* case fold flag */
-
-ONIG_EXTERN OnigCaseFoldType OnigDefaultCaseFoldFlag;
-
-/* #define ONIGENC_CASE_FOLD_HIRAGANA_KATAKANA (1<<1) */
-/* #define ONIGENC_CASE_FOLD_KATAKANA_WIDTH (1<<2) */
-#define ONIGENC_CASE_FOLD_TURKISH_AZERI (1<<20)
-#define INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR (1<<30)
-
-#define ONIGENC_CASE_FOLD_MIN INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR
-#define ONIGENC_CASE_FOLD_DEFAULT OnigDefaultCaseFoldFlag
-
-
-#define ONIGENC_MAX_COMP_CASE_FOLD_CODE_LEN 3
-#define ONIGENC_GET_CASE_FOLD_CODES_MAX_NUM 13
-/* 13 => Unicode:0x1ffc */
-
-/* code range */
-#define ONIGENC_CODE_RANGE_NUM(range) ((int )range[0])
-#define ONIGENC_CODE_RANGE_FROM(range,i) range[((i)*2) + 1]
-#define ONIGENC_CODE_RANGE_TO(range,i) range[((i)*2) + 2]
-
-typedef struct {
- int byte_len; /* argument(original) character(s) byte length */
- int code_len; /* number of code */
- OnigCodePoint code[ONIGENC_MAX_COMP_CASE_FOLD_CODE_LEN];
-} OnigCaseFoldCodeItem;
-
-typedef struct {
- OnigCodePoint esc;
- OnigCodePoint anychar;
- OnigCodePoint anytime;
- OnigCodePoint zero_or_one_time;
- OnigCodePoint one_or_more_time;
- OnigCodePoint anychar_anytime;
-} OnigMetaCharTableType;
-
-typedef int (*OnigApplyAllCaseFoldFunc)(OnigCodePoint from, OnigCodePoint* to, int to_len, void* arg);
-
-typedef struct OnigEncodingTypeST {
- int (*precise_mbc_enc_len)(const OnigUChar* p,const OnigUChar* e, struct OnigEncodingTypeST* enc);
- const char* name;
- int max_enc_len;
- int min_enc_len;
- int (*is_mbc_newline)(const OnigUChar* p, const OnigUChar* end, struct OnigEncodingTypeST* enc);
- OnigCodePoint (*mbc_to_code)(const OnigUChar* p, const OnigUChar* end, struct OnigEncodingTypeST* enc);
- int (*code_to_mbclen)(OnigCodePoint code, struct OnigEncodingTypeST* enc);
- int (*code_to_mbc)(OnigCodePoint code, OnigUChar *buf, struct OnigEncodingTypeST* enc);
- int (*mbc_case_fold)(OnigCaseFoldType flag, const OnigUChar** pp, const OnigUChar* end, OnigUChar* to, struct OnigEncodingTypeST* enc);
- int (*apply_all_case_fold)(OnigCaseFoldType flag, OnigApplyAllCaseFoldFunc f, void* arg, struct OnigEncodingTypeST* enc);
- int (*get_case_fold_codes_by_str)(OnigCaseFoldType flag, const OnigUChar* p, const OnigUChar* end, OnigCaseFoldCodeItem acs[], struct OnigEncodingTypeST* enc);
- int (*property_name_to_ctype)(struct OnigEncodingTypeST* enc, OnigUChar* p, OnigUChar* end);
- int (*is_code_ctype)(OnigCodePoint code, OnigCtype ctype, struct OnigEncodingTypeST* enc);
- int (*get_ctype_code_range)(OnigCtype ctype, OnigCodePoint* sb_out, const OnigCodePoint* ranges[], struct OnigEncodingTypeST* enc);
- OnigUChar* (*left_adjust_char_head)(const OnigUChar* start, const OnigUChar* p, const OnigUChar* end, struct OnigEncodingTypeST* enc);
- int (*is_allowed_reverse_match)(const OnigUChar* p, const OnigUChar* end, struct OnigEncodingTypeST* enc);
- int ruby_encoding_index;
-} OnigEncodingType;
-
-typedef OnigEncodingType* OnigEncoding;
-
-ONIG_EXTERN OnigEncodingType OnigEncodingASCII;
-
-#define ONIG_ENCODING_ASCII (&OnigEncodingASCII)
-
-#define ONIG_ENCODING_UNDEF ((OnigEncoding )0)
-
-
-/* work size */
-#define ONIGENC_CODE_TO_MBC_MAXLEN 7
-#define ONIGENC_MBC_CASE_FOLD_MAXLEN 18
-/* 18: 6(max-byte) * 3(case-fold chars) */
-
-/* character types */
-#define ONIGENC_CTYPE_NEWLINE 0
-#define ONIGENC_CTYPE_ALPHA 1
-#define ONIGENC_CTYPE_BLANK 2
-#define ONIGENC_CTYPE_CNTRL 3
-#define ONIGENC_CTYPE_DIGIT 4
-#define ONIGENC_CTYPE_GRAPH 5
-#define ONIGENC_CTYPE_LOWER 6
-#define ONIGENC_CTYPE_PRINT 7
-#define ONIGENC_CTYPE_PUNCT 8
-#define ONIGENC_CTYPE_SPACE 9
-#define ONIGENC_CTYPE_UPPER 10
-#define ONIGENC_CTYPE_XDIGIT 11
-#define ONIGENC_CTYPE_WORD 12
-#define ONIGENC_CTYPE_ALNUM 13 /* alpha || digit */
-#define ONIGENC_CTYPE_ASCII 14
-#define ONIGENC_MAX_STD_CTYPE ONIGENC_CTYPE_ASCII
-#define ONIGENC_CTYPE_SPECIAL_MASK 128
-#define ONIGENC_CTYPE_S /* [\t\n\v\f\r\s] */ \
- ONIGENC_CTYPE_SPECIAL_MASK | ONIGENC_CTYPE_SPACE
-#define ONIGENC_CTYPE_D /* [0-9] */ \
- ONIGENC_CTYPE_SPECIAL_MASK | ONIGENC_CTYPE_DIGIT
-#define ONIGENC_CTYPE_W /* [0-9A-Za-z_] */ \
- ONIGENC_CTYPE_SPECIAL_MASK | ONIGENC_CTYPE_WORD
-#define ONIGENC_CTYPE_SPECIAL_P(ctype) ((ctype) & ONIGENC_CTYPE_SPECIAL_MASK)
-
-
-#define onig_enc_len(enc,p,e) ONIGENC_MBC_ENC_LEN(enc, p, e)
-
-#define ONIGENC_IS_UNDEF(enc) ((enc) == ONIG_ENCODING_UNDEF)
-#define ONIGENC_IS_SINGLEBYTE(enc) (ONIGENC_MBC_MAXLEN(enc) == 1)
-#define ONIGENC_IS_MBC_HEAD(enc,p,e) (ONIGENC_MBC_ENC_LEN(enc,p,e) != 1)
-#define ONIGENC_IS_MBC_ASCII(p) (*(p) < 128)
-#define ONIGENC_IS_CODE_ASCII(code) ((code) < 128)
-#define ONIGENC_IS_MBC_WORD(enc,s,end) \
- ONIGENC_IS_CODE_WORD(enc,ONIGENC_MBC_TO_CODE(enc,s,end))
-
-
-#define ONIGENC_NAME(enc) ((enc)->name)
-
-#define ONIGENC_MBC_CASE_FOLD(enc,flag,pp,end,buf) \
- (enc)->mbc_case_fold(flag,(const OnigUChar** )pp,end,buf,enc)
-#define ONIGENC_IS_ALLOWED_REVERSE_MATCH(enc,s,end) \
- (enc)->is_allowed_reverse_match(s,end,enc)
-#define ONIGENC_LEFT_ADJUST_CHAR_HEAD(enc,start,s,end) \
- (enc)->left_adjust_char_head(start, s, end, enc)
-#define ONIGENC_APPLY_ALL_CASE_FOLD(enc,case_fold_flag,f,arg) \
- (enc)->apply_all_case_fold(case_fold_flag,f,arg,enc)
-#define ONIGENC_GET_CASE_FOLD_CODES_BY_STR(enc,case_fold_flag,p,end,acs) \
- (enc)->get_case_fold_codes_by_str(case_fold_flag,p,end,acs,enc)
-#define ONIGENC_STEP_BACK(enc,start,s,end,n) \
- onigenc_step_back((enc),(start),(s),(end),(n))
-
-#define ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(n) (n)
-#define ONIGENC_MBCLEN_CHARFOUND_P(r) (0 < (r))
-#define ONIGENC_MBCLEN_CHARFOUND_LEN(r) (r)
-
-#define ONIGENC_CONSTRUCT_MBCLEN_INVALID() (-1)
-#define ONIGENC_MBCLEN_INVALID_P(r) ((r) == -1)
-
-#define ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(n) (-1-(n))
-#define ONIGENC_MBCLEN_NEEDMORE_P(r) ((r) < -1)
-#define ONIGENC_MBCLEN_NEEDMORE_LEN(r) (-1-(r))
-
-#define ONIGENC_PRECISE_MBC_ENC_LEN(enc,p,e) (enc)->precise_mbc_enc_len(p,e,enc)
-
-ONIG_EXTERN
-int onigenc_mbclen_approximate P_((const OnigUChar* p,const OnigUChar* e, struct OnigEncodingTypeST* enc));
-
-#define ONIGENC_MBC_ENC_LEN(enc,p,e) onigenc_mbclen_approximate(p,e,enc)
-#define ONIGENC_MBC_MAXLEN(enc) ((enc)->max_enc_len)
-#define ONIGENC_MBC_MAXLEN_DIST(enc) ONIGENC_MBC_MAXLEN(enc)
-#define ONIGENC_MBC_MINLEN(enc) ((enc)->min_enc_len)
-#define ONIGENC_IS_MBC_NEWLINE(enc,p,end) (enc)->is_mbc_newline((p),(end),enc)
-#define ONIGENC_MBC_TO_CODE(enc,p,end) (enc)->mbc_to_code((p),(end),enc)
-#define ONIGENC_CODE_TO_MBCLEN(enc,code) (enc)->code_to_mbclen(code,enc)
-#define ONIGENC_CODE_TO_MBC(enc,code,buf) (enc)->code_to_mbc(code,buf,enc)
-#define ONIGENC_PROPERTY_NAME_TO_CTYPE(enc,p,end) \
- (enc)->property_name_to_ctype(enc,p,end)
-
-#define ONIGENC_IS_CODE_CTYPE(enc,code,ctype) (enc)->is_code_ctype(code,ctype,enc)
-
-#define ONIGENC_IS_CODE_NEWLINE(enc,code) \
- ONIGENC_IS_CODE_CTYPE(enc,code,ONIGENC_CTYPE_NEWLINE)
-#define ONIGENC_IS_CODE_GRAPH(enc,code) \
- ONIGENC_IS_CODE_CTYPE(enc,code,ONIGENC_CTYPE_GRAPH)
-#define ONIGENC_IS_CODE_PRINT(enc,code) \
- ONIGENC_IS_CODE_CTYPE(enc,code,ONIGENC_CTYPE_PRINT)
-#define ONIGENC_IS_CODE_ALNUM(enc,code) \
- ONIGENC_IS_CODE_CTYPE(enc,code,ONIGENC_CTYPE_ALNUM)
-#define ONIGENC_IS_CODE_ALPHA(enc,code) \
- ONIGENC_IS_CODE_CTYPE(enc,code,ONIGENC_CTYPE_ALPHA)
-#define ONIGENC_IS_CODE_LOWER(enc,code) \
- ONIGENC_IS_CODE_CTYPE(enc,code,ONIGENC_CTYPE_LOWER)
-#define ONIGENC_IS_CODE_UPPER(enc,code) \
- ONIGENC_IS_CODE_CTYPE(enc,code,ONIGENC_CTYPE_UPPER)
-#define ONIGENC_IS_CODE_CNTRL(enc,code) \
- ONIGENC_IS_CODE_CTYPE(enc,code,ONIGENC_CTYPE_CNTRL)
-#define ONIGENC_IS_CODE_PUNCT(enc,code) \
- ONIGENC_IS_CODE_CTYPE(enc,code,ONIGENC_CTYPE_PUNCT)
-#define ONIGENC_IS_CODE_SPACE(enc,code) \
- ONIGENC_IS_CODE_CTYPE(enc,code,ONIGENC_CTYPE_SPACE)
-#define ONIGENC_IS_CODE_BLANK(enc,code) \
- ONIGENC_IS_CODE_CTYPE(enc,code,ONIGENC_CTYPE_BLANK)
-#define ONIGENC_IS_CODE_DIGIT(enc,code) \
- ONIGENC_IS_CODE_CTYPE(enc,code,ONIGENC_CTYPE_DIGIT)
-#define ONIGENC_IS_CODE_XDIGIT(enc,code) \
- ONIGENC_IS_CODE_CTYPE(enc,code,ONIGENC_CTYPE_XDIGIT)
-#define ONIGENC_IS_CODE_WORD(enc,code) \
- ONIGENC_IS_CODE_CTYPE(enc,code,ONIGENC_CTYPE_WORD)
-
-#define ONIGENC_GET_CTYPE_CODE_RANGE(enc,ctype,sbout,ranges) \
- (enc)->get_ctype_code_range(ctype,sbout,ranges,enc)
-
-ONIG_EXTERN
-OnigUChar* onigenc_step_back P_((OnigEncoding enc, const OnigUChar* start, const OnigUChar* s, const OnigUChar* end, int n));
-
-
-/* encoding API */
-ONIG_EXTERN
-int onigenc_init P_((void));
-ONIG_EXTERN
-int onigenc_set_default_encoding P_((OnigEncoding enc));
-ONIG_EXTERN
-OnigEncoding onigenc_get_default_encoding P_((void));
-ONIG_EXTERN
-void onigenc_set_default_caseconv_table P_((const OnigUChar* table));
-ONIG_EXTERN
-OnigUChar* onigenc_get_right_adjust_char_head_with_prev P_((OnigEncoding enc, const OnigUChar* start, const OnigUChar* s, const OnigUChar* end, const OnigUChar** prev));
-ONIG_EXTERN
-OnigUChar* onigenc_get_prev_char_head P_((OnigEncoding enc, const OnigUChar* start, const OnigUChar* s, const OnigUChar* end));
-ONIG_EXTERN
-OnigUChar* onigenc_get_left_adjust_char_head P_((OnigEncoding enc, const OnigUChar* start, const OnigUChar* s, const OnigUChar* end));
-ONIG_EXTERN
-OnigUChar* onigenc_get_right_adjust_char_head P_((OnigEncoding enc, const OnigUChar* start, const OnigUChar* s, const OnigUChar* end));
-ONIG_EXTERN
-int onigenc_strlen P_((OnigEncoding enc, const OnigUChar* p, const OnigUChar* end));
-ONIG_EXTERN
-int onigenc_strlen_null P_((OnigEncoding enc, const OnigUChar* p));
-ONIG_EXTERN
-int onigenc_str_bytelen_null P_((OnigEncoding enc, const OnigUChar* p));
-
-
-
-/* PART: regular expression */
-
-/* config parameters */
-#define ONIG_NREGION 10
-#define ONIG_MAX_BACKREF_NUM 1000
-#define ONIG_MAX_REPEAT_NUM 100000
-#define ONIG_MAX_MULTI_BYTE_RANGES_NUM 10000
-/* constants */
-#define ONIG_MAX_ERROR_MESSAGE_LEN 90
-
-typedef unsigned int OnigOptionType;
-
-#define ONIG_OPTION_DEFAULT ONIG_OPTION_NONE
-
-/* options */
-#define ONIG_OPTION_NONE 0U
-#define ONIG_OPTION_IGNORECASE 1U
-#define ONIG_OPTION_EXTEND (ONIG_OPTION_IGNORECASE << 1)
-#define ONIG_OPTION_MULTILINE (ONIG_OPTION_EXTEND << 1)
-#define ONIG_OPTION_SINGLELINE (ONIG_OPTION_MULTILINE << 1)
-#define ONIG_OPTION_FIND_LONGEST (ONIG_OPTION_SINGLELINE << 1)
-#define ONIG_OPTION_FIND_NOT_EMPTY (ONIG_OPTION_FIND_LONGEST << 1)
-#define ONIG_OPTION_NEGATE_SINGLELINE (ONIG_OPTION_FIND_NOT_EMPTY << 1)
-#define ONIG_OPTION_DONT_CAPTURE_GROUP (ONIG_OPTION_NEGATE_SINGLELINE << 1)
-#define ONIG_OPTION_CAPTURE_GROUP (ONIG_OPTION_DONT_CAPTURE_GROUP << 1)
-/* options (search time) */
-#define ONIG_OPTION_NOTBOL (ONIG_OPTION_CAPTURE_GROUP << 1)
-#define ONIG_OPTION_NOTEOL (ONIG_OPTION_NOTBOL << 1)
-#define ONIG_OPTION_POSIX_REGION (ONIG_OPTION_NOTEOL << 1)
-#define ONIG_OPTION_MAXBIT ONIG_OPTION_POSIX_REGION /* limit */
-
-#define ONIG_OPTION_ON(options,regopt) ((options) |= (regopt))
-#define ONIG_OPTION_OFF(options,regopt) ((options) &= ~(regopt))
-#define ONIG_IS_OPTION_ON(options,option) ((options) & (option))
-
-/* syntax */
-typedef struct {
- unsigned int op;
- unsigned int op2;
- unsigned int behavior;
- OnigOptionType options; /* default option */
- OnigMetaCharTableType meta_char_table;
-} OnigSyntaxType;
-
-ONIG_EXTERN const OnigSyntaxType OnigSyntaxASIS;
-ONIG_EXTERN const OnigSyntaxType OnigSyntaxPosixBasic;
-ONIG_EXTERN const OnigSyntaxType OnigSyntaxPosixExtended;
-ONIG_EXTERN const OnigSyntaxType OnigSyntaxEmacs;
-ONIG_EXTERN const OnigSyntaxType OnigSyntaxGrep;
-ONIG_EXTERN const OnigSyntaxType OnigSyntaxGnuRegex;
-ONIG_EXTERN const OnigSyntaxType OnigSyntaxJava;
-ONIG_EXTERN const OnigSyntaxType OnigSyntaxPerl;
-ONIG_EXTERN const OnigSyntaxType OnigSyntaxPerl_NG;
-ONIG_EXTERN const OnigSyntaxType OnigSyntaxRuby;
-
-/* predefined syntaxes (see regsyntax.c) */
-#define ONIG_SYNTAX_ASIS (&OnigSyntaxASIS)
-#define ONIG_SYNTAX_POSIX_BASIC (&OnigSyntaxPosixBasic)
-#define ONIG_SYNTAX_POSIX_EXTENDED (&OnigSyntaxPosixExtended)
-#define ONIG_SYNTAX_EMACS (&OnigSyntaxEmacs)
-#define ONIG_SYNTAX_GREP (&OnigSyntaxGrep)
-#define ONIG_SYNTAX_GNU_REGEX (&OnigSyntaxGnuRegex)
-#define ONIG_SYNTAX_JAVA (&OnigSyntaxJava)
-#define ONIG_SYNTAX_PERL (&OnigSyntaxPerl)
-#define ONIG_SYNTAX_PERL_NG (&OnigSyntaxPerl_NG)
-#define ONIG_SYNTAX_RUBY (&OnigSyntaxRuby)
-
-/* default syntax */
-ONIG_EXTERN const OnigSyntaxType* OnigDefaultSyntax;
-#define ONIG_SYNTAX_DEFAULT OnigDefaultSyntax
-
-/* syntax (operators) */
-#define ONIG_SYN_OP_VARIABLE_META_CHARACTERS (1U<<0)
-#define ONIG_SYN_OP_DOT_ANYCHAR (1U<<1) /* . */
-#define ONIG_SYN_OP_ASTERISK_ZERO_INF (1U<<2) /* * */
-#define ONIG_SYN_OP_ESC_ASTERISK_ZERO_INF (1U<<3)
-#define ONIG_SYN_OP_PLUS_ONE_INF (1U<<4) /* + */
-#define ONIG_SYN_OP_ESC_PLUS_ONE_INF (1U<<5)
-#define ONIG_SYN_OP_QMARK_ZERO_ONE (1U<<6) /* ? */
-#define ONIG_SYN_OP_ESC_QMARK_ZERO_ONE (1U<<7)
-#define ONIG_SYN_OP_BRACE_INTERVAL (1U<<8) /* {lower,upper} */
-#define ONIG_SYN_OP_ESC_BRACE_INTERVAL (1U<<9) /* \{lower,upper\} */
-#define ONIG_SYN_OP_VBAR_ALT (1U<<10) /* | */
-#define ONIG_SYN_OP_ESC_VBAR_ALT (1U<<11) /* \| */
-#define ONIG_SYN_OP_LPAREN_SUBEXP (1U<<12) /* (...) */
-#define ONIG_SYN_OP_ESC_LPAREN_SUBEXP (1U<<13) /* \(...\) */
-#define ONIG_SYN_OP_ESC_AZ_BUF_ANCHOR (1U<<14) /* \A, \Z, \z */
-#define ONIG_SYN_OP_ESC_CAPITAL_G_BEGIN_ANCHOR (1U<<15) /* \G */
-#define ONIG_SYN_OP_DECIMAL_BACKREF (1U<<16) /* \num */
-#define ONIG_SYN_OP_BRACKET_CC (1U<<17) /* [...] */
-#define ONIG_SYN_OP_ESC_W_WORD (1U<<18) /* \w, \W */
-#define ONIG_SYN_OP_ESC_LTGT_WORD_BEGIN_END (1U<<19) /* \<. \> */
-#define ONIG_SYN_OP_ESC_B_WORD_BOUND (1U<<20) /* \b, \B */
-#define ONIG_SYN_OP_ESC_S_WHITE_SPACE (1U<<21) /* \s, \S */
-#define ONIG_SYN_OP_ESC_D_DIGIT (1U<<22) /* \d, \D */
-#define ONIG_SYN_OP_LINE_ANCHOR (1U<<23) /* ^, $ */
-#define ONIG_SYN_OP_POSIX_BRACKET (1U<<24) /* [:xxxx:] */
-#define ONIG_SYN_OP_QMARK_NON_GREEDY (1U<<25) /* ??,*?,+?,{n,m}? */
-#define ONIG_SYN_OP_ESC_CONTROL_CHARS (1U<<26) /* \n,\r,\t,\a ... */
-#define ONIG_SYN_OP_ESC_C_CONTROL (1U<<27) /* \cx */
-#define ONIG_SYN_OP_ESC_OCTAL3 (1U<<28) /* \OOO */
-#define ONIG_SYN_OP_ESC_X_HEX2 (1U<<29) /* \xHH */
-#define ONIG_SYN_OP_ESC_X_BRACE_HEX8 (1U<<30) /* \x{7HHHHHHH} */
-
-#define ONIG_SYN_OP2_ESC_CAPITAL_Q_QUOTE (1U<<0) /* \Q...\E */
-#define ONIG_SYN_OP2_QMARK_GROUP_EFFECT (1U<<1) /* (?...) */
-#define ONIG_SYN_OP2_OPTION_PERL (1U<<2) /* (?imsx),(?-imsx) */
-#define ONIG_SYN_OP2_OPTION_RUBY (1U<<3) /* (?imx), (?-imx) */
-#define ONIG_SYN_OP2_PLUS_POSSESSIVE_REPEAT (1U<<4) /* ?+,*+,++ */
-#define ONIG_SYN_OP2_PLUS_POSSESSIVE_INTERVAL (1U<<5) /* {n,m}+ */
-#define ONIG_SYN_OP2_CCLASS_SET_OP (1U<<6) /* [...&&..[..]..] */
-#define ONIG_SYN_OP2_QMARK_LT_NAMED_GROUP (1U<<7) /* (?<name>...) */
-#define ONIG_SYN_OP2_ESC_K_NAMED_BACKREF (1U<<8) /* \k<name> */
-#define ONIG_SYN_OP2_ESC_G_SUBEXP_CALL (1U<<9) /* \g<name>, \g<n> */
-#define ONIG_SYN_OP2_ATMARK_CAPTURE_HISTORY (1U<<10) /* (?@..),(?@<x>..) */
-#define ONIG_SYN_OP2_ESC_CAPITAL_C_BAR_CONTROL (1U<<11) /* \C-x */
-#define ONIG_SYN_OP2_ESC_CAPITAL_M_BAR_META (1U<<12) /* \M-x */
-#define ONIG_SYN_OP2_ESC_V_VTAB (1U<<13) /* \v as VTAB */
-#define ONIG_SYN_OP2_ESC_U_HEX4 (1U<<14) /* \uHHHH */
-#define ONIG_SYN_OP2_ESC_GNU_BUF_ANCHOR (1U<<15) /* \`, \' */
-#define ONIG_SYN_OP2_ESC_P_BRACE_CHAR_PROPERTY (1U<<16) /* \p{...}, \P{...} */
-#define ONIG_SYN_OP2_ESC_P_BRACE_CIRCUMFLEX_NOT (1U<<17) /* \p{^..}, \P{^..} */
-/* #define ONIG_SYN_OP2_CHAR_PROPERTY_PREFIX_IS (1U<<18) */
-#define ONIG_SYN_OP2_ESC_H_XDIGIT (1U<<19) /* \h, \H */
-#define ONIG_SYN_OP2_INEFFECTIVE_ESCAPE (1U<<20) /* \ */
-
-/* syntax (behavior) */
-#define ONIG_SYN_CONTEXT_INDEP_ANCHORS (1U<<31) /* not implemented */
-#define ONIG_SYN_CONTEXT_INDEP_REPEAT_OPS (1U<<0) /* ?, *, +, {n,m} */
-#define ONIG_SYN_CONTEXT_INVALID_REPEAT_OPS (1U<<1) /* error or ignore */
-#define ONIG_SYN_ALLOW_UNMATCHED_CLOSE_SUBEXP (1U<<2) /* ...)... */
-#define ONIG_SYN_ALLOW_INVALID_INTERVAL (1U<<3) /* {??? */
-#define ONIG_SYN_ALLOW_INTERVAL_LOW_ABBREV (1U<<4) /* {,n} => {0,n} */
-#define ONIG_SYN_STRICT_CHECK_BACKREF (1U<<5) /* /(\1)/,/\1()/ ..*/
-#define ONIG_SYN_DIFFERENT_LEN_ALT_LOOK_BEHIND (1U<<6) /* (?<=a|bc) */
-#define ONIG_SYN_CAPTURE_ONLY_NAMED_GROUP (1U<<7) /* see doc/RE */
-#define ONIG_SYN_ALLOW_MULTIPLEX_DEFINITION_NAME (1U<<8) /* (?<x>)(?<x>) */
-#define ONIG_SYN_FIXED_INTERVAL_IS_GREEDY_ONLY (1U<<9) /* a{n}?=(?:a{n})? */
-
-/* syntax (behavior) in char class [...] */
-#define ONIG_SYN_NOT_NEWLINE_IN_NEGATIVE_CC (1U<<20) /* [^...] */
-#define ONIG_SYN_BACKSLASH_ESCAPE_IN_CC (1U<<21) /* [..\w..] etc.. */
-#define ONIG_SYN_ALLOW_EMPTY_RANGE_IN_CC (1U<<22)
-#define ONIG_SYN_ALLOW_DOUBLE_RANGE_OP_IN_CC (1U<<23) /* [0-9-a]=[0-9\-a] */
-/* syntax (behavior) warning */
-#define ONIG_SYN_WARN_CC_OP_NOT_ESCAPED (1U<<24) /* [,-,] */
-#define ONIG_SYN_WARN_REDUNDANT_NESTED_REPEAT (1U<<25) /* (?:a*)+ */
-#define ONIG_SYN_WARN_CC_DUP (1U<<26) /* [aa] */
-
-/* meta character specifiers (onig_set_meta_char()) */
-#define ONIG_META_CHAR_ESCAPE 0
-#define ONIG_META_CHAR_ANYCHAR 1
-#define ONIG_META_CHAR_ANYTIME 2
-#define ONIG_META_CHAR_ZERO_OR_ONE_TIME 3
-#define ONIG_META_CHAR_ONE_OR_MORE_TIME 4
-#define ONIG_META_CHAR_ANYCHAR_ANYTIME 5
-
-#define ONIG_INEFFECTIVE_META_CHAR 0
-
-/* error codes */
-#define ONIG_IS_PATTERN_ERROR(ecode) ((ecode) <= -100 && (ecode) > -1000)
-/* normal return */
-#define ONIG_NORMAL 0
-#define ONIG_MISMATCH -1
-#define ONIG_NO_SUPPORT_CONFIG -2
-
-/* internal error */
-#define ONIGERR_MEMORY -5
-#define ONIGERR_TYPE_BUG -6
-#define ONIGERR_PARSER_BUG -11
-#define ONIGERR_STACK_BUG -12
-#define ONIGERR_UNDEFINED_BYTECODE -13
-#define ONIGERR_UNEXPECTED_BYTECODE -14
-#define ONIGERR_MATCH_STACK_LIMIT_OVER -15
-#define ONIGERR_DEFAULT_ENCODING_IS_NOT_SETTED -21
-#define ONIGERR_SPECIFIED_ENCODING_CANT_CONVERT_TO_WIDE_CHAR -22
-/* general error */
-#define ONIGERR_INVALID_ARGUMENT -30
-/* syntax error */
-#define ONIGERR_END_PATTERN_AT_LEFT_BRACE -100
-#define ONIGERR_END_PATTERN_AT_LEFT_BRACKET -101
-#define ONIGERR_EMPTY_CHAR_CLASS -102
-#define ONIGERR_PREMATURE_END_OF_CHAR_CLASS -103
-#define ONIGERR_END_PATTERN_AT_ESCAPE -104
-#define ONIGERR_END_PATTERN_AT_META -105
-#define ONIGERR_END_PATTERN_AT_CONTROL -106
-#define ONIGERR_META_CODE_SYNTAX -108
-#define ONIGERR_CONTROL_CODE_SYNTAX -109
-#define ONIGERR_CHAR_CLASS_VALUE_AT_END_OF_RANGE -110
-#define ONIGERR_CHAR_CLASS_VALUE_AT_START_OF_RANGE -111
-#define ONIGERR_UNMATCHED_RANGE_SPECIFIER_IN_CHAR_CLASS -112
-#define ONIGERR_TARGET_OF_REPEAT_OPERATOR_NOT_SPECIFIED -113
-#define ONIGERR_TARGET_OF_REPEAT_OPERATOR_INVALID -114
-#define ONIGERR_NESTED_REPEAT_OPERATOR -115
-#define ONIGERR_UNMATCHED_CLOSE_PARENTHESIS -116
-#define ONIGERR_END_PATTERN_WITH_UNMATCHED_PARENTHESIS -117
-#define ONIGERR_END_PATTERN_IN_GROUP -118
-#define ONIGERR_UNDEFINED_GROUP_OPTION -119
-#define ONIGERR_INVALID_POSIX_BRACKET_TYPE -121
-#define ONIGERR_INVALID_LOOK_BEHIND_PATTERN -122
-#define ONIGERR_INVALID_REPEAT_RANGE_PATTERN -123
-/* values error (syntax error) */
-#define ONIGERR_TOO_BIG_NUMBER -200
-#define ONIGERR_TOO_BIG_NUMBER_FOR_REPEAT_RANGE -201
-#define ONIGERR_UPPER_SMALLER_THAN_LOWER_IN_REPEAT_RANGE -202
-#define ONIGERR_EMPTY_RANGE_IN_CHAR_CLASS -203
-#define ONIGERR_MISMATCH_CODE_LENGTH_IN_CLASS_RANGE -204
-#define ONIGERR_TOO_MANY_MULTI_BYTE_RANGES -205
-#define ONIGERR_TOO_SHORT_MULTI_BYTE_STRING -206
-#define ONIGERR_TOO_BIG_BACKREF_NUMBER -207
-#define ONIGERR_INVALID_BACKREF -208
-#define ONIGERR_NUMBERED_BACKREF_OR_CALL_NOT_ALLOWED -209
-#define ONIGERR_TOO_LONG_WIDE_CHAR_VALUE -212
-#define ONIGERR_EMPTY_GROUP_NAME -214
-#define ONIGERR_INVALID_GROUP_NAME -215
-#define ONIGERR_INVALID_CHAR_IN_GROUP_NAME -216
-#define ONIGERR_UNDEFINED_NAME_REFERENCE -217
-#define ONIGERR_UNDEFINED_GROUP_REFERENCE -218
-#define ONIGERR_MULTIPLEX_DEFINED_NAME -219
-#define ONIGERR_MULTIPLEX_DEFINITION_NAME_CALL -220
-#define ONIGERR_NEVER_ENDING_RECURSION -221
-#define ONIGERR_GROUP_NUMBER_OVER_FOR_CAPTURE_HISTORY -222
-#define ONIGERR_INVALID_CHAR_PROPERTY_NAME -223
-#define ONIGERR_INVALID_CODE_POINT_VALUE -400
-#define ONIGERR_INVALID_WIDE_CHAR_VALUE -400
-#define ONIGERR_TOO_BIG_WIDE_CHAR_VALUE -401
-#define ONIGERR_NOT_SUPPORTED_ENCODING_COMBINATION -402
-#define ONIGERR_INVALID_COMBINATION_OF_OPTIONS -403
-
-/* errors related to thread */
-#define ONIGERR_OVER_THREAD_PASS_LIMIT_COUNT -1001
-
-
-/* must be smaller than BIT_STATUS_BITS_NUM (unsigned int * 8) */
-#define ONIG_MAX_CAPTURE_HISTORY_GROUP 31
-#define ONIG_IS_CAPTURE_HISTORY_GROUP(r, i) \
- ((i) <= ONIG_MAX_CAPTURE_HISTORY_GROUP && (r)->list && (r)->list[i])
-
-typedef struct OnigCaptureTreeNodeStruct {
- int group; /* group number */
- int beg;
- int end;
- int allocated;
- int num_childs;
- struct OnigCaptureTreeNodeStruct** childs;
-} OnigCaptureTreeNode;
-
-/* match result region type */
-struct re_registers {
- int allocated;
- int num_regs;
- int* beg;
- int* end;
- /* extended */
- OnigCaptureTreeNode* history_root; /* capture history tree root */
-};
-
-/* capture tree traverse */
-#define ONIG_TRAVERSE_CALLBACK_AT_FIRST 1
-#define ONIG_TRAVERSE_CALLBACK_AT_LAST 2
-#define ONIG_TRAVERSE_CALLBACK_AT_BOTH \
- ( ONIG_TRAVERSE_CALLBACK_AT_FIRST | ONIG_TRAVERSE_CALLBACK_AT_LAST )
-
-
-#define ONIG_REGION_NOTPOS -1
-
-typedef struct re_registers OnigRegion;
-
-typedef struct {
- OnigEncoding enc;
- OnigUChar* par;
- OnigUChar* par_end;
-} OnigErrorInfo;
-
-typedef struct {
- int lower;
- int upper;
-} OnigRepeatRange;
-
-typedef void (*OnigWarnFunc) P_((const char* s));
-extern void onig_null_warn P_((const char* s));
-#define ONIG_NULL_WARN onig_null_warn
-
-#define ONIG_CHAR_TABLE_SIZE 256
-
-/* regex_t state */
-#define ONIG_STATE_NORMAL 0
-#define ONIG_STATE_SEARCHING 1
-#define ONIG_STATE_COMPILING -1
-#define ONIG_STATE_MODIFY -2
-
-#define ONIG_STATE(reg) \
- ((reg)->state > 0 ? ONIG_STATE_SEARCHING : (reg)->state)
-
-typedef struct re_pattern_buffer {
- /* common members of BBuf(bytes-buffer) */
- unsigned char* p; /* compiled pattern */
- unsigned int used; /* used space for p */
- unsigned int alloc; /* allocated space for p */
-
- int state; /* normal, searching, compiling */
- int num_mem; /* used memory(...) num counted from 1 */
- int num_repeat; /* OP_REPEAT/OP_REPEAT_NG id-counter */
- int num_null_check; /* OP_NULL_CHECK_START/END id counter */
- int num_comb_exp_check; /* combination explosion check */
- int num_call; /* number of subexp call */
- unsigned int capture_history; /* (?@...) flag (1-31) */
- unsigned int bt_mem_start; /* need backtrack flag */
- unsigned int bt_mem_end; /* need backtrack flag */
- int stack_pop_level;
- int repeat_range_alloc;
- OnigRepeatRange* repeat_range;
-
- OnigEncoding enc;
- OnigOptionType options;
- const OnigSyntaxType* syntax;
- OnigCaseFoldType case_fold_flag;
- void* name_table;
-
- /* optimization info (string search, char-map and anchors) */
- int optimize; /* optimize flag */
- int threshold_len; /* search str-length for apply optimize */
- int anchor; /* BEGIN_BUF, BEGIN_POS, (SEMI_)END_BUF */
- OnigDistance anchor_dmin; /* (SEMI_)END_BUF anchor distance */
- OnigDistance anchor_dmax; /* (SEMI_)END_BUF anchor distance */
- int sub_anchor; /* start-anchor for exact or map */
- unsigned char *exact;
- unsigned char *exact_end;
- unsigned char map[ONIG_CHAR_TABLE_SIZE]; /* used as BM skip or char-map */
- int *int_map; /* BM skip for exact_len > 255 */
- int *int_map_backward; /* BM skip for backward search */
- OnigDistance dmin; /* min-distance of exact or map */
- OnigDistance dmax; /* max-distance of exact or map */
-
- /* regex_t link chain */
- struct re_pattern_buffer* chain; /* escape compile-conflict */
-} OnigRegexType;
-
-typedef OnigRegexType* OnigRegex;
-
-#ifndef ONIG_ESCAPE_REGEX_T_COLLISION
- typedef OnigRegexType regex_t;
-#endif
-
-
-typedef struct {
- int num_of_elements;
- OnigEncoding pattern_enc;
- OnigEncoding target_enc;
- OnigSyntaxType* syntax;
- OnigOptionType option;
- OnigCaseFoldType case_fold_flag;
-} OnigCompileInfo;
-
-/* Oniguruma Native API */
-ONIG_EXTERN
-int onig_init P_((void));
-ONIG_EXTERN
-int onig_error_code_to_str PV_((OnigUChar* s, int err_code, ...));
-ONIG_EXTERN
-void onig_set_warn_func P_((OnigWarnFunc f));
-ONIG_EXTERN
-void onig_set_verb_warn_func P_((OnigWarnFunc f));
-ONIG_EXTERN
-int onig_new P_((OnigRegex*, const OnigUChar* pattern, const OnigUChar* pattern_end, OnigOptionType option, OnigEncoding enc, const OnigSyntaxType* syntax, OnigErrorInfo* einfo));
-ONIG_EXTERN
-int onig_new_deluxe P_((OnigRegex* reg, const OnigUChar* pattern, const OnigUChar* pattern_end, OnigCompileInfo* ci, OnigErrorInfo* einfo));
-ONIG_EXTERN
-void onig_free P_((OnigRegex));
-ONIG_EXTERN
-int onig_recompile P_((OnigRegex, const OnigUChar* pattern, const OnigUChar* pattern_end, OnigOptionType option, OnigEncoding enc, OnigSyntaxType* syntax, OnigErrorInfo* einfo));
-ONIG_EXTERN
-int onig_recompile_deluxe P_((OnigRegex reg, const OnigUChar* pattern, const OnigUChar* pattern_end, OnigCompileInfo* ci, OnigErrorInfo* einfo));
-ONIG_EXTERN
-long onig_search P_((OnigRegex, const OnigUChar* str, const OnigUChar* end, const OnigUChar* start, const OnigUChar* range, OnigRegion* region, OnigOptionType option));
-ONIG_EXTERN
-long onig_match P_((OnigRegex, const OnigUChar* str, const OnigUChar* end, const OnigUChar* at, OnigRegion* region, OnigOptionType option));
-ONIG_EXTERN
-OnigRegion* onig_region_new P_((void));
-ONIG_EXTERN
-void onig_region_init P_((OnigRegion* region));
-ONIG_EXTERN
-void onig_region_free P_((OnigRegion* region, int free_self));
-ONIG_EXTERN
-void onig_region_copy P_((OnigRegion* to, OnigRegion* from));
-ONIG_EXTERN
-void onig_region_clear P_((OnigRegion* region));
-ONIG_EXTERN
-int onig_region_resize P_((OnigRegion* region, int n));
-ONIG_EXTERN
-int onig_region_set P_((OnigRegion* region, int at, int beg, int end));
-ONIG_EXTERN
-int onig_name_to_group_numbers P_((OnigRegex reg, const OnigUChar* name, const OnigUChar* name_end, int** nums));
-ONIG_EXTERN
-int onig_name_to_backref_number P_((OnigRegex reg, const OnigUChar* name, const OnigUChar* name_end, OnigRegion *region));
-ONIG_EXTERN
-int onig_foreach_name P_((OnigRegex reg, int (*func)(const OnigUChar*, const OnigUChar*,int,int*,OnigRegex,void*), void* arg));
-ONIG_EXTERN
-int onig_number_of_names P_((OnigRegex reg));
-ONIG_EXTERN
-int onig_number_of_captures P_((OnigRegex reg));
-ONIG_EXTERN
-int onig_number_of_capture_histories P_((OnigRegex reg));
-ONIG_EXTERN
-OnigCaptureTreeNode* onig_get_capture_tree P_((OnigRegion* region));
-ONIG_EXTERN
-int onig_capture_tree_traverse P_((OnigRegion* region, int at, int(*callback_func)(int,int,int,int,int,void*), void* arg));
-ONIG_EXTERN
-int onig_noname_group_capture_is_active P_((OnigRegex reg));
-ONIG_EXTERN
-OnigEncoding onig_get_encoding P_((OnigRegex reg));
-ONIG_EXTERN
-OnigOptionType onig_get_options P_((OnigRegex reg));
-ONIG_EXTERN
-OnigCaseFoldType onig_get_case_fold_flag P_((OnigRegex reg));
-ONIG_EXTERN
-const OnigSyntaxType* onig_get_syntax P_((OnigRegex reg));
-ONIG_EXTERN
-int onig_set_default_syntax P_((const OnigSyntaxType* syntax));
-ONIG_EXTERN
-void onig_copy_syntax P_((OnigSyntaxType* to, const OnigSyntaxType* from));
-ONIG_EXTERN
-unsigned int onig_get_syntax_op P_((OnigSyntaxType* syntax));
-ONIG_EXTERN
-unsigned int onig_get_syntax_op2 P_((OnigSyntaxType* syntax));
-ONIG_EXTERN
-unsigned int onig_get_syntax_behavior P_((OnigSyntaxType* syntax));
-ONIG_EXTERN
-OnigOptionType onig_get_syntax_options P_((OnigSyntaxType* syntax));
-ONIG_EXTERN
-void onig_set_syntax_op P_((OnigSyntaxType* syntax, unsigned int op));
-ONIG_EXTERN
-void onig_set_syntax_op2 P_((OnigSyntaxType* syntax, unsigned int op2));
-ONIG_EXTERN
-void onig_set_syntax_behavior P_((OnigSyntaxType* syntax, unsigned int behavior));
-ONIG_EXTERN
-void onig_set_syntax_options P_((OnigSyntaxType* syntax, OnigOptionType options));
-ONIG_EXTERN
-int onig_set_meta_char P_((OnigSyntaxType* syntax, unsigned int what, OnigCodePoint code));
-ONIG_EXTERN
-void onig_copy_encoding P_((OnigEncoding to, OnigEncoding from));
-ONIG_EXTERN
-OnigCaseFoldType onig_get_default_case_fold_flag P_((void));
-ONIG_EXTERN
-int onig_set_default_case_fold_flag P_((OnigCaseFoldType case_fold_flag));
-ONIG_EXTERN
-unsigned int onig_get_match_stack_limit_size P_((void));
-ONIG_EXTERN
-int onig_set_match_stack_limit_size P_((unsigned int size));
-ONIG_EXTERN
-int onig_end P_((void));
-ONIG_EXTERN
-const char* onig_version P_((void));
-ONIG_EXTERN
-const char* onig_copyright P_((void));
-
-#ifdef __cplusplus
-#if 0
-{ /* satisfy cc-mode */
-#endif
-}
-#endif
-
-#endif /* ONIGURUMA_H */
diff --git a/include/ruby/re.h b/include/ruby/re.h
deleted file mode 100644
index c60ab96016..0000000000
--- a/include/ruby/re.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/**********************************************************************
-
- re.h -
-
- $Author$
- created at: Thu Sep 30 14:18:32 JST 1993
-
- Copyright (C) 1993-2007 Yukihiro Matsumoto
-
-**********************************************************************/
-
-#ifndef RUBY_RE_H
-#define RUBY_RE_H 1
-
-#if defined(__cplusplus)
-extern "C" {
-#if 0
-} /* satisfy cc-mode */
-#endif
-#endif
-
-#include <sys/types.h>
-#include <stdio.h>
-
-#include "ruby/regex.h"
-
-typedef struct re_pattern_buffer Regexp;
-
-struct rmatch_offset {
- long beg;
- long end;
-};
-
-struct rmatch {
- struct re_registers regs;
-
- int char_offset_updated;
- int char_offset_num_allocated;
- struct rmatch_offset *char_offset;
-};
-
-struct RMatch {
- struct RBasic basic;
- VALUE str;
- struct rmatch *rmatch;
- VALUE regexp; /* RRegexp */
-};
-
-#define RMATCH(obj) (R_CAST(RMatch)(obj))
-#define RMATCH_REGS(obj) (&(R_CAST(RMatch)(obj))->rmatch->regs)
-
-VALUE rb_reg_regcomp(VALUE);
-long rb_reg_search(VALUE, VALUE, long, int);
-VALUE rb_reg_regsub(VALUE, VALUE, struct re_registers *, VALUE);
-long rb_reg_adjust_startpos(VALUE, VALUE, long, int);
-void rb_match_busy(VALUE);
-VALUE rb_reg_quote(VALUE);
-
-#if defined(__cplusplus)
-#if 0
-{ /* satisfy cc-mode */
-#endif
-} /* extern "C" { */
-#endif
-
-#endif /* RUBY_RE_H */
diff --git a/include/ruby/regex.h b/include/ruby/regex.h
deleted file mode 100644
index a63e2f6a4c..0000000000
--- a/include/ruby/regex.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/**********************************************************************
-
- regex.h -
-
- $Author$
-
- Copyright (C) 1993-2007 Yukihiro Matsumoto
-
-**********************************************************************/
-
-#ifndef ONIGURUMA_REGEX_H
-#define ONIGURUMA_REGEX_H 1
-
-#if defined(__cplusplus)
-extern "C" {
-#if 0
-} /* satisfy cc-mode */
-#endif
-#endif
-
-#ifdef RUBY
-#include "ruby/oniguruma.h"
-#else
-#include "oniguruma.h"
-#endif
-
-#ifndef ONIG_RUBY_M17N
-
-ONIG_EXTERN OnigEncoding OnigEncDefaultCharEncoding;
-
-#define mbclen(p,e,enc) rb_enc_mbclen((p),(e),(enc))
-
-#endif /* ifndef ONIG_RUBY_M17N */
-
-#if defined(__cplusplus)
-#if 0
-{ /* satisfy cc-mode */
-#endif
-} /* extern "C" { */
-#endif
-
-#endif /* ONIGURUMA_REGEX_H */
diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h
deleted file mode 100644
index 0df679791a..0000000000
--- a/include/ruby/ruby.h
+++ /dev/null
@@ -1,1320 +0,0 @@
-/**********************************************************************
-
- ruby/ruby.h -
-
- $Author$
- created at: Thu Jun 10 14:26:32 JST 1993
-
- Copyright (C) 1993-2008 Yukihiro Matsumoto
- Copyright (C) 2000 Network Applied Communication Laboratory, Inc.
- Copyright (C) 2000 Information-technology Promotion Agency, Japan
-
-**********************************************************************/
-
-#ifndef RUBY_RUBY_H
-#define RUBY_RUBY_H 1
-
-#if defined(__cplusplus)
-extern "C" {
-#if 0
-} /* satisfy cc-mode */
-#endif
-#endif
-
-#ifndef RUBY_LIB
-#include "ruby/config.h"
-#ifdef RUBY_EXTCONF_H
-#include RUBY_EXTCONF_H
-#endif
-#endif
-
-#define NORETURN_STYLE_NEW 1
-#ifndef NORETURN
-# define NORETURN(x) x
-#endif
-#ifndef DEPRECATED
-# define DEPRECATED(x) x
-#endif
-#ifndef NOINLINE
-# define NOINLINE(x) x
-#endif
-
-#ifdef __GNUC__
-#define PRINTF_ARGS(decl, string_index, first_to_check) \
- decl __attribute__((format(printf, string_index, first_to_check)))
-#else
-#define PRINTF_ARGS(decl, string_index, first_to_check) decl
-#endif
-
-#ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
-
-#ifdef HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-#endif
-
-#ifdef HAVE_INTRINSICS_H
-# include <intrinsics.h>
-#endif
-
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-
-#include <stddef.h>
-#include <stdio.h>
-
-#include "defines.h"
-
-#if defined(HAVE_ALLOCA_H)
-#include <alloca.h>
-#else
-# ifdef _AIX
-#pragma alloca
-# endif
-#endif
-
-#if defined HAVE_UINTPTR_T && 0
-typedef uintptr_t VALUE;
-typedef uintptr_t ID;
-# define SIGNED_VALUE intptr_t
-# define SIZEOF_VALUE SIZEOF_UINTPTR_T
-# undef PRI_VALUE_PREFIX
-#elif SIZEOF_LONG == SIZEOF_VOIDP
-typedef unsigned long VALUE;
-typedef unsigned long ID;
-# define SIGNED_VALUE long
-# define SIZEOF_VALUE SIZEOF_LONG
-# define PRI_VALUE_PREFIX "l"
-#elif SIZEOF_LONG_LONG == SIZEOF_VOIDP
-typedef unsigned LONG_LONG VALUE;
-typedef unsigned LONG_LONG ID;
-# define SIGNED_VALUE LONG_LONG
-# define LONG_LONG_VALUE 1
-# define SIZEOF_VALUE SIZEOF_LONG_LONG
-# define PRI_VALUE_PREFIX "ll"
-#else
-# error ---->> ruby requires sizeof(void*) == sizeof(long) to be compiled. <<----
-#endif
-
-typedef char ruby_check_sizeof_int[SIZEOF_INT == sizeof(int) ? 1 : -1];
-typedef char ruby_check_sizeof_long[SIZEOF_LONG == sizeof(long) ? 1 : -1];
-#ifdef SIZEOF_LONG_LONG
-typedef char ruby_check_sizeof_long_long[SIZEOF_LONG_LONG == sizeof(LONG_LONG) ? 1 : -1];
-#endif
-typedef char ruby_check_sizeof_voidp[SIZEOF_VOIDP == sizeof(void*) ? 1 : -1];
-
-#if defined PRIdPTR && !defined PRI_VALUE_PREFIX
-#define PRIdVALUE PRIdPTR
-#define PRIiVALUE PRIiPTR
-#define PRIoVALUE PRIoPTR
-#define PRIuVALUE PRIuPTR
-#define PRIxVALUE PRIxPTR
-#define PRIXVALUE PRIXPTR
-#else
-#define PRIdVALUE PRI_VALUE_PREFIX"d"
-#define PRIiVALUE PRI_VALUE_PREFIX"i"
-#define PRIoVALUE PRI_VALUE_PREFIX"o"
-#define PRIuVALUE PRI_VALUE_PREFIX"u"
-#define PRIxVALUE PRI_VALUE_PREFIX"x"
-#define PRIXVALUE PRI_VALUE_PREFIX"X"
-#endif
-#ifndef PRI_VALUE_PREFIX
-# define PRI_VALUE_PREFIX ""
-#endif
-
-#if defined PRIdPTR
-# define PRI_PTRDIFF_PREFIX "t"
-#elif SIZEOF_PTRDIFF_T == SIZEOF_INT
-# define PRI_PTRDIFF_PREFIX
-#elif SIZEOF_PTRDIFF_T == SIZEOF_LONG
-# define PRI_PTRDIFF_PREFIX "l"
-#elif SIZEOF_PTRDIFF_T == SIZEOF_LONG_LONG
-# define PRI_PTRDIFF_PREFIX "ll"
-#endif
-#define PRIdPTRDIFF PRI_PTRDIFF_PREFIX"d"
-#define PRIiPTRDIFF PRI_PTRDIFF_PREFIX"i"
-#define PRIoPTRDIFF PRI_PTRDIFF_PREFIX"o"
-#define PRIuPTRDIFF PRI_PTRDIFF_PREFIX"u"
-#define PRIxPTRDIFF PRI_PTRDIFF_PREFIX"x"
-#define PRIXPTRDIFF PRI_PTRDIFF_PREFIX"X"
-
-#if defined PRIdPTR
-# define PRI_SIZE_PREFIX "z"
-#elif SIZEOF_SIZE_T == SIZEOF_INT
-# define PRI_SIZE_PREFIX
-#elif SIZEOF_SIZE_T == SIZEOF_LONG
-# define PRI_SIZE_PREFIX "l"
-#elif SIZEOF_SIZE_T == SIZEOF_LONG_LONG
-# define PRI_SIZE_PREFIX "ll"
-#endif
-#define PRIdSIZE PRI_SIZE_PREFIX"d"
-#define PRIiSIZE PRI_SIZE_PREFIX"i"
-#define PRIoSIZE PRI_SIZE_PREFIX"o"
-#define PRIuSIZE PRI_SIZE_PREFIX"u"
-#define PRIxSIZE PRI_SIZE_PREFIX"x"
-#define PRIXSIZE PRI_SIZE_PREFIX"X"
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# ifndef LONG_MAX
-# ifdef HAVE_LIMITS_H
-# include <limits.h>
-# else
- /* assuming 32bit(2's compliment) long */
-# define LONG_MAX 2147483647
-# endif
-# endif
-# ifndef LONG_MIN
-# define LONG_MIN (-LONG_MAX-1)
-# endif
-# ifndef CHAR_BIT
-# define CHAR_BIT 8
-# endif
-#endif
-
-#ifdef HAVE_LONG_LONG
-# ifndef LLONG_MAX
-# ifdef LONG_LONG_MAX
-# define LLONG_MAX LONG_LONG_MAX
-# else
-# ifdef _I64_MAX
-# define LLONG_MAX _I64_MAX
-# else
- /* assuming 64bit(2's complement) long long */
-# define LLONG_MAX 9223372036854775807LL
-# endif
-# endif
-# endif
-# ifndef LLONG_MIN
-# ifdef LONG_LONG_MIN
-# define LLONG_MIN LONG_LONG_MIN
-# else
-# ifdef _I64_MIN
-# define LLONG_MIN _I64_MIN
-# else
-# define LLONG_MIN (-LLONG_MAX-1)
-# endif
-# endif
-# endif
-#endif
-
-#define FIXNUM_MAX (LONG_MAX>>1)
-#define FIXNUM_MIN RSHIFT((long)LONG_MIN,1)
-
-#define INT2FIX(i) ((VALUE)(((SIGNED_VALUE)(i))<<1 | FIXNUM_FLAG))
-#define LONG2FIX(i) INT2FIX(i)
-#define rb_fix_new(v) INT2FIX(v)
-VALUE rb_int2inum(SIGNED_VALUE);
-
-#define rb_int_new(v) rb_int2inum(v)
-VALUE rb_uint2inum(VALUE);
-
-#define rb_uint_new(v) rb_uint2inum(v)
-
-#ifdef HAVE_LONG_LONG
-VALUE rb_ll2inum(LONG_LONG);
-#define LL2NUM(v) rb_ll2inum(v)
-VALUE rb_ull2inum(unsigned LONG_LONG);
-#define ULL2NUM(v) rb_ull2inum(v)
-#endif
-
-#if SIZEOF_OFF_T > SIZEOF_LONG && defined(HAVE_LONG_LONG)
-# define OFFT2NUM(v) LL2NUM(v)
-#elif SIZEOF_OFF_T == SIZEOF_LONG
-# define OFFT2NUM(v) LONG2NUM(v)
-#else
-# define OFFT2NUM(v) INT2NUM(v)
-#endif
-
-#if SIZEOF_SIZE_T > SIZEOF_LONG && defined(HAVE_LONG_LONG)
-# define SIZET2NUM(v) ULL2NUM(v)
-# define SSIZET2NUM(v) LL2NUM(v)
-#elif SIZEOF_SIZE_T == SIZEOF_LONG
-# define SIZET2NUM(v) ULONG2NUM(v)
-# define SSIZET2NUM(v) LONG2NUM(v)
-#else
-# define SIZET2NUM(v) UINT2NUM(v)
-# define SSIZET2NUM(v) INT2NUM(v)
-#endif
-
-#ifndef SSIZE_MAX
-# if SIZEOF_SIZE_T > SIZEOF_LONG && defined(HAVE_LONG_LONG)
-# define SSIZE_MAX LLONG_MAX
-# define SSIZE_MIN LLONG_MIN
-# elif SIZEOF_SIZE_T == SIZEOF_LONG
-# define SSIZE_MAX LONG_MAX
-# define SSIZE_MIN LONG_MIN
-# elif SIZEOF_SIZE_T == SIZEOF_INT
-# define SSIZE_MAX INT_MAX
-# define SSIZE_MIN INT_MIN
-# else
-# define SSIZE_MAX SHRT_MAX
-# define SSIZE_MIN SHRT_MIN
-# endif
-#endif
-
-#ifndef PIDT2NUM
-#define PIDT2NUM(v) LONG2NUM(v)
-#endif
-#ifndef NUM2PIDT
-#define NUM2PIDT(v) NUM2LONG(v)
-#endif
-#ifndef UIDT2NUM
-#define UIDT2NUM(v) LONG2NUM(v)
-#endif
-#ifndef NUM2UIDT
-#define NUM2UIDT(v) NUM2LONG(v)
-#endif
-#ifndef GIDT2NUM
-#define GIDT2NUM(v) LONG2NUM(v)
-#endif
-#ifndef NUM2GIDT
-#define NUM2GIDT(v) NUM2LONG(v)
-#endif
-
-#define FIX2LONG(x) RSHIFT((SIGNED_VALUE)x,1)
-#define FIX2ULONG(x) ((((VALUE)(x))>>1)&LONG_MAX)
-#define FIXNUM_P(f) (((SIGNED_VALUE)(f))&FIXNUM_FLAG)
-#define POSFIXABLE(f) ((f) < FIXNUM_MAX+1)
-#define NEGFIXABLE(f) ((f) >= FIXNUM_MIN)
-#define FIXABLE(f) (POSFIXABLE(f) && NEGFIXABLE(f))
-
-#define IMMEDIATE_P(x) ((VALUE)(x) & IMMEDIATE_MASK)
-
-#define SYMBOL_P(x) (((VALUE)(x)&~(~(VALUE)0<<RUBY_SPECIAL_SHIFT))==SYMBOL_FLAG)
-#define ID2SYM(x) (((VALUE)(x)<<RUBY_SPECIAL_SHIFT)|SYMBOL_FLAG)
-#define SYM2ID(x) RSHIFT((unsigned long)x,RUBY_SPECIAL_SHIFT)
-
-/* Module#methods, #singleton_methods and so on return Symbols */
-#define USE_SYMBOL_AS_METHOD_NAME 1
-
-/* special constants - i.e. non-zero and non-fixnum constants */
-enum ruby_special_consts {
- RUBY_Qfalse = 0,
- RUBY_Qtrue = 2,
- RUBY_Qnil = 4,
- RUBY_Qundef = 6,
-
- RUBY_IMMEDIATE_MASK = 0x03,
- RUBY_FIXNUM_FLAG = 0x01,
- RUBY_SYMBOL_FLAG = 0x0e,
- RUBY_SPECIAL_SHIFT = 8
-};
-
-#define Qfalse ((VALUE)RUBY_Qfalse)
-#define Qtrue ((VALUE)RUBY_Qtrue)
-#define Qnil ((VALUE)RUBY_Qnil)
-#define Qundef ((VALUE)RUBY_Qundef) /* undefined value for placeholder */
-#define IMMEDIATE_MASK RUBY_IMMEDIATE_MASK
-#define FIXNUM_FLAG RUBY_FIXNUM_FLAG
-#define SYMBOL_FLAG RUBY_SYMBOL_FLAG
-
-#define RTEST(v) (((VALUE)(v) & ~Qnil) != 0)
-#define NIL_P(v) ((VALUE)(v) == Qnil)
-
-#define CLASS_OF(v) rb_class_of((VALUE)(v))
-
-enum ruby_value_type {
- RUBY_T_NONE = 0x00,
-
- RUBY_T_OBJECT = 0x01,
- RUBY_T_CLASS = 0x02,
- RUBY_T_MODULE = 0x03,
- RUBY_T_FLOAT = 0x04,
- RUBY_T_STRING = 0x05,
- RUBY_T_REGEXP = 0x06,
- RUBY_T_ARRAY = 0x07,
- RUBY_T_HASH = 0x08,
- RUBY_T_STRUCT = 0x09,
- RUBY_T_BIGNUM = 0x0a,
- RUBY_T_FILE = 0x0b,
- RUBY_T_DATA = 0x0c,
- RUBY_T_MATCH = 0x0d,
- RUBY_T_COMPLEX = 0x0e,
- RUBY_T_RATIONAL = 0x0f,
-
- RUBY_T_NIL = 0x11,
- RUBY_T_TRUE = 0x12,
- RUBY_T_FALSE = 0x13,
- RUBY_T_SYMBOL = 0x14,
- RUBY_T_FIXNUM = 0x15,
-
- RUBY_T_UNDEF = 0x1b,
- RUBY_T_NODE = 0x1c,
- RUBY_T_ICLASS = 0x1d,
- RUBY_T_ZOMBIE = 0x1e,
-
- RUBY_T_MASK = 0x1f
-};
-
-#define T_NONE RUBY_T_NONE
-#define T_NIL RUBY_T_NIL
-#define T_OBJECT RUBY_T_OBJECT
-#define T_CLASS RUBY_T_CLASS
-#define T_ICLASS RUBY_T_ICLASS
-#define T_MODULE RUBY_T_MODULE
-#define T_FLOAT RUBY_T_FLOAT
-#define T_STRING RUBY_T_STRING
-#define T_REGEXP RUBY_T_REGEXP
-#define T_ARRAY RUBY_T_ARRAY
-#define T_HASH RUBY_T_HASH
-#define T_STRUCT RUBY_T_STRUCT
-#define T_BIGNUM RUBY_T_BIGNUM
-#define T_FILE RUBY_T_FILE
-#define T_FIXNUM RUBY_T_FIXNUM
-#define T_TRUE RUBY_T_TRUE
-#define T_FALSE RUBY_T_FALSE
-#define T_DATA RUBY_T_DATA
-#define T_MATCH RUBY_T_MATCH
-#define T_SYMBOL RUBY_T_SYMBOL
-#define T_RATIONAL RUBY_T_RATIONAL
-#define T_COMPLEX RUBY_T_COMPLEX
-#define T_UNDEF RUBY_T_UNDEF
-#define T_NODE RUBY_T_NODE
-#define T_ZOMBIE RUBY_T_ZOMBIE
-#define T_MASK RUBY_T_MASK
-
-#define BUILTIN_TYPE(x) (int)(((struct RBasic*)(x))->flags & T_MASK)
-
-#define TYPE(x) rb_type((VALUE)(x))
-
-#define RB_GC_GUARD(v) (*(volatile VALUE *)&(v))
-
-void rb_check_type(VALUE,int);
-#define Check_Type(v,t) rb_check_type((VALUE)(v),t)
-
-VALUE rb_str_to_str(VALUE);
-VALUE rb_string_value(volatile VALUE*);
-char *rb_string_value_ptr(volatile VALUE*);
-char *rb_string_value_cstr(volatile VALUE*);
-
-#define StringValue(v) rb_string_value(&(v))
-#define StringValuePtr(v) rb_string_value_ptr(&(v))
-#define StringValueCStr(v) rb_string_value_cstr(&(v))
-
-void rb_check_safe_obj(VALUE);
-DEPRECATED(void rb_check_safe_str(VALUE));
-#define SafeStringValue(v) do {\
- StringValue(v);\
- rb_check_safe_obj(v);\
-} while (0)
-/* obsolete macro - use SafeStringValue(v) */
-#define Check_SafeStr(v) rb_check_safe_str((VALUE)(v))
-
-VALUE rb_str_export(VALUE);
-#define ExportStringValue(v) do {\
- SafeStringValue(v);\
- (v) = rb_str_export(v);\
-} while (0)
-VALUE rb_str_export_locale(VALUE);
-
-VALUE rb_get_path(VALUE);
-#define FilePathValue(v) (RB_GC_GUARD(v) = rb_get_path(v))
-
-VALUE rb_get_path_no_checksafe(VALUE);
-#define FilePathStringValue(v) ((v) = rb_get_path_no_checksafe(v))
-
-void rb_secure(int);
-int rb_safe_level(void);
-void rb_set_safe_level(int);
-void rb_set_safe_level_force(int);
-void rb_secure_update(VALUE);
-NORETURN(void rb_insecure_operation(void));
-
-VALUE rb_errinfo(void);
-void rb_set_errinfo(VALUE);
-
-SIGNED_VALUE rb_num2long(VALUE);
-VALUE rb_num2ulong(VALUE);
-#define NUM2LONG_internal(x) (FIXNUM_P(x) ? FIX2LONG(x) : rb_num2long(x))
-#ifdef __GNUC__
-#define NUM2LONG(x) \
- __extension__ ({VALUE num2long_x = (x); NUM2LONG_internal(num2long_x);})
-#else
-static inline long
-NUM2LONG(VALUE x)
-{
- return NUM2LONG_internal(x);
-}
-#endif
-#define NUM2ULONG(x) rb_num2ulong((VALUE)x)
-#if SIZEOF_INT < SIZEOF_LONG
-long rb_num2int(VALUE);
-long rb_fix2int(VALUE);
-#define FIX2INT(x) ((int)rb_fix2int((VALUE)x))
-static inline int
-NUM2INT(VALUE x)
-{
- return FIXNUM_P(x) ? FIX2INT(x) : (int)rb_num2int(x);
-}
-unsigned long rb_num2uint(VALUE);
-#define NUM2UINT(x) ((unsigned int)rb_num2uint(x))
-unsigned long rb_fix2uint(VALUE);
-#define FIX2UINT(x) ((unsigned int)rb_fix2uint(x))
-#else
-#define NUM2INT(x) ((int)NUM2LONG(x))
-#define NUM2UINT(x) ((unsigned int)NUM2ULONG(x))
-#define FIX2INT(x) ((int)FIX2LONG(x))
-#define FIX2UINT(x) ((unsigned int)FIX2ULONG(x))
-#endif
-
-#ifdef HAVE_LONG_LONG
-LONG_LONG rb_num2ll(VALUE);
-unsigned LONG_LONG rb_num2ull(VALUE);
-static inline LONG_LONG
-NUM2LL(VALUE x)
-{
- return FIXNUM_P(x) ? FIX2LONG(x) : rb_num2ll(x);
-}
-# define NUM2ULL(x) rb_num2ull((VALUE)x)
-#endif
-
-#if defined(HAVE_LONG_LONG) && SIZEOF_OFF_T > SIZEOF_LONG
-# define NUM2OFFT(x) ((off_t)NUM2LL(x))
-#else
-# define NUM2OFFT(x) NUM2LONG(x)
-#endif
-
-#if defined(HAVE_LONG_LONG) && SIZEOF_SIZE_T > SIZEOF_LONG
-# define NUM2SIZET(x) ((size_t)NUM2ULL(x))
-# define NUM2SSIZET(x) ((size_t)NUM2LL(x))
-#else
-# define NUM2SIZET(x) NUM2ULONG(x)
-# define NUM2SSIZET(x) NUM2LONG(x)
-#endif
-
-double rb_num2dbl(VALUE);
-#define NUM2DBL(x) rb_num2dbl((VALUE)(x))
-
-VALUE rb_uint2big(VALUE);
-VALUE rb_int2big(SIGNED_VALUE);
-
-#if SIZEOF_INT < SIZEOF_VALUE
-# define INT2NUM(v) INT2FIX((int)(v))
-# define UINT2NUM(v) LONG2FIX((unsigned int)(v))
-#else
-static inline VALUE
-INT2NUM(int v)
-{
- if (!FIXABLE(v))
- return rb_int2big(v);
- return INT2FIX(v);
-}
-
-static inline VALUE
-UINT2NUM(unsigned int v)
-{
- if (!POSFIXABLE(v))
- return rb_uint2big(v);
- return LONG2FIX(v);
-}
-#endif
-
-static inline VALUE
-LONG2NUM(long v)
-{
- if (FIXABLE(v)) return LONG2FIX(v);
- return rb_int2big(v);
-}
-
-static inline VALUE
-ULONG2NUM(unsigned long v)
-{
- if (POSFIXABLE(v)) return LONG2FIX(v);
- return rb_uint2big(v);
-}
-
-#define NUM2CHR(x) (((TYPE(x) == T_STRING)&&(RSTRING_LEN(x)>=1))?\
- RSTRING_PTR(x)[0]:(char)(NUM2INT(x)&0xff))
-#define CHR2FIX(x) INT2FIX((long)((x)&0xff))
-
-VALUE rb_newobj(void);
-#define NEWOBJ(obj,type) type *obj = (type*)rb_newobj()
-#define OBJSETUP(obj,c,t) do {\
- RBASIC(obj)->flags = (t);\
- RBASIC(obj)->klass = (c);\
- if (rb_safe_level() >= 3) FL_SET(obj, FL_TAINT | FL_UNTRUSTED);\
-} while (0)
-#define CLONESETUP(clone,obj) do {\
- OBJSETUP(clone,rb_singleton_class_clone((VALUE)obj),RBASIC(obj)->flags);\
- rb_singleton_class_attached(RBASIC(clone)->klass, (VALUE)clone);\
- if (FL_TEST(obj, FL_EXIVAR)) rb_copy_generic_ivar((VALUE)clone,(VALUE)obj);\
-} while (0)
-#define DUPSETUP(dup,obj) do {\
- OBJSETUP(dup,rb_obj_class(obj), (RBASIC(obj)->flags)&(T_MASK|FL_EXIVAR|FL_TAINT|FL_UNTRUSTED)); \
- if (FL_TEST(obj, FL_EXIVAR)) rb_copy_generic_ivar((VALUE)dup,(VALUE)obj);\
-} while (0)
-
-struct RBasic {
- VALUE flags;
- VALUE klass;
-};
-
-#define ROBJECT_EMBED_LEN_MAX 3
-struct RObject {
- struct RBasic basic;
- union {
- struct {
- long numiv;
- VALUE *ivptr;
- struct st_table *iv_index_tbl; /* shortcut for RCLASS_IV_INDEX_TBL(rb_obj_class(obj)) */
- } heap;
- VALUE ary[ROBJECT_EMBED_LEN_MAX];
- } as;
-};
-#define ROBJECT_EMBED FL_USER1
-#define ROBJECT_NUMIV(o) \
- ((RBASIC(o)->flags & ROBJECT_EMBED) ? \
- ROBJECT_EMBED_LEN_MAX : \
- ROBJECT(o)->as.heap.numiv)
-#define ROBJECT_IVPTR(o) \
- ((RBASIC(o)->flags & ROBJECT_EMBED) ? \
- ROBJECT(o)->as.ary : \
- ROBJECT(o)->as.heap.ivptr)
-#define ROBJECT_IV_INDEX_TBL(o) \
- ((RBASIC(o)->flags & ROBJECT_EMBED) ? \
- RCLASS_IV_INDEX_TBL(rb_obj_class(o)) : \
- ROBJECT(o)->as.heap.iv_index_tbl)
-
-typedef struct {
- VALUE super;
- struct st_table *iv_tbl;
-} rb_classext_t;
-
-struct RClass {
- struct RBasic basic;
- rb_classext_t *ptr;
- struct st_table *m_tbl;
- struct st_table *iv_index_tbl;
-};
-#define RCLASS_IV_TBL(c) (RCLASS(c)->ptr->iv_tbl)
-#define RCLASS_M_TBL(c) (RCLASS(c)->m_tbl)
-#define RCLASS_SUPER(c) (RCLASS(c)->ptr->super)
-#define RCLASS_IV_INDEX_TBL(c) (RCLASS(c)->iv_index_tbl)
-#define RMODULE_IV_TBL(m) RCLASS_IV_TBL(m)
-#define RMODULE_M_TBL(m) RCLASS_M_TBL(m)
-#define RMODULE_SUPER(m) RCLASS_SUPER(m)
-
-struct RFloat {
- struct RBasic basic;
- double float_value;
-};
-#define RFLOAT_VALUE(v) (RFLOAT(v)->float_value)
-#define DBL2NUM(dbl) rb_float_new(dbl)
-
-#define ELTS_SHARED FL_USER2
-
-#define RSTRING_EMBED_LEN_MAX ((int)((sizeof(VALUE)*3)/sizeof(char)-1))
-struct RString {
- struct RBasic basic;
- union {
- struct {
- long len;
- char *ptr;
- union {
- long capa;
- VALUE shared;
- } aux;
- } heap;
- char ary[RSTRING_EMBED_LEN_MAX + 1];
- } as;
-};
-#define RSTRING_NOEMBED FL_USER1
-#define RSTRING_EMBED_LEN_MASK (FL_USER2|FL_USER3|FL_USER4|FL_USER5|FL_USER6)
-#define RSTRING_EMBED_LEN_SHIFT (FL_USHIFT+2)
-#define RSTRING_LEN(str) \
- (!(RBASIC(str)->flags & RSTRING_NOEMBED) ? \
- (long)((RBASIC(str)->flags >> RSTRING_EMBED_LEN_SHIFT) & \
- (RSTRING_EMBED_LEN_MASK >> RSTRING_EMBED_LEN_SHIFT)) : \
- RSTRING(str)->as.heap.len)
-#define RSTRING_PTR(str) \
- (!(RBASIC(str)->flags & RSTRING_NOEMBED) ? \
- RSTRING(str)->as.ary : \
- RSTRING(str)->as.heap.ptr)
-#define RSTRING_END(str) (RSTRING_PTR(str)+RSTRING_LEN(str))
-
-#define RARRAY_EMBED_LEN_MAX 3
-struct RArray {
- struct RBasic basic;
- union {
- struct {
- long len;
- union {
- long capa;
- VALUE shared;
- } aux;
- VALUE *ptr;
- } heap;
- VALUE ary[RARRAY_EMBED_LEN_MAX];
- } as;
-};
-#define RARRAY_EMBED_FLAG FL_USER1
-/* FL_USER2 is for ELTS_SHARED */
-#define RARRAY_EMBED_LEN_MASK (FL_USER4|FL_USER3)
-#define RARRAY_EMBED_LEN_SHIFT (FL_USHIFT+3)
-#define RARRAY_LEN(a) \
- ((RBASIC(a)->flags & RARRAY_EMBED_FLAG) ? \
- (long)((RBASIC(a)->flags >> RARRAY_EMBED_LEN_SHIFT) & \
- (RARRAY_EMBED_LEN_MASK >> RARRAY_EMBED_LEN_SHIFT)) : \
- RARRAY(a)->as.heap.len)
-#define RARRAY_PTR(a) \
- ((RBASIC(a)->flags & RARRAY_EMBED_FLAG) ? \
- RARRAY(a)->as.ary : \
- RARRAY(a)->as.heap.ptr)
-
-#if SIZEOF_INT < SIZEOF_VALUE
-NORETURN(void rb_out_of_int(SIGNED_VALUE num));
-#endif
-
-#if SIZEOF_INT < SIZEOF_LONG
-#define rb_long2int_internal(n, i) \
- int i = (int)(n); \
- if ((long)i != (n)) rb_out_of_int(n)
-#ifdef __GNUC__
-#define rb_long2int(i2l_n) __extension__ ({rb_long2int_internal(i2l_n, i2l_i); i2l_i;})
-#else
-static inline int
-rb_long2int(long n) {rb_long2int_internal(n, i); return i;}
-#endif
-#else
-#define rb_long2int(n) ((int)(n))
-#endif
-#define RARRAY_LENINT(ary) rb_long2int(RARRAY_LEN(ary))
-
-struct RRegexp {
- struct RBasic basic;
- struct re_pattern_buffer *ptr;
- VALUE src;
- unsigned long usecnt;
-};
-#define RREGEXP_SRC(r) RREGEXP(r)->src
-#define RREGEXP_SRC_PTR(r) RSTRING_PTR(RREGEXP(r)->src)
-#define RREGEXP_SRC_LEN(r) RSTRING_LEN(RREGEXP(r)->src)
-
-struct RHash {
- struct RBasic basic;
- struct st_table *ntbl; /* possibly 0 */
- int iter_lev;
- VALUE ifnone;
-};
-/* RHASH_TBL allocates st_table if not available. */
-#define RHASH_TBL(h) rb_hash_tbl(h)
-#define RHASH_ITER_LEV(h) (RHASH(h)->iter_lev)
-#define RHASH_IFNONE(h) (RHASH(h)->ifnone)
-#define RHASH_SIZE(h) (RHASH(h)->ntbl ? RHASH(h)->ntbl->num_entries : 0)
-#define RHASH_EMPTY_P(h) (RHASH_SIZE(h) == 0)
-
-struct RFile {
- struct RBasic basic;
- struct rb_io_t *fptr;
-};
-
-struct RRational {
- struct RBasic basic;
- VALUE num;
- VALUE den;
-};
-
-struct RComplex {
- struct RBasic basic;
- VALUE real;
- VALUE imag;
-};
-
-struct RData {
- struct RBasic basic;
- void (*dmark)(void*);
- void (*dfree)(void*);
- void *data;
-};
-
-typedef struct rb_data_type_struct {
- const char *wrap_struct_name;
- void (*dmark)(void*);
- void (*dfree)(void*);
- size_t (*dsize)(void *);
- void *ary[4]; /* for extension */
-} rb_data_type_t;
-
-struct RTypedData {
- struct RBasic basic;
- const rb_data_type_t *type;
- VALUE typed_flag; /* 1 or not */
- void *data;
-};
-
-#define DATA_PTR(dta) (RDATA(dta)->data)
-
-#define RTYPEDDATA_P(v) (RTYPEDDATA(v)->typed_flag == 1)
-#define RTYPEDDATA_TYPE(v) (RTYPEDDATA(v)->type)
-#define RTYPEDDATA_DATA(v) (RTYPEDDATA(v)->data)
-
-/*
-#define RUBY_DATA_FUNC(func) ((void (*)(void*))func)
-*/
-typedef void (*RUBY_DATA_FUNC)(void*);
-
-VALUE rb_data_object_alloc(VALUE,void*,RUBY_DATA_FUNC,RUBY_DATA_FUNC);
-VALUE rb_data_typed_object_alloc(VALUE klass, void *datap, const rb_data_type_t *);
-int rb_typeddata_is_kind_of(VALUE, const rb_data_type_t *);
-void *rb_check_typeddata(VALUE, const rb_data_type_t *);
-#define Check_TypedStruct(v,t) rb_check_typeddata((VALUE)(v),t)
-#define RUBY_TYPED_DEFAULT_FREE ((void (*)(void *))-1)
-
-#define Data_Wrap_Struct(klass,mark,free,sval)\
- rb_data_object_alloc(klass,sval,(RUBY_DATA_FUNC)mark,(RUBY_DATA_FUNC)free)
-
-#define Data_Make_Struct(klass,type,mark,free,sval) (\
- sval = ALLOC(type),\
- memset(sval, 0, sizeof(type)),\
- Data_Wrap_Struct(klass,mark,free,sval)\
-)
-
-#define TypedData_Wrap_Struct(klass,data_type,sval)\
- rb_data_typed_object_alloc(klass,sval,data_type)
-
-#define TypedData_Make_Struct(klass, type, data_type, sval) (\
- sval = ALLOC(type),\
- memset(sval, 0, sizeof(type)),\
- TypedData_Wrap_Struct(klass,data_type,sval)\
-)
-
-#define Data_Get_Struct(obj,type,sval) do {\
- Check_Type(obj, T_DATA); \
- sval = (type*)DATA_PTR(obj);\
-} while (0)
-
-#define TypedData_Get_Struct(obj,type,data_type,sval) do {\
- sval = (type*)rb_check_typeddata(obj, data_type); \
-} while (0)
-
-#define RSTRUCT_EMBED_LEN_MAX 3
-struct RStruct {
- struct RBasic basic;
- union {
- struct {
- long len;
- VALUE *ptr;
- } heap;
- VALUE ary[RSTRUCT_EMBED_LEN_MAX];
- } as;
-};
-#define RSTRUCT_EMBED_LEN_MASK (FL_USER2|FL_USER1)
-#define RSTRUCT_EMBED_LEN_SHIFT (FL_USHIFT+1)
-#define RSTRUCT_LEN(st) \
- ((RBASIC(st)->flags & RSTRUCT_EMBED_LEN_MASK) ? \
- (long)((RBASIC(st)->flags >> RSTRUCT_EMBED_LEN_SHIFT) & \
- (RSTRUCT_EMBED_LEN_MASK >> RSTRUCT_EMBED_LEN_SHIFT)) : \
- RSTRUCT(st)->as.heap.len)
-#define RSTRUCT_PTR(st) \
- ((RBASIC(st)->flags & RSTRUCT_EMBED_LEN_MASK) ? \
- RSTRUCT(st)->as.ary : \
- RSTRUCT(st)->as.heap.ptr)
-
-#define RBIGNUM_EMBED_LEN_MAX ((int)((sizeof(VALUE)*3)/sizeof(BDIGIT)))
-struct RBignum {
- struct RBasic basic;
- union {
- struct {
- long len;
- BDIGIT *digits;
- } heap;
- BDIGIT ary[RBIGNUM_EMBED_LEN_MAX];
- } as;
-};
-#define RBIGNUM_SIGN_BIT FL_USER1
-/* sign: positive:1, negative:0 */
-#define RBIGNUM_SIGN(b) ((RBASIC(b)->flags & RBIGNUM_SIGN_BIT) != 0)
-#define RBIGNUM_SET_SIGN(b,sign) \
- ((sign) ? (RBASIC(b)->flags |= RBIGNUM_SIGN_BIT) \
- : (RBASIC(b)->flags &= ~RBIGNUM_SIGN_BIT))
-#define RBIGNUM_POSITIVE_P(b) RBIGNUM_SIGN(b)
-#define RBIGNUM_NEGATIVE_P(b) (!RBIGNUM_SIGN(b))
-
-#define RBIGNUM_EMBED_FLAG FL_USER2
-#define RBIGNUM_EMBED_LEN_MASK (FL_USER5|FL_USER4|FL_USER3)
-#define RBIGNUM_EMBED_LEN_SHIFT (FL_USHIFT+3)
-#define RBIGNUM_LEN(b) \
- ((RBASIC(b)->flags & RBIGNUM_EMBED_FLAG) ? \
- (long)((RBASIC(b)->flags >> RBIGNUM_EMBED_LEN_SHIFT) & \
- (RBIGNUM_EMBED_LEN_MASK >> RBIGNUM_EMBED_LEN_SHIFT)) : \
- RBIGNUM(b)->as.heap.len)
-/* LSB:RBIGNUM_DIGITS(b)[0], MSB:RBIGNUM_DIGITS(b)[RBIGNUM_LEN(b)-1] */
-#define RBIGNUM_DIGITS(b) \
- ((RBASIC(b)->flags & RBIGNUM_EMBED_FLAG) ? \
- RBIGNUM(b)->as.ary : \
- RBIGNUM(b)->as.heap.digits)
-
-#define R_CAST(st) (struct st*)
-#define RBASIC(obj) (R_CAST(RBasic)(obj))
-#define ROBJECT(obj) (R_CAST(RObject)(obj))
-#define RCLASS(obj) (R_CAST(RClass)(obj))
-#define RMODULE(obj) RCLASS(obj)
-#define RFLOAT(obj) (R_CAST(RFloat)(obj))
-#define RSTRING(obj) (R_CAST(RString)(obj))
-#define RREGEXP(obj) (R_CAST(RRegexp)(obj))
-#define RARRAY(obj) (R_CAST(RArray)(obj))
-#define RHASH(obj) (R_CAST(RHash)(obj))
-#define RDATA(obj) (R_CAST(RData)(obj))
-#define RTYPEDDATA(obj) (R_CAST(RTypedData)(obj))
-#define RSTRUCT(obj) (R_CAST(RStruct)(obj))
-#define RBIGNUM(obj) (R_CAST(RBignum)(obj))
-#define RFILE(obj) (R_CAST(RFile)(obj))
-#define RRATIONAL(obj) (R_CAST(RRational)(obj))
-#define RCOMPLEX(obj) (R_CAST(RComplex)(obj))
-
-#define FL_SINGLETON FL_USER0
-#define FL_MARK (((VALUE)1)<<5)
-#define FL_RESERVED (((VALUE)1)<<6) /* will be used in the future GC */
-#define FL_FINALIZE (((VALUE)1)<<7)
-#define FL_TAINT (((VALUE)1)<<8)
-#define FL_UNTRUSTED (((VALUE)1)<<9)
-#define FL_EXIVAR (((VALUE)1)<<10)
-#define FL_FREEZE (((VALUE)1)<<11)
-
-#define FL_USHIFT 12
-
-#define FL_USER0 (((VALUE)1)<<(FL_USHIFT+0))
-#define FL_USER1 (((VALUE)1)<<(FL_USHIFT+1))
-#define FL_USER2 (((VALUE)1)<<(FL_USHIFT+2))
-#define FL_USER3 (((VALUE)1)<<(FL_USHIFT+3))
-#define FL_USER4 (((VALUE)1)<<(FL_USHIFT+4))
-#define FL_USER5 (((VALUE)1)<<(FL_USHIFT+5))
-#define FL_USER6 (((VALUE)1)<<(FL_USHIFT+6))
-#define FL_USER7 (((VALUE)1)<<(FL_USHIFT+7))
-#define FL_USER8 (((VALUE)1)<<(FL_USHIFT+8))
-#define FL_USER9 (((VALUE)1)<<(FL_USHIFT+9))
-#define FL_USER10 (((VALUE)1)<<(FL_USHIFT+10))
-#define FL_USER11 (((VALUE)1)<<(FL_USHIFT+11))
-#define FL_USER12 (((VALUE)1)<<(FL_USHIFT+12))
-#define FL_USER13 (((VALUE)1)<<(FL_USHIFT+13))
-#define FL_USER14 (((VALUE)1)<<(FL_USHIFT+14))
-#define FL_USER15 (((VALUE)1)<<(FL_USHIFT+15))
-#define FL_USER16 (((VALUE)1)<<(FL_USHIFT+16))
-#define FL_USER17 (((VALUE)1)<<(FL_USHIFT+17))
-#define FL_USER18 (((VALUE)1)<<(FL_USHIFT+18))
-#define FL_USER19 (((VALUE)1)<<(FL_USHIFT+19))
-
-#define SPECIAL_CONST_P(x) (IMMEDIATE_P(x) || !RTEST(x))
-
-#define FL_ABLE(x) (!SPECIAL_CONST_P(x) && BUILTIN_TYPE(x) != T_NODE)
-#define FL_TEST(x,f) (FL_ABLE(x)?(RBASIC(x)->flags&(f)):0)
-#define FL_ANY(x,f) FL_TEST(x,f)
-#define FL_ALL(x,f) (FL_TEST(x,f) == (f))
-#define FL_SET(x,f) do {if (FL_ABLE(x)) RBASIC(x)->flags |= (f);} while (0)
-#define FL_UNSET(x,f) do {if (FL_ABLE(x)) RBASIC(x)->flags &= ~(f);} while (0)
-#define FL_REVERSE(x,f) do {if (FL_ABLE(x)) RBASIC(x)->flags ^= (f);} while (0)
-
-#define OBJ_TAINTED(x) (!!FL_TEST((x), FL_TAINT))
-#define OBJ_TAINT(x) FL_SET((x), FL_TAINT)
-#define OBJ_UNTRUSTED(x) (!!FL_TEST((x), FL_UNTRUSTED))
-#define OBJ_UNTRUST(x) FL_SET((x), FL_UNTRUSTED)
-#define OBJ_INFECT(x,s) do {if (FL_ABLE(x) && FL_ABLE(s)) RBASIC(x)->flags |= RBASIC(s)->flags & (FL_TAINT | FL_UNTRUSTED);} while (0)
-
-#define OBJ_FROZEN(x) (!!FL_TEST((x), FL_FREEZE))
-#define OBJ_FREEZE(x) FL_SET((x), FL_FREEZE)
-
-#define ALLOC_N(type,n) (type*)xmalloc2((n),sizeof(type))
-#define ALLOC(type) (type*)xmalloc(sizeof(type))
-#define REALLOC_N(var,type,n) (var)=(type*)xrealloc2((char*)(var),(n),sizeof(type))
-
-#define ALLOCA_N(type,n) (type*)alloca(sizeof(type)*(n))
-
-#define MEMZERO(p,type,n) memset((p), 0, sizeof(type)*(n))
-#define MEMCPY(p1,p2,type,n) memcpy((p1), (p2), sizeof(type)*(n))
-#define MEMMOVE(p1,p2,type,n) memmove((p1), (p2), sizeof(type)*(n))
-#define MEMCMP(p1,p2,type,n) memcmp((p1), (p2), sizeof(type)*(n))
-
-void rb_obj_infect(VALUE,VALUE);
-
-typedef int ruby_glob_func(const char*,VALUE, void*);
-void rb_glob(const char*,void(*)(const char*,VALUE,void*),VALUE);
-int ruby_glob(const char*,int,ruby_glob_func*,VALUE);
-int ruby_brace_glob(const char*,int,ruby_glob_func*,VALUE);
-
-VALUE rb_define_class(const char*,VALUE);
-VALUE rb_define_module(const char*);
-VALUE rb_define_class_under(VALUE, const char*, VALUE);
-VALUE rb_define_module_under(VALUE, const char*);
-
-void rb_include_module(VALUE,VALUE);
-void rb_extend_object(VALUE,VALUE);
-
-struct rb_global_variable;
-
-typedef VALUE rb_gvar_getter_t(ID id, void *data, struct rb_global_variable *gvar);
-typedef void rb_gvar_setter_t(VALUE val, ID id, void *data, struct rb_global_variable *gvar);
-typedef void rb_gvar_marker_t(VALUE *var);
-
-VALUE rb_gvar_undef_getter(ID id, void *data, struct rb_global_variable *gvar);
-void rb_gvar_undef_setter(VALUE val, ID id, void *data, struct rb_global_variable *gvar);
-void rb_gvar_undef_marker(VALUE *var);
-
-VALUE rb_gvar_val_getter(ID id, void *data, struct rb_global_variable *gvar);
-void rb_gvar_val_setter(VALUE val, ID id, void *data, struct rb_global_variable *gvar);
-void rb_gvar_val_marker(VALUE *var);
-
-VALUE rb_gvar_var_getter(ID id, void *data, struct rb_global_variable *gvar);
-void rb_gvar_var_setter(VALUE val, ID id, void *data, struct rb_global_variable *gvar);
-void rb_gvar_var_marker(VALUE *var);
-
-void rb_gvar_readonly_setter(VALUE val, ID id, void *data, struct rb_global_variable *gvar);
-
-void rb_define_variable(const char*,VALUE*);
-void rb_define_virtual_variable(const char*,VALUE(*)(ANYARGS),void(*)(ANYARGS));
-void rb_define_hooked_variable(const char*,VALUE*,VALUE(*)(ANYARGS),void(*)(ANYARGS));
-void rb_define_readonly_variable(const char*,VALUE*);
-void rb_define_const(VALUE,const char*,VALUE);
-void rb_define_global_const(const char*,VALUE);
-
-#define RUBY_METHOD_FUNC(func) ((VALUE (*)(ANYARGS))func)
-void rb_define_method(VALUE,const char*,VALUE(*)(ANYARGS),int);
-void rb_define_module_function(VALUE,const char*,VALUE(*)(ANYARGS),int);
-void rb_define_global_function(const char*,VALUE(*)(ANYARGS),int);
-
-void rb_undef_method(VALUE,const char*);
-void rb_define_alias(VALUE,const char*,const char*);
-void rb_define_attr(VALUE,const char*,int,int);
-
-void rb_global_variable(VALUE*);
-void rb_gc_register_mark_object(VALUE);
-void rb_gc_register_address(VALUE*);
-void rb_gc_unregister_address(VALUE*);
-
-ID rb_intern(const char*);
-ID rb_intern2(const char*, long);
-ID rb_intern_str(VALUE str);
-const char *rb_id2name(ID);
-ID rb_to_id(VALUE);
-VALUE rb_id2str(ID);
-
-#define CONST_ID_CACHE(result, str) \
- { \
- static ID rb_intern_id_cache; \
- if (!rb_intern_id_cache) \
- rb_intern_id_cache = rb_intern2(str, strlen(str)); \
- result rb_intern_id_cache; \
- }
-#define CONST_ID(var, str) \
- do CONST_ID_CACHE(var =, str) while (0)
-#ifdef __GNUC__
-/* __builtin_constant_p and statement expression is available
- * since gcc-2.7.2.3 at least. */
-#define rb_intern(str) \
- (__builtin_constant_p(str) ? \
- __extension__ (CONST_ID_CACHE(/**/, str)) : \
- rb_intern(str))
-#define rb_intern_const(str) \
- (__builtin_constant_p(str) ? \
- __extension__ (rb_intern2(str, strlen(str))) : \
- (rb_intern)(str))
-#else
-#define rb_intern_const(str) rb_intern2(str, strlen(str))
-#endif
-
-const char *rb_class2name(VALUE);
-const char *rb_obj_classname(VALUE);
-
-void rb_p(VALUE);
-
-VALUE rb_eval_string(const char*);
-VALUE rb_eval_string_protect(const char*, int*);
-VALUE rb_eval_string_wrap(const char*, int*);
-VALUE rb_funcall(VALUE, ID, int, ...);
-VALUE rb_funcall2(VALUE, ID, int, const VALUE*);
-VALUE rb_funcall3(VALUE, ID, int, const VALUE*);
-int rb_scan_args(int, const VALUE*, const char*, ...);
-VALUE rb_call_super(int, const VALUE*);
-
-VALUE rb_gv_set(const char*, VALUE);
-VALUE rb_gv_get(const char*);
-VALUE rb_iv_get(VALUE, const char*);
-VALUE rb_iv_set(VALUE, const char*, VALUE);
-
-VALUE rb_equal(VALUE,VALUE);
-
-VALUE *rb_ruby_verbose_ptr(void);
-VALUE *rb_ruby_debug_ptr(void);
-#define ruby_verbose (*rb_ruby_verbose_ptr())
-#define ruby_debug (*rb_ruby_debug_ptr())
-
-PRINTF_ARGS(NORETURN(void rb_raise(VALUE, const char*, ...)), 2, 3);
-PRINTF_ARGS(NORETURN(void rb_fatal(const char*, ...)), 1, 2);
-PRINTF_ARGS(NORETURN(void rb_bug(const char*, ...)), 1, 2);
-NORETURN(void rb_sys_fail(const char*));
-NORETURN(void rb_mod_sys_fail(VALUE, const char*));
-NORETURN(void rb_iter_break(void));
-NORETURN(void rb_exit(int));
-NORETURN(void rb_notimplement(void));
-
-/* reports if `-w' specified */
-PRINTF_ARGS(void rb_warning(const char*, ...), 1, 2);
-PRINTF_ARGS(void rb_compile_warning(const char *, int, const char*, ...), 3, 4);
-PRINTF_ARGS(void rb_sys_warning(const char*, ...), 1, 2);
-/* reports always */
-PRINTF_ARGS(void rb_warn(const char*, ...), 1, 2);
-PRINTF_ARGS(void rb_compile_warn(const char *, int, const char*, ...), 3, 4);
-
-typedef VALUE rb_block_call_func(VALUE, VALUE, int, VALUE*);
-
-VALUE rb_each(VALUE);
-VALUE rb_yield(VALUE);
-VALUE rb_yield_values(int n, ...);
-VALUE rb_yield_values2(int n, const VALUE *argv);
-VALUE rb_yield_splat(VALUE);
-int rb_block_given_p(void);
-void rb_need_block(void);
-VALUE rb_iterate(VALUE(*)(VALUE),VALUE,VALUE(*)(ANYARGS),VALUE);
-VALUE rb_block_call(VALUE,ID,int,VALUE*,VALUE(*)(ANYARGS),VALUE);
-VALUE rb_rescue(VALUE(*)(ANYARGS),VALUE,VALUE(*)(ANYARGS),VALUE);
-VALUE rb_rescue2(VALUE(*)(ANYARGS),VALUE,VALUE(*)(ANYARGS),VALUE,...);
-VALUE rb_ensure(VALUE(*)(ANYARGS),VALUE,VALUE(*)(ANYARGS),VALUE);
-VALUE rb_catch(const char*,VALUE(*)(ANYARGS),VALUE);
-VALUE rb_catch_obj(VALUE,VALUE(*)(ANYARGS),VALUE);
-NORETURN(void rb_throw(const char*,VALUE));
-NORETURN(void rb_throw_obj(VALUE,VALUE));
-
-VALUE rb_require(const char*);
-
-#ifdef __ia64
-void ruby_init_stack(volatile VALUE*, void*);
-#define ruby_init_stack(addr) ruby_init_stack(addr, rb_ia64_bsp())
-#else
-void ruby_init_stack(volatile VALUE*);
-#endif
-#define RUBY_INIT_STACK \
- VALUE variable_in_this_stack_frame; \
- ruby_init_stack(&variable_in_this_stack_frame);
-void ruby_init(void);
-void *ruby_options(int, char**);
-int ruby_run_node(void *);
-
-RUBY_EXTERN VALUE rb_mKernel;
-RUBY_EXTERN VALUE rb_mComparable;
-RUBY_EXTERN VALUE rb_mEnumerable;
-RUBY_EXTERN VALUE rb_mErrno;
-RUBY_EXTERN VALUE rb_mFileTest;
-RUBY_EXTERN VALUE rb_mGC;
-RUBY_EXTERN VALUE rb_mMath;
-RUBY_EXTERN VALUE rb_mProcess;
-RUBY_EXTERN VALUE rb_mWaitReadable;
-RUBY_EXTERN VALUE rb_mWaitWritable;
-
-RUBY_EXTERN VALUE rb_cBasicObject;
-RUBY_EXTERN VALUE rb_cObject;
-RUBY_EXTERN VALUE rb_cArray;
-RUBY_EXTERN VALUE rb_cBignum;
-RUBY_EXTERN VALUE rb_cBinding;
-RUBY_EXTERN VALUE rb_cClass;
-RUBY_EXTERN VALUE rb_cCont;
-RUBY_EXTERN VALUE rb_cDir;
-RUBY_EXTERN VALUE rb_cData;
-RUBY_EXTERN VALUE rb_cFalseClass;
-RUBY_EXTERN VALUE rb_cEncoding;
-RUBY_EXTERN VALUE rb_cEnumerator;
-RUBY_EXTERN VALUE rb_cFile;
-RUBY_EXTERN VALUE rb_cFixnum;
-RUBY_EXTERN VALUE rb_cFloat;
-RUBY_EXTERN VALUE rb_cHash;
-RUBY_EXTERN VALUE rb_cInteger;
-RUBY_EXTERN VALUE rb_cIO;
-RUBY_EXTERN VALUE rb_cMatch;
-RUBY_EXTERN VALUE rb_cMethod;
-RUBY_EXTERN VALUE rb_cModule;
-RUBY_EXTERN VALUE rb_cNameErrorMesg;
-RUBY_EXTERN VALUE rb_cNilClass;
-RUBY_EXTERN VALUE rb_cNumeric;
-RUBY_EXTERN VALUE rb_cProc;
-RUBY_EXTERN VALUE rb_cRange;
-RUBY_EXTERN VALUE rb_cRational;
-RUBY_EXTERN VALUE rb_cComplex;
-RUBY_EXTERN VALUE rb_cRegexp;
-RUBY_EXTERN VALUE rb_cStat;
-RUBY_EXTERN VALUE rb_cString;
-RUBY_EXTERN VALUE rb_cStruct;
-RUBY_EXTERN VALUE rb_cSymbol;
-RUBY_EXTERN VALUE rb_cThread;
-RUBY_EXTERN VALUE rb_cTime;
-RUBY_EXTERN VALUE rb_cTrueClass;
-RUBY_EXTERN VALUE rb_cUnboundMethod;
-
-RUBY_EXTERN VALUE rb_eException;
-RUBY_EXTERN VALUE rb_eStandardError;
-RUBY_EXTERN VALUE rb_eSystemExit;
-RUBY_EXTERN VALUE rb_eInterrupt;
-RUBY_EXTERN VALUE rb_eSignal;
-RUBY_EXTERN VALUE rb_eFatal;
-RUBY_EXTERN VALUE rb_eArgError;
-RUBY_EXTERN VALUE rb_eEOFError;
-RUBY_EXTERN VALUE rb_eIndexError;
-RUBY_EXTERN VALUE rb_eStopIteration;
-RUBY_EXTERN VALUE rb_eKeyError;
-RUBY_EXTERN VALUE rb_eRangeError;
-RUBY_EXTERN VALUE rb_eIOError;
-RUBY_EXTERN VALUE rb_eRuntimeError;
-RUBY_EXTERN VALUE rb_eSecurityError;
-RUBY_EXTERN VALUE rb_eSystemCallError;
-RUBY_EXTERN VALUE rb_eThreadError;
-RUBY_EXTERN VALUE rb_eTypeError;
-RUBY_EXTERN VALUE rb_eZeroDivError;
-RUBY_EXTERN VALUE rb_eNotImpError;
-RUBY_EXTERN VALUE rb_eNoMemError;
-RUBY_EXTERN VALUE rb_eNoMethodError;
-RUBY_EXTERN VALUE rb_eFloatDomainError;
-RUBY_EXTERN VALUE rb_eLocalJumpError;
-RUBY_EXTERN VALUE rb_eSysStackError;
-RUBY_EXTERN VALUE rb_eRegexpError;
-RUBY_EXTERN VALUE rb_eEncodingError;
-RUBY_EXTERN VALUE rb_eEncCompatError;
-
-RUBY_EXTERN VALUE rb_eScriptError;
-RUBY_EXTERN VALUE rb_eNameError;
-RUBY_EXTERN VALUE rb_eSyntaxError;
-RUBY_EXTERN VALUE rb_eLoadError;
-
-RUBY_EXTERN VALUE rb_stdin, rb_stdout, rb_stderr;
-
-static inline VALUE
-rb_class_of(VALUE obj)
-{
- if (IMMEDIATE_P(obj)) {
- if (FIXNUM_P(obj)) return rb_cFixnum;
- if (obj == Qtrue) return rb_cTrueClass;
- if (SYMBOL_P(obj)) return rb_cSymbol;
- }
- else if (!RTEST(obj)) {
- if (obj == Qnil) return rb_cNilClass;
- if (obj == Qfalse) return rb_cFalseClass;
- }
- return RBASIC(obj)->klass;
-}
-
-static inline int
-rb_type(VALUE obj)
-{
- if (IMMEDIATE_P(obj)) {
- if (FIXNUM_P(obj)) return T_FIXNUM;
- if (obj == Qtrue) return T_TRUE;
- if (SYMBOL_P(obj)) return T_SYMBOL;
- if (obj == Qundef) return T_UNDEF;
- }
- else if (!RTEST(obj)) {
- if (obj == Qnil) return T_NIL;
- if (obj == Qfalse) return T_FALSE;
- }
- return BUILTIN_TYPE(obj);
-}
-
-static inline int
-rb_special_const_p(VALUE obj)
-{
- if (SPECIAL_CONST_P(obj)) return (int)Qtrue;
- return (int)Qfalse;
-}
-
-#include "ruby/missing.h"
-#include "ruby/intern.h"
-
-#if defined(EXTLIB) && defined(USE_DLN_A_OUT)
-/* hook for external modules */
-static char *dln_libs_to_be_linked[] = { EXTLIB, 0 };
-#endif
-
-#if (defined(__APPLE__) || defined(__NeXT__)) && defined(__MACH__)
-/* to link startup code with ObjC support */
-#define RUBY_GLOBAL_SETUP static void objcdummyfunction(void) {objc_msgSend();}
-#else
-#define RUBY_GLOBAL_SETUP
-#endif
-
-void ruby_sysinit(int *, char ***);
-
-#define RUBY_VM 1 /* YARV */
-#define HAVE_NATIVETHREAD
-int ruby_native_thread_p(void);
-
-#define RUBY_EVENT_NONE 0x0000
-#define RUBY_EVENT_LINE 0x0001
-#define RUBY_EVENT_CLASS 0x0002
-#define RUBY_EVENT_END 0x0004
-#define RUBY_EVENT_CALL 0x0008
-#define RUBY_EVENT_RETURN 0x0010
-#define RUBY_EVENT_C_CALL 0x0020
-#define RUBY_EVENT_C_RETURN 0x0040
-#define RUBY_EVENT_RAISE 0x0080
-#define RUBY_EVENT_ALL 0xffff
-#define RUBY_EVENT_VM 0x10000
-#define RUBY_EVENT_SWITCH 0x20000
-#define RUBY_EVENT_COVERAGE 0x40000
-
-typedef unsigned int rb_event_flag_t;
-typedef void (*rb_event_hook_func_t)(rb_event_flag_t, VALUE data, VALUE, ID, VALUE klass);
-
-typedef struct rb_event_hook_struct {
- rb_event_flag_t flag;
- rb_event_hook_func_t func;
- VALUE data;
- struct rb_event_hook_struct *next;
-} rb_event_hook_t;
-
-#define RB_EVENT_HOOKS_HAVE_CALLBACK_DATA 1
-void rb_add_event_hook(rb_event_hook_func_t func, rb_event_flag_t events,
- VALUE data);
-int rb_remove_event_hook(rb_event_hook_func_t func);
-
-/* locale insensitive functions */
-
-#define rb_isascii(c) ((unsigned long)(c) < 128)
-int rb_isalnum(int c);
-int rb_isalpha(int c);
-int rb_isblank(int c);
-int rb_iscntrl(int c);
-int rb_isdigit(int c);
-int rb_isgraph(int c);
-int rb_islower(int c);
-int rb_isprint(int c);
-int rb_ispunct(int c);
-int rb_isspace(int c);
-int rb_isupper(int c);
-int rb_isxdigit(int c);
-int rb_tolower(int c);
-int rb_toupper(int c);
-
-#ifndef ISPRINT
-#define ISASCII(c) rb_isascii((unsigned char)(c))
-#undef ISPRINT
-#define ISPRINT(c) rb_isprint((unsigned char)(c))
-#define ISSPACE(c) rb_isspace((unsigned char)(c))
-#define ISUPPER(c) rb_isupper((unsigned char)(c))
-#define ISLOWER(c) rb_islower((unsigned char)(c))
-#define ISALNUM(c) rb_isalnum((unsigned char)(c))
-#define ISALPHA(c) rb_isalpha((unsigned char)(c))
-#define ISDIGIT(c) rb_isdigit((unsigned char)(c))
-#define ISXDIGIT(c) rb_isxdigit((unsigned char)(c))
-#endif
-#define TOUPPER(c) rb_toupper((unsigned char)(c))
-#define TOLOWER(c) rb_tolower((unsigned char)(c))
-
-int st_strcasecmp(const char *s1, const char *s2);
-int st_strncasecmp(const char *s1, const char *s2, size_t n);
-#define STRCASECMP(s1, s2) (st_strcasecmp(s1, s2))
-#define STRNCASECMP(s1, s2, n) (st_strncasecmp(s1, s2, n))
-
-unsigned long ruby_strtoul(const char *str, char **endptr, int base);
-#define STRTOUL(str, endptr, base) (ruby_strtoul(str, endptr, base))
-
-#if defined(__cplusplus)
-#if 0
-{ /* satisfy cc-mode */
-#endif
-} /* extern "C" { */
-#endif
-#endif /* RUBY_RUBY_H */
diff --git a/include/ruby/st.h b/include/ruby/st.h
deleted file mode 100644
index aebdaf569d..0000000000
--- a/include/ruby/st.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/* This is a public domain general purpose hash table package written by Peter Moore @ UCB. */
-
-/* @(#) st.h 5.1 89/12/14 */
-
-#ifndef RUBY_ST_H
-#define RUBY_ST_H 1
-
-#if defined(__cplusplus)
-extern "C" {
-#if 0
-} /* satisfy cc-mode */
-#endif
-#endif
-
-#ifndef RUBY_LIB
-#include "ruby/config.h"
-#include "ruby/defines.h"
-#ifdef RUBY_EXTCONF_H
-#include RUBY_EXTCONF_H
-#endif
-#endif
-
-#if defined STDC_HEADERS
-#include <stddef.h>
-#elif defined HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-
-#if SIZEOF_LONG == SIZEOF_VOIDP
-typedef unsigned long st_data_t;
-#elif SIZEOF_LONG_LONG == SIZEOF_VOIDP
-typedef unsigned LONG_LONG st_data_t;
-#else
-# error ---->> st.c requires sizeof(void*) == sizeof(long) to be compiled. <<----
-#endif
-#define ST_DATA_T_DEFINED
-
-#ifndef CHAR_BIT
-# ifdef HAVE_LIMITS_H
-# include <limits.h>
-# else
-# define CHAR_BIT 8
-# endif
-#endif
-#ifndef _
-# define _(args) args
-#endif
-#ifndef ANYARGS
-# ifdef __cplusplus
-# define ANYARGS ...
-# else
-# define ANYARGS
-# endif
-#endif
-
-typedef struct st_table st_table;
-
-typedef int st_compare_func(st_data_t, st_data_t);
-typedef int st_hash_func(st_data_t);
-
-struct st_hash_type {
- int (*compare)(ANYARGS /*st_data_t, st_data_t*/); /* st_compare_func* */
- int (*hash)(ANYARGS /*st_data_t*/); /* st_hash_func* */
-};
-
-typedef st_data_t st_index_t;
-#define ST_INDEX_BITS (sizeof(st_index_t) * CHAR_BIT)
-
-struct st_table {
- const struct st_hash_type *type;
- st_index_t num_bins;
- unsigned int entries_packed : 1;
-#ifdef __GNUC__
- __extension__
-#endif
- st_index_t num_entries : ST_INDEX_BITS - 1;
- struct st_table_entry **bins;
- struct st_table_entry *head, *tail;
-};
-
-#define st_is_member(table,key) st_lookup(table,key,(st_data_t *)0)
-
-enum st_retval {ST_CONTINUE, ST_STOP, ST_DELETE, ST_CHECK};
-
-st_table *st_init_table(const struct st_hash_type *);
-st_table *st_init_table_with_size(const struct st_hash_type *, int);
-st_table *st_init_numtable(void);
-st_table *st_init_numtable_with_size(int);
-st_table *st_init_strtable(void);
-st_table *st_init_strtable_with_size(int);
-st_table *st_init_strcasetable(void);
-st_table *st_init_strcasetable_with_size(int);
-int st_delete(st_table *, st_data_t *, st_data_t *); /* returns 0:notfound 1:deleted */
-int st_delete_safe(st_table *, st_data_t *, st_data_t *, st_data_t);
-int st_insert(st_table *, st_data_t, st_data_t);
-int st_insert2(st_table *, st_data_t, st_data_t, st_data_t (*)(st_data_t));
-int st_lookup(st_table *, st_data_t, st_data_t *);
-int st_get_key(st_table *, st_data_t, st_data_t *);
-int st_foreach(st_table *, int (*)(ANYARGS), st_data_t);
-int st_reverse_foreach(st_table *, int (*)(ANYARGS), st_data_t);
-void st_add_direct(st_table *, st_data_t, st_data_t);
-void st_free_table(st_table *);
-void st_cleanup_safe(st_table *, st_data_t);
-void st_clear(st_table *);
-st_table *st_copy(st_table *);
-int st_numcmp(st_data_t, st_data_t);
-int st_numhash(st_data_t);
-int st_strcasecmp(const char *s1, const char *s2);
-int st_strncasecmp(const char *s1, const char *s2, size_t n);
-size_t st_memsize(st_table *);
-
-#if defined(__cplusplus)
-#if 0
-{ /* satisfy cc-mode */
-#endif
-} /* extern "C" { */
-#endif
-
-#endif /* RUBY_ST_H */
diff --git a/include/ruby/util.h b/include/ruby/util.h
deleted file mode 100644
index 1c52c576da..0000000000
--- a/include/ruby/util.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/**********************************************************************
-
- util.h -
-
- $Author$
- created at: Thu Mar 9 11:55:53 JST 1995
-
- Copyright (C) 1993-2007 Yukihiro Matsumoto
-
-**********************************************************************/
-
-#ifndef RUBY_UTIL_H
-#define RUBY_UTIL_H 1
-
-#if defined(__cplusplus)
-extern "C" {
-#if 0
-} /* satisfy cc-mode */
-#endif
-#endif
-
-#ifndef _
-#ifdef __cplusplus
-# ifndef HAVE_PROTOTYPES
-# define HAVE_PROTOTYPES 1
-# endif
-# ifndef HAVE_STDARG_PROTOTYPES
-# define HAVE_STDARG_PROTOTYPES 1
-# endif
-#endif
-#ifdef HAVE_PROTOTYPES
-# define _(args) args
-#else
-# define _(args) ()
-#endif
-#ifdef HAVE_STDARG_PROTOTYPES
-# define __(args) args
-#else
-# define __(args) ()
-#endif
-#endif
-
-#define scan_oct(s,l,e) (int)ruby_scan_oct(s,l,e)
-unsigned long ruby_scan_oct(const char *, size_t, size_t *);
-#define scan_hex(s,l,e) (int)ruby_scan_hex(s,l,e)
-unsigned long ruby_scan_hex(const char *, size_t, size_t *);
-
-#if defined(__CYGWIN32__) || defined(_WIN32)
-void ruby_add_suffix(VALUE str, const char *suffix);
-#endif
-
-void ruby_qsort(void *, const size_t, const size_t,
- int (*)(const void *, const void *, void *), void *);
-
-void ruby_setenv(const char *, const char *);
-void ruby_unsetenv(const char *);
-#undef setenv
-#undef unsetenv
-#define setenv(name,val) ruby_setenv(name,val)
-#define unsetenv(name,val) ruby_unsetenv(name);
-
-char *ruby_strdup(const char *);
-#undef strdup
-#define strdup(s) ruby_strdup(s)
-
-char *ruby_getcwd(void);
-#define my_getcwd() ruby_getcwd()
-
-double ruby_strtod(const char *, char **);
-#undef strtod
-#define strtod(s,e) ruby_strtod(s,e)
-
-#if defined _MSC_VER && _MSC_VER >= 1300
-#pragma warning(push)
-#pragma warning(disable:4723)
-#endif
-static inline double
-ruby_div0(double x)
-{
- double t = 0.0;
- return x / t;
-}
-#if defined _MSC_VER && _MSC_VER >= 1300
-#pragma warning(pop)
-#endif
-
-void ruby_each_words(const char *, void (*)(const char*, int, void*), void *);
-
-#if defined(__cplusplus)
-#if 0
-{ /* satisfy cc-mode */
-#endif
-} /* extern "C" { */
-#endif
-
-#endif /* RUBY_UTIL_H */
diff --git a/include/ruby/version.h b/include/ruby/version.h
deleted file mode 100644
index 32b09b3f52..0000000000
--- a/include/ruby/version.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/**********************************************************************
-
- ruby/version.h -
-
- $Author$
- created at: Wed May 13 12:56:56 JST 2009
-
- Copyright (C) 1993-2009 Yukihiro Matsumoto
- Copyright (C) 2000 Network Applied Communication Laboratory, Inc.
- Copyright (C) 2000 Information-technology Promotion Agency, Japan
-
-**********************************************************************/
-
-/*
- * This file contains only
- * - never-changable informations, and
- * - interfaces accessible from extension libraries.
- *
- * Never try to check RUBY_VERSION_CODE etc in extension libraries,
- * check the features with mkmf.rb instead.
- */
-
-#ifndef RUBY_VERSION_H
-#define RUBY_VERSION_H 1
-
-/* The origin. */
-#define RUBY_AUTHOR "Yukihiro Matsumoto"
-#define RUBY_BIRTH_YEAR 1993
-#define RUBY_BIRTH_MONTH 2
-#define RUBY_BIRTH_DAY 24
-
-#ifdef RUBY_EXTERN
-#if defined(__cplusplus)
-extern "C" {
-#if 0
-} /* satisfy cc-mode */
-#endif
-#endif
-/*
- * Interfaces from extension libraries.
- *
- * Before using these infos, think thrice whether they are really
- * necessary or not, and if the answer was yes, think twice a week
- * later again.
- */
-RUBY_EXTERN const char ruby_version[];
-RUBY_EXTERN const char ruby_release_date[];
-RUBY_EXTERN const char ruby_platform[];
-RUBY_EXTERN const int ruby_patchlevel;
-RUBY_EXTERN const char ruby_description[];
-RUBY_EXTERN const char ruby_copyright[];
-RUBY_EXTERN const char ruby_engine[];
-#if defined(__cplusplus)
-#if 0
-{ /* satisfy cc-mode */
-#endif
-} /* extern "C" { */
-#endif
-#endif
-
-#endif
diff --git a/include/ruby/vm.h b/include/ruby/vm.h
deleted file mode 100644
index 6843469735..0000000000
--- a/include/ruby/vm.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/**********************************************************************
-
- ruby/vm.h -
-
- $Author$
- created at: Sat May 31 15:17:36 2008
-
- Copyright (C) 2008 Yukihiro Matsumoto
-
-**********************************************************************/
-
-#ifndef RUBY_VM_H
-#define RUBY_VM_H 1
-
-/* Place holder.
- *
- * We will prepare VM creation/control APIs on 1.9.2 or later.
- * If you have an interest about it, please see mvm branch.
- * http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/mvm/
- */
-
-#endif /* RUBY_VM_H */
diff --git a/include/ruby/win32.h b/include/ruby/win32.h
deleted file mode 100644
index d468bb2664..0000000000
--- a/include/ruby/win32.h
+++ /dev/null
@@ -1,580 +0,0 @@
-#ifndef RUBY_WIN32_H
-#define RUBY_WIN32_H 1
-
-#if defined(__cplusplus)
-extern "C" {
-#if 0
-} /* satisfy cc-mode */
-#endif
-#endif
-
-/*
- * Copyright (c) 1993, Intergraph Corporation
- *
- * You may distribute under the terms of either the GNU General Public
- * License or the Artistic License, as specified in the perl README file.
- *
- */
-
-//
-// Definitions for NT port of Perl
-//
-
-
-//
-// Ok now we can include the normal include files.
-//
-
-// #include <stdarg.h> conflict with varargs.h?
-#if !defined(WSAAPI)
-#if defined(__cplusplus) && defined(_MSC_VER)
-extern "C++" { /* template without extern "C++" */
-#endif
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#if defined(__cplusplus) && defined(_MSC_VER)
-}
-#endif
-#endif
-
-#define NT 1 /* deprecated */
-
-//
-// We're not using Microsoft's "extensions" to C for
-// Structured Exception Handling (SEH) so we can nuke these
-//
-#undef try
-#undef except
-#undef finally
-#undef leave
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <direct.h>
-#include <process.h>
-#include <time.h>
-#if defined(__cplusplus) && defined(_MSC_VER) && _MSC_VER == 1200
-extern "C++" { /* template without extern "C++" */
-#endif
-#include <math.h>
-#if defined(__cplusplus) && defined(_MSC_VER) && _MSC_VER == 1200
-}
-#endif
-#include <signal.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#ifdef HAVE_SYS_UTIME_H
-# include <sys/utime.h>
-#else
-# include <utime.h>
-#endif
-#include <io.h>
-#include <malloc.h>
-#if defined __MINGW32__ || __BORLANDC__ >= 0x0580
-# include <stdint.h>
-#else
-# if !defined(_INTPTR_T_DEFINED)
-# ifdef _WIN64
-typedef __int64 intptr_t;
-# else
-typedef int intptr_t;
-# endif
-# define _INTPTR_T_DEFINED
-# endif
-# if !defined(_UINTPTR_T_DEFINED)
-# ifdef _WIN64
-typedef unsigned __int64 uintptr_t;
-# else
-typedef unsigned int uintptr_t;
-# endif
-# define _UINTPTR_T_DEFINED
-# endif
-#endif
-#ifndef __MINGW32__
-# define mode_t int
-#endif
-
-#ifdef WIN95
-extern DWORD rb_w32_osid(void);
-#define rb_w32_iswinnt() (rb_w32_osid() == VER_PLATFORM_WIN32_NT)
-#define rb_w32_iswin95() (rb_w32_osid() == VER_PLATFORM_WIN32_WINDOWS)
-#else
-#define rb_w32_iswinnt() TRUE
-#define rb_w32_iswin95() FALSE
-#endif
-
-#define WNOHANG -1
-
-#undef getc
-#undef putc
-#undef fgetc
-#undef fputc
-#undef getchar
-#undef putchar
-#undef fgetchar
-#undef fputchar
-#undef utime
-#undef lseek
-#undef fstat
-#define getc(_stream) rb_w32_getc(_stream)
-#define getchar() rb_w32_getc(stdin)
-#define putc(_c, _stream) rb_w32_putc(_c, _stream)
-#define putchar(_c) rb_w32_putc(_c, stdout)
-#ifdef RUBY_EXPORT
-#define fgetc(_stream) getc(_stream)
-#define fputc(_c, _stream) putc(_c, _stream)
-#define fgetchar() getchar()
-#define fputchar(_c) putchar(_c)
-#define utime(_p, _t) rb_w32_utime(_p, _t)
-#define lseek(_f, _o, _w) _lseeki64(_f, _o, _w)
-
-#define pipe(p) rb_w32_pipe(p)
-#define open rb_w32_open
-#define close(h) rb_w32_close(h)
-#define fclose(f) rb_w32_fclose(f)
-#define read(f, b, s) rb_w32_read(f, b, s)
-#define write(f, b, s) rb_w32_write(f, b, s)
-#define getpid() rb_w32_getpid()
-#define getppid() rb_w32_getppid()
-#define sleep(x) rb_w32_Sleep((x)*1000)
-#define Sleep(msec) (void)rb_w32_Sleep(msec)
-#define fstat(fd,st) _fstati64(fd,st)
-#ifdef __BORLANDC__
-#define creat(p, m) _creat(p, m)
-#define eof() _eof()
-#define filelength(h) _filelength(h)
-#define mktemp(t) _mktemp(t)
-#define tell(h) _tell(h)
-#define _open _sopen
-#define sopen _sopen
-#define _fstati64(fd,st) rb_w32_fstati64(fd,st)
-#undef fopen
-#define fopen(p, m) rb_w32_fopen(p, m)
-#undef fdopen
-#define fdopen(h, m) rb_w32_fdopen(h, m)
-#undef fsopen
-#define fsopen(p, m, sh) rb_w32_fsopen(p, m, sh)
-#endif
-
-#undef execv
-#define execv(path,argv) rb_w32_aspawn(P_OVERLAY,path,argv)
-#if !defined(__BORLANDC__)
-#undef isatty
-#define isatty(h) rb_w32_isatty(h)
-#endif
-
-#undef mkdir
-#define mkdir(p, m) rb_w32_mkdir(p, m)
-#undef rmdir
-#define rmdir(p) rb_w32_rmdir(p)
-#undef unlink
-#define unlink(p) rb_w32_unlink(p)
-#endif
-
-#if SIZEOF_OFF_T == 8
-#define off_t __int64
-#define stat stati64
-#if defined(__BORLANDC__)
-#define stati64(path, st) rb_w32_stati64(path, st)
-#elif !defined(_MSC_VER) || _MSC_VER < 1400
-#define stati64 _stati64
-#define _stati64(path, st) rb_w32_stati64(path, st)
-#else
-#define stati64 _stat64
-#define _stat64(path, st) rb_w32_stati64(path, st)
-#endif
-#else
-#define stat(path,st) rb_w32_stat(path,st)
-#define fstat(fd,st) rb_w32_fstat(fd,st)
-extern int rb_w32_stat(const char *, struct stat *);
-extern int rb_w32_fstat(int, struct stat *);
-#endif
-
-#define strcasecmp _stricmp
-#define strncasecmp _strnicmp
-#define fsync _commit
-
-#ifdef __MINGW32__
-struct timezone {
- int tz_minuteswest;
- int tz_dsttime;
-};
-#undef isascii
-#define isascii __isascii
-#endif
-
-struct iovec {
- void *iov_base;
- size_t iov_len;
-};
-struct msghdr {
- void *msg_name;
- int msg_namelen;
- struct iovec *msg_iov;
- int msg_iovlen;
- void *msg_control;
- int msg_controllen;
- int msg_flags;
-};
-
-#define NtInitialize ruby_sysinit
-extern int rb_w32_cmdvector(const char *, char ***);
-extern rb_pid_t rb_w32_pipe_exec(const char *, const char *, int, int *, int *);
-extern int flock(int fd, int oper);
-extern int rb_w32_is_socket(int);
-extern int WSAAPI rb_w32_accept(int, struct sockaddr *, int *);
-extern int WSAAPI rb_w32_bind(int, const struct sockaddr *, int);
-extern int WSAAPI rb_w32_connect(int, const struct sockaddr *, int);
-extern void rb_w32_fdset(int, fd_set*);
-extern void rb_w32_fdclr(int, fd_set*);
-extern int rb_w32_fdisset(int, fd_set*);
-extern int WSAAPI rb_w32_select(int, fd_set *, fd_set *, fd_set *, struct timeval *);
-extern int WSAAPI rb_w32_getpeername(int, struct sockaddr *, int *);
-extern int WSAAPI rb_w32_getsockname(int, struct sockaddr *, int *);
-extern int WSAAPI rb_w32_getsockopt(int, int, int, char *, int *);
-extern int WSAAPI rb_w32_ioctlsocket(int, long, u_long *);
-extern int WSAAPI rb_w32_listen(int, int);
-extern int WSAAPI rb_w32_recv(int, char *, int, int);
-extern int WSAAPI rb_w32_recvfrom(int, char *, int, int, struct sockaddr *, int *);
-extern int WSAAPI rb_w32_send(int, const char *, int, int);
-extern int WSAAPI rb_w32_sendto(int, const char *, int, int, const struct sockaddr *, int);
-extern int recvmsg(int, struct msghdr *, int);
-extern int sendmsg(int, const struct msghdr *, int);
-extern int WSAAPI rb_w32_setsockopt(int, int, int, const char *, int);
-extern int WSAAPI rb_w32_shutdown(int, int);
-extern int WSAAPI rb_w32_socket(int, int, int);
-extern SOCKET rb_w32_get_osfhandle(int);
-extern struct hostent *WSAAPI rb_w32_gethostbyaddr(const char *, int, int);
-extern struct hostent *WSAAPI rb_w32_gethostbyname(const char *);
-extern int WSAAPI rb_w32_gethostname(char *, int);
-extern struct protoent *WSAAPI rb_w32_getprotobyname(const char *);
-extern struct protoent *WSAAPI rb_w32_getprotobynumber(int);
-extern struct servent *WSAAPI rb_w32_getservbyname(const char *, const char *);
-extern struct servent *WSAAPI rb_w32_getservbyport(int, const char *);
-extern int rb_w32_socketpair(int, int, int, int *);
-extern char * rb_w32_getcwd(char *, int);
-extern char * rb_w32_getenv(const char *);
-extern int rb_w32_rename(const char *, const char *);
-extern char **rb_w32_get_environ(void);
-extern void rb_w32_free_environ(char **);
-extern int rb_w32_map_errno(DWORD);
-
-extern int chown(const char *, int, int);
-extern int link(const char *, const char *);
-extern int gettimeofday(struct timeval *, struct timezone *);
-extern rb_pid_t waitpid (rb_pid_t, int *, int);
-extern rb_pid_t rb_w32_spawn(int, const char *, const char*);
-extern rb_pid_t rb_w32_aspawn(int, const char *, char *const *);
-extern int kill(int, int);
-extern int fcntl(int, int, ...);
-extern rb_pid_t rb_w32_getpid(void);
-extern rb_pid_t rb_w32_getppid(void);
-#if !defined(__BORLANDC__)
-extern int rb_w32_isatty(int);
-#endif
-extern int rb_w32_mkdir(const char *, int);
-extern int rb_w32_rmdir(const char *);
-extern int rb_w32_unlink(const char *);
-extern int rb_w32_stati64(const char *, struct stati64 *);
-
-#ifdef __BORLANDC__
-extern int rb_w32_fstati64(int, struct stati64 *);
-extern off_t _lseeki64(int, off_t, int);
-extern FILE *rb_w32_fopen(const char *, const char *);
-extern FILE *rb_w32_fdopen(int, const char *);
-extern FILE *rb_w32_fsopen(const char *, const char *, int);
-#endif
-
-#include <float.h>
-#if !defined __MINGW32__ || defined __NO_ISOCEXT
-#ifndef isnan
-#define isnan(x) _isnan(x)
-#endif
-#ifndef finite
-#define finite(x) _finite(x)
-#endif
-#ifndef copysign
-#define copysign(a, b) _copysign(a, b)
-#endif
-#ifndef scalb
-#define scalb(a, b) _scalb(a, b)
-#endif
-#endif
-
-#if !defined S_IFIFO && defined _S_IFIFO
-#define S_IFIFO _S_IFIFO
-#endif
-
-#if 0 && defined __BORLANDC__
-#undef S_ISDIR
-#undef S_ISFIFO
-#undef S_ISBLK
-#undef S_ISCHR
-#undef S_ISREG
-#define S_ISDIR(m) (((unsigned short)(m) & S_IFMT) == S_IFDIR)
-#define S_ISFIFO(m) (((unsigned short)(m) & S_IFMT) == S_IFIFO)
-#define S_ISBLK(m) (((unsigned short)(m) & S_IFMT) == S_IFBLK)
-#define S_ISCHR(m) (((unsigned short)(m) & S_IFMT) == S_IFCHR)
-#define S_ISREG(m) (((unsigned short)(m) & S_IFMT) == S_IFREG)
-#endif
-
-#if !defined S_IRUSR && !defined __MINGW32__
-#define S_IRUSR 0400
-#endif
-#ifndef S_IRGRP
-#define S_IRGRP 0040
-#endif
-#ifndef S_IROTH
-#define S_IROTH 0004
-#endif
-
-#if !defined S_IWUSR && !defined __MINGW32__
-#define S_IWUSR 0200
-#endif
-#ifndef S_IWGRP
-#define S_IWGRP 0020
-#endif
-#ifndef S_IWOTH
-#define S_IWOTH 0002
-#endif
-
-#if !defined S_IXUSR && !defined __MINGW32__
-#define S_IXUSR 0100
-#endif
-#ifndef S_IXGRP
-#define S_IXGRP 0010
-#endif
-#ifndef S_IXOTH
-#define S_IXOTH 0001
-#endif
-
-//
-// define this so we can do inplace editing
-//
-
-#define SUFFIX
-extern int truncate(const char *path, off_t length);
-extern int ftruncate(int fd, off_t length);
-extern int fseeko(FILE *stream, off_t offset, int whence);
-extern off_t ftello(FILE *stream);
-
-//
-// stubs
-//
-extern int ioctl (int, int, ...);
-extern rb_uid_t getuid (void);
-extern rb_uid_t geteuid (void);
-extern rb_gid_t getgid (void);
-extern rb_gid_t getegid (void);
-extern int setuid (rb_uid_t);
-extern int setgid (rb_gid_t);
-
-extern char *rb_w32_strerror(int);
-
-#ifdef RUBY_EXPORT
-#define strerror(e) rb_w32_strerror(e)
-#endif
-
-#define PIPE_BUF 1024
-
-#define LOCK_SH 1
-#define LOCK_EX 2
-#define LOCK_NB 4
-#define LOCK_UN 8
-
-
-#ifndef SIGINT
-#define SIGINT 2
-#endif
-#ifndef SIGKILL
-#define SIGKILL 9
-#endif
-
-
-/* #undef va_start */
-/* #undef va_end */
-
-/* winsock error map */
-#define EWOULDBLOCK WSAEWOULDBLOCK
-#define EINPROGRESS WSAEINPROGRESS
-#define EALREADY WSAEALREADY
-#define ENOTSOCK WSAENOTSOCK
-#define EDESTADDRREQ WSAEDESTADDRREQ
-#define EMSGSIZE WSAEMSGSIZE
-#define EPROTOTYPE WSAEPROTOTYPE
-#define ENOPROTOOPT WSAENOPROTOOPT
-#define EPROTONOSUPPORT WSAEPROTONOSUPPORT
-#define ESOCKTNOSUPPORT WSAESOCKTNOSUPPORT
-#define EOPNOTSUPP WSAEOPNOTSUPP
-#define EPFNOSUPPORT WSAEPFNOSUPPORT
-#define EAFNOSUPPORT WSAEAFNOSUPPORT
-#define EADDRINUSE WSAEADDRINUSE
-#define EADDRNOTAVAIL WSAEADDRNOTAVAIL
-#define ENETDOWN WSAENETDOWN
-#define ENETUNREACH WSAENETUNREACH
-#define ENETRESET WSAENETRESET
-#define ECONNABORTED WSAECONNABORTED
-#define ECONNRESET WSAECONNRESET
-#define ENOBUFS WSAENOBUFS
-#define EISCONN WSAEISCONN
-#define ENOTCONN WSAENOTCONN
-#define ESHUTDOWN WSAESHUTDOWN
-#define ETOOMANYREFS WSAETOOMANYREFS
-#define ETIMEDOUT WSAETIMEDOUT
-#define ECONNREFUSED WSAECONNREFUSED
-#define ELOOP WSAELOOP
-/*#define ENAMETOOLONG WSAENAMETOOLONG*/
-#define EHOSTDOWN WSAEHOSTDOWN
-#define EHOSTUNREACH WSAEHOSTUNREACH
-/*#define ENOTEMPTY WSAENOTEMPTY*/
-#define EPROCLIM WSAEPROCLIM
-#define EUSERS WSAEUSERS
-#define EDQUOT WSAEDQUOT
-#define ESTALE WSAESTALE
-#define EREMOTE WSAEREMOTE
-
-#define F_SETFL 1
-#define O_NONBLOCK 1
-
-#undef FD_SET
-#define FD_SET(f, s) rb_w32_fdset(f, s)
-
-#undef FD_CLR
-#define FD_CLR(f, s) rb_w32_fdclr(f, s)
-
-#undef FD_ISSET
-#define FD_ISSET(f, s) rb_w32_fdisset(f, s)
-
-#ifdef RUBY_EXPORT
-#undef accept
-#define accept(s, a, l) rb_w32_accept(s, a, l)
-
-#undef bind
-#define bind(s, a, l) rb_w32_bind(s, a, l)
-
-#undef connect
-#define connect(s, a, l) rb_w32_connect(s, a, l)
-
-#undef select
-#define select(n, r, w, e, t) rb_w32_select(n, r, w, e, t)
-
-#undef getpeername
-#define getpeername(s, a, l) rb_w32_getpeername(s, a, l)
-
-#undef getsockname
-#define getsockname(s, a, l) rb_w32_getsockname(s, a, l)
-
-#undef getsockopt
-#define getsockopt(s, v, n, o, l) rb_w32_getsockopt(s, v, n, o, l)
-
-#undef ioctlsocket
-#define ioctlsocket(s, c, a) rb_w32_ioctlsocket(s, c, a)
-
-#undef listen
-#define listen(s, b) rb_w32_listen(s, b)
-
-#undef recv
-#define recv(s, b, l, f) rb_w32_recv(s, b, l, f)
-
-#undef recvfrom
-#define recvfrom(s, b, l, f, fr, frl) rb_w32_recvfrom(s, b, l, f, fr, frl)
-
-#undef send
-#define send(s, b, l, f) rb_w32_send(s, b, l, f)
-
-#undef sendto
-#define sendto(s, b, l, f, t, tl) rb_w32_sendto(s, b, l, f, t, tl)
-
-#undef setsockopt
-#define setsockopt(s, v, n, o, l) rb_w32_setsockopt(s, v, n, o, l)
-
-#undef shutdown
-#define shutdown(s, h) rb_w32_shutdown(s, h)
-
-#undef socket
-#define socket(s, t, p) rb_w32_socket(s, t, p)
-
-#undef gethostbyaddr
-#define gethostbyaddr(a, l, t) rb_w32_gethostbyaddr(a, l, t)
-
-#undef gethostbyname
-#define gethostbyname(n) rb_w32_gethostbyname(n)
-
-#undef gethostname
-#define gethostname(n, l) rb_w32_gethostname(n, l)
-
-#undef getprotobyname
-#define getprotobyname(n) rb_w32_getprotobyname(n)
-
-#undef getprotobynumber
-#define getprotobynumber(n) rb_w32_getprotobynumber(n)
-
-#undef getservbyname
-#define getservbyname(n, p) rb_w32_getservbyname(n, p)
-
-#undef getservbyport
-#define getservbyport(p, pr) rb_w32_getservbyport(p, pr)
-
-#undef socketpair
-#define socketpair(a, t, p, s) rb_w32_socketpair(a, t, p, s)
-
-#undef get_osfhandle
-#define get_osfhandle(h) rb_w32_get_osfhandle(h)
-
-#undef getcwd
-#define getcwd(b, s) rb_w32_getcwd(b, s)
-
-#undef getenv
-#define getenv(n) rb_w32_getenv(n)
-
-#undef rename
-#define rename(o, n) rb_w32_rename(o, n)
-
-#undef times
-#define times(t) rb_w32_times(t)
-#endif
-
-struct tms {
- long tms_utime;
- long tms_stime;
- long tms_cutime;
- long tms_cstime;
-};
-
-int rb_w32_times(struct tms *);
-
-/* thread stuff */
-HANDLE GetCurrentThreadHandle(void);
-int rb_w32_sleep(unsigned long msec);
-int rb_w32_putc(int, FILE*);
-int rb_w32_getc(FILE*);
-int rb_w32_wopen(const WCHAR *, int, ...);
-int rb_w32_open(const char *, int, ...);
-int rb_w32_close(int);
-int rb_w32_fclose(FILE*);
-int rb_w32_pipe(int[2]);
-size_t rb_w32_read(int, void *, size_t);
-size_t rb_w32_write(int, const void *, size_t);
-int rb_w32_utime(const char *, const struct utimbuf *);
-int WINAPI rb_w32_Sleep(unsigned long msec);
-int rb_w32_wait_events_blocking(HANDLE *events, int num, DWORD timeout);
-
-/*
-== ***CAUTION***
-Since this function is very dangerous, ((*NEVER*))
-* lock any HANDLEs(i.e. Mutex, Semaphore, CriticalSection and so on) or,
-* use anything like TRAP_BEG...TRAP_END block structure,
-in asynchronous_func_t.
-*/
-typedef uintptr_t (*asynchronous_func_t)(uintptr_t self, int argc, uintptr_t* argv);
-uintptr_t rb_w32_asynchronize(asynchronous_func_t func, uintptr_t self, int argc, uintptr_t* argv, uintptr_t intrval);
-
-#if defined(__cplusplus)
-#if 0
-{ /* satisfy cc-mode */
-#endif
-} /* extern "C" { */
-#endif
-
-#endif /* RUBY_WIN32_H */
diff --git a/inits.c b/inits.c
index 6fb7463c57..947bbbe242 100644
--- a/inits.c
+++ b/inits.c
@@ -3,61 +3,84 @@
inits.c -
$Author$
+ $Date$
created at: Tue Dec 28 16:01:58 JST 1993
- Copyright (C) 1993-2007 Yukihiro Matsumoto
+ Copyright (C) 1993-2003 Yukihiro Matsumoto
**********************************************************************/
-#include "ruby/ruby.h"
+#include "ruby.h"
-#define CALL(n) {void Init_##n(void); Init_##n();}
+void Init_Array _((void));
+void Init_Bignum _((void));
+void Init_Binding _((void));
+void Init_Comparable _((void));
+void Init_Dir _((void));
+void Init_Enumerable _((void));
+void Init_Enumerator _((void));
+void Init_Exception _((void));
+void Init_syserr _((void));
+void Init_eval _((void));
+void Init_load _((void));
+void Init_Proc _((void));
+void Init_Thread _((void));
+void Init_File _((void));
+void Init_GC _((void));
+void Init_Hash _((void));
+void Init_IO _((void));
+void Init_Math _((void));
+void Init_marshal _((void));
+void Init_Numeric _((void));
+void Init_Object _((void));
+void Init_pack _((void));
+void Init_Precision _((void));
+void Init_sym _((void));
+void Init_process _((void));
+void Init_Random _((void));
+void Init_Range _((void));
+void Init_Regexp _((void));
+void Init_signal _((void));
+void Init_String _((void));
+void Init_Struct _((void));
+void Init_Time _((void));
+void Init_var_tables _((void));
+void Init_version _((void));
void
-rb_call_inits(void)
+rb_call_inits()
{
- CALL(RandomSeed);
- CALL(sym);
- CALL(var_tables);
- CALL(Object);
- CALL(top_self);
- CALL(Encoding);
- CALL(Comparable);
- CALL(Enumerable);
- CALL(String);
- CALL(Exception);
- CALL(eval);
- CALL(safe);
- CALL(jump);
- CALL(Numeric);
- CALL(Bignum);
- CALL(syserr);
- CALL(Array);
- CALL(Hash);
- CALL(Struct);
- CALL(Regexp);
- CALL(pack);
- CALL(transcode);
- CALL(marshal);
- CALL(Range);
- CALL(IO);
- CALL(Dir);
- CALL(Time);
- CALL(Random);
- CALL(signal);
- CALL(process);
- CALL(load);
- CALL(Proc);
- CALL(Binding);
- CALL(Math);
- CALL(GC);
- CALL(Enumerator);
- CALL(VM);
- CALL(ISeq);
- CALL(Thread);
- CALL(Cont);
- CALL(Rational);
- CALL(Complex);
- CALL(version);
+ Init_sym();
+ Init_var_tables();
+ Init_Object();
+ Init_Comparable();
+ Init_Enumerable();
+ Init_Precision();
+ Init_eval();
+ Init_String();
+ Init_Exception();
+ Init_Thread();
+ Init_Numeric();
+ Init_Bignum();
+ Init_syserr();
+ Init_Array();
+ Init_Hash();
+ Init_Struct();
+ Init_Regexp();
+ Init_pack();
+ Init_Range();
+ Init_IO();
+ Init_Dir();
+ Init_Time();
+ Init_Random();
+ Init_signal();
+ Init_process();
+ Init_load();
+ Init_Proc();
+ Init_Binding();
+ Init_Math();
+ Init_GC();
+ Init_Enumerator();
+ Init_marshal();
+ Init_version();
}
-#undef CALL
diff --git a/insns.def b/insns.def
deleted file mode 100644
index 426f101632..0000000000
--- a/insns.def
+++ /dev/null
@@ -1,2133 +0,0 @@
-/** ##skip -*- mode:c; style:ruby -*-
- insns.def - YARV instruction definitions
-
- $Author: $
- created at: 04/01/01 01:17:55 JST
-
- Copyright (C) 2004-2007 Koichi Sasada
-*/
-
-/** ##skip
- instruction comment
- @c: category
- @e: english description
- @j: japanese description
-
- instruction form:
- DEFINE_INSN
- instrunction_name
- (instruction_operands, ..)
- (pop_values, ..)
- (return value)
- {
- .. // insn body
- }
-
- */
-
-
-/**
- @c nop
- @e nop
- @j nop
- */
-DEFINE_INSN
-nop
-()
-()
-()
-{
- /* none */
-}
-
-/**********************************************************/
-/* deal with variables */
-/**********************************************************/
-
-/**
- @c variable
- @e get local variable value (which is pointed by idx).
- @j idx ‚ÅŽw’肳‚ꂽƒ[ƒJƒ‹•Ï”‚ðƒXƒ^ƒbƒN‚É’u‚­B
- */
-DEFINE_INSN
-getlocal
-(lindex_t idx)
-()
-(VALUE val)
-{
- val = *(GET_LFP() - idx);
-}
-
-/**
- @c variable
- @e set local variable value (which is pointed by idx) as val.
- @j idx ‚ÅŽw’肳‚ꂽƒ[ƒJƒ‹•Ï”‚ð val ‚ÉÝ’è‚·‚éB
- */
-DEFINE_INSN
-setlocal
-(lindex_t idx)
-(VALUE val)
-()
-{
- (*(GET_LFP() - idx)) = val;
-}
-
-/**
- @c variable
- @e get special local variable ($~, $_, ..) value.
- @j “ÁŽê‚ȃ[ƒJƒ‹•Ï”i$~, $_, ...j‚Ì’l‚𓾂éB
- */
-DEFINE_INSN
-getspecial
-(VALUE key, rb_num_t type)
-()
-(VALUE val)
-{
- val = vm_getspecial(th, GET_LFP(), key, type);
-}
-
-/**
- @c variable
- @e set special local variable ($~, $_, ...) value as obj.
- @j “Á•ʂȃ[ƒJƒ‹•Ï”i$~, $_, ...j‚Ì’l‚ðÝ’è‚·‚éB
- */
-DEFINE_INSN
-setspecial
-(VALUE key)
-(VALUE obj)
-()
-{
- lfp_svar_set(th, GET_LFP(), key, obj);
-}
-
-/**
- @c variable
- @e get block local variable(which is pointed by idx and level).
- level means nest level of block, and specify how above this variable.
- @j level, idx ‚ÅŽw’肳‚ꂽƒuƒƒbƒNƒ[ƒJƒ‹•Ï”‚Ì’l‚ðƒXƒ^ƒbƒN‚É’u‚­B
- level ‚̓uƒƒbƒN‚̃lƒXƒgƒŒƒxƒ‹‚ÅA‰½’iã‚©‚ðŽ¦‚·B
- */
-DEFINE_INSN
-getdynamic
-(dindex_t idx, rb_num_t level)
-()
-(VALUE val)
-{
- rb_num_t i;
- VALUE *dfp2 = GET_DFP();
- for (i = 0; i < level; i++) {
- dfp2 = GET_PREV_DFP(dfp2);
- }
- val = *(dfp2 - idx);
-}
-
-/**
- @c variable
- @e set block local variable(which is pointed by 'idx') as val.
- level means nest level of block, and specify how above this variable.
- @j level, idx ‚ÅŽw’肳‚ꂽƒuƒƒbƒNƒ[ƒJƒ‹•Ï”‚Ì’l‚ð val ‚É‚·‚éB
- level ‚̓uƒƒbƒN‚̃lƒXƒgƒŒƒxƒ‹‚ÅA‰½’iã‚©‚ðŽ¦‚·B
- */
-DEFINE_INSN
-setdynamic
-(dindex_t idx, rb_num_t level)
-(VALUE val)
-()
-{
- rb_num_t i;
- VALUE *dfp2 = GET_DFP();
- for (i = 0; i < level; i++) {
- dfp2 = GET_PREV_DFP(dfp2);
- }
- *(dfp2 - idx) = val;
-}
-
-/**
- @c variable
- @e get instance variable id of obj.
- if is_local is not 0, search as class local variable.
- @j self ‚̃Cƒ“ƒXƒ^ƒ“ƒX•Ï” id ‚Ì’l‚𓾂éB
- */
-DEFINE_INSN
-getinstancevariable
-(ID id, IC ic)
-()
-(VALUE val)
-{
- val = vm_getivar(GET_SELF(), id, ic);
-}
-
-/**
- @c variable
- @e set instance variable id of obj as val.
- if is_local is not 0, search as class local variable.
- @j self ‚̃Cƒ“ƒXƒ^ƒ“ƒX•Ï” id ‚ð val ‚É‚·‚éB
- */
-DEFINE_INSN
-setinstancevariable
-(ID id, IC ic)
-(VALUE val)
-()
-{
- vm_setivar(GET_SELF(), id, val, ic);
-}
-
-/**
- @c variable
- @e get class variable id of klass as val.
- @j Œ»Ý‚̃XƒR[ƒv‚̃Nƒ‰ƒX•Ï” id ‚Ì’l‚𓾂éB
- */
-DEFINE_INSN
-getclassvariable
-(ID id)
-()
-(VALUE val)
-{
- NODE * const cref = vm_get_cref(GET_ISEQ(), GET_LFP(), GET_DFP());
- val = rb_cvar_get(vm_get_cvar_base(cref), id);
-}
-
-/**
- @c variable
- @e set class variable id of klass as val.
- @j klass ‚̃Nƒ‰ƒX•Ï” id ‚ð val ‚É‚·‚éB
- */
-DEFINE_INSN
-setclassvariable
-(ID id)
-(VALUE val)
-()
-{
- NODE * const cref = vm_get_cref(GET_ISEQ(), GET_LFP(), GET_DFP());
- rb_cvar_set(vm_get_cvar_base(cref), id, val);
-}
-
-/**
- @c variable
- @e
- get constant variable id. if klass is Qnil, constant
- are searched in current scope. if klass is Qfalse, constant as
- top level constant. otherwise, get constant under klass
- class or module.
- @j ’è” id ‚Ì’l‚𓾂éB
- klass ‚ª Qnil ‚È‚çA‚»‚̃XƒR[ƒv‚Å“¾‚ç‚ê‚é’蔂̒l‚𓾂éB
- Qfalse ‚È‚çAƒgƒbƒvƒŒƒxƒ‹ƒXƒR[ƒv‚𓾂éB
- ‚»‚êˆÈŠO‚È‚çAklass ƒNƒ‰ƒX‚̉º‚̒蔂𓾂éB
- */
-DEFINE_INSN
-getconstant
-(ID id)
-(VALUE klass)
-(VALUE val)
-{
- val = vm_get_ev_const(th, GET_ISEQ(), klass, id, 0);
-}
-
-/**
- @c variable
- @e
- set constant variable id. if klass is Qfalse, constant
- is able to access in this scope. if klass is Qnil, set
- top level constant. otherwise, set constant under klass
- class or module.
-
- @j ’è” id ‚Ì’l‚ð val ‚É‚·‚éB
- klass ‚ª Qfalse ‚È‚çA‚»‚̃XƒR[ƒv‚Å“¾‚ç‚ê‚é’è” id ‚Ì’l‚ðÝ’è‚·‚éB
- Qnil ‚È‚çAƒgƒbƒvƒŒƒxƒ‹ƒXƒR[ƒv‚Ì’l‚ðÝ’è‚·‚éB
- ‚»‚êˆÈŠO‚È‚çAklass ƒNƒ‰ƒX‚̉º‚̒蔂ðÝ’è‚·‚éB
- */
-DEFINE_INSN
-setconstant
-(ID id)
-(VALUE val, VALUE cbase)
-()
-{
- vm_check_if_namespace(cbase);
- rb_const_set(cbase, id, val);
- INC_VM_STATE_VERSION();
-}
-
-/**
- @c variable
- @e get global variable id.
- @j ƒOƒ[ƒoƒ‹•Ï” id ‚Ì’l‚𓾂éB
- */
-DEFINE_INSN
-getglobal
-(GENTRY entry)
-()
-(VALUE val)
-{
- val = GET_GLOBAL(entry);
-}
-
-/**
- @c variable
- @e set global variable id as val.
- @j ƒOƒ[ƒoƒ‹•Ï” id ‚Ì’l‚ðÝ’è‚·‚éB
- */
-DEFINE_INSN
-setglobal
-(GENTRY entry)
-(VALUE val)
-()
-{
- SET_GLOBAL(entry, val);
-}
-
-
-/**********************************************************/
-/* deal with values */
-/**********************************************************/
-
-/**
- @c put
- @e put nil to stack.
- @j ƒXƒ^ƒbƒN‚É nil ‚ðƒvƒbƒVƒ…‚·‚éB
- */
-DEFINE_INSN
-putnil
-()
-()
-(VALUE val)
-{
- val = Qnil;
-}
-
-/**
- @c put
- @e put self.
- @j ƒXƒ^ƒbƒN‚É self ‚ðƒvƒbƒVƒ…‚·‚éB
- */
-DEFINE_INSN
-putself
-()
-()
-(VALUE val)
-{
- val = GET_SELF();
-}
-
-/**
- @c put
- @e put some object.
- i.e. Fixnum, true, false, nil, and so on.
- @j ƒIƒuƒWƒFƒNƒg val ‚ðƒXƒ^ƒbƒN‚ɃvƒbƒVƒ…‚·‚éB
- i.e. Fixnum, true, false, nil, and so on.
- */
-DEFINE_INSN
-putobject
-(VALUE val)
-()
-(VALUE val)
-{
- /* */
-}
-
-/**
- @c put
- @e put special object. "value_type" is for expansion.
- @j “Á•ʂȃIƒuƒWƒFƒNƒg val ‚ðƒXƒ^ƒbƒN‚ɃvƒbƒVƒ…‚·‚éB
- ƒIƒuƒWƒFƒNƒg‚ÌŽí—Þ‚Í value_type ‚É‚æ‚éD
- */
-DEFINE_INSN
-putspecialobject
-(rb_num_t value_type)
-()
-(VALUE val)
-{
- switch (value_type) {
- case VM_SPECIAL_OBJECT_VMCORE:
- val = rb_mRubyVMFrozenCore;
- break;
- case VM_SPECIAL_OBJECT_CBASE:
- val = vm_get_cbase(GET_ISEQ(), GET_LFP(), GET_DFP());
- break;
- default:
- rb_bug("putspecialobject insn: unknown value_type");
- }
-}
-
-/**
- @c put
- @e put iseq value.
- @j put iseq value.
- */
-DEFINE_INSN
-putiseq
-(ISEQ iseq)
-()
-(VALUE ret)
-{
- ret = iseq->self;
-}
-
-/**
- @c put
- @e put string val. string will be copied.
- @j •¶Žš—ñ‚ðƒRƒs[‚µ‚ăXƒ^ƒbƒN‚ɃvƒbƒVƒ…‚·‚éB
- */
-DEFINE_INSN
-putstring
-(VALUE str)
-()
-(VALUE val)
-{
- val = rb_str_resurrect(str);
-}
-
-/**
- @c put
- @e put concatenate strings
- @j ƒXƒ^ƒbƒNƒgƒbƒv‚Ì•¶Žš—ñ‚ð n ŒÂ˜AŒ‹‚µCŒ‹‰Ê‚ðƒXƒ^ƒbƒN‚ɃvƒbƒVƒ…‚·‚éB
- */
-DEFINE_INSN
-concatstrings
-(rb_num_t num)
-(...)
-(VALUE val) // inc += 1 - num;
-{
- rb_num_t i = num;
-
- val = rb_str_new(0, 0);
- while (i-- > 0) {
- const VALUE v = TOPN(i);
- rb_str_append(val, v);
- }
- POPN(num);
-}
-
-/**
- @c put
- @e to_str
- @j to_str ‚ÌŒ‹‰Ê‚ðƒXƒ^ƒbƒN‚ɃvƒbƒVƒ…‚·‚éB
- */
-DEFINE_INSN
-tostring
-()
-(VALUE val)
-(VALUE val)
-{
- val = rb_obj_as_string(val);
-}
-
-/**
- @c put
- @e to Regexp
- @j •¶Žš—ñ str ‚ð³‹K•\Œ»‚ɃRƒ“ƒpƒCƒ‹‚µ‚ăXƒ^ƒbƒN‚ɃvƒbƒVƒ…‚·‚éB
- ƒRƒ“ƒpƒCƒ‹ŽžCopt ‚ð³‹K•\Œ»‚̃IƒvƒVƒ‡ƒ“‚Æ‚·‚éB
- */
-DEFINE_INSN
-toregexp
-(rb_num_t opt, rb_num_t cnt)
-(...)
-(VALUE val) // inc += 1 - cnt;
-{
- VALUE rb_reg_new_ary(VALUE ary, int options);
- rb_num_t i;
- const VALUE ary = rb_ary_tmp_new(cnt);
- for (i = 0; i < cnt; i++) {
- rb_ary_store(ary, cnt-i-1, TOPN(i));
- }
- POPN(cnt);
- val = rb_reg_new_ary(ary, (int)opt);
- rb_ary_clear(ary);
-}
-
-/**
- @c put
- @e put new array.
- @j V‚µ‚¢”z—ñ‚ðƒXƒ^ƒbƒNã‚Ì num ŒÂ‚Ì’l‚ʼnŠú‰»‚µ‚ͬ‚µƒvƒbƒVƒ…‚·‚éB
- */
-DEFINE_INSN
-newarray
-(rb_num_t num)
-(...)
-(VALUE val) // inc += 1 - num;
-{
- val = rb_ary_new4((long)num, STACK_ADDR_FROM_TOP(num));
- POPN(num);
-}
-
-/**
- @c put
- @e dup array
- @j ”z—ñ ary ‚ð dup ‚µ‚ăXƒ^ƒbƒN‚ɃvƒbƒVƒ…‚·‚éB
- */
-DEFINE_INSN
-duparray
-(VALUE ary)
-()
-(VALUE val)
-{
- val = rb_ary_resurrect(ary);
-}
-
-/**
- @c put
- @e expand array to num objects.
- @j ƒXƒ^ƒbƒNƒgƒbƒv‚̃IƒuƒWƒFƒNƒg‚ª”z—ñ‚Å‚ ‚ê‚ÎA‚»‚ê‚ð“WŠJ‚·‚éB
- ”z—ñƒIƒuƒWƒFƒNƒg‚Ì—v‘f”‚ª numˆÈ‰º‚È‚ç‚ÎA‘ã‚í‚è‚É nil ‚ðÏ‚ÞBnumˆÈã‚È‚çA
- numˆÈã‚Ì—v‘f‚ÍØ‚èŽÌ‚Ä‚éB
- ”z—ñƒIƒuƒWƒFƒNƒg‚łȂ¯‚ê‚ÎAnum - 1 ŒÂ‚Ì nil ‚ðÏ‚ÞB
- ‚à‚µ flag ‚ª^‚È‚çAŽc‚è—v‘f‚Ì”z—ñ‚ðÏ‚Þ
- flag: 0x01 - ÅŒã‚ð”z—ñ‚É
- flag: 0x02 - postarg —p
- flag: 0x04 - reverse?
- */
-DEFINE_INSN
-expandarray
-(rb_num_t num, rb_num_t flag)
-(..., VALUE ary)
-(...) // inc += num - 1 + (flag & 1 ? 1 : 0);
-{
- vm_expandarray(GET_CFP(), ary, num, (int)flag);
-}
-
-/**
- @c put
- @e concat two arrays
- @j “ñ‚‚̔z—ñ ary1, ary2 ‚ð˜AŒ‹‚µƒXƒ^ƒbƒN‚ÖƒvƒbƒVƒ…‚·‚éB
- */
-DEFINE_INSN
-concatarray
-()
-(VALUE ary1, VALUE ary2st)
-(VALUE ary)
-{
- const VALUE ary2 = ary2st;
- VALUE tmp1 = rb_check_convert_type(ary1, T_ARRAY, "Array", "to_a");
- VALUE tmp2 = rb_check_convert_type(ary2, T_ARRAY, "Array", "to_a");
-
- if (NIL_P(tmp1)) {
- tmp1 = rb_ary_new3(1, ary1);
- }
-
- if (NIL_P(tmp2)) {
- tmp2 = rb_ary_new3(1, ary2);
- }
-
- if (tmp1 == ary1) {
- tmp1 = rb_ary_dup(ary1);
- }
- ary = rb_ary_concat(tmp1, tmp2);
-}
-
-/**
- @c put
- @e splat array
- @j ”z—ñ ary ‚ɑ΂µ‚Ä to_a ‚ðŒÄ‚Ño‚·B
- */
-DEFINE_INSN
-splatarray
-(VALUE flag)
-(VALUE ary)
-(VALUE obj)
-{
- VALUE tmp = rb_check_convert_type(ary, T_ARRAY, "Array", "to_a");
- if (NIL_P(tmp)) {
- tmp = rb_ary_new3(1, ary);
- }
- obj = tmp;
-}
-
-/**
- @c put
- @e check value is included in ary
- @j ”z—ñ ary ‚É—v‘f obj ‚ª“ü‚Á‚Ä‚¢‚é‚©‚Ç‚¤‚©ƒ`ƒFƒbƒNBcase/when ‚Å—˜—p‚·‚éB
- */
-DEFINE_INSN
-checkincludearray
-(VALUE flag)
-(VALUE obj, VALUE ary)
-(VALUE obj, VALUE result)
-{
- int i;
- result = Qfalse;
-
- if (TYPE(ary) != T_ARRAY) {
- ary = rb_Array(ary);
- }
-
- if (flag == Qtrue) {
- /* NODE_CASE */
- for (i = 0; i < RARRAY_LEN(ary); i++) {
- /* TODO: fix me (use another method dispatch) */
- if (RTEST(rb_funcall2(RARRAY_PTR(ary)[i], idEqq, 1, &obj))) {
- result = Qtrue;
- break;
- }
- }
- }
- else {
- obj = Qfalse;
- /* NODE_WHEN */
- for (i = 0; i < RARRAY_LEN(ary); i++) {
- if (RTEST(RARRAY_PTR(ary)[i])) {
- obj = result = Qtrue;
- break;
- }
- }
- }
-}
-
-/**
- @c put
- @e put new Hash.
- @j V‚µ‚¢ƒnƒbƒVƒ…‚ðƒXƒ^ƒbƒNƒgƒbƒv‚Ì n ŒÂ‚ð‰Šú’l‚Æ‚µ‚ͬ‚·‚éB
- n ‚̓L[‚Æ’l‚̃yƒA‚Ȃ̂Š2 ‚Ì”{”‚łȂ¯‚ê‚΂Ȃç‚È‚¢B
- */
-DEFINE_INSN
-newhash
-(rb_num_t num)
-(...)
-(VALUE val) // inc += 1 - num;
-{
- int i;
- val = rb_hash_new();
-
- for (i = num; i > 0; i -= 2) {
- const VALUE v = TOPN(i - 2);
- const VALUE k = TOPN(i - 1);
- rb_hash_aset(val, k, v);
- }
- POPN(num);
-}
-
-/**
- @c put
- @e put new Range object.(Range.new(low, high, flag))
- @j Range.new(low, high, flag) ‚̂悤‚ȃIƒuƒWƒFƒNƒg‚𶬂µƒXƒ^ƒbƒN‚ɃvƒbƒVƒ…‚·‚éB
- */
-DEFINE_INSN
-newrange
-(rb_num_t flag)
-(VALUE low, VALUE high)
-(VALUE val)
-{
- val = rb_range_new(low, high, (int)flag);
-}
-
-/**********************************************************/
-/* deal with stack operation */
-/**********************************************************/
-
-/**
- @c stack
- @e pop from stack.
- @j ƒXƒ^ƒbƒN‚©‚çˆê‚ƒ|ƒbƒv‚·‚éB
- */
-DEFINE_INSN
-pop
-()
-(VALUE val)
-()
-{
- val = val;
- /* none */
-}
-
-/**
- @c stack
- @e duplicate stack top.
- @j ƒXƒ^ƒbƒNƒgƒbƒv‚ðƒRƒs[‚µ‚ăXƒ^ƒbƒN‚ɃvƒbƒVƒ…‚·‚éB
- */
-DEFINE_INSN
-dup
-()
-(VALUE val)
-(VALUE val1, VALUE val2)
-{
- val1 = val2 = val;
-}
-
-/**
- @c stack
- @e duplicate stack top n elements
- @j ƒXƒ^ƒbƒNƒgƒbƒv‚Ì n ŒÂ‚ðƒRƒs[‚µ‚ăXƒ^ƒbƒN‚ɃvƒbƒVƒ…‚·‚éB
- */
-DEFINE_INSN
-dupn
-(rb_num_t n)
-(...)
-(...) // inc += n;
-{
- rb_num_t i;
- VALUE *sp = STACK_ADDR_FROM_TOP(n);
- for (i = 0; i < n; i++) {
- GET_SP()[i] = sp[i];
- }
- INC_SP(n);
-}
-
-
-/**
- @c stack
- @e swap top 2 vals
- @j ƒXƒ^ƒbƒNƒgƒbƒv‚Ì 2 ‚‚̒l‚ðŒðŠ·‚·‚éB
- */
-DEFINE_INSN
-swap
-()
-(VALUE val, VALUE obj)
-(VALUE obj, VALUE val)
-{
- /* none */
-}
-
-/**
- @c stack
- @e for stack caching.
- @j ƒXƒ^ƒbƒNƒLƒƒƒbƒVƒ“ƒO‚Ìó‘Ô‚ð’²®‚·‚邽‚߂ɕK—v‚È–½—ßB
- */
-DEFINE_INSN
-reput
-()
-(..., VALUE val)
-(VALUE val) // inc += 0;
-{
- /* none */
-}
-
-/**
- @c stack
- @e get nth stack value from stack top
- @j ƒXƒ^ƒbƒNƒgƒbƒv‚©‚ç n ŒÂ–Ú‚ðƒXƒ^ƒbƒN‚ɃvƒbƒVƒ…‚·‚éB
- */
-DEFINE_INSN
-topn
-(rb_num_t n)
-(...)
-(VALUE val) // inc += 1;
-{
- val = TOPN(n);
-}
-
-/**
- @c stack
- @e set Nth stack entry to stack top
- @j ƒXƒ^ƒbƒNƒgƒbƒv‚Ì’l‚ð n ŒÂ–ڂ̃Xƒ^ƒbƒN‚ɃRƒs[
- */
-DEFINE_INSN
-setn
-(rb_num_t n)
-(..., VALUE val)
-(VALUE val) // inc += 0
-{
- TOPN(n-1) = val;
-}
-
-/**
- @c stack
- @e empt current stack
- @j current stack ‚ð‹ó‚É‚·‚éB
- */
-DEFINE_INSN
-adjuststack
-(rb_num_t n)
-(...)
-(...) // inc -= n
-{
- DEC_SP(n);
-}
-
-
-/**********************************************************/
-/* deal with setting */
-/**********************************************************/
-
-/**
- @c setting
- @e defined?
- @j defined? ‚ðs‚¤B
- */
-DEFINE_INSN
-defined
-(rb_num_t type, VALUE obj, VALUE needstr)
-(VALUE v)
-(VALUE val)
-{
- VALUE klass;
- const char *expr_type = 0;
- val = Qnil;
-
- switch (type) {
- case DEFINED_IVAR:
- if (rb_ivar_defined(GET_SELF(), SYM2ID(obj))) {
- expr_type = "instance-variable";
- }
- break;
- case DEFINED_IVAR2:
- klass = vm_get_cbase(GET_ISEQ(), GET_LFP(), GET_DFP());
- break;
- case DEFINED_GVAR:
- if (rb_gvar_defined((struct rb_global_entry *)(obj & ~1))) {
- expr_type = "global-variable";
- }
- break;
- case DEFINED_CVAR:
- klass = vm_get_cbase(GET_ISEQ(), GET_LFP(), GET_DFP());
- if (rb_cvar_defined(klass, SYM2ID(obj))) {
- expr_type = "class variable";
- }
- break;
- case DEFINED_CONST:
- klass = v;
- if (vm_get_ev_const(th, GET_ISEQ(), klass, SYM2ID(obj), 1)) {
- expr_type = "constant";
- }
- break;
- case DEFINED_FUNC:
- klass = CLASS_OF(v);
- if (rb_method_boundp(klass, SYM2ID(obj), 0)) {
- expr_type = "method";
- }
- break;
- case DEFINED_METHOD:{
- VALUE klass = CLASS_OF(v);
- const rb_method_entry_t *me = rb_method_entry(klass, SYM2ID(obj));
-
- if (me) {
- if (!(me->flag & NOEX_PRIVATE)) {
- if (!((me->flag & NOEX_PROTECTED) &&
- !rb_obj_is_kind_of(GET_SELF(),
- rb_class_real(klass)))) {
- expr_type = "method";
- }
- }
- }
- break;
- }
- case DEFINED_YIELD:
- if (GET_BLOCK_PTR()) {
- expr_type = "yield";
- }
- break;
- case DEFINED_ZSUPER:{
- rb_iseq_t *ip = GET_ISEQ();
- while (ip) {
- if (ip->defined_method_id) {
- break;
- }
- ip = ip->parent_iseq;
- }
- if (ip) {
- VALUE klass = vm_search_normal_superclass(ip->klass, GET_SELF());
- if (rb_method_boundp(klass, ip->defined_method_id, 0)) {
- expr_type = "super";
- }
- }
- break;
- }
- case DEFINED_REF:{
- val = vm_getspecial(th, GET_LFP(), Qfalse, FIX2INT(obj));
- if (val != Qnil) {
- expr_type = "global-variable";
- }
- break;
- }
- default:
- rb_bug("unimplemented defined? type (VM)");
- break;
- }
- if (expr_type != 0) {
- if (needstr != Qfalse) {
- val = rb_str_new2(expr_type);
- }
- else {
- val = Qtrue;
- }
- }
-}
-
-/**
- @c setting
- @e trace
- @j trace —p‚Ì–½—ßB
- */
-DEFINE_INSN
-trace
-(rb_num_t nf)
-()
-()
-{
- rb_event_flag_t flag = (rb_event_flag_t)nf;
-
- EXEC_EVENT_HOOK(th, flag, GET_SELF(), 0, 0 /* TODO: id, klass */);
-}
-
-/**********************************************************/
-/* deal with control flow 1: class/module */
-/**********************************************************/
-
-/**
- @c class/module
- @e
- enter class definition scope. if super is Qfalse, and clsas
- "klass" is defined, it's redefine. otherwise, define "klass" class.
- @j ƒNƒ‰ƒX’è‹`ƒXƒR[ƒv‚ÖˆÚs‚·‚éB
- ‚à‚µ super ‚ª Qfalse ‚Å klassƒNƒ‰ƒX‚ª’è‹`‚³‚ê‚Ä‚¢‚ê‚ÎÄ’è‹`‚Å‚ ‚éB
- ‚»‚¤‚łȂ¯‚ê‚ÎAklass ƒNƒ‰ƒX‚ð’è‹`‚·‚éB
- */
-DEFINE_INSN
-defineclass
-(ID id, ISEQ class_iseq, rb_num_t define_type)
-(VALUE cbase, VALUE super)
-(VALUE val)
-{
- VALUE klass;
-
- switch ((int)define_type) {
- case 0:
- /* val is dummy. classdef returns class scope value */
-
- if (super == Qnil) {
- super = rb_cObject;
- }
-
- vm_check_if_namespace(cbase);
-
- /* find klass */
- rb_autoload_load(cbase, id);
- if (rb_const_defined_at(cbase, id)) {
- /* already exist */
- klass = rb_const_get_at(cbase, id);
- if (TYPE(klass) != T_CLASS) {
- rb_raise(rb_eTypeError, "%s is not a class", rb_id2name(id));
- }
-
- if (super != rb_cObject) {
- VALUE tmp;
- tmp = rb_class_real(RCLASS_SUPER(klass));
-
- if (tmp != super) {
- rb_raise(rb_eTypeError, "superclass mismatch for class %s",
- rb_id2name(id));
- }
- }
- }
- else {
- /* new class declaration */
- klass = rb_define_class_id(id, super);
- rb_set_class_path_string(klass, cbase, rb_id2str(id));
- rb_const_set(cbase, id, klass);
- rb_class_inherited(super, klass);
- }
- break;
- case 1:
- /* val is dummy. classdef returns class scope value */
- /* super is dummy */
- klass = rb_singleton_class(cbase);
- break;
- case 2:
- /* val is dummy. classdef returns class scope value */
- /* super is dummy */
-
- vm_check_if_namespace(cbase);
-
- /* find klass */
- if (rb_const_defined_at(cbase, id)) {
- klass = rb_const_get_at(cbase, id);
- /* already exist */
- if (TYPE(klass) != T_MODULE) {
- rb_raise(rb_eTypeError, "%s is not a module", rb_id2name(id));
- }
- }
- else {
- /* new module declaration */
- klass = rb_define_module_id(id);
- rb_set_class_path_string(klass, cbase, rb_id2str(id));
- rb_const_set(cbase, id, klass);
- }
- break;
- default:
- rb_bug("unknown defineclass type: %d", (int)define_type);
- }
-
- COPY_CREF(class_iseq->cref_stack, vm_cref_push(th, klass, NOEX_PUBLIC));
-
- /* enter scope */
- vm_push_frame(th, class_iseq,
- VM_FRAME_MAGIC_CLASS, klass, (VALUE) GET_DFP() | 0x02,
- class_iseq->iseq_encoded, GET_SP(), 0,
- class_iseq->local_size);
- RESTORE_REGS();
-
- INC_VM_STATE_VERSION();
- NEXT_INSN();
-}
-
-
-/**********************************************************/
-/* deal with control flow 2: method/iterator */
-/**********************************************************/
-
-/**
- @c method/iterator
- @e obj.send(id, args..) # args.size => num
- @j ƒƒ\ƒbƒhŒÄ‚Ño‚µ‚ðs‚¤B
- obj.send(id, args..) # args.size => num
- flag & VM_CALL_ARGS_SPLAT_BIT != 0 -> splat last arg
- flag & VM_CALL_ARGS_BLOCKARG_BIT != 0 -> Proc as Block
- flag & VM_CALL_FCALL_BIT != 0 -> FCALL ( func() )
- flag & VM_CALL_VCALL_BIT != 0 -> VCALL ( func )
- ...
- */
-DEFINE_INSN
-send
-(ID op_id, rb_num_t op_argc, ISEQ blockiseq, rb_num_t op_flag, IC ic)
-(...)
-(VALUE val) // inc += - (int)(op_argc + ((op_flag & VM_CALL_ARGS_BLOCKARG_BIT) ? 1 : 0));
-{
- const rb_method_entry_t *me;
- VALUE recv, klass;
- rb_block_t *blockptr = 0;
- rb_num_t num = caller_setup_args(th, GET_CFP(), op_flag, (int)op_argc,
- (rb_iseq_t *)blockiseq, &blockptr);
- rb_num_t flag = op_flag;
- ID id = op_id;
-
- /* get receiver */
- recv = (flag & VM_CALL_FCALL_BIT) ? GET_SELF() : TOPN(num);
- klass = CLASS_OF(recv);
- me = vm_method_search(id, klass, ic);
- CALL_METHOD(num, blockptr, flag, id, me, recv);
-}
-
-/**
- @c method/iterator
- @e super(args) # args.size => num
- @j super ‚ðŽÀs‚·‚éB
- super(args) # args.size => num
- flag “™ƒIƒyƒ‰ƒ“ƒh‚̈Ӗ¡‚Í send ‚Æ“¯‚¶B
- */
-DEFINE_INSN
-invokesuper
-(rb_num_t op_argc, ISEQ blockiseq, rb_num_t op_flag)
-(...)
-(VALUE val) // inc += - (int)(op_argc + ((op_flag & VM_CALL_ARGS_BLOCKARG_BIT) ? 1 : 0));
-{
- rb_block_t *blockptr = !(op_flag & VM_CALL_ARGS_BLOCKARG_BIT) ? GET_BLOCK_PTR() : 0;
- rb_num_t num = caller_setup_args(th, GET_CFP(), op_flag,
- (int)op_argc, blockiseq, &blockptr);
- VALUE recv, klass;
- ID id;
- VALUE flag = VM_CALL_SUPER_BIT | VM_CALL_FCALL_BIT;
- const rb_method_entry_t *me;
-
- recv = GET_SELF();
- vm_search_superclass(GET_CFP(), GET_ISEQ(), recv, TOPN(num), &id, &klass);
- me = rb_method_entry(klass, id);
-
- CALL_METHOD(num, blockptr, flag, id, me, recv);
-}
-
-/**
- @c method/iterator
- @e yield(args) # args.size => num, flag shows expand argument or not
- @j yield ‚ðŽÀs‚·‚éB
- yield(args) # args.size => num
- */
-DEFINE_INSN
-invokeblock
-(rb_num_t num, rb_num_t flag)
-(...)
-(VALUE val) // inc += 1 - num;
-{
- val = vm_invoke_block(th, GET_CFP(), num, flag);
- if (val == Qundef) {
- RESTORE_REGS();
- NEXT_INSN();
- }
-}
-
-/**
- @c method/iterator
- @e return from this scope.
- @j ‚±‚̃XƒR[ƒv‚©‚甲‚¯‚éB
- */
-DEFINE_INSN
-leave
-()
-(VALUE val)
-(VALUE val)
-{
- if (OPT_CHECKED_RUN) {
- if (reg_cfp->sp != reg_cfp->bp) {
- rb_bug("Stack consistency error (sp: %"PRIdPTRDIFF", bp: %"PRIdPTRDIFF")",
- VM_SP_CNT(th, reg_cfp->sp), VM_SP_CNT(th, reg_cfp->bp));
- }
- }
-
- RUBY_VM_CHECK_INTS();
- vm_pop_frame(th);
- RESTORE_REGS();
-}
-
-/**
- @c method/iterator
- @e return from this vm loop
- @j VM loop ‚©‚甲‚¯‚éB
- */
-DEFINE_INSN
-finish
-()
-(VALUE val)
-(VALUE val)
-{
-#if OPT_CALL_THREADED_CODE
- rb_bug("unused instruction on OPT_CALL_THREADED_CODE");
-#else
- th->cfp++;
- return val;
-#endif
-}
-
-/**********************************************************/
-/* deal with control flow 3: exception */
-/**********************************************************/
-
-/**
- @c exception
- @e longjump
- @j ‘åˆæƒWƒƒƒ“ƒv‚ðs‚¤B
- */
-DEFINE_INSN
-throw
-(rb_num_t throw_state)
-(VALUE throwobj)
-(VALUE val)
-{
- RUBY_VM_CHECK_INTS();
- val = vm_throw(th, GET_CFP(), throw_state, throwobj);
- THROW_EXCEPTION(val);
- /* unreachable */
-}
-
-/**********************************************************/
-/* deal with control flow 4: local jump */
-/**********************************************************/
-
-/**
- @c jump
- @e set PC to (PC + dst).
- @j PC ‚ð (PC + dst) ‚É‚·‚éB
- */
-DEFINE_INSN
-jump
-(OFFSET dst)
-()
-()
-{
- RUBY_VM_CHECK_INTS();
- JUMP(dst);
-}
-
-/**
- @c jump
- @e if val is not false or nil, set PC to (PC + dst).
- @j ‚à‚µ val ‚ª false ‚© nil ‚łȂ¯‚ê‚ÎAPC ‚ð (PC + dst) ‚É‚·‚éB
- */
-DEFINE_INSN
-branchif
-(OFFSET dst)
-(VALUE val)
-()
-{
- if (RTEST(val)) {
- RUBY_VM_CHECK_INTS();
- JUMP(dst);
- }
-}
-
-/**
- @c jump
- @e if val is false or nil, set PC to (PC + dst).
- @j ‚à‚µ val ‚ª false ‚© nil ‚È‚ç‚ÎAPC ‚ð (PC + dst) ‚É‚·‚éB
- */
-DEFINE_INSN
-branchunless
-(OFFSET dst)
-(VALUE val)
-()
-{
- if (!RTEST(val)) {
- RUBY_VM_CHECK_INTS();
- JUMP(dst);
- }
-}
-
-
-/**********************************************************/
-/* for optimize */
-/**********************************************************/
-
-/**
- @c optimize
- @e inline cache
- @j ƒCƒ“ƒ‰ƒCƒ“ƒLƒƒƒbƒVƒ…‚ª—LŒø‚È‚çA’l‚ðƒXƒ^ƒbƒN‚ɃvƒbƒVƒ…‚µ‚Ä dst ‚ÖƒWƒƒƒ“ƒv‚·‚éB
- */
-DEFINE_INSN
-getinlinecache
-(OFFSET dst, IC ic)
-()
-(VALUE val)
-{
- if (ic->ic_vmstat == GET_VM_STATE_VERSION()) {
- val = ic->ic_value;
- JUMP(dst);
- }
- else {
- /* none */
- val = Qnil;
- }
-}
-
-/**
- @c optimize
- @e inline cache (once)
- @j once ‚ðŽÀŒ»‚·‚éB
- */
-DEFINE_INSN
-onceinlinecache
-(OFFSET dst, IC ic)
-()
-(VALUE val)
-{
- if (ic->ic_vmstat) {
- val = ic->ic_value;
- JUMP(dst);
- }
- else {
- /* none */
- val = Qnil;
- }
-}
-
-/**
- @c optimize
- @e set inline cache
- @j ƒCƒ“ƒ‰ƒCƒ“ƒLƒƒƒbƒVƒ…‚Ì’l‚ðÝ’è‚·‚éB
- */
-DEFINE_INSN
-setinlinecache
-(OFFSET dst)
-(VALUE val)
-(VALUE val)
-{
- IC ic = GET_CONST_INLINE_CACHE(dst);
-
- ic->ic_value = val;
- ic->ic_vmstat = GET_VM_STATE_VERSION() - ruby_vm_const_missing_count;
- ruby_vm_const_missing_count = 0;
-}
-
-/**
- @c optimize
- @e case dispatcher
- @j case •¶‚ÅA‰Â”\‚È‚ç•\ˆø‚«‚ŃWƒƒƒ“ƒv‚·‚éB
- */
-DEFINE_INSN
-opt_case_dispatch
-(CDHASH hash, OFFSET else_offset)
-(..., VALUE key)
-() // inc += -1;
-{
- if (BASIC_OP_UNREDEFINED_P(BOP_EQQ)) {
- VALUE val;
- if (st_lookup(RHASH_TBL(hash), key, &val)) {
- JUMP(FIX2INT(val));
- }
- else {
- JUMP(else_offset);
- }
- }
- else {
- struct opt_case_dispatch_i_arg arg = {
- key, -1
- };
-
- st_foreach(RHASH_TBL(hash), opt_case_dispatch_i, (st_data_t)&arg);
-
- if (arg.label != -1) {
- JUMP(arg.label);
- }
- else {
- JUMP(else_offset);
- }
- }
-}
-
-/**
- @c optimize
- @e check environment
- @j «—ˆ‚ÌŠg’£—pB
- */
-DEFINE_INSN
-opt_checkenv
-()
-()
-()
-{
- if (GET_CFP()->bp != GET_DFP() + 1) {
- VALUE *new_dfp = GET_CFP()->bp - 1;
- /* TODO: copy env and clean stack at creating env? */
- *new_dfp = *GET_DFP();
- SET_DFP(new_dfp);
- }
-}
-
-
-/** simple functions */
-
-/**
- @c optimize
- @e optimized X+Y.
- @j Å“K‰»‚³‚ꂽ X+YB
- */
-DEFINE_INSN
-opt_plus
-(IC ic)
-(VALUE recv, VALUE obj)
-(VALUE val)
-{
- if (0) {
-
- }
-#if 1
- else if (FIXNUM_2_P(recv, obj) &&
- BASIC_OP_UNREDEFINED_P(BOP_PLUS)) {
- /* fixnum + fixnum */
-#ifndef LONG_LONG_VALUE
- val = (recv + (obj & (~1)));
- if ((~(recv ^ obj) & (recv ^ val)) &
- ((VALUE)0x01 << ((sizeof(VALUE) * CHAR_BIT) - 1))) {
- val = rb_big_plus(rb_int2big(FIX2LONG(recv)),
- rb_int2big(FIX2LONG(obj)));
- }
-#else
- long a, b, c;
- a = FIX2LONG(recv);
- b = FIX2LONG(obj);
- c = a + b;
- if (FIXABLE(c)) {
- val = LONG2FIX(c);
- }
- else {
- val = rb_big_plus(rb_int2big(a), rb_int2big(b));
- }
-#endif
- }
-#endif
-
- else if (!SPECIAL_CONST_P(recv) && !SPECIAL_CONST_P(obj)) {
- if (0) {
- }
-#if 1
- else if (HEAP_CLASS_OF(recv) == rb_cFloat &&
- HEAP_CLASS_OF(obj) == rb_cFloat &&
- BASIC_OP_UNREDEFINED_P(BOP_PLUS)) {
- val = DBL2NUM(RFLOAT_VALUE(recv) + RFLOAT_VALUE(obj));
- }
-#endif
-
-#if 1
- else if (HEAP_CLASS_OF(recv) == rb_cString &&
- HEAP_CLASS_OF(obj) == rb_cString &&
- BASIC_OP_UNREDEFINED_P(BOP_PLUS)) {
- val = rb_str_plus(recv, obj);
- }
-#endif
-#if 1
- else if (HEAP_CLASS_OF(recv) == rb_cArray &&
- BASIC_OP_UNREDEFINED_P(BOP_PLUS)) {
- val = rb_ary_plus(recv, obj);
- }
-#endif
- else {
- goto INSN_LABEL(normal_dispatch);
- }
- }
- else {
- INSN_LABEL(normal_dispatch):
- PUSH(recv);
- PUSH(obj);
- CALL_SIMPLE_METHOD(1, idPLUS, recv);
- }
-}
-
-/**
- @c optimize
- @e optimized X-Y.
- @j Å“K‰»‚³‚ꂽ X-YB
- */
-DEFINE_INSN
-opt_minus
-(IC ic)
-(VALUE recv, VALUE obj)
-(VALUE val)
-{
- if (FIXNUM_2_P(recv, obj) &&
- BASIC_OP_UNREDEFINED_P(BOP_MINUS)) {
- long a, b, c;
-
- a = FIX2LONG(recv);
- b = FIX2LONG(obj);
- c = a - b;
-
- if (FIXABLE(c)) {
- val = LONG2FIX(c);
- }
- else {
- val = rb_big_minus(rb_int2big(a), rb_int2big(b));
- }
- }
- else if (!SPECIAL_CONST_P(recv) && !SPECIAL_CONST_P(obj)) {
- if (0) {
- }
-#if 1
- else if (HEAP_CLASS_OF(recv) == rb_cFloat &&
- HEAP_CLASS_OF(obj) == rb_cFloat &&
- BASIC_OP_UNREDEFINED_P(BOP_MINUS)) {
- val = DBL2NUM(RFLOAT_VALUE(recv) - RFLOAT_VALUE(obj));
- }
-#endif
- else {
- goto INSN_LABEL(normal_dispatch);
- }
- }
- else {
- /* other */
- INSN_LABEL(normal_dispatch):
- PUSH(recv);
- PUSH(obj);
- CALL_SIMPLE_METHOD(1, idMINUS, recv);
- }
-}
-
-/**
- @c optimize
- @e optimized X*Y.
- @j Å“K‰»‚³‚ꂽ X*YB
- */
-DEFINE_INSN
-opt_mult
-(IC ic)
-(VALUE recv, VALUE obj)
-(VALUE val)
-{
- if (FIXNUM_2_P(recv, obj) &&
- BASIC_OP_UNREDEFINED_P(BOP_MULT)) {
- long a, b, c;
-
- a = FIX2LONG(recv);
- if (a == 0) {
- val = recv;
- }
- else {
- b = FIX2LONG(obj);
- c = a * b;
-
- if (FIXABLE(c) && c / a == b) {
- val = LONG2FIX(c);
- }
- else {
- val = rb_big_mul(rb_int2big(a), rb_int2big(b));
- }
- }
- }
- else if (!SPECIAL_CONST_P(recv) && !SPECIAL_CONST_P(obj)) {
- if (0) {
- }
-#if 1
- else if (HEAP_CLASS_OF(recv) == rb_cFloat &&
- HEAP_CLASS_OF(obj) == rb_cFloat &&
- BASIC_OP_UNREDEFINED_P(BOP_MULT)) {
- val = DBL2NUM(RFLOAT_VALUE(recv) * RFLOAT_VALUE(obj));
- }
-#endif
- else {
- goto INSN_LABEL(normal_dispatch);
- }
- }
- else {
- INSN_LABEL(normal_dispatch):
- PUSH(recv);
- PUSH(obj);
- CALL_SIMPLE_METHOD(1, idMULT, recv);
- }
-}
-
-/**
- @c optimize
- @e optimized X/Y.
- @j Å“K‰»‚³‚ꂽ X/YB
- */
-DEFINE_INSN
-opt_div
-(IC ic)
-(VALUE recv, VALUE obj)
-(VALUE val)
-{
- if (FIXNUM_2_P(recv, obj) &&
- BASIC_OP_UNREDEFINED_P(BOP_DIV)) {
- long x, y, div;
-
- x = FIX2LONG(recv);
- y = FIX2LONG(obj);
- {
- /* copied from numeric.c#fixdivmod */
- long mod;
- if (y == 0)
- goto INSN_LABEL(normal_dispatch);
- if (y < 0) {
- if (x < 0)
- div = -x / -y;
- else
- div = -(x / -y);
- }
- else {
- if (x < 0)
- div = -(-x / y);
- else
- div = x / y;
- }
- mod = x - div * y;
- if ((mod < 0 && y > 0) || (mod > 0 && y < 0)) {
- mod += y;
- div -= 1;
- }
- }
- val = LONG2NUM(div);
- }
- else if (!SPECIAL_CONST_P(recv) && !SPECIAL_CONST_P(obj)) {
- if (0) {
- }
-#if 1
- else if (HEAP_CLASS_OF(recv) == rb_cFloat &&
- HEAP_CLASS_OF(obj) == rb_cFloat &&
- BASIC_OP_UNREDEFINED_P(BOP_DIV)) {
- val = DBL2NUM(RFLOAT_VALUE(recv) / RFLOAT_VALUE(obj));
- }
-#endif
- else {
- goto INSN_LABEL(normal_dispatch);
- }
- }
- else {
- INSN_LABEL(normal_dispatch):
- PUSH(recv);
- PUSH(obj);
- CALL_SIMPLE_METHOD(1, idDIV, recv);
- }
-}
-
-/**
- @c optimize
- @e optimized X%Y.
- @j Å“K‰»‚³‚ꂽ X%YB
- */
-DEFINE_INSN
-opt_mod
-(IC ic)
-(VALUE recv, VALUE obj)
-(VALUE val)
-{
- if (FIXNUM_2_P(recv, obj) &&
- BASIC_OP_UNREDEFINED_P(BOP_MOD)) {
- long x, y, mod;
-
- x = FIX2LONG(recv);
- y = FIX2LONG(obj);
- {
- /* copied from numeric.c#fixdivmod */
- long div;
-
- if (y == 0)
- rb_num_zerodiv();
- if (y < 0) {
- if (x < 0)
- div = -x / -y;
- else
- div = -(x / -y);
- }
- else {
- if (x < 0)
- div = -(-x / y);
- else
- div = x / y;
- }
- mod = x - div * y;
- if ((mod < 0 && y > 0) || (mod > 0 && y < 0)) {
- mod += y;
- div -= 1;
- }
- }
- val = LONG2FIX(mod);
- }
- else if (!SPECIAL_CONST_P(recv) && !SPECIAL_CONST_P(obj)) {
- if (0) {
- }
- else if (HEAP_CLASS_OF(recv) == rb_cFloat &&
- HEAP_CLASS_OF(obj) == rb_cFloat &&
- BASIC_OP_UNREDEFINED_P(BOP_MOD)) {
- double x = RFLOAT_VALUE(recv);
- double y = RFLOAT_VALUE(obj);
- double div, mod;
-
- {
- double z;
-
- modf(x / y, &z);
- mod = x - z * y;
- }
-
- div = (x - mod) / y;
- if (y * mod < 0) {
- mod += y;
- div -= 1.0;
- }
- val = DBL2NUM(mod);
- }
- else {
- goto INSN_LABEL(normal_dispatch);
- }
- }
- else {
- INSN_LABEL(normal_dispatch):
- PUSH(recv);
- PUSH(obj);
- CALL_SIMPLE_METHOD(1, idMOD, recv);
- }
-}
-
-/**
- @c optimize
- @e optimized X==Y.
- @j Å“K‰»‚³‚ꂽ X==YB
- */
-DEFINE_INSN
-opt_eq
-(IC ic)
-(VALUE recv, VALUE obj)
-(VALUE val)
-{
- val = opt_eq_func(recv, obj, ic);
-
- if (val == Qundef) {
- /* other */
- PUSH(recv);
- PUSH(obj);
- CALL_SIMPLE_METHOD(1, idEq, recv);
- }
-}
-
-/**
- @c optimize
- @e optimized X!=Y.
- @j Å“K‰»‚³‚ꂽ X!=YB
- */
-DEFINE_INSN
-opt_neq
-(IC ic, IC ic_eq)
-(VALUE recv, VALUE obj)
-(VALUE val)
-{
- extern VALUE rb_obj_not_equal(VALUE obj1, VALUE obj2);
- const rb_method_entry_t *me = vm_method_search(idNeq, CLASS_OF(recv), ic);
- val = Qundef;
-
- if (check_cfunc(me, rb_obj_not_equal)) {
- val = opt_eq_func(recv, obj, ic_eq);
-
- if (val != Qundef) {
- val = RTEST(val) ? Qfalse : Qtrue;
- }
- }
-
- if (val == Qundef) {
- /* other */
- PUSH(recv);
- PUSH(obj);
- CALL_SIMPLE_METHOD(1, idNeq, recv);
- }
-}
-
-/**
- @c optimize
- @e optimized X<Y.
- @j Å“K‰»‚³‚ꂽ X<YB
- */
-DEFINE_INSN
-opt_lt
-(IC ic)
-(VALUE recv, VALUE obj)
-(VALUE val)
-{
- if (FIXNUM_2_P(recv, obj) &&
- BASIC_OP_UNREDEFINED_P(BOP_LT)) {
- SIGNED_VALUE a = recv, b = obj;
-
- if (a < b) {
- val = Qtrue;
- }
- else {
- val = Qfalse;
- }
- }
- else if (!SPECIAL_CONST_P(recv) && !SPECIAL_CONST_P(obj)) {
- if (0) {
- }
-#if 1
- else if (HEAP_CLASS_OF(recv) == rb_cFloat &&
- HEAP_CLASS_OF(obj) == rb_cFloat &&
- BASIC_OP_UNREDEFINED_P(BOP_LT)) {
- double a = RFLOAT_VALUE(recv);
- double b = RFLOAT_VALUE(obj);
-#if defined(_MSC_VER) && _MSC_VER < 1300
- if (isnan(a) || isnan(b)) val = Qfalse;
- else
-#endif
- val = a < b ? Qtrue : Qfalse;
- }
-#endif
- else {
- goto INSN_LABEL(normal_dispatch);
- }
- }
- else {
- INSN_LABEL(normal_dispatch):
- PUSH(recv);
- PUSH(obj);
- CALL_SIMPLE_METHOD(1, idLT, recv);
- }
-}
-
-/**
- @c optimize
- @e optimized X<=Y.
- @j Å“K‰»‚³‚ꂽ X<=YB
- */
-DEFINE_INSN
-opt_le
-(IC ic)
-(VALUE recv, VALUE obj)
-(VALUE val)
-{
- if (FIXNUM_2_P(recv, obj) &&
- BASIC_OP_UNREDEFINED_P(BOP_LE)) {
- SIGNED_VALUE a = recv, b = obj;
-
- if (a <= b) {
- val = Qtrue;
- }
- else {
- val = Qfalse;
- }
- }
- else {
- /* other */
- PUSH(recv);
- PUSH(obj);
- CALL_SIMPLE_METHOD(1, idLE, recv);
- }
-}
-
-/**
- @c optimize
- @e optimized X>Y.
- @j Å“K‰»‚³‚ꂽ X>YB
- */
-DEFINE_INSN
-opt_gt
-(IC ic)
-(VALUE recv, VALUE obj)
-(VALUE val)
-{
- if (FIXNUM_2_P(recv, obj) &&
- BASIC_OP_UNREDEFINED_P(BOP_GT)) {
- SIGNED_VALUE a = recv, b = obj;
-
- if (a > b) {
- val = Qtrue;
- }
- else {
- val = Qfalse;
- }
- }
- else if (!SPECIAL_CONST_P(recv) && !SPECIAL_CONST_P(obj)) {
- if (0) {
- }
-#if 1
- else if (HEAP_CLASS_OF(recv) == rb_cFloat &&
- HEAP_CLASS_OF(obj) == rb_cFloat &&
- BASIC_OP_UNREDEFINED_P(BOP_GT)) {
- double a = RFLOAT_VALUE(recv);
- double b = RFLOAT_VALUE(obj);
-#if defined(_MSC_VER) && _MSC_VER < 1300
- if (isnan(a) || isnan(b)) val = Qfalse;
- else
-#endif
- val = a > b ? Qtrue : Qfalse;
- }
-#endif
- else {
- goto INSN_LABEL(normal_dispatch);
- }
- }
- else {
- INSN_LABEL(normal_dispatch):
- PUSH(recv);
- PUSH(obj);
- CALL_SIMPLE_METHOD(1, idGT, recv);
- }
-}
-
-/**
- @c optimize
- @e optimized X>=Y.
- @j Å“K‰»‚³‚ꂽ X>=YB
- */
-DEFINE_INSN
-opt_ge
-(IC ic)
-(VALUE recv, VALUE obj)
-(VALUE val)
-{
- if (FIXNUM_2_P(recv, obj) &&
- BASIC_OP_UNREDEFINED_P(BOP_GE)) {
- SIGNED_VALUE a = recv, b = obj;
-
- if (a >= b) {
- val = Qtrue;
- }
- else {
- val = Qfalse;
- }
- }
- else {
- PUSH(recv);
- PUSH(obj);
- CALL_SIMPLE_METHOD(1, idGE, recv);
- }
-}
-
-/**
- @c optimize
- @e <<
- @j Å“K‰»‚³‚ꂽ X<<YB
- */
-DEFINE_INSN
-opt_ltlt
-(IC ic)
-(VALUE recv, VALUE obj)
-(VALUE val)
-{
- if (!SPECIAL_CONST_P(recv)) {
- if (0) {
- }
- else if (HEAP_CLASS_OF(recv) == rb_cString &&
- BASIC_OP_UNREDEFINED_P(BOP_LTLT)) {
- val = rb_str_concat(recv, obj);
- }
- else if (HEAP_CLASS_OF(recv) == rb_cArray &&
- BASIC_OP_UNREDEFINED_P(BOP_LTLT)) {
- val = rb_ary_push(recv, obj);
- }
- else {
- goto INSN_LABEL(normal_dispatch);
- }
- }
- else {
- INSN_LABEL(normal_dispatch):
- PUSH(recv);
- PUSH(obj);
- CALL_SIMPLE_METHOD(1, idLTLT, recv);
- }
-}
-
-/**
- @c optimize
- @e []
- @j Å“K‰»‚³‚ꂽ recv[obj]B
- */
-DEFINE_INSN
-opt_aref
-(IC ic)
-(VALUE recv, VALUE obj)
-(VALUE val)
-{
- if (!SPECIAL_CONST_P(recv) && BASIC_OP_UNREDEFINED_P(BOP_AREF)) {
- if (HEAP_CLASS_OF(recv) == rb_cArray && FIXNUM_P(obj)) {
- val = rb_ary_entry(recv, FIX2LONG(obj));
- }
- else if (HEAP_CLASS_OF(recv) == rb_cHash) {
- val = rb_hash_aref(recv, obj);
- }
- else {
- goto INSN_LABEL(normal_dispatch);
- }
- }
- else {
- INSN_LABEL(normal_dispatch):
- PUSH(recv);
- PUSH(obj);
- CALL_SIMPLE_METHOD(1, idAREF, recv);
- }
-}
-
-/**
- @c optimize
- @e recv[obj] = set
- @j Å“K‰»‚³‚ꂽ recv[obj] = setB
- */
-DEFINE_INSN
-opt_aset
-(IC ic)
-(VALUE recv, VALUE obj, VALUE set)
-(VALUE val)
-{
- if (!SPECIAL_CONST_P(recv) &&
- BASIC_OP_UNREDEFINED_P(BOP_ASET)) {
- if (HEAP_CLASS_OF(recv) == rb_cArray && FIXNUM_P(obj)) {
- rb_ary_store(recv, FIX2LONG(obj), set);
- val = set;
- }
- else if (HEAP_CLASS_OF(recv) == rb_cHash) {
- rb_hash_aset(recv, obj, set);
- val = set;
- }
- else {
- goto INSN_LABEL(normal_dispatch);
- }
- }
- else {
- INSN_LABEL(normal_dispatch):
- PUSH(recv);
- PUSH(obj);
- PUSH(set);
- CALL_SIMPLE_METHOD(2, idASET, recv);
- }
-}
-
-/**
- @c optimize
- @e optimized length
- @j Å“K‰»‚³‚ꂽ recv.length()B
- */
-DEFINE_INSN
-opt_length
-(IC ic)
-(VALUE recv)
-(VALUE val)
-{
- if (LIKELY(!SPECIAL_CONST_P(recv) &&
- BASIC_OP_UNREDEFINED_P(BOP_LENGTH))) {
- if (HEAP_CLASS_OF(recv) == rb_cString) {
- val = rb_str_length(recv);
- }
- else if (HEAP_CLASS_OF(recv) == rb_cArray) {
- val = LONG2NUM(RARRAY_LEN(recv));
- }
- else if (HEAP_CLASS_OF(recv) == rb_cHash) {
- val = INT2FIX(RHASH_SIZE(recv));
- }
- else {
- goto INSN_LABEL(normal_dispatch);
- }
- }
- else {
- INSN_LABEL(normal_dispatch):
- PUSH(recv);
- CALL_SIMPLE_METHOD(0, idLength, recv);
- }
-}
-
-/**
- @c optimize
- @e optimized size
- @j Å“K‰»‚³‚ꂽ recv.size()B
- */
-DEFINE_INSN
-opt_size
-(IC ic)
-(VALUE recv)
-(VALUE val)
-{
- if (LIKELY(BASIC_OP_UNREDEFINED_P(BOP_SIZE) &&
- !SPECIAL_CONST_P(recv))) {
- if (HEAP_CLASS_OF(recv) == rb_cString) {
- val = rb_str_length(recv);
- }
- else if (HEAP_CLASS_OF(recv) == rb_cArray) {
- val = LONG2NUM(RARRAY_LEN(recv));
- }
- else if (HEAP_CLASS_OF(recv) == rb_cHash) {
- val = INT2FIX(RHASH_SIZE(recv));
- }
- else {
- goto INSN_LABEL(normal_dispatch);
- }
- }
- else {
- INSN_LABEL(normal_dispatch):
- PUSH(recv);
- CALL_SIMPLE_METHOD(0, idSize, recv);
- }
-}
-
-/**
- @c optimize
- @e optimized succ
- @j Å“K‰»‚³‚ꂽ recv.succ()B
- */
-DEFINE_INSN
-opt_succ
-(IC ic)
-(VALUE recv)
-(VALUE val)
-{
- if (SPECIAL_CONST_P(recv)) {
- if (FIXNUM_P(recv) &&
- BASIC_OP_UNREDEFINED_P(BOP_SUCC)) {
- const VALUE obj = INT2FIX(1);
- /* fixnum + INT2FIX(1) */
- val = (recv + (obj & (~1)));
- if ((~(recv ^ obj) & (recv ^ val)) & ((unsigned long)LONG_MAX + 1)) {
- val = rb_big_plus(rb_int2big(FIX2LONG(recv)),
- rb_int2big(FIX2LONG(obj)));
- }
- }
- else {
- goto INSN_LABEL(normal_dispatch);
- }
- }
- else {
- if (HEAP_CLASS_OF(recv) == rb_cString &&
- BASIC_OP_UNREDEFINED_P(BOP_SUCC)) {
- val = rb_str_succ(recv);
- }
- else if (HEAP_CLASS_OF(recv) == rb_cTime &&
- BASIC_OP_UNREDEFINED_P(BOP_SUCC)) {
- val = rb_time_succ(recv);
- }
- else
- {
- goto INSN_LABEL(normal_dispatch);
- }
- }
- if (0) {
- INSN_LABEL(normal_dispatch):
- PUSH(recv);
- CALL_SIMPLE_METHOD(0, idSucc, recv);
- }
-}
-
-/**
- @c optimize
- @e optimized not
- @j Å“K‰»‚³‚ꂽ recv.!()B
- */
-DEFINE_INSN
-opt_not
-(IC ic)
-(VALUE recv)
-(VALUE val)
-{
- extern VALUE rb_obj_not(VALUE obj);
- const rb_method_entry_t *me = vm_method_search(idNot, CLASS_OF(recv), ic);
-
- if (check_cfunc(me, rb_obj_not)) {
- val = RTEST(recv) ? Qfalse : Qtrue;
- }
- else {
- PUSH(recv);
- CALL_SIMPLE_METHOD(0, idNot, recv);
- }
-}
-
-
-/**
- @c optimize
- @e optimized regexp match
- @j Å“K‰»‚³‚ꂽ³‹K•\Œ»ƒ}ƒbƒ`B
- */
-DEFINE_INSN
-opt_regexpmatch1
-(VALUE r)
-(VALUE obj)
-(VALUE val)
-{
- val = rb_reg_match(r, obj);
-}
-
-/**
- @c optimize
- @e optimized regexp match 2
- @j Å“K‰»‚³‚ꂽ³‹K•\Œ»ƒ}ƒbƒ` 2
- */
-DEFINE_INSN
-opt_regexpmatch2
-()
-(VALUE obj2, VALUE obj1)
-(VALUE val)
-{
- if (TYPE(obj2) == T_STRING) {
- val = rb_reg_match(obj1, obj2);
- }
- else {
- val = rb_funcall(obj2, idEqTilde, 1, obj1);
- }
-}
-
-/**
- @c optimize
- @e call native compiled method
- @j ƒlƒCƒeƒBƒuƒRƒ“ƒpƒCƒ‹‚µ‚½ƒƒ\ƒbƒh‚ð‹N“®B
- */
-DEFINE_INSN
-opt_call_c_function
-(rb_insn_func_t funcptr)
-()
-()
-{
- reg_cfp = (funcptr)(th, reg_cfp);
-
- if (reg_cfp == 0) {
- VALUE err = th->errinfo;
- th->errinfo = Qnil;
- THROW_EXCEPTION(err);
- }
-
- RESTORE_REGS();
- NEXT_INSN();
-}
-
-/**
- @c joke
- @e BLT
- @j BLT
- */
-DEFINE_INSN
-bitblt
-()
-()
-(VALUE ret)
-{
- ret = rb_str_new2("a bit of bacon, lettuce and tomato");
-}
-
-/**
- @c joke
- @e The Answer to Life, the Universe, and Everything
- @j l¶A‰F’ˆA‚·‚ׂĂ̓š‚¦B
- */
-DEFINE_INSN
-answer
-()
-()
-(VALUE ret)
-{
- ret = INT2FIX(42);
-}
-
diff --git a/tool/install-sh b/install-sh
index e69de29bb2..e69de29bb2 100755..100644
--- a/tool/install-sh
+++ b/install-sh
diff --git a/instruby.rb b/instruby.rb
new file mode 100755
index 0000000000..2903a7c739
--- /dev/null
+++ b/instruby.rb
@@ -0,0 +1,411 @@
+#!./miniruby
+
+load "./rbconfig.rb"
+include RbConfig
+
+srcdir = File.dirname(__FILE__)
+$:.unshift File.expand_path("lib", srcdir)
+require 'fileutils'
+require 'shellwords'
+require 'optparse'
+require 'optparse/shellwords'
+require 'tempfile'
+
+STDOUT.sync = true
+File.umask(0)
+
+def parse_args(argv = ARGV)
+ $mantype = 'doc'
+ $destdir = nil
+ $extout = nil
+ $make = 'make'
+ $mflags = []
+ $install = []
+ $installed_list = nil
+ $dryrun = false
+ $rdocdir = nil
+ $data_mode = 0644
+ $prog_mode = 0755
+ $dir_mode = nil
+ $script_mode = nil
+ $cmdtype = ('bat' if File::ALT_SEPARATOR == '\\')
+ mflags = []
+ opt = OptionParser.new
+ opt.on('-n') {$dryrun = true}
+ opt.on('--dest-dir=DIR') {|dir| $destdir = dir}
+ opt.on('--extout=DIR') {|dir| $extout = (dir unless dir.empty?)}
+ opt.on('--make=COMMAND') {|make| $make = make}
+ opt.on('--mantype=MAN') {|man| $mantype = man}
+ opt.on('--make-flags=FLAGS', '--mflags', Shellwords) do |v|
+ if arg = v.first
+ arg.insert(0, '-') if /\A[^-][^=]*\Z/ =~ arg
+ end
+ $mflags.concat(v)
+ end
+ opt.on('-i', '--install=TYPE',
+ [:local, :bin, :"bin-arch", :"bin-comm", :lib, :man, :ext, :"ext-arch", :"ext-comm", :rdoc]) do |ins|
+ $install << ins
+ end
+ opt.on('--data-mode=OCTAL-MODE', OptionParser::OctalInteger) do |mode|
+ $data_mode = mode
+ end
+ opt.on('--prog-mode=OCTAL-MODE', OptionParser::OctalInteger) do |mode|
+ $prog_mode = mode
+ end
+ opt.on('--dir-mode=OCTAL-MODE', OptionParser::OctalInteger) do |mode|
+ $dir_mode = mode
+ end
+ opt.on('--script-mode=OCTAL-MODE', OptionParser::OctalInteger) do |mode|
+ $script_mode = mode
+ end
+ opt.on('--installed-list [FILENAME]') {|name| $installed_list = name}
+ opt.on('--rdoc-output [DIR]') {|dir| $rdocdir = dir}
+ opt.on('--cmd-type=TYPE', %w[bat cmd plain]) {|cmd| $cmdtype = (cmd unless cmd == 'plain')}
+
+ opt.order!(argv) do |v|
+ case v
+ when /\AINSTALL[-_]([-\w]+)=(.*)/
+ argv.unshift("--#{$1.tr('_', '-')}=#{$2}")
+ when /\A\w[-\w+]*=\z/
+ mflags << v
+ when /\A\w[-\w+]*\z/
+ $install << v.intern
+ else
+ raise OptionParser::InvalidArgument, v
+ end
+ end rescue abort [$!.message, opt].join("\n")
+
+ $make, *rest = Shellwords.shellwords($make)
+ $mflags.unshift(*rest) unless rest.empty?
+ $mflags.unshift(*mflags)
+
+ def $mflags.set?(flag)
+ grep(/\A-(?!-).*#{flag.chr}/i) { return true }
+ false
+ end
+ def $mflags.defined?(var)
+ grep(/\A#{var}=(.*)/) {return block_given? ? yield($1) : $1}
+ false
+ end
+
+ if $mflags.set?(?n)
+ $dryrun = true
+ else
+ $mflags << '-n' if $dryrun
+ end
+
+ $destdir ||= $mflags.defined?("DESTDIR")
+ if $extout ||= $mflags.defined?("EXTOUT")
+ Config.expand($extout)
+ end
+
+ $continue = $mflags.set?(?k)
+
+ if $installed_list ||= $mflags.defined?('INSTALLED_LIST')
+ Config.expand($installed_list, Config::CONFIG)
+ $installed_list = open($installed_list, "ab")
+ $installed_list.sync = true
+ end
+
+ $rdocdir ||= $mflags.defined?('RDOCOUT')
+
+ $dir_mode ||= $prog_mode | 0700
+ $script_mode ||= $prog_mode
+end
+
+parse_args()
+
+include FileUtils
+include FileUtils::NoWrite if $dryrun
+@fileutils_output = STDOUT
+@fileutils_label = ''
+
+$install_procs = Hash.new {[]}
+def install?(*types, &block)
+ $install_procs[:all] <<= block
+ types.each do |type|
+ $install_procs[type] <<= block
+ end
+end
+
+def install(src, dest, options = {})
+ options[:preserve] = true
+ super(src, with_destdir(dest), options)
+ if $installed_list
+ dest = File.join(dest, File.basename(src)) if $made_dirs[dest]
+ $installed_list.puts dest
+ end
+end
+
+def ln_sf(src, dest)
+ super(src, with_destdir(dest))
+ $installed_list.puts dest if $installed_list
+end
+
+$made_dirs = {}
+def makedirs(dirs)
+ dirs = fu_list(dirs)
+ dirs.collect! do |dir|
+ realdir = with_destdir(dir)
+ realdir unless $made_dirs.fetch(dir) do
+ $made_dirs[dir] = true
+ $installed_list.puts(File.join(dir, "")) if $installed_list
+ File.directory?(realdir)
+ end
+ end.compact!
+ super(dirs, :mode => $dir_mode) unless dirs.empty?
+end
+
+def install_recursive(srcdir, dest, options = {})
+ opts = options.clone
+ noinst = opts.delete(:no_install)
+ glob = opts.delete(:glob) || "*"
+ subpath = srcdir.size..-1
+ Dir.glob("#{srcdir}/**/#{glob}") do |src|
+ case base = File.basename(src)
+ when /\A\#.*\#\z/, /~\z/
+ next
+ end
+ if noinst
+ if Array === noinst
+ next if noinst.any? {|n| File.fnmatch?(n, base)}
+ else
+ next if File.fnmatch?(noinst, base)
+ end
+ end
+ d = dest + src[subpath]
+ if File.directory?(src)
+ makedirs(d)
+ else
+ makedirs(File.dirname(d))
+ install src, d, opts
+ end
+ end
+end
+
+def open_for_install(path, mode)
+ data = open(realpath = with_destdir(path), "rb") {|f| f.read} rescue nil
+ newdata = yield
+ unless $dryrun
+ unless newdata == data
+ open(realpath, "wb", mode) {|f| f.write newdata}
+ end
+ File.chmod(mode, realpath)
+ end
+ $installed_list.puts path if $installed_list
+end
+
+def with_destdir(dir)
+ return dir if !$destdir or $destdir.empty?
+ dir = dir.sub(/\A\w:/, '') if File::PATH_SEPARATOR == ';'
+ $destdir + dir
+end
+
+exeext = CONFIG["EXEEXT"]
+
+ruby_install_name = CONFIG["ruby_install_name"]
+rubyw_install_name = CONFIG["rubyw_install_name"]
+
+version = CONFIG["ruby_version"]
+bindir = CONFIG["bindir"]
+libdir = CONFIG["libdir"]
+rubylibdir = CONFIG["rubylibdir"]
+archlibdir = CONFIG["archdir"]
+sitelibdir = CONFIG["sitelibdir"]
+sitearchlibdir = CONFIG["sitearchdir"]
+vendorlibdir = CONFIG["vendorlibdir"]
+vendorarchlibdir = CONFIG["vendorarchdir"]
+mandir = File.join(CONFIG["mandir"], "man")
+configure_args = Shellwords.shellwords(CONFIG["configure_args"])
+enable_shared = CONFIG["ENABLE_SHARED"] == 'yes'
+dll = CONFIG["LIBRUBY_SO"]
+lib = CONFIG["LIBRUBY"]
+arc = CONFIG["LIBRUBY_A"]
+
+install?(:local, :arch, :bin, :'bin-arch') do
+ puts "installing binary commands"
+
+ makedirs [bindir, libdir, archlibdir]
+
+ install ruby_install_name+exeext, bindir, :mode => $prog_mode
+ if rubyw_install_name and !rubyw_install_name.empty?
+ install rubyw_install_name+exeext, bindir, :mode => $prog_mode
+ end
+ if enable_shared and dll != lib
+ install dll, bindir, :mode => $prog_mode
+ end
+ install lib, libdir, :mode => $prog_mode unless lib == arc
+ install arc, libdir, :mode => $data_mode
+ install "config.h", archlibdir, :mode => $data_mode
+ install "rbconfig.rb", archlibdir, :mode => $data_mode
+ if CONFIG["ARCHFILE"]
+ for file in CONFIG["ARCHFILE"].split
+ install file, archlibdir, :mode => $data_mode
+ end
+ end
+
+ if dll == lib and dll != arc
+ for link in CONFIG["LIBRUBY_ALIASES"].split
+ ln_sf(dll, File.join(libdir, link))
+ end
+ end
+end
+
+if $extout
+ extout = "#$extout"
+ install?(:ext, :arch, :'ext-arch') do
+ puts "installing extension objects"
+ makedirs [archlibdir, sitearchlibdir, vendorarchlibdir]
+ if noinst = CONFIG["no_install_files"] and noinst.empty?
+ noinst = nil
+ end
+ install_recursive("#{extout}/#{CONFIG['arch']}", archlibdir, :no_install => noinst, :mode => $prog_mode)
+ end
+ install?(:ext, :comm, :'ext-comm') do
+ puts "installing extension scripts"
+ makedirs [rubylibdir, sitelibdir, vendorlibdir]
+ install_recursive("#{extout}/common", rubylibdir, :mode => $data_mode)
+ end
+end
+
+install?(:rdoc) do
+ if $rdocdir
+ puts "installing rdoc"
+
+ ridatadir = File.join(CONFIG['datadir'], 'ri/$(MAJOR).$(MINOR)/system')
+ Config.expand(ridatadir)
+ makedirs [ridatadir]
+ install_recursive($rdocdir, ridatadir, :mode => $data_mode)
+ end
+end
+
+install?(:local, :comm, :bin, :'bin-comm') do
+ puts "installing command scripts"
+
+ Dir.chdir srcdir
+ makedirs [bindir, rubylibdir]
+
+ ruby_shebang = File.join(bindir, ruby_install_name)
+ if File::ALT_SEPARATOR
+ ruby_bin = ruby_shebang.tr(File::SEPARATOR, File::ALT_SEPARATOR)
+ end
+ for src in Dir["bin/*"]
+ next unless File.file?(src)
+ next if /\/[.#]|(\.(old|bak|orig|rej|diff|patch|core)|~|\/core)$/i =~ src
+
+ name = ruby_install_name.sub(/ruby/, File.basename(src))
+
+ shebang = ''
+ body = ''
+ open(src, "rb") do |f|
+ shebang = f.gets
+ body = f.read
+ end
+ shebang.sub!(/^\#!.*?ruby\b/) {"#!" + ruby_shebang}
+ shebang.sub!(/\r$/, '')
+ body.gsub!(/\r$/, '')
+
+ cmd = File.join(bindir, name)
+ cmd << ".#{$cmdtype}" if $cmdtype
+ open_for_install(cmd, $script_mode) do
+ case $cmdtype
+ when "bat"
+ "#{<<EOH}#{shebang}#{body}#{<<EOF}".gsub(/$/, "\r")
+@echo off
+@if not "%~d0" == "~d0" goto WinNT
+#{ruby_bin} -x "#{cmd}" %1 %2 %3 %4 %5 %6 %7 %8 %9
+@goto endofruby
+:WinNT
+"%~dp0#{ruby_install_name}" -x "%~f0" %*
+@goto endofruby
+EOH
+__END__
+:endofruby
+EOF
+ when "cmd"
+ "#{<<EOH}#{shebang}#{body}"
+@"%~dp0#{ruby_install_name}" -x "%~f0" %*
+@exit /b %ERRORLEVEL%
+EOH
+ else
+ shebang + body
+ end
+ end
+ end
+end
+
+install?(:local, :comm, :lib) do
+ puts "installing library scripts"
+
+ Dir.chdir srcdir
+ makedirs [rubylibdir]
+
+ for f in Dir["lib/**/*{.rb,help-message}"]
+ dir = File.dirname(f).sub!(/\Alib/, rubylibdir) || rubylibdir
+ makedirs dir
+ install f, dir, :mode => $data_mode
+ end
+end
+
+install?(:local, :arch, :lib) do
+ puts "installing headers"
+
+ Dir.chdir(srcdir)
+ makedirs [archlibdir]
+ for f in Dir["*.h"]
+ install f, archlibdir, :mode => $data_mode
+ end
+
+ if RUBY_PLATFORM =~ /mswin32|mingw|bccwin32/
+ win32libdir = File.join(archlibdir, "win32")
+ makedirs win32libdir
+ install "win32/win32.h", win32libdir, :mode => $data_mode
+ end
+end
+
+install?(:local, :comm, :man) do
+ puts "installing manpages"
+
+ Dir.chdir(srcdir)
+ for mdoc in Dir["*.[1-9]"]
+ next unless File.file?(mdoc) and open(mdoc){|fh| fh.read(1) == '.'}
+
+ destdir = mandir + mdoc[/(\d+)$/]
+ destfile = File.join(destdir, mdoc.sub(/ruby/, ruby_install_name))
+
+ makedirs destdir
+
+ if $mantype == "doc"
+ install mdoc, destfile, :mode => $data_mode
+ else
+ require 'mdoc2man.rb'
+
+ w = Tempfile.open(mdoc)
+
+ open(mdoc) { |r|
+ Mdoc2Man.mdoc2man(r, w)
+ }
+
+ w.close
+
+ install w.path, destfile, :mode => $data_mode
+ end
+ end
+end
+
+$install << :local << :ext if $install.empty?
+$install.each do |inst|
+ if !(procs = $install_procs[inst]) || procs.empty?
+ next warn("unknown install target - #{inst}")
+ end
+ procs.each do |block|
+ dir = Dir.pwd
+ begin
+ block.call
+ ensure
+ Dir.chdir(dir)
+ end
+ end
+end
+
+# vi:set sw=2:
diff --git a/intern.h b/intern.h
new file mode 100644
index 0000000000..b670c9c484
--- /dev/null
+++ b/intern.h
@@ -0,0 +1,529 @@
+/**********************************************************************
+
+ intern.h -
+
+ $Author$
+ $Date$
+ created at: Thu Jun 10 14:22:17 JST 1993
+
+ Copyright (C) 1993-2003 Yukihiro Matsumoto
+ Copyright (C) 2000 Network Applied Communication Laboratory, Inc.
+ Copyright (C) 2000 Information-technology Promotion Agency, Japan
+
+**********************************************************************/
+
+/*
+ * Functions and variables that are used by more than one source file of
+ * the kernel.
+ */
+
+#define ID_ALLOCATOR 1
+
+/* array.c */
+void rb_mem_clear _((register VALUE*, register long));
+VALUE rb_assoc_new _((VALUE, VALUE));
+VALUE rb_check_array_type _((VALUE));
+VALUE rb_ary_new _((void));
+VALUE rb_ary_new2 _((long));
+VALUE rb_ary_new3 __((long,...));
+VALUE rb_ary_new4 _((long, const VALUE *));
+VALUE rb_ary_freeze _((VALUE));
+VALUE rb_ary_aref _((int, VALUE*, VALUE));
+void rb_ary_store _((VALUE, long, VALUE));
+VALUE rb_ary_dup _((VALUE));
+VALUE rb_ary_to_ary _((VALUE));
+VALUE rb_ary_to_s _((VALUE));
+VALUE rb_ary_push _((VALUE, VALUE));
+VALUE rb_ary_pop _((VALUE));
+VALUE rb_ary_shift _((VALUE));
+VALUE rb_ary_unshift _((VALUE, VALUE));
+VALUE rb_ary_entry _((VALUE, long));
+VALUE rb_ary_each _((VALUE));
+VALUE rb_ary_join _((VALUE, VALUE));
+VALUE rb_ary_print_on _((VALUE, VALUE));
+VALUE rb_ary_reverse _((VALUE));
+VALUE rb_ary_sort _((VALUE));
+VALUE rb_ary_sort_bang _((VALUE));
+VALUE rb_ary_delete _((VALUE, VALUE));
+VALUE rb_ary_delete_at _((VALUE, long));
+VALUE rb_ary_clear _((VALUE));
+VALUE rb_ary_plus _((VALUE, VALUE));
+VALUE rb_ary_concat _((VALUE, VALUE));
+VALUE rb_ary_assoc _((VALUE, VALUE));
+VALUE rb_ary_rassoc _((VALUE, VALUE));
+VALUE rb_ary_includes _((VALUE, VALUE));
+VALUE rb_ary_cmp _((VALUE, VALUE));
+VALUE rb_protect_inspect _((VALUE(*)(ANYARGS),VALUE,VALUE));
+VALUE rb_inspecting_p _((VALUE));
+VALUE rb_check_array_value _((VALUE));
+VALUE rb_values_at _((VALUE, long, int, VALUE*, VALUE(*) _((VALUE,long))));
+/* bignum.c */
+VALUE rb_big_clone _((VALUE));
+void rb_big_2comp _((VALUE));
+VALUE rb_big_norm _((VALUE));
+VALUE rb_uint2big _((unsigned long));
+VALUE rb_int2big _((long));
+VALUE rb_uint2inum _((unsigned long));
+VALUE rb_int2inum _((long));
+VALUE rb_cstr_to_inum _((const char*, int, int));
+VALUE rb_str_to_inum _((VALUE, int, int));
+VALUE rb_cstr2inum _((const char*, int));
+VALUE rb_str2inum _((VALUE, int));
+VALUE rb_big2str _((VALUE, int));
+VALUE rb_big2str0 _((VALUE, int, int));
+long rb_big2long _((VALUE));
+#define rb_big2int(x) rb_big2long(x)
+unsigned long rb_big2ulong _((VALUE));
+#define rb_big2uint(x) rb_big2ulong(x)
+#if HAVE_LONG_LONG
+VALUE rb_ll2inum _((LONG_LONG));
+VALUE rb_ull2inum _((unsigned LONG_LONG));
+LONG_LONG rb_big2ll _((VALUE));
+unsigned LONG_LONG rb_big2ull _((VALUE));
+#endif /* HAVE_LONG_LONG */
+void rb_quad_pack _((char*,VALUE));
+VALUE rb_quad_unpack _((const char*,int));
+VALUE rb_dbl2big _((double));
+double rb_big2dbl _((VALUE));
+VALUE rb_big_plus _((VALUE, VALUE));
+VALUE rb_big_minus _((VALUE, VALUE));
+VALUE rb_big_mul _((VALUE, VALUE));
+VALUE rb_big_divmod _((VALUE, VALUE));
+VALUE rb_big_pow _((VALUE, VALUE));
+VALUE rb_big_and _((VALUE, VALUE));
+VALUE rb_big_or _((VALUE, VALUE));
+VALUE rb_big_xor _((VALUE, VALUE));
+VALUE rb_big_lshift _((VALUE, VALUE));
+VALUE rb_big_rand _((VALUE, double*));
+/* class.c */
+VALUE rb_class_boot _((VALUE));
+VALUE rb_class_new _((VALUE));
+VALUE rb_mod_init_copy _((VALUE, VALUE));
+VALUE rb_class_init_copy _((VALUE, VALUE));
+VALUE rb_singleton_class_clone _((VALUE));
+void rb_singleton_class_attached _((VALUE,VALUE));
+VALUE rb_make_metaclass _((VALUE, VALUE));
+void rb_check_inheritable _((VALUE));
+VALUE rb_class_inherited _((VALUE, VALUE));
+VALUE rb_define_class_id _((ID, VALUE));
+VALUE rb_module_new _((void));
+VALUE rb_define_module_id _((ID));
+VALUE rb_mod_included_modules _((VALUE));
+VALUE rb_mod_include_p _((VALUE, VALUE));
+VALUE rb_mod_ancestors _((VALUE));
+VALUE rb_class_instance_methods _((int, VALUE*, VALUE));
+VALUE rb_class_public_instance_methods _((int, VALUE*, VALUE));
+VALUE rb_class_protected_instance_methods _((int, VALUE*, VALUE));
+VALUE rb_big_rshift(VALUE, VALUE);
+VALUE rb_class_private_instance_methods _((int, VALUE*, VALUE));
+VALUE rb_obj_singleton_methods _((int, VALUE*, VALUE));
+void rb_define_method_id _((VALUE, ID, VALUE (*)(ANYARGS), int));
+void rb_frozen_class_p _((VALUE));
+void rb_undef _((VALUE, ID));
+void rb_define_protected_method _((VALUE, const char*, VALUE (*)(ANYARGS), int));
+void rb_define_private_method _((VALUE, const char*, VALUE (*)(ANYARGS), int));
+void rb_define_singleton_method _((VALUE, const char*, VALUE(*)(ANYARGS), int));
+VALUE rb_singleton_class _((VALUE));
+/* compar.c */
+int rb_cmpint _((VALUE, VALUE, VALUE));
+NORETURN(void rb_cmperr _((VALUE, VALUE)));
+/* enum.c */
+VALUE rb_block_call _((VALUE, ID, int, VALUE*, VALUE (*)(ANYARGS), VALUE));
+/* enumerator.c */
+VALUE rb_enumeratorize _((VALUE, VALUE, int, VALUE *));
+#define RETURN_ENUMERATOR(obj, argc, argv) do { \
+ if (!rb_block_given_p()) \
+ return rb_enumeratorize(obj, ID2SYM(rb_frame_this_func()), \
+ argc, argv); \
+ } while (0)
+/* error.c */
+RUBY_EXTERN int ruby_nerrs;
+VALUE rb_exc_new _((VALUE, const char*, long));
+VALUE rb_exc_new2 _((VALUE, const char*));
+VALUE rb_exc_new3 _((VALUE, VALUE));
+NORETURN(void rb_loaderror __((const char*, ...)));
+NORETURN(void rb_name_error __((ID, const char*, ...)));
+NORETURN(void rb_invalid_str _((const char*, const char*)));
+void rb_compile_error __((const char*, ...));
+void rb_compile_error_append __((const char*, ...));
+NORETURN(void rb_load_fail _((const char*)));
+NORETURN(void rb_error_frozen _((const char*)));
+void rb_check_frozen _((VALUE));
+/* eval.c */
+RUBY_EXTERN struct RNode *ruby_current_node;
+void ruby_set_current_source _((void));
+NORETURN(void rb_exc_raise _((VALUE)));
+NORETURN(void rb_exc_fatal _((VALUE)));
+VALUE rb_f_exit _((int,VALUE*));
+VALUE rb_f_abort _((int,VALUE*));
+void rb_remove_method _((VALUE, const char*));
+#define rb_disable_super(klass, name) ((void)0)
+#define rb_enable_super(klass, name) ((void)0)
+#define HAVE_RB_DEFINE_ALLOC_FUNC 1
+void rb_define_alloc_func _((VALUE, VALUE (*)(VALUE)));
+void rb_undef_alloc_func _((VALUE));
+void rb_clear_cache _((void));
+void rb_clear_cache_by_class _((VALUE));
+void rb_alias _((VALUE, ID, ID));
+void rb_attr _((VALUE,ID,int,int,int));
+int rb_method_boundp _((VALUE, ID, int));
+VALUE rb_dvar_defined _((ID));
+VALUE rb_dvar_curr _((ID));
+VALUE rb_dvar_ref _((ID));
+void rb_dvar_asgn _((ID, VALUE));
+void rb_dvar_push _((ID, VALUE));
+VALUE *rb_svar _((int));
+VALUE rb_eval_cmd _((VALUE, VALUE, int));
+int rb_obj_respond_to _((VALUE, ID, int));
+int rb_respond_to _((VALUE, ID));
+void rb_interrupt _((void));
+VALUE rb_apply _((VALUE, ID, VALUE));
+void rb_backtrace _((void));
+ID rb_frame_last_func _((void));
+ID rb_frame_this_func _((void));
+VALUE rb_obj_instance_eval _((int, VALUE*, VALUE));
+VALUE rb_mod_module_eval _((int, VALUE*, VALUE));
+void rb_load _((VALUE, int));
+void rb_load_protect _((VALUE, int, int*));
+NORETURN(void rb_jump_tag _((int)));
+int rb_provided _((const char*));
+void rb_provide _((const char*));
+VALUE rb_f_require _((VALUE, VALUE));
+VALUE rb_require_safe _((VALUE, int));
+void rb_obj_call_init _((VALUE, int, VALUE*));
+VALUE rb_class_new_instance _((int, VALUE*, VALUE));
+VALUE rb_block_proc _((void));
+VALUE rb_block_dup _((VALUE, VALUE, VALUE));
+VALUE rb_method_dup _((VALUE, VALUE, VALUE));
+VALUE rb_f_lambda _((void));
+VALUE rb_proc_call _((VALUE, VALUE));
+VALUE rb_obj_method _((VALUE, VALUE));
+VALUE rb_protect _((VALUE (*)(VALUE), VALUE, int*));
+void rb_set_end_proc _((void (*)(VALUE), VALUE));
+void rb_mark_end_proc _((void));
+void rb_exec_end_proc _((void));
+void ruby_finalize _((void));
+NORETURN(void ruby_stop _((int)));
+int ruby_cleanup _((int));
+int ruby_exec _((void));
+void rb_gc_mark_threads _((void));
+void rb_thread_start_timer _((void));
+void rb_thread_stop_timer _((void));
+void rb_thread_schedule _((void));
+void rb_thread_wait_fd _((int));
+int rb_thread_fd_writable _((int));
+void rb_thread_fd_close _((int));
+int rb_thread_alone _((void));
+void rb_thread_polling _((void));
+void rb_thread_sleep _((int));
+void rb_thread_sleep_forever _((void));
+VALUE rb_thread_stop _((void));
+VALUE rb_thread_wakeup _((VALUE));
+VALUE rb_thread_wakeup_alive _((VALUE));
+VALUE rb_thread_run _((VALUE));
+VALUE rb_thread_kill _((VALUE));
+VALUE rb_thread_alive_p _((VALUE));
+VALUE rb_thread_create _((VALUE (*)(ANYARGS), void*));
+void rb_thread_interrupt _((void));
+void rb_thread_trap_eval _((VALUE, int, int));
+void rb_thread_signal_raise _((int));
+void rb_thread_signal_exit _((void));
+int rb_thread_select _((int, fd_set *, fd_set *, fd_set *, struct timeval *));
+void rb_thread_wait_for _((struct timeval));
+VALUE rb_thread_current _((void));
+VALUE rb_thread_main _((void));
+VALUE rb_thread_local_aref _((VALUE, ID));
+VALUE rb_thread_local_aset _((VALUE, ID, VALUE));
+void rb_thread_atfork _((void));
+VALUE rb_exec_recursive _((VALUE(*)(VALUE, VALUE, int),VALUE,VALUE));
+VALUE rb_funcall_rescue __((VALUE, ID, int, ...));
+/* file.c */
+VALUE rb_file_s_expand_path _((int, VALUE *));
+VALUE rb_file_expand_path _((VALUE, VALUE));
+void rb_file_const _((const char*, VALUE));
+int rb_find_file_ext _((VALUE*, const char* const*));
+VALUE rb_find_file _((VALUE));
+char *rb_path_next _((const char *));
+char *rb_path_skip_prefix _((const char *));
+char *rb_path_last_separator _((const char *));
+char *rb_path_end _((const char *));
+VALUE rb_file_directory_p _((VALUE,VALUE));
+/* gc.c */
+NORETURN(void rb_memerror __((void)));
+int ruby_stack_check _((void));
+int ruby_stack_length _((VALUE**));
+char *rb_source_filename _((const char*));
+void rb_gc_mark_locations _((VALUE*, VALUE*));
+void rb_mark_tbl _((struct st_table*));
+void rb_mark_hash _((struct st_table*));
+void rb_gc_mark_maybe _((VALUE));
+void rb_gc_mark _((VALUE));
+void rb_gc_force_recycle _((VALUE));
+void rb_gc _((void));
+void rb_gc_copy_finalizer _((VALUE,VALUE));
+void rb_gc_finalize_deferred _((void));
+void rb_gc_call_finalizer_at_exit _((void));
+VALUE rb_gc_enable _((void));
+VALUE rb_gc_disable _((void));
+VALUE rb_gc_start _((void));
+/* hash.c */
+void st_foreach_safe _((struct st_table *, int (*)(ANYARGS), unsigned long));
+void rb_hash_foreach _((VALUE, int (*)(ANYARGS), VALUE));
+VALUE rb_hash _((VALUE));
+VALUE rb_hash_new _((void));
+VALUE rb_hash_freeze _((VALUE));
+VALUE rb_hash_aref _((VALUE, VALUE));
+VALUE rb_hash_lookup _((VALUE, VALUE));
+VALUE rb_hash_aset _((VALUE, VALUE, VALUE));
+VALUE rb_hash_delete_if _((VALUE));
+VALUE rb_hash_delete _((VALUE,VALUE));
+int rb_path_check _((const char*));
+int rb_env_path_tainted _((void));
+/* io.c */
+#define rb_defout rb_stdout
+RUBY_EXTERN VALUE rb_fs;
+RUBY_EXTERN VALUE rb_output_fs;
+RUBY_EXTERN VALUE rb_rs;
+RUBY_EXTERN VALUE rb_default_rs;
+RUBY_EXTERN VALUE rb_output_rs;
+VALUE rb_io_write _((VALUE, VALUE));
+VALUE rb_io_gets _((VALUE));
+VALUE rb_io_getc _((VALUE));
+VALUE rb_io_ungetc _((VALUE, VALUE));
+VALUE rb_io_close _((VALUE));
+VALUE rb_io_eof _((VALUE));
+VALUE rb_io_binmode _((VALUE));
+VALUE rb_io_addstr _((VALUE, VALUE));
+VALUE rb_io_printf _((int, VALUE*, VALUE));
+VALUE rb_io_print _((int, VALUE*, VALUE));
+VALUE rb_io_puts _((int, VALUE*, VALUE));
+VALUE rb_file_open _((const char*, const char*));
+VALUE rb_gets _((void));
+void rb_write_error _((const char*));
+void rb_write_error2 _((const char*, long));
+/* marshal.c */
+VALUE rb_marshal_dump _((VALUE, VALUE));
+VALUE rb_marshal_load _((VALUE));
+/* numeric.c */
+void rb_num_zerodiv _((void));
+VALUE rb_num_coerce_bin _((VALUE, VALUE));
+VALUE rb_num_coerce_cmp _((VALUE, VALUE));
+VALUE rb_num_coerce_relop _((VALUE, VALUE));
+VALUE rb_float_new _((double));
+VALUE rb_num2fix _((VALUE));
+VALUE rb_fix2str _((VALUE, int));
+VALUE rb_dbl_cmp _((double, double));
+/* object.c */
+int rb_eql _((VALUE, VALUE));
+VALUE rb_any_to_s _((VALUE));
+VALUE rb_inspect _((VALUE));
+VALUE rb_obj_is_instance_of _((VALUE, VALUE));
+VALUE rb_obj_is_kind_of _((VALUE, VALUE));
+VALUE rb_obj_alloc _((VALUE));
+VALUE rb_obj_clone _((VALUE));
+VALUE rb_obj_dup _((VALUE));
+VALUE rb_obj_init_copy _((VALUE,VALUE));
+VALUE rb_obj_taint _((VALUE));
+VALUE rb_obj_tainted _((VALUE));
+VALUE rb_obj_untaint _((VALUE));
+VALUE rb_obj_freeze _((VALUE));
+VALUE rb_obj_id _((VALUE));
+VALUE rb_obj_class _((VALUE));
+VALUE rb_class_real _((VALUE));
+VALUE rb_class_inherited_p _((VALUE, VALUE));
+VALUE rb_convert_type _((VALUE,int,const char*,const char*));
+VALUE rb_check_convert_type _((VALUE,int,const char*,const char*));
+VALUE rb_check_to_integer _((VALUE, const char *));
+VALUE rb_to_int _((VALUE));
+VALUE rb_Integer _((VALUE));
+VALUE rb_Float _((VALUE));
+VALUE rb_String _((VALUE));
+VALUE rb_Array _((VALUE));
+double rb_cstr_to_dbl _((const char*, int));
+double rb_str_to_dbl _((VALUE, int));
+/* parse.y */
+RUBY_EXTERN int ruby_sourceline;
+RUBY_EXTERN char *ruby_sourcefile;
+int ruby_yyparse _((void));
+ID rb_id_attrset _((ID));
+void rb_parser_append_print _((void));
+void rb_parser_while_loop _((int, int));
+int ruby_parser_stack_on_heap _((void));
+void rb_gc_mark_parser _((void));
+int rb_is_const_id _((ID));
+int rb_is_instance_id _((ID));
+int rb_is_class_id _((ID));
+int rb_is_local_id _((ID));
+int rb_is_junk_id _((ID));
+int rb_symname_p _((const char*));
+int rb_sym_interned_p _((VALUE));
+VALUE rb_backref_get _((void));
+void rb_backref_set _((VALUE));
+VALUE rb_lastline_get _((void));
+void rb_lastline_set _((VALUE));
+VALUE rb_sym_all_symbols _((void));
+/* process.c */
+int rb_proc_exec _((const char*));
+VALUE rb_f_exec _((int,VALUE*));
+int rb_waitpid _((int,int*,int));
+void rb_syswait _((int));
+VALUE rb_proc_times _((VALUE));
+VALUE rb_detach_process _((int));
+/* range.c */
+VALUE rb_range_new _((VALUE, VALUE, int));
+VALUE rb_range_beg_len _((VALUE, long*, long*, long, int));
+VALUE rb_length_by_each _((VALUE));
+/* random.c */
+unsigned long rb_genrand_int32(void);
+double rb_genrand_real(void);
+/* re.c */
+int rb_memcmp _((const void*,const void*,long));
+int rb_memcicmp _((const void*,const void*,long));
+long rb_memsearch _((const void*,long,const void*,long));
+VALUE rb_reg_nth_defined _((int, VALUE));
+VALUE rb_reg_nth_match _((int, VALUE));
+VALUE rb_reg_last_match _((VALUE));
+VALUE rb_reg_match_pre _((VALUE));
+VALUE rb_reg_match_post _((VALUE));
+VALUE rb_reg_match_last _((VALUE));
+VALUE rb_reg_new _((const char*, long, int));
+VALUE rb_reg_match _((VALUE, VALUE));
+VALUE rb_reg_match2 _((VALUE));
+int rb_reg_options _((VALUE));
+void rb_set_kcode _((const char*));
+const char* rb_get_kcode _((void));
+void rb_kcode_set_option _((VALUE));
+void rb_kcode_reset_option _((void));
+/* ruby.c */
+RUBY_EXTERN VALUE rb_argv;
+RUBY_EXTERN VALUE rb_argv0;
+void rb_load_file _((const char*));
+void ruby_script _((const char*));
+void ruby_prog_init _((void));
+void ruby_set_argv _((int, char**));
+void ruby_process_options _((int, char**));
+void ruby_load_script _((void));
+void ruby_init_loadpath _((void));
+void ruby_incpush _((const char*));
+/* signal.c */
+VALUE rb_f_kill _((int, VALUE*));
+void rb_gc_mark_trap_list _((void));
+#ifdef POSIX_SIGNAL
+#define posix_signal ruby_posix_signal
+void posix_signal _((int, RETSIGTYPE (*)(int)));
+#endif
+void rb_trap_exit _((void));
+void rb_trap_exec _((void));
+const char *ruby_signal_name _((int));
+void ruby_default_signal _((int));
+/* sprintf.c */
+VALUE rb_f_sprintf _((int, VALUE*));
+VALUE rb_str_format _((int, VALUE*, VALUE));
+/* string.c */
+VALUE rb_str_new _((const char*, long));
+VALUE rb_str_new2 _((const char*));
+VALUE rb_str_new3 _((VALUE));
+VALUE rb_str_new4 _((VALUE));
+VALUE rb_str_new5 _((VALUE, const char*, long));
+VALUE rb_tainted_str_new _((const char*, long));
+VALUE rb_tainted_str_new2 _((const char*));
+VALUE rb_str_buf_new _((long));
+VALUE rb_str_buf_new2 _((const char*));
+VALUE rb_str_tmp_new _((long));
+VALUE rb_str_buf_append _((VALUE, VALUE));
+VALUE rb_str_buf_cat _((VALUE, const char*, long));
+VALUE rb_str_buf_cat2 _((VALUE, const char*));
+VALUE rb_obj_as_string _((VALUE));
+VALUE rb_check_string_type _((VALUE));
+VALUE rb_str_dup _((VALUE));
+VALUE rb_str_locktmp _((VALUE));
+VALUE rb_str_unlocktmp _((VALUE));
+VALUE rb_str_dup_frozen _((VALUE));
+VALUE rb_str_plus _((VALUE, VALUE));
+VALUE rb_str_times _((VALUE, VALUE));
+VALUE rb_str_substr _((VALUE, long, long));
+void rb_str_modify _((VALUE));
+VALUE rb_str_freeze _((VALUE));
+void rb_str_set_len _((VALUE, long));
+VALUE rb_str_resize _((VALUE, long));
+VALUE rb_str_cat _((VALUE, const char*, long));
+VALUE rb_str_cat2 _((VALUE, const char*));
+VALUE rb_str_append _((VALUE, VALUE));
+VALUE rb_str_concat _((VALUE, VALUE));
+int rb_str_hash _((VALUE));
+int rb_str_cmp _((VALUE, VALUE));
+VALUE rb_str_upto _((VALUE, VALUE, int));
+void rb_str_update _((VALUE, long, long, VALUE));
+VALUE rb_str_inspect _((VALUE));
+VALUE rb_str_dump _((VALUE));
+VALUE rb_str_split _((VALUE, const char*));
+void rb_str_associate _((VALUE, VALUE));
+VALUE rb_str_associated _((VALUE));
+void rb_str_setter _((VALUE, ID, VALUE*));
+VALUE rb_str_intern _((VALUE));
+/* struct.c */
+VALUE rb_struct_new __((VALUE, ...));
+VALUE rb_struct_define __((const char*, ...));
+VALUE rb_struct_alloc _((VALUE, VALUE));
+VALUE rb_struct_aref _((VALUE, VALUE));
+VALUE rb_struct_aset _((VALUE, VALUE, VALUE));
+VALUE rb_struct_getmember _((VALUE, ID));
+VALUE rb_struct_iv_get _((VALUE, const char*));
+VALUE rb_struct_s_members _((VALUE));
+VALUE rb_struct_members _((VALUE));
+/* time.c */
+VALUE rb_time_new _((time_t, time_t));
+/* variable.c */
+VALUE rb_mod_name _((VALUE));
+VALUE rb_class_path _((VALUE));
+void rb_set_class_path _((VALUE, VALUE, const char*));
+VALUE rb_path2class _((const char*));
+void rb_name_class _((VALUE, ID));
+VALUE rb_class_name _((VALUE));
+void rb_autoload _((VALUE, ID, const char*));
+VALUE rb_autoload_load _((VALUE, ID));
+VALUE rb_autoload_p _((VALUE, ID));
+void rb_gc_mark_global_tbl _((void));
+VALUE rb_f_trace_var _((int, VALUE*));
+VALUE rb_f_untrace_var _((int, VALUE*));
+VALUE rb_f_global_variables _((void));
+void rb_alias_variable _((ID, ID));
+struct st_table* rb_generic_ivar_table _((VALUE));
+void rb_copy_generic_ivar _((VALUE,VALUE));
+void rb_mark_generic_ivar _((VALUE));
+void rb_mark_generic_ivar_tbl _((void));
+void rb_free_generic_ivar _((VALUE));
+VALUE rb_ivar_get _((VALUE, ID));
+VALUE rb_ivar_set _((VALUE, ID, VALUE));
+VALUE rb_ivar_defined _((VALUE, ID));
+VALUE rb_iv_set _((VALUE, const char*, VALUE));
+VALUE rb_iv_get _((VALUE, const char*));
+VALUE rb_attr_get _((VALUE, ID));
+VALUE rb_obj_instance_variables _((VALUE));
+VALUE rb_obj_remove_instance_variable _((VALUE, VALUE));
+void *rb_mod_const_at _((VALUE, void*));
+void *rb_mod_const_of _((VALUE, void*));
+VALUE rb_const_list _((void*));
+VALUE rb_mod_constants _((VALUE));
+VALUE rb_mod_remove_const _((VALUE, VALUE));
+int rb_const_defined _((VALUE, ID));
+int rb_const_defined_at _((VALUE, ID));
+int rb_const_defined_from _((VALUE, ID));
+VALUE rb_const_get _((VALUE, ID));
+VALUE rb_const_get_at _((VALUE, ID));
+VALUE rb_const_get_from _((VALUE, ID));
+void rb_const_set _((VALUE, ID, VALUE));
+VALUE rb_mod_constants _((VALUE));
+VALUE rb_mod_const_missing _((VALUE,VALUE));
+VALUE rb_cvar_defined _((VALUE, ID));
+#define RB_CVAR_SET_4ARGS 1
+void rb_cvar_set _((VALUE, ID, VALUE, int));
+VALUE rb_cvar_get _((VALUE, ID));
+void rb_cv_set _((VALUE, const char*, VALUE));
+VALUE rb_cv_get _((VALUE, const char*));
+void rb_define_class_variable _((VALUE, const char*, VALUE));
+VALUE rb_mod_class_variables _((VALUE));
+VALUE rb_mod_remove_cvar _((VALUE, VALUE));
+/* version.c */
+void ruby_show_version _((void));
+void ruby_show_copyright _((void));
diff --git a/io.c b/io.c
index 1e6b26b5e4..7663733d1e 100644
--- a/io.c
+++ b/io.c
@@ -3,38 +3,33 @@
io.c -
$Author$
+ $Date$
created at: Fri Oct 15 18:08:59 JST 1993
- Copyright (C) 1993-2007 Yukihiro Matsumoto
+ Copyright (C) 1993-2003 Yukihiro Matsumoto
Copyright (C) 2000 Network Applied Communication Laboratory, Inc.
Copyright (C) 2000 Information-technology Promotion Agency, Japan
**********************************************************************/
-#include "ruby/ruby.h"
-#include "ruby/io.h"
-#include "dln.h"
-#include <ctype.h>
-#include <errno.h>
-
-#define free(x) xfree(x)
-
-#if defined(DOSISH) || defined(__CYGWIN__)
-#include <io.h>
+#if defined(__VMS)
+#define _XOPEN_SOURCE
+#define _POSIX_C_SOURCE 2
#endif
-#include <sys/types.h>
-#if defined HAVE_NET_SOCKET_H
-# include <net/socket.h>
-#elif defined HAVE_SYS_SOCKET_H
-# include <sys/socket.h>
-#endif
+#include "ruby.h"
+#include "rubyio.h"
+#include "rubysig.h"
+#include "env.h"
+#include "re.h"
+#include <ctype.h>
+#include <errno.h>
-#if defined(__BOW__) || defined(__CYGWIN__) || defined(_WIN32) || defined(__EMX__) || defined(__BEOS__)
+#if defined(MSDOS) || defined(__BOW__) || defined(__CYGWIN__) || defined(_WIN32) || defined(__human68k__) || defined(__EMX__) || defined(__BEOS__)
# define NO_SAFE_RENAME
#endif
-#if defined(__CYGWIN__) || defined(_WIN32)
+#if defined(MSDOS) || defined(__CYGWIN__) || defined(_WIN32)
# define NO_LONG_FNAME
#endif
@@ -47,7 +42,7 @@
#endif
#include <sys/types.h>
-#if defined(HAVE_SYS_IOCTL_H) && !defined(_WIN32)
+#if defined(HAVE_SYS_IOCTL_H) && !defined(DJGPP) && !defined(_WIN32) && !defined(__human68k__)
#include <sys/ioctl.h>
#endif
#if defined(HAVE_FCNTL_H) || defined(_WIN32)
@@ -55,10 +50,19 @@
#elif defined(HAVE_SYS_FCNTL_H)
#include <sys/fcntl.h>
#endif
+#ifdef __CYGWIN__
+#include <io.h>
+#endif
#if !HAVE_OFF_T && !defined(off_t)
# define off_t long
#endif
+#if !HAVE_FSEEKO && !defined(fseeko)
+# define fseeko fseek
+#endif
+#if !HAVE_FTELLO && !defined(ftello)
+# define ftello ftell
+#endif
#include <sys/stat.h>
@@ -72,24 +76,25 @@
#endif
#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
#ifdef HAVE_SYSCALL_H
#include <syscall.h>
#elif defined HAVE_SYS_SYSCALL_H
#include <sys/syscall.h>
#endif
-extern void Init_File(void);
+#include <unistd.h>
+#endif
+
+extern void Init_File _((void));
#ifdef __BEOS__
# ifndef NOFILE
# define NOFILE (OPEN_MAX)
# endif
+#include <net/socket.h>
#endif
-#include "ruby/util.h"
+#include "util.h"
#ifndef O_ACCMODE
#define O_ACCMODE (O_RDONLY | O_WRONLY | O_RDWR)
@@ -107,13 +112,9 @@ extern void Init_File(void);
# endif
#endif
-#define numberof(array) (int)(sizeof(array) / sizeof((array)[0]))
-
VALUE rb_cIO;
VALUE rb_eEOFError;
VALUE rb_eIOError;
-VALUE rb_mWaitReadable;
-VALUE rb_mWaitWritable;
VALUE rb_stdin, rb_stdout, rb_stderr;
VALUE rb_deferr; /* rescue VIM plugin */
@@ -126,114 +127,103 @@ VALUE rb_default_rs;
static VALUE argf;
-static ID id_write, id_read, id_getc, id_flush, id_readpartial;
-static VALUE sym_mode, sym_perm, sym_extenc, sym_intenc, sym_encoding, sym_open_args;
-static VALUE sym_textmode, sym_binmode;
-
-struct timeval rb_time_interval(VALUE);
-
-struct argf {
- VALUE filename, current_file;
- int last_lineno; /* $. */
- int lineno;
- int init_p, next_p;
- VALUE argv;
- char *inplace;
- int binmode;
- struct rb_io_enc_t encs;
-};
+static ID id_write, id_read, id_getc;
-static int max_file_descriptor = NOFILE;
-#define UPDATE_MAXFD(fd) \
- do { \
- if (max_file_descriptor < (fd)) max_file_descriptor = (fd); \
- } while (0)
+extern char *ruby_inplace_mode;
-#define argf_of(obj) (*(struct argf *)DATA_PTR(obj))
-#define ARGF argf_of(argf)
+struct timeval rb_time_interval _((VALUE));
+
+static VALUE filename, current_file;
+static int gets_lineno;
+static int init_p = 0, next_p = 0;
+static VALUE lineno = INT2FIX(0);
#ifdef _STDIO_USES_IOSTREAM /* GNU libc */
# ifdef _IO_fpos_t
-# define STDIO_READ_DATA_PENDING(fp) ((fp)->_IO_read_ptr != (fp)->_IO_read_end)
+# define READ_DATA_PENDING(fp) ((fp)->_IO_read_ptr != (fp)->_IO_read_end)
+# define READ_DATA_PENDING_COUNT(fp) ((fp)->_IO_read_end - (fp)->_IO_read_ptr)
+# define READ_DATA_PENDING_PTR(fp) ((fp)->_IO_read_ptr)
# else
-# define STDIO_READ_DATA_PENDING(fp) ((fp)->_gptr < (fp)->_egptr)
+# define READ_DATA_PENDING(fp) ((fp)->_gptr < (fp)->_egptr)
+# define READ_DATA_PENDING_COUNT(fp) ((fp)->_egptr - (fp)->_gptr)
+# define READ_DATA_PENDING_PTR(fp) ((fp)->_gptr)
# endif
+#elif defined(_LP64) && (defined(__sun__) || defined(__sun))
+typedef struct _FILE64 {
+ unsigned char *_ptr; /* next character from/to here in buffer */
+ unsigned char *_base; /* the buffer */
+ unsigned char *_end; /* the end of the buffer */
+ ssize_t _cnt; /* number of available characters in buffer */
+ int _file; /* UNIX System file descriptor */
+ unsigned int _flag; /* the state of the stream */
+ char __fill[80]; /* filler to bring size to 128 bytes */
+} FILE64;
+# define READ_DATA_PENDING(fp) (((FILE64*)(fp))->_cnt > 0)
+# define READ_DATA_PENDING_COUNT(fp) (((FILE64*)(fp))->_cnt)
+# define READ_DATA_PENDING_PTR(fp) ((char *)((FILE64*)(fp))->_ptr)
#elif defined(FILE_COUNT)
-# define STDIO_READ_DATA_PENDING(fp) ((fp)->FILE_COUNT > 0)
+# define READ_DATA_PENDING(fp) ((fp)->FILE_COUNT > 0)
+# define READ_DATA_PENDING_COUNT(fp) ((fp)->FILE_COUNT)
#elif defined(FILE_READEND)
-# define STDIO_READ_DATA_PENDING(fp) ((fp)->FILE_READPTR < (fp)->FILE_READEND)
+# define READ_DATA_PENDING(fp) ((fp)->FILE_READPTR < (fp)->FILE_READEND)
+# define READ_DATA_PENDING_COUNT(fp) ((fp)->FILE_READEND - (fp)->FILE_READPTR)
#elif defined(__BEOS__)
-# define STDIO_READ_DATA_PENDING(fp) (fp->_state._eof == 0)
+# define READ_DATA_PENDING(fp) (fp->_state._eof == 0)
+#elif defined(__VMS)
+# define READ_DATA_PENDING_COUNT(fp) ((unsigned int)(*(fp))->_cnt)
+# define READ_DATA_PENDING(fp) (((unsigned int)(*(fp))->_cnt) > 0)
+# define READ_DATA_BUFFERED(fp) 0
+#elif defined(__DragonFly__)
+/* FILE is an incomplete struct type since DragonFly BSD 1.4.0 */
+# define READ_DATA_PENDING(fp) (((struct __FILE_public *)(fp))->_r > 0)
+# define READ_DATA_PENDING_COUNT(fp) (((struct __FILE_public *)(fp))->_r)
#else
-# define STDIO_READ_DATA_PENDING(fp) (!feof(fp))
+/* requires systems own version of the ReadDataPending() */
+extern int ReadDataPending();
+# define READ_DATA_PENDING(fp) (!feof(fp))
+# define READ_DATA_BUFFERED(fp) 0
#endif
-
-#define GetWriteIO(io) rb_io_get_write_io(io)
-
-#define READ_DATA_PENDING(fptr) ((fptr)->rbuf_len)
-#define READ_DATA_PENDING_COUNT(fptr) ((fptr)->rbuf_len)
-#define READ_DATA_PENDING_PTR(fptr) ((fptr)->rbuf+(fptr)->rbuf_off)
-#define READ_DATA_BUFFERED(fptr) READ_DATA_PENDING(fptr)
-
-#define READ_CHECK(fptr) do {\
- if (!READ_DATA_PENDING(fptr)) {\
- rb_thread_wait_fd((fptr)->fd);\
- rb_io_check_closed(fptr);\
- }\
-} while(0)
-
-#ifndef S_ISSOCK
-# ifdef _S_ISSOCK
-# define S_ISSOCK(m) _S_ISSOCK(m)
-# else
-# ifdef _S_IFSOCK
-# define S_ISSOCK(m) ((m & S_IFMT) == _S_IFSOCK)
-# else
-# ifdef S_IFSOCK
-# define S_ISSOCK(m) ((m & S_IFMT) == S_IFSOCK)
-# endif
-# endif
-# endif
+#ifndef READ_DATA_BUFFERED
+# define READ_DATA_BUFFERED(fp) READ_DATA_PENDING(fp)
#endif
-#if !defined HAVE_SHUTDOWN && !defined shutdown
-#define shutdown(a,b) 0
+#ifndef READ_DATA_PENDING_PTR
+# ifdef FILE_READPTR
+# define READ_DATA_PENDING_PTR(fp) ((char *)(fp)->FILE_READPTR)
+# endif
#endif
-#define rb_sys_fail_path(path) rb_sys_fail(NIL_P(path) ? 0 : RSTRING_PTR(path))
-
-#if defined(_WIN32)
-#define is_socket(fd, path) rb_w32_is_socket(fd)
-#elif !defined(S_ISSOCK)
-#define is_socket(fd, path) 0
-#else
-static int
-is_socket(int fd, VALUE path)
-{
- struct stat sbuf;
- if (fstat(fd, &sbuf) < 0)
- rb_sys_fail_path(path);
- return S_ISSOCK(sbuf.st_mode);
-}
+#if defined __DJGPP__
+# undef READ_DATA_PENDING_COUNT
+# undef READ_DATA_PENDING_PTR
#endif
+#define READ_CHECK(fp) do {\
+ if (!READ_DATA_PENDING(fp)) {\
+ rb_thread_wait_fd(fileno(fp));\
+ rb_io_check_closed(fptr);\
+ }\
+} while(0)
+
void
-rb_eof_error(void)
+rb_eof_error()
{
rb_raise(rb_eEOFError, "end of file reached");
}
VALUE
-rb_io_taint_check(VALUE io)
+rb_io_taint_check(io)
+ VALUE io;
{
- if (!OBJ_UNTRUSTED(io) && rb_safe_level() >= 4)
- rb_raise(rb_eSecurityError, "Insecure: operation on trusted IO");
+ if (!OBJ_TAINTED(io) && rb_safe_level() >= 4)
+ rb_raise(rb_eSecurityError, "Insecure: operation on untainted IO");
rb_check_frozen(io);
return io;
}
void
-rb_io_check_initialized(rb_io_t *fptr)
+rb_io_check_initialized(fptr)
+ rb_io_t *fptr;
{
if (!fptr) {
rb_raise(rb_eIOError, "uninitialized stream");
@@ -241,130 +231,30 @@ rb_io_check_initialized(rb_io_t *fptr)
}
void
-rb_io_check_closed(rb_io_t *fptr)
+rb_io_check_closed(fptr)
+ rb_io_t *fptr;
{
rb_io_check_initialized(fptr);
- if (fptr->fd < 0) {
+ if (!fptr->f && !fptr->f2) {
rb_raise(rb_eIOError, "closed stream");
}
}
-static int io_fflush(rb_io_t *);
-
-VALUE
-rb_io_get_io(VALUE io)
-{
- return rb_convert_type(io, T_FILE, "IO", "to_io");
-}
-
-static VALUE
-rb_io_check_io(VALUE io)
-{
- return rb_check_convert_type(io, T_FILE, "IO", "to_io");
-}
-
-VALUE
-rb_io_get_write_io(VALUE io)
-{
- VALUE write_io;
- rb_io_check_initialized(RFILE(io)->fptr);
- write_io = RFILE(io)->fptr->tied_io_for_writing;
- if (write_io) {
- return write_io;
- }
- return io;
-}
-
-/*
- * call-seq:
- * IO.try_convert(obj) -> io or nil
- *
- * Try to convert <i>obj</i> into an IO, using to_io method.
- * Returns converted IO or nil if <i>obj</i> cannot be converted
- * for any reason.
- *
- * IO.try_convert(STDOUT) # => STDOUT
- * IO.try_convert("STDOUT") # => nil
- *
- * require 'zlib'
- * f = open("/tmp/zz.gz") # => #<File:/tmp/zz.gz>
- * z = Zlib::GzipReader.open(f) # => #<Zlib::GzipReader:0x81d8744>
- * IO.try_convert(z) # => #<File:/tmp/zz.gz>
- *
- */
-static VALUE
-rb_io_s_try_convert(VALUE dummy, VALUE io)
-{
- return rb_io_check_io(io);
-}
-
-static void
-io_unread(rb_io_t *fptr)
-{
- off_t r;
- rb_io_check_closed(fptr);
- if (fptr->rbuf_len == 0 || fptr->mode & FMODE_DUPLEX)
- return;
- /* xxx: target position may be negative if buffer is filled by ungetc */
- r = lseek(fptr->fd, -fptr->rbuf_len, SEEK_CUR);
- if (r < 0) {
- if (errno == ESPIPE)
- fptr->mode |= FMODE_DUPLEX;
- return;
- }
- fptr->rbuf_off = 0;
- fptr->rbuf_len = 0;
- return;
-}
-
-static rb_encoding *io_input_encoding(rb_io_t *fptr);
-
-static void
-io_ungetbyte(VALUE str, rb_io_t *fptr)
-{
- long len = RSTRING_LEN(str);
-
- if (fptr->rbuf == NULL) {
- fptr->rbuf_off = 0;
- fptr->rbuf_len = 0;
-#if SIZEOF_LONG > SIZEOF_INT
- if (len > INT_MAX)
- rb_raise(rb_eIOError, "ungetbyte failed");
-#endif
- if (len > 8192)
- fptr->rbuf_capa = (int)len;
- else
- fptr->rbuf_capa = 8192;
- fptr->rbuf = ALLOC_N(char, fptr->rbuf_capa);
- }
- if (fptr->rbuf_capa < len + fptr->rbuf_len) {
- rb_raise(rb_eIOError, "ungetbyte failed");
- }
- if (fptr->rbuf_off < len) {
- MEMMOVE(fptr->rbuf+fptr->rbuf_capa-fptr->rbuf_len,
- fptr->rbuf+fptr->rbuf_off,
- char, fptr->rbuf_len);
- fptr->rbuf_off = fptr->rbuf_capa-fptr->rbuf_len;
- }
- fptr->rbuf_off-=(int)len;
- fptr->rbuf_len+=(int)len;
- MEMMOVE(fptr->rbuf+fptr->rbuf_off, RSTRING_PTR(str), char, len);
-}
+static void io_fflush _((FILE *, rb_io_t *));
static rb_io_t *
-flush_before_seek(rb_io_t *fptr)
+flush_before_seek(fptr)
+ rb_io_t *fptr;
{
- if (io_fflush(fptr) < 0)
- rb_sys_fail(0);
- io_unread(fptr);
+ if (fptr->mode & FMODE_WBUF) {
+ io_fflush(GetWriteFile(fptr), fptr);
+ }
errno = 0;
return fptr;
}
-#define io_set_eof(fptr) (void)(((fptr)->mode & FMODE_TTY) && ((fptr)->mode |= FMODE_EOF))
-#define io_unset_eof(fptr) (fptr->mode &= ~FMODE_EOF)
-#define io_seek(fptr, ofs, whence) (io_unset_eof(fptr), lseek(flush_before_seek(fptr)->fd, ofs, whence))
-#define io_tell(fptr) lseek(flush_before_seek(fptr)->fd, 0, SEEK_CUR)
+#define io_seek(fptr, ofs, whence) fseeko(flush_before_seek(fptr)->f, ofs, whence)
+#define io_tell(fptr) ftello(flush_before_seek(fptr)->f)
#ifndef SEEK_CUR
# define SEEK_SET 0
@@ -375,79 +265,59 @@ flush_before_seek(rb_io_t *fptr)
#define FMODE_SYNCWRITE (FMODE_SYNC|FMODE_WRITABLE)
void
-rb_io_check_readable(rb_io_t *fptr)
+rb_io_check_readable(fptr)
+ rb_io_t *fptr;
{
rb_io_check_closed(fptr);
if (!(fptr->mode & FMODE_READABLE)) {
rb_raise(rb_eIOError, "not opened for reading");
}
- if (fptr->wbuf_len) {
- if (io_fflush(fptr) < 0)
- rb_sys_fail(0);
- }
- if (fptr->tied_io_for_writing) {
- rb_io_t *wfptr;
- GetOpenFile(fptr->tied_io_for_writing, wfptr);
- if (io_fflush(wfptr) < 0)
- rb_sys_fail(0);
- }
-}
-
-static rb_encoding*
-io_read_encoding(rb_io_t *fptr)
-{
- if (fptr->encs.enc) {
- return fptr->encs.enc;
+#ifdef NEED_IO_SEEK_BETWEEN_RW
+ if (((fptr->mode & FMODE_WBUF) ||
+ (fptr->mode & (FMODE_SYNCWRITE|FMODE_RBUF)) == FMODE_SYNCWRITE) &&
+ !feof(fptr->f) &&
+ !fptr->f2) {
+ io_seek(fptr, 0, SEEK_CUR);
}
- return rb_default_external_encoding();
-}
-
-static rb_encoding*
-io_input_encoding(rb_io_t *fptr)
-{
- if (fptr->encs.enc2) {
- return fptr->encs.enc2;
- }
- return io_read_encoding(fptr);
+#endif
+ fptr->mode |= FMODE_RBUF;
}
void
-rb_io_check_writable(rb_io_t *fptr)
+rb_io_check_writable(fptr)
+ rb_io_t *fptr;
{
rb_io_check_closed(fptr);
if (!(fptr->mode & FMODE_WRITABLE)) {
rb_raise(rb_eIOError, "not opened for writing");
}
- if (fptr->rbuf_len) {
- io_unread(fptr);
+ if ((fptr->mode & FMODE_RBUF) && !feof(fptr->f) && !fptr->f2) {
+ io_seek(fptr, 0, SEEK_CUR);
+ }
+ if (!fptr->f2) {
+ fptr->mode &= ~FMODE_RBUF;
}
}
int
-rb_io_read_pending(rb_io_t *fptr)
+rb_read_pending(fp)
+ FILE *fp;
{
- return READ_DATA_PENDING(fptr);
+ return READ_DATA_PENDING(fp);
}
void
-rb_read_check(FILE *fp)
+rb_read_check(fp)
+ FILE *fp;
{
- if (!STDIO_READ_DATA_PENDING(fp)) {
+ if (!READ_DATA_PENDING(fp)) {
rb_thread_wait_fd(fileno(fp));
}
}
-void
-rb_io_read_check(rb_io_t *fptr)
-{
- if (!READ_DATA_PENDING(fptr)) {
- rb_thread_wait_fd(fptr->fd);
- }
- return;
-}
-
static int
-ruby_dup(int orig)
+ruby_dup(orig)
+ int orig;
{
int fd;
@@ -464,8 +334,10 @@ ruby_dup(int orig)
return fd;
}
+static VALUE io_alloc _((VALUE));
static VALUE
-io_alloc(VALUE klass)
+io_alloc(klass)
+ VALUE klass;
{
NEWOBJ(io, struct RFile);
OBJSETUP(io, klass, T_FILE);
@@ -475,482 +347,254 @@ io_alloc(VALUE klass)
return (VALUE)io;
}
-#ifndef S_ISREG
-# define S_ISREG(m) ((m & S_IFMT) == S_IFREG)
-#endif
-
-static int
-wsplit_p(rb_io_t *fptr)
-{
-#if defined(HAVE_FCNTL) && defined(F_GETFL) && defined(O_NONBLOCK)
- int r;
-#endif
-
- if (!(fptr->mode & FMODE_WSPLIT_INITIALIZED)) {
- struct stat buf;
- if (fstat(fptr->fd, &buf) == 0 &&
- !S_ISREG(buf.st_mode)
-#if defined(HAVE_FCNTL) && defined(F_GETFL) && defined(O_NONBLOCK)
- && (r = fcntl(fptr->fd, F_GETFL)) != -1 &&
- !(r & O_NONBLOCK)
-#endif
- ) {
- fptr->mode |= FMODE_WSPLIT;
- }
- fptr->mode |= FMODE_WSPLIT_INITIALIZED;
- }
- return fptr->mode & FMODE_WSPLIT;
-}
-
-struct io_internal_struct {
- int fd;
- void *buf;
- size_t capa;
-};
-
-static VALUE
-internal_read_func(void *ptr)
-{
- struct io_internal_struct *iis = (struct io_internal_struct*)ptr;
- return read(iis->fd, iis->buf, iis->capa);
-}
-
-static VALUE
-internal_write_func(void *ptr)
-{
- struct io_internal_struct *iis = (struct io_internal_struct*)ptr;
- return write(iis->fd, iis->buf, iis->capa);
-}
-
-static ssize_t
-rb_read_internal(int fd, void *buf, size_t count)
-{
- struct io_internal_struct iis;
- iis.fd = fd;
- iis.buf = buf;
- iis.capa = count;
-
- return (ssize_t)rb_thread_blocking_region(internal_read_func, &iis, RUBY_UBF_IO, 0);
-}
-
-static ssize_t
-rb_write_internal(int fd, void *buf, size_t count)
-{
- struct io_internal_struct iis;
- iis.fd = fd;
- iis.buf = buf;
- iis.capa = count;
-
- return (ssize_t)rb_thread_blocking_region(internal_write_func, &iis, RUBY_UBF_IO, 0);
-}
-
-static long
-io_writable_length(rb_io_t *fptr, long l)
-{
- if (PIPE_BUF < l &&
- !rb_thread_alone() &&
- wsplit_p(fptr)) {
- l = PIPE_BUF;
- }
- return l;
-}
-
-static VALUE
-io_flush_buffer(VALUE arg)
-{
- rb_io_t *fptr = (rb_io_t *)arg;
- long l = io_writable_length(fptr, fptr->wbuf_len);
- return rb_write_internal(fptr->fd, fptr->wbuf+fptr->wbuf_off, l);
-}
-
-static int
-io_fflush(rb_io_t *fptr)
+static void
+io_fflush(f, fptr)
+ FILE *f;
+ rb_io_t *fptr;
{
- long r;
+ int n;
- rb_io_check_closed(fptr);
- if (fptr->wbuf_len == 0)
- return 0;
- if (!rb_thread_fd_writable(fptr->fd)) {
+ if (!rb_thread_fd_writable(fileno(f))) {
rb_io_check_closed(fptr);
}
- retry:
- if (fptr->wbuf_len == 0)
- return 0;
- if (fptr->write_lock) {
- r = rb_mutex_synchronize(fptr->write_lock, io_flush_buffer, (VALUE)fptr);
- }
- else {
- long l = io_writable_length(fptr, fptr->wbuf_len);
- r = rb_write_internal(fptr->fd, fptr->wbuf+fptr->wbuf_off, l);
- }
- /* xxx: Other threads may modify wbuf.
- * A lock is required, definitely. */
- rb_io_check_closed(fptr);
- if (fptr->wbuf_len <= r) {
- fptr->wbuf_off = 0;
- fptr->wbuf_len = 0;
- return 0;
- }
- if (0 <= r) {
- fptr->wbuf_off += (int)r;
- fptr->wbuf_len -= (int)r;
- errno = EAGAIN;
- }
- if (rb_io_wait_writable(fptr->fd)) {
- rb_io_check_closed(fptr);
- goto retry;
+ for (;;) {
+ TRAP_BEG;
+ n = fflush(f);
+ TRAP_END;
+ if (n != EOF) break;
+ if (!rb_io_wait_writable(fileno(f)))
+ rb_sys_fail(fptr->path);
}
- return -1;
-}
-
-#ifdef HAVE_RB_FD_INIT
-static VALUE
-wait_readable(VALUE p)
-{
- rb_fdset_t *rfds = (rb_fdset_t *)p;
-
- return rb_thread_select(rb_fd_max(rfds), rb_fd_ptr(rfds), NULL, NULL, NULL);
+ fptr->mode &= ~FMODE_WBUF;
}
-#endif
int
-rb_io_wait_readable(int f)
+rb_io_wait_readable(f)
+ int f;
{
- rb_fdset_t rfds;
+ fd_set rfds;
- if (f < 0) {
- rb_raise(rb_eIOError, "closed stream");
- }
switch (errno) {
case EINTR:
#if defined(ERESTART)
case ERESTART:
#endif
rb_thread_wait_fd(f);
- return TRUE;
+ return Qtrue;
case EAGAIN:
#if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
case EWOULDBLOCK:
#endif
- rb_fd_init(&rfds);
- rb_fd_set(f, &rfds);
-#ifdef HAVE_RB_FD_INIT
- rb_ensure(wait_readable, (VALUE)&rfds,
- (VALUE (*)(VALUE))rb_fd_term, (VALUE)&rfds);
-#else
- rb_thread_select(f + 1, rb_fd_ptr(&rfds), NULL, NULL, NULL);
-#endif
- return TRUE;
+ FD_ZERO(&rfds);
+ FD_SET(f, &rfds);
+ rb_thread_select(f + 1, &rfds, NULL, NULL, NULL);
+ return Qtrue;
default:
- return FALSE;
+ return Qfalse;
}
}
-#ifdef HAVE_RB_FD_INIT
-static VALUE
-wait_writable(VALUE p)
-{
- rb_fdset_t *wfds = (rb_fdset_t *)p;
-
- return rb_thread_select(rb_fd_max(wfds), NULL, rb_fd_ptr(wfds), NULL, NULL);
-}
-#endif
-
int
-rb_io_wait_writable(int f)
+rb_io_wait_writable(f)
+ int f;
{
- rb_fdset_t wfds;
+ fd_set wfds;
- if (f < 0) {
- rb_raise(rb_eIOError, "closed stream");
- }
switch (errno) {
case EINTR:
#if defined(ERESTART)
case ERESTART:
#endif
rb_thread_fd_writable(f);
- return TRUE;
+ return Qtrue;
case EAGAIN:
#if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
case EWOULDBLOCK:
#endif
- rb_fd_init(&wfds);
- rb_fd_set(f, &wfds);
-#ifdef HAVE_RB_FD_INIT
- rb_ensure(wait_writable, (VALUE)&wfds,
- (VALUE (*)(VALUE))rb_fd_term, (VALUE)&wfds);
-#else
- rb_thread_select(f + 1, NULL, rb_fd_ptr(&wfds), NULL, NULL);
-#endif
- return TRUE;
+ FD_ZERO(&wfds);
+ FD_SET(f, &wfds);
+ rb_thread_select(f + 1, NULL, &wfds, NULL, NULL);
+ return Qtrue;
default:
- return FALSE;
+ return Qfalse;
}
}
-#if defined(RUBY_TEST_CRLF_ENVIRONMENT) || defined(_WIN32)
-/* Windows */
-# define NEED_NEWLINE_DECORATOR_ON_READ(fptr) (!(fptr->mode & FMODE_BINMODE))
-# define NEED_NEWLINE_DECORATOR_ON_WRITE(fptr) (!(fptr->mode & FMODE_BINMODE))
-# define TEXTMODE_NEWLINE_DECORATOR_ON_WRITE ECONV_CRLF_NEWLINE_DECORATOR
-#else
-/* Unix */
-# define NEED_NEWLINE_DECORATOR_ON_READ(fptr) (fptr->mode & FMODE_TEXTMODE)
-# define NEED_NEWLINE_DECORATOR_ON_WRITE(fptr) 0
+#ifndef S_ISREG
+# define S_ISREG(m) ((m & S_IFMT) == S_IFREG)
#endif
-#define NEED_READCONV(fptr) (fptr->encs.enc2 != NULL || NEED_NEWLINE_DECORATOR_ON_READ(fptr))
-#define NEED_WRITECONV(fptr) ((fptr->encs.enc != NULL && fptr->encs.enc != rb_ascii8bit_encoding()) || NEED_NEWLINE_DECORATOR_ON_WRITE(fptr) || (fptr->encs.ecflags & (ECONV_DECORATOR_MASK|ECONV_STATEFUL_DECORATOR_MASK)))
-static void
-make_writeconv(rb_io_t *fptr)
+static int
+wsplit_p(rb_io_t *fptr)
{
- if (!fptr->writeconv_initialized) {
- const char *senc, *denc;
- rb_encoding *enc;
- int ecflags;
- VALUE ecopts;
-
- fptr->writeconv_initialized = 1;
-
- ecflags = fptr->encs.ecflags;
- ecopts = fptr->encs.ecopts;
-#ifdef TEXTMODE_NEWLINE_DECORATOR_ON_WRITE
- if (NEED_NEWLINE_DECORATOR_ON_WRITE(fptr))
- ecflags |= TEXTMODE_NEWLINE_DECORATOR_ON_WRITE;
+ FILE *f = GetWriteFile(fptr);
+#if defined(HAVE_FCNTL) && defined(F_GETFL) && defined(O_NONBLOCK)
+ int r;
#endif
- if (!fptr->encs.enc || (fptr->encs.enc == rb_ascii8bit_encoding() && !fptr->encs.enc2)) {
- /* no encoding conversion */
- fptr->writeconv_pre_ecflags = 0;
- fptr->writeconv_pre_ecopts = Qnil;
- fptr->writeconv = rb_econv_open_opts("", "", ecflags, ecopts);
- if (!fptr->writeconv)
- rb_exc_raise(rb_econv_open_exc("", "", ecflags));
- fptr->writeconv_asciicompat = Qnil;
- }
- else {
- enc = fptr->encs.enc2 ? fptr->encs.enc2 : fptr->encs.enc;
- senc = rb_econv_asciicompat_encoding(rb_enc_name(enc));
- if (!senc && !(fptr->encs.ecflags & ECONV_STATEFUL_DECORATOR_MASK)) {
- /* single conversion */
- fptr->writeconv_pre_ecflags = ecflags;
- fptr->writeconv_pre_ecopts = ecopts;
- fptr->writeconv = NULL;
- fptr->writeconv_asciicompat = Qnil;
- }
- else {
- /* double conversion */
- fptr->writeconv_pre_ecflags = ecflags & ~ECONV_STATEFUL_DECORATOR_MASK;
- fptr->writeconv_pre_ecopts = ecopts;
- if (senc) {
- denc = rb_enc_name(enc);
- fptr->writeconv_asciicompat = rb_str_new2(senc);
- }
- else {
- senc = denc = "";
- fptr->writeconv_asciicompat = rb_str_new2(rb_enc_name(enc));
- }
- ecflags = fptr->encs.ecflags & (ECONV_ERROR_HANDLER_MASK|ECONV_STATEFUL_DECORATOR_MASK);
- ecopts = fptr->encs.ecopts;
- fptr->writeconv = rb_econv_open_opts(senc, denc, ecflags, ecopts);
- if (!fptr->writeconv)
- rb_exc_raise(rb_econv_open_exc(senc, denc, ecflags));
- }
+ if (!(fptr->mode & FMODE_WSPLIT_INITIALIZED)) {
+ struct stat buf;
+ if (fstat(fileno(f), &buf) == 0 &&
+ !S_ISREG(buf.st_mode)
+#if defined(HAVE_FCNTL) && defined(F_GETFL) && defined(O_NONBLOCK)
+ && (r = fcntl(fileno(f), F_GETFL)) != -1 &&
+ !(r & O_NONBLOCK)
+#endif
+ ) {
+ fptr->mode |= FMODE_WSPLIT;
}
+ fptr->mode |= FMODE_WSPLIT_INITIALIZED;
}
+ return fptr->mode & FMODE_WSPLIT;
}
/* writing functions */
-struct binwrite_arg {
- rb_io_t *fptr;
- VALUE str;
- long offset;
- long length;
-};
-
-static VALUE
-io_binwrite_string(VALUE arg)
-{
- struct binwrite_arg *p = (struct binwrite_arg *)arg;
- long l = io_writable_length(p->fptr, p->length);
- return rb_write_internal(p->fptr->fd, RSTRING_PTR(p->str)+p->offset, l);
-}
-
static long
-io_binwrite(VALUE str, rb_io_t *fptr, int nosync)
+io_fwrite(str, fptr)
+ VALUE str;
+ rb_io_t *fptr;
{
- long len, n, r, offset = 0;
+ long len, n, r, l, offset = 0;
+ FILE *f = GetWriteFile(fptr);
- len = RSTRING_LEN(str);
+ len = RSTRING(str)->len;
if ((n = len) <= 0) return n;
- if (fptr->wbuf == NULL && !(!nosync && (fptr->mode & FMODE_SYNC))) {
- fptr->wbuf_off = 0;
- fptr->wbuf_len = 0;
- fptr->wbuf_capa = 8192;
- fptr->wbuf = ALLOC_N(char, fptr->wbuf_capa);
- fptr->write_lock = rb_mutex_new();
- }
- if ((!nosync && (fptr->mode & (FMODE_SYNC|FMODE_TTY))) ||
- (fptr->wbuf && fptr->wbuf_capa <= fptr->wbuf_len + len)) {
- struct binwrite_arg arg;
-
- /* xxx: use writev to avoid double write if available */
- if (fptr->wbuf_len && fptr->wbuf_len+len <= fptr->wbuf_capa) {
- if (fptr->wbuf_capa < fptr->wbuf_off+fptr->wbuf_len+len) {
- MEMMOVE(fptr->wbuf, fptr->wbuf+fptr->wbuf_off, char, fptr->wbuf_len);
- fptr->wbuf_off = 0;
- }
- MEMMOVE(fptr->wbuf+fptr->wbuf_off+fptr->wbuf_len, RSTRING_PTR(str)+offset, char, len);
- fptr->wbuf_len += (int)len;
- n = 0;
- }
- if (io_fflush(fptr) < 0)
- return -1L;
- if (n == 0)
- return len;
- /* avoid context switch between "a" and "\n" in STDERR.puts "a".
- [ruby-dev:25080] */
- if (fptr->stdio_file != stderr && !rb_thread_fd_writable(fptr->fd)) {
+ if (fptr->mode & FMODE_SYNC) {
+ io_fflush(f, fptr);
+ if (!rb_thread_fd_writable(fileno(f))) {
rb_io_check_closed(fptr);
}
- arg.fptr = fptr;
- arg.str = str;
retry:
- arg.offset = offset;
- arg.length = n;
- if (fptr->write_lock) {
- r = rb_mutex_synchronize(fptr->write_lock, io_binwrite_string, (VALUE)&arg);
- }
- else {
- long l = io_writable_length(fptr, n);
- r = rb_write_internal(fptr->fd, RSTRING_PTR(str)+offset, l);
- }
- /* xxx: other threads may modify given string. */
+ l = n;
+ if (PIPE_BUF < l &&
+ !rb_thread_critical &&
+ !rb_thread_alone() &&
+ wsplit_p(fptr)) {
+ l = PIPE_BUF;
+ }
+ TRAP_BEG;
+ r = write(fileno(f), RSTRING(str)->ptr+offset, l);
+ TRAP_END;
if (r == n) return len;
if (0 <= r) {
offset += r;
n -= r;
errno = EAGAIN;
}
- if (rb_io_wait_writable(fptr->fd)) {
+ if (rb_io_wait_writable(fileno(f))) {
rb_io_check_closed(fptr);
- if (offset < RSTRING_LEN(str))
+ if (offset < RSTRING(str)->len)
goto retry;
}
return -1L;
}
-
- if (fptr->wbuf_off) {
- if (fptr->wbuf_len)
- MEMMOVE(fptr->wbuf, fptr->wbuf+fptr->wbuf_off, char, fptr->wbuf_len);
- fptr->wbuf_off = 0;
- }
- MEMMOVE(fptr->wbuf+fptr->wbuf_off+fptr->wbuf_len, RSTRING_PTR(str)+offset, char, len);
- fptr->wbuf_len += (int)len;
- return len;
-}
-
-static VALUE
-do_writeconv(VALUE str, rb_io_t *fptr)
-{
- if (NEED_WRITECONV(fptr)) {
- VALUE common_encoding = Qnil;
-
- make_writeconv(fptr);
-
- if (fptr->writeconv) {
- if (!NIL_P(fptr->writeconv_asciicompat))
- common_encoding = fptr->writeconv_asciicompat;
- else if (!rb_enc_asciicompat(rb_enc_get(str))) {
- rb_raise(rb_eArgError, "ASCII incompatible string written for text mode IO without encoding conversion: %s",
- rb_enc_name(rb_enc_get(str)));
- }
- }
- else {
- if (fptr->encs.enc2)
- common_encoding = rb_enc_from_encoding(fptr->encs.enc2);
- else if (fptr->encs.enc != rb_ascii8bit_encoding())
- common_encoding = rb_enc_from_encoding(fptr->encs.enc);
- }
-
- if (!NIL_P(common_encoding)) {
- str = rb_str_encode(str, common_encoding,
- fptr->writeconv_pre_ecflags, fptr->writeconv_pre_ecopts);
- }
-
- if (fptr->writeconv) {
- str = rb_econv_str_convert(fptr->writeconv, str, ECONV_PARTIAL_INPUT);
- }
+#if defined(__human68k__) || defined(__vms)
+ do {
+ if (fputc(RSTRING(str)->ptr[offset++], f) == EOF) {
+ if (ferror(f)) return -1L;
+ break;
+ }
+ } while (--n > 0);
+#else
+ while (errno = 0, offset += (r = fwrite(RSTRING(str)->ptr+offset, 1, n, f)), (n -= r) > 0) {
+ if (ferror(f)
+#if defined __BORLANDC__
+ || errno
+#endif
+ ) {
+#ifdef __hpux
+ if (!errno) errno = EAGAIN;
+#elif defined(_WIN32) && !defined(__BORLANDC__)
+ /* workaround for MSVCRT's bug */
+ if (!errno) {
+ if (GetLastError() == ERROR_NO_DATA)
+ errno = EPIPE;
+ else
+ errno = EBADF;
+ }
+#endif
+ if (rb_io_wait_writable(fileno(f))) {
+ rb_io_check_closed(fptr);
+ clearerr(f);
+ if (offset < RSTRING(str)->len)
+ continue;
+ }
+ return -1L;
+ }
}
- return str;
-}
-
-static long
-io_fwrite(VALUE str, rb_io_t *fptr, int nosync)
-{
- str = do_writeconv(str, fptr);
- return io_binwrite(str, fptr, nosync);
+#endif
+ return len - n;
}
-static VALUE
-io_write(VALUE io, VALUE str, int nosync)
+long
+rb_io_fwrite(ptr, len, f)
+ const char *ptr;
+ long len;
+ FILE *f;
{
- rb_io_t *fptr;
- long n;
- VALUE tmp;
-
- rb_secure(4);
- io = GetWriteIO(io);
- str = rb_obj_as_string(str);
- tmp = rb_io_check_io(io);
- if (NIL_P(tmp)) {
- /* port is not IO, call write method for it. */
- return rb_funcall(io, id_write, 1, str);
- }
- io = tmp;
- if (RSTRING_LEN(str) == 0) return INT2FIX(0);
-
- GetOpenFile(io, fptr);
- rb_io_check_writable(fptr);
-
- n = io_fwrite(str, fptr, nosync);
- if (n == -1L) rb_sys_fail_path(fptr->pathv);
+ rb_io_t of;
- return LONG2FIX(n);
+ of.f = f;
+ of.f2 = NULL;
+ of.mode = FMODE_WRITABLE;
+ of.path = NULL;
+ return io_fwrite(rb_str_new(ptr, len), &of);
}
/*
* call-seq:
* ios.write(string) => integer
- *
+ *
* Writes the given string to <em>ios</em>. The stream must be opened
* for writing. If the argument is not a string, it will be converted
* to a string using <code>to_s</code>. Returns the number of bytes
* written.
- *
+ *
* count = $stdout.write( "This is a test\n" )
* puts "That was #{count} bytes of data"
- *
+ *
* <em>produces:</em>
- *
+ *
* This is a test
* That was 15 bytes of data
*/
static VALUE
-io_write_m(VALUE io, VALUE str)
+io_write(io, str)
+ VALUE io, str;
{
- return io_write(io, str, 0);
+ rb_io_t *fptr;
+ long n;
+
+ rb_secure(4);
+ if (TYPE(str) != T_STRING)
+ str = rb_obj_as_string(str);
+
+ if (TYPE(io) != T_FILE) {
+ /* port is not IO, call write method for it. */
+ return rb_funcall(io, id_write, 1, str);
+ }
+ if (RSTRING(str)->len == 0) return INT2FIX(0);
+
+ GetOpenFile(io, fptr);
+ rb_io_check_writable(fptr);
+
+ n = io_fwrite(str, fptr);
+ if (n == -1L) rb_sys_fail(fptr->path);
+ if (!(fptr->mode & FMODE_SYNC)) {
+ fptr->mode |= FMODE_WBUF;
+ }
+
+ return LONG2FIX(n);
}
VALUE
-rb_io_write(VALUE io, VALUE str)
+rb_io_write(io, str)
+ VALUE io, str;
{
return rb_funcall(io, id_write, 1, str);
}
@@ -958,21 +602,21 @@ rb_io_write(VALUE io, VALUE str)
/*
* call-seq:
* ios << obj => ios
- *
+ *
* String Output---Writes <i>obj</i> to <em>ios</em>.
* <i>obj</i> will be converted to a string using
* <code>to_s</code>.
- *
+ *
* $stdout << "Hello " << "world!\n"
- *
+ *
* <em>produces:</em>
- *
+ *
* Hello world!
*/
-
VALUE
-rb_io_addstr(VALUE io, VALUE str)
+rb_io_addstr(io, str)
+ VALUE io, str;
{
rb_io_write(io, str);
return io;
@@ -981,41 +625,31 @@ rb_io_addstr(VALUE io, VALUE str)
/*
* call-seq:
* ios.flush => ios
- *
+ *
* Flushes any buffered data within <em>ios</em> to the underlying
* operating system (note that this is Ruby internal buffering only;
* the OS may buffer the data as well).
- *
+ *
* $stdout.print "no newline"
* $stdout.flush
- *
+ *
* <em>produces:</em>
- *
+ *
* no newline
*/
-VALUE
-rb_io_flush(VALUE io)
+static VALUE
+rb_io_flush(io)
+ VALUE io;
{
rb_io_t *fptr;
+ FILE *f;
- if (TYPE(io) != T_FILE) {
- return rb_funcall(io, id_flush, 0);
- }
-
- io = GetWriteIO(io);
GetOpenFile(io, fptr);
+ rb_io_check_writable(fptr);
+ f = GetWriteFile(fptr);
- if (fptr->mode & FMODE_WRITABLE) {
- if (io_fflush(fptr) < 0)
- rb_sys_fail(0);
-#ifdef _WIN32
- fsync(fptr->fd);
-#endif
- }
- if (fptr->mode & FMODE_READABLE) {
- io_unread(fptr);
- }
+ io_fflush(f, fptr);
return io;
}
@@ -1024,9 +658,9 @@ rb_io_flush(VALUE io)
* call-seq:
* ios.pos => integer
* ios.tell => integer
- *
+ *
* Returns the current offset (in bytes) of <em>ios</em>.
- *
+ *
* f = File.new("testfile")
* f.pos #=> 0
* f.gets #=> "This is line one\n"
@@ -1034,20 +668,22 @@ rb_io_flush(VALUE io)
*/
static VALUE
-rb_io_tell(VALUE io)
+rb_io_tell(io)
+ VALUE io;
{
rb_io_t *fptr;
off_t pos;
GetOpenFile(io, fptr);
pos = io_tell(fptr);
- if (pos < 0 && errno) rb_sys_fail_path(fptr->pathv);
- pos -= fptr->rbuf_len;
+ if (pos < 0 && errno) rb_sys_fail(fptr->path);
return OFFT2NUM(pos);
}
static VALUE
-rb_io_seek(VALUE io, VALUE offset, int whence)
+rb_io_seek(io, offset, whence)
+ VALUE io, offset;
+ int whence;
{
rb_io_t *fptr;
off_t pos;
@@ -1055,7 +691,8 @@ rb_io_seek(VALUE io, VALUE offset, int whence)
pos = NUM2OFFT(offset);
GetOpenFile(io, fptr);
pos = io_seek(fptr, pos, whence);
- if (pos < 0 && errno) rb_sys_fail_path(fptr->pathv);
+ if (pos < 0 && errno) rb_sys_fail(fptr->path);
+ clearerr(fptr->f);
return INT2FIX(0);
}
@@ -1063,26 +700,29 @@ rb_io_seek(VALUE io, VALUE offset, int whence)
/*
* call-seq:
* ios.seek(amount, whence=SEEK_SET) -> 0
- *
+ *
* Seeks to a given offset <i>anInteger</i> in the stream according to
* the value of <i>whence</i>:
*
* IO::SEEK_CUR | Seeks to _amount_ plus current position
* --------------+----------------------------------------------------
- * IO::SEEK_END | Seeks to _amount_ plus end of stream (you probably
+ * IO::SEEK_END | Seeks to _amount_ plus end of stream (you probably
* | want a negative value for _amount_)
* --------------+----------------------------------------------------
* IO::SEEK_SET | Seeks to the absolute location given by _amount_
*
* Example:
- *
+ *
* f = File.new("testfile")
* f.seek(-13, IO::SEEK_END) #=> 0
* f.readline #=> "And so on...\n"
*/
static VALUE
-rb_io_seek_m(int argc, VALUE *argv, VALUE io)
+rb_io_seek_m(argc, argv, io)
+ int argc;
+ VALUE *argv;
+ VALUE io;
{
VALUE offset, ptrname;
int whence = SEEK_SET;
@@ -1097,16 +737,17 @@ rb_io_seek_m(int argc, VALUE *argv, VALUE io)
/*
* call-seq:
* ios.pos = integer => integer
- *
+ *
* Seeks to the given position (in bytes) in <em>ios</em>.
- *
+ *
* f = File.new("testfile")
* f.pos = 17
* f.gets #=> "This is line two\n"
*/
static VALUE
-rb_io_set_pos(VALUE io, VALUE offset)
+rb_io_set_pos(io, offset)
+ VALUE io, offset;
{
rb_io_t *fptr;
off_t pos;
@@ -1114,20 +755,19 @@ rb_io_set_pos(VALUE io, VALUE offset)
pos = NUM2OFFT(offset);
GetOpenFile(io, fptr);
pos = io_seek(fptr, pos, SEEK_SET);
- if (pos < 0) rb_sys_fail_path(fptr->pathv);
+ if (pos != 0) rb_sys_fail(fptr->path);
+ clearerr(fptr->f);
return OFFT2NUM(pos);
}
-static void clear_readconv(rb_io_t *fptr);
-
/*
* call-seq:
* ios.rewind => 0
- *
+ *
* Positions <em>ios</em> to the beginning of input, resetting
* <code>lineno</code> to zero.
- *
+ *
* f = File.new("testfile")
* f.readline #=> "This is line one\n"
* f.rewind #=> 0
@@ -1136,57 +776,22 @@ static void clear_readconv(rb_io_t *fptr);
*/
static VALUE
-rb_io_rewind(VALUE io)
+rb_io_rewind(io)
+ VALUE io;
{
rb_io_t *fptr;
GetOpenFile(io, fptr);
- if (io_seek(fptr, 0L, 0) < 0) rb_sys_fail_path(fptr->pathv);
- if (io == ARGF.current_file) {
- ARGF.lineno -= fptr->lineno;
+ if (io_seek(fptr, 0L, 0) != 0) rb_sys_fail(fptr->path);
+ clearerr(fptr->f);
+ if (io == current_file) {
+ gets_lineno -= fptr->lineno;
}
fptr->lineno = 0;
- if (fptr->readconv) {
- clear_readconv(fptr);
- }
return INT2FIX(0);
}
-static int
-io_fillbuf(rb_io_t *fptr)
-{
- ssize_t r;
-
- if (fptr->mode & FMODE_EOF) {
- return -1;
- }
- if (fptr->rbuf == NULL) {
- fptr->rbuf_off = 0;
- fptr->rbuf_len = 0;
- fptr->rbuf_capa = 8192;
- fptr->rbuf = ALLOC_N(char, fptr->rbuf_capa);
- }
- if (fptr->rbuf_len == 0) {
- retry:
- {
- r = rb_read_internal(fptr->fd, fptr->rbuf, fptr->rbuf_capa);
- }
- if (r < 0) {
- if (rb_io_wait_readable(fptr->fd))
- goto retry;
- rb_sys_fail_path(fptr->pathv);
- }
- fptr->rbuf_off = 0;
- fptr->rbuf_len = (int)r; /* r should be <= rbuf_capa */
- if (r == 0) {
- io_set_eof(fptr);
- return -1; /* EOF */
- }
- }
- return 0;
-}
-
/*
* call-seq:
* ios.eof => true or false
@@ -1220,40 +825,51 @@ io_fillbuf(rb_io_t *fptr)
*/
VALUE
-rb_io_eof(VALUE io)
+rb_io_eof(io)
+ VALUE io;
{
rb_io_t *fptr;
+ int ch;
GetOpenFile(io, fptr);
rb_io_check_readable(fptr);
- if (READ_DATA_PENDING(fptr)) return Qfalse;
- READ_CHECK(fptr);
- if (io_fillbuf(fptr) < 0) {
- return Qtrue;
+ if (feof(fptr->f)) return Qtrue;
+ if (READ_DATA_PENDING(fptr->f)) return Qfalse;
+ READ_CHECK(fptr->f);
+ clearerr(fptr->f);
+ TRAP_BEG;
+ ch = getc(fptr->f);
+ TRAP_END;
+
+ if (ch != EOF) {
+ ungetc(ch, fptr->f);
+ return Qfalse;
}
- return Qfalse;
+ rb_io_check_closed(fptr);
+ clearerr(fptr->f);
+ return Qtrue;
}
/*
* call-seq:
* ios.sync => true or false
- *
+ *
* Returns the current ``sync mode'' of <em>ios</em>. When sync mode is
* true, all output is immediately flushed to the underlying operating
* system and is not buffered by Ruby internally. See also
* <code>IO#fsync</code>.
- *
+ *
* f = File.new("testfile")
* f.sync #=> false
*/
static VALUE
-rb_io_sync(VALUE io)
+rb_io_sync(io)
+ VALUE io;
{
rb_io_t *fptr;
- io = GetWriteIO(io);
GetOpenFile(io, fptr);
return (fptr->mode & FMODE_SYNC) ? Qtrue : Qfalse;
}
@@ -1261,152 +877,123 @@ rb_io_sync(VALUE io)
/*
* call-seq:
* ios.sync = boolean => boolean
- *
+ *
* Sets the ``sync mode'' to <code>true</code> or <code>false</code>.
* When sync mode is true, all output is immediately flushed to the
* underlying operating system and is not buffered internally. Returns
* the new state. See also <code>IO#fsync</code>.
- *
+ *
* f = File.new("testfile")
* f.sync = true
- *
+ *
* <em>(produces no output)</em>
*/
static VALUE
-rb_io_set_sync(VALUE io, VALUE sync)
+rb_io_set_sync(io, mode)
+ VALUE io, mode;
{
rb_io_t *fptr;
- io = GetWriteIO(io);
GetOpenFile(io, fptr);
- if (RTEST(sync)) {
+ if (RTEST(mode)) {
fptr->mode |= FMODE_SYNC;
}
else {
fptr->mode &= ~FMODE_SYNC;
}
- return sync;
+ return mode;
}
-#ifdef HAVE_FSYNC
/*
* call-seq:
* ios.fsync => 0 or nil
- *
+ *
* Immediately writes all buffered data in <em>ios</em> to disk.
- * Note that <code>fsync</code> differs from
+ * Returns <code>nil</code> if the underlying operating system does not
+ * support <em>fsync(2)</em>. Note that <code>fsync</code> differs from
* using <code>IO#sync=</code>. The latter ensures that data is flushed
* from Ruby's buffers, but doesn't not guarantee that the underlying
* operating system actually writes it to disk.
- *
- * <code>NotImplementedError</code> is raised
- * if the underlying operating system does not support <em>fsync(2)</em>.
*/
static VALUE
-rb_io_fsync(VALUE io)
+rb_io_fsync(io)
+ VALUE io;
{
+#ifdef HAVE_FSYNC
rb_io_t *fptr;
+ FILE *f;
- io = GetWriteIO(io);
GetOpenFile(io, fptr);
+ f = GetWriteFile(fptr);
- if (io_fflush(fptr) < 0)
- rb_sys_fail(0);
- if (fsync(fptr->fd) < 0)
- rb_sys_fail_path(fptr->pathv);
+ io_fflush(f, fptr);
+ if (fsync(fileno(f)) < 0)
+ rb_sys_fail(fptr->path);
return INT2FIX(0);
-}
#else
-#define rb_io_fsync rb_f_notimplement
+ rb_notimplement();
+ return Qnil; /* not reached */
#endif
-
-#ifdef HAVE_FDATASYNC
-/*
- * call-seq:
- * ios.fdatasync => 0 or nil
- *
- * Immediately writes all buffered data in <em>ios</em> to disk.
- *
- * <code>NotImplementedError</code> is raised
- * if the underlying operating system does not support <em>fdatasync(2)</em>.
- */
-
-static VALUE
-rb_io_fdatasync(VALUE io)
-{
- rb_io_t *fptr;
-
- io = GetWriteIO(io);
- GetOpenFile(io, fptr);
-
- if (io_fflush(fptr) < 0)
- rb_sys_fail(0);
- if (fdatasync(fptr->fd) < 0)
- rb_sys_fail_path(fptr->pathv);
- return INT2FIX(0);
}
-#else
-#define rb_io_fdatasync rb_f_notimplement
-#endif
/*
* call-seq:
* ios.fileno => fixnum
* ios.to_i => fixnum
- *
+ *
* Returns an integer representing the numeric file descriptor for
* <em>ios</em>.
- *
+ *
* $stdin.fileno #=> 0
* $stdout.fileno #=> 1
*/
static VALUE
-rb_io_fileno(VALUE io)
+rb_io_fileno(io)
+ VALUE io;
{
rb_io_t *fptr;
int fd;
GetOpenFile(io, fptr);
- fd = fptr->fd;
+ fd = fileno(fptr->f);
return INT2FIX(fd);
}
-
/*
* call-seq:
* ios.pid => fixnum
- *
+ *
* Returns the process ID of a child process associated with
- * <em>ios</em>. This will be set by <code>IO.popen</code>.
- *
+ * <em>ios</em>. This will be set by <code>IO::popen</code>.
+ *
* pipe = IO.popen("-")
* if pipe
* $stderr.puts "In parent, child pid is #{pipe.pid}"
* else
* $stderr.puts "In child, pid is #{$$}"
* end
- *
+ *
* <em>produces:</em>
- *
+ *
* In child, pid is 26209
* In parent, child pid is 26209
*/
static VALUE
-rb_io_pid(VALUE io)
+rb_io_pid(io)
+ VALUE io;
{
rb_io_t *fptr;
GetOpenFile(io, fptr);
if (!fptr->pid)
return Qnil;
- return PIDT2NUM(fptr->pid);
+ return INT2FIX(fptr->pid);
}
-
/*
* call-seq:
* ios.inspect => string
@@ -1415,292 +1002,168 @@ rb_io_pid(VALUE io)
*/
static VALUE
-rb_io_inspect(VALUE obj)
+rb_io_inspect(obj)
+ VALUE obj;
{
rb_io_t *fptr;
- const char *cname;
- char fd_desc[256];
- const char *path;
- const char *st = "";
+ char *buf;
+ const char *cname, *st = "";
+ long len;
fptr = RFILE(rb_io_taint_check(obj))->fptr;
- if (!fptr) return rb_any_to_s(obj);
+ if (!fptr || !fptr->path) return rb_any_to_s(obj);
cname = rb_obj_classname(obj);
- if (NIL_P(fptr->pathv)) {
- if (fptr->fd < 0) {
- path = "";
- st = "(closed)";
- }
- else {
- snprintf(fd_desc, sizeof(fd_desc), "fd %d", fptr->fd);
- path = fd_desc;
- }
+ len = strlen(cname) + strlen(fptr->path) + 5;
+ if (!(fptr->f || fptr->f2)) {
+ st = " (closed)";
+ len += 9;
}
- else {
- path = RSTRING_PTR(fptr->pathv);
- if (fptr->fd < 0) {
- st = " (closed)";
- }
- }
- return rb_sprintf("#<%s:%s%s>", cname, path, st);
+ buf = ALLOCA_N(char, len);
+ snprintf(buf, len, "#<%s:%s%s>", cname, fptr->path, st);
+ return rb_str_new2(buf);
}
/*
* call-seq:
* ios.to_io -> ios
- *
+ *
* Returns <em>ios</em>.
*/
static VALUE
-rb_io_to_io(VALUE io)
+rb_io_to_io(io)
+ VALUE io;
{
return io;
}
/* reading functions */
static long
-read_buffered_data(char *ptr, long len, rb_io_t *fptr)
+read_buffered_data(ptr, len, f)
+ char *ptr;
+ long len;
+ FILE *f;
{
- int n;
+ long n;
- n = READ_DATA_PENDING_COUNT(fptr);
+#ifdef READ_DATA_PENDING_COUNT
+ n = READ_DATA_PENDING_COUNT(f);
if (n <= 0) return 0;
- if (n > len) n = (int)len;
- MEMMOVE(ptr, fptr->rbuf+fptr->rbuf_off, char, n);
- fptr->rbuf_off += n;
- fptr->rbuf_len -= n;
+ if (n > len) n = len;
+ return fread(ptr, 1, n, f);
+#else
+ int c;
+
+ for (n = 0; n < len && READ_DATA_PENDING(f) && (c = getc(f)) != EOF; ++n) {
+ *ptr++ = c;
+ }
return n;
+#endif
}
static long
-io_fread(VALUE str, long offset, rb_io_t *fptr)
+io_fread(ptr, len, fptr)
+ char *ptr;
+ long len;
+ rb_io_t *fptr;
{
- long len = RSTRING_LEN(str) - offset;
long n = len;
- long c;
-
- if (READ_DATA_PENDING(fptr) == 0) {
- while (n > 0) {
- again:
- c = rb_read_internal(fptr->fd, RSTRING_PTR(str)+offset, n);
- if (c == 0) {
- io_set_eof(fptr);
- break;
- }
- if (c < 0) {
- if (rb_io_wait_readable(fptr->fd))
- goto again;
- rb_sys_fail_path(fptr->pathv);
- }
- offset += c;
- if ((n -= c) <= 0) break;
- rb_thread_wait_fd(fptr->fd);
- }
- return len - n;
- }
+ int c;
+ int saved_errno;
while (n > 0) {
- c = read_buffered_data(RSTRING_PTR(str)+offset, n, fptr);
- if (c > 0) {
- offset += c;
- if ((n -= c) <= 0) break;
- }
- rb_thread_wait_fd(fptr->fd);
- rb_io_check_closed(fptr);
- if (io_fillbuf(fptr) < 0) {
+ c = read_buffered_data(ptr, n, fptr->f);
+ if (c < 0) goto eof;
+ if (c > 0) {
+ ptr += c;
+ if ((n -= c) <= 0) break;
+ }
+ rb_thread_wait_fd(fileno(fptr->f));
+ rb_io_check_closed(fptr);
+ clearerr(fptr->f);
+ TRAP_BEG;
+ c = getc(fptr->f);
+ TRAP_END;
+ if (c == EOF) {
+ eof:
+ if (ferror(fptr->f)) {
+ switch (errno) {
+ case EINTR:
+#if defined(ERESTART)
+ case ERESTART:
+#endif
+ clearerr(fptr->f);
+ continue;
+ case EAGAIN:
+#if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
+ case EWOULDBLOCK:
+#endif
+ if (len > n) {
+ clearerr(fptr->f);
+ }
+ saved_errno = errno;
+ rb_warning("nonblocking IO#read is obsolete; use IO#readpartial or IO#sysread");
+ errno = saved_errno;
+ }
+ if (len == n) return 0;
+ }
break;
}
+ *ptr++ = c;
+ n--;
}
return len - n;
}
+long
+rb_io_fread(ptr, len, f)
+ char *ptr;
+ long len;
+ FILE *f;
+{
+ rb_io_t of;
+
+ of.f = f;
+ of.f2 = NULL;
+ return io_fread(ptr, len, &of);
+}
+
#define SMALLBUF 100
static long
-remain_size(rb_io_t *fptr)
+remain_size(fptr)
+ rb_io_t *fptr;
{
struct stat st;
- off_t siz = READ_DATA_PENDING_COUNT(fptr);
+ off_t siz = BUFSIZ;
off_t pos;
- if (fstat(fptr->fd, &st) == 0 && S_ISREG(st.st_mode)
+ if (feof(fptr->f)) return 0;
+ if (fstat(fileno(fptr->f), &st) == 0 && S_ISREG(st.st_mode)
#ifdef __BEOS__
&& (st.st_dev > 3)
#endif
)
{
- if (io_fflush(fptr) < 0)
- rb_sys_fail(0);
- pos = lseek(fptr->fd, 0, SEEK_CUR);
+ pos = io_tell(fptr);
if (st.st_size >= pos && pos >= 0) {
- siz += st.st_size - pos;
+ siz = st.st_size - pos + 1;
if (siz > LONG_MAX) {
rb_raise(rb_eIOError, "file too big for single read");
}
}
}
- else {
- siz += BUFSIZ;
- }
return (long)siz;
}
static VALUE
-io_enc_str(VALUE str, rb_io_t *fptr)
-{
- OBJ_TAINT(str);
- rb_enc_associate(str, io_read_encoding(fptr));
- return str;
-}
-
-static void
-make_readconv(rb_io_t *fptr, int size)
-{
- if (!fptr->readconv) {
- int ecflags;
- VALUE ecopts;
- const char *sname, *dname;
- ecflags = fptr->encs.ecflags;
- ecopts = fptr->encs.ecopts;
- if (NEED_NEWLINE_DECORATOR_ON_READ(fptr))
- ecflags |= ECONV_UNIVERSAL_NEWLINE_DECORATOR;
- if (fptr->encs.enc2) {
- sname = rb_enc_name(fptr->encs.enc2);
- dname = rb_enc_name(fptr->encs.enc);
- }
- else {
- sname = dname = "";
- }
- fptr->readconv = rb_econv_open_opts(sname, dname, ecflags, ecopts);
- if (!fptr->readconv)
- rb_exc_raise(rb_econv_open_exc(sname, dname, ecflags));
- fptr->cbuf_off = 0;
- fptr->cbuf_len = 0;
- fptr->cbuf_capa = size < 1024 ? 1024 : size;
- fptr->cbuf = ALLOC_N(char, fptr->cbuf_capa);
- }
-}
-
-static int
-more_char(rb_io_t *fptr)
-{
- const unsigned char *ss, *sp, *se;
- unsigned char *ds, *dp, *de;
- rb_econv_result_t res;
- int putbackable;
- int cbuf_len0;
-
- if (fptr->cbuf_len == fptr->cbuf_capa)
- return 0; /* cbuf full */
- if (fptr->cbuf_len == 0)
- fptr->cbuf_off = 0;
- else if (fptr->cbuf_off + fptr->cbuf_len == fptr->cbuf_capa) {
- memmove(fptr->cbuf, fptr->cbuf+fptr->cbuf_off, fptr->cbuf_len);
- fptr->cbuf_off = 0;
- }
-
- cbuf_len0 = fptr->cbuf_len;
-
- while (1) {
- ss = sp = (const unsigned char *)fptr->rbuf + fptr->rbuf_off;
- se = sp + fptr->rbuf_len;
- ds = dp = (unsigned char *)fptr->cbuf + fptr->cbuf_off + fptr->cbuf_len;
- de = (unsigned char *)fptr->cbuf + fptr->cbuf_capa;
- res = rb_econv_convert(fptr->readconv, &sp, se, &dp, de, ECONV_PARTIAL_INPUT|ECONV_AFTER_OUTPUT);
- fptr->rbuf_off += (int)(sp - ss);
- fptr->rbuf_len -= (int)(sp - ss);
- fptr->cbuf_len += (int)(dp - ds);
-
- putbackable = rb_econv_putbackable(fptr->readconv);
- if (putbackable) {
- rb_econv_putback(fptr->readconv, (unsigned char *)fptr->rbuf + fptr->rbuf_off - putbackable, putbackable);
- fptr->rbuf_off -= putbackable;
- fptr->rbuf_len += putbackable;
- }
-
- rb_econv_check_error(fptr->readconv);
-
- if (cbuf_len0 != fptr->cbuf_len)
- return 0;
-
- if (res == econv_finished) {
- clear_readconv(fptr);
- return -1;
- }
-
- if (res == econv_source_buffer_empty) {
- if (fptr->rbuf_len == 0) {
- rb_thread_wait_fd(fptr->fd);
- rb_io_check_closed(fptr);
- if (io_fillbuf(fptr) == -1) {
- ds = dp = (unsigned char *)fptr->cbuf + fptr->cbuf_off + fptr->cbuf_len;
- de = (unsigned char *)fptr->cbuf + fptr->cbuf_capa;
- res = rb_econv_convert(fptr->readconv, NULL, NULL, &dp, de, 0);
- fptr->cbuf_len += (int)(dp - ds);
- rb_econv_check_error(fptr->readconv);
- }
- }
- }
- }
-}
-
-static VALUE
-io_shift_cbuf(rb_io_t *fptr, int len, VALUE *strp)
-{
+read_all(fptr, siz, str)
+ rb_io_t *fptr;
+ long siz;
VALUE str;
- if (NIL_P(*strp)) {
- *strp = str = rb_str_new(fptr->cbuf+fptr->cbuf_off, len);
- }
- else {
- size_t slen;
- str = *strp;
- slen = RSTRING_LEN(str);
- rb_str_resize(str, RSTRING_LEN(str) + len);
- memcpy(RSTRING_PTR(str)+slen, fptr->cbuf+fptr->cbuf_off, len);
- }
- fptr->cbuf_off += len;
- fptr->cbuf_len -= len;
- OBJ_TAINT(str);
- rb_enc_associate(str, fptr->encs.enc);
- /* xxx: set coderange */
- if (fptr->cbuf_len == 0)
- fptr->cbuf_off = 0;
- if (fptr->cbuf_off < fptr->cbuf_capa/2) {
- memmove(fptr->cbuf, fptr->cbuf+fptr->cbuf_off, fptr->cbuf_len);
- fptr->cbuf_off = 0;
- }
- return str;
-}
-
-static VALUE
-read_all(rb_io_t *fptr, long siz, VALUE str)
{
- long bytes;
+ long bytes = 0;
long n;
- long pos;
- rb_encoding *enc;
- int cr;
-
- if (NEED_READCONV(fptr)) {
- if (NIL_P(str)) str = rb_str_new(NULL, 0);
- else rb_str_set_len(str, 0);
- make_readconv(fptr, 0);
- while (1) {
- if (fptr->cbuf_len) {
- io_shift_cbuf(fptr, fptr->cbuf_len, &str);
- }
- if (more_char(fptr) == -1) {
- return io_enc_str(str, fptr);
- }
- }
- }
-
- bytes = 0;
- pos = 0;
-
- enc = io_read_encoding(fptr);
- cr = 0;
if (siz == 0) siz = BUFSIZ;
if (NIL_P(str)) {
@@ -1710,40 +1173,58 @@ read_all(rb_io_t *fptr, long siz, VALUE str)
rb_str_resize(str, siz);
}
for (;;) {
- READ_CHECK(fptr);
- n = io_fread(str, bytes, fptr);
+ rb_str_locktmp(str);
+ READ_CHECK(fptr->f);
+ n = io_fread(RSTRING(str)->ptr+bytes, siz-bytes, fptr);
+ rb_str_unlocktmp(str);
if (n == 0 && bytes == 0) {
- break;
+ if (!fptr->f) break;
+ if (feof(fptr->f)) break;
+ if (!ferror(fptr->f)) break;
+ rb_sys_fail(fptr->path);
}
bytes += n;
- if (cr != ENC_CODERANGE_BROKEN)
- pos = rb_str_coderange_scan_restartable(RSTRING_PTR(str) + pos, RSTRING_PTR(str) + bytes, enc, &cr);
if (bytes < siz) break;
siz += BUFSIZ;
rb_str_resize(str, siz);
}
if (bytes != siz) rb_str_resize(str, bytes);
- str = io_enc_str(str, fptr);
- ENC_CODERANGE_SET(str, cr);
+ OBJ_TAINT(str);
+
return str;
}
-void
-rb_io_set_nonblock(rb_io_t *fptr)
+void rb_io_set_nonblock(rb_io_t *fptr)
{
- int oflags;
+ int flags;
#ifdef F_GETFL
- oflags = fcntl(fptr->fd, F_GETFL);
- if (oflags == -1) {
- rb_sys_fail_path(fptr->pathv);
+ flags = fcntl(fileno(fptr->f), F_GETFL);
+ if (flags == -1) {
+ rb_sys_fail(fptr->path);
+ }
+#else
+ flags = 0;
+#endif
+ if ((flags & O_NONBLOCK) == 0) {
+ flags |= O_NONBLOCK;
+ if (fcntl(fileno(fptr->f), F_SETFL, flags) == -1) {
+ rb_sys_fail(fptr->path);
+ }
}
+ if (fptr->f2) {
+#ifdef F_GETFL
+ flags = fcntl(fileno(fptr->f2), F_GETFL);
+ if (flags == -1) {
+ rb_sys_fail(fptr->path);
+ }
#else
- oflags = 0;
+ flags = 0;
#endif
- if ((oflags & O_NONBLOCK) == 0) {
- oflags |= O_NONBLOCK;
- if (fcntl(fptr->fd, F_SETFL, oflags) == -1) {
- rb_sys_fail_path(fptr->pathv);
+ if ((flags & O_NONBLOCK) == 0) {
+ flags |= O_NONBLOCK;
+ if (fcntl(fileno(fptr->f2), F_SETFL, flags) == -1) {
+ rb_sys_fail(fptr->path);
+ }
}
}
}
@@ -1758,15 +1239,15 @@ io_getpartial(int argc, VALUE *argv, VALUE io, int nonblock)
rb_scan_args(argc, argv, "11", &length, &str);
if ((len = NUM2LONG(length)) < 0) {
- rb_raise(rb_eArgError, "negative length %ld given", len);
+ rb_raise(rb_eArgError, "negative length %ld given", len);
}
if (NIL_P(str)) {
- str = rb_str_new(0, len);
+ str = rb_str_new(0, len);
}
else {
- StringValue(str);
- rb_str_modify(str);
+ StringValue(str);
+ rb_str_modify(str);
rb_str_resize(str, len);
}
OBJ_TAINT(str);
@@ -1775,32 +1256,33 @@ io_getpartial(int argc, VALUE *argv, VALUE io, int nonblock)
rb_io_check_readable(fptr);
if (len == 0)
- return str;
+ return str;
- if (!nonblock)
- READ_CHECK(fptr);
- if (RSTRING_LEN(str) != len) {
+ if (!nonblock) {
+ READ_CHECK(fptr->f);
+ }
+ if (RSTRING(str)->len != len) {
modified:
- rb_raise(rb_eRuntimeError, "buffer string modified");
+ rb_raise(rb_eRuntimeError, "buffer string modified");
}
- n = read_buffered_data(RSTRING_PTR(str), len, fptr);
+ n = read_buffered_data(RSTRING(str)->ptr, len, fptr->f);
if (n <= 0) {
again:
- if (RSTRING_LEN(str) != len) goto modified;
+ if (RSTRING(str)->len != len) goto modified;
if (nonblock) {
rb_io_set_nonblock(fptr);
+ n = read(fileno(fptr->f), RSTRING(str)->ptr, len);
+ }
+ else {
+ TRAP_BEG;
+ n = read(fileno(fptr->f), RSTRING(str)->ptr, len);
+ TRAP_END;
}
- n = rb_read_internal(fptr->fd, RSTRING_PTR(str), len);
if (n < 0) {
- if (!nonblock && rb_io_wait_readable(fptr->fd))
+ if (!nonblock && rb_io_wait_readable(fileno(fptr->f)))
goto again;
- if (nonblock && (errno == EWOULDBLOCK || errno == EAGAIN))
- rb_mod_sys_fail(rb_mWaitReadable, "read would block");
- rb_sys_fail_path(fptr->pathv);
+ rb_sys_fail(fptr->path);
}
- else if (n == 0) {
- io_set_eof(fptr);
- }
}
rb_str_resize(str, n);
@@ -1836,7 +1318,7 @@ io_getpartial(int argc, VALUE *argv, VALUE io, int nonblock)
* When readpartial doesn't blocks, it returns or raises immediately.
* If the buffer is not empty, it returns the data in the buffer.
* Otherwise if the stream has some content,
- * it returns the data in the stream.
+ * it returns the data in the stream.
* Otherwise if the stream is reached to EOF, it raises EOFError.
*
* r, w = IO.pipe # buffer pipe content
@@ -1860,10 +1342,10 @@ io_getpartial(int argc, VALUE *argv, VALUE io, int nonblock)
* Note that readpartial behaves similar to sysread.
* The differences are:
* * If the buffer is not empty, read from the buffer instead of "sysread for buffered IO (IOError)".
- * * It doesn't cause Errno::EWOULDBLOCK and Errno::EINTR. When readpartial meets EWOULDBLOCK and EINTR by read system call, readpartial retry the system call.
+ * * It doesn't cause Errno::EAGAIN and Errno::EINTR. When readpartial meets EAGAIN and EINTR by read system call, readpartial retry the system call.
*
* The later means that readpartial is nonblocking-flag insensitive.
- * It blocks on the situation IO#sysread causes Errno::EWOULDBLOCK as if the fd is blocking mode.
+ * It blocks on the situation IO#sysread causes Errno::EAGAIN as if the fd is blocking mode.
*
*/
@@ -1885,40 +1367,22 @@ io_readpartial(int argc, VALUE *argv, VALUE io)
* ios.read_nonblock(maxlen, outbuf) => outbuf
*
* Reads at most <i>maxlen</i> bytes from <em>ios</em> using
- * the read(2) system call after O_NONBLOCK is set for
+ * read(2) system call after O_NONBLOCK is set for
* the underlying file descriptor.
*
* If the optional <i>outbuf</i> argument is present,
* it must reference a String, which will receive the data.
*
- * read_nonblock just calls the read(2) system call.
- * It causes all errors the read(2) system call causes: Errno::EWOULDBLOCK, Errno::EINTR, etc.
+ * read_nonblock just calls read(2).
+ * It causes all errors read(2) causes: EAGAIN, EINTR, etc.
* The caller should care such errors.
*
- * If the exception is Errno::EWOULDBLOCK or Errno::AGAIN,
- * it is extended by IO::WaitReadable.
- * So IO::WaitReadable can be used to rescue the exceptions for retrying read_nonblock.
- *
* read_nonblock causes EOFError on EOF.
*
* If the read buffer is not empty,
* read_nonblock reads from the buffer like readpartial.
- * In this case, the read(2) system call is not called.
+ * In this case, read(2) is not called.
*
- * When read_nonblock raises an exception kind of IO::WaitReadable,
- * read_nonblock should not be called
- * until io is readable for avoiding busy loop.
- * This can be done as follows.
- *
- * begin
- * result = io.read_nonblock(maxlen)
- * rescue IO::WaitReadable, Errno::EINTR
- * IO.select([io])
- * retry
- * end
- *
- * Note that this is identical to readpartial
- * except the non-blocking flag is set.
*/
static VALUE
@@ -1938,75 +1402,36 @@ io_read_nonblock(int argc, VALUE *argv, VALUE io)
* ios.write_nonblock(string) => integer
*
* Writes the given string to <em>ios</em> using
- * the write(2) system call after O_NONBLOCK is set for
+ * write(2) system call after O_NONBLOCK is set for
* the underlying file descriptor.
*
- * It returns the number of bytes written.
- *
- * write_nonblock just calls the write(2) system call.
- * It causes all errors the write(2) system call causes: Errno::EWOULDBLOCK, Errno::EINTR, etc.
+ * write_nonblock just calls write(2).
+ * It causes all errors write(2) causes: EAGAIN, EINTR, etc.
* The result may also be smaller than string.length (partial write).
* The caller should care such errors and partial write.
*
- * If the exception is Errno::EWOULDBLOCK or Errno::AGAIN,
- * it is extended by IO::WaitWritable.
- * So IO::WaitWritable can be used to rescue the exceptions for retrying write_nonblock.
- *
- * # Creates a pipe.
- * r, w = IO.pipe
- *
- * # write_nonblock writes only 65536 bytes and return 65536.
- * # (The pipe size is 65536 bytes on this environment.)
- * s = "a" * 100000
- * p w.write_nonblock(s) #=> 65536
- *
- * # write_nonblock cannot write a byte and raise EWOULDBLOCK (EAGAIN).
- * p w.write_nonblock("b") # Resource temporarily unavailable (Errno::EAGAIN)
- *
- * If the write buffer is not empty, it is flushed at first.
- *
- * When write_nonblock raises an exception kind of IO::WaitWritable,
- * write_nonblock should not be called
- * until io is writable for avoiding busy loop.
- * This can be done as follows.
- *
- * begin
- * result = io.write_nonblock(string)
- * rescue IO::WaitWritable, Errno::EINTR
- * IO.select(nil, [io])
- * retry
- * end
- *
- * Note that this doesn't guarantee to write all data in string.
- * The length written is reported as result and it should be checked later.
- *
*/
static VALUE
rb_io_write_nonblock(VALUE io, VALUE str)
{
rb_io_t *fptr;
+ FILE *f;
long n;
rb_secure(4);
if (TYPE(str) != T_STRING)
str = rb_obj_as_string(str);
- io = GetWriteIO(io);
GetOpenFile(io, fptr);
rb_io_check_writable(fptr);
- if (io_fflush(fptr) < 0)
- rb_sys_fail(0);
+ f = GetWriteFile(fptr);
rb_io_set_nonblock(fptr);
- n = write(fptr->fd, RSTRING_PTR(str), RSTRING_LEN(str));
+ n = write(fileno(f), RSTRING(str)->ptr, RSTRING(str)->len);
- if (n == -1) {
- if (errno == EWOULDBLOCK || errno == EAGAIN)
- rb_mod_sys_fail(rb_mWaitWritable, "write would block");
- rb_sys_fail_path(fptr->pathv);
- }
+ if (n == -1) rb_sys_fail(fptr->path);
return LONG2FIX(n);
}
@@ -2015,23 +1440,9 @@ rb_io_write_nonblock(VALUE io, VALUE str)
* call-seq:
* ios.read([length [, buffer]]) => string, buffer, or nil
*
- * Reads <i>length</i> bytes from the I/O stream.
- *
+ * Reads at most <i>length</i> bytes from the I/O stream, or to the
+ * end of file if <i>length</i> is omitted or is <code>nil</code>.
* <i>length</i> must be a non-negative integer or nil.
- *
- * If <i>length</i> is a positive integer,
- * it try to read <i>length</i> bytes.
- * It returns nil or a string which length is 1 to <i>length</i> bytes.
- * nil means it met EOF at beginning.
- * The 1 to <i>length</i>-1 bytes string means it met EOF after reading the result.
- * The <i>length</i> bytes string means it doesn't meet EOF.
- *
- * If <i>length</i> is omitted or is <code>nil</code>,
- * it reads until EOF.
- * It returns a string even if EOF is met at beginning.
- *
- * If <i>length</i> is zero, it returns <code>""</code>.
- *
* If the optional <i>buffer</i> argument is present, it must reference
* a String, which will receive the data.
*
@@ -2043,36 +1454,13 @@ rb_io_write_nonblock(VALUE io, VALUE str)
*
* f = File.new("testfile")
* f.read(16) #=> "This is line one"
- *
- * # reads whole file
- * open("file") {|f|
- * data = f.read # This returns a string even if the file is empty.
- * ...
- * }
- *
- * # iterate over fixed length records.
- * open("fixed-record-file") {|f|
- * while record = f.read(256)
- * ...
- * end
- * }
- *
- * # iterate over variable length records.
- * # record is prefixed by 32-bit length.
- * open("variable-record-file") {|f|
- * while len = f.read(4)
- * len = len.unpack("N")[0] # 32-bit length
- * record = f.read(len) # This returns a string even if len is 0.
- * end
- * }
- *
- * Note that this method behaves like fread() function in C.
- * If you need the behavior like read(2) system call,
- * consider readpartial, read_nonblock and sysread.
*/
static VALUE
-io_read(int argc, VALUE *argv, VALUE io)
+io_read(argc, argv, io)
+ int argc;
+ VALUE *argv;
+ VALUE io;
{
rb_io_t *fptr;
long n, len;
@@ -2083,7 +1471,7 @@ io_read(int argc, VALUE *argv, VALUE io)
if (NIL_P(length)) {
if (!NIL_P(str)) StringValue(str);
GetOpenFile(io, fptr);
- rb_io_check_readable(fptr);
+ rb_io_check_readable(fptr);
return read_all(fptr, remain_size(fptr), str);
}
len = NUM2LONG(length);
@@ -2092,7 +1480,7 @@ io_read(int argc, VALUE *argv, VALUE io)
}
if (NIL_P(str)) {
- str = rb_str_new(0, len);
+ str = rb_tainted_str_new(0, len);
}
else {
StringValue(str);
@@ -2102,367 +1490,310 @@ io_read(int argc, VALUE *argv, VALUE io)
GetOpenFile(io, fptr);
rb_io_check_readable(fptr);
+ if (feof(fptr->f)) return Qnil;
if (len == 0) return str;
- READ_CHECK(fptr);
- if (RSTRING_LEN(str) != len) {
+ rb_str_locktmp(str);
+ READ_CHECK(fptr->f);
+ if (RSTRING(str)->len != len) {
rb_raise(rb_eRuntimeError, "buffer string modified");
}
- n = io_fread(str, 0, fptr);
+ n = io_fread(RSTRING(str)->ptr, len, fptr);
+ rb_str_unlocktmp(str);
if (n == 0) {
- if (fptr->fd < 0) return Qnil;
- rb_str_resize(str, 0);
- return Qnil;
+ if (!fptr->f) return Qnil;
+ if (feof(fptr->f)) {
+ rb_str_resize(str, 0);
+ return Qnil;
+ }
+ if (len > 0) rb_sys_fail(fptr->path);
}
rb_str_resize(str, n);
+ RSTRING(str)->len = n;
+ RSTRING(str)->ptr[n] = '\0';
OBJ_TAINT(str);
return str;
}
-static void
-rscheck(const char *rsptr, long rslen, VALUE rs)
-{
- if (!rs) return;
- if (RSTRING_PTR(rs) != rsptr && RSTRING_LEN(rs) != rslen)
- rb_raise(rb_eRuntimeError, "rs modified");
-}
-
static int
-appendline(rb_io_t *fptr, int delim, VALUE *strp, long *lp)
+appendline(fptr, delim, strp)
+ rb_io_t *fptr;
+ int delim;
+ VALUE *strp;
{
+ FILE *f = fptr->f;
VALUE str = *strp;
- long limit = *lp;
-
- if (NEED_READCONV(fptr)) {
- make_readconv(fptr, 0);
- do {
- const char *p, *e;
- int searchlen;
- if (fptr->cbuf_len) {
- p = fptr->cbuf+fptr->cbuf_off;
- searchlen = fptr->cbuf_len;
- if (0 < limit && limit < searchlen)
- searchlen = (int)limit;
- e = memchr(p, delim, searchlen);
- if (e) {
- int len = (int)(e-p+1);
- if (NIL_P(str))
- *strp = str = rb_str_new(p, len);
- else
- rb_str_buf_cat(str, p, len);
- fptr->cbuf_off += len;
- fptr->cbuf_len -= len;
- limit -= len;
- *lp = limit;
- return delim;
- }
-
- if (NIL_P(str))
- *strp = str = rb_str_new(p, searchlen);
- else
- rb_str_buf_cat(str, p, searchlen);
- fptr->cbuf_off += searchlen;
- fptr->cbuf_len -= searchlen;
- limit -= searchlen;
-
- if (limit == 0) {
- *lp = limit;
- return (unsigned char)RSTRING_PTR(str)[RSTRING_LEN(str)-1];
- }
- }
- } while (more_char(fptr) != -1);
- *lp = limit;
- return EOF;
- }
+ int c = EOF;
+#ifndef READ_DATA_PENDING_PTR
+ char buf[8192];
+ char *bp = buf, *bpe = buf + sizeof buf - 3;
+ int update = Qfalse;
+#endif
do {
- long pending = READ_DATA_PENDING_COUNT(fptr);
+#ifdef READ_DATA_PENDING_PTR
+ long pending = READ_DATA_PENDING_COUNT(f);
if (pending > 0) {
- const char *p = READ_DATA_PENDING_PTR(fptr);
- const char *e;
- long last;
-
- if (limit > 0 && pending > limit) pending = limit;
- e = memchr(p, delim, pending);
+ const char *p = READ_DATA_PENDING_PTR(f);
+ const char *e = memchr(p, delim, pending);
+ long last = 0, len = (c != EOF);
if (e) pending = e - p + 1;
+ len += pending;
if (!NIL_P(str)) {
- last = RSTRING_LEN(str);
- rb_str_resize(str, last + pending);
+ last = RSTRING(str)->len;
+ rb_str_resize(str, last + len);
}
else {
- last = 0;
- *strp = str = rb_str_buf_new(pending);
- rb_str_set_len(str, pending);
+ *strp = str = rb_str_buf_new(len);
+ RSTRING(str)->len = len;
+ RSTRING(str)->ptr[len] = '\0';
}
- read_buffered_data(RSTRING_PTR(str) + last, pending, fptr); /* must not fail */
- limit -= pending;
- *lp = limit;
+ if (c != EOF) {
+ RSTRING(str)->ptr[last++] = c;
+ }
+ fread(RSTRING(str)->ptr + last, 1, pending, f); /* must not fail */
if (e) return delim;
- if (limit == 0)
- return (unsigned char)RSTRING_PTR(str)[RSTRING_LEN(str)-1];
}
- rb_thread_wait_fd(fptr->fd);
+ else if (c != EOF) {
+ if (!NIL_P(str)) {
+ char ch = c;
+ rb_str_buf_cat(str, &ch, 1);
+ }
+ else {
+ *strp = str = rb_str_buf_new(1);
+ RSTRING(str)->ptr[RSTRING(str)->len++] = c;
+ }
+ }
+ rb_thread_wait_fd(fileno(f));
rb_io_check_closed(fptr);
- } while (io_fillbuf(fptr) >= 0);
- *lp = limit;
- return EOF;
+#else
+ READ_CHECK(f);
+#endif
+ clearerr(f);
+ TRAP_BEG;
+ c = getc(f);
+ TRAP_END;
+ if (c == EOF) {
+ if (ferror(f)) {
+ clearerr(f);
+ if (!rb_io_wait_readable(fileno(f)))
+ rb_sys_fail(fptr->path);
+ continue;
+ }
+#ifdef READ_DATA_PENDING_PTR
+ return c;
+#endif
+ }
+#ifndef READ_DATA_PENDING_PTR
+ if (c == EOF || (*bp++ = c) == delim || bp == bpe) {
+ int cnt = bp - buf;
+
+ if (cnt > 0) {
+ if (!NIL_P(str))
+ rb_str_cat(str, buf, cnt);
+ else
+ *strp = str = rb_str_new(buf, cnt);
+ }
+ if (c == EOF) {
+ if (update)
+ return (int)RSTRING(str)->ptr[RSTRING(str)->len-1];
+ return c;
+ }
+ bp = buf;
+ }
+ update = Qtrue;
+#endif
+ } while (c != delim);
+
+#ifdef READ_DATA_PENDING_PTR
+ {
+ char ch = c;
+ if (!NIL_P(str)) {
+ rb_str_cat(str, &ch, 1);
+ }
+ else {
+ *strp = str = rb_str_new(&ch, 1);
+ }
+ }
+#endif
+
+ return c;
}
static inline int
-swallow(rb_io_t *fptr, int term)
+swallow(fptr, term)
+ rb_io_t *fptr;
+ int term;
{
+ FILE *f = fptr->f;
+ int c;
+
do {
- size_t cnt;
- while ((cnt = READ_DATA_PENDING_COUNT(fptr)) > 0) {
+#ifdef READ_DATA_PENDING_PTR
+ long cnt;
+ while ((cnt = READ_DATA_PENDING_COUNT(f)) > 0) {
char buf[1024];
- const char *p = READ_DATA_PENDING_PTR(fptr);
+ const char *p = READ_DATA_PENDING_PTR(f);
int i;
if (cnt > sizeof buf) cnt = sizeof buf;
- if (*p != term) return TRUE;
- i = (int)cnt;
+ if (*p != term) return Qtrue;
+ i = cnt;
while (--i && *++p == term);
- if (!read_buffered_data(buf, cnt - i, fptr)) /* must not fail */
- rb_sys_fail_path(fptr->pathv);
+ if (!fread(buf, 1, cnt - i, f)) /* must not fail */
+ rb_sys_fail(fptr->path);
}
- rb_thread_wait_fd(fptr->fd);
+ rb_thread_wait_fd(fileno(f));
rb_io_check_closed(fptr);
- } while (io_fillbuf(fptr) == 0);
- return FALSE;
+#else
+ READ_CHECK(f);
+#endif
+ clearerr(f);
+ TRAP_BEG;
+ c = getc(f);
+ TRAP_END;
+ if (c != term) {
+ ungetc(c, f);
+ return Qtrue;
+ }
+ } while (c != EOF);
+ return Qfalse;
}
static VALUE
-rb_io_getline_fast(rb_io_t *fptr, rb_encoding *enc)
+rb_io_getline_fast(fptr, delim)
+ rb_io_t *fptr;
+ unsigned char delim;
{
VALUE str = Qnil;
- int len = 0;
- long pos = 0;
- int cr = 0;
+ int c;
- for (;;) {
- int pending = READ_DATA_PENDING_COUNT(fptr);
+ while ((c = appendline(fptr, delim, &str)) != EOF && c != delim);
- if (pending > 0) {
- const char *p = READ_DATA_PENDING_PTR(fptr);
- const char *e;
-
- e = memchr(p, '\n', pending);
- if (e) {
- pending = (int)(e - p + 1);
- }
- if (NIL_P(str)) {
- str = rb_str_new(p, pending);
- fptr->rbuf_off += pending;
- fptr->rbuf_len -= pending;
- }
- else {
- rb_str_resize(str, len + pending);
- read_buffered_data(RSTRING_PTR(str)+len, pending, fptr);
- }
- len += pending;
- if (cr != ENC_CODERANGE_BROKEN)
- pos = rb_str_coderange_scan_restartable(RSTRING_PTR(str) + pos, RSTRING_PTR(str) + len, enc, &cr);
- if (e) break;
- }
- rb_thread_wait_fd(fptr->fd);
- rb_io_check_closed(fptr);
- if (io_fillbuf(fptr) < 0) {
- if (NIL_P(str)) return Qnil;
- break;
- }
+ if (!NIL_P(str)) {
+ fptr->lineno++;
+ lineno = INT2FIX(fptr->lineno);
+ OBJ_TAINT(str);
}
- str = io_enc_str(str, fptr);
- ENC_CODERANGE_SET(str, cr);
- fptr->lineno++;
- ARGF.last_lineno = fptr->lineno;
-
return str;
}
-static void
-prepare_getline_args(int argc, VALUE *argv, VALUE *rsp, long *limit, VALUE io)
+static int
+rscheck(rsptr, rslen, rs)
+ const char *rsptr;
+ long rslen;
+ VALUE rs;
{
- VALUE rs = rb_rs, lim = Qnil;
- rb_io_t *fptr;
-
- if (argc == 1) {
- VALUE tmp = Qnil;
-
- if (NIL_P(argv[0]) || !NIL_P(tmp = rb_check_string_type(argv[0]))) {
- rs = tmp;
- }
- else {
- lim = argv[0];
- }
- }
- else if (2 <= argc) {
- rb_scan_args(argc, argv, "2", &rs, &lim);
- if (!NIL_P(rs))
- StringValue(rs);
- }
- if (!NIL_P(rs)) {
- rb_encoding *enc_rs, *enc_io;
-
- GetOpenFile(io, fptr);
- enc_rs = rb_enc_get(rs);
- enc_io = io_read_encoding(fptr);
- if (enc_io != enc_rs &&
- (rb_enc_str_coderange(rs) != ENC_CODERANGE_7BIT ||
- !rb_enc_asciicompat(enc_io))) {
- if (rs == rb_default_rs) {
- rs = rb_enc_str_new(0, 0, enc_io);
- rb_str_buf_cat_ascii(rs, "\n");
- }
- else {
- rb_raise(rb_eArgError, "encoding mismatch: %s IO with %s RS",
- rb_enc_name(enc_io),
- rb_enc_name(enc_rs));
- }
- }
- }
- *rsp = rs;
- *limit = NIL_P(lim) ? -1L : NUM2LONG(lim);
+ if (RSTRING(rs)->ptr != rsptr && RSTRING(rs)->len != rslen)
+ rb_raise(rb_eRuntimeError, "rs modified");
+ return 1;
}
+static VALUE rb_io_getline(VALUE rs, VALUE io);
+
static VALUE
-rb_io_getline_1(VALUE rs, long limit, VALUE io)
+rb_io_getline(rs, io)
+ VALUE rs, io;
{
VALUE str = Qnil;
rb_io_t *fptr;
- int nolimit = 0;
- rb_encoding *enc;
GetOpenFile(io, fptr);
rb_io_check_readable(fptr);
- if (NIL_P(rs) && limit < 0) {
+ if (NIL_P(rs)) {
str = read_all(fptr, 0, Qnil);
- if (RSTRING_LEN(str) == 0) return Qnil;
- }
- else if (limit == 0) {
- return rb_enc_str_new(0, 0, io_read_encoding(fptr));
+ if (RSTRING(str)->len == 0) return Qnil;
}
- else if (rs == rb_default_rs && limit < 0 && !NEED_READCONV(fptr) &&
- rb_enc_asciicompat(enc = io_read_encoding(fptr))) {
- return rb_io_getline_fast(fptr, enc);
+ else if (rs == rb_default_rs) {
+ return rb_io_getline_fast(fptr, '\n');
}
else {
- int c, newline = -1;
- const char *rsptr = 0;
- long rslen = 0;
+ int c, newline;
+ const char *rsptr;
+ long rslen;
int rspara = 0;
- int extra_limit = 16;
-
- if (!NIL_P(rs)) {
- rslen = RSTRING_LEN(rs);
- if (rslen == 0) {
- rsptr = "\n\n";
- rslen = 2;
- rspara = 1;
- swallow(fptr, '\n');
- rs = 0;
- }
- else {
- rsptr = RSTRING_PTR(rs);
- }
- newline = (unsigned char)rsptr[rslen - 1];
- }
- /* MS - Optimisation */
- enc = io_read_encoding(fptr);
- while ((c = appendline(fptr, newline, &str, &limit)) != EOF) {
- const char *s, *p, *pp, *e;
-
- if (c == newline) {
- if (RSTRING_LEN(str) < rslen) continue;
- s = RSTRING_PTR(str);
- e = s + RSTRING_LEN(str);
- p = e - rslen;
- pp = rb_enc_left_char_head(s, p, e, enc);
- if (pp != p) continue;
- if (!rspara) rscheck(rsptr, rslen, rs);
- if (memcmp(p, rsptr, rslen) == 0) break;
- }
- if (limit == 0) {
- s = RSTRING_PTR(str);
- p = s + RSTRING_LEN(str);
- pp = rb_enc_left_char_head(s, p-1, p, enc);
- if (extra_limit &&
- MBCLEN_NEEDMORE_P(rb_enc_precise_mbclen(pp, p, enc))) {
- /* relax the limit while incomplete character.
- * extra_limit limits the relax length */
- limit = 1;
- extra_limit--;
- }
- else {
- nolimit = 1;
- break;
- }
- }
+ rslen = RSTRING(rs)->len;
+ if (rslen == 0) {
+ rsptr = "\n\n";
+ rslen = 2;
+ rspara = 1;
+ swallow(fptr, '\n');
+ }
+ else if (rslen == 1) {
+ return rb_io_getline_fast(fptr, (unsigned char)RSTRING(rs)->ptr[0]);
}
+ else {
+ rsptr = RSTRING(rs)->ptr;
+ }
+ newline = rsptr[rslen - 1];
+
+ while ((c = appendline(fptr, newline, &str)) != EOF &&
+ (c != newline || RSTRING(str)->len < rslen ||
+ ((rspara || rscheck(rsptr,rslen,rs)) && 0) ||
+ memcmp(RSTRING(str)->ptr+RSTRING(str)->len-rslen,rsptr,rslen)));
if (rspara) {
if (c != EOF) {
swallow(fptr, '\n');
}
}
- if (!NIL_P(str))
- str = io_enc_str(str, fptr);
}
if (!NIL_P(str)) {
- if (!nolimit) {
- fptr->lineno++;
- ARGF.last_lineno = fptr->lineno;
- }
+ fptr->lineno++;
+ lineno = INT2FIX(fptr->lineno);
+ OBJ_TAINT(str);
}
return str;
}
-static VALUE
-rb_io_getline(int argc, VALUE *argv, VALUE io)
-{
- VALUE rs;
- long limit;
-
- prepare_getline_args(argc, argv, &rs, &limit, io);
- return rb_io_getline_1(rs, limit, io);
-}
-
VALUE
-rb_io_gets(VALUE io)
+rb_io_gets(io)
+ VALUE io;
{
- return rb_io_getline_1(rb_default_rs, -1, io);
+ rb_io_t *fptr;
+
+ GetOpenFile(io, fptr);
+ rb_io_check_readable(fptr);
+ return rb_io_getline_fast(fptr, '\n');
}
/*
* call-seq:
- * ios.gets(sep=$/) => string or nil
- * ios.gets(limit) => string or nil
- * ios.gets(sep, limit) => string or nil
- *
+ * ios.gets(sep_string=$/) => string or nil
+ *
* Reads the next ``line'' from the I/O stream; lines are separated by
- * <i>sep</i>. A separator of <code>nil</code> reads the entire
+ * <i>sep_string</i>. A separator of <code>nil</code> reads the entire
* contents, and a zero-length separator reads the input a paragraph at
* a time (two successive newlines in the input separate paragraphs).
* The stream must be opened for reading or an <code>IOError</code>
* will be raised. The line read in will be returned and also assigned
* to <code>$_</code>. Returns <code>nil</code> if called at end of
- * file. If the first argument is an integer, or optional second
- * argument is given, the returning string would not be longer than the
- * given value in bytes.
- *
+ * file.
+ *
* File.new("testfile").gets #=> "This is line one\n"
* $_ #=> "This is line one\n"
*/
static VALUE
-rb_io_gets_m(int argc, VALUE *argv, VALUE io)
+rb_io_gets_m(argc, argv, io)
+ int argc;
+ VALUE *argv;
+ VALUE io;
{
- VALUE str;
+ VALUE rs, str;
- str = rb_io_getline(argc, argv, io);
+ if (argc == 0) {
+ rs = rb_rs;
+ }
+ else {
+ rb_scan_args(argc, argv, "1", &rs);
+ if (!NIL_P(rs)) StringValue(rs);
+ }
+ str = rb_io_getline(rs, io);
rb_lastline_set(str);
return str;
@@ -2471,14 +1802,14 @@ rb_io_gets_m(int argc, VALUE *argv, VALUE io)
/*
* call-seq:
* ios.lineno => integer
- *
+ *
* Returns the current line number in <em>ios</em>. The stream must be
* opened for reading. <code>lineno</code> counts the number of times
* <code>gets</code> is called, rather than the number of newlines
* encountered. The two values will differ if <code>gets</code> is
* called with a separator other than newline. See also the
* <code>$.</code> variable.
- *
+ *
* f = File.new("testfile")
* f.lineno #=> 0
* f.gets #=> "This is line one\n"
@@ -2488,7 +1819,8 @@ rb_io_gets_m(int argc, VALUE *argv, VALUE io)
*/
static VALUE
-rb_io_lineno(VALUE io)
+rb_io_lineno(io)
+ VALUE io;
{
rb_io_t *fptr;
@@ -2500,22 +1832,23 @@ rb_io_lineno(VALUE io)
/*
* call-seq:
* ios.lineno = integer => integer
- *
+ *
* Manually sets the current line number to the given value.
* <code>$.</code> is updated only on the next read.
- *
+ *
* f = File.new("testfile")
* f.gets #=> "This is line one\n"
* $. #=> 1
* f.lineno = 1000
* f.lineno #=> 1000
- * $. #=> 1 # lineno of last read
+ * $. # lineno of last read #=> 1
* f.gets #=> "This is line two\n"
- * $. #=> 1001 # lineno of last read
+ * $. # lineno of last read #=> 1001
*/
static VALUE
-rb_io_set_lineno(VALUE io, VALUE lineno)
+rb_io_set_lineno(io, lineno)
+ VALUE io, lineno;
{
rb_io_t *fptr;
@@ -2525,18 +1858,44 @@ rb_io_set_lineno(VALUE io, VALUE lineno)
return lineno;
}
+static void
+lineno_setter(val, id, var)
+ VALUE val;
+ ID id;
+ VALUE *var;
+{
+ gets_lineno = NUM2INT(val);
+ *var = INT2FIX(gets_lineno);
+}
+
+static VALUE
+argf_set_lineno(argf, val)
+ VALUE argf, val;
+{
+ gets_lineno = NUM2INT(val);
+ lineno = INT2FIX(gets_lineno);
+ return Qnil;
+}
+
+static VALUE
+argf_lineno()
+{
+ return lineno;
+}
+
/*
* call-seq:
- * ios.readline(sep=$/) => string
- * ios.readline(limit) => string
- * ios.readline(sep, limit) => string
- *
+ * ios.readline(sep_string=$/) => string
+ *
* Reads a line as with <code>IO#gets</code>, but raises an
* <code>EOFError</code> on end of file.
*/
static VALUE
-rb_io_readline(int argc, VALUE *argv, VALUE io)
+rb_io_readline(argc, argv, io)
+ int argc;
+ VALUE *argv;
+ VALUE io;
{
VALUE line = rb_io_gets_m(argc, argv, io);
@@ -2548,31 +1907,37 @@ rb_io_readline(int argc, VALUE *argv, VALUE io)
/*
* call-seq:
- * ios.readlines(sep=$/) => array
- * ios.readlines(limit) => array
- * ios.readlines(sep, limit) => array
- *
+ * ios.readlines(sep_string=$/) => array
+ *
* Reads all of the lines in <em>ios</em>, and returns them in
- * <i>anArray</i>. Lines are separated by the optional <i>sep</i>. If
- * <i>sep</i> is <code>nil</code>, the rest of the stream is returned
- * as a single record. If the first argument is an integer, or
- * optional second argument is given, the returning string would not be
- * longer than the given value in bytes. The stream must be opened for
- * reading or an <code>IOError</code> will be raised.
- *
+ * <i>anArray</i>. Lines are separated by the optional
+ * <i>sep_string</i>. If <i>sep_string</i> is <code>nil</code>, the
+ * rest of the stream is returned as a single record.
+ * The stream must be opened for reading or an
+ * <code>IOError</code> will be raised.
+ *
* f = File.new("testfile")
* f.readlines[0] #=> "This is line one\n"
*/
static VALUE
-rb_io_readlines(int argc, VALUE *argv, VALUE io)
+rb_io_readlines(argc, argv, io)
+ int argc;
+ VALUE *argv;
+ VALUE io;
{
- VALUE line, ary, rs;
- long limit;
+ VALUE line, ary;
+ VALUE rs;
- prepare_getline_args(argc, argv, &rs, &limit, io);
+ if (argc == 0) {
+ rs = rb_rs;
+ }
+ else {
+ rb_scan_args(argc, argv, "1", &rs);
+ if (!NIL_P(rs)) StringValue(rs);
+ }
ary = rb_ary_new();
- while (!NIL_P(line = rb_io_getline_1(rs, limit, io))) {
+ while (!NIL_P(line = rb_io_getline(rs, io))) {
rb_ary_push(ary, line);
}
return ary;
@@ -2580,22 +1945,18 @@ rb_io_readlines(int argc, VALUE *argv, VALUE io)
/*
* call-seq:
- * ios.each(sep=$/) {|line| block } => ios
- * ios.each(limit) {|line| block } => ios
- * ios.each(sep,limit) {|line| block } => ios
- * ios.each_line(sep=$/) {|line| block } => ios
- * ios.each_line(limit) {|line| block } => ios
- * ios.each_line(sep,limit) {|line| block } => ios
- *
+ * ios.each(sep_string=$/) {|line| block } => ios
+ * ios.each_line(sep_string=$/) {|line| block } => ios
+ *
* Executes the block for every line in <em>ios</em>, where lines are
- * separated by <i>sep</i>. <em>ios</em> must be opened for
+ * separated by <i>sep_string</i>. <em>ios</em> must be opened for
* reading or an <code>IOError</code> will be raised.
- *
+ *
* f = File.new("testfile")
* f.each {|line| puts "#{f.lineno}: #{line}" }
- *
+ *
* <em>produces:</em>
- *
+ *
* 1: This is line one
* 2: This is line two
* 3: This is line three
@@ -2603,14 +1964,23 @@ rb_io_readlines(int argc, VALUE *argv, VALUE io)
*/
static VALUE
-rb_io_each_line(int argc, VALUE *argv, VALUE io)
+rb_io_each_line(argc, argv, io)
+ int argc;
+ VALUE *argv;
+ VALUE io;
{
- VALUE str, rs;
- long limit;
+ VALUE str;
+ VALUE rs;
RETURN_ENUMERATOR(io, argc, argv);
- prepare_getline_args(argc, argv, &rs, &limit, io);
- while (!NIL_P(str = rb_io_getline_1(rs, limit, io))) {
+ if (argc == 0) {
+ rs = rb_rs;
+ }
+ else {
+ rb_scan_args(argc, argv, "1", &rs);
+ if (!NIL_P(rs)) StringValue(rs);
+ }
+ while (!NIL_P(str = rb_io_getline(rs, io))) {
rb_yield(str);
}
return io;
@@ -2619,11 +1989,11 @@ rb_io_each_line(int argc, VALUE *argv, VALUE io)
/*
* call-seq:
* ios.each_byte {|byte| block } => ios
- *
+ *
* Calls the given block once for each byte (0..255) in <em>ios</em>,
* passing the byte as an argument. The stream must be opened for
* reading or an <code>IOError</code> will be raised.
- *
+ *
* f = File.new("testfile")
* checksum = 0
* f.each_byte {|x| checksum ^= x } #=> #<File:testfile>
@@ -2631,121 +2001,40 @@ rb_io_each_line(int argc, VALUE *argv, VALUE io)
*/
static VALUE
-rb_io_each_byte(VALUE io)
+rb_io_each_byte(io)
+ VALUE io;
{
rb_io_t *fptr;
- char *p, *e;
+ FILE *f;
+ int c;
RETURN_ENUMERATOR(io, 0, 0);
GetOpenFile(io, fptr);
for (;;) {
- p = fptr->rbuf+fptr->rbuf_off;
- e = p + fptr->rbuf_len;
- while (p < e) {
- fptr->rbuf_off++;
- fptr->rbuf_len--;
- rb_yield(INT2FIX(*p & 0xff));
- p++;
- errno = 0;
- }
rb_io_check_readable(fptr);
- READ_CHECK(fptr);
- if (io_fillbuf(fptr) < 0) {
+ f = fptr->f;
+ READ_CHECK(f);
+ clearerr(f);
+ TRAP_BEG;
+ c = getc(f);
+ TRAP_END;
+ if (c == EOF) {
+ if (ferror(f)) {
+ clearerr(f);
+ if (!rb_io_wait_readable(fileno(f)))
+ rb_sys_fail(fptr->path);
+ continue;
+ }
break;
}
+ rb_yield(INT2FIX(c & 0xff));
}
+ if (ferror(f)) rb_sys_fail(fptr->path);
return io;
}
-static VALUE
-io_getc(rb_io_t *fptr, rb_encoding *enc)
-{
- int r, n, cr = 0;
- VALUE str;
-
- if (NEED_READCONV(fptr)) {
- VALUE str = Qnil;
-
- make_readconv(fptr, 0);
-
- while (1) {
- if (fptr->cbuf_len) {
- if (fptr->encs.enc)
- r = rb_enc_precise_mbclen(fptr->cbuf+fptr->cbuf_off,
- fptr->cbuf+fptr->cbuf_off+fptr->cbuf_len,
- fptr->encs.enc);
- else
- r = ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(1);
- if (!MBCLEN_NEEDMORE_P(r))
- break;
- if (fptr->cbuf_len == fptr->cbuf_capa) {
- rb_raise(rb_eIOError, "too long character");
- }
- }
-
- if (more_char(fptr) == -1) {
- if (fptr->cbuf_len == 0)
- return Qnil;
- /* return an incomplete character just before EOF */
- return io_shift_cbuf(fptr, fptr->cbuf_len, &str);
- }
- }
- if (MBCLEN_INVALID_P(r)) {
- r = rb_enc_mbclen(fptr->cbuf+fptr->cbuf_off,
- fptr->cbuf+fptr->cbuf_off+fptr->cbuf_len,
- fptr->encs.enc);
- return io_shift_cbuf(fptr, r, &str);
- }
- return io_shift_cbuf(fptr, MBCLEN_CHARFOUND_LEN(r), &str);
- }
-
- if (io_fillbuf(fptr) < 0) {
- return Qnil;
- }
- if (rb_enc_asciicompat(enc) && ISASCII(fptr->rbuf[fptr->rbuf_off])) {
- str = rb_str_new(fptr->rbuf+fptr->rbuf_off, 1);
- fptr->rbuf_off += 1;
- fptr->rbuf_len -= 1;
- cr = ENC_CODERANGE_7BIT;
- }
- else {
- r = rb_enc_precise_mbclen(fptr->rbuf+fptr->rbuf_off, fptr->rbuf+fptr->rbuf_off+fptr->rbuf_len, enc);
- if (MBCLEN_CHARFOUND_P(r) &&
- (n = MBCLEN_CHARFOUND_LEN(r)) <= fptr->rbuf_len) {
- str = rb_str_new(fptr->rbuf+fptr->rbuf_off, n);
- fptr->rbuf_off += n;
- fptr->rbuf_len -= n;
- cr = ENC_CODERANGE_VALID;
- }
- else if (MBCLEN_NEEDMORE_P(r)) {
- str = rb_str_new(fptr->rbuf+fptr->rbuf_off, fptr->rbuf_len);
- fptr->rbuf_len = 0;
- getc_needmore:
- if (io_fillbuf(fptr) != -1) {
- rb_str_cat(str, fptr->rbuf+fptr->rbuf_off, 1);
- fptr->rbuf_off++;
- fptr->rbuf_len--;
- r = rb_enc_precise_mbclen(RSTRING_PTR(str), RSTRING_PTR(str)+RSTRING_LEN(str), enc);
- if (MBCLEN_NEEDMORE_P(r)) {
- goto getc_needmore;
- }
- else if (MBCLEN_CHARFOUND_P(r)) {
- cr = ENC_CODERANGE_VALID;
- }
- }
- }
- else {
- str = rb_str_new(fptr->rbuf+fptr->rbuf_off, 1);
- fptr->rbuf_off++;
- fptr->rbuf_len--;
- }
- }
- if (!cr) cr = ENC_CODERANGE_BROKEN;
- str = io_enc_str(str, fptr);
- ENC_CODERANGE_SET(str, cr);
- return str;
-}
+VALUE rb_io_getc _((VALUE));
/*
* call-seq:
@@ -2753,117 +2042,43 @@ io_getc(rb_io_t *fptr, rb_encoding *enc)
*
* Calls the given block once for each character in <em>ios</em>,
* passing the character as an argument. The stream must be opened for
- * reading or an <code>IOError</code> will be raised.
+ * reading or an <code>IOError</code> will be raised. Multibyte
+ * characters are dealt with according to $KCODE.
*
* f = File.new("testfile")
* f.each_char {|c| print c, ' ' } #=> #<File:testfile>
*/
static VALUE
-rb_io_each_char(VALUE io)
+rb_io_each_char(io)
+ VALUE io;
{
- rb_io_t *fptr;
- rb_encoding *enc;
- VALUE c;
+ VALUE ch;
RETURN_ENUMERATOR(io, 0, 0);
- GetOpenFile(io, fptr);
- rb_io_check_readable(fptr);
- enc = io_input_encoding(fptr);
- READ_CHECK(fptr);
- while (!NIL_P(c = io_getc(fptr, enc))) {
- rb_yield(c);
- }
- return io;
-}
-
-
-
-/*
- * call-seq:
- * ios.each_codepoint {|c| block } => ios
- *
- * Passes the <code>Integer</code> ordinal of each character in <i>ios</i>,
- * passing the codepoint as an argument. The stream must be opened for
- * reading or an <code>IOError</code> will be raised.
- */
+ while (!NIL_P(ch = rb_io_getc(io))) {
+ unsigned char c;
+ int n;
+ VALUE str;
-static VALUE
-rb_io_each_codepoint(VALUE io)
-{
- rb_io_t *fptr;
- rb_encoding *enc;
- unsigned int c;
- int r, n;
+ c= FIX2INT(ch);
+ n = mbclen(c);
+ str = rb_tainted_str_new((const char *)&c, 1);
- RETURN_ENUMERATOR(io, 0, 0);
- GetOpenFile(io, fptr);
- rb_io_check_readable(fptr);
-
- READ_CHECK(fptr);
- if (NEED_READCONV(fptr)) {
- for (;;) {
- make_readconv(fptr, 0);
- for (;;) {
- if (fptr->cbuf_len) {
- if (fptr->encs.enc)
- r = rb_enc_precise_mbclen(fptr->cbuf+fptr->cbuf_off,
- fptr->cbuf+fptr->cbuf_off+fptr->cbuf_len,
- fptr->encs.enc);
- else
- r = ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(1);
- if (!MBCLEN_NEEDMORE_P(r))
- break;
- if (fptr->cbuf_len == fptr->cbuf_capa) {
- rb_raise(rb_eIOError, "too long character");
- }
- }
- if (more_char(fptr) == -1) {
- /* ignore an incomplete character before EOF */
- return io;
- }
+ while (--n > 0) {
+ if (NIL_P(ch = rb_io_getc(io))) {
+ rb_yield(str);
+ return io;
}
- if (MBCLEN_INVALID_P(r)) {
- rb_raise(rb_eArgError, "invalid byte sequence in %s",
- rb_enc_name(fptr->encs.enc));
- }
- n = MBCLEN_CHARFOUND_LEN(r);
- c = rb_enc_codepoint(fptr->cbuf+fptr->cbuf_off,
- fptr->cbuf+fptr->cbuf_off+fptr->cbuf_len,
- fptr->encs.enc);
- fptr->rbuf_off += n;
- fptr->rbuf_len -= n;
- rb_yield(UINT2NUM(c));
- }
- }
- enc = io_input_encoding(fptr);
- for (;;) {
- if (io_fillbuf(fptr) < 0) {
- return io;
- }
- r = rb_enc_precise_mbclen(fptr->rbuf+fptr->rbuf_off,
- fptr->rbuf+fptr->rbuf_off+fptr->rbuf_len, enc);
- if (MBCLEN_CHARFOUND_P(r) &&
- (n = MBCLEN_CHARFOUND_LEN(r)) <= fptr->rbuf_len) {
- c = rb_enc_codepoint(fptr->rbuf+fptr->rbuf_off,
- fptr->rbuf+fptr->rbuf_off+fptr->rbuf_len, enc);
- fptr->rbuf_off += n;
- fptr->rbuf_len -= n;
- rb_yield(UINT2NUM(c));
- }
- else if (MBCLEN_INVALID_P(r)) {
- rb_raise(rb_eArgError, "invalid byte sequence in %s", rb_enc_name(enc));
- }
- else {
- continue;
+ c = FIX2INT(ch);
+ rb_str_cat(str, (const char *)&c, 1);
}
+ rb_yield(str);
}
return io;
}
-
-
/*
* call-seq:
* ios.lines(sep=$/) => anEnumerator
@@ -2881,7 +2096,10 @@ rb_io_each_codepoint(VALUE io)
*/
static VALUE
-rb_io_lines(int argc, VALUE *argv, VALUE io)
+rb_io_lines(argc, argv, io)
+ int argc;
+ VALUE *argv;
+ VALUE io;
{
return rb_enumeratorize(io, ID2SYM(rb_intern("each_line")), argc, argv);
}
@@ -2893,7 +2111,7 @@ rb_io_lines(int argc, VALUE *argv, VALUE io)
* Returns an enumerator that gives each byte (0..255) in <em>ios</em>.
* The stream must be opened for reading or an <code>IOError</code>
* will be raised.
- *
+ *
* f = File.new("testfile")
* f.bytes.to_a #=> [104, 101, 108, 108, 111]
* f.rewind
@@ -2901,144 +2119,85 @@ rb_io_lines(int argc, VALUE *argv, VALUE io)
*/
static VALUE
-rb_io_bytes(VALUE io)
+rb_io_bytes(io)
+ VALUE io;
{
return rb_enumeratorize(io, ID2SYM(rb_intern("each_byte")), 0, 0);
}
/*
* call-seq:
- * ios.chars => anEnumerator
- *
- * Returns an enumerator that gives each character in <em>ios</em>.
- * The stream must be opened for reading or an <code>IOError</code>
- * will be raised.
- *
- * f = File.new("testfile")
- * f.chars.to_a #=> ["h", "e", "l", "l", "o"]
- * f.rewind
- * f.chars.sort #=> ["e", "h", "l", "l", "o"]
- */
-
-static VALUE
-rb_io_chars(VALUE io)
-{
- return rb_enumeratorize(io, ID2SYM(rb_intern("each_char")), 0, 0);
-}
-
-/*
- * call-seq:
- * ios.codepoints => anEnumerator
- *
- * Returns an enumerator that gives each codepoint in <em>ios</em>.
- * The stream must be opened for reading or an <code>IOError</code>
- * will be raised.
- */
-
-static VALUE
-rb_io_codepoints(VALUE io)
-{
- return rb_enumeratorize(io, ID2SYM(rb_intern("each_codepoint")), 0, 0);
-}
-
-/*
- * call-seq:
- * ios.getc => string or nil
- *
- * Reads a one-character string from <em>ios</em>. Returns
+ * ios.getc => fixnum or nil
+ *
+ * Gets the next 8-bit byte (0..255) from <em>ios</em>. Returns
* <code>nil</code> if called at end of file.
- *
+ *
* f = File.new("testfile")
- * f.getc #=> "h"
- * f.getc #=> "e"
+ * f.getc #=> 84
+ * f.getc #=> 104
*/
-static VALUE
-rb_io_getc(VALUE io)
+VALUE
+rb_io_getc(io)
+ VALUE io;
{
rb_io_t *fptr;
- rb_encoding *enc;
+ FILE *f;
+ int c;
GetOpenFile(io, fptr);
rb_io_check_readable(fptr);
+ f = fptr->f;
- enc = io_input_encoding(fptr);
- READ_CHECK(fptr);
- return io_getc(fptr, enc);
-}
-
-/*
- * call-seq:
- * ios.readchar => string
- *
- * Reads a one-character string from <em>ios</em>. Raises an
- * <code>EOFError</code> on end of file.
- *
- * f = File.new("testfile")
- * f.readchar #=> "h"
- * f.readchar #=> "e"
- */
-
-static VALUE
-rb_io_readchar(VALUE io)
-{
- VALUE c = rb_io_getc(io);
-
- if (NIL_P(c)) {
- rb_eof_error();
+ retry:
+ READ_CHECK(f);
+ clearerr(f);
+ TRAP_BEG;
+ c = getc(f);
+ TRAP_END;
+
+ if (c == EOF) {
+ if (ferror(f)) {
+ clearerr(f);
+ if (!rb_io_wait_readable(fileno(f)))
+ rb_sys_fail(fptr->path);
+ goto retry;
+ }
+ return Qnil;
}
- return c;
+ return INT2FIX(c & 0xff);
}
-/*
- * call-seq:
- * ios.getbyte => fixnum or nil
- *
- * Gets the next 8-bit byte (0..255) from <em>ios</em>. Returns
- * <code>nil</code> if called at end of file.
- *
- * f = File.new("testfile")
- * f.getbyte #=> 84
- * f.getbyte #=> 104
- */
-
-VALUE
-rb_io_getbyte(VALUE io)
+int
+rb_getc(f)
+ FILE *f;
{
- rb_io_t *fptr;
int c;
- GetOpenFile(io, fptr);
- rb_io_check_readable(fptr);
- READ_CHECK(fptr);
- if (fptr->fd == 0 && (fptr->mode & FMODE_TTY) && TYPE(rb_stdout) == T_FILE) {
- rb_io_t *ofp;
- GetOpenFile(rb_stdout, ofp);
- if (ofp->mode & FMODE_TTY) {
- rb_io_flush(rb_stdout);
- }
+ if (!READ_DATA_PENDING(f)) {
+ rb_thread_wait_fd(fileno(f));
}
- if (io_fillbuf(fptr) < 0) {
- return Qnil;
- }
- fptr->rbuf_off++;
- fptr->rbuf_len--;
- c = (unsigned char)fptr->rbuf[fptr->rbuf_off-1];
- return INT2FIX(c & 0xff);
+ clearerr(f);
+ TRAP_BEG;
+ c = getc(f);
+ TRAP_END;
+
+ return c;
}
/*
* call-seq:
- * ios.readbyte => fixnum
- *
- * Reads a byte as with <code>IO#getbyte</code>, but raises an
+ * ios.readchar => fixnum
+ *
+ * Reads a character as with <code>IO#getc</code>, but raises an
* <code>EOFError</code> on end of file.
*/
static VALUE
-rb_io_readbyte(VALUE io)
+rb_io_readchar(io)
+ VALUE io;
{
- VALUE c = rb_io_getbyte(io);
+ VALUE c = rb_io_getc(io);
if (NIL_P(c)) {
rb_eof_error();
@@ -3048,98 +2207,34 @@ rb_io_readbyte(VALUE io)
/*
* call-seq:
- * ios.ungetbyte(string) => nil
- * ios.ungetbyte(integer) => nil
- *
- * Pushes back bytes (passed as a parameter) onto <em>ios</em>,
- * such that a subsequent buffered read will return it. Only one byte
- * may be pushed back before a subsequent read operation (that is,
- * you will be able to read only the last of several bytes that have been pushed
- * back). Has no effect with unbuffered reads (such as <code>IO#sysread</code>).
- *
- * f = File.new("testfile") #=> #<File:testfile>
- * b = f.getbyte #=> 0x38
- * f.ungetbyte(b) #=> nil
- * f.getbyte #=> 0x38
- */
-
-VALUE
-rb_io_ungetbyte(VALUE io, VALUE b)
-{
- rb_io_t *fptr;
-
- GetOpenFile(io, fptr);
- rb_io_check_readable(fptr);
- io_unset_eof(fptr);
- if (NIL_P(b)) return Qnil;
- if (FIXNUM_P(b)) {
- char cc = FIX2INT(b);
- b = rb_str_new(&cc, 1);
- }
- else {
- SafeStringValue(b);
- }
- io_ungetbyte(b, fptr);
- return Qnil;
-}
-
-/*
- * call-seq:
- * ios.ungetc(string) => nil
- *
+ * ios.ungetc(integer) => nil
+ *
* Pushes back one character (passed as a parameter) onto <em>ios</em>,
* such that a subsequent buffered read will return it. Only one character
* may be pushed back before a subsequent read operation (that is,
* you will be able to read only the last of several characters that have been pushed
* back). Has no effect with unbuffered reads (such as <code>IO#sysread</code>).
- *
+ *
* f = File.new("testfile") #=> #<File:testfile>
- * c = f.getc #=> "8"
+ * c = f.getc #=> 84
* f.ungetc(c) #=> nil
- * f.getc #=> "8"
+ * f.getc #=> 84
*/
VALUE
-rb_io_ungetc(VALUE io, VALUE c)
+rb_io_ungetc(io, c)
+ VALUE io, c;
{
rb_io_t *fptr;
- long len;
+ int cc = NUM2INT(c);
GetOpenFile(io, fptr);
+ if (!(fptr->mode & FMODE_RBUF))
+ rb_raise(rb_eIOError, "unread stream");
rb_io_check_readable(fptr);
- io_unset_eof(fptr);
- if (NIL_P(c)) return Qnil;
- if (FIXNUM_P(c)) {
- int cc = FIX2INT(c);
- rb_encoding *enc = io_read_encoding(fptr);
- char buf[16];
- c = rb_str_new(buf, rb_enc_mbcput(cc, buf, enc));
- }
- else {
- SafeStringValue(c);
- }
- if (NEED_READCONV(fptr)) {
- len = RSTRING_LEN(c);
-#if SIZEOF_LONG > SIZEOF_INT
- if (len > INT_MAX)
- rb_raise(rb_eIOError, "ungetc failed");
-#endif
- make_readconv(fptr, (int)len);
- if (fptr->cbuf_capa - fptr->cbuf_len < len)
- rb_raise(rb_eIOError, "ungetc failed");
- if (fptr->cbuf_off < len) {
- MEMMOVE(fptr->cbuf+fptr->cbuf_capa-fptr->cbuf_len,
- fptr->cbuf+fptr->cbuf_off,
- char, fptr->cbuf_len);
- fptr->cbuf_off = fptr->cbuf_capa-fptr->cbuf_len;
- }
- fptr->cbuf_off -= (int)len;
- fptr->cbuf_len += (int)len;
- MEMMOVE(fptr->cbuf+fptr->cbuf_off, RSTRING_PTR(c), char, len);
- }
- else {
- io_ungetbyte(c, fptr);
+ if (ungetc(cc, fptr->f) == EOF && cc != EOF) {
+ rb_raise(rb_eIOError, "ungetc failed");
}
return Qnil;
}
@@ -3148,248 +2243,75 @@ rb_io_ungetc(VALUE io, VALUE c)
* call-seq:
* ios.isatty => true or false
* ios.tty? => true or false
- *
+ *
* Returns <code>true</code> if <em>ios</em> is associated with a
* terminal device (tty), <code>false</code> otherwise.
- *
+ *
* File.new("testfile").isatty #=> false
* File.new("/dev/tty").isatty #=> true
*/
static VALUE
-rb_io_isatty(VALUE io)
+rb_io_isatty(io)
+ VALUE io;
{
rb_io_t *fptr;
GetOpenFile(io, fptr);
- if (isatty(fptr->fd) == 0)
+ if (isatty(fileno(fptr->f)) == 0)
return Qfalse;
return Qtrue;
}
-#if defined(HAVE_FCNTL) && defined(F_GETFD) && defined(F_SETFD) && defined(FD_CLOEXEC)
-/*
- * call-seq:
- * ios.close_on_exec? => true or false
- *
- * Returns <code>true</code> if <em>ios</em> will be closed on exec.
- *
- * f = open("/dev/null")
- * f.close_on_exec? #=> false
- * f.close_on_exec = true
- * f.close_on_exec? #=> true
- * f.close_on_exec = false
- * f.close_on_exec? #=> false
- */
-
-static VALUE
-rb_io_close_on_exec_p(VALUE io)
-{
- rb_io_t *fptr;
- VALUE write_io;
- int fd, ret;
-
- write_io = GetWriteIO(io);
- if (io != write_io) {
- GetOpenFile(write_io, fptr);
- if (fptr && 0 <= (fd = fptr->fd)) {
- if ((ret = fcntl(fd, F_GETFD)) == -1) rb_sys_fail_path(fptr->pathv);
- if (!(ret & FD_CLOEXEC)) return Qfalse;
- }
- }
-
- GetOpenFile(io, fptr);
- if (fptr && 0 <= (fd = fptr->fd)) {
- if ((ret = fcntl(fd, F_GETFD)) == -1) rb_sys_fail_path(fptr->pathv);
- if (!(ret & FD_CLOEXEC)) return Qfalse;
- }
- return Qtrue;
-}
-#else
-#define rb_io_close_on_exec_p rb_f_notimplement
-#endif
-
-#if defined(HAVE_FCNTL) && defined(F_GETFD) && defined(F_SETFD) && defined(FD_CLOEXEC)
-/*
- * call-seq:
- * ios.close_on_exec = bool => true or false
- *
- * Sets a close-on-exec flag.
- *
- * f = open("/dev/null")
- * f.close_on_exec = true
- * system("cat", "/proc/self/fd/#{f.fileno}") # cat: /proc/self/fd/3: No such file or directory
- * f.closed? #=> false
- */
-
-static VALUE
-rb_io_set_close_on_exec(VALUE io, VALUE arg)
-{
- int flag = RTEST(arg) ? FD_CLOEXEC : 0;
- rb_io_t *fptr;
- VALUE write_io;
- int fd, ret;
-
- write_io = GetWriteIO(io);
- if (io != write_io) {
- GetOpenFile(write_io, fptr);
- if (fptr && 0 <= (fd = fptr->fd)) {
- if ((ret = fcntl(fptr->fd, F_GETFD)) == -1) rb_sys_fail_path(fptr->pathv);
- if ((ret & FD_CLOEXEC) != flag) {
- ret = (ret & ~FD_CLOEXEC) | flag;
- ret = fcntl(fd, F_SETFD, ret);
- if (ret == -1) rb_sys_fail_path(fptr->pathv);
- }
- }
-
- }
-
- GetOpenFile(io, fptr);
- if (fptr && 0 <= (fd = fptr->fd)) {
- if ((ret = fcntl(fd, F_GETFD)) == -1) rb_sys_fail_path(fptr->pathv);
- if ((ret & FD_CLOEXEC) != flag) {
- ret = (ret & ~FD_CLOEXEC) | flag;
- ret = fcntl(fd, F_SETFD, ret);
- if (ret == -1) rb_sys_fail_path(fptr->pathv);
- }
- }
- return Qnil;
-}
-#else
-#define rb_io_set_close_on_exec rb_f_notimplement
-#endif
-
-#define FMODE_PREP (1<<16)
-#define IS_PREP_STDIO(f) ((f)->mode & FMODE_PREP)
-#define PREP_STDIO_NAME(f) (RSTRING_PTR((f)->pathv))
-
-static VALUE
-finish_writeconv(rb_io_t *fptr, int noalloc)
-{
- unsigned char *ds, *dp, *de;
- rb_econv_result_t res;
-
- if (!fptr->wbuf) {
- unsigned char buf[1024];
- long r;
-
- res = econv_destination_buffer_full;
- while (res == econv_destination_buffer_full) {
- ds = dp = buf;
- de = buf + sizeof(buf);
- res = rb_econv_convert(fptr->writeconv, NULL, NULL, &dp, de, 0);
- while (dp-ds) {
- retry:
- r = rb_write_internal(fptr->fd, ds, dp-ds);
- if (r == dp-ds)
- break;
- if (0 <= r) {
- ds += r;
- }
- if (rb_io_wait_writable(fptr->fd)) {
- if (fptr->fd < 0)
- return noalloc ? Qtrue : rb_exc_new3(rb_eIOError, rb_str_new_cstr("closed stream"));
- goto retry;
- }
- return noalloc ? Qtrue : INT2NUM(errno);
- }
- if (res == econv_invalid_byte_sequence ||
- res == econv_incomplete_input ||
- res == econv_undefined_conversion) {
- return noalloc ? Qtrue : rb_econv_make_exception(fptr->writeconv);
- }
- }
-
- return Qnil;
- }
-
- res = econv_destination_buffer_full;
- while (res == econv_destination_buffer_full) {
- if (fptr->wbuf_len == fptr->wbuf_capa) {
- if (io_fflush(fptr) < 0)
- return noalloc ? Qtrue : INT2NUM(errno);
- }
-
- ds = dp = (unsigned char *)fptr->wbuf + fptr->wbuf_off + fptr->wbuf_len;
- de = (unsigned char *)fptr->wbuf + fptr->wbuf_capa;
- res = rb_econv_convert(fptr->writeconv, NULL, NULL, &dp, de, 0);
- fptr->wbuf_len += (int)(dp - ds);
- if (res == econv_invalid_byte_sequence ||
- res == econv_incomplete_input ||
- res == econv_undefined_conversion) {
- return noalloc ? Qtrue : rb_econv_make_exception(fptr->writeconv);
- }
- }
- return Qnil;
-}
-
-struct finish_writeconv_arg {
+static void
+fptr_finalize(fptr, noraise)
rb_io_t *fptr;
- int noalloc;
-};
-
-static VALUE
-finish_writeconv_sync(VALUE arg)
+ int noraise;
{
- struct finish_writeconv_arg *p = (struct finish_writeconv_arg *)arg;
- return finish_writeconv(p->fptr, p->noalloc);
-}
+ int n1 = 0, n2 = 0, f1, f2 = -1;
-static void
-fptr_finalize(rb_io_t *fptr, int noraise)
-{
- VALUE err = Qnil;
- if (fptr->writeconv) {
- if (fptr->write_lock) {
- struct finish_writeconv_arg arg;
- arg.fptr = fptr;
- arg.noalloc = noraise;
- err = rb_mutex_synchronize(fptr->write_lock, finish_writeconv_sync, (VALUE)&arg);
+ errno = 0;
+ if (fptr->f2) {
+ f2 = fileno(fptr->f2);
+ while (n2 = 0, fflush(fptr->f2) < 0) {
+ n2 = errno;
+ if (!rb_io_wait_writable(f2)) {
+ break;
+ }
+ if (!fptr->f2) break;
}
- else {
- err = finish_writeconv(fptr, noraise);
+ if (fclose(fptr->f2) < 0 && n2 == 0) {
+ n2 = errno;
+ }
+ fptr->f2 = 0;
+ }
+ if (fptr->f) {
+ f1 = fileno(fptr->f);
+ if ((f2 == -1) && (fptr->mode & FMODE_WBUF)) {
+ while (n1 = 0, fflush(fptr->f) < 0) {
+ n1 = errno;
+ if (!rb_io_wait_writable(f1)) break;
+ if (!fptr->f) break;
+ }
+ }
+ if (fclose(fptr->f) < 0 && n1 == 0) {
+ n1 = errno;
+ }
+ fptr->f = 0;
+ if (n1 == EBADF && f1 == f2) {
+ n1 = 0;
}
}
- if (fptr->wbuf_len) {
- if (io_fflush(fptr) < 0 && NIL_P(err))
- err = noraise ? Qtrue : INT2NUM(errno);
- }
- if (IS_PREP_STDIO(fptr) || fptr->fd <= 2) {
- goto skip_fd_close;
- }
- if (fptr->stdio_file) {
- /* fptr->stdio_file is deallocated anyway
- * even if fclose failed. */
- if (fclose(fptr->stdio_file) < 0 && NIL_P(err))
- err = noraise ? Qtrue : INT2NUM(errno);
- }
- else if (0 <= fptr->fd) {
- /* fptr->fd may be closed even if close fails.
- * POSIX doesn't specify it.
- * We assumes it is closed. */
- if (close(fptr->fd) < 0 && NIL_P(err))
- err = noraise ? Qtrue : INT2NUM(errno);
- }
- skip_fd_close:
- fptr->fd = -1;
- fptr->stdio_file = 0;
- fptr->mode &= ~(FMODE_READABLE|FMODE_WRITABLE);
-
- if (!NIL_P(err) && !noraise) {
- switch(TYPE(err)) {
- case T_FIXNUM:
- case T_BIGNUM:
- errno = NUM2INT(err);
- rb_sys_fail_path(fptr->pathv);
-
- default:
- rb_exc_raise(err);
- }
+ if (!noraise && (n1 || n2)) {
+ errno = (n1 ? n1 : n2);
+ rb_sys_fail(fptr->path);
}
}
static void
-rb_io_fptr_cleanup(rb_io_t *fptr, int noraise)
+rb_io_fptr_cleanup(fptr, noraise)
+ rb_io_t *fptr;
+ int noraise;
{
if (fptr->finalize) {
(*fptr->finalize)(fptr, noraise);
@@ -3399,94 +2321,41 @@ rb_io_fptr_cleanup(rb_io_t *fptr, int noraise)
}
}
-static void
-clear_readconv(rb_io_t *fptr)
-{
- if (fptr->readconv) {
- rb_econv_close(fptr->readconv);
- fptr->readconv = NULL;
- }
- if (fptr->cbuf) {
- free(fptr->cbuf);
- fptr->cbuf = NULL;
- }
-}
-
-static void
-clear_writeconv(rb_io_t *fptr)
+void
+rb_io_fptr_finalize(fptr)
+ rb_io_t *fptr;
{
- if (fptr->writeconv) {
- rb_econv_close(fptr->writeconv);
- fptr->writeconv = NULL;
+ if (!fptr) return;
+ if (fptr->path) {
+ free(fptr->path);
}
- fptr->writeconv_initialized = 0;
-}
-
-static void
-clear_codeconv(rb_io_t *fptr)
-{
- clear_readconv(fptr);
- clear_writeconv(fptr);
-}
-
-int
-rb_io_fptr_finalize(rb_io_t *fptr)
-{
- if (!fptr) return 0;
- fptr->pathv = Qnil;
- fptr->write_lock = 0;
- if (0 <= fptr->fd)
- rb_io_fptr_cleanup(fptr, TRUE);
- if (fptr->rbuf) {
- free(fptr->rbuf);
- fptr->rbuf = 0;
- }
- if (fptr->wbuf) {
- free(fptr->wbuf);
- fptr->wbuf = 0;
- }
- clear_codeconv(fptr);
- free(fptr);
- return 1;
-}
-
-size_t rb_econv_memsize(rb_econv_t *);
+ if (!fptr->f && !fptr->f2) return;
+ if (fileno(fptr->f) < 3) return;
-size_t
-rb_io_memsize(rb_io_t *fptr)
-{
- size_t size = sizeof(rb_io_t);
- size += fptr->rbuf_capa;
- size += fptr->wbuf_capa;
- size += fptr->cbuf_capa;
- if (fptr->readconv) size += rb_econv_memsize(fptr->readconv);
- if (fptr->writeconv) size += rb_econv_memsize(fptr->writeconv);
- return size;
+ rb_io_fptr_cleanup(fptr, Qtrue);
}
VALUE
-rb_io_close(VALUE io)
+rb_io_close(io)
+ VALUE io;
{
rb_io_t *fptr;
- int fd;
- VALUE write_io;
- rb_io_t *write_fptr;
-
- write_io = GetWriteIO(io);
- if (io != write_io) {
- write_fptr = RFILE(write_io)->fptr;
- if (write_fptr && 0 <= write_fptr->fd) {
- rb_io_fptr_cleanup(write_fptr, TRUE);
- }
- }
+ int fd, fd2;
fptr = RFILE(io)->fptr;
if (!fptr) return Qnil;
- if (fptr->fd < 0) return Qnil;
+ if (fptr->f2) {
+ fd2 = fileno(fptr->f2);
+ }
+ else {
+ if (!fptr->f) return Qnil;
+ fd2 = -1;
+ }
- fd = fptr->fd;
- rb_io_fptr_cleanup(fptr, FALSE);
+ fd = fileno(fptr->f);
+ rb_io_fptr_cleanup(fptr, Qfalse);
rb_thread_fd_close(fd);
+ if (fd2 >= 0) rb_thread_fd_close(fd2);
if (fptr->pid) {
rb_syswait(fptr->pid);
@@ -3499,7 +2368,7 @@ rb_io_close(VALUE io)
/*
* call-seq:
* ios.close => nil
- *
+ *
* Closes <em>ios</em> and flushes any pending writes to the operating
* system. The stream is unavailable for any further data operations;
* an <code>IOError</code> is raised if such an attempt is made. I/O
@@ -3511,9 +2380,10 @@ rb_io_close(VALUE io)
*/
static VALUE
-rb_io_close_m(VALUE io)
+rb_io_close_m(io)
+ VALUE io;
{
- if (rb_safe_level() >= 4 && !OBJ_UNTRUSTED(io)) {
+ if (rb_safe_level() >= 4 && !OBJ_TAINTED(io)) {
rb_raise(rb_eSecurityError, "Insecure: can't close");
}
rb_io_check_closed(RFILE(io)->fptr);
@@ -3522,13 +2392,15 @@ rb_io_close_m(VALUE io)
}
static VALUE
-io_call_close(VALUE io)
+io_call_close(io)
+ VALUE io;
{
return rb_funcall(io, rb_intern("close"), 0, 0);
}
static VALUE
-io_close(VALUE io)
+io_close(io)
+ VALUE io;
{
return rb_rescue(io_call_close, io, 0, 0);
}
@@ -3536,11 +2408,11 @@ io_close(VALUE io)
/*
* call-seq:
* ios.closed? => true or false
- *
+ *
* Returns <code>true</code> if <em>ios</em> is completely closed (for
* duplex streams, both reader and writer), <code>false</code>
* otherwise.
- *
+ *
* f = File.new("testfile")
* f.close #=> nil
* f.closed? #=> true
@@ -3551,154 +2423,123 @@ io_close(VALUE io)
* f.closed? #=> true
*/
-
static VALUE
-rb_io_closed(VALUE io)
+rb_io_closed(io)
+ VALUE io;
{
rb_io_t *fptr;
- VALUE write_io;
- rb_io_t *write_fptr;
-
- write_io = GetWriteIO(io);
- if (io != write_io) {
- write_fptr = RFILE(write_io)->fptr;
- if (write_fptr && 0 <= write_fptr->fd) {
- return Qfalse;
- }
- }
fptr = RFILE(io)->fptr;
rb_io_check_initialized(fptr);
- return 0 <= fptr->fd ? Qfalse : Qtrue;
+ return (fptr->f || fptr->f2)?Qfalse:Qtrue;
}
/*
* call-seq:
* ios.close_read => nil
- *
+ *
* Closes the read end of a duplex I/O stream (i.e., one that contains
* both a read and a write stream, such as a pipe). Will raise an
* <code>IOError</code> if the stream is not duplexed.
- *
+ *
* f = IO.popen("/bin/sh","r+")
* f.close_read
* f.readlines
- *
+ *
* <em>produces:</em>
- *
+ *
* prog.rb:3:in `readlines': not opened for reading (IOError)
* from prog.rb:3
*/
static VALUE
-rb_io_close_read(VALUE io)
+rb_io_close_read(io)
+ VALUE io;
{
rb_io_t *fptr;
- VALUE write_io;
+ int n;
- if (rb_safe_level() >= 4 && !OBJ_UNTRUSTED(io)) {
+ if (rb_safe_level() >= 4 && !OBJ_TAINTED(io)) {
rb_raise(rb_eSecurityError, "Insecure: can't close");
}
GetOpenFile(io, fptr);
- if (is_socket(fptr->fd, fptr->pathv)) {
-#ifndef SHUT_RD
-# define SHUT_RD 0
-#endif
- if (shutdown(fptr->fd, SHUT_RD) < 0)
- rb_sys_fail_path(fptr->pathv);
- fptr->mode &= ~FMODE_READABLE;
- if (!(fptr->mode & FMODE_WRITABLE))
- return rb_io_close(io);
- return Qnil;
+ if (fptr->f2 == 0 && (fptr->mode & FMODE_WRITABLE)) {
+ rb_raise(rb_eIOError, "closing non-duplex IO for reading");
}
-
- write_io = GetWriteIO(io);
- if (io != write_io) {
- rb_io_t *wfptr;
- rb_io_fptr_cleanup(fptr, FALSE);
- GetOpenFile(write_io, wfptr);
- RFILE(io)->fptr = wfptr;
- RFILE(write_io)->fptr = NULL;
- rb_io_fptr_finalize(fptr);
- return Qnil;
+ if (fptr->f2 == 0) {
+ return rb_io_close(io);
}
+ n = fclose(fptr->f);
+ fptr->mode &= ~FMODE_READABLE;
+ fptr->f = fptr->f2;
+ fptr->f2 = 0;
+ if (n != 0) rb_sys_fail(fptr->path);
- if (fptr->mode & FMODE_WRITABLE) {
- rb_raise(rb_eIOError, "closing non-duplex IO for reading");
- }
- return rb_io_close(io);
+ return Qnil;
}
/*
* call-seq:
* ios.close_write => nil
- *
+ *
* Closes the write end of a duplex I/O stream (i.e., one that contains
* both a read and a write stream, such as a pipe). Will raise an
* <code>IOError</code> if the stream is not duplexed.
- *
+ *
* f = IO.popen("/bin/sh","r+")
* f.close_write
* f.print "nowhere"
- *
+ *
* <em>produces:</em>
- *
+ *
* prog.rb:3:in `write': not opened for writing (IOError)
* from prog.rb:3:in `print'
* from prog.rb:3
*/
static VALUE
-rb_io_close_write(VALUE io)
+rb_io_close_write(io)
+ VALUE io;
{
rb_io_t *fptr;
- VALUE write_io;
+ int n;
- if (rb_safe_level() >= 4 && !OBJ_UNTRUSTED(io)) {
+ if (rb_safe_level() >= 4 && !OBJ_TAINTED(io)) {
rb_raise(rb_eSecurityError, "Insecure: can't close");
}
- write_io = GetWriteIO(io);
- GetOpenFile(write_io, fptr);
- if (is_socket(fptr->fd, fptr->pathv)) {
-#ifndef SHUT_WR
-# define SHUT_WR 1
-#endif
- if (shutdown(fptr->fd, SHUT_WR) < 0)
- rb_sys_fail_path(fptr->pathv);
- fptr->mode &= ~FMODE_WRITABLE;
- if (!(fptr->mode & FMODE_READABLE))
- return rb_io_close(write_io);
- return Qnil;
- }
-
- if (fptr->mode & FMODE_READABLE) {
+ GetOpenFile(io, fptr);
+ if (fptr->f2 == 0 && (fptr->mode & FMODE_READABLE)) {
rb_raise(rb_eIOError, "closing non-duplex IO for writing");
}
-
- rb_io_close(write_io);
- if (io != write_io) {
- GetOpenFile(io, fptr);
- fptr->tied_io_for_writing = 0;
- fptr->mode &= ~FMODE_DUPLEX;
+ if (fptr->f2 == 0) {
+ return rb_io_close(io);
}
+ n = fclose(fptr->f2);
+ fptr->f2 = 0;
+ fptr->mode &= ~FMODE_WRITABLE;
+ if (n != 0) rb_sys_fail(fptr->path);
+
return Qnil;
}
/*
* call-seq:
* ios.sysseek(offset, whence=SEEK_SET) => integer
- *
+ *
* Seeks to a given <i>offset</i> in the stream according to the value
* of <i>whence</i> (see <code>IO#seek</code> for values of
* <i>whence</i>). Returns the new offset into the file.
- *
+ *
* f = File.new("testfile")
* f.sysseek(-13, IO::SEEK_END) #=> 53
* f.sysread(10) #=> "And so on."
*/
static VALUE
-rb_io_sysseek(int argc, VALUE *argv, VALUE io)
+rb_io_sysseek(argc, argv, io)
+ int argc;
+ VALUE *argv;
+ VALUE io;
{
VALUE offset, ptrname;
int whence = SEEK_SET;
@@ -3710,14 +2551,15 @@ rb_io_sysseek(int argc, VALUE *argv, VALUE io)
}
pos = NUM2OFFT(offset);
GetOpenFile(io, fptr);
- if ((fptr->mode & FMODE_READABLE) && READ_DATA_BUFFERED(fptr)) {
+ if ((fptr->mode & FMODE_READABLE) && READ_DATA_BUFFERED(fptr->f)) {
rb_raise(rb_eIOError, "sysseek for buffered IO");
}
- if ((fptr->mode & FMODE_WRITABLE) && fptr->wbuf_len) {
+ if ((fptr->mode & FMODE_WRITABLE) && (fptr->mode & FMODE_WBUF)) {
rb_warn("sysseek for buffered IO");
}
- pos = lseek(fptr->fd, pos, whence);
- if (pos == -1) rb_sys_fail_path(fptr->pathv);
+ pos = lseek(fileno(fptr->f), pos, whence);
+ if (pos == -1) rb_sys_fail(fptr->path);
+ clearerr(fptr->f);
return OFFT2NUM(pos);
}
@@ -3725,62 +2567,66 @@ rb_io_sysseek(int argc, VALUE *argv, VALUE io)
/*
* call-seq:
* ios.syswrite(string) => integer
- *
+ *
* Writes the given string to <em>ios</em> using a low-level write.
* Returns the number of bytes written. Do not mix with other methods
* that write to <em>ios</em> or you may get unpredictable results.
* Raises <code>SystemCallError</code> on error.
- *
+ *
* f = File.new("out", "w")
* f.syswrite("ABCDEF") #=> 6
*/
static VALUE
-rb_io_syswrite(VALUE io, VALUE str)
+rb_io_syswrite(io, str)
+ VALUE io, str;
{
rb_io_t *fptr;
+ FILE *f;
long n;
rb_secure(4);
if (TYPE(str) != T_STRING)
str = rb_obj_as_string(str);
- io = GetWriteIO(io);
GetOpenFile(io, fptr);
rb_io_check_writable(fptr);
+ f = GetWriteFile(fptr);
- if (fptr->wbuf_len) {
+ if (fptr->mode & FMODE_WBUF) {
rb_warn("syswrite for buffered IO");
}
- if (!rb_thread_fd_writable(fptr->fd)) {
+ if (!rb_thread_fd_writable(fileno(f))) {
rb_io_check_closed(fptr);
}
+ TRAP_BEG;
+ n = write(fileno(f), RSTRING(str)->ptr, RSTRING(str)->len);
+ TRAP_END;
- n = write(fptr->fd, RSTRING_PTR(str), RSTRING_LEN(str));
-
- if (n == -1) rb_sys_fail_path(fptr->pathv);
+ if (n == -1) rb_sys_fail(fptr->path);
return LONG2FIX(n);
}
/*
* call-seq:
- * ios.sysread(integer[, outbuf]) => string
- *
+ * ios.sysread(integer ) => string
+ *
* Reads <i>integer</i> bytes from <em>ios</em> using a low-level
* read and returns them as a string. Do not mix with other methods
* that read from <em>ios</em> or you may get unpredictable results.
- * If the optional <i>outbuf</i> argument is present, it must reference
- * a String, which will receive the data.
* Raises <code>SystemCallError</code> on error and
* <code>EOFError</code> at end of file.
- *
+ *
* f = File.new("testfile")
* f.sysread(16) #=> "This is line one"
*/
static VALUE
-rb_io_sysread(int argc, VALUE *argv, VALUE io)
+rb_io_sysread(argc, argv, io)
+ int argc;
+ VALUE *argv;
+ VALUE io;
{
VALUE len, str;
rb_io_t *fptr;
@@ -3802,292 +2648,239 @@ rb_io_sysread(int argc, VALUE *argv, VALUE io)
GetOpenFile(io, fptr);
rb_io_check_readable(fptr);
- if (READ_DATA_BUFFERED(fptr)) {
+ if (READ_DATA_BUFFERED(fptr->f)) {
rb_raise(rb_eIOError, "sysread for buffered IO");
}
+ rb_str_locktmp(str);
- n = fptr->fd;
- rb_thread_wait_fd(fptr->fd);
+ n = fileno(fptr->f);
+ rb_thread_wait_fd(fileno(fptr->f));
rb_io_check_closed(fptr);
- if (RSTRING_LEN(str) != ilen) {
+ if (RSTRING(str)->len != ilen) {
rb_raise(rb_eRuntimeError, "buffer string modified");
}
+ TRAP_BEG;
+ n = read(fileno(fptr->f), RSTRING(str)->ptr, ilen);
+ TRAP_END;
- n = rb_read_internal(fptr->fd, RSTRING_PTR(str), ilen);
-
+ rb_str_unlocktmp(str);
if (n == -1) {
- rb_sys_fail_path(fptr->pathv);
+ rb_sys_fail(fptr->path);
}
- rb_str_set_len(str, n);
+ rb_str_resize(str, n);
if (n == 0 && ilen > 0) {
rb_eof_error();
}
- rb_str_resize(str, n);
+ RSTRING(str)->len = n;
+ RSTRING(str)->ptr[n] = '\0';
OBJ_TAINT(str);
return str;
}
-VALUE
-rb_io_binmode(VALUE io)
-{
- rb_io_t *fptr;
-
- GetOpenFile(io, fptr);
- if (fptr->readconv)
- rb_econv_binmode(fptr->readconv);
- if (fptr->writeconv)
- rb_econv_binmode(fptr->writeconv);
- fptr->mode |= FMODE_BINMODE;
- fptr->mode &= ~FMODE_TEXTMODE;
- fptr->writeconv_pre_ecflags &= ~(ECONV_UNIVERSAL_NEWLINE_DECORATOR|ECONV_CRLF_NEWLINE_DECORATOR|ECONV_CR_NEWLINE_DECORATOR);
- return io;
-}
-
-VALUE
-rb_io_ascii8bit_binmode(VALUE io)
-{
- rb_io_t *fptr;
-
- GetOpenFile(io, fptr);
- if (fptr->readconv) {
- rb_econv_close(fptr->readconv);
- fptr->readconv = NULL;
- }
- if (fptr->writeconv) {
- rb_econv_close(fptr->writeconv);
- fptr->writeconv = NULL;
- }
- fptr->mode |= FMODE_BINMODE;
- fptr->mode &= ~FMODE_TEXTMODE;
-
- fptr->encs.enc = rb_ascii8bit_encoding();
- fptr->encs.enc2 = NULL;
- fptr->encs.ecflags = 0;
- fptr->encs.ecopts = Qnil;
- clear_codeconv(fptr);
-
- return io;
-}
-
/*
* call-seq:
* ios.binmode => ios
- *
- * Puts <em>ios</em> into binary mode.
- * Once a stream is in binary mode, it cannot be reset to nonbinary mode.
- *
- * - newline conversion disabled
- * - encoding conversion disabled
- * - content is treated as ASCII-8BIT
- *
+ *
+ * Puts <em>ios</em> into binary mode. This is useful only in
+ * MS-DOS/Windows environments. Once a stream is in binary mode, it
+ * cannot be reset to nonbinary mode.
*/
-static VALUE
-rb_io_binmode_m(VALUE io)
+VALUE
+rb_io_binmode(io)
+ VALUE io;
{
- VALUE write_io;
+#if defined(_WIN32) || defined(DJGPP) || defined(__CYGWIN__) || defined(__human68k__) || defined(__EMX__)
+ rb_io_t *fptr;
- rb_io_ascii8bit_binmode(io);
+ GetOpenFile(io, fptr);
+#ifdef __human68k__
+ if (fptr->f)
+ fmode(fptr->f, _IOBIN);
+ if (fptr->f2)
+ fmode(fptr->f2, _IOBIN);
+#else
+ if (fptr->f && setmode(fileno(fptr->f), O_BINARY) == -1)
+ rb_sys_fail(fptr->path);
+ if (fptr->f2 && setmode(fileno(fptr->f2), O_BINARY) == -1)
+ rb_sys_fail(fptr->path);
+#endif
- write_io = GetWriteIO(io);
- if (write_io != io)
- rb_io_ascii8bit_binmode(write_io);
+ fptr->mode |= FMODE_BINMODE;
+#endif
return io;
}
-/*
- * call-seq:
- * ios.binmode? => true or false
- *
- * Returns <code>true</code> if <em>ios</em> is binmode.
- */
-static VALUE
-rb_io_binmode_p(VALUE io)
-{
- rb_io_t *fptr;
- GetOpenFile(io, fptr);
- return fptr->mode & FMODE_BINMODE ? Qtrue : Qfalse;
-}
-
-static const char*
-rb_io_fmode_modestr(int fmode)
+const char*
+rb_io_flags_mode(flags)
+ int flags;
{
-# define MODE_BTMODE(a,b,c) ((fmode & FMODE_BINMODE) ? (b) : \
- (fmode & FMODE_TEXTMODE) ? (c) : (a))
- if (fmode & FMODE_APPEND) {
- if ((fmode & FMODE_READWRITE) == FMODE_READWRITE) {
- return MODE_BTMODE("a+", "ab+", "at+");
+#ifdef O_BINARY
+# define MODE_BINMODE(a,b) ((flags & FMODE_BINMODE) ? (b) : (a))
+#else
+# define MODE_BINMODE(a,b) (a)
+#endif
+ if (flags & FMODE_APPEND) {
+ if ((flags & FMODE_READWRITE) == FMODE_READWRITE) {
+ return MODE_BINMODE("a+", "ab+");
}
- return MODE_BTMODE("a", "ab", "at");
+ return MODE_BINMODE("a", "ab");
}
- switch (fmode & FMODE_READWRITE) {
+ switch (flags & FMODE_READWRITE) {
case FMODE_READABLE:
- return MODE_BTMODE("r", "rb", "rt");
+ return MODE_BINMODE("r", "rb");
case FMODE_WRITABLE:
- return MODE_BTMODE("w", "wb", "wt");
+ return MODE_BINMODE("w", "wb");
case FMODE_READWRITE:
- if (fmode & FMODE_CREATE) {
- return MODE_BTMODE("w+", "wb+", "wt+");
+ if (flags & FMODE_CREATE) {
+ return MODE_BINMODE("w+", "wb+");
}
- return MODE_BTMODE("r+", "rb+", "rt+");
+ return MODE_BINMODE("r+", "rb+");
}
- rb_raise(rb_eArgError, "invalid access fmode 0x%x", fmode);
+ rb_raise(rb_eArgError, "illegal access modenum %o", flags);
return NULL; /* not reached */
}
-static int
-io_encname_bom_p(const char *name, long len)
-{
- static const char bom_prefix[] = "bom|utf-";
- enum {bom_prefix_len = (int)sizeof(bom_prefix) - 1};
- if (!len) {
- const char *p = strchr(name, ':');
- len = p ? (long)(p - name) : (long)strlen(name);
- }
- return len > bom_prefix_len && STRNCASECMP(name, bom_prefix, bom_prefix_len) == 0;
-}
-
int
-rb_io_modestr_fmode(const char *modestr)
+rb_io_mode_flags(mode)
+ const char *mode;
{
- int fmode = 0;
- const char *m = modestr, *p = NULL;
+ int flags = 0;
+ const char *m = mode;
switch (*m++) {
case 'r':
- fmode |= FMODE_READABLE;
+ flags |= FMODE_READABLE;
break;
case 'w':
- fmode |= FMODE_WRITABLE | FMODE_TRUNC | FMODE_CREATE;
+ flags |= FMODE_WRITABLE | FMODE_CREATE;
break;
case 'a':
- fmode |= FMODE_WRITABLE | FMODE_APPEND | FMODE_CREATE;
+ flags |= FMODE_WRITABLE | FMODE_APPEND | FMODE_CREATE;
break;
default:
error:
- rb_raise(rb_eArgError, "invalid access mode %s", modestr);
+ rb_raise(rb_eArgError, "illegal access mode %s", mode);
}
while (*m) {
switch (*m++) {
- case 'b':
- fmode |= FMODE_BINMODE;
+ case 'b':
+ flags |= FMODE_BINMODE;
break;
- case 't':
- fmode |= FMODE_TEXTMODE;
+ case '+':
+ flags |= FMODE_READWRITE;
break;
- case '+':
- fmode |= FMODE_READWRITE;
- break;
- default:
+ case ':':
+ /* forward compatibility */
+ rb_warning("encoding options not supported in 1.8: %s", mode);
+ goto end;
+ default:
goto error;
- case ':':
- p = m;
- goto finished;
}
}
- finished:
- if ((fmode & FMODE_BINMODE) && (fmode & FMODE_TEXTMODE))
- goto error;
- if (p && io_encname_bom_p(p, 0))
- fmode |= FMODE_SETENC_BY_BOM;
-
- return fmode;
+ end:
+ return flags;
}
int
-rb_io_oflags_fmode(int oflags)
+rb_io_modenum_flags(mode)
+ int mode;
{
- int fmode = 0;
+ int flags = 0;
- switch (oflags & (O_RDONLY|O_WRONLY|O_RDWR)) {
+ switch (mode & (O_RDONLY|O_WRONLY|O_RDWR)) {
case O_RDONLY:
- fmode = FMODE_READABLE;
+ flags = FMODE_READABLE;
break;
case O_WRONLY:
- fmode = FMODE_WRITABLE;
+ flags = FMODE_WRITABLE;
break;
case O_RDWR:
- fmode = FMODE_READWRITE;
+ flags = FMODE_READWRITE;
break;
}
- if (oflags & O_APPEND) {
- fmode |= FMODE_APPEND;
- }
- if (oflags & O_TRUNC) {
- fmode |= FMODE_TRUNC;
+ if (mode & O_APPEND) {
+ flags |= FMODE_APPEND;
}
- if (oflags & O_CREAT) {
- fmode |= FMODE_CREATE;
+ if (mode & O_CREAT) {
+ flags |= FMODE_CREATE;
}
#ifdef O_BINARY
- if (oflags & O_BINARY) {
- fmode |= FMODE_BINMODE;
+ if (mode & O_BINARY) {
+ flags |= FMODE_BINMODE;
}
#endif
- return fmode;
+ return flags;
}
static int
-rb_io_fmode_oflags(int fmode)
+rb_io_mode_modenum(mode)
+ const char *mode;
{
- int oflags = 0;
+ int flags = 0;
+ const char *m = mode;
- switch (fmode & FMODE_READWRITE) {
- case FMODE_READABLE:
- oflags |= O_RDONLY;
- break;
- case FMODE_WRITABLE:
- oflags |= O_WRONLY;
- break;
- case FMODE_READWRITE:
- oflags |= O_RDWR;
- break;
+ switch (*m++) {
+ case 'r':
+ flags |= O_RDONLY;
+ break;
+ case 'w':
+ flags |= O_WRONLY | O_CREAT | O_TRUNC;
+ break;
+ case 'a':
+ flags |= O_WRONLY | O_CREAT | O_APPEND;
+ break;
+ default:
+ error:
+ rb_raise(rb_eArgError, "illegal access mode %s", mode);
}
- if (fmode & FMODE_APPEND) {
- oflags |= O_APPEND;
- }
- if (fmode & FMODE_TRUNC) {
- oflags |= O_TRUNC;
- }
- if (fmode & FMODE_CREATE) {
- oflags |= O_CREAT;
- }
+ while (*m) {
+ switch (*m++) {
+ case 'b':
#ifdef O_BINARY
- if (fmode & FMODE_BINMODE) {
- oflags |= O_BINARY;
- }
+ flags |= O_BINARY;
#endif
+ break;
+ case '+':
+ flags = (flags & ~O_ACCMODE) | O_RDWR;
+ break;
+ case ':':
+ /* forward compatibility */
+ rb_warning("encoding options not supported in 1.8: %s", mode);
+ goto end;
+ default:
+ goto error;
+ }
+ }
- return oflags;
+ end:
+ return flags;
}
-int
-rb_io_modestr_oflags(const char *modestr)
-{
- return rb_io_fmode_oflags(rb_io_modestr_fmode(modestr));
-}
+#define MODENUM_MAX 4
static const char*
-rb_io_oflags_modestr(int oflags)
+rb_io_modenum_mode(flags)
+ int flags;
{
#ifdef O_BINARY
-# define MODE_BINARY(a,b) ((oflags & O_BINARY) ? (b) : (a))
+# define MODE_BINARY(a,b) ((flags & O_BINARY) ? (b) : (a))
#else
# define MODE_BINARY(a,b) (a)
#endif
- if (oflags & O_APPEND) {
- if ((oflags & O_RDWR) == O_RDWR) {
+ if (flags & O_APPEND) {
+ if ((flags & O_RDWR) == O_RDWR) {
return MODE_BINARY("a+", "ab+");
}
return MODE_BINARY("a", "ab");
}
- switch (oflags & (O_RDONLY|O_WRONLY|O_RDWR)) {
+ switch (flags & (O_RDONLY|O_WRONLY|O_RDWR)) {
case O_RDONLY:
return MODE_BINARY("r", "rb");
case O_WRONLY:
@@ -4095,433 +2888,92 @@ rb_io_oflags_modestr(int oflags)
case O_RDWR:
return MODE_BINARY("r+", "rb+");
}
- rb_raise(rb_eArgError, "invalid access oflags 0x%x", oflags);
+ rb_raise(rb_eArgError, "illegal access modenum %o", flags);
return NULL; /* not reached */
}
-/*
- * Convert external/internal encodings to enc/enc2
- * NULL => use default encoding
- * Qnil => no encoding specified (internal only)
- */
-static void
-rb_io_ext_int_to_encs(rb_encoding *ext, rb_encoding *intern, rb_encoding **enc, rb_encoding **enc2)
-{
- int default_ext = 0;
-
- if (ext == NULL) {
- ext = rb_default_external_encoding();
- default_ext = 1;
- }
- if (intern == NULL && ext != rb_ascii8bit_encoding())
- /* If external is ASCII-8BIT, no default transcoding */
- intern = rb_default_internal_encoding();
- if (intern == NULL || intern == (rb_encoding *)Qnil || intern == ext) {
- /* No internal encoding => use external + no transcoding */
- *enc = (default_ext && intern != ext) ? NULL : ext;
- *enc2 = NULL;
- }
- else {
- *enc = intern;
- *enc2 = ext;
- }
-}
-
-static void
-parse_mode_enc(const char *estr, rb_encoding **enc_p, rb_encoding **enc2_p)
-{
- const char *p;
- char encname[ENCODING_MAXNAMELEN+1];
- int idx, idx2;
- rb_encoding *ext_enc, *int_enc;
-
- /* parse estr as "enc" or "enc2:enc" or "enc:-" */
-
- p = strrchr(estr, ':');
- if (p) {
- long len = (p++) - estr;
- if (len == 0 || len > ENCODING_MAXNAMELEN)
- idx = -1;
- else {
- if (io_encname_bom_p(estr, len))
- estr += 4;
- memcpy(encname, estr, len);
- encname[len] = '\0';
- estr = encname;
- idx = rb_enc_find_index(encname);
- }
- }
- else {
- long len = strlen(estr);
- if (io_encname_bom_p(estr, len)) {
- estr += 4;
- memcpy(encname, estr, len);
- encname[len] = '\0';
- estr = encname;
- }
- idx = rb_enc_find_index(estr);
- }
-
- if (idx >= 0)
- ext_enc = rb_enc_from_index(idx);
- else {
- if (idx != -2)
- rb_warn("Unsupported encoding %s ignored", estr);
- ext_enc = NULL;
- }
-
- int_enc = NULL;
- if (p) {
- if (*p == '-' && *(p+1) == '\0') {
- /* Special case - "-" => no transcoding */
- int_enc = (rb_encoding *)Qnil;
- }
- else {
- idx2 = rb_enc_find_index(p);
- if (idx2 < 0)
- rb_warn("Unsupported encoding %s ignored", p);
- else if (idx2 == idx) {
- rb_warn("Ignoring internal encoding %s: it is identical to external encoding %s", p, estr);
- int_enc = (rb_encoding *)Qnil;
- }
- else
- int_enc = rb_enc_from_index(idx2);
- }
- }
-
- rb_io_ext_int_to_encs(ext_enc, int_enc, enc_p, enc2_p);
-}
-
-static void
-mode_enc(rb_io_t *fptr, const char *estr)
-{
- clear_codeconv(fptr);
-
- parse_mode_enc(estr, &fptr->encs.enc, &fptr->encs.enc2);
-}
-
-static void
-rb_io_mode_enc(rb_io_t *fptr, const char *modestr)
-{
- const char *p = strchr(modestr, ':');
- if (p) {
- mode_enc(fptr, p+1);
- }
-}
-
-int
-rb_io_extract_encoding_option(VALUE opt, rb_encoding **enc_p, rb_encoding **enc2_p)
-{
- VALUE encoding=Qnil, extenc=Qundef, intenc=Qundef, tmp;
- int extracted = 0;
- rb_encoding *extencoding = NULL;
- rb_encoding *intencoding = NULL;
-
- if (!NIL_P(opt)) {
- VALUE v;
- v = rb_hash_lookup2(opt, sym_encoding, Qnil);
- if (v != Qnil) encoding = v;
- v = rb_hash_lookup2(opt, sym_extenc, Qundef);
- if (v != Qnil) extenc = v;
- v = rb_hash_lookup2(opt, sym_intenc, Qundef);
- if (v != Qundef) intenc = v;
- }
- if ((extenc != Qundef || intenc != Qundef) && !NIL_P(encoding)) {
- rb_warn("Ignoring encoding parameter '%s': %s_encoding is used",
- StringValueCStr(encoding),
- extenc == Qundef ? "internal" : "external");
- encoding = Qnil;
- }
- if (extenc != Qundef && !NIL_P(extenc)) {
- extencoding = rb_to_encoding(extenc);
- }
- if (intenc != Qundef) {
- if (NIL_P(intenc)) {
- /* internal_encoding: nil => no transcoding */
- intencoding = (rb_encoding *)Qnil;
- }
- else if (!NIL_P(tmp = rb_check_string_type(intenc))) {
- char *p = StringValueCStr(tmp);
-
- if (*p == '-' && *(p+1) == '\0') {
- /* Special case - "-" => no transcoding */
- intencoding = (rb_encoding *)Qnil;
- }
- else {
- intencoding = rb_to_encoding(intenc);
- }
- }
- else {
- intencoding = rb_to_encoding(intenc);
- }
- if (extencoding == intencoding) {
- intencoding = (rb_encoding *)Qnil;
- }
- }
- if (!NIL_P(encoding)) {
- extracted = 1;
- parse_mode_enc(StringValueCStr(encoding), enc_p, enc2_p);
- }
- else if (extenc != Qundef || intenc != Qundef) {
- extracted = 1;
- rb_io_ext_int_to_encs(extencoding, intencoding, enc_p, enc2_p);
- }
- return extracted;
-}
-
-typedef struct rb_io_enc_t convconfig_t;
-
-static void
-validate_enc_binmode(int fmode, rb_encoding *enc, rb_encoding *enc2)
-{
- if ((fmode & FMODE_READABLE) &&
- !enc2 &&
- !(fmode & FMODE_BINMODE) &&
- !rb_enc_asciicompat(enc ? enc : rb_default_external_encoding()))
- rb_raise(rb_eArgError, "ASCII incompatible encoding needs binmode");
-}
-
-static void
-extract_binmode(VALUE opthash, int *fmode)
-{
- if (!NIL_P(opthash)) {
- VALUE v;
- v = rb_hash_aref(opthash, sym_textmode);
- if (!NIL_P(v) && RTEST(v))
- *fmode |= FMODE_TEXTMODE;
- v = rb_hash_aref(opthash, sym_binmode);
- if (!NIL_P(v) && RTEST(v))
- *fmode |= FMODE_BINMODE;
-
- if ((*fmode & FMODE_BINMODE) && (*fmode & FMODE_TEXTMODE))
- rb_raise(rb_eArgError, "both textmode and binmode specified");
- }
-}
-
-static void
-rb_io_extract_modeenc(VALUE *vmode_p, VALUE *vperm_p, VALUE opthash,
- int *oflags_p, int *fmode_p, convconfig_t *convconfig_p)
+static int
+rb_sysopen(fname, flags, mode)
+ char *fname;
+ int flags;
+ unsigned int mode;
{
- VALUE vmode;
- int oflags, fmode;
- rb_encoding *enc, *enc2;
- int ecflags;
- VALUE ecopts;
- int has_enc = 0, has_vmode = 0;
- VALUE intmode;
-
- vmode = *vmode_p;
-
- /* Set to defaults */
- rb_io_ext_int_to_encs(NULL, NULL, &enc, &enc2);
-
- if (NIL_P(vmode)) {
- fmode = FMODE_READABLE;
- oflags = O_RDONLY;
- }
- else if (!NIL_P(intmode = rb_check_to_integer(vmode, "to_int"))) {
- vmode = intmode;
- oflags = NUM2INT(intmode);
- fmode = rb_io_oflags_fmode(oflags);
- }
- else {
- const char *p;
-
- vmode_handle:
- SafeStringValue(vmode);
- p = StringValueCStr(vmode);
- fmode = rb_io_modestr_fmode(p);
- oflags = rb_io_fmode_oflags(fmode);
- p = strchr(p, ':');
- if (p) {
- has_enc = 1;
- parse_mode_enc(p+1, &enc, &enc2);
- if (io_encname_bom_p(p+1, 0))
- fmode |= FMODE_SETENC_BY_BOM;
- }
- else {
- rb_encoding *e;
-
- e = (fmode & FMODE_BINMODE) ? rb_ascii8bit_encoding() : NULL;
- rb_io_ext_int_to_encs(e, NULL, &enc, &enc2);
- }
- }
+ int fd;
- if (NIL_P(opthash)) {
- ecflags = 0;
- ecopts = Qnil;
- }
- else {
- VALUE v;
- extract_binmode(opthash, &fmode);
-#ifdef O_BINARY
- if (fmode & FMODE_BINMODE)
- oflags |= O_BINARY;
-#endif
- if (!has_vmode) {
- v = rb_hash_aref(opthash, sym_mode);
- if (!NIL_P(v)) {
- if (!NIL_P(vmode)) {
- rb_raise(rb_eArgError, "mode specified twice");
- }
- has_vmode = 1;
- vmode = v;
- goto vmode_handle;
- }
+ fd = open(fname, flags, mode);
+ if (fd < 0) {
+ if (errno == EMFILE || errno == ENFILE) {
+ rb_gc();
+ fd = open(fname, flags, mode);
}
- v = rb_hash_aref(opthash, sym_perm);
- if (!NIL_P(v)) {
- if (vperm_p) {
- if (!NIL_P(*vperm_p)) {
- rb_raise(rb_eArgError, "perm specified twice");
- }
- *vperm_p = v;
- }
- else {
- /* perm no use, just ignore */
- }
+ if (fd < 0) {
+ rb_sys_fail(fname);
}
- ecflags = rb_econv_prepare_opts(opthash, &ecopts);
-
- if (rb_io_extract_encoding_option(opthash, &enc, &enc2)) {
- if (has_enc) {
- rb_raise(rb_eArgError, "encoding specified twice");
- }
- }
- }
-
- validate_enc_binmode(fmode, enc, enc2);
-
- *vmode_p = vmode;
-
- *oflags_p = oflags;
- *fmode_p = fmode;
- convconfig_p->enc = enc;
- convconfig_p->enc2 = enc2;
- convconfig_p->ecflags = ecflags;
- convconfig_p->ecopts = ecopts;
-}
-
-struct sysopen_struct {
- VALUE fname;
- int oflags;
- mode_t perm;
-#ifdef _WIN32
- int wchar;
-#endif
-};
-
-#ifdef _WIN32
-static rb_encoding *
-w32_utf16(void)
-{
- static rb_encoding *utf16 = (rb_encoding *)-1;
- if (utf16 == (rb_encoding *)-1) {
- utf16 = rb_enc_find("UTF-16LE");
- if (utf16 == rb_ascii8bit_encoding())
- utf16 = NULL;
}
- return utf16;
-}
-
-static int
-w32_conv_to_utf16(volatile VALUE *strp)
-{
- rb_encoding *utf16 = w32_utf16();
- if (utf16) {
- VALUE wstr = rb_str_encode(*strp, rb_enc_from_encoding(utf16), 0, Qnil);
- rb_enc_str_buf_cat(wstr, "", 1, utf16); /* workaround */
- *strp = wstr;
- return 1;
- }
- else {
- return 0;
- }
-}
-#endif
-
-static VALUE
-sysopen_func(void *ptr)
-{
- const struct sysopen_struct *data = ptr;
- const char *fname = RSTRING_PTR(data->fname);
-#ifdef _WIN32
- if (data->wchar)
- return (VALUE)rb_w32_wopen((WCHAR *)fname, data->oflags, data->perm);
-#endif
- return (VALUE)open(fname, data->oflags, data->perm);
-}
-
-static inline int
-rb_sysopen_internal(struct sysopen_struct *data)
-{
- return (int)rb_thread_blocking_region(sysopen_func, data, RUBY_UBF_IO, 0);
+ return fd;
}
-static int
-rb_sysopen(VALUE fname, int oflags, mode_t perm)
+FILE *
+rb_fopen(fname, mode)
+ const char *fname;
+ const char *mode;
{
- int fd;
- struct sysopen_struct data;
-
-#ifdef O_BINARY
- oflags |= O_BINARY;
-#endif
- data.fname = fname;
- data.oflags = oflags;
- data.perm = perm;
-#ifdef _WIN32
- if ((data.wchar = w32_conv_to_utf16(&data.fname)) != 0) {
- OBJ_FREEZE(data.fname);
- }
-#endif
+ FILE *file;
- fd = rb_sysopen_internal(&data);
- if (fd < 0) {
+ file = fopen(fname, mode);
+ if (!file) {
if (errno == EMFILE || errno == ENFILE) {
rb_gc();
- fd = rb_sysopen_internal(&data);
+ file = fopen(fname, mode);
}
- if (fd < 0) {
- rb_sys_fail(RSTRING_PTR(fname));
+ if (!file) {
+ rb_sys_fail(fname);
}
}
- UPDATE_MAXFD(fd);
- return fd;
+#ifdef USE_SETVBUF
+ if (setvbuf(file, NULL, _IOFBF, 0) != 0)
+ rb_warn("setvbuf() can't be honoured for %s", fname);
+#endif
+#ifdef __human68k__
+ fmode(file, _IOTEXT);
+#endif
+ return file;
}
FILE *
-rb_fdopen(int fd, const char *modestr)
+rb_fdopen(fd, mode)
+ int fd;
+ const char *mode;
{
FILE *file;
#if defined(sun)
errno = 0;
#endif
- file = fdopen(fd, modestr);
+ file = fdopen(fd, mode);
if (!file) {
- if (
#if defined(sun)
- errno == 0 ||
+ if (errno == 0 || errno == EMFILE || errno == ENFILE) {
+#else
+ if (errno == EMFILE || errno == ENFILE) {
#endif
- errno == EMFILE || errno == ENFILE) {
rb_gc();
#if defined(sun)
errno = 0;
#endif
- file = fdopen(fd, modestr);
+ file = fdopen(fd, mode);
}
if (!file) {
#ifdef _WIN32
if (errno == 0) errno = EINVAL;
-#elif defined(sun)
+#endif
+#if defined(sun)
if (errno == 0) errno = EMFILE;
#endif
rb_sys_fail(0);
}
}
- /* xxx: should be _IONBF? A buffer in FILE may have trouble. */
#ifdef USE_SETVBUF
if (setvbuf(file, NULL, _IOFBF, 0) != 0)
rb_warn("setvbuf() can't be honoured (fd=%d)", fd);
@@ -4529,167 +2981,67 @@ rb_fdopen(int fd, const char *modestr)
return file;
}
-static void
-io_check_tty(rb_io_t *fptr)
+static VALUE
+rb_file_open_internal(io, fname, mode)
+ VALUE io;
+ const char *fname, *mode;
{
- if (isatty(fptr->fd))
- fptr->mode |= FMODE_TTY|FMODE_DUPLEX;
-}
-
-static VALUE rb_io_internal_encoding(VALUE);
-static void io_encoding_set(rb_io_t *, VALUE, VALUE, VALUE);
-
-static int
-io_strip_bom(VALUE io)
-{
- int b1, b2, b3, b4;
- switch (b1 = FIX2INT(rb_io_getbyte(io))) {
- case 0xEF:
- b2 = FIX2INT(rb_io_getbyte(io));
- if (b2 == 0xBB) {
- b3 = FIX2INT(rb_io_getbyte(io));
- if (b3 == 0xBF) {
- return rb_utf8_encindex();
- }
- rb_io_ungetbyte(io, INT2FIX(b3));
- }
- rb_io_ungetbyte(io, INT2FIX(b2));
- break;
+ rb_io_t *fptr;
- case 0xFE:
- b2 = FIX2INT(rb_io_getbyte(io));
- if (b2 == 0xFF) {
- return rb_enc_find_index("UTF-16BE");
- }
- rb_io_ungetbyte(io, INT2FIX(b2));
- break;
+ MakeOpenFile(io, fptr);
- case 0xFF:
- b2 = FIX2INT(rb_io_getbyte(io));
- if (b2 == 0xFE) {
- b3 = FIX2INT(rb_io_getbyte(io));
- if (b3 == 0) {
- b4 = FIX2INT(rb_io_getbyte(io));
- if (b4 == 0) {
- return rb_enc_find_index("UTF-32LE");
- }
- rb_io_ungetbyte(io, INT2FIX(b4));
- }
- else {
- rb_io_ungetbyte(io, INT2FIX(b3));
- return rb_enc_find_index("UTF-16LE");
- }
- rb_io_ungetbyte(io, INT2FIX(b3));
- }
- rb_io_ungetbyte(io, INT2FIX(b2));
- break;
+ fptr->mode = rb_io_mode_flags(mode);
+ fptr->path = strdup(fname);
+ fptr->f = rb_fopen(fptr->path, rb_io_flags_mode(fptr->mode));
- case 0:
- b2 = FIX2INT(rb_io_getbyte(io));
- if (b2 == 0) {
- b3 = FIX2INT(rb_io_getbyte(io));
- if (b3 == 0xFE) {
- b4 = FIX2INT(rb_io_getbyte(io));
- if (b4 == 0xFF) {
- return rb_enc_find_index("UTF-32BE");
- }
- rb_io_ungetbyte(io, INT2FIX(b4));
- }
- rb_io_ungetbyte(io, INT2FIX(b3));
- }
- rb_io_ungetbyte(io, INT2FIX(b2));
- break;
- }
- rb_io_ungetbyte(io, INT2FIX(b1));
- return 0;
+ return io;
}
-static void
-io_set_encoding_by_bom(VALUE io)
+VALUE
+rb_file_open(fname, mode)
+ const char *fname, *mode;
{
- int idx = io_strip_bom(io);
-
- if (idx) {
- rb_io_t *fptr;
- GetOpenFile(io, fptr);
- io_encoding_set(fptr, rb_enc_from_encoding(rb_enc_from_index(idx)),
- rb_io_internal_encoding(io), Qnil);
- }
+ return rb_file_open_internal(io_alloc(rb_cFile), fname, mode);
}
static VALUE
-rb_file_open_generic(VALUE io, VALUE filename, int oflags, int fmode, convconfig_t *convconfig, mode_t perm)
+rb_file_sysopen_internal(io, fname, flags, mode)
+ VALUE io;
+ char *fname;
+ int flags, mode;
{
rb_io_t *fptr;
- convconfig_t cc;
- if (!convconfig) {
- /* Set to default encodings */
- rb_io_ext_int_to_encs(NULL, NULL, &cc.enc, &cc.enc2);
- cc.ecflags = 0;
- cc.ecopts = Qnil;
- convconfig = &cc;
- }
- validate_enc_binmode(fmode, convconfig->enc, convconfig->enc2);
+ int fd;
+ const char *m;
MakeOpenFile(io, fptr);
- fptr->mode = fmode;
- fptr->encs = *convconfig;
- fptr->pathv = rb_str_new_frozen(filename);
- fptr->fd = rb_sysopen(fptr->pathv, oflags, perm);
- io_check_tty(fptr);
- if (fmode & FMODE_SETENC_BY_BOM) io_set_encoding_by_bom(io);
-
- return io;
-}
-
-static VALUE
-rb_file_open_internal(VALUE io, VALUE filename, const char *modestr)
-{
- int fmode = rb_io_modestr_fmode(modestr);
- const char *p = strchr(modestr, ':');
- convconfig_t convconfig;
-
- if (p) {
- parse_mode_enc(p+1, &convconfig.enc, &convconfig.enc2);
- }
- else {
- rb_encoding *e;
- /* Set to default encodings */
- e = (fmode & FMODE_BINMODE) ? rb_ascii8bit_encoding() : NULL;
- rb_io_ext_int_to_encs(e, NULL, &convconfig.enc, &convconfig.enc2);
- convconfig.ecflags = 0;
- convconfig.ecopts = Qnil;
- }
-
- return rb_file_open_generic(io, filename,
- rb_io_fmode_oflags(fmode),
- fmode,
- &convconfig,
- 0666);
-}
+ fptr->path = strdup(fname);
+ m = rb_io_modenum_mode(flags);
+ fptr->mode = rb_io_modenum_flags(flags);
+ fd = rb_sysopen(fptr->path, flags, mode);
+ fptr->f = rb_fdopen(fd, m);
-VALUE
-rb_file_open_str(VALUE fname, const char *modestr)
-{
- FilePathValue(fname);
- return rb_file_open_internal(io_alloc(rb_cFile), fname, modestr);
+ return io;
}
VALUE
-rb_file_open(const char *fname, const char *modestr)
+rb_file_sysopen(fname, flags, mode)
+ const char *fname;
+ int flags, mode;
{
- return rb_file_open_internal(io_alloc(rb_cFile), rb_str_new_cstr(fname), modestr);
+ return rb_file_sysopen_internal(io_alloc(rb_cFile), fname, flags, mode);
}
-#if defined(__CYGWIN__) || !defined(HAVE_FORK)
+#if defined (_WIN32) || defined(DJGPP) || defined(__CYGWIN__) || defined(__human68k__) || defined(__VMS)
static struct pipe_list {
rb_io_t *fptr;
struct pipe_list *next;
} *pipe_list;
static void
-pipe_add_fptr(rb_io_t *fptr)
+pipe_add_fptr(fptr)
+ rb_io_t *fptr;
{
struct pipe_list *list;
@@ -4700,7 +3052,8 @@ pipe_add_fptr(rb_io_t *fptr)
}
static void
-pipe_del_fptr(rb_io_t *fptr)
+pipe_del_fptr(fptr)
+ rb_io_t *fptr;
{
struct pipe_list *list = pipe_list;
struct pipe_list *tmp;
@@ -4723,7 +3076,7 @@ pipe_del_fptr(rb_io_t *fptr)
}
static void
-pipe_atexit(void)
+pipe_atexit _((void))
{
struct pipe_list *list = pipe_list;
struct pipe_list *tmp;
@@ -4735,17 +3088,27 @@ pipe_atexit(void)
}
}
+static void pipe_finalize _((rb_io_t *fptr,int));
+
static void
-pipe_finalize(rb_io_t *fptr, int noraise)
+pipe_finalize(fptr, noraise)
+ rb_io_t *fptr;
+ int noraise;
{
-#if !defined(HAVE_FORK) && !defined(_WIN32)
+#if !defined (__CYGWIN__) && !defined(_WIN32)
+ extern VALUE rb_last_status;
int status;
- if (fptr->stdio_file) {
- status = pclose(fptr->stdio_file);
+ if (fptr->f) {
+ status = pclose(fptr->f);
+ }
+ if (fptr->f2) {
+ status = pclose(fptr->f2);
}
- fptr->fd = -1;
- fptr->stdio_file = 0;
- rb_last_status_set(status, fptr->pid);
+ fptr->f = fptr->f2 = 0;
+#if defined DJGPP
+ status <<= 8;
+#endif
+ rb_last_status = INT2FIX(status);
#else
fptr_finalize(fptr, noraise);
#endif
@@ -4754,536 +3117,266 @@ pipe_finalize(rb_io_t *fptr, int noraise)
#endif
void
-rb_io_synchronized(rb_io_t *fptr)
+rb_io_synchronized(fptr)
+ rb_io_t *fptr;
{
- rb_io_check_initialized(fptr);
fptr->mode |= FMODE_SYNC;
}
void
-rb_io_unbuffered(rb_io_t *fptr)
+rb_io_unbuffered(fptr)
+ rb_io_t *fptr;
{
rb_io_synchronized(fptr);
}
-int
-rb_pipe(int *pipes)
-{
- int ret;
- ret = pipe(pipes);
- if (ret == -1) {
- if (errno == EMFILE || errno == ENFILE) {
- rb_gc();
- ret = pipe(pipes);
- }
- }
- if (ret == 0) {
- UPDATE_MAXFD(pipes[0]);
- UPDATE_MAXFD(pipes[1]);
- }
- return ret;
-}
-
-#ifdef HAVE_FORK
-struct popen_arg {
- struct rb_exec_arg *execp;
- int modef;
- int pair[2];
- int write_pair[2];
-};
-
-static void
-popen_redirect(struct popen_arg *p)
-{
- if ((p->modef & FMODE_READABLE) && (p->modef & FMODE_WRITABLE)) {
- close(p->write_pair[1]);
- if (p->write_pair[0] != 0) {
- dup2(p->write_pair[0], 0);
- close(p->write_pair[0]);
- }
- close(p->pair[0]);
- if (p->pair[1] != 1) {
- dup2(p->pair[1], 1);
- close(p->pair[1]);
- }
- }
- else if (p->modef & FMODE_READABLE) {
- close(p->pair[0]);
- if (p->pair[1] != 1) {
- dup2(p->pair[1], 1);
- close(p->pair[1]);
- }
- }
- else {
- close(p->pair[1]);
- if (p->pair[0] != 0) {
- dup2(p->pair[0], 0);
- close(p->pair[0]);
- }
- }
-}
-
-void
-rb_close_before_exec(int lowfd, int maxhint, VALUE noclose_fds)
-{
- int fd, ret;
- int max = max_file_descriptor;
- if (max < maxhint)
- max = maxhint;
- for (fd = lowfd; fd <= max; fd++) {
- if (!NIL_P(noclose_fds) &&
- RTEST(rb_hash_lookup(noclose_fds, INT2FIX(fd))))
- continue;
-#ifdef FD_CLOEXEC
- ret = fcntl(fd, F_GETFD);
- if (ret != -1 && !(ret & FD_CLOEXEC)) {
- fcntl(fd, F_SETFD, ret|FD_CLOEXEC);
- }
-#else
- ret = close(fd);
-#endif
-#define CONTIGUOUS_CLOSED_FDS 20
- if (ret != -1) {
- if (max < fd + CONTIGUOUS_CLOSED_FDS)
- max = fd + CONTIGUOUS_CLOSED_FDS;
- }
- }
-}
-
-static int
-popen_exec(void *pp, char *errmsg, size_t errmsg_len)
-{
- struct popen_arg *p = (struct popen_arg*)pp;
-
- rb_thread_atfork_before_exec();
- return rb_exec_err(p->execp, errmsg, errmsg_len);
-}
-#endif
+static VALUE pipe_open(VALUE pstr, const char *pname, const char *mode);
static VALUE
-pipe_open(struct rb_exec_arg *eargp, VALUE prog, const char *modestr, int fmode, convconfig_t *convconfig)
+pipe_open(pstr, pname, mode)
+ VALUE pstr;
+ const char *pname, *mode;
{
- rb_pid_t pid = 0;
+ int modef = rb_io_mode_flags(mode);
rb_io_t *fptr;
- VALUE port;
- rb_io_t *write_fptr;
- VALUE write_port;
-#if defined(HAVE_FORK)
- int status;
- struct popen_arg arg;
- char errmsg[80] = { '\0' };
-#elif defined(_WIN32)
- volatile VALUE argbuf;
- char **args = NULL;
- int pair[2], write_pair[2];
+#if defined(DJGPP) || defined(__human68k__) || defined(__VMS)
+ FILE *f;
+#else
+ int pid;
+#ifdef _WIN32
+ FILE *fpr, *fpw;
+#else
+ int pr[2], pw[2];
#endif
-#if !defined(HAVE_FORK)
- struct rb_exec_arg sarg;
#endif
- FILE *fp = 0;
- int fd = -1;
- int write_fd = -1;
- const char *cmd = 0;
- int argc;
- VALUE *argv;
+ volatile int doexec;
- if (prog)
- cmd = StringValueCStr(prog);
+ if (!pname) pname = StringValueCStr(pstr);
+ doexec = (strcmp("-", pname) != 0);
- if (!eargp) {
- /* fork : IO.popen("-") */
- argc = 0;
- argv = 0;
- }
- else if (eargp->argc) {
- /* no shell : IO.popen([prog, arg0], arg1, ...) */
- argc = eargp->argc;
- argv = eargp->argv;
+#if defined(DJGPP) || defined(__human68k__) || defined(__VMS) || defined(_WIN32)
+ if (!doexec) {
+ rb_raise(rb_eNotImpError,
+ "fork() function is unimplemented on this machine");
}
+#endif
+
+#if defined(DJGPP) || defined(__human68k__) || defined(__VMS)
+ f = popen(pname, mode);
+
+ if (!f) rb_sys_fail(pname);
else {
- /* with shell : IO.popen(prog) */
- argc = 0;
- argv = 0;
- }
-
-#if defined(HAVE_FORK)
- arg.execp = eargp;
- arg.modef = fmode;
- arg.pair[0] = arg.pair[1] = -1;
- arg.write_pair[0] = arg.write_pair[1] = -1;
- switch (fmode & (FMODE_READABLE|FMODE_WRITABLE)) {
- case FMODE_READABLE|FMODE_WRITABLE:
- if (rb_pipe(arg.write_pair) < 0)
- rb_sys_fail(cmd);
- if (rb_pipe(arg.pair) < 0) {
- int e = errno;
- close(arg.write_pair[0]);
- close(arg.write_pair[1]);
- errno = e;
- rb_sys_fail(cmd);
- }
- if (eargp) {
- rb_exec_arg_addopt(eargp, INT2FIX(0), INT2FIX(arg.write_pair[0]));
- rb_exec_arg_addopt(eargp, INT2FIX(1), INT2FIX(arg.pair[1]));
- }
- break;
- case FMODE_READABLE:
- if (rb_pipe(arg.pair) < 0)
- rb_sys_fail(cmd);
- if (eargp)
- rb_exec_arg_addopt(eargp, INT2FIX(1), INT2FIX(arg.pair[1]));
- break;
- case FMODE_WRITABLE:
- if (rb_pipe(arg.pair) < 0)
- rb_sys_fail(cmd);
- if (eargp)
- rb_exec_arg_addopt(eargp, INT2FIX(0), INT2FIX(arg.pair[0]));
- break;
- default:
- rb_sys_fail(cmd);
+ VALUE port = io_alloc(rb_cIO);
+
+ MakeOpenFile(port, fptr);
+ fptr->finalize = pipe_finalize;
+ fptr->mode = modef;
+
+ pipe_add_fptr(fptr);
+ if (modef & FMODE_READABLE) fptr->f = f;
+ if (modef & FMODE_WRITABLE) {
+ if (fptr->f) fptr->f2 = f;
+ else fptr->f = f;
+ rb_io_synchronized(fptr);
+ }
+ return (VALUE)port;
}
- if (eargp) {
- rb_exec_arg_fixup(arg.execp);
- pid = rb_fork_err(&status, popen_exec, &arg, arg.execp->redirect_fds, errmsg, sizeof(errmsg));
+#else
+#ifdef _WIN32
+retry:
+ pid = pipe_exec(pname, rb_io_mode_modenum(mode), &fpr, &fpw);
+ if (pid == -1) { /* exec failed */
+ if (errno == EAGAIN) {
+ rb_thread_sleep(1);
+ goto retry;
+ }
+ rb_sys_fail(pname);
}
else {
- fflush(stdin); /* is it really needed? */
- pid = rb_fork(&status, 0, 0, Qnil);
- if (pid == 0) { /* child */
- popen_redirect(&arg);
- rb_io_synchronized(RFILE(orig_stdout)->fptr);
- rb_io_synchronized(RFILE(orig_stderr)->fptr);
- return Qnil;
+ VALUE port = io_alloc(rb_cIO);
+
+ MakeOpenFile(port, fptr);
+ fptr->mode = modef;
+ fptr->mode |= FMODE_SYNC;
+ fptr->pid = pid;
+
+ if (modef & FMODE_READABLE) {
+ fptr->f = fpr;
+ }
+ if (modef & FMODE_WRITABLE) {
+ if (fptr->f) fptr->f2 = fpw;
+ else fptr->f = fpw;
}
+ fptr->finalize = pipe_finalize;
+ pipe_add_fptr(fptr);
+ return (VALUE)port;
}
+#else
+ if (((modef & FMODE_READABLE) && pipe(pr) == -1) ||
+ ((modef & FMODE_WRITABLE) && pipe(pw) == -1))
+ rb_sys_fail(pname);
- /* parent */
- if (pid == -1) {
- int e = errno;
- close(arg.pair[0]);
- close(arg.pair[1]);
- if ((fmode & (FMODE_READABLE|FMODE_WRITABLE)) == (FMODE_READABLE|FMODE_WRITABLE)) {
- close(arg.write_pair[0]);
- close(arg.write_pair[1]);
- }
- errno = e;
- if (errmsg[0])
- rb_sys_fail(errmsg);
- rb_sys_fail(cmd);
- }
- if ((fmode & FMODE_READABLE) && (fmode & FMODE_WRITABLE)) {
- close(arg.pair[1]);
- fd = arg.pair[0];
- close(arg.write_pair[0]);
- write_fd = arg.write_pair[1];
- }
- else if (fmode & FMODE_READABLE) {
- close(arg.pair[1]);
- fd = arg.pair[0];
- }
- else {
- close(arg.pair[0]);
- fd = arg.pair[1];
+ if (!doexec) {
+ fflush(stdin); /* is it really needed? */
+ fflush(stdout);
+ fflush(stderr);
}
-#elif defined(_WIN32)
- if (argc) {
- int i;
- if (argc >= FIXNUM_MAX / sizeof(char *)) {
- rb_raise(rb_eArgError, "too many arguments");
+ retry:
+ switch ((pid = fork())) {
+ case 0: /* child */
+ if (modef & FMODE_READABLE) {
+ close(pr[0]);
+ if (pr[1] != 1) {
+ dup2(pr[1], 1);
+ close(pr[1]);
+ }
}
- argbuf = rb_str_tmp_new((argc+1) * sizeof(char *));
- args = (void *)RSTRING_PTR(argbuf);
- for (i = 0; i < argc; ++i) {
- args[i] = StringValueCStr(argv[i]);
+ if (modef & FMODE_WRITABLE) {
+ close(pw[1]);
+ if (pw[0] != 0) {
+ dup2(pw[0], 0);
+ close(pw[0]);
+ }
}
- args[i] = NULL;
- }
- switch (fmode & (FMODE_READABLE|FMODE_WRITABLE)) {
- case FMODE_READABLE|FMODE_WRITABLE:
- if (rb_pipe(write_pair) < 0)
- rb_sys_fail(cmd);
- if (rb_pipe(pair) < 0) {
- int e = errno;
- close(write_pair[0]);
- close(write_pair[1]);
- errno = e;
- rb_sys_fail(cmd);
- }
- if (eargp) {
- rb_exec_arg_addopt(eargp, INT2FIX(0), INT2FIX(write_pair[0]));
- rb_exec_arg_addopt(eargp, INT2FIX(1), INT2FIX(pair[1]));
- }
- break;
- case FMODE_READABLE:
- if (rb_pipe(pair) < 0)
- rb_sys_fail(cmd);
- if (eargp)
- rb_exec_arg_addopt(eargp, INT2FIX(1), INT2FIX(pair[1]));
- break;
- case FMODE_WRITABLE:
- if (rb_pipe(pair) < 0)
- rb_sys_fail(cmd);
- if (eargp)
- rb_exec_arg_addopt(eargp, INT2FIX(0), INT2FIX(pair[0]));
- break;
- default:
- rb_sys_fail(cmd);
- }
- if (eargp) {
- rb_exec_arg_fixup(eargp);
- rb_run_exec_options(eargp, &sarg);
- }
- while ((pid = (args ?
- rb_w32_aspawn(P_NOWAIT, cmd, args) :
- rb_w32_spawn(P_NOWAIT, cmd, 0))) == -1) {
- /* exec failed */
- switch (errno) {
- case EAGAIN:
-#if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
- case EWOULDBLOCK:
-#endif
+
+ if (doexec) {
+ int fd;
+
+ for (fd = 3; fd < NOFILE; fd++)
+ close(fd);
+ rb_proc_exec(pname);
+ fprintf(stderr, "%s:%d: command not found: %s\n",
+ ruby_sourcefile, ruby_sourceline, pname);
+ _exit(127);
+ }
+ rb_io_synchronized(RFILE(orig_stdout)->fptr);
+ rb_io_synchronized(RFILE(orig_stderr)->fptr);
+ return Qnil;
+
+ case -1: /* fork failed */
+ if (errno == EAGAIN) {
rb_thread_sleep(1);
- break;
- default:
- {
- int e = errno;
- if (eargp)
- rb_run_exec_options(&sarg, NULL);
- close(pair[0]);
- close(pair[1]);
- if ((fmode & (FMODE_READABLE|FMODE_WRITABLE)) == (FMODE_READABLE|FMODE_WRITABLE)) {
- close(write_pair[0]);
- close(write_pair[1]);
- }
- errno = e;
- rb_sys_fail(cmd);
+ goto retry;
+ }
+ else {
+ int e = errno;
+ if ((modef & FMODE_READABLE)) {
+ close(pr[0]);
+ close(pr[1]);
}
- break;
+ if ((modef & FMODE_WRITABLE)) {
+ close(pw[0]);
+ close(pw[1]);
+ }
+ errno = e;
+ rb_sys_fail(pname);
}
- }
- if (eargp)
- rb_run_exec_options(&sarg, NULL);
- if ((fmode & FMODE_READABLE) && (fmode & FMODE_WRITABLE)) {
- close(pair[1]);
- fd = pair[0];
- close(write_pair[0]);
- write_fd = write_pair[1];
- }
- else if (fmode & FMODE_READABLE) {
- close(pair[1]);
- fd = pair[0];
- }
- else {
- close(pair[0]);
- fd = pair[1];
- }
-#else
- if (argc) {
- prog = rb_ary_join(rb_ary_new4(argc, argv), rb_str_new2(" "));
- cmd = StringValueCStr(prog);
- }
- if (eargp) {
- rb_exec_arg_fixup(eargp);
- rb_run_exec_options(eargp, &sarg);
- }
- fp = popen(cmd, modestr);
- if (eargp)
- rb_run_exec_options(&sarg, NULL);
- if (!fp) rb_sys_fail(RSTRING_PTR(prog));
- fd = fileno(fp);
-#endif
+ break;
- port = io_alloc(rb_cIO);
- MakeOpenFile(port, fptr);
- fptr->fd = fd;
- fptr->stdio_file = fp;
- fptr->mode = fmode | FMODE_SYNC|FMODE_DUPLEX;
- if (convconfig) {
- fptr->encs = *convconfig;
- }
- fptr->pid = pid;
-
- if (0 <= write_fd) {
- write_port = io_alloc(rb_cIO);
- MakeOpenFile(write_port, write_fptr);
- write_fptr->fd = write_fd;
- write_fptr->mode = (fmode & ~FMODE_READABLE)| FMODE_SYNC|FMODE_DUPLEX;
- fptr->mode &= ~FMODE_WRITABLE;
- fptr->tied_io_for_writing = write_port;
- rb_ivar_set(port, rb_intern("@tied_io_for_writing"), write_port);
- }
-
-#if defined (__CYGWIN__) || !defined(HAVE_FORK)
- fptr->finalize = pipe_finalize;
- pipe_add_fptr(fptr);
-#endif
- return port;
-}
+ default: /* parent */
+ if (pid < 0) rb_sys_fail(pname);
+ else {
+ VALUE port = io_alloc(rb_cIO);
-static VALUE
-pipe_open_v(int argc, VALUE *argv, const char *modestr, int fmode, convconfig_t *convconfig)
-{
- VALUE prog;
- struct rb_exec_arg earg;
- prog = rb_exec_arg_init(argc, argv, FALSE, &earg);
- return pipe_open(&earg, prog, modestr, fmode, convconfig);
-}
+ MakeOpenFile(port, fptr);
+ fptr->mode = modef;
+ fptr->mode |= FMODE_SYNC;
+ fptr->pid = pid;
-static VALUE
-pipe_open_s(VALUE prog, const char *modestr, int fmode, convconfig_t *convconfig)
-{
- const char *cmd = RSTRING_PTR(prog);
- int argc = 1;
- VALUE *argv = &prog;
- struct rb_exec_arg earg;
+ if (modef & FMODE_READABLE) {
+ close(pr[1]);
+ fptr->f = rb_fdopen(pr[0], "r");
+ }
+ if (modef & FMODE_WRITABLE) {
+ FILE *f = rb_fdopen(pw[1], "w");
- if (RSTRING_LEN(prog) == 1 && cmd[0] == '-') {
-#if !defined(HAVE_FORK)
- rb_raise(rb_eNotImpError,
- "fork() function is unimplemented on this machine");
+ close(pw[0]);
+ if (fptr->f) fptr->f2 = f;
+ else fptr->f = f;
+ }
+#if defined (__CYGWIN__)
+ fptr->finalize = pipe_finalize;
+ pipe_add_fptr(fptr);
#endif
- return pipe_open(0, 0, modestr, fmode, convconfig);
+ return port;
+ }
}
-
- rb_exec_arg_init(argc, argv, TRUE, &earg);
- return pipe_open(&earg, prog, modestr, fmode, convconfig);
-}
-
-static VALUE
-pop_last_hash(int *argc_p, VALUE *argv)
-{
- VALUE last, tmp;
- if (*argc_p == 0)
- return Qnil;
- last = argv[*argc_p-1];
- tmp = rb_check_convert_type(last, T_HASH, "Hash", "to_hash");
- if (NIL_P(tmp))
- return Qnil;
- (*argc_p)--;
- return tmp;
+#endif
+#endif
}
/*
* call-seq:
- * IO.popen(cmd, mode="r" [, opt]) => io
- * IO.popen(cmd, mode="r" [, opt]) {|io| block } => obj
- *
- * Runs the specified command as a subprocess; the subprocess's
+ * IO.popen(cmd_string, mode="r" ) => io
+ * IO.popen(cmd_string, mode="r" ) {|io| block } => obj
+ *
+ * Runs the specified command string as a subprocess; the subprocess's
* standard input and output will be connected to the returned
- * <code>IO</code> object.
- *
- * The PID of the started process can be obtained by IO#pid method.
- *
- * _cmd_ is a string or an array as follows.
- *
- * cmd:
- * "-" : fork
- * commandline : command line string which is passed to a shell
- * [env, cmdname, arg1, ..., opts] : command name and zero or more arguments (no shell)
- * [env, [cmdname, argv0], arg1, ..., opts] : command name, argv[0] and zero or more arguments (no shell)
- * (env and opts are optional.)
- *
- * If _cmd_ is a +String+ ``<code>-</code>'',
- * then a new instance of Ruby is started as the subprocess.
- *
- * If <i>cmd</i> is an +Array+ of +String+,
- * then it will be used as the subprocess's +argv+ bypassing a shell.
- * The array can contains a hash at first for environments and
- * a hash at last for options similar to <code>spawn</code>.
- *
- * The default mode for the new file object is ``r'',
- * but <i>mode</i> may be set to any of the modes listed in the description for class IO.
- * The last argument <i>opt</i> qualifies <i>mode</i>.
- *
- * # set IO encoding
- * IO.popen("nkf -e filename", :external_encoding=>"EUC-JP") {|nkf_io|
- * euc_jp_string = nkf_io.read
- * }
- *
- * # merge standard output and standard error using
- * # spawn option. See the document of Kernel.spawn.
- * IO.popen(["ls", "/", :err=>[:child, :out]]) {|ls_io|
- * ls_result_with_error = ls_io.read
- * }
- *
- * Raises exceptions which <code>IO.pipe</code> and
- * <code>Kernel.spawn</code> raise.
- *
+ * <code>IO</code> object. If <i>cmd_string</i> starts with a
+ * ``<code>-</code>'', then a new instance of Ruby is started as the
+ * subprocess. The default mode for the new file object is ``r'', but
+ * <i>mode</i> may be set to any of the modes listed in the description
+ * for class IO.
+ *
* If a block is given, Ruby will run the command as a child connected
* to Ruby with a pipe. Ruby's end of the pipe will be passed as a
* parameter to the block.
* At the end of block, Ruby close the pipe and sets <code>$?</code>.
- * In this case <code>IO.popen</code> returns
+ * In this case <code>IO::popen</code> returns
* the value of the block.
- *
- * If a block is given with a _cmd_ of ``<code>-</code>'',
+ *
+ * If a block is given with a <i>cmd_string</i> of ``<code>-</code>'',
* the block will be run in two separate processes: once in the parent,
* and once in a child. The parent process will be passed the pipe
* object as a parameter to the block, the child version of the block
* will be passed <code>nil</code>, and the child's standard in and
* standard out will be connected to the parent through the pipe. Not
* available on all platforms.
- *
+ *
* f = IO.popen("uname")
* p f.readlines
- * f.close
* puts "Parent is #{Process.pid}"
- * IO.popen("date") { |f| puts f.gets }
- * IO.popen("-") {|f| $stderr.puts "#{Process.pid} is here, f is #{f.inspect}"}
+ * IO.popen ("date") { |f| puts f.gets }
+ * IO.popen("-") {|f| $stderr.puts "#{Process.pid} is here, f is #{f}"}
* p $?
- * IO.popen(%w"sed -e s|^|<foo>| -e s&$&;zot;&", "r+") {|f|
- * f.puts "bar"; f.close_write; puts f.gets
- * }
- *
+ *
* <em>produces:</em>
- *
+ *
* ["Linux\n"]
- * Parent is 21346
- * Thu Jan 15 22:41:19 JST 2009
- * 21346 is here, f is #<IO:fd 3>
- * 21352 is here, f is nil
- * #<Process::Status: pid 21352 exit 0>
- * <foo>bar;zot;
+ * Parent is 26166
+ * Wed Apr 9 08:53:52 CDT 2003
+ * 26169 is here, f is
+ * 26166 is here, f is #<IO:0x401b3d44>
+ * #<Process::Status: pid=26166,exited(0)>
*/
static VALUE
-rb_io_s_popen(int argc, VALUE *argv, VALUE klass)
+rb_io_s_popen(argc, argv, klass)
+ int argc;
+ VALUE *argv;
+ VALUE klass;
{
- const char *modestr;
- VALUE pname, pmode, port, tmp, opt;
- int oflags, fmode;
- convconfig_t convconfig;
+ const char *mode;
+ VALUE pname, pmode, port;
- opt = pop_last_hash(&argc, argv);
- rb_scan_args(argc, argv, "11", &pname, &pmode);
-
- rb_io_extract_modeenc(&pmode, 0, opt, &oflags, &fmode, &convconfig);
- modestr = rb_io_oflags_modestr(oflags);
-
- tmp = rb_check_array_type(pname);
- if (!NIL_P(tmp)) {
- long len = RARRAY_LEN(tmp);
-#if SIZEOF_LONG > SIZEOF_INT
- if (len > INT_MAX) {
- rb_raise(rb_eArgError, "too many arguments");
- }
-#endif
- tmp = rb_ary_dup(tmp);
- RBASIC(tmp)->klass = 0;
- port = pipe_open_v((int)len, RARRAY_PTR(tmp), modestr, fmode, &convconfig);
- rb_ary_clear(tmp);
+ if (rb_scan_args(argc, argv, "11", &pname, &pmode) == 1) {
+ mode = "r";
+ }
+ else if (FIXNUM_P(pmode)) {
+ mode = rb_io_modenum_mode(FIX2INT(pmode));
}
else {
- SafeStringValue(pname);
- port = pipe_open_s(pname, modestr, fmode, &convconfig);
+ mode = rb_io_flags_mode(rb_io_mode_flags(StringValueCStr(pmode)));
}
+ SafeStringValue(pname);
+ port = pipe_open(pname, 0, mode);
if (NIL_P(port)) {
/* child */
if (rb_block_given_p()) {
rb_yield(Qnil);
- rb_io_flush(rb_stdout);
- rb_io_flush(rb_stderr);
+ fflush(stdout);
+ fflush(stderr);
_exit(0);
}
return Qnil;
@@ -5295,96 +3388,58 @@ rb_io_s_popen(int argc, VALUE *argv, VALUE klass)
return port;
}
-static void
-rb_scan_open_args(int argc, VALUE *argv,
- VALUE *fname_p, int *oflags_p, int *fmode_p,
- convconfig_t *convconfig_p, mode_t *perm_p)
-{
- VALUE opt=Qnil, fname, vmode, vperm;
- int oflags, fmode;
- mode_t perm;
-
- opt = pop_last_hash(&argc, argv);
- rb_scan_args(argc, argv, "12", &fname, &vmode, &vperm);
- FilePathValue(fname);
-#if defined __APPLE__
- {
- static rb_encoding *fs_encoding;
- rb_encoding *fname_encoding = rb_enc_get(fname);
- if (!fs_encoding)
- fs_encoding = rb_filesystem_encoding();
- if (rb_usascii_encoding() != fname_encoding
- && rb_ascii8bit_encoding() != fname_encoding
-#if defined __APPLE__
- && rb_utf8_encoding() != fname_encoding
-#endif
- && fs_encoding != fname_encoding) {
- static VALUE fs_enc;
- if (!fs_enc)
- fs_enc = rb_enc_from_encoding(fs_encoding);
- fname = rb_str_encode(fname, fs_enc, 0, Qnil);
- }
- }
-#endif
-
- rb_io_extract_modeenc(&vmode, &vperm, opt, &oflags, &fmode, convconfig_p);
-
- perm = NIL_P(vperm) ? 0666 : NUM2UINT(vperm);
-
- *fname_p = fname;
- *oflags_p = oflags;
- *fmode_p = fmode;
- *perm_p = perm;
-}
-
static VALUE
-rb_open_file(int argc, VALUE *argv, VALUE io)
+rb_open_file(argc, argv, io)
+ int argc;
+ VALUE *argv;
+ VALUE io;
{
- VALUE fname;
- int oflags, fmode;
- convconfig_t convconfig;
- mode_t perm;
+ VALUE fname, vmode, perm;
+ const char *path, *mode;
+ int flags;
+ unsigned int fmode;
- rb_scan_open_args(argc, argv, &fname, &oflags, &fmode, &convconfig, &perm);
- rb_file_open_generic(io, fname, oflags, fmode, &convconfig, perm);
+ rb_scan_args(argc, argv, "12", &fname, &vmode, &perm);
+ SafeStringValue(fname);
+
+ path = StringValueCStr(fname);
+ if (FIXNUM_P(vmode) || !NIL_P(perm)) {
+ if (FIXNUM_P(vmode)) {
+ flags = FIX2INT(vmode);
+ }
+ else {
+ SafeStringValue(vmode);
+ flags = rb_io_mode_modenum(RSTRING(vmode)->ptr);
+ }
+ fmode = NIL_P(perm) ? 0666 : NUM2UINT(perm);
+ rb_file_sysopen_internal(io, path, flags, fmode);
+ }
+ else {
+ mode = NIL_P(vmode) ? "r" : StringValueCStr(vmode);
+ rb_file_open_internal(io, path, mode);
+ }
return io;
}
-
/*
- * Document-method: File::open
- *
* call-seq:
- * File.open(filename, mode="r" [, opt]) => file
- * File.open(filename [, mode [, perm]] [, opt]) => file
- * File.open(filename, mode="r" [, opt]) {|file| block } => obj
- * File.open(filename [, mode [, perm]] [, opt]) {|file| block } => obj
- *
+ * IO.open(fd, mode_string="r" ) => io
+ * IO.open(fd, mode_string="r" ) {|io| block } => obj
+ *
* With no associated block, <code>open</code> is a synonym for
- * <code>File.new</code>. If the optional code block is given, it will
- * be passed <i>file</i> as an argument, and the File object will
- * automatically be closed when the block terminates. In this instance,
- * <code>File.open</code> returns the value of the block.
- */
-
-/*
- * Document-method: IO::open
- *
- * call-seq:
- * IO.open(fd, mode_string="r" [, opt] ) => io
- * IO.open(fd, mode_string="r" [, opt] ) {|io| block } => obj
- *
- * With no associated block, <code>open</code> is a synonym for
- * <code>IO.new</code>. If the optional code block is given, it will
+ * <code>IO::new</code>. If the optional code block is given, it will
* be passed <i>io</i> as an argument, and the IO object will
* automatically be closed when the block terminates. In this instance,
- * <code>IO.open</code> returns the value of the block.
- *
+ * <code>IO::open</code> returns the value of the block.
+ *
*/
static VALUE
-rb_io_s_open(int argc, VALUE *argv, VALUE klass)
+rb_io_s_open(argc, argv, klass)
+ int argc;
+ VALUE *argv;
+ VALUE klass;
{
VALUE io = rb_class_new_instance(argc, argv, klass);
@@ -5398,104 +3453,61 @@ rb_io_s_open(int argc, VALUE *argv, VALUE klass)
/*
* call-seq:
* IO.sysopen(path, [mode, [perm]]) => fixnum
- *
+ *
* Opens the given path, returning the underlying file descriptor as a
* <code>Fixnum</code>.
- *
+ *
* IO.sysopen("testfile") #=> 3
- *
+ *
*/
static VALUE
-rb_io_s_sysopen(int argc, VALUE *argv)
+rb_io_s_sysopen(argc, argv)
+ int argc;
+ VALUE *argv;
{
- VALUE fname, vmode, vperm;
- VALUE intmode;
- int oflags, fd;
- mode_t perm;
+ VALUE fname, vmode, perm;
+ int flags, fd;
+ unsigned int fmode;
+ char *path;
- rb_scan_args(argc, argv, "12", &fname, &vmode, &vperm);
- FilePathValue(fname);
+ rb_scan_args(argc, argv, "12", &fname, &vmode, &perm);
+ SafeStringValue(fname);
- if (NIL_P(vmode))
- oflags = O_RDONLY;
- else if (!NIL_P(intmode = rb_check_to_integer(vmode, "to_int")))
- oflags = NUM2INT(intmode);
+ if (NIL_P(vmode)) flags = O_RDONLY;
+ else if (FIXNUM_P(vmode)) flags = FIX2INT(vmode);
else {
SafeStringValue(vmode);
- oflags = rb_io_modestr_oflags(StringValueCStr(vmode));
+ flags = rb_io_mode_modenum(RSTRING(vmode)->ptr);
}
- if (NIL_P(vperm)) perm = 0666;
- else perm = NUM2UINT(vperm);
+ if (NIL_P(perm)) fmode = 0666;
+ else fmode = NUM2UINT(perm);
- RB_GC_GUARD(fname) = rb_str_new4(fname);
- fd = rb_sysopen(fname, oflags, perm);
+ path = ALLOCA_N(char, strlen(RSTRING(fname)->ptr)+1);
+ strcpy(path, RSTRING(fname)->ptr);
+ fd = rb_sysopen(path, flags, fmode);
return INT2NUM(fd);
}
-static VALUE
-check_pipe_command(VALUE filename_or_command)
-{
- char *s = RSTRING_PTR(filename_or_command);
- long l = RSTRING_LEN(filename_or_command);
- char *e = s + l;
- int chlen;
-
- if (rb_enc_ascget(s, e, &chlen, rb_enc_get(filename_or_command)) == '|') {
- VALUE cmd = rb_str_new(s+chlen, l-chlen);
- OBJ_INFECT(cmd, filename_or_command);
- return cmd;
- }
- return Qnil;
-}
-
/*
* call-seq:
- * open(path [, mode_enc [, perm]] [, opt] ) => io or nil
- * open(path [, mode_enc [, perm]] [, opt] ) {|io| block } => obj
- *
+ * open(path [, mode [, perm]] ) => io or nil
+ * open(path [, mode [, perm]] ) {|io| block } => obj
+ *
* Creates an <code>IO</code> object connected to the given stream,
* file, or subprocess.
- *
+ *
* If <i>path</i> does not start with a pipe character
* (``<code>|</code>''), treat it as the name of a file to open using
- * the specified mode (defaulting to ``<code>r</code>'').
- *
- * The mode_enc is
- * either a string or an integer. If it is an integer, it must be
- * bitwise-or of open(2) flags, such as File::RDWR or File::EXCL.
- * If it is a string, it is either "mode", "mode:ext_enc", or
- * "mode:ext_enc:int_enc".
- * The mode is one of the following:
- *
- * r: read (default)
- * w: write
- * a: append
- *
- * The mode can be followed by "b" (means binary-mode), or "+"
- * (means both reading and writing allowed) or both.
- * If ext_enc (external encoding) is specified,
- * read string will be tagged by the encoding in reading,
- * and output string will be converted
- * to the specified encoding in writing.
- * If ext_enc starts with 'BOM|', check whether the input has a BOM. If
- * there is a BOM, strip it and set external encoding as
- * what the BOM tells. If there is no BOM, use ext_enc without 'BOM|'.
- * If two encoding names,
- * ext_enc and int_enc (external encoding and internal encoding),
- * are specified, the read string is converted from ext_enc
- * to int_enc then tagged with the int_enc in read mode,
- * and in write mode, the output string will be
- * converted from int_enc to ext_enc before writing.
- *
- * If a file is being created, its initial permissions may be
- * set using the integer third parameter.
- *
+ * the specified mode (defaulting to ``<code>r</code>''). (See the table
+ * of valid modes on page 331.) If a file is being created, its initial
+ * permissions may be set using the integer third parameter.
+ *
* If a block is specified, it will be invoked with the
* <code>File</code> object as a parameter, and the file will be
* automatically closed when the block terminates. The call
* returns the value of the block.
- *
+ *
* If <i>path</i> starts with a pipe character, a subprocess is
* created, connected to the caller by a pair of pipes. The returned
* <code>IO</code> object may be used to write to the standard input
@@ -5511,27 +3523,27 @@ check_pipe_command(VALUE filename_or_command)
* will be connected to the child's <code>$stdin</code> and
* <code>$stdout</code>. The subprocess will be terminated at the end
* of the block.
- *
+ *
* open("testfile") do |f|
* print f.gets
* end
- *
+ *
* <em>produces:</em>
- *
+ *
* This is line one
- *
+ *
* Open a subprocess and read its output:
- *
+ *
* cmd = open("|date")
* print cmd.gets
* cmd.close
- *
+ *
* <em>produces:</em>
- *
+ *
* Wed Apr 9 08:56:31 CDT 2003
- *
+ *
* Open a subprocess running the same Ruby program:
- *
+ *
* f = open("|-", "w+")
* if f == nil
* puts "in Child"
@@ -5539,13 +3551,13 @@ check_pipe_command(VALUE filename_or_command)
* else
* puts "Got: #{f.gets}"
* end
- *
+ *
* <em>produces:</em>
- *
+ *
* Got: in Child
- *
+ *
* Open a subprocess using a block to receive the I/O object:
- *
+ *
* open("|-") do |f|
* if f == nil
* puts "in Child"
@@ -5553,159 +3565,158 @@ check_pipe_command(VALUE filename_or_command)
* puts "Got: #{f.gets}"
* end
* end
- *
+ *
* <em>produces:</em>
- *
+ *
* Got: in Child
*/
static VALUE
-rb_f_open(int argc, VALUE *argv)
+rb_f_open(argc, argv)
+ int argc;
+ VALUE *argv;
{
- ID to_open = 0;
- int redirect = FALSE;
-
if (argc >= 1) {
- CONST_ID(to_open, "to_open");
- if (rb_respond_to(argv[0], to_open)) {
- redirect = TRUE;
- }
- else {
- VALUE tmp = argv[0];
- FilePathValue(tmp);
- if (NIL_P(tmp)) {
- redirect = TRUE;
- }
- else {
- VALUE cmd = check_pipe_command(tmp);
- if (!NIL_P(cmd)) {
- argv[0] = cmd;
- return rb_io_s_popen(argc, argv, rb_cIO);
- }
- }
- }
- }
- if (redirect) {
- VALUE io = rb_funcall2(argv[0], to_open, argc-1, argv+1);
+ char *str = StringValuePtr(argv[0]);
- if (rb_block_given_p()) {
- return rb_ensure(rb_yield, io, io_close, io);
+ if (str[0] == '|') {
+ VALUE tmp = rb_str_new(str+1, RSTRING(argv[0])->len-1);
+ OBJ_INFECT(tmp, argv[0]);
+ argv[0] = tmp;
+ return rb_io_s_popen(argc, argv, rb_cIO);
}
- return io;
}
return rb_io_s_open(argc, argv, rb_cFile);
}
static VALUE
-rb_io_open(VALUE filename, VALUE vmode, VALUE vperm, VALUE opt)
+rb_io_open(fname, mode)
+ char *fname, *mode;
{
- VALUE cmd;
- int oflags, fmode;
- convconfig_t convconfig;
- mode_t perm;
-
- rb_io_extract_modeenc(&vmode, &vperm, opt, &oflags, &fmode, &convconfig);
- perm = NIL_P(vperm) ? 0666 : NUM2UINT(vperm);
-
- if (!NIL_P(cmd = check_pipe_command(filename))) {
- return pipe_open_s(cmd, rb_io_oflags_modestr(oflags), fmode, &convconfig);
+ if (fname[0] == '|') {
+ return pipe_open(0, fname+1, mode);
}
else {
- return rb_file_open_generic(io_alloc(rb_cFile), filename,
- oflags, fmode, &convconfig, perm);
+ return rb_file_open(fname, mode);
}
}
static VALUE
-rb_io_open_with_args(int argc, VALUE *argv)
+rb_io_get_io(io)
+ VALUE io;
{
+ return rb_convert_type(io, T_FILE, "IO", "to_io");
+}
+
+static VALUE
+rb_io_check_io(io)
VALUE io;
+{
+ return rb_check_convert_type(io, T_FILE, "IO", "to_io");
+}
- io = io_alloc(rb_cFile);
- rb_open_file(argc, argv, io);
- return io;
+static const char*
+rb_io_mode_string(fptr)
+ rb_io_t *fptr;
+{
+ switch (fptr->mode & FMODE_READWRITE) {
+ case FMODE_READABLE:
+ default:
+ return "r";
+ case FMODE_WRITABLE:
+ return "w";
+ case FMODE_READWRITE:
+ return "r+";
+ }
}
static VALUE
-io_reopen(VALUE io, VALUE nfile)
+io_reopen(io, nfile)
+ VALUE io, nfile;
{
rb_io_t *fptr, *orig;
+ const char *mode;
int fd, fd2;
off_t pos = 0;
nfile = rb_io_get_io(nfile);
- if (rb_safe_level() >= 4 &&
- (!OBJ_UNTRUSTED(io) || !OBJ_UNTRUSTED(nfile))) {
+ if (rb_safe_level() >= 4 && (!OBJ_TAINTED(io) || !OBJ_TAINTED(nfile))) {
rb_raise(rb_eSecurityError, "Insecure: can't reopen");
}
GetOpenFile(io, fptr);
GetOpenFile(nfile, orig);
if (fptr == orig) return io;
- if (IS_PREP_STDIO(fptr)) {
- if ((fptr->stdio_file == stdin && !(orig->mode & FMODE_READABLE)) ||
- (fptr->stdio_file == stdout && !(orig->mode & FMODE_WRITABLE)) ||
- (fptr->stdio_file == stderr && !(orig->mode & FMODE_WRITABLE))) {
- rb_raise(rb_eArgError,
- "%s can't change access mode from \"%s\" to \"%s\"",
- PREP_STDIO_NAME(fptr), rb_io_fmode_modestr(fptr->mode),
- rb_io_fmode_modestr(orig->mode));
- }
- }
if (orig->mode & FMODE_READABLE) {
pos = io_tell(orig);
}
- if (orig->mode & FMODE_WRITABLE) {
- if (io_fflush(orig) < 0)
- rb_sys_fail(0);
+ if (orig->f2) {
+ io_fflush(orig->f2, orig);
}
- if (fptr->mode & FMODE_WRITABLE) {
- if (io_fflush(fptr) < 0)
- rb_sys_fail(0);
+ else if (orig->mode & FMODE_WRITABLE) {
+ io_fflush(orig->f, orig);
}
- else {
- io_tell(fptr);
+ if (fptr->mode & FMODE_WRITABLE) {
+ io_fflush(GetWriteFile(fptr), fptr);
}
/* copy rb_io_t structure */
- fptr->mode = orig->mode | (fptr->mode & FMODE_PREP);
+ fptr->mode = orig->mode;
fptr->pid = orig->pid;
fptr->lineno = orig->lineno;
- if (RTEST(orig->pathv)) fptr->pathv = orig->pathv;
- else if (!IS_PREP_STDIO(fptr)) fptr->pathv = Qnil;
+ if (fptr->path) free(fptr->path);
+ if (orig->path) fptr->path = strdup(orig->path);
+ else fptr->path = 0;
fptr->finalize = orig->finalize;
-#if defined (__CYGWIN__) || !defined(HAVE_FORK)
- if (fptr->finalize == pipe_finalize)
- pipe_add_fptr(fptr);
-#endif
- fd = fptr->fd;
- fd2 = orig->fd;
+ mode = rb_io_mode_string(fptr);
+ fd = fileno(fptr->f);
+ fd2 = fileno(orig->f);
if (fd != fd2) {
- if (IS_PREP_STDIO(fptr)) {
+ if (fptr->f == stdin || fptr->f == stdout || fptr->f == stderr) {
+ clearerr(fptr->f);
/* need to keep stdio objects */
if (dup2(fd2, fd) < 0)
- rb_sys_fail_path(orig->pathv);
+ rb_sys_fail(orig->path);
}
else {
- if (fptr->stdio_file)
- fclose(fptr->stdio_file);
- else
- close(fptr->fd);
- fptr->stdio_file = 0;
- fptr->fd = -1;
+ FILE *f2 = fptr->f2;
+ int m = fptr->mode;
+ fclose(fptr->f);
+ fptr->f = f2;
+ fptr->f2 = NULL;
+ fptr->mode &= (m & FMODE_READABLE) ? ~FMODE_READABLE : ~FMODE_WRITABLE;
if (dup2(fd2, fd) < 0)
- rb_sys_fail_path(orig->pathv);
- fptr->fd = fd;
+ rb_sys_fail(orig->path);
+ if (f2) {
+ fptr->f = rb_fdopen(fd, "r");
+ fptr->f2 = f2;
+ }
+ else {
+ fptr->f = rb_fdopen(fd, mode);
+ }
+ fptr->mode = m;
}
rb_thread_fd_close(fd);
if ((orig->mode & FMODE_READABLE) && pos >= 0) {
- if (io_seek(fptr, pos, SEEK_SET) < 0) {
- rb_sys_fail_path(fptr->pathv);
- }
- if (io_seek(orig, pos, SEEK_SET) < 0) {
- rb_sys_fail_path(orig->pathv);
- }
+ io_seek(fptr, pos, SEEK_SET);
+ io_seek(orig, pos, SEEK_SET);
+ }
+ }
+
+ if (fptr->f2 && fd != fileno(fptr->f2)) {
+ fd = fileno(fptr->f2);
+ if (!orig->f2) {
+ fclose(fptr->f2);
+ rb_thread_fd_close(fd);
+ fptr->f2 = 0;
+ }
+ else if (fd != (fd2 = fileno(orig->f2))) {
+ fclose(fptr->f2);
+ rb_thread_fd_close(fd);
+ if (dup2(fd2, fd) < 0)
+ rb_sys_fail(orig->path);
+ fptr->f2 = rb_fdopen(fd, "w");
}
}
@@ -5713,19 +3724,19 @@ io_reopen(VALUE io, VALUE nfile)
rb_io_binmode(io);
}
- RBASIC(io)->klass = rb_obj_class(nfile);
+ RBASIC(io)->klass = RBASIC(nfile)->klass;
return io;
}
/*
* call-seq:
- * ios.reopen(other_IO) => ios
+ * ios.reopen(other_IO) => ios
* ios.reopen(path, mode_str) => ios
- *
+ *
* Reassociates <em>ios</em> with the I/O stream given in
* <i>other_IO</i> or to a new stream opened on <i>path</i>. This may
* dynamically change the actual class of this stream.
- *
+ *
* f1 = File.new("testfile")
* f2 = File.new("testfile")
* f2.readlines[0] #=> "This is line one\n"
@@ -5734,10 +3745,13 @@ io_reopen(VALUE io, VALUE nfile)
*/
static VALUE
-rb_io_reopen(int argc, VALUE *argv, VALUE file)
+rb_io_reopen(argc, argv, file)
+ int argc;
+ VALUE *argv;
+ VALUE file;
{
VALUE fname, nmode;
- int oflags;
+ const char *mode;
rb_io_t *fptr;
rb_secure(4);
@@ -5748,7 +3762,7 @@ rb_io_reopen(int argc, VALUE *argv, VALUE file)
}
}
- FilePathValue(fname);
+ SafeStringValue(fname);
rb_io_taint_check(file);
fptr = RFILE(file)->fptr;
if (!fptr) {
@@ -5757,50 +3771,37 @@ rb_io_reopen(int argc, VALUE *argv, VALUE file)
}
if (!NIL_P(nmode)) {
- int fmode = rb_io_modestr_fmode(StringValueCStr(nmode));
- if (IS_PREP_STDIO(fptr) &&
- ((fptr->mode & FMODE_READWRITE) & (fmode & FMODE_READWRITE)) !=
- (fptr->mode & FMODE_READWRITE)) {
- rb_raise(rb_eArgError,
- "%s can't change access mode from \"%s\" to \"%s\"",
- PREP_STDIO_NAME(fptr), rb_io_fmode_modestr(fptr->mode),
- rb_io_fmode_modestr(fmode));
- }
- fptr->mode = fmode;
- rb_io_mode_enc(fptr, StringValueCStr(nmode));
- fptr->encs.ecflags = 0;
- fptr->encs.ecopts = Qnil;
+ fptr->mode = rb_io_mode_flags(StringValueCStr(nmode));
}
- fptr->pathv = rb_str_new_frozen(fname);
- oflags = rb_io_fmode_oflags(fptr->mode);
- if (fptr->fd < 0) {
- fptr->fd = rb_sysopen(fptr->pathv, oflags, 0666);
- fptr->stdio_file = 0;
- return file;
+ if (fptr->path) {
+ free(fptr->path);
+ fptr->path = 0;
}
- if (fptr->mode & FMODE_WRITABLE) {
- if (io_fflush(fptr) < 0)
- rb_sys_fail(0);
+ fptr->path = strdup(StringValueCStr(fname));
+ mode = rb_io_flags_mode(fptr->mode);
+ if (!fptr->f) {
+ fptr->f = rb_fopen(fptr->path, mode);
+ if (fptr->f2) {
+ fclose(fptr->f2);
+ fptr->f2 = 0;
+ }
+ return file;
}
- fptr->rbuf_off = fptr->rbuf_len = 0;
- if (fptr->stdio_file) {
- if (freopen(RSTRING_PTR(fptr->pathv), rb_io_oflags_modestr(oflags), fptr->stdio_file) == 0) {
- rb_sys_fail_path(fptr->pathv);
- }
- fptr->fd = fileno(fptr->stdio_file);
+ if (freopen(fptr->path, mode, fptr->f) == 0) {
+ rb_sys_fail(fptr->path);
+ }
#ifdef USE_SETVBUF
- if (setvbuf(fptr->stdio_file, NULL, _IOFBF, 0) != 0)
- rb_warn("setvbuf() can't be honoured for %s", RSTRING_PTR(fptr->pathv));
+ if (setvbuf(fptr->f, NULL, _IOFBF, 0) != 0)
+ rb_warn("setvbuf() can't be honoured for %s", fptr->path);
#endif
- }
- else {
- if (close(fptr->fd) < 0)
- rb_sys_fail_path(fptr->pathv);
- fptr->fd = -1;
- fptr->fd = rb_sysopen(fptr->pathv, oflags, 0666);
+
+ if (fptr->f2) {
+ if (freopen(fptr->path, "w", fptr->f2) == 0) {
+ rb_sys_fail(fptr->path);
+ }
}
return file;
@@ -5808,62 +3809,78 @@ rb_io_reopen(int argc, VALUE *argv, VALUE file)
/* :nodoc: */
static VALUE
-rb_io_init_copy(VALUE dest, VALUE io)
+rb_io_init_copy(dest, io)
+ VALUE dest, io;
{
rb_io_t *fptr, *orig;
int fd;
- VALUE write_io;
- off_t pos;
+ const char *mode;
io = rb_io_get_io(io);
if (dest == io) return dest;
GetOpenFile(io, orig);
MakeOpenFile(dest, fptr);
- rb_io_flush(io);
+ if (orig->f2) {
+ io_fflush(orig->f2, orig);
+ fseeko(orig->f, 0L, SEEK_CUR);
+ }
+ else if (orig->mode & FMODE_WRITABLE) {
+ io_fflush(orig->f, orig);
+ }
+ else {
+ fseeko(orig->f, 0L, SEEK_CUR);
+ }
/* copy rb_io_t structure */
- fptr->mode = orig->mode & ~FMODE_PREP;
- fptr->encs = orig->encs;
+ fptr->mode = orig->mode;
fptr->pid = orig->pid;
fptr->lineno = orig->lineno;
- if (!NIL_P(orig->pathv)) fptr->pathv = orig->pathv;
+ if (orig->path) fptr->path = strdup(orig->path);
fptr->finalize = orig->finalize;
-#if defined (__CYGWIN__) || !defined(HAVE_FORK)
- if (fptr->finalize == pipe_finalize)
- pipe_add_fptr(fptr);
-#endif
- fd = ruby_dup(orig->fd);
- fptr->fd = fd;
- pos = io_tell(orig);
- if (0 <= pos)
- io_seek(fptr, pos, SEEK_SET);
+ switch (fptr->mode & FMODE_READWRITE) {
+ case FMODE_READABLE:
+ default:
+ mode = "r"; break;
+ case FMODE_WRITABLE:
+ mode = "w"; break;
+ case FMODE_READWRITE:
+ if (orig->f2) mode = "r";
+ else mode = "r+";
+ break;
+ }
+ fd = ruby_dup(fileno(orig->f));
+ fptr->f = rb_fdopen(fd, mode);
+ fseeko(fptr->f, ftello(orig->f), SEEK_SET);
+ if (orig->f2) {
+ if (fileno(orig->f) != fileno(orig->f2)) {
+ fd = ruby_dup(fileno(orig->f2));
+ }
+ fptr->f2 = rb_fdopen(fd, "w");
+ fseeko(fptr->f2, ftello(orig->f2), SEEK_SET);
+ }
if (fptr->mode & FMODE_BINMODE) {
rb_io_binmode(dest);
}
- write_io = GetWriteIO(io);
- if (io != write_io) {
- write_io = rb_obj_dup(write_io);
- fptr->tied_io_for_writing = write_io;
- rb_ivar_set(dest, rb_intern("@tied_io_for_writing"), write_io);
- }
-
return dest;
}
/*
* call-seq:
* ios.printf(format_string [, obj, ...] ) => nil
- *
+ *
* Formats and writes to <em>ios</em>, converting parameters under
* control of the format string. See <code>Kernel#sprintf</code>
* for details.
*/
VALUE
-rb_io_printf(int argc, VALUE *argv, VALUE out)
+rb_io_printf(argc, argv, out)
+ int argc;
+ VALUE argv[];
+ VALUE out;
{
rb_io_write(out, rb_f_sprintf(argc, argv));
return Qnil;
@@ -5873,7 +3890,7 @@ rb_io_printf(int argc, VALUE *argv, VALUE out)
* call-seq:
* printf(io, string [, obj ... ] ) => nil
* printf(string [, obj ... ] ) => nil
- *
+ *
* Equivalent to:
* io.write(sprintf(string, obj, ...)
* or
@@ -5881,7 +3898,9 @@ rb_io_printf(int argc, VALUE *argv, VALUE out)
*/
static VALUE
-rb_f_printf(int argc, VALUE *argv)
+rb_f_printf(argc, argv)
+ int argc;
+ VALUE argv[];
{
VALUE out;
@@ -5903,7 +3922,7 @@ rb_f_printf(int argc, VALUE *argv)
* call-seq:
* ios.print() => nil
* ios.print(obj, ...) => nil
- *
+ *
* Writes the given object(s) to <em>ios</em>. The stream must be
* opened for writing. If the output record separator (<code>$\\</code>)
* is not <code>nil</code>, it will be appended to the output. If no
@@ -5911,16 +3930,19 @@ rb_f_printf(int argc, VALUE *argv)
* strings will be converted by calling their <code>to_s</code> method.
* With no argument, prints the contents of the variable <code>$_</code>.
* Returns <code>nil</code>.
- *
+ *
* $stdout.print("This is ", 100, " percent.\n")
- *
+ *
* <em>produces:</em>
- *
+ *
* This is 100 percent.
*/
VALUE
-rb_io_print(int argc, VALUE *argv, VALUE out)
+rb_io_print(argc, argv, out)
+ int argc;
+ VALUE *argv;
+ VALUE out;
{
int i;
VALUE line;
@@ -5932,12 +3954,19 @@ rb_io_print(int argc, VALUE *argv, VALUE out)
argv = &line;
}
for (i=0; i<argc; i++) {
- rb_io_write(out, argv[i]);
- if (!NIL_P(rb_output_fs)) {
+ if (!NIL_P(rb_output_fs) && i>0) {
rb_io_write(out, rb_output_fs);
}
+ switch (TYPE(argv[i])) {
+ case T_NIL:
+ rb_io_write(out, rb_str_new2("nil"));
+ break;
+ default:
+ rb_io_write(out, argv[i]);
+ break;
+ }
}
- if (argc > 0 && !NIL_P(rb_output_rs)) {
+ if (!NIL_P(rb_output_rs)) {
rb_io_write(out, rb_output_rs);
}
@@ -5947,7 +3976,7 @@ rb_io_print(int argc, VALUE *argv, VALUE out)
/*
* call-seq:
* print(obj, ...) => nil
- *
+ *
* Prints each object in turn to <code>$stdout</code>. If the output
* field separator (<code>$,</code>) is not +nil+, its
* contents will appear between each field. If the output record
@@ -5955,20 +3984,22 @@ rb_io_print(int argc, VALUE *argv, VALUE out)
* appended to the output. If no arguments are given, prints
* <code>$_</code>. Objects that aren't strings will be converted by
* calling their <code>to_s</code> method.
- *
+ *
* print "cat", [1,2,3], 99, "\n"
* $, = ", "
* $\ = "\n"
* print "cat", [1,2,3], 99
- *
+ *
* <em>produces:</em>
- *
+ *
* cat12399
* cat, 1, 2, 3, 99
*/
static VALUE
-rb_f_print(int argc, VALUE *argv)
+rb_f_print(argc, argv)
+ int argc;
+ VALUE *argv;
{
rb_io_print(argc, argv, rb_stdout);
return Qnil;
@@ -5977,21 +4008,22 @@ rb_f_print(int argc, VALUE *argv)
/*
* call-seq:
* ios.putc(obj) => obj
- *
+ *
* If <i>obj</i> is <code>Numeric</code>, write the character whose
* code is <i>obj</i>, otherwise write the first character of the
* string representation of <i>obj</i> to <em>ios</em>.
- *
+ *
* $stdout.putc "A"
* $stdout.putc 65
- *
+ *
* <em>produces:</em>
- *
+ *
* AA
*/
static VALUE
-rb_io_putc(VALUE io, VALUE ch)
+rb_io_putc(io, ch)
+ VALUE io, ch;
{
char c = NUM2CHR(ch);
@@ -6002,34 +4034,31 @@ rb_io_putc(VALUE io, VALUE ch)
/*
* call-seq:
* putc(int) => int
- *
+ *
* Equivalent to:
*
* $stdout.putc(int)
*/
static VALUE
-rb_f_putc(VALUE recv, VALUE ch)
+rb_f_putc(recv, ch)
+ VALUE recv, ch;
{
- if (recv == rb_stdout) {
- return rb_io_putc(recv, ch);
- }
- return rb_funcall2(rb_stdout, rb_intern("putc"), 1, &ch);
+ return rb_io_putc(rb_stdout, ch);
}
static VALUE
-io_puts_ary(VALUE ary, VALUE out, int recur)
+io_puts_ary(ary, out)
+ VALUE ary, out;
{
VALUE tmp;
long i;
- if (recur) {
- tmp = rb_str_new2("[...]");
- rb_io_puts(1, &tmp, out);
- return Qnil;
- }
- for (i=0; i<RARRAY_LEN(ary); i++) {
- tmp = RARRAY_PTR(ary)[i];
+ for (i=0; i<RARRAY(ary)->len; i++) {
+ tmp = RARRAY(ary)->ptr[i];
+ if (rb_inspecting_p(tmp)) {
+ tmp = rb_str_new2("[...]");
+ }
rb_io_puts(1, &tmp, out);
}
return Qnil;
@@ -6038,17 +4067,17 @@ io_puts_ary(VALUE ary, VALUE out, int recur)
/*
* call-seq:
* ios.puts(obj, ...) => nil
- *
+ *
* Writes the given objects to <em>ios</em> as with
* <code>IO#print</code>. Writes a record separator (typically a
* newline) after any that do not already end with a newline sequence.
* If called with an array argument, writes each element on a new line.
* If called without arguments, outputs a single record separator.
- *
+ *
* $stdout.puts("this", "is", "a", "test")
- *
+ *
* <em>produces:</em>
- *
+ *
* this
* is
* a
@@ -6056,7 +4085,10 @@ io_puts_ary(VALUE ary, VALUE out, int recur)
*/
VALUE
-rb_io_puts(int argc, VALUE *argv, VALUE out)
+rb_io_puts(argc, argv, out)
+ int argc;
+ VALUE *argv;
+ VALUE out;
{
int i;
VALUE line;
@@ -6067,15 +4099,20 @@ rb_io_puts(int argc, VALUE *argv, VALUE out)
return Qnil;
}
for (i=0; i<argc; i++) {
- line = rb_check_array_type(argv[i]);
- if (!NIL_P(line)) {
- rb_exec_recursive(io_puts_ary, line, out);
- continue;
+ if (NIL_P(argv[i])) {
+ line = rb_str_new2("nil");
+ }
+ else {
+ line = rb_check_array_type(argv[i]);
+ if (!NIL_P(line)) {
+ rb_protect_inspect(io_puts_ary, line, out);
+ continue;
+ }
+ line = rb_obj_as_string(argv[i]);
}
- line = rb_obj_as_string(argv[i]);
rb_io_write(out, line);
- if (RSTRING_LEN(line) == 0 ||
- RSTRING_PTR(line)[RSTRING_LEN(line)-1] != '\n') {
+ if (RSTRING(line)->len == 0 ||
+ RSTRING(line)->ptr[RSTRING(line)->len-1] != '\n') {
rb_io_write(out, rb_default_rs);
}
}
@@ -6086,134 +4123,122 @@ rb_io_puts(int argc, VALUE *argv, VALUE out)
/*
* call-seq:
* puts(obj, ...) => nil
- *
- * Equivalent to
+ *
+ * Equivalent to
*
* $stdout.puts(obj, ...)
*/
static VALUE
-rb_f_puts(int argc, VALUE *argv, VALUE recv)
+rb_f_puts(argc, argv)
+ int argc;
+ VALUE *argv;
{
- if (recv == rb_stdout) {
- return rb_io_puts(argc, argv, recv);
- }
- return rb_funcall2(rb_stdout, rb_intern("puts"), argc, argv);
+ rb_io_puts(argc, argv, rb_stdout);
+ return Qnil;
}
void
-rb_p(VALUE obj) /* for debug print within C code */
+rb_p(obj) /* for debug print within C code */
+ VALUE obj;
{
- VALUE str = rb_obj_as_string(rb_inspect(obj));
- if (TYPE(rb_stdout) == T_FILE &&
- rb_method_basic_definition_p(CLASS_OF(rb_stdout), id_write)) {
- io_write(rb_stdout, str, 1);
- io_write(rb_stdout, rb_default_rs, 0);
- }
- else {
- rb_io_write(rb_stdout, str);
- rb_io_write(rb_stdout, rb_default_rs);
- }
+ rb_io_write(rb_stdout, rb_obj_as_string(rb_inspect(obj)));
+ rb_io_write(rb_stdout, rb_default_rs);
}
/*
* call-seq:
- * p(obj) => obj
- * p(obj1, obj2, ...) => [obj, ...]
- * p() => nil
- *
+ * p(obj, ...) => nil
+ *
* For each object, directly writes
* _obj_.+inspect+ followed by the current output
* record separator to the program's standard output.
- *
+ *
* S = Struct.new(:name, :state)
* s = S['dave', 'TX']
* p s
- *
+ *
* <em>produces:</em>
- *
+ *
* #<S name="dave", state="TX">
*/
static VALUE
-rb_f_p(int argc, VALUE *argv, VALUE self)
+rb_f_p(argc, argv)
+ int argc;
+ VALUE *argv;
{
int i;
- VALUE ret = Qnil;
for (i=0; i<argc; i++) {
rb_p(argv[i]);
}
- if (argc == 1) {
- ret = argv[0];
- }
- else if (argc > 1) {
- ret = rb_ary_new4(argc, argv);
- }
if (TYPE(rb_stdout) == T_FILE) {
rb_io_flush(rb_stdout);
}
- return ret;
+ return Qnil;
}
/*
* call-seq:
* obj.display(port=$>) => nil
- *
+ *
* Prints <i>obj</i> on the given port (default <code>$></code>).
* Equivalent to:
- *
+ *
* def display(port=$>)
* port.write self
* end
- *
+ *
* For example:
- *
+ *
* 1.display
* "cat".display
* [ 4, 5, 6 ].display
* puts
- *
+ *
* <em>produces:</em>
- *
+ *
* 1cat456
*/
static VALUE
-rb_obj_display(int argc, VALUE *argv, VALUE self)
+rb_obj_display(argc, argv, self)
+ int argc;
+ VALUE *argv;
+ VALUE self;
{
VALUE out;
- if (argc == 0) {
+ if (rb_scan_args(argc, argv, "01", &out) == 0) {
out = rb_stdout;
}
- else {
- rb_scan_args(argc, argv, "01", &out);
- }
+
rb_io_write(out, self);
return Qnil;
}
void
-rb_write_error2(const char *mesg, long len)
+rb_write_error2(mesg, len)
+ const char *mesg;
+ long len;
{
- if (rb_stderr == orig_stderr || RFILE(orig_stderr)->fptr->fd < 0) {
- (void)fwrite(mesg, sizeof(char), len, stderr);
- }
- else {
- rb_io_write(rb_stderr, rb_str_new(mesg, len));
- }
+ rb_io_write(rb_stderr, rb_str_new(mesg, len));
}
void
-rb_write_error(const char *mesg)
+rb_write_error(mesg)
+ const char *mesg;
{
rb_write_error2(mesg, strlen(mesg));
}
static void
-must_respond_to(ID mid, VALUE val, ID id)
+must_respond_to(mid, val, id)
+ ID mid;
+ VALUE val;
+ ID id;
{
if (!rb_respond_to(val, mid)) {
rb_raise(rb_eTypeError, "%s must have %s method, %s given",
@@ -6223,212 +4248,139 @@ must_respond_to(ID mid, VALUE val, ID id)
}
static void
-stdout_setter(VALUE val, ID id, VALUE *variable)
+stdout_setter(val, id, variable)
+ VALUE val;
+ ID id;
+ VALUE *variable;
{
must_respond_to(id_write, val, id);
*variable = val;
}
+static void
+defout_setter(val, id, variable)
+ VALUE val;
+ ID id;
+ VALUE *variable;
+{
+ stdout_setter(val, id, variable);
+ rb_warn("$defout is obsolete; use $stdout instead");
+}
+
+static void
+deferr_setter(val, id, variable)
+ VALUE val;
+ ID id;
+ VALUE *variable;
+{
+ stdout_setter(val, id, variable);
+ rb_warn("$deferr is obsolete; use $stderr instead");
+}
+
static VALUE
-prep_io(int fd, int fmode, VALUE klass, const char *path)
+prep_stdio(f, mode, klass)
+ FILE *f;
+ int mode;
+ VALUE klass;
{
rb_io_t *fp;
VALUE io = io_alloc(klass);
MakeOpenFile(io, fp);
- fp->fd = fd;
#ifdef __CYGWIN__
- if (!isatty(fd)) {
- fmode |= FMODE_BINMODE;
- setmode(fd, O_BINARY);
+ if (!isatty(fileno(f))) {
+ mode |= O_BINARY;
+ setmode(fileno(f), O_BINARY);
}
#endif
- fp->mode = fmode;
- io_check_tty(fp);
- if (path) fp->pathv = rb_obj_freeze(rb_str_new_cstr(path));
+ fp->f = f;
+ fp->mode = mode;
return io;
}
-VALUE
-rb_io_fdopen(int fd, int oflags, const char *path)
-{
- VALUE klass = rb_cIO;
-
- if (path && strcmp(path, "-")) klass = rb_cFile;
- return prep_io(fd, rb_io_oflags_fmode(oflags), klass, path);
-}
-
-static VALUE
-prep_stdio(FILE *f, int fmode, VALUE klass, const char *path)
+static void
+prep_path(io, path)
+ VALUE io;
+ char *path;
{
rb_io_t *fptr;
- VALUE io = prep_io(fileno(f), fmode|FMODE_PREP, klass, path);
GetOpenFile(io, fptr);
- fptr->stdio_file = f;
-
- return io;
-}
-
-FILE *
-rb_io_stdio_file(rb_io_t *fptr)
-{
- if (!fptr->stdio_file) {
- int oflags = rb_io_fmode_oflags(fptr->mode);
- fptr->stdio_file = rb_fdopen(fptr->fd, rb_io_oflags_modestr(oflags));
- }
- return fptr->stdio_file;
+ if (fptr->path) rb_bug("illegal prep_path() call");
+ fptr->path = strdup(path);
}
/*
* call-seq:
- * IO.new(fd [, mode] [, opt]) => io
- *
+ * IO.new(fd, mode) => io
+ *
* Returns a new <code>IO</code> object (a stream) for the given
- * <code>IO</code> object or integer file descriptor and mode
- * string. See also <code>IO#fileno</code> and
- * <code>IO.for_fd</code>.
- *
- * === Parameters
- * fd:: numeric file descriptor
- * mode:: file mode. a string or an integer
- * opt:: hash for specifiying mode by name.
- *
- * ==== Mode
- * When <code>mode</code> is an integer it must be combination of
- * the modes defined in <code>File::Constants</code>.
- *
- * When <code>mode</code> is a string it must be in one of the
- * following forms:
- * - "fmode",
- * - "fmode:extern",
- * - "fmode:extern:intern".
- * <code>extern</code> is the external encoding name for the IO.
- * <code>intern</code> is the internal encoding.
- * <code>fmode</code> must be combination of the directives. See
- * the description of class +IO+ for a description of the directives.
- *
- * ==== Options
- * <code>opt</code> can have the following keys
- * :mode ::
- * same as <code>mode</code> parameter
- * :external_encoding ::
- * external encoding for the IO. "-" is a
- * synonym for the default external encoding.
- * :internal_encoding ::
- * internal encoding for the IO.
- * "-" is a synonym for the default internal encoding.
- * If the value is nil no conversion occurs.
- * :encoding ::
- * specifies external and internal encodings as "extern:intern".
- * :textmode ::
- * If the value is truth value, same as "b" in argument <code>mode</code>.
- * :binmode ::
- * If the value is truth value, same as "t" in argument <code>mode</code>.
- *
- * Also <code>opt</code> can have same keys in <code>String#encode</code> for
- * controlling conversion between the external encoding and the internal encoding.
- *
- * === Example1
- *
+ * integer file descriptor and mode string. See also
+ * <code>IO#fileno</code> and <code>IO::for_fd</code>.
+ *
* a = IO.new(2,"w") # '2' is standard error
* $stderr.puts "Hello"
* a.puts "World"
- *
+ *
* <em>produces:</em>
- *
+ *
* Hello
* World
- *
- * === Example2
- * io = IO.new(2, mode: 'w:UTF-16LE', cr_newline: true)
- * io.puts "Hello, World!"
- *
- * io = IO.new(2, mode: 'w', cr_newline: true, external_encoding: Encoding::UTF_16LE)
- * io.puts "Hello, World!"
- *
- * both of aboves print "Hello, World!" in UTF-16LE to standard error output with
- * converting EOL generated by <code>puts</code> to CR.
*/
static VALUE
-rb_io_initialize(int argc, VALUE *argv, VALUE io)
+rb_io_initialize(argc, argv, io)
+ int argc;
+ VALUE *argv;
+ VALUE io;
{
- VALUE fnum, vmode;
+ VALUE fnum, mode;
rb_io_t *fp;
- int fd, fmode, oflags = O_RDONLY;
- convconfig_t convconfig;
- VALUE opt;
-#if defined(HAVE_FCNTL) && defined(F_GETFL)
- int ofmode;
-#else
- struct stat st;
-#endif
+ int fd, flags;
rb_secure(4);
-
- opt = pop_last_hash(&argc, argv);
- rb_scan_args(argc, argv, "11", &fnum, &vmode);
- rb_io_extract_modeenc(&vmode, 0, opt, &oflags, &fmode, &convconfig);
-
+ rb_scan_args(argc, argv, "11", &fnum, &mode);
fd = NUM2INT(fnum);
+ if (argc == 2) {
+ if (FIXNUM_P(mode)) {
+ flags = FIX2LONG(mode);
+ }
+ else {
+ SafeStringValue(mode);
+ flags = rb_io_mode_modenum(StringValueCStr(mode));
+ }
+ }
+ else {
#if defined(HAVE_FCNTL) && defined(F_GETFL)
- oflags = fcntl(fd, F_GETFL);
- if (oflags == -1) rb_sys_fail(0);
+ flags = fcntl(fd, F_GETFL);
+ if (flags == -1) rb_sys_fail(0);
#else
- if (fstat(fd, &st) == -1) rb_sys_fail(0);
+ flags = O_RDONLY;
#endif
- UPDATE_MAXFD(fd);
-#if defined(HAVE_FCNTL) && defined(F_GETFL)
- ofmode = rb_io_oflags_fmode(oflags);
- if (NIL_P(vmode)) {
- fmode = ofmode;
}
- else if ((~ofmode & fmode) & FMODE_READWRITE) {
- VALUE error = INT2FIX(EINVAL);
- rb_exc_raise(rb_class_new_instance(1, &error, rb_eSystemCallError));
- }
-#endif
MakeOpenFile(io, fp);
- fp->fd = fd;
- fp->mode = fmode;
- fp->encs = convconfig;
- clear_codeconv(fp);
- io_check_tty(fp);
- if (fileno(stdin) == fd)
- fp->stdio_file = stdin;
- else if (fileno(stdout) == fd)
- fp->stdio_file = stdout;
- else if (fileno(stderr) == fd)
- fp->stdio_file = stderr;
-
- if (fmode & FMODE_SETENC_BY_BOM) io_set_encoding_by_bom(io);
+ fp->mode = rb_io_modenum_flags(flags);
+ fp->f = rb_fdopen(fd, rb_io_modenum_mode(flags));
+
return io;
}
/*
* call-seq:
- * File.new(filename, mode="r" [, opt]) => file
- * File.new(filename [, mode [, perm]] [, opt]) => file
- *
+ * File.new(filename, mode="r") => file
+ * File.new(filename [, mode [, perm]]) => file
+ *
+
* Opens the file named by _filename_ according to
* _mode_ (default is ``r'') and returns a new
- * <code>File</code> object.
- *
- * === Parameters
- * See the description of class +IO+ for a description of _mode_.
- * The file mode may optionally be specified as a +Fixnum+
- * by _or_-ing together the flags (O_RDONLY etc,
- * again described under +IO+).
- *
- * Optional permission bits may be given in _perm_.
- * These mode and permission bits are platform dependent;
- * on Unix systems, see <code>open(2)</code> for details.
- *
- * Optional _opt_ parameter is same as in <code.IO.open</code>.
- *
- * === Examples
+ * <code>File</code> object. See the description of class +IO+ for
+ * a description of _mode_. The file mode may optionally be
+ * specified as a +Fixnum+ by _or_-ing together the
+ * flags (O_RDONLY etc, again described under +IO+). Optional
+ * permission bits may be given in _perm_. These mode and permission
+ * bits are platform dependent; on Unix systems, see
+ * <code>open(2)</code> for details.
*
* f = File.new("testfile", "r")
* f = File.new("newfile", "w+")
@@ -6436,7 +4388,10 @@ rb_io_initialize(int argc, VALUE *argv, VALUE io)
*/
static VALUE
-rb_file_initialize(int argc, VALUE *argv, VALUE io)
+rb_file_initialize(argc, argv, io)
+ int argc;
+ VALUE *argv;
+ VALUE io;
{
if (RFILE(io)->fptr) {
rb_raise(rb_eRuntimeError, "reinitializing File");
@@ -6454,9 +4409,29 @@ rb_file_initialize(int argc, VALUE *argv, VALUE io)
return io;
}
-/* :nodoc: */
+/*
+ * call-seq:
+ * IO.new(fd, mode_string) => io
+ *
+ * Returns a new <code>IO</code> object (a stream) for the given
+ * integer file descriptor and mode string. See also
+ * <code>IO#fileno</code> and <code>IO::for_fd</code>.
+ *
+ * a = IO.new(2,"w") # '2' is standard error
+ * $stderr.puts "Hello"
+ * a.puts "World"
+ *
+ * <em>produces:</em>
+ *
+ * Hello
+ * World
+ */
+
static VALUE
-rb_io_s_new(int argc, VALUE *argv, VALUE klass)
+rb_io_s_new(argc, argv, klass)
+ int argc;
+ VALUE *argv;
+ VALUE klass;
{
if (rb_block_given_p()) {
const char *cname = rb_class2name(klass);
@@ -6467,158 +4442,56 @@ rb_io_s_new(int argc, VALUE *argv, VALUE klass)
return rb_class_new_instance(argc, argv, klass);
}
-
/*
* call-seq:
- * IO.for_fd(fd, mode [, opt]) => io
- *
- * Synonym for <code>IO.new</code>.
- *
+ * IO.for_fd(fd, mode) => io
+ *
+ * Synonym for <code>IO::new</code>.
+ *
*/
static VALUE
-rb_io_s_for_fd(int argc, VALUE *argv, VALUE klass)
+rb_io_s_for_fd(argc, argv, klass)
+ int argc;
+ VALUE *argv;
+ VALUE klass;
{
VALUE io = rb_obj_alloc(klass);
rb_io_initialize(argc, argv, io);
return io;
}
-static void
-argf_mark(void *ptr)
-{
- struct argf *p = ptr;
- rb_gc_mark(p->filename);
- rb_gc_mark(p->current_file);
- rb_gc_mark(p->argv);
- rb_gc_mark(p->encs.ecopts);
-}
-
-static void
-argf_free(void *ptr)
-{
- struct argf *p = ptr;
- xfree(p->inplace);
- xfree(p);
-}
-
-static inline void
-argf_init(struct argf *p, VALUE v)
-{
- p->filename = Qnil;
- p->current_file = Qnil;
- p->lineno = 0;
- p->argv = v;
-}
-
-static VALUE
-argf_alloc(VALUE klass)
-{
- struct argf *p;
- VALUE argf = Data_Make_Struct(klass, struct argf, argf_mark, argf_free, p);
-
- argf_init(p, Qnil);
- return argf;
-}
-
-#undef rb_argv
+static int binmode = 0;
-/* :nodoc: */
static VALUE
-argf_initialize(VALUE argf, VALUE argv)
+argf_forward(int argc, VALUE *argv)
{
- memset(&ARGF, 0, sizeof(ARGF));
- argf_init(&ARGF, argv);
-
- return argf;
+ return rb_funcall3(current_file, ruby_frame->last_func, argc, argv);
}
-/* :nodoc: */
-static VALUE
-argf_initialize_copy(VALUE argf, VALUE orig)
-{
- ARGF = argf_of(orig);
- ARGF.argv = rb_obj_dup(ARGF.argv);
- if (ARGF.inplace) {
- const char *inplace = ARGF.inplace;
- ARGF.inplace = 0;
- ARGF.inplace = ruby_strdup(inplace);
- }
- return argf;
-}
-
-/*
- * call-seq:
- * ARGF.lineno = number => nil
- *
- * Sets the line number of the current file in +ARGF+ to the given +Integer+.
- *
- * +ARGF+ sets the line number automatically as you read data, so normally
- * you will not need to set it explicitly. To access the current line number
- * use +ARGF.lineno+.
- *
- * For example:
- *
- * ARGF.lineno #=> 0
- * ARGF.readline #=> "This is line 1\n"
- * ARGF.lineno #=> 1
- * ARGF.lineno = 0 #=> nil
- * ARGF.lineno #=> 0
- */
-static VALUE
-argf_set_lineno(VALUE argf, VALUE val)
-{
- ARGF.lineno = NUM2INT(val);
- ARGF.last_lineno = ARGF.lineno;
- return Qnil;
-}
-
-/*
- * call-seq:
- * ARGF.lineno => Integer
- *
- * Returns the current line number of the current file in +ARGF+. This value
- * can be set manually with +ARGF.lineno=+.
- *
- * For example:
- *
- * ARGF.lineno #=> 0
- * ARGF.readline #=> "This is line 1\n"
- * ARGF.lineno #=> 1
- */
-static VALUE
-argf_lineno(VALUE argf)
-{
- return INT2FIX(ARGF.lineno);
-}
-
-static VALUE
-argf_forward(int argc, VALUE *argv, VALUE argf)
-{
- return rb_funcall3(ARGF.current_file, rb_frame_this_func(), argc, argv);
-}
-
-#define next_argv() argf_next_argv(argf)
-#define ARGF_GENERIC_INPUT_P() \
- (ARGF.current_file == rb_stdin && TYPE(ARGF.current_file) != T_FILE)
#define ARGF_FORWARD(argc, argv) do {\
- if (ARGF_GENERIC_INPUT_P())\
- return argf_forward(argc, argv, argf);\
+ if (TYPE(current_file) != T_FILE)\
+ return argf_forward(argc, argv);\
} while (0)
#define NEXT_ARGF_FORWARD(argc, argv) do {\
- if (!next_argv()) return Qnil;\
- ARGF_FORWARD(argc, argv);\
+ if (!next_argv()) return Qnil;\
+ ARGF_FORWARD(argc, argv);\
} while (0)
static void
-argf_close(VALUE file)
+argf_close(file)
+ VALUE file;
{
- rb_funcall3(file, rb_intern("close"), 0, 0);
+ if (TYPE(file) == T_FILE)
+ rb_io_close(file);
+ else
+ rb_funcall3(file, rb_intern("close"), 0, 0);
}
static int
-argf_next_argv(VALUE argf)
+next_argv()
{
+ extern VALUE rb_argv;
char *fn;
rb_io_t *fptr;
int stdout_binmode = 0;
@@ -6629,61 +4502,62 @@ argf_next_argv(VALUE argf)
stdout_binmode = 1;
}
- if (ARGF.init_p == 0) {
- if (!NIL_P(ARGF.argv) && RARRAY_LEN(ARGF.argv) > 0) {
- ARGF.next_p = 1;
+ if (init_p == 0) {
+ if (RARRAY(rb_argv)->len > 0) {
+ next_p = 1;
}
else {
- ARGF.next_p = -1;
+ next_p = -1;
}
- ARGF.init_p = 1;
+ init_p = 1;
+ gets_lineno = 0;
}
- if (ARGF.next_p == 1) {
- ARGF.next_p = 0;
+ if (next_p == 1) {
+ next_p = 0;
retry:
- if (RARRAY_LEN(ARGF.argv) > 0) {
- ARGF.filename = rb_ary_shift(ARGF.argv);
- fn = StringValueCStr(ARGF.filename);
+ if (RARRAY(rb_argv)->len > 0) {
+ filename = rb_ary_shift(rb_argv);
+ fn = StringValueCStr(filename);
if (strlen(fn) == 1 && fn[0] == '-') {
- ARGF.current_file = rb_stdin;
- if (ARGF.inplace) {
+ current_file = rb_stdin;
+ if (ruby_inplace_mode) {
rb_warn("Can't do inplace edit for stdio; skipping");
goto retry;
}
}
else {
- int fr = rb_sysopen(ARGF.filename, O_RDONLY, 0);
+ FILE *fr = rb_fopen(fn, "r");
- if (ARGF.inplace) {
+ if (ruby_inplace_mode) {
struct stat st;
#ifndef NO_SAFE_RENAME
struct stat st2;
#endif
VALUE str;
- int fw;
+ FILE *fw;
if (TYPE(rb_stdout) == T_FILE && rb_stdout != orig_stdout) {
rb_io_close(rb_stdout);
}
- fstat(fr, &st);
- if (*ARGF.inplace) {
+ fstat(fileno(fr), &st);
+ if (*ruby_inplace_mode) {
str = rb_str_new2(fn);
#ifdef NO_LONG_FNAME
- ruby_add_suffix(str, ARGF.inplace);
+ ruby_add_suffix(str, ruby_inplace_mode);
#else
- rb_str_cat2(str, ARGF.inplace);
+ rb_str_cat2(str, ruby_inplace_mode);
#endif
#ifdef NO_SAFE_RENAME
- (void)close(fr);
- (void)unlink(RSTRING_PTR(str));
- (void)rename(fn, RSTRING_PTR(str));
- fr = rb_sysopen(str, O_RDONLY, 0);
+ (void)fclose(fr);
+ (void)unlink(RSTRING(str)->ptr);
+ (void)rename(fn, RSTRING(str)->ptr);
+ fr = rb_fopen(RSTRING(str)->ptr, "r");
#else
- if (rename(fn, RSTRING_PTR(str)) < 0) {
+ if (rename(fn, RSTRING(str)->ptr) < 0) {
rb_warn("Can't rename %s to %s: %s, skipping file",
- fn, RSTRING_PTR(str), strerror(errno));
- close(fr);
+ fn, RSTRING(str)->ptr, strerror(errno));
+ fclose(fr);
goto retry;
}
#endif
@@ -6695,244 +4569,175 @@ argf_next_argv(VALUE argf)
if (unlink(fn) < 0) {
rb_warn("Can't remove %s: %s, skipping file",
fn, strerror(errno));
- close(fr);
+ fclose(fr);
goto retry;
}
#endif
}
- fw = rb_sysopen(ARGF.filename, O_WRONLY|O_CREAT|O_TRUNC, 0666);
+ fw = rb_fopen(fn, "w");
#ifndef NO_SAFE_RENAME
- fstat(fw, &st2);
+ fstat(fileno(fw), &st2);
#ifdef HAVE_FCHMOD
- fchmod(fw, st.st_mode);
+ fchmod(fileno(fw), st.st_mode);
#else
chmod(fn, st.st_mode);
#endif
if (st.st_uid!=st2.st_uid || st.st_gid!=st2.st_gid) {
-#ifdef HAVE_FCHOWN
- (void)fchown(fw, st.st_uid, st.st_gid);
-#else
- (void)chown(fn, st.st_uid, st.st_gid);
-#endif
+ fchown(fileno(fw), st.st_uid, st.st_gid);
}
#endif
- rb_stdout = prep_io(fw, FMODE_WRITABLE, rb_cFile, fn);
+ rb_stdout = prep_stdio(fw, FMODE_WRITABLE, rb_cFile);
+ prep_path(rb_stdout, fn);
if (stdout_binmode) rb_io_binmode(rb_stdout);
}
- ARGF.current_file = prep_io(fr, FMODE_READABLE, rb_cFile, fn);
- }
- if (ARGF.binmode) rb_io_ascii8bit_binmode(ARGF.current_file);
- if (ARGF.encs.enc) {
- rb_io_t *fptr;
-
- GetOpenFile(ARGF.current_file, fptr);
- fptr->encs = ARGF.encs;
- clear_codeconv(fptr);
+ current_file = prep_stdio(fr, FMODE_READABLE, rb_cFile);
+ prep_path(current_file, fn);
}
+ if (binmode) rb_io_binmode(current_file);
}
else {
- ARGF.next_p = 1;
- return FALSE;
+ next_p = 1;
+ return Qfalse;
}
}
- else if (ARGF.next_p == -1) {
- ARGF.current_file = rb_stdin;
- ARGF.filename = rb_str_new2("-");
- if (ARGF.inplace) {
+ else if (next_p == -1) {
+ current_file = rb_stdin;
+ filename = rb_str_new2("-");
+ if (ruby_inplace_mode) {
rb_warn("Can't do inplace edit for stdio");
rb_stdout = orig_stdout;
}
}
- return TRUE;
+ return Qtrue;
}
static VALUE
-argf_getline(int argc, VALUE *argv, VALUE argf)
+argf_getline(argc, argv)
+ int argc;
+ VALUE *argv;
{
VALUE line;
retry:
if (!next_argv()) return Qnil;
- if (ARGF_GENERIC_INPUT_P()) {
- line = rb_funcall3(ARGF.current_file, rb_intern("gets"), argc, argv);
+ if (argc == 0 && rb_rs == rb_default_rs) {
+ line = rb_io_gets(current_file);
}
else {
- if (argc == 0 && rb_rs == rb_default_rs) {
- line = rb_io_gets(ARGF.current_file);
+ VALUE rs;
+
+ if (argc == 0) {
+ rs = rb_rs;
}
else {
- line = rb_io_getline(argc, argv, ARGF.current_file);
- }
- if (NIL_P(line) && ARGF.next_p != -1) {
- argf_close(ARGF.current_file);
- ARGF.next_p = 1;
- goto retry;
+ rb_scan_args(argc, argv, "1", &rs);
+ if (!NIL_P(rs)) StringValue(rs);
}
+ line = rb_io_getline(rs, current_file);
+ }
+ if (NIL_P(line) && next_p != -1) {
+ argf_close(current_file);
+ next_p = 1;
+ goto retry;
}
if (!NIL_P(line)) {
- ARGF.lineno++;
- ARGF.last_lineno = ARGF.lineno;
+ gets_lineno++;
+ lineno = INT2FIX(gets_lineno);
}
return line;
}
-static VALUE
-argf_lineno_getter(ID id, VALUE *var)
-{
- VALUE argf = *var;
- return INT2FIX(ARGF.last_lineno);
-}
-
-static void
-argf_lineno_setter(VALUE val, ID id, VALUE *var)
-{
- VALUE argf = *var;
- int n = NUM2INT(val);
- ARGF.last_lineno = ARGF.lineno = n;
-}
-
-static VALUE argf_gets(int, VALUE *, VALUE);
-
/*
* call-seq:
- * gets(sep=$/) => string or nil
- * gets(limit) => string or nil
- * gets(sep,limit) => string or nil
- *
+ * gets(separator=$/) => string or nil
+ *
* Returns (and assigns to <code>$_</code>) the next line from the list
- * of files in +ARGV+ (or <code>$*</code>), or from standard input if
- * no files are present on the command line. Returns +nil+ at end of
- * file. The optional argument specifies the record separator. The
- * separator is included with the contents of each record. A separator
- * of +nil+ reads the entire contents, and a zero-length separator
- * reads the input one paragraph at a time, where paragraphs are
- * divided by two consecutive newlines. If the first argument is an
- * integer, or optional second argument is given, the returning string
- * would not be longer than the given value in bytes. If multiple
- * filenames are present in +ARGV+, +gets(nil)+ will read the contents
- * one file at a time.
- *
+ * of files in +ARGV+ (or <code>$*</code>), or from standard
+ * input if no files are present on the command line. Returns
+ * +nil+ at end of file. The optional argument specifies the
+ * record separator. The separator is included with the contents of
+ * each record. A separator of +nil+ reads the entire
+ * contents, and a zero-length separator reads the input one paragraph
+ * at a time, where paragraphs are divided by two consecutive newlines.
+ * If multiple filenames are present in +ARGV+,
+ * +gets(nil)+ will read the contents one file at a time.
+ *
* ARGV << "testfile"
* print while gets
- *
+ *
* <em>produces:</em>
- *
+ *
* This is line one
* This is line two
* This is line three
* And so on...
- *
+ *
* The style of programming using <code>$_</code> as an implicit
* parameter is gradually losing favor in the Ruby community.
*/
static VALUE
-rb_f_gets(int argc, VALUE *argv, VALUE recv)
-{
- if (recv == argf) {
- return argf_gets(argc, argv, argf);
- }
- return rb_funcall2(argf, rb_intern("gets"), argc, argv);
-}
-
-/*
- * call-seq:
- * ARGF.gets(sep=$/) => String
- * ARGF.gets(limit) => String
- * ARGF.gets(sep, limit) => String
- *
- * Returns the next line from the current file in +ARGF+.
- *
- * By default lines are assumed to be separated by +$/+; to use a different
- * character as a separator, supply it as a +String+ for the _sep_ argument.
- *
- * The optional _limit_ argument specifies how many characters of each line
- * to return. By default all characters are returned.
- *
- */
-static VALUE
-argf_gets(int argc, VALUE *argv, VALUE argf)
+rb_f_gets(argc, argv)
+ int argc;
+ VALUE *argv;
{
VALUE line;
- line = argf_getline(argc, argv, argf);
+ if (!next_argv()) return Qnil;
+ if (TYPE(current_file) != T_FILE) {
+ line = rb_funcall3(current_file, rb_intern("gets"), argc, argv);
+ }
+ else {
+ line = argf_getline(argc, argv);
+ }
rb_lastline_set(line);
-
return line;
}
VALUE
-rb_gets(void)
+rb_gets()
{
VALUE line;
if (rb_rs != rb_default_rs) {
- return rb_f_gets(0, 0, argf);
+ return rb_f_gets(0, 0);
}
retry:
if (!next_argv()) return Qnil;
- line = rb_io_gets(ARGF.current_file);
- if (NIL_P(line) && ARGF.next_p != -1) {
- rb_io_close(ARGF.current_file);
- ARGF.next_p = 1;
+ line = rb_io_gets(current_file);
+ if (NIL_P(line) && next_p != -1) {
+ argf_close(current_file);
+ next_p = 1;
goto retry;
}
rb_lastline_set(line);
if (!NIL_P(line)) {
- ARGF.lineno++;
- ARGF.last_lineno = ARGF.lineno;
+ gets_lineno++;
+ lineno = INT2FIX(gets_lineno);
}
return line;
}
-static VALUE argf_readline(int, VALUE *, VALUE);
-
/*
* call-seq:
- * readline(sep=$/) => string
- * readline(limit) => string
- * readline(sep, limit) => string
- *
+ * readline(separator=$/) => string
+ *
* Equivalent to <code>Kernel::gets</code>, except
* +readline+ raises +EOFError+ at end of file.
*/
static VALUE
-rb_f_readline(int argc, VALUE *argv, VALUE recv)
-{
- if (recv == argf) {
- return argf_readline(argc, argv, argf);
- }
- return rb_funcall2(argf, rb_intern("readline"), argc, argv);
-}
-
-
-/*
- * call-seq:
- * ARGF.readline(sep=$/) => String
- * ARGF.readline(limit) => String
- * ARGF.readline(sep, limit) => String
- *
- * Returns the next line from the current file in +ARGF+.
- *
- * By default lines are assumed to be separated by +$/+; to use a different
- * character as a separator, supply it as a +String+ for the _sep_ argument.
- *
- * The optional _limit_ argument specifies how many characters of each line
- * to return. By default all characters are returned.
- *
- * An +EOFError+ is raised at the end of the file.
- */
-static VALUE
-argf_readline(int argc, VALUE *argv, VALUE argf)
+rb_f_readline(argc, argv)
+ int argc;
+ VALUE *argv;
{
VALUE line;
if (!next_argv()) rb_eof_error();
ARGF_FORWARD(argc, argv);
- line = argf_gets(argc, argv, argf);
+ line = rb_f_gets(argc, argv);
if (NIL_P(line)) {
rb_eof_error();
}
@@ -6940,50 +4745,38 @@ argf_readline(int argc, VALUE *argv, VALUE argf)
return line;
}
-static VALUE argf_readlines(int, VALUE *, VALUE);
-
/*
- * call-seq:
- * readlines(sep=$/) => array
- * readlines(limit) => array
- * readlines(sep,limit) => array
- *
- * Returns an array containing the lines returned by calling
- * <code>Kernel.gets(<i>sep</i>)</code> until the end of file.
+ * obsolete
*/
static VALUE
-rb_f_readlines(int argc, VALUE *argv, VALUE recv)
+rb_f_getc()
{
- if (recv == argf) {
- return argf_readlines(argc, argv, argf);
+ rb_warn("getc is obsolete; use STDIN.getc instead");
+ if (TYPE(rb_stdin) != T_FILE) {
+ return rb_funcall3(rb_stdin, rb_intern("getc"), 0, 0);
}
- return rb_funcall2(argf, rb_intern("readlines"), argc, argv);
+ return rb_io_getc(rb_stdin);
}
/*
* call-seq:
- * ARGF.readlines(sep=$/) => Array
- * ARGF.readlines(limit) => Array
- * ARGF.readlines(sep, limit) => Array
- *
- * ARGF.to_a(sep=$/) => Array
- * ARGF.to_a(limit) => Array
- * ARGF.to_a(sep, limit) => Array
- *
- * Reads +ARGF+'s current file in its entirety, returning an +Array+ of its
- * lines, one line per element. Lines are assumed to be separated by _sep_.
- *
- * lines = ARGF.readlines
- * lines[0] #=> "This is line one\n"
+ * readlines(separator=$/) => array
+ *
+ * Returns an array containing the lines returned by calling
+ * <code>Kernel.gets(<i>separator</i>)</code> until the end of file.
*/
+
static VALUE
-argf_readlines(int argc, VALUE *argv, VALUE argf)
+rb_f_readlines(argc, argv)
+ int argc;
+ VALUE *argv;
{
VALUE line, ary;
+ NEXT_ARGF_FORWARD(argc, argv);
ary = rb_ary_new();
- while (!NIL_P(line = argf_getline(argc, argv, argf))) {
+ while (!NIL_P(line = argf_getline(argc, argv))) {
rb_ary_push(ary, line);
}
@@ -6993,11 +4786,11 @@ argf_readlines(int argc, VALUE *argv, VALUE argf)
/*
* call-seq:
* `cmd` => string
- *
+ *
* Returns the standard output of running _cmd_ in a subshell.
* The built-in syntax <code>%x{...}</code> uses
* this method. Sets <code>$?</code> to the process status.
- *
+ *
* `date` #=> "Wed Apr 9 08:56:30 CDT 2003\n"
* `ls testdir`.split[1] #=> "main.rb"
* `echo oops && exit 99` #=> "oops\n"
@@ -7005,14 +4798,15 @@ argf_readlines(int argc, VALUE *argv, VALUE argf)
*/
static VALUE
-rb_f_backquote(VALUE obj, VALUE str)
+rb_f_backquote(obj, str)
+ VALUE obj, str;
{
volatile VALUE port;
VALUE result;
rb_io_t *fptr;
SafeStringValue(str);
- port = pipe_open_s(str, "r", FMODE_READABLE, NULL);
+ port = pipe_open(str, 0, "r");
if (NIL_P(port)) return rb_str_new(0,0);
GetOpenFile(port, fptr);
@@ -7026,66 +4820,93 @@ rb_f_backquote(VALUE obj, VALUE str)
#include <sys/select.h>
#endif
+/*
+ * call-seq:
+ * IO.select(read_array
+ * [, write_array
+ * [, error_array
+ * [, timeout]]] ) => array or nil
+ *
+ * See <code>Kernel#select</code>.
+ */
+
static VALUE
-select_internal(VALUE read, VALUE write, VALUE except, struct timeval *tp, rb_fdset_t *fds)
+rb_f_select(argc, argv, obj)
+ int argc;
+ VALUE *argv;
+ VALUE obj;
{
- VALUE res, list;
- rb_fdset_t *rp, *wp, *ep;
+ VALUE read, write, except, timeout, res, list;
+ fd_set rset, wset, eset, pset;
+ fd_set *rp, *wp, *ep;
+ struct timeval *tp, timerec;
rb_io_t *fptr;
long i;
int max = 0, n;
int interrupt_flag = 0;
int pending = 0;
- struct timeval timerec;
+ rb_scan_args(argc, argv, "13", &read, &write, &except, &timeout);
+ if (NIL_P(timeout)) {
+ tp = 0;
+ }
+ else {
+ timerec = rb_time_interval(timeout);
+ tp = &timerec;
+ }
+
+ FD_ZERO(&pset);
if (!NIL_P(read)) {
Check_Type(read, T_ARRAY);
- for (i=0; i<RARRAY_LEN(read); i++) {
- GetOpenFile(rb_io_get_io(RARRAY_PTR(read)[i]), fptr);
- rb_fd_set(fptr->fd, &fds[0]);
- if (READ_DATA_PENDING(fptr)) { /* check for buffered data */
+ rp = &rset;
+ FD_ZERO(rp);
+ for (i=0; i<RARRAY(read)->len; i++) {
+ GetOpenFile(rb_io_get_io(RARRAY(read)->ptr[i]), fptr);
+ FD_SET(fileno(fptr->f), rp);
+ if (READ_DATA_PENDING(fptr->f)) { /* check for buffered data */
pending++;
- rb_fd_set(fptr->fd, &fds[3]);
+ FD_SET(fileno(fptr->f), &pset);
}
- if (max < fptr->fd) max = fptr->fd;
+ if (max < fileno(fptr->f)) max = fileno(fptr->f);
}
if (pending) { /* no blocking if there's buffered data */
timerec.tv_sec = timerec.tv_usec = 0;
tp = &timerec;
}
- rp = &fds[0];
}
else
rp = 0;
if (!NIL_P(write)) {
Check_Type(write, T_ARRAY);
- for (i=0; i<RARRAY_LEN(write); i++) {
- VALUE write_io = GetWriteIO(rb_io_get_io(RARRAY_PTR(write)[i]));
- GetOpenFile(write_io, fptr);
- rb_fd_set(fptr->fd, &fds[1]);
- if (max < fptr->fd) max = fptr->fd;
+ wp = &wset;
+ FD_ZERO(wp);
+ for (i=0; i<RARRAY(write)->len; i++) {
+ GetOpenFile(rb_io_get_io(RARRAY(write)->ptr[i]), fptr);
+ FD_SET(fileno(fptr->f), wp);
+ if (max < fileno(fptr->f)) max = fileno(fptr->f);
+ if (fptr->f2) {
+ FD_SET(fileno(fptr->f2), wp);
+ if (max < fileno(fptr->f2)) max = fileno(fptr->f2);
+ }
}
- wp = &fds[1];
}
else
wp = 0;
if (!NIL_P(except)) {
Check_Type(except, T_ARRAY);
- for (i=0; i<RARRAY_LEN(except); i++) {
- VALUE io = rb_io_get_io(RARRAY_PTR(except)[i]);
- VALUE write_io = GetWriteIO(io);
- GetOpenFile(io, fptr);
- rb_fd_set(fptr->fd, &fds[2]);
- if (max < fptr->fd) max = fptr->fd;
- if (io != write_io) {
- GetOpenFile(write_io, fptr);
- rb_fd_set(fptr->fd, &fds[2]);
- if (max < fptr->fd) max = fptr->fd;
- }
+ ep = &eset;
+ FD_ZERO(ep);
+ for (i=0; i<RARRAY(except)->len; i++) {
+ GetOpenFile(rb_io_get_io(RARRAY(except)->ptr[i]), fptr);
+ FD_SET(fileno(fptr->f), ep);
+ if (max < fileno(fptr->f)) max = fileno(fptr->f);
+ if (fptr->f2) {
+ FD_SET(fileno(fptr->f2), ep);
+ if (max < fileno(fptr->f2)) max = fileno(fptr->f2);
+ }
}
- ep = &fds[2];
}
else {
ep = 0;
@@ -7093,7 +4914,7 @@ select_internal(VALUE read, VALUE write, VALUE except, struct timeval *tp, rb_fd
max++;
- n = rb_thread_fd_select(max, rp, wp, ep, tp);
+ n = rb_thread_select(max, rp, wp, ep, tp);
if (n < 0) {
rb_sys_fail(0);
}
@@ -7106,47 +4927,39 @@ select_internal(VALUE read, VALUE write, VALUE except, struct timeval *tp, rb_fd
if (interrupt_flag == 0) {
if (rp) {
- list = RARRAY_PTR(res)[0];
- for (i=0; i< RARRAY_LEN(read); i++) {
- VALUE obj = rb_ary_entry(read, i);
- VALUE io = rb_io_get_io(obj);
- GetOpenFile(io, fptr);
- if (rb_fd_isset(fptr->fd, &fds[0]) ||
- rb_fd_isset(fptr->fd, &fds[3])) {
- rb_ary_push(list, obj);
+ list = RARRAY(res)->ptr[0];
+ for (i=0; i< RARRAY(read)->len; i++) {
+ GetOpenFile(rb_io_get_io(RARRAY(read)->ptr[i]), fptr);
+ if (FD_ISSET(fileno(fptr->f), rp)
+ || FD_ISSET(fileno(fptr->f), &pset)) {
+ rb_ary_push(list, rb_ary_entry(read, i));
}
}
}
if (wp) {
- list = RARRAY_PTR(res)[1];
- for (i=0; i< RARRAY_LEN(write); i++) {
- VALUE obj = rb_ary_entry(write, i);
- VALUE io = rb_io_get_io(obj);
- VALUE write_io = GetWriteIO(io);
- GetOpenFile(write_io, fptr);
- if (rb_fd_isset(fptr->fd, &fds[1])) {
- rb_ary_push(list, obj);
+ list = RARRAY(res)->ptr[1];
+ for (i=0; i< RARRAY(write)->len; i++) {
+ GetOpenFile(rb_io_get_io(RARRAY(write)->ptr[i]), fptr);
+ if (FD_ISSET(fileno(fptr->f), wp)) {
+ rb_ary_push(list, rb_ary_entry(write, i));
+ }
+ else if (fptr->f2 && FD_ISSET(fileno(fptr->f2), wp)) {
+ rb_ary_push(list, rb_ary_entry(write, i));
}
}
}
if (ep) {
- list = RARRAY_PTR(res)[2];
- for (i=0; i< RARRAY_LEN(except); i++) {
- VALUE obj = rb_ary_entry(except, i);
- VALUE io = rb_io_get_io(obj);
- VALUE write_io = GetWriteIO(io);
- GetOpenFile(io, fptr);
- if (rb_fd_isset(fptr->fd, &fds[2])) {
- rb_ary_push(list, obj);
+ list = RARRAY(res)->ptr[2];
+ for (i=0; i< RARRAY(except)->len; i++) {
+ GetOpenFile(rb_io_get_io(RARRAY(except)->ptr[i]), fptr);
+ if (FD_ISSET(fileno(fptr->f), ep)) {
+ rb_ary_push(list, rb_ary_entry(except, i));
+ }
+ else if (fptr->f2 && FD_ISSET(fileno(fptr->f2), ep)) {
+ rb_ary_push(list, rb_ary_entry(except, i));
}
- else if (io != write_io) {
- GetOpenFile(write_io, fptr);
- if (rb_fd_isset(fptr->fd, &fds[2])) {
- rb_ary_push(list, obj);
- }
- }
}
}
}
@@ -7154,96 +4967,41 @@ select_internal(VALUE read, VALUE write, VALUE except, struct timeval *tp, rb_fd
return res; /* returns an empty array on interrupt */
}
-struct select_args {
- VALUE read, write, except;
- struct timeval *timeout;
- rb_fdset_t fdsets[4];
-};
-
-#ifdef HAVE_RB_FD_INIT
-static VALUE
-select_call(VALUE arg)
-{
- struct select_args *p = (struct select_args *)arg;
-
- return select_internal(p->read, p->write, p->except, p->timeout, p->fdsets);
-}
-
-static VALUE
-select_end(VALUE arg)
-{
- struct select_args *p = (struct select_args *)arg;
- int i;
-
- for (i = 0; i < numberof(p->fdsets); ++i)
- rb_fd_term(&p->fdsets[i]);
- return Qnil;
-}
-#endif
-
-/*
- * call-seq:
- * IO.select(read_array
- * [, write_array
- * [, error_array
- * [, timeout]]] ) => array or nil
- *
- * See <code>Kernel#select</code>.
- */
-
-static VALUE
-rb_f_select(int argc, VALUE *argv, VALUE obj)
-{
- VALUE timeout;
- struct select_args args;
- struct timeval timerec;
- int i;
-
- rb_scan_args(argc, argv, "13", &args.read, &args.write, &args.except, &timeout);
- if (NIL_P(timeout)) {
- args.timeout = 0;
- }
- else {
- timerec = rb_time_interval(timeout);
- args.timeout = &timerec;
- }
-
- for (i = 0; i < numberof(args.fdsets); ++i)
- rb_fd_init(&args.fdsets[i]);
-
-#ifdef HAVE_RB_FD_INIT
- return rb_ensure(select_call, (VALUE)&args, select_end, (VALUE)&args);
-#else
- return select_internal(args.read, args.write, args.except,
- args.timeout, args.fdsets);
-#endif
-
-}
-
+#if !defined(MSDOS) && !defined(__human68k__)
static int
-io_cntl(int fd, unsigned long cmd, long narg, int io_p)
+io_cntl(fd, cmd, narg, io_p)
+ int fd, cmd, io_p;
+ long narg;
{
int retval;
#ifdef HAVE_FCNTL
+ TRAP_BEG;
# if defined(__CYGWIN__)
retval = io_p?ioctl(fd, cmd, (void*)narg):fcntl(fd, cmd, narg);
# else
- retval = io_p?ioctl(fd, cmd, narg):fcntl(fd, (int)cmd, narg);
+ retval = io_p?ioctl(fd, cmd, narg):fcntl(fd, cmd, narg);
# endif
+ TRAP_END;
#else
if (!io_p) {
rb_notimplement();
}
+ TRAP_BEG;
retval = ioctl(fd, cmd, narg);
+ TRAP_END;
#endif
return retval;
}
+#endif
static VALUE
-rb_io_ctl(VALUE io, VALUE req, VALUE arg, int io_p)
+rb_io_ctl(io, req, arg, io_p)
+ VALUE io, req, arg;
+ int io_p;
{
- unsigned long cmd = NUM2ULONG(req);
+#if !defined(MSDOS) && !defined(__human68k__)
+ int cmd = NUM2ULONG(req);
rb_io_t *fptr;
long len = 0;
long narg = 0;
@@ -7280,41 +5038,49 @@ rb_io_ctl(VALUE io, VALUE req, VALUE arg, int io_p)
#endif
rb_str_modify(arg);
- if (len <= RSTRING_LEN(arg)) {
- len = RSTRING_LEN(arg);
+ if (len <= RSTRING(arg)->len) {
+ len = RSTRING(arg)->len;
}
- if (RSTRING_LEN(arg) < len) {
+ if (RSTRING(arg)->len < len) {
rb_str_resize(arg, len+1);
}
- RSTRING_PTR(arg)[len] = 17; /* a little sanity check here */
- narg = (long)RSTRING_PTR(arg);
+ RSTRING(arg)->ptr[len] = 17; /* a little sanity check here */
+ narg = (long)RSTRING(arg)->ptr;
}
}
GetOpenFile(io, fptr);
- retval = io_cntl(fptr->fd, cmd, narg, io_p);
- if (retval < 0) rb_sys_fail_path(fptr->pathv);
- if (TYPE(arg) == T_STRING && RSTRING_PTR(arg)[len] != 17) {
+ retval = io_cntl(fileno(fptr->f), cmd, narg, io_p);
+ if (retval < 0) rb_sys_fail(fptr->path);
+ if (TYPE(arg) == T_STRING && RSTRING(arg)->ptr[len] != 17) {
rb_raise(rb_eArgError, "return value overflowed string");
}
+ if (fptr->f2 && fileno(fptr->f) != fileno(fptr->f2)) {
+ /* call on f2 too; ignore result */
+ io_cntl(fileno(fptr->f2), cmd, narg, io_p);
+ }
+
if (!io_p && cmd == F_SETFL) {
- if (narg & O_NONBLOCK) {
- fptr->mode |= FMODE_WSPLIT_INITIALIZED;
- fptr->mode &= ~FMODE_WSPLIT;
- }
- else {
- fptr->mode &= ~(FMODE_WSPLIT_INITIALIZED|FMODE_WSPLIT);
- }
+ if (narg & O_NONBLOCK) {
+ fptr->mode |= FMODE_WSPLIT_INITIALIZED;
+ fptr->mode &= ~FMODE_WSPLIT;
+ }
+ else {
+ fptr->mode &= ~(FMODE_WSPLIT_INITIALIZED|FMODE_WSPLIT);
+ }
}
return INT2NUM(retval);
+#else
+ rb_notimplement();
+ return Qnil; /* not reached */
+#endif
}
-
/*
* call-seq:
* ios.ioctl(integer_cmd, arg) => integer
- *
+ *
* Provides a mechanism for issuing low-level commands to control or
* query I/O devices. Arguments and results are platform dependent. If
* <i>arg</i> is a number, its value is passed directly. If it is a
@@ -7324,7 +5090,10 @@ rb_io_ctl(VALUE io, VALUE req, VALUE arg, int io_p)
*/
static VALUE
-rb_io_ioctl(int argc, VALUE *argv, VALUE io)
+rb_io_ioctl(argc, argv, io)
+ int argc;
+ VALUE *argv;
+ VALUE io;
{
VALUE req, arg;
@@ -7332,11 +5101,10 @@ rb_io_ioctl(int argc, VALUE *argv, VALUE io)
return rb_io_ctl(io, req, arg, 1);
}
-#ifdef HAVE_FCNTL
/*
* call-seq:
* ios.fcntl(integer_cmd, arg) => integer
- *
+ *
* Provides a mechanism for issuing low-level commands to control or
* query file-oriented I/O streams. Arguments and results are platform
* dependent. If <i>arg</i> is a number, its value is passed
@@ -7347,22 +5115,26 @@ rb_io_ioctl(int argc, VALUE *argv, VALUE io)
*/
static VALUE
-rb_io_fcntl(int argc, VALUE *argv, VALUE io)
+rb_io_fcntl(argc, argv, io)
+ int argc;
+ VALUE *argv;
+ VALUE io;
{
+#ifdef HAVE_FCNTL
VALUE req, arg;
rb_scan_args(argc, argv, "11", &req, &arg);
return rb_io_ctl(io, req, arg, 0);
-}
#else
-#define rb_io_fcntl rb_f_notimplement
+ rb_notimplement();
+ return Qnil; /* not reached */
#endif
+}
-#if defined(HAVE_SYSCALL) && SIZEOF_LONG == SIZEOF_INT
/*
* call-seq:
* syscall(fixnum [, args...]) => integer
- *
+ *
* Calls the operating system function identified by _fixnum_,
* passing in the arguments, which must be either +String+
* objects, or +Integer+ objects that ultimately fit within
@@ -7370,17 +5142,20 @@ rb_io_fcntl(int argc, VALUE *argv, VALUE io)
* on the Atari-ST). The function identified by _fixnum_ is system
* dependent. On some Unix systems, the numbers may be obtained from a
* header file called <code>syscall.h</code>.
- *
+ *
* syscall 4, 1, "hello\n", 6 # '4' is write(2) on our box
- *
+ *
* <em>produces:</em>
- *
+ *
* hello
*/
static VALUE
-rb_f_syscall(int argc, VALUE *argv)
+rb_f_syscall(argc, argv)
+ int argc;
+ VALUE *argv;
{
+#if defined(HAVE_SYSCALL) && !defined(__CHECKER__)
#ifdef atarist
unsigned long arg[14]; /* yes, we really need that many ! */
#else
@@ -7398,7 +5173,7 @@ rb_f_syscall(int argc, VALUE *argv)
rb_secure(2);
if (argc == 0)
rb_raise(rb_eArgError, "too few arguments for syscall");
- if (argc > numberof(arg))
+ if (argc > sizeof(arg) / sizeof(arg[0]))
rb_raise(rb_eArgError, "too many arguments for syscall");
arg[0] = NUM2LONG(argv[0]); argv++;
while (items--) {
@@ -7415,7 +5190,7 @@ rb_f_syscall(int argc, VALUE *argv)
argv++;
i++;
}
-
+ TRAP_BEG;
switch (argc) {
case 1:
retval = syscall(arg[0]);
@@ -7469,126 +5244,41 @@ rb_f_syscall(int argc, VALUE *argv)
break;
#endif /* atarist */
}
-
+ TRAP_END;
if (retval < 0) rb_sys_fail(0);
return INT2NUM(retval);
-}
#else
-#define rb_f_syscall rb_f_notimplement
+ rb_notimplement();
+ return Qnil; /* not reached */
#endif
-
-static VALUE
-io_new_instance(VALUE args)
-{
- return rb_class_new_instance(2, (VALUE*)args+1, *(VALUE*)args);
-}
-
-static void
-io_encoding_set(rb_io_t *fptr, VALUE v1, VALUE v2, VALUE opt)
-{
- rb_encoding *enc, *enc2;
- int ecflags;
- VALUE ecopts, tmp;
-
- if (!NIL_P(v2)) {
- enc2 = rb_to_encoding(v1);
- tmp = rb_check_string_type(v2);
- if (!NIL_P(tmp)) {
- char *p = StringValueCStr(tmp);
- if (*p == '-' && *(p+1) == '\0') {
- /* Special case - "-" => no transcoding */
- enc = enc2;
- enc2 = NULL;
- }
- else
- enc = rb_to_encoding(v2);
- if (enc == enc2) {
- /* Special case - "-" => no transcoding */
- enc2 = NULL;
- }
- }
- else
- enc = rb_to_encoding(v2);
- ecflags = rb_econv_prepare_opts(opt, &ecopts);
- }
- else {
- if (NIL_P(v1)) {
- /* Set to default encodings */
- rb_io_ext_int_to_encs(NULL, NULL, &enc, &enc2);
- ecflags = 0;
- ecopts = Qnil;
- }
- else {
- tmp = rb_check_string_type(v1);
- if (!NIL_P(tmp)) {
- parse_mode_enc(StringValueCStr(tmp), &enc, &enc2);
- ecflags = rb_econv_prepare_opts(opt, &ecopts);
- }
- else {
- rb_io_ext_int_to_encs(rb_to_encoding(v1), NULL, &enc, &enc2);
- ecflags = 0;
- ecopts = Qnil;
- }
- }
- }
- validate_enc_binmode(fptr->mode, enc, enc2);
- fptr->encs.enc = enc;
- fptr->encs.enc2 = enc2;
- fptr->encs.ecflags = ecflags;
- fptr->encs.ecopts = ecopts;
- clear_codeconv(fptr);
-
}
+static VALUE io_new_instance _((VALUE));
static VALUE
-pipe_pair_close(VALUE rw)
+io_new_instance(args)
+ VALUE args;
{
- VALUE *rwp = (VALUE *)rw;
- return rb_ensure(io_close, rwp[0], io_close, rwp[1]);
+ return rb_class_new_instance(2, (VALUE*)args+1, *(VALUE*)args);
}
/*
* call-seq:
- * IO.pipe -> [read_io, write_io]
- * IO.pipe(ext_enc) -> [read_io, write_io]
- * IO.pipe("ext_enc:int_enc" [, opt]) -> [read_io, write_io]
- * IO.pipe(ext_enc, int_enc [, opt]) -> [read_io, write_io]
- *
- * IO.pipe(...) {|read_io, write_io| ... }
- *
+ * IO.pipe -> array
+ *
* Creates a pair of pipe endpoints (connected to each other) and
* returns them as a two-element array of <code>IO</code> objects:
- * <code>[</code> <i>read_io</i>, <i>write_io</i> <code>]</code>.
- *
- * If a block is given, the block is called and
- * returns the value of the block.
- * <i>read_io</i> and <i>write_io</i> are sent to the block as arguments.
- * If read_io and write_io are not closed when the block exits, they are closed.
- * i.e. closing read_io and/or write_io doesn't cause an error.
- *
- * Not available on all platforms.
- *
- * If an encoding (encoding name or encoding object) is specified as an optional argument,
- * read string from pipe is tagged with the encoding specified.
- * If the argument is a colon separated two encoding names "A:B",
- * the read string is converted from encoding A (external encoding)
- * to encoding B (internal encoding), then tagged with B.
- * If two optional arguments are specified, those must be
- * encoding objects or encoding names,
- * and the first one is the external encoding,
- * and the second one is the internal encoding.
- * If the external encoding and the internal encoding is specified,
- * optional hash argument specify the conversion option.
- *
+ * <code>[</code> <i>read_file</i>, <i>write_file</i> <code>]</code>. Not
+ * available on all platforms.
+ *
* In the example below, the two processes close the ends of the pipe
* that they are not using. This is not just a cosmetic nicety. The
* read end of a pipe will not generate an end of file condition if
* there are any writers with the pipe still open. In the case of the
* parent process, the <code>rd.read</code> will never return if it
* does not first issue a <code>wr.close</code>.
- *
+ *
* rd, wr = IO.pipe
- *
+ *
* if fork
* wr.close
* puts "Parent got: <#{rd.read}>"
@@ -7600,27 +5290,27 @@ pipe_pair_close(VALUE rw)
* wr.write "Hi Dad"
* wr.close
* end
- *
+ *
* <em>produces:</em>
- *
+ *
* Sending message to parent
* Parent got: <Hi Dad>
*/
static VALUE
-rb_io_s_pipe(int argc, VALUE *argv, VALUE klass)
+rb_io_s_pipe(klass)
+ VALUE klass;
{
+#ifndef __human68k__
int pipes[2], state;
- VALUE r, w, args[3], v1, v2;
- VALUE opt;
- rb_io_t *fptr, *fptr2;
- int fmode = 0;
- VALUE ret;
+ VALUE r, w, args[3];
- opt = pop_last_hash(&argc, argv);
- rb_scan_args(argc, argv, "02", &v1, &v2);
- if (rb_pipe(pipes) == -1)
- rb_sys_fail(0);
+#ifdef _WIN32
+ if (_pipe(pipes, 1024, O_BINARY) == -1)
+#else
+ if (pipe(pipes) == -1)
+#endif
+ rb_sys_fail(0);
args[0] = klass;
args[1] = INT2NUM(pipes[0]);
@@ -7631,8 +5321,6 @@ rb_io_s_pipe(int argc, VALUE *argv, VALUE klass)
close(pipes[1]);
rb_jump_tag(state);
}
- GetOpenFile(r, fptr);
- io_encoding_set(fptr, v1, v2, opt);
args[1] = INT2NUM(pipes[1]);
args[2] = INT2FIX(O_WRONLY);
w = rb_protect(io_new_instance, (VALUE)args, &state);
@@ -7641,74 +5329,28 @@ rb_io_s_pipe(int argc, VALUE *argv, VALUE klass)
if (!NIL_P(r)) rb_io_close(r);
rb_jump_tag(state);
}
- GetOpenFile(w, fptr2);
- rb_io_synchronized(fptr2);
-
- extract_binmode(opt, &fmode);
- fptr->mode |= fmode;
- fptr2->mode |= fmode;
+ rb_io_synchronized(RFILE(w)->fptr);
- ret = rb_assoc_new(r, w);
- if (rb_block_given_p()) {
- VALUE rw[2];
- rw[0] = r;
- rw[1] = w;
- return rb_ensure(rb_yield, ret, pipe_pair_close, (VALUE)rw);
- }
- return ret;
+ return rb_assoc_new(r, w);
+#else
+ rb_notimplement();
+ return Qnil; /* not reached */
+#endif
}
struct foreach_arg {
int argc;
- VALUE *argv;
+ VALUE sep;
VALUE io;
};
-static void
-open_key_args(int argc, VALUE *argv, struct foreach_arg *arg)
-{
- VALUE opt, v;
-
- FilePathValue(argv[0]);
- arg->io = 0;
- arg->argc = argc - 1;
- arg->argv = argv + 1;
- if (argc == 1) {
- no_key:
- arg->io = rb_io_open(argv[0], INT2NUM(O_RDONLY), INT2FIX(0666), Qnil);
- return;
- }
- opt = pop_last_hash(&arg->argc, arg->argv);
- if (NIL_P(opt)) goto no_key;
-
- v = rb_hash_aref(opt, sym_open_args);
- if (!NIL_P(v)) {
- VALUE args;
- long n;
-
- v = rb_convert_type(v, T_ARRAY, "Array", "to_ary");
- n = RARRAY_LEN(v) + 1;
-#if SIZEOF_LONG > SIZEOF_INT
- if (n > INT_MAX) {
- rb_raise(rb_eArgError, "too many arguments");
- }
-#endif
- args = rb_ary_tmp_new(n);
- rb_ary_push(args, argv[0]);
- rb_ary_concat(args, v);
- arg->io = rb_io_open_with_args((int)n, RARRAY_PTR(args));
- rb_ary_clear(args); /* prevent from GC */
- return;
- }
- arg->io = rb_io_open(argv[0], Qnil, Qnil, opt);
-}
-
static VALUE
-io_s_foreach(struct foreach_arg *arg)
+io_s_foreach(arg)
+ struct foreach_arg *arg;
{
VALUE str;
- while (!NIL_P(str = rb_io_gets_m(arg->argc, arg->argv, arg->io))) {
+ while (!NIL_P(str = rb_io_getline(arg->sep, arg->io))) {
rb_yield(str);
}
return Qnil;
@@ -7716,1087 +5358,204 @@ io_s_foreach(struct foreach_arg *arg)
/*
* call-seq:
- * IO.foreach(name, sep=$/ [, open_args]) {|line| block } => nil
- * IO.foreach(name, limit [, open_args]) {|line| block } => nil
- * IO.foreach(name, sep, limit [, open_args]) {|line| block } => nil
- *
+ * IO.foreach(name, sep_string=$/) {|line| block } => nil
+ *
* Executes the block for every line in the named I/O port, where lines
- * are separated by <em>sep</em>.
- *
+ * are separated by <em>sep_string</em>.
+ *
* IO.foreach("testfile") {|x| print "GOT ", x }
- *
+ *
* <em>produces:</em>
- *
+ *
* GOT This is line one
* GOT This is line two
* GOT This is line three
* GOT And so on...
- *
- * If the last argument is a hash, it's the keyword argument to open.
- * See <code>IO.read</code> for detail.
- *
- */
+ */
static VALUE
-rb_io_s_foreach(int argc, VALUE *argv, VALUE self)
+rb_io_s_foreach(argc, argv, self)
+ int argc;
+ VALUE *argv;
+ VALUE self;
{
+ VALUE fname;
struct foreach_arg arg;
- rb_scan_args(argc, argv, "13", NULL, NULL, NULL, NULL);
+ rb_scan_args(argc, argv, "11", &fname, &arg.sep);
RETURN_ENUMERATOR(self, argc, argv);
- open_key_args(argc, argv, &arg);
+ SafeStringValue(fname);
+
+ if (argc == 1) {
+ arg.sep = rb_default_rs;
+ }
+ else if (!NIL_P(arg.sep)) {
+ StringValue(arg.sep);
+ }
+ arg.io = rb_io_open(StringValueCStr(fname), "r");
if (NIL_P(arg.io)) return Qnil;
+
return rb_ensure(io_s_foreach, (VALUE)&arg, rb_io_close, arg.io);
}
static VALUE
-io_s_readlines(struct foreach_arg *arg)
+io_s_readlines(arg)
+ struct foreach_arg *arg;
{
- return rb_io_readlines(arg->argc, arg->argv, arg->io);
+ return rb_io_readlines(arg->argc, &arg->sep, arg->io);
}
/*
* call-seq:
- * IO.readlines(name, sep=$/ [, open_args]) => array
- * IO.readlines(name, limit [, open_args]) => array
- * IO.readlines(name, sep, limit [, open_args]) => array
- *
+ * IO.readlines(name, sep_string=$/) => array
+ *
* Reads the entire file specified by <i>name</i> as individual
* lines, and returns those lines in an array. Lines are separated by
- * <i>sep</i>.
- *
+ * <i>sep_string</i>.
+ *
* a = IO.readlines("testfile")
* a[0] #=> "This is line one\n"
- *
- * If the last argument is a hash, it's the keyword argument to open.
- * See <code>IO.read</code> for detail.
- *
+ *
*/
static VALUE
-rb_io_s_readlines(int argc, VALUE *argv, VALUE io)
+rb_io_s_readlines(argc, argv, io)
+ int argc;
+ VALUE *argv;
+ VALUE io;
{
+ VALUE fname;
struct foreach_arg arg;
- rb_scan_args(argc, argv, "13", NULL, NULL, NULL, NULL);
- open_key_args(argc, argv, &arg);
+ rb_scan_args(argc, argv, "11", &fname, &arg.sep);
+ SafeStringValue(fname);
+
+ arg.argc = argc - 1;
+ arg.io = rb_io_open(StringValueCStr(fname), "r");
if (NIL_P(arg.io)) return Qnil;
return rb_ensure(io_s_readlines, (VALUE)&arg, rb_io_close, arg.io);
}
static VALUE
-io_s_read(struct foreach_arg *arg)
+io_s_read(arg)
+ struct foreach_arg *arg;
{
- return io_read(arg->argc, arg->argv, arg->io);
+ return io_read(arg->argc, &arg->sep, arg->io);
}
/*
* call-seq:
* IO.read(name, [length [, offset]] ) => string
- * IO.read(name, [length [, offset]], open_args) => string
- *
+ *
* Opens the file, optionally seeks to the given offset, then returns
* <i>length</i> bytes (defaulting to the rest of the file).
* <code>read</code> ensures the file is closed before returning.
- *
- * If the last argument is a hash, it specifies option for internal
- * open(). The key would be the following. open_args: is exclusive
- * to others.
- *
- * encoding: string or encoding
- *
- * specifies encoding of the read string. encoding will be ignored
- * if length is specified.
- *
- * mode: string
- *
- * specifies mode argument for open(). it should start with "r"
- * otherwise it would cause error.
- *
- * open_args: array of strings
- *
- * specifies arguments for open() as an array.
- *
+ *
* IO.read("testfile") #=> "This is line one\nThis is line two\nThis is line three\nAnd so on...\n"
* IO.read("testfile", 20) #=> "This is line one\nThi"
* IO.read("testfile", 20, 10) #=> "ne one\nThis is line "
*/
static VALUE
-rb_io_s_read(int argc, VALUE *argv, VALUE io)
+rb_io_s_read(argc, argv, io)
+ int argc;
+ VALUE *argv;
+ VALUE io;
{
- VALUE offset;
+ VALUE fname, offset;
struct foreach_arg arg;
- rb_scan_args(argc, argv, "13", NULL, NULL, &offset, NULL);
- open_key_args(argc, argv, &arg);
- if (NIL_P(arg.io)) return Qnil;
- if (!NIL_P(offset)) {
- rb_io_binmode(arg.io);
- rb_io_seek(arg.io, offset, SEEK_SET);
- if (arg.argc == 2) arg.argc = 1;
- }
- return rb_ensure(io_s_read, (VALUE)&arg, rb_io_close, arg.io);
-}
-
-/*
- * call-seq:
- * IO.binread(name, [length [, offset]] ) => string
- *
- * Opens the file, optionally seeks to the given offset, then returns
- * <i>length</i> bytes (defaulting to the rest of the file).
- * <code>read</code> ensures the file is closed before returning.
- * The open mode would be "rb:ASCII-8BIT".
- *
- * IO.binread("testfile") #=> "This is line one\nThis is line two\nThis is line three\nAnd so on...\n"
- * IO.binread("testfile", 20) #=> "This is line one\nThi"
- * IO.binread("testfile", 20, 10) #=> "ne one\nThis is line "
- */
-
-static VALUE
-rb_io_s_binread(int argc, VALUE *argv, VALUE io)
-{
- VALUE offset;
- struct foreach_arg arg;
+ rb_scan_args(argc, argv, "12", &fname, &arg.sep, &offset);
+ SafeStringValue(fname);
- rb_scan_args(argc, argv, "12", NULL, NULL, &offset);
- FilePathValue(argv[0]);
- arg.io = rb_io_open(argv[0], rb_str_new_cstr("rb:ASCII-8BIT"), Qnil, Qnil);
+ arg.argc = argc ? 1 : 0;
+ arg.io = rb_io_open(StringValueCStr(fname), "r");
if (NIL_P(arg.io)) return Qnil;
- arg.argv = argv+1;
- arg.argc = (argc > 1) ? 1 : 0;
if (!NIL_P(offset)) {
rb_io_seek(arg.io, offset, SEEK_SET);
}
return rb_ensure(io_s_read, (VALUE)&arg, rb_io_close, arg.io);
}
-struct copy_stream_struct {
- VALUE src;
- VALUE dst;
- off_t copy_length; /* (off_t)-1 if not specified */
- off_t src_offset; /* (off_t)-1 if not specified */
-
- int src_fd;
- int dst_fd;
- int close_src;
- int close_dst;
- off_t total;
- const char *syserr;
- int error_no;
- const char *notimp;
- rb_fdset_t fds;
- VALUE th;
-};
-
-static int
-maygvl_copy_stream_wait_read(struct copy_stream_struct *stp)
-{
- int ret;
- rb_fd_zero(&stp->fds);
- rb_fd_set(stp->src_fd, &stp->fds);
- ret = rb_fd_select(rb_fd_max(&stp->fds), &stp->fds, NULL, NULL, NULL);
- if (ret == -1) {
- stp->syserr = "select";
- stp->error_no = errno;
- return -1;
- }
- return 0;
-}
-
-static int
-nogvl_copy_stream_wait_write(struct copy_stream_struct *stp)
-{
- int ret;
- rb_fd_zero(&stp->fds);
- rb_fd_set(stp->dst_fd, &stp->fds);
- ret = rb_fd_select(rb_fd_max(&stp->fds), NULL, &stp->fds, NULL, NULL);
- if (ret == -1) {
- stp->syserr = "select";
- stp->error_no = errno;
- return -1;
- }
- return 0;
-}
-
-#ifdef HAVE_SENDFILE
-
-#ifdef __linux__
-#define USE_SENDFILE
-
-#ifdef HAVE_SYS_SENDFILE_H
-#include <sys/sendfile.h>
-#endif
-
-static ssize_t
-simple_sendfile(int out_fd, int in_fd, off_t *offset, size_t count)
-{
- return sendfile(out_fd, in_fd, offset, count);
-}
-
-#endif
-
-#endif
-
-#ifdef USE_SENDFILE
-static int
-nogvl_copy_stream_sendfile(struct copy_stream_struct *stp)
-{
- struct stat src_stat, dst_stat;
- ssize_t ss;
- int ret;
-
- off_t copy_length;
- off_t src_offset;
- int use_pread;
-
- ret = fstat(stp->src_fd, &src_stat);
- if (ret == -1) {
- stp->syserr = "fstat";
- stp->error_no = errno;
- return -1;
- }
- if (!S_ISREG(src_stat.st_mode))
- return 0;
-
- ret = fstat(stp->dst_fd, &dst_stat);
- if (ret == -1) {
- stp->syserr = "fstat";
- stp->error_no = errno;
- return -1;
- }
- if ((dst_stat.st_mode & S_IFMT) != S_IFSOCK)
- return 0;
-
- src_offset = stp->src_offset;
- use_pread = src_offset != (off_t)-1;
-
- copy_length = stp->copy_length;
- if (copy_length == (off_t)-1) {
- if (use_pread)
- copy_length = src_stat.st_size - src_offset;
- else {
- off_t cur = lseek(stp->src_fd, 0, SEEK_CUR);
- if (cur == (off_t)-1) {
- stp->syserr = "lseek";
- stp->error_no = errno;
- return -1;
- }
- copy_length = src_stat.st_size - cur;
- }
- }
-
- retry_sendfile:
- if (use_pread) {
- ss = simple_sendfile(stp->dst_fd, stp->src_fd, &src_offset, copy_length);
- }
- else {
- ss = simple_sendfile(stp->dst_fd, stp->src_fd, NULL, copy_length);
- }
- if (0 < ss) {
- stp->total += ss;
- copy_length -= ss;
- if (0 < copy_length) {
- ss = -1;
- errno = EAGAIN;
- }
- }
- if (ss == -1) {
- switch (errno) {
- case EINVAL:
-#ifdef ENOSYS
- case ENOSYS:
-#endif
- return 0;
- case EAGAIN:
-#if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
- case EWOULDBLOCK:
-#endif
- if (nogvl_copy_stream_wait_write(stp) == -1)
- return -1;
- if (rb_thread_interrupted(stp->th))
- return -1;
- goto retry_sendfile;
- }
- stp->syserr = "sendfile";
- stp->error_no = errno;
- return -1;
- }
- return 1;
-}
-#endif
-
-static ssize_t
-maygvl_copy_stream_read(struct copy_stream_struct *stp, char *buf, size_t len, off_t offset)
-{
- ssize_t ss;
- retry_read:
- if (offset == (off_t)-1)
- ss = read(stp->src_fd, buf, len);
- else {
-#ifdef HAVE_PREAD
- ss = pread(stp->src_fd, buf, len, offset);
-#else
- stp->notimp = "pread";
- return -1;
-#endif
- }
- if (ss == 0) {
- return 0;
- }
- if (ss == -1) {
- switch (errno) {
- case EAGAIN:
-#if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
- case EWOULDBLOCK:
-#endif
- if (maygvl_copy_stream_wait_read(stp) == -1)
- return -1;
- goto retry_read;
-#ifdef ENOSYS
- case ENOSYS:
-#endif
- stp->notimp = "pread";
- return -1;
- }
- stp->syserr = offset == (off_t)-1 ? "read" : "pread";
- stp->error_no = errno;
- return -1;
- }
- return ss;
-}
-
-static int
-nogvl_copy_stream_write(struct copy_stream_struct *stp, char *buf, size_t len)
-{
- ssize_t ss;
- int off = 0;
- while (len) {
- ss = write(stp->dst_fd, buf+off, len);
- if (ss == -1) {
- if (errno == EAGAIN || errno == EWOULDBLOCK) {
- if (nogvl_copy_stream_wait_write(stp) == -1)
- return -1;
- continue;
- }
- stp->syserr = "write";
- stp->error_no = errno;
- return -1;
- }
- off += (int)ss;
- len -= (int)ss;
- stp->total += ss;
- }
- return 0;
-}
-
-static void
-nogvl_copy_stream_read_write(struct copy_stream_struct *stp)
-{
- char buf[1024*16];
- size_t len;
- ssize_t ss;
- int ret;
- off_t copy_length;
- int use_eof;
- off_t src_offset;
- int use_pread;
-
- copy_length = stp->copy_length;
- use_eof = copy_length == (off_t)-1;
- src_offset = stp->src_offset;
- use_pread = src_offset != (off_t)-1;
-
- if (use_pread && stp->close_src) {
- off_t r;
- r = lseek(stp->src_fd, src_offset, SEEK_SET);
- if (r == (off_t)-1) {
- stp->syserr = "lseek";
- stp->error_no = errno;
- return;
- }
- src_offset = (off_t)-1;
- use_pread = 0;
- }
-
- while (use_eof || 0 < copy_length) {
- if (!use_eof && copy_length < (off_t)sizeof(buf)) {
- len = (size_t)copy_length;
- }
- else {
- len = sizeof(buf);
- }
- if (use_pread) {
- ss = maygvl_copy_stream_read(stp, buf, len, src_offset);
- if (0 < ss)
- src_offset += ss;
- }
- else {
- ss = maygvl_copy_stream_read(stp, buf, len, (off_t)-1);
- }
- if (ss <= 0) /* EOF or error */
- return;
-
- ret = nogvl_copy_stream_write(stp, buf, ss);
- if (ret < 0)
- return;
-
- if (!use_eof)
- copy_length -= ss;
-
- if (rb_thread_interrupted(stp->th))
- return;
- }
-}
-
static VALUE
-nogvl_copy_stream_func(void *arg)
-{
- struct copy_stream_struct *stp = (struct copy_stream_struct *)arg;
-#ifdef USE_SENDFILE
- int ret;
-#endif
-
-#ifdef USE_SENDFILE
- ret = nogvl_copy_stream_sendfile(stp);
- if (ret != 0)
- goto finish; /* error or success */
-#endif
-
- nogvl_copy_stream_read_write(stp);
-
-#ifdef USE_SENDFILE
- finish:
-#endif
- return Qnil;
-}
-
-static VALUE
-copy_stream_fallback_body(VALUE arg)
-{
- struct copy_stream_struct *stp = (struct copy_stream_struct *)arg;
- const int buflen = 16*1024;
- VALUE n;
- VALUE buf = rb_str_buf_new(buflen);
- off_t rest = stp->copy_length;
- off_t off = stp->src_offset;
- ID read_method = id_readpartial;
-
- if (stp->src_fd == -1) {
- if (!rb_respond_to(stp->src, read_method)) {
- read_method = id_read;
- }
- }
-
- while (1) {
- long numwrote;
- long l;
- if (stp->copy_length == (off_t)-1) {
- l = buflen;
- }
- else {
- if (rest == 0)
- break;
- l = buflen < rest ? buflen : (long)rest;
- }
- if (stp->src_fd == -1) {
- rb_funcall(stp->src, read_method, 2, INT2FIX(l), buf);
- }
- else {
- ssize_t ss;
- rb_thread_wait_fd(stp->src_fd);
- rb_str_resize(buf, buflen);
- ss = maygvl_copy_stream_read(stp, RSTRING_PTR(buf), l, off);
- if (ss == -1)
- return Qnil;
- if (ss == 0)
- rb_eof_error();
- rb_str_resize(buf, ss);
- if (off != (off_t)-1)
- off += ss;
- }
- n = rb_io_write(stp->dst, buf);
- numwrote = NUM2LONG(n);
- stp->total += numwrote;
- rest -= numwrote;
- if (read_method == id_read && RSTRING_LEN(buf) == 0) {
- break;
- }
- }
-
- return Qnil;
-}
-
-static VALUE
-copy_stream_fallback(struct copy_stream_struct *stp)
-{
- if (stp->src_fd == -1 && stp->src_offset != (off_t)-1) {
- rb_raise(rb_eArgError, "cannot specify src_offset for non-IO");
- }
- rb_rescue2(copy_stream_fallback_body, (VALUE)stp,
- (VALUE (*) (ANYARGS))0, (VALUE)0,
- rb_eEOFError, (VALUE)0);
- return Qnil;
-}
-
-static VALUE
-copy_stream_body(VALUE arg)
-{
- struct copy_stream_struct *stp = (struct copy_stream_struct *)arg;
- VALUE src_io, dst_io;
- rb_io_t *src_fptr = 0, *dst_fptr = 0;
- int src_fd, dst_fd;
-
- stp->th = rb_thread_current();
-
- stp->total = 0;
-
- if (stp->src == argf ||
- !(TYPE(stp->src) == T_FILE ||
- TYPE(stp->src) == T_STRING ||
- rb_respond_to(stp->src, rb_intern("to_path")))) {
- src_fd = -1;
- }
- else {
- src_io = TYPE(stp->src) == T_FILE ? stp->src : Qnil;
- if (NIL_P(src_io)) {
- VALUE args[2];
- int oflags = O_RDONLY;
-#ifdef O_NOCTTY
- oflags |= O_NOCTTY;
-#endif
- FilePathValue(stp->src);
- args[0] = stp->src;
- args[1] = INT2NUM(oflags);
- src_io = rb_class_new_instance(2, args, rb_cFile);
- stp->src = src_io;
- stp->close_src = 1;
- }
- GetOpenFile(src_io, src_fptr);
- rb_io_check_readable(src_fptr);
- src_fd = src_fptr->fd;
- }
- stp->src_fd = src_fd;
-
- if (stp->dst == argf ||
- !(TYPE(stp->dst) == T_FILE ||
- TYPE(stp->dst) == T_STRING ||
- rb_respond_to(stp->dst, rb_intern("to_path")))) {
- dst_fd = -1;
- }
- else {
- dst_io = TYPE(stp->dst) == T_FILE ? stp->dst : Qnil;
- if (NIL_P(dst_io)) {
- VALUE args[3];
- int oflags = O_WRONLY|O_CREAT|O_TRUNC;
-#ifdef O_NOCTTY
- oflags |= O_NOCTTY;
-#endif
- FilePathValue(stp->dst);
- args[0] = stp->dst;
- args[1] = INT2NUM(oflags);
- args[2] = INT2FIX(0600);
- dst_io = rb_class_new_instance(3, args, rb_cFile);
- stp->dst = dst_io;
- stp->close_dst = 1;
- }
- else {
- dst_io = GetWriteIO(dst_io);
- stp->dst = dst_io;
- }
- GetOpenFile(dst_io, dst_fptr);
- rb_io_check_writable(dst_fptr);
- dst_fd = dst_fptr->fd;
- }
- stp->dst_fd = dst_fd;
-
- if (stp->src_offset == (off_t)-1 && src_fptr && src_fptr->rbuf_len) {
- size_t len = src_fptr->rbuf_len;
- VALUE str;
- if (stp->copy_length != (off_t)-1 && stp->copy_length < (off_t)len) {
- len = (size_t)stp->copy_length;
- }
- str = rb_str_buf_new(len);
- rb_str_resize(str,len);
- read_buffered_data(RSTRING_PTR(str), len, src_fptr);
- if (dst_fptr) { /* IO or filename */
- if (io_binwrite(str, dst_fptr, 0) < 0)
- rb_sys_fail(0);
- }
- else /* others such as StringIO */
- rb_io_write(stp->dst, str);
- stp->total += len;
- if (stp->copy_length != (off_t)-1)
- stp->copy_length -= len;
- }
-
- if (dst_fptr && io_fflush(dst_fptr) < 0) {
- rb_raise(rb_eIOError, "flush failed");
- }
-
- if (stp->copy_length == 0)
- return Qnil;
-
- if (src_fd == -1 || dst_fd == -1) {
- return copy_stream_fallback(stp);
- }
-
- rb_fd_init(&stp->fds);
- rb_fd_set(src_fd, &stp->fds);
- rb_fd_set(dst_fd, &stp->fds);
-
- return rb_thread_blocking_region(nogvl_copy_stream_func, (void*)stp, RUBY_UBF_IO, 0);
-}
-
-static VALUE
-copy_stream_finalize(VALUE arg)
-{
- struct copy_stream_struct *stp = (struct copy_stream_struct *)arg;
- if (stp->close_src) {
- rb_io_close_m(stp->src);
- }
- if (stp->close_dst) {
- rb_io_close_m(stp->dst);
- }
- rb_fd_term(&stp->fds);
- if (stp->syserr) {
- errno = stp->error_no;
- rb_sys_fail(stp->syserr);
- }
- if (stp->notimp) {
- rb_raise(rb_eNotImpError, "%s() not implemented", stp->notimp);
- }
- return Qnil;
-}
-
-/*
- * call-seq:
- * IO.copy_stream(src, dst)
- * IO.copy_stream(src, dst, copy_length)
- * IO.copy_stream(src, dst, copy_length, src_offset)
- *
- * IO.copy_stream copies <i>src</i> to <i>dst</i>.
- * <i>src</i> and <i>dst</i> is either a filename or an IO.
- *
- * This method returns the number of bytes copied.
- *
- * If optional arguments are not given,
- * the start position of the copy is
- * the beginning of the filename or
- * the current file offset of the IO.
- * The end position of the copy is the end of file.
- *
- * If <i>copy_length</i> is given,
- * No more than <i>copy_length</i> bytes are copied.
- *
- * If <i>src_offset</i> is given,
- * it specifies the start position of the copy.
- *
- * When <i>src_offset</i> is specified and
- * <i>src</i> is an IO,
- * IO.copy_stream doesn't move the current file offset.
- *
- */
-static VALUE
-rb_io_s_copy_stream(int argc, VALUE *argv, VALUE io)
-{
- VALUE src, dst, length, src_offset;
- struct copy_stream_struct st;
-
- MEMZERO(&st, struct copy_stream_struct, 1);
-
- rb_scan_args(argc, argv, "22", &src, &dst, &length, &src_offset);
-
- st.src = src;
- st.dst = dst;
-
- if (NIL_P(length))
- st.copy_length = (off_t)-1;
- else
- st.copy_length = NUM2OFFT(length);
-
- if (NIL_P(src_offset))
- st.src_offset = (off_t)-1;
- else
- st.src_offset = NUM2OFFT(src_offset);
-
- rb_ensure(copy_stream_body, (VALUE)&st, copy_stream_finalize, (VALUE)&st);
-
- return OFFT2NUM(st.total);
-}
-
-/*
- * call-seq:
- * io.external_encoding => encoding
- *
- * Returns the Encoding object that represents the encoding of the file.
- * If io is write mode and no encoding is specified, returns <code>nil</code>.
- */
-
-static VALUE
-rb_io_external_encoding(VALUE io)
-{
- rb_io_t *fptr;
-
- GetOpenFile(io, fptr);
- if (fptr->encs.enc2) {
- return rb_enc_from_encoding(fptr->encs.enc2);
- }
- if (fptr->mode & FMODE_WRITABLE) {
- if (fptr->encs.enc)
- return rb_enc_from_encoding(fptr->encs.enc);
- return Qnil;
- }
- return rb_enc_from_encoding(io_read_encoding(fptr));
-}
-
-/*
- * call-seq:
- * io.internal_encoding => encoding
- *
- * Returns the Encoding of the internal string if conversion is
- * specified. Otherwise returns nil.
- */
-
-static VALUE
-rb_io_internal_encoding(VALUE io)
-{
- rb_io_t *fptr;
-
- GetOpenFile(io, fptr);
- if (!fptr->encs.enc2) return Qnil;
- return rb_enc_from_encoding(io_read_encoding(fptr));
-}
-
-/*
- * call-seq:
- * io.set_encoding(ext_enc) => io
- * io.set_encoding("ext_enc:int_enc") => io
- * io.set_encoding(ext_enc, int_enc) => io
- * io.set_encoding("ext_enc:int_enc", opt) => io
- * io.set_encoding(ext_enc, int_enc, opt) => io
- *
- * If single argument is specified, read string from io is tagged
- * with the encoding specified. If encoding is a colon separated two
- * encoding names "A:B", the read string is converted from encoding A
- * (external encoding) to encoding B (internal encoding), then tagged
- * with B. If two arguments are specified, those must be encoding
- * objects or encoding names, and the first one is the external encoding, and the
- * second one is the internal encoding.
- * If the external encoding and the internal encoding is specified,
- * optional hash argument specify the conversion option.
- */
-
-static VALUE
-rb_io_set_encoding(int argc, VALUE *argv, VALUE io)
-{
- rb_io_t *fptr;
- VALUE v1, v2, opt;
-
- opt = pop_last_hash(&argc, argv);
- rb_scan_args(argc, argv, "11", &v1, &v2);
- GetOpenFile(io, fptr);
- io_encoding_set(fptr, v1, v2, opt);
- return io;
-}
-
-void
-rb_stdio_set_default_encoding(void)
-{
- extern VALUE rb_stdin, rb_stdout, rb_stderr;
- VALUE val = Qnil;
-
- rb_io_set_encoding(1, &val, rb_stdin);
- rb_io_set_encoding(1, &val, rb_stdout);
- rb_io_set_encoding(1, &val, rb_stderr);
-}
-
-/*
- * call-seq:
- * ARGF.external_encoding => encoding
- *
- * Returns the external encoding for files read from +ARGF+ as an +Encoding+
- * object. The external encoding is the encoding of the text as stored in a
- * file. Contrast with +ARGF.internal_encoding+, which is the encoding used
- * to represent this text within Ruby.
- *
- * To set the external encoding use +ARGF.set_encoding+.
- *
- * For example:
- *
- * ARGF.external_encoding #=> #<Encoding:UTF-8>
- *
- */
-static VALUE
-argf_external_encoding(VALUE argf)
-{
- if (!RTEST(ARGF.current_file)) {
- return rb_enc_from_encoding(rb_default_external_encoding());
- }
- return rb_io_external_encoding(rb_io_check_io(ARGF.current_file));
-}
-
-/*
- * call-seq:
- * ARGF.internal_encoding => encoding
- *
- * Returns the internal encoding for strings read from +ARGF+ as an
- * +Encoding+ object.
- *
- * If +ARGF.set_encoding+ has been called with two encoding names, the second
- * is returned. Otherwise, if +Encoding.default_external+ has been set, that
- * value is returned. Failing that, if a default external encoding was
- * specified on the command-line, that value is used. If the encoding is
- * unknown, nil is returned.
- */
-static VALUE
-argf_internal_encoding(VALUE argf)
-{
- if (!RTEST(ARGF.current_file)) {
- return rb_enc_from_encoding(rb_default_external_encoding());
- }
- return rb_io_internal_encoding(rb_io_check_io(ARGF.current_file));
-}
-
-/*
- * call-seq:
- * ARGF.set_encoding(ext_enc) => ARGF
- * ARGF.set_encoding("ext_enc:int_enc") => ARGF
- * ARGF.set_encoding(ext_enc, int_enc) => ARGF
- * ARGF.set_encoding("ext_enc:int_enc", opt) => ARGF
- * ARGF.set_encoding(ext_enc, int_enc, opt) => ARGF
- *
- * If single argument is specified, strings read from ARGF are tagged with
- * the encoding specified.
- *
- * If two encoding names separated by a colon are given, e.g. "ascii:utf-8",
- * the read string is converted from the first encoding (external encoding)
- * to the second encoding (internal encoding), then tagged with the second
- * encoding.
- *
- * If two arguments are specified, they must be encoding objects or encoding
- * names. Again, the first specifies the external encoding; the second
- * specifies the internal encoding.
- *
- * If the external encoding and the internal encoding are specified, the
- * optional +Hash+ argument can be used to adjust the conversion process. The
- * structure of this hash is explained in the +String#encode+ documentation.
- *
- * For example:
- *
- * ARGF.set_encoding('ascii') # Tag the input as US-ASCII text
- * ARGF.set_encoding(Encoding::UTF_8) # Tag the input as UTF-8 text
- * ARGF.set_encoding('utf-8','ascii') # Transcode the input from US-ASCII
- * # to UTF-8.
- */
-static VALUE
-argf_set_encoding(int argc, VALUE *argv, VALUE argf)
-{
- rb_io_t *fptr;
-
- if (!next_argv()) {
- rb_raise(rb_eArgError, "no stream to set encoding");
- }
- rb_io_set_encoding(argc, argv, ARGF.current_file);
- GetOpenFile(ARGF.current_file, fptr);
- ARGF.encs = fptr->encs;
- return argf;
-}
-
-/*
- * call-seq:
- * ARGF.tell => Integer
- * ARGF.pos => Integer
- *
- * Returns the current offset (in bytes) of the current file in +ARGF+.
- *
- * ARGF.pos #=> 0
- * ARGF.gets #=> "This is line one\n"
- * ARGF.pos #=> 17
- *
- */
-static VALUE
-argf_tell(VALUE argf)
+argf_tell()
{
if (!next_argv()) {
rb_raise(rb_eArgError, "no stream to tell");
}
ARGF_FORWARD(0, 0);
- return rb_io_tell(ARGF.current_file);
+ return rb_io_tell(current_file);
}
-/*
- * call-seq:
- * ARGF.seek(amount, whence=SEEK_SET) -> 0
- *
- * Seeks to offset _amount_ (an +Integer+) in the +ARGF+ stream according to
- * the value of _whence_. See +IO#seek+ for further details.
- */
static VALUE
-argf_seek_m(int argc, VALUE *argv, VALUE argf)
+argf_seek_m(argc, argv, self)
+ int argc;
+ VALUE *argv;
+ VALUE self;
{
if (!next_argv()) {
rb_raise(rb_eArgError, "no stream to seek");
}
ARGF_FORWARD(argc, argv);
- return rb_io_seek_m(argc, argv, ARGF.current_file);
+ return rb_io_seek_m(argc, argv, current_file);
}
-/*
- * call-seq:
- * ARGF.pos = position => Integer
- *
- * Seeks to the position given by _position_ (in bytes) in +ARGF+.
- *
- * For example:
- *
- * ARGF.pos = 17
- * ARGF.gets #=> "This is line two\n"
- */
static VALUE
-argf_set_pos(VALUE argf, VALUE offset)
+argf_set_pos(self, offset)
+ VALUE self, offset;
{
if (!next_argv()) {
rb_raise(rb_eArgError, "no stream to set position");
}
ARGF_FORWARD(1, &offset);
- return rb_io_set_pos(ARGF.current_file, offset);
+ return rb_io_set_pos(current_file, offset);
}
-/*
- * call-seq:
- * ARGF.rewind => 0
- *
- * Positions the current file to the beginning of input, resetting
- * +ARGF.lineno+ to zero.
- *
- * ARGF.readline #=> "This is line one\n"
- * ARGF.rewind #=> 0
- * ARGF.lineno #=> 0
- * ARGF.readline #=> "This is line one\n"
- */
static VALUE
-argf_rewind(VALUE argf)
+argf_rewind()
{
if (!next_argv()) {
rb_raise(rb_eArgError, "no stream to rewind");
}
ARGF_FORWARD(0, 0);
- return rb_io_rewind(ARGF.current_file);
+ return rb_io_rewind(current_file);
}
-/*
- * call-seq:
- * ARGF.fileno => fixnum
- * ARGF.to_i => fixnum
- *
- * Returns an integer representing the numeric file descriptor for
- * the current file. Raises an +ArgumentError+ if there isn't a current file.
- *
- * ARGF.fileno #=> 3
- */
static VALUE
-argf_fileno(VALUE argf)
+argf_fileno()
{
if (!next_argv()) {
rb_raise(rb_eArgError, "no stream");
}
ARGF_FORWARD(0, 0);
- return rb_io_fileno(ARGF.current_file);
+ return rb_io_fileno(current_file);
}
-/*
- * call-seq:
- * ARGF.to_io => IO
- *
- * Returns an +IO+ object representing the current file. This will be a
- * +File+ object unless the current file is a stream such as STDIN.
- *
- * For example:
- *
- * ARGF.to_io #=> #<File:glark.txt>
- * ARGF.to_io #=> #<IO:<STDIN>>
- */
static VALUE
-argf_to_io(VALUE argf)
+argf_to_io()
{
next_argv();
ARGF_FORWARD(0, 0);
- return ARGF.current_file;
+ return current_file;
}
-/*
- * call-seq:
- * ARGF.eof? => true or false
- * ARGF.eof => true or false
- *
- * Returns true if the current file in +ARGF+ is at end of file, i.e. it has
- * no data to read. The stream must be opened for reading or an +IOError+
- * will be raised.
- *
- * $ echo "eof" | ruby argf.rb
- *
- * ARGF.eof? #=> false
- * 3.times { ARGF.readchar }
- * ARGF.eof? #=> false
- * ARGF.readchar #=> "\n"
- * ARGF.eof? #=> true
- */
-
static VALUE
-argf_eof(VALUE argf)
+argf_eof()
{
- next_argv();
- if (RTEST(ARGF.current_file)) {
- if (ARGF.init_p == 0) return Qtrue;
- next_argv();
+ if (current_file) {
+ if (init_p == 0) return Qtrue;
ARGF_FORWARD(0, 0);
- if (rb_io_eof(ARGF.current_file)) {
+ if (rb_io_eof(current_file)) {
return Qtrue;
}
}
return Qfalse;
}
-/*
- * call-seq:
- * ARGF.read([length [, buffer]]) => string, buffer, or nil
- *
- * Reads _length_ bytes from ARGF. The files named on the command line
- * are concatenated and treated as a single file by this method, so when
- * called without arguments the contents of this pseudo file are returned in
- * their entirety.
- *
- * _length_ must be a non-negative integer or nil. If it is a positive
- * integer, +read+ tries to read at most _length_ bytes. It returns nil
- * if an EOF was encountered before anything could be read. Fewer than
- * _length_ bytes may be returned if an EOF is encountered during the read.
- *
- * If _length_ is omitted or is _nil_, it reads until EOF. A String is
- * returned even if EOF is encountered before any data is read.
- *
- * If _length_ is zero, it returns _""_.
- *
- * If the optional _buffer_ argument is present, it must reference a String,
- * which will receive the data.
- *
- * For example:
- *
- * $ echo "small" > small.txt
- * $ echo "large" > large.txt
- * $ ./glark.rb small.txt large.txt
- *
- * ARGF.read #=> "small\nlarge"
- * ARGF.read(200) #=> "small\nlarge"
- * ARGF.read(2) #=> "sm"
- * ARGF.read(0) #=> ""
- *
- * Note that this method behaves like fread() function in C. If you need the
- * behavior like read(2) system call, consider +ARGF.readpartial+.
- */
-
static VALUE
-argf_read(int argc, VALUE *argv, VALUE argf)
+argf_read(argc, argv)
+ int argc;
+ VALUE *argv;
{
VALUE tmp, str, length;
long len = 0;
@@ -8815,24 +5574,24 @@ argf_read(int argc, VALUE *argv, VALUE argf)
if (!next_argv()) {
return str;
}
- if (ARGF_GENERIC_INPUT_P()) {
- tmp = argf_forward(argc, argv, argf);
+ if (TYPE(current_file) != T_FILE) {
+ tmp = argf_forward(argc, argv);
}
else {
- tmp = io_read(argc, argv, ARGF.current_file);
+ tmp = io_read(argc, argv, current_file);
}
if (NIL_P(str)) str = tmp;
else if (!NIL_P(tmp)) rb_str_append(str, tmp);
if (NIL_P(tmp) || NIL_P(length)) {
- if (ARGF.next_p != -1) {
- argf_close(ARGF.current_file);
- ARGF.next_p = 1;
+ if (next_p != -1) {
+ argf_close(current_file);
+ next_p = 1;
goto retry;
}
}
else if (argc >= 1) {
- if (RSTRING_LEN(str) < len) {
- len -= RSTRING_LEN(str);
+ if (RSTRING(str)->len < len) {
+ len -= RSTRING(str)->len;
argv[0] = INT2NUM(len);
goto retry;
}
@@ -8840,724 +5599,231 @@ argf_read(int argc, VALUE *argv, VALUE argf)
return str;
}
-struct argf_call_arg {
- int argc;
- VALUE *argv;
- VALUE argf;
-};
-
-static VALUE
-argf_forward_call(VALUE arg)
-{
- struct argf_call_arg *p = (struct argf_call_arg *)arg;
- argf_forward(p->argc, p->argv, p->argf);
- return Qnil;
-}
-
-/*
- * call-seq:
- * ARGF.readpartial(maxlen) => string
- * ARGF.readpartial(maxlen, outbuf) => outbuf
- *
- * Reads at most _maxlen_ bytes from the ARGF stream. It blocks only if
- * +ARGF+ has no data immediately available. If the optional _outbuf_
- * argument is present, it must reference a String, which will receive the
- * data. It raises <code>EOFError</code> on end of file.
- *
- * +readpartial+ is designed for streams such as pipes, sockets, and ttys. It
- * blocks only when no data is immediately available. This means that it
- * blocks only when following all conditions hold:
- *
- * * The buffer in the +IO+ object is empty.
- * * The content of the stream is empty.
- * * The stream has not reached EOF.
- *
- * When +readpartial+ blocks, it waits for data or EOF. If some data is read,
- * +readpartial+ returns with the data. If EOF is reached, readpartial raises
- * an +EOFError+.
- *
- * When +readpartial+ doesn't block, it returns or raises immediately. If
- * the buffer is not empty, it returns the data in the buffer. Otherwise, if
- * the stream has some content, it returns the data in the stream. If the
- * stream reaches EOF an +EOFError+ is raised.
- */
-
-static VALUE
-argf_readpartial(int argc, VALUE *argv, VALUE argf)
-{
- VALUE tmp, str, length;
-
- rb_scan_args(argc, argv, "11", &length, &str);
- if (!NIL_P(str)) {
- StringValue(str);
- argv[1] = str;
- }
-
- if (!next_argv()) {
- rb_str_resize(str, 0);
- rb_eof_error();
- }
- if (ARGF_GENERIC_INPUT_P()) {
- struct argf_call_arg arg;
- arg.argc = argc;
- arg.argv = argv;
- arg.argf = argf;
- tmp = rb_rescue2(argf_forward_call, (VALUE)&arg,
- RUBY_METHOD_FUNC(0), Qnil, rb_eEOFError, (VALUE)0);
- }
- else {
- tmp = io_getpartial(argc, argv, ARGF.current_file, 0);
- }
- if (NIL_P(tmp)) {
- if (ARGF.next_p == -1) {
- rb_eof_error();
- }
- argf_close(ARGF.current_file);
- ARGF.next_p = 1;
- if (RARRAY_LEN(ARGF.argv) == 0)
- rb_eof_error();
- if (NIL_P(str))
- str = rb_str_new(NULL, 0);
- return str;
- }
- return tmp;
-}
-
-/*
- * call-seq:
- * ARGF.getc => String or nil
- *
- * Reads the next character from +ARGF+ and returns it as a +String+. Returns
- * +nil+ at the end of the stream.
- *
- * +ARGF+ treats the files named on the command line as a single file created
- * by concatenating their contents. After returning the last character of the
- * first file, it returns the first character of the second file, and so on.
- *
- * For example:
- *
- * $ echo "foo" > file
- * $ ruby argf.rb file
- *
- * ARGF.getc #=> "f"
- * ARGF.getc #=> "o"
- * ARGF.getc #=> "o"
- * ARGF.getc #=> "\n"
- * ARGF.getc #=> nil
- * ARGF.getc #=> nil
- */
static VALUE
-argf_getc(VALUE argf)
+argf_getc()
{
- VALUE ch;
+ VALUE byte;
retry:
if (!next_argv()) return Qnil;
- if (ARGF_GENERIC_INPUT_P()) {
- ch = rb_funcall3(ARGF.current_file, rb_intern("getc"), 0, 0);
+ if (TYPE(current_file) != T_FILE) {
+ byte = rb_funcall3(current_file, rb_intern("getc"), 0, 0);
}
else {
- ch = rb_io_getc(ARGF.current_file);
+ byte = rb_io_getc(current_file);
}
- if (NIL_P(ch) && ARGF.next_p != -1) {
- argf_close(ARGF.current_file);
- ARGF.next_p = 1;
+ if (NIL_P(byte) && next_p != -1) {
+ argf_close(current_file);
+ next_p = 1;
goto retry;
}
- return ch;
+ return byte;
}
-/*
- * call-seq:
- * ARGF.getbyte => Fixnum or nil
- *
- * Gets the next 8-bit byte (0..255) from +ARGF+. Returns +nil+ if called at
- * the end of the stream.
- *
- * For example:
- *
- * $ echo "foo" > file
- * $ ruby argf.rb file
- *
- * ARGF.getbyte #=> 102
- * ARGF.getbyte #=> 111
- * ARGF.getbyte #=> 111
- * ARGF.getbyte #=> 10
- * ARGF.getbyte #=> nil
- */
-static VALUE
-argf_getbyte(VALUE argf)
-{
- VALUE ch;
-
- retry:
- if (!next_argv()) return Qnil;
- if (TYPE(ARGF.current_file) != T_FILE) {
- ch = rb_funcall3(ARGF.current_file, rb_intern("getbyte"), 0, 0);
- }
- else {
- ch = rb_io_getbyte(ARGF.current_file);
- }
- if (NIL_P(ch) && ARGF.next_p != -1) {
- argf_close(ARGF.current_file);
- ARGF.next_p = 1;
- goto retry;
- }
-
- return ch;
-}
-
-/*
- * call-seq:
- * ARGF.readchar => String or nil
- *
- * Reads the next character from +ARGF+ and returns it as a +String+. Raises
- * an +EOFError+ after the last character of the last file has been read.
- *
- * For example:
- *
- * $ echo "foo" > file
- * $ ruby argf.rb file
- *
- * ARGF.readchar #=> "f"
- * ARGF.readchar #=> "o"
- * ARGF.readchar #=> "o"
- * ARGF.readchar #=> "\n"
- * ARGF.readchar #=> end of file reached (EOFError)
- */
static VALUE
-argf_readchar(VALUE argf)
-{
- VALUE ch;
-
- retry:
- if (!next_argv()) rb_eof_error();
- if (TYPE(ARGF.current_file) != T_FILE) {
- ch = rb_funcall3(ARGF.current_file, rb_intern("getc"), 0, 0);
- }
- else {
- ch = rb_io_getc(ARGF.current_file);
- }
- if (NIL_P(ch) && ARGF.next_p != -1) {
- argf_close(ARGF.current_file);
- ARGF.next_p = 1;
- goto retry;
- }
-
- return ch;
-}
-
-/*
- * call-seq:
- * ARGF.readbyte => Fixnum
- *
- * Reads the next 8-bit byte from ARGF and returns it as a +Fixnum+. Raises
- * an +EOFError+ after the last byte of the last file has been read.
- *
- * For example:
- *
- * $ echo "foo" > file
- * $ ruby argf.rb file
- *
- * ARGF.readbyte #=> 102
- * ARGF.readbyte #=> 111
- * ARGF.readbyte #=> 111
- * ARGF.readbyte #=> 10
- * ARGF.readbyte #=> end of file reached (EOFError)
- */
-static VALUE
-argf_readbyte(VALUE argf)
+argf_readchar()
{
VALUE c;
NEXT_ARGF_FORWARD(0, 0);
- c = argf_getbyte(argf);
+ c = argf_getc();
if (NIL_P(c)) {
rb_eof_error();
}
return c;
}
-/*
- * call-seq:
- * ARGF.lines(sep=$/) => Enumerator
- * ARGF.lines(sep=$/) {|line| } => Enumerator
- * ARGF.lines(sep=$/,limit) => Enumerator
- * ARGF.lines(sep=$/,limit) {|line| } => Enumerator
- *
- * ARGF.each_line(sep=$/) => Enumerator
- * ARGF.each_line(sep=$/) {|line| } => Enumerator
- * ARGF.each_line(sep=$/,limit) => Enumerator
- * ARGF.each_line(sep=$/,limit) {|line| } => Enumerator
- * ARGF.each(sep=$/) => Enumerator
- * ARGF.each(sep=$/) {|line| } => Enumerator
- * ARGF.each(sep=$/,limit) => Enumerator
- * ARGF.each(sep=$/,limit) {|line| } => Enumerator
- *
- * Returns an enumerator which iterates over each line (separated by _sep_,
- * which defaults to your platform's newline character) of each file in
- * +ARGV+. If a block is supplied, each line in turn will be yielded to the
- * block. The optional _limit_ argument is a +Fixnum+ specifying the maximumn
- * length of each line; longer lines will be split according to this limit.
- *
- * This method allows you to treat the files supplied on the command line as
- * a single file consisting of the concatenation of each named file. After
- * the last line of the first file has been returned, the first line of the
- * second file is returned. The +ARGF.filename+ and +ARGF.lineno+ methods can
- * be used to determine the filename and line number, respectively, of the
- * current line.
- *
- * For example, the following code prints out each line of each named file
- * prefixed with its line number, displaying the filename once per file:
- *
- * ARGF.lines do |line|
- * puts ARGF.filename if ARGF.lineno == 1
- * puts "#{ARGF.lineno}: #{line}"
- * end
- */
static VALUE
-argf_each_line(int argc, VALUE *argv, VALUE argf)
+argf_each_line(argc, argv, argf)
+ int argc;
+ VALUE *argv;
+ VALUE argf;
{
+ VALUE str;
+
RETURN_ENUMERATOR(argf, argc, argv);
- for (;;) {
- if (!next_argv()) return argf;
- rb_block_call(ARGF.current_file, rb_intern("each_line"), argc, argv, rb_yield, 0);
- ARGF.next_p = 1;
+ if (!next_argv()) return Qnil;
+ if (TYPE(current_file) != T_FILE) {
+ for (;;) {
+ if (!next_argv()) return argf;
+ rb_iterate(rb_each, current_file, rb_yield, 0);
+ next_p = 1;
+ }
}
+ while (!NIL_P(str = argf_getline(argc, argv))) {
+ rb_yield(str);
+ }
+ return argf;
}
-/*
- * call-seq:
- * ARGF.bytes => Enumerator
- * ARGF.bytes {|byte| } => Enumerator
- *
- * ARGF.each_byte => Enumerator
- * ARGF.each_byte {|byte| } => Enumerator
- *
- * Returns an enumerator which iterates over each byte of each file in
- * +ARGV+. If a block is supplied, each byte in turn will be yielded to the
- * block. A byte is returned as a +Fixnum+ in the range 0..255.
- *
- * This method allows you to treat the files supplied on the command line as
- * a single file consisting of the concatenation of each named file. After
- * the last byte of the first file has been returned, the first byte of the
- * second file is returned. The +ARGF.filename+ method can be used to
- * determine the filename of the current byte.
- *
- * For example:
- *
- * ARGF.bytes.to_a #=> [35, 32, ... 95, 10]
- *
- */
static VALUE
-argf_each_byte(VALUE argf)
+argf_each_byte(argf)
+ VALUE argf;
{
+ VALUE byte;
+
RETURN_ENUMERATOR(argf, 0, 0);
- for (;;) {
- if (!next_argv()) return argf;
- rb_block_call(ARGF.current_file, rb_intern("each_byte"), 0, 0, rb_yield, 0);
- ARGF.next_p = 1;
+ while (!NIL_P(byte = argf_getc())) {
+ rb_yield(byte);
}
+ return argf;
}
-/*
- * call-seq:
- * ARGF.chars => Enumerator
- * ARGF.chars {|char| } => Enumerator
- *
- * ARGF.each_char => Enumerator
- * ARGF.each_char {|char| } => Enumerator
- *
- * Returns an enumerator which iterates over each character of each file in
- * +ARGV+. If a block is supplied, each character in turn will be yielded to
- * the block.
- *
- * This method allows you to treat the files supplied on the command line as
- * a single file consisting of the concatenation of each named file. After
- * the last character of the first file has been returned, the first
- * character of the second file is returned. The +ARGF.filename+ method can
- * be used to determine the name of the file in which the current character
- * appears.
- */
static VALUE
-argf_each_char(VALUE argf)
+argf_each_char(argf)
+ VALUE argf;
{
+ VALUE ch;
+
RETURN_ENUMERATOR(argf, 0, 0);
- for (;;) {
- if (!next_argv()) return argf;
- rb_block_call(ARGF.current_file, rb_intern("each_char"), 0, 0, rb_yield, 0);
- ARGF.next_p = 1;
+
+ while (!NIL_P(ch = argf_getc())) {
+ unsigned char c;
+ int n;
+ VALUE str, file;
+
+ first_char:
+ c = FIX2INT(ch);
+ n = mbclen(c);
+ str = rb_tainted_str_new((const char *)&c, 1);
+ file = current_file;
+
+ while (--n > 0) {
+ if (NIL_P(ch = argf_getc())) {
+ rb_yield(str);
+ return argf;
+ }
+ if (current_file != file) {
+ rb_yield(str);
+ goto first_char;
+ }
+ c = FIX2INT(ch);
+ rb_str_cat(str, (const char *)&c, 1);
+ }
+ rb_yield(str);
}
+ return argf;
}
-/*
- * call-seq:
- * ARGF.filename => String
- * ARGF.path => String
- *
- * Returns the current filename. "-" is returned when the current file is
- * STDIN.
- *
- * For example:
- *
- * $ echo "foo" > foo
- * $ echo "bar" > bar
- * $ echo "glark" > glark
- *
- * $ ruby argf.rb foo bar glark
- *
- * ARGF.filename #=> "foo"
- * ARGF.read(5) #=> "foo\nb"
- * ARGF.filename #=> "bar"
- * ARGF.skip
- * ARGF.filename #=> "glark"
- */
static VALUE
-argf_filename(VALUE argf)
+argf_filename()
{
next_argv();
- return ARGF.filename;
+ return filename;
}
static VALUE
-argf_filename_getter(ID id, VALUE *var)
-{
- return argf_filename(*var);
-}
-
-/*
- * call-seq:
- * ARGF.file => IO or File object
- *
- * Returns the current file as an +IO+ or +File+ object. #<IO:<STDIN>> is
- * returned when the current file is STDIN.
- *
- * For example:
- *
- * $ echo "foo" > foo
- * $ echo "bar" > bar
- *
- * $ ruby argf.rb foo bar
- *
- * ARGF.file #=> #<File:foo>
- * ARGF.read(5) #=> "foo\nb"
- * ARGF.file #=> #<File:bar>
- */
-static VALUE
-argf_file(VALUE argf)
+argf_file()
{
next_argv();
- return ARGF.current_file;
+ return current_file;
}
-/*
- * call-seq:
- * ARGF.binmode => ARGF
- *
- * Puts +ARGF+ into binary mode. Once a stream is in binary mode, it cannot
- * be reset to non-binary mode. This option has the following effects:
- *
- * * Newline conversion is disabled.
- * * Encoding conversion is disabled.
- * * Content is treated as ASCII-8BIT.
- */
static VALUE
-argf_binmode_m(VALUE argf)
+argf_binmode()
{
- ARGF.binmode = 1;
+ binmode = 1;
next_argv();
ARGF_FORWARD(0, 0);
- rb_io_ascii8bit_binmode(ARGF.current_file);
+ rb_io_binmode(current_file);
return argf;
}
-/*
- * call-seq:
- * ARGF.binmode? => true or false
- *
- * Returns true if +ARGF+ is being read in binary mode; false otherwise. (To
- * enable binary mode use +ARGF.binmode+.
- *
- * For example:
- *
- * ARGF.binmode? #=> false
- * ARGF.binmode
- * ARGF.binmode? #=> true
- */
-static VALUE
-argf_binmode_p(VALUE argf)
-{
- return ARGF.binmode ? Qtrue : Qfalse;
-}
-
-/*
- * call-seq:
- * ARGF.skip => ARGF
- *
- * Sets the current file to the next file in ARGV. If there aren't any more
- * files it has no effect.
- *
- * For example:
- *
- * $ ruby argf.rb foo bar
- * ARGF.filename #=> "foo"
- * ARGF.skip
- * ARGF.filename #=> "bar"
- */
static VALUE
-argf_skip(VALUE argf)
+argf_skip()
{
- if (ARGF.init_p && ARGF.next_p == 0) {
- argf_close(ARGF.current_file);
- ARGF.next_p = 1;
+ if (next_p != -1) {
+ argf_close(current_file);
+ next_p = 1;
}
return argf;
}
-/*
- * call-seq:
- * ARGF.close => ARGF
- *
- * Closes the current file and skips to the next in the stream. Trying to
- * close a file that has already been closed causes an +IOError+ to be
- * raised.
- *
- * For example:
- *
- * $ ruby argf.rb foo bar
- *
- * ARGF.filename #=> "foo"
- * ARGF.close
- * ARGF.filename #=> "bar"
- * ARGF.close
- * ARGF.close #=> closed stream (IOError)
- */
static VALUE
-argf_close_m(VALUE argf)
+argf_close_m()
{
next_argv();
- argf_close(ARGF.current_file);
- if (ARGF.next_p != -1) {
- ARGF.next_p = 1;
+ argf_close(current_file);
+ if (next_p != -1) {
+ next_p = 1;
}
- ARGF.lineno = 0;
+ gets_lineno = 0;
return argf;
}
-/*
- * call-seq:
- * ARGF.closed? => true or false
- *
- * Returns _true_ if the current file has been closed; _false_ otherwise. Use
- * +ARGF.close+ to actually close the current file.
- */
static VALUE
-argf_closed(VALUE argf)
+argf_closed()
{
next_argv();
ARGF_FORWARD(0, 0);
- return rb_io_closed(ARGF.current_file);
+ return rb_io_closed(current_file);
}
-/*
- * call-seq:
- * ARGF.to_s => String
- *
- * Returns "ARGF".
- */
static VALUE
-argf_to_s(VALUE argf)
+argf_to_s()
{
return rb_str_new2("ARGF");
}
-/*
- * call-seq:
- * ARGF.inplace_mode => String
- *
- * Returns the file extension appended to the names of modified files under
- * inplace-edit mode. This value can be set using +ARGF.inplace_mode=+ or
- * passing the +-i+ switch to the Ruby binary.
- */
-static VALUE
-argf_inplace_mode_get(VALUE argf)
-{
- if (!ARGF.inplace) return Qnil;
- return rb_str_new2(ARGF.inplace);
-}
-
static VALUE
-opt_i_get(ID id, VALUE *var)
+opt_i_get()
{
- return argf_inplace_mode_get(*var);
+ if (!ruby_inplace_mode) return Qnil;
+ return rb_str_new2(ruby_inplace_mode);
}
-/*
- * call-seq:
- * ARGF.inplace_mode = ext => ARGF
- *
- * Sets the filename extension for inplace editing mode to the given String.
- * Each file being edited has this value appended to its filename. The
- * modifed file is saved under this new name.
- *
- * For example:
- *
- * $ ruby argf.rb file.txt
- *
- * ARGF.inplace_mode = '.bak'
- * ARGF.lines do |line|
- * print line.sub("foo","bar")
- * end
- *
- * Each line of _file.txt_ has the first occurence of "foo" replaced with
- * "bar", then the new line is written out to _file.txt.bak_.
- */
-static VALUE
-argf_inplace_mode_set(VALUE argf, VALUE val)
+static void
+opt_i_set(val)
+ VALUE val;
{
if (!RTEST(val)) {
- if (ARGF.inplace) free(ARGF.inplace);
- ARGF.inplace = 0;
- }
- else {
- StringValue(val);
- if (ARGF.inplace) free(ARGF.inplace);
- ARGF.inplace = 0;
- ARGF.inplace = strdup(RSTRING_PTR(val));
+ if (ruby_inplace_mode) free(ruby_inplace_mode);
+ ruby_inplace_mode = 0;
+ return;
}
- return argf;
-}
-
-static void
-opt_i_set(VALUE val, ID id, VALUE *var)
-{
- argf_inplace_mode_set(*var, val);
-}
-
-const char *
-ruby_get_inplace_mode(void)
-{
- return ARGF.inplace;
-}
-
-void
-ruby_set_inplace_mode(const char *suffix)
-{
- if (ARGF.inplace) free(ARGF.inplace);
- ARGF.inplace = 0;
- if (suffix) ARGF.inplace = strdup(suffix);
+ StringValue(val);
+ if (ruby_inplace_mode) free(ruby_inplace_mode);
+ ruby_inplace_mode = 0;
+ ruby_inplace_mode = strdup(StringValueCStr(val));
}
/*
- * call-seq:
- * ARGF.argv => Array
- *
- * Returns the +ARGV+ Array, which contains the arguments passed to your
- * script, one per element.
- *
- * For example:
- *
- * $ ruby argf.rb -v glark.txt
- *
- * ARGF.argv #=> ["-v", "glark.txt"]
- *
- */
-static VALUE
-argf_argv(VALUE argf)
-{
- return ARGF.argv;
-}
-
-static VALUE
-argf_argv_getter(ID id, VALUE *var)
-{
- return argf_argv(*var);
-}
-
-VALUE
-rb_get_argv(void)
-{
- return ARGF.argv;
-}
-
-/*
- * Document-class: ARGF
- *
- * +ARGF+ is a stream designed for use in scripts that process files given as
- * command-line arguments, or passed in via STDIN.
- *
- * The arguments passed to your script are stored in the +ARGV+ Array, one
- * argument per element. +ARGF+ assumes that any arguments that aren't
- * filenames have been removed from +ARGV+. For example:
- *
- * $ ruby argf.rb --verbose file1 file2
- *
- * ARGV #=> ["--verbose", "file1", "file2"]
- * option = ARGV.shift #=> "--verbose"
- * ARGV #=> ["file1", "file2"]
- *
- * You can now use +ARGF+ to work with a concatenation of each of these named
- * files. For instance, +ARGF.read+ will return the contents of _file1_
- * followed by the contents of _file2_.
- *
- * After a file in +ARGV+ has been read, +ARGF+ removes it from the Array.
- * Thus, after all files have been read +ARGV+ will be empty.
- *
- * You can manipulate +ARGV+ yourself to control what +ARGF+ operates on. If
- * you remove a file from +ARGV+, it is ignored by +ARGF+; if you add files to
- * +ARGV+, they are treated as if they were named on the command line. For
- * example:
- *
- * ARGV.replace ["file1"]
- * ARGF.readlines # Returns the contents of file1 as an Array
- * ARGV #=> []
- * ARGV.replace ["file2", "file3"]
- * ARGF.read # Returns the contents of file2 and file3
- *
- * If +ARGV+ is empty, +ARGF+ acts as if it contained STDIN, i.e. the data
- * piped to your script. For example:
- *
- * $ echo "glark" | ruby -e 'p ARGF.read'
- * "glark\n"
- */
-
-/*
* Class <code>IO</code> is the basis for all input and output in Ruby.
* An I/O stream may be <em>duplexed</em> (that is, bidirectional), and
* so may use more than one native operating system stream.
- *
+ *
* Many of the examples in this section use class <code>File</code>,
* the only standard subclass of <code>IO</code>. The two classes are
* closely associated.
- *
+ *
* As used in this section, <em>portname</em> may take any of the
* following forms.
- *
+ *
* * A plain string represents a filename suitable for the underlying
* operating system.
- *
+ *
* * A string starting with ``<code>|</code>'' indicates a subprocess.
* The remainder of the string following the ``<code>|</code>'' is
* invoked as a process with appropriate input/output channels
* connected to it.
- *
+ *
* * A string equal to ``<code>|-</code>'' will create another Ruby
* instance as a subprocess.
- *
+ *
* Ruby will convert pathnames between different operating system
* conventions if possible. For instance, on a Windows system the
* filename ``<code>/gumby/ruby/test.rb</code>'' will be opened as
* ``<code>\gumby\ruby\test.rb</code>''. When specifying a
* Windows-style filename in a Ruby string, remember to escape the
* backslashes:
- *
+ *
* "c:\\gumby\\ruby\\test.rb"
- *
+ *
* Our examples here will use the Unix-style forward slashes;
* <code>File::SEPARATOR</code> can be used to get the
* platform-specific separator character.
- *
+ *
* I/O ports may be opened in any one of several different modes, which
* are shown in this section as <em>mode</em>. The mode may
* either be a Fixnum or a String. If numeric, it should be
@@ -9574,7 +5840,7 @@ rb_get_argv(void)
* -----+--------------------------------------------------------
* "r+" | Read-write, starts at beginning of file.
* -----+--------------------------------------------------------
- * "w" | Write-only, truncates existing file
+ * "w" | Write-only, truncates existing file
* | to zero length or creates a new file for writing.
* -----+--------------------------------------------------------
* "w+" | Read-write, truncates existing file to zero length
@@ -9584,17 +5850,11 @@ rb_get_argv(void)
* | otherwise creates a new file for writing.
* -----+--------------------------------------------------------
* "a+" | Read-write, starts at end of file if file exists,
- * | otherwise creates a new file for reading and
+ * | otherwise creates a new file for reading and
* | writing.
* -----+--------------------------------------------------------
- * "b" | Binary file mode (may appear with
+ * "b" | (DOS/Windows only) Binary file mode (may appear with
* | any of the key letters listed above).
- * | Suppresses EOL <-> CRLF conversion on Windows. And
- * | sets external encoding to ASCII-8BIT unless explicitly
- * | specified.
- * -----+--------------------------------------------------------
- * "t" | Text file mode (may appear with
- * | any of the key letters listed above except "b").
*
*
* The global constant ARGF (also accessible as $<) provides an
@@ -9605,13 +5865,9 @@ rb_get_argv(void)
*/
void
-Init_IO(void)
+Init_IO()
{
-#undef rb_intern
-#define rb_intern(str) rb_intern_const(str)
-
- VALUE rb_cARGF;
-#ifdef __CYGWIN__
+#ifdef __CYGWIN__
#include <sys/cygwin.h>
static struct __cygwin_perfile pf[] =
{
@@ -9630,8 +5886,6 @@ Init_IO(void)
id_write = rb_intern("write");
id_read = rb_intern("read");
id_getc = rb_intern("getc");
- id_flush = rb_intern("flush");
- id_readpartial = rb_intern("readpartial");
rb_define_global_function("syscall", rb_f_syscall, -1);
@@ -9642,6 +5896,7 @@ Init_IO(void)
rb_define_global_function("puts", rb_f_puts, -1);
rb_define_global_function("gets", rb_f_gets, -1);
rb_define_global_function("readline", rb_f_readline, -1);
+ rb_define_global_function("getc", rb_f_getc, 0);
rb_define_global_function("select", rb_f_select, -1);
rb_define_global_function("readlines", rb_f_readlines, -1);
@@ -9654,14 +5909,6 @@ Init_IO(void)
rb_cIO = rb_define_class("IO", rb_cObject);
rb_include_module(rb_cIO, rb_mEnumerable);
- rb_mWaitReadable = rb_define_module_under(rb_cIO, "WaitReadable");
- rb_mWaitWritable = rb_define_module_under(rb_cIO, "WaitWritable");
-
-#if 0
- /* This is necessary only for forcing rdoc handle File::open */
- rb_define_singleton_method(rb_cFile, "open", rb_io_s_open, -1);
-#endif
-
rb_define_alloc_func(rb_cIO, io_alloc);
rb_define_singleton_method(rb_cIO, "new", rb_io_s_new, -1);
rb_define_singleton_method(rb_cIO, "open", rb_io_s_open, -1);
@@ -9671,25 +5918,23 @@ Init_IO(void)
rb_define_singleton_method(rb_cIO, "foreach", rb_io_s_foreach, -1);
rb_define_singleton_method(rb_cIO, "readlines", rb_io_s_readlines, -1);
rb_define_singleton_method(rb_cIO, "read", rb_io_s_read, -1);
- rb_define_singleton_method(rb_cIO, "binread", rb_io_s_binread, -1);
rb_define_singleton_method(rb_cIO, "select", rb_f_select, -1);
- rb_define_singleton_method(rb_cIO, "pipe", rb_io_s_pipe, -1);
- rb_define_singleton_method(rb_cIO, "try_convert", rb_io_s_try_convert, 1);
- rb_define_singleton_method(rb_cIO, "copy_stream", rb_io_s_copy_stream, -1);
+ rb_define_singleton_method(rb_cIO, "pipe", rb_io_s_pipe, 0);
rb_define_method(rb_cIO, "initialize", rb_io_initialize, -1);
rb_output_fs = Qnil;
rb_define_hooked_variable("$,", &rb_output_fs, 0, rb_str_setter);
+ rb_global_variable(&rb_default_rs);
rb_rs = rb_default_rs = rb_str_new2("\n");
- rb_gc_register_mark_object(rb_default_rs);
rb_output_rs = Qnil;
OBJ_FREEZE(rb_default_rs); /* avoid modifying RS_default */
rb_define_hooked_variable("$/", &rb_rs, 0, rb_str_setter);
rb_define_hooked_variable("$-0", &rb_rs, 0, rb_str_setter);
rb_define_hooked_variable("$\\", &rb_output_rs, 0, rb_str_setter);
+ rb_define_hooked_variable("$.", &lineno, 0, lineno_setter);
rb_define_virtual_variable("$_", rb_lastline_get, rb_lastline_set);
rb_define_method(rb_cIO, "initialize_copy", rb_io_init_copy, 1);
@@ -9704,11 +5949,9 @@ Init_IO(void)
rb_define_method(rb_cIO, "each_line", rb_io_each_line, -1);
rb_define_method(rb_cIO, "each_byte", rb_io_each_byte, 0);
rb_define_method(rb_cIO, "each_char", rb_io_each_char, 0);
- rb_define_method(rb_cIO, "each_codepoint", rb_io_each_codepoint, 0);
rb_define_method(rb_cIO, "lines", rb_io_lines, -1);
rb_define_method(rb_cIO, "bytes", rb_io_bytes, 0);
- rb_define_method(rb_cIO, "chars", rb_io_chars, 0);
- rb_define_method(rb_cIO, "codepoints", rb_io_codepoints, 0);
+ rb_define_method(rb_cIO, "chars", rb_io_each_char, 0);
rb_define_method(rb_cIO, "syswrite", rb_io_syswrite, 1);
rb_define_method(rb_cIO, "sysread", rb_io_sysread, -1);
@@ -9718,7 +5961,6 @@ Init_IO(void)
rb_define_method(rb_cIO, "to_io", rb_io_to_io, 0);
rb_define_method(rb_cIO, "fsync", rb_io_fsync, 0);
- rb_define_method(rb_cIO, "fdatasync", rb_io_fdatasync, 0);
rb_define_method(rb_cIO, "sync", rb_io_sync, 0);
rb_define_method(rb_cIO, "sync=", rb_io_set_sync, 1);
@@ -9731,14 +5973,13 @@ Init_IO(void)
rb_define_method(rb_cIO, "write_nonblock", rb_io_write_nonblock, 1);
rb_define_method(rb_cIO, "readpartial", io_readpartial, -1);
rb_define_method(rb_cIO, "read", io_read, -1);
- rb_define_method(rb_cIO, "write", io_write_m, 1);
+ rb_define_method(rb_cIO, "write", io_write, 1);
rb_define_method(rb_cIO, "gets", rb_io_gets_m, -1);
rb_define_method(rb_cIO, "readline", rb_io_readline, -1);
rb_define_method(rb_cIO, "getc", rb_io_getc, 0);
- rb_define_method(rb_cIO, "getbyte", rb_io_getbyte, 0);
+ rb_define_method(rb_cIO, "getbyte", rb_io_getc, 0);
rb_define_method(rb_cIO, "readchar", rb_io_readchar, 0);
- rb_define_method(rb_cIO, "readbyte", rb_io_readbyte, 0);
- rb_define_method(rb_cIO, "ungetbyte",rb_io_ungetbyte, 1);
+ rb_define_method(rb_cIO, "readbyte", rb_io_readchar, 0);
rb_define_method(rb_cIO, "ungetc",rb_io_ungetc, 1);
rb_define_method(rb_cIO, "<<", rb_io_addstr, 1);
rb_define_method(rb_cIO, "flush", rb_io_flush, 0);
@@ -9753,9 +5994,6 @@ Init_IO(void)
rb_define_method(rb_cIO, "eof", rb_io_eof, 0);
rb_define_method(rb_cIO, "eof?", rb_io_eof, 0);
- rb_define_method(rb_cIO, "close_on_exec?", rb_io_close_on_exec_p, 0);
- rb_define_method(rb_cIO, "close_on_exec=", rb_io_set_close_on_exec, 1);
-
rb_define_method(rb_cIO, "close", rb_io_close_m, 0);
rb_define_method(rb_cIO, "closed?", rb_io_closed, 0);
rb_define_method(rb_cIO, "close_read", rb_io_close_read, 0);
@@ -9763,8 +6001,7 @@ Init_IO(void)
rb_define_method(rb_cIO, "isatty", rb_io_isatty, 0);
rb_define_method(rb_cIO, "tty?", rb_io_isatty, 0);
- rb_define_method(rb_cIO, "binmode", rb_io_binmode_m, 0);
- rb_define_method(rb_cIO, "binmode?", rb_io_binmode_p, 0);
+ rb_define_method(rb_cIO, "binmode", rb_io_binmode, 0);
rb_define_method(rb_cIO, "sysseek", rb_io_sysseek, -1);
rb_define_method(rb_cIO, "ioctl", rb_io_ioctl, -1);
@@ -9772,101 +6009,78 @@ Init_IO(void)
rb_define_method(rb_cIO, "pid", rb_io_pid, 0);
rb_define_method(rb_cIO, "inspect", rb_io_inspect, 0);
- rb_define_method(rb_cIO, "external_encoding", rb_io_external_encoding, 0);
- rb_define_method(rb_cIO, "internal_encoding", rb_io_internal_encoding, 0);
- rb_define_method(rb_cIO, "set_encoding", rb_io_set_encoding, -1);
-
rb_define_variable("$stdin", &rb_stdin);
- rb_stdin = prep_stdio(stdin, FMODE_READABLE, rb_cIO, "<STDIN>");
+ rb_stdin = prep_stdio(stdin, FMODE_READABLE, rb_cIO);
rb_define_hooked_variable("$stdout", &rb_stdout, 0, stdout_setter);
- rb_stdout = prep_stdio(stdout, FMODE_WRITABLE, rb_cIO, "<STDOUT>");
+ rb_stdout = prep_stdio(stdout, FMODE_WRITABLE, rb_cIO);
rb_define_hooked_variable("$stderr", &rb_stderr, 0, stdout_setter);
- rb_stderr = prep_stdio(stderr, FMODE_WRITABLE|FMODE_SYNC, rb_cIO, "<STDERR>");
+ rb_stderr = prep_stdio(stderr, FMODE_WRITABLE, rb_cIO);
rb_define_hooked_variable("$>", &rb_stdout, 0, stdout_setter);
orig_stdout = rb_stdout;
rb_deferr = orig_stderr = rb_stderr;
+ /* variables to be removed in 1.8.1 */
+ rb_define_hooked_variable("$defout", &rb_stdout, 0, defout_setter);
+ rb_define_hooked_variable("$deferr", &rb_stderr, 0, deferr_setter);
+
/* constants to hold original stdin/stdout/stderr */
rb_define_global_const("STDIN", rb_stdin);
rb_define_global_const("STDOUT", rb_stdout);
rb_define_global_const("STDERR", rb_stderr);
- /*
- * Hack to get rdoc to regard ARGF as a class:
- * rb_cARGF = rb_define_class("ARGF", rb_cObject);
- */
- rb_cARGF = rb_class_new(rb_cObject);
- rb_set_class_path(rb_cARGF, rb_cObject, "ARGF.class");
- rb_define_alloc_func(rb_cARGF, argf_alloc);
-
- rb_include_module(rb_cARGF, rb_mEnumerable);
-
- rb_define_method(rb_cARGF, "initialize", argf_initialize, -2);
- rb_define_method(rb_cARGF, "initialize_copy", argf_initialize_copy, 1);
- rb_define_method(rb_cARGF, "to_s", argf_to_s, 0);
- rb_define_method(rb_cARGF, "argv", argf_argv, 0);
-
- rb_define_method(rb_cARGF, "fileno", argf_fileno, 0);
- rb_define_method(rb_cARGF, "to_i", argf_fileno, 0);
- rb_define_method(rb_cARGF, "to_io", argf_to_io, 0);
- rb_define_method(rb_cARGF, "each", argf_each_line, -1);
- rb_define_method(rb_cARGF, "each_line", argf_each_line, -1);
- rb_define_method(rb_cARGF, "each_byte", argf_each_byte, 0);
- rb_define_method(rb_cARGF, "each_char", argf_each_char, 0);
- rb_define_method(rb_cARGF, "lines", argf_each_line, -1);
- rb_define_method(rb_cARGF, "bytes", argf_each_byte, 0);
- rb_define_method(rb_cARGF, "chars", argf_each_char, 0);
-
- rb_define_method(rb_cARGF, "read", argf_read, -1);
- rb_define_method(rb_cARGF, "readpartial", argf_readpartial, -1);
- rb_define_method(rb_cARGF, "readlines", argf_readlines, -1);
- rb_define_method(rb_cARGF, "to_a", argf_readlines, -1);
- rb_define_method(rb_cARGF, "gets", argf_gets, -1);
- rb_define_method(rb_cARGF, "readline", argf_readline, -1);
- rb_define_method(rb_cARGF, "getc", argf_getc, 0);
- rb_define_method(rb_cARGF, "getbyte", argf_getbyte, 0);
- rb_define_method(rb_cARGF, "readchar", argf_readchar, 0);
- rb_define_method(rb_cARGF, "readbyte", argf_readbyte, 0);
- rb_define_method(rb_cARGF, "tell", argf_tell, 0);
- rb_define_method(rb_cARGF, "seek", argf_seek_m, -1);
- rb_define_method(rb_cARGF, "rewind", argf_rewind, 0);
- rb_define_method(rb_cARGF, "pos", argf_tell, 0);
- rb_define_method(rb_cARGF, "pos=", argf_set_pos, 1);
- rb_define_method(rb_cARGF, "eof", argf_eof, 0);
- rb_define_method(rb_cARGF, "eof?", argf_eof, 0);
- rb_define_method(rb_cARGF, "binmode", argf_binmode_m, 0);
- rb_define_method(rb_cARGF, "binmode?", argf_binmode_p, 0);
-
- rb_define_method(rb_cARGF, "filename", argf_filename, 0);
- rb_define_method(rb_cARGF, "path", argf_filename, 0);
- rb_define_method(rb_cARGF, "file", argf_file, 0);
- rb_define_method(rb_cARGF, "skip", argf_skip, 0);
- rb_define_method(rb_cARGF, "close", argf_close_m, 0);
- rb_define_method(rb_cARGF, "closed?", argf_closed, 0);
-
- rb_define_method(rb_cARGF, "lineno", argf_lineno, 0);
- rb_define_method(rb_cARGF, "lineno=", argf_set_lineno, 1);
-
- rb_define_method(rb_cARGF, "inplace_mode", argf_inplace_mode_get, 0);
- rb_define_method(rb_cARGF, "inplace_mode=", argf_inplace_mode_set, 1);
-
- rb_define_method(rb_cARGF, "external_encoding", argf_external_encoding, 0);
- rb_define_method(rb_cARGF, "internal_encoding", argf_internal_encoding, 0);
- rb_define_method(rb_cARGF, "set_encoding", argf_set_encoding, -1);
-
- argf = rb_class_new_instance(0, 0, rb_cARGF);
-
rb_define_readonly_variable("$<", &argf);
+ argf = rb_obj_alloc(rb_cObject);
+ rb_extend_object(argf, rb_mEnumerable);
rb_define_global_const("ARGF", argf);
- rb_define_hooked_variable("$.", &argf, argf_lineno_getter, argf_lineno_setter);
- rb_define_hooked_variable("$FILENAME", &argf, argf_filename_getter, rb_gvar_readonly_setter);
- ARGF.filename = rb_str_new2("-");
-
- rb_define_hooked_variable("$-i", &argf, opt_i_get, opt_i_set);
- rb_define_hooked_variable("$*", &argf, argf_argv_getter, rb_gvar_readonly_setter);
-
-#if defined (_WIN32) || defined(__CYGWIN__)
+ rb_define_singleton_method(argf, "to_s", argf_to_s, 0);
+
+ rb_define_singleton_method(argf, "fileno", argf_fileno, 0);
+ rb_define_singleton_method(argf, "to_i", argf_fileno, 0);
+ rb_define_singleton_method(argf, "to_io", argf_to_io, 0);
+ rb_define_singleton_method(argf, "each", argf_each_line, -1);
+ rb_define_singleton_method(argf, "each_line", argf_each_line, -1);
+ rb_define_singleton_method(argf, "each_byte", argf_each_byte, 0);
+ rb_define_singleton_method(argf, "each_char", argf_each_char, 0);
+ rb_define_singleton_method(argf, "lines", argf_each_line, -1);
+ rb_define_singleton_method(argf, "bytes", argf_each_byte, 0);
+ rb_define_singleton_method(argf, "chars", argf_each_char, 0);
+
+ rb_define_singleton_method(argf, "read", argf_read, -1);
+ rb_define_singleton_method(argf, "readlines", rb_f_readlines, -1);
+ rb_define_singleton_method(argf, "to_a", rb_f_readlines, -1);
+ rb_define_singleton_method(argf, "gets", rb_f_gets, -1);
+ rb_define_singleton_method(argf, "readline", rb_f_readline, -1);
+ rb_define_singleton_method(argf, "getc", argf_getc, 0);
+ rb_define_singleton_method(argf, "getbyte", argf_getc, 0);
+ rb_define_singleton_method(argf, "readchar", argf_readchar, 0);
+ rb_define_singleton_method(argf, "readbyte", argf_readchar, 0);
+ rb_define_singleton_method(argf, "tell", argf_tell, 0);
+ rb_define_singleton_method(argf, "seek", argf_seek_m, -1);
+ rb_define_singleton_method(argf, "rewind", argf_rewind, 0);
+ rb_define_singleton_method(argf, "pos", argf_tell, 0);
+ rb_define_singleton_method(argf, "pos=", argf_set_pos, 1);
+ rb_define_singleton_method(argf, "eof", argf_eof, 0);
+ rb_define_singleton_method(argf, "eof?", argf_eof, 0);
+ rb_define_singleton_method(argf, "binmode", argf_binmode, 0);
+
+ rb_define_singleton_method(argf, "filename", argf_filename, 0);
+ rb_define_singleton_method(argf, "path", argf_filename, 0);
+ rb_define_singleton_method(argf, "file", argf_file, 0);
+ rb_define_singleton_method(argf, "skip", argf_skip, 0);
+ rb_define_singleton_method(argf, "close", argf_close_m, 0);
+ rb_define_singleton_method(argf, "closed?", argf_closed, 0);
+
+ rb_define_singleton_method(argf, "lineno", argf_lineno, 0);
+ rb_define_singleton_method(argf, "lineno=", argf_set_lineno, 1);
+
+ rb_global_variable(&current_file);
+ rb_define_readonly_variable("$FILENAME", &filename);
+ filename = rb_str_new2("-");
+
+ rb_define_virtual_variable("$-i", opt_i_get, opt_i_set);
+
+#if defined (_WIN32) || defined(DJGPP) || defined(__CYGWIN__) || defined(__human68k__)
atexit(pipe_atexit);
#endif
@@ -9874,60 +6088,27 @@ Init_IO(void)
rb_define_method(rb_cFile, "initialize", rb_file_initialize, -1);
- /* open for reading only */
rb_file_const("RDONLY", INT2FIX(O_RDONLY));
- /* open for writing only */
rb_file_const("WRONLY", INT2FIX(O_WRONLY));
- /* open for reading and writing */
rb_file_const("RDWR", INT2FIX(O_RDWR));
- /* append on each write */
rb_file_const("APPEND", INT2FIX(O_APPEND));
- /* create file if it does not exist */
rb_file_const("CREAT", INT2FIX(O_CREAT));
- /* error if CREAT and the file exists */
rb_file_const("EXCL", INT2FIX(O_EXCL));
#if defined(O_NDELAY) || defined(O_NONBLOCK)
-# ifndef O_NONBLOCK
-# define O_NONBLOCK O_NDELAY
-# endif
- /* do not block on open or for data to become available */
+# ifdef O_NONBLOCK
rb_file_const("NONBLOCK", INT2FIX(O_NONBLOCK));
+# else
+ rb_file_const("NONBLOCK", INT2FIX(O_NDELAY));
+# endif
#endif
- /* truncate size to 0 */
rb_file_const("TRUNC", INT2FIX(O_TRUNC));
#ifdef O_NOCTTY
- /* not to make opened IO the controling terminal device */
rb_file_const("NOCTTY", INT2FIX(O_NOCTTY));
#endif
-#ifndef O_BINARY
-# define O_BINARY 0
-#endif
- /* disable line code conversion and make ASCII-8BIT */
+#ifdef O_BINARY
rb_file_const("BINARY", INT2FIX(O_BINARY));
+#endif
#ifdef O_SYNC
rb_file_const("SYNC", INT2FIX(O_SYNC));
#endif
-#ifdef O_DSYNC
- rb_file_const("DSYNC", INT2FIX(O_DSYNC));
-#endif
-#ifdef O_RSYNC
- rb_file_const("RSYNC", INT2FIX(O_RSYNC));
-#endif
-#ifdef O_NOFOLLOW
- /* do not follow symlinks */
- rb_file_const("NOFOLLOW", INT2FIX(O_NOFOLLOW)); /* FreeBSD, Linux */
-#endif
-#ifdef O_NOATIME
- /* do not change atime */
- rb_file_const("NOATIME", INT2FIX(O_NOATIME)); /* Linux */
-#endif
-
- sym_mode = ID2SYM(rb_intern("mode"));
- sym_perm = ID2SYM(rb_intern("perm"));
- sym_extenc = ID2SYM(rb_intern("external_encoding"));
- sym_intenc = ID2SYM(rb_intern("internal_encoding"));
- sym_encoding = ID2SYM(rb_intern("encoding"));
- sym_open_args = ID2SYM(rb_intern("open_args"));
- sym_textmode = ID2SYM(rb_intern("textmode"));
- sym_binmode = ID2SYM(rb_intern("binmode"));
}
diff --git a/iseq.c b/iseq.c
deleted file mode 100644
index 5bbd2f1db6..0000000000
--- a/iseq.c
+++ /dev/null
@@ -1,1493 +0,0 @@
-/**********************************************************************
-
- iseq.c -
-
- $Author$
- created at: 2006-07-11(Tue) 09:00:03 +0900
-
- Copyright (C) 2006 Koichi Sasada
-
-**********************************************************************/
-
-#include "ruby/ruby.h"
-
-/* #define MARK_FREE_DEBUG 1 */
-#include "gc.h"
-#include "vm_core.h"
-#include "iseq.h"
-
-#include "insns.inc"
-#include "insns_info.inc"
-
-VALUE rb_cISeq;
-
-#define hidden_obj_p(obj) (!SPECIAL_CONST_P(obj) && !RBASIC(obj)->klass)
-
-static inline VALUE
-obj_resurrect(VALUE obj)
-{
- if (hidden_obj_p(obj)) {
- switch (BUILTIN_TYPE(obj)) {
- case T_STRING:
- obj = rb_str_resurrect(obj);
- break;
- case T_ARRAY:
- obj = rb_ary_resurrect(obj);
- break;
- }
- }
- return obj;
-}
-
-static void
-compile_data_free(struct iseq_compile_data *compile_data)
-{
- if (compile_data) {
- struct iseq_compile_data_storage *cur, *next;
- cur = compile_data->storage_head;
- while (cur) {
- next = cur->next;
- ruby_xfree(cur);
- cur = next;
- }
- ruby_xfree(compile_data);
- }
-}
-
-static void
-iseq_free(void *ptr)
-{
- rb_iseq_t *iseq;
- RUBY_FREE_ENTER("iseq");
-
- if (ptr) {
- iseq = ptr;
- if (!iseq->orig) {
- /* It's possible that strings are freed
- * GC_INFO("%s @ %s\n", RSTRING_PTR(iseq->name),
- * RSTRING_PTR(iseq->filename));
- */
- if (iseq->iseq != iseq->iseq_encoded) {
- RUBY_FREE_UNLESS_NULL(iseq->iseq_encoded);
- }
-
- RUBY_FREE_UNLESS_NULL(iseq->iseq);
- RUBY_FREE_UNLESS_NULL(iseq->insn_info_table);
- RUBY_FREE_UNLESS_NULL(iseq->local_table);
- RUBY_FREE_UNLESS_NULL(iseq->ic_entries);
- RUBY_FREE_UNLESS_NULL(iseq->catch_table);
- RUBY_FREE_UNLESS_NULL(iseq->arg_opt_table);
- compile_data_free(iseq->compile_data);
- }
- ruby_xfree(ptr);
- }
- RUBY_FREE_LEAVE("iseq");
-}
-
-static void
-iseq_mark(void *ptr)
-{
- RUBY_MARK_ENTER("iseq");
-
- if (ptr) {
- int i;
- rb_iseq_t *iseq = ptr;
-
- RUBY_GC_INFO("%s @ %s\n", RSTRING_PTR(iseq->name), RSTRING_PTR(iseq->filename));
- RUBY_MARK_UNLESS_NULL(iseq->mark_ary);
- RUBY_MARK_UNLESS_NULL(iseq->name);
- RUBY_MARK_UNLESS_NULL(iseq->filename);
- RUBY_MARK_UNLESS_NULL((VALUE)iseq->cref_stack);
- RUBY_MARK_UNLESS_NULL(iseq->klass);
- RUBY_MARK_UNLESS_NULL(iseq->coverage);
-/* RUBY_MARK_UNLESS_NULL((VALUE)iseq->node); */
-/* RUBY_MARK_UNLESS_NULL(iseq->cached_special_block); */
- RUBY_MARK_UNLESS_NULL(iseq->orig);
-
- for (i=0; i<iseq->ic_size; i++) {
- struct iseq_inline_cache_entry *const ic = &iseq->ic_entries[i];
- RUBY_MARK_UNLESS_NULL(ic->ic_class);
- RUBY_MARK_UNLESS_NULL(ic->ic_value);
- if (ic->ic_vmstat != GET_VM_STATE_VERSION()) continue;
- if (ic->ic_method) {
- rb_gc_mark_method_entry(ic->ic_method);
- }
- }
-
- if (iseq->compile_data != 0) {
- struct iseq_compile_data *const compile_data = iseq->compile_data;
- RUBY_MARK_UNLESS_NULL(compile_data->mark_ary);
- RUBY_MARK_UNLESS_NULL(compile_data->err_info);
- RUBY_MARK_UNLESS_NULL(compile_data->catch_table_ary);
- }
- }
- RUBY_MARK_LEAVE("iseq");
-}
-
-static size_t
-iseq_memsize(void *ptr)
-{
- size_t size = sizeof(rb_iseq_t);
- rb_iseq_t *iseq;
-
- if (ptr) {
- iseq = ptr;
- if (!iseq->orig) {
- if (iseq->iseq != iseq->iseq_encoded) {
- size += iseq->iseq_size * sizeof(VALUE);
- }
-
- size += iseq->iseq_size * sizeof(VALUE);
- size += iseq->insn_info_size * sizeof(struct iseq_insn_info_entry);
- size += iseq->local_table_size * sizeof(ID);
- size += iseq->catch_table_size * sizeof(struct iseq_catch_table_entry);
- size += iseq->arg_opts * sizeof(VALUE);
- size += iseq->ic_size * sizeof(struct iseq_inline_cache_entry);
-
- if (iseq->compile_data) {
- struct iseq_compile_data_storage *cur;
-
- cur = iseq->compile_data->storage_head;
- while (cur) {
- size += cur->size + sizeof(struct iseq_compile_data_storage);
- cur = cur->next;
- }
- size += sizeof(struct iseq_compile_data);
- }
- }
- }
-
- return size;
-}
-
-static const rb_data_type_t iseq_data_type = {
- "iseq",
- iseq_mark,
- iseq_free,
- iseq_memsize,
-};
-
-static VALUE
-iseq_alloc(VALUE klass)
-{
- rb_iseq_t *iseq;
- return TypedData_Make_Struct(klass, rb_iseq_t, &iseq_data_type, iseq);
-}
-
-static void
-set_relation(rb_iseq_t *iseq, const VALUE parent)
-{
- const VALUE type = iseq->type;
- rb_thread_t *th = GET_THREAD();
-
- /* set class nest stack */
- if (type == ISEQ_TYPE_TOP) {
- /* toplevel is private */
- iseq->cref_stack = NEW_BLOCK(th->top_wrapper ? th->top_wrapper : rb_cObject);
- iseq->cref_stack->nd_file = 0;
- iseq->cref_stack->nd_visi = NOEX_PRIVATE;
- }
- else if (type == ISEQ_TYPE_METHOD || type == ISEQ_TYPE_CLASS) {
- iseq->cref_stack = NEW_BLOCK(0); /* place holder */
- iseq->cref_stack->nd_file = 0;
- }
- else if (RTEST(parent)) {
- rb_iseq_t *piseq;
- GetISeqPtr(parent, piseq);
- iseq->cref_stack = piseq->cref_stack;
- }
-
- if (type == ISEQ_TYPE_TOP ||
- type == ISEQ_TYPE_METHOD || type == ISEQ_TYPE_CLASS) {
- iseq->local_iseq = iseq;
- }
- else if (RTEST(parent)) {
- rb_iseq_t *piseq;
- GetISeqPtr(parent, piseq);
- iseq->local_iseq = piseq->local_iseq;
- }
-
- if (RTEST(parent)) {
- rb_iseq_t *piseq;
- GetISeqPtr(parent, piseq);
- iseq->parent_iseq = piseq;
- }
-}
-
-static VALUE
-prepare_iseq_build(rb_iseq_t *iseq,
- VALUE name, VALUE filename, VALUE line_no,
- VALUE parent, VALUE type, VALUE block_opt,
- const rb_compile_option_t *option)
-{
- OBJ_FREEZE(name);
- OBJ_FREEZE(filename);
-
- iseq->name = name;
- iseq->filename = filename;
- iseq->line_no = line_no;
- iseq->defined_method_id = 0;
- iseq->mark_ary = rb_ary_new();
- RBASIC(iseq->mark_ary)->klass = 0;
-
- iseq->type = type;
- iseq->arg_rest = -1;
- iseq->arg_block = -1;
- iseq->klass = 0;
-
- /*
- * iseq->special_block_builder = GC_GUARDED_PTR_REF(block_opt);
- * iseq->cached_special_block_builder = 0;
- * iseq->cached_special_block = 0;
- */
-
- iseq->compile_data = ALLOC(struct iseq_compile_data);
- MEMZERO(iseq->compile_data, struct iseq_compile_data, 1);
- iseq->compile_data->mark_ary = rb_ary_tmp_new(3);
-
- iseq->compile_data->storage_head = iseq->compile_data->storage_current =
- (struct iseq_compile_data_storage *)
- ALLOC_N(char, INITIAL_ISEQ_COMPILE_DATA_STORAGE_BUFF_SIZE +
- sizeof(struct iseq_compile_data_storage));
-
- iseq->compile_data->catch_table_ary = rb_ary_new();
- iseq->compile_data->storage_head->pos = 0;
- iseq->compile_data->storage_head->next = 0;
- iseq->compile_data->storage_head->size =
- INITIAL_ISEQ_COMPILE_DATA_STORAGE_BUFF_SIZE;
- iseq->compile_data->storage_head->buff =
- (char *)(&iseq->compile_data->storage_head->buff + 1);
- iseq->compile_data->option = option;
-
- set_relation(iseq, parent);
-
- iseq->coverage = Qfalse;
- if (!GET_THREAD()->parse_in_eval) {
- extern VALUE rb_get_coverages(void);
- VALUE coverages = rb_get_coverages();
- if (RTEST(coverages)) {
- iseq->coverage = rb_hash_lookup(coverages, filename);
- if (NIL_P(iseq->coverage)) iseq->coverage = Qfalse;
- }
- }
-
- return Qtrue;
-}
-
-static VALUE
-cleanup_iseq_build(rb_iseq_t *iseq)
-{
- struct iseq_compile_data *data = iseq->compile_data;
- VALUE err = data->err_info;
- iseq->compile_data = 0;
- compile_data_free(data);
-
- if (RTEST(err)) {
- rb_funcall2(err, rb_intern("set_backtrace"), 1, &iseq->filename);
- rb_exc_raise(err);
- }
- return Qtrue;
-}
-
-static rb_compile_option_t COMPILE_OPTION_DEFAULT = {
- OPT_INLINE_CONST_CACHE, /* int inline_const_cache; */
- OPT_PEEPHOLE_OPTIMIZATION, /* int peephole_optimization; */
- OPT_TAILCALL_OPTIMIZATION, /* int tailcall_optimization */
- OPT_SPECIALISED_INSTRUCTION, /* int specialized_instruction; */
- OPT_OPERANDS_UNIFICATION, /* int operands_unification; */
- OPT_INSTRUCTIONS_UNIFICATION, /* int instructions_unification; */
- OPT_STACK_CACHING, /* int stack_caching; */
- OPT_TRACE_INSTRUCTION, /* int trace_instruction */
-};
-static const rb_compile_option_t COMPILE_OPTION_FALSE = {0};
-
-static void
-make_compile_option(rb_compile_option_t *option, VALUE opt)
-{
- if (opt == Qnil) {
- *option = COMPILE_OPTION_DEFAULT;
- }
- else if (opt == Qfalse) {
- *option = COMPILE_OPTION_FALSE;
- }
- else if (opt == Qtrue) {
- memset(option, 1, sizeof(rb_compile_option_t));
- }
- else if (CLASS_OF(opt) == rb_cHash) {
- *option = COMPILE_OPTION_DEFAULT;
-
-#define SET_COMPILE_OPTION(o, h, mem) \
- { VALUE flag = rb_hash_aref(h, ID2SYM(rb_intern(#mem))); \
- if (flag == Qtrue) { o->mem = 1; } \
- else if (flag == Qfalse) { o->mem = 0; } \
- }
-#define SET_COMPILE_OPTION_NUM(o, h, mem) \
- { VALUE num = rb_hash_aref(opt, ID2SYM(rb_intern(#mem))); \
- if (!NIL_P(num)) o->mem = NUM2INT(num); \
- }
- SET_COMPILE_OPTION(option, opt, inline_const_cache);
- SET_COMPILE_OPTION(option, opt, peephole_optimization);
- SET_COMPILE_OPTION(option, opt, tailcall_optimization);
- SET_COMPILE_OPTION(option, opt, specialized_instruction);
- SET_COMPILE_OPTION(option, opt, operands_unification);
- SET_COMPILE_OPTION(option, opt, instructions_unification);
- SET_COMPILE_OPTION(option, opt, stack_caching);
- SET_COMPILE_OPTION(option, opt, trace_instruction);
- SET_COMPILE_OPTION_NUM(option, opt, debug_level);
-#undef SET_COMPILE_OPTION
-#undef SET_COMPILE_OPTION_NUM
- }
- else {
- rb_raise(rb_eTypeError, "Compile option must be Hash/true/false/nil");
- }
-}
-
-static VALUE
-make_compile_option_value(rb_compile_option_t *option)
-{
- VALUE opt = rb_hash_new();
-#define SET_COMPILE_OPTION(o, h, mem) \
- rb_hash_aset(h, ID2SYM(rb_intern(#mem)), o->mem ? Qtrue : Qfalse)
-#define SET_COMPILE_OPTION_NUM(o, h, mem) \
- rb_hash_aset(h, ID2SYM(rb_intern(#mem)), INT2NUM(o->mem))
- {
- SET_COMPILE_OPTION(option, opt, inline_const_cache);
- SET_COMPILE_OPTION(option, opt, peephole_optimization);
- SET_COMPILE_OPTION(option, opt, tailcall_optimization);
- SET_COMPILE_OPTION(option, opt, specialized_instruction);
- SET_COMPILE_OPTION(option, opt, operands_unification);
- SET_COMPILE_OPTION(option, opt, instructions_unification);
- SET_COMPILE_OPTION(option, opt, stack_caching);
- SET_COMPILE_OPTION_NUM(option, opt, debug_level);
- }
-#undef SET_COMPILE_OPTION
-#undef SET_COMPILE_OPTION_NUM
- return opt;
-}
-
-VALUE
-rb_iseq_new(NODE *node, VALUE name, VALUE filename,
- VALUE parent, VALUE type)
-{
- return rb_iseq_new_with_opt(node, name, filename, INT2FIX(0), parent, type,
- &COMPILE_OPTION_DEFAULT);
-}
-
-VALUE
-rb_iseq_new_top(NODE *node, VALUE name, VALUE filename, VALUE parent)
-{
- return rb_iseq_new_with_opt(node, name, filename, INT2FIX(0), parent, ISEQ_TYPE_TOP,
- &COMPILE_OPTION_DEFAULT);
-}
-
-VALUE
-rb_iseq_new_main(NODE *node, VALUE filename)
-{
- rb_thread_t *th = GET_THREAD();
- VALUE parent = th->base_block->iseq->self;
- return rb_iseq_new_with_opt(node, rb_str_new2("<main>"), filename, INT2FIX(0),
- parent, ISEQ_TYPE_MAIN, &COMPILE_OPTION_DEFAULT);
-}
-
-static VALUE
-rb_iseq_new_with_bopt_and_opt(NODE *node, VALUE name, VALUE filename, VALUE line_no,
- VALUE parent, VALUE type, VALUE bopt,
- const rb_compile_option_t *option)
-{
- rb_iseq_t *iseq;
- VALUE self = iseq_alloc(rb_cISeq);
-
- GetISeqPtr(self, iseq);
- iseq->self = self;
-
- prepare_iseq_build(iseq, name, filename, line_no, parent, type, bopt, option);
- rb_iseq_compile_node(self, node);
- cleanup_iseq_build(iseq);
- return self;
-}
-
-VALUE
-rb_iseq_new_with_opt(NODE *node, VALUE name, VALUE filename, VALUE line_no,
- VALUE parent, VALUE type,
- const rb_compile_option_t *option)
-{
- /* TODO: argument check */
- return rb_iseq_new_with_bopt_and_opt(node, name, filename, line_no, parent, type,
- Qfalse, option);
-}
-
-VALUE
-rb_iseq_new_with_bopt(NODE *node, VALUE name, VALUE filename, VALUE line_no,
- VALUE parent, VALUE type, VALUE bopt)
-{
- /* TODO: argument check */
- return rb_iseq_new_with_bopt_and_opt(node, name, filename, line_no, parent, type,
- bopt, &COMPILE_OPTION_DEFAULT);
-}
-
-#define CHECK_ARRAY(v) rb_convert_type(v, T_ARRAY, "Array", "to_ary")
-#define CHECK_STRING(v) rb_convert_type(v, T_STRING, "String", "to_str")
-#define CHECK_SYMBOL(v) rb_convert_type(v, T_SYMBOL, "Symbol", "to_sym")
-static inline VALUE CHECK_INTEGER(VALUE v) {NUM2LONG(v); return v;}
-static VALUE
-iseq_load(VALUE self, VALUE data, VALUE parent, VALUE opt)
-{
- VALUE iseqval = iseq_alloc(self);
-
- VALUE magic, version1, version2, format_type, misc;
- VALUE name, filename, line_no;
- VALUE type, body, locals, args, exception;
-
- VALUE iseq_type;
- struct st_table *type_map = 0;
- rb_iseq_t *iseq;
- rb_compile_option_t option;
- int i = 0;
-
- /* [magic, major_version, minor_version, format_type, misc,
- * name, filename, line_no,
- * type, locals, args, exception_table, body]
- */
-
- data = CHECK_ARRAY(data);
-
- magic = CHECK_STRING(rb_ary_entry(data, i++));
- version1 = CHECK_INTEGER(rb_ary_entry(data, i++));
- version2 = CHECK_INTEGER(rb_ary_entry(data, i++));
- format_type = CHECK_INTEGER(rb_ary_entry(data, i++));
- misc = rb_ary_entry(data, i++); /* TODO */
-
- name = CHECK_STRING(rb_ary_entry(data, i++));
- filename = CHECK_STRING(rb_ary_entry(data, i++));
- line_no = CHECK_INTEGER(rb_ary_entry(data, i++));
-
- type = CHECK_SYMBOL(rb_ary_entry(data, i++));
- locals = CHECK_ARRAY(rb_ary_entry(data, i++));
-
- args = rb_ary_entry(data, i++);
- if (FIXNUM_P(args) || (args = CHECK_ARRAY(args))) {
- /* */
- }
-
- exception = CHECK_ARRAY(rb_ary_entry(data, i++));
- body = CHECK_ARRAY(rb_ary_entry(data, i++));
-
- GetISeqPtr(iseqval, iseq);
- iseq->self = iseqval;
-
- if (type_map == 0) {
- type_map = st_init_numtable();
- st_insert(type_map, ID2SYM(rb_intern("top")), ISEQ_TYPE_TOP);
- st_insert(type_map, ID2SYM(rb_intern("method")), ISEQ_TYPE_METHOD);
- st_insert(type_map, ID2SYM(rb_intern("block")), ISEQ_TYPE_BLOCK);
- st_insert(type_map, ID2SYM(rb_intern("class")), ISEQ_TYPE_CLASS);
- st_insert(type_map, ID2SYM(rb_intern("rescue")), ISEQ_TYPE_RESCUE);
- st_insert(type_map, ID2SYM(rb_intern("ensure")), ISEQ_TYPE_ENSURE);
- st_insert(type_map, ID2SYM(rb_intern("eval")), ISEQ_TYPE_EVAL);
- st_insert(type_map, ID2SYM(rb_intern("main")), ISEQ_TYPE_MAIN);
- st_insert(type_map, ID2SYM(rb_intern("defined_guard")), ISEQ_TYPE_DEFINED_GUARD);
- }
-
- if (st_lookup(type_map, type, &iseq_type) == 0) {
- const char *typename = rb_id2name(type);
- if (typename)
- rb_raise(rb_eTypeError, "unsupport type: :%s", typename);
- else
- rb_raise(rb_eTypeError, "unsupport type: %p", (void *)type);
- }
-
- if (parent == Qnil) {
- parent = 0;
- }
-
- make_compile_option(&option, opt);
- prepare_iseq_build(iseq, name, filename, line_no,
- parent, iseq_type, 0, &option);
-
- rb_iseq_build_from_ary(iseq, locals, args, exception, body);
-
- cleanup_iseq_build(iseq);
- return iseqval;
-}
-
-static VALUE
-iseq_s_load(int argc, VALUE *argv, VALUE self)
-{
- VALUE data, opt=Qnil;
- rb_scan_args(argc, argv, "11", &data, &opt);
-
- return iseq_load(self, data, 0, opt);
-}
-
-VALUE
-rb_iseq_load(VALUE data, VALUE parent, VALUE opt)
-{
- return iseq_load(rb_cISeq, data, parent, opt);
-}
-
-static NODE *
-compile_string(VALUE str, const char *file, int line)
-{
- VALUE parser = rb_parser_new();
- NODE *node = rb_parser_compile_string(parser, file, str, line);
-
- if (!node) {
- rb_exc_raise(GET_THREAD()->errinfo); /* TODO: check err */
- }
- return node;
-}
-
-VALUE
-rb_iseq_compile_with_option(VALUE src, VALUE file, VALUE line, VALUE opt)
-{
- rb_compile_option_t option;
- const char *fn = StringValueCStr(file);
- int ln = NUM2INT(line);
- NODE *node = compile_string(StringValue(src), fn, ln);
- rb_thread_t *th = GET_THREAD();
- make_compile_option(&option, opt);
-
- if (th->base_block && th->base_block->iseq) {
- return rb_iseq_new_with_opt(node, th->base_block->iseq->name,
- file, line, th->base_block->iseq->self,
- ISEQ_TYPE_EVAL, &option);
- }
- else {
- return rb_iseq_new_with_opt(node, rb_str_new2("<compiled>"), file, line, Qfalse,
- ISEQ_TYPE_TOP, &option);
- }
-}
-
-VALUE
-rb_iseq_compile(VALUE src, VALUE file, VALUE line)
-{
- return rb_iseq_compile_with_option(src, file, line, Qnil);
-}
-
-static VALUE
-iseq_s_compile(int argc, VALUE *argv, VALUE self)
-{
- VALUE src, file = Qnil, line = INT2FIX(1), opt = Qnil;
-
- rb_secure(1);
-
- rb_scan_args(argc, argv, "13", &src, &file, &line, &opt);
- if (NIL_P(file)) file = rb_str_new2("<compiled>");
- if (NIL_P(line)) line = INT2FIX(1);
-
- return rb_iseq_compile_with_option(src, file, line, opt);
-}
-
-static VALUE
-iseq_s_compile_file(int argc, VALUE *argv, VALUE self)
-{
- VALUE file, line = INT2FIX(1), opt = Qnil;
- VALUE parser;
- VALUE f;
- NODE *node;
- const char *fname;
- rb_compile_option_t option;
-
- rb_secure(1);
- rb_scan_args(argc, argv, "11", &file, &opt);
- FilePathValue(file);
- fname = StringValueCStr(file);
-
- f = rb_file_open_str(file, "r");
-
- parser = rb_parser_new();
- node = rb_parser_compile_file(parser, fname, f, NUM2INT(line));
- make_compile_option(&option, opt);
- return rb_iseq_new_with_opt(node, rb_str_new2("<main>"), file, line, Qfalse,
- ISEQ_TYPE_TOP, &option);
-}
-
-static VALUE
-iseq_s_compile_option_set(VALUE self, VALUE opt)
-{
- rb_compile_option_t option;
- rb_secure(1);
- make_compile_option(&option, opt);
- COMPILE_OPTION_DEFAULT = option;
- return opt;
-}
-
-static VALUE
-iseq_s_compile_option_get(VALUE self)
-{
- return make_compile_option_value(&COMPILE_OPTION_DEFAULT);
-}
-
-static rb_iseq_t *
-iseq_check(VALUE val)
-{
- rb_iseq_t *iseq;
- GetISeqPtr(val, iseq);
- if (!iseq->name) {
- rb_raise(rb_eTypeError, "uninitialized InstructionSequence");
- }
- return iseq;
-}
-
-static VALUE
-iseq_eval(VALUE self)
-{
- rb_secure(1);
- return rb_iseq_eval(self);
-}
-
-static VALUE
-iseq_inspect(VALUE self)
-{
- rb_iseq_t *iseq;
- GetISeqPtr(self, iseq);
- if (!iseq->name) {
- return rb_sprintf("#<%s: uninitialized>", rb_obj_classname(self));
- }
-
- return rb_sprintf("<%s:%s@%s>",
- rb_obj_classname(self),
- RSTRING_PTR(iseq->name), RSTRING_PTR(iseq->filename));
-}
-
-static
-VALUE iseq_data_to_ary(rb_iseq_t *iseq);
-
-static VALUE
-iseq_to_a(VALUE self)
-{
- rb_iseq_t *iseq = iseq_check(self);
- rb_secure(1);
- return iseq_data_to_ary(iseq);
-}
-
-int
-rb_iseq_first_lineno(rb_iseq_t *iseq)
-{
- return FIX2INT(iseq->line_no);
-}
-
-/* TODO: search algorithm is brute force.
- this should be binary search or so. */
-
-static struct iseq_insn_info_entry *
-get_insn_info(const rb_iseq_t *iseq, const unsigned long pos)
-{
- unsigned long i, size = iseq->insn_info_size;
- struct iseq_insn_info_entry *table = iseq->insn_info_table;
-
- for (i = 0; i < size; i++) {
- if (table[i].position == pos) {
- return &table[i];
- }
- }
-
- return 0;
-}
-
-static unsigned short
-find_line_no(rb_iseq_t *iseq, unsigned long pos)
-{
- struct iseq_insn_info_entry *entry = get_insn_info(iseq, pos);
- if (entry) {
- return entry->line_no;
- }
- else {
- return 0;
- }
-}
-
-static unsigned short
-find_prev_line_no(rb_iseq_t *iseqdat, unsigned long pos)
-{
- unsigned long i, size = iseqdat->insn_info_size;
- struct iseq_insn_info_entry *iiary = iseqdat->insn_info_table;
-
- for (i = 0; i < size; i++) {
- if (iiary[i].position == pos) {
- if (i > 0) {
- return iiary[i - 1].line_no;
- }
- else {
- return 0;
- }
- }
- }
-
- return 0;
-}
-
-static VALUE
-insn_operand_intern(rb_iseq_t *iseq,
- int insn, int op_no, VALUE op,
- int len, int pos, VALUE *pnop, VALUE child)
-{
- const char *types = insn_op_types(insn);
- char type = types[op_no];
- VALUE ret;
-
- switch (type) {
- case TS_OFFSET: /* LONG */
- ret = rb_sprintf("%ld", pos + len + op);
- break;
-
- case TS_NUM: /* ULONG */
- ret = rb_sprintf("%lu", op);
- break;
-
- case TS_LINDEX:
- {
- rb_iseq_t *ip = iseq->local_iseq;
- int lidx = ip->local_size - op;
- const char *name = rb_id2name(ip->local_table[lidx]);
-
- if (name) {
- ret = rb_str_new2(name);
- }
- else {
- ret = rb_str_new2("*");
- }
- break;
- }
- case TS_DINDEX:{
- if (insn == BIN(getdynamic) || insn == BIN(setdynamic)) {
- rb_iseq_t *ip = iseq;
- int level = *pnop, i;
- const char *name;
- for (i = 0; i < level; i++) {
- ip = ip->parent_iseq;
- }
- name = rb_id2name(ip->local_table[ip->local_size - op]);
-
- if (!name) {
- name = "*";
- }
- ret = rb_str_new2(name);
- }
- else {
- ret = rb_inspect(INT2FIX(op));
- }
- break;
- }
- case TS_ID: /* ID (symbol) */
- op = ID2SYM(op);
-
- case TS_VALUE: /* VALUE */
- op = obj_resurrect(op);
- ret = rb_inspect(op);
- if (CLASS_OF(op) == rb_cISeq) {
- rb_ary_push(child, op);
- }
- break;
-
- case TS_ISEQ: /* iseq */
- {
- rb_iseq_t *iseq = (rb_iseq_t *)op;
- if (iseq) {
- ret = iseq->name;
- if (child) {
- rb_ary_push(child, iseq->self);
- }
- }
- else {
- ret = rb_str_new2("nil");
- }
- break;
- }
- case TS_GENTRY:
- {
- struct rb_global_entry *entry = (struct rb_global_entry *)op;
- ret = rb_str_dup(rb_id2str(entry->id));
- }
- break;
-
- case TS_IC:
- ret = rb_str_new2("<ic>");
- break;
-
- case TS_CDHASH:
- ret = rb_str_new2("<cdhash>");
- break;
-
- case TS_FUNCPTR:
- ret = rb_str_new2("<funcptr>");
- break;
-
- default:
- rb_bug("rb_iseq_disasm: unknown operand type: %c", type);
- }
- return ret;
-}
-
-/**
- * Disassemble a instruction
- * Iseq -> Iseq inspect object
- */
-VALUE
-rb_iseq_disasm_insn(VALUE ret, VALUE *iseq, int pos,
- rb_iseq_t *iseqdat, VALUE child)
-{
- int insn = iseq[pos];
- int len = insn_len(insn);
- int j;
- const char *types = insn_op_types(insn);
- VALUE str = rb_str_new(0, 0);
- const char *insn_name_buff;
-
- insn_name_buff = insn_name(insn);
- if (1) {
- rb_str_catf(str, "%04d %-16s ", pos, insn_name_buff);
- }
- else {
- rb_str_catf(str, "%04d %-16.*s ", pos,
- (int)strcspn(insn_name_buff, "_"), insn_name_buff);
- }
-
- for (j = 0; types[j]; j++) {
- const char *types = insn_op_types(insn);
- VALUE opstr = insn_operand_intern(iseqdat, insn, j, iseq[pos + j + 1],
- len, pos, &iseq[pos + j + 2],
- child);
- rb_str_concat(str, opstr);
-
- if (types[j + 1]) {
- rb_str_cat2(str, ", ");
- }
- }
-
- if (1) {
- int line_no = find_line_no(iseqdat, pos);
- int prev = find_prev_line_no(iseqdat, pos);
- if (line_no && line_no != prev) {
- long slen = RSTRING_LEN(str);
- slen = (slen > 70) ? 0 : (70 - slen);
- str = rb_str_catf(str, "%*s(%4d)", (int)slen, "", line_no);
- }
- }
- else {
- /* for debug */
- struct iseq_insn_info_entry *entry = get_insn_info(iseqdat, pos);
- long slen = RSTRING_LEN(str);
- slen = (slen > 60) ? 0 : (60 - slen);
- str = rb_str_catf(str, "%*s(line: %d, sp: %d)",
- (int)slen, "", entry->line_no, entry->sp);
- }
-
- if (ret) {
- rb_str_cat2(str, "\n");
- rb_str_concat(ret, str);
- }
- else {
- printf("%s\n", RSTRING_PTR(str));
- }
- return len;
-}
-
-static const char *
-catch_type(int type)
-{
- switch (type) {
- case CATCH_TYPE_RESCUE:
- return "rescue";
- case CATCH_TYPE_ENSURE:
- return "ensure";
- case CATCH_TYPE_RETRY:
- return "retry";
- case CATCH_TYPE_BREAK:
- return "break";
- case CATCH_TYPE_REDO:
- return "redo";
- case CATCH_TYPE_NEXT:
- return "next";
- default:
- rb_bug("unknown catch type (%d)", type);
- return 0;
- }
-}
-
-VALUE
-rb_iseq_disasm(VALUE self)
-{
- rb_iseq_t *iseqdat = iseq_check(self);
- VALUE *iseq;
- VALUE str = rb_str_new(0, 0);
- VALUE child = rb_ary_new();
- unsigned long size;
- int i;
- long l;
- ID *tbl;
- enum {header_minlen = 72};
-
- rb_secure(1);
-
- iseq = iseqdat->iseq;
- size = iseqdat->iseq_size;
-
- rb_str_cat2(str, "== disasm: ");
-
- rb_str_concat(str, iseq_inspect(iseqdat->self));
- if ((l = RSTRING_LEN(str)) < header_minlen) {
- rb_str_resize(str, header_minlen);
- memset(RSTRING_PTR(str) + l, '=', header_minlen - l);
- }
- rb_str_cat2(str, "\n");
-
- /* show catch table information */
- if (iseqdat->catch_table_size != 0) {
- rb_str_cat2(str, "== catch table\n");
- }
- for (i = 0; i < iseqdat->catch_table_size; i++) {
- struct iseq_catch_table_entry *entry = &iseqdat->catch_table[i];
- rb_str_catf(str,
- "| catch type: %-6s st: %04d ed: %04d sp: %04d cont: %04d\n",
- catch_type((int)entry->type), (int)entry->start,
- (int)entry->end, (int)entry->sp, (int)entry->cont);
- if (entry->iseq) {
- rb_str_concat(str, rb_iseq_disasm(entry->iseq));
- }
- }
- if (iseqdat->catch_table_size != 0) {
- rb_str_cat2(str, "|-------------------------------------"
- "-----------------------------------\n");
- }
-
- /* show local table information */
- tbl = iseqdat->local_table;
-
- if (tbl) {
- rb_str_catf(str,
- "local table (size: %d, argc: %d "
- "[opts: %d, rest: %d, post: %d, block: %d] s%d)\n",
- iseqdat->local_size, iseqdat->argc,
- iseqdat->arg_opts, iseqdat->arg_rest,
- iseqdat->arg_post_len, iseqdat->arg_block,
- iseqdat->arg_simple);
-
- for (i = 0; i < iseqdat->local_table_size; i++) {
- const char *name = rb_id2name(tbl[i]);
- char info[0x100];
- char argi[0x100] = "";
- char opti[0x100] = "";
-
- if (iseqdat->arg_opts) {
- int argc = iseqdat->argc;
- int opts = iseqdat->arg_opts;
- if (i >= argc && i < argc + opts - 1) {
- snprintf(opti, sizeof(opti), "Opt=%ld",
- iseqdat->arg_opt_table[i - argc]);
- }
- }
-
- snprintf(argi, sizeof(argi), "%s%s%s%s%s", /* arg, opts, rest, post block */
- iseqdat->argc > i ? "Arg" : "",
- opti,
- iseqdat->arg_rest == i ? "Rest" : "",
- (iseqdat->arg_post_start <= i &&
- i < iseqdat->arg_post_start + iseqdat->arg_post_len) ? "Post" : "",
- iseqdat->arg_block == i ? "Block" : "");
-
- snprintf(info, sizeof(info), "%s%s%s%s", name ? name : "?",
- *argi ? "<" : "", argi, *argi ? ">" : "");
-
- rb_str_catf(str, "[%2d] %-11s", iseqdat->local_size - i, info);
- }
- rb_str_cat2(str, "\n");
- }
-
- /* show each line */
- for (i = 0; (size_t)i < size;) {
- i += rb_iseq_disasm_insn(str, iseq, i, iseqdat, child);
- }
-
- for (i = 0; i < RARRAY_LEN(child); i++) {
- VALUE isv = rb_ary_entry(child, i);
- rb_str_concat(str, rb_iseq_disasm(isv));
- }
-
- return str;
-}
-
-static VALUE
-iseq_s_disasm(VALUE klass, VALUE body)
-{
- VALUE ret = Qnil;
- rb_iseq_t *iseq;
- extern rb_iseq_t *rb_method_get_iseq(VALUE body);
-
- rb_secure(1);
-
- if ((iseq = rb_method_get_iseq(body)) != 0) {
- ret = rb_iseq_disasm(iseq->self);
- }
-
- return ret;
-}
-
-const char *
-ruby_node_name(int node)
-{
- switch (node) {
-#include "node_name.inc"
- default:
- rb_bug("unknown node (%d)", node);
- return 0;
- }
-}
-
-#define DECL_SYMBOL(name) \
- static VALUE sym_##name
-
-#define INIT_SYMBOL(name) \
- sym_##name = ID2SYM(rb_intern(#name))
-
-static VALUE
-register_label(struct st_table *table, int idx)
-{
- VALUE sym;
- char buff[8 + (sizeof(idx) * CHAR_BIT * 32 / 100)];
-
- snprintf(buff, sizeof(buff), "label_%u", idx);
- sym = ID2SYM(rb_intern(buff));
- st_insert(table, idx, sym);
- return sym;
-}
-
-static VALUE
-exception_type2symbol(VALUE type)
-{
- ID id;
- switch(type) {
- case CATCH_TYPE_RESCUE: CONST_ID(id, "rescue"); break;
- case CATCH_TYPE_ENSURE: CONST_ID(id, "ensure"); break;
- case CATCH_TYPE_RETRY: CONST_ID(id, "retry"); break;
- case CATCH_TYPE_BREAK: CONST_ID(id, "break"); break;
- case CATCH_TYPE_REDO: CONST_ID(id, "redo"); break;
- case CATCH_TYPE_NEXT: CONST_ID(id, "next"); break;
- default:
- rb_bug("...");
- }
- return ID2SYM(id);
-}
-
-static int
-cdhash_each(VALUE key, VALUE value, VALUE ary)
-{
- rb_ary_push(ary, obj_resurrect(key));
- rb_ary_push(ary, value);
- return ST_CONTINUE;
-}
-
-static VALUE
-iseq_data_to_ary(rb_iseq_t *iseq)
-{
- int i, pos, line = 0;
- VALUE *seq;
-
- VALUE val = rb_ary_new();
- VALUE type; /* Symbol */
- VALUE locals = rb_ary_new();
- VALUE args = rb_ary_new();
- VALUE body = rb_ary_new(); /* [[:insn1, ...], ...] */
- VALUE nbody;
- VALUE exception = rb_ary_new(); /* [[....]] */
- VALUE misc = rb_hash_new();
-
- static VALUE insn_syms[VM_INSTRUCTION_SIZE];
- struct st_table *labels_table = st_init_numtable();
-
- DECL_SYMBOL(top);
- DECL_SYMBOL(method);
- DECL_SYMBOL(block);
- DECL_SYMBOL(class);
- DECL_SYMBOL(rescue);
- DECL_SYMBOL(ensure);
- DECL_SYMBOL(eval);
- DECL_SYMBOL(main);
- DECL_SYMBOL(defined_guard);
-
- if (sym_top == 0) {
- int i;
- for (i=0; i<VM_INSTRUCTION_SIZE; i++) {
- insn_syms[i] = ID2SYM(rb_intern(insn_name(i)));
- }
- INIT_SYMBOL(top);
- INIT_SYMBOL(method);
- INIT_SYMBOL(block);
- INIT_SYMBOL(class);
- INIT_SYMBOL(rescue);
- INIT_SYMBOL(ensure);
- INIT_SYMBOL(eval);
- INIT_SYMBOL(main);
- INIT_SYMBOL(defined_guard);
- }
-
- /* type */
- switch(iseq->type) {
- case ISEQ_TYPE_TOP: type = sym_top; break;
- case ISEQ_TYPE_METHOD: type = sym_method; break;
- case ISEQ_TYPE_BLOCK: type = sym_block; break;
- case ISEQ_TYPE_CLASS: type = sym_class; break;
- case ISEQ_TYPE_RESCUE: type = sym_rescue; break;
- case ISEQ_TYPE_ENSURE: type = sym_ensure; break;
- case ISEQ_TYPE_EVAL: type = sym_eval; break;
- case ISEQ_TYPE_MAIN: type = sym_main; break;
- case ISEQ_TYPE_DEFINED_GUARD: type = sym_defined_guard; break;
- default: rb_bug("unsupported iseq type");
- };
-
- /* locals */
- for (i=0; i<iseq->local_table_size; i++) {
- ID lid = iseq->local_table[i];
- if (lid) {
- if (rb_id2str(lid)) rb_ary_push(locals, ID2SYM(lid));
- }
- else {
- rb_ary_push(locals, ID2SYM(rb_intern("#arg_rest")));
- }
- }
-
- /* args */
- {
- /*
- * [argc, # argc
- * [label1, label2, ...] # opts
- * rest index,
- * post_len
- * post_start
- * block index,
- * simple,
- * ]
- */
- VALUE arg_opt_labels = rb_ary_new();
- int j;
-
- for (j=0; j<iseq->arg_opts; j++) {
- rb_ary_push(arg_opt_labels,
- register_label(labels_table, iseq->arg_opt_table[j]));
- }
-
- /* commit */
- if (iseq->arg_simple == 1) {
- args = INT2FIX(iseq->argc);
- }
- else {
- rb_ary_push(args, INT2FIX(iseq->argc));
- rb_ary_push(args, arg_opt_labels);
- rb_ary_push(args, INT2FIX(iseq->arg_post_len));
- rb_ary_push(args, INT2FIX(iseq->arg_post_start));
- rb_ary_push(args, INT2FIX(iseq->arg_rest));
- rb_ary_push(args, INT2FIX(iseq->arg_block));
- rb_ary_push(args, INT2FIX(iseq->arg_simple));
- }
- }
-
- /* body */
- for (seq = iseq->iseq; seq < iseq->iseq + iseq->iseq_size; ) {
- VALUE insn = *seq++;
- int j, len = insn_len(insn);
- VALUE *nseq = seq + len - 1;
- VALUE ary = rb_ary_new2(len);
-
- rb_ary_push(ary, insn_syms[insn]);
- for (j=0; j<len-1; j++, seq++) {
- switch (insn_op_type(insn, j)) {
- case TS_OFFSET: {
- unsigned int idx = nseq - iseq->iseq + *seq;
- rb_ary_push(ary, register_label(labels_table, idx));
- break;
- }
- case TS_LINDEX:
- case TS_DINDEX:
- case TS_NUM:
- rb_ary_push(ary, INT2FIX(*seq));
- break;
- case TS_VALUE:
- rb_ary_push(ary, obj_resurrect(*seq));
- break;
- case TS_ISEQ:
- {
- rb_iseq_t *iseq = (rb_iseq_t *)*seq;
- if (iseq) {
- VALUE val = iseq_data_to_ary(iseq);
- rb_ary_push(ary, val);
- }
- else {
- rb_ary_push(ary, Qnil);
- }
- }
- break;
- case TS_GENTRY:
- {
- struct rb_global_entry *entry = (struct rb_global_entry *)*seq;
- rb_ary_push(ary, ID2SYM(entry->id));
- }
- break;
- case TS_IC:
- rb_ary_push(ary, Qnil);
- break;
- case TS_ID:
- rb_ary_push(ary, ID2SYM(*seq));
- break;
- case TS_CDHASH:
- {
- VALUE hash = *seq;
- VALUE val = rb_ary_new();
- int i;
-
- rb_hash_foreach(hash, cdhash_each, val);
-
- for (i=0; i<RARRAY_LEN(val); i+=2) {
- VALUE pos = FIX2INT(rb_ary_entry(val, i+1));
- unsigned int idx = nseq - iseq->iseq + pos;
-
- rb_ary_store(val, i+1,
- register_label(labels_table, idx));
- }
- rb_ary_push(ary, val);
- }
- break;
- default:
- rb_bug("unknown operand: %c", insn_op_type(insn, j));
- }
- }
- rb_ary_push(body, ary);
- }
-
- nbody = body;
-
- /* exception */
- for (i=0; i<iseq->catch_table_size; i++) {
- VALUE ary = rb_ary_new();
- struct iseq_catch_table_entry *entry = &iseq->catch_table[i];
- rb_ary_push(ary, exception_type2symbol(entry->type));
- if (entry->iseq) {
- rb_iseq_t *eiseq;
- GetISeqPtr(entry->iseq, eiseq);
- rb_ary_push(ary, iseq_data_to_ary(eiseq));
- }
- else {
- rb_ary_push(ary, Qnil);
- }
- rb_ary_push(ary, register_label(labels_table, entry->start));
- rb_ary_push(ary, register_label(labels_table, entry->end));
- rb_ary_push(ary, register_label(labels_table, entry->cont));
- rb_ary_push(ary, INT2FIX(entry->sp));
- rb_ary_push(exception, ary);
- }
-
- /* make body with labels and insert line number */
- body = rb_ary_new();
-
- for (i=0, pos=0; i<RARRAY_LEN(nbody); i++) {
- VALUE ary = RARRAY_PTR(nbody)[i];
- VALUE label;
-
- if (st_lookup(labels_table, pos, &label)) {
- rb_ary_push(body, label);
- }
-
- if (iseq->insn_info_table[i].line_no != line) {
- line = iseq->insn_info_table[i].line_no;
- rb_ary_push(body, INT2FIX(line));
- }
-
- rb_ary_push(body, ary);
- pos += RARRAY_LEN(ary);
- }
-
- st_free_table(labels_table);
-
- rb_hash_aset(misc, ID2SYM(rb_intern("arg_size")), INT2FIX(iseq->arg_size));
- rb_hash_aset(misc, ID2SYM(rb_intern("local_size")), INT2FIX(iseq->local_size));
- rb_hash_aset(misc, ID2SYM(rb_intern("stack_max")), INT2FIX(iseq->stack_max));
-
- /*
- * [:magic, :major_version, :minor_version, :format_type, :misc,
- * :name, :filename, :line_no, :type, :locals, :args,
- * :catch_table, :bytecode]
- */
- rb_ary_push(val, rb_str_new2("YARVInstructionSequence/SimpleDataFormat"));
- rb_ary_push(val, INT2FIX(1)); /* major */
- rb_ary_push(val, INT2FIX(2)); /* minor */
- rb_ary_push(val, INT2FIX(1));
- rb_ary_push(val, misc);
- rb_ary_push(val, iseq->name);
- rb_ary_push(val, iseq->filename);
- rb_ary_push(val, iseq->line_no);
- rb_ary_push(val, type);
- rb_ary_push(val, locals);
- rb_ary_push(val, args);
- rb_ary_push(val, exception);
- rb_ary_push(val, body);
- return val;
-}
-
-VALUE
-rb_iseq_clone(VALUE iseqval, VALUE newcbase)
-{
- VALUE newiseq = iseq_alloc(rb_cISeq);
- rb_iseq_t *iseq0, *iseq1;
-
- GetISeqPtr(iseqval, iseq0);
- GetISeqPtr(newiseq, iseq1);
-
- *iseq1 = *iseq0;
- iseq1->self = newiseq;
- if (!iseq1->orig) {
- iseq1->orig = iseqval;
- }
- if (newcbase) {
- iseq1->cref_stack = NEW_BLOCK(newcbase);
- if (iseq0->cref_stack->nd_next) {
- iseq1->cref_stack->nd_next = iseq0->cref_stack->nd_next;
- }
- }
-
- return newiseq;
-}
-
-VALUE
-rb_iseq_parameters(const rb_iseq_t *iseq, int is_proc)
-{
- int i, r, s;
- VALUE a, args = rb_ary_new2(iseq->arg_size);
- ID req, opt, rest, block;
-#define PARAM_TYPE(type) rb_ary_push(a = rb_ary_new2(2), ID2SYM(type))
-#define PARAM_ID(i) iseq->local_table[i]
-#define PARAM(i, type) ( \
- PARAM_TYPE(type), \
- rb_id2name(PARAM_ID(i)) ? \
- rb_ary_push(a, ID2SYM(PARAM_ID(i))) : \
- a)
-
- CONST_ID(req, "req");
- CONST_ID(opt, "opt");
- if (is_proc) {
- for (i = 0; i < iseq->argc; i++) {
- PARAM_TYPE(opt);
- rb_ary_push(a, rb_id2name(PARAM_ID(i)) ? ID2SYM(PARAM_ID(i)) : Qnil);
- rb_ary_push(args, a);
- }
- }
- else {
- for (i = 0; i < iseq->argc; i++) {
- rb_ary_push(args, PARAM(i, req));
- }
- }
- r = iseq->arg_rest != -1 ? iseq->arg_rest :
- iseq->arg_post_len > 0 ? iseq->arg_post_start :
- iseq->arg_block != -1 ? iseq->arg_block :
- iseq->arg_size;
- for (s = i; i < r; i++) {
- PARAM_TYPE(opt);
- if (rb_id2name(PARAM_ID(i))) {
- rb_ary_push(a, ID2SYM(PARAM_ID(i)));
- }
- rb_ary_push(args, a);
- }
- if (iseq->arg_rest != -1) {
- CONST_ID(rest, "rest");
- rb_ary_push(args, PARAM(iseq->arg_rest, rest));
- }
- r = iseq->arg_post_start + iseq->arg_post_len;
- if (is_proc) {
- for (i = iseq->arg_post_start; i < r; i++) {
- PARAM_TYPE(opt);
- rb_ary_push(a, rb_id2name(PARAM_ID(i)) ? ID2SYM(PARAM_ID(i)) : Qnil);
- rb_ary_push(args, a);
- }
- }
- else {
- for (i = iseq->arg_post_start; i < r; i++) {
- rb_ary_push(args, PARAM(i, req));
- }
- }
- if (iseq->arg_block != -1) {
- CONST_ID(block, "block");
- rb_ary_push(args, PARAM(iseq->arg_block, block));
- }
- return args;
-}
-
-/* ruby2cext */
-
-VALUE
-rb_iseq_build_for_ruby2cext(
- const rb_iseq_t *iseq_template,
- const rb_insn_func_t *func,
- const struct iseq_insn_info_entry *insn_info_table,
- const char **local_table,
- const VALUE *arg_opt_table,
- const struct iseq_catch_table_entry *catch_table,
- const char *name,
- const char *filename,
- const unsigned short line_no)
-{
- unsigned long i;
- VALUE iseqval = iseq_alloc(rb_cISeq);
- rb_iseq_t *iseq;
- GetISeqPtr(iseqval, iseq);
-
- /* copy iseq */
- *iseq = *iseq_template;
- iseq->name = rb_str_new2(name);
- iseq->filename = rb_str_new2(filename);
- iseq->line_no = line_no;
- iseq->mark_ary = rb_ary_tmp_new(3);
- iseq->self = iseqval;
-
- iseq->iseq = ALLOC_N(VALUE, iseq->iseq_size);
-
- for (i=0; i<iseq->iseq_size; i+=2) {
- iseq->iseq[i] = BIN(opt_call_c_function);
- iseq->iseq[i+1] = (VALUE)func;
- }
-
- rb_iseq_translate_threaded_code(iseq);
-
-#define ALLOC_AND_COPY(dst, src, type, size) do { \
- if (size) { \
- (dst) = ALLOC_N(type, (size)); \
- MEMCPY((dst), (src), type, (size)); \
- } \
-} while (0)
-
- ALLOC_AND_COPY(iseq->insn_info_table, insn_info_table,
- struct iseq_insn_info_entry, iseq->insn_info_size);
-
- ALLOC_AND_COPY(iseq->catch_table, catch_table,
- struct iseq_catch_table_entry, iseq->catch_table_size);
-
- ALLOC_AND_COPY(iseq->arg_opt_table, arg_opt_table,
- VALUE, iseq->arg_opts);
-
- set_relation(iseq, 0);
-
- return iseqval;
-}
-
-void
-Init_ISeq(void)
-{
- /* declare ::VM::InstructionSequence */
- rb_cISeq = rb_define_class_under(rb_cRubyVM, "InstructionSequence", rb_cObject);
- rb_define_alloc_func(rb_cISeq, iseq_alloc);
- rb_define_method(rb_cISeq, "inspect", iseq_inspect, 0);
- rb_define_method(rb_cISeq, "disasm", rb_iseq_disasm, 0);
- rb_define_method(rb_cISeq, "disassemble", rb_iseq_disasm, 0);
- rb_define_method(rb_cISeq, "to_a", iseq_to_a, 0);
- rb_define_method(rb_cISeq, "eval", iseq_eval, 0);
-
- /* disable this feature because there is no verifier. */
- /* rb_define_singleton_method(rb_cISeq, "load", iseq_s_load, -1); */
- (void)iseq_s_load;
-
- rb_define_singleton_method(rb_cISeq, "compile", iseq_s_compile, -1);
- rb_define_singleton_method(rb_cISeq, "new", iseq_s_compile, -1);
- rb_define_singleton_method(rb_cISeq, "compile_file", iseq_s_compile_file, -1);
- rb_define_singleton_method(rb_cISeq, "compile_option", iseq_s_compile_option_get, 0);
- rb_define_singleton_method(rb_cISeq, "compile_option=", iseq_s_compile_option_set, 1);
- rb_define_singleton_method(rb_cISeq, "disasm", iseq_s_disasm, 1);
- rb_define_singleton_method(rb_cISeq, "disassemble", iseq_s_disasm, 1);
-}
-
diff --git a/iseq.h b/iseq.h
deleted file mode 100644
index 981b1fca00..0000000000
--- a/iseq.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/**********************************************************************
-
- iseq.h -
-
- $Author$
- created at: 04/01/01 23:36:57 JST
-
- Copyright (C) 2004-2008 Koichi Sasada
-
-**********************************************************************/
-
-#ifndef RUBY_COMPILE_H
-#define RUBY_COMPILE_H
-
-/* compile.c */
-VALUE rb_iseq_compile_node(VALUE self, NODE *node);
-int rb_iseq_translate_threaded_code(rb_iseq_t *iseq);
-VALUE rb_iseq_build_from_ary(rb_iseq_t *iseq, VALUE locals, VALUE args,
- VALUE exception, VALUE body);
-
-/* iseq.c */
-VALUE rb_iseq_load(VALUE data, VALUE parent, VALUE opt);
-struct st_table *ruby_insn_make_insn_table(void);
-
-#define ISEQ_TYPE_TOP INT2FIX(1)
-#define ISEQ_TYPE_METHOD INT2FIX(2)
-#define ISEQ_TYPE_BLOCK INT2FIX(3)
-#define ISEQ_TYPE_CLASS INT2FIX(4)
-#define ISEQ_TYPE_RESCUE INT2FIX(5)
-#define ISEQ_TYPE_ENSURE INT2FIX(6)
-#define ISEQ_TYPE_EVAL INT2FIX(7)
-#define ISEQ_TYPE_MAIN INT2FIX(8)
-#define ISEQ_TYPE_DEFINED_GUARD INT2FIX(9)
-
-#define CATCH_TYPE_RESCUE INT2FIX(1)
-#define CATCH_TYPE_ENSURE INT2FIX(2)
-#define CATCH_TYPE_RETRY INT2FIX(3)
-#define CATCH_TYPE_BREAK INT2FIX(4)
-#define CATCH_TYPE_REDO INT2FIX(5)
-#define CATCH_TYPE_NEXT INT2FIX(6)
-
-struct iseq_insn_info_entry {
- unsigned short position;
- unsigned short line_no;
- unsigned short sp;
-};
-
-struct iseq_catch_table_entry {
- VALUE type;
- VALUE iseq;
- unsigned long start;
- unsigned long end;
- unsigned long cont;
- unsigned long sp;
-};
-
-#define INITIAL_ISEQ_COMPILE_DATA_STORAGE_BUFF_SIZE (512)
-
-struct iseq_compile_data_storage {
- struct iseq_compile_data_storage *next;
- unsigned long pos;
- unsigned long size;
- char *buff;
-};
-
-struct iseq_compile_data {
- /* GC is needed */
- VALUE err_info;
- VALUE mark_ary;
- VALUE catch_table_ary; /* Array */
-
- /* GC is not needed */
- struct iseq_label_data *start_label;
- struct iseq_label_data *end_label;
- struct iseq_label_data *redo_label;
- VALUE current_block;
- VALUE loopval_popped; /* used by NODE_BREAK */
- VALUE ensure_node;
- VALUE for_iseq;
- struct iseq_compile_data_ensure_node_stack *ensure_node_stack;
- int cached_const;
- struct iseq_compile_data_storage *storage_head;
- struct iseq_compile_data_storage *storage_current;
- int last_line;
- int flip_cnt;
- int label_no;
- int node_level;
- const rb_compile_option_t *option;
-};
-
-/* defined? */
-#define DEFINED_IVAR INT2FIX(1)
-#define DEFINED_IVAR2 INT2FIX(2)
-#define DEFINED_GVAR INT2FIX(3)
-#define DEFINED_CVAR INT2FIX(4)
-#define DEFINED_CONST INT2FIX(5)
-#define DEFINED_METHOD INT2FIX(6)
-#define DEFINED_YIELD INT2FIX(7)
-#define DEFINED_REF INT2FIX(8)
-#define DEFINED_ZSUPER INT2FIX(9)
-#define DEFINED_FUNC INT2FIX(10)
-
-#endif /* RUBY_COMPILE_H */
diff --git a/keywords b/keywords
new file mode 100644
index 0000000000..6eed5e1f4d
--- /dev/null
+++ b/keywords
@@ -0,0 +1,42 @@
+struct kwtable {const char *name; int id[2]; enum lex_state state;};
+%%
+__LINE__, {k__LINE__, k__LINE__}, EXPR_END
+__FILE__, {k__FILE__, k__FILE__}, EXPR_END
+BEGIN, {klBEGIN, klBEGIN}, EXPR_END
+END, {klEND, klEND}, EXPR_END
+alias, {kALIAS, kALIAS}, EXPR_FNAME
+and, {kAND, kAND}, EXPR_BEG
+begin, {kBEGIN, kBEGIN}, EXPR_BEG
+break, {kBREAK, kBREAK}, EXPR_MID
+case, {kCASE, kCASE}, EXPR_BEG
+class, {kCLASS, kCLASS}, EXPR_CLASS
+def, {kDEF, kDEF}, EXPR_FNAME
+defined?, {kDEFINED, kDEFINED}, EXPR_ARG
+do, {kDO, kDO}, EXPR_BEG
+else, {kELSE, kELSE}, EXPR_BEG
+elsif, {kELSIF, kELSIF}, EXPR_BEG
+end, {kEND, kEND}, EXPR_END
+ensure, {kENSURE, kENSURE}, EXPR_BEG
+false, {kFALSE, kFALSE}, EXPR_END
+for, {kFOR, kFOR}, EXPR_BEG
+if, {kIF, kIF_MOD}, EXPR_BEG
+in, {kIN, kIN}, EXPR_BEG
+module, {kMODULE, kMODULE}, EXPR_BEG
+next, {kNEXT, kNEXT}, EXPR_MID
+nil, {kNIL, kNIL}, EXPR_END
+not, {kNOT, kNOT}, EXPR_BEG
+or, {kOR, kOR}, EXPR_BEG
+redo, {kREDO, kREDO}, EXPR_END
+rescue, {kRESCUE, kRESCUE_MOD}, EXPR_MID
+retry, {kRETRY, kRETRY}, EXPR_END
+return, {kRETURN, kRETURN}, EXPR_MID
+self, {kSELF, kSELF}, EXPR_END
+super, {kSUPER, kSUPER}, EXPR_ARG
+then, {kTHEN, kTHEN}, EXPR_BEG
+true, {kTRUE, kTRUE}, EXPR_END
+undef, {kUNDEF, kUNDEF}, EXPR_FNAME
+unless, {kUNLESS, kUNLESS_MOD}, EXPR_BEG
+until, {kUNTIL, kUNTIL_MOD}, EXPR_BEG
+when, {kWHEN, kWHEN}, EXPR_BEG
+while, {kWHILE, kWHILE_MOD}, EXPR_BEG
+yield, {kYIELD, kYIELD}, EXPR_ARG
diff --git a/lex.c b/lex.c
new file mode 100644
index 0000000000..a15309d502
--- /dev/null
+++ b/lex.c
@@ -0,0 +1,136 @@
+/* C code produced by gperf version 2.7.2 */
+/* Command-line: gperf -p -j1 -i 1 -g -o -t -N rb_reserved_word -k'1,3,$' ./keywords */
+struct kwtable {const char *name; int id[2]; enum lex_state state;};
+
+#define TOTAL_KEYWORDS 40
+#define MIN_WORD_LENGTH 2
+#define MAX_WORD_LENGTH 8
+#define MIN_HASH_VALUE 6
+#define MAX_HASH_VALUE 55
+/* maximum key range = 50, duplicates = 0 */
+
+#ifdef __GNUC__
+__inline
+#else
+#ifdef __cplusplus
+inline
+#endif
+#endif
+static unsigned int
+hash (str, len)
+ register const char *str;
+ register unsigned int len;
+{
+ static unsigned char asso_values[] =
+ {
+ 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+ 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+ 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+ 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+ 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+ 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+ 56, 56, 56, 11, 56, 56, 36, 56, 1, 37,
+ 31, 1, 56, 56, 56, 56, 29, 56, 1, 56,
+ 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+ 56, 56, 56, 56, 56, 1, 56, 32, 1, 2,
+ 1, 1, 4, 23, 56, 17, 56, 20, 9, 2,
+ 9, 26, 14, 56, 5, 1, 1, 16, 56, 21,
+ 20, 9, 56, 56, 56, 56, 56, 56, 56, 56,
+ 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+ 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+ 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+ 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+ 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+ 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+ 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+ 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+ 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+ 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+ 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+ 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+ 56, 56, 56, 56, 56, 56
+ };
+ register int hval = len;
+
+ switch (hval)
+ {
+ default:
+ case 3:
+ hval += asso_values[(unsigned char)str[2]];
+ case 2:
+ case 1:
+ hval += asso_values[(unsigned char)str[0]];
+ break;
+ }
+ return hval + asso_values[(unsigned char)str[len - 1]];
+}
+
+#ifdef __GNUC__
+__inline
+#endif
+struct kwtable *
+rb_reserved_word (str, len)
+ register const char *str;
+ register unsigned int len;
+{
+ static struct kwtable wordlist[] =
+ {
+ {""}, {""}, {""}, {""}, {""}, {""},
+ {"end", {kEND, kEND}, EXPR_END},
+ {"else", {kELSE, kELSE}, EXPR_BEG},
+ {"case", {kCASE, kCASE}, EXPR_BEG},
+ {"ensure", {kENSURE, kENSURE}, EXPR_BEG},
+ {"module", {kMODULE, kMODULE}, EXPR_BEG},
+ {"elsif", {kELSIF, kELSIF}, EXPR_BEG},
+ {"def", {kDEF, kDEF}, EXPR_FNAME},
+ {"rescue", {kRESCUE, kRESCUE_MOD}, EXPR_MID},
+ {"not", {kNOT, kNOT}, EXPR_BEG},
+ {"then", {kTHEN, kTHEN}, EXPR_BEG},
+ {"yield", {kYIELD, kYIELD}, EXPR_ARG},
+ {"for", {kFOR, kFOR}, EXPR_BEG},
+ {"self", {kSELF, kSELF}, EXPR_END},
+ {"false", {kFALSE, kFALSE}, EXPR_END},
+ {"retry", {kRETRY, kRETRY}, EXPR_END},
+ {"return", {kRETURN, kRETURN}, EXPR_MID},
+ {"true", {kTRUE, kTRUE}, EXPR_END},
+ {"if", {kIF, kIF_MOD}, EXPR_BEG},
+ {"defined?", {kDEFINED, kDEFINED}, EXPR_ARG},
+ {"super", {kSUPER, kSUPER}, EXPR_ARG},
+ {"undef", {kUNDEF, kUNDEF}, EXPR_FNAME},
+ {"break", {kBREAK, kBREAK}, EXPR_MID},
+ {"in", {kIN, kIN}, EXPR_BEG},
+ {"do", {kDO, kDO}, EXPR_BEG},
+ {"nil", {kNIL, kNIL}, EXPR_END},
+ {"until", {kUNTIL, kUNTIL_MOD}, EXPR_BEG},
+ {"unless", {kUNLESS, kUNLESS_MOD}, EXPR_BEG},
+ {"or", {kOR, kOR}, EXPR_BEG},
+ {"next", {kNEXT, kNEXT}, EXPR_MID},
+ {"when", {kWHEN, kWHEN}, EXPR_BEG},
+ {"redo", {kREDO, kREDO}, EXPR_END},
+ {"and", {kAND, kAND}, EXPR_BEG},
+ {"begin", {kBEGIN, kBEGIN}, EXPR_BEG},
+ {"__LINE__", {k__LINE__, k__LINE__}, EXPR_END},
+ {"class", {kCLASS, kCLASS}, EXPR_CLASS},
+ {"__FILE__", {k__FILE__, k__FILE__}, EXPR_END},
+ {"END", {klEND, klEND}, EXPR_END},
+ {"BEGIN", {klBEGIN, klBEGIN}, EXPR_END},
+ {"while", {kWHILE, kWHILE_MOD}, EXPR_BEG},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""},
+ {"alias", {kALIAS, kALIAS}, EXPR_FNAME}
+ };
+
+ if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
+ {
+ register int key = hash (str, len);
+
+ if (key <= MAX_HASH_VALUE && key >= 0)
+ {
+ register const char *s = wordlist[key].name;
+
+ if (*str == *s && !strcmp (str + 1, s + 1))
+ return &wordlist[key];
+ }
+ }
+ return 0;
+}
diff --git a/lex.c.blt b/lex.c.blt
deleted file mode 100644
index 1ae80990b9..0000000000
--- a/lex.c.blt
+++ /dev/null
@@ -1,219 +0,0 @@
-/* C code produced by gperf version 3.0.4 */
-/* Command-line: gperf -C -p -j1 -i 1 -g -o -t -N rb_reserved_word -k'1,3,$' defs/keywords */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
- && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
- && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
- && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
- && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
- && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
- && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
- && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
- && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
- && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
- && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
- && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
- && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
- && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
- && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
- && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
- && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
- && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
- && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
- && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
- && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
- && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
- && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646. */
-error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-#line 1 "defs/keywords"
-
-struct kwtable {const char *name; int id[2]; enum lex_state_e state;};
-const struct kwtable *rb_reserved_word(const char *, unsigned int);
-#ifndef RIPPER
-static const struct kwtable *reserved_word(const char *, unsigned int);
-#define rb_reserved_word(str, len) reserved_word(str, len)
-#line 9 "defs/keywords"
-struct kwtable;
-
-#define TOTAL_KEYWORDS 41
-#define MIN_WORD_LENGTH 2
-#define MAX_WORD_LENGTH 12
-#define MIN_HASH_VALUE 8
-#define MAX_HASH_VALUE 50
-/* maximum key range = 43, duplicates = 0 */
-
-#ifdef __GNUC__
-__inline
-#else
-#ifdef __cplusplus
-inline
-#endif
-#endif
-static unsigned int
-hash (str, len)
- register const char *str;
- register unsigned int len;
-{
- static const unsigned char asso_values[] =
- {
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 26, 51, 51, 14, 51, 16, 8,
- 11, 13, 51, 51, 51, 51, 10, 51, 13, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 11, 51, 13, 1, 26,
- 4, 1, 8, 28, 51, 23, 51, 1, 1, 27,
- 5, 19, 21, 51, 8, 3, 3, 11, 51, 21,
- 24, 16, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51
- };
- register int hval = len;
-
- switch (hval)
- {
- default:
- hval += asso_values[(unsigned char)str[2]];
- /*FALLTHROUGH*/
- case 2:
- case 1:
- hval += asso_values[(unsigned char)str[0]];
- break;
- }
- return hval + asso_values[(unsigned char)str[len - 1]];
-}
-
-#ifdef __GNUC__
-__inline
-#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__
-__attribute__ ((__gnu_inline__))
-#endif
-#endif
-const struct kwtable *
-rb_reserved_word (str, len)
- register const char *str;
- register unsigned int len;
-{
- static const struct kwtable wordlist[] =
- {
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 19 "defs/keywords"
- {"break", {keyword_break, keyword_break}, EXPR_MID},
-#line 25 "defs/keywords"
- {"else", {keyword_else, keyword_else}, EXPR_BEG},
-#line 35 "defs/keywords"
- {"nil", {keyword_nil, keyword_nil}, EXPR_END},
-#line 28 "defs/keywords"
- {"ensure", {keyword_ensure, keyword_ensure}, EXPR_BEG},
-#line 27 "defs/keywords"
- {"end", {keyword_end, keyword_end}, EXPR_END},
-#line 44 "defs/keywords"
- {"then", {keyword_then, keyword_then}, EXPR_BEG},
-#line 36 "defs/keywords"
- {"not", {keyword_not, keyword_not}, EXPR_ARG},
-#line 29 "defs/keywords"
- {"false", {keyword_false, keyword_false}, EXPR_END},
-#line 42 "defs/keywords"
- {"self", {keyword_self, keyword_self}, EXPR_END},
-#line 26 "defs/keywords"
- {"elsif", {keyword_elsif, keyword_elsif}, EXPR_VALUE},
-#line 39 "defs/keywords"
- {"rescue", {keyword_rescue, modifier_rescue}, EXPR_MID},
-#line 45 "defs/keywords"
- {"true", {keyword_true, keyword_true}, EXPR_END},
-#line 48 "defs/keywords"
- {"until", {keyword_until, modifier_until}, EXPR_VALUE},
-#line 47 "defs/keywords"
- {"unless", {keyword_unless, modifier_unless}, EXPR_VALUE},
-#line 41 "defs/keywords"
- {"return", {keyword_return, keyword_return}, EXPR_MID},
-#line 22 "defs/keywords"
- {"def", {keyword_def, keyword_def}, EXPR_FNAME},
-#line 17 "defs/keywords"
- {"and", {keyword_and, keyword_and}, EXPR_VALUE},
-#line 24 "defs/keywords"
- {"do", {keyword_do, keyword_do}, EXPR_BEG},
-#line 51 "defs/keywords"
- {"yield", {keyword_yield, keyword_yield}, EXPR_ARG},
-#line 30 "defs/keywords"
- {"for", {keyword_for, keyword_for}, EXPR_VALUE},
-#line 46 "defs/keywords"
- {"undef", {keyword_undef, keyword_undef}, EXPR_FNAME},
-#line 37 "defs/keywords"
- {"or", {keyword_or, keyword_or}, EXPR_VALUE},
-#line 32 "defs/keywords"
- {"in", {keyword_in, keyword_in}, EXPR_VALUE},
-#line 49 "defs/keywords"
- {"when", {keyword_when, keyword_when}, EXPR_VALUE},
-#line 40 "defs/keywords"
- {"retry", {keyword_retry, keyword_retry}, EXPR_END},
-#line 31 "defs/keywords"
- {"if", {keyword_if, modifier_if}, EXPR_VALUE},
-#line 20 "defs/keywords"
- {"case", {keyword_case, keyword_case}, EXPR_VALUE},
-#line 38 "defs/keywords"
- {"redo", {keyword_redo, keyword_redo}, EXPR_END},
-#line 34 "defs/keywords"
- {"next", {keyword_next, keyword_next}, EXPR_MID},
-#line 43 "defs/keywords"
- {"super", {keyword_super, keyword_super}, EXPR_ARG},
-#line 33 "defs/keywords"
- {"module", {keyword_module, keyword_module}, EXPR_VALUE},
-#line 18 "defs/keywords"
- {"begin", {keyword_begin, keyword_begin}, EXPR_BEG},
-#line 12 "defs/keywords"
- {"__LINE__", {keyword__LINE__, keyword__LINE__}, EXPR_END},
-#line 13 "defs/keywords"
- {"__FILE__", {keyword__FILE__, keyword__FILE__}, EXPR_END},
-#line 11 "defs/keywords"
- {"__ENCODING__", {keyword__ENCODING__, keyword__ENCODING__}, EXPR_END},
-#line 15 "defs/keywords"
- {"END", {keyword_END, keyword_END}, EXPR_END},
-#line 16 "defs/keywords"
- {"alias", {keyword_alias, keyword_alias}, EXPR_FNAME},
-#line 14 "defs/keywords"
- {"BEGIN", {keyword_BEGIN, keyword_BEGIN}, EXPR_END},
-#line 23 "defs/keywords"
- {"defined?", {keyword_defined, keyword_defined}, EXPR_ARG},
-#line 21 "defs/keywords"
- {"class", {keyword_class, keyword_class}, EXPR_CLASS},
- {""}, {""},
-#line 50 "defs/keywords"
- {"while", {keyword_while, modifier_while}, EXPR_VALUE}
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
- {
- register int key = hash (str, len);
-
- if (key <= MAX_HASH_VALUE && key >= 0)
- {
- register const char *s = wordlist[key].name;
-
- if (*str == *s && !strcmp (str + 1, s + 1))
- return &wordlist[key];
- }
- }
- return 0;
-}
-#line 52 "defs/keywords"
-
-#endif
diff --git a/lib/.document b/lib/.document
index d3c4a1369b..2159be8360 100644
--- a/lib/.document
+++ b/lib/.document
@@ -14,6 +14,7 @@ base64.rb
benchmark.rb
cgi
cgi.rb
+cgi-lib.rb
complex.rb
csv.rb
date
@@ -23,6 +24,7 @@ debug.rb
delegate.rb
drb
drb.rb
+e2mmap.rb
erb.rb
eregex.rb
fileutils.rb
@@ -59,13 +61,11 @@ pathname.rb
ping.rb
pp.rb
prettyprint.rb
-prime.rb
profile.rb
profiler.rb
pstore.rb
racc
rational.rb
-rdoc.rb
rdoc
readbytes.rb
resolv-replace.rb
@@ -81,8 +81,7 @@ set.rb
shell
shell.rb
shellwords.rb
-# TODO: YARV cause error. why ...?
-# singleton.rb
+singleton.rb
soap
sync.rb
tempfile.rb
diff --git a/lib/English.rb b/lib/English.rb
index 4fd53c5ec6..1a0e11de74 100644
--- a/lib/English.rb
+++ b/lib/English.rb
@@ -11,7 +11,7 @@
# With English:
#
# require "English"
-#
+#
# $OUTPUT_FIELD_SEPARATOR = ' -- '
# "waterbuffalo" =~ /buff/
# print $LOADED_FEATURES, $POSTMATCH, $PID, "\n"
@@ -83,7 +83,7 @@ alias $DEFAULT_OUTPUT $>
# of the contents of all the files
# given as command-line arguments, or <tt>$stdin</tt>
# (in the case where there are no
-# arguments). <tt>$<</tt> supports methods similar to a
+# arguments). <tt>$<</tt> supports methods similar to a
# +File+ object:
# +inmode+, +close+,
# <tt>closed?</tt>, +each+,
@@ -91,7 +91,7 @@ alias $DEFAULT_OUTPUT $>
# +eof+, <tt>eof?</tt>, +file+,
# +filename+, +fileno+,
# +getc+, +gets+, +lineno+,
-# <tt>lineno=</tt>, +path+,
+# <tt>lineno=</tt>, +path+,
# +pos+, <tt>pos=</tt>,
# +read+, +readchar+,
# +readline+, +readlines+,
@@ -139,12 +139,12 @@ alias $ARGV $*
alias $MATCH $&
# The string preceding the match in the last
-# successful pattern match. This variable is local to
+# successful pattern match. This variable is local to
# the current scope. Read only. Thread local.
alias $PREMATCH $`
# The string following the match in the last
-# successful pattern match. This variable is local to
+# successful pattern match. This variable is local to
# the current scope. Read only. Thread local.
alias $POSTMATCH $'
diff --git a/lib/Env.rb b/lib/Env.rb
new file mode 100644
index 0000000000..452a28659e
--- /dev/null
+++ b/lib/Env.rb
@@ -0,0 +1,18 @@
+# Env.rb -- imports environment variables as global variables, Perlish ;(
+# Usage:
+#
+# require 'Env'
+# p $USER
+# $USER = "matz"
+# p ENV["USER"]
+
+require 'importenv'
+
+if __FILE__ == $0
+ p $TERM
+ $TERM = nil
+ p $TERM
+ p ENV["TERM"]
+ $TERM = "foo"
+ p ENV["TERM"]
+end
diff --git a/lib/README b/lib/README
index a8bb9c8d3d..fa2bbd9635 100644
--- a/lib/README
+++ b/lib/README
@@ -1,38 +1,43 @@
English.rb lets Perl'ish global variables have English names
+Env.rb loads importenv.rb
README this file
-abbrev.rb abbreviation calculator
-base64.rb Base64 de- and encoder
+base64.rb encodes/decodes base64 (obsolete)
benchmark.rb a benchmark utility
+cgi-lib.rb simple CGI support library (old style)
cgi.rb CGI support library
cgi/session.rb CGI session class
-cmath.rb math support for complex numbers
-complex.rb includes cmath and set complex arithemtic as default (obsolete)
+complex.rb complex number support
csv.rb CSV parser/generator
date.rb date object
date/format.rb date parsing and formatting
+date2.rb date object (obsolete; use date)
debug.rb ruby debugger
delegate.rb delegates messages to other object
drb.rb distributed Ruby
e2mmap.rb exception utilities
erb.rb tiny eRuby library
+eregex.rb extended regular expression (just a proof of concept)
fileutils.rb file utilities
+finalize.rb adds finalizer to the object
find.rb traverses directory tree
forwardable.rb explicit delegation library
-gauntlet_rubygems.rb Gem package validator
+ftools.rb file tools
getoptlong.rb GNU getoptlong compatible
+getopts.rb parses command line options (use getoptlong)
gserver.rb general TCP server
+importenv.rb imports environment variables as global variables
ipaddr.rb defines the IPAddr class
irb.rb interactive ruby
+jcode.rb Japanese text handling (replace String methods)
logger.rb simple logging utility
-mathn.rb extended math operation (obsolete)
+mailread.rb reads mail headers
+mathn.rb extended math operation
matrix.rb matrix calculation library
-minitest/unit minimal drop-in replacement for test-unit
mkmf.rb Makefile maker
monitor.rb exclusive region monitor for thread
mutex_m.rb mutex mixin
net/ftp.rb ftp access
net/http.rb HTTP access
-net/https.rb HTTPS access
net/imap.rb IMAP4 access
net/pop.rb POP3 access
net/protocol.rb abstract class for net library (DO NOT USE)
@@ -43,31 +48,29 @@ open-uri.rb easy-to-use network interface using URI and Net
open3.rb opens subprocess connection stdin/stdout/stderr
optparse.rb command line option analysis
ostruct.rb python style object
+parsearg.rb argument parser using getopts
+parsedate.rb parses date string (obsolete)
pathname.rb Object-Oriented Pathname Class
+ping.rb checks whether host is up, using TCP echo.
pp.rb pretty print objects
prettyprint.rb pretty printing algorithm
-prime.rb prime numbers and factorization
profile.rb runs ruby profiler
profiler.rb ruby profiler module
pstore.rb persistent object strage using marshal
racc/parser.rb racc (Ruby yACC) runtime
-rake.rb Ruby Make
-rational.rb rational number support (obsolete)
-rdoc source-code documentation tool
+rational.rb rational number support
+rdoc source-code documentation tool
+readbytes.rb define IO#readbytes
resolv-replace.rb replace Socket DNS by resolve.rb
resolv.rb DNS resolver in Ruby
rexml an XML parser for Ruby, in Ruby
-rinda/rinda.rb Linda distributed computing paradigm for drb
-rinda/ring.rb RingServer for tuplespace
-rinda/tuplespace.rb tuplespace for drb
-rss.rb RSS parser/generator
-rubygems Ruby package management system
+rubyunit.rb original Ruby Unit testing framework
scanf.rb scanf for Ruby
-securerandom.rb Secure random number generator interface
set.rb defines the Set class
shell.rb runs commands and does pipeline operations like shell
shellwords.rb split into words like shell
singleton.rb singleton design pattern library
+soap SOAP 1.1 implementation
sync.rb 2 phase lock
tempfile.rb temporary file with automatic removal
test/unit Ruby Unit Testing Framework
@@ -78,16 +81,16 @@ timeout.rb provides timeout
tmpdir.rb retrieve temporary directory path
tracer.rb execution tracer
tsort.rb topological sorting
-ubygems.rb command line shortcut for RubyGems
un.rb Utilities to replace common UNIX commands in Makefiles etc
uri.rb URI support
uri/ftp.rb ftp scheme support
uri/http.rb http scheme support
uri/https.rb https scheme support
uri/ldap.rb ldap scheme support
-uri/ldaps.rb ldaps scheme support
uri/mailto.rb mailto scheme support
weakref.rb weak reference class
webrick.rb WEB server toolkit
+wsdl WSDL 1.1 implementation
xmlrpc XML-RPC implementation
+xsd XML Schema Datatypes implementation
yaml.rb YAML implementation
diff --git a/lib/base64.rb b/lib/base64.rb
index a240b730b4..8628d611b2 100644
--- a/lib/base64.rb
+++ b/lib/base64.rb
@@ -1,46 +1,46 @@
#
-# = base64.rb: methods for base64-encoding and -decoding strings
+# = base64.rb: methods for base64-encoding and -decoding stings
+#
+# Author:: Yukihiro Matsumoto
+# Documentation:: Dave Thomas and Gavin Sinclair
+#
+# Until Ruby 1.8.1, these methods were defined at the top-level. Now
+# they are in the Base64 module but included in the top-level, where
+# their usage is deprecated.
+#
+# See Base64 for documentation.
#
-# The Base64 module provides for the encoding (#encode64, #strict_encode64,
-# #urlsafe_encode64) and decoding (#decode64, #strict_decode64,
-# #urlsafe_decode64) of binary data using a Base64 representation.
+require "kconv"
+
+
+# The Base64 module provides for the encoding (#encode64) and decoding
+# (#decode64) of binary data using a Base64 representation.
+#
+# The following particular features are also provided:
+# - encode into lines of a given length (#b64encode)
+# - decode the special format specified in RFC2047 for the
+# representation of email headers (decode_b)
#
# == Example
#
-# A simple encoding and decoding.
-#
+# A simple encoding and decoding.
+#
# require "base64"
#
# enc = Base64.encode64('Send reinforcements')
-# # -> "U2VuZCByZWluZm9yY2VtZW50cw==\n"
+# # -> "U2VuZCByZWluZm9yY2VtZW50cw==\n"
# plain = Base64.decode64(enc)
# # -> "Send reinforcements"
#
# The purpose of using base64 to encode data is that it translates any
-# binary data into purely printable characters.
+# binary data into purely printable characters. It is specified in
+# RFC 2045 (http://www.faqs.org/rfcs/rfc2045.html).
module Base64
module_function
- # Returns the Base64-encoded version of +bin+.
- # This method complies with RFC 2045.
- # Line feeds are added to every 60 encoded charactors.
- #
- # require 'base64'
- # Base64.encode64("Now is the time for all good coders\nto learn Ruby")
- #
- # <i>Generates:</i>
- #
- # Tm93IGlzIHRoZSB0aW1lIGZvciBhbGwgZ29vZCBjb2RlcnMKdG8gbGVhcm4g
- # UnVieQ==
- def encode64(bin)
- [bin].pack("m")
- end
-
# Returns the Base64-decoded version of +str+.
- # This method complies with RFC 2045.
- # Characters outside the base alphabet are ignored.
#
# require 'base64'
# str = 'VGhpcyBpcyBsaW5lIG9uZQpUaGlzIG' +
@@ -54,38 +54,80 @@ module Base64
# This is line two
# This is line three
# And so on...
+
def decode64(str)
- str.unpack("m").first
+ str.unpack("m")[0]
end
- # Returns the Base64-encoded version of +bin+.
- # This method complies with RFC 4648.
- # No line feeds are added.
- def strict_encode64(bin)
- [bin].pack("m0")
- end
- # Returns the Base64-decoded version of +str+.
- # This method complies with RFC 4648.
- # ArgumentError is raised if +str+ is incorrectly padded or contains
- # non-alphabet characters. Note that CR or LF are also rejected.
- def strict_decode64(str)
- str.unpack("m0").first
+ # Decodes text formatted using a subset of RFC2047 (the one used for
+ # mime-encoding mail headers).
+ #
+ # Only supports an encoding type of 'b' (base 64), and only supports
+ # the character sets ISO-2022-JP and SHIFT_JIS (so the only two
+ # encoded word sequences recognized are <tt>=?ISO-2022-JP?B?...=</tt> and
+ # <tt>=?SHIFT_JIS?B?...=</tt>). Recognition of these sequences is case
+ # insensitive.
+
+ def decode_b(str)
+ str.gsub!(/=\?ISO-2022-JP\?B\?([!->@-~]+)\?=/i) {
+ decode64($1)
+ }
+ str = Kconv::toeuc(str)
+ str.gsub!(/=\?SHIFT_JIS\?B\?([!->@-~]+)\?=/i) {
+ decode64($1)
+ }
+ str = Kconv::toeuc(str)
+ str.gsub!(/\n/, ' ')
+ str.gsub!(/\0/, '')
+ str
end
- # Returns the Base64-encoded version of +bin+.
- # This method complies with ``Base 64 Encoding with URL and Filename Safe
- # Alphabet'' in RFC 4648.
- # The alphabet uses '-' instead of '+' and '_' instead of '/'.
- def urlsafe_encode64(bin)
- strict_encode64(bin).tr("+/", "-_")
+ # Returns the Base64-encoded version of +str+.
+ #
+ # require 'base64'
+ # Base64.b64encode("Now is the time for all good coders\nto learn Ruby")
+ #
+ # <i>Generates:</i>
+ #
+ # Tm93IGlzIHRoZSB0aW1lIGZvciBhbGwgZ29vZCBjb2RlcnMKdG8gbGVhcm4g
+ # UnVieQ==
+
+ def encode64(bin)
+ [bin].pack("m")
end
- # Returns the Base64-decoded version of +str+.
- # This method complies with ``Base 64 Encoding with URL and Filename Safe
- # Alphabet'' in RFC 4648.
- # The alphabet uses '-' instead of '+' and '_' instead of '/'.
- def urlsafe_decode64(str)
- strict_decode64(str.tr("-_", "+/"))
+ # _Prints_ the Base64 encoded version of +bin+ (a +String+) in lines of
+ # +len+ (default 60) characters.
+ #
+ # require 'base64'
+ # data = "Now is the time for all good coders\nto learn Ruby"
+ # Base64.b64encode(data)
+ #
+ # <i>Generates:</i>
+ #
+ # Tm93IGlzIHRoZSB0aW1lIGZvciBhbGwgZ29vZCBjb2RlcnMKdG8gbGVhcm4g
+ # UnVieQ==
+
+ def b64encode(bin, len = 60)
+ encode64(bin).scan(/.{1,#{len}}/) do
+ print $&, "\n"
+ end
+ end
+
+
+ module Deprecated # :nodoc:
+ include Base64
+
+ for m in Base64.private_instance_methods(false)
+ module_eval %{
+ def #{m}(*args)
+ warn("\#{caller(1)[0]}: #{m} is deprecated; use Base64.#{m} instead")
+ super
+ end
+ }
+ end
end
end
+
+include Base64::Deprecated
diff --git a/lib/benchmark.rb b/lib/benchmark.rb
index 9a0bbef596..a54700a1c2 100644
--- a/lib/benchmark.rb
+++ b/lib/benchmark.rb
@@ -1,13 +1,13 @@
=begin
#
-# benchmark.rb - a performance benchmarking library
-#
+# benchmark.rb - a performance benchmarking library
+#
# $Id$
-#
-# Created by Gotoken (gotoken@notwork.org).
+#
+# Created by Gotoken (gotoken@notwork.org).
#
# Documentation by Gotoken (original RD), Lyle Johnson (RDoc conversion), and
-# Gavin Sinclair (editing).
+# Gavin Sinclair (editing).
#
=end
@@ -26,15 +26,15 @@
# require 'benchmark'
#
# puts Benchmark.measure { "a"*1_000_000 }
-#
+#
# On my machine (FreeBSD 3.2 on P5, 100MHz) this generates:
-#
+#
# 1.166667 0.050000 1.216667 ( 0.571355)
-#
+#
# This report shows the user CPU time, system CPU time, the sum of
# the user and system CPU times, and the elapsed real time. The unit
# of time is seconds.
-#
+#
# * Do some experiments sequentially using the #bm method:
#
# require 'benchmark'
@@ -45,7 +45,7 @@
# x.report { n.times do ; a = "1"; end }
# x.report { 1.upto(n) do ; a = "1"; end }
# end
-#
+#
# The result:
#
# user system total real
@@ -63,14 +63,14 @@
# x.report("times:") { n.times do ; a = "1"; end }
# x.report("upto:") { 1.upto(n) do ; a = "1"; end }
# end
-#
+#
# The result:
-#
+#
# user system total real
# for: 1.050000 0.000000 1.050000 ( 0.503462)
# times: 1.533333 0.016667 1.550000 ( 0.735473)
# upto: 1.500000 0.016667 1.516667 ( 0.711239)
-#
+#
#
# * The times for some benchmarks depend on the order in which items
# are run. These differences are due to the cost of memory
@@ -79,21 +79,21 @@
# sort an array of floats:
#
# require 'benchmark'
-#
+#
# array = (1..1000000).map { rand }
-#
+#
# Benchmark.bmbm do |x|
# x.report("sort!") { array.dup.sort! }
# x.report("sort") { array.dup.sort }
# end
-#
+#
# The result:
-#
+#
# Rehearsal -----------------------------------------
# sort! 11.928000 0.010000 11.938000 ( 12.756000)
# sort 13.048000 0.020000 13.068000 ( 13.857000)
# ------------------------------- total: 25.006000sec
-#
+#
# user system total real
# sort! 12.959000 0.010000 12.969000 ( 13.793000)
# sort 12.007000 0.000000 12.007000 ( 12.791000)
@@ -103,7 +103,6 @@
# using the #benchmark method:
#
# require 'benchmark'
-# include Benchmark # we need the CAPTION and FMTSTR constants
#
# n = 50000
# Benchmark.benchmark(" "*7 + CAPTION, 7, FMTSTR, ">total:", ">avg:") do |x|
@@ -112,9 +111,9 @@
# tu = x.report("upto:") { 1.upto(n) do ; a = "1"; end }
# [tf+tt+tu, (tf+tt+tu)/3]
# end
-#
+#
# The result:
-#
+#
# user system total real
# for: 1.016667 0.016667 1.033333 ( 0.485749)
# times: 1.450000 0.016667 1.466667 ( 0.681367)
@@ -145,10 +144,10 @@ module Benchmark
# suitable for nearly all benchmarking requirements. See the examples in
# Benchmark, and the #bm and #bmbm methods.
#
- # Example:
+ # Example:
#
# require 'benchmark'
- # include Benchmark # we need the CAPTION and FMTSTR constants
+ # include Benchmark # we need the CAPTION and FMTSTR constants
#
# n = 50000
# Benchmark.benchmark(" "*7 + CAPTION, 7, FMTSTR, ">total:", ">avg:") do |x|
@@ -157,16 +156,16 @@ module Benchmark
# tu = x.report("upto:") { 1.upto(n) do ; a = "1"; end }
# [tf+tt+tu, (tf+tt+tu)/3]
# end
- #
+ #
# <i>Generates:</i>
- #
+ #
# user system total real
# for: 1.016667 0.016667 1.033333 ( 0.485749)
# times: 1.450000 0.016667 1.466667 ( 0.681367)
# upto: 1.533333 0.000000 1.533333 ( 0.722166)
# >total: 4.000000 0.033333 4.033333 ( 1.889282)
# >avg: 1.333333 0.011111 1.344444 ( 0.629761)
- #
+ #
def benchmark(caption = "", label_width = nil, fmtstr = nil, *labels) # :yield: report
sync = STDOUT.sync
@@ -177,7 +176,7 @@ module Benchmark
print caption
results = yield(Report.new(label_width, fmtstr))
Array === results and results.grep(Tms).each {|t|
- print((labels.shift || t.label || "").ljust(label_width),
+ print((labels.shift || t.label || "").ljust(label_width),
t.format(fmtstr))
}
STDOUT.sync = sync
@@ -186,7 +185,7 @@ module Benchmark
# A simple interface to the #benchmark method, #bm is generates sequential reports
# with labels. The parameters have the same meaning as for #benchmark.
- #
+ #
# require 'benchmark'
#
# n = 50000
@@ -195,9 +194,9 @@ module Benchmark
# x.report("times:") { n.times do ; a = "1"; end }
# x.report("upto:") { 1.upto(n) do ; a = "1"; end }
# end
- #
+ #
# <i>Generates:</i>
- #
+ #
# user system total real
# for: 1.050000 0.000000 1.050000 ( 0.503462)
# times: 1.533333 0.016667 1.550000 ( 0.735473)
@@ -224,21 +223,21 @@ module Benchmark
# calculate the required label width.
#
# require 'benchmark'
- #
+ #
# array = (1..1000000).map { rand }
- #
+ #
# Benchmark.bmbm do |x|
# x.report("sort!") { array.dup.sort! }
# x.report("sort") { array.dup.sort }
# end
- #
+ #
# <i>Generates:</i>
- #
+ #
# Rehearsal -----------------------------------------
# sort! 11.928000 0.010000 11.938000 ( 12.756000)
# sort 13.048000 0.020000 13.068000 ( 13.857000)
# ------------------------------- total: 25.006000sec
- #
+ #
# user system total real
# sort! 12.959000 0.010000 12.969000 ( 13.793000)
# sort 12.007000 0.000000 12.007000 ( 12.791000)
@@ -267,7 +266,7 @@ module Benchmark
ets = sum.format("total: %tsec")
printf("%s %s\n\n",
"-"*(width+CAPTION.length-ets.length-1), ets)
-
+
# take
print ' '*width, CAPTION
list = []
@@ -285,7 +284,7 @@ module Benchmark
ary
end
- #
+ #
# Returns the time used to execute the given block as a
# Benchmark::Tms object.
#
@@ -293,10 +292,10 @@ module Benchmark
t0, r0 = Benchmark.times, Time.now
yield
t1, r1 = Benchmark.times, Time.now
- Benchmark::Tms.new(t1.utime - t0.utime,
- t1.stime - t0.stime,
- t1.cutime - t0.cutime,
- t1.cstime - t0.cstime,
+ Benchmark::Tms.new(t1.utime - t0.utime,
+ t1.stime - t0.stime,
+ t1.cutime - t0.cutime,
+ t1.cstime - t0.cstime,
r1.to_f - r0.to_f,
label)
end
@@ -323,8 +322,8 @@ module Benchmark
# Usually, one doesn't call this method directly, as new
# Job objects are created by the #bmbm method.
# _width_ is a initial value for the label offset used in formatting;
- # the #bmbm method passes its _width_ argument to this constructor.
- #
+ # the #bmbm method passes its _width_ argument to this constructor.
+ #
def initialize(width)
@width = width
@list = []
@@ -343,11 +342,11 @@ module Benchmark
end
alias report item
-
+
# An array of 2-element arrays, consisting of label and block pairs.
attr_reader :list
-
- # Length of the widest label in the #list, plus one.
+
+ # Length of the widest label in the #list, plus one.
attr_reader :width
end
@@ -363,10 +362,10 @@ module Benchmark
#
# Returns an initialized Report instance.
# Usually, one doesn't call this method directly, as new
- # Report objects are created by the #benchmark and #bm methods.
- # _width_ and _fmtstr_ are the label offset and
- # format string used by Tms#format.
- #
+ # Report objects are created by the #benchmark and #bm methods.
+ # _width_ and _fmtstr_ are the label offset and
+ # format string used by Tms#format.
+ #
def initialize(width = 0, fmtstr = nil)
@width, @fmtstr = width, fmtstr
end
@@ -398,50 +397,50 @@ module Benchmark
# User CPU time
attr_reader :utime
-
+
# System CPU time
attr_reader :stime
-
+
# User CPU time of children
attr_reader :cutime
-
+
# System CPU time of children
attr_reader :cstime
-
+
# Elapsed real time
attr_reader :real
-
- # Total time, that is _utime_ + _stime_ + _cutime_ + _cstime_
+
+ # Total time, that is _utime_ + _stime_ + _cutime_ + _cstime_
attr_reader :total
-
+
# Label
attr_reader :label
#
# Returns an initialized Tms object which has
- # _u_ as the user CPU time, _s_ as the system CPU time,
+ # _u_ as the user CPU time, _s_ as the system CPU time,
# _cu_ as the children's user CPU time, _cs_ as the children's
# system CPU time, _real_ as the elapsed real time and _l_
- # as the label.
- #
+ # as the label.
+ #
def initialize(u = 0.0, s = 0.0, cu = 0.0, cs = 0.0, real = 0.0, l = nil)
@utime, @stime, @cutime, @cstime, @real, @label = u, s, cu, cs, real, l
@total = @utime + @stime + @cutime + @cstime
end
- #
+ #
# Returns a new Tms object whose times are the sum of the times for this
# Tms object, plus the time required to execute the code block (_blk_).
- #
+ #
def add(&blk) # :yield:
- self + Benchmark::measure(&blk)
+ self + Benchmark::measure(&blk)
end
- #
+ #
# An in-place version of #add.
- #
+ #
def add!
- t = Benchmark::measure(&blk)
+ t = Benchmark::measure(&blk)
@utime = utime + t.utime
@stime = stime + t.stime
@cutime = cutime + t.cutime
@@ -450,32 +449,32 @@ module Benchmark
self
end
- #
+ #
# Returns a new Tms object obtained by memberwise summation
# of the individual times for this Tms object with those of the other
# Tms object.
- # This method and #/() are useful for taking statistics.
- #
+ # This method and #/() are useful for taking statistics.
+ #
def +(other); memberwise(:+, other) end
-
+
#
# Returns a new Tms object obtained by memberwise subtraction
# of the individual times for the other Tms object from those of this
# Tms object.
#
def -(other); memberwise(:-, other) end
-
+
#
# Returns a new Tms object obtained by memberwise multiplication
# of the individual times for this Tms object by _x_.
#
def *(x); memberwise(:*, x) end
- #
+ #
# Returns a new Tms object obtained by memberwise division
# of the individual times for this Tms object by _x_.
- # This method and #+() are useful for taking statistics.
- #
+ # This method and #+() are useful for taking statistics.
+ #
def /(x); memberwise(:/, x) end
#
@@ -486,15 +485,15 @@ module Benchmark
#
# <tt>%u</tt>:: Replaced by the user CPU time, as reported by Tms#utime.
# <tt>%y</tt>:: Replaced by the system CPU time, as reported by #stime (Mnemonic: y of "s*y*stem")
- # <tt>%U</tt>:: Replaced by the children's user CPU time, as reported by Tms#cutime
+ # <tt>%U</tt>:: Replaced by the children's user CPU time, as reported by Tms#cutime
# <tt>%Y</tt>:: Replaced by the children's system CPU time, as reported by Tms#cstime
# <tt>%t</tt>:: Replaced by the total CPU time, as reported by Tms#total
# <tt>%r</tt>:: Replaced by the elapsed real time, as reported by Tms#real
# <tt>%n</tt>:: Replaced by the label string, as reported by Tms#label (Mnemonic: n of "*n*ame")
- #
+ #
# If _fmtstr_ is not given, FMTSTR is used as default value, detailing the
# user, system and real elapsed time.
- #
+ #
def format(arg0 = nil, *args)
fmtstr = (arg0 || FMTSTR).dup
fmtstr.gsub!(/(%[-+\.\d]*)n/){"#{$1}s" % label}
@@ -507,19 +506,19 @@ module Benchmark
arg0 ? Kernel::format(fmtstr, *args) : fmtstr
end
- #
+ #
# Same as #format.
- #
+ #
def to_s
format
end
- #
+ #
# Returns a new 6-element array, consisting of the
# label, user CPU time, system CPU time, children's
# user CPU time, children's system CPU time and elapsed
# real time.
- #
+ #
def to_a
[@label, @utime, @stime, @cutime, @cstime, @real]
end
@@ -548,7 +547,7 @@ module Benchmark
# The default caption string (heading above the output times).
CAPTION = Benchmark::Tms::CAPTION
- # The default format string used to display times. See also Benchmark::Tms#format.
+ # The default format string used to display times. See also Benchmark::Tms#format.
FMTSTR = Benchmark::Tms::FMTSTR
end
diff --git a/lib/cgi-lib.rb b/lib/cgi-lib.rb
new file mode 100644
index 0000000000..d6b60d66cc
--- /dev/null
+++ b/lib/cgi-lib.rb
@@ -0,0 +1,272 @@
+warn "Warning:#{caller[0].sub(/:in `.*'\z/, '')}: cgi-lib is deprecated after Ruby 1.8.1; use cgi instead"
+
+=begin
+
+= simple CGI support library
+
+= example
+
+== get form values
+
+ require "cgi-lib.rb"
+ query = CGI.new
+ query['field'] # <== value of 'field'
+ query.keys # <== array of fields
+
+and query has Hash class methods
+
+
+== get cookie values
+
+ require "cgi-lib.rb"
+ query = CGI.new
+ query.cookie['name'] # <== cookie value of 'name'
+ query.cookie.keys # <== all cookie names
+
+and query.cookie has Hash class methods
+
+
+== print HTTP header and HTML string to $>
+
+ require "cgi-lib.rb"
+ CGI::print{
+ CGI::tag("HTML"){
+ CGI::tag("HEAD"){ CGI::tag("TITLE"){"TITLE"} } +
+ CGI::tag("BODY"){
+ CGI::tag("FORM", {"ACTION"=>"test.rb", "METHOD"=>"POST"}){
+ CGI::tag("INPUT", {"TYPE"=>"submit", "VALUE"=>"submit"})
+ } +
+ CGI::tag("HR")
+ }
+ }
+ }
+
+
+== make raw cookie string
+
+ require "cgi-lib.rb"
+ cookie1 = CGI::cookie({'name' => 'name',
+ 'value' => 'value',
+ 'path' => 'path', # optional
+ 'domain' => 'domain', # optional
+ 'expires' => Time.now, # optional
+ 'secure' => true # optional
+ })
+
+ CGI::print("Content-Type: text/html", cookie1, cookie2){ "string" }
+
+
+== print HTTP header and string to $>
+
+ require "cgi-lib.rb"
+ CGI::print{ "string" }
+ # == CGI::print("Content-Type: text/html"){ "string" }
+ CGI::print("Content-Type: text/html", cookie1, cookie2){ "string" }
+
+
+=== NPH (no-parse-header) mode
+
+ require "cgi-lib.rb"
+ CGI::print("nph"){ "string" }
+ # == CGI::print("nph", "Content-Type: text/html"){ "string" }
+ CGI::print("nph", "Content-Type: text/html", cookie1, cookie2){ "string" }
+
+
+== make HTML tag string
+
+ require "cgi-lib.rb"
+ CGI::tag("element", {"attribute_name"=>"attribute_value"}){"content"}
+
+
+== make HTTP header string
+
+ require "cgi-lib.rb"
+ CGI::header # == CGI::header("Content-Type: text/html")
+ CGI::header("Content-Type: text/html", cookie1, cookie2)
+
+
+=== NPH (no-parse-header) mode
+
+ CGI::header("nph") # == CGI::header("nph", "Content-Type: text/html")
+ CGI::header("nph", "Content-Type: text/html", cookie1, cookie2)
+
+
+== escape url encode
+
+ require "cgi-lib.rb"
+ url_encoded_string = CGI::escape("string")
+
+
+== unescape url encoded
+
+ require "cgi-lib.rb"
+ string = CGI::unescape("url encoded string")
+
+
+== escape HTML &"<>
+
+ require "cgi-lib.rb"
+ CGI::escapeHTML("string")
+
+
+=end
+
+require "delegate"
+
+class CGI < SimpleDelegator
+
+ CR = "\015"
+ LF = "\012"
+ EOL = CR + LF
+
+ RFC822_DAYS = %w[ Sun Mon Tue Wed Thu Fri Sat ]
+ RFC822_MONTHS = %w[ Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec ]
+
+ # make rfc1123 date string
+ def CGI::rfc1123_date(time)
+ t = time.clone.gmtime
+ return format("%s, %.2d %s %d %.2d:%.2d:%.2d GMT",
+ RFC822_DAYS[t.wday], t.day, RFC822_MONTHS[t.month-1], t.year,
+ t.hour, t.min, t.sec)
+ end
+
+ # escape url encode
+ def CGI::escape(str)
+ str.gsub(/[^a-zA-Z0-9_\-.]/n){ sprintf("%%%02X", $&.unpack("C")[0]) }
+ end
+
+ # unescape url encoded
+ def CGI::unescape(str)
+ str.gsub(/\+/, ' ').gsub(/%([0-9a-fA-F]{2})/){ [$1.hex].pack("c") }
+ end
+
+ # escape HTML
+ def CGI::escapeHTML(str)
+ str.gsub(/&/, "&amp;").gsub(/\"/, "&quot;").gsub(/>/, "&gt;").gsub(/</, "&lt;")
+ end
+
+ # offline mode. read name=value pairs on standard input.
+ def read_from_cmdline
+ require "shellwords.rb"
+ words = Shellwords.shellwords(
+ if not ARGV.empty?
+ ARGV.join(' ')
+ else
+ STDERR.print "(offline mode: enter name=value pairs on standard input)\n" if STDIN.tty?
+ readlines.join(' ').gsub(/\n/, '')
+ end.gsub(/\\=/, '%3D').gsub(/\\&/, '%26'))
+
+ if words.find{|x| x =~ /=/} then words.join('&') else words.join('+') end
+ end
+
+ def initialize(input = $stdin)
+
+ @inputs = {}
+ @cookie = {}
+
+ case ENV['REQUEST_METHOD']
+ when "GET"
+ ENV['QUERY_STRING'] or ""
+ when "POST"
+ input.read(Integer(ENV['CONTENT_LENGTH'])) or ""
+ else
+ read_from_cmdline
+ end.split(/[&;]/).each do |x|
+ key, val = x.split(/=/,2).collect{|x|CGI::unescape(x)}
+ if @inputs.include?(key)
+ @inputs[key] += "\0" + (val or "")
+ else
+ @inputs[key] = (val or "")
+ end
+ end
+
+ super(@inputs)
+
+ if ENV.has_key?('HTTP_COOKIE') or ENV.has_key?('COOKIE')
+ (ENV['HTTP_COOKIE'] or ENV['COOKIE']).split(/; /).each do |x|
+ key, val = x.split(/=/,2)
+ key = CGI::unescape(key)
+ val = val.split(/&/).collect{|x|CGI::unescape(x)}.join("\0")
+ if @cookie.include?(key)
+ @cookie[key] += "\0" + val
+ else
+ @cookie[key] = val
+ end
+ end
+ end
+ end
+
+ attr("inputs")
+ attr("cookie")
+
+ # make HTML tag string
+ def CGI::tag(element, attributes = {})
+ "<" + escapeHTML(element) + attributes.collect{|name, value|
+ " " + escapeHTML(name) + '="' + escapeHTML(value) + '"'
+ }.to_s + ">" +
+ (iterator? ? yield.to_s + "</" + escapeHTML(element) + ">" : "")
+ end
+
+ # make raw cookie string
+ def CGI::cookie(options)
+ "Set-Cookie: " + options['name'] + '=' + escape(options['value']) +
+ (options['domain'] ? '; domain=' + options['domain'] : '') +
+ (options['path'] ? '; path=' + options['path'] : '') +
+ (options['expires'] ? '; expires=' + rfc1123_date(options['expires']) : '') +
+ (options['secure'] ? '; secure' : '')
+ end
+
+ # make HTTP header string
+ def CGI::header(*options)
+ if defined?(MOD_RUBY)
+ options.each{|option|
+ option.sub(/(.*?): (.*)/){
+ Apache::request.headers_out[$1] = $2
+ }
+ }
+ Apache::request.send_http_header
+ ''
+ else
+ if options.delete("nph") or (ENV['SERVER_SOFTWARE'] =~ /IIS/)
+ [(ENV['SERVER_PROTOCOL'] or "HTTP/1.0") + " 200 OK",
+ "Date: " + rfc1123_date(Time.now),
+ "Server: " + (ENV['SERVER_SOFTWARE'] or ""),
+ "Connection: close"] +
+ (options.empty? ? ["Content-Type: text/html"] : options)
+ else
+ options.empty? ? ["Content-Type: text/html"] : options
+ end.join(EOL) + EOL + EOL
+ end
+ end
+
+ # print HTTP header and string to $>
+ def CGI::print(*options)
+ $>.print CGI::header(*options) + yield.to_s
+ end
+
+ # print message to $>
+ def CGI::message(message, title = "", header = ["Content-Type: text/html"])
+ if message.kind_of?(Hash)
+ title = message['title']
+ header = message['header']
+ message = message['body']
+ end
+ CGI::print(*header){
+ CGI::tag("HTML"){
+ CGI::tag("HEAD"){ CGI.tag("TITLE"){ title } } +
+ CGI::tag("BODY"){ message }
+ }
+ }
+ true
+ end
+
+ # print error message to $> and exit
+ def CGI::error
+ CGI::message({'title'=>'ERROR', 'body'=>
+ CGI::tag("PRE"){
+ "ERROR: " + CGI::tag("STRONG"){ escapeHTML($!.to_s) } + "\n" + escapeHTML($@.join("\n"))
+ }
+ })
+ exit
+ end
+end
diff --git a/lib/cgi.rb b/lib/cgi.rb
index 6355a92804..e616534221 100644
--- a/lib/cgi.rb
+++ b/lib/cgi.rb
@@ -1,14 +1,14 @@
-#
+#
# cgi.rb - cgi support library
-#
+#
# Copyright (C) 2000 Network Applied Communication Laboratory, Inc.
-#
+#
# Copyright (C) 2000 Information-technology Promotion Agency, Japan
#
# Author: Wakou Aoyama <wakou@ruby-lang.org>
#
-# Documentation: Wakou Aoyama (RDoc'd and embellished by William Webber)
-#
+# Documentation: Wakou Aoyama (RDoc'd and embellished by William Webber)
+#
# == Overview
#
# The Common Gateway Interface (CGI) is a simple protocol
@@ -18,7 +18,7 @@
# parameters of the request passed in either in the
# environment (GET) or via $stdin (POST), and everything
# it prints to $stdout is returned to the client.
-#
+#
# This file holds the +CGI+ class. This class provides
# functionality for retrieving HTTP request parameters,
# managing cookies, and generating HTML output. See the
@@ -30,7 +30,9 @@
# See http://www.w3.org/CGI/ for more information on the CGI
# protocol.
-raise "Please, use ruby 1.9.0 or later." if RUBY_VERSION < "1.9.0"
+raise "Please, use ruby 1.5.4 or later." if RUBY_VERSION < "1.5.4"
+
+require 'English'
# CGI class. See documentation for the file cgi.rb for an overview
# of the CGI protocol.
@@ -75,18 +77,18 @@ raise "Please, use ruby 1.9.0 or later." if RUBY_VERSION < "1.9.0"
#
#
# For each of these variables, there is a corresponding attribute with the
-# same name, except all lower case and without a preceding HTTP_.
+# same name, except all lower case and without a preceding HTTP_.
# +content_length+ and +server_port+ are integers; the rest are strings.
#
# === Parameters
#
# The method #params() returns a hash of all parameters in the request as
# name/value-list pairs, where the value-list is an Array of one or more
-# values. The CGI object itself also behaves as a hash of parameter names
-# to values, but only returns a single value (as a String) for each
+# values. The CGI object itself also behaves as a hash of parameter names
+# to values, but only returns a single value (as a String) for each
# parameter name.
#
-# For instance, suppose the request contains the parameter
+# For instance, suppose the request contains the parameter
# "favourite_colours" with the multiple values "blue" and "green". The
# following behaviour would occur:
#
@@ -105,7 +107,7 @@ raise "Please, use ruby 1.9.0 or later." if RUBY_VERSION < "1.9.0"
#
# === Multipart requests
#
-# If a request's method is POST and its content type is multipart/form-data,
+# If a request's method is POST and its content type is multipart/form-data,
# then it may contain uploaded files. These are stored by the QueryExtension
# module in the parameters of the request. The parameter name is the name
# attribute of the file input field, as usual. However, the value is not
@@ -136,7 +138,7 @@ raise "Please, use ruby 1.9.0 or later." if RUBY_VERSION < "1.9.0"
#
# Each HTML element has a corresponding method for generating that
# element as a String. The name of this method is the same as that
-# of the element, all lowercase. The attributes of the element are
+# of the element, all lowercase. The attributes of the element are
# passed in as a hash, and the body as a no-argument block that evaluates
# to a String. The HTML generation module knows which elements are
# always empty, and silently drops any passed-in body. It also knows
@@ -150,57 +152,57 @@ raise "Please, use ruby 1.9.0 or later." if RUBY_VERSION < "1.9.0"
# as arguments, rather than via a hash.
#
# == Examples of use
-#
+#
# === Get form values
-#
+#
# require "cgi"
# cgi = CGI.new
# value = cgi['field_name'] # <== value string for 'field_name'
# # if not 'field_name' included, then return "".
# fields = cgi.keys # <== array of field names
-#
+#
# # returns true if form has 'field_name'
# cgi.has_key?('field_name')
# cgi.has_key?('field_name')
# cgi.include?('field_name')
-#
-# CAUTION! cgi['field_name'] returned an Array with the old
+#
+# CAUTION! cgi['field_name'] returned an Array with the old
# cgi.rb(included in ruby 1.6)
-#
+#
# === Get form values as hash
-#
+#
# require "cgi"
# cgi = CGI.new
# params = cgi.params
-#
+#
# cgi.params is a hash.
-#
+#
# cgi.params['new_field_name'] = ["value"] # add new param
# cgi.params['field_name'] = ["new_value"] # change value
# cgi.params.delete('field_name') # delete param
# cgi.params.clear # delete all params
-#
-#
+#
+#
# === Save form values to file
-#
+#
# require "pstore"
# db = PStore.new("query.db")
# db.transaction do
# db["params"] = cgi.params
# end
-#
-#
+#
+#
# === Restore form values from file
-#
+#
# require "pstore"
# db = PStore.new("query.db")
# db.transaction do
# cgi.params = db["params"]
# end
-#
-#
+#
+#
# === Get multipart form values
-#
+#
# require "cgi"
# cgi = CGI.new
# value = cgi['field_name'] # <== value string for 'field_name'
@@ -208,37 +210,37 @@ raise "Please, use ruby 1.9.0 or later." if RUBY_VERSION < "1.9.0"
# value.local_path # <== path to local file of value
# value.original_filename # <== original filename of value
# value.content_type # <== content_type of value
-#
+#
# and value has StringIO or Tempfile class methods.
-#
+#
# === Get cookie values
-#
+#
# require "cgi"
# cgi = CGI.new
# values = cgi.cookies['name'] # <== array of 'name'
# # if not 'name' included, then return [].
# names = cgi.cookies.keys # <== array of cookie names
-#
+#
# and cgi.cookies is a hash.
-#
+#
# === Get cookie objects
-#
+#
# require "cgi"
# cgi = CGI.new
# for name, cookie in cgi.cookies
# cookie.expires = Time.now + 30
# end
# cgi.out("cookie" => cgi.cookies) {"string"}
-#
+#
# cgi.cookies # { "name1" => cookie1, "name2" => cookie2, ... }
-#
+#
# require "cgi"
# cgi = CGI.new
# cgi.cookies['name'].expires = Time.now + 30
# cgi.out("cookie" => cgi.cookies['name']) {"string"}
-#
+#
# === Print http header and html string to $DEFAULT_OUTPUT ($>)
-#
+#
# require "cgi"
# cgi = CGI.new("html3") # add HTML generation methods
# cgi.out() do
@@ -262,13 +264,2045 @@ raise "Please, use ruby 1.9.0 or later." if RUBY_VERSION < "1.9.0"
# end
# end
# end
-#
+#
# # add HTML generation methods
# CGI.new("html3") # html3.2
# CGI.new("html4") # html4.01 (Strict)
# CGI.new("html4Tr") # html4.01 Transitional
# CGI.new("html4Fr") # html4.01 Frameset
#
-require 'cgi/core'
-require 'cgi/cookie'
-require 'cgi/util'
+class CGI
+
+ # :stopdoc:
+
+ # String for carriage return
+ CR = "\015"
+
+ # String for linefeed
+ LF = "\012"
+
+ # Standard internet newline sequence
+ EOL = CR + LF
+
+ REVISION = '$Id$' #:nodoc:
+
+ NEEDS_BINMODE = true if /WIN/ni.match(RUBY_PLATFORM)
+
+ # Path separators in different environments.
+ PATH_SEPARATOR = {'UNIX'=>'/', 'WINDOWS'=>'\\', 'MACINTOSH'=>':'}
+
+ # HTTP status codes.
+ HTTP_STATUS = {
+ "OK" => "200 OK",
+ "PARTIAL_CONTENT" => "206 Partial Content",
+ "MULTIPLE_CHOICES" => "300 Multiple Choices",
+ "MOVED" => "301 Moved Permanently",
+ "REDIRECT" => "302 Found",
+ "NOT_MODIFIED" => "304 Not Modified",
+ "BAD_REQUEST" => "400 Bad Request",
+ "AUTH_REQUIRED" => "401 Authorization Required",
+ "FORBIDDEN" => "403 Forbidden",
+ "NOT_FOUND" => "404 Not Found",
+ "METHOD_NOT_ALLOWED" => "405 Method Not Allowed",
+ "NOT_ACCEPTABLE" => "406 Not Acceptable",
+ "LENGTH_REQUIRED" => "411 Length Required",
+ "PRECONDITION_FAILED" => "412 Rrecondition Failed",
+ "SERVER_ERROR" => "500 Internal Server Error",
+ "NOT_IMPLEMENTED" => "501 Method Not Implemented",
+ "BAD_GATEWAY" => "502 Bad Gateway",
+ "VARIANT_ALSO_VARIES" => "506 Variant Also Negotiates"
+ }
+
+ # Abbreviated day-of-week names specified by RFC 822
+ RFC822_DAYS = %w[ Sun Mon Tue Wed Thu Fri Sat ]
+
+ # Abbreviated month names specified by RFC 822
+ RFC822_MONTHS = %w[ Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec ]
+
+ # :startdoc:
+
+ def env_table
+ ENV
+ end
+
+ def stdinput
+ $stdin
+ end
+
+ def stdoutput
+ $DEFAULT_OUTPUT
+ end
+
+ private :env_table, :stdinput, :stdoutput
+
+ # URL-encode a string.
+ # url_encoded_string = CGI::escape("'Stop!' said Fred")
+ # # => "%27Stop%21%27+said+Fred"
+ def CGI::escape(string)
+ string.gsub(/([^ a-zA-Z0-9_.-]+)/n) do
+ '%' + $1.unpack('H2' * $1.size).join('%').upcase
+ end.tr(' ', '+')
+ end
+
+
+ # URL-decode a string.
+ # string = CGI::unescape("%27Stop%21%27+said+Fred")
+ # # => "'Stop!' said Fred"
+ def CGI::unescape(string)
+ string.tr('+', ' ').gsub(/((?:%[0-9a-fA-F]{2})+)/n) do
+ [$1.delete('%')].pack('H*')
+ end
+ end
+
+
+ # Escape special characters in HTML, namely &\"<>
+ # CGI::escapeHTML('Usage: foo "bar" <baz>')
+ # # => "Usage: foo &quot;bar&quot; &lt;baz&gt;"
+ def CGI::escapeHTML(string)
+ string.gsub(/&/n, '&amp;').gsub(/\"/n, '&quot;').gsub(/>/n, '&gt;').gsub(/</n, '&lt;')
+ end
+
+
+ # Unescape a string that has been HTML-escaped
+ # CGI::unescapeHTML("Usage: foo &quot;bar&quot; &lt;baz&gt;")
+ # # => "Usage: foo \"bar\" <baz>"
+ def CGI::unescapeHTML(string)
+ string.gsub(/&(amp|quot|gt|lt|\#[0-9]+|\#x[0-9A-Fa-f]+);/n) do
+ match = $1.dup
+ case match
+ when 'amp' then '&'
+ when 'quot' then '"'
+ when 'gt' then '>'
+ when 'lt' then '<'
+ when /\A#0*(\d+)\z/n then
+ if Integer($1) < 256
+ Integer($1).chr
+ else
+ if Integer($1) < 65536 and ($KCODE[0] == ?u or $KCODE[0] == ?U)
+ [Integer($1)].pack("U")
+ else
+ "&##{$1};"
+ end
+ end
+ when /\A#x([0-9a-f]+)\z/ni then
+ if $1.hex < 256
+ $1.hex.chr
+ else
+ if $1.hex < 65536 and ($KCODE[0] == ?u or $KCODE[0] == ?U)
+ [$1.hex].pack("U")
+ else
+ "&#x#{$1};"
+ end
+ end
+ else
+ "&#{match};"
+ end
+ end
+ end
+
+
+ # Escape only the tags of certain HTML elements in +string+.
+ #
+ # Takes an element or elements or array of elements. Each element
+ # is specified by the name of the element, without angle brackets.
+ # This matches both the start and the end tag of that element.
+ # The attribute list of the open tag will also be escaped (for
+ # instance, the double-quotes surrounding attribute values).
+ #
+ # print CGI::escapeElement('<BR><A HREF="url"></A>', "A", "IMG")
+ # # "<BR>&lt;A HREF=&quot;url&quot;&gt;&lt;/A&gt"
+ #
+ # print CGI::escapeElement('<BR><A HREF="url"></A>', ["A", "IMG"])
+ # # "<BR>&lt;A HREF=&quot;url&quot;&gt;&lt;/A&gt"
+ def CGI::escapeElement(string, *elements)
+ elements = elements[0] if elements[0].kind_of?(Array)
+ unless elements.empty?
+ string.gsub(/<\/?(?:#{elements.join("|")})(?!\w)(?:.|\n)*?>/ni) do
+ CGI::escapeHTML($&)
+ end
+ else
+ string
+ end
+ end
+
+
+ # Undo escaping such as that done by CGI::escapeElement()
+ #
+ # print CGI::unescapeElement(
+ # CGI::escapeHTML('<BR><A HREF="url"></A>'), "A", "IMG")
+ # # "&lt;BR&gt;<A HREF="url"></A>"
+ #
+ # print CGI::unescapeElement(
+ # CGI::escapeHTML('<BR><A HREF="url"></A>'), ["A", "IMG"])
+ # # "&lt;BR&gt;<A HREF="url"></A>"
+ def CGI::unescapeElement(string, *elements)
+ elements = elements[0] if elements[0].kind_of?(Array)
+ unless elements.empty?
+ string.gsub(/&lt;\/?(?:#{elements.join("|")})(?!\w)(?:.|\n)*?&gt;/ni) do
+ CGI::unescapeHTML($&)
+ end
+ else
+ string
+ end
+ end
+
+
+ # Format a +Time+ object as a String using the format specified by RFC 1123.
+ #
+ # CGI::rfc1123_date(Time.now)
+ # # Sat, 01 Jan 2000 00:00:00 GMT
+ def CGI::rfc1123_date(time)
+ t = time.clone.gmtime
+ return format("%s, %.2d %s %.4d %.2d:%.2d:%.2d GMT",
+ RFC822_DAYS[t.wday], t.day, RFC822_MONTHS[t.month-1], t.year,
+ t.hour, t.min, t.sec)
+ end
+
+
+ # Create an HTTP header block as a string.
+ #
+ # Includes the empty line that ends the header block.
+ #
+ # +options+ can be a string specifying the Content-Type (defaults
+ # to text/html), or a hash of header key/value pairs. The following
+ # header keys are recognized:
+ #
+ # type:: the Content-Type header. Defaults to "text/html"
+ # charset:: the charset of the body, appended to the Content-Type header.
+ # nph:: a boolean value. If true, prepend protocol string and status code, and
+ # date; and sets default values for "server" and "connection" if not
+ # explicitly set.
+ # status:: the HTTP status code, returned as the Status header. See the
+ # list of available status codes below.
+ # server:: the server software, returned as the Server header.
+ # connection:: the connection type, returned as the Connection header (for
+ # instance, "close".
+ # length:: the length of the content that will be sent, returned as the
+ # Content-Length header.
+ # language:: the language of the content, returned as the Content-Language
+ # header.
+ # expires:: the time on which the current content expires, as a +Time+
+ # object, returned as the Expires header.
+ # cookie:: a cookie or cookies, returned as one or more Set-Cookie headers.
+ # The value can be the literal string of the cookie; a CGI::Cookie
+ # object; an Array of literal cookie strings or Cookie objects; or a
+ # hash all of whose values are literal cookie strings or Cookie objects.
+ # These cookies are in addition to the cookies held in the
+ # @output_cookies field.
+ #
+ # Other header lines can also be set; they are appended as key: value.
+ #
+ # header
+ # # Content-Type: text/html
+ #
+ # header("text/plain")
+ # # Content-Type: text/plain
+ #
+ # header("nph" => true,
+ # "status" => "OK", # == "200 OK"
+ # # "status" => "200 GOOD",
+ # "server" => ENV['SERVER_SOFTWARE'],
+ # "connection" => "close",
+ # "type" => "text/html",
+ # "charset" => "iso-2022-jp",
+ # # Content-Type: text/html; charset=iso-2022-jp
+ # "length" => 103,
+ # "language" => "ja",
+ # "expires" => Time.now + 30,
+ # "cookie" => [cookie1, cookie2],
+ # "my_header1" => "my_value"
+ # "my_header2" => "my_value")
+ #
+ # The status codes are:
+ #
+ # "OK" --> "200 OK"
+ # "PARTIAL_CONTENT" --> "206 Partial Content"
+ # "MULTIPLE_CHOICES" --> "300 Multiple Choices"
+ # "MOVED" --> "301 Moved Permanently"
+ # "REDIRECT" --> "302 Found"
+ # "NOT_MODIFIED" --> "304 Not Modified"
+ # "BAD_REQUEST" --> "400 Bad Request"
+ # "AUTH_REQUIRED" --> "401 Authorization Required"
+ # "FORBIDDEN" --> "403 Forbidden"
+ # "NOT_FOUND" --> "404 Not Found"
+ # "METHOD_NOT_ALLOWED" --> "405 Method Not Allowed"
+ # "NOT_ACCEPTABLE" --> "406 Not Acceptable"
+ # "LENGTH_REQUIRED" --> "411 Length Required"
+ # "PRECONDITION_FAILED" --> "412 Precondition Failed"
+ # "SERVER_ERROR" --> "500 Internal Server Error"
+ # "NOT_IMPLEMENTED" --> "501 Method Not Implemented"
+ # "BAD_GATEWAY" --> "502 Bad Gateway"
+ # "VARIANT_ALSO_VARIES" --> "506 Variant Also Negotiates"
+ #
+ # This method does not perform charset conversion.
+ #
+ def header(options = "text/html")
+
+ buf = ""
+
+ case options
+ when String
+ options = { "type" => options }
+ when Hash
+ options = options.dup
+ end
+
+ unless options.has_key?("type")
+ options["type"] = "text/html"
+ end
+
+ if options.has_key?("charset")
+ options["type"] += "; charset=" + options.delete("charset")
+ end
+
+ options.delete("nph") if defined?(MOD_RUBY)
+ if options.delete("nph") or
+ (/IIS\/(\d+)/n.match(env_table['SERVER_SOFTWARE']) and $1.to_i < 5)
+ buf += (env_table["SERVER_PROTOCOL"] or "HTTP/1.0") + " " +
+ (HTTP_STATUS[options["status"]] or options["status"] or "200 OK") +
+ EOL +
+ "Date: " + CGI::rfc1123_date(Time.now) + EOL
+
+ unless options.has_key?("server")
+ options["server"] = (env_table['SERVER_SOFTWARE'] or "")
+ end
+
+ unless options.has_key?("connection")
+ options["connection"] = "close"
+ end
+
+ options.delete("status")
+ end
+
+ if options.has_key?("status")
+ buf += "Status: " +
+ (HTTP_STATUS[options["status"]] or options["status"]) + EOL
+ options.delete("status")
+ end
+
+ if options.has_key?("server")
+ buf += "Server: " + options.delete("server") + EOL
+ end
+
+ if options.has_key?("connection")
+ buf += "Connection: " + options.delete("connection") + EOL
+ end
+
+ buf += "Content-Type: " + options.delete("type") + EOL
+
+ if options.has_key?("length")
+ buf += "Content-Length: " + options.delete("length").to_s + EOL
+ end
+
+ if options.has_key?("language")
+ buf += "Content-Language: " + options.delete("language") + EOL
+ end
+
+ if options.has_key?("expires")
+ buf += "Expires: " + CGI::rfc1123_date( options.delete("expires") ) + EOL
+ end
+
+ if options.has_key?("cookie")
+ if options["cookie"].kind_of?(String) or
+ options["cookie"].kind_of?(Cookie)
+ buf += "Set-Cookie: " + options.delete("cookie").to_s + EOL
+ elsif options["cookie"].kind_of?(Array)
+ options.delete("cookie").each{|cookie|
+ buf += "Set-Cookie: " + cookie.to_s + EOL
+ }
+ elsif options["cookie"].kind_of?(Hash)
+ options.delete("cookie").each_value{|cookie|
+ buf += "Set-Cookie: " + cookie.to_s + EOL
+ }
+ end
+ end
+ if @output_cookies
+ for cookie in @output_cookies
+ buf += "Set-Cookie: " + cookie.to_s + EOL
+ end
+ end
+
+ options.each{|key, value|
+ buf += key + ": " + value.to_s + EOL
+ }
+
+ if defined?(MOD_RUBY)
+ table = Apache::request.headers_out
+ buf.scan(/([^:]+): (.+)#{EOL}/n){ |name, value|
+ warn sprintf("name:%s value:%s\n", name, value) if $DEBUG
+ case name
+ when 'Set-Cookie'
+ table.add(name, value)
+ when /^status$/ni
+ Apache::request.status_line = value
+ Apache::request.status = value.to_i
+ when /^content-type$/ni
+ Apache::request.content_type = value
+ when /^content-encoding$/ni
+ Apache::request.content_encoding = value
+ when /^location$/ni
+ if Apache::request.status == 200
+ Apache::request.status = 302
+ end
+ Apache::request.headers_out[name] = value
+ else
+ Apache::request.headers_out[name] = value
+ end
+ }
+ Apache::request.send_http_header
+ ''
+ else
+ buf + EOL
+ end
+
+ end # header()
+
+
+ # Print an HTTP header and body to $DEFAULT_OUTPUT ($>)
+ #
+ # The header is provided by +options+, as for #header().
+ # The body of the document is that returned by the passed-
+ # in block. This block takes no arguments. It is required.
+ #
+ # cgi = CGI.new
+ # cgi.out{ "string" }
+ # # Content-Type: text/html
+ # # Content-Length: 6
+ # #
+ # # string
+ #
+ # cgi.out("text/plain") { "string" }
+ # # Content-Type: text/plain
+ # # Content-Length: 6
+ # #
+ # # string
+ #
+ # cgi.out("nph" => true,
+ # "status" => "OK", # == "200 OK"
+ # "server" => ENV['SERVER_SOFTWARE'],
+ # "connection" => "close",
+ # "type" => "text/html",
+ # "charset" => "iso-2022-jp",
+ # # Content-Type: text/html; charset=iso-2022-jp
+ # "language" => "ja",
+ # "expires" => Time.now + (3600 * 24 * 30),
+ # "cookie" => [cookie1, cookie2],
+ # "my_header1" => "my_value",
+ # "my_header2" => "my_value") { "string" }
+ #
+ # Content-Length is automatically calculated from the size of
+ # the String returned by the content block.
+ #
+ # If ENV['REQUEST_METHOD'] == "HEAD", then only the header
+ # is outputted (the content block is still required, but it
+ # is ignored).
+ #
+ # If the charset is "iso-2022-jp" or "euc-jp" or "shift_jis" then
+ # the content is converted to this charset, and the language is set
+ # to "ja".
+ def out(options = "text/html") # :yield:
+
+ options = { "type" => options } if options.kind_of?(String)
+ content = yield
+
+ if options.has_key?("charset")
+ require "nkf"
+ case options["charset"]
+ when /iso-2022-jp/ni
+ content = NKF::nkf('-m0 -x -j', content)
+ options["language"] = "ja" unless options.has_key?("language")
+ when /euc-jp/ni
+ content = NKF::nkf('-m0 -x -e', content)
+ options["language"] = "ja" unless options.has_key?("language")
+ when /shift_jis/ni
+ content = NKF::nkf('-m0 -x -s', content)
+ options["language"] = "ja" unless options.has_key?("language")
+ end
+ end
+
+ options["length"] = content.length.to_s
+ output = stdoutput
+ output.binmode if defined? output.binmode
+ output.print header(options)
+ output.print content unless "HEAD" == env_table['REQUEST_METHOD']
+ end
+
+
+ # Print an argument or list of arguments to the default output stream
+ #
+ # cgi = CGI.new
+ # cgi.print # default: cgi.print == $DEFAULT_OUTPUT.print
+ def print(*options)
+ stdoutput.print(*options)
+ end
+
+ require "delegate"
+
+ # Class representing an HTTP cookie.
+ #
+ # In addition to its specific fields and methods, a Cookie instance
+ # is a delegator to the array of its values.
+ #
+ # See RFC 2965.
+ #
+ # == Examples of use
+ # cookie1 = CGI::Cookie::new("name", "value1", "value2", ...)
+ # cookie1 = CGI::Cookie::new("name" => "name", "value" => "value")
+ # cookie1 = CGI::Cookie::new('name' => 'name',
+ # 'value' => ['value1', 'value2', ...],
+ # 'path' => 'path', # optional
+ # 'domain' => 'domain', # optional
+ # 'expires' => Time.now, # optional
+ # 'secure' => true # optional
+ # )
+ #
+ # cgi.out("cookie" => [cookie1, cookie2]) { "string" }
+ #
+ # name = cookie1.name
+ # values = cookie1.value
+ # path = cookie1.path
+ # domain = cookie1.domain
+ # expires = cookie1.expires
+ # secure = cookie1.secure
+ #
+ # cookie1.name = 'name'
+ # cookie1.value = ['value1', 'value2', ...]
+ # cookie1.path = 'path'
+ # cookie1.domain = 'domain'
+ # cookie1.expires = Time.now + 30
+ # cookie1.secure = true
+ class Cookie < DelegateClass(Array)
+
+ # Create a new CGI::Cookie object.
+ #
+ # The contents of the cookie can be specified as a +name+ and one
+ # or more +value+ arguments. Alternatively, the contents can
+ # be specified as a single hash argument. The possible keywords of
+ # this hash are as follows:
+ #
+ # name:: the name of the cookie. Required.
+ # value:: the cookie's value or list of values.
+ # path:: the path for which this cookie applies. Defaults to the
+ # base directory of the CGI script.
+ # domain:: the domain for which this cookie applies.
+ # expires:: the time at which this cookie expires, as a +Time+ object.
+ # secure:: whether this cookie is a secure cookie or not (default to
+ # false). Secure cookies are only transmitted to HTTPS
+ # servers.
+ #
+ # These keywords correspond to attributes of the cookie object.
+ def initialize(name = "", *value)
+ if name.kind_of?(String)
+ @name = name
+ @value = value
+ %r|^(.*/)|.match(ENV["SCRIPT_NAME"])
+ @path = ($1 or "")
+ @secure = false
+ return super(@value)
+ end
+
+ options = name
+ unless options.has_key?("name")
+ raise ArgumentError, "`name' required"
+ end
+
+ @name = options["name"]
+ @value = Array(options["value"])
+ # simple support for IE
+ if options["path"]
+ @path = options["path"]
+ else
+ %r|^(.*/)|.match(ENV["SCRIPT_NAME"])
+ @path = ($1 or "")
+ end
+ @domain = options["domain"]
+ @expires = options["expires"]
+ @secure = options["secure"] == true ? true : false
+
+ super(@value)
+ end
+
+ attr_accessor("name", "value", "path", "domain", "expires")
+ attr_reader("secure")
+
+ # Set whether the Cookie is a secure cookie or not.
+ #
+ # +val+ must be a boolean.
+ def secure=(val)
+ @secure = val if val == true or val == false
+ @secure
+ end
+
+ # Convert the Cookie to its string representation.
+ def to_s
+ buf = ""
+ buf += @name + '='
+
+ if @value.kind_of?(String)
+ buf += CGI::escape(@value)
+ else
+ buf += @value.collect{|v| CGI::escape(v) }.join("&")
+ end
+
+ if @domain
+ buf += '; domain=' + @domain
+ end
+
+ if @path
+ buf += '; path=' + @path
+ end
+
+ if @expires
+ buf += '; expires=' + CGI::rfc1123_date(@expires)
+ end
+
+ if @secure == true
+ buf += '; secure'
+ end
+
+ buf
+ end
+
+ end # class Cookie
+
+
+ # Parse a raw cookie string into a hash of cookie-name=>Cookie
+ # pairs.
+ #
+ # cookies = CGI::Cookie::parse("raw_cookie_string")
+ # # { "name1" => cookie1, "name2" => cookie2, ... }
+ #
+ def Cookie::parse(raw_cookie)
+ cookies = Hash.new([])
+ return cookies unless raw_cookie
+
+ raw_cookie.split(/[;,]\s?/).each do |pairs|
+ name, values = pairs.split('=',2)
+ next unless name and values
+ name = CGI::unescape(name)
+ values ||= ""
+ values = values.split('&').collect{|v| CGI::unescape(v) }
+ if cookies.has_key?(name)
+ values = cookies[name].value + values
+ end
+ cookies[name] = Cookie::new(name, *values)
+ end
+
+ cookies
+ end
+
+ # Parse an HTTP query string into a hash of key=>value pairs.
+ #
+ # params = CGI::parse("query_string")
+ # # {"name1" => ["value1", "value2", ...],
+ # # "name2" => ["value1", "value2", ...], ... }
+ #
+ def CGI::parse(query)
+ params = Hash.new([].freeze)
+
+ query.split(/[&;]/n).each do |pairs|
+ key, value = pairs.split('=',2).collect{|v| CGI::unescape(v) }
+ if params.has_key?(key)
+ params[key].push(value)
+ else
+ params[key] = [value]
+ end
+ end
+
+ params
+ end
+
+ # Mixin module. It provides the follow functionality groups:
+ #
+ # 1. Access to CGI environment variables as methods. See
+ # documentation to the CGI class for a list of these variables.
+ #
+ # 2. Access to cookies, including the cookies attribute.
+ #
+ # 3. Access to parameters, including the params attribute, and overloading
+ # [] to perform parameter value lookup by key.
+ #
+ # 4. The initialize_query method, for initialising the above
+ # mechanisms, handling multipart forms, and allowing the
+ # class to be used in "offline" mode.
+ #
+ module QueryExtension
+
+ %w[ CONTENT_LENGTH SERVER_PORT ].each do |env|
+ define_method(env.sub(/^HTTP_/n, '').downcase) do
+ (val = env_table[env]) && Integer(val)
+ end
+ end
+
+ %w[ AUTH_TYPE CONTENT_TYPE GATEWAY_INTERFACE PATH_INFO
+ PATH_TRANSLATED QUERY_STRING REMOTE_ADDR REMOTE_HOST
+ REMOTE_IDENT REMOTE_USER REQUEST_METHOD SCRIPT_NAME
+ SERVER_NAME SERVER_PROTOCOL SERVER_SOFTWARE
+
+ HTTP_ACCEPT HTTP_ACCEPT_CHARSET HTTP_ACCEPT_ENCODING
+ HTTP_ACCEPT_LANGUAGE HTTP_CACHE_CONTROL HTTP_FROM HTTP_HOST
+ HTTP_NEGOTIATE HTTP_PRAGMA HTTP_REFERER HTTP_USER_AGENT ].each do |env|
+ define_method(env.sub(/^HTTP_/n, '').downcase) do
+ env_table[env]
+ end
+ end
+
+ # Get the raw cookies as a string.
+ def raw_cookie
+ env_table["HTTP_COOKIE"]
+ end
+
+ # Get the raw RFC2965 cookies as a string.
+ def raw_cookie2
+ env_table["HTTP_COOKIE2"]
+ end
+
+ # Get the cookies as a hash of cookie-name=>Cookie pairs.
+ attr_accessor("cookies")
+
+ # Get the parameters as a hash of name=>values pairs, where
+ # values is an Array.
+ attr("params")
+
+ # Set all the parameters.
+ def params=(hash)
+ @params.clear
+ @params.update(hash)
+ end
+
+ def read_multipart(boundary, content_length)
+ params = Hash.new([])
+ boundary = "--" + boundary
+ quoted_boundary = Regexp.quote(boundary, "n")
+ buf = ""
+ bufsize = 10 * 1024
+ boundary_end=""
+
+ # start multipart/form-data
+ stdinput.binmode if defined? stdinput.binmode
+ boundary_size = boundary.size + EOL.size
+ content_length -= boundary_size
+ status = stdinput.read(boundary_size)
+ if nil == status
+ raise EOFError, "no content body"
+ elsif boundary + EOL != status
+ raise EOFError, "bad content body"
+ end
+
+ loop do
+ head = nil
+ if 10240 < content_length
+ require "tempfile"
+ body = Tempfile.new("CGI")
+ else
+ begin
+ require "stringio"
+ body = StringIO.new
+ rescue LoadError
+ require "tempfile"
+ body = Tempfile.new("CGI")
+ end
+ end
+ body.binmode if defined? body.binmode
+
+ until head and /#{quoted_boundary}(?:#{EOL}|--)/n.match(buf)
+
+ if (not head) and /#{EOL}#{EOL}/n.match(buf)
+ buf = buf.sub(/\A((?:.|\n)*?#{EOL})#{EOL}/n) do
+ head = $1.dup
+ ""
+ end
+ next
+ end
+
+ if head and ( (EOL + boundary + EOL).size < buf.size )
+ body.print buf[0 ... (buf.size - (EOL + boundary + EOL).size)]
+ buf[0 ... (buf.size - (EOL + boundary + EOL).size)] = ""
+ end
+
+ c = if bufsize < content_length
+ stdinput.read(bufsize)
+ else
+ stdinput.read(content_length)
+ end
+ if c.nil? || c.empty?
+ raise EOFError, "bad content body"
+ end
+ buf.concat(c)
+ content_length -= c.size
+ end
+
+ buf = buf.sub(/\A((?:.|\n)*?)(?:[\r\n]{1,2})?#{quoted_boundary}([\r\n]{1,2}|--)/n) do
+ body.print $1
+ if "--" == $2
+ content_length = -1
+ end
+ boundary_end = $2.dup
+ ""
+ end
+
+ body.rewind
+
+ /Content-Disposition:.* filename=(?:"((?:\\.|[^\"\s])*)"|([^;\s]*))/ni.match(head)
+ filename = ($1 or $2 or "")
+ if /Mac/ni.match(env_table['HTTP_USER_AGENT']) and
+ /Mozilla/ni.match(env_table['HTTP_USER_AGENT']) and
+ (not /MSIE/ni.match(env_table['HTTP_USER_AGENT']))
+ filename = CGI::unescape(filename)
+ end
+
+ /Content-Type: ([^\s]*)/ni.match(head)
+ content_type = ($1 or "")
+
+ (class << body; self; end).class_eval do
+ alias local_path path
+ define_method(:original_filename) {filename.dup.taint}
+ define_method(:content_type) {content_type.dup.taint}
+ end
+
+ /Content-Disposition:.* name="?([^\";\s]*)"?/ni.match(head)
+ name = $1.dup
+
+ if params.has_key?(name)
+ params[name].push(body)
+ else
+ params[name] = [body]
+ end
+ break if buf.size == 0
+ break if content_length == -1
+ end
+ raise EOFError, "bad boundary end of body part" unless boundary_end=~/--/
+
+ params
+ end # read_multipart
+ private :read_multipart
+
+ # offline mode. read name=value pairs on standard input.
+ def read_from_cmdline
+ require "shellwords"
+
+ string = unless ARGV.empty?
+ ARGV.join(' ')
+ else
+ if STDIN.tty?
+ STDERR.print(
+ %|(offline mode: enter name=value pairs on standard input)\n|
+ )
+ end
+ readlines.join(' ').gsub(/\n/n, '')
+ end.gsub(/\\=/n, '%3D').gsub(/\\&/n, '%26')
+
+ words = Shellwords.shellwords(string)
+
+ if words.find{|x| /=/n.match(x) }
+ words.join('&')
+ else
+ words.join('+')
+ end
+ end
+ private :read_from_cmdline
+
+ # Initialize the data from the query.
+ #
+ # Handles multipart forms (in particular, forms that involve file uploads).
+ # Reads query parameters in the @params field, and cookies into @cookies.
+ def initialize_query()
+ if ("POST" == env_table['REQUEST_METHOD']) and
+ %r|\Amultipart/form-data.*boundary=\"?([^\";,]+)\"?|n.match(env_table['CONTENT_TYPE'])
+ boundary = $1.dup
+ @multipart = true
+ @params = read_multipart(boundary, Integer(env_table['CONTENT_LENGTH']))
+ else
+ @multipart = false
+ @params = CGI::parse(
+ case env_table['REQUEST_METHOD']
+ when "GET", "HEAD"
+ if defined?(MOD_RUBY)
+ Apache::request.args or ""
+ else
+ env_table['QUERY_STRING'] or ""
+ end
+ when "POST"
+ stdinput.binmode if defined? stdinput.binmode
+ stdinput.read(Integer(env_table['CONTENT_LENGTH'])) or ''
+ else
+ read_from_cmdline
+ end
+ )
+ end
+
+ @cookies = CGI::Cookie::parse((env_table['HTTP_COOKIE'] or env_table['COOKIE']))
+ end
+ private :initialize_query
+
+ def multipart?
+ @multipart
+ end
+
+ module Value # :nodoc:
+ def set_params(params)
+ @params = params
+ end
+ def [](idx, *args)
+ if args.size == 0
+ warn "#{caller(1)[0]}:CAUTION! cgi['key'] == cgi.params['key'][0]; if want Array, use cgi.params['key']"
+ @params[idx]
+ else
+ super[idx,*args]
+ end
+ end
+ def first
+ warn "#{caller(1)[0]}:CAUTION! cgi['key'] == cgi.params['key'][0]; if want Array, use cgi.params['key']"
+ self
+ end
+ alias last first
+ def to_a
+ @params || [self]
+ end
+ alias to_ary to_a # to be rhs of multiple assignment
+ end
+
+ # Get the value for the parameter with a given key.
+ #
+ # If the parameter has multiple values, only the first will be
+ # retrieved; use #params() to get the array of values.
+ def [](key)
+ params = @params[key]
+ return '' unless params
+ value = params[0]
+ if @multipart
+ if value
+ return value
+ elsif defined? StringIO
+ StringIO.new("")
+ else
+ Tempfile.new("CGI")
+ end
+ else
+ str = if value then value.dup else "" end
+ str.extend(Value)
+ str.set_params(params)
+ str
+ end
+ end
+
+ # Return all parameter keys as an array.
+ def keys(*args)
+ @params.keys(*args)
+ end
+
+ # Returns true if a given parameter key exists in the query.
+ def has_key?(*args)
+ @params.has_key?(*args)
+ end
+ alias key? has_key?
+ alias include? has_key?
+
+ end # QueryExtension
+
+
+ # Prettify (indent) an HTML string.
+ #
+ # +string+ is the HTML string to indent. +shift+ is the indentation
+ # unit to use; it defaults to two spaces.
+ #
+ # print CGI::pretty("<HTML><BODY></BODY></HTML>")
+ # # <HTML>
+ # # <BODY>
+ # # </BODY>
+ # # </HTML>
+ #
+ # print CGI::pretty("<HTML><BODY></BODY></HTML>", "\t")
+ # # <HTML>
+ # # <BODY>
+ # # </BODY>
+ # # </HTML>
+ #
+ def CGI::pretty(string, shift = " ")
+ lines = string.gsub(/(?!\A)<(?:.|\n)*?>/n, "\n\\0").gsub(/<(?:.|\n)*?>(?!\n)/n, "\\0\n")
+ end_pos = 0
+ while end_pos = lines.index(/^<\/(\w+)/n, end_pos)
+ element = $1.dup
+ start_pos = lines.rindex(/^\s*<#{element}/ni, end_pos)
+ lines[start_pos ... end_pos] = "__" + lines[start_pos ... end_pos].gsub(/\n(?!\z)/n, "\n" + shift) + "__"
+ end
+ lines.gsub(/^((?:#{Regexp::quote(shift)})*)__(?=<\/?\w)/n, '\1')
+ end
+
+
+ # Base module for HTML-generation mixins.
+ #
+ # Provides methods for code generation for tags following
+ # the various DTD element types.
+ module TagMaker # :nodoc:
+
+ # Generate code for an element with required start and end tags.
+ #
+ # - -
+ def nn_element_def(element)
+ nOE_element_def(element, <<-END)
+ if block_given?
+ yield.to_s
+ else
+ ""
+ end +
+ "</#{element.upcase}>"
+ END
+ end
+
+ # Generate code for an empty element.
+ #
+ # - O EMPTY
+ def nOE_element_def(element, append = nil)
+ s = <<-END
+ "<#{element.upcase}" + attributes.collect{|name, value|
+ next unless value
+ " " + CGI::escapeHTML(name) +
+ if true == value
+ ""
+ else
+ '="' + CGI::escapeHTML(value) + '"'
+ end
+ }.to_s + ">"
+ END
+ s.sub!(/\Z/, " +") << append if append
+ s
+ end
+
+ # Generate code for an element for which the end (and possibly the
+ # start) tag is optional.
+ #
+ # O O or - O
+ def nO_element_def(element)
+ nOE_element_def(element, <<-END)
+ if block_given?
+ yield.to_s + "</#{element.upcase}>"
+ else
+ ""
+ end
+ END
+ end
+
+ end # TagMaker
+
+
+ #
+ # Mixin module providing HTML generation methods.
+ #
+ # For example,
+ # cgi.a("http://www.example.com") { "Example" }
+ # # => "<A HREF=\"http://www.example.com\">Example</A>"
+ #
+ # Modules Http3, Http4, etc., contain more basic HTML-generation methods
+ # (:title, :center, etc.).
+ #
+ # See class CGI for a detailed example.
+ #
+ module HtmlExtension
+
+
+ # Generate an Anchor element as a string.
+ #
+ # +href+ can either be a string, giving the URL
+ # for the HREF attribute, or it can be a hash of
+ # the element's attributes.
+ #
+ # The body of the element is the string returned by the no-argument
+ # block passed in.
+ #
+ # a("http://www.example.com") { "Example" }
+ # # => "<A HREF=\"http://www.example.com\">Example</A>"
+ #
+ # a("HREF" => "http://www.example.com", "TARGET" => "_top") { "Example" }
+ # # => "<A HREF=\"http://www.example.com\" TARGET=\"_top\">Example</A>"
+ #
+ def a(href = "") # :yield:
+ attributes = if href.kind_of?(String)
+ { "HREF" => href }
+ else
+ href
+ end
+ if block_given?
+ super(attributes){ yield }
+ else
+ super(attributes)
+ end
+ end
+
+ # Generate a Document Base URI element as a String.
+ #
+ # +href+ can either by a string, giving the base URL for the HREF
+ # attribute, or it can be a has of the element's attributes.
+ #
+ # The passed-in no-argument block is ignored.
+ #
+ # base("http://www.example.com/cgi")
+ # # => "<BASE HREF=\"http://www.example.com/cgi\">"
+ def base(href = "") # :yield:
+ attributes = if href.kind_of?(String)
+ { "HREF" => href }
+ else
+ href
+ end
+ if block_given?
+ super(attributes){ yield }
+ else
+ super(attributes)
+ end
+ end
+
+ # Generate a BlockQuote element as a string.
+ #
+ # +cite+ can either be a string, give the URI for the source of
+ # the quoted text, or a hash, giving all attributes of the element,
+ # or it can be omitted, in which case the element has no attributes.
+ #
+ # The body is provided by the passed-in no-argument block
+ #
+ # blockquote("http://www.example.com/quotes/foo.html") { "Foo!" }
+ # #=> "<BLOCKQUOTE CITE=\"http://www.example.com/quotes/foo.html\">Foo!</BLOCKQUOTE>
+ def blockquote(cite = nil) # :yield:
+ attributes = if cite.kind_of?(String)
+ { "CITE" => cite }
+ else
+ cite or ""
+ end
+ if block_given?
+ super(attributes){ yield }
+ else
+ super(attributes)
+ end
+ end
+
+
+ # Generate a Table Caption element as a string.
+ #
+ # +align+ can be a string, giving the alignment of the caption
+ # (one of top, bottom, left, or right). It can be a hash of
+ # all the attributes of the element. Or it can be omitted.
+ #
+ # The body of the element is provided by the passed-in no-argument block.
+ #
+ # caption("left") { "Capital Cities" }
+ # # => <CAPTION ALIGN=\"left\">Capital Cities</CAPTION>
+ def caption(align = nil) # :yield:
+ attributes = if align.kind_of?(String)
+ { "ALIGN" => align }
+ else
+ align or ""
+ end
+ if block_given?
+ super(attributes){ yield }
+ else
+ super(attributes)
+ end
+ end
+
+
+ # Generate a Checkbox Input element as a string.
+ #
+ # The attributes of the element can be specified as three arguments,
+ # +name+, +value+, and +checked+. +checked+ is a boolean value;
+ # if true, the CHECKED attribute will be included in the element.
+ #
+ # Alternatively, the attributes can be specified as a hash.
+ #
+ # checkbox("name")
+ # # = checkbox("NAME" => "name")
+ #
+ # checkbox("name", "value")
+ # # = checkbox("NAME" => "name", "VALUE" => "value")
+ #
+ # checkbox("name", "value", true)
+ # # = checkbox("NAME" => "name", "VALUE" => "value", "CHECKED" => true)
+ def checkbox(name = "", value = nil, checked = nil)
+ attributes = if name.kind_of?(String)
+ { "TYPE" => "checkbox", "NAME" => name,
+ "VALUE" => value, "CHECKED" => checked }
+ else
+ name["TYPE"] = "checkbox"
+ name
+ end
+ input(attributes)
+ end
+
+ # Generate a sequence of checkbox elements, as a String.
+ #
+ # The checkboxes will all have the same +name+ attribute.
+ # Each checkbox is followed by a label.
+ # There will be one checkbox for each value. Each value
+ # can be specified as a String, which will be used both
+ # as the value of the VALUE attribute and as the label
+ # for that checkbox. A single-element array has the
+ # same effect.
+ #
+ # Each value can also be specified as a three-element array.
+ # The first element is the VALUE attribute; the second is the
+ # label; and the third is a boolean specifying whether this
+ # checkbox is CHECKED.
+ #
+ # Each value can also be specified as a two-element
+ # array, by omitting either the value element (defaults
+ # to the same as the label), or the boolean checked element
+ # (defaults to false).
+ #
+ # checkbox_group("name", "foo", "bar", "baz")
+ # # <INPUT TYPE="checkbox" NAME="name" VALUE="foo">foo
+ # # <INPUT TYPE="checkbox" NAME="name" VALUE="bar">bar
+ # # <INPUT TYPE="checkbox" NAME="name" VALUE="baz">baz
+ #
+ # checkbox_group("name", ["foo"], ["bar", true], "baz")
+ # # <INPUT TYPE="checkbox" NAME="name" VALUE="foo">foo
+ # # <INPUT TYPE="checkbox" CHECKED NAME="name" VALUE="bar">bar
+ # # <INPUT TYPE="checkbox" NAME="name" VALUE="baz">baz
+ #
+ # checkbox_group("name", ["1", "Foo"], ["2", "Bar", true], "Baz")
+ # # <INPUT TYPE="checkbox" NAME="name" VALUE="1">Foo
+ # # <INPUT TYPE="checkbox" CHECKED NAME="name" VALUE="2">Bar
+ # # <INPUT TYPE="checkbox" NAME="name" VALUE="Baz">Baz
+ #
+ # checkbox_group("NAME" => "name",
+ # "VALUES" => ["foo", "bar", "baz"])
+ #
+ # checkbox_group("NAME" => "name",
+ # "VALUES" => [["foo"], ["bar", true], "baz"])
+ #
+ # checkbox_group("NAME" => "name",
+ # "VALUES" => [["1", "Foo"], ["2", "Bar", true], "Baz"])
+ def checkbox_group(name = "", *values)
+ if name.kind_of?(Hash)
+ values = name["VALUES"]
+ name = name["NAME"]
+ end
+ values.collect{|value|
+ if value.kind_of?(String)
+ checkbox(name, value) + value
+ else
+ if value[value.size - 1] == true
+ checkbox(name, value[0], true) +
+ value[value.size - 2]
+ else
+ checkbox(name, value[0]) +
+ value[value.size - 1]
+ end
+ end
+ }.to_s
+ end
+
+
+ # Generate an File Upload Input element as a string.
+ #
+ # The attributes of the element can be specified as three arguments,
+ # +name+, +size+, and +maxlength+. +maxlength+ is the maximum length
+ # of the file's _name_, not of the file's _contents_.
+ #
+ # Alternatively, the attributes can be specified as a hash.
+ #
+ # See #multipart_form() for forms that include file uploads.
+ #
+ # file_field("name")
+ # # <INPUT TYPE="file" NAME="name" SIZE="20">
+ #
+ # file_field("name", 40)
+ # # <INPUT TYPE="file" NAME="name" SIZE="40">
+ #
+ # file_field("name", 40, 100)
+ # # <INPUT TYPE="file" NAME="name" SIZE="40" MAXLENGTH="100">
+ #
+ # file_field("NAME" => "name", "SIZE" => 40)
+ # # <INPUT TYPE="file" NAME="name" SIZE="40">
+ def file_field(name = "", size = 20, maxlength = nil)
+ attributes = if name.kind_of?(String)
+ { "TYPE" => "file", "NAME" => name,
+ "SIZE" => size.to_s }
+ else
+ name["TYPE"] = "file"
+ name
+ end
+ attributes["MAXLENGTH"] = maxlength.to_s if maxlength
+ input(attributes)
+ end
+
+
+ # Generate a Form element as a string.
+ #
+ # +method+ should be either "get" or "post", and defaults to the latter.
+ # +action+ defaults to the current CGI script name. +enctype+
+ # defaults to "application/x-www-form-urlencoded".
+ #
+ # Alternatively, the attributes can be specified as a hash.
+ #
+ # See also #multipart_form() for forms that include file uploads.
+ #
+ # form{ "string" }
+ # # <FORM METHOD="post" ENCTYPE="application/x-www-form-urlencoded">string</FORM>
+ #
+ # form("get") { "string" }
+ # # <FORM METHOD="get" ENCTYPE="application/x-www-form-urlencoded">string</FORM>
+ #
+ # form("get", "url") { "string" }
+ # # <FORM METHOD="get" ACTION="url" ENCTYPE="application/x-www-form-urlencoded">string</FORM>
+ #
+ # form("METHOD" => "post", "ENCTYPE" => "enctype") { "string" }
+ # # <FORM METHOD="post" ENCTYPE="enctype">string</FORM>
+ def form(method = "post", action = script_name, enctype = "application/x-www-form-urlencoded")
+ attributes = if method.kind_of?(String)
+ { "METHOD" => method, "ACTION" => action,
+ "ENCTYPE" => enctype }
+ else
+ unless method.has_key?("METHOD")
+ method["METHOD"] = "post"
+ end
+ unless method.has_key?("ENCTYPE")
+ method["ENCTYPE"] = enctype
+ end
+ method
+ end
+ if block_given?
+ body = yield
+ else
+ body = ""
+ end
+ if @output_hidden
+ body += @output_hidden.collect{|k,v|
+ "<INPUT TYPE=\"HIDDEN\" NAME=\"#{k}\" VALUE=\"#{v}\">"
+ }.to_s
+ end
+ super(attributes){body}
+ end
+
+ # Generate a Hidden Input element as a string.
+ #
+ # The attributes of the element can be specified as two arguments,
+ # +name+ and +value+.
+ #
+ # Alternatively, the attributes can be specified as a hash.
+ #
+ # hidden("name")
+ # # <INPUT TYPE="hidden" NAME="name">
+ #
+ # hidden("name", "value")
+ # # <INPUT TYPE="hidden" NAME="name" VALUE="value">
+ #
+ # hidden("NAME" => "name", "VALUE" => "reset", "ID" => "foo")
+ # # <INPUT TYPE="hidden" NAME="name" VALUE="value" ID="foo">
+ def hidden(name = "", value = nil)
+ attributes = if name.kind_of?(String)
+ { "TYPE" => "hidden", "NAME" => name, "VALUE" => value }
+ else
+ name["TYPE"] = "hidden"
+ name
+ end
+ input(attributes)
+ end
+
+ # Generate a top-level HTML element as a string.
+ #
+ # The attributes of the element are specified as a hash. The
+ # pseudo-attribute "PRETTY" can be used to specify that the generated
+ # HTML string should be indented. "PRETTY" can also be specified as
+ # a string as the sole argument to this method. The pseudo-attribute
+ # "DOCTYPE", if given, is used as the leading DOCTYPE SGML tag; it
+ # should include the entire text of this tag, including angle brackets.
+ #
+ # The body of the html element is supplied as a block.
+ #
+ # html{ "string" }
+ # # <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"><HTML>string</HTML>
+ #
+ # html("LANG" => "ja") { "string" }
+ # # <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"><HTML LANG="ja">string</HTML>
+ #
+ # html("DOCTYPE" => false) { "string" }
+ # # <HTML>string</HTML>
+ #
+ # html("DOCTYPE" => '<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">') { "string" }
+ # # <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"><HTML>string</HTML>
+ #
+ # html("PRETTY" => " ") { "<BODY></BODY>" }
+ # # <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+ # # <HTML>
+ # # <BODY>
+ # # </BODY>
+ # # </HTML>
+ #
+ # html("PRETTY" => "\t") { "<BODY></BODY>" }
+ # # <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+ # # <HTML>
+ # # <BODY>
+ # # </BODY>
+ # # </HTML>
+ #
+ # html("PRETTY") { "<BODY></BODY>" }
+ # # = html("PRETTY" => " ") { "<BODY></BODY>" }
+ #
+ # html(if $VERBOSE then "PRETTY" end) { "HTML string" }
+ #
+ def html(attributes = {}) # :yield:
+ if nil == attributes
+ attributes = {}
+ elsif "PRETTY" == attributes
+ attributes = { "PRETTY" => true }
+ end
+ pretty = attributes.delete("PRETTY")
+ pretty = " " if true == pretty
+ buf = ""
+
+ if attributes.has_key?("DOCTYPE")
+ if attributes["DOCTYPE"]
+ buf += attributes.delete("DOCTYPE")
+ else
+ attributes.delete("DOCTYPE")
+ end
+ else
+ buf += doctype
+ end
+
+ if block_given?
+ buf += super(attributes){ yield }
+ else
+ buf += super(attributes)
+ end
+
+ if pretty
+ CGI::pretty(buf, pretty)
+ else
+ buf
+ end
+
+ end
+
+ # Generate an Image Button Input element as a string.
+ #
+ # +src+ is the URL of the image to use for the button. +name+
+ # is the input name. +alt+ is the alternative text for the image.
+ #
+ # Alternatively, the attributes can be specified as a hash.
+ #
+ # image_button("url")
+ # # <INPUT TYPE="image" SRC="url">
+ #
+ # image_button("url", "name", "string")
+ # # <INPUT TYPE="image" SRC="url" NAME="name" ALT="string">
+ #
+ # image_button("SRC" => "url", "ATL" => "strng")
+ # # <INPUT TYPE="image" SRC="url" ALT="string">
+ def image_button(src = "", name = nil, alt = nil)
+ attributes = if src.kind_of?(String)
+ { "TYPE" => "image", "SRC" => src, "NAME" => name,
+ "ALT" => alt }
+ else
+ src["TYPE"] = "image"
+ src["SRC"] ||= ""
+ src
+ end
+ input(attributes)
+ end
+
+
+ # Generate an Image element as a string.
+ #
+ # +src+ is the URL of the image. +alt+ is the alternative text for
+ # the image. +width+ is the width of the image, and +height+ is
+ # its height.
+ #
+ # Alternatively, the attributes can be specified as a hash.
+ #
+ # img("src", "alt", 100, 50)
+ # # <IMG SRC="src" ALT="alt" WIDTH="100" HEIGHT="50">
+ #
+ # img("SRC" => "src", "ALT" => "alt", "WIDTH" => 100, "HEIGHT" => 50)
+ # # <IMG SRC="src" ALT="alt" WIDTH="100" HEIGHT="50">
+ def img(src = "", alt = "", width = nil, height = nil)
+ attributes = if src.kind_of?(String)
+ { "SRC" => src, "ALT" => alt }
+ else
+ src
+ end
+ attributes["WIDTH"] = width.to_s if width
+ attributes["HEIGHT"] = height.to_s if height
+ super(attributes)
+ end
+
+
+ # Generate a Form element with multipart encoding as a String.
+ #
+ # Multipart encoding is used for forms that include file uploads.
+ #
+ # +action+ is the action to perform. +enctype+ is the encoding
+ # type, which defaults to "multipart/form-data".
+ #
+ # Alternatively, the attributes can be specified as a hash.
+ #
+ # multipart_form{ "string" }
+ # # <FORM METHOD="post" ENCTYPE="multipart/form-data">string</FORM>
+ #
+ # multipart_form("url") { "string" }
+ # # <FORM METHOD="post" ACTION="url" ENCTYPE="multipart/form-data">string</FORM>
+ def multipart_form(action = nil, enctype = "multipart/form-data")
+ attributes = if action == nil
+ { "METHOD" => "post", "ENCTYPE" => enctype }
+ elsif action.kind_of?(String)
+ { "METHOD" => "post", "ACTION" => action,
+ "ENCTYPE" => enctype }
+ else
+ unless action.has_key?("METHOD")
+ action["METHOD"] = "post"
+ end
+ unless action.has_key?("ENCTYPE")
+ action["ENCTYPE"] = enctype
+ end
+ action
+ end
+ if block_given?
+ form(attributes){ yield }
+ else
+ form(attributes)
+ end
+ end
+
+
+ # Generate a Password Input element as a string.
+ #
+ # +name+ is the name of the input field. +value+ is its default
+ # value. +size+ is the size of the input field display. +maxlength+
+ # is the maximum length of the inputted password.
+ #
+ # Alternatively, attributes can be specified as a hash.
+ #
+ # password_field("name")
+ # # <INPUT TYPE="password" NAME="name" SIZE="40">
+ #
+ # password_field("name", "value")
+ # # <INPUT TYPE="password" NAME="name" VALUE="value" SIZE="40">
+ #
+ # password_field("password", "value", 80, 200)
+ # # <INPUT TYPE="password" NAME="name" VALUE="value" SIZE="80" MAXLENGTH="200">
+ #
+ # password_field("NAME" => "name", "VALUE" => "value")
+ # # <INPUT TYPE="password" NAME="name" VALUE="value">
+ def password_field(name = "", value = nil, size = 40, maxlength = nil)
+ attributes = if name.kind_of?(String)
+ { "TYPE" => "password", "NAME" => name,
+ "VALUE" => value, "SIZE" => size.to_s }
+ else
+ name["TYPE"] = "password"
+ name
+ end
+ attributes["MAXLENGTH"] = maxlength.to_s if maxlength
+ input(attributes)
+ end
+
+ # Generate a Select element as a string.
+ #
+ # +name+ is the name of the element. The +values+ are the options that
+ # can be selected from the Select menu. Each value can be a String or
+ # a one, two, or three-element Array. If a String or a one-element
+ # Array, this is both the value of that option and the text displayed for
+ # it. If a three-element Array, the elements are the option value, displayed
+ # text, and a boolean value specifying whether this option starts as selected.
+ # The two-element version omits either the option value (defaults to the same
+ # as the display text) or the boolean selected specifier (defaults to false).
+ #
+ # The attributes and options can also be specified as a hash. In this
+ # case, options are specified as an array of values as described above,
+ # with the hash key of "VALUES".
+ #
+ # popup_menu("name", "foo", "bar", "baz")
+ # # <SELECT NAME="name">
+ # # <OPTION VALUE="foo">foo</OPTION>
+ # # <OPTION VALUE="bar">bar</OPTION>
+ # # <OPTION VALUE="baz">baz</OPTION>
+ # # </SELECT>
+ #
+ # popup_menu("name", ["foo"], ["bar", true], "baz")
+ # # <SELECT NAME="name">
+ # # <OPTION VALUE="foo">foo</OPTION>
+ # # <OPTION VALUE="bar" SELECTED>bar</OPTION>
+ # # <OPTION VALUE="baz">baz</OPTION>
+ # # </SELECT>
+ #
+ # popup_menu("name", ["1", "Foo"], ["2", "Bar", true], "Baz")
+ # # <SELECT NAME="name">
+ # # <OPTION VALUE="1">Foo</OPTION>
+ # # <OPTION SELECTED VALUE="2">Bar</OPTION>
+ # # <OPTION VALUE="Baz">Baz</OPTION>
+ # # </SELECT>
+ #
+ # popup_menu("NAME" => "name", "SIZE" => 2, "MULTIPLE" => true,
+ # "VALUES" => [["1", "Foo"], ["2", "Bar", true], "Baz"])
+ # # <SELECT NAME="name" MULTIPLE SIZE="2">
+ # # <OPTION VALUE="1">Foo</OPTION>
+ # # <OPTION SELECTED VALUE="2">Bar</OPTION>
+ # # <OPTION VALUE="Baz">Baz</OPTION>
+ # # </SELECT>
+ def popup_menu(name = "", *values)
+
+ if name.kind_of?(Hash)
+ values = name["VALUES"]
+ size = name["SIZE"].to_s if name["SIZE"]
+ multiple = name["MULTIPLE"]
+ name = name["NAME"]
+ else
+ size = nil
+ multiple = nil
+ end
+
+ select({ "NAME" => name, "SIZE" => size,
+ "MULTIPLE" => multiple }){
+ values.collect{|value|
+ if value.kind_of?(String)
+ option({ "VALUE" => value }){ value }
+ else
+ if value[value.size - 1] == true
+ option({ "VALUE" => value[0], "SELECTED" => true }){
+ value[value.size - 2]
+ }
+ else
+ option({ "VALUE" => value[0] }){
+ value[value.size - 1]
+ }
+ end
+ end
+ }.to_s
+ }
+
+ end
+
+ # Generates a radio-button Input element.
+ #
+ # +name+ is the name of the input field. +value+ is the value of
+ # the field if checked. +checked+ specifies whether the field
+ # starts off checked.
+ #
+ # Alternatively, the attributes can be specified as a hash.
+ #
+ # radio_button("name", "value")
+ # # <INPUT TYPE="radio" NAME="name" VALUE="value">
+ #
+ # radio_button("name", "value", true)
+ # # <INPUT TYPE="radio" NAME="name" VALUE="value" CHECKED>
+ #
+ # radio_button("NAME" => "name", "VALUE" => "value", "ID" => "foo")
+ # # <INPUT TYPE="radio" NAME="name" VALUE="value" ID="foo">
+ def radio_button(name = "", value = nil, checked = nil)
+ attributes = if name.kind_of?(String)
+ { "TYPE" => "radio", "NAME" => name,
+ "VALUE" => value, "CHECKED" => checked }
+ else
+ name["TYPE"] = "radio"
+ name
+ end
+ input(attributes)
+ end
+
+ # Generate a sequence of radio button Input elements, as a String.
+ #
+ # This works the same as #checkbox_group(). However, it is not valid
+ # to have more than one radiobutton in a group checked.
+ #
+ # radio_group("name", "foo", "bar", "baz")
+ # # <INPUT TYPE="radio" NAME="name" VALUE="foo">foo
+ # # <INPUT TYPE="radio" NAME="name" VALUE="bar">bar
+ # # <INPUT TYPE="radio" NAME="name" VALUE="baz">baz
+ #
+ # radio_group("name", ["foo"], ["bar", true], "baz")
+ # # <INPUT TYPE="radio" NAME="name" VALUE="foo">foo
+ # # <INPUT TYPE="radio" CHECKED NAME="name" VALUE="bar">bar
+ # # <INPUT TYPE="radio" NAME="name" VALUE="baz">baz
+ #
+ # radio_group("name", ["1", "Foo"], ["2", "Bar", true], "Baz")
+ # # <INPUT TYPE="radio" NAME="name" VALUE="1">Foo
+ # # <INPUT TYPE="radio" CHECKED NAME="name" VALUE="2">Bar
+ # # <INPUT TYPE="radio" NAME="name" VALUE="Baz">Baz
+ #
+ # radio_group("NAME" => "name",
+ # "VALUES" => ["foo", "bar", "baz"])
+ #
+ # radio_group("NAME" => "name",
+ # "VALUES" => [["foo"], ["bar", true], "baz"])
+ #
+ # radio_group("NAME" => "name",
+ # "VALUES" => [["1", "Foo"], ["2", "Bar", true], "Baz"])
+ def radio_group(name = "", *values)
+ if name.kind_of?(Hash)
+ values = name["VALUES"]
+ name = name["NAME"]
+ end
+ values.collect{|value|
+ if value.kind_of?(String)
+ radio_button(name, value) + value
+ else
+ if value[value.size - 1] == true
+ radio_button(name, value[0], true) +
+ value[value.size - 2]
+ else
+ radio_button(name, value[0]) +
+ value[value.size - 1]
+ end
+ end
+ }.to_s
+ end
+
+ # Generate a reset button Input element, as a String.
+ #
+ # This resets the values on a form to their initial values. +value+
+ # is the text displayed on the button. +name+ is the name of this button.
+ #
+ # Alternatively, the attributes can be specified as a hash.
+ #
+ # reset
+ # # <INPUT TYPE="reset">
+ #
+ # reset("reset")
+ # # <INPUT TYPE="reset" VALUE="reset">
+ #
+ # reset("VALUE" => "reset", "ID" => "foo")
+ # # <INPUT TYPE="reset" VALUE="reset" ID="foo">
+ def reset(value = nil, name = nil)
+ attributes = if (not value) or value.kind_of?(String)
+ { "TYPE" => "reset", "VALUE" => value, "NAME" => name }
+ else
+ value["TYPE"] = "reset"
+ value
+ end
+ input(attributes)
+ end
+
+ alias scrolling_list popup_menu
+
+ # Generate a submit button Input element, as a String.
+ #
+ # +value+ is the text to display on the button. +name+ is the name
+ # of the input.
+ #
+ # Alternatively, the attributes can be specified as a hash.
+ #
+ # submit
+ # # <INPUT TYPE="submit">
+ #
+ # submit("ok")
+ # # <INPUT TYPE="submit" VALUE="ok">
+ #
+ # submit("ok", "button1")
+ # # <INPUT TYPE="submit" VALUE="ok" NAME="button1">
+ #
+ # submit("VALUE" => "ok", "NAME" => "button1", "ID" => "foo")
+ # # <INPUT TYPE="submit" VALUE="ok" NAME="button1" ID="foo">
+ def submit(value = nil, name = nil)
+ attributes = if (not value) or value.kind_of?(String)
+ { "TYPE" => "submit", "VALUE" => value, "NAME" => name }
+ else
+ value["TYPE"] = "submit"
+ value
+ end
+ input(attributes)
+ end
+
+ # Generate a text field Input element, as a String.
+ #
+ # +name+ is the name of the input field. +value+ is its initial
+ # value. +size+ is the size of the input area. +maxlength+
+ # is the maximum length of input accepted.
+ #
+ # Alternatively, the attributes can be specified as a hash.
+ #
+ # text_field("name")
+ # # <INPUT TYPE="text" NAME="name" SIZE="40">
+ #
+ # text_field("name", "value")
+ # # <INPUT TYPE="text" NAME="name" VALUE="value" SIZE="40">
+ #
+ # text_field("name", "value", 80)
+ # # <INPUT TYPE="text" NAME="name" VALUE="value" SIZE="80">
+ #
+ # text_field("name", "value", 80, 200)
+ # # <INPUT TYPE="text" NAME="name" VALUE="value" SIZE="80" MAXLENGTH="200">
+ #
+ # text_field("NAME" => "name", "VALUE" => "value")
+ # # <INPUT TYPE="text" NAME="name" VALUE="value">
+ def text_field(name = "", value = nil, size = 40, maxlength = nil)
+ attributes = if name.kind_of?(String)
+ { "TYPE" => "text", "NAME" => name, "VALUE" => value,
+ "SIZE" => size.to_s }
+ else
+ name["TYPE"] = "text"
+ name
+ end
+ attributes["MAXLENGTH"] = maxlength.to_s if maxlength
+ input(attributes)
+ end
+
+ # Generate a TextArea element, as a String.
+ #
+ # +name+ is the name of the textarea. +cols+ is the number of
+ # columns and +rows+ is the number of rows in the display.
+ #
+ # Alternatively, the attributes can be specified as a hash.
+ #
+ # The body is provided by the passed-in no-argument block
+ #
+ # textarea("name")
+ # # = textarea("NAME" => "name", "COLS" => 70, "ROWS" => 10)
+ #
+ # textarea("name", 40, 5)
+ # # = textarea("NAME" => "name", "COLS" => 40, "ROWS" => 5)
+ def textarea(name = "", cols = 70, rows = 10) # :yield:
+ attributes = if name.kind_of?(String)
+ { "NAME" => name, "COLS" => cols.to_s,
+ "ROWS" => rows.to_s }
+ else
+ name
+ end
+ if block_given?
+ super(attributes){ yield }
+ else
+ super(attributes)
+ end
+ end
+
+ end # HtmlExtension
+
+
+ # Mixin module for HTML version 3 generation methods.
+ module Html3 # :nodoc:
+
+ # The DOCTYPE declaration for this version of HTML
+ def doctype
+ %|<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">|
+ end
+
+ # Initialise the HTML generation methods for this version.
+ def element_init
+ extend TagMaker
+ methods = ""
+ # - -
+ for element in %w[ A TT I B U STRIKE BIG SMALL SUB SUP EM STRONG
+ DFN CODE SAMP KBD VAR CITE FONT ADDRESS DIV center MAP
+ APPLET PRE XMP LISTING DL OL UL DIR MENU SELECT table TITLE
+ STYLE SCRIPT H1 H2 H3 H4 H5 H6 TEXTAREA FORM BLOCKQUOTE
+ CAPTION ]
+ methods += <<-BEGIN + nn_element_def(element) + <<-END
+ def #{element.downcase}(attributes = {})
+ BEGIN
+ end
+ END
+ end
+
+ # - O EMPTY
+ for element in %w[ IMG BASE BASEFONT BR AREA LINK PARAM HR INPUT
+ ISINDEX META ]
+ methods += <<-BEGIN + nOE_element_def(element) + <<-END
+ def #{element.downcase}(attributes = {})
+ BEGIN
+ end
+ END
+ end
+
+ # O O or - O
+ for element in %w[ HTML HEAD BODY P PLAINTEXT DT DD LI OPTION tr
+ th td ]
+ methods += <<-BEGIN + nO_element_def(element) + <<-END
+ def #{element.downcase}(attributes = {})
+ BEGIN
+ end
+ END
+ end
+ eval(methods)
+ end
+
+ end # Html3
+
+
+ # Mixin module for HTML version 4 generation methods.
+ module Html4 # :nodoc:
+
+ # The DOCTYPE declaration for this version of HTML
+ def doctype
+ %|<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">|
+ end
+
+ # Initialise the HTML generation methods for this version.
+ def element_init
+ extend TagMaker
+ methods = ""
+ # - -
+ for element in %w[ TT I B BIG SMALL EM STRONG DFN CODE SAMP KBD
+ VAR CITE ABBR ACRONYM SUB SUP SPAN BDO ADDRESS DIV MAP OBJECT
+ H1 H2 H3 H4 H5 H6 PRE Q INS DEL DL OL UL LABEL SELECT OPTGROUP
+ FIELDSET LEGEND BUTTON TABLE TITLE STYLE SCRIPT NOSCRIPT
+ TEXTAREA FORM A BLOCKQUOTE CAPTION ]
+ methods += <<-BEGIN + nn_element_def(element) + <<-END
+ def #{element.downcase}(attributes = {})
+ BEGIN
+ end
+ END
+ end
+
+ # - O EMPTY
+ for element in %w[ IMG BASE BR AREA LINK PARAM HR INPUT COL META ]
+ methods += <<-BEGIN + nOE_element_def(element) + <<-END
+ def #{element.downcase}(attributes = {})
+ BEGIN
+ end
+ END
+ end
+
+ # O O or - O
+ for element in %w[ HTML BODY P DT DD LI OPTION THEAD TFOOT TBODY
+ COLGROUP TR TH TD HEAD]
+ methods += <<-BEGIN + nO_element_def(element) + <<-END
+ def #{element.downcase}(attributes = {})
+ BEGIN
+ end
+ END
+ end
+ eval(methods)
+ end
+
+ end # Html4
+
+
+ # Mixin module for HTML version 4 transitional generation methods.
+ module Html4Tr # :nodoc:
+
+ # The DOCTYPE declaration for this version of HTML
+ def doctype
+ %|<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">|
+ end
+
+ # Initialise the HTML generation methods for this version.
+ def element_init
+ extend TagMaker
+ methods = ""
+ # - -
+ for element in %w[ TT I B U S STRIKE BIG SMALL EM STRONG DFN
+ CODE SAMP KBD VAR CITE ABBR ACRONYM FONT SUB SUP SPAN BDO
+ ADDRESS DIV CENTER MAP OBJECT APPLET H1 H2 H3 H4 H5 H6 PRE Q
+ INS DEL DL OL UL DIR MENU LABEL SELECT OPTGROUP FIELDSET
+ LEGEND BUTTON TABLE IFRAME NOFRAMES TITLE STYLE SCRIPT
+ NOSCRIPT TEXTAREA FORM A BLOCKQUOTE CAPTION ]
+ methods += <<-BEGIN + nn_element_def(element) + <<-END
+ def #{element.downcase}(attributes = {})
+ BEGIN
+ end
+ END
+ end
+
+ # - O EMPTY
+ for element in %w[ IMG BASE BASEFONT BR AREA LINK PARAM HR INPUT
+ COL ISINDEX META ]
+ methods += <<-BEGIN + nOE_element_def(element) + <<-END
+ def #{element.downcase}(attributes = {})
+ BEGIN
+ end
+ END
+ end
+
+ # O O or - O
+ for element in %w[ HTML BODY P DT DD LI OPTION THEAD TFOOT TBODY
+ COLGROUP TR TH TD HEAD ]
+ methods += <<-BEGIN + nO_element_def(element) + <<-END
+ def #{element.downcase}(attributes = {})
+ BEGIN
+ end
+ END
+ end
+ eval(methods)
+ end
+
+ end # Html4Tr
+
+
+ # Mixin module for generating HTML version 4 with framesets.
+ module Html4Fr # :nodoc:
+
+ # The DOCTYPE declaration for this version of HTML
+ def doctype
+ %|<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">|
+ end
+
+ # Initialise the HTML generation methods for this version.
+ def element_init
+ methods = ""
+ # - -
+ for element in %w[ FRAMESET ]
+ methods += <<-BEGIN + nn_element_def(element) + <<-END
+ def #{element.downcase}(attributes = {})
+ BEGIN
+ end
+ END
+ end
+
+ # - O EMPTY
+ for element in %w[ FRAME ]
+ methods += <<-BEGIN + nOE_element_def(element) + <<-END
+ def #{element.downcase}(attributes = {})
+ BEGIN
+ end
+ END
+ end
+ eval(methods)
+ end
+
+ end # Html4Fr
+
+
+ # Creates a new CGI instance.
+ #
+ # +type+ specifies which version of HTML to load the HTML generation
+ # methods for. The following versions of HTML are supported:
+ #
+ # html3:: HTML 3.x
+ # html4:: HTML 4.0
+ # html4Tr:: HTML 4.0 Transitional
+ # html4Fr:: HTML 4.0 with Framesets
+ #
+ # If not specified, no HTML generation methods will be loaded.
+ #
+ # If the CGI object is not created in a standard CGI call environment
+ # (that is, it can't locate REQUEST_METHOD in its environment), then
+ # it will run in "offline" mode. In this mode, it reads its parameters
+ # from the command line or (failing that) from standard input. Otherwise,
+ # cookies and other parameters are parsed automatically from the standard
+ # CGI locations, which varies according to the REQUEST_METHOD.
+ def initialize(type = "query")
+ if defined?(MOD_RUBY) && !ENV.key?("GATEWAY_INTERFACE")
+ Apache.request.setup_cgi_env
+ end
+
+ extend QueryExtension
+ @multipart = false
+ if defined?(CGI_PARAMS)
+ warn "do not use CGI_PARAMS and CGI_COOKIES"
+ @params = CGI_PARAMS.dup
+ @cookies = CGI_COOKIES.dup
+ else
+ initialize_query() # set @params, @cookies
+ end
+ @output_cookies = nil
+ @output_hidden = nil
+
+ case type
+ when "html3"
+ extend Html3
+ element_init()
+ extend HtmlExtension
+ when "html4"
+ extend Html4
+ element_init()
+ extend HtmlExtension
+ when "html4Tr"
+ extend Html4Tr
+ element_init()
+ extend HtmlExtension
+ when "html4Fr"
+ extend Html4Tr
+ element_init()
+ extend Html4Fr
+ element_init()
+ extend HtmlExtension
+ end
+ end
+
+end # class CGI
diff --git a/lib/cgi/.document b/lib/cgi/.document
index 4153f97aa5..107f2f317c 100644
--- a/lib/cgi/.document
+++ b/lib/cgi/.document
@@ -1 +1,2 @@
-session.rb \ No newline at end of file
+session.rb
+
diff --git a/lib/cgi/cookie.rb b/lib/cgi/cookie.rb
deleted file mode 100644
index 68fbc8972c..0000000000
--- a/lib/cgi/cookie.rb
+++ /dev/null
@@ -1,137 +0,0 @@
- # Class representing an HTTP cookie.
- #
- # In addition to its specific fields and methods, a Cookie instance
- # is a delegator to the array of its values.
- #
- # See RFC 2965.
- #
- # == Examples of use
- # cookie1 = CGI::Cookie::new("name", "value1", "value2", ...)
- # cookie1 = CGI::Cookie::new("name" => "name", "value" => "value")
- # cookie1 = CGI::Cookie::new('name' => 'name',
- # 'value' => ['value1', 'value2', ...],
- # 'path' => 'path', # optional
- # 'domain' => 'domain', # optional
- # 'expires' => Time.now, # optional
- # 'secure' => true # optional
- # )
- #
- # cgi.out("cookie" => [cookie1, cookie2]) { "string" }
- #
- # name = cookie1.name
- # values = cookie1.value
- # path = cookie1.path
- # domain = cookie1.domain
- # expires = cookie1.expires
- # secure = cookie1.secure
- #
- # cookie1.name = 'name'
- # cookie1.value = ['value1', 'value2', ...]
- # cookie1.path = 'path'
- # cookie1.domain = 'domain'
- # cookie1.expires = Time.now + 30
- # cookie1.secure = true
-class CGI
- class Cookie < Array
-
- # Create a new CGI::Cookie object.
- #
- # The contents of the cookie can be specified as a +name+ and one
- # or more +value+ arguments. Alternatively, the contents can
- # be specified as a single hash argument. The possible keywords of
- # this hash are as follows:
- #
- # name:: the name of the cookie. Required.
- # value:: the cookie's value or list of values.
- # path:: the path for which this cookie applies. Defaults to the
- # base directory of the CGI script.
- # domain:: the domain for which this cookie applies.
- # expires:: the time at which this cookie expires, as a +Time+ object.
- # secure:: whether this cookie is a secure cookie or not (default to
- # false). Secure cookies are only transmitted to HTTPS
- # servers.
- #
- # These keywords correspond to attributes of the cookie object.
- def initialize(name = "", *value)
- if name.kind_of?(String)
- @name = name
- @value = value
- %r|^(.*/)|.match(ENV["SCRIPT_NAME"])
- @path = ($1 or "")
- @secure = false
- return super(@value)
- end
-
- options = name
- unless options.has_key?("name")
- raise ArgumentError, "`name' required"
- end
-
- @name = options["name"]
- @value = Array(options["value"])
- # simple support for IE
- if options["path"]
- @path = options["path"]
- else
- %r|^(.*/)|.match(ENV["SCRIPT_NAME"])
- @path = ($1 or "")
- end
- @domain = options["domain"]
- @expires = options["expires"]
- @secure = options["secure"] == true ? true : false
-
- super(@value)
- end
-
- attr_accessor("name", "value", "path", "domain", "expires")
- attr_reader("secure")
-
- # Set whether the Cookie is a secure cookie or not.
- #
- # +val+ must be a boolean.
- def secure=(val)
- @secure = val if val == true or val == false
- @secure
- end
-
- # Convert the Cookie to its string representation.
- def to_s
- val = @value.kind_of?(String) ? CGI::escape(@value) : @value.collect{|v| CGI::escape(v) }.join("&")
- buf = "#{@name}=#{val}"
- buf << "; domain=#{@domain}" if @domain
- buf << "; path=#{@path}" if @path
- buf << "; expires=#{CGI::rfc1123_date(@expires)}" if @expires
- buf << "; secure" if @secure == true
- buf
- end
-
- end # class Cookie
-
-
- # Parse a raw cookie string into a hash of cookie-name=>Cookie
- # pairs.
- #
- # cookies = CGI::Cookie::parse("raw_cookie_string")
- # # { "name1" => cookie1, "name2" => cookie2, ... }
- #
- def Cookie::parse(raw_cookie)
- cookies = Hash.new([])
- return cookies unless raw_cookie
-
- raw_cookie.split(/[;,]\s?/).each do |pairs|
- name, values = pairs.split('=',2)
- next unless name and values
- name = CGI::unescape(name)
- values ||= ""
- values = values.split('&').collect{|v| CGI::unescape(v,@@accept_charset) }
- if cookies.has_key?(name)
- values = cookies[name].value + values
- end
- cookies[name] = Cookie::new(name, *values)
- end
-
- cookies
- end
-end
-
-
diff --git a/lib/cgi/core.rb b/lib/cgi/core.rb
deleted file mode 100644
index 02daf14e50..0000000000
--- a/lib/cgi/core.rb
+++ /dev/null
@@ -1,792 +0,0 @@
-class CGI
-
- $CGI_ENV = ENV # for FCGI support
-
- # String for carriage return
- CR = "\015"
-
- # String for linefeed
- LF = "\012"
-
- # Standard internet newline sequence
- EOL = CR + LF
-
- REVISION = '$Id$' #:nodoc:
-
- NEEDS_BINMODE = true if /WIN/i.match(RUBY_PLATFORM)
-
- # Path separators in different environments.
- PATH_SEPARATOR = {'UNIX'=>'/', 'WINDOWS'=>'\\', 'MACINTOSH'=>':'}
-
- # HTTP status codes.
- HTTP_STATUS = {
- "OK" => "200 OK",
- "PARTIAL_CONTENT" => "206 Partial Content",
- "MULTIPLE_CHOICES" => "300 Multiple Choices",
- "MOVED" => "301 Moved Permanently",
- "REDIRECT" => "302 Found",
- "NOT_MODIFIED" => "304 Not Modified",
- "BAD_REQUEST" => "400 Bad Request",
- "AUTH_REQUIRED" => "401 Authorization Required",
- "FORBIDDEN" => "403 Forbidden",
- "NOT_FOUND" => "404 Not Found",
- "METHOD_NOT_ALLOWED" => "405 Method Not Allowed",
- "NOT_ACCEPTABLE" => "406 Not Acceptable",
- "LENGTH_REQUIRED" => "411 Length Required",
- "PRECONDITION_FAILED" => "412 Precondition Failed",
- "SERVER_ERROR" => "500 Internal Server Error",
- "NOT_IMPLEMENTED" => "501 Method Not Implemented",
- "BAD_GATEWAY" => "502 Bad Gateway",
- "VARIANT_ALSO_VARIES" => "506 Variant Also Negotiates"
- }
-
- # Abbreviated day-of-week names specified by RFC 822
- RFC822_DAYS = %w[ Sun Mon Tue Wed Thu Fri Sat ]
-
- # Abbreviated month names specified by RFC 822
- RFC822_MONTHS = %w[ Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec ]
-
- # :startdoc:
-
- def env_table
- ENV
- end
-
- def stdinput
- $stdin
- end
-
- def stdoutput
- $stdout
- end
-
- private :env_table, :stdinput, :stdoutput
-
-
- # Create an HTTP header block as a string.
- #
- # Includes the empty line that ends the header block.
- #
- # +options+ can be a string specifying the Content-Type (defaults
- # to text/html), or a hash of header key/value pairs. The following
- # header keys are recognized:
- #
- # type:: the Content-Type header. Defaults to "text/html"
- # charset:: the charset of the body, appended to the Content-Type header.
- # nph:: a boolean value. If true, prepend protocol string and status code, and
- # date; and sets default values for "server" and "connection" if not
- # explicitly set.
- # status:: the HTTP status code, returned as the Status header. See the
- # list of available status codes below.
- # server:: the server software, returned as the Server header.
- # connection:: the connection type, returned as the Connection header (for
- # instance, "close".
- # length:: the length of the content that will be sent, returned as the
- # Content-Length header.
- # language:: the language of the content, returned as the Content-Language
- # header.
- # expires:: the time on which the current content expires, as a +Time+
- # object, returned as the Expires header.
- # cookie:: a cookie or cookies, returned as one or more Set-Cookie headers.
- # The value can be the literal string of the cookie; a CGI::Cookie
- # object; an Array of literal cookie strings or Cookie objects; or a
- # hash all of whose values are literal cookie strings or Cookie objects.
- # These cookies are in addition to the cookies held in the
- # @output_cookies field.
- #
- # Other header lines can also be set; they are appended as key: value.
- #
- # header
- # # Content-Type: text/html
- #
- # header("text/plain")
- # # Content-Type: text/plain
- #
- # header("nph" => true,
- # "status" => "OK", # == "200 OK"
- # # "status" => "200 GOOD",
- # "server" => ENV['SERVER_SOFTWARE'],
- # "connection" => "close",
- # "type" => "text/html",
- # "charset" => "iso-2022-jp",
- # # Content-Type: text/html; charset=iso-2022-jp
- # "length" => 103,
- # "language" => "ja",
- # "expires" => Time.now + 30,
- # "cookie" => [cookie1, cookie2],
- # "my_header1" => "my_value"
- # "my_header2" => "my_value")
- #
- # The status codes are:
- #
- # "OK" --> "200 OK"
- # "PARTIAL_CONTENT" --> "206 Partial Content"
- # "MULTIPLE_CHOICES" --> "300 Multiple Choices"
- # "MOVED" --> "301 Moved Permanently"
- # "REDIRECT" --> "302 Found"
- # "NOT_MODIFIED" --> "304 Not Modified"
- # "BAD_REQUEST" --> "400 Bad Request"
- # "AUTH_REQUIRED" --> "401 Authorization Required"
- # "FORBIDDEN" --> "403 Forbidden"
- # "NOT_FOUND" --> "404 Not Found"
- # "METHOD_NOT_ALLOWED" --> "405 Method Not Allowed"
- # "NOT_ACCEPTABLE" --> "406 Not Acceptable"
- # "LENGTH_REQUIRED" --> "411 Length Required"
- # "PRECONDITION_FAILED" --> "412 Precondition Failed"
- # "SERVER_ERROR" --> "500 Internal Server Error"
- # "NOT_IMPLEMENTED" --> "501 Method Not Implemented"
- # "BAD_GATEWAY" --> "502 Bad Gateway"
- # "VARIANT_ALSO_VARIES" --> "506 Variant Also Negotiates"
- #
- # This method does not perform charset conversion.
- def header(options='text/html')
- if options.is_a?(String)
- content_type = options
- buf = _header_for_string(content_type)
- elsif options.is_a?(Hash)
- if options.size == 1 && options.has_key?('type')
- content_type = options['type']
- buf = _header_for_string(content_type)
- else
- buf = _header_for_hash(options.dup)
- end
- else
- raise ArgumentError.new("expected String or Hash but got #{options.class}")
- end
- if defined?(MOD_RUBY)
- _header_for_modruby(buf)
- return ''
- else
- buf << EOL # empty line of separator
- return buf
- end
- end # header()
-
- def _header_for_string(content_type) #:nodoc:
- buf = ''
- if nph?()
- buf << "#{$CGI_ENV['SERVER_PROTOCOL'] || 'HTTP/1.0'} 200 OK#{EOL}"
- buf << "Date: #{CGI.rfc1123_date(Time.now)}#{EOL}"
- buf << "Server: #{$CGI_ENV['SERVER_SOFTWARE']}#{EOL}"
- buf << "Connection: close#{EOL}"
- end
- buf << "Content-Type: #{content_type}#{EOL}"
- if @output_cookies
- @output_cookies.each {|cookie| buf << "Set-Cookie: #{cookie}#{EOL}" }
- end
- return buf
- end # _header_for_string
- private :_header_for_string
-
- def _header_for_hash(options) #:nodoc:
- buf = ''
- ## add charset to option['type']
- options['type'] ||= 'text/html'
- charset = options.delete('charset')
- options['type'] += "; charset=#{charset}" if charset
- ## NPH
- options.delete('nph') if defined?(MOD_RUBY)
- if options.delete('nph') || nph?()
- protocol = $CGI_ENV['SERVER_PROTOCOL'] || 'HTTP/1.0'
- status = options.delete('status')
- status = HTTP_STATUS[status] || status || '200 OK'
- buf << "#{protocol} #{status}#{EOL}"
- buf << "Date: #{CGI.rfc1123_date(Time.now)}#{EOL}"
- options['server'] ||= $CGI_ENV['SERVER_SOFTWARE'] || ''
- options['connection'] ||= 'close'
- end
- ## common headers
- status = options.delete('status')
- buf << "Status: #{HTTP_STATUS[status] || status}#{EOL}" if status
- server = options.delete('server')
- buf << "Server: #{server}#{EOL}" if server
- connection = options.delete('connection')
- buf << "Connection: #{connection}#{EOL}" if connection
- type = options.delete('type')
- buf << "Content-Type: #{type}#{EOL}" #if type
- length = options.delete('length')
- buf << "Content-Length: #{length}#{EOL}" if length
- language = options.delete('language')
- buf << "Content-Language: #{language}#{EOL}" if language
- expires = options.delete('expires')
- buf << "Expires: #{CGI.rfc1123_date(expires)}#{EOL}" if expires
- ## cookie
- if cookie = options.delete('cookie')
- case cookie
- when String, Cookie
- buf << "Set-Cookie: #{cookie}#{EOL}"
- when Array
- arr = cookie
- arr.each {|c| buf << "Set-Cookie: #{c}#{EOL}" }
- when Hash
- hash = cookie
- hash.each {|name, c| buf << "Set-Cookie: #{c}#{EOL}" }
- end
- end
- if @output_cookies
- @output_cookies.each {|c| buf << "Set-Cookie: #{c}#{EOL}" }
- end
- ## other headers
- options.each do |key, value|
- buf << "#{key}: #{value}#{EOL}"
- end
- return buf
- end # _header_for_hash
- private :_header_for_hash
-
- def nph? #:nodoc:
- return /IIS\/(\d+)/.match($CGI_ENV['SERVER_SOFTWARE']) && $1.to_i < 5
- end
-
- def _header_for_modruby(buf) #:nodoc:
- request = Apache::request
- buf.scan(/([^:]+): (.+)#{EOL}/o) do |name, value|
- warn sprintf("name:%s value:%s\n", name, value) if $DEBUG
- case name
- when 'Set-Cookie'
- request.headers_out.add(name, value)
- when /^status$/i
- request.status_line = value
- request.status = value.to_i
- when /^content-type$/i
- request.content_type = value
- when /^content-encoding$/i
- request.content_encoding = value
- when /^location$/i
- request.status = 302 if request.status == 200
- request.headers_out[name] = value
- else
- request.headers_out[name] = value
- end
- end
- request.send_http_header
- return ''
- end
- private :_header_for_modruby
- #
-
- # Print an HTTP header and body to $DEFAULT_OUTPUT ($>)
- #
- # The header is provided by +options+, as for #header().
- # The body of the document is that returned by the passed-
- # in block. This block takes no arguments. It is required.
- #
- # cgi = CGI.new
- # cgi.out{ "string" }
- # # Content-Type: text/html
- # # Content-Length: 6
- # #
- # # string
- #
- # cgi.out("text/plain") { "string" }
- # # Content-Type: text/plain
- # # Content-Length: 6
- # #
- # # string
- #
- # cgi.out("nph" => true,
- # "status" => "OK", # == "200 OK"
- # "server" => ENV['SERVER_SOFTWARE'],
- # "connection" => "close",
- # "type" => "text/html",
- # "charset" => "iso-2022-jp",
- # # Content-Type: text/html; charset=iso-2022-jp
- # "language" => "ja",
- # "expires" => Time.now + (3600 * 24 * 30),
- # "cookie" => [cookie1, cookie2],
- # "my_header1" => "my_value",
- # "my_header2" => "my_value") { "string" }
- #
- # Content-Length is automatically calculated from the size of
- # the String returned by the content block.
- #
- # If ENV['REQUEST_METHOD'] == "HEAD", then only the header
- # is outputted (the content block is still required, but it
- # is ignored).
- #
- # If the charset is "iso-2022-jp" or "euc-jp" or "shift_jis" then
- # the content is converted to this charset, and the language is set
- # to "ja".
- def out(options = "text/html") # :yield:
-
- options = { "type" => options } if options.kind_of?(String)
- content = yield
- options["length"] = content.bytesize.to_s
- output = stdoutput
- output.binmode if defined? output.binmode
- output.print header(options)
- output.print content unless "HEAD" == env_table['REQUEST_METHOD']
- end
-
-
- # Print an argument or list of arguments to the default output stream
- #
- # cgi = CGI.new
- # cgi.print # default: cgi.print == $DEFAULT_OUTPUT.print
- def print(*options)
- stdoutput.print(*options)
- end
-
- # Parse an HTTP query string into a hash of key=>value pairs.
- #
- # params = CGI::parse("query_string")
- # # {"name1" => ["value1", "value2", ...],
- # # "name2" => ["value1", "value2", ...], ... }
- #
- def CGI::parse(query)
- params = {}
- query.split(/[&;]/).each do |pairs|
- key, value = pairs.split('=',2).collect{|v| CGI::unescape(v) }
- if key && value
- params.has_key?(key) ? params[key].push(value) : params[key] = [value]
- elsif key
- params[key]=[]
- end
- end
- params.default=[].freeze
- params
- end
-
- # Maximum content length of post data
- ##MAX_CONTENT_LENGTH = 2 * 1024 * 1024
-
- # Maximum content length of multipart data
- MAX_MULTIPART_LENGTH = 128 * 1024 * 1024
-
- # Maximum number of request parameters when multipart
- MAX_MULTIPART_COUNT = 128
-
- # Mixin module. It provides the follow functionality groups:
- #
- # 1. Access to CGI environment variables as methods. See
- # documentation to the CGI class for a list of these variables.
- #
- # 2. Access to cookies, including the cookies attribute.
- #
- # 3. Access to parameters, including the params attribute, and overloading
- # [] to perform parameter value lookup by key.
- #
- # 4. The initialize_query method, for initialising the above
- # mechanisms, handling multipart forms, and allowing the
- # class to be used in "offline" mode.
- #
- module QueryExtension
-
- %w[ CONTENT_LENGTH SERVER_PORT ].each do |env|
- define_method(env.sub(/^HTTP_/, '').downcase) do
- (val = env_table[env]) && Integer(val)
- end
- end
-
- %w[ AUTH_TYPE CONTENT_TYPE GATEWAY_INTERFACE PATH_INFO
- PATH_TRANSLATED QUERY_STRING REMOTE_ADDR REMOTE_HOST
- REMOTE_IDENT REMOTE_USER REQUEST_METHOD SCRIPT_NAME
- SERVER_NAME SERVER_PROTOCOL SERVER_SOFTWARE
-
- HTTP_ACCEPT HTTP_ACCEPT_CHARSET HTTP_ACCEPT_ENCODING
- HTTP_ACCEPT_LANGUAGE HTTP_CACHE_CONTROL HTTP_FROM HTTP_HOST
- HTTP_NEGOTIATE HTTP_PRAGMA HTTP_REFERER HTTP_USER_AGENT ].each do |env|
- define_method(env.sub(/^HTTP_/, '').downcase) do
- env_table[env]
- end
- end
-
- # Get the raw cookies as a string.
- def raw_cookie
- env_table["HTTP_COOKIE"]
- end
-
- # Get the raw RFC2965 cookies as a string.
- def raw_cookie2
- env_table["HTTP_COOKIE2"]
- end
-
- # Get the cookies as a hash of cookie-name=>Cookie pairs.
- attr_accessor :cookies
-
- # Get the parameters as a hash of name=>values pairs, where
- # values is an Array.
- attr_reader :params
-
- # Get the uploaed files as a hash of name=>values pairs
- attr_reader :files
-
- # Set all the parameters.
- def params=(hash)
- @params.clear
- @params.update(hash)
- end
-
- def read_multipart(boundary, content_length)
- ## read first boundary
- stdin = $stdin
- first_line = "--#{boundary}#{EOL}"
- content_length -= first_line.bytesize
- status = stdin.read(first_line.bytesize)
- raise EOFError.new("no content body") unless status
- raise EOFError.new("bad content body") unless first_line == status
- ## parse and set params
- params = {}
- @files = {}
- boundary_rexp = /--#{Regexp.quote(boundary)}(#{EOL}|--)/
- boundary_size = "#{EOL}--#{boundary}#{EOL}".bytesize
- boundary_end = nil
- buf = ''
- bufsize = 10 * 1024
- max_count = MAX_MULTIPART_COUNT
- n = 0
- while true
- (n += 1) < max_count or raise StandardError.new("too many parameters.")
- ## create body (StringIO or Tempfile)
- body = create_body(bufsize < content_length)
- class << body
- if method_defined?(:path)
- alias local_path path
- else
- def local_path
- nil
- end
- end
- attr_reader :original_filename, :content_type
- end
- ## find head and boundary
- head = nil
- separator = EOL * 2
- until head && matched = boundary_rexp.match(buf)
- if !head && pos = buf.index(separator)
- len = pos + EOL.bytesize
- head = buf[0, len]
- buf = buf[(pos+separator.bytesize)..-1]
- else
- if head && buf.size > boundary_size
- len = buf.size - boundary_size
- body.print(buf[0, len])
- buf[0, len] = ''
- end
- c = stdin.read(bufsize < content_length ? bufsize : content_length)
- raise EOFError.new("bad content body") if c.nil? || c.empty?
- buf << c
- content_length -= c.bytesize
- end
- end
- ## read to end of boundary
- m = matched
- len = m.begin(0)
- s = buf[0, len]
- if s =~ /(\r?\n)\z/
- s = buf[0, len - $1.bytesize]
- end
- body.print(s)
- buf = buf[m.end(0)..-1]
- boundary_end = m[1]
- content_length = -1 if boundary_end == '--'
- ## reset file cursor position
- body.rewind
- ## original filename
- /Content-Disposition:.* filename=(?:"(.*?)"|([^;\r\n]*))/i.match(head)
- filename = $1 || $2 || ''
- filename = CGI.unescape(filename) if unescape_filename?()
- body.instance_variable_set('@original_filename', filename.taint)
- ## content type
- /Content-Type: (.*)/i.match(head)
- (content_type = $1 || '').chomp!
- body.instance_variable_set('@content_type', content_type.taint)
- ## query parameter name
- /Content-Disposition:.* name=(?:"(.*?)"|([^;\r\n]*))/i.match(head)
- name = $1 || $2 || ''
- if body.original_filename.empty?
- value=body.read.dup.force_encoding(@accept_charset)
- (params[name] ||= []) << value
- unless value.valid_encoding?
- if @accept_charset_error_block
- @accept_charset_error_block.call(name,value)
- else
- raise InvalidEncoding,"Accept-Charset encoding error"
- end
- end
- class << params[name].last;self;end.class_eval do
- define_method(:read){self}
- define_method(:original_filename){""}
- define_method(:content_type){""}
- end
- else
- (params[name] ||= []) << body
- @files[name]=body
- end
- ## break loop
- break if buf.size == 0
- break if content_length == -1
- end
- raise EOFError, "bad boundary end of body part" unless boundary_end =~ /--/
- params.default = []
- params
- end # read_multipart
- private :read_multipart
- def create_body(is_large) #:nodoc:
- if is_large
- require 'tempfile'
- body = Tempfile.new('CGI', encoding: "ascii-8bit")
- else
- begin
- require 'stringio'
- body = StringIO.new("".force_encoding("ascii-8bit"))
- rescue LoadError
- require 'tempfile'
- body = Tempfile.new('CGI', encoding: "ascii-8bit")
- end
- end
- body.binmode if defined? body.binmode
- return body
- end
- def unescape_filename? #:nodoc:
- user_agent = $CGI_ENV['HTTP_USER_AGENT']
- return /Mac/i.match(user_agent) && /Mozilla/i.match(user_agent) && !/MSIE/i.match(user_agent)
- end
-
- # offline mode. read name=value pairs on standard input.
- def read_from_cmdline
- require "shellwords"
-
- string = unless ARGV.empty?
- ARGV.join(' ')
- else
- if STDIN.tty?
- STDERR.print(
- %|(offline mode: enter name=value pairs on standard input)\n|
- )
- end
- readlines.join(' ').gsub(/\n/, '')
- end.gsub(/\\=/, '%3D').gsub(/\\&/, '%26')
-
- words = Shellwords.shellwords(string)
-
- if words.find{|x| /=/.match(x) }
- words.join('&')
- else
- words.join('+')
- end
- end
- private :read_from_cmdline
-
- # A wrapper class to use a StringIO object as the body and switch
- # to a TempFile when the passed threshold is passed.
- # Initialize the data from the query.
- #
- # Handles multipart forms (in particular, forms that involve file uploads).
- # Reads query parameters in the @params field, and cookies into @cookies.
- def initialize_query()
- if ("POST" == env_table['REQUEST_METHOD']) and
- %r|\Amultipart/form-data.*boundary=\"?([^\";,]+)\"?|.match(env_table['CONTENT_TYPE'])
- raise StandardError.new("too large multipart data.") if env_table['CONTENT_LENGTH'].to_i > MAX_MULTIPART_LENGTH
- boundary = $1.dup
- @multipart = true
- @params = read_multipart(boundary, Integer(env_table['CONTENT_LENGTH']))
- else
- @multipart = false
- @params = CGI::parse(
- case env_table['REQUEST_METHOD']
- when "GET", "HEAD"
- if defined?(MOD_RUBY)
- Apache::request.args or ""
- else
- env_table['QUERY_STRING'] or ""
- end
- when "POST"
- stdinput.binmode if defined? stdinput.binmode
- stdinput.read(Integer(env_table['CONTENT_LENGTH'])) or ''
- else
- read_from_cmdline
- end.dup.force_encoding(@accept_charset)
- )
- unless Encoding.find(@accept_charset) == Encoding::ASCII_8BIT
- @params.each do |key,values|
- values.each do |value|
- unless value.valid_encoding?
- if @accept_charset_error_block
- @accept_charset_error_block.call(key,value)
- else
- raise InvalidEncoding,"Accept-Charset encoding error"
- end
- end
- end
- end
- end
- end
-
- @cookies = CGI::Cookie::parse((env_table['HTTP_COOKIE'] or env_table['COOKIE']))
- end
- private :initialize_query
-
- def multipart?
- @multipart
- end
-
- # Get the value for the parameter with a given key.
- #
- # If the parameter has multiple values, only the first will be
- # retrieved; use #params() to get the array of values.
- def [](key)
- params = @params[key]
- return '' unless params
- value = params[0]
- if @multipart
- if value
- return value
- elsif defined? StringIO
- StringIO.new("".force_encoding("ascii-8bit"))
- else
- Tempfile.new("CGI",encoding:"ascii-8bit")
- end
- else
- str = if value then value.dup else "" end
- str
- end
- end
-
- # Return all parameter keys as an array.
- def keys(*args)
- @params.keys(*args)
- end
-
- # Returns true if a given parameter key exists in the query.
- def has_key?(*args)
- @params.has_key?(*args)
- end
- alias key? has_key?
- alias include? has_key?
-
- end # QueryExtension
-
- # InvalidEncoding Exception class
- class InvalidEncoding < Exception; end
-
- # @@accept_charset is default accept character set.
- # This default value default is "UTF-8"
- # If you want to change the default accept character set
- # when create a new CGI instance, set this:
- #
- # CGI.accept_charset = "EUC-JP"
- #
-
- @@accept_charset="UTF-8"
-
- def self.accept_charset
- @@accept_charset
- end
-
- def self.accept_charset=(accept_charset)
- @@accept_charset=accept_charset
- end
-
- # Create a new CGI instance.
- #
- # CGI accept constructor parameters either in a hash, string as a block.
- # But string is as same as using :tag_maker of hash.
- #
- # CGI.new("html3") #=> CGI.new(:tag_maker=>"html3")
- #
- # And, if you specify string, @accept_charset cannot be changed.
- # Instead, please use hash parameter.
- #
- # == accept_charset
- #
- # :accept_charset specifies encoding of received query string.
- # ( Default value is @@accept_charset. )
- # If not valid, raise CGI::InvalidEncoding
- #
- # Example. Suppose @@accept_charset # => "UTF-8"
- #
- # when not specified:
- #
- # cgi=CGI.new # @accept_charset # => "UTF-8"
- #
- # when specified "EUC-JP":
- #
- # cgi=CGI.new(:accept_charset => "EUC-JP") # => "EUC-JP"
- #
- # == block
- #
- # When you use a block, you can write a process
- # that query encoding is invalid. Example:
- #
- # encoding_error={}
- # cgi=CGI.new(:accept_charset=>"EUC-JP") do |name,value|
- # encoding_error[key] = value
- # end
- #
- # == tag_maker
- #
- # :tag_maker specifies which version of HTML to load the HTML generation
- # methods for. The following versions of HTML are supported:
- #
- # html3:: HTML 3.x
- # html4:: HTML 4.0
- # html4Tr:: HTML 4.0 Transitional
- # html4Fr:: HTML 4.0 with Framesets
- #
- # If not specified, no HTML generation methods will be loaded.
- #
- # If the CGI object is not created in a standard CGI call environment
- # (that is, it can't locate REQUEST_METHOD in its environment), then
- # it will run in "offline" mode. In this mode, it reads its parameters
- # from the command line or (failing that) from standard input. Otherwise,
- # cookies and other parameters are parsed automatically from the standard
- # CGI locations, which varies according to the REQUEST_METHOD. It works this:
- #
- # CGI.new(:tag_maker=>"html3")
- #
- # This will be obsolete:
- #
- # CGI.new("html3")
- #
- attr_reader :accept_charset
- def initialize(options = {},&block)
- @accept_charset_error_block=block if block_given?
- @options={:accept_charset=>@@accept_charset}
- case options
- when Hash
- @options.merge!(options)
- when String
- @options[:tag_maker]=options
- end
- @accept_charset=@options[:accept_charset]
- if defined?(MOD_RUBY) && !ENV.key?("GATEWAY_INTERFACE")
- Apache.request.setup_cgi_env
- end
-
- extend QueryExtension
- @multipart = false
-
- initialize_query() # set @params, @cookies
- @output_cookies = nil
- @output_hidden = nil
-
- case @options[:tag_maker]
- when "html3"
- require 'cgi/html'
- extend Html3
- element_init()
- extend HtmlExtension
- when "html4"
- require 'cgi/html'
- extend Html4
- element_init()
- extend HtmlExtension
- when "html4Tr"
- require 'cgi/html'
- extend Html4Tr
- element_init()
- extend HtmlExtension
- when "html4Fr"
- require 'cgi/html'
- extend Html4Tr
- element_init()
- extend Html4Fr
- element_init()
- extend HtmlExtension
- end
- end
-
-end # class CGI
-
-
diff --git a/lib/cgi/html.rb b/lib/cgi/html.rb
deleted file mode 100644
index 8ee38000c5..0000000000
--- a/lib/cgi/html.rb
+++ /dev/null
@@ -1,1021 +0,0 @@
- # Base module for HTML-generation mixins.
- #
- # Provides methods for code generation for tags following
- # the various DTD element types.
-class CGI
- module TagMaker # :nodoc:
-
- # Generate code for an element with required start and end tags.
- #
- # - -
- def nn_element_def(element)
- nOE_element_def(element, <<-END)
- if block_given?
- yield.to_s
- else
- ""
- end +
- "</#{element.upcase}>"
- END
- end
-
- # Generate code for an empty element.
- #
- # - O EMPTY
- def nOE_element_def(element, append = nil)
- s = <<-END
- attributes={attributes=>nil} if attributes.kind_of?(String)
- "<#{element.upcase}" + attributes.collect{|name, value|
- next unless value
- " " + CGI::escapeHTML(name.to_s) +
- if true == value
- ""
- else
- '="' + CGI::escapeHTML(value.to_s) + '"'
- end
- }.join + ">"
- END
- s.sub!(/\Z/, " +") << append if append
- s
- end
-
- # Generate code for an element for which the end (and possibly the
- # start) tag is optional.
- #
- # O O or - O
- def nO_element_def(element)
- nOE_element_def(element, <<-END)
- if block_given?
- yield.to_s + "</#{element.upcase}>"
- else
- ""
- end
- END
- end
-
- end # TagMaker
-
-
- #
- # Mixin module providing HTML generation methods.
- #
- # For example,
- # cgi.a("http://www.example.com") { "Example" }
- # # => "<A HREF=\"http://www.example.com\">Example</A>"
- #
- # Modules Http3, Http4, etc., contain more basic HTML-generation methods
- # (:title, :center, etc.).
- #
- # See class CGI for a detailed example.
- #
- module HtmlExtension
-
-
- # Generate an Anchor element as a string.
- #
- # +href+ can either be a string, giving the URL
- # for the HREF attribute, or it can be a hash of
- # the element's attributes.
- #
- # The body of the element is the string returned by the no-argument
- # block passed in.
- #
- # a("http://www.example.com") { "Example" }
- # # => "<A HREF=\"http://www.example.com\">Example</A>"
- #
- # a("HREF" => "http://www.example.com", "TARGET" => "_top") { "Example" }
- # # => "<A HREF=\"http://www.example.com\" TARGET=\"_top\">Example</A>"
- #
- def a(href = "") # :yield:
- attributes = if href.kind_of?(String)
- { "HREF" => href }
- else
- href
- end
- if block_given?
- super(attributes){ yield }
- else
- super(attributes)
- end
- end
-
- # Generate a Document Base URI element as a String.
- #
- # +href+ can either by a string, giving the base URL for the HREF
- # attribute, or it can be a has of the element's attributes.
- #
- # The passed-in no-argument block is ignored.
- #
- # base("http://www.example.com/cgi")
- # # => "<BASE HREF=\"http://www.example.com/cgi\">"
- def base(href = "") # :yield:
- attributes = if href.kind_of?(String)
- { "HREF" => href }
- else
- href
- end
- if block_given?
- super(attributes){ yield }
- else
- super(attributes)
- end
- end
-
- # Generate a BlockQuote element as a string.
- #
- # +cite+ can either be a string, give the URI for the source of
- # the quoted text, or a hash, giving all attributes of the element,
- # or it can be omitted, in which case the element has no attributes.
- #
- # The body is provided by the passed-in no-argument block
- #
- # blockquote("http://www.example.com/quotes/foo.html") { "Foo!" }
- # #=> "<BLOCKQUOTE CITE=\"http://www.example.com/quotes/foo.html\">Foo!</BLOCKQUOTE>
- def blockquote(cite = {}) # :yield:
- attributes = if cite.kind_of?(String)
- { "CITE" => cite }
- else
- cite
- end
- if block_given?
- super(attributes){ yield }
- else
- super(attributes)
- end
- end
-
-
- # Generate a Table Caption element as a string.
- #
- # +align+ can be a string, giving the alignment of the caption
- # (one of top, bottom, left, or right). It can be a hash of
- # all the attributes of the element. Or it can be omitted.
- #
- # The body of the element is provided by the passed-in no-argument block.
- #
- # caption("left") { "Capital Cities" }
- # # => <CAPTION ALIGN=\"left\">Capital Cities</CAPTION>
- def caption(align = {}) # :yield:
- attributes = if align.kind_of?(String)
- { "ALIGN" => align }
- else
- align
- end
- if block_given?
- super(attributes){ yield }
- else
- super(attributes)
- end
- end
-
-
- # Generate a Checkbox Input element as a string.
- #
- # The attributes of the element can be specified as three arguments,
- # +name+, +value+, and +checked+. +checked+ is a boolean value;
- # if true, the CHECKED attribute will be included in the element.
- #
- # Alternatively, the attributes can be specified as a hash.
- #
- # checkbox("name")
- # # = checkbox("NAME" => "name")
- #
- # checkbox("name", "value")
- # # = checkbox("NAME" => "name", "VALUE" => "value")
- #
- # checkbox("name", "value", true)
- # # = checkbox("NAME" => "name", "VALUE" => "value", "CHECKED" => true)
- def checkbox(name = "", value = nil, checked = nil)
- attributes = if name.kind_of?(String)
- { "TYPE" => "checkbox", "NAME" => name,
- "VALUE" => value, "CHECKED" => checked }
- else
- name["TYPE"] = "checkbox"
- name
- end
- input(attributes)
- end
-
- # Generate a sequence of checkbox elements, as a String.
- #
- # The checkboxes will all have the same +name+ attribute.
- # Each checkbox is followed by a label.
- # There will be one checkbox for each value. Each value
- # can be specified as a String, which will be used both
- # as the value of the VALUE attribute and as the label
- # for that checkbox. A single-element array has the
- # same effect.
- #
- # Each value can also be specified as a three-element array.
- # The first element is the VALUE attribute; the second is the
- # label; and the third is a boolean specifying whether this
- # checkbox is CHECKED.
- #
- # Each value can also be specified as a two-element
- # array, by omitting either the value element (defaults
- # to the same as the label), or the boolean checked element
- # (defaults to false).
- #
- # checkbox_group("name", "foo", "bar", "baz")
- # # <INPUT TYPE="checkbox" NAME="name" VALUE="foo">foo
- # # <INPUT TYPE="checkbox" NAME="name" VALUE="bar">bar
- # # <INPUT TYPE="checkbox" NAME="name" VALUE="baz">baz
- #
- # checkbox_group("name", ["foo"], ["bar", true], "baz")
- # # <INPUT TYPE="checkbox" NAME="name" VALUE="foo">foo
- # # <INPUT TYPE="checkbox" CHECKED NAME="name" VALUE="bar">bar
- # # <INPUT TYPE="checkbox" NAME="name" VALUE="baz">baz
- #
- # checkbox_group("name", ["1", "Foo"], ["2", "Bar", true], "Baz")
- # # <INPUT TYPE="checkbox" NAME="name" VALUE="1">Foo
- # # <INPUT TYPE="checkbox" CHECKED NAME="name" VALUE="2">Bar
- # # <INPUT TYPE="checkbox" NAME="name" VALUE="Baz">Baz
- #
- # checkbox_group("NAME" => "name",
- # "VALUES" => ["foo", "bar", "baz"])
- #
- # checkbox_group("NAME" => "name",
- # "VALUES" => [["foo"], ["bar", true], "baz"])
- #
- # checkbox_group("NAME" => "name",
- # "VALUES" => [["1", "Foo"], ["2", "Bar", true], "Baz"])
- def checkbox_group(name = "", *values)
- if name.kind_of?(Hash)
- values = name["VALUES"]
- name = name["NAME"]
- end
- values.collect{|value|
- if value.kind_of?(String)
- checkbox(name, value) + value
- else
- if value[-1] == true || value[-1] == false
- checkbox(name, value[0], value[-1]) +
- value[-2]
- else
- checkbox(name, value[0]) +
- value[-1]
- end
- end
- }.join
- end
-
-
- # Generate an File Upload Input element as a string.
- #
- # The attributes of the element can be specified as three arguments,
- # +name+, +size+, and +maxlength+. +maxlength+ is the maximum length
- # of the file's _name_, not of the file's _contents_.
- #
- # Alternatively, the attributes can be specified as a hash.
- #
- # See #multipart_form() for forms that include file uploads.
- #
- # file_field("name")
- # # <INPUT TYPE="file" NAME="name" SIZE="20">
- #
- # file_field("name", 40)
- # # <INPUT TYPE="file" NAME="name" SIZE="40">
- #
- # file_field("name", 40, 100)
- # # <INPUT TYPE="file" NAME="name" SIZE="40" MAXLENGTH="100">
- #
- # file_field("NAME" => "name", "SIZE" => 40)
- # # <INPUT TYPE="file" NAME="name" SIZE="40">
- def file_field(name = "", size = 20, maxlength = nil)
- attributes = if name.kind_of?(String)
- { "TYPE" => "file", "NAME" => name,
- "SIZE" => size.to_s }
- else
- name["TYPE"] = "file"
- name
- end
- attributes["MAXLENGTH"] = maxlength.to_s if maxlength
- input(attributes)
- end
-
-
- # Generate a Form element as a string.
- #
- # +method+ should be either "get" or "post", and defaults to the latter.
- # +action+ defaults to the current CGI script name. +enctype+
- # defaults to "application/x-www-form-urlencoded".
- #
- # Alternatively, the attributes can be specified as a hash.
- #
- # See also #multipart_form() for forms that include file uploads.
- #
- # form{ "string" }
- # # <FORM METHOD="post" ENCTYPE="application/x-www-form-urlencoded">string</FORM>
- #
- # form("get") { "string" }
- # # <FORM METHOD="get" ENCTYPE="application/x-www-form-urlencoded">string</FORM>
- #
- # form("get", "url") { "string" }
- # # <FORM METHOD="get" ACTION="url" ENCTYPE="application/x-www-form-urlencoded">string</FORM>
- #
- # form("METHOD" => "post", "ENCTYPE" => "enctype") { "string" }
- # # <FORM METHOD="post" ENCTYPE="enctype">string</FORM>
- def form(method = "post", action = script_name, enctype = "application/x-www-form-urlencoded")
- attributes = if method.kind_of?(String)
- { "METHOD" => method, "ACTION" => action,
- "ENCTYPE" => enctype }
- else
- unless method.has_key?("METHOD")
- method["METHOD"] = "post"
- end
- unless method.has_key?("ENCTYPE")
- method["ENCTYPE"] = enctype
- end
- method
- end
- if block_given?
- body = yield
- else
- body = ""
- end
- if @output_hidden
- body += @output_hidden.collect{|k,v|
- "<INPUT TYPE=\"HIDDEN\" NAME=\"#{k}\" VALUE=\"#{v}\">"
- }.join
- end
- super(attributes){body}
- end
-
- # Generate a Hidden Input element as a string.
- #
- # The attributes of the element can be specified as two arguments,
- # +name+ and +value+.
- #
- # Alternatively, the attributes can be specified as a hash.
- #
- # hidden("name")
- # # <INPUT TYPE="hidden" NAME="name">
- #
- # hidden("name", "value")
- # # <INPUT TYPE="hidden" NAME="name" VALUE="value">
- #
- # hidden("NAME" => "name", "VALUE" => "reset", "ID" => "foo")
- # # <INPUT TYPE="hidden" NAME="name" VALUE="value" ID="foo">
- def hidden(name = "", value = nil)
- attributes = if name.kind_of?(String)
- { "TYPE" => "hidden", "NAME" => name, "VALUE" => value }
- else
- name["TYPE"] = "hidden"
- name
- end
- input(attributes)
- end
-
- # Generate a top-level HTML element as a string.
- #
- # The attributes of the element are specified as a hash. The
- # pseudo-attribute "PRETTY" can be used to specify that the generated
- # HTML string should be indented. "PRETTY" can also be specified as
- # a string as the sole argument to this method. The pseudo-attribute
- # "DOCTYPE", if given, is used as the leading DOCTYPE SGML tag; it
- # should include the entire text of this tag, including angle brackets.
- #
- # The body of the html element is supplied as a block.
- #
- # html{ "string" }
- # # <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"><HTML>string</HTML>
- #
- # html("LANG" => "ja") { "string" }
- # # <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"><HTML LANG="ja">string</HTML>
- #
- # html("DOCTYPE" => false) { "string" }
- # # <HTML>string</HTML>
- #
- # html("DOCTYPE" => '<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">') { "string" }
- # # <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"><HTML>string</HTML>
- #
- # html("PRETTY" => " ") { "<BODY></BODY>" }
- # # <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
- # # <HTML>
- # # <BODY>
- # # </BODY>
- # # </HTML>
- #
- # html("PRETTY" => "\t") { "<BODY></BODY>" }
- # # <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
- # # <HTML>
- # # <BODY>
- # # </BODY>
- # # </HTML>
- #
- # html("PRETTY") { "<BODY></BODY>" }
- # # = html("PRETTY" => " ") { "<BODY></BODY>" }
- #
- # html(if $VERBOSE then "PRETTY" end) { "HTML string" }
- #
- def html(attributes = {}) # :yield:
- if nil == attributes
- attributes = {}
- elsif "PRETTY" == attributes
- attributes = { "PRETTY" => true }
- end
- pretty = attributes.delete("PRETTY")
- pretty = " " if true == pretty
- buf = ""
-
- if attributes.has_key?("DOCTYPE")
- if attributes["DOCTYPE"]
- buf += attributes.delete("DOCTYPE")
- else
- attributes.delete("DOCTYPE")
- end
- else
- buf += doctype
- end
-
- if block_given?
- buf += super(attributes){ yield }
- else
- buf += super(attributes)
- end
-
- if pretty
- CGI::pretty(buf, pretty)
- else
- buf
- end
-
- end
-
- # Generate an Image Button Input element as a string.
- #
- # +src+ is the URL of the image to use for the button. +name+
- # is the input name. +alt+ is the alternative text for the image.
- #
- # Alternatively, the attributes can be specified as a hash.
- #
- # image_button("url")
- # # <INPUT TYPE="image" SRC="url">
- #
- # image_button("url", "name", "string")
- # # <INPUT TYPE="image" SRC="url" NAME="name" ALT="string">
- #
- # image_button("SRC" => "url", "ATL" => "strng")
- # # <INPUT TYPE="image" SRC="url" ALT="string">
- def image_button(src = "", name = nil, alt = nil)
- attributes = if src.kind_of?(String)
- { "TYPE" => "image", "SRC" => src, "NAME" => name,
- "ALT" => alt }
- else
- src["TYPE"] = "image"
- src["SRC"] ||= ""
- src
- end
- input(attributes)
- end
-
-
- # Generate an Image element as a string.
- #
- # +src+ is the URL of the image. +alt+ is the alternative text for
- # the image. +width+ is the width of the image, and +height+ is
- # its height.
- #
- # Alternatively, the attributes can be specified as a hash.
- #
- # img("src", "alt", 100, 50)
- # # <IMG SRC="src" ALT="alt" WIDTH="100" HEIGHT="50">
- #
- # img("SRC" => "src", "ALT" => "alt", "WIDTH" => 100, "HEIGHT" => 50)
- # # <IMG SRC="src" ALT="alt" WIDTH="100" HEIGHT="50">
- def img(src = "", alt = "", width = nil, height = nil)
- attributes = if src.kind_of?(String)
- { "SRC" => src, "ALT" => alt }
- else
- src
- end
- attributes["WIDTH"] = width.to_s if width
- attributes["HEIGHT"] = height.to_s if height
- super(attributes)
- end
-
-
- # Generate a Form element with multipart encoding as a String.
- #
- # Multipart encoding is used for forms that include file uploads.
- #
- # +action+ is the action to perform. +enctype+ is the encoding
- # type, which defaults to "multipart/form-data".
- #
- # Alternatively, the attributes can be specified as a hash.
- #
- # multipart_form{ "string" }
- # # <FORM METHOD="post" ENCTYPE="multipart/form-data">string</FORM>
- #
- # multipart_form("url") { "string" }
- # # <FORM METHOD="post" ACTION="url" ENCTYPE="multipart/form-data">string</FORM>
- def multipart_form(action = nil, enctype = "multipart/form-data")
- attributes = if action == nil
- { "METHOD" => "post", "ENCTYPE" => enctype }
- elsif action.kind_of?(String)
- { "METHOD" => "post", "ACTION" => action,
- "ENCTYPE" => enctype }
- else
- unless action.has_key?("METHOD")
- action["METHOD"] = "post"
- end
- unless action.has_key?("ENCTYPE")
- action["ENCTYPE"] = enctype
- end
- action
- end
- if block_given?
- form(attributes){ yield }
- else
- form(attributes)
- end
- end
-
-
- # Generate a Password Input element as a string.
- #
- # +name+ is the name of the input field. +value+ is its default
- # value. +size+ is the size of the input field display. +maxlength+
- # is the maximum length of the inputted password.
- #
- # Alternatively, attributes can be specified as a hash.
- #
- # password_field("name")
- # # <INPUT TYPE="password" NAME="name" SIZE="40">
- #
- # password_field("name", "value")
- # # <INPUT TYPE="password" NAME="name" VALUE="value" SIZE="40">
- #
- # password_field("password", "value", 80, 200)
- # # <INPUT TYPE="password" NAME="name" VALUE="value" SIZE="80" MAXLENGTH="200">
- #
- # password_field("NAME" => "name", "VALUE" => "value")
- # # <INPUT TYPE="password" NAME="name" VALUE="value">
- def password_field(name = "", value = nil, size = 40, maxlength = nil)
- attributes = if name.kind_of?(String)
- { "TYPE" => "password", "NAME" => name,
- "VALUE" => value, "SIZE" => size.to_s }
- else
- name["TYPE"] = "password"
- name
- end
- attributes["MAXLENGTH"] = maxlength.to_s if maxlength
- input(attributes)
- end
-
- # Generate a Select element as a string.
- #
- # +name+ is the name of the element. The +values+ are the options that
- # can be selected from the Select menu. Each value can be a String or
- # a one, two, or three-element Array. If a String or a one-element
- # Array, this is both the value of that option and the text displayed for
- # it. If a three-element Array, the elements are the option value, displayed
- # text, and a boolean value specifying whether this option starts as selected.
- # The two-element version omits either the option value (defaults to the same
- # as the display text) or the boolean selected specifier (defaults to false).
- #
- # The attributes and options can also be specified as a hash. In this
- # case, options are specified as an array of values as described above,
- # with the hash key of "VALUES".
- #
- # popup_menu("name", "foo", "bar", "baz")
- # # <SELECT NAME="name">
- # # <OPTION VALUE="foo">foo</OPTION>
- # # <OPTION VALUE="bar">bar</OPTION>
- # # <OPTION VALUE="baz">baz</OPTION>
- # # </SELECT>
- #
- # popup_menu("name", ["foo"], ["bar", true], "baz")
- # # <SELECT NAME="name">
- # # <OPTION VALUE="foo">foo</OPTION>
- # # <OPTION VALUE="bar" SELECTED>bar</OPTION>
- # # <OPTION VALUE="baz">baz</OPTION>
- # # </SELECT>
- #
- # popup_menu("name", ["1", "Foo"], ["2", "Bar", true], "Baz")
- # # <SELECT NAME="name">
- # # <OPTION VALUE="1">Foo</OPTION>
- # # <OPTION SELECTED VALUE="2">Bar</OPTION>
- # # <OPTION VALUE="Baz">Baz</OPTION>
- # # </SELECT>
- #
- # popup_menu("NAME" => "name", "SIZE" => 2, "MULTIPLE" => true,
- # "VALUES" => [["1", "Foo"], ["2", "Bar", true], "Baz"])
- # # <SELECT NAME="name" MULTIPLE SIZE="2">
- # # <OPTION VALUE="1">Foo</OPTION>
- # # <OPTION SELECTED VALUE="2">Bar</OPTION>
- # # <OPTION VALUE="Baz">Baz</OPTION>
- # # </SELECT>
- def popup_menu(name = "", *values)
-
- if name.kind_of?(Hash)
- values = name["VALUES"]
- size = name["SIZE"].to_s if name["SIZE"]
- multiple = name["MULTIPLE"]
- name = name["NAME"]
- else
- size = nil
- multiple = nil
- end
-
- select({ "NAME" => name, "SIZE" => size,
- "MULTIPLE" => multiple }){
- values.collect{|value|
- if value.kind_of?(String)
- option({ "VALUE" => value }){ value }
- else
- if value[value.size - 1] == true
- option({ "VALUE" => value[0], "SELECTED" => true }){
- value[value.size - 2]
- }
- else
- option({ "VALUE" => value[0] }){
- value[value.size - 1]
- }
- end
- end
- }.join
- }
-
- end
-
- # Generates a radio-button Input element.
- #
- # +name+ is the name of the input field. +value+ is the value of
- # the field if checked. +checked+ specifies whether the field
- # starts off checked.
- #
- # Alternatively, the attributes can be specified as a hash.
- #
- # radio_button("name", "value")
- # # <INPUT TYPE="radio" NAME="name" VALUE="value">
- #
- # radio_button("name", "value", true)
- # # <INPUT TYPE="radio" NAME="name" VALUE="value" CHECKED>
- #
- # radio_button("NAME" => "name", "VALUE" => "value", "ID" => "foo")
- # # <INPUT TYPE="radio" NAME="name" VALUE="value" ID="foo">
- def radio_button(name = "", value = nil, checked = nil)
- attributes = if name.kind_of?(String)
- { "TYPE" => "radio", "NAME" => name,
- "VALUE" => value, "CHECKED" => checked }
- else
- name["TYPE"] = "radio"
- name
- end
- input(attributes)
- end
-
- # Generate a sequence of radio button Input elements, as a String.
- #
- # This works the same as #checkbox_group(). However, it is not valid
- # to have more than one radiobutton in a group checked.
- #
- # radio_group("name", "foo", "bar", "baz")
- # # <INPUT TYPE="radio" NAME="name" VALUE="foo">foo
- # # <INPUT TYPE="radio" NAME="name" VALUE="bar">bar
- # # <INPUT TYPE="radio" NAME="name" VALUE="baz">baz
- #
- # radio_group("name", ["foo"], ["bar", true], "baz")
- # # <INPUT TYPE="radio" NAME="name" VALUE="foo">foo
- # # <INPUT TYPE="radio" CHECKED NAME="name" VALUE="bar">bar
- # # <INPUT TYPE="radio" NAME="name" VALUE="baz">baz
- #
- # radio_group("name", ["1", "Foo"], ["2", "Bar", true], "Baz")
- # # <INPUT TYPE="radio" NAME="name" VALUE="1">Foo
- # # <INPUT TYPE="radio" CHECKED NAME="name" VALUE="2">Bar
- # # <INPUT TYPE="radio" NAME="name" VALUE="Baz">Baz
- #
- # radio_group("NAME" => "name",
- # "VALUES" => ["foo", "bar", "baz"])
- #
- # radio_group("NAME" => "name",
- # "VALUES" => [["foo"], ["bar", true], "baz"])
- #
- # radio_group("NAME" => "name",
- # "VALUES" => [["1", "Foo"], ["2", "Bar", true], "Baz"])
- def radio_group(name = "", *values)
- if name.kind_of?(Hash)
- values = name["VALUES"]
- name = name["NAME"]
- end
- values.collect{|value|
- if value.kind_of?(String)
- radio_button(name, value) + value
- else
- if value[-1] == true || value[-1] == false
- radio_button(name, value[0], value[-1]) +
- value[-2]
- else
- radio_button(name, value[0]) +
- value[-1]
- end
- end
- }.join
- end
-
- # Generate a reset button Input element, as a String.
- #
- # This resets the values on a form to their initial values. +value+
- # is the text displayed on the button. +name+ is the name of this button.
- #
- # Alternatively, the attributes can be specified as a hash.
- #
- # reset
- # # <INPUT TYPE="reset">
- #
- # reset("reset")
- # # <INPUT TYPE="reset" VALUE="reset">
- #
- # reset("VALUE" => "reset", "ID" => "foo")
- # # <INPUT TYPE="reset" VALUE="reset" ID="foo">
- def reset(value = nil, name = nil)
- attributes = if (not value) or value.kind_of?(String)
- { "TYPE" => "reset", "VALUE" => value, "NAME" => name }
- else
- value["TYPE"] = "reset"
- value
- end
- input(attributes)
- end
-
- alias scrolling_list popup_menu
-
- # Generate a submit button Input element, as a String.
- #
- # +value+ is the text to display on the button. +name+ is the name
- # of the input.
- #
- # Alternatively, the attributes can be specified as a hash.
- #
- # submit
- # # <INPUT TYPE="submit">
- #
- # submit("ok")
- # # <INPUT TYPE="submit" VALUE="ok">
- #
- # submit("ok", "button1")
- # # <INPUT TYPE="submit" VALUE="ok" NAME="button1">
- #
- # submit("VALUE" => "ok", "NAME" => "button1", "ID" => "foo")
- # # <INPUT TYPE="submit" VALUE="ok" NAME="button1" ID="foo">
- def submit(value = nil, name = nil)
- attributes = if (not value) or value.kind_of?(String)
- { "TYPE" => "submit", "VALUE" => value, "NAME" => name }
- else
- value["TYPE"] = "submit"
- value
- end
- input(attributes)
- end
-
- # Generate a text field Input element, as a String.
- #
- # +name+ is the name of the input field. +value+ is its initial
- # value. +size+ is the size of the input area. +maxlength+
- # is the maximum length of input accepted.
- #
- # Alternatively, the attributes can be specified as a hash.
- #
- # text_field("name")
- # # <INPUT TYPE="text" NAME="name" SIZE="40">
- #
- # text_field("name", "value")
- # # <INPUT TYPE="text" NAME="name" VALUE="value" SIZE="40">
- #
- # text_field("name", "value", 80)
- # # <INPUT TYPE="text" NAME="name" VALUE="value" SIZE="80">
- #
- # text_field("name", "value", 80, 200)
- # # <INPUT TYPE="text" NAME="name" VALUE="value" SIZE="80" MAXLENGTH="200">
- #
- # text_field("NAME" => "name", "VALUE" => "value")
- # # <INPUT TYPE="text" NAME="name" VALUE="value">
- def text_field(name = "", value = nil, size = 40, maxlength = nil)
- attributes = if name.kind_of?(String)
- { "TYPE" => "text", "NAME" => name, "VALUE" => value,
- "SIZE" => size.to_s }
- else
- name["TYPE"] = "text"
- name
- end
- attributes["MAXLENGTH"] = maxlength.to_s if maxlength
- input(attributes)
- end
-
- # Generate a TextArea element, as a String.
- #
- # +name+ is the name of the textarea. +cols+ is the number of
- # columns and +rows+ is the number of rows in the display.
- #
- # Alternatively, the attributes can be specified as a hash.
- #
- # The body is provided by the passed-in no-argument block
- #
- # textarea("name")
- # # = textarea("NAME" => "name", "COLS" => 70, "ROWS" => 10)
- #
- # textarea("name", 40, 5)
- # # = textarea("NAME" => "name", "COLS" => 40, "ROWS" => 5)
- def textarea(name = "", cols = 70, rows = 10) # :yield:
- attributes = if name.kind_of?(String)
- { "NAME" => name, "COLS" => cols.to_s,
- "ROWS" => rows.to_s }
- else
- name
- end
- if block_given?
- super(attributes){ yield }
- else
- super(attributes)
- end
- end
-
- end # HtmlExtension
-
-
- # Mixin module for HTML version 3 generation methods.
- module Html3 # :nodoc:
-
- # The DOCTYPE declaration for this version of HTML
- def doctype
- %|<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">|
- end
-
- # Initialise the HTML generation methods for this version.
- def element_init
- extend TagMaker
- methods = ""
- # - -
- for element in %w[ A TT I B U STRIKE BIG SMALL SUB SUP EM STRONG
- DFN CODE SAMP KBD VAR CITE FONT ADDRESS DIV center MAP
- APPLET PRE XMP LISTING DL OL UL DIR MENU SELECT table TITLE
- STYLE SCRIPT H1 H2 H3 H4 H5 H6 TEXTAREA FORM BLOCKQUOTE
- CAPTION ]
- methods += <<-BEGIN + nn_element_def(element) + <<-END
- def #{element.downcase}(attributes = {})
- BEGIN
- end
- END
- end
-
- # - O EMPTY
- for element in %w[ IMG BASE BASEFONT BR AREA LINK PARAM HR INPUT
- ISINDEX META ]
- methods += <<-BEGIN + nOE_element_def(element) + <<-END
- def #{element.downcase}(attributes = {})
- BEGIN
- end
- END
- end
-
- # O O or - O
- for element in %w[ HTML HEAD BODY P PLAINTEXT DT DD LI OPTION tr
- th td ]
- methods += <<-BEGIN + nO_element_def(element) + <<-END
- def #{element.downcase}(attributes = {})
- BEGIN
- end
- END
- end
- eval(methods)
- end
-
- end # Html3
-
-
- # Mixin module for HTML version 4 generation methods.
- module Html4 # :nodoc:
-
- # The DOCTYPE declaration for this version of HTML
- def doctype
- %|<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">|
- end
-
- # Initialise the HTML generation methods for this version.
- def element_init
- extend TagMaker
- methods = ""
- # - -
- for element in %w[ TT I B BIG SMALL EM STRONG DFN CODE SAMP KBD
- VAR CITE ABBR ACRONYM SUB SUP SPAN BDO ADDRESS DIV MAP OBJECT
- H1 H2 H3 H4 H5 H6 PRE Q INS DEL DL OL UL LABEL SELECT OPTGROUP
- FIELDSET LEGEND BUTTON TABLE TITLE STYLE SCRIPT NOSCRIPT
- TEXTAREA FORM A BLOCKQUOTE CAPTION ]
- methods += <<-BEGIN + nn_element_def(element) + <<-END
- def #{element.downcase}(attributes = {})
- BEGIN
- end
- END
- end
-
- # - O EMPTY
- for element in %w[ IMG BASE BR AREA LINK PARAM HR INPUT COL META ]
- methods += <<-BEGIN + nOE_element_def(element) + <<-END
- def #{element.downcase}(attributes = {})
- BEGIN
- end
- END
- end
-
- # O O or - O
- for element in %w[ HTML BODY P DT DD LI OPTION THEAD TFOOT TBODY
- COLGROUP TR TH TD HEAD]
- methods += <<-BEGIN + nO_element_def(element) + <<-END
- def #{element.downcase}(attributes = {})
- BEGIN
- end
- END
- end
- eval(methods)
- end
-
- end # Html4
-
-
- # Mixin module for HTML version 4 transitional generation methods.
- module Html4Tr # :nodoc:
-
- # The DOCTYPE declaration for this version of HTML
- def doctype
- %|<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">|
- end
-
- # Initialise the HTML generation methods for this version.
- def element_init
- extend TagMaker
- methods = ""
- # - -
- for element in %w[ TT I B U S STRIKE BIG SMALL EM STRONG DFN
- CODE SAMP KBD VAR CITE ABBR ACRONYM FONT SUB SUP SPAN BDO
- ADDRESS DIV CENTER MAP OBJECT APPLET H1 H2 H3 H4 H5 H6 PRE Q
- INS DEL DL OL UL DIR MENU LABEL SELECT OPTGROUP FIELDSET
- LEGEND BUTTON TABLE IFRAME NOFRAMES TITLE STYLE SCRIPT
- NOSCRIPT TEXTAREA FORM A BLOCKQUOTE CAPTION ]
- methods += <<-BEGIN + nn_element_def(element) + <<-END
- def #{element.downcase}(attributes = {})
- BEGIN
- end
- END
- end
-
- # - O EMPTY
- for element in %w[ IMG BASE BASEFONT BR AREA LINK PARAM HR INPUT
- COL ISINDEX META ]
- methods += <<-BEGIN + nOE_element_def(element) + <<-END
- def #{element.downcase}(attributes = {})
- BEGIN
- end
- END
- end
-
- # O O or - O
- for element in %w[ HTML BODY P DT DD LI OPTION THEAD TFOOT TBODY
- COLGROUP TR TH TD HEAD ]
- methods += <<-BEGIN + nO_element_def(element) + <<-END
- def #{element.downcase}(attributes = {})
- BEGIN
- end
- END
- end
- eval(methods)
- end
-
- end # Html4Tr
-
-
- # Mixin module for generating HTML version 4 with framesets.
- module Html4Fr # :nodoc:
-
- # The DOCTYPE declaration for this version of HTML
- def doctype
- %|<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">|
- end
-
- # Initialise the HTML generation methods for this version.
- def element_init
- methods = ""
- # - -
- for element in %w[ FRAMESET ]
- methods += <<-BEGIN + nn_element_def(element) + <<-END
- def #{element.downcase}(attributes = {})
- BEGIN
- end
- END
- end
-
- # - O EMPTY
- for element in %w[ FRAME ]
- methods += <<-BEGIN + nOE_element_def(element) + <<-END
- def #{element.downcase}(attributes = {})
- BEGIN
- end
- END
- end
- eval(methods)
- end
-
- end # Html4Fr
-end
-
-
diff --git a/lib/cgi/session.rb b/lib/cgi/session.rb
index 65d6442b37..a6e999bc34 100644
--- a/lib/cgi/session.rb
+++ b/lib/cgi/session.rb
@@ -13,7 +13,7 @@
#
# This file provides the +CGI::Session+ class, which provides session
# support for CGI scripts. A session is a sequence of HTTP requests
-# and responses linked together and associated with a single client.
+# and responses linked together and associated with a single client.
# Information associated with the session is stored
# on the server between requests. A session id is passed between client
# and server with every request and response, transparently
@@ -28,7 +28,7 @@ require 'tmpdir'
class CGI
- # Class representing an HTTP session. See documentation for the file
+ # Class representing an HTTP session. See documentation for the file
# cgi/session.rb for an introduction to HTTP sessions.
#
# == Lifecycle
@@ -47,7 +47,7 @@ class CGI
# == Setting and retrieving session data.
#
# The Session class associates data with a session as key-value pairs.
- # This data can be set and retrieved by indexing the Session instance
+ # This data can be set and retrieved by indexing the Session instance
# using '[]', much the same as hashes (although other hash methods
# are not supported).
#
@@ -60,21 +60,21 @@ class CGI
#
# == Storing session state
#
- # The caller can specify what form of storage to use for the session's
+ # The caller can specify what form of storage to use for the session's
# data with the +database_manager+ option to CGI::Session::new. The
# following storage classes are provided as part of the standard library:
#
- # CGI::Session::FileStore:: stores data as plain text in a flat file. Only
- # works with String data. This is the default
+ # CGI::Session::FileStore:: stores data as plain text in a flat file. Only
+ # works with String data. This is the default
# storage type.
- # CGI::Session::MemoryStore:: stores data in an in-memory hash. The data
- # only persists for as long as the current ruby
+ # CGI::Session::MemoryStore:: stores data in an in-memory hash. The data
+ # only persists for as long as the current ruby
# interpreter instance does.
# CGI::Session::PStore:: stores data in Marshalled format. Provided by
- # cgi/session/pstore.rb. Supports data of any type,
+ # cgi/session/pstore.rb. Supports data of any type,
# and provides file-locking and transaction support.
#
- # Custom storage types can also be created by defining a class with
+ # Custom storage types can also be created by defining a class with
# the following methods:
#
# new(session, options)
@@ -99,14 +99,14 @@ class CGI
# The simplest way to do this is via cookies. The CGI::Session class
# provides transparent support for session id communication via cookies
# if the client has cookies enabled.
- #
+ #
# If the client has cookies disabled, the session id must be included
# as a parameter of all requests sent by the client to the server. The
# CGI::Session class in conjunction with the CGI class will transparently
# add the session id as a hidden input field to all forms generated
# using the CGI#form() HTML generation method. No built-in support is
# provided for other mechanisms, such as URL re-writing. The caller is
- # responsible for extracting the session id from the session_id
+ # responsible for extracting the session id from the session_id
# attribute and manually encoding it in URLs and adding it as a hidden
# input to HTML forms created by other mechanisms. Also, session expiry
# is not automatically handled.
@@ -124,10 +124,10 @@ class CGI
# session = CGI::Session.new(cgi,
# 'database_manager' => CGI::Session::PStore, # use PStore
# 'session_key' => '_rb_sess_id', # custom session key
- # 'session_expires' => Time.now + 30 * 60, # 30 minute timeout
+ # 'session_expires' => Time.now + 30 * 60, # 30 minute timeout
# 'prefix' => 'pstore_sid_') # PStore option
# if cgi.has_key?('user_name') and cgi['user_name'] != ''
- # # coerce to String: cgi[] returns the
+ # # coerce to String: cgi[] returns the
# # string-like CGI::QueryExtension::Value
# session['user_name'] = cgi['user_name'].to_s
# elsif !session['user_name']
@@ -143,11 +143,11 @@ class CGI
# cgi = CGI.new("html4")
#
# # We make sure to delete an old session if one exists,
- # # not just to free resources, but to prevent the session
+ # # not just to free resources, but to prevent the session
# # from being maliciously hijacked later on.
# begin
- # session = CGI::Session.new(cgi, 'new_session' => false)
- # session.delete
+ # session = CGI::Session.new(cgi, 'new_session' => false)
+ # session.delete
# rescue ArgumentError # if no old session
# end
# session = CGI::Session.new(cgi, 'new_session' => true)
@@ -163,7 +163,7 @@ class CGI
def Session::callback(dbman) #:nodoc:
Proc.new{
- dbman[0].close unless dbman.empty?
+ dbman[0].close unless dbman.empty?
}
end
@@ -172,7 +172,7 @@ class CGI
# The session id is an MD5 hash based upon the time,
# a random number, and a constant string. This routine
# is used internally for automatically generated
- # session ids.
+ # session ids.
def create_new_id
require 'securerandom'
begin
@@ -188,6 +188,7 @@ class CGI
md5.update('foobar')
session_id = md5.hexdigest
end
+ @new_session = true
session_id
end
private :create_new_id
@@ -205,7 +206,7 @@ class CGI
# it is retrieved from the +session_key+ parameter
# of the request, or automatically generated for
# a new session.
- # new_session:: if true, force creation of a new session. If not set,
+ # new_session:: if true, force creation of a new session. If not set,
# a new session is only created if none currently
# exists. If false, a new session is never created,
# and if none currently exists and the +session_id+
@@ -220,7 +221,7 @@ class CGI
# The following options are also recognised, but only apply if the
# session id is stored in a cookie.
#
- # session_expires:: the time the current session expires, as a
+ # session_expires:: the time the current session expires, as a
# +Time+ object. If not set, the session will terminate
# when the user's browser is closed.
# session_domain:: the hostname domain for which this session is valid.
@@ -232,10 +233,10 @@ class CGI
# +option+ is also passed on to the session storage class initializer; see
# the documentation for each session storage class for the options
# they support.
- #
+ #
# The retrieved or created session is automatically added to +request+
# as a cookie, and also to its +output_hidden+ table, which is used
- # to add hidden input elements to forms.
+ # to add hidden input elements to forms.
#
# *WARNING* the +output_hidden+
# fields are surrounded by a <fieldset> tag in HTML 4 generation, which
@@ -253,26 +254,24 @@ class CGI
session_key = option['session_key'] || '_session_id'
session_id = option['session_id']
unless session_id
- if option['new_session']
- session_id = create_new_id
- @new_session = true
- end
+ if option['new_session']
+ session_id = create_new_id
+ end
end
unless session_id
- if request.key?(session_key)
- session_id = request[session_key]
- session_id = session_id.read if session_id.respond_to?(:read)
- end
- unless session_id
- session_id, = request.cookies[session_key]
- end
- unless session_id
- unless option.fetch('new_session', true)
- raise ArgumentError, "session_key `%s' should be supplied"%session_key
- end
- session_id = create_new_id
- @new_session = true
- end
+ if request.key?(session_key)
+ session_id = request[session_key]
+ session_id = session_id.read if session_id.respond_to?(:read)
+ end
+ unless session_id
+ session_id, = request.cookies[session_key]
+ end
+ unless session_id
+ unless option.fetch('new_session', true)
+ raise ArgumentError, "session_key `%s' should be supplied"%session_key
+ end
+ session_id = create_new_id
+ end
end
@session_id = session_id
dbman = option['database_manager'] || FileStore
@@ -282,26 +281,24 @@ class CGI
unless option.fetch('new_session', true)
raise ArgumentError, "invalid session_id `%s'"%session_id
end
- session_id = @session_id = create_new_id unless session_id
- @new_session=true
+ session_id = @session_id = create_new_id
retry
end
request.instance_eval do
- @output_hidden = {session_key => session_id} unless option['no_hidden']
- @output_cookies = [
+ @output_hidden = {session_key => session_id} unless option['no_hidden']
+ @output_cookies = [
Cookie::new("name" => session_key,
- "value" => session_id,
- "expires" => option['session_expires'],
- "domain" => option['session_domain'],
- "secure" => option['session_secure'],
- "path" =>
- if option['session_path']
- option['session_path']
- elsif ENV["SCRIPT_NAME"]
- File::dirname(ENV["SCRIPT_NAME"])
- else
- ""
- end)
+ "value" => session_id,
+ "expires" => option['session_expires'],
+ "domain" => option['session_domain'],
+ "secure" => option['session_secure'],
+ "path" => if option['session_path'] then
+ option['session_path']
+ elsif ENV["SCRIPT_NAME"] then
+ File::dirname(ENV["SCRIPT_NAME"])
+ else
+ ""
+ end)
] unless option['no_cookies']
end
@dbprot = [@dbman]
@@ -323,11 +320,11 @@ class CGI
# Store session data on the server. For some session storage types,
# this is a no-op.
- def update
+ def update
@dbman.update
end
- # Store session data on the server and close the session storage.
+ # Store session data on the server and close the session storage.
# For some session storage types, this is a no-op.
def close
@dbman.close
@@ -359,7 +356,7 @@ class CGI
# created. The session id must only contain alphanumeric
# characters; automatically generated session ids observe
# this requirement.
- #
+ #
# +option+ is a hash of options for the initializer. The
# following options are recognised:
#
@@ -368,7 +365,7 @@ class CGI
# on Unix systems).
# prefix:: the prefix to add to the session id when generating
# the filename for this session's FileStore file.
- # Defaults to "cgi_sid_".
+ # Defaults to the empty string.
# suffix:: the prefix to add to the session id when generating
# the filename for this session's FileStore file.
# Defaults to the empty string.
@@ -376,56 +373,56 @@ class CGI
# This session's FileStore file will be created if it does
# not exist, or opened if it does.
def initialize(session, option={})
- dir = option['tmpdir'] || Dir::tmpdir
- prefix = option['prefix'] || 'cgi_sid_'
- suffix = option['suffix'] || ''
- id = session.session_id
+ dir = option['tmpdir'] || Dir::tmpdir
+ prefix = option['prefix'] || ''
+ suffix = option['suffix'] || ''
+ id = session.session_id
require 'digest/md5'
md5 = Digest::MD5.hexdigest(id)[0,16]
- @path = dir+"/"+prefix+md5+suffix
- if File::exist? @path
- @hash = nil
- else
+ @path = dir+"/"+prefix+md5+suffix
+ if File::exist? @path
+ @hash = nil
+ else
unless session.new_session
raise CGI::Session::NoSession, "uninitialized session"
end
- @hash = {}
- end
+ @hash = {}
+ end
end
# Restore session state from the session's FileStore file.
#
# Returns the session state as a hash.
def restore
- unless @hash
- @hash = {}
+ unless @hash
+ @hash = {}
begin
lockf = File.open(@path+".lock", "r")
lockf.flock File::LOCK_SH
- f = File.open(@path, 'r')
- for line in f
- line.chomp!
- k, v = line.split('=',2)
- @hash[CGI::unescape(k)] = Marshal.restore(CGI::unescape(v))
- end
+ f = File.open(@path, 'r')
+ for line in f
+ line.chomp!
+ k, v = line.split('=',2)
+ @hash[CGI::unescape(k)] = CGI::unescape(v)
+ end
ensure
- f.close unless f.nil?
+ f.close unless f.nil?
lockf.close if lockf
end
- end
- @hash
+ end
+ @hash
end
# Save session state to the session's FileStore file.
def update
- return unless @hash
+ return unless @hash
begin
lockf = File.open(@path+".lock", File::CREAT|File::RDWR, 0600)
- lockf.flock File::LOCK_EX
+ lockf.flock File::LOCK_EX
f = File.open(@path+".new", File::CREAT|File::TRUNC|File::WRONLY, 0600)
- for k,v in @hash
- f.printf "%s=%s\n", CGI::escape(k), CGI::escape(String(Marshal.dump(v)))
- end
+ for k,v in @hash
+ f.printf "%s=%s\n", CGI::escape(k), CGI::escape(String(v))
+ end
f.close
File.rename @path+".new", @path
ensure
@@ -436,21 +433,22 @@ class CGI
# Update and close the session's FileStore file.
def close
- update
+ update
end
# Close and delete the session's FileStore file.
def delete
File::unlink @path+".lock" rescue nil
File::unlink @path+".new" rescue nil
- File::unlink @path rescue Errno::ENOENT
+ File::unlink @path
+ rescue Errno::ENOENT
end
end
# In-memory session storage class.
#
# Implements session storage as a global in-memory hash. Session
- # data will only persist for as long as the ruby interpreter
+ # data will only persist for as long as the ruby interpreter
# instance does.
class MemoryStore
GLOBAL_HASH_TABLE = {} #:nodoc:
@@ -461,7 +459,7 @@ class CGI
# +option+ is a list of initialisation options. None are
# currently recognised.
def initialize(session, option=nil)
- @session_id = session.session_id
+ @session_id = session.session_id
unless GLOBAL_HASH_TABLE.key?(@session_id)
unless session.new_session
raise CGI::Session::NoSession, "uninitialized session"
@@ -474,63 +472,26 @@ class CGI
#
# Returns session data as a hash.
def restore
- GLOBAL_HASH_TABLE[@session_id]
- end
-
- # Update session state.
- #
- # A no-op.
- def update
- # don't need to update; hash is shared
- end
-
- # Close session storage.
- #
- # A no-op.
- def close
- # don't need to close
- end
-
- # Delete the session state.
- def delete
- GLOBAL_HASH_TABLE.delete(@session_id)
- end
- end
-
- # Dummy session storage class.
- #
- # Implements session storage place holder. No actual storage
- # will be done.
- class NullStore
- # Create a new NullStore instance.
- #
- # +session+ is the session this instance is associated with.
- # +option+ is a list of initialisation options. None are
- # currently recognised.
- def initialize(session, option=nil)
- end
-
- # Restore (empty) session state.
- def restore
- {}
+ GLOBAL_HASH_TABLE[@session_id]
end
# Update session state.
#
# A no-op.
def update
+ # don't need to update; hash is shared
end
# Close session storage.
#
# A no-op.
def close
+ # don't need to close
end
# Delete the session state.
- #
- # A no-op.
def delete
+ GLOBAL_HASH_TABLE.delete(@session_id)
end
end
end
diff --git a/lib/cgi/session/pstore.rb b/lib/cgi/session/pstore.rb
index a63d7d3984..3d204d5dc0 100644
--- a/lib/cgi/session/pstore.rb
+++ b/lib/cgi/session/pstore.rb
@@ -2,7 +2,7 @@
# cgi/session/pstore.rb - persistent storage of marshalled session data
#
# Documentation: William Webber (william@williamwebber.com)
-#
+#
# == Overview
#
# This file provides the CGI::Session::PStore class, which builds
@@ -29,7 +29,7 @@ class CGI
# created. The session id must only contain alphanumeric
# characters; automatically generated session ids observe
# this requirement.
- #
+ #
# +option+ is a hash of options for the initializer. The
# following options are recognised:
#
@@ -43,55 +43,55 @@ class CGI
# This session's PStore file will be created if it does
# not exist, or opened if it does.
def initialize(session, option={})
- dir = option['tmpdir'] || Dir::tmpdir
- prefix = option['prefix'] || ''
- id = session.session_id
+ dir = option['tmpdir'] || Dir::tmpdir
+ prefix = option['prefix'] || ''
+ id = session.session_id
require 'digest/md5'
md5 = Digest::MD5.hexdigest(id)[0,16]
- path = dir+"/"+prefix+md5
- path.untaint
- if File::exist?(path)
- @hash = nil
- else
+ path = dir+"/"+prefix+md5
+ path.untaint
+ if File::exist?(path)
+ @hash = nil
+ else
unless session.new_session
raise CGI::Session::NoSession, "uninitialized session"
end
- @hash = {}
- end
- @p = ::PStore.new(path)
- @p.transaction do |p|
- File.chmod(0600, p.path)
- end
+ @hash = {}
+ end
+ @p = ::PStore.new(path)
+ @p.transaction do |p|
+ File.chmod(0600, p.path)
+ end
end
# Restore session state from the session's PStore file.
#
# Returns the session state as a hash.
def restore
- unless @hash
- @p.transaction do
- @hash = @p['hash'] || {}
- end
- end
- @hash
+ unless @hash
+ @p.transaction do
+ @hash = @p['hash'] || {}
+ end
+ end
+ @hash
end
# Save session state to the session's PStore file.
- def update
- @p.transaction do
- @p['hash'] = @hash
- end
+ def update
+ @p.transaction do
+ @p['hash'] = @hash
+ end
end
# Update and close the session's PStore file.
def close
- update
+ update
end
# Close and delete the session's PStore file.
def delete
- path = @p.path
- File::unlink path
+ path = @p.path
+ File::unlink path
end
end
diff --git a/lib/cgi/util.rb b/lib/cgi/util.rb
deleted file mode 100644
index 218bdbdd9a..0000000000
--- a/lib/cgi/util.rb
+++ /dev/null
@@ -1,181 +0,0 @@
-class CGI
- # URL-encode a string.
- # url_encoded_string = CGI::escape("'Stop!' said Fred")
- # # => "%27Stop%21%27+said+Fred"
- def CGI::escape(string)
- string.gsub(/([^ a-zA-Z0-9_.-]+)/) do
- '%' + $1.unpack('H2' * $1.bytesize).join('%').upcase
- end.tr(' ', '+')
- end
-
-
- # URL-decode a string with encoding(optional).
- # string = CGI::unescape("%27Stop%21%27+said+Fred")
- # # => "'Stop!' said Fred"
- def CGI::unescape(string,encoding=@@accept_charset)
- str=string.tr('+', ' ').gsub(/((?:%[0-9a-fA-F]{2})+)/) do
- [$1.delete('%')].pack('H*')
- end.force_encoding(encoding)
- str.valid_encoding? ? str : str.force_encoding(string.encoding)
- end
-
- TABLE_FOR_ESCAPE_HTML__ = {
- '&' => '&amp;',
- '"' => '&quot;',
- '<' => '&lt;',
- '>' => '&gt;',
- }
-
- # Escape special characters in HTML, namely &\"<>
- # CGI::escapeHTML('Usage: foo "bar" <baz>')
- # # => "Usage: foo &quot;bar&quot; &lt;baz&gt;"
- def CGI::escapeHTML(string)
- string.gsub(/[&\"<>]/, TABLE_FOR_ESCAPE_HTML__)
- end
-
-
- # Unescape a string that has been HTML-escaped
- # CGI::unescapeHTML("Usage: foo &quot;bar&quot; &lt;baz&gt;")
- # # => "Usage: foo \"bar\" <baz>"
- def CGI::unescapeHTML(string)
- enc = string.encoding
- if [Encoding::UTF_16BE, Encoding::UTF_16LE, Encoding::UTF_32BE, Encoding::UTF_32LE].include?(enc)
- return string.gsub(Regexp.new('&(amp|quot|gt|lt|#[0-9]+|#x[0-9A-Fa-f]+);'.encode(enc))) do
- case $1.encode("US-ASCII")
- when 'amp' then '&'.encode(enc)
- when 'quot' then '"'.encode(enc)
- when 'gt' then '>'.encode(enc)
- when 'lt' then '<'.encode(enc)
- when /\A#0*(\d+)\z/ then $1.to_i.chr(enc)
- when /\A#x([0-9a-f]+)\z/i then $1.hex.chr(enc)
- end
- end
- end
- asciicompat = Encoding.compatible?(string, "a")
- string.gsub(/&(amp|quot|gt|lt|\#[0-9]+|\#x[0-9A-Fa-f]+);/) do
- match = $1.dup
- case match
- when 'amp' then '&'
- when 'quot' then '"'
- when 'gt' then '>'
- when 'lt' then '<'
- when /\A#0*(\d+)\z/
- n = $1.to_i
- if enc == Encoding::UTF_8 or
- enc == Encoding::ISO_8859_1 && n < 256 or
- asciicompat && n < 128
- n.chr(enc)
- else
- "&##{$1};"
- end
- when /\A#x([0-9a-f]+)\z/i
- n = $1.hex
- if enc == Encoding::UTF_8 or
- enc == Encoding::ISO_8859_1 && n < 256 or
- asciicompat && n < 128
- n.chr(enc)
- else
- "&#x#{$1};"
- end
- else
- "&#{match};"
- end
- end
- end
- def CGI::escape_html(str)
- escapeHTML(str)
- end
- def CGI::unescape_html(str)
- unescapeHTML(str)
- end
-
- # Escape only the tags of certain HTML elements in +string+.
- #
- # Takes an element or elements or array of elements. Each element
- # is specified by the name of the element, without angle brackets.
- # This matches both the start and the end tag of that element.
- # The attribute list of the open tag will also be escaped (for
- # instance, the double-quotes surrounding attribute values).
- #
- # print CGI::escapeElement('<BR><A HREF="url"></A>', "A", "IMG")
- # # "<BR>&lt;A HREF=&quot;url&quot;&gt;&lt;/A&gt"
- #
- # print CGI::escapeElement('<BR><A HREF="url"></A>', ["A", "IMG"])
- # # "<BR>&lt;A HREF=&quot;url&quot;&gt;&lt;/A&gt"
- def CGI::escapeElement(string, *elements)
- elements = elements[0] if elements[0].kind_of?(Array)
- unless elements.empty?
- string.gsub(/<\/?(?:#{elements.join("|")})(?!\w)(?:.|\n)*?>/i) do
- CGI::escapeHTML($&)
- end
- else
- string
- end
- end
-
-
- # Undo escaping such as that done by CGI::escapeElement()
- #
- # print CGI::unescapeElement(
- # CGI::escapeHTML('<BR><A HREF="url"></A>'), "A", "IMG")
- # # "&lt;BR&gt;<A HREF="url"></A>"
- #
- # print CGI::unescapeElement(
- # CGI::escapeHTML('<BR><A HREF="url"></A>'), ["A", "IMG"])
- # # "&lt;BR&gt;<A HREF="url"></A>"
- def CGI::unescapeElement(string, *elements)
- elements = elements[0] if elements[0].kind_of?(Array)
- unless elements.empty?
- string.gsub(/&lt;\/?(?:#{elements.join("|")})(?!\w)(?:.|\n)*?&gt;/i) do
- CGI::unescapeHTML($&)
- end
- else
- string
- end
- end
- def CGI::escape_element(str)
- escapeElement(str)
- end
- def CGI::unescape_element(str)
- unescapeElement(str)
- end
-
- # Format a +Time+ object as a String using the format specified by RFC 1123.
- #
- # CGI::rfc1123_date(Time.now)
- # # Sat, 01 Jan 2000 00:00:00 GMT
- def CGI::rfc1123_date(time)
- t = time.clone.gmtime
- return format("%s, %.2d %s %.4d %.2d:%.2d:%.2d GMT",
- RFC822_DAYS[t.wday], t.day, RFC822_MONTHS[t.month-1], t.year,
- t.hour, t.min, t.sec)
- end
-
- # Prettify (indent) an HTML string.
- #
- # +string+ is the HTML string to indent. +shift+ is the indentation
- # unit to use; it defaults to two spaces.
- #
- # print CGI::pretty("<HTML><BODY></BODY></HTML>")
- # # <HTML>
- # # <BODY>
- # # </BODY>
- # # </HTML>
- #
- # print CGI::pretty("<HTML><BODY></BODY></HTML>", "\t")
- # # <HTML>
- # # <BODY>
- # # </BODY>
- # # </HTML>
- #
- def CGI::pretty(string, shift = " ")
- lines = string.gsub(/(?!\A)<(?:.|\n)*?>/, "\n\\0").gsub(/<(?:.|\n)*?>(?!\n)/, "\\0\n")
- end_pos = 0
- while end_pos = lines.index(/^<\/(\w+)/, end_pos)
- element = $1.dup
- start_pos = lines.rindex(/^\s*<#{element}/i, end_pos)
- lines[start_pos ... end_pos] = "__" + lines[start_pos ... end_pos].gsub(/\n(?!\z)/, "\n" + shift) + "__"
- end
- lines.gsub(/^((?:#{Regexp::quote(shift)})*)__(?=<\/?\w)/, '\1')
- end
-end
diff --git a/lib/cmath.rb b/lib/cmath.rb
deleted file mode 100644
index b23dac239c..0000000000
--- a/lib/cmath.rb
+++ /dev/null
@@ -1,254 +0,0 @@
-module CMath
-
- include Math
-
- alias exp! exp
- alias log! log
- alias log2! log2
- alias log10! log10
- alias sqrt! sqrt
- alias cbrt! cbrt
-
- alias sin! sin
- alias cos! cos
- alias tan! tan
-
- alias sinh! sinh
- alias cosh! cosh
- alias tanh! tanh
-
- alias asin! asin
- alias acos! acos
- alias atan! atan
- alias atan2! atan2
-
- alias asinh! asinh
- alias acosh! acosh
- alias atanh! atanh
-
- def exp(z)
- if z.real?
- exp!(z)
- else
- ere = exp!(z.real)
- Complex(ere * cos!(z.imag),
- ere * sin!(z.imag))
- end
- end
-
- def log(*args)
- z, b = args
- if z.real? and z >= 0 and (b.nil? or b >= 0)
- log!(*args)
- else
- a = Complex(log!(z.abs), z.arg)
- if b
- a /= log(b)
- end
- a
- end
- end
-
- def log2(z)
- if z.real? and z >= 0
- log2!(z)
- else
- log(z) / log!(2)
- end
- end
-
- def log10(z)
- if z.real? and z >= 0
- log10!(z)
- else
- log(z) / log!(10)
- end
- end
-
- def sqrt(z)
- if z.real?
- if z < 0
- Complex(0, sqrt!(-z))
- else
- sqrt!(z)
- end
- else
- if z.imag < 0 ||
- (z.imag == 0 && z.imag.to_s[0] == '-')
- sqrt(z.conjugate).conjugate
- else
- r = z.abs
- x = z.real
- Complex(sqrt!((r + x) / 2), sqrt!((r - x) / 2))
- end
- end
- end
-
- def cbrt(z)
- if z.real? and z >= 0
- cbrt!(z)
- else
- Complex(z) ** (1.0/3)
- end
- end
-
- def sin(z)
- if z.real?
- sin!(z)
- else
- Complex(sin!(z.real) * cosh!(z.imag),
- cos!(z.real) * sinh!(z.imag))
- end
- end
-
- def cos(z)
- if z.real?
- cos!(z)
- else
- Complex(cos!(z.real) * cosh!(z.imag),
- -sin!(z.real) * sinh!(z.imag))
- end
- end
-
- def tan(z)
- if z.real?
- tan!(z)
- else
- sin(z) / cos(z)
- end
- end
-
- def sinh(z)
- if z.real?
- sinh!(z)
- else
- Complex(sinh!(z.real) * cos!(z.imag),
- cosh!(z.real) * sin!(z.imag))
- end
- end
-
- def cosh(z)
- if z.real?
- cosh!(z)
- else
- Complex(cosh!(z.real) * cos!(z.imag),
- sinh!(z.real) * sin!(z.imag))
- end
- end
-
- def tanh(z)
- if z.real?
- tanh!(z)
- else
- sinh(z) / cosh(z)
- end
- end
-
- def asin(z)
- if z.real? and z >= -1 and z <= 1
- asin!(z)
- else
- (-1.0).i * log(1.0.i * z + sqrt(1.0 - z * z))
- end
- end
-
- def acos(z)
- if z.real? and z >= -1 and z <= 1
- acos!(z)
- else
- (-1.0).i * log(z + 1.0.i * sqrt(1.0 - z * z))
- end
- end
-
- def atan(z)
- if z.real?
- atan!(z)
- else
- 1.0.i * log((1.0.i + z) / (1.0.i - z)) / 2.0
- end
- end
-
- def atan2(y,x)
- if y.real? and x.real?
- atan2!(y,x)
- else
- (-1.0).i * log((x + 1.0.i * y) / sqrt(x * x + y * y))
- end
- end
-
- def asinh(z)
- if z.real?
- asinh!(z)
- else
- log(z + sqrt(1.0 + z * z))
- end
- end
-
- def acosh(z)
- if z.real? and z >= 1
- acosh!(z)
- else
- log(z + sqrt(z * z - 1.0))
- end
- end
-
- def atanh(z)
- if z.real? and z >= -1 and z <= 1
- atanh!(z)
- else
- log((1.0 + z) / (1.0 - z)) / 2.0
- end
- end
-
- module_function :exp!
- module_function :exp
- module_function :log!
- module_function :log
- module_function :log2!
- module_function :log2
- module_function :log10!
- module_function :log10
- module_function :sqrt!
- module_function :sqrt
- module_function :cbrt!
- module_function :cbrt
-
- module_function :sin!
- module_function :sin
- module_function :cos!
- module_function :cos
- module_function :tan!
- module_function :tan
-
- module_function :sinh!
- module_function :sinh
- module_function :cosh!
- module_function :cosh
- module_function :tanh!
- module_function :tanh
-
- module_function :asin!
- module_function :asin
- module_function :acos!
- module_function :acos
- module_function :atan!
- module_function :atan
- module_function :atan2!
- module_function :atan2
-
- module_function :asinh!
- module_function :asinh
- module_function :acosh!
- module_function :acosh
- module_function :atanh!
- module_function :atanh
-
- module_function :frexp
- module_function :ldexp
- module_function :hypot
- module_function :erf
- module_function :erfc
- module_function :gamma
- module_function :lgamma
-
-end
diff --git a/lib/complex.rb b/lib/complex.rb
index 9c57ecdf7a..fbf50ffece 100644
--- a/lib/complex.rb
+++ b/lib/complex.rb
@@ -1,28 +1,663 @@
-# :enddoc:
+#
+# complex.rb -
+# $Release Version: 0.5 $
+# $Revision: 1.3 $
+# $Date: 1998/07/08 10:05:28 $
+# by Keiju ISHITSUKA(SHL Japan Inc.)
+#
+# ----
+#
+# complex.rb implements the Complex class for complex numbers. Additionally,
+# some methods in other Numeric classes are redefined or added to allow greater
+# interoperability with Complex numbers.
+#
+# Complex numbers can be created in the following manner:
+# - <tt>Complex(a, b)</tt>
+# - <tt>Complex.polar(radius, theta)</tt>
+#
+# Additionally, note the following:
+# - <tt>Complex::I</tt> (the mathematical constant <i>i</i>)
+# - <tt>Numeric#im</tt> (e.g. <tt>5.im -> 0+5i</tt>)
+#
+# The following +Math+ module methods are redefined to handle Complex arguments.
+# They will work as normal with non-Complex arguments.
+# sqrt exp cos sin tan log log10
+# cosh sinh tanh acos asin atan atan2 acosh asinh atanh
+#
-warn('lib/complex.rb is deprecated') if $VERBOSE
-require 'cmath'
+#
+# Numeric is a built-in class on which Fixnum, Bignum, etc., are based. Here
+# some methods are added so that all number types can be treated to some extent
+# as Complex numbers.
+#
+class Numeric
+ #
+ # Returns a Complex number <tt>(0,<i>self</i>)</tt>.
+ #
+ def im
+ Complex(0, self)
+ end
+
+ #
+ # The real part of a complex number, i.e. <i>self</i>.
+ #
+ def real
+ self
+ end
+
+ #
+ # The imaginary part of a complex number, i.e. 0.
+ #
+ def image
+ 0
+ end
+ alias imag image
+
+ #
+ # See Complex#arg.
+ #
+ def arg
+ if self >= 0
+ return 0
+ else
+ return Math::PI
+ end
+ end
+ alias angle arg
+
+ #
+ # See Complex#polar.
+ #
+ def polar
+ return abs, arg
+ end
+
+ #
+ # See Complex#conjugate (short answer: returns <i>self</i>).
+ #
+ def conjugate
+ self
+ end
+ alias conj conjugate
+end
-unless defined?(Math.exp!)
- Object.instance_eval{remove_const :Math}
- Math = CMath
+
+#
+# Creates a Complex number. +a+ and +b+ should be Numeric. The result will be
+# <tt>a+bi</tt>.
+#
+def Complex(a, b = 0)
+ if b == 0 and (a.kind_of?(Complex) or defined? Complex::Unify)
+ a
+ else
+ Complex.new( a.real-b.imag, a.imag+b.real )
+ end
end
-def Complex.generic? (other)
- other.kind_of?(Integer) ||
- other.kind_of?(Float) ||
- other.kind_of?(Rational)
+#
+# The complex number class. See complex.rb for an overview.
+#
+class Complex < Numeric
+ @RCS_ID='-$Id: complex.rb,v 1.3 1998/07/08 10:05:28 keiju Exp keiju $-'
+
+ undef step
+ undef div, divmod
+ undef floor, truncate, ceil, round
+
+ def Complex.generic?(other) # :nodoc:
+ other.kind_of?(Integer) or
+ other.kind_of?(Float) or
+ (defined?(Rational) and other.kind_of?(Rational))
+ end
+
+ #
+ # Creates a +Complex+ number in terms of +r+ (radius) and +theta+ (angle).
+ #
+ def Complex.polar(r, theta)
+ Complex(r*Math.cos(theta), r*Math.sin(theta))
+ end
+
+ #
+ # Creates a +Complex+ number <tt>a</tt>+<tt>b</tt><i>i</i>.
+ #
+ def Complex.new!(a, b=0)
+ new(a,b)
+ end
+
+ def initialize(a, b)
+ raise TypeError, "non numeric 1st arg `#{a.inspect}'" if !a.kind_of? Numeric
+ raise TypeError, "`#{a.inspect}' for 1st arg" if a.kind_of? Complex
+ raise TypeError, "non numeric 2nd arg `#{b.inspect}'" if !b.kind_of? Numeric
+ raise TypeError, "`#{b.inspect}' for 2nd arg" if b.kind_of? Complex
+ @real = a
+ @image = b
+ end
+
+ #
+ # Addition with real or complex number.
+ #
+ def + (other)
+ if other.kind_of?(Complex)
+ re = @real + other.real
+ im = @image + other.image
+ Complex(re, im)
+ elsif Complex.generic?(other)
+ Complex(@real + other, @image)
+ else
+ x , y = other.coerce(self)
+ x + y
+ end
+ end
+
+ #
+ # Subtraction with real or complex number.
+ #
+ def - (other)
+ if other.kind_of?(Complex)
+ re = @real - other.real
+ im = @image - other.image
+ Complex(re, im)
+ elsif Complex.generic?(other)
+ Complex(@real - other, @image)
+ else
+ x , y = other.coerce(self)
+ x - y
+ end
+ end
+
+ #
+ # Multiplication with real or complex number.
+ #
+ def * (other)
+ if other.kind_of?(Complex)
+ re = @real*other.real - @image*other.image
+ im = @real*other.image + @image*other.real
+ Complex(re, im)
+ elsif Complex.generic?(other)
+ Complex(@real * other, @image * other)
+ else
+ x , y = other.coerce(self)
+ x * y
+ end
+ end
+
+ #
+ # Division by real or complex number.
+ #
+ def / (other)
+ if other.kind_of?(Complex)
+ self*other.conjugate/other.abs2
+ elsif Complex.generic?(other)
+ Complex(@real/other, @image/other)
+ else
+ x, y = other.coerce(self)
+ x/y
+ end
+ end
+
+ def quo(other)
+ Complex(@real.quo(1), @image.quo(1)) / other
+ end
+
+ #
+ # Raise this complex number to the given (real or complex) power.
+ #
+ def ** (other)
+ if other == 0
+ return Complex(1)
+ end
+ if other.kind_of?(Complex)
+ r, theta = polar
+ ore = other.real
+ oim = other.image
+ nr = Math.exp!(ore*Math.log!(r) - oim * theta)
+ ntheta = theta*ore + oim*Math.log!(r)
+ Complex.polar(nr, ntheta)
+ elsif other.kind_of?(Integer)
+ if other > 0
+ x = self
+ z = x
+ n = other - 1
+ while n != 0
+ while (div, mod = n.divmod(2)
+ mod == 0)
+ x = Complex(x.real*x.real - x.image*x.image, 2*x.real*x.image)
+ n = div
+ end
+ z *= x
+ n -= 1
+ end
+ z
+ else
+ if defined? Rational
+ (Rational(1) / self) ** -other
+ else
+ self ** Float(other)
+ end
+ end
+ elsif Complex.generic?(other)
+ r, theta = polar
+ Complex.polar(r**other, theta*other)
+ else
+ x, y = other.coerce(self)
+ x**y
+ end
+ end
+
+ #
+ # Remainder after division by a real or complex number.
+ #
+ def % (other)
+ if other.kind_of?(Complex)
+ Complex(@real % other.real, @image % other.image)
+ elsif Complex.generic?(other)
+ Complex(@real % other, @image % other)
+ else
+ x , y = other.coerce(self)
+ x % y
+ end
+ end
+
+#--
+# def divmod(other)
+# if other.kind_of?(Complex)
+# rdiv, rmod = @real.divmod(other.real)
+# idiv, imod = @image.divmod(other.image)
+# return Complex(rdiv, idiv), Complex(rmod, rmod)
+# elsif Complex.generic?(other)
+# Complex(@real.divmod(other), @image.divmod(other))
+# else
+# x , y = other.coerce(self)
+# x.divmod(y)
+# end
+# end
+#++
+
+ #
+ # Absolute value (aka modulus): distance from the zero point on the complex
+ # plane.
+ #
+ def abs
+ Math.hypot(@real, @image)
+ end
+
+ #
+ # Square of the absolute value.
+ #
+ def abs2
+ @real*@real + @image*@image
+ end
+
+ #
+ # Argument (angle from (1,0) on the complex plane).
+ #
+ def arg
+ Math.atan2!(@image, @real)
+ end
+ alias angle arg
+
+ #
+ # Returns the absolute value _and_ the argument.
+ #
+ def polar
+ return abs, arg
+ end
+
+ #
+ # Complex conjugate (<tt>z + z.conjugate = 2 * z.real</tt>).
+ #
+ def conjugate
+ Complex(@real, -@image)
+ end
+ alias conj conjugate
+
+ #
+ # Compares the absolute values of the two numbers.
+ #
+ def <=> (other)
+ self.abs <=> other.abs
+ end
+
+ #
+ # Test for numerical equality (<tt>a == a + 0<i>i</i></tt>).
+ #
+ def == (other)
+ if other.kind_of?(Complex)
+ @real == other.real and @image == other.image
+ elsif Complex.generic?(other)
+ @real == other and @image == 0
+ else
+ other == self
+ end
+ end
+
+ #
+ # Attempts to coerce +other+ to a Complex number.
+ #
+ def coerce(other)
+ if Complex.generic?(other)
+ return Complex.new!(other), self
+ else
+ super
+ end
+ end
+
+ #
+ # FIXME
+ #
+ def denominator
+ @real.denominator.lcm(@image.denominator)
+ end
+
+ #
+ # FIXME
+ #
+ def numerator
+ cd = denominator
+ Complex(@real.numerator*(cd/@real.denominator),
+ @image.numerator*(cd/@image.denominator))
+ end
+
+ #
+ # Standard string representation of the complex number.
+ #
+ def to_s
+ if @real != 0
+ if defined?(Rational) and @image.kind_of?(Rational) and @image.denominator != 1
+ if @image >= 0
+ @real.to_s+"+("+@image.to_s+")i"
+ else
+ @real.to_s+"-("+(-@image).to_s+")i"
+ end
+ else
+ if @image >= 0
+ @real.to_s+"+"+@image.to_s+"i"
+ else
+ @real.to_s+"-"+(-@image).to_s+"i"
+ end
+ end
+ else
+ if defined?(Rational) and @image.kind_of?(Rational) and @image.denominator != 1
+ "("+@image.to_s+")i"
+ else
+ @image.to_s+"i"
+ end
+ end
+ end
+
+ #
+ # Returns a hash code for the complex number.
+ #
+ def hash
+ @real.hash ^ @image.hash
+ end
+
+ #
+ # Returns "<tt>Complex(<i>real</i>, <i>image</i>)</tt>".
+ #
+ def inspect
+ sprintf("Complex(%s, %s)", @real.inspect, @image.inspect)
+ end
+
+
+ #
+ # +I+ is the imaginary number. It exists at point (0,1) on the complex plane.
+ #
+ I = Complex(0,1)
+
+ # The real part of a complex number.
+ attr :real
+
+ # The imaginary part of a complex number.
+ attr :image
+ alias imag image
+
end
-class Complex
+class Integer
+
+ unless defined?(1.numerator)
+ def numerator() self end
+ def denominator() 1 end
- alias image imag
+ def gcd(other)
+ min = self.abs
+ max = other.abs
+ while min > 0
+ tmp = min
+ min = max % min
+ max = tmp
+ end
+ max
+ end
+
+ def lcm(other)
+ if self.zero? or other.zero?
+ 0
+ else
+ (self.div(self.gcd(other)) * other).abs
+ end
+ end
+
+ end
end
-class Numeric
+module Math
+ alias sqrt! sqrt
+ alias exp! exp
+ alias log! log
+ alias log10! log10
+ alias cos! cos
+ alias sin! sin
+ alias tan! tan
+ alias cosh! cosh
+ alias sinh! sinh
+ alias tanh! tanh
+ alias acos! acos
+ alias asin! asin
+ alias atan! atan
+ alias atan2! atan2
+ alias acosh! acosh
+ alias asinh! asinh
+ alias atanh! atanh
+
+ # Redefined to handle a Complex argument.
+ def sqrt(z)
+ if Complex.generic?(z)
+ if z >= 0
+ sqrt!(z)
+ else
+ Complex(0,sqrt!(-z))
+ end
+ else
+ if z.image < 0
+ sqrt(z.conjugate).conjugate
+ else
+ r = z.abs
+ x = z.real
+ Complex( sqrt!((r+x)/2), sqrt!((r-x)/2) )
+ end
+ end
+ end
+
+ # Redefined to handle a Complex argument.
+ def exp(z)
+ if Complex.generic?(z)
+ exp!(z)
+ else
+ Complex(exp!(z.real) * cos!(z.image), exp!(z.real) * sin!(z.image))
+ end
+ end
+
+ # Redefined to handle a Complex argument.
+ def cos(z)
+ if Complex.generic?(z)
+ cos!(z)
+ else
+ Complex(cos!(z.real)*cosh!(z.image),
+ -sin!(z.real)*sinh!(z.image))
+ end
+ end
+
+ # Redefined to handle a Complex argument.
+ def sin(z)
+ if Complex.generic?(z)
+ sin!(z)
+ else
+ Complex(sin!(z.real)*cosh!(z.image),
+ cos!(z.real)*sinh!(z.image))
+ end
+ end
+
+ # Redefined to handle a Complex argument.
+ def tan(z)
+ if Complex.generic?(z)
+ tan!(z)
+ else
+ sin(z)/cos(z)
+ end
+ end
+
+ def sinh(z)
+ if Complex.generic?(z)
+ sinh!(z)
+ else
+ Complex( sinh!(z.real)*cos!(z.image), cosh!(z.real)*sin!(z.image) )
+ end
+ end
+
+ def cosh(z)
+ if Complex.generic?(z)
+ cosh!(z)
+ else
+ Complex( cosh!(z.real)*cos!(z.image), sinh!(z.real)*sin!(z.image) )
+ end
+ end
+
+ def tanh(z)
+ if Complex.generic?(z)
+ tanh!(z)
+ else
+ sinh(z)/cosh(z)
+ end
+ end
+
+ # Redefined to handle a Complex argument.
+ def log(z)
+ if Complex.generic?(z) and z >= 0
+ log!(z)
+ else
+ r, theta = z.polar
+ Complex(log!(r.abs), theta)
+ end
+ end
+
+ # Redefined to handle a Complex argument.
+ def log10(z)
+ if Complex.generic?(z)
+ log10!(z)
+ else
+ log(z)/log!(10)
+ end
+ end
- def im() Complex(0, self) end
+ def acos(z)
+ if Complex.generic?(z) and z >= -1 and z <= 1
+ acos!(z)
+ else
+ -1.0.im * log( z + 1.0.im * sqrt(1.0-z*z) )
+ end
+ end
+ def asin(z)
+ if Complex.generic?(z) and z >= -1 and z <= 1
+ asin!(z)
+ else
+ -1.0.im * log( 1.0.im * z + sqrt(1.0-z*z) )
+ end
+ end
+
+ def atan(z)
+ if Complex.generic?(z)
+ atan!(z)
+ else
+ 1.0.im * log( (1.0.im+z) / (1.0.im-z) ) / 2.0
+ end
+ end
+
+ def atan2(y,x)
+ if Complex.generic?(y) and Complex.generic?(x)
+ atan2!(y,x)
+ else
+ -1.0.im * log( (x+1.0.im*y) / sqrt(x*x+y*y) )
+ end
+ end
+
+ def acosh(z)
+ if Complex.generic?(z) and z >= 1
+ acosh!(z)
+ else
+ log( z + sqrt(z*z-1.0) )
+ end
+ end
+
+ def asinh(z)
+ if Complex.generic?(z)
+ asinh!(z)
+ else
+ log( z + sqrt(1.0+z*z) )
+ end
+ end
+
+ def atanh(z)
+ if Complex.generic?(z) and z >= -1 and z <= 1
+ atanh!(z)
+ else
+ log( (1.0+z) / (1.0-z) ) / 2.0
+ end
+ end
+
+ module_function :sqrt!
+ module_function :sqrt
+ module_function :exp!
+ module_function :exp
+ module_function :log!
+ module_function :log
+ module_function :log10!
+ module_function :log10
+ module_function :cosh!
+ module_function :cosh
+ module_function :cos!
+ module_function :cos
+ module_function :sinh!
+ module_function :sinh
+ module_function :sin!
+ module_function :sin
+ module_function :tan!
+ module_function :tan
+ module_function :tanh!
+ module_function :tanh
+ module_function :acos!
+ module_function :acos
+ module_function :asin!
+ module_function :asin
+ module_function :atan!
+ module_function :atan
+ module_function :atan2!
+ module_function :atan2
+ module_function :acosh!
+ module_function :acosh
+ module_function :asinh!
+ module_function :asinh
+ module_function :atanh!
+ module_function :atanh
+
end
+
+# Documentation comments:
+# - source: original (researched from pickaxe)
+# - a couple of fixme's
+# - RDoc output for Bignum etc. is a bit short, with nothing but an
+# (undocumented) alias. No big deal.
diff --git a/lib/csv.rb b/lib/csv.rb
index aae94888cd..f6c12fa285 100644
--- a/lib/csv.rb
+++ b/lib/csv.rb
@@ -1,2308 +1,992 @@
-# encoding: US-ASCII
-# = csv.rb -- CSV Reading and Writing
-#
-# Created by James Edward Gray II on 2005-10-31.
-# Copyright 2005 James Edward Gray II. You can redistribute or modify this code
-# under the terms of Ruby's license.
-#
-# See CSV for documentation.
-#
-# == Description
-#
-# Welcome to the new and improved CSV.
-#
-# This version of the CSV library began its life as FasterCSV. FasterCSV was
-# intended as a replacement to Ruby's then standard CSV library. It was
-# designed to address concerns users of that library had and it had three
-# primary goals:
-#
-# 1. Be significantly faster than CSV while remaining a pure Ruby library.
-# 2. Use a smaller and easier to maintain code base. (FasterCSV eventually
-# grew larger, was also but considerably richer in features. The parsing
-# core remains quite small.)
-# 3. Improve on the CSV interface.
-#
-# Obviously, the last one is subjective. I did try to defer to the original
-# interface whenever I didn't have a compelling reason to change it though, so
-# hopefully this won't be too radically different.
-#
-# We must have met our goals because FasterCSV was renamed to CSV and replaced
-# the original library.
-#
-# == What's Different From the Old CSV?
-#
-# I'm sure I'll miss something, but I'll try to mention most of the major
-# differences I am aware of, to help others quickly get up to speed:
-#
-# === CSV Parsing
-#
-# * This parser is m17n aware. See CSV for full details.
-# * This library has a stricter parser and will throw MalformedCSVErrors on
-# problematic data.
-# * This library has a less liberal idea of a line ending than CSV. What you
-# set as the <tt>:row_sep</tt> is law. It can auto-detect your line endings
-# though.
-# * The old library returned empty lines as <tt>[nil]</tt>. This library calls
-# them <tt>[]</tt>.
-# * This library has a much faster parser.
-#
-# === Interface
-#
-# * CSV now uses Hash-style parameters to set options.
-# * CSV no longer has generate_row() or parse_row().
-# * The old CSV's Reader and Writer classes have been dropped.
-# * CSV::open() is now more like Ruby's open().
-# * CSV objects now support most standard IO methods.
-# * CSV now has a new() method used to wrap objects like String and IO for
-# reading and writing.
-# * CSV::generate() is different from the old method.
-# * CSV no longer supports partial reads. It works line-by-line.
-# * CSV no longer allows the instance methods to override the separators for
-# performance reasons. They must be set in the constructor.
-#
-# If you use this library and find yourself missing any functionality I have
-# trimmed, please {let me know}[mailto:james@grayproductions.net].
-#
-# == Documentation
-#
-# See CSV for documentation.
-#
-# == What is CSV, really?
-#
-# CSV maintains a pretty strict definition of CSV taken directly from
-# {the RFC}[http://www.ietf.org/rfc/rfc4180.txt]. I relax the rules in only one
-# place and that is to make using this library easier. CSV will parse all valid
-# CSV.
-#
-# What you don't want to do is feed CSV invalid data. Because of the way the
-# CSV format works, it's common for a parser to need to read until the end of
-# the file to be sure a field is invalid. This eats a lot of time and memory.
-#
-# Luckily, when working with invalid CSV, Ruby's built-in methods will almost
-# always be superior in every way. For example, parsing non-quoted fields is as
-# easy as:
-#
-# data.split(",")
-#
-# == Questions and/or Comments
-#
-# Feel free to email {James Edward Gray II}[mailto:james@grayproductions.net]
-# with any questions.
-
-require "forwardable"
-require "English"
-require "date"
-require "stringio"
-
-#
-# This class provides a complete interface to CSV files and data. It offers
-# tools to enable you to read and write to and from Strings or IO objects, as
-# needed.
-#
-# == Reading
-#
-# === From a File
-#
-# ==== A Line at a Time
-#
-# CSV.foreach("path/to/file.csv") do |row|
-# # use row here...
-# end
-#
-# ==== All at Once
-#
-# arr_of_arrs = CSV.read("path/to/file.csv")
-#
-# === From a String
-#
-# ==== A Line at a Time
-#
-# CSV.parse("CSV,data,String") do |row|
-# # use row here...
-# end
-#
-# ==== All at Once
-#
-# arr_of_arrs = CSV.parse("CSV,data,String")
-#
-# == Writing
-#
-# === To a File
-#
-# CSV.open("path/to/file.csv", "wb") do |csv|
-# csv << ["row", "of", "CSV", "data"]
-# csv << ["another", "row"]
-# # ...
-# end
-#
-# === To a String
-#
-# csv_string = CSV.generate do |csv|
-# csv << ["row", "of", "CSV", "data"]
-# csv << ["another", "row"]
-# # ...
-# end
-#
-# == Convert a Single Line
-#
-# csv_string = ["CSV", "data"].to_csv # to CSV
-# csv_array = "CSV,String".parse_csv # from CSV
-#
-# == Shortcut Interface
-#
-# CSV { |csv_out| csv_out << %w{my data here} } # to $stdout
-# CSV(csv = "") { |csv_str| csv_str << %w{my data here} } # to a String
-# CSV($stderr) { |csv_err| csv_err << %w{my data here} } # to $stderr
-#
-# == CSV and Character Encodings (M17n or Multilingualization)
-#
-# This new CSV parser is m17n savvy. The parser works in the Encoding of the IO
-# or String object being read from or written to. Your data is never transcoded
-# (unless you ask Ruby to transcode it for you) and will literally be parsed in
-# the Encoding it is in. Thus CSV will return Arrays or Rows of Strings in the
-# Encoding of your data. This is accomplished by transcoding the parser itself
-# into your Encoding.
-#
-# Some transcoding must take place, of course, to accomplish this multiencoding
-# support. For example, <tt>:col_sep</tt>, <tt>:row_sep</tt>, and
-# <tt>:quote_char</tt> must be transcoded to match your data. Hopefully this
-# makes the entire process feel transparent, since CSV's defaults should just
-# magically work for you data. However, you can set these values manually in
-# the target Encoding to avoid the translation.
-#
-# It's also important to note that while all of CSV's core parser is now
-# Encoding agnostic, some features are not. For example, the built-in
-# converters will try to transcode data to UTF-8 before making conversions.
-# Again, you can provide custom converters that are aware of your Encodings to
-# avoid this translation. It's just too hard for me to support native
-# conversions in all of Ruby's Encodings.
-#
-# Anyway, the practical side of this is simple: make sure IO and String objects
-# passed into CSV have the proper Encoding set and everything should just work.
-# CSV methods that allow you to open IO objects (CSV::foreach(), CSV::open(),
-# CSV::read(), and CSV::readlines()) do allow you to specify the Encoding.
-#
-# One minor exception comes when generating CSV into a String with an Encoding
-# that is not ASCII compatible. There's no existing data for CSV to use to
-# prepare itself and thus you will probably need to manually specify the desired
-# Encoding for most of those cases. It will try to guess using the fields in a
-# row of output though, when using CSV::generate_line() or Array#to_csv().
-#
-# I try to point out any other Encoding issues in the documentation of methods
-# as they come up.
-#
-# This has been tested to the best of my ability with all non-"dummy" Encodings
-# Ruby ships with. However, it is brave new code and may have some bugs.
-# Please feel free to {report}[mailto:james@grayproductions.net] any issues you
-# find with it.
-#
+# CSV -- module for generating/parsing CSV data.
+# Copyright (C) 2000-2004 NAKAMURA, Hiroshi <nakahiro@sarion.co.jp>.
+
+# $Id$
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
class CSV
- # The version of the installed library.
- VERSION = "2.4.5".freeze
-
- #
- # A CSV::Row is part Array and part Hash. It retains an order for the fields
- # and allows duplicates just as an Array would, but also allows you to access
- # fields by name just as you could if they were in a Hash.
- #
- # All rows returned by CSV will be constructed from this class, if header row
- # processing is activated.
- #
- class Row
- #
- # Construct a new CSV::Row from +headers+ and +fields+, which are expected
- # to be Arrays. If one Array is shorter than the other, it will be padded
- # with +nil+ objects.
- #
- # The optional +header_row+ parameter can be set to +true+ to indicate, via
- # CSV::Row.header_row?() and CSV::Row.field_row?(), that this is a header
- # row. Otherwise, the row is assumes to be a field row.
- #
- # A CSV::Row object supports the following Array methods through delegation:
- #
- # * empty?()
- # * length()
- # * size()
- #
- def initialize(headers, fields, header_row = false)
- @header_row = header_row
+ class IllegalFormatError < RuntimeError; end
- # handle extra headers or fields
- @row = if headers.size > fields.size
- headers.zip(fields)
- else
- fields.zip(headers).map { |pair| pair.reverse }
- end
+ # deprecated
+ class Cell < String
+ def initialize(data = "", is_null = false)
+ super(is_null ? "" : data)
end
- # Internal data format used to compare equality.
- attr_reader :row
- protected :row
-
- ### Array Delegation ###
-
- extend Forwardable
- def_delegators :@row, :empty?, :length, :size
-
- # Returns +true+ if this is a header row.
- def header_row?
- @header_row
+ def data
+ to_s
end
+ end
- # Returns +true+ if this is a field row.
- def field_row?
- not header_row?
- end
+ # deprecated
+ class Row < Array
+ end
- # Returns the headers of this row.
- def headers
- @row.map { |pair| pair.first }
+ # Open a CSV formatted file for reading or writing.
+ #
+ # For reading.
+ #
+ # EXAMPLE 1
+ # CSV.open('csvfile.csv', 'r') do |row|
+ # p row
+ # end
+ #
+ # EXAMPLE 2
+ # reader = CSV.open('csvfile.csv', 'r')
+ # row1 = reader.shift
+ # row2 = reader.shift
+ # if row2.empty?
+ # p 'row2 not find.'
+ # end
+ # reader.close
+ #
+ # ARGS
+ # filename: filename to parse.
+ # col_sep: Column separator. ?, by default. If you want to separate
+ # fields with semicolon, give ?; here.
+ # row_sep: Row separator. nil by default. nil means "\r\n or \n". If you
+ # want to separate records with \r, give ?\r here.
+ #
+ # RETURNS
+ # reader instance. To get parse result, see CSV::Reader#each.
+ #
+ #
+ # For writing.
+ #
+ # EXAMPLE 1
+ # CSV.open('csvfile.csv', 'w') do |writer|
+ # writer << ['r1c1', 'r1c2']
+ # writer << ['r2c1', 'r2c2']
+ # writer << [nil, nil]
+ # end
+ #
+ # EXAMPLE 2
+ # writer = CSV.open('csvfile.csv', 'w')
+ # writer << ['r1c1', 'r1c2'] << ['r2c1', 'r2c2'] << [nil, nil]
+ # writer.close
+ #
+ # ARGS
+ # filename: filename to generate.
+ # col_sep: Column separator. ?, by default. If you want to separate
+ # fields with semicolon, give ?; here.
+ # row_sep: Row separator. nil by default. nil means "\r\n or \n". If you
+ # want to separate records with \r, give ?\r here.
+ #
+ # RETURNS
+ # writer instance. See CSV::Writer#<< and CSV::Writer#add_row to know how
+ # to generate CSV string.
+ #
+ def CSV.open(path, mode, fs = nil, rs = nil, &block)
+ if mode == 'r' or mode == 'rb'
+ open_reader(path, mode, fs, rs, &block)
+ elsif mode == 'w' or mode == 'wb'
+ open_writer(path, mode, fs, rs, &block)
+ else
+ raise ArgumentError.new("'mode' must be 'r', 'rb', 'w', or 'wb'")
end
+ end
- #
- # :call-seq:
- # field( header )
- # field( header, offset )
- # field( index )
- #
- # This method will fetch the field value by +header+ or +index+. If a field
- # is not found, +nil+ is returned.
- #
- # When provided, +offset+ ensures that a header match occurrs on or later
- # than the +offset+ index. You can use this to find duplicate headers,
- # without resorting to hard-coding exact indices.
- #
- def field(header_or_index, minimum_index = 0)
- # locate the pair
- finder = header_or_index.is_a?(Integer) ? :[] : :assoc
- pair = @row[minimum_index..-1].send(finder, header_or_index)
+ def CSV.foreach(path, rs = nil, &block)
+ open_reader(path, 'r', ',', rs, &block)
+ end
- # return the field if we have a pair
- pair.nil? ? nil : pair.last
+ def CSV.read(path, length = nil, offset = nil)
+ CSV.parse(IO.read(path, length, offset))
+ end
+
+ def CSV.readlines(path, rs = nil)
+ reader = open_reader(path, 'r', ',', rs)
+ begin
+ reader.collect { |row| row }
+ ensure
+ reader.close
end
- alias_method :[], :field
+ end
- #
- # :call-seq:
- # []=( header, value )
- # []=( header, offset, value )
- # []=( index, value )
- #
- # Looks up the field by the semantics described in CSV::Row.field() and
- # assigns the +value+.
- #
- # Assigning past the end of the row with an index will set all pairs between
- # to <tt>[nil, nil]</tt>. Assigning to an unused header appends the new
- # pair.
- #
- def []=(*args)
- value = args.pop
+ def CSV.generate(path, fs = nil, rs = nil, &block)
+ open_writer(path, 'w', fs, rs, &block)
+ end
- if args.first.is_a? Integer
- if @row[args.first].nil? # extending past the end with index
- @row[args.first] = [nil, value]
- @row.map! { |pair| pair.nil? ? [nil, nil] : pair }
- else # normal index assignment
- @row[args.first][1] = value
- end
- else
- index = index(*args)
- if index.nil? # appending a field
- self << [args.first, value]
- else # normal header assignment
- @row[index][1] = value
- end
- end
+ # Parse lines from given string or stream. Return rows as an Array of Arrays.
+ def CSV.parse(str_or_readable, fs = nil, rs = nil, &block)
+ if File.exist?(str_or_readable)
+ STDERR.puts("CSV.parse(filename) is deprecated." +
+ " Use CSV.open(filename, 'r') instead.")
+ return open_reader(str_or_readable, 'r', fs, rs, &block)
end
-
- #
- # :call-seq:
- # <<( field )
- # <<( header_and_field_array )
- # <<( header_and_field_hash )
- #
- # If a two-element Array is provided, it is assumed to be a header and field
- # and the pair is appended. A Hash works the same way with the key being
- # the header and the value being the field. Anything else is assumed to be
- # a lone field which is appended with a +nil+ header.
- #
- # This method returns the row for chaining.
- #
- def <<(arg)
- if arg.is_a?(Array) and arg.size == 2 # appending a header and name
- @row << arg
- elsif arg.is_a?(Hash) # append header and name pairs
- arg.each { |pair| @row << pair }
- else # append field value
- @row << [nil, arg]
+ if block
+ CSV::Reader.parse(str_or_readable, fs, rs) do |row|
+ yield(row)
end
-
- self # for chaining
+ nil
+ else
+ CSV::Reader.create(str_or_readable, fs, rs).collect { |row| row }
end
+ end
- #
- # A shortcut for appending multiple fields. Equivalent to:
- #
- # args.each { |arg| csv_row << arg }
- #
- # This method returns the row for chaining.
- #
- def push(*args)
- args.each { |arg| self << arg }
-
- self # for chaining
+ # Parse a line from given string. Bear in mind it parses ONE LINE. Rest of
+ # the string is ignored for example "a,b\r\nc,d" => ['a', 'b'] and the
+ # second line 'c,d' is ignored.
+ #
+ # If you don't know whether a target string to parse is exactly 1 line or
+ # not, use CSV.parse_row instead of this method.
+ def CSV.parse_line(src, fs = nil, rs = nil)
+ fs ||= ','
+ if fs.is_a?(Fixnum)
+ fs = fs.chr
end
-
- #
- # :call-seq:
- # delete( header )
- # delete( header, offset )
- # delete( index )
- #
- # Used to remove a pair from the row by +header+ or +index+. The pair is
- # located as described in CSV::Row.field(). The deleted pair is returned,
- # or +nil+ if a pair could not be found.
- #
- def delete(header_or_index, minimum_index = 0)
- if header_or_index.is_a? Integer # by index
- @row.delete_at(header_or_index)
- else # by header
- @row.delete_at(index(header_or_index, minimum_index))
- end
+ if !rs.nil? and rs.is_a?(Fixnum)
+ rs = rs.chr
end
-
- #
- # The provided +block+ is passed a header and field for each pair in the row
- # and expected to return +true+ or +false+, depending on whether the pair
- # should be deleted.
- #
- # This method returns the row for chaining.
- #
- def delete_if(&block)
- @row.delete_if(&block)
-
- self # for chaining
+ idx = 0
+ res_type = :DT_COLSEP
+ row = []
+ begin
+ while res_type == :DT_COLSEP
+ res_type, idx, cell = parse_body(src, idx, fs, rs)
+ row << cell
+ end
+ rescue IllegalFormatError
+ return []
end
+ row
+ end
- #
- # This method accepts any number of arguments which can be headers, indices,
- # Ranges of either, or two-element Arrays containing a header and offset.
- # Each argument will be replaced with a field lookup as described in
- # CSV::Row.field().
- #
- # If called with no arguments, all fields are returned.
- #
- def fields(*headers_and_or_indices)
- if headers_and_or_indices.empty? # return all fields--no arguments
- @row.map { |pair| pair.last }
- else # or work like values_at()
- headers_and_or_indices.inject(Array.new) do |all, h_or_i|
- all + if h_or_i.is_a? Range
- index_begin = h_or_i.begin.is_a?(Integer) ? h_or_i.begin :
- index(h_or_i.begin)
- index_end = h_or_i.end.is_a?(Integer) ? h_or_i.end :
- index(h_or_i.end)
- new_range = h_or_i.exclude_end? ? (index_begin...index_end) :
- (index_begin..index_end)
- fields.values_at(new_range)
- else
- [field(*Array(h_or_i))]
+ # Create a line from cells. each cell is stringified by to_s.
+ def CSV.generate_line(row, fs = nil, rs = nil)
+ if row.size == 0
+ return ''
+ end
+ fs ||= ','
+ if fs.is_a?(Fixnum)
+ fs = fs.chr
+ end
+ if !rs.nil? and rs.is_a?(Fixnum)
+ rs = rs.chr
+ end
+ res_type = :DT_COLSEP
+ result_str = ''
+ idx = 0
+ while true
+ generate_body(row[idx], result_str, fs, rs)
+ idx += 1
+ if (idx == row.size)
+ break
+ end
+ generate_separator(:DT_COLSEP, result_str, fs, rs)
+ end
+ result_str
+ end
+
+ # Parse a line from string. Consider using CSV.parse_line instead.
+ # To parse lines in CSV string, see EXAMPLE below.
+ #
+ # EXAMPLE
+ # src = "a,b\r\nc,d\r\ne,f"
+ # idx = 0
+ # begin
+ # parsed = []
+ # parsed_cells, idx = CSV.parse_row(src, idx, parsed)
+ # puts "Parsed #{ parsed_cells } cells."
+ # p parsed
+ # end while parsed_cells > 0
+ #
+ # ARGS
+ # src: a CSV data to be parsed. Must respond '[](idx)'.
+ # src[](idx) must return a char. (Not a string such as 'a', but 97).
+ # src[](idx_out_of_bounds) must return nil. A String satisfies this
+ # requirement.
+ # idx: index of parsing location of 'src'. 0 origin.
+ # out_dev: buffer for parsed cells. Must respond '<<(aString)'.
+ # col_sep: Column separator. ?, by default. If you want to separate
+ # fields with semicolon, give ?; here.
+ # row_sep: Row separator. nil by default. nil means "\r\n or \n". If you
+ # want to separate records with \r, give ?\r here.
+ #
+ # RETURNS
+ # parsed_cells: num of parsed cells.
+ # idx: index of next parsing location of 'src'.
+ #
+ def CSV.parse_row(src, idx, out_dev, fs = nil, rs = nil)
+ fs ||= ','
+ if fs.is_a?(Fixnum)
+ fs = fs.chr
+ end
+ if !rs.nil? and rs.is_a?(Fixnum)
+ rs = rs.chr
+ end
+ idx_backup = idx
+ parsed_cells = 0
+ res_type = :DT_COLSEP
+ begin
+ while res_type != :DT_ROWSEP
+ res_type, idx, cell = parse_body(src, idx, fs, rs)
+ if res_type == :DT_EOS
+ if idx == idx_backup #((parsed_cells == 0) and cell.nil?)
+ return 0, 0
end
+ res_type = :DT_ROWSEP
end
- end
- end
- alias_method :values_at, :fields
-
- #
- # :call-seq:
- # index( header )
- # index( header, offset )
- #
- # This method will return the index of a field with the provided +header+.
- # The +offset+ can be used to locate duplicate header names, as described in
- # CSV::Row.field().
- #
- def index(header, minimum_index = 0)
- # find the pair
- index = headers[minimum_index..-1].index(header)
- # return the index at the right offset, if we found one
- index.nil? ? nil : index + minimum_index
- end
-
- # Returns +true+ if +name+ is a header for this row, and +false+ otherwise.
- def header?(name)
- headers.include? name
- end
- alias_method :include?, :header?
-
- #
- # Returns +true+ if +data+ matches a field in this row, and +false+
- # otherwise.
- #
- def field?(data)
- fields.include? data
- end
-
- include Enumerable
-
- #
- # Yields each pair of the row as header and field tuples (much like
- # iterating over a Hash).
- #
- # Support for Enumerable.
- #
- # This method returns the row for chaining.
- #
- def each(&block)
- @row.each(&block)
-
- self # for chaining
- end
-
- #
- # Returns +true+ if this row contains the same headers and fields in the
- # same order as +other+.
- #
- def ==(other)
- @row == other.row
- end
-
- #
- # Collapses the row into a simple Hash. Be warning that this discards field
- # order and clobbers duplicate fields.
- #
- def to_hash
- # flatten just one level of the internal Array
- Hash[*@row.inject(Array.new) { |ary, pair| ary.push(*pair) }]
- end
-
- #
- # Returns the row as a CSV String. Headers are not used. Equivalent to:
- #
- # csv_row.fields.to_csv( options )
- #
- def to_csv(options = Hash.new)
- fields.to_csv(options)
- end
- alias_method :to_s, :to_csv
-
- # A summary of fields, by header, in an ASCII compatible String.
- def inspect
- str = ["#<", self.class.to_s]
- each do |header, field|
- str << " " << (header.is_a?(Symbol) ? header.to_s : header.inspect) <<
- ":" << field.inspect
- end
- str << ">"
- begin
- str.join
- rescue # any encoding error
- str.map do |s|
- e = Encoding::Converter.asciicompat_encoding(s.encoding)
- e ? s.encode(e) : s.force_encoding("ASCII-8BIT")
- end.join
- end
+ parsed_cells += 1
+ out_dev << cell
+ end
+ rescue IllegalFormatError
+ return 0, 0
+ end
+ return parsed_cells, idx
+ end
+
+ # Convert a line from cells data to string. Consider using CSV.generate_line
+ # instead. To generate multi-row CSV string, see EXAMPLE below.
+ #
+ # EXAMPLE
+ # row1 = ['a', 'b']
+ # row2 = ['c', 'd']
+ # row3 = ['e', 'f']
+ # src = [row1, row2, row3]
+ # buf = ''
+ # src.each do |row|
+ # parsed_cells = CSV.generate_row(row, 2, buf)
+ # puts "Created #{ parsed_cells } cells."
+ # end
+ # p buf
+ #
+ # ARGS
+ # src: an Array of String to be converted to CSV string. Must respond to
+ # 'size' and '[](idx)'. src[idx] must return String.
+ # cells: num of cells in a line.
+ # out_dev: buffer for generated CSV string. Must respond to '<<(string)'.
+ # col_sep: Column separator. ?, by default. If you want to separate
+ # fields with semicolon, give ?; here.
+ # row_sep: Row separator. nil by default. nil means "\r\n or \n". If you
+ # want to separate records with \r, give ?\r here.
+ #
+ # RETURNS
+ # parsed_cells: num of converted cells.
+ #
+ def CSV.generate_row(src, cells, out_dev, fs = nil, rs = nil)
+ fs ||= ','
+ if fs.is_a?(Fixnum)
+ fs = fs.chr
+ end
+ if !rs.nil? and rs.is_a?(Fixnum)
+ rs = rs.chr
+ end
+ src_size = src.size
+ if (src_size == 0)
+ if cells == 0
+ generate_separator(:DT_ROWSEP, out_dev, fs, rs)
+ end
+ return 0
+ end
+ res_type = :DT_COLSEP
+ parsed_cells = 0
+ generate_body(src[parsed_cells], out_dev, fs, rs)
+ parsed_cells += 1
+ while ((parsed_cells < cells) and (parsed_cells != src_size))
+ generate_separator(:DT_COLSEP, out_dev, fs, rs)
+ generate_body(src[parsed_cells], out_dev, fs, rs)
+ parsed_cells += 1
+ end
+ if (parsed_cells == cells)
+ generate_separator(:DT_ROWSEP, out_dev, fs, rs)
+ else
+ generate_separator(:DT_COLSEP, out_dev, fs, rs)
end
+ parsed_cells
end
+
+ # Private class methods.
+ class << self
+ private
- #
- # A CSV::Table is a two-dimensional data structure for representing CSV
- # documents. Tables allow you to work with the data by row or column,
- # manipulate the data, and even convert the results back to CSV, if needed.
- #
- # All tables returned by CSV will be constructed from this class, if header
- # row processing is activated.
- #
- class Table
- #
- # Construct a new CSV::Table from +array_of_rows+, which are expected
- # to be CSV::Row objects. All rows are assumed to have the same headers.
- #
- # A CSV::Table object supports the following Array methods through
- # delegation:
- #
- # * empty?()
- # * length()
- # * size()
- #
- def initialize(array_of_rows)
- @table = array_of_rows
- @mode = :col_or_row
- end
-
- # The current access mode for indexing and iteration.
- attr_reader :mode
-
- # Internal data format used to compare equality.
- attr_reader :table
- protected :table
-
- ### Array Delegation ###
-
- extend Forwardable
- def_delegators :@table, :empty?, :length, :size
-
- #
- # Returns a duplicate table object, in column mode. This is handy for
- # chaining in a single call without changing the table mode, but be aware
- # that this method can consume a fair amount of memory for bigger data sets.
- #
- # This method returns the duplicate table for chaining. Don't chain
- # destructive methods (like []=()) this way though, since you are working
- # with a duplicate.
- #
- def by_col
- self.class.new(@table.dup).by_col!
- end
-
- #
- # Switches the mode of this table to column mode. All calls to indexing and
- # iteration methods will work with columns until the mode is changed again.
- #
- # This method returns the table and is safe to chain.
- #
- def by_col!
- @mode = :col
-
- self
- end
-
- #
- # Returns a duplicate table object, in mixed mode. This is handy for
- # chaining in a single call without changing the table mode, but be aware
- # that this method can consume a fair amount of memory for bigger data sets.
- #
- # This method returns the duplicate table for chaining. Don't chain
- # destructive methods (like []=()) this way though, since you are working
- # with a duplicate.
- #
- def by_col_or_row
- self.class.new(@table.dup).by_col_or_row!
- end
-
- #
- # Switches the mode of this table to mixed mode. All calls to indexing and
- # iteration methods will use the default intelligent indexing system until
- # the mode is changed again. In mixed mode an index is assumed to be a row
- # reference while anything else is assumed to be column access by headers.
- #
- # This method returns the table and is safe to chain.
- #
- def by_col_or_row!
- @mode = :col_or_row
-
- self
- end
-
- #
- # Returns a duplicate table object, in row mode. This is handy for chaining
- # in a single call without changing the table mode, but be aware that this
- # method can consume a fair amount of memory for bigger data sets.
- #
- # This method returns the duplicate table for chaining. Don't chain
- # destructive methods (like []=()) this way though, since you are working
- # with a duplicate.
- #
- def by_row
- self.class.new(@table.dup).by_row!
- end
-
- #
- # Switches the mode of this table to row mode. All calls to indexing and
- # iteration methods will work with rows until the mode is changed again.
- #
- # This method returns the table and is safe to chain.
- #
- def by_row!
- @mode = :row
-
- self
- end
-
- #
- # Returns the headers for the first row of this table (assumed to match all
- # other rows). An empty Array is returned for empty tables.
- #
- def headers
- if @table.empty?
- Array.new
+ def open_reader(path, mode, fs, rs, &block)
+ file = File.open(path, mode)
+ if block
+ begin
+ CSV::Reader.parse(file, fs, rs) do |row|
+ yield(row)
+ end
+ ensure
+ file.close
+ end
+ nil
else
- @table.first.headers
+ reader = CSV::Reader.create(file, fs, rs)
+ reader.close_on_terminate
+ reader
end
end
- #
- # In the default mixed mode, this method returns rows for index access and
- # columns for header access. You can force the index association by first
- # calling by_col!() or by_row!().
- #
- # Columns are returned as an Array of values. Altering that Array has no
- # effect on the table.
- #
- def [](index_or_header)
- if @mode == :row or # by index
- (@mode == :col_or_row and index_or_header.is_a? Integer)
- @table[index_or_header]
- else # by header
- @table.map { |row| row[index_or_header] }
- end
- end
-
- #
- # In the default mixed mode, this method assigns rows for index access and
- # columns for header access. You can force the index association by first
- # calling by_col!() or by_row!().
- #
- # Rows may be set to an Array of values (which will inherit the table's
- # headers()) or a CSV::Row.
- #
- # Columns may be set to a single value, which is copied to each row of the
- # column, or an Array of values. Arrays of values are assigned to rows top
- # to bottom in row major order. Excess values are ignored and if the Array
- # does not have a value for each row the extra rows will receive a +nil+.
- #
- # Assigning to an existing column or row clobbers the data. Assigning to
- # new columns creates them at the right end of the table.
- #
- def []=(index_or_header, value)
- if @mode == :row or # by index
- (@mode == :col_or_row and index_or_header.is_a? Integer)
- if value.is_a? Array
- @table[index_or_header] = Row.new(headers, value)
- else
- @table[index_or_header] = value
+ def open_writer(path, mode, fs, rs, &block)
+ file = File.open(path, mode)
+ if block
+ begin
+ CSV::Writer.generate(file, fs, rs) do |writer|
+ yield(writer)
+ end
+ ensure
+ file.close
end
- else # set column
- if value.is_a? Array # multiple values
- @table.each_with_index do |row, i|
- if row.header_row?
- row[index_or_header] = index_or_header
- else
- row[index_or_header] = value[i]
+ nil
+ else
+ writer = CSV::Writer.create(file, fs, rs)
+ writer.close_on_terminate
+ writer
+ end
+ end
+
+ def parse_body(src, idx, fs, rs)
+ fs_str = fs
+ fs_size = fs_str.size
+ rs_str = rs || "\n"
+ rs_size = rs_str.size
+ fs_idx = rs_idx = 0
+ cell = Cell.new
+ state = :ST_START
+ quoted = cr = false
+ c = nil
+ last_idx = idx
+ while c = src[idx]
+ unless quoted
+ fschar = (c == fs_str[fs_idx])
+ rschar = (c == rs_str[rs_idx])
+ # simple 1 char backtrack
+ if !fschar and c == fs_str[0]
+ fs_idx = 0
+ fschar = true
+ if state == :ST_START
+ state = :ST_DATA
+ elsif state == :ST_QUOTE
+ raise IllegalFormatError
end
end
- else # repeated value
- @table.each do |row|
- if row.header_row?
- row[index_or_header] = index_or_header
+ if !rschar and c == rs_str[0]
+ rs_idx = 0
+ rschar = true
+ if state == :ST_START
+ state = :ST_DATA
+ elsif state == :ST_QUOTE
+ raise IllegalFormatError
+ end
+ end
+ end
+ if c == ?"
+ fs_idx = rs_idx = 0
+ if cr
+ raise IllegalFormatError
+ end
+ cell << src[last_idx, (idx - last_idx)]
+ last_idx = idx
+ if state == :ST_DATA
+ if quoted
+ last_idx += 1
+ quoted = false
+ state = :ST_QUOTE
else
- row[index_or_header] = value
+ raise IllegalFormatError
+ end
+ elsif state == :ST_QUOTE
+ cell << c.chr
+ last_idx += 1
+ quoted = true
+ state = :ST_DATA
+ else # :ST_START
+ quoted = true
+ last_idx += 1
+ state = :ST_DATA
+ end
+ elsif fschar or rschar
+ if fschar
+ fs_idx += 1
+ end
+ if rschar
+ rs_idx += 1
+ end
+ sep = nil
+ if fs_idx == fs_size
+ if state == :ST_START and rs_idx > 0 and fs_idx < rs_idx
+ state = :ST_DATA
+ end
+ cell << src[last_idx, (idx - last_idx - (fs_size - 1))]
+ last_idx = idx
+ fs_idx = rs_idx = 0
+ if cr
+ raise IllegalFormatError
+ end
+ sep = :DT_COLSEP
+ elsif rs_idx == rs_size
+ if state == :ST_START and fs_idx > 0 and rs_idx < fs_idx
+ state = :ST_DATA
+ end
+ if !(rs.nil? and cr)
+ cell << src[last_idx, (idx - last_idx - (rs_size - 1))]
+ last_idx = idx
end
+ fs_idx = rs_idx = 0
+ sep = :DT_ROWSEP
+ end
+ if sep
+ if state == :ST_DATA
+ return sep, idx + 1, cell;
+ elsif state == :ST_QUOTE
+ return sep, idx + 1, cell;
+ else # :ST_START
+ return sep, idx + 1, nil
+ end
+ end
+ elsif rs.nil? and c == ?\r
+ # special \r treatment for backward compatibility
+ fs_idx = rs_idx = 0
+ if cr
+ raise IllegalFormatError
+ end
+ cell << src[last_idx, (idx - last_idx)]
+ last_idx = idx
+ if quoted
+ state = :ST_DATA
+ else
+ cr = true
+ end
+ else
+ fs_idx = rs_idx = 0
+ if state == :ST_DATA or state == :ST_START
+ if cr
+ raise IllegalFormatError
+ end
+ state = :ST_DATA
+ else # :ST_QUOTE
+ raise IllegalFormatError
end
end
+ idx += 1
end
- end
-
- #
- # The mixed mode default is to treat a list of indices as row access,
- # returning the rows indicated. Anything else is considered columnar
- # access. For columnar access, the return set has an Array for each row
- # with the values indicated by the headers in each Array. You can force
- # column or row mode using by_col!() or by_row!().
- #
- # You cannot mix column and row access.
- #
- def values_at(*indices_or_headers)
- if @mode == :row or # by indices
- ( @mode == :col_or_row and indices_or_headers.all? do |index|
- index.is_a?(Integer) or
- ( index.is_a?(Range) and
- index.first.is_a?(Integer) and
- index.last.is_a?(Integer) )
- end )
- @table.values_at(*indices_or_headers)
- else # by headers
- @table.map { |row| row.values_at(*indices_or_headers) }
- end
- end
-
- #
- # Adds a new row to the bottom end of this table. You can provide an Array,
- # which will be converted to a CSV::Row (inheriting the table's headers()),
- # or a CSV::Row.
- #
- # This method returns the table for chaining.
- #
- def <<(row_or_array)
- if row_or_array.is_a? Array # append Array
- @table << Row.new(headers, row_or_array)
- else # append Row
- @table << row_or_array
- end
-
- self # for chaining
- end
-
- #
- # A shortcut for appending multiple rows. Equivalent to:
- #
- # rows.each { |row| self << row }
- #
- # This method returns the table for chaining.
- #
- def push(*rows)
- rows.each { |row| self << row }
-
- self # for chaining
- end
-
- #
- # Removes and returns the indicated column or row. In the default mixed
- # mode indices refer to rows and everything else is assumed to be a column
- # header. Use by_col!() or by_row!() to force the lookup.
- #
- def delete(index_or_header)
- if @mode == :row or # by index
- (@mode == :col_or_row and index_or_header.is_a? Integer)
- @table.delete_at(index_or_header)
- else # by header
- @table.map { |row| row.delete(index_or_header).last }
- end
- end
-
- #
- # Removes any column or row for which the block returns +true+. In the
- # default mixed mode or row mode, iteration is the standard row major
- # walking of rows. In column mode, interation will +yield+ two element
- # tuples containing the column name and an Array of values for that column.
- #
- # This method returns the table for chaining.
- #
- def delete_if(&block)
- if @mode == :row or @mode == :col_or_row # by index
- @table.delete_if(&block)
- else # by header
- to_delete = Array.new
- headers.each_with_index do |header, i|
- to_delete << header if block[[header, self[header]]]
+ if state == :ST_START
+ if fs_idx > 0 or rs_idx > 0
+ state = :ST_DATA
+ else
+ return :DT_EOS, idx, nil
end
- to_delete.map { |header| delete(header) }
- end
-
- self # for chaining
- end
-
- include Enumerable
-
- #
- # In the default mixed mode or row mode, iteration is the standard row major
- # walking of rows. In column mode, interation will +yield+ two element
- # tuples containing the column name and an Array of values for that column.
- #
- # This method returns the table for chaining.
- #
- def each(&block)
- if @mode == :col
- headers.each { |header| block[[header, self[header]]] }
+ elsif quoted
+ raise IllegalFormatError
+ elsif cr
+ raise IllegalFormatError
+ end
+ cell << src[last_idx, (idx - last_idx)]
+ last_idx = idx
+ return :DT_EOS, idx, cell
+ end
+
+ def generate_body(cell, out_dev, fs, rs)
+ if cell.nil?
+ # empty
else
- @table.each(&block)
- end
-
- self # for chaining
- end
-
- # Returns +true+ if all rows of this table ==() +other+'s rows.
- def ==(other)
- @table == other.table
- end
-
- #
- # Returns the table as an Array of Arrays. Headers will be the first row,
- # then all of the field rows will follow.
- #
- def to_a
- @table.inject([headers]) do |array, row|
- if row.header_row?
- array
+ cell = cell.to_s
+ row_data = cell.dup
+ if (row_data.gsub!('"', '""') or
+ row_data.index(fs) or
+ (rs and row_data.index(rs)) or
+ (/[\r\n]/ =~ row_data) or
+ (cell.empty?))
+ out_dev << '"' << row_data << '"'
else
- array + [row.fields]
+ out_dev << row_data
end
end
end
-
- #
- # Returns the table as a complete CSV String. Headers will be listed first,
- # then all of the field rows.
- #
- def to_csv(options = Hash.new)
- @table.inject([headers.to_csv(options)]) do |rows, row|
- if row.header_row?
- rows
- else
- rows + [row.fields.to_csv(options)]
- end
- end.join
- end
- alias_method :to_s, :to_csv
-
- # Shows the mode and size of this table in a US-ASCII String.
- def inspect
- "#<#{self.class} mode:#{@mode} row_count:#{to_a.size}>".encode("US-ASCII")
+
+ def generate_separator(type, out_dev, fs, rs)
+ case type
+ when :DT_COLSEP
+ out_dev << fs
+ when :DT_ROWSEP
+ out_dev << (rs || "\n")
+ end
end
end
- # The error thrown when the parser encounters illegal CSV formatting.
- class MalformedCSVError < RuntimeError; end
-
- #
- # A FieldInfo Struct contains details about a field's position in the data
- # source it was read from. CSV will pass this Struct to some blocks that make
- # decisions based on field structure. See CSV.convert_fields() for an
- # example.
- #
- # <b><tt>index</tt></b>:: The zero-based index of the field in its row.
- # <b><tt>line</tt></b>:: The line of the data source this row is from.
- # <b><tt>header</tt></b>:: The header for the column, when available.
- #
- FieldInfo = Struct.new(:index, :line, :header)
-
- # A Regexp used to find and convert some common Date formats.
- DateMatcher = / \A(?: (\w+,?\s+)?\w+\s+\d{1,2},?\s+\d{2,4} |
- \d{4}-\d{2}-\d{2} )\z /x
- # A Regexp used to find and convert some common DateTime formats.
- DateTimeMatcher =
- / \A(?: (\w+,?\s+)?\w+\s+\d{1,2}\s+\d{1,2}:\d{1,2}:\d{1,2},?\s+\d{2,4} |
- \d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2} )\z /x
-
- # The encoding used by all converters.
- ConverterEncoding = Encoding.find("UTF-8")
-
- #
- # This Hash holds the built-in converters of CSV that can be accessed by name.
- # You can select Converters with CSV.convert() or through the +options+ Hash
- # passed to CSV::new().
- #
- # <b><tt>:integer</tt></b>:: Converts any field Integer() accepts.
- # <b><tt>:float</tt></b>:: Converts any field Float() accepts.
- # <b><tt>:numeric</tt></b>:: A combination of <tt>:integer</tt>
- # and <tt>:float</tt>.
- # <b><tt>:date</tt></b>:: Converts any field Date::parse() accepts.
- # <b><tt>:date_time</tt></b>:: Converts any field DateTime::parse() accepts.
- # <b><tt>:all</tt></b>:: All built-in converters. A combination of
- # <tt>:date_time</tt> and <tt>:numeric</tt>.
- #
- # All built-in converters transcode field data to UTF-8 before attempting a
- # conversion. If your data cannot be transcoded to UTF-8 the conversion will
- # fail and the field will remain unchanged.
- #
- # This Hash is intentionally left unfrozen and users should feel free to add
- # values to it that can be accessed by all CSV objects.
- #
- # To add a combo field, the value should be an Array of names. Combo fields
- # can be nested with other combo fields.
- #
- Converters = { integer: lambda { |f|
- Integer(f.encode(ConverterEncoding)) rescue f
- },
- float: lambda { |f|
- Float(f.encode(ConverterEncoding)) rescue f
- },
- numeric: [:integer, :float],
- date: lambda { |f|
- begin
- e = f.encode(ConverterEncoding)
- e =~ DateMatcher ? Date.parse(e) : f
- rescue # encoding conversion or date parse errors
- f
- end
- },
- date_time: lambda { |f|
- begin
- e = f.encode(ConverterEncoding)
- e =~ DateTimeMatcher ? DateTime.parse(e) : f
- rescue # encoding conversion or date parse errors
- f
- end
- },
- all: [:date_time, :numeric] }
-
- #
- # This Hash holds the built-in header converters of CSV that can be accessed
- # by name. You can select HeaderConverters with CSV.header_convert() or
- # through the +options+ Hash passed to CSV::new().
- #
- # <b><tt>:downcase</tt></b>:: Calls downcase() on the header String.
- # <b><tt>:symbol</tt></b>:: The header String is downcased, spaces are
- # replaced with underscores, non-word characters
- # are dropped, and finally to_sym() is called.
- #
- # All built-in header converters transcode header data to UTF-8 before
- # attempting a conversion. If your data cannot be transcoded to UTF-8 the
- # conversion will fail and the header will remain unchanged.
- #
- # This Hash is intetionally left unfrozen and users should feel free to add
- # values to it that can be accessed by all CSV objects.
- #
- # To add a combo field, the value should be an Array of names. Combo fields
- # can be nested with other combo fields.
- #
- HeaderConverters = {
- downcase: lambda { |h| h.encode(ConverterEncoding).downcase },
- symbol: lambda { |h|
- h.encode(ConverterEncoding).downcase.gsub(/\s+/, "_").
- gsub(/\W+/, "").to_sym
- }
- }
-
- #
- # The options used when no overrides are given by calling code. They are:
- #
- # <b><tt>:col_sep</tt></b>:: <tt>","</tt>
- # <b><tt>:row_sep</tt></b>:: <tt>:auto</tt>
- # <b><tt>:quote_char</tt></b>:: <tt>'"'</tt>
- # <b><tt>:field_size_limit</tt></b>:: +nil+
- # <b><tt>:converters</tt></b>:: +nil+
- # <b><tt>:unconverted_fields</tt></b>:: +nil+
- # <b><tt>:headers</tt></b>:: +false+
- # <b><tt>:return_headers</tt></b>:: +false+
- # <b><tt>:header_converters</tt></b>:: +nil+
- # <b><tt>:skip_blanks</tt></b>:: +false+
- # <b><tt>:force_quotes</tt></b>:: +false+
- #
- DEFAULT_OPTIONS = { col_sep: ",",
- row_sep: :auto,
- quote_char: '"',
- field_size_limit: nil,
- converters: nil,
- unconverted_fields: nil,
- headers: false,
- return_headers: false,
- header_converters: nil,
- skip_blanks: false,
- force_quotes: false }.freeze
-
- #
- # This method will return a CSV instance, just like CSV::new(), but the
- # instance will be cached and returned for all future calls to this method for
- # the same +data+ object (tested by Object#object_id()) with the same
- # +options+.
- #
- # If a block is given, the instance is passed to the block and the return
- # value becomes the return value of the block.
- #
- def self.instance(data = $stdout, options = Hash.new)
- # create a _signature_ for this method call, data object and options
- sig = [data.object_id] +
- options.values_at(*DEFAULT_OPTIONS.keys.sort_by { |sym| sym.to_s })
-
- # fetch or create the instance for this signature
- @@instances ||= Hash.new
- instance = (@@instances[sig] ||= new(data, options))
- if block_given?
- yield instance # run block, if given, returning result
- else
- instance # or return the instance
- end
- end
-
- #
- # This method allows you to serialize an Array of Ruby objects to a String or
- # File of CSV data. This is not as powerful as Marshal or YAML, but perhaps
- # useful for spreadsheet and database interaction.
- #
- # Out of the box, this method is intended to work with simple data objects or
- # Structs. It will serialize a list of instance variables and/or
- # Struct.members().
- #
- # If you need need more complicated serialization, you can control the process
- # by adding methods to the class to be serialized.
- #
- # A class method csv_meta() is responsible for returning the first row of the
- # document (as an Array). This row is considered to be a Hash of the form
- # key_1,value_1,key_2,value_2,... CSV::load() expects to find a class key
- # with a value of the stringified class name and CSV::dump() will create this,
- # if you do not define this method. This method is only called on the first
- # object of the Array.
+ # CSV formatted string/stream reader.
#
- # The next method you can provide is an instance method called csv_headers().
- # This method is expected to return the second line of the document (again as
- # an Array), which is to be used to give each column a header. By default,
- # CSV::load() will set an instance variable if the field header starts with an
- # @ character or call send() passing the header as the method name and
- # the field value as an argument. This method is only called on the first
- # object of the Array.
+ # EXAMPLE
+ # read CSV lines untill the first column is 'stop'.
#
- # Finally, you can provide an instance method called csv_dump(), which will
- # be passed the headers. This should return an Array of fields that can be
- # serialized for this object. This method is called once for every object in
- # the Array.
+ # CSV::Reader.parse(File.open('bigdata', 'rb')) do |row|
+ # p row
+ # break if !row[0].is_null && row[0].data == 'stop'
+ # end
#
- # The +io+ parameter can be used to serialize to a File, and +options+ can be
- # anything CSV::new() accepts.
- #
- def self.dump(ary_of_objs, io = "", options = Hash.new)
- obj_template = ary_of_objs.first
-
- csv = new(io, options)
+ class Reader
+ include Enumerable
- # write meta information
- begin
- csv << obj_template.class.csv_meta
- rescue NoMethodError
- csv << [:class, obj_template.class]
+ # Parse CSV data and get lines. Given block is called for each parsed row.
+ # Block value is always nil. Rows are not cached for performance reason.
+ def Reader.parse(str_or_readable, fs = ',', rs = nil, &block)
+ reader = Reader.create(str_or_readable, fs, rs)
+ if block
+ reader.each do |row|
+ yield(row)
+ end
+ reader.close
+ nil
+ else
+ reader
+ end
end
- # write headers
- begin
- headers = obj_template.csv_headers
- rescue NoMethodError
- headers = obj_template.instance_variables.sort
- if obj_template.class.ancestors.find { |cls| cls.to_s =~ /\AStruct\b/ }
- headers += obj_template.members.map { |mem| "#{mem}=" }.sort
+ # Returns reader instance.
+ def Reader.create(str_or_readable, fs = ',', rs = nil)
+ case str_or_readable
+ when IO
+ IOReader.new(str_or_readable, fs, rs)
+ when String
+ StringReader.new(str_or_readable, fs, rs)
+ else
+ IOReader.new(str_or_readable, fs, rs)
end
end
- csv << headers
- # serialize each object
- ary_of_objs.each do |obj|
- begin
- csv << obj.csv_dump(headers)
- rescue NoMethodError
- csv << headers.map do |var|
- if var[0] == ?@
- obj.instance_variable_get(var)
- else
- obj[var[0..-2]]
- end
+ def each
+ while true
+ row = []
+ parsed_cells = get_row(row)
+ if parsed_cells == 0
+ break
end
+ yield(row)
end
+ nil
end
- if io.is_a? String
- csv.string
- else
- csv.close
+ def shift
+ row = []
+ parsed_cells = get_row(row)
+ row
end
- end
- #
- # This method is the reading counterpart to CSV::dump(). See that method for
- # a detailed description of the process.
- #
- # You can customize loading by adding a class method called csv_load() which
- # will be passed a Hash of meta information, an Array of headers, and an Array
- # of fields for the object the method is expected to return.
- #
- # Remember that all fields will be Strings after this load. If you need
- # something else, use +options+ to setup converters or provide a custom
- # csv_load() implementation.
- #
- def self.load(io_or_str, options = Hash.new)
- csv = new(io_or_str, options)
-
- # load meta information
- meta = Hash[*csv.shift]
- cls = meta["class".encode(csv.encoding)].split("::".encode(csv.encoding)).
- inject(Object) do |c, const|
- c.const_get(const)
+ def close
+ terminate
end
- # load headers
- headers = csv.shift
+ private
- # unserialize each object stored in the file
- results = csv.inject(Array.new) do |all, row|
- begin
- obj = cls.csv_load(meta, headers, row)
- rescue NoMethodError
- obj = cls.allocate
- headers.zip(row) do |name, value|
- if name[0] == ?@
- obj.instance_variable_set(name, value)
- else
- obj.send(name, value)
- end
- end
- end
- all << obj
+ def initialize(dev)
+ raise RuntimeError.new('Do not instanciate this class directly.')
end
- csv.close unless io_or_str.is_a? String
-
- results
- end
-
- #
- # :call-seq:
- # filter( options = Hash.new ) { |row| ... }
- # filter( input, options = Hash.new ) { |row| ... }
- # filter( input, output, options = Hash.new ) { |row| ... }
- #
- # This method is a convenience for building Unix-like filters for CSV data.
- # Each row is yielded to the provided block which can alter it as needed.
- # After the block returns, the row is appended to +output+ altered or not.
- #
- # The +input+ and +output+ arguments can be anything CSV::new() accepts
- # (generally String or IO objects). If not given, they default to
- # <tt>ARGF</tt> and <tt>$stdout</tt>.
- #
- # The +options+ parameter is also filtered down to CSV::new() after some
- # clever key parsing. Any key beginning with <tt>:in_</tt> or
- # <tt>:input_</tt> will have that leading identifier stripped and will only
- # be used in the +options+ Hash for the +input+ object. Keys starting with
- # <tt>:out_</tt> or <tt>:output_</tt> affect only +output+. All other keys
- # are assigned to both objects.
- #
- # The <tt>:output_row_sep</tt> +option+ defaults to
- # <tt>$INPUT_RECORD_SEPARATOR</tt> (<tt>$/</tt>).
- #
- def self.filter(*args)
- # parse options for input, output, or both
- in_options, out_options = Hash.new, {row_sep: $INPUT_RECORD_SEPARATOR}
- if args.last.is_a? Hash
- args.pop.each do |key, value|
- case key.to_s
- when /\Ain(?:put)?_(.+)\Z/
- in_options[$1.to_sym] = value
- when /\Aout(?:put)?_(.+)\Z/
- out_options[$1.to_sym] = value
- else
- in_options[key] = value
- out_options[key] = value
- end
- end
+ def get_row(row)
+ raise NotImplementedError.new('Method get_row must be defined in a derived class.')
end
- # build input and output wrappers
- input = new(args.shift || ARGF, in_options)
- output = new(args.shift || $stdout, out_options)
- # read, yield, write
- input.each do |row|
- yield row
- output << row
+ def terminate
+ # Define if needed.
end
end
+
- #
- # This method is intended as the primary interface for reading CSV files. You
- # pass a +path+ and any +options+ you wish to set for the read. Each row of
- # file will be passed to the provided +block+ in turn.
- #
- # The +options+ parameter can be anything CSV::new() understands. This method
- # also understands an additional <tt>:encoding</tt> parameter that you can use
- # to specify the Encoding of the data in the file to be read. You must provide
- # this unless your data is in Encoding::default_external(). CSV will use this
- # to deterime how to parse the data. You may provide a second Encoding to
- # have the data transcoded as it is read. For example,
- # <tt>encoding: "UTF-32BE:UTF-8"</tt> would read UTF-32BE data from the file
- # but transcode it to UTF-8 before CSV parses it.
- #
- def self.foreach(path, options = Hash.new, &block)
- encoding = options.delete(:encoding)
- mode = "rb"
- mode << ":#{encoding}" if encoding
- open(path, mode, options) do |csv|
- csv.each(&block)
+ class StringReader < Reader
+ def initialize(string, fs = ',', rs = nil)
+ @fs = fs
+ @rs = rs
+ @dev = string
+ @idx = 0
+ if @dev[0, 3] == "\xef\xbb\xbf"
+ @idx += 3
+ end
end
- end
- #
- # :call-seq:
- # generate( str, options = Hash.new ) { |csv| ... }
- # generate( options = Hash.new ) { |csv| ... }
- #
- # This method wraps a String you provide, or an empty default String, in a
- # CSV object which is passed to the provided block. You can use the block to
- # append CSV rows to the String and when the block exits, the final String
- # will be returned.
- #
- # Note that a passed String *is* modfied by this method. Call dup() before
- # passing if you need a new String.
- #
- # The +options+ parameter can be anthing CSV::new() understands. This method
- # understands an additional <tt>:encoding</tt> parameter when not passed a
- # String to set the base Encoding for the output. CSV needs this hint if you
- # plan to output non-ASCII compatible data.
- #
- def self.generate(*args)
- # add a default empty String, if none was given
- if args.first.is_a? String
- io = StringIO.new(args.shift)
- io.seek(0, IO::SEEK_END)
- args.unshift(io)
- else
- encoding = args.last.is_a?(Hash) ? args.last.delete(:encoding) : nil
- str = ""
- str.encode!(encoding) if encoding
- args.unshift(str)
- end
- csv = new(*args) # wrap
- yield csv # yield for appending
- csv.string # return final String
- end
+ private
- #
- # This method is a shortcut for converting a single row (Array) into a CSV
- # String.
- #
- # The +options+ parameter can be anthing CSV::new() understands. This method
- # understands an additional <tt>:encoding</tt> parameter to set the base
- # Encoding for the output. This method will try to guess your Encoding from
- # the first non-+nil+ field in +row+, if possible, but you may need to use
- # this parameter as a backup plan.
- #
- # The <tt>:row_sep</tt> +option+ defaults to <tt>$INPUT_RECORD_SEPARATOR</tt>
- # (<tt>$/</tt>) when calling this method.
- #
- def self.generate_line(row, options = Hash.new)
- options = {row_sep: $INPUT_RECORD_SEPARATOR}.merge(options)
- encoding = options.delete(:encoding)
- str = ""
- if encoding
- str.force_encoding(encoding)
- elsif field = row.find { |f| not f.nil? }
- str.force_encoding(String(field).encoding)
+ def get_row(row)
+ parsed_cells, next_idx = CSV.parse_row(@dev, @idx, row, @fs, @rs)
+ if parsed_cells == 0 and next_idx == 0 and @idx != @dev.size
+ raise IllegalFormatError.new
+ end
+ @idx = next_idx
+ parsed_cells
end
- (new(str, options) << row).string
end
- #
- # :call-seq:
- # open( filename, mode = "rb", options = Hash.new ) { |faster_csv| ... }
- # open( filename, options = Hash.new ) { |faster_csv| ... }
- # open( filename, mode = "rb", options = Hash.new )
- # open( filename, options = Hash.new )
- #
- # This method opens an IO object, and wraps that with CSV. This is intended
- # as the primary interface for writing a CSV file.
- #
- # You must pass a +filename+ and may optionally add a +mode+ for Ruby's
- # open(). You may also pass an optional Hash containing any +options+
- # CSV::new() understands as the final argument.
- #
- # This method works like Ruby's open() call, in that it will pass a CSV object
- # to a provided block and close it when the block terminates, or it will
- # return the CSV object when no block is provided. (*Note*: This is different
- # from the Ruby 1.8 CSV library which passed rows to the block. Use
- # CSV::foreach() for that behavior.)
- #
- # You must provide a +mode+ with an embedded Encoding designator unless your
- # data is in Encoding::default_external(). CSV will check the Encoding of the
- # underlying IO object (set by the +mode+ you pass) to deterime how to parse
- # the data. You may provide a second Encoding to have the data transcoded as
- # it is read just as you can with a normal call to IO::open(). For example,
- # <tt>"rb:UTF-32BE:UTF-8"</tt> would read UTF-32BE data from the file but
- # transcode it to UTF-8 before CSV parses it.
- #
- # An opened CSV object will delegate to many IO methods for convenience. You
- # may call:
- #
- # * binmode()
- # * binmode?()
- # * close()
- # * close_read()
- # * close_write()
- # * closed?()
- # * eof()
- # * eof?()
- # * external_encoding()
- # * fcntl()
- # * fileno()
- # * flock()
- # * flush()
- # * fsync()
- # * internal_encoding()
- # * ioctl()
- # * isatty()
- # * path()
- # * pid()
- # * pos()
- # * pos=()
- # * reopen()
- # * seek()
- # * stat()
- # * sync()
- # * sync=()
- # * tell()
- # * to_i()
- # * to_io()
- # * truncate()
- # * tty?()
- #
- def self.open(*args)
- # find the +options+ Hash
- options = if args.last.is_a? Hash then args.pop else Hash.new end
- # default to a binary open mode
- args << "rb" if args.size == 1
- # wrap a File opened with the remaining +args+
- csv = new(File.open(*args), options)
- # handle blocks like Ruby's open(), not like the CSV library
- if block_given?
- begin
- yield csv
- ensure
- csv.close
+ class IOReader < Reader
+ def initialize(io, fs = ',', rs = nil)
+ @io = io
+ @fs = fs
+ @rs = rs
+ @dev = CSV::IOBuf.new(@io)
+ @idx = 0
+ if @dev[0] == 0xef and @dev[1] == 0xbb and @dev[2] == 0xbf
+ @idx += 3
end
- else
- csv
+ @close_on_terminate = false
end
- end
- #
- # :call-seq:
- # parse( str, options = Hash.new ) { |row| ... }
- # parse( str, options = Hash.new )
- #
- # This method can be used to easily parse CSV out of a String. You may either
- # provide a +block+ which will be called with each row of the String in turn,
- # or just use the returned Array of Arrays (when no +block+ is given).
- #
- # You pass your +str+ to read from, and an optional +options+ Hash containing
- # anything CSV::new() understands.
- #
- def self.parse(*args, &block)
- csv = new(*args)
- if block.nil? # slurp contents, if no block is given
- begin
- csv.read
- ensure
- csv.close
- end
- else # or pass each row to a provided block
- csv.each(&block)
+ # Tell this reader to close the IO when terminated (Triggered by invoking
+ # CSV::IOReader#close).
+ def close_on_terminate
+ @close_on_terminate = true
end
- end
-
- #
- # This method is a shortcut for converting a single line of a CSV String into
- # a into an Array. Note that if +line+ contains multiple rows, anything
- # beyond the first row is ignored.
- #
- # The +options+ parameter can be anthing CSV::new() understands.
- #
- def self.parse_line(line, options = Hash.new)
- new(line, options).shift
- end
- #
- # Use to slurp a CSV file into an Array of Arrays. Pass the +path+ to the
- # file and any +options+ CSV::new() understands. This method also understands
- # an additional <tt>:encoding</tt> parameter that you can use to specify the
- # Encoding of the data in the file to be read. You must provide this unless
- # your data is in Encoding::default_external(). CSV will use this to deterime
- # how to parse the data. You may provide a second Encoding to have the data
- # transcoded as it is read. For example,
- # <tt>encoding: "UTF-32BE:UTF-8"</tt> would read UTF-32BE data from the file
- # but transcode it to UTF-8 before CSV parses it.
- #
- def self.read(path, options = Hash.new)
- encoding = options.delete(:encoding)
- mode = "rb"
- mode << ":#{encoding}" if encoding
- open(path, mode, options) { |csv| csv.read }
- end
-
- # Alias for CSV::read().
- def self.readlines(*args)
- read(*args)
- end
-
- #
- # A shortcut for:
- #
- # CSV.read( path, { headers: true,
- # converters: :numeric,
- # header_converters: :symbol }.merge(options) )
- #
- def self.table(path, options = Hash.new)
- read( path, { headers: true,
- converters: :numeric,
- header_converters: :symbol }.merge(options) )
- end
-
- #
- # This constructor will wrap either a String or IO object passed in +data+ for
- # reading and/or writing. In addition to the CSV instance methods, several IO
- # methods are delegated. (See CSV::open() for a complete list.) If you pass
- # a String for +data+, you can later retrieve it (after writing to it, for
- # example) with CSV.string().
- #
- # Note that a wrapped String will be positioned at at the beginning (for
- # reading). If you want it at the end (for writing), use CSV::generate().
- # If you want any other positioning, pass a preset StringIO object instead.
- #
- # You may set any reading and/or writing preferences in the +options+ Hash.
- # Available options are:
- #
- # <b><tt>:col_sep</tt></b>:: The String placed between each field.
- # This String will be transcoded into
- # the data's Encoding before parsing.
- # <b><tt>:row_sep</tt></b>:: The String appended to the end of each
- # row. This can be set to the special
- # <tt>:auto</tt> setting, which requests
- # that CSV automatically discover this
- # from the data. Auto-discovery reads
- # ahead in the data looking for the next
- # <tt>"\r\n"</tt>, <tt>"\n"</tt>, or
- # <tt>"\r"</tt> sequence. A sequence
- # will be selected even if it occurs in
- # a quoted field, assuming that you
- # would have the same line endings
- # there. If none of those sequences is
- # found, +data+ is <tt>ARGF</tt>,
- # <tt>STDIN</tt>, <tt>STDOUT</tt>, or
- # <tt>STDERR</tt>, or the stream is only
- # available for output, the default
- # <tt>$INPUT_RECORD_SEPARATOR</tt>
- # (<tt>$/</tt>) is used. Obviously,
- # discovery takes a little time. Set
- # manually if speed is important. Also
- # note that IO objects should be opened
- # in binary mode on Windows if this
- # feature will be used as the
- # line-ending translation can cause
- # problems with resetting the document
- # position to where it was before the
- # read ahead. This String will be
- # transcoded into the data's Encoding
- # before parsing.
- # <b><tt>:quote_char</tt></b>:: The character used to quote fields.
- # This has to be a single character
- # String. This is useful for
- # application that incorrectly use
- # <tt>'</tt> as the quote character
- # instead of the correct <tt>"</tt>.
- # CSV will always consider a double
- # sequence this character to be an
- # escaped quote. This String will be
- # transcoded into the data's Encoding
- # before parsing.
- # <b><tt>:field_size_limit</tt></b>:: This is a maximum size CSV will read
- # ahead looking for the closing quote
- # for a field. (In truth, it reads to
- # the first line ending beyond this
- # size.) If a quote cannot be found
- # within the limit CSV will raise a
- # MalformedCSVError, assuming the data
- # is faulty. You can use this limit to
- # prevent what are effectively DoS
- # attacks on the parser. However, this
- # limit can cause a legitimate parse to
- # fail and thus is set to +nil+, or off,
- # by default.
- # <b><tt>:converters</tt></b>:: An Array of names from the Converters
- # Hash and/or lambdas that handle custom
- # conversion. A single converter
- # doesn't have to be in an Array. All
- # built-in converters try to transcode
- # fields to UTF-8 before converting.
- # The conversion will fail if the data
- # cannot be transcoded, leaving the
- # field unchanged.
- # <b><tt>:unconverted_fields</tt></b>:: If set to +true+, an
- # unconverted_fields() method will be
- # added to all returned rows (Array or
- # CSV::Row) that will return the fields
- # as they were before conversion. Note
- # that <tt>:headers</tt> supplied by
- # Array or String were not fields of the
- # document and thus will have an empty
- # Array attached.
- # <b><tt>:headers</tt></b>:: If set to <tt>:first_row</tt> or
- # +true+, the initial row of the CSV
- # file will be treated as a row of
- # headers. If set to an Array, the
- # contents will be used as the headers.
- # If set to a String, the String is run
- # through a call of CSV::parse_line()
- # with the same <tt>:col_sep</tt>,
- # <tt>:row_sep</tt>, and
- # <tt>:quote_char</tt> as this instance
- # to produce an Array of headers. This
- # setting causes CSV#shift() to return
- # rows as CSV::Row objects instead of
- # Arrays and CSV#read() to return
- # CSV::Table objects instead of an Array
- # of Arrays.
- # <b><tt>:return_headers</tt></b>:: When +false+, header rows are silently
- # swallowed. If set to +true+, header
- # rows are returned in a CSV::Row object
- # with identical headers and
- # fields (save that the fields do not go
- # through the converters).
- # <b><tt>:write_headers</tt></b>:: When +true+ and <tt>:headers</tt> is
- # set, a header row will be added to the
- # output.
- # <b><tt>:header_converters</tt></b>:: Identical in functionality to
- # <tt>:converters</tt> save that the
- # conversions are only made to header
- # rows. All built-in converters try to
- # transcode headers to UTF-8 before
- # converting. The conversion will fail
- # if the data cannot be transcoded,
- # leaving the header unchanged.
- # <b><tt>:skip_blanks</tt></b>:: When set to a +true+ value, CSV will
- # skip over any rows with no content.
- # <b><tt>:force_quotes</tt></b>:: When set to a +true+ value, CSV will
- # quote all CSV fields it creates.
- #
- # See CSV::DEFAULT_OPTIONS for the default settings.
- #
- # Options cannot be overriden in the instance methods for performance reasons,
- # so be sure to set what you want here.
- #
- def initialize(data, options = Hash.new)
- # build the options for this read/write
- options = DEFAULT_OPTIONS.merge(options)
-
- # create the IO object we will read from
- @io = if data.is_a? String then StringIO.new(data) else data end
- # honor the IO encoding if we can, otherwise default to ASCII-8BIT
- @encoding = if @io.respond_to? :internal_encoding
- @io.internal_encoding || @io.external_encoding
- elsif @io.is_a? StringIO
- @io.string.encoding
- end
- @encoding ||= Encoding.default_internal || Encoding.default_external
- #
- # prepare for building safe regular expressions in the target encoding,
- # if we can transcode the needed characters
- #
- @re_esc = "\\".encode(@encoding) rescue ""
- @re_chars = %w[ \\ . [ ] - ^ $ ?
- * + { } ( ) | #
- \ \r \n \t \f \v ].
- map { |s| s.encode(@encoding) rescue nil }.compact
-
- init_separators(options)
- init_parsers(options)
- init_converters(options)
- init_headers(options)
+ private
- unless options.empty?
- raise ArgumentError, "Unknown options: #{options.keys.join(', ')}."
+ def get_row(row)
+ parsed_cells, next_idx = CSV.parse_row(@dev, @idx, row, @fs, @rs)
+ if parsed_cells == 0 and next_idx == 0 and !@dev.is_eos?
+ raise IllegalFormatError.new
+ end
+ dropped = @dev.drop(next_idx)
+ @idx = next_idx - dropped
+ parsed_cells
end
- # track our own lineno since IO gets confused about line-ends is CSV fields
- @lineno = 0
- end
+ def terminate
+ if @close_on_terminate
+ @io.close
+ end
- #
- # The encoded <tt>:col_sep</tt> used in parsing and writing. See CSV::new
- # for details.
- #
- attr_reader :col_sep
- #
- # The encoded <tt>:row_sep</tt> used in parsing and writing. See CSV::new
- # for details.
- #
- attr_reader :row_sep
- #
- # The encoded <tt>:quote_char</tt> used in parsing and writing. See CSV::new
- # for details.
- #
- attr_reader :quote_char
- # The limit for field size, if any. See CSV::new for details.
- attr_reader :field_size_limit
- #
- # Returns the current list of converters in effect. See CSV::new for details.
- # Built-in converters will be returned by name, while others will be returned
- # as is.
- #
- def converters
- @converters.map do |converter|
- name = Converters.rassoc(converter)
- name ? name.first : converter
- end
- end
- #
- # Returns +true+ if unconverted_fields() to parsed results. See CSV::new
- # for details.
- #
- def unconverted_fields?() @unconverted_fields end
- #
- # Returns +nil+ if headers will not be used, +true+ if they will but have not
- # yet been read, or the actual headers after they have been read. See
- # CSV::new for details.
- #
- def headers
- @headers || true if @use_headers
- end
- #
- # Returns +true+ if headers will be returned as a row of results.
- # See CSV::new for details.
- #
- def return_headers?() @return_headers end
- # Returns +true+ if headers are written in output. See CSV::new for details.
- def write_headers?() @write_headers end
- #
- # Returns the current list of converters in effect for headers. See CSV::new
- # for details. Built-in converters will be returned by name, while others
- # will be returned as is.
- #
- def header_converters
- @header_converters.map do |converter|
- name = HeaderConverters.rassoc(converter)
- name ? name.first : converter
+ if @dev
+ @dev.close
+ end
end
end
- #
- # Returns +true+ blank lines are skipped by the parser. See CSV::new
- # for details.
- #
- def skip_blanks?() @skip_blanks end
- # Returns +true+ if all output fields are quoted. See CSV::new for details.
- def force_quotes?() @force_quotes end
- #
- # The Encoding CSV is parsing or writing in. This will be the Encoding you
- # receive parsed data in and/or the Encoding data will be written in.
- #
- attr_reader :encoding
+ # CSV formatted string/stream writer.
#
- # The line number of the last row read from this file. Fields with nested
- # line-end characters will not affect this count.
+ # EXAMPLE
+ # Write rows to 'csvout' file.
#
- attr_reader :lineno
-
- ### IO and StringIO Delegation ###
-
- extend Forwardable
- def_delegators :@io, :binmode, :binmode?, :close, :close_read, :close_write,
- :closed?, :eof, :eof?, :external_encoding, :fcntl,
- :fileno, :flock, :flush, :fsync, :internal_encoding,
- :ioctl, :isatty, :path, :pid, :pos, :pos=, :reopen,
- :seek, :stat, :string, :sync, :sync=, :tell, :to_i,
- :to_io, :truncate, :tty?
-
- # Rewinds the underlying IO object and resets CSV's lineno() counter.
- def rewind
- @headers = nil
- @lineno = 0
-
- @io.rewind
- end
-
- ### End Delegation ###
-
- #
- # The primary write method for wrapped Strings and IOs, +row+ (an Array or
- # CSV::Row) is converted to CSV and appended to the data source. When a
- # CSV::Row is passed, only the row's fields() are appended to the output.
+ # outfile = File.open('csvout', 'wb')
+ # CSV::Writer.generate(outfile) do |csv|
+ # csv << ['c1', nil, '', '"', "\r\n", 'c2']
+ # ...
+ # end
#
- # The data source must be open for writing.
+ # outfile.close
#
- def <<(row)
- # make sure headers have been assigned
- if header_row? and [Array, String].include? @use_headers.class
- parse_headers # won't read data for Array or String
- self << @headers if @write_headers
+ class Writer
+ # Given block is called with the writer instance. str_or_writable must
+ # handle '<<(string)'.
+ def Writer.generate(str_or_writable, fs = ',', rs = nil, &block)
+ writer = Writer.create(str_or_writable, fs, rs)
+ if block
+ yield(writer)
+ writer.close
+ nil
+ else
+ writer
+ end
end
- # handle CSV::Row objects and Hashes
- row = case row
- when self.class::Row then row.fields
- when Hash then @headers.map { |header| row[header] }
- else row
- end
-
- @headers = row if header_row?
- @lineno += 1
-
- @io << row.map(&@quote).join(@col_sep) + @row_sep # quote and separate
-
- self # for chaining
- end
- alias_method :add_row, :<<
- alias_method :puts, :<<
+ # str_or_writable must handle '<<(string)'.
+ def Writer.create(str_or_writable, fs = ',', rs = nil)
+ BasicWriter.new(str_or_writable, fs, rs)
+ end
- #
- # :call-seq:
- # convert( name )
- # convert { |field| ... }
- # convert { |field, field_info| ... }
- #
- # You can use this method to install a CSV::Converters built-in, or provide a
- # block that handles a custom conversion.
- #
- # If you provide a block that takes one argument, it will be passed the field
- # and is expected to return the converted value or the field itself. If your
- # block takes two arguments, it will also be passed a CSV::FieldInfo Struct,
- # containing details about the field. Again, the block should return a
- # converted field or the field itself.
- #
- def convert(name = nil, &converter)
- add_converter(:converters, self.class::Converters, name, &converter)
- end
+ # dump CSV stream to the device. argument must be an Array of String.
+ def <<(row)
+ CSV.generate_row(row, row.size, @dev, @fs, @rs)
+ self
+ end
+ alias add_row <<
- #
- # :call-seq:
- # header_convert( name )
- # header_convert { |field| ... }
- # header_convert { |field, field_info| ... }
- #
- # Identical to CSV#convert(), but for header rows.
- #
- # Note that this method must be called before header rows are read to have any
- # effect.
- #
- def header_convert(name = nil, &converter)
- add_converter( :header_converters,
- self.class::HeaderConverters,
- name,
- &converter )
- end
+ def close
+ terminate
+ end
- include Enumerable
+ private
- #
- # Yields each row of the data source in turn.
- #
- # Support for Enumerable.
- #
- # The data source must be open for reading.
- #
- def each
- while row = shift
- yield row
+ def initialize(dev)
+ raise RuntimeError.new('Do not instanciate this class directly.')
end
- end
- #
- # Slurps the remaining rows and returns an Array of Arrays.
- #
- # The data source must be open for reading.
- #
- def read
- rows = to_a
- if @use_headers
- Table.new(rows)
- else
- rows
+ def terminate
+ # Define if needed.
end
end
- alias_method :readlines, :read
- # Returns +true+ if the next row read will be a header row.
- def header_row?
- @use_headers and @headers.nil?
- end
- #
- # The primary read method for wrapped Strings and IOs, a single row is pulled
- # from the data source, parsed and returned as an Array of fields (if header
- # rows are not used) or a CSV::Row (when header rows are used).
- #
- # The data source must be open for reading.
- #
- def shift
- #########################################################################
- ### This method is purposefully kept a bit long as simple conditional ###
- ### checks are faster than numerous (expensive) method calls. ###
- #########################################################################
-
- # handle headers not based on document content
- if header_row? and @return_headers and
- [Array, String].include? @use_headers.class
- if @unconverted_fields
- return add_unconverted_fields(parse_headers, Array.new)
- else
- return parse_headers
- end
+ class BasicWriter < Writer
+ def initialize(str_or_writable, fs = ',', rs = nil)
+ @fs = fs
+ @rs = rs
+ @dev = str_or_writable
+ @close_on_terminate = false
end
- # begin with a blank line, so we can always add to it
- line = ""
+ # Tell this writer to close the IO when terminated (Triggered by invoking
+ # CSV::BasicWriter#close).
+ def close_on_terminate
+ @close_on_terminate = true
+ end
- #
- # it can take multiple calls to <tt>@io.gets()</tt> to get a full line,
- # because of \r and/or \n characters embedded in quoted fields
- #
- loop do
- # add another read to the line
- (line += @io.gets(@row_sep)) rescue return nil
- # copy the line so we can chop it up in parsing
- parse = line.dup
- parse.sub!(@parsers[:line_end], "")
+ private
- #
- # I believe a blank line should be an <tt>Array.new</tt>, not Ruby 1.8
- # CSV's <tt>[nil]</tt>
- #
- if parse.empty?
- @lineno += 1
- if @skip_blanks
- line = ""
- next
- elsif @unconverted_fields
- return add_unconverted_fields(Array.new, Array.new)
- elsif @use_headers
- return self.class::Row.new(Array.new, Array.new)
+ def terminate
+ if @close_on_terminate
+ @dev.close
+ end
+ end
+ end
+
+private
+
+ # Buffered stream.
+ #
+ # EXAMPLE 1 -- an IO.
+ # class MyBuf < StreamBuf
+ # # Do initialize myself before a super class. Super class might call my
+ # # method 'read'. (Could be awful for C++ user. :-)
+ # def initialize(s)
+ # @s = s
+ # super()
+ # end
+ #
+ # # define my own 'read' method.
+ # # CAUTION: Returning nil means EnfOfStream.
+ # def read(size)
+ # @s.read(size)
+ # end
+ #
+ # # release buffers. in Ruby which has GC, you do not have to call this...
+ # def terminate
+ # @s = nil
+ # super()
+ # end
+ # end
+ #
+ # buf = MyBuf.new(STDIN)
+ # my_str = ''
+ # p buf[0, 0] # => '' (null string)
+ # p buf[0] # => 97 (char code of 'a')
+ # p buf[0, 1] # => 'a'
+ # my_str = buf[0, 5]
+ # p my_str # => 'abcde' (5 chars)
+ # p buf[0, 6] # => "abcde\n" (6 chars)
+ # p buf[0, 7] # => "abcde\n" (6 chars)
+ # p buf.drop(3) # => 3 (dropped chars)
+ # p buf.get(0, 2) # => 'de' (2 chars)
+ # p buf.is_eos? # => false (is not EOS here)
+ # p buf.drop(5) # => 3 (dropped chars)
+ # p buf.is_eos? # => true (is EOS here)
+ # p buf[0] # => nil (is EOS here)
+ #
+ # EXAMPLE 2 -- String.
+ # This is a conceptual example. No pros with this.
+ #
+ # class StrBuf < StreamBuf
+ # def initialize(s)
+ # @str = s
+ # @idx = 0
+ # super()
+ # end
+ #
+ # def read(size)
+ # str = @str[@idx, size]
+ # @idx += str.size
+ # str
+ # end
+ # end
+ #
+ class StreamBuf
+ # get a char or a partial string from the stream.
+ # idx: index of a string to specify a start point of a string to get.
+ # unlike String instance, idx < 0 returns nil.
+ # n: size of a string to get.
+ # returns char at idx if n == nil.
+ # returns a partial string, from idx to (idx + n) if n != nil. at EOF,
+ # the string size could not equal to arg n.
+ def [](idx, n = nil)
+ if idx < 0
+ return nil
+ end
+ if (idx_is_eos?(idx))
+ if n and (@offset + idx == buf_size(@cur_buf))
+ # Like a String, 'abc'[4, 1] returns nil and
+ # 'abc'[3, 1] returns '' not nil.
+ return ''
else
- return Array.new
+ return nil
end
end
-
- #
- # shave leading empty fields if needed, because the main parser chokes
- # on these
- #
- csv = if parse.sub!(@parsers[:leading_fields], "")
- [nil] * ($&.length / @col_sep.length)
- else
- Array.new
- end
- #
- # then parse the main fields with a hyper-tuned Regexp from
- # Mastering Regular Expressions, Second Edition
- #
- parse.gsub!(@parsers[:csv_row]) do
- csv << if $1.nil? # we found an unquoted field
- if $2.empty? # switch empty unquoted fields to +nil+...
- nil # for Ruby 1.8 CSV compatibility
- else
- # I decided to take a strict approach to CSV parsing...
- if $2.count(@parsers[:return_newline]).zero? # verify correctness
- $2
- else
- # or throw an Exception
- raise MalformedCSVError, "Unquoted fields do not allow " +
- "\\r or \\n (line #{lineno + 1})."
- end
+ my_buf = @cur_buf
+ my_offset = @offset
+ next_idx = idx
+ while (my_offset + next_idx >= buf_size(my_buf))
+ if (my_buf == @buf_tail_idx)
+ unless add_buf
+ break
end
- else # we found a quoted field...
- $1.gsub(@quote_char * 2, @quote_char) # unescape contents
- end
- "" # gsub!'s replacement, clear the field
- end
-
- # if parse is empty?(), we found all the fields on the line...
- if parse.empty?
- @lineno += 1
-
- # save fields unconverted fields, if needed...
- unconverted = csv.dup if @unconverted_fields
-
- # convert fields, if needed...
- csv = convert_fields(csv) unless @use_headers or @converters.empty?
- # parse out header rows and handle CSV::Row conversions...
- csv = parse_headers(csv) if @use_headers
-
- # inject unconverted fields and accessor, if requested...
- if @unconverted_fields and not csv.respond_to? :unconverted_fields
- add_unconverted_fields(csv, unconverted)
end
-
- # return the results
- break csv
- end
- # if we're not empty?() but at eof?(), a quoted field wasn't closed...
- if @io.eof?
- raise MalformedCSVError, "Unclosed quoted field on line #{lineno + 1}."
- elsif parse =~ @parsers[:bad_field]
- raise MalformedCSVError, "Illegal quoting on line #{lineno + 1}."
- elsif @field_size_limit and parse.length >= @field_size_limit
- raise MalformedCSVError, "Field size exceeded on line #{lineno + 1}."
- end
- # otherwise, we need to loop and pull some more data to complete the row
- end
- end
- alias_method :gets, :shift
- alias_method :readline, :shift
-
- #
- # Returns a simplified description of the key FasterCSV attributes in an
- # ASCII compatible String.
- #
- def inspect
- str = ["<#", self.class.to_s, " io_type:"]
- # show type of wrapped IO
- if @io == $stdout then str << "$stdout"
- elsif @io == $stdin then str << "$stdin"
- elsif @io == $stderr then str << "$stderr"
- else str << @io.class.to_s
- end
- # show IO.path(), if available
- if @io.respond_to?(:path) and (p = @io.path)
- str << " io_path:" << p.inspect
- end
- # show encoding
- str << " encoding:" << @encoding.name
- # show other attributes
- %w[ lineno col_sep row_sep
- quote_char skip_blanks ].each do |attr_name|
- if a = instance_variable_get("@#{attr_name}")
- str << " " << attr_name << ":" << a.inspect
- end
- end
- if @use_headers
- str << " headers:" << headers.inspect
- end
- str << ">"
- begin
- str.join
- rescue # any encoding error
- str.map do |s|
- e = Encoding::Converter.asciicompat_encoding(s.encoding)
- e ? s.encode(e) : s.force_encoding("ASCII-8BIT")
- end.join
- end
- end
-
- private
-
- #
- # Stores the indicated separators for later use.
- #
- # If auto-discovery was requested for <tt>@row_sep</tt>, this method will read
- # ahead in the <tt>@io</tt> and try to find one. +ARGF+, +STDIN+, +STDOUT+,
- # +STDERR+ and any stream open for output only with a default
- # <tt>@row_sep</tt> of <tt>$INPUT_RECORD_SEPARATOR</tt> (<tt>$/</tt>).
- #
- # This method also establishes the quoting rules used for CSV output.
- #
- def init_separators(options)
- # store the selected separators
- @col_sep = options.delete(:col_sep).to_s.encode(@encoding)
- @row_sep = options.delete(:row_sep) # encode after resolving :auto
- @quote_char = options.delete(:quote_char).to_s.encode(@encoding)
-
- if @quote_char.length != 1
- raise ArgumentError, ":quote_char has to be a single character String"
- end
-
- #
- # automatically discover row separator when requested
- # (not fully encoding safe)
- #
- if @row_sep == :auto
- if [ARGF, STDIN, STDOUT, STDERR].include?(@io) or
- (defined?(Zlib) and @io.class == Zlib::GzipWriter)
- @row_sep = $INPUT_RECORD_SEPARATOR
- else
- begin
- saved_pos = @io.pos # remember where we were
- while @row_sep == :auto
- #
- # if we run out of data, it's probably a single line
- # (use a sensible default)
- #
- if @io.eof?
- @row_sep = $INPUT_RECORD_SEPARATOR
- break
- end
-
- # read ahead a bit
- sample = read_to_char(1024)
- sample += read_to_char(1) if sample[-1..-1] == encode_str("\r") and
- not @io.eof?
-
- # try to find a standard separator
- if sample =~ encode_re("\r\n?|\n")
- @row_sep = $&
- break
- end
- end
- # tricky seek() clone to work around GzipReader's lack of seek()
- @io.rewind
- # reset back to the remembered position
- while saved_pos > 1024 # avoid loading a lot of data into memory
- @io.read(1024)
- saved_pos -= 1024
+ next_idx = my_offset + next_idx - buf_size(my_buf)
+ my_buf += 1
+ my_offset = 0
+ end
+ loc = my_offset + next_idx
+ if !n
+ return @buf_list[my_buf][loc] # Fixnum of char code.
+ elsif (loc + n - 1 < buf_size(my_buf))
+ return @buf_list[my_buf][loc, n] # String.
+ else # should do loop insted of (tail) recursive call...
+ res = @buf_list[my_buf][loc, BufSize]
+ size_added = buf_size(my_buf) - loc
+ if size_added > 0
+ idx += size_added
+ n -= size_added
+ ret = self[idx, n]
+ if ret
+ res << ret
end
- @io.read(saved_pos) if saved_pos.nonzero?
- rescue IOError # stream not opened for reading
- @row_sep = $INPUT_RECORD_SEPARATOR
end
- end
- end
- @row_sep = @row_sep.to_s.encode(@encoding)
-
- # establish quoting rules
- @force_quotes = options.delete(:force_quotes)
- do_quote = lambda do |field|
- @quote_char +
- String(field).gsub(@quote_char, @quote_char * 2) +
- @quote_char
- end
- quotable_chars = encode_str("\r\n", @col_sep, @quote_char)
- @quote = if @force_quotes
- do_quote
- else
- lambda do |field|
- if field.nil? # represent +nil+ fields as empty unquoted fields
- ""
- else
- field = String(field) # Stringify fields
- # represent empty fields as empty quoted fields
- if field.empty? or
- field.count(quotable_chars).nonzero?
- do_quote.call(field)
+ return res
+ end
+ end
+ alias get []
+
+ # drop a string from the stream.
+ # returns dropped size. at EOF, dropped size might not equals to arg n.
+ # Once you drop the head of the stream, access to the dropped part via []
+ # or get returns nil.
+ def drop(n)
+ if is_eos?
+ return 0
+ end
+ size_dropped = 0
+ while (n > 0)
+ if !@is_eos or (@cur_buf != @buf_tail_idx)
+ if (@offset + n < buf_size(@cur_buf))
+ size_dropped += n
+ @offset += n
+ n = 0
else
- field # unquoted field
+ size = buf_size(@cur_buf) - @offset
+ size_dropped += size
+ n -= size
+ @offset = 0
+ unless rel_buf
+ unless add_buf
+ break
+ end
+ @cur_buf = @buf_tail_idx
+ end
end
end
end
+ size_dropped
+ end
+
+ def is_eos?
+ return idx_is_eos?(0)
+ end
+
+ # WARN: Do not instantiate this class directly. Define your own class
+ # which derives this class and define 'read' instance method.
+ def initialize
+ @buf_list = []
+ @cur_buf = @buf_tail_idx = -1
+ @offset = 0
+ @is_eos = false
+ add_buf
+ @cur_buf = @buf_tail_idx
+ end
+
+ protected
+
+ def terminate
+ while (rel_buf); end
+ end
+
+ # protected method 'read' must be defined in derived classes.
+ # CAUTION: Returning a string which size is not equal to 'size' means
+ # EnfOfStream. When it is not at EOS, you must block the callee, try to
+ # read and return the sized string.
+ def read(size) # raise EOFError
+ raise NotImplementedError.new('Method read must be defined in a derived class.')
+ end
+
+ private
+
+ def buf_size(idx)
+ @buf_list[idx].size
end
- end
-
- # Pre-compiles parsers and stores them by name for access during reads.
- def init_parsers(options)
- # store the parser behaviors
- @skip_blanks = options.delete(:skip_blanks)
- @field_size_limit = options.delete(:field_size_limit)
-
- # prebuild Regexps for faster parsing
- esc_col_sep = escape_re(@col_sep)
- esc_row_sep = escape_re(@row_sep)
- esc_quote = escape_re(@quote_char)
- @parsers = {
- # for empty leading fields
- leading_fields: encode_re("\\A(?:", esc_col_sep, ")+"),
- # The Primary Parser
- csv_row: encode_re(
- "\\G(?:\\A|", esc_col_sep, ")", # anchor the match
- "(?:", esc_quote, # find quoted fields
- "((?>[^", esc_quote, "]*)", # "unrolling the loop"
- "(?>", esc_quote * 2, # double for escaping
- "[^", esc_quote, "]*)*)",
- esc_quote,
- "|", # ... or ...
- "([^", esc_quote, esc_col_sep, "]*))", # unquoted fields
- "(?=", esc_col_sep, "|\\z)" # ensure field is ended
- ),
- # a test for unescaped quotes
- bad_field: encode_re(
- "\\A", esc_col_sep, "?", # an optional comma
- "(?:", esc_quote, # a quoted field
- "(?>[^", esc_quote, "]*)", # "unrolling the loop"
- "(?>", esc_quote * 2, # double for escaping
- "[^", esc_quote, "]*)*",
- esc_quote, # the closing quote
- "[^", esc_quote, "]", # an extra character
- "|", # ... or ...
- "[^", esc_quote, esc_col_sep, "]+", # an unquoted field
- esc_quote, ")" # an extra quote
- ),
- # safer than chomp!()
- line_end: encode_re(esc_row_sep, "\\z"),
- # illegal unquoted characters
- return_newline: encode_str("\r\n")
- }
- end
-
- #
- # Loads any converters requested during construction.
- #
- # If +field_name+ is set <tt>:converters</tt> (the default) field converters
- # are set. When +field_name+ is <tt>:header_converters</tt> header converters
- # are added instead.
- #
- # The <tt>:unconverted_fields</tt> option is also actived for
- # <tt>:converters</tt> calls, if requested.
- #
- def init_converters(options, field_name = :converters)
- if field_name == :converters
- @unconverted_fields = options.delete(:unconverted_fields)
- end
-
- instance_variable_set("@#{field_name}", Array.new)
- # find the correct method to add the converters
- convert = method(field_name.to_s.sub(/ers\Z/, ""))
-
- # load converters
- unless options[field_name].nil?
- # allow a single converter not wrapped in an Array
- unless options[field_name].is_a? Array
- options[field_name] = [options[field_name]]
+ def add_buf
+ if @is_eos
+ return false
end
- # load each converter...
- options[field_name].each do |converter|
- if converter.is_a? Proc # custom code block
- convert.call(&converter)
- else # by name
- convert.call(converter)
- end
+ begin
+ str_read = read(BufSize)
+ rescue EOFError
+ str_read = nil
+ rescue
+ terminate
+ raise
+ end
+ if str_read.nil?
+ @is_eos = true
+ @buf_list.push('')
+ @buf_tail_idx += 1
+ false
+ else
+ @buf_list.push(str_read)
+ @buf_tail_idx += 1
+ true
end
end
-
- options.delete(field_name)
- end
-
- # Stores header row settings and loads header converters, if needed.
- def init_headers(options)
- @use_headers = options.delete(:headers)
- @return_headers = options.delete(:return_headers)
- @write_headers = options.delete(:write_headers)
-
- # headers must be delayed until shift(), in case they need a row of content
- @headers = nil
-
- init_converters(options, :header_converters)
- end
-
- #
- # The actual work method for adding converters, used by both CSV.convert() and
- # CSV.header_convert().
- #
- # This method requires the +var_name+ of the instance variable to place the
- # converters in, the +const+ Hash to lookup named converters in, and the
- # normal parameters of the CSV.convert() and CSV.header_convert() methods.
- #
- def add_converter(var_name, const, name = nil, &converter)
- if name.nil? # custom converter
- instance_variable_get("@#{var_name}") << converter
- else # named converter
- combo = const[name]
- case combo
- when Array # combo converter
- combo.each do |converter_name|
- add_converter(var_name, const, converter_name)
- end
- else # individual named converter
- instance_variable_get("@#{var_name}") << combo
+
+ def rel_buf
+ if (@cur_buf < 0)
+ return false
end
- end
- end
-
- #
- # Processes +fields+ with <tt>@converters</tt>, or <tt>@header_converters</tt>
- # if +headers+ is passed as +true+, returning the converted field set. Any
- # converter that changes the field into something other than a String halts
- # the pipeline of conversion for that field. This is primarily an efficiency
- # shortcut.
- #
- def convert_fields(fields, headers = false)
- # see if we are converting headers or fields
- converters = headers ? @header_converters : @converters
-
- fields.map.with_index do |field, index|
- converters.each do |converter|
- field = if converter.arity == 1 # straight field converter
- converter[field]
- else # FieldInfo converter
- header = @use_headers && !headers ? @headers[index] : nil
- converter[field, FieldInfo.new(index, lineno, header)]
- end
- break unless field.is_a? String # short-curcuit pipeline for speed
+ @buf_list[@cur_buf] = nil
+ if (@cur_buf == @buf_tail_idx)
+ @cur_buf = -1
+ return false
+ else
+ @cur_buf += 1
+ return true
end
- field # final state of each field, converted or original
end
- end
-
- #
- # This methods is used to turn a finished +row+ into a CSV::Row. Header rows
- # are also dealt with here, either by returning a CSV::Row with identical
- # headers and fields (save that the fields do not go through the converters)
- # or by reading past them to return a field row. Headers are also saved in
- # <tt>@headers</tt> for use in future rows.
- #
- # When +nil+, +row+ is assumed to be a header row not based on an actual row
- # of the stream.
- #
- def parse_headers(row = nil)
- if @headers.nil? # header row
- @headers = case @use_headers # save headers
- # Array of headers
- when Array then @use_headers
- # CSV header String
- when String
- self.class.parse_line( @use_headers,
- col_sep: @col_sep,
- row_sep: @row_sep,
- quote_char: @quote_char )
- # first row is headers
- else row
- end
-
- # prepare converted and unconverted copies
- row = @headers if row.nil?
- @headers = convert_fields(@headers, true)
-
- if @return_headers # return headers
- return self.class::Row.new(@headers, row, true)
- elsif not [Array, String].include? @use_headers.class # skip to field row
- return shift
- end
+
+ def idx_is_eos?(idx)
+ (@is_eos and ((@cur_buf < 0) or (@cur_buf == @buf_tail_idx)))
end
-
- self.class::Row.new(@headers, convert_fields(row)) # field row
+
+ BufSize = 1024 * 8
end
+ # Buffered IO.
#
- # Thiw methods injects an instance variable <tt>unconverted_fields</tt> into
- # +row+ and an accessor method for it called unconverted_fields(). The
- # variable is set to the contents of +fields+.
+ # EXAMPLE
+ # # File 'bigdata' could be a giga-byte size one!
+ # buf = CSV::IOBuf.new(File.open('bigdata', 'rb'))
+ # CSV::Reader.new(buf).each do |row|
+ # p row
+ # break if row[0].data == 'admin'
+ # end
#
- def add_unconverted_fields(row, fields)
- class << row
- attr_reader :unconverted_fields
+ class IOBuf < StreamBuf
+ def initialize(s)
+ @s = s
+ super()
end
- row.instance_eval { @unconverted_fields = fields }
- row
- end
-
- #
- # This method is an encoding safe version of Regexp::escape(). It will escape
- # any characters that would change the meaning of a regular expression in the
- # encoding of +str+. Regular expression characters that cannot be transcoded
- # to the target encoding will be skipped and no escaping will be performed if
- # a backslash cannot be transcoded.
- #
- def escape_re(str)
- str.chars.map { |c| @re_chars.include?(c) ? @re_esc + c : c }.join
- end
-
- #
- # Builds a regular expression in <tt>@encoding</tt>. All +chunks+ will be
- # transcoded to that encoding.
- #
- def encode_re(*chunks)
- Regexp.new(encode_str(*chunks))
- end
-
- #
- # Builds a String in <tt>@encoding</tt>. All +chunks+ will be transcoded to
- # that encoding.
- #
- def encode_str(*chunks)
- chunks.map { |chunk| chunk.encode(@encoding.name) }.join
- end
-
- #
- # Reads at least +bytes+ from <tt>@io</tt>, but will read up 10 bytes ahead if
- # needed to ensure the data read is valid in the ecoding of that data. This
- # should ensure that it is safe to use regular expressions on the read data,
- # unless it is actually a broken encoding. The read data will be returned in
- # <tt>@encoding</tt>.
- #
- def read_to_char(bytes)
- return "" if @io.eof?
- data = @io.read(bytes)
- begin
- encoded = encode_str(data)
- raise unless encoded.valid_encoding?
- return encoded
- rescue # encoding error or my invalid data raise
- if @io.eof? or data.size >= bytes + 10
- return data
- else
- data += @io.read(1)
- retry
- end
+
+ def close
+ terminate
end
- end
-end
-# Another name for CSV::instance().
-def CSV(*args, &block)
- CSV.instance(*args, &block)
-end
-
-class Array
- # Equivalent to <tt>CSV::generate_line(self, options)</tt>.
- def to_csv(options = Hash.new)
- CSV.generate_line(self, options)
- end
-end
+ private
-class String
- # Equivalent to <tt>CSV::parse_line(self, options)</tt>.
- def parse_csv(options = Hash.new)
- CSV.parse_line(self, options)
+ def read(size)
+ @s.read(size)
+ end
+
+ def terminate
+ super()
+ end
end
end
diff --git a/lib/date.rb b/lib/date.rb
index 802ce8ec14..90a4a01ca3 100644
--- a/lib/date.rb
+++ b/lib/date.rb
@@ -1,7 +1,7 @@
#
# date.rb - date and time library
#
-# Author: Tadayoshi Funaba 1998-2009
+# Author: Tadayoshi Funaba 1998-2008
#
# Documentation: William Webber <william@williamwebber.com>
#
@@ -193,8 +193,8 @@
#
# puts secs_to_new_year()
+require 'rational'
require 'date/format'
-require 'date/delta'
# Class representing a date.
#
@@ -328,392 +328,235 @@ class Date
UNIX_EPOCH_IN_CJD = 2440588 # :nodoc:
LD_EPOCH_IN_CJD = 2299160 # :nodoc:
- t = Module.new do
-
- private
-
- def find_fdoy(y, sg) # :nodoc:
- j = nil
- 1.upto(31) do |d|
- break if j = _valid_civil?(y, 1, d, sg)
+ # Does a given Julian Day Number fall inside the old-style (Julian)
+ # calendar?
+ #
+ # +jd+ is the Julian Day Number in question. +sg+ may be Date::GREGORIAN,
+ # in which case the answer is false; it may be Date::JULIAN, in which case
+ # the answer is true; or it may a number representing the Day of
+ # Calendar Reform. Date::ENGLAND and Date::ITALY are two possible such
+ # days.
+
+ def self.julian? (jd, sg)
+ case sg
+ when Numeric
+ jd < sg
+ else
+ if $VERBOSE
+ warn("#{caller.shift.sub(/:in .*/, '')}: " \
+"warning: do not use non-numerical object as julian day number anymore")
end
- j
+ not sg
end
+ end
- def find_ldoy(y, sg) # :nodoc:
- j = nil
- 31.downto(1) do |d|
- break if j = _valid_civil?(y, 12, d, sg)
- end
- j
- end
+ # Does a given Julian Day Number fall inside the new-style (Gregorian)
+ # calendar?
+ #
+ # The reverse of self.os? See the documentation for that method for
+ # more details.
+ def self.gregorian? (jd, sg) !julian?(jd, sg) end
- def find_fdom(y, m, sg) # :nodoc:
- j = nil
- 1.upto(31) do |d|
- break if j = _valid_civil?(y, m, d, sg)
- end
- j
- end
+ def self.fix_style(jd, sg) # :nodoc:
+ if julian?(jd, sg)
+ then JULIAN
+ else GREGORIAN end
+ end
- def find_ldom(y, m, sg) # :nodoc:
- j = nil
- 31.downto(1) do |d|
- break if j = _valid_civil?(y, m, d, sg)
- end
- j
- end
+ private_class_method :fix_style
- # Convert an Ordinal Date to a Julian Day Number.
- #
- # +y+ and +d+ are the year and day-of-year to convert.
- # +sg+ specifies the Day of Calendar Reform.
- #
- # Returns the corresponding Julian Day Number.
- def ordinal_to_jd(y, d, sg=GREGORIAN) # :nodoc:
- find_fdoy(y, sg) + d - 1
- end
+ # Convert an Ordinal Date to a Julian Day Number.
+ #
+ # +y+ and +d+ are the year and day-of-year to convert.
+ # +sg+ specifies the Day of Calendar Reform.
+ #
+ # Returns the corresponding Julian Day Number.
+ def self.ordinal_to_jd(y, d, sg=GREGORIAN)
+ civil_to_jd(y, 1, d, sg)
+ end
- # Convert a Julian Day Number to an Ordinal Date.
- #
- # +jd+ is the Julian Day Number to convert.
- # +sg+ specifies the Day of Calendar Reform.
- #
- # Returns the corresponding Ordinal Date as
- # [year, day_of_year]
- def jd_to_ordinal(jd, sg=GREGORIAN) # :nodoc:
- y = jd_to_civil(jd, sg)[0]
- j = find_fdoy(y, sg)
- doy = jd - j + 1
- return y, doy
- end
+ # Convert a Julian Day Number to an Ordinal Date.
+ #
+ # +jd+ is the Julian Day Number to convert.
+ # +sg+ specifies the Day of Calendar Reform.
+ #
+ # Returns the corresponding Ordinal Date as
+ # [year, day_of_year]
+ def self.jd_to_ordinal(jd, sg=GREGORIAN)
+ y = jd_to_civil(jd, sg)[0]
+ doy = jd - civil_to_jd(y - 1, 12, 31, fix_style(jd, sg))
+ return y, doy
+ end
- # Convert a Civil Date to a Julian Day Number.
- # +y+, +m+, and +d+ are the year, month, and day of the
- # month. +sg+ specifies the Day of Calendar Reform.
- #
- # Returns the corresponding Julian Day Number.
- def civil_to_jd(y, m, d, sg=GREGORIAN) # :nodoc:
- if m <= 2
- y -= 1
- m += 12
- end
- a = (y / 100.0).floor
- b = 2 - a + (a / 4.0).floor
- jd = (365.25 * (y + 4716)).floor +
- (30.6001 * (m + 1)).floor +
- d + b - 1524
- if jd < sg
- jd -= b
- end
- jd
+ # Convert a Civil Date to a Julian Day Number.
+ # +y+, +m+, and +d+ are the year, month, and day of the
+ # month. +sg+ specifies the Day of Calendar Reform.
+ #
+ # Returns the corresponding Julian Day Number.
+ def self.civil_to_jd(y, m, d, sg=GREGORIAN)
+ if m <= 2
+ y -= 1
+ m += 12
end
-
- # Convert a Julian Day Number to a Civil Date. +jd+ is
- # the Julian Day Number. +sg+ specifies the Day of
- # Calendar Reform.
- #
- # Returns the corresponding [year, month, day_of_month]
- # as a three-element array.
- def jd_to_civil(jd, sg=GREGORIAN) # :nodoc:
- if jd < sg
- a = jd
- else
- x = ((jd - 1867216.25) / 36524.25).floor
- a = jd + 1 + x - (x / 4.0).floor
- end
- b = a + 1524
- c = ((b - 122.1) / 365.25).floor
- d = (365.25 * c).floor
- e = ((b - d) / 30.6001).floor
- dom = b - d - (30.6001 * e).floor
- if e <= 13
- m = e - 1
- y = c - 4716
- else
- m = e - 13
- y = c - 4715
- end
- return y, m, dom
+ a = (y / 100.0).floor
+ b = 2 - a + (a / 4.0).floor
+ jd = (365.25 * (y + 4716)).floor +
+ (30.6001 * (m + 1)).floor +
+ d + b - 1524
+ if julian?(jd, sg)
+ jd -= b
end
+ jd
+ end
- # Convert a Commercial Date to a Julian Day Number.
- #
- # +y+, +w+, and +d+ are the (commercial) year, week of the year,
- # and day of the week of the Commercial Date to convert.
- # +sg+ specifies the Day of Calendar Reform.
- def commercial_to_jd(y, w, d, sg=GREGORIAN) # :nodoc:
- j = find_fdoy(y, sg) + 3
- (j - (((j - 1) + 1) % 7)) +
- 7 * (w - 1) +
- (d - 1)
+ # Convert a Julian Day Number to a Civil Date. +jd+ is
+ # the Julian Day Number. +sg+ specifies the Day of
+ # Calendar Reform.
+ #
+ # Returns the corresponding [year, month, day_of_month]
+ # as a three-element array.
+ def self.jd_to_civil(jd, sg=GREGORIAN)
+ if julian?(jd, sg)
+ a = jd
+ else
+ x = ((jd - 1867216.25) / 36524.25).floor
+ a = jd + 1 + x - (x / 4.0).floor
end
-
- # Convert a Julian Day Number to a Commercial Date
- #
- # +jd+ is the Julian Day Number to convert.
- # +sg+ specifies the Day of Calendar Reform.
- #
- # Returns the corresponding Commercial Date as
- # [commercial_year, week_of_year, day_of_week]
- def jd_to_commercial(jd, sg=GREGORIAN) # :nodoc:
- a = jd_to_civil(jd - 3, sg)[0]
- y = if jd >= commercial_to_jd(a + 1, 1, 1, sg) then a + 1 else a end
- w = 1 + ((jd - commercial_to_jd(y, 1, 1, sg)) / 7).floor
- d = (jd + 1) % 7
- d = 7 if d == 0
- return y, w, d
+ b = a + 1524
+ c = ((b - 122.1) / 365.25).floor
+ d = (365.25 * c).floor
+ e = ((b - d) / 30.6001).floor
+ dom = b - d - (30.6001 * e).floor
+ if e <= 13
+ m = e - 1
+ y = c - 4716
+ else
+ m = e - 13
+ y = c - 4715
end
+ return y, m, dom
+ end
- def weeknum_to_jd(y, w, d, f=0, sg=GREGORIAN) # :nodoc:
- a = find_fdoy(y, sg) + 6
- (a - ((a - f) + 1) % 7 - 7) + 7 * w + d
- end
+ # Convert a Commercial Date to a Julian Day Number.
+ #
+ # +y+, +w+, and +d+ are the (commercial) year, week of the year,
+ # and day of the week of the Commercial Date to convert.
+ # +sg+ specifies the Day of Calendar Reform.
+ def self.commercial_to_jd(y, w, d, ns=GREGORIAN)
+ jd = civil_to_jd(y, 1, 4, ns)
+ (jd - (((jd - 1) + 1) % 7)) +
+ 7 * (w - 1) +
+ (d - 1)
+ end
- def jd_to_weeknum(jd, f=0, sg=GREGORIAN) # :nodoc:
- y, m, d = jd_to_civil(jd, sg)
- a = find_fdoy(y, sg) + 6
- w, d = (jd - (a - ((a - f) + 1) % 7) + 7).divmod(7)
- return y, w, d
- end
+ # Convert a Julian Day Number to a Commercial Date
+ #
+ # +jd+ is the Julian Day Number to convert.
+ # +sg+ specifies the Day of Calendar Reform.
+ #
+ # Returns the corresponding Commercial Date as
+ # [commercial_year, week_of_year, day_of_week]
+ def self.jd_to_commercial(jd, sg=GREGORIAN)
+ ns = fix_style(jd, sg)
+ a = jd_to_civil(jd - 3, ns)[0]
+ y = if jd >= commercial_to_jd(a + 1, 1, 1, ns) then a + 1 else a end
+ w = 1 + ((jd - commercial_to_jd(y, 1, 1, ns)) / 7).floor
+ d = (jd + 1) % 7
+ d = 7 if d == 0
+ return y, w, d
+ end
- def nth_kday_to_jd(y, m, n, k, sg=GREGORIAN) # :nodoc:
- j = if n > 0
- find_fdom(y, m, sg) - 1
- else
- find_ldom(y, m, sg) + 7
- end
- (j - (((j - k) + 1) % 7)) + 7 * n
- end
+ def self.weeknum_to_jd(y, w, d, f=0, ns=GREGORIAN) # :nodoc:
+ a = civil_to_jd(y, 1, 1, ns) + 6
+ (a - ((a - f) + 1) % 7 - 7) + 7 * w + d
+ end
- def jd_to_nth_kday(jd, sg=GREGORIAN) # :nodoc:
- y, m, d = jd_to_civil(jd, sg)
- j = find_fdom(y, m, sg)
- return y, m, ((jd - j) / 7).floor + 1, jd_to_wday(jd)
- end
+ def self.jd_to_weeknum(jd, f=0, sg=GREGORIAN) # :nodoc:
+ ns = fix_style(jd, sg)
+ y, m, d = jd_to_civil(jd, ns)
+ a = civil_to_jd(y, 1, 1, ns) + 6
+ w, d = (jd - (a - ((a - f) + 1) % 7) + 7).divmod(7)
+ return y, w, d
+ end
- # Convert an Astronomical Julian Day Number to a (civil) Julian
- # Day Number.
- #
- # +ajd+ is the Astronomical Julian Day Number to convert.
- # +of+ is the offset from UTC as a fraction of a day (defaults to 0).
- #
- # Returns the (civil) Julian Day Number as [day_number,
- # fraction] where +fraction+ is always 1/2.
- def ajd_to_jd(ajd, of=0) (ajd + of + HALF_DAYS_IN_DAY).divmod(1) end # :nodoc:
-
- # Convert a (civil) Julian Day Number to an Astronomical Julian
- # Day Number.
- #
- # +jd+ is the Julian Day Number to convert, and +fr+ is a
- # fractional day.
- # +of+ is the offset from UTC as a fraction of a day (defaults to 0).
- #
- # Returns the Astronomical Julian Day Number as a single
- # numeric value.
- def jd_to_ajd(jd, fr, of=0) jd + fr - of - HALF_DAYS_IN_DAY end # :nodoc:
-
- # Convert a fractional day +fr+ to [hours, minutes, seconds,
- # fraction_of_a_second]
- def day_fraction_to_time(fr) # :nodoc:
- ss, fr = fr.divmod(SECONDS_IN_DAY) # 4p
- h, ss = ss.divmod(3600)
- min, s = ss.divmod(60)
- return h, min, s, fr * 86400
- end
+ private_class_method :weeknum_to_jd, :jd_to_weeknum
- # Convert an +h+ hour, +min+ minutes, +s+ seconds period
- # to a fractional day.
- begin
- Rational(Rational(1, 2), 2) # a challenge
+ # Convert an Astronomical Julian Day Number to a (civil) Julian
+ # Day Number.
+ #
+ # +ajd+ is the Astronomical Julian Day Number to convert.
+ # +of+ is the offset from UTC as a fraction of a day (defaults to 0).
+ #
+ # Returns the (civil) Julian Day Number as [day_number,
+ # fraction] where +fraction+ is always 1/2.
+ def self.ajd_to_jd(ajd, of=0) (ajd + of + HALF_DAYS_IN_DAY).divmod(1) end
- def time_to_day_fraction(h, min, s)
- Rational(h * 3600 + min * 60 + s, 86400) # 4p
- end
- rescue
- def time_to_day_fraction(h, min, s)
+ # Convert a (civil) Julian Day Number to an Astronomical Julian
+ # Day Number.
+ #
+ # +jd+ is the Julian Day Number to convert, and +fr+ is a
+ # fractional day.
+ # +of+ is the offset from UTC as a fraction of a day (defaults to 0).
+ #
+ # Returns the Astronomical Julian Day Number as a single
+ # numeric value.
+ def self.jd_to_ajd(jd, fr, of=0) jd + fr - of - HALF_DAYS_IN_DAY end
+
+ # Convert a fractional day +fr+ to [hours, minutes, seconds,
+ # fraction_of_a_second]
+ def self.day_fraction_to_time(fr)
+ ss, fr = fr.divmod(SECONDS_IN_DAY) # 4p
+ h, ss = ss.divmod(3600)
+ min, s = ss.divmod(60)
+ return h, min, s, fr
+ end
+
+ # Convert an +h+ hour, +min+ minutes, +s+ seconds period
+ # to a fractional day.
+ begin
+ Rational(Rational(1, 2), 2) # a challenge
+
+ def self.time_to_day_fraction(h, min, s)
+ Rational(h * 3600 + min * 60 + s, 86400) # 4p
+ end
+ rescue
+ def self.time_to_day_fraction(h, min, s)
if Integer === h && Integer === min && Integer === s
Rational(h * 3600 + min * 60 + s, 86400) # 4p
else
(h * 3600 + min * 60 + s).to_r/86400 # 4p
end
- end
end
+ end
- # Convert an Astronomical Modified Julian Day Number to an
- # Astronomical Julian Day Number.
- def amjd_to_ajd(amjd) amjd + MJD_EPOCH_IN_AJD end # :nodoc:
-
- # Convert an Astronomical Julian Day Number to an
- # Astronomical Modified Julian Day Number.
- def ajd_to_amjd(ajd) ajd - MJD_EPOCH_IN_AJD end # :nodoc:
-
- # Convert a Modified Julian Day Number to a Julian
- # Day Number.
- def mjd_to_jd(mjd) mjd + MJD_EPOCH_IN_CJD end # :nodoc:
-
- # Convert a Julian Day Number to a Modified Julian Day
- # Number.
- def jd_to_mjd(jd) jd - MJD_EPOCH_IN_CJD end # :nodoc:
-
- # Convert a count of the number of days since the adoption
- # of the Gregorian Calendar (in Italy) to a Julian Day Number.
- def ld_to_jd(ld) ld + LD_EPOCH_IN_CJD end # :nodoc:
-
- # Convert a Julian Day Number to the number of days since
- # the adoption of the Gregorian Calendar (in Italy).
- def jd_to_ld(jd) jd - LD_EPOCH_IN_CJD end # :nodoc:
-
- # Convert a Julian Day Number to the day of the week.
- #
- # Sunday is day-of-week 0; Saturday is day-of-week 6.
- def jd_to_wday(jd) (jd + 1) % 7 end # :nodoc:
-
- # Is +jd+ a valid Julian Day Number?
- #
- # If it is, returns it. In fact, any value is treated as a valid
- # Julian Day Number.
- def _valid_jd? (jd, sg=GREGORIAN) jd end # :nodoc:
-
- # Do the year +y+ and day-of-year +d+ make a valid Ordinal Date?
- # Returns the corresponding Julian Day Number if they do, or
- # nil if they don't.
- #
- # +d+ can be a negative number, in which case it counts backwards
- # from the end of the year (-1 being the last day of the year).
- # No year wraparound is performed, however, so valid values of
- # +d+ are -365 .. -1, 1 .. 365 on a non-leap-year,
- # -366 .. -1, 1 .. 366 on a leap year.
- # A date falling in the period skipped in the Day of Calendar Reform
- # adjustment is not valid.
- #
- # +sg+ specifies the Day of Calendar Reform.
- def _valid_ordinal? (y, d, sg=GREGORIAN) # :nodoc:
- if d < 0
- j = find_ldoy(y, sg)
- ny, nd = jd_to_ordinal(j + d + 1, sg)
- return unless ny == y
- d = nd
- end
- jd = ordinal_to_jd(y, d, sg)
- return unless [y, d] == jd_to_ordinal(jd, sg)
- jd
- end
+ # Convert an Astronomical Modified Julian Day Number to an
+ # Astronomical Julian Day Number.
+ def self.amjd_to_ajd(amjd) amjd + MJD_EPOCH_IN_AJD end
- # Do year +y+, month +m+, and day-of-month +d+ make a
- # valid Civil Date? Returns the corresponding Julian
- # Day Number if they do, nil if they don't.
- #
- # +m+ and +d+ can be negative, in which case they count
- # backwards from the end of the year and the end of the
- # month respectively. No wraparound is performed, however,
- # and invalid values cause an ArgumentError to be raised.
- # A date falling in the period skipped in the Day of Calendar
- # Reform adjustment is not valid.
- #
- # +sg+ specifies the Day of Calendar Reform.
- def _valid_civil? (y, m, d, sg=GREGORIAN) # :nodoc:
- if m < 0
- m += 13
- end
- if d < 0
- j = find_ldom(y, m, sg)
- ny, nm, nd = jd_to_civil(j + d + 1, sg)
- return unless [ny, nm] == [y, m]
- d = nd
- end
- jd = civil_to_jd(y, m, d, sg)
- return unless [y, m, d] == jd_to_civil(jd, sg)
- jd
- end
+ # Convert an Astronomical Julian Day Number to an
+ # Astronomical Modified Julian Day Number.
+ def self.ajd_to_amjd(ajd) ajd - MJD_EPOCH_IN_AJD end
- # Do year +y+, week-of-year +w+, and day-of-week +d+ make a
- # valid Commercial Date? Returns the corresponding Julian
- # Day Number if they do, nil if they don't.
- #
- # Monday is day-of-week 1; Sunday is day-of-week 7.
- #
- # +w+ and +d+ can be negative, in which case they count
- # backwards from the end of the year and the end of the
- # week respectively. No wraparound is performed, however,
- # and invalid values cause an ArgumentError to be raised.
- # A date falling in the period skipped in the Day of Calendar
- # Reform adjustment is not valid.
- #
- # +sg+ specifies the Day of Calendar Reform.
- def _valid_commercial? (y, w, d, sg=GREGORIAN) # :nodoc:
- if d < 0
- d += 8
- end
- if w < 0
- ny, nw, nd =
- jd_to_commercial(commercial_to_jd(y + 1, 1, 1, sg) + w * 7, sg)
- return unless ny == y
- w = nw
- end
- jd = commercial_to_jd(y, w, d, sg)
- return unless [y, w, d] == jd_to_commercial(jd, sg)
- jd
- end
+ # Convert a Modified Julian Day Number to a Julian
+ # Day Number.
+ def self.mjd_to_jd(mjd) mjd + MJD_EPOCH_IN_CJD end
- def _valid_weeknum? (y, w, d, f, sg=GREGORIAN) # :nodoc:
- if d < 0
- d += 7
- end
- if w < 0
- ny, nw, nd, nf =
- jd_to_weeknum(weeknum_to_jd(y + 1, 1, f, f, sg) + w * 7, f, sg)
- return unless ny == y
- w = nw
- end
- jd = weeknum_to_jd(y, w, d, f, sg)
- return unless [y, w, d] == jd_to_weeknum(jd, f, sg)
- jd
- end
+ # Convert a Julian Day Number to a Modified Julian Day
+ # Number.
+ def self.jd_to_mjd(jd) jd - MJD_EPOCH_IN_CJD end
- def _valid_nth_kday? (y, m, n, k, sg=GREGORIAN) # :nodoc:
- if k < 0
- k += 7
- end
- if n < 0
- ny, nm = (y * 12 + m).divmod(12)
- nm, = (nm + 1) .divmod(1)
- ny, nm, nn, nk =
- jd_to_nth_kday(nth_kday_to_jd(ny, nm, 1, k, sg) + n * 7, sg)
- return unless [ny, nm] == [y, m]
- n = nn
- end
- jd = nth_kday_to_jd(y, m, n, k, sg)
- return unless [y, m, n, k] == jd_to_nth_kday(jd, sg)
- jd
- end
+ # Convert a count of the number of days since the adoption
+ # of the Gregorian Calendar (in Italy) to a Julian Day Number.
+ def self.ld_to_jd(ld) ld + LD_EPOCH_IN_CJD end
- # Do hour +h+, minute +min+, and second +s+ constitute a valid time?
- #
- # If they do, returns their value as a fraction of a day. If not,
- # returns nil.
- #
- # The 24-hour clock is used. Negative values of +h+, +min+, and
- # +sec+ are treating as counting backwards from the end of the
- # next larger unit (e.g. a +min+ of -2 is treated as 58). No
- # wraparound is performed.
- def _valid_time? (h, min, s) # :nodoc:
- h += 24 if h < 0
- min += 60 if min < 0
- s += 60 if s < 0
- return unless ((0...24) === h &&
- (0...60) === min &&
- (0...60) === s) ||
- (24 == h &&
- 0 == min &&
- 0 == s)
- time_to_day_fraction(h, min, s)
- end
+ # Convert a Julian Day Number to the number of days since
+ # the adoption of the Gregorian Calendar (in Italy).
+ def self.jd_to_ld(jd) jd - LD_EPOCH_IN_CJD end
- end
-
- extend t
- include t
+ # Convert a Julian Day Number to the day of the week.
+ #
+ # Sunday is day-of-week 0; Saturday is day-of-week 6.
+ def self.jd_to_wday(jd) (jd + 1) % 7 end
# Is a year a leap year in the Julian calendar?
#
@@ -729,49 +572,148 @@ class Date
class << self; alias_method :leap?, :gregorian_leap? end
class << self; alias_method :new!, :new end
- def self.valid_jd? (jd, sg=ITALY)
- !!_valid_jd?(jd, sg)
- end
+ # Is +jd+ a valid Julian Day Number?
+ #
+ # If it is, returns it. In fact, any value is treated as a valid
+ # Julian Day Number.
+ def self.valid_jd? (jd, sg=ITALY) jd end
+ # Do the year +y+ and day-of-year +d+ make a valid Ordinal Date?
+ # Returns the corresponding Julian Day Number if they do, or
+ # nil if they don't.
+ #
+ # +d+ can be a negative number, in which case it counts backwards
+ # from the end of the year (-1 being the last day of the year).
+ # No year wraparound is performed, however, so valid values of
+ # +d+ are -365 .. -1, 1 .. 365 on a non-leap-year,
+ # -366 .. -1, 1 .. 366 on a leap year.
+ # A date falling in the period skipped in the Day of Calendar Reform
+ # adjustment is not valid.
+ #
+ # +sg+ specifies the Day of Calendar Reform.
def self.valid_ordinal? (y, d, sg=ITALY)
- !!_valid_ordinal?(y, d, sg)
+ if d < 0
+ ny, = (y + 1).divmod(1)
+ jd = ordinal_to_jd(ny, d + 1, sg)
+ ns = fix_style(jd, sg)
+ return unless [y] == jd_to_ordinal(jd, sg)[0..0]
+ return unless [ny, 1] == jd_to_ordinal(jd - d, ns)
+ else
+ jd = ordinal_to_jd(y, d, sg)
+ return unless [y, d] == jd_to_ordinal(jd, sg)
+ end
+ jd
end
+ # Do year +y+, month +m+, and day-of-month +d+ make a
+ # valid Civil Date? Returns the corresponding Julian
+ # Day Number if they do, nil if they don't.
+ #
+ # +m+ and +d+ can be negative, in which case they count
+ # backwards from the end of the year and the end of the
+ # month respectively. No wraparound is performed, however,
+ # and invalid values cause an ArgumentError to be raised.
+ # A date falling in the period skipped in the Day of Calendar
+ # Reform adjustment is not valid.
+ #
+ # +sg+ specifies the Day of Calendar Reform.
def self.valid_civil? (y, m, d, sg=ITALY)
- !!_valid_civil?(y, m, d, sg)
+ if m < 0
+ m += 13
+ end
+ if d < 0
+ ny, nm = (y * 12 + m).divmod(12)
+ nm, = (nm + 1).divmod(1)
+ jd = civil_to_jd(ny, nm, d + 1, sg)
+ ns = fix_style(jd, sg)
+ return unless [y, m] == jd_to_civil(jd, sg)[0..1]
+ return unless [ny, nm, 1] == jd_to_civil(jd - d, ns)
+ else
+ jd = civil_to_jd(y, m, d, sg)
+ return unless [y, m, d] == jd_to_civil(jd, sg)
+ end
+ jd
end
class << self; alias_method :valid_date?, :valid_civil? end
+ # Do year +y+, week-of-year +w+, and day-of-week +d+ make a
+ # valid Commercial Date? Returns the corresponding Julian
+ # Day Number if they do, nil if they don't.
+ #
+ # Monday is day-of-week 1; Sunday is day-of-week 7.
+ #
+ # +w+ and +d+ can be negative, in which case they count
+ # backwards from the end of the year and the end of the
+ # week respectively. No wraparound is performed, however,
+ # and invalid values cause an ArgumentError to be raised.
+ # A date falling in the period skipped in the Day of Calendar
+ # Reform adjustment is not valid.
+ #
+ # +sg+ specifies the Day of Calendar Reform.
def self.valid_commercial? (y, w, d, sg=ITALY)
- !!_valid_commercial?(y, w, d, sg)
+ if d < 0
+ d += 8
+ end
+ if w < 0
+ ny, nw, nd =
+ jd_to_commercial(commercial_to_jd(y + 1, 1, 1) + w * 7)
+ return unless ny == y
+ w = nw
+ end
+ jd = commercial_to_jd(y, w, d)
+ return unless gregorian?(jd, sg)
+ return unless [y, w, d] == jd_to_commercial(jd)
+ jd
end
def self.valid_weeknum? (y, w, d, f, sg=ITALY) # :nodoc:
- !!_valid_weeknum?(y, w, d, f, sg)
+ if d < 0
+ d += 7
+ end
+ if w < 0
+ ny, nw, nd, nf =
+ jd_to_weeknum(weeknum_to_jd(y + 1, 1, f, f) + w * 7, f)
+ return unless ny == y
+ w = nw
+ end
+ jd = weeknum_to_jd(y, w, d, f)
+ return unless gregorian?(jd, sg)
+ return unless [y, w, d] == jd_to_weeknum(jd, f)
+ jd
end
private_class_method :valid_weeknum?
- def self.valid_nth_kday? (y, m, n, k, sg=ITALY) # :nodoc:
- !!_valid_nth_kday?(y, m, n, k, sg)
- end
-
- private_class_method :valid_nth_kday?
-
- def self.valid_time? (h, min, s) # :nodoc:
- !!_valid_time?(h, min, s)
+ # Do hour +h+, minute +min+, and second +s+ constitute a valid time?
+ #
+ # If they do, returns their value as a fraction of a day. If not,
+ # returns nil.
+ #
+ # The 24-hour clock is used. Negative values of +h+, +min+, and
+ # +sec+ are treating as counting backwards from the end of the
+ # next larger unit (e.g. a +min+ of -2 is treated as 58). No
+ # wraparound is performed.
+ def self.valid_time? (h, min, s)
+ h += 24 if h < 0
+ min += 60 if min < 0
+ s += 60 if s < 0
+ return unless ((0...24) === h &&
+ (0...60) === min &&
+ (0...60) === s) ||
+ (24 == h &&
+ 0 == min &&
+ 0 == s)
+ time_to_day_fraction(h, min, s)
end
- private_class_method :valid_time?
-
# Create a new Date object from a Julian Day Number.
#
# +jd+ is the Julian Day Number; if not specified, it defaults to
# 0.
# +sg+ specifies the Day of Calendar Reform.
def self.jd(jd=0, sg=ITALY)
- jd = _valid_jd?(jd, sg)
+ jd = valid_jd?(jd, sg)
new!(jd_to_ajd(jd, 0, 0), 0, sg)
end
@@ -786,7 +728,7 @@ class Date
#
# +sg+ specifies the Day of Calendar Reform.
def self.ordinal(y=-4712, d=1, sg=ITALY)
- unless jd = _valid_ordinal?(y, d, sg)
+ unless jd = valid_ordinal?(y, d, sg)
raise ArgumentError, 'invalid date'
end
new!(jd_to_ajd(jd, 0, 0), 0, sg)
@@ -806,7 +748,7 @@ class Date
#
# +sg+ specifies the Day of Calendar Reform.
def self.civil(y=-4712, m=1, d=1, sg=ITALY)
- unless jd = _valid_civil?(y, m, d, sg)
+ unless jd = valid_civil?(y, m, d, sg)
raise ArgumentError, 'invalid date'
end
new!(jd_to_ajd(jd, 0, 0), 0, sg)
@@ -824,19 +766,19 @@ class Date
# week respectively. No wraparound is performed, however,
# and invalid values cause an ArgumentError to be raised.
#
- # +y+ defaults to -4712, +w+ to 1, and +d+ to 1; this is
- # Julian Day Number day 0.
+ # +y+ defaults to 1582, +w+ to 41, and +d+ to 5, the Day of
+ # Calendar Reform for Italy and the Catholic countries.
#
# +sg+ specifies the Day of Calendar Reform.
- def self.commercial(y=-4712, w=1, d=1, sg=ITALY)
- unless jd = _valid_commercial?(y, w, d, sg)
+ def self.commercial(y=1582, w=41, d=5, sg=ITALY)
+ unless jd = valid_commercial?(y, w, d, sg)
raise ArgumentError, 'invalid date'
end
new!(jd_to_ajd(jd, 0, 0), 0, sg)
end
- def self.weeknum(y=-4712, w=0, d=1, f=0, sg=ITALY)
- unless jd = _valid_weeknum?(y, w, d, f, sg)
+ def self.weeknum(y=1582, w=41, d=5, f=0, sg=ITALY) # :nodoc:
+ unless jd = valid_weeknum?(y, w, d, f, sg)
raise ArgumentError, 'invalid date'
end
new!(jd_to_ajd(jd, 0, 0), 0, sg)
@@ -844,15 +786,6 @@ class Date
private_class_method :weeknum
- def self.nth_kday(y=-4712, m=1, n=1, k=1, sg=ITALY)
- unless jd = _valid_nth_kday?(y, m, n, k, sg)
- raise ArgumentError, 'invalid date'
- end
- new!(jd_to_ajd(jd, 0, 0), 0, sg)
- end
-
- private_class_method :nth_kday
-
def self.rewrite_frags(elem) # :nodoc:
elem ||= {}
if seconds = elem[:seconds]
@@ -928,7 +861,7 @@ class Date
elem[e] = d.__send__(e)
end
elem[:wnum1] ||= 0
- elem[:wday] ||= 1
+ elem[:wday] ||= 0
end
end
@@ -953,21 +886,21 @@ class Date
catch :jd do
a = elem.values_at(:jd)
if a.all?
- if jd = _valid_jd?(*(a << sg))
+ if jd = valid_jd?(*(a << sg))
throw :jd, jd
end
end
a = elem.values_at(:year, :yday)
if a.all?
- if jd = _valid_ordinal?(*(a << sg))
+ if jd = valid_ordinal?(*(a << sg))
throw :jd, jd
end
end
a = elem.values_at(:year, :mon, :mday)
if a.all?
- if jd = _valid_civil?(*(a << sg))
+ if jd = valid_civil?(*(a << sg))
throw :jd, jd
end
end
@@ -977,7 +910,7 @@ class Date
a[2] = elem[:wday].nonzero? || 7
end
if a.all?
- if jd = _valid_commercial?(*(a << sg))
+ if jd = valid_commercial?(*(a << sg))
throw :jd, jd
end
end
@@ -987,7 +920,7 @@ class Date
a[2] = elem[:cwday] % 7
end
if a.all?
- if jd = _valid_weeknum?(*(a << 0 << sg))
+ if jd = valid_weeknum?(*(a << 0 << sg))
throw :jd, jd
end
end
@@ -1000,7 +933,7 @@ class Date
a[2] = (elem[:cwday] - 1) % 7
end
if a.all?
- if jd = _valid_weeknum?(*(a << 1 << sg))
+ if jd = valid_weeknum?(*(a << 1 << sg))
throw :jd, jd
end
end
@@ -1011,7 +944,7 @@ class Date
def self.valid_time_frags? (elem) # :nodoc:
h, min, s = elem.values_at(:hour, :min, :sec)
- _valid_time?(h, min, s)
+ valid_time?(h, min, s)
end
private_class_method :valid_time_frags?
@@ -1062,52 +995,20 @@ class Date
# Day Number day 0.
#
# +sg+ specifies the Day of Calendar Reform.
- def self.parse(str='-4712-01-01', comp=true, sg=ITALY)
+ def self.parse(str='-4712-01-01', comp=false, sg=ITALY)
elem = _parse(str, comp)
new_by_frags(elem, sg)
end
- def self.iso8601(str='-4712-01-01', sg=ITALY) # :nodoc:
- elem = _iso8601(str)
- new_by_frags(elem, sg)
- end
-
- def self.rfc3339(str='-4712-01-01T00:00:00+00:00', sg=ITALY) # :nodoc:
- elem = _rfc3339(str)
- new_by_frags(elem, sg)
- end
-
- def self.xmlschema(str='-4712-01-01', sg=ITALY) # :nodoc:
- elem = _xmlschema(str)
- new_by_frags(elem, sg)
- end
-
- def self.rfc2822(str='Mon, 1 Jan -4712 00:00:00 +0000', sg=ITALY) # :nodoc:
- elem = _rfc2822(str)
- new_by_frags(elem, sg)
- end
-
- class << self; alias_method :rfc822, :rfc2822 end
-
- def self.httpdate(str='Mon, 01 Jan -4712 00:00:00 GMT', sg=ITALY) # :nodoc:
- elem = _httpdate(str)
- new_by_frags(elem, sg)
- end
-
- def self.jisx0301(str='-4712-01-01', sg=ITALY) # :nodoc:
- elem = _jisx0301(str)
- new_by_frags(elem, sg)
- end
-
class << self
- def once(*ids) # :nodoc: -- restricted
+ def once(*ids) # :nodoc:
for id in ids
module_eval <<-"end;"
- alias_method :__#{id.object_id}__, :#{id.to_s}
- private :__#{id.object_id}__
- def #{id.to_s}(*args)
- @__ca__[#{id.object_id}] ||= __#{id.object_id}__(*args)
+ alias_method :__#{id.to_i}__, :#{id.to_s}
+ private :__#{id.to_i}__
+ def #{id.to_s}(*args, &block)
+ (@__#{id.to_i}__ ||= [__#{id.to_i}__(*args, &block)])[0]
end
end;
end
@@ -1136,45 +1037,42 @@ class Date
#
# Using one of the factory methods such as Date::civil is
# generally easier and safer.
- def initialize(ajd=0, of=0, sg=ITALY)
- @ajd, @of, @sg = ajd, of, sg
- @__ca__ = {}
- end
+ def initialize(ajd=0, of=0, sg=ITALY) @ajd, @of, @sg = ajd, of, sg end
# Get the date as an Astronomical Julian Day Number.
def ajd() @ajd end
# Get the date as an Astronomical Modified Julian Day Number.
- def amjd() ajd_to_amjd(@ajd) end
+ def amjd() self.class.ajd_to_amjd(@ajd) end
once :amjd
# Get the date as a Julian Day Number.
- def jd() ajd_to_jd(@ajd, @of)[0] end
+ def jd() self.class.ajd_to_jd(@ajd, @of)[0] end
# Get any fractional day part of the date.
- def day_fraction() ajd_to_jd(@ajd, @of)[1] end
+ def day_fraction() self.class.ajd_to_jd(@ajd, @of)[1] end
# Get the date as a Modified Julian Day Number.
- def mjd() jd_to_mjd(jd) end
+ def mjd() self.class.jd_to_mjd(jd) end
# Get the date as the number of days since the Day of Calendar
# Reform (in Italy and the Catholic countries).
- def ld() jd_to_ld(jd) end
+ def ld() self.class.jd_to_ld(jd) end
once :jd, :day_fraction, :mjd, :ld
# Get the date as a Civil Date, [year, month, day_of_month]
- def civil() jd_to_civil(jd, @sg) end # :nodoc:
+ def civil() self.class.jd_to_civil(jd, @sg) end # :nodoc:
# Get the date as an Ordinal Date, [year, day_of_year]
- def ordinal() jd_to_ordinal(jd, @sg) end # :nodoc:
+ def ordinal() self.class.jd_to_ordinal(jd, @sg) end # :nodoc:
# Get the date as a Commercial Date, [year, week_of_year, day_of_week]
- def commercial() jd_to_commercial(jd, @sg) end # :nodoc:
+ def commercial() self.class.jd_to_commercial(jd, @sg) end # :nodoc:
- def weeknum0() jd_to_weeknum(jd, 0, @sg) end # :nodoc:
- def weeknum1() jd_to_weeknum(jd, 1, @sg) end # :nodoc:
+ def weeknum0() self.class.__send__(:jd_to_weeknum, jd, 0, @sg) end # :nodoc:
+ def weeknum1() self.class.__send__(:jd_to_weeknum, jd, 1, @sg) end # :nodoc:
once :civil, :ordinal, :commercial, :weeknum0, :weeknum1
private :civil, :ordinal, :commercial, :weeknum0, :weeknum1
@@ -1205,7 +1103,7 @@ class Date
# Get the time of this date as [hours, minutes, seconds,
# fraction_of_a_second]
- def time() day_fraction_to_time(day_fraction) end # :nodoc:
+ def time() self.class.day_fraction_to_time(day_fraction) end # :nodoc:
once :time
private :time
@@ -1219,15 +1117,18 @@ class Date
# Get the second of this date.
def sec() time[2] end
- # Get the fraction-of-a-second of this date.
+ # Get the fraction-of-a-second of this date. The unit is in days.
+ # I do NOT recommend you to use this method.
def sec_fraction() time[3] end
+=begin
alias_method :minute, :min
alias_method :second, :sec
alias_method :second_fraction, :sec_fraction
+=end
- private :hour, :min, :sec, :sec_fraction,
- :minute, :second, :second_fraction
+ private :hour, :min, :sec, :sec_fraction
+# :minute, :second, :second_fraction
def zone() strftime('%:z') end
@@ -1246,7 +1147,7 @@ class Date
# Get the week day of this date. Sunday is day-of-week 0;
# Saturday is day-of-week 6.
- def wday() jd_to_wday(jd) end
+ def wday() self.class.jd_to_wday(jd) end
once :wday
@@ -1256,23 +1157,17 @@ class Date
define_method(n.downcase + '?'){mon == i}
end
end
-=end
DAYNAMES.each_with_index do |n, i|
define_method(n.downcase + '?'){wday == i}
end
-
- def nth_kday? (n, k)
- k == wday && jd === nth_kday_to_jd(year, mon, n, k, start)
- end
-
- private :nth_kday?
+=end
# Is the current date old-style (Julian Calendar)?
- def julian? () jd < @sg end
+ def julian? () self.class.julian?(jd, @sg) end
# Is the current date new-style (Gregorian Calendar)?
- def gregorian? () !julian? end
+ def gregorian? () self.class.gregorian?(jd, @sg) end
once :julian?, :gregorian?
@@ -1286,8 +1181,8 @@ class Date
# Is this a leap year?
def leap?
- jd_to_civil(civil_to_jd(year, 3, 1, fix_style) - 1,
- fix_style)[-1] == 29
+ self.class.jd_to_civil(self.class.civil_to_jd(year, 3, 1, fix_style) - 1,
+ fix_style)[-1] == 29
end
once :leap?
@@ -1337,9 +1232,6 @@ class Date
def + (n)
case n
when Numeric; return self.class.new!(@ajd + n, @of, @sg)
- when Delta
- d = n.__send__(:delta)
- return (self >> d.imag) + d.real
end
raise TypeError, 'expected numeric'
end
@@ -1356,11 +1248,8 @@ class Date
case x
when Numeric; return self.class.new!(@ajd - x, @of, @sg)
when Date; return @ajd - x.ajd
- when Delta
- d = x.__send__(:delta)
- return (self << d.imag) - d.real
end
- raise TypeError, 'expected numeric'
+ raise TypeError, 'expected numeric or date'
end
# Compare this date with another date.
@@ -1378,12 +1267,6 @@ class Date
case other
when Numeric; return @ajd <=> other
when Date; return @ajd <=> other.ajd
- else
- begin
- l, r = other.coerce(self)
- return l <=> r
- rescue NoMethodError
- end
end
nil
end
@@ -1398,15 +1281,14 @@ class Date
case other
when Numeric; return jd == other
when Date; return jd == other.jd
- else
- l, r = other.coerce(self)
- return l === r
end
false
end
def next_day(n=1) self + n end
- def prev_day(n=1) self - n end
+# def prev_day(n=1) self - n end
+
+ private :next_day
# Return a new Date one day after this one.
def next() next_day end
@@ -1423,7 +1305,7 @@ class Date
y, m = (year * 12 + (mon - 1) + n).divmod(12)
m, = (m + 1) .divmod(1)
d = mday
- d -= 1 until jd2 = _valid_civil?(y, m, d, @sg)
+ d -= 1 until jd2 = self.class.valid_civil?(y, m, d, fix_style)
self + (jd2 - jd)
end
@@ -1435,13 +1317,15 @@ class Date
# of the returned Date will be the last day of the target month.
def << (n) self >> -n end
+=begin
def next_month(n=1) self >> n end
def prev_month(n=1) self << n end
def next_year(n=1) self >> n * 12 end
def prev_year(n=1) self << n * 12 end
+=end
- require 'enumerator'
+# require 'enumerator'
# Step the current date forward +step+ days at a
# time (or backward, if +step+ is negative) until
@@ -1453,9 +1337,11 @@ class Date
raise ArgumentError, "step can't be 0"
end
=end
+=begin
unless block_given?
return to_enum(:step, limit, step)
end
+=end
da = self
op = %w(- <= >=)[step <=> 0]
while da.__send__(op, limit)
@@ -1486,9 +1372,7 @@ class Date
def hash() @ajd.hash end
# Return internal object state as a programmer-readable string.
- def inspect
- format('#<%s: %s (%s,%s,%s)>', self.class, to_s, @ajd, @of, @sg)
- end
+ def inspect() format('#<%s: %s,%s,%s>', self.class, @ajd, @of, @sg) end
# Return the date as a human-readable string.
#
@@ -1496,12 +1380,21 @@ class Date
def to_s() format('%.4d-%02d-%02d', year, mon, mday) end # 4p
# Dump to Marshal format.
- def marshal_dump() [@ajd, @of, @sg] end
+ def _dump(limit) Marshal.dump([@ajd, @of, @sg], -1) end
+
+# def self._load(str) new!(*Marshal.load(str)) end
# Load from Marshal format.
- def marshal_load(a)
- @ajd, @of, @sg, = a
- @__ca__ = {}
+ def self._load(str)
+ a = Marshal.load(str)
+ if a.size == 2
+ ajd, sg = a
+ of = 0
+ ajd -= 1.to_r/2
+ else
+ ajd, of, sg = a
+ end
+ new!(ajd, of, sg)
end
end
@@ -1536,7 +1429,8 @@ end
# === sec_fraction()
#
# Get the fraction of a second of the time. This is returned as
-# a +Rational+.
+# a +Rational+. The unit is in days.
+# I do NOT recommend you to use this method.
#
# === zone()
#
@@ -1570,8 +1464,8 @@ class DateTime < Date
#
# All day/time values default to 0.
def self.jd(jd=0, h=0, min=0, s=0, of=0, sg=ITALY)
- unless (jd = _valid_jd?(jd, sg)) &&
- (fr = _valid_time?(h, min, s))
+ unless (jd = valid_jd?(jd, sg)) &&
+ (fr = valid_time?(h, min, s))
raise ArgumentError, 'invalid date'
end
if String === of
@@ -1595,8 +1489,8 @@ class DateTime < Date
# +y+ defaults to -4712, and +d+ to 1; this is Julian Day Number
# day 0. The time values default to 0.
def self.ordinal(y=-4712, d=1, h=0, min=0, s=0, of=0, sg=ITALY)
- unless (jd = _valid_ordinal?(y, d, sg)) &&
- (fr = _valid_time?(h, min, s))
+ unless (jd = valid_ordinal?(y, d, sg)) &&
+ (fr = valid_time?(h, min, s))
raise ArgumentError, 'invalid date'
end
if String === of
@@ -1620,8 +1514,8 @@ class DateTime < Date
# +y+ defaults to -4712, +m+ to 1, and +d+ to 1; this is Julian Day
# Number day 0. The time values default to 0.
def self.civil(y=-4712, m=1, d=1, h=0, min=0, s=0, of=0, sg=ITALY)
- unless (jd = _valid_civil?(y, m, d, sg)) &&
- (fr = _valid_time?(h, min, s))
+ unless (jd = valid_civil?(y, m, d, sg)) &&
+ (fr = valid_time?(h, min, s))
raise ArgumentError, 'invalid date'
end
if String === of
@@ -1644,12 +1538,12 @@ class DateTime < Date
# +of+ is the offset from UTC as a fraction of a day (defaults to 0).
# +sg+ specifies the Day of Calendar Reform.
#
- # +y+ defaults to -4712, +w+ to 1, and +d+ to 1; this is
- # Julian Day Number day 0.
+ # +y+ defaults to 1582, +w+ to 41, and +d+ to 5; this is the Day of
+ # Calendar Reform for Italy and the Catholic countries.
# The time values default to 0.
- def self.commercial(y=-4712, w=1, d=1, h=0, min=0, s=0, of=0, sg=ITALY)
- unless (jd = _valid_commercial?(y, w, d, sg)) &&
- (fr = _valid_time?(h, min, s))
+ def self.commercial(y=1582, w=41, d=5, h=0, min=0, s=0, of=0, sg=ITALY)
+ unless (jd = valid_commercial?(y, w, d, sg)) &&
+ (fr = valid_time?(h, min, s))
raise ArgumentError, 'invalid date'
end
if String === of
@@ -1658,9 +1552,9 @@ class DateTime < Date
new!(jd_to_ajd(jd, fr, of), of, sg)
end
- def self.weeknum(y=-4712, w=0, d=1, f=0, h=0, min=0, s=0, of=0, sg=ITALY) # :nodoc:
- unless (jd = _valid_weeknum?(y, w, d, f, sg)) &&
- (fr = _valid_time?(h, min, s))
+ def self.weeknum(y=1582, w=41, d=5, f=0, h=0, min=0, s=0, of=0, sg=ITALY) # :nodoc:
+ unless (jd = valid_weeknum?(y, w, d, f, sg)) &&
+ (fr = valid_time?(h, min, s))
raise ArgumentError, 'invalid date'
end
if String === of
@@ -1671,19 +1565,6 @@ class DateTime < Date
private_class_method :weeknum
- def self.nth_kday(y=-4712, m=1, n=1, k=1, h=0, min=0, s=0, of=0, sg=ITALY) # :nodoc:
- unless (jd = _valid_nth_kday?(y, m, n, k, sg)) &&
- (fr = _valid_time?(h, min, s))
- raise ArgumentError, 'invalid date'
- end
- if String === of
- of = Rational(zone_to_diff(of) || 0, 86400)
- end
- new!(jd_to_ajd(jd, fr, of), of, sg)
- end
-
- private_class_method :nth_kday
-
def self.new_by_frags(elem, sg) # :nodoc:
elem = rewrite_frags(elem)
elem = complete_frags(elem)
@@ -1732,45 +1613,13 @@ class DateTime < Date
# Day Number day 0.
#
# +sg+ specifies the Day of Calendar Reform.
- def self.parse(str='-4712-01-01T00:00:00+00:00', comp=true, sg=ITALY)
+ def self.parse(str='-4712-01-01T00:00:00+00:00', comp=false, sg=ITALY)
elem = _parse(str, comp)
new_by_frags(elem, sg)
end
- def self.iso8601(str='-4712-01-01T00:00:00+00:00', sg=ITALY) # :nodoc:
- elem = _iso8601(str)
- new_by_frags(elem, sg)
- end
-
- def self.rfc3339(str='-4712-01-01T00:00:00+00:00', sg=ITALY) # :nodoc:
- elem = _rfc3339(str)
- new_by_frags(elem, sg)
- end
-
- def self.xmlschema(str='-4712-01-01T00:00:00+00:00', sg=ITALY) # :nodoc:
- elem = _xmlschema(str)
- new_by_frags(elem, sg)
- end
-
- def self.rfc2822(str='Mon, 1 Jan -4712 00:00:00 +0000', sg=ITALY) # :nodoc:
- elem = _rfc2822(str)
- new_by_frags(elem, sg)
- end
-
- class << self; alias_method :rfc822, :rfc2822 end
-
- def self.httpdate(str='Mon, 01 Jan -4712 00:00:00 GMT', sg=ITALY) # :nodoc:
- elem = _httpdate(str)
- new_by_frags(elem, sg)
- end
-
- def self.jisx0301(str='-4712-01-01T00:00:00+00:00', sg=ITALY) # :nodoc:
- elem = _jisx0301(str)
- new_by_frags(elem, sg)
- end
-
- public :hour, :min, :sec, :sec_fraction, :zone, :offset, :new_offset,
- :minute, :second, :second_fraction
+ public :hour, :min, :sec, :sec_fraction, :zone, :offset, :new_offset
+# :minute, :second, :second_fraction
def to_s # 4p
format('%.4d-%02d-%02dT%02d:%02d:%02d%s',
@@ -1781,50 +1630,42 @@ end
class Time
- def to_time() getlocal end
+# def to_time() getlocal end
def to_date
- jd = Date.__send__(:civil_to_jd, year, mon, mday, Date::ITALY)
- Date.new!(Date.__send__(:jd_to_ajd, jd, 0, 0), 0, Date::ITALY)
+ jd = Date.civil_to_jd(year, mon, mday, Date::ITALY)
+ Date.new!(Date.jd_to_ajd(jd, 0, 0), 0, Date::ITALY)
end
def to_datetime
- jd = DateTime.__send__(:civil_to_jd, year, mon, mday, DateTime::ITALY)
- fr = DateTime.__send__(:time_to_day_fraction, hour, min, [sec, 59].min) +
- Rational(subsec, 86400)
+ jd = DateTime.civil_to_jd(year, mon, mday, DateTime::ITALY)
+ fr = DateTime.time_to_day_fraction(hour, min, [sec, 59].min) +
+ Rational(usec, 86400_000_000)
of = Rational(utc_offset, 86400)
- DateTime.new!(DateTime.__send__(:jd_to_ajd, jd, fr, of),
- of, DateTime::ITALY)
+ DateTime.new!(DateTime.jd_to_ajd(jd, fr, of), of, DateTime::ITALY)
end
+ private :to_date, :to_datetime
+
end
class Date
+=begin
def to_time() Time.local(year, mon, mday) end
def to_date() self end
- def to_datetime() DateTime.new!(jd_to_ajd(jd, 0, 0), @of, @sg) end
+ def to_datetime() DateTime.new!(self.class.jd_to_ajd(jd, 0, 0), @of, @sg) end
+=end
# Create a new Date object representing today.
#
# +sg+ specifies the Day of Calendar Reform.
- def self.today(sg=ITALY)
- t = Time.now
- jd = civil_to_jd(t.year, t.mon, t.mday, sg)
- new!(jd_to_ajd(jd, 0, 0), 0, sg)
- end
+ def self.today(sg=ITALY) Time.now.__send__(:to_date) .new_start(sg) end
# Create a new DateTime object representing the current time.
#
# +sg+ specifies the Day of Calendar Reform.
- def self.now(sg=ITALY)
- t = Time.now
- jd = civil_to_jd(t.year, t.mon, t.mday, sg)
- fr = time_to_day_fraction(t.hour, t.min, [t.sec, 59].min) +
- Rational(t.subsec, 86400)
- of = Rational(t.utc_offset, 86400)
- new!(jd_to_ajd(jd, fr, of), of, sg)
- end
+ def self.now (sg=ITALY) Time.now.__send__(:to_datetime).new_start(sg) end
private_class_method :now
@@ -1832,19 +1673,95 @@ end
class DateTime < Date
+=begin
def to_time
d = new_offset(0)
d.instance_eval do
- Time.utc(year, mon, mday, hour, min, sec +
- sec_fraction)
+ Time.utc(year, mon, mday, hour, min, sec,
+ (sec_fraction * 86400000000).to_i)
end.
getlocal
end
- def to_date() Date.new!(jd_to_ajd(jd, 0, 0), 0, @sg) end
+ def to_date() Date.new!(self.class.jd_to_ajd(jd, 0, 0), 0, @sg) end
def to_datetime() self end
+=end
private_class_method :today
public_class_method :now
end
+
+class Date
+
+ class << self
+
+ def deprecated_class_method_alias(old, new) # :nodoc:
+ module_eval <<-"end;"
+ class << self
+ def #{old}(*args, &block)
+ if $VERBOSE
+ warn("\#{caller.shift.sub(/:in .*/, '')}: " \
+ "warning: \#{self}::#{old} is deprecated; " \
+ "use \#{self}::#{new}")
+ end
+ #{new}(*args, &block)
+ end
+ end
+ end;
+ end
+
+ private :deprecated_class_method_alias
+
+ def deprecated_alias(old, new) # :nodoc:
+ module_eval <<-"end;"
+ def #{old}(*args, &block)
+ if $VERBOSE
+ warn("\#{caller.shift.sub(/:in .*/, '')}: " \
+ "warning: \#{self.class}\##{old} is deprecated; " \
+ "use \#{self.class}\##{new}")
+ end
+ #{new}(*args, &block)
+ end
+ end;
+ end
+
+ private :deprecated_alias
+
+ end
+
+ [ %w(os? julian?),
+ %w(ns? gregorian?),
+ %w(exist1? valid_jd?),
+ %w(exist2? valid_ordinal?),
+ %w(exist3? valid_date?),
+ %w(exist? valid_date?),
+ %w(existw? valid_commercial?),
+ %w(new0 new!),
+ %w(new1 jd),
+ %w(new2 ordinal),
+ %w(new3 new),
+ %w(neww commercial)
+ ].each do |old, new|
+ deprecated_class_method_alias(old, new)
+ end
+
+ [ %w(os? julian?),
+ %w(ns? gregorian?),
+ %w(sg start),
+ %w(newsg new_start),
+ %w(of offset),
+ %w(newof new_offset)
+ ].each do |old, new|
+ deprecated_alias(old, new)
+ end
+
+ private :of, :newof
+
+end
+
+class DateTime < Date
+
+ public :of, :newof
+
+end
diff --git a/lib/date/delta.rb b/lib/date/delta.rb
deleted file mode 100644
index 283faf6ac2..0000000000
--- a/lib/date/delta.rb
+++ /dev/null
@@ -1,400 +0,0 @@
-# delta.rb: Written by Tadayoshi Funaba 2004-2009
-
-require 'date/delta/parser'
-
-class Date
-
- class Delta
-
- include Comparable
-
- UNIT_PREFIXES = {
- 'yotta' => Rational(10**24),
- 'zetta' => Rational(10**21),
- 'exa' => Rational(10**18),
- 'peta' => Rational(10**15),
- 'tera' => Rational(10**12),
- 'giga' => Rational(10**9),
- 'mega' => Rational(10**6),
- 'kilo' => Rational(10**3),
- 'hecto' => Rational(10**2),
- 'deca' => Rational(10**1),
- 'deka' => Rational(10**1),
- 'deci' => Rational(1, 10**1),
- 'centi' => Rational(1, 10**2),
- 'milli' => Rational(1, 10**3),
- 'decimilli' => Rational(1, 10**4),
- 'centimilli' => Rational(1, 10**5),
- 'micro' => Rational(1, 10**6),
- 'nano' => Rational(1, 10**9),
- 'millimicro' => Rational(1, 10**9),
- 'pico' => Rational(1, 10**12),
- 'micromicro' => Rational(1, 10**12),
- 'femto' => Rational(1, 10**15),
- 'atto' => Rational(1, 10**18),
- 'zepto' => Rational(1, 10**21),
- 'yocto' => Rational(1, 10**24)
- }
-
- IUNITS = {
- 'year' => Complex(0, 12),
- 'month' => Complex(0, 1)
- }
-
- RUNITS = {
- 'day' => Rational(1),
- 'week' => Rational(7),
- 'sennight' => Rational(7),
- 'fortnight' => Rational(14),
- 'hour' => Rational(1, 24),
- 'minute' => Rational(1, 1440),
- 'second' => Rational(1, 86400)
- }
-
- UNIT_PREFIXES.each do |k, v|
- RUNITS[k + 'second'] = v * RUNITS['second']
- end
-
- remove_const :UNIT_PREFIXES
-
- UNITS = {}
-
- IUNITS.each do |k, v|
- UNITS[k] = v
- end
-
- RUNITS.each do |k, v|
- UNITS[k] = v
- end
-
- UNITS4KEY = {}
-
- UNITS.each do |k, v|
- UNITS4KEY[k] = UNITS4KEY[k + 's'] = v
- end
-
- UNITS4KEY['y'] = UNITS4KEY['years']
- UNITS4KEY['yr'] = UNITS4KEY['years']
- UNITS4KEY['yrs'] = UNITS4KEY['years']
- UNITS4KEY['m'] = UNITS4KEY['months']
- UNITS4KEY['mo'] = UNITS4KEY['months']
- UNITS4KEY['mon'] = UNITS4KEY['months']
- UNITS4KEY['mnth'] = UNITS4KEY['months']
- UNITS4KEY['mnths'] = UNITS4KEY['months']
- UNITS4KEY['w'] = UNITS4KEY['weeks']
- UNITS4KEY['wk'] = UNITS4KEY['weeks']
- UNITS4KEY['d'] = UNITS4KEY['days']
- UNITS4KEY['dy'] = UNITS4KEY['days']
- UNITS4KEY['dys'] = UNITS4KEY['days']
- UNITS4KEY['h'] = UNITS4KEY['hours']
- UNITS4KEY['hr'] = UNITS4KEY['hours']
- UNITS4KEY['hrs'] = UNITS4KEY['hours']
- UNITS4KEY['min'] = UNITS4KEY['minutes']
- UNITS4KEY['mins'] = UNITS4KEY['minutes']
- UNITS4KEY['s'] = UNITS4KEY['seconds']
- UNITS4KEY['sec'] = UNITS4KEY['seconds']
- UNITS4KEY['secs'] = UNITS4KEY['seconds']
- UNITS4KEY['ms'] = UNITS4KEY['milliseconds']
- UNITS4KEY['msec'] = UNITS4KEY['milliseconds']
- UNITS4KEY['msecs'] = UNITS4KEY['milliseconds']
- UNITS4KEY['milli'] = UNITS4KEY['milliseconds']
- UNITS4KEY['us'] = UNITS4KEY['microseconds']
- UNITS4KEY['usec'] = UNITS4KEY['microseconds']
- UNITS4KEY['usecs'] = UNITS4KEY['microseconds']
- UNITS4KEY['micro'] = UNITS4KEY['microseconds']
- UNITS4KEY['ns'] = UNITS4KEY['nanoseconds']
- UNITS4KEY['nsec'] = UNITS4KEY['nanoseconds']
- UNITS4KEY['nsecs'] = UNITS4KEY['nanoseconds']
- UNITS4KEY['nano'] = UNITS4KEY['nanoseconds']
-
- def self.delta_to_dhms(delta)
- fr = delta.imag.abs
- y, fr = fr.divmod(12)
- m, fr = fr.divmod(1)
-
- if delta.imag < 0
- y = -y
- m = -m
- end
-
- fr = delta.real.abs
- ss, fr = fr.divmod(SECONDS_IN_DAY) # 4p
- d, ss = ss.divmod(86400)
- h, ss = ss.divmod(3600)
- min, s = ss.divmod(60)
-
- if delta.real < 0
- d = -d
- h = -h
- min = -min
- s = -s
- end
-
- return y, m, d, h, min, s, fr
- end
-
- def self.dhms_to_delta(y, m, d, h, min, s, fr)
- fr = 0 if fr == 0
- Complex(0, y.to_i * 12 + m.to_i) +
- Rational(d * 86400 + h * 3600 + min * 60 + (s + fr), 86400) # 4p
- end
-
- def initialize(delta)
- @delta = delta
- @__ca__ = {}
- end
-
- class << self; alias_method :new!, :new end
-
- def self.new(arg=0, h=0, min=0, s=0)
- if Hash === arg
- d = Complex(0)
- arg.each do |k, v|
- k = k.to_s.downcase
- unless UNITS4KEY[k]
- raise ArgumentError, "unknown keyword #{k}"
- end
- d += v * UNITS4KEY[k]
- end
- else
- d = dhms_to_delta(0, 0, arg, h, min, s, 0)
- end
- new!(d)
- end
-
- UNITS.each_key do |k|
- module_eval <<-"end;"
- def self.#{k}s(n=1)
- new(:d=>n * UNITS['#{k}'])
- end
- end;
- end
-
- class << self; alias_method :mins, :minutes end
- class << self; alias_method :secs, :seconds end
-
- def self.parse(str)
- d = begin (@@pa ||= Parser.new).parse(str)
- rescue Racc::ParseError
- raise ArgumentError, 'syntax error'
- end
- new!(d)
- end
-
- def self.diff(d1, d2) new(d1.ajd - d2.ajd) end
-
- class << self
-
- def once(*ids) # :nodoc: -- restricted
- for id in ids
- module_eval <<-"end;"
- alias_method :__#{id.object_id}__, :#{id.to_s}
- private :__#{id.object_id}__
- def #{id.to_s}(*args)
- @__ca__[#{id.object_id}] ||= __#{id.object_id}__(*args)
- end
- end;
- end
- end
-
- private :once
-
- end
-
- def dhms() self.class.delta_to_dhms(@delta) end
-
- once :dhms
-
- def delta() @delta end
-
- protected :delta
-
- def years() dhms[0] end
- def months() dhms[1] end
- def days() dhms[2] end
- def hours() dhms[3] end
- def minutes() dhms[4] end
- def seconds() dhms[5] end
- def second_fractions() dhms[6] end
-
- alias_method :mins, :minutes
- alias_method :secs, :seconds
- alias_method :sec_fractions, :second_fractions
-
- RUNITS.each_key do |k|
- module_eval <<-"end;"
- def in_#{k}s(u=1)
- if @delta.imag != 0
- raise ArgumentError, "#{k}: #{self} has month"
- end
- @delta.real / (u * RUNITS['#{k}'])
- end
- end;
- end
-
- alias_method :in_mins, :in_minutes
- alias_method :in_secs, :in_seconds
-
- def zero?() @delta.zero? end
- def nonzero?() unless zero? then self end end
-
- def integer? () @delta.imag == 0 && @delta.real.integer? end
-
- def -@ () self.class.new!(-@delta) end
- def +@ () self.class.new!(+@delta) end
-
- def dx_addsub(m, n)
- case n
- when Numeric; return self.class.new!(@delta.__send__(m, n))
- when Delta; return self.class.new!(@delta.__send__(m, n.delta))
- else
- l, r = n.coerce(self)
- return l.__send__(m, r)
- end
- end
-
- private :dx_addsub
-
- def + (n) dx_addsub(:+, n) end
- def - (n) dx_addsub(:-, n) end
-
- def dx_muldiv(m, n)
- case n
- when Numeric
- return self.class.new!(@delta.__send__(m, n))
- else
- l, r = n.coerce(self)
- return l.__send__(m, r)
- end
- end
-
- private :dx_muldiv
-
- def * (n) dx_muldiv(:*, n) end
- def / (n) dx_muldiv(:/, n) end
-
- def dx_conv1(m, n)
- if @delta.imag != 0
- raise ArgumentError, "#{m}: #{self} has month"
- end
- case n
- when Numeric
- return self.class.new!(Complex(@delta.real.__send__(m, n), 0))
- else
- l, r = n.coerce(self)
- return l.__send__(m, r)
- end
- end
-
- private :dx_conv1
-
- def % (n) dx_conv1(:%, n) end
-
- def div(n) dx_conv1(:div, n) end
- def modulo(n) dx_conv1(:modulo, n) end
- def divmod(n) [div(n), modulo(n)] end
-
- def quotient(n)
- if @delta.imag != 0
- raise ArgumentError, "quotient: #{self} has month"
- end
- case n
- when Numeric
- return self.class.new!(Complex((@delta.real / n).truncate))
- else
- l, r = n.coerce(self)
- return l.__send__(m, r)
- end
- end
-
- def remainder(n) dx_conv1(:remainder, n) end
- def quotrem(n) [quotient(n), remainder(n)] end
-
- def ** (n) dx_conv1(:**, n) end
- def quo(n) dx_muldiv(:quo, n) end
-
- def <=> (other)
- if @delta.imag != 0
- raise ArgumentError, "<=>: #{self} has month"
- end
- case other
- when Numeric; return @delta.real <=> other
- when Delta; return @delta.real <=> other.delta.real
- else
- begin
- l, r = other.coerce(self)
- return l <=> r
- rescue NoMethodError
- end
- end
- nil
- end
-
- def == (other)
- case other
- when Numeric; return @delta == other
- when Delta; return @delta == other
- else
- begin
- l, r = other.coerce(self)
- return l == r
- rescue NoMethodError
- end
- end
- nil
- end
-
- def coerce(other)
- case other
- when Numeric; return other, @delta
- else
- super
- end
- end
-
- def eql? (other) Delta === other && self == other end
- def hash() @delta.hash end
-
- def dx_conv0(m)
- if @delta.imag != 0
- raise ArgumentError, "#{m}: #{self} has month"
- end
- @delta.real.__send__(m)
- end
-
- private :dx_conv0
-
- def abs() dx_conv0(:abs) end
-
- def ceil() dx_conv0(:ceil) end
- def floor() dx_conv0(:floor) end
- def round() dx_conv0(:round) end
- def truncate() dx_conv0(:truncate) end
-
- def to_i() dx_conv0(:to_i) end
- def to_f() dx_conv0(:to_f) end
- def to_r() dx_conv0(:to_r) end
- def to_c() @delta end
-
- alias_method :to_int, :to_i
-
- def inspect() format('#<%s: %s (%s)>', self.class, to_s, @delta) end
-
- def to_s
- format(%(%s(%dd %.02d:%02d'%02d"%03d)%s(%dy %dm)), # '
- if @delta.real < 0 then '-' else '+' end,
- days.abs, hours.abs, mins.abs, secs.abs, sec_fractions.abs * 1000,
- if @delta.imag < 0 then '-' else '+' end,
- years.abs, months.abs)
- end
-
- def marshal_dump() @delta end
-
- def marshal_load(a)
- @delta = a
- @__ca__ = {}
- end
-
- end
-
-end
diff --git a/lib/date/delta/parser.rb b/lib/date/delta/parser.rb
deleted file mode 100644
index 7efe29f4c2..0000000000
--- a/lib/date/delta/parser.rb
+++ /dev/null
@@ -1,301 +0,0 @@
-#
-# DO NOT MODIFY!!!!
-# This file is automatically generated by racc 1.4.5
-# from racc grammer file "parser.ry".
-#
-
-require 'racc/parser'
-
-
-class Date
-
- class Delta
-
- class Parser < Racc::Parser
-
-module_eval <<'..end parser.ry modeval..id43bff5dec9', 'parser.ry', 42
-
- def lookup(str)
- t = str.downcase
- k = UNITS4KEY[t]
- return [:UNIT, k] if k
- return [:AND, nil] if t == 'and'
- return [:UNKNOWNWORD, nil]
- end
-
- def parse(str)
- @q = []
- until str.empty?
- case str
- when /\A\s+/
- when /\AP(\d+y)?(\d+m)?(\d+d)?t?(\d+h)?(\d+m)?(\d+s)?(\d+w)?/i
- y, m, d, h, min, s, w =
- [$1, $2, $3, $4, $5, $6, $7].collect{|x| x.to_i}
- y *= UNITS4KEY['years']
- m *= UNITS4KEY['months']
- d *= UNITS4KEY['days']
- h *= UNITS4KEY['hours']
- min *= UNITS4KEY['minutes']
- s *= UNITS4KEY['seconds']
- w *= UNITS4KEY['weeks']
- @q.push [:DURATION, y + m + d + h + min + s + w]
- when /\A\d+/
- @q.push [:DIGITS, $&.to_i]
- when /\A[a-z]+/i
- @q.push lookup($&)
- when /\A.|\n/
- @q.push [$&, $&]
- end
- str = $'
- end
- @q.push [false, false]
- do_parse
- end
-
- def next_token
- @q.shift
- end
-
-..end parser.ry modeval..id43bff5dec9
-
-##### racc 1.4.5 generates ###
-
-racc_reduce_table = [
- 0, 0, :racc_error,
- 1, 16, :_reduce_none,
- 1, 17, :_reduce_none,
- 1, 17, :_reduce_none,
- 3, 17, :_reduce_4,
- 3, 17, :_reduce_5,
- 3, 17, :_reduce_6,
- 3, 17, :_reduce_7,
- 3, 17, :_reduce_8,
- 3, 17, :_reduce_9,
- 3, 17, :_reduce_10,
- 2, 17, :_reduce_11,
- 2, 17, :_reduce_12,
- 3, 17, :_reduce_13,
- 2, 18, :_reduce_14,
- 0, 20, :_reduce_15,
- 1, 20, :_reduce_none,
- 1, 19, :_reduce_none ]
-
-racc_reduce_n = 18
-
-racc_shift_n = 32
-
-racc_action_table = [
- 13, 14, 15, 16, 17, 18, 19, 4, 27, 23,
- 8, 9, 1, 4, 25, 2, 8, 9, 1, 4,
- 24, 2, 8, 9, 1, 4, 21, 2, 8, 9,
- 1, 4, 11, 2, 8, 9, 1, 4, 26, 2,
- 8, 9, 1, 4, nil, 2, 8, 9, 1, 4,
- nil, 2, 8, 9, 1, nil, nil, 2, 13, 14,
- 15, 16, 17, 18, 19, 13, 14, 15, 13, 14,
- 15, 13, 14, 15, 13, 14, 15 ]
-
-racc_action_check = [
- 10, 10, 10, 10, 10, 10, 10, 17, 15, 10,
- 17, 17, 17, 18, 13, 17, 18, 18, 18, 4,
- 11, 18, 4, 4, 4, 1, 9, 4, 1, 1,
- 1, 8, 3, 1, 8, 8, 8, 19, 14, 8,
- 19, 19, 19, 0, nil, 19, 0, 0, 0, 16,
- nil, 0, 16, 16, 16, nil, nil, 16, 5, 5,
- 5, 5, 5, 5, 5, 30, 30, 30, 28, 28,
- 28, 29, 29, 29, 31, 31, 31 ]
-
-racc_action_pointer = [
- 37, 19, nil, 32, 13, 55, nil, nil, 25, 13,
- -3, 20, nil, 4, 28, -2, 43, 1, 7, 31,
- nil, nil, nil, nil, nil, nil, nil, nil, 65, 68,
- 62, 71 ]
-
-racc_action_default = [
- -18, -18, -17, -18, -18, -1, -2, -3, -18, -15,
- -18, -18, -12, -18, -18, -18, -18, -18, -18, -18,
- -11, -16, -14, -13, 32, -10, -8, -9, -4, -5,
- -6, -7 ]
-
-racc_goto_table = [
- 5, 10, 3, 22, 12, nil, nil, nil, 20, nil,
- nil, nil, nil, nil, nil, nil, 28, 29, 30, 31 ]
-
-racc_goto_check = [
- 2, 2, 1, 5, 2, nil, nil, nil, 2, nil,
- nil, nil, nil, nil, nil, nil, 2, 2, 2, 2 ]
-
-racc_goto_pointer = [
- nil, 2, 0, nil, nil, -6 ]
-
-racc_goto_default = [
- nil, nil, nil, 6, 7, nil ]
-
-racc_token_table = {
- false => 0,
- Object.new => 1,
- :UNARY => 2,
- "^" => 3,
- "*" => 4,
- "/" => 5,
- "+" => 6,
- "," => 7,
- :AND => 8,
- "-" => 9,
- :DIGITS => 10,
- "(" => 11,
- ")" => 12,
- :UNIT => 13,
- :DURATION => 14 }
-
-racc_use_result_var = true
-
-racc_nt_base = 15
-
-Racc_arg = [
- racc_action_table,
- racc_action_check,
- racc_action_default,
- racc_action_pointer,
- racc_goto_table,
- racc_goto_check,
- racc_goto_default,
- racc_goto_pointer,
- racc_nt_base,
- racc_reduce_table,
- racc_token_table,
- racc_shift_n,
- racc_reduce_n,
- racc_use_result_var ]
-
-Racc_token_to_s_table = [
-'$end',
-'error',
-'UNARY',
-'"^"',
-'"*"',
-'"/"',
-'"+"',
-'","',
-'AND',
-'"-"',
-'DIGITS',
-'"("',
-'")"',
-'UNIT',
-'DURATION',
-'$start',
-'stmt',
-'expr',
-'time',
-'iso',
-'unit']
-
-Racc_debug_parser = false
-
-##### racc system variables end #####
-
- # reduce 0 omitted
-
- # reduce 1 omitted
-
- # reduce 2 omitted
-
- # reduce 3 omitted
-
-module_eval <<'.,.,', 'parser.ry', 18
- def _reduce_4( val, _values, result )
-result += val[2]
- result
- end
-.,.,
-
-module_eval <<'.,.,', 'parser.ry', 19
- def _reduce_5( val, _values, result )
-result += val[2]
- result
- end
-.,.,
-
-module_eval <<'.,.,', 'parser.ry', 20
- def _reduce_6( val, _values, result )
-result += val[2]
- result
- end
-.,.,
-
-module_eval <<'.,.,', 'parser.ry', 21
- def _reduce_7( val, _values, result )
-result -= val[2]
- result
- end
-.,.,
-
-module_eval <<'.,.,', 'parser.ry', 22
- def _reduce_8( val, _values, result )
-result *= val[2]
- result
- end
-.,.,
-
-module_eval <<'.,.,', 'parser.ry', 23
- def _reduce_9( val, _values, result )
-result /= val[2]
- result
- end
-.,.,
-
-module_eval <<'.,.,', 'parser.ry', 24
- def _reduce_10( val, _values, result )
-result **= val[2]
- result
- end
-.,.,
-
-module_eval <<'.,.,', 'parser.ry', 25
- def _reduce_11( val, _values, result )
-result = -val[1]
- result
- end
-.,.,
-
-module_eval <<'.,.,', 'parser.ry', 26
- def _reduce_12( val, _values, result )
-result = +val[1]
- result
- end
-.,.,
-
-module_eval <<'.,.,', 'parser.ry', 27
- def _reduce_13( val, _values, result )
-result = val[1]
- result
- end
-.,.,
-
-module_eval <<'.,.,', 'parser.ry', 30
- def _reduce_14( val, _values, result )
-result = val[0] * val[1]
- result
- end
-.,.,
-
-module_eval <<'.,.,', 'parser.ry', 33
- def _reduce_15( val, _values, result )
-result = 1
- result
- end
-.,.,
-
- # reduce 16 omitted
-
- # reduce 17 omitted
-
- def _reduce_none( val, _values, result )
- result
- end
-
- end # class Parser
-
- end # class Delta
-
-end # class Date
diff --git a/lib/date/delta/parser.ry b/lib/date/delta/parser.ry
deleted file mode 100644
index 84d4c22c3c..0000000000
--- a/lib/date/delta/parser.ry
+++ /dev/null
@@ -1,84 +0,0 @@
-# parser.ry: Written by Tadayoshi Funaba 2006,2008,2009 -*- ruby -*-
-
-class Date::Delta::Parser
-
- prechigh
- nonassoc UNARY
- left '^'
- left '*' '/'
- left '+' ',' AND '-'
- preclow
-
- rule
-
- stmt : expr
- ;
-
- expr : time
- | iso
- | expr '+' expr {result += val[2]}
- | expr ',' expr {result += val[2]}
- | expr AND expr {result += val[2]}
- | expr '-' expr {result -= val[2]}
- | expr '*' DIGITS {result *= val[2]}
- | expr '/' DIGITS {result /= val[2]}
- | expr '^' DIGITS {result **= val[2]}
- | '-' expr =UNARY {result = -val[1]}
- | '+' expr =UNARY {result = +val[1]}
- | '(' expr ')' {result = val[1]}
- ;
-
- time : DIGITS unit {result = val[0] * val[1]}
- ;
-
- unit : {result = 1} | UNIT
- ;
-
- iso : DURATION
- ;
-
----- header ----
----- inner ----
-
- def lookup(str)
- t = str.downcase
- k = UNITS4KEY[t]
- return [:UNIT, k] if k
- return [:AND, nil] if t == 'and'
- return [:UNKNOWNWORD, nil]
- end
-
- def parse(str)
- @q = []
- until str.empty?
- case str
- when /\A\s+/
- when /\AP(\d+y)?(\d+m)?(\d+d)?t?(\d+h)?(\d+m)?(\d+s)?(\d+w)?/i
- y, m, d, h, min, s, w =
- [$1, $2, $3, $4, $5, $6, $7].collect{|x| x.to_i}
- y *= UNITS4KEY['years']
- m *= UNITS4KEY['months']
- d *= UNITS4KEY['days']
- h *= UNITS4KEY['hours']
- min *= UNITS4KEY['minutes']
- s *= UNITS4KEY['seconds']
- w *= UNITS4KEY['weeks']
- @q.push [:DURATION, y + m + d + h + min + s + w]
- when /\A\d+/
- @q.push [:DIGITS, $&.to_i]
- when /\A[a-z]+/i
- @q.push lookup($&)
- when /\A.|\n/
- @q.push [$&, $&]
- end
- str = $'
- end
- @q.push [false, false]
- do_parse
- end
-
- def next_token
- @q.shift
- end
-
----- footer ----
diff --git a/lib/date/format.rb b/lib/date/format.rb
index b30cf3a41e..f89c1344a9 100644
--- a/lib/date/format.rb
+++ b/lib/date/format.rb
@@ -1,6 +1,8 @@
-# format.rb: Written by Tadayoshi Funaba 1999-2009
+# format.rb: Written by Tadayoshi Funaba 1999-2008
# $Id: format.rb,v 2.43 2008-01-17 20:16:31+09 tadf Exp $
+require 'rational'
+
class Date
module Format # :nodoc:
@@ -213,9 +215,9 @@ class Date
:emit_a, :emit_ad, :emit_au
def strftime(fmt='%F')
- fmt.gsub(/%([-_0^#]+)?(\d+)?([EO]?(?::{1,3}z|.))/m) do
+ fmt.gsub(/%([-_0^#]+)?(\d+)?([EO]?(?::{1,3}z|.))/m) do |m|
f = {}
- m = $&
+ a = $&
s, w, c = $1, $2, $3
if s
s.scan(/./) do |k|
@@ -255,19 +257,13 @@ class Date
when 'j'; emit_n(yday, 3, f)
when 'k'; emit_a(hour, 2, f)
when 'L'
- f[:p] = nil
- w = f[:w] || 3
- u = 10**w
- emit_n((sec_fraction * u).floor, w, f)
+ emit_n((sec_fraction / MILLISECONDS_IN_DAY).floor, 3, f)
when 'l'; emit_a((hour % 12).nonzero? || 12, 2, f)
when 'M', 'OM'; emit_n(min, 2, f)
when 'm', 'Om'; emit_n(mon, 2, f)
when 'N'
- f[:p] = nil
- w = f[:w] || 9
- u = 10**w
- emit_n((sec_fraction * u).floor, w, f)
- when 'n'; emit_a("\n", 0, f)
+ emit_n((sec_fraction / NANOSECONDS_IN_DAY).floor, 9, f)
+ when 'n'; "\n"
when 'P'; emit_ad(strftime('%p').downcase, 0, f)
when 'p'; emit_au(if hour < 12 then 'AM' else 'PM' end, 0, f)
when 'Q'
@@ -285,7 +281,7 @@ class Date
else
emit_a(strftime('%H:%M:%S'), 0, f)
end
- when 't'; emit_a("\t", 0, f)
+ when 't'; "\t"
when 'U', 'W', 'OU', 'OW'
emit_n(if c[-1,1] == 'U' then wnum0 else wnum1 end, 2, f)
when 'u', 'Ou'; emit_n(cwday, 1, f)
@@ -330,8 +326,23 @@ class Date
([emit_z(sign * hh, 2, f)] + tail).join(sep)
when '%'; emit_a('%', 0, f)
when '+'; emit_a(strftime('%a %b %e %H:%M:%S %Z %Y'), 0, f)
+ when '1'
+ if $VERBOSE
+ warn("warning: strftime: %1 is deprecated; forget this")
+ end
+ emit_n(jd, 1, f)
+ when '2'
+ if $VERBOSE
+ warn("warning: strftime: %2 is deprecated; use '%Y-%j'")
+ end
+ emit_a(strftime('%Y-%j'), 0, f)
+ when '3'
+ if $VERBOSE
+ warn("warning: strftime: %3 is deprecated; use '%F'")
+ end
+ emit_a(strftime('%F'), 0, f)
else
- m
+ a
end
end
end
@@ -342,18 +353,15 @@ class Date
alias_method :ctime, :asctime
+=begin
def iso8601() strftime('%F') end
def rfc3339() iso8601 end
- def xmlschema() iso8601 end # :nodoc:
-
def rfc2822() strftime('%a, %-d %b %Y %T %z') end
alias_method :rfc822, :rfc2822
- def httpdate() new_offset(0).strftime('%a, %d %b %Y %T GMT') end # :nodoc:
-
def jisx0301
if jd < 2405160
iso8601
@@ -372,7 +380,6 @@ class Date
end
end
-=begin
def beat(n=0)
i, f = (new_offset(HOURS_IN_DAY).day_fraction * 1000).divmod(1)
('@%03d' % i) +
@@ -555,13 +562,30 @@ class Date
return unless str.sub!(/\A%/, '')
when '+'
return unless _strptime_i(str, '%a %b %e %H:%M:%S %Z %Y', e)
+ when '1'
+ if $VERBOSE
+ warn("warning: strptime: %1 is deprecated; forget this")
+ end
+ return unless str.sub!(/\A(\d+)/, '')
+ val = $1.to_i
+ e.jd = val
+ when '2'
+ if $VERBOSE
+ warn("warning: strptime: %2 is deprecated; use '%Y-%j'")
+ end
+ return unless _strptime_i(str, '%Y-%j', e)
+ when '3'
+ if $VERBOSE
+ warn("warning: strptime: %3 is deprecated; use '%F'")
+ end
+ return unless _strptime_i(str, '%F', e)
else
return unless str.sub!(Regexp.new('\\A' + Regexp.quote(a)), '')
end
else
case c
- when /\A\s/
- str.sub!(/\A\s+/, '')
+ when /\A[\s\v]/
+ str.sub!(/\A[\s\v]+/, '')
else
return unless str.sub!(Regexp.new('\\A' + Regexp.quote(a)), '')
end
@@ -669,11 +693,11 @@ class Date
private_class_method :s3e
def self._parse_day(str, e) # :nodoc:
- if str.sub!(/\b(#{Format::ABBR_DAYS.keys.join('|')})[^-\d\s]*/io, ' ')
+ if str.sub!(/\b(#{Format::ABBR_DAYS.keys.join('|')})[^-\d\s]*/ino, ' ')
e.wday = Format::ABBR_DAYS[$1.downcase]
true
=begin
- elsif str.sub!(/\b(?!\dth)(su|mo|tu|we|th|fr|sa)\b/i, ' ')
+ elsif str.sub!(/\b(?!\dth)(su|mo|tu|we|th|fr|sa)\b/in, ' ')
e.wday = %w(su mo tu we th fr sa).index($1.downcase)
true
=end
@@ -708,7 +732,7 @@ class Date
[[:alpha:]]+(?:\sdst)?\b
)
)?
- /ix,
+ /inx,
' ')
t = $1
@@ -720,7 +744,7 @@ class Date
\s*:?\s*(\d+)(?:[,.](\d+))?s?
)?
)?
- (?:\s*([ap])(?:m\b|\.m\.))?/ix
+ (?:\s*([ap])(?:m\b|\.m\.))?/inx
e.hour = $1.to_i
e.min = $2.to_i if $2
@@ -765,7 +789,7 @@ class Date
\s*
('?-?\d+(?:(?:st|nd|rd|th)\b)?)
)?
- /iox,
+ /inox,
' ') # '
s3e(e, $4, Format::ABBR_MONTHS[$2.downcase], $1,
$3 && $3[0,1].downcase == 'b')
@@ -784,7 +808,7 @@ class Date
\s*
('?-?\d+)
)?
- /iox,
+ /inox,
' ') # '
s3e(e, $4, Format::ABBR_MONTHS[$1.downcase], $2,
$3 && $3[0,1].downcase == 'b')
@@ -793,43 +817,43 @@ class Date
end
def self._parse_iso(str, e) # :nodoc:
- if str.sub!(/('?[-+]?\d+)-(\d+)-('?-?\d+)/, ' ')
+ if str.sub!(/('?[-+]?\d+)-(\d+)-('?-?\d+)/n, ' ')
s3e(e, $1, $2, $3)
true
end
end
def self._parse_iso2(str, e) # :nodoc:
- if str.sub!(/\b(\d{2}|\d{4})?-?w(\d{2})(?:-?(\d))?\b/i, ' ')
+ if str.sub!(/\b(\d{2}|\d{4})?-?w(\d{2})(?:-?(\d))?\b/in, ' ')
e.cwyear = $1.to_i if $1
e.cweek = $2.to_i
e.cwday = $3.to_i if $3
true
- elsif str.sub!(/-w-(\d)\b/i, ' ')
+ elsif str.sub!(/-w-(\d)\b/in, ' ')
e.cwday = $1.to_i
true
- elsif str.sub!(/--(\d{2})?-(\d{2})\b/, ' ')
+ elsif str.sub!(/--(\d{2})?-(\d{2})\b/n, ' ')
e.mon = $1.to_i if $1
e.mday = $2.to_i
true
- elsif str.sub!(/--(\d{2})(\d{2})?\b/, ' ')
+ elsif str.sub!(/--(\d{2})(\d{2})?\b/n, ' ')
e.mon = $1.to_i
e.mday = $2.to_i if $2
true
- elsif /[,.](\d{2}|\d{4})-\d{3}\b/ !~ str &&
- str.sub!(/\b(\d{2}|\d{4})-(\d{3})\b/, ' ')
+ elsif /[,.](\d{2}|\d{4})-\d{3}\b/n !~ str &&
+ str.sub!(/\b(\d{2}|\d{4})-(\d{3})\b/n, ' ')
e.year = $1.to_i
e.yday = $2.to_i
true
- elsif /\d-\d{3}\b/ !~ str &&
- str.sub!(/\b-(\d{3})\b/, ' ')
+ elsif /\d-\d{3}\b/n !~ str &&
+ str.sub!(/\b-(\d{3})\b/n, ' ')
e.yday = $1.to_i
true
end
end
def self._parse_jis(str, e) # :nodoc:
- if str.sub!(/\b([mtsh])(\d+)\.(\d+)\.(\d+)/i, ' ')
+ if str.sub!(/\b([mtsh])(\d+)\.(\d+)\.(\d+)/in, ' ')
era = { 'm'=>1867,
't'=>1911,
's'=>1925,
@@ -844,46 +868,46 @@ class Date
def self._parse_vms(str, e) # :nodoc:
if str.sub!(/('?-?\d+)-(#{Format::ABBR_MONTHS.keys.join('|')})[^-]*
- -('?-?\d+)/iox, ' ')
+ -('?-?\d+)/inox, ' ')
s3e(e, $3, Format::ABBR_MONTHS[$2.downcase], $1)
true
elsif str.sub!(/\b(#{Format::ABBR_MONTHS.keys.join('|')})[^-]*
- -('?-?\d+)(?:-('?-?\d+))?/iox, ' ')
+ -('?-?\d+)(?:-('?-?\d+))?/inox, ' ')
s3e(e, $3, Format::ABBR_MONTHS[$1.downcase], $2)
true
end
end
def self._parse_sla(str, e) # :nodoc:
- if str.sub!(%r|('?-?\d+)/\s*('?\d+)(?:\D\s*('?-?\d+))?|, ' ') # '
- s3e(e, $1, $2, $3)
+ if str.sub!(%r|('?-?\d+)/\s*('?\d+)(?:\D\s*('?-?\d+))?|n, ' ') # '
+ s3e(e, $3, $1, $2)
true
end
end
def self._parse_dot(str, e) # :nodoc:
- if str.sub!(%r|('?-?\d+)\.\s*('?\d+)\.\s*('?-?\d+)|, ' ') # '
+ if str.sub!(%r|('?-?\d+)\.\s*('?\d+)\.\s*('?-?\d+)|n, ' ') # '
s3e(e, $1, $2, $3)
true
end
end
def self._parse_year(str, e) # :nodoc:
- if str.sub!(/'(\d+)\b/, ' ')
+ if str.sub!(/'(\d+)\b/n, ' ')
e.year = $1.to_i
true
end
end
def self._parse_mon(str, e) # :nodoc:
- if str.sub!(/\b(#{Format::ABBR_MONTHS.keys.join('|')})\S*/io, ' ')
+ if str.sub!(/\b(#{Format::ABBR_MONTHS.keys.join('|')})\S*/ino, ' ')
e.mon = Format::ABBR_MONTHS[$1.downcase]
true
end
end
def self._parse_mday(str, e) # :nodoc:
- if str.sub!(/(\d+)(st|nd|rd|th)\b/i, ' ')
+ if str.sub!(/(\d+)(st|nd|rd|th)\b/in, ' ')
e.mday = $1.to_i
true
end
@@ -908,7 +932,7 @@ class Date
\[[-+]?\d[^\]]*\]
)
)?
- /ix,
+ /inx,
' ')
case $2.size
when 2
@@ -1027,14 +1051,14 @@ class Date
:_parse_jis, :_parse_vms, :_parse_sla, :_parse_dot,
:_parse_year, :_parse_mon, :_parse_mday, :_parse_ddd
- def self._parse(str, comp=true)
+ def self._parse(str, comp=false)
str = str.dup
e = Format::Bag.new
e._comp = comp
- str.gsub!(/[^-+',.\/:@[:alnum:]\[\]]+/, ' ')
+ str.gsub!(/[^-+',.\/:@[:alnum:]\[\]\x80-\xff]+/n, ' ')
_parse_time(str, e) # || _parse_beat(str, e)
_parse_day(str, e)
@@ -1052,13 +1076,13 @@ class Date
_parse_mday(str, e) ||
_parse_ddd(str, e)
- if str.sub!(/\b(bc\b|bce\b|b\.c\.|b\.c\.e\.)/i, ' ')
+ if str.sub!(/\b(bc\b|bce\b|b\.c\.|b\.c\.e\.)/in, ' ')
if e.year
e.year = -e.year + 1
end
end
- if str.sub!(/\A\s*(\d{1,2})\s*\z/, ' ')
+ if str.sub!(/\A\s*(\d{1,2})\s*\z/n, ' ')
if e.hour && !e.mday
v = $1.to_i
if (1..31) === v
@@ -1093,187 +1117,40 @@ class Date
e.to_hash
end
- def self._iso8601(str) # :nodoc:
- if /\A\s*(([-+]?\d{2,}|-)-\d{2}-\d{2}|
- ([-+]?\d{2,})?-\d{3}|
- (\d{2}|\d{4})?-w\d{2}-\d|
- -w-\d)
- (t
- \d{2}:\d{2}(:\d{2}([,.]\d+)?)?
- (z|[-+]\d{2}(:?\d{2})?)?)?\s*\z/ix =~ str
- _parse(str)
- elsif /\A\s*(([-+]?(\d{2}|\d{4})|--)\d{2}\d{2}|
- ([-+]?(\d{2}|\d{4}))?\d{3}|-\d{3}|
- (\d{2}|\d{4})?w\d{2}\d)
- (t?
- \d{2}\d{2}(\d{2}([,.]\d+)?)?
- (z|[-+]\d{2}(\d{2})?)?)?\s*\z/ix =~ str
- _parse(str)
- elsif /\A\s*(\d{2}:\d{2}(:\d{2}([,.]\d+)?)?
- (z|[-+]\d{2}(:?\d{2})?)?)?\s*\z/ix =~ str
- _parse(str)
- elsif /\A\s*(\d{2}\d{2}(\d{2}([,.]\d+)?)?
- (z|[-+]\d{2}(\d{2})?)?)?\s*\z/ix =~ str
- _parse(str)
- end
- end
-
- def self._rfc3339(str) # :nodoc:
- if /\A\s*-?\d{4}-\d{2}-\d{2} # allow minus, anyway
- (t|\s)
- \d{2}:\d{2}:\d{2}(\.\d+)?
- (z|[-+]\d{2}:\d{2})\s*\z/ix =~ str
- _parse(str)
- end
- end
-
- def self._xmlschema(str) # :nodoc:
- if /\A\s*(-?\d{4,})(?:-(\d{2})(?:-(\d{2}))?)?
- (?:t
- (\d{2}):(\d{2}):(\d{2})(?:\.(\d+))?)?
- (z|[-+]\d{2}:\d{2})?\s*\z/ix =~ str
- e = Format::Bag.new
- e.year = $1.to_i
- e.mon = $2.to_i if $2
- e.mday = $3.to_i if $3
- e.hour = $4.to_i if $4
- e.min = $5.to_i if $5
- e.sec = $6.to_i if $6
- e.sec_fraction = Rational($7.to_i, 10**$7.size) if $7
- if $8
- e.zone = $8
- e.offset = zone_to_diff($8)
- end
- e.to_hash
- elsif /\A\s*(\d{2}):(\d{2}):(\d{2})(?:\.(\d+))?
- (z|[-+]\d{2}:\d{2})?\s*\z/ix =~ str
- e = Format::Bag.new
- e.hour = $1.to_i if $1
- e.min = $2.to_i if $2
- e.sec = $3.to_i if $3
- e.sec_fraction = Rational($4.to_i, 10**$4.size) if $4
- if $5
- e.zone = $5
- e.offset = zone_to_diff($5)
- end
- e.to_hash
- elsif /\A\s*(?:--(\d{2})(?:-(\d{2}))?|---(\d{2}))
- (z|[-+]\d{2}:\d{2})?\s*\z/ix =~ str
- e = Format::Bag.new
- e.mon = $1.to_i if $1
- e.mday = $2.to_i if $2
- e.mday = $3.to_i if $3
- if $4
- e.zone = $4
- e.offset = zone_to_diff($4)
- end
- e.to_hash
- end
- end
-
- def self._rfc2822(str) # :nodoc:
- if /\A\s*(?:(?:#{Format::ABBR_DAYS.keys.join('|')})\s*,\s+)?
- \d{1,2}\s+
- (?:#{Format::ABBR_MONTHS.keys.join('|')})\s+
- -?(\d{2,})\s+ # allow minus, anyway
- \d{2}:\d{2}(:\d{2})?\s*
- (?:[-+]\d{4}|ut|gmt|e[sd]t|c[sd]t|m[sd]t|p[sd]t|[a-ik-z])\s*\z/iox =~ str
- e = _parse(str, false)
- if $1.size < 4
- if e[:year] < 50
- e[:year] += 2000
- elsif e[:year] < 1000
- e[:year] += 1900
- end
- end
- e
- end
- end
-
- class << self; alias_method :_rfc822, :_rfc2822 end
-
- def self._httpdate(str) # :nodoc:
- if /\A\s*(#{Format::ABBR_DAYS.keys.join('|')})\s*,\s+
- \d{2}\s+
- (#{Format::ABBR_MONTHS.keys.join('|')})\s+
- -?\d{4}\s+ # allow minus, anyway
- \d{2}:\d{2}:\d{2}\s+
- gmt\s*\z/iox =~ str
- _rfc2822(str)
- elsif /\A\s*(#{Format::DAYS.keys.join('|')})\s*,\s+
- \d{2}\s*-\s*
- (#{Format::ABBR_MONTHS.keys.join('|')})\s*-\s*
- \d{2}\s+
- \d{2}:\d{2}:\d{2}\s+
- gmt\s*\z/iox =~ str
- _parse(str)
- elsif /\A\s*(#{Format::ABBR_DAYS.keys.join('|')})\s+
- (#{Format::ABBR_MONTHS.keys.join('|')})\s+
- \d{1,2}\s+
- \d{2}:\d{2}:\d{2}\s+
- \d{4}\s*\z/iox =~ str
- _parse(str)
- end
- end
-
- def self._jisx0301(str) # :nodoc:
- if /\A\s*[mtsh]?\d{2}\.\d{2}\.\d{2}
- (t
- (\d{2}:\d{2}(:\d{2}([,.]\d*)?)?
- (z|[-+]\d{2}(:?\d{2})?)?)?)?\s*\z/ix =~ str
- if /\A\s*\d/ =~ str
- _parse(str.sub(/\A\s*(\d)/, 'h\1'))
- else
- _parse(str)
- end
+ def self.zone_to_diff(zone) # :nodoc:
+ zone = zone.downcase
+ if zone.sub!(/\s+(standard|daylight)\s+time\z/, '')
+ dst = $1 == 'daylight'
else
- _iso8601(str)
+ dst = zone.sub!(/\s+dst\z/, '')
end
- end
-
- t = Module.new do
-
- private
-
- def zone_to_diff(zone) # :nodoc:
- zone = zone.downcase
- if zone.sub!(/\s+(standard|daylight)\s+time\z/, '')
- dst = $1 == 'daylight'
+ if Format::ZONES.include?(zone)
+ offset = Format::ZONES[zone]
+ offset += 3600 if dst
+ elsif zone.sub!(/\A(?:gmt|utc?)?([-+])/, '')
+ sign = $1
+ if zone.include?(':')
+ hour, min, sec, = zone.split(':')
+ elsif zone.include?(',') || zone.include?('.')
+ hour, fr, = zone.split(/[,.]/)
+ min = Rational(fr.to_i, 10**fr.size) * 60
else
- dst = zone.sub!(/\s+dst\z/, '')
- end
- if Format::ZONES.include?(zone)
- offset = Format::ZONES[zone]
- offset += 3600 if dst
- elsif zone.sub!(/\A(?:gmt|utc?)?([-+])/, '')
- sign = $1
- if zone.include?(':')
- hour, min, sec, = zone.split(':')
- elsif zone.include?(',') || zone.include?('.')
- hour, fr, = zone.split(/[,.]/)
- min = Rational(fr.to_i, 10**fr.size) * 60
+ case zone.size
+ when 3
+ hour = zone[0,1]
+ min = zone[1,2]
else
- case zone.size
- when 3
- hour = zone[0,1]
- min = zone[1,2]
- else
- hour = zone[0,2]
- min = zone[2,2]
- sec = zone[4,2]
- end
+ hour = zone[0,2]
+ min = zone[2,2]
+ sec = zone[4,2]
end
- offset = hour.to_i * 3600 + min.to_i * 60 + sec.to_i
- offset *= -1 if sign == '-'
end
- offset
+ offset = hour.to_i * 3600 + min.to_i * 60 + sec.to_i
+ offset *= -1 if sign == '-'
end
-
+ offset
end
- extend t
- include t
-
end
class DateTime < Date
@@ -1286,12 +1163,13 @@ class DateTime < Date
super(str, fmt)
end
+=begin
def iso8601_timediv(n) # :nodoc:
strftime('T%T' +
if n < 1
''
else
- '.%0*d' % [n, (sec_fraction / Rational(1, 10**n)).round]
+ '.%0*d' % [n, (sec_fraction / SECONDS_IN_DAY / (10**n)).round]
end +
'%:z')
end
@@ -1304,10 +1182,9 @@ class DateTime < Date
def rfc3339(n=0) iso8601(n) end
- def xmlschema(n=0) iso8601(n) end # :nodoc:
-
def jisx0301(n=0)
super() + iso8601_timediv(n)
end
+=end
end
diff --git a/lib/date2.rb b/lib/date2.rb
new file mode 100644
index 0000000000..f7da78f650
--- /dev/null
+++ b/lib/date2.rb
@@ -0,0 +1,5 @@
+# date2 was overridden by date.
+# To be precise, date was overridden by date2,
+# and date2 was renamed to date.
+
+require 'date'
diff --git a/lib/debug.rb b/lib/debug.rb
index 10236c352d..9ae119f8fb 100644
--- a/lib/debug.rb
+++ b/lib/debug.rb
@@ -2,8 +2,6 @@
# Copyright (C) 2000 Information-technology Promotion Agency, Japan
# Copyright (C) 2000-2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-require 'continuation'
-
if $SAFE > 0
STDERR.print "-r debug.rb is not available in safe mode\n"
exit 1
@@ -21,6 +19,45 @@ end
SCRIPT_LINES__ = {} unless defined? SCRIPT_LINES__
class DEBUGGER__
+class Mutex
+ def initialize
+ @locker = nil
+ @waiting = []
+ @locked = false;
+ end
+
+ def locked?
+ @locked
+ end
+
+ def lock
+ return if Thread.critical
+ return if @locker == Thread.current
+ while (Thread.critical = true; @locked)
+ @waiting.push Thread.current
+ Thread.stop
+ end
+ @locked = true
+ @locker = Thread.current
+ Thread.critical = false
+ self
+ end
+
+ def unlock
+ return if Thread.critical
+ return unless @locked
+ unless @locker == Thread.current
+ raise RuntimeError, "unlocked by other"
+ end
+ Thread.critical = true
+ t = @waiting.shift
+ @locked = false
+ @locker = nil
+ Thread.critical = false
+ t.run if t
+ self
+ end
+end
MUTEX = Mutex.new
class Context
@@ -81,14 +118,13 @@ class Context
end
def check_suspend
- while MUTEX.synchronize {
- if @suspend_next
- DEBUGGER__.waiting.push Thread.current
- @suspend_next = false
- true
- end
- }
+ return if Thread.critical
+ while (Thread.critical = true; @suspend_next)
+ DEBUGGER__.waiting.push Thread.current
+ @suspend_next = false
+ Thread.stop
end
+ Thread.critical = false
end
def trace?
@@ -220,7 +256,7 @@ class Context
def debug_command(file, line, id, binding)
MUTEX.lock
unless defined?($debugger_restart) and $debugger_restart
- callcc{|c| $debugger_restart = c}
+ callcc{|c| $debugger_restart = c}
end
set_last_thread(Thread.current)
frame_pos = 0
@@ -297,9 +333,9 @@ class Context
if break_points.find{|b| b[1] == 0}
n = 1
stdout.print "Breakpoints:\n"
- break_points.each do |b|
+ for b in break_points
if b[0] and b[1] == 0
- stdout.printf " %d %s:%s\n", n, b[2], b[3]
+ stdout.printf " %d %s:%s\n", n, b[2], b[3]
end
n += 1
end
@@ -593,6 +629,7 @@ EOHELP
def display_list(b, e, file, line)
stdout.printf "[%d, %d] in %s\n", b, e, file
if lines = SCRIPT_LINES__[file] and lines != true
+ n = 0
b.upto(e) do |n|
if n > 0 && lines[n-1]
if n == line
@@ -711,7 +748,10 @@ EOHELP
end
@frames.shift
- when 'raise'
+ when 'end'
+ @frames.shift
+
+ when 'raise'
excn_handle(file, line, id, binding)
end
@@ -750,12 +790,13 @@ class << DEBUGGER__
end
def set_trace( arg )
- MUTEX.synchronize do
- make_thread_list
- for th, in @thread_list
- context(th).set_trace arg
- end
+ saved_crit = Thread.critical
+ Thread.critical = true
+ make_thread_list
+ for th, in @thread_list
+ context(th).set_trace arg
end
+ Thread.critical = saved_crit
arg
end
@@ -764,29 +805,31 @@ class << DEBUGGER__
end
def suspend
- MUTEX.synchronize do
- make_thread_list
- for th, in @thread_list
- next if th == Thread.current
- context(th).set_suspend
- end
- end
+ saved_crit = Thread.critical
+ Thread.critical = true
+ make_thread_list
+ for th, in @thread_list
+ next if th == Thread.current
+ context(th).set_suspend
+ end
+ Thread.critical = saved_crit
# Schedule other threads to suspend as soon as possible.
- Thread.pass
+ Thread.pass unless Thread.critical
end
def resume
- MUTEX.synchronize do
- make_thread_list
- @thread_list.each do |th,|
- next if th == Thread.current
- context(th).clear_suspend
- end
- waiting.each do |th|
- th.run
- end
- waiting.clear
- end
+ saved_crit = Thread.critical
+ Thread.critical = true
+ make_thread_list
+ for th, in @thread_list
+ next if th == Thread.current
+ context(th).clear_suspend
+ end
+ waiting.each do |th|
+ th.run
+ end
+ waiting.clear
+ Thread.critical = saved_crit
# Schedule other threads to restart as soon as possible.
Thread.pass
end
@@ -804,7 +847,7 @@ class << DEBUGGER__
end
def get_thread(num)
- th = @thread_list.key(num)
+ th = @thread_list.index(num)
unless th
@stdout.print "No thread ##{num}\n"
throw :debug_error
@@ -878,7 +921,7 @@ class << DEBUGGER__
@stdout.print "Already stopped.\n"
else
thread_list(@thread_list[th])
- context(th).suspend
+ context(th).suspend
end
when /^resume\s+(\d+)/
@@ -898,9 +941,6 @@ end
stdout.printf "Debug.rb\n"
stdout.printf "Emacs support available.\n\n"
-RubyVM::InstructionSequence.compile_option = {
- trace_instruction: true
-}
set_trace_func proc { |event, file, line, id, binding, klass, *rest|
DEBUGGER__.context.trace_func event, file, line, id, binding, klass
}
diff --git a/lib/delegate.rb b/lib/delegate.rb
index d0b732aa8d..bd2b5e4813 100644
--- a/lib/delegate.rb
+++ b/lib/delegate.rb
@@ -37,16 +37,16 @@
# def initialize
# @source = SimpleDelegator.new([])
# end
-#
+#
# def stats( records )
# @source.__setobj__(records)
-#
+#
# "Elements: #{@source.size}\n" +
# " Non-Nil: #{@source.compact.size}\n" +
# " Unique: #{@source.uniq.size}\n"
# end
# end
-#
+#
# s = Stats.new
# puts s.stats(%w{James Edward Gray II})
# puts
@@ -57,7 +57,7 @@
# Elements: 4
# Non-Nil: 4
# Unique: 4
-#
+#
# Elements: 8
# Non-Nil: 7
# Unique: 6
@@ -72,19 +72,19 @@
#
# class Tempfile < DelegateClass(File)
# # constant and class member data initialization...
-#
+#
# def initialize(basename, tmpdir=Dir::tmpdir)
# # build up file path/name in var tmpname...
-#
+#
# @tmpfile = File.open(tmpname, File::RDWR|File::CREAT|File::EXCL, 0600)
-#
+#
# # ...
-#
+#
# super(@tmpfile)
-#
+#
# # below this point, all methods of File are supported...
# end
-#
+#
# # ...
# end
#
@@ -95,17 +95,17 @@
# class SimpleDelegator < Delegator
# def initialize(obj)
# super # pass obj to Delegator constructor, required
-# @delegate_sd_obj = obj # store obj for future use
+# @_sd_obj = obj # store obj for future use
# end
-#
+#
# def __getobj__
-# @delegate_sd_obj # return object we are delegating to, required
+# @_sd_obj # return object we are delegating to, required
# end
-#
+#
# def __setobj__(obj)
-# @delegate_sd_obj = obj # change delegation object, a feature we're providing
+# @_sd_obj = obj # change delegation object, a feature we're providing
# end
-#
+#
# # ...
# end
@@ -115,51 +115,60 @@
# implementation, see SimpleDelegator.
#
class Delegator
- [:to_s,:inspect,:=~,:!~,:===].each do |m|
- undef_method m
- end
+ IgnoreBacktracePat = %r"\A#{Regexp.quote(__FILE__)}:\d+:in `"
#
# Pass in the _obj_ to delegate method calls to. All methods supported by
# _obj_ will be delegated to.
#
def initialize(obj)
- __setobj__(obj)
+ preserved = ::Kernel.public_instance_methods(false)
+ preserved -= ["to_s","to_a","inspect","==","=~","==="]
+ for t in self.class.ancestors
+ preserved |= t.public_instance_methods(false)
+ preserved |= t.private_instance_methods(false)
+ preserved |= t.protected_instance_methods(false)
+ break if t == Delegator
+ end
+ preserved << "singleton_method_added"
+ for method in obj.methods
+ next if preserved.include? method
+ begin
+ eval <<-EOS, nil, __FILE__, __LINE__+1
+ def self.#{method}(*args, &block)
+ begin
+ __getobj__.__send__(:#{method}, *args, &block)
+ ensure
+ $@.delete_if{|s|IgnoreBacktracePat=~s} if $@
+ end
+ end
+ EOS
+ rescue SyntaxError
+ raise NameError, "invalid identifier %s" % method, caller(4)
+ end
+ end
end
+ alias initialize_methods initialize
# Handles the magic of delegation through \_\_getobj\_\_.
- def method_missing(m, *args, &block)
- begin
- target = self.__getobj__
- unless target.respond_to?(m)
- super(m, *args, &block)
- else
- target.__send__(m, *args, &block)
- end
- rescue Exception
- $@.delete_if{|s| %r"\A#{Regexp.quote(__FILE__)}:\d+:in `method_missing'\z"o =~ s}
- ::Kernel::raise
+ def method_missing(m, *args)
+ target = self.__getobj__
+ unless target.respond_to?(m)
+ super(m, *args)
end
+ target.__send__(m, *args)
end
- #
- # Checks for a method provided by this the delegate object by fowarding the
+ #
+ # Checks for a method provided by this the delegate object by fowarding the
# call through \_\_getobj\_\_.
- #
+ #
def respond_to?(m, include_private = false)
return true if super
return self.__getobj__.respond_to?(m, include_private)
end
#
- # Returns true if two objects are considered same.
- #
- def ==(obj)
- return true if obj.equal?(self)
- self.__getobj__ == obj
- end
-
- #
# This method must be overridden by subclasses and should return the object
# method calls are being delegated to.
#
@@ -167,35 +176,15 @@ class Delegator
raise NotImplementedError, "need to define `__getobj__'"
end
- #
- # This method must be overridden by subclasses and change the object delegate
- # to _obj_.
- #
- def __setobj__(obj)
- raise NotImplementedError, "need to define `__setobj__'"
- end
-
# Serialization support for the object returned by \_\_getobj\_\_.
def marshal_dump
__getobj__
end
# Reinitializes delegation from a serialized object.
def marshal_load(obj)
+ initialize_methods(obj)
__setobj__(obj)
end
-
- # Clone support for the object returned by \_\_getobj\_\_.
- def clone
- new = super
- new.__setobj__(__getobj__.clone)
- new
- end
- # Duplication support for the object returned by \_\_getobj\_\_.
- def dup
- new = super
- new.__setobj__(__getobj__.dup)
- new
- end
end
#
@@ -205,9 +194,16 @@ end
# \_\_setobj\_\_ .
#
class SimpleDelegator<Delegator
+
+ # Pass in the _obj_ you would like to delegate method calls to.
+ def initialize(obj)
+ super
+ @_sd_obj = obj
+ end
+
# Returns the current object method calls are being delegated to.
def __getobj__
- @delegate_sd_obj
+ @_sd_obj
end
#
@@ -226,22 +222,27 @@ class SimpleDelegator<Delegator
#
def __setobj__(obj)
raise ArgumentError, "cannot delegate to self" if self.equal?(obj)
- @delegate_sd_obj = obj
+ @_sd_obj = obj
end
-end
-# :stopdoc:
-def Delegator.delegating_block(mid)
- lambda do |*args, &block|
- begin
- __getobj__.__send__(mid, *args, &block)
- rescue
- re = /\A#{Regexp.quote(__FILE__)}:#{__LINE__-2}:/o
- $!.backtrace.delete_if {|t| re =~ t}
- raise
- end
+ # Clone support for the object returned by \_\_getobj\_\_.
+ def clone
+ new = super
+ new.__setobj__(__getobj__.clone)
+ new
+ end
+ # Duplication support for the object returned by \_\_getobj\_\_.
+ def dup
+ new = super
+ new.__setobj__(__getobj__.clone)
+ new
end
end
+
+# :stopdoc:
+# backward compatibility ^_^;;;
+Delegater = Delegator
+SimpleDelegater = SimpleDelegator
# :startdoc:
#
@@ -255,22 +256,55 @@ end
# end
#
def DelegateClass(superclass)
- klass = Class.new(Delegator)
+ klass = Class.new
methods = superclass.public_instance_methods(true)
- methods -= ::Delegator.public_instance_methods
- methods -= [:to_s,:inspect,:=~,:!~,:===]
+ methods -= ::Kernel.public_instance_methods(false)
+ methods |= ["to_s","to_a","inspect","==","=~","==="]
klass.module_eval {
+ def initialize(obj) # :nodoc:
+ @_dc_obj = obj
+ end
+ def method_missing(m, *args) # :nodoc:
+ unless @_dc_obj.respond_to?(m)
+ super(m, *args)
+ end
+ @_dc_obj.__send__(m, *args)
+ end
+ def respond_to?(m, include_private = false) # :nodoc:
+ return true if super
+ return @_dc_obj.respond_to?(m, include_private)
+ end
def __getobj__ # :nodoc:
- @delegate_dc_obj
+ @_dc_obj
end
def __setobj__(obj) # :nodoc:
raise ArgumentError, "cannot delegate to self" if self.equal?(obj)
- @delegate_dc_obj = obj
+ @_dc_obj = obj
+ end
+ def clone # :nodoc:
+ new = super
+ new.__setobj__(__getobj__.clone)
+ new
+ end
+ def dup # :nodoc:
+ new = super
+ new.__setobj__(__getobj__.clone)
+ new
end
}
- klass.module_eval do
- methods.each do |method|
- define_method(method, Delegator.delegating_block(method))
+ for method in methods
+ begin
+ klass.module_eval <<-EOS, __FILE__, __LINE__+1
+ def #{method}(*args, &block)
+ begin
+ @_dc_obj.__send__(:#{method}, *args, &block)
+ ensure
+ $@.delete_if{|s| ::Delegator::IgnoreBacktracePat =~ s} if $@
+ end
+ end
+ EOS
+ rescue SyntaxError
+ raise NameError, "invalid identifier %s" % method, caller(3)
end
end
return klass
@@ -289,23 +323,15 @@ if __FILE__ == $0
p ary.class
ary.push 25
p ary
- ary.push 42
- ary.each {|x| p x}
foo = Object.new
def foo.test
25
end
- def foo.iter
- yield self
- end
def foo.error
raise 'this is OK'
end
foo2 = SimpleDelegator.new(foo)
- p foo2
- foo2.instance_eval{print "foo\n"}
p foo.test == foo2.test # => true
- p foo2.iter{[55,true]} # => true
foo2.error # raise error!
end
diff --git a/lib/drb/drb.rb b/lib/drb/drb.rb
index a2c11f980d..20e658e611 100644
--- a/lib/drb/drb.rb
+++ b/lib/drb/drb.rb
@@ -18,7 +18,7 @@
#
# The Ruby standard library contains the core classes of the dRuby package.
# However, the full package also includes access control lists and the
-# Rinda tuple-space distributed task management system, as well as a
+# Rinda tuple-space distributed task management system, as well as a
# large number of samples. The full dRuby package can be downloaded from
# the dRuby home page (see *References*).
#
@@ -121,7 +121,7 @@ require 'drb/eq'
# are forwarded to the local object, as described in the discussion of
# DRbObjects. This has semantics similar to the normal Ruby
# pass-by-reference.
-#
+#
# The easiest way to signal that we want an otherwise marshallable
# object to be passed or returned as a DRbObject reference, rather
# than marshalled and sent as a copy, is to include the
@@ -135,7 +135,7 @@ require 'drb/eq'
# passed back to the remote execution context to be collected, before
# the collected values are finally returned to the local context as
# the return value of the method invocation.
-#
+#
# == Examples of usage
#
# For more dRuby samples, see the +samples+ directory in the full
@@ -148,33 +148,33 @@ require 'drb/eq'
# starting the server code first.
#
# ==== Server code
-#
+#
# require 'drb/drb'
-#
+#
# # The URI for the server to connect to
-# URI="druby://localhost:8787"
-#
+# URI="druby://localhost:8787"
+#
# class TimeServer
-#
+#
# def get_current_time
# return Time.now
# end
-#
+#
# end
-#
+#
# # The object that handles requests on the server
# FRONT_OBJECT=TimeServer.new
#
# $SAFE = 1 # disable eval() and friends
-#
+#
# DRb.start_service(URI, FRONT_OBJECT)
# # Wait for the drb server thread to finish before exiting.
# DRb.thread.join
#
# ==== Client code
-#
+#
# require 'drb/drb'
-#
+#
# # The URI to connect to
# SERVER_URI="druby://localhost:8787"
#
@@ -184,43 +184,43 @@ require 'drb/eq'
# # as soon as we pass a non-marshallable object as an argument
# # to a dRuby call.
# DRb.start_service
-#
+#
# timeserver = DRbObject.new_with_uri(SERVER_URI)
-# puts timeserver.get_current_time
+# puts timeserver.get_current_time
#
# === Remote objects under dRuby
#
# This example illustrates returning a reference to an object
# from a dRuby call. The Logger instances live in the server
# process. References to them are returned to the client process,
-# where methods can be invoked upon them. These methods are
+# where methods can be invoked upon them. These methods are
# executed in the server process.
#
# ==== Server code
-#
+#
# require 'drb/drb'
-#
+#
# URI="druby://localhost:8787"
-#
+#
# class Logger
#
# # Make dRuby send Logger instances as dRuby references,
# # not copies.
# include DRb::DRbUndumped
-#
+#
# def initialize(n, fname)
# @name = n
# @filename = fname
# end
-#
+#
# def log(message)
# File.open(@filename, "a") do |f|
# f.puts("#{Time.now}: #{@name}: #{message}")
# end
# end
-#
+#
# end
-#
+#
# # We have a central object for creating and retrieving loggers.
# # This retains a local reference to all loggers created. This
# # is so an existing logger can be looked up by name, but also
@@ -228,12 +228,12 @@ require 'drb/eq'
# # reference to an object is not sufficient to prevent it being
# # garbage collected!
# class LoggerFactory
-#
+#
# def initialize(bdir)
# @basedir = bdir
# @loggers = {}
# end
-#
+#
# def get_logger(name)
# if !@loggers.has_key? name
# # make the filename safe, then declare it to be so
@@ -242,34 +242,34 @@ require 'drb/eq'
# end
# return @loggers[name]
# end
-#
+#
# end
-#
+#
# FRONT_OBJECT=LoggerFactory.new("/tmp/dlog")
#
# $SAFE = 1 # disable eval() and friends
-#
+#
# DRb.start_service(URI, FRONT_OBJECT)
# DRb.thread.join
#
# ==== Client code
#
# require 'drb/drb'
-#
+#
# SERVER_URI="druby://localhost:8787"
#
# DRb.start_service
-#
+#
# log_service=DRbObject.new_with_uri(SERVER_URI)
-#
+#
# ["loga", "logb", "logc"].each do |logname|
-#
+#
# logger=log_service.get_logger(logname)
-#
+#
# logger.log("Hello, world!")
# logger.log("Goodbye, world!")
# logger.log("=== EOT ===")
-#
+#
# end
#
# == Security
@@ -288,9 +288,9 @@ require 'drb/eq'
# ro.instance_eval("`rm -rf *`")
#
# The dangers posed by instance_eval and friends are such that a
-# DRbServer should generally be run with $SAFE set to at least
-# level 1. This will disable eval() and related calls on strings
-# passed across the wire. The sample usage code given above follows
+# DRbServer should generally be run with $SAFE set to at least
+# level 1. This will disable eval() and related calls on strings
+# passed across the wire. The sample usage code given above follows
# this practice.
#
# A DRbServer can be configured with an access control list to
@@ -360,7 +360,7 @@ module DRb
#
# This, the default implementation, uses an object's local ObjectSpace
# __id__ as its id. This means that an object's identification over
- # drb remains valid only while that object instance remains alive
+ # drb remains valid only while that object instance remains alive
# within the server runtime.
#
# For alternative mechanisms, see DRb::TimerIdConv in rdb/timeridconv.rb
@@ -374,7 +374,7 @@ module DRb
def to_obj(ref)
ObjectSpace._id2ref(ref)
end
-
+
# Convert an object into a reference id.
#
# This implementation returns the object's __id__ in the local
@@ -390,7 +390,7 @@ module DRb
# called over drb, then the object remains in the server space
# and a reference to the object is returned, rather than the
# object being marshalled and moved into the client space.
- module DRbUndumped
+ module DRbUndumped
def _dump(dummy) # :nodoc:
raise TypeError, 'can\'t dump'
end
@@ -424,7 +424,7 @@ module DRb
def self._load(s) # :nodoc:
Marshal::load(s)
end
-
+
def _dump(lv) # :nodoc:
Marshal::dump(@unknown)
end
@@ -456,11 +456,11 @@ module DRb
# +name+ attribute. The marshalled object is held in the +buf+
# attribute.
class DRbUnknown
-
+
# Create a new DRbUnknown object.
#
# +buf+ is a string containing a marshalled object that could not
- # be unmarshalled. +err+ is the error message that was raised
+ # be unmarshalled. +err+ is the error message that was raised
# when the unmarshalling failed. It is used to determine the
# name of the unmarshalled object.
def initialize(err, buf)
@@ -499,7 +499,7 @@ module DRb
# Attempt to load the wrapped marshalled object again.
#
# If the class of the object is now known locally, the object
- # will be unmarshalled and returned. Otherwise, a new
+ # will be unmarshalled and returned. Otherwise, a new
# but identical DRbUnknown object will be returned.
def reload
self.class._load(@buf)
@@ -513,7 +513,7 @@ module DRb
class DRbArray
def initialize(ary)
- @ary = ary.collect { |obj|
+ @ary = ary.collect { |obj|
if obj.kind_of? DRbUndumped
DRbObject.new(obj)
else
@@ -607,7 +607,7 @@ module DRb
rescue
raise(DRbConnError, $!.message, $!.backtrace)
end
-
+
def recv_request(stream) # :nodoc:
ref = load(stream)
ro = DRb.to_obj(ref)
@@ -656,10 +656,10 @@ module DRb
# using configuration +config+. Return a
# protocol instance for this listener.
# [uri_option(uri, config)] Take a URI, possibly containing an option
- # component (e.g. a trailing '?param=val'),
+ # component (e.g. a trailing '?param=val'),
# and return a [uri, option] tuple.
#
- # All of these methods should raise a DRbBadScheme error if the URI
+ # All of these methods should raise a DRbBadScheme error if the URI
# does not identify the protocol they support (e.g. "druby:" for
# the standard Ruby protocol). This is how the DRbProtocol module,
# given a URI, determines which protocol implementation serves that
@@ -675,14 +675,14 @@ module DRb
#
# The protocol instance returned by #open must have the following methods:
#
- # [send_request (ref, msg_id, arg, b)]
+ # [send_request (ref, msg_id, arg, b)]
# Send a request to +ref+ with the given message id and arguments.
# This is most easily implemented by calling DRbMessage.send_request,
# providing a stream that sits on top of the current protocol.
# [recv_reply]
# Receive a reply from the server and return it as a [success-boolean,
# reply-value] pair. This is most easily implemented by calling
- # DRb.recv_reply, providing a stream that sits on top of the
+ # DRb.recv_reply, providing a stream that sits on top of the
# current protocol.
# [alive?]
# Is this connection still alive?
@@ -725,7 +725,7 @@ module DRb
# URI by raising a DRbBadScheme error. If no protocol recognises the
# URI, then a DRbBadURI error is raised. If a protocol accepts the
# URI, but an error occurs in opening it, a DRbConnError is raised.
- def open(uri, config, first=true)
+ def open(uri, config, first=true)
@protocol.each do |prot|
begin
return prot.open(uri, config)
@@ -744,14 +744,14 @@ module DRb
end
module_function :open
- # Open a server listening for connections at +uri+ with
+ # Open a server listening for connections at +uri+ with
# configuration +config+.
#
# The DRbProtocol module asks each registered protocol in turn to
- # try to open a server at the URI. Each protocol signals that it does
- # not handle that URI by raising a DRbBadScheme error. If no protocol
- # recognises the URI, then a DRbBadURI error is raised. If a protocol
- # accepts the URI, but an error occurs in opening it, the underlying
+ # try to open a server at the URI. Each protocol signals that it does
+ # not handle that URI by raising a DRbBadScheme error. If no protocol
+ # recognises the URI, then a DRbBadURI error is raised. If a protocol
+ # accepts the URI, but an error occurs in opening it, the underlying
# error is passed on to the caller.
def open_server(uri, config, first=true)
@protocol.each do |prot|
@@ -773,7 +773,7 @@ module DRb
# The DRbProtocol module asks each registered protocol in turn to
# try to parse the URI. Each protocol signals that it does not handle that
# URI by raising a DRbBadScheme error. If no protocol recognises the
- # URI, then a DRbBadURI error is raised.
+ # URI, then a DRbBadURI error is raised.
def uri_option(uri, config, first=true)
@protocol.each do |prot|
begin
@@ -837,18 +837,23 @@ module DRb
end
def self.open_server_inaddr_any(host, port)
- infos = Socket::getaddrinfo(host, nil,
+ infos = Socket::getaddrinfo(host, nil,
Socket::AF_UNSPEC,
- Socket::SOCK_STREAM,
+ Socket::SOCK_STREAM,
0,
Socket::AI_PASSIVE)
- families = Hash[*infos.collect { |af, *_| af }.uniq.zip([]).flatten]
- return TCPServer.open('0.0.0.0', port) if families.has_key?('AF_INET')
- return TCPServer.open('::', port) if families.has_key?('AF_INET6')
- return TCPServer.open(port)
+ family = infos.collect { |af, *_| af }.uniq
+ case family
+ when ['AF_INET']
+ return TCPServer.open('0.0.0.0', port)
+ when ['AF_INET6']
+ return TCPServer.open('::', port)
+ else
+ return TCPServer.open(port)
+ end
end
- # Open a server listening for connections at +uri+ using
+ # Open a server listening for connections at +uri+ using
# configuration +config+.
def self.open_server(uri, config)
uri = 'druby://:0' unless uri
@@ -894,7 +899,7 @@ module DRb
def peeraddr
@socket.peeraddr
end
-
+
# Get the socket.
def stream; @socket; end
@@ -902,7 +907,7 @@ module DRb
def send_request(ref, msg_id, arg, b)
@msg.send_request(stream, ref, msg_id, arg, b)
end
-
+
# On the server side, receive a request from the client.
def recv_request
@msg.recv_request(stream)
@@ -932,14 +937,14 @@ module DRb
@socket = nil
end
end
-
- # On the server side, for an instance returned by #open_server,
+
+ # On the server side, for an instance returned by #open_server,
# accept a client connection and return a new instance to handle
# the server's side of this client-server session.
def accept
while true
s = @socket.accept
- break if (@acl ? @acl.allow_socket?(s) : true)
+ break if (@acl ? @acl.allow_socket?(s) : true)
s.close
end
if @config[:tcp_original_host].to_s.size == 0
@@ -976,16 +981,16 @@ module DRb
end
attr :option
def to_s; @option; end
-
+
def ==(other)
return false unless DRbURIOption === other
@option == other.option
end
-
+
def hash
@option.hash
end
-
+
alias eql? ==
end
@@ -1002,7 +1007,7 @@ module DRb
# created to act as a stub for the remote referenced object.
def self._load(s)
uri, ref = Marshal.load(s)
-
+
if DRb.here?(uri)
obj = DRb.to_obj(ref)
if ((! obj.tainted?) && Thread.current[:drb_untaint])
@@ -1052,7 +1057,7 @@ module DRb
end
# Get the URI of the remote object.
- def __drburi
+ def __drburi
@uri
end
@@ -1080,7 +1085,7 @@ module DRb
if DRb.here?(@uri)
obj = DRb.to_obj(@ref)
DRb.current_server.check_insecure_method(obj, msg_id)
- return obj.__send__(msg_id, *a, &b)
+ return obj.__send__(msg_id, *a, &b)
end
succ, result = self.class.with_friend(@uri) do
@@ -1103,7 +1108,7 @@ module DRb
def self.with_friend(uri)
friend = DRb.fetch_server(uri)
return yield() unless friend
-
+
save = Thread.current['DRb']
Thread.current['DRb'] = { 'server' => friend }
return yield
@@ -1115,7 +1120,7 @@ module DRb
prefix = "(#{uri}) "
bt = []
result.backtrace.each do |x|
- break if /`__send__'$/ =~ x
+ break if /`__send__'$/ =~ x
if /^\(druby:\/\// =~ x
bt.push(x)
else
@@ -1203,7 +1208,6 @@ module DRb
end
def alive? # :nodoc:
- return false unless @protocol
@protocol.alive?
end
end
@@ -1266,14 +1270,14 @@ module DRb
def self.verbose=(on)
@@verbose = on
end
-
+
# Get the default value of the :verbose option.
def self.verbose
@@verbose
end
def self.make_config(hash={}) # :nodoc:
- default_config = {
+ default_config = {
:idconv => @@idconv,
:verbose => @@verbose,
:tcp_acl => @@acl,
@@ -1363,7 +1367,7 @@ module DRb
attr_reader :thread
# The front object of the DRbServer.
- #
+ #
# This object receives remote method calls made on the server's
# URI alone, with an object id.
attr_reader :front
@@ -1456,7 +1460,7 @@ module DRb
def any_to_s(obj)
obj.to_s + ":#{obj.class}"
rescue
- sprintf("#<%s:0x%lx>", obj.class, obj.__id__)
+ sprintf("#<%s:0x%lx>", obj.class, obj.__id__)
end
# Check that a method is callable via dRuby.
@@ -1464,18 +1468,18 @@ module DRb
# +obj+ is the object we want to invoke the method on. +msg_id+ is the
# method name, as a Symbol.
#
- # If the method is an insecure method (see #insecure_method?) a
+ # If the method is an insecure method (see #insecure_method?) a
# SecurityError is thrown. If the method is private or undefined,
# a NameError is thrown.
def check_insecure_method(obj, msg_id)
return true if Proc === obj && msg_id == :__drb_yield
raise(ArgumentError, "#{any_to_s(msg_id)} is not a symbol") unless Symbol == msg_id.class
raise(SecurityError, "insecure method `#{msg_id}'") if insecure_method?(msg_id)
-
- if obj.private_methods.include?(msg_id)
+
+ if obj.private_methods.include?(msg_id.to_s)
desc = any_to_s(obj)
raise NoMethodError, "private method `#{msg_id}' called for #{desc}"
- elsif obj.protected_methods.include?(msg_id)
+ elsif obj.protected_methods.include?(msg_id.to_s)
desc = any_to_s(obj)
raise NoMethodError, "protected method `#{msg_id}' called for #{desc}"
else
@@ -1483,7 +1487,7 @@ module DRb
end
end
public :check_insecure_method
-
+
class InvokeMethod # :nodoc:
def initialize(drb_server, client)
@drb_server = drb_server
@@ -1505,7 +1509,7 @@ module DRb
perform_with_block
}.value
else
- @result = Thread.new {
+ @result = Thread.new {
Thread.current['DRb'] = info
$SAFE = @safe_level
perform_without_block
@@ -1520,7 +1524,7 @@ module DRb
end
@succ = true
if @msg_id == :to_ary && @result.class == Array
- @result = DRbArray.new(@result)
+ @result = DRbArray.new(@result)
end
return @succ, @result
rescue StandardError, ScriptError, Interrupt
@@ -1536,7 +1540,7 @@ module DRb
@argv = argv
@block = block
end
-
+
def check_insecure_method
@drb_server.check_insecure_method(@obj, @msg_id)
end
@@ -1545,7 +1549,7 @@ module DRb
init_with_client
check_insecure_method
end
-
+
def perform_without_block
if Proc === @obj && @msg_id == :__drb_yield
if @argv.size == 1
@@ -1633,7 +1637,7 @@ module DRb
# The primary local dRuby server.
#
- # This is the server created by the #start_service call.
+ # This is the server created by the #start_service call.
attr_accessor :primary_server
module_function :primary_server=, :primary_server
@@ -1648,8 +1652,8 @@ module DRb
# If the above rule fails to find a server, a DRbServerNotFound
# error is raised.
def current_server
- drb = Thread.current['DRb']
- server = (drb && drb['server']) ? drb['server'] : @primary_server
+ drb = Thread.current['DRb']
+ server = (drb && drb['server']) ? drb['server'] : @primary_server
raise DRbServerNotFound unless server
return server
end
@@ -1695,7 +1699,7 @@ module DRb
DRbServer.make_config
end
module_function :config
-
+
# Get the front object of the current server.
#
# This raises a DRbServerNotFound error if there is no current server.
@@ -1766,7 +1770,7 @@ module DRb
@server.delete(server.uri)
end
module_function :remove_server
-
+
def fetch_server(uri)
@server[uri]
end
diff --git a/lib/drb/extserv.rb b/lib/drb/extserv.rb
index 5996626492..7da8130c2b 100644
--- a/lib/drb/extserv.rb
+++ b/lib/drb/extserv.rb
@@ -1,24 +1,19 @@
=begin
external service
- Copyright (c) 2000,2002 Masatoshi SEKI
+ Copyright (c) 2000,2002 Masatoshi SEKI
=end
require 'drb/drb'
-require 'monitor'
module DRb
class ExtServ
- include MonitorMixin
include DRbUndumped
def initialize(there, name, server=nil)
- super()
@server = server || DRb::primary_server
@name = name
ro = DRbObject.new(nil, there)
- synchronize do
- @invoker = ro.regist(name, DRbObject.new(self, @server.uri))
- end
+ @invoker = ro.regist(name, DRbObject.new(self, @server.uri))
end
attr_reader :server
@@ -27,13 +22,11 @@ module DRb
end
def stop_service
- synchronize do
- @invoker.unregist(@name)
- server = @server
- @server = nil
- server.stop_service
- true
- end
+ @invoker.unregist(@name)
+ server = @server
+ @server = nil
+ server.stop_service
+ true
end
def alive?
diff --git a/lib/drb/extservm.rb b/lib/drb/extservm.rb
index 5937cb0c50..be40aea9f5 100644
--- a/lib/drb/extservm.rb
+++ b/lib/drb/extservm.rb
@@ -1,6 +1,6 @@
=begin
external service manager
- Copyright (c) 2000 Masatoshi SEKI
+ Copyright (c) 2000 Masatoshi SEKI
=end
require 'drb/drb'
@@ -21,7 +21,7 @@ module DRb
def self.command=(cmd)
@@command = cmd
end
-
+
def initialize
super()
@cond = new_cond
@@ -51,7 +51,7 @@ module DRb
end
self
end
-
+
def unregist(name)
synchronize do
@servers.delete(name)
@@ -79,7 +79,11 @@ module DRb
@servers[name] = false
end
uri = @uri || DRb.uri
- Process.detach spawn("#{command} #{uri} #{name}")
+ if RUBY_PLATFORM =~ /mswin32/ && /NT/ =~ ENV["OS"]
+ system(%Q'cmd /c start "ruby" /b #{command} #{uri} #{name}')
+ else
+ system("#{command} #{uri} #{name} &")
+ end
end
end
end
diff --git a/lib/drb/invokemethod.rb b/lib/drb/invokemethod.rb
index 220d0ad68d..412b2ab9b5 100644
--- a/lib/drb/invokemethod.rb
+++ b/lib/drb/invokemethod.rb
@@ -9,7 +9,7 @@ module DRb
end
block_value = @block.call(*x)
end
-
+
def perform_with_block
@obj.__send__(@msg_id, *@argv) do |*x|
jump_error = nil
@@ -20,6 +20,8 @@ module DRb
end
if jump_error
case jump_error.reason
+ when :retry
+ retry
when :break
break(jump_error.exit_value)
else
diff --git a/lib/drb/observer.rb b/lib/drb/observer.rb
index 149426db7b..e7f1668c52 100644
--- a/lib/drb/observer.rb
+++ b/lib/drb/observer.rb
@@ -6,16 +6,16 @@ module DRb
def notify_observers(*arg)
if defined? @observer_state and @observer_state
- if defined? @observer_peers
- @observer_peers.each do |observer, method|
- begin
- observer.send(method, *arg)
- rescue
- delete_observer(observer)
- end
- end
- end
- @observer_state = false
+ if defined? @observer_peers
+ for i in @observer_peers.dup
+ begin
+ i.update(*arg)
+ rescue
+ delete_observer(i)
+ end
+ end
+ end
+ @observer_state = false
end
end
end
diff --git a/lib/drb/ssl.rb b/lib/drb/ssl.rb
index 08f97f4bc6..58d6b7d1e0 100644
--- a/lib/drb/ssl.rb
+++ b/lib/drb/ssl.rb
@@ -15,7 +15,7 @@ module DRb
:SSLClientCA => nil,
:SSLCACertificatePath => nil,
:SSLCACertificateFile => nil,
- :SSLVerifyMode => ::OpenSSL::SSL::VERIFY_NONE,
+ :SSLVerifyMode => ::OpenSSL::SSL::VERIFY_NONE,
:SSLVerifyDepth => nil,
:SSLVerifyCallback => nil, # custom verification
:SSLCertificateStore => nil,
@@ -31,7 +31,7 @@ module DRb
@ssl_ctx = nil
end
- def [](key);
+ def [](key);
@config[key] || DEFAULT[key]
end
@@ -41,14 +41,14 @@ module DRb
ssl.connect
ssl
end
-
+
def accept(tcp)
ssl = OpenSSL::SSL::SSLSocket.new(tcp, @ssl_ctx)
ssl.sync = true
ssl.accept
ssl
end
-
+
def setup_certificate
if @cert && @pkey
return
@@ -77,7 +77,7 @@ module DRb
cert.not_before = Time.now
cert.not_after = Time.now + (365*24*60*60)
cert.public_key = rsa.public_key
-
+
ef = OpenSSL::X509::ExtensionFactory.new(nil,cert)
cert.extensions = [
ef.create_extension("basicConstraints","CA:FALSE"),
@@ -89,7 +89,7 @@ module DRb
cert.add_extension(ef.create_extension("nsComment", comment))
end
cert.sign(rsa, OpenSSL::Digest::SHA1.new)
-
+
@cert = cert
@pkey = rsa
end
@@ -143,7 +143,7 @@ module DRb
end
port = soc.addr[1] if port == 0
@uri = "drbssl://#{host}:#{port}"
-
+
ssl_conf = SSLConfig.new(config)
ssl_conf.setup_certificate
ssl_conf.setup_ssl_context
@@ -159,7 +159,7 @@ module DRb
@ssl = is_established ? soc : nil
super(uri, soc.to_io, config)
end
-
+
def stream; @ssl; end
def close
@@ -169,12 +169,12 @@ module DRb
end
super
end
-
+
def accept
begin
while true
soc = @socket.accept
- break if (@acl ? @acl.allow_socket?(soc) : true)
+ break if (@acl ? @acl.allow_socket?(soc) : true)
soc.close
end
ssl = @config.accept(soc)
@@ -185,6 +185,6 @@ module DRb
end
end
end
-
+
DRbProtocol.add_protocol(DRbSSLSocket)
end
diff --git a/lib/drb/timeridconv.rb b/lib/drb/timeridconv.rb
index 6d8935b1ef..bb2c48d528 100644
--- a/lib/drb/timeridconv.rb
+++ b/lib/drb/timeridconv.rb
@@ -19,7 +19,7 @@ module DRb
end
def add(obj)
- synchronize do
+ synchronize do
key = obj.__id__
@curr[key] = obj
return key
@@ -27,7 +27,7 @@ module DRb
end
def fetch(key, dv=@sentinel)
- synchronize do
+ synchronize do
obj = peek(key)
if obj == @sentinel
return dv unless dv == @sentinel
@@ -39,7 +39,7 @@ module DRb
end
def include?(key)
- synchronize do
+ synchronize do
obj = peek(key)
return false if obj == @sentinel
true
@@ -47,7 +47,7 @@ module DRb
end
def peek(key)
- synchronize do
+ synchronize do
return @curr.fetch(key, @renew.fetch(key, @gc.fetch(key, @sentinel)))
end
end
diff --git a/lib/drb/unix.rb b/lib/drb/unix.rb
index ebecc22901..57feed8301 100644
--- a/lib/drb/unix.rb
+++ b/lib/drb/unix.rb
@@ -8,7 +8,7 @@ module DRb
class DRbUNIXSocket < DRbTCPSocket
def self.parse_uri(uri)
- if /^drbunix:(.*?)(\?(.*))?$/ =~ uri
+ if /^drbunix:(.*?)(\?(.*))?$/ =~ uri
filename = $1
option = $3
[filename, option]
@@ -59,7 +59,7 @@ module DRb
@server_mode = server_mode
@acl = nil
end
-
+
# import from tempfile.rb
Max_try = 10
private
diff --git a/lib/e2mmap.rb b/lib/e2mmap.rb
index ac2fb2dd49..3e2604af5d 100644
--- a/lib/e2mmap.rb
+++ b/lib/e2mmap.rb
@@ -2,6 +2,7 @@
# e2mmap.rb - for ruby 1.1
# $Release Version: 2.0$
# $Revision: 1.10 $
+# $Date: 1999/02/17 12:33:17 $
# by Keiju ISHITSUKA
#
# --
@@ -47,6 +48,8 @@
# Foo.Fail ExistingExceptionClass, arg...
#
#
+fail "Use Ruby 1.1" if VERSION < "1.1"
+
module Exception2MessageMapper
@RCS_ID='-$Id: e2mmap.rb,v 1.10 1999/02/17 12:33:17 keiju Exp keiju $-'
@@ -54,7 +57,13 @@ module Exception2MessageMapper
def E2MM.extend_object(cl)
super
- cl.bind(self) unless cl < E2MM
+ cl.bind(self) unless cl == E2MM
+ end
+
+ # backward compatibility
+ def E2MM.extend_to(b)
+ c = eval("self", b)
+ c.extend(self)
end
def bind(cl)
@@ -78,8 +87,21 @@ module Exception2MessageMapper
E2MM.Raise(self, err, *rest)
end
alias Fail Raise
- alias fail Raise
+ # backward compatibility
+ alias fail! fail
+ def fail(err = nil, *rest)
+ begin
+ E2MM.Fail(self, err, *rest)
+ rescue E2MM::ErrNotRegisteredException
+ super
+ end
+ end
+ class << self
+ public :fail
+ end
+
+
# def_e2message(c, m)
# c: exception
# m: message_form
@@ -88,7 +110,7 @@ module Exception2MessageMapper
def def_e2message(c, m)
E2MM.def_e2message(self, c, m)
end
-
+
# def_exception(n, m, s)
# n: exception_name
# m: message_form
@@ -105,7 +127,7 @@ module Exception2MessageMapper
# {[class, exp] => message, ...}
@MessageMap = {}
- # E2MM.def_e2message(k, e, m)
+ # E2MM.def_exception(k, e, m)
# k: class to define exception under.
# e: exception
# m: message_form
@@ -115,7 +137,7 @@ module Exception2MessageMapper
E2MM.instance_eval{@MessageMap[[k, c]] = m}
c
end
-
+
# E2MM.def_exception(k, n, m, s)
# k: class to define exception under.
# n: exception_name
@@ -137,11 +159,12 @@ module Exception2MessageMapper
#
def E2MM.Raise(klass = E2MM, err = nil, *rest)
if form = e2mm_message(klass, err)
- b = $@.nil? ? caller(1) : $@
+ $! = err.new(sprintf(form, *rest))
+ $@ = caller(1) if $@.nil?
#p $@
#p __FILE__
- b.shift if b[0] =~ /^#{Regexp.quote(__FILE__)}:/
- raise err, sprintf(form, *rest), b
+ $@.shift if $@[0] =~ /^#{Regexp.quote(__FILE__)}:/
+ raise
else
E2MM.Fail E2MM, ErrNotRegisteredException, err.inspect
end
@@ -164,8 +187,8 @@ module Exception2MessageMapper
alias message e2mm_message
end
- E2MM.def_exception(E2MM,
- :ErrNotRegisteredException,
+ E2MM.def_exception(E2MM,
+ :ErrNotRegisteredException,
"not registerd exception(%s)")
end
diff --git a/lib/erb.rb b/lib/erb.rb
index 5e9feb9ba5..2ae5a1ab4a 100644
--- a/lib/erb.rb
+++ b/lib/erb.rb
@@ -20,7 +20,7 @@
# purposes of generating document information details and/or flow control.
#
# A very simple example is this:
-#
+#
# require 'erb'
#
# x = 42
@@ -58,24 +58,6 @@
#
# See the ERB.new and ERB#result methods for more detail.
#
-# == Character encodings
-#
-# ERB (or ruby code generated by ERB) returns a string in the same
-# character encoding as the input string. When the input string has
-# a magic comment, however, it returns a string in the encoding specified
-# by the magic comment.
-#
-# # -*- coding: UTF-8 -*-
-# require 'erb'
-#
-# template = ERB.new <<EOF
-# <%#-*- coding: Big5 -*-%>
-# \_\_ENCODING\_\_ is <%= \_\_ENCODING\_\_ %>.
-# EOF
-# puts template.result
-#
-# <em>Prints:</em> \_\_ENCODING\_\_ is Big5.
-#
#
# == Examples
#
@@ -86,39 +68,39 @@
# <tt>%q{...}</tt> to avoid trouble with the backslash.
#
# require "erb"
-#
+#
# # Create template.
# template = %q{
# From: James Edward Gray II <james@grayproductions.net>
# To: <%= to %>
# Subject: Addressing Needs
-#
+#
# <%= to[/\w+/] %>:
-#
+#
# Just wanted to send a quick note assuring that your needs are being
# addressed.
-#
+#
# I want you to know that my team will keep working on the issues,
# especially:
-#
+#
# <%# ignore numerous minor requests -- focus on priorities %>
# % priorities.each do |priority|
# * <%= priority %>
# % end
-#
+#
# Thanks for your patience.
-#
+#
# James Edward Gray II
# }.gsub(/^ /, '')
-#
+#
# message = ERB.new(template, 0, "%<>")
-#
+#
# # Set up template data.
# to = "Community Spokesman <spokesman@ruby_community.org>"
# priorities = [ "Run Ruby Quiz",
# "Document Modules",
# "Answer Questions on Ruby Talk" ]
-#
+#
# # Produce result.
# email = message.result
# puts email
@@ -128,19 +110,19 @@
# From: James Edward Gray II <james@grayproductions.net>
# To: Community Spokesman <spokesman@ruby_community.org>
# Subject: Addressing Needs
-#
+#
# Community:
-#
+#
# Just wanted to send a quick note assuring that your needs are being addressed.
-#
+#
# I want you to know that my team will keep working on the issues, especially:
-#
+#
# * Run Ruby Quiz
# * Document Modules
# * Answer Questions on Ruby Talk
-#
+#
# Thanks for your patience.
-#
+#
# James Edward Gray II
#
# === Ruby in HTML
@@ -150,7 +132,7 @@
# variables in the Product object can be resolved.
#
# require "erb"
-#
+#
# # Build template data class.
# class Product
# def initialize( code, name, desc, cost )
@@ -158,37 +140,37 @@
# @name = name
# @desc = desc
# @cost = cost
-#
+#
# @features = [ ]
# end
-#
+#
# def add_feature( feature )
# @features << feature
# end
-#
+#
# # Support templating of member data.
# def get_binding
# binding
# end
-#
+#
# # ...
# end
-#
+#
# # Create template.
# template = %{
# <html>
# <head><title>Ruby Toys -- <%= @name %></title></head>
# <body>
-#
+#
# <h1><%= @name %> (<%= @code %>)</h1>
# <p><%= @desc %></p>
-#
+#
# <ul>
# <% @features.each do |f| %>
# <li><b><%= f %></b></li>
# <% end %>
# </ul>
-#
+#
# <p>
# <% if @cost < 10 %>
# <b>Only <%= @cost %>!!!</b>
@@ -196,13 +178,13 @@
# Call for a price, today!
# <% end %>
# </p>
-#
+#
# </body>
# </html>
# }.gsub(/^ /, '')
-#
+#
# rhtml = ERB.new(template)
-#
+#
# # Set up template data.
# toy = Product.new( "TZ-1002",
# "Rubysapien",
@@ -213,7 +195,7 @@
# toy.add_feature("Karate-Chop Action!!!")
# toy.add_feature("Matz signature on left leg.")
# toy.add_feature("Gem studded eyes... Rubies, of course!")
-#
+#
# # Produce result.
# rhtml.run(toy.get_binding)
#
@@ -222,10 +204,10 @@
# <html>
# <head><title>Ruby Toys -- Rubysapien</title></head>
# <body>
-#
+#
# <h1>Rubysapien (TZ-1002)</h1>
# <p>Geek's Best Friend! Responds to Ruby commands...</p>
-#
+#
# <ul>
# <li><b>Listens for verbal commands in the Ruby language!</b></li>
# <li><b>Ignores Perl, Java, and all C variants.</b></li>
@@ -233,15 +215,15 @@
# <li><b>Matz signature on left leg.</b></li>
# <li><b>Gem studded eyes... Rubies, of course!</b></li>
# </ul>
-#
+#
# <p>
# Call for a price, today!
# </p>
-#
+#
# </body>
# </html>
#
-#
+#
# == Notes
#
# There are a variety of templating solutions available in various Ruby projects:
@@ -254,7 +236,7 @@
# Rails, the web application framework, uses ERB to create views.
#
class ERB
- Revision = '$Date:: $' #'
+ Revision = '$Date$' #'
# Returns revision information for the erb.rb module.
def self.version
@@ -318,11 +300,11 @@ class ERB
end
end
attr_accessor :stag
-
+
def scan(&block)
@stag = nil
if @percent
- @src.each_line do |line|
+ @src.each do |line|
percent_line(line, &block)
end
else
@@ -425,7 +407,7 @@ class ERB
end
end
end
-
+
Scanner.regist_scanner(SimpleScanner, nil, false)
begin
@@ -444,6 +426,27 @@ class ERB
end
Scanner.regist_scanner(SimpleScanner2, nil, false)
+ class PercentScanner < Scanner # :nodoc:
+ def scan
+ stag_reg = /(.*?)(^%%|^%|<%%|<%=|<%#|<%|\z)/m
+ etag_reg = /(.*?)(%%>|%>|\z)/m
+ scanner = StringScanner.new(@src)
+ while ! scanner.eos?
+ scanner.scan(@stag ? etag_reg : stag_reg)
+ yield(scanner[1])
+
+ elem = scanner[2]
+ if elem == '%%'
+ elem = '%'
+ elsif elem == '%'
+ elem = PercentLine.new(scanner.scan(/.*?(\n|\z)/).chomp)
+ end
+ yield(elem)
+ end
+ end
+ end
+ Scanner.regist_scanner(PercentScanner, nil, true)
+
class ExplicitScanner < Scanner # :nodoc:
def scan
stag_reg = /(.*?)(^[ \t]*<%-|<%%|<%=|<%#|<%-|<%|\z)/m
@@ -471,10 +474,10 @@ class ERB
end
class Buffer # :nodoc:
- def initialize(compiler, enc=nil)
+ def initialize(compiler)
@compiler = compiler
@line = []
- @script = enc ? "#coding:#{enc.to_s}\n" : ""
+ @script = ""
@compiler.pre_cmd.each do |x|
push(x)
end
@@ -484,13 +487,13 @@ class ERB
def push(cmd)
@line << cmd
end
-
+
def cr
@script << (@line.join('; '))
@line = []
@script << "\n"
end
-
+
def close
return unless @line
@compiler.post_cmd.each do |x|
@@ -511,16 +514,12 @@ class ERB
end
def compile(s)
- enc = s.encoding
- raise ArgumentError, "#{enc} is not ASCII compatible" if enc.dummy?
- s = s.dup.force_encoding("ASCII-8BIT") # don't use constant Enoding::ASCII_8BIT for miniruby
- enc = detect_magic_comment(s) || enc
- out = Buffer.new(self, enc)
+ out = Buffer.new(self)
content = ''
scanner = make_scanner(s)
scanner.scan do |token|
- next if token.nil?
+ next if token.nil?
next if token == ''
if scanner.stag.nil?
case token
@@ -572,7 +571,7 @@ class ERB
end
out.push("#{@put_cmd} #{content_dump(content)}") if content.size > 0
out.close
- return out.script, enc
+ out.script
end
def prepare_trim_mode(mode)
@@ -612,18 +611,6 @@ class ERB
end
attr_reader :percent, :trim_mode
attr_accessor :put_cmd, :insert_cmd, :pre_cmd, :post_cmd
-
- private
- def detect_magic_comment(s)
- if /\A<%#(.*)%>/ =~ s or (@percent and /\A%#(.*)/ =~ s)
- comment = $1
- comment = $1 if comment[/-\*-\s*(.*?)\s*-*-$/]
- if %r"coding\s*[=:]\s*([[:alnum:]\-_]+)" =~ comment
- enc = $1.sub(/-(?:mac|dos|unix)/i, '')
- enc = Encoding.find(enc)
- end
- end
- end
end
end
@@ -632,19 +619,19 @@ end
class ERB
#
# Constructs a new ERB object with the template specified in _str_.
- #
+ #
# An ERB object works by building a chunk of Ruby code that will output
# the completed template when run. If _safe_level_ is set to a non-nil value,
# ERB code will be run in a separate thread with <b>$SAFE</b> set to the
# provided level.
- #
+ #
# If _trim_mode_ is passed a String containing one or more of the following
# modifiers, ERB will adjust its code generation as listed:
- #
+ #
# % enables Ruby code processing for lines beginning with %
# <> omit newline for lines starting with <% and ending in %>
# > omit newline for lines ending in %>
- #
+ #
# _eoutvar_ can be used to set the name of the variable ERB will build up
# its output in. This is useful when you need to run multiple ERB
# templates through the same binding and/or when you want to control where
@@ -653,20 +640,20 @@ class ERB
# === Example
#
# require "erb"
- #
+ #
# # build data class
# class Listings
# PRODUCT = { :name => "Chicken Fried Steak",
# :desc => "A well messages pattie, breaded and fried.",
# :cost => 9.95 }
- #
+ #
# attr_reader :product, :price
- #
+ #
# def initialize( product = "", price = "" )
# @product = product
# @price = price
# end
- #
+ #
# def build
# b = binding
# # create and run templates, filling member data variables
@@ -680,26 +667,26 @@ class ERB
# END_PRICE
# end
# end
- #
+ #
# # setup template data
# listings = Listings.new
# listings.build
- #
+ #
# puts listings.product + "\n" + listings.price
#
# _Generates_
#
# Chicken Fried Steak
# A well messages pattie, breaded and fried.
- #
+ #
# Chicken Fried Steak -- 9.95
# A well messages pattie, breaded and fried.
- #
+ #
def initialize(str, safe_level=nil, trim_mode=nil, eoutvar='_erbout')
@safe_level = safe_level
compiler = ERB::Compiler.new(trim_mode)
set_eoutvar(compiler, eoutvar)
- @src, @enc = *compiler.compile(str)
+ @src = compiler.compile(str)
@filename = nil
end
@@ -721,11 +708,11 @@ class ERB
cmd = []
cmd.push "#{eoutvar} = ''"
-
+
compiler.pre_cmd = cmd
cmd = []
- cmd.push("#{eoutvar}.force_encoding(__ENCODING__)")
+ cmd.push(eoutvar)
compiler.post_cmd = cmd
end
@@ -739,18 +726,18 @@ class ERB
# Executes the generated ERB code to produce a completed template, returning
# the results of that code. (See ERB#new for details on how this process can
# be affected by _safe_level_.)
- #
+ #
# _b_ accepts a Binding or Proc object which is used to set the context of
# code evaluation.
#
def result(b=TOPLEVEL_BINDING)
if @safe_level
- proc {
+ proc {
$SAFE = @safe_level
- eval(@src, b, (@filename || '(erb)'), 0)
+ eval(@src, b, (@filename || '(erb)'), 1)
}.call
else
- eval(@src, b, (@filename || '(erb)'), 0)
+ eval(@src, b, (@filename || '(erb)'), 1)
end
end
@@ -762,11 +749,7 @@ class ERB
# erb.def_method(MyClass, 'render(arg1, arg2)', filename)
# print MyClass.new.render('foo', 123)
def def_method(mod, methodname, fname='(ERB)')
- src = self.src
- magic_comment = "#coding:#{@enc}\n"
- mod.module_eval do
- eval(magic_comment + "def #{methodname}\n" + src + "\nend\n", binding, fname, -2)
- end
+ mod.module_eval("def #{methodname}\n" + self.src + "\nend\n", fname, 0)
end
# Create unnamed module, define _methodname_ as instance method of it, and return it.
@@ -813,14 +796,14 @@ class ERB
public
#
# A utility method for escaping HTML tag characters in _s_.
- #
+ #
# require "erb"
# include ERB::Util
- #
+ #
# puts html_escape("is a > 0 & a < 10?")
- #
+ #
# _Generates_
- #
+ #
# is a &gt; 0 &amp; a &lt; 10?
#
def html_escape(s)
@@ -829,23 +812,21 @@ class ERB
alias h html_escape
module_function :h
module_function :html_escape
-
+
#
# A utility method for encoding the String _s_ as a URL.
- #
+ #
# require "erb"
# include ERB::Util
- #
+ #
# puts url_encode("Programming Ruby: The Pragmatic Programmer's Guide")
- #
+ #
# _Generates_
- #
+ #
# Programming%20Ruby%3A%20%20The%20Pragmatic%20Programmer%27s%20Guide
#
def url_encode(s)
- s.to_s.dup.force_encoding("ASCII-8BIT").gsub(/[^a-zA-Z0-9_\-.]/n) {
- sprintf("%%%02X", $&.unpack("C")[0])
- }
+ s.to_s.gsub(/[^a-zA-Z0-9_\-.]/n){ sprintf("%%%02X", $&.unpack("C")[0]) }
end
alias u url_encode
module_function :u
diff --git a/lib/eregex.rb b/lib/eregex.rb
new file mode 100644
index 0000000000..cc7a7f6f46
--- /dev/null
+++ b/lib/eregex.rb
@@ -0,0 +1,37 @@
+# this is just a proof of concept toy.
+
+class RegOr
+ def initialize(re1, re2)
+ @re1 = re1
+ @re2 = re2
+ end
+
+ def =~ (str)
+ @re1 =~ str or @re2 =~ str
+ end
+end
+
+class RegAnd
+ def initialize(re1, re2)
+ @re1 = re1
+ @re2 = re2
+ end
+
+ def =~ (str)
+ @re1 =~ str and @re2 =~ str
+ end
+end
+
+class Regexp
+ def |(other)
+ RegOr.new(self, other)
+ end
+ def &(other)
+ RegAnd.new(self, other)
+ end
+end
+
+if __FILE__ == $0
+ p "abc" =~ /b/|/c/
+ p "abc" =~ /b/&/c/
+end
diff --git a/lib/fileutils.rb b/lib/fileutils.rb
index 2a6b248585..3fdb6cbfe6 100644
--- a/lib/fileutils.rb
+++ b/lib/fileutils.rb
@@ -1,17 +1,17 @@
-#
+#
# = fileutils.rb
-#
-# Copyright (c) 2000-2007 Minero Aoki
-#
+#
+# Copyright (c) 2000-2006 Minero Aoki
+#
# This program is free software.
# You can distribute/modify this program under the same terms of ruby.
-#
+#
# == module FileUtils
-#
+#
# Namespace for several file utility methods for copying, moving, removing, etc.
-#
+#
# === Module Functions
-#
+#
# cd(dir, options)
# cd(dir, options) {|dir| .... }
# pwd()
@@ -64,23 +64,23 @@
# uptodate?(file, cmp_list)
#
# == module FileUtils::Verbose
-#
+#
# This module has all methods of FileUtils module, but it outputs messages
# before acting. This equates to passing the <tt>:verbose</tt> flag to methods
# in FileUtils.
-#
+#
# == module FileUtils::NoWrite
-#
+#
# This module has all methods of FileUtils module, but never changes
# files/directories. This equates to passing the <tt>:noop</tt> flag to methods
# in FileUtils.
-#
+#
# == module FileUtils::DryRun
-#
+#
# This module has all methods of FileUtils module, but never changes
# files/directories. This equates to passing the <tt>:noop</tt> and
# <tt>:verbose</tt> flags to methods in FileUtils.
-#
+#
module FileUtils
@@ -107,14 +107,14 @@ module FileUtils
#
# Options: verbose
- #
+ #
# Changes the current directory to the directory +dir+.
- #
+ #
# If this method is called with block, resumes to the old
# working directory after the block execution finished.
- #
+ #
# FileUtils.cd('/', :verbose => true) # chdir and report it
- #
+ #
def cd(dir, options = {}, &block) # :yield: dir
fu_check_options options, OPT_TABLE['cd']
fu_output_message "cd #{dir}" if options[:verbose]
@@ -131,13 +131,13 @@ module FileUtils
#
# Options: (none)
- #
+ #
# Returns true if +newer+ is newer than all +old_list+.
# Non-existent files are older than any file.
- #
+ #
# FileUtils.uptodate?('hello.o', %w(hello.c hello.h)) or \
# system 'make hello.o'
- #
+ #
def uptodate?(new, old_list, options = nil)
raise ArgumentError, 'uptodate? does not accept any option' if options
@@ -154,14 +154,14 @@ module FileUtils
#
# Options: mode noop verbose
- #
+ #
# Creates one or more directories.
- #
+ #
# FileUtils.mkdir 'test'
# FileUtils.mkdir %w( tmp data )
# FileUtils.mkdir 'notexist', :noop => true # Does not really create.
# FileUtils.mkdir 'tmp', :mode => 0700
- #
+ #
def mkdir(list, options = {})
fu_check_options options, OPT_TABLE['mkdir']
list = fu_list(list)
@@ -178,12 +178,12 @@ module FileUtils
#
# Options: mode noop verbose
- #
+ #
# Creates a directory and all its parent directories.
# For example,
- #
+ #
# FileUtils.mkdir_p '/usr/local/lib/ruby'
- #
+ #
# causes to make following directories, if it does not exist.
# * /usr
# * /usr/local
@@ -191,7 +191,7 @@ module FileUtils
# * /usr/local/lib/ruby
#
# You can pass several directories at a time in a list.
- #
+ #
def mkdir_p(list, options = {})
fu_check_options options, OPT_TABLE['mkdir_p']
list = fu_list(list)
@@ -212,11 +212,11 @@ module FileUtils
stack.push path
path = File.dirname(path)
end
- stack.reverse_each do |dir|
+ stack.reverse_each do |path|
begin
- fu_mkdir dir, options[:mode]
+ fu_mkdir path, options[:mode]
rescue SystemCallError => err
- raise unless File.directory?(dir)
+ raise unless File.directory?(path)
end
end
end
@@ -247,35 +247,26 @@ module FileUtils
#
# Options: noop, verbose
- #
+ #
# Removes one or more directories.
- #
+ #
# FileUtils.rmdir 'somedir'
# FileUtils.rmdir %w(somedir anydir otherdir)
# # Does not really remove directory; outputs message.
# FileUtils.rmdir 'somedir', :verbose => true, :noop => true
- #
+ #
def rmdir(list, options = {})
fu_check_options options, OPT_TABLE['rmdir']
list = fu_list(list)
- parents = options[:parents]
- fu_output_message "rmdir #{parents ? '-p ' : ''}#{list.join ' '}" if options[:verbose]
+ fu_output_message "rmdir #{list.join ' '}" if options[:verbose]
return if options[:noop]
list.each do |dir|
- begin
- Dir.rmdir(dir = dir.sub(%r</\z>, ''))
- if parents
- until (parent = File.dirname(dir)) == '.' or parent == dir
- Dir.rmdir(dir)
- end
- end
- rescue Errno::ENOTEMPTY, Errno::ENOENT
- end
+ Dir.rmdir dir.sub(%r</\z>, '')
end
end
module_function :rmdir
- OPT_TABLE['rmdir'] = [:parents, :noop, :verbose]
+ OPT_TABLE['rmdir'] = [:noop, :verbose]
#
# Options: force noop verbose
@@ -286,19 +277,19 @@ module FileUtils
# If +new+ already exists and it is a directory, creates a link +new/old+.
# If +new+ already exists and it is not a directory, raises Errno::EEXIST.
# But if :force option is set, overwrite +new+.
- #
+ #
# FileUtils.ln 'gcc', 'cc', :verbose => true
# FileUtils.ln '/usr/bin/emacs21', '/usr/bin/emacs'
- #
+ #
# <b><tt>ln(list, destdir, options = {})</tt></b>
- #
+ #
# Creates several hard links in a directory, with each one pointing to the
# item in +list+. If +destdir+ is not a directory, raises Errno::ENOTDIR.
- #
+ #
# include FileUtils
# cd '/sbin'
# FileUtils.ln %w(cp mv mkdir), '/bin' # Now /sbin/cp and /bin/cp are linked.
- #
+ #
def ln(src, dest, options = {})
fu_check_options options, OPT_TABLE['ln']
fu_output_message "ln#{options[:force] ? ' -f' : ''} #{[src,dest].flatten.join ' '}" if options[:verbose]
@@ -320,24 +311,24 @@ module FileUtils
# Options: force noop verbose
#
# <b><tt>ln_s(old, new, options = {})</tt></b>
- #
+ #
# Creates a symbolic link +new+ which points to +old+. If +new+ already
# exists and it is a directory, creates a symbolic link +new/old+. If +new+
# already exists and it is not a directory, raises Errno::EEXIST. But if
# :force option is set, overwrite +new+.
- #
+ #
# FileUtils.ln_s '/usr/bin/ruby', '/usr/local/bin/ruby'
# FileUtils.ln_s 'verylongsourcefilename.c', 'c', :force => true
- #
+ #
# <b><tt>ln_s(list, destdir, options = {})</tt></b>
- #
+ #
# Creates several symbolic links in a directory, with each one pointing to the
# item in +list+. If +destdir+ is not a directory, raises Errno::ENOTDIR.
#
# If +destdir+ is not a directory, raises Errno::ENOTDIR.
- #
+ #
# FileUtils.ln_s Dir.glob('bin/*.rb'), '/home/aamine/bin'
- #
+ #
def ln_s(src, dest, options = {})
fu_check_options options, OPT_TABLE['ln_s']
fu_output_message "ln -s#{options[:force] ? 'f' : ''} #{[src,dest].flatten.join ' '}" if options[:verbose]
@@ -357,10 +348,10 @@ module FileUtils
#
# Options: noop verbose
- #
+ #
# Same as
# #ln_s(src, dest, :force)
- #
+ #
def ln_sf(src, dest, options = {})
fu_check_options options, OPT_TABLE['ln_sf']
options = options.dup
@@ -383,7 +374,7 @@ module FileUtils
# FileUtils.cp %w(cgi.rb complex.rb date.rb), '/usr/lib/ruby/1.6'
# FileUtils.cp %w(cgi.rb complex.rb date.rb), '/usr/lib/ruby/1.6', :verbose => true
# FileUtils.cp 'symlink', 'dest' # copy content, "dest" is not a symlink
- #
+ #
def cp(src, dest, options = {})
fu_check_options options, OPT_TABLE['cp']
fu_output_message "cp#{options[:preserve] ? ' -p' : ''} #{[src,dest].flatten.join ' '}" if options[:verbose]
@@ -402,17 +393,17 @@ module FileUtils
#
# Options: preserve noop verbose dereference_root remove_destination
- #
+ #
# Copies +src+ to +dest+. If +src+ is a directory, this method copies
# all its contents recursively. If +dest+ is a directory, copies
# +src+ to +dest/src+.
#
# +src+ can be a list of files.
- #
+ #
# # Installing ruby library "mylib" under the site_ruby
# FileUtils.rm_r site_ruby + '/mylib', :force
# FileUtils.cp_r 'lib/', site_ruby + '/mylib'
- #
+ #
# # Examples of copying several files to target directory.
# FileUtils.cp_r %w(mail.rb field.rb debug/), site_ruby + '/tmail'
# FileUtils.cp_r Dir.glob('*.rb'), '/home/aamine/lib/ruby', :noop => true, :verbose => true
@@ -422,11 +413,12 @@ module FileUtils
# # use following code.
# FileUtils.cp_r 'src/.', 'dest' # cp_r('src', 'dest') makes src/dest,
# # but this doesn't.
- #
+ #
def cp_r(src, dest, options = {})
fu_check_options options, OPT_TABLE['cp_r']
fu_output_message "cp -r#{options[:preserve] ? 'p' : ''}#{options[:remove_destination] ? ' --remove-destination' : ''} #{[src,dest].flatten.join ' '}" if options[:verbose]
return if options[:noop]
+ options[:dereference_root] = true unless options.key?(:dereference_root)
fu_each_src_dest(src, dest) do |s, d|
copy_entry s, d, options[:preserve], options[:dereference_root], options[:remove_destination]
end
@@ -479,22 +471,22 @@ module FileUtils
# +dest+ must respond to #write(str).
#
def copy_stream(src, dest)
- IO.copy_stream(src, dest)
+ fu_copy_stream0 src, dest, fu_stream_blksize(src, dest)
end
module_function :copy_stream
#
# Options: force noop verbose
- #
+ #
# Moves file(s) +src+ to +dest+. If +file+ and +dest+ exist on the different
- # disk partition, the file is copied then the original file is removed.
- #
+ # disk partition, the file is copied instead.
+ #
# FileUtils.mv 'badname.rb', 'goodname.rb'
# FileUtils.mv 'stuff.rb', '/notexist/lib/ruby', :force => true # no error
- #
+ #
# FileUtils.mv %w(junk.txt dust.txt), '/home/aamine/.trash/'
# FileUtils.mv Dir.glob('test*.rb'), 'test', :noop => true, :verbose => true
- #
+ #
def mv(src, dest, options = {})
fu_check_options options, OPT_TABLE['mv']
fu_output_message "mv#{options[:force] ? ' -f' : ''} #{[src,dest].flatten.join ' '}" if options[:verbose]
@@ -533,20 +525,20 @@ module FileUtils
OPT_TABLE['move'] = [:force, :noop, :verbose, :secure]
def rename_cannot_overwrite_file? #:nodoc:
- /cygwin|mswin|mingw|bccwin|emx/ =~ RUBY_PLATFORM
+ /djgpp|cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM
end
private_module_function :rename_cannot_overwrite_file?
#
# Options: force noop verbose
- #
+ #
# Remove file(s) specified in +list+. This method cannot remove directories.
# All StandardErrors are ignored when the :force option is set.
- #
+ #
# FileUtils.rm %w( junk.txt dust.txt )
# FileUtils.rm Dir.glob('*.so')
# FileUtils.rm 'NotExistFile', :force => true # never raises exception
- #
+ #
def rm(list, options = {})
fu_check_options options, OPT_TABLE['rm']
list = fu_list(list)
@@ -567,7 +559,7 @@ module FileUtils
#
# Options: noop verbose
- #
+ #
# Equivalent to
#
# #rm(list, :force => true)
@@ -588,11 +580,11 @@ module FileUtils
#
# Options: force noop verbose secure
- #
+ #
# remove files +list+[0] +list+[1]... If +list+[n] is a directory,
# removes its all contents recursively. This method ignores
# StandardError when :force option is set.
- #
+ #
# FileUtils.rm_r Dir.glob('/tmp/*')
# FileUtils.rm_r '/', :force => true # :-)
#
@@ -606,7 +598,7 @@ module FileUtils
#
# NOTE: This method calls #remove_entry_secure if :secure option is set.
# See also #remove_entry_secure.
- #
+ #
def rm_r(list, options = {})
fu_check_options options, OPT_TABLE['rm_r']
# options[:secure] = true unless options.key?(:secure)
@@ -627,14 +619,14 @@ module FileUtils
#
# Options: noop verbose secure
- #
+ #
# Equivalent to
#
# #rm_r(list, :force => true)
#
# WARNING: This method causes local vulnerability.
# Read the documentation of #rm_r first.
- #
+ #
def rm_rf(list, options = {})
fu_check_options options, OPT_TABLE['rm_rf']
options = options.dup
@@ -694,7 +686,7 @@ module FileUtils
end
# is a directory.
parent_st = File.stat(File.dirname(fullpath))
- unless parent_st.world_writable?
+ unless fu_world_writable?(parent_st)
remove_entry path, force
return
end
@@ -732,6 +724,11 @@ module FileUtils
end
module_function :remove_entry_secure
+ def fu_world_writable?(st)
+ (st.mode & 0002) != 0
+ end
+ private_module_function :fu_world_writable?
+
def fu_have_symlink? #:nodoc
File.symlink nil, nil
rescue NotImplementedError
@@ -788,7 +785,7 @@ module FileUtils
#
# Returns true if the contents of a file A and a file B are identical.
- #
+ #
# FileUtils.compare_file('somefile', 'somefile') #=> true
# FileUtils.compare_file('/bin/cp', '/bin/mv') #=> maybe false
#
@@ -828,14 +825,14 @@ module FileUtils
#
# Options: mode preserve noop verbose
- #
+ #
# If +src+ is not same as +dest+, copies it and changes the permission
# mode to +mode+. If +dest+ is a directory, destination is +dest+/+src+.
# This method removes destination before copy.
- #
+ #
# FileUtils.install 'ruby', '/usr/local/bin/ruby', :mode => 0755, :verbose => true
# FileUtils.install 'lib.rb', '/usr/local/lib/ruby/site_ruby', :verbose => true
- #
+ #
def install(src, dest, options = {})
fu_check_options options, OPT_TABLE['install']
fu_output_message "install -c#{options[:preserve] && ' -p'}#{options[:mode] ? (' -m 0%o' % options[:mode]) : ''} #{[src,dest].flatten.join ' '}" if options[:verbose]
@@ -856,14 +853,14 @@ module FileUtils
#
# Options: noop verbose
- #
+ #
# Changes permission bits on the named files (in +list+) to the bit pattern
# represented by +mode+.
- #
+ #
# FileUtils.chmod 0755, 'somecommand'
# FileUtils.chmod 0644, %w(my.rb your.rb his.rb her.rb)
# FileUtils.chmod 0755, '/usr/bin/ruby', :verbose => true
- #
+ #
def chmod(mode, list, options = {})
fu_check_options options, OPT_TABLE['chmod']
list = fu_list(list)
@@ -879,12 +876,12 @@ module FileUtils
#
# Options: noop verbose force
- #
+ #
# Changes permission bits on the named files (in +list+)
# to the bit pattern represented by +mode+.
- #
+ #
# FileUtils.chmod_R 0700, "/tmp/app.#{$$}"
- #
+ #
def chmod_R(mode, list, options = {})
fu_check_options options, OPT_TABLE['chmod_R']
list = fu_list(list)
@@ -908,16 +905,16 @@ module FileUtils
#
# Options: noop verbose
- #
+ #
# Changes owner and group on the named files (in +list+)
# to the user +user+ and the group +group+. +user+ and +group+
# may be an ID (Integer/String) or a name (String).
# If +user+ or +group+ is nil, this method does not change
# the attribute.
- #
+ #
# FileUtils.chown 'root', 'staff', '/usr/local/bin/ruby'
# FileUtils.chown nil, 'bin', Dir.glob('/usr/bin/*'), :verbose => true
- #
+ #
def chown(user, group, list, options = {})
fu_check_options options, OPT_TABLE['chown']
list = fu_list(list)
@@ -937,16 +934,16 @@ module FileUtils
#
# Options: noop verbose force
- #
+ #
# Changes owner and group on the named files (in +list+)
# to the user +user+ and the group +group+ recursively.
# +user+ and +group+ may be an ID (Integer/String) or
# a name (String). If +user+ or +group+ is nil, this
# method does not change the attribute.
- #
+ #
# FileUtils.chown_R 'www', 'www', '/var/www/htdocs'
# FileUtils.chown_R 'cvs', 'cvs', '/var/cvs', :verbose => true
- #
+ #
def chown_R(user, group, list, options = {})
fu_check_options options, OPT_TABLE['chown_R']
list = fu_list(list)
@@ -987,7 +984,6 @@ module FileUtils
def fu_get_gid(group) #:nodoc:
return nil unless group
- group = group.to_s
if /\A\d+\z/ =~ group
then group.to_i
else Etc.getgrnam(group).gid
@@ -1011,13 +1007,13 @@ module FileUtils
#
# Options: noop verbose
- #
+ #
# Updates modification time (mtime) and access time (atime) of file(s) in
# +list+. Files are created if they don't exist.
- #
+ #
# FileUtils.touch 'timestamp'
# FileUtils.touch Dir.glob('*.c'); system 'make'
- #
+ #
def touch(list, options = {})
fu_check_options options, OPT_TABLE['touch']
list = fu_list(list)
@@ -1051,11 +1047,14 @@ module FileUtils
private
def fu_windows?
- /mswin|mingw|bccwin|emx/ =~ RUBY_PLATFORM
+ /mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM
end
- def fu_copy_stream0(src, dest, blksize = nil) #:nodoc:
- IO.copy_stream(src, dest)
+ def fu_copy_stream0(src, dest, blksize) #:nodoc:
+ # FIXME: readpartial?
+ while s = src.read(blksize)
+ dest.write s
+ end
end
def fu_stream_blksize(*streams)
@@ -1104,7 +1103,7 @@ module FileUtils
def path
if @path
- File.path(@path)
+ @path.to_str
else
join(@prefix, @rel)
end
@@ -1231,9 +1230,6 @@ module FileUtils
when file?
copy_file dest
when directory?
- if !File.exist?(dest) and /^#{Regexp.quote(path)}/ =~ File.dirname(dest)
- raise ArgumentError, "cannot copy directory %s to itself %s" % [path, dest]
- end
begin
Dir.mkdir dest
rescue
@@ -1261,9 +1257,12 @@ module FileUtils
end
def copy_file(dest)
- File.open(dest, 'wb') do |f|
- IO.copy_stream(path(), f)
- end
+ st = stat()
+ File.open(path(), 'rb') {|r|
+ File.open(dest, 'wb', st.mode) {|w|
+ fu_copy_stream0 r, w, (fu_blksize(st) || fu_default_blksize())
+ }
+ }
end
def copy_metadata(path)
@@ -1379,14 +1378,14 @@ module FileUtils
end
def join(dir, base)
- return File.path(dir) if not base or base == '.'
- return File.path(base) if not dir or dir == '.'
+ return dir.to_str if not base or base == '.'
+ return base.to_str if not dir or dir == '.'
File.join(dir, base)
end
end # class Entry_
def fu_list(arg) #:nodoc:
- [arg].flatten.map {|path| File.path(path) }
+ [arg].flatten.map {|path| path.to_str }
end
private_module_function :fu_list
@@ -1399,17 +1398,17 @@ module FileUtils
private_module_function :fu_each_src_dest
def fu_each_src_dest0(src, dest) #:nodoc:
- if tmp = Array.try_convert(src)
- tmp.each do |s|
- s = File.path(s)
+ if src.is_a?(Array)
+ src.each do |s|
+ s = s.to_str
yield s, File.join(dest, File.basename(s))
end
else
- src = File.path(src)
+ src = src.to_str
if File.directory?(dest)
yield src, File.join(dest, File.basename(src))
else
- yield src, File.path(dest)
+ yield src, dest.to_str
end
end
end
@@ -1443,8 +1442,8 @@ module FileUtils
private_module_function :fu_check_options
def fu_update_option(args, new) #:nodoc:
- if tmp = Hash.try_convert(args.last)
- args[-1] = tmp.dup.update(new)
+ if args.last.is_a?(Hash)
+ args[-1] = args.last.dup.update(new)
else
args.push new
end
@@ -1510,14 +1509,14 @@ module FileUtils
OPT_TABLE.keys.select {|m| OPT_TABLE[m].include?(opt) }
end
- METHODS = singleton_methods() - [:private_module_function,
- :commands, :options, :have_option?, :options_of, :collect_method]
+ METHODS = singleton_methods() - %w( private_module_function
+ commands options have_option? options_of collect_method )
- #
+ #
# This module has all methods of FileUtils module, but it outputs messages
# before acting. This equates to passing the <tt>:verbose</tt> flag to
# methods in FileUtils.
- #
+ #
module Verbose
include FileUtils
@fileutils_output = $stderr
@@ -1538,11 +1537,11 @@ module FileUtils
end
end
- #
+ #
# This module has all methods of FileUtils module, but never changes
# files/directories. This equates to passing the <tt>:noop</tt> flag
# to methods in FileUtils.
- #
+ #
module NoWrite
include FileUtils
@fileutils_output = $stderr
@@ -1563,12 +1562,12 @@ module FileUtils
end
end
- #
+ #
# This module has all methods of FileUtils module, but never changes
# files/directories, with printing message before acting.
# This equates to passing the <tt>:noop</tt> and <tt>:verbose</tt> flag
# to methods in FileUtils.
- #
+ #
module DryRun
include FileUtils
@fileutils_output = $stderr
diff --git a/lib/finalize.rb b/lib/finalize.rb
new file mode 100644
index 0000000000..9b6b302cac
--- /dev/null
+++ b/lib/finalize.rb
@@ -0,0 +1,193 @@
+#--
+# finalizer.rb -
+# $Release Version: 0.3$
+# $Revision: 1.4 $
+# $Date: 1998/02/27 05:34:33 $
+# by Keiju ISHITSUKA
+#++
+#
+# Usage:
+#
+# add dependency R_method(obj, dependant)
+# add(obj, dependant, method = :finalize, *opt)
+# add_dependency(obj, dependant, method = :finalize, *opt)
+#
+# delete dependency R_method(obj, dependant)
+# delete(obj_or_id, dependant, method = :finalize)
+# delete_dependency(obj_or_id, dependant, method = :finalize)
+#
+# delete dependency R_*(obj, dependant)
+# delete_all_dependency(obj_or_id, dependant)
+#
+# delete dependency R_method(*, dependant)
+# delete_by_dependant(dependant, method = :finalize)
+#
+# delete dependency R_*(*, dependant)
+# delete_all_by_dependant(dependant)
+#
+# delete all dependency R_*(*, *)
+# delete_all
+#
+# finalize the dependant connected by dependency R_method(obj, dependtant).
+# finalize(obj_or_id, dependant, method = :finalize)
+# finalize_dependency(obj_or_id, dependant, method = :finalize)
+#
+# finalize all dependants connected by dependency R_*(obj, dependtant).
+# finalize_all_dependency(obj_or_id, dependant)
+#
+# finalize the dependant connected by dependency R_method(*, dependtant).
+# finalize_by_dependant(dependant, method = :finalize)
+#
+# finalize all dependants connected by dependency R_*(*, dependant).
+# finalize_all_by_dependant(dependant)
+#
+# finalize all dependency registered to the Finalizer.
+# finalize_all
+#
+# stop invoking Finalizer on GC.
+# safe{..}
+#
+
+module Finalizer
+ RCS_ID='-$Id: finalize.rb,v 1.4 1998/02/27 05:34:33 keiju Exp keiju $-'
+
+ class <<self
+ # @dependency: {id => [[dependant, method, *opt], ...], ...}
+
+ # add dependency R_method(obj, dependant)
+ def add_dependency(obj, dependant, method = :finalize, *opt)
+ ObjectSpace.call_finalizer(obj)
+ method = method.intern unless method.kind_of?(Integer)
+ assoc = [dependant, method].concat(opt)
+ if dep = @dependency[obj.object_id]
+ dep.push assoc
+ else
+ @dependency[obj.object_id] = [assoc]
+ end
+ end
+ alias add add_dependency
+
+ # delete dependency R_method(obj, dependant)
+ def delete_dependency(id, dependant, method = :finalize)
+ id = id.object_id unless id.kind_of?(Integer)
+ method = method.intern unless method.kind_of?(Integer)
+ for assoc in @dependency[id]
+ assoc.delete_if do
+ |d, m, *o|
+ d == dependant && m == method
+ end
+ @dependency.delete(id) if assoc.empty?
+ end
+ end
+ alias delete delete_dependency
+
+ # delete dependency R_*(obj, dependant)
+ def delete_all_dependency(id, dependant)
+ id = id.object_id unless id.kind_of?(Integer)
+ method = method.intern unless method.kind_of?(Integer)
+ for assoc in @dependency[id]
+ assoc.delete_if do
+ |d, m, *o|
+ d == dependant
+ end
+ @dependency.delete(id) if assoc.empty?
+ end
+ end
+
+ # delete dependency R_method(*, dependant)
+ def delete_by_dependant(dependant, method = :finalize)
+ method = method.intern unless method.kind_of?(Integer)
+ for id in @dependency.keys
+ delete(id, dependant, method)
+ end
+ end
+
+ # delete dependency R_*(*, dependant)
+ def delete_all_by_dependant(dependant)
+ for id in @dependency.keys
+ delete_all_dependency(id, dependant)
+ end
+ end
+
+ # finalize the depandant connected by dependency R_method(obj, dependtant)
+ def finalize_dependency(id, dependant, method = :finalize)
+ id = id.object_id unless id.kind_of?(Integer)
+ method = method.intern unless method.kind_of?(Integer)
+ for assocs in @dependency[id]
+ assocs.delete_if do
+ |d, m, *o|
+ d.send(m, id, *o) if ret = d == dependant && m == method
+ ret
+ end
+ @dependency.delete(id) if assoc.empty?
+ end
+ end
+ alias finalize finalize_dependency
+
+ # finalize all dependants connected by dependency R_*(obj, dependtant)
+ def finalize_all_dependency(id, dependant)
+ id = id.object_id unless id.kind_of?(Integer)
+ method = method.intern unless method.kind_of?(Integer)
+ for assoc in @dependency[id]
+ assoc.delete_if do
+ |d, m, *o|
+ d.send(m, id, *o) if ret = d == dependant
+ end
+ @dependency.delete(id) if assoc.empty?
+ end
+ end
+
+ # finalize the dependant connected by dependency R_method(*, dependtant)
+ def finalize_by_dependant(dependant, method = :finalize)
+ method = method.intern unless method.kind_of?(Integer)
+ for id in @dependency.keys
+ finalize(id, dependant, method)
+ end
+ end
+
+ # finalize all dependants connected by dependency R_*(*, dependtant)
+ def finalize_all_by_dependant(dependant)
+ for id in @dependency.keys
+ finalize_all_dependency(id, dependant)
+ end
+ end
+
+ # finalize all dependants registered to the Finalizer.
+ def finalize_all
+ for id, assocs in @dependency
+ for dependant, method, *opt in assocs
+ dependant.send(method, id, *opt)
+ end
+ assocs.clear
+ end
+ end
+
+ # method to call finalize_* safely.
+ def safe
+ old_status = Thread.critical
+ Thread.critical = true
+ ObjectSpace.remove_finalizer(@proc)
+ begin
+ yield
+ ensure
+ ObjectSpace.add_finalizer(@proc)
+ Thread.critical = old_status
+ end
+ end
+
+ private
+
+ # registering function to ObjectSpace#add_finalizer
+ def final_of(id)
+ if assocs = @dependency.delete(id)
+ for dependant, method, *opt in assocs
+ dependant.send(method, id, *opt)
+ end
+ end
+ end
+
+ end
+ @dependency = Hash.new
+ @proc = proc{|id| final_of(id)}
+ ObjectSpace.add_finalizer(@proc)
+end
diff --git a/lib/find.rb b/lib/find.rb
index 79ff7c1378..0d22dd62d6 100644
--- a/lib/find.rb
+++ b/lib/find.rb
@@ -33,9 +33,7 @@ module Find
# See the +Find+ module documentation for an example.
#
def find(*paths) # :yield: path
- block_given? or return enum_for(__method__, *paths)
-
- paths.collect!{|d| raise Errno::ENOENT unless File.exist?(d); d.dup}
+ paths.collect!{|d| d.dup}
while file = paths.shift
catch(:prune) do
yield file.dup.taint
@@ -59,7 +57,7 @@ module Find
d.close
end
end
- rescue Errno::ENOENT, Errno::EACCES
+ rescue Errno::ENOENT, Errno::EACCES
end
end
end
diff --git a/lib/forwardable.rb b/lib/forwardable.rb
index 39b35d9cee..cc6e4ee418 100644
--- a/lib/forwardable.rb
+++ b/lib/forwardable.rb
@@ -1,17 +1,17 @@
+# = forwardable - Support for the Delegation Pattern
#
-# forwardable.rb -
-# $Release Version: 1.1$
-# $Revision$
-# by Keiju ISHITSUKA(keiju@ishitsuka.com)
-# original definition by delegator.rb
-# Revised by Daniel J. Berger with suggestions from Florian Gross.
+# $Release Version: 1.1$
+# $Revision$
+# $Date$
+# by Keiju ISHITSUKA(keiju@ishitsuka.com)
#
-# Documentation by James Edward Gray II and Gavin Sinclair
+# Documentation by James Edward Gray II and Gavin Sinclair
#
# == Introduction
#
# This library allows you delegate method calls to an object, on a method by
-# method basis.
+# method basis. You can use Forwardable to setup this delegation at the class
+# level, or SingleForwardable to handle it at the object level.
#
# == Notes
#
@@ -33,28 +33,28 @@
#
# class Queue
# extend Forwardable
-#
+#
# def initialize
# @q = [ ] # prepare delegate object
# end
-#
+#
# # setup preferred interface, enq() and deq()...
# def_delegator :@q, :push, :enq
# def_delegator :@q, :shift, :deq
-#
+#
# # support some general Array methods that fit Queues well
# def_delegators :@q, :clear, :first, :push, :shift, :size
# end
-#
+#
# q = Queue.new
# q.enq 1, 2, 3, 4, 5
# q.push 6
-#
+#
# q.shift # => 1
# while q.size > 0
# puts q.deq
# end
-#
+#
# q.enq "Ruby", "Perl", "Python"
# puts q.first
# q.clear
@@ -70,34 +70,13 @@
# Ruby
# nil
#
-# SingleForwardable can be used to setup delegation at the object level as well.
+# === SingleForwardable
#
# printer = String.new
# printer.extend SingleForwardable # prepare object for delegation
# printer.def_delegator "STDOUT", "puts" # add delegation for STDOUT.puts()
# printer.puts "Howdy!"
#
-# Also, SingleForwardable can be use to Class or Module.
-#
-# module Facade
-# extend SingleForwardable
-# def_delegator :Implementation, :service
-#
-# class Implementation
-# def service...
-# end
-# end
-#
-# If you want to use both Forwardable and SingleForwardable, you can
-# use methods def_instance_delegator and def_single_delegator, etc.
-#
-# If the object isn't a Module and Class, You can too extend
-# Forwardable module.
-# printer = String.new
-# printer.extend Forwardable # prepare object for delegation
-# printer.def_delegator "STDOUT", "puts" # add delegation for STDOUT.puts()
-# printer.puts "Howdy!"
-#
# <i>Prints:</i>
#
# Howdy!
@@ -124,38 +103,17 @@
# # extend Forwardable, but we did that above
# def_delegators :@records, :size, :<<, :map
# end
-# f = Foo.new
-# f.printf ...
-# f.gets
-# f.content_at(1)
#
# Also see the example at forwardable.rb.
-
+#
module Forwardable
- FORWARDABLE_VERSION = "1.1.0"
@debug = nil
class<<self
+ # force Forwardable to show up in stack backtraces of delegated methods
attr_accessor :debug
end
- # Takes a hash as its argument. The key is a symbol or an array of
- # symbols. These symbols correspond to method names. The value is
- # the accessor to which the methods will be delegated.
- #
- # :call-seq:
- # delegate method => accessor
- # delegate [method, method, ...] => accessor
- #
- def instance_delegate(hash)
- hash.each{ |methods, accessor|
- methods = methods.to_s unless methods.respond_to?(:each)
- methods.each{ |method|
- def_instance_delegator(accessor, method)
- }
- }
- end
-
#
# Shortcut for defining multiple delegator methods, but with no
# provision for using a different name. The following two code
@@ -167,76 +125,67 @@ module Forwardable
# def_delegator :@records, :<<
# def_delegator :@records, :map
#
+ # See the examples at Forwardable and forwardable.rb.
+ #
def def_instance_delegators(accessor, *methods)
- methods.delete("__send__")
- methods.delete("__id__")
for method in methods
def_instance_delegator(accessor, method)
end
end
+ #
+ # Defines a method _method_ which delegates to _obj_ (i.e. it calls
+ # the method of the same name in _obj_). If _new_name_ is
+ # provided, it is used as the name for the delegate method.
+ #
+ # See the examples at Forwardable and forwardable.rb.
+ #
def def_instance_delegator(accessor, method, ali = method)
- line_no = __LINE__; str = %{
+ accessor = accessor.id2name if accessor.kind_of?(Integer)
+ method = method.id2name if method.kind_of?(Integer)
+ ali = ali.id2name if ali.kind_of?(Integer)
+
+ module_eval(<<-EOS, "(__FORWARDABLE__)", 1)
def #{ali}(*args, &block)
begin
#{accessor}.__send__(:#{method}, *args, &block)
rescue Exception
- $@.delete_if{|s| %r"#{Regexp.quote(__FILE__)}"o =~ s} unless Forwardable::debug
- ::Kernel::raise
+ $@.delete_if{|s| /^\\(__FORWARDABLE__\\):/ =~ s} unless Forwardable::debug
+ Kernel::raise
end
end
- }
- # If it's not a class or module, it's an instance
- begin
- module_eval(str, __FILE__, line_no)
- rescue
- instance_eval(str, __FILE__, line_no)
- end
-
+ EOS
end
- alias delegate instance_delegate
alias def_delegators def_instance_delegators
alias def_delegator def_instance_delegator
end
#
-# Usage of The SingleForwardable is like Fowadable module.
+# The SingleForwardable module provides delegation of specified
+# methods to a designated object, using the methods #def_delegator
+# and #def_delegators. This module is similar to Forwardable, but it works on
+# objects themselves, instead of their defining classes.
+#
+# Also see the example at forwardable.rb.
#
module SingleForwardable
- # Takes a hash as its argument. The key is a symbol or an array of
- # symbols. These symbols correspond to method names. The value is
- # the accessor to which the methods will be delegated.
- #
- # :call-seq:
- # delegate method => accessor
- # delegate [method, method, ...] => accessor
- #
- def single_delegate(hash)
- hash.each{ |methods, accessor|
- methods = methods.to_s unless methods.respond_to?(:each)
- methods.each{ |method|
- def_single_delegator(accessor, method)
- }
- }
- end
-
#
# Shortcut for defining multiple delegator methods, but with no
# provision for using a different name. The following two code
# samples have the same effect:
#
- # def_delegators :@records, :size, :<<, :map
+ # single_forwardable.def_delegators :@records, :size, :<<, :map
#
- # def_delegator :@records, :size
- # def_delegator :@records, :<<
- # def_delegator :@records, :map
+ # single_forwardable.def_delegator :@records, :size
+ # single_forwardable.def_delegator :@records, :<<
+ # single_forwardable.def_delegator :@records, :map
#
- def def_single_delegators(accessor, *methods)
- methods.delete("__send__")
- methods.delete("__id__")
+ # See the example at forwardable.rb.
+ #
+ def def_singleton_delegators(accessor, *methods)
for method in methods
- def_single_delegator(accessor, method)
+ def_singleton_delegator(accessor, method)
end
end
@@ -245,26 +194,25 @@ module SingleForwardable
# the method of the same name in _obj_). If _new_name_ is
# provided, it is used as the name for the delegate method.
#
- def def_single_delegator(accessor, method, ali = method)
- line_no = __LINE__; str = %{
- def #{ali}(*args, &block)
- begin
- #{accessor}.__send__(:#{method}, *args, &block)
- rescue Exception
- $@.delete_if{|s| %r"#{Regexp.quote(__FILE__)}"o =~ s} unless Forwardable::debug
- ::Kernel::raise
- end
- end
- }
-
- instance_eval(str, __FILE__, __LINE__)
+ # See the example at forwardable.rb.
+ #
+ def def_singleton_delegator(accessor, method, ali = method)
+ accessor = accessor.id2name if accessor.kind_of?(Integer)
+ method = method.id2name if method.kind_of?(Integer)
+ ali = ali.id2name if ali.kind_of?(Integer)
+
+ instance_eval(<<-EOS, "(__FORWARDABLE__)", 1)
+ def #{ali}(*args, &block)
+ begin
+ #{accessor}.__send__(:#{method}, *args,&block)
+ rescue Exception
+ $@.delete_if{|s| /^\\(__FORWARDABLE__\\):/ =~ s} unless Forwardable::debug
+ Kernel::raise
+ end
+ end
+ EOS
end
- alias delegate single_delegate
- alias def_delegators def_single_delegators
- alias def_delegator def_single_delegator
+ alias def_delegators def_singleton_delegators
+ alias def_delegator def_singleton_delegator
end
-
-
-
-
diff --git a/lib/ftools.rb b/lib/ftools.rb
new file mode 100644
index 0000000000..5f082331fb
--- /dev/null
+++ b/lib/ftools.rb
@@ -0,0 +1,261 @@
+#
+# = ftools.rb: Extra tools for the File class
+#
+# Author:: WATANABE, Hirofumi
+# Documentation:: Zachary Landau
+#
+# This library can be distributed under the terms of the Ruby license.
+# You can freely distribute/modify this library.
+#
+# It is included in the Ruby standard library.
+#
+# == Description
+#
+# ftools adds several (class, not instance) methods to the File class, for
+# copying, moving, deleting, installing, and comparing files, as well as
+# creating a directory path. See the File class for details.
+#
+# FileUtils contains all or nearly all the same functionality and more, and
+# is a recommended option over ftools
+#
+# When you
+#
+# require 'ftools'
+#
+# then the File class aquires some utility methods for copying, moving, and
+# deleting files, and more.
+#
+# See the method descriptions below, and consider using FileUtils as it is
+# more comprehensive.
+#
+class File
+end
+
+class << File
+
+ BUFSIZE = 8 * 1024
+
+ #
+ # If +to+ is a valid directory, +from+ will be appended to +to+, adding
+ # and escaping backslashes as necessary. Otherwise, +to+ will be returned.
+ # Useful for appending +from+ to +to+ only if the filename was not specified
+ # in +to+.
+ #
+ def catname(from, to)
+ if directory? to
+ join to.sub(%r([/\\]$), ''), basename(from)
+ else
+ to
+ end
+ end
+
+ #
+ # Copies a file +from+ to +to+. If +to+ is a directory, copies +from+
+ # to <tt>to/from</tt>.
+ #
+ def syscopy(from, to)
+ to = catname(from, to)
+
+ fmode = stat(from).mode
+ tpath = to
+ not_exist = !exist?(tpath)
+
+ from = open(from, "rb")
+ to = open(to, "wb")
+
+ begin
+ while true
+ to.syswrite from.sysread(BUFSIZE)
+ end
+ rescue EOFError
+ ret = true
+ rescue
+ ret = false
+ ensure
+ to.close
+ from.close
+ end
+ chmod(fmode, tpath) if not_exist
+ ret
+ end
+
+ #
+ # Copies a file +from+ to +to+ using #syscopy. If +to+ is a directory,
+ # copies +from+ to <tt>to/from</tt>. If +verbose+ is true, <tt>from -> to</tt>
+ # is printed.
+ #
+ def copy(from, to, verbose = false)
+ $stderr.print from, " -> ", catname(from, to), "\n" if verbose
+ syscopy from, to
+ end
+
+ alias cp copy
+
+ #
+ # Moves a file +from+ to +to+ using #syscopy. If +to+ is a directory,
+ # copies from +from+ to <tt>to/from</tt>. If +verbose+ is true, <tt>from ->
+ # to</tt> is printed.
+ #
+ def move(from, to, verbose = false)
+ to = catname(from, to)
+ $stderr.print from, " -> ", to, "\n" if verbose
+
+ if RUBY_PLATFORM =~ /djgpp|(cyg|ms|bcc)win|mingw/ and file? to
+ unlink to
+ end
+ fstat = stat(from)
+ begin
+ rename from, to
+ rescue
+ begin
+ symlink readlink(from), to and unlink from
+ rescue
+ from_stat = stat(from)
+ syscopy from, to and unlink from
+ utime(from_stat.atime, from_stat.mtime, to)
+ begin
+ chown(fstat.uid, fstat.gid, to)
+ rescue
+ end
+ end
+ end
+ end
+
+ alias mv move
+
+ #
+ # Returns +true+ if and only if the contents of files +from+ and +to+ are
+ # identical. If +verbose+ is +true+, <tt>from <=> to</tt> is printed.
+ #
+ def compare(from, to, verbose = false)
+ $stderr.print from, " <=> ", to, "\n" if verbose
+
+ return false if stat(from).size != stat(to).size
+
+ from = open(from, "rb")
+ to = open(to, "rb")
+
+ ret = false
+ fr = tr = ''
+
+ begin
+ while fr == tr
+ fr = from.read(BUFSIZE)
+ if fr
+ tr = to.read(fr.size)
+ else
+ ret = to.read(BUFSIZE)
+ ret = !ret || ret.length == 0
+ break
+ end
+ end
+ rescue
+ ret = false
+ ensure
+ to.close
+ from.close
+ end
+ ret
+ end
+
+ alias cmp compare
+
+ #
+ # Removes a list of files. Each parameter should be the name of the file to
+ # delete. If the last parameter isn't a String, verbose mode will be enabled.
+ # Returns the number of files deleted.
+ #
+ def safe_unlink(*files)
+ verbose = if files[-1].is_a? String then false else files.pop end
+ files.each do |file|
+ begin
+ unlink file
+ $stderr.print "removing ", file, "\n" if verbose
+ rescue Errno::EACCES # for Windows
+ continue if symlink? file
+ begin
+ mode = stat(file).mode
+ o_chmod mode | 0200, file
+ unlink file
+ $stderr.print "removing ", file, "\n" if verbose
+ rescue
+ o_chmod mode, file rescue nil
+ end
+ rescue
+ end
+ end
+ end
+
+ alias rm_f safe_unlink
+
+ #
+ # Creates a directory and all its parent directories.
+ # For example,
+ #
+ # File.makedirs '/usr/lib/ruby'
+ #
+ # causes the following directories to be made, if they do not exist.
+ # * /usr
+ # * /usr/lib
+ # * /usr/lib/ruby
+ #
+ # You can pass several directories, each as a parameter. If the last
+ # parameter isn't a String, verbose mode will be enabled.
+ #
+ def makedirs(*dirs)
+ verbose = if dirs[-1].is_a? String then false else dirs.pop end
+ mode = 0755
+ for dir in dirs
+ parent = dirname(dir)
+ next if parent == dir or directory? dir
+ makedirs parent unless directory? parent
+ $stderr.print "mkdir ", dir, "\n" if verbose
+ if basename(dir) != ""
+ begin
+ Dir.mkdir dir, mode
+ rescue SystemCallError
+ raise unless directory? dir
+ end
+ end
+ end
+ end
+
+ alias mkpath makedirs
+
+ alias o_chmod chmod
+
+ vsave, $VERBOSE = $VERBOSE, false
+
+ #
+ # Changes permission bits on +files+ to the bit pattern represented
+ # by +mode+. If the last parameter isn't a String, verbose mode will
+ # be enabled.
+ #
+ # File.chmod 0755, 'somecommand'
+ # File.chmod 0644, 'my.rb', 'your.rb', true
+ #
+ def chmod(mode, *files)
+ verbose = if files[-1].is_a? String then false else files.pop end
+ $stderr.printf "chmod %04o %s\n", mode, files.join(" ") if verbose
+ o_chmod mode, *files
+ end
+ $VERBOSE = vsave
+
+ #
+ # If +src+ is not the same as +dest+, copies it and changes the permission
+ # mode to +mode+. If +dest+ is a directory, destination is <tt>dest/src</tt>.
+ # If +mode+ is not set, default is used. If +verbose+ is set to true, the
+ # name of each file copied will be printed.
+ #
+ def install(from, to, mode = nil, verbose = false)
+ to = catname(from, to)
+ unless exist? to and cmp from, to
+ safe_unlink to if exist? to
+ cp from, to, verbose
+ chmod mode, to, verbose if mode
+ end
+ end
+
+end
+
+# vi:set sw=2:
diff --git a/lib/gauntlet_rubygems.rb b/lib/gauntlet_rubygems.rb
deleted file mode 100644
index f6c4827129..0000000000
--- a/lib/gauntlet_rubygems.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-require 'rubygems'
-require 'gauntlet'
-
-##
-# GemGauntlet validates all current gems. Currently these packages are
-# borked:
-#
-# Asami-0.04 : No such file or directory - bin/Asami.rb
-# ObjectGraph-1.0.1 : No such file or directory - bin/objectgraph
-# evil-ruby-0.1.0 : authors must be Array of Strings
-# fresh_cookies-1.0.0 : authors must be Array of Strings
-# plugems_deploy-0.2.0 : authors must be Array of Strings
-# pmsrb-0.2.0 : authors must be Array of Strings
-# pqa-1.6 : authors must be Array of Strings
-# rant-0.5.7 : authors must be Array of Strings
-# rvsh-0.4.5 : No such file or directory - bin/rvsh
-# xen-0.1.2.1 : authors must be Array of Strings
-
-class GemGauntlet < Gauntlet
- def run(name)
- warn name
-
- spec = begin
- Gem::Specification.load 'gemspec'
- rescue SyntaxError
- Gem::Specification.from_yaml File.read('gemspec')
- end
- spec.validate
-
- self.data[name] = false
- self.dirty = true
- rescue SystemCallError, Gem::InvalidSpecificationException => e
- self.data[name] = e.message
- self.dirty = true
- end
-
- def should_skip?(name)
- self.data[name] == false
- end
-
- def report
- self.data.sort.reject { |k,v| !v }.each do |k,v|
- puts "%-21s: %s" % [k, v]
- end
- end
-end
-
-gauntlet = GemGauntlet.new
-gauntlet.run_the_gauntlet ARGV.shift
-gauntlet.report
diff --git a/lib/generator.rb b/lib/generator.rb
new file mode 100644
index 0000000000..dbdd0f40a9
--- /dev/null
+++ b/lib/generator.rb
@@ -0,0 +1,418 @@
+#!/usr/bin/env ruby
+#--
+# $Idaemons: /home/cvs/rb/generator.rb,v 1.8 2001/10/03 08:54:32 knu Exp $
+# $RoughId: generator.rb,v 1.10 2003/10/14 19:36:58 knu Exp $
+# $Id$
+#++
+#
+# = generator.rb: convert an internal iterator to an external one
+#
+# Copyright (c) 2001,2003 Akinori MUSHA <knu@iDaemons.org>
+#
+# All rights reserved. You can redistribute and/or modify it under
+# the same terms as Ruby.
+#
+# == Overview
+#
+# This library provides the Generator class, which converts an
+# internal iterator (i.e. an Enumerable object) to an external
+# iterator. In that form, you can roll many iterators independently.
+#
+# The SyncEnumerator class, which is implemented using Generator,
+# makes it easy to roll many Enumerable objects synchronously.
+#
+# See the respective classes for examples of usage.
+
+
+#
+# Generator converts an internal iterator (i.e. an Enumerable object)
+# to an external iterator.
+#
+# Note that it is not very fast since it is implemented using
+# continuations, which are currently slow.
+#
+# == Example
+#
+# require 'generator'
+#
+# # Generator from an Enumerable object
+# g = Generator.new(['A', 'B', 'C', 'Z'])
+#
+# while g.next?
+# puts g.next
+# end
+#
+# # Generator from a block
+# g = Generator.new { |g|
+# for i in 'A'..'C'
+# g.yield i
+# end
+#
+# g.yield 'Z'
+# }
+#
+# # The same result as above
+# while g.next?
+# puts g.next
+# end
+#
+class Generator
+ include Enumerable
+
+ # Creates a new generator either from an Enumerable object or from a
+ # block.
+ #
+ # In the former, block is ignored even if given.
+ #
+ # In the latter, the given block is called with the generator
+ # itself, and expected to call the +yield+ method for each element.
+ def initialize(enum = nil, &block)
+ if enum
+ @block = proc { |g|
+ enum.each { |x| g.yield x }
+ }
+ else
+ @block = block
+ end
+
+ @index = 0
+ @queue = []
+ @cont_next = @cont_yield = @cont_endp = nil
+
+ if @cont_next = callcc { |c| c }
+ @block.call(self)
+
+ @cont_endp.call(nil) if @cont_endp
+ end
+
+ self
+ end
+
+ # Yields an element to the generator.
+ def yield(value)
+ if @cont_yield = callcc { |c| c }
+ @queue << value
+ @cont_next.call(nil)
+ end
+
+ self
+ end
+
+ # Returns true if the generator has reached the end.
+ def end?()
+ if @cont_endp = callcc { |c| c }
+ @cont_yield.nil? && @queue.empty?
+ else
+ @queue.empty?
+ end
+ end
+
+ # Returns true if the generator has not reached the end yet.
+ def next?()
+ !end?
+ end
+
+ # Returns the current index (position) counting from zero.
+ def index()
+ @index
+ end
+
+ # Returns the current index (position) counting from zero.
+ def pos()
+ @index
+ end
+
+ # Returns the element at the current position and moves forward.
+ def next()
+ if end?
+ raise EOFError, "no more elements available"
+ end
+
+ if @cont_next = callcc { |c| c }
+ @cont_yield.call(nil) if @cont_yield
+ end
+
+ @index += 1
+
+ @queue.shift
+ end
+
+ # Returns the element at the current position.
+ def current()
+ if @queue.empty?
+ raise EOFError, "no more elements available"
+ end
+
+ @queue.first
+ end
+
+ # Rewinds the generator.
+ def rewind()
+ initialize(nil, &@block) if @index.nonzero?
+
+ self
+ end
+
+ # Rewinds the generator and enumerates the elements.
+ def each
+ rewind
+
+ until end?
+ yield self.next
+ end
+
+ self
+ end
+end
+
+class Enumerable::Enumerator
+ def __generator
+ @generator ||= Generator.new(self)
+ end
+ private :__generator
+
+ # call-seq:
+ # e.next => object
+ #
+ # Returns the next object in the enumerator, and move the internal
+ # position forward. When the position reached at the end, internal
+ # position is rewinded then StopIteration is raised.
+ #
+ # Note that enumeration sequence by next method does not affect other
+ # non-external enumeration methods, unless underlying iteration
+ # methods itself has side-effect, e.g. IO#each_line.
+ #
+ # Caution: This feature internally uses Generator, which uses callcc
+ # to stop and resume enumeration to fetch each value. Use with care
+ # and be aware of the performance loss.
+ def next
+ g = __generator
+ return g.next unless g.end?
+
+ g.rewind
+ raise StopIteration, 'iteration reached at end'
+ end
+
+ # call-seq:
+ # e.rewind => e
+ #
+ # Rewinds the enumeration sequence by the next method.
+ def rewind
+ __generator.rewind
+ self
+ end
+end
+
+#
+# SyncEnumerator creates an Enumerable object from multiple Enumerable
+# objects and enumerates them synchronously.
+#
+# == Example
+#
+# require 'generator'
+#
+# s = SyncEnumerator.new([1,2,3], ['a', 'b', 'c'])
+#
+# # Yields [1, 'a'], [2, 'b'], and [3,'c']
+# s.each { |row| puts row.join(', ') }
+#
+class SyncEnumerator
+ include Enumerable
+
+ # Creates a new SyncEnumerator which enumerates rows of given
+ # Enumerable objects.
+ def initialize(*enums)
+ @gens = enums.map { |e| Generator.new(e) }
+ end
+
+ # Returns the number of enumerated Enumerable objects, i.e. the size
+ # of each row.
+ def size
+ @gens.size
+ end
+
+ # Returns the number of enumerated Enumerable objects, i.e. the size
+ # of each row.
+ def length
+ @gens.length
+ end
+
+ # Returns true if the given nth Enumerable object has reached the
+ # end. If no argument is given, returns true if any of the
+ # Enumerable objects has reached the end.
+ def end?(i = nil)
+ if i.nil?
+ @gens.detect { |g| g.end? } ? true : false
+ else
+ @gens[i].end?
+ end
+ end
+
+ # Enumerates rows of the Enumerable objects.
+ def each
+ @gens.each { |g| g.rewind }
+
+ loop do
+ count = 0
+
+ ret = @gens.map { |g|
+ if g.end?
+ count += 1
+ nil
+ else
+ g.next
+ end
+ }
+
+ if count == @gens.size
+ break
+ end
+
+ yield ret
+ end
+
+ self
+ end
+end
+
+if $0 == __FILE__
+ eval DATA.read, nil, $0, __LINE__+4
+end
+
+__END__
+
+require 'test/unit'
+
+class TC_Generator < Test::Unit::TestCase
+ def test_block1
+ g = Generator.new { |g|
+ # no yield's
+ }
+
+ assert_equal(0, g.pos)
+ assert_raises(EOFError) { g.current }
+ end
+
+ def test_block2
+ g = Generator.new { |g|
+ for i in 'A'..'C'
+ g.yield i
+ end
+
+ g.yield 'Z'
+ }
+
+ assert_equal(0, g.pos)
+ assert_equal('A', g.current)
+
+ assert_equal(true, g.next?)
+ assert_equal(0, g.pos)
+ assert_equal('A', g.current)
+ assert_equal(0, g.pos)
+ assert_equal('A', g.next)
+
+ assert_equal(1, g.pos)
+ assert_equal(true, g.next?)
+ assert_equal(1, g.pos)
+ assert_equal('B', g.current)
+ assert_equal(1, g.pos)
+ assert_equal('B', g.next)
+
+ assert_equal(g, g.rewind)
+
+ assert_equal(0, g.pos)
+ assert_equal('A', g.current)
+
+ assert_equal(true, g.next?)
+ assert_equal(0, g.pos)
+ assert_equal('A', g.current)
+ assert_equal(0, g.pos)
+ assert_equal('A', g.next)
+
+ assert_equal(1, g.pos)
+ assert_equal(true, g.next?)
+ assert_equal(1, g.pos)
+ assert_equal('B', g.current)
+ assert_equal(1, g.pos)
+ assert_equal('B', g.next)
+
+ assert_equal(2, g.pos)
+ assert_equal(true, g.next?)
+ assert_equal(2, g.pos)
+ assert_equal('C', g.current)
+ assert_equal(2, g.pos)
+ assert_equal('C', g.next)
+
+ assert_equal(3, g.pos)
+ assert_equal(true, g.next?)
+ assert_equal(3, g.pos)
+ assert_equal('Z', g.current)
+ assert_equal(3, g.pos)
+ assert_equal('Z', g.next)
+
+ assert_equal(4, g.pos)
+ assert_equal(false, g.next?)
+ assert_raises(EOFError) { g.next }
+ end
+
+ def test_each
+ a = [5, 6, 7, 8, 9]
+
+ g = Generator.new(a)
+
+ i = 0
+
+ g.each { |x|
+ assert_equal(a[i], x)
+
+ i += 1
+
+ break if i == 3
+ }
+
+ assert_equal(3, i)
+
+ i = 0
+
+ g.each { |x|
+ assert_equal(a[i], x)
+
+ i += 1
+ }
+
+ assert_equal(5, i)
+ end
+end
+
+class TC_SyncEnumerator < Test::Unit::TestCase
+ def test_each
+ r = ['a'..'f', 1..10, 10..20]
+ ra = r.map { |x| x.to_a }
+
+ a = (0...(ra.map {|x| x.size}.max)).map { |i| ra.map { |x| x[i] } }
+
+ s = SyncEnumerator.new(*r)
+
+ i = 0
+
+ s.each { |x|
+ assert_equal(a[i], x)
+
+ i += 1
+
+ break if i == 3
+ }
+
+ assert_equal(3, i)
+
+ i = 0
+
+ s.each { |x|
+ assert_equal(a[i], x)
+
+ i += 1
+ }
+
+ assert_equal(a.size, i)
+ end
+end
diff --git a/lib/getoptlong.rb b/lib/getoptlong.rb
index 2d3b617d6b..4d004419b1 100644
--- a/lib/getoptlong.rb
+++ b/lib/getoptlong.rb
@@ -12,10 +12,10 @@
# found at http://www.sra.co.jp/people/m-kasahr/ruby/getoptlong/
# The GetoptLong class allows you to parse command line options similarly to
-# the GNU getopt_long() C library call. Note, however, that GetoptLong is a
+# the GNU getopt_long() C library call. Note, however, that GetoptLong is a
# pure Ruby implementation.
#
-# GetoptLong allows for POSIX-style options like <tt>--file</tt> as well
+# GetoptLong allows for POSIX-style options like <tt>--file</tt> as well
# as single letter options like <tt>-f</tt>
#
# The empty option <tt>--</tt> (two minus symbols) is used to end option
@@ -24,34 +24,41 @@
#
# Here is a simple example of usage:
#
+# # == Synopsis
+# #
+# # hello: greets user, demonstrates command line parsing
+# #
+# # == Usage
+# #
+# # hello [OPTION] ... DIR
+# #
+# # -h, --help:
+# # show help
+# #
+# # --repeat x, -n x:
+# # repeat x times
+# #
+# # --name [name]:
+# # greet user by name, if name not supplied default is John
+# #
+# # DIR: The directory in which to issue the greeting.
+#
# require 'getoptlong'
-#
+# require 'rdoc/usage'
+#
# opts = GetoptLong.new(
# [ '--help', '-h', GetoptLong::NO_ARGUMENT ],
# [ '--repeat', '-n', GetoptLong::REQUIRED_ARGUMENT ],
# [ '--name', GetoptLong::OPTIONAL_ARGUMENT ]
# )
-#
+#
# dir = nil
# name = nil
# repetitions = 1
# opts.each do |opt, arg|
# case opt
# when '--help'
-# puts <<-EOF
-# hello [OPTION] ... DIR
-#
-# -h, --help:
-# show help
-#
-# --repeat x, -n x:
-# repeat x times
-#
-# --name [name]:
-# greet user by name, if name not supplied default is John
-#
-# DIR: The directory in which to issue the greeting.
-# EOF
+# RDoc::usage
# when '--repeat'
# repetitions = arg.to_i
# when '--name'
@@ -62,14 +69,14 @@
# end
# end
# end
-#
+#
# if ARGV.length != 1
# puts "Missing dir argument (try --help)"
# exit 0
# end
-#
+#
# dir = ARGV.shift
-#
+#
# Dir.chdir(dir)
# for i in (1..repetitions)
# print "Hello"
@@ -104,7 +111,7 @@ class GetoptLong
# Error types.
#
class Error < StandardError; end
- class AmbiguousOption < Error; end
+ class AmbigousOption < Error; end
class NeedlessArgument < Error; end
class MissingArgument < Error; end
class InvalidOption < Error; end
@@ -113,7 +120,7 @@ class GetoptLong
# Set up option processing.
#
# The options to support are passed to new() as an array of arrays.
- # Each sub-array contains any number of String option names which carry
+ # Each sub-array contains any number of String option names which carry
# the same meaning, and one of the following flags:
#
# GetoptLong::NO_ARGUMENT :: Option does not take an argument.
@@ -150,7 +157,7 @@ class GetoptLong
@argument_flags = Hash.new
#
- # Whether error messages are output to $stderr.
+ # Whether error messages are output to $deferr.
#
@quiet = FALSE
@@ -193,23 +200,23 @@ class GetoptLong
# the processing of options as follows:
#
# <b>REQUIRE_ORDER</b> :
- #
+ #
# Options are required to occur before non-options.
#
# Processing of options ends as soon as a word is encountered that has not
# been preceded by an appropriate option flag.
#
# For example, if -a and -b are options which do not take arguments,
- # parsing command line arguments of '-a one -b two' would result in
- # 'one', '-b', 'two' being left in ARGV, and only ('-a', '') being
+ # parsing command line arguments of '-a one -b two' would result in
+ # 'one', '-b', 'two' being left in ARGV, and only ('-a', '') being
# processed as an option/arg pair.
#
# This is the default ordering, if the environment variable
# POSIXLY_CORRECT is set. (This is for compatibility with GNU getopt_long.)
#
# <b>PERMUTE</b> :
- #
- # Options can occur anywhere in the command line parsed. This is the
+ #
+ # Options can occur anywhere in the command line parsed. This is the
# default behavior.
#
# Every sequence of words which can be interpreted as an option (with or
@@ -226,7 +233,7 @@ class GetoptLong
#
# <b>RETURN_IN_ORDER</b> :
#
- # All words on the command line are processed as options. Words not
+ # All words on the command line are processed as options. Words not
# preceded by a short or long option flag are passed as arguments
# with an option of '' (empty string).
#
@@ -272,7 +279,7 @@ class GetoptLong
# The method is failed if option processing has already started.
#
if @status != STATUS_YET
- raise RuntimeError,
+ raise RuntimeError,
"invoke set_options, but option processing has already started"
end
@@ -282,8 +289,14 @@ class GetoptLong
@canonical_names.clear
@argument_flags.clear
- arguments.each do |*arg|
- arg = arg.first # TODO: YARV Hack
+ arguments.each do |arg|
+ #
+ # Each argument must be an Array.
+ #
+ if !arg.is_a?(Array)
+ raise ArgumentError, "the option list contains non-Array argument"
+ end
+
#
# Find an argument flag and it set to `argument_flag'.
#
@@ -296,7 +309,6 @@ class GetoptLong
argument_flag = i
end
end
-
raise ArgumentError, "no argument-flag" if argument_flag == nil
canonical_name = nil
@@ -319,7 +331,7 @@ class GetoptLong
end
#
- # Register the option (`i') to the `@canonical_names' and
+ # Register the option (`i') to the `@canonical_names' and
# `@canonical_names' Hashes.
#
if canonical_name == nil
@@ -376,10 +388,10 @@ class GetoptLong
end
#
- # Set an error (a protected method).
+ # Set an error (protected).
#
def set_error(type, message)
- $stderr.print("#{$0}: #{message}\n") if !@quiet
+ $deferr.print("#{$0}: #{message}\n") if !@quiet
@error = type
@error_message = message
@@ -451,7 +463,7 @@ class GetoptLong
return nil
end
argument = ARGV.shift
- elsif @ordering == REQUIRE_ORDER
+ elsif @ordering == REQUIRE_ORDER
if (ARGV[0] !~ /^-./)
terminate
return nil
@@ -485,16 +497,16 @@ class GetoptLong
# The option `option_name' is not registered in `@canonical_names'.
# It may be an abbreviated.
#
- matches = []
+ match_count = 0
@canonical_names.each_key do |key|
if key.index(pattern) == 0
option_name = key
- matches << key
+ match_count += 1
end
end
- if 2 <= matches.length
- set_error(AmbiguousOption, "option `#{argument}' is ambiguous between #{matches.join(', ')}")
- elsif matches.length == 0
+ if 2 <= match_count
+ set_error(AmbigousOption, "option `#{argument}' is ambiguous")
+ elsif match_count == 0
set_error(InvalidOption, "unrecognized option `#{argument}'")
end
end
@@ -563,7 +575,7 @@ class GetoptLong
# 1003.2 specifies the format of this message.
#
if ENV.include?('POSIXLY_CORRECT')
- set_error(InvalidOption, "invalid option -- #{ch}")
+ set_error(InvalidOption, "illegal option -- #{ch}")
else
set_error(InvalidOption, "invalid option -- #{ch}")
end
@@ -588,7 +600,7 @@ class GetoptLong
#
# The block is called repeatedly with two arguments:
# The first is the option name.
- # The second is the argument which followed it (if any).
+ # The second is the argument which followed it (if any).
# Example: ('--opt', 'value')
#
# The option name is always converted to the first (preferred)
diff --git a/lib/getopts.rb b/lib/getopts.rb
new file mode 100644
index 0000000000..7124269351
--- /dev/null
+++ b/lib/getopts.rb
@@ -0,0 +1,127 @@
+#
+# getopts.rb -
+# $Release Version: $
+# $Revision$
+# $Date$
+# by Yasuo OHBA(SHL Japan Inc. Technology Dept.)
+#
+# --
+# this is obsolete; use getoptlong
+#
+# 2000-03-21
+# modified by Minero Aoki <aamine@dp.u-netsurf.ne.jp>
+#
+# 2002-03-05
+# rewritten by Akinori MUSHA <knu@ruby-lang.org>
+#
+
+warn "Warning:#{caller[0].sub(/:in `.*'\z/, '')}: getopts is deprecated after Ruby 1.8.1; use optparse instead" if caller[0] and $VERBOSE
+
+$RCS_ID=%q$Header$
+
+# getopts is obsolete. Use GetoptLong.
+
+def getopts(single_options, *options)
+ boolopts = {}
+ valopts = {}
+
+ #
+ # set defaults
+ #
+ single_options.scan(/.:?/) do |opt|
+ if opt.size == 1
+ boolopts[opt] = false
+ else
+ valopts[opt[0, 1]] = nil
+ end
+ end if single_options
+
+ options.each do |arg|
+ opt, val = arg.split(':', 2)
+
+ if val
+ valopts[opt] = val.empty? ? nil : val
+ else
+ boolopts[opt] = false
+ end
+ end
+
+ #
+ # scan
+ #
+ c = 0
+ argv = ARGV
+
+ while arg = argv.shift
+ case arg
+ when /\A--(.*)/
+ if $1.empty? # xinit -- -bpp 24
+ break
+ end
+
+ opt, val = $1.split('=', 2)
+
+ if opt.size == 1
+ argv.unshift arg
+ return nil
+ elsif valopts.key? opt # imclean --src +trash
+ valopts[opt] = val || argv.shift or return nil
+ elsif boolopts.key? opt # ruby --verbose
+ boolopts[opt] = true
+ else
+ argv.unshift arg
+ return nil
+ end
+
+ c += 1
+ when /\A-(.+)/
+ opts = $1
+
+ until opts.empty?
+ opt = opts.slice!(0, 1)
+
+ if valopts.key? opt
+ val = opts
+
+ if val.empty? # ruby -e 'p $:'
+ valopts[opt] = argv.shift or return nil
+ else # cc -ohello ...
+ valopts[opt] = val
+ end
+
+ c += 1
+ break
+ elsif boolopts.key? opt
+ boolopts[opt] = true # ruby -h
+ c += 1
+ else
+ argv.unshift arg
+ return nil
+ end
+ end
+ else
+ argv.unshift arg
+ break
+ end
+ end
+
+ #
+ # set
+ #
+ $OPT = {}
+
+ boolopts.each do |opt, val|
+ $OPT[opt] = val
+
+ sopt = opt.gsub(/[^A-Za-z0-9_]/, '_')
+ eval "$OPT_#{sopt} = val"
+ end
+ valopts.each do |opt, val|
+ $OPT[opt] = val
+
+ sopt = opt.gsub(/[^A-Za-z0-9_]/, '_')
+ eval "$OPT_#{sopt} = val"
+ end
+
+ c
+end
diff --git a/lib/gserver.rb b/lib/gserver.rb
index 2ab6e42bce..eb5f31b7b3 100644
--- a/lib/gserver.rb
+++ b/lib/gserver.rb
@@ -13,7 +13,7 @@ require "thread"
#
# GServer implements a generic server, featuring thread pool management,
-# simple logging, and multi-server management. See HttpServer in
+# simple logging, and multi-server management. See HttpServer in
# <tt>xmlrpc/httpserver.rb</tt> in the Ruby standard library for an example of
# GServer in action.
#
@@ -34,30 +34,30 @@ require "thread"
#
# #
# # A server that returns the time in seconds since 1970.
-# #
+# #
# class TimeServer < GServer
# def initialize(port=10001, *args)
# super(port, *args)
# end
# def serve(io)
-# io.puts(Time.now.to_s)
+# io.puts(Time.now.to_i)
# end
# end
#
# # Run the server with logging enabled (it's a separate thread).
# server = TimeServer.new
# server.audit = true # Turn logging on.
-# server.start
+# server.start
#
# # *** Now point your browser to http://localhost:10001 to see it working ***
#
-# # See if it's still running.
+# # See if it's still running.
# GServer.in_service?(10001) # -> true
# server.stopped? # -> false
#
# # Shut the server down gracefully.
# server.shutdown
-#
+#
# # Alternatively, stop it immediately.
# GServer.stop(10001)
# # or, of course, "server.stop".
diff --git a/lib/importenv.rb b/lib/importenv.rb
new file mode 100644
index 0000000000..8e1ba33b1d
--- /dev/null
+++ b/lib/importenv.rb
@@ -0,0 +1,33 @@
+# importenv.rb -- imports environment variables as global variables, Perlish ;(
+#
+# Usage:
+#
+# require 'importenv'
+# p $USER
+# $USER = "matz"
+# p ENV["USER"]
+
+warn "Warning:#{caller[0].sub(/:in `.*'\z/, '')}: importenv is deprecated after Ruby 1.8.1 (no replacement)"
+
+for k,v in ENV
+ next unless /^[a-zA-Z][_a-zA-Z0-9]*/ =~ k
+ eval <<EOS
+ $#{k} = v
+ trace_var "$#{k}", proc{|v|
+ ENV[%q!#{k}!] = v
+ $#{k} = v
+ if v == nil
+ untrace_var "$#{k}"
+ end
+ }
+EOS
+end
+
+if __FILE__ == $0
+ p $TERM
+ $TERM = nil
+ p $TERM
+ p ENV["TERM"]
+ $TERM = "foo"
+ p ENV["TERM"]
+end
diff --git a/lib/ipaddr.rb b/lib/ipaddr.rb
index 282ca09a8f..23d74af451 100644
--- a/lib/ipaddr.rb
+++ b/lib/ipaddr.rb
@@ -66,19 +66,19 @@ end
# == Example
#
# require 'ipaddr'
-#
+#
# ipaddr1 = IPAddr.new "3ffe:505:2::1"
-#
+#
# p ipaddr1 #=> #<IPAddr: IPv6:3ffe:0505:0002:0000:0000:0000:0000:0001/ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff>
-#
+#
# p ipaddr1.to_s #=> "3ffe:505:2::1"
-#
+#
# ipaddr2 = ipaddr1.mask(48) #=> #<IPAddr: IPv6:3ffe:0505:0002:0000:0000:0000:0000:0000/ffff:ffff:ffff:0000:0000:0000:0000:0000>
-#
+#
# p ipaddr2.to_s #=> "3ffe:505:2::"
-#
+#
# ipaddr3 = IPAddr.new "192.168.2.0/24"
-#
+#
# p ipaddr3 #=> #<IPAddr: IPv4:192.168.2.0/255.255.255.0>
class IPAddr
@@ -88,7 +88,7 @@ class IPAddr
IN6FORMAT = (["%.4x"] * 8).join(':')
# Returns the address family of this IP address.
- attr_reader :family
+ attr :family
# Creates a new ipaddr containing the given network byte ordered
# string form of an IP address.
@@ -331,16 +331,6 @@ class IPAddr
end
include Comparable
- # Checks equality used by Hash.
- def eql?(other)
- return self.class == other.class && self.hash == other.hash && self == other
- end
-
- # Returns a hash value used by Hash, Set, and Array classes
- def hash
- return ([@addr, @mask_addr].hash << 1) | (ipv4? ? 0 : 1)
- end
-
# Creates a Range object for the network address.
def to_range
begin_addr = (@addr & @mask_addr)
@@ -435,7 +425,7 @@ class IPAddr
# Creates a new ipaddr object either from a human readable IP
# address representation in string, or from a packed in_addr value
# followed by an address family.
- #
+ #
# In the former case, the following are the valid formats that will
# be recognized: "address", "address/prefixlen" and "address/mask",
# where IPv6 address may be enclosed in square brackets (`[' and
@@ -443,7 +433,7 @@ class IPAddr
# IP address. Although the address family is determined
# automatically from a specified string, you can specify one
# explicitly by the optional second argument.
- #
+ #
# Otherwise an IP addess is generated from a packed in_addr value
# and an address family.
#
@@ -493,7 +483,7 @@ class IPAddr
if prefixlen
mask!(prefixlen)
else
- @mask_addr = (@family == Socket::AF_INET) ? IN4MASK : IN6MASK
+ @mask_addr = (family == Socket::AF_INET) ? IN4MASK : IN6MASK
end
end
@@ -587,6 +577,7 @@ end
__END__
require 'test/unit'
+require 'test/unit/ui/console/testrunner'
class TC_IPAddr < Test::Unit::TestCase
def test_s_new
@@ -820,31 +811,4 @@ class TC_Operator < Test::Unit::TestCase
end
- def test_hash
- a1 = IPAddr.new('192.168.2.0')
- a2 = IPAddr.new('192.168.2.0')
- a3 = IPAddr.new('3ffe:505:2::1')
- a4 = IPAddr.new('3ffe:505:2::1')
- a5 = IPAddr.new('127.0.0.1')
- a6 = IPAddr.new('::1')
- a7 = IPAddr.new('192.168.2.0/25')
- a8 = IPAddr.new('192.168.2.0/25')
-
- h = { a1 => 'ipv4', a2 => 'ipv4', a3 => 'ipv6', a4 => 'ipv6', a5 => 'ipv4', a6 => 'ipv6', a7 => 'ipv4', a8 => 'ipv4'}
- assert_equal(5, h.size)
- assert_equal('ipv4', h[a1])
- assert_equal('ipv4', h[a2])
- assert_equal('ipv6', h[a3])
- assert_equal('ipv6', h[a4])
-
- require 'set'
- s = Set[a1, a2, a3, a4, a5, a6, a7, a8]
- assert_equal(5, s.size)
- assert_equal(true, s.include?(a1))
- assert_equal(true, s.include?(a2))
- assert_equal(true, s.include?(a3))
- assert_equal(true, s.include?(a4))
- assert_equal(true, s.include?(a5))
- assert_equal(true, s.include?(a6))
- end
end
diff --git a/lib/irb.rb b/lib/irb.rb
index d914f06a7a..7580e39d43 100644
--- a/lib/irb.rb
+++ b/lib/irb.rb
@@ -1,7 +1,8 @@
#
# irb.rb - irb main module
-# $Release Version: 0.9.6 $
+# $Release Version: 0.9.5 $
# $Revision$
+# $Date$
# by Keiju ISHITSUKA(keiju@ruby-lang.org)
#
# --
@@ -64,21 +65,13 @@ module IRB
trap("SIGINT") do
irb.signal_handle
end
-
- begin
- catch(:IRB_EXIT) do
- irb.eval_input
- end
- ensure
- irb_at_exit
+
+ catch(:IRB_EXIT) do
+ irb.eval_input
end
# print "\n"
end
- def IRB.irb_at_exit
- @CONF[:AT_EXIT].each{|hook| hook.call}
- end
-
def IRB.irb_exit(irb, ret)
throw :IRB_EXIT, ret
end
@@ -92,7 +85,7 @@ module IRB
end
#
- # irb interpreter main routine
+ # irb interpriter main routine
#
class Irb
def initialize(workspace = nil, input_method = nil, output_method = nil)
@@ -115,7 +108,7 @@ module IRB
f = @context.prompt_c
elsif indent > 0
f = @context.prompt_n
- else
+ else @context.prompt_i
f = @context.prompt_i
end
f = "" unless f
@@ -133,7 +126,7 @@ module IRB
end
end
end
-
+
@scanner.set_input(@context.io) do
signal_status(:IN_INPUT) do
if l = @context.io.gets
@@ -164,13 +157,12 @@ module IRB
end
if exc
print exc.class, ": ", exc, "\n"
- if exc.backtrace[0] =~ /irb(2)?(\/.*|-.*|\.rb)?:/ && exc.class.to_s !~ /^IRB/ &&
- !(SyntaxError === exc)
- irb_bug = true
+ if exc.backtrace[0] =~ /irb(2)?(\/.*|-.*|\.rb)?:/ && exc.class.to_s !~ /^IRB/
+ irb_bug = true
else
irb_bug = false
end
-
+
messages = []
lasts = []
levels = 0
@@ -182,7 +174,7 @@ module IRB
else
lasts.push "\tfrom "+m
if lasts.size > @context.back_trace_limit
- lasts.shift
+ lasts.shift
levels += 1
end
end
@@ -287,13 +279,13 @@ module IRB
when "l"
ltype
when "i"
- if $1
+ if $1
format("%" + $1 + "d", indent)
else
indent.to_s
end
when "n"
- if $1
+ if $1
format("%" + $1 + "d", line_no)
else
line_no.to_s
@@ -306,13 +298,17 @@ module IRB
end
def output_value
- printf @context.return_format, @context.inspect_last_value
+ if @context.inspect?
+ printf @context.return_format, @context.last_value.inspect
+ else
+ printf @context.return_format, @context.last_value
+ end
end
def inspect
ary = []
for iv in instance_variables
- case (iv = iv.to_s)
+ case iv
when "@signal_status"
ary.push format("%s=:%s", iv, @signal_status.id2name)
when "@context"
diff --git a/lib/irb/cmd/chws.rb b/lib/irb/cmd/chws.rb
index 65c977016b..88585b778b 100644
--- a/lib/irb/cmd/chws.rb
+++ b/lib/irb/cmd/chws.rb
@@ -1,12 +1,13 @@
#
-# change-ws.rb -
-# $Release Version: 0.9.6$
+# change-ws.rb -
+# $Release Version: 0.9.5$
# $Revision$
+# $Date$
# by Keiju ISHITSUKA(keiju@ruby-lang.org)
#
# --
#
-#
+#
#
require "irb/cmd/nop.rb"
diff --git a/lib/irb/cmd/fork.rb b/lib/irb/cmd/fork.rb
index 45350cb1b7..2866b1373b 100644
--- a/lib/irb/cmd/fork.rb
+++ b/lib/irb/cmd/fork.rb
@@ -1,12 +1,13 @@
#
-# fork.rb -
-# $Release Version: 0.9.6 $
+# fork.rb -
+# $Release Version: 0.9.5 $
# $Revision$
+# $Date$
# by Keiju ISHITSUKA(keiju@ruby-lang.org)
#
# --
#
-#
+#
#
@RCS_ID='-$Id$-'
@@ -17,7 +18,7 @@ module IRB
class Fork<Nop
def execute(&block)
pid = send ExtendCommand.irb_original_method_name("fork")
- unless pid
+ unless pid
class<<self
alias_method :exit, ExtendCommand.irb_original_method_name('exit')
end
diff --git a/lib/irb/cmd/help.rb b/lib/irb/cmd/help.rb
index d2d6ef4083..3e8d1388e0 100644
--- a/lib/irb/cmd/help.rb
+++ b/lib/irb/cmd/help.rb
@@ -1,30 +1,28 @@
#
# help.rb - helper using ri
-# $Release Version: 0.9.6$
+# $Release Version: 0.9.5$
# $Revision$
+# $Date$
#
# --
#
+#
#
-#
-
-require 'rdoc/ri/driver'
-require 'rdoc/ri/util'
-require "irb/cmd/nop.rb"
+require 'rdoc/ri/ri_driver'
module IRB
module ExtendCommand
- class Help<Nop
+ module Help
begin
- Ri = RDoc::RI::Driver.new
+ @ri = RiDriver.new
rescue SystemExit
else
- def execute(*names)
+ def self.execute(context, *names)
names.each do |name|
begin
- Ri.get_info_for(name.to_s)
- rescue RDoc::RI::Error
+ @ri.get_info_for(name.to_s)
+ rescue RiError
puts $!.message
end
end
diff --git a/lib/irb/cmd/load.rb b/lib/irb/cmd/load.rb
index 2a6de21ed7..cbc5d91d03 100644
--- a/lib/irb/cmd/load.rb
+++ b/lib/irb/cmd/load.rb
@@ -1,12 +1,13 @@
#
-# load.rb -
-# $Release Version: 0.9.6$
+# load.rb -
+# $Release Version: 0.9.5$
# $Revision$
+# $Date$
# by Keiju ISHITSUKA(keiju@ruby-lang.org)
#
# --
#
-#
+#
#
require "irb/cmd/nop.rb"
@@ -25,7 +26,7 @@ module IRB
class Require<Nop
include IrbLoader
-
+
def execute(file_name)
# return ruby_require(file_name) unless IRB.conf[:USE_LOADER]
@@ -44,7 +45,7 @@ module IRB
when /\.(so|o|sl)$/
return ruby_require(file_name)
end
-
+
begin
irb_load(f = file_name + ".rb")
$".push f
diff --git a/lib/irb/cmd/nop.rb b/lib/irb/cmd/nop.rb
index 2b028975c8..aa553c959e 100644
--- a/lib/irb/cmd/nop.rb
+++ b/lib/irb/cmd/nop.rb
@@ -1,17 +1,18 @@
#
-# nop.rb -
-# $Release Version: 0.9.6$
+# nop.rb -
+# $Release Version: 0.9.5$
# $Revision$
+# $Date$
# by Keiju ISHITSUKA(keiju@ruby-lang.org)
#
# --
#
-#
+#
#
module IRB
module ExtendCommand
class Nop
-
+
@RCS_ID='-$Id$-'
def self.execute(conf, *opts)
diff --git a/lib/irb/cmd/pushws.rb b/lib/irb/cmd/pushws.rb
index 5fd567731c..eddaeae631 100644
--- a/lib/irb/cmd/pushws.rb
+++ b/lib/irb/cmd/pushws.rb
@@ -1,12 +1,13 @@
#
-# change-ws.rb -
-# $Release Version: 0.9.6$
+# change-ws.rb -
+# $Release Version: 0.9.5$
# $Revision$
+# $Date$
# by Keiju ISHITSUKA(keiju@ruby-lang.org)
#
# --
#
-#
+#
#
require "irb/cmd/nop.rb"
diff --git a/lib/irb/cmd/subirb.rb b/lib/irb/cmd/subirb.rb
index 4d54a72b6f..79d654b172 100644
--- a/lib/irb/cmd/subirb.rb
+++ b/lib/irb/cmd/subirb.rb
@@ -1,11 +1,14 @@
-# multi.rb -
-# $Release Version: 0.9.6$
+#!/usr/local/bin/ruby
+#
+# multi.rb -
+# $Release Version: 0.9.5$
# $Revision$
+# $Date$
# by Keiju ISHITSUKA(keiju@ruby-lang.org)
#
# --
#
-#
+#
#
require "irb/cmd/nop.rb"
diff --git a/lib/irb/completion.rb b/lib/irb/completion.rb
index 459f856dfe..000658e2a3 100644
--- a/lib/irb/completion.rb
+++ b/lib/irb/completion.rb
@@ -1,7 +1,8 @@
#
-# irb/completor.rb -
+# irb/completor.rb -
# $Release Version: 0.9$
# $Revision$
+# $Date$
# by Keiju ISHITSUKA(keiju@ishitsuka.com)
# From Original Idea of shugo@ruby-lang.org
#
@@ -15,16 +16,16 @@ module IRB
ReservedWords = [
"BEGIN", "END",
- "alias", "and",
- "begin", "break",
+ "alias", "and",
+ "begin", "break",
"case", "class",
"def", "defined", "do",
"else", "elsif", "end", "ensure",
- "false", "for",
- "if", "in",
- "module",
+ "false", "for",
+ "if", "in",
+ "module",
"next", "nil", "not",
- "or",
+ "or",
"redo", "rescue", "retry", "return",
"self", "super",
"then", "true",
@@ -32,10 +33,10 @@ module IRB
"when", "while",
"yield",
]
-
+
CompletionProc = proc { |input|
bind = IRB.conf[:MAIN_CONTEXT].workspace.binding
-
+
# puts "input: #{input}"
case input
@@ -44,7 +45,7 @@ module IRB
receiver = $1
message = Regexp.quote($2)
- candidates = Regexp.instance_methods.collect{|m| m.to_s}
+ candidates = Regexp.instance_methods(true)
select_message(receiver, message, candidates)
when /^([^\]]*\])\.([^.]*)$/
@@ -52,7 +53,7 @@ module IRB
receiver = $1
message = Regexp.quote($2)
- candidates = Array.instance_methods.collect{|m| m.to_s}
+ candidates = Array.instance_methods(true)
select_message(receiver, message, candidates)
when /^([^\}]*\})\.([^.]*)$/
@@ -60,10 +61,9 @@ module IRB
receiver = $1
message = Regexp.quote($2)
- candidates = Proc.instance_methods.collect{|m| m.to_s}
- candidates |= Hash.instance_methods.collect{|m| m.to_s}
+ candidates = Proc.instance_methods(true) | Hash.instance_methods(true)
select_message(receiver, message, candidates)
-
+
when /^(:[^:.]*)$/
# Symbol
if Symbol.respond_to?(:all_symbols)
@@ -77,7 +77,7 @@ module IRB
when /^::([A-Z][^:\.\(]*)$/
# Absolute Constant or class methods
receiver = $1
- candidates = Object.constants.collect{|m| m.to_s}
+ candidates = Object.constants
candidates.grep(/^#{receiver}/).collect{|e| "::" + e}
when /^(((::)?[A-Z][^:.\(]*)+)::?([^:.]*)$/
@@ -85,8 +85,7 @@ module IRB
receiver = $1
message = Regexp.quote($4)
begin
- candidates = eval("#{receiver}.constants.collect{|m| m.to_s}", bind)
- candidates |= eval("#{receiver}.methods.collect{|m| m.to_s}", bind)
+ candidates = eval("#{receiver}.constants | #{receiver}.methods", bind)
rescue Exception
candidates = []
end
@@ -97,7 +96,7 @@ module IRB
receiver = $1
message = Regexp.quote($2)
- candidates = Symbol.instance_methods.collect{|m| m.to_s}
+ candidates = Symbol.instance_methods(true)
select_message(receiver, message, candidates)
when /^(-?(0[dbo])?[0-9_]+(\.[0-9_]+)?([eE]-?[0-9]+)?)\.([^.]*)$/
@@ -106,7 +105,7 @@ module IRB
message = Regexp.quote($5)
begin
- candidates = eval(receiver, bind).methods.collect{|m| m.to_s}
+ candidates = eval(receiver, bind).methods
rescue Exception
candidates = []
end
@@ -118,15 +117,14 @@ module IRB
message = Regexp.quote($2)
begin
- candidates = eval(receiver, bind).methods.collect{|m| m.to_s}
+ candidates = eval(receiver, bind).methods
rescue Exception
candidates = []
end
select_message(receiver, message, candidates)
when /^(\$[^.]*)$/
- regmessage = Regexp.new(Regexp.quote($1))
- candidates = global_variables.collect{|m| m.to_s}.grep(regmessage)
+ candidates = global_variables.grep(Regexp.new(Regexp.quote($1)))
# when /^(\$?(\.?[^.]+)+)\.([^.]*)$/
when /^((\.?[^.]+)+)\.([^.]*)$/
@@ -134,17 +132,17 @@ module IRB
receiver = $1
message = Regexp.quote($3)
- gv = eval("global_variables", bind).collect{|m| m.to_s}
- lv = eval("local_variables", bind).collect{|m| m.to_s}
- cv = eval("self.class.constants", bind).collect{|m| m.to_s}
-
+ gv = eval("global_variables", bind)
+ lv = eval("local_variables", bind)
+ cv = eval("self.class.constants", bind)
+
if (gv | lv | cv).include?(receiver)
# foo.func and foo is local var.
- candidates = eval("#{receiver}.methods", bind).collect{|m| m.to_s}
+ candidates = eval("#{receiver}.methods", bind)
elsif /^[A-Z]/ =~ receiver and /\./ !~ receiver
# Foo::Bar.func
begin
- candidates = eval("#{receiver}.methods", bind).collect{|m| m.to_s}
+ candidates = eval("#{receiver}.methods", bind)
rescue Exception
candidates = []
end
@@ -157,9 +155,9 @@ module IRB
rescue Exception
name = ""
end
- next if name != "IRB::Context" and
+ next if name != "IRB::Context" and
/^(IRB|SLex|RubyLex|RubyToken)/ =~ name
- candidates.concat m.instance_methods(false).collect{|x| x.to_s}
+ candidates.concat m.instance_methods(false)
}
candidates.sort!
candidates.uniq!
@@ -172,19 +170,19 @@ module IRB
receiver = ""
message = Regexp.quote($1)
- candidates = String.instance_methods(true).collect{|m| m.to_s}
+ candidates = String.instance_methods(true)
select_message(receiver, message, candidates)
else
- candidates = eval("methods | private_methods | local_variables | self.class.constants", bind).collect{|m| m.to_s}
-
+ candidates = eval("methods | private_methods | local_variables | self.class.constants", bind)
+
(candidates|ReservedWords).grep(/^#{Regexp.quote(input)}/)
end
}
Operators = ["%", "&", "*", "**", "+", "-", "/",
"<", "<<", "<=", "<=>", "==", "===", "=~", ">", ">=", ">>",
- "[]", "[]=", "^", "!", "!=", "!~"]
+ "[]", "[]=", "^",]
def self.select_message(receiver, message, candidates)
candidates.grep(/^#{message}/).collect do |e|
diff --git a/lib/irb/context.rb b/lib/irb/context.rb
index a2778f76ab..d01bd4aefa 100644
--- a/lib/irb/context.rb
+++ b/lib/irb/context.rb
@@ -1,15 +1,15 @@
#
# irb/context.rb - irb context
-# $Release Version: 0.9.6$
+# $Release Version: 0.9.5$
# $Revision$
+# $Date$
# by Keiju ISHITSUKA(keiju@ruby-lang.org)
#
# --
#
-#
+#
#
require "irb/workspace"
-require "irb/inspector"
module IRB
class Context
@@ -35,8 +35,8 @@ module IRB
@load_modules = IRB.conf[:LOAD_MODULES]
@use_readline = IRB.conf[:USE_READLINE]
+ @inspect_mode = IRB.conf[:INSPECT_MODE]
- self.inspect_mode = IRB.conf[:INSPECT_MODE]
self.math_mode = IRB.conf[:MATH_MODE] if IRB.conf[:MATH_MODE]
self.use_tracer = IRB.conf[:USE_TRACER] if IRB.conf[:USE_TRACER]
self.use_loader = IRB.conf[:USE_LOADER] if IRB.conf[:USE_LOADER]
@@ -46,7 +46,7 @@ module IRB
@ignore_eof = IRB.conf[:IGNORE_EOF]
@back_trace_limit = IRB.conf[:BACK_TRACE_LIMIT]
-
+
self.prompt_mode = IRB.conf[:PROMPT_MODE]
if IRB.conf[:SINGLE_IRB] or !defined?(JobManager)
@@ -91,7 +91,7 @@ module IRB
@output_method = StdioOutputMethod.new
end
- @verbose = IRB.conf[:VERBOSE]
+ @verbose = IRB.conf[:VERBOSE]
@echo = IRB.conf[:ECHO]
if @echo.nil?
@echo = true
@@ -107,7 +107,7 @@ module IRB
attr_accessor :workspace
attr_reader :thread
attr_accessor :io
-
+
attr_accessor :irb
attr_accessor :ap_name
attr_accessor :rc
@@ -142,7 +142,7 @@ module IRB
def verbose?
if @verbose.nil?
- if defined?(ReadlineInputMethod) && @io.kind_of?(ReadlineInputMethod)
+ if defined?(ReadlineInputMethod) && @io.kind_of?(ReadlineInputMethod)
false
elsif !STDIN.tty? or @io.kind_of?(FileInputMethod)
true
@@ -180,7 +180,7 @@ module IRB
@auto_indent_mode = IRB.conf[:AUTO_INDENT]
end
end
-
+
def inspect?
@inspect_mode.nil? or @inspect_mode
end
@@ -190,49 +190,15 @@ module IRB
end
def inspect_mode=(opt)
-
- if i = INSPECTORS[opt]
+ if opt
@inspect_mode = opt
- @inspect_method = i
- i.init
else
- case opt
- when nil
- if INSPECTORS.keys_with_inspector(INSPECTORS[true]).include?(@inspect_mode)
- self.inspect_mode = false
- elsif INSPECTORS.keys_with_inspector(INSPECTORS[false]).include?(@inspect_mode)
- self.inspect_mode = true
- else
- puts "Can't switch inspect mode."
- return
- end
- when /^\s*\{.*\}\s*$/
- begin
- inspector = eval "proc#{opt}"
- rescue Exception
- puts "Can't switch inspect mode(#{opt})."
- return
- end
- self.inspect_mode = inspector
- when Proc
- self.inspect_mode = IRB::Inspector(opt)
- when Inspector
- prefix = "usr%d"
- i = 1
- while INSPECTORS[format(prefix, i)]; i += 1; end
- @inspect_mode = format(prefix, i)
- @inspect_method = opt
- INSPECTORS.def_inspector(format(prefix, i), @inspect_method)
- else
- puts "Can't switch inspect mode(#{opt})."
- return
- end
+ @inspect_mode = !@inspect_mode
end
print "Switch to#{unless @inspect_mode; ' non';end} inspect mode.\n" if verbose?
@inspect_mode
end
-
def use_readline=(opt)
@use_readline = opt
print "use readline module\n" if @use_readline
@@ -255,10 +221,6 @@ module IRB
# @_ = @workspace.evaluate(line, irb_path, line_no)
end
- def inspect_last_value
- @inspect_method.inspect_value(@last_value)
- end
-
alias __exit__ exit
def exit(ret = 0)
IRB.irb_exit(@irb, ret)
@@ -272,8 +234,7 @@ module IRB
def inspect
array = []
for ivar in instance_variables.sort{|e1, e2| e1 <=> e2}
- ivar = ivar.to_s
- name = ivar.sub(/^@(.*)$/, '\1')
+ name = ivar.sub(/^@(.*)$/){$1}
val = instance_eval(ivar)
case ivar
when *NOPRINTING_IVARS
diff --git a/lib/irb/ext/change-ws.rb b/lib/irb/ext/change-ws.rb
index dea969d384..fff8f58fe5 100644
--- a/lib/irb/ext/change-ws.rb
+++ b/lib/irb/ext/change-ws.rb
@@ -1,12 +1,13 @@
#
-# irb/ext/cb.rb -
-# $Release Version: 0.9.6$
+# irb/ext/cb.rb -
+# $Release Version: 0.9.5$
# $Revision$
+# $Date$
# by Keiju ISHITSUKA(keiju@ruby-lang.org)
#
# --
#
-#
+#
#
module IRB
@@ -22,12 +23,12 @@ module IRB
def change_workspace(*_main)
if _main.empty?
- @workspace = home_workspace
+ @workspace = home_workspace
return main
end
-
+
@workspace = WorkSpace.new(_main[0])
-
+
if !(class<<main;ancestors;end).include?(ExtendCommandBundle)
main.extend ExtendCommandBundle
end
@@ -56,6 +57,6 @@ module IRB
# end
# end
# alias change_workspace change_binding
- end
+ end
end
diff --git a/lib/irb/ext/history.rb b/lib/irb/ext/history.rb
index 1495f9eb14..40f8692e8b 100644
--- a/lib/irb/ext/history.rb
+++ b/lib/irb/ext/history.rb
@@ -1,12 +1,13 @@
#
-# history.rb -
-# $Release Version: 0.9.6$
+# history.rb -
+# $Release Version: 0.9.5$
# $Revision$
+# $Date$
# by Keiju ISHITSUKA(keiju@ruby-lang.org)
#
# --
#
-#
+#
#
module IRB
@@ -56,7 +57,7 @@ module IRB
end
def size(size)
- if size != 0 && size < @size
+ if size != 0 && size < @size
@contents = @contents[@size - size .. @size]
end
@size = size
@@ -78,7 +79,7 @@ module IRB
@contents.push [no, val]
@contents.shift if @size != 0 && @contents.size > @size
end
-
+
alias real_inspect inspect
def inspect
diff --git a/lib/irb/ext/loader.rb b/lib/irb/ext/loader.rb
index 26a3203676..837e2553ac 100644
--- a/lib/irb/ext/loader.rb
+++ b/lib/irb/ext/loader.rb
@@ -1,12 +1,13 @@
#
-# loader.rb -
-# $Release Version: 0.9.6$
+# loader.rb -
+# $Release Version: 0.9.5$
# $Revision$
+# $Date$
# by Keiju ISHITSUKA(keiju@ruby-lang.org)
#
# --
#
-#
+#
#
@@ -44,7 +45,7 @@ module IRB
irb.suspend_name(path, File.basename(path)) do
irb.suspend_input_method(FileInputMethod.new(path)) do
|back_io|
- irb.signal_status(:IN_LOAD) do
+ irb.signal_status(:IN_LOAD) do
if back_io.kind_of?(FileInputMethod)
irb.eval_input
else
@@ -61,7 +62,7 @@ module IRB
def load_file(path, priv = nil)
irb.suspend_name(path, File.basename(path)) do
-
+
if priv
ws = WorkSpace.new(Module.new)
else
@@ -70,7 +71,7 @@ module IRB
irb.suspend_workspace(ws) do
irb.suspend_input_method(FileInputMethod.new(path)) do
|back_io|
- irb.signal_status(:IN_LOAD) do
+ irb.signal_status(:IN_LOAD) do
# p irb.conf
if back_io.kind_of?(FileInputMethod)
irb.eval_input
diff --git a/lib/irb/ext/math-mode.rb b/lib/irb/ext/math-mode.rb
index 41be79841c..bd443b96ed 100644
--- a/lib/irb/ext/math-mode.rb
+++ b/lib/irb/ext/math-mode.rb
@@ -1,12 +1,13 @@
#
-# math-mode.rb -
-# $Release Version: 0.9.6$
+# math-mode.rb -
+# $Release Version: 0.9.5$
# $Revision$
+# $Date$
# by Keiju ISHITSUKA(keiju@ruby-lang.org)
#
# --
#
-#
+#
#
require "mathn"
diff --git a/lib/irb/ext/multi-irb.rb b/lib/irb/ext/multi-irb.rb
index 7bb1a7cfab..4589b1d554 100644
--- a/lib/irb/ext/multi-irb.rb
+++ b/lib/irb/ext/multi-irb.rb
@@ -1,12 +1,13 @@
#
# irb/multi-irb.rb - multiple irb module
-# $Release Version: 0.9.6$
+# $Release Version: 0.9.5$
# $Revision$
+# $Date$
# by Keiju ISHITSUKA(keiju@ruby-lang.org)
#
# --
#
-#
+#
#
IRB.fail CantShiftToMultiIrbMode unless defined?(Thread)
require "thread"
@@ -66,10 +67,10 @@ module IRB
IRB.fail IrbAlreadyDead unless th.alive?
th.exit
end
- end
+ end
def search(key)
- job = case key
+ case key
when Integer
@jobs[key]
when Irb
@@ -77,10 +78,10 @@ module IRB
when Thread
@jobs.assoc(key)
else
- @jobs.find{|k, v| v.context.main.equal?(key)}
+ assoc = @jobs.find{|k, v| v.context.main.equal?(key)}
+ IRB.fail NoSuchJob, key if assoc.nil?
+ assoc
end
- IRB.fail NoSuchJob, key if job.nil?
- job
end
def delete(key)
@@ -123,8 +124,8 @@ module IRB
t_status = "exited"
end
ary.push format("#%d->%s on %s (%s: %s)",
- i,
- irb.context.irb_name,
+ i,
+ irb.context.irb_name,
irb.context.main,
th,
t_status)
@@ -143,14 +144,14 @@ module IRB
IRB.JobManager.irb(Thread.current).context
end
- # invoke multi-irb
+ # invoke multi-irb
def IRB.irb(file = nil, *main)
workspace = WorkSpace.new(*main)
parent_thread = Thread.current
Thread.start do
begin
irb = Irb.new(workspace, file)
- rescue
+ rescue
print "Subirb can't start with context(self): ", workspace.main.inspect, "\n"
print "return to main irb\n"
Thread.pass
diff --git a/lib/irb/ext/save-history.rb b/lib/irb/ext/save-history.rb
index f9c983ac11..5260bfcdd8 100644
--- a/lib/irb/ext/save-history.rb
+++ b/lib/irb/ext/save-history.rb
@@ -1,11 +1,14 @@
-# save-history.rb -
-# $Release Version: 0.9.6$
+#!/usr/local/bin/ruby
+#
+# save-history.rb -
+# $Release Version: 0.9.5$
# $Revision$
-# by Keiju ISHITSUKA(keiju@ruby-lang.org)
+# $Date$
+# by Keiju ISHITSUKAkeiju@ruby-lang.org)
#
# --
#
-#
+#
#
require "readline"
@@ -47,51 +50,36 @@ module IRB
module HistorySavingAbility
include Readline
-# def HistorySavingAbility.create_finalizer
-# proc do
-# if num = IRB.conf[:SAVE_HISTORY] and (num = num.to_i) > 0
-# if hf = IRB.conf[:HISTORY_FILE]
-# file = File.expand_path(hf)
-# end
-# file = IRB.rc_file("_history") unless file
-# open(file, 'w' ) do |f|
-# hist = HISTORY.to_a
-# f.puts(hist[-num..-1] || hist)
-# end
-# end
-# end
-# end
+ def HistorySavingAbility.create_finalizer
+ proc do
+ if num = IRB.conf[:SAVE_HISTORY] and (num = num.to_i) > 0
+ if hf = IRB.conf[:HISTORY_FILE]
+ file = File.expand_path(hf)
+ end
+ file = IRB.rc_file("_history") unless file
+ open(file, 'w' ) do |f|
+ hist = HISTORY.to_a
+ f.puts(hist[-num..-1] || hist)
+ end
+ end
+ end
+ end
def HistorySavingAbility.extended(obj)
-# ObjectSpace.define_finalizer(obj, HistorySavingAbility.create_finalizer)
- IRB.conf[:AT_EXIT].push proc{obj.save_history}
+ ObjectSpace.define_finalizer(obj, HistorySavingAbility.create_finalizer)
obj.load_history
obj
end
def load_history
- if history_file = IRB.conf[:HISTORY_FILE]
- history_file = File.expand_path(history_file)
- end
- history_file = IRB.rc_file("_history") unless history_file
- if File.exist?(history_file)
- open(history_file) do |f|
+ hist = IRB.conf[:HISTORY_FILE]
+ hist = IRB.rc_file("_history") unless hist
+ if File.exist?(hist)
+ open(hist) do |f|
f.each {|l| HISTORY << l.chomp}
end
end
end
-
- def save_history
- if num = IRB.conf[:SAVE_HISTORY] and (num = num.to_i) > 0
- if history_file = IRB.conf[:HISTORY_FILE]
- history_file = File.expand_path(history_file)
- end
- history_file = IRB.rc_file("_history") unless history_file
- open(history_file, 'w' ) do |f|
- hist = HISTORY.to_a
- f.puts(hist[-num..-1] || hist)
- end
- end
- end
end
end
+
diff --git a/lib/irb/ext/tracer.rb b/lib/irb/ext/tracer.rb
index 46a9d53a2e..805f630a4d 100644
--- a/lib/irb/ext/tracer.rb
+++ b/lib/irb/ext/tracer.rb
@@ -1,12 +1,13 @@
#
-# irb/lib/tracer.rb -
-# $Release Version: 0.9.6$
+# irb/lib/tracer.rb -
+# $Release Version: 0.9.5$
# $Revision$
+# $Date$
# by Keiju ISHITSUKA(keiju@ruby-lang.org)
#
# --
#
-#
+#
#
require "tracer"
@@ -43,7 +44,7 @@ module IRB
alias __evaluate__ evaluate
def evaluate(context, statements, file = nil, line = nil)
if context.use_tracer? && file != nil && line != nil
- Tracer.on
+ Tracer.on
begin
__evaluate__(context, statements, file, line)
ensure
@@ -57,4 +58,4 @@ module IRB
IRB.initialize_tracer
end
-
+
diff --git a/lib/irb/ext/use-loader.rb b/lib/irb/ext/use-loader.rb
index 64283b8989..1b4d480fcd 100644
--- a/lib/irb/ext/use-loader.rb
+++ b/lib/irb/ext/use-loader.rb
@@ -1,12 +1,13 @@
#
-# use-loader.rb -
-# $Release Version: 0.9.6$
+# use-loader.rb -
+# $Release Version: 0.9.5$
# $Revision$
+# $Date$
# by Keiju ISHITSUKA(keiju@ruby-lang.org)
#
# --
#
-#
+#
#
require "irb/cmd/load"
@@ -30,7 +31,7 @@ module IRB
class Context
IRB.conf[:USE_LOADER] = false
-
+
def use_loader
IRB.conf[:USE_LOADER]
end
diff --git a/lib/irb/ext/workspaces.rb b/lib/irb/ext/workspaces.rb
index 118ea598c0..79098570dc 100644
--- a/lib/irb/ext/workspaces.rb
+++ b/lib/irb/ext/workspaces.rb
@@ -1,12 +1,13 @@
#
-# push-ws.rb -
-# $Release Version: 0.9.6$
+# push-ws.rb -
+# $Release Version: 0.9.5$
# $Revision$
+# $Date$
# by Keiju ISHITSUKA(keiju@ruby-lang.org)
#
# --
#
-#
+#
#
module IRB
diff --git a/lib/irb/extend-command.rb b/lib/irb/extend-command.rb
index 7bc033cee1..508721c11d 100644
--- a/lib/irb/extend-command.rb
+++ b/lib/irb/extend-command.rb
@@ -1,12 +1,13 @@
#
-# irb/extend-command.rb - irb extend command
-# $Release Version: 0.9.6$
+# irb/extend-command.rb - irb extend command
+# $Release Version: 0.9.5$
# $Revision$
+# $Date$
# by Keiju ISHITSUKA(keiju@ruby-lang.org)
#
# --
#
-#
+#
#
module IRB
#
@@ -89,15 +90,15 @@ module IRB
[:irb_load, :Load, "irb/cmd/load"],
[:irb_require, :Require, "irb/cmd/load"],
- [:irb_source, :Source, "irb/cmd/load",
+ [:irb_source, :Source, "irb/cmd/load",
[:source, NO_OVERRIDE]],
[:irb, :IrbCommand, "irb/cmd/subirb"],
- [:irb_jobs, :Jobs, "irb/cmd/subirb",
+ [:irb_jobs, :Jobs, "irb/cmd/subirb",
[:jobs, NO_OVERRIDE]],
- [:irb_fg, :Foreground, "irb/cmd/subirb",
+ [:irb_fg, :Foreground, "irb/cmd/subirb",
[:fg, NO_OVERRIDE]],
- [:irb_kill, :Kill, "irb/cmd/subirb",
+ [:irb_kill, :Kill, "irb/cmd/subirb",
[:kill, OVERRIDE_PRIVATE_ONLY]],
[:irb_help, :Help, "irb/cmd/help",
@@ -125,14 +126,9 @@ module IRB
eval %[
def #{cmd_name}(*opts, &b)
require "#{load_file}"
- arity = ExtendCommand::#{cmd_class}.instance_method(:execute).arity
- args = (1..arity.abs).map {|i| "arg" + i.to_s }
- args << "*opts" if arity < 0
- args << "&block"
- args = args.join(", ")
eval %[
- def #{cmd_name}(\#{args})
- ExtendCommand::#{cmd_class}.execute(irb_context, \#{args})
+ def #{cmd_name}(*opts, &b)
+ ExtendCommand::#{cmd_class}.execute(irb_context, *opts, &b)
end
]
send :#{cmd_name}, *opts, &b
@@ -161,9 +157,9 @@ module IRB
(override == NO_OVERRIDE) && !respond_to?(to, true)
target = self
(class<<self;self;end).instance_eval{
- if target.respond_to?(to, true) &&
+ if target.respond_to?(to, true) &&
!target.respond_to?(EXCB.irb_original_method_name(to), true)
- alias_method(EXCB.irb_original_method_name(to), to)
+ alias_method(EXCB.irb_original_method_name(to), to)
end
alias_method to, from
}
diff --git a/lib/irb/frame.rb b/lib/irb/frame.rb
index 8814b47a9d..f0b0a9abf3 100644
--- a/lib/irb/frame.rb
+++ b/lib/irb/frame.rb
@@ -1,12 +1,13 @@
#
-# frame.rb -
+# frame.rb -
# $Release Version: 0.9$
# $Revision$
+# $Date$
# by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd)
#
# --
#
-#
+#
#
require "e2mmap"
diff --git a/lib/irb/help.rb b/lib/irb/help.rb
index 4a308b6e46..4921de6ec9 100644
--- a/lib/irb/help.rb
+++ b/lib/irb/help.rb
@@ -1,35 +1,33 @@
#
# irb/help.rb - print usage module
-# $Release Version: 0.9.6$
+# $Release Version: 0.9.5$
# $Revision$
+# $Date$
# by Keiju ISHITSUKA(keiju@ishitsuka.com)
#
# --
#
+#
#
-#
-
-require 'irb/magic-file'
module IRB
def IRB.print_usage
lc = IRB.conf[:LC_MESSAGES]
path = lc.find("irb/help-message")
space_line = false
- IRB::MagicFile.open(path){|f|
- f.each_line do |l|
- if /^\s*$/ =~ l
- lc.puts l unless space_line
- space_line = true
- next
- end
- space_line = false
-
- l.sub!(/#.*$/, "")
- next if /^\s*$/ =~ l
- lc.puts l
+ File.foreach(path) do
+ |l|
+ if /^\s*$/ =~ l
+ lc.puts l unless space_line
+ space_line = true
+ next
end
- }
+ space_line = false
+
+ l.sub!(/#.*$/, "")
+ next if /^\s*$/ =~ l
+ lc.puts l
+ end
end
end
diff --git a/lib/irb/init.rb b/lib/irb/init.rb
index f51fd1c0b1..db22ca639b 100644
--- a/lib/irb/init.rb
+++ b/lib/irb/init.rb
@@ -1,12 +1,13 @@
#
# irb/init.rb - irb initialize module
-# $Release Version: 0.9.6$
+# $Release Version: 0.9.5$
# $Revision$
+# $Date$
# by Keiju ISHITSUKA(keiju@ruby-lang.org)
#
# --
#
-#
+#
#
module IRB
@@ -20,7 +21,7 @@ module IRB
IRB.load_modules
unless @CONF[:PROMPT][@CONF[:PROMPT_MODE]]
- IRB.fail(UndefinedPromptMode, @CONF[:PROMPT_MODE])
+ IRB.fail(UndefinedPromptMode, @CONF[:PROMPT_MODE])
end
end
@@ -44,7 +45,7 @@ module IRB
@CONF[:MATH_MODE] = false
@CONF[:USE_READLINE] = false unless defined?(ReadlineInputMethod)
- @CONF[:INSPECT_MODE] = true
+ @CONF[:INSPECT_MODE] = nil
@CONF[:USE_TRACER] = false
@CONF[:USE_LOADER] = false
@CONF[:IGNORE_SIGINT] = true
@@ -113,8 +114,6 @@ module IRB
# @CONF[:LC_MESSAGES] = "en"
@CONF[:LC_MESSAGES] = Locale.new
- @CONF[:AT_EXIT] = []
-
@CONF[:DEBUG_LEVEL] = 1
end
@@ -141,17 +140,10 @@ module IRB
when /^-I(.+)?/
opt = $1 || ARGV.shift
load_path.concat(opt.split(File::PATH_SEPARATOR)) if opt
- when '-U'
- set_encoding("UTF-8", "UTF-8")
- when /^-E(.+)?/, /^--encoding(?:=(.+))?/
- opt = $1 || ARGV.shift
- set_encoding(*opt.split(':', 2))
+ when /^-K(.)/
+ $KCODE = $1
when "--inspect"
- if /^-/ !~ ARGV.first
- @CONF[:INSPECT_MODE] = ARGV.shift
- else
- @CONF[:INSPECT_MODE] = true
- end
+ @CONF[:INSPECT_MODE] = true
when "--noinspect"
@CONF[:INSPECT_MODE] = false
when "--readline"
@@ -166,9 +158,8 @@ module IRB
@CONF[:VERBOSE] = true
when "--noverbose"
@CONF[:VERBOSE] = false
- when /^--prompt-mode(?:=(.+))?/, /^--prompt(?:=(.+))?/
- opt = $1 || ARGV.shift
- prompt_mode = opt.upcase.tr("-", "_").intern
+ when "--prompt-mode", "--prompt"
+ prompt_mode = ARGV.shift.upcase.tr("-", "_").intern
@CONF[:PROMPT_MODE] = prompt_mode
when "--noprompt"
@CONF[:PROMPT_MODE] = :NULL
@@ -178,14 +169,14 @@ module IRB
@CONF[:PROMPT_MODE] = :SIMPLE
when "--tracer"
@CONF[:USE_TRACER] = true
- when /^--back-trace-limit(?:=(.+))?/
- @CONF[:BACK_TRACE_LIMIT] = ($1 || ARGV.shift).to_i
- when /^--context-mode(?:=(.+))?/
- @CONF[:CONTEXT_MODE] = ($1 || ARGV.shift).to_i
+ when "--back-trace-limit"
+ @CONF[:BACK_TRACE_LIMIT] = ARGV.shift.to_i
+ when "--context-mode"
+ @CONF[:CONTEXT_MODE] = ARGV.shift.to_i
when "--single-irb"
@CONF[:SINGLE_IRB] = true
- when /^--irb_debug=(?:=(.+))?/
- @CONF[:DEBUG_LEVEL] = ($1 || ARGV.shift).to_i
+ when "--irb_debug"
+ @CONF[:DEBUG_LEVEL] = ARGV.shift.to_i
when "-v", "--version"
print IRB.version, "\n"
exit 0
@@ -193,12 +184,6 @@ module IRB
require "irb/help"
IRB.print_usage
exit 0
- when "--"
- if opt = ARGV.shfit
- @CONF[:SCRIPT] = opt
- $0 = opt
- end
- break
when /^-/
IRB.fail UnrecognizedSwitch, opt
else
@@ -213,7 +198,6 @@ module IRB
end
end
$LOAD_PATH.unshift(*load_path)
-
end
# running config
@@ -222,7 +206,7 @@ module IRB
begin
load rc_file
rescue LoadError, Errno::ENOENT
- rescue # StandardError, ScriptError
+ rescue
print "load error: #{rc_file}\n"
print $!.class, ": ", $!, "\n"
for err in $@[0, $@.size - 2]
@@ -249,10 +233,10 @@ module IRB
# enumerate possible rc-file base name generators
def IRB.rc_file_generators
if irbrc = ENV["IRBRC"]
- yield proc{|rc| rc == "rc" ? irbrc : irbrc+rc}
+ yield proc{|rc| rc == "rc" ? irbrc : irbrc+rc}
end
if home = ENV["HOME"]
- yield proc{|rc| home+"/.irb#{rc}"}
+ yield proc{|rc| home+"/.irb#{rc}"}
end
home = Dir.pwd
yield proc{|rc| home+"/.irb#{rc}"}
@@ -266,27 +250,10 @@ module IRB
for m in @CONF[:LOAD_MODULES]
begin
require m
- rescue LoadError => err
- warn err.backtrace[0] << ":#{err.class}: #{err}"
+ rescue
+ print $@[0], ":", $!.class, ": ", $!, "\n"
end
end
end
-
- DefaultEncodings = Struct.new(:external, :internal)
- class << IRB
- private
- def set_encoding(extern, intern = nil)
- verbose, $VERBOSE = $VERBOSE, nil
- Encoding.default_external = extern unless extern.nil? || extern.empty?
- Encoding.default_internal = intern unless intern.nil? || intern.empty?
- @CONF[:ENCODINGS] = IRB::DefaultEncodings.new(extern, intern)
- [$stdin, $stdout, $stderr].each do |io|
- io.set_encoding(extern, intern)
- end
- @CONF[:LC_MESSAGES].instance_variable_set(:@encoding, extern)
- ensure
- $VERBOSE = verbose
- end
- end
end
diff --git a/lib/irb/input-method.rb b/lib/irb/input-method.rb
index 7227df4ca0..bfb90fa59a 100644
--- a/lib/irb/input-method.rb
+++ b/lib/irb/input-method.rb
@@ -1,18 +1,16 @@
#
# irb/input-method.rb - input methods used irb
-# $Release Version: 0.9.6$
+# $Release Version: 0.9.5$
# $Revision$
+# $Date$
# by Keiju ISHITSUKA(keiju@ruby-lang.org)
#
# --
#
+#
#
-#
-require 'irb/src_encoding'
-require 'irb/magic-file'
-
module IRB
- #
+ #
# InputMethod
# StdioInputMethod
# FileInputMethod
@@ -28,7 +26,7 @@ module IRB
attr_reader :file_name
attr_accessor :prompt
-
+
def gets
IRB.fail NotImplementedError, "gets"
end
@@ -38,24 +36,21 @@ module IRB
false
end
end
-
+
class StdioInputMethod < InputMethod
def initialize
super
@line_no = 0
@line = []
- @stdin = IO.open(STDIN.to_i, :external_encoding => IRB.conf[:LC_MESSAGES].encoding, :internal_encoding => "-")
- @stdout = IO.open(STDOUT.to_i, 'w', :external_encoding => IRB.conf[:LC_MESSAGES].encoding, :internal_encoding => "-")
end
def gets
print @prompt
- line = @stdin.gets
- @line[@line_no += 1] = line
+ @line[@line_no += 1] = $stdin.gets
end
def eof?
- @stdin.eof?
+ $stdin.eof?
end
def readable_atfer_eof?
@@ -65,16 +60,12 @@ module IRB
def line(line_no)
@line[line_no]
end
-
- def encoding
- @stdin.external_encoding
- end
end
-
+
class FileInputMethod < InputMethod
def initialize(file)
super
- @io = IRB::MagicFile.open(file)
+ @io = open(file)
end
attr_reader :file_name
@@ -88,32 +79,23 @@ module IRB
# print @prompt, l
l
end
-
- def encoding
- @io.external_encoding
- end
end
begin
require "readline"
class ReadlineInputMethod < InputMethod
- include Readline
+ include Readline
def initialize
super
@line_no = 0
@line = []
@eof = false
-
- @stdin = IO.open(STDIN.to_i, :external_encoding => IRB.conf[:LC_MESSAGES].encoding, :internal_encoding => "-")
- @stdout = IO.open(STDOUT.to_i, 'w', :external_encoding => IRB.conf[:LC_MESSAGES].encoding, :internal_encoding => "-")
end
def gets
- Readline.input = @stdin
- Readline.output = @stdout
if l = readline(@prompt, false)
- HISTORY.push(l) if !l.empty?
+ HISTORY.push(l) if !l.empty?
@line[@line_no += 1] = l + "\n"
else
@eof = true
@@ -132,10 +114,6 @@ module IRB
def line(line_no)
@line[line_no]
end
-
- def encoding
- @stdin.external_encoding
- end
end
rescue LoadError
end
diff --git a/lib/irb/inspector.rb b/lib/irb/inspector.rb
deleted file mode 100644
index ab5128399e..0000000000
--- a/lib/irb/inspector.rb
+++ /dev/null
@@ -1,109 +0,0 @@
-#
-# irb/inspector.rb - inspect methods
-# $Release Version: 0.9.6$
-# $Revision: 1.19 $
-# $Date: 2002/06/11 07:51:31 $
-# by Keiju ISHITSUKA(keiju@ruby-lang.org)
-#
-# --
-#
-#
-#
-
-module IRB
-
- def IRB::Inspector(inspect, init = nil)
- Inspector.new(inspect, init)
- end
-
- class Inspector
- def initialize(inspect_proc, init_proc = nil)
- @init = init_proc
- @inspect = inspect_proc
- end
-
- def init
- @init.call if @init
- end
-
- def inspect_value(v)
- @inspect.call(v)
- end
- end
-
- INSPECTORS = {}
-
- def INSPECTORS.keys_with_inspector(inspector)
- select{|k,v| v == inspector}.collect{|k, v| k}
- end
-
- # ex)
- # INSPECTORS.def_inspector(key, init_p=nil){|v| v.inspect}
- # INSPECTORS.def_inspector([key1,..], init_p=nil){|v| v.inspect}
- # INSPECTORS.def_inspector(key, inspector)
- # INSPECTORS.def_inspector([key1,...], inspector)
-
- def INSPECTORS.def_inspector(key, arg=nil, &block)
-# if !block_given?
-# case arg
-# when nil, Proc
-# inspector = IRB::Inspector(init_p)
-# when Inspector
-# inspector = init_p
-# else
-# IRB.Raise IllegalParameter, init_p
-# end
-# init_p = nil
-# else
-# inspector = IRB::Inspector(block, init_p)
-# end
-
- if block_given?
- inspector = IRB::Inspector(block, arg)
- else
- inspector = arg
- end
-
- case key
- when Array
- for k in key
- def_inspector(k, inspector)
- end
- when Symbol
- self[key] = inspector
- self[key.to_s] = inspector
- when String
- self[key] = inspector
- self[key.intern] = inspector
- else
- self[key] = inspector
- end
- end
-
- INSPECTORS.def_inspector([false, :to_s, :raw]){|v| v.to_s}
- INSPECTORS.def_inspector([true, :p, :inspect]){|v|
- begin
- v.inspect
- rescue NoMethodError
- puts "(Object doesn't support #inspect)"
- end
- }
- INSPECTORS.def_inspector([:pp, :pretty_inspect], proc{require "pp"}){|v| v.pretty_inspect.chomp}
- INSPECTORS.def_inspector([:yaml, :YAML], proc{require "yaml"}){|v|
- begin
- YAML.dump(v)
- rescue
- puts "(can't dump yaml. use inspect)"
- v.inspect
- end
- }
-
- INSPECTORS.def_inspector([:marshal, :Marshal, :MARSHAL, Marshal]){|v|
- Marshal.dump(v)
- }
-end
-
-
-
-
-
diff --git a/lib/irb/lc/error.rb b/lib/irb/lc/error.rb
index 742821e3af..247596b7fe 100644
--- a/lib/irb/lc/error.rb
+++ b/lib/irb/lc/error.rb
@@ -1,12 +1,13 @@
#
-# irb/lc/error.rb -
-# $Release Version: 0.9.6$
+# irb/lc/error.rb -
+# $Release Version: 0.9.5$
# $Revision$
+# $Date$
# by Keiju ISHITSUKA(keiju@ruby-lang.org)
#
# --
#
-#
+#
#
require "e2mmap"
@@ -17,7 +18,7 @@ module IRB
def_exception :UnrecognizedSwitch, "Unrecognized switch: %s"
def_exception :NotImplementedError, "Need to define `%s'"
def_exception :CantReturnToNormalMode, "Can't return to normal mode."
- def_exception :IllegalParameter, "Invalid parameter(%s)."
+ def_exception :IllegalParameter, "Illegal parameter(%s)."
def_exception :IrbAlreadyDead, "Irb is already dead."
def_exception :IrbSwitchedToCurrentThread, "Switched to current thread."
def_exception :NoSuchJob, "No such job(%s)."
diff --git a/lib/irb/lc/help-message b/lib/irb/lc/help-message
index dd30b9fd24..32087d113c 100644
--- a/lib/irb/lc/help-message
+++ b/lib/irb/lc/help-message
@@ -1,8 +1,8 @@
-# -*- coding: US-ASCII -*-
#
# irb/lc/help-message.rb -
-# $Release Version: 0.9.6$
+# $Release Version: 0.9.5$
# $Revision$
+# $Date$
# by Keiju ISHITSUKA(keiju@ruby-lang.org)
#
# --
@@ -15,8 +15,6 @@ Usage: irb.rb [options] [programfile] [arguments]
-d Set $DEBUG to true (same as `ruby -d')
-r load-module Same as `ruby -r'
-I path Specify $LOAD_PATH directory
- -U Same as `ruby -U`
- -E enc Same as `ruby -E`
--inspect Use `inspect' for output (default except for bc mode)
--noinspect Don't use inspect for output
--readline Use Readline extension module
@@ -35,4 +33,3 @@ Usage: irb.rb [options] [programfile] [arguments]
value is 16.
--irb_debug n Set internal debug level to n (not for popular use)
-v, --version Print the version of irb
-# vim:fileencoding=us-ascii
diff --git a/lib/irb/lc/ja/encoding_aliases.rb b/lib/irb/lc/ja/encoding_aliases.rb
deleted file mode 100644
index a713dff4be..0000000000
--- a/lib/irb/lc/ja/encoding_aliases.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-module IRB
- class Locale
- @@legacy_encoding_alias_map = {
- 'ujis' => Encoding::EUC_JP,
- 'euc' => Encoding::EUC_JP
- }.freeze
- end
-end
diff --git a/lib/irb/lc/ja/error.rb b/lib/irb/lc/ja/error.rb
index 9a7670f459..4c2fb3b839 100644
--- a/lib/irb/lc/ja/error.rb
+++ b/lib/irb/lc/ja/error.rb
@@ -1,27 +1,27 @@
-# -*- coding: utf-8 -*-
-# irb/lc/ja/error.rb -
-# $Release Version: 0.9.6$
+#
+# irb/lc/ja/error.rb -
+# $Release Version: 0.9.5$
# $Revision$
+# $Date$
# by Keiju ISHITSUKA(keiju@ruby-lang.org)
#
# --
#
-#
+#
#
require "e2mmap"
module IRB
# exceptions
extend Exception2MessageMapper
- def_exception :UnrecognizedSwitch, 'スイッãƒ(%s)ãŒåˆ†ã‚Šã¾ã›ã‚“'
- def_exception :NotImplementedError, '`%s\'ã®å®šç¾©ãŒå¿…è¦ã§ã™'
- def_exception :CantReturnToNormalMode, 'Normalãƒ¢ãƒ¼ãƒ‰ã«æˆ»ã‚Œã¾ã›ã‚“.'
- def_exception :IllegalParameter, 'パラメータ(%s)ãŒé–“é•ã£ã¦ã„ã¾ã™.'
- def_exception :IrbAlreadyDead, 'Irbã¯æ—¢ã«æ­»ã‚“ã§ã„ã¾ã™.'
- def_exception :IrbSwitchedToCurrentThread, 'カレントスレッドã«åˆ‡ã‚Šæ›¿ã‚りã¾ã—ãŸ.'
- def_exception :NoSuchJob, 'ãã®ã‚ˆã†ãªã‚¸ãƒ§ãƒ–(%s)ã¯ã‚りã¾ã›ã‚“.'
- def_exception :CantShiftToMultiIrbMode, 'multi-irb modeã«ç§»ã‚Œã¾ã›ã‚“.'
- def_exception :CantChangeBinding, 'ãƒã‚¤ãƒ³ãƒ‡ã‚£ãƒ³ã‚°(%s)ã«å¤‰æ›´ã§ãã¾ã›ã‚“.'
- def_exception :UndefinedPromptMode, 'プロンプトモード(%s)ã¯å®šç¾©ã•れã¦ã„ã¾ã›ã‚“.'
+ def_exception :UnrecognizedSwitch, '$B%9%$%C%A(B(%s)$B$,J,$j$^$;$s(B'
+ def_exception :NotImplementedError, '`%s\'$B$NDj5A$,I,MW$G$9(B'
+ def_exception :CantReturnToNormalMode, 'Normal$B%b!<%I$KLa$l$^$;$s(B.'
+ def_exception :IllegalParameter, '$B%Q%i%a!<%?(B(%s)$B$,4V0c$C$F$$$^$9(B.'
+ def_exception :IrbAlreadyDead, 'Irb$B$O4{$K;`$s$G$$$^$9(B.'
+ def_exception :IrbSwitchedToCurrentThread, '$B%+%l%s%H%9%l%C%I$K@Z$jBX$o$j$^$7$?(B.'
+ def_exception :NoSuchJob, '$B$=$N$h$&$J%8%g%V(B(%s)$B$O$"$j$^$;$s(B.'
+ def_exception :CantShiftToMultiIrbMode, 'multi-irb mode$B$K0\$l$^$;$s(B.'
+ def_exception :CantChangeBinding, '$B%P%$%s%G%#%s%0(B(%s)$B$KJQ99$G$-$^$;$s(B.'
+ def_exception :UndefinedPromptMode, '$B%W%m%s%W%H%b!<%I(B(%s)$B$ODj5A$5$l$F$$$^$;$s(B.'
end
-# vim:fileencoding=utf-8
diff --git a/lib/irb/lc/ja/help-message b/lib/irb/lc/ja/help-message
index f2c4066cf6..debbfe9355 100644
--- a/lib/irb/lc/ja/help-message
+++ b/lib/irb/lc/ja/help-message
@@ -1,7 +1,8 @@
-# -*- coding: utf-8 -*-
+#
# irb/lc/ja/help-message.rb -
-# $Release Version: 0.9.6$
+# $Release Version: 0.9.5$
# $Revision$
+# $Date$
# by Keiju ISHITSUKA(keiju@ruby-lang.org)
#
# --
@@ -9,31 +10,27 @@
#
#
Usage: irb.rb [options] [programfile] [arguments]
- -f ~/.irbrc を読ã¿è¾¼ã¾ãªã„.
- -m bcモード(分数, 行列ã®è¨ˆç®—ãŒã§ãã‚‹)
- -d $DEBUG ã‚’trueã«ã™ã‚‹(ruby -d ã¨åŒã˜)
- -r load-module ruby -r ã¨åŒã˜.
- -I path $LOAD_PATH ã« path を追加ã™ã‚‹.
- -U ruby -U ã¨åŒã˜.
- -E enc ruby -E ã¨åŒã˜.
- --inspect çµæžœå‡ºåŠ›ã«inspectを用ã„ã‚‹(bcモード以外ã¯ãƒ‡ãƒ•ォルト).
- --noinspect çµæžœå‡ºåŠ›ã«inspectを用ã„ãªã„.
- --readline readlineライブラリを利用ã™ã‚‹.
- --noreadline readlineライブラリを利用ã—ãªã„.
+ -f ~/.irbrc $B$rFI$_9~$^$J$$(B.
+ -m bc$B%b!<%I(B($BJ,?t(B, $B9TNs$N7W;;$,$G$-$k(B)
+ -d $DEBUG $B$r(Btrue$B$K$9$k(B(ruby -d $B$HF1$8(B)
+ -r load-module ruby -r $B$HF1$8(B.
+ -I path $LOAD_PATH $B$K(B path $B$rDI2C$9$k(B.
+ --inspect $B7k2L=PNO$K(Binspect$B$rMQ$$$k(B(bc$B%b!<%I0J30$O%G%U%)%k%H(B).
+ --noinspect $B7k2L=PNO$K(Binspect$B$rMQ$$$J$$(B.
+ --readline readline$B%i%$%V%i%j$rMxMQ$9$k(B.
+ --noreadline readline$B%i%$%V%i%j$rMxMQ$7$J$$(B.
--prompt prompt-mode/--prompt-mode prompt-mode
- プロンプトモードを切替ãˆã¾ã™. ç¾åœ¨å®šç¾©ã•れã¦ã„るプ
- ロンプトモードã¯, default, simple, xmp, inf-rubyãŒ
- 用æ„ã•れã¦ã„ã¾ã™.
- --inf-ruby-mode emacsã®inf-ruby-mode用ã®ãƒ—ロンプト表示を行ãªã†. 特
- ã«æŒ‡å®šãŒãªã„é™ã‚Š, readlineライブラリã¯ä½¿ã‚ãªããªã‚‹.
- --simple-prompt éžå¸¸ã«ã‚·ãƒ³ãƒ—ルãªãƒ—ロンプトを用ã„るモードã§ã™.
- --noprompt プロンプト表示を行ãªã‚ãªã„.
- --tracer コマンド実行時ã«ãƒˆãƒ¬ãƒ¼ã‚¹ã‚’行ãªã†.
+ $B%W%m%s%W%H%b!<%I$r@ZBX$($^$9(B. $B8=:_Dj5A$5$l$F$$$k%W(B
+ $B%m%s%W%H%b!<%I$O(B, default, simple, xmp, inf-ruby$B$,(B
+ $BMQ0U$5$l$F$$$^$9(B.
+ --inf-ruby-mode emacs$B$N(Binf-ruby-mode$BMQ$N%W%m%s%W%HI=<($r9T$J$&(B. $BFC(B
+ $B$K;XDj$,$J$$8B$j(B, readline$B%i%$%V%i%j$O;H$o$J$/$J$k(B.
+ --simple-prompt $BHs>o$K%7%s%W%k$J%W%m%s%W%H$rMQ$$$k%b!<%I$G$9(B.
+ --noprompt $B%W%m%s%W%HI=<($r9T$J$o$J$$(B.
+ --tracer $B%3%^%s%I<B9T;~$K%H%l!<%9$r9T$J$&(B.
--back-trace-limit n
- ãƒãƒƒã‚¯ãƒˆãƒ¬ãƒ¼ã‚¹è¡¨ç¤ºã‚’ãƒãƒƒã‚¯ãƒˆãƒ¬ãƒ¼ã‚¹ã®é ­ã‹ã‚‰ n, 後ã‚
- ã‹ã‚‰nã ã‘行ãªã†. デフォルトã¯16
- --irb_debug n irbã®ãƒ‡ãƒãƒƒã‚°ãƒ‡ãƒãƒƒã‚°ãƒ¬ãƒ™ãƒ«ã‚’nã«è¨­å®šã™ã‚‹(利用ã—ãª
- ã„æ–¹ãŒç„¡é›£ã§ã—ょã†).
- -v, --version irbã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’表示ã™ã‚‹
-
-# vim:fileencoding=utf-8
+ $B%P%C%/%H%l!<%9I=<($r%P%C%/%H%l!<%9$NF,$+$i(B n, $B8e$m(B
+ $B$+$i(Bn$B$@$19T$J$&(B. $B%G%U%)%k%H$O(B16
+ --irb_debug n irb$B$N%G%P%C%0%G%P%C%0%l%Y%k$r(Bn$B$K@_Dj$9$k(B($BMxMQ$7$J(B
+ $B$$J}$,L5Fq$G$7$g$&(B).
+ -v, --version irb$B$N%P!<%8%g%s$rI=<($9$k(B
diff --git a/lib/irb/locale.rb b/lib/irb/locale.rb
index 9924409ba1..5ed9f54507 100644
--- a/lib/irb/locale.rb
+++ b/lib/irb/locale.rb
@@ -1,59 +1,51 @@
#
# irb/locale.rb - internationalization module
-# $Release Version: 0.9.6$
+# $Release Version: 0.9.5$
# $Revision$
+# $Date$
# by Keiju ISHITSUKA(keiju@ruby-lang.org)
#
# --
#
+#
#
-#
+
+autoload :Kconv, "kconv"
+
module IRB
class Locale
@RCS_ID='-$Id$-'
- LOCALE_NAME_RE = %r[
- (?<language>[[:alpha:]]{2})
- (?:_
- (?<territory>[[:alpha:]]{2,3})
- (?:\.
- (?<codeset>[^@]+)
- )?
- )?
- (?:@
- (?<modifier>.*)
- )?
- ]x
+ JPDefaultLocale = "ja"
LOCALE_DIR = "/lc/"
- @@legacy_encoding_alias_map = {}.freeze
-
def initialize(locale = nil)
- @lang = @territory = @encoding_name = @modifier = nil
- @locale = locale || ENV["IRB_LANG"] || ENV["LC_MESSAGES"] || ENV["LC_ALL"] || ENV["LANG"] || "C"
- if m = LOCALE_NAME_RE.match(@locale)
- @lang, @territory, @encoding_name, @modifier = m[:language], m[:territory], m[:codeset], m[:modifier]
-
- if @encoding_name
- begin load 'irb/encoding_aliases.rb'; rescue LoadError; end
- if @encoding = @@legacy_encoding_alias_map[@encoding_name]
- warn "%s is obsolete. use %s" % ["#{@lang}_#{@territory}.#{@encoding_name}", "#{@lang}_#{@territory}.#{@encoding.name}"]
- end
- @encoding = Encoding.find(@encoding_name) rescue nil
- end
- end
- @encoding ||= (Encoding.find('locale') rescue Encoding::ASCII_8BIT)
+ @lang = locale || ENV["IRB_LANG"] || ENV["LC_MESSAGES"] || ENV["LC_ALL"] || ENV["LANG"] || "C"
end
- attr_reader :lang, :territory, :encoding, :modifieer
+ attr_reader :lang
+
+ def lc2kconv(lang)
+ case lang
+ when "ja_JP.ujis", "ja_JP.euc", "ja_JP.eucJP"
+ Kconv::EUC
+ when "ja_JP.sjis", "ja_JP.SJIS"
+ Kconv::SJIS
+ when /ja_JP.utf-?8/i
+ Kconv::UTF8
+ end
+ end
+ private :lc2kconv
def String(mes)
mes = super(mes)
- if @encoding
- mes.encode(@encoding)
+ case @lang
+ when /^ja/
+ mes = Kconv::kconv(mes, lc2kconv(@lang))
else
mes
end
+ mes
end
def format(*opts)
@@ -109,26 +101,33 @@ module IRB
end
alias toplevel_load load
-
+
def load(file, priv=nil)
dir = File.dirname(file)
dir = "" if dir == "."
base = File.basename(file)
- if dir[0] == ?/ #/
- lc_path = search_file(dir, base)
- return real_load(lc_path, priv) if lc_path
+ if /^ja(_JP)?$/ =~ @lang
+ back, @lang = @lang, "C"
end
-
- for path in $:
- lc_path = search_file(path + "/" + dir, base)
- return real_load(lc_path, priv) if lc_path
+ begin
+ if dir[0] == ?/ #/
+ lc_path = search_file(dir, base)
+ return real_load(lc_path, priv) if lc_path
+ end
+
+ for path in $:
+ lc_path = search_file(path + "/" + dir, base)
+ return real_load(lc_path, priv) if lc_path
+ end
+ ensure
+ @lang = back if back
end
raise LoadError, "No such file to load -- #{file}"
- end
+ end
def real_load(path, priv)
- src = MagicFile.open(path){|f| f.read}
+ src = self.String(File.read(path))
if priv
eval("self", TOPLEVEL_BINDING).extend(Module.new {eval(src, nil, path)})
else
@@ -141,7 +140,7 @@ module IRB
dir = File.dirname(file)
dir = "" if dir == "."
base = File.basename(file)
- if dir =~ /^\//
+ if dir[0] == ?/ #/
return lc_path = search_file(dir, base)
else
for path in $:
@@ -154,39 +153,29 @@ module IRB
end
def search_file(path, file)
- each_sublocale do |lc|
- full_path = path + lc_path(file, lc)
- return full_path if File.exist?(full_path)
+ if File.exist?(p1 = path + lc_path(file, "C"))
+ if File.exist?(p2 = path + lc_path(file))
+ return p2
+ else
+ end
+ return p1
+ else
end
nil
end
private :search_file
- def lc_path(file = "", lc = @locale)
- if lc.nil?
+ def lc_path(file = "", lc = @lang)
+ case lc
+ when "C"
LOCALE_DIR + file
+ when /^ja/
+ LOCALE_DIR + "ja/" + file
else
LOCALE_DIR + @lang + "/" + file
end
end
private :lc_path
-
- def each_sublocale
- if @lang
- if @territory
- if @encoding_name
- yield "#{@lang}_#{@territory}.#{@encoding_name}@#{@modifier}" if @modifier
- yield "#{@lang}_#{@territory}.#{@encoding_name}"
- end
- yield "#{@lang}_#{@territory}@#{@modifier}" if @modifier
- yield "#{@lang}_#{@territory}"
- end
- yield "#{@lang}@#{@modifier}" if @modifier
- yield "#{@lang}"
- end
- yield nil
- end
- private :each_sublocale
end
end
diff --git a/lib/irb/magic-file.rb b/lib/irb/magic-file.rb
deleted file mode 100644
index 861262050e..0000000000
--- a/lib/irb/magic-file.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-module IRB
- class << (MagicFile = Object.new)
- # see parser_magic_comment in parse.y
- ENCODING_SPEC_RE = %r"coding\s*[=:]\s*([[:alnum:]\-_]+)"
-
- def open(path)
- io = File.open(path, 'rb')
- line = io.gets
- line = io.gets if line[0,2] == "#!"
- encoding = detect_encoding(line)
- encoding ||= default_src_encoding
- io.rewind
- io.set_encoding(encoding, nil)
-
- if block_given?
- begin
- return (yield io)
- ensure
- io.close
- end
- else
- return io
- end
- end
-
- private
- def detect_encoding(line)
- return unless line[0] == ?#
- line = line[1..-1]
- line = $1 if line[/-\*-\s*(.*?)\s*-*-$/]
- return nil unless ENCODING_SPEC_RE =~ line
- encoding = $1
- return encoding.sub(/-(?:mac|dos|unix)/i, '')
- end
- end
-end
diff --git a/lib/irb/notifier.rb b/lib/irb/notifier.rb
index fdfcdd2dbc..0f79bc5a8d 100644
--- a/lib/irb/notifier.rb
+++ b/lib/irb/notifier.rb
@@ -1,12 +1,13 @@
#
-# notifier.rb - output methods used by irb
-# $Release Version: 0.9.6$
+# notifier.rb - output methods used by irb
+# $Release Version: 0.9.5$
# $Revision$
+# $Date$
# by Keiju ISHITSUKA(keiju@ruby-lang.org)
#
# --
#
-#
+#
#
require "e2mmap"
@@ -15,16 +16,16 @@ require "irb/output-method"
module IRB
module Notifier
extend Exception2MessageMapper
- def_exception :ErrUndefinedNotifier,
+ def_exception :ErrUndefinedNotifier,
"undefined notifier level: %d is specified"
- def_exception :ErrUnrecognizedLevel,
+ def_exception :ErrUnrecognizedLevel,
"unrecognized notifier level: %s is specified"
def def_notifier(prefix = "", output_method = StdioOutputMethod.new)
CompositeNotifier.new(prefix, output_method)
end
module_function :def_notifier
-
+
class AbstructNotifier
def initialize(prefix, base_notifier)
@prefix = prefix
@@ -112,7 +113,7 @@ module IRB
def initialize(base, level, prefix)
super(prefix, base)
-
+
@level = level
end
@@ -121,7 +122,7 @@ module IRB
def <=>(other)
@level <=> other.level
end
-
+
def notify?
@base_notifier.level >= self
end
diff --git a/lib/irb/output-method.rb b/lib/irb/output-method.rb
index 4201523a45..b9a3a8851e 100644
--- a/lib/irb/output-method.rb
+++ b/lib/irb/output-method.rb
@@ -1,12 +1,13 @@
#
-# output-method.rb - optput methods used by irb
-# $Release Version: 0.9.6$
+# output-method.rb - optput methods used by irb
+# $Release Version: 0.9.5$
# $Revision$
+# $Date$
# by Keiju ISHITSUKA(keiju@ruby-lang.org)
#
# --
#
-#
+#
#
require "e2mmap"
@@ -35,15 +36,30 @@ module IRB
end
# %
- # <flag> [#0- +]
- # <minimum field width> (\*|\*[1-9][0-9]*\$|[1-9][0-9]*)
- # <precision>.(\*|\*[1-9][0-9]*\$|[1-9][0-9]*|)?
- # #<length modifier>(hh|h|l|ll|L|q|j|z|t)
- # <conversion specifier>[diouxXeEfgGcsb%]
+ # <¥Õ¥é¥°> [#0- +]
+ # <ºÇ¾®¥Õ¥£¡¼¥ë¥ÉÉý> (\*|\*[1-9][0-9]*\$|[1-9][0-9]*)
+ # <ÀºÅÙ>.(\*|\*[1-9][0-9]*\$|[1-9][0-9]*|)?
+ # #<Ťµ½¤ÀµÊ¸»ú>(hh|h|l|ll|L|q|j|z|t)
+ # <ÊÑ´¹½¤ÀµÊ¸»ú>[diouxXeEfgGcsb%]
def parse_printf_format(format, opts)
return format, opts if $1.size % 2 == 1
end
+ def foo(format)
+ pos = 0
+ inspects = []
+ format.scan(/%[#0\-+ ]?(\*(?=[^0-9])|\*[1-9][0-9]*\$|[1-9][0-9]*(?=[^0-9]))?(\.(\*(?=[^0-9])|\*[1-9][0-9]*\$|[1-9][0-9]*(?=[^0-9])))?(([1-9][0-9]*\$)*)([diouxXeEfgGcsb%])/) {|f, p, pp, pos, new_pos, c|
+ puts [f, p, pp, pos, new_pos, c].join("!")
+ pos = new_pos if new_pos
+ if c == "I"
+ inspects.push pos.to_i
+ (f||"")+(p||"")+(pp||"")+(pos||"")+"s"
+ else
+ $&
+ end
+ }
+ end
+
def puts(*objs)
for obj in objs
print(*obj)
diff --git a/lib/irb/ruby-lex.rb b/lib/irb/ruby-lex.rb
index b49337c1c6..313a809ccd 100644
--- a/lib/irb/ruby-lex.rb
+++ b/lib/irb/ruby-lex.rb
@@ -1,12 +1,13 @@
#
# irb/ruby-lex.rb - ruby lexcal analyzer
-# $Release Version: 0.9.6$
+# $Release Version: 0.9.5$
# $Revision$
+# $Date$
# by Keiju ISHITSUKA(keiju@ruby-lang.org)
#
# --
#
-#
+#
#
require "e2mmap"
@@ -20,12 +21,12 @@ class RubyLex
def_exception(:AlreadyDefinedToken, "Already defined token(%s)")
def_exception(:TkReading2TokenNoKey, "key nothing(key='%s')")
def_exception(:TkSymbol2TokenNoKey, "key nothing(key='%s')")
- def_exception(:TkReading2TokenDuplicateError,
+ def_exception(:TkReading2TokenDuplicateError,
"key duplicate(token_n='%s', key='%s')")
def_exception(:SyntaxError, "%s")
def_exception(:TerminateLineInput, "Terminate Line Input")
-
+
include RubyToken
class << self
@@ -53,7 +54,7 @@ class RubyLex
@lex_state = EXPR_BEG
@space_seen = false
@here_header = false
-
+
@continue = false
@line = ""
@@ -91,7 +92,7 @@ class RubyLex
else
@base_char_no += @readed.size
end
-
+
readed = @readed.join("")
@readed = []
readed
@@ -103,7 +104,6 @@ class RubyLex
@rests.push nil unless buf_input
end
c = @rests.shift
- return if c == nil
if @here_header
@here_readed.push c
else
@@ -111,7 +111,7 @@ class RubyLex
end
@seek += 1
if c == "\n"
- @line_no += 1
+ @line_no += 1
@char_no = 0
else
@char_no += 1
@@ -148,10 +148,10 @@ class RubyLex
c2 = @here_readed.pop
end
c = c2 unless c
- @rests.unshift c #c =
+ @rests.unshift c #c =
@seek -= 1
if c == "\n"
- @line_no -= 1
+ @line_no -= 1
if idx = @readed.reverse.index("\n")
@char_no = @readed.size - idx
else
@@ -188,7 +188,7 @@ class RubyLex
prompt
line = @input.call
return nil unless line
- @rests.concat line.chars.to_a
+ @rests.concat line.split(//)
true
end
private :buf_input
@@ -216,14 +216,14 @@ class RubyLex
@lex_state = EXPR_BEG
@space_seen = false
@here_header = false
-
+
@continue = false
prompt
@line = ""
@exp_line_no = @line_no
end
-
+
def each_top_level_statement
initialize_input
catch(:TERM_INPUT) do
@@ -234,13 +234,13 @@ class RubyLex
unless l = lex
throw :TERM_INPUT if @line == ''
else
+ #p l
@line.concat l
if @ltype or @continue or @indent > 0
next
end
end
if @line != "\n"
- @line.force_encoding(@io.encoding)
yield @line, @exp_line_no
end
break unless l
@@ -297,7 +297,7 @@ class RubyLex
# Tracer.off
tk
end
-
+
ENINDENT_CLAUSE = [
"case", "class", "def", "do", "for", "if",
"module", "unless", "until", "while", "begin" #, "when"
@@ -314,7 +314,7 @@ class RubyLex
"W" => "]",
"s" => ":"
}
-
+
PERCENT_PAREN = {
"{" => "}",
"[" => "]",
@@ -354,7 +354,7 @@ class RubyLex
end
@OP.def_rule("=begin",
- proc{|op, io| @prev_char_no == 0 && peek(0) =~ /\s/}) do
+ proc{|op, io| @prev_char_no == 0 && peek(0) =~ /\s/}) do
|op, io|
@ltype = "="
until getc == "\n"; end
@@ -374,8 +374,8 @@ class RubyLex
else
@continue = false
@lex_state = EXPR_BEG
- until (@indent_stack.empty? ||
- [TkLPAREN, TkLBRACK, TkLBRACE,
+ until (@indent_stack.empty? ||
+ [TkLPAREN, TkLBRACK, TkLBRACE,
TkfLPAREN, TkfLBRACK, TkfLBRACE].include?(@indent_stack.last))
@indent_stack.pop
end
@@ -385,12 +385,11 @@ class RubyLex
Token(TkNL)
end
- @OP.def_rules("*", "**",
- "=", "==", "===",
- "=~", "<=>",
+ @OP.def_rules("*", "**",
+ "=", "==", "===",
+ "=~", "<=>",
"<", "<=",
- ">", ">=", ">>",
- "!", "!=", "!~") do
+ ">", ">=", ">>") do
|op, io|
case @lex_state
when EXPR_FNAME, EXPR_DOT
@@ -401,13 +400,19 @@ class RubyLex
Token(op)
end
+ @OP.def_rules("!", "!=", "!~") do
+ |op, io|
+ @lex_state = EXPR_BEG
+ Token(op)
+ end
+
@OP.def_rules("<<") do
|op, io|
tk = nil
if @lex_state != EXPR_END && @lex_state != EXPR_CLASS &&
(@lex_state != EXPR_ARG || @space_seen)
c = peek(0)
- if /\S/ =~ c && (/["'`]/ =~ c || /\w/ =~ c || c == "-")
+ if /\S/ =~ c && (/["'`]/ =~ c || /[\w_]/ =~ c || c == "-")
tk = identify_here_document
end
end
@@ -450,7 +455,7 @@ class RubyLex
@lex_state = EXPR_BEG;
Token(TkQUESTION)
else
- if (ch == '\\')
+ if (ch == '\\')
read_escape
end
@lex_state = EXPR_END
@@ -464,8 +469,8 @@ class RubyLex
@lex_state = EXPR_BEG
Token(op)
end
-
- @OP.def_rules("+=", "-=", "*=", "**=",
+
+ @OP.def_rules("+=", "-=", "*=", "**=",
"&=", "|=", "^=", "<<=", ">>=", "||=", "&&=") do
|op, io|
@lex_state = EXPR_BEG
@@ -524,7 +529,7 @@ class RubyLex
lex_int2
end
-
+
def lex_int2
@OP.def_rules("]", "}", ")") do
|op, io|
@@ -567,7 +572,7 @@ class RubyLex
Token(TkOPASGN, "/") #/)
elsif @lex_state == EXPR_ARG and @space_seen and peek(0) !~ /\s/
identify_string(op)
- else
+ else
@lex_state = EXPR_BEG
Token("/") #/)
end
@@ -583,7 +588,7 @@ class RubyLex
# @lex_state = EXPR_BEG
# Token(OP_ASGN, :^)
# end
-
+
@OP.def_rules(",") do
|op, io|
@lex_state = EXPR_BEG
@@ -593,8 +598,8 @@ class RubyLex
@OP.def_rules(";") do
|op, io|
@lex_state = EXPR_BEG
- until (@indent_stack.empty? ||
- [TkLPAREN, TkLBRACK, TkLBRACE,
+ until (@indent_stack.empty? ||
+ [TkLPAREN, TkLBRACK, TkLBRACE,
TkfLPAREN, TkfLBRACK, TkfLBRACE].include?(@indent_stack.last))
@indent_stack.pop
end
@@ -612,7 +617,7 @@ class RubyLex
@lex_state = EXPR_BEG
Token("~")
end
-
+
@OP.def_rule("(") do
|op, io|
@indent += 1
@@ -713,7 +718,7 @@ class RubyLex
end
end
- # @OP.def_rule("def", proc{|op, io| /\s/ =~ io.peek(0)}) do
+ # @OP.def_rule("def", proc{|op, io| /\s/ =~ io.peek(0)}) do
# |op, io|
# @indent += 1
# @lex_state = EXPR_FNAME
@@ -728,19 +733,19 @@ class RubyLex
printf "MATCH: start %s: %s\n", op, io.inspect if RubyLex.debug?
if peek(0) =~ /[0-9]/
t = identify_number
- elsif peek(0) =~ /\w/
+ elsif peek(0) =~ /[\w_]/
t = identify_identifier
end
printf "MATCH: end %s: %s\n", op, io.inspect if RubyLex.debug?
t
end
-
+
p @OP if RubyLex.debug?
end
-
+
def identify_gvar
@lex_state = EXPR_END
-
+
case ch = getc
when /[~_*$?!@\/\\;,=:<>".]/ #"
Token(TkGVAR, "$" + ch)
@@ -756,12 +761,12 @@ class RubyLex
ungetc
ungetc
identify_identifier
- else
+ else
ungetc
Token("$")
end
end
-
+
def identify_identifier
token = ""
if peek(0) =~ /[$@]/
@@ -776,7 +781,7 @@ class RubyLex
token.concat ch
end
ungetc
-
+
if (ch == "!" || ch == "?") && token[0,1] =~ /\w/ && peek(0) != "="
token.concat getc
end
@@ -794,7 +799,7 @@ class RubyLex
@lex_state = EXPR_END
return Token(TkIVAR, token)
end
-
+
if @lex_state != EXPR_DOT
print token, "\n" if RubyLex.debug?
@@ -817,11 +822,11 @@ class RubyLex
when "class"
valid = false unless peek_match?(/^\s*(<<|\w|::)/)
when "def"
- valid = false if peek_match?(/^\s*(([+\-\/*&\|^]|<<|>>|\|\||\&\&)=|\&\&|\|\|)/)
+ valid = false if peek_match?(/^\s*(([+-\/*&\|^]|<<|>>|\|\||\&\&)=|\&\&|\|\|)/)
when "do"
- valid = false if peek_match?(/^\s*([+\-\/*]?=|\*|<|>|\&)/)
+ valid = false if peek_match?(/^\s*([+-\/*]?=|\*|<|>|\&)/)
when *ENINDENT_CLAUSE
- valid = false if peek_match?(/^\s*([+\-\/*]?=|\*|<|>|\&|\|)/)
+ valid = false if peek_match?(/^\s*([+-\/*]?=|\*|<|>|\&|\|)/)
else
# no nothing
end
@@ -922,7 +927,7 @@ class RubyLex
@lex_state = EXPR_END
Token(Ltype2Token[lt])
end
-
+
def identify_quotation
ch = getc
if lt = PERCENT_LTYPE[ch]
@@ -962,11 +967,11 @@ class RubyLex
when /[0-7]/
match = /[0-7_]/
when /[89]/
- RubyLex.fail SyntaxError, "Invalid octal digit"
- else
+ RubyLex.fail SyntaxError, "Illegal octal digit"
+ else
return Token(TkINTEGER)
end
-
+
len0 = true
non_digit = false
while ch = getc
@@ -994,7 +999,7 @@ class RubyLex
end
return Token(TkINTEGER)
end
-
+
type = TkINTEGER
allow_point = true
allow_e = true
@@ -1037,7 +1042,7 @@ class RubyLex
end
Token(type)
end
-
+
def identify_string(ltype, quoted = ltype)
@ltype = ltype
@quoted = quoted
@@ -1047,20 +1052,12 @@ class RubyLex
while ch = getc
if @quoted == ch and nest == 0
break
- elsif ch == "#" and peek(0) == "{"
- identify_string_dvar
elsif @ltype != "'" && @ltype != "]" && @ltype != ":" and ch == "#"
subtype = true
- elsif ch == '\\' and @ltype == "'" #'
- case ch = getc
- when "\\", "\n", "'"
- else
- ungetc
- end
elsif ch == '\\' #'
read_escape
end
- if PERCENT_PAREN.values.include?(@quoted)
+ if PERCENT_PAREN.values.include?(@quoted)
if PERCENT_PAREN[ch] == @quoted
nest += 1
elsif ch == @quoted
@@ -1084,42 +1081,6 @@ class RubyLex
@lex_state = EXPR_END
end
end
-
- def identify_string_dvar
- begin
- getc
-
- reserve_continue = @continue
- reserve_ltype = @ltype
- reserve_indent = @indent
- reserve_indent_stack = @indent_stack
- reserve_state = @lex_state
- reserve_quoted = @quoted
-
- @ltype = nil
- @quoted = nil
- @indent = 0
- @indent_stack = []
- @lex_state = EXPR_BEG
-
- loop do
- @continue = false
- prompt
- tk = token
- if @ltype or @continue or @indent > 0
- next
- end
- break if tk.kind_of?(TkRBRACE)
- end
- ensure
- @continue = reserve_continue
- @ltype = reserve_ltype
- @indent = reserve_indent
- @indent_stack = reserve_indent_stack
- @lex_state = reserve_state
- @quoted = reserve_quoted
- end
- end
def identify_comment
@ltype = "#"
@@ -1136,7 +1097,7 @@ class RubyLex
end
return Token(TkCOMMENT)
end
-
+
def read_escape
case ch = getc
when "\n", "\r", "\f"
@@ -1153,7 +1114,7 @@ class RubyLex
break
end
end
-
+
when "x"
2.times do
case ch = getc
@@ -1182,7 +1143,7 @@ class RubyLex
read_escape
end
else
- # other characters
+ # other characters
end
end
end
diff --git a/lib/irb/ruby-token.rb b/lib/irb/ruby-token.rb
index 9b06eab21b..525d4df14c 100644
--- a/lib/irb/ruby-token.rb
+++ b/lib/irb/ruby-token.rb
@@ -1,12 +1,13 @@
#
-# irb/ruby-token.rb - ruby tokens
-# $Release Version: 0.9.6$
+# irb/ruby-token.rb - ruby tokens
+# $Release Version: 0.9.5$
# $Revision$
+# $Date$
# by Keiju ISHITSUKA(keiju@ruby-lang.org)
#
# --
#
-#
+#
#
module RubyToken
EXPR_BEG = :EXPR_BEG
@@ -21,14 +22,16 @@ module RubyToken
if !defined?(Symbol)
Symbol = Integer
end
-
+
class Token
def initialize(seek, line_no, char_no)
@seek = seek
@line_no = line_no
@char_no = char_no
end
- attr :seek, :line_no, :char_no
+ attr :seek
+ attr :line_no
+ attr :char_no
end
class TkNode < Token
@@ -55,7 +58,7 @@ module RubyToken
end
class TkOp < Token
- attr_accessor :name
+ attr :name, true
end
class TkOPASGN < TkOp
@@ -84,7 +87,7 @@ module RubyToken
if (tk = TkReading2Token[token]).nil?
IRB.fail TkReading2TokenNoKey, token
end
- tk = Token(tk[0], value)
+ tk = Token(tk[0], value)
if tk.kind_of?(TkOp)
tk.name = token
end
@@ -93,8 +96,8 @@ module RubyToken
if (tk = TkSymbol2Token[token]).nil?
IRB.fail TkSymbol2TokenNoKey, token
end
- return Token(tk[0], value)
- else
+ return Token(tk[0], value)
+ else
if (token.ancestors & [TkId, TkVal, TkOPASGN, TkUnknownChar]).empty?
token.new(@prev_seek, @prev_line_no, @prev_char_no)
else
@@ -194,7 +197,7 @@ module RubyToken
[:TkASSOC, TkOp, "=>"],
[:TkQUESTION, TkOp, "?"], #?
[:TkCOLON, TkOp, ":"], #:
-
+
[:TkfLPAREN], # func( #
[:TkfLBRACK], # func[ #
[:TkfLBRACE], # func{ #
@@ -250,7 +253,7 @@ module RubyToken
IRB.fail AlreadyDefinedToken, token_n
end
token_c = eval("class #{token_n} < #{super_token}; end; #{token_n}")
-
+
if reading
if TkReading2Token[reading]
IRB.fail TkReading2TokenDuplicateError, token_n, reading
diff --git a/lib/irb/slex.rb b/lib/irb/slex.rb
index fac62bfd93..f7e3a3b2b2 100644
--- a/lib/irb/slex.rb
+++ b/lib/irb/slex.rb
@@ -1,12 +1,13 @@
#
# irb/slex.rb - simple lex analyzer
-# $Release Version: 0.9.6$
+# $Release Version: 0.9.5$
# $Revision$
+# $Date$
# by Keiju ISHITSUKA(keiju@ruby-lang.org)
#
# --
#
-#
+#
#
require "e2mmap"
@@ -24,20 +25,20 @@ module IRB
D_WARN = DOUT::def_notifier(1, "Warn: ")
D_DEBUG = DOUT::def_notifier(2, "Debug: ")
D_DETAIL = DOUT::def_notifier(4, "Detail: ")
-
+
DOUT.level = Notifier::D_NOMSG
def initialize
@head = Node.new("")
end
-
+
def def_rule(token, preproc = nil, postproc = nil, &block)
D_DETAIL.pp token
postproc = block if block_given?
node = create(token, preproc, postproc)
end
-
+
def def_rules(*tokens, &block)
if block_given?
p = block
@@ -46,18 +47,18 @@ module IRB
def_rule(token, nil, p)
end
end
-
+
def preproc(token, proc)
node = search(token)
node.preproc=proc
end
-
- #$BMW%A%'%C%/(B?
+
+ #$BMW%A%'%C%/(B?
def postproc(token)
node = search(token, proc)
node.postproc=proc
end
-
+
def search(token)
@head.search(token.split(//))
end
@@ -65,7 +66,7 @@ module IRB
def create(token, preproc = nil, postproc = nil)
@head.create_subnode(token.split(//), preproc, postproc)
end
-
+
def match(token)
case token
when Array
@@ -78,14 +79,14 @@ module IRB
D_DETAIL.exec_if{D_DEATIL.printf "match end: %s:%s\n", ret, token.inspect}
ret
end
-
+
def inspect
format("<SLex: @head = %s>", @head.inspect)
end
#----------------------------------------------------------------------
#
- # class Node -
+ # class Node -
#
#----------------------------------------------------------------------
class Node
@@ -99,7 +100,7 @@ module IRB
attr_accessor :preproc
attr_accessor :postproc
-
+
def search(chrs, opt = nil)
return self if chrs.empty?
ch = chrs.shift
@@ -114,7 +115,7 @@ module IRB
end
end
end
-
+
def create_subnode(chrs, preproc = nil, postproc = nil)
if chrs.empty?
if @postproc
@@ -127,7 +128,7 @@ module IRB
end
return self
end
-
+
ch = chrs.shift
if node = @Tree[ch]
if chrs.empty?
@@ -161,7 +162,7 @@ module IRB
# chrs: String
# character array
# io must have getc()/ungetc(); and ungetc() must be
- # able to be called arbitrary number of times.
+ # able to be called arbitrary number of times.
#
def match(chrs, op = "")
D_DETAIL.print "match>: ", chrs, "op:", op, "\n"
@@ -244,6 +245,8 @@ module IRB
end
end
+SLex=IRB::SLex
+
if $0 == __FILE__
# Tracer.on
case $1
@@ -254,14 +257,14 @@ if $0 == __FILE__
print "1: ", tr.inspect, "\n"
tr.def_rule("==") {print "==\n"}
print "2: ", tr.inspect, "\n"
-
+
print "case 1:\n"
print tr.match("="), "\n"
print "case 2:\n"
print tr.match("=="), "\n"
print "case 3:\n"
print tr.match("=>"), "\n"
-
+
when "2"
tr = SLex.new
print "0: ", tr.inspect, "\n"
@@ -269,7 +272,7 @@ if $0 == __FILE__
print "1: ", tr.inspect, "\n"
tr.def_rule("==", proc{false}) {print "==\n"}
print "2: ", tr.inspect, "\n"
-
+
print "case 1:\n"
print tr.match("="), "\n"
print "case 2:\n"
diff --git a/lib/irb/src_encoding.rb b/lib/irb/src_encoding.rb
deleted file mode 100644
index 958cef104c..0000000000
--- a/lib/irb/src_encoding.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-# DO NOT WRITE ANY MAGIC COMMENT HERE.
-def default_src_encoding
- return __ENCODING__
-end
diff --git a/lib/irb/version.rb b/lib/irb/version.rb
index 621a127ebd..28b079740a 100644
--- a/lib/irb/version.rb
+++ b/lib/irb/version.rb
@@ -1,15 +1,16 @@
#
# irb/version.rb - irb version definition file
-# $Release Version: 0.9.6$
+# $Release Version: 0.9.5$
# $Revision$
+# $Date$
# by Keiju ISHITSUKA(keiju@ishitsuka.com)
#
# --
#
-#
+#
#
module IRB
- @RELEASE_VERSION = "0.9.6"
- @LAST_UPDATE_DATE = "09/06/30"
+ @RELEASE_VERSION = "0.9.5"
+ @LAST_UPDATE_DATE = "05/04/13"
end
diff --git a/lib/irb/workspace.rb b/lib/irb/workspace.rb
index 991df2e652..7d1794cd7b 100644
--- a/lib/irb/workspace.rb
+++ b/lib/irb/workspace.rb
@@ -1,12 +1,13 @@
#
-# irb/workspace-binding.rb -
-# $Release Version: 0.9.6$
+# irb/workspace-binding.rb -
+# $Release Version: 0.9.5$
# $Revision$
+# $Date$
# by Keiju ISHITSUKA(keiju@ruby-lang.org)
#
# --
#
-#
+#
#
module IRB
class WorkSpace
@@ -21,7 +22,7 @@ module IRB
case IRB.conf[:CONTEXT_MODE]
when 0 # binding in proc on TOPLEVEL_BINDING
@binding = eval("proc{binding}.call",
- TOPLEVEL_BINDING,
+ TOPLEVEL_BINDING,
__FILE__,
__LINE__)
when 1 # binding in loaded file
@@ -37,7 +38,7 @@ EOF
when 2 # binding in loaded file(thread use)
unless defined? BINDING_QUEUE
require "thread"
-
+
IRB.const_set("BINDING_QUEUE", SizedQueue.new(1))
Thread.abort_on_exception = true
Thread.start do
@@ -49,7 +50,7 @@ EOF
when 3 # binging in function on TOPLEVEL_BINDING(default)
@binding = eval("def irb_binding; binding; end; irb_binding",
- TOPLEVEL_BINDING,
+ TOPLEVEL_BINDING,
__FILE__,
__LINE__ - 3)
end
@@ -63,7 +64,7 @@ EOF
when Module
@binding = eval("IRB.conf[:__MAIN__].module_eval('binding', __FILE__, __LINE__)", @binding, __FILE__, __LINE__)
else
- begin
+ begin
@binding = eval("IRB.conf[:__MAIN__].instance_eval('binding', __FILE__, __LINE__)", @binding, __FILE__, __LINE__)
rescue TypeError
IRB.fail CantChangeBinding, @main.inspect
@@ -79,7 +80,7 @@ EOF
def evaluate(context, statements, file = __FILE__, line = __LINE__)
eval(statements, @binding, file, line)
end
-
+
# error message manipulator
def filter_backtrace(bt)
case IRB.conf[:CONTEXT_MODE]
@@ -93,11 +94,9 @@ EOF
end
when 2
return nil if bt =~ /irb\/.*\.rb/
- return nil if bt =~ /irb\.rb/
when 3
return nil if bt =~ /irb\/.*\.rb/
- return nil if bt =~ /irb\.rb/
- bt.sub!(/:\s*in `irb_binding'/, '')
+ bt.sub!(/:\s*in `irb_binding'/){""}
end
bt
end
diff --git a/lib/irb/ws-for-case-2.rb b/lib/irb/ws-for-case-2.rb
index bb3932ad62..afd49d23e1 100644
--- a/lib/irb/ws-for-case-2.rb
+++ b/lib/irb/ws-for-case-2.rb
@@ -1,12 +1,13 @@
#
-# irb/ws-for-case-2.rb -
-# $Release Version: 0.9.6$
+# irb/ws-for-case-2.rb -
+# $Release Version: 0.9.5$
# $Revision$
+# $Date$
# by Keiju ISHITSUKA(keiju@ruby-lang.org)
#
# --
#
-#
+#
#
while true
diff --git a/lib/irb/xmp.rb b/lib/irb/xmp.rb
index 1a58026f45..4bcc2ca22f 100644
--- a/lib/irb/xmp.rb
+++ b/lib/irb/xmp.rb
@@ -2,11 +2,12 @@
# xmp.rb - irb version of gotoken xmp
# $Release Version: 0.9$
# $Revision$
+# $Date$
# by Keiju ISHITSUKA(Nippon Rational Inc.)
#
# --
#
-#
+#
#
require "irb"
@@ -72,20 +73,8 @@ class XMP
end
def puts(exps)
- if @encoding and exps.encoding != @encoding
- enc = Encoding.compatible?(@exps.join("\n"), exps)
- if enc.nil?
- raise Encoding::CompatibilityError, "Encoding in which the passed exression is encoded is not compatible to the preceding's one"
- else
- @encoding = enc
- end
- else
- @encoding = exps.encoding
- end
@exps.concat exps.split(/\n/)
end
-
- attr_reader :encoding
end
end
diff --git a/lib/jcode.rb b/lib/jcode.rb
new file mode 100644
index 0000000000..78422f296f
--- /dev/null
+++ b/lib/jcode.rb
@@ -0,0 +1,220 @@
+# jcode.rb - ruby code to handle japanese (EUC/SJIS) string
+
+if $VERBOSE && $KCODE == "NONE"
+ warn "Warning: $KCODE is NONE."
+end
+
+$vsave, $VERBOSE = $VERBOSE, false
+class String
+ warn "feel free for some warnings:\n" if $VERBOSE
+
+ def _regex_quote(str)
+ str.gsub(/(\\[\[\]\-\\])|\\(.)|([\[\]\\])/) do
+ $1 || $2 || '\\' + $3
+ end
+ end
+ private :_regex_quote
+
+ PATTERN_SJIS = '[\x81-\x9f\xe0-\xef][\x40-\x7e\x80-\xfc]'
+ PATTERN_EUC = '[\xa1-\xfe][\xa1-\xfe]'
+ PATTERN_UTF8 = '[\xc0-\xdf][\x80-\xbf]|[\xe0-\xef][\x80-\xbf][\x80-\xbf]'
+
+ RE_SJIS = Regexp.new(PATTERN_SJIS, 0, 'n')
+ RE_EUC = Regexp.new(PATTERN_EUC, 0, 'n')
+ RE_UTF8 = Regexp.new(PATTERN_UTF8, 0, 'n')
+
+ SUCC = {}
+ SUCC['s'] = Hash.new(1)
+ for i in 0 .. 0x3f
+ SUCC['s'][i.chr] = 0x40 - i
+ end
+ SUCC['s']["\x7e"] = 0x80 - 0x7e
+ SUCC['s']["\xfd"] = 0x100 - 0xfd
+ SUCC['s']["\xfe"] = 0x100 - 0xfe
+ SUCC['s']["\xff"] = 0x100 - 0xff
+ SUCC['e'] = Hash.new(1)
+ for i in 0 .. 0xa0
+ SUCC['e'][i.chr] = 0xa1 - i
+ end
+ SUCC['e']["\xfe"] = 2
+ SUCC['u'] = Hash.new(1)
+ for i in 0 .. 0x7f
+ SUCC['u'][i.chr] = 0x80 - i
+ end
+ SUCC['u']["\xbf"] = 0x100 - 0xbf
+
+ def mbchar?
+ case $KCODE[0]
+ when ?s, ?S
+ self =~ RE_SJIS
+ when ?e, ?E
+ self =~ RE_EUC
+ when ?u, ?U
+ self =~ RE_UTF8
+ else
+ nil
+ end
+ end
+
+ def end_regexp
+ case $KCODE[0]
+ when ?s, ?S
+ /#{PATTERN_SJIS}$/on
+ when ?e, ?E
+ /#{PATTERN_EUC}$/on
+ when ?u, ?U
+ /#{PATTERN_UTF8}$/on
+ else
+ /.$/on
+ end
+ end
+
+ alias original_succ! succ!
+ private :original_succ!
+
+ alias original_succ succ
+ private :original_succ
+
+ def succ!
+ reg = end_regexp
+ if $KCODE != 'NONE' && self =~ reg
+ succ_table = SUCC[$KCODE[0,1].downcase]
+ begin
+ self[-1] += succ_table[self[-1]]
+ self[-2] += 1 if self[-1] == 0
+ end while self !~ reg
+ self
+ else
+ original_succ!
+ end
+ end
+
+ def succ
+ str = self.dup
+ str.succ! or str
+ end
+
+ private
+
+ def _expand_ch str
+ a = []
+ str.scan(/(?:\\(.)|([^\\]))-(?:\\(.)|([^\\]))|(?:\\(.)|(.))/m) do
+ from = $1 || $2
+ to = $3 || $4
+ one = $5 || $6
+ if one
+ a.push one
+ elsif from.length != to.length
+ next
+ elsif from.length == 1
+ from[0].upto(to[0]) { |c| a.push c.chr }
+ else
+ from.upto(to) { |c| a.push c }
+ end
+ end
+ a
+ end
+
+ def expand_ch_hash from, to
+ h = {}
+ afrom = _expand_ch(from)
+ ato = _expand_ch(to)
+ afrom.each_with_index do |x,i| h[x] = ato[i] || ato[-1] end
+ h
+ end
+
+ HashCache = {}
+ TrPatternCache = {}
+ DeletePatternCache = {}
+ SqueezePatternCache = {}
+
+ public
+
+ def tr!(from, to)
+ return nil if from == ""
+ return self.delete!(from) if to == ""
+
+ pattern = TrPatternCache[from] ||= /[#{_regex_quote(from)}]/
+ if from[0] == ?^
+ last = /.$/.match(to)[0]
+ self.gsub!(pattern, last)
+ else
+ h = HashCache[from + "1-0" + to] ||= expand_ch_hash(from, to)
+ self.gsub!(pattern) do |c| h[c] end
+ end
+ end
+
+ def tr(from, to)
+ (str = self.dup).tr!(from, to) or str
+ end
+
+ def delete!(del)
+ return nil if del == ""
+ self.gsub!(DeletePatternCache[del] ||= /[#{_regex_quote(del)}]+/, '')
+ end
+
+ def delete(del)
+ (str = self.dup).delete!(del) or str
+ end
+
+ def squeeze!(del=nil)
+ return nil if del == ""
+ pattern =
+ if del
+ SqueezePatternCache[del] ||= /([#{_regex_quote(del)}])\1+/
+ else
+ /(.|\n)\1+/
+ end
+ self.gsub!(pattern, '\1')
+ end
+
+ def squeeze(del=nil)
+ (str = self.dup).squeeze!(del) or str
+ end
+
+ def tr_s!(from, to)
+ return self.delete!(from) if to.length == 0
+
+ pattern = SqueezePatternCache[from] ||= /([#{_regex_quote(from)}])\1*/
+ if from[0] == ?^
+ last = /.$/.match(to)[0]
+ self.gsub!(pattern, last)
+ else
+ h = HashCache[from + "1-0" + to] ||= expand_ch_hash(from, to)
+ self.gsub!(pattern) do h[$1] end
+ end
+ end
+
+ def tr_s(from, to)
+ (str = self.dup).tr_s!(from,to) or str
+ end
+
+ def chop!
+ self.gsub!(/(?:.|\r?\n)\z/, '')
+ end
+
+ def chop
+ (str = self.dup).chop! or str
+ end
+
+ def jlength
+ self.gsub(/[^\Wa-zA-Z_\d]/, ' ').length
+ end
+ alias jsize jlength
+
+ def jcount(str)
+ self.delete("^#{str}").jlength
+ end
+
+ def each_char
+ if block_given?
+ scan(/./m) do |x|
+ yield x
+ end
+ else
+ scan(/./m)
+ end
+ end
+
+end
+$VERBOSE = $vsave
diff --git a/lib/logger.rb b/lib/logger.rb
index 07699e7017..9030fa1d0d 100644
--- a/lib/logger.rb
+++ b/lib/logger.rb
@@ -3,8 +3,6 @@
require 'monitor'
-# = logger.rb
-#
# Simple logging utility.
#
# Author:: NAKAMURA, Hiroshi <nakahiro@sarion.co.jp>
@@ -14,11 +12,6 @@ require 'monitor'
# license; either the dual license version in 2003, or any later version.
# Revision:: $Id$
#
-# See Logger for documentation.
-#
-
-
-#
# == Description
#
# The Logger class provides a simple but sophisticated logging utility that
@@ -150,14 +143,14 @@ require 'monitor'
# 2. Log4r (somewhat) compatible interface.
#
# logger.level = Logger::INFO
-#
+#
# DEBUG < INFO < WARN < ERROR < FATAL < UNKNOWN
#
#
# == Format
#
-# Log messages are rendered in the output stream in a certain format by
-# default. The default format and a sample are shown below:
+# Log messages are rendered in the output stream in a certain format. The
+# default format and a sample are shown below:
#
# Log format:
# SeverityID, [Date Time mSec #pid] SeverityLabel -- ProgName: message
@@ -170,25 +163,15 @@ require 'monitor'
# logger.datetime_format = "%Y-%m-%d %H:%M:%S"
# # e.g. "2004-01-03 00:54:26"
#
-# You may change the overall format with Logger#formatter= method.
-#
-# logger.formatter = proc { |severity, datetime, progname, msg|
-# "#{datetime}: #{msg}\n"
-# }
-# # e.g. "Thu Sep 22 08:51:08 GMT+9:00 2005: hello world"
+# There is currently no supported way to change the overall format, but you may
+# have some luck hacking the Format constant.
#
class Logger
VERSION = "1.2.6"
- id, name, rev = %w$Id$
- if name
- name = name.chomp(",v")
- else
- name = File.basename(__FILE__)
- end
- rev ||= "v#{VERSION}"
- ProgName = "#{name}/#{rev}"
+ /: (\S+),v (\S+)/ =~ %q$Id$
+ ProgName = "#{$1}/#{$2}"
class Error < RuntimeError; end
class ShiftingError < Error; end
@@ -642,8 +625,8 @@ private
class Application
include Logger::Severity
- # Name of the application given at initialize.
attr_reader :appname
+ attr_reader :logdev
#
# == Synopsis
@@ -682,21 +665,9 @@ private
status
end
- # Logger for this application. See the class Logger for an explanation.
- def logger
- @log
- end
-
- #
- # Sets the logger for this application. See the class Logger for an explanation.
- #
- def logger=(logger)
- @log = logger
- end
-
#
- # Sets the log device for this application. See <tt>Logger.new</tt> for an explanation
- # of the arguments.
+ # Sets the log device for this application. See the class Logger for an
+ # explanation of the arguments.
#
def set_log(logdev, shift_age = 0, shift_size = 1024000)
@log = Logger.new(logdev, shift_age, shift_size)
diff --git a/lib/mailread.rb b/lib/mailread.rb
new file mode 100644
index 0000000000..08b33c92a4
--- /dev/null
+++ b/lib/mailread.rb
@@ -0,0 +1,62 @@
+# The Mail class represents an internet mail message (as per RFC822, RFC2822)
+# with headers and a body.
+class Mail
+
+ # Create a new Mail where +f+ is either a stream which responds to gets(),
+ # or a path to a file. If +f+ is a path it will be opened.
+ #
+ # The whole message is read so it can be made available through the #header,
+ # #[] and #body methods.
+ #
+ # The "From " line is ignored if the mail is in mbox format.
+ def initialize(f)
+ unless defined? f.gets
+ f = open(f, "r")
+ opened = true
+ end
+
+ @header = {}
+ @body = []
+ begin
+ while line = f.gets()
+ line.chop!
+ next if /^From /=~line # skip From-line
+ break if /^$/=~line # end of header
+
+ if /^(\S+?):\s*(.*)/=~line
+ (attr = $1).capitalize!
+ @header[attr] = $2
+ elsif attr
+ line.sub!(/^\s*/, '')
+ @header[attr] += "\n" + line
+ end
+ end
+
+ return unless line
+
+ while line = f.gets()
+ break if /^From /=~line
+ @body.push(line)
+ end
+ ensure
+ f.close if opened
+ end
+ end
+
+ # Return the headers as a Hash.
+ def header
+ return @header
+ end
+
+ # Return the message body as an Array of lines
+ def body
+ return @body
+ end
+
+ # Return the header corresponding to +field+.
+ #
+ # Matching is case-insensitive.
+ def [](field)
+ @header[field.capitalize]
+ end
+end
diff --git a/lib/mathn.rb b/lib/mathn.rb
index 57eac113c7..a5a121c6c6 100644
--- a/lib/mathn.rb
+++ b/lib/mathn.rb
@@ -1,64 +1,133 @@
#
-# mathn.rb -
+# mathn.rb -
# $Release Version: 0.5 $
# $Revision: 1.1.1.1.4.1 $
+# $Date: 1998/01/16 12:36:05 $
# by Keiju ISHITSUKA(SHL Japan Inc.)
#
# --
#
-#
+#
#
-require "cmath.rb"
+require "complex.rb"
+require "rational.rb"
require "matrix.rb"
-require "prime.rb"
-require "mathn/rational"
-require "mathn/complex"
+class Integer
-unless defined?(Math.exp!)
- Object.instance_eval{remove_const :Math}
- Math = CMath
+ def gcd2(int)
+ a = self.abs
+ b = int.abs
+ a, b = b, a if a < b
+
+ pd_a = a.prime_division
+ pd_b = b.prime_division
+
+ gcd = 1
+ for pair in pd_a
+ as = pd_b.assoc(pair[0])
+ if as
+ gcd *= as[0] ** [as[1], pair[1]].min
+ end
+ end
+ return gcd
+ end
+
+ def Integer.from_prime_division(pd)
+ value = 1
+ for prime, index in pd
+ value *= prime**index
+ end
+ value
+ end
+
+ def prime_division
+ raise ZeroDivisionError if self == 0
+ ps = Prime.new
+ value = self
+ pv = []
+ for prime in ps
+ count = 0
+ while (value1, mod = value.divmod(prime)
+ mod) == 0
+ value = value1
+ count += 1
+ end
+ if count != 0
+ pv.push [prime, count]
+ end
+ break if prime * prime >= value
+ end
+ if value > 1
+ pv.push [value, 1]
+ end
+ return pv
+ end
end
+
+class Prime
+ include Enumerable
-class Fixnum
- remove_method :/
- alias / quo
-
- alias power! ** unless defined?(0.power!)
+ def initialize
+ @seed = 1
+ @primes = []
+ @counts = []
+ end
+
+ def succ
+ i = -1
+ size = @primes.size
+ while i < size
+ if i == -1
+ @seed += 1
+ i += 1
+ else
+ while @seed > @counts[i]
+ @counts[i] += @primes[i]
+ end
+ if @seed != @counts[i]
+ i += 1
+ else
+ i = -1
+ end
+ end
+ end
+ @primes.push @seed
+ @counts.push @seed + @seed
+ return @seed
+ end
+ alias next succ
- def ** (other)
- if self < 0 && other.round != other
- Complex(self, 0.0) ** other
- else
- power!(other)
+ def each
+ loop do
+ yield succ
end
end
+end
+class Fixnum
+ alias / quo
end
class Bignum
- remove_method :/
alias / quo
+end
- alias power! ** unless defined?(0.power!)
+class Rational
+ Unify = true
- def ** (other)
- if self < 0 && other.round != other
- Complex(self, 0.0) ** other
- else
- power!(other)
- end
+ def inspect
+ format "%s/%s", numerator.inspect, denominator.inspect
end
-end
+ alias power! **
-class Rational
def ** (other)
if other.kind_of?(Rational)
other2 = other
if self < 0
- return Complex(self, 0.0) ** other
+ return Complex.new!(self, 0) ** other
elsif other == 0
return Rational(1,1)
elsif self == 0
@@ -66,14 +135,14 @@ class Rational
elsif self == 1
return Rational(1,1)
end
-
+
npd = numerator.prime_division
dpd = denominator.prime_division
if other < 0
other = -other
npd, dpd = dpd, npd
end
-
+
for elm in npd
elm[1] = elm[1] * other
if !elm[1].kind_of?(Integer) and elm[1].denominator != 1
@@ -81,7 +150,7 @@ class Rational
end
elm[1] = elm[1].to_i
end
-
+
for elm in dpd
elm[1] = elm[1] * other
if !elm[1].kind_of?(Integer) and elm[1].denominator != 1
@@ -89,12 +158,56 @@ class Rational
end
elm[1] = elm[1].to_i
end
-
+
num = Integer.from_prime_division(npd)
den = Integer.from_prime_division(dpd)
-
+
Rational(num,den)
+
+ elsif other.kind_of?(Integer)
+ if other > 0
+ num = numerator ** other
+ den = denominator ** other
+ elsif other < 0
+ num = denominator ** -other
+ den = numerator ** -other
+ elsif other == 0
+ num = 1
+ den = 1
+ end
+ Rational.new!(num, den)
+ elsif other.kind_of?(Float)
+ Float(self) ** other
+ else
+ x , y = other.coerce(self)
+ x ** y
+ end
+ end
+ def power2(other)
+ if other.kind_of?(Rational)
+ if self < 0
+ return Complex(self, 0) ** other
+ elsif other == 0
+ return Rational(1,1)
+ elsif self == 0
+ return Rational(0,1)
+ elsif self == 1
+ return Rational(1,1)
+ end
+
+ dem = nil
+ x = self.denominator.to_f.to_i
+ neard = self.denominator.to_f ** (1.0/other.denominator.to_f)
+ loop do
+ if (neard**other.denominator == self.denominator)
+ dem = neaed
+ break
+ end
+ end
+ nearn = self.numerator.to_f ** (1.0/other.denominator.to_f)
+ Rational(num,den)
+
elsif other.kind_of?(Integer)
if other > 0
num = numerator ** other
@@ -106,7 +219,7 @@ class Rational
num = 1
den = 1
end
- Rational(num, den)
+ Rational.new!(num, den)
elsif other.kind_of?(Float)
Float(self) ** other
else
@@ -117,10 +230,9 @@ class Rational
end
module Math
- remove_method(:sqrt)
def sqrt(a)
if a.kind_of?(Complex)
- abs = sqrt(a.real*a.real + a.imag*a.imag)
+ abs = sqrt(a.real*a.real + a.image*a.image)
# if not abs.kind_of?(Rational)
# return a**Rational(1,2)
# end
@@ -129,20 +241,18 @@ module Math
# if !(x.kind_of?(Rational) and y.kind_of?(Rational))
# return a**Rational(1,2)
# end
- if a.imag >= 0
+ if a.image >= 0
Complex(x, y)
else
Complex(x, -y)
end
- elsif a.respond_to?(:nan?) and a.nan?
- a
elsif a >= 0
rsqrt(a)
else
Complex(0,rsqrt(-a))
end
end
-
+
def rsqrt(a)
if a.kind_of?(Float)
sqrt!(a)
@@ -156,7 +266,7 @@ module Math
while (src >= max) and (src >>= 32)
byte_a.unshift src & 0xffffffff
end
-
+
answer = 0
main = 0
side = 0
@@ -166,13 +276,13 @@ module Math
if answer != 0
if main * 4 < side * side
applo = main.div(side)
- else
+ else
applo = ((sqrt!(side * side + 4 * main) - side)/2.0).to_i + 1
end
else
applo = sqrt!(main).to_i + 1
end
-
+
while (x = (side + applo) * applo) > main
applo -= 1
end
@@ -192,15 +302,7 @@ module Math
module_function :rsqrt
end
-class Float
- alias power! **
-
- def ** (other)
- if self < 0 && other.round != other
- Complex(self, 0.0) ** other
- else
- power!(other)
- end
- end
-
+class Complex
+ Unify = true
end
+
diff --git a/lib/matrix.rb b/lib/matrix.rb
index 95c8273522..470db19b05 100644
--- a/lib/matrix.rb
+++ b/lib/matrix.rb
@@ -1,7 +1,9 @@
+#!/usr/local/bin/ruby
#--
-# matrix.rb -
-# $Release Version: 1.0$
-# $Revision: 1.13 $
+# matrix.rb -
+# $Release Version: 1.0$
+# $Revision: 1.11 $
+# $Date: 1999/10/06 11:01:53 $
# Original Version from Smalltalk-80 version
# on July 23, 1985 at 8:37:17 am
# by Keiju ISHITSUKA
@@ -12,18 +14,19 @@
# An implementation of Matrix and Vector classes.
#
# Author:: Keiju ISHITSUKA
-# Documentation:: Gavin Sinclair (sourced from <i>Ruby in a Nutshell</i> (Matsumoto, O'Reilly))
+# Documentation:: Gavin Sinclair (sourced from <i>Ruby in a Nutshell</i> (Matsumoto, O'Reilly))
#
-# See classes Matrix and Vector for documentation.
+# See classes Matrix and Vector for documentation.
#
+
require "e2mmap.rb"
module ExceptionForMatrix # :nodoc:
extend Exception2MessageMapper
def_e2message(TypeError, "wrong argument type %s (expected %s)")
def_e2message(ArgumentError, "Wrong # of arguments(%d for %d)")
-
+
def_exception("ErrDimensionMismatch", "\#{self.name} dimension mismatch")
def_exception("ErrNotRegular", "Not Regular Matrix")
def_exception("ErrOperationNotDefined", "This operation(%s) can\\'t defined")
@@ -58,7 +61,7 @@ end
# * <tt> Matrix.row_vector(row) </tt>
# * <tt> Matrix.column_vector(column) </tt>
#
-# To access Matrix elements/columns/rows/submatrices/properties:
+# To access Matrix elements/columns/rows/submatrices/properties:
# * <tt> [](i, j) </tt>
# * <tt> #row_size </tt>
# * <tt> #column_size </tt>
@@ -102,14 +105,14 @@ end
# * <tt> #inspect </tt>
#
class Matrix
- @RCS_ID='-$Id: matrix.rb,v 1.13 2001/12/09 14:22:23 keiju Exp keiju $-'
-
+ @RCS_ID='-$Id: matrix.rb,v 1.11 1999/10/06 11:01:53 keiju Exp keiju $-'
+
# extend Exception2MessageMapper
include ExceptionForMatrix
-
+
# instance creations
private_class_method :new
-
+
#
# Creates a matrix where each argument is a row.
# Matrix[ [25, 93], [-1, 66] ]
@@ -119,7 +122,7 @@ class Matrix
def Matrix.[](*rows)
new(:init_rows, rows, false)
end
-
+
#
# Creates a matrix where +rows+ is an array of arrays, each of which is a row
# to the matrix. If the optional argument +copy+ is false, use the given
@@ -130,7 +133,7 @@ class Matrix
def Matrix.rows(rows, copy = true)
new(:init_rows, rows, copy)
end
-
+
#
# Creates a matrix using +columns+ as an array of column vectors.
# Matrix.columns([[25, 93], [-1, 66]])
@@ -139,14 +142,16 @@ class Matrix
#
#
def Matrix.columns(columns)
- rows = (0 .. columns[0].size - 1).collect {|i|
- (0 .. columns.size - 1).collect {|j|
+ rows = (0 .. columns[0].size - 1).collect {
+ |i|
+ (0 .. columns.size - 1).collect {
+ |j|
columns[j][i]
}
}
Matrix.rows(rows, false)
end
-
+
#
# Creates a matrix where the diagonal elements are composed of +values+.
# Matrix.diagonal(9, 5, -3)
@@ -156,14 +161,15 @@ class Matrix
#
def Matrix.diagonal(*values)
size = values.size
- rows = (0 .. size - 1).collect {|j|
+ rows = (0 .. size - 1).collect {
+ |j|
row = Array.new(size).fill(0, 0, size)
row[j] = values[j]
row
}
rows(rows, false)
end
-
+
#
# Creates an +n+ by +n+ diagonal matrix where each diagonal element is
# +value+.
@@ -184,11 +190,11 @@ class Matrix
def Matrix.identity(n)
Matrix.scalar(n, 1)
end
- class << Matrix
+ class << Matrix
alias unit identity
alias I identity
end
-
+
#
# Creates an +n+ by +n+ zero matrix.
# Matrix.zero(2)
@@ -198,7 +204,7 @@ class Matrix
def Matrix.zero(n)
Matrix.scalar(n, 0)
end
-
+
#
# Creates a single-row matrix where the values of that row are as given in
# +row+.
@@ -215,7 +221,7 @@ class Matrix
Matrix.rows([[row]], false)
end
end
-
+
#
# Creates a single-column matrix where the values of that column are as given
# in +column+.
@@ -242,7 +248,7 @@ class Matrix
def initialize(init_method, *argv)
self.send(init_method, *argv)
end
-
+
def init_rows(rows, copy)
if copy
@rows = rows.collect{|row| row.dup}
@@ -252,22 +258,13 @@ class Matrix
self
end
private :init_rows
-
+
#
# Returns element (+i+,+j+) of the matrix. That is: row +i+, column +j+.
#
def [](i, j)
@rows[i][j]
end
- alias element []
- alias component []
-
- def []=(i, j, v)
- @rows[i][j] = v
- end
- alias set_element []=
- alias set_component []=
- private :[]=, :set_element, :set_component
#
# Returns the number of rows.
@@ -275,7 +272,7 @@ class Matrix
def row_size
@rows.size
end
-
+
#
# Returns the number of columns. Note that it is possible to construct a
# matrix with uneven columns (e.g. Matrix[ [1,2,3], [4,5] ]), but this is
@@ -307,21 +304,23 @@ class Matrix
#
def column(j) # :yield: e
if block_given?
- 0.upto(row_size - 1) do |i|
+ 0.upto(row_size - 1) do
+ |i|
yield @rows[i][j]
end
else
- col = (0 .. row_size - 1).collect {|i|
+ col = (0 .. row_size - 1).collect {
+ |i|
@rows[i][j]
}
Vector.elements(col, false)
end
end
-
+
#
# Returns a matrix that is the result of iteration of the given block over all
# elements of the matrix.
- # Matrix[ [1,2], [3,4] ].collect { |e| e**2 }
+ # Matrix[ [1,2], [3,4] ].collect { |i| i**2 }
# => 1 4
# 9 16
#
@@ -330,7 +329,7 @@ class Matrix
Matrix.rows(rows, false)
end
alias map collect
-
+
#
# Returns a section of the matrix. The parameters are either:
# * start_row, nrows, start_col, ncols; OR
@@ -357,13 +356,14 @@ class Matrix
else
Matrix.Raise ArgumentError, param.inspect
end
-
- rows = @rows[from_row, size_row].collect{|row|
+
+ rows = @rows[from_row, size_row].collect{
+ |row|
row[from_col, size_col]
}
Matrix.rows(rows, false)
end
-
+
#--
# TESTING -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
#++
@@ -374,7 +374,7 @@ class Matrix
def regular?
square? and rank == column_size
end
-
+
#
# Returns +true+ is this is a singular (i.e. non-regular) matrix.
#
@@ -389,7 +389,7 @@ class Matrix
def square?
column_size == row_size
end
-
+
#--
# OBJECT METHODS -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
#++
@@ -399,27 +399,24 @@ class Matrix
#
def ==(other)
return false unless Matrix === other
-
+
other.compare_by_row_vectors(@rows)
end
- def eql?(other)
- return false unless Matrix === other
-
- other.compare_by_row_vectors(@rows, :eql?)
- end
-
+ alias eql? ==
+
#
# Not really intended for general consumption.
#
- def compare_by_row_vectors(rows, comparison = :==)
+ def compare_by_row_vectors(rows)
return false unless @rows.size == rows.size
-
- 0.upto(@rows.size - 1) do |i|
- return false unless @rows[i].send(comparison, rows[i])
+
+ 0.upto(@rows.size - 1) do
+ |i|
+ return false unless @rows[i] == rows[i]
end
true
end
-
+
#
# Returns a clone of the matrix, so that the contents of each do not reference
# identical objects.
@@ -427,7 +424,7 @@ class Matrix
def clone
Matrix.rows(@rows)
end
-
+
#
# Returns a hash-code for the matrix.
#
@@ -440,11 +437,11 @@ class Matrix
end
return value
end
-
+
#--
# ARITHMETIC -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
#++
-
+
#
# Matrix multiplication.
# Matrix[[2,4], [6,8]] * Matrix.identity(2)
@@ -454,8 +451,10 @@ class Matrix
def *(m) # m is matrix or vector or number
case(m)
when Numeric
- rows = @rows.collect {|row|
- row.collect {|e|
+ rows = @rows.collect {
+ |row|
+ row.collect {
+ |e|
e * m
}
}
@@ -466,11 +465,14 @@ class Matrix
return r.column(0)
when Matrix
Matrix.Raise ErrDimensionMismatch if column_size != m.row_size
-
- rows = (0 .. row_size - 1).collect {|i|
- (0 .. m.column_size - 1).collect {|j|
+
+ rows = (0 .. row_size - 1).collect {
+ |i|
+ (0 .. m.column_size - 1).collect {
+ |j|
vij = 0
- 0.upto(column_size - 1) do |k|
+ 0.upto(column_size - 1) do
+ |k|
vij += self[i, k] * m[k, j]
end
vij
@@ -482,7 +484,7 @@ class Matrix
return x * y
end
end
-
+
#
# Matrix addition.
# Matrix.scalar(2,5) + Matrix[[1,0], [-4,7]]
@@ -500,11 +502,13 @@ class Matrix
x, y = m.coerce(self)
return x + y
end
-
+
Matrix.Raise ErrDimensionMismatch unless row_size == m.row_size and column_size == m.column_size
-
- rows = (0 .. row_size - 1).collect {|i|
- (0 .. column_size - 1).collect {|j|
+
+ rows = (0 .. row_size - 1).collect {
+ |i|
+ (0 .. column_size - 1).collect {
+ |j|
self[i, j] + m[i, j]
}
}
@@ -528,17 +532,19 @@ class Matrix
x, y = m.coerce(self)
return x - y
end
-
+
Matrix.Raise ErrDimensionMismatch unless row_size == m.row_size and column_size == m.column_size
-
- rows = (0 .. row_size - 1).collect {|i|
- (0 .. column_size - 1).collect {|j|
+
+ rows = (0 .. row_size - 1).collect {
+ |i|
+ (0 .. column_size - 1).collect {
+ |j|
self[i, j] - m[i, j]
}
}
Matrix.rows(rows, false)
end
-
+
#
# Matrix division (multiplication by the inverse).
# Matrix[[7,6], [3,9]] / Matrix[[2,9], [3,1]]
@@ -548,8 +554,10 @@ class Matrix
def /(other)
case other
when Numeric
- rows = @rows.collect {|row|
- row.collect {|e|
+ rows = @rows.collect {
+ |row|
+ row.collect {
+ |e|
e / other
}
}
@@ -580,11 +588,11 @@ class Matrix
def inverse_from(src)
size = row_size - 1
a = src.to_a
-
+
for k in 0..size
i = k
akk = a[k][k].abs
- ((k+1)..size).each do |j|
+ for j in (k+1)..size
v = a[j][k].abs
if v > akk
i = j
@@ -597,31 +605,35 @@ class Matrix
@rows[i], @rows[k] = @rows[k], @rows[i]
end
akk = a[k][k]
-
+
for i in 0 .. size
next if i == k
- q = a[i][k].quo(akk)
+ q = a[i][k] / akk
a[i][k] = 0
-
- for j in (k + 1).. size
+
+ (k + 1).upto(size) do
+ |j|
a[i][j] -= a[k][j] * q
end
- for j in 0..size
+ 0.upto(size) do
+ |j|
@rows[i][j] -= @rows[k][j] * q
end
end
-
- for j in (k + 1).. size
- a[k][j] = a[k][j].quo(akk)
+
+ (k + 1).upto(size) do
+ |j|
+ a[k][j] /= akk
end
- for j in 0..size
- @rows[k][j] = @rows[k][j].quo(akk)
+ 0.upto(size) do
+ |j|
+ @rows[k][j] /= akk
end
end
self
end
#alias reciprocal inverse
-
+
#
# Matrix exponentiation. Defined for integer powers only. Equivalent to
# multiplying the matrix by itself N times.
@@ -655,106 +667,53 @@ class Matrix
Matrix.Raise ErrOperationNotDefined, "**"
end
end
-
+
#--
# MATRIX FUNCTIONS -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
#++
-
+
#
# Returns the determinant of the matrix. If the matrix is not square, the
- # result is 0. This method's algorism is Gaussian elimination method
- # and using Numeric#quo(). Beware that using Float values, with their
- # usual lack of precision, can affect the value returned by this method. Use
- # Rational values or Matrix#det_e instead if this is important to you.
- #
+ # result is 0.
# Matrix[[7,6], [3,9]].determinant
- # => 63.0
+ # => 63
#
def determinant
return 0 unless square?
-
+
size = row_size - 1
a = to_a
-
+
det = 1
k = 0
- loop do
+ begin
if (akk = a[k][k]) == 0
i = k
- loop do
- return 0 if (ii += 1) > size
- break unless a[i][k] == 0
- end
+ begin
+ return 0 if (i += 1) > size
+ end while a[i][k] == 0
a[i], a[k] = a[k], a[i]
akk = a[k][k]
det *= -1
end
-
- for i in k + 1 .. size
- q = a[i][k].quo(akk)
- (k + 1).upto(size) do |j|
+ (k + 1).upto(size) do
+ |i|
+ q = a[i][k] / akk
+ (k + 1).upto(size) do
+ |j|
a[i][j] -= a[k][j] * q
end
end
det *= akk
- break unless (k += 1) <= size
- end
+ end while (k += 1) <= size
det
end
alias det determinant
-
- #
- # Returns the determinant of the matrix. If the matrix is not square, the
- # result is 0. This method's algorism is Gaussian elimination method.
- # This method uses Euclidean algorism. If all elements are integer,
- # really exact value. But, if an element is a float, can't return
- # exact value.
- #
- # Matrix[[7,6], [3,9]].determinant
- # => 63
- #
- def determinant_e
- return 0 unless square?
-
- size = row_size - 1
- a = to_a
-
- det = 1
- k = 0
- loop do
- if a[k][k].zero?
- i = k
- loop do
- return 0 if (i += 1) > size
- break unless a[i][k].zero?
- end
- a[i], a[k] = a[k], a[i]
- det *= -1
- end
-
- for i in (k + 1)..size
- q = a[i][k].quo(a[k][k])
- k.upto(size) do |j|
- a[i][j] -= a[k][j] * q
- end
- unless a[i][k].zero?
- a[i], a[k] = a[k], a[i]
- det *= -1
- redo
- end
- end
- det *= a[k][k]
- break unless (k += 1) <= size
- end
- det
- end
- alias det_e determinant_e
-
- #
- # Returns the rank of the matrix. Beware that using Float values,
- # probably return faild value. Use Rational values or Matrix#rank_e
- # for getting exact result.
+
#
+ # Returns the rank of the matrix. Beware that using Float values, with their
+ # usual lack of precision, can affect the value returned by this method. Use
+ # Rational values instead if this is important to you.
# Matrix[[7,6], [3,9]].rank
# => 2
#
@@ -774,28 +733,27 @@ class Matrix
if (akk = a[k][k]) == 0
i = k
exists = true
- loop do
+ begin
if (i += 1) > a_column_size - 1
exists = false
break
end
- break unless a[i][k] == 0
- end
+ end while a[i][k] == 0
if exists
a[i], a[k] = a[k], a[i]
akk = a[k][k]
else
i = k
exists = true
- loop do
+ begin
if (i += 1) > a_row_size - 1
exists = false
break
end
- break unless a[k][i] == 0
- end
+ end while a[k][i] == 0
if exists
- k.upto(a_column_size - 1) do |j|
+ k.upto(a_column_size - 1) do
+ |j|
a[j][k], a[j][i] = a[j][i], a[j][k]
end
akk = a[k][k]
@@ -804,10 +762,11 @@ class Matrix
end
end
end
-
- for i in (k + 1)..(a_row_size - 1)
- q = a[i][k].quo(akk)
- for j in (k + 1)..(a_column_size - 1)
+ (k + 1).upto(a_row_size - 1) do
+ |i|
+ q = a[i][k] / akk
+ (k + 1).upto(a_column_size - 1) do
+ |j|
a[i][j] -= a[k][j] * q
end
end
@@ -817,54 +776,20 @@ class Matrix
end
#
- # Returns the rank of the matrix. This method uses Euclidean
- # algorism. If all elements are integer, really exact value. But, if
- # an element is a float, can't return exact value.
- #
- # Matrix[[7,6], [3,9]].rank
- # => 2
- #
- def rank_e
- a = to_a
- a_column_size = column_size
- a_row_size = row_size
- pi = 0
- (0 ... a_column_size).each do |j|
- if i = (pi ... a_row_size).find{|i0| !a[i0][j].zero?}
- if i != pi
- a[pi], a[i] = a[i], a[pi]
- end
- (pi + 1 ... a_row_size).each do |k|
- q = a[k][j].quo(a[pi][j])
- (pi ... a_column_size).each do |j0|
- a[k][j0] -= q * a[pi][j0]
- end
- if k > pi && !a[k][j].zero?
- a[k], a[pi] = a[pi], a[k]
- redo
- end
- end
- pi += 1
- end
- end
- pi
- end
-
-
- #
# Returns the trace (sum of diagonal elements) of the matrix.
# Matrix[[7,6], [3,9]].trace
# => 16
#
def trace
tr = 0
- 0.upto(column_size - 1) do |i|
+ 0.upto(column_size - 1) do
+ |i|
tr += @rows[i][i]
end
tr
end
alias tr trace
-
+
#
# Returns the transpose of the matrix.
# Matrix[[1,2], [3,4], [5,6]]
@@ -879,11 +804,11 @@ class Matrix
Matrix.columns(@rows)
end
alias t transpose
-
+
#--
# CONVERTING -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
#++
-
+
#
# FIXME: describe #coerce.
#
@@ -900,70 +825,61 @@ class Matrix
# Returns an array of the row vectors of the matrix. See Vector.
#
def row_vectors
- rows = (0 .. row_size - 1).collect {|i|
+ rows = (0 .. row_size - 1).collect {
+ |i|
row(i)
}
rows
end
-
+
#
# Returns an array of the column vectors of the matrix. See Vector.
#
def column_vectors
- columns = (0 .. column_size - 1).collect {|i|
+ columns = (0 .. column_size - 1).collect {
+ |i|
column(i)
}
columns
end
-
+
#
# Returns an array of arrays that describe the rows of the matrix.
#
def to_a
@rows.collect{|row| row.collect{|e| e}}
end
-
- def elements_to_f
- collect{|e| e.to_f}
- end
-
- def elements_to_i
- collect{|e| e.to_i}
- end
-
- def elements_to_r
- collect{|e| e.to_r}
- end
-
+
#--
# PRINTING -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
#++
-
+
#
# Overrides Object#to_s
#
def to_s
- "Matrix[" + @rows.collect{|row|
+ "Matrix[" + @rows.collect{
+ |row|
"[" + row.collect{|e| e.to_s}.join(", ") + "]"
}.join(", ")+"]"
end
-
+
#
# Overrides Object#inspect
#
def inspect
"Matrix"+@rows.inspect
end
-
+
# Private CLASS
-
+
class Scalar < Numeric # :nodoc:
include ExceptionForMatrix
-
+
def initialize(value)
@value = value
end
-
+
# ARITHMETIC
def +(other)
case other
@@ -978,7 +894,7 @@ class Matrix
x + y
end
end
-
+
def -(other)
case other
when Numeric
@@ -992,7 +908,7 @@ class Matrix
x - y
end
end
-
+
def *(other)
case other
when Numeric
@@ -1004,7 +920,7 @@ class Matrix
x * y
end
end
-
+
def / (other)
case other
when Numeric
@@ -1012,13 +928,13 @@ class Matrix
when Vector
Scalar.Raise WrongArgType, other.class, "Numeric or Scalar or Matrix"
when Matrix
- self * other.inverse
+ self * _M.inverse
else
x, y = other.coerce(self)
- x.quo(y)
+ x / y
end
end
-
+
def ** (other)
case other
when Numeric
@@ -1077,9 +993,9 @@ end
#
class Vector
include ExceptionForMatrix
-
+
#INSTANCE CREATION
-
+
private_class_method :new
#
@@ -1089,7 +1005,7 @@ class Vector
def Vector.[](*array)
new(:init_elements, array, copy = false)
end
-
+
#
# Creates a vector from an Array. The optional second argument specifies
# whether the array itself or a copy is used internally.
@@ -1097,14 +1013,14 @@ class Vector
def Vector.elements(array, copy = true)
new(:init_elements, array, copy)
end
-
+
#
# For internal use.
#
def initialize(method, array, copy)
self.send(method, array, copy)
end
-
+
#
# For internal use.
#
@@ -1115,32 +1031,23 @@ class Vector
@elements = array
end
end
-
+
# ACCESSING
-
+
#
# Returns element number +i+ (starting at zero) of the vector.
#
def [](i)
@elements[i]
end
- alias element []
- alias component []
-
- def []=(i, v)
- @elements[i]= v
- end
- alias set_element []=
- alias set_component []=
- private :[]=, :set_element, :set_component
-
+
#
# Returns the number of elements in the vector.
#
def size
@elements.size
end
-
+
#--
# ENUMERATIONS -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
#++
@@ -1150,18 +1057,20 @@ class Vector
#
def each2(v) # :yield: e1, e2
Vector.Raise ErrDimensionMismatch if size != v.size
- 0.upto(size - 1) do |i|
+ 0.upto(size - 1) do
+ |i|
yield @elements[i], v[i]
end
end
-
+
#
# Collects (as in Enumerable#collect) over the elements of this vector and +v+
# in conjunction.
#
def collect2(v) # :yield: e1, e2
Vector.Raise ErrDimensionMismatch if size != v.size
- (0 .. size - 1).collect do |i|
+ (0 .. size - 1).collect do
+ |i|
yield @elements[i], v[i]
end
end
@@ -1175,40 +1084,36 @@ class Vector
#
def ==(other)
return false unless Vector === other
-
+
other.compare_by(@elements)
end
- def eql?(other)
- return false unless Vector === other
-
- other.compare_by(@elements, :eql?)
- end
-
+ alias eqn? ==
+
#
# For internal use.
#
- def compare_by(elements, comparison = :==)
- @elements.send(comparison, elements)
+ def compare_by(elements)
+ @elements == elements
end
-
+
#
# Return a copy of the vector.
#
def clone
Vector.elements(@elements)
end
-
+
#
# Return a hash-code for the vector.
#
def hash
@elements.hash
end
-
+
#--
# ARITHMETIC -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
#++
-
+
#
# Multiplies the vector by +x+, where +x+ is a number or another vector.
#
@@ -1232,7 +1137,8 @@ class Vector
case v
when Vector
Vector.Raise ErrDimensionMismatch if size != v.size
- els = collect2(v) {|v1, v2|
+ els = collect2(v) {
+ |v1, v2|
v1 + v2
}
Vector.elements(els, false)
@@ -1251,7 +1157,8 @@ class Vector
case v
when Vector
Vector.Raise ErrDimensionMismatch if size != v.size
- els = collect2(v) {|v1, v2|
+ els = collect2(v) {
+ |v1, v2|
v1 - v2
}
Vector.elements(els, false)
@@ -1262,46 +1169,49 @@ class Vector
s - x
end
end
-
+
#--
# VECTOR FUNCTIONS -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
#++
-
+
#
# Returns the inner product of this vector with the other.
# Vector[4,7].inner_product Vector[10,1] => 47
#
def inner_product(v)
Vector.Raise ErrDimensionMismatch if size != v.size
-
+
p = 0
- each2(v) {|v1, v2|
+ each2(v) {
+ |v1, v2|
p += v1 * v2
}
p
end
-
+
#
# Like Array#collect.
#
def collect # :yield: e
- els = @elements.collect {|v|
+ els = @elements.collect {
+ |v|
yield v
}
Vector.elements(els, false)
end
alias map collect
-
+
#
# Like Vector#collect2, but returns a Vector instead of an Array.
#
def map2(v) # :yield: e1, e2
- els = collect2(v) {|v1, v2|
+ els = collect2(v) {
+ |v1, v2|
yield v1, v2
}
Vector.elements(els, false)
end
-
+
#
# Returns the modulus (Pythagorean distance) of the vector.
# Vector[5,8,2].r => 9.643650761
@@ -1313,7 +1223,7 @@ class Vector
end
return Math.sqrt(v)
end
-
+
#--
# CONVERTING
#++
@@ -1324,49 +1234,37 @@ class Vector
def covector
Matrix.row_vector(self)
end
-
+
#
# Returns the elements of the vector in an array.
#
def to_a
@elements.dup
end
-
- def elements_to_f
- collect{|e| e.to_f}
- end
-
- def elements_to_i
- collect{|e| e.to_i}
- end
-
- def elements_to_r
- collect{|e| e.to_r}
- end
-
+
#
# FIXME: describe Vector#coerce.
#
def coerce(other)
case other
when Numeric
- return Matrix::Scalar.new(other), self
+ return Scalar.new(other), self
else
raise TypeError, "#{self.class} can't be coerced into #{other.class}"
end
end
-
+
#--
# PRINTING -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
#++
-
+
#
# Overrides Object#to_s
#
def to_s
"Vector[" + @elements.join(", ") + "]"
end
-
+
#
# Overrides Object#inspect
#
diff --git a/lib/minitest/autorun.rb b/lib/minitest/autorun.rb
deleted file mode 100644
index 5bf35f6ab8..0000000000
--- a/lib/minitest/autorun.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-############################################################
-# This file is imported from a different project.
-# DO NOT make modifications in this repo.
-# File a patch instead and assign it to Ryan Davis
-############################################################
-
-require 'minitest/unit'
-require 'minitest/spec'
-require 'minitest/mock'
-
-MiniTest::Unit.autorun
diff --git a/lib/minitest/mock.rb b/lib/minitest/mock.rb
deleted file mode 100644
index 54af28c453..0000000000
--- a/lib/minitest/mock.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-############################################################
-# This file is imported from a different project.
-# DO NOT make modifications in this repo.
-# File a patch instead and assign it to Ryan Davis
-############################################################
-
-class MockExpectationError < StandardError; end
-
-module MiniTest
- class Mock
- def initialize
- @expected_calls = {}
- @actual_calls = Hash.new {|h,k| h[k] = [] }
- end
-
- def expect(name, retval, args=[])
- n, r, a = name, retval, args # for the closure below
- @expected_calls[name] = { :retval => retval, :args => args }
- self.class.__send__(:define_method, name) { |*x|
- raise ArgumentError unless @expected_calls[n][:args].size == x.size
- @actual_calls[n] << { :retval => r, :args => x }
- retval
- }
- self
- end
-
- def verify
- @expected_calls.each_key do |name|
- expected = @expected_calls[name]
- msg = "expected #{name}, #{expected.inspect}"
- raise MockExpectationError, msg unless
- @actual_calls.has_key? name and @actual_calls[name].include?(expected)
- end
- true
- end
- end
-end
diff --git a/lib/minitest/spec.rb b/lib/minitest/spec.rb
deleted file mode 100644
index 81bd08867a..0000000000
--- a/lib/minitest/spec.rb
+++ /dev/null
@@ -1,114 +0,0 @@
-############################################################
-# This file is imported from a different project.
-# DO NOT make modifications in this repo.
-# File a patch instead and assign it to Ryan Davis
-############################################################
-
-#!/usr/bin/ruby -w
-
-require 'minitest/unit'
-
-class Module
- def infect_with_assertions pos_prefix, neg_prefix, skip_re, map = {}
- MiniTest::Assertions.public_instance_methods(false).each do |meth|
- meth = meth.to_s
-
- new_name = case meth
- when /^assert/ then
- meth.sub(/^assert/, pos_prefix.to_s)
- when /^refute/ then
- meth.sub(/^refute/, neg_prefix.to_s)
- end
- next unless new_name
- next if new_name =~ skip_re
-
- regexp, replacement = map.find { |re, _| new_name =~ re }
- new_name.sub! regexp, replacement if replacement
-
- # warn "%-22p -> %p %p" % [meth, new_name, regexp]
- self.class_eval <<-EOM
- def #{new_name} *args, &block
- return MiniTest::Spec.current.#{meth}(*args, &self) if Proc === self
- return MiniTest::Spec.current.#{meth}(args.first, self) if args.size == 1
- return MiniTest::Spec.current.#{meth}(self, *args)
- end
- EOM
- end
- end
-end
-
-Object.infect_with_assertions(:must, :wont,
- /^(must|wont)$|wont_(throw)|
- must_(block|not?_|nothing|raise$)/x,
- /(must_throw)s/ => '\1',
- /(?!not)_same/ => '_be_same_as',
- /_in_/ => '_be_within_',
- /_operator/ => '_be',
- /_includes/ => '_include',
- /(must|wont)_(.*_of|nil|empty)/ => '\1_be_\2',
- /must_raises/ => 'must_raise')
-
-class Object
- alias :must_be_close_to :must_be_within_delta
- alias :wont_be_close_to :wont_be_within_delta
-end
-
-module Kernel
- def describe desc, &block
- stack = MiniTest::Spec.describe_stack
- name = desc.to_s.split(/\W+/).map { |s| s.capitalize }.join + "Spec"
- cls = Object.class_eval "class #{name} < #{stack.last}; end; #{name}"
-
- cls.nuke_test_methods!
-
- stack.push cls
- cls.class_eval(&block)
- stack.pop
- end
- private :describe
-end
-
-class MiniTest::Spec < MiniTest::Unit::TestCase
- @@describe_stack = [MiniTest::Spec]
- def self.describe_stack
- @@describe_stack
- end
-
- def self.current
- @@current_spec
- end
-
- def initialize name
- super
- @@current_spec = self
- end
-
- def self.nuke_test_methods!
- self.public_instance_methods.grep(/^test_/).each do |name|
- send :remove_method, name rescue nil
- end
- end
-
- def self.define_inheritable_method name, &block
- super_method = self.superclass.instance_method name
-
- define_method name do
- super_method.bind(self).call if super_method # regular super() warns
- instance_eval(&block)
- end
- end
-
- def self.before(type = :each, &block)
- raise "unsupported before type: #{type}" unless type == :each
- define_inheritable_method :setup, &block
- end
-
- def self.after(type = :each, &block)
- raise "unsupported after type: #{type}" unless type == :each
- define_inheritable_method :teardown, &block
- end
-
- def self.it desc, &block
- define_method "test_#{desc.gsub(/\W+/, '_').downcase}", &block
- end
-end
diff --git a/lib/minitest/unit.rb b/lib/minitest/unit.rb
deleted file mode 100644
index e936f39fc7..0000000000
--- a/lib/minitest/unit.rb
+++ /dev/null
@@ -1,536 +0,0 @@
-############################################################
-# This file is imported from a different project.
-# DO NOT make modifications in this repo.
-# File a patch instead and assign it to Ryan Davis
-############################################################
-
-##
-#
-# Totally minimal drop-in replacement for test-unit
-#
-# TODO: refute -> debunk, prove/rebut, show/deny... lots of possibilities
-
-module MiniTest
- class Assertion < Exception; end
- class Skip < Assertion; end
-
- file = if RUBY_VERSION =~ /^1\.9/ then # bt's expanded, but __FILE__ isn't :(
- File.expand_path __FILE__
- elsif __FILE__ =~ /^[^\.]/ then # assume both relative
- require 'pathname'
- pwd = Pathname.new Dir.pwd
- pn = Pathname.new File.expand_path(__FILE__)
- pn = File.join(".", pn.relative_path_from(pwd)) unless pn.relative?
- pn.to_s
- else # assume both are expanded
- __FILE__
- end
-
- # './lib' in project dir, or '/usr/local/blahblah' if installed
- MINI_DIR = File.dirname(File.dirname(file))
-
- def self.filter_backtrace bt
- return ["No backtrace"] unless bt
-
- new_bt = []
- bt.each do |line|
- break if line.rindex(MINI_DIR, 0)
- new_bt << line
- end
-
- new_bt = bt.reject { |line| line.rindex(MINI_DIR, 0) } if new_bt.empty?
- new_bt = bt.dup if new_bt.empty?
- new_bt
- end
-
- module Assertions
- def mu_pp(obj)
- s = obj.inspect
- s = s.force_encoding(Encoding.default_external) if defined? Encoding
- s
- end
-
- def _assertions= n
- @_assertions = n
- end
-
- def _assertions
- @_assertions ||= 0
- end
-
- def assert test, msg = nil
- msg ||= "Failed assertion, no message given."
- self._assertions += 1
- unless test then
- msg = msg.call if Proc === msg
- raise MiniTest::Assertion, msg
- end
- true
- end
-
- def assert_block msg = nil
- msg = message(msg) { "Expected block to return true value" }
- assert yield, msg
- end
-
- def assert_empty obj, msg = nil
- msg = message(msg) { "Expected #{obj.inspect} to be empty" }
- assert_respond_to obj, :empty?
- assert obj.empty?, msg
- end
-
- def assert_equal exp, act, msg = nil
- msg = message(msg) { "Expected #{mu_pp(exp)}, not #{mu_pp(act)}" }
- assert(exp == act, msg)
- end
-
- def assert_in_delta exp, act, delta = 0.001, msg = nil
- n = (exp - act).abs
- msg = message(msg) { "Expected #{exp} - #{act} (#{n}) to be < #{delta}" }
- assert delta >= n, msg
- end
-
- def assert_in_epsilon a, b, epsilon = 0.001, msg = nil
- assert_in_delta a, b, [a, b].min * epsilon, msg
- end
-
- def assert_includes collection, obj, msg = nil
- msg = message(msg) { "Expected #{mu_pp(collection)} to include #{mu_pp(obj)}" }
- flip = (obj.respond_to? :include?) && ! (collection.respond_to? :include?) # HACK for specs
- obj, collection = collection, obj if flip
- assert_respond_to collection, :include?
- assert collection.include?(obj), msg
- end
-
- def assert_instance_of cls, obj, msg = nil
- msg = message(msg) { "Expected #{mu_pp(obj)} to be an instance of #{cls}, not #{obj.class}" }
- flip = (Module === obj) && ! (Module === cls) # HACK for specs
- obj, cls = cls, obj if flip
- assert obj.instance_of?(cls), msg
- end
-
- def assert_kind_of cls, obj, msg = nil # TODO: merge with instance_of
- msg = message(msg) {
- "Expected #{mu_pp(obj)} to be a kind of #{cls}, not #{obj.class}" }
- flip = (Module === obj) && ! (Module === cls) # HACK for specs
- obj, cls = cls, obj if flip
- assert obj.kind_of?(cls), msg
- end
-
- def assert_match exp, act, msg = nil
- msg = message(msg) { "Expected #{mu_pp(exp)} to match #{mu_pp(act)}" }
- assert_respond_to act, :"=~"
- exp = /#{Regexp.escape(exp)}/ if String === exp && String === act
- assert exp =~ act, msg
- end
-
- def assert_nil obj, msg = nil
- msg = message(msg) { "Expected #{mu_pp(obj)} to be nil" }
- assert obj.nil?, msg
- end
-
- def assert_operator o1, op, o2, msg = nil
- msg = message(msg) { "Expected #{mu_pp(o1)} to be #{op} #{mu_pp(o2)}" }
- assert o1.__send__(op, o2), msg
- end
-
- def assert_raises *exp
- msg = String === exp.last ? exp.pop : nil
- should_raise = false
- begin
- yield
- should_raise = true
- rescue Exception => e
- assert(exp.any? { |ex|
- ex.instance_of?(Module) ? e.kind_of?(ex) : ex == e.class
- }, exception_details(e, "#{mu_pp(exp)} exception expected, not"))
-
- return e
- end
-
- exp = exp.first if exp.size == 1
- flunk "#{mu_pp(exp)} expected but nothing was raised." if should_raise
- end
-
- def assert_respond_to obj, meth, msg = nil
- msg = message(msg) {
- "Expected #{mu_pp(obj)} (#{obj.class}) to respond to ##{meth}"
- }
- flip = (Symbol === obj) && ! (Symbol === meth) # HACK for specs
- obj, meth = meth, obj if flip
- assert obj.respond_to?(meth), msg
- end
-
- def assert_same exp, act, msg = nil
- msg = message(msg) {
- data = [mu_pp(act), act.object_id, mu_pp(exp), exp.object_id]
- "Expected %s (0x%x) to be the same as %s (0x%x)" % data
- }
- assert exp.equal?(act), msg
- end
-
- def assert_send send_ary, m = nil
- recv, msg, *args = send_ary
- m = message(m) {
- "Expected #{mu_pp(recv)}.#{msg}(*#{mu_pp(args)}) to return true" }
- assert recv.__send__(msg, *args), m
- end
-
- def assert_throws sym, msg = nil
- default = "Expected #{mu_pp(sym)} to have been thrown"
- caught = true
- catch(sym) do
- begin
- yield
- rescue ArgumentError => e # 1.9 exception
- default += ", not #{e.message.split(/ /).last}"
- rescue NameError => e # 1.8 exception
- default += ", not #{e.name.inspect}"
- end
- caught = false
- end
-
- assert caught, message(msg) { default }
- end
-
- def capture_io
- require 'stringio'
-
- orig_stdout, orig_stderr = $stdout, $stderr
- captured_stdout, captured_stderr = StringIO.new, StringIO.new
- $stdout, $stderr = captured_stdout, captured_stderr
-
- yield
-
- return captured_stdout.string, captured_stderr.string
- ensure
- $stdout = orig_stdout
- $stderr = orig_stderr
- end
-
- def exception_details e, msg
- "#{msg}\nClass: <#{e.class}>\nMessage: <#{e.message.inspect}>\n---Backtrace---\n#{MiniTest::filter_backtrace(e.backtrace).join("\n")}\n---------------"
- end
-
- def flunk msg = nil
- msg ||= "Epic Fail!"
- assert false, msg
- end
-
- def message msg = nil, &default
- proc {
- if msg then
- msg = msg.to_s unless String === msg
- msg += '.' unless msg.empty?
- msg += "\n#{default.call}."
- msg.strip
- else
- "#{default.call}."
- end
- }
- end
-
- # used for counting assertions
- def pass msg = nil
- assert true
- end
-
- def refute test, msg = nil
- msg ||= "Failed refutation, no message given"
- not assert(! test, msg)
- end
-
- def refute_empty obj, msg = nil
- msg = message(msg) { "Expected #{obj.inspect} to not be empty" }
- assert_respond_to obj, :empty?
- refute obj.empty?, msg
- end
-
- def refute_equal exp, act, msg = nil
- msg = message(msg) { "Expected #{mu_pp(act)} to not be equal to #{mu_pp(exp)}" }
- refute exp == act, msg
- end
-
- def refute_in_delta exp, act, delta = 0.001, msg = nil
- n = (exp - act).abs
- msg = message(msg) { "Expected #{exp} - #{act} (#{n}) to not be < #{delta}" }
- refute delta > n, msg
- end
-
- def refute_in_epsilon a, b, epsilon = 0.001, msg = nil
- refute_in_delta a, b, a * epsilon, msg
- end
-
- def refute_includes collection, obj, msg = nil
- msg = message(msg) { "Expected #{mu_pp(collection)} to not include #{mu_pp(obj)}" }
- flip = (obj.respond_to? :include?) && ! (collection.respond_to? :include?) # HACK for specs
- obj, collection = collection, obj if flip
- assert_respond_to collection, :include?
- refute collection.include?(obj), msg
- end
-
- def refute_instance_of cls, obj, msg = nil
- msg = message(msg) { "Expected #{mu_pp(obj)} to not be an instance of #{cls}" }
- flip = (Module === obj) && ! (Module === cls) # HACK for specs
- obj, cls = cls, obj if flip
- refute obj.instance_of?(cls), msg
- end
-
- def refute_kind_of cls, obj, msg = nil # TODO: merge with instance_of
- msg = message(msg) { "Expected #{mu_pp(obj)} to not be a kind of #{cls}" }
- flip = (Module === obj) && ! (Module === cls) # HACK for specs
- obj, cls = cls, obj if flip
- refute obj.kind_of?(cls), msg
- end
-
- def refute_match exp, act, msg = nil
- msg = message(msg) { "Expected #{mu_pp(exp)} to not match #{mu_pp(act)}" }
- assert_respond_to act, :"=~"
- exp = /#{Regexp.escape(exp)}/ if String === exp && String === act
- refute exp =~ act, msg
- end
-
- def refute_nil obj, msg = nil
- msg = message(msg) { "Expected #{mu_pp(obj)} to not be nil" }
- refute obj.nil?, msg
- end
-
- def refute_operator o1, op, o2, msg = nil
- msg = message(msg) { "Expected #{mu_pp(o1)} to not be #{op} #{mu_pp(o2)}" }
- refute o1.__send__(op, o2), msg
- end
-
- def refute_respond_to obj, meth, msg = nil
- msg = message(msg) { "Expected #{mu_pp(obj)} to not respond to #{meth}" }
- flip = (Symbol === obj) && ! (Symbol === meth) # HACK for specs
- obj, meth = meth, obj if flip
- refute obj.respond_to?(meth), msg
- end
-
- def refute_same exp, act, msg = nil
- msg = message(msg) { "Expected #{mu_pp(act)} to not be the same as #{mu_pp(exp)}" }
- refute exp.equal?(act), msg
- end
-
- def skip msg = nil, bt = caller
- msg ||= "Skipped, no message given"
- raise MiniTest::Skip, msg, bt
- end
- end
-
- class Unit
- VERSION = "1.4.2"
-
- attr_accessor :report, :failures, :errors, :skips
- attr_accessor :test_count, :assertion_count
- attr_accessor :start_time
-
- @@installed_at_exit ||= false
- @@out = $stdout
-
- def self.autorun
- at_exit {
- next if $! # don't run if there was an exception
- exit_code = MiniTest::Unit.new.run(ARGV)
- exit false if exit_code && exit_code != 0
- } unless @@installed_at_exit
- @@installed_at_exit = true
- end
-
- def self.output= stream
- @@out = stream
- end
-
- def location e
- last_before_assertion = ""
- e.backtrace.reverse_each do |s|
- break if s =~ /in .(assert|refute|flunk|pass|fail|raise|must|wont)/
- last_before_assertion = s
- end
- last_before_assertion.sub(/:in .*$/, '')
- end
-
- def puke klass, meth, e
- e = case e
- when MiniTest::Skip then
- @skips += 1
- "Skipped:\n#{meth}(#{klass}) [#{location e}]:\n#{e.message}\n"
- when MiniTest::Assertion then
- @failures += 1
- "Failure:\n#{meth}(#{klass}) [#{location e}]:\n#{e.message}\n"
- else
- @errors += 1
- bt = MiniTest::filter_backtrace(e.backtrace).join("\n ")
- "Error:\n#{meth}(#{klass}):\n#{e.class}: #{e.message}\n #{bt}\n"
- end
- @report << e
- e[0, 1]
- end
-
- def initialize
- @report = []
- @errors = @failures = @skips = 0
- @verbose = false
- end
-
- ##
- # Top level driver, controls all output and filtering.
-
- def run args = []
- @verbose = args.delete('-v')
-
- filter = if args.first =~ /^(-n|--name)$/ then
- args.shift
- arg = args.shift
- arg =~ /\/(.*)\// ? Regexp.new($1) : arg
- else
- /./ # anything - ^test_ already filtered by #tests
- end
-
- @@out.puts "Loaded suite #{$0.sub(/\.rb$/, '')}\nStarted"
-
- start = Time.now
- run_test_suites filter
-
- @@out.puts
- @@out.puts "Finished in #{'%.6f' % (Time.now - start)} seconds."
-
- @report.each_with_index do |msg, i|
- @@out.puts "\n%3d) %s" % [i + 1, msg]
- end
-
- @@out.puts
-
- status
-
- return failures + errors if @test_count > 0 # or return nil...
- rescue Interrupt
- abort 'Interrupted'
- end
-
- def status io = @@out
- format = "%d tests, %d assertions, %d failures, %d errors, %d skips"
- io.puts format % [test_count, assertion_count, failures, errors, skips]
- end
-
- def run_test_suites filter = /./
- @test_count, @assertion_count = 0, 0
- old_sync, @@out.sync = @@out.sync, true if @@out.respond_to? :sync=
- TestCase.test_suites.each do |suite|
- suite.test_methods.grep(filter).each do |test|
- inst = suite.new test
- inst._assertions = 0
- @@out.print "#{suite}##{test}: " if @verbose
-
- @start_time = Time.now
- result = inst.run(self)
-
- @@out.print "%.2f s: " % (Time.now - @start_time) if @verbose
- @@out.print result
- @@out.puts if @verbose
- @test_count += 1
- @assertion_count += inst._assertions
- end
- end
- @@out.sync = old_sync if @@out.respond_to? :sync=
- [@test_count, @assertion_count]
- end
-
- class TestCase
- attr_reader :__name__
-
- PASSTHROUGH_EXCEPTIONS = [NoMemoryError, SignalException, Interrupt,
- SystemExit]
-
- SUPPORTS_INFO_SIGNAL = Signal.list['INFO']
-
- def run runner
- trap 'INFO' do
- warn '%s#%s %.2fs' % [self.class, self.__name__,
- (Time.now - runner.start_time)]
- runner.status $stderr
- end if SUPPORTS_INFO_SIGNAL
-
- result = '.'
- begin
- @passed = nil
- self.setup
- self.__send__ self.__name__
- @passed = true
- rescue *PASSTHROUGH_EXCEPTIONS
- raise
- rescue Exception => e
- @passed = false
- result = runner.puke(self.class, self.__name__, e)
- ensure
- begin
- self.teardown
- rescue *PASSTHROUGH_EXCEPTIONS
- raise
- rescue Exception => e
- result = runner.puke(self.class, self.__name__, e)
- end
- trap 'INFO', 'DEFAULT' if SUPPORTS_INFO_SIGNAL
- end
- result
- end
-
- def initialize name
- @__name__ = name
- @passed = nil
- end
-
- def self.reset
- @@test_suites = {}
- end
-
- reset
-
- def self.inherited klass
- @@test_suites[klass] = true
- end
-
- def self.test_order
- :random
- end
-
- def self.test_suites
- @@test_suites.keys.sort_by { |ts| ts.name }
- end
-
- def self.test_methods
- methods = public_instance_methods(true).grep(/^test/).map { |m|
- m.to_s
- }.sort
-
- if self.test_order == :random then
- max = methods.size
- methods = methods.sort_by { rand(max) }
- end
-
- methods
- end
-
- def setup; end
- def teardown; end
-
- def passed?
- @passed
- end
-
- include MiniTest::Assertions
- end # class TestCase
- end # class Test
-end # module Mini
-
-if $DEBUG then
- # this helps me ferret out porting issues
- module Test; end
- module Test::Unit; end
- class Test::Unit::TestCase
- def self.inherited x
- raise "You're running minitest and test/unit in the same process: #{x}"
- end
- end
-end
-
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 8d6fc96793..a532b5c0a8 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -5,16 +5,15 @@ require 'rbconfig'
require 'fileutils'
require 'shellwords'
-CONFIG = RbConfig::MAKEFILE_CONFIG
+CONFIG = Config::MAKEFILE_CONFIG
ORIG_LIBPATH = ENV['LIB']
CXX_EXT = %w[cc cxx cpp]
-if File::FNM_SYSCASE.zero?
+if /mswin|bccwin|mingw|msdosdjgpp|human|os2/ !~ CONFIG['build_os']
CXX_EXT.concat(%w[C])
end
-SRC_EXT = %w[c m].concat(CXX_EXT)
-$static = nil
-$config_h = '$(arch_hdrdir)/ruby/config.h'
+SRC_EXT = %w[c m] << CXX_EXT
+$static = $config_h = nil
$default_static = $static
unless defined? $configure_args
@@ -60,12 +59,11 @@ $mswin = /mswin/ =~ RUBY_PLATFORM
$bccwin = /bccwin/ =~ RUBY_PLATFORM
$mingw = /mingw/ =~ RUBY_PLATFORM
$cygwin = /cygwin/ =~ RUBY_PLATFORM
+$human = /human/ =~ RUBY_PLATFORM
$netbsd = /netbsd/ =~ RUBY_PLATFORM
$os2 = /os2/ =~ RUBY_PLATFORM
$beos = /beos/ =~ RUBY_PLATFORM
-$haiku = /haiku/ =~ RUBY_PLATFORM
$solaris = /solaris/ =~ RUBY_PLATFORM
-$universal = /universal/ =~ RUBY_PLATFORM
$dest_prefix_pattern = (File::PATH_SEPARATOR == ';' ? /\A([[:alpha:]]:)?/ : /\A/)
# :stopdoc:
@@ -78,15 +76,6 @@ def dir_re(dir)
Regexp.new('\$(?:\('+dir+'\)|\{'+dir+'\})(?:\$(?:\(target_prefix\)|\{target_prefix\}))?')
end
-def relative_from(path, base)
- dir = File.join(path, "")
- if File.expand_path(dir) == File.expand_path(dir, base)
- path
- else
- File.join(base, path)
- end
-end
-
INSTALL_DIRS = [
[dir_re('commondir'), "$(RUBYCOMMONDIR)"],
[dir_re('sitedir'), "$(RUBYCOMMONDIR)"],
@@ -96,11 +85,8 @@ INSTALL_DIRS = [
[dir_re('sitelibdir'), "$(RUBYLIBDIR)"],
[dir_re('vendorlibdir'), "$(RUBYLIBDIR)"],
[dir_re('sitearchdir'), "$(RUBYARCHDIR)"],
- [dir_re('vendorarchdir'), "$(RUBYARCHDIR)"],
- [dir_re('rubyhdrdir'), "$(RUBYHDRDIR)"],
- [dir_re('sitehdrdir'), "$(SITEHDRDIR)"],
- [dir_re('vendorhdrdir'), "$(VENDORHDRDIR)"],
[dir_re('bindir'), "$(BINDIR)"],
+ [dir_re('vendorarchdir'), "$(RUBYARCHDIR)"],
]
def install_dirs(target_prefix = nil)
@@ -110,8 +96,6 @@ def install_dirs(target_prefix = nil)
['RUBYCOMMONDIR', '$(extout)/common'],
['RUBYLIBDIR', '$(RUBYCOMMONDIR)$(target_prefix)'],
['RUBYARCHDIR', '$(extout)/$(arch)$(target_prefix)'],
- ['HDRDIR', '$(extout)/include/ruby$(target_prefix)'],
- ['ARCHHDRDIR', '$(extout)/include/$(arch)/ruby$(target_prefix)'],
['extout', "#$extout"],
['extout_prefix', "#$extout_prefix"],
]
@@ -121,8 +105,6 @@ def install_dirs(target_prefix = nil)
['RUBYCOMMONDIR', '$(rubylibdir)'],
['RUBYLIBDIR', '$(rubylibdir)$(target_prefix)'],
['RUBYARCHDIR', '$(archdir)$(target_prefix)'],
- ['HDRDIR', '$(rubyhdrdir)/ruby$(target_prefix)'],
- ['ARCHHDRDIR', '$(rubyhdrdir)/$(arch)/ruby$(target_prefix)'],
]
elsif $configure_args.has_key?('--vendor')
dirs = [
@@ -130,8 +112,6 @@ def install_dirs(target_prefix = nil)
['RUBYCOMMONDIR', '$(vendordir)$(target_prefix)'],
['RUBYLIBDIR', '$(vendorlibdir)$(target_prefix)'],
['RUBYARCHDIR', '$(vendorarchdir)$(target_prefix)'],
- ['HDRDIR', '$(rubyhdrdir)/ruby$(target_prefix)'],
- ['ARCHHDRDIR', '$(rubyhdrdir)/$(arch)/ruby$(target_prefix)'],
]
else
dirs = [
@@ -139,8 +119,6 @@ def install_dirs(target_prefix = nil)
['RUBYCOMMONDIR', '$(sitedir)$(target_prefix)'],
['RUBYLIBDIR', '$(sitelibdir)$(target_prefix)'],
['RUBYARCHDIR', '$(sitearchdir)$(target_prefix)'],
- ['HDRDIR', '$(rubyhdrdir)/ruby$(target_prefix)'],
- ['ARCHHDRDIR', '$(rubyhdrdir)/$(arch)/ruby$(target_prefix)'],
]
end
dirs << ['target_prefix', (target_prefix ? "/#{target_prefix}" : "")]
@@ -149,31 +127,24 @@ end
def map_dir(dir, map = nil)
map ||= INSTALL_DIRS
- map.inject(dir) {|d, (orig, new)| d.gsub(orig, new)}
+ map.inject(dir) {|dir, (orig, new)| dir.gsub(orig, new)}
end
topdir = File.dirname(libdir = File.dirname(__FILE__))
extdir = File.expand_path("ext", topdir)
-path = File.expand_path($0)
-$extmk = path[0, topdir.size+1] == topdir+"/"
-$extmk &&= %r"\A(?:ext|enc|tool|test(?:/.+))\z" =~ File.dirname(path[topdir.size+1..-1])
-$extmk &&= true
-if not $extmk and File.exist?(($hdrdir = RbConfig::CONFIG["rubyhdrdir"]) + "/ruby/ruby.h")
+$extmk = File.expand_path($0)[0, extdir.size+1] == extdir+"/"
+if not $extmk and File.exist?(($hdrdir = Config::CONFIG["archdir"]) + "/ruby.h")
$topdir = $hdrdir
- $top_srcdir = $hdrdir
- $arch_hdrdir = $hdrdir + "/$(arch)"
-elsif File.exist?(($hdrdir = ($top_srcdir ||= topdir) + "/include") + "/ruby.h")
- $topdir ||= RbConfig::CONFIG["topdir"]
- $arch_hdrdir = "$(extout)/include/$(arch)"
+elsif File.exist?(($hdrdir = ($top_srcdir ||= topdir)) + "/ruby.h") and
+ File.exist?(($topdir ||= Config::CONFIG["topdir"]) + "/config.h")
else
abort "mkmf.rb can't find header files for ruby at #{$hdrdir}/ruby.h"
end
OUTFLAG = CONFIG['OUTFLAG']
-COUTFLAG = CONFIG['COUTFLAG']
CPPOUTFILE = CONFIG['CPPOUTFILE']
-CONFTEST_C = "conftest.c".freeze
+CONFTEST_C = "conftest.c"
class String
# Wraps a string in escaped quotes if it contains whitespace.
@@ -194,13 +165,7 @@ class Array
end
def rm_f(*files)
- opt = ([files.pop] if Hash === files.last)
- FileUtils.rm_f(Dir[*files], *opt)
-end
-
-def rm_rf(*files)
- opt = ([files.pop] if Hash === files.last)
- FileUtils.rm_rf(Dir[*files], *opt)
+ FileUtils.rm_f(Dir[files.join("\0")])
end
# Returns time stamp of the +target+ file if it exists and is newer
@@ -241,13 +206,9 @@ module Logging
@postpone = 0
@quiet = $extmk
- def self::log_open
- @log ||= File::open(@logfile, 'wb')
- @log.sync = true
- end
-
def self::open
- log_open
+ @log ||= File::open(@logfile, 'w')
+ @log.sync = true
$stderr.reopen(@log)
$stdout.reopen(@log)
yield
@@ -257,7 +218,8 @@ module Logging
end
def self::message(*s)
- log_open
+ @log ||= File::open(@logfile, 'w')
+ @log.sync = true
@log.printf(*s)
end
@@ -269,7 +231,7 @@ module Logging
@log = nil
end
end
-
+
def self::postpone
tmplog = "mkmftmp#{@postpone += 1}.log"
open do
@@ -277,9 +239,9 @@ module Logging
@log, @logfile, @orgout, @orgerr = nil, tmplog, log, log
begin
log.print(open {yield})
- ensure
@log.close
File::open(tmplog) {|t| FileUtils.copy_stream(t, log)}
+ ensure
@log, @logfile, @orgout, @orgerr = log, *save
@postpone -= 1
rm_f tmplog
@@ -332,77 +294,45 @@ EOM
end
def create_tmpsrc(src)
- src = "#{COMMON_HEADERS}\n#{src}"
src = yield(src) if block_given?
- src.gsub!(/[ \t]+$/, '')
- src.gsub!(/\A\n+|^\n+$/, '')
- src.sub!(/[^\n]\z/, "\\&\n")
- count = 0
- begin
- open(CONFTEST_C, "wb") do |cfile|
- cfile.print src
- end
- rescue Errno::EACCES
- if (count += 1) < 5
- sleep 0.2
- retry
- end
+ src = src.gsub(/[ \t]+$/, '').gsub(/\A\n+|^\n+$/, '').sub(/[^\n]\z/, "\\&\n")
+ open(CONFTEST_C, "wb") do |cfile|
+ cfile.print src
end
src
end
-def have_devel?
- unless defined? $have_devel
- $have_devel = true
- $have_devel = try_link(MAIN_DOES_NOTHING)
- end
- $have_devel
-end
-
def try_do(src, command, &b)
- unless have_devel?
- raise <<MSG
-The complier failed to generate an executable file.
-You have to install development tools first.
-MSG
- end
src = create_tmpsrc(src, &b)
xsystem(command)
ensure
log_src(src)
- rm_rf 'conftest.dSYM'
end
def link_command(ldflags, opt="", libpath=$DEFLIBPATH|$LIBPATH)
- conf = RbConfig::CONFIG.merge('hdrdir' => $hdrdir.quote,
- 'src' => "#{CONFTEST_C}",
- 'arch_hdrdir' => "#$arch_hdrdir",
- 'top_srcdir' => $top_srcdir.quote,
- 'INCFLAGS' => "#$INCFLAGS",
- 'CPPFLAGS' => "#$CPPFLAGS",
- 'CFLAGS' => "#$CFLAGS",
- 'ARCH_FLAG' => "#$ARCH_FLAG",
- 'LDFLAGS' => "#$LDFLAGS #{ldflags}",
- 'LIBPATH' => libpathflag(libpath),
- 'LOCAL_LIBS' => "#$LOCAL_LIBS #$libs",
- 'LIBS' => "#$LIBRUBYARG_STATIC #{opt} #$LIBS")
- RbConfig::expand(TRY_LINK.dup, conf)
+ conf = Config::CONFIG.merge('hdrdir' => $hdrdir.quote,
+ 'src' => CONFTEST_C,
+ 'INCFLAGS' => $INCFLAGS,
+ 'CPPFLAGS' => $CPPFLAGS,
+ 'CFLAGS' => "#$CFLAGS",
+ 'ARCH_FLAG' => "#$ARCH_FLAG",
+ 'LDFLAGS' => "#$LDFLAGS #{ldflags}",
+ 'LIBPATH' => libpathflag(libpath),
+ 'LOCAL_LIBS' => "#$LOCAL_LIBS #$libs",
+ 'LIBS' => "#$LIBRUBYARG_STATIC #{opt} #$LIBS")
+ Config::expand(TRY_LINK.dup, conf)
end
def cc_command(opt="")
- conf = RbConfig::CONFIG.merge('hdrdir' => $hdrdir.quote, 'srcdir' => $srcdir.quote,
- 'arch_hdrdir' => "#$arch_hdrdir",
- 'top_srcdir' => $top_srcdir.quote)
- RbConfig::expand("$(CC) #$INCFLAGS #$CPPFLAGS #$CFLAGS #$ARCH_FLAG #{opt} -c #{CONFTEST_C}",
- conf)
+ conf = Config::CONFIG.merge('hdrdir' => $hdrdir.quote, 'srcdir' => $srcdir.quote)
+ Config::expand("$(CC) #$INCFLAGS #$CPPFLAGS #$CFLAGS #$ARCH_FLAG #{opt} -c #{CONFTEST_C}",
+ conf)
end
def cpp_command(outfile, opt="")
- conf = RbConfig::CONFIG.merge('hdrdir' => $hdrdir.quote, 'srcdir' => $srcdir.quote,
- 'arch_hdrdir' => "#$arch_hdrdir",
- 'top_srcdir' => $top_srcdir.quote)
- RbConfig::expand("$(CPP) #$INCFLAGS #$CPPFLAGS #$CFLAGS #{opt} #{CONFTEST_C} #{outfile}",
- conf)
+ conf = Config::CONFIG.merge('hdrdir' => $hdrdir.quote, 'srcdir' => $srcdir.quote)
+ Config::expand("$(CPP) #$INCFLAGS #$CPPFLAGS #$CFLAGS #{opt} #{CONFTEST_C} #{outfile}",
+ conf)
end
def libpathflag(libpath=$DEFLIBPATH|$LIBPATH)
@@ -417,20 +347,7 @@ def libpathflag(libpath=$DEFLIBPATH|$LIBPATH)
end
def try_link0(src, opt="", &b)
- cmd = link_command("", opt)
- if $universal
- require 'tmpdir'
- Dir.mktmpdir("mkmf_", oldtmpdir = ENV["TMPDIR"]) do |tmpdir|
- begin
- ENV["TMPDIR"] = tmpdir
- try_do(src, cmd, &b)
- ensure
- ENV["TMPDIR"] = oldtmpdir
- end
- end
- else
- try_do(src, cmd, &b)
- end
+ try_do(src, link_command("", opt), &b)
end
def try_link(src, opt="", &b)
@@ -451,14 +368,10 @@ ensure
rm_f "conftest*"
end
-class Object
- alias_method :try_header, (config_string('try_header') || :try_cpp)
-end
-
def cpp_include(header)
if header
header = [header] unless header.kind_of? Array
- header.map {|h| String === h ? "#include <#{h}>\n" : h}.join
+ header.map {|h| "#include <#{h}>\n"}.join
else
""
end
@@ -491,6 +404,7 @@ end
def try_static_assert(expr, headers = nil, opt = "", &b)
headers = cpp_include(headers)
try_compile(<<SRC, opt, &b)
+#{COMMON_HEADERS}
#{headers}
/*top*/
int conftest_const[(#{expr}) ? 1 : -1];
@@ -529,7 +443,8 @@ def try_constant(const, headers = nil, opt = "", &b)
upper = -upper if neg
return upper
else
- src = %{#{includes}
+ src = %{#{COMMON_HEADERS}
+#{includes}
#include <stdio.h>
/*top*/
int conftest_const = (int)(#{const});
@@ -546,16 +461,16 @@ end
def try_func(func, libs, headers = nil, &b)
headers = cpp_include(headers)
- try_link(<<"SRC", libs, &b) or
+ try_link(<<"SRC", libs, &b) or try_link(<<"SRC", libs, &b)
+#{COMMON_HEADERS}
#{headers}
/*top*/
-#{MAIN_DOES_NOTHING}
+int main() { return 0; }
int t() { void ((*volatile p)()); p = (void ((*)()))#{func}; return 0; }
SRC
- try_link(<<"SRC", libs, &b)
#{headers}
/*top*/
-#{MAIN_DOES_NOTHING}
+int main() { return 0; }
int t() { #{func}(); return 0; }
SRC
end
@@ -563,9 +478,10 @@ end
def try_var(var, headers = nil, &b)
headers = cpp_include(headers)
try_compile(<<"SRC", &b)
+#{COMMON_HEADERS}
#{headers}
/*top*/
-#{MAIN_DOES_NOTHING}
+int main() { return 0; }
int t() { const volatile void *volatile p; p = &(&#{var})[0]; return 0; }
SRC
end
@@ -622,7 +538,7 @@ def install_files(mfile, ifiles, map = nil, srcprefix = nil)
ifiles or return
ifiles.empty? and return
srcprefix ||= '$(srcdir)'
- RbConfig::expand(srcdir = srcprefix.dup)
+ Config::expand(srcdir = srcprefix.dup)
dirs = []
path = Hash.new {|h, i| h[i] = dirs.push([i])[-1]}
ifiles.each do |files, dir, prefix|
@@ -638,8 +554,7 @@ def install_files(mfile, ifiles, map = nil, srcprefix = nil)
len = srcdir.size
end
f = nil
- Dir.glob(files) do |fx|
- f = fx
+ Dir.glob(files) do |f|
f[0..len] = "" if len
case File.basename(f)
when *$NONINSTALLFILES
@@ -682,7 +597,7 @@ end
# Internal use only.
#
def checking_for(m, fmt = nil)
- f = caller[0][/in `(.*)'$/, 1] and f << ": " #` for vim #'
+ f = caller[0][/in `(.*)'$/, 1] and f << ": " #` for vim
m = "checking #{/\Acheck/ =~ f ? '' : 'for '}#{m}... "
message "%s", m
a = r = nil
@@ -826,9 +741,9 @@ end
# For example, if have_header('foo.h') returned true, then the HAVE_FOO_H
# preprocessor macro would be passed to the compiler.
#
-def have_header(header, preheaders = nil, &b)
+def have_header(header, &b)
checking_for header do
- if try_header(cpp_include(preheaders)+cpp_include(header), &b)
+ if try_cpp(cpp_include(header), &b)
$defs.push(format("-DHAVE_%s", header.tr("a-z./\055", "A-Z___")))
true
else
@@ -847,13 +762,13 @@ def find_header(header, *paths)
message = checking_message(header, paths)
header = cpp_include(header)
checking_for message do
- if try_header(header)
+ if try_cpp(header)
true
else
found = false
paths.each do |dir|
opt = "-I#{dir}".quote
- if try_header(header, opt)
+ if try_cpp(header, opt)
$INCFLAGS << " " << opt
found = true
break
@@ -870,23 +785,21 @@ end
# (in addition to the common header files).
#
# If found, a macro is passed as a preprocessor constant to the compiler using
-# the type name and the member name, in uppercase, prepended with 'HAVE_'.
+# the member name, in uppercase, prepended with 'HAVE_ST_'.
#
# For example, if have_struct_member('struct foo', 'bar') returned true, then the
-# HAVE_STRUCT_FOO_BAR preprocessor macro would be passed to the compiler.
-#
-# HAVE_ST_BAR is also defined for backward compatibility.
-#
+# HAVE_ST_BAR preprocessor macro would be passed to the compiler.
+#
def have_struct_member(type, member, headers = nil, &b)
checking_for checking_message("#{type}.#{member}", headers) do
if try_compile(<<"SRC", &b)
+#{COMMON_HEADERS}
#{cpp_include(headers)}
/*top*/
-#{MAIN_DOES_NOTHING}
+int main() { return 0; }
int s = (char *)&((#{type}*)0)->#{member} - (char *)0;
SRC
- $defs.push(format("-DHAVE_%s_%s", type.tr_cpp, member.tr_cpp))
- $defs.push(format("-DHAVE_ST_%s", member.tr_cpp)) # backward compatibility
+ $defs.push(format("-DHAVE_ST_%s", member.tr_cpp))
true
else
false
@@ -896,6 +809,7 @@ end
def try_type(type, headers = nil, opt = "", &b)
if try_compile(<<"SRC", opt, &b)
+#{COMMON_HEADERS}
#{cpp_include(headers)}
/*top*/
typedef #{type} conftest_type;
@@ -950,6 +864,7 @@ end
def try_const(const, headers = nil, opt = "", &b)
const, type = *const
if try_compile(<<"SRC", opt, &b)
+#{COMMON_HEADERS}
#{cpp_include(headers)}
/*top*/
typedef #{type || 'int'} conftest_type;
@@ -994,27 +909,15 @@ end
# For example, if check_sizeof('mystruct') returned 12, then the
# SIZEOF_MYSTRUCT=12 preprocessor macro would be passed to the compiler.
#
-def check_sizeof(type, headers = nil, opts = "", &b)
- typename, member = type.split('.', 2)
- prelude = cpp_include(headers).split(/$/)
- prelude << "typedef #{typename} rbcv_typedef_;\n"
- prelude << "static rbcv_typedef_ *rbcv_ptr_;\n"
- prelude = [prelude]
- expr = "sizeof((*rbcv_ptr_)#{"." << member if member})"
- fmt = "%s"
+def check_sizeof(type, headers = nil, &b)
+ expr = "sizeof(#{type})"
+ fmt = "%d"
def fmt.%(x)
x ? super : "failed"
end
checking_for checking_message("size of #{type}", headers), fmt do
- if UNIVERSAL_INTS.include?(type)
- type
- elsif size = UNIVERSAL_INTS.find {|t|
- try_static_assert("#{expr} == sizeof(#{t})", prelude, opts, &b)
- }
- $defs.push(format("-DSIZEOF_%s=SIZEOF_%s", type.tr_cpp, size.tr_cpp))
- size
- elsif size = try_constant(expr, prelude, opts, &b)
- $defs.push(format("-DSIZEOF_%s=%s", type.tr_cpp, size))
+ if size = try_constant(expr, headers, &b)
+ $defs.push(format("-DSIZEOF_%s=%d", type.tr_cpp, size))
size
end
end
@@ -1026,10 +929,11 @@ end
# pointer.
def scalar_ptr_type?(type, member = nil, headers = nil, &b)
try_compile(<<"SRC", &b) # pointer
+#{COMMON_HEADERS}
#{cpp_include(headers)}
/*top*/
volatile #{type} conftestval;
-#{MAIN_DOES_NOTHING}
+int main() { return 0; }
int t() {return (int)(1-*(conftestval#{member ? ".#{member}" : ""}));}
SRC
end
@@ -1038,82 +942,44 @@ end
# pointer.
def scalar_type?(type, member = nil, headers = nil, &b)
try_compile(<<"SRC", &b) # pointer
+#{COMMON_HEADERS}
#{cpp_include(headers)}
/*top*/
volatile #{type} conftestval;
-#{MAIN_DOES_NOTHING}
+int main() { return 0; }
int t() {return (int)(1-(conftestval#{member ? ".#{member}" : ""}));}
SRC
end
-# Used internally by the what_type? method to check if _typeof_ GCC
-# extension is available.
-def have_typeof?
- return $typeof if defined?($typeof)
- $typeof = %w[__typeof__ typeof].find do |t|
- try_compile(<<SRC)
-int rbcv_foo;
-#{t}(rbcv_foo) rbcv_bar;
-SRC
- end
-end
-
def what_type?(type, member = nil, headers = nil, &b)
m = "#{type}"
- var = val = "*rbcv_var_"
- func = "rbcv_func_(void)"
+ name = type
if member
m << "." << member
- else
- type, member = type.split('.', 2)
- end
- if member
- val = "(#{var}).#{member}"
- end
- prelude = [cpp_include(headers).split(/^/)]
- prelude << ["typedef #{type} rbcv_typedef_;\n",
- "extern rbcv_typedef_ *#{func};\n",
- "static rbcv_typedef_ #{var};\n",
- ]
- type = "rbcv_typedef_"
- fmt = member && !(typeof = have_typeof?) ? "seems %s" : "%s"
- if typeof
- var = "*rbcv_member_"
- func = "rbcv_mem_func_(void)"
- member = nil
- type = "rbcv_mem_typedef_"
- prelude[-1] << "typedef #{typeof}(#{val}) #{type};\n"
- prelude[-1] << "extern #{type} *#{func};\n"
- prelude[-1] << "static #{type} #{var};\n"
- val = var
+ name = "(((#{type} *)0)->#{member})"
end
+ fmt = "seems %s"
def fmt.%(x)
x ? super : "unknown"
end
checking_for checking_message(m, headers), fmt do
- if scalar_ptr_type?(type, member, prelude, &b)
- if try_static_assert("sizeof(*#{var}) == 1", prelude)
- return "string"
+ if scalar_ptr_type?(type, member, headers, &b)
+ if try_static_assert("sizeof(*#{name}) == 1", headers)
+ "string"
end
- ptr = "*"
- elsif scalar_type?(type, member, prelude, &b)
- unless member and !typeof or try_static_assert("(#{type})-1 < 0", prelude)
- unsigned = "unsigned"
- end
- ptr = ""
- else
- next
- end
- type = UNIVERSAL_INTS.find do |t|
- pre = prelude
- unless member
- pre += [["static #{unsigned} #{t} #{ptr}#{var};\n",
- "extern #{unsigned} #{t} #{ptr}*#{func};\n"]]
+ elsif scalar_type?(type, member, headers, &b)
+ if try_static_assert("sizeof(#{name}) > sizeof(long)", headers)
+ "long long"
+ elsif try_static_assert("sizeof(#{name}) > sizeof(int)", headers)
+ "long"
+ elsif try_static_assert("sizeof(#{name}) > sizeof(short)", headers)
+ "int"
+ elsif try_static_assert("sizeof(#{name}) > 1", headers)
+ "short"
+ else
+ "char"
end
- try_static_assert("sizeof(#{ptr}#{val}) == sizeof(#{unsigned} #{t})", pre)
end
- type or next
- [unsigned, type, ptr].join(" ").strip
end
end
@@ -1160,14 +1026,9 @@ end
# :stopdoc:
-def arg_config(config, default=nil, &block)
- $arg_config << [config, default]
- defaults = []
- if default
- defaults << default
- elsif !block
- defaults << nil
- end
+def arg_config(config, *defaults, &block)
+ $arg_config << [config, *defaults]
+ defaults << nil if !block and defaults.empty?
$configure_args.fetch(config.tr('_', '-'), *defaults, &block)
end
@@ -1185,15 +1046,15 @@ end
# $defs.push("-DOSSL_DEBUG") unless $defs.include? "-DOSSL_DEBUG"
# end
#
-def with_config(config, default=nil)
+def with_config(config, *defaults)
config = config.sub(/^--with[-_]/, '')
val = arg_config("--with-"+config) do
if arg_config("--without-"+config)
false
elsif block_given?
- yield(config, default)
+ yield(config, *defaults)
else
- break default
+ break *defaults
end
end
case val
@@ -1218,15 +1079,15 @@ end
# $defs.push("-DOSSL_DEBUG") unless $defs.include? "-DOSSL_DEBUG"
# end
#
-def enable_config(config, default=nil)
+def enable_config(config, *defaults)
if arg_config("--enable-"+config)
true
elsif arg_config("--disable-"+config)
false
elsif block_given?
- yield(config, default)
+ yield(config, *defaults)
else
- return default
+ return *defaults
end
end
@@ -1236,7 +1097,7 @@ end
# 'extconf.h'.
#
# For example:
-#
+#
# # extconf.rb
# require 'mkmf'
# have_func('realpath')
@@ -1302,11 +1163,11 @@ def dir_config(target, idefault=nil, ldefault=nil)
idirs = idir ? Array === idir ? idir : idir.split(File::PATH_SEPARATOR) : []
if defaults
- idirs.concat(defaults.collect {|d| d + "/include"})
+ idirs.concat(defaults.collect {|dir| dir + "/include"})
idir = ([idir] + idirs).compact.join(File::PATH_SEPARATOR)
end
unless idirs.empty?
- idirs.collect! {|d| "-I" + d}
+ idirs.collect! {|dir| "-I" + dir}
idirs -= Shellwords.shellwords($CPPFLAGS)
unless idirs.empty?
$CPPFLAGS = (idirs.quote << $CPPFLAGS).join(" ")
@@ -1315,7 +1176,7 @@ def dir_config(target, idefault=nil, ldefault=nil)
ldirs = ldir ? Array === ldir ? ldir : ldir.split(File::PATH_SEPARATOR) : []
if defaults
- ldirs.concat(defaults.collect {|d| d + "/lib"})
+ ldirs.concat(defaults.collect {|dir| dir + "/lib"})
ldir = ([ldir] + ldirs).compact.join(File::PATH_SEPARATOR)
end
$LIBPATH = ldirs | $LIBPATH
@@ -1331,7 +1192,7 @@ def pkg_config(pkg)
if pkgconfig = with_config("#{pkg}-config") and find_executable0(pkgconfig)
# iff package specific config command is given
get = proc {|opt| `#{pkgconfig} --#{opt}`.chomp}
- elsif ($PKGCONFIG ||=
+ elsif ($PKGCONFIG ||=
(pkgconfig = with_config("pkg-config", ("pkg-config" unless CROSS_COMPILING))) &&
find_executable0(pkgconfig) && pkgconfig) and
system("#{$PKGCONFIG} --exists #{pkg}")
@@ -1372,54 +1233,35 @@ def winsep(s)
s.tr('/', '\\')
end
-# Converts native path to format acceptable in Makefile
-#
-# Internal use only.
-#
-if !CROSS_COMPILING
- case CONFIG['build_os']
- when 'mingw32'
- def mkintpath(path)
- # mingw uses make from msys and it needs special care
- # converts from C:\some\path to /C/some/path
- path = path.dup
- path.tr!('\\', '/')
- path.sub!(/\A([A-Za-z]):(?=\/)/, '/\1')
- path
- end
- end
-end
-unless defined?(mkintpath)
- def mkintpath(path)
- path
- end
-end
-
def configuration(srcdir)
mk = []
- vpath = $VPATH.dup
+ vpath = %w[$(srcdir) $(topdir) $(hdrdir)]
if !CROSS_COMPILING
case CONFIG['build_os']
when 'cygwin'
if CONFIG['target_os'] != 'cygwin'
- vpath = vpath.map {|p| p.sub(/.*/, '$(shell cygpath -u \&)')}
+ vpath.each {|p| p.sub!(/.*/, '$(shell cygpath -u \&)')}
end
+ when 'msdosdjgpp', 'mingw32'
+ CONFIG['PATH_SEPARATOR'] = ';'
end
end
- CONFIG["hdrdir"] ||= $hdrdir
mk << %{
SHELL = /bin/sh
#### Start of system configuration section. ####
-#{"top_srcdir = " + $top_srcdir.sub(%r"\A#{Regexp.quote($topdir)}/", "$(topdir)/") if $extmk}
-srcdir = #{srcdir.gsub(/\$\((srcdir)\)|\$\{(srcdir)\}/) {mkintpath(CONFIG[$1||$2])}.quote}
-topdir = #{mkintpath($extmk ? CONFIG["topdir"] : $topdir).quote}
-hdrdir = #{mkintpath(CONFIG["hdrdir"]).quote}
-arch_hdrdir = #{$arch_hdrdir}
+#{
+if $extmk
+ "top_srcdir = " + $top_srcdir.sub(%r"\A#{Regexp.quote($topdir)}/", "$(topdir)/")
+end
+}
+srcdir = #{srcdir.gsub(/\$\((srcdir)\)|\$\{(srcdir)\}/) {CONFIG[$1||$2]}.quote}
+topdir = #{($extmk ? CONFIG["topdir"] : $topdir).quote}
+hdrdir = #{$extmk ? CONFIG["hdrdir"].quote : '$(topdir)'}
VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])}
}
if $extmk
- mk << "RUBYLIB = -\nRUBYOPT = -r$(top_srcdir)/ext/purelib.rb\n"
+ mk << "RUBYLIB = -\nRUBYOPT = -rpurelib.rb\n"
end
if destdir = CONFIG["prefix"][$dest_prefix_pattern, 1]
mk << "\nDESTDIR = #{destdir}\n"
@@ -1430,8 +1272,7 @@ VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])}
end
CONFIG.each do |key, var|
next if /^abs_/ =~ key
- next if /^(?:src|top|hdr)dir$/ =~ key
- next unless /dir$/ =~ key
+ next unless /^(?:src|top|hdr|(.*))dir$/ =~ key and $1
mk << "#{key} = #{with_destdir(var)}\n"
end
if !$extmk and !$configure_args.has_key?('--ruby') and
@@ -1440,23 +1281,15 @@ VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])}
else
sep = ""
end
- possible_command = (proc {|s| s if /top_srcdir/ !~ s} unless $extmk)
- extconf_h = $extconf_h ? "-DRUBY_EXTCONF_H=\\\"$(RUBY_EXTCONF_H)\\\" " : $defs.join(" ") << " "
+ extconf_h = $extconf_h ? "-DRUBY_EXTCONF_H=\\\"$(RUBY_EXTCONF_H)\\\" " : $defs.join(" ")<<" "
mk << %{
CC = #{CONFIG['CC']}
-CXX = #{CONFIG['CXX']}
LIBRUBY = #{CONFIG['LIBRUBY']}
LIBRUBY_A = #{CONFIG['LIBRUBY_A']}
LIBRUBYARG_SHARED = #$LIBRUBYARG_SHARED
LIBRUBYARG_STATIC = #$LIBRUBYARG_STATIC
-OUTFLAG = #{OUTFLAG}
-COUTFLAG = #{COUTFLAG}
RUBY_EXTCONF_H = #{$extconf_h}
-cflags = #{CONFIG['cflags']}
-optflags = #{CONFIG['optflags']}
-debugflags = #{CONFIG['debugflags']}
-warnflags = #{CONFIG['warnflags']}
CFLAGS = #{$static ? '' : CONFIG['CCDLFLAGS']} #$CFLAGS #$ARCH_FLAG
INCFLAGS = -I. #$INCFLAGS
DEFS = #{CONFIG['DEFS']}
@@ -1467,30 +1300,26 @@ dldflags = #{$DLDFLAGS}
archflag = #{$ARCH_FLAG}
DLDFLAGS = $(ldflags) $(dldflags) $(archflag)
LDSHARED = #{CONFIG['LDSHARED']}
-LDSHAREDXX = #{config_string('LDSHAREDXX') || '$(LDSHARED)'}
AR = #{CONFIG['AR']}
EXEEXT = #{CONFIG['EXEEXT']}
-RUBY_BASE_NAME = #{CONFIG['RUBY_BASE_NAME']}
RUBY_INSTALL_NAME = #{CONFIG['RUBY_INSTALL_NAME']}
RUBY_SO_NAME = #{CONFIG['RUBY_SO_NAME']}
arch = #{CONFIG['arch']}
sitearch = #{CONFIG['sitearch']}
-ruby_version = #{RbConfig::CONFIG['ruby_version']}
+ruby_version = #{Config::CONFIG['ruby_version']}
ruby = #{$ruby}
RUBY = $(ruby#{sep})
-RM = #{config_string('RM', &possible_command) || '$(RUBY) -run -e rm -- -f'}
-RM_RF = #{'$(RUBY) -run -e rm -- -rf'}
-RMDIRS = #{config_string('RMDIRS', &possible_command) || '$(RUBY) -run -e rmdir -- -p'}
-MAKEDIRS = #{config_string('MAKEDIRS', &possible_command) || '@$(RUBY) -run -e mkdir -- -p'}
-INSTALL = #{config_string('INSTALL', &possible_command) || '@$(RUBY) -run -e install -- -vp'}
+RM = #{config_string('RM') || '$(RUBY) -run -e rm -- -f'}
+MAKEDIRS = #{config_string('MAKEDIRS') || '@$(RUBY) -run -e mkdir -- -p'}
+INSTALL = #{config_string('INSTALL') || '@$(RUBY) -run -e install -- -vp'}
INSTALL_PROG = #{config_string('INSTALL_PROG') || '$(INSTALL) -m 0755'}
INSTALL_DATA = #{config_string('INSTALL_DATA') || '$(INSTALL) -m 0644'}
-COPY = #{config_string('CP', &possible_command) || '@$(RUBY) -run -e cp -- -v'}
+COPY = #{config_string('CP') || '@$(RUBY) -run -e cp -- -v'}
#### End of system configuration section. ####
-preload = #{defined?($preload) && $preload ? $preload.join(' ') : ''}
+preload = #{$preload ? $preload.join(' ') : ''}
}
if $nmake == ?b
mk.each do |x|
@@ -1503,7 +1332,6 @@ preload = #{defined?($preload) && $preload ? $preload.join(' ') : ''}
end
mk
end
-# :startdoc:
def dummy_makefile(srcdir)
configuration(srcdir) << <<RULES << CLEANINGS
@@ -1511,67 +1339,10 @@ CLEANFILES = #{$cleanfiles.join(' ')}
DISTCLEANFILES = #{$distcleanfiles.join(' ')}
all install static install-so install-rb: Makefile
-.PHONY: all install static install-so install-rb
-.PHONY: clean clean-so clean-rb
RULES
end
-
-def depend_rules(depend)
- suffixes = []
- depout = []
- cont = implicit = nil
- impconv = proc do
- COMPILE_RULES.each {|rule| depout << (rule % implicit[0]) << implicit[1]}
- implicit = nil
- end
- ruleconv = proc do |line|
- if implicit
- if /\A\t/ =~ line
- implicit[1] << line
- next
- else
- impconv[]
- end
- end
- if m = /\A\.(\w+)\.(\w+)(?:\s*:)/.match(line)
- suffixes << m[1] << m[2]
- implicit = [[m[1], m[2]], [m.post_match]]
- next
- elsif RULE_SUBST and /\A(?!\s*\w+\s*=)[$\w][^#]*:/ =~ line
- line.gsub!(%r"(\s)(?!\.)([^$(){}+=:\s\/\\,]+)(?=\s|\z)") {$1 + RULE_SUBST % $2}
- end
- depout << line
- end
- depend.each_line do |line|
- line.gsub!(/\.o\b/, ".#{$OBJEXT}")
- line.gsub!(/\$\((?:hdr|top)dir\)\/config.h/, $config_h)
- line.gsub!(%r"\$\(hdrdir\)/(?!ruby(?![^:;/\s]))(?=[-\w]+\.h)", '\&ruby/')
- if $nmake && /\A\s*\$\(RM|COPY\)/ =~ line
- line.gsub!(%r"[-\w\./]{2,}"){$&.tr("/", "\\")}
- line.gsub!(/(\$\((?!RM|COPY)[^:)]+)(?=\))/, '\1:/=\\')
- end
- if /(?:^|[^\\])(?:\\\\)*\\$/ =~ line
- (cont ||= []) << line
- next
- elsif cont
- line = (cont << line).join
- cont = nil
- end
- ruleconv.call(line)
- end
- if cont
- ruleconv.call(cont.join)
- elsif implicit
- impconv.call
- end
- unless suffixes.empty?
- depout.unshift(".SUFFIXES: ." + suffixes.uniq.join(" .") + "\n\n")
- end
- depout.unshift("$(OBJS): $(RUBY_EXTCONF_H)\n\n") if $extconf_h
- depout.flatten!
- depout
-end
+# :startdoc:
# Generates the Makefile for your extension, passing along any options and
# preprocessor constants that you may have generated through other methods.
@@ -1597,7 +1368,7 @@ end
# Makefile.
#
# Setting the +target_prefix+ will, in turn, install the generated binary in
-# a directory under your RbConfig::CONFIG['sitearchdir'] that mimics your local
+# a directory under your Config::CONFIG['sitearchdir'] that mimics your local
# filesystem when you run 'make install'.
#
# For example, given the following file tree:
@@ -1645,59 +1416,49 @@ def create_makefile(target, srcprefix = nil)
end
srcprefix ||= '$(srcdir)'
- RbConfig::expand(srcdir = srcprefix.dup)
+ Config::expand(srcdir = srcprefix.dup)
- ext = ".#{$OBJEXT}"
if not $objs
- srcs = $srcs || Dir[File.join(srcdir, "*.{#{SRC_EXT.join(%q{,})}}")]
- objs = srcs.inject(Hash.new {[]}) {|h, f| h[File.basename(f, ".*") << ext] <<= f; h}
- $objs = objs.keys
- unless objs.delete_if {|b, f| f.size == 1}.empty?
- dups = objs.sort.map {|b, f|
- "#{b[/.*\./]}{#{f.collect {|n| n[/([^.]+)\z/]}.join(',')}}"
- }
- abort "source files duplication - #{dups.join(", ")}"
+ $objs = []
+ srcs = Dir[File.join(srcdir, "*.{#{SRC_EXT.join(%q{,})}}")]
+ for f in srcs
+ obj = File.basename(f, ".*") << ".o"
+ $objs.push(obj) unless $objs.index(obj)
end
- else
- $objs.collect! {|o| File.basename(o, ".*") << ext} unless $OBJEXT == "o"
- srcs = $srcs || $objs.collect {|o| o.chomp(ext) << ".c"}
+ elsif !(srcs = $srcs)
+ srcs = $objs.collect {|obj| obj.sub(/\.o\z/, '.c')}
end
$srcs = srcs
+ for i in $objs
+ i.sub!(/\.o\z/, ".#{$OBJEXT}")
+ end
+ $objs = $objs.join(" ")
- target = nil if $objs.empty?
+ target = nil if $objs == ""
if target and EXPORT_PREFIX
if File.exist?(File.join(srcdir, target + '.def'))
deffile = "$(srcdir)/$(TARGET).def"
unless EXPORT_PREFIX.empty?
- makedef = %{-pe "$_.sub!(/^(?=\\w)/,'#{EXPORT_PREFIX}') unless 1../^EXPORTS$/i"}
+ makedef = %{-pe "sub!(/^(?=\\w)/,'#{EXPORT_PREFIX}') unless 1../^EXPORTS$/i"}
end
else
makedef = %{-e "puts 'EXPORTS', '#{EXPORT_PREFIX}Init_$(TARGET)'"}
end
if makedef
- $cleanfiles << '$(DEFFILE)'
+ $distcleanfiles << '$(DEFFILE)'
origdef = deffile
deffile = "$(TARGET)-$(arch).def"
end
end
origdef ||= ''
- if $extout and $INSTALLFILES
- $cleanfiles.concat($INSTALLFILES.collect {|files, dir|File.join(dir, files.sub(/\A\.\//, ''))})
- $distcleandirs.concat($INSTALLFILES.collect {|files, dir| dir})
- end
-
- if $extmk and not $extconf_h
- create_header
- end
-
libpath = libpathflag(libpath)
dllib = target ? "$(TARGET).#{CONFIG['DLEXT']}" : ""
staticlib = target ? "$(TARGET).#$LIBEXT" : ""
mfile = open("Makefile", "wb")
- mfile.print(*configuration(srcprefix))
+ mfile.print configuration(srcprefix)
mfile.print "
libpath = #{($DEFLIBPATH|$LIBPATH).join(" ")}
LIBPATH = #{libpath}
@@ -1705,47 +1466,31 @@ DEFFILE = #{deffile}
CLEANFILES = #{$cleanfiles.join(' ')}
DISTCLEANFILES = #{$distcleanfiles.join(' ')}
-DISTCLEANDIRS = #{$distcleandirs.join(' ')}
-extout = #{$extout && $extout.quote}
+extout = #{$extout}
extout_prefix = #{$extout_prefix}
target_prefix = #{target_prefix}
LOCAL_LIBS = #{$LOCAL_LIBS}
LIBS = #{$LIBRUBYARG} #{$libs} #{$LIBS}
SRCS = #{srcs.collect(&File.method(:basename)).join(' ')}
-OBJS = #{$objs.join(" ")}
+OBJS = #{$objs}
TARGET = #{target}
DLLIB = #{dllib}
EXTSTATIC = #{$static || ""}
STATIC_LIB = #{staticlib unless $static.nil?}
#{!$extout && defined?($installed_list) ? "INSTALLED_LIST = #{$installed_list}\n" : ""}
-" #"
- # TODO: fixme
+"
install_dirs.each {|d| mfile.print("%-14s= %s\n" % d) if /^[[:upper:]]/ =~ d[0]}
- n = ($extout ? '$(RUBYARCHDIR)/' : '') + '$(TARGET)'
+ n = ($extout ? '$(RUBYARCHDIR)/' : '') + '$(TARGET).'
mfile.print "
TARGET_SO = #{($extout ? '$(RUBYARCHDIR)/' : '')}$(DLLIB)
-CLEANLIBS = #{n}.#{CONFIG['DLEXT']} #{config_string('cleanlibs') {|t| t.gsub(/\$\*/) {n}}}
-CLEANOBJS = *.#{$OBJEXT} #{config_string('cleanobjs') {|t| t.gsub(/\$\*/, "$(TARGET)#{deffile ? '-$(arch)': ''}")} if target} *.bak
+CLEANLIBS = #{n}#{CONFIG['DLEXT']} #{n}il? #{n}tds #{n}map
+CLEANOBJS = *.#{$OBJEXT} *.#{$LIBEXT} *.s[ol] *.pdb *.exp *.bak
-all: #{$extout ? "install" : target ? "$(DLLIB)" : "Makefile"}
-static: $(STATIC_LIB)#{$extout ? " install-rb" : ""}
-.PHONY: all install static install-so install-rb
-.PHONY: clean clean-so clean-rb
+all: #{$extout ? "install" : target ? "$(DLLIB)" : "Makefile"}
+static: $(STATIC_LIB)#{$extout ? " install-rb" : ""}
"
mfile.print CLEANINGS
- fsep = config_string('BUILD_FILE_SEPARATOR') {|s| s unless s == "/"}
- if fsep
- sep = ":/=#{fsep}"
- fseprepl = proc {|s|
- s = s.gsub("/", fsep)
- s = s.gsub(/(\$\(\w+)(\))/) {$1+sep+$2}
- s = s.gsub(/(\$\{\w+)(\})/) {$1+sep+$2}
- }
- else
- fseprepl = proc {|s| s}
- sep = ""
- end
dirs = []
mfile.print "install: install-so install-rb\n\n"
sodir = (dir = "$(RUBYARCHDIR)").dup
@@ -1754,13 +1499,18 @@ static: $(STATIC_LIB)#{$extout ? " install-rb" : ""}
f = "$(DLLIB)"
dest = "#{dir}/#{f}"
mfile.puts dir, "install-so: #{dest}"
- if $extout
- mfile.print "clean-so::\n"
- mfile.print "\t@-$(RM) #{fseprepl[dest]}\n"
- mfile.print "\t@-$(RMDIRS) #{fseprepl[dir]}\n"
- else
- mfile.print "#{dest}: #{dir} #{f}\n"
- mfile.print "\t$(INSTALL_PROG) #{fseprepl[f]} #{fseprepl[dir]}\n"
+ unless $extout
+ mfile.print "#{dest}: #{f}\n"
+ if (sep = config_string('BUILD_FILE_SEPARATOR'))
+ f.gsub!("/", sep)
+ dir.gsub!("/", sep)
+ sep = ":/="+sep
+ f.gsub!(/(\$\(\w+)(\))/) {$1+sep+$2}
+ f.gsub!(/(\$\{\w+)(\})/) {$1+sep+$2}
+ dir.gsub!(/(\$\(\w+)(\))/) {$1+sep+$2}
+ dir.gsub!(/(\$\{\w+)(\})/) {$1+sep+$2}
+ end
+ mfile.print "\t$(INSTALL_PROG) #{f} #{dir}\n"
if defined?($installed_list)
mfile.print "\t@echo #{dir}/#{File.basename(f)}>>$(INSTALLED_LIST)\n"
end
@@ -1779,32 +1529,28 @@ static: $(STATIC_LIB)#{$extout ? " install-rb" : ""}
dirs << dir
mfile.print "pre-install-rb#{sfx}: #{dir}\n"
end
- for f in files
+ files.each do |f|
dest = "#{dir}/#{File.basename(f)}"
mfile.print("install-rb#{sfx}: #{dest}\n")
mfile.print("#{dest}: #{f} #{dir}\n\t$(#{$extout ? 'COPY' : 'INSTALL_DATA'}) ")
- mfile.print("#{f} $(@D)\n")
+ sep = config_string('BUILD_FILE_SEPARATOR')
+ if sep
+ f = f.gsub("/", sep)
+ sep = ":/="+sep
+ f = f.gsub(/(\$\(\w+)(\))/) {$1+sep+$2}
+ f = f.gsub(/(\$\{\w+)(\})/) {$1+sep+$2}
+ else
+ sep = ""
+ end
+ mfile.print("#{f} $(@D#{sep})\n")
if defined?($installed_list) and !$extout
mfile.print("\t@echo #{dest}>>$(INSTALLED_LIST)\n")
end
- if $extout
- mfile.print("clean-rb#{sfx}::\n")
- mfile.print("\t@-$(RM) #{fseprepl[dest]}\n")
- end
- end
- end
- if $extout
- dirs.uniq!
- unless dirs.empty?
- mfile.print("clean-rb#{sfx}::\n")
- for dir in dirs.sort_by {|d| -d.count('/')}
- mfile.print("\t@-$(RMDIRS) #{fseprepl[dir]}\n")
- end
end
end
end
dirs.unshift(sodir) if target and !dirs.include?(sodir)
- dirs.each {|d| mfile.print "#{d}:\n\t$(MAKEDIRS) $@\n"}
+ dirs.each {|dir| mfile.print "#{dir}:\n\t$(MAKEDIRS) $@\n"}
mfile.print <<-SITEINSTALL
@@ -1816,36 +1562,31 @@ site-install-rb: install-rb
return unless target
- mfile.puts SRC_EXT.collect {|e| ".path.#{e} = $(VPATH)"} if $nmake == ?b
+ mfile.puts SRC_EXT.collect {|ext| ".path.#{ext} = $(VPATH)"} if $nmake == ?b
mfile.print ".SUFFIXES: .#{SRC_EXT.join(' .')} .#{$OBJEXT}\n"
mfile.print "\n"
- CXX_EXT.each do |e|
+ CXX_EXT.each do |ext|
COMPILE_RULES.each do |rule|
- mfile.printf(rule, e, $OBJEXT)
+ mfile.printf(rule, ext, $OBJEXT)
mfile.printf("\n\t%s\n\n", COMPILE_CXX)
end
end
- %w[c].each do |e|
+ %w[c].each do |ext|
COMPILE_RULES.each do |rule|
- mfile.printf(rule, e, $OBJEXT)
+ mfile.printf(rule, ext, $OBJEXT)
mfile.printf("\n\t%s\n\n", COMPILE_C)
end
end
mfile.print "$(RUBYARCHDIR)/" if $extout
- mfile.print "$(DLLIB): "
- mfile.print "$(DEFFILE) " if makedef
- mfile.print "$(OBJS) Makefile\n"
- mfile.print "\t@-$(RM) $(@#{sep})\n"
+ mfile.print "$(DLLIB): ", (makedef ? "$(DEFFILE) " : ""), "$(OBJS)\n"
+ mfile.print "\t@-$(RM) $@\n"
mfile.print "\t@-$(MAKEDIRS) $(@D)\n" if $extout
link_so = LINK_SO.gsub(/^/, "\t")
- if srcs.any?(&%r"\.(?:#{CXX_EXT.join('|')})\z".method(:===))
- link_so = link_so.sub(/\bLDSHARED\b/, '\&XX')
- end
mfile.print link_so, "\n\n"
unless $static.nil?
- mfile.print "$(STATIC_LIB): $(OBJS)\n\t@-$(RM) $(@#{sep})\n\t"
+ mfile.print "$(STATIC_LIB): $(OBJS)\n\t"
mfile.print "$(AR) #{config_string('ARFLAGS') || 'cru '}$@ $(OBJS)"
config_string('RANLIB') do |ranlib|
mfile.print "\n\t@-#{ranlib} $(DLLIB) 2> /dev/null || true"
@@ -1859,14 +1600,63 @@ site-install-rb: install-rb
depend = File.join(srcdir, "depend")
if File.exist?(depend)
- mfile.print("###\n", *depend_rules(File.read(depend)))
+ suffixes = []
+ depout = []
+ open(depend, "r") do |dfile|
+ mfile.printf "###\n"
+ cont = implicit = nil
+ impconv = proc do
+ COMPILE_RULES.each {|rule| depout << (rule % implicit[0]) << implicit[1]}
+ implicit = nil
+ end
+ ruleconv = proc do |line|
+ if implicit
+ if /\A\t/ =~ line
+ implicit[1] << line
+ next
+ else
+ impconv[]
+ end
+ end
+ if m = /\A\.(\w+)\.(\w+)(?:\s*:)/.match(line)
+ suffixes << m[1] << m[2]
+ implicit = [[m[1], m[2]], [m.post_match]]
+ next
+ elsif RULE_SUBST and /\A(?!\s*\w+\s*=)[$\w][^#]*:/ =~ line
+ line.gsub!(%r"(\s)(?!\.)([^$(){}+=:\s\/\\,]+)(?=\s|\z)") {$1 + RULE_SUBST % $2}
+ end
+ depout << line
+ end
+ while line = dfile.gets()
+ line.gsub!(/\.o\b/, ".#{$OBJEXT}")
+ line.gsub!(/\$\((?:hdr|top)dir\)\/config.h/, $config_h) if $config_h
+ if /(?:^|[^\\])(?:\\\\)*\\$/ =~ line
+ (cont ||= []) << line
+ next
+ elsif cont
+ line = (cont << line).join
+ cont = nil
+ end
+ ruleconv.call(line)
+ end
+ if cont
+ ruleconv.call(cont.join)
+ elsif implicit
+ impconv.call
+ end
+ end
+ unless suffixes.empty?
+ mfile.print ".SUFFIXES: .", suffixes.uniq.join(" ."), "\n\n"
+ end
+ mfile.print "$(OBJS): $(RUBY_EXTCONF_H)\n\n" if $extconf_h
+ mfile.print depout
else
- headers = %w[$(hdrdir)/ruby.h $(hdrdir)/ruby/defines.h]
+ headers = %w[ruby.h defines.h]
if RULE_SUBST
- headers.each {|h| h.sub!(/.*/, &RULE_SUBST.method(:%))}
+ headers.each {|h| h.sub!(/.*/) {|*m| RULE_SUBST % m}}
end
- headers << $config_h
- headers << '$(RUBY_EXTCONF_H)' if $extconf_h
+ headers << $config_h if $config_h
+ headers << "$(RUBY_EXTCONF_H)" if $extconf_h
mfile.print "$(OBJS): ", headers.join(' '), "\n"
end
@@ -1887,9 +1677,7 @@ def init_mkmf(config = CONFIG)
$ARCH_FLAG = with_config("arch_flag", arg_config("ARCH_FLAG", config["ARCH_FLAG"])).dup
$CPPFLAGS = with_config("cppflags", arg_config("CPPFLAGS", config["CPPFLAGS"])).dup
$LDFLAGS = with_config("ldflags", arg_config("LDFLAGS", config["LDFLAGS"])).dup
- $INCFLAGS = "-I$(arch_hdrdir)"
- $INCFLAGS << " -I$(hdrdir)/ruby/backward" unless $extmk
- $INCFLAGS << " -I$(hdrdir) -I$(srcdir)"
+ $INCFLAGS = "-I$(topdir) -I$(hdrdir) -I$(srcdir)"
$DLDFLAGS = with_config("dldflags", arg_config("DLDFLAGS", config["DLDFLAGS"])).dup
$LIBEXT = config['LIBEXT'].dup
$OBJEXT = config["OBJEXT"].dup
@@ -1897,17 +1685,16 @@ def init_mkmf(config = CONFIG)
$LIBRUBYARG = ""
$LIBRUBYARG_STATIC = config['LIBRUBYARG_STATIC']
$LIBRUBYARG_SHARED = config['LIBRUBYARG_SHARED']
- $DEFLIBPATH = [$extmk ? "$(topdir)" : "$(libdir)"]
+ $DEFLIBPATH = $extmk ? ["$(topdir)"] : CROSS_COMPILING ? [] : ["$(libdir)"]
$DEFLIBPATH.unshift(".")
$LIBPATH = []
$INSTALLFILES = []
$NONINSTALLFILES = [/~\z/, /\A#.*#\z/, /\A\.#/, /\.bak\z/i, /\.orig\z/, /\.rej\z/, /\.l[ao]\z/, /\.o\z/]
- $VPATH = %w[$(srcdir) $(arch_hdrdir)/ruby $(hdrdir)/ruby]
$objs = nil
$srcs = nil
$libs = ""
- if $enable_shared or RbConfig.expand(config["LIBRUBY"].dup) != RbConfig.expand(config["LIBRUBY_A"].dup)
+ if $enable_shared or Config.expand(config["LIBRUBY"].dup) != Config.expand(config["LIBRUBY_A"].dup)
$LIBRUBYARG = config['LIBRUBYARG']
end
@@ -1916,7 +1703,6 @@ def init_mkmf(config = CONFIG)
$cleanfiles = config_string('CLEANFILES') {|s| Shellwords.shellwords(s)} || []
$cleanfiles << "mkmf.log"
$distcleanfiles = config_string('DISTCLEANFILES') {|s| Shellwords.shellwords(s)} || []
- $distcleandirs = config_string('DISTCLEANDIRS') {|s| Shellwords.shellwords(s)} || []
$extout ||= nil
$extout_prefix ||= nil
@@ -1959,41 +1745,41 @@ when $bccwin
$nmake = ?b if /Borland/i =~ `#{make} -h`
end
-RbConfig::CONFIG["srcdir"] = CONFIG["srcdir"] =
+Config::CONFIG["srcdir"] = CONFIG["srcdir"] =
$srcdir = arg_config("--srcdir", File.dirname($0))
$configure_args["--topsrcdir"] ||= $srcdir
if $curdir = arg_config("--curdir")
- RbConfig.expand(curdir = $curdir.dup)
+ Config.expand(curdir = $curdir.dup)
else
curdir = $curdir = "."
end
-unless File.expand_path(RbConfig::CONFIG["topdir"]) == File.expand_path(curdir)
+unless File.expand_path(Config::CONFIG["topdir"]) == File.expand_path(curdir)
CONFIG["topdir"] = $curdir
- RbConfig::CONFIG["topdir"] = curdir
+ Config::CONFIG["topdir"] = curdir
end
$configure_args["--topdir"] ||= $curdir
-$ruby = arg_config("--ruby", File.join(RbConfig::CONFIG["bindir"], CONFIG["ruby_install_name"]))
+$ruby = arg_config("--ruby", File.join(Config::CONFIG["bindir"], CONFIG["ruby_install_name"]))
split = Shellwords.method(:shellwords).to_proc
EXPORT_PREFIX = config_string('EXPORT_PREFIX') {|s| s.strip}
-hdr = ['#include "ruby.h"' "\n"]
+hdr = []
config_string('COMMON_MACROS') do |s|
Shellwords.shellwords(s).each do |w|
hdr << "#define " + w.split(/=/, 2).join(" ")
end
end
config_string('COMMON_HEADERS') do |s|
- Shellwords.shellwords(s).each {|w| hdr << "#include <#{w}>"}
+ Shellwords.shellwords(s).each {|s| hdr << "#include <#{s}>"}
end
COMMON_HEADERS = hdr.join("\n")
COMMON_LIBS = config_string('COMMON_LIBS', &split) || []
COMPILE_RULES = config_string('COMPILE_RULES', &split) || %w[.%s.%s:]
RULE_SUBST = config_string('RULE_SUBST')
-COMPILE_C = config_string('COMPILE_C') || '$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $<'
-COMPILE_CXX = config_string('COMPILE_CXX') || '$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<'
+COMPILE_C = config_string('COMPILE_C') || '$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) -c $<'
+COMPILE_CXX = config_string('COMPILE_CXX') || '$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<'
TRY_LINK = config_string('TRY_LINK') ||
"$(CC) #{OUTFLAG}conftest $(INCFLAGS) $(CPPFLAGS) " \
"$(CFLAGS) $(src) $(LIBPATH) $(LDFLAGS) $(ARCH_FLAG) $(LOCAL_LIBS) $(LIBS)"
@@ -2007,27 +1793,17 @@ LINK_SO = config_string('LINK_SO') ||
LIBPATHFLAG = config_string('LIBPATHFLAG') || ' -L"%s"'
RPATHFLAG = config_string('RPATHFLAG') || ''
LIBARG = config_string('LIBARG') || '-l%s'
-MAIN_DOES_NOTHING = config_string('MAIN_DOES_NOTHING') || 'int main() {return 0;}'
-UNIVERSAL_INTS = config_string('UNIVERSAL_INTS') {|s| Shellwords.shellwords(s)} ||
- %w[int short long long\ long]
-sep = config_string('BUILD_FILE_SEPARATOR') {|s| ":/=#{s}" if s != "/"} || ""
+sep = config_string('BUILD_FILE_SEPARATOR') {|sep| ":/=#{sep}" if sep != "/"} || ""
CLEANINGS = "
-clean-rb-default::
-clean-rb::
-clean-so::
-clean: clean-so clean-rb-default clean-rb
-\t\t@-$(RM) $(CLEANLIBS#{sep}) $(CLEANOBJS#{sep}) $(CLEANFILES#{sep})
-
-distclean-rb-default::
-distclean-rb::
-distclean-so::
-distclean: clean distclean-so distclean-rb-default distclean-rb
-\t\t@-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
-\t\t@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES#{sep})
-\t\t@-$(RMDIRS) $(DISTCLEANDIRS#{sep})
-
-realclean: distclean
+clean:
+ @-$(RM) $(CLEANLIBS#{sep}) $(CLEANOBJS#{sep}) $(CLEANFILES#{sep})
+
+distclean: clean
+ @-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
+ @-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES#{sep})
+
+realclean: distclean
"
if not $extmk and /\A(extconf|makefile).rb\z/ =~ File.basename($0)
diff --git a/lib/monitor.rb b/lib/monitor.rb
index b9bf28ded0..4c146c8086 100644
--- a/lib/monitor.rb
+++ b/lib/monitor.rb
@@ -12,11 +12,11 @@ You can freely distribute/modify this library.
This is a simple example.
require 'monitor.rb'
-
+
buf = []
buf.extend(MonitorMixin)
empty_cond = buf.new_cond
-
+
# consumer
Thread.start do
loop do
@@ -26,7 +26,7 @@ This is a simple example.
end
end
end
-
+
# producer
while line = ARGF.gets
buf.synchronize do
@@ -41,19 +41,18 @@ reads a line from ARGF and push it to buf, then call
empty_cond.signal.
=end
-
-require 'thread'
+
#
# Adds monitor functionality to an arbitrary object by mixing the module with
# +include+. For example:
#
-# require 'monitor'
-#
+# require 'monitor.rb'
+#
# buf = []
# buf.extend(MonitorMixin)
# empty_cond = buf.new_cond
-#
+#
# # consumer
# Thread.start do
# loop do
@@ -63,7 +62,7 @@ require 'thread'
# end
# end
# end
-#
+#
# # producer
# while line = ARGF.gets
# buf.synchronize do
@@ -71,7 +70,7 @@ require 'thread'
# empty_cond.signal
# end
# end
-#
+#
# The consumer thread waits for the producer thread to push a line
# to buf while buf.empty?, and the producer thread (main thread)
# reads a line from ARGF and push it to buf, then call
@@ -86,72 +85,123 @@ module MonitorMixin
#
class ConditionVariable
class Timeout < Exception; end
-
+
+ # Create a new timer with the argument timeout, and add the
+ # current thread to the list of waiters. Then the thread is
+ # stopped. It will be resumed when a corresponding #signal
+ # occurs.
def wait(timeout = nil)
- if timeout
- raise NotImplementedError, "timeout is not implemented yet"
- end
- @monitor.__send__(:mon_check_owner)
- count = @monitor.__send__(:mon_exit_for_cond)
+ @monitor.instance_eval {mon_check_owner()}
+ timer = create_timer(timeout)
+
+ Thread.critical = true
+ count = @monitor.instance_eval {mon_exit_for_cond()}
+ @waiters.push(Thread.current)
+
begin
- @cond.wait(@monitor.instance_variable_get("@mon_mutex"))
+ Thread.stop
return true
+ rescue Timeout
+ return false
ensure
- @monitor.__send__(:mon_enter_for_cond, count)
+ Thread.critical = true
+ begin
+ if timer && timer.alive?
+ Thread.kill(timer)
+ end
+ if @waiters.include?(Thread.current) # interrupted?
+ @waiters.delete(Thread.current)
+ end
+ @monitor.instance_eval {mon_enter_for_cond(count)}
+ ensure
+ Thread.critical = false
+ end
end
end
+
+ # call #wait while the supplied block returns +true+.
def wait_while
while yield
wait
end
end
-
+
+ # call #wait until the supplied block returns +true+.
def wait_until
until yield
wait
end
end
-
+
+ # Wake up and run the next waiter
def signal
- @monitor.__send__(:mon_check_owner)
- @cond.signal
+ @monitor.instance_eval {mon_check_owner()}
+ Thread.critical = true
+ t = @waiters.shift
+ t.wakeup if t
+ Thread.critical = false
+ Thread.pass
end
-
+
+ # Wake up all the waiters.
def broadcast
- @monitor.__send__(:mon_check_owner)
- @cond.broadcast
+ @monitor.instance_eval {mon_check_owner()}
+ Thread.critical = true
+ for t in @waiters
+ t.wakeup
+ end
+ @waiters.clear
+ Thread.critical = false
+ Thread.pass
end
-
+
def count_waiters
- raise NotImplementedError
+ return @waiters.length
end
-
+
private
def initialize(monitor)
@monitor = monitor
- @cond = ::ConditionVariable.new
+ @waiters = []
end
- end
+ def create_timer(timeout)
+ if timeout
+ waiter = Thread.current
+ return Thread.start {
+ Thread.pass
+ sleep(timeout)
+ Thread.critical = true
+ waiter.raise(Timeout.new)
+ }
+ else
+ return nil
+ end
+ end
+ end
+
def self.extend_object(obj)
super(obj)
- obj.__send__(:mon_initialize)
+ obj.instance_eval {mon_initialize()}
end
-
+
#
# Attempts to enter exclusive section. Returns +false+ if lock fails.
#
def mon_try_enter
- if @mon_owner != Thread.current
- unless @mon_mutex.try_lock
- return false
- end
+ result = false
+ Thread.critical = true
+ if @mon_owner.nil?
@mon_owner = Thread.current
end
- @mon_count += 1
- return true
+ if @mon_owner == Thread.current
+ @mon_count += 1
+ result = true
+ end
+ Thread.critical = false
+ return result
end
# For backward compatibility
alias try_mon_enter mon_try_enter
@@ -160,23 +210,25 @@ module MonitorMixin
# Enters exclusive section.
#
def mon_enter
- if @mon_owner != Thread.current
- @mon_mutex.lock
- @mon_owner = Thread.current
- end
+ Thread.critical = true
+ mon_acquire(@mon_entering_queue)
@mon_count += 1
+ ensure
+ Thread.critical = false
end
-
+
#
# Leaves exclusive section.
#
def mon_exit
mon_check_owner
- @mon_count -=1
+ Thread.critical = true
+ @mon_count -= 1
if @mon_count == 0
- @mon_owner = nil
- @mon_mutex.unlock
+ mon_release
end
+ Thread.critical = false
+ Thread.pass
end
#
@@ -193,9 +245,12 @@ module MonitorMixin
end
end
alias synchronize mon_synchronize
-
+
#
# FIXME: This isn't documented in Nutshell.
+ #
+ # Create a new condition variable for this monitor.
+ # This facilitates control of the monitor with #signal and #wait.
#
def new_cond
return ConditionVariable.new(self)
@@ -208,31 +263,63 @@ module MonitorMixin
mon_initialize
end
+ # called by initialize method to set defaults for instance variables.
def mon_initialize
@mon_owner = nil
@mon_count = 0
- @mon_mutex = Mutex.new
+ @mon_entering_queue = []
+ @mon_waiting_queue = []
end
+ # Throw a ThreadError exception if the current thread
+ # does't own the monitor
def mon_check_owner
if @mon_owner != Thread.current
raise ThreadError, "current thread not owner"
end
end
- def mon_enter_for_cond(count)
+ def mon_acquire(queue)
+ while @mon_owner && @mon_owner != Thread.current
+ queue.push(Thread.current)
+ Thread.stop
+ Thread.critical = true
+ end
@mon_owner = Thread.current
+ end
+
+ def mon_release
+ @mon_owner = nil
+ t = @mon_waiting_queue.shift
+ t = @mon_entering_queue.shift unless t
+ t.wakeup if t
+ end
+
+ def mon_enter_for_cond(count)
+ mon_acquire(@mon_waiting_queue)
@mon_count = count
end
def mon_exit_for_cond
count = @mon_count
- @mon_owner = nil
@mon_count = 0
return count
+ ensure
+ mon_release
end
end
+# Monitors provide means of mutual exclusion for Thread programming.
+# A critical region is created by means of the synchronize method,
+# which takes a block.
+# The condition variables (created with #new_cond) may be used
+# to control the execution of a monitor with #signal and #wait.
+#
+# the Monitor class wraps MonitorMixin, and provides aliases
+# alias try_enter try_mon_enter
+# alias enter mon_enter
+# alias exit mon_exit
+# to access its methods more concisely.
class Monitor
include MonitorMixin
alias try_enter try_mon_enter
diff --git a/lib/mutex_m.rb b/lib/mutex_m.rb
index 21d828523e..8e0d42bc8d 100644
--- a/lib/mutex_m.rb
+++ b/lib/mutex_m.rb
@@ -1,29 +1,32 @@
-#
-# mutex_m.rb -
+#--
+# mutex_m.rb -
# $Release Version: 3.0$
# $Revision: 1.7 $
+# $Date: 1998/02/27 04:28:57 $
# Original from mutex.rb
# by Keiju ISHITSUKA(keiju@ishitsuka.com)
# modified by matz
# patched by akira yamada
+#++
#
-# --
-# Usage:
-# require "mutex_m.rb"
-# obj = Object.new
-# obj.extend Mutex_m
-# ...
-# extended object can be handled like Mutex
-# or
-# class Foo
-# include Mutex_m
-# ...
-# end
-# obj = Foo.new
-# this obj can be handled like Mutex
+# == Usage
#
-
-require 'thread'
+# Extend an object and use it like a Mutex object:
+#
+# require "mutex_m.rb"
+# obj = Object.new
+# obj.extend Mutex_m
+# # ...
+#
+# Or, include Mutex_m in a class to have its instances behave like a Mutex
+# object:
+#
+# class Foo
+# include Mutex_m
+# # ...
+# end
+#
+# obj = Foo.new
module Mutex_m
def Mutex_m.define_aliases(cl)
@@ -34,13 +37,13 @@ module Mutex_m
alias try_lock mu_try_lock
alias synchronize mu_synchronize
}
- end
+ end
def Mutex_m.append_features(cl)
super
define_aliases(cl) unless cl.instance_of?(Module)
end
-
+
def Mutex_m.extend_object(obj)
super
obj.mu_extended
@@ -56,32 +59,60 @@ module Mutex_m
end
mu_initialize
end
-
- # locking
- def mu_synchronize(&block)
- @_mutex.synchronize(&block)
+
+ # locking
+ def mu_synchronize
+ begin
+ mu_lock
+ yield
+ ensure
+ mu_unlock
+ end
end
-
+
def mu_locked?
- @_mutex.locked?
+ @mu_locked
end
-
+
def mu_try_lock
- @_mutex.try_lock
+ result = false
+ Thread.critical = true
+ unless @mu_locked
+ @mu_locked = true
+ result = true
+ end
+ Thread.critical = false
+ result
end
-
+
def mu_lock
- @_mutex.lock
+ while (Thread.critical = true; @mu_locked)
+ @mu_waiting.push Thread.current
+ Thread.stop
+ end
+ @mu_locked = true
+ Thread.critical = false
+ self
end
-
+
def mu_unlock
- @_mutex.unlock
+ return unless @mu_locked
+ Thread.critical = true
+ wait = @mu_waiting
+ @mu_waiting = []
+ @mu_locked = false
+ Thread.critical = false
+ for w in wait
+ w.run
+ end
+ self
end
-
+
private
-
+
def mu_initialize
- @_mutex = Mutex.new
+ @mu_waiting = []
+ @mu_locked = false;
end
def initialize(*args)
diff --git a/lib/net/.document b/lib/net/.document
deleted file mode 100644
index 6332bb9e7e..0000000000
--- a/lib/net/.document
+++ /dev/null
@@ -1,8 +0,0 @@
-ftp.rb
-http.rb
-https.rb
-imap.rb
-pop.rb
-smtp.rb
-smtps.rb
-telnet.rb
diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb
index 40227b69d8..c3059deea3 100644
--- a/lib/net/ftp.rb
+++ b/lib/net/ftp.rb
@@ -1,11 +1,11 @@
-#
+#
# = net/ftp.rb - FTP Client Library
-#
+#
# Written by Shugo Maeda <shugo@ruby-lang.org>.
#
# Documentation by Gavin Sinclair, sourced from "Programming Ruby" (Hunt/Thomas)
# and "Ruby In a Nutshell" (Matsumoto), used with permission.
-#
+#
# This library is distributed under the terms of the Ruby license.
# You can freely distribute/modify this library.
#
@@ -22,8 +22,8 @@ module Net
# :stopdoc:
class FTPError < StandardError; end
class FTPReplyError < FTPError; end
- class FTPTempError < FTPError; end
- class FTPPermError < FTPError; end
+ class FTPTempError < FTPError; end
+ class FTPPermError < FTPError; end
class FTPProtoError < FTPError; end
# :startdoc:
@@ -34,11 +34,11 @@ module Net
# advantage of Ruby's style and strengths.
#
# == Example
- #
+ #
# require 'net/ftp'
#
# === Example 1
- #
+ #
# ftp = Net::FTP.new('ftp.netlab.co.jp')
# ftp.login
# files = ftp.chdir('pub/lang/ruby/contrib')
@@ -71,15 +71,15 @@ module Net
#
class FTP
include MonitorMixin
-
+
# :stopdoc:
FTP_PORT = 21
CRLF = "\r\n"
DEFAULT_BLOCKSIZE = 4096
# :startdoc:
-
+
# When +true+, transfers are performed in binary mode. Default: +true+.
- attr_reader :binary
+ attr_accessor :binary
# When +true+, the connection is in passive mode. Default: +false+.
attr_accessor :passive
@@ -101,7 +101,7 @@ module Net
# The server's last response.
attr_reader :last_response
-
+
#
# A synonym for <tt>FTP.new</tt>, but with a mandatory host parameter.
#
@@ -120,7 +120,7 @@ module Net
new(host, user, passwd, acct)
end
end
-
+
#
# Creates and returns a new +FTP+ object. If a +host+ is given, a connection
# is made. Additionally, if the +user+ is given, the given user name,
@@ -128,7 +128,7 @@ module Net
#
def initialize(host = nil, user = nil, passwd = nil, acct = nil)
super()
- @binary = false
+ @binary = true
@passive = false
@debug_mode = false
@resume = false
@@ -140,24 +140,6 @@ module Net
end
end
- def binary=(newmode)
- if newmode != @binary
- @binary = newmode
- @binary ? voidcmd("TYPE I") : voidcmd("TYPE A")
- end
- end
-
- def with_binary(newmode)
- oldmode = binary
- self.binary = newmode
- begin
- yield
- ensure
- self.binary = oldmode
- end
- end
- private :with_binary
-
# Obsolete
def return_code
$stderr.puts("warning: Net::FTP#return_code is obsolete and do nothing")
@@ -170,15 +152,15 @@ module Net
end
def open_socket(host, port)
- if defined? SOCKSSocket and ENV["SOCKS_SERVER"]
+ if defined? SOCKSsocket and ENV["SOCKS_SERVER"]
@passive = true
- return SOCKSSocket.open(host, port)
+ return SOCKSsocket.open(host, port)
else
return TCPSocket.open(host, port)
end
end
private :open_socket
-
+
#
# Establishes an FTP connection to host, optionally overriding the default
# port. If the environment variable +SOCKS_SERVER+ is set, sets up the
@@ -215,7 +197,7 @@ module Net
end
end
private :sanitize
-
+
def putline(line)
if @debug_mode
print "put: ", sanitize(line), "\n"
@@ -224,7 +206,7 @@ module Net
@sock.write(line)
end
private :putline
-
+
def getline
line = @sock.readline # if get EOF, raise EOFError
line.sub!(/(\r\n|\n|\r)\z/n, "")
@@ -234,7 +216,7 @@ module Net
return line
end
private :getline
-
+
def getmultiline
line = getline
buff = line
@@ -248,7 +230,7 @@ module Net
return buff << "\n"
end
private :getmultiline
-
+
def getresp
@last_response = getmultiline
@last_response_code = @last_response[0, 3]
@@ -264,7 +246,7 @@ module Net
end
end
private :getresp
-
+
def voidresp
resp = getresp
if resp[0] != ?2
@@ -272,7 +254,7 @@ module Net
end
end
private :voidresp
-
+
#
# Sends a command and returns the response.
#
@@ -282,7 +264,7 @@ module Net
return getresp
end
end
-
+
#
# Sends a command and expect a response beginning with '2'.
#
@@ -292,20 +274,23 @@ module Net
voidresp
end
end
-
+
def sendport(host, port)
af = (@sock.peeraddr)[0]
if af == "AF_INET"
- cmd = "PORT " + (host.split(".") + port.divmod(256)).join(",")
+ hbytes = host.split(".")
+ pbytes = [port / 256, port % 256]
+ bytes = hbytes + pbytes
+ cmd = "PORT " + bytes.join(",")
elsif af == "AF_INET6"
- cmd = sprintf("EPRT |2|%s|%d|", host, port)
+ cmd = "EPRT |2|" + host + "|" + sprintf("%d", port) + "|"
else
raise FTPProtoError, host
end
voidcmd(cmd)
end
private :sendport
-
+
def makeport
sock = TCPServer.open(@sock.addr[3], 0)
port = sock.addr[1]
@@ -314,7 +299,7 @@ module Net
return sock
end
private :makeport
-
+
def makepasv
if @sock.peeraddr[0] == "AF_INET"
host, port = parse227(sendcmd("PASV"))
@@ -325,13 +310,13 @@ module Net
return host, port
end
private :makepasv
-
+
def transfercmd(cmd, rest_offset = nil)
if @passive
host, port = makepasv
conn = open_socket(host, port)
if @resume and rest_offset
- resp = sendcmd("REST " + rest_offset.to_s)
+ resp = sendcmd("REST " + rest_offset.to_s)
if resp[0] != ?3
raise FTPReplyError, resp
end
@@ -345,7 +330,7 @@ module Net
else
sock = makeport
if @resume and rest_offset
- resp = sendcmd("REST " + rest_offset.to_s)
+ resp = sendcmd("REST " + rest_offset.to_s)
if resp[0] != ?3
raise FTPReplyError, resp
end
@@ -362,7 +347,7 @@ module Net
return conn
end
private :transfercmd
-
+
def getaddress
thishost = Socket.gethostname
if not thishost.index(".")
@@ -378,7 +363,7 @@ module Net
return realuser + "@" + thishost
end
private :getaddress
-
+
#
# Logs in to the remote host. The session must have been previously
# connected. If +user+ is the string "anonymous" and the +password+ is
@@ -391,16 +376,14 @@ module Net
if user == "anonymous" and passwd == nil
passwd = getaddress
end
-
+
resp = ""
synchronize do
resp = sendcmd('USER ' + user)
if resp[0] == ?3
- raise FTPReplyError, resp if passwd.nil?
resp = sendcmd('PASS ' + passwd)
end
if resp[0] == ?3
- raise FTPReplyError, resp if acct.nil?
resp = sendcmd('ACCT ' + acct)
end
end
@@ -408,9 +391,8 @@ module Net
raise FTPReplyError, resp
end
@welcome = resp
- self.binary = true
end
-
+
#
# Puts the connection into binary (image) mode, issues the given command,
# and fetches the data returned, passing it to the associated block in
@@ -419,19 +401,18 @@ module Net
#
def retrbinary(cmd, blocksize, rest_offset = nil) # :yield: data
synchronize do
- with_binary(true) do
- conn = transfercmd(cmd, rest_offset)
- loop do
- data = conn.read(blocksize)
- break if data == nil
- yield(data)
- end
- conn.close
- voidresp
- end
+ voidcmd("TYPE I")
+ conn = transfercmd(cmd, rest_offset)
+ loop do
+ data = conn.read(blocksize)
+ break if data == nil
+ yield(data)
+ end
+ conn.close
+ voidresp
end
end
-
+
#
# Puts the connection into ASCII (text) mode, issues the given command, and
# passes the resulting data, one line at a time, to the associated block. If
@@ -440,24 +421,23 @@ module Net
#
def retrlines(cmd) # :yield: line
synchronize do
- with_binary(false) do
- conn = transfercmd(cmd)
- loop do
- line = conn.gets
- break if line == nil
- if line[-2, 2] == CRLF
- line = line[0 .. -3]
- elsif line[-1] == ?\n
- line = line[0 .. -2]
- end
- yield(line)
- end
- conn.close
- voidresp
- end
+ voidcmd("TYPE A")
+ conn = transfercmd(cmd)
+ loop do
+ line = conn.gets
+ break if line == nil
+ if line[-2, 2] == CRLF
+ line = line[0 .. -3]
+ elsif line[-1] == ?\n
+ line = line[0 .. -2]
+ end
+ yield(line)
+ end
+ conn.close
+ voidresp
end
end
-
+
#
# Puts the connection into binary (image) mode, issues the given server-side
# command (such as "STOR myfile"), and sends the contents of the file named
@@ -469,27 +449,19 @@ module Net
file.seek(rest_offset, IO::SEEK_SET)
end
synchronize do
- with_binary(true) do
- conn = transfercmd(cmd, rest_offset)
- loop do
- buf = file.read(blocksize)
- break if buf == nil
- conn.write(buf)
- yield(buf) if block
- end
- conn.close
- voidresp
- end
+ voidcmd("TYPE I")
+ conn = transfercmd(cmd, rest_offset)
+ loop do
+ buf = file.read(blocksize)
+ break if buf == nil
+ conn.write(buf)
+ yield(buf) if block
+ end
+ conn.close
+ voidresp
end
- rescue Errno::EPIPE
- # EPIPE, in this case, means that the data connection was unexpectedly
- # terminated. Rather than just raising EPIPE to the caller, check the
- # response on the control connection. If getresp doesn't raise a more
- # appropriate exception, re-raise the original exception.
- getresp
- raise
end
-
+
#
# Puts the connection into ASCII (text) mode, issues the given server-side
# command (such as "STOR myfile"), and sends the contents of the file
@@ -498,86 +470,61 @@ module Net
#
def storlines(cmd, file, &block) # :yield: line
synchronize do
- with_binary(false) do
- conn = transfercmd(cmd)
- loop do
- buf = file.gets
- break if buf == nil
- if buf[-2, 2] != CRLF
- buf = buf.chomp + CRLF
- end
- conn.write(buf)
- yield(buf) if block
- end
- conn.close
- voidresp
- end
+ voidcmd("TYPE A")
+ conn = transfercmd(cmd)
+ loop do
+ buf = file.gets
+ break if buf == nil
+ if buf[-2, 2] != CRLF
+ buf = buf.chomp + CRLF
+ end
+ conn.write(buf)
+ yield(buf) if block
+ end
+ conn.close
+ voidresp
end
- rescue Errno::EPIPE
- # EPIPE, in this case, means that the data connection was unexpectedly
- # terminated. Rather than just raising EPIPE to the caller, check the
- # response on the control connection. If getresp doesn't raise a more
- # appropriate exception, re-raise the original exception.
- getresp
- raise
end
#
# Retrieves +remotefile+ in binary mode, storing the result in +localfile+.
- # If +localfile+ is nil, returns retrieved data.
# If a block is supplied, it is passed the retrieved data in +blocksize+
# chunks.
#
def getbinaryfile(remotefile, localfile = File.basename(remotefile),
- blocksize = DEFAULT_BLOCKSIZE) # :yield: data
- result = nil
- if localfile
- if @resume
- rest_offset = File.size?(localfile)
- f = open(localfile, "a")
- else
- rest_offset = nil
- f = open(localfile, "w")
- end
- elsif !block_given?
- result = ""
+ blocksize = DEFAULT_BLOCKSIZE, &block) # :yield: data
+ if @resume
+ rest_offset = File.size?(localfile)
+ f = open(localfile, "a")
+ else
+ rest_offset = nil
+ f = open(localfile, "w")
end
begin
- f.binmode if localfile
+ f.binmode
retrbinary("RETR " + remotefile, blocksize, rest_offset) do |data|
- f.write(data) if localfile
- yield(data) if block_given?
- result.concat(data) if result
+ f.write(data)
+ yield(data) if block
end
- return result
ensure
- f.close if localfile
+ f.close
end
end
-
+
#
# Retrieves +remotefile+ in ASCII (text) mode, storing the result in
- # +localfile+.
- # If +localfile+ is nil, returns retrieved data.
- # If a block is supplied, it is passed the retrieved data one
+ # +localfile+. If a block is supplied, it is passed the retrieved data one
# line at a time.
#
- def gettextfile(remotefile, localfile = File.basename(remotefile)) # :yield: line
- result = nil
- if localfile
- f = open(localfile, "w")
- elsif !block_given?
- result = ""
- end
+ def gettextfile(remotefile, localfile = File.basename(remotefile), &block) # :yield: line
+ f = open(localfile, "w")
begin
retrlines("RETR " + remotefile) do |line|
- f.puts(line) if localfile
- yield(line) if block_given?
- result.concat(line + "\n") if result
+ f.puts(line)
+ yield(line) if block
end
- return result
ensure
- f.close if localfile
+ f.close
end
end
@@ -587,13 +534,13 @@ module Net
#
def get(remotefile, localfile = File.basename(remotefile),
blocksize = DEFAULT_BLOCKSIZE, &block) # :yield: data
- if @binary
- getbinaryfile(remotefile, localfile, blocksize, &block)
- else
+ unless @binary
gettextfile(remotefile, localfile, &block)
+ else
+ getbinaryfile(remotefile, localfile, blocksize, &block)
end
end
-
+
#
# Transfers +localfile+ to the server in binary mode, storing the result in
# +remotefile+. If a block is supplied, calls it, passing in the transmitted
@@ -618,7 +565,7 @@ module Net
f.close
end
end
-
+
#
# Transfers +localfile+ to the server in ASCII (text) mode, storing the result
# in +remotefile+. If callback or an associated block is supplied, calls it,
@@ -639,10 +586,10 @@ module Net
#
def put(localfile, remotefile = File.basename(localfile),
blocksize = DEFAULT_BLOCKSIZE, &block)
- if @binary
- putbinaryfile(localfile, remotefile, blocksize, &block)
- else
+ unless @binary
puttextfile(localfile, remotefile, &block)
+ else
+ putbinaryfile(localfile, remotefile, blocksize, &block)
end
end
@@ -653,7 +600,7 @@ module Net
cmd = "ACCT " + account
voidcmd(cmd)
end
-
+
#
# Returns an array of filenames in the remote directory.
#
@@ -668,7 +615,7 @@ module Net
end
return files
end
-
+
#
# Returns an array of file information in the directory (the output is like
# `ls -l`). If a block is given, it iterates through the listing.
@@ -690,7 +637,7 @@ module Net
end
alias ls list
alias dir list
-
+
#
# Renames a file on the server.
#
@@ -701,7 +648,7 @@ module Net
end
voidcmd("RNTO " + toname)
end
-
+
#
# Deletes a file on the server.
#
@@ -715,7 +662,7 @@ module Net
raise FTPReplyError, resp
end
end
-
+
#
# Changes the (remote) directory.
#
@@ -724,31 +671,30 @@ module Net
begin
voidcmd("CDUP")
return
- rescue FTPPermError => e
- if e.message[0, 3] != "500"
- raise e
+ rescue FTPPermError
+ if $![0, 3] != "500"
+ raise FTPPermError, $!
end
end
end
cmd = "CWD " + dirname
voidcmd(cmd)
end
-
+
#
# Returns the size of the given (remote) filename.
#
def size(filename)
- with_binary(true) do
- resp = sendcmd("SIZE " + filename)
- if resp[0, 3] != "213"
- raise FTPReplyError, resp
- end
- return resp[3..-1].strip.to_i
+ voidcmd("TYPE I")
+ resp = sendcmd("SIZE " + filename)
+ if resp[0, 3] != "213"
+ raise FTPReplyError, resp
end
+ return resp[3..-1].strip.to_i
end
-
+
MDTM_REGEXP = /^(\d\d\d\d)(\d\d)(\d\d)(\d\d)(\d\d)(\d\d)/ # :nodoc:
-
+
#
# Returns the last modification time of the (remote) file. If +local+ is
# +true+, it is returned as a local time, otherwise it's a UTC time.
@@ -758,7 +704,7 @@ module Net
ary = str.scan(MDTM_REGEXP)[0].collect {|i| i.to_i}
return local ? Time.local(*ary) : Time.gm(*ary)
end
-
+
#
# Creates a remote directory.
#
@@ -766,14 +712,14 @@ module Net
resp = sendcmd("MKD " + dirname)
return parse257(resp)
end
-
+
#
# Removes a remote directory.
#
def rmdir(dirname)
voidcmd("RMD " + dirname)
end
-
+
#
# Returns the current remote directory.
#
@@ -782,7 +728,7 @@ module Net
return parse257(resp)
end
alias getdir pwd
-
+
#
# Returns system information.
#
@@ -793,7 +739,7 @@ module Net
end
return resp[4 .. -1]
end
-
+
#
# Aborts the previous command (ABOR command).
#
@@ -807,7 +753,7 @@ module Net
end
return resp
end
-
+
#
# Returns the status (STAT command).
#
@@ -817,7 +763,7 @@ module Net
@sock.send(line, Socket::MSG_OOB)
return getresp
end
-
+
#
# Issues the MDTM command. TODO: more info.
#
@@ -827,7 +773,7 @@ module Net
return resp[3 .. -1].strip
end
end
-
+
#
# Issues the HELP command.
#
@@ -838,7 +784,7 @@ module Net
end
sendcmd(cmd)
end
-
+
#
# Exits the FTP session.
#
@@ -860,7 +806,7 @@ module Net
cmd = "SITE " + arg
voidcmd(cmd)
end
-
+
#
# Closes the connection. Further operations are impossible until you open
# a new connection with #connect.
@@ -868,14 +814,14 @@ module Net
def close
@sock.close if @sock and not @sock.closed?
end
-
+
#
# Returns +true+ iff the connection is closed.
#
def closed?
@sock == nil or @sock.closed?
end
-
+
def parse227(resp)
if resp[0, 3] != "227"
raise FTPReplyError, resp
@@ -894,7 +840,7 @@ module Net
return host, port
end
private :parse227
-
+
def parse228(resp)
if resp[0, 3] != "228"
raise FTPReplyError, resp
@@ -922,11 +868,11 @@ module Net
end
host = v6[0, 8].join(":")
port = (numbers[19].to_i << 8) + numbers[20].to_i
- end
+ end
return host, port
end
private :parse228
-
+
def parse229(resp)
if resp[0, 3] != "229"
raise FTPReplyError, resp
@@ -945,7 +891,7 @@ module Net
return host, port
end
private :parse229
-
+
def parse257(resp)
if resp[0, 3] != "257"
raise FTPReplyError, resp
diff --git a/lib/net/http.rb b/lib/net/http.rb
index d4cbedbda1..7dd1f24d4c 100644
--- a/lib/net/http.rb
+++ b/lib/net/http.rb
@@ -1,29 +1,29 @@
#
# = net/http.rb
#
-# Copyright (c) 1999-2007 Yukihiro Matsumoto
-# Copyright (c) 1999-2007 Minero Aoki
+# Copyright (c) 1999-2006 Yukihiro Matsumoto
+# Copyright (c) 1999-2006 Minero Aoki
# Copyright (c) 2001 GOTOU Yuuzou
-#
+#
# Written and maintained by Minero Aoki <aamine@loveruby.net>.
# HTTPS support added by GOTOU Yuuzou <gotoyuzo@notwork.org>.
#
# This file is derived from "http-access.rb".
#
# Documented by Minero Aoki; converted to RDoc by William Webber.
-#
+#
# This program is free software. You can re-distribute and/or
# modify this program under the same terms of ruby itself ---
# Ruby Distribution License or GNU General Public License.
#
-# See Net::HTTP for an overview and examples.
-#
+# See Net::HTTP for an overview and examples.
+#
# NOTE: You can find Japanese version of this document here:
-# http://www.ruby-lang.org/ja/man/html/net_http.html
-#
+# http://www.ruby-lang.org/ja/man/?cmd=view;name=net%2Fhttp.rb
+#
#--
# $Id$
-#++
+#++
require 'net/protocol'
require 'uri'
@@ -36,29 +36,29 @@ module Net #:nodoc:
# :startdoc:
# == What Is This Library?
- #
+ #
# This library provides your program functions to access WWW
# documents via HTTP, Hyper Text Transfer Protocol version 1.1.
- # For details of HTTP, refer to [RFC2616]
+ # For details of HTTP, refer [RFC2616]
# (http://www.ietf.org/rfc/rfc2616.txt).
- #
+ #
# == Examples
- #
+ #
# === Getting Document From WWW Server
- #
+ #
# Example #1: Simple GET+print
- #
+ #
# require 'net/http'
# Net::HTTP.get_print 'www.example.com', '/index.html'
- #
+ #
# Example #2: Simple GET+print by URL
- #
+ #
# require 'net/http'
# require 'uri'
# Net::HTTP.get_print URI.parse('http://www.example.com/index.html')
- #
+ #
# Example #3: More generic GET+print
- #
+ #
# require 'net/http'
# require 'uri'
#
@@ -69,7 +69,7 @@ module Net #:nodoc:
# puts res.body
#
# Example #4: More generic GET+print
- #
+ #
# require 'net/http'
#
# url = URI.parse('http://www.example.com/index.html')
@@ -78,28 +78,27 @@ module Net #:nodoc:
# http.request(req)
# }
# puts res.body
- #
+ #
# === Posting Form Data
- #
+ #
# require 'net/http'
# require 'uri'
#
# #1: Simple POST
# res = Net::HTTP.post_form(URI.parse('http://www.example.com/search.cgi'),
- # {'q' => 'ruby', 'max' => '50'})
+ # {'q'=>'ruby', 'max'=>'50'})
# puts res.body
#
# #2: POST with basic authentication
# res = Net::HTTP.post_form(URI.parse('http://jack:pass@www.example.com/todo.cgi'),
- # {'from' => '2005-01-01',
- # 'to' => '2005-03-31'})
+ # {'from'=>'2005-01-01', 'to'=>'2005-03-31'})
# puts res.body
#
# #3: Detailed control
# url = URI.parse('http://www.example.com/todo.cgi')
# req = Net::HTTP::Post.new(url.path)
# req.basic_auth 'jack', 'pass'
- # req.set_form_data({'from' => '2005-01-01', 'to' => '2005-03-31'}, ';')
+ # req.set_form_data({'from'=>'2005-01-01', 'to'=>'2005-03-31'}, ';')
# res = Net::HTTP.new(url.host, url.port).start {|http| http.request(req) }
# case res
# when Net::HTTPSuccess, Net::HTTPRedirection
@@ -107,20 +106,15 @@ module Net #:nodoc:
# else
# res.error!
# end
- #
- # #4: Multiple values
- # res = Net::HTTP.post_form(URI.parse('http://www.example.com/search.cgi'),
- # {'q' => ['ruby', 'perl'], 'max' => '50'})
- # puts res.body
- #
+ #
# === Accessing via Proxy
- #
+ #
# Net::HTTP.Proxy creates http proxy class. It has same
# methods of Net::HTTP but its instances always connect to
# proxy, instead of given host.
- #
+ #
# require 'net/http'
- #
+ #
# proxy_addr = 'your.proxy.host'
# proxy_port = 8080
# :
@@ -128,20 +122,20 @@ module Net #:nodoc:
# # always connect to your.proxy.addr:8080
# :
# }
- #
+ #
# Since Net::HTTP.Proxy returns Net::HTTP itself when proxy_addr is nil,
# there's no need to change code if there's proxy or not.
- #
+ #
# There are two additional parameters in Net::HTTP.Proxy which allow to
# specify proxy user name and password:
- #
+ #
# Net::HTTP::Proxy(proxy_addr, proxy_port, proxy_user = nil, proxy_pass = nil)
- #
+ #
# You may use them to work with authorization-enabled proxies:
- #
+ #
# require 'net/http'
# require 'uri'
- #
+ #
# proxy_host = 'your.proxy.host'
# proxy_port = 8080
# uri = URI.parse(ENV['http_proxy'])
@@ -154,16 +148,16 @@ module Net #:nodoc:
#
# Note that net/http never rely on HTTP_PROXY environment variable.
# If you want to use proxy, set it explicitly.
- #
+ #
# === Following Redirection
- #
+ #
# require 'net/http'
# require 'uri'
- #
+ #
# def fetch(uri_str, limit = 10)
- # # You should choose better exception.
+ # # You should choose better exception.
# raise ArgumentError, 'HTTP redirect too deep' if limit == 0
- #
+ #
# response = Net::HTTP.get_response(URI.parse(uri_str))
# case response
# when Net::HTTPSuccess then response
@@ -172,25 +166,25 @@ module Net #:nodoc:
# response.error!
# end
# end
- #
+ #
# print fetch('http://www.ruby-lang.org')
- #
+ #
# Net::HTTPSuccess and Net::HTTPRedirection is a HTTPResponse class.
# All HTTPResponse objects belong to its own response class which
# indicate HTTP result status. For details of response classes,
# see section "HTTP Response Classes".
- #
+ #
# === Basic Authentication
- #
+ #
# require 'net/http'
- #
+ #
# Net::HTTP.start('www.example.com') {|http|
# req = Net::HTTP::Get.new('/secret-page.html')
# req.basic_auth 'account', 'password'
# response = http.request(req)
# print response.body
# }
- #
+ #
# === HTTP Request Classes
#
# Here is HTTP request class hierarchy.
@@ -220,7 +214,7 @@ module Net #:nodoc:
# HTTPUnknownResponse
# HTTPInformation # 1xx
# HTTPContinue # 100
- # HTTPSwitchProtocol # 101
+ # HTTPSwitchProtocl # 101
# HTTPSuccess # 2xx
# HTTPOK # 200
# HTTPCreated # 201
@@ -263,22 +257,22 @@ module Net #:nodoc:
# HTTPServiceUnavailable # 503
# HTTPGatewayTimeOut # 504
# HTTPVersionNotSupported # 505
- #
+ #
# == Switching Net::HTTP versions
- #
+ #
# You can use net/http.rb 1.1 features (bundled with Ruby 1.6)
# by calling HTTP.version_1_1. Calling Net::HTTP.version_1_2
# allows you to use 1.2 features again.
- #
+ #
# # example
# Net::HTTP.start {|http1| ...(http1 has 1.2 features)... }
- #
+ #
# Net::HTTP.version_1_1
# Net::HTTP.start {|http2| ...(http2 has 1.1 features)... }
- #
+ #
# Net::HTTP.version_1_2
# Net::HTTP.start {|http3| ...(http3 has 1.2 features)... }
- #
+ #
# This function is NOT thread-safe.
#
class HTTP < Protocol
@@ -287,13 +281,6 @@ module Net #:nodoc:
Revision = %q$Revision$.split[1]
HTTPVersion = '1.1'
@newimpl = true
- begin
- require 'zlib'
- require 'stringio' #for our purposes (unpacking gzip) lump these together
- HAVE_ZLIB=true
- rescue LoadError
- HAVE_ZLIB=false
- end
# :startdoc:
# Turns on net/http 1.2 (ruby 1.8) features.
@@ -338,7 +325,7 @@ module Net #:nodoc:
#
# Get body from target and output it to +$stdout+. The
# target can either be specified as (+uri+), or as
- # (+host+, +path+, +port+ = 80); so:
+ # (+host+, +path+, +port+ = 80); so:
#
# Net::HTTP.get_print URI.parse('http://www.example.com/index.html')
#
@@ -358,7 +345,7 @@ module Net #:nodoc:
# Send a GET request to the target and return the response
# as a string. The target can either be specified as
# (+uri+), or as (+host+, +path+, +port+ = 80); so:
- #
+ #
# print Net::HTTP.get(URI.parse('http://www.example.com/index.html'))
#
# or:
@@ -372,7 +359,7 @@ module Net #:nodoc:
# Send a GET request to the target and return the response
# as a Net::HTTPResponse object. The target can either be specified as
# (+uri+), or as (+host+, +path+, +port+ = 80); so:
- #
+ #
# res = Net::HTTP.get_response(URI.parse('http://www.example.com/index.html'))
# print res.body
#
@@ -442,9 +429,9 @@ module Net #:nodoc:
BufferedIO
end
- # creates a new Net::HTTP object and opens its TCP connection and
- # HTTP session. If the optional block is given, the newly
- # created Net::HTTP object is passed to it and closed when the
+ # creates a new Net::HTTP object and opens its TCP connection and
+ # HTTP session. If the optional block is given, the newly
+ # created Net::HTTP object is passed to it and closed when the
# block finishes. In this case, the return value of this method
# is the return value of the block. If no block is given, the
# return value of this method is the newly created Net::HTTP object
@@ -474,7 +461,7 @@ module Net #:nodoc:
@address = address
@port = (port || HTTP.default_port)
@curr_http_version = HTTPVersion
- @no_keepalive_server = false
+ @seems_1_0_server = false
@close_on_empty_response = false
@socket = nil
@started = false
@@ -483,14 +470,6 @@ module Net #:nodoc:
@debug_output = nil
@use_ssl = false
@ssl_context = nil
- @enable_post_connection_check = true
- @compression = nil
- @sspi_enabled = false
- if defined?(SSL_ATTRIBUTES)
- SSL_ATTRIBUTES.each do |name|
- instance_variable_set "@#{name}", nil
- end
- end
end
def inspect
@@ -548,7 +527,7 @@ module Net #:nodoc:
end
# Opens TCP connection and HTTP session.
- #
+ #
# When this method is called with block, gives a HTTP object
# to the block and closes the TCP connection / HTTP session
# after the block executed.
@@ -581,17 +560,10 @@ module Net #:nodoc:
s = timeout(@open_timeout) { TCPSocket.open(conn_address(), conn_port()) }
D "opened"
if use_ssl?
- ssl_parameters = Hash.new
- iv_list = instance_variables
- SSL_ATTRIBUTES.each do |name|
- ivname = "@#{name}".intern
- if iv_list.include?(ivname) and
- value = instance_variable_get(ivname)
- ssl_parameters[name] = value
- end
+ unless @ssl_context.verify_mode
+ warn "warning: peer certificate won't be verified in this SSL session"
+ @ssl_context.verify_mode = OpenSSL::SSL::VERIFY_NONE
end
- @ssl_context = OpenSSL::SSL::SSLContext.new
- @ssl_context.set_params(ssl_parameters)
s = OpenSSL::SSL::SSLSocket.new(s, @ssl_context)
s.sync_close = true
end
@@ -655,9 +627,9 @@ module Net #:nodoc:
# Arguments are address/port of proxy host and username/password
# if authorization on proxy server is required.
# You can replace the HTTP class with created proxy class.
- #
+ #
# If ADDRESS is nil, this method returns self (Net::HTTP).
- #
+ #
# # Example
# proxy_class = Net::HTTP::Proxy('proxy.example.com', 8080)
# :
@@ -665,7 +637,7 @@ module Net #:nodoc:
# # connecting proxy.foo.org:8080
# :
# }
- #
+ #
def HTTP.Proxy(p_addr, p_port = nil, p_user = nil, p_pass = nil)
return self unless p_addr
delta = ProxyDelta
@@ -761,18 +733,7 @@ module Net #:nodoc:
public
# Gets data from +path+ on the connected-to host.
- # +initheader+ must be a Hash like { 'Accept' => '*/*', ... },
- # and it defaults to an empty hash.
- # If +initheader+ doesn't have the key 'accept-encoding', then
- # a value of "gzip;q=1.0,deflate;q=0.6,identity;q=0.3" is used,
- # so that gzip compression is used in preference to deflate
- # compression, which is used in preference to no compression.
- # Ruby doesn't have libraries to support the compress (Lempel-Ziv)
- # compression, so that is not supported. The intent of this is
- # to reduce bandwidth by default. If this routine sets up
- # compression, then it does the decompression also, removing
- # the header as well to prevent confusion. Otherwise
- # it leaves the body as it found it.
+ # +header+ must be a Hash like { 'Accept' => '*/*', ... }.
#
# In version 1.1 (ruby 1.6), this method returns a pair of objects,
# a Net::HTTPResponse object and the entity body string.
@@ -787,7 +748,7 @@ module Net #:nodoc:
# +dest+ argument is obsolete.
# It still works but you must not use it.
#
- # In version 1.1, this method might raise an exception for
+ # In version 1.1, this method might raise an exception for
# 3xx (redirect). In this case you can get a HTTPResponse object
# by "anException.response".
#
@@ -798,7 +759,7 @@ module Net #:nodoc:
#
# # version 1.2 (bundled with Ruby 1.8 or later)
# response = http.get('/index.html')
- #
+ #
# # using block
# File.open('result.txt', 'w') {|f|
# http.get('/~foo/') do |str|
@@ -806,33 +767,10 @@ module Net #:nodoc:
# end
# }
#
- def get(path, initheader = {}, dest = nil, &block) # :yield: +body_segment+
+ def get(path, initheader = nil, dest = nil, &block) # :yield: +body_segment+
res = nil
- if HAVE_ZLIB
- unless initheader.keys.any?{|k| k.downcase == "accept-encoding"}
- initheader["accept-encoding"] = "gzip;q=1.0,deflate;q=0.6,identity;q=0.3"
- @compression = true
- end
- end
request(Get.new(path, initheader)) {|r|
- if r.key?("content-encoding") and @compression
- @compression = nil # Clear it till next set.
- the_body = r.read_body dest, &block
- case r["content-encoding"]
- when "gzip"
- r.body= Zlib::GzipReader.new(StringIO.new(the_body)).read
- r.delete("content-encoding")
- when "deflate"
- r.body= Zlib::Inflate.inflate(the_body);
- r.delete("content-encoding")
- when "identity"
- ; # nothing needed
- else
- ; # Don't do anything dramatic, unless we need to later
- end
- else
- r.read_body dest, &block
- end
+ r.read_body dest, &block
res = r
}
unless @newimpl
@@ -845,21 +783,21 @@ module Net #:nodoc:
# Gets only the header from +path+ on the connected-to host.
# +header+ is a Hash like { 'Accept' => '*/*', ... }.
- #
+ #
# This method returns a Net::HTTPResponse object.
- #
- # In version 1.1, this method might raise an exception for
+ #
+ # In version 1.1, this method might raise an exception for
# 3xx (redirect). On the case you can get a HTTPResponse object
# by "anException.response".
# In version 1.2, this method never raises an exception.
- #
+ #
# response = nil
# Net::HTTP.start('some.www.server', 80) {|http|
# response = http.head('/index.html')
# }
# p response['content-type']
#
- def head(path, initheader = nil)
+ def head(path, initheader = nil)
res = request(Head.new(path, initheader))
res.value unless @newimpl
res
@@ -867,11 +805,11 @@ module Net #:nodoc:
# Posts +data+ (must be a String) to +path+. +header+ must be a Hash
# like { 'Accept' => '*/*', ... }.
- #
+ #
# In version 1.1 (ruby 1.6), this method returns a pair of objects, a
# Net::HTTPResponse object and an entity body string.
# In version 1.2 (ruby 1.8), this method returns a Net::HTTPResponse object.
- #
+ #
# If called with a block, yields each fragment of the
# entity body in turn as a string as it are read from
# the socket. Note that in this case, the returned response
@@ -879,18 +817,18 @@ module Net #:nodoc:
#
# +dest+ argument is obsolete.
# It still works but you must not use it.
- #
- # In version 1.1, this method might raise an exception for
+ #
+ # In version 1.1, this method might raise an exception for
# 3xx (redirect). In this case you can get an HTTPResponse object
# by "anException.response".
# In version 1.2, this method never raises exception.
- #
+ #
# # version 1.1
# response, body = http.post('/cgi-bin/search.rb', 'query=foo')
- #
+ #
# # version 1.2
# response = http.post('/cgi-bin/search.rb', 'query=foo')
- #
+ #
# # using block
# File.open('result.txt', 'w') {|f|
# http.post('/cgi-bin/search.rb', 'query=foo') do |str|
@@ -983,21 +921,21 @@ module Net #:nodoc:
# Sends a GET request to the +path+ and gets a response,
# as an HTTPResponse object.
- #
+ #
# When called with a block, yields an HTTPResponse object.
# The body of this response will not have been read yet;
# the caller can process it using HTTPResponse#read_body,
# if desired.
#
# Returns the response.
- #
+ #
# This method never raises Net::* exceptions.
- #
+ #
# response = http.request_get('/index.html')
# # The entity body is already read here.
# p response['content-type']
# puts response.body
- #
+ #
# # using block
# http.request_get('/index.html') {|response|
# p response['content-type']
@@ -1014,9 +952,9 @@ module Net #:nodoc:
# as an HTTPResponse object.
#
# Returns the response.
- #
+ #
# This method never raises Net::* exceptions.
- #
+ #
# response = http.request_head('/index.html')
# p response['content-type']
#
@@ -1026,21 +964,21 @@ module Net #:nodoc:
# Sends a POST request to the +path+ and gets a response,
# as an HTTPResponse object.
- #
+ #
# When called with a block, yields an HTTPResponse object.
# The body of this response will not have been read yet;
# the caller can process it using HTTPResponse#read_body,
# if desired.
#
# Returns the response.
- #
+ #
# This method never raises Net::* exceptions.
- #
+ #
# # example
# response = http.request_post('/cgi-bin/nice.rb', 'datadatadata...')
# p response.status
# puts response.body # body is already read
- #
+ #
# # using block
# http.request_post('/cgi-bin/nice.rb', 'datadatadata...') {|response|
# p response.status
@@ -1068,7 +1006,7 @@ module Net #:nodoc:
# This method also sends DATA string if DATA is given.
#
# Returns a HTTPResponse object.
- #
+ #
# This method never raises Net::* exceptions.
#
# response = http.send_request('GET', '/index.html')
@@ -1082,14 +1020,14 @@ module Net #:nodoc:
# Sends an HTTPRequest object REQUEST to the HTTP server.
# This method also sends DATA string if REQUEST is a post/put request.
# Giving DATA for get/head request causes ArgumentError.
- #
+ #
# When called with a block, yields an HTTPResponse object.
# The body of this response will not have been read yet;
# the caller can process it using HTTPResponse#read_body,
# if desired.
#
# Returns a HTTPResponse object.
- #
+ #
# This method never raises Net::* exceptions.
#
def request(req, body = nil, &block) # :yield: +response+
@@ -1100,34 +1038,34 @@ module Net #:nodoc:
}
end
if proxy_user()
- req.proxy_basic_auth proxy_user(), proxy_pass() unless use_ssl?
- end
- req.set_body_internal body
- res = transport_request(req, &block)
- if sspi_auth?(res)
- sspi_auth(req)
- res = transport_request(req, &block)
+ unless use_ssl?
+ req.proxy_basic_auth proxy_user(), proxy_pass()
+ end
end
- res
- end
- private
-
- def transport_request(req)
+ req.set_body_internal body
begin_transport req
- req.exec @socket, @curr_http_version, edit_path(req.path)
- begin
- res = HTTPResponse.read_new(@socket)
- end while res.kind_of?(HTTPContinue)
- res.reading_body(@socket, req.response_body_permitted?) {
- yield res if block_given?
- }
+ req.exec @socket, @curr_http_version, edit_path(req.path)
+ begin
+ res = HTTPResponse.read_new(@socket)
+ end while res.kind_of?(HTTPContinue)
+ res.reading_body(@socket, req.response_body_permitted?) {
+ yield res if block_given?
+ }
end_transport req, res
+
res
end
+ private
+
def begin_transport(req)
- connect if @socket.closed?
+ if @socket.closed?
+ connect
+ end
+ if @seems_1_0_server
+ req['connection'] ||= 'close'
+ end
if not req.response_body_permitted? and @close_on_empty_response
req['connection'] ||= 'close'
end
@@ -1136,13 +1074,15 @@ module Net #:nodoc:
def end_transport(req, res)
@curr_http_version = res.http_version
- if @socket.closed?
- D 'Conn socket closed'
- elsif not res.body and @close_on_empty_response
+ if not res.body and @close_on_empty_response
D 'Conn close'
@socket.close
elsif keep_alive?(req, res)
D 'Conn keep-alive'
+ if @socket.closed?
+ D 'Conn (but seems 1.0 server)'
+ @seems_1_0_server = true
+ end
else
D 'Conn close'
@socket.close
@@ -1150,40 +1090,13 @@ module Net #:nodoc:
end
def keep_alive?(req, res)
- return false if req.connection_close?
- if @curr_http_version <= '1.0'
- res.connection_keep_alive?
- else # HTTP/1.1 or later
- not res.connection_close?
- end
- end
-
- def sspi_auth?(res)
- return false unless @sspi_enabled
- if res.kind_of?(HTTPProxyAuthenticationRequired) and
- proxy? and res["Proxy-Authenticate"].include?("Negotiate")
- begin
- require 'win32/sspi'
- true
- rescue LoadError
- false
- end
- else
- false
- end
- end
-
- def sspi_auth(req)
- n = Win32::SSPI::NegotiateAuth.new
- req["Proxy-Authorization"] = "Negotiate #{n.get_initial_token}"
- # Some versions of ISA will close the connection if this isn't present.
- req["Connection"] = "Keep-Alive"
- req["Proxy-Connection"] = "Keep-Alive"
- res = transport_request(req)
- authphrase = res["Proxy-Authenticate"] or return res
- req["Proxy-Authorization"] = "Negotiate #{n.complete_authentication(authphrase)}"
- rescue => err
- raise HTTPAuthenticationError.new('HTTP authentication failed', err)
+ return false if /close/i =~ req['connection'].to_s
+ return false if @seems_1_0_server
+ return true if /keep-alive/i =~ res['connection'].to_s
+ return false if /close/i =~ res['connection'].to_s
+ return true if /keep-alive/i =~ res['proxy-connection'].to_s
+ return false if /close/i =~ res['proxy-connection'].to_s
+ (@curr_http_version == '1.1')
end
#
@@ -1421,7 +1334,7 @@ module Net #:nodoc:
raise HTTPHeaderSyntaxError, 'wrong Content-Length format'
len.to_i
end
-
+
def content_length=(len)
unless len
@header.delete 'content-length'
@@ -1431,7 +1344,7 @@ module Net #:nodoc:
end
# Returns "true" if the "transfer-encoding" header is present and
- # set to "chunked". This is an HTTP/1.1 feature, allowing the
+ # set to "chunked". This is an HTTP/1.1 feature, allowing the
# the content to be sent in "chunks" without at the outset
# stating the entire content length.
def chunked?
@@ -1472,7 +1385,7 @@ module Net #:nodoc:
return nil unless @header['content-type']
self['Content-Type'].split(';').first.to_s.split('/')[0].to_s.strip
end
-
+
# Returns a content type string such as "html".
# This method returns nil if Content-Type: header field does not exist
# or sub-type is not given (e.g. "Content-Type: text").
@@ -1510,26 +1423,15 @@ module Net #:nodoc:
#
# This method also set Content-Type: header field to
# application/x-www-form-urlencoded.
- #
- # Example:
- # http.form_data = {"q" => "ruby", "lang" => "en"}
- # http.form_data = {"q" => ["ruby", "perl"], "lang" => "en"}
- # http.set_form_data({"q" => "ruby", "lang" => "en"}, ';')
- #
def set_form_data(params, sep = '&')
- self.body = params.map {|k, v| encode_kvpair(k, v) }.flatten.join(sep)
+ self.body = params.map {|k,v| "#{urlencode(k.to_s)}=#{urlencode(v.to_s)}" }.join(sep)
self.content_type = 'application/x-www-form-urlencoded'
end
alias form_data= set_form_data
- def encode_kvpair(k, vs)
- Array(vs).map {|v| "#{urlencode(k)}=#{urlencode(v.to_s)}" }
- end
- private :encode_kvpair
-
def urlencode(str)
- str.dup.force_encoding('ASCII-8BIT').gsub(/[^a-zA-Z0-9_\.\-]/){'%%%02x' % $&.ord}
+ str.gsub(/[^a-zA-Z0-9_\.\-]/n) {|s| sprintf('%%%02x', s[0]) }
end
private :urlencode
@@ -1548,24 +1450,6 @@ module Net #:nodoc:
end
private :basic_encode
- def connection_close?
- tokens(@header['connection']).include?('close') or
- tokens(@header['proxy-connection']).include?('close')
- end
-
- def connection_keep_alive?
- tokens(@header['connection']).include?('keep-alive') or
- tokens(@header['proxy-connection']).include?('keep-alive')
- end
-
- def tokens(vals)
- return [] unless vals
- vals.map {|v| v.split(',') }.flatten\
- .reject {|str| str.strip.empty? }\
- .map {|tok| tok.strip.downcase }
- end
- private :tokens
-
end
@@ -1583,12 +1467,10 @@ module Net #:nodoc:
@method = m
@request_has_body = reqbody
@response_has_body = resbody
- raise ArgumentError, "no HTTP request path given" unless path
raise ArgumentError, "HTTP request path is empty" if path.empty?
@path = path
initialize_http_header initheader
self['Accept'] ||= '*/*'
- self['User-Agent'] ||= 'Ruby'
@body = nil
@body_stream = nil
end
@@ -1651,7 +1533,7 @@ module Net #:nodoc:
private
def send_request_with_body(sock, ver, path, body)
- self.content_length = body.bytesize
+ self.content_length = body.length
delete 'Transfer-Encoding'
supply_default_content_type
write_header sock, ver, path
@@ -1691,14 +1573,14 @@ module Net #:nodoc:
buf << "\r\n"
sock.write buf
end
-
+
end
- #
+ #
# HTTP request class. This class wraps request header and entity path.
# You *must* use its subclass, Net::HTTP::Get, Post, Head.
- #
+ #
class HTTPRequest < HTTPGenericRequest
# Creates HTTP request object.
@@ -1838,17 +1720,17 @@ module Net #:nodoc:
# HTTP response class. This class wraps response header and entity.
# Mixes in the HTTPHeader module, which provides access to response
# header values both via hash-like methods and individual readers.
- # Note that each possible HTTP response code defines its own
+ # Note that each possible HTTP response code defines its own
# HTTPResponse subclass. These are listed below.
# All classes are
# defined under the Net module. Indentation indicates inheritance.
- #
+ #
# xxx HTTPResponse
- #
+ #
# 1xx HTTPInformation
- # 100 HTTPContinue
+ # 100 HTTPContinue
# 101 HTTPSwitchProtocol
- #
+ #
# 2xx HTTPSuccess
# 200 HTTPOK
# 201 HTTPCreated
@@ -1857,7 +1739,7 @@ module Net #:nodoc:
# 204 HTTPNoContent
# 205 HTTPResetContent
# 206 HTTPPartialContent
- #
+ #
# 3xx HTTPRedirection
# 300 HTTPMultipleChoice
# 301 HTTPMovedPermanently
@@ -1866,7 +1748,7 @@ module Net #:nodoc:
# 304 HTTPNotModified
# 305 HTTPUseProxy
# 307 HTTPTemporaryRedirect
- #
+ #
# 4xx HTTPClientError
# 400 HTTPBadRequest
# 401 HTTPUnauthorized
@@ -1886,7 +1768,7 @@ module Net #:nodoc:
# 415 HTTPUnsupportedMediaType
# 416 HTTPRequestedRangeNotSatisfiable
# 417 HTTPExpectationFailed
- #
+ #
# 5xx HTTPServerError
# 500 HTTPInternalServerError
# 501 HTTPNotImplemented
@@ -1894,7 +1776,7 @@ module Net #:nodoc:
# 503 HTTPServiceUnavailable
# 504 HTTPGatewayTimeOut
# 505 HTTPVersionNotSupported
- #
+ #
# xxx HTTPUnknownResponse
#
class HTTPResponse
@@ -2160,7 +2042,7 @@ module Net #:nodoc:
# next is to fix bug in RDoc, where the private inside class << self
# spills out.
- public
+ public
include HTTPHeader
@@ -2193,7 +2075,7 @@ module Net #:nodoc:
# To allow Net::HTTP 1.1 style assignment
# e.g.
# response, body = Net::HTTP.get(....)
- #
+ #
def to_ary
warn "net/http.rb: warning: Net::HTTP v1.1 style assignment found at #{caller(1)[0]}; use `response = http.get(...)' instead." if $VERBOSE
res = self.dup
@@ -2316,12 +2198,6 @@ module Net #:nodoc:
read_body()
end
- # Because it may be necessary to modify the body, Eg, decompression
- # this method facilitates that.
- def body=(value)
- @body = value
- end
-
alias entity body #:nodoc: obsolete
private
diff --git a/lib/net/https.rb b/lib/net/https.rb
index 636ae1be4d..7847c3ffea 100644
--- a/lib/net/https.rb
+++ b/lib/net/https.rb
@@ -17,7 +17,7 @@
== Version
$Id$
-
+
2001-11-06: Contiributed to Ruby/OpenSSL project.
2004-03-06: Some code is merged in to net/http.
@@ -73,7 +73,7 @@ It can be replaced by the following code:
: ca_file, ca_file=((|path|))
Sets path of a CA certification file in PEM format.
- The file can contrain several CA certificates.
+ The file can contrain several CA certificats.
: ca_path, ca_path=((|path|))
Sets path of a CA certification directory containing certifications
@@ -102,35 +102,72 @@ require 'net/http'
require 'openssl'
module Net
+
class HTTP
remove_method :use_ssl?
def use_ssl?
@use_ssl
end
+ # For backward compatibility.
+ alias use_ssl use_ssl?
+
# Turn on/off SSL.
# This flag must be set before starting session.
# If you change use_ssl value after session started,
# a Net::HTTP object raises IOError.
def use_ssl=(flag)
flag = (flag ? true : false)
- if started? and @use_ssl != flag
- raise IOError, "use_ssl value changed, but session already started"
+ raise IOError, "use_ssl value changed, but session already started" \
+ if started? and @use_ssl != flag
+ if flag and not @ssl_context
+ @ssl_context = OpenSSL::SSL::SSLContext.new
end
@use_ssl = flag
end
- SSL_ATTRIBUTES = %w(
- ssl_version key cert ca_file ca_path cert_store ciphers
- verify_mode verify_callback verify_depth ssl_timeout
- )
- attr_accessor(*SSL_ATTRIBUTES)
+ def self.ssl_context_accessor(name)
+ module_eval(<<-End, __FILE__, __LINE__ + 1)
+ def #{name}
+ return nil unless @ssl_context
+ @ssl_context.#{name}
+ end
+
+ def #{name}=(val)
+ @ssl_context ||= OpenSSL::SSL::SSLContext.new
+ @ssl_context.#{name} = val
+ end
+ End
+ end
+
+ ssl_context_accessor :key
+ ssl_context_accessor :cert
+ ssl_context_accessor :ca_file
+ ssl_context_accessor :ca_path
+ ssl_context_accessor :verify_mode
+ ssl_context_accessor :verify_callback
+ ssl_context_accessor :verify_depth
+ ssl_context_accessor :cert_store
+
+ def ssl_timeout
+ return nil unless @ssl_context
+ @ssl_context.timeout
+ end
+
+ def ssl_timeout=(sec)
+ raise ArgumentError, 'Net::HTTP#ssl_timeout= called but use_ssl=false' \
+ unless use_ssl?
+ @ssl_context ||= OpenSSL::SSL::SSLContext.new
+ @ssl_context.timeout = sec
+ end
+
+ # For backward compatibility
+ alias timeout= ssl_timeout=
def peer_cert
- if not use_ssl? or not @socket
- return nil
- end
+ return nil if not use_ssl? or not @socket
@socket.io.peer_cert
end
end
+
end
diff --git a/lib/net/imap.rb b/lib/net/imap.rb
index 8b7529d79d..f8c0d3be4c 100644
--- a/lib/net/imap.rb
+++ b/lib/net/imap.rb
@@ -9,14 +9,13 @@
# Documentation: Shugo Maeda, with RDoc conversion and overview by William
# Webber.
#
-# See Net::IMAP for documentation.
+# See Net::IMAP for documentation.
#
require "socket"
require "monitor"
require "digest/md5"
-require "strscan"
begin
require "openssl"
rescue LoadError
@@ -45,12 +44,12 @@ module Net
# read-only access) #examine(). Once the client has successfully
# selected a mailbox, they enter _selected_ state, and that
# mailbox becomes the _current_ mailbox, on which mail-item
- # related commands implicitly operate.
+ # related commands implicitly operate.
#
# Messages have two sorts of identifiers: message sequence
- # numbers, and UIDs.
+ # numbers, and UIDs.
#
- # Message sequence numbers number messages within a mail box
+ # Message sequence numbers number messages within a mail box
# from 1 up to the number of items in the mail box. If new
# message arrives during a session, it receives a sequence
# number equal to the new size of the mail box. If messages
@@ -58,7 +57,7 @@ module Net
# sequence numbers "shuffled down" to fill the gaps.
#
# UIDs, on the other hand, are permanently guaranteed not to
- # identify another message within the same mailbox, even if
+ # identify another message within the same mailbox, even if
# the existing message is deleted. UIDs are required to
# be assigned in ascending (but not necessarily sequential)
# order within a mailbox; this means that if a non-IMAP client
@@ -91,11 +90,11 @@ module Net
# imap.store(message_id, "+FLAGS", [:Deleted])
# end
# imap.expunge
- #
+ #
# == Thread Safety
#
# Net::IMAP supports concurrent threads. For example,
- #
+ #
# imap = Net::IMAP.new("imap.foo.net", "imap2")
# imap.authenticate("cram-md5", "bar", "password")
# imap.select("inbox")
@@ -103,7 +102,7 @@ module Net
# search_result = imap.search(["BODY", "hello"])
# fetch_result = fetch_thread.value
# imap.disconnect
- #
+ #
# This script invokes the FETCH command and the SEARCH command concurrently.
#
# == Errors
@@ -113,9 +112,9 @@ module Net
#
# NO:: the attempted command could not be successfully completed. For
# instance, the username/password used for logging in are incorrect;
- # the selected mailbox does not exists; etc.
+ # the selected mailbox does not exists; etc.
#
- # BAD:: the request from the client does not follow the server's
+ # BAD:: the request from the client does not follow the server's
# understanding of the IMAP protocol. This includes attempting
# commands from the wrong client state; for instance, attempting
# to perform a SEARCH command without having SELECTed a current
@@ -147,8 +146,8 @@ module Net
#
# Finally, a Net::IMAP::DataFormatError is thrown if low-level data
# is found to be in an incorrect format (for instance, when converting
- # between UTF-8 and UTF-16), and Net::IMAP::ResponseParseError is
- # thrown if a server response is non-parseable.
+ # between UTF-8 and UTF-16), and Net::IMAP::ResponseParseError is
+ # thrown if a server response is non-parseable.
#
#
# == References
@@ -274,10 +273,8 @@ module Net
# is the type of authentication this authenticator supports
# (for instance, "LOGIN"). The +authenticator+ is an object
# which defines a process() method to handle authentication with
- # the server. See Net::IMAP::LoginAuthenticator,
- # Net::IMAP::CramMD5Authenticator, and Net::IMAP::DigestMD5Authenticator
- # for examples.
- #
+ # the server. See Net::IMAP::LoginAuthenticator and
+ # Net::IMAP::CramMD5Authenticator for examples.
#
# If +auth_type+ refers to an existing authenticator, it will be
# replaced by the new one.
@@ -287,16 +284,10 @@ module Net
# Disconnects from the server.
def disconnect
- begin
- begin
- # try to call SSL::SSLSocket#io.
- @sock.io.shutdown
- rescue NoMethodError
- # @sock is not an SSL::SSLSocket.
- @sock.shutdown
- end
- rescue Errno::ENOTCONN
- # ignore `Errno::ENOTCONN: Socket is not connected' on some platforms.
+ if SSL::SSLSocket === @sock
+ @sock.io.shutdown
+ else
+ @sock.shutdown
end
@receiver_thread.join
@sock.close
@@ -314,7 +305,7 @@ module Net
#
# Note that the Net::IMAP class does not modify its
# behaviour according to the capabilities of the server;
- # it is up to the user of the class to ensure that
+ # it is up to the user of the class to ensure that
# a certain capability is supported by a server before
# using it.
def capability
@@ -335,27 +326,12 @@ module Net
send_command("LOGOUT")
end
- # Sends a STARTTLS command to start TLS session.
- def starttls(options = {}, verify = true)
- send_command("STARTTLS") do |resp|
- if resp.kind_of?(TaggedResponse) && resp.name == "OK"
- begin
- # for backward compatibility
- certs = options.to_str
- options = create_ssl_params(certs, verify)
- rescue NoMethodError
- end
- start_tls_session(options)
- end
- end
- end
-
# Sends an AUTHENTICATE command to authenticate the client.
# The +auth_type+ parameter is a string that represents
# the authentication mechanism to be used. Currently Net::IMAP
# supports authentication mechanisms:
#
- # LOGIN:: login using cleartext user and password.
+ # LOGIN:: login using cleartext user and password.
# CRAM-MD5:: login with cleartext user and encrypted password
# (see [RFC-2195] for a full description). This
# mechanism requires that the server have the user's
@@ -403,7 +379,7 @@ module Net
end
# Sends a SELECT command to select a +mailbox+ so that messages
- # in the +mailbox+ can be accessed.
+ # in the +mailbox+ can be accessed.
#
# After you have selected a mailbox, you may retrieve the
# number of items in that mailbox from @responses["EXISTS"][-1],
@@ -454,7 +430,7 @@ module Net
# Sends a RENAME command to change the name of the +mailbox+ to
# +newname+.
#
- # A Net::IMAP::NoResponseError is raised if a mailbox with the
+ # A Net::IMAP::NoResponseError is raised if a mailbox with the
# name +mailbox+ cannot be renamed to +newname+ for whatever
# reason; for instance, because +mailbox+ does not exist, or
# because there is already a mailbox with the name +newname+.
@@ -501,8 +477,8 @@ module Net
# imap.create("foo/bar")
# imap.create("foo/baz")
# p imap.list("", "foo/%")
- # #=> [#<Net::IMAP::MailboxList attr=[:Noselect], delim="/", name="foo/">, \\
- # #<Net::IMAP::MailboxList attr=[:Noinferiors, :Marked], delim="/", name="foo/bar">, \\
+ # #=> [#<Net::IMAP::MailboxList attr=[:Noselect], delim="/", name="foo/">, \\
+ # #<Net::IMAP::MailboxList attr=[:Noinferiors, :Marked], delim="/", name="foo/bar">, \\
# #<Net::IMAP::MailboxList attr=[:Noinferiors], delim="/", name="foo/baz">]
def list(refname, mailbox)
synchronize do
@@ -555,7 +531,7 @@ module Net
# then that user will be stripped of any rights to that mailbox.
# The IMAP ACL commands are described in [RFC-2086].
def setacl(mailbox, user, rights)
- if rights.nil?
+ if rights.nil?
send_command("SETACL", mailbox, user, "")
else
send_command("SETACL", mailbox, user, rights)
@@ -574,7 +550,7 @@ module Net
# Sends a LSUB command, and returns a subset of names from the set
# of names that the user has declared as being "active" or
- # "subscribed". +refname+ and +mailbox+ are interpreted as
+ # "subscribed". +refname+ and +mailbox+ are interpreted as
# for #list().
# The return value is an array of +Net::IMAP::MailboxList+.
def lsub(refname, mailbox)
@@ -597,7 +573,7 @@ module Net
# p imap.status("inbox", ["MESSAGES", "RECENT"])
# #=> {"RECENT"=>0, "MESSAGES"=>44}
#
- # A Net::IMAP::NoResponseError is raised if status values
+ # A Net::IMAP::NoResponseError is raised if status values
# for +mailbox+ cannot be returned, for instance because it
# does not exist.
def status(mailbox, attr)
@@ -608,9 +584,9 @@ module Net
end
# Sends a APPEND command to append the +message+ to the end of
- # the +mailbox+. The optional +flags+ argument is an array of
+ # the +mailbox+. The optional +flags+ argument is an array of
# flags to initially passing to the new message. The optional
- # +date_time+ argument specifies the creation time to assign to the
+ # +date_time+ argument specifies the creation time to assign to the
# new message; it defaults to the current time.
# For example:
#
@@ -618,7 +594,7 @@ module Net
# Subject: hello
# From: shugo@ruby-lang.org
# To: shugo@ruby-lang.org
- #
+ #
# hello world
# EOF
#
@@ -637,7 +613,7 @@ module Net
# Sends a CHECK command to request a checkpoint of the currently
# selected mailbox. This performs implementation-specific
- # housekeeping, for instance, reconciling the mailbox's
+ # housekeeping, for instance, reconciling the mailbox's
# in-memory and on-disk state.
def check
send_command("CHECK")
@@ -661,8 +637,8 @@ module Net
# Sends a SEARCH command to search the mailbox for messages that
# match the given searching criteria, and returns message sequence
- # numbers. +keys+ can either be a string holding the entire
- # search string, or a single-dimension array of search keywords and
+ # numbers. +keys+ can either be a string holding the entire
+ # search string, or a single-dimension array of search keywords and
# arguments. The following are some common search criteria;
# see [IMAP] section 6.4.4 for a full list.
#
@@ -686,7 +662,7 @@ module Net
#
# OR <search-key> <search-key>:: "or" two search keys together.
#
- # ON <date>:: messages with an internal date exactly equal to <date>,
+ # ON <date>:: messages with an internal date exactly equal to <date>,
# which has a format similar to 8-Aug-2002.
#
# SINCE <date>:: messages with an internal date on or after <date>.
@@ -694,7 +670,7 @@ module Net
# SUBJECT <string>:: messages with <string> in their subject.
#
# TO <string>:: messages with <string> in their TO field.
- #
+ #
# For example:
#
# p imap.search(["SUBJECT", "hello", "NOT", "NEW"])
@@ -717,8 +693,8 @@ module Net
# The return value is an array of Net::IMAP::FetchData. For example:
#
# p imap.fetch(6..8, "UID")
- # #=> [#<Net::IMAP::FetchData seqno=6, attr={"UID"=>98}>, \\
- # #<Net::IMAP::FetchData seqno=7, attr={"UID"=>99}>, \\
+ # #=> [#<Net::IMAP::FetchData seqno=6, attr={"UID"=>98}>, \\
+ # #<Net::IMAP::FetchData seqno=7, attr={"UID"=>99}>, \\
# #<Net::IMAP::FetchData seqno=8, attr={"UID"=>100}>]
# p imap.fetch(6, "BODY[HEADER.FIELDS (SUBJECT)]")
# #=> [#<Net::IMAP::FetchData seqno=6, attr={"BODY[HEADER.FIELDS (SUBJECT)]"=>"Subject: test\r\n\r\n"}>]
@@ -741,9 +717,9 @@ module Net
end
# Sends a STORE command to alter data associated with messages
- # in the mailbox, in particular their flags. The +set+ parameter
- # is a number or an array of numbers or a Range object. Each number
- # is a message sequence number. +attr+ is the name of a data item
+ # in the mailbox, in particular their flags. The +set+ parameter
+ # is a number or an array of numbers or a Range object. Each number
+ # is a message sequence number. +attr+ is the name of a data item
# to store: 'FLAGS' means to replace the message's flag list
# with the provided one; '+FLAGS' means to add the provided flags;
# and '-FLAGS' means to remove them. +flags+ is a list of flags.
@@ -751,8 +727,8 @@ module Net
# The return value is an array of Net::IMAP::FetchData. For example:
#
# p imap.store(6..8, "+FLAGS", [:Deleted])
- # #=> [#<Net::IMAP::FetchData seqno=6, attr={"FLAGS"=>[:Seen, :Deleted]}>, \\
- # #<Net::IMAP::FetchData seqno=7, attr={"FLAGS"=>[:Seen, :Deleted]}>, \\
+ # #=> [#<Net::IMAP::FetchData seqno=6, attr={"FLAGS"=>[:Seen, :Deleted]}>, \\
+ # #<Net::IMAP::FetchData seqno=7, attr={"FLAGS"=>[:Seen, :Deleted]}>, \\
# #<Net::IMAP::FetchData seqno=8, attr={"FLAGS"=>[:Seen, :Deleted]}>]
def store(set, attr, flags)
return store_internal("STORE", set, attr, flags)
@@ -794,9 +770,9 @@ module Net
return sort_internal("UID SORT", sort_keys, search_keys, charset)
end
- # Adds a response handler. For example, to detect when
+ # Adds a response handler. For example, to detect when
# the server sends us a new EXISTS response (which normally
- # indicates new messages being added to the mail box),
+ # indicates new messages being added to the mail box),
# you could add the following handler after selecting the
# mailbox.
#
@@ -832,50 +808,12 @@ module Net
return thread_internal("THREAD", algorithm, search_keys, charset)
end
- # As for #thread(), but returns unique identifiers instead of
+ # As for #thread(), but returns unique identifiers instead of
# message sequence numbers.
def uid_thread(algorithm, search_keys, charset)
return thread_internal("UID THREAD", algorithm, search_keys, charset)
end
- # Sends an IDLE command that waits for notifications of new or expunged
- # messages. Yields responses from the server during the IDLE.
- #
- # Use #idle_done() to leave IDLE.
- def idle(&response_handler)
- raise LocalJumpError, "no block given" unless response_handler
-
- response = nil
-
- synchronize do
- tag = Thread.current[:net_imap_tag] = generate_tag
- put_string("#{tag} IDLE#{CRLF}")
-
- begin
- add_response_handler(response_handler)
- @idle_done_cond = new_cond
- @idle_done_cond.wait
- @idle_done_cond = nil
- ensure
- remove_response_handler(response_handler)
- put_string("DONE#{CRLF}")
- response = get_tagged_response(tag, "IDLE")
- end
- end
-
- return response
- end
-
- # Leaves IDLE.
- def idle_done
- synchronize do
- if @idle_done_cond.nil?
- raise Net::IMAP::Error, "not during IDLE"
- end
- @idle_done_cond.signal
- end
- end
-
# Decode a string from modified UTF-7 format to UTF-8.
#
# UTF-7 is a 7-bit encoding of Unicode [UTF7]. IMAP uses a
@@ -894,59 +832,39 @@ module Net
if x > 0
base64.concat("=" * (4 - x))
end
- base64.unpack("m")[0].unpack("n*").pack("U*")
+ u16tou8(base64.unpack("m")[0])
end
- }.force_encoding("UTF-8")
+ }
end
# Encode a string from UTF-8 format to modified UTF-7.
def self.encode_utf7(s)
- return s.gsub(/(&)|([^\x20-\x25\x27-\x7e]+)/u) {
+ return s.gsub(/(&)|([^\x20-\x25\x27-\x7e]+)/n) { |x|
if $1
"&-"
else
- base64 = [$&.unpack("U*").pack("n*")].pack("m")
+ base64 = [u8tou16(x)].pack("m")
"&" + base64.delete("=\n").tr("/", ",") + "-"
end
- }.force_encoding("ASCII-8BIT")
- end
-
- # Formats +time+ as an IMAP-style date.
- def self.format_date(time)
- return time.strftime('%d-%b-%Y')
- end
-
- # Formats +time+ as an IMAP-style date-time.
- def self.format_datetime(time)
- return time.strftime('%d-%b-%Y %H:%M %z')
+ }
end
private
CRLF = "\r\n" # :nodoc:
PORT = 143 # :nodoc:
- SSL_PORT = 993 # :nodoc:
@@debug = false
@@authenticators = {}
- # call-seq:
- # Net::IMAP.new(host, options = {})
- #
# Creates a new Net::IMAP object and connects it to the specified
- # +host+.
- #
- # +options+ is an option hash, each key of which is a symbol.
- #
- # The available options are:
- #
- # port:: port number (default value is 143 for imap, or 993 for imaps)
- # ssl:: if options[:ssl] is true, then an attempt will be made
- # to use SSL (now TLS) to connect to the server. For this to work
- # OpenSSL [OSSL] and the Ruby OpenSSL [RSSL] extensions need to
- # be installed.
- # if options[:ssl] is a hash, it's passed to
- # OpenSSL::SSL::SSLContext#set_params as parameters.
+ # +port+ (143 by default) on the named +host+. If +usessl+ is true,
+ # then an attempt will
+ # be made to use SSL (now TLS) to connect to the server. For this
+ # to work OpenSSL [OSSL] and the Ruby OpenSSL [RSSL]
+ # extensions need to be installed. The +certs+ parameter indicates
+ # the path or file containing the CA cert of the server, and the
+ # +verify+ parameter is for the OpenSSL verification callback.
#
# The most common errors are:
#
@@ -956,47 +874,48 @@ module Net
# being dropped by an intervening firewall).
# Errno::ENETUNREACH:: there is no route to that network.
# SocketError:: hostname not known or other socket error.
- # Net::IMAP::ByeResponseError:: we connected to the host, but they
+ # Net::IMAP::ByeResponseError:: we connected to the host, but they
# immediately said goodbye to us.
- def initialize(host, port_or_options = {},
- usessl = false, certs = nil, verify = true)
+ def initialize(host, port = PORT, usessl = false, certs = nil, verify = false)
super()
@host = host
- begin
- options = port_or_options.to_hash
- rescue NoMethodError
- # for backward compatibility
- options = {}
- options[:port] = port_or_options
- if usessl
- options[:ssl] = create_ssl_params(certs, verify)
- end
- end
- @port = options[:port] || (options[:ssl] ? SSL_PORT : PORT)
+ @port = port
@tag_prefix = "RUBY"
@tagno = 0
@parser = ResponseParser.new
- @sock = TCPSocket.open(@host, @port)
- if options[:ssl]
- start_tls_session(options[:ssl])
+ @sock = TCPSocket.open(host, port)
+ if usessl
+ unless defined?(OpenSSL)
+ raise "SSL extension not installed"
+ end
@usessl = true
+
+ # verify the server.
+ context = SSLContext::new()
+ context.ca_file = certs if certs && FileTest::file?(certs)
+ context.ca_path = certs if certs && FileTest::directory?(certs)
+ context.verify_mode = VERIFY_PEER if verify
+ if defined?(VerifyCallbackProc)
+ context.verify_callback = VerifyCallbackProc
+ end
+ @sock = SSLSocket.new(@sock, context)
+ @sock.connect # start ssl session.
+ @sock.post_connection_check(@host) if verify
else
@usessl = false
end
@responses = Hash.new([].freeze)
@tagged_responses = {}
@response_handlers = []
- @tagged_response_arrival = new_cond
- @continuation_request_arrival = new_cond
- @idle_done_cond = nil
+ @response_arrival = new_cond
+ @continuation_request = nil
@logout_command_tag = nil
@debug_output_bol = true
- @exception = nil
@greeting = get_response
if @greeting.name == "BYE"
@sock.close
- raise ByeResponseError, @greeting
+ raise ByeResponseError, @greeting.raw_data
end
@client_thread = Thread.current
@@ -1007,30 +926,20 @@ module Net
def receive_responses
while true
- synchronize do
- @exception = nil
- end
begin
resp = get_response
- rescue Exception => e
- synchronize do
- @sock.close
- @exception = e
- end
- break
- end
- unless resp
- synchronize do
- @exception = EOFError.new("end of file reached")
- end
+ rescue Exception
+ @sock.close
+ @client_thread.raise($!)
break
end
+ break unless resp
begin
synchronize do
case resp
when TaggedResponse
@tagged_responses[resp.tag] = resp
- @tagged_response_arrival.broadcast
+ @response_arrival.broadcast
if resp.tag == @logout_command_tag
return
end
@@ -1042,41 +951,36 @@ module Net
end
if resp.name == "BYE" && @logout_command_tag.nil?
@sock.close
- @exception = ByeResponseError.new(resp)
- break
+ raise ByeResponseError, resp.raw_data
end
when ContinuationRequest
- @continuation_request_arrival.signal
+ @continuation_request = resp
+ @response_arrival.broadcast
end
@response_handlers.each do |handler|
handler.call(resp)
end
end
- rescue Exception => e
- @exception = e
- synchronize do
- @tagged_response_arrival.broadcast
- @continuation_request_arrival.broadcast
- end
+ rescue Exception
+ @client_thread.raise($!)
end
end
- synchronize do
- @tagged_response_arrival.broadcast
- @continuation_request_arrival.broadcast
- end
end
- def get_tagged_response(tag, cmd)
+ def get_tagged_response(tag)
until @tagged_responses.key?(tag)
- raise @exception if @exception
- @tagged_response_arrival.wait
+ @response_arrival.wait
end
+ return pick_up_tagged_response(tag)
+ end
+
+ def pick_up_tagged_response(tag)
resp = @tagged_responses.delete(tag)
case resp.name
when /\A(?:NO)\z/ni
- raise NoResponseError, resp
+ raise NoResponseError, resp.data.text
when /\A(?:BAD)\z/ni
- raise BadResponseError, resp
+ raise BadResponseError, resp.data.text
else
return resp
end
@@ -1111,10 +1015,7 @@ module Net
def send_command(cmd, *args, &block)
synchronize do
- args.each do |i|
- validate_data(i)
- end
- tag = generate_tag
+ tag = Thread.current[:net_imap_tag] = generate_tag
put_string(tag + " " + cmd)
args.each do |i|
put_string(" ")
@@ -1128,7 +1029,7 @@ module Net
add_response_handler(block)
end
begin
- return get_tagged_response(tag, cmd)
+ return get_tagged_response(tag)
ensure
if block
remove_response_handler(block)
@@ -1141,7 +1042,7 @@ module Net
@tagno += 1
return format("%s%04d", @tag_prefix, @tagno)
end
-
+
def put_string(str)
@sock.print(str)
if @@debug
@@ -1157,25 +1058,6 @@ module Net
end
end
- def validate_data(data)
- case data
- when nil
- when String
- when Integer
- if data < 0 || data >= 4294967296
- raise DataFormatError, num.to_s
- end
- when Array
- data.each do |i|
- validate_data(i)
- end
- when Time
- when Symbol
- else
- data.validate
- end
- end
-
def send_data(data)
case data
when nil
@@ -1209,19 +1091,29 @@ module Net
put_string(str)
end
end
-
+
def send_quoted_string(str)
put_string('"' + str.gsub(/["\\]/n, "\\\\\\&") + '"')
end
def send_literal(str)
put_string("{" + str.length.to_s + "}" + CRLF)
- @continuation_request_arrival.wait
- raise @exception if @exception
+ while @continuation_request.nil? &&
+ !@tagged_responses.key?(Thread.current[:net_imap_tag])
+ @response_arrival.wait
+ end
+ if @continuation_request.nil?
+ pick_up_tagged_response(Thread.current[:net_imap_tag])
+ raise ResponseError.new("expected continuation request")
+ end
+ @continuation_request = nil
put_string(str)
end
def send_number_data(num)
+ if num < 0 || num >= 4294967296
+ raise DataFormatError, num.to_s
+ end
put_string(num.to_s)
end
@@ -1330,56 +1222,130 @@ module Net
end
end
- def create_ssl_params(certs = nil, verify = true)
- params = {}
- if certs
- if File.file?(certs)
- params[:ca_file] = certs
- elsif File.directory?(certs)
- params[:ca_path] = certs
+ def self.u16tou8(s)
+ len = s.length
+ if len < 2
+ return ""
+ end
+ buf = ""
+ i = 0
+ while i < len
+ c = s[i] << 8 | s[i + 1]
+ i += 2
+ if c == 0xfeff
+ next
+ elsif c < 0x0080
+ buf.concat(c)
+ elsif c < 0x0800
+ b2 = c & 0x003f
+ b1 = c >> 6
+ buf.concat(b1 | 0xc0)
+ buf.concat(b2 | 0x80)
+ elsif c >= 0xdc00 && c < 0xe000
+ raise DataFormatError, "invalid surrogate detected"
+ elsif c >= 0xd800 && c < 0xdc00
+ if i + 2 > len
+ raise DataFormatError, "invalid surrogate detected"
+ end
+ low = s[i] << 8 | s[i + 1]
+ i += 2
+ if low < 0xdc00 || low > 0xdfff
+ raise DataFormatError, "invalid surrogate detected"
+ end
+ c = (((c & 0x03ff)) << 10 | (low & 0x03ff)) + 0x10000
+ b4 = c & 0x003f
+ b3 = (c >> 6) & 0x003f
+ b2 = (c >> 12) & 0x003f
+ b1 = c >> 18;
+ buf.concat(b1 | 0xf0)
+ buf.concat(b2 | 0x80)
+ buf.concat(b3 | 0x80)
+ buf.concat(b4 | 0x80)
+ else # 0x0800-0xffff
+ b3 = c & 0x003f
+ b2 = (c >> 6) & 0x003f
+ b1 = c >> 12
+ buf.concat(b1 | 0xe0)
+ buf.concat(b2 | 0x80)
+ buf.concat(b3 | 0x80)
+ end
+ end
+ return buf
+ end
+ private_class_method :u16tou8
+
+ def self.u8tou16(s)
+ len = s.length
+ buf = ""
+ i = 0
+ while i < len
+ c = s[i]
+ if (c & 0x80) == 0
+ buf.concat(0x00)
+ buf.concat(c)
+ i += 1
+ elsif (c & 0xe0) == 0xc0 &&
+ len >= 2 &&
+ (s[i + 1] & 0xc0) == 0x80
+ if c == 0xc0 || c == 0xc1
+ raise DataFormatError, format("non-shortest UTF-8 sequence (%02x)", c)
+ end
+ u = ((c & 0x1f) << 6) | (s[i + 1] & 0x3f)
+ buf.concat(u >> 8)
+ buf.concat(u & 0x00ff)
+ i += 2
+ elsif (c & 0xf0) == 0xe0 &&
+ i + 2 < len &&
+ (s[i + 1] & 0xc0) == 0x80 &&
+ (s[i + 2] & 0xc0) == 0x80
+ if c == 0xe0 && s[i + 1] < 0xa0
+ raise DataFormatError, format("non-shortest UTF-8 sequence (%02x)", c)
+ end
+ u = ((c & 0x0f) << 12) | ((s[i + 1] & 0x3f) << 6) | (s[i + 2] & 0x3f)
+ # surrogate chars
+ if u >= 0xd800 && u <= 0xdfff
+ raise DataFormatError, format("none-UTF-16 char detected (%04x)", u)
+ end
+ buf.concat(u >> 8)
+ buf.concat(u & 0x00ff)
+ i += 3
+ elsif (c & 0xf8) == 0xf0 &&
+ i + 3 < len &&
+ (s[i + 1] & 0xc0) == 0x80 &&
+ (s[i + 2] & 0xc0) == 0x80 &&
+ (s[i + 3] & 0xc0) == 0x80
+ if c == 0xf0 && s[i + 1] < 0x90
+ raise DataFormatError, format("non-shortest UTF-8 sequence (%02x)", c)
+ end
+ u = ((c & 0x07) << 18) | ((s[i + 1] & 0x3f) << 12) |
+ ((s[i + 2] & 0x3f) << 6) | (s[i + 3] & 0x3f)
+ if u < 0x10000
+ buf.concat(u >> 8)
+ buf.concat(u & 0x00ff)
+ elsif u < 0x110000
+ high = ((u - 0x10000) >> 10) | 0xd800
+ low = (u & 0x03ff) | 0xdc00
+ buf.concat(high >> 8)
+ buf.concat(high & 0x00ff)
+ buf.concat(low >> 8)
+ buf.concat(low & 0x00ff)
+ else
+ raise DataFormatError, format("none-UTF-16 char detected (%04x)", u)
+ end
+ i += 4
+ else
+ raise DataFormatError, format("illegal UTF-8 sequence (%02x)", c)
end
end
- if verify
- params[:verify_mode] = VERIFY_PEER
- else
- params[:verify_mode] = VERIFY_NONE
- end
- return params
- end
-
- def start_tls_session(params = {})
- unless defined?(OpenSSL)
- raise "SSL extension not installed"
- end
- if @sock.kind_of?(OpenSSL::SSL::SSLSocket)
- raise RuntimeError, "already using SSL"
- end
- begin
- params = params.to_hash
- rescue NoMethodError
- params = {}
- end
- context = SSLContext.new
- context.set_params(params)
- if defined?(VerifyCallbackProc)
- context.verify_callback = VerifyCallbackProc
- end
- @sock = SSLSocket.new(@sock, context)
- @sock.sync_close = true
- @sock.connect
- if context.verify_mode != VERIFY_NONE
- @sock.post_connection_check(@host)
- end
+ return buf
end
+ private_class_method :u8tou16
class RawData # :nodoc:
def send_data(imap)
imap.send(:put_string, @data)
end
- def validate
- end
-
private
def initialize(data)
@@ -1392,9 +1358,6 @@ module Net
imap.send(:put_string, @data)
end
- def validate
- end
-
private
def initialize(data)
@@ -1407,9 +1370,6 @@ module Net
imap.send(:send_quoted_string, @data)
end
- def validate
- end
-
private
def initialize(data)
@@ -1422,9 +1382,6 @@ module Net
imap.send(:send_literal, @data)
end
- def validate
- end
-
private
def initialize(data)
@@ -1437,10 +1394,6 @@ module Net
imap.send(:put_string, format_internal(@data))
end
- def validate
- validate_internal(@data)
- end
-
private
def initialize(data)
@@ -1452,6 +1405,7 @@ module Net
when "*"
return data
when Integer
+ ensure_nz_number(data)
if data == -1
return "*"
else
@@ -1465,23 +1419,6 @@ module Net
when ThreadMember
return data.seqno.to_s +
":" + data.children.collect {|i| format_internal(i).join(",")}
- end
- end
-
- def validate_internal(data)
- case data
- when "*"
- when Integer
- ensure_nz_number(data)
- when Range
- when Array
- data.each do |i|
- validate_internal(i)
- end
- when ThreadMember
- data.children.each do |i|
- validate_internal(i)
- end
else
raise DataFormatError, data.inspect
end
@@ -1497,109 +1434,109 @@ module Net
end
# Net::IMAP::ContinuationRequest represents command continuation requests.
- #
+ #
# The command continuation request response is indicated by a "+" token
# instead of a tag. This form of response indicates that the server is
# ready to accept the continuation of a command from the client. The
# remainder of this response is a line of text.
- #
+ #
# continue_req ::= "+" SPACE (resp_text / base64)
- #
+ #
# ==== Fields:
- #
+ #
# data:: Returns the data (Net::IMAP::ResponseText).
- #
+ #
# raw_data:: Returns the raw data string.
ContinuationRequest = Struct.new(:data, :raw_data)
# Net::IMAP::UntaggedResponse represents untagged responses.
- #
+ #
# Data transmitted by the server to the client and status responses
# that do not indicate command completion are prefixed with the token
# "*", and are called untagged responses.
- #
+ #
# response_data ::= "*" SPACE (resp_cond_state / resp_cond_bye /
# mailbox_data / message_data / capability_data)
- #
+ #
# ==== Fields:
- #
+ #
# name:: Returns the name such as "FLAGS", "LIST", "FETCH"....
- #
+ #
# data:: Returns the data such as an array of flag symbols,
# a ((<Net::IMAP::MailboxList>)) object....
- #
+ #
# raw_data:: Returns the raw data string.
UntaggedResponse = Struct.new(:name, :data, :raw_data)
-
+
# Net::IMAP::TaggedResponse represents tagged responses.
- #
+ #
# The server completion result response indicates the success or
# failure of the operation. It is tagged with the same tag as the
# client command which began the operation.
- #
+ #
# response_tagged ::= tag SPACE resp_cond_state CRLF
- #
+ #
# tag ::= 1*<any ATOM_CHAR except "+">
- #
+ #
# resp_cond_state ::= ("OK" / "NO" / "BAD") SPACE resp_text
- #
+ #
# ==== Fields:
- #
+ #
# tag:: Returns the tag.
- #
+ #
# name:: Returns the name. the name is one of "OK", "NO", "BAD".
- #
+ #
# data:: Returns the data. See ((<Net::IMAP::ResponseText>)).
- #
+ #
# raw_data:: Returns the raw data string.
#
TaggedResponse = Struct.new(:tag, :name, :data, :raw_data)
-
+
# Net::IMAP::ResponseText represents texts of responses.
# The text may be prefixed by the response code.
- #
+ #
# resp_text ::= ["[" resp_text_code "]" SPACE] (text_mime2 / text)
# ;; text SHOULD NOT begin with "[" or "="
- #
+ #
# ==== Fields:
- #
+ #
# code:: Returns the response code. See ((<Net::IMAP::ResponseCode>)).
- #
+ #
# text:: Returns the text.
- #
+ #
ResponseText = Struct.new(:code, :text)
- #
+ #
# Net::IMAP::ResponseCode represents response codes.
- #
+ #
# resp_text_code ::= "ALERT" / "PARSE" /
# "PERMANENTFLAGS" SPACE "(" #(flag / "\*") ")" /
# "READ-ONLY" / "READ-WRITE" / "TRYCREATE" /
# "UIDVALIDITY" SPACE nz_number /
# "UNSEEN" SPACE nz_number /
# atom [SPACE 1*<any TEXT_CHAR except "]">]
- #
+ #
# ==== Fields:
- #
+ #
# name:: Returns the name such as "ALERT", "PERMANENTFLAGS", "UIDVALIDITY"....
- #
+ #
# data:: Returns the data if it exists.
#
ResponseCode = Struct.new(:name, :data)
# Net::IMAP::MailboxList represents contents of the LIST response.
- #
+ #
# mailbox_list ::= "(" #("\Marked" / "\Noinferiors" /
# "\Noselect" / "\Unmarked" / flag_extension) ")"
# SPACE (<"> QUOTED_CHAR <"> / nil) SPACE mailbox
- #
+ #
# ==== Fields:
- #
+ #
# attr:: Returns the name attributes. Each name attribute is a symbol
# capitalized by String#capitalize, such as :Noselect (not :NoSelect).
- #
+ #
# delim:: Returns the hierarchy delimiter
- #
+ #
# name:: Returns the mailbox name.
#
MailboxList = Struct.new(:attr, :delim, :name)
@@ -1608,78 +1545,78 @@ module Net
# This object can also be a response to GETQUOTAROOT. In the syntax
# specification below, the delimiter used with the "#" construct is a
# single space (SPACE).
- #
+ #
# quota_list ::= "(" #quota_resource ")"
- #
+ #
# quota_resource ::= atom SPACE number SPACE number
- #
+ #
# quota_response ::= "QUOTA" SPACE astring SPACE quota_list
- #
+ #
# ==== Fields:
- #
+ #
# mailbox:: The mailbox with the associated quota.
- #
+ #
# usage:: Current storage usage of mailbox.
- #
+ #
# quota:: Quota limit imposed on mailbox.
#
MailboxQuota = Struct.new(:mailbox, :usage, :quota)
# Net::IMAP::MailboxQuotaRoot represents part of the GETQUOTAROOT
# response. (GETQUOTAROOT can also return Net::IMAP::MailboxQuota.)
- #
+ #
# quotaroot_response ::= "QUOTAROOT" SPACE astring *(SPACE astring)
- #
+ #
# ==== Fields:
- #
+ #
# mailbox:: The mailbox with the associated quota.
- #
+ #
# quotaroots:: Zero or more quotaroots that effect the quota on the
# specified mailbox.
#
MailboxQuotaRoot = Struct.new(:mailbox, :quotaroots)
# Net::IMAP::MailboxACLItem represents response from GETACL.
- #
+ #
# acl_data ::= "ACL" SPACE mailbox *(SPACE identifier SPACE rights)
- #
+ #
# identifier ::= astring
- #
+ #
# rights ::= astring
- #
+ #
# ==== Fields:
- #
+ #
# user:: Login name that has certain rights to the mailbox
# that was specified with the getacl command.
- #
+ #
# rights:: The access rights the indicated user has to the
# mailbox.
#
MailboxACLItem = Struct.new(:user, :rights)
# Net::IMAP::StatusData represents contents of the STATUS response.
- #
+ #
# ==== Fields:
- #
+ #
# mailbox:: Returns the mailbox name.
- #
+ #
# attr:: Returns a hash. Each key is one of "MESSAGES", "RECENT", "UIDNEXT",
# "UIDVALIDITY", "UNSEEN". Each value is a number.
- #
+ #
StatusData = Struct.new(:mailbox, :attr)
# Net::IMAP::FetchData represents contents of the FETCH response.
- #
+ #
# ==== Fields:
- #
+ #
# seqno:: Returns the message sequence number.
# (Note: not the unique identifier, even for the UID command response.)
- #
+ #
# attr:: Returns a hash. Each key is a data item name, and each value is
# its value.
- #
+ #
# The current data items are:
- #
+ #
# [BODY]
# A form of BODYSTRUCTURE without extension data.
# [BODY[<section>]<<origin_octet>>]
@@ -1706,67 +1643,67 @@ module Net
# Equivalent to BODY[TEXT].
# [UID]
# A number expressing the unique identifier of the message.
- #
+ #
FetchData = Struct.new(:seqno, :attr)
# Net::IMAP::Envelope represents envelope structures of messages.
- #
+ #
# ==== Fields:
- #
+ #
# date:: Returns a string that represents the date.
- #
+ #
# subject:: Returns a string that represents the subject.
- #
+ #
# from:: Returns an array of Net::IMAP::Address that represents the from.
- #
+ #
# sender:: Returns an array of Net::IMAP::Address that represents the sender.
- #
+ #
# reply_to:: Returns an array of Net::IMAP::Address that represents the reply-to.
- #
+ #
# to:: Returns an array of Net::IMAP::Address that represents the to.
- #
+ #
# cc:: Returns an array of Net::IMAP::Address that represents the cc.
- #
+ #
# bcc:: Returns an array of Net::IMAP::Address that represents the bcc.
- #
+ #
# in_reply_to:: Returns a string that represents the in-reply-to.
- #
+ #
# message_id:: Returns a string that represents the message-id.
- #
+ #
Envelope = Struct.new(:date, :subject, :from, :sender, :reply_to,
:to, :cc, :bcc, :in_reply_to, :message_id)
- #
+ #
# Net::IMAP::Address represents electronic mail addresses.
- #
+ #
# ==== Fields:
- #
+ #
# name:: Returns the phrase from [RFC-822] mailbox.
- #
+ #
# route:: Returns the route from [RFC-822] route-addr.
- #
+ #
# mailbox:: nil indicates end of [RFC-822] group.
# If non-nil and host is nil, returns [RFC-822] group name.
# Otherwise, returns [RFC-822] local-part
- #
+ #
# host:: nil indicates [RFC-822] group syntax.
# Otherwise, returns [RFC-822] domain name.
#
Address = Struct.new(:name, :route, :mailbox, :host)
- #
+ #
# Net::IMAP::ContentDisposition represents Content-Disposition fields.
- #
+ #
# ==== Fields:
- #
+ #
# dsp_type:: Returns the disposition type.
- #
+ #
# param:: Returns a hash that represents parameters of the Content-Disposition
# field.
- #
+ #
ContentDisposition = Struct.new(:dsp_type, :param)
- # Net::IMAP::ThreadMember represents a thread-node returned
+ # Net::IMAP::ThreadMember represents a thread-node returned
# by Net::IMAP#thread
#
# ==== Fields:
@@ -1779,37 +1716,37 @@ module Net
ThreadMember = Struct.new(:seqno, :children)
# Net::IMAP::BodyTypeBasic represents basic body structures of messages.
- #
+ #
# ==== Fields:
- #
+ #
# media_type:: Returns the content media type name as defined in [MIME-IMB].
- #
+ #
# subtype:: Returns the content subtype name as defined in [MIME-IMB].
- #
+ #
# param:: Returns a hash that represents parameters as defined in [MIME-IMB].
- #
+ #
# content_id:: Returns a string giving the content id as defined in [MIME-IMB].
- #
+ #
# description:: Returns a string giving the content description as defined in
# [MIME-IMB].
- #
+ #
# encoding:: Returns a string giving the content transfer encoding as defined in
# [MIME-IMB].
- #
+ #
# size:: Returns a number giving the size of the body in octets.
- #
+ #
# md5:: Returns a string giving the body MD5 value as defined in [MD5].
- #
+ #
# disposition:: Returns a Net::IMAP::ContentDisposition object giving
# the content disposition.
- #
+ #
# language:: Returns a string or an array of strings giving the body
# language value as defined in [LANGUAGE-TAGS].
- #
+ #
# extension:: Returns extension data.
- #
+ #
# multipart?:: Returns false.
- #
+ #
class BodyTypeBasic < Struct.new(:media_type, :subtype,
:param, :content_id,
:description, :encoding, :size,
@@ -1820,7 +1757,7 @@ module Net
end
# Obsolete: use +subtype+ instead. Calling this will
- # generate a warning message to +stderr+, then return
+ # generate a warning message to +stderr+, then return
# the value of +subtype+.
def media_subtype
$stderr.printf("warning: media_subtype is obsolete.\n")
@@ -1830,13 +1767,13 @@ module Net
end
# Net::IMAP::BodyTypeText represents TEXT body structures of messages.
- #
+ #
# ==== Fields:
- #
+ #
# lines:: Returns the size of the body in text lines.
- #
+ #
# And Net::IMAP::BodyTypeText has all fields of Net::IMAP::BodyTypeBasic.
- #
+ #
class BodyTypeText < Struct.new(:media_type, :subtype,
:param, :content_id,
:description, :encoding, :size,
@@ -1848,7 +1785,7 @@ module Net
end
# Obsolete: use +subtype+ instead. Calling this will
- # generate a warning message to +stderr+, then return
+ # generate a warning message to +stderr+, then return
# the value of +subtype+.
def media_subtype
$stderr.printf("warning: media_subtype is obsolete.\n")
@@ -1858,13 +1795,13 @@ module Net
end
# Net::IMAP::BodyTypeMessage represents MESSAGE/RFC822 body structures of messages.
- #
+ #
# ==== Fields:
- #
+ #
# envelope:: Returns a Net::IMAP::Envelope giving the envelope structure.
- #
+ #
# body:: Returns an object giving the body structure.
- #
+ #
# And Net::IMAP::BodyTypeMessage has all methods of Net::IMAP::BodyTypeText.
#
class BodyTypeMessage < Struct.new(:media_type, :subtype,
@@ -1878,7 +1815,7 @@ module Net
end
# Obsolete: use +subtype+ instead. Calling this will
- # generate a warning message to +stderr+, then return
+ # generate a warning message to +stderr+, then return
# the value of +subtype+.
def media_subtype
$stderr.printf("warning: media_subtype is obsolete.\n")
@@ -1887,29 +1824,29 @@ module Net
end
end
- # Net::IMAP::BodyTypeMultipart represents multipart body structures
+ # Net::IMAP::BodyTypeMultipart represents multipart body structures
# of messages.
- #
+ #
# ==== Fields:
- #
+ #
# media_type:: Returns the content media type name as defined in [MIME-IMB].
- #
+ #
# subtype:: Returns the content subtype name as defined in [MIME-IMB].
- #
+ #
# parts:: Returns multiple parts.
- #
+ #
# param:: Returns a hash that represents parameters as defined in [MIME-IMB].
- #
+ #
# disposition:: Returns a Net::IMAP::ContentDisposition object giving
# the content disposition.
- #
+ #
# language:: Returns a string or an array of strings giving the body
# language value as defined in [LANGUAGE-TAGS].
- #
+ #
# extension:: Returns extension data.
- #
+ #
# multipart?:: Returns true.
- #
+ #
class BodyTypeMultipart < Struct.new(:media_type, :subtype,
:parts,
:param, :disposition, :language,
@@ -1919,7 +1856,7 @@ module Net
end
# Obsolete: use +subtype+ instead. Calling this will
- # generate a warning message to +stderr+, then return
+ # generate a warning message to +stderr+, then return
# the value of +subtype+.
def media_subtype
$stderr.printf("warning: media_subtype is obsolete.\n")
@@ -2720,35 +2657,35 @@ module Net
def thread_branch(token)
rootmember = nil
lastmember = nil
-
+
while true
shift_token # ignore first T_LPAR
token = lookahead
-
+
case token.symbol
when T_NUMBER
# new member
newmember = ThreadMember.new(number, [])
if rootmember.nil?
rootmember = newmember
- else
+ else
lastmember.children << newmember
- end
+ end
lastmember = newmember
- when T_SPACE
- # do nothing
+ when T_SPACE
+ # do nothing
when T_LPAR
if rootmember.nil?
# dummy member
lastmember = rootmember = ThreadMember.new(nil, [])
- end
-
+ end
+
lastmember.children << thread_branch(token)
when T_RPAR
- break
- end
+ break
+ end
end
-
+
return rootmember
end
@@ -2825,16 +2762,11 @@ module Net
match(T_SPACE)
result = ResponseCode.new(name, number)
else
- token = lookahead
- if token.symbol == T_SPACE
- shift_token
- @lex_state = EXPR_CTEXT
- token = match(T_TEXT)
- @lex_state = EXPR_BEG
- result = ResponseCode.new(name, token.value)
- else
- result = ResponseCode.new(name, nil)
- end
+ match(T_SPACE)
+ @lex_state = EXPR_CTEXT
+ token = match(T_TEXT)
+ @lex_state = EXPR_BEG
+ result = ResponseCode.new(name, token.value)
end
match(T_RBRA)
@lex_state = EXPR_RTEXT
@@ -3173,7 +3105,7 @@ module Net
parse_error("unknown token - %s", $&.dump)
end
else
- parse_error("invalid @lex_state - %s", @lex_state.inspect)
+ parse_error("illegal @lex_state - %s", @lex_state.inspect)
end
end
@@ -3217,22 +3149,6 @@ module Net
end
add_authenticator "LOGIN", LoginAuthenticator
- # Authenticator for the "PLAIN" authentication type. See
- # #authenticate().
- class PlainAuthenticator
- def process(data)
- return "\0#{@user}\0#{@password}"
- end
-
- private
-
- def initialize(user, password)
- @user = user
- @password = password
- end
- end
- add_authenticator "PLAIN", PlainAuthenticator
-
# Authenticator for the "CRAM-MD5" authentication type. See
# #authenticate().
class CramMD5Authenticator
@@ -3256,8 +3172,8 @@ module Net
k_ipad = key + "\0" * (64 - key.length)
k_opad = key + "\0" * (64 - key.length)
for i in 0..63
- k_ipad[i] = (k_ipad[i].ord ^ 0x36).chr
- k_opad[i] = (k_opad[i].ord ^ 0x5c).chr
+ k_ipad[i] ^= 0x36
+ k_opad[i] ^= 0x5c
end
digest = Digest::MD5.digest(k_ipad + text)
@@ -3267,106 +3183,6 @@ module Net
end
add_authenticator "CRAM-MD5", CramMD5Authenticator
- # Authenticator for the "DIGEST-MD5" authentication type. See
- # #authenticate().
- class DigestMD5Authenticator
- def process(challenge)
- case @stage
- when STAGE_ONE
- @stage = STAGE_TWO
- sparams = {}
- c = StringScanner.new(challenge)
- while c.scan(/(?:\s*,)?\s*(\w+)=("(?:[^\\"]+|\\.)*"|[^,]+)\s*/)
- k, v = c[1], c[2]
- if v =~ /^"(.*)"$/
- v = $1
- if v =~ /,/
- v = v.split(',')
- end
- end
- sparams[k] = v
- end
-
- raise DataFormatError, "Bad Challenge: '#{challenge}'" unless c.rest.size == 0
- raise Error, "Server does not support auth (qop = #{sparams['qop'].join(',')})" unless sparams['qop'].include?("auth")
-
- response = {
- :nonce => sparams['nonce'],
- :username => @user,
- :realm => sparams['realm'],
- :cnonce => Digest::MD5.hexdigest("%.15f:%.15f:%d" % [Time.now.to_f, rand, Process.pid.to_s]),
- :'digest-uri' => 'imap/' + sparams['realm'],
- :qop => 'auth',
- :maxbuf => 65535,
- :nc => "%08d" % nc(sparams['nonce']),
- :charset => sparams['charset'],
- }
-
- response[:authzid] = @authname unless @authname.nil?
-
- # now, the real thing
- a0 = Digest::MD5.digest( [ response.values_at(:username, :realm), @password ].join(':') )
-
- a1 = [ a0, response.values_at(:nonce,:cnonce) ].join(':')
- a1 << ':' + response[:authzid] unless response[:authzid].nil?
-
- a2 = "AUTHENTICATE:" + response[:'digest-uri']
- a2 << ":00000000000000000000000000000000" if response[:qop] and response[:qop] =~ /^auth-(?:conf|int)$/
-
- response[:response] = Digest::MD5.hexdigest(
- [
- Digest::MD5.hexdigest(a1),
- response.values_at(:nonce, :nc, :cnonce, :qop),
- Digest::MD5.hexdigest(a2)
- ].join(':')
- )
-
- return response.keys.map {|key| qdval(key.to_s, response[key]) }.join(',')
- when STAGE_TWO
- @stage = nil
- # if at the second stage, return an empty string
- if challenge =~ /rspauth=/
- return ''
- else
- raise ResponseParseError, challenge
- end
- else
- raise ResponseParseError, challenge
- end
- end
-
- def initialize(user, password, authname = nil)
- @user, @password, @authname = user, password, authname
- @nc, @stage = {}, STAGE_ONE
- end
-
- private
-
- STAGE_ONE = :stage_one
- STAGE_TWO = :stage_two
-
- def nc(nonce)
- if @nc.has_key? nonce
- @nc[nonce] = @nc[nonce] + 1
- else
- @nc[nonce] = 1
- end
- return @nc[nonce]
- end
-
- # some responses need quoting
- def qdval(k, v)
- return if k.nil? or v.nil?
- if %w"username authzid realm nonce cnonce digest-uri qop".include? k
- v.gsub!(/([\\"])/, "\\\1")
- return '%s="%s"' % [k, v]
- else
- return '%s=%s' % [k, v]
- end
- end
- end
- add_authenticator "DIGEST-MD5", DigestMD5Authenticator
-
# Superclass of IMAP errors.
class Error < StandardError
end
@@ -3382,16 +3198,6 @@ module Net
# Superclass of all errors used to encapsulate "fail" responses
# from the server.
class ResponseError < Error
-
- # The response that caused this error
- attr_accessor :response
-
- def initialize(response)
- @response = response
-
- super @response.data.text
- end
-
end
# Error raised upon a "NO" response from the server, indicating
@@ -3405,7 +3211,7 @@ module Net
class BadResponseError < ResponseError
end
- # Error raised upon a "BYE" response from the server, indicating
+ # Error raised upon a "BYE" response from the server, indicating
# that the client is not being allowed to login, or has been timed
# out due to inactivity.
class ByeResponseError < ResponseError
@@ -3490,8 +3296,9 @@ EOF
usage
exit(1)
end
-
- imap = Net::IMAP.new($host, :port => $port, :ssl => $ssl)
+ $port ||= $ssl ? 993 : 143
+
+ imap = Net::IMAP.new($host, $port, $ssl)
begin
password = get_password
imap.authenticate($auth, $user, password)
diff --git a/lib/net/pop.rb b/lib/net/pop.rb
index 6a45e3b5f0..82cc9a747b 100644
--- a/lib/net/pop.rb
+++ b/lib/net/pop.rb
@@ -3,20 +3,20 @@
# Copyright (c) 1999-2007 Yukihiro Matsumoto.
#
# Copyright (c) 1999-2007 Minero Aoki.
-#
+#
# Written & maintained by Minero Aoki <aamine@loveruby.net>.
#
# Documented by William Webber and Minero Aoki.
-#
+#
# This program is free software. You can re-distribute and/or
# modify this program under the same terms as Ruby itself,
# Ruby Distribute License.
-#
+#
# NOTE: You can find Japanese version of this document at:
# http://www.ruby-lang.org/ja/man/html/net_pop.html
-#
+#
# $Id$
-#
+#
# See Net::POP3 for documentation.
#
@@ -25,7 +25,7 @@ require 'digest/md5'
require 'timeout'
begin
- require "openssl"
+ require "openssl/ssl"
rescue LoadError
end
@@ -45,25 +45,25 @@ module Net
# = Net::POP3
#
# == What is This Library?
- #
- # This library provides functionality for retrieving
+ #
+ # This library provides functionality for retrieving
# email via POP3, the Post Office Protocol version 3. For details
# of POP3, see [RFC1939] (http://www.ietf.org/rfc/rfc1939.txt).
- #
+ #
# == Examples
- #
- # === Retrieving Messages
- #
- # This example retrieves messages from the server and deletes them
+ #
+ # === Retrieving Messages
+ #
+ # This example retrieves messages from the server and deletes them
# on the server.
#
# Messages are written to files named 'inbox/1', 'inbox/2', ....
# Replace 'pop.example.com' with your POP3 server address, and
# 'YourAccount' and 'YourPassword' with the appropriate account
# details.
- #
+ #
# require 'net/pop'
- #
+ #
# pop = Net::POP3.new('pop.example.com')
# pop.start('YourAccount', 'YourPassword') # (1)
# if pop.mails.empty?
@@ -80,19 +80,19 @@ module Net
# puts "#{pop.mails.size} mails popped."
# end
# pop.finish # (3)
- #
+ #
# 1. Call Net::POP3#start and start POP session.
# 2. Access messages by using POP3#each_mail and/or POP3#mails.
# 3. Close POP session by calling POP3#finish or use the block form of #start.
- #
+ #
# === Shortened Code
- #
+ #
# The example above is very verbose. You can shorten the code by using
# some utility methods. First, the block form of Net::POP3.start can
# be used instead of POP3.new, POP3#start and POP3#finish.
- #
+ #
# require 'net/pop'
- #
+ #
# Net::POP3.start('pop.example.com', 110,
# 'YourAccount', 'YourPassword') do |pop|
# if pop.mails.empty?
@@ -109,11 +109,11 @@ module Net
# puts "#{pop.mails.size} mails popped."
# end
# end
- #
+ #
# POP3#delete_all is an alternative for #each_mail and #delete.
- #
+ #
# require 'net/pop'
- #
+ #
# Net::POP3.start('pop.example.com', 110,
# 'YourAccount', 'YourPassword') do |pop|
# if pop.mails.empty?
@@ -128,11 +128,11 @@ module Net
# end
# end
# end
- #
+ #
# And here is an even shorter example.
- #
+ #
# require 'net/pop'
- #
+ #
# i = 0
# Net::POP3.delete_all('pop.example.com', 110,
# 'YourAccount', 'YourPassword') do |m|
@@ -141,14 +141,14 @@ module Net
# end
# i += 1
# end
- #
+ #
# === Memory Space Issues
- #
+ #
# All the examples above get each message as one big string.
# This example avoids this.
- #
+ #
# require 'net/pop'
- #
+ #
# i = 1
# Net::POP3.delete_all('pop.example.com', 110,
# 'YourAccount', 'YourPassword') do |m|
@@ -159,41 +159,41 @@ module Net
# i += 1
# end
# end
- #
+ #
# === Using APOP
- #
+ #
# The net/pop library supports APOP authentication.
# To use APOP, use the Net::APOP class instead of the Net::POP3 class.
# You can use the utility method, Net::POP3.APOP(). For example:
- #
+ #
# require 'net/pop'
- #
+ #
# # Use APOP authentication if $isapop == true
# pop = Net::POP3.APOP($is_apop).new('apop.example.com', 110)
# pop.start(YourAccount', 'YourPassword') do |pop|
# # Rest of the code is the same.
# end
- #
+ #
# === Fetch Only Selected Mail Using 'UIDL' POP Command
- #
+ #
# If your POP server provides UIDL functionality,
# you can grab only selected mails from the POP server.
# e.g.
- #
+ #
# def need_pop?( id )
# # determine if we need pop this mail...
# end
- #
+ #
# Net::POP3.start('pop.example.com', 110,
# 'Your account', 'Your password') do |pop|
# pop.mails.select { |m| need_pop?(m.unique_id) }.each do |m|
# do_something(m.pop)
# end
# end
- #
+ #
# The POPMail#unique_id() method returns the unique-id of the message as a
# String. Normally the unique-id is a hash of the message.
- #
+ #
class POP3 < Protocol
Revision = %q$Revision$.split[1]
@@ -210,7 +210,7 @@ module Net
def POP3.default_pop3_port
110
end
-
+
# The default port for POP3S connections, port 995
def POP3.default_pop3s_port
995
@@ -375,7 +375,7 @@ module Net
# Session management
#
- # Creates a new POP3 object and open the connection. Equivalent to
+ # Creates a new POP3 object and open the connection. Equivalent to
#
# Net::POP3.new(address, port, isapop).start(account, password)
#
@@ -396,7 +396,7 @@ module Net
isapop = false, &block) # :yield: pop
new(address, port, isapop).start(account, password, &block)
end
-
+
# Creates a new POP3 object.
#
# +address+ is the hostname or ip address of your POP3 server.
@@ -412,7 +412,7 @@ module Net
@ssl_params = POP3.ssl_params
@port = port
@apop = isapop
-
+
@command = nil
@socket = nil
@started = false
@@ -434,7 +434,7 @@ module Net
def use_ssl?
return !@ssl_params.nil?
end
-
+
# call-seq:
# Net::POP#enable_ssl(params = {})
#
@@ -451,7 +451,7 @@ module Net
@port = port || @port
end
end
-
+
def disable_ssl
@ssl_params = nil
end
@@ -635,7 +635,7 @@ module Net
# Yields each message to the passed-in block in turn.
# Equivalent to:
- #
+ #
# pop3.mails.each do |popmail|
# ....
# end
@@ -683,8 +683,9 @@ module Net
end
def set_all_uids #:nodoc: internal use only (called from POPMail#uidl)
- uidl = command().uidl
- @mails.each {|m| m.uid = uidl[m.number] }
+ command().uidl.each do |num, uid|
+ @mails.find {|m| m.number == num }.uid = uid
+ end
end
def logging(msg)
@@ -742,7 +743,7 @@ module Net
#
# This method fetches the message. If called with a block, the
# message is yielded to the block one chunk at a time. If called
- # without a block, the message is returned as a String. The optional
+ # without a block, the message is returned as a String. The optional
# +dest+ argument will be prepended to the returned String; this
# argument is essentially obsolete.
#
@@ -753,7 +754,7 @@ module Net
# n = 1
# pop.mails.each do |popmail|
# File.open("inbox/#{n}", 'w') do |f|
- # f.write popmail.pop
+ # f.write popmail.pop
# end
# popmail.delete
# n += 1
@@ -792,7 +793,7 @@ module Net
alias all pop #:nodoc: obsolete
alias mail pop #:nodoc: obsolete
- # Fetches the message header and +lines+ lines of body.
+ # Fetches the message header and +lines+ lines of body.
#
# The optional +dest+ argument is obsolete.
#
@@ -804,7 +805,7 @@ module Net
dest
end
- # Fetches the message header.
+ # Fetches the message header.
#
# The optional +dest+ argument is obsolete.
#
@@ -870,11 +871,9 @@ module Net
@socket = sock
@error_occured = false
res = check_response(critical { recv_response() })
- @apop_stamp = res.slice(/<[!-~]+@[!-~]+>/)
+ @apop_stamp = res.slice(/<.+>/)
end
- attr_reader :socket
-
def inspect
"#<#{self.class} socket=#{@socket}>"
end
@@ -933,7 +932,7 @@ module Net
@socket.each_message_chunk(&block)
}
end
-
+
def dele(num)
check_response(critical { get_response('DELE %d', num) })
end
diff --git a/lib/net/protocol.rb b/lib/net/protocol.rb
index 2a6cfb4f61..dc23c14dfa 100644
--- a/lib/net/protocol.rb
+++ b/lib/net/protocol.rb
@@ -2,8 +2,8 @@
# = net/protocol.rb
#
#--
-# Copyright (c) 1999-2004 Yukihiro Matsumoto
-# Copyright (c) 1999-2004 Minero Aoki
+# Copyright (c) 1999-2005 Yukihiro Matsumoto
+# Copyright (c) 1999-2005 Minero Aoki
#
# written and maintained by Minero Aoki <aamine@loveruby.net>
#
@@ -121,7 +121,7 @@ module Net # :nodoc:
return rbuf_consume(@rbuf.size)
end
end
-
+
def readline
readuntil("\n").chop
end
@@ -131,23 +131,9 @@ module Net # :nodoc:
BUFSIZE = 1024 * 16
def rbuf_fill
- begin
- @rbuf << @io.read_nonblock(BUFSIZE)
- rescue IO::WaitReadable
- if IO.select([@io], nil, nil, @read_timeout)
- retry
- else
- raise Timeout::Error
- end
- rescue IO::WaitWritable
- # OpenSSL::Buffering#read_nonblock may fail with IO::WaitWritable.
- # http://www.openssl.org/support/faq.html#PROG10
- if IO.select(nil, [@io], nil, @read_timeout)
- retry
- else
- raise Timeout::Error
- end
- end
+ timeout(@read_timeout) {
+ @rbuf << @io.sysread(BUFSIZE)
+ }
end
def rbuf_consume(len)
@@ -216,6 +202,16 @@ module Net # :nodoc:
class InternetMessageIO < BufferedIO #:nodoc: internal use only
+ def InternetMessageIO.old_open(addr, port,
+ open_timeout = nil, read_timeout = nil, debug_output = nil)
+ debug_output << "opening connection to #{addr}...\n" if debug_output
+ s = timeout(open_timeout) { TCPsocket.new(addr, port) }
+ io = new(s)
+ io.read_timeout = read_timeout
+ io.debug_output = debug_output
+ io
+ end
+
def initialize(io)
super
@wbuf = nil
@@ -236,7 +232,7 @@ module Net # :nodoc:
LOG_on()
LOG "read message (#{read_bytes} bytes)"
end
-
+
# *library private* (cannot handle 'break')
def each_list_item
while (str = readuntil("\r\n")) != ".\r\n"
@@ -321,8 +317,8 @@ module Net # :nodoc:
yield
end
else # generic reader
- src.each do |str|
- buf << str
+ src.each do |s|
+ buf << s
yield if buf.size > 1024
end
yield unless buf.empty?
diff --git a/lib/net/smtp.rb b/lib/net/smtp.rb
index 8c50e28dd0..57dee9a496 100644
--- a/lib/net/smtp.rb
+++ b/lib/net/smtp.rb
@@ -1,23 +1,23 @@
# = net/smtp.rb
-#
+#
# Copyright (c) 1999-2007 Yukihiro Matsumoto.
#
# Copyright (c) 1999-2007 Minero Aoki.
-#
+#
# Written & maintained by Minero Aoki <aamine@loveruby.net>.
#
# Documented by William Webber and Minero Aoki.
-#
+#
# This program is free software. You can re-distribute and/or
# modify this program under the same terms as Ruby itself.
-#
+#
# NOTE: You can find Japanese version of this document at:
# http://www.ruby-lang.org/ja/man/html/net_smtp.html
-#
+#
# $Id$
#
-# See Net::SMTP for documentation.
-#
+# See Net::SMTP for documentation.
+#
require 'net/protocol'
require 'digest/md5'
@@ -69,103 +69,103 @@ module Net
# = Net::SMTP
#
# == What is This Library?
- #
+ #
# This library provides functionality to send internet
# mail via SMTP, the Simple Mail Transfer Protocol. For details of
# SMTP itself, see [RFC2821] (http://www.ietf.org/rfc/rfc2821.txt).
- #
+ #
# == What is This Library NOT?
- #
+ #
# This library does NOT provide functions to compose internet mails.
# You must create them by yourself. If you want better mail support,
# try RubyMail or TMail. You can get both libraries from RAA.
# (http://www.ruby-lang.org/en/raa.html)
- #
+ #
# FYI: the official documentation on internet mail is: [RFC2822] (http://www.ietf.org/rfc/rfc2822.txt).
- #
+ #
# == Examples
- #
+ #
# === Sending Messages
- #
+ #
# You must open a connection to an SMTP server before sending messages.
- # The first argument is the address of your SMTP server, and the second
- # argument is the port number. Using SMTP.start with a block is the simplest
- # way to do this. This way, the SMTP connection is closed automatically
+ # The first argument is the address of your SMTP server, and the second
+ # argument is the port number. Using SMTP.start with a block is the simplest
+ # way to do this. This way, the SMTP connection is closed automatically
# after the block is executed.
- #
+ #
# require 'net/smtp'
# Net::SMTP.start('your.smtp.server', 25) do |smtp|
# # Use the SMTP object smtp only in this block.
# end
- #
+ #
# Replace 'your.smtp.server' with your SMTP server. Normally
# your system manager or internet provider supplies a server
# for you.
- #
+ #
# Then you can send messages.
- #
+ #
# msgstr = <<END_OF_MESSAGE
# From: Your Name <your@mail.address>
# To: Destination Address <someone@example.com>
# Subject: test message
# Date: Sat, 23 Jun 2001 16:26:43 +0900
# Message-Id: <unique.message.id.string@example.com>
- #
+ #
# This is a test message.
# END_OF_MESSAGE
- #
+ #
# require 'net/smtp'
# Net::SMTP.start('your.smtp.server', 25) do |smtp|
# smtp.send_message msgstr,
# 'your@mail.address',
# 'his_addess@example.com'
# end
- #
+ #
# === Closing the Session
- #
- # You MUST close the SMTP session after sending messages, by calling
+ #
+ # You MUST close the SMTP session after sending messages, by calling
# the #finish method:
- #
+ #
# # using SMTP#finish
# smtp = Net::SMTP.start('your.smtp.server', 25)
# smtp.send_message msgstr, 'from@address', 'to@address'
# smtp.finish
- #
+ #
# You can also use the block form of SMTP.start/SMTP#start. This closes
# the SMTP session automatically:
- #
+ #
# # using block form of SMTP.start
# Net::SMTP.start('your.smtp.server', 25) do |smtp|
# smtp.send_message msgstr, 'from@address', 'to@address'
# end
- #
+ #
# I strongly recommend this scheme. This form is simpler and more robust.
- #
+ #
# === HELO domain
- #
+ #
# In almost all situations, you must provide a third argument
# to SMTP.start/SMTP#start. This is the domain name which you are on
# (the host to send mail from). It is called the "HELO domain".
# The SMTP server will judge whether it should send or reject
# the SMTP session by inspecting the HELO domain.
- #
+ #
# Net::SMTP.start('your.smtp.server', 25,
# 'mail.from.domain') { |smtp| ... }
- #
+ #
# === SMTP Authentication
- #
+ #
# The Net::SMTP class supports three authentication schemes;
# PLAIN, LOGIN and CRAM MD5. (SMTP Authentication: [RFC2554])
- # To use SMTP authentication, pass extra arguments to
+ # To use SMTP authentication, pass extra arguments to
# SMTP.start/SMTP#start.
- #
+ #
# # PLAIN
# Net::SMTP.start('your.smtp.server', 25, 'mail.from.domain',
# 'Your Account', 'Your Password', :plain)
# # LOGIN
# Net::SMTP.start('your.smtp.server', 25, 'mail.from.domain',
# 'Your Account', 'Your Password', :login)
- #
+ #
# # CRAM MD5
# Net::SMTP.start('your.smtp.server', 25, 'mail.from.domain',
# 'Your Account', 'Your Password', :cram_md5)
@@ -196,7 +196,7 @@ module Net
def SMTP.default_ssl_context
OpenSSL::SSL::SSLContext.new
end
-
+
#
# Creates a new Net::SMTP object.
#
@@ -223,7 +223,7 @@ module Net
@starttls = false
@ssl_context = nil
end
-
+
# Provide human-readable stringification of class state.
def inspect
"#<#{self.class} #{@address}:#{@port} started=#{@started}>"
@@ -235,7 +235,7 @@ module Net
end
#
- # Set whether to use ESMTP or not. This should be done before
+ # Set whether to use ESMTP or not. This should be done before
# calling #start. Note that if #start is called in ESMTP mode,
# and the connection fails due to a ProtocolError, the SMTP
# object will automatically switch to plain SMTP mode and
@@ -310,7 +310,7 @@ module Net
end
alias enable_ssl enable_tls
-
+
# Disables SMTP/TLS for this object. Must be called before the
# connection is established to have any effect.
def disable_tls
@@ -336,7 +336,7 @@ module Net
def starttls_auto?
@starttls == :auto
end
-
+
# Enables SMTP/TLS (STARTTLS) for this object.
# +context+ is a OpenSSL::SSL::SSLContext object.
def enable_starttls(context = SMTP.default_ssl_context)
@@ -413,7 +413,7 @@ module Net
# Creates a new Net::SMTP object and connects to the server.
#
# This method is equivalent to:
- #
+ #
# Net::SMTP.new(address, port).start(helo_domain, account, password, authtype)
#
# === Example
@@ -437,7 +437,7 @@ module Net
# +port+ is the port to connect to; it defaults to port 25.
#
# +helo+ is the _HELO_ _domain_ provided by the client to the
- # server (see overview comments); it defaults to 'localhost'.
+ # server (see overview comments); it defaults to 'localhost.localdomain'.
#
# The remaining arguments are used for SMTP authentication, if required
# or desired. +user+ is the account name; +secret+ is your password
@@ -457,7 +457,7 @@ module Net
# * IOError
# * TimeoutError
#
- def SMTP.start(address, port = nil, helo = 'localhost',
+ def SMTP.start(address, port = nil, helo = 'localhost.localdomain',
user = nil, secret = nil, authtype = nil,
&block) # :yield: smtp
new(address, port).start(helo, user, secret, authtype, &block)
@@ -476,33 +476,33 @@ module Net
# +helo+ is the _HELO_ _domain_ that you'll dispatch mails from; see
# the discussion in the overview notes.
#
- # If both of +user+ and +secret+ are given, SMTP authentication
- # will be attempted using the AUTH command. +authtype+ specifies
+ # If both of +user+ and +secret+ are given, SMTP authentication
+ # will be attempted using the AUTH command. +authtype+ specifies
# the type of authentication to attempt; it must be one of
# :login, :plain, and :cram_md5. See the notes on SMTP Authentication
- # in the overview.
+ # in the overview.
#
# === Block Usage
#
# When this methods is called with a block, the newly-started SMTP
# object is yielded to the block, and automatically closed after
- # the block call finishes. Otherwise, it is the caller's
+ # the block call finishes. Otherwise, it is the caller's
# responsibility to close the session when finished.
#
# === Example
#
# This is very similar to the class method SMTP.start.
#
- # require 'net/smtp'
+ # require 'net/smtp'
# smtp = Net::SMTP.new('smtp.mail.server', 25)
# smtp.start(helo_domain, account, password, authtype) do |smtp|
# smtp.send_message msgstr, 'from@example.com', ['dest@example.com']
- # end
+ # end
#
# The primary use of this method (as opposed to SMTP.start)
# is probably to set debugging (#set_debug_output) or ESMTP
# (#esmtp=), which must be done before the session is
- # started.
+ # started.
#
# === Errors
#
@@ -518,7 +518,7 @@ module Net
# * IOError
# * TimeoutError
#
- def start(helo = 'localhost',
+ def start(helo = 'localhost.localdomain',
user = nil, secret = nil, authtype = nil) # :yield: smtp
if block_given?
begin
@@ -548,7 +548,7 @@ module Net
check_auth_method(authtype || DEFAULT_AUTH_TYPE)
check_auth_args user, secret
end
- s = timeout(@open_timeout) { TCPSocket.open(@address, @port) }
+ s = timeout(@open_timeout) { TCPSocket.open(@address, @port) }
logging "Connection opened: #{@address}:#{@port}"
@socket = new_internet_message_io(tls? ? tlsconnect(s) : s)
check_response critical { recv_response() }
@@ -621,7 +621,7 @@ module Net
#
# Sends +msgstr+ as a message. Single CR ("\r") and LF ("\n") found
# in the +msgstr+, are converted into the CR LF pair. You cannot send a
- # binary message with this method. +msgstr+ should include both
+ # binary message with this method. +msgstr+ should include both
# the message headers and body.
#
# +from_addr+ is a String representing the source mail address.
@@ -769,7 +769,7 @@ module Net
"auth_#{type.to_s.downcase}".intern
end
- def check_auth_args(user, secret, authtype = DEFAULT_AUTH_TYPE)
+ def check_auth_args(user, secret)
unless user
raise ArgumentError, 'SMTP-AUTH requested but missing user name'
end
@@ -837,7 +837,7 @@ module Net
def rcptto(to_addr)
if $SAFE > 0
- raise SecurityError, 'tainted to_addr' if to_addr.tainted?
+ raise SecurityError, 'tainted to_addr' if to.tainted?
end
getok("RCPT TO:<#{to_addr}>")
end
@@ -852,7 +852,7 @@ module Net
# From: john@example.com
# To: betty@example.com
# Subject: I found a bug
- #
+ #
# Check vm.c:58879.
# EndMessage
#
diff --git a/lib/net/telnet.rb b/lib/net/telnet.rb
index 98285a944b..73471c3327 100644
--- a/lib/net/telnet.rb
+++ b/lib/net/telnet.rb
@@ -1,7 +1,7 @@
# = net/telnet.rb - Simple Telnet Client Library
-#
+#
# Author:: Wakou Aoyama <wakou@ruby-lang.org>
-# Documentation:: William Webber and Wakou Aoyama
+# Documentation:: William Webber and Wakou Aoyama
#
# This file holds the class Net::Telnet, which provides client-side
# telnet functionality.
@@ -13,7 +13,7 @@ require "socket"
require "delegate"
require "timeout"
require "English"
-
+
module Net
#
@@ -50,11 +50,11 @@ module Net
# have to handle authentication yourself.
#
# For some protocols, it will be possible to specify the +Prompt+
- # option once when you create the Telnet object and use #cmd() calls;
+ # option once when you create the Telnet object and use #cmd() calls;
# for others, you will have to specify the response sequence to
# look for as the Match option to every #cmd() call, or call
- # #puts() and #waitfor() directly; for yet others, you will have
- # to use #sysread() instead of #waitfor() and parse server
+ # #puts() and #waitfor() directly; for yet others, you will have
+ # to use #sysread() instead of #waitfor() and parse server
# responses yourself.
#
# It is worth noting that when you create a new Net::Telnet object,
@@ -63,21 +63,21 @@ module Net
# to already open sockets, or to any read-write IO object. This
# can be useful, for instance, for setting up a test fixture for
# unit testing.
- #
+ #
# == Examples
- #
+ #
# === Log in and send a command, echoing all output to stdout
- #
+ #
# localhost = Net::Telnet::new("Host" => "localhost",
# "Timeout" => 10,
# "Prompt" => /[$%#>] \z/n)
# localhost.login("username", "password") { |c| print c }
# localhost.cmd("command") { |c| print c }
# localhost.close
- #
- #
+ #
+ #
# === Check a POP server to see if you have mail
- #
+ #
# pop = Net::Telnet::new("Host" => "your_destination_host_here",
# "Port" => 110,
# "Telnetmode" => false,
@@ -97,73 +97,73 @@ module Net
# :stopdoc:
IAC = 255.chr # "\377" # "\xff" # interpret as command
- DONT = 254.chr # "\376" # "\xfe" # you are not to use option
- DO = 253.chr # "\375" # "\xfd" # please, you use option
- WONT = 252.chr # "\374" # "\xfc" # I won't use option
- WILL = 251.chr # "\373" # "\xfb" # I will use option
- SB = 250.chr # "\372" # "\xfa" # interpret as subnegotiation
- GA = 249.chr # "\371" # "\xf9" # you may reverse the line
- EL = 248.chr # "\370" # "\xf8" # erase the current line
- EC = 247.chr # "\367" # "\xf7" # erase the current character
- AYT = 246.chr # "\366" # "\xf6" # are you there
- AO = 245.chr # "\365" # "\xf5" # abort output--but let prog finish
- IP = 244.chr # "\364" # "\xf4" # interrupt process--permanently
- BREAK = 243.chr # "\363" # "\xf3" # break
- DM = 242.chr # "\362" # "\xf2" # data mark--for connect. cleaning
- NOP = 241.chr # "\361" # "\xf1" # nop
- SE = 240.chr # "\360" # "\xf0" # end sub negotiation
- EOR = 239.chr # "\357" # "\xef" # end of record (transparent mode)
- ABORT = 238.chr # "\356" # "\xee" # Abort process
- SUSP = 237.chr # "\355" # "\xed" # Suspend process
- EOF = 236.chr # "\354" # "\xec" # End of file
- SYNCH = 242.chr # "\362" # "\xf2" # for telfunc calls
-
- OPT_BINARY = 0.chr # "\000" # "\x00" # Binary Transmission
- OPT_ECHO = 1.chr # "\001" # "\x01" # Echo
- OPT_RCP = 2.chr # "\002" # "\x02" # Reconnection
- OPT_SGA = 3.chr # "\003" # "\x03" # Suppress Go Ahead
- OPT_NAMS = 4.chr # "\004" # "\x04" # Approx Message Size Negotiation
- OPT_STATUS = 5.chr # "\005" # "\x05" # Status
- OPT_TM = 6.chr # "\006" # "\x06" # Timing Mark
- OPT_RCTE = 7.chr # "\a" # "\x07" # Remote Controlled Trans and Echo
- OPT_NAOL = 8.chr # "\010" # "\x08" # Output Line Width
- OPT_NAOP = 9.chr # "\t" # "\x09" # Output Page Size
- OPT_NAOCRD = 10.chr # "\n" # "\x0a" # Output Carriage-Return Disposition
- OPT_NAOHTS = 11.chr # "\v" # "\x0b" # Output Horizontal Tab Stops
- OPT_NAOHTD = 12.chr # "\f" # "\x0c" # Output Horizontal Tab Disposition
- OPT_NAOFFD = 13.chr # "\r" # "\x0d" # Output Formfeed Disposition
- OPT_NAOVTS = 14.chr # "\016" # "\x0e" # Output Vertical Tabstops
- OPT_NAOVTD = 15.chr # "\017" # "\x0f" # Output Vertical Tab Disposition
- OPT_NAOLFD = 16.chr # "\020" # "\x10" # Output Linefeed Disposition
- OPT_XASCII = 17.chr # "\021" # "\x11" # Extended ASCII
- OPT_LOGOUT = 18.chr # "\022" # "\x12" # Logout
- OPT_BM = 19.chr # "\023" # "\x13" # Byte Macro
- OPT_DET = 20.chr # "\024" # "\x14" # Data Entry Terminal
- OPT_SUPDUP = 21.chr # "\025" # "\x15" # SUPDUP
- OPT_SUPDUPOUTPUT = 22.chr # "\026" # "\x16" # SUPDUP Output
- OPT_SNDLOC = 23.chr # "\027" # "\x17" # Send Location
- OPT_TTYPE = 24.chr # "\030" # "\x18" # Terminal Type
- OPT_EOR = 25.chr # "\031" # "\x19" # End of Record
- OPT_TUID = 26.chr # "\032" # "\x1a" # TACACS User Identification
- OPT_OUTMRK = 27.chr # "\e" # "\x1b" # Output Marking
- OPT_TTYLOC = 28.chr # "\034" # "\x1c" # Terminal Location Number
- OPT_3270REGIME = 29.chr # "\035" # "\x1d" # Telnet 3270 Regime
- OPT_X3PAD = 30.chr # "\036" # "\x1e" # X.3 PAD
- OPT_NAWS = 31.chr # "\037" # "\x1f" # Negotiate About Window Size
- OPT_TSPEED = 32.chr # " " # "\x20" # Terminal Speed
- OPT_LFLOW = 33.chr # "!" # "\x21" # Remote Flow Control
- OPT_LINEMODE = 34.chr # "\"" # "\x22" # Linemode
- OPT_XDISPLOC = 35.chr # "#" # "\x23" # X Display Location
- OPT_OLD_ENVIRON = 36.chr # "$" # "\x24" # Environment Option
- OPT_AUTHENTICATION = 37.chr # "%" # "\x25" # Authentication Option
- OPT_ENCRYPT = 38.chr # "&" # "\x26" # Encryption Option
- OPT_NEW_ENVIRON = 39.chr # "'" # "\x27" # New Environment Option
- OPT_EXOPL = 255.chr # "\377" # "\xff" # Extended-Options-List
-
- NULL = "\000"
- CR = "\015"
- LF = "\012"
- EOL = CR + LF
+ DONT = 254.chr # "\376" # "\xfe" # you are not to use option
+ DO = 253.chr # "\375" # "\xfd" # please, you use option
+ WONT = 252.chr # "\374" # "\xfc" # I won't use option
+ WILL = 251.chr # "\373" # "\xfb" # I will use option
+ SB = 250.chr # "\372" # "\xfa" # interpret as subnegotiation
+ GA = 249.chr # "\371" # "\xf9" # you may reverse the line
+ EL = 248.chr # "\370" # "\xf8" # erase the current line
+ EC = 247.chr # "\367" # "\xf7" # erase the current character
+ AYT = 246.chr # "\366" # "\xf6" # are you there
+ AO = 245.chr # "\365" # "\xf5" # abort output--but let prog finish
+ IP = 244.chr # "\364" # "\xf4" # interrupt process--permanently
+ BREAK = 243.chr # "\363" # "\xf3" # break
+ DM = 242.chr # "\362" # "\xf2" # data mark--for connect. cleaning
+ NOP = 241.chr # "\361" # "\xf1" # nop
+ SE = 240.chr # "\360" # "\xf0" # end sub negotiation
+ EOR = 239.chr # "\357" # "\xef" # end of record (transparent mode)
+ ABORT = 238.chr # "\356" # "\xee" # Abort process
+ SUSP = 237.chr # "\355" # "\xed" # Suspend process
+ EOF = 236.chr # "\354" # "\xec" # End of file
+ SYNCH = 242.chr # "\362" # "\xf2" # for telfunc calls
+
+ OPT_BINARY = 0.chr # "\000" # "\x00" # Binary Transmission
+ OPT_ECHO = 1.chr # "\001" # "\x01" # Echo
+ OPT_RCP = 2.chr # "\002" # "\x02" # Reconnection
+ OPT_SGA = 3.chr # "\003" # "\x03" # Suppress Go Ahead
+ OPT_NAMS = 4.chr # "\004" # "\x04" # Approx Message Size Negotiation
+ OPT_STATUS = 5.chr # "\005" # "\x05" # Status
+ OPT_TM = 6.chr # "\006" # "\x06" # Timing Mark
+ OPT_RCTE = 7.chr # "\a" # "\x07" # Remote Controlled Trans and Echo
+ OPT_NAOL = 8.chr # "\010" # "\x08" # Output Line Width
+ OPT_NAOP = 9.chr # "\t" # "\x09" # Output Page Size
+ OPT_NAOCRD = 10.chr # "\n" # "\x0a" # Output Carriage-Return Disposition
+ OPT_NAOHTS = 11.chr # "\v" # "\x0b" # Output Horizontal Tab Stops
+ OPT_NAOHTD = 12.chr # "\f" # "\x0c" # Output Horizontal Tab Disposition
+ OPT_NAOFFD = 13.chr # "\r" # "\x0d" # Output Formfeed Disposition
+ OPT_NAOVTS = 14.chr # "\016" # "\x0e" # Output Vertical Tabstops
+ OPT_NAOVTD = 15.chr # "\017" # "\x0f" # Output Vertical Tab Disposition
+ OPT_NAOLFD = 16.chr # "\020" # "\x10" # Output Linefeed Disposition
+ OPT_XASCII = 17.chr # "\021" # "\x11" # Extended ASCII
+ OPT_LOGOUT = 18.chr # "\022" # "\x12" # Logout
+ OPT_BM = 19.chr # "\023" # "\x13" # Byte Macro
+ OPT_DET = 20.chr # "\024" # "\x14" # Data Entry Terminal
+ OPT_SUPDUP = 21.chr # "\025" # "\x15" # SUPDUP
+ OPT_SUPDUPOUTPUT = 22.chr # "\026" # "\x16" # SUPDUP Output
+ OPT_SNDLOC = 23.chr # "\027" # "\x17" # Send Location
+ OPT_TTYPE = 24.chr # "\030" # "\x18" # Terminal Type
+ OPT_EOR = 25.chr # "\031" # "\x19" # End of Record
+ OPT_TUID = 26.chr # "\032" # "\x1a" # TACACS User Identification
+ OPT_OUTMRK = 27.chr # "\e" # "\x1b" # Output Marking
+ OPT_TTYLOC = 28.chr # "\034" # "\x1c" # Terminal Location Number
+ OPT_3270REGIME = 29.chr # "\035" # "\x1d" # Telnet 3270 Regime
+ OPT_X3PAD = 30.chr # "\036" # "\x1e" # X.3 PAD
+ OPT_NAWS = 31.chr # "\037" # "\x1f" # Negotiate About Window Size
+ OPT_TSPEED = 32.chr # " " # "\x20" # Terminal Speed
+ OPT_LFLOW = 33.chr # "!" # "\x21" # Remote Flow Control
+ OPT_LINEMODE = 34.chr # "\"" # "\x22" # Linemode
+ OPT_XDISPLOC = 35.chr # "#" # "\x23" # X Display Location
+ OPT_OLD_ENVIRON = 36.chr # "$" # "\x24" # Environment Option
+ OPT_AUTHENTICATION = 37.chr # "%" # "\x25" # Authentication Option
+ OPT_ENCRYPT = 38.chr # "&" # "\x26" # Encryption Option
+ OPT_NEW_ENVIRON = 39.chr # "'" # "\x27" # New Environment Option
+ OPT_EXOPL = 255.chr # "\377" # "\xff" # Extended-Options-List
+
+ NULL = "\000"
+ CR = "\015"
+ LF = "\012"
+ EOL = CR + LF
REVISION = '$Id$'
# :startdoc:
@@ -174,13 +174,13 @@ module Net
# provided: see below). If a block is provided, it is yielded
# status messages on the attempt to connect to the server, of
# the form:
- #
+ #
# Trying localhost...
# Connected to localhost.
#
# +options+ is a hash of options. The following example lists
# all options and their default values.
- #
+ #
# host = Net::Telnet::new(
# "Host" => "localhost", # default: "localhost"
# "Port" => 23, # default: 23
@@ -198,16 +198,16 @@ module Net
#
# The options have the following meanings:
#
- # Host:: the hostname or IP address of the host to connect to, as a String.
+ # Host:: the hostname or IP address of the host to connect to, as a String.
# Defaults to "localhost".
#
# Port:: the port to connect to. Defaults to 23.
#
- # Binmode:: if false (the default), newline substitution is performed.
+ # Binmode:: if false (the default), newline substitution is performed.
# Outgoing LF is
# converted to CRLF, and incoming CRLF is converted to LF. If
# true, this substitution is not performed. This value can
- # also be set with the #binmode() method. The
+ # also be set with the #binmode() method. The
# outgoing conversion only applies to the #puts() and #print()
# methods, not the #write() method. The precise nature of
# the newline conversion is also affected by the telnet options
@@ -217,13 +217,13 @@ module Net
# and all received traffic to. In the case of a proper
# Telnet session, this will include the client input as
# echoed by the host; otherwise, it only includes server
- # responses. Output is appended verbatim to this file.
+ # responses. Output is appended verbatim to this file.
# By default, no output log is kept.
#
# Dump_log:: as for Output_log, except that output is written in hexdump
# format (16 bytes per line as hex pairs, followed by their
# printable equivalent), with connection status messages
- # preceded by '#', sent traffic preceded by '>', and
+ # preceded by '#', sent traffic preceded by '>', and
# received traffic preceded by '<'. By default, not dump log
# is kept.
#
@@ -233,7 +233,7 @@ module Net
# ready to receive a new command. By default, this regular
# expression is /[$%#>] \z/n.
#
- # Telnetmode:: a boolean value, true by default. In telnet mode,
+ # Telnetmode:: a boolean value, true by default. In telnet mode,
# traffic received from the host is parsed for special
# command sequences, and these sequences are escaped
# in outgoing traffic sent using #puts() or #print()
@@ -255,11 +255,11 @@ module Net
# minutes), but other attempts to read data from the host
# will hand indefinitely if no data is forthcoming.
#
- # Waittime:: the amount of time to wait after seeing what looks like a
+ # Waittime:: the amount of time to wait after seeing what looks like a
# prompt (that is, received data that matches the Prompt
# option regular expression) to see if more data arrives.
# If more data does arrive in this time, Net::Telnet assumes
- # that what it saw was not really a prompt. This is to try to
+ # that what it saw was not really a prompt. This is to try to
# avoid false matches, but it can also lead to missing real
# prompts (if, for instance, a background process writes to
# the terminal soon after the prompt is displayed). By
@@ -267,12 +267,12 @@ module Net
#
# Proxy:: a proxy object to used instead of opening a direct connection
# to the host. Must be either another Net::Telnet object or
- # an IO object. If it is another Net::Telnet object, this
+ # an IO object. If it is another Net::Telnet object, this
# instance will use that one's socket for communication. If an
# IO object, it is used directly for communication. Any other
# kind of object will cause an error to be raised.
#
- def initialize(options) # :yield: mesg
+ def initialize(options) # :yield: mesg
@options = options
@options["Host"] = "localhost" unless @options.has_key?("Host")
@options["Port"] = 23 unless @options.has_key?("Port")
@@ -280,7 +280,7 @@ module Net
@options["Timeout"] = 10 unless @options.has_key?("Timeout")
@options["Waittime"] = 0 unless @options.has_key?("Waittime")
unless @options.has_key?("Binmode")
- @options["Binmode"] = false
+ @options["Binmode"] = false
else
unless (true == @options["Binmode"] or false == @options["Binmode"])
raise ArgumentError, "Binmode option must be true or false"
@@ -288,7 +288,7 @@ module Net
end
unless @options.has_key?("Telnetmode")
- @options["Telnetmode"] = true
+ @options["Telnetmode"] = true
else
unless (true == @options["Telnetmode"] or false == @options["Telnetmode"])
raise ArgumentError, "Telnetmode option must be true or false"
@@ -374,7 +374,7 @@ module Net
# The socket the Telnet object is using. Note that this object becomes
# a delegate of the Telnet object, so normally you invoke its methods
# directly on the Telnet object.
- attr :sock
+ attr :sock
# Set telnet command interpretation on (+mode+ == true) or off
# (+mode+ == false), or return the current value (+mode+ not
@@ -408,7 +408,7 @@ module Net
def binmode(mode = nil)
case mode
when nil
- @options["Binmode"]
+ @options["Binmode"]
when true, false
@options["Binmode"] = mode
else
@@ -428,7 +428,7 @@ module Net
# Preprocess received data from the host.
#
# Performs newline conversion and detects telnet command sequences.
- # Called automatically by #waitfor(). You should only use this
+ # Called automatically by #waitfor(). You should only use this
# method yourself if you have read input directly using sysread()
# or similar, and even then only if in telnet mode.
def preprocess(string)
@@ -438,9 +438,6 @@ module Net
# combine EOL into "\n"
string = string.gsub(/#{EOL}/no, "\n") unless @options["Binmode"]
- # remove NULL
- string = string.gsub(/#{NULL}/no, '') unless @options["Binmode"]
-
string.gsub(/#{IAC}(
[#{IAC}#{AO}#{AYT}#{DM}#{IP}#{NOP}]|
[#{DO}#{DONT}#{WILL}#{WONT}]
@@ -494,9 +491,9 @@ module Net
# Read data from the host until a certain sequence is matched.
#
# If a block is given, the received data will be yielded as it
- # is read in (not necessarily all in one go), or nil if EOF
+ # is read in (not necessarily all in one go), or nil if EOF
# occurs before any data is received. Whether a block is given
- # or not, all data read will be returned in a single string, or again
+ # or not, all data read will be returned in a single string, or again
# nil if EOF occurs before any data is received. Note that
# received data includes the matched sequence we were looking for.
#
@@ -510,7 +507,7 @@ module Net
# into a regular expression. Used only if Match and
# Prompt are not specified.
# Timeout:: the number of seconds to wait for data from the host
- # before raising a TimeoutError. If set to false,
+ # before raising a TimeoutError. If set to false,
# no timeout will occur. If not specified, the
# Timeout option value specified when this instance
# was created will be used, or, failing that, the
@@ -527,7 +524,7 @@ module Net
# EOFError will be raised. Otherwise, defaults to the old
# behaviour that the function will return whatever data
# has been received already, or nil if nothing was received.
- #
+ #
def waitfor(options) # :yield: recvdata
time_out = @options["Timeout"]
waittime = @options["Waittime"]
@@ -564,8 +561,8 @@ module Net
@dumplog.log_dump('<', c) if @options.has_key?("Dump_log")
if @options["Telnetmode"]
c = rest + c
- if Integer(c.rindex(/#{IAC}#{SE}/no) || 0) <
- Integer(c.rindex(/#{IAC}#{SB}/no) || 0)
+ if Integer(c.rindex(/#{IAC}#{SE}/no)) <
+ Integer(c.rindex(/#{IAC}#{SB}/no))
buf = preprocess(c[0 ... c.rindex(/#{IAC}#{SB}/no)])
rest = c[c.rindex(/#{IAC}#{SB}/no) .. -1]
elsif pt = c.rindex(/#{IAC}[^#{IAC}#{AO}#{AYT}#{DM}#{IP}#{NOP}]?\z/no) ||
@@ -622,7 +619,7 @@ module Net
# Sends a string to the host.
#
# This does _not_ automatically append a newline to the string. Embedded
- # newlines may be converted and telnet command sequences escaped
+ # newlines may be converted and telnet command sequences escaped
# depending upon the values of telnetmode, binmode, and telnet options
# set by the host.
def print(string)
@@ -657,7 +654,7 @@ module Net
# data until is sees the prompt or other matched sequence.
#
# If a block is given, the received data will be yielded to it as
- # it is read in. Whether a block is given or not, the received data
+ # it is read in. Whether a block is given or not, the received data
# will be return as a string. Note that the received data includes
# the prompt and in most cases the host's echo of our command.
#
@@ -702,7 +699,7 @@ module Net
#
# The username and password can either be provided as two string
# arguments in that order, or as a hash with keys "Name" and
- # "Password".
+ # "Password".
#
# This method looks for the strings "login" and "Password" from the
# host to determine when to send the username and password. If the
diff --git a/lib/observer.rb b/lib/observer.rb
index ee3f01b793..64c7d81351 100644
--- a/lib/observer.rb
+++ b/lib/observer.rb
@@ -7,7 +7,7 @@
#
# The Observer pattern, also known as Publish/Subscribe, provides a simple
# mechanism for one object to inform a set of interested third-party objects
-# when its state changes.
+# when its state changes.
#
# == Mechanism
#
@@ -39,14 +39,14 @@
# contracts are correct, nothing else can warn you.
#
# require "observer"
-#
+#
# class Ticker ### Periodically fetch a stock price.
# include Observable
-#
+#
# def initialize(symbol)
# @symbol = symbol
# end
-#
+#
# def run
# lastPrice = nil
# loop do
@@ -67,14 +67,14 @@
# 60 + rand(80)
# end
# end
-#
+#
# class Warner ### An abstract observer of Ticker objects.
# def initialize(ticker, limit)
# @limit = limit
# ticker.add_observer(self)
# end
# end
-#
+#
# class WarnLow < Warner
# def update(time, price) # callback for observer
# if price < @limit
@@ -82,7 +82,7 @@
# end
# end
# end
-#
+#
# class WarnHigh < Warner
# def update(time, price) # callback for observer
# if price > @limit
@@ -118,15 +118,14 @@ module Observable
#
# Add +observer+ as an observer on this object. +observer+ will now receive
- # notifications. The second optional argument specifies a method to notify
- # updates, of which default value is +update+.
+ # notifications.
#
- def add_observer(observer, func=:update)
- @observer_peers = {} unless defined? @observer_peers
- unless observer.respond_to? func
- raise NoMethodError, "observer does not respond to `#{func.to_s}'"
+ def add_observer(observer)
+ @observer_peers = [] unless defined? @observer_peers
+ unless observer.respond_to? :update
+ raise NoMethodError, "observer needs to respond to `update'"
end
- @observer_peers[observer] = func
+ @observer_peers.push observer
end
#
@@ -182,9 +181,9 @@ module Observable
def notify_observers(*arg)
if defined? @observer_state and @observer_state
if defined? @observer_peers
- @observer_peers.each { |k, v|
- k.send v, *arg
- }
+ for i in @observer_peers.dup
+ i.update(*arg)
+ end
end
@observer_state = false
end
diff --git a/lib/open-uri.rb b/lib/open-uri.rb
index 2a6c544fe6..54b42f336f 100644
--- a/lib/open-uri.rb
+++ b/lib/open-uri.rb
@@ -5,9 +5,6 @@ require 'time'
module Kernel
private
alias open_uri_original_open open # :nodoc:
- class << self
- alias open_uri_original_open open # :nodoc:
- end
# makes possible to open various resources including URIs.
# If the first argument respond to `open' method,
@@ -94,15 +91,9 @@ end
module OpenURI
Options = {
:proxy => true,
- :proxy_http_basic_authentication => true,
:progress_proc => true,
:content_length_proc => true,
:http_basic_authentication => true,
- :read_timeout => true,
- :ssl_ca_cert => nil,
- :ssl_verify_mode => nil,
- :ftp_active_mode => false,
- :redirect => true,
}
def OpenURI.check_options(options) # :nodoc:
@@ -132,11 +123,6 @@ module OpenURI
options ||= {}
OpenURI.check_options(options)
- if /\Arb?(?:\Z|:([^:]+))/ =~ mode
- encoding, = $1,Encoding.find($1) if $1
- mode = nil
- end
-
unless mode == nil ||
mode == 'r' || mode == 'rb' ||
mode == File::RDONLY
@@ -144,7 +130,6 @@ module OpenURI
end
io = open_loop(uri, options)
- io.set_encoding(encoding) if encoding
if block_given?
begin
yield io
@@ -157,40 +142,16 @@ module OpenURI
end
def OpenURI.open_loop(uri, options) # :nodoc:
- proxy_opts = []
- proxy_opts << :proxy_http_basic_authentication if options.include? :proxy_http_basic_authentication
- proxy_opts << :proxy if options.include? :proxy
- proxy_opts.compact!
- if 1 < proxy_opts.length
- raise ArgumentError, "multiple proxy options specified"
- end
- case proxy_opts.first
- when :proxy_http_basic_authentication
- opt_proxy, proxy_user, proxy_pass = options.fetch(:proxy_http_basic_authentication)
- proxy_user = proxy_user.to_str
- proxy_pass = proxy_pass.to_str
- if opt_proxy == true
- raise ArgumentError.new("Invalid authenticated proxy option: #{options[:proxy_http_basic_authentication].inspect}")
- end
- when :proxy
- opt_proxy = options.fetch(:proxy)
- proxy_user = nil
- proxy_pass = nil
- when nil
- opt_proxy = true
- proxy_user = nil
- proxy_pass = nil
- end
- case opt_proxy
+ case opt_proxy = options.fetch(:proxy, true)
when true
- find_proxy = lambda {|u| pxy = u.find_proxy; pxy ? [pxy, nil, nil] : nil}
+ find_proxy = lambda {|u| u.find_proxy}
when nil, false
find_proxy = lambda {|u| nil}
when String
opt_proxy = URI.parse(opt_proxy)
- find_proxy = lambda {|u| [opt_proxy, proxy_user, proxy_pass]}
+ find_proxy = lambda {|u| opt_proxy}
when URI::Generic
- find_proxy = lambda {|u| [opt_proxy, proxy_user, proxy_pass]}
+ find_proxy = lambda {|u| opt_proxy}
else
raise ArgumentError.new("Invalid proxy option: #{opt_proxy}")
end
@@ -209,9 +170,6 @@ module OpenURI
# URI. It is converted to absolute URI using uri as a base URI.
redirect = uri + redirect
end
- if !options.fetch(:redirect, true)
- raise HTTPRedirect.new(buf.io.status.join(' '), buf.io, redirect)
- end
unless OpenURI.redirectable?(uri, redirect)
raise "redirection forbidden: #{uri} -> #{redirect}"
end
@@ -235,9 +193,6 @@ module OpenURI
def OpenURI.redirectable?(uri1, uri2) # :nodoc:
# This test is intended to forbid a redirection from http://... to
# file:///etc/passwd.
- # https to http redirect is also forbidden intentionally.
- # It avoids sending secure cookie or referer by non-secure HTTP protocol.
- # (RFC 2109 4.3.1, RFC 2965 3.3, RFC 2616 15.1.3)
# However this is ad hoc. It should be extensible/configurable.
uri1.scheme.downcase == uri2.scheme.downcase ||
(/\A(?:http|ftp)\z/i =~ uri1.scheme && /\A(?:http|ftp)\z/i =~ uri2.scheme)
@@ -245,8 +200,7 @@ module OpenURI
def OpenURI.open_http(buf, target, proxy, options) # :nodoc:
if proxy
- proxy_uri, proxy_user, proxy_pass = proxy
- raise "Non-HTTP proxy URI: #{proxy_uri}" if proxy_uri.class != URI::HTTP
+ raise "Non-HTTP proxy URI: #{proxy}" if proxy.class != URI::HTTP
end
if target.userinfo && "1.9.0" <= RUBY_VERSION
@@ -254,53 +208,35 @@ module OpenURI
raise ArgumentError, "userinfo not supported. [RFC3986]"
end
- header = {}
- options.each {|k, v| header[k] = v if String === k }
-
require 'net/http'
klass = Net::HTTP
if URI::HTTP === target
# HTTP or HTTPS
if proxy
- if proxy_user && proxy_pass
- klass = Net::HTTP::Proxy(proxy_uri.host, proxy_uri.port, proxy_user, proxy_pass)
- else
- klass = Net::HTTP::Proxy(proxy_uri.host, proxy_uri.port)
- end
+ klass = Net::HTTP::Proxy(proxy.host, proxy.port)
end
target_host = target.host
target_port = target.port
request_uri = target.request_uri
else
# FTP over HTTP proxy
- target_host = proxy_uri.host
- target_port = proxy_uri.port
+ target_host = proxy.host
+ target_port = proxy.port
request_uri = target.to_s
- if proxy_user && proxy_pass
- header["Proxy-Authorization"] = 'Basic ' + ["#{proxy_user}:#{proxy_pass}"].pack('m').delete("\r\n")
- end
end
http = klass.new(target_host, target_port)
if target.class == URI::HTTPS
require 'net/https'
http.use_ssl = true
- http.verify_mode = options[:ssl_verify_mode] || OpenSSL::SSL::VERIFY_PEER
+ http.verify_mode = OpenSSL::SSL::VERIFY_PEER
store = OpenSSL::X509::Store.new
- if options[:ssl_ca_cert]
- if File.directory? options[:ssl_ca_cert]
- store.add_path options[:ssl_ca_cert]
- else
- store.add_file options[:ssl_ca_cert]
- end
- else
- store.set_default_paths
- end
+ store.set_default_paths
http.cert_store = store
end
- if options.include? :read_timeout
- http.read_timeout = options[:read_timeout]
- end
+
+ header = {}
+ options.each {|k, v| header[k] = v if String === k }
resp = nil
http.start {
@@ -336,12 +272,7 @@ module OpenURI
Net::HTTPFound, # 302
Net::HTTPSeeOther, # 303
Net::HTTPTemporaryRedirect # 307
- begin
- loc_uri = URI.parse(resp['location'])
- rescue URI::InvalidURIError
- raise OpenURI::HTTPError.new(io.status.join(' ') + ' (Invalid Location URI)', io)
- end
- throw :open_uri_redirect, loc_uri
+ throw :open_uri_redirect, URI.parse(resp['location'])
else
raise OpenURI::HTTPError.new(io.status.join(' '), io)
end
@@ -355,14 +286,6 @@ module OpenURI
attr_reader :io
end
- class HTTPRedirect < HTTPError
- def initialize(message, io, uri)
- super(message, io)
- @uri = uri
- end
- attr_reader :uri
- end
-
class Buffer # :nodoc:
def initialize
@io = StringIO.new
@@ -378,14 +301,14 @@ module OpenURI
require 'tempfile'
io = Tempfile.new('open-uri')
io.binmode
- Meta.init io, @io if Meta === @io
+ Meta.init io, @io if @io.respond_to? :meta
io << @io.string
@io = io
end
end
def io
- Meta.init @io unless Meta === @io
+ Meta.init @io unless @io.respond_to? :meta
@io
end
end
@@ -418,29 +341,8 @@ module OpenURI
# The Hash keys are downcased for canonicalization.
attr_reader :meta
- def meta_setup_encoding # :nodoc:
- charset = self.charset
- enc = nil
- if charset
- begin
- enc = Encoding.find(charset)
- rescue ArgumentError
- end
- end
- enc = Encoding::ASCII_8BIT unless enc
- if self.respond_to? :force_encoding
- self.force_encoding(enc)
- elsif self.respond_to? :string
- self.string.force_encoding(enc)
- else # Tempfile
- self.set_encoding enc
- end
- end
-
def meta_add_field(name, value) # :nodoc:
- name = name.downcase
- @meta[name] = value
- meta_setup_encoding if name == 'content-type'
+ @meta[name.downcase] = value
end
# returns a Time which represents Last-Modified field.
@@ -465,7 +367,7 @@ module OpenURI
subtype = $2.downcase
parameters = []
$3.scan(/;#{RE_LWS}?(#{RE_TOKEN})#{RE_LWS}?=#{RE_LWS}?(?:(#{RE_TOKEN})|(#{RE_QUOTED_STRING}))/no) {|att, val, qval|
- val = qval.gsub(/[\r\n\t !#-\[\]-~\x80-\xff]+|(\\[\x00-\x7f])/n) { $1 ? $1[1,1] : $& } if qval
+ val = qval.gsub(/[\r\n\t !#-\[\]-~\x80-\xff]+|(\\[\x00-\x7f])/) { $1 ? $1[1,1] : $& } if qval
parameters << [att.downcase, val]
}
["#{type}/#{subtype}", *parameters]
@@ -548,7 +450,7 @@ module OpenURI
# :proxy => true
# :proxy => false
# :proxy => nil
- #
+ #
# If :proxy option is specified, the value should be String, URI,
# boolean or nil.
# When String or URI is given, it is treated as proxy URI.
@@ -558,21 +460,6 @@ module OpenURI
# When false or nil is given, the environment variables are ignored and
# connection will be made to a server directly.
#
- # [:proxy_http_basic_authentication]
- # Synopsis:
- # :proxy_http_basic_authentication => ["http://proxy.foo.com:8000/", "proxy-user", "proxy-password"]
- # :proxy_http_basic_authentication => [URI.parse("http://proxy.foo.com:8000/"), "proxy-user", "proxy-password"]
- #
- # If :proxy option is specified, the value should be an Array with 3 elements.
- # It should contain a proxy URI, a proxy user name and a proxy password.
- # The proxy URI should be a String, an URI or nil.
- # The proxy user name and password should be a String.
- #
- # If nil is given for the proxy URI, this option is just ignored.
- #
- # If :proxy and :proxy_http_basic_authentication is specified,
- # ArgumentError is raised.
- #
# [:http_basic_authentication]
# Synopsis:
# :http_basic_authentication=>[user, password]
@@ -585,14 +472,14 @@ module OpenURI
# [:content_length_proc]
# Synopsis:
# :content_length_proc => lambda {|content_length| ... }
- #
+ #
# If :content_length_proc option is specified, the option value procedure
# is called before actual transfer is started.
# It takes one argument which is expected content length in bytes.
- #
+ #
# If two or more transfer is done by HTTP redirection, the procedure
# is called only one for a last transfer.
- #
+ #
# When expected content length is unknown, the procedure is called with
# nil.
# It is happen when HTTP response has no Content-Length header.
@@ -624,47 +511,9 @@ module OpenURI
# pbar.set s if pbar
# }) {|f| ... }
#
- # [:read_timeout]
- # Synopsis:
- # :read_timeout=>nil (no timeout)
- # :read_timeout=>10 (10 second)
- #
- # :read_timeout option specifies a timeout of read for http connections.
- #
- # [:ssl_ca_cert]
- # Synopsis:
- # :ssl_ca_cert=>filename
- #
- # :ssl_ca_cert is used to specify CA certificate for SSL.
- # If it is given, default certificates are not used.
- #
- # [:ssl_verify_mode]
- # Synopsis:
- # :ssl_verify_mode=>mode
- #
- # :ssl_verify_mode is used to specify openssl verify mode.
- #
# OpenURI::OpenRead#open returns an IO like object if block is not given.
# Otherwise it yields the IO object and return the value of the block.
# The IO object is extended with OpenURI::Meta.
- #
- # [:ftp_active_mode]
- # Synopsis:
- # :ftp_active_mode=>bool
- #
- # :ftp_active_mode=>true is used to make ftp active mode.
- # Note that the active mode is default in Ruby 1.8 or prior.
- # Ruby 1.9 uses passive mode by default.
- #
- # [:redirect]
- # Synopsis:
- # :redirect=>bool
- #
- # :redirect=>false is used to disable HTTP redirects at all.
- # OpenURI::HTTPRedirect exception raised on redirection.
- # It is true by default.
- # The true means redirections between http and ftp is permitted.
- #
def open(*rest, &block)
OpenURI.open_uri(self, *rest, &block)
end
@@ -801,7 +650,6 @@ module URI
# The access sequence is defined by RFC 1738
ftp = Net::FTP.open(self.host)
- ftp.passive = true if !options[:ftp_active_mode]
# todo: extract user/passwd from .netrc.
user = 'anonymous'
passwd = nil
diff --git a/lib/open3.rb b/lib/open3.rb
index 86bd2c6c22..c4dacc9473 100644
--- a/lib/open3.rb
+++ b/lib/open3.rb
@@ -9,710 +9,82 @@
#
#
-# Open3 grants you access to stdin, stdout, stderr and a thread to wait the
-# child process when running another program.
-# You can specify various attributes, redirections, current directory, etc., of
-# the program as Process.spawn.
+# Open3 grants you access to stdin, stdout, and stderr when running another
+# program. Example:
#
-# - Open3.popen3 : pipes for stdin, stdout, stderr
-# - Open3.popen2 : pipes for stdin, stdout
-# - Open3.popen2e : pipes for stdin, merged stdout and stderr
-# - Open3.capture3 : give a string for stdin. get strings for stdout, stderr
-# - Open3.capture2 : give a string for stdin. get a string for stdout
-# - Open3.capture2e : give a string for stdin. get a string for merged stdout and stderr
-# - Open3.pipeline_rw : pipes for first stdin and last stdout of a pipeline
-# - Open3.pipeline_r : pipe for last stdout of a pipeline
-# - Open3.pipeline_w : pipe for first stdin of a pipeline
-# - Open3.pipeline_start : a pipeline
-# - Open3.pipeline : run a pipline and wait
+# require "open3"
+# include Open3
+#
+# stdin, stdout, stderr = popen3('nroff -man')
+#
+# Open3.popen3 can also take a block which will receive stdin, stdout and
+# stderr as parameters. This ensures stdin, stdout and stderr are closed
+# once the block exits. Example:
+#
+# require "open3"
+#
+# Open3.popen3('nroff -man') { |stdin, stdout, stderr| ... }
#
module Open3
-
+ #
# Open stdin, stdout, and stderr streams and start external executable.
- # In addition, a thread for waiting the started process is noticed.
- # The thread has a pid method and thread variable :pid which is the pid of
- # the started process.
- #
- # Block form:
- #
- # Open3.popen3([env,] cmd... [, opts]) {|stdin, stdout, stderr, wait_thr|
- # pid = wait_thr.pid # pid of the started process.
- # ...
- # exit_status = wait_thr.value # Process::Status object returned.
- # }
- #
# Non-block form:
+ #
+ # require 'open3'
#
- # stdin, stdout, stderr, wait_thr = Open3.popen3([env,] cmd... [, opts])
- # pid = wait_thr[:pid] # pid of the started process.
- # ...
- # stdin.close # stdin, stdout and stderr should be closed explicitly in this form.
- # stdout.close
- # stderr.close
- # exit_status = wait_thr.value # Process::Status object returned.
- #
- # The parameters +cmd...+ is passed to Process.spawn.
- # So a commandline string and list of argument strings can be accepted as follows.
- #
- # Open3.popen3("echo a") {|i, o, e, t| ... }
- # Open3.popen3("echo", "a") {|i, o, e, t| ... }
- # Open3.popen3(["echo", "argv0"], "a") {|i, o, e, t| ... }
- #
- # If the last parameter, opts, is a Hash, it is recognized as an option for Process.spawn.
- #
- # Open3.popen3("pwd", :chdir=>"/") {|i,o,e,t|
- # p o.read.chomp #=> "/"
- # }
- #
- # wait_thr.value waits the termination of the process.
- # The block form also waits the process when it returns.
- #
- # Closing stdin, stdout and stderr does not wait the process.
- #
- def popen3(*cmd, &block)
- if Hash === cmd.last
- opts = cmd.pop.dup
- else
- opts = {}
- end
-
- in_r, in_w = IO.pipe
- opts[:in] = in_r
- in_w.sync = true
-
- out_r, out_w = IO.pipe
- opts[:out] = out_w
-
- err_r, err_w = IO.pipe
- opts[:err] = err_w
-
- popen_run(cmd, opts, [in_r, out_w, err_w], [in_w, out_r, err_r], &block)
- end
- module_function :popen3
-
- # Open3.popen2 is similer to Open3.popen3 except it doesn't make a pipe for
- # the standard error stream.
+ # [stdin, stdout, stderr] = Open3.popen3(cmd)
#
# Block form:
#
- # Open3.popen2([env,] cmd... [, opts]) {|stdin, stdout, wait_thr|
- # pid = wait_thr.pid # pid of the started process.
- # ...
- # exit_status = wait_thr.value # Process::Status object returned.
- # }
- #
- # Non-block form:
- #
- # stdin, stdout, wait_thr = Open3.popen2([env,] cmd... [, opts])
- # ...
- # stdin.close # stdin and stdout should be closed explicitly in this form.
- # stdout.close
- #
- # See Process.spawn for the optional hash arguments _env_ and _opts_.
- #
- # Example:
- #
- # Open3.popen2("wc -c") {|i,o,t|
- # i.print "answer to life the universe and everything"
- # i.close
- # p o.gets #=> "42\n"
- # }
- #
- # Open3.popen2("bc -q") {|i,o,t|
- # i.puts "obase=13"
- # i.puts "6 * 9"
- # p o.gets #=> "42\n"
- # }
- #
- # Open3.popen2("dc") {|i,o,t|
- # i.print "42P"
- # i.close
- # p o.read #=> "*"
- # }
- #
- def popen2(*cmd, &block)
- if Hash === cmd.last
- opts = cmd.pop.dup
- else
- opts = {}
- end
-
- in_r, in_w = IO.pipe
- opts[:in] = in_r
- in_w.sync = true
-
- out_r, out_w = IO.pipe
- opts[:out] = out_w
-
- popen_run(cmd, opts, [in_r, out_w], [in_w, out_r], &block)
- end
- module_function :popen2
-
- # Open3.popen2e is similer to Open3.popen3 except it merges
- # the standard output stream and the standard error stream.
- #
- # Block form:
- #
- # Open3.popen2e([env,] cmd... [, opts]) {|stdin, stdout_and_stderr, wait_thr|
- # pid = wait_thr.pid # pid of the started process.
- # ...
- # exit_status = wait_thr.value # Process::Status object returned.
- # }
- #
- # Non-block form:
- #
- # stdin, stdout_and_stderr, wait_thr = Open3.popen2e([env,] cmd... [, opts])
- # ...
- # stdin.close # stdin and stdout_and_stderr should be closed explicitly in this form.
- # stdout_and_stderr.close
- #
- # See Process.spawn for the optional hash arguments _env_ and _opts_.
+ # require 'open3'
#
- # Example:
- # # check gcc warnings
- # source = "foo.c"
- # Open3.popen2e("gcc", "-Wall", source) {|i,oe,t|
- # oe.each {|line|
- # if /warning/ =~ line
- # ...
- # end
- # }
- # }
+ # Open3.popen3(cmd) { |stdin, stdout, stderr| ... }
#
- def popen2e(*cmd, &block)
- if Hash === cmd.last
- opts = cmd.pop.dup
- else
- opts = {}
- end
-
- in_r, in_w = IO.pipe
- opts[:in] = in_r
- in_w.sync = true
-
- out_r, out_w = IO.pipe
- opts[[:out, :err]] = out_w
-
- popen_run(cmd, opts, [in_r, out_w], [in_w, out_r], &block)
- end
- module_function :popen2e
-
- def popen_run(cmd, opts, child_io, parent_io) # :nodoc:
- pid = spawn(*cmd, opts)
- wait_thr = Process.detach(pid)
- child_io.each {|io| io.close }
- result = [*parent_io, wait_thr]
- if defined? yield
- begin
- return yield(*result)
- ensure
- parent_io.each{|io| io.close unless io.closed?}
- wait_thr.join
- end
- end
- result
- end
- module_function :popen_run
- class << self
- private :popen_run
- end
-
- # Open3.capture3 captures the standard output and the standard error of a command.
- #
- # stdout_str, stderr_str, status = Open3.capture3([env,] cmd... [, opts])
- #
- # The arguments env, cmd and opts are passed to Open3.popen3 except
- # opts[:stdin_data] and opts[:stdin_data]. See Process.spawn.
- #
- # If opts[:stdin_data] is specified, it is sent to the command's standard input.
- #
- # If opts[:binmode] is true, internal pipes are set to binary mode.
+ # The parameter +cmd+ is passed directly to Kernel#exec.
#
- # Example:
- #
- # # dot is a command of graphviz.
- # graph = <<'End'
- # digraph g {
- # a -> b
- # }
- # End
- # layouted_graph, dot_log = Open3.capture3("dot -v", :stdin_data=>graph)
- #
- # o, e, s = Open3.capture3("echo a; sort >&2", :stdin_data=>"foo\nbar\nbaz\n")
- # p o #=> "a\n"
- # p e #=> "bar\nbaz\nfoo\n"
- # p s #=> #<Process::Status: pid 32682 exit 0>
- #
- # # generate a thumnail image using the convert command of ImageMagick.
- # # However, if the image stored really in a file,
- # # system("convert", "-thumbnail", "80", "png:#{filename}", "png:-") is better
- # # because memory consumption.
- # # But if the image is stored in a DB or generated by gnuplot Open3.capture2 example,
- # # Open3.capture3 is considerable.
- # #
- # image = File.read("/usr/share/openclipart/png/animals/mammals/sheep-md-v0.1.png", :binmode=>true)
- # thumnail, err, s = Open3.capture3("convert -thumbnail 80 png:- png:-", :stdin_data=>image, :binmode=>true)
- # if s.success?
- # STDOUT.binmode; print thumnail
- # end
- #
- def capture3(*cmd, &block)
- if Hash === cmd.last
- opts = cmd.pop.dup
- else
- opts = {}
- end
+ def popen3(*cmd)
+ pw = IO::pipe # pipe[0] for read, pipe[1] for write
+ pr = IO::pipe
+ pe = IO::pipe
- stdin_data = opts.delete(:stdin_data) || ''
- binmode = opts.delete(:binmode)
+ pid = fork{
+ # child
+ fork{
+ # grandchild
+ pw[1].close
+ STDIN.reopen(pw[0])
+ pw[0].close
- popen3(*cmd, opts) {|i, o, e, t|
- if binmode
- i.binmode
- o.binmode
- e.binmode
- end
- out_reader = Thread.new { o.read }
- err_reader = Thread.new { e.read }
- i.write stdin_data
- i.close
- [out_reader.value, err_reader.value, t.value]
- }
- end
- module_function :capture3
-
- # Open3.capture2 captures the standard output of a command.
- #
- # stdout_str, status = Open3.capture2([env,] cmd... [, opts])
- #
- # The arguments env, cmd and opts are passed to Open3.popen3 except
- # opts[:stdin_data] and opts[:stdin_data]. See Process.spawn.
- #
- # If opts[:stdin_data] is specified, it is sent to the command's standard input.
- #
- # If opts[:binmode] is true, internal pipes are set to binary mode.
- #
- # Example:
- #
- # # factor is a command for integer factorization.
- # o, s = Open3.capture2("factor", :stdin_data=>"42")
- # p o #=> "42: 2 3 7\n"
- #
- # # generate x**2 graph in png using gnuplot.
- # gnuplot_commands = <<"End"
- # set terminal png
- # plot x**2, "-" with lines
- # 1 14
- # 2 1
- # 3 8
- # 4 5
- # e
- # End
- # image, s = Open3.capture2("gnuplot", :stdin_data=>gnuplot_commands, :binmode=>true)
- #
- def capture2(*cmd, &block)
- if Hash === cmd.last
- opts = cmd.pop.dup
- else
- opts = {}
- end
+ pr[0].close
+ STDOUT.reopen(pr[1])
+ pr[1].close
- stdin_data = opts.delete(:stdin_data) || ''
- binmode = opts.delete(:binmode)
+ pe[0].close
+ STDERR.reopen(pe[1])
+ pe[1].close
- popen2(*cmd, opts) {|i, o, t|
- if binmode
- i.binmode
- o.binmode
- end
- out_reader = Thread.new { o.read }
- i.write stdin_data
- i.close
- [out_reader.value, t.value]
+ exec(*cmd)
+ }
+ exit!(0)
}
- end
- module_function :capture2
- # Open3.capture2e captures the standard output and the standard error of a command.
- #
- # stdout_and_stderr_str, status = Open3.capture2e([env,] cmd... [, opts])
- #
- # The arguments env, cmd and opts are passed to Open3.popen3 except
- # opts[:stdin_data] and opts[:stdin_data]. See Process.spawn.
- #
- # If opts[:stdin_data] is specified, it is sent to the command's standard input.
- #
- # If opts[:binmode] is true, internal pipes are set to binary mode.
- #
- # Example:
- #
- # # capture make log
- # make_log, s = Open3.capture2e("make")
- #
- def capture2e(*cmd, &block)
- if Hash === cmd.last
- opts = cmd.pop.dup
- else
- opts = {}
- end
-
- stdin_data = opts.delete(:stdin_data) || ''
- binmode = opts.delete(:binmode)
-
- popen2e(*cmd, opts) {|i, oe, t|
- if binmode
- i.binmode
- oe.binmode
- end
- outerr_reader = Thread.new { oe.read }
- i.write stdin_data
- i.close
- [outerr_reader.value, t.value]
- }
- end
- module_function :capture2e
-
- # Open3.pipeline_rw starts a list of commands as a pipeline with pipes
- # which connects stdin of the first command and stdout of the last command.
- #
- # Open3.pipeline_rw(cmd1, cmd2, ... [, opts]) {|first_stdin, last_stdout, wait_threads|
- # ...
- # }
- #
- # first_stdin, last_stdout, wait_threads = Open3.pipeline_rw(cmd1, cmd2, ... [, opts])
- # ...
- # first_stdin.close
- # last_stdout.close
- #
- # Each cmd is a string or an array.
- # If it is an array, the elements are passed to Process.spawn.
- #
- # cmd:
- # commandline command line string which is passed to a shell
- # [env, commandline, opts] command line string which is passed to a shell
- # [env, cmdname, arg1, ..., opts] command name and one or more arguments (no shell)
- # [env, [cmdname, argv0], arg1, ..., opts] command name and arguments including argv[0] (no shell)
- #
- # Note that env and opts are optional, as Process.spawn.
- #
- # The option to pass Process.spawn is constructed by merging
- # +opts+, the last hash element of the array and
- # specification for the pipe between each commands.
- #
- # Example:
- #
- # Open3.pipeline_rw("tr -dc A-Za-z", "wc -c") {|i,o,ts|
- # i.puts "All persons more than a mile high to leave the court."
- # i.close
- # p o.gets #=> "42\n"
- # }
- #
- # Open3.pipeline_rw("sort", "cat -n") {|stdin, stdout, wait_thrs|
- # stdin.puts "foo"
- # stdin.puts "bar"
- # stdin.puts "baz"
- # stdin.close # send EOF to sort.
- # p stdout.read #=> " 1\tbar\n 2\tbaz\n 3\tfoo\n"
- # }
- def pipeline_rw(*cmds, &block)
- if Hash === cmds.last
- opts = cmds.pop.dup
- else
- opts = {}
- end
-
- in_r, in_w = IO.pipe
- opts[:in] = in_r
- in_w.sync = true
-
- out_r, out_w = IO.pipe
- opts[:out] = out_w
-
- pipeline_run(cmds, opts, [in_r, out_w], [in_w, out_r], &block)
- end
- module_function :pipeline_rw
-
- # Open3.pipeline_r starts a list of commands as a pipeline with a pipe
- # which connects stdout of the last command.
- #
- # Open3.pipeline_r(cmd1, cmd2, ... [, opts]) {|last_stdout, wait_threads|
- # ...
- # }
- #
- # last_stdout, wait_threads = Open3.pipeline_r(cmd1, cmd2, ... [, opts])
- # ...
- # last_stdout.close
- #
- # Each cmd is a string or an array.
- # If it is an array, the elements are passed to Process.spawn.
- #
- # cmd:
- # commandline command line string which is passed to a shell
- # [env, commandline, opts] command line string which is passed to a shell
- # [env, cmdname, arg1, ..., opts] command name and one or more arguments (no shell)
- # [env, [cmdname, argv0], arg1, ..., opts] command name and arguments including argv[0] (no shell)
- #
- # Note that env and opts are optional, as Process.spawn.
- #
- # Example:
- #
- # Open3.pipeline_r("zcat /var/log/apache2/access.log.*.gz",
- # [{"LANG"=>"C"}, "grep", "GET /favicon.ico"],
- # "logresolve") {|r, ts|
- # r.each_line {|line|
- # ...
- # }
- # }
- #
- # Open3.pipeline_r("yes", "head -10") {|r, ts|
- # p r.read #=> "y\ny\ny\ny\ny\ny\ny\ny\ny\ny\n"
- # p ts[0].value #=> #<Process::Status: pid 24910 SIGPIPE (signal 13)>
- # p ts[1].value #=> #<Process::Status: pid 24913 exit 0>
- # }
- #
- def pipeline_r(*cmds, &block)
- if Hash === cmds.last
- opts = cmds.pop.dup
- else
- opts = {}
- end
-
- out_r, out_w = IO.pipe
- opts[:out] = out_w
-
- pipeline_run(cmds, opts, [out_w], [out_r], &block)
- end
- module_function :pipeline_r
-
- # Open3.pipeline_w starts a list of commands as a pipeline with a pipe
- # which connects stdin of the first command.
- #
- # Open3.pipeline_w(cmd1, cmd2, ... [, opts]) {|first_stdin, wait_threads|
- # ...
- # }
- #
- # first_stdin, wait_threads = Open3.pipeline_w(cmd1, cmd2, ... [, opts])
- # ...
- # first_stdin.close
- #
- # Each cmd is a string or an array.
- # If it is an array, the elements are passed to Process.spawn.
- #
- # cmd:
- # commandline command line string which is passed to a shell
- # [env, commandline, opts] command line string which is passed to a shell
- # [env, cmdname, arg1, ..., opts] command name and one or more arguments (no shell)
- # [env, [cmdname, argv0], arg1, ..., opts] command name and arguments including argv[0] (no shell)
- #
- # Note that env and opts are optional, as Process.spawn.
- #
- # Example:
- #
- # Open3.pipeline_w("bzip2 -c", :out=>"/tmp/hello.bz2") {|w, ts|
- # w.puts "hello"
- # }
- #
- def pipeline_w(*cmds, &block)
- if Hash === cmds.last
- opts = cmds.pop.dup
- else
- opts = {}
- end
-
- in_r, in_w = IO.pipe
- opts[:in] = in_r
- in_w.sync = true
-
- pipeline_run(cmds, opts, [in_r], [in_w], &block)
- end
- module_function :pipeline_w
-
- # Open3.pipeline_start starts a list of commands as a pipeline.
- # No pipe made for stdin of the first command and
- # stdout of the last command.
- #
- # Open3.pipeline_start(cmd1, cmd2, ... [, opts]) {|wait_threads|
- # ...
- # }
- #
- # wait_threads = Open3.pipeline_start(cmd1, cmd2, ... [, opts])
- # ...
- #
- # Each cmd is a string or an array.
- # If it is an array, the elements are passed to Process.spawn.
- #
- # cmd:
- # commandline command line string which is passed to a shell
- # [env, commandline, opts] command line string which is passed to a shell
- # [env, cmdname, arg1, ..., opts] command name and one or more arguments (no shell)
- # [env, [cmdname, argv0], arg1, ..., opts] command name and arguments including argv[0] (no shell)
- #
- # Note that env and opts are optional, as Process.spawn.
- #
- # Example:
- #
- # # run xeyes in 10 seconds.
- # Open3.pipeline_start("xeyes") {|ts|
- # sleep 10
- # t = ts[0]
- # Process.kill("TERM", t.pid)
- # p t.value #=> #<Process::Status: pid 911 SIGTERM (signal 15)>
- # }
- #
- # # convert pdf to ps and send it to a printer.
- # # collect error message of pdftops and lpr.
- # pdf_file = "paper.pdf"
- # printer = "printer-name"
- # err_r, err_w = IO.pipe
- # Open3.pipeline_start(["pdftops", pdf_file, "-"],
- # ["lpr", "-P#{printer}"],
- # :err=>err_w) {|ts|
- # err_w.close
- # p err_r.read # error messages of pdftops and lpr.
- # }
- #
- def pipeline_start(*cmds, &block)
- if Hash === cmds.last
- opts = cmds.pop.dup
- else
- opts = {}
- end
-
- if block
- pipeline_run(cmds, opts, [], [], &block)
- else
- ts, = pipeline_run(cmds, opts, [], [])
- ts
- end
- end
- module_function :pipeline_start
-
- # Open3.pipeline starts a list of commands as a pipeline.
- # It waits the finish of the commands.
- # No pipe made for stdin of the first command and
- # stdout of the last command.
- #
- # status_list = Open3.pipeline(cmd1, cmd2, ... [, opts])
- #
- # Each cmd is a string or an array.
- # If it is an array, the elements are passed to Process.spawn.
- #
- # cmd:
- # commandline command line string which is passed to a shell
- # [env, commandline, opts] command line string which is passed to a shell
- # [env, cmdname, arg1, ..., opts] command name and one or more arguments (no shell)
- # [env, [cmdname, argv0], arg1, ..., opts] command name and arguments including argv[0] (no shell)
- #
- # Note that env and opts are optional, as Process.spawn.
- #
- # Example:
- #
- # fname = "/usr/share/man/man1/ruby.1.gz"
- # p Open3.pipeline(["zcat", fname], "nroff -man", "less")
- # #=> [#<Process::Status: pid 11817 exit 0>,
- # # #<Process::Status: pid 11820 exit 0>,
- # # #<Process::Status: pid 11828 exit 0>]
- #
- # fname = "/usr/share/man/man1/ls.1.gz"
- # Open3.pipeline(["zcat", fname], "nroff -man", "colcrt")
- #
- # # convert PDF to PS and send to a printer by lpr
- # pdf_file = "paper.pdf"
- # printer = "printer-name"
- # Open3.pipeline(["pdftops", pdf_file, "-"],
- # ["lpr", "-P#{printer}"])
- #
- # # count lines
- # Open3.pipeline("sort", "uniq -c", :in=>"names.txt", :out=>"count")
- #
- # # cyclic pipeline
- # r,w = IO.pipe
- # w.print "ibase=14\n10\n"
- # Open3.pipeline("bc", "tee /dev/tty", :in=>r, :out=>w)
- # #=> 14
- # # 18
- # # 22
- # # 30
- # # 42
- # # 58
- # # 78
- # # 106
- # # 202
- #
- def pipeline(*cmds)
- if Hash === cmds.last
- opts = cmds.pop.dup
- else
- opts = {}
- end
-
- pipeline_run(cmds, opts, [], []) {|ts|
- ts.map {|t| t.value }
- }
- end
- module_function :pipeline
-
- def pipeline_run(cmds, pipeline_opts, child_io, parent_io, &block) # :nodoc:
- if cmds.empty?
- raise ArgumentError, "no commands"
- end
-
- opts_base = pipeline_opts.dup
- opts_base.delete :in
- opts_base.delete :out
-
- wait_thrs = []
- r = nil
- cmds.each_with_index {|cmd, i|
- cmd_opts = opts_base.dup
- if String === cmd
- cmd = [cmd]
- else
- cmd_opts.update cmd.pop if Hash === cmd.last
- end
- if i == 0
- if !cmd_opts.include?(:in)
- if pipeline_opts.include?(:in)
- cmd_opts[:in] = pipeline_opts[:in]
- end
- end
- else
- cmd_opts[:in] = r
- end
- if i != cmds.length - 1
- r2, w2 = IO.pipe
- cmd_opts[:out] = w2
- else
- if !cmd_opts.include?(:out)
- if pipeline_opts.include?(:out)
- cmd_opts[:out] = pipeline_opts[:out]
- end
- end
- end
- pid = spawn(*cmd, cmd_opts)
- wait_thrs << Process.detach(pid)
- r.close if r
- w2.close if w2
- r = r2
- }
- result = parent_io + [wait_thrs]
- child_io.each {|io| io.close }
+ pw[0].close
+ pr[1].close
+ pe[1].close
+ Process.waitpid(pid)
+ pi = [pw[1], pr[0], pe[0]]
+ pw[1].sync = true
if defined? yield
begin
- return yield(*result)
+ return yield(*pi)
ensure
- parent_io.each{|io| io.close unless io.closed?}
- wait_thrs.each {|t| t.join }
+ pi.each{|p| p.close unless p.closed?}
end
end
- result
- end
- module_function :pipeline_run
- class << self
- private :pipeline_run
+ pi
end
-
+ module_function :popen3
end
if $0 == __FILE__
diff --git a/lib/optparse.rb b/lib/optparse.rb
index e701363e8b..134b540cfb 100644
--- a/lib/optparse.rb
+++ b/lib/optparse.rb
@@ -1,15 +1,15 @@
#
# optparse.rb - command-line option analysis with the OptionParser class.
-#
+#
# Author:: Nobu Nakada
# Documentation:: Nobu Nakada and Gavin Sinclair.
#
-# See OptionParser for documentation.
+# See OptionParser for documentation.
#
-# == Developer Documentation (not for RDoc output)
-#
+# == Developer Documentation (not for RDoc output)
+#
# === Class tree
#
# - OptionParser:: front end
@@ -51,7 +51,7 @@
# solution.
#
# === Features
-#
+#
# 1. The argument specification and the code to handle it are written in the
# same place.
# 2. It can output an option summary; you don't need to maintain this string
@@ -88,12 +88,12 @@
# require 'optparse/time'
# require 'ostruct'
# require 'pp'
-#
+#
# class OptparseExample
-#
+#
# CODES = %w[iso-2022-jp shift_jis euc-jp utf8 binary]
# CODE_ALIASES = { "jis" => "iso-2022-jp", "sjis" => "shift_jis" }
-#
+#
# #
# # Return a structure describing the options.
# #
@@ -106,19 +106,19 @@
# options.encoding = "utf8"
# options.transfer_type = :auto
# options.verbose = false
-#
+#
# opts = OptionParser.new do |opts|
# opts.banner = "Usage: example.rb [options]"
-#
+#
# opts.separator ""
# opts.separator "Specific options:"
-#
+#
# # Mandatory argument.
# opts.on("-r", "--require LIBRARY",
# "Require the LIBRARY before executing your script") do |lib|
# options.library << lib
# end
-#
+#
# # Optional argument; multi-line description.
# opts.on("-i", "--inplace [EXTENSION]",
# "Edit ARGV files in place",
@@ -127,28 +127,28 @@
# options.extension = ext || ''
# options.extension.sub!(/\A\.?(?=.)/, ".") # Ensure extension begins with dot.
# end
-#
+#
# # Cast 'delay' argument to a Float.
# opts.on("--delay N", Float, "Delay N seconds before executing") do |n|
# options.delay = n
# end
-#
+#
# # Cast 'time' argument to a Time object.
# opts.on("-t", "--time [TIME]", Time, "Begin execution at given time") do |time|
# options.time = time
# end
-#
+#
# # Cast to octal integer.
# opts.on("-F", "--irs [OCTAL]", OptionParser::OctalInteger,
# "Specify record separator (default \\0)") do |rs|
# options.record_separator = rs
# end
-#
+#
# # List of arguments.
# opts.on("--list x,y,z", Array, "Example 'list' of arguments") do |list|
# options.list = list
# end
-#
+#
# # Keyword completion. We are specifying a specific set of arguments (CODES
# # and CODE_ALIASES - notice the latter is a Hash), and the user may provide
# # the shortest unambiguous text.
@@ -157,41 +157,41 @@
# " (#{code_list})") do |encoding|
# options.encoding = encoding
# end
-#
+#
# # Optional argument with keyword completion.
# opts.on("--type [TYPE]", [:text, :binary, :auto],
# "Select transfer type (text, binary, auto)") do |t|
# options.transfer_type = t
# end
-#
+#
# # Boolean switch.
# opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
# options.verbose = v
# end
-#
+#
# opts.separator ""
# opts.separator "Common options:"
-#
+#
# # No argument, shows at tail. This will print an options summary.
# # Try it and see!
# opts.on_tail("-h", "--help", "Show this message") do
# puts opts
# exit
# end
-#
+#
# # Another typical switch to print the version.
# opts.on_tail("--version", "Show version") do
# puts OptionParser::Version.join('.')
# exit
# end
# end
-#
+#
# opts.parse!(args)
# options
# end # parse()
-#
+#
# end # class OptparseExample
-#
+#
# options = OptparseExample.parse(ARGV)
# pp options
#
@@ -221,7 +221,7 @@ class OptionParser
def complete(key, icase = false, pat = nil)
pat ||= Regexp.new('\A' + Regexp.quote(key).gsub(/\w+\b/, '\&\w*'),
icase)
- canon, sw, cn = nil
+ canon, sw, k, v, cn = nil
candidates = []
each do |k, *v|
(if Regexp === k
@@ -276,7 +276,7 @@ class OptionParser
# Individual switch class. Not important to the user.
#
# Defined within Switch are several Switch-derived classes: NoArgument,
- # RequiredArgument, etc.
+ # RequiredArgument, etc.
#
class Switch
attr_reader :pattern, :conv, :short, :long, :arg, :desc, :block
@@ -301,8 +301,7 @@ class OptionParser
end
def self.incompatible_argument_styles(arg, t)
- raise(ArgumentError, "#{arg}: incompatible argument styles\n #{self}, #{t}",
- ParseError.filter_backtrace(caller(2)))
+ raise ArgumentError, "#{arg}: incompatible argument styles\n #{self}, #{t}"
end
def self.pattern
@@ -322,10 +321,10 @@ class OptionParser
# argument pattern. Yields when the pattern doesn't match substring.
#
def parse_arg(arg)
- pattern or return nil, [arg]
+ pattern or return nil, arg
unless m = pattern.match(arg)
yield(InvalidArgument, arg)
- return arg, []
+ return arg, nil
end
if String === m
m = [s = m]
@@ -346,11 +345,11 @@ class OptionParser
# conversion. Yields at semi-error condition instead of raising an
# exception.
#
- def conv_arg(arg, val = [])
+ def conv_arg(arg, val = nil)
if conv
val = conv.call(*val)
else
- val = proc {|v| v}.call(*val)
+ val = proc {|val| val}.call(*val)
end
return arg, block, val
end
@@ -369,7 +368,7 @@ class OptionParser
# +indent+:: Prefix string indents all summarized lines.
#
def summarize(sdone = [], ldone = [], width = 1, max = width - 1, indent = "")
- sopts, lopts = [], [], nil
+ sopts, lopts, s = [], [], nil
@short.each {|s| sdone.fetch(s) {sopts << s}; sdone[s] = true} if @short
@long.each {|s| ldone.fetch(s) {lopts << s}; ldone[s] = true} if @long
return if sopts.empty? and lopts.empty? # completely hidden
@@ -384,16 +383,10 @@ class OptionParser
left[-1] << if left[-1].empty? then ' ' * 4 else ', ' end << s
end
- if arg
- left[0] << (left[1] ? arg.sub(/\A(\[?)=/, '\1') + ',' : arg)
- end
- mlen = left.collect {|ss| ss.length}.max.to_i
+ left[0] << arg if arg
+ mlen = left.collect {|s| s.length}.max.to_i
while mlen > width and l = left.shift
- mlen = left.collect {|ss| ss.length}.max.to_i if l.length == mlen
- if l.length < width and (r = right[0]) and !r.empty?
- l = l.to_s.ljust(width) + ' ' + r
- right.shift
- end
+ mlen = left.collect {|s| s.length}.max.to_i if l.length == mlen
yield(indent + l)
end
@@ -413,7 +406,7 @@ class OptionParser
to
end
- def match_nonswitch?(str) # :nodoc:
+ def match_nonswitch?(str) # :nodoc:
@pattern =~ str unless @short or @long
end
@@ -458,7 +451,7 @@ class OptionParser
raise MissingArgument if argv.empty?
arg = argv.shift
end
- conv_arg(*parse_arg(arg, &method(:raise)))
+ conv_arg(*parse_arg(arg) {|*exc| raise(*exc)})
end
end
@@ -511,13 +504,13 @@ class OptionParser
class List
# Map from acceptable argument types to pattern and converter pairs.
attr_reader :atype
-
+
# Map from short style option switches to actual switch objects.
attr_reader :short
-
+
# Map from long style option switches to actual switch objects.
attr_reader :long
-
+
# List of all switches and summary string.
attr_reader :list
@@ -534,10 +527,9 @@ class OptionParser
#
# See OptionParser.accept.
#
- def accept(t, pat = /.*/m, &block)
+ def accept(t, pat = /.*/nm, &block)
if pat
- pat.respond_to?(:match) or
- raise TypeError, "has no `match'", ParseError.filter_backtrace(caller(2))
+ pat.respond_to?(:match) or raise TypeError, "has no `match'"
else
pat = t if t.respond_to?(:match)
end
@@ -563,6 +555,7 @@ class OptionParser
# +nlopts+:: Negated long style options list.
#
def update(sw, sopts, lopts, nsw = nil, nlopts = nil)
+ o = nil
sopts.each {|o| @short[o] = sw} if sopts
lopts.each {|o| @long[o] = sw} if lopts
nlopts.each {|o| @long[o] = nsw} if nsw and nlopts
@@ -574,7 +567,7 @@ class OptionParser
#
# Inserts +switch+ at the head of the list, and associates short, long
# and negated long options. Arguments are:
- #
+ #
# +switch+:: OptionParser::Switch instance to be inserted.
# +short_opts+:: List of short style options.
# +long_opts+:: List of long style options.
@@ -590,7 +583,7 @@ class OptionParser
#
# Appends +switch+ at the tail of the list, and associates short, long
# and negated long options. Arguments are:
- #
+ #
# +switch+:: OptionParser::Switch instance to be inserted.
# +short_opts+:: List of short style options.
# +long_opts+:: List of long style options.
@@ -637,21 +630,17 @@ class OptionParser
# method which is called on every option.
#
def summarize(*args, &block)
- sum = []
- list.reverse_each do |opt|
+ list.each do |opt|
if opt.respond_to?(:summarize) # perhaps OptionParser::Switch
- s = []
- opt.summarize(*args) {|l| s << l}
- sum.concat(s.reverse)
- elsif !opt or opt.empty?
- sum << ""
+ opt.summarize(*args, &block)
+ elsif !opt
+ yield("")
elsif opt.respond_to?(:each_line)
- sum.concat([*opt.each_line].reverse)
+ opt.each_line(&block)
else
- sum.concat([*opt.each].reverse)
+ opt.each(&block)
end
end
- sum.reverse_each(&block)
end
def add_banner(to) # :nodoc:
@@ -674,10 +663,9 @@ class OptionParser
# Completion for hash key.
#
def match(key)
- *values = fetch(key) {
+ return key, *fetch(key) {
raise AmbiguousArgument, catch(:ambiguous) {return complete(key)}
}
- return key, *values
end
end
@@ -756,7 +744,7 @@ class OptionParser
# Initializes a new instance and evaluates the optional block in context
# of the instance. Arguments +args+ are passed to #new, see there for
# description of parameters.
- #
+ #
# This method is *deprecated*, its behavior corresponds to the older #new
# method.
#
@@ -974,8 +962,7 @@ class OptionParser
# +indent+:: Indentation, defaults to @summary_indent.
#
def summarize(to = [], width = @summary_width, max = width - 1, indent = @summary_indent, &blk)
- blk ||= proc {|l| to << (l.index($/, -1) ? l : l + $/)}
- visit(:summarize, {}, {}, width, max, indent, &blk)
+ visit(:summarize, {}, {}, width, max, indent, &(blk || proc {|l| to << l + $/}))
to
end
@@ -1000,14 +987,17 @@ class OptionParser
#
def notwice(obj, prv, msg)
unless !prv or prv == obj
- raise(ArgumentError, "argument #{msg} given twice: #{obj}",
- ParseError.filter_backtrace(caller(2)))
+ begin
+ raise ArgumentError, "argument #{msg} given twice: #{obj}"
+ rescue
+ $@[0, 2] = nil
+ raise
+ end
end
obj
end
private :notwice
- SPLAT_PROC = proc {|*a| a.length <= 1 ? a.first : a}
#
# Creates an OptionParser::Switch from the parameters. The parsed argument
# value is passed to the given block, where it can be processed.
@@ -1049,7 +1039,7 @@ class OptionParser
# There is also a special form which matches character range (not full
# set of regular expression):
# "-[a-z]MANDATORY"
- # "-[a-z][OPTIONAL]"
+ # "-[a-z][OPTIONAL]"
# "-[a-z]"
#
# [Argument style and description:]
@@ -1061,7 +1051,7 @@ class OptionParser
# [Description:]
# Description string for the option.
# "Run verbosely"
- #
+ #
# [Handler:]
# Handler for the parsed argument value. Either give a block or pass a
# Proc or Method as an argument.
@@ -1072,6 +1062,7 @@ class OptionParser
default_style = Switch::NoArgument
default_pattern = nil
klass = nil
+ o = nil
n, q, a = nil
opts.each do |o|
@@ -1086,13 +1077,9 @@ class OptionParser
end
# directly specified pattern(any object possible to match)
- if (!(String === o || Symbol === o)) and o.respond_to?(:match)
+ if !(String === o) and o.respond_to?(:match)
pattern = notwice(o, pattern, 'pattern')
- if pattern.respond_to?(:convert)
- conv = pattern.method(:convert).to_proc
- else
- conv = SPLAT_PROC
- end
+ conv = pattern.method(:convert).to_proc if pattern.respond_to?(:convert)
next
end
@@ -1109,9 +1096,9 @@ class OptionParser
else
raise ArgumentError, "argument pattern given twice"
end
- o.each {|pat, *v| pattern[pat] = v.fetch(0) {pat}}
+ o.each {|(o, *v)| pattern[o] = v.fetch(0) {o}}
when Module
- raise ArgumentError, "unsupported argument type: #{o}", ParseError.filter_backtrace(caller(4))
+ raise ArgumentError, "unsupported argument type: #{o}"
when *ArgumentStyle.keys
style = notwice(ArgumentStyle[o], style, 'style')
when /^--no-([^\[\]=\s]*)(.+)?/
@@ -1176,9 +1163,7 @@ class OptionParser
s = (style || default_style).new(pattern || default_pattern,
conv, sdesc, ldesc, arg, desc, block)
elsif !block
- if style or pattern
- raise ArgumentError, "no switch given", ParseError.filter_backtrace(caller)
- end
+ raise ArgumentError, "no switch given" if style or pattern
s = desc
else
short << pattern
@@ -1259,13 +1244,13 @@ class OptionParser
end
def parse_in_order(argv = default_argv, setter = nil, &nonopt) # :nodoc:
- opt, arg, val, rest = nil
- nonopt ||= proc {|a| throw :terminate, a}
+ opt, arg, sw, val, rest = nil
+ nonopt ||= proc {|arg| throw :terminate, arg}
argv.unshift(arg) if arg = catch(:terminate) {
while arg = argv.shift
case arg
# long option
- when /\A--([^=]*)(?:=(.*))?/m
+ when /\A--([^=]*)(?:=(.*))?/nm
opt, rest = $1, $2
begin
sw, = complete(:long, opt, true)
@@ -1281,7 +1266,7 @@ class OptionParser
end
# short option
- when /\A-(.)((=).*|.+)?/m
+ when /\A-(.)((=).*|.+)?/nm
opt, has_arg, eq, val, rest = $1, $3, $3, $2, $2
begin
sw, = search(:short, opt)
@@ -1304,7 +1289,7 @@ class OptionParser
begin
opt, cb, val = sw.parse(val, argv) {|*exc| raise(*exc) if eq}
raise InvalidOption, arg if has_arg and !eq and arg == "-#{opt}"
- argv.unshift(opt) if opt and (!rest or (opt = opt.sub(/\A-*/, '-')) != '-')
+ argv.unshift(opt) if opt and (opt = opt.sub(/\A-*/, '-')) != '-'
val = cb.call(val) if cb
setter.call(sw.switch_name, val) if setter
rescue ParseError
@@ -1314,8 +1299,7 @@ class OptionParser
# non-option argument
else
catch(:prune) do
- visit(:each_option) do |sw0|
- sw = sw0
+ visit(:each_option) do |sw|
sw.block.call(arg) if Switch === sw and sw.match_nonswitch?(arg)
end
nonopt.call(arg)
@@ -1346,7 +1330,8 @@ class OptionParser
#
def permute!(argv = default_argv)
nonopts = []
- order!(argv, &nonopts.method(:<<))
+ arg = nil
+ order!(argv) {|arg| nonopts << arg}
argv[0, 0] = nonopts
argv
end
@@ -1423,6 +1408,7 @@ class OptionParser
# +block+.
#
def visit(id, *args, &block)
+ el = nil
@stack.reverse_each do |el|
el.send(id, *args, &block)
end
@@ -1455,7 +1441,7 @@ class OptionParser
search(typ, opt) {|sw| return [sw, opt]} # exact match or...
end
raise AmbiguousOption, catch(:ambiguous) {
- visit(:complete, typ, opt, icase, *pat) {|o, *sw| return sw}
+ visit(:complete, typ, opt, icase, *pat) {|opt, *sw| return sw}
raise InvalidOption, opt
}
end
@@ -1490,7 +1476,6 @@ class OptionParser
#
def environment(env = File.basename($0, '.*'))
env = ENV[env] || ENV[env.upcase] or return
- require 'shellwords'
parse(*Shellwords.shellwords(env))
end
@@ -1508,7 +1493,7 @@ class OptionParser
#
# Any non-empty string, and no conversion.
#
- accept(String, /.+/m) {|s,*|s}
+ accept(String, /.+/nm) {|s,*|s}
#
# Ruby/C-like integer, octal for 0-7 sequence, binary for 0b, hexadecimal
@@ -1575,7 +1560,7 @@ class OptionParser
#
accept(Array) do |s,|
if s
- s = s.split(',').collect {|ss| ss unless ss.empty?}
+ s = s.split(',').collect {|s| s unless s.empty?}
end
s
end
@@ -1621,17 +1606,6 @@ class OptionParser
argv
end
- def self.filter_backtrace(array)
- unless $DEBUG
- array.delete_if(&%r"\A#{Regexp.quote(__FILE__)}:"o.method(:=~))
- end
- array
- end
-
- def set_backtrace(array)
- super(self.class.filter_backtrace(array))
- end
-
def set_option(opt, eq)
if eq
@args[0] = opt
diff --git a/lib/optparse/version.rb b/lib/optparse/version.rb
index 76ed564287..558d9d710b 100644
--- a/lib/optparse/version.rb
+++ b/lib/optparse/version.rb
@@ -1,7 +1,7 @@
# OptionParser internal utility
class << OptionParser
- def show_version(*pkgs)
+ def show_version(*pkg)
progname = ARGV.options.program_name
result = false
show = proc do |klass, cname, version|
@@ -19,14 +19,14 @@ class << OptionParser
puts str
result = true
end
- if pkgs.size == 1 and pkgs[0] == "all"
+ if pkg.size == 1 and pkg[0] == "all"
self.search_const(::Object, /\AV(?:ERSION|ersion)\z/) do |klass, cname, version|
unless cname[1] == ?e and klass.const_defined?(:Version)
show.call(klass, cname.intern, version)
end
end
else
- pkgs.each do |pkg|
+ pkg.each do |pkg|
begin
pkg = pkg.split(/::|\//).inject(::Object) {|m, c| m.const_get(c)}
v = case
@@ -46,8 +46,8 @@ class << OptionParser
result
end
- def each_const(path, base = ::Object)
- path.split(/::|\//).inject(base) do |klass, name|
+ def each_const(path, klass = ::Object)
+ path.split(/::|\//).inject(klass) do |klass, name|
raise NameError, path unless Module === klass
klass.constants.grep(/#{name}/i) do |c|
klass.const_defined?(c) or next
diff --git a/lib/ostruct.rb b/lib/ostruct.rb
index aea0c8e124..6af5bbdac0 100644
--- a/lib/ostruct.rb
+++ b/lib/ostruct.rb
@@ -12,13 +12,13 @@
# OpenStruct allows you to create data objects and set arbitrary attributes.
# For example:
#
-# require 'ostruct'
+# require 'ostruct'
#
# record = OpenStruct.new
# record.name = "John Smith"
# record.age = 70
# record.pension = 300
-#
+#
# puts record.name # -> "John Smith"
# puts record.address # -> nil
#
@@ -41,7 +41,7 @@ class OpenStruct
#
# p data # -> <OpenStruct country="Australia" population=20000000>
#
- # By default, the resulting OpenStruct object will have no attributes.
+ # By default, the resulting OpenStruct object will have no attributes.
#
def initialize(hash=nil)
@table = {}
@@ -53,7 +53,7 @@ class OpenStruct
end
end
- # Duplicate an OpenStruct object members.
+ # Duplicate an OpenStruct object members.
def initialize_copy(orig)
super
@table = @table.dup
@@ -67,35 +67,28 @@ class OpenStruct
@table.each_key{|key| new_ostruct_member(key)}
end
- def modifiable
- begin
- @modifiable = true
- rescue
- raise TypeError, "can't modify frozen #{self.class}", caller(3)
- end
- @table
- end
- protected :modifiable
-
def new_ostruct_member(name)
name = name.to_sym
unless self.respond_to?(name)
- class << self; self; end.class_eval do
- define_method(name) { @table[name] }
- define_method("#{name}=") { |x| modifiable[name] = x }
- end
+ meta = class << self; self; end
+ meta.send(:define_method, name) { @table[name] }
+ meta.send(:define_method, :"#{name}=") { |x| @table[name] = x }
end
- name
end
def method_missing(mid, *args) # :nodoc:
mname = mid.id2name
len = args.length
- if mname.chomp!('=')
+ if mname =~ /=$/
if len != 1
raise ArgumentError, "wrong number of arguments (#{len} for 1)", caller(1)
end
- modifiable[new_ostruct_member(mname)] = args[0]
+ if self.frozen?
+ raise TypeError, "can't modify frozen #{self.class}", caller(1)
+ end
+ mname.chop!
+ self.new_ostruct_member(mname)
+ @table[mname.intern] = args[0]
elsif len == 0
@table[mid]
else
@@ -118,23 +111,25 @@ class OpenStruct
def inspect
str = "#<#{self.class}"
- ids = (Thread.current[InspectKey] ||= [])
- if ids.include?(object_id)
- return str << ' ...>'
- end
-
- ids << object_id
- begin
+ Thread.current[InspectKey] ||= []
+ if Thread.current[InspectKey].include?(self) then
+ str << " ..."
+ else
first = true
for k,v in @table
str << "," unless first
first = false
- str << " #{k}=#{v.inspect}"
+
+ Thread.current[InspectKey] << v
+ begin
+ str << " #{k}=#{v.inspect}"
+ ensure
+ Thread.current[InspectKey].pop
+ end
end
- return str << '>'
- ensure
- ids.pop
end
+
+ str << ">"
end
alias :to_s :inspect
diff --git a/lib/parsearg.rb b/lib/parsearg.rb
new file mode 100644
index 0000000000..cab2dba789
--- /dev/null
+++ b/lib/parsearg.rb
@@ -0,0 +1,87 @@
+#
+# parsearg.rb - parse arguments
+# $Release Version: $
+# $Revision$
+# $Date$
+# by Yasuo OHBA(SHL Japan Inc. Technology Dept.)
+#
+# --
+#
+#
+#
+
+warn "Warning:#{caller[0].sub(/:in `.*'\z/, '')}: parsearg is deprecated after Ruby 1.8.1; use optparse instead"
+
+$RCS_ID=%q$Header$
+
+require "getopts"
+
+def printUsageAndExit()
+ if $USAGE
+ eval($USAGE)
+ end
+ exit()
+end
+
+def setParenthesis(ex, opt, c)
+ if opt != ""
+ ex = sprintf("%s$OPT_%s%s", ex, opt, c)
+ else
+ ex = sprintf("%s%s", ex, c)
+ end
+ return ex
+end
+
+def setOrAnd(ex, opt, c)
+ if opt != ""
+ ex = sprintf("%s$OPT_%s %s%s ", ex, opt, c, c)
+ else
+ ex = sprintf("%s %s%s ", ex, c, c)
+ end
+ return ex
+end
+
+def setExpression(ex, opt, op)
+ if !op
+ ex = sprintf("%s$OPT_%s", ex, opt)
+ return ex
+ end
+ case op.chr
+ when "(", ")"
+ ex = setParenthesis(ex, opt, op.chr)
+ when "|", "&"
+ ex = setOrAnd(ex, opt, op.chr)
+ else
+ return nil
+ end
+ return ex
+end
+
+# parseArgs is obsolete. Use OptionParser instead.
+
+def parseArgs(argc, nopt, single_opts, *opts)
+ if (noOptions = getopts(single_opts, *opts)) == nil
+ printUsageAndExit()
+ end
+ if nopt
+ ex = nil
+ pos = 0
+ for o in nopt.split(/[()|&]/)
+ pos += o.length
+ ex = setExpression(ex, o, nopt[pos])
+ pos += 1
+ end
+ begin
+ if !eval(ex)
+ printUsageAndExit()
+ end
+ rescue
+ print "Format Error!! : \"" + nopt + "\"\t[parseArgs]\n"
+ exit!(-1)
+ end
+ end
+ if ARGV.length < argc
+ printUsageAndExit()
+ end
+ return noOptions
+end
diff --git a/lib/parsedate.rb b/lib/parsedate.rb
new file mode 100644
index 0000000000..b52a79ba47
--- /dev/null
+++ b/lib/parsedate.rb
@@ -0,0 +1,53 @@
+#
+# = parsedate.rb: Parses dates
+#
+# Author:: Tadayoshi Funaba
+# Documentation:: Konrad Meyer
+#
+# ParseDate munches on a date and turns it into an array of values.
+#
+
+#
+# ParseDate converts a date into an array of values.
+# For example:
+#
+# require 'parsedate'
+#
+# ParseDate.parsedate "Tuesday, July 6th, 2007, 18:35:20 UTC"
+# # => [2007, 7, 6, 18, 35, 20, "UTC", 2]
+#
+# The order is of the form [year, month, day of month, hour, minute, second,
+# timezone, day of the week].
+
+require 'date/format'
+
+module ParseDate
+ #
+ # Parse a string representation of a date into values.
+ # For example:
+ #
+ # require 'parsedate'
+ #
+ # ParseDate.parsedate "Tuesday, July 5th, 2007, 18:35:20 UTC"
+ # # => [2007, 7, 5, 18, 35, 20, "UTC", 2]
+ #
+ # The order is of the form [year, month, day of month, hour, minute,
+ # second, timezone, day of week].
+ #
+ # ParseDate.parsedate can also take a second argument, +comp+, which
+ # is a boolean telling the method to compensate for dates with years
+ # expressed as two digits. Example:
+ #
+ # require 'parsedate'
+ #
+ # ParseDate.parsedate "Mon Dec 25 00 06:53:24 UTC", true
+ # # => [2000, 12, 25, 6, 53, 24, "UTC", 1]
+ #
+ def parsedate(str, comp=false)
+ Date._parse(str, comp).
+ values_at(:year, :mon, :mday, :hour, :min, :sec, :zone, :wday)
+ end
+
+ module_function :parsedate
+
+end
diff --git a/lib/pathname.rb b/lib/pathname.rb
index 8af8957c7b..e4ca5489ce 100644
--- a/lib/pathname.rb
+++ b/lib/pathname.rb
@@ -36,27 +36,27 @@
# === Example 1: Using Pathname
#
# require 'pathname'
-# pn = Pathname.new("/usr/bin/ruby")
-# size = pn.size # 27662
-# isdir = pn.directory? # false
-# dir = pn.dirname # Pathname:/usr/bin
-# base = pn.basename # Pathname:ruby
-# dir, base = pn.split # [Pathname:/usr/bin, Pathname:ruby]
-# data = pn.read
-# pn.open { |f| _ }
-# pn.each_line { |line| _ }
+# p = Pathname.new("/usr/bin/ruby")
+# size = p.size # 27662
+# isdir = p.directory? # false
+# dir = p.dirname # Pathname:/usr/bin
+# base = p.basename # Pathname:ruby
+# dir, base = p.split # [Pathname:/usr/bin, Pathname:ruby]
+# data = p.read
+# p.open { |f| _ }
+# p.each_line { |line| _ }
#
# === Example 2: Using standard Ruby
#
-# pn = "/usr/bin/ruby"
-# size = File.size(pn) # 27662
-# isdir = File.directory?(pn) # false
-# dir = File.dirname(pn) # "/usr/bin"
-# base = File.basename(pn) # "ruby"
-# dir, base = File.split(pn) # ["/usr/bin", "ruby"]
-# data = File.read(pn)
-# File.open(pn) { |f| _ }
-# File.foreach(pn) { |line| _ }
+# p = "/usr/bin/ruby"
+# size = File.size(p) # 27662
+# isdir = File.directory?(p) # false
+# dir = File.dirname(p) # "/usr/bin"
+# base = File.basename(p) # "ruby"
+# dir, base = File.split(p) # ["/usr/bin", "ruby"]
+# data = File.read(p)
+# File.open(p) { |f| _ }
+# File.foreach(p) { |line| _ }
#
# === Example 3: Special features
#
@@ -71,14 +71,14 @@
# p5.cleanpath # Pathname:articles
# p5.realpath # Pathname:/home/gavin/articles
# p5.children # [Pathname:/home/gavin/articles/linux, ...]
-#
+#
# == Breakdown of functionality
#
# === Core methods
#
-# These methods are effectively manipulating a String, because that's
-# all a path is. Except for #mountpoint?, #children, #each_child,
-# #realdirpath and #realpath, they don't access the filesystem.
+# These methods are effectively manipulating a String, because that's all a path
+# is. Except for #mountpoint?, #children, and #realpath, they don't access the
+# filesystem.
#
# - +
# - #join
@@ -90,9 +90,7 @@
# - #each_filename
# - #cleanpath
# - #realpath
-# - #realdirpath
# - #children
-# - #each_child
# - #mountpoint?
#
# === File status predicate methods
@@ -167,7 +165,6 @@
# These methods are a facade for IO:
# - #each_line(*args, &block)
# - #read(*args)
-# - #binread(*args)
# - #readlines(*args)
# - #sysopen(*args)
#
@@ -197,13 +194,6 @@ class Pathname
# to_path is implemented so Pathname objects are usable with File.open, etc.
TO_PATH = :to_path
end
-
- SAME_PATHS = if File::FNM_SYSCASE
- proc {|a, b| a.casecmp(b).zero?}
- else
- proc {|a, b| a == b}
- end
-
# :startdoc:
#
@@ -261,44 +251,19 @@ class Pathname
# Return a pathname which is substituted by String#sub.
def sub(pattern, *rest, &block)
- if block
- path = @path.sub(pattern, *rest) {|*args|
- begin
- old = Thread.current[:pathname_sub_matchdata]
- Thread.current[:pathname_sub_matchdata] = $~
- eval("$~ = Thread.current[:pathname_sub_matchdata]", block.binding)
- ensure
- Thread.current[:pathname_sub_matchdata] = old
- end
- yield(*args)
- }
- else
- path = @path.sub(pattern, *rest)
- end
- self.class.new(path)
+ self.class.new(@path.sub(pattern, *rest, &block))
end
if File::ALT_SEPARATOR
- SEPARATOR_LIST = "#{Regexp.quote File::ALT_SEPARATOR}#{Regexp.quote File::SEPARATOR}"
- SEPARATOR_PAT = /[#{SEPARATOR_LIST}]/
+ SEPARATOR_PAT = /[#{Regexp.quote File::ALT_SEPARATOR}#{Regexp.quote File::SEPARATOR}]/
else
- SEPARATOR_LIST = "#{Regexp.quote File::SEPARATOR}"
SEPARATOR_PAT = /#{Regexp.quote File::SEPARATOR}/
end
- # Return a pathname which the extension of the basename is substituted by
- # <i>repl</i>.
- #
- # If self has no extension part, <i>repl</i> is appended.
- def sub_ext(repl)
- ext = File.extname(@path)
- self.class.new(@path.chomp(ext) + repl)
- end
-
# chop_basename(path) -> [pre-basename, basename] or nil
def chop_basename(path)
base = File.basename(path)
- if /\A#{SEPARATOR_PAT}?\z/o =~ base
+ if /\A#{SEPARATOR_PAT}?\z/ =~ base
return nil
else
return path[0, path.rindex(base)], base
@@ -320,7 +285,7 @@ class Pathname
def prepend_prefix(prefix, relpath)
if relpath.empty?
File.dirname(prefix)
- elsif /#{SEPARATOR_PAT}/o =~ prefix
+ elsif /#{SEPARATOR_PAT}/ =~ prefix
prefix = File.dirname(prefix)
prefix = File.join(prefix, "") if File.basename(prefix + 'a') != 'a'
prefix + relpath
@@ -435,7 +400,7 @@ class Pathname
end
private :cleanpath_conservative
- def realpath_rec(prefix, unresolved, h, strict, last = true)
+ def realpath_rec(prefix, unresolved, h)
resolved = []
until unresolved.empty?
n = unresolved.shift
@@ -452,20 +417,14 @@ class Pathname
prefix, *resolved = h[path]
end
else
- begin
- s = File.lstat(path)
- rescue Errno::ENOENT => e
- raise e if strict || !last || !unresolved.empty?
- resolved << n
- break
- end
+ s = File.lstat(path)
if s.symlink?
h[path] = :resolving
link_prefix, link_names = split_names(File.readlink(path))
if link_prefix == ''
- prefix, *resolved = h[path] = realpath_rec(prefix, resolved + link_names, h, strict, unresolved.empty?)
+ prefix, *resolved = h[path] = realpath_rec(prefix, resolved + link_names, h)
else
- prefix, *resolved = h[path] = realpath_rec(link_prefix, link_names, h, strict, unresolved.empty?)
+ prefix, *resolved = h[path] = realpath_rec(link_prefix, link_names, h)
end
else
resolved << n
@@ -478,38 +437,22 @@ class Pathname
end
private :realpath_rec
- def real_path_internal(strict = false)
+ #
+ # Returns a real (absolute) pathname of +self+ in the actual filesystem.
+ # The real pathname doesn't contain symlinks or useless dots.
+ #
+ # No arguments should be given; the old behaviour is *obsoleted*.
+ #
+ def realpath
path = @path
prefix, names = split_names(path)
if prefix == ''
prefix, names2 = split_names(Dir.pwd)
names = names2 + names
end
- prefix, *names = realpath_rec(prefix, names, {}, strict)
+ prefix, *names = realpath_rec(prefix, names, {})
self.class.new(prepend_prefix(prefix, File.join(*names)))
end
- private :real_path_internal
-
- #
- # Returns the real (absolute) pathname of +self+ in the actual
- # filesystem not containing symlinks or useless dots.
- #
- # All components of the pathname must exist when this method is
- # called.
- #
- def realpath
- real_path_internal(true)
- end
-
- #
- # Returns the real (absolute) pathname of +self+ in the actual filesystem.
- # The real pathname doesn't contain symlinks or useless dots.
- #
- # The last component of the real pathname can be nonexistent.
- #
- def realdirpath
- real_path_internal(false)
- end
# #parent returns the parent directory.
#
@@ -563,7 +506,6 @@ class Pathname
# # yields "usr", "bin", and "ruby".
#
def each_filename # :yield: filename
- return to_enum(__method__) unless block_given?
prefix, names = split_names(@path)
names.each {|filename| yield filename }
nil
@@ -634,7 +576,7 @@ class Pathname
# p2 = p1 + "bin/ruby" # Pathname:/usr/bin/ruby
# p3 = p1 + "/etc/passwd" # Pathname:/etc/passwd
#
- # This method doesn't access the file system; it is pure string manipulation.
+ # This method doesn't access the file system; it is pure string manipulation.
#
def +(other)
other = Pathname.new(other) unless Pathname === other
@@ -710,12 +652,12 @@ class Pathname
# filename only.
#
# For example:
- # pn = Pathname("/usr/lib/ruby/1.8")
- # pn.children
+ # p = Pathname("/usr/lib/ruby/1.8")
+ # p.children
# # -> [ Pathname:/usr/lib/ruby/1.8/English.rb,
# Pathname:/usr/lib/ruby/1.8/Env.rb,
# Pathname:/usr/lib/ruby/1.8/abbrev.rb, ... ]
- # pn.children(false)
+ # p.children(false)
# # -> [ Pathname:English.rb, Pathname:Env.rb, Pathname:abbrev.rb, ... ]
#
# Note that the result never contain the entries <tt>.</tt> and <tt>..</tt> in
@@ -737,36 +679,6 @@ class Pathname
result
end
- # Iterates over the children of the directory
- # (files and subdirectories, not recursive).
- # It yields Pathname object for each child.
- # By default, the yielded pathnames will have enough information to access the files.
- # If you set +with_directory+ to +false+, then the returned pathnames will contain the filename only.
- #
- # Pathname("/usr/local").each_child {|f| p f }
- # #=> #<Pathname:/usr/local/share>
- # # #<Pathname:/usr/local/bin>
- # # #<Pathname:/usr/local/games>
- # # #<Pathname:/usr/local/lib>
- # # #<Pathname:/usr/local/include>
- # # #<Pathname:/usr/local/sbin>
- # # #<Pathname:/usr/local/src>
- # # #<Pathname:/usr/local/man>
- #
- # Pathname("/usr/local").each_child(false) {|f| p f }
- # #=> #<Pathname:share>
- # # #<Pathname:bin>
- # # #<Pathname:games>
- # # #<Pathname:lib>
- # # #<Pathname:include>
- # # #<Pathname:sbin>
- # # #<Pathname:src>
- # # #<Pathname:man>
- #
- def each_child(with_directory=true, &b)
- children(with_directory).each(&b)
- end
-
#
# #relative_path_from returns a relative path from the argument to the
# receiver. If +self+ is absolute, the argument must be absolute too. If
@@ -793,12 +705,12 @@ class Pathname
base_prefix, basename = r
base_names.unshift basename if basename != '.'
end
- unless SAME_PATHS[dest_prefix, base_prefix]
+ if dest_prefix != base_prefix
raise ArgumentError, "different prefix: #{dest_prefix.inspect} and #{base_directory.inspect}"
end
while !dest_names.empty? &&
!base_names.empty? &&
- SAME_PATHS[dest_names.first, base_names.first]
+ dest_names.first == base_names.first
dest_names.shift
base_names.shift
end
@@ -826,13 +738,15 @@ class Pathname # * IO *
IO.foreach(@path, *args, &block)
end
- # See <tt>IO.read</tt>. Returns all data from the file, or the first +N+ bytes
- # if specified.
- def read(*args) IO.read(@path, *args) end
+ # Pathname#foreachline is *obsoleted* at 1.8.1. Use #each_line.
+ def foreachline(*args, &block)
+ warn "Pathname#foreachline is obsoleted. Use Pathname#each_line."
+ each_line(*args, &block)
+ end
- # See <tt>IO.binread</tt>. Returns all the bytes from the file, or the first +N+
+ # See <tt>IO.read</tt>. Returns all the bytes from the file, or the first +N+
# if specified.
- def binread(*args) IO.binread(@path, *args) end
+ def read(*args) IO.read(@path, *args) end
# See <tt>IO.readlines</tt>. Returns all the lines from the file.
def readlines(*args) IO.readlines(@path, *args) end
@@ -920,6 +834,20 @@ class Pathname # * File *
# See <tt>File.split</tt>. Returns the #dirname and the #basename in an
# Array.
def split() File.split(@path).map {|f| self.class.new(f) } end
+
+ # Pathname#link is confusing and *obsoleted* because the receiver/argument
+ # order is inverted to corresponding system call.
+ def link(old)
+ warn 'Pathname#link is obsoleted. Use Pathname#make_link.'
+ File.link(old, @path)
+ end
+
+ # Pathname#symlink is confusing and *obsoleted* because the receiver/argument
+ # order is inverted to corresponding system call.
+ def symlink(old)
+ warn 'Pathname#symlink is obsoleted. Use Pathname#make_symlink.'
+ File.symlink(old, @path)
+ end
end
@@ -1001,7 +929,7 @@ end
class Pathname # * Dir *
# See <tt>Dir.glob</tt>. Returns or yields Pathname objects.
- def Pathname.glob(*args) # :yield: pathname
+ def Pathname.glob(*args) # :yield: p
if block_given?
Dir.glob(*args) {|f| yield self.new(f) }
else
@@ -1013,6 +941,18 @@ class Pathname # * Dir *
def Pathname.getwd() self.new(Dir.getwd) end
class << self; alias pwd getwd end
+ # Pathname#chdir is *obsoleted* at 1.8.1.
+ def chdir(&block)
+ warn "Pathname#chdir is obsoleted. Use Dir.chdir."
+ Dir.chdir(@path, &block)
+ end
+
+ # Pathname#chroot is *obsoleted* at 1.8.1.
+ def chroot
+ warn "Pathname#chroot is obsoleted. Use Dir.chroot."
+ Dir.chroot(@path)
+ end
+
# Return the entries (files and subdirectories) in the directory, each as a
# Pathname object.
def entries() Dir.entries(@path).map {|f| self.class.new(f) } end
@@ -1021,10 +961,16 @@ class Pathname # * Dir *
# yields a Pathname object for each entry.
#
# This method has existed since 1.8.1.
- def each_entry(&block) # :yield: pathname
+ def each_entry(&block) # :yield: p
Dir.foreach(@path) {|f| yield self.class.new(f) }
end
+ # Pathname#dir_foreach is *obsoleted* at 1.8.1.
+ def dir_foreach(*args, &block)
+ warn "Pathname#dir_foreach is obsoleted. Use Pathname#each_entry."
+ each_entry(*args, &block)
+ end
+
# See <tt>Dir.mkdir</tt>. Create the referenced directory.
def mkdir(*args) Dir.mkdir(@path, *args) end
@@ -1049,7 +995,7 @@ class Pathname # * Find *
# If +self+ is <tt>.</tt>, yielded pathnames begin with a filename in the
# current directory, not <tt>./</tt>.
#
- def find(&block) # :yield: pathname
+ def find(&block) # :yield: p
require 'find'
if @path == '.'
Find.find(@path) {|f| yield self.class.new(f.sub(%r{\A\./}, '')) }
@@ -1091,10 +1037,18 @@ class Pathname # * mixed *
end
end
alias delete unlink
-end
-class Pathname
- undef =~
+ # This method is *obsoleted* at 1.8.1. Use #each_line or #each_entry.
+ def foreach(*args, &block)
+ warn "Pathname#foreach is obsoleted. Use each_line or each_entry."
+ if FileTest.directory? @path
+ # For polymorphism between Dir.foreach and IO.foreach,
+ # Pathname#foreach doesn't yield Pathname object.
+ Dir.foreach(@path, *args, &block)
+ else
+ IO.foreach(@path, *args, &block)
+ end
+ end
end
module Kernel
diff --git a/lib/ping.rb b/lib/ping.rb
new file mode 100644
index 0000000000..c2966b619c
--- /dev/null
+++ b/lib/ping.rb
@@ -0,0 +1,64 @@
+#
+# = ping.rb: Check a host for upness
+#
+# Author:: Yukihiro Matsumoto
+# Documentation:: Konrad Meyer
+#
+# Performs the function of the basic network testing tool, ping.
+# See: Ping.
+#
+
+require 'timeout'
+require "socket"
+
+#
+# Ping contains routines to test for the reachability of remote hosts.
+# Currently the only routine implemented is pingecho().
+#
+# Ping.pingecho uses a TCP echo (not an ICMP echo) to determine if the
+# remote host is reachable. This is usually adequate to tell that a remote
+# host is available to telnet, ftp, or ssh to.
+#
+# Warning: Ping.pingecho may block for a long time if DNS resolution is
+# slow. Requiring 'resolv-replace' allows non-blocking name resolution.
+#
+# Usage:
+#
+# require 'ping'
+#
+# puts "'jimmy' is alive and kicking" if Ping.pingecho('jimmy', 10)
+#
+module Ping
+
+ #
+ # Return true if we can open a connection to the hostname or IP address
+ # +host+ on port +service+ (which defaults to the "echo" port) waiting up
+ # to +timeout+ seconds.
+ #
+ # Example:
+ #
+ # require 'ping'
+ #
+ # Ping.pingecho "google.com", 10, 80
+ #
+ def pingecho(host, timeout=5, service="echo")
+ begin
+ timeout(timeout) do
+ s = TCPSocket.new(host, service)
+ s.close
+ end
+ rescue Errno::ECONNREFUSED
+ return true
+ rescue Timeout::Error, StandardError
+ return false
+ end
+ return true
+ end
+ module_function :pingecho
+end
+
+if $0 == __FILE__
+ host = ARGV[0]
+ host ||= "localhost"
+ printf("%s alive? - %s\n", host, Ping::pingecho(host, 5))
+end
diff --git a/lib/pp.rb b/lib/pp.rb
index a71ce9db38..14fe62ee95 100644
--- a/lib/pp.rb
+++ b/lib/pp.rb
@@ -1,10 +1,10 @@
# == Pretty-printer for Ruby objects.
-#
+#
# = Which seems better?
-#
+#
# non-pretty-printed output by #p is:
# #<PP:0x81fedf0 @genspace=#<Proc:0x81feda0>, @group_queue=#<PrettyPrint::GroupQueue:0x81fed3c @queue=[[#<PrettyPrint::Group:0x81fed78 @breakables=[], @depth=0, @break=false>], []]>, @buffer=[], @newline="\n", @group_stack=[#<PrettyPrint::Group:0x81fed78 @breakables=[], @depth=0, @break=false>], @buffer_width=0, @indent=0, @maxwidth=79, @output_width=2, @output=#<IO:0x8114ee4>>
-#
+#
# pretty-printed output by #pp is:
# #<PP:0x81fedf0
# @buffer=[],
@@ -22,17 +22,17 @@
# @newline="\n",
# @output=#<IO:0x8114ee4>,
# @output_width=2>
-#
+#
# I like the latter. If you do too, this library is for you.
-#
+#
# = Usage
-#
+#
# pp(obj)
#
# output +obj+ to +$>+ in pretty printed format.
-#
+#
# It returns +nil+.
-#
+#
# = Output Customization
# To define your customized pretty printing function for your classes,
# redefine a method #pretty_print(+pp+) in the class.
@@ -67,10 +67,10 @@ end
class PP < PrettyPrint
# Outputs +obj+ to +out+ in pretty printed format of
# +width+ columns in width.
- #
+ #
# If +out+ is omitted, +$>+ is assumed.
# If +width+ is omitted, 79 is assumed.
- #
+ #
# PP.pp returns +out+.
def PP.pp(obj, out=$>, width=79)
q = PP.new(out, width)
@@ -82,7 +82,7 @@ class PP < PrettyPrint
# Outputs +obj+ to +out+ like PP.pp but with no indent and
# newline.
- #
+ #
# PP.singleline_pp returns +out+.
def PP.singleline_pp(obj, out=$>)
q = SingleLine.new(out)
@@ -105,87 +105,59 @@ class PP < PrettyPrint
end
module PPMethods
- def guard_inspect_key
- if Thread.current[:__recursive_key__] == nil
- Thread.current[:__recursive_key__] = {}.untrust
- end
+ InspectKey = :__inspect_key__
- if Thread.current[:__recursive_key__][:inspect] == nil
- Thread.current[:__recursive_key__][:inspect] = {}.untrust
+ def guard_inspect_key
+ if Thread.current[InspectKey] == nil
+ Thread.current[InspectKey] = []
end
- save = Thread.current[:__recursive_key__][:inspect]
+ save = Thread.current[InspectKey]
begin
- Thread.current[:__recursive_key__][:inspect] = {}.untrust
+ Thread.current[InspectKey] = []
yield
ensure
- Thread.current[:__recursive_key__][:inspect] = save
+ Thread.current[InspectKey] = save
end
end
- def check_inspect_key(id)
- Thread.current[:__recursive_key__] &&
- Thread.current[:__recursive_key__][:inspect] &&
- Thread.current[:__recursive_key__][:inspect].include?(id)
- end
- def push_inspect_key(id)
- Thread.current[:__recursive_key__][:inspect][id] = true
- end
- def pop_inspect_key(id)
- Thread.current[:__recursive_key__][:inspect].delete id
- end
-
# Adds +obj+ to the pretty printing buffer
# using Object#pretty_print or Object#pretty_print_cycle.
- #
+ #
# Object#pretty_print_cycle is used when +obj+ is already
# printed, a.k.a the object reference chain has a cycle.
def pp(obj)
- id = obj.object_id
+ id = obj.__id__
- if check_inspect_key(id)
+ if Thread.current[InspectKey].include? id
group {obj.pretty_print_cycle self}
return
end
begin
- push_inspect_key(id)
+ Thread.current[InspectKey] << id
group {obj.pretty_print self}
ensure
- pop_inspect_key(id) unless PP.sharing_detection
+ Thread.current[InspectKey].pop unless PP.sharing_detection
end
end
# A convenience method which is same as follows:
- #
+ #
# group(1, '#<' + obj.class.name, '>') { ... }
def object_group(obj, &block) # :yield:
group(1, '#<' + obj.class.name, '>', &block)
end
- if 0x100000000.class == Bignum
- # 32bit
- PointerMask = 0xffffffff
- else
- # 64bit
- PointerMask = 0xffffffffffffffff
- end
-
- case Object.new.inspect
- when /\A\#<Object:0x([0-9a-f]+)>\z/
- PointerFormat = "%0#{$1.length}x"
- else
- PointerFormat = "%x"
- end
-
def object_address_group(obj, &block)
- id = PointerFormat % (obj.object_id * 2 & PointerMask)
+ id = "%x" % (obj.__id__ * 2)
+ id.sub!(/\Af(?=[[:xdigit:]]{2}+\z)/, '') if id.sub!(/\A\.\./, '')
group(1, "\#<#{obj.class}:0x#{id}", '>', &block)
end
# A convenience method which is same as follows:
- #
+ #
# text ','
# breakable
def comma_breakable
@@ -195,23 +167,23 @@ class PP < PrettyPrint
# Adds a separated list.
# The list is separated by comma with breakable space, by default.
- #
+ #
# #seplist iterates the +list+ using +iter_method+.
# It yields each object to the block given for #seplist.
# The procedure +separator_proc+ is called between each yields.
- #
+ #
# If the iteration is zero times, +separator_proc+ is not called at all.
- #
+ #
# If +separator_proc+ is nil or not given,
# +lambda { comma_breakable }+ is used.
# If +iter_method+ is not given, :each is used.
- #
+ #
# For example, following 3 code fragments has similar effect.
- #
+ #
# q.seplist([1,2,3]) {|v| xxx v }
- #
- # q.seplist([1,2,3], lambda { q.comma_breakable }, :each) {|v| xxx v }
- #
+ #
+ # q.seplist([1,2,3], lambda { comma_breakable }, :each) {|v| xxx v }
+ #
# xxx 1
# q.comma_breakable
# xxx 2
@@ -275,11 +247,11 @@ class PP < PrettyPrint
# A default pretty printing method for general objects.
# It calls #pretty_print_instance_variables to list instance variables.
- #
+ #
# If +self+ has a customized (redefined) #inspect method,
# the result of self.inspect is used but it obviously has no
# line break hints.
- #
+ #
# This module provides predefined #pretty_print methods for some of
# the most commonly used built-in classes for convenience.
def pretty_print(q)
@@ -302,7 +274,7 @@ class PP < PrettyPrint
end
# Returns a sorted array of instance variable names.
- #
+ #
# This method should return an array of names of instance variables as symbols or strings as:
# +[:@a, :@b]+.
def pretty_print_instance_variables
@@ -311,7 +283,7 @@ class PP < PrettyPrint
# Is #inspect implementation using #pretty_print.
# If you implement #pretty_print, it can be used as follows.
- #
+ #
# alias inspect pretty_print_inspect
#
# However, doing this requires that every class that #inspect is called on
@@ -351,17 +323,13 @@ end
class << ENV
def pretty_print(q)
- h = {}
- ENV.keys.sort.each {|k|
- h[k] = ENV[k]
- }
- q.pp_hash h
+ q.pp_hash self
end
end
class Struct
def pretty_print(q)
- q.group(1, sprintf("#<struct %s", PP.mcall(self, Kernel, :class).name), '>') {
+ q.group(1, '#<struct ' + PP.mcall(self, Kernel, :class).name, '>') {
q.seplist(PP.mcall(self, Struct, :members), lambda { q.text "," }) {|member|
q.breakable
q.text member.to_s
@@ -473,24 +441,10 @@ end
class MatchData
def pretty_print(q)
- nc = []
- self.regexp.named_captures.each {|name, indexes|
- indexes.each {|i| nc[i] = name }
- }
q.object_group(self) {
q.breakable
- q.seplist(0...self.size, lambda { q.breakable }) {|i|
- if i == 0
- q.pp self[i]
- else
- if nc[i]
- q.text nc[i]
- else
- q.pp i
- end
- q.text ':'
- q.pp self[i]
- end
+ q.seplist(1..self.size, lambda { q.breakable }) {|i|
+ q.pp self[i-1]
}
}
end
@@ -515,3 +469,186 @@ end
end
}
}
+
+# :enddoc:
+if __FILE__ == $0
+ require 'test/unit'
+
+ class PPTest < Test::Unit::TestCase
+ def test_list0123_12
+ assert_equal("[0, 1, 2, 3]\n", PP.pp([0,1,2,3], '', 12))
+ end
+
+ def test_list0123_11
+ assert_equal("[0,\n 1,\n 2,\n 3]\n", PP.pp([0,1,2,3], '', 11))
+ end
+
+ OverriddenStruct = Struct.new("OverriddenStruct", :members, :class)
+ def test_struct_override_members # [ruby-core:7865]
+ a = OverriddenStruct.new(1,2)
+ assert_equal("#<struct Struct::OverriddenStruct members=1, class=2>\n", PP.pp(a, ''))
+ end
+
+ def test_redefined_method
+ o = ""
+ def o.method
+ end
+ assert_equal(%(""\n), PP.pp(o, ""))
+ end
+ end
+
+ class HasInspect
+ def initialize(a)
+ @a = a
+ end
+
+ def inspect
+ return "<inspect:#{@a.inspect}>"
+ end
+ end
+
+ class HasPrettyPrint
+ def initialize(a)
+ @a = a
+ end
+
+ def pretty_print(q)
+ q.text "<pretty_print:"
+ q.pp @a
+ q.text ">"
+ end
+ end
+
+ class HasBoth
+ def initialize(a)
+ @a = a
+ end
+
+ def inspect
+ return "<inspect:#{@a.inspect}>"
+ end
+
+ def pretty_print(q)
+ q.text "<pretty_print:"
+ q.pp @a
+ q.text ">"
+ end
+ end
+
+ class PrettyPrintInspect < HasPrettyPrint
+ alias inspect pretty_print_inspect
+ end
+
+ class PrettyPrintInspectWithoutPrettyPrint
+ alias inspect pretty_print_inspect
+ end
+
+ class PPInspectTest < Test::Unit::TestCase
+ def test_hasinspect
+ a = HasInspect.new(1)
+ assert_equal("<inspect:1>\n", PP.pp(a, ''))
+ end
+
+ def test_hasprettyprint
+ a = HasPrettyPrint.new(1)
+ assert_equal("<pretty_print:1>\n", PP.pp(a, ''))
+ end
+
+ def test_hasboth
+ a = HasBoth.new(1)
+ assert_equal("<pretty_print:1>\n", PP.pp(a, ''))
+ end
+
+ def test_pretty_print_inspect
+ a = PrettyPrintInspect.new(1)
+ assert_equal("<pretty_print:1>", a.inspect)
+ a = PrettyPrintInspectWithoutPrettyPrint.new
+ assert_raise(RuntimeError) { a.inspect }
+ end
+
+ def test_proc
+ a = proc {1}
+ assert_equal("#{a.inspect}\n", PP.pp(a, ''))
+ end
+
+ def test_to_s_with_iv
+ a = Object.new
+ def a.to_s() "aaa" end
+ a.instance_eval { @a = nil }
+ result = PP.pp(a, '')
+ assert_equal("#{a.inspect}\n", result)
+ assert_match(/\A#<Object.*>\n\z/m, result)
+ a = 1.0
+ a.instance_eval { @a = nil }
+ result = PP.pp(a, '')
+ assert_equal("#{a.inspect}\n", result)
+ end
+
+ def test_to_s_without_iv
+ a = Object.new
+ def a.to_s() "aaa" end
+ result = PP.pp(a, '')
+ assert_equal("#{a.inspect}\n", result)
+ assert_equal("aaa\n", result)
+ end
+ end
+
+ class PPCycleTest < Test::Unit::TestCase
+ def test_array
+ a = []
+ a << a
+ assert_equal("[[...]]\n", PP.pp(a, ''))
+ assert_equal("#{a.inspect}\n", PP.pp(a, ''))
+ end
+
+ def test_hash
+ a = {}
+ a[0] = a
+ assert_equal("{0=>{...}}\n", PP.pp(a, ''))
+ assert_equal("#{a.inspect}\n", PP.pp(a, ''))
+ end
+
+ S = Struct.new("S", :a, :b)
+ def test_struct
+ a = S.new(1,2)
+ a.b = a
+ assert_equal("#<struct Struct::S a=1, b=#<struct Struct::S:...>>\n", PP.pp(a, ''))
+ assert_equal("#{a.inspect}\n", PP.pp(a, ''))
+ end
+
+ def test_object
+ a = Object.new
+ a.instance_eval {@a = a}
+ assert_equal(a.inspect + "\n", PP.pp(a, ''))
+ end
+
+ def test_anonymous
+ a = Class.new.new
+ assert_equal(a.inspect + "\n", PP.pp(a, ''))
+ end
+
+ def test_withinspect
+ a = []
+ a << HasInspect.new(a)
+ assert_equal("[<inspect:[...]>]\n", PP.pp(a, ''))
+ assert_equal("#{a.inspect}\n", PP.pp(a, ''))
+ end
+
+ def test_share_nil
+ begin
+ PP.sharing_detection = true
+ a = [nil, nil]
+ assert_equal("[nil, nil]\n", PP.pp(a, ''))
+ ensure
+ PP.sharing_detection = false
+ end
+ end
+ end
+
+ class PPSingleLineTest < Test::Unit::TestCase
+ def test_hash
+ assert_equal("{1=>1}", PP.singleline_pp({ 1 => 1}, '')) # [ruby-core:02699]
+ assert_equal("[1#{', 1'*99}]", PP.singleline_pp([1]*100, ''))
+ end
+ end
+end
diff --git a/lib/prettyprint.rb b/lib/prettyprint.rb
index 2c1fff3258..315c422e9e 100644
--- a/lib/prettyprint.rb
+++ b/lib/prettyprint.rb
@@ -1,6 +1,8 @@
+# $Id$
+
# This class implements a pretty printing algorithm. It finds line breaks and
# nice indentations for grouped structure.
-#
+#
# By default, the class assumes that primitive elements are strings and each
# byte in the strings have single column in width. But it can be used for
# other situations by giving suitable arguments for some methods:
@@ -16,28 +18,28 @@
# == Bugs
# * Box based formatting?
# * Other (better) model/algorithm?
-#
+#
# == References
# Christian Lindig, Strictly Pretty, March 2000,
# http://www.st.cs.uni-sb.de/~lindig/papers/#pretty
-#
+#
# Philip Wadler, A prettier printer, March 1998,
# http://homepages.inf.ed.ac.uk/wadler/topics/language-design.html#prettier
-#
+#
# == Author
# Tanaka Akira <akr@m17n.org>
-#
+#
class PrettyPrint
# This is a convenience method which is same as follows:
- #
+ #
# begin
# q = PrettyPrint.new(output, maxwidth, newline, &genspace)
# ...
# q.flush
# output
# end
- #
+ #
def PrettyPrint.format(output='', maxwidth=79, newline="\n", genspace=lambda {|n| ' ' * n})
q = PrettyPrint.new(output, maxwidth, newline, &genspace)
yield q
@@ -375,3 +377,520 @@ class PrettyPrint
end
end
end
+
+if __FILE__ == $0
+ require 'test/unit'
+
+ class WadlerExample < Test::Unit::TestCase # :nodoc:
+ def setup
+ @tree = Tree.new("aaaa", Tree.new("bbbbb", Tree.new("ccc"),
+ Tree.new("dd")),
+ Tree.new("eee"),
+ Tree.new("ffff", Tree.new("gg"),
+ Tree.new("hhh"),
+ Tree.new("ii")))
+ end
+
+ def hello(width)
+ PrettyPrint.format('', width) {|hello|
+ hello.group {
+ hello.group {
+ hello.group {
+ hello.group {
+ hello.text 'hello'
+ hello.breakable; hello.text 'a'
+ }
+ hello.breakable; hello.text 'b'
+ }
+ hello.breakable; hello.text 'c'
+ }
+ hello.breakable; hello.text 'd'
+ }
+ }
+ end
+
+ def test_hello_00_06
+ expected = <<'End'.chomp
+hello
+a
+b
+c
+d
+End
+ assert_equal(expected, hello(0))
+ assert_equal(expected, hello(6))
+ end
+
+ def test_hello_07_08
+ expected = <<'End'.chomp
+hello a
+b
+c
+d
+End
+ assert_equal(expected, hello(7))
+ assert_equal(expected, hello(8))
+ end
+
+ def test_hello_09_10
+ expected = <<'End'.chomp
+hello a b
+c
+d
+End
+ out = hello(9); assert_equal(expected, out)
+ out = hello(10); assert_equal(expected, out)
+ end
+
+ def test_hello_11_12
+ expected = <<'End'.chomp
+hello a b c
+d
+End
+ assert_equal(expected, hello(11))
+ assert_equal(expected, hello(12))
+ end
+
+ def test_hello_13
+ expected = <<'End'.chomp
+hello a b c d
+End
+ assert_equal(expected, hello(13))
+ end
+
+ def tree(width)
+ PrettyPrint.format('', width) {|q| @tree.show(q)}
+ end
+
+ def test_tree_00_19
+ expected = <<'End'.chomp
+aaaa[bbbbb[ccc,
+ dd],
+ eee,
+ ffff[gg,
+ hhh,
+ ii]]
+End
+ assert_equal(expected, tree(0))
+ assert_equal(expected, tree(19))
+ end
+
+ def test_tree_20_22
+ expected = <<'End'.chomp
+aaaa[bbbbb[ccc, dd],
+ eee,
+ ffff[gg,
+ hhh,
+ ii]]
+End
+ assert_equal(expected, tree(20))
+ assert_equal(expected, tree(22))
+ end
+
+ def test_tree_23_43
+ expected = <<'End'.chomp
+aaaa[bbbbb[ccc, dd],
+ eee,
+ ffff[gg, hhh, ii]]
+End
+ assert_equal(expected, tree(23))
+ assert_equal(expected, tree(43))
+ end
+
+ def test_tree_44
+ assert_equal(<<'End'.chomp, tree(44))
+aaaa[bbbbb[ccc, dd], eee, ffff[gg, hhh, ii]]
+End
+ end
+
+ def tree_alt(width)
+ PrettyPrint.format('', width) {|q| @tree.altshow(q)}
+ end
+
+ def test_tree_alt_00_18
+ expected = <<'End'.chomp
+aaaa[
+ bbbbb[
+ ccc,
+ dd
+ ],
+ eee,
+ ffff[
+ gg,
+ hhh,
+ ii
+ ]
+]
+End
+ assert_equal(expected, tree_alt(0))
+ assert_equal(expected, tree_alt(18))
+ end
+
+ def test_tree_alt_19_20
+ expected = <<'End'.chomp
+aaaa[
+ bbbbb[ ccc, dd ],
+ eee,
+ ffff[
+ gg,
+ hhh,
+ ii
+ ]
+]
+End
+ assert_equal(expected, tree_alt(19))
+ assert_equal(expected, tree_alt(20))
+ end
+
+ def test_tree_alt_20_49
+ expected = <<'End'.chomp
+aaaa[
+ bbbbb[ ccc, dd ],
+ eee,
+ ffff[ gg, hhh, ii ]
+]
+End
+ assert_equal(expected, tree_alt(21))
+ assert_equal(expected, tree_alt(49))
+ end
+
+ def test_tree_alt_50
+ expected = <<'End'.chomp
+aaaa[ bbbbb[ ccc, dd ], eee, ffff[ gg, hhh, ii ] ]
+End
+ assert_equal(expected, tree_alt(50))
+ end
+
+ class Tree # :nodoc:
+ def initialize(string, *children)
+ @string = string
+ @children = children
+ end
+
+ def show(q)
+ q.group {
+ q.text @string
+ q.nest(@string.length) {
+ unless @children.empty?
+ q.text '['
+ q.nest(1) {
+ first = true
+ @children.each {|t|
+ if first
+ first = false
+ else
+ q.text ','
+ q.breakable
+ end
+ t.show(q)
+ }
+ }
+ q.text ']'
+ end
+ }
+ }
+ end
+
+ def altshow(q)
+ q.group {
+ q.text @string
+ unless @children.empty?
+ q.text '['
+ q.nest(2) {
+ q.breakable
+ first = true
+ @children.each {|t|
+ if first
+ first = false
+ else
+ q.text ','
+ q.breakable
+ end
+ t.altshow(q)
+ }
+ }
+ q.breakable
+ q.text ']'
+ end
+ }
+ end
+
+ end
+ end
+
+ class StrictPrettyExample < Test::Unit::TestCase # :nodoc:
+ def prog(width)
+ PrettyPrint.format('', width) {|q|
+ q.group {
+ q.group {q.nest(2) {
+ q.text "if"; q.breakable;
+ q.group {
+ q.nest(2) {
+ q.group {q.text "a"; q.breakable; q.text "=="}
+ q.breakable; q.text "b"}}}}
+ q.breakable
+ q.group {q.nest(2) {
+ q.text "then"; q.breakable;
+ q.group {
+ q.nest(2) {
+ q.group {q.text "a"; q.breakable; q.text "<<"}
+ q.breakable; q.text "2"}}}}
+ q.breakable
+ q.group {q.nest(2) {
+ q.text "else"; q.breakable;
+ q.group {
+ q.nest(2) {
+ q.group {q.text "a"; q.breakable; q.text "+"}
+ q.breakable; q.text "b"}}}}}
+ }
+ end
+
+ def test_00_04
+ expected = <<'End'.chomp
+if
+ a
+ ==
+ b
+then
+ a
+ <<
+ 2
+else
+ a
+ +
+ b
+End
+ assert_equal(expected, prog(0))
+ assert_equal(expected, prog(4))
+ end
+
+ def test_05
+ expected = <<'End'.chomp
+if
+ a
+ ==
+ b
+then
+ a
+ <<
+ 2
+else
+ a +
+ b
+End
+ assert_equal(expected, prog(5))
+ end
+
+ def test_06
+ expected = <<'End'.chomp
+if
+ a ==
+ b
+then
+ a <<
+ 2
+else
+ a +
+ b
+End
+ assert_equal(expected, prog(6))
+ end
+
+ def test_07
+ expected = <<'End'.chomp
+if
+ a ==
+ b
+then
+ a <<
+ 2
+else
+ a + b
+End
+ assert_equal(expected, prog(7))
+ end
+
+ def test_08
+ expected = <<'End'.chomp
+if
+ a == b
+then
+ a << 2
+else
+ a + b
+End
+ assert_equal(expected, prog(8))
+ end
+
+ def test_09
+ expected = <<'End'.chomp
+if a == b
+then
+ a << 2
+else
+ a + b
+End
+ assert_equal(expected, prog(9))
+ end
+
+ def test_10
+ expected = <<'End'.chomp
+if a == b
+then
+ a << 2
+else a + b
+End
+ assert_equal(expected, prog(10))
+ end
+
+ def test_11_31
+ expected = <<'End'.chomp
+if a == b
+then a << 2
+else a + b
+End
+ assert_equal(expected, prog(11))
+ assert_equal(expected, prog(15))
+ assert_equal(expected, prog(31))
+ end
+
+ def test_32
+ expected = <<'End'.chomp
+if a == b then a << 2 else a + b
+End
+ assert_equal(expected, prog(32))
+ end
+
+ end
+
+ class TailGroup < Test::Unit::TestCase # :nodoc:
+ def test_1
+ out = PrettyPrint.format('', 10) {|q|
+ q.group {
+ q.group {
+ q.text "abc"
+ q.breakable
+ q.text "def"
+ }
+ q.group {
+ q.text "ghi"
+ q.breakable
+ q.text "jkl"
+ }
+ }
+ }
+ assert_equal("abc defghi\njkl", out)
+ end
+ end
+
+ class NonString < Test::Unit::TestCase # :nodoc:
+ def format(width)
+ PrettyPrint.format([], width, 'newline', lambda {|n| "#{n} spaces"}) {|q|
+ q.text(3, 3)
+ q.breakable(1, 1)
+ q.text(3, 3)
+ }
+ end
+
+ def test_6
+ assert_equal([3, "newline", "0 spaces", 3], format(6))
+ end
+
+ def test_7
+ assert_equal([3, 1, 3], format(7))
+ end
+
+ end
+
+ class Fill < Test::Unit::TestCase # :nodoc:
+ def format(width)
+ PrettyPrint.format('', width) {|q|
+ q.group {
+ q.text 'abc'
+ q.fill_breakable
+ q.text 'def'
+ q.fill_breakable
+ q.text 'ghi'
+ q.fill_breakable
+ q.text 'jkl'
+ q.fill_breakable
+ q.text 'mno'
+ q.fill_breakable
+ q.text 'pqr'
+ q.fill_breakable
+ q.text 'stu'
+ }
+ }
+ end
+
+ def test_00_06
+ expected = <<'End'.chomp
+abc
+def
+ghi
+jkl
+mno
+pqr
+stu
+End
+ assert_equal(expected, format(0))
+ assert_equal(expected, format(6))
+ end
+
+ def test_07_10
+ expected = <<'End'.chomp
+abc def
+ghi jkl
+mno pqr
+stu
+End
+ assert_equal(expected, format(7))
+ assert_equal(expected, format(10))
+ end
+
+ def test_11_14
+ expected = <<'End'.chomp
+abc def ghi
+jkl mno pqr
+stu
+End
+ assert_equal(expected, format(11))
+ assert_equal(expected, format(14))
+ end
+
+ def test_15_18
+ expected = <<'End'.chomp
+abc def ghi jkl
+mno pqr stu
+End
+ assert_equal(expected, format(15))
+ assert_equal(expected, format(18))
+ end
+
+ def test_19_22
+ expected = <<'End'.chomp
+abc def ghi jkl mno
+pqr stu
+End
+ assert_equal(expected, format(19))
+ assert_equal(expected, format(22))
+ end
+
+ def test_23_26
+ expected = <<'End'.chomp
+abc def ghi jkl mno pqr
+stu
+End
+ assert_equal(expected, format(23))
+ assert_equal(expected, format(26))
+ end
+
+ def test_27
+ expected = <<'End'.chomp
+abc def ghi jkl mno pqr stu
+End
+ assert_equal(expected, format(27))
+ end
+
+ end
+end
diff --git a/lib/prime.rb b/lib/prime.rb
deleted file mode 100644
index 68253897ca..0000000000
--- a/lib/prime.rb
+++ /dev/null
@@ -1,468 +0,0 @@
-#
-# = prime.rb
-#
-# Prime numbers and factorization library.
-#
-# Copyright::
-# Copyright (c) 1998-2008 Keiju ISHITSUKA(SHL Japan Inc.)
-# Copyright (c) 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-#
-# Documentation::
-# Yuki Sonoda
-#
-
-require "singleton"
-require "forwardable"
-
-class Integer
- # Re-composes a prime factorization and returns the product.
- #
- # See Prime#int_from_prime_division for more details.
- def Integer.from_prime_division(pd)
- Prime.int_from_prime_division(pd)
- end
-
- # Returns the factorization of +self+.
- #
- # See Prime#prime_division for more details.
- def prime_division(generator = Prime::Generator23.new)
- Prime.prime_division(self, generator)
- end
-
- # Returns true if +self+ is a prime number, false for a composite.
- def prime?
- Prime.prime?(self)
- end
-
- # Iterates the given block over all prime numbers.
- #
- # See +Prime+#each for more details.
- def Integer.each_prime(ubound, &block) # :yields: prime
- Prime.each(ubound, &block)
- end
-end
-
-#
-# The set of all prime numbers.
-#
-# == Example
-# Prime.each(100) do |prime|
-# p prime #=> 2, 3, 5, 7, 11, ...., 97
-# end
-#
-# == Retrieving the instance
-# +Prime+.new is obsolete. Now +Prime+ has the default instance and you can
-# access it as +Prime+.instance.
-#
-# For convenience, each instance method of +Prime+.instance can be accessed
-# as a class method of +Prime+.
-#
-# e.g.
-# Prime.instance.prime?(2) #=> true
-# Prime.prime?(2) #=> true
-#
-# == Generators
-# A "generator" provides an implementation of enumerating pseudo-prime
-# numbers and it remembers the position of enumeration and upper bound.
-# Futhermore, it is a external iterator of prime enumeration which is
-# compatible to an Enumerator.
-#
-# +Prime+::+PseudoPrimeGenerator+ is the base class for generators.
-# There are few implementations of generator.
-#
-# [+Prime+::+EratosthenesGenerator+]
-# Uses eratosthenes's sieve.
-# [+Prime+::+TrialDivisionGenerator+]
-# Uses the trial division method.
-# [+Prime+::+Generator23+]
-# Generates all positive integers which is not divided by 2 nor 3.
-# This sequence is very bad as a pseudo-prime sequence. But this
-# is faster and uses much less memory than other generators. So,
-# it is suitable for factorizing an integer which is not large but
-# has many prime factors. e.g. for Prime#prime? .
-class Prime
- include Enumerable
- @the_instance = Prime.new
-
- # obsolete. Use +Prime+::+instance+ or class methods of +Prime+.
- def initialize
- @generator = EratosthenesGenerator.new
- extend OldCompatibility
- warn "Prime::new is obsolete. use Prime::instance or class methods of Prime."
- end
-
- class<<self
- extend Forwardable
- include Enumerable
- # Returns the default instance of Prime.
- def instance; @the_instance end
-
- def method_added(method) # :nodoc:
- (class<<self;self;end).def_delegator :instance, method
- end
- end
-
- # Iterates the given block over all prime numbers.
- #
- # == Parameters
- # +ubound+::
- # Optional. An arbitrary positive number.
- # The upper bound of enumeration. The method enumerates
- # prime numbers infinitely if +ubound+ is nil.
- # +generator+::
- # Optional. An implementation of pseudo-prime generator.
- #
- # == Return value
- # An evaluated value of the given block at the last time.
- # Or an enumerator which is compatible to an +Enumerator+
- # if no block given.
- #
- # == Description
- # Calls +block+ once for each prime number, passing the prime as
- # a parameter.
- #
- # +ubound+::
- # Upper bound of prime numbers. The iterator stops after
- # yields all prime numbers p <= +ubound+.
- #
- # == Note
- # +Prime+.+new+ returns a object extended by +Prime+::+OldCompatibility+
- # in order to compatibility to Ruby 1.8, and +Prime+#each is overwritten
- # by +Prime+::+OldCompatibility+#+each+.
- #
- # +Prime+.+new+ is now obsolete. Use +Prime+.+instance+.+each+ or simply
- # +Prime+.+each+.
- def each(ubound = nil, generator = EratosthenesGenerator.new, &block)
- generator.upper_bound = ubound
- generator.each(&block)
- end
-
-
- # Returns true if +value+ is prime, false for a composite.
- #
- # == Parameters
- # +value+:: an arbitrary integer to be checked.
- # +generator+:: optional. A pseudo-prime generator.
- def prime?(value, generator = Prime::Generator23.new)
- value = -value if value < 0
- return false if value < 2
- for num in generator
- q,r = value.divmod num
- return true if q < num
- return false if r == 0
- end
- end
-
- # Re-composes a prime factorization and returns the product.
- #
- # == Parameters
- # +pd+:: Array of pairs of integers. The each internal
- # pair consists of a prime number -- a prime factor --
- # and a natural number -- an exponent.
- #
- # == Example
- # For [[p_1, e_1], [p_2, e_2], ...., [p_n, e_n]], it returns
- # p_1**e_1 * p_2**e_2 * .... * p_n**e_n.
- #
- # Prime.int_from_prime_division([[2,2], [3,1]]) #=> 12
- def int_from_prime_division(pd)
- pd.inject(1){|value, (prime, index)|
- value *= prime**index
- }
- end
-
- # Returns the factorization of +value+.
- #
- # == Parameters
- # +value+:: An arbitrary integer.
- # +generator+:: Optional. A pseudo-prime generator.
- # +generator+.succ must return the next
- # pseudo-prime number in the ascendent
- # order. It must generate all prime numbers,
- # but may generate non prime numbers.
- #
- # === Exceptions
- # +ZeroDivisionError+:: when +value+ is zero.
- #
- # == Example
- # For an arbitrary integer
- # n = p_1**e_1 * p_2**e_2 * .... * p_n**e_n,
- # prime_division(n) returns
- # [[p_1, e_1], [p_2, e_2], ...., [p_n, e_n]].
- #
- # Prime.prime_division(12) #=> [[2,2], [3,1]]
- #
- def prime_division(value, generator= Prime::Generator23.new)
- raise ZeroDivisionError if value == 0
- if value < 0
- value = -value
- pv = [[-1, 1]]
- else
- pv = []
- end
- for prime in generator
- count = 0
- while (value1, mod = value.divmod(prime)
- mod) == 0
- value = value1
- count += 1
- end
- if count != 0
- pv.push [prime, count]
- end
- break if value1 <= prime
- end
- if value > 1
- pv.push [value, 1]
- end
- return pv
- end
-
- # An abstract class for enumerating pseudo-prime numbers.
- #
- # Concrete subclasses should override succ, next, rewind.
- class PseudoPrimeGenerator
- include Enumerable
-
- def initialize(ubound = nil)
- @ubound = ubound
- end
-
- def upper_bound=(ubound)
- @ubound = ubound
- end
- def upper_bound
- @ubound
- end
-
- # returns the next pseudo-prime number, and move the internal
- # position forward.
- #
- # +PseudoPrimeGenerator+#succ raises +NotImplementedError+.
- def succ
- raise NotImplementedError, "need to define `succ'"
- end
-
- # alias of +succ+.
- def next
- raise NotImplementedError, "need to define `next'"
- end
-
- # Rewinds the internal position for enumeration.
- #
- # See +Enumerator+#rewind.
- def rewind
- raise NotImplementedError, "need to define `rewind'"
- end
-
- # Iterates the given block for each prime numbers.
- def each(&block)
- return self.dup unless block
- if @ubound
- last_value = nil
- loop do
- prime = succ
- break last_value if prime > @ubound
- last_value = block.call(prime)
- end
- else
- loop do
- block.call(succ)
- end
- end
- end
-
- # see +Enumerator+#with_index.
- alias with_index each_with_index
-
- # see +Enumerator+#with_object.
- def with_object(obj)
- return enum_for(:with_object) unless block_given?
- each do |prime|
- yield prime, obj
- end
- end
- end
-
- # An implementation of +PseudoPrimeGenerator+.
- #
- # Uses +EratosthenesSieve+.
- class EratosthenesGenerator < PseudoPrimeGenerator
- def initialize
- @last_prime = nil
- end
-
- def succ
- @last_prime = @last_prime ? EratosthenesSieve.instance.next_to(@last_prime) : 2
- end
- def rewind
- initialize
- end
- alias next succ
- end
-
- # An implementation of +PseudoPrimeGenerator+ which uses
- # a prime table generated by trial division.
- class TrialDivisionGenerator<PseudoPrimeGenerator
- def initialize
- @index = -1
- end
-
- def succ
- TrialDivision.instance[@index += 1]
- end
- def rewind
- initialize
- end
- alias next succ
- end
-
- # Generates all integer which are greater than 2 and
- # are not divided by 2 nor 3.
- #
- # This is a pseudo-prime generator, suitable on
- # checking primality of a integer by brute force
- # method.
- class Generator23<PseudoPrimeGenerator
- def initialize
- @prime = 1
- @step = nil
- end
-
- def succ
- loop do
- if (@step)
- @prime += @step
- @step = 6 - @step
- else
- case @prime
- when 1; @prime = 2
- when 2; @prime = 3
- when 3; @prime = 5; @step = 2
- end
- end
- return @prime
- end
- end
- alias next succ
- def rewind
- initialize
- end
- end
-
-
-
-
- # Internal use. An implementation of prime table by trial division method.
- class TrialDivision
- include Singleton
-
- def initialize # :nodoc:
- # These are included as class variables to cache them for later uses. If memory
- # usage is a problem, they can be put in Prime#initialize as instance variables.
-
- # There must be no primes between @primes[-1] and @next_to_check.
- @primes = [2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53, 59, 61, 67, 71, 73, 79, 83, 89, 97, 101]
- # @next_to_check % 6 must be 1.
- @next_to_check = 103 # @primes[-1] - @primes[-1] % 6 + 7
- @ulticheck_index = 3 # @primes.index(@primes.reverse.find {|n|
- # n < Math.sqrt(@@next_to_check) })
- @ulticheck_next_squared = 121 # @primes[@ulticheck_index + 1] ** 2
- end
-
- # Returns the cached prime numbers.
- def cache
- return @primes
- end
- alias primes cache
- alias primes_so_far cache
-
- # Returns the +index+th prime number.
- #
- # +index+ is a 0-based index.
- def [](index)
- while index >= @primes.length
- # Only check for prime factors up to the square root of the potential primes,
- # but without the performance hit of an actual square root calculation.
- if @next_to_check + 4 > @ulticheck_next_squared
- @ulticheck_index += 1
- @ulticheck_next_squared = @primes.at(@ulticheck_index + 1) ** 2
- end
- # Only check numbers congruent to one and five, modulo six. All others
-
- # are divisible by two or three. This also allows us to skip checking against
- # two and three.
- @primes.push @next_to_check if @primes[2..@ulticheck_index].find {|prime| @next_to_check % prime == 0 }.nil?
- @next_to_check += 4
- @primes.push @next_to_check if @primes[2..@ulticheck_index].find {|prime| @next_to_check % prime == 0 }.nil?
- @next_to_check += 2
- end
- return @primes[index]
- end
- end
-
- # Internal use. An implementation of eratosthenes's sieve
- class EratosthenesSieve
- include Singleton
-
- def initialize # :nodoc:
- # bitmap for odd prime numbers less than 256.
- # For an arbitrary odd number n, @table[i][j] is 1 when n is prime where i,j = n.divmod(32) .
- @table = [0xcb6e, 0x64b4, 0x129a, 0x816d, 0x4c32, 0x864a, 0x820d, 0x2196]
- end
-
- # returns the least odd prime number which is greater than +n+.
- def next_to(n)
- n = (n-1).div(2)*2+3 # the next odd number of given n
- i,j = n.divmod(32)
- loop do
- extend_table until @table.length > i
- if !@table[i].zero?
- (j...32).step(2) do |k|
- return 32*i+k if !@table[i][k.div(2)].zero?
- end
- end
- i += 1; j = 1
- end
- end
-
- private
- def extend_table
- orig_len = @table.length
- new_len = [orig_len**2, orig_len+256].min
- lbound = orig_len*32
- ubound = new_len*32
- @table.fill(0xFFFF, orig_len...new_len)
- (3..Integer(Math.sqrt(ubound))).step(2) do |p|
- i, j = p.divmod(32)
- next if @table[i][j.div(2)].zero?
-
- start = (lbound.div(2*p)*2+1)*p # odd multiple of p which is greater than or equal to lbound
- (start...ubound).step(2*p) do |n|
- i, j = n.divmod(32)
- @table[i] &= 0xFFFF ^ (1<<(j.div(2)))
- end
- end
- end
- end
-
- # Provides a +Prime+ object with compatibility to Ruby 1.8 when instanciated via +Prime+.+new+.
- module OldCompatibility
- # Returns the next prime number and forwards internal pointer.
- def succ
- @generator.succ
- end
- alias next succ
-
- # Overwrites Prime#each.
- #
- # Iterates the given block over all prime numbers. Note that enumeration starts from
- # the current position of internal pointer, not rewound.
- def each(&block)
- return @generator.dup unless block_given?
- loop do
- yield succ
- end
- end
- end
-end
diff --git a/lib/profile.rb b/lib/profile.rb
index 2aeecce908..104cb205b9 100644
--- a/lib/profile.rb
+++ b/lib/profile.rb
@@ -1,9 +1,5 @@
require 'profiler'
-RubyVM::InstructionSequence.compile_option = {
- :trace_instruction => true,
- :specialized_instruction => false
-}
END {
Profiler__::print_profile(STDERR)
}
diff --git a/lib/profiler.rb b/lib/profiler.rb
index a4b8889093..9762fa1181 100644
--- a/lib/profiler.rb
+++ b/lib/profiler.rb
@@ -34,7 +34,7 @@ module_function
total = Process.times[0] - @@start
if total == 0 then total = 0.01 end
data = @@map.values
- data = data.sort_by{|x| -x[2]}
+ data.sort!{|a,b| b[2] <=> a[2]}
sum = 0
f.printf " %% cumulative self self total\n"
f.printf " time seconds seconds calls ms/call ms/call name\n"
diff --git a/lib/pstore.rb b/lib/pstore.rb
index 0d635c4ac2..ab495d9ed7 100644
--- a/lib/pstore.rb
+++ b/lib/pstore.rb
@@ -3,61 +3,59 @@
# pstore.rb -
# originally by matz
# documentation by Kev Jackson and James Edward Gray II
-# improved by Hongli Lai
#
# See PStore for documentation.
require "fileutils"
require "digest/md5"
-require "thread"
#
# PStore implements a file based persistence mechanism based on a Hash. User
# code can store hierarchies of Ruby objects (values) into the data store file
-# by name (keys). An object hierarchy may be just a single object. User code
+# by name (keys). An object hierarchy may be just a single object. User code
# may later read values back from the data store or even update data, as needed.
-#
+#
# The transactional behavior ensures that any changes succeed or fail together.
# This can be used to ensure that the data store is not left in a transitory
# state, where some values were updated but others were not.
-#
-# Behind the scenes, Ruby objects are stored to the data store file with
-# Marshal. That carries the usual limitations. Proc objects cannot be
+#
+# Behind the scenes, Ruby objects are stored to the data store file with
+# Marshal. That carries the usual limitations. Proc objects cannot be
# marshalled, for example.
#
# == Usage example:
-#
+#
# require "pstore"
-#
+#
# # a mock wiki object...
# class WikiPage
# def initialize( page_name, author, contents )
# @page_name = page_name
# @revisions = Array.new
-#
+#
# add_revision(author, contents)
# end
-#
+#
# attr_reader :page_name
-#
+#
# def add_revision( author, contents )
# @revisions << { :created => Time.now,
# :author => author,
# :contents => contents }
# end
-#
+#
# def wiki_page_references
# [@page_name] + @revisions.last[:contents].scan(/\b(?:[A-Z]+[a-z]+){2,}/)
# end
-#
+#
# # ...
# end
-#
+#
# # create a new page...
# home_page = WikiPage.new( "HomePage", "James Edward Gray II",
# "A page about the JoysOfDocumentation..." )
-#
+#
# # then we want to update page data and the index together, or not at all...
# wiki = PStore.new("wiki_pages.pstore")
# wiki.transaction do # begin transaction; do all of this or none of it
@@ -68,9 +66,9 @@ require "thread"
# # update wiki index...
# wiki[:wiki_index].push(*home_page.wiki_page_references)
# end # commit changes to wiki data store file
-#
+#
# ### Some time later... ###
-#
+#
# # read wiki data...
# wiki.transaction(true) do # begin read-only transaction, no changes allowed
# wiki.roots.each do |data_root_name|
@@ -79,20 +77,6 @@ require "thread"
# end
# end
#
-# == Transaction modes
-#
-# By default, file integrity is only ensured as long as the operating system
-# (and the underlying hardware) doesn't raise any unexpected I/O errors. If an
-# I/O error occurs while PStore is writing to its file, then the file will
-# become corrupted.
-#
-# You can prevent this by setting <em>pstore.ultra_safe = true</em>.
-# However, this results in a minor performance loss, and only works on platforms
-# that support atomic file renames. Please consult the documentation for
-# +ultra_safe+ for details.
-#
-# Needless to say, if you're storing valuable data with PStore, then you should
-# backup the PStore files from time to time.
class PStore
binmode = defined?(File::BINARY) ? File::BINARY : 0
RDWR_ACCESS = File::RDWR | File::CREAT | binmode
@@ -103,23 +87,11 @@ class PStore
class Error < StandardError
end
- # Whether PStore should do its best to prevent file corruptions, even when under
- # unlikely-to-occur error conditions such as out-of-space conditions and other
- # unusual OS filesystem errors. Setting this flag comes at the price in the form
- # of a performance loss.
- #
- # This flag only has effect on platforms on which file renames are atomic (e.g.
- # all POSIX platforms: Linux, MacOS X, FreeBSD, etc). The default value is false.
- attr_accessor :ultra_safe
-
- #
- # To construct a PStore object, pass in the _file_ path where you would like
+ #
+ # To construct a PStore object, pass in the _file_ path where you would like
# the data to be stored.
- #
- # PStore objects are always reentrant. But if _thread_safe_ is set to true,
- # then it will become thread-safe at the cost of a minor performance hit.
- #
- def initialize(file, thread_safe = false)
+ #
+ def initialize(file)
dir = File::dirname(file)
unless File::directory? dir
raise PStore::Error, format("directory %s does not exist", dir)
@@ -130,22 +102,16 @@ class PStore
@transaction = false
@filename = file
@abort = false
- @ultra_safe = false
- if @thread_safe
- @lock = Mutex.new
- else
- @lock = DummyMutex.new
- end
end
# Raises PStore::Error if the calling code is not in a PStore#transaction.
def in_transaction
raise PStore::Error, "not in transaction" unless @transaction
end
- #
+ #
# Raises PStore::Error if the calling code is not in a PStore#transaction or
# if the code is in a read-only PStore#transaction.
- #
+ #
def in_transaction_wr()
in_transaction()
raise PStore::Error, "in read-only transaction" if @rdonly
@@ -153,9 +119,9 @@ class PStore
private :in_transaction, :in_transaction_wr
#
- # Retrieves a value from the PStore file data, by _name_. The hierarchy of
+ # Retrieves a value from the PStore file data, by _name_. The hierarchy of
# Ruby objects stored under that root _name_ will be returned.
- #
+ #
# *WARNING*: This method is only valid in a PStore#transaction. It will
# raise PStore::Error if called at any other time.
#
@@ -164,22 +130,22 @@ class PStore
@table[name]
end
#
- # This method is just like PStore#[], save that you may also provide a
- # _default_ value for the object. In the event the specified _name_ is not
- # found in the data store, your _default_ will be returned instead. If you do
- # not specify a default, PStore::Error will be raised if the object is not
+ # This method is just like PStore#[], save that you may also provide a
+ # _default_ value for the object. In the event the specified _name_ is not
+ # found in the data store, your _default_ will be returned instead. If you do
+ # not specify a default, PStore::Error will be raised if the object is not
# found.
- #
+ #
# *WARNING*: This method is only valid in a PStore#transaction. It will
# raise PStore::Error if called at any other time.
#
def fetch(name, default=PStore::Error)
in_transaction
unless @table.key? name
- if default == PStore::Error
- raise PStore::Error, format("undefined root name `%s'", name)
+ if default==PStore::Error
+ raise PStore::Error, format("undefined root name `%s'", name)
else
- return default
+ return default
end
end
@table[name]
@@ -188,11 +154,11 @@ class PStore
# Stores an individual Ruby object or a hierarchy of Ruby objects in the data
# store file under the root _name_. Assigning to a _name_ already in the data
# store clobbers the old data.
- #
+ #
# == Example:
- #
+ #
# require "pstore"
- #
+ #
# store = PStore.new("data_file.pstore")
# store.transaction do # begin transaction
# # load some data into the store...
@@ -200,7 +166,7 @@ class PStore
# store[:obj_heirarchy] = { "Kev Jackson" => ["rational.rb", "pstore.rb"],
# "James Gray" => ["erb.rb", "pstore.rb"] }
# end # commit changes to data store file
- #
+ #
# *WARNING*: This method is only valid in a PStore#transaction and it cannot
# be read-only. It will raise PStore::Error if called at any other time.
#
@@ -210,7 +176,7 @@ class PStore
end
#
# Removes an object hierarchy from the data store, by _name_.
- #
+ #
# *WARNING*: This method is only valid in a PStore#transaction and it cannot
# be read-only. It will raise PStore::Error if called at any other time.
#
@@ -221,7 +187,7 @@ class PStore
#
# Returns the names of all object hierarchies currently in the store.
- #
+ #
# *WARNING*: This method is only valid in a PStore#transaction. It will
# raise PStore::Error if called at any other time.
#
@@ -231,7 +197,7 @@ class PStore
end
#
# Returns true if the supplied _name_ is currently in the data store.
- #
+ #
# *WARNING*: This method is only valid in a PStore#transaction. It will
# raise PStore::Error if called at any other time.
#
@@ -247,22 +213,22 @@ class PStore
#
# Ends the current PStore#transaction, committing any changes to the data
# store immediately.
- #
+ #
# == Example:
- #
+ #
# require "pstore"
- #
+ #
# store = PStore.new("data_file.pstore")
# store.transaction do # begin transaction
# # load some data into the store...
# store[:one] = 1
# store[:two] = 2
- #
+ #
# store.commit # end transaction here, committing changes
- #
+ #
# store[:three] = 3 # this change is never reached
# end
- #
+ #
# *WARNING*: This method is only valid in a PStore#transaction. It will
# raise PStore::Error if called at any other time.
#
@@ -274,21 +240,21 @@ class PStore
#
# Ends the current PStore#transaction, discarding any changes to the data
# store.
- #
+ #
# == Example:
- #
+ #
# require "pstore"
- #
+ #
# store = PStore.new("data_file.pstore")
# store.transaction do # begin transaction
# store[:one] = 1 # this change is not applied, see below...
# store[:two] = 2 # this change is not applied, see below...
- #
+ #
# store.abort # end transaction here, discard all changes
- #
+ #
# store[:three] = 3 # this change is never reached
# end
- #
+ #
# *WARNING*: This method is only valid in a PStore#transaction. It will
# raise PStore::Error if called at any other time.
#
@@ -300,223 +266,109 @@ class PStore
#
# Opens a new transaction for the data store. Code executed inside a block
- # passed to this method may read and write data to and from the data store
+ # passed to this method may read and write data to and from the data store
# file.
- #
+ #
# At the end of the block, changes are committed to the data store
- # automatically. You may exit the transaction early with a call to either
+ # automatically. You may exit the transaction early with a call to either
# PStore#commit or PStore#abort. See those methods for details about how
- # changes are handled. Raising an uncaught Exception in the block is
+ # changes are handled. Raising an uncaught Exception in the block is
# equivalent to calling PStore#abort.
- #
+ #
# If _read_only_ is set to +true+, you will only be allowed to read from the
# data store during the transaction and any attempts to change the data will
# raise a PStore::Error.
- #
+ #
# Note that PStore does not support nested transactions.
#
- def transaction(read_only = false, &block) # :yields: pstore
- value = nil
+ def transaction(read_only=false) # :yields: pstore
raise PStore::Error, "nested transaction" if @transaction
- @lock.synchronize do
+ begin
@rdonly = read_only
- @transaction = true
@abort = false
- file = open_and_lock_file(@filename, read_only)
- if file
- begin
- @table, checksum, original_data_size = load_data(file, read_only)
-
- catch(:pstore_abort_transaction) do
- value = yield(self)
- end
-
- if !@abort && !read_only
- save_data(checksum, original_data_size, file)
- end
- ensure
- file.close if !file.closed?
- end
+ @transaction = true
+ value = nil
+ new_file = @filename + ".new"
+
+ content = nil
+ unless read_only
+ file = File.open(@filename, RDWR_ACCESS)
+ file.flock(File::LOCK_EX)
+ commit_new(file) if FileTest.exist?(new_file)
+ content = file.read()
else
- # This can only occur if read_only == true.
- @table = {}
- catch(:pstore_abort_transaction) do
- value = yield(self)
- end
- end
- end
- value
- ensure
- @transaction = false
- end
-
- private
- # Constant for relieving Ruby's garbage collector.
- EMPTY_STRING = ""
- EMPTY_MARSHAL_DATA = Marshal.dump({})
- EMPTY_MARSHAL_CHECKSUM = Digest::MD5.digest(EMPTY_MARSHAL_DATA)
-
- class DummyMutex
- def synchronize
- yield
- end
- end
-
- #
- # Open the specified filename (either in read-only mode or in
- # read-write mode) and lock it for reading or writing.
- #
- # The opened File object will be returned. If _read_only_ is true,
- # and the file does not exist, then nil will be returned.
- #
- # All exceptions are propagated.
- #
- def open_and_lock_file(filename, read_only)
- if read_only
- begin
- file = File.new(filename, RD_ACCESS)
begin
+ file = File.open(@filename, RD_ACCESS)
file.flock(File::LOCK_SH)
- return file
- rescue
- file.close
- raise
+ content = (File.open(new_file, RD_ACCESS) {|n| n.read} rescue file.read())
+ rescue Errno::ENOENT
+ content = ""
end
- rescue Errno::ENOENT
- return nil
end
- else
- file = File.new(filename, RDWR_ACCESS)
- file.flock(File::LOCK_EX)
- return file
- end
- end
- # Load the given PStore file.
- # If +read_only+ is true, the unmarshalled Hash will be returned.
- # If +read_only+ is false, a 3-tuple will be returned: the unmarshalled
- # Hash, an MD5 checksum of the data, and the size of the data.
- def load_data(file, read_only)
- if read_only
- begin
- table = load(file)
- if !table.is_a?(Hash)
- raise Error, "PStore file seems to be corrupted."
+ if content != ""
+ @table = load(content)
+ if !read_only
+ size = content.size
+ md5 = Digest::MD5.digest(content)
end
- rescue EOFError
- # This seems to be a newly-created file.
- table = {}
- end
- table
- else
- data = file.read
- if data.empty?
- # This seems to be a newly-created file.
- table = {}
- checksum = empty_marshal_checksum
- size = empty_marshal_data.size
else
- table = load(data)
- checksum = Digest::MD5.digest(data)
- size = data.size
- if !table.is_a?(Hash)
- raise Error, "PStore file seems to be corrupted."
- end
+ @table = {}
end
- data.replace(EMPTY_STRING)
- [table, checksum, size]
- end
- end
+ content = nil # unreference huge data
- def on_windows?
- is_windows = RUBY_PLATFORM =~ /mswin/ ||
- RUBY_PLATFORM =~ /mingw/ ||
- RUBY_PLATFORM =~ /bccwin/ ||
- RUBY_PLATFORM =~ /wince/
- self.class.__send__(:define_method, :on_windows?) do
- is_windows
- end
- is_windows
- end
-
- # Check whether Marshal.dump supports the 'canonical' option. This option
- # makes sure that Marshal.dump always dumps data structures in the same order.
- # This is important because otherwise, the checksums that we generate may differ.
- def marshal_dump_supports_canonical_option?
- begin
- Marshal.dump(nil, -1, true)
- result = true
- rescue
- result = false
- end
- self.class.__send__(:define_method, :marshal_dump_supports_canonical_option?) do
- result
- end
- result
- end
-
- def save_data(original_checksum, original_file_size, file)
- # We only want to save the new data if the size or checksum has changed.
- # This results in less filesystem calls, which is good for performance.
- if marshal_dump_supports_canonical_option?
- new_data = Marshal.dump(@table, -1, true)
- else
- new_data = dump(@table)
- end
- new_checksum = Digest::MD5.digest(new_data)
-
- if new_data.size != original_file_size || new_checksum != original_checksum
- if @ultra_safe && !on_windows?
- # Windows doesn't support atomic file renames.
- save_data_with_atomic_file_rename_strategy(new_data, file)
- else
- save_data_with_fast_strategy(new_data, file)
+ begin
+ catch(:pstore_abort_transaction) do
+ value = yield(self)
+ end
+ rescue Exception
+ @abort = true
+ raise
+ ensure
+ if !read_only and !@abort
+ tmp_file = @filename + ".tmp"
+ content = dump(@table)
+ if !md5 || size != content.size || md5 != Digest::MD5.digest(content)
+ File.open(tmp_file, WR_ACCESS) {|t| t.write(content)}
+ File.rename(tmp_file, new_file)
+ commit_new(file)
+ end
+ content = nil # unreference huge data
+ end
end
- end
-
- new_data.replace(EMPTY_STRING)
- end
-
- def save_data_with_atomic_file_rename_strategy(data, file)
- temp_filename = "#{@filename}.tmp.#{Process.pid}.#{rand 1000000}"
- temp_file = File.new(temp_filename, WR_ACCESS)
- begin
- temp_file.flock(File::LOCK_EX)
- temp_file.write(data)
- temp_file.flush
- File.rename(temp_filename, @filename)
- rescue
- File.unlink(temp_file) rescue nil
- raise
ensure
- temp_file.close
+ @table = nil
+ @transaction = false
+ file.close if file
end
+ value
end
- def save_data_with_fast_strategy(data, file)
- file.rewind
- file.truncate(0)
- file.write(data)
- end
-
-
- # This method is just a wrapped around Marshal.dump
- # to allow subclass overriding used in YAML::Store.
+ # This method is just a wrapped around Marshal.dump.
def dump(table) # :nodoc:
Marshal::dump(table)
end
# This method is just a wrapped around Marshal.load.
- # to allow subclass overriding used in YAML::Store.
def load(content) # :nodoc:
Marshal::load(content)
end
- def empty_marshal_data
- EMPTY_MARSHAL_DATA
+ # This method is just a wrapped around Marshal.load.
+ def load_file(file) # :nodoc:
+ Marshal::load(file)
end
- def empty_marshal_checksum
- EMPTY_MARSHAL_CHECKSUM
+
+ private
+ # Commits changes to the data store file.
+ def commit_new(f)
+ f.truncate(0)
+ f.rewind
+ new_file = @filename + ".new"
+ File.open(new_file, RD_ACCESS) do |nf|
+ FileUtils.copy_stream(nf, f)
+ end
+ File.unlink(new_file)
end
end
diff --git a/lib/racc/parser.rb b/lib/racc/parser.rb
index fc9b390d59..a7408dd00a 100644
--- a/lib/racc/parser.rb
+++ b/lib/racc/parser.rb
@@ -159,6 +159,7 @@ module Racc
reduce_n, use_result, * = arg
_racc_init_sysvars
+ tok = nil
act = nil
i = nil
nerr = 0
@@ -188,7 +189,7 @@ module Racc
;
end
- while not(i = action_pointer[@racc_state[-1]]) or
+ while not (i = action_pointer[@racc_state[-1]]) or
not @racc_read_next or
@racc_t == 0 # $
unless i and i += @racc_t and
@@ -388,7 +389,7 @@ module Racc
toks.each {|t| out.print ' ', racc_token2str(t) }
end
out.puts " --> #{racc_token2str(sim)}"
-
+
racc_print_stacks tstack, vstack
@racc_debug_out.puts
end
diff --git a/lib/rake.rb b/lib/rake.rb
deleted file mode 100644
index c288e80b00..0000000000
--- a/lib/rake.rb
+++ /dev/null
@@ -1,2471 +0,0 @@
-#--
-
-# Copyright 2003, 2004, 2005, 2006, 2007, 2008 by Jim Weirich (jim@weirichhouse.org)
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-# IN THE SOFTWARE.
-#++
-#
-# = Rake -- Ruby Make
-#
-# This is the main file for the Rake application. Normally it is referenced
-# as a library via a require statement, but it can be distributed
-# independently as an application.
-
-RAKEVERSION = '0.8.4'
-
-require 'rbconfig'
-require 'fileutils'
-require 'singleton'
-require 'monitor'
-require 'optparse'
-require 'ostruct'
-
-require 'rake/win32'
-
-######################################################################
-# Rake extensions to Module.
-#
-class Module
- # Check for an existing method in the current class before extending. IF
- # the method already exists, then a warning is printed and the extension is
- # not added. Otherwise the block is yielded and any definitions in the
- # block will take effect.
- #
- # Usage:
- #
- # class String
- # rake_extension("xyz") do
- # def xyz
- # ...
- # end
- # end
- # end
- #
- def rake_extension(method)
- if method_defined?(method)
- $stderr.puts "WARNING: Possible conflict with Rake extension: #{self}##{method} already exists"
- else
- yield
- end
- end
-end # module Module
-
-
-######################################################################
-# User defined methods to be added to String.
-#
-class String
- rake_extension("ext") do
- # Replace the file extension with +newext+. If there is no extension on
- # the string, append the new extension to the end. If the new extension
- # is not given, or is the empty string, remove any existing extension.
- #
- # +ext+ is a user added method for the String class.
- def ext(newext='')
- return self.dup if ['.', '..'].include? self
- if newext != ''
- newext = (newext =~ /^\./) ? newext : ("." + newext)
- end
- self.chomp(File.extname(self)) << newext
- end
- end
-
- rake_extension("pathmap") do
- # Explode a path into individual components. Used by +pathmap+.
- def pathmap_explode
- head, tail = File.split(self)
- return [self] if head == self
- return [tail] if head == '.' || tail == '/'
- return [head, tail] if head == '/'
- return head.pathmap_explode + [tail]
- end
- protected :pathmap_explode
-
- # Extract a partial path from the path. Include +n+ directories from the
- # front end (left hand side) if +n+ is positive. Include |+n+|
- # directories from the back end (right hand side) if +n+ is negative.
- def pathmap_partial(n)
- dirs = File.dirname(self).pathmap_explode
- partial_dirs =
- if n > 0
- dirs[0...n]
- elsif n < 0
- dirs.reverse[0...-n].reverse
- else
- "."
- end
- File.join(partial_dirs)
- end
- protected :pathmap_partial
-
- # Preform the pathmap replacement operations on the given path. The
- # patterns take the form 'pat1,rep1;pat2,rep2...'.
- def pathmap_replace(patterns, &block)
- result = self
- patterns.split(';').each do |pair|
- pattern, replacement = pair.split(',')
- pattern = Regexp.new(pattern)
- if replacement == '*' && block_given?
- result = result.sub(pattern, &block)
- elsif replacement
- result = result.sub(pattern, replacement)
- else
- result = result.sub(pattern, '')
- end
- end
- result
- end
- protected :pathmap_replace
-
- # Map the path according to the given specification. The specification
- # controls the details of the mapping. The following special patterns are
- # recognized:
- #
- # * <b>%p</b> -- The complete path.
- # * <b>%f</b> -- The base file name of the path, with its file extension,
- # but without any directories.
- # * <b>%n</b> -- The file name of the path without its file extension.
- # * <b>%d</b> -- The directory list of the path.
- # * <b>%x</b> -- The file extension of the path. An empty string if there
- # is no extension.
- # * <b>%X</b> -- Everything *but* the file extension.
- # * <b>%s</b> -- The alternate file separater if defined, otherwise use
- # the standard file separator.
- # * <b>%%</b> -- A percent sign.
- #
- # The %d specifier can also have a numeric prefix (e.g. '%2d'). If the
- # number is positive, only return (up to) +n+ directories in the path,
- # starting from the left hand side. If +n+ is negative, return (up to)
- # |+n+| directories from the right hand side of the path.
- #
- # Examples:
- #
- # 'a/b/c/d/file.txt'.pathmap("%2d") => 'a/b'
- # 'a/b/c/d/file.txt'.pathmap("%-2d") => 'c/d'
- #
- # Also the %d, %p, %f, %n, %x, and %X operators can take a
- # pattern/replacement argument to perform simple string substititions on a
- # particular part of the path. The pattern and replacement are speparated
- # by a comma and are enclosed by curly braces. The replacement spec comes
- # after the % character but before the operator letter. (e.g.
- # "%{old,new}d"). Muliple replacement specs should be separated by
- # semi-colons (e.g. "%{old,new;src,bin}d").
- #
- # Regular expressions may be used for the pattern, and back refs may be
- # used in the replacement text. Curly braces, commas and semi-colons are
- # excluded from both the pattern and replacement text (let's keep parsing
- # reasonable).
- #
- # For example:
- #
- # "src/org/onestepback/proj/A.java".pathmap("%{^src,bin}X.class")
- #
- # returns:
- #
- # "bin/org/onestepback/proj/A.class"
- #
- # If the replacement text is '*', then a block may be provided to perform
- # some arbitrary calculation for the replacement.
- #
- # For example:
- #
- # "/path/to/file.TXT".pathmap("%X%{.*,*}x") { |ext|
- # ext.downcase
- # }
- #
- # Returns:
- #
- # "/path/to/file.txt"
- #
- def pathmap(spec=nil, &block)
- return self if spec.nil?
- result = ''
- spec.scan(/%\{[^}]*\}-?\d*[sdpfnxX%]|%-?\d+d|%.|[^%]+/) do |frag|
- case frag
- when '%f'
- result << File.basename(self)
- when '%n'
- result << File.basename(self, '.*')
- when '%d'
- result << File.dirname(self)
- when '%x'
- result << File.extname(self)
- when '%X'
- result << self.ext
- when '%p'
- result << self
- when '%s'
- result << (File::ALT_SEPARATOR || File::SEPARATOR)
- when '%-'
- # do nothing
- when '%%'
- result << "%"
- when /%(-?\d+)d/
- result << pathmap_partial($1.to_i)
- when /^%\{([^}]*)\}(\d*[dpfnxX])/
- patterns, operator = $1, $2
- result << pathmap('%' + operator).pathmap_replace(patterns, &block)
- when /^%/
- fail ArgumentError, "Unknown pathmap specifier #{frag} in '#{spec}'"
- else
- result << frag
- end
- end
- result
- end
- end
-end # class String
-
-##############################################################################
-module Rake
-
- # Errors -----------------------------------------------------------
-
- # Error indicating an ill-formed task declaration.
- class TaskArgumentError < ArgumentError
- end
-
- # Error indicating a recursion overflow error in task selection.
- class RuleRecursionOverflowError < StandardError
- def initialize(*args)
- super
- @targets = []
- end
-
- def add_target(target)
- @targets << target
- end
-
- def message
- super + ": [" + @targets.reverse.join(' => ') + "]"
- end
- end
-
- # --------------------------------------------------------------------------
- # Rake module singleton methods.
- #
- class << self
- # Current Rake Application
- def application
- @application ||= Rake::Application.new
- end
-
- # Set the current Rake application object.
- def application=(app)
- @application = app
- end
-
- # Return the original directory where the Rake application was started.
- def original_dir
- application.original_dir
- end
-
- end
-
- # ##########################################################################
- # Mixin for creating easily cloned objects.
- #
- module Cloneable
- # Clone an object by making a new object and setting all the instance
- # variables to the same values.
- def dup
- sibling = self.class.new
- instance_variables.each do |ivar|
- value = self.instance_variable_get(ivar)
- new_value = value.clone rescue value
- sibling.instance_variable_set(ivar, new_value)
- end
- sibling.taint if tainted?
- sibling
- end
-
- def clone
- sibling = dup
- sibling.freeze if frozen?
- sibling
- end
- end
-
- ####################################################################
- # TaskAguments manage the arguments passed to a task.
- #
- class TaskArguments
- include Enumerable
-
- attr_reader :names
-
- # Create a TaskArgument object with a list of named arguments
- # (given by :names) and a set of associated values (given by
- # :values). :parent is the parent argument object.
- def initialize(names, values, parent=nil)
- @names = names
- @parent = parent
- @hash = {}
- names.each_with_index { |name, i|
- @hash[name.to_sym] = values[i] unless values[i].nil?
- }
- end
-
- # Create a new argument scope using the prerequisite argument
- # names.
- def new_scope(names)
- values = names.collect { |n| self[n] }
- self.class.new(names, values, self)
- end
-
- # Find an argument value by name or index.
- def [](index)
- lookup(index.to_sym)
- end
-
- # Specify a hash of default values for task arguments. Use the
- # defaults only if there is no specific value for the given
- # argument.
- def with_defaults(defaults)
- @hash = defaults.merge(@hash)
- end
-
- def each(&block)
- @hash.each(&block)
- end
-
- def method_missing(sym, *args, &block)
- lookup(sym.to_sym)
- end
-
- def to_hash
- @hash
- end
-
- def to_s
- @hash.inspect
- end
-
- def inspect
- to_s
- end
-
- protected
-
- def lookup(name)
- if @hash.has_key?(name)
- @hash[name]
- elsif ENV.has_key?(name.to_s)
- ENV[name.to_s]
- elsif ENV.has_key?(name.to_s.upcase)
- ENV[name.to_s.upcase]
- elsif @parent
- @parent.lookup(name)
- end
- end
- end
-
- EMPTY_TASK_ARGS = TaskArguments.new([], [])
-
- ####################################################################
- # InvocationChain tracks the chain of task invocations to detect
- # circular dependencies.
- class InvocationChain
- def initialize(value, tail)
- @value = value
- @tail = tail
- end
-
- def member?(obj)
- @value == obj || @tail.member?(obj)
- end
-
- def append(value)
- if member?(value)
- fail RuntimeError, "Circular dependency detected: #{to_s} => #{value}"
- end
- self.class.new(value, self)
- end
-
- def to_s
- "#{prefix}#{@value}"
- end
-
- def self.append(value, chain)
- chain.append(value)
- end
-
- private
-
- def prefix
- "#{@tail.to_s} => "
- end
-
- class EmptyInvocationChain
- def member?(obj)
- false
- end
- def append(value)
- InvocationChain.new(value, self)
- end
- def to_s
- "TOP"
- end
- end
-
- EMPTY = EmptyInvocationChain.new
-
- end # class InvocationChain
-
-end # module Rake
-
-module Rake
-
- # #########################################################################
- # A Task is the basic unit of work in a Rakefile. Tasks have associated
- # actions (possibly more than one) and a list of prerequisites. When
- # invoked, a task will first ensure that all of its prerequisites have an
- # opportunity to run and then it will execute its own actions.
- #
- # Tasks are not usually created directly using the new method, but rather
- # use the +file+ and +task+ convenience methods.
- #
- class Task
- # List of prerequisites for a task.
- attr_reader :prerequisites
-
- # List of actions attached to a task.
- attr_reader :actions
-
- # Application owning this task.
- attr_accessor :application
-
- # Comment for this task. Restricted to a single line of no more than 50
- # characters.
- attr_reader :comment
-
- # Full text of the (possibly multi-line) comment.
- attr_reader :full_comment
-
- # Array of nested namespaces names used for task lookup by this task.
- attr_reader :scope
-
- # Return task name
- def to_s
- name
- end
-
- def inspect
- "<#{self.class} #{name} => [#{prerequisites.join(', ')}]>"
- end
-
- # List of sources for task.
- attr_writer :sources
- def sources
- @sources ||= []
- end
-
- # First source from a rule (nil if no sources)
- def source
- @sources.first if defined?(@sources)
- end
-
- # Create a task named +task_name+ with no actions or prerequisites. Use
- # +enhance+ to add actions and prerequisites.
- def initialize(task_name, app)
- @name = task_name.to_s
- @prerequisites = []
- @actions = []
- @already_invoked = false
- @full_comment = nil
- @comment = nil
- @lock = Monitor.new
- @application = app
- @scope = app.current_scope
- @arg_names = nil
- end
-
- # Enhance a task with prerequisites or actions. Returns self.
- def enhance(deps=nil, &block)
- @prerequisites |= deps if deps
- @actions << block if block_given?
- self
- end
-
- # Name of the task, including any namespace qualifiers.
- def name
- @name.to_s
- end
-
- # Name of task with argument list description.
- def name_with_args # :nodoc:
- if arg_description
- "#{name}#{arg_description}"
- else
- name
- end
- end
-
- # Argument description (nil if none).
- def arg_description # :nodoc:
- @arg_names ? "[#{(arg_names || []).join(',')}]" : nil
- end
-
- # Name of arguments for this task.
- def arg_names
- @arg_names || []
- end
-
- # Reenable the task, allowing its tasks to be executed if the task
- # is invoked again.
- def reenable
- @already_invoked = false
- end
-
- # Clear the existing prerequisites and actions of a rake task.
- def clear
- clear_prerequisites
- clear_actions
- self
- end
-
- # Clear the existing prerequisites of a rake task.
- def clear_prerequisites
- prerequisites.clear
- self
- end
-
- # Clear the existing actions on a rake task.
- def clear_actions
- actions.clear
- self
- end
-
- # Invoke the task if it is needed. Prerequites are invoked first.
- def invoke(*args)
- task_args = TaskArguments.new(arg_names, args)
- invoke_with_call_chain(task_args, InvocationChain::EMPTY)
- end
-
- # Same as invoke, but explicitly pass a call chain to detect
- # circular dependencies.
- def invoke_with_call_chain(task_args, invocation_chain) # :nodoc:
- new_chain = InvocationChain.append(self, invocation_chain)
- @lock.synchronize do
- if application.options.trace
- puts "** Invoke #{name} #{format_trace_flags}"
- end
- return if @already_invoked
- @already_invoked = true
- invoke_prerequisites(task_args, new_chain)
- execute(task_args) if needed?
- end
- end
- protected :invoke_with_call_chain
-
- # Invoke all the prerequisites of a task.
- def invoke_prerequisites(task_args, invocation_chain) # :nodoc:
- @prerequisites.each { |n|
- prereq = application[n, @scope]
- prereq_args = task_args.new_scope(prereq.arg_names)
- prereq.invoke_with_call_chain(prereq_args, invocation_chain)
- }
- end
-
- # Format the trace flags for display.
- def format_trace_flags
- flags = []
- flags << "first_time" unless @already_invoked
- flags << "not_needed" unless needed?
- flags.empty? ? "" : "(" + flags.join(", ") + ")"
- end
- private :format_trace_flags
-
- # Execute the actions associated with this task.
- def execute(args=nil)
- args ||= EMPTY_TASK_ARGS
- if application.options.dryrun
- puts "** Execute (dry run) #{name}"
- return
- end
- if application.options.trace
- puts "** Execute #{name}"
- end
- application.enhance_with_matching_rule(name) if @actions.empty?
- @actions.each do |act|
- case act.arity
- when 1
- act.call(self)
- else
- act.call(self, args)
- end
- end
- end
-
- # Is this task needed?
- def needed?
- true
- end
-
- # Timestamp for this task. Basic tasks return the current time for their
- # time stamp. Other tasks can be more sophisticated.
- def timestamp
- @prerequisites.collect { |p| application[p].timestamp }.max || Time.now
- end
-
- # Add a description to the task. The description can consist of an option
- # argument list (enclosed brackets) and an optional comment.
- def add_description(description)
- return if ! description
- comment = description.strip
- add_comment(comment) if comment && ! comment.empty?
- end
-
- # Writing to the comment attribute is the same as adding a description.
- def comment=(description)
- add_description(description)
- end
-
- # Add a comment to the task. If a comment alread exists, separate
- # the new comment with " / ".
- def add_comment(comment)
- if @full_comment
- @full_comment << " / "
- else
- @full_comment = ''
- end
- @full_comment << comment
- if @full_comment =~ /\A([^.]+?\.)( |$)/
- @comment = $1
- else
- @comment = @full_comment
- end
- end
- private :add_comment
-
- # Set the names of the arguments for this task. +args+ should be
- # an array of symbols, one for each argument name.
- def set_arg_names(args)
- @arg_names = args.map { |a| a.to_sym }
- end
-
- # Return a string describing the internal state of a task. Useful for
- # debugging.
- def investigation
- result = "------------------------------\n"
- result << "Investigating #{name}\n"
- result << "class: #{self.class}\n"
- result << "task needed: #{needed?}\n"
- result << "timestamp: #{timestamp}\n"
- result << "pre-requisites: \n"
- prereqs = @prerequisites.collect {|name| application[name]}
- prereqs.sort! {|a,b| a.timestamp <=> b.timestamp}
- prereqs.each do |p|
- result << "--#{p.name} (#{p.timestamp})\n"
- end
- latest_prereq = @prerequisites.collect{|n| application[n].timestamp}.max
- result << "latest-prerequisite time: #{latest_prereq}\n"
- result << "................................\n\n"
- return result
- end
-
- # ----------------------------------------------------------------
- # Rake Module Methods
- #
- class << self
-
- # Clear the task list. This cause rake to immediately forget all the
- # tasks that have been assigned. (Normally used in the unit tests.)
- def clear
- Rake.application.clear
- end
-
- # List of all defined tasks.
- def tasks
- Rake.application.tasks
- end
-
- # Return a task with the given name. If the task is not currently
- # known, try to synthesize one from the defined rules. If no rules are
- # found, but an existing file matches the task name, assume it is a file
- # task with no dependencies or actions.
- def [](task_name)
- Rake.application[task_name]
- end
-
- # TRUE if the task name is already defined.
- def task_defined?(task_name)
- Rake.application.lookup(task_name) != nil
- end
-
- # Define a task given +args+ and an option block. If a rule with the
- # given name already exists, the prerequisites and actions are added to
- # the existing task. Returns the defined task.
- def define_task(*args, &block)
- Rake.application.define_task(self, *args, &block)
- end
-
- # Define a rule for synthesizing tasks.
- def create_rule(*args, &block)
- Rake.application.create_rule(*args, &block)
- end
-
- # Apply the scope to the task name according to the rules for
- # this kind of task. Generic tasks will accept the scope as
- # part of the name.
- def scope_name(scope, task_name)
- (scope + [task_name]).join(':')
- end
-
- end # class << Rake::Task
- end # class Rake::Task
-
-
- # #########################################################################
- # A FileTask is a task that includes time based dependencies. If any of a
- # FileTask's prerequisites have a timestamp that is later than the file
- # represented by this task, then the file must be rebuilt (using the
- # supplied actions).
- #
- class FileTask < Task
-
- # Is this file task needed? Yes if it doesn't exist, or if its time stamp
- # is out of date.
- def needed?
- ! File.exist?(name) || out_of_date?(timestamp)
- end
-
- # Time stamp for file task.
- def timestamp
- if File.exist?(name)
- File.mtime(name.to_s)
- else
- Rake::EARLY
- end
- end
-
- private
-
- # Are there any prerequisites with a later time than the given time stamp?
- def out_of_date?(stamp)
- @prerequisites.any? { |n| application[n].timestamp > stamp}
- end
-
- # ----------------------------------------------------------------
- # Task class methods.
- #
- class << self
- # Apply the scope to the task name according to the rules for this kind
- # of task. File based tasks ignore the scope when creating the name.
- def scope_name(scope, task_name)
- task_name
- end
- end
- end # class Rake::FileTask
-
- # #########################################################################
- # A FileCreationTask is a file task that when used as a dependency will be
- # needed if and only if the file has not been created. Once created, it is
- # not re-triggered if any of its dependencies are newer, nor does trigger
- # any rebuilds of tasks that depend on it whenever it is updated.
- #
- class FileCreationTask < FileTask
- # Is this file task needed? Yes if it doesn't exist.
- def needed?
- ! File.exist?(name)
- end
-
- # Time stamp for file creation task. This time stamp is earlier
- # than any other time stamp.
- def timestamp
- Rake::EARLY
- end
- end
-
- # #########################################################################
- # Same as a regular task, but the immediate prerequisites are done in
- # parallel using Ruby threads.
- #
- class MultiTask < Task
- private
- def invoke_prerequisites(args, invocation_chain)
- threads = @prerequisites.collect { |p|
- Thread.new(p) { |r| application[r].invoke_with_call_chain(args, invocation_chain) }
- }
- threads.each { |t| t.join }
- end
- end
-end # module Rake
-
-# ###########################################################################
-# Task Definition Functions ...
-
-# Declare a basic task.
-#
-# Example:
-# task :clobber => [:clean] do
-# rm_rf "html"
-# end
-#
-def task(*args, &block)
- Rake::Task.define_task(*args, &block)
-end
-
-
-# Declare a file task.
-#
-# Example:
-# file "config.cfg" => ["config.template"] do
-# open("config.cfg", "w") do |outfile|
-# open("config.template") do |infile|
-# while line = infile.gets
-# outfile.puts line
-# end
-# end
-# end
-# end
-#
-def file(*args, &block)
- Rake::FileTask.define_task(*args, &block)
-end
-
-# Declare a file creation task.
-# (Mainly used for the directory command).
-def file_create(args, &block)
- Rake::FileCreationTask.define_task(args, &block)
-end
-
-# Declare a set of files tasks to create the given directories on demand.
-#
-# Example:
-# directory "testdata/doc"
-#
-def directory(dir)
- Rake.each_dir_parent(dir) do |d|
- file_create d do |t|
- mkdir_p t.name if ! File.exist?(t.name)
- end
- end
-end
-
-# Declare a task that performs its prerequisites in parallel. Multitasks does
-# *not* guarantee that its prerequisites will execute in any given order
-# (which is obvious when you think about it)
-#
-# Example:
-# multitask :deploy => [:deploy_gem, :deploy_rdoc]
-#
-def multitask(args, &block)
- Rake::MultiTask.define_task(args, &block)
-end
-
-# Create a new rake namespace and use it for evaluating the given block.
-# Returns a NameSpace object that can be used to lookup tasks defined in the
-# namespace.
-#
-# E.g.
-#
-# ns = namespace "nested" do
-# task :run
-# end
-# task_run = ns[:run] # find :run in the given namespace.
-#
-def namespace(name=nil, &block)
- Rake.application.in_namespace(name, &block)
-end
-
-# Declare a rule for auto-tasks.
-#
-# Example:
-# rule '.o' => '.c' do |t|
-# sh %{cc -o #{t.name} #{t.source}}
-# end
-#
-def rule(*args, &block)
- Rake::Task.create_rule(*args, &block)
-end
-
-# Describe the next rake task.
-#
-# Example:
-# desc "Run the Unit Tests"
-# task :test => [:build]
-# runtests
-# end
-#
-def desc(description)
- Rake.application.last_description = description
-end
-
-# Import the partial Rakefiles +fn+. Imported files are loaded _after_ the
-# current file is completely loaded. This allows the import statement to
-# appear anywhere in the importing file, and yet allowing the imported files
-# to depend on objects defined in the importing file.
-#
-# A common use of the import statement is to include files containing
-# dependency declarations.
-#
-# See also the --rakelibdir command line option.
-#
-# Example:
-# import ".depend", "my_rules"
-#
-def import(*fns)
- fns.each do |fn|
- Rake.application.add_import(fn)
- end
-end
-
-# ###########################################################################
-# This a FileUtils extension that defines several additional commands to be
-# added to the FileUtils utility functions.
-#
-module FileUtils
- RUBY = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name']).
- sub(/.*\s.*/m, '"\&"')
-
- OPT_TABLE['sh'] = %w(noop verbose)
- OPT_TABLE['ruby'] = %w(noop verbose)
-
- # Run the system command +cmd+. If multiple arguments are given the command
- # is not run with the shell (same semantics as Kernel::exec and
- # Kernel::system).
- #
- # Example:
- # sh %{ls -ltr}
- #
- # sh 'ls', 'file with spaces'
- #
- # # check exit status after command runs
- # sh %{grep pattern file} do |ok, res|
- # if ! ok
- # puts "pattern not found (status = #{res.exitstatus})"
- # end
- # end
- #
- def sh(*cmd, &block)
- options = (Hash === cmd.last) ? cmd.pop : {}
- unless block_given?
- show_command = cmd.join(" ")
- show_command = show_command[0,42] + "..."
- # TODO code application logic heref show_command.length > 45
- block = lambda { |ok, status|
- ok or fail "Command failed with status (#{status.exitstatus}): [#{show_command}]"
- }
- end
- if RakeFileUtils.verbose_flag == :default
- options[:verbose] = true
- else
- options[:verbose] ||= RakeFileUtils.verbose_flag
- end
- options[:noop] ||= RakeFileUtils.nowrite_flag
- rake_check_options options, :noop, :verbose
- rake_output_message cmd.join(" ") if options[:verbose]
- unless options[:noop]
- res = rake_system(*cmd)
- block.call(res, $?)
- end
- end
-
- def rake_system(*cmd)
- system(*cmd)
- end
- private :rake_system
-
- # Run a Ruby interpreter with the given arguments.
- #
- # Example:
- # ruby %{-pe '$_.upcase!' <README}
- #
- def ruby(*args,&block)
- options = (Hash === args.last) ? args.pop : {}
- if args.length > 1 then
- sh(*([RUBY] + args + [options]), &block)
- else
- sh("#{RUBY} #{args.first}", options, &block)
- end
- end
-
- LN_SUPPORTED = [true]
-
- # Attempt to do a normal file link, but fall back to a copy if the link
- # fails.
- def safe_ln(*args)
- unless LN_SUPPORTED[0]
- cp(*args)
- else
- begin
- ln(*args)
- rescue StandardError, NotImplementedError => ex
- LN_SUPPORTED[0] = false
- cp(*args)
- end
- end
- end
-
- # Split a file path into individual directory names.
- #
- # Example:
- # split_all("a/b/c") => ['a', 'b', 'c']
- #
- def split_all(path)
- head, tail = File.split(path)
- return [tail] if head == '.' || tail == '/'
- return [head, tail] if head == '/'
- return split_all(head) + [tail]
- end
-end
-
-# ###########################################################################
-# RakeFileUtils provides a custom version of the FileUtils methods that
-# respond to the <tt>verbose</tt> and <tt>nowrite</tt> commands.
-#
-module RakeFileUtils
- include FileUtils
-
- class << self
- attr_accessor :verbose_flag, :nowrite_flag
- end
- RakeFileUtils.verbose_flag = :default
- RakeFileUtils.nowrite_flag = false
-
- $fileutils_verbose = true
- $fileutils_nowrite = false
-
- FileUtils::OPT_TABLE.each do |name, opts|
- default_options = []
- if opts.include?(:verbose) || opts.include?("verbose")
- default_options << ':verbose => RakeFileUtils.verbose_flag'
- end
- if opts.include?(:noop) || opts.include?("noop")
- default_options << ':noop => RakeFileUtils.nowrite_flag'
- end
-
- next if default_options.empty?
- module_eval(<<-EOS, __FILE__, __LINE__ + 1)
- def #{name}( *args, &block )
- super(
- *rake_merge_option(args,
- #{default_options.join(', ')}
- ), &block)
- end
- EOS
- end
-
- # Get/set the verbose flag controlling output from the FileUtils utilities.
- # If verbose is true, then the utility method is echoed to standard output.
- #
- # Examples:
- # verbose # return the current value of the verbose flag
- # verbose(v) # set the verbose flag to _v_.
- # verbose(v) { code } # Execute code with the verbose flag set temporarily to _v_.
- # # Return to the original value when code is done.
- def verbose(value=nil)
- oldvalue = RakeFileUtils.verbose_flag
- RakeFileUtils.verbose_flag = value unless value.nil?
- if block_given?
- begin
- yield
- ensure
- RakeFileUtils.verbose_flag = oldvalue
- end
- end
- RakeFileUtils.verbose_flag
- end
-
- # Get/set the nowrite flag controlling output from the FileUtils utilities.
- # If verbose is true, then the utility method is echoed to standard output.
- #
- # Examples:
- # nowrite # return the current value of the nowrite flag
- # nowrite(v) # set the nowrite flag to _v_.
- # nowrite(v) { code } # Execute code with the nowrite flag set temporarily to _v_.
- # # Return to the original value when code is done.
- def nowrite(value=nil)
- oldvalue = RakeFileUtils.nowrite_flag
- RakeFileUtils.nowrite_flag = value unless value.nil?
- if block_given?
- begin
- yield
- ensure
- RakeFileUtils.nowrite_flag = oldvalue
- end
- end
- oldvalue
- end
-
- # Use this function to prevent protentially destructive ruby code from
- # running when the :nowrite flag is set.
- #
- # Example:
- #
- # when_writing("Building Project") do
- # project.build
- # end
- #
- # The following code will build the project under normal conditions. If the
- # nowrite(true) flag is set, then the example will print:
- # DRYRUN: Building Project
- # instead of actually building the project.
- #
- def when_writing(msg=nil)
- if RakeFileUtils.nowrite_flag
- puts "DRYRUN: #{msg}" if msg
- else
- yield
- end
- end
-
- # Merge the given options with the default values.
- def rake_merge_option(args, defaults)
- if Hash === args.last
- defaults.update(args.last)
- args.pop
- end
- args.push defaults
- args
- end
- private :rake_merge_option
-
- # Send the message to the default rake output (which is $stderr).
- def rake_output_message(message)
- $stderr.puts(message)
- end
- private :rake_output_message
-
- # Check that the options do not contain options not listed in +optdecl+. An
- # ArgumentError exception is thrown if non-declared options are found.
- def rake_check_options(options, *optdecl)
- h = options.dup
- optdecl.each do |name|
- h.delete name
- end
- raise ArgumentError, "no such option: #{h.keys.join(' ')}" unless h.empty?
- end
- private :rake_check_options
-
- extend self
-end
-
-# ###########################################################################
-# Include the FileUtils file manipulation functions in the top level module,
-# but mark them private so that they don't unintentionally define methods on
-# other objects.
-
-include RakeFileUtils
-private(*FileUtils.instance_methods(false))
-private(*RakeFileUtils.instance_methods(false))
-
-######################################################################
-module Rake
-
- # #########################################################################
- # A FileList is essentially an array with a few helper methods defined to
- # make file manipulation a bit easier.
- #
- # FileLists are lazy. When given a list of glob patterns for possible files
- # to be included in the file list, instead of searching the file structures
- # to find the files, a FileList holds the pattern for latter use.
- #
- # This allows us to define a number of FileList to match any number of
- # files, but only search out the actual files when then FileList itself is
- # actually used. The key is that the first time an element of the
- # FileList/Array is requested, the pending patterns are resolved into a real
- # list of file names.
- #
- class FileList
-
- include Cloneable
-
- # == Method Delegation
- #
- # The lazy evaluation magic of FileLists happens by implementing all the
- # array specific methods to call +resolve+ before delegating the heavy
- # lifting to an embedded array object (@items).
- #
- # In addition, there are two kinds of delegation calls. The regular kind
- # delegates to the @items array and returns the result directly. Well,
- # almost directly. It checks if the returned value is the @items object
- # itself, and if so will return the FileList object instead.
- #
- # The second kind of delegation call is used in methods that normally
- # return a new Array object. We want to capture the return value of these
- # methods and wrap them in a new FileList object. We enumerate these
- # methods in the +SPECIAL_RETURN+ list below.
-
- # List of array methods (that are not in +Object+) that need to be
- # delegated.
- ARRAY_METHODS = (Array.instance_methods - Object.instance_methods).map { |n| n.to_s }
-
- # List of additional methods that must be delegated.
- MUST_DEFINE = %w[to_a inspect]
-
- # List of methods that should not be delegated here (we define special
- # versions of them explicitly below).
- MUST_NOT_DEFINE = %w[to_a to_ary partition *]
-
- # List of delegated methods that return new array values which need
- # wrapping.
- SPECIAL_RETURN = %w[
- map collect sort sort_by select find_all reject grep
- compact flatten uniq values_at
- + - & |
- ]
-
- DELEGATING_METHODS = (ARRAY_METHODS + MUST_DEFINE - MUST_NOT_DEFINE).collect{ |s| s.to_s }.sort.uniq
-
- # Now do the delegation.
- DELEGATING_METHODS.each_with_index do |sym, i|
- if SPECIAL_RETURN.include?(sym)
- class_eval <<-END, __FILE__, __LINE__+1
- def #{sym}(*args, &block)
- resolve
- result = @items.send(:#{sym}, *args, &block)
- FileList.new.import(result)
- end
- END
- else
- class_eval <<-END, __FILE__, __LINE__+1
- def #{sym}(*args, &block)
- resolve
- result = @items.send(:#{sym}, *args, &block)
- result.object_id == @items.object_id ? self : result
- end
- END
- end
- end
-
- # Create a file list from the globbable patterns given. If you wish to
- # perform multiple includes or excludes at object build time, use the
- # "yield self" pattern.
- #
- # Example:
- # file_list = FileList.new('lib/**/*.rb', 'test/test*.rb')
- #
- # pkg_files = FileList.new('lib/**/*') do |fl|
- # fl.exclude(/\bCVS\b/)
- # end
- #
- def initialize(*patterns)
- @pending_add = []
- @pending = false
- @exclude_patterns = DEFAULT_IGNORE_PATTERNS.dup
- @exclude_procs = DEFAULT_IGNORE_PROCS.dup
- @exclude_re = nil
- @items = []
- patterns.each { |pattern| include(pattern) }
- yield self if block_given?
- end
-
- # Add file names defined by glob patterns to the file list. If an array
- # is given, add each element of the array.
- #
- # Example:
- # file_list.include("*.java", "*.cfg")
- # file_list.include %w( math.c lib.h *.o )
- #
- def include(*filenames)
- # TODO: check for pending
- filenames.each do |fn|
- if fn.respond_to? :to_ary
- include(*fn.to_ary)
- else
- @pending_add << fn
- end
- end
- @pending = true
- self
- end
- alias :add :include
-
- # Register a list of file name patterns that should be excluded from the
- # list. Patterns may be regular expressions, glob patterns or regular
- # strings. In addition, a block given to exclude will remove entries that
- # return true when given to the block.
- #
- # Note that glob patterns are expanded against the file system. If a file
- # is explicitly added to a file list, but does not exist in the file
- # system, then an glob pattern in the exclude list will not exclude the
- # file.
- #
- # Examples:
- # FileList['a.c', 'b.c'].exclude("a.c") => ['b.c']
- # FileList['a.c', 'b.c'].exclude(/^a/) => ['b.c']
- #
- # If "a.c" is a file, then ...
- # FileList['a.c', 'b.c'].exclude("a.*") => ['b.c']
- #
- # If "a.c" is not a file, then ...
- # FileList['a.c', 'b.c'].exclude("a.*") => ['a.c', 'b.c']
- #
- def exclude(*patterns, &block)
- patterns.each do |pat|
- @exclude_patterns << pat
- end
- if block_given?
- @exclude_procs << block
- end
- resolve_exclude if ! @pending
- self
- end
-
-
- # Clear all the exclude patterns so that we exclude nothing.
- def clear_exclude
- @exclude_patterns = []
- @exclude_procs = []
- calculate_exclude_regexp if ! @pending
- self
- end
-
- # Define equality.
- def ==(array)
- to_ary == array
- end
-
- # Return the internal array object.
- def to_a
- resolve
- @items
- end
-
- # Return the internal array object.
- def to_ary
- to_a
- end
-
- # Lie about our class.
- def is_a?(klass)
- klass == Array || super(klass)
- end
- alias kind_of? is_a?
-
- # Redefine * to return either a string or a new file list.
- def *(other)
- result = @items * other
- case result
- when Array
- FileList.new.import(result)
- else
- result
- end
- end
-
- # Resolve all the pending adds now.
- def resolve
- if @pending
- @pending = false
- @pending_add.each do |fn| resolve_add(fn) end
- @pending_add = []
- resolve_exclude
- end
- self
- end
-
- def calculate_exclude_regexp
- ignores = []
- @exclude_patterns.each do |pat|
- case pat
- when Regexp
- ignores << pat
- when /[*?]/
- Dir[pat].each do |p| ignores << p end
- else
- ignores << Regexp.quote(pat)
- end
- end
- if ignores.empty?
- @exclude_re = /^$/
- else
- re_str = ignores.collect { |p| "(" + p.to_s + ")" }.join("|")
- @exclude_re = Regexp.new(re_str)
- end
- end
-
- def resolve_add(fn)
- case fn
- when %r{[*?\[\{]}
- add_matching(fn)
- else
- self << fn
- end
- end
- private :resolve_add
-
- def resolve_exclude
- calculate_exclude_regexp
- reject! { |fn| exclude?(fn) }
- self
- end
- private :resolve_exclude
-
- # Return a new FileList with the results of running +sub+ against each
- # element of the oringal list.
- #
- # Example:
- # FileList['a.c', 'b.c'].sub(/\.c$/, '.o') => ['a.o', 'b.o']
- #
- def sub(pat, rep)
- inject(FileList.new) { |res, fn| res << fn.sub(pat,rep) }
- end
-
- # Return a new FileList with the results of running +gsub+ against each
- # element of the original list.
- #
- # Example:
- # FileList['lib/test/file', 'x/y'].gsub(/\//, "\\")
- # => ['lib\\test\\file', 'x\\y']
- #
- def gsub(pat, rep)
- inject(FileList.new) { |res, fn| res << fn.gsub(pat,rep) }
- end
-
- # Same as +sub+ except that the oringal file list is modified.
- def sub!(pat, rep)
- each_with_index { |fn, i| self[i] = fn.sub(pat,rep) }
- self
- end
-
- # Same as +gsub+ except that the original file list is modified.
- def gsub!(pat, rep)
- each_with_index { |fn, i| self[i] = fn.gsub(pat,rep) }
- self
- end
-
- # Apply the pathmap spec to each of the included file names, returning a
- # new file list with the modified paths. (See String#pathmap for
- # details.)
- def pathmap(spec=nil)
- collect { |fn| fn.pathmap(spec) }
- end
-
- # Return a new file list with <tt>String#ext</tt> method applied
- # to each member of the array.
- #
- # This method is a shortcut for:
- #
- # array.collect { |item| item.ext(newext) }
- #
- # +ext+ is a user added method for the Array class.
- def ext(newext='')
- collect { |fn| fn.ext(newext) }
- end
-
-
- # Grep each of the files in the filelist using the given pattern. If a
- # block is given, call the block on each matching line, passing the file
- # name, line number, and the matching line of text. If no block is given,
- # a standard emac style file:linenumber:line message will be printed to
- # standard out.
- def egrep(pattern, *opt)
- each do |fn|
- open(fn, "rb", *opt) do |inf|
- count = 0
- inf.each do |line|
- count += 1
- if pattern.match(line)
- if block_given?
- yield fn, count, line
- else
- puts "#{fn}:#{count}:#{line}"
- end
- end
- end
- end
- end
- end
-
- # Return a new file list that only contains file names from the current
- # file list that exist on the file system.
- def existing
- select { |fn| File.exist?(fn) }
- end
-
- # Modify the current file list so that it contains only file name that
- # exist on the file system.
- def existing!
- resolve
- @items = @items.select { |fn| File.exist?(fn) }
- self
- end
-
- # FileList version of partition. Needed because the nested arrays should
- # be FileLists in this version.
- def partition(&block) # :nodoc:
- resolve
- result = @items.partition(&block)
- [
- FileList.new.import(result[0]),
- FileList.new.import(result[1]),
- ]
- end
-
- # Convert a FileList to a string by joining all elements with a space.
- def to_s
- resolve
- self.join(' ')
- end
-
- # Add matching glob patterns.
- def add_matching(pattern)
- Dir[pattern].each do |fn|
- self << fn unless exclude?(fn)
- end
- end
- private :add_matching
-
- # Should the given file name be excluded?
- def exclude?(fn)
- calculate_exclude_regexp unless @exclude_re
- fn =~ @exclude_re || @exclude_procs.any? { |p| p.call(fn) }
- end
-
- DEFAULT_IGNORE_PATTERNS = [
- /(^|[\/\\])CVS([\/\\]|$)/,
- /(^|[\/\\])\.svn([\/\\]|$)/,
- /\.bak$/,
- /~$/
- ]
- DEFAULT_IGNORE_PROCS = [
- proc { |fn| fn =~ /(^|[\/\\])core$/ && ! File.directory?(fn) }
- ]
-# @exclude_patterns = DEFAULT_IGNORE_PATTERNS.dup
-
- def import(array)
- @items = array
- self
- end
-
- class << self
- # Create a new file list including the files listed. Similar to:
- #
- # FileList.new(*args)
- def [](*args)
- new(*args)
- end
- end
- end # FileList
-end
-
-module Rake
- class << self
-
- # Yield each file or directory component.
- def each_dir_parent(dir) # :nodoc:
- old_length = nil
- while dir != '.' && dir.length != old_length
- yield(dir)
- old_length = dir.length
- dir = File.dirname(dir)
- end
- end
- end
-end # module Rake
-
-# Alias FileList to be available at the top level.
-FileList = Rake::FileList
-
-# ###########################################################################
-module Rake
-
- # Default Rakefile loader used by +import+.
- class DefaultLoader
- def load(fn)
- Kernel.load(File.expand_path(fn))
- end
- end
-
- # EarlyTime is a fake timestamp that occurs _before_ any other time value.
- class EarlyTime
- include Comparable
- include Singleton
-
- def <=>(other)
- -1
- end
-
- def to_s
- "<EARLY TIME>"
- end
- end
-
- EARLY = EarlyTime.instance
-end # module Rake
-
-# ###########################################################################
-# Extensions to time to allow comparisons with an early time class.
-#
-class Time
- alias rake_original_time_compare :<=>
- def <=>(other)
- if Rake::EarlyTime === other
- - other.<=>(self)
- else
- rake_original_time_compare(other)
- end
- end
-end # class Time
-
-module Rake
-
- ####################################################################
- # The NameSpace class will lookup task names in the the scope
- # defined by a +namespace+ command.
- #
- class NameSpace
-
- # Create a namespace lookup object using the given task manager
- # and the list of scopes.
- def initialize(task_manager, scope_list)
- @task_manager = task_manager
- @scope = scope_list.dup
- end
-
- # Lookup a task named +name+ in the namespace.
- def [](name)
- @task_manager.lookup(name, @scope)
- end
-
- # Return the list of tasks defined in this and nested namespaces.
- def tasks
- @task_manager.tasks_in_scope(@scope)
- end
- end # NameSpace
-
-
- ####################################################################
- # The TaskManager module is a mixin for managing tasks.
- module TaskManager
- # Track the last comment made in the Rakefile.
- attr_accessor :last_description
- alias :last_comment :last_description # Backwards compatibility
-
- def initialize
- super
- @tasks = Hash.new
- @rules = Array.new
- @scope = Array.new
- @last_description = nil
- end
-
- def create_rule(*args, &block)
- pattern, arg_names, deps = resolve_args(args)
- pattern = Regexp.new(Regexp.quote(pattern) + '$') if String === pattern
- @rules << [pattern, deps, block]
- end
-
- def define_task(task_class, *args, &block)
- task_name, arg_names, deps = resolve_args(args)
- task_name = task_class.scope_name(@scope, task_name)
- deps = [deps] unless deps.respond_to?(:to_ary)
- deps = deps.collect {|d| d.to_s }
- task = intern(task_class, task_name)
- task.set_arg_names(arg_names) unless arg_names.empty?
- task.add_description(@last_description)
- @last_description = nil
- task.enhance(deps, &block)
- task
- end
-
- # Lookup a task. Return an existing task if found, otherwise
- # create a task of the current type.
- def intern(task_class, task_name)
- @tasks[task_name.to_s] ||= task_class.new(task_name, self)
- end
-
- # Find a matching task for +task_name+.
- def [](task_name, scopes=nil)
- task_name = task_name.to_s
- self.lookup(task_name, scopes) or
- enhance_with_matching_rule(task_name) or
- synthesize_file_task(task_name) or
- fail "Don't know how to build task '#{task_name}'"
- end
-
- def synthesize_file_task(task_name)
- return nil unless File.exist?(task_name)
- define_task(Rake::FileTask, task_name)
- end
-
- # Resolve the arguments for a task/rule. Returns a triplet of
- # [task_name, arg_name_list, prerequisites].
- def resolve_args(args)
- if args.last.is_a?(Hash)
- deps = args.pop
- resolve_args_with_dependencies(args, deps)
- else
- resolve_args_without_dependencies(args)
- end
- end
-
- # Resolve task arguments for a task or rule when there are no
- # dependencies declared.
- #
- # The patterns recognized by this argument resolving function are:
- #
- # task :t
- # task :t, [:a]
- # task :t, :a (deprecated)
- #
- def resolve_args_without_dependencies(args)
- task_name = args.shift
- if args.size == 1 && args.first.respond_to?(:to_ary)
- arg_names = args.first.to_ary
- else
- arg_names = args
- end
- [task_name, arg_names, []]
- end
- private :resolve_args_without_dependencies
-
- # Resolve task arguments for a task or rule when there are
- # dependencies declared.
- #
- # The patterns recognized by this argument resolving function are:
- #
- # task :t => [:d]
- # task :t, [a] => [:d]
- # task :t, :needs => [:d] (deprecated)
- # task :t, :a, :needs => [:d] (deprecated)
- #
- def resolve_args_with_dependencies(args, hash) # :nodoc:
- fail "Task Argument Error" if hash.size != 1
- key, value = hash.map { |k, v| [k,v] }.first
- if args.empty?
- task_name = key
- arg_names = []
- deps = value
- elsif key == :needs
- task_name = args.shift
- arg_names = args
- deps = value
- else
- task_name = args.shift
- arg_names = key
- deps = value
- end
- deps = [deps] unless deps.respond_to?(:to_ary)
- [task_name, arg_names, deps]
- end
- private :resolve_args_with_dependencies
-
- # If a rule can be found that matches the task name, enhance the
- # task with the prerequisites and actions from the rule. Set the
- # source attribute of the task appropriately for the rule. Return
- # the enhanced task or nil of no rule was found.
- def enhance_with_matching_rule(task_name, level=0)
- fail Rake::RuleRecursionOverflowError,
- "Rule Recursion Too Deep" if level >= 16
- @rules.each do |pattern, extensions, block|
- if md = pattern.match(task_name)
- task = attempt_rule(task_name, extensions, block, level)
- return task if task
- end
- end
- nil
- rescue Rake::RuleRecursionOverflowError => ex
- ex.add_target(task_name)
- fail ex
- end
-
- # List of all defined tasks in this application.
- def tasks
- @tasks.values.sort_by { |t| t.name }
- end
-
- # List of all the tasks defined in the given scope (and its
- # sub-scopes).
- def tasks_in_scope(scope)
- prefix = scope.join(":")
- tasks.select { |t|
- /^#{prefix}:/ =~ t.name
- }
- end
-
- # Clear all tasks in this application.
- def clear
- @tasks.clear
- @rules.clear
- end
-
- # Lookup a task, using scope and the scope hints in the task name.
- # This method performs straight lookups without trying to
- # synthesize file tasks or rules. Special scope names (e.g. '^')
- # are recognized. If no scope argument is supplied, use the
- # current scope. Return nil if the task cannot be found.
- def lookup(task_name, initial_scope=nil)
- initial_scope ||= @scope
- task_name = task_name.to_s
- if task_name =~ /^rake:/
- scopes = []
- task_name = task_name.sub(/^rake:/, '')
- elsif task_name =~ /^(\^+)/
- scopes = initial_scope[0, initial_scope.size - $1.size]
- task_name = task_name.sub(/^(\^+)/, '')
- else
- scopes = initial_scope
- end
- lookup_in_scope(task_name, scopes)
- end
-
- # Lookup the task name
- def lookup_in_scope(name, scope)
- n = scope.size
- while n >= 0
- tn = (scope[0,n] + [name]).join(':')
- task = @tasks[tn]
- return task if task
- n -= 1
- end
- nil
- end
- private :lookup_in_scope
-
- # Return the list of scope names currently active in the task
- # manager.
- def current_scope
- @scope.dup
- end
-
- # Evaluate the block in a nested namespace named +name+. Create
- # an anonymous namespace if +name+ is nil.
- def in_namespace(name)
- name ||= generate_name
- @scope.push(name)
- ns = NameSpace.new(self, @scope)
- yield(ns)
- ns
- ensure
- @scope.pop
- end
-
- private
-
- # Generate an anonymous namespace name.
- def generate_name
- @seed ||= 0
- @seed += 1
- "_anon_#{@seed}"
- end
-
- def trace_rule(level, message)
- puts "#{" "*level}#{message}" if Rake.application.options.trace_rules
- end
-
- # Attempt to create a rule given the list of prerequisites.
- def attempt_rule(task_name, extensions, block, level)
- sources = make_sources(task_name, extensions)
- prereqs = sources.collect { |source|
- trace_rule level, "Attempting Rule #{task_name} => #{source}"
- if File.exist?(source) || Rake::Task.task_defined?(source)
- trace_rule level, "(#{task_name} => #{source} ... EXIST)"
- source
- elsif parent = enhance_with_matching_rule(source, level+1)
- trace_rule level, "(#{task_name} => #{source} ... ENHANCE)"
- parent.name
- else
- trace_rule level, "(#{task_name} => #{source} ... FAIL)"
- return nil
- end
- }
- task = FileTask.define_task({task_name => prereqs}, &block)
- task.sources = prereqs
- task
- end
-
- # Make a list of sources from the list of file name extensions /
- # translation procs.
- def make_sources(task_name, extensions)
- extensions.collect { |ext|
- case ext
- when /%/
- task_name.pathmap(ext)
- when %r{/}
- ext
- when /^\./
- task_name.ext(ext)
- when String
- ext
- when Proc
- if ext.arity == 1
- ext.call(task_name)
- else
- ext.call
- end
- else
- fail "Don't know how to handle rule dependent: #{ext.inspect}"
- end
- }.flatten
- end
-
- end # TaskManager
-
- ######################################################################
- # Rake main application object. When invoking +rake+ from the
- # command line, a Rake::Application object is created and run.
- #
- class Application
- include TaskManager
-
- # The name of the application (typically 'rake')
- attr_reader :name
-
- # The original directory where rake was invoked.
- attr_reader :original_dir
-
- # Name of the actual rakefile used.
- attr_reader :rakefile
-
- # List of the top level task names (task names from the command line).
- attr_reader :top_level_tasks
-
- DEFAULT_RAKEFILES = ['rakefile', 'Rakefile', 'rakefile.rb', 'Rakefile.rb'].freeze
-
- # Initialize a Rake::Application object.
- def initialize
- super
- @name = 'rake'
- @rakefiles = DEFAULT_RAKEFILES.dup
- @rakefile = nil
- @pending_imports = []
- @imported = []
- @loaders = {}
- @default_loader = Rake::DefaultLoader.new
- @original_dir = Dir.pwd
- @top_level_tasks = []
- add_loader('rb', DefaultLoader.new)
- add_loader('rf', DefaultLoader.new)
- add_loader('rake', DefaultLoader.new)
- @tty_output = STDOUT.tty?
- end
-
- # Run the Rake application. The run method performs the following three steps:
- #
- # * Initialize the command line options (+init+).
- # * Define the tasks (+load_rakefile+).
- # * Run the top level tasks (+run_tasks+).
- #
- # If you wish to build a custom rake command, you should call +init+ on your
- # application. The define any tasks. Finally, call +top_level+ to run your top
- # level tasks.
- def run
- standard_exception_handling do
- init
- load_rakefile
- top_level
- end
- end
-
- # Initialize the command line parameters and app name.
- def init(app_name='rake')
- standard_exception_handling do
- @name = app_name
- handle_options
- collect_tasks
- end
- end
-
- # Find the rakefile and then load it and any pending imports.
- def load_rakefile
- standard_exception_handling do
- raw_load_rakefile
- end
- end
-
- # Run the top level tasks of a Rake application.
- def top_level
- standard_exception_handling do
- if options.show_tasks
- display_tasks_and_comments
- elsif options.show_prereqs
- display_prerequisites
- else
- top_level_tasks.each { |task_name| invoke_task(task_name) }
- end
- end
- end
-
- # Add a loader to handle imported files ending in the extension
- # +ext+.
- def add_loader(ext, loader)
- ext = ".#{ext}" unless ext =~ /^\./
- @loaders[ext] = loader
- end
-
- # Application options from the command line
- def options
- @options ||= OpenStruct.new
- end
-
- # private ----------------------------------------------------------------
-
- def invoke_task(task_string)
- name, args = parse_task_string(task_string)
- t = self[name]
- t.invoke(*args)
- end
-
- def parse_task_string(string)
- if string =~ /^([^\[]+)(\[(.*)\])$/
- name = $1
- args = $3.split(/\s*,\s*/)
- else
- name = string
- args = []
- end
- [name, args]
- end
-
- # Provide standard execption handling for the given block.
- def standard_exception_handling
- begin
- yield
- rescue SystemExit => ex
- # Exit silently with current status
- raise
- rescue OptionParser::InvalidOption => ex
- # Exit silently
- exit(false)
- rescue Exception => ex
- # Exit with error message
- $stderr.puts "#{name} aborted!"
- $stderr.puts ex.message
- if options.trace
- $stderr.puts ex.backtrace.join("\n")
- else
- $stderr.puts ex.backtrace.find {|str| str =~ /#{@rakefile}/ } || ""
- $stderr.puts "(See full trace by running task with --trace)"
- end
- exit(false)
- end
- end
-
- # True if one of the files in RAKEFILES is in the current directory.
- # If a match is found, it is copied into @rakefile.
- def have_rakefile
- @rakefiles.each do |fn|
- if File.exist?(fn)
- others = Dir.glob(fn, File::FNM_CASEFOLD)
- return others.size == 1 ? others.first : fn
- elsif fn == ''
- return fn
- end
- end
- return nil
- end
-
- # True if we are outputting to TTY, false otherwise
- def tty_output?
- @tty_output
- end
-
- # Override the detected TTY output state (mostly for testing)
- def tty_output=( tty_output_state )
- @tty_output = tty_output_state
- end
-
- # We will truncate output if we are outputting to a TTY or if we've been
- # given an explicit column width to honor
- def truncate_output?
- tty_output? || ENV['RAKE_COLUMNS']
- end
-
- # Display the tasks and comments.
- def display_tasks_and_comments
- displayable_tasks = tasks.select { |t|
- t.comment && t.name =~ options.show_task_pattern
- }
- if options.full_description
- displayable_tasks.each do |t|
- puts "#{name} #{t.name_with_args}"
- t.full_comment.split("\n").each do |line|
- puts " #{line}"
- end
- puts
- end
- else
- width = displayable_tasks.collect { |t| t.name_with_args.length }.max || 10
- max_column = truncate_output? ? terminal_width - name.size - width - 7 : nil
- displayable_tasks.each do |t|
- printf "#{name} %-#{width}s # %s\n",
- t.name_with_args, max_column ? truncate(t.comment, max_column) : t.comment
- end
- end
- end
-
- def terminal_width
- if ENV['RAKE_COLUMNS']
- result = ENV['RAKE_COLUMNS'].to_i
- else
- result = unix? ? dynamic_width : 80
- end
- (result < 10) ? 80 : result
- rescue
- 80
- end
-
- # Calculate the dynamic width of the
- def dynamic_width
- @dynamic_width ||= (dynamic_width_stty.nonzero? || dynamic_width_tput)
- end
-
- def dynamic_width_stty
- %x{stty size 2>/dev/null}.split[1].to_i
- end
-
- def dynamic_width_tput
- %x{tput cols 2>/dev/null}.to_i
- end
-
- def unix?
- RUBY_PLATFORM =~ /(aix|darwin|linux|(net|free|open)bsd|cygwin|solaris|irix|hpux)/i
- end
-
- def windows?
- Win32.windows?
- end
-
- def truncate(string, width)
- if string.length <= width
- string
- else
- ( string[0, width-3] || "" ) + "..."
- end
- end
-
- # Display the tasks and prerequisites
- def display_prerequisites
- tasks.each do |t|
- puts "#{name} #{t.name}"
- t.prerequisites.each { |pre| puts " #{pre}" }
- end
- end
-
- # A list of all the standard options used in rake, suitable for
- # passing to OptionParser.
- def standard_rake_options
- [
- ['--classic-namespace', '-C', "Put Task and FileTask in the top level namespace",
- lambda { |value|
- require 'rake/classic_namespace'
- options.classic_namespace = true
- }
- ],
- ['--describe', '-D [PATTERN]', "Describe the tasks (matching optional PATTERN), then exit.",
- lambda { |value|
- options.show_tasks = true
- options.full_description = true
- options.show_task_pattern = Regexp.new(value || '')
- }
- ],
- ['--dry-run', '-n', "Do a dry run without executing actions.",
- lambda { |value|
- verbose(true)
- nowrite(true)
- options.dryrun = true
- options.trace = true
- }
- ],
- ['--execute', '-e CODE', "Execute some Ruby code and exit.",
- lambda { |value|
- eval(value)
- exit
- }
- ],
- ['--execute-print', '-p CODE', "Execute some Ruby code, print the result, then exit.",
- lambda { |value|
- puts eval(value)
- exit
- }
- ],
- ['--execute-continue', '-E CODE',
- "Execute some Ruby code, then continue with normal task processing.",
- lambda { |value| eval(value) }
- ],
- ['--libdir', '-I LIBDIR', "Include LIBDIR in the search path for required modules.",
- lambda { |value| $:.push(value) }
- ],
- ['--prereqs', '-P', "Display the tasks and dependencies, then exit.",
- lambda { |value| options.show_prereqs = true }
- ],
- ['--quiet', '-q', "Do not log messages to standard output.",
- lambda { |value| verbose(false) }
- ],
- ['--rakefile', '-f [FILE]', "Use FILE as the rakefile.",
- lambda { |value|
- value ||= ''
- @rakefiles.clear
- @rakefiles << value
- }
- ],
- ['--rakelibdir', '--rakelib', '-R RAKELIBDIR',
- "Auto-import any .rake files in RAKELIBDIR. (default is 'rakelib')",
- lambda { |value| options.rakelib = value.split(':') }
- ],
- ['--require', '-r MODULE', "Require MODULE before executing rakefile.",
- lambda { |value|
- begin
- require value
- rescue LoadError => ex
- begin
- rake_require value
- rescue LoadError => ex2
- raise ex
- end
- end
- }
- ],
- ['--rules', "Trace the rules resolution.",
- lambda { |value| options.trace_rules = true }
- ],
- ['--no-search', '--nosearch', '-N', "Do not search parent directories for the Rakefile.",
- lambda { |value| options.nosearch = true }
- ],
- ['--silent', '-s', "Like --quiet, but also suppresses the 'in directory' announcement.",
- lambda { |value|
- verbose(false)
- options.silent = true
- }
- ],
- ['--system', '-g',
- "Using system wide (global) rakefiles (usually '~/.rake/*.rake').",
- lambda { |value| options.load_system = true }
- ],
- ['--no-system', '--nosystem', '-G',
- "Use standard project Rakefile search paths, ignore system wide rakefiles.",
- lambda { |value| options.ignore_system = true }
- ],
- ['--tasks', '-T [PATTERN]', "Display the tasks (matching optional PATTERN) with descriptions, then exit.",
- lambda { |value|
- options.show_tasks = true
- options.show_task_pattern = Regexp.new(value || '')
- options.full_description = false
- }
- ],
- ['--trace', '-t', "Turn on invoke/execute tracing, enable full backtrace.",
- lambda { |value|
- options.trace = true
- verbose(true)
- }
- ],
- ['--verbose', '-v', "Log message to standard output.",
- lambda { |value| verbose(true) }
- ],
- ['--version', '-V', "Display the program version.",
- lambda { |value|
- puts "rake, version #{RAKEVERSION}"
- exit
- }
- ]
- ]
- end
-
- # Read and handle the command line options.
- def handle_options
- options.rakelib = ['rakelib']
-
- OptionParser.new do |opts|
- opts.banner = "rake [-f rakefile] {options} targets..."
- opts.separator ""
- opts.separator "Options are ..."
-
- opts.on_tail("-h", "--help", "-H", "Display this help message.") do
- puts opts
- exit
- end
-
- standard_rake_options.each { |args| opts.on(*args) }
- end.parse!
-
- # If class namespaces are requested, set the global options
- # according to the values in the options structure.
- if options.classic_namespace
- $show_tasks = options.show_tasks
- $show_prereqs = options.show_prereqs
- $trace = options.trace
- $dryrun = options.dryrun
- $silent = options.silent
- end
- end
-
- # Similar to the regular Ruby +require+ command, but will check
- # for *.rake files in addition to *.rb files.
- def rake_require(file_name, paths=$LOAD_PATH, loaded=$")
- return false if loaded.include?(file_name)
- paths.each do |path|
- fn = file_name + ".rake"
- full_path = File.join(path, fn)
- if File.exist?(full_path)
- load full_path
- loaded << fn
- return true
- end
- end
- fail LoadError, "Can't find #{file_name}"
- end
-
- def find_rakefile_location
- here = Dir.pwd
- while ! (fn = have_rakefile)
- Dir.chdir("..")
- if Dir.pwd == here || options.nosearch
- return nil
- end
- here = Dir.pwd
- end
- [fn, here]
- ensure
- Dir.chdir(Rake.original_dir)
- end
-
- def raw_load_rakefile # :nodoc:
- rakefile, location = find_rakefile_location
- if (! options.ignore_system) &&
- (options.load_system || rakefile.nil?) &&
- system_dir && File.directory?(system_dir)
- puts "(in #{Dir.pwd})" unless options.silent
- glob("#{system_dir}/*.rake") do |name|
- add_import name
- end
- else
- fail "No Rakefile found (looking for: #{@rakefiles.join(', ')})" if
- rakefile.nil?
- @rakefile = rakefile
- Dir.chdir(location)
- puts "(in #{Dir.pwd})" unless options.silent
- $rakefile = @rakefile if options.classic_namespace
- load File.expand_path(@rakefile) if @rakefile && @rakefile != ''
- options.rakelib.each do |rlib|
- glob("#{rlib}/*.rake") do |name|
- add_import name
- end
- end
- end
- load_imports
- end
-
- def glob(path, &block)
- Dir[path.gsub("\\", '/')].each(&block)
- end
- private :glob
-
- # The directory path containing the system wide rakefiles.
- def system_dir
- @system_dir ||=
- begin
- if ENV['RAKE_SYSTEM']
- ENV['RAKE_SYSTEM']
- else
- standard_system_dir
- end
- end
- end
-
- # The standard directory containing system wide rake files.
- if Win32.windows?
- def standard_system_dir #:nodoc:
- Win32.win32_system_dir
- end
- else
- def standard_system_dir #:nodoc:
- File.expand_path('.rake', '~')
- end
- end
- private :standard_system_dir
-
- # Collect the list of tasks on the command line. If no tasks are
- # given, return a list containing only the default task.
- # Environmental assignments are processed at this time as well.
- def collect_tasks
- @top_level_tasks = []
- ARGV.each do |arg|
- if arg =~ /^(\w+)=(.*)$/
- ENV[$1] = $2
- else
- @top_level_tasks << arg unless arg =~ /^-/
- end
- end
- @top_level_tasks.push("default") if @top_level_tasks.size == 0
- end
-
- # Add a file to the list of files to be imported.
- def add_import(fn)
- @pending_imports << fn
- end
-
- # Load the pending list of imported files.
- def load_imports
- while fn = @pending_imports.shift
- next if @imported.member?(fn)
- if fn_task = lookup(fn)
- fn_task.invoke
- end
- ext = File.extname(fn)
- loader = @loaders[ext] || @default_loader
- loader.load(fn)
- @imported << fn
- end
- end
-
- # Warn about deprecated use of top level constant names.
- def const_warning(const_name)
- @const_warning ||= false
- if ! @const_warning
- $stderr.puts %{WARNING: Deprecated reference to top-level constant '#{const_name}' } +
- %{found at: #{rakefile_location}} # '
- $stderr.puts %{ Use --classic-namespace on rake command}
- $stderr.puts %{ or 'require "rake/classic_namespace"' in Rakefile}
- end
- @const_warning = true
- end
-
- def rakefile_location
- begin
- fail
- rescue RuntimeError => ex
- ex.backtrace.find {|str| str =~ /#{@rakefile}/ } || ""
- end
- end
- end
-end
-
-
-class Module
- # Rename the original handler to make it available.
- alias :rake_original_const_missing :const_missing
-
- # Check for deprecated uses of top level (i.e. in Object) uses of
- # Rake class names. If someone tries to reference the constant
- # name, display a warning and return the proper object. Using the
- # --classic-namespace command line option will define these
- # constants in Object and avoid this handler.
- def const_missing(const_name)
- case const_name
- when :Task
- Rake.application.const_warning(const_name)
- Rake::Task
- when :FileTask
- Rake.application.const_warning(const_name)
- Rake::FileTask
- when :FileCreationTask
- Rake.application.const_warning(const_name)
- Rake::FileCreationTask
- when :RakeApp
- Rake.application.const_warning(const_name)
- Rake::Application
- else
- rake_original_const_missing(const_name)
- end
- end
-end
diff --git a/lib/rake/classic_namespace.rb b/lib/rake/classic_namespace.rb
deleted file mode 100644
index feb7569966..0000000000
--- a/lib/rake/classic_namespace.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-# The following classes used to be in the top level namespace.
-# Loading this file enables compatibility with older Rakefile that
-# referenced Task from the top level.
-
-Task = Rake::Task
-FileTask = Rake::FileTask
-FileCreationTask = Rake::FileCreationTask
-RakeApp = Rake::Application
diff --git a/lib/rake/clean.rb b/lib/rake/clean.rb
deleted file mode 100644
index 62f27d5751..0000000000
--- a/lib/rake/clean.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-# The 'rake/clean' file defines two file lists (CLEAN and CLOBBER) and
-# two rake tasks (:clean and :clobber).
-#
-# [:clean] Clean up the project by deleting scratch files and backup
-# files. Add files to the CLEAN file list to have the :clean
-# target handle them.
-#
-# [:clobber] Clobber all generated and non-source files in a project.
-# The task depends on :clean, so all the clean files will
-# be deleted as well as files in the CLOBBER file list.
-# The intent of this task is to return a project to its
-# pristine, just unpacked state.
-
-require 'rake'
-
-CLEAN = Rake::FileList["**/*~", "**/*.bak", "**/core"]
-CLEAN.clear_exclude.exclude { |fn|
- fn.pathmap("%f") == 'core' && File.directory?(fn)
-}
-
-desc "Remove any temporary products."
-task :clean do
- CLEAN.each { |fn| rm_r fn rescue nil }
-end
-
-CLOBBER = Rake::FileList.new
-
-desc "Remove any generated file."
-task :clobber => [:clean] do
- CLOBBER.each { |fn| rm_r fn rescue nil }
-end
diff --git a/lib/rake/gempackagetask.rb b/lib/rake/gempackagetask.rb
deleted file mode 100644
index 3a99ff2b87..0000000000
--- a/lib/rake/gempackagetask.rb
+++ /dev/null
@@ -1,95 +0,0 @@
-# Define a package task library to aid in the definition of GEM
-# packages.
-
-require 'rubygems'
-require 'rake'
-require 'rake/packagetask'
-require 'rubygems/user_interaction'
-require 'rubygems/builder'
-
-module Rake
-
- # Create a package based upon a Gem spec. Gem packages, as well as
- # zip files and tar/gzipped packages can be produced by this task.
- #
- # In addition to the Rake targets generated by PackageTask, a
- # GemPackageTask will also generate the following tasks:
- #
- # [<b>"<em>package_dir</em>/<em>name</em>-<em>version</em>.gem"</b>]
- # Create a Ruby GEM package with the given name and version.
- #
- # Example using a Ruby GEM spec:
- #
- # require 'rubygems'
- #
- # spec = Gem::Specification.new do |s|
- # s.platform = Gem::Platform::RUBY
- # s.summary = "Ruby based make-like utility."
- # s.name = 'rake'
- # s.version = PKG_VERSION
- # s.requirements << 'none'
- # s.require_path = 'lib'
- # s.autorequire = 'rake'
- # s.files = PKG_FILES
- # s.description = <<EOF
- # Rake is a Make-like program implemented in Ruby. Tasks
- # and dependencies are specified in standard Ruby syntax.
- # EOF
- # end
- #
- # Rake::GemPackageTask.new(spec) do |pkg|
- # pkg.need_zip = true
- # pkg.need_tar = true
- # end
- #
- class GemPackageTask < PackageTask
- # Ruby GEM spec containing the metadata for this package. The
- # name, version and package_files are automatically determined
- # from the GEM spec and don't need to be explicitly provided.
- attr_accessor :gem_spec
-
- # Create a GEM Package task library. Automatically define the gem
- # if a block is given. If no block is supplied, then +define+
- # needs to be called to define the task.
- def initialize(gem_spec)
- init(gem_spec)
- yield self if block_given?
- define if block_given?
- end
-
- # Initialization tasks without the "yield self" or define
- # operations.
- def init(gem)
- super(gem.name, gem.version)
- @gem_spec = gem
- @package_files += gem_spec.files if gem_spec.files
- end
-
- # Create the Rake tasks and actions specified by this
- # GemPackageTask. (+define+ is automatically called if a block is
- # given to +new+).
- def define
- super
- task :package => [:gem]
- desc "Build the gem file #{gem_file}"
- task :gem => ["#{package_dir}/#{gem_file}"]
- file "#{package_dir}/#{gem_file}" => [package_dir] + @gem_spec.files do
- when_writing("Creating GEM") {
- Gem::Builder.new(gem_spec).build
- verbose(true) {
- mv gem_file, "#{package_dir}/#{gem_file}"
- }
- }
- end
- end
-
- def gem_file
- if @gem_spec.platform == Gem::Platform::RUBY
- "#{package_name}.gem"
- else
- "#{package_name}-#{@gem_spec.platform}.gem"
- end
- end
-
- end
-end
diff --git a/lib/rake/loaders/makefile.rb b/lib/rake/loaders/makefile.rb
deleted file mode 100644
index c77d428596..0000000000
--- a/lib/rake/loaders/makefile.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-module Rake
-
- # Makefile loader to be used with the import file loader.
- class MakefileLoader
- SPACE_MARK = "\0"
-
- # Load the makefile dependencies in +fn+.
- def load(fn)
- lines = open(fn) {|mf| mf.read}
- lines.gsub!(/\\ /, SPACE_MARK)
- lines.gsub!(/#[^\n]*\n/m, "")
- lines.gsub!(/\\\n/, ' ')
- lines.each_line do |line|
- process_line(line)
- end
- end
-
- private
-
- # Process one logical line of makefile data.
- def process_line(line)
- file_tasks, args = line.split(':', 2)
- return if args.nil?
- dependents = args.split
- file_tasks.scan(/\S+/) do |file_task|
- file_task = respace(file_task)
- file file_task => dependents
- end
- end
-
- def respace(str)
- str.tr(SPACE_MARK, ' ')
- end
- end
-
- # Install the handler
- Rake.application.add_loader('mf', MakefileLoader.new)
-end
diff --git a/lib/rake/packagetask.rb b/lib/rake/packagetask.rb
deleted file mode 100644
index de14fc77d8..0000000000
--- a/lib/rake/packagetask.rb
+++ /dev/null
@@ -1,182 +0,0 @@
-# Define a package task libarary to aid in the definition of
-# redistributable package files.
-
-require 'rake'
-require 'rake/tasklib'
-
-module Rake
-
- # Create a packaging task that will package the project into
- # distributable files (e.g zip archive or tar files).
- #
- # The PackageTask will create the following targets:
- #
- # [<b>:package</b>]
- # Create all the requested package files.
- #
- # [<b>:clobber_package</b>]
- # Delete all the package files. This target is automatically
- # added to the main clobber target.
- #
- # [<b>:repackage</b>]
- # Rebuild the package files from scratch, even if they are not out
- # of date.
- #
- # [<b>"<em>package_dir</em>/<em>name</em>-<em>version</em>.tgz"</b>]
- # Create a gzipped tar package (if <em>need_tar</em> is true).
- #
- # [<b>"<em>package_dir</em>/<em>name</em>-<em>version</em>.tar.gz"</b>]
- # Create a gzipped tar package (if <em>need_tar_gz</em> is true).
- #
- # [<b>"<em>package_dir</em>/<em>name</em>-<em>version</em>.tar.bz2"</b>]
- # Create a bzip2'd tar package (if <em>need_tar_bz2</em> is true).
- #
- # [<b>"<em>package_dir</em>/<em>name</em>-<em>version</em>.zip"</b>]
- # Create a zip package archive (if <em>need_zip</em> is true).
- #
- # Example:
- #
- # Rake::PackageTask.new("rake", "1.2.3") do |p|
- # p.need_tar = true
- # p.package_files.include("lib/**/*.rb")
- # end
- #
- class PackageTask < TaskLib
- # Name of the package (from the GEM Spec).
- attr_accessor :name
-
- # Version of the package (e.g. '1.3.2').
- attr_accessor :version
-
- # Directory used to store the package files (default is 'pkg').
- attr_accessor :package_dir
-
- # True if a gzipped tar file (tgz) should be produced (default is false).
- attr_accessor :need_tar
-
- # True if a gzipped tar file (tar.gz) should be produced (default is false).
- attr_accessor :need_tar_gz
-
- # True if a bzip2'd tar file (tar.bz2) should be produced (default is false).
- attr_accessor :need_tar_bz2
-
- # True if a zip file should be produced (default is false)
- attr_accessor :need_zip
-
- # List of files to be included in the package.
- attr_accessor :package_files
-
- # Tar command for gzipped or bzip2ed archives. The default is 'tar'.
- attr_accessor :tar_command
-
- # Zip command for zipped archives. The default is 'zip'.
- attr_accessor :zip_command
-
- # Create a Package Task with the given name and version.
- def initialize(name=nil, version=nil)
- init(name, version)
- yield self if block_given?
- define unless name.nil?
- end
-
- # Initialization that bypasses the "yield self" and "define" step.
- def init(name, version)
- @name = name
- @version = version
- @package_files = Rake::FileList.new
- @package_dir = 'pkg'
- @need_tar = false
- @need_tar_gz = false
- @need_tar_bz2 = false
- @need_zip = false
- @tar_command = 'tar'
- @zip_command = 'zip'
- end
-
- # Create the tasks defined by this task library.
- def define
- fail "Version required (or :noversion)" if @version.nil?
- @version = nil if :noversion == @version
-
- desc "Build all the packages"
- task :package
-
- desc "Force a rebuild of the package files"
- task :repackage => [:clobber_package, :package]
-
- desc "Remove package products"
- task :clobber_package do
- rm_r package_dir rescue nil
- end
-
- task :clobber => [:clobber_package]
-
- [
- [need_tar, tgz_file, "z"],
- [need_tar_gz, tar_gz_file, "z"],
- [need_tar_bz2, tar_bz2_file, "j"]
- ].each do |(need, file, flag)|
- if need
- task :package => ["#{package_dir}/#{file}"]
- file "#{package_dir}/#{file}" => [package_dir_path] + package_files do
- chdir(package_dir) do
- sh %{#{@tar_command} #{flag}cvf #{file} #{package_name}}
- end
- end
- end
- end
-
- if need_zip
- task :package => ["#{package_dir}/#{zip_file}"]
- file "#{package_dir}/#{zip_file}" => [package_dir_path] + package_files do
- chdir(package_dir) do
- sh %{#{@zip_command} -r #{zip_file} #{package_name}}
- end
- end
- end
-
- directory package_dir
-
- file package_dir_path => @package_files do
- mkdir_p package_dir rescue nil
- @package_files.each do |fn|
- f = File.join(package_dir_path, fn)
- fdir = File.dirname(f)
- mkdir_p(fdir) if !File.exist?(fdir)
- if File.directory?(fn)
- mkdir_p(f)
- else
- rm_f f
- safe_ln(fn, f)
- end
- end
- end
- self
- end
-
- def package_name
- @version ? "#{@name}-#{@version}" : @name
- end
-
- def package_dir_path
- "#{package_dir}/#{package_name}"
- end
-
- def tgz_file
- "#{package_name}.tgz"
- end
-
- def tar_gz_file
- "#{package_name}.tar.gz"
- end
-
- def tar_bz2_file
- "#{package_name}.tar.bz2"
- end
-
- def zip_file
- "#{package_name}.zip"
- end
- end
-
-end
diff --git a/lib/rake/rake_test_loader.rb b/lib/rake/rake_test_loader.rb
deleted file mode 100644
index 8d7dad3c94..0000000000
--- a/lib/rake/rake_test_loader.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env ruby
-
-# Load the test files from the command line.
-
-ARGV.each { |f| load f unless f =~ /^-/ }
diff --git a/lib/rake/rdoctask.rb b/lib/rake/rdoctask.rb
deleted file mode 100644
index de020f4d87..0000000000
--- a/lib/rake/rdoctask.rb
+++ /dev/null
@@ -1,207 +0,0 @@
-require 'rake'
-require 'rake/tasklib'
-
-module Rake
-
- # Create a documentation task that will generate the RDoc files for
- # a project.
- #
- # The RDocTask will create the following targets:
- #
- # [<b>:<em>rdoc</em></b>]
- # Main task for this RDOC task.
- #
- # [<b>:clobber_<em>rdoc</em></b>]
- # Delete all the rdoc files. This target is automatically
- # added to the main clobber target.
- #
- # [<b>:re<em>rdoc</em></b>]
- # Rebuild the rdoc files from scratch, even if they are not out
- # of date.
- #
- # Simple example:
- #
- # Rake::RDocTask.new do |rd|
- # rd.main = "README.rdoc"
- # rd.rdoc_files.include("README.rdoc", "lib/**/*.rb")
- # end
- #
- # The +rd+ object passed to the block is an RDocTask object. See the
- # attributes list for the RDocTask class for available customization options.
- #
- # == Specifying different task names
- #
- # You may wish to give the task a different name, such as if you are
- # generating two sets of documentation. For instance, if you want to have a
- # development set of documentation including private methods:
- #
- # Rake::RDocTask.new(:rdoc_dev) do |rd|
- # rd.main = "README.doc"
- # rd.rdoc_files.include("README.rdoc", "lib/**/*.rb")
- # rd.options << "--all"
- # end
- #
- # The tasks would then be named :<em>rdoc_dev</em>, :clobber_<em>rdoc_dev</em>, and
- # :re<em>rdoc_dev</em>.
- #
- # If you wish to have completely different task names, then pass a Hash as
- # first argument. With the <tt>:rdoc</tt>, <tt>:clobber_rdoc</tt> and
- # <tt>:rerdoc</tt> options, you can customize the task names to your liking.
- # For example:
- #
- # Rake::RDocTask.new(:rdoc => "rdoc", :clobber_rdoc => "rdoc:clean", :rerdoc => "rdoc:force")
- #
- # This will create the tasks <tt>:rdoc</tt>, <tt>:rdoc_clean</tt> and
- # <tt>:rdoc:force</tt>.
- #
- class RDocTask < TaskLib
- # Name of the main, top level task. (default is :rdoc)
- attr_accessor :name
-
- # Name of directory to receive the html output files. (default is "html")
- attr_accessor :rdoc_dir
-
- # Title of RDoc documentation. (defaults to rdoc's default)
- attr_accessor :title
-
- # Name of file to be used as the main, top level file of the
- # RDoc. (default is none)
- attr_accessor :main
-
- # Name of template to be used by rdoc. (defaults to rdoc's default)
- attr_accessor :template
-
- # List of files to be included in the rdoc generation. (default is [])
- attr_accessor :rdoc_files
-
- # Additional list of options to be passed rdoc. (default is [])
- attr_accessor :options
-
- # Whether to run the rdoc process as an external shell (default is false)
- attr_accessor :external
-
- attr_accessor :inline_source
-
- # Create an RDoc task with the given name. See the RDocTask class overview
- # for documentation.
- def initialize(name = :rdoc) # :yield: self
- if name.is_a?(Hash)
- invalid_options = name.keys.map { |k| k.to_sym } - [:rdoc, :clobber_rdoc, :rerdoc]
- if !invalid_options.empty?
- raise ArgumentError, "Invalid option(s) passed to RDocTask.new: #{invalid_options.join(", ")}"
- end
- end
-
- @name = name
- @rdoc_files = Rake::FileList.new
- @rdoc_dir = 'html'
- @main = nil
- @title = nil
- @template = nil
- @external = false
- @inline_source = true
- @options = []
- yield self if block_given?
- define
- end
-
- # Create the tasks defined by this task lib.
- def define
- if rdoc_task_name != "rdoc"
- desc "Build the RDOC HTML Files"
- else
- desc "Build the #{rdoc_task_name} HTML Files"
- end
- task rdoc_task_name
-
- desc "Force a rebuild of the RDOC files"
- task rerdoc_task_name => [clobber_task_name, rdoc_task_name]
-
- desc "Remove rdoc products"
- task clobber_task_name do
- rm_r rdoc_dir rescue nil
- end
-
- task :clobber => [clobber_task_name]
-
- directory @rdoc_dir
- task rdoc_task_name => [rdoc_target]
- file rdoc_target => @rdoc_files + [Rake.application.rakefile] do
- rm_r @rdoc_dir rescue nil
- @before_running_rdoc.call if @before_running_rdoc
- args = option_list + @rdoc_files
- if @external
- argstring = args.join(' ')
- sh %{ruby -Ivendor vender/rd #{argstring}}
- else
- require 'rdoc/rdoc'
- RDoc::RDoc.new.document(args)
- end
- end
- self
- end
-
- def option_list
- result = @options.dup
- result << "-o" << @rdoc_dir
- result << "--main" << quote(main) if main
- result << "--title" << quote(title) if title
- result << "-T" << quote(template) if template
- result << "--inline-source" if inline_source && !@options.include?("--inline-source") && !@options.include?("-S")
- result
- end
-
- def quote(str)
- if @external
- "'#{str}'"
- else
- str
- end
- end
-
- def option_string
- option_list.join(' ')
- end
-
- # The block passed to this method will be called just before running the
- # RDoc generator. It is allowed to modify RDocTask attributes inside the
- # block.
- def before_running_rdoc(&block)
- @before_running_rdoc = block
- end
-
- private
-
- def rdoc_target
- "#{rdoc_dir}/index.html"
- end
-
- def rdoc_task_name
- case name
- when Hash
- (name[:rdoc] || "rdoc").to_s
- else
- name.to_s
- end
- end
-
- def clobber_task_name
- case name
- when Hash
- (name[:clobber_rdoc] || "clobber_rdoc").to_s
- else
- "clobber_#{name}"
- end
- end
-
- def rerdoc_task_name
- case name
- when Hash
- (name[:rerdoc] || "rerdoc").to_s
- else
- "re#{name}"
- end
- end
-
- end
-end
diff --git a/lib/rake/runtest.rb b/lib/rake/runtest.rb
deleted file mode 100644
index f6928d57b8..0000000000
--- a/lib/rake/runtest.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-require 'test/unit'
-require 'test/unit/assertions'
-
-module Rake
- include Test::Unit::Assertions
-
- def run_tests(pattern='test/test*.rb', log_enabled=false)
- Dir["#{pattern}"].each { |fn|
- puts fn if log_enabled
- begin
- load fn
- rescue Exception => ex
- puts "Error in #{fn}: #{ex.message}"
- puts ex.backtrace
- assert false
- end
- }
- end
-
- extend self
-end
diff --git a/lib/rake/tasklib.rb b/lib/rake/tasklib.rb
deleted file mode 100644
index a5a4494369..0000000000
--- a/lib/rake/tasklib.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-require 'rake'
-
-module Rake
-
- # Base class for Task Libraries.
- class TaskLib
- include Cloneable
-
- # Make a symbol by pasting two strings together.
- #
- # NOTE: DEPRECATED! This method is kinda stupid. I don't know why
- # I didn't just use string interpolation. But now other task
- # libraries depend on this so I can't remove it without breaking
- # other people's code. So for now it stays for backwards
- # compatibility. BUT DON'T USE IT.
- def paste(a,b) # :nodoc:
- (a.to_s + b.to_s).intern
- end
- end
-
-end
diff --git a/lib/rake/testtask.rb b/lib/rake/testtask.rb
deleted file mode 100644
index 3444012500..0000000000
--- a/lib/rake/testtask.rb
+++ /dev/null
@@ -1,159 +0,0 @@
-# Define a task library for running unit tests.
-
-require 'rake'
-require 'rake/tasklib'
-
-module Rake
-
- # Create a task that runs a set of tests.
- #
- # Example:
- #
- # Rake::TestTask.new do |t|
- # t.libs << "test"
- # t.test_files = FileList['test/test*.rb']
- # t.verbose = true
- # end
- #
- # If rake is invoked with a "TEST=filename" command line option,
- # then the list of test files will be overridden to include only the
- # filename specified on the command line. This provides an easy way
- # to run just one test.
- #
- # If rake is invoked with a "TESTOPTS=options" command line option,
- # then the given options are passed to the test process after a
- # '--'. This allows Test::Unit options to be passed to the test
- # suite.
- #
- # Examples:
- #
- # rake test # run tests normally
- # rake test TEST=just_one_file.rb # run just one test file.
- # rake test TESTOPTS="-v" # run in verbose mode
- # rake test TESTOPTS="--runner=fox" # use the fox test runner
- #
- class TestTask < TaskLib
-
- # Name of test task. (default is :test)
- attr_accessor :name
-
- # List of directories to added to $LOAD_PATH before running the
- # tests. (default is 'lib')
- attr_accessor :libs
-
- # True if verbose test output desired. (default is false)
- attr_accessor :verbose
-
- # Test options passed to the test suite. An explicit
- # TESTOPTS=opts on the command line will override this. (default
- # is NONE)
- attr_accessor :options
-
- # Request that the tests be run with the warning flag set.
- # E.g. warning=true implies "ruby -w" used to run the tests.
- attr_accessor :warning
-
- # Glob pattern to match test files. (default is 'test/test*.rb')
- attr_accessor :pattern
-
- # Style of test loader to use. Options are:
- #
- # * :rake -- Rake provided test loading script (default).
- # * :testrb -- Ruby provided test loading script.
- # * :direct -- Load tests using command line loader.
- #
- attr_accessor :loader
-
- # Array of commandline options to pass to ruby when running test loader.
- attr_accessor :ruby_opts
-
- # Explicitly define the list of test files to be included in a
- # test. +list+ is expected to be an array of file names (a
- # FileList is acceptable). If both +pattern+ and +test_files+ are
- # used, then the list of test files is the union of the two.
- def test_files=(list)
- @test_files = list
- end
-
- # Create a testing task.
- def initialize(name=:test)
- @name = name
- @libs = ["lib"]
- @pattern = nil
- @options = nil
- @test_files = nil
- @verbose = false
- @warning = false
- @loader = :rake
- @ruby_opts = []
- yield self if block_given?
- @pattern = 'test/test*.rb' if @pattern.nil? && @test_files.nil?
- define
- end
-
- # Create the tasks defined by this task lib.
- def define
- lib_path = @libs.collect {|path| "-I#{File.expand_path(path)}"}
- desc "Run tests" + (@name==:test ? "" : " for #{@name}")
- task @name do
- run_code = ''
- RakeFileUtils.verbose(@verbose) do
- run_code =
- case @loader
- when :direct
- "-e 'ARGV.each{|f| load f}'"
- when :testrb
- "-S testrb #{fix}"
- when :rake
- rake_loader
- end
- @ruby_opts.unshift( *lib_path )
- @ruby_opts.unshift( "-w" ) if @warning
- ruby @ruby_opts.join(" ") +
- " \"#{run_code}\" " +
- file_list.collect { |fn| "\"#{fn}\"" }.join(' ') +
- " #{option_list}"
- end
- end
- self
- end
-
- def option_list # :nodoc:
- ENV['TESTOPTS'] || @options || ""
- end
-
- def file_list # :nodoc:
- if ENV['TEST']
- FileList[ ENV['TEST'] ]
- else
- result = []
- result += @test_files.to_a if @test_files
- result += FileList[ @pattern ].to_a if @pattern
- FileList[result]
- end
- end
-
- def fix # :nodoc:
- case RUBY_VERSION
- when '1.8.2'
- find_file 'rake/ruby182_test_unit_fix'
- else
- nil
- end || ''
- end
-
- def rake_loader # :nodoc:
- find_file('rake/rake_test_loader') or
- fail "unable to find rake test loader"
- end
-
- def find_file(fn) # :nodoc:
- $LOAD_PATH.each do |path|
- file_path = File.join(path, "#{fn}.rb")
- return file_path if File.exist? file_path
- end
- nil
- end
-
- end
-end
diff --git a/lib/rake/win32.rb b/lib/rake/win32.rb
deleted file mode 100644
index 96f66d6957..0000000000
--- a/lib/rake/win32.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-module Rake
-
- # Win 32 interface methods for Rake. Windows specific functionality
- # will be placed here to collect that knowledge in one spot.
- module Win32
- class << self
- # True if running on a windows system.
- def windows?
- # assume other DOSish systems are extinct.
- File::ALT_SEPARATOR == '\\'
- end
- end
-
- class << self
- # The standard directory containing system wide rake files on
- # Win 32 systems. Try the following environment variables (in
- # order):
- #
- # * APPDATA
- # * HOME
- # * HOMEDRIVE + HOMEPATH
- # * USERPROFILE
- #
- # If the above are not defined, retruns the personal folder.
- def win32_system_dir #:nodoc:
- win32_shared_path = ENV['APPDATA']
- if !win32_shared_path or win32_shared_path.empty?
- win32_shared_path = '~'
- end
- File.expand_path('Rake', win32_shared_path)
- end
- end if windows?
- end
-end
diff --git a/lib/rational.rb b/lib/rational.rb
index 515c273d54..69a3b76bf1 100644
--- a/lib/rational.rb
+++ b/lib/rational.rb
@@ -1,23 +1,564 @@
-# :enddoc:
+#
+# rational.rb -
+# $Release Version: 0.5 $
+# $Revision: 1.7 $
+# $Date: 1999/08/24 12:49:28 $
+# by Keiju ISHITSUKA(SHL Japan Inc.)
+#
+# Documentation by Kevin Jackson and Gavin Sinclair.
+#
+# When you <tt>require 'rational'</tt>, all interactions between numbers
+# potentially return a rational result. For example:
+#
+# 1.quo(2) # -> 0.5
+# require 'rational'
+# 1.quo(2) # -> Rational(1,2)
+#
+# See Rational for full documentation.
+#
-warn('lib/rational.rb is deprecated') if $VERBOSE
+
+#
+# Creates a Rational number (i.e. a fraction). +a+ and +b+ should be Integers:
+#
+# Rational(1,3) # -> 1/3
+#
+# Note: trying to construct a Rational with floating point or real values
+# produces errors:
+#
+# Rational(1.1, 2.3) # -> NoMethodError
+#
+def Rational(a, b = 1)
+ if a.kind_of?(Rational) && b == 1
+ a
+ else
+ Rational.reduce(a, b)
+ end
+end
+
+#
+# Rational implements a rational class for numbers.
+#
+# <em>A rational number is a number that can be expressed as a fraction p/q
+# where p and q are integers and q != 0. A rational number p/q is said to have
+# numerator p and denominator q. Numbers that are not rational are called
+# irrational numbers.</em> (http://mathworld.wolfram.com/RationalNumber.html)
+#
+# To create a Rational Number:
+# Rational(a,b) # -> a/b
+# Rational.new!(a,b) # -> a/b
+#
+# Examples:
+# Rational(5,6) # -> 5/6
+# Rational(5) # -> 5/1
+#
+# Rational numbers are reduced to their lowest terms:
+# Rational(6,10) # -> 3/5
+#
+# But not if you use the unusual method "new!":
+# Rational.new!(6,10) # -> 6/10
+#
+# Division by zero is obviously not allowed:
+# Rational(3,0) # -> ZeroDivisionError
+#
+class Rational < Numeric
+ @RCS_ID='-$Id: rational.rb,v 1.7 1999/08/24 12:49:28 keiju Exp keiju $-'
+
+ #
+ # Reduces the given numerator and denominator to their lowest terms. Use
+ # Rational() instead.
+ #
+ def Rational.reduce(num, den = 1)
+ raise ZeroDivisionError, "denominator is zero" if den == 0
+
+ if den < 0
+ num = -num
+ den = -den
+ end
+ gcd = num.gcd(den)
+ num = num.div(gcd)
+ den = den.div(gcd)
+ if den == 1 && defined?(Unify)
+ num
+ else
+ new!(num, den)
+ end
+ end
+
+ #
+ # Implements the constructor. This method does not reduce to lowest terms or
+ # check for division by zero. Therefore #Rational() should be preferred in
+ # normal use.
+ #
+ def Rational.new!(num, den = 1)
+ new(num, den)
+ end
+
+ private_class_method :new
+
+ #
+ # This method is actually private.
+ #
+ def initialize(num, den)
+ if den < 0
+ num = -num
+ den = -den
+ end
+ if num.kind_of?(Integer) and den.kind_of?(Integer)
+ @numerator = num
+ @denominator = den
+ else
+ @numerator = num.to_i
+ @denominator = den.to_i
+ end
+ end
+
+ #
+ # Returns the addition of this value and +a+.
+ #
+ # Examples:
+ # r = Rational(3,4) # -> Rational(3,4)
+ # r + 1 # -> Rational(7,4)
+ # r + 0.5 # -> 1.25
+ #
+ def + (a)
+ if a.kind_of?(Rational)
+ num = @numerator * a.denominator
+ num_a = a.numerator * @denominator
+ Rational(num + num_a, @denominator * a.denominator)
+ elsif a.kind_of?(Integer)
+ self + Rational.new!(a, 1)
+ elsif a.kind_of?(Float)
+ Float(self) + a
+ else
+ x, y = a.coerce(self)
+ x + y
+ end
+ end
+
+ #
+ # Returns the difference of this value and +a+.
+ # subtracted.
+ #
+ # Examples:
+ # r = Rational(3,4) # -> Rational(3,4)
+ # r - 1 # -> Rational(-1,4)
+ # r - 0.5 # -> 0.25
+ #
+ def - (a)
+ if a.kind_of?(Rational)
+ num = @numerator * a.denominator
+ num_a = a.numerator * @denominator
+ Rational(num - num_a, @denominator*a.denominator)
+ elsif a.kind_of?(Integer)
+ self - Rational.new!(a, 1)
+ elsif a.kind_of?(Float)
+ Float(self) - a
+ else
+ x, y = a.coerce(self)
+ x - y
+ end
+ end
+
+ #
+ # Returns the product of this value and +a+.
+ #
+ # Examples:
+ # r = Rational(3,4) # -> Rational(3,4)
+ # r * 2 # -> Rational(3,2)
+ # r * 4 # -> Rational(3,1)
+ # r * 0.5 # -> 0.375
+ # r * Rational(1,2) # -> Rational(3,8)
+ #
+ def * (a)
+ if a.kind_of?(Rational)
+ num = @numerator * a.numerator
+ den = @denominator * a.denominator
+ Rational(num, den)
+ elsif a.kind_of?(Integer)
+ self * Rational.new!(a, 1)
+ elsif a.kind_of?(Float)
+ Float(self) * a
+ else
+ x, y = a.coerce(self)
+ x * y
+ end
+ end
+
+ #
+ # Returns the quotient of this value and +a+.
+ # r = Rational(3,4) # -> Rational(3,4)
+ # r / 2 # -> Rational(3,8)
+ # r / 2.0 # -> 0.375
+ # r / Rational(1,2) # -> Rational(3,2)
+ #
+ def / (a)
+ if a.kind_of?(Rational)
+ num = @numerator * a.denominator
+ den = @denominator * a.numerator
+ Rational(num, den)
+ elsif a.kind_of?(Integer)
+ raise ZeroDivisionError, "division by zero" if a == 0
+ self / Rational.new!(a, 1)
+ elsif a.kind_of?(Float)
+ Float(self) / a
+ else
+ x, y = a.coerce(self)
+ x / y
+ end
+ end
+
+ #
+ # Returns this value raised to the given power.
+ #
+ # Examples:
+ # r = Rational(3,4) # -> Rational(3,4)
+ # r ** 2 # -> Rational(9,16)
+ # r ** 2.0 # -> 0.5625
+ # r ** Rational(1,2) # -> 0.866025403784439
+ #
+ def ** (other)
+ if other.kind_of?(Rational)
+ Float(self) ** other
+ elsif other.kind_of?(Integer)
+ if other > 0
+ num = @numerator ** other
+ den = @denominator ** other
+ elsif other < 0
+ num = @denominator ** -other
+ den = @numerator ** -other
+ elsif other == 0
+ num = 1
+ den = 1
+ end
+ Rational.new!(num, den)
+ elsif other.kind_of?(Float)
+ Float(self) ** other
+ else
+ x, y = other.coerce(self)
+ x ** y
+ end
+ end
+
+ def div(other)
+ (self / other).floor
+ end
+
+ #
+ # Returns the remainder when this value is divided by +other+.
+ #
+ # Examples:
+ # r = Rational(7,4) # -> Rational(7,4)
+ # r % Rational(1,2) # -> Rational(1,4)
+ # r % 1 # -> Rational(3,4)
+ # r % Rational(1,7) # -> Rational(1,28)
+ # r % 0.26 # -> 0.19
+ #
+ def % (other)
+ value = (self / other).floor
+ return self - other * value
+ end
+
+ #
+ # Returns the quotient _and_ remainder.
+ #
+ # Examples:
+ # r = Rational(7,4) # -> Rational(7,4)
+ # r.divmod Rational(1,2) # -> [3, Rational(1,4)]
+ #
+ def divmod(other)
+ value = (self / other).floor
+ return value, self - other * value
+ end
+
+ #
+ # Returns the absolute value.
+ #
+ def abs
+ if @numerator > 0
+ self
+ else
+ Rational.new!(-@numerator, @denominator)
+ end
+ end
+
+ #
+ # Returns +true+ iff this value is numerically equal to +other+.
+ #
+ # But beware:
+ # Rational(1,2) == Rational(4,8) # -> true
+ # Rational(1,2) == Rational.new!(4,8) # -> false
+ #
+ # Don't use Rational.new!
+ #
+ def == (other)
+ if other.kind_of?(Rational)
+ @numerator == other.numerator and @denominator == other.denominator
+ elsif other.kind_of?(Integer)
+ self == Rational.new!(other, 1)
+ elsif other.kind_of?(Float)
+ Float(self) == other
+ else
+ other == self
+ end
+ end
+
+ #
+ # Standard comparison operator.
+ #
+ def <=> (other)
+ if other.kind_of?(Rational)
+ num = @numerator * other.denominator
+ num_a = other.numerator * @denominator
+ v = num - num_a
+ if v > 0
+ return 1
+ elsif v < 0
+ return -1
+ else
+ return 0
+ end
+ elsif other.kind_of?(Integer)
+ return self <=> Rational.new!(other, 1)
+ elsif other.kind_of?(Float)
+ return Float(self) <=> other
+ elsif defined? other.coerce
+ x, y = other.coerce(self)
+ return x <=> y
+ else
+ return nil
+ end
+ end
+
+ def coerce(other)
+ if other.kind_of?(Float)
+ return other, self.to_f
+ elsif other.kind_of?(Integer)
+ return Rational.new!(other, 1), self
+ else
+ super
+ end
+ end
+
+ #
+ # Converts the rational to an Integer. Not the _nearest_ integer, the
+ # truncated integer. Study the following example carefully:
+ # Rational(+7,4).to_i # -> 1
+ # Rational(-7,4).to_i # -> -1
+ # (-1.75).to_i # -> -1
+ #
+ # In other words:
+ # Rational(-7,4) == -1.75 # -> true
+ # Rational(-7,4).to_i == (-1.75).to_i # -> true
+ #
+
+
+ def floor()
+ @numerator.div(@denominator)
+ end
+
+ def ceil()
+ -((-@numerator).div(@denominator))
+ end
+
+ def truncate()
+ if @numerator < 0
+ return -((-@numerator).div(@denominator))
+ end
+ @numerator.div(@denominator)
+ end
+
+ alias_method :to_i, :truncate
+
+ def round()
+ if @numerator < 0
+ num = -@numerator
+ num = num * 2 + @denominator
+ den = @denominator * 2
+ -(num.div(den))
+ else
+ num = @numerator * 2 + @denominator
+ den = @denominator * 2
+ num.div(den)
+ end
+ end
+
+ #
+ # Converts the rational to a Float.
+ #
+ def to_f
+ @numerator.to_f/@denominator.to_f
+ end
+
+ #
+ # Returns a string representation of the rational number.
+ #
+ # Example:
+ # Rational(3,4).to_s # "3/4"
+ # Rational(8).to_s # "8"
+ #
+ def to_s
+ if @denominator == 1
+ @numerator.to_s
+ else
+ @numerator.to_s+"/"+@denominator.to_s
+ end
+ end
+
+ #
+ # Returns +self+.
+ #
+ def to_r
+ self
+ end
+
+ #
+ # Returns a reconstructable string representation:
+ #
+ # Rational(5,8).inspect # -> "Rational(5, 8)"
+ #
+ def inspect
+ sprintf("Rational(%s, %s)", @numerator.inspect, @denominator.inspect)
+ end
+
+ #
+ # Returns a hash code for the object.
+ #
+ def hash
+ @numerator.hash ^ @denominator.hash
+ end
+
+ attr :numerator
+ attr :denominator
+
+ private :initialize
+end
+
+class Integer
+ #
+ # In an integer, the value _is_ the numerator of its rational equivalent.
+ # Therefore, this method returns +self+.
+ #
+ def numerator
+ self
+ end
+
+ #
+ # In an integer, the denominator is 1. Therefore, this method returns 1.
+ #
+ def denominator
+ 1
+ end
+
+ #
+ # Returns a Rational representation of this integer.
+ #
+ def to_r
+ Rational(self, 1)
+ end
+
+ #
+ # Returns the <em>greatest common denominator</em> of the two numbers (+self+
+ # and +n+).
+ #
+ # Examples:
+ # 72.gcd 168 # -> 24
+ # 19.gcd 36 # -> 1
+ #
+ # The result is positive, no matter the sign of the arguments.
+ #
+ def gcd(other)
+ min = self.abs
+ max = other.abs
+ while min > 0
+ tmp = min
+ min = max % min
+ max = tmp
+ end
+ max
+ end
+
+ #
+ # Returns the <em>lowest common multiple</em> (LCM) of the two arguments
+ # (+self+ and +other+).
+ #
+ # Examples:
+ # 6.lcm 7 # -> 42
+ # 6.lcm 9 # -> 18
+ #
+ def lcm(other)
+ if self.zero? or other.zero?
+ 0
+ else
+ (self.div(self.gcd(other)) * other).abs
+ end
+ end
+
+ #
+ # Returns the GCD _and_ the LCM (see #gcd and #lcm) of the two arguments
+ # (+self+ and +other+). This is more efficient than calculating them
+ # separately.
+ #
+ # Example:
+ # 6.gcdlcm 9 # -> [3, 18]
+ #
+ def gcdlcm(other)
+ gcd = self.gcd(other)
+ if self.zero? or other.zero?
+ [gcd, 0]
+ else
+ [gcd, (self.div(gcd) * other).abs]
+ end
+ end
+end
class Fixnum
+ remove_method :quo
- alias quof fdiv
+ # If Rational is defined, returns a Rational number instead of a Float.
+ def quo(other)
+ Rational.new!(self, 1) / other
+ end
alias rdiv quo
- alias power! ** unless defined?(0.power!)
- alias rpower **
+ # Returns a Rational number if the result is in fact rational (i.e. +other+ < 0).
+ def rpower (other)
+ if other >= 0
+ self.power!(other)
+ else
+ Rational.new!(self, 1)**other
+ end
+ end
end
class Bignum
+ remove_method :quo
- alias quof fdiv
+ # If Rational is defined, returns a Rational number instead of a Float.
+ def quo(other)
+ Rational.new!(self, 1) / other
+ end
alias rdiv quo
- alias power! ** unless defined?(0.power!)
- alias rpower **
+ # Returns a Rational number if the result is in fact rational (i.e. +other+ < 0).
+ def rpower (other)
+ if other >= 0
+ self.power!(other)
+ else
+ Rational.new!(self, 1)**other
+ end
+ end
+
+end
+unless defined? 1.power!
+ class Fixnum
+ alias power! **
+ alias ** rpower
+ end
+ class Bignum
+ alias power! **
+ alias ** rpower
+ end
end
diff --git a/lib/rbconfig/datadir.rb b/lib/rbconfig/datadir.rb
deleted file mode 100644
index 554b7fead7..0000000000
--- a/lib/rbconfig/datadir.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-module RbConfig
-
- ##
- # Return the path to the data directory associated with the given package
- # name. Normally this is just
- # "#{RbConfig::CONFIG['datadir']}/#{package_name}", but may be modified by
- # packages like RubyGems to handle versioned data directories.
-
- def self.datadir(package_name)
- File.join(CONFIG['datadir'], package_name)
- end unless RbConfig.respond_to?(:datadir)
-
-end
-
diff --git a/lib/rdoc.rb b/lib/rdoc.rb
deleted file mode 100644
index 043d3420be..0000000000
--- a/lib/rdoc.rb
+++ /dev/null
@@ -1,395 +0,0 @@
-$DEBUG_RDOC = nil
-
-##
-# = \RDoc - Ruby Documentation System
-#
-# This package contains RDoc and RDoc::Markup. RDoc is an application that
-# produces documentation for one or more Ruby source files. It works similarly
-# to JavaDoc, parsing the source, and extracting the definition for classes,
-# modules, and methods (along with includes and requires). It associates with
-# these optional documentation contained in the immediately preceding comment
-# block, and then renders the result using a pluggable output formatter.
-# RDoc::Markup is a library that converts plain text into various output
-# formats. The markup library is used to interpret the comment blocks that
-# RDoc uses to document methods, classes, and so on.
-#
-# == Roadmap
-#
-# * If you want to use RDoc to create documentation for your Ruby source files,
-# read on.
-# * If you want to include extensions written in C, see RDoc::Parser::C
-# * If you want to drive RDoc programmatically, see RDoc::RDoc.
-# * If you want to use the library to format text blocks into HTML, have a look
-# at RDoc::Markup.
-# * If you want to try writing your own HTML output template, see
-# RDoc::Generator::HTML
-#
-# == Summary
-#
-# Once installed, you can create documentation using the +rdoc+ command
-#
-# % rdoc [options] [names...]
-#
-# For an up-to-date option summary, type
-# % rdoc --help
-#
-# A typical use might be to generate documentation for a package of Ruby
-# source (such as RDoc itself).
-#
-# % rdoc
-#
-# This command generates documentation for all the Ruby and C source
-# files in and below the current directory. These will be stored in a
-# documentation tree starting in the subdirectory +doc+.
-#
-# You can make this slightly more useful for your readers by having the
-# index page contain the documentation for the primary file. In our
-# case, we could type
-#
-# % rdoc --main rdoc.rb
-#
-# You'll find information on the various formatting tricks you can use
-# in comment blocks in the documentation this generates.
-#
-# RDoc uses file extensions to determine how to process each file. File names
-# ending +.rb+ and +.rbw+ are assumed to be Ruby source. Files
-# ending +.c+ are parsed as C files. All other files are assumed to
-# contain just Markup-style markup (with or without leading '#' comment
-# markers). If directory names are passed to RDoc, they are scanned
-# recursively for C and Ruby source files only.
-#
-# == \Options
-# rdoc can be passed a variety of command-line options. In addition,
-# options can be specified via the +RDOCOPT+ environment variable, which
-# functions similarly to the +RUBYOPT+ environment variable.
-#
-# % export RDOCOPT="-S"
-#
-# will make rdoc default to inline method source code. Command-line options
-# always will override those in +RDOCOPT+.
-#
-# Run
-#
-# % rdoc --help
-#
-# for full details on rdoc's options.
-#
-# Here are some of the most commonly used options.
-# [-d, --diagram]
-# Generate diagrams showing modules and
-# classes. You need dot V1.8.6 or later to
-# use the --diagram option correctly. Dot is
-# available from http://graphviz.org
-#
-# [-S, --inline-source]
-# Show method source code inline, rather than via a popup link.
-#
-# [-T, --template=NAME]
-# Set the template used when generating output.
-#
-# == Documenting Source Code
-#
-# Comment blocks can be written fairly naturally, either using +#+ on
-# successive lines of the comment, or by including the comment in
-# a =begin/=end block. If you use the latter form, the =begin line must be
-# flagged with an RDoc tag:
-#
-# =begin rdoc
-# Documentation to be processed by RDoc.
-#
-# ...
-# =end
-#
-# RDoc stops processing comments if it finds a comment line containing
-# a <tt>--</tt>. This can be used to separate external from internal
-# comments, or to stop a comment being associated with a method, class, or
-# module. Commenting can be turned back on with a line that starts with a
-# <tt>++</tt>.
-#
-# ##
-# # Extract the age and calculate the date-of-birth.
-# #--
-# # FIXME: fails if the birthday falls on February 29th
-# #++
-# # The DOB is returned as a Time object.
-#
-# def get_dob(person)
-# # ...
-# end
-#
-# Names of classes, files, and any method names containing an
-# underscore or preceded by a hash character are automatically hyperlinked
-# from comment text to their description.
-#
-# Method parameter lists are extracted and displayed with the method
-# description. If a method calls +yield+, then the parameters passed to yield
-# will also be displayed:
-#
-# def fred
-# ...
-# yield line, address
-#
-# This will get documented as:
-#
-# fred() { |line, address| ... }
-#
-# You can override this using a comment containing ':yields: ...' immediately
-# after the method definition
-#
-# def fred # :yields: index, position
-# # ...
-#
-# yield line, address
-#
-# which will get documented as
-#
-# fred() { |index, position| ... }
-#
-# +:yields:+ is an example of a documentation directive. These appear
-# immediately after the start of the document element they are modifying.
-#
-# == \Markup
-#
-# * The markup engine looks for a document's natural left margin. This is
-# used as the initial margin for the document.
-#
-# * Consecutive lines starting at this margin are considered to be a
-# paragraph.
-#
-# * If a paragraph starts with a "*", "-", or with "<digit>.", then it is
-# taken to be the start of a list. The margin in increased to be the first
-# non-space following the list start flag. Subsequent lines should be
-# indented to this new margin until the list ends. For example:
-#
-# * this is a list with three paragraphs in
-# the first item. This is the first paragraph.
-#
-# And this is the second paragraph.
-#
-# 1. This is an indented, numbered list.
-# 2. This is the second item in that list
-#
-# This is the third conventional paragraph in the
-# first list item.
-#
-# * This is the second item in the original list
-#
-# * You can also construct labeled lists, sometimes called description
-# or definition lists. Do this by putting the label in square brackets
-# and indenting the list body:
-#
-# [cat] a small furry mammal
-# that seems to sleep a lot
-#
-# [ant] a little insect that is known
-# to enjoy picnics
-#
-# A minor variation on labeled lists uses two colons to separate the
-# label from the list body:
-#
-# cat:: a small furry mammal
-# that seems to sleep a lot
-#
-# ant:: a little insect that is known
-# to enjoy picnics
-#
-# This latter style guarantees that the list bodies' left margins are
-# aligned: think of them as a two column table.
-#
-# * Any line that starts to the right of the current margin is treated
-# as verbatim text. This is useful for code listings. The example of a
-# list above is also verbatim text.
-#
-# * A line starting with an equals sign (=) is treated as a
-# heading. Level one headings have one equals sign, level two headings
-# have two,and so on.
-#
-# * A line starting with three or more hyphens (at the current indent)
-# generates a horizontal rule. The more hyphens, the thicker the rule
-# (within reason, and if supported by the output device)
-#
-# * You can use markup within text (except verbatim) to change the
-# appearance of parts of that text. Out of the box, RDoc::Markup
-# supports word-based and general markup.
-#
-# Word-based markup uses flag characters around individual words:
-#
-# [\*word*] displays word in a *bold* font
-# [\_word_] displays word in an _emphasized_ font
-# [\+word+] displays word in a +code+ font
-#
-# General markup affects text between a start delimiter and and end
-# delimiter. Not surprisingly, these delimiters look like HTML markup.
-#
-# [\<b>text...</b>] displays word in a *bold* font
-# [\<em>text...</em>] displays word in an _emphasized_ font
-# [\\<i>text...</i>] displays word in an <i>italicized</i> font
-# [\<tt>text...</tt>] displays word in a +code+ font
-#
-# Unlike conventional Wiki markup, general markup can cross line
-# boundaries. You can turn off the interpretation of markup by
-# preceding the first character with a backslash. This only works for
-# simple markup, not HTML-style markup.
-#
-# * Hyperlinks to the web starting http:, mailto:, ftp:, or www. are
-# recognized. An HTTP url that references an external image file is
-# converted into an inline <IMG..>. Hyperlinks starting 'link:' are
-# assumed to refer to local files whose path is relative to the --op
-# directory.
-#
-# Hyperlinks can also be of the form <tt>label</tt>[url], in which
-# case the label is used in the displayed text, and +url+ is
-# used as the target. If +label+ contains multiple words,
-# put it in braces: <em>{multi word label}[</em>url<em>]</em>.
-#
-# == Directives
-#
-# [+:nodoc:+ / +:nodoc:+ all]
-# This directive prevents documentation for the element from
-# being generated. For classes and modules, the methods, aliases,
-# constants, and attributes directly within the affected class or
-# module also will be omitted. By default, though, modules and
-# classes within that class of module _will_ be documented. This is
-# turned off by adding the +all+ modifier.
-#
-# module MyModule # :nodoc:
-# class Input
-# end
-# end
-#
-# module OtherModule # :nodoc: all
-# class Output
-# end
-# end
-#
-# In the above code, only class <tt>MyModule::Input</tt> will be documented.
-# The +:nodoc:+ directive is global across all files for the class or module
-# to which it applies, so use +:stopdoc:+/+:startdoc:+ to suppress
-# documentation only for a particular set of methods, etc.
-#
-# [+:doc:+]
-# Forces a method or attribute to be documented even if it wouldn't be
-# otherwise. Useful if, for example, you want to include documentation of a
-# particular private method.
-#
-# [+:notnew:+]
-# Only applicable to the +initialize+ instance method. Normally RDoc
-# assumes that the documentation and parameters for +initialize+ are
-# actually for the +new+ method, and so fakes out a +new+ for the class.
-# The +:notnew:+ modifier stops this. Remember that +initialize+ is private,
-# so you won't see the documentation unless you use the +-a+ command line
-# option.
-#
-# Comment blocks can contain other directives:
-#
-# [<tt>:section: title</tt>]
-# Starts a new section in the output. The title following +:section:+ is
-# used as the section heading, and the remainder of the comment containing
-# the section is used as introductory text. Subsequent methods, aliases,
-# attributes, and classes will be documented in this section. A :section:
-# comment block may have one or more lines before the :section: directive.
-# These will be removed, and any identical lines at the end of the block are
-# also removed. This allows you to add visual cues such as:
-#
-# # ----------------------------------------
-# # :section: My Section
-# # This is the section that I wrote.
-# # See it glisten in the noon-day sun.
-# # ----------------------------------------
-#
-# [+:call-seq:+]
-# Lines up to the next blank line in the comment are treated as the method's
-# calling sequence, overriding the default parsing of method parameters and
-# yield arguments.
-#
-# [+:include:+ _filename_]
-# \Include the contents of the named file at this point. The file will be
-# searched for in the directories listed by the +--include+ option, or in
-# the current directory by default. The contents of the file will be
-# shifted to have the same indentation as the ':' at the start of
-# the :include: directive.
-#
-# [+:title:+ _text_]
-# Sets the title for the document. Equivalent to the <tt>--title</tt>
-# command line parameter. (The command line parameter overrides any :title:
-# directive in the source).
-#
-# [+:enddoc:+]
-# Document nothing further at the current level.
-#
-# [+:main:+ _name_]
-# Equivalent to the <tt>--main</tt> command line parameter.
-#
-# [+:stopdoc:+ / +:startdoc:+]
-# Stop and start adding new documentation elements to the current container.
-# For example, if a class has a number of constants that you don't want to
-# document, put a +:stopdoc:+ before the first, and a +:startdoc:+ after the
-# last. If you don't specify a +:startdoc:+ by the end of the container,
-# disables documentation for the entire class or module.
-#
-# == Other stuff
-#
-# RDoc is currently being maintained by Eric Hodel <drbrain@segment7.net>
-#
-# Dave Thomas <dave@pragmaticprogrammer.com> is the original author of RDoc.
-#
-# == Credits
-#
-# * The Ruby parser in rdoc/parse.rb is based heavily on the outstanding
-# work of Keiju ISHITSUKA of Nippon Rational Inc, who produced the Ruby
-# parser for irb and the rtags package.
-#
-# * Code to diagram classes and modules was written by Sergey A Yanovitsky
-# (Jah) of Enticla.
-#
-# * Charset patch from MoonWolf.
-#
-# * Rich Kilmer wrote the kilmer.rb output template.
-#
-# * Dan Brickley led the design of the RDF format.
-#
-# == License
-#
-# RDoc is Copyright (c) 2001-2003 Dave Thomas, The Pragmatic Programmers. It
-# is free software, and may be redistributed under the terms specified
-# in the README file of the Ruby distribution.
-#
-# == Warranty
-#
-# This software is provided "as is" and without any express or implied
-# warranties, including, without limitation, the implied warranties of
-# merchantibility and fitness for a particular purpose.
-
-module RDoc
-
- ##
- # Exception thrown by any rdoc error.
-
- class Error < RuntimeError; end
-
- RDocError = Error # :nodoc:
-
- ##
- # RDoc version you are using
-
- VERSION = "2.2.2"
-
- ##
- # Name of the dotfile that contains the description of files to be processed
- # in the current directory
-
- DOT_DOC_FILENAME = ".document"
-
- GENERAL_MODIFIERS = %w[nodoc].freeze
-
- CLASS_MODIFIERS = GENERAL_MODIFIERS
-
- ATTR_MODIFIERS = GENERAL_MODIFIERS
-
- CONSTANT_MODIFIERS = GENERAL_MODIFIERS
-
- METHOD_MODIFIERS = GENERAL_MODIFIERS +
- %w[arg args yield yields notnew not-new not_new doc]
-
-end
-
diff --git a/lib/rdoc/README b/lib/rdoc/README
index f183c61f8d..89ea0fbd3f 100644
--- a/lib/rdoc/README
+++ b/lib/rdoc/README
@@ -1,34 +1,38 @@
= RDOC - Ruby Documentation System
-This package contains RDoc and RDoc::Markup. RDoc is an application that
-produces documentation for one or more Ruby source files. We work similarly to
-JavaDoc, parsing the source, and extracting the definition for classes,
-modules, and methods (along with includes and requires). We associate with
-these optional documentation contained in the immediately preceding comment
-block, and then render the result using a pluggable output formatter.
-RDoc::Markup is a library that converts plain text into various output formats.
-The markup library is used to interpret the comment blocks that RDoc uses to
-document methods, classes, and so on.
+This package contains Rdoc and SimpleMarkup. Rdoc is an application
+that produces documentation for one or more Ruby source files. We work
+similarly to JavaDoc, parsing the source, and extracting the
+definition for classes, modules, and methods (along with includes and
+requires). We associate with these optional documentation contained
+in the immediately preceding comment block, and then render the result
+using a pluggable output formatter. (Currently, HTML is the only
+supported format. Markup is a library that converts plain text into
+various output formats. The Markup library is used to interpret the
+comment blocks that Rdoc uses to document methods, classes, and so on.
+
+This library contains two packages, rdoc itself and a text markup
+library, 'markup'.
== Roadmap
-* If you want to use RDoc to create documentation for your Ruby source files,
- read on.
-* If you want to include extensions written in C, see RDoc::C_Parser
-* For information on the various markups available in comment blocks, see
- RDoc::Markup.
-* If you want to drive RDoc programmatically, see RDoc::RDoc.
-* If you want to use the library to format text blocks into HTML, have a look
- at RDoc::Markup.
+* If you want to use Rdoc to create documentation for your Ruby source
+ files, read on.
+* If you want to include extensions written in C, see rdoc/parsers/parse_c.rb.
+* For information on the various markups available in comment
+ blocks, see markup/simple_markup.rb.
+* If you want to drive Rdoc programatically, see RDoc::RDoc.
+* If you want to use the library to format text blocks into HTML,
+ have a look at SM::SimpleMarkup.
* If you want to try writing your own HTML output template, see
- RDoc::Generator::HTML
+ RDoc::Page.
== Summary
Once installed, you can create documentation using the 'rdoc' command
(the command is 'rdoc.bat' under Windows)
- % rdoc [options] [names...]
+ % rdoc [options] [names...]
Type "rdoc --help" for an up-to-date option summary.
@@ -38,195 +42,448 @@ source (such as rdoc itself).
% rdoc
This command generates documentation for all the Ruby and C source
-files in and below the current directory. These will be stored in a
+files in and below the current directory. These will be stored in a
documentation tree starting in the subdirectory 'doc'.
You can make this slightly more useful for your readers by having the
-index page contain the documentation for the primary file. In our
+index page contain the documentation for the primary file. In our
case, we could type
- % rdoc --main rdoc.rb
+ % rdoc --main rdoc/rdoc.rb
You'll find information on the various formatting tricks you can use
in comment blocks in the documentation this generates.
-RDoc uses file extensions to determine how to process each file. File names
-ending +.rb+ and <tt>.rbw</tt> are assumed to be Ruby source. Files
-ending +.c+ are parsed as C files. All other files are assumed to
-contain just Markup-style markup (with or without leading '#' comment markers).
-If directory names are passed to RDoc, they are scanned recursively for C and
-Ruby source files only.
+RDoc uses file extensions to determine how to process each file. File
+names ending <tt>.rb</tt> and <tt>.rbw</tt> are assumed to be Ruby
+source. Files ending <tt>.c</tt> are parsed as C files. All other
+files are assumed to contain just SimpleMarkup-style markup (with or
+without leading '#' comment markers). If directory names are passed to
+RDoc, they are scanned recursively for C and Ruby source files only.
-= Markup
-
-For information on how to make lists, hyperlinks, & etc. with RDoc, see
-RDoc::Markup.
-
-Comment blocks can be written fairly naturally, either using '#' on successive
-lines of the comment, or by including the comment in an =begin/=end block. If
-you use the latter form, the =begin line must be flagged with an RDoc tag:
+== Credits
- =begin rdoc
- Documentation to be processed by RDoc.
-
- ...
- =end
+* The Ruby parser in rdoc/parse.rb is based heavily on the outstanding
+ work of Keiju ISHITSUKA of Nippon Rational Inc, who produced the Ruby
+ parser for irb and the rtags package.
-RDoc stops processing comments if it finds a comment line containing '+#--+'.
-This can be used to separate external from internal comments, or to stop a
-comment being associated with a method, class, or module. Commenting can be
-turned back on with a line that starts '+#+++'.
-
- ##
- # Extract the age and calculate the date-of-birth.
- #--
- # FIXME: fails if the birthday falls on February 29th
- #++
- # The DOB is returned as a Time object.
-
- def get_dob(person)
- # ...
- end
+* Code to diagram classes and modules was written by Sergey A Yanovitsky
+ (Jah) of Enticla.
-Names of classes, source files, and any method names containing an underscore
-or preceded by a hash character are automatically hyperlinked from comment text
-to their description.
+* Charset patch from MoonWolf.
-Method parameter lists are extracted and displayed with the method description.
-If a method calls +yield+, then the parameters passed to yield will also be
-displayed:
+* Rich Kilmer wrote the kilmer.rb output template.
- def fred
- ...
- yield line, address
+* Dan Brickley led the design of the RDF format.
-This will get documented as:
+== License
- fred() { |line, address| ... }
+RDoc is Copyright (c) 2001-2003 Dave Thomas, The Pragmatic Programmers. It
+is free software, and may be redistributed under the terms specified
+in the README file of the Ruby distribution.
-You can override this using a comment containing ':yields: ...' immediately
-after the method definition
+= Usage
- def fred # :yields: index, position
- # ...
-
- yield line, address
+RDoc is invoked from the command line using:
-which will get documented as
+ % rdoc <options> [name...]
- fred() { |index, position| ... }
+Files are parsed, and the information they contain collected, before
+any output is produced. This allows cross references between all files
+to be resolved. If a name is a directory, it is traversed. If no
+names are specified, all Ruby files in the current directory (and
+subdirectories) are processed.
-+:yields:+ is an example of a documentation directive. These appear immediately
-after the start of the document element they are modifying.
+Options are:
-== Directives
+[<tt>--accessor</tt> <i>name[,name...]</i>]
+ specifies the name(s) of additional methods that should be treated
+ as if they were <tt>attr_</tt><i>xxx</i> methods. Specifying
+ "--accessor db_opt" means lines such as
-[+:nodoc:+ / +:nodoc:+ all]
- Don't include this element in the documentation. For classes
- and modules, the methods, aliases, constants, and attributes
- directly within the affected class or module will also be
- omitted. By default, though, modules and classes within that
- class of module _will_ be documented. This is turned off by
- adding the +all+ modifier.
-
- module MyModule # :nodoc:
- class Input
- end
- end
-
- module OtherModule # :nodoc: all
- class Output
- end
- end
+ db_opt :name, :age
- In the above code, only class +MyModule::Input+ will be documented.
-
-[+:doc:+]
- Force a method or attribute to be documented even if it wouldn't otherwise
- be. Useful if, for example, you want to include documentation of a
- particular private method.
-
-[+:notnew:+]
- Only applicable to the +initialize+ instance method. Normally RDoc assumes
- that the documentation and parameters for #initialize are actually for the
- ::new method, and so fakes out a ::new for the class. The :notnew: modifier
- stops this. Remember that #initialize is protected, so you won't see the
- documentation unless you use the -a command line option.
-
-Comment blocks can contain other directives:
-
-[+:section: title+]
- Starts a new section in the output. The title following +:section:+ is used
- as the section heading, and the remainder of the comment containing the
- section is used as introductory text. Subsequent methods, aliases,
- attributes, and classes will be documented in this section. A :section:
- comment block may have one or more lines before the :section: directive.
- These will be removed, and any identical lines at the end of the block are
- also removed. This allows you to add visual cues such as:
-
- # ----------------------------------------
- # :section: My Section
- # This is the section that I wrote.
- # See it glisten in the noon-day sun.
- # ----------------------------------------
-
-[+:call-seq:+]
- Lines up to the next blank line in the comment are treated as the method's
- calling sequence, overriding the default parsing of method parameters and
- yield arguments.
-
-[+:include:+ _filename_]
- Include the contents of the named file at this point. The file will be
- searched for in the directories listed by the +--include+ option, or in the
- current directory by default. The contents of the file will be shifted to
- have the same indentation as the ':' at the start of the :include: directive.
-
-[+:title:+ _text_]
- Sets the title for the document. Equivalent to the --title command line
- parameter. (The command line parameter overrides any :title: directive in
- the source).
-
-[+:enddoc:+]
- Document nothing further at the current level.
-
-[+:main:+ _name_]
- Equivalent to the --main command line parameter.
-
-[+:stopdoc:+ / +:startdoc:+]
- Stop and start adding new documentation elements to the current container.
- For example, if a class has a number of constants that you don't want to
- document, put a +:stopdoc:+ before the first, and a +:startdoc:+ after the
- last. If you don't specify a +:startdoc:+ by the end of the container,
- disables documentation for the entire class or module.
+ will get parsed and displayed in the documentation. Each name may have an
+ optional "=flagtext" appended, in which case the given flagtext will appear
+ where (for example) the 'rw' appears for attr_accessor.
+
+[<tt>--all</tt>]
+ include protected and private methods in the output (by default
+ only public methods are included)
+
+[<tt>--charset</tt> _charset_]
+ Set the character set for the generated HTML.
+
+[<tt>--diagram</tt>]
+ include diagrams showing modules and classes. This is currently
+ an experimental feature, and may not be supported by all output
+ templates. You need dot V1.8.6 or later to use the --diagram
+ option correctly (http://www.research.att.com/sw/tools/graphviz/).
+
+[<tt>--exclude</tt> <i>pattern</i>]
+ exclude files and directories matching this pattern from processing
+
+[<tt>--extension</tt> <i>new=old</i>]
+ treat files ending <i>.new</i> as if they ended
+ <i>.old</i>. Saying '--extension cgi=rb' causes RDoc to treat .cgi
+ files as Ruby source.
+
+[<tt>fileboxes</tt>]
+ Classes are put in boxes which represents files, where these
+ classes reside. Classes shared between more than one file are
+ shown with list of files that sharing them. Silently discarded if
+ --diagram is not given Experimental.
+
+[<tt>--fmt</tt> _fmt_]
+ generate output in a particular format.
+
+[<tt>--help</tt>]
+ generate a usage summary.
+
+[<tt>--help-output</tt>]
+ explain the various output options.
+
+[<tt>--image-format</tt> <i>gif/png/jpg/jpeg</i>]
+ sets output image format for diagrams. Can be png, gif, jpeg,
+ jpg. If this option is omitted, png is used. Requires --diagram.
+
+[<tt>--include</tt> <i>dir,...</i>]
+ specify one or more directories to be searched when satisfying
+ :+include+: directives. Multiple <tt>--include</tt> options may be
+ given. The directory containing the file currently being processed
+ is always searched.
+
+[<tt>--inline-source</tt>]
+ By default, the source code of methods is shown in a popup. With
+ this option, it's displayed inline.
+
+[<tt>line-numbers</tt>]
+ include line numbers in the source code
+
+[<tt>--main</tt> _name_]
+ the class of module _name_ will appear on the index page. If you
+ want to set a particular file as a main page (a README, for
+ example) simply specifiy its name as the first on the command
+ line.
+
+[<tt>--merge</tt>]
+ when generating _ri_ output, if classes being processed already
+ exist in the destination directory, merge in the current details
+ rather than overwrite them.
+
+[<tt>--one-file</tt>]
+ place all the output into a single file
+
+[<tt>--op</tt> _dir_]
+ set the output directory to _dir_ (the default is the directory
+ "doc")
+
+[<tt>--op-name</tt> _name_]
+ set the name of the output. Has no effect for HTML.
+ "doc")
+
+[<tt>--opname</tt> _name_]
+ set the output name (has no effect for HTML).
+
+[<tt>--promiscuous</tt>]
+ If a module or class is defined in more than one source file, and
+ you click on a particular file's name in the top navigation pane,
+ RDoc will normally only show you the inner classes and modules of
+ that class that are defined in the particular file. Using this
+ option makes it show all classes and modules defined in the class,
+ regardless of the file they were defined in.
+
+[<tt>--quiet</tt>]
+ do not display progress messages
+
+[<tt>--ri</tt>, <tt>--ri-site</tt>, _and_ <tt>--ri-system</tt>]
+ generate output than can be read by the _ri_ command-line tool.
+ By default --ri places its output in ~/.rdoc, --ri-site in
+ $datadir/ri/<ver>/site, and --ri-system in
+ $datadir/ri/<ver>/system. All can be overridden with a subsequent
+ --op option. All default directories are in ri's default search
+ path.
+
+[<tt>--show-hash</tt>]
+ A name of the form #name in a comment is a possible hyperlink to
+ an instance method name. When displayed, the '#' is removed unless
+ this option is specified
+
+[<tt>--style</tt> <i>stylesheet url</i>]
+ specifies the URL of an external stylesheet to use (rather than
+ generating one of our own)
+
+[<tt>tab-width</tt> _n_]
+ set the width of tab characters (default 8)
+
+[<tt>--template</tt> <i>name</i>]
+ specify an alternate template to use when generating output (the
+ default is 'standard'). This template should be in a directory
+ accessible via $: as rdoc/generators/xxxx_template, where 'xxxx'
+ depends on the output formatter.
+
+[<tt>--version</tt>]
+ display RDoc's version
+
+[<tt>--webcvs</tt> _url_]
+ Specify a URL for linking to a web frontend to CVS. If the URL
+ contains a '\%s', the name of the current file will be
+ substituted; if the URL doesn't contain a '\%s', the filename will
+ be appended to it.
+
+= Example
-= Other stuff
-
-Author:: Dave Thomas <dave@pragmaticprogrammer.com>
+A typical small Ruby program commented using RDoc might be as follows. You
+can see the formatted result in EXAMPLE.rb and Anagram.
-== Credits
+ :include: EXAMPLE.rb
-* The Ruby parser in rdoc/parse.rb is based heavily on the outstanding
- work of Keiju ISHITSUKA of Nippon Rational Inc, who produced the Ruby
- parser for irb and the rtags package.
+= Markup
-* Code to diagram classes and modules was written by Sergey A Yanovitsky
- (Jah) of Enticla.
+Comment blocks can be written fairly naturally, either using '#' on
+successive lines of the comment, or by including the comment in
+an =begin/=end block. If you use the latter form, the =begin line
+must be flagged with an RDoc tag:
-* Charset patch from MoonWolf.
+ =begin rdoc
+ Documentation to
+ be processed by RDoc.
+ =end
-* Rich Kilmer wrote the kilmer.rb output template.
+Paragraphs are lines that share the left margin. Text indented past
+this margin are formatted verbatim.
+
+1. Lists are typed as indented paragraphs with:
+ * a '*' or '-' (for bullet lists)
+ * a digit followed by a period for
+ numbered lists
+ * an upper or lower case letter followed
+ by a period for alpha lists.
-* Dan Brickley led the design of the RDF format.
+ For example, the input that produced the above paragraph looked like
+ 1. Lists are typed as indented
+ paragraphs with:
+ * a '*' or '-' (for bullet lists)
+ * a digit followed by a period for
+ numbered lists
+ * an upper or lower case letter followed
+ by a period for alpha lists.
+
+2. Labeled lists (sometimes called description
+ lists) are typed using square brackets for the label.
+ [cat] small domestic animal
+ [+cat+] command to copy standard input
+
+3. Labeled lists may also be produced by putting a double colon
+ after the label. This sets the result in tabular form, so the
+ descriptions all line up. This was used to create the 'author'
+ block at the bottom of this description.
+ cat:: small domestic animal
+ +cat+:: command to copy standard input
+
+ For both kinds of labeled lists, if the body text starts on the same
+ line as the label, then the start of that text determines the block
+ indent for the rest of the body. The text may also start on the line
+ following the label, indented from the start of the label. This is
+ often preferable if the label is long. Both the following are
+ valid labeled list entries:
+
+ <tt>--output</tt> <i>name [, name]</i>::
+ specify the name of one or more output files. If multiple
+ files are present, the first is used as the index.
+
+ <tt>--quiet:</tt>:: do not output the names, sizes, byte counts,
+ index areas, or bit ratios of units as
+ they are processed.
+
+4. Headings are entered using equals signs
+
+ = Level One Heading
+ == Level Two Heading
+ and so on
+
+5. Rules (horizontal lines) are entered using three or
+ more hyphens.
+
+6. Non-verbatim text can be marked up:
+
+ _italic_:: \_word_ or \<em>text</em>
+ *bold*:: \*word* or \<b>text</b>
+ +typewriter+:: \+word+ or \<tt>text</tt>
+
+ The first form only works around 'words', where a word is a
+ sequence of upper and lower case letters and underscores. Putting a
+ backslash before inline markup stops it being interpreted, which is
+ how I created the table above:
+
+ _italic_:: \_word_ or \<em>text</em>
+ *bold*:: \*word* or \<b>text</b>
+ +typewriter+:: \+word+ or \<tt>text</tt>
+
+7. Names of classes, source files, and any method names
+ containing an underscore or preceded by a hash
+ character are automatically hyperlinked from
+ comment text to their description.
+
+8. Hyperlinks to the web starting http:, mailto:, ftp:, or www. are
+ recognized. An HTTP url that references an external image file is
+ converted into an inline <IMG..>. Hyperlinks starting 'link:' are
+ assumed to refer to local files whose path is relative to the --op
+ directory.
+
+ Hyperlinks can also be of the form <tt>label</tt>[url], in which
+ case the label is used in the displayed text, and <tt>url</tt> is
+ used as the target. If <tt>label</tt> contains multiple words,
+ put it in braces: <em>{multi word label}[</em>url<em>]</em>.
+
+9. Method parameter lists are extracted and displayed with
+ the method description. If a method calls +yield+, then
+ the parameters passed to yield will also be displayed:
+
+ def fred
+ ...
+ yield line, address
+
+ This will get documented as
+
+ fred() { |line, address| ... }
+
+ You can override this using a comment containing
+ ':yields: ...' immediately after the method definition
+
+ def fred # :yields: index, position
+ ...
+ yield line, address
+
+ which will get documented as
+
+ fred() { |index, position| ... }
+
+
+10. ':yields:' is an example of a documentation modifier. These appear
+ immediately after the start of the document element they are modifying.
+ Other modifiers include
+
+ [<tt>:nodoc:</tt><i>[all]</i>]
+ don't include this element in the documentation. For classes
+ and modules, the methods, aliases, constants, and attributes
+ directly within the affected class or module will also be
+ omitted. By default, though, modules and classes within that
+ class of module _will_ be documented. This is turned off by
+ adding the +all+ modifier.
+
+ module SM #:nodoc:
+ class Input
+ end
+ end
+ module Markup #:nodoc: all
+ class Output
+ end
+ end
+
+ In the above code, only class <tt>SM::Input</tt> will be
+ documented.
+
+ [<tt>:doc:</tt>]
+ force a method or attribute to be documented even if it
+ wouldn't otherwise be. Useful if, for example, you want to
+ include documentation of a particular private method.
+
+ [<tt>:notnew:</tt>]
+ only applicable to the +initialize+ instance method. Normally
+ RDoc assumes that the documentation and parameters for
+ #initialize are actually for the ::new method, and so fakes
+ out a ::new for the class. THe :notnew: modifier stops
+ this. Remember that #initialize is protected, so you won't
+ see the documentation unless you use the -a command line
+ option.
+
+
+11. RDoc stops processing comments if it finds a comment
+ line containing '<tt>#--</tt>'. This can be used to
+ separate external from internal comments, or
+ to stop a comment being associated with a method,
+ class, or module. Commenting can be turned back on with
+ a line that starts '<tt>#++</tt>'.
+
+ # Extract the age and calculate the
+ # date-of-birth.
+ #--
+ # FIXME: fails if the birthday falls on
+ # February 29th
+ #++
+ # The DOB is returned as a Time object.
+
+ def get_dob(person)
+ ...
+
+12. Comment blocks can contain other directives:
+
+ [<tt>:section: title</tt>]
+ Starts a new section in the output. The title following
+ <tt>:section:</tt> is used as the section heading, and the
+ remainder of the comment containing the section is used as
+ introductory text. Subsequent methods, aliases, attributes,
+ and classes will be documented in this section. A :section:
+ comment block may have one or more lines before the :section:
+ directive. These will be removed, and any identical lines at
+ the end of the block are also removed. This allows you to add
+ visual cues such as
+
+ # ----------------------------------------
+ # :section: My Section
+ # This is the section that I wrote.
+ # See it glisten in the noon-day sun.
+ # ----------------------------------------
+
+ [<tt>call-seq:</tt>]
+ lines up to the next blank line in the comment are treated as
+ the method's calling sequence, overriding the
+ default parsing of method parameters and yield arguments.
+
+ [<tt>:include:</tt><i>filename</i>]
+ include the contents of the named file at this point. The
+ file will be searched for in the directories listed by
+ the <tt>--include</tt> option, or in the current
+ directory by default. The contents of the file will be
+ shifted to have the same indentation as the ':' at the
+ start of the :include: directive.
+
+ [<tt>:title:</tt><i>text</i>]
+ Sets the title for the document. Equivalent to the --title command
+ line parameter. (The command line parameter overrides any :title:
+ directive in the source).
+
+ [<tt>:enddoc:</tt>]
+ Document nothing further at the current level.
+
+ [<tt>:main:</tt><i>name</i>]
+ Equivalent to the --main command line parameter.
+
+ [<tt>:stopdoc: / :startdoc:</tt>]
+ Stop and start adding new documentation elements to the
+ current container. For example, if a class has a number of
+ constants that you don't want to document, put a
+ <tt>:stopdoc:</tt> before the first, and a
+ <tt>:startdoc:</tt> after the last. If you don't specifiy a
+ <tt>:startdoc:</tt> by the end of the container, disables
+ documentation for the entire class or module.
+
+
+---
+
+See also markup/simple_markup.rb.
-== License
+= Other stuff
-RDoc is Copyright (c) 2001-2003 Dave Thomas, The Pragmatic Programmers. It
-is free software, and may be redistributed under the terms specified
-in the README file of the Ruby distribution.
+Author:: Dave Thomas <dave@pragmaticprogrammer.com>
+Requires:: Ruby 1.8.1 or later
+License:: Copyright (c) 2001-2003 Dave Thomas.
+ Released under the same license as Ruby.
== Warranty
-This software is provided "as is" and without any express or implied
-warranties, including, without limitation, the implied warranties of
-merchantibility and fitness for a particular purpose.
-
+This software is provided "as is" and without any express or
+implied warranties, including, without limitation, the implied
+warranties of merchantibility and fitness for a particular
+purpose.
diff --git a/lib/rdoc/code_objects.rb b/lib/rdoc/code_objects.rb
index 3fdd86314d..d6c4f1bdb9 100644
--- a/lib/rdoc/code_objects.rb
+++ b/lib/rdoc/code_objects.rb
@@ -5,10 +5,10 @@ require 'rdoc/tokenstream'
module RDoc
- ##
- # We contain the common stuff for contexts (which are containers) and other
- # elements (methods, attributes and so on)
+ # We contain the common stuff for contexts (which are containers)
+ # and other elements (methods, attributes and so on)
+ #
class CodeObject
attr_accessor :parent
@@ -31,13 +31,6 @@ module RDoc
attr_reader :document_self
- def initialize
- @document_self = true
- @document_children = true
- @force_documentation = false
- @done_documenting = false
- end
-
def document_self=(val)
@document_self = val
if !val
@@ -71,14 +64,6 @@ module RDoc
# Do we _force_ documentation, even is we wouldn't normally show the entity
attr_accessor :force_documentation
- def parent_file_name
- @parent ? @parent.file_base_name : '(unknown)'
- end
-
- def parent_name
- @parent ? @parent.name : '(unknown)'
- end
-
# Default callbacks to nothing, but this is overridden for classes
# and modules
def remove_classes_and_modules
@@ -87,10 +72,18 @@ module RDoc
def remove_methods_etc
end
+ def initialize
+ @document_self = true
+ @document_children = true
+ @force_documentation = false
+ @done_documenting = false
+ end
+
# Access the code object's comment
attr_reader :comment
- # Update the comment, but don't overwrite a real comment with an empty one
+ # Update the comment, but don't overwrite a real comment
+ # with an empty one
def comment=(comment)
@comment = comment unless comment.empty?
end
@@ -101,7 +94,7 @@ module RDoc
# those directives. Wehn a comment is assigned, we then extract
# out any matching directives and update our object
- def self.attr_overridable(name, *aliases)
+ def CodeObject.attr_overridable(name, *aliases)
@overridables ||= {}
attr_accessor name
@@ -114,24 +107,15 @@ module RDoc
end
- ##
- # A Context is something that can hold modules, classes, methods,
- # attributes, aliases, requires, and includes. Classes, modules, and files
- # are all Contexts.
+ # A Context is something that can hold modules, classes, methods,
+ # attributes, aliases, requires, and includes. Classes, modules, and
+ # files are all Contexts.
class Context < CodeObject
+ attr_reader :name, :method_list, :attributes, :aliases, :constants
+ attr_reader :requires, :includes, :in_files, :visibility
- attr_reader :aliases
- attr_reader :attributes
- attr_reader :constants
- attr_reader :current_section
- attr_reader :in_files
- attr_reader :includes
- attr_reader :method_list
- attr_reader :name
- attr_reader :requires
- attr_reader :sections
- attr_reader :visibility
+ attr_reader :sections
class Section
attr_reader :title, :comment, :sequence
@@ -142,26 +126,15 @@ module RDoc
@title = title
@@sequence.succ!
@sequence = @@sequence.dup
- @comment = nil
set_comment(comment)
end
- def ==(other)
- self.class === other and @sequence == other.sequence
- end
-
- def inspect
- "#<%s:0x%x %s %p>" % [
- self.class, object_id,
- @sequence, title
- ]
- end
+ private
- ##
- # Set the comment for this section from the original comment block If
- # the first line contains :section:, strip it and use the rest.
- # Otherwise remove lines up to the line containing :section:, and look
- # for those lines again at the end and remove them. This lets us write
+ # Set the comment for this section from the original comment block
+ # If the first line contains :section:, strip it and use the rest. Otherwise
+ # remove lines up to the line containing :section:, and look for
+ # those lines again at the end and remove them. This lets us write
#
# # ---------------------
# # :SECTION: The title
@@ -171,10 +144,9 @@ module RDoc
def set_comment(comment)
return unless comment
- if comment =~ /^#[ \t]*:section:.*\n/
+ if comment =~ /^.*?:section:.*$/
start = $`
rest = $'
-
if start.empty?
@comment = rest
else
@@ -185,13 +157,13 @@ module RDoc
end
@comment = nil if @comment.empty?
end
-
end
+
def initialize
- super
+ super()
- @in_files = []
+ @in_files = []
@name ||= "unknown"
@comment ||= ""
@@ -205,53 +177,29 @@ module RDoc
initialize_classes_and_modules
end
- ##
# map the class hash to an array externally
-
def classes
@classes.values
end
- ##
# map the module hash to an array externally
-
def modules
@modules.values
end
- ##
- # return the classes Hash (only to be used internally)
-
- def classes_hash
- @classes
- end
- protected :classes_hash
-
- ##
- # return the modules Hash (only to be used internally)
-
- def modules_hash
- @modules
- end
- protected :modules_hash
-
- ##
# Change the default visibility for new methods
-
def ongoing_visibility=(vis)
@visibility = vis
end
- ##
- # Yields Method and Attr entries matching the list of names in +methods+.
- # Attributes are only returned when +singleton+ is false.
+ # Given an array +methods+ of method names, set the
+ # visibility of the corresponding AnyMethod object
- def methods_matching(methods, singleton = false)
+ def set_visibility_for(methods, vis, singleton=false)
count = 0
-
@method_list.each do |m|
- if methods.include? m.name and m.singleton == singleton then
- yield m
+ if methods.include?(m.name) && m.singleton == singleton
+ m.visibility = vis
count += 1
end
end
@@ -261,23 +209,14 @@ module RDoc
# perhaps we need to look at attributes
@attributes.each do |a|
- yield a if methods.include? a.name
- end
- end
-
- ##
- # Given an array +methods+ of method names, set the visibility of the
- # corresponding AnyMethod object
-
- def set_visibility_for(methods, vis, singleton = false)
- methods_matching methods, singleton do |m|
- m.visibility = vis
+ if methods.include?(a.name)
+ a.visibility = vis
+ count += 1
+ end
end
end
- ##
# Record the file that we happen to find it in
-
def record_location(toplevel)
@in_files << toplevel unless @in_files.include?(toplevel)
end
@@ -288,24 +227,7 @@ module RDoc
end
def add_class(class_type, name, superclass)
- klass = add_class_or_module @classes, class_type, name, superclass
-
- #
- # If the parser encounters Container::Item before encountering
- # Container, then it assumes that Container is a module. This
- # may not be the case, so remove Container from the module list
- # if present and transfer any contained classes and modules to
- # the new class.
- #
- mod = @modules.delete(name)
-
- if mod then
- klass.classes_hash.update(mod.classes_hash)
- klass.modules_hash.update(mod.modules_hash)
- klass.method_list.concat(mod.method_list)
- end
-
- return klass
+ add_class_or_module(@classes, class_type, name, superclass)
end
def add_module(class_type, name)
@@ -313,46 +235,28 @@ module RDoc
end
def add_method(a_method)
+ puts "Adding #@visibility method #{a_method.name} to #@name" if $DEBUG
a_method.visibility = @visibility
add_to(@method_list, a_method)
-
- unmatched_alias_list = @unmatched_alias_lists[a_method.name]
- if unmatched_alias_list then
- unmatched_alias_list.each do |unmatched_alias|
- add_alias_impl unmatched_alias, a_method
- @aliases.delete unmatched_alias
- end
-
- @unmatched_alias_lists.delete a_method.name
- end
end
def add_attribute(an_attribute)
add_to(@attributes, an_attribute)
end
- def add_alias_impl(an_alias, meth)
- new_meth = AnyMethod.new(an_alias.text, an_alias.new_name)
- new_meth.is_alias_for = meth
- new_meth.singleton = meth.singleton
- new_meth.params = meth.params
- new_meth.comment = "Alias for \##{meth.name}"
- meth.add_alias(new_meth)
- add_method(new_meth)
- end
-
def add_alias(an_alias)
meth = find_instance_method_named(an_alias.old_name)
-
- if meth then
- add_alias_impl(an_alias, meth)
+ if meth
+ new_meth = AnyMethod.new(an_alias.text, an_alias.new_name)
+ new_meth.is_alias_for = meth
+ new_meth.singleton = meth.singleton
+ new_meth.params = meth.params
+ new_meth.comment = "Alias for \##{meth.name}"
+ meth.add_alias(new_meth)
+ add_method(new_meth)
else
add_to(@aliases, an_alias)
- unmatched_alias_list = @unmatched_alias_lists[an_alias.old_name] ||= []
- unmatched_alias_list.push(an_alias)
end
-
- an_alias
end
def add_include(an_include)
@@ -365,21 +269,20 @@ module RDoc
# Requires always get added to the top-level (file) context
def add_require(a_require)
- if TopLevel === self then
- add_to @requires, a_require
+ if self.kind_of? TopLevel
+ add_to(@requires, a_require)
else
- parent.add_require a_require
+ parent.add_require(a_require)
end
end
def add_class_or_module(collection, class_type, name, superclass=nil)
cls = collection[name]
-
- if cls then
- cls.superclass = superclass unless cls.module?
- puts "Reusing class/module #{name}" if $DEBUG_RDOC
+ if cls
+ puts "Reusing class/module #{name}" if $DEBUG
else
cls = class_type.new(name, superclass)
+ puts "Adding class/module #{name} to #@name" if $DEBUG
# collection[name] = cls if @document_self && !@done_documenting
collection[name] = cls if !@done_documenting
cls.parent = self
@@ -389,7 +292,7 @@ module RDoc
end
def add_to(array, thing)
- array << thing if @document_self and not @done_documenting
+ array << thing if @document_self && !@done_documenting
thing.parent = self
thing.section = @current_section
end
@@ -409,10 +312,6 @@ module RDoc
@requires = []
@includes = []
@constants = []
-
- # This Hash maps a method name to a list of unmatched
- # aliases (aliases of a method not yet encountered).
- @unmatched_alias_lists = {}
end
# and remove classes and modules when we see a :nodoc: all
@@ -427,12 +326,9 @@ module RDoc
# Find a named module
def find_module_named(name)
- # First check the enclosed modules, then check the module itself,
- # then check the enclosing modules (this mirrors the check done by
- # the Ruby parser)
+ return self if self.name == name
res = @modules[name] || @classes[name]
return res if res
- return self if self.name == name
find_enclosing_module_named(name)
end
@@ -453,7 +349,7 @@ module RDoc
@method_list.each {|m| yield m}
end
- def each_attribute
+ def each_attribute
@attributes.each {|a| yield a}
end
@@ -475,31 +371,26 @@ module RDoc
name <=> other.name
end
- ##
- # Look up +symbol+. If +method+ is non-nil, then we assume the symbol
- # references a module that contains that method.
-
- def find_symbol(symbol, method = nil)
+ # Look up the given symbol. If method is non-nil, then
+ # we assume the symbol references a module that
+ # contains that method
+ def find_symbol(symbol, method=nil)
result = nil
-
case symbol
- when /^::(.*)/ then
+ when /^::(.*)/
result = toplevel.find_symbol($1)
- when /::/ then
+ when /::/
modules = symbol.split(/::/)
-
- unless modules.empty? then
+ unless modules.empty?
module_name = modules.shift
result = find_module_named(module_name)
-
- if result then
- modules.each do |name|
- result = result.find_module_named(name)
+ if result
+ modules.each do |module_name|
+ result = result.find_module_named(module_name)
break unless result
end
end
end
-
else
# if a method is specified, then we're definitely looking for
# a module, otherwise it could be any symbol
@@ -517,21 +408,22 @@ module RDoc
end
end
end
-
- if result and method then
- fail unless result.respond_to? :find_local_symbol
+ if result && method
+ if !result.respond_to?(:find_local_symbol)
+ p result.name
+ p method
+ fail
+ end
result = result.find_local_symbol(method)
end
-
result
end
-
+
def find_local_symbol(symbol)
res = find_method_named(symbol) ||
find_constant_named(symbol) ||
find_attribute_named(symbol) ||
- find_module_named(symbol) ||
- find_file_named(symbol)
+ find_module_named(symbol)
end
# Handle sections
@@ -562,17 +454,10 @@ module RDoc
def find_attribute_named(name)
@attributes.find {|m| m.name == name}
end
-
- ##
- # Find a named file, or return nil
-
- def find_file_named(name)
- toplevel.class.find_file_named(name)
- end
-
+
end
- ##
+
# A TopLevel context is a source file
class TopLevel < Context
@@ -580,94 +465,68 @@ module RDoc
attr_accessor :file_relative_name
attr_accessor :file_absolute_name
attr_accessor :diagram
-
+
@@all_classes = {}
@@all_modules = {}
- @@all_files = {}
- def self.reset
+ def TopLevel::reset
@@all_classes = {}
@@all_modules = {}
- @@all_files = {}
end
def initialize(file_name)
super()
@name = "TopLevel"
- @file_relative_name = file_name
- @file_absolute_name = file_name
- @file_stat = File.stat(file_name)
- @diagram = nil
- @@all_files[file_name] = self
- end
-
- def file_base_name
- File.basename @file_absolute_name
+ @file_relative_name = file_name
+ @file_absolute_name = file_name
+ @file_stat = File.stat(file_name)
+ @diagram = nil
end
def full_name
nil
end
- ##
- # Adding a class or module to a TopLevel is special, as we only want one
- # copy of a particular top-level class. For example, if both file A and
- # file B implement class C, we only want one ClassModule object for C.
- # This code arranges to share classes and modules between files.
+ # Adding a class or module to a TopLevel is special, as we only
+ # want one copy of a particular top-level class. For example,
+ # if both file A and file B implement class C, we only want one
+ # ClassModule object for C. This code arranges to share
+ # classes and modules between files.
def add_class_or_module(collection, class_type, name, superclass)
cls = collection[name]
-
- if cls then
- cls.superclass = superclass unless cls.module?
- puts "Reusing class/module #{cls.full_name}" if $DEBUG_RDOC
+ if cls
+ puts "Reusing class/module #{name}" if $DEBUG
else
- if class_type == NormalModule then
+ if class_type == NormalModule
all = @@all_modules
else
all = @@all_classes
end
-
cls = all[name]
-
- if !cls then
- cls = class_type.new name, superclass
- all[name] = cls unless @done_documenting
- else
- # If the class has been encountered already, check that its
- # superclass has been set (it may not have been, depending on
- # the context in which it was encountered).
- if class_type == NormalClass
- if !cls.superclass then
- cls.superclass = superclass
- end
- end
+ if !cls
+ cls = class_type.new(name, superclass)
+ all[name] = cls unless @done_documenting
end
-
+ puts "Adding class/module #{name} to #@name" if $DEBUG
collection[name] = cls unless @done_documenting
-
cls.parent = self
end
-
cls
end
- def self.all_classes_and_modules
+ def TopLevel.all_classes_and_modules
@@all_classes.values + @@all_modules.values
end
- def self.find_class_named(name)
+ def TopLevel.find_class_named(name)
@@all_classes.each_value do |c|
- res = c.find_class_named(name)
+ res = c.find_class_named(name)
return res if res
end
nil
end
- def self.find_file_named(name)
- @@all_files[name]
- end
-
def find_local_symbol(symbol)
find_class_or_module_named(symbol) || super
end
@@ -678,30 +537,20 @@ module RDoc
nil
end
- ##
# Find a named module
-
def find_module_named(name)
find_class_or_module_named(name) || find_enclosing_module_named(name)
end
- def inspect
- "#<%s:0x%x %p modules: %p classes: %p>" % [
- self.class, object_id,
- file_base_name,
- @modules.map { |n,m| m },
- @classes.map { |n,c| c }
- ]
- end
end
- ##
- # ClassModule is the base class for objects representing either a class or a
- # module.
+ # ClassModule is the base class for objects representing either a
+ # class or a module.
class ClassModule < Context
+ attr_reader :superclass
attr_accessor :diagram
def initialize(name, superclass = nil)
@@ -712,15 +561,7 @@ module RDoc
super()
end
- def find_class_named(name)
- return self if full_name == name
- @classes.each_value {|c| return c if c.find_class_named(name) }
- nil
- end
-
- ##
# Return the fully qualified name of this class or module
-
def full_name
if @parent && @parent.full_name
@parent.full_name + "::" + @name
@@ -734,123 +575,62 @@ module RDoc
File.join(prefix, *path) + ".html"
end
- ##
- # Does this object represent a module?
-
- def module?
+ # Return +true+ if this object represents a module
+ def is_module?
false
end
- ##
- # Get the superclass of this class. Attempts to retrieve the superclass'
- # real name by following module nesting.
-
- def superclass
- raise NoMethodError, "#{full_name} is a module" if module?
-
- scope = self
-
- begin
- superclass = scope.classes.find { |c| c.name == @superclass }
-
- return superclass.full_name if superclass
- scope = scope.parent
- end until scope.nil? or TopLevel === scope
-
- @superclass
- end
-
- ##
- # Set the superclass of this class
-
- def superclass=(superclass)
- raise NoMethodError, "#{full_name} is a module" if module?
-
- if @superclass.nil? or @superclass == 'Object' then
- @superclass = superclass
- end
- end
-
+ # to_s is simply for debugging
def to_s
- "#{self.class}: #{@name} #{@comment} #{super}"
+ res = self.class.name + ": " + @name
+ res << @comment.to_s
+ res << super
+ res
end
+ def find_class_named(name)
+ return self if full_name == name
+ @classes.each_value {|c| return c if c.find_class_named(name) }
+ nil
+ end
end
- ##
# Anonymous classes
-
class AnonClass < ClassModule
end
- ##
# Normal classes
-
class NormalClass < ClassModule
-
- def inspect
- superclass = @superclass ? " < #{@superclass}" : nil
- "<%s:0x%x class %s%s includes: %p attributes: %p methods: %p aliases: %p>" % [
- self.class, object_id,
- @name, superclass, @includes, @attributes, @method_list, @aliases
- ]
- end
-
end
- ##
# Singleton classes
-
class SingleClass < ClassModule
end
- ##
# Module
-
class NormalModule < ClassModule
-
- def comment=(comment)
- return if comment.empty?
- comment = @comment << "# ---\n" << comment unless @comment.empty?
-
- super
- end
-
- def inspect
- "#<%s:0x%x module %s includes: %p attributes: %p methods: %p aliases: %p>" % [
- self.class, object_id,
- @name, @includes, @attributes, @method_list, @aliases
- ]
- end
-
- def module?
+ def is_module?
true
end
-
end
- ##
+
# AnyMethod is the base class for objects representing methods
class AnyMethod < CodeObject
-
attr_accessor :name
attr_accessor :visibility
attr_accessor :block_params
attr_accessor :dont_rename_initialize
attr_accessor :singleton
- attr_reader :text
-
- # list of other names for this method
- attr_reader :aliases
-
- # method we're aliasing
- attr_accessor :is_alias_for
+ attr_reader :aliases # list of other names for this method
+ attr_accessor :is_alias_for # or a method we're aliasing
attr_overridable :params, :param, :parameters, :parameter
attr_accessor :call_seq
+
include TokenStream
def initialize(text, name)
@@ -871,71 +651,45 @@ module RDoc
@name <=> other.name
end
- def add_alias(method)
- @aliases << method
- end
-
- def inspect
- alias_for = @is_alias_for ? " (alias for #{@is_alias_for.name})" : nil
- "#<%s:0x%x %s%s%s (%s)%s>" % [
- self.class, object_id,
- parent_name,
- singleton ? '::' : '#',
- name,
- visibility,
- alias_for,
- ]
+ def to_s
+ res = self.class.name + ": " + @name + " (" + @text + ")\n"
+ res << @comment.to_s
+ res
end
def param_seq
- params = params.gsub(/\s*\#.*/, '')
- params = params.tr("\n", " ").squeeze(" ")
- params = "(#{params})" unless p[0] == ?(
+ p = params.gsub(/\s*\#.*/, '')
+ p = p.tr("\n", " ").squeeze(" ")
+ p = "(" + p + ")" unless p[0] == ?(
- if block = block_params then # yes, =
- # If this method has explicit block parameters, remove any explicit
- # &block
- params.sub!(/,?\s*&\w+/)
+ if (block = block_params)
+ # If this method has explicit block parameters, remove any
+ # explicit &block
+$stderr.puts p
+ p.sub!(/,?\s*&\w+/)
+$stderr.puts p
block.gsub!(/\s*\#.*/, '')
block = block.tr("\n", " ").squeeze(" ")
if block[0] == ?(
block.sub!(/^\(/, '').sub!(/\)/, '')
end
- params << " { |#{block}| ... }"
+ p << " {|#{block}| ...}"
end
-
- params
+ p
end
- def to_s
- res = self.class.name + ": " + @name + " (" + @text + ")\n"
- res << @comment.to_s
- res
+ def add_alias(method)
+ @aliases << method
end
-
- end
-
- ##
- # GhostMethod represents a method referenced only by a comment
-
- class GhostMethod < AnyMethod
end
- ##
- # MetaMethod represents a meta-programmed method
-
- class MetaMethod < AnyMethod
- end
-
- ##
- # Represent an alias, which is an old_name/ new_name pair associated with a
- # particular context
+ # Represent an alias, which is an old_name/ new_name pair associated
+ # with a particular context
class Alias < CodeObject
-
attr_accessor :text, :old_name, :new_name, :comment
-
+
def initialize(text, old_name, new_name, comment)
super()
@text = text
@@ -944,22 +698,12 @@ module RDoc
self.comment = comment
end
- def inspect
- "#<%s:0x%x %s.alias_method %s, %s>" % [
- self.class, object_id,
- parent.name, @old_name, @new_name,
- ]
- end
-
def to_s
"alias: #{self.old_name} -> #{self.new_name}\n#{self.comment}"
end
-
end
- ##
# Represent a constant
-
class Constant < CodeObject
attr_accessor :name, :value
@@ -971,9 +715,7 @@ module RDoc
end
end
- ##
# Represent attributes
-
class Attr < CodeObject
attr_accessor :text, :name, :rw, :visibility
@@ -986,33 +728,16 @@ module RDoc
self.comment = comment
end
- def <=>(other)
- self.name <=> other.name
- end
-
- def inspect
- attr = case rw
- when 'RW' then :attr_accessor
- when 'R' then :attr_reader
- when 'W' then :attr_writer
- else
- " (#{rw})"
- end
-
- "#<%s:0x%x %s.%s :%s>" % [
- self.class, object_id,
- parent_name, attr, @name,
- ]
- end
-
def to_s
"attr: #{self.name} #{self.rw}\n#{self.comment}"
end
+ def <=>(other)
+ self.name <=> other.name
+ end
end
- ##
- # A required file
+ # a required file
class Require < CodeObject
attr_accessor :name
@@ -1023,37 +748,16 @@ module RDoc
self.comment = comment
end
- def inspect
- "#<%s:0x%x require '%s' in %s>" % [
- self.class,
- object_id,
- @name,
- parent_file_name,
- ]
- end
-
end
- ##
- # An included module
-
+ # an included module
class Include < CodeObject
-
attr_accessor :name
def initialize(name, comment)
super()
@name = name
self.comment = comment
-
- end
-
- def inspect
- "#<%s:0x%x %s.include %s>" % [
- self.class,
- object_id,
- parent_name, @name,
- ]
end
end
diff --git a/lib/rdoc/diagram.rb b/lib/rdoc/diagram.rb
index d308d36dee..9fdc49c02e 100644
--- a/lib/rdoc/diagram.rb
+++ b/lib/rdoc/diagram.rb
@@ -4,11 +4,11 @@
# You must have the V1.7 or later in your path
# http://www.research.att.com/sw/tools/graphviz/
-require 'rdoc/dot'
+require "rdoc/dot/dot"
+require 'rdoc/options'
module RDoc
- ##
# Draw a set of diagrams representing the modules and classes in the
# system. We draw one diagram for each file, and one for each toplevel
# class or module. This means there will be overlap. However, it also
@@ -30,22 +30,20 @@ module RDoc
DOT_PATH = "dot"
- ##
- # Pass in the set of top level objects. The method also creates the
- # subdirectory to hold the images
+ # Pass in the set of top level objects. The method also creates
+ # the subdirectory to hold the images
def initialize(info, options)
@info = info
@options = options
@counter = 0
- FileUtils.mkdir_p(DOT_PATH)
+ File.makedirs(DOT_PATH)
@diagram_cache = {}
end
- ##
- # Draw the diagrams. We traverse the files, drawing a diagram for each. We
- # also traverse each top-level class and module in that file drawing a
- # diagram for these too.
+ # Draw the diagrams. We traverse the files, drawing a diagram for
+ # each. We also traverse each top-level class and module in that
+ # file drawing a diagram for these too.
def draw
unless @options.quiet
@@ -57,26 +55,26 @@ module RDoc
@done_modules = {}
@local_names = find_names(i)
@global_names = []
- @global_graph = graph = DOT::Digraph.new('name' => 'TopLevel',
- 'fontname' => FONT,
- 'fontsize' => '8',
- 'bgcolor' => 'lightcyan1',
- 'compound' => 'true')
-
+ @global_graph = graph = DOT::DOTDigraph.new('name' => 'TopLevel',
+ 'fontname' => FONT,
+ 'fontsize' => '8',
+ 'bgcolor' => 'lightcyan1',
+ 'compound' => 'true')
+
# it's a little hack %) i'm too lazy to create a separate class
# for default node
- graph << DOT::Node.new('name' => 'node',
- 'fontname' => FONT,
- 'color' => 'black',
- 'fontsize' => 8)
-
+ graph << DOT::DOTNode.new('name' => 'node',
+ 'fontname' => FONT,
+ 'color' => 'black',
+ 'fontsize' => 8)
+
i.modules.each do |mod|
draw_module(mod, graph, true, i.file_relative_name)
end
add_classes(i, graph, i.file_relative_name)
i.diagram = convert_to_png("f_#{file_count}", graph)
-
+
# now go through and document each top level class and
# module independently
i.modules.each_with_index do |mod, count|
@@ -84,25 +82,27 @@ module RDoc
@local_names = find_names(mod)
@global_names = []
- @global_graph = graph = DOT::Digraph.new('name' => 'TopLevel',
- 'fontname' => FONT,
- 'fontsize' => '8',
- 'bgcolor' => 'lightcyan1',
- 'compound' => 'true')
+ @global_graph = graph = DOT::DOTDigraph.new('name' => 'TopLevel',
+ 'fontname' => FONT,
+ 'fontsize' => '8',
+ 'bgcolor' => 'lightcyan1',
+ 'compound' => 'true')
- graph << DOT::Node.new('name' => 'node',
- 'fontname' => FONT,
- 'color' => 'black',
- 'fontsize' => 8)
+ graph << DOT::DOTNode.new('name' => 'node',
+ 'fontname' => FONT,
+ 'color' => 'black',
+ 'fontsize' => 8)
draw_module(mod, graph, true)
- mod.diagram = convert_to_png("m_#{file_count}_#{count}",
- graph)
+ mod.diagram = convert_to_png("m_#{file_count}_#{count}",
+ graph)
end
end
$stderr.puts unless @options.quiet
end
+ #######
private
+ #######
def find_names(mod)
return [mod.full_name] + mod.classes.collect{|cl| cl.full_name} +
@@ -127,39 +127,39 @@ module RDoc
@counter += 1
url = mod.http_url("classes")
- m = DOT::Subgraph.new('name' => "cluster_#{mod.full_name.gsub( /:/,'_' )}",
- 'label' => mod.name,
- 'fontname' => FONT,
- 'color' => 'blue',
- 'style' => 'filled',
- 'URL' => %{"#{url}"},
- 'fillcolor' => toplevel ? 'palegreen1' : 'palegreen3')
-
+ m = DOT::DOTSubgraph.new('name' => "cluster_#{mod.full_name.gsub( /:/,'_' )}",
+ 'label' => mod.name,
+ 'fontname' => FONT,
+ 'color' => 'blue',
+ 'style' => 'filled',
+ 'URL' => %{"#{url}"},
+ 'fillcolor' => toplevel ? 'palegreen1' : 'palegreen3')
+
@done_modules[mod.full_name] = m
add_classes(mod, m, file)
graph << m
unless mod.includes.empty?
- mod.includes.each do |inc|
- m_full_name = find_full_name(inc.name, mod)
+ mod.includes.each do |m|
+ m_full_name = find_full_name(m.name, mod)
if @local_names.include?(m_full_name)
- @global_graph << DOT::Edge.new('from' => "#{m_full_name.gsub( /:/,'_' )}",
- 'to' => "#{mod.full_name.gsub( /:/,'_' )}",
- 'ltail' => "cluster_#{m_full_name.gsub( /:/,'_' )}",
- 'lhead' => "cluster_#{mod.full_name.gsub( /:/,'_' )}")
+ @global_graph << DOT::DOTEdge.new('from' => "#{m_full_name.gsub( /:/,'_' )}",
+ 'to' => "#{mod.full_name.gsub( /:/,'_' )}",
+ 'ltail' => "cluster_#{m_full_name.gsub( /:/,'_' )}",
+ 'lhead' => "cluster_#{mod.full_name.gsub( /:/,'_' )}")
else
unless @global_names.include?(m_full_name)
path = m_full_name.split("::")
url = File.join('classes', *path) + ".html"
- @global_graph << DOT::Node.new('name' => "#{m_full_name.gsub( /:/,'_' )}",
- 'shape' => 'box',
- 'label' => "#{m_full_name}",
- 'URL' => %{"#{url}"})
+ @global_graph << DOT::DOTNode.new('name' => "#{m_full_name.gsub( /:/,'_' )}",
+ 'shape' => 'box',
+ 'label' => "#{m_full_name}",
+ 'URL' => %{"#{url}"})
@global_names << m_full_name
end
- @global_graph << DOT::Edge.new('from' => "#{m_full_name.gsub( /:/,'_' )}",
- 'to' => "#{mod.full_name.gsub( /:/,'_' )}",
- 'lhead' => "cluster_#{mod.full_name.gsub( /:/,'_' )}")
+ @global_graph << DOT::DOTEdge.new('from' => "#{m_full_name.gsub( /:/,'_' )}",
+ 'to' => "#{mod.full_name.gsub( /:/,'_' )}",
+ 'lhead' => "cluster_#{mod.full_name.gsub( /:/,'_' )}")
end
end
end
@@ -167,28 +167,27 @@ module RDoc
def add_classes(container, graph, file = nil )
- use_fileboxes = @options.fileboxes
+ use_fileboxes = Options.instance.fileboxes
files = {}
# create dummy node (needed if empty and for module includes)
if container.full_name
- graph << DOT::Node.new('name' => "#{container.full_name.gsub( /:/,'_' )}",
- 'label' => "",
- 'width' => (container.classes.empty? and
- container.modules.empty?) ?
- '0.75' : '0.01',
- 'height' => '0.01',
- 'shape' => 'plaintext')
+ graph << DOT::DOTNode.new('name' => "#{container.full_name.gsub( /:/,'_' )}",
+ 'label' => "",
+ 'width' => (container.classes.empty? and
+ container.modules.empty?) ?
+ '0.75' : '0.01',
+ 'height' => '0.01',
+ 'shape' => 'plaintext')
end
-
container.classes.each_with_index do |cl, cl_index|
last_file = cl.in_files[-1].file_relative_name
if use_fileboxes && !files.include?(last_file)
@counter += 1
files[last_file] =
- DOT::Subgraph.new('name' => "cluster_#{@counter}",
+ DOT::DOTSubgraph.new('name' => "cluster_#{@counter}",
'label' => "#{last_file}",
'fontname' => FONT,
'color'=>
@@ -198,16 +197,16 @@ module RDoc
next if cl.name == 'Object' || cl.name[0,2] == "<<"
url = cl.http_url("classes")
-
+
label = cl.name.dup
if use_fileboxes && cl.in_files.length > 1
- label << '\n[' +
+ label << '\n[' +
cl.in_files.collect {|i|
- i.file_relative_name
+ i.file_relative_name
}.sort.join( '\n' ) +
']'
- end
-
+ end
+
attrs = {
'name' => "#{cl.full_name.gsub( /:/, '_' )}",
'fontcolor' => 'black',
@@ -218,41 +217,41 @@ module RDoc
'URL' => %{"#{url}"}
}
- c = DOT::Node.new(attrs)
-
+ c = DOT::DOTNode.new(attrs)
+
if use_fileboxes
- files[last_file].push c
+ files[last_file].push c
else
graph << c
end
end
-
+
if use_fileboxes
files.each_value do |val|
graph << val
end
end
-
+
unless container.classes.empty?
container.classes.each_with_index do |cl, cl_index|
cl.includes.each do |m|
m_full_name = find_full_name(m.name, cl)
if @local_names.include?(m_full_name)
- @global_graph << DOT::Edge.new('from' => "#{m_full_name.gsub( /:/,'_' )}",
- 'to' => "#{cl.full_name.gsub( /:/,'_' )}",
- 'ltail' => "cluster_#{m_full_name.gsub( /:/,'_' )}")
+ @global_graph << DOT::DOTEdge.new('from' => "#{m_full_name.gsub( /:/,'_' )}",
+ 'to' => "#{cl.full_name.gsub( /:/,'_' )}",
+ 'ltail' => "cluster_#{m_full_name.gsub( /:/,'_' )}")
else
unless @global_names.include?(m_full_name)
path = m_full_name.split("::")
url = File.join('classes', *path) + ".html"
- @global_graph << DOT::Node.new('name' => "#{m_full_name.gsub( /:/,'_' )}",
- 'shape' => 'box',
- 'label' => "#{m_full_name}",
- 'URL' => %{"#{url}"})
+ @global_graph << DOT::DOTNode.new('name' => "#{m_full_name.gsub( /:/,'_' )}",
+ 'shape' => 'box',
+ 'label' => "#{m_full_name}",
+ 'URL' => %{"#{url}"})
@global_names << m_full_name
end
- @global_graph << DOT::Edge.new('from' => "#{m_full_name.gsub( /:/,'_' )}",
- 'to' => "#{cl.full_name.gsub( /:/, '_')}")
+ @global_graph << DOT::DOTEdge.new('from' => "#{m_full_name.gsub( /:/,'_' )}",
+ 'to' => "#{cl.full_name.gsub( /:/, '_')}")
end
end
@@ -262,26 +261,27 @@ module RDoc
unless @local_names.include?(sclass_full_name) or @global_names.include?(sclass_full_name)
path = sclass_full_name.split("::")
url = File.join('classes', *path) + ".html"
- @global_graph << DOT::Node.new('name' => "#{sclass_full_name.gsub( /:/, '_' )}",
- 'label' => sclass_full_name,
- 'URL' => %{"#{url}"})
+ @global_graph << DOT::DOTNode.new(
+ 'name' => "#{sclass_full_name.gsub( /:/, '_' )}",
+ 'label' => sclass_full_name,
+ 'URL' => %{"#{url}"})
@global_names << sclass_full_name
end
- @global_graph << DOT::Edge.new('from' => "#{sclass_full_name.gsub( /:/,'_' )}",
- 'to' => "#{cl.full_name.gsub( /:/, '_')}")
+ @global_graph << DOT::DOTEdge.new('from' => "#{sclass_full_name.gsub( /:/,'_' )}",
+ 'to' => "#{cl.full_name.gsub( /:/, '_')}")
end
end
container.modules.each do |submod|
draw_module(submod, graph)
end
-
+
end
def convert_to_png(file_base, graph)
str = graph.to_s
return @diagram_cache[str] if @diagram_cache[str]
- op_type = @options.image_format
+ op_type = Options.instance.image_format
dotfile = File.join(DOT_PATH, file_base)
src = dotfile + ".dot"
dot = dotfile + "." + op_type
@@ -294,7 +294,7 @@ module RDoc
File.open(src, 'w+' ) do |f|
f << str << "\n"
end
-
+
system "dot", "-T#{op_type}", src, "-o", dot
# Now construct the imagemap wrapper around
@@ -305,36 +305,31 @@ module RDoc
return ret
end
- ##
- # Extract the client-side image map from dot, and use it to generate the
- # imagemap proper. Return the whole <map>..<img> combination, suitable for
- # inclusion on the page
+ # Extract the client-side image map from dot, and use it
+ # to generate the imagemap proper. Return the whole
+ # <map>..<img> combination, suitable for inclusion on
+ # the page
def wrap_in_image_map(src, dot)
- res = ""
+ res = %{<map id="map" name="map">\n}
dot_map = `dot -Tismap #{src}`
-
- if(!dot_map.empty?)
- res << %{<map id="map" name="map">\n}
- dot_map.split($/).each do |area|
- unless area =~ /^rectangle \((\d+),(\d+)\) \((\d+),(\d+)\) ([\/\w.]+)\s*(.*)/
- $stderr.puts "Unexpected output from dot:\n#{area}"
- return nil
- end
-
- xs, ys = [$1.to_i, $3.to_i], [$2.to_i, $4.to_i]
- url, area_name = $5, $6
-
- res << %{ <area shape="rect" coords="#{xs.min},#{ys.min},#{xs.max},#{ys.max}" }
- res << %{ href="#{url}" alt="#{area_name}" />\n}
+ dot_map.each do |area|
+ unless area =~ /^rectangle \((\d+),(\d+)\) \((\d+),(\d+)\) ([\/\w.]+)\s*(.*)/
+ $stderr.puts "Unexpected output from dot:\n#{area}"
+ return nil
end
- res << "</map>\n"
- end
+
+ xs, ys = [$1.to_i, $3.to_i], [$2.to_i, $4.to_i]
+ url, area_name = $5, $6
- res << %{<img src="#{dot}" usemap="#map" alt="#{dot}" />}
+ res << %{ <area shape="rect" coords="#{xs.min},#{ys.min},#{xs.max},#{ys.max}" }
+ res << %{ href="#{url}" alt="#{area_name}" />\n}
+ end
+ res << "</map>\n"
+# map_file = src.sub(/.dot/, '.map')
+# system("dot -Timap #{src} -o #{map_file}")
+ res << %{<img src="#{dot}" usemap="#map" border="0" alt="#{dot}">}
return res
end
-
end
-
end
diff --git a/lib/rdoc/dot.rb b/lib/rdoc/dot.rb
deleted file mode 100644
index fbd2cfba02..0000000000
--- a/lib/rdoc/dot.rb
+++ /dev/null
@@ -1,249 +0,0 @@
-module RDoc; end
-
-module RDoc::DOT
-
- TAB = ' '
- TAB2 = TAB * 2
-
- # options for node declaration
- NODE_OPTS = [
- 'bgcolor',
- 'color',
- 'fontcolor',
- 'fontname',
- 'fontsize',
- 'height',
- 'width',
- 'label',
- 'layer',
- 'rank',
- 'shape',
- 'shapefile',
- 'style',
- 'URL',
- ]
-
- # options for edge declaration
- EDGE_OPTS = [
- 'color',
- 'decorate',
- 'dir',
- 'fontcolor',
- 'fontname',
- 'fontsize',
- 'id',
- 'label',
- 'layer',
- 'lhead',
- 'ltail',
- 'minlen',
- 'style',
- 'weight'
- ]
-
- # options for graph declaration
- GRAPH_OPTS = [
- 'bgcolor',
- 'center',
- 'clusterrank',
- 'color',
- 'compound',
- 'concentrate',
- 'fillcolor',
- 'fontcolor',
- 'fontname',
- 'fontsize',
- 'label',
- 'layerseq',
- 'margin',
- 'mclimit',
- 'nodesep',
- 'nslimit',
- 'ordering',
- 'orientation',
- 'page',
- 'rank',
- 'rankdir',
- 'ranksep',
- 'ratio',
- 'size',
- 'style',
- 'URL'
- ]
-
- # a root class for any element in dot notation
- class SimpleElement
- attr_accessor :name
-
- def initialize( params = {} )
- @label = params['name'] ? params['name'] : ''
- end
-
- def to_s
- @name
- end
- end
-
- # an element that has options ( node, edge or graph )
- class Element < SimpleElement
- #attr_reader :parent
- attr_accessor :name, :options
-
- def initialize( params = {}, option_list = [] )
- super( params )
- @name = params['name'] ? params['name'] : nil
- @parent = params['parent'] ? params['parent'] : nil
- @options = {}
- option_list.each{ |i|
- @options[i] = params[i] if params[i]
- }
- @options['label'] ||= @name if @name != 'node'
- end
-
- def each_option
- @options.each{ |i| yield i }
- end
-
- def each_option_pair
- @options.each_pair{ |key, val| yield key, val }
- end
-
- #def parent=( thing )
- # @parent.delete( self ) if defined?( @parent ) and @parent
- # @parent = thing
- #end
- end
-
-
- # this is used when we build nodes that have shape=record
- # ports don't have options :)
- class Port < SimpleElement
- attr_accessor :label
-
- def initialize( params = {} )
- super( params )
- @name = params['label'] ? params['label'] : ''
- end
- def to_s
- ( @name && @name != "" ? "<#{@name}>" : "" ) + "#{@label}"
- end
- end
-
- # node element
- class Node < Element
-
- def initialize( params = {}, option_list = NODE_OPTS )
- super( params, option_list )
- @ports = params['ports'] ? params['ports'] : []
- end
-
- def each_port
- @ports.each{ |i| yield i }
- end
-
- def << ( thing )
- @ports << thing
- end
-
- def push ( thing )
- @ports.push( thing )
- end
-
- def pop
- @ports.pop
- end
-
- def to_s( t = '' )
-
- label = @options['shape'] != 'record' && @ports.length == 0 ?
- @options['label'] ?
- t + TAB + "label = \"#{@options['label']}\"\n" :
- '' :
- t + TAB + 'label = "' + " \\\n" +
- t + TAB2 + "#{@options['label']}| \\\n" +
- @ports.collect{ |i|
- t + TAB2 + i.to_s
- }.join( "| \\\n" ) + " \\\n" +
- t + TAB + '"' + "\n"
-
- t + "#{@name} [\n" +
- @options.to_a.collect{ |i|
- i[1] && i[0] != 'label' ?
- t + TAB + "#{i[0]} = #{i[1]}" : nil
- }.compact.join( ",\n" ) + ( label != '' ? ",\n" : "\n" ) +
- label +
- t + "]\n"
- end
- end
-
- # subgraph element is the same to graph, but has another header in dot
- # notation
- class Subgraph < Element
-
- def initialize( params = {}, option_list = GRAPH_OPTS )
- super( params, option_list )
- @nodes = params['nodes'] ? params['nodes'] : []
- @dot_string = 'subgraph'
- end
-
- def each_node
- @nodes.each{ |i| yield i }
- end
-
- def << ( thing )
- @nodes << thing
- end
-
- def push( thing )
- @nodes.push( thing )
- end
-
- def pop
- @nodes.pop
- end
-
- def to_s( t = '' )
- hdr = t + "#{@dot_string} #{@name} {\n"
-
- options = @options.to_a.collect{ |name, val|
- val && name != 'label' ?
- t + TAB + "#{name} = #{val}" :
- name ? t + TAB + "#{name} = \"#{val}\"" : nil
- }.compact.join( "\n" ) + "\n"
-
- nodes = @nodes.collect{ |i|
- i.to_s( t + TAB )
- }.join( "\n" ) + "\n"
- hdr + options + nodes + t + "}\n"
- end
- end
-
- # this is graph
- class Digraph < Subgraph
- def initialize( params = {}, option_list = GRAPH_OPTS )
- super( params, option_list )
- @dot_string = 'digraph'
- end
- end
-
- # this is edge
- class Edge < Element
- attr_accessor :from, :to
- def initialize( params = {}, option_list = EDGE_OPTS )
- super( params, option_list )
- @from = params['from'] ? params['from'] : nil
- @to = params['to'] ? params['to'] : nil
- end
-
- def to_s( t = '' )
- t + "#{@from} -> #{to} [\n" +
- @options.to_a.collect{ |i|
- i[1] && i[0] != 'label' ?
- t + TAB + "#{i[0]} = #{i[1]}" :
- i[1] ? t + TAB + "#{i[0]} = \"#{i[1]}\"" : nil
- }.compact.join( "\n" ) + "\n" + t + "]\n"
- end
- end
-
-end
-
diff --git a/lib/rdoc/dot/dot.rb b/lib/rdoc/dot/dot.rb
new file mode 100644
index 0000000000..6dbb7cb237
--- /dev/null
+++ b/lib/rdoc/dot/dot.rb
@@ -0,0 +1,255 @@
+module DOT
+
+ # these glogal vars are used to make nice graph source
+ $tab = ' '
+ $tab2 = $tab * 2
+
+ # if we don't like 4 spaces, we can change it any time
+ def change_tab( t )
+ $tab = t
+ $tab2 = t * 2
+ end
+
+ # options for node declaration
+ NODE_OPTS = [
+ 'bgcolor',
+ 'color',
+ 'fontcolor',
+ 'fontname',
+ 'fontsize',
+ 'height',
+ 'width',
+ 'label',
+ 'layer',
+ 'rank',
+ 'shape',
+ 'shapefile',
+ 'style',
+ 'URL',
+ ]
+
+ # options for edge declaration
+ EDGE_OPTS = [
+ 'color',
+ 'decorate',
+ 'dir',
+ 'fontcolor',
+ 'fontname',
+ 'fontsize',
+ 'id',
+ 'label',
+ 'layer',
+ 'lhead',
+ 'ltail',
+ 'minlen',
+ 'style',
+ 'weight'
+ ]
+
+ # options for graph declaration
+ GRAPH_OPTS = [
+ 'bgcolor',
+ 'center',
+ 'clusterrank',
+ 'color',
+ 'compound',
+ 'concentrate',
+ 'fillcolor',
+ 'fontcolor',
+ 'fontname',
+ 'fontsize',
+ 'label',
+ 'layerseq',
+ 'margin',
+ 'mclimit',
+ 'nodesep',
+ 'nslimit',
+ 'ordering',
+ 'orientation',
+ 'page',
+ 'rank',
+ 'rankdir',
+ 'ranksep',
+ 'ratio',
+ 'size',
+ 'style',
+ 'URL'
+ ]
+
+ # a root class for any element in dot notation
+ class DOTSimpleElement
+ attr_accessor :name
+
+ def initialize( params = {} )
+ @label = params['name'] ? params['name'] : ''
+ end
+
+ def to_s
+ @name
+ end
+ end
+
+ # an element that has options ( node, edge or graph )
+ class DOTElement < DOTSimpleElement
+ #attr_reader :parent
+ attr_accessor :name, :options
+
+ def initialize( params = {}, option_list = [] )
+ super( params )
+ @name = params['name'] ? params['name'] : nil
+ @parent = params['parent'] ? params['parent'] : nil
+ @options = {}
+ option_list.each{ |i|
+ @options[i] = params[i] if params[i]
+ }
+ @options['label'] ||= @name if @name != 'node'
+ end
+
+ def each_option
+ @options.each{ |i| yield i }
+ end
+
+ def each_option_pair
+ @options.each_pair{ |key, val| yield key, val }
+ end
+
+ #def parent=( thing )
+ # @parent.delete( self ) if defined?( @parent ) and @parent
+ # @parent = thing
+ #end
+ end
+
+
+ # this is used when we build nodes that have shape=record
+ # ports don't have options :)
+ class DOTPort < DOTSimpleElement
+ attr_accessor :label
+
+ def initialize( params = {} )
+ super( params )
+ @name = params['label'] ? params['label'] : ''
+ end
+ def to_s
+ ( @name && @name != "" ? "<#{@name}>" : "" ) + "#{@label}"
+ end
+ end
+
+ # node element
+ class DOTNode < DOTElement
+
+ def initialize( params = {}, option_list = NODE_OPTS )
+ super( params, option_list )
+ @ports = params['ports'] ? params['ports'] : []
+ end
+
+ def each_port
+ @ports.each{ |i| yield i }
+ end
+
+ def << ( thing )
+ @ports << thing
+ end
+
+ def push ( thing )
+ @ports.push( thing )
+ end
+
+ def pop
+ @ports.pop
+ end
+
+ def to_s( t = '' )
+
+ label = @options['shape'] != 'record' && @ports.length == 0 ?
+ @options['label'] ?
+ t + $tab + "label = \"#{@options['label']}\"\n" :
+ '' :
+ t + $tab + 'label = "' + " \\\n" +
+ t + $tab2 + "#{@options['label']}| \\\n" +
+ @ports.collect{ |i|
+ t + $tab2 + i.to_s
+ }.join( "| \\\n" ) + " \\\n" +
+ t + $tab + '"' + "\n"
+
+ t + "#{@name} [\n" +
+ @options.to_a.collect{ |i|
+ i[1] && i[0] != 'label' ?
+ t + $tab + "#{i[0]} = #{i[1]}" : nil
+ }.compact.join( ",\n" ) + ( label != '' ? ",\n" : "\n" ) +
+ label +
+ t + "]\n"
+ end
+ end
+
+ # subgraph element is the same to graph, but has another header in dot
+ # notation
+ class DOTSubgraph < DOTElement
+
+ def initialize( params = {}, option_list = GRAPH_OPTS )
+ super( params, option_list )
+ @nodes = params['nodes'] ? params['nodes'] : []
+ @dot_string = 'subgraph'
+ end
+
+ def each_node
+ @nodes.each{ |i| yield i }
+ end
+
+ def << ( thing )
+ @nodes << thing
+ end
+
+ def push( thing )
+ @nodes.push( thing )
+ end
+
+ def pop
+ @nodes.pop
+ end
+
+ def to_s( t = '' )
+ hdr = t + "#{@dot_string} #{@name} {\n"
+
+ options = @options.to_a.collect{ |name, val|
+ val && name != 'label' ?
+ t + $tab + "#{name} = #{val}" :
+ name ? t + $tab + "#{name} = \"#{val}\"" : nil
+ }.compact.join( "\n" ) + "\n"
+
+ nodes = @nodes.collect{ |i|
+ i.to_s( t + $tab )
+ }.join( "\n" ) + "\n"
+ hdr + options + nodes + t + "}\n"
+ end
+ end
+
+ # this is graph
+ class DOTDigraph < DOTSubgraph
+ def initialize( params = {}, option_list = GRAPH_OPTS )
+ super( params, option_list )
+ @dot_string = 'digraph'
+ end
+ end
+
+ # this is edge
+ class DOTEdge < DOTElement
+ attr_accessor :from, :to
+ def initialize( params = {}, option_list = EDGE_OPTS )
+ super( params, option_list )
+ @from = params['from'] ? params['from'] : nil
+ @to = params['to'] ? params['to'] : nil
+ end
+
+ def to_s( t = '' )
+ t + "#{@from} -> #{to} [\n" +
+ @options.to_a.collect{ |i|
+ i[1] && i[0] != 'label' ?
+ t + $tab + "#{i[0]} = #{i[1]}" :
+ i[1] ? t + $tab + "#{i[0]} = \"#{i[1]}\"" : nil
+ }.compact.join( "\n" ) + "\n" + t + "]\n"
+ end
+ end
+end
+
+
+
diff --git a/lib/rdoc/generator.rb b/lib/rdoc/generator.rb
deleted file mode 100644
index 86196b4cf6..0000000000
--- a/lib/rdoc/generator.rb
+++ /dev/null
@@ -1,1082 +0,0 @@
-require 'cgi'
-require 'rdoc'
-require 'rdoc/options'
-require 'rdoc/markup/to_html_crossref'
-require 'rdoc/template'
-
-module RDoc::Generator
-
- ##
- # Name of sub-directory that holds file descriptions
-
- FILE_DIR = "files"
-
- ##
- # Name of sub-directory that holds class descriptions
-
- CLASS_DIR = "classes"
-
- ##
- # Name of the RDoc CSS file
-
- CSS_NAME = "rdoc-style.css"
-
- ##
- # Build a hash of all items that can be cross-referenced. This is used when
- # we output required and included names: if the names appear in this hash,
- # we can generate an html cross reference to the appropriate description.
- # We also use this when parsing comment blocks: any decorated words matching
- # an entry in this list are hyperlinked.
-
- class AllReferences
- @@refs = {}
-
- def AllReferences::reset
- @@refs = {}
- end
-
- def AllReferences.add(name, html_class)
- @@refs[name] = html_class
- end
-
- def AllReferences.[](name)
- @@refs[name]
- end
-
- def AllReferences.keys
- @@refs.keys
- end
- end
-
- ##
- # Handle common markup tasks for the various Context subclasses
-
- module MarkUp
-
- ##
- # Convert a string in markup format into HTML.
-
- def markup(str, remove_para = false)
- return '' unless str
-
- # Convert leading comment markers to spaces, but only if all non-blank
- # lines have them
- if str =~ /^(?>\s*)[^\#]/ then
- content = str
- else
- content = str.gsub(/^\s*(#+)/) { $1.tr '#', ' ' }
- end
-
- res = formatter.convert content
-
- if remove_para then
- res.sub!(/^<p>/, '')
- res.sub!(/<\/p>$/, '')
- end
-
- res
- end
-
- ##
- # Qualify a stylesheet URL; if if +css_name+ does not begin with '/' or
- # 'http[s]://', prepend a prefix relative to +path+. Otherwise, return it
- # unmodified.
-
- def style_url(path, css_name=nil)
-# $stderr.puts "style_url( #{path.inspect}, #{css_name.inspect} )"
- css_name ||= CSS_NAME
- if %r{^(https?:/)?/} =~ css_name
- css_name
- else
- RDoc::Markup::ToHtml.gen_relative_url path, css_name
- end
- end
-
- ##
- # Build a webcvs URL with the given 'url' argument. URLs with a '%s' in them
- # get the file's path sprintfed into them; otherwise they're just catenated
- # together.
-
- def cvs_url(url, full_path)
- if /%s/ =~ url
- return sprintf( url, full_path )
- else
- return url + full_path
- end
- end
-
- end
-
- ##
- # A Context is built by the parser to represent a container: contexts hold
- # classes, modules, methods, require lists and include lists. ClassModule
- # and TopLevel are the context objects we process here
-
- class Context
-
- include MarkUp
-
- attr_reader :context
-
- ##
- # Generate:
- #
- # * a list of RDoc::Generator::File objects for each TopLevel object
- # * a list of RDoc::Generator::Class objects for each first level class or
- # module in the TopLevel objects
- # * a complete list of all hyperlinkable terms (file, class, module, and
- # method names)
-
- def self.build_indices(toplevels, options)
- files = []
- classes = []
-
- toplevels.each do |toplevel|
- files << RDoc::Generator::File.new(toplevel, options,
- RDoc::Generator::FILE_DIR)
- end
-
- RDoc::TopLevel.all_classes_and_modules.each do |cls|
- build_class_list(classes, options, cls, files[0],
- RDoc::Generator::CLASS_DIR)
- end
-
- return files, classes
- end
-
- def self.build_class_list(classes, options, from, html_file, class_dir)
- classes << RDoc::Generator::Class.new(from, html_file, class_dir, options)
-
- from.each_classmodule do |mod|
- build_class_list(classes, options, mod, html_file, class_dir)
- end
- end
-
- def initialize(context, options)
- @context = context
- @options = options
-
- # HACK ugly
- @template = options.template_class
- end
-
- def formatter
- @formatter ||= @options.formatter ||
- RDoc::Markup::ToHtmlCrossref.new(path, self, @options.show_hash)
- end
-
- ##
- # convenience method to build a hyperlink
-
- def href(link, cls, name)
- %{<a href="#{link}" class="#{cls}">#{name}</a>} #"
- end
-
- ##
- # Returns a reference to outselves to be used as an href= the form depends
- # on whether we're all in one file or in multiple files
-
- def as_href(from_path)
- if @options.all_one_file
- "#" + path
- else
- RDoc::Markup::ToHtml.gen_relative_url from_path, path
- end
- end
-
- ##
- # Create a list of Method objects for each method in the corresponding
- # context object. If the @options.show_all variable is set (corresponding
- # to the <tt>--all</tt> option, we include all methods, otherwise just the
- # public ones.
-
- def collect_methods
- list = @context.method_list
-
- unless @options.show_all then
- list = list.select do |m|
- m.visibility == :public or
- m.visibility == :protected or
- m.force_documentation
- end
- end
-
- @methods = list.collect do |m|
- RDoc::Generator::Method.new m, self, @options
- end
- end
-
- ##
- # Build a summary list of all the methods in this context
-
- def build_method_summary_list(path_prefix = "")
- collect_methods unless @methods
-
- @methods.sort.map do |meth|
- {
- "name" => CGI.escapeHTML(meth.name),
- "aref" => "##{meth.aref}"
- }
- end
- end
-
- ##
- # Build a list of aliases for which we couldn't find a
- # corresponding method
-
- def build_alias_summary_list(section)
- @context.aliases.map do |al|
- next unless al.section == section
-
- res = {
- 'old_name' => al.old_name,
- 'new_name' => al.new_name,
- }
-
- if al.comment and not al.comment.empty? then
- res['desc'] = markup al.comment, true
- end
-
- res
- end.compact
- end
-
- ##
- # Build a list of constants
-
- def build_constants_summary_list(section)
- @context.constants.map do |co|
- next unless co.section == section
-
- res = {
- 'name' => co.name,
- 'value' => CGI.escapeHTML(co.value)
- }
-
- if co.comment and not co.comment.empty? then
- res['desc'] = markup co.comment, true
- end
-
- res
- end.compact
- end
-
- def build_requires_list(context)
- potentially_referenced_list(context.requires) {|fn| [fn + ".rb"] }
- end
-
- def build_include_list(context)
- potentially_referenced_list(context.includes)
- end
-
- ##
- # Build a list from an array of Context items. Look up each in the
- # AllReferences hash: if we find a corresponding entry, we generate a
- # hyperlink to it, otherwise just output the name. However, some names
- # potentially need massaging. For example, you may require a Ruby file
- # without the .rb extension, but the file names we know about may have it.
- # To deal with this, we pass in a block which performs the massaging,
- # returning an array of alternative names to match
-
- def potentially_referenced_list(array)
- res = []
- array.each do |i|
- ref = AllReferences[i.name]
-# if !ref
-# container = @context.parent
-# while !ref && container
-# name = container.name + "::" + i.name
-# ref = AllReferences[name]
-# container = container.parent
-# end
-# end
-
- ref = @context.find_symbol(i.name)
- ref = ref.viewer if ref
-
- if !ref && block_given?
- possibles = yield(i.name)
- while !ref and !possibles.empty?
- ref = AllReferences[possibles.shift]
- end
- end
- h_name = CGI.escapeHTML(i.name)
- if ref and ref.document_self
- path = url(ref.path)
- res << { "name" => h_name, "aref" => path }
- else
- res << { "name" => h_name }
- end
- end
- res
- end
-
- ##
- # Build an array of arrays of method details. The outer array has up
- # to six entries, public, private, and protected for both class
- # methods, the other for instance methods. The inner arrays contain
- # a hash for each method
-
- def build_method_detail_list(section)
- outer = []
-
- methods = @methods.sort.select do |m|
- m.document_self and m.section == section
- end
-
- for singleton in [true, false]
- for vis in [ :public, :protected, :private ]
- res = []
- methods.each do |m|
- next unless m.visibility == vis and m.singleton == singleton
-
- row = {}
-
- if m.call_seq then
- row["callseq"] = m.call_seq.gsub(/->/, '&rarr;')
- else
- row["name"] = CGI.escapeHTML(m.name)
- row["params"] = m.params
- end
-
- desc = m.description.strip
- row["m_desc"] = desc unless desc.empty?
- row["aref"] = m.aref
- row["visibility"] = m.visibility.to_s
-
- alias_names = []
-
- m.aliases.each do |other|
- if other.viewer then # won't be if the alias is private
- alias_names << {
- 'name' => other.name,
- 'aref' => other.viewer.as_href(path)
- }
- end
- end
-
- row["aka"] = alias_names unless alias_names.empty?
-
- if @options.inline_source then
- code = m.source_code
- row["sourcecode"] = code if code
- else
- code = m.src_url
- if code then
- row["codeurl"] = code
- row["imgurl"] = m.img_url
- end
- end
-
- res << row
- end
-
- if res.size > 0 then
- outer << {
- "type" => vis.to_s.capitalize,
- "category" => singleton ? "Class" : "Instance",
- "methods" => res
- }
- end
- end
- end
-
- outer
- end
-
- ##
- # Build the structured list of classes and modules contained
- # in this context.
-
- def build_class_list(level, from, section, infile=nil)
- prefix = '&nbsp;&nbsp;::' * level;
- res = ''
-
- from.modules.sort.each do |mod|
- next unless mod.section == section
- next if infile && !mod.defined_in?(infile)
- if mod.document_self
- res <<
- prefix <<
- 'Module ' <<
- href(url(mod.viewer.path), 'link', mod.full_name) <<
- "<br />\n" <<
- build_class_list(level + 1, mod, section, infile)
- end
- end
-
- from.classes.sort.each do |cls|
- next unless cls.section == section
- next if infile and not cls.defined_in?(infile)
-
- if cls.document_self
- res <<
- prefix <<
- 'Class ' <<
- href(url(cls.viewer.path), 'link', cls.full_name) <<
- "<br />\n" <<
- build_class_list(level + 1, cls, section, infile)
- end
- end
-
- res
- end
-
- def url(target)
- RDoc::Markup::ToHtml.gen_relative_url path, target
- end
-
- def aref_to(target)
- if @options.all_one_file
- "#" + target
- else
- url(target)
- end
- end
-
- def document_self
- @context.document_self
- end
-
- def diagram_reference(diagram)
- res = diagram.gsub(/((?:src|href)=")(.*?)"/) {
- $1 + url($2) + '"'
- }
- res
- end
-
- ##
- # Find a symbol in ourselves or our parent
-
- def find_symbol(symbol, method=nil)
- res = @context.find_symbol(symbol, method)
- if res
- res = res.viewer
- end
- res
- end
-
- ##
- # create table of contents if we contain sections
-
- def add_table_of_sections
- toc = []
- @context.sections.each do |section|
- if section.title then
- toc << {
- 'secname' => section.title,
- 'href' => section.sequence
- }
- end
- end
-
- @values['toc'] = toc unless toc.empty?
- end
-
- end
-
- ##
- # Wrap a ClassModule context
-
- class Class < Context
-
- attr_reader :methods
- attr_reader :path
- attr_reader :values
-
- def initialize(context, html_file, prefix, options)
- super context, options
-
- @html_file = html_file
- @html_class = self
- @is_module = context.module?
- @values = {}
-
- context.viewer = self
-
- if options.all_one_file
- @path = context.full_name
- else
- @path = http_url(context.full_name, prefix)
- end
-
- collect_methods
-
- AllReferences.add(name, self)
- end
-
- ##
- # Returns the relative file name to store this class in, which is also its
- # url
-
- def http_url(full_name, prefix)
- path = full_name.dup
-
- path.gsub!(/<<\s*(\w*)/, 'from-\1') if path['<<']
-
- ::File.join(prefix, path.split("::")) + ".html"
- end
-
- def name
- @context.full_name
- end
-
- def parent_name
- @context.parent.full_name
- end
-
- def index_name
- name
- end
-
- def write_on(f, file_list, class_list, method_list, overrides = {})
- value_hash
-
- @values['file_list'] = file_list
- @values['class_list'] = class_list
- @values['method_list'] = method_list
-
- @values.update overrides
-
- template = RDoc::TemplatePage.new(@template::BODY,
- @template::CLASS_PAGE,
- @template::METHOD_LIST)
-
- template.write_html_on(f, @values)
- end
-
- def value_hash
- class_attribute_values
- add_table_of_sections
-
- @values["charset"] = @options.charset
- @values["style_url"] = style_url(path, @options.css)
-
- d = markup(@context.comment)
- @values["description"] = d unless d.empty?
-
- ml = build_method_summary_list @path
- @values["methods"] = ml unless ml.empty?
-
- il = build_include_list @context
- @values["includes"] = il unless il.empty?
-
- @values["sections"] = @context.sections.map do |section|
- secdata = {
- "sectitle" => section.title,
- "secsequence" => section.sequence,
- "seccomment" => markup(section.comment),
- }
-
- al = build_alias_summary_list section
- secdata["aliases"] = al unless al.empty?
-
- co = build_constants_summary_list section
- secdata["constants"] = co unless co.empty?
-
- al = build_attribute_list section
- secdata["attributes"] = al unless al.empty?
-
- cl = build_class_list 0, @context, section
- secdata["classlist"] = cl unless cl.empty?
-
- mdl = build_method_detail_list section
- secdata["method_list"] = mdl unless mdl.empty?
-
- secdata
- end
-
- @values
- end
-
- def build_attribute_list(section)
- @context.attributes.sort.map do |att|
- next unless att.section == section
-
- if att.visibility == :public or att.visibility == :protected or
- @options.show_all then
-
- entry = {
- "name" => CGI.escapeHTML(att.name),
- "rw" => att.rw,
- "a_desc" => markup(att.comment, true)
- }
-
- unless att.visibility == :public or att.visibility == :protected then
- entry["rw"] << "-"
- end
-
- entry
- end
- end.compact
- end
-
- def class_attribute_values
- h_name = CGI.escapeHTML(name)
-
- @values["href"] = @path
- @values["classmod"] = @is_module ? "Module" : "Class"
- @values["title"] = "#{@values['classmod']}: #{h_name} [#{@options.title}]"
-
- c = @context
- c = c.parent while c and not c.diagram
-
- if c and c.diagram then
- @values["diagram"] = diagram_reference(c.diagram)
- end
-
- @values["full_name"] = h_name
-
- if not @context.module? and @context.superclass then
- parent_class = @context.superclass
- @values["parent"] = CGI.escapeHTML(parent_class)
-
- if parent_name
- lookup = parent_name + "::" + parent_class
- else
- lookup = parent_class
- end
-
- parent_url = AllReferences[lookup] || AllReferences[parent_class]
-
- if parent_url and parent_url.document_self
- @values["par_url"] = aref_to(parent_url.path)
- end
- end
-
- files = []
- @context.in_files.each do |f|
- res = {}
- full_path = CGI.escapeHTML(f.file_absolute_name)
-
- res["full_path"] = full_path
- res["full_path_url"] = aref_to(f.viewer.path) if f.document_self
-
- if @options.webcvs
- res["cvsurl"] = cvs_url( @options.webcvs, full_path )
- end
-
- files << res
- end
-
- @values['infiles'] = files
- end
-
- def <=>(other)
- self.name <=> other.name
- end
-
- end
-
- ##
- # Handles the mapping of a file's information to HTML. In reality, a file
- # corresponds to a +TopLevel+ object, containing modules, classes, and
- # top-level methods. In theory it _could_ contain attributes and aliases,
- # but we ignore these for now.
-
- class File < Context
-
- attr_reader :path
- attr_reader :name
- attr_reader :values
-
- def initialize(context, options, file_dir)
- super context, options
-
- @values = {}
-
- if options.all_one_file
- @path = filename_to_label
- else
- @path = http_url(file_dir)
- end
-
- @name = @context.file_relative_name
-
- collect_methods
- AllReferences.add(name, self)
- context.viewer = self
- end
-
- def http_url(file_dir)
- ::File.join file_dir, "#{@context.file_relative_name.tr '.', '_'}.html"
- end
-
- def filename_to_label
- @context.file_relative_name.gsub(/%|\/|\?|\#/) do
- ('%%%x' % $&[0]).unpack('C')
- end
- end
-
- def index_name
- name
- end
-
- def parent_name
- nil
- end
-
- def value_hash
- file_attribute_values
- add_table_of_sections
-
- @values["charset"] = @options.charset
- @values["href"] = path
- @values["style_url"] = style_url(path, @options.css)
-
- if @context.comment
- d = markup(@context.comment)
- @values["description"] = d if d.size > 0
- end
-
- ml = build_method_summary_list
- @values["methods"] = ml unless ml.empty?
-
- il = build_include_list(@context)
- @values["includes"] = il unless il.empty?
-
- rl = build_requires_list(@context)
- @values["requires"] = rl unless rl.empty?
-
- if @options.promiscuous
- file_context = nil
- else
- file_context = @context
- end
-
-
- @values["sections"] = @context.sections.map do |section|
-
- secdata = {
- "sectitle" => section.title,
- "secsequence" => section.sequence,
- "seccomment" => markup(section.comment)
- }
-
- cl = build_class_list(0, @context, section, file_context)
- secdata["classlist"] = cl unless cl.empty?
-
- mdl = build_method_detail_list(section)
- secdata["method_list"] = mdl unless mdl.empty?
-
- al = build_alias_summary_list(section)
- secdata["aliases"] = al unless al.empty?
-
- co = build_constants_summary_list(section)
- secdata["constants"] = co unless co.empty?
-
- secdata
- end
-
- @values
- end
-
- def write_on(f, file_list, class_list, method_list, overrides = {})
- value_hash
-
- @values['file_list'] = file_list
- @values['class_list'] = class_list
- @values['method_list'] = method_list
-
- @values.update overrides
-
- template = RDoc::TemplatePage.new(@template::BODY,
- @template::FILE_PAGE,
- @template::METHOD_LIST)
-
- template.write_html_on(f, @values)
- end
-
- def file_attribute_values
- full_path = @context.file_absolute_name
- short_name = ::File.basename full_path
-
- @values["title"] = CGI.escapeHTML("File: #{short_name} [#{@options.title}]")
-
- if @context.diagram then
- @values["diagram"] = diagram_reference(@context.diagram)
- end
-
- @values["short_name"] = CGI.escapeHTML(short_name)
- @values["full_path"] = CGI.escapeHTML(full_path)
- @values["dtm_modified"] = @context.file_stat.mtime.to_s
-
- if @options.webcvs then
- @values["cvsurl"] = cvs_url @options.webcvs, @values["full_path"]
- end
- end
-
- def <=>(other)
- self.name <=> other.name
- end
-
- end
-
- class Method
-
- include MarkUp
-
- attr_reader :context
- attr_reader :src_url
- attr_reader :img_url
- attr_reader :source_code
-
- def self.all_methods
- @@all_methods
- end
-
- def self.reset
- @@all_methods = []
- @@seq = "M000000"
- end
-
- # Initialize the class variables.
- self.reset
-
- def initialize(context, html_class, options)
- # TODO: rethink the class hierarchy here...
- @context = context
- @html_class = html_class
- @options = options
-
- @@seq = @@seq.succ
- @seq = @@seq
-
- # HACK ugly
- @template = options.template_class
-
- @@all_methods << self
-
- context.viewer = self
-
- if (ts = @context.token_stream)
- @source_code = markup_code(ts)
- unless @options.inline_source
- @src_url = create_source_code_file(@source_code)
- @img_url = RDoc::Markup::ToHtml.gen_relative_url path, 'source.png'
- end
- end
-
- AllReferences.add(name, self)
- end
-
- ##
- # Returns a reference to outselves to be used as an href= the form depends
- # on whether we're all in one file or in multiple files
-
- def as_href(from_path)
- if @options.all_one_file
- "#" + path
- else
- RDoc::Markup::ToHtml.gen_relative_url from_path, path
- end
- end
-
- def formatter
- @formatter ||= @options.formatter ||
- RDoc::Markup::ToHtmlCrossref.new(path, self, @options.show_hash)
- end
-
- def inspect
- alias_for = if @context.is_alias_for then
- " (alias_for #{@context.is_alias_for})"
- else
- nil
- end
-
- "#<%s:0x%x %s%s%s (%s)%s>" % [
- self.class, object_id,
- @context.parent.name,
- @context.singleton ? '::' : '#',
- name,
- @context.visibility,
- alias_for
- ]
- end
-
- def name
- @context.name
- end
-
- def section
- @context.section
- end
-
- def index_name
- "#{@context.name} (#{@html_class.name})"
- end
-
- def parent_name
- if @context.parent.parent
- @context.parent.parent.full_name
- else
- nil
- end
- end
-
- def aref
- @seq
- end
-
- def path
- if @options.all_one_file
- aref
- else
- @html_class.path + "#" + aref
- end
- end
-
- def description
- markup(@context.comment)
- end
-
- def visibility
- @context.visibility
- end
-
- def singleton
- @context.singleton
- end
-
- def call_seq
- cs = @context.call_seq
- if cs
- cs.gsub(/\n/, "<br />\n")
- else
- nil
- end
- end
-
- def params
- # params coming from a call-seq in 'C' will start with the
- # method name
- params = @context.params
- if params !~ /^\w/
- params = @context.params.gsub(/\s*\#.*/, '')
- params = params.tr("\n", " ").squeeze(" ")
- params = "(" + params + ")" unless params[0] == ?(
-
- if (block = @context.block_params)
- # If this method has explicit block parameters, remove any
- # explicit &block
-
- params.sub!(/,?\s*&\w+/, '')
-
- block.gsub!(/\s*\#.*/, '')
- block = block.tr("\n", " ").squeeze(" ")
- if block[0] == ?(
- block.sub!(/^\(/, '').sub!(/\)/, '')
- end
- params << " {|#{block.strip}| ...}"
- end
- end
- CGI.escapeHTML(params)
- end
-
- def create_source_code_file(code_body)
- meth_path = @html_class.path.sub(/\.html$/, '.src')
- FileUtils.mkdir_p(meth_path)
- file_path = ::File.join meth_path, "#{@seq}.html"
-
- template = RDoc::TemplatePage.new(@template::SRC_PAGE)
-
- open file_path, 'w' do |f|
- values = {
- 'title' => CGI.escapeHTML(index_name),
- 'code' => code_body,
- 'style_url' => style_url(file_path, @options.css),
- 'charset' => @options.charset
- }
- template.write_html_on(f, values)
- end
-
- RDoc::Markup::ToHtml.gen_relative_url path, file_path
- end
-
- def <=>(other)
- @context <=> other.context
- end
-
- ##
- # Given a sequence of source tokens, mark up the source code
- # to make it look purty.
-
- def markup_code(tokens)
- src = ""
- tokens.each do |t|
- next unless t
-# style = STYLE_MAP[t.class]
- style = case t
- when RDoc::RubyToken::TkCONSTANT then "ruby-constant"
- when RDoc::RubyToken::TkKW then "ruby-keyword kw"
- when RDoc::RubyToken::TkIVAR then "ruby-ivar"
- when RDoc::RubyToken::TkOp then "ruby-operator"
- when RDoc::RubyToken::TkId then "ruby-identifier"
- when RDoc::RubyToken::TkNode then "ruby-node"
- when RDoc::RubyToken::TkCOMMENT then "ruby-comment cmt"
- when RDoc::RubyToken::TkREGEXP then "ruby-regexp re"
- when RDoc::RubyToken::TkSTRING then "ruby-value str"
- when RDoc::RubyToken::TkVal then "ruby-value"
- else
- nil
- end
-
- text = CGI.escapeHTML(t.text)
-
- if style
- src << "<span class=\"#{style}\">#{text}</span>"
- else
- src << text
- end
- end
-
- add_line_numbers(src) if @options.include_line_numbers
- src
- end
-
- ##
- # We rely on the fact that the first line of a source code listing has
- # # File xxxxx, line dddd
-
- def add_line_numbers(src)
- if src =~ /\A.*, line (\d+)/
- first = $1.to_i - 1
- last = first + src.count("\n")
- size = last.to_s.length
- fmt = "%#{size}d: "
- is_first_line = true
- line_num = first
- src.gsub!(/^/) do
- if is_first_line then
- is_first_line = false
- res = " " * (size+2)
- else
- res = sprintf(fmt, line_num)
- end
-
- line_num += 1
- res
- end
- end
- end
-
- def document_self
- @context.document_self
- end
-
- def aliases
- @context.aliases
- end
-
- def find_symbol(symbol, method=nil)
- res = @context.parent.find_symbol(symbol, method)
- if res
- res = res.viewer
- end
- res
- end
-
- end
-
-end
-
diff --git a/lib/rdoc/generator/chm.rb b/lib/rdoc/generator/chm.rb
deleted file mode 100644
index 7537365842..0000000000
--- a/lib/rdoc/generator/chm.rb
+++ /dev/null
@@ -1,113 +0,0 @@
-require 'rdoc/generator/html'
-
-class RDoc::Generator::CHM < RDoc::Generator::HTML
-
- HHC_PATH = "c:/Program Files/HTML Help Workshop/hhc.exe"
-
- ##
- # Standard generator factory
-
- def self.for(options)
- new(options)
- end
-
- def initialize(*args)
- super
- @op_name = @options.op_name || "rdoc"
- check_for_html_help_workshop
- end
-
- def check_for_html_help_workshop
- stat = File.stat(HHC_PATH)
- rescue
- $stderr <<
- "\n.chm output generation requires that Microsoft's Html Help\n" <<
- "Workshop is installed. RDoc looks for it in:\n\n " <<
- HHC_PATH <<
- "\n\nYou can download a copy for free from:\n\n" <<
- " http://msdn.microsoft.com/library/default.asp?" <<
- "url=/library/en-us/htmlhelp/html/hwMicrosoftHTMLHelpDownloads.asp\n\n"
- end
-
- ##
- # Generate the html as normal, then wrap it in a help project
-
- def generate(info)
- super
- @project_name = @op_name + ".hhp"
- create_help_project
- end
-
- ##
- # The project contains the project file, a table of contents and an index
-
- def create_help_project
- create_project_file
- create_contents_and_index
- compile_project
- end
-
- ##
- # The project file links together all the various
- # files that go to make up the help.
-
- def create_project_file
- template = RDoc::TemplatePage.new @template::HPP_FILE
- values = { "title" => @options.title, "opname" => @op_name }
- files = []
- @files.each do |f|
- files << { "html_file_name" => f.path }
- end
-
- values['all_html_files'] = files
-
- File.open(@project_name, "w") do |f|
- template.write_html_on(f, values)
- end
- end
-
- ##
- # The contents is a list of all files and modules.
- # For each we include as sub-entries the list
- # of methods they contain. As we build the contents
- # we also build an index file
-
- def create_contents_and_index
- contents = []
- index = []
-
- (@files+@classes).sort.each do |entry|
- content_entry = { "c_name" => entry.name, "ref" => entry.path }
- index << { "name" => entry.name, "aref" => entry.path }
-
- internals = []
-
- methods = entry.build_method_summary_list(entry.path)
-
- content_entry["methods"] = methods unless methods.empty?
- contents << content_entry
- index.concat methods
- end
-
- values = { "contents" => contents }
- template = RDoc::TemplatePage.new @template::CONTENTS
- File.open("contents.hhc", "w") do |f|
- template.write_html_on(f, values)
- end
-
- values = { "index" => index }
- template = RDoc::TemplatePage.new @template::CHM_INDEX
- File.open("index.hhk", "w") do |f|
- template.write_html_on(f, values)
- end
- end
-
- ##
- # Invoke the windows help compiler to compiler the project
-
- def compile_project
- system(HHC_PATH, @project_name)
- end
-
-end
-
diff --git a/lib/rdoc/generator/chm/chm.rb b/lib/rdoc/generator/chm/chm.rb
deleted file mode 100644
index c362318d91..0000000000
--- a/lib/rdoc/generator/chm/chm.rb
+++ /dev/null
@@ -1,100 +0,0 @@
-require 'rdoc/generator/chm'
-require 'rdoc/generator/html/html'
-
-module RDoc::Generator::CHM::CHM
-
- HTML = RDoc::Generator::HTML::HTML
-
- INDEX = HTML::INDEX
-
- STYLE = HTML::STYLE
-
- CLASS_INDEX = HTML::CLASS_INDEX
- CLASS_PAGE = HTML::CLASS_PAGE
- FILE_INDEX = HTML::FILE_INDEX
- FILE_PAGE = HTML::FILE_PAGE
- METHOD_INDEX = HTML::METHOD_INDEX
- METHOD_LIST = HTML::METHOD_LIST
-
- FR_INDEX_BODY = HTML::FR_INDEX_BODY
-
- # This is a nasty little hack, but hhc doesn't support the <?xml tag, so...
- BODY = HTML::BODY.sub!(/<\?xml.*\?>/, '')
- SRC_PAGE = HTML::SRC_PAGE.sub!(/<\?xml.*\?>/, '')
-
- HPP_FILE = <<-EOF
-[OPTIONS]
-Auto Index = Yes
-Compatibility=1.1 or later
-Compiled file=<%= values["opname"] %>.chm
-Contents file=contents.hhc
-Full-text search=Yes
-Index file=index.hhk
-Language=0x409 English(United States)
-Title=<%= values["title"] %>
-
-[FILES]
-<% values["all_html_files"].each do |all_html_files| %>
-<%= all_html_files["html_file_name"] %>
-<% end # values["all_html_files"] %>
- EOF
-
- CONTENTS = <<-EOF
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<HTML>
-<HEAD>
-<meta name="GENERATOR" content="Microsoft&reg; HTML Help Workshop 4.1">
-<!-- Sitemap 1.0 -->
-</HEAD><BODY>
-<OBJECT type="text/site properties">
- <param name="Foreground" value="0x80">
- <param name="Window Styles" value="0x800025">
- <param name="ImageType" value="Folder">
-</OBJECT>
-<UL>
-<% values["contents"].each do |contents| %>
- <LI> <OBJECT type="text/sitemap">
- <param name="Name" value="<%= contents["c_name"] %>">
- <param name="Local" value="<%= contents["ref"] %>">
- </OBJECT>
-<% if contents["methods"] then %>
-<ul>
-<% contents["methods"].each do |methods| %>
- <LI> <OBJECT type="text/sitemap">
- <param name="Name" value="<%= methods["name"] %>">
- <param name="Local" value="<%= methods["aref"] %>">
- </OBJECT>
-<% end # contents["methods"] %>
-</ul>
-<% end %>
- </LI>
-<% end # values["contents"] %>
-</UL>
-</BODY></HTML>
- EOF
-
- CHM_INDEX = <<-EOF
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<HTML>
-<HEAD>
-<meta name="GENERATOR" content="Microsoft&reg; HTML Help Workshop 4.1">
-<!-- Sitemap 1.0 -->
-</HEAD><BODY>
-<OBJECT type="text/site properties">
- <param name="Foreground" value="0x80">
- <param name="Window Styles" value="0x800025">
- <param name="ImageType" value="Folder">
-</OBJECT>
-<UL>
-<% values["index"].each do |index| %>
- <LI> <OBJECT type="text/sitemap">
- <param name="Name" value="<%= index["name"] %>">
- <param name="Local" value="<%= index["aref"] %>">
- </OBJECT>
-<% end # values["index"] %>
-</UL>
-</BODY></HTML>
- EOF
-
-end
-
diff --git a/lib/rdoc/generator/html.rb b/lib/rdoc/generator/html.rb
deleted file mode 100644
index 60e0c175fe..0000000000
--- a/lib/rdoc/generator/html.rb
+++ /dev/null
@@ -1,445 +0,0 @@
-require 'fileutils'
-
-require 'rdoc/generator'
-require 'rdoc/markup/to_html'
-
-##
-# We're responsible for generating all the HTML files from the object tree
-# defined in code_objects.rb. We generate:
-#
-# [files] an html file for each input file given. These
-# input files appear as objects of class
-# TopLevel
-#
-# [classes] an html file for each class or module encountered.
-# These classes are not grouped by file: if a file
-# contains four classes, we'll generate an html
-# file for the file itself, and four html files
-# for the individual classes.
-#
-# [indices] we generate three indices for files, classes,
-# and methods. These are displayed in a browser
-# like window with three index panes across the
-# top and the selected description below
-#
-# Method descriptions appear in whatever entity (file, class, or module) that
-# contains them.
-#
-# We generate files in a structure below a specified subdirectory, normally
-# +doc+.
-#
-# opdir
-# |
-# |___ files
-# | |__ per file summaries
-# |
-# |___ classes
-# |__ per class/module descriptions
-#
-# HTML is generated using the Template class.
-
-class RDoc::Generator::HTML
-
- include RDoc::Generator::MarkUp
-
- ##
- # Generator may need to return specific subclasses depending on the
- # options they are passed. Because of this we create them using a factory
-
- def self.for(options)
- RDoc::Generator::AllReferences.reset
- RDoc::Generator::Method.reset
-
- if options.all_one_file
- RDoc::Generator::HTMLInOne.new options
- else
- new options
- end
- end
-
- class << self
- protected :new
- end
-
- ##
- # Set up a new HTML generator. Basically all we do here is load up the
- # correct output temlate
-
- def initialize(options) #:not-new:
- @options = options
- load_html_template
- end
-
- ##
- # Build the initial indices and output objects
- # based on an array of TopLevel objects containing
- # the extracted information.
-
- def generate(toplevels)
- @toplevels = toplevels
- @files = []
- @classes = []
-
- write_style_sheet
- gen_sub_directories
- build_indices
- generate_html
- end
-
- private
-
- ##
- # Load up the HTML template specified in the options.
- # If the template name contains a slash, use it literally
-
- def load_html_template
- #
- # If the template is not a path, first look for it
- # in rdoc's HTML template directory. Perhaps this behavior should
- # be reversed (first try to include the template and, only if that
- # fails, try to include it in the default template directory).
- # One danger with reversing the behavior, however, is that
- # if something like require 'html' could load up an
- # unrelated file in the standard library or in a gem.
- #
- template = @options.template
-
- unless template =~ %r{/|\\} then
- template = File.join('rdoc', 'generator', @options.generator.key,
- template)
- end
-
- begin
- require template
-
- @template = self.class.const_get @options.template.upcase
- @options.template_class = @template
- rescue LoadError => e
- #
- # The template did not exist in the default template directory, so
- # see if require can find the template elsewhere (in a gem, for
- # instance).
- #
- if(e.message[template] && template != @options.template)
- template = @options.template
- retry
- end
-
- $stderr.puts "Could not find HTML template '#{template}': #{e.message}"
- exit 99
- end
- end
-
- ##
- # Write out the style sheet used by the main frames
-
- def write_style_sheet
- return unless @template.constants.include? :STYLE or
- @template.constants.include? 'STYLE'
-
- template = RDoc::TemplatePage.new @template::STYLE
-
- unless @options.css then
- open RDoc::Generator::CSS_NAME, 'w' do |f|
- values = {}
-
- if @template.constants.include? :FONTS or
- @template.constants.include? 'FONTS' then
- values["fonts"] = @template::FONTS
- end
-
- template.write_html_on(f, values)
- end
- end
- end
-
- ##
- # See the comments at the top for a description of the directory structure
-
- def gen_sub_directories
- FileUtils.mkdir_p RDoc::Generator::FILE_DIR
- FileUtils.mkdir_p RDoc::Generator::CLASS_DIR
- rescue
- $stderr.puts $!.message
- exit 1
- end
-
- def build_indices
- @files, @classes = RDoc::Generator::Context.build_indices(@toplevels,
- @options)
- end
-
- ##
- # Generate all the HTML
-
- def generate_html
- @main_url = main_url
-
- # the individual descriptions for files and classes
- gen_into(@files)
- gen_into(@classes)
-
- # and the index files
- gen_file_index
- gen_class_index
- gen_method_index
- gen_main_index
-
- # this method is defined in the template file
- values = {
- 'title_suffix' => CGI.escapeHTML("[#{@options.title}]"),
- 'charset' => @options.charset,
- 'style_url' => style_url('', @options.css),
- }
-
- @template.write_extra_pages(values) if @template.respond_to?(:write_extra_pages)
- end
-
- def gen_into(list)
- #
- # The file, class, and method lists technically should be regenerated
- # for every output file, in order that the relative links be correct
- # (we are worried here about frameless templates, which need this
- # information for every generated page). Doing this is a bit slow,
- # however. For a medium-sized gem, this increased rdoc's runtime by
- # about 5% (using the 'time' command-line utility). While this is not
- # necessarily a problem, I do not want to pessimize rdoc for large
- # projects, however, and so we only regenerate the lists when the
- # directory of the output file changes, which seems like a reasonable
- # optimization.
- #
- file_list = {}
- class_list = {}
- method_list = {}
- prev_op_dir = nil
-
- list.each do |item|
- next unless item.document_self
-
- op_file = item.path
- op_dir = File.dirname(op_file)
-
- if(op_dir != prev_op_dir)
- file_list = index_to_links op_file, @files
- class_list = index_to_links op_file, @classes
- method_list = index_to_links op_file, RDoc::Generator::Method.all_methods
- end
- prev_op_dir = op_dir
-
- FileUtils.mkdir_p op_dir
-
- open op_file, 'w' do |io|
- item.write_on io, file_list, class_list, method_list
- end
- end
- end
-
- def gen_file_index
- gen_an_index @files, 'Files', @template::FILE_INDEX, "fr_file_index.html"
- end
-
- def gen_class_index
- gen_an_index(@classes, 'Classes', @template::CLASS_INDEX,
- "fr_class_index.html")
- end
-
- def gen_method_index
- gen_an_index(RDoc::Generator::Method.all_methods, 'Methods',
- @template::METHOD_INDEX, "fr_method_index.html")
- end
-
- def gen_an_index(collection, title, template, filename)
- template = RDoc::TemplatePage.new @template::FR_INDEX_BODY, template
- res = []
- collection.sort.each do |f|
- if f.document_self
- res << { "href" => f.path, "name" => f.index_name }
- end
- end
-
- values = {
- "entries" => res,
- 'title' => CGI.escapeHTML("#{title} [#{@options.title}]"),
- 'list_title' => CGI.escapeHTML(title),
- 'index_url' => @main_url,
- 'charset' => @options.charset,
- 'style_url' => style_url('', @options.css),
- }
-
- open filename, 'w' do |f|
- template.write_html_on(f, values)
- end
- end
-
- ##
- # The main index page is mostly a template frameset, but includes the
- # initial page. If the <tt>--main</tt> option was given, we use this as
- # our main page, otherwise we use the first file specified on the command
- # line.
-
- def gen_main_index
- if @template.const_defined? :FRAMELESS then
- #
- # If we're using a template without frames, then just redirect
- # to it from index.html.
- #
- # One alternative to this, expanding the main page's template into
- # index.html, is tricky because the relative URLs will be different
- # (since index.html is located in at the site's root,
- # rather than within a files or a classes subdirectory).
- #
- open 'index.html', 'w' do |f|
- f.puts(%{<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">})
- f.puts(%{<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
- lang="en">})
- f.puts(%{<head>})
- f.puts(%{<title>#{CGI.escapeHTML(@options.title)}</title>})
- f.puts(%{<meta http-equiv="refresh" content="0; url=#{@main_url}" />})
- f.puts(%{</head>})
- f.puts(%{<body></body>})
- f.puts(%{</html>})
- end
- else
- main = RDoc::TemplatePage.new @template::INDEX
-
- open 'index.html', 'w' do |f|
- style_url = style_url '', @options.css
-
- classes = @classes.sort.map { |klass| klass.value_hash }
-
- values = {
- 'initial_page' => @main_url,
- 'style_url' => style_url('', @options.css),
- 'title' => CGI.escapeHTML(@options.title),
- 'charset' => @options.charset,
- 'classes' => classes,
- }
-
- values['inline_source'] = @options.inline_source
-
- main.write_html_on f, values
- end
- end
- end
-
- def index_to_links(output_path, collection)
- collection.sort.map do |f|
- next unless f.document_self
- { "href" => RDoc::Markup::ToHtml.gen_relative_url(output_path, f.path),
- "name" => f.index_name }
- end.compact
- end
-
- ##
- # Returns the url of the main page
-
- def main_url
- main_page = @options.main_page
-
- #
- # If a main page has been specified (--main), then search for it
- # in the AllReferences array. This allows either files or classes
- # to be used for the main page.
- #
- if main_page then
- main_page_ref = RDoc::Generator::AllReferences[main_page]
-
- if main_page_ref then
- return main_page_ref.path
- else
- $stderr.puts "Could not find main page #{main_page}"
- end
- end
-
- #
- # No main page has been specified, so just use the README.
- #
- @files.each do |file|
- if file.name =~ /^README/ then
- return file.path
- end
- end
-
- #
- # There's no README (shame! shame!). Just use the first file
- # that will be documented.
- #
- @files.each do |file|
- if file.document_self then
- return file.path
- end
- end
-
- #
- # There are no files to be documented... Something seems very wrong.
- #
- raise RDoc::Error, "Couldn't find anything to document (perhaps :stopdoc: has been used in all classes)!"
- end
- private :main_url
-
-end
-
-class RDoc::Generator::HTMLInOne < RDoc::Generator::HTML
-
- def initialize(*args)
- super
- end
-
- ##
- # Build the initial indices and output objects
- # based on an array of TopLevel objects containing
- # the extracted information.
-
- def generate(info)
- @toplevels = info
- @hyperlinks = {}
-
- build_indices
- generate_xml
- end
-
- ##
- # Generate:
- #
- # * a list of RDoc::Generator::File objects for each TopLevel object.
- # * a list of RDoc::Generator::Class objects for each first level
- # class or module in the TopLevel objects
- # * a complete list of all hyperlinkable terms (file,
- # class, module, and method names)
-
- def build_indices
- @files, @classes = RDoc::Generator::Context.build_indices(@toplevels,
- @options)
- end
-
- ##
- # Generate all the HTML. For the one-file case, we generate
- # all the information in to one big hash
-
- def generate_xml
- values = {
- 'charset' => @options.charset,
- 'files' => gen_into(@files),
- 'classes' => gen_into(@classes),
- 'title' => CGI.escapeHTML(@options.title),
- }
-
- template = RDoc::TemplatePage.new @template::ONE_PAGE
-
- if @options.op_name
- opfile = open @options.op_name, 'w'
- else
- opfile = $stdout
- end
- template.write_html_on(opfile, values)
- end
-
- def gen_into(list)
- res = []
- list.each do |item|
- res << item.value_hash
- end
- res
- end
-end
diff --git a/lib/rdoc/generator/html/common.rb b/lib/rdoc/generator/html/common.rb
deleted file mode 100644
index b25f009a72..0000000000
--- a/lib/rdoc/generator/html/common.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# The templates require further refactoring. In particular,
-# * Some kind of HTML generation library should be used.
-#
-# Also, all of the templates require some TLC from a designer.
-#
-# Right now, this file contains some constants that are used by all
-# of the templates.
-#
-module RDoc::Generator::HTML::Common
- XHTML_STRICT_PREAMBLE = <<-EOF
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-EOF
-
- XHTML_FRAME_PREAMBLE = <<-EOF
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
-EOF
-
- HTML_ELEMENT = <<-EOF
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-EOF
-end
diff --git a/lib/rdoc/generator/html/frameless.rb b/lib/rdoc/generator/html/frameless.rb
deleted file mode 100644
index 0375fee313..0000000000
--- a/lib/rdoc/generator/html/frameless.rb
+++ /dev/null
@@ -1,92 +0,0 @@
-require 'rdoc/generator/html/html'
-
-##
-# = CSS2 RDoc HTML template
-#
-# This is a template for RDoc that uses XHTML 1.0 Strict and dictates a
-# bit more of the appearance of the output to cascading stylesheets than the
-# default. It was designed for clean inline code display, and uses DHTMl to
-# toggle the visbility of each method's source with each click on the '[source]'
-# link.
-#
-# Frameless basically is the html template without frames.
-#
-# == Authors
-#
-# * Michael Granger <ged@FaerieMUD.org>
-#
-# Copyright (c) 2002, 2003 The FaerieMUD Consortium. Some rights reserved.
-#
-# This work is licensed under the Creative Commons Attribution License. To view
-# a copy of this license, visit http://creativecommons.org/licenses/by/1.0/ or
-# send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California
-# 94305, USA.
-
-module RDoc::Generator::HTML::FRAMELESS
-
- FRAMELESS = true
-
- FONTS = RDoc::Generator::HTML::HTML::FONTS
-
- STYLE = RDoc::Generator::HTML::HTML::STYLE
-
- HEADER = RDoc::Generator::HTML::HTML::HEADER
-
- FOOTER = <<-EOF
- <div id="popupmenu" class="index">
- <br />
- <h1 class="index-entries section-bar">Files</h1>
- <ul>
-<% values["file_list"].each do |file| %>
- <li><a href="<%= file["href"] %>"><%= file["name"] %></a></li>
-<% end %>
- </ul>
-
- <br />
- <h1 class="index-entries section-bar">Classes</h1>
- <ul>
-<% values["class_list"].each do |klass| %>
- <li><a href="<%= klass["href"] %>"><%= klass["name"] %></a></li>
-<% end %>
- </ul>
-
- <br />
- <h1 class="index-entries section-bar">Methods</h1>
- <ul>
-<% values["method_list"].each do |method| %>
- <li><a href="<%= method["href"] %>"><%= method["name"] %></a></li>
-<% end %>
- </ul>
- </div>
-</body>
-</html>
- EOF
-
- FILE_PAGE = RDoc::Generator::HTML::HTML::FILE_PAGE
-
- CLASS_PAGE = RDoc::Generator::HTML::HTML::CLASS_PAGE
-
- METHOD_LIST = RDoc::Generator::HTML::HTML::METHOD_LIST
-
- BODY = HEADER + %{
-
-<%= template_include %> <!-- banner header -->
-
- <div id="bodyContent">
-
-} + METHOD_LIST + %{
-
- </div>
-
-} + FOOTER
-
- SRC_PAGE = RDoc::Generator::HTML::HTML::SRC_PAGE
-
- FR_INDEX_BODY = RDoc::Generator::HTML::HTML::FR_INDEX_BODY
-
- FILE_INDEX = RDoc::Generator::HTML::HTML::FILE_INDEX
-
- CLASS_INDEX = RDoc::Generator::HTML::HTML::CLASS_INDEX
-
- METHOD_INDEX = RDoc::Generator::HTML::HTML::METHOD_INDEX
-end
diff --git a/lib/rdoc/generator/html/hefss.rb b/lib/rdoc/generator/html/hefss.rb
deleted file mode 100644
index 01425a4556..0000000000
--- a/lib/rdoc/generator/html/hefss.rb
+++ /dev/null
@@ -1,150 +0,0 @@
-require 'rdoc/generator/html'
-require 'rdoc/generator/html/kilmerfactory'
-
-module RDoc::Generator::HTML::HEFSS
-
- FONTS = "Verdana, Arial, Helvetica, sans-serif"
-
- CENTRAL_STYLE = <<-EOF
-body,p { font-family: <%= values["fonts"] %>;
- color: #000040; background: #BBBBBB;
-}
-
-td { font-family: <%= values["fonts"] %>;
- color: #000040;
-}
-
-.attr-rw { font-size: small; color: #444488 }
-
-.title-row {color: #eeeeff;
- background: #BBBBDD;
-}
-
-.big-title-font { color: white;
- font-family: <%= values["fonts"] %>;
- font-size: large;
- height: 50px}
-
-.small-title-font { color: purple;
- font-family: <%= values["fonts"] %>;
- font-size: small; }
-
-.aqua { color: purple }
-
-#diagram img {
- border: 0;
-}
-
-.method-name, attr-name {
- font-family: monospace; font-weight: bold;
-}
-
-.tablesubtitle {
- width: 100%;
- margin-top: 1ex;
- margin-bottom: .5ex;
- padding: 5px 0px 5px 20px;
- font-size: large;
- color: purple;
- background: #BBBBCC;
-}
-
-.tablesubsubtitle {
- width: 100%;
- margin-top: 1ex;
- margin-bottom: .5ex;
- padding: 5px 0px 5px 20px;
- font-size: medium;
- color: white;
- background: #BBBBCC;
-}
-
-.name-list {
- font-family: monospace;
- margin-left: 40px;
- margin-bottom: 2ex;
- line-height: 140%;
-}
-
-.description {
- margin-left: 40px;
- margin-bottom: 2ex;
- line-height: 140%;
-}
-
-.methodtitle {
- font-size: medium;
- text_decoration: none;
- padding: 3px 3px 3px 20px;
- color: #0000AA;
-}
-
-.ruby-comment { color: green; font-style: italic }
-.ruby-constant { color: #4433aa; font-weight: bold; }
-.ruby-identifier { color: #222222; }
-.ruby-ivar { color: #2233dd; }
-.ruby-keyword { color: #3333FF; font-weight: bold }
-.ruby-node { color: #777777; }
-.ruby-operator { color: #111111; }
-.ruby-regexp { color: #662222; }
-.ruby-value { color: #662222; font-style: italic }
-
-.srcbut { float: right }
- EOF
-
- INDEX_STYLE = <<-EOF
-body {
- background-color: #bbbbbb;
- font-family: #{FONTS};
- font-size: 11px;
- font-style: normal;
- line-height: 14px;
- color: #000040;
-}
-
-div.banner {
- background: #bbbbcc;
- color: white;
- padding: 1;
- margin: 0;
- font-size: 90%;
- font-weight: bold;
- line-height: 1.1;
- text-align: center;
- width: 100%;
-}
-EOF
-
- FACTORY = RDoc::Generator::HTML::
- KilmerFactory.new(:central_css => CENTRAL_STYLE,
- :index_css => INDEX_STYLE,
- :method_list_heading => "Subroutines and Functions",
- :class_and_module_list_heading => "Classes and Modules",
- :attribute_list_heading => "Arguments")
-
- STYLE = FACTORY.get_STYLE()
-
- METHOD_LIST = FACTORY.get_METHOD_LIST()
-
- BODY = FACTORY.get_BODY()
-
- FILE_PAGE = FACTORY.get_FILE_PAGE()
-
- CLASS_PAGE = FACTORY.get_CLASS_PAGE()
-
- SRC_PAGE = FACTORY.get_SRC_PAGE()
-
- FR_INDEX_BODY = FACTORY.get_FR_INDEX_BODY()
-
- FILE_INDEX = FACTORY.get_FILE_INDEX()
-
- CLASS_INDEX = FACTORY.get_CLASS_INDEX()
-
- METHOD_INDEX = FACTORY.get_METHOD_INDEX()
-
- INDEX = FACTORY.get_INDEX()
-
- def self.write_extra_pages(values)
- FACTORY.write_extra_pages(values)
- end
-end
diff --git a/lib/rdoc/generator/html/html.rb b/lib/rdoc/generator/html/html.rb
deleted file mode 100644
index 5e5b4d5531..0000000000
--- a/lib/rdoc/generator/html/html.rb
+++ /dev/null
@@ -1,769 +0,0 @@
-require 'rdoc/generator/html'
-require 'rdoc/generator/html/common'
-
-##
-# = CSS2 RDoc HTML template
-#
-# This is a template for RDoc that uses XHTML 1.0 Strict and dictates a
-# bit more of the appearance of the output to cascading stylesheets than the
-# default. It was designed for clean inline code display, and uses DHTMl to
-# toggle the visibility of each method's source with each click on the
-# '[source]' link.
-#
-# This template *also* forms the basis of the frameless template.
-#
-# == Authors
-#
-# * Michael Granger <ged@FaerieMUD.org>
-#
-# Copyright (c) 2002, 2003 The FaerieMUD Consortium. Some rights reserved.
-#
-# This work is licensed under the Creative Commons Attribution License. To
-# view a copy of this license, visit
-# http://creativecommons.org/licenses/by/1.0/ or send a letter to Creative
-# Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA.
-
-module RDoc::Generator::HTML::HTML
-
- include RDoc::Generator::HTML::Common
-
- FONTS = "Verdana,Arial,Helvetica,sans-serif"
-
- STYLE = <<-EOF
-body {
- font-family: #{FONTS};
- font-size: 90%;
- margin: 0;
- margin-left: 40px;
- padding: 0;
- background: white;
- color: black;
-}
-
-h1, h2, h3, h4 {
- margin: 0;
- background: transparent;
-}
-
-h1 {
- font-size: 150%;
-}
-
-h2,h3,h4 {
- margin-top: 1em;
-}
-
-:link, :visited {
- background: #eef;
- color: #039;
- text-decoration: none;
-}
-
-:link:hover, :visited:hover {
- background: #039;
- color: #eef;
-}
-
-/* Override the base stylesheet's Anchor inside a table cell */
-td > :link, td > :visited {
- background: transparent;
- color: #039;
- text-decoration: none;
-}
-
-/* and inside a section title */
-.section-title > :link, .section-title > :visited {
- background: transparent;
- color: #eee;
- text-decoration: none;
-}
-
-/* === Structural elements =================================== */
-
-.index {
- margin: 0;
- margin-left: -40px;
- padding: 0;
- font-size: 90%;
-}
-
-.index :link, .index :visited {
- margin-left: 0.7em;
-}
-
-.index .section-bar {
- margin-left: 0px;
- padding-left: 0.7em;
- background: #ccc;
- font-size: small;
-}
-
-#classHeader, #fileHeader {
- width: auto;
- color: white;
- padding: 0.5em 1.5em 0.5em 1.5em;
- margin: 0;
- margin-left: -40px;
- border-bottom: 3px solid #006;
-}
-
-#classHeader :link, #fileHeader :link,
-#classHeader :visited, #fileHeader :visited {
- background: inherit;
- color: white;
-}
-
-#classHeader td, #fileHeader td {
- background: inherit;
- color: white;
-}
-
-#fileHeader {
- background: #057;
-}
-
-#classHeader {
- background: #048;
-}
-
-.class-name-in-header {
- font-size: 180%;
- font-weight: bold;
-}
-
-#bodyContent {
- padding: 0 1.5em 0 1.5em;
-}
-
-#description {
- padding: 0.5em 1.5em;
- background: #efefef;
- border: 1px dotted #999;
-}
-
-#description h1, #description h2, #description h3,
-#description h4, #description h5, #description h6 {
- color: #125;
- background: transparent;
-}
-
-#validator-badges {
- text-align: center;
-}
-
-#validator-badges img {
- border: 0;
-}
-
-#copyright {
- color: #333;
- background: #efefef;
- font: 0.75em sans-serif;
- margin-top: 5em;
- margin-bottom: 0;
- padding: 0.5em 2em;
-}
-
-/* === Classes =================================== */
-
-table.header-table {
- color: white;
- font-size: small;
-}
-
-.type-note {
- font-size: small;
- color: #dedede;
-}
-
-.section-bar {
- color: #333;
- border-bottom: 1px solid #999;
- margin-left: -20px;
-}
-
-.section-title {
- background: #79a;
- color: #eee;
- padding: 3px;
- margin-top: 2em;
- margin-left: -30px;
- border: 1px solid #999;
-}
-
-.top-aligned-row {
- vertical-align: top
-}
-
-.bottom-aligned-row {
- vertical-align: bottom
-}
-
-#diagram img {
- border: 0;
-}
-
-/* --- Context section classes ----------------------- */
-
-.context-row { }
-
-.context-item-name {
- font-family: monospace;
- font-weight: bold;
- color: black;
-}
-
-.context-item-value {
- font-size: small;
- color: #448;
-}
-
-.context-item-desc {
- color: #333;
- padding-left: 2em;
-}
-
-/* --- Method classes -------------------------- */
-
-.method-detail {
- background: #efefef;
- padding: 0;
- margin-top: 0.5em;
- margin-bottom: 1em;
- border: 1px dotted #ccc;
-}
-
-.method-heading {
- color: black;
- background: #ccc;
- border-bottom: 1px solid #666;
- padding: 0.2em 0.5em 0 0.5em;
-}
-
-.method-signature {
- color: black;
- background: inherit;
-}
-
-.method-name {
- font-weight: bold;
-}
-
-.method-args {
- font-style: italic;
-}
-
-.method-description {
- padding: 0 0.5em 0 0.5em;
-}
-
-/* --- Source code sections -------------------- */
-
-:link.source-toggle, :visited.source-toggle {
- font-size: 90%;
-}
-
-div.method-source-code {
- background: #262626;
- color: #ffdead;
- margin: 1em;
- padding: 0.5em;
- border: 1px dashed #999;
- overflow: auto;
-}
-
-div.method-source-code pre {
- color: #ffdead;
-}
-
-/* --- Ruby keyword styles --------------------- */
-
-.standalone-code {
- background: #221111;
- color: #ffdead;
- overflow: auto;
-}
-
-.ruby-constant {
- color: #7fffd4;
- background: transparent;
-}
-
-.ruby-keyword {
- color: #00ffff;
- background: transparent;
-}
-
-.ruby-ivar {
- color: #eedd82;
- background: transparent;
-}
-
-.ruby-operator {
- color: #00ffee;
- background: transparent;
-}
-
-.ruby-identifier {
- color: #ffdead;
- background: transparent;
-}
-
-.ruby-node {
- color: #ffa07a;
- background: transparent;
-}
-
-.ruby-comment {
- color: #b22222;
- font-weight: bold;
- background: transparent;
-}
-
-.ruby-regexp {
- color: #ffa07a;
- background: transparent;
-}
-
-.ruby-value {
- color: #7fffd4;
- background: transparent;
-}
-EOF
-
-
-#####################################################################
-### H E A D E R T E M P L A T E
-#####################################################################
-
- HEADER = XHTML_STRICT_PREAMBLE + HTML_ELEMENT + <<-EOF
-<head>
- <title><%= values["title"] %></title>
- <meta http-equiv="Content-Type" content="text/html; charset=<%= values["charset"] %>" />
- <meta http-equiv="Content-Script-Type" content="text/javascript" />
- <link rel="stylesheet" href="<%= values["style_url"] %>" type="text/css" media="screen" />
- <script type="text/javascript">
- // <![CDATA[
-
- function popupCode( url ) {
- window.open(url, "Code", "resizable=yes,scrollbars=yes,toolbar=no,status=no,height=150,width=400")
- }
-
- function toggleCode( id ) {
- if ( document.getElementById )
- elem = document.getElementById( id );
- else if ( document.all )
- elem = eval( "document.all." + id );
- else
- return false;
-
- elemStyle = elem.style;
-
- if ( elemStyle.display != "block" ) {
- elemStyle.display = "block"
- } else {
- elemStyle.display = "none"
- }
-
- return true;
- }
-
- // Make codeblocks hidden by default
- document.writeln( "<style type=\\"text/css\\">div.method-source-code { display: none }<\\/style>" )
-
- // ]]>
- </script>
-
-</head>
-<body>
-EOF
-
-#####################################################################
-### F O O T E R T E M P L A T E
-#####################################################################
-
- FOOTER = <<-EOF
-<div id="validator-badges">
- <p><small><a href="http://validator.w3.org/check/referer">[Validate]</a></small></p>
-</div>
-
-</body>
-</html>
- EOF
-
-
-#####################################################################
-### F I L E P A G E H E A D E R T E M P L A T E
-#####################################################################
-
- FILE_PAGE = <<-EOF
- <div id="fileHeader">
- <h1><%= values["short_name"] %></h1>
- <table class="header-table">
- <tr class="top-aligned-row">
- <td><strong>Path:</strong></td>
- <td><%= values["full_path"] %>
-<% if values["cvsurl"] then %>
- &nbsp;(<a href="<%= values["cvsurl"] %>"><acronym title="Concurrent Versioning System">CVS</acronym></a>)
-<% end %>
- </td>
- </tr>
- <tr class="top-aligned-row">
- <td><strong>Last Update:</strong></td>
- <td><%= values["dtm_modified"] %></td>
- </tr>
- </table>
- </div>
- EOF
-
-#####################################################################
-### C L A S S P A G E H E A D E R T E M P L A T E
-#####################################################################
-
- CLASS_PAGE = <<-EOF
- <div id="classHeader">
- <table class="header-table">
- <tr class="top-aligned-row">
- <td><strong><%= values["classmod"] %></strong></td>
- <td class="class-name-in-header"><%= values["full_name"] %></td>
- </tr>
- <tr class="top-aligned-row">
- <td><strong>In:</strong></td>
- <td>
-<% values["infiles"].each do |infiles| %>
-<% if infiles["full_path_url"] then %>
- <a href="<%= infiles["full_path_url"] %>">
-<% end %>
- <%= infiles["full_path"] %>
-<% if infiles["full_path_url"] then %>
- </a>
-<% end %>
-<% if infiles["cvsurl"] then %>
- &nbsp;(<a href="<%= infiles["cvsurl"] %>"><acronym title="Concurrent Versioning System">CVS</acronym></a>)
-<% end %>
- <br />
-<% end %><%# values["infiles"] %>
- </td>
- </tr>
-
-<% if values["parent"] then %>
- <tr class="top-aligned-row">
- <td><strong>Parent:</strong></td>
- <td>
-<% if values["par_url"] then %>
- <a href="<%= values["par_url"] %>">
-<% end %>
- <%= values["parent"] %>
-<% if values["par_url"] then %>
- </a>
-<% end %>
- </td>
- </tr>
-<% end %>
- </table>
- </div>
- EOF
-
-#####################################################################
-### M E T H O D L I S T T E M P L A T E
-#####################################################################
-
- METHOD_LIST = <<-EOF
- <div id="contextContent">
-<% if values["diagram"] then %>
- <div id="diagram">
- <%= values["diagram"] %>
- </div>
-<% end
-
- if values["description"] then %>
- <div id="description">
- <%= values["description"] %>
- </div>
-<% end
-
- if values["requires"] then %>
- <div id="requires-list">
- <h3 class="section-bar">Required files</h3>
-
- <div class="name-list">
-<% values["requires"].each do |requires| %>
- <%= href requires["aref"], requires["name"] %>&nbsp;&nbsp;
-<% end %><%# values["requires"] %>
- </div>
- </div>
-<% end
-
- if values["toc"] then %>
- <div id="contents-list">
- <h3 class="section-bar">Contents</h3>
- <ul>
-<% values["toc"].each do |toc| %>
- <li><a href="#<%= toc["href"] %>"><%= toc["secname"] %></a></li>
-<% end %><%# values["toc"] %>
- </ul>
-<% end %>
- </div>
-
-<% if values["methods"] then %>
- <div id="method-list">
- <h3 class="section-bar">Methods</h3>
-
- <div class="name-list">
-<% values["methods"].each do |methods| %>
- <%= href methods["aref"], methods["name"] %>&nbsp;&nbsp;
-<% end %><%# values["methods"] %>
- </div>
- </div>
-<% end %>
- </div>
-
- <!-- if includes -->
-<% if values["includes"] then %>
- <div id="includes">
- <h3 class="section-bar">Included Modules</h3>
-
- <div id="includes-list">
-<% values["includes"].each do |includes| %>
- <span class="include-name"><%= href includes["aref"], includes["name"] %></span>
-<% end %><%# values["includes"] %>
- </div>
- </div>
-<% end
-
- values["sections"].each do |sections| %>
- <div id="section">
-<% if sections["sectitle"] then %>
- <h2 class="section-title"><a name="<%= sections["secsequence"] %>"><%= sections["sectitle"] %></a></h2>
-<% if sections["seccomment"] then %>
- <div class="section-comment">
- <%= sections["seccomment"] %>
- </div>
-<% end
- end
-
- if sections["classlist"] then %>
- <div id="class-list">
- <h3 class="section-bar">Classes and Modules</h3>
-
- <%= sections["classlist"] %>
- </div>
-<% end
-
- if sections["constants"] then %>
- <div id="constants-list">
- <h3 class="section-bar">Constants</h3>
-
- <div class="name-list">
- <table summary="Constants">
-<% sections["constants"].each do |constants| %>
- <tr class="top-aligned-row context-row">
- <td class="context-item-name"><%= constants["name"] %></td>
- <td>=</td>
- <td class="context-item-value"><%= constants["value"] %></td>
-<% if constants["desc"] then %>
- <td>&nbsp;</td>
- <td class="context-item-desc"><%= constants["desc"] %></td>
-<% end %>
- </tr>
-<% end %><%# sections["constants"] %>
- </table>
- </div>
- </div>
-<% end
-
- if sections["aliases"] then %>
- <div id="aliases-list">
- <h3 class="section-bar">External Aliases</h3>
-
- <div class="name-list">
- <table summary="aliases">
-<% sections["aliases"].each do |aliases| %>
- <tr class="top-aligned-row context-row">
- <td class="context-item-name"><%= aliases["old_name"] %></td>
- <td>-&gt;</td>
- <td class="context-item-value"><%= aliases["new_name"] %></td>
- </tr>
-<% if aliases["desc"] then %>
- <tr class="top-aligned-row context-row">
- <td>&nbsp;</td>
- <td colspan="2" class="context-item-desc"><%= aliases["desc"] %></td>
- </tr>
-<% end
- end %><%# sections["aliases"] %>
- </table>
- </div>
- </div>
-<% end %>
-
-<% if sections["attributes"] then %>
- <div id="attribute-list">
- <h3 class="section-bar">Attributes</h3>
-
- <div class="name-list">
- <table>
-<% sections["attributes"].each do |attribute| %>
- <tr class="top-aligned-row context-row">
- <td class="context-item-name"><%= attribute["name"] %></td>
-<% if attribute["rw"] then %>
- <td class="context-item-value">&nbsp;[<%= attribute["rw"] %>]&nbsp;</td>
-<% end
- unless attribute["rw"] then %>
- <td class="context-item-value">&nbsp;&nbsp;</td>
-<% end %>
- <td class="context-item-desc"><%= attribute["a_desc"] %></td>
- </tr>
-<% end %><%# sections["attributes"] %>
- </table>
- </div>
- </div>
-<% end %>
-
- <!-- if method_list -->
-<% if sections["method_list"] then %>
- <div id="methods">
-<% sections["method_list"].each do |method_list|
- if method_list["methods"] then %>
- <h3 class="section-bar"><%= method_list["type"] %> <%= method_list["category"] %> methods</h3>
-
-<% method_list["methods"].each do |methods| %>
- <div id="method-<%= methods["aref"] %>" class="method-detail">
- <a name="<%= methods["aref"] %>"></a>
-
- <div class="method-heading">
-<% if methods["codeurl"] then %>
- <a href="<%= methods["codeurl"] %>" target="Code" class="method-signature"
- onclick="popupCode('<%= methods["codeurl"] %>');return false;">
-<% end
- if methods["sourcecode"] then %>
- <a href="#<%= methods["aref"] %>" class="method-signature">
-<% end
- if methods["callseq"] then %>
- <span class="method-name"><%= methods["callseq"] %></span>
-<% end
- unless methods["callseq"] then %>
- <span class="method-name"><%= methods["name"] %></span><span class="method-args"><%= methods["params"] %></span>
-<% end
- if methods["codeurl"] then %>
- </a>
-<% end
- if methods["sourcecode"] then %>
- </a>
-<% end %>
- </div>
-
- <div class="method-description">
-<% if methods["m_desc"] then %>
- <%= methods["m_desc"] %>
-<% end
- if methods["sourcecode"] then %>
- <p><a class="source-toggle" href="#"
- onclick="toggleCode('<%= methods["aref"] %>-source');return false;">[Source]</a></p>
- <div class="method-source-code" id="<%= methods["aref"] %>-source">
-<pre>
-<%= methods["sourcecode"] %>
-</pre>
- </div>
-<% end %>
- </div>
- </div>
-
-<% end %><%# method_list["methods"] %><%
- end
- end %><%# sections["method_list"] %>
-
- </div>
-<% end %>
-<% end %><%# values["sections"] %>
- EOF
-
-#####################################################################
-### B O D Y T E M P L A T E
-#####################################################################
-
- BODY = HEADER + %{
-
-<%= template_include %> <!-- banner header -->
-
- <div id="bodyContent">
-
-} + METHOD_LIST + %{
-
- </div>
-
-} + FOOTER
-
-#####################################################################
-### S O U R C E C O D E T E M P L A T E
-#####################################################################
-
- SRC_PAGE = XHTML_STRICT_PREAMBLE + HTML_ELEMENT + <<-EOF
-<head>
- <title><%= values["title"] %></title>
- <meta http-equiv="Content-Type" content="text/html; charset=<%= values["charset"] %>" />
- <link rel="stylesheet" href="<%= values["style_url"] %>" type="text/css" media="screen" />
-</head>
-<body class="standalone-code">
- <pre><%= values["code"] %></pre>
-</body>
-</html>
- EOF
-
-
-#####################################################################
-### I N D E X F I L E T E M P L A T E S
-#####################################################################
-
- FR_INDEX_BODY = %{<%= template_include %>}
-
- FILE_INDEX = XHTML_STRICT_PREAMBLE + HTML_ELEMENT + <<-EOF
-<!--
-
- <%= values["title"] %>
-
- -->
-<head>
- <title><%= values["title"] %></title>
- <meta http-equiv="Content-Type" content="text/html; charset=<%= values["charset"] %>" />
- <link rel="stylesheet" href="<%= values["style_url"] %>" type="text/css" />
- <base target="docwin" />
-</head>
-<body>
-<div class="index">
- <h1 class="section-bar"><%= values["list_title"] %></h1>
- <div id="index-entries">
-<% values["entries"].each do |entries| %>
- <a href="<%= entries["href"] %>"><%= entries["name"] %></a><br />
-<% end %><%# values["entries"] %>
- </div>
-</div>
-</body>
-</html>
- EOF
-
- CLASS_INDEX = FILE_INDEX
- METHOD_INDEX = FILE_INDEX
-
- INDEX = XHTML_FRAME_PREAMBLE + HTML_ELEMENT + <<-EOF
-<!--
-
- <%= values["title"] %>
-
- -->
-<head>
- <title><%= values["title"] %></title>
- <meta http-equiv="Content-Type" content="text/html; charset=<%= values["charset"] %>" />
-</head>
-<frameset rows="20%, 80%">
- <frameset cols="25%,35%,45%">
- <frame src="fr_file_index.html" title="Files" name="Files" />
- <frame src="fr_class_index.html" name="Classes" />
- <frame src="fr_method_index.html" name="Methods" />
- </frameset>
- <frame src="<%= values["initial_page"] %>" name="docwin" />
-</frameset>
-</html>
- EOF
-
-end
-
diff --git a/lib/rdoc/generator/html/kilmer.rb b/lib/rdoc/generator/html/kilmer.rb
deleted file mode 100644
index 233a9259a2..0000000000
--- a/lib/rdoc/generator/html/kilmer.rb
+++ /dev/null
@@ -1,151 +0,0 @@
-require 'rdoc/generator/html'
-require 'rdoc/generator/html/kilmerfactory'
-
-module RDoc::Generator::HTML::KILMER
-
- FONTS = "Verdana, Arial, Helvetica, sans-serif"
-
- CENTRAL_STYLE = <<-EOF
-body,td,p { font-family: <%= values["fonts"] %>;
- color: #000040;
-}
-
-.attr-rw { font-size: xx-small; color: #444488 }
-
-.title-row { background-color: #CCCCFF;
- color: #000010;
-}
-
-.big-title-font {
- color: black;
- font-weight: bold;
- font-family: <%= values["fonts"] %>;
- font-size: large;
- height: 60px;
- padding: 10px 3px 10px 3px;
-}
-
-.small-title-font { color: black;
- font-family: <%= values["fonts"] %>;
- font-size:10; }
-
-.aqua { color: black }
-
-#diagram img {
- border: 0;
-}
-
-.method-name, .attr-name {
- font-family: font-family: <%= values["fonts"] %>;
- font-weight: bold;
- font-size: small;
- margin-left: 20px;
- color: #000033;
-}
-
-.tablesubtitle, .tablesubsubtitle {
- width: 100%;
- margin-top: 1ex;
- margin-bottom: .5ex;
- padding: 5px 0px 5px 3px;
- font-size: large;
- color: black;
- background-color: #CCCCFF;
- border: thin;
-}
-
-.name-list {
- margin-left: 5px;
- margin-bottom: 2ex;
- line-height: 105%;
-}
-
-.description {
- margin-left: 5px;
- margin-bottom: 2ex;
- line-height: 105%;
- font-size: small;
-}
-
-.methodtitle {
- font-size: small;
- font-weight: bold;
- text-decoration: none;
- color: #000033;
- background: #ccc;
-}
-
-.srclink {
- font-size: small;
- font-weight: bold;
- text-decoration: none;
- color: #0000DD;
- background-color: white;
-}
-
-.srcbut { float: right }
-
-.ruby-comment { color: green; font-style: italic }
-.ruby-constant { color: #4433aa; font-weight: bold; }
-.ruby-identifier { color: #222222; }
-.ruby-ivar { color: #2233dd; }
-.ruby-keyword { color: #3333FF; font-weight: bold }
-.ruby-node { color: #777777; }
-.ruby-operator { color: #111111; }
-.ruby-regexp { color: #662222; }
-.ruby-value { color: #662222; font-style: italic }
- EOF
-
- INDEX_STYLE = <<-EOF
-body {
- background-color: #ddddff;
- font-family: #{FONTS};
- font-size: 11px;
- font-style: normal;
- line-height: 14px;
- color: #000040;
-}
-
-div.banner {
- background: #0000aa;
- color: white;
- padding: 1;
- margin: 0;
- font-size: 90%;
- font-weight: bold;
- line-height: 1.1;
- text-align: center;
- width: 100%;
-}
-EOF
-
- FACTORY = RDoc::Generator::HTML::
- KilmerFactory.new(:central_css => CENTRAL_STYLE,
- :index_css => INDEX_STYLE)
-
- STYLE = FACTORY.get_STYLE()
-
- METHOD_LIST = FACTORY.get_METHOD_LIST()
-
- BODY = FACTORY.get_BODY()
-
- FILE_PAGE = FACTORY.get_FILE_PAGE()
-
- CLASS_PAGE = FACTORY.get_CLASS_PAGE()
-
- SRC_PAGE = FACTORY.get_SRC_PAGE()
-
- FR_INDEX_BODY = FACTORY.get_FR_INDEX_BODY()
-
- FILE_INDEX = FACTORY.get_FILE_INDEX()
-
- CLASS_INDEX = FACTORY.get_CLASS_INDEX()
-
- METHOD_INDEX = FACTORY.get_METHOD_INDEX()
-
- INDEX = FACTORY.get_INDEX()
-
- def self.write_extra_pages(values)
- FACTORY.write_extra_pages(values)
- end
-end
diff --git a/lib/rdoc/generator/html/kilmerfactory.rb b/lib/rdoc/generator/html/kilmerfactory.rb
deleted file mode 100644
index 1407840839..0000000000
--- a/lib/rdoc/generator/html/kilmerfactory.rb
+++ /dev/null
@@ -1,427 +0,0 @@
-require 'rdoc/generator/html'
-require 'rdoc/generator/html/common'
-
-#
-# This class generates Kilmer-style templates. Right now,
-# rdoc is shipped with two such templates:
-# * kilmer
-# * hefss
-#
-# Kilmer-style templates use frames. The left side of the page has
-# three frames stacked on top of each other: one lists
-# files, one lists classes, and one lists methods. If source code
-# is not inlined, an additional frame runs across the bottom of
-# the page and will be used to display method source code.
-# The central (and largest frame) display class and file
-# pages.
-#
-# The constructor of this class accepts a Hash containing stylistic
-# attributes. Then, a get_BLAH instance method of this class returns a
-# value for the template's BLAH constant. get_BODY, for instance, returns
-# the value of the template's BODY constant.
-#
-class RDoc::Generator::HTML::KilmerFactory
-
- include RDoc::Generator::HTML::Common
-
- #
- # The contents of the stylesheet that should be used for the
- # central frame (for the class and file pages).
- #
- # This must be specified in the Hash passed to the constructor.
- #
- attr_reader :central_css
-
- #
- # The contents of the stylesheet that should be used for the
- # index pages.
- #
- # This must be specified in the Hash passed to the constructor.
- #
- attr_reader :index_css
-
- #
- # The heading that should be displayed before listing methods.
- #
- # If not supplied, this defaults to "Methods".
- #
- attr_reader :method_list_heading
-
- #
- # The heading that should be displayed before listing classes and
- # modules.
- #
- # If not supplied, this defaults to "Classes and Modules".
- #
- attr_reader :class_and_module_list_heading
-
- #
- # The heading that should be displayed before listing attributes.
- #
- # If not supplied, this defaults to "Attributes".
- #
- attr_reader :attribute_list_heading
-
- #
- # ====Description:
- # This method constructs a KilmerFactory instance, which
- # can be used to build Kilmer-style template classes.
- # The +style_attributes+ argument is a Hash that contains the
- # values of the classes attributes (Symbols mapped to Strings).
- #
- # ====Parameters:
- # [style_attributes]
- # A Hash describing the appearance of the Kilmer-style.
- #
- def initialize(style_attributes)
- @central_css = style_attributes[:central_css]
- if(!@central_css)
- raise ArgumentError, "did not specify a value for :central_css"
- end
-
- @index_css = style_attributes[:index_css]
- if(!@index_css)
- raise ArgumentError, "did not specify a value for :index_css"
- end
-
- @method_list_heading = style_attributes[:method_list_heading]
- if(!@method_list_heading)
- @method_list_heading = "Methods"
- end
-
- @class_and_module_list_heading = style_attributes[:class_and_module_list_heading]
- if(!@class_and_module_list_heading)
- @class_and_module_list_heading = "Classes and Modules"
- end
-
- @attribute_list_heading = style_attributes[:attribute_list_heading]
- if(!@attribute_list_heading)
- @attribute_list_heading = "Attributes"
- end
- end
-
- def get_STYLE
- return @central_css
- end
-
- def get_METHOD_LIST
- return %{
-<% if values["diagram"] then %>
-<div id="diagram">
-<table width="100%"><tr><td align="center">
-<%= values["diagram"] %>
-</td></tr></table>
-</div>
-<% end %>
-
-<% if values["description"] then %>
-<div class="description"><%= values["description"] %></div>
-<% end %>
-
-<% if values["requires"] then %>
-<table cellpadding="5" width="100%">
-<tr><td class="tablesubtitle">Required files</td></tr>
-</table><br />
-<div class="name-list">
-<% values["requires"].each do |requires| %>
-<%= href requires["aref"], requires["name"] %>
-<% end %><%# values["requires"] %>
-</div>
-<% end %>
-
-<% if values["methods"] then %>
-<table cellpadding="5" width="100%">
-<tr><td class="tablesubtitle">#{@method_list_heading}</td></tr>
-</table><br />
-<div class="name-list">
-<% values["methods"].each do |methods| %>
-<%= href methods["aref"], methods["name"] %>,
-<% end %><%# values["methods"] %>
-</div>
-<% end %>
-
-<% if values["includes"] then %>
-<div class="tablesubsubtitle">Included modules</div><br />
-<div class="name-list">
-<% values["includes"].each do |includes| %>
- <span class="method-name"><%= href includes["aref"], includes["name"] %></span>
-<% end %><%# values["includes"] %>
-</div>
-<% end %>
-
-<% values["sections"].each do |sections| %>
- <div id="section">
-<% if sections["sectitle"] then %>
- <h2 class="section-title"><a name="<%= sections["secsequence"] %>"><%= sections["sectitle"] %></a></h2>
-<% if sections["seccomment"] then %>
- <div class="section-comment">
- <%= sections["seccomment"] %>
- </div>
-<% end %>
-<% end %>
-<% if sections["attributes"] then %>
-<table cellpadding="5" width="100%">
-<tr><td class="tablesubtitle">#{@attribute_list_heading}</td></tr>
-</table><br />
-<table cellspacing="5">
-<% sections["attributes"].each do |attributes| %>
- <tr valign="top">
-<% if attributes["rw"] then %>
- <td align="center" class="attr-rw">&nbsp;[<%= attributes["rw"] %>]&nbsp;</td>
-<% end %>
-<% unless attributes["rw"] then %>
- <td></td>
-<% end %>
- <td class="attr-name"><%= attributes["name"] %></td>
- <td><%= attributes["a_desc"] %></td>
- </tr>
-<% end %><%# sections["attributes"] %>
-</table>
-<% end %>
-
-<% if sections["classlist"] then %>
-<table cellpadding="5" width="100%">
-<tr><td class="tablesubtitle">#{@class_and_module_list_heading}</td></tr>
-</table><br />
-<%= sections["classlist"] %><br />
-<% end %>
-
-<% if sections["method_list"] then %>
-<% sections["method_list"].each do |method_list| %>
-<% if method_list["methods"] then %>
-<table cellpadding="5" width="100%">
-<tr><td class="tablesubtitle"><%= method_list["type"] %> <%= method_list["category"] %> methods</td></tr>
-</table>
-<% method_list["methods"].each do |methods| %>
-<table width="100%" cellspacing="0" cellpadding="5" border="0">
-<tr><td class="methodtitle">
-<a name="<%= methods["aref"] %>">
-<% if methods["callseq"] then %>
-<b><%= methods["callseq"] %></b>
-<% end %>
-<% unless methods["callseq"] then %>
- <b><%= methods["name"] %></b><%= methods["params"] %>
-<% end %>
-</a>
-<% if methods["codeurl"] then %>
-<a href="<%= methods["codeurl"] %>" target="source" class="srclink">src</a>
-<% end %>
-</td></tr>
-</table>
-<% if methods["m_desc"] then %>
-<div class="description">
-<%= methods["m_desc"] %>
-</div>
-<% end %>
-<% if methods["aka"] then %>
-<div class="aka">
-This method is also aliased as
-<% methods["aka"].each do |aka| %>
-<a href="<%= methods["aref"] %>"><%= methods["name"] %></a>
-<% end %><%# methods["aka"] %>
-</div>
-<% end %>
-<% if methods["sourcecode"] then %>
-<pre class="source">
-<%= methods["sourcecode"] %>
-</pre>
-<% end %>
-<% end %><%# method_list["methods"] %>
-<% end %>
-<% end %><%# sections["method_list"] %>
-<% end %>
-
-<% end %><%# values["sections"] %>
-</div>
-}
- end
-
- def get_BODY
- return XHTML_STRICT_PREAMBLE + HTML_ELEMENT + %{
-<head>
- <title><%= values["title"] %></title>
- <meta http-equiv="Content-Type" content="text/html; charset=<%= values["charset"] %>" />
- <link rel="stylesheet" href="<%= values["style_url"] %>" type="text/css" media="screen" />
- <script type="text/javascript">
- <!--
- function popCode(url) {
- parent.frames.source.location = url
- }
- //-->
- </script>
-</head>
-<body>
-<div class="bodyContent">
-<%= template_include %> <!-- banner header -->
-
-#{get_METHOD_LIST()}
-</div>
-</body>
-</html>
-}
- end
-
-def get_FILE_PAGE
- return %{
-<table width="100%">
- <tr class="title-row">
- <td><table width="100%"><tr>
- <td class="big-title-font" colspan="2">File<br /><%= values["short_name"] %></td>
- <td align="right"><table cellspacing="0" cellpadding="2">
- <tr>
- <td class="small-title-font">Path:</td>
- <td class="small-title-font"><%= values["full_path"] %>
-<% if values["cvsurl"] then %>
- &nbsp;(<a href="<%= values["cvsurl"] %>"><acronym title="Concurrent Versioning System">CVS</acronym></a>)
-<% end %>
- </td>
- </tr>
- <tr>
- <td class="small-title-font">Modified:</td>
- <td class="small-title-font"><%= values["dtm_modified"] %></td>
- </tr>
- </table>
- </td></tr></table></td>
- </tr>
-</table><br />
-}
-end
-
-def get_CLASS_PAGE
- return %{
-<table width="100%" border="0" cellspacing="0">
- <tr class="title-row">
- <td class="big-title-font">
- <%= values["classmod"] %><br /><%= values["full_name"] %>
- </td>
- <td align="right">
- <table cellspacing="0" cellpadding="2">
- <tr valign="top">
- <td class="small-title-font">In:</td>
- <td class="small-title-font">
-<% values["infiles"].each do |infiles| %>
-<%= href infiles["full_path_url"], infiles["full_path"] %>
-<% if infiles["cvsurl"] then %>
-&nbsp;(<a href="<%= infiles["cvsurl"] %>"><acronym title="Concurrent Versioning System">CVS</acronym></a>)
-<% end %>
-<% end %><%# values["infiles"] %>
- </td>
- </tr>
-<% if values["parent"] then %>
- <tr>
- <td class="small-title-font">Parent:</td>
- <td class="small-title-font">
-<% if values["par_url"] then %>
- <a href="<%= values["par_url"] %>" class="cyan">
-<% end %>
-<%= values["parent"] %>
-<% if values["par_url"] then %>
- </a>
-<% end %>
- </td>
- </tr>
-<% end %>
- </table>
- </td>
- </tr>
-</table><br />
-}
-end
-
-def get_SRC_PAGE
- return XHTML_STRICT_PREAMBLE + HTML_ELEMENT + %{
-<head><title><%= values["title"] %></title>
-<meta http-equiv="Content-Type" content="text/html; charset=<%= values["charset"] %>" />
-<link rel="stylesheet" href="<%= values["style_url"] %>" type="text/css" media="screen" />
-</head>
-<body>
-<pre><%= values["code"] %></pre>
-</body>
-</html>
-}
-end
-
-def get_FR_INDEX_BODY
- return %{<%= template_include %>}
-end
-
-def get_FILE_INDEX
- return XHTML_STRICT_PREAMBLE + HTML_ELEMENT + %{
-<head>
-<title><%= values["title"] %></title>
-<meta http-equiv="Content-Type" content="text/html; charset=<%= values["charset"] %>" />
-<style type="text/css">
-<!--
-#{@index_css}
--->
-</style>
-<base target="docwin" />
-</head>
-<body>
-<div class="index">
-<div class="banner"><%= values["list_title"] %></div>
-<% values["entries"].each do |entries| %>
-<a href="<%= entries["href"] %>"><%= entries["name"] %></a><br />
-<% end %><%# values["entries"] %>
-</div>
-</body></html>
-}
-end
-
-def get_CLASS_INDEX
- return get_FILE_INDEX
-end
-
-def get_METHOD_INDEX
- return get_FILE_INDEX
-end
-
-def get_INDEX
- return XHTML_FRAME_PREAMBLE + HTML_ELEMENT + %{
-<head>
- <title><%= values["title"] %></title>
- <meta http-equiv="Content-Type" content="text/html; charset=<%= values["charset"] %>" />
-</head>
-
-<frameset cols="20%,*">
- <frameset rows="15%,35%,50%">
- <frame src="fr_file_index.html" title="Files" name="Files" />
- <frame src="fr_class_index.html" name="Classes" />
- <frame src="fr_method_index.html" name="Methods" />
- </frameset>
-<% if values["inline_source"] then %>
- <frame src="<%= values["initial_page"] %>" name="docwin" />
-<% end %>
-<% unless values["inline_source"] then %>
- <frameset rows="80%,20%">
- <frame src="<%= values["initial_page"] %>" name="docwin" />
- <frame src="blank.html" name="source" />
- </frameset>
-<% end %>
-</frameset>
-
-</html>
-}
-end
-
-def get_BLANK
- # This will be displayed in the source code frame before
- # any source code has been selected.
- return XHTML_STRICT_PREAMBLE + HTML_ELEMENT + %{
-<head>
- <title>Source Code Frame <%= values["title_suffix"] %></title>
- <meta http-equiv="Content-Type" content="text/html; charset=<%= values["charset"] %>" />
- <link rel="stylesheet" href="<%= values["style_url"] %>" type="text/css" media="screen" />
-</head>
-<body>
-</body>
-</html>
-}
-end
-
-def write_extra_pages(values)
- template = RDoc::TemplatePage.new(get_BLANK())
- File.open("blank.html", "w") { |f| template.write_html_on(f, values) }
-end
-
-end
diff --git a/lib/rdoc/generator/html/one_page_html.rb b/lib/rdoc/generator/html/one_page_html.rb
deleted file mode 100644
index 5bae2f34f7..0000000000
--- a/lib/rdoc/generator/html/one_page_html.rb
+++ /dev/null
@@ -1,122 +0,0 @@
-require 'rdoc/generator/html'
-require 'rdoc/generator/html/common'
-
-module RDoc::Generator::HTML::ONE_PAGE_HTML
-
- include RDoc::Generator::HTML::Common
-
- CONTENTS_XML = <<-EOF
-<% if defined? classes and classes["description"] then %>
-<%= classes["description"] %>
-<% end %>
-
-<% if defined? files and files["requires"] then %>
-<h4>Requires:</h4>
-<ul>
-<% files["requires"].each do |requires| %>
-<% if requires["aref"] then %>
-<li><a href="<%= requires["aref"] %>"><%= requires["name"] %></a></li>
-<% end %>
-<% unless requires["aref"] then %>
-<li><%= requires["name"] %></li>
-<% end %>
-<% end %><%# files["requires"] %>
-</ul>
-<% end %>
-
-<% if defined? classes and classes["includes"] then %>
-<h4>Includes</h4>
-<ul>
-<% classes["includes"].each do |includes| %>
-<% if includes["aref"] then %>
-<li><a href="<%= includes["aref"] %>"><%= includes["name"] %></a></li>
-<% end %>
-<% unless includes["aref"] then %>
-<li><%= includes["name"] %></li>
-<% end %>
-<% end %><%# classes["includes"] %>
-</ul>
-<% end %>
-
-<% if defined? classes and classes["sections"] then %>
-<% classes["sections"].each do |sections| %>
-<% if sections["attributes"] then %>
-<h4>Attributes</h4>
-<table>
-<% sections["attributes"].each do |attributes| %>
-<tr><td><%= attributes["name"] %></td><td><%= attributes["rw"] %></td><td><%= attributes["a_desc"] %></td></tr>
-<% end %><%# sections["attributes"] %>
-</table>
-<% end %>
-
-<% if sections["method_list"] then %>
-<h3>Methods</h3>
-<% sections["method_list"].each do |method_list| %>
-<% if method_list["methods"] then %>
-<% method_list["methods"].each do |methods| %>
-<h4><%= methods["type"] %> <%= methods["category"] %> method:
-<% if methods["callseq"] then %>
-<a name="<%= methods["aref"] %>"><%= methods["callseq"] %></a>
-<% end %>
-<% unless methods["callseq"] then %>
-<a name="<%= methods["aref"] %>"><%= methods["name"] %><%= methods["params"] %></a></h4>
-<% end %>
-
-<% if methods["m_desc"] then %>
-<%= methods["m_desc"] %>
-<% end %>
-
-<% if methods["sourcecode"] then %>
-<blockquote><pre>
-<%= methods["sourcecode"] %>
-</pre></blockquote>
-<% end %>
-<% end %><%# method_list["methods"] %>
-<% end %>
-<% end %><%# sections["method_list"] %>
-<% end %>
-<% end %><%# classes["sections"] %>
-<% end %>
- EOF
-
- ONE_PAGE = XHTML_STRICT_PREAMBLE + HTML_ELEMENT + %{
-<head>
- <title><%= values["title"] %></title>
- <meta http-equiv="Content-Type" content="text/html; charset=<%= values["charset"] %>" />
-</head>
-<body>
-<% values["files"].each do |files| %>
-<h2>File: <a name="<%= files["href"] %>"><%= files["short_name"] %></a></h2>
-<table>
- <tr><td>Path:</td><td><%= files["full_path"] %></td></tr>
- <tr><td>Modified:</td><td><%= files["dtm_modified"] %></td></tr>
-</table>
-} + CONTENTS_XML + %{
-<% end %><%# values["files"] %>
-
-<% if values["classes"] then %>
-<h2>Classes</h2>
-<% values["classes"].each do |classes| %>
-<% if classes["parent"] then %>
-<h3><%= classes["classmod"] %> <a name="<%= classes["href"] %>"><%= classes["full_name"] %></a> &lt; <%= href classes["par_url"], classes["parent"] %></h3>
-<% end %>
-<% unless classes["parent"] then %>
-<h3><%= classes["classmod"] %> <%= classes["full_name"] %></h3>
-<% end %>
-
-<% if classes["infiles"] then %>
-(in files
-<% classes["infiles"].each do |infiles| %>
-<%= href infiles["full_path_url"], infiles["full_path"] %>
-<% end %><%# classes["infiles"] %>
-)
-<% end %>
-} + CONTENTS_XML + %{
-<% end %><%# values["classes"] %>
-<% end %>
-</body>
-</html>
-}
-
-end
-
diff --git a/lib/rdoc/generator/ri.rb b/lib/rdoc/generator/ri.rb
deleted file mode 100644
index 6b7a5932f8..0000000000
--- a/lib/rdoc/generator/ri.rb
+++ /dev/null
@@ -1,226 +0,0 @@
-require 'rdoc/generator'
-require 'rdoc/markup/to_flow'
-
-require 'rdoc/ri/cache'
-require 'rdoc/ri/reader'
-require 'rdoc/ri/writer'
-require 'rdoc/ri/descriptions'
-
-class RDoc::Generator::RI
-
- ##
- # Generator may need to return specific subclasses depending on the
- # options they are passed. Because of this we create them using a factory
-
- def self.for(options)
- new(options)
- end
-
- ##
- # Set up a new ri generator
-
- def initialize(options) #:not-new:
- @options = options
- @ri_writer = RDoc::RI::Writer.new "."
- @markup = RDoc::Markup.new
- @to_flow = RDoc::Markup::ToFlow.new
-
- @generated = {}
- end
-
- ##
- # Build the initial indices and output objects based on an array of
- # TopLevel objects containing the extracted information.
-
- def generate(toplevels)
- RDoc::TopLevel.all_classes_and_modules.each do |cls|
- process_class cls
- end
- end
-
- def process_class(from_class)
- generate_class_info(from_class)
-
- # now recurse into this class' constituent classes
- from_class.each_classmodule do |mod|
- process_class(mod)
- end
- end
-
- def generate_class_info(cls)
- case cls
- when RDoc::NormalModule then
- cls_desc = RDoc::RI::ModuleDescription.new
- else
- cls_desc = RDoc::RI::ClassDescription.new
- cls_desc.superclass = cls.superclass
- end
-
- cls_desc.name = cls.name
- cls_desc.full_name = cls.full_name
- cls_desc.comment = markup(cls.comment)
-
- cls_desc.attributes = cls.attributes.sort.map do |a|
- RDoc::RI::Attribute.new(a.name, a.rw, markup(a.comment))
- end
-
- cls_desc.constants = cls.constants.map do |c|
- RDoc::RI::Constant.new(c.name, c.value, markup(c.comment))
- end
-
- cls_desc.includes = cls.includes.map do |i|
- RDoc::RI::IncludedModule.new(i.name)
- end
-
- class_methods, instance_methods = method_list(cls)
-
- cls_desc.class_methods = class_methods.map do |m|
- RDoc::RI::MethodSummary.new(m.name)
- end
-
- cls_desc.instance_methods = instance_methods.map do |m|
- RDoc::RI::MethodSummary.new(m.name)
- end
-
- update_or_replace(cls_desc)
-
- class_methods.each do |m|
- generate_method_info(cls_desc, m)
- end
-
- instance_methods.each do |m|
- generate_method_info(cls_desc, m)
- end
- end
-
- def generate_method_info(cls_desc, method)
- meth_desc = RDoc::RI::MethodDescription.new
- meth_desc.name = method.name
- meth_desc.full_name = cls_desc.full_name
- if method.singleton
- meth_desc.full_name += "::"
- else
- meth_desc.full_name += "#"
- end
- meth_desc.full_name << method.name
-
- meth_desc.comment = markup(method.comment)
- meth_desc.params = params_of(method)
- meth_desc.visibility = method.visibility.to_s
- meth_desc.is_singleton = method.singleton
- meth_desc.block_params = method.block_params
-
- meth_desc.aliases = method.aliases.map do |a|
- RDoc::RI::AliasName.new(a.name)
- end
-
- @ri_writer.add_method(cls_desc, meth_desc)
- end
-
- private
-
- ##
- # Returns a list of class and instance methods that we'll be documenting
-
- def method_list(cls)
- list = cls.method_list
- unless @options.show_all
- list = list.find_all do |m|
- m.visibility == :public || m.visibility == :protected || m.force_documentation
- end
- end
-
- c = []
- i = []
- list.sort.each do |m|
- if m.singleton
- c << m
- else
- i << m
- end
- end
- return c,i
- end
-
- def params_of(method)
- if method.call_seq
- method.call_seq
- else
- params = method.params || ""
-
- p = params.gsub(/\s*\#.*/, '')
- p = p.tr("\n", " ").squeeze(" ")
- p = "(" + p + ")" unless p[0] == ?(
-
- if (block = method.block_params)
- block.gsub!(/\s*\#.*/, '')
- block = block.tr("\n", " ").squeeze(" ")
- if block[0] == ?(
- block.sub!(/^\(/, '').sub!(/\)/, '')
- end
- p << " {|#{block.strip}| ...}"
- end
- p
- end
- end
-
- def markup(comment)
- return nil if !comment || comment.empty?
-
- # Convert leading comment markers to spaces, but only
- # if all non-blank lines have them
-
- if comment =~ /^(?>\s*)[^\#]/
- content = comment
- else
- content = comment.gsub(/^\s*(#+)/) { $1.tr('#',' ') }
- end
- @markup.convert(content, @to_flow)
- end
-
- ##
- # By default we replace existing classes with the same name. If the
- # --merge option was given, we instead merge this definition into an
- # existing class. We add our methods, aliases, etc to that class, but do
- # not change the class's description.
-
- def update_or_replace(cls_desc)
- old_cls = nil
-
- if @options.merge
- rdr = RDoc::RI::Reader.new RDoc::RI::Cache.new(@options.op_dir)
-
- namespace = rdr.top_level_namespace
- namespace = rdr.lookup_namespace_in(cls_desc.name, namespace)
- if namespace.empty?
- $stderr.puts "You asked me to merge this source into existing "
- $stderr.puts "documentation. This file references a class or "
- $stderr.puts "module called #{cls_desc.name} which I don't"
- $stderr.puts "have existing documentation for."
- $stderr.puts
- $stderr.puts "Perhaps you need to generate its documentation first"
- exit 1
- else
- old_cls = namespace[0]
- end
- end
-
- prev_cls = @generated[cls_desc.full_name]
-
- if old_cls and not prev_cls then
- old_desc = rdr.get_class old_cls
- cls_desc.merge_in old_desc
- end
-
- if prev_cls then
- cls_desc.merge_in prev_cls
- end
-
- @generated[cls_desc.full_name] = cls_desc
-
- @ri_writer.remove_class cls_desc
- @ri_writer.add_class cls_desc
- end
-
-end
-
diff --git a/lib/rdoc/generator/texinfo.rb b/lib/rdoc/generator/texinfo.rb
deleted file mode 100644
index 99a1452f21..0000000000
--- a/lib/rdoc/generator/texinfo.rb
+++ /dev/null
@@ -1,81 +0,0 @@
-require 'rdoc/rdoc'
-require 'rdoc/generator'
-require 'rdoc/markup/to_texinfo'
-
-module RDoc
- module Generator
- # This generates Texinfo files for viewing with GNU Info or Emacs
- # from RDoc extracted from Ruby source files.
- class TEXINFO
- # What should the .info file be named by default?
- DEFAULT_INFO_FILENAME = 'rdoc.info'
-
- include Generator::MarkUp
-
- # Accept some options
- def initialize(options)
- @options = options
- @options.inline_source = true
- @options.op_name ||= 'rdoc.texinfo'
- @options.formatter = ::RDoc::Markup::ToTexInfo.new
- end
-
- # Generate the +texinfo+ files
- def generate(toplevels)
- @toplevels = toplevels
- @files, @classes = ::RDoc::Generator::Context.build_indices(@toplevels,
- @options)
-
- (@files + @classes).each { |x| x.value_hash }
-
- open(@options.op_name, 'w') do |f|
- f.puts TexinfoTemplate.new('files' => @files,
- 'classes' => @classes,
- 'filename' => @options.op_name.gsub(/texinfo/, 'info'),
- 'title' => @options.title).render
- end
- # TODO: create info files and install?
- end
-
- class << self
- # Factory? We don't need no stinkin' factory!
- alias_method :for, :new
- end
- end
-
- # Basically just a wrapper around ERB.
- # Should probably use RDoc::TemplatePage instead
- class TexinfoTemplate
- BASE_DIR = ::File.expand_path(::File.dirname(__FILE__)) # have to calculate this when the file's loaded.
-
- def initialize(values, file = 'texinfo.erb')
- @v, @file = [values, file]
- end
-
- def template
- ::File.read(::File.join(BASE_DIR, 'texinfo', @file))
- end
-
- # Go!
- def render
- ERB.new(template).result binding
- end
-
- def href(location, text)
- text # TODO: how does texinfo do hyperlinks?
- end
-
- def target(name, text)
- text # TODO: how do hyperlink targets work?
- end
-
- # TODO: this is probably implemented elsewhere?
- def method_prefix(section)
- { 'Class' => '.',
- 'Module' => '::',
- 'Instance' => '#',
- }[section['category']]
- end
- end
- end
-end
diff --git a/lib/rdoc/generator/texinfo/class.texinfo.erb b/lib/rdoc/generator/texinfo/class.texinfo.erb
deleted file mode 100644
index 74ecc59f7d..0000000000
--- a/lib/rdoc/generator/texinfo/class.texinfo.erb
+++ /dev/null
@@ -1,44 +0,0 @@
-@node <%= @v['class']['full_name'].gsub(/::/, '-') %>
-@chapter <%= @v['class']["classmod"] %> <%= @v['class']['full_name'] %>
-
-<% if @v['class']["parent"] and @v['class']['par_url'] %>
-Inherits <%= href @v['class']["par_url"], @v['class']["parent"] %><% end %>
-
-<%= @v['class']["description"] %>
-
-<% if @v['class']["includes"] %>
-Includes
-<% @v['class']["includes"].each do |include| %>
-* <%= href include["aref"], include["name"] %>
-<% end # @v['class']["includes"] %>
-<% end %>
-
-<% if @v['class']["sections"] %>
-<% @v['class']["sections"].each do |section| %>
-<% if section["attributes"] %>
-Attributes
-<% section["attributes"].each do |attributes| %>
-* <%= attributes["name"] %> <%= attributes["rw"] %> <%= attributes["a_desc"] %>
-<% end # section["attributes"] %>
-<% end %>
-<% end %>
-
-<% @v['class']["sections"].each do |section| %>
-<% if section["method_list"] %>
-Methods
-@menu
-<% section["method_list"].each_with_index do |method_list, i| %>
-<%= i %>
-<% (method_list["methods"] || []).each do |method| %>
-* <%= @v['class']['full_name'].gsub(/::/, '-') %><%= method_prefix method_list %><%= method['name'] %>::<% end %>
-<% end %>
-@end menu
-
-<% section["method_list"].each do |method_list| %>
-<% (method_list["methods"] || []).uniq.each do |method| %>
-<%= TexinfoTemplate.new(@v.merge({'method' => method, 'list' => method_list}),
- 'method.texinfo.erb').render %><% end %>
-<% end %>
-<% end # if section["method_list"] %>
-<% end # @v['class']["sections"] %>
-<% end %>
diff --git a/lib/rdoc/generator/texinfo/file.texinfo.erb b/lib/rdoc/generator/texinfo/file.texinfo.erb
deleted file mode 100644
index b619b94bd2..0000000000
--- a/lib/rdoc/generator/texinfo/file.texinfo.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-<% if false %>
-<h2>File: <%= @v['file']["short_name"] %></h2>
-Path: <%= @v['file']["full_path"] %>
-
-<%= TexinfoTemplate.new(@v, 'content.texinfo.erb').render %>
-<% end %>
diff --git a/lib/rdoc/generator/texinfo/method.texinfo.erb b/lib/rdoc/generator/texinfo/method.texinfo.erb
deleted file mode 100644
index f5c2b73a4b..0000000000
--- a/lib/rdoc/generator/texinfo/method.texinfo.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-@node <%= @v['class']['full_name'].gsub(/::/, '-') %><%= method_prefix @v['list'] %><%= @v['method']['name'] %>
-@section <%= @v['class']["classmod"] %> <%= @v['class']['full_name'] %><%= method_prefix @v['list'] %><%= @v['method']['name'] %>
-<%= @v['method']["type"] %> <%= @v['method']["category"] %> method:
-<%= target @v['method']["aref"], @v['method']['callseq'] ||
- @v['method']["name"] + @v['method']["params"] %>
-<%= @v['method']["m_desc"] %>
diff --git a/lib/rdoc/generator/texinfo/texinfo.erb b/lib/rdoc/generator/texinfo/texinfo.erb
deleted file mode 100644
index 235f63d73c..0000000000
--- a/lib/rdoc/generator/texinfo/texinfo.erb
+++ /dev/null
@@ -1,28 +0,0 @@
-\input texinfo @c -*-texinfo-*-
-@c %**start of header
-@setfilename <%= @v['filename'] %>
-@settitle <%= @v['title'] %>
-@c %**end of header
-
-@contents @c TODO: whitespace is a mess... =\
-
-@ifnottex
-@node Top
-
-@top <%= @v['title'] %>
-@end ifnottex
-
-<% if @f = @v['files'].detect { |f| f.name =~ /Readme/i } %>
-<%= @f.values['description'] %><% end %>
-
-@menu
-<% @v['classes'].each do |klass| %>
-* <%= klass.name.gsub(/::/, '-') %>::<% end %>
-@c TODO: add files
-@end menu
-
-<% (@v['classes'] || []).each_with_index do |klass, i| %>
-<%= TexinfoTemplate.new(@v.merge('class' => klass.values),
- 'class.texinfo.erb').render %><% end %>
-
-@bye
diff --git a/lib/rdoc/generator/xml.rb b/lib/rdoc/generator/xml.rb
deleted file mode 100644
index 0d4c5a7ea1..0000000000
--- a/lib/rdoc/generator/xml.rb
+++ /dev/null
@@ -1,117 +0,0 @@
-require 'rdoc/generator/html'
-
-##
-# Generate XML output as one big file
-
-class RDoc::Generator::XML < RDoc::Generator::HTML
-
- ##
- # Standard generator factory
-
- def self.for(options)
- new(options)
- end
-
- def initialize(*args)
- super
- end
-
- ##
- # Build the initial indices and output objects
- # based on an array of TopLevel objects containing
- # the extracted information.
-
- def generate(info)
- @info = info
- @files = []
- @classes = []
- @hyperlinks = {}
-
- build_indices
- generate_xml
- end
-
- ##
- # Generate:
- #
- # * a list of File objects for each TopLevel object.
- # * a list of Class objects for each first level
- # class or module in the TopLevel objects
- # * a complete list of all hyperlinkable terms (file,
- # class, module, and method names)
-
- def build_indices
- @info.each do |toplevel|
- @files << RDoc::Generator::File.new(toplevel, @options, RDoc::Generator::FILE_DIR)
- end
-
- RDoc::TopLevel.all_classes_and_modules.each do |cls|
- build_class_list(cls, @files[0], RDoc::Generator::CLASS_DIR)
- end
- end
-
- def build_class_list(from, html_file, class_dir)
- @classes << RDoc::Generator::Class.new(from, html_file, class_dir, @options)
- from.each_classmodule do |mod|
- build_class_list(mod, html_file, class_dir)
- end
- end
-
- ##
- # Generate all the HTML. For the one-file case, we generate
- # all the information in to one big hash
-
- def generate_xml
- values = {
- 'charset' => @options.charset,
- 'files' => gen_into(@files),
- 'classes' => gen_into(@classes)
- }
-
- template = RDoc::TemplatePage.new @template::ONE_PAGE
-
- if @options.op_name
- opfile = File.open(@options.op_name, "w")
- else
- opfile = $stdout
- end
- template.write_html_on(opfile, values)
- end
-
- def gen_into(list)
- res = []
- list.each do |item|
- res << item.value_hash
- end
- res
- end
-
- def gen_file_index
- gen_an_index(@files, 'Files')
- end
-
- def gen_class_index
- gen_an_index(@classes, 'Classes')
- end
-
- def gen_method_index
- gen_an_index(RDoc::Generator::HtmlMethod.all_methods, 'Methods')
- end
-
- def gen_an_index(collection, title)
- res = []
- collection.sort.each do |f|
- if f.document_self
- res << { "href" => f.path, "name" => f.index_name }
- end
- end
-
- return {
- "entries" => res,
- 'list_title' => title,
- 'index_url' => main_url,
- }
- end
-
-end
-
diff --git a/lib/rdoc/generator/xml/rdf.rb b/lib/rdoc/generator/xml/rdf.rb
deleted file mode 100644
index 7b15c69a18..0000000000
--- a/lib/rdoc/generator/xml/rdf.rb
+++ /dev/null
@@ -1,113 +0,0 @@
-require 'rdoc/generator/xml'
-
-module RDoc::Generator::XML::RDF
-
- CONTENTS_RDF = <<-EOF
-<% if defined? classes and classes["description"] then %>
- <description rd:parseType="Literal">
-<%= classes["description"] %>
- </description>
-<% end %>
-
-<% if defined? files and files["requires"] then %>
-<% files["requires"].each do |requires| %>
- <rd:required-file rd:name="<%= requires["name"] %>" />
-<% end # files["requires"] %>
-<% end %>
-
-<% if defined? classes and classes["includes"] then %>
- <IncludedModuleList>
-<% classes["includes"].each do |includes| %>
- <included-module rd:name="<%= includes["name"] %>" />
-<% end # includes["includes"] %>
- </IncludedModuleList>
-<% end %>
-
-<% if defined? classes and classes["sections"] then %>
-<% classes["sections"].each do |sections| %>
-<% if sections["attributes"] then %>
-<% sections["attributes"].each do |attributes| %>
- <contents>
- <Attribute rd:name="<%= attributes["name"] %>">
-<% if attributes["rw"] then %>
- <attribute-rw><%= attributes["rw"] %></attribute-rw>
-<% end %>
- <description rdf:parseType="Literal"><%= attributes["a_desc"] %></description>
- </Attribute>
- </contents>
-<% end # sections["attributes"] %>
-<% end %>
-
-<% if sections["method_list"] then %>
-<% sections["method_list"].each do |method_list| %>
-<% if method_list["methods"] then %>
-<% method_list["methods"].each do |methods| %>
- <contents>
- <Method rd:name="<%= methods["name"] %>" rd:visibility="<%= methods["type"] %>"
- rd:category="<%= methods["category"] %>" rd:id="<%= methods["aref"] %>">
- <parameters><%= methods["params"] %></parameters>
-<% if methods["m_desc"] then %>
- <description rdf:parseType="Literal">
-<%= methods["m_desc"] %>
- </description>
-<% end %>
-<% if methods["sourcecode"] then %>
- <source-code-listing rdf:parseType="Literal">
-<%= methods["sourcecode"] %>
- </source-code-listing>
-<% end %>
- </Method>
- </contents>
-<% end # method_list["methods"] %>
-<% end %>
-<% end # sections["method_list"] %>
-<% end %>
- <!-- end method list -->
-<% end # classes["sections"] %>
-<% end %>
- EOF
-
-########################################################################
-
- ONE_PAGE = %{<?xml version="1.0" encoding="utf-8"?>
-<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns="http://pragprog.com/rdoc/rdoc.rdf#"
- xmlns:rd="http://pragprog.com/rdoc/rdoc.rdf#">
-
-<!-- RDoc -->
-<% values["files"].each do |files| %>
- <rd:File rd:name="<%= files["short_name"] %>" rd:id="<%= files["href"] %>">
- <path><%= files["full_path"] %></path>
- <dtm-modified><%= files["dtm_modified"] %></dtm-modified>
-} + CONTENTS_RDF + %{
- </rd:File>
-<% end # values["files"] %>
-<% values["classes"].each do |classes| %>
- <<%= values["classmod"] %> rd:name="<%= classes["full_name"] %>" rd:id="<%= classes["full_name"] %>">
- <classmod-info>
-<% if classes["infiles"] then %>
- <InFiles>
-<% classes["infiles"].each do |infiles| %>
- <infile>
- <File rd:name="<%= infiles["full_path"] %>"
-<% if infiles["full_path_url"] then %>
- rdf:about="<%= infiles["full_path_url"] %>"
-<% end %>
- />
- </infile>
-<% end # classes["infiles"] %>
- </InFiles>
-<% end %>
-<% if classes["parent"] then %>
- <superclass><%= href classes["par_url"], classes["parent"] %></superclass>
-<% end %>
- </classmod-info>
-} + CONTENTS_RDF + %{
- </<%= classes["classmod"] %>>
-<% end # values["classes"] %>
-<!-- /RDoc -->
-</rdf:RDF>
-}
-
-end
-
diff --git a/lib/rdoc/generator/xml/xml.rb b/lib/rdoc/generator/xml/xml.rb
deleted file mode 100644
index 4b54e7350f..0000000000
--- a/lib/rdoc/generator/xml/xml.rb
+++ /dev/null
@@ -1,123 +0,0 @@
-require 'rdoc/generator/xml'
-
-module RDoc::Generator::XML::XML
-
- CONTENTS_XML = <<-EOF
-<% if defined? classes and classes["description"] then %>
- <description>
-<%= classes["description"] %>
- </description>
-<% end %>
- <contents>
-<% if defined? files and files["requires"] then %>
- <required-file-list>
-<% files["requires"].each do |requires| %>
- <required-file name="<%= requires["name"] %>"
-<% if requires["aref"] then %>
- href="<%= requires["aref"] %>"
-<% end %>
- />
-<% end %><%# files["requires"] %>
- </required-file-list>
-<% end %>
-<% if defined? classes and classes["sections"] then %>
-<% classes["sections"].each do |sections| %>
-<% if sections["constants"] then %>
- <constant-list>
-<% sections["constants"].each do |constant| %>
- <constant name="<%= constant["name"] %>">
-<% if constant["value"] then %>
- <value><%= constant["value"] %></value>
-<% end %>
- <description><%= constant["a_desc"] %></description>
- </constant>
-<% end %><%# sections["constants"] %>
- </constant-list>
-<% end %>
-<% if sections["attributes"] then %>
- <attribute-list>
-<% sections["attributes"].each do |attributes| %>
- <attribute name="<%= attributes["name"] %>">
-<% if attributes["rw"] then %>
- <attribute-rw><%= attributes["rw"] %></attribute-rw>
-<% end %>
- <description><%= attributes["a_desc"] %></description>
- </attribute>
-<% end %><%# sections["attributes"] %>
- </attribute-list>
-<% end %>
-<% if sections["method_list"] then %>
- <method-list>
-<% sections["method_list"].each do |method_list| %>
-<% if method_list["methods"] then %>
-<% method_list["methods"].each do |methods| %>
- <method name="<%= methods["name"] %>" type="<%= methods["type"] %>" category="<%= methods["category"] %>" id="<%= methods["aref"] %>">
- <parameters><%= methods["params"] %></parameters>
-<% if methods["m_desc"] then %>
- <description>
-<%= methods["m_desc"] %>
- </description>
-<% end %>
-<% if methods["sourcecode"] then %>
- <source-code-listing>
-<%= methods["sourcecode"] %>
- </source-code-listing>
-<% end %>
- </method>
-<% end %><%# method_list["methods"] %>
-<% end %>
-<% end %><%# sections["method_list"] %>
- </method-list>
-<% end %>
-<% end %><%# classes["sections"] %>
-<% end %>
-<% if defined? classes and classes["includes"] then %>
- <included-module-list>
-<% classes["includes"].each do |includes| %>
- <included-module name="<%= includes["name"] %>"
-<% if includes["aref"] then %>
- href="<%= includes["aref"] %>"
-<% end %>
- />
-<% end %><%# classes["includes"] %>
- </included-module-list>
-<% end %>
- </contents>
- EOF
-
- ONE_PAGE = %{<?xml version="1.0" encoding="utf-8"?>
-<rdoc>
-<file-list>
-<% values["files"].each do |files| %>
- <file name="<%= files["short_name"] %>" id="<%= files["href"] %>">
- <file-info>
- <path><%= files["full_path"] %></path>
- <dtm-modified><%= files["dtm_modified"] %></dtm-modified>
- </file-info>
-} + CONTENTS_XML + %{
- </file>
-<% end %><%# values["files"] %>
-</file-list>
-<class-module-list>
-<% values["classes"].each do |classes| %>
- <<%= classes["classmod"] %> name="<%= classes["full_name"] %>" id="<%= classes["full_name"] %>">
- <classmod-info>
-<% if classes["infiles"] then %>
- <infiles>
-<% classes["infiles"].each do |infiles| %>
- <infile><%= href infiles["full_path_url"], infiles["full_path"] %></infile>
-<% end %><%# classes["infiles"] %>
- </infiles>
-<% end %>
-<% if classes["parent"] then %>
- <superclass><%= href classes["par_url"], classes["parent"] %></superclass>
-<% end %>
- </classmod-info>
-} + CONTENTS_XML + %{
- </<%= classes["classmod"] %>>
-<% end %><%# values["classes"] %>
-</class-module-list>
-</rdoc>
-}
-
-end
diff --git a/lib/rdoc/generators/chm_generator.rb b/lib/rdoc/generators/chm_generator.rb
new file mode 100644
index 0000000000..51eeda8dd1
--- /dev/null
+++ b/lib/rdoc/generators/chm_generator.rb
@@ -0,0 +1,112 @@
+require 'rdoc/generators/html_generator'
+
+module Generators
+
+ class CHMGenerator < HTMLGenerator
+
+ HHC_PATH = "c:/Program Files/HTML Help Workshop/hhc.exe"
+
+ # Standard generator factory
+ def CHMGenerator.for(options)
+ CHMGenerator.new(options)
+ end
+
+
+ def initialize(*args)
+ super
+ @op_name = @options.op_name || "rdoc"
+ check_for_html_help_workshop
+ end
+
+ def check_for_html_help_workshop
+ stat = File.stat(HHC_PATH)
+ rescue
+ $stderr <<
+ "\n.chm output generation requires that Microsoft's Html Help\n" <<
+ "Workshop is installed. RDoc looks for it in:\n\n " <<
+ HHC_PATH <<
+ "\n\nYou can download a copy for free from:\n\n" <<
+ " http://msdn.microsoft.com/library/default.asp?" <<
+ "url=/library/en-us/htmlhelp/html/hwMicrosoftHTMLHelpDownloads.asp\n\n"
+
+ exit 99
+ end
+
+ # Generate the html as normal, then wrap it
+ # in a help project
+ def generate(info)
+ super
+ @project_name = @op_name + ".hhp"
+ create_help_project
+ end
+
+ # The project contains the project file, a table of contents
+ # and an index
+ def create_help_project
+ create_project_file
+ create_contents_and_index
+ compile_project
+ end
+
+ # The project file links together all the various
+ # files that go to make up the help.
+
+ def create_project_file
+ template = TemplatePage.new(RDoc::Page::HPP_FILE)
+ values = { "title" => @options.title, "opname" => @op_name }
+ files = []
+ @files.each do |f|
+ files << { "html_file_name" => f.path }
+ end
+
+ values['all_html_files'] = files
+
+ File.open(@project_name, "w") do |f|
+ template.write_html_on(f, values)
+ end
+ end
+
+ # The contents is a list of all files and modules.
+ # For each we include as sub-entries the list
+ # of methods they contain. As we build the contents
+ # we also build an index file
+
+ def create_contents_and_index
+ contents = []
+ index = []
+
+ (@files+@classes).sort.each do |entry|
+ content_entry = { "c_name" => entry.name, "ref" => entry.path }
+ index << { "name" => entry.name, "aref" => entry.path }
+
+ internals = []
+
+ methods = entry.build_method_summary_list(entry.path)
+
+ content_entry["methods"] = methods unless methods.empty?
+ contents << content_entry
+ index.concat methods
+ end
+
+ values = { "contents" => contents }
+ template = TemplatePage.new(RDoc::Page::CONTENTS)
+ File.open("contents.hhc", "w") do |f|
+ template.write_html_on(f, values)
+ end
+
+ values = { "index" => index }
+ template = TemplatePage.new(RDoc::Page::CHM_INDEX)
+ File.open("index.hhk", "w") do |f|
+ template.write_html_on(f, values)
+ end
+ end
+
+ # Invoke the windows help compiler to compiler the project
+ def compile_project
+ system(HHC_PATH, @project_name)
+ end
+
+ end
+
+
+end
diff --git a/lib/rdoc/generators/html_generator.rb b/lib/rdoc/generators/html_generator.rb
new file mode 100644
index 0000000000..1f9b808e8d
--- /dev/null
+++ b/lib/rdoc/generators/html_generator.rb
@@ -0,0 +1,1509 @@
+# We're responsible for generating all the HTML files
+# from the object tree defined in code_objects.rb. We
+# generate:
+#
+# [files] an html file for each input file given. These
+# input files appear as objects of class
+# TopLevel
+#
+# [classes] an html file for each class or module encountered.
+# These classes are not grouped by file: if a file
+# contains four classes, we'll generate an html
+# file for the file itself, and four html files
+# for the individual classes.
+#
+# [indices] we generate three indices for files, classes,
+# and methods. These are displayed in a browser
+# like window with three index panes across the
+# top and the selected description below
+#
+# Method descriptions appear in whatever entity (file, class,
+# or module) that contains them.
+#
+# We generate files in a structure below a specified subdirectory,
+# normally +doc+.
+#
+# opdir
+# |
+# |___ files
+# | |__ per file summaries
+# |
+# |___ classes
+# |__ per class/module descriptions
+#
+# HTML is generated using the Template class.
+#
+
+require 'ftools'
+
+require 'rdoc/options'
+require 'rdoc/template'
+require 'rdoc/markup/simple_markup'
+require 'rdoc/markup/simple_markup/to_html'
+require 'cgi'
+
+module Generators
+
+ # Name of sub-direcories that hold file and class/module descriptions
+
+ FILE_DIR = "files"
+ CLASS_DIR = "classes"
+ CSS_NAME = "rdoc-style.css"
+
+
+ ##
+ # Build a hash of all items that can be cross-referenced.
+ # This is used when we output required and included names:
+ # if the names appear in this hash, we can generate
+ # an html cross reference to the appropriate description.
+ # We also use this when parsing comment blocks: any decorated
+ # words matching an entry in this list are hyperlinked.
+
+ class AllReferences
+ @@refs = {}
+
+ def AllReferences::reset
+ @@refs = {}
+ end
+
+ def AllReferences.add(name, html_class)
+ @@refs[name] = html_class
+ end
+
+ def AllReferences.[](name)
+ @@refs[name]
+ end
+
+ def AllReferences.keys
+ @@refs.keys
+ end
+ end
+
+
+ ##
+ # Subclass of the SM::ToHtml class that supports looking
+ # up words in the AllReferences list. Those that are
+ # found (like AllReferences in this comment) will
+ # be hyperlinked
+
+ class HyperlinkHtml < SM::ToHtml
+ # We need to record the html path of our caller so we can generate
+ # correct relative paths for any hyperlinks that we find
+ def initialize(from_path, context)
+ super()
+ @from_path = from_path
+
+ @parent_name = context.parent_name
+ @parent_name += "::" if @parent_name
+ @context = context
+ end
+
+ # We're invoked when any text matches the CROSSREF pattern
+ # (defined in MarkUp). If we fine the corresponding reference,
+ # generate a hyperlink. If the name we're looking for contains
+ # no punctuation, we look for it up the module/class chain. For
+ # example, HyperlinkHtml is found, even without the Generators::
+ # prefix, because we look for it in module Generators first.
+
+ def handle_special_CROSSREF(special)
+ name = special.text
+ if name[0,1] == '#'
+ lookup = name[1..-1]
+ name = lookup unless Options.instance.show_hash
+ else
+ lookup = name
+ end
+
+ # Find class, module, or method in class or module.
+ if /([A-Z]\w*)[.\#](\w+[!?=]?)/ =~ lookup
+ container = $1
+ method = $2
+ ref = @context.find_symbol(container, method)
+ elsif /([A-Za-z]\w*)[.\#](\w+(\([\.\w+\*\/\+\-\=\<\>]+\))?)/ =~ lookup
+ container = $1
+ method = $2
+ ref = @context.find_symbol(container, method)
+ else
+ ref = @context.find_symbol(lookup)
+ end
+
+ if ref and ref.document_self
+ "<a href=\"#{ref.as_href(@from_path)}\">#{name}</a>"
+ else
+ name
+ end
+ end
+
+
+ # Generate a hyperlink for url, labeled with text. Handle the
+ # special cases for img: and link: described under handle_special_HYPEDLINK
+ def gen_url(url, text)
+ if url =~ /([A-Za-z]+):(.*)/
+ type = $1
+ path = $2
+ else
+ type = "http"
+ path = url
+ url = "http://#{url}"
+ end
+
+ if type == "link"
+ if path[0,1] == '#' # is this meaningful?
+ url = path
+ else
+ url = HTMLGenerator.gen_url(@from_path, path)
+ end
+ end
+
+ if (type == "http" || type == "link") &&
+ url =~ /\.(gif|png|jpg|jpeg|bmp)$/
+
+ "<img src=\"#{url}\" />"
+ else
+ "<a href=\"#{url}\">#{text.sub(%r{^#{type}:/*}, '')}</a>"
+ end
+ end
+
+ # And we're invoked with a potential external hyperlink mailto:
+ # just gets inserted. http: links are checked to see if they
+ # reference an image. If so, that image gets inserted using an
+ # <img> tag. Otherwise a conventional <a href> is used. We also
+ # support a special type of hyperlink, link:, which is a reference
+ # to a local file whose path is relative to the --op directory.
+
+ def handle_special_HYPERLINK(special)
+ url = special.text
+ gen_url(url, url)
+ end
+
+ # HEre's a hypedlink where the label is different to the URL
+ # <label>[url]
+ #
+
+ def handle_special_TIDYLINK(special)
+ text = special.text
+# unless text =~ /(\S+)\[(.*?)\]/
+ unless text =~ /\{(.*?)\}\[(.*?)\]/ or text =~ /(\S+)\[(.*?)\]/
+ return text
+ end
+ label = $1
+ url = $2
+ gen_url(url, label)
+ end
+
+ end
+
+
+
+ #####################################################################
+ #
+ # Handle common markup tasks for the various Html classes
+ #
+
+ module MarkUp
+
+ # Convert a string in markup format into HTML. We keep a cached
+ # SimpleMarkup object lying around after the first time we're
+ # called per object.
+
+ def markup(str, remove_para=false)
+ return '' unless str
+ unless defined? @markup
+ @markup = SM::SimpleMarkup.new
+
+ # class names, variable names, or instance variables
+ @markup.add_special(/(
+ \w+(::\w+)*[.\#]\w+(\([\.\w+\*\/\+\-\=\<\>]+\))? # A::B.meth(**) (for operator in Fortran95)
+ | \#\w+(\([.\w\*\/\+\-\=\<\>]+\))? # meth(**) (for operator in Fortran95)
+ | \b([A-Z]\w*(::\w+)*[.\#]\w+) # A::B.meth
+ | \b([A-Z]\w+(::\w+)*) # A::B..
+ | \#\w+[!?=]? # #meth_name
+ | \b\w+([_\/\.]+\w+)*[!?=]? # meth_name
+ )/x,
+ :CROSSREF)
+
+ # external hyperlinks
+ @markup.add_special(/((link:|https?:|mailto:|ftp:|www\.)\S+\w)/, :HYPERLINK)
+
+ # and links of the form <text>[<url>]
+ @markup.add_special(/(((\{.*?\})|\b\S+?)\[\S+?\.\S+?\])/, :TIDYLINK)
+# @markup.add_special(/\b(\S+?\[\S+?\.\S+?\])/, :TIDYLINK)
+
+ end
+ unless defined? @html_formatter
+ @html_formatter = HyperlinkHtml.new(self.path, self)
+ end
+
+ # Convert leading comment markers to spaces, but only
+ # if all non-blank lines have them
+
+ if str =~ /^(?>\s*)[^\#]/
+ content = str
+ else
+ content = str.gsub(/^\s*(#+)/) { $1.tr('#',' ') }
+ end
+
+ res = @markup.convert(content, @html_formatter)
+ if remove_para
+ res.sub!(/^<p>/, '')
+ res.sub!(/<\/p>$/, '')
+ end
+ res
+ end
+
+ # Qualify a stylesheet URL; if if +css_name+ does not begin with '/' or
+ # 'http[s]://', prepend a prefix relative to +path+. Otherwise, return it
+ # unmodified.
+
+ def style_url(path, css_name=nil)
+# $stderr.puts "style_url( #{path.inspect}, #{css_name.inspect} )"
+ css_name ||= CSS_NAME
+ if %r{^(https?:/)?/} =~ css_name
+ return css_name
+ else
+ return HTMLGenerator.gen_url(path, css_name)
+ end
+ end
+
+ # Build a webcvs URL with the given 'url' argument. URLs with a '%s' in them
+ # get the file's path sprintfed into them; otherwise they're just catenated
+ # together.
+
+ def cvs_url(url, full_path)
+ if /%s/ =~ url
+ return sprintf( url, full_path )
+ else
+ return url + full_path
+ end
+ end
+ end
+
+
+ #####################################################################
+ #
+ # A Context is built by the parser to represent a container: contexts
+ # hold classes, modules, methods, require lists and include lists.
+ # ClassModule and TopLevel are the context objects we process here
+ #
+ class ContextUser
+
+ include MarkUp
+
+ attr_reader :context
+
+ def initialize(context, options)
+ @context = context
+ @options = options
+ end
+
+ # convenience method to build a hyperlink
+ def href(link, cls, name)
+ %{<a href="#{link}" class="#{cls}">#{name}</a>} #"
+ end
+
+ # return a reference to outselves to be used as an href=
+ # the form depends on whether we're all in one file
+ # or in multiple files
+
+ def as_href(from_path)
+ if @options.all_one_file
+ "#" + path
+ else
+ HTMLGenerator.gen_url(from_path, path)
+ end
+ end
+
+ # Create a list of HtmlMethod objects for each method
+ # in the corresponding context object. If the @options.show_all
+ # variable is set (corresponding to the <tt>--all</tt> option,
+ # we include all methods, otherwise just the public ones.
+
+ def collect_methods
+ list = @context.method_list
+ unless @options.show_all
+ list = list.find_all {|m| m.visibility == :public || m.visibility == :protected || m.force_documentation }
+ end
+ @methods = list.collect {|m| HtmlMethod.new(m, self, @options) }
+ end
+
+ # Build a summary list of all the methods in this context
+ def build_method_summary_list(path_prefix="")
+ collect_methods unless @methods
+ meths = @methods.sort
+ res = []
+ meths.each do |meth|
+ res << {
+ "name" => CGI.escapeHTML(meth.name),
+ "aref" => "#{path_prefix}\##{meth.aref}"
+ }
+ end
+ res
+ end
+
+
+ # Build a list of aliases for which we couldn't find a
+ # corresponding method
+ def build_alias_summary_list(section)
+ values = []
+ @context.aliases.each do |al|
+ next unless al.section == section
+ res = {
+ 'old_name' => al.old_name,
+ 'new_name' => al.new_name,
+ }
+ if al.comment && !al.comment.empty?
+ res['desc'] = markup(al.comment, true)
+ end
+ values << res
+ end
+ values
+ end
+
+ # Build a list of constants
+ def build_constants_summary_list(section)
+ values = []
+ @context.constants.each do |co|
+ next unless co.section == section
+ res = {
+ 'name' => co.name,
+ 'value' => CGI.escapeHTML(co.value)
+ }
+ res['desc'] = markup(co.comment, true) if co.comment && !co.comment.empty?
+ values << res
+ end
+ values
+ end
+
+ def build_requires_list(context)
+ potentially_referenced_list(context.requires) {|fn| [fn + ".rb"] }
+ end
+
+ def build_include_list(context)
+ potentially_referenced_list(context.includes)
+ end
+
+ # Build a list from an array of <i>Htmlxxx</i> items. Look up each
+ # in the AllReferences hash: if we find a corresponding entry,
+ # we generate a hyperlink to it, otherwise just output the name.
+ # However, some names potentially need massaging. For example,
+ # you may require a Ruby file without the .rb extension,
+ # but the file names we know about may have it. To deal with
+ # this, we pass in a block which performs the massaging,
+ # returning an array of alternative names to match
+
+ def potentially_referenced_list(array)
+ res = []
+ array.each do |i|
+ ref = AllReferences[i.name]
+# if !ref
+# container = @context.parent
+# while !ref && container
+# name = container.name + "::" + i.name
+# ref = AllReferences[name]
+# container = container.parent
+# end
+# end
+
+ ref = @context.find_symbol(i.name)
+ ref = ref.viewer if ref
+
+ if !ref && block_given?
+ possibles = yield(i.name)
+ while !ref and !possibles.empty?
+ ref = AllReferences[possibles.shift]
+ end
+ end
+ h_name = CGI.escapeHTML(i.name)
+ if ref and ref.document_self
+ path = url(ref.path)
+ res << { "name" => h_name, "aref" => path }
+ else
+ res << { "name" => h_name }
+ end
+ end
+ res
+ end
+
+ # Build an array of arrays of method details. The outer array has up
+ # to six entries, public, private, and protected for both class
+ # methods, the other for instance methods. The inner arrays contain
+ # a hash for each method
+
+ def build_method_detail_list(section)
+ outer = []
+
+ methods = @methods.sort
+ for singleton in [true, false]
+ for vis in [ :public, :protected, :private ]
+ res = []
+ methods.each do |m|
+ if m.section == section and
+ m.document_self and
+ m.visibility == vis and
+ m.singleton == singleton
+ row = {}
+ if m.call_seq
+ row["callseq"] = m.call_seq.gsub(/->/, '&rarr;')
+ else
+ row["name"] = CGI.escapeHTML(m.name)
+ row["params"] = m.params
+ end
+ desc = m.description.strip
+ row["m_desc"] = desc unless desc.empty?
+ row["aref"] = m.aref
+ row["visibility"] = m.visibility.to_s
+
+ alias_names = []
+ m.aliases.each do |other|
+ if other.viewer # won't be if the alias is private
+ alias_names << {
+ 'name' => other.name,
+ 'aref' => other.viewer.as_href(path)
+ }
+ end
+ end
+ unless alias_names.empty?
+ row["aka"] = alias_names
+ end
+
+ if @options.inline_source
+ code = m.source_code
+ row["sourcecode"] = code if code
+ else
+ code = m.src_url
+ if code
+ row["codeurl"] = code
+ row["imgurl"] = m.img_url
+ end
+ end
+ res << row
+ end
+ end
+ if res.size > 0
+ outer << {
+ "type" => vis.to_s.capitalize,
+ "category" => singleton ? "Class" : "Instance",
+ "methods" => res
+ }
+ end
+ end
+ end
+ outer
+ end
+
+ # Build the structured list of classes and modules contained
+ # in this context.
+
+ def build_class_list(level, from, section, infile=nil)
+ res = ""
+ prefix = "&nbsp;&nbsp;::" * level;
+
+ from.modules.sort.each do |mod|
+ next unless mod.section == section
+ next if infile && !mod.defined_in?(infile)
+ if mod.document_self
+ res <<
+ prefix <<
+ "Module " <<
+ href(url(mod.viewer.path), "link", mod.full_name) <<
+ "<br />\n" <<
+ build_class_list(level + 1, mod, section, infile)
+ end
+ end
+
+ from.classes.sort.each do |cls|
+ next unless cls.section == section
+ next if infile && !cls.defined_in?(infile)
+ if cls.document_self
+ res <<
+ prefix <<
+ "Class " <<
+ href(url(cls.viewer.path), "link", cls.full_name) <<
+ "<br />\n" <<
+ build_class_list(level + 1, cls, section, infile)
+ end
+ end
+
+ res
+ end
+
+ def url(target)
+ HTMLGenerator.gen_url(path, target)
+ end
+
+ def aref_to(target)
+ if @options.all_one_file
+ "#" + target
+ else
+ url(target)
+ end
+ end
+
+ def document_self
+ @context.document_self
+ end
+
+ def diagram_reference(diagram)
+ res = diagram.gsub(/((?:src|href)=")(.*?)"/) {
+ $1 + url($2) + '"'
+ }
+ res
+ end
+
+
+ # Find a symbol in ourselves or our parent
+ def find_symbol(symbol, method=nil)
+ res = @context.find_symbol(symbol, method)
+ if res
+ res = res.viewer
+ end
+ res
+ end
+
+ # create table of contents if we contain sections
+
+ def add_table_of_sections
+ toc = []
+ @context.sections.each do |section|
+ if section.title
+ toc << {
+ 'secname' => section.title,
+ 'href' => section.sequence
+ }
+ end
+ end
+
+ @values['toc'] = toc unless toc.empty?
+ end
+
+
+ end
+
+ #####################################################################
+ #
+ # Wrap a ClassModule context
+
+ class HtmlClass < ContextUser
+
+ attr_reader :path
+
+ def initialize(context, html_file, prefix, options)
+ super(context, options)
+
+ @html_file = html_file
+ @is_module = context.is_module?
+ @values = {}
+
+ context.viewer = self
+
+ if options.all_one_file
+ @path = context.full_name
+ else
+ @path = http_url(context.full_name, prefix)
+ end
+
+ collect_methods
+
+ AllReferences.add(name, self)
+ end
+
+ # return the relative file name to store this class in,
+ # which is also its url
+ def http_url(full_name, prefix)
+ path = full_name.dup
+ if path['<<']
+ path.gsub!(/<<\s*(\w*)/) { "from-#$1" }
+ end
+ File.join(prefix, path.split("::")) + ".html"
+ end
+
+
+ def name
+ @context.full_name
+ end
+
+ def parent_name
+ @context.parent.full_name
+ end
+
+ def index_name
+ name
+ end
+
+ def write_on(f)
+ value_hash
+ template = TemplatePage.new(RDoc::Page::BODY,
+ RDoc::Page::CLASS_PAGE,
+ RDoc::Page::METHOD_LIST)
+ template.write_html_on(f, @values)
+ end
+
+ def value_hash
+ class_attribute_values
+ add_table_of_sections
+
+ @values["charset"] = @options.charset
+ @values["style_url"] = style_url(path, @options.css)
+
+ d = markup(@context.comment)
+ @values["description"] = d unless d.empty?
+
+ ml = build_method_summary_list
+ @values["methods"] = ml unless ml.empty?
+
+ il = build_include_list(@context)
+ @values["includes"] = il unless il.empty?
+
+ @values["sections"] = @context.sections.map do |section|
+
+ secdata = {
+ "sectitle" => section.title,
+ "secsequence" => section.sequence,
+ "seccomment" => markup(section.comment)
+ }
+
+ al = build_alias_summary_list(section)
+ secdata["aliases"] = al unless al.empty?
+
+ co = build_constants_summary_list(section)
+ secdata["constants"] = co unless co.empty?
+
+ al = build_attribute_list(section)
+ secdata["attributes"] = al unless al.empty?
+
+ cl = build_class_list(0, @context, section)
+ secdata["classlist"] = cl unless cl.empty?
+
+ mdl = build_method_detail_list(section)
+ secdata["method_list"] = mdl unless mdl.empty?
+
+ secdata
+ end
+
+ @values
+ end
+
+ def build_attribute_list(section)
+ atts = @context.attributes.sort
+ res = []
+ atts.each do |att|
+ next unless att.section == section
+ if att.visibility == :public || att.visibility == :protected || @options.show_all
+ entry = {
+ "name" => CGI.escapeHTML(att.name),
+ "rw" => att.rw,
+ "a_desc" => markup(att.comment, true)
+ }
+ unless att.visibility == :public || att.visibility == :protected
+ entry["rw"] << "-"
+ end
+ res << entry
+ end
+ end
+ res
+ end
+
+ def class_attribute_values
+ h_name = CGI.escapeHTML(name)
+
+ @values["classmod"] = @is_module ? "Module" : "Class"
+ @values["title"] = "#{@values['classmod']}: #{h_name}"
+
+ c = @context
+ c = c.parent while c and !c.diagram
+ if c && c.diagram
+ @values["diagram"] = diagram_reference(c.diagram)
+ end
+
+ @values["full_name"] = h_name
+
+ parent_class = @context.superclass
+
+ if parent_class
+ @values["parent"] = CGI.escapeHTML(parent_class)
+
+ if parent_name
+ lookup = parent_name + "::" + parent_class
+ else
+ lookup = parent_class
+ end
+
+ parent_url = AllReferences[lookup] || AllReferences[parent_class]
+
+ if parent_url and parent_url.document_self
+ @values["par_url"] = aref_to(parent_url.path)
+ end
+ end
+
+ files = []
+ @context.in_files.each do |f|
+ res = {}
+ full_path = CGI.escapeHTML(f.file_absolute_name)
+
+ res["full_path"] = full_path
+ res["full_path_url"] = aref_to(f.viewer.path) if f.document_self
+
+ if @options.webcvs
+ res["cvsurl"] = cvs_url( @options.webcvs, full_path )
+ end
+
+ files << res
+ end
+
+ @values['infiles'] = files
+ end
+
+ def <=>(other)
+ self.name <=> other.name
+ end
+
+ end
+
+ #####################################################################
+ #
+ # Handles the mapping of a file's information to HTML. In reality,
+ # a file corresponds to a +TopLevel+ object, containing modules,
+ # classes, and top-level methods. In theory it _could_ contain
+ # attributes and aliases, but we ignore these for now.
+
+ class HtmlFile < ContextUser
+
+ attr_reader :path
+ attr_reader :name
+
+ def initialize(context, options, file_dir)
+ super(context, options)
+
+ @values = {}
+
+ if options.all_one_file
+ @path = filename_to_label
+ else
+ @path = http_url(file_dir)
+ end
+
+ @name = @context.file_relative_name
+
+ collect_methods
+ AllReferences.add(name, self)
+ context.viewer = self
+ end
+
+ def http_url(file_dir)
+ File.join(file_dir, @context.file_relative_name.tr('.', '_')) +
+ ".html"
+ end
+
+ def filename_to_label
+ @context.file_relative_name.gsub(/%|\/|\?|\#/) {|s| '%' + ("%x" % s[0]) }
+ end
+
+ def index_name
+ name
+ end
+
+ def parent_name
+ nil
+ end
+
+ def value_hash
+ file_attribute_values
+ add_table_of_sections
+
+ @values["charset"] = @options.charset
+ @values["href"] = path
+ @values["style_url"] = style_url(path, @options.css)
+
+ if @context.comment
+ d = markup(@context.comment)
+ @values["description"] = d if d.size > 0
+ end
+
+ ml = build_method_summary_list
+ @values["methods"] = ml unless ml.empty?
+
+ il = build_include_list(@context)
+ @values["includes"] = il unless il.empty?
+
+ rl = build_requires_list(@context)
+ @values["requires"] = rl unless rl.empty?
+
+ if @options.promiscuous
+ file_context = nil
+ else
+ file_context = @context
+ end
+
+
+ @values["sections"] = @context.sections.map do |section|
+
+ secdata = {
+ "sectitle" => section.title,
+ "secsequence" => section.sequence,
+ "seccomment" => markup(section.comment)
+ }
+
+ cl = build_class_list(0, @context, section, file_context)
+ @values["classlist"] = cl unless cl.empty?
+
+ mdl = build_method_detail_list(section)
+ secdata["method_list"] = mdl unless mdl.empty?
+
+ al = build_alias_summary_list(section)
+ secdata["aliases"] = al unless al.empty?
+
+ co = build_constants_summary_list(section)
+ @values["constants"] = co unless co.empty?
+
+ secdata
+ end
+
+ @values
+ end
+
+ def write_on(f)
+ value_hash
+ template = TemplatePage.new(RDoc::Page::BODY,
+ RDoc::Page::FILE_PAGE,
+ RDoc::Page::METHOD_LIST)
+ template.write_html_on(f, @values)
+ end
+
+ def file_attribute_values
+ full_path = @context.file_absolute_name
+ short_name = File.basename(full_path)
+
+ @values["title"] = CGI.escapeHTML("File: #{short_name}")
+
+ if @context.diagram
+ @values["diagram"] = diagram_reference(@context.diagram)
+ end
+
+ @values["short_name"] = CGI.escapeHTML(short_name)
+ @values["full_path"] = CGI.escapeHTML(full_path)
+ @values["dtm_modified"] = @context.file_stat.mtime.to_s
+
+ if @options.webcvs
+ @values["cvsurl"] = cvs_url( @options.webcvs, @values["full_path"] )
+ end
+ end
+
+ def <=>(other)
+ self.name <=> other.name
+ end
+ end
+
+ #####################################################################
+
+ class HtmlMethod
+ include MarkUp
+
+ attr_reader :context
+ attr_reader :src_url
+ attr_reader :img_url
+ attr_reader :source_code
+
+ @@seq = "M000000"
+
+ @@all_methods = []
+
+ def HtmlMethod::reset
+ @@all_methods = []
+ end
+
+ def initialize(context, html_class, options)
+ @context = context
+ @html_class = html_class
+ @options = options
+ @@seq = @@seq.succ
+ @seq = @@seq
+ @@all_methods << self
+
+ context.viewer = self
+
+ if (ts = @context.token_stream)
+ @source_code = markup_code(ts)
+ unless @options.inline_source
+ @src_url = create_source_code_file(@source_code)
+ @img_url = HTMLGenerator.gen_url(path, 'source.png')
+ end
+ end
+
+ AllReferences.add(name, self)
+ end
+
+ # return a reference to outselves to be used as an href=
+ # the form depends on whether we're all in one file
+ # or in multiple files
+
+ def as_href(from_path)
+ if @options.all_one_file
+ "#" + path
+ else
+ HTMLGenerator.gen_url(from_path, path)
+ end
+ end
+
+ def name
+ @context.name
+ end
+
+ def section
+ @context.section
+ end
+
+ def index_name
+ "#{@context.name} (#{@html_class.name})"
+ end
+
+ def parent_name
+ if @context.parent.parent
+ @context.parent.parent.full_name
+ else
+ nil
+ end
+ end
+
+ def aref
+ @seq
+ end
+
+ def path
+ if @options.all_one_file
+ aref
+ else
+ @html_class.path + "#" + aref
+ end
+ end
+
+ def description
+ markup(@context.comment)
+ end
+
+ def visibility
+ @context.visibility
+ end
+
+ def singleton
+ @context.singleton
+ end
+
+ def call_seq
+ cs = @context.call_seq
+ if cs
+ cs.gsub(/\n/, "<br />\n")
+ else
+ nil
+ end
+ end
+
+ def params
+ # params coming from a call-seq in 'C' will start with the
+ # method name
+ p = @context.params
+ if p !~ /^\w/
+ p = @context.params.gsub(/\s*\#.*/, '')
+ p = p.tr("\n", " ").squeeze(" ")
+ p = "(" + p + ")" unless p[0] == ?(
+
+ if (block = @context.block_params)
+ # If this method has explicit block parameters, remove any
+ # explicit &block
+
+ p.sub!(/,?\s*&\w+/, '')
+
+ block.gsub!(/\s*\#.*/, '')
+ block = block.tr("\n", " ").squeeze(" ")
+ if block[0] == ?(
+ block.sub!(/^\(/, '').sub!(/\)/, '')
+ end
+ p << " {|#{block.strip}| ...}"
+ end
+ end
+ CGI.escapeHTML(p)
+ end
+
+ def create_source_code_file(code_body)
+ meth_path = @html_class.path.sub(/\.html$/, '.src')
+ File.makedirs(meth_path)
+ file_path = File.join(meth_path, @seq) + ".html"
+
+ template = TemplatePage.new(RDoc::Page::SRC_PAGE)
+ File.open(file_path, "w") do |f|
+ values = {
+ 'title' => CGI.escapeHTML(index_name),
+ 'code' => code_body,
+ 'style_url' => style_url(file_path, @options.css),
+ 'charset' => @options.charset
+ }
+ template.write_html_on(f, values)
+ end
+ HTMLGenerator.gen_url(path, file_path)
+ end
+
+ def HtmlMethod.all_methods
+ @@all_methods
+ end
+
+ def <=>(other)
+ @context <=> other.context
+ end
+
+ ##
+ # Given a sequence of source tokens, mark up the source code
+ # to make it look purty.
+
+
+ def markup_code(tokens)
+ src = ""
+ tokens.each do |t|
+ next unless t
+ # p t.class
+# style = STYLE_MAP[t.class]
+ style = case t
+ when RubyToken::TkCONSTANT then "ruby-constant"
+ when RubyToken::TkKW then "ruby-keyword kw"
+ when RubyToken::TkIVAR then "ruby-ivar"
+ when RubyToken::TkOp then "ruby-operator"
+ when RubyToken::TkId then "ruby-identifier"
+ when RubyToken::TkNode then "ruby-node"
+ when RubyToken::TkCOMMENT then "ruby-comment cmt"
+ when RubyToken::TkREGEXP then "ruby-regexp re"
+ when RubyToken::TkSTRING then "ruby-value str"
+ when RubyToken::TkVal then "ruby-value"
+ else
+ nil
+ end
+
+ text = CGI.escapeHTML(t.text)
+
+ if style
+ src << "<span class=\"#{style}\">#{text}</span>"
+ else
+ src << text
+ end
+ end
+
+ add_line_numbers(src) if Options.instance.include_line_numbers
+ src
+ end
+
+ # we rely on the fact that the first line of a source code
+ # listing has
+ # # File xxxxx, line dddd
+
+ def add_line_numbers(src)
+ if src =~ /\A.*, line (\d+)/
+ first = $1.to_i - 1
+ last = first + src.count("\n")
+ size = last.to_s.length
+ real_fmt = "%#{size}d: "
+ fmt = " " * (size+2)
+ src.gsub!(/^/) do
+ res = sprintf(fmt, first)
+ first += 1
+ fmt = real_fmt
+ res
+ end
+ end
+ end
+
+ def document_self
+ @context.document_self
+ end
+
+ def aliases
+ @context.aliases
+ end
+
+ def find_symbol(symbol, method=nil)
+ res = @context.parent.find_symbol(symbol, method)
+ if res
+ res = res.viewer
+ end
+ res
+ end
+ end
+
+ #####################################################################
+
+ class HTMLGenerator
+
+ include MarkUp
+
+ ##
+ # convert a target url to one that is relative to a given
+ # path
+
+ def HTMLGenerator.gen_url(path, target)
+ from = File.dirname(path)
+ to, to_file = File.split(target)
+
+ from = from.split("/")
+ to = to.split("/")
+
+ while from.size > 0 and to.size > 0 and from[0] == to[0]
+ from.shift
+ to.shift
+ end
+
+ from.fill("..")
+ from.concat(to)
+ from << to_file
+ File.join(*from)
+ end
+
+ # Generators may need to return specific subclasses depending
+ # on the options they are passed. Because of this
+ # we create them using a factory
+
+ def HTMLGenerator.for(options)
+ AllReferences::reset
+ HtmlMethod::reset
+
+ if options.all_one_file
+ HTMLGeneratorInOne.new(options)
+ else
+ HTMLGenerator.new(options)
+ end
+ end
+
+ class <<self
+ protected :new
+ end
+
+ # Set up a new HTML generator. Basically all we do here is load
+ # up the correct output temlate
+
+ def initialize(options) #:not-new:
+ @options = options
+ load_html_template
+ end
+
+
+ ##
+ # Build the initial indices and output objects
+ # based on an array of TopLevel objects containing
+ # the extracted information.
+
+ def generate(toplevels)
+ @toplevels = toplevels
+ @files = []
+ @classes = []
+
+ write_style_sheet
+ gen_sub_directories()
+ build_indices
+ generate_html
+ end
+
+ private
+
+ ##
+ # Load up the HTML template specified in the options.
+ # If the template name contains a slash, use it literally
+ #
+ def load_html_template
+ template = @options.template
+ unless template =~ %r{/|\\}
+ template = File.join("rdoc/generators/template",
+ @options.generator.key, template)
+ end
+ require template
+ extend RDoc::Page
+ rescue LoadError
+ $stderr.puts "Could not find HTML template '#{template}'"
+ exit 99
+ end
+
+ ##
+ # Write out the style sheet used by the main frames
+ #
+
+ def write_style_sheet
+ template = TemplatePage.new(RDoc::Page::STYLE)
+ unless @options.css
+ File.open(CSS_NAME, "w") do |f|
+ values = { "fonts" => RDoc::Page::FONTS }
+ template.write_html_on(f, values)
+ end
+ end
+ end
+
+ ##
+ # See the comments at the top for a description of the
+ # directory structure
+
+ def gen_sub_directories
+ File.makedirs(FILE_DIR, CLASS_DIR)
+ rescue
+ $stderr.puts $!.message
+ exit 1
+ end
+
+ ##
+ # Generate:
+ #
+ # * a list of HtmlFile objects for each TopLevel object.
+ # * a list of HtmlClass objects for each first level
+ # class or module in the TopLevel objects
+ # * a complete list of all hyperlinkable terms (file,
+ # class, module, and method names)
+
+ def build_indices
+
+ @toplevels.each do |toplevel|
+ @files << HtmlFile.new(toplevel, @options, FILE_DIR)
+ end
+
+ RDoc::TopLevel.all_classes_and_modules.each do |cls|
+ build_class_list(cls, @files[0], CLASS_DIR)
+ end
+ end
+
+ def build_class_list(from, html_file, class_dir)
+ @classes << HtmlClass.new(from, html_file, class_dir, @options)
+ from.each_classmodule do |mod|
+ build_class_list(mod, html_file, class_dir)
+ end
+ end
+
+ ##
+ # Generate all the HTML
+ #
+ def generate_html
+ # the individual descriptions for files and classes
+ gen_into(@files)
+ gen_into(@classes)
+ # and the index files
+ gen_file_index
+ gen_class_index
+ gen_method_index
+ gen_main_index
+
+ # this method is defined in the template file
+ write_extra_pages if defined? write_extra_pages
+ end
+
+ def gen_into(list)
+ list.each do |item|
+ if item.document_self
+ op_file = item.path
+ File.makedirs(File.dirname(op_file))
+ File.open(op_file, "w") { |file| item.write_on(file) }
+ end
+ end
+
+ end
+
+ def gen_file_index
+ gen_an_index(@files, 'Files',
+ RDoc::Page::FILE_INDEX,
+ "fr_file_index.html")
+ end
+
+ def gen_class_index
+ gen_an_index(@classes, 'Classes',
+ RDoc::Page::CLASS_INDEX,
+ "fr_class_index.html")
+ end
+
+ def gen_method_index
+ gen_an_index(HtmlMethod.all_methods, 'Methods',
+ RDoc::Page::METHOD_INDEX,
+ "fr_method_index.html")
+ end
+
+
+ def gen_an_index(collection, title, template, filename)
+ template = TemplatePage.new(RDoc::Page::FR_INDEX_BODY, template)
+ res = []
+ collection.sort.each do |f|
+ if f.document_self
+ res << { "href" => f.path, "name" => f.index_name }
+ end
+ end
+
+ values = {
+ "entries" => res,
+ 'list_title' => CGI.escapeHTML(title),
+ 'index_url' => main_url,
+ 'charset' => @options.charset,
+ 'style_url' => style_url('', @options.css),
+ }
+
+ File.open(filename, "w") do |f|
+ template.write_html_on(f, values)
+ end
+ end
+
+ # The main index page is mostly a template frameset, but includes
+ # the initial page. If the <tt>--main</tt> option was given,
+ # we use this as our main page, otherwise we use the
+ # first file specified on the command line.
+
+ def gen_main_index
+ template = TemplatePage.new(RDoc::Page::INDEX)
+ File.open("index.html", "w") do |f|
+ values = {
+ "initial_page" => main_url,
+ 'title' => CGI.escapeHTML(@options.title),
+ 'charset' => @options.charset
+ }
+ if @options.inline_source
+ values['inline_source'] = true
+ end
+ template.write_html_on(f, values)
+ end
+ end
+
+ # return the url of the main page
+ def main_url
+ main_page = @options.main_page
+ ref = nil
+ if main_page
+ ref = AllReferences[main_page]
+ if ref
+ ref = ref.path
+ else
+ $stderr.puts "Could not find main page #{main_page}"
+ end
+ end
+
+ unless ref
+ for file in @files
+ if file.document_self
+ ref = file.path
+ break
+ end
+ end
+ end
+
+ unless ref
+ $stderr.puts "Couldn't find anything to document"
+ $stderr.puts "Perhaps you've used :stopdoc: in all classes"
+ exit(1)
+ end
+
+ ref
+ end
+
+
+ end
+
+
+ ######################################################################
+
+
+ class HTMLGeneratorInOne < HTMLGenerator
+
+ def initialize(*args)
+ super
+ end
+
+ ##
+ # Build the initial indices and output objects
+ # based on an array of TopLevel objects containing
+ # the extracted information.
+
+ def generate(info)
+ @toplevels = info
+ @files = []
+ @classes = []
+ @hyperlinks = {}
+
+ build_indices
+ generate_xml
+ end
+
+
+ ##
+ # Generate:
+ #
+ # * a list of HtmlFile objects for each TopLevel object.
+ # * a list of HtmlClass objects for each first level
+ # class or module in the TopLevel objects
+ # * a complete list of all hyperlinkable terms (file,
+ # class, module, and method names)
+
+ def build_indices
+
+ @toplevels.each do |toplevel|
+ @files << HtmlFile.new(toplevel, @options, FILE_DIR)
+ end
+
+ RDoc::TopLevel.all_classes_and_modules.each do |cls|
+ build_class_list(cls, @files[0], CLASS_DIR)
+ end
+ end
+
+ def build_class_list(from, html_file, class_dir)
+ @classes << HtmlClass.new(from, html_file, class_dir, @options)
+ from.each_classmodule do |mod|
+ build_class_list(mod, html_file, class_dir)
+ end
+ end
+
+ ##
+ # Generate all the HTML. For the one-file case, we generate
+ # all the information in to one big hash
+ #
+ def generate_xml
+ values = {
+ 'charset' => @options.charset,
+ 'files' => gen_into(@files),
+ 'classes' => gen_into(@classes),
+ 'title' => CGI.escapeHTML(@options.title),
+ }
+
+ # this method is defined in the template file
+ write_extra_pages if defined? write_extra_pages
+
+ template = TemplatePage.new(RDoc::Page::ONE_PAGE)
+
+ if @options.op_name
+ opfile = File.open(@options.op_name, "w")
+ else
+ opfile = $stdout
+ end
+ template.write_html_on(opfile, values)
+ end
+
+ def gen_into(list)
+ res = []
+ list.each do |item|
+ res << item.value_hash
+ end
+ res
+ end
+
+ def gen_file_index
+ gen_an_index(@files, 'Files')
+ end
+
+ def gen_class_index
+ gen_an_index(@classes, 'Classes')
+ end
+
+ def gen_method_index
+ gen_an_index(HtmlMethod.all_methods, 'Methods')
+ end
+
+
+ def gen_an_index(collection, title)
+ res = []
+ collection.sort.each do |f|
+ if f.document_self
+ res << { "href" => f.path, "name" => f.index_name }
+ end
+ end
+
+ return {
+ "entries" => res,
+ 'list_title' => title,
+ 'index_url' => main_url,
+ }
+ end
+
+ end
+end
diff --git a/lib/rdoc/generators/ri_generator.rb b/lib/rdoc/generators/ri_generator.rb
new file mode 100644
index 0000000000..c7d0bbd8f0
--- /dev/null
+++ b/lib/rdoc/generators/ri_generator.rb
@@ -0,0 +1,268 @@
+# We're responsible for generating all the HTML files
+# from the object tree defined in code_objects.rb. We
+# generate:
+#
+# [files] an html file for each input file given. These
+# input files appear as objects of class
+# TopLevel
+#
+# [classes] an html file for each class or module encountered.
+# These classes are not grouped by file: if a file
+# contains four classes, we'll generate an html
+# file for the file itself, and four html files
+# for the individual classes.
+#
+# [indices] we generate three indices for files, classes,
+# and methods. These are displayed in a browser
+# like window with three index panes across the
+# top and the selected description below
+#
+# Method descriptions appear in whatever entity (file, class,
+# or module) that contains them.
+#
+# We generate files in a structure below a specified subdirectory,
+# normally +doc+.
+#
+# opdir
+# |
+# |___ files
+# | |__ per file summaries
+# |
+# |___ classes
+# |__ per class/module descriptions
+#
+# HTML is generated using the Template class.
+#
+
+require 'ftools'
+
+require 'rdoc/options'
+require 'rdoc/template'
+require 'rdoc/markup/simple_markup'
+require 'rdoc/markup/simple_markup/to_flow'
+require 'cgi'
+
+require 'rdoc/ri/ri_cache'
+require 'rdoc/ri/ri_reader'
+require 'rdoc/ri/ri_writer'
+require 'rdoc/ri/ri_descriptions'
+
+module Generators
+
+
+ class RIGenerator
+
+ # Generators may need to return specific subclasses depending
+ # on the options they are passed. Because of this
+ # we create them using a factory
+
+ def RIGenerator.for(options)
+ new(options)
+ end
+
+ class <<self
+ protected :new
+ end
+
+ # Set up a new HTML generator. Basically all we do here is load
+ # up the correct output temlate
+
+ def initialize(options) #:not-new:
+ @options = options
+ @ri_writer = RI::RiWriter.new(".")
+ @markup = SM::SimpleMarkup.new
+ @to_flow = SM::ToFlow.new
+ end
+
+
+ ##
+ # Build the initial indices and output objects
+ # based on an array of TopLevel objects containing
+ # the extracted information.
+
+ def generate(toplevels)
+ RDoc::TopLevel.all_classes_and_modules.each do |cls|
+ process_class(cls)
+ end
+ end
+
+ def process_class(from_class)
+ generate_class_info(from_class)
+
+ # now recure into this classes constituent classess
+ from_class.each_classmodule do |mod|
+ process_class(mod)
+ end
+ end
+
+ def generate_class_info(cls)
+ if cls === RDoc::NormalModule
+ cls_desc = RI::ModuleDescription.new
+ else
+ cls_desc = RI::ClassDescription.new
+ cls_desc.superclass = cls.superclass
+ end
+ cls_desc.name = cls.name
+ cls_desc.full_name = cls.full_name
+ cls_desc.comment = markup(cls.comment)
+
+ cls_desc.attributes =cls.attributes.sort.map do |a|
+ RI::Attribute.new(a.name, a.rw, markup(a.comment))
+ end
+
+ cls_desc.constants = cls.constants.map do |c|
+ RI::Constant.new(c.name, c.value, markup(c.comment))
+ end
+
+ cls_desc.includes = cls.includes.map do |i|
+ RI::IncludedModule.new(i.name)
+ end
+
+ class_methods, instance_methods = method_list(cls)
+
+ cls_desc.class_methods = class_methods.map do |m|
+ RI::MethodSummary.new(m.name)
+ end
+ cls_desc.instance_methods = instance_methods.map do |m|
+ RI::MethodSummary.new(m.name)
+ end
+
+ update_or_replace(cls_desc)
+
+ class_methods.each do |m|
+ generate_method_info(cls_desc, m)
+ end
+
+ instance_methods.each do |m|
+ generate_method_info(cls_desc, m)
+ end
+ end
+
+
+ def generate_method_info(cls_desc, method)
+ meth_desc = RI::MethodDescription.new
+ meth_desc.name = method.name
+ meth_desc.full_name = cls_desc.full_name
+ if method.singleton
+ meth_desc.full_name += "::"
+ else
+ meth_desc.full_name += "#"
+ end
+ meth_desc.full_name << method.name
+
+ meth_desc.comment = markup(method.comment)
+ meth_desc.params = params_of(method)
+ meth_desc.visibility = method.visibility.to_s
+ meth_desc.is_singleton = method.singleton
+ meth_desc.block_params = method.block_params
+
+ meth_desc.aliases = method.aliases.map do |a|
+ RI::AliasName.new(a.name)
+ end
+
+ @ri_writer.add_method(cls_desc, meth_desc)
+ end
+
+ private
+
+ # return a list of class and instance methods that we'll be
+ # documenting
+
+ def method_list(cls)
+ list = cls.method_list
+ unless @options.show_all
+ list = list.find_all do |m|
+ m.visibility == :public || m.visibility == :protected || m.force_documentation
+ end
+ end
+
+ c = []
+ i = []
+ list.sort.each do |m|
+ if m.singleton
+ c << m
+ else
+ i << m
+ end
+ end
+ return c,i
+ end
+
+ def params_of(method)
+ if method.call_seq
+ method.call_seq
+ else
+ params = method.params || ""
+
+ p = params.gsub(/\s*\#.*/, '')
+ p = p.tr("\n", " ").squeeze(" ")
+ p = "(" + p + ")" unless p[0] == ?(
+
+ if (block = method.block_params)
+ block.gsub!(/\s*\#.*/, '')
+ block = block.tr("\n", " ").squeeze(" ")
+ if block[0] == ?(
+ block.sub!(/^\(/, '').sub!(/\)/, '')
+ end
+ p << " {|#{block.strip}| ...}"
+ end
+ p
+ end
+ end
+
+ def markup(comment)
+ return nil if !comment || comment.empty?
+
+ # Convert leading comment markers to spaces, but only
+ # if all non-blank lines have them
+
+ if comment =~ /^(?>\s*)[^\#]/
+ content = comment
+ else
+ content = comment.gsub(/^\s*(#+)/) { $1.tr('#',' ') }
+ end
+ @markup.convert(content, @to_flow)
+ end
+
+
+ # By default we replace existing classes with the
+ # same name. If the --merge option was given, we instead
+ # merge this definition into an existing class. We add
+ # our methods, aliases, etc to that class, but do not
+ # change the class's description.
+
+ def update_or_replace(cls_desc)
+ old_cls = nil
+
+ if @options.merge
+ rdr = RI::RiReader.new(RI::RiCache.new(@options.op_dir))
+
+ namespace = rdr.top_level_namespace
+ namespace = rdr.lookup_namespace_in(cls_desc.name, namespace)
+ if namespace.empty?
+ $stderr.puts "You asked me to merge this source into existing "
+ $stderr.puts "documentation. This file references a class or "
+ $stderr.puts "module called #{cls_desc.name} which I don't"
+ $stderr.puts "have existing documentation for."
+ $stderr.puts
+ $stderr.puts "Perhaps you need to generate its documentation first"
+ exit 1
+ else
+ old_cls = namespace[0]
+ end
+ end
+
+ if old_cls.nil?
+ # no merge: simply overwrite
+ @ri_writer.remove_class(cls_desc)
+ @ri_writer.add_class(cls_desc)
+ else
+ # existing class: merge in
+ old_desc = rdr.get_class(old_cls)
+
+ old_desc.merge_in(cls_desc)
+ @ri_writer.add_class(old_desc)
+ end
+ end
+ end
+end
diff --git a/lib/rdoc/generators/template/chm/chm.rb b/lib/rdoc/generators/template/chm/chm.rb
new file mode 100644
index 0000000000..4a89c26520
--- /dev/null
+++ b/lib/rdoc/generators/template/chm/chm.rb
@@ -0,0 +1,87 @@
+module RDoc
+module Page
+
+require "rdoc/generators/template/html/html"
+
+# This is a nasty little hack, but hhc doesn't support the <?xml
+# tag, so...
+
+BODY.sub!(/<\?xml.*\?>/, '')
+SRC_PAGE.sub!(/<\?xml.*\?>/, '')
+
+HPP_FILE = %{
+[OPTIONS]
+Auto Index = Yes
+Compatibility=1.1 or later
+Compiled file=%opname%.chm
+Contents file=contents.hhc
+Full-text search=Yes
+Index file=index.hhk
+Language=0x409 English(United States)
+Title=%title%
+
+[FILES]
+START:all_html_files
+%html_file_name%
+END:all_html_files
+}
+
+CONTENTS = %{
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<HTML>
+<HEAD>
+<meta name="GENERATOR" content="Microsoft&reg; HTML Help Workshop 4.1">
+<!-- Sitemap 1.0 -->
+</HEAD><BODY>
+<OBJECT type="text/site properties">
+ <param name="Foreground" value="0x80">
+ <param name="Window Styles" value="0x800025">
+ <param name="ImageType" value="Folder">
+</OBJECT>
+<UL>
+START:contents
+ <LI> <OBJECT type="text/sitemap">
+ <param name="Name" value="%c_name%">
+ <param name="Local" value="%ref%">
+ </OBJECT>
+IF:methods
+<ul>
+START:methods
+ <LI> <OBJECT type="text/sitemap">
+ <param name="Name" value="%name%">
+ <param name="Local" value="%aref%">
+ </OBJECT>
+END:methods
+</ul>
+ENDIF:methods
+ </LI>
+END:contents
+</UL>
+</BODY></HTML>
+}
+
+
+CHM_INDEX = %{
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<HTML>
+<HEAD>
+<meta name="GENERATOR" content="Microsoft&reg; HTML Help Workshop 4.1">
+<!-- Sitemap 1.0 -->
+</HEAD><BODY>
+<OBJECT type="text/site properties">
+ <param name="Foreground" value="0x80">
+ <param name="Window Styles" value="0x800025">
+ <param name="ImageType" value="Folder">
+</OBJECT>
+<UL>
+START:index
+ <LI> <OBJECT type="text/sitemap">
+ <param name="Name" value="%name%">
+ <param name="Local" value="%aref%">
+ </OBJECT>
+END:index
+</UL>
+</BODY></HTML>
+}
+end
+end
diff --git a/lib/rdoc/generators/template/html/hefss.rb b/lib/rdoc/generators/template/html/hefss.rb
new file mode 100644
index 0000000000..e68ca85823
--- /dev/null
+++ b/lib/rdoc/generators/template/html/hefss.rb
@@ -0,0 +1,418 @@
+module RDoc
+module Page
+
+
+FONTS = "Verdana, Arial, Helvetica, sans-serif"
+
+STYLE = %{
+body,p { font-family: Verdana, Arial, Helvetica, sans-serif;
+ color: #000040; background: #BBBBBB;
+}
+
+td { font-family: Verdana, Arial, Helvetica, sans-serif;
+ color: #000040;
+}
+
+.attr-rw { font-size: small; color: #444488 }
+
+.title-row {color: #eeeeff;
+ background: #BBBBDD;
+}
+
+.big-title-font { color: white;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: large;
+ height: 50px}
+
+.small-title-font { color: purple;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: small; }
+
+.aqua { color: purple }
+
+.method-name, attr-name {
+ font-family: monospace; font-weight: bold;
+}
+
+.tablesubtitle {
+ width: 100%;
+ margin-top: 1ex;
+ margin-bottom: .5ex;
+ padding: 5px 0px 5px 20px;
+ font-size: large;
+ color: purple;
+ background: #BBBBCC;
+}
+
+.tablesubsubtitle {
+ width: 100%;
+ margin-top: 1ex;
+ margin-bottom: .5ex;
+ padding: 5px 0px 5px 20px;
+ font-size: medium;
+ color: white;
+ background: #BBBBCC;
+}
+
+.name-list {
+ font-family: monospace;
+ margin-left: 40px;
+ margin-bottom: 2ex;
+ line-height: 140%;
+}
+
+.description {
+ margin-left: 40px;
+ margin-bottom: 2ex;
+ line-height: 140%;
+}
+
+.methodtitle {
+ font-size: medium;
+ text_decoration: none;
+ padding: 3px 3px 3px 20px;
+ color: #0000AA;
+}
+
+.column-title {
+ font-size: medium;
+ font-weight: bold;
+ text_decoration: none;
+ padding: 3px 3px 3px 20px;
+ color: #3333CC;
+ }
+
+.variable-name {
+ font-family: monospace;
+ font-size: medium;
+ text_decoration: none;
+ padding: 3px 3px 3px 20px;
+ color: #0000AA;
+}
+
+.row-name {
+ font-size: medium;
+ font-weight: medium;
+ font-family: monospace;
+ text_decoration: none;
+ padding: 3px 3px 3px 20px;
+}
+
+.paramsig {
+ font-size: small;
+}
+
+.srcbut { float: right }
+
+}
+
+
+############################################################################
+
+
+BODY = %{
+<html><head>
+ <title>%title%</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=%charset%">
+ <link rel="stylesheet" href="%style_url%" type="text/css" media="screen" />
+ <script type="text/javascript" language="JavaScript">
+ <!--
+ function popCode(url) {
+ parent.frames.source.location = url
+ }
+ //-->
+ </script>
+</head>
+<body bgcolor="#BBBBBB">
+
+!INCLUDE! <!-- banner header -->
+
+IF:diagram
+<table width="100%"><tr><td align="center">
+%diagram%
+</td></tr></table>
+ENDIF:diagram
+
+IF:description
+<div class="description">%description%</div>
+ENDIF:description
+
+IF:requires
+<table cellpadding="5" width="100%">
+<tr><td class="tablesubtitle">Required files</td></tr>
+</table><br />
+<div class="name-list">
+START:requires
+HREF:aref:name:
+END:requires
+ENDIF:requires
+</div>
+
+IF:methods
+<table cellpadding="5" width="100%">
+<tr><td class="tablesubtitle">Subroutines and Functions</td></tr>
+</table><br />
+<div class="name-list">
+START:methods
+HREF:aref:name:,
+END:methods
+</div>
+ENDIF:methods
+
+IF:attributes
+<table cellpadding="5" width="100%">
+<tr><td class="tablesubtitle">Arguments</td></tr>
+</table><br />
+<table cellspacing="5">
+START:attributes
+ <tr valign="top">
+IF:rw
+ <td align="center" class="attr-rw">&nbsp;[%rw%]&nbsp;</td>
+ENDIF:rw
+IFNOT:rw
+ <td></td>
+ENDIF:rw
+ <td class="attr-name">%name%</td>
+ <td>%a_desc%</td>
+ </tr>
+END:attributes
+</table>
+ENDIF:attributes
+
+IF:classlist
+<table cellpadding="5" width="100%">
+<tr><td class="tablesubtitle">Modules</td></tr>
+</table><br />
+%classlist%<br />
+ENDIF:classlist
+
+ !INCLUDE! <!-- method descriptions -->
+
+</body>
+</html>
+}
+
+###############################################################################
+
+FILE_PAGE = <<_FILE_PAGE_
+<table width="100%">
+ <tr class="title-row">
+ <td><table width="100%"><tr>
+ <td class="big-title-font" colspan="2"><font size="-3"><b>File</b><br /></font>%short_name%</td>
+ <td align="right"><table cellspacing="0" cellpadding="2">
+ <tr>
+ <td class="small-title-font">Path:</td>
+ <td class="small-title-font">%full_path%
+IF:cvsurl
+ &nbsp;(<a href="%cvsurl%"><acronym title="Concurrent Versioning System">CVS</acronym></a>)
+ENDIF:cvsurl
+ </td>
+ </tr>
+ <tr>
+ <td class="small-title-font">Modified:</td>
+ <td class="small-title-font">%dtm_modified%</td>
+ </tr>
+ </table>
+ </td></tr></table></td>
+ </tr>
+</table><br />
+_FILE_PAGE_
+
+###################################################################
+
+CLASS_PAGE = %{
+<table width="100%" border="0" cellspacing="0">
+ <tr class="title-row">
+ <td class="big-title-font">
+ <font size="-3"><b>%classmod%</b><br /></font>%full_name%
+ </td>
+ <td align="right">
+ <table cellspacing="0" cellpadding="2">
+ <tr valign="top">
+ <td class="small-title-font">In:</td>
+ <td class="small-title-font">
+START:infiles
+HREF:full_path_url:full_path:
+IF:cvsurl
+&nbsp;(<a href="%cvsurl%"><acronym title="Concurrent Versioning System">CVS</acronym></a>)
+ENDIF:cvsurl
+END:infiles
+ </td>
+ </tr>
+IF:parent
+ <tr>
+ <td class="small-title-font">Parent:</td>
+ <td class="small-title-font">
+IF:par_url
+ <a href="%par_url%" class="cyan">
+ENDIF:par_url
+%parent%
+IF:par_url
+ </a>
+ENDIF:par_url
+ </td>
+ </tr>
+ENDIF:parent
+ </table>
+ </td>
+ </tr>
+</table><br />
+}
+
+###################################################################
+
+METHOD_LIST = %{
+IF:includes
+<div class="tablesubsubtitle">Uses</div><br />
+<div class="name-list">
+START:includes
+ <span class="method-name">HREF:aref:name:</span>
+END:includes
+</div>
+ENDIF:includes
+
+IF:method_list
+START:method_list
+IF:methods
+<table cellpadding="5" width="100%">
+<tr><td class="tablesubtitle">%type% %category% methods</td></tr>
+</table>
+START:methods
+<table width="100%" cellspacing="0" cellpadding="5" border="0">
+<tr><td class="methodtitle">
+<a name="%aref%">
+<b>%name%</b>%params%
+IF:codeurl
+<a href="%codeurl%" target="source" class="srclink">src</a>
+ENDIF:codeurl
+</a></td></tr>
+</table>
+IF:m_desc
+<div class="description">
+%m_desc%
+</div>
+ENDIF:m_desc
+END:methods
+ENDIF:methods
+END:method_list
+ENDIF:method_list
+}
+
+=begin
+=end
+
+########################## Source code ##########################
+
+SRC_PAGE = %{
+<html>
+<head><title>%title%</title>
+<meta http-equiv="Content-Type" content="text/html; charset=%charset%">
+<style type="text/css">
+ .kw { color: #3333FF; font-weight: bold }
+ .cmt { color: green; font-style: italic }
+ .str { color: #662222; font-style: italic }
+ .re { color: #662222; }
+.ruby-comment { color: green; font-style: italic }
+.ruby-constant { color: #4433aa; font-weight: bold; }
+.ruby-identifier { color: #222222; }
+.ruby-ivar { color: #2233dd; }
+.ruby-keyword { color: #3333FF; font-weight: bold }
+.ruby-node { color: #777777; }
+.ruby-operator { color: #111111; }
+.ruby-regexp { color: #662222; }
+.ruby-value { color: #662222; font-style: italic }
+</style>
+</head>
+<body bgcolor="#BBBBBB">
+<pre>%code%</pre>
+</body>
+</html>
+}
+
+########################## Index ################################
+
+FR_INDEX_BODY = %{
+!INCLUDE!
+}
+
+FILE_INDEX = %{
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=%charset%">
+<style type="text/css">
+<!--
+ body {
+background-color: #bbbbbb;
+ font-family: #{FONTS};
+ font-size: 11px;
+ font-style: normal;
+ line-height: 14px;
+ color: #000040;
+ }
+div.banner {
+ background: #bbbbcc;
+ color: white;
+ padding: 1;
+ margin: 0;
+ font-size: 90%;
+ font-weight: bold;
+ line-height: 1.1;
+ text-align: center;
+ width: 100%;
+}
+
+-->
+</style>
+<base target="docwin">
+</head>
+<body>
+<div class="banner">%list_title%</div>
+START:entries
+<a href="%href%">%name%</a><br />
+END:entries
+</body></html>
+}
+
+CLASS_INDEX = FILE_INDEX
+METHOD_INDEX = FILE_INDEX
+
+INDEX = %{
+<html>
+<head>
+ <title>%title%</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=%charset%">
+</head>
+
+<frameset cols="20%,*">
+ <frameset rows="15%,35%,50%">
+ <frame src="fr_file_index.html" title="Files" name="Files">
+ <frame src="fr_class_index.html" name="Modules">
+ <frame src="fr_method_index.html" name="Subroutines and Functions">
+ </frameset>
+ <frameset rows="80%,20%">
+ <frame src="%initial_page%" name="docwin">
+ <frame src="blank.html" name="source">
+ </frameset>
+ <noframes>
+ <body bgcolor="#BBBBBB">
+ Click <a href="html/index.html">here</a> for a non-frames
+ version of this page.
+ </body>
+ </noframes>
+</frameset>
+
+</html>
+}
+
+# and a blank page to use as a target
+BLANK = %{
+<html><body bgcolor="#BBBBBB"></body></html>
+}
+
+def write_extra_pages
+ template = TemplatePage.new(BLANK)
+ File.open("blank.html", "w") { |f| template.write_html_on(f, {}) }
+end
+
+end
+end
diff --git a/lib/rdoc/generators/template/html/html.rb b/lib/rdoc/generators/template/html/html.rb
new file mode 100644
index 0000000000..7f9e599465
--- /dev/null
+++ b/lib/rdoc/generators/template/html/html.rb
@@ -0,0 +1,711 @@
+#
+# = CSS2 RDoc HTML template
+#
+# This is a template for RDoc that uses XHTML 1.0 Transitional and dictates a
+# bit more of the appearance of the output to cascading stylesheets than the
+# default. It was designed for clean inline code display, and uses DHTMl to
+# toggle the visbility of each method's source with each click on the '[source]'
+# link.
+#
+# == Authors
+#
+# * Michael Granger <ged@FaerieMUD.org>
+#
+# Copyright (c) 2002, 2003 The FaerieMUD Consortium. Some rights reserved.
+#
+# This work is licensed under the Creative Commons Attribution License. To view
+# a copy of this license, visit http://creativecommons.org/licenses/by/1.0/ or
+# send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California
+# 94305, USA.
+#
+
+module RDoc
+ module Page
+
+ FONTS = "Verdana,Arial,Helvetica,sans-serif"
+
+STYLE = %{
+body {
+ font-family: Verdana,Arial,Helvetica,sans-serif;
+ font-size: 90%;
+ margin: 0;
+ margin-left: 40px;
+ padding: 0;
+ background: white;
+}
+
+h1,h2,h3,h4 { margin: 0; color: #efefef; background: transparent; }
+h1 { font-size: 150%; }
+h2,h3,h4 { margin-top: 1em; }
+
+a { background: #eef; color: #039; text-decoration: none; }
+a:hover { background: #039; color: #eef; }
+
+/* Override the base stylesheet's Anchor inside a table cell */
+td > a {
+ background: transparent;
+ color: #039;
+ text-decoration: none;
+}
+
+/* and inside a section title */
+.section-title > a {
+ background: transparent;
+ color: #eee;
+ text-decoration: none;
+}
+
+/* === Structural elements =================================== */
+
+div#index {
+ margin: 0;
+ margin-left: -40px;
+ padding: 0;
+ font-size: 90%;
+}
+
+
+div#index a {
+ margin-left: 0.7em;
+}
+
+div#index .section-bar {
+ margin-left: 0px;
+ padding-left: 0.7em;
+ background: #ccc;
+ font-size: small;
+}
+
+
+div#classHeader, div#fileHeader {
+ width: auto;
+ color: white;
+ padding: 0.5em 1.5em 0.5em 1.5em;
+ margin: 0;
+ margin-left: -40px;
+ border-bottom: 3px solid #006;
+}
+
+div#classHeader a, div#fileHeader a {
+ background: inherit;
+ color: white;
+}
+
+div#classHeader td, div#fileHeader td {
+ background: inherit;
+ color: white;
+}
+
+
+div#fileHeader {
+ background: #057;
+}
+
+div#classHeader {
+ background: #048;
+}
+
+
+.class-name-in-header {
+ font-size: 180%;
+ font-weight: bold;
+}
+
+
+div#bodyContent {
+ padding: 0 1.5em 0 1.5em;
+}
+
+div#description {
+ padding: 0.5em 1.5em;
+ background: #efefef;
+ border: 1px dotted #999;
+}
+
+div#description h1,h2,h3,h4,h5,h6 {
+ color: #125;;
+ background: transparent;
+}
+
+div#validator-badges {
+ text-align: center;
+}
+div#validator-badges img { border: 0; }
+
+div#copyright {
+ color: #333;
+ background: #efefef;
+ font: 0.75em sans-serif;
+ margin-top: 5em;
+ margin-bottom: 0;
+ padding: 0.5em 2em;
+}
+
+
+/* === Classes =================================== */
+
+table.header-table {
+ color: white;
+ font-size: small;
+}
+
+.type-note {
+ font-size: small;
+ color: #DEDEDE;
+}
+
+.xxsection-bar {
+ background: #eee;
+ color: #333;
+ padding: 3px;
+}
+
+.section-bar {
+ color: #333;
+ border-bottom: 1px solid #999;
+ margin-left: -20px;
+}
+
+
+.section-title {
+ background: #79a;
+ color: #eee;
+ padding: 3px;
+ margin-top: 2em;
+ margin-left: -30px;
+ border: 1px solid #999;
+}
+
+.top-aligned-row { vertical-align: top }
+.bottom-aligned-row { vertical-align: bottom }
+
+/* --- Context section classes ----------------------- */
+
+.context-row { }
+.context-item-name { font-family: monospace; font-weight: bold; color: black; }
+.context-item-value { font-size: small; color: #448; }
+.context-item-desc { color: #333; padding-left: 2em; }
+
+/* --- Method classes -------------------------- */
+.method-detail {
+ background: #efefef;
+ padding: 0;
+ margin-top: 0.5em;
+ margin-bottom: 1em;
+ border: 1px dotted #ccc;
+}
+.method-heading {
+ color: black;
+ background: #ccc;
+ border-bottom: 1px solid #666;
+ padding: 0.2em 0.5em 0 0.5em;
+}
+.method-signature { color: black; background: inherit; }
+.method-name { font-weight: bold; }
+.method-args { font-style: italic; }
+.method-description { padding: 0 0.5em 0 0.5em; }
+
+/* --- Source code sections -------------------- */
+
+a.source-toggle { font-size: 90%; }
+div.method-source-code {
+ background: #262626;
+ color: #ffdead;
+ margin: 1em;
+ padding: 0.5em;
+ border: 1px dashed #999;
+ overflow: hidden;
+}
+
+div.method-source-code pre { color: #ffdead; overflow: hidden; }
+
+/* --- Ruby keyword styles --------------------- */
+
+.standalone-code { background: #221111; color: #ffdead; overflow: hidden; }
+
+.ruby-constant { color: #7fffd4; background: transparent; }
+.ruby-keyword { color: #00ffff; background: transparent; }
+.ruby-ivar { color: #eedd82; background: transparent; }
+.ruby-operator { color: #00ffee; background: transparent; }
+.ruby-identifier { color: #ffdead; background: transparent; }
+.ruby-node { color: #ffa07a; background: transparent; }
+.ruby-comment { color: #b22222; font-weight: bold; background: transparent; }
+.ruby-regexp { color: #ffa07a; background: transparent; }
+.ruby-value { color: #7fffd4; background: transparent; }
+}
+
+
+#####################################################################
+### H E A D E R T E M P L A T E
+#####################################################################
+
+XHTML_PREAMBLE = %{<?xml version="1.0" encoding="%charset%"?>
+<!DOCTYPE html
+ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+}
+
+HEADER = XHTML_PREAMBLE + %{
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+ <title>%title%</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=%charset%" />
+ <meta http-equiv="Content-Script-Type" content="text/javascript" />
+ <link rel="stylesheet" href="%style_url%" type="text/css" media="screen" />
+ <script type="text/javascript">
+ // <![CDATA[
+
+ function popupCode( url ) {
+ window.open(url, "Code", "resizable=yes,scrollbars=yes,toolbar=no,status=no,height=150,width=400")
+ }
+
+ function toggleCode( id ) {
+ if ( document.getElementById )
+ elem = document.getElementById( id );
+ else if ( document.all )
+ elem = eval( "document.all." + id );
+ else
+ return false;
+
+ elemStyle = elem.style;
+
+ if ( elemStyle.display != "block" ) {
+ elemStyle.display = "block"
+ } else {
+ elemStyle.display = "none"
+ }
+
+ return true;
+ }
+
+ // Make codeblocks hidden by default
+ document.writeln( "<style type=\\"text/css\\">div.method-source-code { display: none }</style>" )
+
+ // ]]>
+ </script>
+
+</head>
+<body>
+}
+
+
+#####################################################################
+### C O N T E X T C O N T E N T T E M P L A T E
+#####################################################################
+
+CONTEXT_CONTENT = %{
+}
+
+
+#####################################################################
+### F O O T E R T E M P L A T E
+#####################################################################
+FOOTER = %{
+<div id="validator-badges">
+ <p><small><a href="http://validator.w3.org/check/referer">[Validate]</a></small></p>
+</div>
+
+</body>
+</html>
+}
+
+
+#####################################################################
+### F I L E P A G E H E A D E R T E M P L A T E
+#####################################################################
+
+FILE_PAGE = %{
+ <div id="fileHeader">
+ <h1>%short_name%</h1>
+ <table class="header-table">
+ <tr class="top-aligned-row">
+ <td><strong>Path:</strong></td>
+ <td>%full_path%
+IF:cvsurl
+ &nbsp;(<a href="%cvsurl%"><acronym title="Concurrent Versioning System">CVS</acronym></a>)
+ENDIF:cvsurl
+ </td>
+ </tr>
+ <tr class="top-aligned-row">
+ <td><strong>Last Update:</strong></td>
+ <td>%dtm_modified%</td>
+ </tr>
+ </table>
+ </div>
+}
+
+
+#####################################################################
+### C L A S S P A G E H E A D E R T E M P L A T E
+#####################################################################
+
+CLASS_PAGE = %{
+ <div id="classHeader">
+ <table class="header-table">
+ <tr class="top-aligned-row">
+ <td><strong>%classmod%</strong></td>
+ <td class="class-name-in-header">%full_name%</td>
+ </tr>
+ <tr class="top-aligned-row">
+ <td><strong>In:</strong></td>
+ <td>
+START:infiles
+IF:full_path_url
+ <a href="%full_path_url%">
+ENDIF:full_path_url
+ %full_path%
+IF:full_path_url
+ </a>
+ENDIF:full_path_url
+IF:cvsurl
+ &nbsp;(<a href="%cvsurl%"><acronym title="Concurrent Versioning System">CVS</acronym></a>)
+ENDIF:cvsurl
+ <br />
+END:infiles
+ </td>
+ </tr>
+
+IF:parent
+ <tr class="top-aligned-row">
+ <td><strong>Parent:</strong></td>
+ <td>
+IF:par_url
+ <a href="%par_url%">
+ENDIF:par_url
+ %parent%
+IF:par_url
+ </a>
+ENDIF:par_url
+ </td>
+ </tr>
+ENDIF:parent
+ </table>
+ </div>
+}
+
+
+#####################################################################
+### M E T H O D L I S T T E M P L A T E
+#####################################################################
+
+METHOD_LIST = %{
+
+ <div id="contextContent">
+IF:diagram
+ <div id="diagram">
+ %diagram%
+ </div>
+ENDIF:diagram
+
+IF:description
+ <div id="description">
+ %description%
+ </div>
+ENDIF:description
+
+IF:requires
+ <div id="requires-list">
+ <h3 class="section-bar">Required files</h3>
+
+ <div class="name-list">
+START:requires
+ HREF:aref:name:&nbsp;&nbsp;
+END:requires
+ </div>
+ </div>
+ENDIF:requires
+
+IF:toc
+ <div id="contents-list">
+ <h3 class="section-bar">Contents</h3>
+ <ul>
+START:toc
+ <li><a href="#%href%">%secname%</a></li>
+END:toc
+ </ul>
+ENDIF:toc
+ </div>
+
+IF:methods
+ <div id="method-list">
+ <h3 class="section-bar">Methods</h3>
+
+ <div class="name-list">
+START:methods
+ HREF:aref:name:&nbsp;&nbsp;
+END:methods
+ </div>
+ </div>
+ENDIF:methods
+
+ </div>
+
+
+ <!-- if includes -->
+IF:includes
+ <div id="includes">
+ <h3 class="section-bar">Included Modules</h3>
+
+ <div id="includes-list">
+START:includes
+ <span class="include-name">HREF:aref:name:</span>
+END:includes
+ </div>
+ </div>
+ENDIF:includes
+
+START:sections
+ <div id="section">
+IF:sectitle
+ <h2 class="section-title"><a name="%secsequence%">%sectitle%</a></h2>
+IF:seccomment
+ <div class="section-comment">
+ %seccomment%
+ </div>
+ENDIF:seccomment
+ENDIF:sectitle
+
+IF:classlist
+ <div id="class-list">
+ <h3 class="section-bar">Classes and Modules</h3>
+
+ %classlist%
+ </div>
+ENDIF:classlist
+
+IF:constants
+ <div id="constants-list">
+ <h3 class="section-bar">Constants</h3>
+
+ <div class="name-list">
+ <table summary="Constants">
+START:constants
+ <tr class="top-aligned-row context-row">
+ <td class="context-item-name">%name%</td>
+ <td>=</td>
+ <td class="context-item-value">%value%</td>
+IF:desc
+ <td width="3em">&nbsp;</td>
+ <td class="context-item-desc">%desc%</td>
+ENDIF:desc
+ </tr>
+END:constants
+ </table>
+ </div>
+ </div>
+ENDIF:constants
+
+IF:aliases
+ <div id="aliases-list">
+ <h3 class="section-bar">External Aliases</h3>
+
+ <div class="name-list">
+ <table summary="aliases">
+START:aliases
+ <tr class="top-aligned-row context-row">
+ <td class="context-item-name">%old_name%</td>
+ <td>-&gt;</td>
+ <td class="context-item-value">%new_name%</td>
+ </tr>
+IF:desc
+ <tr class="top-aligned-row context-row">
+ <td>&nbsp;</td>
+ <td colspan="2" class="context-item-desc">%desc%</td>
+ </tr>
+ENDIF:desc
+END:aliases
+ </table>
+ </div>
+ </div>
+ENDIF:aliases
+
+
+IF:attributes
+ <div id="attribute-list">
+ <h3 class="section-bar">Attributes</h3>
+
+ <div class="name-list">
+ <table>
+START:attributes
+ <tr class="top-aligned-row context-row">
+ <td class="context-item-name">%name%</td>
+IF:rw
+ <td class="context-item-value">&nbsp;[%rw%]&nbsp;</td>
+ENDIF:rw
+IFNOT:rw
+ <td class="context-item-value">&nbsp;&nbsp;</td>
+ENDIF:rw
+ <td class="context-item-desc">%a_desc%</td>
+ </tr>
+END:attributes
+ </table>
+ </div>
+ </div>
+ENDIF:attributes
+
+
+
+ <!-- if method_list -->
+IF:method_list
+ <div id="methods">
+START:method_list
+IF:methods
+ <h3 class="section-bar">%type% %category% methods</h3>
+
+START:methods
+ <div id="method-%aref%" class="method-detail">
+ <a name="%aref%"></a>
+
+ <div class="method-heading">
+IF:codeurl
+ <a href="%codeurl%" target="Code" class="method-signature"
+ onclick="popupCode('%codeurl%');return false;">
+ENDIF:codeurl
+IF:sourcecode
+ <a href="#%aref%" class="method-signature">
+ENDIF:sourcecode
+IF:callseq
+ <span class="method-name">%callseq%</span>
+ENDIF:callseq
+IFNOT:callseq
+ <span class="method-name">%name%</span><span class="method-args">%params%</span>
+ENDIF:callseq
+IF:codeurl
+ </a>
+ENDIF:codeurl
+IF:sourcecode
+ </a>
+ENDIF:sourcecode
+ </div>
+
+ <div class="method-description">
+IF:m_desc
+ %m_desc%
+ENDIF:m_desc
+IF:sourcecode
+ <p><a class="source-toggle" href="#"
+ onclick="toggleCode('%aref%-source');return false;">[Source]</a></p>
+ <div class="method-source-code" id="%aref%-source">
+<pre>
+%sourcecode%
+</pre>
+ </div>
+ENDIF:sourcecode
+ </div>
+ </div>
+
+END:methods
+ENDIF:methods
+END:method_list
+
+ </div>
+ENDIF:method_list
+END:sections
+}
+
+
+#####################################################################
+### B O D Y T E M P L A T E
+#####################################################################
+
+BODY = HEADER + %{
+
+!INCLUDE! <!-- banner header -->
+
+ <div id="bodyContent">
+
+} + METHOD_LIST + %{
+
+ </div>
+
+} + FOOTER
+
+
+
+#####################################################################
+### S O U R C E C O D E T E M P L A T E
+#####################################################################
+
+SRC_PAGE = XHTML_PREAMBLE + %{
+<html>
+<head>
+ <title>%title%</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=%charset%" />
+ <link rel="stylesheet" href="%style_url%" type="text/css" media="screen" />
+</head>
+<body class="standalone-code">
+ <pre>%code%</pre>
+</body>
+</html>
+}
+
+
+#####################################################################
+### I N D E X F I L E T E M P L A T E S
+#####################################################################
+
+FR_INDEX_BODY = %{
+!INCLUDE!
+}
+
+FILE_INDEX = XHTML_PREAMBLE + %{
+<!--
+
+ %list_title%
+
+ -->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+ <title>%list_title%</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=%charset%" />
+ <link rel="stylesheet" href="%style_url%" type="text/css" />
+ <base target="docwin" />
+</head>
+<body>
+<div id="index">
+ <h1 class="section-bar">%list_title%</h1>
+ <div id="index-entries">
+START:entries
+ <a href="%href%">%name%</a><br />
+END:entries
+ </div>
+</div>
+</body>
+</html>
+}
+
+CLASS_INDEX = FILE_INDEX
+METHOD_INDEX = FILE_INDEX
+
+INDEX = %{<?xml version="1.0" encoding="%charset%"?>
+<!DOCTYPE html
+ PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
+
+<!--
+
+ %title%
+
+ -->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+ <title>%title%</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=%charset%" />
+</head>
+<frameset rows="20%, 80%">
+ <frameset cols="25%,35%,45%">
+ <frame src="fr_file_index.html" title="Files" name="Files" />
+ <frame src="fr_class_index.html" name="Classes" />
+ <frame src="fr_method_index.html" name="Methods" />
+ </frameset>
+ <frame src="%initial_page%" name="docwin" />
+</frameset>
+</html>
+}
+
+
+
+ end # module Page
+end # class RDoc
+
+require 'rdoc/generators/template/html/one_page_html'
diff --git a/lib/rdoc/generators/template/html/kilmer.rb b/lib/rdoc/generators/template/html/kilmer.rb
new file mode 100644
index 0000000000..55071fc026
--- /dev/null
+++ b/lib/rdoc/generators/template/html/kilmer.rb
@@ -0,0 +1,435 @@
+module RDoc
+module Page
+
+
+FONTS = "Verdana, Arial, Helvetica, sans-serif"
+
+STYLE = %{
+body,td,p { font-family: %fonts%;
+ color: #000040;
+}
+
+.attr-rw { font-size: xx-small; color: #444488 }
+
+.title-row { background-color: #CCCCFF;
+ color: #000010;
+}
+
+.big-title-font {
+ color: black;
+ font-weight: bold;
+ font-family: %fonts%;
+ font-size: large;
+ height: 60px;
+ padding: 10px 3px 10px 3px;
+}
+
+.small-title-font { color: black;
+ font-family: %fonts%;
+ font-size:10; }
+
+.aqua { color: black }
+
+.method-name, .attr-name {
+ font-family: font-family: %fonts%;
+ font-weight: bold;
+ font-size: small;
+ margin-left: 20px;
+ color: #000033;
+}
+
+.tablesubtitle, .tablesubsubtitle {
+ width: 100%;
+ margin-top: 1ex;
+ margin-bottom: .5ex;
+ padding: 5px 0px 5px 3px;
+ font-size: large;
+ color: black;
+ background-color: #CCCCFF;
+ border: thin;
+}
+
+.name-list {
+ margin-left: 5px;
+ margin-bottom: 2ex;
+ line-height: 105%;
+}
+
+.description {
+ margin-left: 5px;
+ margin-bottom: 2ex;
+ line-height: 105%;
+ font-size: small;
+}
+
+.methodtitle {
+ font-size: small;
+ font-weight: bold;
+ text-decoration: none;
+ color: #000033;
+ background-color: white;
+}
+
+.srclink {
+ font-size: small;
+ font-weight: bold;
+ text-decoration: none;
+ color: #0000DD;
+ background-color: white;
+}
+
+.paramsig {
+ font-size: small;
+}
+
+.srcbut { float: right }
+
+}
+
+
+############################################################################
+
+
+BODY = %{
+<html><head>
+ <title>%title%</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=%charset%">
+ <link rel="stylesheet" href="%style_url%" type="text/css" media="screen" />
+ <script type="text/javascript" language="JavaScript">
+ <!--
+ function popCode(url) {
+ parent.frames.source.location = url
+ }
+ //-->
+ </script>
+</head>
+<body bgcolor="white">
+
+!INCLUDE! <!-- banner header -->
+
+IF:diagram
+<table width="100%"><tr><td align="center">
+%diagram%
+</td></tr></table>
+ENDIF:diagram
+
+IF:description
+<div class="description">%description%</div>
+ENDIF:description
+
+IF:requires
+<table cellpadding="5" width="100%">
+<tr><td class="tablesubtitle">Required files</td></tr>
+</table><br />
+<div class="name-list">
+START:requires
+HREF:aref:name:
+END:requires
+ENDIF:requires
+</div>
+
+IF:methods
+<table cellpadding="5" width="100%">
+<tr><td class="tablesubtitle">Methods</td></tr>
+</table><br />
+<div class="name-list">
+START:methods
+HREF:aref:name:,
+END:methods
+</div>
+ENDIF:methods
+
+
+START:sections
+ <div id="section">
+IF:sectitle
+ <h2 class="section-title"><a name="%secsequence%">%sectitle%</a></h2>
+IF:seccomment
+ <div class="section-comment">
+ %seccomment%
+ </div>
+ENDIF:seccomment
+ENDIF:sectitle
+
+IF:attributes
+<table cellpadding="5" width="100%">
+<tr><td class="tablesubtitle">Attributes</td></tr>
+</table><br />
+<table cellspacing="5">
+START:attributes
+ <tr valign="top">
+IF:rw
+ <td align="center" class="attr-rw">&nbsp;[%rw%]&nbsp;</td>
+ENDIF:rw
+IFNOT:rw
+ <td></td>
+ENDIF:rw
+ <td class="attr-name">%name%</td>
+ <td>%a_desc%</td>
+ </tr>
+END:attributes
+</table>
+ENDIF:attributes
+
+IF:classlist
+<table cellpadding="5" width="100%">
+<tr><td class="tablesubtitle">Classes and Modules</td></tr>
+</table><br />
+%classlist%<br />
+ENDIF:classlist
+
+ !INCLUDE! <!-- method descriptions -->
+
+END:sections
+
+</body>
+</html>
+}
+
+###############################################################################
+
+FILE_PAGE = <<_FILE_PAGE_
+<table width="100%">
+ <tr class="title-row">
+ <td><table width="100%"><tr>
+ <td class="big-title-font" colspan="2"><font size="-3"><b>File</b><br /></font>%short_name%</td>
+ <td align="right"><table cellspacing="0" cellpadding="2">
+ <tr>
+ <td class="small-title-font">Path:</td>
+ <td class="small-title-font">%full_path%
+IF:cvsurl
+ &nbsp;(<a href="%cvsurl%"><acronym title="Concurrent Versioning System">CVS</acronym></a>)
+ENDIF:cvsurl
+ </td>
+ </tr>
+ <tr>
+ <td class="small-title-font">Modified:</td>
+ <td class="small-title-font">%dtm_modified%</td>
+ </tr>
+ </table>
+ </td></tr></table></td>
+ </tr>
+</table><br />
+_FILE_PAGE_
+
+###################################################################
+
+CLASS_PAGE = %{
+<table width="100%" border="0" cellspacing="0">
+ <tr class="title-row">
+ <td class="big-title-font">
+ <font size="-3"><b>%classmod%</b><br /></font>%full_name%
+ </td>
+ <td align="right">
+ <table cellspacing="0" cellpadding="2">
+ <tr valign="top">
+ <td class="small-title-font">In:</td>
+ <td class="small-title-font">
+START:infiles
+HREF:full_path_url:full_path:
+IF:cvsurl
+&nbsp;(<a href="%cvsurl%"><acronym title="Concurrent Versioning System">CVS</acronym></a>)
+ENDIF:cvsurl
+END:infiles
+ </td>
+ </tr>
+IF:parent
+ <tr>
+ <td class="small-title-font">Parent:</td>
+ <td class="small-title-font">
+IF:par_url
+ <a href="%par_url%" class="cyan">
+ENDIF:par_url
+%parent%
+IF:par_url
+ </a>
+ENDIF:par_url
+ </td>
+ </tr>
+ENDIF:parent
+ </table>
+ </td>
+ </tr>
+</table><br />
+}
+
+###################################################################
+
+METHOD_LIST = %{
+IF:includes
+<div class="tablesubsubtitle">Included modules</div><br />
+<div class="name-list">
+START:includes
+ <span class="method-name">HREF:aref:name:</span>
+END:includes
+</div>
+ENDIF:includes
+
+IF:method_list
+START:method_list
+IF:methods
+<table cellpadding=5 width="100%">
+<tr><td class="tablesubtitle">%type% %category% methods</td></tr>
+</table>
+START:methods
+<table width="100%" cellspacing="0" cellpadding="5" border="0">
+<tr><td class="methodtitle">
+<a name="%aref%">
+IF:callseq
+<b>%callseq%</b>
+ENDIF:callseq
+IFNOT:callseq
+ <b>%name%</b>%params%
+ENDIF:callseq
+IF:codeurl
+<a href="%codeurl%" target="source" class="srclink">src</a>
+ENDIF:codeurl
+</a></td></tr>
+</table>
+IF:m_desc
+<div class="description">
+%m_desc%
+</div>
+ENDIF:m_desc
+IF:aka
+<div class="aka">
+This method is also aliased as
+START:aka
+<a href="%aref%">%name%</a>
+END:aka
+</div>
+ENDIF:aka
+IF:sourcecode
+<pre class="source">
+%sourcecode%
+</pre>
+ENDIF:sourcecode
+END:methods
+ENDIF:methods
+END:method_list
+ENDIF:method_list
+}
+
+=begin
+=end
+
+########################## Source code ##########################
+
+SRC_PAGE = %{
+<html>
+<head><title>%title%</title>
+<meta http-equiv="Content-Type" content="text/html; charset=%charset%">
+<style type="text/css">
+.ruby-comment { color: green; font-style: italic }
+.ruby-constant { color: #4433aa; font-weight: bold; }
+.ruby-identifier { color: #222222; }
+.ruby-ivar { color: #2233dd; }
+.ruby-keyword { color: #3333FF; font-weight: bold }
+.ruby-node { color: #777777; }
+.ruby-operator { color: #111111; }
+.ruby-regexp { color: #662222; }
+.ruby-value { color: #662222; font-style: italic }
+ .kw { color: #3333FF; font-weight: bold }
+ .cmt { color: green; font-style: italic }
+ .str { color: #662222; font-style: italic }
+ .re { color: #662222; }
+</style>
+</head>
+<body bgcolor="white">
+<pre>%code%</pre>
+</body>
+</html>
+}
+
+########################## Index ################################
+
+FR_INDEX_BODY = %{
+!INCLUDE!
+}
+
+FILE_INDEX = %{
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=%charset%">
+<style>
+<!--
+ body {
+background-color: #ddddff;
+ font-family: #{FONTS};
+ font-size: 11px;
+ font-style: normal;
+ line-height: 14px;
+ color: #000040;
+ }
+div.banner {
+ background: #0000aa;
+ color: white;
+ padding: 1;
+ margin: 0;
+ font-size: 90%;
+ font-weight: bold;
+ line-height: 1.1;
+ text-align: center;
+ width: 100%;
+}
+
+-->
+</style>
+<base target="docwin">
+</head>
+<body>
+<div class="banner">%list_title%</div>
+START:entries
+<a href="%href%">%name%</a><br />
+END:entries
+</body></html>
+}
+
+CLASS_INDEX = FILE_INDEX
+METHOD_INDEX = FILE_INDEX
+
+INDEX = %{
+<html>
+<head>
+ <title>%title%</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=%charset%">
+</head>
+
+<frameset cols="20%,*">
+ <frameset rows="15%,35%,50%">
+ <frame src="fr_file_index.html" title="Files" name="Files">
+ <frame src="fr_class_index.html" name="Classes">
+ <frame src="fr_method_index.html" name="Methods">
+ </frameset>
+IF:inline_source
+ <frame src="%initial_page%" name="docwin">
+ENDIF:inline_source
+IFNOT:inline_source
+ <frameset rows="80%,20%">
+ <frame src="%initial_page%" name="docwin">
+ <frame src="blank.html" name="source">
+ </frameset>
+ENDIF:inline_source
+ <noframes>
+ <body bgcolor="white">
+ Click <a href="html/index.html">here</a> for a non-frames
+ version of this page.
+ </body>
+ </noframes>
+</frameset>
+
+</html>
+}
+
+# and a blank page to use as a target
+BLANK = %{
+<html><body bgcolor="white"></body></html>
+}
+
+def write_extra_pages
+ template = TemplatePage.new(BLANK)
+ File.open("blank.html", "w") { |f| template.write_html_on(f, {}) }
+end
+
+end
+end
diff --git a/lib/rdoc/generators/template/html/old_html.rb b/lib/rdoc/generators/template/html/old_html.rb
new file mode 100644
index 0000000000..ca66302a08
--- /dev/null
+++ b/lib/rdoc/generators/template/html/old_html.rb
@@ -0,0 +1,728 @@
+module RDoc
+
+# This is how you define the HTML that RDoc generates. Simply create
+# a file in rdoc/generators/html_templates that creates the
+# module RDoc::Page and populate it as described below. Then invoke
+# rdoc using the --template <name of your file> option, and
+# your template will be used.
+#
+# The constants defining pages use a simple templating system:
+#
+# * The templating system is passed a hash. Keys in the hash correspond
+# to tags on this page. The tag %abc% is looked up in the hash,
+# and is replaced by the corresponding hash value.
+#
+# * Some tags are optional. You can detect this using IF/ENDIF
+#
+# IF: title
+# The value of title is %title%
+# ENDIF: title
+#
+# * Some entries in the hash have values that are arrays, where each
+# entry in the array is itself a hash. These are used to generate
+# lists using the START: construct. For example, given a hash
+# containing
+#
+# { 'people' => [ { 'name' => 'Fred', 'age' => '12' },
+# { 'name' => 'Mary', 'age' => '21' } ]
+#
+# You could generate a simple table using
+#
+# <table>
+# START:people
+# <tr><td>%name%<td>%age%</tr>
+# END:people
+# </table>
+#
+# These lists can be nested to an arbitrary depth
+#
+# * the construct HREF:url:name: generates <a href="%url%">%name%</a>
+# if +url+ is defined in the hash, or %name% otherwise.
+#
+#
+# Your file must contain the following constants
+#
+# [*FONTS*] a list of fonts to be used
+# [*STYLE*] a CSS section (without the <style> or comments). This is
+# used to generate a style.css file
+#
+# [*BODY*]
+# The main body of all non-index RDoc pages. BODY will contain
+# two !INCLUDE!s. The first is used to include a document-type
+# specific header (FILE_PAGE or CLASS_PAGE). The second include
+# is for the method list (METHOD_LIST). THe body is passed:
+#
+# %title%::
+# the page's title
+#
+# %style_url%::
+# the url of a style sheet for this page
+#
+# %diagram%::
+# the optional URL of a diagram for this page
+#
+# %description%::
+# a (potentially multi-paragraph) string containing the
+# description for th file/class/module.
+#
+# %requires%::
+# an optional list of %aref%/%name% pairs, one for each module
+# required by this file.
+#
+# %methods%::
+# an optional list of %aref%/%name%, one for each method
+# documented on this page. This is intended to be an index.
+#
+# %attributes%::
+# An optional list. For each attribute it contains:
+# %name%:: the attribute name
+# %rw%:: r/o, w/o, or r/w
+# %a_desc%:: description of the attribute
+#
+# %classlist%::
+# An optional string containing an already-formatted list of
+# classes and modules documented in this file
+#
+# For FILE_PAGE entries, the body will be passed
+#
+# %short_name%::
+# The name of the file
+#
+# %full_path%::
+# The full path to the file
+#
+# %dtm_modified%::
+# The date/time the file was last changed
+#
+# For class and module pages, the body will be passed
+#
+# %classmod%::
+# The name of the class or module
+#
+# %files%::
+# A list. For each file this class is defined in, it contains:
+# %full_path_url%:: an (optional) URL of the RDoc page
+# for this file
+# %full_path%:: the name of the file
+#
+# %par_url%::
+# The (optional) URL of the RDoc page documenting this class's
+# parent class
+#
+# %parent%::
+# The name of this class's parent.
+#
+# For both files and classes, the body is passed the following information
+# on includes and methods:
+#
+# %includes%::
+# Optional list of included modules. For each, it receives
+# %aref%:: optional URL to RDoc page for the module
+# %name%:: the name of the module
+#
+# %method_list%::
+# Optional list of methods of a particular class and category.
+#
+# Each method list entry contains:
+#
+# %type%:: public/private/protected
+# %category%:: instance/class
+# %methods%:: a list of method descriptions
+#
+# Each method description contains:
+#
+# %aref%:: a target aref, used when referencing this method
+# description. You should code this as <a name="%aref%">
+# %codeurl%:: the optional URL to the page containing this method's
+# source code.
+# %name%:: the method's name
+# %params%:: the method's parameters
+# %callseq%:: a full calling sequence
+# %m_desc%:: the (potentially multi-paragraph) description of
+# this method.
+#
+# [*CLASS_PAGE*]
+# Header for pages documenting classes and modules. See
+# BODY above for the available parameters.
+#
+# [*FILE_PAGE*]
+# Header for pages documenting files. See
+# BODY above for the available parameters.
+#
+# [*METHOD_LIST*]
+# Controls the display of the listing of methods. See BODY for
+# parameters.
+#
+# [*INDEX*]
+# The top-level index page. For a browser-like environment
+# define a frame set that includes the file, class, and
+# method indices. Passed
+# %title%:: title of page
+# %initial_page% :: url of initial page to display
+#
+# [*CLASS_INDEX*]
+# Individual files for the three indexes. Passed:
+# %index_url%:: URL of main index page
+# %entries%:: List of
+# %name%:: name of an index entry
+# %href%:: url of corresponding page
+# [*METHOD_INDEX*]
+# Same as CLASS_INDEX for methods
+#
+# [*FILE_INDEX*]
+# Same as CLASS_INDEX for methods
+#
+# [*FR_INDEX_BODY*]
+# A wrapper around CLASS_INDEX, METHOD_INDEX, and FILE_INDEX.
+# If those index strings contain the complete HTML for the
+# output, then FR_INDEX_BODY can simply be !INCLUDE!
+#
+# [*SRC_PAGE*]
+# Page used to display source code. Passed %title% and %code%,
+# the latter being a multi-line string of code.
+
+module Page
+
+FONTS = "Verdana, Arial, Helvetica, sans-serif"
+
+STYLE = %{
+body,td,p { font-family: %fonts%;
+ color: #000040;
+}
+
+.attr-rw { font-size: x-small; color: #444488 }
+
+.title-row { background: #0000aa;
+ color: #eeeeff;
+}
+
+.big-title-font { color: white;
+ font-family: %fonts%;
+ font-size: large;
+ height: 50px}
+
+.small-title-font { color: aqua;
+ font-family: %fonts%;
+ font-size: xx-small; }
+
+.aqua { color: aqua }
+
+.method-name, attr-name {
+ font-family: monospace; font-weight: bold;
+}
+
+.tablesubtitle, .tablesubsubtitle {
+ width: 100%;
+ margin-top: 1ex;
+ margin-bottom: .5ex;
+ padding: 5px 0px 5px 20px;
+ font-size: large;
+ color: aqua;
+ background: #3333cc;
+}
+
+.name-list {
+ font-family: monospace;
+ margin-left: 40px;
+ margin-bottom: 2ex;
+ line-height: 140%;
+}
+
+.description {
+ margin-left: 40px;
+ margin-top: -2ex;
+ margin-bottom: 2ex;
+}
+
+.description p {
+ line-height: 140%;
+}
+
+.aka {
+ margin-left: 40px;
+ margin-bottom: 2ex;
+ line-height: 100%;
+ font-size: small;
+ color: #808080;
+}
+
+.methodtitle {
+ font-size: medium;
+ text-decoration: none;
+ color: #0000AA;
+ background: white;
+}
+
+.paramsig {
+ font-size: small;
+}
+
+.srcbut { float: right }
+
+pre { font-size: 1.2em; }
+tt { font-size: 1.2em; }
+
+pre.source {
+ border-style: groove;
+ background-color: #ddddff;
+ margin-left: 40px;
+ padding: 1em 0em 1em 2em;
+}
+
+.classlist {
+ margin-left: 40px;
+ margin-bottom: 2ex;
+ line-height: 140%;
+}
+
+li {
+ display: list-item;
+ margin-top: .6em;
+}
+
+.ruby-comment { color: green; font-style: italic }
+.ruby-constant { color: #4433aa; font-weight: bold; }
+.ruby-identifier { color: #222222; }
+.ruby-ivar { color: #2233dd; }
+.ruby-keyword { color: #3333FF; font-weight: bold }
+.ruby-node { color: #777777; }
+.ruby-operator { color: #111111; }
+.ruby-regexp { color: #662222; }
+.ruby-value { color: #662222; font-style: italic }
+
+}
+
+
+############################################################################
+
+
+HEADER = %{
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+ <title>%title%</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=%charset%" />
+ <link rel=StyleSheet href="%style_url%" type="text/css" media="screen" />
+ <script type="text/javascript" language="JavaScript">
+ <!--
+ function popCode(url) {
+ window.open(url, "Code",
+ "resizable=yes,scrollbars=yes,toolbar=no,status=no,height=150,width=400")
+ }
+ //-->
+ </script>
+</head>
+}
+
+
+###################################################################
+
+METHOD_LIST = %{
+IF:includes
+<table summary="Included modules" cellpadding="5" width="100%">
+<tr><td class="tablesubtitle">Included modules</td></tr>
+</table>
+<div class="name-list">
+START:includes
+ <span class="method-name">HREF:aref:name:</span>
+END:includes
+</div>
+ENDIF:includes
+
+IF:method_list
+START:method_list
+IF:methods
+<table summary="Method list" cellpadding="5" width="100%">
+<tr><td class="tablesubtitle">%type% %category% methods</td></tr>
+</table>
+START:methods
+<table summary="method" width="100%" cellspacing="0" cellpadding="5" border="0">
+<tr><td class="methodtitle">
+<a name="%aref%"></a>
+IF:codeurl
+<a href="%codeurl%" target="Code" class="methodtitle"
+ onClick="popCode('%codeurl%');return false;">
+ENDIF:codeurl
+IF:callseq
+<b>%callseq%</b>
+ENDIF:callseq
+IFNOT:callseq
+<b>%name%</b>%params%
+ENDIF:callseq
+IF:codeurl
+</a>
+ENDIF:codeurl
+</td></tr>
+</table>
+IF:m_desc
+<div class="description">
+%m_desc%
+</div>
+ENDIF:m_desc
+IF:aka
+<div class="aka">
+This method is also aliased as
+START:aka
+<a href="%aref%">%name%</a>
+END:aka
+</div>
+ENDIF:aka
+IF:sourcecode
+<pre class="source">
+%sourcecode%
+</pre>
+ENDIF:sourcecode
+END:methods
+ENDIF:methods
+END:method_list
+ENDIF:method_list
+}
+
+###################################################################
+
+CONTEXT_CONTENT = %{
+IF:diagram
+<table summary="Diagram of classes and modules" width="100%">
+<tr><td align="center">
+%diagram%
+</td></tr></table>
+ENDIF:diagram
+
+
+IF:description
+<div class="description">%description%</div>
+ENDIF:description
+
+IF:requires
+<table summary="Requires" cellpadding="5" width="100%">
+<tr><td class="tablesubtitle">Required files</td></tr>
+</table>
+<div class="name-list">
+START:requires
+HREF:aref:name:&nbsp; &nbsp;
+END:requires
+</div>
+ENDIF:requires
+
+IF:methods
+<table summary="Methods" cellpadding="5" width="100%">
+<tr><td class="tablesubtitle">Methods</td></tr>
+</table>
+<div class="name-list">
+START:methods
+HREF:aref:name:&nbsp; &nbsp;
+END:methods
+</div>
+ENDIF:methods
+
+IF:constants
+<table summary="Constants" cellpadding="5" width="100%">
+<tr><td class="tablesubtitle">Constants</td></tr>
+</table>
+<table cellpadding="5">
+START:constants
+<tr valign="top"><td>%name%</td><td>=</td><td>%value%</td></tr>
+IF:desc
+<tr><td></td><td></td><td>%desc%</td></tr>
+ENDIF:desc
+END:constants
+</table>
+ENDIF:constants
+
+IF:aliases
+<table summary="Aliases" cellpadding="5" width="100%">
+<tr><td class="tablesubtitle">External Aliases</td></tr>
+</table>
+<div class="name-list">
+START:aliases
+%old_name% -> %new_name%<br />
+END:aliases
+</div>
+ENDIF:aliases
+
+IF:attributes
+<table summary="Attributes" cellpadding="5" width="100%">
+<tr><td class="tablesubtitle">Attributes</td></tr>
+</table>
+<table summary="Attribute details" cellspacing="5">
+START:attributes
+ <tr valign="top">
+ <td class="attr-name">%name%</td>
+IF:rw
+ <td align="center" class="attr-rw">&nbsp;[%rw%]&nbsp;</td>
+ENDIF:rw
+IFNOT:rw
+ <td></td>
+ENDIF:rw
+ <td>%a_desc%</td>
+ </tr>
+END:attributes
+</table>
+ENDIF:attributes
+
+IF:classlist
+<table summary="List of classes" cellpadding="5" width="100%">
+<tr><td class="tablesubtitle">Classes and Modules</td></tr>
+</table>
+<div class="classlist">
+%classlist%
+</div>
+ENDIF:classlist
+}
+
+###############################################################################
+
+BODY = HEADER + %{
+<body bgcolor="white">
+!INCLUDE! <!-- banner header -->
+} +
+CONTEXT_CONTENT + METHOD_LIST +
+%{
+</body>
+</html>
+}
+
+
+###############################################################################
+
+FILE_PAGE = <<_FILE_PAGE_
+<table summary="Information on file" width="100%">
+ <tr class="title-row">
+ <td><table summary="layout" width="100%"><tr>
+ <td class="big-title-font" colspan="2">%short_name%</td>
+ <td align="right"><table summary="layout" cellspacing="0" cellpadding="2">
+ <tr>
+ <td class="small-title-font">Path:</td>
+ <td class="small-title-font">%full_path%
+IF:cvsurl
+ &nbsp;(<a href="%cvsurl%"><acronym title="Concurrent Versioning System">CVS</acronym></a>)
+ENDIF:cvsurl
+ </td>
+ </tr>
+ <tr>
+ <td class="small-title-font">Modified:</td>
+ <td class="small-title-font">%dtm_modified%</td>
+ </tr>
+ </table>
+ </td></tr></table></td>
+ </tr>
+</table>
+_FILE_PAGE_
+
+###################################################################
+
+CLASS_PAGE = %{
+<table summary="Information on class" width="100%" border="0" cellspacing="0">
+ <tr class="title-row">
+ <td class="big-title-font">
+ <sup><font color="aqua">%classmod%</font></sup> %full_name%
+ </td>
+ <td align="right">
+ <table summary="layout" cellspacing="0" cellpadding="2">
+ <tr valign="top">
+ <td class="small-title-font">In:</td>
+ <td class="small-title-font">
+START:infiles
+IF:full_path_url
+ <a href="%full_path_url%" class="aqua">
+ENDIF:full_path_url
+%full_path%
+IF:full_path_url
+ </a>
+ENDIF:full_path_url
+IF:cvsurl
+ &nbsp;(<a href="%cvsurl%"><acronym title="Concurrent Versioning System">CVS</acronym></a>)
+ENDIF:cvsurl
+<br />
+END:infiles
+ </td>
+ </tr>
+IF:parent
+ <tr>
+ <td class="small-title-font">Parent:</td>
+ <td class="small-title-font">
+IF:par_url
+ <a href="%par_url%" class="aqua">
+ENDIF:par_url
+%parent%
+IF:par_url
+ </a>
+ENDIF:par_url
+ </td>
+ </tr>
+ENDIF:parent
+ </table>
+ </td>
+ </tr>
+</table>
+}
+
+=begin
+=end
+
+########################## Source code ##########################
+
+SRC_PAGE = %{
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=%charset%">
+<title>%title%</title>
+<link rel="stylesheet" href="%style_url%" type="text/css" media="screen" />
+</head>
+<body bgcolor="white">
+<pre>%code%</pre>
+</body>
+</html>
+}
+
+########################## Index ################################
+
+FR_INDEX_BODY = %{
+!INCLUDE!
+}
+
+FILE_INDEX = %{
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=%charset%">
+<title>%list_title%</title>
+<style type="text/css">
+<!--
+ body {
+background-color: #ddddff;
+ font-family: #{FONTS};
+ font-size: 11px;
+ font-style: normal;
+ line-height: 14px;
+ color: #000040;
+ }
+div.banner {
+ background: #0000aa;
+ color: white;
+ padding: 1;
+ margin: 0;
+ font-size: 90%;
+ font-weight: bold;
+ line-height: 1.1;
+ text-align: center;
+ width: 100%;
+}
+
+A.xx { color: white; font-weight: bold; }
+-->
+</style>
+<base target="docwin">
+</head>
+<body>
+<div class="banner"><a href="%index_url%" class="xx">%list_title%</a></div>
+START:entries
+<a href="%href%">%name%</a><br />
+END:entries
+</body></html>
+}
+
+CLASS_INDEX = FILE_INDEX
+METHOD_INDEX = FILE_INDEX
+
+INDEX = %{
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=%charset%">
+<title>%title%</title></head>
+
+<frameset rows="20%, 80%">
+ <frameset cols="25%,35%,45%">
+ <frame src="fr_file_index.html" title="Files" name="Files">
+ <frame src="fr_class_index.html" name="Classes">
+ <frame src="fr_method_index.html" name="Methods">
+ </frameset>
+ <frame src="%initial_page%" name="docwin">
+ <noframes>
+ <body bgcolor="white">
+ Sorry, RDoc currently only generates HTML using frames.
+ </body>
+ </noframes>
+</frameset>
+
+</html>
+}
+
+######################################################################
+#
+# The following is used for the -1 option
+#
+
+CONTENTS_XML = %{
+IF:description
+%description%
+ENDIF:description
+
+IF:requires
+<h4>Requires:</h4>
+<ul>
+START:requires
+IF:aref
+<li><a href="%aref%">%name%</a></li>
+ENDIF:aref
+IFNOT:aref
+<li>%name%</li>
+ENDIF:aref
+END:requires
+</ul>
+ENDIF:requires
+
+IF:attributes
+<h4>Attributes</h4>
+<table>
+START:attributes
+<tr><td>%name%</td><td>%rw%</td><td>%a_desc%</td></tr>
+END:attributes
+</table>
+ENDIF:attributes
+
+IF:includes
+<h4>Includes</h4>
+<ul>
+START:includes
+IF:aref
+<li><a href="%aref%">%name%</a></li>
+ENDIF:aref
+IFNOT:aref
+<li>%name%</li>
+ENDIF:aref
+END:includes
+</ul>
+ENDIF:includes
+
+IF:method_list
+<h3>Methods</h3>
+START:method_list
+IF:methods
+START:methods
+<h4>%type% %category% method: <a name="%aref%">%name%%params%</a></h4>
+
+IF:m_desc
+%m_desc%
+ENDIF:m_desc
+
+IF:sourcecode
+<blockquote><pre>
+%sourcecode%
+</pre></blockquote>
+ENDIF:sourcecode
+END:methods
+ENDIF:methods
+END:method_list
+ENDIF:method_list
+}
+
+
+end
+end
+
+require 'rdoc/generators/template/html/one_page_html'
diff --git a/lib/rdoc/generators/template/html/one_page_html.rb b/lib/rdoc/generators/template/html/one_page_html.rb
new file mode 100644
index 0000000000..19441f4725
--- /dev/null
+++ b/lib/rdoc/generators/template/html/one_page_html.rb
@@ -0,0 +1,122 @@
+module RDoc
+module Page
+######################################################################
+#
+# The following is used for the -1 option
+#
+
+CONTENTS_XML = %{
+IF:description
+%description%
+ENDIF:description
+
+IF:requires
+<h4>Requires:</h4>
+<ul>
+START:requires
+IF:aref
+<li><a href="%aref%">%name%</a></li>
+ENDIF:aref
+IFNOT:aref
+<li>%name%</li>
+ENDIF:aref
+END:requires
+</ul>
+ENDIF:requires
+
+IF:attributes
+<h4>Attributes</h4>
+<table>
+START:attributes
+<tr><td>%name%</td><td>%rw%</td><td>%a_desc%</td></tr>
+END:attributes
+</table>
+ENDIF:attributes
+
+IF:includes
+<h4>Includes</h4>
+<ul>
+START:includes
+IF:aref
+<li><a href="%aref%">%name%</a></li>
+ENDIF:aref
+IFNOT:aref
+<li>%name%</li>
+ENDIF:aref
+END:includes
+</ul>
+ENDIF:includes
+
+IF:method_list
+<h3>Methods</h3>
+START:method_list
+IF:methods
+START:methods
+<h4>%type% %category% method:
+IF:callseq
+<a name="%aref%">%callseq%</a>
+ENDIF:callseq
+IFNOT:callseq
+<a name="%aref%">%name%%params%</a></h4>
+ENDIF:callseq
+
+IF:m_desc
+%m_desc%
+ENDIF:m_desc
+
+IF:sourcecode
+<blockquote><pre>
+%sourcecode%
+</pre></blockquote>
+ENDIF:sourcecode
+END:methods
+ENDIF:methods
+END:method_list
+ENDIF:method_list
+}
+
+########################################################################
+
+ONE_PAGE = %{
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+ <title>%title%</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=%charset%" />
+</head>
+<body>
+START:files
+<h2>File: %short_name%</h2>
+<table>
+ <tr><td>Path:</td><td>%full_path%</td></tr>
+ <tr><td>Modified:</td><td>%dtm_modified%</td></tr>
+</table>
+} + CONTENTS_XML + %{
+END:files
+
+IF:classes
+<h2>Classes</h2>
+START:classes
+IF:parent
+<h3>%classmod% %full_name% &lt; HREF:par_url:parent:</h3>
+ENDIF:parent
+IFNOT:parent
+<h3>%classmod% %full_name%</h3>
+ENDIF:parent
+
+IF:infiles
+(in files
+START:infiles
+HREF:full_path_url:full_path:
+END:infiles
+)
+ENDIF:infiles
+} + CONTENTS_XML + %{
+END:classes
+ENDIF:classes
+</body>
+</html>
+}
+
+end
+end
diff --git a/lib/rdoc/generators/template/xml/rdf.rb b/lib/rdoc/generators/template/xml/rdf.rb
new file mode 100644
index 0000000000..1545d81a2f
--- /dev/null
+++ b/lib/rdoc/generators/template/xml/rdf.rb
@@ -0,0 +1,112 @@
+module RDoc
+module Page
+
+
+
+CONTENTS_RDF = %{
+IF:description
+ <description rd:parseType="Literal">
+%description%
+ </description>
+ENDIF:description
+
+IF:requires
+START:requires
+ <rd:required-file rd:name="%name%" />
+END:requires
+ENDIF:requires
+
+IF:attributes
+START:attributes
+ <contents>
+ <Attribute rd:name="%name%">
+IF:rw
+ <attribute-rw>%rw%</attribute-rw>
+ENDIF:rw
+ <description rdf:parseType="Literal">%a_desc%</description>
+ </Attribute>
+ </contents>
+END:attributes
+ENDIF:attributes
+
+IF:includes
+ <IncludedModuleList>
+START:includes
+ <included-module rd:name="%name%" />
+END:includes
+ </IncludedModuleList>
+ENDIF:includes
+
+IF:method_list
+START:method_list
+IF:methods
+START:methods
+ <contents>
+ <Method rd:name="%name%" rd:visibility="%type%"
+ rd:category="%category%" rd:id="%aref%">
+ <parameters>%params%</parameters>
+IF:m_desc
+ <description rdf:parseType="Literal">
+%m_desc%
+ </description>
+ENDIF:m_desc
+IF:sourcecode
+ <source-code-listing rdf:parseType="Literal">
+%sourcecode%
+ </source-code-listing>
+ENDIF:sourcecode
+ </Method>
+ </contents>
+END:methods
+ENDIF:methods
+END:method_list
+ENDIF:method_list
+ <!-- end method list -->
+}
+
+########################################################################
+
+ONE_PAGE = %{<?xml version="1.0" encoding="utf-8"?>
+<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns="http://pragprog.com/rdoc/rdoc.rdf#"
+ xmlns:rd="http://pragprog.com/rdoc/rdoc.rdf#">
+
+<!-- RDoc -->
+START:files
+ <rd:File rd:name="%short_name%" rd:id="%href%">
+ <path>%full_path%</path>
+ <dtm-modified>%dtm_modified%</dtm-modified>
+} + CONTENTS_RDF + %{
+ </rd:File>
+END:files
+START:classes
+ <%classmod% rd:name="%full_name%" rd:id="%full_name%">
+ <classmod-info>
+IF:infiles
+ <InFiles>
+START:infiles
+ <infile>
+ <File rd:name="%full_path%"
+IF:full_path_url
+ rdf:about="%full_path_url%"
+ENDIF:full_path_url
+ />
+ </infile>
+END:infiles
+ </InFiles>
+ENDIF:infiles
+IF:parent
+ <superclass>HREF:par_url:parent:</superclass>
+ENDIF:parent
+ </classmod-info>
+} + CONTENTS_RDF + %{
+ </%classmod%>
+END:classes
+<!-- /RDoc -->
+</rdf:RDF>
+}
+
+
+end
+end
+
diff --git a/lib/rdoc/generators/template/xml/xml.rb b/lib/rdoc/generators/template/xml/xml.rb
new file mode 100644
index 0000000000..4a0c8c9ac4
--- /dev/null
+++ b/lib/rdoc/generators/template/xml/xml.rb
@@ -0,0 +1,112 @@
+module RDoc
+module Page
+
+
+
+CONTENTS_XML = %{
+IF:description
+ <description>
+%description%
+ </description>
+ENDIF:description
+ <contents>
+IF:requires
+ <required-file-list>
+START:requires
+ <required-file name="%name%"
+IF:aref
+ href="%aref%"
+ENDIF:aref
+ />
+END:requires
+ </required-file-list>
+ENDIF:requires
+IF:attributes
+ <attribute-list>
+START:attributes
+ <attribute name="%name%">
+IF:rw
+ <attribute-rw>%rw%</attribute-rw>
+ENDIF:rw
+ <description>%a_desc%</description>
+ </attribute>
+END:attributes
+ </attribute-list>
+ENDIF:attributes
+IF:includes
+ <included-module-list>
+START:includes
+ <included-module name="%name%"
+IF:aref
+ href="%aref%"
+ENDIF:aref
+ />
+END:includes
+ </included-module-list>
+ENDIF:includes
+IF:method_list
+ <method-list>
+START:method_list
+IF:methods
+START:methods
+ <method name="%name%" type="%type%" category="%category%" id="%aref%">
+ <parameters>%params%</parameters>
+IF:m_desc
+ <description>
+%m_desc%
+ </description>
+ENDIF:m_desc
+IF:sourcecode
+ <source-code-listing>
+%sourcecode%
+ </source-code-listing>
+ENDIF:sourcecode
+ </method>
+END:methods
+ENDIF:methods
+END:method_list
+ </method-list>
+ENDIF:method_list
+ </contents>
+}
+
+########################################################################
+
+ONE_PAGE = %{<?xml version="1.0" encoding="utf-8"?>
+<rdoc>
+<file-list>
+START:files
+ <file name="%short_name%" id="%href%">
+ <file-info>
+ <path>%full_path%</path>
+ <dtm-modified>%dtm_modified%</dtm-modified>
+ </file-info>
+} + CONTENTS_XML + %{
+ </file>
+END:files
+</file-list>
+<class-module-list>
+START:classes
+ <%classmod% name="%full_name%" id="%full_name%">
+ <classmod-info>
+IF:infiles
+ <infiles>
+START:infiles
+ <infile>HREF:full_path_url:full_path:</infile>
+END:infiles
+ </infiles>
+ENDIF:infiles
+IF:parent
+ <superclass>HREF:par_url:parent:</superclass>
+ENDIF:parent
+ </classmod-info>
+} + CONTENTS_XML + %{
+ </%classmod%>
+END:classes
+</class-module-list>
+</rdoc>
+}
+
+
+end
+end
diff --git a/lib/rdoc/generators/xml_generator.rb b/lib/rdoc/generators/xml_generator.rb
new file mode 100644
index 0000000000..8c1a76d62b
--- /dev/null
+++ b/lib/rdoc/generators/xml_generator.rb
@@ -0,0 +1,130 @@
+
+require 'ftools'
+
+require 'rdoc/options'
+require 'rdoc/markup/simple_markup'
+require 'rdoc/markup/simple_markup/to_html'
+require 'rdoc/generators/html_generator'
+
+module Generators
+
+ # Generate XML output as one big file
+
+ class XMLGenerator < HTMLGenerator
+
+ # Standard generator factory
+ def XMLGenerator.for(options)
+ XMLGenerator.new(options)
+ end
+
+
+ def initialize(*args)
+ super
+ end
+
+ ##
+ # Build the initial indices and output objects
+ # based on an array of TopLevel objects containing
+ # the extracted information.
+
+ def generate(info)
+ @info = info
+ @files = []
+ @classes = []
+ @hyperlinks = {}
+
+ build_indices
+ generate_xml
+ end
+
+
+ ##
+ # Generate:
+ #
+ # * a list of HtmlFile objects for each TopLevel object.
+ # * a list of HtmlClass objects for each first level
+ # class or module in the TopLevel objects
+ # * a complete list of all hyperlinkable terms (file,
+ # class, module, and method names)
+
+ def build_indices
+
+ @info.each do |toplevel|
+ @files << HtmlFile.new(toplevel, @options, FILE_DIR)
+ end
+
+ RDoc::TopLevel.all_classes_and_modules.each do |cls|
+ build_class_list(cls, @files[0], CLASS_DIR)
+ end
+ end
+
+ def build_class_list(from, html_file, class_dir)
+ @classes << HtmlClass.new(from, html_file, class_dir, @options)
+ from.each_classmodule do |mod|
+ build_class_list(mod, html_file, class_dir)
+ end
+ end
+
+ ##
+ # Generate all the HTML. For the one-file case, we generate
+ # all the information in to one big hash
+ #
+ def generate_xml
+ values = {
+ 'charset' => @options.charset,
+ 'files' => gen_into(@files),
+ 'classes' => gen_into(@classes)
+ }
+
+ # this method is defined in the template file
+ write_extra_pages if defined? write_extra_pages
+
+ template = TemplatePage.new(RDoc::Page::ONE_PAGE)
+
+ if @options.op_name
+ opfile = File.open(@options.op_name, "w")
+ else
+ opfile = $stdout
+ end
+ template.write_html_on(opfile, values)
+ end
+
+ def gen_into(list)
+ res = []
+ list.each do |item|
+ res << item.value_hash
+ end
+ res
+ end
+
+ def gen_file_index
+ gen_an_index(@files, 'Files')
+ end
+
+ def gen_class_index
+ gen_an_index(@classes, 'Classes')
+ end
+
+ def gen_method_index
+ gen_an_index(HtmlMethod.all_methods, 'Methods')
+ end
+
+
+ def gen_an_index(collection, title)
+ res = []
+ collection.sort.each do |f|
+ if f.document_self
+ res << { "href" => f.path, "name" => f.index_name }
+ end
+ end
+
+ return {
+ "entries" => res,
+ 'list_title' => title,
+ 'index_url' => main_url,
+ }
+ end
+
+ end
+
+end
diff --git a/lib/rdoc/known_classes.rb b/lib/rdoc/known_classes.rb
deleted file mode 100644
index dbb1802f5a..0000000000
--- a/lib/rdoc/known_classes.rb
+++ /dev/null
@@ -1,68 +0,0 @@
-module RDoc
-
- ##
- # Ruby's built-in classes, modules and exceptions
-
- KNOWN_CLASSES = {
- "rb_cArray" => "Array",
- "rb_cBignum" => "Bignum",
- "rb_cClass" => "Class",
- "rb_cData" => "Data",
- "rb_cDir" => "Dir",
- "rb_cFalseClass" => "FalseClass",
- "rb_cFile" => "File",
- "rb_cFixnum" => "Fixnum",
- "rb_cFloat" => "Float",
- "rb_cHash" => "Hash",
- "rb_cIO" => "IO",
- "rb_cInteger" => "Integer",
- "rb_cModule" => "Module",
- "rb_cNilClass" => "NilClass",
- "rb_cNumeric" => "Numeric",
- "rb_cObject" => "Object",
- "rb_cProc" => "Proc",
- "rb_cRange" => "Range",
- "rb_cRegexp" => "Regexp",
- "rb_cRubyVM" => "RubyVM",
- "rb_cString" => "String",
- "rb_cStruct" => "Struct",
- "rb_cSymbol" => "Symbol",
- "rb_cThread" => "Thread",
- "rb_cTime" => "Time",
- "rb_cTrueClass" => "TrueClass",
-
- "rb_eArgError" => "ArgError",
- "rb_eEOFError" => "EOFError",
- "rb_eException" => "Exception",
- "rb_eFatal" => "Fatal",
- "rb_eFloatDomainError" => "FloatDomainError",
- "rb_eIOError" => "IOError",
- "rb_eIndexError" => "IndexError",
- "rb_eInterrupt" => "Interrupt",
- "rb_eLoadError" => "LoadError",
- "rb_eNameError" => "NameError",
- "rb_eNoMemError" => "NoMemError",
- "rb_eNotImpError" => "NotImpError",
- "rb_eRangeError" => "RangeError",
- "rb_eRuntimeError" => "RuntimeError",
- "rb_eScriptError" => "ScriptError",
- "rb_eSecurityError" => "SecurityError",
- "rb_eSignal" => "Signal",
- "rb_eStandardError" => "StandardError",
- "rb_eSyntaxError" => "SyntaxError",
- "rb_eSystemCallError" => "SystemCallError",
- "rb_eSystemExit" => "SystemExit",
- "rb_eTypeError" => "TypeError",
- "rb_eZeroDivError" => "ZeroDivError",
-
- "rb_mComparable" => "Comparable",
- "rb_mEnumerable" => "Enumerable",
- "rb_mErrno" => "Errno",
- "rb_mFileTest" => "FileTest",
- "rb_mGC" => "GC",
- "rb_mKernel" => "Kernel",
- "rb_mMath" => "Math",
- "rb_mProcess" => "Process"
- }
-
-end
diff --git a/lib/rdoc/markup.rb b/lib/rdoc/markup.rb
deleted file mode 100644
index a584a79b75..0000000000
--- a/lib/rdoc/markup.rb
+++ /dev/null
@@ -1,378 +0,0 @@
-require 'rdoc'
-
-##
-# RDoc::Markup parses plain text documents and attempts to decompose them into
-# their constituent parts. Some of these parts are high-level: paragraphs,
-# chunks of verbatim text, list entries and the like. Other parts happen at
-# the character level: a piece of bold text, a word in code font. This markup
-# is similar in spirit to that used on WikiWiki webs, where folks create web
-# pages using a simple set of formatting rules.
-#
-# RDoc::Markup itself does no output formatting: this is left to a different
-# set of classes.
-#
-# RDoc::Markup is extendable at runtime: you can add \new markup elements to
-# be recognised in the documents that RDoc::Markup parses.
-#
-# RDoc::Markup is intended to be the basis for a family of tools which share
-# the common requirement that simple, plain-text should be rendered in a
-# variety of different output formats and media. It is envisaged that
-# RDoc::Markup could be the basis for formatting RDoc style comment blocks,
-# Wiki entries, and online FAQs.
-#
-# == Synopsis
-#
-# This code converts +input_string+ to HTML. The conversion takes place in
-# the +convert+ method, so you can use the same RDoc::Markup converter to
-# convert multiple input strings.
-#
-# require 'rdoc/markup/to_html'
-#
-# h = RDoc::Markup::ToHtml.new
-#
-# puts h.convert(input_string)
-#
-# You can extend the RDoc::Markup parser to recognise new markup
-# sequences, and to add special processing for text that matches a
-# regular expression. Here we make WikiWords significant to the parser,
-# and also make the sequences {word} and \<no>text...</no> signify
-# strike-through text. When then subclass the HTML output class to deal
-# with these:
-#
-# require 'rdoc/markup'
-# require 'rdoc/markup/to_html'
-#
-# class WikiHtml < RDoc::Markup::ToHtml
-# def handle_special_WIKIWORD(special)
-# "<font color=red>" + special.text + "</font>"
-# end
-# end
-#
-# m = RDoc::Markup.new
-# m.add_word_pair("{", "}", :STRIKE)
-# m.add_html("no", :STRIKE)
-#
-# m.add_special(/\b([A-Z][a-z]+[A-Z]\w+)/, :WIKIWORD)
-#
-# wh = WikiHtml.new
-# wh.add_tag(:STRIKE, "<strike>", "</strike>")
-#
-# puts "<body>#{wh.convert ARGF.read}</body>"
-#
-#--
-# Author:: Dave Thomas, dave@pragmaticprogrammer.com
-# License:: Ruby license
-
-class RDoc::Markup
-
- SPACE = ?\s
-
- # List entries look like:
- # * text
- # 1. text
- # [label] text
- # label:: text
- #
- # Flag it as a list entry, and work out the indent for subsequent lines
-
- SIMPLE_LIST_RE = /^(
- ( \* (?# bullet)
- |- (?# bullet)
- |\d+\. (?# numbered )
- |[A-Za-z]\. (?# alphabetically numbered )
- )
- \s+
- )\S/x
-
- LABEL_LIST_RE = /^(
- ( \[.*?\] (?# labeled )
- |\S.*:: (?# note )
- )(?:\s+|$)
- )/x
-
- ##
- # Take a block of text and use various heuristics to determine it's
- # structure (paragraphs, lists, and so on). Invoke an event handler as we
- # identify significant chunks.
-
- def initialize
- @am = RDoc::Markup::AttributeManager.new
- @output = nil
- end
-
- ##
- # Add to the sequences used to add formatting to an individual word (such
- # as *bold*). Matching entries will generate attributes that the output
- # formatters can recognize by their +name+.
-
- def add_word_pair(start, stop, name)
- @am.add_word_pair(start, stop, name)
- end
-
- ##
- # Add to the sequences recognized as general markup.
-
- def add_html(tag, name)
- @am.add_html(tag, name)
- end
-
- ##
- # Add to other inline sequences. For example, we could add WikiWords using
- # something like:
- #
- # parser.add_special(/\b([A-Z][a-z]+[A-Z]\w+)/, :WIKIWORD)
- #
- # Each wiki word will be presented to the output formatter via the
- # accept_special method.
-
- def add_special(pattern, name)
- @am.add_special(pattern, name)
- end
-
- ##
- # We take a string, split it into lines, work out the type of each line,
- # and from there deduce groups of lines (for example all lines in a
- # paragraph). We then invoke the output formatter using a Visitor to
- # display the result.
-
- def convert(str, op)
- lines = str.split(/\r?\n/).map { |line| Line.new line }
- @lines = Lines.new lines
-
- return "" if @lines.empty?
- @lines.normalize
- assign_types_to_lines
- group = group_lines
- # call the output formatter to handle the result
- #group.each { |line| p line }
- group.accept @am, op
- end
-
- private
-
- ##
- # Look through the text at line indentation. We flag each line as being
- # Blank, a paragraph, a list element, or verbatim text.
-
- def assign_types_to_lines(margin = 0, level = 0)
- while line = @lines.next
- if line.blank? then
- line.stamp :BLANK, level
- next
- end
-
- # if a line contains non-blanks before the margin, then it must belong
- # to an outer level
-
- text = line.text
-
- for i in 0...margin
- if text[i] != SPACE
- @lines.unget
- return
- end
- end
-
- active_line = text[margin..-1]
-
- # Rules (horizontal lines) look like
- #
- # --- (three or more hyphens)
- #
- # The more hyphens, the thicker the rule
- #
-
- if /^(---+)\s*$/ =~ active_line
- line.stamp :RULE, level, $1.length-2
- next
- end
-
- # Then look for list entries. First the ones that have to have
- # text following them (* xxx, - xxx, and dd. xxx)
-
- if SIMPLE_LIST_RE =~ active_line
- offset = margin + $1.length
- prefix = $2
- prefix_length = prefix.length
-
- flag = case prefix
- when "*","-" then :BULLET
- when /^\d/ then :NUMBER
- when /^[A-Z]/ then :UPPERALPHA
- when /^[a-z]/ then :LOWERALPHA
- else raise "Invalid List Type: #{self.inspect}"
- end
-
- line.stamp :LIST, level+1, prefix, flag
- text[margin, prefix_length] = " " * prefix_length
- assign_types_to_lines(offset, level + 1)
- next
- end
-
- if LABEL_LIST_RE =~ active_line
- offset = margin + $1.length
- prefix = $2
- prefix_length = prefix.length
-
- next if handled_labeled_list(line, level, margin, offset, prefix)
- end
-
- # Headings look like
- # = Main heading
- # == Second level
- # === Third
- #
- # Headings reset the level to 0
-
- if active_line[0] == ?= and active_line =~ /^(=+)\s*(.*)/
- prefix_length = $1.length
- prefix_length = 6 if prefix_length > 6
- line.stamp :HEADING, 0, prefix_length
- line.strip_leading(margin + prefix_length)
- next
- end
-
- # If the character's a space, then we have verbatim text,
- # otherwise
-
- if active_line[0] == SPACE
- line.strip_leading(margin) if margin > 0
- line.stamp :VERBATIM, level
- else
- line.stamp :PARAGRAPH, level
- end
- end
- end
-
- ##
- # Handle labeled list entries, We have a special case to deal with.
- # Because the labels can be long, they force the remaining block of text
- # over the to right:
- #
- # this is a long label that I wrote:: and here is the
- # block of text with
- # a silly margin
- #
- # So we allow the special case. If the label is followed by nothing, and
- # if the following line is indented, then we take the indent of that line
- # as the new margin.
- #
- # this is a long label that I wrote::
- # here is a more reasonably indented block which
- # will be attached to the label.
- #
-
- def handled_labeled_list(line, level, margin, offset, prefix)
- prefix_length = prefix.length
- text = line.text
- flag = nil
-
- case prefix
- when /^\[/ then
- flag = :LABELED
- prefix = prefix[1, prefix.length-2]
- when /:$/ then
- flag = :NOTE
- prefix.chop!
- else
- raise "Invalid List Type: #{self.inspect}"
- end
-
- # body is on the next line
- if text.length <= offset then
- original_line = line
- line = @lines.next
- return false unless line
- text = line.text
-
- for i in 0..margin
- if text[i] != SPACE
- @lines.unget
- return false
- end
- end
-
- i = margin
- i += 1 while text[i] == SPACE
-
- if i >= text.length then
- @lines.unget
- return false
- else
- offset = i
- prefix_length = 0
-
- if text[offset..-1] =~ SIMPLE_LIST_RE then
- @lines.unget
- line = original_line
- line.text = ''
- else
- @lines.delete original_line
- end
- end
- end
-
- line.stamp :LIST, level+1, prefix, flag
- text[margin, prefix_length] = " " * prefix_length
- assign_types_to_lines(offset, level + 1)
- return true
- end
-
- ##
- # Return a block consisting of fragments which are paragraphs, list
- # entries or verbatim text. We merge consecutive lines of the same type
- # and level together. We are also slightly tricky with lists: the lines
- # following a list introduction look like paragraph lines at the next
- # level, and we remap them into list entries instead.
-
- def group_lines
- @lines.rewind
-
- in_list = false
- wanted_type = wanted_level = nil
-
- block = LineCollection.new
- group = nil
-
- while line = @lines.next
- if line.level == wanted_level and line.type == wanted_type
- group.add_text(line.text)
- else
- group = block.fragment_for(line)
- block.add(group)
-
- if line.type == :LIST
- wanted_type = :PARAGRAPH
- else
- wanted_type = line.type
- end
-
- wanted_level = line.type == :HEADING ? line.param : line.level
- end
- end
-
- block.normalize
- block
- end
-
- ##
- # For debugging, we allow access to our line contents as text.
-
- def content
- @lines.as_text
- end
- public :content
-
- ##
- # For debugging, return the list of line types.
-
- def get_line_types
- @lines.line_types
- end
- public :get_line_types
-
-end
-
-require 'rdoc/markup/fragments'
-require 'rdoc/markup/inline'
-require 'rdoc/markup/lines'
diff --git a/lib/rdoc/markup/.document b/lib/rdoc/markup/.document
new file mode 100644
index 0000000000..3cf4f21bd7
--- /dev/null
+++ b/lib/rdoc/markup/.document
@@ -0,0 +1,2 @@
+simple_markup
+simple_markup.rb
diff --git a/lib/rdoc/markup/attribute_manager.rb b/lib/rdoc/markup/attribute_manager.rb
deleted file mode 100644
index d13b79376c..0000000000
--- a/lib/rdoc/markup/attribute_manager.rb
+++ /dev/null
@@ -1,265 +0,0 @@
-require 'rdoc/markup/inline'
-
-class RDoc::Markup::AttributeManager
-
- NULL = "\000".freeze
-
- ##
- # We work by substituting non-printing characters in to the text. For now
- # I'm assuming that I can substitute a character in the range 0..8 for a 7
- # bit character without damaging the encoded string, but this might be
- # optimistic
-
- A_PROTECT = 004
- PROTECT_ATTR = A_PROTECT.chr
-
- ##
- # This maps delimiters that occur around words (such as *bold* or +tt+)
- # where the start and end delimiters and the same. This lets us optimize
- # the regexp
-
- MATCHING_WORD_PAIRS = {}
-
- ##
- # And this is used when the delimiters aren't the same. In this case the
- # hash maps a pattern to the attribute character
-
- WORD_PAIR_MAP = {}
-
- ##
- # This maps HTML tags to the corresponding attribute char
-
- HTML_TAGS = {}
-
- ##
- # And this maps _special_ sequences to a name. A special sequence is
- # something like a WikiWord
-
- SPECIAL = {}
-
- ##
- # Return an attribute object with the given turn_on and turn_off bits set
-
- def attribute(turn_on, turn_off)
- RDoc::Markup::AttrChanger.new turn_on, turn_off
- end
-
- def change_attribute(current, new)
- diff = current ^ new
- attribute(new & diff, current & diff)
- end
-
- def changed_attribute_by_name(current_set, new_set)
- current = new = 0
- current_set.each do |name|
- current |= RDoc::Markup::Attribute.bitmap_for(name)
- end
-
- new_set.each do |name|
- new |= RDoc::Markup::Attribute.bitmap_for(name)
- end
-
- change_attribute(current, new)
- end
-
- def copy_string(start_pos, end_pos)
- res = @str[start_pos...end_pos]
- res.gsub!(/\000/, '')
- res
- end
-
- ##
- # Map attributes like <b>text</b>to the sequence
- # \001\002<char>\001\003<char>, where <char> is a per-attribute specific
- # character
-
- def convert_attrs(str, attrs)
- # first do matching ones
- tags = MATCHING_WORD_PAIRS.keys.join("")
-
- re = /(^|\W)([#{tags}])([#:\\]?[\w.\/-]+?\S?)\2(\W|$)/
-
- 1 while str.gsub!(re) do
- attr = MATCHING_WORD_PAIRS[$2]
- attrs.set_attrs($`.length + $1.length + $2.length, $3.length, attr)
- $1 + NULL * $2.length + $3 + NULL * $2.length + $4
- end
-
- # then non-matching
- unless WORD_PAIR_MAP.empty? then
- WORD_PAIR_MAP.each do |regexp, attr|
- str.gsub!(regexp) {
- attrs.set_attrs($`.length + $1.length, $2.length, attr)
- NULL * $1.length + $2 + NULL * $3.length
- }
- end
- end
- end
-
- def convert_html(str, attrs)
- tags = HTML_TAGS.keys.join '|'
-
- 1 while str.gsub!(/<(#{tags})>(.*?)<\/\1>/i) {
- attr = HTML_TAGS[$1.downcase]
- html_length = $1.length + 2
- seq = NULL * html_length
- attrs.set_attrs($`.length + html_length, $2.length, attr)
- seq + $2 + seq + NULL
- }
- end
-
- def convert_specials(str, attrs)
- unless SPECIAL.empty?
- SPECIAL.each do |regexp, attr|
- str.scan(regexp) do
- attrs.set_attrs($`.length, $&.length,
- attr | RDoc::Markup::Attribute::SPECIAL)
- end
- end
- end
- end
-
- ##
- # A \ in front of a character that would normally be processed turns off
- # processing. We do this by turning \< into <#{PROTECT}
-
- PROTECTABLE = %w[<\\]
-
- def mask_protected_sequences
- protect_pattern = Regexp.new("\\\\([#{Regexp.escape(PROTECTABLE.join(''))}])")
- @str.gsub!(protect_pattern, "\\1#{PROTECT_ATTR}")
- end
-
- def unmask_protected_sequences
- @str.gsub!(/(.)#{PROTECT_ATTR}/, "\\1\000")
- end
-
- def initialize
- add_word_pair("*", "*", :BOLD)
- add_word_pair("_", "_", :EM)
- add_word_pair("+", "+", :TT)
-
- add_html("em", :EM)
- add_html("i", :EM)
- add_html("b", :BOLD)
- add_html("tt", :TT)
- add_html("code", :TT)
- end
-
- def add_word_pair(start, stop, name)
- raise ArgumentError, "Word flags may not start with '<'" if
- start[0,1] == '<'
-
- bitmap = RDoc::Markup::Attribute.bitmap_for name
-
- if start == stop then
- MATCHING_WORD_PAIRS[start] = bitmap
- else
- pattern = /(#{Regexp.escape start})(\S+)(#{Regexp.escape stop})/
- WORD_PAIR_MAP[pattern] = bitmap
- end
-
- PROTECTABLE << start[0,1]
- PROTECTABLE.uniq!
- end
-
- def add_html(tag, name)
- HTML_TAGS[tag.downcase] = RDoc::Markup::Attribute.bitmap_for name
- end
-
- def add_special(pattern, name)
- SPECIAL[pattern] = RDoc::Markup::Attribute.bitmap_for name
- end
-
- def flow(str)
- @str = str
-
- mask_protected_sequences
-
- @attrs = RDoc::Markup::AttrSpan.new @str.length
-
- convert_attrs(@str, @attrs)
- convert_html(@str, @attrs)
- convert_specials(str, @attrs)
-
- unmask_protected_sequences
-
- return split_into_flow
- end
-
- def display_attributes
- puts
- puts @str.tr(NULL, "!")
- bit = 1
- 16.times do |bno|
- line = ""
- @str.length.times do |i|
- if (@attrs[i] & bit) == 0
- line << " "
- else
- if bno.zero?
- line << "S"
- else
- line << ("%d" % (bno+1))
- end
- end
- end
- puts(line) unless line =~ /^ *$/
- bit <<= 1
- end
- end
-
- def split_into_flow
- res = []
- current_attr = 0
- str = ""
-
- str_len = @str.length
-
- # skip leading invisible text
- i = 0
- i += 1 while i < str_len and @str[i].chr == "\0"
- start_pos = i
-
- # then scan the string, chunking it on attribute changes
- while i < str_len
- new_attr = @attrs[i]
- if new_attr != current_attr
- if i > start_pos
- res << copy_string(start_pos, i)
- start_pos = i
- end
-
- res << change_attribute(current_attr, new_attr)
- current_attr = new_attr
-
- if (current_attr & RDoc::Markup::Attribute::SPECIAL) != 0 then
- i += 1 while
- i < str_len and (@attrs[i] & RDoc::Markup::Attribute::SPECIAL) != 0
-
- res << RDoc::Markup::Special.new(current_attr,
- copy_string(start_pos, i))
- start_pos = i
- next
- end
- end
-
- # move on, skipping any invisible characters
- begin
- i += 1
- end while i < str_len and @str[i].chr == "\0"
- end
-
- # tidy up trailing text
- if start_pos < str_len
- res << copy_string(start_pos, str_len)
- end
-
- # and reset to all attributes off
- res << change_attribute(current_attr, 0) if current_attr != 0
-
- return res
- end
-
-end
-
diff --git a/lib/rdoc/markup/formatter.rb b/lib/rdoc/markup/formatter.rb
deleted file mode 100644
index 14cbae59f9..0000000000
--- a/lib/rdoc/markup/formatter.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-require 'rdoc/markup'
-
-class RDoc::Markup::Formatter
-
- def initialize
- @markup = RDoc::Markup.new
- end
-
- def convert(content)
- @markup.convert content, self
- end
-
-end
-
diff --git a/lib/rdoc/markup/fragments.rb b/lib/rdoc/markup/fragments.rb
deleted file mode 100644
index 0031b809b4..0000000000
--- a/lib/rdoc/markup/fragments.rb
+++ /dev/null
@@ -1,337 +0,0 @@
-require 'rdoc/markup'
-require 'rdoc/markup/lines'
-
-class RDoc::Markup
-
- ##
- # A Fragment is a chunk of text, subclassed as a paragraph, a list
- # entry, or verbatim text.
-
- class Fragment
- attr_reader :level, :param, :txt
- attr_accessor :type
-
- ##
- # This is a simple factory system that lets us associate fragement
- # types (a string) with a subclass of fragment
-
- TYPE_MAP = {}
-
- def self.type_name(name)
- TYPE_MAP[name] = self
- end
-
- def self.for(line)
- klass = TYPE_MAP[line.type] ||
- raise("Unknown line type: '#{line.type.inspect}:' '#{line.text}'")
- return klass.new(line.level, line.param, line.flag, line.text)
- end
-
- def initialize(level, param, type, txt)
- @level = level
- @param = param
- @type = type
- @txt = ""
- add_text(txt) if txt
- end
-
- def add_text(txt)
- @txt << " " if @txt.length > 0
- @txt << txt.tr_s("\n ", " ").strip
- end
-
- def to_s
- "L#@level: #{self.class.name.split('::')[-1]}\n#@txt"
- end
-
- end
-
- ##
- # A paragraph is a fragment which gets wrapped to fit. We remove all
- # newlines when we're created, and have them put back on output.
-
- class Paragraph < Fragment
- type_name :PARAGRAPH
- end
-
- class BlankLine < Paragraph
- type_name :BLANK
- end
-
- class Heading < Paragraph
- type_name :HEADING
-
- def head_level
- @param.to_i
- end
- end
-
- ##
- # A List is a fragment with some kind of label
-
- class ListBase < Paragraph
- LIST_TYPES = [
- :BULLET,
- :NUMBER,
- :UPPERALPHA,
- :LOWERALPHA,
- :LABELED,
- :NOTE,
- ]
- end
-
- class ListItem < ListBase
- type_name :LIST
-
- def to_s
- text = if [:NOTE, :LABELED].include? type then
- "#{@param}: #{@txt}"
- else
- @txt
- end
-
- "L#@level: #{type} #{self.class.name.split('::')[-1]}\n#{text}"
- end
-
- end
-
- class ListStart < ListBase
- def initialize(level, param, type)
- super(level, param, type, nil)
- end
- end
-
- class ListEnd < ListBase
- def initialize(level, type)
- super(level, "", type, nil)
- end
- end
-
- ##
- # Verbatim code contains lines that don't get wrapped.
-
- class Verbatim < Fragment
- type_name :VERBATIM
-
- def add_text(txt)
- @txt << txt.chomp << "\n"
- end
-
- end
-
- ##
- # A horizontal rule
-
- class Rule < Fragment
- type_name :RULE
- end
-
- ##
- # Collect groups of lines together. Each group will end up containing a flow
- # of text.
-
- class LineCollection
-
- def initialize
- @fragments = []
- end
-
- def add(fragment)
- @fragments << fragment
- end
-
- def each(&b)
- @fragments.each(&b)
- end
-
- def to_a # :nodoc:
- @fragments.map {|fragment| fragment.to_s}
- end
-
- ##
- # Factory for different fragment types
-
- def fragment_for(*args)
- Fragment.for(*args)
- end
-
- ##
- # Tidy up at the end
-
- def normalize
- change_verbatim_blank_lines
- add_list_start_and_ends
- add_list_breaks
- tidy_blank_lines
- end
-
- def to_s
- @fragments.join("\n----\n")
- end
-
- def accept(am, visitor)
- visitor.start_accepting
-
- @fragments.each do |fragment|
- case fragment
- when Verbatim
- visitor.accept_verbatim(am, fragment)
- when Rule
- visitor.accept_rule(am, fragment)
- when ListStart
- visitor.accept_list_start(am, fragment)
- when ListEnd
- visitor.accept_list_end(am, fragment)
- when ListItem
- visitor.accept_list_item(am, fragment)
- when BlankLine
- visitor.accept_blank_line(am, fragment)
- when Heading
- visitor.accept_heading(am, fragment)
- when Paragraph
- visitor.accept_paragraph(am, fragment)
- end
- end
-
- visitor.end_accepting
- end
-
- private
-
- # If you have:
- #
- # normal paragraph text.
- #
- # this is code
- #
- # and more code
- #
- # You'll end up with the fragments Paragraph, BlankLine, Verbatim,
- # BlankLine, Verbatim, BlankLine, etc.
- #
- # The BlankLine in the middle of the verbatim chunk needs to be changed to
- # a real verbatim newline, and the two verbatim blocks merged
-
- def change_verbatim_blank_lines
- frag_block = nil
- blank_count = 0
- @fragments.each_with_index do |frag, i|
- if frag_block.nil?
- frag_block = frag if Verbatim === frag
- else
- case frag
- when Verbatim
- blank_count.times { frag_block.add_text("\n") }
- blank_count = 0
- frag_block.add_text(frag.txt)
- @fragments[i] = nil # remove out current fragment
- when BlankLine
- if frag_block
- blank_count += 1
- @fragments[i] = nil
- end
- else
- frag_block = nil
- blank_count = 0
- end
- end
- end
- @fragments.compact!
- end
-
- ##
- # List nesting is implicit given the level of indentation. Make it
- # explicit, just to make life a tad easier for the output processors
-
- def add_list_start_and_ends
- level = 0
- res = []
- type_stack = []
-
- @fragments.each do |fragment|
- # $stderr.puts "#{level} : #{fragment.class.name} : #{fragment.level}"
- new_level = fragment.level
- while (level < new_level)
- level += 1
- type = fragment.type
- res << ListStart.new(level, fragment.param, type) if type
- type_stack.push type
- # $stderr.puts "Start: #{level}"
- end
-
- while level > new_level
- type = type_stack.pop
- res << ListEnd.new(level, type) if type
- level -= 1
- # $stderr.puts "End: #{level}, #{type}"
- end
-
- res << fragment
- level = fragment.level
- end
- level.downto(1) do |i|
- type = type_stack.pop
- res << ListEnd.new(i, type) if type
- end
-
- @fragments = res
- end
-
- ##
- # Inserts start/ends between list entries at the same level that have
- # different element types
-
- def add_list_breaks
- res = @fragments
-
- @fragments = []
- list_stack = []
-
- res.each do |fragment|
- case fragment
- when ListStart
- list_stack.push fragment
- when ListEnd
- start = list_stack.pop
- fragment.type = start.type
- when ListItem
- l = list_stack.last
- if fragment.type != l.type
- @fragments << ListEnd.new(l.level, l.type)
- start = ListStart.new(l.level, fragment.param, fragment.type)
- @fragments << start
- list_stack.pop
- list_stack.push start
- end
- else
- ;
- end
- @fragments << fragment
- end
- end
-
- ##
- # Tidy up the blank lines:
- # * change Blank/ListEnd into ListEnd/Blank
- # * remove blank lines at the front
-
- def tidy_blank_lines
- (@fragments.size - 1).times do |i|
- if BlankLine === @fragments[i] and ListEnd === @fragments[i+1] then
- @fragments[i], @fragments[i+1] = @fragments[i+1], @fragments[i]
- end
- end
-
- # remove leading blanks
- @fragments.each_with_index do |f, i|
- break unless f.kind_of? BlankLine
- @fragments[i] = nil
- end
-
- @fragments.compact!
- end
-
- end
-
-end
-
diff --git a/lib/rdoc/markup/inline.rb b/lib/rdoc/markup/inline.rb
deleted file mode 100644
index 46c9b5822c..0000000000
--- a/lib/rdoc/markup/inline.rb
+++ /dev/null
@@ -1,101 +0,0 @@
-require 'rdoc/markup'
-
-class RDoc::Markup
-
- ##
- # We manage a set of attributes. Each attribute has a symbol name and a bit
- # value.
-
- class Attribute
- SPECIAL = 1
-
- @@name_to_bitmap = { :_SPECIAL_ => SPECIAL }
- @@next_bitmap = 2
-
- def self.bitmap_for(name)
- bitmap = @@name_to_bitmap[name]
- unless bitmap then
- bitmap = @@next_bitmap
- @@next_bitmap <<= 1
- @@name_to_bitmap[name] = bitmap
- end
- bitmap
- end
-
- def self.as_string(bitmap)
- return "none" if bitmap.zero?
- res = []
- @@name_to_bitmap.each do |name, bit|
- res << name if (bitmap & bit) != 0
- end
- res.join(",")
- end
-
- def self.each_name_of(bitmap)
- @@name_to_bitmap.each do |name, bit|
- next if bit == SPECIAL
- yield name.to_s if (bitmap & bit) != 0
- end
- end
- end
-
- AttrChanger = Struct.new(:turn_on, :turn_off)
-
- ##
- # An AttrChanger records a change in attributes. It contains a bitmap of the
- # attributes to turn on, and a bitmap of those to turn off.
-
- class AttrChanger
- def to_s
- "Attr: +#{Attribute.as_string(turn_on)}/-#{Attribute.as_string(turn_on)}"
- end
- end
-
- ##
- # An array of attributes which parallels the characters in a string.
-
- class AttrSpan
- def initialize(length)
- @attrs = Array.new(length, 0)
- end
-
- def set_attrs(start, length, bits)
- for i in start ... (start+length)
- @attrs[i] |= bits
- end
- end
-
- def [](n)
- @attrs[n]
- end
- end
-
- ##
- # Hold details of a special sequence
-
- class Special
- attr_reader :type
- attr_accessor :text
-
- def initialize(type, text)
- @type, @text = type, text
- end
-
- def ==(o)
- self.text == o.text && self.type == o.type
- end
-
- def inspect
- "#<RDoc::Markup::Special:0x%x @type=%p, name=%p @text=%p>" % [
- object_id, @type, RDoc::Markup::Attribute.as_string(type), text.dump]
- end
-
- def to_s
- "Special: type=#{type}, name=#{RDoc::Markup::Attribute.as_string type}, text=#{text.dump}"
- end
-
- end
-
-end
-
-require 'rdoc/markup/attribute_manager'
diff --git a/lib/rdoc/markup/lines.rb b/lib/rdoc/markup/lines.rb
deleted file mode 100644
index 069492122f..0000000000
--- a/lib/rdoc/markup/lines.rb
+++ /dev/null
@@ -1,152 +0,0 @@
-class RDoc::Markup
-
- ##
- # We store the lines we're working on as objects of class Line. These
- # contain the text of the line, along with a flag indicating the line type,
- # and an indentation level.
-
- class Line
- INFINITY = 9999
-
- LINE_TYPES = [
- :BLANK,
- :HEADING,
- :LIST,
- :PARAGRAPH,
- :RULE,
- :VERBATIM,
- ]
-
- # line type
- attr_accessor :type
-
- # The indentation nesting level
- attr_accessor :level
-
- # The contents
- attr_accessor :text
-
- # A prefix or parameter. For LIST lines, this is
- # the text that introduced the list item (the label)
- attr_accessor :param
-
- # A flag. For list lines, this is the type of the list
- attr_accessor :flag
-
- # the number of leading spaces
- attr_accessor :leading_spaces
-
- # true if this line has been deleted from the list of lines
- attr_accessor :deleted
-
- def initialize(text)
- @text = text.dup
- @deleted = false
-
- # expand tabs
- 1 while @text.gsub!(/\t+/) { ' ' * (8*$&.length - $`.length % 8)} && $~ #`
-
- # Strip trailing whitespace
- @text.sub!(/\s+$/, '')
-
- # and look for leading whitespace
- if @text.length > 0
- @text =~ /^(\s*)/
- @leading_spaces = $1.length
- else
- @leading_spaces = INFINITY
- end
- end
-
- # Return true if this line is blank
- def blank?
- @text.empty?
- end
-
- # stamp a line with a type, a level, a prefix, and a flag
- def stamp(type, level, param="", flag=nil)
- @type, @level, @param, @flag = type, level, param, flag
- end
-
- ##
- # Strip off the leading margin
-
- def strip_leading(size)
- if @text.size > size
- @text[0,size] = ""
- else
- @text = ""
- end
- end
-
- def to_s
- "#@type#@level: #@text"
- end
- end
-
- ##
- # A container for all the lines.
-
- class Lines
-
- include Enumerable
-
- attr_reader :lines # :nodoc:
-
- def initialize(lines)
- @lines = lines
- rewind
- end
-
- def empty?
- @lines.size.zero?
- end
-
- def each
- @lines.each do |line|
- yield line unless line.deleted
- end
- end
-
-# def [](index)
-# @lines[index]
-# end
-
- def rewind
- @nextline = 0
- end
-
- def next
- begin
- res = @lines[@nextline]
- @nextline += 1 if @nextline < @lines.size
- end while res and res.deleted and @nextline < @lines.size
- res
- end
-
- def unget
- @nextline -= 1
- end
-
- def delete(a_line)
- a_line.deleted = true
- end
-
- def normalize
- margin = @lines.collect{|l| l.leading_spaces}.min
- margin = 0 if margin == :INFINITY
- @lines.each {|line| line.strip_leading(margin) } if margin > 0
- end
-
- def as_text
- @lines.map {|l| l.text}.join("\n")
- end
-
- def line_types
- @lines.map {|l| l.type }
- end
-
- end
-
-end
-
diff --git a/lib/rdoc/markup/preprocess.rb b/lib/rdoc/markup/preprocess.rb
deleted file mode 100644
index 00dd4be4ad..0000000000
--- a/lib/rdoc/markup/preprocess.rb
+++ /dev/null
@@ -1,75 +0,0 @@
-require 'rdoc/markup'
-
-##
-# Handle common directives that can occur in a block of text:
-#
-# : include : filename
-
-class RDoc::Markup::PreProcess
-
- def initialize(input_file_name, include_path)
- @input_file_name = input_file_name
- @include_path = include_path
- end
-
- ##
- # Look for common options in a chunk of text. Options that we don't handle
- # are yielded to the caller.
-
- def handle(text)
- text.gsub!(/^([ \t]*#?[ \t]*):(\w+):([ \t]*)(.+)?\n/) do
- next $& if $3.empty? and $4 and $4[0, 1] == ':'
-
- prefix = $1
- directive = $2.downcase
- param = $4
-
- case directive
- when 'include' then
- filename = param.split[0]
- include_file filename, prefix
-
- else
- result = yield directive, param
- result = "#{prefix}:#{directive}: #{param}\n" unless result
- result
- end
- end
- end
-
- private
-
- ##
- # Include a file, indenting it correctly.
-
- def include_file(name, indent)
- if full_name = find_include_file(name) then
- content = File.open(full_name) {|f| f.read}
- # strip leading '#'s, but only if all lines start with them
- if content =~ /^[^#]/
- content.gsub(/^/, indent)
- else
- content.gsub(/^#?/, indent)
- end
- else
- $stderr.puts "Couldn't find file to include: '#{name}'"
- ''
- end
- end
-
- ##
- # Look for the given file in the directory containing the current file,
- # and then in each of the directories specified in the RDOC_INCLUDE path
-
- def find_include_file(name)
- to_search = [ File.dirname(@input_file_name) ].concat @include_path
- to_search.each do |dir|
- full_name = File.join(dir, name)
- stat = File.stat(full_name) rescue next
- return full_name if stat.readable?
- end
- nil
- end
-
-end
-
diff --git a/lib/rdoc/markup/sample/rdoc2latex.rb b/lib/rdoc/markup/sample/rdoc2latex.rb
new file mode 100644
index 0000000000..26563b75da
--- /dev/null
+++ b/lib/rdoc/markup/sample/rdoc2latex.rb
@@ -0,0 +1,16 @@
+#!/usr/local/bin/ruby
+# Illustration of a script to convert an RDoc-style file to a LaTeX
+# document
+
+require 'rdoc/markup/simple_markup'
+require 'rdoc/markup/simple_markup/to_latex'
+
+p = SM::SimpleMarkup.new
+h = SM::ToLaTeX.new
+
+#puts "\\documentclass{report}"
+#puts "\\usepackage{tabularx}"
+#puts "\\usepackage{parskip}"
+#puts "\\begin{document}"
+puts p.convert(ARGF.read, h)
+#puts "\\end{document}"
diff --git a/lib/rdoc/markup/sample/sample.rb b/lib/rdoc/markup/sample/sample.rb
new file mode 100644
index 0000000000..a375b54564
--- /dev/null
+++ b/lib/rdoc/markup/sample/sample.rb
@@ -0,0 +1,42 @@
+# This program illustrates the basic use of the SimpleMarkup
+# class. It extracts the first comment block from the
+# simple_markup.rb file and converts it into HTML on
+# standard output. Run it using
+#
+# % ruby sample.rb
+#
+# You should be in the sample/ directory when you do this,
+# as it hardwires the path to the files it needs to require.
+# This isn't necessary in the code you write once you've
+# installed the package.
+#
+# For a better way of formatting code comment blocks (and more)
+# see the rdoc package.
+#
+
+$:.unshift "../../.."
+
+require 'rdoc/markup/simple_markup'
+require 'rdoc/markup/simple_markup/to_html'
+
+# Extract the comment block from the source file
+
+input_string = ""
+
+File.foreach("../simple_markup.rb") do |line|
+ break unless line.gsub!(/^\# ?/, '')
+ input_string << line
+end
+
+# Create a markup object
+markup = SM::SimpleMarkup.new
+
+# Attach it to an HTML formatter
+h = SM::ToHtml.new
+
+# And convert out comment block to html. Wrap it a body
+# tag pair to let browsers view it
+
+puts "<html><body>"
+puts markup.convert(input_string, h)
+puts "</body></html>"
diff --git a/lib/rdoc/markup/simple_markup.rb b/lib/rdoc/markup/simple_markup.rb
new file mode 100644
index 0000000000..8193ca02d4
--- /dev/null
+++ b/lib/rdoc/markup/simple_markup.rb
@@ -0,0 +1,476 @@
+# = Introduction
+#
+# SimpleMarkup parses plain text documents and attempts to decompose
+# them into their constituent parts. Some of these parts are high-level:
+# paragraphs, chunks of verbatim text, list entries and the like. Other
+# parts happen at the character level: a piece of bold text, a word in
+# code font. This markup is similar in spirit to that used on WikiWiki
+# webs, where folks create web pages using a simple set of formatting
+# rules.
+#
+# SimpleMarkup itself does no output formatting: this is left to a
+# different set of classes.
+#
+# SimpleMarkup is extendable at runtime: you can add new markup
+# elements to be recognised in the documents that SimpleMarkup parses.
+#
+# SimpleMarkup is intended to be the basis for a family of tools which
+# share the common requirement that simple, plain-text should be
+# rendered in a variety of different output formats and media. It is
+# envisaged that SimpleMarkup could be the basis for formating RDoc
+# style comment blocks, Wiki entries, and online FAQs.
+#
+# = Basic Formatting
+#
+# * SimpleMarkup looks for a document's natural left margin. This is
+# used as the initial margin for the document.
+#
+# * Consecutive lines starting at this margin are considered to be a
+# paragraph.
+#
+# * If a paragraph starts with a "*", "-", or with "<digit>.", then it is
+# taken to be the start of a list. The margin in increased to be the
+# first non-space following the list start flag. Subsequent lines
+# should be indented to this new margin until the list ends. For
+# example:
+#
+# * this is a list with three paragraphs in
+# the first item. This is the first paragraph.
+#
+# And this is the second paragraph.
+#
+# 1. This is an indented, numbered list.
+# 2. This is the second item in that list
+#
+# This is the third conventional paragraph in the
+# first list item.
+#
+# * This is the second item in the original list
+#
+# * You can also construct labeled lists, sometimes called description
+# or definition lists. Do this by putting the label in square brackets
+# and indenting the list body:
+#
+# [cat] a small furry mammal
+# that seems to sleep a lot
+#
+# [ant] a little insect that is known
+# to enjoy picnics
+#
+# A minor variation on labeled lists uses two colons to separate the
+# label from the list body:
+#
+# cat:: a small furry mammal
+# that seems to sleep a lot
+#
+# ant:: a little insect that is known
+# to enjoy picnics
+#
+# This latter style guarantees that the list bodies' left margins are
+# aligned: think of them as a two column table.
+#
+# * Any line that starts to the right of the current margin is treated
+# as verbatim text. This is useful for code listings. The example of a
+# list above is also verbatim text.
+#
+# * A line starting with an equals sign (=) is treated as a
+# heading. Level one headings have one equals sign, level two headings
+# have two,and so on.
+#
+# * A line starting with three or more hyphens (at the current indent)
+# generates a horizontal rule. THe more hyphens, the thicker the rule
+# (within reason, and if supported by the output device)
+#
+# * You can use markup within text (except verbatim) to change the
+# appearance of parts of that text. Out of the box, SimpleMarkup
+# supports word-based and general markup.
+#
+# Word-based markup uses flag characters around individual words:
+#
+# [\*word*] displays word in a *bold* font
+# [\_word_] displays word in an _emphasized_ font
+# [\+word+] displays word in a +code+ font
+#
+# General markup affects text between a start delimiter and and end
+# delimiter. Not surprisingly, these delimiters look like HTML markup.
+#
+# [\<b>text...</b>] displays word in a *bold* font
+# [\<em>text...</em>] displays word in an _emphasized_ font
+# [\<i>text...</i>] displays word in an _emphasized_ font
+# [\<tt>text...</tt>] displays word in a +code+ font
+#
+# Unlike conventional Wiki markup, general markup can cross line
+# boundaries. You can turn off the interpretation of markup by
+# preceding the first character with a backslash, so \\\<b>bold
+# text</b> and \\\*bold* produce \<b>bold text</b> and \*bold
+# respectively.
+#
+# = Using SimpleMarkup
+#
+# For information on using SimpleMarkup programatically,
+# see SM::SimpleMarkup.
+#
+# Author:: Dave Thomas, dave@pragmaticprogrammer.com
+# Version:: 0.0
+# License:: Ruby license
+
+
+
+require 'rdoc/markup/simple_markup/fragments'
+require 'rdoc/markup/simple_markup/lines.rb'
+
+module SM #:nodoc:
+
+ # == Synopsis
+ #
+ # This code converts <tt>input_string</tt>, which is in the format
+ # described in markup/simple_markup.rb, to HTML. The conversion
+ # takes place in the +convert+ method, so you can use the same
+ # SimpleMarkup object to convert multiple input strings.
+ #
+ # require 'rdoc/markup/simple_markup'
+ # require 'rdoc/markup/simple_markup/to_html'
+ #
+ # p = SM::SimpleMarkup.new
+ # h = SM::ToHtml.new
+ #
+ # puts p.convert(input_string, h)
+ #
+ # You can extend the SimpleMarkup parser to recognise new markup
+ # sequences, and to add special processing for text that matches a
+ # regular epxression. Here we make WikiWords significant to the parser,
+ # and also make the sequences {word} and \<no>text...</no> signify
+ # strike-through text. When then subclass the HTML output class to deal
+ # with these:
+ #
+ # require 'rdoc/markup/simple_markup'
+ # require 'rdoc/markup/simple_markup/to_html'
+ #
+ # class WikiHtml < SM::ToHtml
+ # def handle_special_WIKIWORD(special)
+ # "<font color=red>" + special.text + "</font>"
+ # end
+ # end
+ #
+ # p = SM::SimpleMarkup.new
+ # p.add_word_pair("{", "}", :STRIKE)
+ # p.add_html("no", :STRIKE)
+ #
+ # p.add_special(/\b([A-Z][a-z]+[A-Z]\w+)/, :WIKIWORD)
+ #
+ # h = WikiHtml.new
+ # h.add_tag(:STRIKE, "<strike>", "</strike>")
+ #
+ # puts "<body>" + p.convert(ARGF.read, h) + "</body>"
+ #
+ # == Output Formatters
+ #
+ # _missing_
+ #
+ #
+
+ class SimpleMarkup
+
+ SPACE = ?\s
+
+ # List entries look like:
+ # * text
+ # 1. text
+ # [label] text
+ # label:: text
+ #
+ # Flag it as a list entry, and
+ # work out the indent for subsequent lines
+
+ SIMPLE_LIST_RE = /^(
+ ( \* (?# bullet)
+ |- (?# bullet)
+ |\d+\. (?# numbered )
+ |[A-Za-z]\. (?# alphabetically numbered )
+ )
+ \s+
+ )\S/x
+
+ LABEL_LIST_RE = /^(
+ ( \[.*?\] (?# labeled )
+ |\S.*:: (?# note )
+ )(?:\s+|$)
+ )/x
+
+
+ ##
+ # take a block of text and use various heuristics to determine
+ # it's structure (paragraphs, lists, and so on). Invoke an
+ # event handler as we identify significant chunks.
+ #
+
+ def initialize
+ @am = AttributeManager.new
+ @output = nil
+ end
+
+ ##
+ # Add to the sequences used to add formatting to an individual word
+ # (such as *bold*). Matching entries will generate attibutes
+ # that the output formatters can recognize by their +name+
+
+ def add_word_pair(start, stop, name)
+ @am.add_word_pair(start, stop, name)
+ end
+
+ ##
+ # Add to the sequences recognized as general markup
+ #
+
+ def add_html(tag, name)
+ @am.add_html(tag, name)
+ end
+
+ ##
+ # Add to other inline sequences. For example, we could add
+ # WikiWords using something like:
+ #
+ # parser.add_special(/\b([A-Z][a-z]+[A-Z]\w+)/, :WIKIWORD)
+ #
+ # Each wiki word will be presented to the output formatter
+ # via the accept_special method
+ #
+
+ def add_special(pattern, name)
+ @am.add_special(pattern, name)
+ end
+
+
+ # We take a string, split it into lines, work out the type of
+ # each line, and from there deduce groups of lines (for example
+ # all lines in a paragraph). We then invoke the output formatter
+ # using a Visitor to display the result
+
+ def convert(str, op)
+ @lines = Lines.new(str.split(/\r?\n/).collect { |aLine|
+ Line.new(aLine) })
+ return "" if @lines.empty?
+ @lines.normalize
+ assign_types_to_lines
+ group = group_lines
+ # call the output formatter to handle the result
+ # group.to_a.each {|i| p i}
+ group.accept(@am, op)
+ end
+
+
+ #######
+ private
+ #######
+
+
+ ##
+ # Look through the text at line indentation. We flag each line as being
+ # Blank, a paragraph, a list element, or verbatim text
+ #
+
+ def assign_types_to_lines(margin = 0, level = 0)
+
+ while line = @lines.next
+ if line.isBlank?
+ line.stamp(Line::BLANK, level)
+ next
+ end
+
+ # if a line contains non-blanks before the margin, then it must belong
+ # to an outer level
+
+ text = line.text
+
+ for i in 0...margin
+ if text[i] != SPACE
+ @lines.unget
+ return
+ end
+ end
+
+ active_line = text[margin..-1]
+
+ # Rules (horizontal lines) look like
+ #
+ # --- (three or more hyphens)
+ #
+ # The more hyphens, the thicker the rule
+ #
+
+ if /^(---+)\s*$/ =~ active_line
+ line.stamp(Line::RULE, level, $1.length-2)
+ next
+ end
+
+ # Then look for list entries. First the ones that have to have
+ # text following them (* xxx, - xxx, and dd. xxx)
+
+ if SIMPLE_LIST_RE =~ active_line
+
+ offset = margin + $1.length
+ prefix = $2
+ prefix_length = prefix.length
+
+ flag = case prefix
+ when "*","-" then ListBase::BULLET
+ when /^\d/ then ListBase::NUMBER
+ when /^[A-Z]/ then ListBase::UPPERALPHA
+ when /^[a-z]/ then ListBase::LOWERALPHA
+ else raise "Invalid List Type: #{self.inspect}"
+ end
+
+ line.stamp(Line::LIST, level+1, prefix, flag)
+ text[margin, prefix_length] = " " * prefix_length
+ assign_types_to_lines(offset, level + 1)
+ next
+ end
+
+
+ if LABEL_LIST_RE =~ active_line
+ offset = margin + $1.length
+ prefix = $2
+ prefix_length = prefix.length
+
+ next if handled_labeled_list(line, level, margin, offset, prefix)
+ end
+
+ # Headings look like
+ # = Main heading
+ # == Second level
+ # === Third
+ #
+ # Headings reset the level to 0
+
+ if active_line[0] == ?= and active_line =~ /^(=+)\s*(.*)/
+ prefix_length = $1.length
+ prefix_length = 6 if prefix_length > 6
+ line.stamp(Line::HEADING, 0, prefix_length)
+ line.strip_leading(margin + prefix_length)
+ next
+ end
+
+ # If the character's a space, then we have verbatim text,
+ # otherwise
+
+ if active_line[0] == SPACE
+ line.strip_leading(margin) if margin > 0
+ line.stamp(Line::VERBATIM, level)
+ else
+ line.stamp(Line::PARAGRAPH, level)
+ end
+ end
+ end
+
+ # Handle labeled list entries, We have a special case
+ # to deal with. Because the labels can be long, they force
+ # the remaining block of text over the to right:
+ #
+ # this is a long label that I wrote:: and here is the
+ # block of text with
+ # a silly margin
+ #
+ # So we allow the special case. If the label is followed
+ # by nothing, and if the following line is indented, then
+ # we take the indent of that line as the new margin
+ #
+ # this is a long label that I wrote::
+ # here is a more reasonably indented block which
+ # will ab attached to the label.
+ #
+
+ def handled_labeled_list(line, level, margin, offset, prefix)
+ prefix_length = prefix.length
+ text = line.text
+ flag = nil
+ case prefix
+ when /^\[/
+ flag = ListBase::LABELED
+ prefix = prefix[1, prefix.length-2]
+ when /:$/
+ flag = ListBase::NOTE
+ prefix.chop!
+ else raise "Invalid List Type: #{self.inspect}"
+ end
+
+ # body is on the next line
+
+ if text.length <= offset
+ original_line = line
+ line = @lines.next
+ return(false) unless line
+ text = line.text
+
+ for i in 0..margin
+ if text[i] != SPACE
+ @lines.unget
+ return false
+ end
+ end
+ i = margin
+ i += 1 while text[i] == SPACE
+ if i >= text.length
+ @lines.unget
+ return false
+ else
+ offset = i
+ prefix_length = 0
+ @lines.delete(original_line)
+ end
+ end
+
+ line.stamp(Line::LIST, level+1, prefix, flag)
+ text[margin, prefix_length] = " " * prefix_length
+ assign_types_to_lines(offset, level + 1)
+ return true
+ end
+
+ # Return a block consisting of fragments which are
+ # paragraphs, list entries or verbatim text. We merge consecutive
+ # lines of the same type and level together. We are also slightly
+ # tricky with lists: the lines following a list introduction
+ # look like paragraph lines at the next level, and we remap them
+ # into list entries instead
+
+ def group_lines
+ @lines.rewind
+
+ inList = false
+ wantedType = wantedLevel = nil
+
+ block = LineCollection.new
+ group = nil
+
+ while line = @lines.next
+ if line.level == wantedLevel and line.type == wantedType
+ group.add_text(line.text)
+ else
+ group = block.fragment_for(line)
+ block.add(group)
+ if line.type == Line::LIST
+ wantedType = Line::PARAGRAPH
+ else
+ wantedType = line.type
+ end
+ wantedLevel = line.type == Line::HEADING ? line.param : line.level
+ end
+ end
+
+ block.normalize
+ block
+ end
+
+ ## for debugging, we allow access to our line contents as text
+ def content
+ @lines.as_text
+ end
+ public :content
+
+ ## for debugging, return the list of line types
+ def get_line_types
+ @lines.line_types
+ end
+ public :get_line_types
+ end
+
+end
diff --git a/lib/rdoc/markup/simple_markup/fragments.rb b/lib/rdoc/markup/simple_markup/fragments.rb
new file mode 100644
index 0000000000..6ca06382ab
--- /dev/null
+++ b/lib/rdoc/markup/simple_markup/fragments.rb
@@ -0,0 +1,328 @@
+require 'rdoc/markup/simple_markup/lines.rb'
+#require 'rdoc/markup/simple_markup/to_flow.rb'
+
+module SM
+
+ ##
+ # A Fragment is a chunk of text, subclassed as a paragraph, a list
+ # entry, or verbatim text
+
+ class Fragment
+ attr_reader :level, :param, :txt
+ attr_accessor :type
+
+ def initialize(level, param, type, txt)
+ @level = level
+ @param = param
+ @type = type
+ @txt = ""
+ add_text(txt) if txt
+ end
+
+ def add_text(txt)
+ @txt << " " if @txt.length > 0
+ @txt << txt.tr_s("\n ", " ").strip
+ end
+
+ def to_s
+ "L#@level: #{self.class.name.split('::')[-1]}\n#@txt"
+ end
+
+ ######
+ # This is a simple factory system that lets us associate fragement
+ # types (a string) with a subclass of fragment
+
+ TYPE_MAP = {}
+
+ def Fragment.type_name(name)
+ TYPE_MAP[name] = self
+ end
+
+ def Fragment.for(line)
+ klass = TYPE_MAP[line.type] ||
+ raise("Unknown line type: '#{line.type.inspect}:' '#{line.text}'")
+ return klass.new(line.level, line.param, line.flag, line.text)
+ end
+ end
+
+ ##
+ # A paragraph is a fragment which gets wrapped to fit. We remove all
+ # newlines when we're created, and have them put back on output
+
+ class Paragraph < Fragment
+ type_name Line::PARAGRAPH
+ end
+
+ class BlankLine < Paragraph
+ type_name Line::BLANK
+ end
+
+ class Heading < Paragraph
+ type_name Line::HEADING
+
+ def head_level
+ @param.to_i
+ end
+ end
+
+ ##
+ # A List is a fragment with some kind of label
+ #
+
+ class ListBase < Paragraph
+ # List types
+ BULLET = :BULLET
+ NUMBER = :NUMBER
+ UPPERALPHA = :UPPERALPHA
+ LOWERALPHA = :LOWERALPHA
+ LABELED = :LABELED
+ NOTE = :NOTE
+ end
+
+ class ListItem < ListBase
+ type_name Line::LIST
+
+ # def label
+ # am = AttributeManager.new(@param)
+ # am.flow
+ # end
+ end
+
+ class ListStart < ListBase
+ def initialize(level, param, type)
+ super(level, param, type, nil)
+ end
+ end
+
+ class ListEnd < ListBase
+ def initialize(level, type)
+ super(level, "", type, nil)
+ end
+ end
+
+ ##
+ # Verbatim code contains lines that don't get wrapped.
+
+ class Verbatim < Fragment
+ type_name Line::VERBATIM
+
+ def add_text(txt)
+ @txt << txt.chomp << "\n"
+ end
+
+ end
+
+ ##
+ # A horizontal rule
+ class Rule < Fragment
+ type_name Line::RULE
+ end
+
+
+ # Collect groups of lines together. Each group
+ # will end up containing a flow of text
+
+ class LineCollection
+
+ def initialize
+ @fragments = []
+ end
+
+ def add(fragment)
+ @fragments << fragment
+ end
+
+ def each(&b)
+ @fragments.each(&b)
+ end
+
+ # For testing
+ def to_a
+ @fragments.map {|fragment| fragment.to_s}
+ end
+
+ # Factory for different fragment types
+ def fragment_for(*args)
+ Fragment.for(*args)
+ end
+
+ # tidy up at the end
+ def normalize
+ change_verbatim_blank_lines
+ add_list_start_and_ends
+ add_list_breaks
+ tidy_blank_lines
+ end
+
+ def to_s
+ @fragments.join("\n----\n")
+ end
+
+ def accept(am, visitor)
+
+ visitor.start_accepting
+
+ @fragments.each do |fragment|
+ case fragment
+ when Verbatim
+ visitor.accept_verbatim(am, fragment)
+ when Rule
+ visitor.accept_rule(am, fragment)
+ when ListStart
+ visitor.accept_list_start(am, fragment)
+ when ListEnd
+ visitor.accept_list_end(am, fragment)
+ when ListItem
+ visitor.accept_list_item(am, fragment)
+ when BlankLine
+ visitor.accept_blank_line(am, fragment)
+ when Heading
+ visitor.accept_heading(am, fragment)
+ when Paragraph
+ visitor.accept_paragraph(am, fragment)
+ end
+ end
+
+ visitor.end_accepting
+ end
+ #######
+ private
+ #######
+
+ # If you have:
+ #
+ # normal paragraph text.
+ #
+ # this is code
+ #
+ # and more code
+ #
+ # You'll end up with the fragments Paragraph, BlankLine,
+ # Verbatim, BlankLine, Verbatim, BlankLine, etc
+ #
+ # The BlankLine in the middle of the verbatim chunk needs to
+ # be changed to a real verbatim newline, and the two
+ # verbatim blocks merged
+ #
+ #
+ def change_verbatim_blank_lines
+ frag_block = nil
+ blank_count = 0
+ @fragments.each_with_index do |frag, i|
+ if frag_block.nil?
+ frag_block = frag if Verbatim === frag
+ else
+ case frag
+ when Verbatim
+ blank_count.times { frag_block.add_text("\n") }
+ blank_count = 0
+ frag_block.add_text(frag.txt)
+ @fragments[i] = nil # remove out current fragment
+ when BlankLine
+ if frag_block
+ blank_count += 1
+ @fragments[i] = nil
+ end
+ else
+ frag_block = nil
+ blank_count = 0
+ end
+ end
+ end
+ @fragments.compact!
+ end
+
+ # List nesting is implicit given the level of
+ # Make it explicit, just to make life a tad
+ # easier for the output processors
+
+ def add_list_start_and_ends
+ level = 0
+ res = []
+ type_stack = []
+
+ @fragments.each do |fragment|
+ # $stderr.puts "#{level} : #{fragment.class.name} : #{fragment.level}"
+ new_level = fragment.level
+ while (level < new_level)
+ level += 1
+ type = fragment.type
+ res << ListStart.new(level, fragment.param, type) if type
+ type_stack.push type
+ # $stderr.puts "Start: #{level}"
+ end
+
+ while level > new_level
+ type = type_stack.pop
+ res << ListEnd.new(level, type) if type
+ level -= 1
+ # $stderr.puts "End: #{level}, #{type}"
+ end
+
+ res << fragment
+ level = fragment.level
+ end
+ level.downto(1) do |i|
+ type = type_stack.pop
+ res << ListEnd.new(i, type) if type
+ end
+
+ @fragments = res
+ end
+
+ # now insert start/ends between list entries at the
+ # same level that have different element types
+
+ def add_list_breaks
+ res = @fragments
+
+ @fragments = []
+ list_stack = []
+
+ res.each do |fragment|
+ case fragment
+ when ListStart
+ list_stack.push fragment
+ when ListEnd
+ start = list_stack.pop
+ fragment.type = start.type
+ when ListItem
+ l = list_stack.last
+ if fragment.type != l.type
+ @fragments << ListEnd.new(l.level, l.type)
+ start = ListStart.new(l.level, fragment.param, fragment.type)
+ @fragments << start
+ list_stack.pop
+ list_stack.push start
+ end
+ else
+ ;
+ end
+ @fragments << fragment
+ end
+ end
+
+ # Finally tidy up the blank lines:
+ # * change Blank/ListEnd into ListEnd/Blank
+ # * remove blank lines at the front
+
+ def tidy_blank_lines
+ (@fragments.size - 1).times do |i|
+ if @fragments[i].kind_of?(BlankLine) and
+ @fragments[i+1].kind_of?(ListEnd)
+ @fragments[i], @fragments[i+1] = @fragments[i+1], @fragments[i]
+ end
+ end
+
+ # remove leading blanks
+ @fragments.each_with_index do |f, i|
+ break unless f.kind_of? BlankLine
+ @fragments[i] = nil
+ end
+
+ @fragments.compact!
+ end
+
+ end
+
+end
diff --git a/lib/rdoc/markup/simple_markup/inline.rb b/lib/rdoc/markup/simple_markup/inline.rb
new file mode 100644
index 0000000000..d54fe1e667
--- /dev/null
+++ b/lib/rdoc/markup/simple_markup/inline.rb
@@ -0,0 +1,340 @@
+module SM
+
+ # We manage a set of attributes. Each attribute has a symbol name
+ # and a bit value
+
+ class Attribute
+ SPECIAL = 1
+
+ @@name_to_bitmap = { :_SPECIAL_ => SPECIAL }
+ @@next_bitmap = 2
+
+ def Attribute.bitmap_for(name)
+ bitmap = @@name_to_bitmap[name]
+ if !bitmap
+ bitmap = @@next_bitmap
+ @@next_bitmap <<= 1
+ @@name_to_bitmap[name] = bitmap
+ end
+ bitmap
+ end
+
+ def Attribute.as_string(bitmap)
+ return "none" if bitmap.zero?
+ res = []
+ @@name_to_bitmap.each do |name, bit|
+ res << name if (bitmap & bit) != 0
+ end
+ res.join(",")
+ end
+
+ def Attribute.each_name_of(bitmap)
+ @@name_to_bitmap.each do |name, bit|
+ next if bit == SPECIAL
+ yield name.to_s if (bitmap & bit) != 0
+ end
+ end
+ end
+
+
+ # An AttrChanger records a change in attributes. It contains
+ # a bitmap of the attributes to turn on, and a bitmap of those to
+ # turn off
+
+ AttrChanger = Struct.new(:turn_on, :turn_off)
+ class AttrChanger
+ def to_s
+ "Attr: +#{Attribute.as_string(@turn_on)}/-#{Attribute.as_string(@turn_on)}"
+ end
+ end
+
+ # An array of attributes which parallels the characters in a string
+ class AttrSpan
+ def initialize(length)
+ @attrs = Array.new(length, 0)
+ end
+
+ def set_attrs(start, length, bits)
+ for i in start ... (start+length)
+ @attrs[i] |= bits
+ end
+ end
+
+ def [](n)
+ @attrs[n]
+ end
+ end
+
+ ##
+ # Hold details of a special sequence
+
+ class Special
+ attr_reader :type
+ attr_accessor :text
+
+ def initialize(type, text)
+ @type, @text = type, text
+ end
+
+ def ==(o)
+ self.text == o.text && self.type == o.type
+ end
+
+ def to_s
+ "Special: type=#{type}, text=#{text.dump}"
+ end
+ end
+
+ class AttributeManager
+
+ NULL = "\000".freeze
+
+ ##
+ # We work by substituting non-printing characters in to the
+ # text. For now I'm assuming that I can substitute
+ # a character in the range 0..8 for a 7 bit character
+ # without damaging the encoded string, but this might
+ # be optimistic
+ #
+
+ A_PROTECT = 004
+ PROTECT_ATTR = A_PROTECT.chr
+
+ # This maps delimiters that occur around words (such as
+ # *bold* or +tt+) where the start and end delimiters
+ # and the same. This lets us optimize the regexp
+ MATCHING_WORD_PAIRS = {}
+
+ # And this is used when the delimiters aren't the same. In this
+ # case the hash maps a pattern to the attribute character
+ WORD_PAIR_MAP = {}
+
+ # This maps HTML tags to the corresponding attribute char
+ HTML_TAGS = {}
+
+ # And this maps _special_ sequences to a name. A special sequence
+ # is something like a WikiWord
+ SPECIAL = {}
+
+ # Return an attribute object with the given turn_on
+ # and turn_off bits set
+
+ def attribute(turn_on, turn_off)
+ AttrChanger.new(turn_on, turn_off)
+ end
+
+
+ def change_attribute(current, new)
+ diff = current ^ new
+ attribute(new & diff, current & diff)
+ end
+
+ def changed_attribute_by_name(current_set, new_set)
+ current = new = 0
+ current_set.each {|name| current |= Attribute.bitmap_for(name) }
+ new_set.each {|name| new |= Attribute.bitmap_for(name) }
+ change_attribute(current, new)
+ end
+
+ def copy_string(start_pos, end_pos)
+ res = @str[start_pos...end_pos]
+ res.gsub!(/\000/, '')
+ res
+ end
+
+ # Map attributes like <b>text</b>to the sequence \001\002<char>\001\003<char>,
+ # where <char> is a per-attribute specific character
+
+ def convert_attrs(str, attrs)
+ # first do matching ones
+ tags = MATCHING_WORD_PAIRS.keys.join("")
+ re = "(^|\\W)([#{tags}])([A-Za-z_]+?)\\2(\\W|\$)"
+# re = "(^|\\W)([#{tags}])(\\S+?)\\2(\\W|\$)"
+ 1 while str.gsub!(Regexp.new(re)) {
+ attr = MATCHING_WORD_PAIRS[$2];
+ attrs.set_attrs($`.length + $1.length + $2.length, $3.length, attr)
+ $1 + NULL*$2.length + $3 + NULL*$2.length + $4
+ }
+
+ # then non-matching
+ unless WORD_PAIR_MAP.empty?
+ WORD_PAIR_MAP.each do |regexp, attr|
+ str.gsub!(regexp) {
+ attrs.set_attrs($`.length + $1.length, $2.length, attr)
+ NULL*$1.length + $2 + NULL*$3.length
+ }
+ end
+ end
+ end
+
+ def convert_html(str, attrs)
+ tags = HTML_TAGS.keys.join("|")
+ re = "<(#{tags})>(.*?)</\\1>"
+ 1 while str.gsub!(Regexp.new(re, Regexp::IGNORECASE)) {
+ attr = HTML_TAGS[$1.downcase]
+ html_length = $1.length + 2
+ seq = NULL * html_length
+ attrs.set_attrs($`.length + html_length, $2.length, attr)
+ seq + $2 + seq + NULL
+ }
+ end
+
+ def convert_specials(str, attrs)
+ unless SPECIAL.empty?
+ SPECIAL.each do |regexp, attr|
+ str.scan(regexp) do
+ attrs.set_attrs($`.length, $&.length, attr | Attribute::SPECIAL)
+ end
+ end
+ end
+ end
+
+ # A \ in front of a character that would normally be
+ # processed turns off processing. We do this by turning
+ # \< into <#{PROTECT}
+
+ PROTECTABLE = [ "<" << "\\" ] #"
+
+
+ def mask_protected_sequences
+ protect_pattern = Regexp.new("\\\\([#{Regexp.escape(PROTECTABLE.join(''))}])")
+ @str.gsub!(protect_pattern, "\\1#{PROTECT_ATTR}")
+ end
+
+ def unmask_protected_sequences
+ @str.gsub!(/(.)#{PROTECT_ATTR}/, "\\1\000")
+ end
+
+ def initialize
+ add_word_pair("*", "*", :BOLD)
+ add_word_pair("_", "_", :EM)
+ add_word_pair("+", "+", :TT)
+
+ add_html("em", :EM)
+ add_html("i", :EM)
+ add_html("b", :BOLD)
+ add_html("tt", :TT)
+ add_html("code", :TT)
+
+ add_special(/<!--(.*?)-->/, :COMMENT)
+ end
+
+ def add_word_pair(start, stop, name)
+ raise "Word flags may not start '<'" if start[0] == ?<
+ bitmap = Attribute.bitmap_for(name)
+ if start == stop
+ MATCHING_WORD_PAIRS[start] = bitmap
+ else
+ pattern = Regexp.new("(" + Regexp.escape(start) + ")" +
+# "([A-Za-z]+)" +
+ "(\\S+)" +
+ "(" + Regexp.escape(stop) +")")
+ WORD_PAIR_MAP[pattern] = bitmap
+ end
+ PROTECTABLE << start[0,1]
+ PROTECTABLE.uniq!
+ end
+
+ def add_html(tag, name)
+ HTML_TAGS[tag.downcase] = Attribute.bitmap_for(name)
+ end
+
+ def add_special(pattern, name)
+ SPECIAL[pattern] = Attribute.bitmap_for(name)
+ end
+
+ def flow(str)
+ @str = str
+
+ puts("Before flow, str='#{@str.dump}'") if $DEBUG
+ mask_protected_sequences
+
+ @attrs = AttrSpan.new(@str.length)
+
+ puts("After protecting, str='#{@str.dump}'") if $DEBUG
+ convert_attrs(@str, @attrs)
+ convert_html(@str, @attrs)
+ convert_specials(str, @attrs)
+ unmask_protected_sequences
+ puts("After flow, str='#{@str.dump}'") if $DEBUG
+ return split_into_flow
+ end
+
+ def display_attributes
+ puts
+ puts @str.tr(NULL, "!")
+ bit = 1
+ 16.times do |bno|
+ line = ""
+ @str.length.times do |i|
+ if (@attrs[i] & bit) == 0
+ line << " "
+ else
+ if bno.zero?
+ line << "S"
+ else
+ line << ("%d" % (bno+1))
+ end
+ end
+ end
+ puts(line) unless line =~ /^ *$/
+ bit <<= 1
+ end
+ end
+
+ def split_into_flow
+
+ display_attributes if $DEBUG
+
+ res = []
+ current_attr = 0
+ str = ""
+
+
+ str_len = @str.length
+
+ # skip leading invisible text
+ i = 0
+ i += 1 while i < str_len and @str[i].zero?
+ start_pos = i
+
+ # then scan the string, chunking it on attribute changes
+ while i < str_len
+ new_attr = @attrs[i]
+ if new_attr != current_attr
+ if i > start_pos
+ res << copy_string(start_pos, i)
+ start_pos = i
+ end
+
+ res << change_attribute(current_attr, new_attr)
+ current_attr = new_attr
+
+ if (current_attr & Attribute::SPECIAL) != 0
+ i += 1 while i < str_len and (@attrs[i] & Attribute::SPECIAL) != 0
+ res << Special.new(current_attr, copy_string(start_pos, i))
+ start_pos = i
+ next
+ end
+ end
+
+ # move on, skipping any invisible characters
+ begin
+ i += 1
+ end while i < str_len and @str[i].zero?
+ end
+
+ # tidy up trailing text
+ if start_pos < str_len
+ res << copy_string(start_pos, str_len)
+ end
+
+ # and reset to all attributes off
+ res << change_attribute(current_attr, 0) if current_attr != 0
+
+ return res
+ end
+
+ end
+
+end
diff --git a/lib/rdoc/markup/simple_markup/lines.rb b/lib/rdoc/markup/simple_markup/lines.rb
new file mode 100644
index 0000000000..4e294f27dc
--- /dev/null
+++ b/lib/rdoc/markup/simple_markup/lines.rb
@@ -0,0 +1,151 @@
+##########################################################################
+#
+# We store the lines we're working on as objects of class Line.
+# These contain the text of the line, along with a flag indicating the
+# line type, and an indentation level
+
+module SM
+
+ class Line
+ INFINITY = 9999
+
+ BLANK = :BLANK
+ HEADING = :HEADING
+ LIST = :LIST
+ RULE = :RULE
+ PARAGRAPH = :PARAGRAPH
+ VERBATIM = :VERBATIM
+
+ # line type
+ attr_accessor :type
+
+ # The indentation nesting level
+ attr_accessor :level
+
+ # The contents
+ attr_accessor :text
+
+ # A prefix or parameter. For LIST lines, this is
+ # the text that introduced the list item (the label)
+ attr_accessor :param
+
+ # A flag. For list lines, this is the type of the list
+ attr_accessor :flag
+
+ # the number of leading spaces
+ attr_accessor :leading_spaces
+
+ # true if this line has been deleted from the list of lines
+ attr_accessor :deleted
+
+
+ def initialize(text)
+ @text = text.dup
+ @deleted = false
+
+ # expand tabs
+ 1 while @text.gsub!(/\t+/) { ' ' * (8*$&.length - $`.length % 8)} && $~ #`
+
+ # Strip trailing whitespace
+ @text.sub!(/\s+$/, '')
+
+ # and look for leading whitespace
+ if @text.length > 0
+ @text =~ /^(\s*)/
+ @leading_spaces = $1.length
+ else
+ @leading_spaces = INFINITY
+ end
+ end
+
+ # Return true if this line is blank
+ def isBlank?
+ @text.length.zero?
+ end
+
+ # stamp a line with a type, a level, a prefix, and a flag
+ def stamp(type, level, param="", flag=nil)
+ @type, @level, @param, @flag = type, level, param, flag
+ end
+
+ ##
+ # Strip off the leading margin
+ #
+
+ def strip_leading(size)
+ if @text.size > size
+ @text[0,size] = ""
+ else
+ @text = ""
+ end
+ end
+
+ def to_s
+ "#@type#@level: #@text"
+ end
+ end
+
+ ###############################################################################
+ #
+ # A container for all the lines
+ #
+
+ class Lines
+ include Enumerable
+
+ attr_reader :lines # for debugging
+
+ def initialize(lines)
+ @lines = lines
+ rewind
+ end
+
+ def empty?
+ @lines.size.zero?
+ end
+
+ def each
+ @lines.each do |line|
+ yield line unless line.deleted
+ end
+ end
+
+# def [](index)
+# @lines[index]
+# end
+
+ def rewind
+ @nextline = 0
+ end
+
+ def next
+ begin
+ res = @lines[@nextline]
+ @nextline += 1 if @nextline < @lines.size
+ end while res and res.deleted and @nextline < @lines.size
+ res
+ end
+
+ def unget
+ @nextline -= 1
+ end
+
+ def delete(a_line)
+ a_line.deleted = true
+ end
+
+ def normalize
+ margin = @lines.collect{|l| l.leading_spaces}.min
+ margin = 0 if margin == Line::INFINITY
+ @lines.each {|line| line.strip_leading(margin) } if margin > 0
+ end
+
+ def as_text
+ @lines.map {|l| l.text}.join("\n")
+ end
+
+ def line_types
+ @lines.map {|l| l.type }
+ end
+ end
+end
diff --git a/lib/rdoc/markup/simple_markup/preprocess.rb b/lib/rdoc/markup/simple_markup/preprocess.rb
new file mode 100644
index 0000000000..101c9bdeb1
--- /dev/null
+++ b/lib/rdoc/markup/simple_markup/preprocess.rb
@@ -0,0 +1,73 @@
+module SM
+
+ ##
+ # Handle common directives that can occur in a block of text:
+ #
+ # : include : filename
+ #
+
+ class PreProcess
+
+ def initialize(input_file_name, include_path)
+ @input_file_name = input_file_name
+ @include_path = include_path
+ end
+
+ # Look for common options in a chunk of text. Options that
+ # we don't handle are passed back to our caller
+ # as |directive, param|
+
+ def handle(text)
+ text.gsub!(/^([ \t#]*):(\w+):\s*(.+)?\n/) do
+ prefix = $1
+ directive = $2.downcase
+ param = $3
+
+ case directive
+ when "include"
+ filename = param.split[0]
+ include_file(filename, prefix)
+
+ else
+ yield(directive, param)
+ end
+ end
+ end
+
+ #######
+ private
+ #######
+
+ # Include a file, indenting it correctly
+
+ def include_file(name, indent)
+ if (full_name = find_include_file(name))
+ content = File.open(full_name) {|f| f.read}
+ # strip leading '#'s, but only if all lines start with them
+ if content =~ /^[^#]/
+ content.gsub(/^/, indent)
+ else
+ content.gsub(/^#?/, indent)
+ end
+ else
+ $stderr.puts "Couldn't find file to include: '#{name}'"
+ ''
+ end
+ end
+
+ # Look for the given file in the directory containing the current
+ # file, and then in each of the directories specified in the
+ # RDOC_INCLUDE path
+
+ def find_include_file(name)
+ to_search = [ File.dirname(@input_file_name) ].concat @include_path
+ to_search.each do |dir|
+ full_name = File.join(dir, name)
+ stat = File.stat(full_name) rescue next
+ return full_name if stat.readable?
+ end
+ nil
+ end
+
+ end
+end
diff --git a/lib/rdoc/markup/simple_markup/to_flow.rb b/lib/rdoc/markup/simple_markup/to_flow.rb
new file mode 100644
index 0000000000..048e71abce
--- /dev/null
+++ b/lib/rdoc/markup/simple_markup/to_flow.rb
@@ -0,0 +1,188 @@
+require 'rdoc/markup/simple_markup/fragments'
+require 'rdoc/markup/simple_markup/inline'
+require 'cgi'
+
+module SM
+
+ module Flow
+ P = Struct.new(:body)
+ VERB = Struct.new(:body)
+ RULE = Struct.new(:width)
+ class LIST
+ attr_reader :type, :contents
+ def initialize(type)
+ @type = type
+ @contents = []
+ end
+ def <<(stuff)
+ @contents << stuff
+ end
+ end
+ LI = Struct.new(:label, :body)
+ H = Struct.new(:level, :text)
+ end
+
+ class ToFlow
+ LIST_TYPE_TO_HTML = {
+ SM::ListBase::BULLET => [ "<ul>", "</ul>" ],
+ SM::ListBase::NUMBER => [ "<ol>", "</ol>" ],
+ SM::ListBase::UPPERALPHA => [ "<ol>", "</ol>" ],
+ SM::ListBase::LOWERALPHA => [ "<ol>", "</ol>" ],
+ SM::ListBase::LABELED => [ "<dl>", "</dl>" ],
+ SM::ListBase::NOTE => [ "<table>", "</table>" ],
+ }
+
+ InlineTag = Struct.new(:bit, :on, :off)
+
+ def initialize
+ init_tags
+ end
+
+ ##
+ # Set up the standard mapping of attributes to HTML tags
+ #
+ def init_tags
+ @attr_tags = [
+ InlineTag.new(SM::Attribute.bitmap_for(:BOLD), "<b>", "</b>"),
+ InlineTag.new(SM::Attribute.bitmap_for(:TT), "<tt>", "</tt>"),
+ InlineTag.new(SM::Attribute.bitmap_for(:EM), "<em>", "</em>"),
+ ]
+ end
+
+ ##
+ # Add a new set of HTML tags for an attribute. We allow
+ # separate start and end tags for flexibility
+ #
+ def add_tag(name, start, stop)
+ @attr_tags << InlineTag.new(SM::Attribute.bitmap_for(name), start, stop)
+ end
+
+ ##
+ # Given an HTML tag, decorate it with class information
+ # and the like if required. This is a no-op in the base
+ # class, but is overridden in HTML output classes that
+ # implement style sheets
+
+ def annotate(tag)
+ tag
+ end
+
+ ##
+ # Here's the client side of the visitor pattern
+
+ def start_accepting
+ @res = []
+ @list_stack = []
+ end
+
+ def end_accepting
+ @res
+ end
+
+ def accept_paragraph(am, fragment)
+ @res << Flow::P.new((convert_flow(am.flow(fragment.txt))))
+ end
+
+ def accept_verbatim(am, fragment)
+ @res << Flow::VERB.new((convert_flow(am.flow(fragment.txt))))
+ end
+
+ def accept_rule(am, fragment)
+ size = fragment.param
+ size = 10 if size > 10
+ @res << Flow::RULE.new(size)
+ end
+
+ def accept_list_start(am, fragment)
+ @list_stack.push(@res)
+ list = Flow::LIST.new(fragment.type)
+ @res << list
+ @res = list
+ end
+
+ def accept_list_end(am, fragment)
+ @res = @list_stack.pop
+ end
+
+ def accept_list_item(am, fragment)
+ @res << Flow::LI.new(fragment.param, convert_flow(am.flow(fragment.txt)))
+ end
+
+ def accept_blank_line(am, fragment)
+ # @res << annotate("<p />") << "\n"
+ end
+
+ def accept_heading(am, fragment)
+ @res << Flow::H.new(fragment.head_level, convert_flow(am.flow(fragment.txt)))
+ end
+
+
+ #######################################################################
+
+ private
+
+ #######################################################################
+
+ def on_tags(res, item)
+ attr_mask = item.turn_on
+ return if attr_mask.zero?
+
+ @attr_tags.each do |tag|
+ if attr_mask & tag.bit != 0
+ res << annotate(tag.on)
+ end
+ end
+ end
+
+ def off_tags(res, item)
+ attr_mask = item.turn_off
+ return if attr_mask.zero?
+
+ @attr_tags.reverse_each do |tag|
+ if attr_mask & tag.bit != 0
+ res << annotate(tag.off)
+ end
+ end
+ end
+
+ def convert_flow(flow)
+ res = ""
+ flow.each do |item|
+ case item
+ when String
+ res << convert_string(item)
+ when AttrChanger
+ off_tags(res, item)
+ on_tags(res, item)
+ when Special
+ res << convert_special(item)
+ else
+ raise "Unknown flow element: #{item.inspect}"
+ end
+ end
+ res
+ end
+
+ # some of these patterns are taken from SmartyPants...
+
+ def convert_string(item)
+ CGI.escapeHTML(item)
+ end
+
+ def convert_special(special)
+ handled = false
+ Attribute.each_name_of(special.type) do |name|
+ method_name = "handle_special_#{name}"
+ if self.respond_to? method_name
+ special.text = send(method_name, special)
+ handled = true
+ end
+ end
+ raise "Unhandled special: #{special}" unless handled
+ special.text
+ end
+
+
+ end
+
+end
diff --git a/lib/rdoc/markup/simple_markup/to_html.rb b/lib/rdoc/markup/simple_markup/to_html.rb
new file mode 100644
index 0000000000..26b5f4ce70
--- /dev/null
+++ b/lib/rdoc/markup/simple_markup/to_html.rb
@@ -0,0 +1,289 @@
+require 'rdoc/markup/simple_markup/fragments'
+require 'rdoc/markup/simple_markup/inline'
+
+require 'cgi'
+
+module SM
+
+ class ToHtml
+
+ LIST_TYPE_TO_HTML = {
+ ListBase::BULLET => [ "<ul>", "</ul>" ],
+ ListBase::NUMBER => [ "<ol>", "</ol>" ],
+ ListBase::UPPERALPHA => [ "<ol>", "</ol>" ],
+ ListBase::LOWERALPHA => [ "<ol>", "</ol>" ],
+ ListBase::LABELED => [ "<dl>", "</dl>" ],
+ ListBase::NOTE => [ "<table>", "</table>" ],
+ }
+
+ InlineTag = Struct.new(:bit, :on, :off)
+
+ def initialize
+ init_tags
+ end
+
+ ##
+ # Set up the standard mapping of attributes to HTML tags
+ #
+ def init_tags
+ @attr_tags = [
+ InlineTag.new(SM::Attribute.bitmap_for(:BOLD), "<b>", "</b>"),
+ InlineTag.new(SM::Attribute.bitmap_for(:TT), "<tt>", "</tt>"),
+ InlineTag.new(SM::Attribute.bitmap_for(:EM), "<em>", "</em>"),
+ ]
+ end
+
+ ##
+ # Add a new set of HTML tags for an attribute. We allow
+ # separate start and end tags for flexibility
+ #
+ def add_tag(name, start, stop)
+ @attr_tags << InlineTag.new(SM::Attribute.bitmap_for(name), start, stop)
+ end
+
+ ##
+ # Given an HTML tag, decorate it with class information
+ # and the like if required. This is a no-op in the base
+ # class, but is overridden in HTML output classes that
+ # implement style sheets
+
+ def annotate(tag)
+ tag
+ end
+
+ ##
+ # Here's the client side of the visitor pattern
+
+ def start_accepting
+ @res = ""
+ @in_list_entry = []
+ end
+
+ def end_accepting
+ @res
+ end
+
+ def accept_paragraph(am, fragment)
+ @res << annotate("<p>") + "\n"
+ @res << wrap(convert_flow(am.flow(fragment.txt)))
+ @res << annotate("</p>") + "\n"
+ end
+
+ def accept_verbatim(am, fragment)
+ @res << annotate("<pre>") + "\n"
+ @res << CGI.escapeHTML(fragment.txt)
+ @res << annotate("</pre>") << "\n"
+ end
+
+ def accept_rule(am, fragment)
+ size = fragment.param
+ size = 10 if size > 10
+ @res << "<hr size=\"#{size}\"></hr>"
+ end
+
+ def accept_list_start(am, fragment)
+ @res << html_list_name(fragment.type, true) <<"\n"
+ @in_list_entry.push false
+ end
+
+ def accept_list_end(am, fragment)
+ if tag = @in_list_entry.pop
+ @res << annotate(tag) << "\n"
+ end
+ @res << html_list_name(fragment.type, false) <<"\n"
+ end
+
+ def accept_list_item(am, fragment)
+ if tag = @in_list_entry.last
+ @res << annotate(tag) << "\n"
+ end
+ @res << list_item_start(am, fragment)
+ @res << wrap(convert_flow(am.flow(fragment.txt))) << "\n"
+ @in_list_entry[-1] = list_end_for(fragment.type)
+ end
+
+ def accept_blank_line(am, fragment)
+ # @res << annotate("<p />") << "\n"
+ end
+
+ def accept_heading(am, fragment)
+ @res << convert_heading(fragment.head_level, am.flow(fragment.txt))
+ end
+
+ # This is a higher speed (if messier) version of wrap
+
+ def wrap(txt, line_len = 76)
+ res = ""
+ sp = 0
+ ep = txt.length
+ while sp < ep
+ # scan back for a space
+ p = sp + line_len - 1
+ if p >= ep
+ p = ep
+ else
+ while p > sp and txt[p] != ?\s
+ p -= 1
+ end
+ if p <= sp
+ p = sp + line_len
+ while p < ep and txt[p] != ?\s
+ p += 1
+ end
+ end
+ end
+ res << txt[sp...p] << "\n"
+ sp = p
+ sp += 1 while sp < ep and txt[sp] == ?\s
+ end
+ res
+ end
+
+ #######################################################################
+
+ private
+
+ #######################################################################
+
+ def on_tags(res, item)
+ attr_mask = item.turn_on
+ return if attr_mask.zero?
+
+ @attr_tags.each do |tag|
+ if attr_mask & tag.bit != 0
+ res << annotate(tag.on)
+ end
+ end
+ end
+
+ def off_tags(res, item)
+ attr_mask = item.turn_off
+ return if attr_mask.zero?
+
+ @attr_tags.reverse_each do |tag|
+ if attr_mask & tag.bit != 0
+ res << annotate(tag.off)
+ end
+ end
+ end
+
+ def convert_flow(flow)
+ res = ""
+ flow.each do |item|
+ case item
+ when String
+ res << convert_string(item)
+ when AttrChanger
+ off_tags(res, item)
+ on_tags(res, item)
+ when Special
+ res << convert_special(item)
+ else
+ raise "Unknown flow element: #{item.inspect}"
+ end
+ end
+ res
+ end
+
+ # some of these patterns are taken from SmartyPants...
+
+ def convert_string(item)
+ CGI.escapeHTML(item).
+
+
+ # convert -- to em-dash, (-- to en-dash)
+ gsub(/---?/, '&#8212;'). #gsub(/--/, '&#8211;').
+
+ # convert ... to elipsis (and make sure .... becomes .<elipsis>)
+ gsub(/\.\.\.\./, '.&#8230;').gsub(/\.\.\./, '&#8230;').
+
+ # convert single closing quote
+ gsub(%r{([^ \t\r\n\[\{\(])\'}) { "#$1&#8217;" }.
+ gsub(%r{\'(?=\W|s\b)}) { "&#8217;" }.
+
+ # convert single opening quote
+ gsub(/'/, '&#8216;').
+
+ # convert double closing quote
+ gsub(%r{([^ \t\r\n\[\{\(])\'(?=\W)}) { "#$1&#8221;" }.
+
+ # convert double opening quote
+ gsub(/'/, '&#8220;').
+
+ # convert copyright
+ gsub(/\(c\)/, '&#169;').
+
+ # convert and registered trademark
+ gsub(/\(r\)/, '&#174;')
+
+ end
+
+ def convert_special(special)
+ handled = false
+ Attribute.each_name_of(special.type) do |name|
+ method_name = "handle_special_#{name}"
+ if self.respond_to? method_name
+ special.text = send(method_name, special)
+ handled = true
+ end
+ end
+ raise "Unhandled special: #{special}" unless handled
+ special.text
+ end
+
+ def convert_heading(level, flow)
+ res =
+ annotate("<h#{level}>") +
+ convert_flow(flow) +
+ annotate("</h#{level}>\n")
+ end
+
+ def html_list_name(list_type, is_open_tag)
+ tags = LIST_TYPE_TO_HTML[list_type] || raise("Invalid list type: #{list_type.inspect}")
+ annotate(tags[ is_open_tag ? 0 : 1])
+ end
+
+ def list_item_start(am, fragment)
+ case fragment.type
+ when ListBase::BULLET, ListBase::NUMBER
+ annotate("<li>")
+
+ when ListBase::UPPERALPHA
+ annotate("<li type=\"A\">")
+
+ when ListBase::LOWERALPHA
+ annotate("<li type=\"a\">")
+
+ when ListBase::LABELED
+ annotate("<dt>") +
+ convert_flow(am.flow(fragment.param)) +
+ annotate("</dt>") +
+ annotate("<dd>")
+
+ when ListBase::NOTE
+ annotate("<tr>") +
+ annotate("<td valign=\"top\">") +
+ convert_flow(am.flow(fragment.param)) +
+ annotate("</td>") +
+ annotate("<td>")
+ else
+ raise "Invalid list type"
+ end
+ end
+
+ def list_end_for(fragment_type)
+ case fragment_type
+ when ListBase::BULLET, ListBase::NUMBER, ListBase::UPPERALPHA, ListBase::LOWERALPHA
+ "</li>"
+ when ListBase::LABELED
+ "</dd>"
+ when ListBase::NOTE
+ "</td></tr>"
+ else
+ raise "Invalid list type"
+ end
+ end
+
+ end
+
+end
diff --git a/lib/rdoc/markup/simple_markup/to_latex.rb b/lib/rdoc/markup/simple_markup/to_latex.rb
new file mode 100644
index 0000000000..6c16278652
--- /dev/null
+++ b/lib/rdoc/markup/simple_markup/to_latex.rb
@@ -0,0 +1,333 @@
+require 'rdoc/markup/simple_markup/fragments'
+require 'rdoc/markup/simple_markup/inline'
+
+require 'cgi'
+
+module SM
+
+ # Convert SimpleMarkup to basic LaTeX report format
+
+ class ToLaTeX
+
+ BS = "\020" # \
+ OB = "\021" # {
+ CB = "\022" # }
+ DL = "\023" # Dollar
+
+ BACKSLASH = "#{BS}symbol#{OB}92#{CB}"
+ HAT = "#{BS}symbol#{OB}94#{CB}"
+ BACKQUOTE = "#{BS}symbol#{OB}0#{CB}"
+ TILDE = "#{DL}#{BS}sim#{DL}"
+ LESSTHAN = "#{DL}<#{DL}"
+ GREATERTHAN = "#{DL}>#{DL}"
+
+ def self.l(str)
+ str.tr('\\', BS).tr('{', OB).tr('}', CB).tr('$', DL)
+ end
+
+ def l(arg)
+ SM::ToLaTeX.l(arg)
+ end
+
+ LIST_TYPE_TO_LATEX = {
+ ListBase::BULLET => [ l("\\begin{itemize}"), l("\\end{itemize}") ],
+ ListBase::NUMBER => [ l("\\begin{enumerate}"), l("\\end{enumerate}"), "\\arabic" ],
+ ListBase::UPPERALPHA => [ l("\\begin{enumerate}"), l("\\end{enumerate}"), "\\Alph" ],
+ ListBase::LOWERALPHA => [ l("\\begin{enumerate}"), l("\\end{enumerate}"), "\\alph" ],
+ ListBase::LABELED => [ l("\\begin{description}"), l("\\end{description}") ],
+ ListBase::NOTE => [
+ l("\\begin{tabularx}{\\linewidth}{@{} l X @{}}"),
+ l("\\end{tabularx}") ],
+ }
+
+ InlineTag = Struct.new(:bit, :on, :off)
+
+ def initialize
+ init_tags
+ @list_depth = 0
+ @prev_list_types = []
+ end
+
+ ##
+ # Set up the standard mapping of attributes to LaTeX
+ #
+ def init_tags
+ @attr_tags = [
+ InlineTag.new(SM::Attribute.bitmap_for(:BOLD), l("\\textbf{"), l("}")),
+ InlineTag.new(SM::Attribute.bitmap_for(:TT), l("\\texttt{"), l("}")),
+ InlineTag.new(SM::Attribute.bitmap_for(:EM), l("\\emph{"), l("}")),
+ ]
+ end
+
+ ##
+ # Escape a LaTeX string
+ def escape(str)
+# $stderr.print "FE: ", str
+ s = str.
+# sub(/\s+$/, '').
+ gsub(/([_\${}&%#])/, "#{BS}\\1").
+ gsub(/\\/, BACKSLASH).
+ gsub(/\^/, HAT).
+ gsub(/~/, TILDE).
+ gsub(/</, LESSTHAN).
+ gsub(/>/, GREATERTHAN).
+ gsub(/,,/, ",{},").
+ gsub(/\`/, BACKQUOTE)
+# $stderr.print "-> ", s, "\n"
+ s
+ end
+
+ ##
+ # Add a new set of LaTeX tags for an attribute. We allow
+ # separate start and end tags for flexibility
+ #
+ def add_tag(name, start, stop)
+ @attr_tags << InlineTag.new(SM::Attribute.bitmap_for(name), start, stop)
+ end
+
+
+ ##
+ # Here's the client side of the visitor pattern
+
+ def start_accepting
+ @res = ""
+ @in_list_entry = []
+ end
+
+ def end_accepting
+ @res.tr(BS, '\\').tr(OB, '{').tr(CB, '}').tr(DL, '$')
+ end
+
+ def accept_paragraph(am, fragment)
+ @res << wrap(convert_flow(am.flow(fragment.txt)))
+ @res << "\n"
+ end
+
+ def accept_verbatim(am, fragment)
+ @res << "\n\\begin{code}\n"
+ @res << fragment.txt.sub(/[\n\s]+\Z/, '')
+ @res << "\n\\end{code}\n\n"
+ end
+
+ def accept_rule(am, fragment)
+ size = fragment.param
+ size = 10 if size > 10
+ @res << "\n\n\\rule{\\linewidth}{#{size}pt}\n\n"
+ end
+
+ def accept_list_start(am, fragment)
+ @res << list_name(fragment.type, true) <<"\n"
+ @in_list_entry.push false
+ end
+
+ def accept_list_end(am, fragment)
+ if tag = @in_list_entry.pop
+ @res << tag << "\n"
+ end
+ @res << list_name(fragment.type, false) <<"\n"
+ end
+
+ def accept_list_item(am, fragment)
+ if tag = @in_list_entry.last
+ @res << tag << "\n"
+ end
+ @res << list_item_start(am, fragment)
+ @res << wrap(convert_flow(am.flow(fragment.txt))) << "\n"
+ @in_list_entry[-1] = list_end_for(fragment.type)
+ end
+
+ def accept_blank_line(am, fragment)
+ # @res << "\n"
+ end
+
+ def accept_heading(am, fragment)
+ @res << convert_heading(fragment.head_level, am.flow(fragment.txt))
+ end
+
+ # This is a higher speed (if messier) version of wrap
+
+ def wrap(txt, line_len = 76)
+ res = ""
+ sp = 0
+ ep = txt.length
+ while sp < ep
+ # scan back for a space
+ p = sp + line_len - 1
+ if p >= ep
+ p = ep
+ else
+ while p > sp and txt[p] != ?\s
+ p -= 1
+ end
+ if p <= sp
+ p = sp + line_len
+ while p < ep and txt[p] != ?\s
+ p += 1
+ end
+ end
+ end
+ res << txt[sp...p] << "\n"
+ sp = p
+ sp += 1 while sp < ep and txt[sp] == ?\s
+ end
+ res
+ end
+
+ #######################################################################
+
+ private
+
+ #######################################################################
+
+ def on_tags(res, item)
+ attr_mask = item.turn_on
+ return if attr_mask.zero?
+
+ @attr_tags.each do |tag|
+ if attr_mask & tag.bit != 0
+ res << tag.on
+ end
+ end
+ end
+
+ def off_tags(res, item)
+ attr_mask = item.turn_off
+ return if attr_mask.zero?
+
+ @attr_tags.reverse_each do |tag|
+ if attr_mask & tag.bit != 0
+ res << tag.off
+ end
+ end
+ end
+
+ def convert_flow(flow)
+ res = ""
+ flow.each do |item|
+ case item
+ when String
+# $stderr.puts "Converting '#{item}'"
+ res << convert_string(item)
+ when AttrChanger
+ off_tags(res, item)
+ on_tags(res, item)
+ when Special
+ res << convert_special(item)
+ else
+ raise "Unknown flow element: #{item.inspect}"
+ end
+ end
+ res
+ end
+
+ # some of these patterns are taken from SmartyPants...
+
+ def convert_string(item)
+
+ escape(item).
+
+
+ # convert ... to elipsis (and make sure .... becomes .<elipsis>)
+ gsub(/\.\.\.\./, '.\ldots{}').gsub(/\.\.\./, '\ldots{}').
+
+ # convert single closing quote
+ gsub(%r{([^ \t\r\n\[\{\(])\'}) { "#$1'" }.
+ gsub(%r{\'(?=\W|s\b)}) { "'" }.
+
+ # convert single opening quote
+ gsub(/'/, '`').
+
+ # convert double closing quote
+ gsub(%r{([^ \t\r\n\[\{\(])\"(?=\W)}) { "#$1''" }.
+
+ # convert double opening quote
+ gsub(/"/, "``").
+
+ # convert copyright
+ gsub(/\(c\)/, '\copyright{}')
+
+ end
+
+ def convert_special(special)
+ handled = false
+ Attribute.each_name_of(special.type) do |name|
+ method_name = "handle_special_#{name}"
+ if self.respond_to? method_name
+ special.text = send(method_name, special)
+ handled = true
+ end
+ end
+ raise "Unhandled special: #{special}" unless handled
+ special.text
+ end
+
+ def convert_heading(level, flow)
+ res =
+ case level
+ when 1 then "\\chapter{"
+ when 2 then "\\section{"
+ when 3 then "\\subsection{"
+ when 4 then "\\subsubsection{"
+ else "\\paragraph{"
+ end +
+ convert_flow(flow) +
+ "}\n"
+ end
+
+ def list_name(list_type, is_open_tag)
+ tags = LIST_TYPE_TO_LATEX[list_type] || raise("Invalid list type: #{list_type.inspect}")
+ if tags[2] # enumerate
+ if is_open_tag
+ @list_depth += 1
+ if @prev_list_types[@list_depth] != tags[2]
+ case @list_depth
+ when 1
+ roman = "i"
+ when 2
+ roman = "ii"
+ when 3
+ roman = "iii"
+ when 4
+ roman = "iv"
+ else
+ raise("Too deep list: level #{@list_depth}")
+ end
+ @prev_list_types[@list_depth] = tags[2]
+ return l("\\renewcommand{\\labelenum#{roman}}{#{tags[2]}{enum#{roman}}}") + "\n" + tags[0]
+ end
+ else
+ @list_depth -= 1
+ end
+ end
+ tags[ is_open_tag ? 0 : 1]
+ end
+
+ def list_item_start(am, fragment)
+ case fragment.type
+ when ListBase::BULLET, ListBase::NUMBER, ListBase::UPPERALPHA, ListBase::LOWERALPHA
+ "\\item "
+
+ when ListBase::LABELED
+ "\\item[" + convert_flow(am.flow(fragment.param)) + "] "
+
+ when ListBase::NOTE
+ convert_flow(am.flow(fragment.param)) + " & "
+ else
+ raise "Invalid list type"
+ end
+ end
+
+ def list_end_for(fragment_type)
+ case fragment_type
+ when ListBase::BULLET, ListBase::NUMBER, ListBase::UPPERALPHA, ListBase::LOWERALPHA, ListBase::LABELED
+ ""
+ when ListBase::NOTE
+ "\\\\\n"
+ else
+ raise "Invalid list type"
+ end
+ end
+
+ end
+
+end
diff --git a/lib/rdoc/markup/test/AllTests.rb b/lib/rdoc/markup/test/AllTests.rb
new file mode 100644
index 0000000000..b9c8c9dfcc
--- /dev/null
+++ b/lib/rdoc/markup/test/AllTests.rb
@@ -0,0 +1,2 @@
+require 'TestParse.rb'
+require 'TestInline.rb'
diff --git a/lib/rdoc/markup/test/TestInline.rb b/lib/rdoc/markup/test/TestInline.rb
new file mode 100644
index 0000000000..a067d4c24c
--- /dev/null
+++ b/lib/rdoc/markup/test/TestInline.rb
@@ -0,0 +1,154 @@
+require "test/unit"
+
+$:.unshift "../../.."
+
+require "rdoc/markup/simple_markup/inline"
+
+class TestInline < Test::Unit::TestCase
+
+
+ def setup
+ @am = SM::AttributeManager.new
+
+ @bold_on = @am.changed_attribute_by_name([], [:BOLD])
+ @bold_off = @am.changed_attribute_by_name([:BOLD], [])
+
+ @tt_on = @am.changed_attribute_by_name([], [:TT])
+ @tt_off = @am.changed_attribute_by_name([:TT], [])
+
+ @em_on = @am.changed_attribute_by_name([], [:EM])
+ @em_off = @am.changed_attribute_by_name([:EM], [])
+
+ @bold_em_on = @am.changed_attribute_by_name([], [:BOLD] | [:EM])
+ @bold_em_off = @am.changed_attribute_by_name([:BOLD] | [:EM], [])
+
+ @em_then_bold = @am.changed_attribute_by_name([:EM], [:EM] | [:BOLD])
+
+ @em_to_bold = @am.changed_attribute_by_name([:EM], [:BOLD])
+
+ @am.add_word_pair("{", "}", :WOMBAT)
+ @wombat_on = @am.changed_attribute_by_name([], [:WOMBAT])
+ @wombat_off = @am.changed_attribute_by_name([:WOMBAT], [])
+ end
+
+ def crossref(text)
+ [ @am.changed_attribute_by_name([], [:CROSSREF] | [:_SPECIAL_]),
+ SM::Special.new(33, text),
+ @am.changed_attribute_by_name([:CROSSREF] | [:_SPECIAL_], [])
+ ]
+ end
+
+ def test_special
+ # class names, variable names, file names, or instance variables
+ @am.add_special(/(
+ \b([A-Z]\w+(::\w+)*)
+ | \#\w+[!?=]?
+ | \b\w+([_\/\.]+\w+)+[!?=]?
+ )/x,
+ :CROSSREF)
+
+ assert_equal(["cat"], @am.flow("cat"))
+
+ assert_equal(["cat ", crossref("#fred"), " dog"].flatten,
+ @am.flow("cat #fred dog"))
+
+ assert_equal([crossref("#fred"), " dog"].flatten,
+ @am.flow("#fred dog"))
+
+ assert_equal(["cat ", crossref("#fred")].flatten, @am.flow("cat #fred"))
+ end
+
+ def test_basic
+ assert_equal(["cat"], @am.flow("cat"))
+
+ assert_equal(["cat ", @bold_on, "and", @bold_off, " dog"],
+ @am.flow("cat *and* dog"))
+
+ assert_equal(["cat ", @bold_on, "AND", @bold_off, " dog"],
+ @am.flow("cat *AND* dog"))
+
+ assert_equal(["cat ", @em_on, "And", @em_off, " dog"],
+ @am.flow("cat _And_ dog"))
+
+ assert_equal(["cat *and dog*"], @am.flow("cat *and dog*"))
+
+ assert_equal(["*cat and* dog"], @am.flow("*cat and* dog"))
+
+ assert_equal(["cat *and ", @bold_on, "dog", @bold_off],
+ @am.flow("cat *and *dog*"))
+
+ assert_equal(["cat ", @em_on, "and", @em_off, " dog"],
+ @am.flow("cat _and_ dog"))
+
+ assert_equal(["cat_and_dog"],
+ @am.flow("cat_and_dog"))
+
+ assert_equal(["cat ", @tt_on, "and", @tt_off, " dog"],
+ @am.flow("cat +and+ dog"))
+
+ assert_equal(["cat ", @bold_on, "a_b_c", @bold_off, " dog"],
+ @am.flow("cat *a_b_c* dog"))
+
+ assert_equal(["cat __ dog"],
+ @am.flow("cat __ dog"))
+
+ assert_equal(["cat ", @em_on, "_", @em_off, " dog"],
+ @am.flow("cat ___ dog"))
+
+ end
+
+ def test_combined
+ assert_equal(["cat ", @em_on, "and", @em_off, " ", @bold_on, "dog", @bold_off],
+ @am.flow("cat _and_ *dog*"))
+
+ assert_equal(["cat ", @em_on, "a__nd", @em_off, " ", @bold_on, "dog", @bold_off],
+ @am.flow("cat _a__nd_ *dog*"))
+ end
+
+ def test_html_like
+ assert_equal(["cat ", @tt_on, "dog", @tt_off], @am.flow("cat <tt>dog</Tt>"))
+
+ assert_equal(["cat ", @em_on, "and", @em_off, " ", @bold_on, "dog", @bold_off],
+ @am.flow("cat <i>and</i> <B>dog</b>"))
+
+ assert_equal(["cat ", @em_on, "and ", @em_then_bold, "dog", @bold_em_off],
+ @am.flow("cat <i>and <B>dog</B></I>"))
+
+ assert_equal(["cat ", @em_on, "and ", @em_to_bold, "dog", @bold_off],
+ @am.flow("cat <i>and </i><b>dog</b>"))
+
+ assert_equal(["cat ", @em_on, "and ", @em_to_bold, "dog", @bold_off],
+ @am.flow("cat <i>and <b></i>dog</b>"))
+
+ assert_equal([@tt_on, "cat", @tt_off, " ", @em_on, "and ", @em_to_bold, "dog", @bold_off],
+ @am.flow("<tt>cat</tt> <i>and <b></i>dog</b>"))
+
+ assert_equal(["cat ", @em_on, "and ", @em_then_bold, "dog", @bold_em_off],
+ @am.flow("cat <i>and <b>dog</b></i>"))
+
+ assert_equal(["cat ", @bold_em_on, "and", @bold_em_off, " dog"],
+ @am.flow("cat <i><b>and</b></i> dog"))
+
+
+ end
+
+ def test_protect
+ assert_equal(['cat \\ dog'], @am.flow('cat \\ dog'))
+
+ assert_equal(["cat <tt>dog</Tt>"], @am.flow("cat \\<tt>dog</Tt>"))
+
+ assert_equal(["cat ", @em_on, "and", @em_off, " <B>dog</b>"],
+ @am.flow("cat <i>and</i> \\<B>dog</b>"))
+
+ assert_equal(["*word* or <b>text</b>"], @am.flow("\\*word* or \\<b>text</b>"))
+
+ assert_equal(["_cat_", @em_on, "dog", @em_off],
+ @am.flow("\\_cat_<i>dog</i>"))
+ end
+
+ def test_adding
+ assert_equal(["cat ", @wombat_on, "and", @wombat_off, " dog" ],
+ @am.flow("cat {and} dog"))
+# assert_equal(["cat {and} dog" ], @am.flow("cat \\{and} dog"))
+ end
+end
diff --git a/lib/rdoc/markup/test/TestParse.rb b/lib/rdoc/markup/test/TestParse.rb
new file mode 100644
index 0000000000..3ec541ce7a
--- /dev/null
+++ b/lib/rdoc/markup/test/TestParse.rb
@@ -0,0 +1,503 @@
+require 'test/unit'
+
+$:.unshift "../../.."
+
+require 'rdoc/markup/simple_markup'
+
+include SM
+
+class TestParse < Test::Unit::TestCase
+
+ class MockOutput
+ def start_accepting
+ @res = []
+ end
+
+ def end_accepting
+ @res
+ end
+
+ def accept_paragraph(am, fragment)
+ @res << fragment.to_s
+ end
+
+ def accept_verbatim(am, fragment)
+ @res << fragment.to_s
+ end
+
+ def accept_list_start(am, fragment)
+ @res << fragment.to_s
+ end
+
+ def accept_list_end(am, fragment)
+ @res << fragment.to_s
+ end
+
+ def accept_list_item(am, fragment)
+ @res << fragment.to_s
+ end
+
+ def accept_blank_line(am, fragment)
+ @res << fragment.to_s
+ end
+
+ def accept_heading(am, fragment)
+ @res << fragment.to_s
+ end
+
+ def accept_rule(am, fragment)
+ @res << fragment.to_s
+ end
+
+ end
+
+ def basic_conv(str)
+ sm = SimpleMarkup.new
+ mock = MockOutput.new
+ sm.convert(str, mock)
+ sm.content
+ end
+
+ def line_types(str, expected)
+ p = SimpleMarkup.new
+ mock = MockOutput.new
+ p.convert(str, mock)
+ assert_equal(expected, p.get_line_types.map{|type| type.to_s[0,1]}.join(''))
+ end
+
+ def line_groups(str, expected)
+ p = SimpleMarkup.new
+ mock = MockOutput.new
+
+ block = p.convert(str, mock)
+
+ if block != expected
+ rows = (0...([expected.size, block.size].max)).collect{|i|
+ [expected[i]||"nil", block[i]||"nil"]
+ }
+ printf "\n\n%35s %35s\n", "Expected", "Got"
+ rows.each {|e,g| printf "%35s %35s\n", e.dump, g.dump }
+ end
+
+ assert_equal(expected, block)
+ end
+
+ def test_tabs
+ str = "hello\n dave"
+ assert_equal(str, basic_conv(str))
+ str = "hello\n\tdave"
+ assert_equal("hello\n dave", basic_conv(str))
+ str = "hello\n \tdave"
+ assert_equal("hello\n dave", basic_conv(str))
+ str = "hello\n \tdave"
+ assert_equal("hello\n dave", basic_conv(str))
+ str = "hello\n \tdave"
+ assert_equal("hello\n dave", basic_conv(str))
+ str = "hello\n \tdave"
+ assert_equal("hello\n dave", basic_conv(str))
+ str = "hello\n \tdave"
+ assert_equal("hello\n dave", basic_conv(str))
+ str = "hello\n \tdave"
+ assert_equal("hello\n dave", basic_conv(str))
+ str = "hello\n \tdave"
+ assert_equal("hello\n dave", basic_conv(str))
+ str = "hello\n \tdave"
+ assert_equal("hello\n dave", basic_conv(str))
+ str = ".\t\t."
+ assert_equal(". .", basic_conv(str))
+ end
+
+ def test_whitespace
+ assert_equal("hello", basic_conv("hello"))
+ assert_equal("hello", basic_conv(" hello "))
+ assert_equal("hello", basic_conv(" \t \t hello\t\t"))
+
+ assert_equal("1\n 2\n 3", basic_conv("1\n 2\n 3"))
+ assert_equal("1\n 2\n 3", basic_conv(" 1\n 2\n 3"))
+
+ assert_equal("1\n 2\n 3\n1\n 2", basic_conv("1\n 2\n 3\n1\n 2"))
+ assert_equal("1\n 2\n 3\n1\n 2", basic_conv(" 1\n 2\n 3\n 1\n 2"))
+
+ assert_equal("1\n 2\n\n 3", basic_conv(" 1\n 2\n\n 3"))
+ end
+
+ def test_types
+ str = "now is the time"
+ line_types(str, 'P')
+
+ str = "now is the time\nfor all good men"
+ line_types(str, 'PP')
+
+ str = "now is the time\n code\nfor all good men"
+ line_types(str, 'PVP')
+
+ str = "now is the time\n code\n more code\nfor all good men"
+ line_types(str, 'PVVP')
+
+ str = "now is\n---\nthe time"
+ line_types(str, 'PRP')
+
+ str = %{\
+ now is
+ * l1
+ * l2
+ the time}
+ line_types(str, 'PLLP')
+
+ str = %{\
+ now is
+ * l1
+ l1+
+ * l2
+ the time}
+ line_types(str, 'PLPLP')
+
+ str = %{\
+ now is
+ * l1
+ * l1.1
+ * l2
+ the time}
+ line_types(str, 'PLLLP')
+
+ str = %{\
+ now is
+ * l1
+ * l1.1
+ text
+ code
+ code
+
+ text
+ * l2
+ the time}
+ line_types(str, 'PLLPVVBPLP')
+
+ str = %{\
+ now is
+ 1. l1
+ * l1.1
+ 2. l2
+ the time}
+ line_types(str, 'PLLLP')
+
+ str = %{\
+ now is
+ [cat] l1
+ * l1.1
+ [dog] l2
+ the time}
+ line_types(str, 'PLLLP')
+
+ str = %{\
+ now is
+ [cat] l1
+ continuation
+ [dog] l2
+ the time}
+ line_types(str, 'PLPLP')
+ end
+
+ def test_groups
+ str = "now is the time"
+ line_groups(str, ["L0: Paragraph\nnow is the time"] )
+
+ str = "now is the time\nfor all good men"
+ line_groups(str, ["L0: Paragraph\nnow is the time for all good men"] )
+
+ str = %{\
+ now is the time
+ code _line_ here
+ for all good men}
+
+ line_groups(str,
+ [ "L0: Paragraph\nnow is the time",
+ "L0: Verbatim\n code _line_ here\n",
+ "L0: Paragraph\nfor all good men"
+ ] )
+
+ str = "now is the time\n code\n more code\nfor all good men"
+ line_groups(str,
+ [ "L0: Paragraph\nnow is the time",
+ "L0: Verbatim\n code\n more code\n",
+ "L0: Paragraph\nfor all good men"
+ ] )
+
+ str = %{\
+ now is
+ * l1
+ * l2
+ the time}
+ line_groups(str,
+ [ "L0: Paragraph\nnow is",
+ "L1: ListStart\n",
+ "L1: ListItem\nl1",
+ "L1: ListItem\nl2",
+ "L1: ListEnd\n",
+ "L0: Paragraph\nthe time"
+ ])
+
+ str = %{\
+ now is
+ * l1
+ l1+
+ * l2
+ the time}
+ line_groups(str,
+ [ "L0: Paragraph\nnow is",
+ "L1: ListStart\n",
+ "L1: ListItem\nl1 l1+",
+ "L1: ListItem\nl2",
+ "L1: ListEnd\n",
+ "L0: Paragraph\nthe time"
+ ])
+
+ str = %{\
+ now is
+ * l1
+ * l1.1
+ * l2
+ the time}
+ line_groups(str,
+ [ "L0: Paragraph\nnow is",
+ "L1: ListStart\n",
+ "L1: ListItem\nl1",
+ "L2: ListStart\n",
+ "L2: ListItem\nl1.1",
+ "L2: ListEnd\n",
+ "L1: ListItem\nl2",
+ "L1: ListEnd\n",
+ "L0: Paragraph\nthe time"
+ ])
+
+
+ str = %{\
+ now is
+ * l1
+ * l1.1
+ text
+ code
+ code
+
+ text
+ * l2
+ the time}
+ line_groups(str,
+ [ "L0: Paragraph\nnow is",
+ "L1: ListStart\n",
+ "L1: ListItem\nl1",
+ "L2: ListStart\n",
+ "L2: ListItem\nl1.1 text",
+ "L2: Verbatim\n code\n code\n",
+ "L2: Paragraph\ntext",
+ "L2: ListEnd\n",
+ "L1: ListItem\nl2",
+ "L1: ListEnd\n",
+ "L0: Paragraph\nthe time"
+ ])
+
+
+ str = %{\
+ now is
+ 1. l1
+ * l1.1
+ 2. l2
+ the time}
+ line_groups(str,
+ [ "L0: Paragraph\nnow is",
+ "L1: ListStart\n",
+ "L1: ListItem\nl1",
+ "L2: ListStart\n",
+ "L2: ListItem\nl1.1",
+ "L2: ListEnd\n",
+ "L1: ListItem\nl2",
+ "L1: ListEnd\n",
+ "L0: Paragraph\nthe time"
+ ])
+
+ str = %{\
+ now is
+ [cat] l1
+ * l1.1
+ [dog] l2
+ the time}
+ line_groups(str,
+ [ "L0: Paragraph\nnow is",
+ "L1: ListStart\n",
+ "L1: ListItem\nl1",
+ "L2: ListStart\n",
+ "L2: ListItem\nl1.1",
+ "L2: ListEnd\n",
+ "L1: ListItem\nl2",
+ "L1: ListEnd\n",
+ "L0: Paragraph\nthe time"
+ ])
+
+ str = %{\
+ now is
+ [cat] l1
+ continuation
+ [dog] l2
+ the time}
+ line_groups(str,
+ [ "L0: Paragraph\nnow is",
+ "L1: ListStart\n",
+ "L1: ListItem\nl1 continuation",
+ "L1: ListItem\nl2",
+ "L1: ListEnd\n",
+ "L0: Paragraph\nthe time"
+ ])
+
+
+ end
+
+ def test_verbatim_merge
+ str = %{\
+ now is
+ code
+ the time}
+
+ line_groups(str,
+ [ "L0: Paragraph\nnow is",
+ "L0: Verbatim\n code\n",
+ "L0: Paragraph\nthe time"
+ ])
+
+
+ str = %{\
+ now is
+ code
+ code1
+ the time}
+
+ line_groups(str,
+ [ "L0: Paragraph\nnow is",
+ "L0: Verbatim\n code\n code1\n",
+ "L0: Paragraph\nthe time"
+ ])
+
+
+ str = %{\
+ now is
+ code
+
+ code1
+ the time}
+
+ line_groups(str,
+ [ "L0: Paragraph\nnow is",
+ "L0: Verbatim\n code\n\n code1\n",
+ "L0: Paragraph\nthe time"
+ ])
+
+
+ str = %{\
+ now is
+ code
+
+ code1
+
+ the time}
+
+ line_groups(str,
+ [ "L0: Paragraph\nnow is",
+ "L0: Verbatim\n code\n\n code1\n",
+ "L0: Paragraph\nthe time"
+ ])
+
+
+ str = %{\
+ now is
+ code
+
+ code1
+
+ code2
+ the time}
+
+ line_groups(str,
+ [ "L0: Paragraph\nnow is",
+ "L0: Verbatim\n code\n\n code1\n\n code2\n",
+ "L0: Paragraph\nthe time"
+ ])
+
+
+ # Folds multiple blank lines
+ str = %{\
+ now is
+ code
+
+
+ code1
+
+ the time}
+
+ line_groups(str,
+ [ "L0: Paragraph\nnow is",
+ "L0: Verbatim\n code\n\n code1\n",
+ "L0: Paragraph\nthe time"
+ ])
+
+
+ end
+
+ def test_list_split
+ str = %{\
+ now is
+ * l1
+ 1. n1
+ 2. n2
+ * l2
+ the time}
+ line_groups(str,
+ [ "L0: Paragraph\nnow is",
+ "L1: ListStart\n",
+ "L1: ListItem\nl1",
+ "L1: ListEnd\n",
+ "L1: ListStart\n",
+ "L1: ListItem\nn1",
+ "L1: ListItem\nn2",
+ "L1: ListEnd\n",
+ "L1: ListStart\n",
+ "L1: ListItem\nl2",
+ "L1: ListEnd\n",
+ "L0: Paragraph\nthe time"
+ ])
+
+ end
+
+
+ def test_headings
+ str = "= heading one"
+ line_groups(str,
+ [ "L0: Heading\nheading one"
+ ])
+
+ str = "=== heading three"
+ line_groups(str,
+ [ "L0: Heading\nheading three"
+ ])
+
+ str = "text\n === heading three"
+ line_groups(str,
+ [ "L0: Paragraph\ntext",
+ "L0: Verbatim\n === heading three\n"
+ ])
+
+ str = "text\n code\n === heading three"
+ line_groups(str,
+ [ "L0: Paragraph\ntext",
+ "L0: Verbatim\n code\n === heading three\n"
+ ])
+
+ str = "text\n code\n=== heading three"
+ line_groups(str,
+ [ "L0: Paragraph\ntext",
+ "L0: Verbatim\n code\n",
+ "L0: Heading\nheading three"
+ ])
+
+ end
+
+
+end
diff --git a/lib/rdoc/markup/to_flow.rb b/lib/rdoc/markup/to_flow.rb
deleted file mode 100644
index 3d87b3e9c3..0000000000
--- a/lib/rdoc/markup/to_flow.rb
+++ /dev/null
@@ -1,185 +0,0 @@
-require 'rdoc/markup/formatter'
-require 'rdoc/markup/fragments'
-require 'rdoc/markup/inline'
-require 'cgi'
-
-class RDoc::Markup
-
- module Flow
- P = Struct.new(:body)
- VERB = Struct.new(:body)
- RULE = Struct.new(:width)
- class LIST
- attr_reader :type, :contents
- def initialize(type)
- @type = type
- @contents = []
- end
- def <<(stuff)
- @contents << stuff
- end
- end
- LI = Struct.new(:label, :body)
- H = Struct.new(:level, :text)
- end
-
- class ToFlow < RDoc::Markup::Formatter
- LIST_TYPE_TO_HTML = {
- :BULLET => [ "<ul>", "</ul>" ],
- :NUMBER => [ "<ol>", "</ol>" ],
- :UPPERALPHA => [ "<ol>", "</ol>" ],
- :LOWERALPHA => [ "<ol>", "</ol>" ],
- :LABELED => [ "<dl>", "</dl>" ],
- :NOTE => [ "<table>", "</table>" ],
- }
-
- InlineTag = Struct.new(:bit, :on, :off)
-
- def initialize
- super
-
- init_tags
- end
-
- ##
- # Set up the standard mapping of attributes to HTML tags
-
- def init_tags
- @attr_tags = [
- InlineTag.new(RDoc::Markup::Attribute.bitmap_for(:BOLD), "<b>", "</b>"),
- InlineTag.new(RDoc::Markup::Attribute.bitmap_for(:TT), "<tt>", "</tt>"),
- InlineTag.new(RDoc::Markup::Attribute.bitmap_for(:EM), "<em>", "</em>"),
- ]
- end
-
- ##
- # Add a new set of HTML tags for an attribute. We allow separate start and
- # end tags for flexibility
-
- def add_tag(name, start, stop)
- @attr_tags << InlineTag.new(RDoc::Markup::Attribute.bitmap_for(name), start, stop)
- end
-
- ##
- # Given an HTML tag, decorate it with class information and the like if
- # required. This is a no-op in the base class, but is overridden in HTML
- # output classes that implement style sheets
-
- def annotate(tag)
- tag
- end
-
- ##
- # Here's the client side of the visitor pattern
-
- def start_accepting
- @res = []
- @list_stack = []
- end
-
- def end_accepting
- @res
- end
-
- def accept_paragraph(am, fragment)
- @res << Flow::P.new((convert_flow(am.flow(fragment.txt))))
- end
-
- def accept_verbatim(am, fragment)
- @res << Flow::VERB.new((convert_flow(am.flow(fragment.txt))))
- end
-
- def accept_rule(am, fragment)
- size = fragment.param
- size = 10 if size > 10
- @res << Flow::RULE.new(size)
- end
-
- def accept_list_start(am, fragment)
- @list_stack.push(@res)
- list = Flow::LIST.new(fragment.type)
- @res << list
- @res = list
- end
-
- def accept_list_end(am, fragment)
- @res = @list_stack.pop
- end
-
- def accept_list_item(am, fragment)
- @res << Flow::LI.new(fragment.param, convert_flow(am.flow(fragment.txt)))
- end
-
- def accept_blank_line(am, fragment)
- # @res << annotate("<p />") << "\n"
- end
-
- def accept_heading(am, fragment)
- @res << Flow::H.new(fragment.head_level, convert_flow(am.flow(fragment.txt)))
- end
-
- private
-
- def on_tags(res, item)
- attr_mask = item.turn_on
- return if attr_mask.zero?
-
- @attr_tags.each do |tag|
- if attr_mask & tag.bit != 0
- res << annotate(tag.on)
- end
- end
- end
-
- def off_tags(res, item)
- attr_mask = item.turn_off
- return if attr_mask.zero?
-
- @attr_tags.reverse_each do |tag|
- if attr_mask & tag.bit != 0
- res << annotate(tag.off)
- end
- end
- end
-
- def convert_flow(flow)
- res = ""
- flow.each do |item|
- case item
- when String
- res << convert_string(item)
- when AttrChanger
- off_tags(res, item)
- on_tags(res, item)
- when Special
- res << convert_special(item)
- else
- raise "Unknown flow element: #{item.inspect}"
- end
- end
- res
- end
-
- def convert_string(item)
- CGI.escapeHTML(item)
- end
-
- def convert_special(special)
- handled = false
- Attribute.each_name_of(special.type) do |name|
- method_name = "handle_special_#{name}"
- if self.respond_to? method_name
- special.text = send(method_name, special)
- handled = true
- end
- end
-
- raise "Unhandled special: #{special}" unless handled
-
- special.text
- end
-
- end
-
-end
-
diff --git a/lib/rdoc/markup/to_html.rb b/lib/rdoc/markup/to_html.rb
deleted file mode 100644
index 0165042d84..0000000000
--- a/lib/rdoc/markup/to_html.rb
+++ /dev/null
@@ -1,403 +0,0 @@
-require 'rdoc/markup/formatter'
-require 'rdoc/markup/fragments'
-require 'rdoc/markup/inline'
-
-require 'cgi'
-
-class RDoc::Markup::ToHtml < RDoc::Markup::Formatter
-
- LIST_TYPE_TO_HTML = {
- :BULLET => %w[<ul> </ul>],
- :NUMBER => %w[<ol> </ol>],
- :UPPERALPHA => %w[<ol> </ol>],
- :LOWERALPHA => %w[<ol> </ol>],
- :LABELED => %w[<dl> </dl>],
- :NOTE => %w[<table> </table>],
- }
-
- InlineTag = Struct.new(:bit, :on, :off)
-
- def initialize
- super
-
- # @in_tt - tt nested levels count
- # @tt_bit - cache
- @in_tt = 0
- @tt_bit = RDoc::Markup::Attribute.bitmap_for :TT
-
- # external hyperlinks
- @markup.add_special(/((link:|https?:|mailto:|ftp:|www\.)\S+\w)/, :HYPERLINK)
-
- # and links of the form <text>[<url>]
- @markup.add_special(/(((\{.*?\})|\b\S+?)\[\S+?\.\S+?\])/, :TIDYLINK)
-
- init_tags
- end
-
- ##
- # Converts a target url to one that is relative to a given path
-
- def self.gen_relative_url(path, target)
- from = File.dirname path
- to, to_file = File.split target
-
- from = from.split "/"
- to = to.split "/"
-
- while from.size > 0 and to.size > 0 and from[0] == to[0] do
- from.shift
- to.shift
- end
-
- from.fill ".."
- from.concat to
- from << to_file
- File.join(*from)
- end
-
- ##
- # Generate a hyperlink for url, labeled with text. Handle the
- # special cases for img: and link: described under handle_special_HYPERLINK
-
- def gen_url(url, text)
- if url =~ /([A-Za-z]+):(.*)/ then
- type = $1
- path = $2
- else
- type = "http"
- path = url
- url = "http://#{url}"
- end
-
- if type == "link" then
- url = if path[0, 1] == '#' then # is this meaningful?
- path
- else
- self.class.gen_relative_url @from_path, path
- end
- end
-
- if (type == "http" or type == "link") and
- url =~ /\.(gif|png|jpg|jpeg|bmp)$/ then
- "<img src=\"#{url}\" />"
- else
- "<a href=\"#{url}\">#{text.sub(%r{^#{type}:/*}, '')}</a>"
- end
- end
-
- ##
- # And we're invoked with a potential external hyperlink mailto:
- # just gets inserted. http: links are checked to see if they
- # reference an image. If so, that image gets inserted using an
- # <img> tag. Otherwise a conventional <a href> is used. We also
- # support a special type of hyperlink, link:, which is a reference
- # to a local file whose path is relative to the --op directory.
-
- def handle_special_HYPERLINK(special)
- url = special.text
- gen_url url, url
- end
-
- ##
- # Here's a hypedlink where the label is different to the URL
- # <label>[url] or {long label}[url]
-
- def handle_special_TIDYLINK(special)
- text = special.text
-
- return text unless text =~ /\{(.*?)\}\[(.*?)\]/ or text =~ /(\S+)\[(.*?)\]/
-
- label = $1
- url = $2
- gen_url url, label
- end
-
- ##
- # are we currently inside <tt> tags?
-
- def in_tt?
- @in_tt > 0
- end
-
- ##
- # is +tag+ a <tt> tag?
-
- def tt?(tag)
- tag.bit == @tt_bit
- end
-
- ##
- # Set up the standard mapping of attributes to HTML tags
-
- def init_tags
- @attr_tags = [
- InlineTag.new(RDoc::Markup::Attribute.bitmap_for(:BOLD), "<b>", "</b>"),
- InlineTag.new(RDoc::Markup::Attribute.bitmap_for(:TT), "<tt>", "</tt>"),
- InlineTag.new(RDoc::Markup::Attribute.bitmap_for(:EM), "<em>", "</em>"),
- ]
- end
-
- ##
- # Add a new set of HTML tags for an attribute. We allow separate start and
- # end tags for flexibility.
-
- def add_tag(name, start, stop)
- @attr_tags << InlineTag.new(RDoc::Markup::Attribute.bitmap_for(name), start, stop)
- end
-
- ##
- # Given an HTML tag, decorate it with class information and the like if
- # required. This is a no-op in the base class, but is overridden in HTML
- # output classes that implement style sheets.
-
- def annotate(tag)
- tag
- end
-
- ##
- # Here's the client side of the visitor pattern
-
- def start_accepting
- @res = ""
- @in_list_entry = []
- end
-
- def end_accepting
- @res
- end
-
- def accept_paragraph(am, fragment)
- @res << annotate("<p>") + "\n"
- @res << wrap(convert_flow(am.flow(fragment.txt)))
- @res << annotate("</p>") + "\n"
- end
-
- def accept_verbatim(am, fragment)
- @res << annotate("<pre>") + "\n"
- @res << CGI.escapeHTML(fragment.txt)
- @res << annotate("</pre>") << "\n"
- end
-
- def accept_rule(am, fragment)
- size = fragment.param
- size = 10 if size > 10
- @res << "<hr size=\"#{size}\"></hr>"
- end
-
- def accept_list_start(am, fragment)
- @res << html_list_name(fragment.type, true) << "\n"
- @in_list_entry.push false
- end
-
- def accept_list_end(am, fragment)
- if tag = @in_list_entry.pop
- @res << annotate(tag) << "\n"
- end
- @res << html_list_name(fragment.type, false) << "\n"
- end
-
- def accept_list_item(am, fragment)
- if tag = @in_list_entry.last
- @res << annotate(tag) << "\n"
- end
-
- @res << list_item_start(am, fragment)
-
- @res << wrap(convert_flow(am.flow(fragment.txt))) << "\n"
-
- @in_list_entry[-1] = list_end_for(fragment.type)
- end
-
- def accept_blank_line(am, fragment)
- # @res << annotate("<p />") << "\n"
- end
-
- def accept_heading(am, fragment)
- @res << convert_heading(fragment.head_level, am.flow(fragment.txt))
- end
-
- ##
- # This is a higher speed (if messier) version of wrap
-
- def wrap(txt, line_len = 76)
- res = ""
- sp = 0
- ep = txt.length
- while sp < ep
- # scan back for a space
- p = sp + line_len - 1
- if p >= ep
- p = ep
- else
- while p > sp and txt[p] != ?\s
- p -= 1
- end
- if p <= sp
- p = sp + line_len
- while p < ep and txt[p] != ?\s
- p += 1
- end
- end
- end
- res << txt[sp...p] << "\n"
- sp = p
- sp += 1 while sp < ep and txt[sp] == ?\s
- end
- res
- end
-
- private
-
- def on_tags(res, item)
- attr_mask = item.turn_on
- return if attr_mask.zero?
-
- @attr_tags.each do |tag|
- if attr_mask & tag.bit != 0
- res << annotate(tag.on)
- @in_tt += 1 if tt?(tag)
- end
- end
- end
-
- def off_tags(res, item)
- attr_mask = item.turn_off
- return if attr_mask.zero?
-
- @attr_tags.reverse_each do |tag|
- if attr_mask & tag.bit != 0
- @in_tt -= 1 if tt?(tag)
- res << annotate(tag.off)
- end
- end
- end
-
- def convert_flow(flow)
- res = ""
-
- flow.each do |item|
- case item
- when String
- res << convert_string(item)
- when RDoc::Markup::AttrChanger
- off_tags(res, item)
- on_tags(res, item)
- when RDoc::Markup::Special
- res << convert_special(item)
- else
- raise "Unknown flow element: #{item.inspect}"
- end
- end
-
- res
- end
-
- def convert_string(item)
- in_tt? ? convert_string_simple(item) : convert_string_fancy(item)
- end
-
- def convert_string_simple(item)
- CGI.escapeHTML item
- end
-
- ##
- # some of these patterns are taken from SmartyPants...
-
- def convert_string_fancy(item)
- # convert ampersand before doing anything else
- item.gsub(/&/, '&amp;').
-
- # convert -- to em-dash, (-- to en-dash)
- gsub(/---?/, '&#8212;'). #gsub(/--/, '&#8211;').
-
- # convert ... to elipsis (and make sure .... becomes .<elipsis>)
- gsub(/\.\.\.\./, '.&#8230;').gsub(/\.\.\./, '&#8230;').
-
- # convert single closing quote
- gsub(%r{([^ \t\r\n\[\{\(])\'}, '\1&#8217;'). # }
- gsub(%r{\'(?=\W|s\b)}, '&#8217;').
-
- # convert single opening quote
- gsub(/'/, '&#8216;').
-
- # convert double closing quote
- gsub(%r{([^ \t\r\n\[\{\(])\"(?=\W)}, '\1&#8221;'). # }
-
- # convert double opening quote
- gsub(/"/, '&#8220;').
-
- # convert copyright
- gsub(/\(c\)/, '&#169;').
-
- # convert registered trademark
- gsub(/\(r\)/, '&#174;')
- end
-
- def convert_special(special)
- handled = false
- RDoc::Markup::Attribute.each_name_of(special.type) do |name|
- method_name = "handle_special_#{name}"
- if self.respond_to? method_name
- special.text = send(method_name, special)
- handled = true
- end
- end
- raise "Unhandled special: #{special}" unless handled
- special.text
- end
-
- def convert_heading(level, flow)
- res =
- annotate("<h#{level}>") +
- convert_flow(flow) +
- annotate("</h#{level}>\n")
- end
-
- def html_list_name(list_type, is_open_tag)
- tags = LIST_TYPE_TO_HTML[list_type] || raise("Invalid list type: #{list_type.inspect}")
- annotate(tags[ is_open_tag ? 0 : 1])
- end
-
- def list_item_start(am, fragment)
- case fragment.type
- when :BULLET, :NUMBER then
- annotate("<li>")
-
- when :UPPERALPHA then
- annotate("<li type=\"A\">")
-
- when :LOWERALPHA then
- annotate("<li type=\"a\">")
-
- when :LABELED then
- annotate("<dt>") +
- convert_flow(am.flow(fragment.param)) +
- annotate("</dt>") +
- annotate("<dd>")
-
- when :NOTE then
- annotate("<tr>") +
- annotate("<td valign=\"top\">") +
- convert_flow(am.flow(fragment.param)) +
- annotate("</td>") +
- annotate("<td>")
- else
- raise "Invalid list type"
- end
- end
-
- def list_end_for(fragment_type)
- case fragment_type
- when :BULLET, :NUMBER, :UPPERALPHA, :LOWERALPHA then
- "</li>"
- when :LABELED then
- "</dd>"
- when :NOTE then
- "</td></tr>"
- else
- raise "Invalid list type"
- end
- end
-
-end
-
diff --git a/lib/rdoc/markup/to_html_crossref.rb b/lib/rdoc/markup/to_html_crossref.rb
deleted file mode 100644
index e73fbf5c8f..0000000000
--- a/lib/rdoc/markup/to_html_crossref.rb
+++ /dev/null
@@ -1,148 +0,0 @@
-require 'rdoc/markup/to_html'
-
-##
-# Subclass of the RDoc::Markup::ToHtml class that supports looking up words in
-# the AllReferences list. Those that are found (like AllReferences in this
-# comment) will be hyperlinked
-
-class RDoc::Markup::ToHtmlCrossref < RDoc::Markup::ToHtml
-
- attr_accessor :context
-
- # Regular expressions to match class and method references.
- #
- # 1.) There can be a '\' in front of text to suppress
- # any cross-references (note, however, that the single '\'
- # is written as '\\\\' in order to escape it twice, once
- # in the Ruby String literal and once in the regexp).
- # 2.) There can be a '::' in front of class names to reference
- # from the top-level namespace.
- # 3.) The method can be followed by parenthesis,
- # which may or may not have things inside (this
- # apparently is allowed for Fortran 95, but I also think that this
- # is a good idea for Ruby, as it is very reasonable to want to
- # reference a call with arguments).
- #
- # NOTE: In order to support Fortran 95 properly, the [A-Z] below
- # should be changed to [A-Za-z]. This slows down rdoc significantly,
- # however, and the Fortran 95 support is broken in any case due to
- # the return in handle_special_CROSSREF if the token consists
- # entirely of lowercase letters.
- #
- # The markup/cross-referencing engine needs a rewrite for
- # Fortran 95 to be supported properly.
- CLASS_REGEXP_STR = '\\\\?((?:\:{2})?[A-Z]\w*(?:\:\:\w+)*)'
- METHOD_REGEXP_STR = '(\w+[!?=]?)(?:\([\.\w+\*\/\+\-\=\<\>]*\))?'
-
- # Regular expressions matching text that should potentially have
- # cross-reference links generated are passed to add_special.
- # Note that these expressions are meant to pick up text for which
- # cross-references have been suppressed, since the suppression
- # characters are removed by the code that is triggered.
- CROSSREF_REGEXP = /(
- # A::B::C.meth
- #{CLASS_REGEXP_STR}[\.\#]#{METHOD_REGEXP_STR}
-
- # Stand-alone method (proceeded by a #)
- | \\?\##{METHOD_REGEXP_STR}
-
- # A::B::C
- # The stuff after CLASS_REGEXP_STR is a
- # nasty hack. CLASS_REGEXP_STR unfortunately matches
- # words like dog and cat (these are legal "class"
- # names in Fortran 95). When a word is flagged as a
- # potential cross-reference, limitations in the markup
- # engine suppress other processing, such as typesetting.
- # This is particularly noticeable for contractions.
- # In order that words like "can't" not
- # be flagged as potential cross-references, only
- # flag potential class cross-references if the character
- # after the cross-referece is a space or sentence
- # punctuation.
- | #{CLASS_REGEXP_STR}(?=[\s\)\.\?\!\,\;]|\z)
-
- # Things that look like filenames
- # The key thing is that there must be at least
- # one special character (period, slash, or
- # underscore).
- | [\/\w]+[_\/\.][\w\/\.]+
-
- # Things that have markup suppressed
- | \\[^\s]
- )/x
-
- ##
- # We need to record the html path of our caller so we can generate
- # correct relative paths for any hyperlinks that we find
-
- def initialize(from_path, context, show_hash)
- raise ArgumentError, 'from_path cannot be nil' if from_path.nil?
- super()
-
- @markup.add_special(CROSSREF_REGEXP, :CROSSREF)
-
- @from_path = from_path
- @context = context
- @show_hash = show_hash
-
- @seen = {}
- end
-
- ##
- # We're invoked when any text matches the CROSSREF pattern
- # (defined in MarkUp). If we fine the corresponding reference,
- # generate a hyperlink. If the name we're looking for contains
- # no punctuation, we look for it up the module/class chain. For
- # example, HyperlinkHtml is found, even without the Generator::
- # prefix, because we look for it in module Generator first.
-
- def handle_special_CROSSREF(special)
- name = special.text
-
- # This ensures that words entirely consisting of lowercase letters will
- # not have cross-references generated (to suppress lots of
- # erroneous cross-references to "new" in text, for instance)
- return name if name =~ /\A[a-z]*\z/
-
- return @seen[name] if @seen.include? name
-
- if name[0, 1] == '#' then
- lookup = name[1..-1]
- name = lookup unless @show_hash
- else
- lookup = name
- end
-
-
- # Find class, module, or method in class or module.
- #
- # Do not, however, use an if/elsif/else chain to do so. Instead, test
- # each possible pattern until one matches. The reason for this is that a
- # string like "YAML.txt" could be the txt() class method of class YAML (in
- # which case it would match the first pattern, which splits the string
- # into container and method components and looks up both) or a filename
- # (in which case it would match the last pattern, which just checks
- # whether the string as a whole is a known symbol).
-
- if /#{CLASS_REGEXP_STR}[\.\#]#{METHOD_REGEXP_STR}/ =~ lookup then
- container = $1
- method = $2
- ref = @context.find_symbol container, method
- end
-
- ref = @context.find_symbol lookup unless ref
-
- out = if lookup =~ /^\\/ then
- $'
- elsif ref and ref.document_self then
- "<a href=\"#{ref.as_href(@from_path)}\">#{name}</a>"
- else
- name
- end
-
- @seen[name] = out
-
- out
- end
-
-end
diff --git a/lib/rdoc/markup/to_latex.rb b/lib/rdoc/markup/to_latex.rb
deleted file mode 100644
index bbf958f2ed..0000000000
--- a/lib/rdoc/markup/to_latex.rb
+++ /dev/null
@@ -1,328 +0,0 @@
-require 'rdoc/markup/formatter'
-require 'rdoc/markup/fragments'
-require 'rdoc/markup/inline'
-
-require 'cgi'
-
-##
-# Convert SimpleMarkup to basic LaTeX report format.
-
-class RDoc::Markup::ToLaTeX < RDoc::Markup::Formatter
-
- BS = "\020" # \
- OB = "\021" # {
- CB = "\022" # }
- DL = "\023" # Dollar
-
- BACKSLASH = "#{BS}symbol#{OB}92#{CB}"
- HAT = "#{BS}symbol#{OB}94#{CB}"
- BACKQUOTE = "#{BS}symbol#{OB}0#{CB}"
- TILDE = "#{DL}#{BS}sim#{DL}"
- LESSTHAN = "#{DL}<#{DL}"
- GREATERTHAN = "#{DL}>#{DL}"
-
- def self.l(str)
- str.tr('\\', BS).tr('{', OB).tr('}', CB).tr('$', DL)
- end
-
- def l(arg)
- RDoc::Markup::ToLaTeX.l(arg)
- end
-
- LIST_TYPE_TO_LATEX = {
- :BULLET => [ l("\\begin{itemize}"), l("\\end{itemize}") ],
- :NUMBER => [ l("\\begin{enumerate}"), l("\\end{enumerate}"), "\\arabic" ],
- :UPPERALPHA => [ l("\\begin{enumerate}"), l("\\end{enumerate}"), "\\Alph" ],
- :LOWERALPHA => [ l("\\begin{enumerate}"), l("\\end{enumerate}"), "\\alph" ],
- :LABELED => [ l("\\begin{description}"), l("\\end{description}") ],
- :NOTE => [
- l("\\begin{tabularx}{\\linewidth}{@{} l X @{}}"),
- l("\\end{tabularx}") ],
- }
-
- InlineTag = Struct.new(:bit, :on, :off)
-
- def initialize
- init_tags
- @list_depth = 0
- @prev_list_types = []
- end
-
- ##
- # Set up the standard mapping of attributes to LaTeX
-
- def init_tags
- @attr_tags = [
- InlineTag.new(RDoc::Markup::Attribute.bitmap_for(:BOLD), l("\\textbf{"), l("}")),
- InlineTag.new(RDoc::Markup::Attribute.bitmap_for(:TT), l("\\texttt{"), l("}")),
- InlineTag.new(RDoc::Markup::Attribute.bitmap_for(:EM), l("\\emph{"), l("}")),
- ]
- end
-
- ##
- # Escape a LaTeX string
-
- def escape(str)
- $stderr.print "FE: ", str if $DEBUG_RDOC
- s = str.
- sub(/\s+$/, '').
- gsub(/([_\${}&%#])/, "#{BS}\\1").
- gsub(/\\/, BACKSLASH).
- gsub(/\^/, HAT).
- gsub(/~/, TILDE).
- gsub(/</, LESSTHAN).
- gsub(/>/, GREATERTHAN).
- gsub(/,,/, ",{},").
- gsub(/\`/, BACKQUOTE)
- $stderr.print "-> ", s, "\n" if $DEBUG_RDOC
- s
- end
-
- ##
- # Add a new set of LaTeX tags for an attribute. We allow
- # separate start and end tags for flexibility
-
- def add_tag(name, start, stop)
- @attr_tags << InlineTag.new(RDoc::Markup::Attribute.bitmap_for(name), start, stop)
- end
-
- ##
- # Here's the client side of the visitor pattern
-
- def start_accepting
- @res = ""
- @in_list_entry = []
- end
-
- def end_accepting
- @res.tr(BS, '\\').tr(OB, '{').tr(CB, '}').tr(DL, '$')
- end
-
- def accept_paragraph(am, fragment)
- @res << wrap(convert_flow(am.flow(fragment.txt)))
- @res << "\n"
- end
-
- def accept_verbatim(am, fragment)
- @res << "\n\\begin{code}\n"
- @res << fragment.txt.sub(/[\n\s]+\Z/, '')
- @res << "\n\\end{code}\n\n"
- end
-
- def accept_rule(am, fragment)
- size = fragment.param
- size = 10 if size > 10
- @res << "\n\n\\rule{\\linewidth}{#{size}pt}\n\n"
- end
-
- def accept_list_start(am, fragment)
- @res << list_name(fragment.type, true) << "\n"
- @in_list_entry.push false
- end
-
- def accept_list_end(am, fragment)
- if tag = @in_list_entry.pop
- @res << tag << "\n"
- end
- @res << list_name(fragment.type, false) << "\n"
- end
-
- def accept_list_item(am, fragment)
- if tag = @in_list_entry.last
- @res << tag << "\n"
- end
- @res << list_item_start(am, fragment)
- @res << wrap(convert_flow(am.flow(fragment.txt))) << "\n"
- @in_list_entry[-1] = list_end_for(fragment.type)
- end
-
- def accept_blank_line(am, fragment)
- # @res << "\n"
- end
-
- def accept_heading(am, fragment)
- @res << convert_heading(fragment.head_level, am.flow(fragment.txt))
- end
-
- ##
- # This is a higher speed (if messier) version of wrap
-
- def wrap(txt, line_len = 76)
- res = ""
- sp = 0
- ep = txt.length
- while sp < ep
- # scan back for a space
- p = sp + line_len - 1
- if p >= ep
- p = ep
- else
- while p > sp and txt[p] != ?\s
- p -= 1
- end
- if p <= sp
- p = sp + line_len
- while p < ep and txt[p] != ?\s
- p += 1
- end
- end
- end
- res << txt[sp...p] << "\n"
- sp = p
- sp += 1 while sp < ep and txt[sp] == ?\s
- end
- res
- end
-
- private
-
- def on_tags(res, item)
- attr_mask = item.turn_on
- return if attr_mask.zero?
-
- @attr_tags.each do |tag|
- if attr_mask & tag.bit != 0
- res << tag.on
- end
- end
- end
-
- def off_tags(res, item)
- attr_mask = item.turn_off
- return if attr_mask.zero?
-
- @attr_tags.reverse_each do |tag|
- if attr_mask & tag.bit != 0
- res << tag.off
- end
- end
- end
-
- def convert_flow(flow)
- res = ""
- flow.each do |item|
- case item
- when String
- $stderr.puts "Converting '#{item}'" if $DEBUG_RDOC
- res << convert_string(item)
- when AttrChanger
- off_tags(res, item)
- on_tags(res, item)
- when Special
- res << convert_special(item)
- else
- raise "Unknown flow element: #{item.inspect}"
- end
- end
- res
- end
-
- ##
- # some of these patterns are taken from SmartyPants...
-
- def convert_string(item)
- escape(item).
-
- # convert ... to elipsis (and make sure .... becomes .<elipsis>)
- gsub(/\.\.\.\./, '.\ldots{}').gsub(/\.\.\./, '\ldots{}').
-
- # convert single closing quote
- gsub(%r{([^ \t\r\n\[\{\(])\'}, '\1\'').
- gsub(%r{\'(?=\W|s\b)}, "'" ).
-
- # convert single opening quote
- gsub(/'/, '`').
-
- # convert double closing quote
- gsub(%r{([^ \t\r\n\[\{\(])\"(?=\W)}, "\\1''").
-
- # convert double opening quote
- gsub(/"/, "``").
-
- # convert copyright
- gsub(/\(c\)/, '\copyright{}')
-
- end
-
- def convert_special(special)
- handled = false
- Attribute.each_name_of(special.type) do |name|
- method_name = "handle_special_#{name}"
- if self.respond_to? method_name
- special.text = send(method_name, special)
- handled = true
- end
- end
- raise "Unhandled special: #{special}" unless handled
- special.text
- end
-
- def convert_heading(level, flow)
- res =
- case level
- when 1 then "\\chapter{"
- when 2 then "\\section{"
- when 3 then "\\subsection{"
- when 4 then "\\subsubsection{"
- else "\\paragraph{"
- end +
- convert_flow(flow) +
- "}\n"
- end
-
- def list_name(list_type, is_open_tag)
- tags = LIST_TYPE_TO_LATEX[list_type] || raise("Invalid list type: #{list_type.inspect}")
- if tags[2] # enumerate
- if is_open_tag
- @list_depth += 1
- if @prev_list_types[@list_depth] != tags[2]
- case @list_depth
- when 1
- roman = "i"
- when 2
- roman = "ii"
- when 3
- roman = "iii"
- when 4
- roman = "iv"
- else
- raise("Too deep list: level #{@list_depth}")
- end
- @prev_list_types[@list_depth] = tags[2]
- return l("\\renewcommand{\\labelenum#{roman}}{#{tags[2]}{enum#{roman}}}") + "\n" + tags[0]
- end
- else
- @list_depth -= 1
- end
- end
- tags[ is_open_tag ? 0 : 1]
- end
-
- def list_item_start(am, fragment)
- case fragment.type
- when :BULLET, :NUMBER, :UPPERALPHA, :LOWERALPHA then
- "\\item "
-
- when :LABELED then
- "\\item[" + convert_flow(am.flow(fragment.param)) + "] "
-
- when :NOTE then
- convert_flow(am.flow(fragment.param)) + " & "
- else
- raise "Invalid list type"
- end
- end
-
- def list_end_for(fragment_type)
- case fragment_type
- when :BULLET, :NUMBER, :UPPERALPHA, :LOWERALPHA, :LABELED then
- ""
- when :NOTE
- "\\\\\n"
- else
- raise "Invalid list type"
- end
- end
-
-end
-
diff --git a/lib/rdoc/markup/to_test.rb b/lib/rdoc/markup/to_test.rb
deleted file mode 100644
index ce6aff6e9a..0000000000
--- a/lib/rdoc/markup/to_test.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-require 'rdoc/markup'
-require 'rdoc/markup/formatter'
-
-##
-# This Markup outputter is used for testing purposes.
-
-class RDoc::Markup::ToTest < RDoc::Markup::Formatter
-
- def start_accepting
- @res = []
- end
-
- def end_accepting
- @res
- end
-
- def accept_paragraph(am, fragment)
- @res << fragment.to_s
- end
-
- def accept_verbatim(am, fragment)
- @res << fragment.to_s
- end
-
- def accept_list_start(am, fragment)
- @res << fragment.to_s
- end
-
- def accept_list_end(am, fragment)
- @res << fragment.to_s
- end
-
- def accept_list_item(am, fragment)
- @res << fragment.to_s
- end
-
- def accept_blank_line(am, fragment)
- @res << fragment.to_s
- end
-
- def accept_heading(am, fragment)
- @res << fragment.to_s
- end
-
- def accept_rule(am, fragment)
- @res << fragment.to_s
- end
-
-end
-
diff --git a/lib/rdoc/markup/to_texinfo.rb b/lib/rdoc/markup/to_texinfo.rb
deleted file mode 100644
index 65a1608c4d..0000000000
--- a/lib/rdoc/markup/to_texinfo.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-require 'rdoc/markup/formatter'
-require 'rdoc/markup/fragments'
-require 'rdoc/markup/inline'
-
-require 'rdoc/markup'
-require 'rdoc/markup/formatter'
-
-##
-# Convert SimpleMarkup to basic TexInfo format
-#
-# TODO: WTF is AttributeManager for?
-#
-class RDoc::Markup::ToTexInfo < RDoc::Markup::Formatter
-
- def start_accepting
- @text = []
- end
-
- def end_accepting
- @text.join("\n")
- end
-
- def accept_paragraph(attributes, text)
- @text << format(text)
- end
-
- def accept_verbatim(attributes, text)
- @text << "@verb{|#{format(text)}|}"
- end
-
- def accept_heading(attributes, text)
- heading = ['@majorheading', '@chapheading'][text.head_level - 1] || '@heading'
- @text << "#{heading} #{format(text)}"
- end
-
- def accept_list_start(attributes, text)
- @text << '@itemize @bullet'
- end
-
- def accept_list_end(attributes, text)
- @text << '@end itemize'
- end
-
- def accept_list_item(attributes, text)
- @text << "@item\n#{format(text)}"
- end
-
- def accept_blank_line(attributes, text)
- @text << "\n"
- end
-
- def accept_rule(attributes, text)
- @text << '-----'
- end
-
- def format(text)
- text.txt.
- gsub(/@/, "@@").
- gsub(/\{/, "@{").
- gsub(/\}/, "@}").
- # gsub(/,/, "@,"). # technically only required in cross-refs
- gsub(/\+([\w]+)\+/, "@code{\\1}").
- gsub(/\<tt\>([^<]+)\<\/tt\>/, "@code{\\1}").
- gsub(/\*([\w]+)\*/, "@strong{\\1}").
- gsub(/\<b\>([^<]+)\<\/b\>/, "@strong{\\1}").
- gsub(/_([\w]+)_/, "@emph{\\1}").
- gsub(/\<em\>([^<]+)\<\/em\>/, "@emph{\\1}")
- end
-end
diff --git a/lib/rdoc/options.rb b/lib/rdoc/options.rb
index 2b069f4265..7e35abdb0b 100644
--- a/lib/rdoc/options.rb
+++ b/lib/rdoc/options.rb
@@ -1,617 +1,561 @@
# We handle the parsing of options, and subsequently as a singleton
# object to be queried for option values
-require "rdoc/ri/paths"
-require 'optparse'
+require "rdoc/ri/ri_paths"
-class RDoc::Options
+class Options
- ##
- # Should the output be placed into a single file
+ require 'singleton'
+ require 'getoptlong'
- attr_reader :all_one_file
-
- ##
- # Character-set
-
- attr_reader :charset
-
- ##
- # URL of stylesheet
-
- attr_reader :css
-
- ##
- # Should diagrams be drawn
-
- attr_reader :diagram
-
- ##
- # Files matching this pattern will be excluded
+ include Singleton
+ # files matching this pattern will be excluded
attr_accessor :exclude
- ##
- # Additional attr_... style method flags
-
- attr_reader :extra_accessor_flags
-
- ##
- # Pattern for additional attr_... style methods
-
- attr_accessor :extra_accessors
-
- ##
- # Should we draw fileboxes in diagrams
-
- attr_reader :fileboxes
-
- ##
- # The list of files to be processed
-
- attr_accessor :files
-
- ##
- # Scan newer sources than the flag file if true.
-
- attr_reader :force_update
-
- ##
- # Description of the output generator (set with the <tt>-fmt</tt> option)
-
- attr_accessor :generator
-
- ##
- # Formatter to mark up text with
-
- attr_accessor :formatter
-
- ##
- # image format for diagrams
-
- attr_reader :image_format
-
- ##
- # Include line numbers in the source listings
-
- attr_reader :include_line_numbers
-
- ##
- # Should source code be included inline, or displayed in a popup
-
- attr_accessor :inline_source
-
- ##
- # Name of the file, class or module to display in the initial index page (if
- # not specified the first file we encounter is used)
+ # the name of the output directory
+ attr_accessor :op_dir
+
+ # the name to use for the output
+ attr_reader :op_name
+ # include private and protected methods in the
+ # output
+ attr_accessor :show_all
+
+ # name of the file, class or module to display in
+ # the initial index page (if not specified
+ # the first file we encounter is used)
attr_accessor :main_page
- ##
- # Merge into classes of the same name when generating ri
-
+ # merge into classes of the name name when generating ri
attr_reader :merge
- ##
- # The name of the output directory
-
- attr_accessor :op_dir
-
- ##
- # The name to use for the output
-
- attr_accessor :op_name
-
- ##
- # Are we promiscuous about showing module contents across multiple files
+ # Don't display progress as we process the files
+ attr_reader :quiet
- attr_reader :promiscuous
+ # description of the output generator (set with the <tt>-fmt</tt>
+ # option
+ attr_accessor :generator
- ##
- # Array of directories to search for files to satisfy an :include:
+ # and the list of files to be processed
+ attr_reader :files
+ # array of directories to search for files to satisfy an :include:
attr_reader :rdoc_include
- ##
- # Include private and protected methods in the output
-
- attr_accessor :show_all
-
- ##
- # Include the '#' at the front of hyperlinked instance method names
+ # title to be used out the output
+ #attr_writer :title
- attr_reader :show_hash
-
- ##
- # The number of columns in a tab
-
- attr_reader :tab_width
-
- ##
# template to be used when generating output
-
attr_reader :template
- ##
- # Template class for file generation
- #--
- # HACK around dependencies in lib/rdoc/generator/html.rb
-
- attr_accessor :template_class # :nodoc:
+ # should diagrams be drawn
+ attr_reader :diagram
- ##
- # Documentation title
+ # should we draw fileboxes in diagrams
+ attr_reader :fileboxes
- attr_reader :title
+ # include the '#' at the front of hyperlinked instance method names
+ attr_reader :show_hash
- ##
- # Verbosity, zero means quiet
+ # image format for diagrams
+ attr_reader :image_format
- attr_accessor :verbosity
+ # character-set
+ attr_reader :charset
- ##
- # URL of web cvs frontend
+ # should source code be included inline, or displayed in a popup
+ attr_reader :inline_source
- attr_reader :webcvs
+ # should the output be placed into a single file
+ attr_reader :all_one_file
- def initialize(generators = {}) # :nodoc:
- @op_dir = "doc"
- @op_name = nil
- @show_all = false
- @main_page = nil
- @merge = false
- @exclude = []
- @generators = generators
- @generator_name = 'html'
- @generator = @generators[@generator_name]
- @rdoc_include = []
- @title = nil
- @template = nil
- @template_class = nil
- @diagram = false
- @fileboxes = false
- @show_hash = false
- @image_format = 'png'
- @inline_source = false
- @all_one_file = false
- @tab_width = 8
- @include_line_numbers = false
- @extra_accessor_flags = {}
- @promiscuous = false
- @force_update = false
- @verbosity = 1
-
- @css = nil
- @webcvs = nil
-
- @charset = 'utf-8'
- end
+ # the number of columns in a tab
+ attr_reader :tab_width
- ##
- # Parse command line options.
-
- def parse(argv)
- accessors = []
-
- opts = OptionParser.new do |opt|
- opt.program_name = File.basename $0
- opt.version = RDoc::VERSION
- opt.release = nil
- opt.summary_indent = ' ' * 4
- opt.banner = <<-EOF
-Usage: #{opt.program_name} [options] [names...]
-
- Files are parsed, and the information they contain collected, before any
- output is produced. This allows cross references between all files to be
- resolved. If a name is a directory, it is traversed. If no names are
- specified, all Ruby files in the current directory (and subdirectories) are
- processed.
-
- How RDoc generates output depends on the output formatter being used, and on
- the options you give.
-
- - HTML output is normally produced into a number of separate files
- (one per class, module, and file, along with various indices).
- These files will appear in the directory given by the --op
- option (doc/ by default).
-
- - XML output by default is written to standard output. If a
- --opname option is given, the output will instead be written
- to a file with that name in the output directory.
-
- - .chm files (Windows help files) are written in the --op directory.
- If an --opname parameter is present, that name is used, otherwise
- the file will be called rdoc.chm.
- EOF
-
- opt.separator nil
- opt.separator "Options:"
- opt.separator nil
-
- opt.on("--accessor=ACCESSORS", "-A", Array,
- "A comma separated list of additional class",
- "methods that should be treated like",
- "'attr_reader' and friends.",
- " ",
- "Option may be repeated.",
- " ",
- "Each accessorname may have '=text'",
- "appended, in which case that text appears",
- "where the r/w/rw appears for normal.",
- "accessors") do |value|
- value.each do |accessor|
- if accessor =~ /^(\w+)(=(.*))?$/
- accessors << $1
- @extra_accessor_flags[$1] = $3
- end
- end
- end
+ # include line numbers in the source listings
+ attr_reader :include_line_numbers
- opt.separator nil
+ # pattern for additional attr_... style methods
+ attr_reader :extra_accessors
+ attr_reader :extra_accessor_flags
- opt.on("--all", "-a",
- "Include all methods (not just public) in",
- "the output.") do |value|
- @show_all = value
- end
+ # URL of stylesheet
+ attr_reader :css
- opt.separator nil
+ # URL of web cvs frontend
+ attr_reader :webcvs
- opt.on("--charset=CHARSET", "-c",
- "Specifies the output HTML character-set.") do |value|
- @charset = value
- end
+ # Are we promiscuous about showing module contents across
+ # multiple files
+ attr_reader :promiscuous
- opt.separator nil
+ # scan newer sources than the flag file if true.
+ attr_reader :force_update
- opt.on("--debug", "-D",
- "Displays lots on internal stuff.") do |value|
- $DEBUG_RDOC = value
+ module OptionList
+
+ OPTION_LIST = [
+ [ "--accessor", "-A", "accessorname[,..]",
+ "comma separated list of additional class methods\n" +
+ "that should be treated like 'attr_reader' and\n" +
+ "friends. Option may be repeated. Each accessorname\n" +
+ "may have '=text' appended, in which case that text\n" +
+ "appears where the r/w/rw appears for normal accessors."],
+
+ [ "--all", "-a", nil,
+ "include all methods (not just public)\nin the output" ],
+
+ [ "--charset", "-c", "charset",
+ "specifies HTML character-set" ],
+
+ [ "--debug", "-D", nil,
+ "displays lots on internal stuff" ],
+
+ [ "--diagram", "-d", nil,
+ "Generate diagrams showing modules and classes.\n" +
+ "You need dot V1.8.6 or later to use the --diagram\n" +
+ "option correctly. Dot is available from\n"+
+ "http://www.research.att.com/sw/tools/graphviz/" ],
+
+ [ "--exclude", "-x", "pattern",
+ "do not process files or directories matching\n" +
+ "pattern. Files given explicitly on the command\n" +
+ "line will never be excluded." ],
+
+ [ "--extension", "-E", "new=old",
+ "Treat files ending with .new as if they ended with\n" +
+ ".old. Using '-E cgi=rb' will cause xxx.cgi to be\n" +
+ "parsed as a Ruby file"],
+
+ [ "--fileboxes", "-F", nil,
+ "classes are put in boxes which represents\n" +
+ "files, where these classes reside. Classes\n" +
+ "shared between more than one file are\n" +
+ "shown with list of files that sharing them.\n" +
+ "Silently discarded if --diagram is not given\n" +
+ "Experimental." ],
+
+ [ "--force-update", "-U", nil,
+ "forces to scan all sources even if newer than\n" +
+ "the flag file." ],
+
+ [ "--fmt", "-f", "format name",
+ "set the output formatter (see below)" ],
+
+ [ "--help", "-h", nil,
+ "you're looking at it" ],
+
+ [ "--help-output", "-O", nil,
+ "explain the various output options" ],
+
+ [ "--image-format", "-I", "gif/png/jpg/jpeg",
+ "Sets output image format for diagrams. Can\n" +
+ "be png, gif, jpeg, jpg. If this option is\n" +
+ "omitted, png is used. Requires --diagram." ],
+
+ [ "--include", "-i", "dir[,dir...]",
+ "set (or add to) the list of directories\n" +
+ "to be searched when satisfying :include:\n" +
+ "requests. Can be used more than once." ],
+
+ [ "--inline-source", "-S", nil,
+ "Show method source code inline, rather\n" +
+ "than via a popup link" ],
+
+ [ "--line-numbers", "-N", nil,
+ "Include line numbers in the source code" ],
+
+ [ "--main", "-m", "name",
+ "'name' will be the initial page displayed" ],
+
+ [ "--merge", "-M", nil,
+ "when creating ri output, merge processed classes\n" +
+ "into previously documented classes of the name name"],
+
+ [ "--one-file", "-1", nil,
+ "put all the output into a single file" ],
+
+ [ "--op", "-o", "dir",
+ "set the output directory" ],
+
+ [ "--opname", "-n", "name",
+ "Set the 'name' of the output. Has no\n" +
+ "effect for HTML." ],
+
+ [ "--promiscuous", "-p", nil,
+ "When documenting a file that contains a module\n" +
+ "or class also defined in other files, show\n" +
+ "all stuff for that module/class in each files\n" +
+ "page. By default, only show stuff defined in\n" +
+ "that particular file." ],
+
+ [ "--quiet", "-q", nil,
+ "don't show progress as we parse" ],
+
+ [ "--ri", "-r", nil,
+ "generate output for use by 'ri.' The files are\n" +
+ "stored in the '.rdoc' directory under your home\n"+
+ "directory unless overridden by a subsequent\n" +
+ "--op parameter, so no special privileges are needed." ],
+
+ [ "--ri-site", "-R", nil,
+ "generate output for use by 'ri.' The files are\n" +
+ "stored in a site-wide directory, making them accessible\n"+
+ "to others, so special privileges are needed." ],
+
+ [ "--ri-system", "-Y", nil,
+ "generate output for use by 'ri.' The files are\n" +
+ "stored in a system-level directory, making them accessible\n"+
+ "to others, so special privileges are needed. This option\n"+
+ "is intended to be used during Ruby installations" ],
+
+ [ "--show-hash", "-H", nil,
+ "A name of the form #name in a comment\n" +
+ "is a possible hyperlink to an instance\n" +
+ "method name. When displayed, the '#' is\n" +
+ "removed unless this option is specified" ],
+
+ [ "--style", "-s", "stylesheet url",
+ "specifies the URL of a separate stylesheet." ],
+
+ [ "--tab-width", "-w", "n",
+ "Set the width of tab characters (default 8)"],
+
+ [ "--template", "-T", "template name",
+ "Set the template used when generating output" ],
+
+ [ "--title", "-t", "text",
+ "Set 'txt' as the title for the output" ],
+
+ [ "--version", "-v", nil,
+ "display RDoc's version" ],
+
+ [ "--webcvs", "-W", "url",
+ "Specify a URL for linking to a web frontend\n" +
+ "to CVS. If the URL contains a '\%s', the\n" +
+ "name of the current file will be substituted;\n" +
+ "if the URL doesn't contain a '\%s', the\n" +
+ "filename will be appended to it." ],
+ ]
+
+ def OptionList.options
+ OPTION_LIST.map do |long, short, arg,|
+ [ long,
+ short,
+ arg ? GetoptLong::REQUIRED_ARGUMENT : GetoptLong::NO_ARGUMENT
+ ]
end
+ end
- opt.separator nil
-
- opt.on("--diagram", "-d",
- "Generate diagrams showing modules and",
- "classes. You need dot V1.8.6 or later to",
- "use the --diagram option correctly. Dot is",
- "available from http://graphviz.org") do |value|
- check_diagram
- @diagram = true
- end
- opt.separator nil
+ def OptionList.strip_output(text)
+ text =~ /^\s+/
+ leading_spaces = $&
+ text.gsub!(/^#{leading_spaces}/, '')
+ $stdout.puts text
+ end
- opt.on("--exclude=PATTERN", "-x", Regexp,
- "Do not process files or directories",
- "matching PATTERN.") do |value|
- @exclude << value
- end
- opt.separator nil
+ # Show an error and exit
- opt.on("--extension=NEW=OLD", "-E",
- "Treat files ending with .new as if they",
- "ended with .old. Using '-E cgi=rb' will",
- "cause xxx.cgi to be parsed as a Ruby file.") do |value|
- new, old = value.split(/=/, 2)
+ def OptionList.error(msg)
+ $stderr.puts
+ $stderr.puts msg
+ $stderr.puts "\nFor help on options, try 'rdoc --help'\n\n"
+ exit 1
+ end
- unless new and old then
- raise OptionParser::InvalidArgument, "Invalid parameter to '-E'"
+ # Show usage and exit
+
+ def OptionList.usage(generator_names)
+
+ puts
+ puts(VERSION_STRING)
+ puts
+
+ name = File.basename($0)
+ OptionList.strip_output(<<-EOT)
+ Usage:
+
+ #{name} [options] [names...]
+
+ Files are parsed, and the information they contain
+ collected, before any output is produced. This allows cross
+ references between all files to be resolved. If a name is a
+ directory, it is traversed. If no names are specified, all
+ Ruby files in the current directory (and subdirectories) are
+ processed.
+
+ Options:
+
+ EOT
+
+ OPTION_LIST.each do |long, short, arg, desc|
+ opt = sprintf("%20s", "#{long}, #{short}")
+ oparg = sprintf("%-7s", arg)
+ print "#{opt} #{oparg}"
+ desc = desc.split("\n")
+ if arg.nil? || arg.length < 7
+ puts desc.shift
+ else
+ puts
end
-
- unless RDoc::ParserFactory.alias_extension old, new then
- raise OptionParser::InvalidArgument, "Unknown extension .#{old} to -E"
+ desc.each do |line|
+ puts(" "*28 + line)
end
+ puts
end
- opt.separator nil
-
- opt.on("--fileboxes", "-F",
- "Classes are put in boxes which represents",
- "files, where these classes reside. Classes",
- "shared between more than one file are",
- "shown with list of files that are sharing",
- "them. Silently discarded if --diagram is",
- "not given.") do |value|
- @fileboxes = value
- end
-
- opt.separator nil
+ puts "\nAvailable output formatters: " +
+ generator_names.sort.join(', ') + "\n\n"
- opt.on("--force-update", "-U",
- "Forces rdoc to scan all sources even if",
- "newer than the flag file.") do |value|
- @force_update = value
- end
-
- opt.separator nil
-
- opt.on("--fmt=FORMAT", "--format=FORMAT", "-f", @generators.keys,
- "Set the output formatter.") do |value|
- @generator_name = value.downcase
- setup_generator
- end
-
- opt.separator nil
-
- image_formats = %w[gif png jpg jpeg]
- opt.on("--image-format=FORMAT", "-I", image_formats,
- "Sets output image format for diagrams. Can",
- "be #{image_formats.join ', '}. If this option",
- "is omitted, png is used. Requires",
- "diagrams.") do |value|
- @image_format = value
- end
-
- opt.separator nil
-
- opt.on("--include=DIRECTORIES", "-i", Array,
- "set (or add to) the list of directories to",
- "be searched when satisfying :include:",
- "requests. Can be used more than once.") do |value|
- @rdoc_include.concat value.map { |dir| dir.strip }
- end
+ puts "For information on where the output goes, use\n\n"
+ puts " rdoc --help-output\n\n"
- opt.separator nil
-
- opt.on("--inline-source", "-S",
- "Show method source code inline, rather than",
- "via a popup link.") do |value|
- @inline_source = value
- end
-
- opt.separator nil
-
- opt.on("--line-numbers", "-N",
- "Include line numbers in the source code.") do |value|
- @include_line_numbers = value
- end
-
- opt.separator nil
-
- opt.on("--main=NAME", "-m",
- "NAME will be the initial page displayed.") do |value|
- @main_page = value
- end
-
- opt.separator nil
-
- opt.on("--merge", "-M",
- "When creating ri output, merge previously",
- "processed classes into previously",
- "documented classes of the same name.") do |value|
- @merge = value
- end
-
- opt.separator nil
-
- opt.on("--one-file", "-1",
- "Put all the output into a single file.") do |value|
- @all_one_file = value
- @inline_source = value if value
- @template = 'one_page_html'
- end
-
- opt.separator nil
+ exit 0
+ end
- opt.on("--op=DIR", "-o",
- "Set the output directory.") do |value|
- @op_dir = value
- end
+ def OptionList.help_output
+ OptionList.strip_output(<<-EOT)
+ How RDoc generates output depends on the output formatter being
+ used, and on the options you give.
- opt.separator nil
+ - HTML output is normally produced into a number of separate files
+ (one per class, module, and file, along with various indices).
+ These files will appear in the directory given by the --op
+ option (doc/ by default).
- opt.on("--opname=NAME", "-n",
- "Set the NAME of the output. Has no effect",
- "for HTML.") do |value|
- @op_name = value
- end
+ - XML output by default is written to standard output. If a
+ --opname option is given, the output will instead be written
+ to a file with that name in the output directory.
- opt.separator nil
-
- opt.on("--promiscuous", "-p",
- "When documenting a file that contains a",
- "module or class also defined in other",
- "files, show all stuff for that module or",
- "class in each files page. By default, only",
- "show stuff defined in that particular file.") do |value|
- @promiscuous = value
- end
+ - .chm files (Windows help files) are written in the --op directory.
+ If an --opname parameter is present, that name is used, otherwise
+ the file will be called rdoc.chm.
- opt.separator nil
+ For information on other RDoc options, use "rdoc --help".
+ EOT
+ exit 0
+ end
+ end
- opt.on("--quiet", "-q",
- "Don't show progress as we parse.") do |value|
- @verbosity = 0
- end
+ # Parse command line options. We're passed a hash containing
+ # output generators, keyed by the generator name
+
+ def parse(argv, generators)
+ old_argv = ARGV.dup
+ begin
+ ARGV.replace(argv)
+ @op_dir = "doc"
+ @op_name = nil
+ @show_all = false
+ @main_page = nil
+ @marge = false
+ @exclude = []
+ @quiet = false
+ @generator_name = 'html'
+ @generator = generators[@generator_name]
+ @rdoc_include = []
+ @title = nil
+ @template = nil
+ @diagram = false
+ @fileboxes = false
+ @show_hash = false
+ @image_format = 'png'
+ @inline_source = false
+ @all_one_file = false
+ @tab_width = 8
+ @include_line_numbers = false
+ @extra_accessor_flags = {}
+ @promiscuous = false
+ @force_update = false
+
+ @css = nil
+ @webcvs = nil
+
+ @charset = case $KCODE
+ when /^S/i
+ 'Shift_JIS'
+ when /^E/i
+ 'EUC-JP'
+ else
+ 'iso-8859-1'
+ end
+
+ accessors = []
+
+ go = GetoptLong.new(*OptionList.options)
+ go.quiet = true
+
+ go.each do |opt, arg|
+ case opt
+ when "--all" then @show_all = true
+ when "--charset" then @charset = arg
+ when "--debug" then $DEBUG = true
+ when "--exclude" then @exclude << Regexp.new(arg)
+ when "--inline-source" then @inline_source = true
+ when "--line-numbers" then @include_line_numbers = true
+ when "--main" then @main_page = arg
+ when "--merge" then @merge = true
+ when "--one-file" then @all_one_file = @inline_source = true
+ when "--op" then @op_dir = arg
+ when "--opname" then @op_name = arg
+ when "--promiscuous" then @promiscuous = true
+ when "--quiet" then @quiet = true
+ when "--show-hash" then @show_hash = true
+ when "--style" then @css = arg
+ when "--template" then @template = arg
+ when "--title" then @title = arg
+ when "--webcvs" then @webcvs = arg
+
+ when "--accessor"
+ arg.split(/,/).each do |accessor|
+ if accessor =~ /^(\w+)(=(.*))?$/
+ accessors << $1
+ @extra_accessor_flags[$1] = $3
+ end
+ end
- opt.on("--verbose", "-v",
- "Display extra progress as we parse.") do |value|
- @verbosity = 2
- end
+ when "--diagram"
+ check_diagram
+ @diagram = true
+ when "--fileboxes"
+ @fileboxes = true if @diagram
- opt.separator nil
+ when "--fmt"
+ @generator_name = arg.downcase
+ setup_generator(generators)
- opt.on("--ri", "-r",
- "Generate output for use by `ri`. The files",
- "are stored in the '.rdoc' directory under",
- "your home directory unless overridden by a",
- "subsequent --op parameter, so no special",
- "privileges are needed.") do |value|
- @generator_name = "ri"
- @op_dir = RDoc::RI::Paths::HOMEDIR
- setup_generator
- end
+ when "--help"
+ OptionList.usage(generators.keys)
- opt.separator nil
+ when "--help-output"
+ OptionList.help_output
- opt.on("--ri-site", "-R",
- "Generate output for use by `ri`. The files",
- "are stored in a site-wide directory,",
- "making them accessible to others, so",
- "special privileges are needed.") do |value|
- @generator_name = "ri"
- @op_dir = RDoc::RI::Paths::SITEDIR
- setup_generator
- end
+ when "--image-format"
+ if ['gif', 'png', 'jpeg', 'jpg'].include?(arg)
+ @image_format = arg
+ else
+ raise GetoptLong::InvalidOption.new("unknown image format: #{arg}")
+ end
- opt.separator nil
-
- opt.on("--ri-system", "-Y",
- "Generate output for use by `ri`. The files",
- "are stored in a site-wide directory,",
- "making them accessible to others, so",
- "special privileges are needed. This",
- "option is intended to be used during Ruby",
- "installation.") do |value|
- @generator_name = "ri"
- @op_dir = RDoc::RI::Paths::SYSDIR
- setup_generator
- end
+ when "--include"
+ @rdoc_include.concat arg.split(/\s*,\s*/)
+
+ when "--ri", "--ri-site", "--ri-system"
+ @generator_name = "ri"
+ @op_dir = case opt
+ when "--ri" then RI::Paths::HOMEDIR
+ when "--ri-site" then RI::Paths::SITEDIR
+ when "--ri-system" then RI::Paths::SYSDIR
+ else fail opt
+ end
+ setup_generator(generators)
+
+ when "--tab-width"
+ begin
+ @tab_width = Integer(arg)
+ rescue
+ $stderr.puts "Invalid tab width: '#{arg}'"
+ exit 1
+ end
- opt.separator nil
+ when "--extension"
+ new, old = arg.split(/=/, 2)
+ OptionList.error("Invalid parameter to '-E'") unless new && old
+ unless RDoc::ParserFactory.alias_extension(old, new)
+ OptionList.error("Unknown extension .#{old} to -E")
+ end
- opt.on("--show-hash", "-H",
- "A name of the form #name in a comment is a",
- "possible hyperlink to an instance method",
- "name. When displayed, the '#' is removed",
- "unless this option is specified.") do |value|
- @show_hash = value
- end
+ when "--force-update"
+ @force_update = true
- opt.separator nil
+ when "--version"
+ puts VERSION_STRING
+ exit
+ end
- opt.on("--style=URL", "-s",
- "Specifies the URL of a separate stylesheet.") do |value|
- @css = value
end
- opt.separator nil
-
- opt.on("--tab-width=WIDTH", "-w", OptionParser::DecimalInteger,
- "Set the width of tab characters.") do |value|
- @tab_width = value
- end
+ @files = ARGV.dup
- opt.separator nil
+ @rdoc_include << "." if @rdoc_include.empty?
- opt.on("--template=NAME", "-T",
- "Set the template used when generating",
- "output.") do |value|
- @template = value
+ if @exclude.empty?
+ @exclude = nil
+ else
+ @exclude = Regexp.new(@exclude.join("|"))
end
- opt.separator nil
+ check_files
- opt.on("--title=TITLE", "-t",
- "Set TITLE as the title for HTML output.") do |value|
- @title = value
- end
+ # If no template was specified, use the default
+ # template for the output formatter
- opt.separator nil
+ @template ||= @generator_name
- opt.on("--webcvs=URL", "-W",
- "Specify a URL for linking to a web frontend",
- "to CVS. If the URL contains a '\%s', the",
- "name of the current file will be",
- "substituted; if the URL doesn't contain a",
- "'\%s', the filename will be appended to it.") do |value|
- @webcvs = value
+ # Generate a regexp from the accessors
+ unless accessors.empty?
+ re = '^(' + accessors.map{|a| Regexp.quote(a)}.join('|') + ')$'
+ @extra_accessors = Regexp.new(re)
end
- end
-
- argv.insert(0, *ENV['RDOCOPT'].split) if ENV['RDOCOPT']
-
- opts.parse! argv
- @files = argv.dup
+ rescue GetoptLong::InvalidOption, GetoptLong::MissingArgument => error
+ OptionList.error(error.message)
- @rdoc_include << "." if @rdoc_include.empty?
-
- if @exclude.empty? then
- @exclude = nil
- else
- @exclude = Regexp.new(@exclude.join("|"))
+ ensure
+ ARGV.replace(old_argv)
end
+ end
- check_files
-
- # If no template was specified, use the default template for the output
- # formatter
-
- @template ||= @generator_name
- # Generate a regexp from the accessors
- unless accessors.empty? then
- re = '^(' + accessors.map { |a| Regexp.quote a }.join('|') + ')$'
- @extra_accessors = Regexp.new re
- end
-
- rescue OptionParser::InvalidArgument, OptionParser::InvalidOption => e
- puts opts
- puts
- puts e
- exit 1
+ def title
+ @title ||= "RDoc Documentation"
end
-
- ##
- # Set the title, but only if not already set. This means that a title set
- # from the command line trumps one set in a source file
+
+ # Set the title, but only if not already set. This means that a title set from
+ # the command line trumps one set in a source file
def title=(string)
@title ||= string
end
- ##
- # Don't display progress as we process the files
-
- def quiet
- @verbosity.zero?
- end
-
- def quiet=(bool)
- @verbosity = bool ? 0 : 1
- end
private
- ##
# Set up an output generator for the format in @generator_name
-
- def setup_generator
- @generator = @generators[@generator_name]
-
- unless @generator then
- raise OptionParser::InvalidArgument, "Invalid output formatter"
+ def setup_generator(generators)
+ @generator = generators[@generator_name]
+ if !@generator
+ OptionList.error("Invalid output formatter")
end
-
- if @generator_name == "xml" then
+
+ if @generator_name == "xml"
@all_one_file = true
@inline_source = true
end
end
- # Check that the right version of 'dot' is available. Unfortunately this
- # doesn't work correctly under Windows NT, so we'll bypass the test under
- # Windows.
+ # Check that the right version of 'dot' is available.
+ # Unfortuately this doesn't work correctly under Windows NT,
+ # so we'll bypass the test under Windows
def check_diagram
return if RUBY_PLATFORM =~ /mswin|cygwin|mingw|bccwin/
ok = false
ver = nil
-
- IO.popen "dot -V 2>&1" do |io|
+ IO.popen("dot -V 2>&1") do |io|
ver = io.read
- if ver =~ /dot.+version(?:\s+gviz)?\s+(\d+)\.(\d+)/ then
+ if ver =~ /dot.+version(?:\s+gviz)?\s+(\d+)\.(\d+)/
ok = ($1.to_i > 1) || ($1.to_i == 1 && $2.to_i >= 8)
end
end
-
- unless ok then
- if ver =~ /^dot.+version/ then
+ unless ok
+ if ver =~ /^dot.+version/
$stderr.puts "Warning: You may need dot V1.8.6 or later to use\n",
"the --diagram option correctly. You have:\n\n ",
ver,
@@ -621,18 +565,22 @@ Usage: #{opt.program_name} [options] [names...]
"(see http://www.research.att.com/sw/tools/graphviz/)\n\n"
exit
end
+# exit
end
end
-
- ##
+
# Check that the files on the command line exist
-
+
def check_files
@files.each do |f|
- stat = File.stat f
- raise RDoc::Error, "file '#{f}' not readable" unless stat.readable?
+ stat = File.stat f rescue error("File not found: #{f}")
+ error("File '#{f}' not readable") unless stat.readable?
end
end
-end
+ def error(str)
+ $stderr.puts str
+ exit(1)
+ end
+end
diff --git a/lib/rdoc/parser.rb b/lib/rdoc/parser.rb
deleted file mode 100644
index 3798734d5e..0000000000
--- a/lib/rdoc/parser.rb
+++ /dev/null
@@ -1,136 +0,0 @@
-require 'rdoc'
-require 'rdoc/code_objects'
-require 'rdoc/markup/preprocess'
-require 'rdoc/stats'
-
-##
-# A parser is simple a class that implements
-#
-# #initialize(file_name, body, options)
-#
-# and
-#
-# #scan
-#
-# The initialize method takes a file name to be used, the body of the file,
-# and an RDoc::Options object. The scan method is then called to return an
-# appropriately parsed TopLevel code object.
-#
-# The ParseFactory is used to redirect to the correct parser given a
-# filename extension. This magic works because individual parsers have to
-# register themselves with us as they are loaded in. The do this using the
-# following incantation
-#
-# require "rdoc/parser"
-#
-# class RDoc::Parser::Xyz < RDoc::Parser
-# parse_files_matching /\.xyz$/ # <<<<
-#
-# def initialize(file_name, body, options)
-# ...
-# end
-#
-# def scan
-# ...
-# end
-# end
-#
-# Just to make life interesting, if we suspect a plain text file, we also
-# look for a shebang line just in case it's a potential shell script
-
-class RDoc::Parser
-
- @parsers = []
-
- class << self
- attr_reader :parsers
- end
-
- ##
- # Alias an extension to another extension. After this call, files ending
- # "new_ext" will be parsed using the same parser as "old_ext"
-
- def self.alias_extension(old_ext, new_ext)
- old_ext = old_ext.sub(/^\.(.*)/, '\1')
- new_ext = new_ext.sub(/^\.(.*)/, '\1')
-
- parser = can_parse "xxx.#{old_ext}"
- return false unless parser
-
- RDoc::Parser.parsers.unshift [/\.#{new_ext}$/, parser]
-
- true
- end
-
- ##
- # Return _true_ if the +file+ seems like binary.
-
- def self.binary?(file)
- s = File.read(file, 1024) or return false
- s.count("^ -~\t\r\n").fdiv(s.size) > 0.3 || s.index("\x00")
- end
- private_class_method :binary?
-
- ##
- # Return a parser that can handle a particular extension
-
- def self.can_parse(file_name)
- parser = RDoc::Parser.parsers.find { |regexp,| regexp =~ file_name }.last
-
- #
- # The default parser should *NOT* parse binary files.
- #
- if parser == RDoc::Parser::Simple then
- if binary? file_name then
- return nil
- end
- end
-
- return parser
- end
-
- ##
- # Find the correct parser for a particular file name. Return a SimpleParser
- # for ones that we don't know
-
- def self.for(top_level, file_name, body, options, stats)
- # If no extension, look for shebang
- if file_name !~ /\.\w+$/ && body =~ %r{\A#!(.+)} then
- shebang = $1
- case shebang
- when %r{env\s+ruby}, %r{/ruby}
- file_name = "dummy.rb"
- end
- end
-
- parser = can_parse file_name
-
- #
- # This method must return a parser.
- #
- if !parser then
- parser = RDoc::Parser::Simple
- end
-
- parser.new top_level, file_name, body, options, stats
- end
-
- ##
- # Record which file types this parser can understand.
-
- def self.parse_files_matching(regexp)
- RDoc::Parser.parsers.unshift [regexp, self]
- end
-
- def initialize(top_level, file_name, content, options, stats)
- @top_level = top_level
- @file_name = file_name
- @content = content
- @options = options
- @stats = stats
- end
-
-end
-
-require 'rdoc/parser/simple'
-
diff --git a/lib/rdoc/parser/c.rb b/lib/rdoc/parser/c.rb
deleted file mode 100644
index a2c3eefbde..0000000000
--- a/lib/rdoc/parser/c.rb
+++ /dev/null
@@ -1,661 +0,0 @@
-require 'rdoc/parser'
-require 'rdoc/parser/ruby'
-require 'rdoc/known_classes'
-
-##
-# We attempt to parse C extension files. Basically we look for
-# the standard patterns that you find in extensions: <tt>rb_define_class,
-# rb_define_method</tt> and so on. We also try to find the corresponding
-# C source for the methods and extract comments, but if we fail
-# we don't worry too much.
-#
-# The comments associated with a Ruby method are extracted from the C
-# comment block associated with the routine that _implements_ that
-# method, that is to say the method whose name is given in the
-# <tt>rb_define_method</tt> call. For example, you might write:
-#
-# /*
-# * Returns a new array that is a one-dimensional flattening of this
-# * array (recursively). That is, for every element that is an array,
-# * extract its elements into the new array.
-# *
-# * s = [ 1, 2, 3 ] #=> [1, 2, 3]
-# * t = [ 4, 5, 6, [7, 8] ] #=> [4, 5, 6, [7, 8]]
-# * a = [ s, t, 9, 10 ] #=> [[1, 2, 3], [4, 5, 6, [7, 8]], 9, 10]
-# * a.flatten #=> [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
-# */
-# static VALUE
-# rb_ary_flatten(ary)
-# VALUE ary;
-# {
-# ary = rb_obj_dup(ary);
-# rb_ary_flatten_bang(ary);
-# return ary;
-# }
-#
-# ...
-#
-# void
-# Init_Array()
-# {
-# ...
-# rb_define_method(rb_cArray, "flatten", rb_ary_flatten, 0);
-#
-# Here RDoc will determine from the rb_define_method line that there's a
-# method called "flatten" in class Array, and will look for the implementation
-# in the method rb_ary_flatten. It will then use the comment from that
-# method in the HTML output. This method must be in the same source file
-# as the rb_define_method.
-#
-# C classes can be diagrammed (see /tc/dl/ruby/ruby/error.c), and RDoc
-# integrates C and Ruby source into one tree
-#
-# The comment blocks may include special directives:
-#
-# [Document-class: <i>name</i>]
-# This comment block is documentation for the given class. Use this
-# when the <tt>Init_xxx</tt> method is not named after the class.
-#
-# [Document-method: <i>name</i>]
-# This comment documents the named method. Use when RDoc cannot
-# automatically find the method from it's declaration
-#
-# [call-seq: <i>text up to an empty line</i>]
-# Because C source doesn't give descripive names to Ruby-level parameters,
-# you need to document the calling sequence explicitly
-#
-# In addition, RDoc assumes by default that the C method implementing a
-# Ruby function is in the same source file as the rb_define_method call.
-# If this isn't the case, add the comment:
-#
-# rb_define_method(....); // in filename
-#
-# As an example, we might have an extension that defines multiple classes
-# in its Init_xxx method. We could document them using
-#
-# /*
-# * Document-class: MyClass
-# *
-# * Encapsulate the writing and reading of the configuration
-# * file. ...
-# */
-#
-# /*
-# * Document-method: read_value
-# *
-# * call-seq:
-# * cfg.read_value(key) -> value
-# * cfg.read_value(key} { |key| } -> value
-# *
-# * Return the value corresponding to +key+ from the configuration.
-# * In the second form, if the key isn't found, invoke the
-# * block and return its value.
-# */
-
-class RDoc::Parser::C < RDoc::Parser
-
- parse_files_matching(/\.(?:([CcHh])\1?|c([+xp])\2|y)\z/)
-
- @@enclosure_classes = {}
- @@known_bodies = {}
-
- ##
- # Prepare to parse a C file
-
- def initialize(top_level, file_name, content, options, stats)
- super
-
- @known_classes = RDoc::KNOWN_CLASSES.dup
- @content = handle_tab_width handle_ifdefs_in(@content)
- @classes = Hash.new
- @file_dir = File.dirname(@file_name)
- end
-
- def do_aliases
- @content.scan(%r{rb_define_alias\s*\(\s*(\w+),\s*"([^"]+)",\s*"([^"]+)"\s*\)}m) do
- |var_name, new_name, old_name|
- class_name = @known_classes[var_name] || var_name
- class_obj = find_class(var_name, class_name)
-
- as = class_obj.add_alias RDoc::Alias.new("", old_name, new_name, "")
-
- @stats.add_alias as
- end
- end
-
- def do_classes
- @content.scan(/(\w+)\s* = \s*rb_define_module\s*\(\s*"(\w+)"\s*\)/mx) do
- |var_name, class_name|
- handle_class_module(var_name, "module", class_name, nil, nil)
- end
-
- # The '.' lets us handle SWIG-generated files
- @content.scan(/([\w\.]+)\s* = \s*rb_define_class\s*
- \(
- \s*"(\w+)",
- \s*(\w+)\s*
- \)/mx) do |var_name, class_name, parent|
- handle_class_module(var_name, "class", class_name, parent, nil)
- end
-
- @content.scan(/(\w+)\s*=\s*boot_defclass\s*\(\s*"(\w+?)",\s*(\w+?)\s*\)/) do
- |var_name, class_name, parent|
- parent = nil if parent == "0"
- handle_class_module(var_name, "class", class_name, parent, nil)
- end
-
- @content.scan(/(\w+)\s* = \s*rb_define_module_under\s*
- \(
- \s*(\w+),
- \s*"(\w+)"
- \s*\)/mx) do |var_name, in_module, class_name|
- handle_class_module(var_name, "module", class_name, nil, in_module)
- end
-
- @content.scan(/([\w\.]+)\s* = \s*rb_define_class_under\s*
- \(
- \s*(\w+),
- \s*"(\w+)",
- \s*([\w\*\s\(\)\.\->]+)\s* # for SWIG
- \s*\)/mx) do |var_name, in_module, class_name, parent|
- handle_class_module(var_name, "class", class_name, parent, in_module)
- end
- end
-
- def do_constants
- @content.scan(%r{\Wrb_define_
- (
- variable |
- readonly_variable |
- const |
- global_const |
- )
- \s*\(
- (?:\s*(\w+),)?
- \s*"(\w+)",
- \s*(.*?)\s*\)\s*;
- }xm) do |type, var_name, const_name, definition|
- var_name = "rb_cObject" if !var_name or var_name == "rb_mKernel"
- handle_constants(type, var_name, const_name, definition)
- end
- end
-
- ##
- # Look for includes of the form:
- #
- # rb_include_module(rb_cArray, rb_mEnumerable);
-
- def do_includes
- @content.scan(/rb_include_module\s*\(\s*(\w+?),\s*(\w+?)\s*\)/) do |c,m|
- if cls = @classes[c]
- m = @known_classes[m] || m
- cls.add_include RDoc::Include.new(m, "")
- end
- end
- end
-
- def do_methods
- @content.scan(%r{rb_define_
- (
- singleton_method |
- method |
- module_function |
- private_method
- )
- \s*\(\s*([\w\.]+),
- \s*"([^"]+)",
- \s*(?:RUBY_METHOD_FUNC\(|VALUEFUNC\()?(\w+)\)?,
- \s*(-?\w+)\s*\)
- (?:;\s*/[*/]\s+in\s+(\w+?\.[cy]))?
- }xm) do
- |type, var_name, meth_name, meth_body, param_count, source_file|
-
- # Ignore top-object and weird struct.c dynamic stuff
- next if var_name == "ruby_top_self"
- next if var_name == "nstr"
- next if var_name == "envtbl"
- next if var_name == "argf" # it'd be nice to handle this one
-
- var_name = "rb_cObject" if var_name == "rb_mKernel"
- handle_method(type, var_name, meth_name,
- meth_body, param_count, source_file)
- end
-
- @content.scan(%r{rb_define_attr\(
- \s*([\w\.]+),
- \s*"([^"]+)",
- \s*(\d+),
- \s*(\d+)\s*\);
- }xm) do |var_name, attr_name, attr_reader, attr_writer|
- #var_name = "rb_cObject" if var_name == "rb_mKernel"
- handle_attr(var_name, attr_name,
- attr_reader.to_i != 0,
- attr_writer.to_i != 0)
- end
-
- @content.scan(%r{rb_define_global_function\s*\(
- \s*"([^"]+)",
- \s*(?:RUBY_METHOD_FUNC\(|VALUEFUNC\()?(\w+)\)?,
- \s*(-?\w+)\s*\)
- (?:;\s*/[*/]\s+in\s+(\w+?\.[cy]))?
- }xm) do |meth_name, meth_body, param_count, source_file|
- handle_method("method", "rb_mKernel", meth_name,
- meth_body, param_count, source_file)
- end
-
- @content.scan(/define_filetest_function\s*\(
- \s*"([^"]+)",
- \s*(?:RUBY_METHOD_FUNC\(|VALUEFUNC\()?(\w+)\)?,
- \s*(-?\w+)\s*\)/xm) do
- |meth_name, meth_body, param_count|
-
- handle_method("method", "rb_mFileTest", meth_name, meth_body, param_count)
- handle_method("singleton_method", "rb_cFile", meth_name, meth_body, param_count)
- end
- end
-
- def find_attr_comment(attr_name)
- if @content =~ %r{((?>/\*.*?\*/\s+))
- rb_define_attr\((?:\s*(\w+),)?\s*"#{attr_name}"\s*,.*?\)\s*;}xmi
- $1
- elsif @content =~ %r{Document-attr:\s#{attr_name}\s*?\n((?>.*?\*/))}m
- $1
- else
- ''
- end
- end
-
- ##
- # Find the C code corresponding to a Ruby method
-
- def find_body(class_name, meth_name, meth_obj, body, quiet = false)
- case body
- when %r"((?>/\*.*?\*/\s*))(?:(?:static|SWIGINTERN)\s+)?(?:intern\s+)?VALUE\s+#{meth_name}
- \s*(\([^)]*\))([^;]|$)"xm
- comment, params = $1, $2
- body_text = $&
-
- remove_private_comments(comment) if comment
-
- # see if we can find the whole body
-
- re = Regexp.escape(body_text) + '[^(]*^\{.*?^\}'
- body_text = $& if /#{re}/m =~ body
-
- # The comment block may have been overridden with a 'Document-method'
- # block. This happens in the interpreter when multiple methods are
- # vectored through to the same C method but those methods are logically
- # distinct (for example Kernel.hash and Kernel.object_id share the same
- # implementation
-
- override_comment = find_override_comment(class_name, meth_obj.name)
- comment = override_comment if override_comment
-
- find_modifiers(comment, meth_obj) if comment
-
-# meth_obj.params = params
- meth_obj.start_collecting_tokens
- meth_obj.add_token(RDoc::RubyToken::Token.new(1,1).set_text(body_text))
- meth_obj.comment = mangle_comment(comment)
- when %r{((?>/\*.*?\*/\s*))^\s*\#\s*define\s+#{meth_name}\s+(\w+)}m
- comment = $1
- find_body(class_name, $2, meth_obj, body, true)
- find_modifiers(comment, meth_obj)
- meth_obj.comment = mangle_comment(comment) + meth_obj.comment
- when %r{^\s*\#\s*define\s+#{meth_name}\s+(\w+)}m
- unless find_body(class_name, $1, meth_obj, body, true)
- warn "No definition for #{meth_name}" unless @options.quiet
- return false
- end
- else
-
- # No body, but might still have an override comment
- comment = find_override_comment(class_name, meth_obj.name)
-
- if comment
- find_modifiers(comment, meth_obj)
- meth_obj.comment = mangle_comment(comment)
- else
- warn "No definition for #{meth_name}" unless @options.quiet
- return false
- end
- end
- true
- end
-
- def find_class(raw_name, name)
- unless @classes[raw_name]
- if raw_name =~ /^rb_m/
- container = @top_level.add_module RDoc::NormalModule, name
- else
- container = @top_level.add_class RDoc::NormalClass, name, nil
- end
-
- container.record_location @top_level
- @classes[raw_name] = container
- end
- @classes[raw_name]
- end
-
- ##
- # Look for class or module documentation above Init_+class_name+(void),
- # in a Document-class +class_name+ (or module) comment or above an
- # rb_define_class (or module). If a comment is supplied above a matching
- # Init_ and a rb_define_class the Init_ comment is used.
- #
- # /*
- # * This is a comment for Foo
- # */
- # Init_Foo(void) {
- # VALUE cFoo = rb_define_class("Foo", rb_cObject);
- # }
- #
- # /*
- # * Document-class: Foo
- # * This is a comment for Foo
- # */
- # Init_foo(void) {
- # VALUE cFoo = rb_define_class("Foo", rb_cObject);
- # }
- #
- # /*
- # * This is a comment for Foo
- # */
- # VALUE cFoo = rb_define_class("Foo", rb_cObject);
-
- def find_class_comment(class_name, class_meth)
- comment = nil
- if @content =~ %r{((?>/\*.*?\*/\s+))
- (static\s+)?void\s+Init_#{class_name}\s*(?:_\(\s*)?\(\s*(?:void\s*)\)}xmi then
- comment = $1
- elsif @content =~ %r{Document-(?:class|module):\s#{class_name}\s*?(?:<\s+[:,\w]+)?\n((?>.*?\*/))}m
- comment = $1
- else
- if @content =~ /rb_define_(class|module)/m then
- class_name = class_name.split("::").last
- comments = []
- @content.split(/(\/\*.*?\*\/)\s*?\n/m).each_with_index do |chunk, index|
- comments[index] = chunk
- if chunk =~ /rb_define_(class|module).*?"(#{class_name})"/m then
- comment = comments[index-1]
- break
- end
- end
- end
- end
- class_meth.comment = mangle_comment(comment) if comment
- end
-
- ##
- # Finds a comment matching +type+ and +const_name+ either above the
- # comment or in the matching Document- section.
-
- def find_const_comment(type, const_name)
- if @content =~ %r{((?>^\s*/\*.*?\*/\s+))
- rb_define_#{type}\((?:\s*(\w+),)?\s*"#{const_name}"\s*,.*?\)\s*;}xmi
- $1
- elsif @content =~ %r{Document-(?:const|global|variable):\s#{const_name}\s*?\n((?>.*?\*/))}m
- $1
- else
- ''
- end
- end
-
- ##
- # If the comment block contains a section that looks like:
- #
- # call-seq:
- # Array.new
- # Array.new(10)
- #
- # use it for the parameters.
-
- def find_modifiers(comment, meth_obj)
- if comment.sub!(/:nodoc:\s*^\s*\*?\s*$/m, '') or
- comment.sub!(/\A\/\*\s*:nodoc:\s*\*\/\Z/, '')
- meth_obj.document_self = false
- end
- if comment.sub!(/call-seq:(.*?)^\s*\*?\s*$/m, '') or
- comment.sub!(/\A\/\*\s*call-seq:(.*?)\*\/\Z/, '')
- seq = $1
- seq.gsub!(/^\s*\*\s*/, '')
- meth_obj.call_seq = seq
- end
- end
-
- def find_override_comment(class_name, meth_name)
- name = Regexp.escape(meth_name)
- if @content =~ %r{Document-method:\s+#{class_name}(?:\.|::|#)#{name}\s*?\n((?>.*?\*/))}m then
- $1
- elsif @content =~ %r{Document-method:\s#{name}\s*?\n((?>.*?\*/))}m then
- $1
- end
- end
-
- def handle_attr(var_name, attr_name, reader, writer)
- rw = ''
- if reader
- #@stats.num_methods += 1
- rw << 'R'
- end
- if writer
- #@stats.num_methods += 1
- rw << 'W'
- end
-
- class_name = @known_classes[var_name]
-
- return unless class_name
-
- class_obj = find_class(var_name, class_name)
-
- if class_obj
- comment = find_attr_comment(attr_name)
- unless comment.empty?
- comment = mangle_comment(comment)
- end
- att = RDoc::Attr.new '', attr_name, rw, comment
- class_obj.add_attribute(att)
- end
- end
-
- def handle_class_module(var_name, class_mod, class_name, parent, in_module)
- parent_name = @known_classes[parent] || parent
-
- if in_module
- enclosure = @classes[in_module] || @@enclosure_classes[in_module]
- unless enclosure
- if enclosure = @known_classes[in_module]
- handle_class_module(in_module, (/^rb_m/ =~ in_module ? "module" : "class"),
- enclosure, nil, nil)
- enclosure = @classes[in_module]
- end
- end
- unless enclosure
- warn("Enclosing class/module '#{in_module}' for " +
- "#{class_mod} #{class_name} not known")
- return
- end
- else
- enclosure = @top_level
- end
-
- if class_mod == "class" then
- full_name = enclosure.full_name.to_s + "::#{class_name}"
- if @content =~ %r{Document-class:\s+#{full_name}\s*<\s+([:,\w]+)} then
- parent_name = $1
- end
- cm = enclosure.add_class RDoc::NormalClass, class_name, parent_name
- @stats.add_class cm
- else
- cm = enclosure.add_module RDoc::NormalModule, class_name
- @stats.add_module cm
- end
-
- cm.record_location(enclosure.toplevel)
-
- find_class_comment(cm.full_name, cm)
- @classes[var_name] = cm
- @@enclosure_classes[var_name] = cm
- @known_classes[var_name] = cm.full_name
- end
-
- ##
- # Adds constant comments. By providing some_value: at the start ofthe
- # comment you can override the C value of the comment to give a friendly
- # definition.
- #
- # /* 300: The perfect score in bowling */
- # rb_define_const(cFoo, "PERFECT", INT2FIX(300);
- #
- # Will override +INT2FIX(300)+ with the value +300+ in the output RDoc.
- # Values may include quotes and escaped colons (\:).
-
- def handle_constants(type, var_name, const_name, definition)
- #@stats.num_constants += 1
- class_name = @known_classes[var_name]
-
- return unless class_name
-
- class_obj = find_class(var_name, class_name)
-
- unless class_obj
- warn("Enclosing class/module '#{const_name}' for not known")
- return
- end
-
- comment = find_const_comment(type, const_name)
-
- # In the case of rb_define_const, the definition and comment are in
- # "/* definition: comment */" form. The literal ':' and '\' characters
- # can be escaped with a backslash.
- if type.downcase == 'const' then
- elements = mangle_comment(comment).split(':')
- if elements.nil? or elements.empty? then
- con = RDoc::Constant.new(const_name, definition,
- mangle_comment(comment))
- else
- new_definition = elements[0..-2].join(':')
- if new_definition.empty? then # Default to literal C definition
- new_definition = definition
- else
- new_definition.gsub!("\:", ":")
- new_definition.gsub!("\\", '\\')
- end
- new_definition.sub!(/\A(\s+)/, '')
- new_comment = $1.nil? ? elements.last : "#{$1}#{elements.last.lstrip}"
- con = RDoc::Constant.new(const_name, new_definition,
- mangle_comment(new_comment))
- end
- else
- con = RDoc::Constant.new const_name, definition, mangle_comment(comment)
- end
-
- class_obj.add_constant(con)
- end
-
- ##
- # Removes #ifdefs that would otherwise confuse us
-
- def handle_ifdefs_in(body)
- body.gsub(/^#ifdef HAVE_PROTOTYPES.*?#else.*?\n(.*?)#endif.*?\n/m, '\1')
- end
-
- def handle_method(type, var_name, meth_name, meth_body, param_count,
- source_file = nil)
- class_name = @known_classes[var_name]
-
- return unless class_name
-
- class_obj = find_class var_name, class_name
-
- if class_obj then
- if meth_name == "initialize" then
- meth_name = "new"
- type = "singleton_method"
- end
-
- meth_obj = RDoc::AnyMethod.new '', meth_name
- meth_obj.singleton = %w[singleton_method module_function].include? type
-
- p_count = (Integer(param_count) rescue -1)
-
- if p_count < 0
- meth_obj.params = "(...)"
- elsif p_count == 0
- meth_obj.params = "()"
- else
- meth_obj.params = "(" + (1..p_count).map{|i| "p#{i}"}.join(", ") + ")"
- end
-
- if source_file then
- file_name = File.join(@file_dir, source_file)
- body = (@@known_bodies[source_file] ||= File.read(file_name))
- else
- body = @content
- end
-
- if find_body(class_name, meth_body, meth_obj, body) and meth_obj.document_self then
- class_obj.add_method meth_obj
- @stats.add_method meth_obj
- end
- end
- end
-
- def handle_tab_width(body)
- if /\t/ =~ body
- tab_width = @options.tab_width
- body.split(/\n/).map do |line|
- 1 while line.gsub!(/\t+/) { ' ' * (tab_width*$&.length - $`.length % tab_width)} && $~ #`
- line
- end .join("\n")
- else
- body
- end
- end
-
- ##
- # Remove the /*'s and leading asterisks from C comments
-
- def mangle_comment(comment)
- comment.sub!(%r{/\*+}) { " " * $&.length }
- comment.sub!(%r{\*+/}) { " " * $&.length }
- comment.gsub!(/^[ \t]*\*/m) { " " * $&.length }
- comment
- end
-
- ##
- # Removes lines that are commented out that might otherwise get picked up
- # when scanning for classes and methods
-
- def remove_commented_out_lines
- @content.gsub!(%r{//.*rb_define_}, '//')
- end
-
- def remove_private_comments(comment)
- comment.gsub!(/\/?\*--\n(.*?)\/?\*\+\+/m, '')
- comment.sub!(/\/?\*--\n.*/m, '')
- end
-
- ##
- # Extract the classes/modules and methods from a C file and return the
- # corresponding top-level object
-
- def scan
- remove_commented_out_lines
- do_classes
- do_constants
- do_methods
- do_includes
- do_aliases
- @top_level
- end
-
- def warn(msg)
- $stderr.puts
- $stderr.puts msg
- $stderr.flush
- end
-
-end
-
diff --git a/lib/rdoc/parser/f95.rb b/lib/rdoc/parser/f95.rb
deleted file mode 100644
index 0959db4936..0000000000
--- a/lib/rdoc/parser/f95.rb
+++ /dev/null
@@ -1,1835 +0,0 @@
-require 'rdoc/parser'
-
-##
-# = Fortran95 RDoc Parser
-#
-# == Overview
-#
-# This parser parses Fortran95 files with suffixes "f90", "F90", "f95" and
-# "F95". Fortran95 files are expected to be conformed to Fortran95 standards.
-#
-# == Rules
-#
-# Fundamental rules are same as that of the Ruby parser. But comment markers
-# are '!' not '#'.
-#
-# === Correspondence between RDoc documentation and Fortran95 programs
-#
-# F95 parses main programs, modules, subroutines, functions, derived-types,
-# public variables, public constants, defined operators and defined
-# assignments. These components are described in items of RDoc documentation,
-# as follows.
-#
-# Files :: Files (same as Ruby)
-# Classes:: Modules
-# Methods:: Subroutines, functions, variables, constants, derived-types,
-# defined operators, defined assignments
-# Required files:: Files in which imported modules, external subroutines and
-# external functions are defined.
-# Included Modules:: List of imported modules
-# Attributes:: List of derived-types, List of imported modules all of whose
-# components are published again
-#
-# Components listed in 'Methods' (subroutines, functions, ...) defined in
-# modules are described in the item of 'Classes'. On the other hand,
-# components defined in main programs or as external procedures are described
-# in the item of 'Files'.
-#
-# === Components parsed by default
-#
-# By default, documentation on public components (subroutines, functions,
-# variables, constants, derived-types, defined operators, defined assignments)
-# are generated.
-#
-# With "--all" option, documentation on all components are generated (almost
-# same as the Ruby parser).
-#
-# === Information parsed automatically
-#
-# The following information is automatically parsed.
-#
-# * Types of arguments
-# * Types of variables and constants
-# * Types of variables in the derived types, and initial values
-# * NAMELISTs and types of variables in them, and initial values
-#
-# Aliases by interface statement are described in the item of 'Methods'.
-#
-# Components which are imported from other modules and published again are
-# described in the item of 'Methods'.
-#
-# === Format of comment blocks
-#
-# Comment blocks should be written as follows.
-#
-# Comment blocks are considered to be ended when the line without '!' appears.
-#
-# The indentation is not necessary.
-#
-# ! (Top of file)
-# !
-# ! Comment blocks for the files.
-# !
-# !--
-# ! The comment described in the part enclosed by
-# ! "!--" and "!++" is ignored.
-# !++
-# !
-# module hogehoge
-# !
-# ! Comment blocks for the modules (or the programs).
-# !
-#
-# private
-#
-# logical :: a ! a private variable
-# real, public :: b ! a public variable
-# integer, parameter :: c = 0 ! a public constant
-#
-# public :: c
-# public :: MULTI_ARRAY
-# public :: hoge, foo
-#
-# type MULTI_ARRAY
-# !
-# ! Comment blocks for the derived-types.
-# !
-# real, pointer :: var(:) =>null() ! Comments block for the variables.
-# integer :: num = 0
-# end type MULTI_ARRAY
-#
-# contains
-#
-# subroutine hoge( in, & ! Comment blocks between continuation lines are ignored.
-# & out )
-# !
-# ! Comment blocks for the subroutines or functions
-# !
-# character(*),intent(in):: in ! Comment blocks for the arguments.
-# character(*),intent(out),allocatable,target :: in
-# ! Comment blocks can be
-# ! written under Fortran statements.
-#
-# character(32) :: file ! This comment parsed as a variable in below NAMELIST.
-# integer :: id
-#
-# namelist /varinfo_nml/ file, id
-# !
-# ! Comment blocks for the NAMELISTs.
-# ! Information about variables are described above.
-# !
-#
-# ....
-#
-# end subroutine hoge
-#
-# integer function foo( in )
-# !
-# ! This part is considered as comment block.
-#
-# ! Comment blocks under blank lines are ignored.
-# !
-# integer, intent(in):: inA ! This part is considered as comment block.
-#
-# ! This part is ignored.
-#
-# end function foo
-#
-# subroutine hide( in, &
-# & out ) !:nodoc:
-# !
-# ! If "!:nodoc:" is described at end-of-line in subroutine
-# ! statement as above, the subroutine is ignored.
-# ! This assignment can be used to modules, subroutines,
-# ! functions, variables, constants, derived-types,
-# ! defined operators, defined assignments,
-# ! list of imported modules ("use" statement).
-# !
-#
-# ....
-#
-# end subroutine hide
-#
-# end module hogehoge
-
-class RDoc::Parser::F95 < RDoc::Parser
-
- parse_files_matching(/\.((f|F)9(0|5)|F)$/)
-
- class Token
-
- NO_TEXT = "??".freeze
-
- def initialize(line_no, char_no)
- @line_no = line_no
- @char_no = char_no
- @text = NO_TEXT
- end
- # Because we're used in contexts that expect to return a token,
- # we set the text string and then return ourselves
- def set_text(text)
- @text = text
- self
- end
-
- attr_reader :line_no, :char_no, :text
-
- end
-
- @@external_aliases = []
- @@public_methods = []
-
- ##
- # "false":: Comments are below source code
- # "true" :: Comments are upper source code
-
- COMMENTS_ARE_UPPER = false
-
- ##
- # Internal alias message
-
- INTERNAL_ALIAS_MES = "Alias for"
-
- ##
- # External alias message
-
- EXTERNAL_ALIAS_MES = "The entity is"
-
- ##
- # Define code constructs
-
- def scan
- # remove private comment
- remaining_code = remove_private_comments(@content)
-
- # continuation lines are united to one line
- remaining_code = united_to_one_line(remaining_code)
-
- # semicolons are replaced to line feed
- remaining_code = semicolon_to_linefeed(remaining_code)
-
- # collect comment for file entity
- whole_comment, remaining_code = collect_first_comment(remaining_code)
- @top_level.comment = whole_comment
-
- # String "remaining_code" is converted to Array "remaining_lines"
- remaining_lines = remaining_code.split("\n")
-
- # "module" or "program" parts are parsed (new)
- #
- level_depth = 0
- block_searching_flag = nil
- block_searching_lines = []
- pre_comment = []
- module_program_trailing = ""
- module_program_name = ""
- other_block_level_depth = 0
- other_block_searching_flag = nil
- remaining_lines.collect!{|line|
- if !block_searching_flag && !other_block_searching_flag
- if line =~ /^\s*?module\s+(\w+)\s*?(!.*?)?$/i
- block_searching_flag = :module
- block_searching_lines << line
- module_program_name = $1
- module_program_trailing = find_comments($2)
- next false
- elsif line =~ /^\s*?program\s+(\w+)\s*?(!.*?)?$/i ||
- line =~ /^\s*?\w/ && !block_start?(line)
- block_searching_flag = :program
- block_searching_lines << line
- module_program_name = $1 || ""
- module_program_trailing = find_comments($2)
- next false
-
- elsif block_start?(line)
- other_block_searching_flag = true
- next line
-
- elsif line =~ /^\s*?!\s?(.*)/
- pre_comment << line
- next line
- else
- pre_comment = []
- next line
- end
- elsif other_block_searching_flag
- other_block_level_depth += 1 if block_start?(line)
- other_block_level_depth -= 1 if block_end?(line)
- if other_block_level_depth < 0
- other_block_level_depth = 0
- other_block_searching_flag = nil
- end
- next line
- end
-
- block_searching_lines << line
- level_depth += 1 if block_start?(line)
- level_depth -= 1 if block_end?(line)
- if level_depth >= 0
- next false
- end
-
- # "module_program_code" is formatted.
- # ":nodoc:" flag is checked.
- #
- module_program_code = block_searching_lines.join("\n")
- module_program_code = remove_empty_head_lines(module_program_code)
- if module_program_trailing =~ /^:nodoc:/
- # next loop to search next block
- level_depth = 0
- block_searching_flag = false
- block_searching_lines = []
- pre_comment = []
- next false
- end
-
- # NormalClass is created, and added to @top_level
- #
- if block_searching_flag == :module
- module_name = module_program_name
- module_code = module_program_code
- module_trailing = module_program_trailing
-
- f9x_module = @top_level.add_module NormalClass, module_name
- f9x_module.record_location @top_level
-
- @stats.add_module f9x_module
-
- f9x_comment = COMMENTS_ARE_UPPER ?
- find_comments(pre_comment.join("\n")) + "\n" + module_trailing :
- module_trailing + "\n" + find_comments(module_code.sub(/^.*$\n/i, ''))
- f9x_module.comment = f9x_comment
- parse_program_or_module(f9x_module, module_code)
-
- TopLevel.all_files.each do |name, toplevel|
- if toplevel.include_includes?(module_name, @options.ignore_case)
- if !toplevel.include_requires?(@file_name, @options.ignore_case)
- toplevel.add_require(Require.new(@file_name, ""))
- end
- end
- toplevel.each_classmodule{|m|
- if m.include_includes?(module_name, @options.ignore_case)
- if !m.include_requires?(@file_name, @options.ignore_case)
- m.add_require(Require.new(@file_name, ""))
- end
- end
- }
- end
- elsif block_searching_flag == :program
- program_name = module_program_name
- program_code = module_program_code
- program_trailing = module_program_trailing
- # progress "p" # HACK what stats thingy does this correspond to?
- program_comment = COMMENTS_ARE_UPPER ?
- find_comments(pre_comment.join("\n")) + "\n" + program_trailing :
- program_trailing + "\n" + find_comments(program_code.sub(/^.*$\n/i, ''))
- program_comment = "\n\n= <i>Program</i> <tt>#{program_name}</tt>\n\n" \
- + program_comment
- @top_level.comment << program_comment
- parse_program_or_module(@top_level, program_code, :private)
- end
-
- # next loop to search next block
- level_depth = 0
- block_searching_flag = false
- block_searching_lines = []
- pre_comment = []
- next false
- }
-
- remaining_lines.delete_if{ |line|
- line == false
- }
-
- # External subprograms and functions are parsed
- #
- parse_program_or_module(@top_level, remaining_lines.join("\n"),
- :public, true)
-
- @top_level
- end # End of scan
-
- private
-
- def parse_program_or_module(container, code,
- visibility=:public, external=nil)
- return unless container
- return unless code
- remaining_lines = code.split("\n")
- remaining_code = "#{code}"
-
- #
- # Parse variables before "contains" in module
- #
- level_depth = 0
- before_contains_lines = []
- before_contains_code = nil
- before_contains_flag = nil
- remaining_lines.each{ |line|
- if !before_contains_flag
- if line =~ /^\s*?module\s+\w+\s*?(!.*?)?$/i
- before_contains_flag = true
- end
- else
- break if line =~ /^\s*?contains\s*?(!.*?)?$/i
- level_depth += 1 if block_start?(line)
- level_depth -= 1 if block_end?(line)
- break if level_depth < 0
- before_contains_lines << line
- end
- }
- before_contains_code = before_contains_lines.join("\n")
- if before_contains_code
- before_contains_code.gsub!(/^\s*?interface\s+.*?\s+end\s+interface.*?$/im, "")
- before_contains_code.gsub!(/^\s*?type[\s\,]+.*?\s+end\s+type.*?$/im, "")
- end
-
- #
- # Parse global "use"
- #
- use_check_code = "#{before_contains_code}"
- cascaded_modules_list = []
- while use_check_code =~ /^\s*?use\s+(\w+)(.*?)(!.*?)?$/i
- use_check_code = $~.pre_match
- use_check_code << $~.post_match
- used_mod_name = $1.strip.chomp
- used_list = $2 || ""
- used_trailing = $3 || ""
- next if used_trailing =~ /!:nodoc:/
- if !container.include_includes?(used_mod_name, @options.ignore_case)
- # progress "." # HACK what stats thingy does this correspond to?
- container.add_include Include.new(used_mod_name, "")
- end
- if ! (used_list =~ /\,\s*?only\s*?:/i )
- cascaded_modules_list << "\#" + used_mod_name
- end
- end
-
- #
- # Parse public and private, and store information.
- # This information is used when "add_method" and
- # "set_visibility_for" are called.
- #
- visibility_default, visibility_info =
- parse_visibility(remaining_lines.join("\n"), visibility, container)
- @@public_methods.concat visibility_info
- if visibility_default == :public
- if !cascaded_modules_list.empty?
- cascaded_modules =
- Attr.new("Cascaded Modules",
- "Imported modules all of whose components are published again",
- "",
- cascaded_modules_list.join(", "))
- container.add_attribute(cascaded_modules)
- end
- end
-
- #
- # Check rename elements
- #
- use_check_code = "#{before_contains_code}"
- while use_check_code =~ /^\s*?use\s+(\w+)\s*?\,(.+)$/i
- use_check_code = $~.pre_match
- use_check_code << $~.post_match
- used_mod_name = $1.strip.chomp
- used_elements = $2.sub(/\s*?only\s*?:\s*?/i, '')
- used_elements.split(",").each{ |used|
- if /\s*?(\w+)\s*?=>\s*?(\w+)\s*?/ =~ used
- local = $1
- org = $2
- @@public_methods.collect!{ |pub_meth|
- if local == pub_meth["name"] ||
- local.upcase == pub_meth["name"].upcase &&
- @options.ignore_case
- pub_meth["name"] = org
- pub_meth["local_name"] = local
- end
- pub_meth
- }
- end
- }
- end
-
- #
- # Parse private "use"
- #
- use_check_code = remaining_lines.join("\n")
- while use_check_code =~ /^\s*?use\s+(\w+)(.*?)(!.*?)?$/i
- use_check_code = $~.pre_match
- use_check_code << $~.post_match
- used_mod_name = $1.strip.chomp
- used_trailing = $3 || ""
- next if used_trailing =~ /!:nodoc:/
- if !container.include_includes?(used_mod_name, @options.ignore_case)
- # progress "." # HACK what stats thingy does this correspond to?
- container.add_include Include.new(used_mod_name, "")
- end
- end
-
- container.each_includes{ |inc|
- TopLevel.all_files.each do |name, toplevel|
- indicated_mod = toplevel.find_symbol(inc.name,
- nil, @options.ignore_case)
- if indicated_mod
- indicated_name = indicated_mod.parent.file_relative_name
- if !container.include_requires?(indicated_name, @options.ignore_case)
- container.add_require(Require.new(indicated_name, ""))
- end
- break
- end
- end
- }
-
- #
- # Parse derived-types definitions
- #
- derived_types_comment = ""
- remaining_code = remaining_lines.join("\n")
- while remaining_code =~ /^\s*?
- type[\s\,]+(public|private)?\s*?(::)?\s*?
- (\w+)\s*?(!.*?)?$
- (.*?)
- ^\s*?end\s+type.*?$
- /imx
- remaining_code = $~.pre_match
- remaining_code << $~.post_match
- typename = $3.chomp.strip
- type_elements = $5 || ""
- type_code = remove_empty_head_lines($&)
- type_trailing = find_comments($4)
- next if type_trailing =~ /^:nodoc:/
- type_visibility = $1
- type_comment = COMMENTS_ARE_UPPER ?
- find_comments($~.pre_match) + "\n" + type_trailing :
- type_trailing + "\n" + find_comments(type_code.sub(/^.*$\n/i, ''))
- type_element_visibility_public = true
- type_code.split("\n").each{ |line|
- if /^\s*?private\s*?$/ =~ line
- type_element_visibility_public = nil
- break
- end
- } if type_code
-
- args_comment = ""
- type_args_info = nil
-
- if @options.show_all
- args_comment = find_arguments(nil, type_code, true)
- else
- type_public_args_list = []
- type_args_info = definition_info(type_code)
- type_args_info.each{ |arg|
- arg_is_public = type_element_visibility_public
- arg_is_public = true if arg.include_attr?("public")
- arg_is_public = nil if arg.include_attr?("private")
- type_public_args_list << arg.varname if arg_is_public
- }
- args_comment = find_arguments(type_public_args_list, type_code)
- end
-
- type = AnyMethod.new("type #{typename}", typename)
- type.singleton = false
- type.params = ""
- type.comment = "<b><em> Derived Type </em></b> :: <tt></tt>\n"
- type.comment << args_comment if args_comment
- type.comment << type_comment if type_comment
-
- @stats.add_method type
-
- container.add_method type
-
- set_visibility(container, typename, visibility_default, @@public_methods)
-
- if type_visibility
- type_visibility.gsub!(/\s/,'')
- type_visibility.gsub!(/\,/,'')
- type_visibility.gsub!(/:/,'')
- type_visibility.downcase!
- if type_visibility == "public"
- container.set_visibility_for([typename], :public)
- elsif type_visibility == "private"
- container.set_visibility_for([typename], :private)
- end
- end
-
- check_public_methods(type, container.name)
-
- if @options.show_all
- derived_types_comment << ", " unless derived_types_comment.empty?
- derived_types_comment << typename
- else
- if type.visibility == :public
- derived_types_comment << ", " unless derived_types_comment.empty?
- derived_types_comment << typename
- end
- end
-
- end
-
- if !derived_types_comment.empty?
- derived_types_table =
- Attr.new("Derived Types", "Derived_Types", "",
- derived_types_comment)
- container.add_attribute(derived_types_table)
- end
-
- #
- # move interface scope
- #
- interface_code = ""
- while remaining_code =~ /^\s*?
- interface(
- \s+\w+ |
- \s+operator\s*?\(.*?\) |
- \s+assignment\s*?\(\s*?=\s*?\)
- )?\s*?$
- (.*?)
- ^\s*?end\s+interface.*?$
- /imx
- interface_code << remove_empty_head_lines($&) + "\n"
- remaining_code = $~.pre_match
- remaining_code << $~.post_match
- end
-
- #
- # Parse global constants or variables in modules
- #
- const_var_defs = definition_info(before_contains_code)
- const_var_defs.each{|defitem|
- next if defitem.nodoc
- const_or_var_type = "Variable"
- const_or_var_progress = "v"
- if defitem.include_attr?("parameter")
- const_or_var_type = "Constant"
- const_or_var_progress = "c"
- end
- const_or_var = AnyMethod.new(const_or_var_type, defitem.varname)
- const_or_var.singleton = false
- const_or_var.params = ""
- self_comment = find_arguments([defitem.varname], before_contains_code)
- const_or_var.comment = "<b><em>" + const_or_var_type + "</em></b> :: <tt></tt>\n"
- const_or_var.comment << self_comment if self_comment
-
- @stats.add_method const_or_var_progress
-
- container.add_method const_or_var
-
- set_visibility(container, defitem.varname, visibility_default, @@public_methods)
-
- if defitem.include_attr?("public")
- container.set_visibility_for([defitem.varname], :public)
- elsif defitem.include_attr?("private")
- container.set_visibility_for([defitem.varname], :private)
- end
-
- check_public_methods(const_or_var, container.name)
-
- } if const_var_defs
-
- remaining_lines = remaining_code.split("\n")
-
- # "subroutine" or "function" parts are parsed (new)
- #
- level_depth = 0
- block_searching_flag = nil
- block_searching_lines = []
- pre_comment = []
- procedure_trailing = ""
- procedure_name = ""
- procedure_params = ""
- procedure_prefix = ""
- procedure_result_arg = ""
- procedure_type = ""
- contains_lines = []
- contains_flag = nil
- remaining_lines.collect!{|line|
- if !block_searching_flag
- # subroutine
- if line =~ /^\s*?
- (recursive|pure|elemental)?\s*?
- subroutine\s+(\w+)\s*?(\(.*?\))?\s*?(!.*?)?$
- /ix
- block_searching_flag = :subroutine
- block_searching_lines << line
-
- procedure_name = $2.chomp.strip
- procedure_params = $3 || ""
- procedure_prefix = $1 || ""
- procedure_trailing = $4 || "!"
- next false
-
- # function
- elsif line =~ /^\s*?
- (recursive|pure|elemental)?\s*?
- (
- character\s*?(\([\w\s\=\(\)\*]+?\))?\s+
- | type\s*?\([\w\s]+?\)\s+
- | integer\s*?(\([\w\s\=\(\)\*]+?\))?\s+
- | real\s*?(\([\w\s\=\(\)\*]+?\))?\s+
- | double\s+precision\s+
- | logical\s*?(\([\w\s\=\(\)\*]+?\))?\s+
- | complex\s*?(\([\w\s\=\(\)\*]+?\))?\s+
- )?
- function\s+(\w+)\s*?
- (\(.*?\))?(\s+result\((.*?)\))?\s*?(!.*?)?$
- /ix
- block_searching_flag = :function
- block_searching_lines << line
-
- procedure_prefix = $1 || ""
- procedure_type = $2 ? $2.chomp.strip : nil
- procedure_name = $8.chomp.strip
- procedure_params = $9 || ""
- procedure_result_arg = $11 ? $11.chomp.strip : procedure_name
- procedure_trailing = $12 || "!"
- next false
- elsif line =~ /^\s*?!\s?(.*)/
- pre_comment << line
- next line
- else
- pre_comment = []
- next line
- end
- end
- contains_flag = true if line =~ /^\s*?contains\s*?(!.*?)?$/
- block_searching_lines << line
- contains_lines << line if contains_flag
-
- level_depth += 1 if block_start?(line)
- level_depth -= 1 if block_end?(line)
- if level_depth >= 0
- next false
- end
-
- # "procedure_code" is formatted.
- # ":nodoc:" flag is checked.
- #
- procedure_code = block_searching_lines.join("\n")
- procedure_code = remove_empty_head_lines(procedure_code)
- if procedure_trailing =~ /^!:nodoc:/
- # next loop to search next block
- level_depth = 0
- block_searching_flag = nil
- block_searching_lines = []
- pre_comment = []
- procedure_trailing = ""
- procedure_name = ""
- procedure_params = ""
- procedure_prefix = ""
- procedure_result_arg = ""
- procedure_type = ""
- contains_lines = []
- contains_flag = nil
- next false
- end
-
- # AnyMethod is created, and added to container
- #
- subroutine_function = nil
- if block_searching_flag == :subroutine
- subroutine_prefix = procedure_prefix
- subroutine_name = procedure_name
- subroutine_params = procedure_params
- subroutine_trailing = procedure_trailing
- subroutine_code = procedure_code
-
- subroutine_comment = COMMENTS_ARE_UPPER ?
- pre_comment.join("\n") + "\n" + subroutine_trailing :
- subroutine_trailing + "\n" + subroutine_code.sub(/^.*$\n/i, '')
- subroutine = AnyMethod.new("subroutine", subroutine_name)
- parse_subprogram(subroutine, subroutine_params,
- subroutine_comment, subroutine_code,
- before_contains_code, nil, subroutine_prefix)
-
- @stats.add_method subroutine
-
- container.add_method subroutine
- subroutine_function = subroutine
-
- elsif block_searching_flag == :function
- function_prefix = procedure_prefix
- function_type = procedure_type
- function_name = procedure_name
- function_params_org = procedure_params
- function_result_arg = procedure_result_arg
- function_trailing = procedure_trailing
- function_code_org = procedure_code
-
- function_comment = COMMENTS_ARE_UPPER ?
- pre_comment.join("\n") + "\n" + function_trailing :
- function_trailing + "\n " + function_code_org.sub(/^.*$\n/i, '')
-
- function_code = "#{function_code_org}"
- if function_type
- function_code << "\n" + function_type + " :: " + function_result_arg
- end
-
- function_params =
- function_params_org.sub(/^\(/, "\(#{function_result_arg}, ")
-
- function = AnyMethod.new("function", function_name)
- parse_subprogram(function, function_params,
- function_comment, function_code,
- before_contains_code, true, function_prefix)
-
- # Specific modification due to function
- function.params.sub!(/\(\s*?#{function_result_arg}\s*?,\s*?/, "\( ")
- function.params << " result(" + function_result_arg + ")"
- function.start_collecting_tokens
- function.add_token Token.new(1,1).set_text(function_code_org)
-
- @stats.add_method function
-
- container.add_method function
- subroutine_function = function
-
- end
-
- # The visibility of procedure is specified
- #
- set_visibility(container, procedure_name,
- visibility_default, @@public_methods)
-
- # The alias for this procedure from external modules
- #
- check_external_aliases(procedure_name,
- subroutine_function.params,
- subroutine_function.comment, subroutine_function) if external
- check_public_methods(subroutine_function, container.name)
-
-
- # contains_lines are parsed as private procedures
- if contains_flag
- parse_program_or_module(container,
- contains_lines.join("\n"), :private)
- end
-
- # next loop to search next block
- level_depth = 0
- block_searching_flag = nil
- block_searching_lines = []
- pre_comment = []
- procedure_trailing = ""
- procedure_name = ""
- procedure_params = ""
- procedure_prefix = ""
- procedure_result_arg = ""
- contains_lines = []
- contains_flag = nil
- next false
- } # End of remaining_lines.collect!{|line|
-
- # Array remains_lines is converted to String remains_code again
- #
- remaining_code = remaining_lines.join("\n")
-
- #
- # Parse interface
- #
- interface_scope = false
- generic_name = ""
- interface_code.split("\n").each{ |line|
- if /^\s*?
- interface(
- \s+\w+|
- \s+operator\s*?\(.*?\)|
- \s+assignment\s*?\(\s*?=\s*?\)
- )?
- \s*?(!.*?)?$
- /ix =~ line
- generic_name = $1 ? $1.strip.chomp : nil
- interface_trailing = $2 || "!"
- interface_scope = true
- interface_scope = false if interface_trailing =~ /!:nodoc:/
-# if generic_name =~ /operator\s*?\((.*?)\)/i
-# operator_name = $1
-# if operator_name && !operator_name.empty?
-# generic_name = "#{operator_name}"
-# end
-# end
-# if generic_name =~ /assignment\s*?\((.*?)\)/i
-# assignment_name = $1
-# if assignment_name && !assignment_name.empty?
-# generic_name = "#{assignment_name}"
-# end
-# end
- end
- if /^\s*?end\s+interface/i =~ line
- interface_scope = false
- generic_name = nil
- end
- # internal alias
- if interface_scope && /^\s*?module\s+procedure\s+(.*?)(!.*?)?$/i =~ line
- procedures = $1.strip.chomp
- procedures_trailing = $2 || "!"
- next if procedures_trailing =~ /!:nodoc:/
- procedures.split(",").each{ |proc|
- proc.strip!
- proc.chomp!
- next if generic_name == proc || !generic_name
- old_meth = container.find_symbol(proc, nil, @options.ignore_case)
- next if !old_meth
- nolink = old_meth.visibility == :private ? true : nil
- nolink = nil if @options.show_all
- new_meth =
- initialize_external_method(generic_name, proc,
- old_meth.params, nil,
- old_meth.comment,
- old_meth.clone.token_stream[0].text,
- true, nolink)
- new_meth.singleton = old_meth.singleton
-
- @stats.add_method new_meth
-
- container.add_method new_meth
-
- set_visibility(container, generic_name, visibility_default, @@public_methods)
-
- check_public_methods(new_meth, container.name)
-
- }
- end
-
- # external aliases
- if interface_scope
- # subroutine
- proc = nil
- params = nil
- procedures_trailing = nil
- if line =~ /^\s*?
- (recursive|pure|elemental)?\s*?
- subroutine\s+(\w+)\s*?(\(.*?\))?\s*?(!.*?)?$
- /ix
- proc = $2.chomp.strip
- generic_name = proc unless generic_name
- params = $3 || ""
- procedures_trailing = $4 || "!"
-
- # function
- elsif line =~ /^\s*?
- (recursive|pure|elemental)?\s*?
- (
- character\s*?(\([\w\s\=\(\)\*]+?\))?\s+
- | type\s*?\([\w\s]+?\)\s+
- | integer\s*?(\([\w\s\=\(\)\*]+?\))?\s+
- | real\s*?(\([\w\s\=\(\)\*]+?\))?\s+
- | double\s+precision\s+
- | logical\s*?(\([\w\s\=\(\)\*]+?\))?\s+
- | complex\s*?(\([\w\s\=\(\)\*]+?\))?\s+
- )?
- function\s+(\w+)\s*?
- (\(.*?\))?(\s+result\((.*?)\))?\s*?(!.*?)?$
- /ix
- proc = $8.chomp.strip
- generic_name = proc unless generic_name
- params = $9 || ""
- procedures_trailing = $12 || "!"
- else
- next
- end
- next if procedures_trailing =~ /!:nodoc:/
- indicated_method = nil
- indicated_file = nil
- TopLevel.all_files.each do |name, toplevel|
- indicated_method = toplevel.find_local_symbol(proc, @options.ignore_case)
- indicated_file = name
- break if indicated_method
- end
-
- if indicated_method
- external_method =
- initialize_external_method(generic_name, proc,
- indicated_method.params,
- indicated_file,
- indicated_method.comment)
-
- @stats.add_method external_method
-
- container.add_method external_method
- set_visibility(container, generic_name, visibility_default, @@public_methods)
- if !container.include_requires?(indicated_file, @options.ignore_case)
- container.add_require(Require.new(indicated_file, ""))
- end
- check_public_methods(external_method, container.name)
-
- else
- @@external_aliases << {
- "new_name" => generic_name,
- "old_name" => proc,
- "file_or_module" => container,
- "visibility" => find_visibility(container, generic_name, @@public_methods) || visibility_default
- }
- end
- end
-
- } if interface_code # End of interface_code.split("\n").each ...
-
- #
- # Already imported methods are removed from @@public_methods.
- # Remainders are assumed to be imported from other modules.
- #
- @@public_methods.delete_if{ |method| method["entity_is_discovered"]}
-
- @@public_methods.each{ |pub_meth|
- next unless pub_meth["file_or_module"].name == container.name
- pub_meth["used_modules"].each{ |used_mod|
- TopLevel.all_classes_and_modules.each{ |modules|
- if modules.name == used_mod ||
- modules.name.upcase == used_mod.upcase &&
- @options.ignore_case
- modules.method_list.each{ |meth|
- if meth.name == pub_meth["name"] ||
- meth.name.upcase == pub_meth["name"].upcase &&
- @options.ignore_case
- new_meth = initialize_public_method(meth,
- modules.name)
- if pub_meth["local_name"]
- new_meth.name = pub_meth["local_name"]
- end
-
- @stats.add_method new_meth
-
- container.add_method new_meth
- end
- }
- end
- }
- }
- }
-
- container
- end # End of parse_program_or_module
-
- ##
- # Parse arguments, comment, code of subroutine and function. Return
- # AnyMethod object.
-
- def parse_subprogram(subprogram, params, comment, code,
- before_contains=nil, function=nil, prefix=nil)
- subprogram.singleton = false
- prefix = "" if !prefix
- arguments = params.sub(/\(/, "").sub(/\)/, "").split(",") if params
- args_comment, params_opt =
- find_arguments(arguments, code.sub(/^s*?contains\s*?(!.*?)?$.*/im, ""),
- nil, nil, true)
- params_opt = "( " + params_opt + " ) " if params_opt
- subprogram.params = params_opt || ""
- namelist_comment = find_namelists(code, before_contains)
-
- block_comment = find_comments comment
- if function
- subprogram.comment = "<b><em> Function </em></b> :: <em>#{prefix}</em>\n"
- else
- subprogram.comment = "<b><em> Subroutine </em></b> :: <em>#{prefix}</em>\n"
- end
- subprogram.comment << args_comment if args_comment
- subprogram.comment << block_comment if block_comment
- subprogram.comment << namelist_comment if namelist_comment
-
- # For output source code
- subprogram.start_collecting_tokens
- subprogram.add_token Token.new(1,1).set_text(code)
-
- subprogram
- end
-
- ##
- # Collect comment for file entity
-
- def collect_first_comment(body)
- comment = ""
- not_comment = ""
- comment_start = false
- comment_end = false
- body.split("\n").each{ |line|
- if comment_end
- not_comment << line
- not_comment << "\n"
- elsif /^\s*?!\s?(.*)$/i =~ line
- comment_start = true
- comment << $1
- comment << "\n"
- elsif /^\s*?$/i =~ line
- comment_end = true if comment_start && COMMENTS_ARE_UPPER
- else
- comment_end = true
- not_comment << line
- not_comment << "\n"
- end
- }
- return comment, not_comment
- end
-
-
- ##
- # Return comments of definitions of arguments
- #
- # If "all" argument is true, information of all arguments are returned.
- #
- # If "modified_params" is true, list of arguments are decorated, for
- # example, optional arguments are parenthetic as "[arg]".
-
- def find_arguments(args, text, all=nil, indent=nil, modified_params=nil)
- return unless args || all
- indent = "" unless indent
- args = ["all"] if all
- params = "" if modified_params
- comma = ""
- return unless text
- args_rdocforms = "\n"
- remaining_lines = "#{text}"
- definitions = definition_info(remaining_lines)
- args.each{ |arg|
- arg.strip!
- arg.chomp!
- definitions.each { |defitem|
- if arg == defitem.varname.strip.chomp || all
- args_rdocforms << <<-"EOF"
-
-#{indent}<tt><b>#{defitem.varname.chomp.strip}#{defitem.arraysuffix}</b> #{defitem.inivalue}</tt> ::
-#{indent} <tt>#{defitem.types.chomp.strip}</tt>
-EOF
- if !defitem.comment.chomp.strip.empty?
- comment = ""
- defitem.comment.split("\n").each{ |line|
- comment << " " + line + "\n"
- }
- args_rdocforms << <<-"EOF"
-
-#{indent} <tt></tt> ::
-#{indent} <tt></tt>
-#{indent} #{comment.chomp.strip}
-EOF
- end
-
- if modified_params
- if defitem.include_attr?("optional")
- params << "#{comma}[#{arg}]"
- else
- params << "#{comma}#{arg}"
- end
- comma = ", "
- end
- end
- }
- }
- if modified_params
- return args_rdocforms, params
- else
- return args_rdocforms
- end
- end
-
- ##
- # Return comments of definitions of namelists
-
- def find_namelists(text, before_contains=nil)
- return nil if !text
- result = ""
- lines = "#{text}"
- before_contains = "" if !before_contains
- while lines =~ /^\s*?namelist\s+\/\s*?(\w+)\s*?\/([\s\w\,]+)$/i
- lines = $~.post_match
- nml_comment = COMMENTS_ARE_UPPER ?
- find_comments($~.pre_match) : find_comments($~.post_match)
- nml_name = $1
- nml_args = $2.split(",")
- result << "\n\n=== NAMELIST <tt><b>" + nml_name + "</tt></b>\n\n"
- result << nml_comment + "\n" if nml_comment
- if lines.split("\n")[0] =~ /^\//i
- lines = "namelist " + lines
- end
- result << find_arguments(nml_args, "#{text}" + "\n" + before_contains)
- end
- return result
- end
-
- ##
- # Comments just after module or subprogram, or arguments are returned. If
- # "COMMENTS_ARE_UPPER" is true, comments just before modules or subprograms
- # are returnd
-
- def find_comments text
- return "" unless text
- lines = text.split("\n")
- lines.reverse! if COMMENTS_ARE_UPPER
- comment_block = Array.new
- lines.each do |line|
- break if line =~ /^\s*?\w/ || line =~ /^\s*?$/
- if COMMENTS_ARE_UPPER
- comment_block.unshift line.sub(/^\s*?!\s?/,"")
- else
- comment_block.push line.sub(/^\s*?!\s?/,"")
- end
- end
- nice_lines = comment_block.join("\n").split "\n\s*?\n"
- nice_lines[0] ||= ""
- nice_lines.shift
- end
-
- ##
- # Create method for internal alias
-
- def initialize_public_method(method, parent)
- return if !method || !parent
-
- new_meth = AnyMethod.new("External Alias for module", method.name)
- new_meth.singleton = method.singleton
- new_meth.params = method.params.clone
- new_meth.comment = remove_trailing_alias(method.comment.clone)
- new_meth.comment << "\n\n#{EXTERNAL_ALIAS_MES} #{parent.strip.chomp}\##{method.name}"
-
- return new_meth
- end
-
- ##
- # Create method for external alias
- #
- # If argument "internal" is true, file is ignored.
-
- def initialize_external_method(new, old, params, file, comment, token=nil,
- internal=nil, nolink=nil)
- return nil unless new || old
-
- if internal
- external_alias_header = "#{INTERNAL_ALIAS_MES} "
- external_alias_text = external_alias_header + old
- elsif file
- external_alias_header = "#{EXTERNAL_ALIAS_MES} "
- external_alias_text = external_alias_header + file + "#" + old
- else
- return nil
- end
- external_meth = AnyMethod.new(external_alias_text, new)
- external_meth.singleton = false
- external_meth.params = params
- external_comment = remove_trailing_alias(comment) + "\n\n" if comment
- external_meth.comment = external_comment || ""
- if nolink && token
- external_meth.start_collecting_tokens
- external_meth.add_token Token.new(1,1).set_text(token)
- else
- external_meth.comment << external_alias_text
- end
-
- return external_meth
- end
-
- ##
- # Parse visibility
-
- def parse_visibility(code, default, container)
- result = []
- visibility_default = default || :public
-
- used_modules = []
- container.includes.each{|i| used_modules << i.name} if container
-
- remaining_code = code.gsub(/^\s*?type[\s\,]+.*?\s+end\s+type.*?$/im, "")
- remaining_code.split("\n").each{ |line|
- if /^\s*?private\s*?$/ =~ line
- visibility_default = :private
- break
- end
- } if remaining_code
-
- remaining_code.split("\n").each{ |line|
- if /^\s*?private\s*?(::)?\s+(.*)\s*?(!.*?)?/i =~ line
- methods = $2.sub(/!.*$/, '')
- methods.split(",").each{ |meth|
- meth.sub!(/!.*$/, '')
- meth.gsub!(/:/, '')
- result << {
- "name" => meth.chomp.strip,
- "visibility" => :private,
- "used_modules" => used_modules.clone,
- "file_or_module" => container,
- "entity_is_discovered" => nil,
- "local_name" => nil
- }
- }
- elsif /^\s*?public\s*?(::)?\s+(.*)\s*?(!.*?)?/i =~ line
- methods = $2.sub(/!.*$/, '')
- methods.split(",").each{ |meth|
- meth.sub!(/!.*$/, '')
- meth.gsub!(/:/, '')
- result << {
- "name" => meth.chomp.strip,
- "visibility" => :public,
- "used_modules" => used_modules.clone,
- "file_or_module" => container,
- "entity_is_discovered" => nil,
- "local_name" => nil
- }
- }
- end
- } if remaining_code
-
- if container
- result.each{ |vis_info|
- vis_info["parent"] = container.name
- }
- end
-
- return visibility_default, result
- end
-
- ##
- # Set visibility
- #
- # "subname" element of "visibility_info" is deleted.
-
- def set_visibility(container, subname, visibility_default, visibility_info)
- return unless container || subname || visibility_default || visibility_info
- not_found = true
- visibility_info.collect!{ |info|
- if info["name"] == subname ||
- @options.ignore_case && info["name"].upcase == subname.upcase
- if info["file_or_module"].name == container.name
- container.set_visibility_for([subname], info["visibility"])
- info["entity_is_discovered"] = true
- not_found = false
- end
- end
- info
- }
- if not_found
- return container.set_visibility_for([subname], visibility_default)
- else
- return container
- end
- end
-
- ##
- # Find visibility
-
- def find_visibility(container, subname, visibility_info)
- return nil if !subname || !visibility_info
- visibility_info.each{ |info|
- if info["name"] == subname ||
- @options.ignore_case && info["name"].upcase == subname.upcase
- if info["parent"] == container.name
- return info["visibility"]
- end
- end
- }
- return nil
- end
-
- ##
- # Check external aliases
-
- def check_external_aliases(subname, params, comment, test=nil)
- @@external_aliases.each{ |alias_item|
- if subname == alias_item["old_name"] ||
- subname.upcase == alias_item["old_name"].upcase &&
- @options.ignore_case
-
- new_meth = initialize_external_method(alias_item["new_name"],
- subname, params, @file_name,
- comment)
- new_meth.visibility = alias_item["visibility"]
-
- @stats.add_method new_meth
-
- alias_item["file_or_module"].add_method(new_meth)
-
- if !alias_item["file_or_module"].include_requires?(@file_name, @options.ignore_case)
- alias_item["file_or_module"].add_require(Require.new(@file_name, ""))
- end
- end
- }
- end
-
- ##
- # Check public_methods
-
- def check_public_methods(method, parent)
- return if !method || !parent
- @@public_methods.each{ |alias_item|
- parent_is_used_module = nil
- alias_item["used_modules"].each{ |used_module|
- if used_module == parent ||
- used_module.upcase == parent.upcase &&
- @options.ignore_case
- parent_is_used_module = true
- end
- }
- next if !parent_is_used_module
-
- if method.name == alias_item["name"] ||
- method.name.upcase == alias_item["name"].upcase &&
- @options.ignore_case
-
- new_meth = initialize_public_method(method, parent)
- if alias_item["local_name"]
- new_meth.name = alias_item["local_name"]
- end
-
- @stats.add_method new_meth
-
- alias_item["file_or_module"].add_method new_meth
- end
- }
- end
-
- ##
- # Continuous lines are united.
- #
- # Comments in continuous lines are removed.
-
- def united_to_one_line(f90src)
- return "" unless f90src
- lines = f90src.split("\n")
- previous_continuing = false
- now_continuing = false
- body = ""
- lines.each{ |line|
- words = line.split("")
- next if words.empty? && previous_continuing
- commentout = false
- brank_flag = true ; brank_char = ""
- squote = false ; dquote = false
- ignore = false
- words.collect! { |char|
- if previous_continuing && brank_flag
- now_continuing = true
- ignore = true
- case char
- when "!" ; break
- when " " ; brank_char << char ; next ""
- when "&"
- brank_flag = false
- now_continuing = false
- next ""
- else
- brank_flag = false
- now_continuing = false
- ignore = false
- next brank_char + char
- end
- end
- ignore = false
-
- if now_continuing
- next ""
- elsif !(squote) && !(dquote) && !(commentout)
- case char
- when "!" ; commentout = true ; next char
- when "\""; dquote = true ; next char
- when "\'"; squote = true ; next char
- when "&" ; now_continuing = true ; next ""
- else next char
- end
- elsif commentout
- next char
- elsif squote
- case char
- when "\'"; squote = false ; next char
- else next char
- end
- elsif dquote
- case char
- when "\""; dquote = false ; next char
- else next char
- end
- end
- }
- if !ignore && !previous_continuing || !brank_flag
- if previous_continuing
- body << words.join("")
- else
- body << "\n" + words.join("")
- end
- end
- previous_continuing = now_continuing ? true : nil
- now_continuing = nil
- }
- return body
- end
-
-
- ##
- # Continuous line checker
-
- def continuous_line?(line)
- continuous = false
- if /&\s*?(!.*)?$/ =~ line
- continuous = true
- if comment_out?($~.pre_match)
- continuous = false
- end
- end
- return continuous
- end
-
- ##
- # Comment out checker
-
- def comment_out?(line)
- return nil unless line
- commentout = false
- squote = false ; dquote = false
- line.split("").each { |char|
- if !(squote) && !(dquote)
- case char
- when "!" ; commentout = true ; break
- when "\""; dquote = true
- when "\'"; squote = true
- else next
- end
- elsif squote
- case char
- when "\'"; squote = false
- else next
- end
- elsif dquote
- case char
- when "\""; dquote = false
- else next
- end
- end
- }
- return commentout
- end
-
- ##
- # Semicolons are replaced to line feed.
-
- def semicolon_to_linefeed(text)
- return "" unless text
- lines = text.split("\n")
- lines.collect!{ |line|
- words = line.split("")
- commentout = false
- squote = false ; dquote = false
- words.collect! { |char|
- if !(squote) && !(dquote) && !(commentout)
- case char
- when "!" ; commentout = true ; next char
- when "\""; dquote = true ; next char
- when "\'"; squote = true ; next char
- when ";" ; "\n"
- else next char
- end
- elsif commentout
- next char
- elsif squote
- case char
- when "\'"; squote = false ; next char
- else next char
- end
- elsif dquote
- case char
- when "\""; dquote = false ; next char
- else next char
- end
- end
- }
- words.join("")
- }
- return lines.join("\n")
- end
-
- ##
- # Which "line" is start of block (module, program, block data, subroutine,
- # function) statement ?
-
- def block_start?(line)
- return nil if !line
-
- if line =~ /^\s*?module\s+(\w+)\s*?(!.*?)?$/i ||
- line =~ /^\s*?program\s+(\w+)\s*?(!.*?)?$/i ||
- line =~ /^\s*?block\s+data(\s+\w+)?\s*?(!.*?)?$/i ||
- line =~ \
- /^\s*?
- (recursive|pure|elemental)?\s*?
- subroutine\s+(\w+)\s*?(\(.*?\))?\s*?(!.*?)?$
- /ix ||
- line =~ \
- /^\s*?
- (recursive|pure|elemental)?\s*?
- (
- character\s*?(\([\w\s\=\(\)\*]+?\))?\s+
- | type\s*?\([\w\s]+?\)\s+
- | integer\s*?(\([\w\s\=\(\)\*]+?\))?\s+
- | real\s*?(\([\w\s\=\(\)\*]+?\))?\s+
- | double\s+precision\s+
- | logical\s*?(\([\w\s\=\(\)\*]+?\))?\s+
- | complex\s*?(\([\w\s\=\(\)\*]+?\))?\s+
- )?
- function\s+(\w+)\s*?
- (\(.*?\))?(\s+result\((.*?)\))?\s*?(!.*?)?$
- /ix
- return true
- end
-
- return nil
- end
-
- ##
- # Which "line" is end of block (module, program, block data, subroutine,
- # function) statement ?
-
- def block_end?(line)
- return nil if !line
-
- if line =~ /^\s*?end\s*?(!.*?)?$/i ||
- line =~ /^\s*?end\s+module(\s+\w+)?\s*?(!.*?)?$/i ||
- line =~ /^\s*?end\s+program(\s+\w+)?\s*?(!.*?)?$/i ||
- line =~ /^\s*?end\s+block\s+data(\s+\w+)?\s*?(!.*?)?$/i ||
- line =~ /^\s*?end\s+subroutine(\s+\w+)?\s*?(!.*?)?$/i ||
- line =~ /^\s*?end\s+function(\s+\w+)?\s*?(!.*?)?$/i
- return true
- end
-
- return nil
- end
-
- ##
- # Remove "Alias for" in end of comments
-
- def remove_trailing_alias(text)
- return "" if !text
- lines = text.split("\n").reverse
- comment_block = Array.new
- checked = false
- lines.each do |line|
- if !checked
- if /^\s?#{INTERNAL_ALIAS_MES}/ =~ line ||
- /^\s?#{EXTERNAL_ALIAS_MES}/ =~ line
- checked = true
- next
- end
- end
- comment_block.unshift line
- end
- nice_lines = comment_block.join("\n")
- nice_lines ||= ""
- return nice_lines
- end
-
- ##
- # Empty lines in header are removed
-
- def remove_empty_head_lines(text)
- return "" unless text
- lines = text.split("\n")
- header = true
- lines.delete_if{ |line|
- header = false if /\S/ =~ line
- header && /^\s*?$/ =~ line
- }
- lines.join("\n")
- end
-
- ##
- # header marker "=", "==", ... are removed
-
- def remove_header_marker(text)
- return text.gsub(/^\s?(=+)/, '<tt></tt>\1')
- end
-
- def remove_private_comments(body)
- body.gsub!(/^\s*!--\s*?$.*?^\s*!\+\+\s*?$/m, '')
- return body
- end
-
- ##
- # Information of arguments of subroutines and functions in Fortran95
-
- class Fortran95Definition
-
- # Name of variable
- #
- attr_reader :varname
-
- # Types of variable
- #
- attr_reader :types
-
- # Initial Value
- #
- attr_reader :inivalue
-
- # Suffix of array
- #
- attr_reader :arraysuffix
-
- # Comments
- #
- attr_accessor :comment
-
- # Flag of non documentation
- #
- attr_accessor :nodoc
-
- def initialize(varname, types, inivalue, arraysuffix, comment,
- nodoc=false)
- @varname = varname
- @types = types
- @inivalue = inivalue
- @arraysuffix = arraysuffix
- @comment = comment
- @nodoc = nodoc
- end
-
- def to_s
- return <<-EOF
-<Fortran95Definition:
-varname=#{@varname}, types=#{types},
-inivalue=#{@inivalue}, arraysuffix=#{@arraysuffix}, nodoc=#{@nodoc},
-comment=
-#{@comment}
->
-EOF
- end
-
- #
- # If attr is included, true is returned
- #
- def include_attr?(attr)
- return if !attr
- @types.split(",").each{ |type|
- return true if type.strip.chomp.upcase == attr.strip.chomp.upcase
- }
- return nil
- end
-
- end # End of Fortran95Definition
-
- ##
- # Parse string argument "text", and Return Array of Fortran95Definition
- # object
-
- def definition_info(text)
- return nil unless text
- lines = "#{text}"
- defs = Array.new
- comment = ""
- trailing_comment = ""
- under_comment_valid = false
- lines.split("\n").each{ |line|
- if /^\s*?!\s?(.*)/ =~ line
- if COMMENTS_ARE_UPPER
- comment << remove_header_marker($1)
- comment << "\n"
- elsif defs[-1] && under_comment_valid
- defs[-1].comment << "\n"
- defs[-1].comment << remove_header_marker($1)
- end
- next
- elsif /^\s*?$/ =~ line
- comment = ""
- under_comment_valid = false
- next
- end
- type = ""
- characters = ""
- if line =~ /^\s*?
- (
- character\s*?(\([\w\s\=\(\)\*]+?\))?[\s\,]*
- | type\s*?\([\w\s]+?\)[\s\,]*
- | integer\s*?(\([\w\s\=\(\)\*]+?\))?[\s\,]*
- | real\s*?(\([\w\s\=\(\)\*]+?\))?[\s\,]*
- | double\s+precision[\s\,]*
- | logical\s*?(\([\w\s\=\(\)\*]+?\))?[\s\,]*
- | complex\s*?(\([\w\s\=\(\)\*]+?\))?[\s\,]*
- )
- (.*?::)?
- (.+)$
- /ix
- characters = $8
- type = $1
- type << $7.gsub(/::/, '').gsub(/^\s*?\,/, '') if $7
- else
- under_comment_valid = false
- next
- end
- squote = false ; dquote = false ; bracket = 0
- iniflag = false; commentflag = false
- varname = "" ; arraysuffix = "" ; inivalue = ""
- start_pos = defs.size
- characters.split("").each { |char|
- if !(squote) && !(dquote) && bracket <= 0 && !(iniflag) && !(commentflag)
- case char
- when "!" ; commentflag = true
- when "(" ; bracket += 1 ; arraysuffix = char
- when "\""; dquote = true
- when "\'"; squote = true
- when "=" ; iniflag = true ; inivalue << char
- when ","
- defs << Fortran95Definition.new(varname, type, inivalue, arraysuffix, comment)
- varname = "" ; arraysuffix = "" ; inivalue = ""
- under_comment_valid = true
- when " " ; next
- else ; varname << char
- end
- elsif commentflag
- comment << remove_header_marker(char)
- trailing_comment << remove_header_marker(char)
- elsif iniflag
- if dquote
- case char
- when "\"" ; dquote = false ; inivalue << char
- else ; inivalue << char
- end
- elsif squote
- case char
- when "\'" ; squote = false ; inivalue << char
- else ; inivalue << char
- end
- elsif bracket > 0
- case char
- when "(" ; bracket += 1 ; inivalue << char
- when ")" ; bracket -= 1 ; inivalue << char
- else ; inivalue << char
- end
- else
- case char
- when ","
- defs << Fortran95Definition.new(varname, type, inivalue, arraysuffix, comment)
- varname = "" ; arraysuffix = "" ; inivalue = ""
- iniflag = false
- under_comment_valid = true
- when "(" ; bracket += 1 ; inivalue << char
- when "\""; dquote = true ; inivalue << char
- when "\'"; squote = true ; inivalue << char
- when "!" ; commentflag = true
- else ; inivalue << char
- end
- end
- elsif !(squote) && !(dquote) && bracket > 0
- case char
- when "(" ; bracket += 1 ; arraysuffix << char
- when ")" ; bracket -= 1 ; arraysuffix << char
- else ; arraysuffix << char
- end
- elsif squote
- case char
- when "\'"; squote = false ; inivalue << char
- else ; inivalue << char
- end
- elsif dquote
- case char
- when "\""; dquote = false ; inivalue << char
- else ; inivalue << char
- end
- end
- }
- defs << Fortran95Definition.new(varname, type, inivalue, arraysuffix, comment)
- if trailing_comment =~ /^:nodoc:/
- defs[start_pos..-1].collect!{ |defitem|
- defitem.nodoc = true
- }
- end
- varname = "" ; arraysuffix = "" ; inivalue = ""
- comment = ""
- under_comment_valid = true
- trailing_comment = ""
- }
- return defs
- end
-
-end
-
diff --git a/lib/rdoc/parser/perl.rb b/lib/rdoc/parser/perl.rb
deleted file mode 100644
index 0023a013a6..0000000000
--- a/lib/rdoc/parser/perl.rb
+++ /dev/null
@@ -1,165 +0,0 @@
-require 'rdoc/parser'
-
-##
-#
-# This is an attamept to write a basic parser for Perl's
-# POD (Plain old Documentation) format. Ruby code must
-# co-exist with Perl, and some tasks are easier in Perl
-# than Ruby because of existing libraries.
-#
-# One difficult is that Perl POD has no means of identifying
-# the classes (packages) and methods (subs) with which it
-# is associated, it is more like literate programming in so
-# far as it just happens to be in the same place as the code,
-# but need not be.
-#
-# We would like to support all the markup the POD provides
-# so that it will convert happily to HTML. At the moment
-# I don't think I can do that: time constraints.
-#
-
-class RDoc::Parser::PerlPOD < RDoc::Parser
-
- parse_files_matching(/.p[lm]$/)
-
- ##
- # Prepare to parse a perl file
-
- def initialize(top_level, file_name, content, options, stats)
- super
-
- preprocess = RDoc::Markup::PreProcess.new @file_name, @options.rdoc_include
-
- preprocess.handle @content do |directive, param|
- warn "Unrecognized directive '#{directive}' in #{@file_name}"
- end
- end
-
- ##
- # Extract the Pod(-like) comments from the code.
- # At its most basic there will ne no need to distinguish
- # between the different types of header, etc.
- #
- # This uses a simple finite state machine, in a very
- # procedural pattern. I could "replace case with polymorphism"
- # but I think it would obscure the intent, scatter the
- # code all over tha place. This machine is necessary
- # because POD requires that directives be preceded by
- # blank lines, so reading line by line is necessary,
- # and preserving state about what is seen is necesary.
-
- def scan
-
- @top_level.comment ||= ""
- state=:code_blank
- line_number = 0
- line = nil
-
- # This started out as a really long nested case statement,
- # which also led to repetitive code. I'd like to avoid that
- # so I'm using a "table" instead.
-
- # Firstly we need some procs to do the transition and processing
- # work. Because these are procs they are closures, and they can
- # use variables in the local scope.
- #
- # First, the "nothing to see here" stuff.
- code_noop = lambda do
- if line =~ /^\s+$/
- state = :code_blank
- end
- end
-
- pod_noop = lambda do
- if line =~ /^\s+$/
- state = :pod_blank
- end
- @top_level.comment += filter(line)
- end
-
- begin_noop = lambda do
- if line =~ /^\s+$/
- state = :begin_blank
- end
- @top_level.comment += filter(line)
- end
-
- # Now for the blocks that process code and comments...
-
- transit_to_pod = lambda do
- case line
- when /^=(?:pod|head\d+)/
- state = :pod_no_blank
- @top_level.comment += filter(line)
- when /^=over/
- state = :over_no_blank
- @top_level.comment += filter(line)
- when /^=(?:begin|for)/
- state = :begin_no_blank
- end
- end
-
- process_pod = lambda do
- case line
- when /^\s*$/
- state = :pod_blank
- @top_level.comment += filter(line)
- when /^=cut/
- state = :code_no_blank
- when /^=end/
- $stderr.puts "'=end' unexpected at #{line_number} in #{@file_name}"
- else
- @top_level.comment += filter(line)
- end
- end
-
-
- process_begin = lambda do
- case line
- when /^\s*$/
- state = :begin_blank
- @top_level.comment += filter(line)
- when /^=end/
- state = :code_no_blank
- when /^=cut/
- $stderr.puts "'=cut' unexpected at #{line_number} in #{@file_name}"
- else
- @top_level.comment += filter(line)
- end
-
- end
-
-
- transitions = { :code_no_blank => code_noop,
- :code_blank => transit_to_pod,
- :pod_no_blank => pod_noop,
- :pod_blank => process_pod,
- :begin_no_blank => begin_noop,
- :begin_blank => process_begin}
- @content.each_line do |l|
- line = l
- line_number += 1
- transitions[state].call
- end # each line
-
- @top_level
- end
-
- # Filter the perl markup that does the same as the rdoc
- # filtering. Only basic for now. Will probably need a
- # proper parser to cope with C<<...>> etc
- def filter(comment)
- return '' if comment =~ /^=pod\s*$/
- comment.gsub!(/^=pod/, '==')
- comment.gsub!(/^=head(\d+)/) do
- "=" * $1.to_i
- end
- comment.gsub!(/=item/, '');
- comment.gsub!(/C<(.*?)>/, '<tt>\1</tt>');
- comment.gsub!(/I<(.*?)>/, '<i>\1</i>');
- comment.gsub!(/B<(.*?)>/, '<b>\1</b>');
- comment
- end
-
-end
-
diff --git a/lib/rdoc/parser/ruby.rb b/lib/rdoc/parser/ruby.rb
deleted file mode 100644
index cf6c1ad221..0000000000
--- a/lib/rdoc/parser/ruby.rb
+++ /dev/null
@@ -1,2829 +0,0 @@
-##
-# This file contains stuff stolen outright from:
-#
-# rtags.rb -
-# ruby-lex.rb - ruby lexcal analyzer
-# ruby-token.rb - ruby tokens
-# by Keiju ISHITSUKA (Nippon Rational Inc.)
-#
-
-require 'e2mmap'
-require 'irb/slex'
-
-require 'rdoc/code_objects'
-require 'rdoc/tokenstream'
-require 'rdoc/markup/preprocess'
-require 'rdoc/parser'
-
-$TOKEN_DEBUG ||= nil
-#$TOKEN_DEBUG = $DEBUG_RDOC
-
-##
-# Definitions of all tokens involved in the lexical analysis
-
-module RDoc::RubyToken
-
- EXPR_BEG = :EXPR_BEG
- EXPR_MID = :EXPR_MID
- EXPR_END = :EXPR_END
- EXPR_ARG = :EXPR_ARG
- EXPR_FNAME = :EXPR_FNAME
- EXPR_DOT = :EXPR_DOT
- EXPR_CLASS = :EXPR_CLASS
-
- class Token
- NO_TEXT = "??".freeze
-
- attr_accessor :text
- attr_reader :line_no
- attr_reader :char_no
-
- def initialize(line_no, char_no)
- @line_no = line_no
- @char_no = char_no
- @text = NO_TEXT
- end
-
- def ==(other)
- self.class == other.class and
- other.line_no == @line_no and
- other.char_no == @char_no and
- other.text == @text
- end
-
- ##
- # Because we're used in contexts that expect to return a token, we set the
- # text string and then return ourselves
-
- def set_text(text)
- @text = text
- self
- end
-
- end
-
- class TkNode < Token
- attr :node
- end
-
- class TkId < Token
- def initialize(line_no, char_no, name)
- super(line_no, char_no)
- @name = name
- end
- attr :name
- end
-
- class TkKW < TkId
- end
-
- class TkVal < Token
- def initialize(line_no, char_no, value = nil)
- super(line_no, char_no)
- set_text(value)
- end
- end
-
- class TkOp < Token
- def name
- self.class.op_name
- end
- end
-
- class TkOPASGN < TkOp
- def initialize(line_no, char_no, op)
- super(line_no, char_no)
- op = TkReading2Token[op] unless Symbol === op
- @op = op
- end
- attr :op
- end
-
- class TkUnknownChar < Token
- def initialize(line_no, char_no, id)
- super(line_no, char_no)
- @name = char_no.chr
- end
- attr :name
- end
-
- class TkError < Token
- end
-
- def set_token_position(line, char)
- @prev_line_no = line
- @prev_char_no = char
- end
-
- def Token(token, value = nil)
- tk = nil
- case token
- when String, Symbol
- source = String === token ? TkReading2Token : TkSymbol2Token
- raise TkReading2TokenNoKey, token if (tk = source[token]).nil?
- tk = Token(tk[0], value)
- else
- tk = if (token.ancestors & [TkId, TkVal, TkOPASGN, TkUnknownChar]).empty?
- token.new(@prev_line_no, @prev_char_no)
- else
- token.new(@prev_line_no, @prev_char_no, value)
- end
- end
- tk
- end
-
- TokenDefinitions = [
- [:TkCLASS, TkKW, "class", EXPR_CLASS],
- [:TkMODULE, TkKW, "module", EXPR_CLASS],
- [:TkDEF, TkKW, "def", EXPR_FNAME],
- [:TkUNDEF, TkKW, "undef", EXPR_FNAME],
- [:TkBEGIN, TkKW, "begin", EXPR_BEG],
- [:TkRESCUE, TkKW, "rescue", EXPR_MID],
- [:TkENSURE, TkKW, "ensure", EXPR_BEG],
- [:TkEND, TkKW, "end", EXPR_END],
- [:TkIF, TkKW, "if", EXPR_BEG, :TkIF_MOD],
- [:TkUNLESS, TkKW, "unless", EXPR_BEG, :TkUNLESS_MOD],
- [:TkTHEN, TkKW, "then", EXPR_BEG],
- [:TkELSIF, TkKW, "elsif", EXPR_BEG],
- [:TkELSE, TkKW, "else", EXPR_BEG],
- [:TkCASE, TkKW, "case", EXPR_BEG],
- [:TkWHEN, TkKW, "when", EXPR_BEG],
- [:TkWHILE, TkKW, "while", EXPR_BEG, :TkWHILE_MOD],
- [:TkUNTIL, TkKW, "until", EXPR_BEG, :TkUNTIL_MOD],
- [:TkFOR, TkKW, "for", EXPR_BEG],
- [:TkBREAK, TkKW, "break", EXPR_END],
- [:TkNEXT, TkKW, "next", EXPR_END],
- [:TkREDO, TkKW, "redo", EXPR_END],
- [:TkRETRY, TkKW, "retry", EXPR_END],
- [:TkIN, TkKW, "in", EXPR_BEG],
- [:TkDO, TkKW, "do", EXPR_BEG],
- [:TkRETURN, TkKW, "return", EXPR_MID],
- [:TkYIELD, TkKW, "yield", EXPR_END],
- [:TkSUPER, TkKW, "super", EXPR_END],
- [:TkSELF, TkKW, "self", EXPR_END],
- [:TkNIL, TkKW, "nil", EXPR_END],
- [:TkTRUE, TkKW, "true", EXPR_END],
- [:TkFALSE, TkKW, "false", EXPR_END],
- [:TkAND, TkKW, "and", EXPR_BEG],
- [:TkOR, TkKW, "or", EXPR_BEG],
- [:TkNOT, TkKW, "not", EXPR_BEG],
- [:TkIF_MOD, TkKW],
- [:TkUNLESS_MOD, TkKW],
- [:TkWHILE_MOD, TkKW],
- [:TkUNTIL_MOD, TkKW],
- [:TkALIAS, TkKW, "alias", EXPR_FNAME],
- [:TkDEFINED, TkKW, "defined?", EXPR_END],
- [:TklBEGIN, TkKW, "BEGIN", EXPR_END],
- [:TklEND, TkKW, "END", EXPR_END],
- [:Tk__LINE__, TkKW, "__LINE__", EXPR_END],
- [:Tk__FILE__, TkKW, "__FILE__", EXPR_END],
-
- [:TkIDENTIFIER, TkId],
- [:TkFID, TkId],
- [:TkGVAR, TkId],
- [:TkIVAR, TkId],
- [:TkCONSTANT, TkId],
-
- [:TkINTEGER, TkVal],
- [:TkFLOAT, TkVal],
- [:TkSTRING, TkVal],
- [:TkXSTRING, TkVal],
- [:TkREGEXP, TkVal],
- [:TkCOMMENT, TkVal],
-
- [:TkDSTRING, TkNode],
- [:TkDXSTRING, TkNode],
- [:TkDREGEXP, TkNode],
- [:TkNTH_REF, TkId],
- [:TkBACK_REF, TkId],
-
- [:TkUPLUS, TkOp, "+@"],
- [:TkUMINUS, TkOp, "-@"],
- [:TkPOW, TkOp, "**"],
- [:TkCMP, TkOp, "<=>"],
- [:TkEQ, TkOp, "=="],
- [:TkEQQ, TkOp, "==="],
- [:TkNEQ, TkOp, "!="],
- [:TkGEQ, TkOp, ">="],
- [:TkLEQ, TkOp, "<="],
- [:TkANDOP, TkOp, "&&"],
- [:TkOROP, TkOp, "||"],
- [:TkMATCH, TkOp, "=~"],
- [:TkNMATCH, TkOp, "!~"],
- [:TkDOT2, TkOp, ".."],
- [:TkDOT3, TkOp, "..."],
- [:TkAREF, TkOp, "[]"],
- [:TkASET, TkOp, "[]="],
- [:TkLSHFT, TkOp, "<<"],
- [:TkRSHFT, TkOp, ">>"],
- [:TkCOLON2, TkOp],
- [:TkCOLON3, TkOp],
-# [:OPASGN, TkOp], # +=, -= etc. #
- [:TkASSOC, TkOp, "=>"],
- [:TkQUESTION, TkOp, "?"], #?
- [:TkCOLON, TkOp, ":"], #:
-
- [:TkfLPAREN], # func( #
- [:TkfLBRACK], # func[ #
- [:TkfLBRACE], # func{ #
- [:TkSTAR], # *arg
- [:TkAMPER], # &arg #
- [:TkSYMBOL, TkId], # :SYMBOL
- [:TkSYMBEG, TkId],
- [:TkGT, TkOp, ">"],
- [:TkLT, TkOp, "<"],
- [:TkPLUS, TkOp, "+"],
- [:TkMINUS, TkOp, "-"],
- [:TkMULT, TkOp, "*"],
- [:TkDIV, TkOp, "/"],
- [:TkMOD, TkOp, "%"],
- [:TkBITOR, TkOp, "|"],
- [:TkBITXOR, TkOp, "^"],
- [:TkBITAND, TkOp, "&"],
- [:TkBITNOT, TkOp, "~"],
- [:TkNOTOP, TkOp, "!"],
-
- [:TkBACKQUOTE, TkOp, "`"],
-
- [:TkASSIGN, Token, "="],
- [:TkDOT, Token, "."],
- [:TkLPAREN, Token, "("], #(exp)
- [:TkLBRACK, Token, "["], #[arry]
- [:TkLBRACE, Token, "{"], #{hash}
- [:TkRPAREN, Token, ")"],
- [:TkRBRACK, Token, "]"],
- [:TkRBRACE, Token, "}"],
- [:TkCOMMA, Token, ","],
- [:TkSEMICOLON, Token, ";"],
-
- [:TkRD_COMMENT],
- [:TkSPACE],
- [:TkNL],
- [:TkEND_OF_SCRIPT],
-
- [:TkBACKSLASH, TkUnknownChar, "\\"],
- [:TkAT, TkUnknownChar, "@"],
- [:TkDOLLAR, TkUnknownChar, "\$"], #"
- ]
-
- # {reading => token_class}
- # {reading => [token_class, *opt]}
- TkReading2Token = {}
- TkSymbol2Token = {}
-
- def self.def_token(token_n, super_token = Token, reading = nil, *opts)
- token_n = token_n.id2name unless String === token_n
-
- fail AlreadyDefinedToken, token_n if const_defined?(token_n)
-
- token_c = Class.new super_token
- const_set token_n, token_c
-# token_c.inspect
-
- if reading
- if TkReading2Token[reading]
- fail TkReading2TokenDuplicateError, token_n, reading
- end
- if opts.empty?
- TkReading2Token[reading] = [token_c]
- else
- TkReading2Token[reading] = [token_c].concat(opts)
- end
- end
- TkSymbol2Token[token_n.intern] = token_c
-
- if token_c <= TkOp
- token_c.class_eval %{
- def self.op_name; "#{reading}"; end
- }
- end
- end
-
- for defs in TokenDefinitions
- def_token(*defs)
- end
-
- NEWLINE_TOKEN = TkNL.new(0,0)
- NEWLINE_TOKEN.set_text("\n")
-
-end
-
-##
-# Lexical analyzer for Ruby source
-
-class RDoc::RubyLex
-
- ##
- # Read an input stream character by character. We allow for unlimited
- # ungetting of characters just read.
- #
- # We simplify the implementation greatly by reading the entire input
- # into a buffer initially, and then simply traversing it using
- # pointers.
- #
- # We also have to allow for the <i>here document diversion</i>. This
- # little gem comes about when the lexer encounters a here
- # document. At this point we effectively need to split the input
- # stream into two parts: one to read the body of the here document,
- # the other to read the rest of the input line where the here
- # document was initially encountered. For example, we might have
- #
- # do_something(<<-A, <<-B)
- # stuff
- # for
- # A
- # stuff
- # for
- # B
- #
- # When the lexer encounters the <<A, it reads until the end of the
- # line, and keeps it around for later. It then reads the body of the
- # here document. Once complete, it needs to read the rest of the
- # original line, but then skip the here document body.
- #
-
- class BufferedReader
-
- attr_reader :line_num
-
- def initialize(content, options)
- @options = options
-
- if /\t/ =~ content
- tab_width = @options.tab_width
- content = content.split(/\n/).map do |line|
- 1 while line.gsub!(/\t+/) { ' ' * (tab_width*$&.length - $`.length % tab_width)} && $~ #`
- line
- end .join("\n")
- end
- @content = content
- @content << "\n" unless @content[-1,1] == "\n"
- @size = @content.size
- @offset = 0
- @hwm = 0
- @line_num = 1
- @read_back_offset = 0
- @last_newline = 0
- @newline_pending = false
- end
-
- def column
- @offset - @last_newline
- end
-
- def getc
- return nil if @offset >= @size
- ch = @content[@offset, 1]
-
- @offset += 1
- @hwm = @offset if @hwm < @offset
-
- if @newline_pending
- @line_num += 1
- @last_newline = @offset - 1
- @newline_pending = false
- end
-
- if ch == "\n"
- @newline_pending = true
- end
- ch
- end
-
- def getc_already_read
- getc
- end
-
- def ungetc(ch)
- raise "unget past beginning of file" if @offset <= 0
- @offset -= 1
- if @content[@offset] == ?\n
- @newline_pending = false
- end
- end
-
- def get_read
- res = @content[@read_back_offset...@offset]
- @read_back_offset = @offset
- res
- end
-
- def peek(at)
- pos = @offset + at
- if pos >= @size
- nil
- else
- @content[pos, 1]
- end
- end
-
- def peek_equal(str)
- @content[@offset, str.length] == str
- end
-
- def divert_read_from(reserve)
- @content[@offset, 0] = reserve
- @size = @content.size
- end
- end
-
- # end of nested class BufferedReader
-
- extend Exception2MessageMapper
- def_exception(:AlreadyDefinedToken, "Already defined token(%s)")
- def_exception(:TkReading2TokenNoKey, "key nothing(key='%s')")
- def_exception(:TkSymbol2TokenNoKey, "key nothing(key='%s')")
- def_exception(:TkReading2TokenDuplicateError,
- "key duplicate(token_n='%s', key='%s')")
- def_exception(:SyntaxError, "%s")
-
- include RDoc::RubyToken
- include IRB
-
- attr_reader :continue
- attr_reader :lex_state
-
- def self.debug?
- false
- end
-
- def initialize(content, options)
- lex_init
-
- @options = options
-
- @reader = BufferedReader.new content, @options
-
- @exp_line_no = @line_no = 1
- @base_char_no = 0
- @indent = 0
-
- @ltype = nil
- @quoted = nil
- @lex_state = EXPR_BEG
- @space_seen = false
-
- @continue = false
- @line = ""
-
- @skip_space = false
- @read_auto_clean_up = false
- @exception_on_syntax_error = true
- end
-
- attr_accessor :skip_space
- attr_accessor :read_auto_clean_up
- attr_accessor :exception_on_syntax_error
- attr_reader :indent
-
- # io functions
- def line_no
- @reader.line_num
- end
-
- def char_no
- @reader.column
- end
-
- def get_read
- @reader.get_read
- end
-
- def getc
- @reader.getc
- end
-
- def getc_of_rests
- @reader.getc_already_read
- end
-
- def gets
- c = getc or return
- l = ""
- begin
- l.concat c unless c == "\r"
- break if c == "\n"
- end while c = getc
- l
- end
-
-
- def ungetc(c = nil)
- @reader.ungetc(c)
- end
-
- def peek_equal?(str)
- @reader.peek_equal(str)
- end
-
- def peek(i = 0)
- @reader.peek(i)
- end
-
- def lex
- until (TkNL === (tk = token) or TkEND_OF_SCRIPT === tk) and
- not @continue or tk.nil?
- end
-
- line = get_read
-
- if line == "" and TkEND_OF_SCRIPT === tk or tk.nil? then
- nil
- else
- line
- end
- end
-
- def token
- set_token_position(line_no, char_no)
- begin
- begin
- tk = @OP.match(self)
- @space_seen = TkSPACE === tk
- rescue SyntaxError => e
- raise RDoc::Error, "syntax error: #{e.message}" if
- @exception_on_syntax_error
-
- tk = TkError.new(line_no, char_no)
- end
- end while @skip_space and TkSPACE === tk
- if @read_auto_clean_up
- get_read
- end
-# throw :eof unless tk
- tk
- end
-
- ENINDENT_CLAUSE = [
- "case", "class", "def", "do", "for", "if",
- "module", "unless", "until", "while", "begin" #, "when"
- ]
- DEINDENT_CLAUSE = ["end" #, "when"
- ]
-
- PERCENT_LTYPE = {
- "q" => "\'",
- "Q" => "\"",
- "x" => "\`",
- "r" => "/",
- "w" => "]"
- }
-
- PERCENT_PAREN = {
- "{" => "}",
- "[" => "]",
- "<" => ">",
- "(" => ")"
- }
-
- Ltype2Token = {
- "\'" => TkSTRING,
- "\"" => TkSTRING,
- "\`" => TkXSTRING,
- "/" => TkREGEXP,
- "]" => TkDSTRING
- }
- Ltype2Token.default = TkSTRING
-
- DLtype2Token = {
- "\"" => TkDSTRING,
- "\`" => TkDXSTRING,
- "/" => TkDREGEXP,
- }
-
- def lex_init()
- @OP = IRB::SLex.new
- @OP.def_rules("\0", "\004", "\032") do |chars, io|
- Token(TkEND_OF_SCRIPT).set_text(chars)
- end
-
- @OP.def_rules(" ", "\t", "\f", "\r", "\13") do |chars, io|
- @space_seen = TRUE
- while (ch = getc) =~ /[ \t\f\r\13]/
- chars << ch
- end
- ungetc
- Token(TkSPACE).set_text(chars)
- end
-
- @OP.def_rule("#") do
- |op, io|
- identify_comment
- end
-
- @OP.def_rule("=begin", proc{@prev_char_no == 0 && peek(0) =~ /\s/}) do
- |op, io|
- str = op
- @ltype = "="
-
-
- begin
- line = ""
- begin
- ch = getc
- line << ch
- end until ch == "\n"
- str << line
- end until line =~ /^=end/
-
- ungetc
-
- @ltype = nil
-
- if str =~ /\A=begin\s+rdoc/i
- str.sub!(/\A=begin.*\n/, '')
- str.sub!(/^=end.*/m, '')
- Token(TkCOMMENT).set_text(str)
- else
- Token(TkRD_COMMENT)#.set_text(str)
- end
- end
-
- @OP.def_rule("\n") do
- print "\\n\n" if RDoc::RubyLex.debug?
- case @lex_state
- when EXPR_BEG, EXPR_FNAME, EXPR_DOT
- @continue = TRUE
- else
- @continue = FALSE
- @lex_state = EXPR_BEG
- end
- Token(TkNL).set_text("\n")
- end
-
- @OP.def_rules("*", "**",
- "!", "!=", "!~",
- "=", "==", "===",
- "=~", "<=>",
- "<", "<=",
- ">", ">=", ">>") do
- |op, io|
- @lex_state = EXPR_BEG
- Token(op).set_text(op)
- end
-
- @OP.def_rules("<<") do
- |op, io|
- tk = nil
- if @lex_state != EXPR_END && @lex_state != EXPR_CLASS &&
- (@lex_state != EXPR_ARG || @space_seen)
- c = peek(0)
- if /[-\w_\"\'\`]/ =~ c
- tk = identify_here_document
- end
- end
- if !tk
- @lex_state = EXPR_BEG
- tk = Token(op).set_text(op)
- end
- tk
- end
-
- @OP.def_rules("'", '"') do
- |op, io|
- identify_string(op)
- end
-
- @OP.def_rules("`") do
- |op, io|
- if @lex_state == EXPR_FNAME
- Token(op).set_text(op)
- else
- identify_string(op)
- end
- end
-
- @OP.def_rules('?') do
- |op, io|
- if @lex_state == EXPR_END
- @lex_state = EXPR_BEG
- Token(TkQUESTION).set_text(op)
- else
- ch = getc
- if @lex_state == EXPR_ARG && ch !~ /\s/
- ungetc
- @lex_state = EXPR_BEG
- Token(TkQUESTION).set_text(op)
- else
- str = op
- str << ch
- if (ch == '\\') #'
- str << read_escape
- end
- @lex_state = EXPR_END
- Token(TkINTEGER).set_text(str)
- end
- end
- end
-
- @OP.def_rules("&", "&&", "|", "||") do
- |op, io|
- @lex_state = EXPR_BEG
- Token(op).set_text(op)
- end
-
- @OP.def_rules("+=", "-=", "*=", "**=",
- "&=", "|=", "^=", "<<=", ">>=", "||=", "&&=") do
- |op, io|
- @lex_state = EXPR_BEG
- op =~ /^(.*)=$/
- Token(TkOPASGN, $1).set_text(op)
- end
-
- @OP.def_rule("+@", proc{@lex_state == EXPR_FNAME}) do |op, io|
- Token(TkUPLUS).set_text(op)
- end
-
- @OP.def_rule("-@", proc{@lex_state == EXPR_FNAME}) do |op, io|
- Token(TkUMINUS).set_text(op)
- end
-
- @OP.def_rules("+", "-") do
- |op, io|
- catch(:RET) do
- if @lex_state == EXPR_ARG
- if @space_seen and peek(0) =~ /[0-9]/
- throw :RET, identify_number(op)
- else
- @lex_state = EXPR_BEG
- end
- elsif @lex_state != EXPR_END and peek(0) =~ /[0-9]/
- throw :RET, identify_number(op)
- else
- @lex_state = EXPR_BEG
- end
- Token(op).set_text(op)
- end
- end
-
- @OP.def_rule(".") do
- @lex_state = EXPR_BEG
- if peek(0) =~ /[0-9]/
- ungetc
- identify_number("")
- else
- # for obj.if
- @lex_state = EXPR_DOT
- Token(TkDOT).set_text(".")
- end
- end
-
- @OP.def_rules("..", "...") do
- |op, io|
- @lex_state = EXPR_BEG
- Token(op).set_text(op)
- end
-
- lex_int2
- end
-
- def lex_int2
- @OP.def_rules("]", "}", ")") do
- |op, io|
- @lex_state = EXPR_END
- @indent -= 1
- Token(op).set_text(op)
- end
-
- @OP.def_rule(":") do
- if @lex_state == EXPR_END || peek(0) =~ /\s/
- @lex_state = EXPR_BEG
- tk = Token(TkCOLON)
- else
- @lex_state = EXPR_FNAME
- tk = Token(TkSYMBEG)
- end
- tk.set_text(":")
- end
-
- @OP.def_rule("::") do
- if @lex_state == EXPR_BEG or @lex_state == EXPR_ARG && @space_seen
- @lex_state = EXPR_BEG
- tk = Token(TkCOLON3)
- else
- @lex_state = EXPR_DOT
- tk = Token(TkCOLON2)
- end
- tk.set_text("::")
- end
-
- @OP.def_rule("/") do
- |op, io|
- if @lex_state == EXPR_BEG || @lex_state == EXPR_MID
- identify_string(op)
- elsif peek(0) == '='
- getc
- @lex_state = EXPR_BEG
- Token(TkOPASGN, :/).set_text("/=") #")
- elsif @lex_state == EXPR_ARG and @space_seen and peek(0) !~ /\s/
- identify_string(op)
- else
- @lex_state = EXPR_BEG
- Token("/").set_text(op)
- end
- end
-
- @OP.def_rules("^") do
- @lex_state = EXPR_BEG
- Token("^").set_text("^")
- end
-
- @OP.def_rules(",", ";") do
- |op, io|
- @lex_state = EXPR_BEG
- Token(op).set_text(op)
- end
-
- @OP.def_rule("~") do
- @lex_state = EXPR_BEG
- Token("~").set_text("~")
- end
-
- @OP.def_rule("~@", proc{@lex_state = EXPR_FNAME}) do
- @lex_state = EXPR_BEG
- Token("~").set_text("~@")
- end
-
- @OP.def_rule("(") do
- @indent += 1
- if @lex_state == EXPR_BEG || @lex_state == EXPR_MID
- @lex_state = EXPR_BEG
- tk = Token(TkfLPAREN)
- else
- @lex_state = EXPR_BEG
- tk = Token(TkLPAREN)
- end
- tk.set_text("(")
- end
-
- @OP.def_rule("[]", proc{@lex_state == EXPR_FNAME}) do
- Token("[]").set_text("[]")
- end
-
- @OP.def_rule("[]=", proc{@lex_state == EXPR_FNAME}) do
- Token("[]=").set_text("[]=")
- end
-
- @OP.def_rule("[") do
- @indent += 1
- if @lex_state == EXPR_FNAME
- t = Token(TkfLBRACK)
- else
- if @lex_state == EXPR_BEG || @lex_state == EXPR_MID
- t = Token(TkLBRACK)
- elsif @lex_state == EXPR_ARG && @space_seen
- t = Token(TkLBRACK)
- else
- t = Token(TkfLBRACK)
- end
- @lex_state = EXPR_BEG
- end
- t.set_text("[")
- end
-
- @OP.def_rule("{") do
- @indent += 1
- if @lex_state != EXPR_END && @lex_state != EXPR_ARG
- t = Token(TkLBRACE)
- else
- t = Token(TkfLBRACE)
- end
- @lex_state = EXPR_BEG
- t.set_text("{")
- end
-
- @OP.def_rule('\\') do #'
- if getc == "\n"
- @space_seen = true
- @continue = true
- Token(TkSPACE).set_text("\\\n")
- else
- ungetc
- Token("\\").set_text("\\") #"
- end
- end
-
- @OP.def_rule('%') do
- |op, io|
- if @lex_state == EXPR_BEG || @lex_state == EXPR_MID
- identify_quotation('%')
- elsif peek(0) == '='
- getc
- Token(TkOPASGN, "%").set_text("%=")
- elsif @lex_state == EXPR_ARG and @space_seen and peek(0) !~ /\s/
- identify_quotation('%')
- else
- @lex_state = EXPR_BEG
- Token("%").set_text("%")
- end
- end
-
- @OP.def_rule('$') do #'
- identify_gvar
- end
-
- @OP.def_rule('@') do
- if peek(0) =~ /[@\w_]/
- ungetc
- identify_identifier
- else
- Token("@").set_text("@")
- end
- end
-
- @OP.def_rule("__END__", proc{@prev_char_no == 0 && peek(0) =~ /[\r\n]/}) do
- throw :eof
- end
-
- @OP.def_rule("") do
- |op, io|
- printf "MATCH: start %s: %s\n", op, io.inspect if RDoc::RubyLex.debug?
- if peek(0) =~ /[0-9]/
- t = identify_number("")
- elsif peek(0) =~ /[\w_]/
- t = identify_identifier
- end
- printf "MATCH: end %s: %s\n", op, io.inspect if RDoc::RubyLex.debug?
- t
- end
- end
-
- def identify_gvar
- @lex_state = EXPR_END
- str = "$"
-
- tk = case ch = getc
- when /[~_*$?!@\/\\;,=:<>".]/ #"
- str << ch
- Token(TkGVAR, str)
-
- when "-"
- str << "-" << getc
- Token(TkGVAR, str)
-
- when "&", "`", "'", "+"
- str << ch
- Token(TkBACK_REF, str)
-
- when /[1-9]/
- str << ch
- while (ch = getc) =~ /[0-9]/
- str << ch
- end
- ungetc
- Token(TkNTH_REF)
- when /\w/
- ungetc
- ungetc
- return identify_identifier
- else
- ungetc
- Token("$")
- end
- tk.set_text(str)
- end
-
- def identify_identifier
- token = ""
- token.concat getc if peek(0) =~ /[$@]/
- token.concat getc if peek(0) == "@"
-
- while (ch = getc) =~ /\w|_/
- print ":", ch, ":" if RDoc::RubyLex.debug?
- token.concat ch
- end
- ungetc
-
- if ch == "!" or ch == "?"
- token.concat getc
- end
- # fix token
-
- # $stderr.puts "identifier - #{token}, state = #@lex_state"
-
- case token
- when /^\$/
- return Token(TkGVAR, token).set_text(token)
- when /^\@/
- @lex_state = EXPR_END
- return Token(TkIVAR, token).set_text(token)
- end
-
- if @lex_state != EXPR_DOT
- print token, "\n" if RDoc::RubyLex.debug?
-
- token_c, *trans = TkReading2Token[token]
- if token_c
- # reserved word?
-
- if (@lex_state != EXPR_BEG &&
- @lex_state != EXPR_FNAME &&
- trans[1])
- # modifiers
- token_c = TkSymbol2Token[trans[1]]
- @lex_state = trans[0]
- else
- if @lex_state != EXPR_FNAME
- if ENINDENT_CLAUSE.include?(token)
- @indent += 1
- elsif DEINDENT_CLAUSE.include?(token)
- @indent -= 1
- end
- @lex_state = trans[0]
- else
- @lex_state = EXPR_END
- end
- end
- return Token(token_c, token).set_text(token)
- end
- end
-
- if @lex_state == EXPR_FNAME
- @lex_state = EXPR_END
- if peek(0) == '='
- token.concat getc
- end
- elsif @lex_state == EXPR_BEG || @lex_state == EXPR_DOT
- @lex_state = EXPR_ARG
- else
- @lex_state = EXPR_END
- end
-
- if token[0, 1] =~ /[A-Z]/
- return Token(TkCONSTANT, token).set_text(token)
- elsif token[token.size - 1, 1] =~ /[!?]/
- return Token(TkFID, token).set_text(token)
- else
- return Token(TkIDENTIFIER, token).set_text(token)
- end
- end
-
- def identify_here_document
- ch = getc
- if ch == "-"
- ch = getc
- indent = true
- end
- if /['"`]/ =~ ch # '
- lt = ch
- quoted = ""
- while (c = getc) && c != lt
- quoted.concat c
- end
- else
- lt = '"'
- quoted = ch.dup
- while (c = getc) && c =~ /\w/
- quoted.concat c
- end
- ungetc
- end
-
- ltback, @ltype = @ltype, lt
- reserve = ""
-
- while ch = getc
- reserve << ch
- if ch == "\\" #"
- ch = getc
- reserve << ch
- elsif ch == "\n"
- break
- end
- end
-
- str = ""
- while (l = gets)
- l.chomp!
- l.strip! if indent
- break if l == quoted
- str << l.chomp << "\n"
- end
-
- @reader.divert_read_from(reserve)
-
- @ltype = ltback
- @lex_state = EXPR_END
- Token(Ltype2Token[lt], str).set_text(str.dump)
- end
-
- def identify_quotation(initial_char)
- ch = getc
- if lt = PERCENT_LTYPE[ch]
- initial_char += ch
- ch = getc
- elsif ch =~ /\W/
- lt = "\""
- else
- fail SyntaxError, "unknown type of %string ('#{ch}')"
- end
-# if ch !~ /\W/
-# ungetc
-# next
-# end
- #@ltype = lt
- @quoted = ch unless @quoted = PERCENT_PAREN[ch]
- identify_string(lt, @quoted, ch, initial_char)
- end
-
- def identify_number(start)
- str = start.dup
-
- if start == "+" or start == "-" or start == ""
- start = getc
- str << start
- end
-
- @lex_state = EXPR_END
-
- if start == "0"
- if peek(0) == "x"
- ch = getc
- str << ch
- match = /[0-9a-f_]/
- else
- match = /[0-7_]/
- end
- while ch = getc
- if ch !~ match
- ungetc
- break
- else
- str << ch
- end
- end
- return Token(TkINTEGER).set_text(str)
- end
-
- type = TkINTEGER
- allow_point = TRUE
- allow_e = TRUE
- while ch = getc
- case ch
- when /[0-9_]/
- str << ch
-
- when allow_point && "."
- type = TkFLOAT
- if peek(0) !~ /[0-9]/
- ungetc
- break
- end
- str << ch
- allow_point = false
-
- when allow_e && "e", allow_e && "E"
- str << ch
- type = TkFLOAT
- if peek(0) =~ /[+-]/
- str << getc
- end
- allow_e = false
- allow_point = false
- else
- ungetc
- break
- end
- end
- Token(type).set_text(str)
- end
-
- def identify_string(ltype, quoted = ltype, opener=nil, initial_char = nil)
- @ltype = ltype
- @quoted = quoted
- subtype = nil
-
- str = ""
- str << initial_char if initial_char
- str << (opener||quoted)
-
- nest = 0
- begin
- while ch = getc
- str << ch
- if @quoted == ch
- if nest == 0
- break
- else
- nest -= 1
- end
- elsif opener == ch
- nest += 1
- elsif @ltype != "'" && @ltype != "]" and ch == "#"
- ch = getc
- if ch == "{"
- subtype = true
- str << ch << skip_inner_expression
- else
- ungetc(ch)
- end
- elsif ch == '\\' #'
- str << read_escape
- end
- end
- if @ltype == "/"
- if peek(0) =~ /i|o|n|e|s/
- str << getc
- end
- end
- if subtype
- Token(DLtype2Token[ltype], str)
- else
- Token(Ltype2Token[ltype], str)
- end.set_text(str)
- ensure
- @ltype = nil
- @quoted = nil
- @lex_state = EXPR_END
- end
- end
-
- def skip_inner_expression
- res = ""
- nest = 0
- while (ch = getc)
- res << ch
- if ch == '}'
- break if nest.zero?
- nest -= 1
- elsif ch == '{'
- nest += 1
- end
- end
- res
- end
-
- def identify_comment
- @ltype = "#"
- comment = "#"
- while ch = getc
- if ch == "\\"
- ch = getc
- if ch == "\n"
- ch = " "
- else
- comment << "\\"
- end
- else
- if ch == "\n"
- @ltype = nil
- ungetc
- break
- end
- end
- comment << ch
- end
- return Token(TkCOMMENT).set_text(comment)
- end
-
- def read_escape
- res = ""
- case ch = getc
- when /[0-7]/
- ungetc ch
- 3.times do
- case ch = getc
- when /[0-7]/
- when nil
- break
- else
- ungetc
- break
- end
- res << ch
- end
-
- when "x"
- res << ch
- 2.times do
- case ch = getc
- when /[0-9a-fA-F]/
- when nil
- break
- else
- ungetc
- break
- end
- res << ch
- end
-
- when "M"
- res << ch
- if (ch = getc) != '-'
- ungetc
- else
- res << ch
- if (ch = getc) == "\\" #"
- res << ch
- res << read_escape
- else
- res << ch
- end
- end
-
- when "C", "c" #, "^"
- res << ch
- if ch == "C" and (ch = getc) != "-"
- ungetc
- else
- res << ch
- if (ch = getc) == "\\" #"
- res << ch
- res << read_escape
- else
- res << ch
- end
- end
- else
- res << ch
- end
- res
- end
-end
-
-##
-# Extracts code elements from a source file returning a TopLevel object
-# containing the constituent file elements.
-#
-# This file is based on rtags
-#
-# RubyParser understands how to document:
-# * classes
-# * modules
-# * methods
-# * constants
-# * aliases
-# * private, public, protected
-# * private_class_function, public_class_function
-# * module_function
-# * attr, attr_reader, attr_writer, attr_accessor
-# * extra accessors given on the command line
-# * metaprogrammed methods
-# * require
-# * include
-#
-# == Method Arguments
-#
-#--
-# NOTE: I don't think this works, needs tests, remove the paragraph following
-# this block when known to work
-#
-# The parser extracts the arguments from the method definition. You can
-# override this with a custom argument definition using the :args: directive:
-#
-# ##
-# # This method tries over and over until it is tired
-#
-# def go_go_go(thing_to_try, tries = 10) # :args: thing_to_try
-# puts thing_to_try
-# go_go_go thing_to_try, tries - 1
-# end
-#
-# If you have a more-complex set of overrides you can use the :call-seq:
-# directive:
-#++
-#
-# The parser extracts the arguments from the method definition. You can
-# override this with a custom argument definition using the :call-seq:
-# directive:
-#
-# ##
-# # This method can be called with a range or an offset and length
-# #
-# # :call-seq:
-# # my_method(Range)
-# # my_method(offset, length)
-#
-# def my_method(*args)
-# end
-#
-# The parser extracts +yield+ expressions from method bodies to gather the
-# yielded argument names. If your method manually calls a block instead of
-# yielding or you want to override the discovered argument names use
-# the :yields: directive:
-#
-# ##
-# # My method is awesome
-#
-# def my_method(&block) # :yields: happy, times
-# block.call 1, 2
-# end
-#
-# == Metaprogrammed Methods
-#
-# To pick up a metaprogrammed method, the parser looks for a comment starting
-# with '##' before an identifier:
-#
-# ##
-# # This is a meta-programmed method!
-#
-# add_my_method :meta_method, :arg1, :arg2
-#
-# The parser looks at the token after the identifier to determine the name, in
-# this example, :meta_method. If a name cannot be found, a warning is printed
-# and 'unknown is used.
-#
-# You can force the name of a method using the :method: directive:
-#
-# ##
-# # :method: woo_hoo!
-#
-# By default, meta-methods are instance methods. To indicate that a method is
-# a singleton method instead use the :singleton-method: directive:
-#
-# ##
-# # :singleton-method:
-#
-# You can also use the :singleton-method: directive with a name:
-#
-# ##
-# # :singleton-method: woo_hoo!
-#
-# == Hidden methods
-#
-# You can provide documentation for methods that don't appear using
-# the :method: and :singleton-method: directives:
-#
-# ##
-# # :method: ghost_method
-# # There is a method here, but you can't see it!
-#
-# ##
-# # this is a comment for a regular method
-#
-# def regular_method() end
-#
-# Note that by default, the :method: directive will be ignored if there is a
-# standard rdocable item following it.
-
-class RDoc::Parser::Ruby < RDoc::Parser
-
- parse_files_matching(/\.rbw?$/)
-
- include RDoc::RubyToken
- include RDoc::TokenStream
-
- NORMAL = "::"
- SINGLE = "<<"
-
- def initialize(top_level, file_name, content, options, stats)
- super
-
- @size = 0
- @token_listeners = nil
- @scanner = RDoc::RubyLex.new content, @options
- @scanner.exception_on_syntax_error = false
-
- reset
- end
-
- def add_token_listener(obj)
- @token_listeners ||= []
- @token_listeners << obj
- end
-
- ##
- # Look for the first comment in a file that isn't a shebang line.
-
- def collect_first_comment
- skip_tkspace
- res = ''
- first_line = true
-
- tk = get_tk
-
- while TkCOMMENT === tk
- if first_line and tk.text =~ /\A#!/ then
- skip_tkspace
- tk = get_tk
- elsif first_line and tk.text =~ /\A#\s*-\*-/ then
- first_line = false
- skip_tkspace
- tk = get_tk
- else
- first_line = false
- res << tk.text << "\n"
- tk = get_tk
-
- if TkNL === tk then
- skip_tkspace false
- tk = get_tk
- end
- end
- end
-
- unget_tk tk
-
- res
- end
-
- def error(msg)
- msg = make_message msg
- $stderr.puts msg
- exit(1)
- end
-
- ##
- # Look for a 'call-seq' in the comment, and override the normal parameter
- # stuff
-
- def extract_call_seq(comment, meth)
- if comment.sub!(/:?call-seq:(.*?)^\s*\#?\s*$/m, '') then
- seq = $1
- seq.gsub!(/^\s*\#\s*/, '')
- meth.call_seq = seq
- end
-
- meth
- end
-
- def get_bool
- skip_tkspace
- tk = get_tk
- case tk
- when TkTRUE
- true
- when TkFALSE, TkNIL
- false
- else
- unget_tk tk
- true
- end
- end
-
- ##
- # Look for the name of a class of module (optionally with a leading :: or
- # with :: separated named) and return the ultimate name and container
-
- def get_class_or_module(container)
- skip_tkspace
- name_t = get_tk
-
- # class ::A -> A is in the top level
- if TkCOLON2 === name_t then
- name_t = get_tk
- container = @top_level
- end
-
- skip_tkspace(false)
-
- while TkCOLON2 === peek_tk do
- prev_container = container
- container = container.find_module_named(name_t.name)
- if !container
-# warn("Couldn't find module #{name_t.name}")
- container = prev_container.add_module RDoc::NormalModule, name_t.name
- end
- get_tk
- name_t = get_tk
- end
- skip_tkspace(false)
- return [container, name_t]
- end
-
- ##
- # Return a superclass, which can be either a constant of an expression
-
- def get_class_specification
- tk = get_tk
- return "self" if TkSELF === tk
-
- res = ""
- while TkCOLON2 === tk or TkCOLON3 === tk or TkCONSTANT === tk do
- res += tk.text
- tk = get_tk
- end
-
- unget_tk(tk)
- skip_tkspace(false)
-
- get_tkread # empty out read buffer
-
- tk = get_tk
-
- case tk
- when TkNL, TkCOMMENT, TkSEMICOLON then
- unget_tk(tk)
- return res
- end
-
- res += parse_call_parameters(tk)
- res
- end
-
- ##
- # Parse a constant, which might be qualified by one or more class or module
- # names
-
- def get_constant
- res = ""
- skip_tkspace(false)
- tk = get_tk
-
- while TkCOLON2 === tk or TkCOLON3 === tk or TkCONSTANT === tk do
- res += tk.text
- tk = get_tk
- end
-
-# if res.empty?
-# warn("Unexpected token #{tk} in constant")
-# end
- unget_tk(tk)
- res
- end
-
- ##
- # Get a constant that may be surrounded by parens
-
- def get_constant_with_optional_parens
- skip_tkspace(false)
- nest = 0
- while TkLPAREN === (tk = peek_tk) or TkfLPAREN === tk do
- get_tk
- skip_tkspace(true)
- nest += 1
- end
-
- name = get_constant
-
- while nest > 0
- skip_tkspace(true)
- tk = get_tk
- nest -= 1 if TkRPAREN === tk
- end
- name
- end
-
- def get_symbol_or_name
- tk = get_tk
- case tk
- when TkSYMBOL
- tk.text.sub(/^:/, '')
- when TkId, TkOp
- tk.name
- when TkSTRING
- tk.text
- else
- raise "Name or symbol expected (got #{tk})"
- end
- end
-
- def get_tk
- tk = nil
- if @tokens.empty?
- tk = @scanner.token
- @read.push @scanner.get_read
- puts "get_tk1 => #{tk.inspect}" if $TOKEN_DEBUG
- else
- @read.push @unget_read.shift
- tk = @tokens.shift
- puts "get_tk2 => #{tk.inspect}" if $TOKEN_DEBUG
- end
-
- if TkSYMBEG === tk then
- set_token_position(tk.line_no, tk.char_no)
- tk1 = get_tk
- if TkId === tk1 or TkOp === tk1 or TkSTRING === tk1 then
- if tk1.respond_to?(:name)
- tk = Token(TkSYMBOL).set_text(":" + tk1.name)
- else
- tk = Token(TkSYMBOL).set_text(":" + tk1.text)
- end
- # remove the identifier we just read (we're about to
- # replace it with a symbol)
- @token_listeners.each do |obj|
- obj.pop_token
- end if @token_listeners
- else
- warn("':' not followed by identifier or operator")
- tk = tk1
- end
- end
-
- # inform any listeners of our shiny new token
- @token_listeners.each do |obj|
- obj.add_token(tk)
- end if @token_listeners
-
- tk
- end
-
- def get_tkread
- read = @read.join("")
- @read = []
- read
- end
-
- ##
- # Look for directives in a normal comment block:
- #
- # #-- - don't display comment from this point forward
- #
- # This routine modifies it's parameter
-
- def look_for_directives_in(context, comment)
- preprocess = RDoc::Markup::PreProcess.new(@file_name,
- @options.rdoc_include)
-
- preprocess.handle(comment) do |directive, param|
- case directive
- when 'enddoc' then
- throw :enddoc
- when 'main' then
- @options.main_page = param
- ''
- when 'method', 'singleton-method' then
- false # ignore
- when 'section' then
- context.set_current_section(param, comment)
- comment.replace ''
- break
- when 'startdoc' then
- context.start_doc
- context.force_documentation = true
- ''
- when 'stopdoc' then
- context.stop_doc
- ''
- when 'title' then
- @options.title = param
- ''
- else
- warn "Unrecognized directive '#{directive}'"
- false
- end
- end
-
- remove_private_comments(comment)
- end
-
- def make_message(msg)
- prefix = "\n" + @file_name + ":"
- if @scanner
- prefix << "#{@scanner.line_no}:#{@scanner.char_no}: "
- end
- return prefix + msg
- end
-
- def parse_attr(context, single, tk, comment)
- args = parse_symbol_arg(1)
- if args.size > 0
- name = args[0]
- rw = "R"
- skip_tkspace(false)
- tk = get_tk
- if TkCOMMA === tk then
- rw = "RW" if get_bool
- else
- unget_tk tk
- end
- att = RDoc::Attr.new get_tkread, name, rw, comment
- read_documentation_modifiers att, RDoc::ATTR_MODIFIERS
- if att.document_self
- context.add_attribute(att)
- end
- else
- warn("'attr' ignored - looks like a variable")
- end
- end
-
- def parse_attr_accessor(context, single, tk, comment)
- args = parse_symbol_arg
- read = get_tkread
- rw = "?"
-
- # If nodoc is given, don't document any of them
-
- tmp = RDoc::CodeObject.new
- read_documentation_modifiers tmp, RDoc::ATTR_MODIFIERS
- return unless tmp.document_self
-
- case tk.name
- when "attr_reader" then rw = "R"
- when "attr_writer" then rw = "W"
- when "attr_accessor" then rw = "RW"
- else
- rw = @options.extra_accessor_flags[tk.name]
- rw = '?' if rw.nil?
- end
-
- for name in args
- att = RDoc::Attr.new get_tkread, name, rw, comment
- context.add_attribute att
- end
- end
-
- def parse_alias(context, single, tk, comment)
- skip_tkspace
- if TkLPAREN === peek_tk then
- get_tk
- skip_tkspace
- end
- new_name = get_symbol_or_name
- @scanner.instance_eval{@lex_state = EXPR_FNAME}
- skip_tkspace
- if TkCOMMA === peek_tk then
- get_tk
- skip_tkspace
- end
- old_name = get_symbol_or_name
-
- al = RDoc::Alias.new get_tkread, old_name, new_name, comment
- read_documentation_modifiers al, RDoc::ATTR_MODIFIERS
- if al.document_self
- context.add_alias(al)
- end
- end
-
- def parse_call_parameters(tk)
- end_token = case tk
- when TkLPAREN, TkfLPAREN
- TkRPAREN
- when TkRPAREN
- return ""
- else
- TkNL
- end
- nest = 0
-
- loop do
- case tk
- when TkSEMICOLON
- break
- when TkLPAREN, TkfLPAREN
- nest += 1
- when end_token
- if end_token == TkRPAREN
- nest -= 1
- break if @scanner.lex_state == EXPR_END and nest <= 0
- else
- break unless @scanner.continue
- end
- when TkCOMMENT
- unget_tk(tk)
- break
- end
- tk = get_tk
- end
- res = get_tkread.tr("\n", " ").strip
- res = "" if res == ";"
- res
- end
-
- def parse_class(container, single, tk, comment)
- container, name_t = get_class_or_module(container)
-
- case name_t
- when TkCONSTANT
- name = name_t.name
- superclass = "Object"
-
- if TkLT === peek_tk then
- get_tk
- skip_tkspace(true)
- superclass = get_class_specification
- superclass = "<unknown>" if superclass.empty?
- end
-
- cls_type = single == SINGLE ? RDoc::SingleClass : RDoc::NormalClass
- cls = container.add_class cls_type, name, superclass
-
- @stats.add_class cls
-
- read_documentation_modifiers cls, RDoc::CLASS_MODIFIERS
- cls.record_location @top_level
-
- parse_statements cls
- cls.comment = comment
-
- when TkLSHFT
- case name = get_class_specification
- when "self", container.name
- parse_statements(container, SINGLE)
- else
- other = RDoc::TopLevel.find_class_named(name)
- unless other
- # other = @top_level.add_class(NormalClass, name, nil)
- # other.record_location(@top_level)
- # other.comment = comment
- other = RDoc::NormalClass.new "Dummy", nil
- end
-
- @stats.add_class other
-
- read_documentation_modifiers other, RDoc::CLASS_MODIFIERS
- parse_statements(other, SINGLE)
- end
-
- else
- warn("Expected class name or '<<'. Got #{name_t.class}: #{name_t.text.inspect}")
- end
- end
-
- def parse_constant(container, single, tk, comment)
- name = tk.name
- skip_tkspace(false)
- eq_tk = get_tk
-
- unless TkASSIGN === eq_tk then
- unget_tk(eq_tk)
- return
- end
-
-
- nest = 0
- get_tkread
-
- tk = get_tk
- if TkGT === tk then
- unget_tk(tk)
- unget_tk(eq_tk)
- return
- end
-
- loop do
- case tk
- when TkSEMICOLON
- break
- when TkLPAREN, TkfLPAREN, TkLBRACE, TkLBRACK, TkDO
- nest += 1
- when TkRPAREN, TkRBRACE, TkRBRACK, TkEND
- nest -= 1
- when TkCOMMENT
- if nest <= 0 && @scanner.lex_state == EXPR_END
- unget_tk(tk)
- break
- end
- when TkNL
- if (nest <= 0) && ((@scanner.lex_state == EXPR_END) || (!@scanner.continue))
- unget_tk(tk)
- break
- end
- end
- tk = get_tk
- end
-
- res = get_tkread.tr("\n", " ").strip
- res = "" if res == ";"
-
- con = RDoc::Constant.new name, res, comment
- read_documentation_modifiers con, RDoc::CONSTANT_MODIFIERS
-
- if con.document_self
- container.add_constant(con)
- end
- end
-
- def parse_comment(container, tk, comment)
- line_no = tk.line_no
- column = tk.char_no
-
- singleton = !!comment.sub!(/(^# +:?)(singleton-)(method:)/, '\1\3')
-
- if comment.sub!(/^# +:?method: *(\S*).*?\n/i, '') then
- name = $1 unless $1.empty?
- else
- return nil
- end
-
- meth = RDoc::GhostMethod.new get_tkread, name
- meth.singleton = singleton
-
- @stats.add_method meth
-
- meth.start_collecting_tokens
- indent = TkSPACE.new 1, 1
- indent.set_text " " * column
-
- position_comment = TkCOMMENT.new(line_no, 1, "# File #{@top_level.file_absolute_name}, line #{line_no}")
- meth.add_tokens [position_comment, NEWLINE_TOKEN, indent]
-
- meth.params = ''
-
- extract_call_seq comment, meth
-
- container.add_method meth if meth.document_self
-
- meth.comment = comment
- end
-
- def parse_include(context, comment)
- loop do
- skip_tkspace_comment
-
- name = get_constant_with_optional_parens
- context.add_include RDoc::Include.new(name, comment) unless name.empty?
-
- return unless TkCOMMA === peek_tk
- get_tk
- end
- end
-
- ##
- # Parses a meta-programmed method
-
- def parse_meta_method(container, single, tk, comment)
- line_no = tk.line_no
- column = tk.char_no
-
- start_collecting_tokens
- add_token tk
- add_token_listener self
-
- skip_tkspace false
-
- singleton = !!comment.sub!(/(^# +:?)(singleton-)(method:)/, '\1\3')
-
- if comment.sub!(/^# +:?method: *(\S*).*?\n/i, '') then
- name = $1 unless $1.empty?
- end
-
- if name.nil? then
- name_t = get_tk
- case name_t
- when TkSYMBOL then
- name = name_t.text[1..-1]
- when TkSTRING then
- name = name_t.text[1..-2]
- else
- warn "#{container.top_level.file_relative_name}:#{name_t.line_no} unknown name token #{name_t.inspect} for meta-method"
- name = 'unknown'
- end
- end
-
- meth = RDoc::MetaMethod.new get_tkread, name
- meth.singleton = singleton
-
- @stats.add_method meth
-
- remove_token_listener self
-
- meth.start_collecting_tokens
- indent = TkSPACE.new 1, 1
- indent.set_text " " * column
-
- position_comment = TkCOMMENT.new(line_no, 1, "# File #{@top_level.file_absolute_name}, line #{line_no}")
- meth.add_tokens [position_comment, NEWLINE_TOKEN, indent]
- meth.add_tokens @token_stream
-
- add_token_listener meth
-
- meth.params = ''
-
- extract_call_seq comment, meth
-
- container.add_method meth if meth.document_self
-
- last_tk = tk
-
- while tk = get_tk do
- case tk
- when TkSEMICOLON then
- break
- when TkNL then
- break unless last_tk and TkCOMMA === last_tk
- when TkSPACE then
- # expression continues
- else
- last_tk = tk
- end
- end
-
- remove_token_listener meth
-
- meth.comment = comment
- end
-
- ##
- # Parses a method
-
- def parse_method(container, single, tk, comment)
- line_no = tk.line_no
- column = tk.char_no
-
- start_collecting_tokens
- add_token(tk)
- add_token_listener(self)
-
- @scanner.instance_eval do @lex_state = EXPR_FNAME end
-
- skip_tkspace(false)
- name_t = get_tk
- back_tk = skip_tkspace
- meth = nil
- added_container = false
-
- dot = get_tk
- if TkDOT === dot or TkCOLON2 === dot then
- @scanner.instance_eval do @lex_state = EXPR_FNAME end
- skip_tkspace
- name_t2 = get_tk
-
- case name_t
- when TkSELF then
- name = name_t2.name
- when TkCONSTANT then
- name = name_t2.name
- prev_container = container
- container = container.find_module_named(name_t.name)
- unless container then
- added_container = true
- obj = name_t.name.split("::").inject(Object) do |state, item|
- state.const_get(item)
- end rescue nil
-
- type = obj.class == Class ? RDoc::NormalClass : RDoc::NormalModule
-
- unless [Class, Module].include?(obj.class) then
- warn("Couldn't find #{name_t.name}. Assuming it's a module")
- end
-
- if type == RDoc::NormalClass then
- container = prev_container.add_class(type, name_t.name, obj.superclass.name)
- else
- container = prev_container.add_module(type, name_t.name)
- end
-
- container.record_location @top_level
- end
- else
- # warn("Unexpected token '#{name_t2.inspect}'")
- # break
- skip_method(container)
- return
- end
-
- meth = RDoc::AnyMethod.new(get_tkread, name)
- meth.singleton = true
- else
- unget_tk dot
- back_tk.reverse_each do |token|
- unget_tk token
- end
- name = name_t.name
-
- meth = RDoc::AnyMethod.new get_tkread, name
- meth.singleton = (single == SINGLE)
- end
-
- @stats.add_method meth
-
- remove_token_listener self
-
- meth.start_collecting_tokens
- indent = TkSPACE.new 1, 1
- indent.set_text " " * column
-
- token = TkCOMMENT.new(line_no, 1, "# File #{@top_level.file_absolute_name}, line #{line_no}")
- meth.add_tokens [token, NEWLINE_TOKEN, indent]
- meth.add_tokens @token_stream
-
- add_token_listener meth
-
- @scanner.instance_eval do @continue = false end
- parse_method_parameters meth
-
- if meth.document_self then
- container.add_method meth
- elsif added_container then
- container.document_self = false
- end
-
- # Having now read the method parameters and documentation modifiers, we
- # now know whether we have to rename #initialize to ::new
-
- if name == "initialize" && !meth.singleton then
- if meth.dont_rename_initialize then
- meth.visibility = :protected
- else
- meth.singleton = true
- meth.name = "new"
- meth.visibility = :public
- end
- end
-
- parse_statements(container, single, meth)
-
- remove_token_listener(meth)
-
- extract_call_seq comment, meth
-
- meth.comment = comment
- end
-
- def parse_method_or_yield_parameters(method = nil,
- modifiers = RDoc::METHOD_MODIFIERS)
- skip_tkspace(false)
- tk = get_tk
-
- # Little hack going on here. In the statement
- # f = 2*(1+yield)
- # We see the RPAREN as the next token, so we need
- # to exit early. This still won't catch all cases
- # (such as "a = yield + 1"
- end_token = case tk
- when TkLPAREN, TkfLPAREN
- TkRPAREN
- when TkRPAREN
- return ""
- else
- TkNL
- end
- nest = 0
-
- loop do
- case tk
- when TkSEMICOLON
- break
- when TkLBRACE
- nest += 1
- when TkRBRACE
- # we might have a.each {|i| yield i }
- unget_tk(tk) if nest.zero?
- nest -= 1
- break if nest <= 0
- when TkLPAREN, TkfLPAREN
- nest += 1
- when end_token
- if end_token == TkRPAREN
- nest -= 1
- break if @scanner.lex_state == EXPR_END and nest <= 0
- else
- break unless @scanner.continue
- end
- when method && method.block_params.nil? && TkCOMMENT
- unget_tk(tk)
- read_documentation_modifiers(method, modifiers)
- end
- tk = get_tk
- end
- res = get_tkread.tr("\n", " ").strip
- res = "" if res == ";"
- res
- end
-
- ##
- # Capture the method's parameters. Along the way, look for a comment
- # containing:
- #
- # # yields: ....
- #
- # and add this as the block_params for the method
-
- def parse_method_parameters(method)
- res = parse_method_or_yield_parameters(method)
- res = "(" + res + ")" unless res[0] == ?(
- method.params = res unless method.params
- if method.block_params.nil?
- skip_tkspace(false)
- read_documentation_modifiers method, RDoc::METHOD_MODIFIERS
- end
- end
-
- def parse_module(container, single, tk, comment)
- container, name_t = get_class_or_module(container)
-
- name = name_t.name
-
- mod = container.add_module RDoc::NormalModule, name
- mod.record_location @top_level
-
- @stats.add_module mod
-
- read_documentation_modifiers mod, RDoc::CLASS_MODIFIERS
- parse_statements(mod)
- mod.comment = comment
- end
-
- def parse_require(context, comment)
- skip_tkspace_comment
- tk = get_tk
- if TkLPAREN === tk then
- skip_tkspace_comment
- tk = get_tk
- end
-
- name = nil
- case tk
- when TkSTRING
- name = tk.text
- # when TkCONSTANT, TkIDENTIFIER, TkIVAR, TkGVAR
- # name = tk.name
- when TkDSTRING
- warn "Skipping require of dynamic string: #{tk.text}"
- # else
- # warn "'require' used as variable"
- end
- if name
- context.add_require RDoc::Require.new(name, comment)
- else
- unget_tk(tk)
- end
- end
-
- def parse_statements(container, single = NORMAL, current_method = nil,
- comment = '')
- nest = 1
- save_visibility = container.visibility
-
- non_comment_seen = true
-
- while tk = get_tk do
- keep_comment = false
-
- non_comment_seen = true unless TkCOMMENT === tk
-
- case tk
- when TkNL then
- skip_tkspace true # Skip blanks and newlines
- tk = get_tk
-
- if TkCOMMENT === tk then
- if non_comment_seen then
- # Look for RDoc in a comment about to be thrown away
- parse_comment container, tk, comment unless comment.empty?
-
- comment = ''
- non_comment_seen = false
- end
-
- while TkCOMMENT === tk do
- comment << tk.text << "\n"
- tk = get_tk # this is the newline
- skip_tkspace(false) # leading spaces
- tk = get_tk
- end
-
- unless comment.empty? then
- look_for_directives_in container, comment
-
- if container.done_documenting then
- container.ongoing_visibility = save_visibility
- end
- end
-
- keep_comment = true
- else
- non_comment_seen = true
- end
-
- unget_tk tk
- keep_comment = true
-
- when TkCLASS then
- if container.document_children then
- parse_class container, single, tk, comment
- else
- nest += 1
- end
-
- when TkMODULE then
- if container.document_children then
- parse_module container, single, tk, comment
- else
- nest += 1
- end
-
- when TkDEF then
- if container.document_self then
- parse_method container, single, tk, comment
- else
- nest += 1
- end
-
- when TkCONSTANT then
- if container.document_self then
- parse_constant container, single, tk, comment
- end
-
- when TkALIAS then
- if container.document_self then
- parse_alias container, single, tk, comment
- end
-
- when TkYIELD then
- if current_method.nil? then
- warn "Warning: yield outside of method" if container.document_self
- else
- parse_yield container, single, tk, current_method
- end
-
- # Until and While can have a 'do', which shouldn't increase the nesting.
- # We can't solve the general case, but we can handle most occurrences by
- # ignoring a do at the end of a line.
-
- when TkUNTIL, TkWHILE then
- nest += 1
- skip_optional_do_after_expression
-
- # 'for' is trickier
- when TkFOR then
- nest += 1
- skip_for_variable
- skip_optional_do_after_expression
-
- when TkCASE, TkDO, TkIF, TkUNLESS, TkBEGIN then
- nest += 1
-
- when TkIDENTIFIER then
- if nest == 1 and current_method.nil? then
- case tk.name
- when 'private', 'protected', 'public', 'private_class_method',
- 'public_class_method', 'module_function' then
- parse_visibility container, single, tk
- keep_comment = true
- when 'attr' then
- parse_attr container, single, tk, comment
- when /^attr_(reader|writer|accessor)$/, @options.extra_accessors then
- parse_attr_accessor container, single, tk, comment
- when 'alias_method' then
- if container.document_self then
- parse_alias container, single, tk, comment
- end
- else
- if container.document_self and comment =~ /\A#\#$/ then
- parse_meta_method container, single, tk, comment
- end
- end
- end
-
- case tk.name
- when "require" then
- parse_require container, comment
- when "include" then
- parse_include container, comment
- end
-
- when TkEND then
- nest -= 1
- if nest == 0 then
- read_documentation_modifiers container, RDoc::CLASS_MODIFIERS
- container.ongoing_visibility = save_visibility
- return
- end
-
- end
-
- comment = '' unless keep_comment
-
- begin
- get_tkread
- skip_tkspace(false)
- end while peek_tk == TkNL
- end
- end
-
- def parse_symbol_arg(no = nil)
- args = []
- skip_tkspace_comment
- case tk = get_tk
- when TkLPAREN
- loop do
- skip_tkspace_comment
- if tk1 = parse_symbol_in_arg
- args.push tk1
- break if no and args.size >= no
- end
-
- skip_tkspace_comment
- case tk2 = get_tk
- when TkRPAREN
- break
- when TkCOMMA
- else
- warn("unexpected token: '#{tk2.inspect}'") if $DEBUG_RDOC
- break
- end
- end
- else
- unget_tk tk
- if tk = parse_symbol_in_arg
- args.push tk
- return args if no and args.size >= no
- end
-
- loop do
- skip_tkspace(false)
-
- tk1 = get_tk
- unless TkCOMMA === tk1 then
- unget_tk tk1
- break
- end
-
- skip_tkspace_comment
- if tk = parse_symbol_in_arg
- args.push tk
- break if no and args.size >= no
- end
- end
- end
- args
- end
-
- def parse_symbol_in_arg
- case tk = get_tk
- when TkSYMBOL
- tk.text.sub(/^:/, '')
- when TkSTRING
- eval @read[-1]
- else
- warn("Expected symbol or string, got #{tk.inspect}") if $DEBUG_RDOC
- nil
- end
- end
-
- def parse_toplevel_statements(container)
- comment = collect_first_comment
- look_for_directives_in(container, comment)
- container.comment = comment unless comment.empty?
- parse_statements container, NORMAL, nil, comment
- end
-
- def parse_visibility(container, single, tk)
- singleton = (single == SINGLE)
-
- vis_type = tk.name
-
- vis = case vis_type
- when 'private' then :private
- when 'protected' then :protected
- when 'public' then :public
- when 'private_class_method' then
- singleton = true
- :private
- when 'public_class_method' then
- singleton = true
- :public
- when 'module_function' then
- singleton = true
- :public
- else
- raise "Invalid visibility: #{tk.name}"
- end
-
- skip_tkspace_comment false
-
- case peek_tk
- # Ryan Davis suggested the extension to ignore modifiers, because he
- # often writes
- #
- # protected unless $TESTING
- #
- when TkNL, TkUNLESS_MOD, TkIF_MOD, TkSEMICOLON then
- container.ongoing_visibility = vis
- else
- if vis_type == 'module_function' then
- args = parse_symbol_arg
- container.set_visibility_for args, :private, false
-
- module_functions = []
-
- container.methods_matching args do |m|
- s_m = m.dup
- s_m.singleton = true if RDoc::AnyMethod === s_m
- s_m.visibility = :public
- module_functions << s_m
- end
-
- module_functions.each do |s_m|
- case s_m
- when RDoc::AnyMethod then
- container.add_method s_m
- when RDoc::Attr then
- container.add_attribute s_m
- end
- end
- else
- args = parse_symbol_arg
- container.set_visibility_for args, vis, singleton
- end
- end
- end
-
- def parse_yield_parameters
- parse_method_or_yield_parameters
- end
-
- def parse_yield(context, single, tk, method)
- if method.block_params.nil?
- get_tkread
- @scanner.instance_eval{@continue = false}
- method.block_params = parse_yield_parameters
- end
- end
-
- def peek_read
- @read.join('')
- end
-
- ##
- # Peek at the next token, but don't remove it from the stream
-
- def peek_tk
- unget_tk(tk = get_tk)
- tk
- end
-
- ##
- # Directives are modifier comments that can appear after class, module, or
- # method names. For example:
- #
- # def fred # :yields: a, b
- #
- # or:
- #
- # class MyClass # :nodoc:
- #
- # We return the directive name and any parameters as a two element array
-
- def read_directive(allowed)
- tk = get_tk
- result = nil
- if TkCOMMENT === tk
- if tk.text =~ /\s*:?(\w+):\s*(.*)/
- directive = $1.downcase
- if allowed.include?(directive)
- result = [directive, $2]
- end
- end
- else
- unget_tk(tk)
- end
- result
- end
-
- def read_documentation_modifiers(context, allow)
- dir = read_directive(allow)
-
- case dir[0]
- when "notnew", "not_new", "not-new" then
- context.dont_rename_initialize = true
-
- when "nodoc" then
- context.document_self = false
- if dir[1].downcase == "all"
- context.document_children = false
- end
-
- when "doc" then
- context.document_self = true
- context.force_documentation = true
-
- when "yield", "yields" then
- unless context.params.nil?
- context.params.sub!(/(,|)\s*&\w+/,'') # remove parameter &proc
- end
-
- context.block_params = dir[1]
-
- when "arg", "args" then
- context.params = dir[1]
- end if dir
- end
-
- def remove_private_comments(comment)
- comment.gsub!(/^#--\n.*?^#\+\+/m, '')
- comment.sub!(/^#--\n.*/m, '')
- end
-
- def remove_token_listener(obj)
- @token_listeners.delete(obj)
- end
-
- def reset
- @tokens = []
- @unget_read = []
- @read = []
- end
-
- def scan
- reset
-
- catch(:eof) do
- catch(:enddoc) do
- begin
- parse_toplevel_statements(@top_level)
- rescue Exception => e
- $stderr.puts <<-EOF
-
-
-RDoc failure in #{@file_name} at or around line #{@scanner.line_no} column
-#{@scanner.char_no}
-
-Before reporting this, could you check that the file you're documenting
-compiles cleanly--RDoc is not a full Ruby parser, and gets confused easily if
-fed invalid programs.
-
-The internal error was:
-
- EOF
-
- e.set_backtrace(e.backtrace[0,4])
- raise
- end
- end
- end
-
- @top_level
- end
-
- ##
- # while, until, and for have an optional do
-
- def skip_optional_do_after_expression
- skip_tkspace(false)
- tk = get_tk
- case tk
- when TkLPAREN, TkfLPAREN
- end_token = TkRPAREN
- else
- end_token = TkNL
- end
-
- nest = 0
- @scanner.instance_eval{@continue = false}
-
- loop do
- case tk
- when TkSEMICOLON
- break
- when TkLPAREN, TkfLPAREN
- nest += 1
- when TkDO
- break if nest.zero?
- when end_token
- if end_token == TkRPAREN
- nest -= 1
- break if @scanner.lex_state == EXPR_END and nest.zero?
- else
- break unless @scanner.continue
- end
- end
- tk = get_tk
- end
- skip_tkspace(false)
-
- get_tk if TkDO === peek_tk
- end
-
- ##
- # skip the var [in] part of a 'for' statement
-
- def skip_for_variable
- skip_tkspace(false)
- tk = get_tk
- skip_tkspace(false)
- tk = get_tk
- unget_tk(tk) unless TkIN === tk
- end
-
- def skip_method(container)
- meth = RDoc::AnyMethod.new "", "anon"
- parse_method_parameters(meth)
- parse_statements(container, false, meth)
- end
-
- ##
- # Skip spaces
-
- def skip_tkspace(skip_nl = true)
- tokens = []
-
- while TkSPACE === (tk = get_tk) or (skip_nl and TkNL === tk) do
- tokens.push tk
- end
-
- unget_tk(tk)
- tokens
- end
-
- ##
- # Skip spaces until a comment is found
-
- def skip_tkspace_comment(skip_nl = true)
- loop do
- skip_tkspace(skip_nl)
- return unless TkCOMMENT === peek_tk
- get_tk
- end
- end
-
- def unget_tk(tk)
- @tokens.unshift tk
- @unget_read.unshift @read.pop
-
- # Remove this token from any listeners
- @token_listeners.each do |obj|
- obj.pop_token
- end if @token_listeners
- end
-
- def warn(msg)
- return if @options.quiet
- msg = make_message msg
- $stderr.puts msg
- end
-
-end
-
diff --git a/lib/rdoc/parser/simple.rb b/lib/rdoc/parser/simple.rb
deleted file mode 100644
index cdfe686718..0000000000
--- a/lib/rdoc/parser/simple.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-require 'rdoc/parser'
-
-##
-# Parse a non-source file. We basically take the whole thing as one big
-# comment. If the first character in the file is '#', we strip leading pound
-# signs.
-
-class RDoc::Parser::Simple < RDoc::Parser
-
- parse_files_matching(//)
-
- ##
- # Prepare to parse a plain file
-
- def initialize(top_level, file_name, content, options, stats)
- super
-
- preprocess = RDoc::Markup::PreProcess.new @file_name, @options.rdoc_include
-
- preprocess.handle @content do |directive, param|
- warn "Unrecognized directive '#{directive}' in #{@file_name}"
- end
- end
-
- ##
- # Extract the file contents and attach them to the toplevel as a comment
-
- def scan
- @top_level.comment = remove_private_comments(@content)
- @top_level
- end
-
- def remove_private_comments(comment)
- comment.gsub(/^--\n.*?^\+\+/m, '').sub(/^--\n.*/m, '')
- end
-
-end
-
diff --git a/lib/rdoc/parsers/parse_c.rb b/lib/rdoc/parsers/parse_c.rb
new file mode 100644
index 0000000000..7eefa29706
--- /dev/null
+++ b/lib/rdoc/parsers/parse_c.rb
@@ -0,0 +1,773 @@
+# Classes and modules built in to the interpreter. We need
+# these to define superclasses of user objects
+
+require "rdoc/code_objects"
+require "rdoc/parsers/parserfactory"
+require "rdoc/options"
+require "rdoc/rdoc"
+
+module RDoc
+
+ ##
+ # Ruby's built-in classes.
+
+ KNOWN_CLASSES = {
+ "rb_cObject" => "Object",
+ "rb_cArray" => "Array",
+ "rb_cBignum" => "Bignum",
+ "rb_cClass" => "Class",
+ "rb_cDir" => "Dir",
+ "rb_cData" => "Data",
+ "rb_cFalseClass" => "FalseClass",
+ "rb_cFile" => "File",
+ "rb_cFixnum" => "Fixnum",
+ "rb_cFloat" => "Float",
+ "rb_cHash" => "Hash",
+ "rb_cInteger" => "Integer",
+ "rb_cIO" => "IO",
+ "rb_cModule" => "Module",
+ "rb_cNilClass" => "NilClass",
+ "rb_cNumeric" => "Numeric",
+ "rb_cProc" => "Proc",
+ "rb_cRange" => "Range",
+ "rb_cRegexp" => "Regexp",
+ "rb_cString" => "String",
+ "rb_cSymbol" => "Symbol",
+ "rb_cThread" => "Thread",
+ "rb_cTime" => "Time",
+ "rb_cTrueClass" => "TrueClass",
+ "rb_cStruct" => "Struct",
+ "rb_eException" => "Exception",
+ "rb_eStandardError" => "StandardError",
+ "rb_eSystemExit" => "SystemExit",
+ "rb_eInterrupt" => "Interrupt",
+ "rb_eSignal" => "Signal",
+ "rb_eFatal" => "Fatal",
+ "rb_eArgError" => "ArgError",
+ "rb_eEOFError" => "EOFError",
+ "rb_eIndexError" => "IndexError",
+ "rb_eRangeError" => "RangeError",
+ "rb_eIOError" => "IOError",
+ "rb_eRuntimeError" => "RuntimeError",
+ "rb_eSecurityError" => "SecurityError",
+ "rb_eSystemCallError" => "SystemCallError",
+ "rb_eTypeError" => "TypeError",
+ "rb_eZeroDivError" => "ZeroDivError",
+ "rb_eNotImpError" => "NotImpError",
+ "rb_eNoMemError" => "NoMemError",
+ "rb_eFloatDomainError" => "FloatDomainError",
+ "rb_eScriptError" => "ScriptError",
+ "rb_eNameError" => "NameError",
+ "rb_eSyntaxError" => "SyntaxError",
+ "rb_eLoadError" => "LoadError",
+
+ "rb_mKernel" => "Kernel",
+ "rb_mComparable" => "Comparable",
+ "rb_mEnumerable" => "Enumerable",
+ "rb_mPrecision" => "Precision",
+ "rb_mErrno" => "Errno",
+ "rb_mFileTest" => "FileTest",
+ "rb_mGC" => "GC",
+ "rb_mMath" => "Math",
+ "rb_mProcess" => "Process"
+ }
+
+ ##
+ # We attempt to parse C extension files. Basically we look for
+ # the standard patterns that you find in extensions: <tt>rb_define_class,
+ # rb_define_method</tt> and so on. We also try to find the corresponding
+ # C source for the methods and extract comments, but if we fail
+ # we don't worry too much.
+ #
+ # The comments associated with a Ruby method are extracted from the C
+ # comment block associated with the routine that _implements_ that
+ # method, that is to say the method whose name is given in the
+ # <tt>rb_define_method</tt> call. For example, you might write:
+ #
+ # /*
+ # * Returns a new array that is a one-dimensional flattening of this
+ # * array (recursively). That is, for every element that is an array,
+ # * extract its elements into the new array.
+ # *
+ # * s = [ 1, 2, 3 ] #=> [1, 2, 3]
+ # * t = [ 4, 5, 6, [7, 8] ] #=> [4, 5, 6, [7, 8]]
+ # * a = [ s, t, 9, 10 ] #=> [[1, 2, 3], [4, 5, 6, [7, 8]], 9, 10]
+ # * a.flatten #=> [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
+ # */
+ # static VALUE
+ # rb_ary_flatten(ary)
+ # VALUE ary;
+ # {
+ # ary = rb_obj_dup(ary);
+ # rb_ary_flatten_bang(ary);
+ # return ary;
+ # }
+ #
+ # ...
+ #
+ # void
+ # Init_Array()
+ # {
+ # ...
+ # rb_define_method(rb_cArray, "flatten", rb_ary_flatten, 0);
+ #
+ # Here RDoc will determine from the rb_define_method line that there's a
+ # method called "flatten" in class Array, and will look for the implementation
+ # in the method rb_ary_flatten. It will then use the comment from that
+ # method in the HTML output. This method must be in the same source file
+ # as the rb_define_method.
+ #
+ # C classes can be diagrammed (see /tc/dl/ruby/ruby/error.c), and RDoc
+ # integrates C and Ruby source into one tree
+ #
+ # The comment blocks may include special directives:
+ #
+ # [Document-class: <i>name</i>]
+ # This comment block is documentation for the given class. Use this
+ # when the <tt>Init_xxx</tt> method is not named after the class.
+ #
+ # [Document-method: <i>name</i>]
+ # This comment documents the named method. Use when RDoc cannot
+ # automatically find the method from it's declaration
+ #
+ # [call-seq: <i>text up to an empty line</i>]
+ # Because C source doesn't give descriptive names to Ruby-level parameters,
+ # you need to document the calling sequence explicitly
+ #
+ # In addition, RDoc assumes by default that the C method implementing a
+ # Ruby function is in the same source file as the rb_define_method call.
+ # If this isn't the case, add the comment
+ #
+ # rb_define_method(....); // in: filename
+ #
+ # As an example, we might have an extension that defines multiple classes
+ # in its Init_xxx method. We could document them using
+ #
+ #
+ # /*
+ # * Document-class: MyClass
+ # *
+ # * Encapsulate the writing and reading of the configuration
+ # * file. ...
+ # */
+ #
+ # /*
+ # * Document-method: read_value
+ # *
+ # * call-seq:
+ # * cfg.read_value(key) -> value
+ # * cfg.read_value(key} { |key| } -> value
+ # *
+ # * Return the value corresponding to +key+ from the configuration.
+ # * In the second form, if the key isn't found, invoke the
+ # * block and return its value.
+ # */
+ #
+
+ class C_Parser
+
+ attr_accessor :progress
+
+ extend ParserFactory
+ parse_files_matching(/\.(?:([CcHh])\1?|c([+xp])\2|y)\z/)
+
+ @@known_bodies = {}
+
+ # prepare to parse a C file
+ def initialize(top_level, file_name, body, options, stats)
+ @known_classes = KNOWN_CLASSES.dup
+ @body = handle_tab_width(handle_ifdefs_in(body))
+ @options = options
+ @stats = stats
+ @top_level = top_level
+ @classes = Hash.new
+ @file_dir = File.dirname(file_name)
+ @progress = $stderr unless options.quiet
+ end
+
+ # Extract the classes/modules and methods from a C file
+ # and return the corresponding top-level object
+ def scan
+ remove_commented_out_lines
+ do_classes
+ do_constants
+ do_methods
+ do_includes
+ do_aliases
+ @top_level
+ end
+
+ #######
+ private
+ #######
+
+ def progress(char)
+ unless @options.quiet
+ @progress.print(char)
+ @progress.flush
+ end
+ end
+
+ def warn(msg)
+ $stderr.puts
+ $stderr.puts msg
+ $stderr.flush
+ end
+
+ def remove_private_comments(comment)
+ comment.gsub!(/\/?\*--(.*?)\/?\*\+\+/m, '')
+ comment.sub!(/\/?\*--.*/m, '')
+ end
+
+ ##
+ # removes lines that are commented out that might otherwise get picked up
+ # when scanning for classes and methods
+
+ def remove_commented_out_lines
+ @body.gsub!(%r{//.*rb_define_}, '//')
+ end
+
+ def handle_class_module(var_name, class_mod, class_name, parent, in_module)
+ progress(class_mod[0, 1])
+
+ parent_name = @known_classes[parent] || parent
+
+ if in_module
+ enclosure = @classes[in_module]
+ unless enclosure
+ if enclosure = @known_classes[in_module]
+ handle_class_module(in_module, (/^rb_m/ =~ in_module ? "module" : "class"),
+ enclosure, nil, nil)
+ enclosure = @classes[in_module]
+ end
+ end
+ unless enclosure
+ warn("Enclosing class/module '#{in_module}' for " +
+ "#{class_mod} #{class_name} not known")
+ return
+ end
+ else
+ enclosure = @top_level
+ end
+
+ if class_mod == "class"
+ cm = enclosure.add_class(NormalClass, class_name, parent_name)
+ @stats.num_classes += 1
+ else
+ cm = enclosure.add_module(NormalModule, class_name)
+ @stats.num_modules += 1
+ end
+ cm.record_location(enclosure.toplevel)
+
+ find_class_comment(cm.full_name, cm)
+ @classes[var_name] = cm
+ @known_classes[var_name] = cm.full_name
+ end
+
+ ##
+ # Look for class or module documentation above Init_+class_name+(void),
+ # in a Document-class +class_name+ (or module) comment or above an
+ # rb_define_class (or module). If a comment is supplied above a matching
+ # Init_ and a rb_define_class the Init_ comment is used.
+ #
+ # /*
+ # * This is a comment for Foo
+ # */
+ # Init_Foo(void) {
+ # VALUE cFoo = rb_define_class("Foo", rb_cObject);
+ # }
+ #
+ # /*
+ # * Document-class: Foo
+ # * This is a comment for Foo
+ # */
+ # Init_foo(void) {
+ # VALUE cFoo = rb_define_class("Foo", rb_cObject);
+ # }
+ #
+ # /*
+ # * This is a comment for Foo
+ # */
+ # VALUE cFoo = rb_define_class("Foo", rb_cObject);
+
+ def find_class_comment(class_name, class_meth)
+ comment = nil
+ if @body =~ %r{((?>/\*.*?\*/\s+))
+ (static\s+)?void\s+Init_#{class_name}\s*(?:_\(\s*)?\(\s*(?:void\s*)?\)}xmi
+ comment = $1
+ elsif @body =~ %r{Document-(class|module):\s#{class_name}\s*?\n((?>.*?\*/))}m
+ comment = $2
+ else
+ if @body =~ /rb_define_(class|module)/m then
+ class_name = class_name.split("::").last
+ comments = []
+ @body.split(/(\/\*.*?\*\/)\s*?\n/m).each_with_index do |chunk, index|
+ comments[index] = chunk
+ if chunk =~ /rb_define_(class|module).*?"(#{class_name})"/m then
+ comment = comments[index-1]
+ break
+ end
+ end
+ end
+ end
+ class_meth.comment = mangle_comment(comment) if comment
+ end
+
+ ############################################################
+
+ def do_classes
+ @body.scan(/(\w+)\s* = \s*rb_define_module\s*\(\s*"(\w+)"\s*\)/mx) do
+ |var_name, class_name|
+ handle_class_module(var_name, "module", class_name, nil, nil)
+ end
+
+ # The '.' lets us handle SWIG-generated files
+ @body.scan(/([\w\.]+)\s* = \s*rb_define_class\s*
+ \(
+ \s*"(\w+)",
+ \s*(\w+)\s*
+ \)/mx) do
+
+ |var_name, class_name, parent|
+ handle_class_module(var_name, "class", class_name, parent, nil)
+ end
+
+ @body.scan(/(\w+)\s*=\s*boot_defclass\s*\(\s*"(\w+?)",\s*(\w+?)\s*\)/) do
+ |var_name, class_name, parent|
+ parent = nil if parent == "0"
+ handle_class_module(var_name, "class", class_name, parent, nil)
+ end
+
+ @body.scan(/(\w+)\s* = \s*rb_define_module_under\s*
+ \(
+ \s*(\w+),
+ \s*"(\w+)"
+ \s*\)/mx) do
+
+ |var_name, in_module, class_name|
+ handle_class_module(var_name, "module", class_name, nil, in_module)
+ end
+
+ @body.scan(/([\w\.]+)\s* = \s*rb_define_class_under\s*
+ \(
+ \s*(\w+),
+ \s*"(\w+)",
+ \s*(\w+)\s*
+ \s*\)/mx) do
+
+ |var_name, in_module, class_name, parent|
+ handle_class_module(var_name, "class", class_name, parent, in_module)
+ end
+
+ end
+
+ ###########################################################
+
+ def do_constants
+ @body.scan(%r{\Wrb_define_
+ (
+ variable |
+ readonly_variable |
+ const |
+ global_const |
+ )
+ \s*\(
+ (?:\s*(\w+),)?
+ \s*"(\w+)",
+ \s*(.*?)\s*\)\s*;
+ }xm) do
+
+ |type, var_name, const_name, definition|
+ var_name = "rb_cObject" if !var_name or var_name == "rb_mKernel"
+ handle_constants(type, var_name, const_name, definition)
+ end
+ end
+
+ ############################################################
+
+ def do_methods
+
+ @body.scan(%r{rb_define_
+ (
+ singleton_method |
+ method |
+ module_function |
+ private_method
+ )
+ \s*\(\s*([\w\.]+),
+ \s*"([^"]+)",
+ \s*(?:RUBY_METHOD_FUNC\(|VALUEFUNC\()?(\w+)\)?,
+ \s*(-?\w+)\s*\)
+ (?:;\s*/[*/]\s+in\s+(\w+?\.[cy]))?
+ }xm) do
+ |type, var_name, meth_name, meth_body, param_count, source_file|
+ #"
+
+ # Ignore top-object and weird struct.c dynamic stuff
+ next if var_name == "ruby_top_self"
+ next if var_name == "nstr"
+ next if var_name == "envtbl"
+ next if var_name == "argf" # it'd be nice to handle this one
+
+ var_name = "rb_cObject" if var_name == "rb_mKernel"
+ handle_method(type, var_name, meth_name,
+ meth_body, param_count, source_file)
+ end
+
+ @body.scan(%r{rb_define_attr\(
+ \s*([\w\.]+),
+ \s*"([^"]+)",
+ \s*(\d+),
+ \s*(\d+)\s*\);
+ }xm) do #"
+ |var_name, attr_name, attr_reader, attr_writer|
+
+ #var_name = "rb_cObject" if var_name == "rb_mKernel"
+ handle_attr(var_name, attr_name,
+ attr_reader.to_i != 0,
+ attr_writer.to_i != 0)
+ end
+
+ @body.scan(%r{rb_define_global_function\s*\(
+ \s*"([^"]+)",
+ \s*(?:RUBY_METHOD_FUNC\(|VALUEFUNC\()?(\w+)\)?,
+ \s*(-?\w+)\s*\)
+ (?:;\s*/[*/]\s+in\s+(\w+?\.[cy]))?
+ }xm) do #"
+ |meth_name, meth_body, param_count, source_file|
+ handle_method("method", "rb_mKernel", meth_name,
+ meth_body, param_count, source_file)
+ end
+
+ @body.scan(/define_filetest_function\s*\(
+ \s*"([^"]+)",
+ \s*(?:RUBY_METHOD_FUNC\(|VALUEFUNC\()?(\w+)\)?,
+ \s*(-?\w+)\s*\)/xm) do #"
+ |meth_name, meth_body, param_count|
+
+ handle_method("method", "rb_mFileTest", meth_name, meth_body, param_count)
+ handle_method("singleton_method", "rb_cFile", meth_name, meth_body, param_count)
+ end
+ end
+
+ ############################################################
+
+ def do_aliases
+ @body.scan(%r{rb_define_alias\s*\(\s*(\w+),\s*"([^"]+)",\s*"([^"]+)"\s*\)}m) do
+ |var_name, new_name, old_name|
+ @stats.num_methods += 1
+ class_name = @known_classes[var_name] || var_name
+ class_obj = find_class(var_name, class_name)
+
+ class_obj.add_alias(Alias.new("", old_name, new_name, ""))
+ end
+ end
+
+ ##
+ # Adds constant comments. By providing some_value: at the start ofthe
+ # comment you can override the C value of the comment to give a friendly
+ # definition.
+ #
+ # /* 300: The perfect score in bowling */
+ # rb_define_const(cFoo, "PERFECT", INT2FIX(300);
+ #
+ # Will override +INT2FIX(300)+ with the value +300+ in the output RDoc.
+ # Values may include quotes and escaped colons (\:).
+
+ def handle_constants(type, var_name, const_name, definition)
+ #@stats.num_constants += 1
+ class_name = @known_classes[var_name]
+
+ return unless class_name
+
+ class_obj = find_class(var_name, class_name)
+
+ unless class_obj
+ warn("Enclosing class/module '#{const_name}' for not known")
+ return
+ end
+
+ comment = find_const_comment(type, const_name)
+
+ # In the case of rb_define_const, the definition and comment are in
+ # "/* definition: comment */" form. The literal ':' and '\' characters
+ # can be escaped with a backslash.
+ if type.downcase == 'const' then
+ elements = mangle_comment(comment).split(':')
+ if elements.nil? or elements.empty? then
+ con = Constant.new(const_name, definition, mangle_comment(comment))
+ else
+ new_definition = elements[0..-2].join(':')
+ if new_definition.empty? then # Default to literal C definition
+ new_definition = definition
+ else
+ new_definition.gsub!("\:", ":")
+ new_definition.gsub!("\\", '\\')
+ end
+ new_definition.sub!(/\A(\s+)/, '')
+ new_comment = $1.nil? ? elements.last : "#{$1}#{elements.last.lstrip}"
+ con = Constant.new(const_name, new_definition,
+ mangle_comment(new_comment))
+ end
+ else
+ con = Constant.new(const_name, definition, mangle_comment(comment))
+ end
+
+ class_obj.add_constant(con)
+ end
+
+ ##
+ # Finds a comment matching +type+ and +const_name+ either above the
+ # comment or in the matching Document- section.
+
+ def find_const_comment(type, const_name)
+ if @body =~ %r{((?>^\s*/\*.*?\*/\s+))
+ rb_define_#{type}\((?:\s*(\w+),)?\s*"#{const_name}"\s*,.*?\)\s*;}xmi
+ $1
+ elsif @body =~ %r{Document-(?:const|global|variable):\s#{const_name}\s*?\n((?>.*?\*/))}m
+ $1
+ else
+ ''
+ end
+ end
+
+ ###########################################################
+
+ def handle_attr(var_name, attr_name, reader, writer)
+ rw = ''
+ if reader
+ #@stats.num_methods += 1
+ rw << 'R'
+ end
+ if writer
+ #@stats.num_methods += 1
+ rw << 'W'
+ end
+
+ class_name = @known_classes[var_name]
+
+ return unless class_name
+
+ class_obj = find_class(var_name, class_name)
+
+ if class_obj
+ comment = find_attr_comment(attr_name)
+ unless comment.empty?
+ comment = mangle_comment(comment)
+ end
+ att = Attr.new('', attr_name, rw, comment)
+ class_obj.add_attribute(att)
+ end
+
+ end
+
+ ###########################################################
+
+ def find_attr_comment(attr_name)
+ if @body =~ %r{((?>/\*.*?\*/\s+))
+ rb_define_attr\((?:\s*(\w+),)?\s*"#{attr_name}"\s*,.*?\)\s*;}xmi
+ $1
+ elsif @body =~ %r{Document-attr:\s#{attr_name}\s*?\n((?>.*?\*/))}m
+ $1
+ else
+ ''
+ end
+ end
+
+ ###########################################################
+
+ def handle_method(type, var_name, meth_name,
+ meth_body, param_count, source_file = nil)
+ progress(".")
+
+ @stats.num_methods += 1
+ class_name = @known_classes[var_name]
+
+ return unless class_name
+
+ class_obj = find_class(var_name, class_name)
+
+ if class_obj
+ if meth_name == "initialize"
+ meth_name = "new"
+ type = "singleton_method"
+ end
+ meth_obj = AnyMethod.new("", meth_name)
+ meth_obj.singleton =
+ %w{singleton_method module_function}.include?(type)
+
+ p_count = (Integer(param_count) rescue -1)
+
+ if p_count < 0
+ meth_obj.params = "(...)"
+ elsif p_count == 0
+ meth_obj.params = "()"
+ else
+ meth_obj.params = "(" +
+ (1..p_count).map{|i| "p#{i}"}.join(", ") +
+ ")"
+ end
+
+ if source_file
+ file_name = File.join(@file_dir, source_file)
+ body = (@@known_bodies[source_file] ||= File.read(file_name))
+ else
+ body = @body
+ end
+ if find_body(meth_body, meth_obj, body) and meth_obj.document_self
+ class_obj.add_method(meth_obj)
+ end
+ end
+ end
+
+ ############################################################
+
+ # Find the C code corresponding to a Ruby method
+ def find_body(meth_name, meth_obj, body, quiet = false)
+ case body
+ when %r{((?>/\*.*?\*/\s*))(?:static\s+)?VALUE\s+#{meth_name}
+ \s*(\(.*?\)).*?^}xm
+ comment, params = $1, $2
+ body_text = $&
+
+ remove_private_comments(comment) if comment
+
+ # see if we can find the whole body
+
+ re = Regexp.escape(body_text) + '[^(]*^\{.*?^\}'
+ if Regexp.new(re, Regexp::MULTILINE).match(body)
+ body_text = $&
+ end
+
+ # The comment block may have been overridden with a
+ # 'Document-method' block. This happens in the interpreter
+ # when multiple methods are vectored through to the same
+ # C method but those methods are logically distinct (for
+ # example Kernel.hash and Kernel.object_id share the same
+ # implementation
+
+ override_comment = find_override_comment(meth_obj.name)
+ comment = override_comment if override_comment
+
+ find_modifiers(comment, meth_obj) if comment
+
+# meth_obj.params = params
+ meth_obj.start_collecting_tokens
+ meth_obj.add_token(RubyToken::Token.new(1,1).set_text(body_text))
+ meth_obj.comment = mangle_comment(comment)
+ when %r{((?>/\*.*?\*/\s*))^\s*\#\s*define\s+#{meth_name}\s+(\w+)}m
+ comment = $1
+ find_body($2, meth_obj, body, true)
+ find_modifiers(comment, meth_obj)
+ meth_obj.comment = mangle_comment(comment) + meth_obj.comment
+ when %r{^\s*\#\s*define\s+#{meth_name}\s+(\w+)}m
+ unless find_body($1, meth_obj, body, true)
+ warn "No definition for #{meth_name}" unless quiet
+ return false
+ end
+ else
+
+ # No body, but might still have an override comment
+ comment = find_override_comment(meth_obj.name)
+
+ if comment
+ find_modifiers(comment, meth_obj)
+ meth_obj.comment = mangle_comment(comment)
+ else
+ warn "No definition for #{meth_name}" unless quiet
+ return false
+ end
+ end
+ true
+ end
+
+
+ ##
+ # If the comment block contains a section that looks like:
+ #
+ # call-seq:
+ # Array.new
+ # Array.new(10)
+ #
+ # use it for the parameters.
+
+ def find_modifiers(comment, meth_obj)
+ if comment.sub!(/:nodoc:\s*^\s*\*?\s*$/m, '') or
+ comment.sub!(/\A\/\*\s*:nodoc:\s*\*\/\Z/, '')
+ meth_obj.document_self = false
+ end
+ if comment.sub!(/call-seq:(.*?)^\s*\*?\s*$/m, '') or
+ comment.sub!(/\A\/\*\s*call-seq:(.*?)\*\/\Z/, '')
+ seq = $1
+ seq.gsub!(/^\s*\*\s*/, '')
+ meth_obj.call_seq = seq
+ end
+ end
+
+ ############################################################
+
+ def find_override_comment(meth_name)
+ name = Regexp.escape(meth_name)
+ if @body =~ %r{Document-method:\s#{name}\s*?\n((?>.*?\*/))}m
+ $1
+ end
+ end
+
+ ##
+ # Look for includes of the form:
+ #
+ # rb_include_module(rb_cArray, rb_mEnumerable);
+
+ def do_includes
+ @body.scan(/rb_include_module\s*\(\s*(\w+?),\s*(\w+?)\s*\)/) do |c,m|
+ if cls = @classes[c]
+ m = @known_classes[m] || m
+ cls.add_include(Include.new(m, ""))
+ end
+ end
+ end
+
+ ##
+ # Remove the /*'s and leading asterisks from C comments
+
+ def mangle_comment(comment)
+ comment.sub!(%r{/\*+}) { " " * $&.length }
+ comment.sub!(%r{\*+/}) { " " * $&.length }
+ comment.gsub!(/^[ \t]*\*/m) { " " * $&.length }
+ comment
+ end
+
+ def find_class(raw_name, name)
+ unless @classes[raw_name]
+ if raw_name =~ /^rb_m/
+ @classes[raw_name] = @top_level.add_module(NormalModule, name)
+ else
+ @classes[raw_name] = @top_level.add_class(NormalClass, name, nil)
+ end
+ end
+ @classes[raw_name]
+ end
+
+ def handle_tab_width(body)
+ if /\t/ =~ body
+ tab_width = Options.instance.tab_width
+ body.split(/\n/).map do |line|
+ 1 while line.gsub!(/\t+/) { ' ' * (tab_width*$&.length - $`.length % tab_width)} && $~ #`
+ line
+ end .join("\n")
+ else
+ body
+ end
+ end
+
+ ##
+ # Removes #ifdefs that would otherwise confuse us
+
+ def handle_ifdefs_in(body)
+ body.gsub(/^#ifdef HAVE_PROTOTYPES.*?#else.*?\n(.*?)#endif.*?\n/m) { $1 }
+ end
+
+ end
+
+end
+
diff --git a/lib/rdoc/parsers/parse_f95.rb b/lib/rdoc/parsers/parse_f95.rb
new file mode 100644
index 0000000000..f1a1ae4d4b
--- /dev/null
+++ b/lib/rdoc/parsers/parse_f95.rb
@@ -0,0 +1,1841 @@
+#= parse_f95.rb - Fortran95 Parser
+#
+#== Overview
+#
+#"parse_f95.rb" parses Fortran95 files with suffixes "f90", "F90", "f95"
+#and "F95". Fortran95 files are expected to be conformed to Fortran95
+#standards.
+#
+#== Rules
+#
+#Fundamental rules are same as that of the Ruby parser.
+#But comment markers are '!' not '#'.
+#
+#=== Correspondence between RDoc documentation and Fortran95 programs
+#
+#"parse_f95.rb" parses main programs, modules, subroutines, functions,
+#derived-types, public variables, public constants,
+#defined operators and defined assignments.
+#These components are described in items of RDoc documentation, as follows.
+#
+#Files :: Files (same as Ruby)
+#Classes :: Modules
+#Methods :: Subroutines, functions, variables, constants, derived-types, defined operators, defined assignments
+#Required files :: Files in which imported modules, external subroutines and external functions are defined.
+#Included Modules :: List of imported modules
+#Attributes :: List of derived-types, List of imported modules all of whose components are published again
+#
+#Components listed in 'Methods' (subroutines, functions, ...)
+#defined in modules are described in the item of 'Classes'.
+#On the other hand, components defined in main programs or
+#as external procedures are described in the item of 'Files'.
+#
+#=== Components parsed by default
+#
+#By default, documentation on public components (subroutines, functions,
+#variables, constants, derived-types, defined operators,
+#defined assignments) are generated.
+#With "--all" option, documentation on all components
+#are generated (almost same as the Ruby parser).
+#
+#=== Information parsed automatically
+#
+#The following information is automatically parsed.
+#
+#* Types of arguments
+#* Types of variables and constants
+#* Types of variables in the derived types, and initial values
+#* NAMELISTs and types of variables in them, and initial values
+#
+#Aliases by interface statement are described in the item of 'Methods'.
+#
+#Components which are imported from other modules and published again
+#are described in the item of 'Methods'.
+#
+#=== Format of comment blocks
+#
+#Comment blocks should be written as follows.
+#Comment blocks are considered to be ended when the line without '!'
+#appears.
+#The indentation is not necessary.
+#
+# ! (Top of file)
+# !
+# ! Comment blocks for the files.
+# !
+# !--
+# ! The comment described in the part enclosed by
+# ! "!--" and "!++" is ignored.
+# !++
+# !
+# module hogehoge
+# !
+# ! Comment blocks for the modules (or the programs).
+# !
+#
+# private
+#
+# logical :: a ! a private variable
+# real, public :: b ! a public variable
+# integer, parameter :: c = 0 ! a public constant
+#
+# public :: c
+# public :: MULTI_ARRAY
+# public :: hoge, foo
+#
+# type MULTI_ARRAY
+# !
+# ! Comment blocks for the derived-types.
+# !
+# real, pointer :: var(:) =>null() ! Comments block for the variables.
+# integer :: num = 0
+# end type MULTI_ARRAY
+#
+# contains
+#
+# subroutine hoge( in, & ! Comment blocks between continuation lines are ignored.
+# & out )
+# !
+# ! Comment blocks for the subroutines or functions
+# !
+# character(*),intent(in):: in ! Comment blocks for the arguments.
+# character(*),intent(out),allocatable,target :: in
+# ! Comment blocks can be
+# ! written under Fortran statements.
+#
+# character(32) :: file ! This comment parsed as a variable in below NAMELIST.
+# integer :: id
+#
+# namelist /varinfo_nml/ file, id
+# !
+# ! Comment blocks for the NAMELISTs.
+# ! Information about variables are described above.
+# !
+#
+# ....
+#
+# end subroutine hoge
+#
+# integer function foo( in )
+# !
+# ! This part is considered as comment block.
+#
+# ! Comment blocks under blank lines are ignored.
+# !
+# integer, intent(in):: inA ! This part is considered as comment block.
+#
+# ! This part is ignored.
+#
+# end function foo
+#
+# subroutine hide( in, &
+# & out ) !:nodoc:
+# !
+# ! If "!:nodoc:" is described at end-of-line in subroutine
+# ! statement as above, the subroutine is ignored.
+# ! This assignment can be used to modules, subroutines,
+# ! functions, variables, constants, derived-types,
+# ! defined operators, defined assignments,
+# ! list of imported modules ("use" statement).
+# !
+#
+# ....
+#
+# end subroutine hide
+#
+# end module hogehoge
+#
+
+
+require "rdoc/code_objects"
+
+module RDoc
+
+ class Token
+
+ NO_TEXT = "??".freeze
+
+ def initialize(line_no, char_no)
+ @line_no = line_no
+ @char_no = char_no
+ @text = NO_TEXT
+ end
+ # Because we're used in contexts that expect to return a token,
+ # we set the text string and then return ourselves
+ def set_text(text)
+ @text = text
+ self
+ end
+
+ attr_reader :line_no, :char_no, :text
+
+ end
+
+ # See rdoc/parsers/parse_f95.rb
+
+ class Fortran95parser
+
+ extend ParserFactory
+ parse_files_matching(/\.((f|F)9(0|5)|F)$/)
+
+ @@external_aliases = []
+ @@public_methods = []
+
+ # "false":: Comments are below source code
+ # "true" :: Comments are upper source code
+ COMMENTS_ARE_UPPER = false
+
+ # Internal alias message
+ INTERNAL_ALIAS_MES = "Alias for"
+
+ # External alias message
+ EXTERNAL_ALIAS_MES = "The entity is"
+
+ # prepare to parse a Fortran 95 file
+ def initialize(top_level, file_name, body, options, stats)
+ @body = body
+ @stats = stats
+ @file_name = file_name
+ @options = options
+ @top_level = top_level
+ @progress = $stderr unless options.quiet
+ end
+
+ # define code constructs
+ def scan
+
+ # remove private comment
+ remaining_code = remove_private_comments(@body)
+
+ # continuation lines are united to one line
+ remaining_code = united_to_one_line(remaining_code)
+
+ # semicolons are replaced to line feed
+ remaining_code = semicolon_to_linefeed(remaining_code)
+
+ # collect comment for file entity
+ whole_comment, remaining_code = collect_first_comment(remaining_code)
+ @top_level.comment = whole_comment
+
+ # String "remaining_code" is converted to Array "remaining_lines"
+ remaining_lines = remaining_code.split("\n")
+
+ # "module" or "program" parts are parsed (new)
+ #
+ level_depth = 0
+ block_searching_flag = nil
+ block_searching_lines = []
+ pre_comment = []
+ module_program_trailing = ""
+ module_program_name = ""
+ other_block_level_depth = 0
+ other_block_searching_flag = nil
+ remaining_lines.collect!{|line|
+ if !block_searching_flag && !other_block_searching_flag
+ if line =~ /^\s*?module\s+(\w+)\s*?(!.*?)?$/i
+ block_searching_flag = :module
+ block_searching_lines << line
+ module_program_name = $1
+ module_program_trailing = find_comments($2)
+ next false
+ elsif line =~ /^\s*?program\s+(\w+)\s*?(!.*?)?$/i ||
+ line =~ /^\s*?\w/ && !block_start?(line)
+ block_searching_flag = :program
+ block_searching_lines << line
+ module_program_name = $1 || ""
+ module_program_trailing = find_comments($2)
+ next false
+
+ elsif block_start?(line)
+ other_block_searching_flag = true
+ next line
+
+ elsif line =~ /^\s*?!\s?(.*)/
+ pre_comment << line
+ next line
+ else
+ pre_comment = []
+ next line
+ end
+ elsif other_block_searching_flag
+ other_block_level_depth += 1 if block_start?(line)
+ other_block_level_depth -= 1 if block_end?(line)
+ if other_block_level_depth < 0
+ other_block_level_depth = 0
+ other_block_searching_flag = nil
+ end
+ next line
+ end
+
+ block_searching_lines << line
+ level_depth += 1 if block_start?(line)
+ level_depth -= 1 if block_end?(line)
+ if level_depth >= 0
+ next false
+ end
+
+ # "module_program_code" is formatted.
+ # ":nodoc:" flag is checked.
+ #
+ module_program_code = block_searching_lines.join("\n")
+ module_program_code = remove_empty_head_lines(module_program_code)
+ if module_program_trailing =~ /^:nodoc:/
+ # next loop to search next block
+ level_depth = 0
+ block_searching_flag = false
+ block_searching_lines = []
+ pre_comment = []
+ next false
+ end
+
+ # NormalClass is created, and added to @top_level
+ #
+ if block_searching_flag == :module
+ module_name = module_program_name
+ module_code = module_program_code
+ module_trailing = module_program_trailing
+ progress "m"
+ @stats.num_modules += 1
+ f9x_module = @top_level.add_module NormalClass, module_name
+ f9x_module.record_location @top_level
+
+ f9x_comment = COMMENTS_ARE_UPPER ?
+ find_comments(pre_comment.join("\n")) + "\n" + module_trailing :
+ module_trailing + "\n" + find_comments(module_code.sub(/^.*$\n/i, ''))
+ f9x_module.comment = f9x_comment
+ parse_program_or_module(f9x_module, module_code)
+
+ TopLevel.all_files.each do |name, toplevel|
+ if toplevel.include_includes?(module_name, @options.ignore_case)
+ if !toplevel.include_requires?(@file_name, @options.ignore_case)
+ toplevel.add_require(Require.new(@file_name, ""))
+ end
+ end
+ toplevel.each_classmodule{|m|
+ if m.include_includes?(module_name, @options.ignore_case)
+ if !m.include_requires?(@file_name, @options.ignore_case)
+ m.add_require(Require.new(@file_name, ""))
+ end
+ end
+ }
+ end
+ elsif block_searching_flag == :program
+ program_name = module_program_name
+ program_code = module_program_code
+ program_trailing = module_program_trailing
+ progress "p"
+ program_comment = COMMENTS_ARE_UPPER ?
+ find_comments(pre_comment.join("\n")) + "\n" + program_trailing :
+ program_trailing + "\n" + find_comments(program_code.sub(/^.*$\n/i, ''))
+ program_comment = "\n\n= <i>Program</i> <tt>#{program_name}</tt>\n\n" \
+ + program_comment
+ @top_level.comment << program_comment
+ parse_program_or_module(@top_level, program_code, :private)
+ end
+
+ # next loop to search next block
+ level_depth = 0
+ block_searching_flag = false
+ block_searching_lines = []
+ pre_comment = []
+ next false
+ }
+
+ remaining_lines.delete_if{ |line|
+ line == false
+ }
+
+ # External subprograms and functions are parsed
+ #
+ parse_program_or_module(@top_level, remaining_lines.join("\n"),
+ :public, true)
+
+ @top_level
+ end # End of scan
+
+ private
+
+ def parse_program_or_module(container, code,
+ visibility=:public, external=nil)
+ return unless container
+ return unless code
+ remaining_lines = code.split("\n")
+ remaining_code = "#{code}"
+
+ #
+ # Parse variables before "contains" in module
+ #
+ level_depth = 0
+ before_contains_lines = []
+ before_contains_code = nil
+ before_contains_flag = nil
+ remaining_lines.each{ |line|
+ if !before_contains_flag
+ if line =~ /^\s*?module\s+\w+\s*?(!.*?)?$/i
+ before_contains_flag = true
+ end
+ else
+ break if line =~ /^\s*?contains\s*?(!.*?)?$/i
+ level_depth += 1 if block_start?(line)
+ level_depth -= 1 if block_end?(line)
+ break if level_depth < 0
+ before_contains_lines << line
+ end
+ }
+ before_contains_code = before_contains_lines.join("\n")
+ if before_contains_code
+ before_contains_code.gsub!(/^\s*?interface\s+.*?\s+end\s+interface.*?$/im, "")
+ before_contains_code.gsub!(/^\s*?type[\s\,]+.*?\s+end\s+type.*?$/im, "")
+ end
+
+ #
+ # Parse global "use"
+ #
+ use_check_code = "#{before_contains_code}"
+ cascaded_modules_list = []
+ while use_check_code =~ /^\s*?use\s+(\w+)(.*?)(!.*?)?$/i
+ use_check_code = $~.pre_match
+ use_check_code << $~.post_match
+ used_mod_name = $1.strip.chomp
+ used_list = $2 || ""
+ used_trailing = $3 || ""
+ next if used_trailing =~ /!:nodoc:/
+ if !container.include_includes?(used_mod_name, @options.ignore_case)
+ progress "."
+ container.add_include Include.new(used_mod_name, "")
+ end
+ if ! (used_list =~ /\,\s*?only\s*?:/i )
+ cascaded_modules_list << "\#" + used_mod_name
+ end
+ end
+
+ #
+ # Parse public and private, and store information.
+ # This information is used when "add_method" and
+ # "set_visibility_for" are called.
+ #
+ visibility_default, visibility_info =
+ parse_visibility(remaining_lines.join("\n"), visibility, container)
+ @@public_methods.concat visibility_info
+ if visibility_default == :public
+ if !cascaded_modules_list.empty?
+ cascaded_modules =
+ Attr.new("Cascaded Modules",
+ "Imported modules all of whose components are published again",
+ "",
+ cascaded_modules_list.join(", "))
+ container.add_attribute(cascaded_modules)
+ end
+ end
+
+ #
+ # Check rename elements
+ #
+ use_check_code = "#{before_contains_code}"
+ while use_check_code =~ /^\s*?use\s+(\w+)\s*?\,(.+)$/i
+ use_check_code = $~.pre_match
+ use_check_code << $~.post_match
+ used_mod_name = $1.strip.chomp
+ used_elements = $2.sub(/\s*?only\s*?:\s*?/i, '')
+ used_elements.split(",").each{ |used|
+ if /\s*?(\w+)\s*?=>\s*?(\w+)\s*?/ =~ used
+ local = $1
+ org = $2
+ @@public_methods.collect!{ |pub_meth|
+ if local == pub_meth["name"] ||
+ local.upcase == pub_meth["name"].upcase &&
+ @options.ignore_case
+ pub_meth["name"] = org
+ pub_meth["local_name"] = local
+ end
+ pub_meth
+ }
+ end
+ }
+ end
+
+ #
+ # Parse private "use"
+ #
+ use_check_code = remaining_lines.join("\n")
+ while use_check_code =~ /^\s*?use\s+(\w+)(.*?)(!.*?)?$/i
+ use_check_code = $~.pre_match
+ use_check_code << $~.post_match
+ used_mod_name = $1.strip.chomp
+ used_trailing = $3 || ""
+ next if used_trailing =~ /!:nodoc:/
+ if !container.include_includes?(used_mod_name, @options.ignore_case)
+ progress "."
+ container.add_include Include.new(used_mod_name, "")
+ end
+ end
+
+ container.each_includes{ |inc|
+ TopLevel.all_files.each do |name, toplevel|
+ indicated_mod = toplevel.find_symbol(inc.name,
+ nil, @options.ignore_case)
+ if indicated_mod
+ indicated_name = indicated_mod.parent.file_relative_name
+ if !container.include_requires?(indicated_name, @options.ignore_case)
+ container.add_require(Require.new(indicated_name, ""))
+ end
+ break
+ end
+ end
+ }
+
+ #
+ # Parse derived-types definitions
+ #
+ derived_types_comment = ""
+ remaining_code = remaining_lines.join("\n")
+ while remaining_code =~ /^\s*?
+ type[\s\,]+(public|private)?\s*?(::)?\s*?
+ (\w+)\s*?(!.*?)?$
+ (.*?)
+ ^\s*?end\s+type.*?$
+ /imx
+ remaining_code = $~.pre_match
+ remaining_code << $~.post_match
+ typename = $3.chomp.strip
+ type_elements = $5 || ""
+ type_code = remove_empty_head_lines($&)
+ type_trailing = find_comments($4)
+ next if type_trailing =~ /^:nodoc:/
+ type_visibility = $1
+ type_comment = COMMENTS_ARE_UPPER ?
+ find_comments($~.pre_match) + "\n" + type_trailing :
+ type_trailing + "\n" + find_comments(type_code.sub(/^.*$\n/i, ''))
+ type_element_visibility_public = true
+ type_code.split("\n").each{ |line|
+ if /^\s*?private\s*?$/ =~ line
+ type_element_visibility_public = nil
+ break
+ end
+ } if type_code
+
+ args_comment = ""
+ type_args_info = nil
+
+ if @options.show_all
+ args_comment = find_arguments(nil, type_code, true)
+ else
+ type_public_args_list = []
+ type_args_info = definition_info(type_code)
+ type_args_info.each{ |arg|
+ arg_is_public = type_element_visibility_public
+ arg_is_public = true if arg.include_attr?("public")
+ arg_is_public = nil if arg.include_attr?("private")
+ type_public_args_list << arg.varname if arg_is_public
+ }
+ args_comment = find_arguments(type_public_args_list, type_code)
+ end
+
+ type = AnyMethod.new("type #{typename}", typename)
+ type.singleton = false
+ type.params = ""
+ type.comment = "<b><em> Derived Type </em></b> :: <tt></tt>\n"
+ type.comment << args_comment if args_comment
+ type.comment << type_comment if type_comment
+ progress "t"
+ @stats.num_methods += 1
+ container.add_method type
+
+ set_visibility(container, typename, visibility_default, @@public_methods)
+
+ if type_visibility
+ type_visibility.gsub!(/\s/,'')
+ type_visibility.gsub!(/\,/,'')
+ type_visibility.gsub!(/:/,'')
+ type_visibility.downcase!
+ if type_visibility == "public"
+ container.set_visibility_for([typename], :public)
+ elsif type_visibility == "private"
+ container.set_visibility_for([typename], :private)
+ end
+ end
+
+ check_public_methods(type, container.name)
+
+ if @options.show_all
+ derived_types_comment << ", " unless derived_types_comment.empty?
+ derived_types_comment << typename
+ else
+ if type.visibility == :public
+ derived_types_comment << ", " unless derived_types_comment.empty?
+ derived_types_comment << typename
+ end
+ end
+
+ end
+
+ if !derived_types_comment.empty?
+ derived_types_table =
+ Attr.new("Derived Types", "Derived_Types", "",
+ derived_types_comment)
+ container.add_attribute(derived_types_table)
+ end
+
+ #
+ # move interface scope
+ #
+ interface_code = ""
+ while remaining_code =~ /^\s*?
+ interface(
+ \s+\w+ |
+ \s+operator\s*?\(.*?\) |
+ \s+assignment\s*?\(\s*?=\s*?\)
+ )?\s*?$
+ (.*?)
+ ^\s*?end\s+interface.*?$
+ /imx
+ interface_code << remove_empty_head_lines($&) + "\n"
+ remaining_code = $~.pre_match
+ remaining_code << $~.post_match
+ end
+
+ #
+ # Parse global constants or variables in modules
+ #
+ const_var_defs = definition_info(before_contains_code)
+ const_var_defs.each{|defitem|
+ next if defitem.nodoc
+ const_or_var_type = "Variable"
+ const_or_var_progress = "v"
+ if defitem.include_attr?("parameter")
+ const_or_var_type = "Constant"
+ const_or_var_progress = "c"
+ end
+ const_or_var = AnyMethod.new(const_or_var_type, defitem.varname)
+ const_or_var.singleton = false
+ const_or_var.params = ""
+ self_comment = find_arguments([defitem.varname], before_contains_code)
+ const_or_var.comment = "<b><em>" + const_or_var_type + "</em></b> :: <tt></tt>\n"
+ const_or_var.comment << self_comment if self_comment
+ progress const_or_var_progress
+ @stats.num_methods += 1
+ container.add_method const_or_var
+
+ set_visibility(container, defitem.varname, visibility_default, @@public_methods)
+
+ if defitem.include_attr?("public")
+ container.set_visibility_for([defitem.varname], :public)
+ elsif defitem.include_attr?("private")
+ container.set_visibility_for([defitem.varname], :private)
+ end
+
+ check_public_methods(const_or_var, container.name)
+
+ } if const_var_defs
+
+ remaining_lines = remaining_code.split("\n")
+
+ # "subroutine" or "function" parts are parsed (new)
+ #
+ level_depth = 0
+ block_searching_flag = nil
+ block_searching_lines = []
+ pre_comment = []
+ procedure_trailing = ""
+ procedure_name = ""
+ procedure_params = ""
+ procedure_prefix = ""
+ procedure_result_arg = ""
+ procedure_type = ""
+ contains_lines = []
+ contains_flag = nil
+ remaining_lines.collect!{|line|
+ if !block_searching_flag
+ # subroutine
+ if line =~ /^\s*?
+ (recursive|pure|elemental)?\s*?
+ subroutine\s+(\w+)\s*?(\(.*?\))?\s*?(!.*?)?$
+ /ix
+ block_searching_flag = :subroutine
+ block_searching_lines << line
+
+ procedure_name = $2.chomp.strip
+ procedure_params = $3 || ""
+ procedure_prefix = $1 || ""
+ procedure_trailing = $4 || "!"
+ next false
+
+ # function
+ elsif line =~ /^\s*?
+ (recursive|pure|elemental)?\s*?
+ (
+ character\s*?(\([\w\s\=\(\)\*]+?\))?\s+
+ | type\s*?\([\w\s]+?\)\s+
+ | integer\s*?(\([\w\s\=\(\)\*]+?\))?\s+
+ | real\s*?(\([\w\s\=\(\)\*]+?\))?\s+
+ | double\s+precision\s+
+ | logical\s*?(\([\w\s\=\(\)\*]+?\))?\s+
+ | complex\s*?(\([\w\s\=\(\)\*]+?\))?\s+
+ )?
+ function\s+(\w+)\s*?
+ (\(.*?\))?(\s+result\((.*?)\))?\s*?(!.*?)?$
+ /ix
+ block_searching_flag = :function
+ block_searching_lines << line
+
+ procedure_prefix = $1 || ""
+ procedure_type = $2 ? $2.chomp.strip : nil
+ procedure_name = $8.chomp.strip
+ procedure_params = $9 || ""
+ procedure_result_arg = $11 ? $11.chomp.strip : procedure_name
+ procedure_trailing = $12 || "!"
+ next false
+ elsif line =~ /^\s*?!\s?(.*)/
+ pre_comment << line
+ next line
+ else
+ pre_comment = []
+ next line
+ end
+ end
+ contains_flag = true if line =~ /^\s*?contains\s*?(!.*?)?$/
+ block_searching_lines << line
+ contains_lines << line if contains_flag
+
+ level_depth += 1 if block_start?(line)
+ level_depth -= 1 if block_end?(line)
+ if level_depth >= 0
+ next false
+ end
+
+ # "procedure_code" is formatted.
+ # ":nodoc:" flag is checked.
+ #
+ procedure_code = block_searching_lines.join("\n")
+ procedure_code = remove_empty_head_lines(procedure_code)
+ if procedure_trailing =~ /^!:nodoc:/
+ # next loop to search next block
+ level_depth = 0
+ block_searching_flag = nil
+ block_searching_lines = []
+ pre_comment = []
+ procedure_trailing = ""
+ procedure_name = ""
+ procedure_params = ""
+ procedure_prefix = ""
+ procedure_result_arg = ""
+ procedure_type = ""
+ contains_lines = []
+ contains_flag = nil
+ next false
+ end
+
+ # AnyMethod is created, and added to container
+ #
+ subroutine_function = nil
+ if block_searching_flag == :subroutine
+ subroutine_prefix = procedure_prefix
+ subroutine_name = procedure_name
+ subroutine_params = procedure_params
+ subroutine_trailing = procedure_trailing
+ subroutine_code = procedure_code
+
+ subroutine_comment = COMMENTS_ARE_UPPER ?
+ pre_comment.join("\n") + "\n" + subroutine_trailing :
+ subroutine_trailing + "\n" + subroutine_code.sub(/^.*$\n/i, '')
+ subroutine = AnyMethod.new("subroutine", subroutine_name)
+ parse_subprogram(subroutine, subroutine_params,
+ subroutine_comment, subroutine_code,
+ before_contains_code, nil, subroutine_prefix)
+ progress "s"
+ @stats.num_methods += 1
+ container.add_method subroutine
+ subroutine_function = subroutine
+
+ elsif block_searching_flag == :function
+ function_prefix = procedure_prefix
+ function_type = procedure_type
+ function_name = procedure_name
+ function_params_org = procedure_params
+ function_result_arg = procedure_result_arg
+ function_trailing = procedure_trailing
+ function_code_org = procedure_code
+
+ function_comment = COMMENTS_ARE_UPPER ?
+ pre_comment.join("\n") + "\n" + function_trailing :
+ function_trailing + "\n " + function_code_org.sub(/^.*$\n/i, '')
+
+ function_code = "#{function_code_org}"
+ if function_type
+ function_code << "\n" + function_type + " :: " + function_result_arg
+ end
+
+ function_params =
+ function_params_org.sub(/^\(/, "\(#{function_result_arg}, ")
+
+ function = AnyMethod.new("function", function_name)
+ parse_subprogram(function, function_params,
+ function_comment, function_code,
+ before_contains_code, true, function_prefix)
+
+ # Specific modification due to function
+ function.params.sub!(/\(\s*?#{function_result_arg}\s*?,\s*?/, "\( ")
+ function.params << " result(" + function_result_arg + ")"
+ function.start_collecting_tokens
+ function.add_token Token.new(1,1).set_text(function_code_org)
+
+ progress "f"
+ @stats.num_methods += 1
+ container.add_method function
+ subroutine_function = function
+
+ end
+
+ # The visibility of procedure is specified
+ #
+ set_visibility(container, procedure_name,
+ visibility_default, @@public_methods)
+
+ # The alias for this procedure from external modules
+ #
+ check_external_aliases(procedure_name,
+ subroutine_function.params,
+ subroutine_function.comment, subroutine_function) if external
+ check_public_methods(subroutine_function, container.name)
+
+
+ # contains_lines are parsed as private procedures
+ if contains_flag
+ parse_program_or_module(container,
+ contains_lines.join("\n"), :private)
+ end
+
+ # next loop to search next block
+ level_depth = 0
+ block_searching_flag = nil
+ block_searching_lines = []
+ pre_comment = []
+ procedure_trailing = ""
+ procedure_name = ""
+ procedure_params = ""
+ procedure_prefix = ""
+ procedure_result_arg = ""
+ contains_lines = []
+ contains_flag = nil
+ next false
+ } # End of remaining_lines.collect!{|line|
+
+ # Array remains_lines is converted to String remains_code again
+ #
+ remaining_code = remaining_lines.join("\n")
+
+ #
+ # Parse interface
+ #
+ interface_scope = false
+ generic_name = ""
+ interface_code.split("\n").each{ |line|
+ if /^\s*?
+ interface(
+ \s+\w+|
+ \s+operator\s*?\(.*?\)|
+ \s+assignment\s*?\(\s*?=\s*?\)
+ )?
+ \s*?(!.*?)?$
+ /ix =~ line
+ generic_name = $1 ? $1.strip.chomp : nil
+ interface_trailing = $2 || "!"
+ interface_scope = true
+ interface_scope = false if interface_trailing =~ /!:nodoc:/
+# if generic_name =~ /operator\s*?\((.*?)\)/i
+# operator_name = $1
+# if operator_name && !operator_name.empty?
+# generic_name = "#{operator_name}"
+# end
+# end
+# if generic_name =~ /assignment\s*?\((.*?)\)/i
+# assignment_name = $1
+# if assignment_name && !assignment_name.empty?
+# generic_name = "#{assignment_name}"
+# end
+# end
+ end
+ if /^\s*?end\s+interface/i =~ line
+ interface_scope = false
+ generic_name = nil
+ end
+ # internal alias
+ if interface_scope && /^\s*?module\s+procedure\s+(.*?)(!.*?)?$/i =~ line
+ procedures = $1.strip.chomp
+ procedures_trailing = $2 || "!"
+ next if procedures_trailing =~ /!:nodoc:/
+ procedures.split(",").each{ |proc|
+ proc.strip!
+ proc.chomp!
+ next if generic_name == proc || !generic_name
+ old_meth = container.find_symbol(proc, nil, @options.ignore_case)
+ next if !old_meth
+ nolink = old_meth.visibility == :private ? true : nil
+ nolink = nil if @options.show_all
+ new_meth =
+ initialize_external_method(generic_name, proc,
+ old_meth.params, nil,
+ old_meth.comment,
+ old_meth.clone.token_stream[0].text,
+ true, nolink)
+ new_meth.singleton = old_meth.singleton
+
+ progress "i"
+ @stats.num_methods += 1
+ container.add_method new_meth
+
+ set_visibility(container, generic_name, visibility_default, @@public_methods)
+
+ check_public_methods(new_meth, container.name)
+
+ }
+ end
+
+ # external aliases
+ if interface_scope
+ # subroutine
+ proc = nil
+ params = nil
+ procedures_trailing = nil
+ if line =~ /^\s*?
+ (recursive|pure|elemental)?\s*?
+ subroutine\s+(\w+)\s*?(\(.*?\))?\s*?(!.*?)?$
+ /ix
+ proc = $2.chomp.strip
+ generic_name = proc unless generic_name
+ params = $3 || ""
+ procedures_trailing = $4 || "!"
+
+ # function
+ elsif line =~ /^\s*?
+ (recursive|pure|elemental)?\s*?
+ (
+ character\s*?(\([\w\s\=\(\)\*]+?\))?\s+
+ | type\s*?\([\w\s]+?\)\s+
+ | integer\s*?(\([\w\s\=\(\)\*]+?\))?\s+
+ | real\s*?(\([\w\s\=\(\)\*]+?\))?\s+
+ | double\s+precision\s+
+ | logical\s*?(\([\w\s\=\(\)\*]+?\))?\s+
+ | complex\s*?(\([\w\s\=\(\)\*]+?\))?\s+
+ )?
+ function\s+(\w+)\s*?
+ (\(.*?\))?(\s+result\((.*?)\))?\s*?(!.*?)?$
+ /ix
+ proc = $8.chomp.strip
+ generic_name = proc unless generic_name
+ params = $9 || ""
+ procedures_trailing = $12 || "!"
+ else
+ next
+ end
+ next if procedures_trailing =~ /!:nodoc:/
+ indicated_method = nil
+ indicated_file = nil
+ TopLevel.all_files.each do |name, toplevel|
+ indicated_method = toplevel.find_local_symbol(proc, @options.ignore_case)
+ indicated_file = name
+ break if indicated_method
+ end
+
+ if indicated_method
+ external_method =
+ initialize_external_method(generic_name, proc,
+ indicated_method.params,
+ indicated_file,
+ indicated_method.comment)
+
+ progress "e"
+ @stats.num_methods += 1
+ container.add_method external_method
+ set_visibility(container, generic_name, visibility_default, @@public_methods)
+ if !container.include_requires?(indicated_file, @options.ignore_case)
+ container.add_require(Require.new(indicated_file, ""))
+ end
+ check_public_methods(external_method, container.name)
+
+ else
+ @@external_aliases << {
+ "new_name" => generic_name,
+ "old_name" => proc,
+ "file_or_module" => container,
+ "visibility" => find_visibility(container, generic_name, @@public_methods) || visibility_default
+ }
+ end
+ end
+
+ } if interface_code # End of interface_code.split("\n").each ...
+
+ #
+ # Already imported methods are removed from @@public_methods.
+ # Remainders are assumed to be imported from other modules.
+ #
+ @@public_methods.delete_if{ |method| method["entity_is_discovered"]}
+
+ @@public_methods.each{ |pub_meth|
+ next unless pub_meth["file_or_module"].name == container.name
+ pub_meth["used_modules"].each{ |used_mod|
+ TopLevel.all_classes_and_modules.each{ |modules|
+ if modules.name == used_mod ||
+ modules.name.upcase == used_mod.upcase &&
+ @options.ignore_case
+ modules.method_list.each{ |meth|
+ if meth.name == pub_meth["name"] ||
+ meth.name.upcase == pub_meth["name"].upcase &&
+ @options.ignore_case
+ new_meth = initialize_public_method(meth,
+ modules.name)
+ if pub_meth["local_name"]
+ new_meth.name = pub_meth["local_name"]
+ end
+ progress "e"
+ @stats.num_methods += 1
+ container.add_method new_meth
+ end
+ }
+ end
+ }
+ }
+ }
+
+ container
+ end # End of parse_program_or_module
+
+ #
+ # Parse arguments, comment, code of subroutine and function.
+ # Return AnyMethod object.
+ #
+ def parse_subprogram(subprogram, params, comment, code,
+ before_contains=nil, function=nil, prefix=nil)
+ subprogram.singleton = false
+ prefix = "" if !prefix
+ arguments = params.sub(/\(/, "").sub(/\)/, "").split(",") if params
+ args_comment, params_opt =
+ find_arguments(arguments, code.sub(/^s*?contains\s*?(!.*?)?$.*/im, ""),
+ nil, nil, true)
+ params_opt = "( " + params_opt + " ) " if params_opt
+ subprogram.params = params_opt || ""
+ namelist_comment = find_namelists(code, before_contains)
+
+ block_comment = find_comments comment
+ if function
+ subprogram.comment = "<b><em> Function </em></b> :: <em>#{prefix}</em>\n"
+ else
+ subprogram.comment = "<b><em> Subroutine </em></b> :: <em>#{prefix}</em>\n"
+ end
+ subprogram.comment << args_comment if args_comment
+ subprogram.comment << block_comment if block_comment
+ subprogram.comment << namelist_comment if namelist_comment
+
+ # For output source code
+ subprogram.start_collecting_tokens
+ subprogram.add_token Token.new(1,1).set_text(code)
+
+ subprogram
+ end
+
+ #
+ # Collect comment for file entity
+ #
+ def collect_first_comment(body)
+ comment = ""
+ not_comment = ""
+ comment_start = false
+ comment_end = false
+ body.split("\n").each{ |line|
+ if comment_end
+ not_comment << line
+ not_comment << "\n"
+ elsif /^\s*?!\s?(.*)$/i =~ line
+ comment_start = true
+ comment << $1
+ comment << "\n"
+ elsif /^\s*?$/i =~ line
+ comment_end = true if comment_start && COMMENTS_ARE_UPPER
+ else
+ comment_end = true
+ not_comment << line
+ not_comment << "\n"
+ end
+ }
+ return comment, not_comment
+ end
+
+
+ # Return comments of definitions of arguments
+ #
+ # If "all" argument is true, information of all arguments are returned.
+ # If "modified_params" is true, list of arguments are decorated,
+ # for example, optional arguments are parenthetic as "[arg]".
+ #
+ def find_arguments(args, text, all=nil, indent=nil, modified_params=nil)
+ return unless args || all
+ indent = "" unless indent
+ args = ["all"] if all
+ params = "" if modified_params
+ comma = ""
+ return unless text
+ args_rdocforms = "\n"
+ remaining_lines = "#{text}"
+ definitions = definition_info(remaining_lines)
+ args.each{ |arg|
+ arg.strip!
+ arg.chomp!
+ definitions.each { |defitem|
+ if arg == defitem.varname.strip.chomp || all
+ args_rdocforms << <<-"EOF"
+
+#{indent}<tt><b>#{defitem.varname.chomp.strip}#{defitem.arraysuffix}</b> #{defitem.inivalue}</tt> ::
+#{indent} <tt>#{defitem.types.chomp.strip}</tt>
+EOF
+ if !defitem.comment.chomp.strip.empty?
+ comment = ""
+ defitem.comment.split("\n").each{ |line|
+ comment << " " + line + "\n"
+ }
+ args_rdocforms << <<-"EOF"
+
+#{indent} <tt></tt> ::
+#{indent} <tt></tt>
+#{indent} #{comment.chomp.strip}
+EOF
+ end
+
+ if modified_params
+ if defitem.include_attr?("optional")
+ params << "#{comma}[#{arg}]"
+ else
+ params << "#{comma}#{arg}"
+ end
+ comma = ", "
+ end
+ end
+ }
+ }
+ if modified_params
+ return args_rdocforms, params
+ else
+ return args_rdocforms
+ end
+ end
+
+ # Return comments of definitions of namelists
+ #
+ def find_namelists(text, before_contains=nil)
+ return nil if !text
+ result = ""
+ lines = "#{text}"
+ before_contains = "" if !before_contains
+ while lines =~ /^\s*?namelist\s+\/\s*?(\w+)\s*?\/([\s\w\,]+)$/i
+ lines = $~.post_match
+ nml_comment = COMMENTS_ARE_UPPER ?
+ find_comments($~.pre_match) : find_comments($~.post_match)
+ nml_name = $1
+ nml_args = $2.split(",")
+ result << "\n\n=== NAMELIST <tt><b>" + nml_name + "</tt></b>\n\n"
+ result << nml_comment + "\n" if nml_comment
+ if lines.split("\n")[0] =~ /^\//i
+ lines = "namelist " + lines
+ end
+ result << find_arguments(nml_args, "#{text}" + "\n" + before_contains)
+ end
+ return result
+ end
+
+ #
+ # Comments just after module or subprogram, or arguments are
+ # returned. If "COMMENTS_ARE_UPPER" is true, comments just before
+ # modules or subprograms are returned
+ #
+ def find_comments text
+ return "" unless text
+ lines = text.split("\n")
+ lines.reverse! if COMMENTS_ARE_UPPER
+ comment_block = Array.new
+ lines.each do |line|
+ break if line =~ /^\s*?\w/ || line =~ /^\s*?$/
+ if COMMENTS_ARE_UPPER
+ comment_block.unshift line.sub(/^\s*?!\s?/,"")
+ else
+ comment_block.push line.sub(/^\s*?!\s?/,"")
+ end
+ end
+ nice_lines = comment_block.join("\n").split "\n\s*?\n"
+ nice_lines[0] ||= ""
+ nice_lines.shift
+ end
+
+ def progress(char)
+ unless @options.quiet
+ @progress.print(char)
+ @progress.flush
+ end
+ end
+
+ #
+ # Create method for internal alias
+ #
+ def initialize_public_method(method, parent)
+ return if !method || !parent
+
+ new_meth = AnyMethod.new("External Alias for module", method.name)
+ new_meth.singleton = method.singleton
+ new_meth.params = method.params.clone
+ new_meth.comment = remove_trailing_alias(method.comment.clone)
+ new_meth.comment << "\n\n#{EXTERNAL_ALIAS_MES} #{parent.strip.chomp}\##{method.name}"
+
+ return new_meth
+ end
+
+ #
+ # Create method for external alias
+ #
+ # If argument "internal" is true, file is ignored.
+ #
+ def initialize_external_method(new, old, params, file, comment, token=nil,
+ internal=nil, nolink=nil)
+ return nil unless new || old
+
+ if internal
+ external_alias_header = "#{INTERNAL_ALIAS_MES} "
+ external_alias_text = external_alias_header + old
+ elsif file
+ external_alias_header = "#{EXTERNAL_ALIAS_MES} "
+ external_alias_text = external_alias_header + file + "#" + old
+ else
+ return nil
+ end
+ external_meth = AnyMethod.new(external_alias_text, new)
+ external_meth.singleton = false
+ external_meth.params = params
+ external_comment = remove_trailing_alias(comment) + "\n\n" if comment
+ external_meth.comment = external_comment || ""
+ if nolink && token
+ external_meth.start_collecting_tokens
+ external_meth.add_token Token.new(1,1).set_text(token)
+ else
+ external_meth.comment << external_alias_text
+ end
+
+ return external_meth
+ end
+
+
+
+ #
+ # Parse visibility
+ #
+ def parse_visibility(code, default, container)
+ result = []
+ visibility_default = default || :public
+
+ used_modules = []
+ container.includes.each{|i| used_modules << i.name} if container
+
+ remaining_code = code.gsub(/^\s*?type[\s\,]+.*?\s+end\s+type.*?$/im, "")
+ remaining_code.split("\n").each{ |line|
+ if /^\s*?private\s*?$/ =~ line
+ visibility_default = :private
+ break
+ end
+ } if remaining_code
+
+ remaining_code.split("\n").each{ |line|
+ if /^\s*?private\s*?(::)?\s+(.*)\s*?(!.*?)?/i =~ line
+ methods = $2.sub(/!.*$/, '')
+ methods.split(",").each{ |meth|
+ meth.sub!(/!.*$/, '')
+ meth.gsub!(/:/, '')
+ result << {
+ "name" => meth.chomp.strip,
+ "visibility" => :private,
+ "used_modules" => used_modules.clone,
+ "file_or_module" => container,
+ "entity_is_discovered" => nil,
+ "local_name" => nil
+ }
+ }
+ elsif /^\s*?public\s*?(::)?\s+(.*)\s*?(!.*?)?/i =~ line
+ methods = $2.sub(/!.*$/, '')
+ methods.split(",").each{ |meth|
+ meth.sub!(/!.*$/, '')
+ meth.gsub!(/:/, '')
+ result << {
+ "name" => meth.chomp.strip,
+ "visibility" => :public,
+ "used_modules" => used_modules.clone,
+ "file_or_module" => container,
+ "entity_is_discovered" => nil,
+ "local_name" => nil
+ }
+ }
+ end
+ } if remaining_code
+
+ if container
+ result.each{ |vis_info|
+ vis_info["parent"] = container.name
+ }
+ end
+
+ return visibility_default, result
+ end
+
+ #
+ # Set visibility
+ #
+ # "subname" element of "visibility_info" is deleted.
+ #
+ def set_visibility(container, subname, visibility_default, visibility_info)
+ return unless container || subname || visibility_default || visibility_info
+ not_found = true
+ visibility_info.collect!{ |info|
+ if info["name"] == subname ||
+ @options.ignore_case && info["name"].upcase == subname.upcase
+ if info["file_or_module"].name == container.name
+ container.set_visibility_for([subname], info["visibility"])
+ info["entity_is_discovered"] = true
+ not_found = false
+ end
+ end
+ info
+ }
+ if not_found
+ return container.set_visibility_for([subname], visibility_default)
+ else
+ return container
+ end
+ end
+
+ #
+ # Find visibility
+ #
+ def find_visibility(container, subname, visibility_info)
+ return nil if !subname || !visibility_info
+ visibility_info.each{ |info|
+ if info["name"] == subname ||
+ @options.ignore_case && info["name"].upcase == subname.upcase
+ if info["parent"] == container.name
+ return info["visibility"]
+ end
+ end
+ }
+ return nil
+ end
+
+ #
+ # Check external aliases
+ #
+ def check_external_aliases(subname, params, comment, test=nil)
+ @@external_aliases.each{ |alias_item|
+ if subname == alias_item["old_name"] ||
+ subname.upcase == alias_item["old_name"].upcase &&
+ @options.ignore_case
+
+ new_meth = initialize_external_method(alias_item["new_name"],
+ subname, params, @file_name,
+ comment)
+ new_meth.visibility = alias_item["visibility"]
+
+ progress "e"
+ @stats.num_methods += 1
+ alias_item["file_or_module"].add_method(new_meth)
+
+ if !alias_item["file_or_module"].include_requires?(@file_name, @options.ignore_case)
+ alias_item["file_or_module"].add_require(Require.new(@file_name, ""))
+ end
+ end
+ }
+ end
+
+ #
+ # Check public_methods
+ #
+ def check_public_methods(method, parent)
+ return if !method || !parent
+ @@public_methods.each{ |alias_item|
+ parent_is_used_module = nil
+ alias_item["used_modules"].each{ |used_module|
+ if used_module == parent ||
+ used_module.upcase == parent.upcase &&
+ @options.ignore_case
+ parent_is_used_module = true
+ end
+ }
+ next if !parent_is_used_module
+
+ if method.name == alias_item["name"] ||
+ method.name.upcase == alias_item["name"].upcase &&
+ @options.ignore_case
+
+ new_meth = initialize_public_method(method, parent)
+ if alias_item["local_name"]
+ new_meth.name = alias_item["local_name"]
+ end
+
+ progress "e"
+ @stats.num_methods += 1
+ alias_item["file_or_module"].add_method new_meth
+ end
+ }
+ end
+
+ #
+ # Continuous lines are united.
+ #
+ # Comments in continuous lines are removed.
+ #
+ def united_to_one_line(f90src)
+ return "" unless f90src
+ lines = f90src.split("\n")
+ previous_continuing = false
+ now_continuing = false
+ body = ""
+ lines.each{ |line|
+ words = line.split("")
+ next if words.empty? && previous_continuing
+ commentout = false
+ brank_flag = true ; brank_char = ""
+ squote = false ; dquote = false
+ ignore = false
+ words.collect! { |char|
+ if previous_continuing && brank_flag
+ now_continuing = true
+ ignore = true
+ case char
+ when "!" ; break
+ when " " ; brank_char << char ; next ""
+ when "&"
+ brank_flag = false
+ now_continuing = false
+ next ""
+ else
+ brank_flag = false
+ now_continuing = false
+ ignore = false
+ next brank_char + char
+ end
+ end
+ ignore = false
+
+ if now_continuing
+ next ""
+ elsif !(squote) && !(dquote) && !(commentout)
+ case char
+ when "!" ; commentout = true ; next char
+ when "\""; dquote = true ; next char
+ when "\'"; squote = true ; next char
+ when "&" ; now_continuing = true ; next ""
+ else next char
+ end
+ elsif commentout
+ next char
+ elsif squote
+ case char
+ when "\'"; squote = false ; next char
+ else next char
+ end
+ elsif dquote
+ case char
+ when "\""; dquote = false ; next char
+ else next char
+ end
+ end
+ }
+ if !ignore && !previous_continuing || !brank_flag
+ if previous_continuing
+ body << words.join("")
+ else
+ body << "\n" + words.join("")
+ end
+ end
+ previous_continuing = now_continuing ? true : nil
+ now_continuing = nil
+ }
+ return body
+ end
+
+
+ #
+ # Continuous line checker
+ #
+ def continuous_line?(line)
+ continuous = false
+ if /&\s*?(!.*)?$/ =~ line
+ continuous = true
+ if comment_out?($~.pre_match)
+ continuous = false
+ end
+ end
+ return continuous
+ end
+
+ #
+ # Comment out checker
+ #
+ def comment_out?(line)
+ return nil unless line
+ commentout = false
+ squote = false ; dquote = false
+ line.split("").each { |char|
+ if !(squote) && !(dquote)
+ case char
+ when "!" ; commentout = true ; break
+ when "\""; dquote = true
+ when "\'"; squote = true
+ else next
+ end
+ elsif squote
+ case char
+ when "\'"; squote = false
+ else next
+ end
+ elsif dquote
+ case char
+ when "\""; dquote = false
+ else next
+ end
+ end
+ }
+ return commentout
+ end
+
+ #
+ # Semicolons are replaced to line feed.
+ #
+ def semicolon_to_linefeed(text)
+ return "" unless text
+ lines = text.split("\n")
+ lines.collect!{ |line|
+ words = line.split("")
+ commentout = false
+ squote = false ; dquote = false
+ words.collect! { |char|
+ if !(squote) && !(dquote) && !(commentout)
+ case char
+ when "!" ; commentout = true ; next char
+ when "\""; dquote = true ; next char
+ when "\'"; squote = true ; next char
+ when ";" ; "\n"
+ else next char
+ end
+ elsif commentout
+ next char
+ elsif squote
+ case char
+ when "\'"; squote = false ; next char
+ else next char
+ end
+ elsif dquote
+ case char
+ when "\""; dquote = false ; next char
+ else next char
+ end
+ end
+ }
+ words.join("")
+ }
+ return lines.join("\n")
+ end
+
+ #
+ # Which "line" is start of block (module, program, block data,
+ # subroutine, function) statement ?
+ #
+ def block_start?(line)
+ return nil if !line
+
+ if line =~ /^\s*?module\s+(\w+)\s*?(!.*?)?$/i ||
+ line =~ /^\s*?program\s+(\w+)\s*?(!.*?)?$/i ||
+ line =~ /^\s*?block\s+data(\s+\w+)?\s*?(!.*?)?$/i ||
+ line =~ \
+ /^\s*?
+ (recursive|pure|elemental)?\s*?
+ subroutine\s+(\w+)\s*?(\(.*?\))?\s*?(!.*?)?$
+ /ix ||
+ line =~ \
+ /^\s*?
+ (recursive|pure|elemental)?\s*?
+ (
+ character\s*?(\([\w\s\=\(\)\*]+?\))?\s+
+ | type\s*?\([\w\s]+?\)\s+
+ | integer\s*?(\([\w\s\=\(\)\*]+?\))?\s+
+ | real\s*?(\([\w\s\=\(\)\*]+?\))?\s+
+ | double\s+precision\s+
+ | logical\s*?(\([\w\s\=\(\)\*]+?\))?\s+
+ | complex\s*?(\([\w\s\=\(\)\*]+?\))?\s+
+ )?
+ function\s+(\w+)\s*?
+ (\(.*?\))?(\s+result\((.*?)\))?\s*?(!.*?)?$
+ /ix
+ return true
+ end
+
+ return nil
+ end
+
+ #
+ # Which "line" is end of block (module, program, block data,
+ # subroutine, function) statement ?
+ #
+ def block_end?(line)
+ return nil if !line
+
+ if line =~ /^\s*?end\s*?(!.*?)?$/i ||
+ line =~ /^\s*?end\s+module(\s+\w+)?\s*?(!.*?)?$/i ||
+ line =~ /^\s*?end\s+program(\s+\w+)?\s*?(!.*?)?$/i ||
+ line =~ /^\s*?end\s+block\s+data(\s+\w+)?\s*?(!.*?)?$/i ||
+ line =~ /^\s*?end\s+subroutine(\s+\w+)?\s*?(!.*?)?$/i ||
+ line =~ /^\s*?end\s+function(\s+\w+)?\s*?(!.*?)?$/i
+ return true
+ end
+
+ return nil
+ end
+
+ #
+ # Remove "Alias for" in end of comments
+ #
+ def remove_trailing_alias(text)
+ return "" if !text
+ lines = text.split("\n").reverse
+ comment_block = Array.new
+ checked = false
+ lines.each do |line|
+ if !checked
+ if /^\s?#{INTERNAL_ALIAS_MES}/ =~ line ||
+ /^\s?#{EXTERNAL_ALIAS_MES}/ =~ line
+ checked = true
+ next
+ end
+ end
+ comment_block.unshift line
+ end
+ nice_lines = comment_block.join("\n")
+ nice_lines ||= ""
+ return nice_lines
+ end
+
+ # Empty lines in header are removed
+ def remove_empty_head_lines(text)
+ return "" unless text
+ lines = text.split("\n")
+ header = true
+ lines.delete_if{ |line|
+ header = false if /\S/ =~ line
+ header && /^\s*?$/ =~ line
+ }
+ lines.join("\n")
+ end
+
+
+ # header marker "=", "==", ... are removed
+ def remove_header_marker(text)
+ return text.gsub(/^\s?(=+)/, '<tt></tt>\1')
+ end
+
+ def remove_private_comments(body)
+ body.gsub!(/^\s*!--\s*?$.*?^\s*!\+\+\s*?$/m, '')
+ return body
+ end
+
+
+ #
+ # Information of arguments of subroutines and functions in Fortran95
+ #
+ class Fortran95Definition
+
+ # Name of variable
+ #
+ attr_reader :varname
+
+ # Types of variable
+ #
+ attr_reader :types
+
+ # Initial Value
+ #
+ attr_reader :inivalue
+
+ # Suffix of array
+ #
+ attr_reader :arraysuffix
+
+ # Comments
+ #
+ attr_accessor :comment
+
+ # Flag of non documentation
+ #
+ attr_accessor :nodoc
+
+ def initialize(varname, types, inivalue, arraysuffix, comment,
+ nodoc=false)
+ @varname = varname
+ @types = types
+ @inivalue = inivalue
+ @arraysuffix = arraysuffix
+ @comment = comment
+ @nodoc = nodoc
+ end
+
+ def to_s
+ return <<-EOF
+<Fortran95Definition:
+ varname=#{@varname}, types=#{types},
+ inivalue=#{@inivalue}, arraysuffix=#{@arraysuffix}, nodoc=#{@nodoc},
+ comment=
+#{@comment}
+>
+EOF
+ end
+
+ #
+ # If attr is included, true is returned
+ #
+ def include_attr?(attr)
+ return if !attr
+ @types.split(",").each{ |type|
+ return true if type.strip.chomp.upcase == attr.strip.chomp.upcase
+ }
+ return nil
+ end
+
+ end # End of Fortran95Definition
+
+ #
+ # Parse string argument "text", and Return Array of
+ # Fortran95Definition object
+ #
+ def definition_info(text)
+ return nil unless text
+ lines = "#{text}"
+ defs = Array.new
+ comment = ""
+ trailing_comment = ""
+ under_comment_valid = false
+ lines.split("\n").each{ |line|
+ if /^\s*?!\s?(.*)/ =~ line
+ if COMMENTS_ARE_UPPER
+ comment << remove_header_marker($1)
+ comment << "\n"
+ elsif defs[-1] && under_comment_valid
+ defs[-1].comment << "\n"
+ defs[-1].comment << remove_header_marker($1)
+ end
+ next
+ elsif /^\s*?$/ =~ line
+ comment = ""
+ under_comment_valid = false
+ next
+ end
+ type = ""
+ characters = ""
+ if line =~ /^\s*?
+ (
+ character\s*?(\([\w\s\=\(\)\*]+?\))?[\s\,]*
+ | type\s*?\([\w\s]+?\)[\s\,]*
+ | integer\s*?(\([\w\s\=\(\)\*]+?\))?[\s\,]*
+ | real\s*?(\([\w\s\=\(\)\*]+?\))?[\s\,]*
+ | double\s+precision[\s\,]*
+ | logical\s*?(\([\w\s\=\(\)\*]+?\))?[\s\,]*
+ | complex\s*?(\([\w\s\=\(\)\*]+?\))?[\s\,]*
+ )
+ (.*?::)?
+ (.+)$
+ /ix
+ characters = $8
+ type = $1
+ type << $7.gsub(/::/, '').gsub(/^\s*?\,/, '') if $7
+ else
+ under_comment_valid = false
+ next
+ end
+ squote = false ; dquote = false ; bracket = 0
+ iniflag = false; commentflag = false
+ varname = "" ; arraysuffix = "" ; inivalue = ""
+ start_pos = defs.size
+ characters.split("").each { |char|
+ if !(squote) && !(dquote) && bracket <= 0 && !(iniflag) && !(commentflag)
+ case char
+ when "!" ; commentflag = true
+ when "(" ; bracket += 1 ; arraysuffix = char
+ when "\""; dquote = true
+ when "\'"; squote = true
+ when "=" ; iniflag = true ; inivalue << char
+ when ","
+ defs << Fortran95Definition.new(varname, type, inivalue, arraysuffix, comment)
+ varname = "" ; arraysuffix = "" ; inivalue = ""
+ under_comment_valid = true
+ when " " ; next
+ else ; varname << char
+ end
+ elsif commentflag
+ comment << remove_header_marker(char)
+ trailing_comment << remove_header_marker(char)
+ elsif iniflag
+ if dquote
+ case char
+ when "\"" ; dquote = false ; inivalue << char
+ else ; inivalue << char
+ end
+ elsif squote
+ case char
+ when "\'" ; squote = false ; inivalue << char
+ else ; inivalue << char
+ end
+ elsif bracket > 0
+ case char
+ when "(" ; bracket += 1 ; inivalue << char
+ when ")" ; bracket -= 1 ; inivalue << char
+ else ; inivalue << char
+ end
+ else
+ case char
+ when ","
+ defs << Fortran95Definition.new(varname, type, inivalue, arraysuffix, comment)
+ varname = "" ; arraysuffix = "" ; inivalue = ""
+ iniflag = false
+ under_comment_valid = true
+ when "(" ; bracket += 1 ; inivalue << char
+ when "\""; dquote = true ; inivalue << char
+ when "\'"; squote = true ; inivalue << char
+ when "!" ; commentflag = true
+ else ; inivalue << char
+ end
+ end
+ elsif !(squote) && !(dquote) && bracket > 0
+ case char
+ when "(" ; bracket += 1 ; arraysuffix << char
+ when ")" ; bracket -= 1 ; arraysuffix << char
+ else ; arraysuffix << char
+ end
+ elsif squote
+ case char
+ when "\'"; squote = false ; inivalue << char
+ else ; inivalue << char
+ end
+ elsif dquote
+ case char
+ when "\""; dquote = false ; inivalue << char
+ else ; inivalue << char
+ end
+ end
+ }
+ defs << Fortran95Definition.new(varname, type, inivalue, arraysuffix, comment)
+ if trailing_comment =~ /^:nodoc:/
+ defs[start_pos..-1].collect!{ |defitem|
+ defitem.nodoc = true
+ }
+ end
+ varname = "" ; arraysuffix = "" ; inivalue = ""
+ comment = ""
+ under_comment_valid = true
+ trailing_comment = ""
+ }
+ return defs
+ end
+
+
+ end # class Fortran95parser
+
+end # module RDoc
diff --git a/lib/rdoc/parsers/parse_rb.rb b/lib/rdoc/parsers/parse_rb.rb
new file mode 100644
index 0000000000..750c483c15
--- /dev/null
+++ b/lib/rdoc/parsers/parse_rb.rb
@@ -0,0 +1,2609 @@
+#!/usr/local/bin/ruby
+
+# Parse a Ruby source file, building a set of objects
+# representing the modules, classes, methods,
+# requires, and includes we find (these classes
+# are defined in code_objects.rb).
+
+# This file contains stuff stolen outright from:
+#
+# rtags.rb -
+# ruby-lex.rb - ruby lexcal analizer
+# ruby-token.rb - ruby tokens
+# by Keiju ISHITSUKA (Nippon Rational Inc.)
+#
+
+require "e2mmap"
+require "irb/slex"
+
+require "rdoc/code_objects"
+require "rdoc/tokenstream"
+
+require "rdoc/markup/simple_markup/preprocess"
+
+require "rdoc/parsers/parserfactory"
+
+$TOKEN_DEBUG = $DEBUG
+
+# Definitions of all tokens involved in the lexical analysis
+
+module RubyToken
+ EXPR_BEG = :EXPR_BEG
+ EXPR_MID = :EXPR_MID
+ EXPR_END = :EXPR_END
+ EXPR_ARG = :EXPR_ARG
+ EXPR_FNAME = :EXPR_FNAME
+ EXPR_DOT = :EXPR_DOT
+ EXPR_CLASS = :EXPR_CLASS
+
+ class Token
+ NO_TEXT = "??".freeze
+ attr :text
+
+ def initialize(line_no, char_no)
+ @line_no = line_no
+ @char_no = char_no
+ @text = NO_TEXT
+ end
+
+ # Because we're used in contexts that expect to return a token,
+ # we set the text string and then return ourselves
+ def set_text(text)
+ @text = text
+ self
+ end
+
+ attr_reader :line_no, :char_no, :text
+ end
+
+ class TkNode < Token
+ attr :node
+ end
+
+ class TkId < Token
+ def initialize(line_no, char_no, name)
+ super(line_no, char_no)
+ @name = name
+ end
+ attr :name
+ end
+
+ class TkKW < TkId
+ end
+
+ class TkVal < Token
+ def initialize(line_no, char_no, value = nil)
+ super(line_no, char_no)
+ set_text(value)
+ end
+ end
+
+ class TkOp < Token
+ def name
+ self.class.op_name
+ end
+ end
+
+ class TkOPASGN < TkOp
+ def initialize(line_no, char_no, op)
+ super(line_no, char_no)
+ op = TkReading2Token[op] unless op.kind_of?(Symbol)
+ @op = op
+ end
+ attr :op
+ end
+
+ class TkUnknownChar < Token
+ def initialize(line_no, char_no, id)
+ super(line_no, char_no)
+ @name = char_no.chr
+ end
+ attr :name
+ end
+
+ class TkError < Token
+ end
+
+ def set_token_position(line, char)
+ @prev_line_no = line
+ @prev_char_no = char
+ end
+
+ def Token(token, value = nil)
+ tk = nil
+ case token
+ when String, Symbol
+ source = token.kind_of?(String) ? TkReading2Token : TkSymbol2Token
+ if (tk = source[token]).nil?
+ IRB.fail TkReading2TokenNoKey, token
+ end
+ tk = Token(tk[0], value)
+ else
+ tk = if (token.ancestors & [TkId, TkVal, TkOPASGN, TkUnknownChar]).empty?
+ token.new(@prev_line_no, @prev_char_no)
+ else
+ token.new(@prev_line_no, @prev_char_no, value)
+ end
+ end
+ tk
+ end
+
+ TokenDefinitions = [
+ [:TkCLASS, TkKW, "class", EXPR_CLASS],
+ [:TkMODULE, TkKW, "module", EXPR_BEG],
+ [:TkDEF, TkKW, "def", EXPR_FNAME],
+ [:TkUNDEF, TkKW, "undef", EXPR_FNAME],
+ [:TkBEGIN, TkKW, "begin", EXPR_BEG],
+ [:TkRESCUE, TkKW, "rescue", EXPR_MID],
+ [:TkENSURE, TkKW, "ensure", EXPR_BEG],
+ [:TkEND, TkKW, "end", EXPR_END],
+ [:TkIF, TkKW, "if", EXPR_BEG, :TkIF_MOD],
+ [:TkUNLESS, TkKW, "unless", EXPR_BEG, :TkUNLESS_MOD],
+ [:TkTHEN, TkKW, "then", EXPR_BEG],
+ [:TkELSIF, TkKW, "elsif", EXPR_BEG],
+ [:TkELSE, TkKW, "else", EXPR_BEG],
+ [:TkCASE, TkKW, "case", EXPR_BEG],
+ [:TkWHEN, TkKW, "when", EXPR_BEG],
+ [:TkWHILE, TkKW, "while", EXPR_BEG, :TkWHILE_MOD],
+ [:TkUNTIL, TkKW, "until", EXPR_BEG, :TkUNTIL_MOD],
+ [:TkFOR, TkKW, "for", EXPR_BEG],
+ [:TkBREAK, TkKW, "break", EXPR_END],
+ [:TkNEXT, TkKW, "next", EXPR_END],
+ [:TkREDO, TkKW, "redo", EXPR_END],
+ [:TkRETRY, TkKW, "retry", EXPR_END],
+ [:TkIN, TkKW, "in", EXPR_BEG],
+ [:TkDO, TkKW, "do", EXPR_BEG],
+ [:TkRETURN, TkKW, "return", EXPR_MID],
+ [:TkYIELD, TkKW, "yield", EXPR_END],
+ [:TkSUPER, TkKW, "super", EXPR_END],
+ [:TkSELF, TkKW, "self", EXPR_END],
+ [:TkNIL, TkKW, "nil", EXPR_END],
+ [:TkTRUE, TkKW, "true", EXPR_END],
+ [:TkFALSE, TkKW, "false", EXPR_END],
+ [:TkAND, TkKW, "and", EXPR_BEG],
+ [:TkOR, TkKW, "or", EXPR_BEG],
+ [:TkNOT, TkKW, "not", EXPR_BEG],
+ [:TkIF_MOD, TkKW],
+ [:TkUNLESS_MOD, TkKW],
+ [:TkWHILE_MOD, TkKW],
+ [:TkUNTIL_MOD, TkKW],
+ [:TkALIAS, TkKW, "alias", EXPR_FNAME],
+ [:TkDEFINED, TkKW, "defined?", EXPR_END],
+ [:TklBEGIN, TkKW, "BEGIN", EXPR_END],
+ [:TklEND, TkKW, "END", EXPR_END],
+ [:Tk__LINE__, TkKW, "__LINE__", EXPR_END],
+ [:Tk__FILE__, TkKW, "__FILE__", EXPR_END],
+
+ [:TkIDENTIFIER, TkId],
+ [:TkFID, TkId],
+ [:TkGVAR, TkId],
+ [:TkIVAR, TkId],
+ [:TkCONSTANT, TkId],
+
+ [:TkINTEGER, TkVal],
+ [:TkFLOAT, TkVal],
+ [:TkSTRING, TkVal],
+ [:TkXSTRING, TkVal],
+ [:TkREGEXP, TkVal],
+ [:TkCOMMENT, TkVal],
+
+ [:TkDSTRING, TkNode],
+ [:TkDXSTRING, TkNode],
+ [:TkDREGEXP, TkNode],
+ [:TkNTH_REF, TkId],
+ [:TkBACK_REF, TkId],
+
+ [:TkUPLUS, TkOp, "+@"],
+ [:TkUMINUS, TkOp, "-@"],
+ [:TkPOW, TkOp, "**"],
+ [:TkCMP, TkOp, "<=>"],
+ [:TkEQ, TkOp, "=="],
+ [:TkEQQ, TkOp, "==="],
+ [:TkNEQ, TkOp, "!="],
+ [:TkGEQ, TkOp, ">="],
+ [:TkLEQ, TkOp, "<="],
+ [:TkANDOP, TkOp, "&&"],
+ [:TkOROP, TkOp, "||"],
+ [:TkMATCH, TkOp, "=~"],
+ [:TkNMATCH, TkOp, "!~"],
+ [:TkDOT2, TkOp, ".."],
+ [:TkDOT3, TkOp, "..."],
+ [:TkAREF, TkOp, "[]"],
+ [:TkASET, TkOp, "[]="],
+ [:TkLSHFT, TkOp, "<<"],
+ [:TkRSHFT, TkOp, ">>"],
+ [:TkCOLON2, TkOp],
+ [:TkCOLON3, TkOp],
+# [:OPASGN, TkOp], # +=, -= etc. #
+ [:TkASSOC, TkOp, "=>"],
+ [:TkQUESTION, TkOp, "?"], #?
+ [:TkCOLON, TkOp, ":"], #:
+
+ [:TkfLPAREN], # func( #
+ [:TkfLBRACK], # func[ #
+ [:TkfLBRACE], # func{ #
+ [:TkSTAR], # *arg
+ [:TkAMPER], # &arg #
+ [:TkSYMBOL, TkId], # :SYMBOL
+ [:TkSYMBEG, TkId],
+ [:TkGT, TkOp, ">"],
+ [:TkLT, TkOp, "<"],
+ [:TkPLUS, TkOp, "+"],
+ [:TkMINUS, TkOp, "-"],
+ [:TkMULT, TkOp, "*"],
+ [:TkDIV, TkOp, "/"],
+ [:TkMOD, TkOp, "%"],
+ [:TkBITOR, TkOp, "|"],
+ [:TkBITXOR, TkOp, "^"],
+ [:TkBITAND, TkOp, "&"],
+ [:TkBITNOT, TkOp, "~"],
+ [:TkNOTOP, TkOp, "!"],
+
+ [:TkBACKQUOTE, TkOp, "`"],
+
+ [:TkASSIGN, Token, "="],
+ [:TkDOT, Token, "."],
+ [:TkLPAREN, Token, "("], #(exp)
+ [:TkLBRACK, Token, "["], #[arry]
+ [:TkLBRACE, Token, "{"], #{hash}
+ [:TkRPAREN, Token, ")"],
+ [:TkRBRACK, Token, "]"],
+ [:TkRBRACE, Token, "}"],
+ [:TkCOMMA, Token, ","],
+ [:TkSEMICOLON, Token, ";"],
+
+ [:TkRD_COMMENT],
+ [:TkSPACE],
+ [:TkNL],
+ [:TkEND_OF_SCRIPT],
+
+ [:TkBACKSLASH, TkUnknownChar, "\\"],
+ [:TkAT, TkUnknownChar, "@"],
+ [:TkDOLLAR, TkUnknownChar, "\$"], #"
+ ]
+
+ # {reading => token_class}
+ # {reading => [token_class, *opt]}
+ TkReading2Token = {}
+ TkSymbol2Token = {}
+
+ def RubyToken.def_token(token_n, super_token = Token, reading = nil, *opts)
+ token_n = token_n.id2name unless token_n.kind_of?(String)
+ if RubyToken.const_defined?(token_n)
+ IRB.fail AlreadyDefinedToken, token_n
+ end
+
+ token_c = Class.new super_token
+ RubyToken.const_set token_n, token_c
+# token_c.inspect
+
+ if reading
+ if TkReading2Token[reading]
+ IRB.fail TkReading2TokenDuplicateError, token_n, reading
+ end
+ if opts.empty?
+ TkReading2Token[reading] = [token_c]
+ else
+ TkReading2Token[reading] = [token_c].concat(opts)
+ end
+ end
+ TkSymbol2Token[token_n.intern] = token_c
+
+ if token_c <= TkOp
+ token_c.class_eval %{
+ def self.op_name; "#{reading}"; end
+ }
+ end
+ end
+
+ for defs in TokenDefinitions
+ def_token(*defs)
+ end
+
+ NEWLINE_TOKEN = TkNL.new(0,0)
+ NEWLINE_TOKEN.set_text("\n")
+
+end
+
+
+
+# Lexical analyzer for Ruby source
+
+class RubyLex
+
+ ######################################################################
+ #
+ # Read an input stream character by character. We allow for unlimited
+ # ungetting of characters just read.
+ #
+ # We simplify the implementation greatly by reading the entire input
+ # into a buffer initially, and then simply traversing it using
+ # pointers.
+ #
+ # We also have to allow for the <i>here document diversion</i>. This
+ # little gem comes about when the lexer encounters a here
+ # document. At this point we effectively need to split the input
+ # stream into two parts: one to read the body of the here document,
+ # the other to read the rest of the input line where the here
+ # document was initially encountered. For example, we might have
+ #
+ # do_something(<<-A, <<-B)
+ # stuff
+ # for
+ # A
+ # stuff
+ # for
+ # B
+ #
+ # When the lexer encounters the <<A, it reads until the end of the
+ # line, and keeps it around for later. It then reads the body of the
+ # here document. Once complete, it needs to read the rest of the
+ # original line, but then skip the here document body.
+ #
+
+ class BufferedReader
+
+ attr_reader :line_num
+
+ def initialize(content)
+ if /\t/ =~ content
+ tab_width = Options.instance.tab_width
+ content = content.split(/\n/).map do |line|
+ 1 while line.gsub!(/\t+/) { ' ' * (tab_width*$&.length - $`.length % tab_width)} && $~ #`
+ line
+ end .join("\n")
+ end
+ @content = content
+ @content << "\n" unless @content[-1,1] == "\n"
+ @size = @content.size
+ @offset = 0
+ @hwm = 0
+ @line_num = 1
+ @read_back_offset = 0
+ @last_newline = 0
+ @newline_pending = false
+ end
+
+ def column
+ @offset - @last_newline
+ end
+
+ def getc
+ return nil if @offset >= @size
+ ch = @content[@offset, 1]
+
+ @offset += 1
+ @hwm = @offset if @hwm < @offset
+
+ if @newline_pending
+ @line_num += 1
+ @last_newline = @offset - 1
+ @newline_pending = false
+ end
+
+ if ch == "\n"
+ @newline_pending = true
+ end
+ ch
+ end
+
+ def getc_already_read
+ getc
+ end
+
+ def ungetc(ch)
+ raise "unget past beginning of file" if @offset <= 0
+ @offset -= 1
+ if @content[@offset] == ?\n
+ @newline_pending = false
+ end
+ end
+
+ def get_read
+ res = @content[@read_back_offset...@offset]
+ @read_back_offset = @offset
+ res
+ end
+
+ def peek(at)
+ pos = @offset + at
+ if pos >= @size
+ nil
+ else
+ @content[pos, 1]
+ end
+ end
+
+ def peek_equal(str)
+ @content[@offset, str.length] == str
+ end
+
+ def divert_read_from(reserve)
+ @content[@offset, 0] = reserve
+ @size = @content.size
+ end
+ end
+
+ # end of nested class BufferedReader
+
+ extend Exception2MessageMapper
+ def_exception(:AlreadyDefinedToken, "Already defined token(%s)")
+ def_exception(:TkReading2TokenNoKey, "key nothing(key='%s')")
+ def_exception(:TkSymbol2TokenNoKey, "key nothing(key='%s')")
+ def_exception(:TkReading2TokenDuplicateError,
+ "key duplicate(token_n='%s', key='%s')")
+ def_exception(:SyntaxError, "%s")
+
+ include RubyToken
+ include IRB
+
+ attr_reader :continue
+ attr_reader :lex_state
+
+ def RubyLex.debug?
+ false
+ end
+
+ def initialize(content)
+ lex_init
+
+ @reader = BufferedReader.new(content)
+
+ @exp_line_no = @line_no = 1
+ @base_char_no = 0
+ @indent = 0
+
+ @ltype = nil
+ @quoted = nil
+ @lex_state = EXPR_BEG
+ @space_seen = false
+
+ @continue = false
+ @line = ""
+
+ @skip_space = false
+ @read_auto_clean_up = false
+ @exception_on_syntax_error = true
+ end
+
+ attr :skip_space, true
+ attr :read_auto_clean_up, true
+ attr :exception_on_syntax_error, true
+
+ attr :indent
+
+ # io functions
+ def line_no
+ @reader.line_num
+ end
+
+ def char_no
+ @reader.column
+ end
+
+ def get_read
+ @reader.get_read
+ end
+
+ def getc
+ @reader.getc
+ end
+
+ def getc_of_rests
+ @reader.getc_already_read
+ end
+
+ def gets
+ c = getc or return
+ l = ""
+ begin
+ l.concat c unless c == "\r"
+ break if c == "\n"
+ end while c = getc
+ l
+ end
+
+
+ def ungetc(c = nil)
+ @reader.ungetc(c)
+ end
+
+ def peek_equal?(str)
+ @reader.peek_equal(str)
+ end
+
+ def peek(i = 0)
+ @reader.peek(i)
+ end
+
+ def lex
+ until (((tk = token).kind_of?(TkNL) || tk.kind_of?(TkEND_OF_SCRIPT)) &&
+ !@continue or
+ tk.nil?)
+ end
+ line = get_read
+
+ if line == "" and tk.kind_of?(TkEND_OF_SCRIPT) || tk.nil?
+ nil
+ else
+ line
+ end
+ end
+
+ def token
+ set_token_position(line_no, char_no)
+ begin
+ begin
+ tk = @OP.match(self)
+ @space_seen = tk.kind_of?(TkSPACE)
+ rescue SyntaxError
+ abort if @exception_on_syntax_error
+ tk = TkError.new(line_no, char_no)
+ end
+ end while @skip_space and tk.kind_of?(TkSPACE)
+ if @read_auto_clean_up
+ get_read
+ end
+# throw :eof unless tk
+ p tk if $DEBUG
+ tk
+ end
+
+ ENINDENT_CLAUSE = [
+ "case", "class", "def", "do", "for", "if",
+ "module", "unless", "until", "while", "begin" #, "when"
+ ]
+ DEINDENT_CLAUSE = ["end" #, "when"
+ ]
+
+ PERCENT_LTYPE = {
+ "q" => "\'",
+ "Q" => "\"",
+ "x" => "\`",
+ "r" => "/",
+ "w" => "]"
+ }
+
+ PERCENT_PAREN = {
+ "{" => "}",
+ "[" => "]",
+ "<" => ">",
+ "(" => ")"
+ }
+
+ Ltype2Token = {
+ "\'" => TkSTRING,
+ "\"" => TkSTRING,
+ "\`" => TkXSTRING,
+ "/" => TkREGEXP,
+ "]" => TkDSTRING
+ }
+ Ltype2Token.default = TkSTRING
+
+ DLtype2Token = {
+ "\"" => TkDSTRING,
+ "\`" => TkDXSTRING,
+ "/" => TkDREGEXP,
+ }
+
+ def lex_init()
+ @OP = SLex.new
+ @OP.def_rules("\0", "\004", "\032") do |chars, io|
+ Token(TkEND_OF_SCRIPT).set_text(chars)
+ end
+
+ @OP.def_rules(" ", "\t", "\f", "\r", "\13") do |chars, io|
+ @space_seen = TRUE
+ while (ch = getc) =~ /[ \t\f\r\13]/
+ chars << ch
+ end
+ ungetc
+ Token(TkSPACE).set_text(chars)
+ end
+
+ @OP.def_rule("#") do
+ |op, io|
+ identify_comment
+ end
+
+ @OP.def_rule("=begin", proc{@prev_char_no == 0 && peek(0) =~ /\s/}) do
+ |op, io|
+ str = op
+ @ltype = "="
+
+
+ begin
+ line = ""
+ begin
+ ch = getc
+ line << ch
+ end until ch == "\n"
+ str << line
+ end until line =~ /^=end/
+
+ ungetc
+
+ @ltype = nil
+
+ if str =~ /\A=begin\s+rdoc/i
+ str.sub!(/\A=begin.*\n/, '')
+ str.sub!(/^=end.*/m, '')
+ Token(TkCOMMENT).set_text(str)
+ else
+ Token(TkRD_COMMENT)#.set_text(str)
+ end
+ end
+
+ @OP.def_rule("\n") do
+ print "\\n\n" if RubyLex.debug?
+ case @lex_state
+ when EXPR_BEG, EXPR_FNAME, EXPR_DOT
+ @continue = TRUE
+ else
+ @continue = FALSE
+ @lex_state = EXPR_BEG
+ end
+ Token(TkNL).set_text("\n")
+ end
+
+ @OP.def_rules("*", "**",
+ "!", "!=", "!~",
+ "=", "==", "===",
+ "=~", "<=>",
+ "<", "<=",
+ ">", ">=", ">>") do
+ |op, io|
+ @lex_state = EXPR_BEG
+ Token(op).set_text(op)
+ end
+
+ @OP.def_rules("<<") do
+ |op, io|
+ tk = nil
+ if @lex_state != EXPR_END && @lex_state != EXPR_CLASS &&
+ (@lex_state != EXPR_ARG || @space_seen)
+ c = peek(0)
+ if /[-\w_\"\'\`]/ =~ c
+ tk = identify_here_document
+ end
+ end
+ if !tk
+ @lex_state = EXPR_BEG
+ tk = Token(op).set_text(op)
+ end
+ tk
+ end
+
+ @OP.def_rules("'", '"') do
+ |op, io|
+ identify_string(op)
+ end
+
+ @OP.def_rules("`") do
+ |op, io|
+ if @lex_state == EXPR_FNAME
+ Token(op).set_text(op)
+ else
+ identify_string(op)
+ end
+ end
+
+ @OP.def_rules('?') do
+ |op, io|
+ if @lex_state == EXPR_END
+ @lex_state = EXPR_BEG
+ Token(TkQUESTION).set_text(op)
+ else
+ ch = getc
+ if @lex_state == EXPR_ARG && ch !~ /\s/
+ ungetc
+ @lex_state = EXPR_BEG;
+ Token(TkQUESTION).set_text(op)
+ else
+ str = op
+ str << ch
+ if (ch == '\\') #'
+ str << read_escape
+ end
+ @lex_state = EXPR_END
+ Token(TkINTEGER).set_text(str)
+ end
+ end
+ end
+
+ @OP.def_rules("&", "&&", "|", "||") do
+ |op, io|
+ @lex_state = EXPR_BEG
+ Token(op).set_text(op)
+ end
+
+ @OP.def_rules("+=", "-=", "*=", "**=",
+ "&=", "|=", "^=", "<<=", ">>=", "||=", "&&=") do
+ |op, io|
+ @lex_state = EXPR_BEG
+ op =~ /^(.*)=$/
+ Token(TkOPASGN, $1).set_text(op)
+ end
+
+ @OP.def_rule("+@", proc{@lex_state == EXPR_FNAME}) do |op, io|
+ Token(TkUPLUS).set_text(op)
+ end
+
+ @OP.def_rule("-@", proc{@lex_state == EXPR_FNAME}) do |op, io|
+ Token(TkUMINUS).set_text(op)
+ end
+
+ @OP.def_rules("+", "-") do
+ |op, io|
+ catch(:RET) do
+ if @lex_state == EXPR_ARG
+ if @space_seen and peek(0) =~ /[0-9]/
+ throw :RET, identify_number(op)
+ else
+ @lex_state = EXPR_BEG
+ end
+ elsif @lex_state != EXPR_END and peek(0) =~ /[0-9]/
+ throw :RET, identify_number(op)
+ else
+ @lex_state = EXPR_BEG
+ end
+ Token(op).set_text(op)
+ end
+ end
+
+ @OP.def_rule(".") do
+ @lex_state = EXPR_BEG
+ if peek(0) =~ /[0-9]/
+ ungetc
+ identify_number("")
+ else
+ # for obj.if
+ @lex_state = EXPR_DOT
+ Token(TkDOT).set_text(".")
+ end
+ end
+
+ @OP.def_rules("..", "...") do
+ |op, io|
+ @lex_state = EXPR_BEG
+ Token(op).set_text(op)
+ end
+
+ lex_int2
+ end
+
+ def lex_int2
+ @OP.def_rules("]", "}", ")") do
+ |op, io|
+ @lex_state = EXPR_END
+ @indent -= 1
+ Token(op).set_text(op)
+ end
+
+ @OP.def_rule(":") do
+ if @lex_state == EXPR_END || peek(0) =~ /\s/
+ @lex_state = EXPR_BEG
+ tk = Token(TkCOLON)
+ else
+ @lex_state = EXPR_FNAME;
+ tk = Token(TkSYMBEG)
+ end
+ tk.set_text(":")
+ end
+
+ @OP.def_rule("::") do
+# p @lex_state.id2name, @space_seen
+ if @lex_state == EXPR_BEG or @lex_state == EXPR_ARG && @space_seen
+ @lex_state = EXPR_BEG
+ tk = Token(TkCOLON3)
+ else
+ @lex_state = EXPR_DOT
+ tk = Token(TkCOLON2)
+ end
+ tk.set_text("::")
+ end
+
+ @OP.def_rule("/") do
+ |op, io|
+ if @lex_state == EXPR_BEG || @lex_state == EXPR_MID
+ identify_string(op)
+ elsif peek(0) == '='
+ getc
+ @lex_state = EXPR_BEG
+ Token(TkOPASGN, :/).set_text("/=") #")
+ elsif @lex_state == EXPR_ARG and @space_seen and peek(0) !~ /\s/
+ identify_string(op)
+ else
+ @lex_state = EXPR_BEG
+ Token("/").set_text(op)
+ end
+ end
+
+ @OP.def_rules("^") do
+ @lex_state = EXPR_BEG
+ Token("^").set_text("^")
+ end
+
+ # @OP.def_rules("^=") do
+ # @lex_state = EXPR_BEG
+ # Token(TkOPASGN, :^)
+ # end
+
+ @OP.def_rules(",", ";") do
+ |op, io|
+ @lex_state = EXPR_BEG
+ Token(op).set_text(op)
+ end
+
+ @OP.def_rule("~") do
+ @lex_state = EXPR_BEG
+ Token("~").set_text("~")
+ end
+
+ @OP.def_rule("~@", proc{@lex_state = EXPR_FNAME}) do
+ @lex_state = EXPR_BEG
+ Token("~").set_text("~@")
+ end
+
+ @OP.def_rule("(") do
+ @indent += 1
+ if @lex_state == EXPR_BEG || @lex_state == EXPR_MID
+ @lex_state = EXPR_BEG
+ tk = Token(TkfLPAREN)
+ else
+ @lex_state = EXPR_BEG
+ tk = Token(TkLPAREN)
+ end
+ tk.set_text("(")
+ end
+
+ @OP.def_rule("[]", proc{@lex_state == EXPR_FNAME}) do
+ Token("[]").set_text("[]")
+ end
+
+ @OP.def_rule("[]=", proc{@lex_state == EXPR_FNAME}) do
+ Token("[]=").set_text("[]=")
+ end
+
+ @OP.def_rule("[") do
+ @indent += 1
+ if @lex_state == EXPR_FNAME
+ t = Token(TkfLBRACK)
+ else
+ if @lex_state == EXPR_BEG || @lex_state == EXPR_MID
+ t = Token(TkLBRACK)
+ elsif @lex_state == EXPR_ARG && @space_seen
+ t = Token(TkLBRACK)
+ else
+ t = Token(TkfLBRACK)
+ end
+ @lex_state = EXPR_BEG
+ end
+ t.set_text("[")
+ end
+
+ @OP.def_rule("{") do
+ @indent += 1
+ if @lex_state != EXPR_END && @lex_state != EXPR_ARG
+ t = Token(TkLBRACE)
+ else
+ t = Token(TkfLBRACE)
+ end
+ @lex_state = EXPR_BEG
+ t.set_text("{")
+ end
+
+ @OP.def_rule('\\') do #'
+ if getc == "\n"
+ @space_seen = true
+ @continue = true
+ Token(TkSPACE).set_text("\\\n")
+ else
+ ungetc
+ Token("\\").set_text("\\") #"
+ end
+ end
+
+ @OP.def_rule('%') do
+ |op, io|
+ if @lex_state == EXPR_BEG || @lex_state == EXPR_MID
+ identify_quotation('%')
+ elsif peek(0) == '='
+ getc
+ Token(TkOPASGN, "%").set_text("%=")
+ elsif @lex_state == EXPR_ARG and @space_seen and peek(0) !~ /\s/
+ identify_quotation('%')
+ else
+ @lex_state = EXPR_BEG
+ Token("%").set_text("%")
+ end
+ end
+
+ @OP.def_rule('$') do #'
+ identify_gvar
+ end
+
+ @OP.def_rule('@') do
+ if peek(0) =~ /[@\w_]/
+ ungetc
+ identify_identifier
+ else
+ Token("@").set_text("@")
+ end
+ end
+
+ # @OP.def_rule("def", proc{|op, io| /\s/ =~ io.peek(0)}) do
+ # |op, io|
+ # @indent += 1
+ # @lex_state = EXPR_FNAME
+ # # @lex_state = EXPR_END
+ # # until @rests[0] == "\n" or @rests[0] == ";"
+ # # rests.shift
+ # # end
+ # end
+
+ @OP.def_rule("__END__", proc{@prev_char_no == 0 && peek(0) =~ /[\r\n]/}) do
+ throw :eof
+ end
+
+ @OP.def_rule("") do
+ |op, io|
+ printf "MATCH: start %s: %s\n", op, io.inspect if RubyLex.debug?
+ if peek(0) =~ /[0-9]/
+ t = identify_number("")
+ elsif peek(0) =~ /[\w_]/
+ t = identify_identifier
+ end
+ printf "MATCH: end %s: %s\n", op, io.inspect if RubyLex.debug?
+ t
+ end
+
+ p @OP if RubyLex.debug?
+ end
+
+ def identify_gvar
+ @lex_state = EXPR_END
+ str = "$"
+
+ tk = case ch = getc
+ when /[~_*$?!@\/\\;,=:<>".]/ #"
+ str << ch
+ Token(TkGVAR, str)
+
+ when "-"
+ str << "-" << getc
+ Token(TkGVAR, str)
+
+ when "&", "`", "'", "+"
+ str << ch
+ Token(TkBACK_REF, str)
+
+ when /[1-9]/
+ str << ch
+ while (ch = getc) =~ /[0-9]/
+ str << ch
+ end
+ ungetc
+ Token(TkNTH_REF)
+ when /\w/
+ ungetc
+ ungetc
+ return identify_identifier
+ else
+ ungetc
+ Token("$")
+ end
+ tk.set_text(str)
+ end
+
+ def identify_identifier
+ token = ""
+ token.concat getc if peek(0) =~ /[$@]/
+ token.concat getc if peek(0) == "@"
+
+ while (ch = getc) =~ /\w|_/
+ print ":", ch, ":" if RubyLex.debug?
+ token.concat ch
+ end
+ ungetc
+
+ if ch == "!" or ch == "?"
+ token.concat getc
+ end
+ # fix token
+
+ # $stderr.puts "identifier - #{token}, state = #@lex_state"
+
+ case token
+ when /^\$/
+ return Token(TkGVAR, token).set_text(token)
+ when /^\@/
+ @lex_state = EXPR_END
+ return Token(TkIVAR, token).set_text(token)
+ end
+
+ if @lex_state != EXPR_DOT
+ print token, "\n" if RubyLex.debug?
+
+ token_c, *trans = TkReading2Token[token]
+ if token_c
+ # reserved word?
+
+ if (@lex_state != EXPR_BEG &&
+ @lex_state != EXPR_FNAME &&
+ trans[1])
+ # modifiers
+ token_c = TkSymbol2Token[trans[1]]
+ @lex_state = trans[0]
+ else
+ if @lex_state != EXPR_FNAME
+ if ENINDENT_CLAUSE.include?(token)
+ @indent += 1
+ elsif DEINDENT_CLAUSE.include?(token)
+ @indent -= 1
+ end
+ @lex_state = trans[0]
+ else
+ @lex_state = EXPR_END
+ end
+ end
+ return Token(token_c, token).set_text(token)
+ end
+ end
+
+ if @lex_state == EXPR_FNAME
+ @lex_state = EXPR_END
+ if peek(0) == '='
+ token.concat getc
+ end
+ elsif @lex_state == EXPR_BEG || @lex_state == EXPR_DOT
+ @lex_state = EXPR_ARG
+ else
+ @lex_state = EXPR_END
+ end
+
+ if token[0, 1] =~ /[A-Z]/
+ return Token(TkCONSTANT, token).set_text(token)
+ elsif token[token.size - 1, 1] =~ /[!?]/
+ return Token(TkFID, token).set_text(token)
+ else
+ return Token(TkIDENTIFIER, token).set_text(token)
+ end
+ end
+
+ def identify_here_document
+ ch = getc
+ if ch == "-"
+ ch = getc
+ indent = true
+ end
+ if /['"`]/ =~ ch # '
+ lt = ch
+ quoted = ""
+ while (c = getc) && c != lt
+ quoted.concat c
+ end
+ else
+ lt = '"'
+ quoted = ch.dup
+ while (c = getc) && c =~ /\w/
+ quoted.concat c
+ end
+ ungetc
+ end
+
+ ltback, @ltype = @ltype, lt
+ reserve = ""
+
+ while ch = getc
+ reserve << ch
+ if ch == "\\" #"
+ ch = getc
+ reserve << ch
+ elsif ch == "\n"
+ break
+ end
+ end
+
+ str = ""
+ while (l = gets)
+ l.chomp!
+ l.strip! if indent
+ break if l == quoted
+ str << l.chomp << "\n"
+ end
+
+ @reader.divert_read_from(reserve)
+
+ @ltype = ltback
+ @lex_state = EXPR_END
+ Token(Ltype2Token[lt], str).set_text(str.dump)
+ end
+
+ def identify_quotation(initial_char)
+ ch = getc
+ if lt = PERCENT_LTYPE[ch]
+ initial_char += ch
+ ch = getc
+ elsif ch =~ /\W/
+ lt = "\""
+ else
+ RubyLex.fail SyntaxError, "unknown type of %string ('#{ch}')"
+ end
+# if ch !~ /\W/
+# ungetc
+# next
+# end
+ #@ltype = lt
+ @quoted = ch unless @quoted = PERCENT_PAREN[ch]
+ identify_string(lt, @quoted, ch, initial_char)
+ end
+
+ def identify_number(start)
+ str = start.dup
+
+ if start == "+" or start == "-" or start == ""
+ start = getc
+ str << start
+ end
+
+ @lex_state = EXPR_END
+
+ if start == "0"
+ if peek(0) == "x"
+ ch = getc
+ str << ch
+ match = /[0-9a-f_]/
+ else
+ match = /[0-7_]/
+ end
+ while ch = getc
+ if ch !~ match
+ ungetc
+ break
+ else
+ str << ch
+ end
+ end
+ return Token(TkINTEGER).set_text(str)
+ end
+
+ type = TkINTEGER
+ allow_point = TRUE
+ allow_e = TRUE
+ while ch = getc
+ case ch
+ when /[0-9_]/
+ str << ch
+
+ when allow_point && "."
+ type = TkFLOAT
+ if peek(0) !~ /[0-9]/
+ ungetc
+ break
+ end
+ str << ch
+ allow_point = false
+
+ when allow_e && "e", allow_e && "E"
+ str << ch
+ type = TkFLOAT
+ if peek(0) =~ /[+-]/
+ str << getc
+ end
+ allow_e = false
+ allow_point = false
+ else
+ ungetc
+ break
+ end
+ end
+ Token(type).set_text(str)
+ end
+
+ def identify_string(ltype, quoted = ltype, opener=nil, initial_char = nil)
+ @ltype = ltype
+ @quoted = quoted
+ subtype = nil
+
+ str = ""
+ str << initial_char if initial_char
+ str << (opener||quoted)
+
+ nest = 0
+ begin
+ while ch = getc
+ str << ch
+ if @quoted == ch
+ if nest == 0
+ break
+ else
+ nest -= 1
+ end
+ elsif opener == ch
+ nest += 1
+ elsif @ltype != "'" && @ltype != "]" and ch == "#"
+ ch = getc
+ if ch == "{"
+ subtype = true
+ str << ch << skip_inner_expression
+ else
+ ungetc(ch)
+ end
+ elsif ch == '\\' #'
+ str << read_escape
+ end
+ end
+ if @ltype == "/"
+ if peek(0) =~ /i|o|n|e|s/
+ str << getc
+ end
+ end
+ if subtype
+ Token(DLtype2Token[ltype], str)
+ else
+ Token(Ltype2Token[ltype], str)
+ end.set_text(str)
+ ensure
+ @ltype = nil
+ @quoted = nil
+ @lex_state = EXPR_END
+ end
+ end
+
+ def skip_inner_expression
+ res = ""
+ nest = 0
+ while (ch = getc)
+ res << ch
+ if ch == '}'
+ break if nest.zero?
+ nest -= 1
+ elsif ch == '{'
+ nest += 1
+ end
+ end
+ res
+ end
+
+ def identify_comment
+ @ltype = "#"
+ comment = "#"
+ while ch = getc
+ if ch == "\\"
+ ch = getc
+ if ch == "\n"
+ ch = " "
+ else
+ comment << "\\"
+ end
+ else
+ if ch == "\n"
+ @ltype = nil
+ ungetc
+ break
+ end
+ end
+ comment << ch
+ end
+ return Token(TkCOMMENT).set_text(comment)
+ end
+
+ def read_escape
+ res = ""
+ case ch = getc
+ when /[0-7]/
+ ungetc ch
+ 3.times do
+ case ch = getc
+ when /[0-7]/
+ when nil
+ break
+ else
+ ungetc
+ break
+ end
+ res << ch
+ end
+
+ when "x"
+ res << ch
+ 2.times do
+ case ch = getc
+ when /[0-9a-fA-F]/
+ when nil
+ break
+ else
+ ungetc
+ break
+ end
+ res << ch
+ end
+
+ when "M"
+ res << ch
+ if (ch = getc) != '-'
+ ungetc
+ else
+ res << ch
+ if (ch = getc) == "\\" #"
+ res << ch
+ res << read_escape
+ else
+ res << ch
+ end
+ end
+
+ when "C", "c" #, "^"
+ res << ch
+ if ch == "C" and (ch = getc) != "-"
+ ungetc
+ else
+ res << ch
+ if (ch = getc) == "\\" #"
+ res << ch
+ res << read_escape
+ else
+ res << ch
+ end
+ end
+ else
+ res << ch
+ end
+ res
+ end
+end
+
+
+
+# Extract code elements from a source file, returning a TopLevel
+# object containing the constituent file elements.
+#
+# This file is based on rtags
+
+module RDoc
+
+ GENERAL_MODIFIERS = [ 'nodoc' ].freeze
+
+ CLASS_MODIFIERS = GENERAL_MODIFIERS
+
+ ATTR_MODIFIERS = GENERAL_MODIFIERS
+
+ CONSTANT_MODIFIERS = GENERAL_MODIFIERS
+
+ METHOD_MODIFIERS = GENERAL_MODIFIERS +
+ [ 'arg', 'args', 'yield', 'yields', 'notnew', 'not-new', 'not_new', 'doc' ]
+
+
+ class RubyParser
+ include RubyToken
+ include TokenStream
+
+ extend ParserFactory
+
+ parse_files_matching(/\.rbw?$/)
+
+
+ def initialize(top_level, file_name, content, options, stats)
+ @options = options
+ @stats = stats
+ @size = 0
+ @token_listeners = nil
+ @input_file_name = file_name
+ @scanner = RubyLex.new(content)
+ @scanner.exception_on_syntax_error = false
+ @top_level = top_level
+ @progress = $stderr unless options.quiet
+ end
+
+ def scan
+ @tokens = []
+ @unget_read = []
+ @read = []
+ catch(:eof) do
+ catch(:enddoc) do
+ begin
+ parse_toplevel_statements(@top_level)
+ rescue Exception => e
+ $stderr.puts "\n\n"
+ $stderr.puts "RDoc failure in #@input_file_name at or around " +
+ "line #{@scanner.line_no} column #{@scanner.char_no}"
+ $stderr.puts
+ $stderr.puts "Before reporting this, could you check that the file"
+ $stderr.puts "you're documenting compiles cleanly--RDoc is not a"
+ $stderr.puts "full Ruby parser, and gets confused easily if fed"
+ $stderr.puts "invalid programs."
+ $stderr.puts
+ $stderr.puts "The internal error was:\n\n"
+
+ e.set_backtrace(e.backtrace[0,4])
+ raise
+ end
+ end
+ end
+ @top_level
+ end
+
+ private
+
+ def make_message(msg)
+ prefix = "\n" + @input_file_name + ":"
+ if @scanner
+ prefix << "#{@scanner.line_no}:#{@scanner.char_no}: "
+ end
+ return prefix + msg
+ end
+
+ def warn(msg)
+ return if @options.quiet
+ msg = make_message msg
+ $stderr.puts msg
+ end
+
+ def error(msg)
+ msg = make_message msg
+ $stderr.puts msg
+ exit(1)
+ end
+
+ def progress(char)
+ unless @options.quiet
+ @progress.print(char)
+ @progress.flush
+ end
+ end
+
+ def add_token_listener(obj)
+ @token_listeners ||= []
+ @token_listeners << obj
+ end
+
+ def remove_token_listener(obj)
+ @token_listeners.delete(obj)
+ end
+
+ def get_tk
+ tk = nil
+ if @tokens.empty?
+ tk = @scanner.token
+ @read.push @scanner.get_read
+ puts "get_tk1 => #{tk.inspect}" if $TOKEN_DEBUG
+ else
+ @read.push @unget_read.shift
+ tk = @tokens.shift
+ puts "get_tk2 => #{tk.inspect}" if $TOKEN_DEBUG
+ end
+
+ if tk.kind_of?(TkSYMBEG)
+ set_token_position(tk.line_no, tk.char_no)
+ tk1 = get_tk
+ if tk1.kind_of?(TkId) || tk1.kind_of?(TkOp)
+ tk = Token(TkSYMBOL).set_text(":" + tk1.name)
+ # remove the identifier we just read (we're about to
+ # replace it with a symbol)
+ @token_listeners.each do |obj|
+ obj.pop_token
+ end if @token_listeners
+ else
+ warn("':' not followed by identifier or operator")
+ tk = tk1
+ end
+ end
+
+ # inform any listeners of our shiny new token
+ @token_listeners.each do |obj|
+ obj.add_token(tk)
+ end if @token_listeners
+
+ tk
+ end
+
+ def peek_tk
+ unget_tk(tk = get_tk)
+ tk
+ end
+
+ def unget_tk(tk)
+ @tokens.unshift tk
+ @unget_read.unshift @read.pop
+
+ # Remove this token from any listeners
+ @token_listeners.each do |obj|
+ obj.pop_token
+ end if @token_listeners
+ end
+
+ def skip_tkspace(skip_nl = true)
+ tokens = []
+ while ((tk = get_tk).kind_of?(TkSPACE) ||
+ (skip_nl && tk.kind_of?(TkNL)))
+ tokens.push tk
+ end
+ unget_tk(tk)
+ tokens
+ end
+
+ def get_tkread
+ read = @read.join("")
+ @read = []
+ read
+ end
+
+ def peek_read
+ @read.join('')
+ end
+
+ NORMAL = "::"
+ SINGLE = "<<"
+
+ # Look for the first comment in a file that isn't
+ # a shebang line.
+
+ def collect_first_comment
+ skip_tkspace
+ res = ''
+ first_line = true
+
+ tk = get_tk
+ while tk.kind_of?(TkCOMMENT)
+ if first_line && /\A#!/ =~ tk.text
+ skip_tkspace
+ tk = get_tk
+ elsif first_line && /\A#\s*-\*-/ =~ tk.text
+ first_line = false
+ skip_tkspace
+ tk = get_tk
+ else
+ first_line = false
+ res << tk.text << "\n"
+ tk = get_tk
+ if tk.kind_of? TkNL
+ skip_tkspace(false)
+ tk = get_tk
+ end
+ end
+ end
+ unget_tk(tk)
+ res
+ end
+
+ def parse_toplevel_statements(container)
+ comment = collect_first_comment
+ look_for_directives_in(container, comment)
+ container.comment = comment unless comment.empty?
+ parse_statements(container, NORMAL, nil, comment)
+ end
+
+ def parse_statements(container, single=NORMAL, current_method=nil, comment='')
+ nest = 1
+ save_visibility = container.visibility
+
+# if container.kind_of?(TopLevel)
+# else
+# comment = ''
+# end
+
+ non_comment_seen = true
+
+ while tk = get_tk
+
+ keep_comment = false
+
+ non_comment_seen = true unless tk.kind_of?(TkCOMMENT)
+
+ case tk
+
+ when TkNL
+ skip_tkspace(true) # Skip blanks and newlines
+ tk = get_tk
+ if tk.kind_of?(TkCOMMENT)
+ if non_comment_seen
+ comment = ''
+ non_comment_seen = false
+ end
+ while tk.kind_of?(TkCOMMENT)
+ comment << tk.text << "\n"
+ tk = get_tk # this is the newline
+ skip_tkspace(false) # leading spaces
+ tk = get_tk
+ end
+ unless comment.empty?
+ look_for_directives_in(container, comment)
+ if container.done_documenting
+ container.ongoing_visibility = save_visibility
+# return
+ end
+ end
+ keep_comment = true
+ else
+ non_comment_seen = true
+ end
+ unget_tk(tk)
+ keep_comment = true
+
+
+ when TkCLASS
+ if container.document_children
+ parse_class(container, single, tk, comment)
+ else
+ nest += 1
+ end
+
+ when TkMODULE
+ if container.document_children
+ parse_module(container, single, tk, comment)
+ else
+ nest += 1
+ end
+
+ when TkDEF
+ if container.document_self
+ parse_method(container, single, tk, comment)
+ else
+ nest += 1
+ end
+
+ when TkCONSTANT
+ if container.document_self
+ parse_constant(container, single, tk, comment)
+ end
+
+ when TkALIAS
+ if container.document_self
+ parse_alias(container, single, tk, comment)
+ end
+
+ when TkYIELD
+ if current_method.nil?
+ warn("Warning: yield outside of method") if container.document_self
+ else
+ parse_yield(container, single, tk, current_method)
+ end
+
+ # Until and While can have a 'do', which shouldn't increas
+ # the nesting. We can't solve the general case, but we can
+ # handle most occurrences by ignoring a do at the end of a line
+
+ when TkUNTIL, TkWHILE
+ nest += 1
+ puts "FOUND #{tk.class} in #{container.name}, nest = #{nest}, " +
+ "line #{tk.line_no}" if $DEBUG
+ skip_optional_do_after_expression
+
+ # 'for' is trickier
+ when TkFOR
+ nest += 1
+ puts "FOUND #{tk.class} in #{container.name}, nest = #{nest}, " +
+ "line #{tk.line_no}" if $DEBUG
+ skip_for_variable
+ skip_optional_do_after_expression
+
+ when TkCASE, TkDO, TkIF, TkUNLESS, TkBEGIN
+ nest += 1
+ puts "Found #{tk.class} in #{container.name}, nest = #{nest}, " +
+ "line #{tk.line_no}" if $DEBUG
+
+ when TkIDENTIFIER
+ if nest == 1 and current_method.nil?
+ case tk.name
+ when "private", "protected", "public",
+ "private_class_method", "public_class_method"
+ parse_visibility(container, single, tk)
+ keep_comment = true
+ when "attr"
+ parse_attr(container, single, tk, comment)
+ when /^attr_(reader|writer|accessor)$/, @options.extra_accessors
+ parse_attr_accessor(container, single, tk, comment)
+ when "alias_method"
+ if container.document_self
+ parse_alias(container, single, tk, comment)
+ end
+ end
+ end
+
+ case tk.name
+ when "require"
+ parse_require(container, comment)
+ when "include"
+ parse_include(container, comment)
+ end
+
+
+ when TkEND
+ nest -= 1
+ puts "Found 'end' in #{container.name}, nest = #{nest}, line #{tk.line_no}" if $DEBUG
+ puts "Method = #{current_method.name}" if $DEBUG and current_method
+ if nest == 0
+ read_documentation_modifiers(container, CLASS_MODIFIERS)
+ container.ongoing_visibility = save_visibility
+ return
+ end
+
+ end
+
+ comment = '' unless keep_comment
+ begin
+ get_tkread
+ skip_tkspace(false)
+ end while peek_tk == TkNL
+
+ end
+ end
+
+ def parse_class(container, single, tk, comment, &block)
+ progress("c")
+
+ @stats.num_classes += 1
+
+ container, name_t = get_class_or_module(container)
+
+ case name_t
+ when TkCONSTANT
+ name = name_t.name
+ superclass = "Object"
+
+ if peek_tk.kind_of?(TkLT)
+ get_tk
+ skip_tkspace(true)
+ superclass = get_class_specification
+ superclass = "<unknown>" if superclass.empty?
+ end
+
+ if single == SINGLE
+ cls_type = SingleClass
+ else
+ cls_type = NormalClass
+ end
+
+ cls = container.add_class(cls_type, name, superclass)
+ read_documentation_modifiers(cls, CLASS_MODIFIERS)
+ cls.record_location(@top_level)
+ parse_statements(cls)
+ cls.comment = comment
+
+ when TkLSHFT
+ case name = get_class_specification
+ when "self", container.name
+ parse_statements(container, SINGLE, &block)
+ else
+ other = TopLevel.find_class_named(name)
+ unless other
+# other = @top_level.add_class(NormalClass, name, nil)
+# other.record_location(@top_level)
+# other.comment = comment
+ other = NormalClass.new("Dummy", nil)
+ end
+ read_documentation_modifiers(other, CLASS_MODIFIERS)
+ parse_statements(other, SINGLE, &block)
+ end
+
+ else
+ warn("Expected class name or '<<'. Got #{name_t.class}: #{name_t.text.inspect}")
+ end
+ end
+
+ def parse_module(container, single, tk, comment)
+ progress("m")
+ @stats.num_modules += 1
+ container, name_t = get_class_or_module(container)
+# skip_tkspace
+ name = name_t.name
+ mod = container.add_module(NormalModule, name)
+ mod.record_location(@top_level)
+ read_documentation_modifiers(mod, CLASS_MODIFIERS)
+ parse_statements(mod)
+ mod.comment = comment
+ end
+
+ # Look for the name of a class of module (optionally with a leading :: or
+ # with :: separated named) and return the ultimate name and container
+
+ def get_class_or_module(container)
+ skip_tkspace
+ name_t = get_tk
+
+ # class ::A -> A is in the top level
+ if name_t.kind_of?(TkCOLON2)
+ name_t = get_tk
+ container = @top_level
+ end
+
+ skip_tkspace(false)
+
+ while peek_tk.kind_of?(TkCOLON2)
+ prev_container = container
+ container = container.find_module_named(name_t.name)
+ if !container
+# warn("Couldn't find module #{name_t.name}")
+ container = prev_container.add_module(NormalModule, name_t.name)
+ end
+ get_tk
+ name_t = get_tk
+ end
+ skip_tkspace(false)
+ return [container, name_t]
+ end
+
+ def parse_constant(container, single, tk, comment)
+ name = tk.name
+ skip_tkspace(false)
+ eq_tk = get_tk
+
+ unless eq_tk.kind_of?(TkASSIGN)
+ unget_tk(eq_tk)
+ return
+ end
+
+
+ nest = 0
+ get_tkread
+
+ tk = get_tk
+ if tk.kind_of? TkGT
+ unget_tk(tk)
+ unget_tk(eq_tk)
+ return
+ end
+
+ loop do
+ puts("Param: #{tk}, #{@scanner.continue} " +
+ "#{@scanner.lex_state} #{nest}") if $DEBUG
+
+ case tk
+ when TkSEMICOLON
+ break
+ when TkLPAREN, TkfLPAREN
+ nest += 1
+ when TkRPAREN
+ nest -= 1
+ when TkCOMMENT
+ if nest <= 0 && @scanner.lex_state == EXPR_END
+ unget_tk(tk)
+ break
+ end
+ when TkNL
+ if (@scanner.lex_state == EXPR_END and nest <= 0) || !@scanner.continue
+ unget_tk(tk)
+ break
+ end
+ end
+ tk = get_tk
+ end
+
+ res = get_tkread.tr("\n", " ").strip
+ res = "" if res == ";"
+ con = Constant.new(name, res, comment)
+ read_documentation_modifiers(con, CONSTANT_MODIFIERS)
+ if con.document_self
+ container.add_constant(con)
+ end
+ end
+
+ def parse_method(container, single, tk, comment)
+ progress(".")
+ @stats.num_methods += 1
+ line_no = tk.line_no
+ column = tk.char_no
+
+ start_collecting_tokens
+ add_token(tk)
+ add_token_listener(self)
+
+ @scanner.instance_eval{@lex_state = EXPR_FNAME}
+ skip_tkspace(false)
+ name_t = get_tk
+ back_tk = skip_tkspace
+ meth = nil
+ added_container = false
+
+ dot = get_tk
+ if dot.kind_of?(TkDOT) or dot.kind_of?(TkCOLON2)
+ @scanner.instance_eval{@lex_state = EXPR_FNAME}
+ skip_tkspace
+ name_t2 = get_tk
+ case name_t
+ when TkSELF
+ name = name_t2.name
+ when TkCONSTANT
+ name = name_t2.name
+ prev_container = container
+ container = container.find_module_named(name_t.name)
+ if !container
+ added_container = true
+ obj = name_t.name.split("::").inject(Object) do |state, item|
+ state.const_get(item)
+ end rescue nil
+
+ type = obj.class == Class ? NormalClass : NormalModule
+ if not [Class, Module].include?(obj.class)
+ warn("Couldn't find #{name_t.name}. Assuming it's a module")
+ end
+
+ if type == NormalClass then
+ container = prev_container.add_class(type, name_t.name, obj.superclass.name)
+ else
+ container = prev_container.add_module(type, name_t.name)
+ end
+ end
+ else
+ # warn("Unexpected token '#{name_t2.inspect}'")
+ # break
+ skip_method(container)
+ return
+ end
+ meth = AnyMethod.new(get_tkread, name)
+ meth.singleton = true
+ else
+ unget_tk dot
+ back_tk.reverse_each do
+ |tk|
+ unget_tk tk
+ end
+ name = name_t.name
+
+ meth = AnyMethod.new(get_tkread, name)
+ meth.singleton = (single == SINGLE)
+ end
+
+ remove_token_listener(self)
+
+ meth.start_collecting_tokens
+ indent = TkSPACE.new(1,1)
+ indent.set_text(" " * column)
+
+ meth.add_tokens([TkCOMMENT.new(line_no,
+ 1,
+ "# File #{@top_level.file_absolute_name}, line #{line_no}"),
+ NEWLINE_TOKEN,
+ indent])
+
+ meth.add_tokens(@token_stream)
+
+ add_token_listener(meth)
+
+ @scanner.instance_eval{@continue = false}
+ parse_method_parameters(meth)
+
+ if meth.document_self
+ container.add_method(meth)
+ elsif added_container
+ container.document_self = false
+ end
+
+ # Having now read the method parameters and documentation modifiers, we
+ # now know whether we have to rename #initialize to ::new
+
+ if name == "initialize" && !meth.singleton
+ if meth.dont_rename_initialize
+ meth.visibility = :protected
+ else
+ meth.singleton = true
+ meth.name = "new"
+ meth.visibility = :public
+ end
+ end
+
+ parse_statements(container, single, meth)
+
+ remove_token_listener(meth)
+
+ # Look for a 'call-seq' in the comment, and override the
+ # normal parameter stuff
+
+ if comment.sub!(/:?call-seq:(.*?)^\s*\#?\s*$/m, '')
+ seq = $1
+ seq.gsub!(/^\s*\#\s*/, '')
+ meth.call_seq = seq
+ end
+
+ meth.comment = comment
+
+ end
+
+ def skip_method(container)
+ meth = AnyMethod.new("", "anon")
+ parse_method_parameters(meth)
+ parse_statements(container, false, meth)
+ end
+
+ # Capture the method's parameters. Along the way,
+ # look for a comment containing
+ #
+ # # yields: ....
+ #
+ # and add this as the block_params for the method
+
+ def parse_method_parameters(method)
+ res = parse_method_or_yield_parameters(method)
+ res = "(" + res + ")" unless res[0] == ?(
+ method.params = res unless method.params
+ if method.block_params.nil?
+ skip_tkspace(false)
+ read_documentation_modifiers(method, METHOD_MODIFIERS)
+ end
+ end
+
+ def parse_method_or_yield_parameters(method=nil, modifiers=METHOD_MODIFIERS)
+ skip_tkspace(false)
+ tk = get_tk
+
+ # Little hack going on here. In the statement
+ # f = 2*(1+yield)
+ # We see the RPAREN as the next token, so we need
+ # to exit early. This still won't catch all cases
+ # (such as "a = yield + 1"
+ end_token = case tk
+ when TkLPAREN, TkfLPAREN
+ TkRPAREN
+ when TkRPAREN
+ return ""
+ else
+ TkNL
+ end
+ nest = 0
+
+ loop do
+ puts("Param: #{tk.inspect}, #{@scanner.continue} " +
+ "#{@scanner.lex_state} #{nest}") if $DEBUG
+ case tk
+ when TkSEMICOLON
+ break
+ when TkLBRACE
+ nest += 1
+ when TkRBRACE
+ # we might have a.each {|i| yield i }
+ unget_tk(tk) if nest.zero?
+ nest -= 1
+ break if nest <= 0
+ when TkLPAREN, TkfLPAREN
+ nest += 1
+ when end_token
+ if end_token == TkRPAREN
+ nest -= 1
+ break if @scanner.lex_state == EXPR_END and nest <= 0
+ else
+ break unless @scanner.continue
+ end
+ when method && method.block_params.nil? && TkCOMMENT
+ unget_tk(tk)
+ read_documentation_modifiers(method, modifiers)
+ end
+ tk = get_tk
+ end
+ res = get_tkread.tr("\n", " ").strip
+ res = "" if res == ";"
+ res
+ end
+
+ # skip the var [in] part of a 'for' statement
+ def skip_for_variable
+ skip_tkspace(false)
+ tk = get_tk
+ skip_tkspace(false)
+ tk = get_tk
+ unget_tk(tk) unless tk.kind_of?(TkIN)
+ end
+
+ # while, until, and for have an optional
+ def skip_optional_do_after_expression
+ skip_tkspace(false)
+ tk = get_tk
+ case tk
+ when TkLPAREN, TkfLPAREN
+ end_token = TkRPAREN
+ else
+ end_token = TkNL
+ end
+
+ nest = 0
+ @scanner.instance_eval{@continue = false}
+
+ loop do
+ puts("\nWhile: #{tk}, #{@scanner.continue} " +
+ "#{@scanner.lex_state} #{nest}") if $DEBUG
+ case tk
+ when TkSEMICOLON
+ break
+ when TkLPAREN, TkfLPAREN
+ nest += 1
+ when TkDO
+ break if nest.zero?
+ when end_token
+ if end_token == TkRPAREN
+ nest -= 1
+ break if @scanner.lex_state == EXPR_END and nest.zero?
+ else
+ break unless @scanner.continue
+ end
+ end
+ tk = get_tk
+ end
+ skip_tkspace(false)
+ if peek_tk.kind_of? TkDO
+ get_tk
+ end
+ end
+
+ # Return a superclass, which can be either a constant
+ # of an expression
+
+ def get_class_specification
+ tk = get_tk
+ return "self" if tk.kind_of?(TkSELF)
+
+ res = ""
+ while tk.kind_of?(TkCOLON2) ||
+ tk.kind_of?(TkCOLON3) ||
+ tk.kind_of?(TkCONSTANT)
+
+ res += tk.text
+ tk = get_tk
+ end
+
+ unget_tk(tk)
+ skip_tkspace(false)
+
+ get_tkread # empty out read buffer
+
+ tk = get_tk
+
+ case tk
+ when TkNL, TkCOMMENT, TkSEMICOLON
+ unget_tk(tk)
+ return res
+ end
+
+ res += parse_call_parameters(tk)
+ res
+ end
+
+ def parse_call_parameters(tk)
+
+ end_token = case tk
+ when TkLPAREN, TkfLPAREN
+ TkRPAREN
+ when TkRPAREN
+ return ""
+ else
+ TkNL
+ end
+ nest = 0
+
+ loop do
+ puts("Call param: #{tk}, #{@scanner.continue} " +
+ "#{@scanner.lex_state} #{nest}") if $DEBUG
+ case tk
+ when TkSEMICOLON
+ break
+ when TkLPAREN, TkfLPAREN
+ nest += 1
+ when end_token
+ if end_token == TkRPAREN
+ nest -= 1
+ break if @scanner.lex_state == EXPR_END and nest <= 0
+ else
+ break unless @scanner.continue
+ end
+ when TkCOMMENT
+ unget_tk(tk)
+ break
+ end
+ tk = get_tk
+ end
+ res = get_tkread.tr("\n", " ").strip
+ res = "" if res == ";"
+ res
+ end
+
+
+ # Parse a constant, which might be qualified by
+ # one or more class or module names
+
+ def get_constant
+ res = ""
+ skip_tkspace(false)
+ tk = get_tk
+
+ while tk.kind_of?(TkCOLON2) ||
+ tk.kind_of?(TkCOLON3) ||
+ tk.kind_of?(TkCONSTANT)
+
+ res += tk.text
+ tk = get_tk
+ end
+
+# if res.empty?
+# warn("Unexpected token #{tk} in constant")
+# end
+ unget_tk(tk)
+ res
+ end
+
+ # Get a constant that may be surrounded by parens
+
+ def get_constant_with_optional_parens
+ skip_tkspace(false)
+ nest = 0
+ while (tk = peek_tk).kind_of?(TkLPAREN) || tk.kind_of?(TkfLPAREN)
+ get_tk
+ skip_tkspace(true)
+ nest += 1
+ end
+
+ name = get_constant
+
+ while nest > 0
+ skip_tkspace(true)
+ tk = get_tk
+ nest -= 1 if tk.kind_of?(TkRPAREN)
+ end
+ name
+ end
+
+ # Directives are modifier comments that can appear after class, module,
+ # or method names. For example
+ #
+ # def fred # :yields: a, b
+ #
+ # or
+ #
+ # class SM # :nodoc:
+ #
+ # we return the directive name and any parameters as a two element array
+
+ def read_directive(allowed)
+ tk = get_tk
+ puts "directive: #{tk.inspect}" if $DEBUG
+ result = nil
+ if tk.kind_of?(TkCOMMENT)
+ if tk.text =~ /\s*:?(\w+):\s*(.*)/
+ directive = $1.downcase
+ if allowed.include?(directive)
+ result = [directive, $2]
+ end
+ end
+ else
+ unget_tk(tk)
+ end
+ result
+ end
+
+
+ def read_documentation_modifiers(context, allow)
+ dir = read_directive(allow)
+
+ case dir[0]
+
+ when "notnew", "not_new", "not-new"
+ context.dont_rename_initialize = true
+
+ when "nodoc"
+ context.document_self = false
+ if dir[1].downcase == "all"
+ context.document_children = false
+ end
+
+ when "doc"
+ context.document_self = true
+ context.force_documentation = true
+
+ when "yield", "yields"
+ unless context.params.nil?
+ context.params.sub!(/(,|)\s*&\w+/,'') # remove parameter &proc
+ end
+ context.block_params = dir[1]
+
+ when "arg", "args"
+ context.params = dir[1]
+ end if dir
+ end
+
+
+ # Look for directives in a normal comment block:
+ #
+ # #-- - don't display comment from this point forward
+ #
+ #
+ # This routine modifies it's parameter
+
+ def look_for_directives_in(context, comment)
+
+ preprocess = SM::PreProcess.new(@input_file_name,
+ @options.rdoc_include)
+
+ preprocess.handle(comment) do |directive, param|
+ case directive
+ when "stopdoc"
+ context.stop_doc
+ ""
+ when "startdoc"
+ context.start_doc
+ context.force_documentation = true
+ ""
+
+ when "enddoc"
+ #context.done_documenting = true
+ #""
+ throw :enddoc
+
+ when "main"
+ options = Options.instance
+ options.main_page = param
+ ""
+
+ when "title"
+ options = Options.instance
+ options.title = param
+ ""
+
+ when "section"
+ context.set_current_section(param, comment)
+ comment.replace("") # 1.8 doesn't support #clear
+ break
+ else
+ warn "Unrecognized directive '#{directive}'"
+ break
+ end
+ end
+
+ remove_private_comments(comment)
+ end
+
+ def remove_private_comments(comment)
+ comment.gsub!(/^#--.*?^#\+\+/m, '')
+ comment.sub!(/^#--.*/m, '')
+ end
+
+
+
+ def get_symbol_or_name
+ tk = get_tk
+ case tk
+ when TkSYMBOL
+ tk.text.sub(/^:/, '')
+ when TkId, TkOp
+ tk.name
+ when TkSTRING
+ tk.text
+ else
+ raise "Name or symbol expected (got #{tk})"
+ end
+ end
+
+ def parse_alias(context, single, tk, comment)
+ skip_tkspace
+ if (peek_tk.kind_of? TkLPAREN)
+ get_tk
+ skip_tkspace
+ end
+ new_name = get_symbol_or_name
+ @scanner.instance_eval{@lex_state = EXPR_FNAME}
+ skip_tkspace
+ if (peek_tk.kind_of? TkCOMMA)
+ get_tk
+ skip_tkspace
+ end
+ old_name = get_symbol_or_name
+
+ al = Alias.new(get_tkread, old_name, new_name, comment)
+ read_documentation_modifiers(al, ATTR_MODIFIERS)
+ if al.document_self
+ context.add_alias(al)
+ end
+ end
+
+ def parse_yield_parameters
+ parse_method_or_yield_parameters
+ end
+
+ def parse_yield(context, single, tk, method)
+ if method.block_params.nil?
+ get_tkread
+ @scanner.instance_eval{@continue = false}
+ method.block_params = parse_yield_parameters
+ end
+ end
+
+ def parse_require(context, comment)
+ skip_tkspace_comment
+ tk = get_tk
+ if tk.kind_of? TkLPAREN
+ skip_tkspace_comment
+ tk = get_tk
+ end
+
+ name = nil
+ case tk
+ when TkSTRING
+ name = tk.text
+# when TkCONSTANT, TkIDENTIFIER, TkIVAR, TkGVAR
+# name = tk.name
+ when TkDSTRING
+ warn "Skipping require of dynamic string: #{tk.text}"
+ # else
+ # warn "'require' used as variable"
+ end
+ if name
+ context.add_require(Require.new(name, comment))
+ else
+ unget_tk(tk)
+ end
+ end
+
+ def parse_include(context, comment)
+ loop do
+ skip_tkspace_comment
+ name = get_constant_with_optional_parens
+ unless name.empty?
+ context.add_include(Include.new(name, comment))
+ end
+ return unless peek_tk.kind_of?(TkCOMMA)
+ get_tk
+ end
+ end
+
+ def get_bool
+ skip_tkspace
+ tk = get_tk
+ case tk
+ when TkTRUE
+ true
+ when TkFALSE, TkNIL
+ false
+ else
+ unget_tk tk
+ true
+ end
+ end
+
+ def parse_attr(context, single, tk, comment)
+ args = parse_symbol_arg(1)
+ if args.size > 0
+ name = args[0]
+ rw = "R"
+ skip_tkspace(false)
+ tk = get_tk
+ if tk.kind_of? TkCOMMA
+ rw = "RW" if get_bool
+ else
+ unget_tk tk
+ end
+ att = Attr.new(get_tkread, name, rw, comment)
+ read_documentation_modifiers(att, ATTR_MODIFIERS)
+ if att.document_self
+ context.add_attribute(att)
+ end
+ else
+ warn("'attr' ignored - looks like a variable")
+ end
+
+ end
+
+ def parse_visibility(container, single, tk)
+ singleton = (single == SINGLE)
+ vis = case tk.name
+ when "private" then :private
+ when "protected" then :protected
+ when "public" then :public
+ when "private_class_method"
+ singleton = true
+ :private
+ when "public_class_method"
+ singleton = true
+ :public
+ else raise "Invalid visibility: #{tk.name}"
+ end
+
+ skip_tkspace_comment(false)
+ case peek_tk
+ # Ryan Davis suggested the extension to ignore modifiers, because he
+ # often writes
+ #
+ # protected unless $TESTING
+ #
+ when TkNL, TkUNLESS_MOD, TkIF_MOD
+# error("Missing argument") if singleton
+ container.ongoing_visibility = vis
+ else
+ args = parse_symbol_arg
+ container.set_visibility_for(args, vis, singleton)
+ end
+ end
+
+ def parse_attr_accessor(context, single, tk, comment)
+ args = parse_symbol_arg
+ read = get_tkread
+ rw = "?"
+
+ # If nodoc is given, don't document any of them
+
+ tmp = CodeObject.new
+ read_documentation_modifiers(tmp, ATTR_MODIFIERS)
+ return unless tmp.document_self
+
+ case tk.name
+ when "attr_reader" then rw = "R"
+ when "attr_writer" then rw = "W"
+ when "attr_accessor" then rw = "RW"
+ else
+ rw = @options.extra_accessor_flags[tk.name]
+ end
+
+ for name in args
+ att = Attr.new(get_tkread, name, rw, comment)
+ context.add_attribute(att)
+ end
+ end
+
+ def skip_tkspace_comment(skip_nl = true)
+ loop do
+ skip_tkspace(skip_nl)
+ return unless peek_tk.kind_of? TkCOMMENT
+ get_tk
+ end
+ end
+
+ def parse_symbol_arg(no = nil)
+
+ args = []
+ skip_tkspace_comment
+ case tk = get_tk
+ when TkLPAREN
+ loop do
+ skip_tkspace_comment
+ if tk1 = parse_symbol_in_arg
+ args.push tk1
+ break if no and args.size >= no
+ end
+
+ skip_tkspace_comment
+ case tk2 = get_tk
+ when TkRPAREN
+ break
+ when TkCOMMA
+ else
+ warn("unexpected token: '#{tk2.inspect}'") if $DEBUG
+ break
+ end
+ end
+ else
+ unget_tk tk
+ if tk = parse_symbol_in_arg
+ args.push tk
+ return args if no and args.size >= no
+ end
+
+ loop do
+# skip_tkspace_comment(false)
+ skip_tkspace(false)
+
+ tk1 = get_tk
+ unless tk1.kind_of?(TkCOMMA)
+ unget_tk tk1
+ break
+ end
+
+ skip_tkspace_comment
+ if tk = parse_symbol_in_arg
+ args.push tk
+ break if no and args.size >= no
+ end
+ end
+ end
+ args
+ end
+
+ def parse_symbol_in_arg
+ case tk = get_tk
+ when TkSYMBOL
+ tk.text.sub(/^:/, '')
+ when TkSTRING
+ eval @read[-1]
+ else
+ warn("Expected symbol or string, got #{tk.inspect}") if $DEBUG
+ nil
+ end
+ end
+ end
+
+end
diff --git a/lib/rdoc/parsers/parse_simple.rb b/lib/rdoc/parsers/parse_simple.rb
new file mode 100644
index 0000000000..3f1a546964
--- /dev/null
+++ b/lib/rdoc/parsers/parse_simple.rb
@@ -0,0 +1,41 @@
+# Parse a non-source file. We basically take the whole thing
+# as one big comment. If the first character in the file
+# is '#', we strip leading pound signs.
+
+
+require "rdoc/code_objects"
+require "rdoc/markup/simple_markup/preprocess"
+
+module RDoc
+ # See rdoc/parsers/parse_c.rb
+
+ class SimpleParser
+
+ # prepare to parse a plain file
+ def initialize(top_level, file_name, body, options, stats)
+
+ preprocess = SM::PreProcess.new(file_name, options.rdoc_include)
+
+ preprocess.handle(body) do |directive, param|
+ $stderr.puts "Unrecognized directive '#{directive}' in #{file_name}"
+ end
+
+ @body = body
+ @options = options
+ @top_level = top_level
+ end
+
+ # Extract the file contents and attach them to the toplevel as a
+ # comment
+
+ def scan
+ # @body.gsub(/^(\s\n)+/, '')
+ @top_level.comment = remove_private_comments(@body)
+ @top_level
+ end
+
+ def remove_private_comments(comment)
+ comment.gsub(/^--.*?^\+\+/m, '').sub(/^--.*/m, '')
+ end
+ end
+end
diff --git a/lib/rdoc/parsers/parserfactory.rb b/lib/rdoc/parsers/parserfactory.rb
new file mode 100644
index 0000000000..00a82cf4b1
--- /dev/null
+++ b/lib/rdoc/parsers/parserfactory.rb
@@ -0,0 +1,99 @@
+require "rdoc/parsers/parse_simple"
+
+module RDoc
+
+ # A parser is simple a class that implements
+ #
+ # #initialize(file_name, body, options)
+ #
+ # and
+ #
+ # #scan
+ #
+ # The initialize method takes a file name to be used, the body of the
+ # file, and an RDoc::Options object. The scan method is then called
+ # to return an appropriately parsed TopLevel code object.
+ #
+ # The ParseFactory is used to redirect to the correct parser given a filename
+ # extension. This magic works because individual parsers have to register
+ # themselves with us as they are loaded in. The do this using the following
+ # incantation
+ #
+ #
+ # require "rdoc/parsers/parsefactory"
+ #
+ # module RDoc
+ #
+ # class XyzParser
+ # extend ParseFactory <<<<
+ # parse_files_matching /\.xyz$/ <<<<
+ #
+ # def initialize(file_name, body, options)
+ # ...
+ # end
+ #
+ # def scan
+ # ...
+ # end
+ # end
+ # end
+ #
+ # Just to make life interesting, if we suspect a plain text file, we
+ # also look for a shebang line just in case it's a potential
+ # shell script
+
+
+
+ module ParserFactory
+
+ @@parsers = []
+
+ Parsers = Struct.new(:regexp, :parser)
+
+ # Record the fact that a particular class parses files that
+ # match a given extension
+
+ def parse_files_matching(regexp)
+ @@parsers.unshift Parsers.new(regexp, self)
+ end
+
+ # Return a parser that can handle a particular extension
+
+ def ParserFactory.can_parse(file_name)
+ @@parsers.find {|p| p.regexp.match(file_name) }
+ end
+
+ # Alias an extension to another extension. After this call,
+ # files ending "new_ext" will be parsed using the same parser
+ # as "old_ext"
+
+ def ParserFactory.alias_extension(old_ext, new_ext)
+ parser = ParserFactory.can_parse("xxx.#{old_ext}")
+ return false unless parser
+ @@parsers.unshift Parsers.new(Regexp.new("\\.#{new_ext}$"), parser.parser)
+ true
+ end
+
+ # Find the correct parser for a particular file name. Return a
+ # SimpleParser for ones that we don't know
+
+ def ParserFactory.parser_for(top_level, file_name, body, options, stats)
+ # If no extension, look for shebang
+ if file_name !~ /\.\w+$/ && body =~ %r{\A#!(.+)}
+ shebang = $1
+ case shebang
+ when %r{env\s+ruby}, %r{/ruby}
+ file_name = "dummy.rb"
+ end
+ end
+ parser_description = can_parse(file_name)
+ if parser_description
+ parser = parser_description.parser
+ else
+ parser = SimpleParser
+ end
+
+ parser.new(top_level, file_name, body, options, stats)
+ end
+ end
+end
diff --git a/lib/rdoc/rdoc.rb b/lib/rdoc/rdoc.rb
index ce1cb1a93f..91f5611196 100644
--- a/lib/rdoc/rdoc.rb
+++ b/lib/rdoc/rdoc.rb
@@ -1,86 +1,117 @@
-require 'rdoc'
+# See README.
+#
+
-require 'rdoc/parser'
+VERSION_STRING = %{RDoc V1.0.1 - 20041108}
-# Simple must come first
-require 'rdoc/parser/simple'
-require 'rdoc/parser/ruby'
-require 'rdoc/parser/c'
-require 'rdoc/parser/f95'
-require 'rdoc/parser/perl'
-require 'rdoc/stats'
+require 'rdoc/parsers/parse_rb.rb'
+require 'rdoc/parsers/parse_c.rb'
+require 'rdoc/parsers/parse_f95.rb'
+
+require 'rdoc/parsers/parse_simple.rb'
require 'rdoc/options'
require 'rdoc/diagram'
require 'find'
-require 'fileutils'
+require 'ftools'
require 'time'
+# We put rdoc stuff in the RDoc module to avoid namespace
+# clutter.
+#
+# ToDo: This isn't universally true.
+#
+# :include: README
+
module RDoc
- ##
- # Encapsulate the production of rdoc documentation. Basically you can use
- # this as you would invoke rdoc from the command line:
- #
- # rdoc = RDoc::RDoc.new
- # rdoc.document(args)
- #
- # Where +args+ is an array of strings, each corresponding to an argument
- # you'd give rdoc on the command line. See rdoc/rdoc.rb for details.
+ # Name of the dotfile that contains the description of files to be
+ # processed in the current directory
+ DOT_DOC_FILENAME = ".document"
- class RDoc
+ # Simple stats collector
+ class Stats
+ attr_accessor :num_files, :num_classes, :num_modules, :num_methods
+ def initialize
+ @num_files = @num_classes = @num_modules = @num_methods = 0
+ @start = Time.now
+ end
+ def print
+ puts "Files: #@num_files"
+ puts "Classes: #@num_classes"
+ puts "Modules: #@num_modules"
+ puts "Methods: #@num_methods"
+ puts "Elapsed: " + sprintf("%0.3fs", Time.now - @start)
+ end
+ end
- Generator = Struct.new(:file_name, :class_name, :key)
- ##
- # Accessor for statistics. Available after each call to parse_files
+ # Exception thrown by any rdoc error. Only the #message part is
+ # of use externally.
- attr_reader :stats
+ class RDocError < Exception
+ end
- ##
- # This is the list of output generator that we support
+ # Encapsulate the production of rdoc documentation. Basically
+ # you can use this as you would invoke rdoc from the command
+ # line:
+ #
+ # rdoc = RDoc::RDoc.new
+ # rdoc.document(args)
+ #
+ # where _args_ is an array of strings, each corresponding to
+ # an argument you'd give rdoc on the command line. See rdoc/rdoc.rb
+ # for details.
+
+ class RDoc
+ ##
+ # This is the list of output generators that we
+ # support
+
+ Generator = Struct.new(:file_name, :class_name, :key)
+
GENERATORS = {}
-
- $LOAD_PATH.collect do |d|
- File.expand_path d
- end.find_all do |d|
- File.directory? "#{d}/rdoc/generator"
- end.each do |dir|
- Dir.entries("#{dir}/rdoc/generator").each do |gen|
- next unless /(\w+)\.rb$/ =~ gen
+ $:.collect {|d|
+ File::expand_path(d)
+ }.find_all {|d|
+ File::directory?("#{d}/rdoc/generators")
+ }.each {|dir|
+ Dir::entries("#{dir}/rdoc/generators").each {|gen|
+ next unless /(\w+)_generator.rb$/ =~ gen
type = $1
unless GENERATORS.has_key? type
- GENERATORS[type] = Generator.new("rdoc/generator/#{gen}",
- "#{type.upcase}".intern,
+ GENERATORS[type] = Generator.new("rdoc/generators/#{gen}",
+ "#{type.upcase}Generator".intern,
type)
end
- end
- end
+ }
+ }
- def initialize
- @stats = nil
- end
+ #######
+ private
+ #######
##
# Report an error message and exit
-
+
def error(msg)
- raise ::RDoc::Error, msg
+ raise RDocError.new(msg)
end
-
+
##
- # Create an output dir if it doesn't exist. If it does exist, but doesn't
- # contain the flag file <tt>created.rid</tt> then we refuse to use it, as
- # we may clobber some manually generated documentation
-
+ # Create an output dir if it doesn't exist. If it does
+ # exist, but doesn't contain the flag file <tt>created.rid</tt>
+ # then we refuse to use it, as we may clobber some
+ # manually generated documentation
+
def setup_output_dir(op_dir, force)
flag_file = output_flag_file(op_dir)
if File.exist?(op_dir)
unless File.directory?(op_dir)
- error "'#{op_dir}' exists, and is not a directory"
+ error "'#{op_dir}' exists, and is not a directory"
end
begin
created = File.read(flag_file)
@@ -94,30 +125,24 @@ module RDoc
last = (Time.parse(created) unless force rescue nil)
end
else
- FileUtils.mkdir_p(op_dir)
+ File.makedirs(op_dir)
end
last
end
- ##
# Update the flag file in an output directory.
-
def update_output_dir(op_dir, time)
File.open(output_flag_file(op_dir), "w") {|f| f.puts time.rfc2822 }
end
- ##
# Return the path name of the flag file in an output directory.
-
def output_flag_file(op_dir)
File.join(op_dir, "created.rid")
end
- ##
- # The .document file contains a list of file and directory name patterns,
- # representing candidates for documentation. It may also contain comments
- # (starting with '#')
-
+ # The .document file contains a list of file and directory name
+ # patterns, representing candidates for documentation. It may
+ # also contain comments (starting with '#')
def parse_dot_doc_file(in_dir, filename, options)
# read and strip comments
patterns = File.read(filename).gsub(/#.*/, '')
@@ -131,20 +156,20 @@ module RDoc
result
end
- ##
- # Given a list of files and directories, create a list of all the Ruby
- # files they contain.
+
+ # Given a list of files and directories, create a list
+ # of all the Ruby files they contain.
#
- # If +force_doc+ is true we always add the given files, if false, only
- # add files that we guarantee we can parse. It is true when looking at
- # files given on the command line, false when recursing through
- # subdirectories.
+ # If +force_doc+ is true, we always add the given files.
+ # If false, only add files that we guarantee we can parse
+ # It is true when looking at files given on the command line,
+ # false when recursing through subdirectories.
+ #
+ # The effect of this is that if you want a file with a non-
+ # standard extension parsed, you must name it explicity.
#
- # The effect of this is that if you want a file with a non-standard
- # extension parsed, you must name it explicitly.
- def normalized_file_list(options, relative_files, force_doc = false,
- exclude_pattern = nil)
+ def normalized_file_list(options, relative_files, force_doc = false, exclude_pattern=nil)
file_list = []
relative_files.each do |rel_file_name|
@@ -153,10 +178,7 @@ module RDoc
case type = stat.ftype
when "file"
next if @last_created and stat.mtime < @last_created
-
- if force_doc or ::RDoc::Parser.can_parse(rel_file_name) then
- file_list << rel_file_name.sub(/^\.\//, '')
- end
+ file_list << rel_file_name.sub(/^\.\//, '') if force_doc || ParserFactory.can_parse(rel_file_name)
when "directory"
next if rel_file_name == "CVS" || rel_file_name == ".svn"
dot_doc = File.join(rel_file_name, DOT_DOC_FILENAME)
@@ -166,124 +188,107 @@ module RDoc
file_list.concat(list_files_in_directory(rel_file_name, options))
end
else
- raise RDoc::Error, "I can't deal with a #{type} #{rel_file_name}"
+ raise RDocError.new("I can't deal with a #{type} #{rel_file_name}")
end
end
-
file_list
end
- ##
- # Return a list of the files to be processed in a directory. We know that
- # this directory doesn't have a .document file, so we're looking for real
- # files. However we may well contain subdirectories which must be tested
- # for .document files.
-
+ # Return a list of the files to be processed in
+ # a directory. We know that this directory doesn't have
+ # a .document file, so we're looking for real files. However
+ # we may well contain subdirectories which must
+ # be tested for .document files
def list_files_in_directory(dir, options)
- files = Dir.glob File.join(dir, "*")
-
- normalized_file_list options, files, false, options.exclude
+ normalized_file_list(options, Dir.glob(File.join(dir, "*")), false, options.exclude)
end
- ##
- # Parse each file on the command line, recursively entering directories.
+
+ # Parse each file on the command line, recursively entering
+ # directories
def parse_files(options)
- @stats = Stats.new options.verbosity
+
+ file_info = []
files = options.files
files = ["."] if files.empty?
- file_list = normalized_file_list(options, files, true, options.exclude)
-
- return [] if file_list.empty?
-
- file_info = []
-
- file_list.each do |filename|
- @stats.add_file filename
+ file_list = normalized_file_list(options, files, true)
- content = if RUBY_VERSION >= '1.9' then
- File.open(filename, "r:ascii-8bit") { |f| f.read }
- else
- File.read filename
- end
-
- if defined? Encoding then
- if /coding:\s*(\S+)/ =~ content[/\A(?:.*\n){0,2}/]
- if enc = ::Encoding.find($1)
- content.force_encoding(enc)
- end
- end
- end
-
- top_level = ::RDoc::TopLevel.new filename
-
- parser = ::RDoc::Parser.for top_level, filename, content, options,
- @stats
+ file_list.each do |fn|
+ $stderr.printf("\n%35s: ", File.basename(fn)) unless options.quiet
+
+ content = File.open(fn, "r") {|f| f.read}
+ top_level = TopLevel.new(fn)
+ parser = ParserFactory.parser_for(top_level, fn, content, options, @stats)
file_info << parser.scan
+ @stats.num_files += 1
end
file_info
end
- ##
- # Format up one or more files according to the given arguments.
+
+ public
+
+ ###################################################################
#
- # For simplicity, _argv_ is an array of strings, equivalent to the strings
- # that would be passed on the command line. (This isn't a coincidence, as
- # we _do_ pass in ARGV when running interactively). For a list of options,
- # see rdoc/rdoc.rb. By default, output will be stored in a directory
- # called +doc+ below the current directory, so make sure you're somewhere
- # writable before invoking.
+ # Format up one or more files according to the given arguments.
+ # For simplicity, _argv_ is an array of strings, equivalent to the
+ # strings that would be passed on the command line. (This isn't a
+ # coincidence, as we _do_ pass in ARGV when running
+ # interactively). For a list of options, see rdoc/rdoc.rb. By
+ # default, output will be stored in a directory called +doc+ below
+ # the current directory, so make sure you're somewhere writable
+ # before invoking.
#
- # Throws: RDoc::Error on error
+ # Throws: RDocError on error
def document(argv)
+
TopLevel::reset
- @options = Options.new GENERATORS
- @options.parse argv
+ @stats = Stats.new
- @last_created = nil
+ options = Options.instance
+ options.parse(argv, GENERATORS)
- unless @options.all_one_file then
- @last_created = setup_output_dir @options.op_dir, @options.force_update
+ @last_created = nil
+ unless options.all_one_file
+ @last_created = setup_output_dir(options.op_dir, options.force_update)
end
-
start_time = Time.now
- file_info = parse_files @options
-
- @options.title = "RDoc Documentation"
+ file_info = parse_files(options)
if file_info.empty?
- $stderr.puts "\nNo newer files." unless @options.quiet
+ $stderr.puts "\nNo newer files." unless options.quiet
else
- @gen = @options.generator
+ gen = options.generator
- $stderr.puts "\nGenerating #{@gen.key.upcase}..." unless @options.quiet
+ $stderr.puts "\nGenerating #{gen.key.upcase}..." unless options.quiet
- require @gen.file_name
+ require gen.file_name
- gen_class = ::RDoc::Generator.const_get @gen.class_name
- @gen = gen_class.for @options
+ gen_class = Generators.const_get(gen.class_name)
+ gen = gen_class.for(options)
pwd = Dir.pwd
- Dir.chdir @options.op_dir unless @options.all_one_file
+ Dir.chdir(options.op_dir) unless options.all_one_file
begin
- Diagram.new(file_info, @options).draw if @options.diagram
- @gen.generate(file_info)
+ Diagram.new(file_info, options).draw if options.diagram
+ gen.generate(file_info)
update_output_dir(".", start_time)
ensure
Dir.chdir(pwd)
end
end
- unless @options.quiet
+ unless options.quiet
puts
@stats.print
end
diff --git a/lib/rdoc/ri.rb b/lib/rdoc/ri.rb
deleted file mode 100644
index a3a858e673..0000000000
--- a/lib/rdoc/ri.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-require 'rdoc'
-
-module RDoc::RI
-
- class Error < RDoc::Error; end
-
-end
-
diff --git a/lib/rdoc/ri/cache.rb b/lib/rdoc/ri/cache.rb
deleted file mode 100644
index 06177a00de..0000000000
--- a/lib/rdoc/ri/cache.rb
+++ /dev/null
@@ -1,187 +0,0 @@
-require 'rdoc/ri'
-
-class RDoc::RI::ClassEntry
-
- attr_reader :name
- attr_reader :path_names
-
- def initialize(path_name, name, in_class)
- @path_names = [ path_name ]
- @name = name
- @in_class = in_class
- @class_methods = []
- @instance_methods = []
- @inferior_classes = []
- end
-
- # We found this class in more than one place, so add
- # in the name from there.
- def add_path(path)
- @path_names << path
- end
-
- # read in our methods and any classes
- # and modules in our namespace. Methods are
- # stored in files called name-c|i.yaml,
- # where the 'name' portion is the external
- # form of the method name and the c|i is a class|instance
- # flag
-
- def load_from(dir)
- Dir.foreach(dir) do |name|
- next if name =~ /^\./
-
- # convert from external to internal form, and
- # extract the instance/class flag
-
- if name =~ /^(.*?)-(c|i).yaml$/
- external_name = $1
- is_class_method = $2 == "c"
- internal_name = RDoc::RI::Writer.external_to_internal(external_name)
- list = is_class_method ? @class_methods : @instance_methods
- path = File.join(dir, name)
- list << RDoc::RI::MethodEntry.new(path, internal_name, is_class_method, self)
- else
- full_name = File.join(dir, name)
- if File.directory?(full_name)
- inf_class = @inferior_classes.find {|c| c.name == name }
- if inf_class
- inf_class.add_path(full_name)
- else
- inf_class = RDoc::RI::ClassEntry.new(full_name, name, self)
- @inferior_classes << inf_class
- end
- inf_class.load_from(full_name)
- end
- end
- end
- end
-
- # Return a list of any classes or modules that we contain
- # that match a given string
-
- def contained_modules_matching(name)
- @inferior_classes.find_all {|c| c.name[name]}
- end
-
- def classes_and_modules
- @inferior_classes
- end
-
- # Return an exact match to a particular name
- def contained_class_named(name)
- @inferior_classes.find {|c| c.name == name}
- end
-
- # return the list of local methods matching name
- # We're split into two because we need distinct behavior
- # when called from the _toplevel_
- def methods_matching(name, is_class_method)
- local_methods_matching(name, is_class_method)
- end
-
- # Find methods matching 'name' in ourselves and in
- # any classes we contain
- def recursively_find_methods_matching(name, is_class_method)
- res = local_methods_matching(name, is_class_method)
- @inferior_classes.each do |c|
- res.concat(c.recursively_find_methods_matching(name, is_class_method))
- end
- res
- end
-
-
- # Return our full name
- def full_name
- res = @in_class.full_name
- res << "::" unless res.empty?
- res << @name
- end
-
- # Return a list of all out method names
- def all_method_names
- res = @class_methods.map {|m| m.full_name }
- @instance_methods.each {|m| res << m.full_name}
- res
- end
-
- private
-
- # Return a list of all our methods matching a given string.
- # Is +is_class_methods+ if 'nil', we don't care if the method
- # is a class method or not, otherwise we only return
- # those methods that match
- def local_methods_matching(name, is_class_method)
-
- list = case is_class_method
- when nil then @class_methods + @instance_methods
- when true then @class_methods
- when false then @instance_methods
- else fail "Unknown is_class_method: #{is_class_method.inspect}"
- end
-
- list.find_all {|m| m.name; m.name[name]}
- end
-end
-
-##
-# A TopLevelEntry is like a class entry, but when asked to search for methods
-# searches all classes, not just itself
-
-class RDoc::RI::TopLevelEntry < RDoc::RI::ClassEntry
- def methods_matching(name, is_class_method)
- res = recursively_find_methods_matching(name, is_class_method)
- end
-
- def full_name
- ""
- end
-
- def module_named(name)
-
- end
-
-end
-
-class RDoc::RI::MethodEntry
- attr_reader :name
- attr_reader :path_name
-
- def initialize(path_name, name, is_class_method, in_class)
- @path_name = path_name
- @name = name
- @is_class_method = is_class_method
- @in_class = in_class
- end
-
- def full_name
- res = @in_class.full_name
- unless res.empty?
- if @is_class_method
- res << "::"
- else
- res << "#"
- end
- end
- res << @name
- end
-end
-
-##
-# We represent everything known about all 'ri' files accessible to this program
-
-class RDoc::RI::Cache
-
- attr_reader :toplevel
-
- def initialize(dirs)
- # At the top level we have a dummy module holding the
- # overall namespace
- @toplevel = RDoc::RI::TopLevelEntry.new('', '::', nil)
-
- dirs.each do |dir|
- @toplevel.load_from(dir)
- end
- end
-
-end
diff --git a/lib/rdoc/ri/descriptions.rb b/lib/rdoc/ri/descriptions.rb
deleted file mode 100644
index 467b7de2a9..0000000000
--- a/lib/rdoc/ri/descriptions.rb
+++ /dev/null
@@ -1,156 +0,0 @@
-require 'yaml'
-require 'rdoc/markup/fragments'
-require 'rdoc/ri'
-
-##
-# Descriptions are created by RDoc (in ri_generator) and written out in
-# serialized form into the documentation tree. ri then reads these to generate
-# the documentation
-
-class RDoc::RI::NamedThing
- attr_reader :name
- def initialize(name)
- @name = name
- end
-
- def <=>(other)
- @name <=> other.name
- end
-
- def hash
- @name.hash
- end
-
- def eql?(other)
- @name.eql?(other)
- end
-end
-
-class RDoc::RI::AliasName < RDoc::RI::NamedThing; end
-
-class RDoc::RI::Attribute < RDoc::RI::NamedThing
- attr_reader :rw, :comment
-
- def initialize(name, rw, comment)
- super(name)
- @rw = rw
- @comment = comment
- end
-end
-
-class RDoc::RI::Constant < RDoc::RI::NamedThing
- attr_reader :value, :comment
-
- def initialize(name, value, comment)
- super(name)
- @value = value
- @comment = comment
- end
-end
-
-class RDoc::RI::IncludedModule < RDoc::RI::NamedThing; end
-
-class RDoc::RI::MethodSummary < RDoc::RI::NamedThing
- def initialize(name="")
- super
- end
-end
-
-class RDoc::RI::Description
- attr_accessor :name
- attr_accessor :full_name
- attr_accessor :comment
-
- def serialize
- self.to_yaml
- end
-
- def self.deserialize(from)
- YAML.load(from)
- end
-
- def <=>(other)
- @name <=> other.name
- end
-end
-
-class RDoc::RI::ModuleDescription < RDoc::RI::Description
-
- attr_accessor :class_methods
- attr_accessor :class_method_extensions
- attr_accessor :instance_methods
- attr_accessor :instance_method_extensions
- attr_accessor :attributes
- attr_accessor :constants
- attr_accessor :includes
-
- # merge in another class description into this one
- def merge_in(old)
- merge(@class_methods, old.class_methods)
- merge(@instance_methods, old.instance_methods)
- merge(@attributes, old.attributes)
- merge(@constants, old.constants)
- merge(@includes, old.includes)
- if @comment.nil? || @comment.empty?
- @comment = old.comment
- else
- unless old.comment.nil? or old.comment.empty? then
- if @comment.nil? or @comment.empty? then
- @comment = old.comment
- else
- @comment << RDoc::Markup::Flow::RULE.new
- @comment.concat old.comment
- end
- end
- end
- end
-
- def display_name
- "Module"
- end
-
- # the 'ClassDescription' subclass overrides this
- # to format up the name of a parent
- def superclass_string
- nil
- end
-
- private
-
- def merge(into, from)
- names = {}
- into.each {|i| names[i.name] = i }
- from.each {|i| names[i.name] = i }
- into.replace(names.keys.sort.map {|n| names[n]})
- end
-end
-
-class RDoc::RI::ClassDescription < RDoc::RI::ModuleDescription
- attr_accessor :superclass
-
- def display_name
- "Class"
- end
-
- def superclass_string
- if @superclass && @superclass != "Object"
- @superclass
- else
- nil
- end
- end
-end
-
-class RDoc::RI::MethodDescription < RDoc::RI::Description
-
- attr_accessor :is_class_method
- attr_accessor :visibility
- attr_accessor :block_params
- attr_accessor :is_singleton
- attr_accessor :aliases
- attr_accessor :is_alias_for
- attr_accessor :params
- attr_accessor :source_path
-
-end
-
diff --git a/lib/rdoc/ri/display.rb b/lib/rdoc/ri/display.rb
deleted file mode 100644
index f6b647fbc1..0000000000
--- a/lib/rdoc/ri/display.rb
+++ /dev/null
@@ -1,392 +0,0 @@
-require 'rdoc/ri'
-
-# readline support might not be present, so be careful
-# when requiring it.
-begin
- require('readline')
- require('abbrev')
- CAN_USE_READLINE = true # HACK use an RDoc namespace constant
-rescue LoadError
- CAN_USE_READLINE = false
-end
-
-##
-# This is a kind of 'flag' module. If you want to write your own 'ri' display
-# module (perhaps because you're writing an IDE), you write a class which
-# implements the various 'display' methods in RDoc::RI::DefaultDisplay, and
-# include the RDoc::RI::Display module in that class.
-#
-# To access your class from the command line, you can do
-#
-# ruby -r <your source file> ../ri ....
-
-module RDoc::RI::Display
-
- @@display_class = nil
-
- def self.append_features(display_class)
- @@display_class = display_class
- end
-
- def self.new(*args)
- @@display_class.new(*args)
- end
-
-end
-
-##
-# A paging display module. Uses the RDoc::RI::Formatter class to do the actual
-# presentation.
-
-class RDoc::RI::DefaultDisplay
-
- include RDoc::RI::Display
-
- def initialize(formatter, width, use_stdout, output = $stdout)
- @use_stdout = use_stdout
- @formatter = formatter.new output, width, " "
- end
-
- ##
- # Display information about +klass+. Fetches additional information from
- # +ri_reader+ as necessary.
-
- def display_class_info(klass)
- page do
- superclass = klass.superclass
-
- if superclass
- superclass = " < " + superclass
- else
- superclass = ""
- end
-
- @formatter.draw_line(klass.display_name + ": " +
- klass.full_name + superclass)
-
- display_flow(klass.comment)
- @formatter.draw_line
-
- unless klass.includes.empty?
- @formatter.blankline
- @formatter.display_heading("Includes:", 2, "")
- incs = []
-
- klass.includes.each do |inc|
- incs << inc.name
- end
-
- @formatter.wrap(incs.sort.join(', '))
- end
-
- unless klass.constants.empty?
- @formatter.blankline
- @formatter.display_heading("Constants:", 2, "")
-
- constants = klass.constants.sort_by { |constant| constant.name }
-
- constants.each do |constant|
- @formatter.wrap "#{constant.name} = #{constant.value}"
- if constant.comment then
- @formatter.indent do
- @formatter.display_flow constant.comment
- end
- else
- @formatter.break_to_newline
- end
- end
- end
-
- unless klass.attributes.empty? then
- @formatter.blankline
- @formatter.display_heading 'Attributes:', 2, ''
-
- attributes = klass.attributes.sort_by { |attribute| attribute.name }
-
- attributes.each do |attribute|
- if attribute.comment then
- @formatter.wrap "#{attribute.name} (#{attribute.rw}):"
- @formatter.indent do
- @formatter.display_flow attribute.comment
- end
- else
- @formatter.wrap "#{attribute.name} (#{attribute.rw})"
- @formatter.break_to_newline
- end
- end
- end
-
- return display_class_method_list(klass)
- end
- end
-
- ##
- # Given a Hash mapping a class' methods to method types (returned by
- # display_class_method_list), this method allows the user to
- # choose one of the methods.
-
- def get_class_method_choice(method_map)
- if CAN_USE_READLINE
- # prepare abbreviations for tab completion
- abbreviations = method_map.keys.abbrev
- Readline.completion_proc = proc do |string|
- abbreviations.values.uniq.grep(/^#{string}/)
- end
- end
-
- @formatter.raw_print_line "\nEnter the method name you want.\n"
- @formatter.raw_print_line "Class methods can be preceeded by '::' and instance methods by '#'.\n"
-
- if CAN_USE_READLINE
- @formatter.raw_print_line "You can use tab to autocomplete.\n"
- @formatter.raw_print_line "Enter a blank line to exit.\n"
-
- choice_string = Readline.readline(">> ").strip
- else
- @formatter.raw_print_line "Enter a blank line to exit.\n"
- @formatter.raw_print_line ">> "
- choice_string = $stdin.gets.strip
- end
-
- if choice_string == ''
- return nil
- else
- class_or_instance = method_map[choice_string]
-
- if class_or_instance
- # If the user's choice is not preceeded by a '::' or a '#', figure
- # out whether they want a class or an instance method and decorate
- # the choice appropriately.
- if(choice_string =~ /^[a-zA-Z]/)
- if(class_or_instance == :class)
- choice_string = "::#{choice_string}"
- else
- choice_string = "##{choice_string}"
- end
- end
-
- return choice_string
- else
- @formatter.raw_print_line "No method matched '#{choice_string}'.\n"
- return nil
- end
- end
- end
-
-
- ##
- # Display methods on +klass+
- # Returns a hash mapping method name to method contents (HACK?)
-
- def display_class_method_list(klass)
- method_map = {}
-
- class_data = [
- :class_methods,
- :class_method_extensions,
- :instance_methods,
- :instance_method_extensions,
- ]
-
- class_data.each do |data_type|
- data = klass.send data_type
-
- unless data.nil? or data.empty? then
- @formatter.blankline
-
- heading = data_type.to_s.split('_').join(' ').capitalize << ':'
- @formatter.display_heading heading, 2, ''
-
- method_names = []
- data.each do |item|
- method_names << item.name
-
- if(data_type == :class_methods ||
- data_type == :class_method_extensions) then
- method_map["::#{item.name}"] = :class
- method_map[item.name] = :class
- else
- #
- # Since we iterate over instance methods after class methods,
- # an instance method always will overwrite the unqualified
- # class method entry for a class method of the same name.
- #
- method_map["##{item.name}"] = :instance
- method_map[item.name] = :instance
- end
- end
- method_names.sort!
-
- @formatter.wrap method_names.join(', ')
- end
- end
-
- method_map
- end
- private :display_class_method_list
-
- ##
- # Display an Array of RDoc::Markup::Flow objects, +flow+.
-
- def display_flow(flow)
- if flow and not flow.empty? then
- @formatter.display_flow flow
- else
- @formatter.wrap '[no description]'
- end
- end
-
- ##
- # Display information about +method+.
-
- def display_method_info(method)
- page do
- @formatter.draw_line(method.full_name)
- display_params(method)
-
- @formatter.draw_line
- display_flow(method.comment)
-
- if method.aliases and not method.aliases.empty? then
- @formatter.blankline
- aka = "(also known as #{method.aliases.map { |a| a.name }.join(', ')})"
- @formatter.wrap aka
- end
- end
- end
-
- ##
- # Display the list of +methods+.
-
- def display_method_list(methods)
- page do
- @formatter.wrap "More than one method matched your request. You can refine your search by asking for information on one of:"
- @formatter.blankline
-
- methods.each do |method|
- @formatter.raw_print_line "#{method.full_name} [#{method.source_path}]\n"
- end
- end
- end
-
- ##
- # Display a list of +methods+ and allow the user to select one of them.
-
- def display_method_list_choice(methods)
- page do
- @formatter.wrap "More than one method matched your request. Please choose one of the possible matches."
- @formatter.blankline
-
- methods.each_with_index do |method, index|
- @formatter.raw_print_line "%3d %s [%s]\n" % [index + 1, method.full_name, method.source_path]
- end
-
- @formatter.raw_print_line ">> "
-
- choice = $stdin.gets.strip!
-
- if(choice == '')
- return
- end
-
- choice = choice.to_i
-
- if ((choice == 0) || (choice > methods.size)) then
- @formatter.raw_print_line "Invalid choice!\n"
- else
- method = methods[choice - 1]
- display_method_info(method)
- end
- end
- end
-
- ##
- # Display the params for +method+.
-
- def display_params(method)
- params = method.params
-
- if params[0,1] == "(" then
- if method.is_singleton
- params = method.full_name + params
- else
- params = method.name + params
- end
- end
-
- params.split(/\n/).each do |param|
- @formatter.wrap param
- @formatter.break_to_newline
- end
-
- @formatter.blankline
- @formatter.wrap("From #{method.source_path}")
- end
-
- ##
- # List the classes in +classes+.
-
- def list_known_classes(classes)
- if classes.empty?
- warn_no_database
- else
- page do
- @formatter.draw_line "Known classes and modules"
- @formatter.blankline
-
- @formatter.wrap classes.sort.join(', ')
- end
- end
- end
-
- ##
- # Paginates output through a pager program.
-
- def page
- if pager = setup_pager then
- begin
- orig_output = @formatter.output
- @formatter.output = pager
- yield
- ensure
- @formatter.output = orig_output
- pager.close
- end
- else
- yield
- end
- rescue Errno::EPIPE
- end
-
- ##
- # Sets up a pager program to pass output through.
-
- def setup_pager
- unless @use_stdout then
- for pager in [ ENV['PAGER'], "less", "more", 'pager' ].compact.uniq
- return IO.popen(pager, "w") rescue nil
- end
- @use_stdout = true
- nil
- end
- end
-
- ##
- # Displays a message that describes how to build RI data.
-
- def warn_no_database
- output = @formatter.output
-
- output.puts "No ri data found"
- output.puts
- output.puts "If you've installed Ruby yourself, you need to generate documentation using:"
- output.puts
- output.puts " make install-doc"
- output.puts
- output.puts "from the same place you ran `make` to build ruby."
- output.puts
- output.puts "If you installed Ruby from a packaging system, then you may need to"
- output.puts "install an additional package, or ask the packager to enable ri generation."
- end
-
-end
diff --git a/lib/rdoc/ri/driver.rb b/lib/rdoc/ri/driver.rb
deleted file mode 100644
index 89534a5972..0000000000
--- a/lib/rdoc/ri/driver.rb
+++ /dev/null
@@ -1,669 +0,0 @@
-require 'optparse'
-require 'yaml'
-
-require 'rdoc/ri'
-require 'rdoc/ri/paths'
-require 'rdoc/ri/formatter'
-require 'rdoc/ri/display'
-require 'fileutils'
-require 'rdoc/markup'
-require 'rdoc/markup/to_flow'
-
-class RDoc::RI::Driver
-
- #
- # This class offers both Hash and OpenStruct functionality.
- # We convert from the Core Hash to this before calling any of
- # the display methods, in order to give the display methods
- # a cleaner API for accessing the data.
- #
- class OpenStructHash < Hash
- #
- # This method converts from a Hash to an OpenStructHash.
- #
- def self.convert(object)
- case object
- when Hash then
- new_hash = new # Convert Hash -> OpenStructHash
-
- object.each do |key, value|
- new_hash[key] = convert(value)
- end
-
- new_hash
- when Array then
- object.map do |element|
- convert(element)
- end
- else
- object
- end
- end
-
- def merge_enums(other)
- other.each do |k, v|
- if self[k] then
- case v
- when Array then
- # HACK dunno
- if String === self[k] and self[k].empty? then
- self[k] = v
- else
- self[k] += v
- end
- when Hash then
- self[k].update v
- else
- # do nothing
- end
- else
- self[k] = v
- end
- end
- end
-
- def method_missing method, *args
- self[method.to_s]
- end
- end
-
- class Error < RDoc::RI::Error; end
-
- class NotFoundError < Error
- def message
- "Nothing known about #{super}"
- end
- end
-
- attr_accessor :homepath # :nodoc:
-
- def self.default_options
- options = {}
- options[:use_stdout] = !$stdout.tty?
- options[:width] = 72
- options[:formatter] = RDoc::RI::Formatter.for 'plain'
- options[:interactive] = false
- options[:use_cache] = true
-
- # By default all standard paths are used.
- options[:use_system] = true
- options[:use_site] = true
- options[:use_home] = true
- options[:use_gems] = true
- options[:extra_doc_dirs] = []
-
- return options
- end
-
- def self.process_args(argv)
- options = default_options
-
- opts = OptionParser.new do |opt|
- opt.program_name = File.basename $0
- opt.version = RDoc::VERSION
- opt.release = nil
- opt.summary_indent = ' ' * 4
-
- directories = [
- RDoc::RI::Paths::SYSDIR,
- RDoc::RI::Paths::SITEDIR,
- RDoc::RI::Paths::HOMEDIR
- ]
-
- if RDoc::RI::Paths::GEMDIRS then
- Gem.path.each do |dir|
- directories << "#{dir}/doc/*/ri"
- end
- end
-
- opt.banner = <<-EOT
-Usage: #{opt.program_name} [options] [names...]
-
-Where name can be:
-
- Class | Class::method | Class#method | Class.method | method
-
-All class names may be abbreviated to their minimum unambiguous form. If a name
-is ambiguous, all valid options will be listed.
-
-The form '.' method matches either class or instance methods, while #method
-matches only instance and ::method matches only class methods.
-
-For example:
-
- #{opt.program_name} Fil
- #{opt.program_name} File
- #{opt.program_name} File.new
- #{opt.program_name} zip
-
-Note that shell quoting may be required for method names containing
-punctuation:
-
- #{opt.program_name} 'Array.[]'
- #{opt.program_name} compact\\!
-
-By default ri searches for documentation in the following directories:
-
- #{directories.join "\n "}
-
-Specifying the --system, --site, --home, --gems or --doc-dir options will
-limit ri to searching only the specified directories.
-
-Options may also be set in the 'RI' environment variable.
- EOT
-
- opt.separator nil
- opt.separator "Options:"
- opt.separator nil
-
- opt.on("--fmt=FORMAT", "--format=FORMAT", "-f",
- RDoc::RI::Formatter::FORMATTERS.keys,
- "Format to use when displaying output:",
- " #{RDoc::RI::Formatter.list}",
- "Use 'bs' (backspace) with most pager",
- "programs. To use ANSI, either disable the",
- "pager or tell the pager to allow control",
- "characters.") do |value|
- options[:formatter] = RDoc::RI::Formatter.for value
- end
-
- opt.separator nil
-
- opt.on("--doc-dir=DIRNAME", "-d", Array,
- "List of directories from which to source",
- "documentation in addition to the standard",
- "directories. May be repeated.") do |value|
- value.each do |dir|
- unless File.directory? dir then
- raise OptionParser::InvalidArgument, "#{dir} is not a directory"
- end
-
- options[:extra_doc_dirs] << File.expand_path(dir)
- end
- end
-
- opt.separator nil
-
- opt.on("--[no-]use-cache",
- "Whether or not to use ri's cache.",
- "True by default.") do |value|
- options[:use_cache] = value
- end
-
- opt.separator nil
-
- opt.on("--no-standard-docs",
- "Do not include documentation from",
- "the Ruby standard library, site_lib,",
- "installed gems, or ~/.rdoc.",
- "Equivalent to specifying",
- "the options --no-system, --no-site, --no-gems,",
- "and --no-home") do
- options[:use_system] = false
- options[:use_site] = false
- options[:use_gems] = false
- options[:use_home] = false
- end
-
- opt.separator nil
-
- opt.on("--[no-]system",
- "Include documentation from Ruby's standard",
- "library. Defaults to true.") do |value|
- options[:use_system] = value
- end
-
- opt.separator nil
-
- opt.on("--[no-]site",
- "Include documentation from libraries",
- "installed in site_lib.",
- "Defaults to true.") do |value|
- options[:use_site] = value
- end
-
- opt.separator nil
-
- opt.on("--[no-]gems",
- "Include documentation from RubyGems.",
- "Defaults to true.") do |value|
- options[:use_gems] = value
- end
-
- opt.separator nil
-
- opt.on("--[no-]home",
- "Include documentation stored in ~/.rdoc.",
- "Defaults to true.") do |value|
- options[:use_home] = value
- end
-
- opt.separator nil
-
- opt.on("--list-doc-dirs",
- "List the directories from which ri will",
- "source documentation on stdout and exit.") do
- options[:list_doc_dirs] = true
- end
-
- opt.separator nil
-
- opt.on("--no-pager", "-T",
- "Send output directly to stdout,",
- "rather than to a pager.") do
- options[:use_stdout] = true
- end
-
- opt.on("--interactive", "-i",
- "This makes ri go into interactive mode.",
- "When ri is in interactive mode it will",
- "allow the user to disambiguate lists of",
- "methods in case multiple methods match",
- "against a method search string. It also",
- "will allow the user to enter in a method",
- "name (with auto-completion, if readline",
- "is supported) when viewing a class.") do
- options[:interactive] = true
- end
-
- opt.separator nil
-
- opt.on("--width=WIDTH", "-w", OptionParser::DecimalInteger,
- "Set the width of the output.") do |value|
- options[:width] = value
- end
- end
-
- argv = ENV['RI'].to_s.split.concat argv
-
- opts.parse! argv
-
- options[:names] = argv
-
- options[:formatter] ||= RDoc::RI::Formatter.for('plain')
- options[:use_stdout] ||= !$stdout.tty?
- options[:use_stdout] ||= options[:interactive]
- options[:width] ||= 72
-
- options
-
- rescue OptionParser::InvalidArgument, OptionParser::InvalidOption => e
- puts opts
- puts
- puts e
- exit 1
- end
-
- def self.run(argv = ARGV)
- options = process_args argv
- ri = new options
- ri.run
- end
-
- def initialize(initial_options={})
- options = self.class.default_options.update(initial_options)
-
- @names = options[:names]
- @class_cache_name = 'classes'
-
- @doc_dirs = RDoc::RI::Paths.path(options[:use_system],
- options[:use_site],
- options[:use_home],
- options[:use_gems],
- options[:extra_doc_dirs])
-
- @homepath = RDoc::RI::Paths.raw_path(false, false, true, false).first
- @homepath = @homepath.sub(/\.rdoc/, '.ri')
- @sys_dir = RDoc::RI::Paths.raw_path(true, false, false, false).first
- @list_doc_dirs = options[:list_doc_dirs]
-
- FileUtils.mkdir_p cache_file_path unless File.directory? cache_file_path
- @cache_doc_dirs_path = File.join cache_file_path, ".doc_dirs"
-
- @use_cache = options[:use_cache]
- @class_cache = nil
-
- @interactive = options[:interactive]
- @display = RDoc::RI::DefaultDisplay.new(options[:formatter],
- options[:width],
- options[:use_stdout])
- end
-
- def class_cache
- return @class_cache if @class_cache
-
- # Get the documentation directories used to make the cache in order to see
- # whether the cache is valid for the current ri instantiation.
- if(File.readable?(@cache_doc_dirs_path))
- cache_doc_dirs = IO.read(@cache_doc_dirs_path).split("\n")
- else
- cache_doc_dirs = []
- end
-
- newest = map_dirs('created.rid') do |f|
- File.mtime f if test ?f, f
- end.max
-
- # An up to date cache file must have been created more recently than
- # the last modification of any of the documentation directories. It also
- # must have been created with the same documentation directories
- # as those from which ri currently is sourcing documentation.
- up_to_date = (File.exist?(class_cache_file_path) and
- newest and newest < File.mtime(class_cache_file_path) and
- (cache_doc_dirs == @doc_dirs))
-
- if up_to_date and @use_cache then
- open class_cache_file_path, 'rb' do |fp|
- begin
- @class_cache = Marshal.load fp.read
- rescue
- #
- # This shouldn't be necessary, since the up_to_date logic above
- # should force the cache to be recreated when a new version of
- # rdoc is installed. This seems like a worthwhile enhancement
- # to ri's robustness, however.
- #
- $stderr.puts "Error reading the class cache; recreating the class cache!"
- @class_cache = create_class_cache
- end
- end
- else
- @class_cache = create_class_cache
- end
-
- @class_cache
- end
-
- def create_class_cache
- class_cache = OpenStructHash.new
-
- if(@use_cache)
- # Dump the documentation directories to a file in the cache, so that
- # we only will use the cache for future instantiations with identical
- # documentation directories.
- File.open @cache_doc_dirs_path, "wb" do |fp|
- fp << @doc_dirs.join("\n")
- end
- end
-
- classes = map_dirs('**/cdesc*.yaml') { |f| Dir[f] }
- warn "Updating class cache with #{classes.size} classes..."
- populate_class_cache class_cache, classes
-
- write_cache class_cache, class_cache_file_path
-
- class_cache
- end
-
- def populate_class_cache(class_cache, classes, extension = false)
- classes.each do |cdesc|
- desc = read_yaml cdesc
- klassname = desc["full_name"]
-
- unless class_cache.has_key? klassname then
- desc["display_name"] = "Class"
- desc["sources"] = [cdesc]
- desc["instance_method_extensions"] = []
- desc["class_method_extensions"] = []
- class_cache[klassname] = desc
- else
- klass = class_cache[klassname]
-
- if extension then
- desc["instance_method_extensions"] = desc.delete "instance_methods"
- desc["class_method_extensions"] = desc.delete "class_methods"
- end
-
- klass.merge_enums desc
- klass["sources"] << cdesc
- end
- end
- end
-
- def class_cache_file_path
- File.join cache_file_path, @class_cache_name
- end
-
- def cache_file_for(klassname)
- File.join cache_file_path, klassname.gsub(/:+/, "-")
- end
-
- def cache_file_path
- File.join @homepath, 'cache'
- end
-
- def display_class(name)
- klass = class_cache[name]
- @display.display_class_info klass
- end
-
- def display_method(method)
- @display.display_method_info method
- end
-
- def get_info_for(arg)
- @names = [arg]
- run
- end
-
- def load_cache_for(klassname)
- path = cache_file_for klassname
-
- cache = nil
-
- if File.exist? path and
- File.mtime(path) >= File.mtime(class_cache_file_path) and
- @use_cache then
- open path, 'rb' do |fp|
- begin
- cache = Marshal.load fp.read
- rescue
- #
- # The cache somehow is bad. Recreate the cache.
- #
- $stderr.puts "Error reading the cache for #{klassname}; recreating the cache!"
- cache = create_cache_for klassname, path
- end
- end
- else
- cache = create_cache_for klassname, path
- end
-
- cache
- end
-
- def create_cache_for(klassname, path)
- klass = class_cache[klassname]
- return nil unless klass
-
- method_files = klass["sources"]
- cache = OpenStructHash.new
-
- method_files.each do |f|
- system_file = f.index(@sys_dir) == 0
- Dir[File.join(File.dirname(f), "*")].each do |yaml|
- next unless yaml =~ /yaml$/
- next if yaml =~ /cdesc-[^\/]+yaml$/
-
- method = read_yaml yaml
-
- if system_file then
- method["source_path"] = "Ruby #{RDoc::RI::Paths::VERSION}"
- else
- if(f =~ %r%gems/[\d.]+/doc/([^/]+)%) then
- ext_path = "gem #{$1}"
- else
- ext_path = f
- end
-
- method["source_path"] = ext_path
- end
-
- name = method["full_name"]
- cache[name] = method
- end
- end
-
- write_cache cache, path
- end
-
- ##
- # Finds the next ancestor of +orig_klass+ after +klass+.
-
- def lookup_ancestor(klass, orig_klass)
- # This is a bit hacky, but ri will go into an infinite
- # loop otherwise, since Object has an Object ancestor
- # for some reason. Depending on the documentation state, I've seen
- # Kernel as an ancestor of Object and not as an ancestor of Object.
- if ((orig_klass == "Object") &&
- ((klass == "Kernel") || (klass == "Object")))
- return nil
- end
-
- cache = class_cache[orig_klass]
-
- return nil unless cache
-
- ancestors = [orig_klass]
- ancestors.push(*cache.includes.map { |inc| inc['name'] })
- ancestors << cache.superclass
-
- ancestor_index = ancestors.index(klass)
-
- if ancestor_index
- ancestor = ancestors[ancestors.index(klass) + 1]
- return ancestor if ancestor
- end
-
- lookup_ancestor klass, cache.superclass
- end
-
- ##
- # Finds the method
-
- def lookup_method(name, klass)
- cache = load_cache_for klass
- return nil unless cache
-
- method = cache[name.gsub('.', '#')]
- method = cache[name.gsub('.', '::')] unless method
- method
- end
-
- def map_dirs(file_name)
- @doc_dirs.map { |dir| yield File.join(dir, file_name) }.flatten.compact
- end
-
- ##
- # Extract the class and method name parts from +name+ like Foo::Bar#baz
-
- def parse_name(name)
- parts = name.split(/(::|\#|\.)/)
-
- if parts[-2] != '::' or parts.last !~ /^[A-Z]/ then
- meth = parts.pop
- parts.pop
- end
-
- klass = parts.join
-
- [klass, meth]
- end
-
- def read_yaml(path)
- data = File.read path
-
- # Necessary to be backward-compatible with documentation generated
- # by earliar RDoc versions.
- data = data.gsub(/ \!ruby\/(object|struct):(RDoc::RI|RI).*/, '')
- data = data.gsub(/ \!ruby\/(object|struct):SM::(\S+)/,
- ' !ruby/\1:RDoc::Markup::\2')
- OpenStructHash.convert(YAML.load(data))
- end
-
- def run
- if(@list_doc_dirs)
- puts @doc_dirs.join("\n")
- elsif @names.empty? then
- @display.list_known_classes class_cache.keys.sort
- else
- @names.each do |name|
- if class_cache.key? name then
- method_map = display_class name
- if(@interactive)
- method_name = @display.get_class_method_choice(method_map)
-
- if(method_name != nil)
- method = lookup_method "#{name}#{method_name}", name
- display_method method
- end
- end
- elsif name =~ /::|\#|\./ then
- klass, = parse_name name
-
- orig_klass = klass
- orig_name = name
-
- loop do
- method = lookup_method name, klass
-
- break method if method
-
- ancestor = lookup_ancestor klass, orig_klass
-
- break unless ancestor
-
- name = name.sub klass, ancestor
- klass = ancestor
- end
-
- raise NotFoundError, orig_name unless method
-
- display_method method
- else
- methods = select_methods(/#{name}/)
-
- if methods.size == 0
- raise NotFoundError, name
- elsif methods.size == 1
- display_method methods[0]
- else
- if(@interactive)
- @display.display_method_list_choice methods
- else
- @display.display_method_list methods
- end
- end
- end
- end
- end
- rescue NotFoundError => e
- abort e.message
- end
-
- def select_methods(pattern)
- methods = []
- class_cache.keys.sort.each do |klass|
- class_cache[klass]["instance_methods"].map{|h|h["name"]}.grep(pattern) do |name|
- method = load_cache_for(klass)[klass+'#'+name]
- methods << method if method
- end
- class_cache[klass]["class_methods"].map{|h|h["name"]}.grep(pattern) do |name|
- method = load_cache_for(klass)[klass+'::'+name]
- methods << method if method
- end
- end
- methods
- end
-
- def write_cache(cache, path)
- if(@use_cache)
- File.open path, "wb" do |cache_file|
- Marshal.dump cache, cache_file
- end
- end
-
- cache
- end
-
-end
diff --git a/lib/rdoc/ri/formatter.rb b/lib/rdoc/ri/formatter.rb
deleted file mode 100644
index 258907d141..0000000000
--- a/lib/rdoc/ri/formatter.rb
+++ /dev/null
@@ -1,616 +0,0 @@
-require 'rdoc/ri'
-require 'rdoc/markup'
-
-class RDoc::RI::Formatter
-
- attr_writer :indent
- attr_accessor :output
-
- FORMATTERS = { }
-
- def self.for(name)
- FORMATTERS[name.downcase]
- end
-
- def self.list
- FORMATTERS.keys.sort.join ", "
- end
-
- def initialize(output, width, indent)
- @output = output
- @width = width
- @indent = indent
- @original_indent = indent.dup
- end
-
- def draw_line(label=nil)
- len = @width
- len -= (label.size + 1) if label
-
- if len > 0 then
- @output.print '-' * len
- if label
- @output.print ' '
- bold_print label
- end
-
- @output.puts
- else
- @output.print '-' * @width
- @output.puts
-
- @output.puts label
- end
- end
-
- def indent
- return @indent unless block_given?
-
- begin
- indent = @indent.dup
- @indent += @original_indent
- yield
- ensure
- @indent = indent
- end
- end
-
- def wrap(txt, prefix=@indent, linelen=@width)
- return unless txt && !txt.empty?
-
- work = conv_markup(txt)
- textLen = linelen - prefix.length
- patt = Regexp.new("^(.{0,#{textLen}})[ \n]")
- next_prefix = prefix.tr("^ ", " ")
-
- res = []
-
- while work.length > textLen
- if work =~ patt
- res << $1
- work.slice!(0, $&.length)
- else
- res << work.slice!(0, textLen)
- end
- end
- res << work if work.length.nonzero?
- @output.puts(prefix + res.join("\n" + next_prefix))
- end
-
- def blankline
- @output.puts
- end
-
- ##
- # Called when we want to ensure a new 'wrap' starts on a newline. Only
- # needed for HtmlFormatter, because the rest do their own line breaking.
-
- def break_to_newline
- end
-
- def bold_print(txt)
- @output.print txt
- end
-
- def raw_print_line(txt)
- @output.print txt
- end
-
- ##
- # Convert HTML entities back to ASCII
-
- def conv_html(txt)
- txt = txt.gsub(/&gt;/, '>')
- txt.gsub!(/&lt;/, '<')
- txt.gsub!(/&quot;/, '"')
- txt.gsub!(/&amp;/, '&')
- txt
- end
-
- ##
- # Convert markup into display form
-
- def conv_markup(txt)
- txt = txt.gsub(%r{<tt>(.*?)</tt>}, '+\1+')
- txt.gsub!(%r{<code>(.*?)</code>}, '+\1+')
- txt.gsub!(%r{<b>(.*?)</b>}, '*\1*')
- txt.gsub!(%r{<em>(.*?)</em>}, '_\1_')
- txt
- end
-
- def display_list(list)
- case list.type
- when :BULLET
- prefixer = proc { |ignored| @indent + "* " }
-
- when :NUMBER, :UPPERALPHA, :LOWERALPHA then
- start = case list.type
- when :NUMBER then 1
- when :UPPERALPHA then 'A'
- when :LOWERALPHA then 'a'
- end
-
- prefixer = proc do |ignored|
- res = @indent + "#{start}.".ljust(4)
- start = start.succ
- res
- end
-
- when :LABELED, :NOTE then
- longest = 0
-
- list.contents.each do |item|
- if RDoc::Markup::Flow::LI === item and item.label.length > longest then
- longest = item.label.length
- end
- end
-
- longest += 1
-
- prefixer = proc { |li| @indent + li.label.ljust(longest) }
-
- else
- raise ArgumentError, "unknown list type #{list.type}"
- end
-
- list.contents.each do |item|
- if RDoc::Markup::Flow::LI === item then
- prefix = prefixer.call item
- display_flow_item item, prefix
- else
- display_flow_item item
- end
- end
- end
-
- def display_flow_item(item, prefix = @indent)
- case item
- when RDoc::Markup::Flow::P, RDoc::Markup::Flow::LI
- wrap(conv_html(item.body), prefix)
- blankline
-
- when RDoc::Markup::Flow::LIST
- display_list(item)
-
- when RDoc::Markup::Flow::VERB
- display_verbatim_flow_item(item, @indent)
-
- when RDoc::Markup::Flow::H
- display_heading(conv_html(item.text), item.level, @indent)
-
- when RDoc::Markup::Flow::RULE
- draw_line
-
- else
- raise RDoc::Error, "Unknown flow element: #{item.class}"
- end
- end
-
- def display_verbatim_flow_item(item, prefix=@indent)
- item.body.split(/\n/).each do |line|
- @output.print @indent, conv_html(line), "\n"
- end
- blankline
- end
-
- def display_heading(text, level, indent)
- text = strip_attributes text
-
- case level
- when 1 then
- ul = "=" * text.length
- @output.puts
- @output.puts text.upcase
- @output.puts ul
-
- when 2 then
- ul = "-" * text.length
- @output.puts
- @output.puts text
- @output.puts ul
- else
- @output.print indent, text, "\n"
- end
-
- @output.puts
- end
-
- def display_flow(flow)
- flow.each do |f|
- display_flow_item(f)
- end
- end
-
- def strip_attributes(text)
- text.gsub(/(<\/?(?:b|code|em|i|tt)>)/, '')
- end
-
-end
-
-##
-# Handle text with attributes. We're a base class: there are different
-# presentation classes (one, for example, uses overstrikes to handle bold and
-# underlining, while another using ANSI escape sequences.
-
-class RDoc::RI::AttributeFormatter < RDoc::RI::Formatter
-
- BOLD = 1
- ITALIC = 2
- CODE = 4
-
- ATTR_MAP = {
- "b" => BOLD,
- "code" => CODE,
- "em" => ITALIC,
- "i" => ITALIC,
- "tt" => CODE
- }
-
- AttrChar = Struct.new :char, :attr
-
- class AttributeString
- attr_reader :txt
-
- def initialize
- @txt = []
- @optr = 0
- end
-
- def <<(char)
- @txt << char
- end
-
- def empty?
- @optr >= @txt.length
- end
-
- # accept non space, then all following spaces
- def next_word
- start = @optr
- len = @txt.length
-
- while @optr < len && @txt[@optr].char != " "
- @optr += 1
- end
-
- while @optr < len && @txt[@optr].char == " "
- @optr += 1
- end
-
- @txt[start...@optr]
- end
- end
-
- ##
- # Overrides base class. Looks for <tt>...</tt> etc sequences and generates
- # an array of AttrChars. This array is then used as the basis for the
- # split.
-
- def wrap(txt, prefix=@indent, linelen=@width)
- return unless txt && !txt.empty?
-
- txt = add_attributes_to(txt)
- next_prefix = prefix.tr("^ ", " ")
- linelen -= prefix.size
-
- line = []
-
- until txt.empty?
- word = txt.next_word
- if word.size + line.size > linelen
- write_attribute_text(prefix, line)
- prefix = next_prefix
- line = []
- end
- line.concat(word)
- end
-
- write_attribute_text(prefix, line) if line.length > 0
- end
-
- protected
-
- def write_attribute_text(prefix, line)
- @output.print prefix
- line.each do |achar|
- @output.print achar.char
- end
- @output.puts
- end
-
- def bold_print(txt)
- @output.print txt
- end
-
- private
-
- def add_attributes_to(txt)
- tokens = txt.split(%r{(</?(?:b|code|em|i|tt)>)})
- text = AttributeString.new
- attributes = 0
- tokens.each do |tok|
- case tok
- when %r{^</(\w+)>$} then attributes &= ~(ATTR_MAP[$1]||0)
- when %r{^<(\w+)>$} then attributes |= (ATTR_MAP[$1]||0)
- else
- tok.split(//).each {|ch| text << AttrChar.new(ch, attributes)}
- end
- end
- text
- end
-
-end
-
-##
-# This formatter generates overstrike-style formatting, which works with
-# pagers such as man and less.
-
-class RDoc::RI::OverstrikeFormatter < RDoc::RI::AttributeFormatter
-
- BS = "\C-h"
-
- def write_attribute_text(prefix, line)
- @output.print prefix
-
- line.each do |achar|
- attr = achar.attr
- @output.print "_", BS if (attr & (ITALIC + CODE)) != 0
- @output.print achar.char, BS if (attr & BOLD) != 0
- @output.print achar.char
- end
-
- @output.puts
- end
-
- ##
- # Draw a string in bold
-
- def bold_print(text)
- text.split(//).each do |ch|
- @output.print ch, BS, ch
- end
- end
-
-end
-
-##
-# This formatter uses ANSI escape sequences to colorize stuff works with
-# pagers such as man and less.
-
-class RDoc::RI::AnsiFormatter < RDoc::RI::AttributeFormatter
-
- def initialize(*args)
- super
- @output.print "\033[0m"
- end
-
- def write_attribute_text(prefix, line)
- @output.print prefix
- curr_attr = 0
- line.each do |achar|
- attr = achar.attr
- if achar.attr != curr_attr
- update_attributes(achar.attr)
- curr_attr = achar.attr
- end
- @output.print achar.char
- end
- update_attributes(0) unless curr_attr.zero?
- @output.puts
- end
-
- def bold_print(txt)
- @output.print "\033[1m#{txt}\033[m"
- end
-
- HEADINGS = {
- 1 => ["\033[1;32m", "\033[m"],
- 2 => ["\033[4;32m", "\033[m"],
- 3 => ["\033[32m", "\033[m"],
- }
-
- def display_heading(text, level, indent)
- level = 3 if level > 3
- heading = HEADINGS[level]
- @output.print indent
- @output.print heading[0]
- @output.print strip_attributes(text)
- @output.puts heading[1]
- end
-
- private
-
- ATTR_MAP = {
- BOLD => "1",
- ITALIC => "33",
- CODE => "36"
- }
-
- def update_attributes(attr)
- str = "\033["
- for quality in [ BOLD, ITALIC, CODE]
- unless (attr & quality).zero?
- str << ATTR_MAP[quality]
- end
- end
- @output.print str, "m"
- end
-
-end
-
-##
-# This formatter uses HTML.
-
-class RDoc::RI::HtmlFormatter < RDoc::RI::AttributeFormatter
-
- def write_attribute_text(prefix, line)
- curr_attr = 0
- line.each do |achar|
- attr = achar.attr
- if achar.attr != curr_attr
- update_attributes(curr_attr, achar.attr)
- curr_attr = achar.attr
- end
- @output.print(escape(achar.char))
- end
- update_attributes(curr_attr, 0) unless curr_attr.zero?
- end
-
- def draw_line(label=nil)
- if label != nil
- bold_print(label)
- end
- @output.puts("<hr>")
- end
-
- def bold_print(txt)
- tag("b") { txt }
- end
-
- def blankline()
- @output.puts("<p>")
- end
-
- def break_to_newline
- @output.puts("<br>")
- end
-
- def display_heading(text, level, indent)
- level = 4 if level > 4
- tag("h#{level}") { text }
- @output.puts
- end
-
- def display_list(list)
- case list.type
- when :BULLET then
- list_type = "ul"
- prefixer = proc { |ignored| "<li>" }
-
- when :NUMBER, :UPPERALPHA, :LOWERALPHA then
- list_type = "ol"
- prefixer = proc { |ignored| "<li>" }
-
- when :LABELED then
- list_type = "dl"
- prefixer = proc do |li|
- "<dt><b>" + escape(li.label) + "</b><dd>"
- end
-
- when :NOTE then
- list_type = "table"
- prefixer = proc do |li|
- %{<tr valign="top"><td>#{li.label.gsub(/ /, '&nbsp;')}</td><td>}
- end
- else
- fail "unknown list type"
- end
-
- @output.print "<#{list_type}>"
- list.contents.each do |item|
- if item.kind_of? RDoc::Markup::Flow::LI
- prefix = prefixer.call(item)
- @output.print prefix
- display_flow_item(item, prefix)
- else
- display_flow_item(item)
- end
- end
- @output.print "</#{list_type}>"
- end
-
- def display_verbatim_flow_item(item, prefix=@indent)
- @output.print("<pre>")
- item.body.split(/\n/).each do |line|
- @output.puts conv_html(line)
- end
- @output.puts("</pre>")
- end
-
- private
-
- ATTR_MAP = {
- BOLD => "b>",
- ITALIC => "i>",
- CODE => "tt>"
- }
-
- def update_attributes(current, wanted)
- str = ""
- # first turn off unwanted ones
- off = current & ~wanted
- for quality in [ BOLD, ITALIC, CODE]
- if (off & quality) > 0
- str << "</" + ATTR_MAP[quality]
- end
- end
-
- # now turn on wanted
- for quality in [ BOLD, ITALIC, CODE]
- unless (wanted & quality).zero?
- str << "<" << ATTR_MAP[quality]
- end
- end
- @output.print str
- end
-
- def tag(code)
- @output.print("<#{code}>")
- @output.print(yield)
- @output.print("</#{code}>")
- end
-
- def escape(str)
- str = str.gsub(/&/n, '&amp;')
- str.gsub!(/\"/n, '&quot;')
- str.gsub!(/>/n, '&gt;')
- str.gsub!(/</n, '&lt;')
- str
- end
-
-end
-
-##
-# This formatter reduces extra lines for a simpler output. It improves way
-# output looks for tools like IRC bots.
-
-class RDoc::RI::SimpleFormatter < RDoc::RI::Formatter
-
- ##
- # No extra blank lines
-
- def blankline
- end
-
- ##
- # Display labels only, no lines
-
- def draw_line(label=nil)
- unless label.nil? then
- bold_print(label)
- @output.puts
- end
- end
-
- ##
- # Place heading level indicators inline with heading.
-
- def display_heading(text, level, indent)
- text = strip_attributes(text)
- case level
- when 1
- @output.puts "= " + text.upcase
- when 2
- @output.puts "-- " + text
- else
- @output.print indent, text, "\n"
- end
- end
-
-end
-
-RDoc::RI::Formatter::FORMATTERS['plain'] = RDoc::RI::Formatter
-RDoc::RI::Formatter::FORMATTERS['simple'] = RDoc::RI::SimpleFormatter
-RDoc::RI::Formatter::FORMATTERS['bs'] = RDoc::RI::OverstrikeFormatter
-RDoc::RI::Formatter::FORMATTERS['ansi'] = RDoc::RI::AnsiFormatter
-RDoc::RI::Formatter::FORMATTERS['html'] = RDoc::RI::HtmlFormatter
diff --git a/lib/rdoc/ri/gemdirs.rb b/lib/rdoc/ri/gemdirs.rb
deleted file mode 100644
index 0bca992bca..0000000000
--- a/lib/rdoc/ri/gemdirs.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-module RDoc::RI::Paths
- begin
- require 'rubygems' unless defined?(Gem)
-
- # HACK dup'd from Gem.latest_partials and friends
- all_paths = []
-
- all_paths = Gem.path.map do |dir|
- Dir[File.join(dir, 'doc/*/ri')]
- end.flatten
-
- ri_paths = {}
-
- all_paths.each do |dir|
- if %r"/([^/]*)-((?:\d+\.)*\d+)/ri\z" =~ dir
- name, version = $1, $2
- ver = Gem::Version.new(version)
- if !ri_paths[name] or ver > ri_paths[name][0]
- ri_paths[name] = [ver, dir]
- end
- end
- end
-
- GEMDIRS = ri_paths.map { |k,v| v.last }.sort
- rescue LoadError
- GEMDIRS = []
- end
-end
diff --git a/lib/rdoc/ri/paths.rb b/lib/rdoc/ri/paths.rb
deleted file mode 100644
index 399fbbab00..0000000000
--- a/lib/rdoc/ri/paths.rb
+++ /dev/null
@@ -1,78 +0,0 @@
-require 'rdoc/ri'
-
-##
-# Encapsulate all the strangeness to do with finding out where to find RDoc
-# files
-#
-# We basically deal with three directories:
-#
-# 1. The 'system' documentation directory, which holds the documentation
-# distributed with Ruby, and which is managed by the Ruby install process
-# 2. The 'site' directory, which contains site-wide documentation added
-# locally.
-# 3. The 'user' documentation directory, stored under the user's own home
-# directory.
-#
-# There's contention about all this, but for now:
-#
-# system:: $datadir/ri/<ver>/system/...
-# site:: $datadir/ri/<ver>/site/...
-# user:: ~/.rdoc
-
-module RDoc::RI::Paths
-
- #:stopdoc:
- require 'rbconfig'
-
- DOC_DIR = "doc/rdoc"
-
- VERSION = RbConfig::CONFIG['ruby_version']
-
- if VERSION > '1.9.1'
- if m = /ruby/.match(RbConfig::CONFIG['RUBY_INSTALL_NAME'])
- m = [m.pre_match, m.post_match]
- else
- m = [""] * 2
- end
- ri = "#{m[0]}ri#{m[1]}"
- rdoc = "#{m[0]}rdoc#{m[1]}"
- base = File.join(RbConfig::CONFIG['datadir'], ri, VERSION)
- else
- if m = /ruby/.match(RbConfig::CONFIG['RUBY_BASE_NAME'])
- m = [m.pre_match, m.post_match]
- else
- m = [""] * 2
- end
- ri = "#{m[0]}ri#{m[1]}"
- rdoc = "#{m[0]}rdoc#{m[1]}"
- base = File.join(RbConfig::CONFIG['ridir'], VERSION)
- end
- SYSDIR = File.join(base, "system")
- SITEDIR = File.join(base, "site")
- HOMEDIR = (File.expand_path("~/.#{rdoc}") rescue nil)
-
- autoload(:GEMDIRS, File.expand_path('../gemdirs.rb', __FILE__))
-
- # Returns the selected documentation directories as an Array, or PATH if no
- # overriding directories were given.
-
- def self.path(use_system, use_site, use_home, use_gems, *extra_dirs)
- path = raw_path(use_system, use_site, use_home, use_gems, *extra_dirs)
- return path.select { |directory| File.directory? directory }
- end
-
- # Returns the selected documentation directories including nonexistent
- # directories. Used to print out what paths were searched if no ri was
- # found.
-
- def self.raw_path(use_system, use_site, use_home, use_gems, *extra_dirs)
- path = []
- path << extra_dirs unless extra_dirs.empty?
- path << SYSDIR if use_system
- path << SITEDIR if use_site
- path << HOMEDIR if use_home
- path << GEMDIRS if use_gems
-
- return path.flatten.compact
- end
-end
diff --git a/lib/rdoc/ri/reader.rb b/lib/rdoc/ri/reader.rb
deleted file mode 100644
index de3c8d9afa..0000000000
--- a/lib/rdoc/ri/reader.rb
+++ /dev/null
@@ -1,106 +0,0 @@
-require 'rdoc/ri'
-require 'rdoc/ri/descriptions'
-require 'rdoc/ri/writer'
-require 'rdoc/markup/to_flow'
-
-class RDoc::RI::Reader
-
- def initialize(ri_cache)
- @cache = ri_cache
- end
-
- def top_level_namespace
- [ @cache.toplevel ]
- end
-
- def lookup_namespace_in(target, namespaces)
- result = []
- for n in namespaces
- result.concat(n.contained_modules_matching(target))
- end
- result
- end
-
- def find_class_by_name(full_name)
- names = full_name.split(/::/)
- ns = @cache.toplevel
- for name in names
- ns = ns.contained_class_named(name)
- return nil if ns.nil?
- end
- get_class(ns)
- end
-
- def find_methods(name, is_class_method, namespaces)
- result = []
- namespaces.each do |ns|
- result.concat ns.methods_matching(name, is_class_method)
- end
- result
- end
-
- ##
- # Return the MethodDescription for a given MethodEntry by deserializing the
- # YAML
-
- def get_method(method_entry)
- path = method_entry.path_name
- File.open(path) { |f| RDoc::RI::Description.deserialize(f) }
- end
-
- ##
- # Return a class description
-
- def get_class(class_entry)
- result = nil
- for path in class_entry.path_names
- path = RDoc::RI::Writer.class_desc_path(path, class_entry)
- desc = File.open(path) {|f| RDoc::RI::Description.deserialize(f) }
- if result
- result.merge_in(desc)
- else
- result = desc
- end
- end
- result
- end
-
- ##
- # Return the names of all classes and modules
-
- def full_class_names
- res = []
- find_classes_in(res, @cache.toplevel)
- end
-
- ##
- # Return a list of all classes, modules, and methods
-
- def all_names
- res = []
- find_names_in(res, @cache.toplevel)
- end
-
- private
-
- def find_classes_in(res, klass)
- classes = klass.classes_and_modules
- for c in classes
- res << c.full_name
- find_classes_in(res, c)
- end
- res
- end
-
- def find_names_in(res, klass)
- classes = klass.classes_and_modules
- for c in classes
- res << c.full_name
- res.concat c.all_method_names
- find_names_in(res, c)
- end
- res
- end
-
-end
-
diff --git a/lib/rdoc/ri/ri_cache.rb b/lib/rdoc/ri/ri_cache.rb
new file mode 100644
index 0000000000..1844ac969e
--- /dev/null
+++ b/lib/rdoc/ri/ri_cache.rb
@@ -0,0 +1,187 @@
+module RI
+
+ class ClassEntry
+
+ attr_reader :name
+ attr_reader :path_names
+
+ def initialize(path_name, name, in_class)
+ @path_names = [ path_name ]
+ @name = name
+ @in_class = in_class
+ @class_methods = []
+ @instance_methods = []
+ @inferior_classes = []
+ end
+
+ # We found this class in more tha one place, so add
+ # in the name from there.
+ def add_path(path)
+ @path_names << path
+ end
+
+ # read in our methods and any classes
+ # and modules in our namespace. Methods are
+ # stored in files called name-c|i.yaml,
+ # where the 'name' portion is the external
+ # form of the method name and the c|i is a class|instance
+ # flag
+
+ def load_from(dir)
+ Dir.foreach(dir) do |name|
+ next if name =~ /^\./
+
+ # convert from external to internal form, and
+ # extract the instance/class flag
+
+ if name =~ /^(.*?)-(c|i).yaml$/
+ external_name = $1
+ is_class_method = $2 == "c"
+ internal_name = RiWriter.external_to_internal(external_name)
+ list = is_class_method ? @class_methods : @instance_methods
+ path = File.join(dir, name)
+ list << MethodEntry.new(path, internal_name, is_class_method, self)
+ else
+ full_name = File.join(dir, name)
+ if File.directory?(full_name)
+ inf_class = @inferior_classes.find {|c| c.name == name }
+ if inf_class
+ inf_class.add_path(full_name)
+ else
+ inf_class = ClassEntry.new(full_name, name, self)
+ @inferior_classes << inf_class
+ end
+ inf_class.load_from(full_name)
+ end
+ end
+ end
+ end
+
+ # Return a list of any classes or modules that we contain
+ # that match a given string
+
+ def contained_modules_matching(name)
+ @inferior_classes.find_all {|c| c.name[name]}
+ end
+
+ def classes_and_modules
+ @inferior_classes
+ end
+
+ # Return an exact match to a particular name
+ def contained_class_named(name)
+ @inferior_classes.find {|c| c.name == name}
+ end
+
+ # return the list of local methods matching name
+ # We're split into two because we need distinct behavior
+ # when called from the _toplevel_
+ def methods_matching(name, is_class_method)
+ local_methods_matching(name, is_class_method)
+ end
+
+ # Find methods matching 'name' in ourselves and in
+ # any classes we contain
+ def recursively_find_methods_matching(name, is_class_method)
+ res = local_methods_matching(name, is_class_method)
+ @inferior_classes.each do |c|
+ res.concat(c.recursively_find_methods_matching(name, is_class_method))
+ end
+ res
+ end
+
+
+ # Return our full name
+ def full_name
+ res = @in_class.full_name
+ res << "::" unless res.empty?
+ res << @name
+ end
+
+ # Return a list of all out method names
+ def all_method_names
+ res = @class_methods.map {|m| m.full_name }
+ @instance_methods.each {|m| res << m.full_name}
+ res
+ end
+
+ private
+
+ # Return a list of all our methods matching a given string.
+ # Is +is_class_methods+ if 'nil', we don't care if the method
+ # is a class method or not, otherwise we only return
+ # those methods that match
+ def local_methods_matching(name, is_class_method)
+
+ list = case is_class_method
+ when nil then @class_methods + @instance_methods
+ when true then @class_methods
+ when false then @instance_methods
+ else fail "Unknown is_class_method: #{is_class_method.inspect}"
+ end
+
+ list.find_all {|m| m.name; m.name[name]}
+ end
+ end
+
+ # A TopLevelEntry is like a class entry, but when asked to search
+ # for methods searches all classes, not just itself
+
+ class TopLevelEntry < ClassEntry
+ def methods_matching(name, is_class_method)
+ res = recursively_find_methods_matching(name, is_class_method)
+ end
+
+ def full_name
+ ""
+ end
+
+ def module_named(name)
+
+ end
+
+ end
+
+ class MethodEntry
+ attr_reader :name
+ attr_reader :path_name
+
+ def initialize(path_name, name, is_class_method, in_class)
+ @path_name = path_name
+ @name = name
+ @is_class_method = is_class_method
+ @in_class = in_class
+ end
+
+ def full_name
+ res = @in_class.full_name
+ unless res.empty?
+ if @is_class_method
+ res << "::"
+ else
+ res << "#"
+ end
+ end
+ res << @name
+ end
+ end
+
+ # We represent everything know about all 'ri' files
+ # accessible to this program
+
+ class RiCache
+
+ attr_reader :toplevel
+
+ def initialize(dirs)
+ # At the top level we have a dummy module holding the
+ # overall namespace
+ @toplevel = TopLevelEntry.new('', '::', nil)
+
+ dirs.each do |dir|
+ @toplevel.load_from(dir)
+ end
+ end
+
+ end
+end
diff --git a/lib/rdoc/ri/ri_descriptions.rb b/lib/rdoc/ri/ri_descriptions.rb
new file mode 100644
index 0000000000..e5ea9f2fbf
--- /dev/null
+++ b/lib/rdoc/ri/ri_descriptions.rb
@@ -0,0 +1,154 @@
+require 'yaml'
+require 'rdoc/markup/simple_markup/fragments'
+
+# Descriptions are created by RDoc (in ri_generator) and
+# written out in serialized form into the documentation
+# tree. ri then reads these to generate the documentation
+
+module RI
+ class NamedThing
+ attr_reader :name
+ def initialize(name)
+ @name = name
+ end
+ def <=>(other)
+ @name <=> other.name
+ end
+
+ def hash
+ @name.hash
+ end
+
+ def eql?(other)
+ @name.eql?(other)
+ end
+ end
+
+# Alias = Struct.new(:old_name, :new_name)
+
+ class AliasName < NamedThing
+ end
+
+ class Attribute < NamedThing
+ attr_reader :rw, :comment
+ def initialize(name, rw, comment)
+ super(name)
+ @rw = rw
+ @comment = comment
+ end
+ end
+
+ class Constant < NamedThing
+ attr_reader :value, :comment
+ def initialize(name, value, comment)
+ super(name)
+ @value = value
+ @comment = comment
+ end
+ end
+
+ class IncludedModule < NamedThing
+ end
+
+
+ class MethodSummary < NamedThing
+ def initialize(name="")
+ super
+ end
+ end
+
+
+
+ class Description
+ attr_accessor :name
+ attr_accessor :full_name
+ attr_accessor :comment
+
+ def serialize
+ self.to_yaml
+ end
+
+ def Description.deserialize(from)
+ YAML.load(from)
+ end
+
+ def <=>(other)
+ @name <=> other.name
+ end
+ end
+
+ class ModuleDescription < Description
+
+ attr_accessor :class_methods
+ attr_accessor :instance_methods
+ attr_accessor :attributes
+ attr_accessor :constants
+ attr_accessor :includes
+
+ # merge in another class desscription into this one
+ def merge_in(old)
+ merge(@class_methods, old.class_methods)
+ merge(@instance_methods, old.instance_methods)
+ merge(@attributes, old.attributes)
+ merge(@constants, old.constants)
+ merge(@includes, old.includes)
+ if @comment.nil? || @comment.empty?
+ @comment = old.comment
+ else
+ unless old.comment.nil? or old.comment.empty? then
+ @comment << SM::Flow::RULE.new
+ @comment.concat old.comment
+ end
+ end
+ end
+
+ def display_name
+ "Module"
+ end
+
+ # the 'ClassDescription' subclass overrides this
+ # to format up the name of a parent
+ def superclass_string
+ nil
+ end
+
+ private
+
+ def merge(into, from)
+ names = {}
+ into.each {|i| names[i.name] = i }
+ from.each {|i| names[i.name] = i }
+ into.replace(names.keys.sort.map {|n| names[n]})
+ end
+ end
+
+ class ClassDescription < ModuleDescription
+ attr_accessor :superclass
+
+ def display_name
+ "Class"
+ end
+
+ def superclass_string
+ if @superclass && @superclass != "Object"
+ @superclass
+ else
+ nil
+ end
+ end
+ end
+
+
+ class MethodDescription < Description
+
+ attr_accessor :is_class_method
+ attr_accessor :visibility
+ attr_accessor :block_params
+ attr_accessor :is_singleton
+ attr_accessor :aliases
+ attr_accessor :is_alias_for
+ attr_accessor :params
+
+ end
+
+end
diff --git a/lib/rdoc/ri/ri_display.rb b/lib/rdoc/ri/ri_display.rb
new file mode 100644
index 0000000000..67962fc2c1
--- /dev/null
+++ b/lib/rdoc/ri/ri_display.rb
@@ -0,0 +1,255 @@
+require 'rdoc/ri/ri_util'
+require 'rdoc/ri/ri_formatter'
+require 'rdoc/ri/ri_options'
+
+
+# This is a kind of 'flag' module. If you want to write your
+# own 'ri' display module (perhaps because you'r writing
+# an IDE or somesuch beast), you simply write a class
+# which implements the various 'display' methods in 'DefaultDisplay',
+# and include the 'RiDisplay' module in that class.
+#
+# To access your class from the command line, you can do
+#
+# ruby -r <your source file> ../ri ....
+#
+# If folks _really_ want to do this from the command line,
+# I'll build an option in
+
+module RiDisplay
+ @@display_class = nil
+
+ def RiDisplay.append_features(display_class)
+ @@display_class = display_class
+ end
+
+ def RiDisplay.new(*args)
+ @@display_class.new(*args)
+ end
+end
+
+######################################################################
+#
+# A paging display module. Uses the ri_formatter class to do the
+# actual presentation
+#
+
+class DefaultDisplay
+
+ include RiDisplay
+
+ def initialize(options)
+ @options = options
+ @formatter = @options.formatter.new(@options, " ")
+ end
+
+
+ ######################################################################
+
+ def display_usage
+ page do
+ RI::Options::OptionList.usage(short_form=true)
+ end
+ end
+
+
+ ######################################################################
+
+ def display_method_info(method)
+ page do
+ @formatter.draw_line(method.full_name)
+ display_params(method)
+ @formatter.draw_line
+ display_flow(method.comment)
+ if method.aliases && !method.aliases.empty?
+ @formatter.blankline
+ aka = "(also known as "
+ aka << method.aliases.map {|a| a.name }.join(", ")
+ aka << ")"
+ @formatter.wrap(aka)
+ end
+ end
+ end
+
+ ######################################################################
+
+ def display_class_info(klass, ri_reader)
+ page do
+ superclass = klass.superclass_string
+
+ if superclass
+ superclass = " < " + superclass
+ else
+ superclass = ""
+ end
+
+ @formatter.draw_line(klass.display_name + ": " +
+ klass.full_name + superclass)
+
+ display_flow(klass.comment)
+ @formatter.draw_line
+
+ unless klass.includes.empty?
+ @formatter.blankline
+ @formatter.display_heading("Includes:", 2, "")
+ incs = []
+ klass.includes.each do |inc|
+ inc_desc = ri_reader.find_class_by_name(inc.name)
+ if inc_desc
+ str = inc.name + "("
+ str << inc_desc.instance_methods.map{|m| m.name}.join(", ")
+ str << ")"
+ incs << str
+ else
+ incs << inc.name
+ end
+ end
+ @formatter.wrap(incs.sort.join(', '))
+ end
+
+ unless klass.constants.empty?
+ @formatter.blankline
+ @formatter.display_heading("Constants:", 2, "")
+ len = 0
+ klass.constants.each { |c| len = c.name.length if c.name.length > len }
+ len += 2
+ klass.constants.each do |c|
+ @formatter.wrap(c.value,
+ @formatter.indent+((c.name+":").ljust(len)))
+ end
+ end
+
+ unless klass.class_methods.empty?
+ @formatter.blankline
+ @formatter.display_heading("Class methods:", 2, "")
+ @formatter.wrap(klass.class_methods.map{|m| m.name}.sort.join(', '))
+ end
+
+ unless klass.instance_methods.empty?
+ @formatter.blankline
+ @formatter.display_heading("Instance methods:", 2, "")
+ @formatter.wrap(klass.instance_methods.map{|m| m.name}.sort.join(', '))
+ end
+
+ unless klass.attributes.empty?
+ @formatter.blankline
+ @formatter.wrap("Attributes:", "")
+ @formatter.wrap(klass.attributes.map{|a| a.name}.sort.join(', '))
+ end
+ end
+ end
+
+ ######################################################################
+
+ # Display a list of method names
+
+ def display_method_list(methods)
+ page do
+ puts "More than one method matched your request. You can refine"
+ puts "your search by asking for information on one of:\n\n"
+ @formatter.wrap(methods.map {|m| m.full_name} .join(", "))
+ end
+ end
+
+ ######################################################################
+
+ def display_class_list(namespaces)
+ page do
+ puts "More than one class or module matched your request. You can refine"
+ puts "your search by asking for information on one of:\n\n"
+ @formatter.wrap(namespaces.map {|m| m.full_name}.join(", "))
+ end
+ end
+
+ ######################################################################
+
+ def list_known_classes(classes)
+ if classes.empty?
+ warn_no_database
+ else
+ page do
+ @formatter.draw_line("Known classes and modules")
+ @formatter.blankline
+ @formatter.wrap(classes.sort.join(", "))
+ end
+ end
+ end
+
+ ######################################################################
+
+ def list_known_names(names)
+ if names.empty?
+ warn_no_database
+ else
+ page do
+ names.each {|n| @formatter.raw_print_line(n)}
+ end
+ end
+ end
+
+ ######################################################################
+
+ private
+
+ ######################################################################
+
+ def page
+ return yield unless pager = setup_pager
+ begin
+ save_stdout = STDOUT.clone
+ STDOUT.reopen(pager)
+ yield
+ ensure
+ STDOUT.reopen(save_stdout)
+ save_stdout.close
+ pager.close
+ end
+ end
+
+ ######################################################################
+
+ def setup_pager
+ unless @options.use_stdout
+ for pager in [ ENV['PAGER'], "less", "more", 'pager' ].compact.uniq
+ return IO.popen(pager, "w") rescue nil
+ end
+ @options.use_stdout = true
+ nil
+ end
+ end
+
+ ######################################################################
+
+ def display_params(method)
+
+ params = method.params
+
+ if params[0,1] == "("
+ if method.is_singleton
+ params = method.full_name + params
+ else
+ params = method.name + params
+ end
+ end
+ params.split(/\n/).each do |p|
+ @formatter.wrap(p)
+ @formatter.break_to_newline
+ end
+ end
+ ######################################################################
+
+ def display_flow(flow)
+ if !flow || flow.empty?
+ @formatter.wrap("(no description...)")
+ else
+ @formatter.display_flow(flow)
+ end
+ end
+
+ ######################################################################
+
+ def warn_no_database
+ puts "Before using ri, you need to generate documentation"
+ puts "using 'rdoc' with the --ri option"
+ end
+end # class RiDisplay
diff --git a/lib/rdoc/ri/ri_driver.rb b/lib/rdoc/ri/ri_driver.rb
new file mode 100644
index 0000000000..a00f20ee3b
--- /dev/null
+++ b/lib/rdoc/ri/ri_driver.rb
@@ -0,0 +1,143 @@
+require 'rdoc/ri/ri_paths'
+require 'rdoc/usage'
+require 'rdoc/ri/ri_cache'
+require 'rdoc/ri/ri_util'
+require 'rdoc/ri/ri_reader'
+require 'rdoc/ri/ri_formatter'
+require 'rdoc/ri/ri_options'
+
+
+######################################################################
+
+class RiDriver
+
+ def initialize
+ @options = RI::Options.instance
+
+ args = ARGV
+ if ENV["RI"]
+ args = ENV["RI"].split.concat(ARGV)
+ end
+
+ @options.parse(args)
+
+ path = @options.path
+ report_missing_documentation @options.raw_path if path.empty?
+
+ @ri_reader = RI::RiReader.new(RI::RiCache.new(path))
+ @display = @options.displayer
+ end
+
+ # Couldn't find documentation in +path+, so tell the user what to do
+
+ def report_missing_documentation(path)
+ STDERR.puts "No ri documentation found in:"
+ path.each do |d|
+ STDERR.puts " #{d}"
+ end
+ STDERR.puts "\nWas rdoc run to create documentation?\n\n"
+ RDoc::usage("Installing Documentation")
+ end
+
+ ######################################################################
+
+ # If the list of matching methods contains exactly one entry, or
+ # if it contains an entry that exactly matches the requested method,
+ # then display that entry, otherwise display the list of
+ # matching method names
+
+ def report_method_stuff(requested_method_name, methods)
+ if methods.size == 1
+ method = @ri_reader.get_method(methods[0])
+ @display.display_method_info(method)
+ else
+ entries = methods.find_all {|m| m.name == requested_method_name}
+ if entries.size == 1
+ method = @ri_reader.get_method(entries[0])
+ @display.display_method_info(method)
+ else
+ @display.display_method_list(methods)
+ end
+ end
+ end
+
+ ######################################################################
+
+ def report_class_stuff(namespaces)
+ if namespaces.size == 1
+ klass = @ri_reader.get_class(namespaces[0])
+ @display.display_class_info(klass, @ri_reader)
+ else
+# entries = namespaces.find_all {|m| m.full_name == requested_class_name}
+# if entries.size == 1
+# klass = @ri_reader.get_class(entries[0])
+# @display.display_class_info(klass, @ri_reader)
+# else
+ @display.display_class_list(namespaces)
+# end
+ end
+ end
+
+ ######################################################################
+
+
+ def get_info_for(arg)
+ desc = NameDescriptor.new(arg)
+
+ namespaces = @ri_reader.top_level_namespace
+
+ for class_name in desc.class_names
+ namespaces = @ri_reader.lookup_namespace_in(class_name, namespaces)
+ if namespaces.empty?
+ raise RiError.new("Nothing known about #{arg}")
+ end
+ end
+
+ # at this point, if we have multiple possible namespaces, but one
+ # is an exact match for our requested class, prune down to just it
+
+ full_class_name = desc.full_class_name
+ entries = namespaces.find_all {|m| m.full_name == full_class_name}
+ namespaces = entries if entries.size == 1
+
+ if desc.method_name.nil?
+ report_class_stuff(namespaces)
+ else
+ methods = @ri_reader.find_methods(desc.method_name,
+ desc.is_class_method,
+ namespaces)
+
+ if methods.empty?
+ raise RiError.new("Nothing known about #{arg}")
+ else
+ report_method_stuff(desc.method_name, methods)
+ end
+ end
+ end
+
+ ######################################################################
+
+ def process_args
+ if @options.list_classes
+ classes = @ri_reader.full_class_names
+ @display.list_known_classes(classes)
+ elsif @options.list_names
+ names = @ri_reader.all_names
+ @display.list_known_names(names)
+ else
+ if ARGV.size.zero?
+ @display.display_usage
+ else
+ begin
+ ARGV.each do |arg|
+ get_info_for(arg)
+ end
+ rescue RiError => e
+ STDERR.puts(e.message)
+ exit(1)
+ end
+ end
+ end
+ end
+
+end # class RiDriver
diff --git a/lib/rdoc/ri/ri_formatter.rb b/lib/rdoc/ri/ri_formatter.rb
new file mode 100644
index 0000000000..34eb561ca3
--- /dev/null
+++ b/lib/rdoc/ri/ri_formatter.rb
@@ -0,0 +1,672 @@
+module RI
+ class TextFormatter
+
+ attr_reader :indent
+
+ def initialize(options, indent)
+ @options = options
+ @width = options.width
+ @indent = indent
+ end
+
+
+ ######################################################################
+
+ def draw_line(label=nil)
+ len = @width
+ len -= (label.size+1) if label
+ print "-"*len
+ if label
+ print(" ")
+ bold_print(label)
+ end
+ puts
+ end
+
+ ######################################################################
+
+ def wrap(txt, prefix=@indent, linelen=@width)
+ return unless txt && !txt.empty?
+ work = conv_markup(txt)
+ textLen = linelen - prefix.length
+ patt = Regexp.new("^(.{0,#{textLen}})[ \n]")
+ next_prefix = prefix.tr("^ ", " ")
+
+ res = []
+
+ while work.length > textLen
+ if work =~ patt
+ res << $1
+ work.slice!(0, $&.length)
+ else
+ res << work.slice!(0, textLen)
+ end
+ end
+ res << work if work.length.nonzero?
+ puts(prefix + res.join("\n" + next_prefix))
+ end
+
+ ######################################################################
+
+ def blankline
+ puts
+ end
+
+ ######################################################################
+
+ # called when we want to ensure a nbew 'wrap' starts on a newline
+ # Only needed for HtmlFormatter, because the rest do their
+ # own line breaking
+
+ def break_to_newline
+ end
+
+ ######################################################################
+
+ def bold_print(txt)
+ print txt
+ end
+
+ ######################################################################
+
+ def raw_print_line(txt)
+ puts txt
+ end
+
+ ######################################################################
+
+ # convert HTML entities back to ASCII
+ def conv_html(txt)
+ txt.
+ gsub(/&gt;/, '>').
+ gsub(/&lt;/, '<').
+ gsub(/&quot;/, '"').
+ gsub(/&amp;/, '&')
+
+ end
+
+ # convert markup into display form
+ def conv_markup(txt)
+ txt.
+ gsub(%r{<tt>(.*?)</tt>}) { "+#$1+" } .
+ gsub(%r{<code>(.*?)</code>}) { "+#$1+" } .
+ gsub(%r{<b>(.*?)</b>}) { "*#$1*" } .
+ gsub(%r{<em>(.*?)</em>}) { "_#$1_" }
+ end
+
+ ######################################################################
+
+ def display_list(list)
+ case list.type
+
+ when SM::ListBase::BULLET
+ prefixer = proc { |ignored| @indent + "* " }
+
+ when SM::ListBase::NUMBER,
+ SM::ListBase::UPPERALPHA,
+ SM::ListBase::LOWERALPHA
+
+ start = case list.type
+ when SM::ListBase::NUMBER then 1
+ when SM::ListBase::UPPERALPHA then 'A'
+ when SM::ListBase::LOWERALPHA then 'a'
+ end
+ prefixer = proc do |ignored|
+ res = @indent + "#{start}.".ljust(4)
+ start = start.succ
+ res
+ end
+
+ when SM::ListBase::LABELED
+ prefixer = proc do |li|
+ li.label
+ end
+
+ when SM::ListBase::NOTE
+ longest = 0
+ list.contents.each do |item|
+ if item.kind_of?(SM::Flow::LI) && item.label.length > longest
+ longest = item.label.length
+ end
+ end
+
+ prefixer = proc do |li|
+ @indent + li.label.ljust(longest+1)
+ end
+
+ else
+ fail "unknown list type"
+
+ end
+
+ list.contents.each do |item|
+ if item.kind_of? SM::Flow::LI
+ prefix = prefixer.call(item)
+ display_flow_item(item, prefix)
+ else
+ display_flow_item(item)
+ end
+ end
+ end
+
+ ######################################################################
+
+ def display_flow_item(item, prefix=@indent)
+ case item
+ when SM::Flow::P, SM::Flow::LI
+ wrap(conv_html(item.body), prefix)
+ blankline
+
+ when SM::Flow::LIST
+ display_list(item)
+
+ when SM::Flow::VERB
+ display_verbatim_flow_item(item, @indent)
+
+ when SM::Flow::H
+ display_heading(conv_html(item.text), item.level, @indent)
+
+ when SM::Flow::RULE
+ draw_line
+
+ else
+ fail "Unknown flow element: #{item.class}"
+ end
+ end
+
+ ######################################################################
+
+ def display_verbatim_flow_item(item, prefix=@indent)
+ item.body.split(/\n/).each do |line|
+ print @indent, conv_html(line), "\n"
+ end
+ blankline
+ end
+
+ ######################################################################
+
+ def display_heading(text, level, indent)
+ text = strip_attributes(text)
+ case level
+ when 1
+ ul = "=" * text.length
+ puts
+ puts text.upcase
+ puts ul
+# puts
+
+ when 2
+ ul = "-" * text.length
+ puts
+ puts text
+ puts ul
+# puts
+ else
+ print indent, text, "\n"
+ end
+ end
+
+
+ def display_flow(flow)
+ flow.each do |f|
+ display_flow_item(f)
+ end
+ end
+
+ def strip_attributes(txt)
+ tokens = txt.split(%r{(</?(?:b|code|em|i|tt)>)})
+ text = []
+ attributes = 0
+ tokens.each do |tok|
+ case tok
+ when %r{^</(\w+)>$}, %r{^<(\w+)>$}
+ ;
+ else
+ text << tok
+ end
+ end
+ text.join
+ end
+
+
+ end
+
+
+ ######################################################################
+ # Handle text with attributes. We're a base class: there are
+ # different presentation classes (one, for example, uses overstrikes
+ # to handle bold and underlining, while another using ANSI escape
+ # sequences
+
+ class AttributeFormatter < TextFormatter
+
+ BOLD = 1
+ ITALIC = 2
+ CODE = 4
+
+ ATTR_MAP = {
+ "b" => BOLD,
+ "code" => CODE,
+ "em" => ITALIC,
+ "i" => ITALIC,
+ "tt" => CODE
+ }
+
+ # TODO: struct?
+ class AttrChar
+ attr_reader :char
+ attr_reader :attr
+
+ def initialize(char, attr)
+ @char = char
+ @attr = attr
+ end
+ end
+
+
+ class AttributeString
+ attr_reader :txt
+
+ def initialize
+ @txt = []
+ @optr = 0
+ end
+
+ def <<(char)
+ @txt << char
+ end
+
+ def empty?
+ @optr >= @txt.length
+ end
+
+ # accept non space, then all following spaces
+ def next_word
+ start = @optr
+ len = @txt.length
+
+ while @optr < len && @txt[@optr].char != " "
+ @optr += 1
+ end
+
+ while @optr < len && @txt[@optr].char == " "
+ @optr += 1
+ end
+
+ @txt[start...@optr]
+ end
+ end
+
+ ######################################################################
+ # overrides base class. Looks for <tt>...</tt> etc sequences
+ # and generates an array of AttrChars. This array is then used
+ # as the basis for the split
+
+ def wrap(txt, prefix=@indent, linelen=@width)
+ return unless txt && !txt.empty?
+
+ txt = add_attributes_to(txt)
+ next_prefix = prefix.tr("^ ", " ")
+ linelen -= prefix.size
+
+ line = []
+
+ until txt.empty?
+ word = txt.next_word
+ if word.size + line.size > linelen
+ write_attribute_text(prefix, line)
+ prefix = next_prefix
+ line = []
+ end
+ line.concat(word)
+ end
+
+ write_attribute_text(prefix, line) if line.length > 0
+ end
+
+ protected
+
+ # overridden in specific formatters
+
+ def write_attribute_text(prefix, line)
+ print prefix
+ line.each do |achar|
+ print achar.char
+ end
+ puts
+ end
+
+ # again, overridden
+
+ def bold_print(txt)
+ print txt
+ end
+
+ private
+
+ def add_attributes_to(txt)
+ tokens = txt.split(%r{(</?(?:b|code|em|i|tt)>)})
+ text = AttributeString.new
+ attributes = 0
+ tokens.each do |tok|
+ case tok
+ when %r{^</(\w+)>$} then attributes &= ~(ATTR_MAP[$1]||0)
+ when %r{^<(\w+)>$} then attributes |= (ATTR_MAP[$1]||0)
+ else
+ tok.split(//).each {|ch| text << AttrChar.new(ch, attributes)}
+ end
+ end
+ text
+ end
+
+ end
+
+
+ ##################################################
+
+ # This formatter generates overstrike-style formatting, which
+ # works with pagers such as man and less.
+
+ class OverstrikeFormatter < AttributeFormatter
+
+ BS = "\C-h"
+
+ def write_attribute_text(prefix, line)
+ print prefix
+ line.each do |achar|
+ attr = achar.attr
+ if (attr & (ITALIC+CODE)) != 0
+ print "_", BS
+ end
+ if (attr & BOLD) != 0
+ print achar.char, BS
+ end
+ print achar.char
+ end
+ puts
+ end
+
+ # draw a string in bold
+ def bold_print(text)
+ text.split(//).each do |ch|
+ print ch, BS, ch
+ end
+ end
+ end
+
+ ##################################################
+
+ # This formatter uses ANSI escape sequences
+ # to colorize stuff
+ # works with pages such as man and less.
+
+ class AnsiFormatter < AttributeFormatter
+
+ def initialize(*args)
+ print "\033[0m"
+ super
+ end
+
+ def write_attribute_text(prefix, line)
+ print prefix
+ curr_attr = 0
+ line.each do |achar|
+ attr = achar.attr
+ if achar.attr != curr_attr
+ update_attributes(achar.attr)
+ curr_attr = achar.attr
+ end
+ print achar.char
+ end
+ update_attributes(0) unless curr_attr.zero?
+ puts
+ end
+
+
+ def bold_print(txt)
+ print "\033[1m#{txt}\033[m"
+ end
+
+ HEADINGS = {
+ 1 => [ "\033[1;32m", "\033[m" ] ,
+ 2 => ["\033[4;32m", "\033[m" ],
+ 3 => ["\033[32m", "\033[m" ]
+ }
+
+ def display_heading(text, level, indent)
+ level = 3 if level > 3
+ heading = HEADINGS[level]
+ print indent
+ print heading[0]
+ print strip_attributes(text)
+ puts heading[1]
+ end
+
+ private
+
+ ATTR_MAP = {
+ BOLD => "1",
+ ITALIC => "33",
+ CODE => "36"
+ }
+
+ def update_attributes(attr)
+ str = "\033["
+ for quality in [ BOLD, ITALIC, CODE]
+ unless (attr & quality).zero?
+ str << ATTR_MAP[quality]
+ end
+ end
+ print str, "m"
+ end
+ end
+
+ ##################################################
+
+ # This formatter uses HTML.
+
+ class HtmlFormatter < AttributeFormatter
+
+ def initialize(*args)
+ super
+ end
+
+ def write_attribute_text(prefix, line)
+ curr_attr = 0
+ line.each do |achar|
+ attr = achar.attr
+ if achar.attr != curr_attr
+ update_attributes(curr_attr, achar.attr)
+ curr_attr = achar.attr
+ end
+ print(escape(achar.char))
+ end
+ update_attributes(curr_attr, 0) unless curr_attr.zero?
+ end
+
+ def draw_line(label=nil)
+ if label != nil
+ bold_print(label)
+ end
+ puts("<hr>")
+ end
+
+ def bold_print(txt)
+ tag("b") { txt }
+ end
+
+ def blankline()
+ puts("<p>")
+ end
+
+ def break_to_newline
+ puts("<br>")
+ end
+
+ def display_heading(text, level, indent)
+ level = 4 if level > 4
+ tag("h#{level}") { text }
+ puts
+ end
+
+ ######################################################################
+
+ def display_list(list)
+
+ case list.type
+ when SM::ListBase::BULLET
+ list_type = "ul"
+ prefixer = proc { |ignored| "<li>" }
+
+ when SM::ListBase::NUMBER,
+ SM::ListBase::UPPERALPHA,
+ SM::ListBase::LOWERALPHA
+ list_type = "ol"
+ prefixer = proc { |ignored| "<li>" }
+
+ when SM::ListBase::LABELED
+ list_type = "dl"
+ prefixer = proc do |li|
+ "<dt><b>" + escape(li.label) + "</b><dd>"
+ end
+
+ when SM::ListBase::NOTE
+ list_type = "table"
+ prefixer = proc do |li|
+ %{<tr valign="top"><td>#{li.label.gsub(/ /, '&nbsp;')}</td><td>}
+ end
+ else
+ fail "unknown list type"
+ end
+
+ print "<#{list_type}>"
+ list.contents.each do |item|
+ if item.kind_of? SM::Flow::LI
+ prefix = prefixer.call(item)
+ print prefix
+ display_flow_item(item, prefix)
+ else
+ display_flow_item(item)
+ end
+ end
+ print "</#{list_type}>"
+ end
+
+ def display_verbatim_flow_item(item, prefix=@indent)
+ print("<pre>")
+ puts item.body
+ puts("</pre>")
+ end
+
+ private
+
+ ATTR_MAP = {
+ BOLD => "b>",
+ ITALIC => "i>",
+ CODE => "tt>"
+ }
+
+ def update_attributes(current, wanted)
+ str = ""
+ # first turn off unwanted ones
+ off = current & ~wanted
+ for quality in [ BOLD, ITALIC, CODE]
+ if (off & quality) > 0
+ str << "</" + ATTR_MAP[quality]
+ end
+ end
+
+ # now turn on wanted
+ for quality in [ BOLD, ITALIC, CODE]
+ unless (wanted & quality).zero?
+ str << "<" << ATTR_MAP[quality]
+ end
+ end
+ print str
+ end
+
+ def tag(code)
+ print("<#{code}>")
+ print(yield)
+ print("</#{code}>")
+ end
+
+ def escape(str)
+ str.
+ gsub(/&/n, '&amp;').
+ gsub(/\"/n, '&quot;').
+ gsub(/>/n, '&gt;').
+ gsub(/</n, '&lt;')
+ end
+
+ end
+
+ ##################################################
+
+ # This formatter reduces extra lines for a simpler output.
+ # It improves way output looks for tools like IRC bots.
+
+ class SimpleFormatter < TextFormatter
+
+ ######################################################################
+
+ # No extra blank lines
+
+ def blankline
+ end
+
+ ######################################################################
+
+ # Display labels only, no lines
+
+ def draw_line(label=nil)
+ unless label.nil? then
+ bold_print(label)
+ puts
+ end
+ end
+
+ ######################################################################
+
+ # Place heading level indicators inline with heading.
+
+ def display_heading(text, level, indent)
+ text = strip_attributes(text)
+ case level
+ when 1
+ puts "= " + text.upcase
+ when 2
+ puts "-- " + text
+ else
+ print indent, text, "\n"
+ end
+ end
+
+ end
+
+
+ # Finally, fill in the list of known formatters
+
+ class TextFormatter
+
+ FORMATTERS = {
+ "ansi" => AnsiFormatter,
+ "bs" => OverstrikeFormatter,
+ "html" => HtmlFormatter,
+ "plain" => TextFormatter,
+ "simple" => SimpleFormatter,
+ }
+
+ def TextFormatter.list
+ FORMATTERS.keys.sort.join(", ")
+ end
+
+ def TextFormatter.for(name)
+ FORMATTERS[name.downcase]
+ end
+
+ end
+
+end
+
+
diff --git a/lib/rdoc/ri/ri_options.rb b/lib/rdoc/ri/ri_options.rb
new file mode 100644
index 0000000000..179ef96cea
--- /dev/null
+++ b/lib/rdoc/ri/ri_options.rb
@@ -0,0 +1,319 @@
+# We handle the parsing of options, and subsequently as a singleton
+# object to be queried for option values
+
+module RI
+
+ require 'rdoc/ri/ri_paths'
+ require 'rdoc/ri/ri_display'
+
+ VERSION_STRING = "ri v1.0.1 - 20041108"
+
+ class Options
+
+ require 'singleton'
+ require 'getoptlong'
+
+ include Singleton
+
+ # No not use a pager. Writable, because ri sets it if it
+ # can't find a pager
+ attr_accessor :use_stdout
+
+ # should we just display a class list and exit
+ attr_reader :list_classes
+
+ # should we display a list of all names
+ attr_reader :list_names
+
+ # The width of the output line
+ attr_reader :width
+
+ # the formatting we apply to the output
+ attr_reader :formatter
+
+ # the directory we search for original documentation
+ attr_reader :doc_dir
+
+ module OptionList
+
+ OPTION_LIST = [
+ [ "--help", "-h", nil,
+ "you're looking at it" ],
+
+ [ "--classes", "-c", nil,
+ "Display the names of classes and modules we\n" +
+ "know about"],
+
+ [ "--doc-dir", "-d", "<dirname>",
+ "A directory to search for documentation. If not\n" +
+ "specified, we search the standard rdoc/ri directories.\n" +
+ "May be repeated."],
+
+ [ "--system", nil, nil,
+ "Include documentation from Ruby's standard library:\n " +
+ RI::Paths::SYSDIR ],
+
+ [ "--site", nil, nil,
+ "Include documentation from libraries installed in site_lib:\n " +
+ RI::Paths::SITEDIR ],
+
+ [ "--home", nil, nil,
+ "Include documentation stored in ~/.rdoc:\n " +
+ (RI::Paths::HOMEDIR || "No ~/.rdoc found") ],
+
+ [ "--gems", nil, nil,
+ "Include documentation from RubyGems:\n" +
+ (RI::Paths::GEMDIRS ?
+ Gem.path.map { |dir| " #{dir}/doc/*/ri" }.join("\n") :
+ "No Rubygems ri found.") ],
+
+ [ "--format", "-f", "<name>",
+ "Format to use when displaying output:\n" +
+ " " + RI::TextFormatter.list + "\n" +
+ "Use 'bs' (backspace) with most pager programs.\n" +
+ "To use ANSI, either also use the -T option, or\n" +
+ "tell your pager to allow control characters\n" +
+ "(for example using the -R option to less)"],
+
+ [ "--list-names", "-l", nil,
+ "List all the names known to RDoc, one per line"
+ ],
+
+ [ "--no-pager", "-T", nil,
+ "Send output directly to stdout."
+ ],
+
+ [ "--width", "-w", "output width",
+ "Set the width of the output" ],
+
+ [ "--version", "-v", nil,
+ "Display the version of ri"
+ ],
+
+ ]
+
+ def OptionList.options
+ OPTION_LIST.map do |long, short, arg,|
+ option = []
+ option << long
+ option << short unless short.nil?
+ option << (arg ? GetoptLong::REQUIRED_ARGUMENT :
+ GetoptLong::NO_ARGUMENT)
+ option
+ end
+ end
+
+
+ def OptionList.strip_output(text)
+ text =~ /^\s+/
+ leading_spaces = $&
+ text.gsub!(/^#{leading_spaces}/, '')
+ $stdout.puts text
+ end
+
+
+ # Show an error and exit
+
+ def OptionList.error(msg)
+ $stderr.puts
+ $stderr.puts msg
+ name = File.basename $PROGRAM_NAME
+ $stderr.puts "\nFor help on options, try '#{name} --help'\n\n"
+ exit 1
+ end
+
+ # Show usage and exit
+
+ def OptionList.usage(short_form=false)
+
+ puts
+ puts(RI::VERSION_STRING)
+ puts
+
+ name = File.basename($0)
+
+ directories = [
+ RI::Paths::SYSDIR,
+ RI::Paths::SITEDIR,
+ RI::Paths::HOMEDIR
+ ]
+
+ if RI::Paths::GEMDIRS then
+ Gem.path.each do |dir|
+ directories << "#{dir}/doc/*/ri"
+ end
+ end
+
+ directories = directories.join("\n ")
+
+ OptionList.strip_output(<<-EOT)
+ Usage:
+
+ #{name} [options] [names...]
+
+ Display information on Ruby classes, modules, and methods.
+ Give the names of classes or methods to see their documentation.
+ Partial names may be given: if the names match more than
+ one entity, a list will be shown, otherwise details on
+ that entity will be displayed.
+
+ Nested classes and modules can be specified using the normal
+ Name::Name notation, and instance methods can be distinguished
+ from class methods using "." (or "#") instead of "::".
+
+ For example:
+
+ #{name} File
+ #{name} File.new
+ #{name} F.n
+ #{name} zip
+
+ Note that shell quoting may be required for method names
+ containing punctuation:
+
+ #{name} 'Array.[]'
+ #{name} compact\\!
+
+ By default ri searches for documentation in the following
+ directories:
+
+ #{directories}
+
+ Specifying the --system, --site, --home, --gems or --doc-dir
+ options will limit ri to searching only the specified
+ directories.
+
+ EOT
+
+ if short_form
+ puts "For help on options, type '#{name} -h'"
+ puts "For a list of classes I know about, type '#{name} -c'"
+ else
+ puts "Options:\n\n"
+ OPTION_LIST.each do|long, short, arg, desc|
+ opt = ''
+ opt << (short ? sprintf("%15s", "#{long}, #{short}") :
+ sprintf("%15s", long))
+ if arg
+ opt << " " << arg
+ end
+ print opt
+ desc = desc.split("\n")
+ if opt.size < 17
+ print " "*(18-opt.size)
+ puts desc.shift
+ else
+ puts
+ end
+ desc.each do |line|
+ puts(" "*18 + line)
+ end
+ puts
+ end
+ puts "Options may also be passed in the 'RI' environment variable"
+ exit 0
+ end
+ end
+ end
+
+ # Show the version and exit
+ def show_version
+ puts VERSION_STRING
+ exit(0)
+ end
+
+ def initialize
+ @use_stdout = !STDOUT.tty?
+ @width = 72
+ @formatter = RI::TextFormatter.for("plain")
+ @list_classes = false
+ @list_names = false
+
+ # By default all paths are used. If any of these are true, only those
+ # directories are used.
+ @use_system = false
+ @use_site = false
+ @use_home = false
+ @use_gems = false
+ @doc_dirs = []
+ end
+
+ # Parse command line options.
+
+ def parse(args)
+
+ old_argv = ARGV.dup
+
+ ARGV.replace(args)
+
+ begin
+
+ go = GetoptLong.new(*OptionList.options)
+ go.quiet = true
+
+ go.each do |opt, arg|
+ case opt
+ when "--help" then OptionList.usage
+ when "--version" then show_version
+ when "--list-names" then @list_names = true
+ when "--no-pager" then @use_stdout = true
+ when "--classes" then @list_classes = true
+
+ when "--system" then @use_system = true
+ when "--site" then @use_site = true
+ when "--home" then @use_home = true
+ when "--gems" then @use_gems = true
+
+ when "--doc-dir"
+ if File.directory?(arg)
+ @doc_dirs << arg
+ else
+ $stderr.puts "Invalid directory: #{arg}"
+ exit 1
+ end
+
+ when "--format"
+ @formatter = RI::TextFormatter.for(arg)
+ unless @formatter
+ $stderr.print "Invalid formatter (should be one of "
+ $stderr.puts RI::TextFormatter.list + ")"
+ exit 1
+ end
+ when "--width"
+ begin
+ @width = Integer(arg)
+ rescue
+ $stderr.puts "Invalid width: '#{arg}'"
+ exit 1
+ end
+ end
+ end
+
+ rescue GetoptLong::InvalidOption, GetoptLong::MissingArgument => error
+ OptionList.error(error.message)
+
+ end
+ end
+
+ # Return the selected documentation directories.
+
+ def path
+ RI::Paths.path(@use_system, @use_site, @use_home, @use_gems, *@doc_dirs)
+ end
+
+ def raw_path
+ RI::Paths.raw_path(@use_system, @use_site, @use_home, @use_gems,
+ *@doc_dirs)
+ end
+
+ # Return an instance of the displayer (the thing that actually writes
+ # the information). This allows us to load in new displayer classes
+ # at runtime (for example to help with IDE integration)
+
+ def displayer
+ ::RiDisplay.new(self)
+ end
+ end
+
+end
+
diff --git a/lib/rdoc/ri/ri_paths.rb b/lib/rdoc/ri/ri_paths.rb
new file mode 100644
index 0000000000..9768f12b7d
--- /dev/null
+++ b/lib/rdoc/ri/ri_paths.rb
@@ -0,0 +1,101 @@
+module RI
+
+ # Encapsulate all the strangeness to do with finding out
+ # where to find RDoc files
+ #
+ # We basically deal with three directories:
+ #
+ # 1. The 'system' documentation directory, which holds
+ # the documentation distributed with Ruby, and which
+ # is managed by the Ruby install process
+ # 2. The 'site' directory, which contains site-wide
+ # documentation added locally.
+ # 3. The 'user' documentation directory, stored under the
+ # user's own home directory.
+ #
+ # There's contention about all this, but for now:
+ #
+ # system:: $datadir/ri/<ver>/system/...
+ # site:: $datadir/ri/<ver>/site/...
+ # user:: ~/.rdoc
+
+ module Paths
+
+ #:stopdoc:
+ require 'rbconfig'
+
+ DOC_DIR = "doc/rdoc"
+
+ version = Config::CONFIG['ruby_version']
+
+ base = File.join(Config::CONFIG['datadir'], "ri", version)
+ SYSDIR = File.join(base, "system")
+ SITEDIR = File.join(base, "site")
+ homedir = ENV['HOME'] || ENV['USERPROFILE'] || ENV['HOMEPATH']
+
+ if homedir
+ HOMEDIR = File.join(homedir, ".rdoc")
+ else
+ HOMEDIR = nil
+ end
+
+ # This is the search path for 'ri'
+ PATH = [ SYSDIR, SITEDIR, HOMEDIR ].find_all {|p| p && File.directory?(p)}
+
+ begin
+ require 'rubygems'
+
+ # HACK dup'd from Gem.latest_partials and friends
+ all_paths = []
+
+ all_paths = Gem.path.map do |dir|
+ Dir[File.join(dir, 'doc', '*', 'ri')]
+ end.flatten
+
+ ri_paths = {}
+
+ all_paths.each do |dir|
+ base = File.basename File.dirname(dir)
+ if base =~ /(.*)-((\d+\.)*\d+)/ then
+ name, version = $1, $2
+ ver = Gem::Version.new version
+ if ri_paths[name].nil? or ver > ri_paths[name][0] then
+ ri_paths[name] = [ver, dir]
+ end
+ end
+ end
+
+ GEMDIRS = ri_paths.map { |k,v| v.last }.sort
+ GEMDIRS.each { |dir| RI::Paths::PATH << dir }
+ rescue LoadError
+ GEMDIRS = nil
+ end
+
+ # Returns the selected documentation directories as an Array, or PATH if no
+ # overriding directories were given.
+
+ def self.path(use_system, use_site, use_home, use_gems, *extra_dirs)
+ path = raw_path(use_system, use_site, use_home, use_gems, *extra_dirs)
+ return path.select { |directory| File.directory? directory }
+ end
+
+ # Returns the selected documentation directories including nonexistent
+ # directories. Used to print out what paths were searched if no ri was
+ # found.
+
+ def self.raw_path(use_system, use_site, use_home, use_gems, *extra_dirs)
+ return PATH unless use_system or use_site or use_home or use_gems or
+ not extra_dirs.empty?
+
+ path = []
+ path << extra_dirs unless extra_dirs.empty?
+ path << RI::Paths::SYSDIR if use_system
+ path << RI::Paths::SITEDIR if use_site
+ path << RI::Paths::HOMEDIR if use_home
+ path << RI::Paths::GEMDIRS if use_gems
+
+ return path.flatten.compact
+ end
+
+ end
+end
diff --git a/lib/rdoc/ri/ri_reader.rb b/lib/rdoc/ri/ri_reader.rb
new file mode 100644
index 0000000000..fb2c373e38
--- /dev/null
+++ b/lib/rdoc/ri/ri_reader.rb
@@ -0,0 +1,100 @@
+require 'rdoc/ri/ri_descriptions'
+require 'rdoc/ri/ri_writer'
+require 'rdoc/markup/simple_markup/to_flow'
+
+module RI
+ class RiReader
+
+ def initialize(ri_cache)
+ @cache = ri_cache
+ end
+
+ def top_level_namespace
+ [ @cache.toplevel ]
+ end
+
+ def lookup_namespace_in(target, namespaces)
+ result = []
+ for n in namespaces
+ result.concat(n.contained_modules_matching(target))
+ end
+ result
+ end
+
+ def find_class_by_name(full_name)
+ names = full_name.split(/::/)
+ ns = @cache.toplevel
+ for name in names
+ ns = ns.contained_class_named(name)
+ return nil if ns.nil?
+ end
+ get_class(ns)
+ end
+
+ def find_methods(name, is_class_method, namespaces)
+ result = []
+ namespaces.each do |ns|
+ result.concat ns.methods_matching(name, is_class_method)
+ end
+ result
+ end
+
+ # return the MethodDescription for a given MethodEntry
+ # by deserializing the YAML
+ def get_method(method_entry)
+ path = method_entry.path_name
+ File.open(path) { |f| RI::Description.deserialize(f) }
+ end
+
+ # Return a class description
+ def get_class(class_entry)
+ result = nil
+ for path in class_entry.path_names
+ path = RiWriter.class_desc_path(path, class_entry)
+ desc = File.open(path) {|f| RI::Description.deserialize(f) }
+ if result
+ result.merge_in(desc)
+ else
+ result = desc
+ end
+ end
+ result
+ end
+
+ # return the names of all classes and modules
+ def full_class_names
+ res = []
+ find_classes_in(res, @cache.toplevel)
+ end
+
+ # return a list of all classes, modules, and methods
+ def all_names
+ res = []
+ find_names_in(res, @cache.toplevel)
+ end
+
+ # ----
+ private
+ # ----
+
+ def find_classes_in(res, klass)
+ classes = klass.classes_and_modules
+ for c in classes
+ res << c.full_name
+ find_classes_in(res, c)
+ end
+ res
+ end
+
+ def find_names_in(res, klass)
+ classes = klass.classes_and_modules
+ for c in classes
+ res << c.full_name
+ res.concat c.all_method_names
+ find_names_in(res, c)
+ end
+ res
+ end
+
+ end
+end
diff --git a/lib/rdoc/ri/ri_util.rb b/lib/rdoc/ri/ri_util.rb
new file mode 100644
index 0000000000..8a01255897
--- /dev/null
+++ b/lib/rdoc/ri/ri_util.rb
@@ -0,0 +1,75 @@
+######################################################################
+
+class RiError < Exception; end
+#
+# Break argument into its constituent class or module names, an
+# optional method type, and a method name
+
+class NameDescriptor
+
+ attr_reader :class_names
+ attr_reader :method_name
+
+ # true and false have the obvious meaning. nil means we don't care
+ attr_reader :is_class_method
+
+ # arg may be
+ # 1. a class or module name (optionally qualified with other class
+ # or module names (Kernel, File::Stat etc)
+ # 2. a method name
+ # 3. a method name qualified by a optionally fully qualified class
+ # or module name
+ #
+ # We're fairly casual about delimiters: folks can say Kernel::puts,
+ # Kernel.puts, or Kernel\#puts for example. There's one exception:
+ # if you say IO::read, we look for a class method, but if you
+ # say IO.read, we look for an instance method
+
+ def initialize(arg)
+ @class_names = []
+ separator = nil
+
+ tokens = arg.split(/(\.|::|#)/)
+
+ # Skip leading '::', '#' or '.', but remember it might
+ # be a method name qualifier
+ separator = tokens.shift if tokens[0] =~ /^(\.|::|#)/
+
+ # Skip leading '::', but remember we potentially have an inst
+
+ # leading stuff must be class names
+
+ while tokens[0] =~ /^[A-Z]/
+ @class_names << tokens.shift
+ unless tokens.empty?
+ separator = tokens.shift
+ break unless separator == "::"
+ end
+ end
+
+ # Now must have a single token, the method name, or an empty
+ # array
+ unless tokens.empty?
+ @method_name = tokens.shift
+ # We may now have a trailing !, ?, or = to roll into
+ # the method name
+ if !tokens.empty? && tokens[0] =~ /^[!?=]$/
+ @method_name << tokens.shift
+ end
+
+ if @method_name =~ /::|\.|#/ or !tokens.empty?
+ raise RiError.new("Bad argument: #{arg}")
+ end
+ if separator && separator != '.'
+ @is_class_method = separator == "::"
+ end
+ end
+ end
+
+ # Return the full class name (with '::' between the components)
+ # or "" if there's no class name
+
+ def full_class_name
+ @class_names.join("::")
+ end
+end
diff --git a/lib/rdoc/ri/ri_writer.rb b/lib/rdoc/ri/ri_writer.rb
new file mode 100644
index 0000000000..78c68e8409
--- /dev/null
+++ b/lib/rdoc/ri/ri_writer.rb
@@ -0,0 +1,62 @@
+require 'fileutils'
+
+module RI
+ class RiWriter
+
+ def RiWriter.class_desc_path(dir, class_desc)
+ File.join(dir, "cdesc-" + class_desc.name + ".yaml")
+ end
+
+
+ # Convert a name from internal form (containing punctuation)
+ # to an external form (where punctuation is replaced
+ # by %xx)
+
+ def RiWriter.internal_to_external(name)
+ name.gsub(/\W/) { sprintf("%%%02x", $&[0]) }
+ end
+
+ # And the reverse operation
+ def RiWriter.external_to_internal(name)
+ name.gsub(/%([0-9a-f]{2,2})/) { $1.to_i(16).chr }
+ end
+
+ def initialize(base_dir)
+ @base_dir = base_dir
+ end
+
+ def remove_class(class_desc)
+ FileUtils.rm_rf(path_to_dir(class_desc.full_name))
+ end
+
+ def add_class(class_desc)
+ dir = path_to_dir(class_desc.full_name)
+ FileUtils.mkdir_p(dir)
+ class_file_name = RiWriter.class_desc_path(dir, class_desc)
+ File.open(class_file_name, "w") do |f|
+ f.write(class_desc.serialize)
+ end
+ end
+
+ def add_method(class_desc, method_desc)
+ dir = path_to_dir(class_desc.full_name)
+ file_name = RiWriter.internal_to_external(method_desc.name)
+ meth_file_name = File.join(dir, file_name)
+ if method_desc.is_singleton
+ meth_file_name += "-c.yaml"
+ else
+ meth_file_name += "-i.yaml"
+ end
+
+ File.open(meth_file_name, "w") do |f|
+ f.write(method_desc.serialize)
+ end
+ end
+
+ private
+
+ def path_to_dir(class_name)
+ File.join(@base_dir, *class_name.split('::'))
+ end
+ end
+end
diff --git a/lib/rdoc/ri/util.rb b/lib/rdoc/ri/util.rb
deleted file mode 100644
index 51cf881bdd..0000000000
--- a/lib/rdoc/ri/util.rb
+++ /dev/null
@@ -1,79 +0,0 @@
-require 'rdoc/ri'
-
-##
-# Break argument into its constituent class or module names, an
-# optional method type, and a method name
-
-class RDoc::RI::NameDescriptor
-
- attr_reader :class_names
- attr_reader :method_name
-
- ##
- # true and false have the obvious meaning. nil means we don't care
-
- attr_reader :is_class_method
-
- ##
- # +arg+ may be
- #
- # 1. A class or module name (optionally qualified with other class or module
- # names (Kernel, File::Stat etc)
- # 2. A method name
- # 3. A method name qualified by a optionally fully qualified class or module
- # name
- #
- # We're fairly casual about delimiters: folks can say Kernel::puts,
- # Kernel.puts, or Kernel\#puts for example. There's one exception: if you
- # say IO::read, we look for a class method, but if you say IO.read, we look
- # for an instance method
-
- def initialize(arg)
- @class_names = []
- separator = nil
-
- tokens = arg.split(/(\.|::|#)/)
-
- # Skip leading '::', '#' or '.', but remember it might
- # be a method name qualifier
- separator = tokens.shift if tokens[0] =~ /^(\.|::|#)/
-
- # Skip leading '::', but remember we potentially have an inst
-
- # leading stuff must be class names
-
- while tokens[0] =~ /^[A-Z]/
- @class_names << tokens.shift
- unless tokens.empty?
- separator = tokens.shift
- break unless separator == "::"
- end
- end
-
- # Now must have a single token, the method name, or an empty array
- unless tokens.empty?
- @method_name = tokens.shift
- # We may now have a trailing !, ?, or = to roll into
- # the method name
- if !tokens.empty? && tokens[0] =~ /^[!?=]$/
- @method_name << tokens.shift
- end
-
- if @method_name =~ /::|\.|#/ or !tokens.empty?
- raise RDoc::RI::Error.new("Bad argument: #{arg}")
- end
- if separator && separator != '.'
- @is_class_method = separator == "::"
- end
- end
- end
-
- # Return the full class name (with '::' between the components) or "" if
- # there's no class name
-
- def full_class_name
- @class_names.join("::")
- end
-
-end
-
diff --git a/lib/rdoc/ri/writer.rb b/lib/rdoc/ri/writer.rb
deleted file mode 100644
index 92aaa1c2da..0000000000
--- a/lib/rdoc/ri/writer.rb
+++ /dev/null
@@ -1,68 +0,0 @@
-require 'fileutils'
-require 'rdoc/ri'
-
-class RDoc::RI::Writer
-
- def self.class_desc_path(dir, class_desc)
- File.join(dir, "cdesc-" + class_desc.name + ".yaml")
- end
-
- ##
- # Convert a name from internal form (containing punctuation) to an external
- # form (where punctuation is replaced by %xx)
-
- def self.internal_to_external(name)
- if ''.respond_to? :ord then
- name.gsub(/\W/) { "%%%02x" % $&[0].ord }
- else
- name.gsub(/\W/) { "%%%02x" % $&[0] }
- end
- end
-
- ##
- # And the reverse operation
-
- def self.external_to_internal(name)
- name.gsub(/%([0-9a-f]{2,2})/) { $1.to_i(16).chr }
- end
-
- def initialize(base_dir)
- @base_dir = base_dir
- end
-
- def remove_class(class_desc)
- FileUtils.rm_rf(path_to_dir(class_desc.full_name))
- end
-
- def add_class(class_desc)
- dir = path_to_dir(class_desc.full_name)
- FileUtils.mkdir_p(dir)
- class_file_name = self.class.class_desc_path(dir, class_desc)
- File.open(class_file_name, "w") do |f|
- f.write(class_desc.serialize)
- end
- end
-
- def add_method(class_desc, method_desc)
- dir = path_to_dir(class_desc.full_name)
- file_name = self.class.internal_to_external(method_desc.name)
- meth_file_name = File.join(dir, file_name)
- if method_desc.is_singleton
- meth_file_name += "-c.yaml"
- else
- meth_file_name += "-i.yaml"
- end
-
- File.open(meth_file_name, "w") do |f|
- f.write(method_desc.serialize)
- end
- end
-
- private
-
- def path_to_dir(class_name)
- File.join(@base_dir, *class_name.split('::'))
- end
-
-end
-
diff --git a/lib/rdoc/stats.rb b/lib/rdoc/stats.rb
deleted file mode 100644
index e18e3c23d7..0000000000
--- a/lib/rdoc/stats.rb
+++ /dev/null
@@ -1,115 +0,0 @@
-require 'rdoc'
-
-##
-# Simple stats collector
-
-class RDoc::Stats
-
- attr_reader :num_classes
- attr_reader :num_files
- attr_reader :num_methods
- attr_reader :num_modules
-
- def initialize(verbosity = 1)
- @num_classes = 0
- @num_files = 0
- @num_methods = 0
- @num_modules = 0
-
- @start = Time.now
-
- @display = case verbosity
- when 0 then Quiet.new
- when 1 then Normal.new
- else Verbose.new
- end
- end
-
- def add_alias(as)
- @display.print_alias as
- @num_methods += 1
- end
-
- def add_class(klass)
- @display.print_class klass
- @num_classes += 1
- end
-
- def add_file(file)
- @display.print_file file
- @num_files += 1
- end
-
- def add_method(method)
- @display.print_method method
- @num_methods += 1
- end
-
- def add_module(mod)
- @display.print_module mod
- @num_modules += 1
- end
-
- def print
- puts "Files: #@num_files"
- puts "Classes: #@num_classes"
- puts "Modules: #@num_modules"
- puts "Methods: #@num_methods"
- puts "Elapsed: " + sprintf("%0.1fs", Time.now - @start)
- end
-
- class Quiet
- def print_alias(*) end
- def print_class(*) end
- def print_file(*) end
- def print_method(*) end
- def print_module(*) end
- end
-
- class Normal
- def print_alias(as)
- print 'a'
- end
-
- def print_class(klass)
- print 'C'
- end
-
- def print_file(file)
- print "\n#{file}: "
- end
-
- def print_method(method)
- print 'm'
- end
-
- def print_module(mod)
- print 'M'
- end
- end
-
- class Verbose
- def print_alias(as)
- puts "\t\talias #{as.new_name} #{as.old_name}"
- end
-
- def print_class(klass)
- puts "\tclass #{klass.full_name}"
- end
-
- def print_file(file)
- puts file
- end
-
- def print_method(method)
- puts "\t\t#{method.singleton ? '::' : '#'}#{method.name}"
- end
-
- def print_module(mod)
- puts "\tmodule #{mod.full_name}"
- end
- end
-
-end
-
-
diff --git a/lib/rdoc/template.rb b/lib/rdoc/template.rb
index 53d0e3ce68..469e10fb4b 100644
--- a/lib/rdoc/template.rb
+++ b/lib/rdoc/template.rb
@@ -1,63 +1,233 @@
-require 'erb'
-
-module RDoc; end
-
-##
-# An ERb wrapper that allows nesting of one ERb template inside another.
+# Cheap-n-cheerful HTML page template system. You create a
+# template containing:
+#
+# * variable names between percent signs (<tt>%fred%</tt>)
+# * blocks of repeating stuff:
+#
+# START:key
+# ... stuff
+# END:key
+#
+# You feed the code a hash. For simple variables, the values
+# are resolved directly from the hash. For blocks, the hash entry
+# corresponding to +key+ will be an array of hashes. The block will
+# be generated once for each entry. Blocks can be nested arbitrarily
+# deeply.
+#
+# The template may also contain
+#
+# IF:key
+# ... stuff
+# ENDIF:key
#
-# This TemplatePage operates similarly to RDoc 1.x's TemplatePage, but uses
-# ERb instead of a custom template language.
+# _stuff_ will only be included in the output if the corresponding
+# key is set in the value hash.
#
-# Converting from a RDoc 1.x template to an RDoc 2.x template is fairly easy.
+# Usage: Given a set of templates <tt>T1, T2,</tt> etc
#
-# * %blah% becomes <%= values["blah"] %>
-# * !INCLUDE! becomes <%= template_include %>
-# * HREF:aref:name becomes <%= href values["aref"], values["name"] %>
-# * IF:blah becomes <% if values["blah"] then %>
-# * IFNOT:blah becomes <% unless values["blah"] then %>
-# * ENDIF:blah becomes <% end %>
-# * START:blah becomes <% values["blah"].each do |blah| %>
-# * END:blah becomes <% end %>
+# values = { "name" => "Dave", state => "TX" }
#
-# To make nested loops easier to convert, start by converting START statements
-# to:
+# t = TemplatePage.new(T1, T2, T3)
+# File.open(name, "w") {|f| t.write_html_on(f, values)}
+# or
+# res = ''
+# t.write_html_on(res, values)
#
-# <% values["blah"].each do |blah| $stderr.puts blah.keys %>
#
-# So you can see what is being used inside which loop.
-class RDoc::TemplatePage
+class TemplatePage
- ##
- # Create a new TemplatePage that will use +templates+.
+ ##########
+ # A context holds a stack of key/value pairs (like a symbol
+ # table). When asked to resolve a key, it first searches the top of
+ # the stack, then the next level, and so on until it finds a match
+ # (or runs out of entries)
- def initialize(*templates)
- @templates = templates
+ class Context
+ def initialize
+ @stack = []
+ end
+
+ def push(hash)
+ @stack.push(hash)
+ end
+
+ def pop
+ @stack.pop
+ end
+
+ # Find a scalar value, throwing an exception if not found. This
+ # method is used when substituting the %xxx% constructs
+
+ def find_scalar(key)
+ @stack.reverse_each do |level|
+ if val = level[key]
+ return val unless val.kind_of? Array
+ end
+ end
+ raise "Template error: can't find variable '#{key}'"
+ end
+
+ # Lookup any key in the stack of hashes
+
+ def lookup(key)
+ @stack.reverse_each do |level|
+ val = level[key]
+ return val if val
+ end
+ nil
+ end
end
- ##
- # Returns "<a href=\"#{ref}\">#{name}</a>"
+ #########
+ # Simple class to read lines out of a string
- def href(ref, name)
- if ref then
- "<a href=\"#{ref}\">#{name}</a>"
- else
- name
+ class LineReader
+ # we're initialized with an array of lines
+ def initialize(lines)
+ @lines = lines
+ end
+
+ # read the next line
+ def read
+ @lines.shift
+ end
+
+ # Return a list of lines up to the line that matches
+ # a pattern. That last line is discarded.
+ def read_up_to(pattern)
+ res = []
+ while line = read
+ if pattern.match(line)
+ return LineReader.new(res)
+ else
+ res << line
+ end
+ end
+ raise "Missing end tag in template: #{pattern.source}"
+ end
+
+ # Return a copy of ourselves that can be modified without
+ # affecting us
+ def dup
+ LineReader.new(@lines.dup)
end
end
- ##
- # Process the template using +values+, writing the result to +io+.
- def write_html_on(io, values)
- b = binding
- template_include = ""
- @templates.reverse_each do |template|
- template_include = ERB.new(template).result b
+ # +templates+ is an array of strings containing the templates.
+ # We start at the first, and substitute in subsequent ones
+ # where the string <tt>!INCLUDE!</tt> occurs. For example,
+ # we could have the overall page template containing
+ #
+ # <html><body>
+ # <h1>Master</h1>
+ # !INCLUDE!
+ # </bost></html>
+ #
+ # and substitute subpages in to it by passing [master, sub_page].
+ # This gives us a cheap way of framing pages
+
+ def initialize(*templates)
+ result = "!INCLUDE!"
+ templates.each do |content|
+ result.sub!(/!INCLUDE!/, content)
end
+ @lines = LineReader.new(result.split($/))
+ end
+
+ # Render the templates into HTML, storing the result on +op+
+ # using the method <tt><<</tt>. The <tt>value_hash</tt> contains
+ # key/value pairs used to drive the substitution (as described above)
+
+ def write_html_on(op, value_hash)
+ @context = Context.new
+ op << substitute_into(@lines, value_hash).tr("\000", '\\')
+ end
+
+
+ # Substitute a set of key/value pairs into the given template.
+ # Keys with scalar values have them substituted directly into
+ # the page. Those with array values invoke <tt>substitute_array</tt>
+ # (below), which examples a block of the template once for each
+ # row in the array.
+ #
+ # This routine also copes with the <tt>IF:</tt>_key_ directive,
+ # removing chunks of the template if the corresponding key
+ # does not appear in the hash, and the START: directive, which
+ # loops its contents for each value in an array
+
+ def substitute_into(lines, values)
+ @context.push(values)
+ skip_to = nil
+ result = []
+
+ while line = lines.read
+
+ case line
+
+ when /^IF:(\w+)/
+ lines.read_up_to(/^ENDIF:#$1/) unless @context.lookup($1)
+
+ when /^IFNOT:(\w+)/
+ lines.read_up_to(/^ENDIF:#$1/) if @context.lookup($1)
+
+ when /^ENDIF:/
+ ;
+
+ when /^START:(\w+)/
+ tag = $1
+ body = lines.read_up_to(/^END:#{tag}/)
+ inner_values = @context.lookup(tag)
+ raise "unknown tag: #{tag}" unless inner_values
+ raise "not array: #{tag}" unless inner_values.kind_of?(Array)
+ inner_values.each do |vals|
+ result << substitute_into(body.dup, vals)
+ end
+ else
+ result << expand_line(line.dup)
+ end
+ end
+
+ @context.pop
+
+ result.join("\n")
+ end
+
+ # Given an individual line, we look for %xxx% constructs and
+ # HREF:ref:name: constructs, substituting for each.
+
+ def expand_line(line)
+ # Generate a cross reference if a reference is given,
+ # otherwise just fill in the name part
+
+ line.gsub!(/HREF:(\w+?):(\w+?):/) {
+ ref = @context.lookup($1)
+ name = @context.find_scalar($2)
+
+ if ref and !ref.kind_of?(Array)
+ "<a href=\"#{ref}\">#{name}</a>"
+ else
+ name
+ end
+ }
+
+ # Substitute in values for %xxx% constructs. This is made complex
+ # because the replacement string may contain characters that are
+ # meaningful to the regexp (like \1)
+
+ line = line.gsub(/%([a-zA-Z]\w*)%/) {
+ val = @context.find_scalar($1)
+ val.tr('\\', "\000")
+ }
+
- io.write template_include
+ line
+ rescue Exception => e
+ $stderr.puts "Error in template: #{e}"
+ $stderr.puts "Original line: #{line}"
+ exit
end
end
diff --git a/lib/rdoc/tokenstream.rb b/lib/rdoc/tokenstream.rb
index 0a1eb9130b..0a0720d8a9 100644
--- a/lib/rdoc/tokenstream.rb
+++ b/lib/rdoc/tokenstream.rb
@@ -1,14 +1,11 @@
-module RDoc; end
-
-##
-# A TokenStream is a list of tokens, gathered during the parse of some entity
-# (say a method). Entities populate these streams by being registered with the
-# lexer. Any class can collect tokens by including TokenStream. From the
-# outside, you use such an object by calling the start_collecting_tokens
-# method, followed by calls to add_token and pop_token.
-
-module RDoc::TokenStream
-
+# A TokenStream is a list of tokens, gathered during the parse
+# of some entity (say a method). Entities populate these streams
+# by being registered with the lexer. Any class can collect tokens
+# by including TokenStream. From the outside, you use such an object
+# by calling the start_collecting_tokens method, followed by calls
+# to add_token and pop_token
+
+module TokenStream
def token_stream
@token_stream
end
@@ -16,18 +13,13 @@ module RDoc::TokenStream
def start_collecting_tokens
@token_stream = []
end
-
def add_token(tk)
@token_stream << tk
end
-
def add_tokens(tks)
tks.each {|tk| add_token(tk)}
end
-
def pop_token
@token_stream.pop
end
-
end
-
diff --git a/lib/rdoc/usage.rb b/lib/rdoc/usage.rb
new file mode 100644
index 0000000000..def516b3d7
--- /dev/null
+++ b/lib/rdoc/usage.rb
@@ -0,0 +1,210 @@
+# = Synopsis
+#
+# This library allows command-line tools to encapsulate their usage
+# as a comment at the top of the main file. Calling <tt>RDoc::usage</tt>
+# then displays some or all of that comment, and optionally exits
+# the program with an exit status. We always look for the comment
+# in the main program file, so it is safe to call this method
+# from anywhere in the executing program.
+#
+# = Usage
+#
+# RDoc::usage( [ exit_status ], [ section, ...])
+# RDoc::usage_no_exit( [ section, ...])
+#
+# where:
+#
+# exit_status::
+# the integer exit code (default zero). RDoc::usage will exit
+# the calling program with this status.
+#
+# section::
+# an optional list of section names. If specified, only the
+# sections with the given names as headings will be output.
+# For example, this section is named 'Usage', and the next
+# section is named 'Examples'. The section names are case
+# insensitive.
+#
+# = Examples
+#
+# # Comment block describing usage
+# # with (optional) section headings
+# # . . .
+#
+# require 'rdoc/usage'
+#
+# # Display all usage and exit with a status of 0
+#
+# RDoc::usage
+#
+# # Display all usage and exit with a status of 99
+#
+# RDoc::usage(99)
+#
+# # Display usage in the 'Summary' section only, then
+# # exit with a status of 99
+#
+# RDoc::usage(99, 'Summary')
+#
+# # Display information in the Author and Copyright
+# # sections, then exit 0.
+#
+# RDoc::usage('Author', 'Copyright')
+#
+# # Display information in the Author and Copyright
+# # sections, but don't exit
+#
+# RDoc::usage_no_exit('Author', 'Copyright')
+#
+# = Author
+#
+# Dave Thomas, The Pragmatic Programmers, LLC
+#
+# = Copyright
+#
+# Copyright (c) 2004 Dave Thomas.
+# Licensed under the same terms as Ruby
+#
+
+require 'rdoc/markup/simple_markup'
+require 'rdoc/markup/simple_markup/to_flow'
+require 'rdoc/ri/ri_formatter'
+require 'rdoc/ri/ri_options'
+
+module RDoc
+
+ # Display usage information from the comment at the top of
+ # the file. String arguments identify specific sections of the
+ # comment to display. An optional integer first argument
+ # specifies the exit status (defaults to 0)
+
+ def RDoc.usage(*args)
+ exit_code = 0
+
+ if args.size > 0
+ status = args[0]
+ if status.respond_to?(:to_int)
+ exit_code = status.to_int
+ args.shift
+ end
+ end
+
+ # display the usage and exit with the given code
+ usage_no_exit(*args)
+ exit(exit_code)
+ end
+
+ # Display usage
+ def RDoc.usage_no_exit(*args)
+ main_program_file = caller[-1].sub(/:\d+$/, '')
+ comment = File.open(main_program_file) do |file|
+ find_comment(file)
+ end
+
+ comment = comment.gsub(/^\s*#/, '')
+
+ markup = SM::SimpleMarkup.new
+ flow_convertor = SM::ToFlow.new
+
+ flow = markup.convert(comment, flow_convertor)
+
+ format = "plain"
+
+ unless args.empty?
+ flow = extract_sections(flow, args)
+ end
+
+ options = RI::Options.instance
+ if args = ENV["RI"]
+ options.parse(args.split)
+ end
+ formatter = options.formatter.new(options, "")
+ formatter.display_flow(flow)
+ end
+
+ ######################################################################
+
+ private
+
+ # Find the first comment in the file (that isn't a shebang line)
+ # If the file doesn't start with a comment, report the fact
+ # and return empty string
+
+ def RDoc.gets(file)
+ if (line = file.gets) && (line =~ /^#!/) # shebang
+ throw :exit, find_comment(file)
+ else
+ line
+ end
+ end
+
+ def RDoc.find_comment(file)
+ catch(:exit) do
+ # skip leading blank lines
+ 0 while (line = gets(file)) && (line =~ /^\s*$/)
+
+ comment = []
+ while line && line =~ /^\s*#/
+ comment << line
+ line = gets(file)
+ end
+
+ 0 while line && (line = gets(file))
+ return no_comment if comment.empty?
+ return comment.join
+ end
+ end
+
+
+ #####
+ # Given an array of flow items and an array of section names, extract those
+ # sections from the flow which have headings corresponding to
+ # a section name in the list. Return them in the order
+ # of names in the +sections+ array.
+
+ def RDoc.extract_sections(flow, sections)
+ result = []
+ sections.each do |name|
+ name = name.downcase
+ copy_upto_level = nil
+
+ flow.each do |item|
+ case item
+ when SM::Flow::H
+ if copy_upto_level && item.level >= copy_upto_level
+ copy_upto_level = nil
+ else
+ if item.text.downcase == name
+ result << item
+ copy_upto_level = item.level
+ end
+ end
+ else
+ if copy_upto_level
+ result << item
+ end
+ end
+ end
+ end
+ if result.empty?
+ puts "Note to developer: requested section(s) [#{sections.join(', ')}] " +
+ "not found"
+ result = flow
+ end
+ result
+ end
+
+ #####
+ # Report the fact that no doc comment count be found
+ def RDoc.no_comment
+ $stderr.puts "No usage information available for this program"
+ ""
+ end
+end
+
+
+if $0 == __FILE__
+
+ RDoc::usage(*ARGV)
+
+end
diff --git a/lib/readbytes.rb b/lib/readbytes.rb
new file mode 100644
index 0000000000..ebb5fc0bd4
--- /dev/null
+++ b/lib/readbytes.rb
@@ -0,0 +1,41 @@
+# TruncatedDataError is raised when IO#readbytes fails to read enough data.
+
+class TruncatedDataError<IOError
+ def initialize(mesg, data) # :nodoc:
+ @data = data
+ super(mesg)
+ end
+
+ # The read portion of an IO#readbytes attempt.
+ attr_reader :data
+end
+
+class IO
+ # Reads exactly +n+ bytes.
+ #
+ # If the data read is nil an EOFError is raised.
+ #
+ # If the data read is too short a TruncatedDataError is raised and the read
+ # data is obtainable via its #data method.
+ def readbytes(n)
+ str = read(n)
+ if str == nil
+ raise EOFError, "End of file reached"
+ end
+ if str.size < n
+ raise TruncatedDataError.new("data truncated", str)
+ end
+ str
+ end
+end
+
+if __FILE__ == $0
+ begin
+ loop do
+ print STDIN.readbytes(6)
+ end
+ rescue TruncatedDataError
+ p $!.data
+ raise
+ end
+end
diff --git a/lib/resolv-replace.rb b/lib/resolv-replace.rb
index 63d58cea27..5d15b4577c 100644
--- a/lib/resolv-replace.rb
+++ b/lib/resolv-replace.rb
@@ -23,8 +23,7 @@ end
class UDPSocket
alias original_resolv_bind bind
def bind(host, port)
- host = IPSocket.getaddress(host) if host != ""
- original_resolv_bind(host, port)
+ original_resolv_bind(IPSocket.getaddress(host), port)
end
alias original_resolv_connect connect
diff --git a/lib/resolv.rb b/lib/resolv.rb
index ed8859d3c4..a3ed32ed6d 100644
--- a/lib/resolv.rb
+++ b/lib/resolv.rb
@@ -3,34 +3,29 @@ require 'fcntl'
require 'timeout'
require 'thread'
-begin
- require 'securerandom'
-rescue LoadError
-end
-
# Resolv is a thread-aware DNS resolver library written in Ruby. Resolv can
# handle multiple DNS requests concurrently without blocking. The ruby
# interpreter.
#
# See also resolv-replace.rb to replace the libc resolver with # Resolv.
-#
+#
# Resolv can look up various DNS resources using the DNS module directly.
-#
+#
# Examples:
-#
+#
# p Resolv.getaddress "www.ruby-lang.org"
# p Resolv.getname "210.251.121.214"
-#
+#
# Resolv::DNS.open do |dns|
# ress = dns.getresources "www.ruby-lang.org", Resolv::DNS::Resource::IN::A
# p ress.map { |r| r.address }
# ress = dns.getresources "ruby-lang.org", Resolv::DNS::Resource::IN::MX
# p ress.map { |r| [r.exchange.to_s, r.preference] }
# end
-#
-#
+#
+#
# == Bugs
-#
+#
# * NIS is not supported.
# * /etc/nsswitch.conf is not supported.
@@ -38,14 +33,14 @@ class Resolv
##
# Looks up the first IP address for +name+.
-
+
def self.getaddress(name)
DefaultResolver.getaddress(name)
end
##
# Looks up all IP address for +name+.
-
+
def self.getaddresses(name)
DefaultResolver.getaddresses(name)
end
@@ -87,7 +82,7 @@ class Resolv
##
# Looks up the first IP address for +name+.
-
+
def getaddress(name)
each_address(name) {|address| return address}
raise ResolvError.new("no address for #{name}")
@@ -95,7 +90,7 @@ class Resolv
##
# Looks up all IP address for +name+.
-
+
def getaddresses(name)
ret = []
each_address(name) {|address| ret << address}
@@ -162,10 +157,10 @@ class Resolv
class ResolvTimeout < TimeoutError; end
##
- # Resolv::Hosts is a hostname resolver that uses the system hosts file.
+ # DNS::Hosts is a hostname resolver that uses the system hosts file.
class Hosts
- if /mswin|mingw|bccwin/ =~ RUBY_PLATFORM
+ if /mswin32|mingw|bccwin/ =~ RUBY_PLATFORM
require 'win32/resolv'
DefaultFileName = Win32::Resolv.get_hosts_path
else
@@ -173,7 +168,7 @@ class Resolv
end
##
- # Creates a new Resolv::Hosts, using +filename+ for its data source.
+ # Creates a new DNS::Hosts, using +filename+ for its data source.
def initialize(filename = DefaultFileName)
@filename = filename
@@ -290,6 +285,11 @@ class Resolv
UDPSize = 512
##
+ # Group of DNS resolver threads
+
+ DNSThreadGroup = ThreadGroup.new
+
+ ##
# Creates a new DNS resolver. See Resolv::DNS.new for argument details.
#
# Yields the created DNS resolver to the block, if given, otherwise
@@ -309,7 +309,7 @@ class Resolv
# Creates a new DNS resolver.
#
# +config_info+ can be:
- #
+ #
# nil:: Uses /etc/resolv.conf.
# String:: Path to a file using /etc/resolv.conf's format.
# Hash:: Must contain :nameserver, :search and :ndots keys.
@@ -330,6 +330,13 @@ class Resolv
@mutex.synchronize {
unless @initialized
@config.lazy_initialize
+
+ if nameserver = @config.single?
+ @requester = Requester::ConnectedUDP.new(nameserver)
+ else
+ @requester = Requester::UnconnectedUDP.new
+ end
+
@initialized = true
end
}
@@ -342,6 +349,8 @@ class Resolv
def close
@mutex.synchronize {
if @initialized
+ @requester.close if @requester
+ @requester = nil
@initialized = false
end
}
@@ -379,20 +388,8 @@ class Resolv
def each_address(name)
each_resource(name, Resource::IN::A) {|resource| yield resource.address}
- if use_ipv6?
- each_resource(name, Resource::IN::AAAA) {|resource| yield resource.address}
- end
- end
-
- def use_ipv6?
- begin
- list = Socket.ip_address_list
- rescue NotImplementedError
- return true
- end
- list.any? {|a| a.ipv6? && !a.ipv6_loopback? && !a.ipv6_linklocal? }
+ each_resource(name, Resource::IN::AAAA) {|resource| yield resource.address}
end
- private :use_ipv6?
##
# Gets the hostname for +address+ from the DNS resolver.
@@ -469,7 +466,7 @@ class Resolv
##
# Looks up all +typeclass+ DNS resources for +name+. See #getresource for
# argument details.
-
+
def getresources(name, typeclass)
ret = []
each_resource(name, typeclass) {|resource| ret << resource}
@@ -479,10 +476,10 @@ class Resolv
##
# Iterates over all +typeclass+ DNS resources for +name+. See
# #getresource for argument details.
-
+
def each_resource(name, typeclass, &proc)
lazy_initialize
- requester = make_requester
+ q = Queue.new
senders = {}
begin
@config.resolv(name) {|candidate, tout, nameserver|
@@ -491,9 +488,11 @@ class Resolv
msg.add_question(candidate, typeclass)
unless sender = senders[[candidate, nameserver]]
sender = senders[[candidate, nameserver]] =
- requester.sender(msg, candidate, nameserver)
+ @requester.sender(msg, candidate, q, nameserver)
end
- reply, reply_name = requester.request(sender, tout)
+ sender.send
+ reply = reply_name = nil
+ timeout(tout, ResolvTimeout) { reply, reply_name = q.pop }
case reply.rcode
when RCode::NoError
extract_resources(reply, reply_name, typeclass, &proc)
@@ -505,15 +504,7 @@ class Resolv
end
}
ensure
- requester.close
- end
- end
-
- def make_requester # :nodoc:
- if nameserver = @config.single?
- Requester::ConnectedUDP.new(nameserver)
- else
- Requester::UnconnectedUDP.new
+ @requester.delete(q)
end
end
@@ -548,106 +539,45 @@ class Resolv
}
end
- if defined? SecureRandom
- def self.random(arg) # :nodoc:
- begin
- SecureRandom.random_number(arg)
- rescue NotImplementedError
- rand(arg)
- end
- end
- else
- def self.random(arg) # :nodoc:
- rand(arg)
- end
- end
-
-
- def self.rangerand(range) # :nodoc:
- base = range.begin
- len = range.end - range.begin
- if !range.exclude_end?
- len += 1
- end
- base + random(len)
- end
-
- RequestID = {}
- RequestIDMutex = Mutex.new
-
- def self.allocate_request_id(host, port) # :nodoc:
- id = nil
- RequestIDMutex.synchronize {
- h = (RequestID[[host, port]] ||= {})
- begin
- id = rangerand(0x0000..0xffff)
- end while h[id]
- h[id] = true
- }
- id
- end
-
- def self.free_request_id(host, port, id) # :nodoc:
- RequestIDMutex.synchronize {
- key = [host, port]
- if h = RequestID[key]
- h.delete id
- if h.empty?
- RequestID.delete key
- end
- end
- }
- end
-
- def self.bind_random_port(udpsock) # :nodoc:
- begin
- port = rangerand(1024..65535)
- udpsock.bind("", port)
- rescue Errno::EADDRINUSE
- retry
- end
- end
-
class Requester # :nodoc:
def initialize
@senders = {}
- @sock = nil
end
- def request(sender, tout)
- timelimit = Time.now + tout
- sender.send
- while (now = Time.now) < timelimit
- timeout = timelimit - now
- if !IO.select([@sock], nil, nil, timeout)
- raise ResolvTimeout
- end
- reply, from = recv_reply
- begin
- msg = Message.decode(reply)
- rescue DecodeError
- next # broken DNS message ignored
- end
- if s = @senders[[from,msg.id]]
- break
- else
- # unexpected DNS message ignored
+ def close
+ thread, sock, @thread, @sock = @thread, @sock
+ begin
+ if thread
+ thread.kill
+ thread.join
end
+ ensure
+ sock.close if sock
end
- return msg, s.data
end
- def close
- sock = @sock
- @sock = nil
- sock.close if sock
+ def delete(arg)
+ case arg
+ when Sender
+ @senders.delete_if {|k, s| s == arg }
+ when Queue
+ @senders.delete_if {|k, s| s.queue == arg }
+ else
+ raise ArgumentError.new("neither Sender or Queue: #{arg}")
+ end
end
class Sender # :nodoc:
- def initialize(msg, data, sock)
+ def initialize(msg, data, sock, queue)
@msg = msg
@data = data
@sock = sock
+ @queue = queue
+ end
+ attr_reader :queue
+
+ def recv(msg)
+ @queue.push([msg, @data])
end
end
@@ -655,38 +585,45 @@ class Resolv
def initialize
super()
@sock = UDPSocket.new
- @sock.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC) if defined? Fcntl::F_SETFD
- DNS.bind_random_port(@sock)
- end
-
- def recv_reply
- reply, from = @sock.recvfrom(UDPSize)
- return reply, [from[3],from[1]]
+ @sock.fcntl(Fcntl::F_SETFD, 1) if defined? Fcntl::F_SETFD
+ @id = {}
+ @id.default = -1
+ @thread = Thread.new {
+ DNSThreadGroup.add Thread.current
+ loop {
+ reply, from = @sock.recvfrom(UDPSize)
+ msg = begin
+ Message.decode(reply)
+ rescue DecodeError
+ STDERR.print("DNS message decoding error: #{reply.inspect}\n")
+ next
+ end
+ if s = @senders[[[from[3],from[1]],msg.id]]
+ s.recv msg
+ else
+ #STDERR.print("non-handled DNS message: #{msg.inspect} from #{from.inspect}\n")
+ end
+ }
+ }
end
- def sender(msg, data, host, port=Port)
+ def sender(msg, data, queue, host, port=Port)
service = [host, port]
- id = DNS.allocate_request_id(host, port)
+ id = Thread.exclusive {
+ @id[service] = (@id[service] + 1) & 0xffff
+ }
request = msg.encode
request[0,2] = [id].pack('n')
return @senders[[service, id]] =
- Sender.new(request, data, @sock, host, port)
- end
-
- def close
- super
- @senders.each_key {|service, id|
- DNS.free_request_id(service[0], service[1], id)
- }
+ Sender.new(request, data, @sock, host, port, queue)
end
class Sender < Requester::Sender # :nodoc:
- def initialize(msg, data, sock, host, port)
- super(msg, data, sock)
+ def initialize(msg, data, sock, host, port, queue)
+ super(msg, data, sock, queue)
@host = host
@port = port
end
- attr_reader :data
def send
@sock.send(@msg, 0, @host, @port)
@@ -700,38 +637,42 @@ class Resolv
@host = host
@port = port
@sock = UDPSocket.new(host.index(':') ? Socket::AF_INET6 : Socket::AF_INET)
- DNS.bind_random_port(@sock)
@sock.connect(host, port)
- @sock.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC) if defined? Fcntl::F_SETFD
- end
-
- def recv_reply
- reply = @sock.recv(UDPSize)
- return reply, nil
+ @sock.fcntl(Fcntl::F_SETFD, 1) if defined? Fcntl::F_SETFD
+ @id = -1
+ @thread = Thread.new {
+ DNSThreadGroup.add Thread.current
+ loop {
+ reply = @sock.recv(UDPSize)
+ msg = begin
+ Message.decode(reply)
+ rescue DecodeError
+ STDERR.print("DNS message decoding error: #{reply.inspect}")
+ next
+ end
+ if s = @senders[msg.id]
+ s.recv msg
+ else
+ #STDERR.print("non-handled DNS message: #{msg.inspect}")
+ end
+ }
+ }
end
- def sender(msg, data, host=@host, port=@port)
+ def sender(msg, data, queue, host=@host, port=@port)
unless host == @host && port == @port
raise RequestError.new("host/port don't match: #{host}:#{port}")
end
- id = DNS.allocate_request_id(@host, @port)
+ id = Thread.exclusive { @id = (@id + 1) & 0xffff }
request = msg.encode
request[0,2] = [id].pack('n')
- return @senders[[nil,id]] = Sender.new(request, data, @sock)
- end
-
- def close
- super
- @senders.each_key {|from, id|
- DNS.free_request_id(@host, @port, id)
- }
+ return @senders[id] = Sender.new(request, data, @sock, queue)
end
class Sender < Requester::Sender # :nodoc:
def send
@sock.send(@msg, 0)
end
- attr_reader :data
end
end
@@ -740,25 +681,39 @@ class Resolv
super()
@host = host
@port = port
- @sock = TCPSocket.new(@host, @port)
- @sock.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC) if defined? Fcntl::F_SETFD
+ @sock = TCPSocket.new
+ @sock.connect(host, port)
+ @sock.fcntl(Fcntl::F_SETFD, 1) if defined? Fcntl::F_SETFD
+ @id = -1
@senders = {}
+ @thread = Thread.new {
+ DNSThreadGroup.add Thread.current
+ loop {
+ len = @sock.read(2).unpack('n')
+ reply = @sock.read(len)
+ msg = begin
+ Message.decode(reply)
+ rescue DecodeError
+ STDERR.print("DNS message decoding error: #{reply.inspect}")
+ next
+ end
+ if s = @senders[msg.id]
+ s.push msg
+ else
+ #STDERR.print("non-handled DNS message: #{msg.inspect}")
+ end
+ }
+ }
end
- def recv_reply
- len = @sock.read(2).unpack('n')[0]
- reply = @sock.read(len)
- return reply, nil
- end
-
- def sender(msg, data, host=@host, port=@port)
+ def sender(msg, data, queue, host=@host, port=@port)
unless host == @host && port == @port
raise RequestError.new("host/port don't match: #{host}:#{port}")
end
- id = DNS.allocate_request_id(@host, @port)
+ id = Thread.exclusive { @id = (@id + 1) & 0xffff }
request = msg.encode
request[0,2] = [request.length, id].pack('nn')
- return @senders[[nil,id]] = Sender.new(request, data, @sock)
+ return @senders[id] = Sender.new(request, data, @sock, queue)
end
class Sender < Requester::Sender # :nodoc:
@@ -766,14 +721,6 @@ class Resolv
@sock.print(@msg)
@sock.flush
end
- attr_reader :data
- end
-
- def close
- super
- @senders.each_key {|from,id|
- DNS.free_request_id(@host, @port, id)
- }
end
end
@@ -829,7 +776,7 @@ class Resolv
if File.exist? filename
config_hash = Config.parse_resolv_conf(filename)
else
- if /mswin|cygwin|mingw|bccwin/ =~ RUBY_PLATFORM
+ if /mswin32|cygwin|mingw|bccwin/ =~ RUBY_PLATFORM
require 'win32/resolv'
search, nameserver = Win32::Resolv.get_resolv_info
config_hash = {}
@@ -1049,7 +996,7 @@ class Resolv
# A representation of a DNS name.
class Name
-
+
##
# Creates a new DNS name from +arg+. +arg+ can be:
#
@@ -1383,7 +1330,6 @@ class Resolv
def get_unpack(template)
len = 0
template.each_byte {|byte|
- byte = "%c" % byte
case byte
when ?c, ?C
len += 1
@@ -1402,7 +1348,7 @@ class Resolv
end
def get_string
- len = @data[@index].ord
+ len = @data[@index]
raise DecodeError.new("limit exceeded") if @limit < @index + 1 + len
d = @data[@index + 1, len]
@index += 1 + len
@@ -1425,7 +1371,7 @@ class Resolv
limit = @index if !limit || @index < limit
d = []
while true
- case @data[@index].ord
+ case @data[@index]
when 0
@index += 1
return d
@@ -1460,9 +1406,7 @@ class Resolv
name = self.get_name
type, klass, ttl = self.get_unpack('nnN')
typeclass = Resource.get_class(type, klass)
- res = self.get_length16 { typeclass.decode_rdata self }
- res.instance_variable_set :@ttl, ttl
- return name, ttl, res
+ return name, ttl, self.get_length16 {typeclass.decode_rdata(self)}
end
end
end
@@ -1472,11 +1416,11 @@ class Resolv
class Query
def encode_rdata(msg) # :nodoc:
- raise EncodeError.new("#{self.class} is query.")
+ raise EncodeError.new("#{self.class} is query.")
end
def self.decode_rdata(msg) # :nodoc:
- raise DecodeError.new("#{self.class} is query.")
+ raise DecodeError.new("#{self.class} is query.")
end
end
@@ -1501,16 +1445,10 @@ class Resolv
end
def ==(other) # :nodoc:
- return false unless self.class == other.class
- s_ivars = self.instance_variables
- s_ivars.sort!
- s_ivars.delete "@ttl"
- o_ivars = other.instance_variables
- o_ivars.sort!
- o_ivars.delete "@ttl"
- return s_ivars == o_ivars &&
- s_ivars.collect {|name| self.instance_variable_get name} ==
- o_ivars.collect {|name| other.instance_variable_get name}
+ return self.class == other.class &&
+ self.instance_variables == other.instance_variables &&
+ self.instance_variables.collect {|name| self.instance_eval name} ==
+ other.instance_variables.collect {|name| other.instance_eval name}
end
def eql?(other) # :nodoc:
@@ -1519,10 +1457,8 @@ class Resolv
def hash # :nodoc:
h = 0
- vars = self.instance_variables
- vars.delete "@ttl"
- vars.each {|name|
- h ^= self.instance_variable_get(name).hash
+ self.instance_variables.each {|name|
+ h ^= self.instance_eval("#{name}.hash")
}
return h
end
@@ -1951,7 +1887,7 @@ class Resolv
def initialize(address)
@address = IPv6.create(address)
end
-
+
##
# The Resolv::IPv6 address for this AAAA.
@@ -1968,7 +1904,7 @@ class Resolv
##
# SRV resource record defined in RFC 2782
- #
+ #
# These records identify the hostname and port that a service is
# available at.
diff --git a/lib/rexml/attlistdecl.rb b/lib/rexml/attlistdecl.rb
index ec4e6c3b8d..ef4721b5ce 100644
--- a/lib/rexml/attlistdecl.rb
+++ b/lib/rexml/attlistdecl.rb
@@ -3,60 +3,60 @@ require 'rexml/child'
require 'rexml/source'
module REXML
- # This class needs:
- # * Documentation
- # * Work! Not all types of attlists are intelligently parsed, so we just
- # spew back out what we get in. This works, but it would be better if
- # we formatted the output ourselves.
- #
- # AttlistDecls provide *just* enough support to allow namespace
- # declarations. If you need some sort of generalized support, or have an
- # interesting idea about how to map the hideous, terrible design of DTD
- # AttlistDecls onto an intuitive Ruby interface, let me know. I'm desperate
- # for anything to make DTDs more palateable.
- class AttlistDecl < Child
- include Enumerable
-
- # What is this? Got me.
- attr_reader :element_name
-
- # Create an AttlistDecl, pulling the information from a Source. Notice
- # that this isn't very convenient; to create an AttlistDecl, you basically
- # have to format it yourself, and then have the initializer parse it.
- # Sorry, but for the forseeable future, DTD support in REXML is pretty
- # weak on convenience. Have I mentioned how much I hate DTDs?
- def initialize(source)
- super()
- if (source.kind_of? Array)
- @element_name, @pairs, @contents = *source
- end
- end
-
- # Access the attlist attribute/value pairs.
- # value = attlist_decl[ attribute_name ]
- def [](key)
- @pairs[key]
- end
-
- # Whether an attlist declaration includes the given attribute definition
- # if attlist_decl.include? "xmlns:foobar"
- def include?(key)
- @pairs.keys.include? key
- end
-
- # Iterate over the key/value pairs:
- # attlist_decl.each { |attribute_name, attribute_value| ... }
- def each(&block)
- @pairs.each(&block)
- end
-
- # Write out exactly what we got in.
- def write out, indent=-1
- out << @contents
- end
-
- def node_type
- :attlistdecl
- end
- end
+ # This class needs:
+ # * Documentation
+ # * Work! Not all types of attlists are intelligently parsed, so we just
+ # spew back out what we get in. This works, but it would be better if
+ # we formatted the output ourselves.
+ #
+ # AttlistDecls provide *just* enough support to allow namespace
+ # declarations. If you need some sort of generalized support, or have an
+ # interesting idea about how to map the hideous, terrible design of DTD
+ # AttlistDecls onto an intuitive Ruby interface, let me know. I'm desperate
+ # for anything to make DTDs more palateable.
+ class AttlistDecl < Child
+ include Enumerable
+
+ # What is this? Got me.
+ attr_reader :element_name
+
+ # Create an AttlistDecl, pulling the information from a Source. Notice
+ # that this isn't very convenient; to create an AttlistDecl, you basically
+ # have to format it yourself, and then have the initializer parse it.
+ # Sorry, but for the forseeable future, DTD support in REXML is pretty
+ # weak on convenience. Have I mentioned how much I hate DTDs?
+ def initialize(source)
+ super()
+ if (source.kind_of? Array)
+ @element_name, @pairs, @contents = *source
+ end
+ end
+
+ # Access the attlist attribute/value pairs.
+ # value = attlist_decl[ attribute_name ]
+ def [](key)
+ @pairs[key]
+ end
+
+ # Whether an attlist declaration includes the given attribute definition
+ # if attlist_decl.include? "xmlns:foobar"
+ def include?(key)
+ @pairs.keys.include? key
+ end
+
+ # Iterate over the key/value pairs:
+ # attlist_decl.each { |attribute_name, attribute_value| ... }
+ def each(&block)
+ @pairs.each(&block)
+ end
+
+ # Write out exactly what we got in.
+ def write out, indent=-1
+ out << @contents
+ end
+
+ def node_type
+ :attlistdecl
+ end
+ end
end
diff --git a/lib/rexml/attribute.rb b/lib/rexml/attribute.rb
index 28a5923608..89c1ada36c 100644
--- a/lib/rexml/attribute.rb
+++ b/lib/rexml/attribute.rb
@@ -2,171 +2,168 @@ require "rexml/namespace"
require 'rexml/text'
module REXML
- # Defines an Element Attribute; IE, a attribute=value pair, as in:
- # <element attribute="value"/>. Attributes can be in their own
- # namespaces. General users of REXML will not interact with the
- # Attribute class much.
- class Attribute
- include Node
- include Namespace
-
- # The element to which this attribute belongs
- attr_reader :element
- # The normalized value of this attribute. That is, the attribute with
- # entities intact.
- attr_writer :normalized
- PATTERN = /\s*(#{NAME_STR})\s*=\s*(["'])(.*?)\2/um
-
- NEEDS_A_SECOND_CHECK = /(<|&((#{Entity::NAME});|(#0*((?:\d+)|(?:x[a-fA-F0-9]+)));)?)/um
-
- # Constructor.
+ # Defines an Element Attribute; IE, a attribute=value pair, as in:
+ # <element attribute="value"/>. Attributes can be in their own
+ # namespaces. General users of REXML will not interact with the
+ # Attribute class much.
+ class Attribute
+ include Node
+ include Namespace
+
+ # The element to which this attribute belongs
+ attr_reader :element
+ # The normalized value of this attribute. That is, the attribute with
+ # entities intact.
+ attr_writer :normalized
+ PATTERN = /\s*(#{NAME_STR})\s*=\s*(["'])(.*?)\2/um
+
+ # Constructor.
# FIXME: The parser doesn't catch illegal characters in attributes
#
- # first::
+ # first::
# Either: an Attribute, which this new attribute will become a
# clone of; or a String, which is the name of this attribute
# second::
# If +first+ is an Attribute, then this may be an Element, or nil.
# If nil, then the Element parent of this attribute is the parent
- # of the +first+ Attribute. If the first argument is a String,
- # then this must also be a String, and is the content of the attribute.
+ # of the +first+ Attribute. If the first argument is a String,
+ # then this must also be a String, and is the content of the attribute.
# If this is the content, it must be fully normalized (contain no
# illegal characters).
# parent::
- # Ignored unless +first+ is a String; otherwise, may be the Element
+ # Ignored unless +first+ is a String; otherwise, may be the Element
# parent of this attribute, or nil.
#
- #
- # Attribute.new( attribute_to_clone )
- # Attribute.new( attribute_to_clone, parent_element )
- # Attribute.new( "attr", "attr_value" )
- # Attribute.new( "attr", "attr_value", parent_element )
- def initialize( first, second=nil, parent=nil )
- @normalized = @unnormalized = @element = nil
- if first.kind_of? Attribute
- self.name = first.expanded_name
- @unnormalized = first.value
- if second.kind_of? Element
- @element = second
- else
- @element = first.element
- end
- elsif first.kind_of? String
- @element = parent
- self.name = first
- @normalized = second.to_s
- else
- raise "illegal argument #{first.class.name} to Attribute constructor"
- end
- end
-
- # Returns the namespace of the attribute.
- #
- # e = Element.new( "elns:myelement" )
- # e.add_attribute( "nsa:a", "aval" )
- # e.add_attribute( "b", "bval" )
- # e.attributes.get_attribute( "a" ).prefix # -> "nsa"
- # e.attributes.get_attribute( "b" ).prefix # -> "elns"
- # a = Attribute.new( "x", "y" )
- # a.prefix # -> ""
- def prefix
- pf = super
- if pf == ""
- pf = @element.prefix if @element
- end
- pf
- end
-
- # Returns the namespace URL, if defined, or nil otherwise
- #
- # e = Element.new("el")
- # e.add_attributes({"xmlns:ns", "http://url"})
- # e.namespace( "ns" ) # -> "http://url"
- def namespace arg=nil
- arg = prefix if arg.nil?
- @element.namespace arg
- end
-
- # Returns true if other is an Attribute and has the same name and value,
- # false otherwise.
- def ==( other )
- other.kind_of?(Attribute) and other.name==name and other.value==value
- end
-
- # Creates (and returns) a hash from both the name and value
- def hash
- name.hash + value.hash
- end
-
- # Returns this attribute out as XML source, expanding the name
- #
- # a = Attribute.new( "x", "y" )
- # a.to_string # -> "x='y'"
- # b = Attribute.new( "ns:x", "y" )
- # b.to_string # -> "ns:x='y'"
- def to_string
- if @element and @element.context and @element.context[:attribute_quote] == :quote
- %Q^#@expanded_name="#{to_s().gsub(/"/, '&quote;')}"^
- else
- "#@expanded_name='#{to_s().gsub(/'/, '&apos;')}'"
- end
- end
-
- def doctype
- if @element
- doc = @element.document
- doctype = doc.doctype if doc
- end
- end
-
- # Returns the attribute value, with entities replaced
- def to_s
- return @normalized if @normalized
-
- @normalized = Text::normalize( @unnormalized, doctype )
- @unnormalized = nil
+ #
+ # Attribute.new( attribute_to_clone )
+ # Attribute.new( attribute_to_clone, parent_element )
+ # Attribute.new( "attr", "attr_value" )
+ # Attribute.new( "attr", "attr_value", parent_element )
+ def initialize( first, second=nil, parent=nil )
+ @normalized = @unnormalized = @element = nil
+ if first.kind_of? Attribute
+ self.name = first.expanded_name
+ @unnormalized = first.value
+ if second.kind_of? Element
+ @element = second
+ else
+ @element = first.element
+ end
+ elsif first.kind_of? String
+ @element = parent
+ self.name = first
+ @normalized = second.to_s
+ else
+ raise "illegal argument #{first.class.name} to Attribute constructor"
+ end
+ end
+
+ # Returns the namespace of the attribute.
+ #
+ # e = Element.new( "elns:myelement" )
+ # e.add_attribute( "nsa:a", "aval" )
+ # e.add_attribute( "b", "bval" )
+ # e.attributes.get_attribute( "a" ).prefix # -> "nsa"
+ # e.attributes.get_attribute( "b" ).prefix # -> "elns"
+ # a = Attribute.new( "x", "y" )
+ # a.prefix # -> ""
+ def prefix
+ pf = super
+ if pf == ""
+ pf = @element.prefix if @element
+ end
+ pf
+ end
+
+ # Returns the namespace URL, if defined, or nil otherwise
+ #
+ # e = Element.new("el")
+ # e.add_attributes({"xmlns:ns", "http://url"})
+ # e.namespace( "ns" ) # -> "http://url"
+ def namespace arg=nil
+ arg = prefix if arg.nil?
+ @element.namespace arg
+ end
+
+ # Returns true if other is an Attribute and has the same name and value,
+ # false otherwise.
+ def ==( other )
+ other.kind_of?(Attribute) and other.name==name and other.value==value
+ end
+
+ # Creates (and returns) a hash from both the name and value
+ def hash
+ name.hash + value.hash
+ end
+
+ # Returns this attribute out as XML source, expanding the name
+ #
+ # a = Attribute.new( "x", "y" )
+ # a.to_string # -> "x='y'"
+ # b = Attribute.new( "ns:x", "y" )
+ # b.to_string # -> "ns:x='y'"
+ def to_string
+ if @element and @element.context and @element.context[:attribute_quote] == :quote
+ %Q^#@expanded_name="#{to_s().gsub(/"/, '&quote;')}"^
+ else
+ "#@expanded_name='#{to_s().gsub(/'/, '&apos;')}'"
+ end
+ end
+
+ # Returns the attribute value, with entities replaced
+ def to_s
+ return @normalized if @normalized
+
+ doctype = nil
+ if @element
+ doc = @element.document
+ doctype = doc.doctype if doc
+ end
+
+ @normalized = Text::normalize( @unnormalized, doctype )
+ @unnormalized = nil
@normalized
- end
-
- # Returns the UNNORMALIZED value of this attribute. That is, entities
- # have been expanded to their values
- def value
- return @unnormalized if @unnormalized
- @unnormalized = Text::unnormalize( @normalized, doctype )
- @normalized = nil
+ end
+
+ # Returns the UNNORMALIZED value of this attribute. That is, entities
+ # have been expanded to their values
+ def value
+ return @unnormalized if @unnormalized
+ doctype = nil
+ if @element
+ doc = @element.document
+ doctype = doc.doctype if doc
+ end
+ @unnormalized = Text::unnormalize( @normalized, doctype )
+ @normalized = nil
@unnormalized
- end
-
- # Returns a copy of this attribute
- def clone
- Attribute.new self
- end
-
- # Sets the element of which this object is an attribute. Normally, this
- # is not directly called.
- #
- # Returns this attribute
- def element=( element )
- @element = element
-
- if @normalized
- Text.check( @normalized, NEEDS_A_SECOND_CHECK, doctype )
- end
-
- self
- end
-
- # Removes this Attribute from the tree, and returns true if successfull
- #
- # This method is usually not called directly.
- def remove
- @element.attributes.delete self.name unless @element.nil?
- end
-
- # Writes this attribute (EG, puts 'key="value"' to the output)
- def write( output, indent=-1 )
- output << to_string
- end
+ end
+
+ # Returns a copy of this attribute
+ def clone
+ Attribute.new self
+ end
+
+ # Sets the element of which this object is an attribute. Normally, this
+ # is not directly called.
+ #
+ # Returns this attribute
+ def element=( element )
+ @element = element
+ self
+ end
+
+ # Removes this Attribute from the tree, and returns true if successfull
+ #
+ # This method is usually not called directly.
+ def remove
+ @element.attributes.delete self.name unless @element.nil?
+ end
+
+ # Writes this attribute (EG, puts 'key="value"' to the output)
+ def write( output, indent=-1 )
+ output << to_string
+ end
def node_type
:attribute
@@ -183,6 +180,6 @@ module REXML
path += "/@#{self.expanded_name}"
return path
end
- end
+ end
end
#vim:ts=2 sw=2 noexpandtab:
diff --git a/lib/rexml/cdata.rb b/lib/rexml/cdata.rb
index e1235d60f8..efcb71160a 100644
--- a/lib/rexml/cdata.rb
+++ b/lib/rexml/cdata.rb
@@ -1,39 +1,39 @@
require "rexml/text"
module REXML
- class CData < Text
- START = '<![CDATA['
- STOP = ']]>'
- ILLEGAL = /(\]\]>)/
+ class CData < Text
+ START = '<![CDATA['
+ STOP = ']]>'
+ ILLEGAL = /(\]\]>)/
- # Constructor. CData is data between <![CDATA[ ... ]]>
- #
- # _Examples_
- # CData.new( source )
- # CData.new( "Here is some CDATA" )
- # CData.new( "Some unprocessed data", respect_whitespace_TF, parent_element )
- def initialize( first, whitespace=true, parent=nil )
- super( first, whitespace, parent, false, true, ILLEGAL )
- end
+ # Constructor. CData is data between <![CDATA[ ... ]]>
+ #
+ # _Examples_
+ # CData.new( source )
+ # CData.new( "Here is some CDATA" )
+ # CData.new( "Some unprocessed data", respect_whitespace_TF, parent_element )
+ def initialize( first, whitespace=true, parent=nil )
+ super( first, whitespace, parent, true, true, ILLEGAL )
+ end
- # Make a copy of this object
- #
- # _Examples_
- # c = CData.new( "Some text" )
- # d = c.clone
- # d.to_s # -> "Some text"
- def clone
- CData.new self
- end
+ # Make a copy of this object
+ #
+ # _Examples_
+ # c = CData.new( "Some text" )
+ # d = c.clone
+ # d.to_s # -> "Some text"
+ def clone
+ CData.new self
+ end
- # Returns the content of this CData object
- #
- # _Examples_
- # c = CData.new( "Some text" )
- # c.to_s # -> "Some text"
- def to_s
- @string
- end
+ # Returns the content of this CData object
+ #
+ # _Examples_
+ # c = CData.new( "Some text" )
+ # c.to_s # -> "Some text"
+ def to_s
+ @string
+ end
def value
@string
@@ -42,26 +42,26 @@ module REXML
# == DEPRECATED
# See the rexml/formatters package
#
- # Generates XML output of this object
- #
- # output::
- # Where to write the string. Defaults to $stdout
- # indent::
+ # Generates XML output of this object
+ #
+ # output::
+ # Where to write the string. Defaults to $stdout
+ # indent::
# The amount to indent this node by
- # transitive::
+ # transitive::
# Ignored
- # ie_hack::
+ # ie_hack::
# Ignored
- #
- # _Examples_
- # c = CData.new( " Some text " )
- # c.write( $stdout ) #-> <![CDATA[ Some text ]]>
- def write( output=$stdout, indent=-1, transitive=false, ie_hack=false )
+ #
+ # _Examples_
+ # c = CData.new( " Some text " )
+ # c.write( $stdout ) #-> <![CDATA[ Some text ]]>
+ def write( output=$stdout, indent=-1, transitive=false, ie_hack=false )
Kernel.warn( "#{self.class.name}.write is deprecated" )
- indent( output, indent )
- output << START
- output << @string
- output << STOP
- end
- end
+ indent( output, indent )
+ output << START
+ output << @string
+ output << STOP
+ end
+ end
end
diff --git a/lib/rexml/child.rb b/lib/rexml/child.rb
index fd59d7283a..6d3c9df5e6 100644
--- a/lib/rexml/child.rb
+++ b/lib/rexml/child.rb
@@ -1,96 +1,96 @@
require "rexml/node"
module REXML
- ##
- # A Child object is something contained by a parent, and this class
- # contains methods to support that. Most user code will not use this
- # class directly.
- class Child
- include Node
- attr_reader :parent # The Parent of this object
+ ##
+ # A Child object is something contained by a parent, and this class
+ # contains methods to support that. Most user code will not use this
+ # class directly.
+ class Child
+ include Node
+ attr_reader :parent # The Parent of this object
- # Constructor. Any inheritors of this class should call super to make
- # sure this method is called.
- # parent::
- # if supplied, the parent of this child will be set to the
- # supplied value, and self will be added to the parent
- def initialize( parent = nil )
- @parent = nil
- # Declare @parent, but don't define it. The next line sets the
- # parent.
- parent.add( self ) if parent
- end
+ # Constructor. Any inheritors of this class should call super to make
+ # sure this method is called.
+ # parent::
+ # if supplied, the parent of this child will be set to the
+ # supplied value, and self will be added to the parent
+ def initialize( parent = nil )
+ @parent = nil
+ # Declare @parent, but don't define it. The next line sets the
+ # parent.
+ parent.add( self ) if parent
+ end
- # Replaces this object with another object. Basically, calls
- # Parent.replace_child
- #
- # Returns:: self
- def replace_with( child )
- @parent.replace_child( self, child )
- self
- end
+ # Replaces this object with another object. Basically, calls
+ # Parent.replace_child
+ #
+ # Returns:: self
+ def replace_with( child )
+ @parent.replace_child( self, child )
+ self
+ end
- # Removes this child from the parent.
- #
- # Returns:: self
- def remove
- unless @parent.nil?
- @parent.delete self
- end
- self
- end
+ # Removes this child from the parent.
+ #
+ # Returns:: self
+ def remove
+ unless @parent.nil?
+ @parent.delete self
+ end
+ self
+ end
- # Sets the parent of this child to the supplied argument.
- #
- # other::
- # Must be a Parent object. If this object is the same object as the
- # existing parent of this child, no action is taken. Otherwise, this
- # child is removed from the current parent (if one exists), and is added
- # to the new parent.
- # Returns:: The parent added
- def parent=( other )
- return @parent if @parent == other
- @parent.delete self if defined? @parent and @parent
- @parent = other
- end
+ # Sets the parent of this child to the supplied argument.
+ #
+ # other::
+ # Must be a Parent object. If this object is the same object as the
+ # existing parent of this child, no action is taken. Otherwise, this
+ # child is removed from the current parent (if one exists), and is added
+ # to the new parent.
+ # Returns:: The parent added
+ def parent=( other )
+ return @parent if @parent == other
+ @parent.delete self if defined? @parent and @parent
+ @parent = other
+ end
- alias :next_sibling :next_sibling_node
- alias :previous_sibling :previous_sibling_node
+ alias :next_sibling :next_sibling_node
+ alias :previous_sibling :previous_sibling_node
- # Sets the next sibling of this child. This can be used to insert a child
- # after some other child.
- # a = Element.new("a")
- # b = a.add_element("b")
- # c = Element.new("c")
- # b.next_sibling = c
- # # => <a><b/><c/></a>
- def next_sibling=( other )
- parent.insert_after self, other
- end
+ # Sets the next sibling of this child. This can be used to insert a child
+ # after some other child.
+ # a = Element.new("a")
+ # b = a.add_element("b")
+ # c = Element.new("c")
+ # b.next_sibling = c
+ # # => <a><b/><c/></a>
+ def next_sibling=( other )
+ parent.insert_after self, other
+ end
- # Sets the previous sibling of this child. This can be used to insert a
- # child before some other child.
- # a = Element.new("a")
- # b = a.add_element("b")
- # c = Element.new("c")
- # b.previous_sibling = c
- # # => <a><b/><c/></a>
- def previous_sibling=(other)
- parent.insert_before self, other
- end
+ # Sets the previous sibling of this child. This can be used to insert a
+ # child before some other child.
+ # a = Element.new("a")
+ # b = a.add_element("b")
+ # c = Element.new("c")
+ # b.previous_sibling = c
+ # # => <a><b/><c/></a>
+ def previous_sibling=(other)
+ parent.insert_before self, other
+ end
- # Returns:: the document this child belongs to, or nil if this child
- # belongs to no document
- def document
- return parent.document unless parent.nil?
- nil
- end
+ # Returns:: the document this child belongs to, or nil if this child
+ # belongs to no document
+ def document
+ return parent.document unless parent.nil?
+ nil
+ end
- # This doesn't yet handle encodings
- def bytes
- encoding = document.encoding
+ # This doesn't yet handle encodings
+ def bytes
+ encoding = document.encoding
- to_s
- end
- end
+ to_s
+ end
+ end
end
diff --git a/lib/rexml/comment.rb b/lib/rexml/comment.rb
index e401090376..2b9b4b89c9 100644
--- a/lib/rexml/comment.rb
+++ b/lib/rexml/comment.rb
@@ -1,80 +1,80 @@
require "rexml/child"
module REXML
- ##
- # Represents an XML comment; that is, text between \<!-- ... -->
- class Comment < Child
- include Comparable
- START = "<!--"
- STOP = "-->"
+ ##
+ # Represents an XML comment; that is, text between \<!-- ... -->
+ class Comment < Child
+ include Comparable
+ START = "<!--"
+ STOP = "-->"
- # The content text
+ # The content text
- attr_accessor :string
+ attr_accessor :string
- ##
- # Constructor. The first argument can be one of three types:
- # @param first If String, the contents of this comment are set to the
- # argument. If Comment, the argument is duplicated. If
- # Source, the argument is scanned for a comment.
- # @param second If the first argument is a Source, this argument
- # should be nil, not supplied, or a Parent to be set as the parent
- # of this object
- def initialize( first, second = nil )
- #puts "IN COMMENT CONSTRUCTOR; SECOND IS #{second.type}"
- super(second)
- if first.kind_of? String
- @string = first
- elsif first.kind_of? Comment
- @string = first.string
- end
- end
+ ##
+ # Constructor. The first argument can be one of three types:
+ # @param first If String, the contents of this comment are set to the
+ # argument. If Comment, the argument is duplicated. If
+ # Source, the argument is scanned for a comment.
+ # @param second If the first argument is a Source, this argument
+ # should be nil, not supplied, or a Parent to be set as the parent
+ # of this object
+ def initialize( first, second = nil )
+ #puts "IN COMMENT CONSTRUCTOR; SECOND IS #{second.type}"
+ super(second)
+ if first.kind_of? String
+ @string = first
+ elsif first.kind_of? Comment
+ @string = first.string
+ end
+ end
- def clone
- Comment.new self
- end
+ def clone
+ Comment.new self
+ end
# == DEPRECATED
# See REXML::Formatters
#
- # output::
- # Where to write the string
- # indent::
- # An integer. If -1, no indenting will be used; otherwise, the
- # indentation will be this number of spaces, and children will be
- # indented an additional amount.
- # transitive::
- # Ignored by this class. The contents of comments are never modified.
- # ie_hack::
- # Needed for conformity to the child API, but not used by this class.
- def write( output, indent=-1, transitive=false, ie_hack=false )
+ # output::
+ # Where to write the string
+ # indent::
+ # An integer. If -1, no indenting will be used; otherwise, the
+ # indentation will be this number of spaces, and children will be
+ # indented an additional amount.
+ # transitive::
+ # Ignored by this class. The contents of comments are never modified.
+ # ie_hack::
+ # Needed for conformity to the child API, but not used by this class.
+ def write( output, indent=-1, transitive=false, ie_hack=false )
Kernel.warn("Comment.write is deprecated. See REXML::Formatters")
- indent( output, indent )
- output << START
- output << @string
- output << STOP
- end
+ indent( output, indent )
+ output << START
+ output << @string
+ output << STOP
+ end
- alias :to_s :string
+ alias :to_s :string
- ##
- # Compares this Comment to another; the contents of the comment are used
- # in the comparison.
- def <=>(other)
- other.to_s <=> @string
- end
+ ##
+ # Compares this Comment to another; the contents of the comment are used
+ # in the comparison.
+ def <=>(other)
+ other.to_s <=> @string
+ end
- ##
- # Compares this Comment to another; the contents of the comment are used
- # in the comparison.
- def ==( other )
- other.kind_of? Comment and
- (other <=> self) == 0
- end
+ ##
+ # Compares this Comment to another; the contents of the comment are used
+ # in the comparison.
+ def ==( other )
+ other.kind_of? Comment and
+ (other <=> self) == 0
+ end
def node_type
:comment
end
- end
+ end
end
#vim:ts=2 sw=2 noexpandtab:
diff --git a/lib/rexml/doctype.rb b/lib/rexml/doctype.rb
index 1a946a1587..05cd4ab331 100644
--- a/lib/rexml/doctype.rb
+++ b/lib/rexml/doctype.rb
@@ -15,11 +15,11 @@ module REXML
STOP = ">"
SYSTEM = "SYSTEM"
PUBLIC = "PUBLIC"
- DEFAULT_ENTITIES = {
- 'gt'=>EntityConst::GT,
- 'lt'=>EntityConst::LT,
- 'quot'=>EntityConst::QUOT,
- "apos"=>EntityConst::APOS
+ DEFAULT_ENTITIES = {
+ 'gt'=>EntityConst::GT,
+ 'lt'=>EntityConst::LT,
+ 'quot'=>EntityConst::QUOT,
+ "apos"=>EntityConst::APOS
}
# name is the name of the doctype
@@ -33,7 +33,7 @@ module REXML
# dt = DocType.new( doctype_to_clone )
# # Incomplete. Shallow clone of doctype
#
- # +Note+ that the constructor:
+ # +Note+ that the constructor:
#
# Doctype.new( Source.new( "<!DOCTYPE foo 'bar'>" ) )
#
@@ -117,6 +117,7 @@ module REXML
unless @children.empty?
next_indent = indent + 1
output << ' ['
+ child = nil # speed
@children.each { |child|
output << "\n"
f.write( child, output )
@@ -139,8 +140,8 @@ module REXML
@entities = DEFAULT_ENTITIES.clone if @entities == DEFAULT_ENTITIES
@entities[ child.name ] = child if child.kind_of? Entity
end
-
- # This method retrieves the public identifier identifying the document's
+
+ # This method retrieves the public identifier identifying the document's
# DTD.
#
# Method contributed by Henrik Martensson
@@ -152,7 +153,7 @@ module REXML
strip_quotes(@long_name)
end
end
-
+
# This method retrieves the system identifier identifying the document's DTD
#
# Method contributed by Henrik Martensson
@@ -164,16 +165,16 @@ module REXML
@uri.kind_of?(String) ? strip_quotes(@uri) : nil
end
end
-
+
# This method returns a list of notations that have been declared in the
- # _internal_ DTD subset. Notations in the external DTD subset are not
+ # _internal_ DTD subset. Notations in the external DTD subset are not
# listed.
#
# Method contributed by Henrik Martensson
def notations
children().select {|node| node.kind_of?(REXML::NotationDecl)}
end
-
+
# Retrieves a named notation. Only notations declared in the internal
# DTD subset can be retrieved.
#
@@ -183,12 +184,12 @@ module REXML
notation_decl.name == name
}
end
-
+
private
-
+
# Method contributed by Henrik Martensson
def strip_quotes(quoted_string)
- quoted_string =~ /^[\'\"].*[\'\"]$/ ?
+ quoted_string =~ /^[\'\"].*[\´\"]$/ ?
quoted_string[1, quoted_string.length-2] :
quoted_string
end
@@ -217,7 +218,7 @@ module REXML
output << to_s
end
end
-
+
public
class ElementDecl < Declaration
def initialize( src )
@@ -250,7 +251,7 @@ module REXML
def to_s
"<!NOTATION #@name #@middle#{
- @public ? ' ' + public.inspect : ''
+ @public ? ' ' + public.inspect : ''
}#{
@system ? ' ' +@system.inspect : ''
}>"
@@ -259,7 +260,7 @@ module REXML
def write( output, indent=-1 )
output << to_s
end
-
+
# This method retrieves the name of the notation.
#
# Method contributed by Henrik Martensson
diff --git a/lib/rexml/document.rb b/lib/rexml/document.rb
index 0fde6df1a1..54aa691ad8 100644
--- a/lib/rexml/document.rb
+++ b/lib/rexml/document.rb
@@ -16,64 +16,63 @@ module REXML
# Document has a single child that can be accessed by root().
# Note that if you want to have an XML declaration written for a document
# you create, you must add one; REXML documents do not write a default
- # declaration for you. See |DECLARATION| and |write|.
- class Document < Element
- # A convenient default XML declaration. If you want an XML declaration,
- # the easiest way to add one is mydoc << Document::DECLARATION
+ # declaration for you. See |DECLARATION| and |write|.
+ class Document < Element
+ # A convenient default XML declaration. If you want an XML declaration,
+ # the easiest way to add one is mydoc << Document::DECLARATION
# +DEPRECATED+
# Use: mydoc << XMLDecl.default
- DECLARATION = XMLDecl.default
-
- # Constructor
- # @param source if supplied, must be a Document, String, or IO.
- # Documents have their context and Element attributes cloned.
- # Strings are expected to be valid XML documents. IOs are expected
- # to be sources of valid XML documents.
- # @param context if supplied, contains the context of the document;
- # this should be a Hash.
- def initialize( source = nil, context = {} )
- @entity_expansion_count = 0
- super()
- @context = context
- return if source.nil?
- if source.kind_of? Document
- @context = source.context
- super source
- else
- build( source )
- end
- end
+ DECLARATION = XMLDecl.default
+
+ # Constructor
+ # @param source if supplied, must be a Document, String, or IO.
+ # Documents have their context and Element attributes cloned.
+ # Strings are expected to be valid XML documents. IOs are expected
+ # to be sources of valid XML documents.
+ # @param context if supplied, contains the context of the document;
+ # this should be a Hash.
+ def initialize( source = nil, context = {} )
+ super()
+ @context = context
+ return if source.nil?
+ if source.kind_of? Document
+ @context = source.context
+ super source
+ else
+ build( source )
+ end
+ end
def node_type
:document
end
- # Should be obvious
- def clone
- Document.new self
- end
+ # Should be obvious
+ def clone
+ Document.new self
+ end
- # According to the XML spec, a root node has no expanded name
- def expanded_name
- ''
- #d = doc_type
- #d ? d.name : "UNDEFINED"
- end
+ # According to the XML spec, a root node has no expanded name
+ def expanded_name
+ ''
+ #d = doc_type
+ #d ? d.name : "UNDEFINED"
+ end
- alias :name :expanded_name
+ alias :name :expanded_name
- # We override this, because XMLDecls and DocTypes must go at the start
- # of the document
- def add( child )
- if child.kind_of? XMLDecl
- @children.unshift child
+ # We override this, because XMLDecls and DocTypes must go at the start
+ # of the document
+ def add( child )
+ if child.kind_of? XMLDecl
+ @children.unshift child
child.parent = self
- elsif child.kind_of? DocType
- # Find first Element or DocType node and insert the decl right
+ elsif child.kind_of? DocType
+ # Find first Element or DocType node and insert the decl right
# before it. If there is no such node, just insert the child at the
# end. If there is a child and it is an DocType, then replace it.
insert_before_index = 0
- @children.find { |x|
+ @children.find { |x|
insert_before_index += 1
x.kind_of?(Element) || x.kind_of?(DocType)
}
@@ -86,60 +85,60 @@ module REXML
else # Insert at end of list
@children[insert_before_index] = child
end
- child.parent = self
- else
- rv = super
- raise "attempted adding second root element to document" if @elements.size > 1
- rv
- end
- end
- alias :<< :add
-
- def add_element(arg=nil, arg2=nil)
- rv = super
- raise "attempted adding second root element to document" if @elements.size > 1
- rv
- end
-
- # @return the root Element of the document, or nil if this document
- # has no children.
- def root
+ child.parent = self
+ else
+ rv = super
+ raise "attempted adding second root element to document" if @elements.size > 1
+ rv
+ end
+ end
+ alias :<< :add
+
+ def add_element(arg=nil, arg2=nil)
+ rv = super
+ raise "attempted adding second root element to document" if @elements.size > 1
+ rv
+ end
+
+ # @return the root Element of the document, or nil if this document
+ # has no children.
+ def root
elements[1]
#self
#@children.find { |item| item.kind_of? Element }
- end
-
- # @return the DocType child of the document, if one exists,
- # and nil otherwise.
- def doctype
- @children.find { |item| item.kind_of? DocType }
- end
-
- # @return the XMLDecl of this document; if no XMLDecl has been
- # set, the default declaration is returned.
- def xml_decl
- rv = @children[0]
+ end
+
+ # @return the DocType child of the document, if one exists,
+ # and nil otherwise.
+ def doctype
+ @children.find { |item| item.kind_of? DocType }
+ end
+
+ # @return the XMLDecl of this document; if no XMLDecl has been
+ # set, the default declaration is returned.
+ def xml_decl
+ rv = @children[0]
return rv if rv.kind_of? XMLDecl
rv = @children.unshift(XMLDecl.default)[0]
- end
-
- # @return the XMLDecl version of this document as a String.
- # If no XMLDecl has been set, returns the default version.
- def version
- xml_decl().version
- end
-
- # @return the XMLDecl encoding of this document as a String.
- # If no XMLDecl has been set, returns the default encoding.
- def encoding
- xml_decl().encoding
- end
-
- # @return the XMLDecl standalone value of this document as a String.
- # If no XMLDecl has been set, returns the default setting.
- def stand_alone?
- xml_decl().stand_alone?
- end
+ end
+
+ # @return the XMLDecl version of this document as a String.
+ # If no XMLDecl has been set, returns the default version.
+ def version
+ xml_decl().version
+ end
+
+ # @return the XMLDecl encoding of this document as a String.
+ # If no XMLDecl has been set, returns the default encoding.
+ def encoding
+ xml_decl().encoding
+ end
+
+ # @return the XMLDecl standalone value of this document as a String.
+ # If no XMLDecl has been set, returns the default setting.
+ def stand_alone?
+ xml_decl().stand_alone?
+ end
# Write the XML tree out, optionally with indent. This writes out the
# entire XML document, including XML declarations, doctype declarations,
@@ -167,9 +166,9 @@ module REXML
# indent::
# An integer. If -1, no indenting will be used; otherwise, the
# indentation will be twice this number of spaces, and children will be
- # indented an additional amount. For a value of 3, every item will be
+ # indented an additional amount. For a value of 3, every item will be
# indented 3 more levels, or 6 more spaces (2 * 3). Defaults to -1
- # transitive::
+ # trans::
# If transitive is true and indent is >= 0, then the output will be
# pretty-printed in such a way that the added whitespace does not affect
# the absolute *value* of the document -- that is, it leaves the value
@@ -178,15 +177,14 @@ module REXML
# Internet Explorer is the worst piece of crap to have ever been
# written, with the possible exception of Windows itself. Since IE is
# unable to parse proper XML, we have to provide a hack to generate XML
- # that IE's limited abilities can handle. This hack inserts a space
+ # that IE's limited abilities can handle. This hack inserts a space
# before the /> on empty tags. Defaults to false
- def write( output=$stdout, indent=-1, transitive=false, ie_hack=false )
+ def write( output=$stdout, indent=-1, trans=false, ie_hack=false )
if xml_decl.encoding != "UTF-8" && !output.kind_of?(Output)
output = Output.new( output, xml_decl.encoding )
end
formatter = if indent > -1
- if transitive
- require "rexml/formatters/transitive"
+ if trans
REXML::Formatters::Transitive.new( indent, ie_hack )
else
REXML::Formatters::Pretty.new( indent, ie_hack )
@@ -195,37 +193,16 @@ module REXML
REXML::Formatters::Default.new( ie_hack )
end
formatter.write( self, output )
- end
+ end
+
+ def Document::parse_stream( source, listener )
+ Parsers::StreamParser.new( source, listener ).parse
+ end
- def Document::parse_stream( source, listener )
- Parsers::StreamParser.new( source, listener ).parse
- end
-
- @@entity_expansion_limit = 10_000
-
- # Set the entity expansion limit. By default the limit is set to 10000.
- def Document::entity_expansion_limit=( val )
- @@entity_expansion_limit = val
- end
-
- # Get the entity expansion limit. By default the limit is set to 10000.
- def Document::entity_expansion_limit
- return @@entity_expansion_limit
- end
-
- attr_reader :entity_expansion_count
-
- def record_entity_expansion
- @entity_expansion_count += 1
- if @entity_expansion_count > @@entity_expansion_limit
- raise "number of entity expansions exceeded, processing aborted."
- end
- end
-
- private
- def build( source )
+ private
+ def build( source )
Parsers::TreeParser.new( source, self ).parse
- end
- end
+ end
+ end
end
diff --git a/lib/rexml/dtd/attlistdecl.rb b/lib/rexml/dtd/attlistdecl.rb
index 25955ee274..e176bb0749 100644
--- a/lib/rexml/dtd/attlistdecl.rb
+++ b/lib/rexml/dtd/attlistdecl.rb
@@ -1,10 +1,10 @@
require "rexml/child"
module REXML
- module DTD
- class AttlistDecl < Child
- START = "<!ATTLIST"
- START_RE = /^\s*#{START}/um
- PATTERN_RE = /\s*(#{START}.*?>)/um
- end
- end
+ module DTD
+ class AttlistDecl < Child
+ START = "<!ATTLIST"
+ START_RE = /^\s*#{START}/um
+ PATTERN_RE = /\s*(#{START}.*?>)/um
+ end
+ end
end
diff --git a/lib/rexml/dtd/dtd.rb b/lib/rexml/dtd/dtd.rb
index 966e39ea57..4f735d4812 100644
--- a/lib/rexml/dtd/dtd.rb
+++ b/lib/rexml/dtd/dtd.rb
@@ -6,46 +6,46 @@ require "rexml/dtd/attlistdecl"
require "rexml/parent"
module REXML
- module DTD
- class Parser
- def Parser.parse( input )
- case input
- when String
- parse_helper input
- when File
- parse_helper input.read
- end
- end
+ module DTD
+ class Parser
+ def Parser.parse( input )
+ case input
+ when String
+ parse_helper input
+ when File
+ parse_helper input.read
+ end
+ end
- # Takes a String and parses it out
- def Parser.parse_helper( input )
- contents = Parent.new
- while input.size > 0
- case input
- when ElementDecl.PATTERN_RE
- match = $&
- source = $'
- contents << ElementDecl.new( match )
- when AttlistDecl.PATTERN_RE
- matchdata = $~
- source = $'
- contents << AttlistDecl.new( matchdata )
- when EntityDecl.PATTERN_RE
- matchdata = $~
- source = $'
- contents << EntityDecl.new( matchdata )
- when Comment.PATTERN_RE
- matchdata = $~
- source = $'
- contents << Comment.new( matchdata )
- when NotationDecl.PATTERN_RE
- matchdata = $~
- source = $'
- contents << NotationDecl.new( matchdata )
- end
- end
- contents
- end
- end
- end
+ # Takes a String and parses it out
+ def Parser.parse_helper( input )
+ contents = Parent.new
+ while input.size > 0
+ case input
+ when ElementDecl.PATTERN_RE
+ match = $&
+ source = $'
+ contents << ElementDecl.new( match )
+ when AttlistDecl.PATTERN_RE
+ matchdata = $~
+ source = $'
+ contents << AttlistDecl.new( matchdata )
+ when EntityDecl.PATTERN_RE
+ matchdata = $~
+ source = $'
+ contents << EntityDecl.new( matchdata )
+ when Comment.PATTERN_RE
+ matchdata = $~
+ source = $'
+ contents << Comment.new( matchdata )
+ when NotationDecl.PATTERN_RE
+ matchdata = $~
+ source = $'
+ contents << NotationDecl.new( matchdata )
+ end
+ end
+ contents
+ end
+ end
+ end
end
diff --git a/lib/rexml/dtd/elementdecl.rb b/lib/rexml/dtd/elementdecl.rb
index a0bf641300..c4e620f389 100644
--- a/lib/rexml/dtd/elementdecl.rb
+++ b/lib/rexml/dtd/elementdecl.rb
@@ -1,17 +1,17 @@
require "rexml/child"
module REXML
- module DTD
- class ElementDecl < Child
- START = "<!ELEMENT"
- START_RE = /^\s*#{START}/um
- PATTERN_RE = /^\s*(#{START}.*?)>/um
- PATTERN_RE = /^\s*#{START}\s+((?:[:\w_][-\.\w_]*:)?[-!\*\.\w_]*)(.*?)>/
- #\s*((((["']).*?\5)|[^\/'">]*)*?)(\/)?>/um, true)
+ module DTD
+ class ElementDecl < Child
+ START = "<!ELEMENT"
+ START_RE = /^\s*#{START}/um
+ PATTERN_RE = /^\s*(#{START}.*?)>/um
+ PATTERN_RE = /^\s*#{START}\s+((?:[:\w_][-\.\w_]*:)?[-!\*\.\w_]*)(.*?)>/
+ #\s*((((["']).*?\5)|[^\/'">]*)*?)(\/)?>/um, true)
- def initialize match
- @name = match[1]
- @rest = match[2]
- end
- end
- end
+ def initialize match
+ @name = match[1]
+ @rest = match[2]
+ end
+ end
+ end
end
diff --git a/lib/rexml/dtd/entitydecl.rb b/lib/rexml/dtd/entitydecl.rb
index a9286b2b90..a5f1520f2b 100644
--- a/lib/rexml/dtd/entitydecl.rb
+++ b/lib/rexml/dtd/entitydecl.rb
@@ -1,56 +1,56 @@
require "rexml/child"
module REXML
- module DTD
- class EntityDecl < Child
- START = "<!ENTITY"
- START_RE = /^\s*#{START}/um
- PUBLIC = /^\s*#{START}\s+(?:%\s+)?(\w+)\s+PUBLIC\s+((["']).*?\3)\s+((["']).*?\5)\s*>/um
- SYSTEM = /^\s*#{START}\s+(?:%\s+)?(\w+)\s+SYSTEM\s+((["']).*?\3)(?:\s+NDATA\s+\w+)?\s*>/um
- PLAIN = /^\s*#{START}\s+(\w+)\s+((["']).*?\3)\s*>/um
- PERCENT = /^\s*#{START}\s+%\s+(\w+)\s+((["']).*?\3)\s*>/um
- # <!ENTITY name SYSTEM "...">
- # <!ENTITY name "...">
- def initialize src
- super()
- md = nil
- if src.match( PUBLIC )
- md = src.match( PUBLIC, true )
- @middle = "PUBLIC"
- @content = "#{md[2]} #{md[4]}"
- elsif src.match( SYSTEM )
- md = src.match( SYSTEM, true )
- @middle = "SYSTEM"
- @content = md[2]
- elsif src.match( PLAIN )
- md = src.match( PLAIN, true )
- @middle = ""
- @content = md[2]
- elsif src.match( PERCENT )
- md = src.match( PERCENT, true )
- @middle = ""
- @content = md[2]
- end
- raise ParseException.new("failed Entity match", src) if md.nil?
- @name = md[1]
- end
+ module DTD
+ class EntityDecl < Child
+ START = "<!ENTITY"
+ START_RE = /^\s*#{START}/um
+ PUBLIC = /^\s*#{START}\s+(?:%\s+)?(\w+)\s+PUBLIC\s+((["']).*?\3)\s+((["']).*?\5)\s*>/um
+ SYSTEM = /^\s*#{START}\s+(?:%\s+)?(\w+)\s+SYSTEM\s+((["']).*?\3)(?:\s+NDATA\s+\w+)?\s*>/um
+ PLAIN = /^\s*#{START}\s+(\w+)\s+((["']).*?\3)\s*>/um
+ PERCENT = /^\s*#{START}\s+%\s+(\w+)\s+((["']).*?\3)\s*>/um
+ # <!ENTITY name SYSTEM "...">
+ # <!ENTITY name "...">
+ def initialize src
+ super()
+ md = nil
+ if src.match( PUBLIC )
+ md = src.match( PUBLIC, true )
+ @middle = "PUBLIC"
+ @content = "#{md[2]} #{md[4]}"
+ elsif src.match( SYSTEM )
+ md = src.match( SYSTEM, true )
+ @middle = "SYSTEM"
+ @content = md[2]
+ elsif src.match( PLAIN )
+ md = src.match( PLAIN, true )
+ @middle = ""
+ @content = md[2]
+ elsif src.match( PERCENT )
+ md = src.match( PERCENT, true )
+ @middle = ""
+ @content = md[2]
+ end
+ raise ParseException.new("failed Entity match", src) if md.nil?
+ @name = md[1]
+ end
- def to_s
- rv = "<!ENTITY #@name "
- rv << "#@middle " if @middle.size > 0
- rv << @content
- rv
- end
+ def to_s
+ rv = "<!ENTITY #@name "
+ rv << "#@middle " if @middle.size > 0
+ rv << @content
+ rv
+ end
- def write( output, indent )
+ def write( output, indent )
indent( output, indent )
- output << to_s
- end
+ output << to_s
+ end
- def EntityDecl.parse_source source, listener
- md = source.match( PATTERN_RE, true )
- thing = md[0].squeeze(" \t\n\r")
- listener.send inspect.downcase, thing
- end
- end
- end
+ def EntityDecl.parse_source source, listener
+ md = source.match( PATTERN_RE, true )
+ thing = md[0].squeeze(" \t\n\r")
+ listener.send inspect.downcase, thing
+ end
+ end
+ end
end
diff --git a/lib/rexml/dtd/notationdecl.rb b/lib/rexml/dtd/notationdecl.rb
index 17d1b9ef29..a47ff8f24b 100644
--- a/lib/rexml/dtd/notationdecl.rb
+++ b/lib/rexml/dtd/notationdecl.rb
@@ -1,39 +1,39 @@
require "rexml/child"
module REXML
- module DTD
- class NotationDecl < Child
- START = "<!NOTATION"
- START_RE = /^\s*#{START}/um
- PUBLIC = /^\s*#{START}\s+(\w[\w-]*)\s+(PUBLIC)\s+((["']).*?\4)\s*>/um
- SYSTEM = /^\s*#{START}\s+(\w[\w-]*)\s+(SYSTEM)\s+((["']).*?\4)\s*>/um
- def initialize src
- super()
- if src.match( PUBLIC )
- md = src.match( PUBLIC, true )
- elsif src.match( SYSTEM )
- md = src.match( SYSTEM, true )
- else
- raise ParseException.new( "error parsing notation: no matching pattern", src )
- end
- @name = md[1]
- @middle = md[2]
- @rest = md[3]
- end
+ module DTD
+ class NotationDecl < Child
+ START = "<!NOTATION"
+ START_RE = /^\s*#{START}/um
+ PUBLIC = /^\s*#{START}\s+(\w[\w-]*)\s+(PUBLIC)\s+((["']).*?\4)\s*>/um
+ SYSTEM = /^\s*#{START}\s+(\w[\w-]*)\s+(SYSTEM)\s+((["']).*?\4)\s*>/um
+ def initialize src
+ super()
+ if src.match( PUBLIC )
+ md = src.match( PUBLIC, true )
+ elsif src.match( SYSTEM )
+ md = src.match( SYSTEM, true )
+ else
+ raise ParseException.new( "error parsing notation: no matching pattern", src )
+ end
+ @name = md[1]
+ @middle = md[2]
+ @rest = md[3]
+ end
- def to_s
- "<!NOTATION #@name #@middle #@rest>"
- end
+ def to_s
+ "<!NOTATION #@name #@middle #@rest>"
+ end
- def write( output, indent )
+ def write( output, indent )
indent( output, indent )
- output << to_s
- end
+ output << to_s
+ end
- def NotationDecl.parse_source source, listener
- md = source.match( PATTERN_RE, true )
- thing = md[0].squeeze(" \t\n\r")
- listener.send inspect.downcase, thing
- end
- end
- end
+ def NotationDecl.parse_source source, listener
+ md = source.match( PATTERN_RE, true )
+ thing = md[0].squeeze(" \t\n\r")
+ listener.send inspect.downcase, thing
+ end
+ end
+ end
end
diff --git a/lib/rexml/element.rb b/lib/rexml/element.rb
index 7a3abc65e5..3db87c6126 100644
--- a/lib/rexml/element.rb
+++ b/lib/rexml/element.rb
@@ -30,13 +30,13 @@ module REXML
attr_accessor :context
# Constructor
- # arg::
+ # arg::
# if not supplied, will be set to the default value.
# If a String, the name of this object will be set to the argument.
- # If an Element, the object will be shallowly cloned; name,
+ # If an Element, the object will be shallowly cloned; name,
# attributes, and namespaces will be copied. Children will +not+ be
# copied.
- # parent::
+ # parent::
# if supplied, must be a Parent, and will be used as
# the parent of this object.
# context::
@@ -97,7 +97,7 @@ module REXML
self.class.new self
end
- # Evaluates to the root node of the document that this element
+ # Evaluates to the root node of the document that this element
# belongs to. If this element doesn't belong to a document, but does
# belong to another Element, the parent's root will be returned, until the
# earliest ancestor is found.
@@ -137,8 +137,8 @@ module REXML
# is the case if:
# 1. Neither :+respect_whitespace+ nor :+compress_whitespace+ has any value
# 2. The context has :+respect_whitespace+ set to :+all+ or
- # an array containing the name of this element, and
- # :+compress_whitespace+ isn't set to :+all+ or an array containing the
+ # an array containing the name of this element, and
+ # :+compress_whitespace+ isn't set to :+all+ or an array containing the
# name of this element.
# The evaluation is tested against +expanded_name+, and so is namespace
# sensitive.
@@ -162,7 +162,7 @@ module REXML
@ignore_whitespace_nodes = false
if @context
if @context[:ignore_whitespace_nodes]
- @ignore_whitespace_nodes =
+ @ignore_whitespace_nodes =
(@context[:ignore_whitespace_nodes] == :all or
@context[:ignore_whitespace_nodes].include? expanded_name)
end
@@ -206,13 +206,13 @@ module REXML
return namespaces
end
- # Evalutas to the URI for a prefix, or the empty string if no such
+ # Evalutas to the URI for a prefix, or the empty string if no such
# namespace is declared for this element. Evaluates recursively for
# ancestors. Returns the default namespace, if there is one.
- # prefix::
+ # prefix::
# the prefix to search for. If not supplied, returns the default
# namespace if one exists
- # Returns::
+ # Returns::
# the namespace URI as a String, or nil if no such namespace
# exists. If the namespace is undefined, returns an empty string
# doc = Document.new("<a xmlns='1' xmlns:y='2'><b/><c xmlns:z='3'/></a>")
@@ -235,10 +235,10 @@ module REXML
end
# Adds a namespace to this element.
- # prefix::
+ # prefix::
# the prefix string, or the namespace URI if +uri+ is not
# supplied
- # uri::
+ # uri::
# the namespace URI. May be nil, in which +prefix+ is used as
# the URI
# Evaluates to: this Element
@@ -280,12 +280,12 @@ module REXML
# Adds a child to this element, optionally setting attributes in
# the element.
- # element::
+ # element::
# optional. If Element, the element is added.
# Otherwise, a new Element is constructed with the argument (see
# Element.initialize).
- # attrs::
- # If supplied, must be a Hash containing String name,value
+ # attrs::
+ # If supplied, must be a Hash containing String name,value
# pairs, which will be used to set the attributes of the new Element.
# Returns:: the Element that was added
# el = doc.add_element 'my-tag'
@@ -296,15 +296,15 @@ module REXML
raise "First argument must be either an element name, or an Element object" if element.nil?
el = @elements.add(element)
attrs.each do |key, value|
- el.attributes[key]=value
+ el.attributes[key]=Attribute.new(key,value,self)
end if attrs.kind_of? Hash
el
end
# Deletes a child element.
- # element::
- # Must be an +Element+, +String+, or +Integer+. If Element,
- # the element is removed. If String, the element is found (via XPath)
+ # element::
+ # Must be an +Element+, +String+, or +Integer+. If Element,
+ # the element is removed. If String, the element is found (via XPath)
# and removed. <em>This means that any parent can remove any
# descendant.<em> If Integer, the Element indexed by that number will be
# removed.
@@ -327,14 +327,14 @@ module REXML
# Iterates through the child elements, yielding for each Element that
# has a particular attribute set.
- # key::
+ # key::
# the name of the attribute to search for
- # value::
+ # value::
# the value of the attribute
- # max::
- # (optional) causes this method to return after yielding
+ # max::
+ # (optional) causes this method to return after yielding
# for this number of matching children
- # name::
+ # name::
# (optional) if supplied, this is an XPath that filters
# the children to check.
#
@@ -348,7 +348,7 @@ module REXML
# # Yields d
# doc.root.each_element_with_attribute( 'id', '1', 0, 'd' ) {|e| p e}
def each_element_with_attribute( key, value=nil, max=0, name=nil, &block ) # :yields: Element
- each_with_something( proc {|child|
+ each_with_something( proc {|child|
if value.nil?
child.attributes[key] != nil
else
@@ -359,13 +359,13 @@ module REXML
# Iterates through the children, yielding for each Element that
# has a particular text set.
- # text::
+ # text::
# the text to search for. If nil, or not supplied, will iterate
# over all +Element+ children that contain at least one +Text+ node.
- # max::
+ # max::
# (optional) causes this method to return after yielding
# for this number of matching children
- # name::
+ # name::
# (optional) if supplied, this is an XPath that filters
# the children to check.
#
@@ -379,7 +379,7 @@ module REXML
# # Yields d
# doc.each_element_with_text(nil, 0, 'd'){|e|p e}
def each_element_with_text( text=nil, max=0, name=nil, &block ) # :yields: Element
- each_with_something( proc {|child|
+ each_with_something( proc {|child|
if text.nil?
child.has_text?
else
@@ -408,7 +408,7 @@ module REXML
# doc.root.elements['c'].next_element #-> nil
def next_element
element = next_sibling
- element = element.next_sibling until element.nil? or element.kind_of? Element
+ element = element.next_sibling until element.nil? or element.kind_of? Element
return element
end
@@ -477,7 +477,7 @@ module REXML
# this method with a nil argument. In this case, the next Text
# child becomes the first Text child. In no case is the order of
# any siblings disturbed.
- # text::
+ # text::
# If a String, a new Text child is created and added to
# this Element as the first Text child. If Text, the text is set
# as the first Child element. If nil, then any existing first Text
@@ -520,7 +520,7 @@ module REXML
# Note that at the end of this example, the branch has <b>3</b> nodes; the 'e'
# element and <b>2</b> Text node children.
def add_text( text )
- if text.kind_of? String
+ if text.kind_of? String
if @children[-1].kind_of? Text
@children[-1] << text
return
@@ -552,25 +552,9 @@ module REXML
def attribute( name, namespace=nil )
prefix = nil
- if namespaces.respond_to? :key
- prefix = namespaces.key(namespace) if namespace
- else
- prefix = namespaces.index(namespace) if namespace
- end
+ prefix = namespaces.index(namespace) if namespace
prefix = nil if prefix == 'xmlns'
-
- ret_val =
- attributes.get_attribute( "#{prefix ? prefix + ':' : ''}#{name}" )
-
- return ret_val unless ret_val.nil?
- return nil if prefix.nil?
-
- # now check that prefix'es namespace is not the same as the
- # default namespace
- return nil unless ( namespaces[ prefix ] == namespaces[ 'xmlns' ] )
-
- attributes.get_attribute( name )
-
+ attributes.get_attribute( "#{prefix ? prefix + ':' : ''}#{name}" )
end
# Evaluates to +true+ if this element has any attributes set, false
@@ -586,7 +570,7 @@ module REXML
# the attribute is added to the list of Element attributes. If String,
# the argument is used as the name of the new attribute, and the value
# parameter must be supplied.
- # value::
+ # value::
# Required if +key+ is a String, and ignored if the first argument is
# an Attribute. This is a String, and is used as the value
# of the new Attribute. This should be the unnormalized value of the
@@ -621,7 +605,7 @@ module REXML
# either an Attribute or a String. In either case, the
# attribute is found by matching the attribute name to the argument,
# and then removed. If no attribute is found, no action is taken.
- # Returns::
+ # Returns::
# the attribute removed, or nil if this Element did not contain
# a matching attribute
# e = Element.new('E')
@@ -638,7 +622,7 @@ module REXML
# Other Utilities #
#################################################
- # Get an array of all CData children.
+ # Get an array of all CData children.
# IMMUTABLE
def cdatas
find_all { |child| child.kind_of? CData }.freeze
@@ -681,17 +665,16 @@ module REXML
# Internet Explorer is the worst piece of crap to have ever been
# written, with the possible exception of Windows itself. Since IE is
# unable to parse proper XML, we have to provide a hack to generate XML
- # that IE's limited abilities can handle. This hack inserts a space
+ # that IE's limited abilities can handle. This hack inserts a space
# before the /> on empty tags. Defaults to false
#
# out = ''
# doc.write( out ) #-> doc is written to the string 'out'
# doc.write( $stdout ) #-> doc written to the console
- def write(output=$stdout, indent=-1, transitive=false, ie_hack=false)
+ def write(writer=$stdout, indent=-1, transitive=false, ie_hack=false)
Kernel.warn("#{self.class.name}.write is deprecated. See REXML::Formatters")
formatter = if indent > -1
if transitive
- require "rexml/formatters/transitive"
REXML::Formatters::Transitive.new( indent, ie_hack )
else
REXML::Formatters::Pretty.new( indent, ie_hack )
@@ -707,8 +690,8 @@ module REXML
def __to_xpath_helper node
rv = node.expanded_name.clone
if node.parent
- results = node.parent.find_all {|n|
- n.kind_of?(REXML::Element) and n.expanded_name == node.expanded_name
+ results = node.parent.find_all {|n|
+ n.kind_of?(REXML::Element) and n.expanded_name == node.expanded_name
}
if results.length > 1
idx = results.index( node )
@@ -721,6 +704,7 @@ module REXML
# A private helper method
def each_with_something( test, max=0, name=nil )
num = 0
+ child=nil
@elements.each( name ){ |child|
yield child if test.call(child) and num += 1
return if max>0 and num == max
@@ -734,7 +718,7 @@ module REXML
# A class which provides filtering of children for Elements, and
# XPath search support. You are expected to only encounter this class as
- # the <tt>element.elements</tt> object. Therefore, you are
+ # the <tt>element.elements</tt> object. Therefore, you are
# _not_ expected to instantiate this yourself.
class Elements
include Enumerable
@@ -746,7 +730,7 @@ module REXML
# Fetches a child element. Filters only Element children, regardless of
# the XPath match.
- # index::
+ # index::
# the search parameter. This is either an Integer, which
# will be used to find the index'th child Element, or an XPath,
# which will be used to search for the Element. <em>Because
@@ -756,7 +740,7 @@ module REXML
# child element is at index 1, not 0, and the +n+th element is at index
# +n+, not <tt>n-1</tt>. This is because XPath indexes element children
# starting from 1, not 0, and the indexes should be the same.
- # name::
+ # name::
# optional, and only used in the first argument is an
# Integer. In that case, the index'th child Element that has the
# supplied name will be returned. Note again that the indexes start at 1.
@@ -770,14 +754,15 @@ module REXML
raise "index (#{index}) must be >= 1" if index < 1
name = literalize(name) if name
num = 0
+ child = nil
@element.find { |child|
child.kind_of? Element and
- (name.nil? ? true : child.has_name?( name )) and
+ (name.nil? ? true : child.has_name?( name )) and
(num += 1) == index
}
else
return XPath::first( @element, index )
- #{ |element|
+ #{ |element|
# return element if element.kind_of? Element
#}
#return nil
@@ -787,7 +772,7 @@ module REXML
# Sets an element, replacing any previous matching element. If no
# existing element is found ,the element is added.
# index:: Used to find a matching element to replace. See []().
- # element::
+ # element::
# The element to replace the existing element with
# the previous element
# Returns:: nil if no previous element was found.
@@ -812,12 +797,12 @@ module REXML
@element.find{ |child| child.kind_of? Element}.nil?
end
- # Returns the index of the supplied child (starting at 1), or -1 if
+ # Returns the index of the supplied child (starting at 1), or -1 if
# the element is not a child
# element:: an +Element+ child
def index element
rv = 0
- found = @element.find do |child|
+ found = @element.find do |child|
child.kind_of? Element and
(rv += 1) and
child == element
@@ -827,7 +812,7 @@ module REXML
end
# Deletes a child Element
- # element::
+ # element::
# Either an Element, which is removed directly; an
# xpath, where the first matching child is removed; or an Integer,
# where the n'th Element is removed.
@@ -854,7 +839,7 @@ module REXML
# deleted = doc.elements.delete_all 'a/c' #-> [<c/>, <c/>, <c/>, <c/>]
def delete_all( xpath )
rv = []
- XPath::each( @element, xpath) {|element|
+ XPath::each( @element, xpath) {|element|
rv << element if element.kind_of? Element
}
rv.each do |element|
@@ -865,7 +850,7 @@ module REXML
end
# Adds an element
- # element::
+ # element::
# if supplied, is either an Element, String, or
# Source (see Element.initialize). If not supplied or nil, a
# new, default Element will be constructed
@@ -890,8 +875,8 @@ module REXML
# Iterates through all of the child Elements, optionally filtering
# them by a given XPath
- # xpath::
- # optional. If supplied, this is a String XPath, and is used to
+ # xpath::
+ # optional. If supplied, this is a String XPath, and is used to
# filter the children, so that only matching children are yielded. Note
# that XPaths are automatically filtered for Elements, so that
# non-Element children will not be yielded
@@ -908,8 +893,8 @@ module REXML
def collect( xpath=nil, &block )
collection = []
- XPath::each( @element, xpath ) {|e|
- collection << yield(e) if e.kind_of?(Element)
+ XPath::each( @element, xpath ) {|e|
+ collection << yield(e) if e.kind_of?(Element)
}
collection
end
@@ -944,7 +929,7 @@ module REXML
# supplied XPath matches non-Element children.
# doc = Document.new '<a>sean<b/>elliott<c/></a>'
# doc.root.elements.to_a #-> [ <b/>, <c/> ]
- # doc.root.elements.to_a("child::node()") #-> [ <b/>, <c/> ]
+ # doc.root.elements.to_a("child::node()") #-> [ <b/>, <c/> ]
# XPath.match(doc.root, "child::node()") #-> [ sean, <b/>, elliott, <c/> ]
def to_a( xpath=nil )
rv = XPath.match( @element, xpath )
@@ -964,7 +949,7 @@ module REXML
# ATTRIBUTES #
########################################################################
- # A class that defines the set of Attributes of an Element and provides
+ # A class that defines the set of Attributes of an Element and provides
# operations for accessing elements in that set.
class Attributes < Hash
# Constructor
@@ -976,11 +961,11 @@ module REXML
# Fetches an attribute value. If you want to get the Attribute itself,
# use get_attribute()
# name:: an XPath attribute name. Namespaces are relevant here.
- # Returns::
+ # Returns::
# the String value of the matching attribute, or +nil+ if no
# matching attribute was found. This is the unnormalized value
# (with entities expanded).
- #
+ #
# doc = Document.new "<a foo:att='1' bar:att='2' att='&lt;'/>"
# doc.root.attributes['att'] #-> '<'
# doc.root.attributes['bar:att'] #-> '2'
@@ -1006,7 +991,7 @@ module REXML
# Iterates over the attributes of an Element. Yields actual Attribute
# nodes, not String values.
- #
+ #
# doc = Document.new '<a x="1" y="2"/>'
# doc.root.attributes.each_attribute {|attr|
# p attr.expanded_name+" => "+attr.value
@@ -1028,12 +1013,12 @@ module REXML
# doc.root.attributes.each {|name, value| p name+" => "+value }
def each
each_attribute do |attr|
- yield [attr.expanded_name, attr.value]
+ yield attr.expanded_name, attr.value
end
end
# Fetches an attribute
- # name::
+ # name::
# the name by which to search for the attribute. Can be a
# <tt>prefix:name</tt> namespace name.
# Returns:: The first matching attribute, or nil if there was none. This
@@ -1077,10 +1062,10 @@ module REXML
# Sets an attribute, overwriting any existing attribute value by the
# same name. Namespace is significant.
# name:: the name of the attribute
- # value::
+ # value::
# (optional) If supplied, the value of the attribute. If
# nil, any existing matching attribute is deleted.
- # Returns::
+ # Returns::
# Owning element
# doc = Document.new "<a x:foo='1' foo='3'/>"
# doc.root.attributes['y:foo'] = '2'
@@ -1109,13 +1094,13 @@ module REXML
old_attr[value.prefix] = value
elsif old_attr.prefix != value.prefix
# Check for conflicting namespaces
- raise ParseException.new(
+ raise ParseException.new(
"Namespace conflict in adding attribute \"#{value.name}\": "+
"Prefix \"#{old_attr.prefix}\" = "+
"\"#{@element.namespace(old_attr.prefix)}\" and prefix "+
- "\"#{value.prefix}\" = \"#{@element.namespace(value.prefix)}\"") if
+ "\"#{value.prefix}\" = \"#{@element.namespace(value.prefix)}\"") if
value.prefix != "xmlns" and old_attr.prefix != "xmlns" and
- @element.namespace( old_attr.prefix ) ==
+ @element.namespace( old_attr.prefix ) ==
@element.namespace( value.prefix )
store value.name, { old_attr.prefix => old_attr,
value.prefix => value }
@@ -1125,7 +1110,7 @@ module REXML
return @element
end
- # Returns an array of Strings containing all of the prefixes declared
+ # Returns an array of Strings containing all of the prefixes declared
# by this set of # attributes. The array does not include the default
# namespace declaration, if one exists.
# doc = Document.new("<a xmlns='foo' xmlns:x='bar' xmlns:y='twee' "+
@@ -1164,7 +1149,7 @@ module REXML
end
# Removes an attribute
- # attribute::
+ # attribute::
# either a String, which is the name of the attribute to remove --
# namespaces are significant here -- or the attribute to remove.
# Returns:: the owning element
@@ -1212,12 +1197,12 @@ module REXML
alias :<< :add
# Deletes all attributes matching a name. Namespaces are significant.
- # name::
+ # name::
# A String; all attributes that match this path will be removed
# Returns:: an Array of the Attributes that were removed
def delete_all( name )
rv = []
- each_attribute { |attribute|
+ each_attribute { |attribute|
rv << attribute if attribute.expanded_name == name
}
rv.each{ |attr| attr.remove }
@@ -1227,20 +1212,16 @@ module REXML
# The +get_attribute_ns+ method retrieves a method by its namespace
# and name. Thus it is possible to reliably identify an attribute
# even if an XML processor has changed the prefix.
- #
+ #
# Method contributed by Henrik Martensson
def get_attribute_ns(namespace, name)
- result = nil
each_attribute() { |attribute|
if name == attribute.name &&
- namespace == attribute.namespace() &&
- ( !namespace.empty? || !attribute.fully_expanded_name.index(':') )
- # foo will match xmlns:foo, but only if foo isn't also an attribute
- result = attribute if !result or !namespace.empty? or
- !attribute.fully_expanded_name.index(':')
+ namespace == attribute.namespace()
+ return attribute
end
}
- result
+ nil
end
end
end
diff --git a/lib/rexml/encoding.rb b/lib/rexml/encoding.rb
index 3feffb80f4..a01763be99 100644
--- a/lib/rexml/encoding.rb
+++ b/lib/rexml/encoding.rb
@@ -29,7 +29,7 @@ module REXML
if enc and enc != UTF_8
@encoding = enc
raise ArgumentError, "Bad encoding name #@encoding" unless @encoding =~ /^[\w-]+$/
- @encoding.untaint
+ @encoding.untaint
begin
require 'rexml/encodings/ICONV.rb'
Encoding.apply(self, "ICONV")
@@ -56,14 +56,14 @@ module REXML
def check_encoding str
# We have to recognize UTF-16, LSB UTF-16, and UTF-8
- if str[0,2] == "\xfe\xff"
+ if str[0] == 0xfe && str[1] == 0xff
str[0,2] = ""
return UTF_16
- elsif str[0,2] == "\xff\xfe"
+ elsif str[0] == 0xff && str[1] == 0xfe
str[0,2] = ""
return UNILE
end
- str =~ /^\s*<\?xml\s+version\s*=\s*(['"]).*?\1\s+encoding\s*=\s*(["'])(.*?)\2/m
+ str =~ /^\s*<\?xml\s+version\s*=\s*(['"]).*?\1\s+encoding\s*=\s*(["'])(.*?)\2/um
return $3.upcase if $3
return UTF_8
end
diff --git a/lib/rexml/encodings/CP-1252.rb b/lib/rexml/encodings/CP-1252.rb
index 587c5bdd68..8675f9ff98 100644
--- a/lib/rexml/encodings/CP-1252.rb
+++ b/lib/rexml/encodings/CP-1252.rb
@@ -3,12 +3,12 @@
#
module REXML
module Encoding
- register( "CP-1252" ) do |o|
- class << o
- alias encode encode_cp1252
- alias decode decode_cp1252
- end
- end
+ register( "CP-1252" ) do |o|
+ class << o
+ alias encode encode_cp1252
+ alias decode decode_cp1252
+ end
+ end
# Convert from UTF-8
def encode_cp1252(content)
@@ -58,7 +58,7 @@ module REXML
end
array_enc.pack('C*')
end
-
+
# Convert to UTF-8
def decode_cp1252(str)
array_latin9 = str.unpack('C*')
diff --git a/lib/rexml/encodings/ISO-8859-15.rb b/lib/rexml/encodings/ISO-8859-15.rb
index 08a19cb755..8dea0d38a4 100644
--- a/lib/rexml/encodings/ISO-8859-15.rb
+++ b/lib/rexml/encodings/ISO-8859-15.rb
@@ -3,10 +3,10 @@
#
module REXML
module Encoding
- register("ISO-8859-15") do |o|
- alias encode to_iso_8859_15
+ register("ISO-8859-15") do |o|
+ alias encode to_iso_8859_15
alias decode from_iso_8859_15
- end
+ end
# Convert from UTF-8
def to_iso_8859_15(content)
@@ -46,7 +46,7 @@ module REXML
end
array_enc.pack('C*')
end
-
+
# Convert to UTF-8
def from_iso_8859_15(str)
array_latin9 = str.unpack('C*')
diff --git a/lib/rexml/encodings/UNILE.rb b/lib/rexml/encodings/UNILE.rb
index 1a18f0c932..d054140c40 100644
--- a/lib/rexml/encodings/UNILE.rb
+++ b/lib/rexml/encodings/UNILE.rb
@@ -18,7 +18,7 @@ module REXML
def decode_unile(str)
array_enc=str.unpack('C*')
array_utf8 = []
- 0.step(array_enc.size-1, 2){|i|
+ 0.step(array_enc.size-1, 2){|i|
array_utf8 << (array_enc.at(i) + array_enc.at(i+1)*0x100)
}
array_utf8.pack('U*')
diff --git a/lib/rexml/encodings/UTF-16.rb b/lib/rexml/encodings/UTF-16.rb
index 2ec058eed5..007c493d9c 100644
--- a/lib/rexml/encodings/UTF-16.rb
+++ b/lib/rexml/encodings/UTF-16.rb
@@ -19,7 +19,7 @@ module REXML
str = str[2..-1] if /^\376\377/n =~ str
array_enc=str.unpack('C*')
array_utf8 = []
- 0.step(array_enc.size-1, 2){|i|
+ 0.step(array_enc.size-1, 2){|i|
array_utf8 << (array_enc.at(i+1) + array_enc.at(i)*0x100)
}
array_utf8.pack('U*')
diff --git a/lib/rexml/entity.rb b/lib/rexml/entity.rb
index 5e3edf4eeb..ff2d45f39b 100644
--- a/lib/rexml/entity.rb
+++ b/lib/rexml/entity.rb
@@ -3,164 +3,163 @@ require 'rexml/source'
require 'rexml/xmltokens'
module REXML
- # God, I hate DTDs. I really do. Why this idiot standard still
- # plagues us is beyond me.
- class Entity < Child
- include XMLTokens
- PUBIDCHAR = "\x20\x0D\x0Aa-zA-Z0-9\\-()+,./:=?;!*@$_%#"
- SYSTEMLITERAL = %Q{((?:"[^"]*")|(?:'[^']*'))}
- PUBIDLITERAL = %Q{("[#{PUBIDCHAR}']*"|'[#{PUBIDCHAR}]*')}
- EXTERNALID = "(?:(?:(SYSTEM)\\s+#{SYSTEMLITERAL})|(?:(PUBLIC)\\s+#{PUBIDLITERAL}\\s+#{SYSTEMLITERAL}))"
- NDATADECL = "\\s+NDATA\\s+#{NAME}"
- PEREFERENCE = "%#{NAME};"
- ENTITYVALUE = %Q{((?:"(?:[^%&"]|#{PEREFERENCE}|#{REFERENCE})*")|(?:'([^%&']|#{PEREFERENCE}|#{REFERENCE})*'))}
- PEDEF = "(?:#{ENTITYVALUE}|#{EXTERNALID})"
- ENTITYDEF = "(?:#{ENTITYVALUE}|(?:#{EXTERNALID}(#{NDATADECL})?))"
- PEDECL = "<!ENTITY\\s+(%)\\s+#{NAME}\\s+#{PEDEF}\\s*>"
- GEDECL = "<!ENTITY\\s+#{NAME}\\s+#{ENTITYDEF}\\s*>"
- ENTITYDECL = /\s*(?:#{GEDECL})|(?:#{PEDECL})/um
+ # God, I hate DTDs. I really do. Why this idiot standard still
+ # plagues us is beyond me.
+ class Entity < Child
+ include XMLTokens
+ PUBIDCHAR = "\x20\x0D\x0Aa-zA-Z0-9\\-()+,./:=?;!*@$_%#"
+ SYSTEMLITERAL = %Q{((?:"[^"]*")|(?:'[^']*'))}
+ PUBIDLITERAL = %Q{("[#{PUBIDCHAR}']*"|'[#{PUBIDCHAR}]*')}
+ EXTERNALID = "(?:(?:(SYSTEM)\\s+#{SYSTEMLITERAL})|(?:(PUBLIC)\\s+#{PUBIDLITERAL}\\s+#{SYSTEMLITERAL}))"
+ NDATADECL = "\\s+NDATA\\s+#{NAME}"
+ PEREFERENCE = "%#{NAME};"
+ ENTITYVALUE = %Q{((?:"(?:[^%&"]|#{PEREFERENCE}|#{REFERENCE})*")|(?:'([^%&']|#{PEREFERENCE}|#{REFERENCE})*'))}
+ PEDEF = "(?:#{ENTITYVALUE}|#{EXTERNALID})"
+ ENTITYDEF = "(?:#{ENTITYVALUE}|(?:#{EXTERNALID}(#{NDATADECL})?))"
+ PEDECL = "<!ENTITY\\s+(%)\\s+#{NAME}\\s+#{PEDEF}\\s*>"
+ GEDECL = "<!ENTITY\\s+#{NAME}\\s+#{ENTITYDEF}\\s*>"
+ ENTITYDECL = /\s*(?:#{GEDECL})|(?:#{PEDECL})/um
- attr_reader :name, :external, :ref, :ndata, :pubid
+ attr_reader :name, :external, :ref, :ndata, :pubid
- # Create a new entity. Simple entities can be constructed by passing a
- # name, value to the constructor; this creates a generic, plain entity
- # reference. For anything more complicated, you have to pass a Source to
- # the constructor with the entity definiton, or use the accessor methods.
- # +WARNING+: There is no validation of entity state except when the entity
- # is read from a stream. If you start poking around with the accessors,
- # you can easily create a non-conformant Entity. The best thing to do is
- # dump the stupid DTDs and use XMLSchema instead.
- #
- # e = Entity.new( 'amp', '&' )
- def initialize stream, value=nil, parent=nil, reference=false
- super(parent)
- @ndata = @pubid = @value = @external = nil
- if stream.kind_of? Array
- @name = stream[1]
- if stream[-1] == '%'
- @reference = true
- stream.pop
- else
- @reference = false
- end
- if stream[2] =~ /SYSTEM|PUBLIC/
- @external = stream[2]
- if @external == 'SYSTEM'
- @ref = stream[3]
- @ndata = stream[4] if stream.size == 5
- else
- @pubid = stream[3]
- @ref = stream[4]
- end
- else
- @value = stream[2]
- end
- else
- @reference = reference
- @external = nil
- @name = stream
- @value = value
- end
- end
+ # Create a new entity. Simple entities can be constructed by passing a
+ # name, value to the constructor; this creates a generic, plain entity
+ # reference. For anything more complicated, you have to pass a Source to
+ # the constructor with the entity definiton, or use the accessor methods.
+ # +WARNING+: There is no validation of entity state except when the entity
+ # is read from a stream. If you start poking around with the accessors,
+ # you can easily create a non-conformant Entity. The best thing to do is
+ # dump the stupid DTDs and use XMLSchema instead.
+ #
+ # e = Entity.new( 'amp', '&' )
+ def initialize stream, value=nil, parent=nil, reference=false
+ super(parent)
+ @ndata = @pubid = @value = @external = nil
+ if stream.kind_of? Array
+ @name = stream[1]
+ if stream[-1] == '%'
+ @reference = true
+ stream.pop
+ else
+ @reference = false
+ end
+ if stream[2] =~ /SYSTEM|PUBLIC/
+ @external = stream[2]
+ if @external == 'SYSTEM'
+ @ref = stream[3]
+ @ndata = stream[4] if stream.size == 5
+ else
+ @pubid = stream[3]
+ @ref = stream[4]
+ end
+ else
+ @value = stream[2]
+ end
+ else
+ @reference = reference
+ @external = nil
+ @name = stream
+ @value = value
+ end
+ end
- # Evaluates whether the given string matchs an entity definition,
- # returning true if so, and false otherwise.
- def Entity::matches? string
- (ENTITYDECL =~ string) == 0
- end
+ # Evaluates whether the given string matchs an entity definition,
+ # returning true if so, and false otherwise.
+ def Entity::matches? string
+ (ENTITYDECL =~ string) == 0
+ end
- # Evaluates to the unnormalized value of this entity; that is, replacing
- # all entities -- both %ent; and &ent; entities. This differs from
- # +value()+ in that +value+ only replaces %ent; entities.
- def unnormalized
- document.record_entity_expansion unless document.nil?
- v = value()
- return nil if v.nil?
- @unnormalized = Text::unnormalize(v, parent)
- @unnormalized
- end
+ # Evaluates to the unnormalized value of this entity; that is, replacing
+ # all entities -- both %ent; and &ent; entities. This differs from
+ # +value()+ in that +value+ only replaces %ent; entities.
+ def unnormalized
+ v = value()
+ return nil if v.nil?
+ @unnormalized = Text::unnormalize(v, parent)
+ @unnormalized
+ end
- #once :unnormalized
+ #once :unnormalized
- # Returns the value of this entity unprocessed -- raw. This is the
- # normalized value; that is, with all %ent; and &ent; entities intact
- def normalized
- @value
- end
+ # Returns the value of this entity unprocessed -- raw. This is the
+ # normalized value; that is, with all %ent; and &ent; entities intact
+ def normalized
+ @value
+ end
- # Write out a fully formed, correct entity definition (assuming the Entity
- # object itself is valid.)
+ # Write out a fully formed, correct entity definition (assuming the Entity
+ # object itself is valid.)
#
# out::
# An object implementing <TT>&lt;&lt;<TT> to which the entity will be
# output
# indent::
# *DEPRECATED* and ignored
- def write out, indent=-1
- out << '<!ENTITY '
- out << '% ' if @reference
- out << @name
- out << ' '
- if @external
- out << @external << ' '
- if @pubid
- q = @pubid.include?('"')?"'":'"'
- out << q << @pubid << q << ' '
- end
- q = @ref.include?('"')?"'":'"'
- out << q << @ref << q
- out << ' NDATA ' << @ndata if @ndata
- else
- q = @value.include?('"')?"'":'"'
- out << q << @value << q
- end
- out << '>'
- end
+ def write out, indent=-1
+ out << '<!ENTITY '
+ out << '% ' if @reference
+ out << @name
+ out << ' '
+ if @external
+ out << @external << ' '
+ if @pubid
+ q = @pubid.include?('"')?"'":'"'
+ out << q << @pubid << q << ' '
+ end
+ q = @ref.include?('"')?"'":'"'
+ out << q << @ref << q
+ out << ' NDATA ' << @ndata if @ndata
+ else
+ q = @value.include?('"')?"'":'"'
+ out << q << @value << q
+ end
+ out << '>'
+ end
- # Returns this entity as a string. See write().
- def to_s
- rv = ''
- write rv
- rv
- end
+ # Returns this entity as a string. See write().
+ def to_s
+ rv = ''
+ write rv
+ rv
+ end
- PEREFERENCE_RE = /#{PEREFERENCE}/um
- # Returns the value of this entity. At the moment, only internal entities
- # are processed. If the value contains internal references (IE,
- # %blah;), those are replaced with their values. IE, if the doctype
- # contains:
- # <!ENTITY % foo "bar">
- # <!ENTITY yada "nanoo %foo; nanoo>
- # then:
- # doctype.entity('yada').value #-> "nanoo bar nanoo"
- def value
- if @value
- matches = @value.scan(PEREFERENCE_RE)
- rv = @value.clone
- if @parent
- matches.each do |entity_reference|
- entity_value = @parent.entity( entity_reference[0] )
- rv.gsub!( /%#{entity_reference.join};/um, entity_value )
- end
- end
- return rv
- end
- nil
- end
- end
+ PEREFERENCE_RE = /#{PEREFERENCE}/um
+ # Returns the value of this entity. At the moment, only internal entities
+ # are processed. If the value contains internal references (IE,
+ # %blah;), those are replaced with their values. IE, if the doctype
+ # contains:
+ # <!ENTITY % foo "bar">
+ # <!ENTITY yada "nanoo %foo; nanoo>
+ # then:
+ # doctype.entity('yada').value #-> "nanoo bar nanoo"
+ def value
+ if @value
+ matches = @value.scan(PEREFERENCE_RE)
+ rv = @value.clone
+ if @parent
+ matches.each do |entity_reference|
+ entity_value = @parent.entity( entity_reference[0] )
+ rv.gsub!( /%#{entity_reference};/um, entity_value )
+ end
+ end
+ return rv
+ end
+ nil
+ end
+ end
- # This is a set of entity constants -- the ones defined in the XML
- # specification. These are +gt+, +lt+, +amp+, +quot+ and +apos+.
- module EntityConst
- # +>+
- GT = Entity.new( 'gt', '>' )
- # +<+
- LT = Entity.new( 'lt', '<' )
- # +&+
- AMP = Entity.new( 'amp', '&' )
- # +"+
- QUOT = Entity.new( 'quot', '"' )
- # +'+
- APOS = Entity.new( 'apos', "'" )
- end
+ # This is a set of entity constants -- the ones defined in the XML
+ # specification. These are +gt+, +lt+, +amp+, +quot+ and +apos+.
+ module EntityConst
+ # +>+
+ GT = Entity.new( 'gt', '>' )
+ # +<+
+ LT = Entity.new( 'lt', '<' )
+ # +&+
+ AMP = Entity.new( 'amp', '&' )
+ # +"+
+ QUOT = Entity.new( 'quot', '"' )
+ # +'+
+ APOS = Entity.new( 'apos', "'" )
+ end
end
diff --git a/lib/rexml/formatters/default.rb b/lib/rexml/formatters/default.rb
index 56a1d93783..77381bdf84 100644
--- a/lib/rexml/formatters/default.rb
+++ b/lib/rexml/formatters/default.rb
@@ -21,7 +21,7 @@ module REXML
def write( node, output )
case node
- when Document
+ when Document
if node.xml_decl.encoding != "UTF-8" && !output.kind_of?(Output)
output = Output.new( output, node.xml_decl.encoding )
end
@@ -63,14 +63,14 @@ module REXML
def write_element( node, output )
output << "<#{node.expanded_name}"
- node.attributes.to_a.sort_by {|attr| attr.name}.each do |attr|
+ node.attributes.each_attribute do |attr|
output << " "
attr.write( output )
end unless node.attributes.empty?
if node.children.empty?
output << " " if @ie_hack
- output << "/"
+ output << "/"
else
output << ">"
node.children.each { |child|
diff --git a/lib/rexml/formatters/pretty.rb b/lib/rexml/formatters/pretty.rb
index 17d217d1dc..d21175d34a 100644
--- a/lib/rexml/formatters/pretty.rb
+++ b/lib/rexml/formatters/pretty.rb
@@ -31,7 +31,6 @@ module REXML
@level = 0
@ie_hack = ie_hack
@width = 80
- @compact = false
end
protected
@@ -48,7 +47,7 @@ module REXML
if @ie_hack
output << " "
end
- output << "/"
+ output << "/"
else
output << ">"
# If compact and all children are text, and if the formatted output
@@ -129,7 +128,6 @@ module REXML
# Recursively wrap string at width.
return string if string.length <= width
place = string.rindex(' ', width) # Position in string with last ' ' before cutoff
- return string if place.nil?
return string[0,place] + "\n" + wrap(string[place+1..-1], width)
end
diff --git a/lib/rexml/formatters/transitive.rb b/lib/rexml/formatters/transitive.rb
index 3a52e03f01..1d80f21fbb 100644
--- a/lib/rexml/formatters/transitive.rb
+++ b/lib/rexml/formatters/transitive.rb
@@ -12,10 +12,9 @@ module REXML
# formatted. Since this formatter does not alter whitespace nodes, the
# results of formatting already formatted XML will be odd.
class Transitive < Default
- def initialize( indentation=2, ie_hack=false )
+ def initialize( indentation=2 )
@indentation = indentation
@level = 0
- @ie_hack = ie_hack
end
protected
@@ -30,8 +29,7 @@ module REXML
output << "\n"
output << ' '*@level
if node.children.empty?
- output << " " if @ie_hack
- output << "/"
+ output << "/"
else
output << ">"
# If compact and all children are text, and if the formatted output
diff --git a/lib/rexml/functions.rb b/lib/rexml/functions.rb
index 2d30e5fe92..fefc9ef940 100644
--- a/lib/rexml/functions.rb
+++ b/lib/rexml/functions.rb
@@ -48,7 +48,7 @@ module REXML
# UNTESTED
def Functions::local_name( node_set=nil )
get_namespace( node_set ) do |node|
- return node.local_name
+ return node.local_name
end
end
@@ -57,7 +57,7 @@ module REXML
end
def Functions::name( node_set=nil )
- get_namespace( node_set ) do |node|
+ get_namespace( node_set ) do |node|
node.expanded_name
end
end
@@ -66,7 +66,7 @@ module REXML
def Functions::get_namespace( node_set = nil )
if node_set == nil
yield @@context[:node] if defined? @@context[:node].namespace
- else
+ else
if node_set.respond_to? :each
node_set.each { |node| yield node if defined? node.namespace }
elsif node_set.respond_to? :namespace
@@ -81,15 +81,15 @@ module REXML
#
# A number is converted to a string as follows
#
- # NaN is converted to the string NaN
+ # NaN is converted to the string NaN
#
- # positive zero is converted to the string 0
+ # positive zero is converted to the string 0
#
- # negative zero is converted to the string 0
+ # negative zero is converted to the string 0
#
- # positive infinity is converted to the string Infinity
+ # positive infinity is converted to the string Infinity
#
- # negative infinity is converted to the string -Infinity
+ # negative infinity is converted to the string -Infinity
#
# if the number is an integer, the number is represented in decimal form
# as a Number with no decimal point and no leading zeros, preceded by a
@@ -156,7 +156,7 @@ module REXML
string(string).include?(string(test))
end
- # Kouhei fixed this
+ # Kouhei fixed this
def Functions::substring_before( string, test )
ruby_string = string(string)
ruby_index = ruby_string.index(string(test))
@@ -166,7 +166,7 @@ module REXML
ruby_string[ 0...ruby_index ]
end
end
-
+
# Kouhei fixed this too
def Functions::substring_after( string, test )
ruby_string = string(string)
@@ -175,11 +175,11 @@ module REXML
""
end
- # Take equal portions of Mike Stok and Sean Russell; mix
+ # Take equal portions of Mike Stok and Sean Russell; mix
# vigorously, and pour into a tall, chilled glass. Serves 10,000.
def Functions::substring( string, start, length=nil )
ruby_string = string(string)
- ruby_length = if length.nil?
+ ruby_length = if length.nil?
ruby_string.length.to_f
else
number(length)
@@ -188,15 +188,15 @@ module REXML
# Handle the special cases
return '' if (
- ruby_length.nan? or
+ ruby_length.nan? or
ruby_start.nan? or
ruby_start.infinite?
)
infinite_length = ruby_length.infinite? == 1
ruby_length = ruby_string.length if infinite_length
-
- # Now, get the bounds. The XPath bounds are 1..length; the ruby bounds
+
+ # Now, get the bounds. The XPath bounds are 1..length; the ruby bounds
# are 0..length. Therefore, we have to offset the bounds by one.
ruby_start = ruby_start.round - 1
ruby_length = ruby_length.round
@@ -247,7 +247,7 @@ module REXML
0.upto(from.length - 1) { |pos|
from_char = from[pos]
unless map.has_key? from_char
- map[from_char] =
+ map[from_char] =
if pos < to.length
to[pos]
else
@@ -256,15 +256,9 @@ module REXML
end
}
- if ''.respond_to? :chars
- string(string).chars.collect { |c|
- if map.has_key? c then map[c] else c end
- }.compact.join
- else
- string(string).unpack('U*').collect { |c|
- if map.has_key? c then map[c] else c end
- }.compact.pack('U*')
- end
+ string(string).unpack('U*').collect { |c|
+ if map.has_key? c then map[c] else c end
+ }.compact.pack('U*')
end
# UNTESTED
@@ -359,7 +353,7 @@ module REXML
nodes = [nodes] unless nodes.kind_of? Array
nodes.inject(0) { |r,n| r += number(string(n)) }
end
-
+
def Functions::floor( number )
number(number).floor
end
diff --git a/lib/rexml/instruction.rb b/lib/rexml/instruction.rb
index f8b734a5b5..c16b894b4a 100644
--- a/lib/rexml/instruction.rb
+++ b/lib/rexml/instruction.rb
@@ -2,62 +2,62 @@ require "rexml/child"
require "rexml/source"
module REXML
- # Represents an XML Instruction; IE, <? ... ?>
- # TODO: Add parent arg (3rd arg) to constructor
- class Instruction < Child
- START = '<\?'
- STOP = '\?>'
+ # Represents an XML Instruction; IE, <? ... ?>
+ # TODO: Add parent arg (3rd arg) to constructor
+ class Instruction < Child
+ START = '<\?'
+ STOP = '\?>'
- # target is the "name" of the Instruction; IE, the "tag" in <?tag ...?>
- # content is everything else.
- attr_accessor :target, :content
+ # target is the "name" of the Instruction; IE, the "tag" in <?tag ...?>
+ # content is everything else.
+ attr_accessor :target, :content
- # Constructs a new Instruction
- # @param target can be one of a number of things. If String, then
- # the target of this instruction is set to this. If an Instruction,
- # then the Instruction is shallowly cloned (target and content are
- # copied). If a Source, then the source is scanned and parsed for
- # an Instruction declaration.
- # @param content Must be either a String, or a Parent. Can only
- # be a Parent if the target argument is a Source. Otherwise, this
- # String is set as the content of this instruction.
- def initialize(target, content=nil)
- if target.kind_of? String
- super()
- @target = target
- @content = content
- elsif target.kind_of? Instruction
- super(content)
- @target = target.target
- @content = target.content
- end
- @content.strip! if @content
- end
-
- def clone
- Instruction.new self
- end
+ # Constructs a new Instruction
+ # @param target can be one of a number of things. If String, then
+ # the target of this instruction is set to this. If an Instruction,
+ # then the Instruction is shallowly cloned (target and content are
+ # copied). If a Source, then the source is scanned and parsed for
+ # an Instruction declaration.
+ # @param content Must be either a String, or a Parent. Can only
+ # be a Parent if the target argument is a Source. Otherwise, this
+ # String is set as the content of this instruction.
+ def initialize(target, content=nil)
+ if target.kind_of? String
+ super()
+ @target = target
+ @content = content
+ elsif target.kind_of? Instruction
+ super(content)
+ @target = target.target
+ @content = target.content
+ end
+ @content.strip! if @content
+ end
+ def clone
+ Instruction.new self
+ end
+
# == DEPRECATED
# See the rexml/formatters package
#
- def write writer, indent=-1, transitive=false, ie_hack=false
+ def write writer, indent=-1, transitive=false, ie_hack=false
Kernel.warn( "#{self.class.name}.write is deprecated" )
- indent(writer, indent)
- writer << START.sub(/\\/u, '')
- writer << @target
- writer << ' '
- writer << @content
- writer << STOP.sub(/\\/u, '')
- end
+ indent(writer, indent)
+ writer << START.sub(/\\/u, '')
+ writer << @target
+ writer << ' '
+ writer << @content
+ writer << STOP.sub(/\\/u, '')
+ end
- # @return true if other is an Instruction, and the content and target
- # of the other matches the target and content of this object.
- def ==( other )
- other.kind_of? Instruction and
- other.target == @target and
- other.content == @content
- end
+ # @return true if other is an Instruction, and the content and target
+ # of the other matches the target and content of this object.
+ def ==( other )
+ other.kind_of? Instruction and
+ other.target == @target and
+ other.content == @content
+ end
def node_type
:processing_instruction
@@ -66,5 +66,5 @@ module REXML
def inspect
"<?p-i #{target} ...?>"
end
- end
+ end
end
diff --git a/lib/rexml/light/node.rb b/lib/rexml/light/node.rb
index 9c90148c05..943ec5f1a0 100644
--- a/lib/rexml/light/node.rb
+++ b/lib/rexml/light/node.rb
@@ -2,195 +2,195 @@ require 'rexml/xmltokens'
require 'rexml/light/node'
# [ :element, parent, name, attributes, children* ]
- # a = Node.new
- # a << "B" # => <a>B</a>
- # a.b # => <a>B<b/></a>
- # a.b[1] # => <a>B<b/><b/><a>
- # a.b[1]["x"] = "y" # => <a>B<b/><b x="y"/></a>
- # a.b[0].c # => <a>B<b><c/></b><b x="y"/></a>
- # a.b.c << "D" # => <a>B<b><c>D</c></b><b x="y"/></a>
+ # a = Node.new
+ # a << "B" # => <a>B</a>
+ # a.b # => <a>B<b/></a>
+ # a.b[1] # => <a>B<b/><b/><a>
+ # a.b[1]["x"] = "y" # => <a>B<b/><b x="y"/></a>
+ # a.b[0].c # => <a>B<b><c/></b><b x="y"/></a>
+ # a.b.c << "D" # => <a>B<b><c>D</c></b><b x="y"/></a>
module REXML
- module Light
- # Represents a tagged XML element. Elements are characterized by
- # having children, attributes, and names, and can themselves be
- # children.
- class Node
- NAMESPLIT = /^(?:(#{XMLTokens::NCNAME_STR}):)?(#{XMLTokens::NCNAME_STR})/u
- PARENTS = [ :element, :document, :doctype ]
- # Create a new element.
- def initialize node=nil
- @node = node
- if node.kind_of? String
- node = [ :text, node ]
- elsif node.nil?
- node = [ :document, nil, nil ]
- elsif node[0] == :start_element
- node[0] = :element
- elsif node[0] == :start_doctype
- node[0] = :doctype
- elsif node[0] == :start_document
- node[0] = :document
- end
- end
-
- def size
- if PARENTS.include? @node[0]
- @node[-1].size
- else
- 0
- end
- end
-
- def each( &block )
- size.times { |x| yield( at(x+4) ) }
- end
-
- def name
- at(2)
- end
-
- def name=( name_str, ns=nil )
- pfx = ''
- pfx = "#{prefix(ns)}:" if ns
- _old_put(2, "#{pfx}#{name_str}")
- end
-
- def parent=( node )
- _old_put(1,node)
- end
-
- def local_name
- namesplit
- @name
- end
-
- def local_name=( name_str )
- _old_put( 1, "#@prefix:#{name_str}" )
- end
-
- def prefix( namespace=nil )
- prefix_of( self, namespace )
- end
-
- def namespace( prefix=prefix() )
- namespace_of( self, prefix )
- end
-
- def namespace=( namespace )
- @prefix = prefix( namespace )
- pfx = ''
- pfx = "#@prefix:" if @prefix.size > 0
- _old_put(1, "#{pfx}#@name")
- end
-
- def []( reference, ns=nil )
- if reference.kind_of? String
- pfx = ''
- pfx = "#{prefix(ns)}:" if ns
- at(3)["#{pfx}#{reference}"]
- elsif reference.kind_of? Range
- _old_get( Range.new(4+reference.begin, reference.end, reference.exclude_end?) )
- else
- _old_get( 4+reference )
- end
- end
-
- def =~( path )
- XPath.match( self, path )
- end
-
- # Doesn't handle namespaces yet
- def []=( reference, ns, value=nil )
- if reference.kind_of? String
- value = ns unless value
- at( 3 )[reference] = value
- elsif reference.kind_of? Range
- _old_put( Range.new(3+reference.begin, reference.end, reference.exclude_end?), ns )
- else
- if value
- _old_put( 4+reference, ns, value )
- else
- _old_put( 4+reference, ns )
- end
- end
- end
-
- # Append a child to this element, optionally under a provided namespace.
- # The namespace argument is ignored if the element argument is an Element
- # object. Otherwise, the element argument is a string, the namespace (if
- # provided) is the namespace the element is created in.
- def << element
- if node_type() == :text
- at(-1) << element
- else
- newnode = Node.new( element )
- newnode.parent = self
- self.push( newnode )
- end
- at(-1)
- end
-
- def node_type
- _old_get(0)
- end
-
- def text=( foo )
- replace = at(4).kind_of?(String)? 1 : 0
- self._old_put(4,replace, normalizefoo)
- end
-
- def root
- context = self
- context = context.at(1) while context.at(1)
- end
-
- def has_name?( name, namespace = '' )
- at(3) == name and namespace() == namespace
- end
-
- def children
- self
- end
-
- def parent
- at(1)
- end
-
- def to_s
-
- end
-
- private
-
- def namesplit
- return if @name.defined?
- at(2) =~ NAMESPLIT
- @prefix = '' || $1
- @name = $2
- end
-
- def namespace_of( node, prefix=nil )
- if not prefix
- name = at(2)
- name =~ NAMESPLIT
- prefix = $1
- end
- to_find = 'xmlns'
- to_find = "xmlns:#{prefix}" if not prefix.nil?
- ns = at(3)[ to_find ]
- ns ? ns : namespace_of( @node[0], prefix )
- end
-
- def prefix_of( node, namespace=nil )
- if not namespace
- name = node.name
- name =~ NAMESPLIT
- $1
- else
- ns = at(3).find { |k,v| v == namespace }
- ns ? ns : prefix_of( node.parent, namespace )
- end
- end
- end
- end
+ module Light
+ # Represents a tagged XML element. Elements are characterized by
+ # having children, attributes, and names, and can themselves be
+ # children.
+ class Node
+ NAMESPLIT = /^(?:(#{XMLTokens::NCNAME_STR}):)?(#{XMLTokens::NCNAME_STR})/u
+ PARENTS = [ :element, :document, :doctype ]
+ # Create a new element.
+ def initialize node=nil
+ @node = node
+ if node.kind_of? String
+ node = [ :text, node ]
+ elsif node.nil?
+ node = [ :document, nil, nil ]
+ elsif node[0] == :start_element
+ node[0] = :element
+ elsif node[0] == :start_doctype
+ node[0] = :doctype
+ elsif node[0] == :start_document
+ node[0] = :document
+ end
+ end
+
+ def size
+ if PARENTS.include? @node[0]
+ @node[-1].size
+ else
+ 0
+ end
+ end
+
+ def each( &block )
+ size.times { |x| yield( at(x+4) ) }
+ end
+
+ def name
+ at(2)
+ end
+
+ def name=( name_str, ns=nil )
+ pfx = ''
+ pfx = "#{prefix(ns)}:" if ns
+ _old_put(2, "#{pfx}#{name_str}")
+ end
+
+ def parent=( node )
+ _old_put(1,node)
+ end
+
+ def local_name
+ namesplit
+ @name
+ end
+
+ def local_name=( name_str )
+ _old_put( 1, "#@prefix:#{name_str}" )
+ end
+
+ def prefix( namespace=nil )
+ prefix_of( self, namespace )
+ end
+
+ def namespace( prefix=prefix() )
+ namespace_of( self, prefix )
+ end
+
+ def namespace=( namespace )
+ @prefix = prefix( namespace )
+ pfx = ''
+ pfx = "#@prefix:" if @prefix.size > 0
+ _old_put(1, "#{pfx}#@name")
+ end
+
+ def []( reference, ns=nil )
+ if reference.kind_of? String
+ pfx = ''
+ pfx = "#{prefix(ns)}:" if ns
+ at(3)["#{pfx}#{reference}"]
+ elsif reference.kind_of? Range
+ _old_get( Range.new(4+reference.begin, reference.end, reference.exclude_end?) )
+ else
+ _old_get( 4+reference )
+ end
+ end
+
+ def =~( path )
+ XPath.match( self, path )
+ end
+
+ # Doesn't handle namespaces yet
+ def []=( reference, ns, value=nil )
+ if reference.kind_of? String
+ value = ns unless value
+ at( 3 )[reference] = value
+ elsif reference.kind_of? Range
+ _old_put( Range.new(3+reference.begin, reference.end, reference.exclude_end?), ns )
+ else
+ if value
+ _old_put( 4+reference, ns, value )
+ else
+ _old_put( 4+reference, ns )
+ end
+ end
+ end
+
+ # Append a child to this element, optionally under a provided namespace.
+ # The namespace argument is ignored if the element argument is an Element
+ # object. Otherwise, the element argument is a string, the namespace (if
+ # provided) is the namespace the element is created in.
+ def << element
+ if node_type() == :text
+ at(-1) << element
+ else
+ newnode = Node.new( element )
+ newnode.parent = self
+ self.push( newnode )
+ end
+ at(-1)
+ end
+
+ def node_type
+ _old_get(0)
+ end
+
+ def text=( foo )
+ replace = at(4).kind_of?(String)? 1 : 0
+ self._old_put(4,replace, normalizefoo)
+ end
+
+ def root
+ context = self
+ context = context.at(1) while context.at(1)
+ end
+
+ def has_name?( name, namespace = '' )
+ at(3) == name and namespace() == namespace
+ end
+
+ def children
+ self
+ end
+
+ def parent
+ at(1)
+ end
+
+ def to_s
+
+ end
+
+ private
+
+ def namesplit
+ return if @name.defined?
+ at(2) =~ NAMESPLIT
+ @prefix = '' || $1
+ @name = $2
+ end
+
+ def namespace_of( node, prefix=nil )
+ if not prefix
+ name = at(2)
+ name =~ NAMESPLIT
+ prefix = $1
+ end
+ to_find = 'xmlns'
+ to_find = "xmlns:#{prefix}" if not prefix.nil?
+ ns = at(3)[ to_find ]
+ ns ? ns : namespace_of( @node[0], prefix )
+ end
+
+ def prefix_of( node, namespace=nil )
+ if not namespace
+ name = node.name
+ name =~ NAMESPLIT
+ $1
+ else
+ ns = at(3).find { |k,v| v == namespace }
+ ns ? ns : prefix_of( node.parent, namespace )
+ end
+ end
+ end
+ end
end
diff --git a/lib/rexml/namespace.rb b/lib/rexml/namespace.rb
index aeb339ee83..3e8790580b 100644
--- a/lib/rexml/namespace.rb
+++ b/lib/rexml/namespace.rb
@@ -1,47 +1,47 @@
require 'rexml/xmltokens'
module REXML
- # Adds named attributes to an object.
- module Namespace
- # The name of the object, valid if set
- attr_reader :name, :expanded_name
- # The expanded name of the object, valid if name is set
- attr_accessor :prefix
- include XMLTokens
- NAMESPLIT = /^(?:(#{NCNAME_STR}):)?(#{NCNAME_STR})/u
+ # Adds named attributes to an object.
+ module Namespace
+ # The name of the object, valid if set
+ attr_reader :name, :expanded_name
+ # The expanded name of the object, valid if name is set
+ attr_accessor :prefix
+ include XMLTokens
+ NAMESPLIT = /^(?:(#{NCNAME_STR}):)?(#{NCNAME_STR})/u
- # Sets the name and the expanded name
- def name=( name )
- @expanded_name = name
- name =~ NAMESPLIT
- if $1
- @prefix = $1
- else
- @prefix = ""
- @namespace = ""
- end
- @name = $2
- end
+ # Sets the name and the expanded name
+ def name=( name )
+ @expanded_name = name
+ name =~ NAMESPLIT
+ if $1
+ @prefix = $1
+ else
+ @prefix = ""
+ @namespace = ""
+ end
+ @name = $2
+ end
- # Compares names optionally WITH namespaces
- def has_name?( other, ns=nil )
- if ns
- return (namespace() == ns and name() == other)
- elsif other.include? ":"
- return fully_expanded_name == other
- else
- return name == other
- end
- end
+ # Compares names optionally WITH namespaces
+ def has_name?( other, ns=nil )
+ if ns
+ return (namespace() == ns and name() == other)
+ elsif other.include? ":"
+ return fully_expanded_name == other
+ else
+ return name == other
+ end
+ end
- alias :local_name :name
+ alias :local_name :name
- # Fully expand the name, even if the prefix wasn't specified in the
- # source file.
- def fully_expanded_name
- ns = prefix
- return "#{ns}:#@name" if ns.size > 0
- return @name
- end
- end
+ # Fully expand the name, even if the prefix wasn't specified in the
+ # source file.
+ def fully_expanded_name
+ ns = prefix
+ return "#{ns}:#@name" if ns.size > 0
+ return @name
+ end
+ end
end
diff --git a/lib/rexml/node.rb b/lib/rexml/node.rb
index 85457f1ad0..d5e8456e53 100644
--- a/lib/rexml/node.rb
+++ b/lib/rexml/node.rb
@@ -3,27 +3,27 @@ require "rexml/formatters/pretty"
require "rexml/formatters/default"
module REXML
- # Represents a node in the tree. Nodes are never encountered except as
- # superclasses of other objects. Nodes have siblings.
- module Node
- # @return the next sibling (nil if unset)
- def next_sibling_node
- return nil if @parent.nil?
- @parent[ @parent.index(self) + 1 ]
- end
+ # Represents a node in the tree. Nodes are never encountered except as
+ # superclasses of other objects. Nodes have siblings.
+ module Node
+ # @return the next sibling (nil if unset)
+ def next_sibling_node
+ return nil if @parent.nil?
+ @parent[ @parent.index(self) + 1 ]
+ end
- # @return the previous sibling (nil if unset)
- def previous_sibling_node
- return nil if @parent.nil?
- ind = @parent.index(self)
- return nil if ind == 0
- @parent[ ind - 1 ]
- end
+ # @return the previous sibling (nil if unset)
+ def previous_sibling_node
+ return nil if @parent.nil?
+ ind = @parent.index(self)
+ return nil if ind == 0
+ @parent[ ind - 1 ]
+ end
# indent::
# *DEPRECATED* This parameter is now ignored. See the formatters in the
# REXML::Formatters package for changing the output style.
- def to_s indent=nil
+ def to_s indent=nil
unless indent.nil?
Kernel.warn( "#{self.class.name}.to_s(indent) parameter is deprecated" )
f = REXML::Formatters::Pretty.new( indent )
@@ -33,33 +33,33 @@ module REXML
f.write( self, rv = "" )
end
return rv
- end
+ end
- def indent to, ind
+ def indent to, ind
if @parent and @parent.context and not @parent.context[:indentstyle].nil? then
indentstyle = @parent.context[:indentstyle]
else
indentstyle = ' '
end
to << indentstyle*ind unless ind<1
- end
+ end
- def parent?
- false;
- end
+ def parent?
+ false;
+ end
- # Visit all subnodes of +self+ recursively
- def each_recursive(&block) # :yields: node
- self.elements.each {|node|
- block.call(node)
- node.each_recursive(&block)
- }
- end
+ # Visit all subnodes of +self+ recursively
+ def each_recursive(&block) # :yields: node
+ self.elements.each {|node|
+ block.call(node)
+ node.each_recursive(&block)
+ }
+ end
- # Find (and return) first subnode (recursively) for which the block
+ # Find (and return) first subnode (recursively) for which the block
# evaluates to true. Returns +nil+ if none was found.
- def find_first_recursive(&block) # :yields: node
+ def find_first_recursive(&block) # :yields: node
each_recursive {|node|
return node if block.call(node)
}
@@ -71,5 +71,5 @@ module REXML
def index_in_parent
parent.index(self)+1
end
- end
+ end
end
diff --git a/lib/rexml/output.rb b/lib/rexml/output.rb
index b7f17b9dff..be4d23d42d 100644
--- a/lib/rexml/output.rb
+++ b/lib/rexml/output.rb
@@ -1,24 +1,24 @@
require 'rexml/encoding'
module REXML
- class Output
- include Encoding
-
+ class Output
+ include Encoding
+
attr_reader :encoding
- def initialize real_IO, encd="iso-8859-1"
- @output = real_IO
- self.encoding = encd
+ def initialize real_IO, encd="iso-8859-1"
+ @output = real_IO
+ self.encoding = encd
- @to_utf = encd == UTF_8 ? false : true
- end
+ @to_utf = encd == UTF_8 ? false : true
+ end
- def <<( content )
- @output << (@to_utf ? self.encode(content) : content)
- end
+ def <<( content )
+ @output << (@to_utf ? self.encode(content) : content)
+ end
def to_s
"Output[#{encoding}]"
end
- end
+ end
end
diff --git a/lib/rexml/parent.rb b/lib/rexml/parent.rb
index 7ed1761654..a20aaaef6b 100644
--- a/lib/rexml/parent.rb
+++ b/lib/rexml/parent.rb
@@ -6,14 +6,14 @@ module REXML
# object.
class Parent < Child
include Enumerable
-
+
# Constructor
# @param parent if supplied, will be set as the parent of this object
def initialize parent=nil
super(parent)
@children = []
end
-
+
def add( object )
#puts "PARENT GOTS #{size} CHILDREN"
object.parent = self
@@ -21,47 +21,47 @@ module REXML
#puts "PARENT NOW GOTS #{size} CHILDREN"
object
end
-
+
alias :push :add
alias :<< :push
-
+
def unshift( object )
object.parent = self
@children.unshift object
end
-
+
def delete( object )
found = false
@children.delete_if {|c| c.equal?(object) and found = true }
object.parent = nil if found
end
-
+
def each(&block)
@children.each(&block)
end
-
+
def delete_if( &block )
@children.delete_if(&block)
end
-
+
def delete_at( index )
@children.delete_at index
end
-
+
def each_index( &block )
@children.each_index(&block)
end
-
+
# Fetches a child at a given index
# @param index the Integer index of the child to fetch
def []( index )
@children[index]
end
-
+
alias :each_child :each
-
-
-
+
+
+
# Set an index entry. See Array.[]=
# @param index the index of the element to set
# @param opt either the object to set, or an Integer length
@@ -71,7 +71,7 @@ module REXML
args[-1].parent = self
@children[*args[0..-2]] = args[-1]
end
-
+
# Inserts an child before another child
# @param child1 this is either an xpath or an Element. If an Element,
# child2 will be inserted before child1 in the child list of the parent.
@@ -91,7 +91,7 @@ module REXML
end
self
end
-
+
# Inserts an child after another child
# @param child1 this is either an xpath or an Element. If an Element,
# child2 will be inserted after child1 in the child list of the parent.
@@ -111,11 +111,11 @@ module REXML
end
self
end
-
+
def to_a
@children.dup
end
-
+
# Fetches the index of a given child
# @param child the child to get the index of
# @return the index of the child, or nil if the object is not a child
@@ -125,24 +125,24 @@ module REXML
@children.find { |i| count += 1 ; i.hash == child.hash }
count
end
-
+
# @return the number of children of this parent
def size
@children.size
end
-
+
alias :length :size
-
+
# Replaces one child with another, making sure the nodelist is correct
# @param to_replace the child to replace (must be a Child)
- # @param replacement the child to insert into the nodelist (must be a
+ # @param replacement the child to insert into the nodelist (must be a
# Child)
def replace_child( to_replace, replacement )
@children.map! {|c| c.equal?( to_replace ) ? replacement : c }
to_replace.parent = nil
replacement.parent = self
end
-
+
# Deeply clones this object. This creates a complete duplicate of this
# Parent, including all descendants.
def deep_clone
@@ -156,9 +156,9 @@ module REXML
end
cl
end
-
+
alias :children :to_a
-
+
def parent?
true
end
diff --git a/lib/rexml/parseexception.rb b/lib/rexml/parseexception.rb
index 0481f72818..feb7a7e638 100644
--- a/lib/rexml/parseexception.rb
+++ b/lib/rexml/parseexception.rb
@@ -30,7 +30,7 @@ module REXML
err << "Last 80 unconsumed characters:\n"
err << @source.buffer[0..80].gsub(/\n/, ' ')
end
-
+
err
end
@@ -40,12 +40,12 @@ module REXML
end
def line
- @source.current_line[2] if @source and defined? @source.current_line and
+ @source.current_line[2] if @source and defined? @source.current_line and
@source.current_line
end
def context
@source.current_line
end
- end
+ end
end
diff --git a/lib/rexml/parsers/baseparser.rb b/lib/rexml/parsers/baseparser.rb
index 2f758265bb..fc2354a67f 100644
--- a/lib/rexml/parsers/baseparser.rb
+++ b/lib/rexml/parsers/baseparser.rb
@@ -25,20 +25,7 @@ module REXML
#
# Nat Price gave me some good ideas for the API.
class BaseParser
- if String.method_defined? :encode
- # Oniguruma / POSIX [understands unicode]
- LETTER = '[[:alpha:]]'
- DIGIT = '[[:digit:]]'
- else
- # Ruby < 1.9 [doesn't understand unicode]
- LETTER = 'a-zA-Z'
- DIGIT = '\d'
- end
-
- COMBININGCHAR = '' # TODO
- EXTENDER = '' # TODO
-
- NCNAME_STR= "[#{LETTER}_:][-#{LETTER}#{DIGIT}._:#{COMBININGCHAR}#{EXTENDER}]*"
+ NCNAME_STR= '[\w:][\-\w\d.]*'
NAME_STR= "(?:(#{NCNAME_STR}):)?(#{NCNAME_STR})"
UNAME_STR= "(?:#{NCNAME_STR}:)?#{NCNAME_STR}"
@@ -46,7 +33,7 @@ module REXML
NAME = "([\\w:]#{NAMECHAR}*)"
NMTOKEN = "(?:#{NAMECHAR})+"
NMTOKENS = "#{NMTOKEN}(\\s+#{NMTOKEN})*"
- REFERENCE = "&(?:#{NAME};|#\\d+;|#x[0-9a-fA-F]+;)"
+ REFERENCE = "(?:&#{NAME};|&#\\d+;|&#x[0-9a-fA-F]+;)"
REFERENCE_RE = /#{REFERENCE}/
DOCTYPE_START = /\A\s*<!DOCTYPE\s/um
@@ -105,11 +92,11 @@ module REXML
EREFERENCE = /&(?!#{NAME};)/
- DEFAULT_ENTITIES = {
- 'gt' => [/&gt;/, '&gt;', '>', />/],
- 'lt' => [/&lt;/, '&lt;', '<', /</],
- 'quot' => [/&quot;/, '&quot;', '"', /"/],
- "apos" => [/&apos;/, "&apos;", "'", /'/]
+ DEFAULT_ENTITIES = {
+ 'gt' => [/&gt;/, '&gt;', '>', />/],
+ 'lt' => [/&lt;/, '&lt;', '<', /</],
+ 'quot' => [/&quot;/, '&quot;', '"', /"/],
+ "apos" => [/&apos;/, "&apos;", "'", /'/]
}
@@ -180,9 +167,9 @@ module REXML
# Peek at the +depth+ event in the stack. The first element on the stack
# is at depth 0. If +depth+ is -1, will parse to the end of the input
# stream and return the last event, which is always :end_document.
- # Be aware that this causes the stream to be parsed up to the +depth+
- # event, so you can effectively pre-parse the entire document (pull the
- # entire thing into memory) using this method.
+ # Be aware that this causes the stream to be parsed up to the +depth+
+ # event, so you can effectively pre-parse the entire document (pull the
+ # entire thing into memory) using this method.
def peek depth=0
raise %Q[Illegal argument "#{depth}"] if depth < -1
temp = []
@@ -255,17 +242,12 @@ module REXML
@document_status = :after_doctype
@source.read if @source.buffer.size<2
md = @source.match(/\s*/um, true)
- if @source.encoding == "UTF-8"
- if @source.buffer.respond_to? :force_encoding
- @source.buffer.force_encoding(Encoding::UTF_8)
- end
- end
end
end
if @document_status == :in_doctype
md = @source.match(/\s*(.*?>)/um)
case md[1]
- when SYSTEMENTITY
+ when SYSTEMENTITY
match = @source.match( SYSTEMENTITY, true )[1]
return [ :externalentity, match ]
@@ -344,7 +326,7 @@ module REXML
#md = @source.match_to_consume( '>', CLOSE_MATCH)
md = @source.match( CLOSE_MATCH, true )
raise REXML::ParseException.new( "Missing end tag for "+
- "'#{last_tag}' (got \"#{md[1]}\")",
+ "'#{last_tag}' (got \"#{md[1]}\")",
@source) unless last_tag == md[1]
return [ :end_element, last_tag ]
elsif @source.buffer[1] == ?!
@@ -353,12 +335,6 @@ module REXML
raise REXML::ParseException.new("Malformed node", @source) unless md
if md[0][2] == ?-
md = @source.match( COMMENT_PATTERN, true )
-
- case md[1]
- when /--/, /-$/
- raise REXML::ParseException.new("Malformed comment", @source)
- end
-
return [ :comment, md[1] ] if md
else
md = @source.match( CDATA_PATTERN, true )
@@ -377,7 +353,7 @@ module REXML
unless md
# Check for missing attribute quotes
raise REXML::ParseException.new("missing attribute quote", @source) if @source.match(MISSING_ATTRIBUTE_QUOTES )
- raise REXML::ParseException.new("malformed XML: missing tag start", @source)
+ raise REXML::ParseException.new("malformed XML: missing tag start", @source)
end
attributes = {}
prefixes = Set.new
@@ -386,7 +362,7 @@ module REXML
if md[4].size > 0
attrs = md[4].scan( ATTRIBUTE_PATTERN )
raise REXML::ParseException.new( "error parsing attributes: [#{attrs.join ', '}], excess = \"#$'\"", @source) if $' and $'.strip.size > 0
- attrs.each { |a,b,c,d,e|
+ attrs.each { |a,b,c,d,e|
if b == "xmlns"
if c == "xml"
if d != "http://www.w3.org/XML/1998/namespace"
@@ -403,16 +379,10 @@ module REXML
elsif b
prefixes << b unless b == "xml"
end
-
- if attributes.has_key? a
- msg = "Duplicate attribute #{a.inspect}"
- raise REXML::ParseException.new( msg, @source, self)
- end
-
- attributes[a] = e
+ attributes[a] = e
}
end
-
+
# Verify that all of the prefixes have been defined
for prefix in prefixes
unless @nsstack.find{|k| k.member?(prefix)}
@@ -466,7 +436,7 @@ module REXML
# Doing it like this rather than in a loop improves the speed
copy.gsub!( EREFERENCE, '&amp;' )
entities.each do |key, value|
- copy.gsub!( value, "&#{key};" ) unless entity_filter and
+ copy.gsub!( value, "&#{key};" ) unless entity_filter and
entity_filter.include?(entity)
end if entities
copy.gsub!( EREFERENCE, '&amp;' )
@@ -482,7 +452,7 @@ module REXML
rv.gsub!( /\r\n?/, "\n" )
matches = rv.scan( REFERENCE_RE )
return rv if matches.size == 0
- rv.gsub!( /&#0*((?:\d+)|(?:x[a-fA-F0-9]+));/ ) {
+ rv.gsub!( /&#0*((?:\d+)|(?:x[a-fA-F0-9]+));/ ) {|m|
m=$1
m = "0#{m}" if m[0] == ?x
[Integer(m)].pack('U*')
@@ -495,12 +465,15 @@ module REXML
if entity_value
re = /&#{entity_reference};/
rv.gsub!( re, entity_value )
- else
- er = DEFAULT_ENTITIES[entity_reference]
- rv.gsub!( er[0], er[2] ) if er
end
end
end
+ matches.each do |entity_reference|
+ unless filter and filter.include?(entity_reference)
+ er = DEFAULT_ENTITIES[entity_reference]
+ rv.gsub!( er[0], er[2] ) if er
+ end
+ end
rv.gsub!( /&amp;/, '&' )
end
rv
diff --git a/lib/rexml/parsers/lightparser.rb b/lib/rexml/parsers/lightparser.rb
index ca9692c449..0f35034993 100644
--- a/lib/rexml/parsers/lightparser.rb
+++ b/lib/rexml/parsers/lightparser.rb
@@ -3,12 +3,12 @@ require 'rexml/parsers/baseparser'
require 'rexml/light/node'
module REXML
- module Parsers
- class LightParser
- def initialize stream
- @stream = stream
- @parser = REXML::Parsers::BaseParser.new( stream )
- end
+ module Parsers
+ class LightParser
+ def initialize stream
+ @stream = stream
+ @parser = REXML::Parsers::BaseParser.new( stream )
+ end
def add_listener( listener )
@parser.add_listener( listener )
@@ -19,40 +19,42 @@ module REXML
@parser.stream = @stream
end
- def parse
- root = context = [ :document ]
- while true
- event = @parser.pull
- case event[0]
- when :end_document
- break
- when :start_element, :start_doctype
- new_node = event
- context << new_node
- new_node[1,0] = [context]
- context = new_node
- when :end_element, :end_doctype
- context = context[1]
- else
- new_node = event
- context << new_node
- new_node[1,0] = [context]
- end
- end
- root
- end
- end
+ def parse
+ root = context = [ :document ]
+ while true
+ event = @parser.pull
+ case event[0]
+ when :end_document
+ break
+ when :end_doctype
+ context = context[1]
+ when :start_element, :start_doctype
+ new_node = event
+ context << new_node
+ new_node[1,0] = [context]
+ context = new_node
+ when :end_element, :end_doctype
+ context = context[1]
+ else
+ new_node = event
+ context << new_node
+ new_node[1,0] = [context]
+ end
+ end
+ root
+ end
+ end
- # An element is an array. The array contains:
- # 0 The parent element
- # 1 The tag name
- # 2 A hash of attributes
- # 3..-1 The child elements
- # An element is an array of size > 3
- # Text is a String
- # PIs are [ :processing_instruction, target, data ]
- # Comments are [ :comment, data ]
- # DocTypes are DocType structs
- # The root is an array with XMLDecls, Text, DocType, Array, Text
- end
+ # An element is an array. The array contains:
+ # 0 The parent element
+ # 1 The tag name
+ # 2 A hash of attributes
+ # 3..-1 The child elements
+ # An element is an array of size > 3
+ # Text is a String
+ # PIs are [ :processing_instruction, target, data ]
+ # Comments are [ :comment, data ]
+ # DocTypes are DocType structs
+ # The root is an array with XMLDecls, Text, DocType, Array, Text
+ end
end
diff --git a/lib/rexml/parsers/pullparser.rb b/lib/rexml/parsers/pullparser.rb
index 68a4ff7eae..36dc7160c3 100644
--- a/lib/rexml/parsers/pullparser.rb
+++ b/lib/rexml/parsers/pullparser.rb
@@ -68,7 +68,7 @@ module REXML
event = @parser.pull
case event[0]
when :entitydecl
- @entities[ event[1] ] =
+ @entities[ event[1] ] =
event[2] unless event[2] =~ /PUBLIC|SYSTEM/
when :text
unnormalized = @parser.unnormalize( event[1], @entities )
diff --git a/lib/rexml/parsers/sax2parser.rb b/lib/rexml/parsers/sax2parser.rb
index d0f0c5155e..e402eb7747 100644
--- a/lib/rexml/parsers/sax2parser.rb
+++ b/lib/rexml/parsers/sax2parser.rb
@@ -4,171 +4,162 @@ require 'rexml/namespace'
require 'rexml/text'
module REXML
- module Parsers
+ module Parsers
# SAX2Parser
- class SAX2Parser
- def initialize source
- @parser = BaseParser.new(source)
- @listeners = []
- @procs = []
- @namespace_stack = []
- @has_listeners = false
- @tag_stack = []
+ class SAX2Parser
+ def initialize source
+ @parser = BaseParser.new(source)
+ @listeners = []
+ @procs = []
+ @namespace_stack = []
+ @has_listeners = false
+ @tag_stack = []
@entities = {}
- end
+ end
def source
@parser.source
end
-
+
def add_listener( listener )
@parser.add_listener( listener )
end
- # Listen arguments:
- #
- # Symbol, Array, Block
- # Listen to Symbol events on Array elements
- # Symbol, Block
- # Listen to Symbol events
- # Array, Listener
- # Listen to all events on Array elements
- # Array, Block
- # Listen to :start_element events on Array elements
- # Listener
- # Listen to All events
- #
- # Symbol can be one of: :start_element, :end_element,
- # :start_prefix_mapping, :end_prefix_mapping, :characters,
- # :processing_instruction, :doctype, :attlistdecl, :elementdecl,
- # :entitydecl, :notationdecl, :cdata, :xmldecl, :comment
+ # Listen arguments:
+ #
+ # Symbol, Array, Block
+ # Listen to Symbol events on Array elements
+ # Symbol, Block
+ # Listen to Symbol events
+ # Array, Listener
+ # Listen to all events on Array elements
+ # Array, Block
+ # Listen to :start_element events on Array elements
+ # Listener
+ # Listen to All events
+ #
+ # Symbol can be one of: :start_element, :end_element,
+ # :start_prefix_mapping, :end_prefix_mapping, :characters,
+ # :processing_instruction, :doctype, :attlistdecl, :elementdecl,
+ # :entitydecl, :notationdecl, :cdata, :xmldecl, :comment
#
# There is an additional symbol that can be listened for: :progress.
- # This will be called for every event generated, passing in the current
+ # This will be called for every event generated, passing in the current
# stream position.
- #
- # Array contains regular expressions or strings which will be matched
- # against fully qualified element names.
- #
- # Listener must implement the methods in SAX2Listener
- #
- # Block will be passed the same arguments as a SAX2Listener method would
- # be, where the method name is the same as the matched Symbol.
- # See the SAX2Listener for more information.
- def listen( *args, &blok )
- if args[0].kind_of? Symbol
- if args.size == 2
- args[1].each { |match| @procs << [args[0], match, blok] }
- else
- add( [args[0], nil, blok] )
- end
- elsif args[0].kind_of? Array
- if args.size == 2
- args[0].each { |match| add( [nil, match, args[1]] ) }
- else
- args[0].each { |match| add( [ :start_element, match, blok ] ) }
- end
- else
- add([nil, nil, args[0]])
- end
- end
-
- def deafen( listener=nil, &blok )
- if listener
- @listeners.delete_if {|item| item[-1] == listener }
- @has_listeners = false if @listeners.size == 0
- else
- @procs.delete_if {|item| item[-1] == blok }
- end
- end
-
- def parse
- @procs.each { |sym,match,block| block.call if sym == :start_document }
- @listeners.each { |sym,match,block|
- block.start_document if sym == :start_document or sym.nil?
- }
- root = context = []
- while true
- event = @parser.pull
- case event[0]
- when :end_document
- handle( :end_document )
- break
+ #
+ # Array contains regular expressions or strings which will be matched
+ # against fully qualified element names.
+ #
+ # Listener must implement the methods in SAX2Listener
+ #
+ # Block will be passed the same arguments as a SAX2Listener method would
+ # be, where the method name is the same as the matched Symbol.
+ # See the SAX2Listener for more information.
+ def listen( *args, &blok )
+ if args[0].kind_of? Symbol
+ if args.size == 2
+ args[1].each { |match| @procs << [args[0], match, blok] }
+ else
+ add( [args[0], nil, blok] )
+ end
+ elsif args[0].kind_of? Array
+ if args.size == 2
+ args[0].each { |match| add( [nil, match, args[1]] ) }
+ else
+ args[0].each { |match| add( [ :start_element, match, blok ] ) }
+ end
+ else
+ add([nil, nil, args[0]])
+ end
+ end
+
+ def deafen( listener=nil, &blok )
+ if listener
+ @listeners.delete_if {|item| item[-1] == listener }
+ @has_listeners = false if @listeners.size == 0
+ else
+ @procs.delete_if {|item| item[-1] == blok }
+ end
+ end
+
+ def parse
+ @procs.each { |sym,match,block| block.call if sym == :start_document }
+ @listeners.each { |sym,match,block|
+ block.start_document if sym == :start_document or sym.nil?
+ }
+ root = context = []
+ while true
+ event = @parser.pull
+ case event[0]
+ when :end_document
+ handle( :end_document )
+ break
when :start_doctype
handle( :doctype, *event[1..-1])
- when :end_doctype
- context = context[1]
- when :start_element
- @tag_stack.push(event[1])
- # find the observers for namespaces
- procs = get_procs( :start_prefix_mapping, event[1] )
- listeners = get_listeners( :start_prefix_mapping, event[1] )
- if procs or listeners
- # break out the namespace declarations
- # The attributes live in event[2]
- event[2].each {|n, v| event[2][n] = @parser.normalize(v)}
- nsdecl = event[2].find_all { |n, value| n =~ /^xmlns(:|$)/ }
- nsdecl.collect! { |n, value| [ n[6..-1], value ] }
- @namespace_stack.push({})
- nsdecl.each do |n,v|
- @namespace_stack[-1][n] = v
- # notify observers of namespaces
- procs.each { |ob| ob.call( n, v ) } if procs
- listeners.each { |ob| ob.start_prefix_mapping(n, v) } if listeners
- end
- end
- event[1] =~ Namespace::NAMESPLIT
- prefix = $1
- local = $2
- uri = get_namespace(prefix)
- # find the observers for start_element
- procs = get_procs( :start_element, event[1] )
- listeners = get_listeners( :start_element, event[1] )
- # notify observers
- procs.each { |ob| ob.call( uri, local, event[1], event[2] ) } if procs
- listeners.each { |ob|
- ob.start_element( uri, local, event[1], event[2] )
- } if listeners
- when :end_element
- @tag_stack.pop
- event[1] =~ Namespace::NAMESPLIT
- prefix = $1
- local = $2
- uri = get_namespace(prefix)
- # find the observers for start_element
- procs = get_procs( :end_element, event[1] )
- listeners = get_listeners( :end_element, event[1] )
- # notify observers
- procs.each { |ob| ob.call( uri, local, event[1] ) } if procs
- listeners.each { |ob|
- ob.end_element( uri, local, event[1] )
- } if listeners
+ when :end_doctype
+ context = context[1]
+ when :start_element
+ @tag_stack.push(event[1])
+ # find the observers for namespaces
+ procs = get_procs( :start_prefix_mapping, event[1] )
+ listeners = get_listeners( :start_prefix_mapping, event[1] )
+ if procs or listeners
+ # break out the namespace declarations
+ # The attributes live in event[2]
+ event[2].each {|n, v| event[2][n] = @parser.normalize(v)}
+ nsdecl = event[2].find_all { |n, value| n =~ /^xmlns(:|$)/ }
+ nsdecl.collect! { |n, value| [ n[6..-1], value ] }
+ @namespace_stack.push({})
+ nsdecl.each do |n,v|
+ @namespace_stack[-1][n] = v
+ # notify observers of namespaces
+ procs.each { |ob| ob.call( n, v ) } if procs
+ listeners.each { |ob| ob.start_prefix_mapping(n, v) } if listeners
+ end
+ end
+ event[1] =~ Namespace::NAMESPLIT
+ prefix = $1
+ local = $2
+ uri = get_namespace(prefix)
+ # find the observers for start_element
+ procs = get_procs( :start_element, event[1] )
+ listeners = get_listeners( :start_element, event[1] )
+ # notify observers
+ procs.each { |ob| ob.call( uri, local, event[1], event[2] ) } if procs
+ listeners.each { |ob|
+ ob.start_element( uri, local, event[1], event[2] )
+ } if listeners
+ when :end_element
+ @tag_stack.pop
+ event[1] =~ Namespace::NAMESPLIT
+ prefix = $1
+ local = $2
+ uri = get_namespace(prefix)
+ # find the observers for start_element
+ procs = get_procs( :end_element, event[1] )
+ listeners = get_listeners( :end_element, event[1] )
+ # notify observers
+ procs.each { |ob| ob.call( uri, local, event[1] ) } if procs
+ listeners.each { |ob|
+ ob.end_element( uri, local, event[1] )
+ } if listeners
- namespace_mapping = @namespace_stack.pop
- # find the observers for namespaces
- procs = get_procs( :end_prefix_mapping, event[1] )
- listeners = get_listeners( :end_prefix_mapping, event[1] )
- if procs or listeners
- namespace_mapping.each do |ns_prefix, ns_uri|
- # notify observers of namespaces
- procs.each { |ob| ob.call( ns_prefix ) } if procs
- listeners.each { |ob| ob.end_prefix_mapping(ns_prefix) } if listeners
- end
- end
- when :text
+ namespace_mapping = @namespace_stack.pop
+ # find the observers for namespaces
+ procs = get_procs( :end_prefix_mapping, event[1] )
+ listeners = get_listeners( :end_prefix_mapping, event[1] )
+ if procs or listeners
+ namespace_mapping.each do |prefix, uri|
+ # notify observers of namespaces
+ procs.each { |ob| ob.call( prefix ) } if procs
+ listeners.each { |ob| ob.end_prefix_mapping(prefix) } if listeners
+ end
+ end
+ when :text
#normalized = @parser.normalize( event[1] )
#handle( :characters, normalized )
copy = event[1].clone
-
- esub = proc { |match|
- if @entities.has_key?($1)
- @entities[$1].gsub(Text::REFERENCE, &esub)
- else
- match
- end
- }
-
- copy.gsub!( Text::REFERENCE, &esub )
+ @entities.each { |key, value| copy = copy.gsub("&#{key};", value) }
copy.gsub!( Text::NUMERICENTITY ) {|m|
m=$1
m = "0#{m}" if m[0] == ?x
@@ -177,71 +168,71 @@ module REXML
handle( :characters, copy )
when :entitydecl
@entities[ event[1] ] = event[2] if event.size == 3
- handle( *event )
- when :processing_instruction, :comment, :attlistdecl,
- :elementdecl, :cdata, :notationdecl, :xmldecl
- handle( *event )
- end
+ handle( *event )
+ when :processing_instruction, :comment, :attlistdecl,
+ :elementdecl, :cdata, :notationdecl, :xmldecl
+ handle( *event )
+ end
handle( :progress, @parser.position )
- end
- end
+ end
+ end
- private
- def handle( symbol, *arguments )
- tag = @tag_stack[-1]
- procs = get_procs( symbol, tag )
- listeners = get_listeners( symbol, tag )
- # notify observers
- procs.each { |ob| ob.call( *arguments ) } if procs
- listeners.each { |l|
- l.send( symbol.to_s, *arguments )
- } if listeners
- end
+ private
+ def handle( symbol, *arguments )
+ tag = @tag_stack[-1]
+ procs = get_procs( symbol, tag )
+ listeners = get_listeners( symbol, tag )
+ # notify observers
+ procs.each { |ob| ob.call( *arguments ) } if procs
+ listeners.each { |l|
+ l.send( symbol.to_s, *arguments )
+ } if listeners
+ end
- # The following methods are duplicates, but it is faster than using
- # a helper
- def get_procs( symbol, name )
- return nil if @procs.size == 0
- @procs.find_all do |sym, match, block|
+ # The following methods are duplicates, but it is faster than using
+ # a helper
+ def get_procs( symbol, name )
+ return nil if @procs.size == 0
+ @procs.find_all do |sym, match, block|
#puts sym.inspect+"=="+symbol.inspect+ "\t"+match.inspect+"=="+name.inspect+ "\t"+( (sym.nil? or symbol == sym) and ((name.nil? and match.nil?) or match.nil? or ( (name == match) or (match.kind_of? Regexp and name =~ match)))).to_s
- (
- (sym.nil? or symbol == sym) and
- ((name.nil? and match.nil?) or match.nil? or (
- (name == match) or
- (match.kind_of? Regexp and name =~ match)
- )
- )
- )
- end.collect{|x| x[-1]}
- end
- def get_listeners( symbol, name )
- return nil if @listeners.size == 0
- @listeners.find_all do |sym, match, block|
- (
- (sym.nil? or symbol == sym) and
- ((name.nil? and match.nil?) or match.nil? or (
- (name == match) or
- (match.kind_of? Regexp and name =~ match)
- )
- )
- )
- end.collect{|x| x[-1]}
- end
+ (
+ (sym.nil? or symbol == sym) and
+ ((name.nil? and match.nil?) or match.nil? or (
+ (name == match) or
+ (match.kind_of? Regexp and name =~ match)
+ )
+ )
+ )
+ end.collect{|x| x[-1]}
+ end
+ def get_listeners( symbol, name )
+ return nil if @listeners.size == 0
+ @listeners.find_all do |sym, match, block|
+ (
+ (sym.nil? or symbol == sym) and
+ ((name.nil? and match.nil?) or match.nil? or (
+ (name == match) or
+ (match.kind_of? Regexp and name =~ match)
+ )
+ )
+ )
+ end.collect{|x| x[-1]}
+ end
- def add( pair )
- if pair[-1].respond_to? :call
- @procs << pair unless @procs.include? pair
- else
- @listeners << pair unless @listeners.include? pair
- @has_listeners = true
- end
- end
+ def add( pair )
+ if pair[-1].respond_to? :call
+ @procs << pair unless @procs.include? pair
+ else
+ @listeners << pair unless @listeners.include? pair
+ @has_listeners = true
+ end
+ end
- def get_namespace( prefix )
+ def get_namespace( prefix )
uris = (@namespace_stack.find_all { |ns| not ns[prefix].nil? }) ||
- (@namespace_stack.find { |ns| not ns[nil].nil? })
- uris[-1][prefix] unless uris.nil? or 0 == uris.size
- end
- end
- end
+ (@namespace_stack.find { |ns| not ns[nil].nil? })
+ uris[-1][prefix] unless uris.nil? or 0 == uris.size
+ end
+ end
+ end
end
diff --git a/lib/rexml/parsers/streamparser.rb b/lib/rexml/parsers/streamparser.rb
index 073fcc2c21..256d0f611c 100644
--- a/lib/rexml/parsers/streamparser.rb
+++ b/lib/rexml/parsers/streamparser.rb
@@ -5,11 +5,11 @@ module REXML
@listener = listener
@parser = BaseParser.new( source )
end
-
+
def add_listener( listener )
@parser.add_listener( listener )
end
-
+
def parse
# entity string
while true
diff --git a/lib/rexml/parsers/treeparser.rb b/lib/rexml/parsers/treeparser.rb
index 7f618cb319..5c3e142ea7 100644
--- a/lib/rexml/parsers/treeparser.rb
+++ b/lib/rexml/parsers/treeparser.rb
@@ -30,10 +30,7 @@ module REXML
return
when :start_element
tag_stack.push(event[1])
- el = @build_context = @build_context.add_element( event[1] )
- event[2].each do |key, value|
- el.attributes[key]=Attribute.new(key,value,self)
- end
+ el = @build_context = @build_context.add_element( event[1], event[2] )
when :end_element
tag_stack.pop
@build_context = @build_context.parent
@@ -42,8 +39,8 @@ module REXML
if @build_context[-1].instance_of? Text
@build_context[-1] << event[1]
else
- @build_context.add(
- Text.new(event[1], @build_context.whitespace, nil, true)
+ @build_context.add(
+ Text.new(event[1], @build_context.whitespace, nil, true)
) unless (
@build_context.ignore_whitespace_nodes and
event[1].strip.size==0
diff --git a/lib/rexml/parsers/ultralightparser.rb b/lib/rexml/parsers/ultralightparser.rb
index 96c55d837e..adc4af18e2 100644
--- a/lib/rexml/parsers/ultralightparser.rb
+++ b/lib/rexml/parsers/ultralightparser.rb
@@ -2,12 +2,12 @@ require 'rexml/parsers/streamparser'
require 'rexml/parsers/baseparser'
module REXML
- module Parsers
- class UltraLightParser
- def initialize stream
- @stream = stream
- @parser = REXML::Parsers::BaseParser.new( stream )
- end
+ module Parsers
+ class UltraLightParser
+ def initialize stream
+ @stream = stream
+ @parser = REXML::Parsers::BaseParser.new( stream )
+ end
def add_listener( listener )
@parser.add_listener( listener )
@@ -18,39 +18,39 @@ module REXML
@parser.stream = @stream
end
- def parse
- root = context = []
- while true
- event = @parser.pull
- case event[0]
- when :end_document
- break
- when :end_doctype
- context = context[1]
- when :start_element, :doctype
- context << event
- event[1,0] = [context]
- context = event
- when :end_element
- context = context[1]
- else
- context << event
- end
- end
- root
- end
- end
+ def parse
+ root = context = []
+ while true
+ event = @parser.pull
+ case event[0]
+ when :end_document
+ break
+ when :end_doctype
+ context = context[1]
+ when :start_element, :doctype
+ context << event
+ event[1,0] = [context]
+ context = event
+ when :end_element
+ context = context[1]
+ else
+ context << event
+ end
+ end
+ root
+ end
+ end
- # An element is an array. The array contains:
- # 0 The parent element
- # 1 The tag name
- # 2 A hash of attributes
- # 3..-1 The child elements
- # An element is an array of size > 3
- # Text is a String
- # PIs are [ :processing_instruction, target, data ]
- # Comments are [ :comment, data ]
- # DocTypes are DocType structs
- # The root is an array with XMLDecls, Text, DocType, Array, Text
- end
+ # An element is an array. The array contains:
+ # 0 The parent element
+ # 1 The tag name
+ # 2 A hash of attributes
+ # 3..-1 The child elements
+ # An element is an array of size > 3
+ # Text is a String
+ # PIs are [ :processing_instruction, target, data ]
+ # Comments are [ :comment, data ]
+ # DocTypes are DocType structs
+ # The root is an array with XMLDecls, Text, DocType, Array, Text
+ end
end
diff --git a/lib/rexml/parsers/xpathparser.rb b/lib/rexml/parsers/xpathparser.rb
index aafa72ab9e..de2530e347 100644
--- a/lib/rexml/parsers/xpathparser.rb
+++ b/lib/rexml/parsers/xpathparser.rb
@@ -39,10 +39,10 @@ module REXML
case op
when :node
when :attribute
- string << "/" if string.size > 0
- string << "@"
+ string << "/" if string.size > 0
+ string << "@"
when :child
- string << "/" if string.size > 0
+ string << "/" if string.size > 0
when :descendant_or_self
string << "/"
when :self
@@ -51,10 +51,10 @@ module REXML
string << ".."
when :any
string << "*"
- when :text
- string << "text()"
- when :following, :following_sibling,
- :ancestor, :ancestor_or_self, :descendant,
+ when :text
+ string << "text()"
+ when :following, :following_sibling,
+ :ancestor, :ancestor_or_self, :descendant,
:namespace, :preceding, :preceding_sibling
string << "/" unless string.size == 0
string << op.to_s.tr("_", "-")
@@ -70,13 +70,13 @@ module REXML
string << ']'
when :document
document = true
- when :function
- string << path.shift
- string << "( "
- string << predicate_to_string( path.shift[0] ) {|x| abbreviate( x )}
- string << " )"
- when :literal
- string << %Q{ "#{path.shift}" }
+ when :function
+ string << path.shift
+ string << "( "
+ string << predicate_to_string( path.shift[0] ) {|x| abbreviate( x )}
+ string << " )"
+ when :literal
+ string << %Q{ "#{path.shift}" }
else
string << "/" unless string.size == 0
string << "UNKNOWN("
@@ -84,7 +84,7 @@ module REXML
string << ")"
end
end
- string = "/"+string if document
+ string = "/"+string if document
return string
end
@@ -97,7 +97,7 @@ module REXML
case op
when :node
string << "node()"
- when :attribute, :child, :following, :following_sibling,
+ when :attribute, :child, :following, :following_sibling,
:ancestor, :ancestor_or_self, :descendant, :descendant_or_self,
:namespace, :preceding, :preceding_sibling, :self, :parent
string << "/" unless string.size == 0
@@ -249,7 +249,7 @@ module REXML
parsed.concat(n)
end
-
+
if path.size > 0
if path[0] == ?/
if path[1] == ?/
@@ -332,12 +332,12 @@ module REXML
predicates << expr[1..-2] if expr
end
#puts "PREDICATES = #{predicates.inspect}"
- predicates.each{ |pred|
- #puts "ORING #{pred}"
+ predicates.each{ |expr|
+ #puts "ORING #{expr}"
preds = []
parsed << :predicate
parsed << preds
- OrExpr(pred, preds)
+ OrExpr(expr, preds)
}
#puts "PREDICATES = #{predicates.inspect}"
path
@@ -600,13 +600,13 @@ module REXML
#puts "LITERAL or NUMBER: #$1"
varname = $1.nil? ? $2 : $1
path = $'
- parsed << :literal
+ parsed << :literal
parsed << (varname.include?('.') ? varname.to_f : varname.to_i)
when LITERAL
#puts "LITERAL or NUMBER: #$1"
varname = $1.nil? ? $2 : $1
path = $'
- parsed << :literal
+ parsed << :literal
parsed << varname
when /^\(/ #/
path, contents = get_group(path)
@@ -649,43 +649,43 @@ module REXML
return nil unless depth==0
[string[ind..-1], string[0..ind-1]]
end
-
+
def parse_args( string )
arguments = []
ind = 0
- inquot = false
- inapos = false
+ inquot = false
+ inapos = false
depth = 1
begin
case string[ind]
when ?"
- inquot = !inquot unless inapos
+ inquot = !inquot unless inapos
when ?'
- inapos = !inapos unless inquot
+ inapos = !inapos unless inquot
else
- unless inquot or inapos
- case string[ind]
- when ?(
- depth += 1
+ unless inquot or inapos
+ case string[ind]
+ when ?(
+ depth += 1
if depth == 1
- string = string[1..-1]
- ind -= 1
- end
- when ?)
- depth -= 1
- if depth == 0
- s = string[0,ind].strip
- arguments << s unless s == ""
- string = string[ind+1..-1]
+ string = string[1..-1]
+ ind -= 1
end
- when ?,
- if depth == 1
- s = string[0,ind].strip
- arguments << s unless s == ""
- string = string[ind+1..-1]
- ind = -1
- end
- end
+ when ?)
+ depth -= 1
+ if depth == 0
+ s = string[0,ind].strip
+ arguments << s unless s == ""
+ string = string[ind+1..-1]
+ end
+ when ?,
+ if depth == 1
+ s = string[0,ind].strip
+ arguments << s unless s == ""
+ string = string[ind+1..-1]
+ ind = -1
+ end
+ end
end
end
ind += 1
diff --git a/lib/rexml/quickpath.rb b/lib/rexml/quickpath.rb
index 95fc72b7c2..c099db8579 100644
--- a/lib/rexml/quickpath.rb
+++ b/lib/rexml/quickpath.rb
@@ -2,262 +2,265 @@ require 'rexml/functions'
require 'rexml/xmltokens'
module REXML
- class QuickPath
- include Functions
- include XMLTokens
+ class QuickPath
+ include Functions
+ include XMLTokens
- EMPTY_HASH = {}
+ EMPTY_HASH = {}
- def QuickPath::first element, path, namespaces=EMPTY_HASH
- match(element, path, namespaces)[0]
- end
+ def QuickPath::first element, path, namespaces=EMPTY_HASH
+ match(element, path, namespaces)[0]
+ end
- def QuickPath::each element, path, namespaces=EMPTY_HASH, &block
- path = "*" unless path
- match(element, path, namespaces).each( &block )
- end
+ def QuickPath::each element, path, namespaces=EMPTY_HASH, &block
+ path = "*" unless path
+ match(element, path, namespaces).each( &block )
+ end
- def QuickPath::match element, path, namespaces=EMPTY_HASH
- raise "nil is not a valid xpath" unless path
- results = nil
- Functions::namespace_context = namespaces
- case path
- when /^\/([^\/]|$)/u
- # match on root
- path = path[1..-1]
- return [element.root.parent] if path == ''
- results = filter([element.root], path)
- when /^[-\w]*::/u
- results = filter([element], path)
- when /^\*/u
- results = filter(element.to_a, path)
- when /^[\[!\w:]/u
- # match on child
- matches = []
- children = element.to_a
- results = filter(children, path)
- else
- results = filter([element], path)
- end
- return results
- end
+ def QuickPath::match element, path, namespaces=EMPTY_HASH
+ raise "nil is not a valid xpath" unless path
+ results = nil
+ Functions::namespace_context = namespaces
+ case path
+ when /^\/([^\/]|$)/u
+ # match on root
+ path = path[1..-1]
+ return [element.root.parent] if path == ''
+ results = filter([element.root], path)
+ when /^[-\w]*::/u
+ results = filter([element], path)
+ when /^\*/u
+ results = filter(element.to_a, path)
+ when /^[\[!\w:]/u
+ # match on child
+ matches = []
+ children = element.to_a
+ results = filter(children, path)
+ else
+ results = filter([element], path)
+ end
+ return results
+ end
- # Given an array of nodes it filters the array based on the path. The
- # result is that when this method returns, the array will contain elements
- # which match the path
- def QuickPath::filter elements, path
- return elements if path.nil? or path == '' or elements.size == 0
- case path
- when /^\/\//u # Descendant
- return axe( elements, "descendant-or-self", $' )
- when /^\/?\b(\w[-\w]*)\b::/u # Axe
- axe_name = $1
- rest = $'
- return axe( elements, $1, $' )
- when /^\/(?=\b([:!\w][-\.\w]*:)?[-!\*\.\w]*\b([^:(]|$)|\*)/u # Child
- rest = $'
- results = []
- elements.each do |element|
- results |= filter( element.to_a, rest )
- end
- return results
- when /^\/?(\w[-\w]*)\(/u # / Function
- return function( elements, $1, $' )
- when Namespace::NAMESPLIT # Element name
- name = $2
- ns = $1
- rest = $'
- elements.delete_if do |element|
- !(element.kind_of? Element and
- (element.expanded_name == name or
- (element.name == name and
- element.namespace == Functions.namespace_context[ns])))
- end
- return filter( elements, rest )
- when /^\/\[/u
- matches = []
- elements.each do |element|
- matches |= predicate( element.to_a, path[1..-1] ) if element.kind_of? Element
- end
- return matches
- when /^\[/u # Predicate
- return predicate( elements, path )
- when /^\/?\.\.\./u # Ancestor
- return axe( elements, "ancestor", $' )
- when /^\/?\.\./u # Parent
- return filter( elements.collect{|e|e.parent}, $' )
- when /^\/?\./u # Self
- return filter( elements, $' )
- when /^\*/u # Any
- results = []
- elements.each do |element|
- results |= filter( [element], $' ) if element.kind_of? Element
- #if element.kind_of? Element
- # children = element.to_a
- # children.delete_if { |child| !child.kind_of?(Element) }
- # results |= filter( children, $' )
- #end
- end
- return results
- end
- return []
- end
+ # Given an array of nodes it filters the array based on the path. The
+ # result is that when this method returns, the array will contain elements
+ # which match the path
+ def QuickPath::filter elements, path
+ return elements if path.nil? or path == '' or elements.size == 0
+ case path
+ when /^\/\//u # Descendant
+ return axe( elements, "descendant-or-self", $' )
+ when /^\/?\b(\w[-\w]*)\b::/u # Axe
+ axe_name = $1
+ rest = $'
+ return axe( elements, $1, $' )
+ when /^\/(?=\b([:!\w][-\.\w]*:)?[-!\*\.\w]*\b([^:(]|$)|\*)/u # Child
+ rest = $'
+ results = []
+ elements.each do |element|
+ results |= filter( element.to_a, rest )
+ end
+ return results
+ when /^\/?(\w[-\w]*)\(/u # / Function
+ return function( elements, $1, $' )
+ when Namespace::NAMESPLIT # Element name
+ name = $2
+ ns = $1
+ rest = $'
+ elements.delete_if do |element|
+ !(element.kind_of? Element and
+ (element.expanded_name == name or
+ (element.name == name and
+ element.namespace == Functions.namespace_context[ns])))
+ end
+ return filter( elements, rest )
+ when /^\/\[/u
+ matches = []
+ elements.each do |element|
+ matches |= predicate( element.to_a, path[1..-1] ) if element.kind_of? Element
+ end
+ return matches
+ when /^\[/u # Predicate
+ return predicate( elements, path )
+ when /^\/?\.\.\./u # Ancestor
+ return axe( elements, "ancestor", $' )
+ when /^\/?\.\./u # Parent
+ return filter( elements.collect{|e|e.parent}, $' )
+ when /^\/?\./u # Self
+ return filter( elements, $' )
+ when /^\*/u # Any
+ results = []
+ elements.each do |element|
+ results |= filter( [element], $' ) if element.kind_of? Element
+ #if element.kind_of? Element
+ # children = element.to_a
+ # children.delete_if { |child| !child.kind_of?(Element) }
+ # results |= filter( children, $' )
+ #end
+ end
+ return results
+ end
+ return []
+ end
- def QuickPath::axe( elements, axe_name, rest )
- matches = []
- matches = filter( elements.dup, rest ) if axe_name =~ /-or-self$/u
- case axe_name
- when /^descendant/u
- elements.each do |element|
- matches |= filter( element.to_a, "descendant-or-self::#{rest}" ) if element.kind_of? Element
- end
- when /^ancestor/u
- elements.each do |element|
- while element.parent
- matches << element.parent
- element = element.parent
- end
- end
- matches = filter( matches, rest )
- when "self"
- matches = filter( elements, rest )
- when "child"
- elements.each do |element|
- matches |= filter( element.to_a, rest ) if element.kind_of? Element
- end
- when "attribute"
- elements.each do |element|
- matches << element.attributes[ rest ] if element.kind_of? Element
- end
- when "parent"
- matches = filter(elements.collect{|element| element.parent}.uniq, rest)
- when "following-sibling"
- matches = filter(elements.collect{|element| element.next_sibling}.uniq,
- rest)
- when "previous-sibling"
- matches = filter(elements.collect{|element|
- element.previous_sibling}.uniq, rest )
- end
- return matches.uniq
- end
+ def QuickPath::axe( elements, axe_name, rest )
+ matches = []
+ matches = filter( elements.dup, rest ) if axe_name =~ /-or-self$/u
+ case axe_name
+ when /^descendant/u
+ elements.each do |element|
+ matches |= filter( element.to_a, "descendant-or-self::#{rest}" ) if element.kind_of? Element
+ end
+ when /^ancestor/u
+ elements.each do |element|
+ while element.parent
+ matches << element.parent
+ element = element.parent
+ end
+ end
+ matches = filter( matches, rest )
+ when "self"
+ matches = filter( elements, rest )
+ when "child"
+ elements.each do |element|
+ matches |= filter( element.to_a, rest ) if element.kind_of? Element
+ end
+ when "attribute"
+ elements.each do |element|
+ matches << element.attributes[ rest ] if element.kind_of? Element
+ end
+ when "parent"
+ matches = filter(elements.collect{|element| element.parent}.uniq, rest)
+ when "following-sibling"
+ matches = filter(elements.collect{|element| element.next_sibling}.uniq,
+ rest)
+ when "previous-sibling"
+ matches = filter(elements.collect{|element|
+ element.previous_sibling}.uniq, rest )
+ end
+ return matches.uniq
+ end
- # A predicate filters a node-set with respect to an axis to produce a
- # new node-set. For each node in the node-set to be filtered, the
- # PredicateExpr is evaluated with that node as the context node, with
- # the number of nodes in the node-set as the context size, and with the
- # proximity position of the node in the node-set with respect to the
- # axis as the context position; if PredicateExpr evaluates to true for
- # that node, the node is included in the new node-set; otherwise, it is
- # not included.
- #
- # A PredicateExpr is evaluated by evaluating the Expr and converting
- # the result to a boolean. If the result is a number, the result will
- # be converted to true if the number is equal to the context position
- # and will be converted to false otherwise; if the result is not a
- # number, then the result will be converted as if by a call to the
- # boolean function. Thus a location path para[3] is equivalent to
- # para[position()=3].
- def QuickPath::predicate( elements, path )
- ind = 1
- bcount = 1
- while bcount > 0
- bcount += 1 if path[ind] == ?[
- bcount -= 1 if path[ind] == ?]
- ind += 1
- end
- ind -= 1
- predicate = path[1..ind-1]
- rest = path[ind+1..-1]
+ # A predicate filters a node-set with respect to an axis to produce a
+ # new node-set. For each node in the node-set to be filtered, the
+ # PredicateExpr is evaluated with that node as the context node, with
+ # the number of nodes in the node-set as the context size, and with the
+ # proximity position of the node in the node-set with respect to the
+ # axis as the context position; if PredicateExpr evaluates to true for
+ # that node, the node is included in the new node-set; otherwise, it is
+ # not included.
+ #
+ # A PredicateExpr is evaluated by evaluating the Expr and converting
+ # the result to a boolean. If the result is a number, the result will
+ # be converted to true if the number is equal to the context position
+ # and will be converted to false otherwise; if the result is not a
+ # number, then the result will be converted as if by a call to the
+ # boolean function. Thus a location path para[3] is equivalent to
+ # para[position()=3].
+ def QuickPath::predicate( elements, path )
+ ind = 1
+ bcount = 1
+ while bcount > 0
+ bcount += 1 if path[ind] == ?[
+ bcount -= 1 if path[ind] == ?]
+ ind += 1
+ end
+ ind -= 1
+ predicate = path[1..ind-1]
+ rest = path[ind+1..-1]
- # have to change 'a [=<>] b [=<>] c' into 'a [=<>] b and b [=<>] c'
- predicate.gsub!( /([^\s(and)(or)<>=]+)\s*([<>=])\s*([^\s(and)(or)<>=]+)\s*([<>=])\s*([^\s(and)(or)<>=]+)/u,
- '\1 \2 \3 and \3 \4 \5' )
- # Let's do some Ruby trickery to avoid some work:
- predicate.gsub!( /&/u, "&&" )
- predicate.gsub!( /=/u, "==" )
- predicate.gsub!( /@(\w[-\w.]*)/u, 'attribute("\1")' )
- predicate.gsub!( /\bmod\b/u, "%" )
- predicate.gsub!( /\b(\w[-\w.]*\()/u ) {
- fname = $1
- fname.gsub( /-/u, "_" )
- }
+ # have to change 'a [=<>] b [=<>] c' into 'a [=<>] b and b [=<>] c'
+ predicate.gsub!( /([^\s(and)(or)<>=]+)\s*([<>=])\s*([^\s(and)(or)<>=]+)\s*([<>=])\s*([^\s(and)(or)<>=]+)/u ) {
+ "#$1 #$2 #$3 and #$3 #$4 #$5"
+ }
+ # Let's do some Ruby trickery to avoid some work:
+ predicate.gsub!( /&/u, "&&" )
+ predicate.gsub!( /=/u, "==" )
+ predicate.gsub!( /@(\w[-\w.]*)/u ) {
+ "attribute(\"#$1\")"
+ }
+ predicate.gsub!( /\bmod\b/u, "%" )
+ predicate.gsub!( /\b(\w[-\w.]*\()/u ) {
+ fname = $1
+ fname.gsub( /-/u, "_" )
+ }
+
+ Functions.pair = [ 0, elements.size ]
+ results = []
+ elements.each do |element|
+ Functions.pair[0] += 1
+ Functions.node = element
+ res = eval( predicate )
+ case res
+ when true
+ results << element
+ when Fixnum
+ results << element if Functions.pair[0] == res
+ when String
+ results << element
+ end
+ end
+ return filter( results, rest )
+ end
- Functions.pair = [ 0, elements.size ]
- results = []
- elements.each do |element|
- Functions.pair[0] += 1
- Functions.node = element
- res = eval( predicate )
- case res
- when true
- results << element
- when Fixnum
- results << element if Functions.pair[0] == res
- when String
- results << element
- end
- end
- return filter( results, rest )
- end
+ def QuickPath::attribute( name )
+ return Functions.node.attributes[name] if Functions.node.kind_of? Element
+ end
- def QuickPath::attribute( name )
- return Functions.node.attributes[name] if Functions.node.kind_of? Element
- end
+ def QuickPath::name()
+ return Functions.node.name if Functions.node.kind_of? Element
+ end
- def QuickPath::name()
- return Functions.node.name if Functions.node.kind_of? Element
- end
+ def QuickPath::method_missing( id, *args )
+ begin
+ Functions.send( id.id2name, *args )
+ rescue Exception
+ raise "METHOD: #{id.id2name}(#{args.join ', '})\n#{$!.message}"
+ end
+ end
- def QuickPath::method_missing( id, *args )
- begin
- Functions.send( id.id2name, *args )
- rescue Exception
- raise "METHOD: #{id.id2name}(#{args.join ', '})\n#{$!.message}"
- end
- end
+ def QuickPath::function( elements, fname, rest )
+ args = parse_args( elements, rest )
+ Functions.pair = [0, elements.size]
+ results = []
+ elements.each do |element|
+ Functions.pair[0] += 1
+ Functions.node = element
+ res = Functions.send( fname, *args )
+ case res
+ when true
+ results << element
+ when Fixnum
+ results << element if Functions.pair[0] == res
+ end
+ end
+ return results
+ end
- def QuickPath::function( elements, fname, rest )
- args = parse_args( elements, rest )
- Functions.pair = [0, elements.size]
- results = []
- elements.each do |element|
- Functions.pair[0] += 1
- Functions.node = element
- res = Functions.send( fname, *args )
- case res
- when true
- results << element
- when Fixnum
- results << element if Functions.pair[0] == res
- end
- end
- return results
- end
-
- def QuickPath::parse_args( element, string )
- # /.*?(?:\)|,)/
- arguments = []
- buffer = ""
- while string and string != ""
- c = string[0]
- string.sub!(/^./u, "")
- case c
- when ?,
- # if depth = 1, then we start a new argument
- arguments << evaluate( buffer )
- #arguments << evaluate( string[0..count] )
- when ?(
- # start a new method call
- function( element, buffer, string )
- buffer = ""
- when ?)
- # close the method call and return arguments
- return arguments
- else
- buffer << c
- end
- end
- ""
- end
- end
+ def QuickPath::parse_args( element, string )
+ # /.*?(?:\)|,)/
+ arguments = []
+ buffer = ""
+ while string and string != ""
+ c = string[0]
+ string.sub!(/^./u, "")
+ case c
+ when ?,
+ # if depth = 1, then we start a new argument
+ arguments << evaluate( buffer )
+ #arguments << evaluate( string[0..count] )
+ when ?(
+ # start a new method call
+ function( element, buffer, string )
+ buffer = ""
+ when ?)
+ # close the method call and return arguments
+ return arguments
+ else
+ buffer << c
+ end
+ end
+ ""
+ end
+ end
end
diff --git a/lib/rexml/rexml.rb b/lib/rexml/rexml.rb
index ab2f44561b..8af1697e51 100644
--- a/lib/rexml/rexml.rb
+++ b/lib/rexml/rexml.rb
@@ -5,25 +5,26 @@
# non-validating[http://www.w3.org/TR/2004/REC-xml-20040204/#sec-conformance]
# toolkit with an intuitive API. REXML passes 100% of the non-validating Oasis
# tests[http://www.oasis-open.org/committees/xml-conformance/xml-test-suite.shtml],
-# and provides tree, stream, SAX2, pull, and lightweight APIs. REXML also
-# includes a full XPath[http://www.w3c.org/tr/xpath] 1.0 implementation. Since
+# and provides tree, stream, SAX2, pull, and lightweight APIs. REXML also
+# includes a full XPath[http://www.w3c.org/tr/xpath] 1.0 implementation. Since
# Ruby 1.8, REXML is included in the standard Ruby distribution.
#
# Main page:: http://www.germane-software.com/software/rexml
# Author:: Sean Russell <serATgermaneHYPHENsoftwareDOTcom>
-# Date:: 2008/019
-# Version:: 3.1.7.3
-#
+# Version:: 3.1.7.2
+# Date:: 2007/275
+# Revision:: $Revision$
+#
# This API documentation can be downloaded from the REXML home page, or can
# be accessed online[http://www.germane-software.com/software/rexml_doc]
#
# A tutorial is available in the REXML distribution in docs/tutorial.html,
-# or can be accessed
+# or can be accessed
# online[http://www.germane-software.com/software/rexml/docs/tutorial.html]
module REXML
- COPYRIGHT = "Copyright © 2001-2008 Sean Russell <ser@germane-software.com>"
- DATE = "2008/019"
- VERSION = "3.1.7.3"
+ COPYRIGHT = "Copyright \xC2\xA9 2001-2006 Sean Russell <ser@germane-software.com>"
+ VERSION = "3.1.7.2"
+ DATE = "2007/275"
REVISION = "$Revision$".gsub(/\$Revision:|\$/,'').strip
Copyright = COPYRIGHT
diff --git a/lib/rexml/sax2listener.rb b/lib/rexml/sax2listener.rb
index 6830e4483a..8db1389d06 100644
--- a/lib/rexml/sax2listener.rb
+++ b/lib/rexml/sax2listener.rb
@@ -1,97 +1,97 @@
module REXML
- # A template for stream parser listeners.
- # Note that the declarations (attlistdecl, elementdecl, etc) are trivially
- # processed; REXML doesn't yet handle doctype entity declarations, so you
- # have to parse them out yourself.
- # === Missing methods from SAX2
- # ignorable_whitespace
- # === Methods extending SAX2
- # +WARNING+
- # These methods are certainly going to change, until DTDs are fully
- # supported. Be aware of this.
- # start_document
- # end_document
- # doctype
- # elementdecl
- # attlistdecl
- # entitydecl
- # notationdecl
- # cdata
- # xmldecl
- # comment
- module SAX2Listener
- def start_document
- end
- def end_document
- end
- def start_prefix_mapping prefix, uri
- end
- def end_prefix_mapping prefix
- end
- def start_element uri, localname, qname, attributes
- end
- def end_element uri, localname, qname
- end
- def characters text
- end
- def processing_instruction target, data
- end
- # Handles a doctype declaration. Any attributes of the doctype which are
- # not supplied will be nil. # EG, <!DOCTYPE me PUBLIC "foo" "bar">
- # @p name the name of the doctype; EG, "me"
- # @p pub_sys "PUBLIC", "SYSTEM", or nil. EG, "PUBLIC"
- # @p long_name the supplied long name, or nil. EG, "foo"
- # @p uri the uri of the doctype, or nil. EG, "bar"
- def doctype name, pub_sys, long_name, uri
- end
- # If a doctype includes an ATTLIST declaration, it will cause this
- # method to be called. The content is the declaration itself, unparsed.
- # EG, <!ATTLIST el attr CDATA #REQUIRED> will come to this method as "el
- # attr CDATA #REQUIRED". This is the same for all of the .*decl
- # methods.
- def attlistdecl(element, pairs, contents)
- end
- # <!ELEMENT ...>
- def elementdecl content
- end
- # <!ENTITY ...>
- # The argument passed to this method is an array of the entity
- # declaration. It can be in a number of formats, but in general it
- # returns (example, result):
- # <!ENTITY % YN '"Yes"'>
- # ["%", "YN", "'\"Yes\"'", "\""]
- # <!ENTITY % YN 'Yes'>
- # ["%", "YN", "'Yes'", "s"]
- # <!ENTITY WhatHeSaid "He said %YN;">
- # ["WhatHeSaid", "\"He said %YN;\"", "YN"]
- # <!ENTITY open-hatch SYSTEM "http://www.textuality.com/boilerplate/OpenHatch.xml">
- # ["open-hatch", "SYSTEM", "\"http://www.textuality.com/boilerplate/OpenHatch.xml\""]
- # <!ENTITY open-hatch PUBLIC "-//Textuality//TEXT Standard open-hatch boilerplate//EN" "http://www.textuality.com/boilerplate/OpenHatch.xml">
- # ["open-hatch", "PUBLIC", "\"-//Textuality//TEXT Standard open-hatch boilerplate//EN\"", "\"http://www.textuality.com/boilerplate/OpenHatch.xml\""]
- # <!ENTITY hatch-pic SYSTEM "../grafix/OpenHatch.gif" NDATA gif>
- # ["hatch-pic", "SYSTEM", "\"../grafix/OpenHatch.gif\"", "\n\t\t\t\t\t\t\tNDATA gif", "gif"]
- def entitydecl name, decl
- end
- # <!NOTATION ...>
- def notationdecl content
- end
- # Called when <![CDATA[ ... ]]> is encountered in a document.
- # @p content "..."
- def cdata content
- end
- # Called when an XML PI is encountered in the document.
- # EG: <?xml version="1.0" encoding="utf"?>
- # @p version the version attribute value. EG, "1.0"
- # @p encoding the encoding attribute value, or nil. EG, "utf"
- # @p standalone the standalone attribute value, or nil. EG, nil
+ # A template for stream parser listeners.
+ # Note that the declarations (attlistdecl, elementdecl, etc) are trivially
+ # processed; REXML doesn't yet handle doctype entity declarations, so you
+ # have to parse them out yourself.
+ # === Missing methods from SAX2
+ # ignorable_whitespace
+ # === Methods extending SAX2
+ # +WARNING+
+ # These methods are certainly going to change, until DTDs are fully
+ # supported. Be aware of this.
+ # start_document
+ # end_document
+ # doctype
+ # elementdecl
+ # attlistdecl
+ # entitydecl
+ # notationdecl
+ # cdata
+ # xmldecl
+ # comment
+ module SAX2Listener
+ def start_document
+ end
+ def end_document
+ end
+ def start_prefix_mapping prefix, uri
+ end
+ def end_prefix_mapping prefix
+ end
+ def start_element uri, localname, qname, attributes
+ end
+ def end_element uri, localname, qname
+ end
+ def characters text
+ end
+ def processing_instruction target, data
+ end
+ # Handles a doctype declaration. Any attributes of the doctype which are
+ # not supplied will be nil. # EG, <!DOCTYPE me PUBLIC "foo" "bar">
+ # @p name the name of the doctype; EG, "me"
+ # @p pub_sys "PUBLIC", "SYSTEM", or nil. EG, "PUBLIC"
+ # @p long_name the supplied long name, or nil. EG, "foo"
+ # @p uri the uri of the doctype, or nil. EG, "bar"
+ def doctype name, pub_sys, long_name, uri
+ end
+ # If a doctype includes an ATTLIST declaration, it will cause this
+ # method to be called. The content is the declaration itself, unparsed.
+ # EG, <!ATTLIST el attr CDATA #REQUIRED> will come to this method as "el
+ # attr CDATA #REQUIRED". This is the same for all of the .*decl
+ # methods.
+ def attlistdecl(element, pairs, contents)
+ end
+ # <!ELEMENT ...>
+ def elementdecl content
+ end
+ # <!ENTITY ...>
+ # The argument passed to this method is an array of the entity
+ # declaration. It can be in a number of formats, but in general it
+ # returns (example, result):
+ # <!ENTITY % YN '"Yes"'>
+ # ["%", "YN", "'\"Yes\"'", "\""]
+ # <!ENTITY % YN 'Yes'>
+ # ["%", "YN", "'Yes'", "s"]
+ # <!ENTITY WhatHeSaid "He said %YN;">
+ # ["WhatHeSaid", "\"He said %YN;\"", "YN"]
+ # <!ENTITY open-hatch SYSTEM "http://www.textuality.com/boilerplate/OpenHatch.xml">
+ # ["open-hatch", "SYSTEM", "\"http://www.textuality.com/boilerplate/OpenHatch.xml\""]
+ # <!ENTITY open-hatch PUBLIC "-//Textuality//TEXT Standard open-hatch boilerplate//EN" "http://www.textuality.com/boilerplate/OpenHatch.xml">
+ # ["open-hatch", "PUBLIC", "\"-//Textuality//TEXT Standard open-hatch boilerplate//EN\"", "\"http://www.textuality.com/boilerplate/OpenHatch.xml\""]
+ # <!ENTITY hatch-pic SYSTEM "../grafix/OpenHatch.gif" NDATA gif>
+ # ["hatch-pic", "SYSTEM", "\"../grafix/OpenHatch.gif\"", "\n\t\t\t\t\t\t\tNDATA gif", "gif"]
+ def entitydecl name, decl
+ end
+ # <!NOTATION ...>
+ def notationdecl content
+ end
+ # Called when <![CDATA[ ... ]]> is encountered in a document.
+ # @p content "..."
+ def cdata content
+ end
+ # Called when an XML PI is encountered in the document.
+ # EG: <?xml version="1.0" encoding="utf"?>
+ # @p version the version attribute value. EG, "1.0"
+ # @p encoding the encoding attribute value, or nil. EG, "utf"
+ # @p standalone the standalone attribute value, or nil. EG, nil
# @p spaced the declaration is followed by a line break
- def xmldecl version, encoding, standalone
- end
- # Called when a comment is encountered.
- # @p comment The content of the comment
- def comment comment
- end
+ def xmldecl version, encoding, standalone
+ end
+ # Called when a comment is encountered.
+ # @p comment The content of the comment
+ def comment comment
+ end
def progress position
end
- end
+ end
end
diff --git a/lib/rexml/source.rb b/lib/rexml/source.rb
index 3f6d4ffa26..ce7a2c98b0 100644
--- a/lib/rexml/source.rb
+++ b/lib/rexml/source.rb
@@ -7,14 +7,13 @@ module REXML
# @param arg Either a String, or an IO
# @return a Source, or nil if a bad argument was given
def SourceFactory::create_from(arg)
- if arg.respond_to? :read and
- arg.respond_to? :readline and
- arg.respond_to? :nil? and
- arg.respond_to? :eof?
+ if arg.kind_of? String
+ Source.new(arg)
+ elsif arg.respond_to? :read and
+ arg.respond_to? :readline and
+ arg.respond_to? :nil? and
+ arg.respond_to? :eof?
IOSource.new(arg)
- elsif arg.respond_to? :to_str
- require 'stringio'
- IOSource.new(StringIO.new(arg))
elsif arg.kind_of? Source
arg
else
@@ -59,9 +58,6 @@ module REXML
@to_utf = true
else
@to_utf = false
- if @buffer.respond_to? :force_encoding
- @buffer.force_encoding Encoding::UTF_8
- end
end
end
@@ -69,9 +65,9 @@ module REXML
# usual scan() method. For one thing, the pattern argument has some
# requirements; for another, the source can be consumed. You can easily
# confuse this method. Originally, the patterns were easier
- # to construct and this method more robust, because this method
- # generated search regexes on the fly; however, this was
- # computationally expensive and slowed down the entire REXML package
+ # to construct and this method more robust, because this method
+ # generated search regexes on the fly; however, this was
+ # computationally expensive and slowed down the entire REXML package
# considerably, since this is by far the most commonly called method.
# @param pattern must be a Regexp, and must be in the form of
# /^\s*(#{your pattern, with no groups})(.*)/. The first group
@@ -147,21 +143,21 @@ module REXML
# the XML spec. If there is one, we can determine the encoding from
# it.
@buffer = ""
- str = @source.read( 2 ) || ''
+ str = @source.read( 2 )
if encoding
self.encoding = encoding
- elsif str[0,2] == "\xfe\xff"
+ elsif 0xfe == str[0] && 0xff == str[1]
@line_break = "\000>"
- elsif str[0,2] == "\xff\xfe"
+ elsif 0xff == str[0] && 0xfe == str[1]
@line_break = ">\000"
- elsif str[0,2] == "\xef\xbb"
+ elsif 0xef == str[0] && 0xbb == str[1]
str += @source.read(1)
- str = '' if (str[2,1] == "\xBF")
+ str = '' if (0xbf == str[2])
@line_break = ">"
else
@line_break = ">"
end
- super( @source.eof? ? str : str+@source.readline( @line_break ) )
+ super str+@source.readline( @line_break )
end
def scan(pattern, cons=false)
@@ -194,11 +190,8 @@ module REXML
def read
begin
str = @source.readline(@line_break)
- str = decode(str) if @to_utf and str
+ str = decode(str) if @to_utf and str
@buffer << str
- if not @to_utf and @buffer.respond_to? :force_encoding
- @buffer.force_encoding Encoding::UTF_8
- end
rescue Exception, NameError
@source = nil
end
@@ -225,13 +218,13 @@ module REXML
rv.taint
rv
end
-
+
def empty?
super and ( @source.nil? || @source.eof? )
end
def position
- @er_source.pos rescue 0
+ @er_source.stat.pipe? ? 0 : @er_source.pos
end
# @return the current line in the source
diff --git a/lib/rexml/streamlistener.rb b/lib/rexml/streamlistener.rb
index 619c529578..6f401125b5 100644
--- a/lib/rexml/streamlistener.rb
+++ b/lib/rexml/streamlistener.rb
@@ -1,92 +1,92 @@
module REXML
- # A template for stream parser listeners.
- # Note that the declarations (attlistdecl, elementdecl, etc) are trivially
- # processed; REXML doesn't yet handle doctype entity declarations, so you
- # have to parse them out yourself.
- module StreamListener
- # Called when a tag is encountered.
- # @p name the tag name
- # @p attrs an array of arrays of attribute/value pairs, suitable for
- # use with assoc or rassoc. IE, <tag attr1="value1" attr2="value2">
- # will result in
- # tag_start( "tag", # [["attr1","value1"],["attr2","value2"]])
- def tag_start name, attrs
- end
- # Called when the end tag is reached. In the case of <tag/>, tag_end
- # will be called immidiately after tag_start
- # @p the name of the tag
- def tag_end name
- end
- # Called when text is encountered in the document
- # @p text the text content.
- def text text
- end
- # Called when an instruction is encountered. EG: <?xsl sheet='foo'?>
- # @p name the instruction name; in the example, "xsl"
- # @p instruction the rest of the instruction. In the example,
- # "sheet='foo'"
- def instruction name, instruction
- end
- # Called when a comment is encountered.
- # @p comment The content of the comment
- def comment comment
- end
- # Handles a doctype declaration. Any attributes of the doctype which are
- # not supplied will be nil. # EG, <!DOCTYPE me PUBLIC "foo" "bar">
- # @p name the name of the doctype; EG, "me"
- # @p pub_sys "PUBLIC", "SYSTEM", or nil. EG, "PUBLIC"
- # @p long_name the supplied long name, or nil. EG, "foo"
- # @p uri the uri of the doctype, or nil. EG, "bar"
- def doctype name, pub_sys, long_name, uri
- end
- # Called when the doctype is done
- def doctype_end
- end
- # If a doctype includes an ATTLIST declaration, it will cause this
- # method to be called. The content is the declaration itself, unparsed.
- # EG, <!ATTLIST el attr CDATA #REQUIRED> will come to this method as "el
- # attr CDATA #REQUIRED". This is the same for all of the .*decl
- # methods.
- def attlistdecl element_name, attributes, raw_content
- end
- # <!ELEMENT ...>
- def elementdecl content
- end
- # <!ENTITY ...>
- # The argument passed to this method is an array of the entity
- # declaration. It can be in a number of formats, but in general it
- # returns (example, result):
- # <!ENTITY % YN '"Yes"'>
- # ["%", "YN", "'\"Yes\"'", "\""]
- # <!ENTITY % YN 'Yes'>
- # ["%", "YN", "'Yes'", "s"]
- # <!ENTITY WhatHeSaid "He said %YN;">
- # ["WhatHeSaid", "\"He said %YN;\"", "YN"]
- # <!ENTITY open-hatch SYSTEM "http://www.textuality.com/boilerplate/OpenHatch.xml">
- # ["open-hatch", "SYSTEM", "\"http://www.textuality.com/boilerplate/OpenHatch.xml\""]
- # <!ENTITY open-hatch PUBLIC "-//Textuality//TEXT Standard open-hatch boilerplate//EN" "http://www.textuality.com/boilerplate/OpenHatch.xml">
- # ["open-hatch", "PUBLIC", "\"-//Textuality//TEXT Standard open-hatch boilerplate//EN\"", "\"http://www.textuality.com/boilerplate/OpenHatch.xml\""]
- # <!ENTITY hatch-pic SYSTEM "../grafix/OpenHatch.gif" NDATA gif>
- # ["hatch-pic", "SYSTEM", "\"../grafix/OpenHatch.gif\"", "\n\t\t\t\t\t\t\tNDATA gif", "gif"]
- def entitydecl content
- end
- # <!NOTATION ...>
- def notationdecl content
- end
- # Called when %foo; is encountered in a doctype declaration.
- # @p content "foo"
- def entity content
- end
- # Called when <![CDATA[ ... ]]> is encountered in a document.
- # @p content "..."
- def cdata content
- end
- # Called when an XML PI is encountered in the document.
- # EG: <?xml version="1.0" encoding="utf"?>
- # @p version the version attribute value. EG, "1.0"
- # @p encoding the encoding attribute value, or nil. EG, "utf"
- # @p standalone the standalone attribute value, or nil. EG, nil
- def xmldecl version, encoding, standalone
- end
- end
+ # A template for stream parser listeners.
+ # Note that the declarations (attlistdecl, elementdecl, etc) are trivially
+ # processed; REXML doesn't yet handle doctype entity declarations, so you
+ # have to parse them out yourself.
+ module StreamListener
+ # Called when a tag is encountered.
+ # @p name the tag name
+ # @p attrs an array of arrays of attribute/value pairs, suitable for
+ # use with assoc or rassoc. IE, <tag attr1="value1" attr2="value2">
+ # will result in
+ # tag_start( "tag", # [["attr1","value1"],["attr2","value2"]])
+ def tag_start name, attrs
+ end
+ # Called when the end tag is reached. In the case of <tag/>, tag_end
+ # will be called immidiately after tag_start
+ # @p the name of the tag
+ def tag_end name
+ end
+ # Called when text is encountered in the document
+ # @p text the text content.
+ def text text
+ end
+ # Called when an instruction is encountered. EG: <?xsl sheet='foo'?>
+ # @p name the instruction name; in the example, "xsl"
+ # @p instruction the rest of the instruction. In the example,
+ # "sheet='foo'"
+ def instruction name, instruction
+ end
+ # Called when a comment is encountered.
+ # @p comment The content of the comment
+ def comment comment
+ end
+ # Handles a doctype declaration. Any attributes of the doctype which are
+ # not supplied will be nil. # EG, <!DOCTYPE me PUBLIC "foo" "bar">
+ # @p name the name of the doctype; EG, "me"
+ # @p pub_sys "PUBLIC", "SYSTEM", or nil. EG, "PUBLIC"
+ # @p long_name the supplied long name, or nil. EG, "foo"
+ # @p uri the uri of the doctype, or nil. EG, "bar"
+ def doctype name, pub_sys, long_name, uri
+ end
+ # Called when the doctype is done
+ def doctype_end
+ end
+ # If a doctype includes an ATTLIST declaration, it will cause this
+ # method to be called. The content is the declaration itself, unparsed.
+ # EG, <!ATTLIST el attr CDATA #REQUIRED> will come to this method as "el
+ # attr CDATA #REQUIRED". This is the same for all of the .*decl
+ # methods.
+ def attlistdecl element_name, attributes, raw_content
+ end
+ # <!ELEMENT ...>
+ def elementdecl content
+ end
+ # <!ENTITY ...>
+ # The argument passed to this method is an array of the entity
+ # declaration. It can be in a number of formats, but in general it
+ # returns (example, result):
+ # <!ENTITY % YN '"Yes"'>
+ # ["%", "YN", "'\"Yes\"'", "\""]
+ # <!ENTITY % YN 'Yes'>
+ # ["%", "YN", "'Yes'", "s"]
+ # <!ENTITY WhatHeSaid "He said %YN;">
+ # ["WhatHeSaid", "\"He said %YN;\"", "YN"]
+ # <!ENTITY open-hatch SYSTEM "http://www.textuality.com/boilerplate/OpenHatch.xml">
+ # ["open-hatch", "SYSTEM", "\"http://www.textuality.com/boilerplate/OpenHatch.xml\""]
+ # <!ENTITY open-hatch PUBLIC "-//Textuality//TEXT Standard open-hatch boilerplate//EN" "http://www.textuality.com/boilerplate/OpenHatch.xml">
+ # ["open-hatch", "PUBLIC", "\"-//Textuality//TEXT Standard open-hatch boilerplate//EN\"", "\"http://www.textuality.com/boilerplate/OpenHatch.xml\""]
+ # <!ENTITY hatch-pic SYSTEM "../grafix/OpenHatch.gif" NDATA gif>
+ # ["hatch-pic", "SYSTEM", "\"../grafix/OpenHatch.gif\"", "\n\t\t\t\t\t\t\tNDATA gif", "gif"]
+ def entitydecl content
+ end
+ # <!NOTATION ...>
+ def notationdecl content
+ end
+ # Called when %foo; is encountered in a doctype declaration.
+ # @p content "foo"
+ def entity content
+ end
+ # Called when <![CDATA[ ... ]]> is encountered in a document.
+ # @p content "..."
+ def cdata content
+ end
+ # Called when an XML PI is encountered in the document.
+ # EG: <?xml version="1.0" encoding="utf"?>
+ # @p version the version attribute value. EG, "1.0"
+ # @p encoding the encoding attribute value, or nil. EG, "utf"
+ # @p standalone the standalone attribute value, or nil. EG, nil
+ def xmldecl version, encoding, standalone
+ end
+ end
end
diff --git a/lib/rexml/syncenumerator.rb b/lib/rexml/syncenumerator.rb
index 11609bdf3d..955e006cb2 100644
--- a/lib/rexml/syncenumerator.rb
+++ b/lib/rexml/syncenumerator.rb
@@ -6,7 +6,8 @@ module REXML
# Enumerable objects.
def initialize(*enums)
@gens = enums
- @length = @gens.collect {|x| x.size }.max
+ @biggest = @gens[0]
+ @gens.each {|x| @biggest = x if x.size > @biggest.size }
end
# Returns the number of enumerated Enumerable objects, i.e. the size
@@ -23,8 +24,8 @@ module REXML
# Enumerates rows of the Enumerable objects.
def each
- @length.times {|i|
- yield @gens.collect {|x| x[i]}
+ @biggest.zip( *@gens ) {|a|
+ yield(*a[1..-1])
}
self
end
diff --git a/lib/rexml/text.rb b/lib/rexml/text.rb
index d09dc3ac54..2bc00429b3 100644
--- a/lib/rexml/text.rb
+++ b/lib/rexml/text.rb
@@ -18,57 +18,25 @@ module REXML
# If +raw+ is true, then REXML leaves the value alone
attr_accessor :raw
- NEEDS_A_SECOND_CHECK = /(<|&((#{Entity::NAME});|(#0*((?:\d+)|(?:x[a-fA-F0-9]+)));)?)/um
- NUMERICENTITY = /&#0*((?:\d+)|(?:x[a-fA-F0-9]+));/
- VALID_CHAR = [
- 0x9, 0xA, 0xD,
- (0x20..0xD7FF),
- (0xE000..0xFFFD),
- (0x10000..0x10FFFF)
- ]
-
- if String.method_defined? :encode
- VALID_XML_CHARS = Regexp.new('^['+
- VALID_CHAR.map { |item|
- case item
- when Fixnum
- [item].pack('U').force_encoding('utf-8')
- when Range
- [item.first, '-'.ord, item.last].pack('UUU').force_encoding('utf-8')
- end
- }.join +
- ']*$')
- else
- VALID_XML_CHARS = /^(
- [\x09\x0A\x0D\x20-\x7E] # ASCII
- | [\xC2-\xDF][\x80-\xBF] # non-overlong 2-byte
- | \xE0[\xA0-\xBF][\x80-\xBF] # excluding overlongs
- | [\xE1-\xEC\xEE][\x80-\xBF]{2} # straight 3-byte
- | \xEF[\x80-\xBE]{2} #
- | \xEF\xBF[\x80-\xBD] # excluding U+fffe and U+ffff
- | \xED[\x80-\x9F][\x80-\xBF] # excluding surrogates
- | \xF0[\x90-\xBF][\x80-\xBF]{2} # planes 1-3
- | [\xF1-\xF3][\x80-\xBF]{3} # planes 4-15
- | \xF4[\x80-\x8F][\x80-\xBF]{2} # plane 16
- )*$/nx;
- end
+ ILLEGAL = /(<|&(?!(#{Entity::NAME})|(#0*((?:\d+)|(?:x[a-fA-F0-9]+)));))/um
+ NUMERICENTITY = /&#0*((?:\d+)|(?:x[a-fA-F0-9]+));/
# Constructor
# +arg+ if a String, the content is set to the String. If a Text,
- # the object is shallowly cloned.
+ # the object is shallowly cloned.
#
# +respect_whitespace+ (boolean, false) if true, whitespace is
# respected
#
# +parent+ (nil) if this is a Parent object, the parent
- # will be set to this.
+ # will be set to this.
#
# +raw+ (nil) This argument can be given three values.
- # If true, then the value of used to construct this object is expected to
- # contain no unescaped XML markup, and REXML will not change the text. If
+ # If true, then the value of used to construct this object is expected to
+ # contain no unescaped XML markup, and REXML will not change the text. If
# this value is false, the string may contain any characters, and REXML will
# escape any and all defined entities whose values are contained in the
- # text. If this value is nil (the default), then the raw value of the
+ # text. If this value is nil (the default), then the raw value of the
# parent will be used as the raw value for this node. If there is no raw
# value for the parent, and no value is supplied, the default is false.
# Use this field if you have entities defined for some text, and you don't
@@ -89,14 +57,14 @@ module REXML
# In the last example, the +entity_filter+ argument is ignored.
#
# +pattern+ INTERNAL USE ONLY
- def initialize(arg, respect_whitespace=false, parent=nil, raw=nil,
- entity_filter=nil, illegal=NEEDS_A_SECOND_CHECK )
+ def initialize(arg, respect_whitespace=false, parent=nil, raw=nil,
+ entity_filter=nil, illegal=ILLEGAL )
@raw = false
if parent
super( parent )
- @raw = parent.raw
+ @raw = parent.raw
else
@parent = nil
end
@@ -117,54 +85,10 @@ module REXML
@string.gsub!( /\r\n?/, "\n" )
- Text.check(@string, NEEDS_A_SECOND_CHECK, doctype) if @raw and @parent
- end
-
- def parent= parent
- super(parent)
- Text.check(@string, NEEDS_A_SECOND_CHECK, doctype) if @raw and @parent
- end
-
- # check for illegal characters
- def Text.check string, pattern, doctype
-
- # illegal anywhere
- if string !~ VALID_XML_CHARS
- if String.method_defined? :encode
- string.chars.each do |c|
- case c.ord
- when *VALID_CHAR
- else
- raise "Illegal character #{c.inspect} in raw string \"#{string}\""
- end
- end
- else
- string.scan(/[\x00-\x7F]|[\x80-\xBF][\xC0-\xF0]*|[\xC0-\xF0]/n) do |c|
- case c.unpack('U')
- when *VALID_CHAR
- else
- raise "Illegal character #{c.inspect} in raw string \"#{string}\""
- end
- end
- end
- end
-
- # context sensitive
- string.scan(pattern) do
- if $1[-1] != ?;
- raise "Illegal character '#{$1}' in raw string \"#{string}\""
- elsif $1[0] == ?&
- if $5 and $5[0] == ?#
- case ($5[1] == ?x ? $5[2..-1].to_i(16) : $5[1..-1].to_i)
- when *VALID_CHAR
- else
- raise "Illegal character '#{$1}' in raw string \"#{string}\""
- end
- elsif $3 and !SUBSTITUTES.include?($1)
- if !doctype or !doctype.entities.has_key?($3)
- raise "Undeclared entity '#{$1}' in raw string \"#{string}\""
- end
- end
+ # check for illegal characters
+ if @raw
+ if @string =~ illegal
+ raise "Illegal character '#{$1}' in raw string \"#{@string}\""
end
end
end
@@ -196,24 +120,17 @@ module REXML
to_s() <=> other.to_s
end
- def doctype
- if @parent
- doc = @parent.document
- doc.doctype if doc
- end
- end
-
REFERENCE = /#{Entity::REFERENCE}/
# Returns the string value of this text node. This string is always
# escaped, meaning that it is a valid XML text node string, and all
# entities that can be escaped, have been inserted. This method respects
# the entity filter set in the constructor.
- #
- # # Assume that the entity "s" is defined to be "sean", and that the
+ #
+ # # Assume that the entity "s" is defined to be "sean", and that the
# # entity "r" is defined to be "russell"
- # t = Text.new( "< & sean russell", false, nil, false, ['s'] )
+ # t = Text.new( "< & sean russell", false, nil, false, ['s'] )
# t.to_s #-> "&lt; &amp; &s; russell"
- # t = Text.new( "< & &s; russell", false, nil, false )
+ # t = Text.new( "< & &s; russell", false, nil, false )
# t.to_s #-> "&lt; &amp; &s; russell"
# u = Text.new( "sean russell", false, nil, true )
# u.to_s #-> "sean russell"
@@ -221,6 +138,12 @@ module REXML
return @string if @raw
return @normalized if @normalized
+ doctype = nil
+ if @parent
+ doc = @parent.document
+ doctype = doc.doctype if doc
+ end
+
@normalized = Text::normalize( @string, doctype, @entity_filter )
end
@@ -233,20 +156,25 @@ module REXML
# console. This ignores the 'raw' attribute setting, and any
# entity_filter.
#
- # # Assume that the entity "s" is defined to be "sean", and that the
+ # # Assume that the entity "s" is defined to be "sean", and that the
# # entity "r" is defined to be "russell"
- # t = Text.new( "< & sean russell", false, nil, false, ['s'] )
+ # t = Text.new( "< & sean russell", false, nil, false, ['s'] )
# t.value #-> "< & sean russell"
# t = Text.new( "< & &s; russell", false, nil, false )
# t.value #-> "< & sean russell"
# u = Text.new( "sean russell", false, nil, true )
# u.value #-> "sean russell"
def value
- return @unnormalized if @unnormalized
+ @unnormalized if @unnormalized
+ doctype = nil
+ if @parent
+ doc = @parent.document
+ doctype = doc.doctype if doc
+ end
@unnormalized = Text::unnormalize( @string, doctype )
end
- # Sets the contents of this text node. This expects the text to be
+ # Sets the contents of this text node. This expects the text to be
# unnormalized. It returns self.
#
# e = Element.new( "a" )
@@ -259,7 +187,7 @@ module REXML
@normalized = nil
@raw = false
end
-
+
def wrap(string, width, addnewline=false)
# Recursively wrap string at width.
return string if string.length <= width
@@ -282,11 +210,11 @@ module REXML
new_string.strip! unless indentfirstline
return new_string
end
-
+
# == DEPRECATED
# See REXML::Formatters
#
- def write( writer, indent=-1, transitive=false, ie_hack=false )
+ def write( writer, indent=-1, transitive=false, ie_hack=false )
Kernel.warn("#{self.class.name}.write is deprecated. See REXML::Formatters")
formatter = if indent > -1
REXML::Formatters::Pretty.new( indent )
@@ -337,7 +265,7 @@ module REXML
if copy =~ illegal
raise ParseException.new( "malformed text: Illegal character #$& in \"#{copy}\"" )
end if illegal
-
+
copy.gsub!( /\r\n?/, "\n" )
if copy.include? ?&
copy.gsub!( SETUTITSBUS[0], SLAICEPS[0] )
@@ -345,7 +273,7 @@ module REXML
copy.gsub!( SETUTITSBUS[2], SLAICEPS[2] )
copy.gsub!( SETUTITSBUS[3], SLAICEPS[3] )
copy.gsub!( SETUTITSBUS[4], SLAICEPS[4] )
- copy.gsub!( /&#0*((?:\d+)|(?:x[a-f0-9]+));/ ) {
+ copy.gsub!( /&#0*((?:\d+)|(?:x[a-f0-9]+));/ ) {|m|
m=$1
#m='0' if m==''
m = "0#{m}" if m[0] == ?x
@@ -358,15 +286,15 @@ module REXML
EREFERENCE = /&(?!#{Entity::NAME};)/
# Escapes all possible entities
def Text::normalize( input, doctype=nil, entity_filter=nil )
- copy = input.to_s
+ copy = input
# Doing it like this rather than in a loop improves the speed
#copy = copy.gsub( EREFERENCE, '&amp;' )
copy = copy.gsub( "&", "&amp;" )
if doctype
# Replace all ampersands that aren't part of an entity
doctype.entities.each_value do |entity|
- copy = copy.gsub( entity.value,
- "&#{entity.name};" ) if entity.value and
+ copy = copy.gsub( entity.value,
+ "&#{entity.name};" ) if entity.value and
not( entity_filter and entity_filter.include?(entity) )
end
else
@@ -380,25 +308,37 @@ module REXML
# Unescapes all possible entities
def Text::unnormalize( string, doctype=nil, filter=nil, illegal=nil )
- string.gsub( /\r\n?/, "\n" ).gsub( REFERENCE ) {
- ref = $&
- if ref[1] == ?#
- if ref[2] == ?x
- [ref[3...-1].to_i(16)].pack('U*')
- else
- [ref[2...-1].to_i].pack('U*')
+ rv = string.clone
+ rv.gsub!( /\r\n?/, "\n" )
+ matches = rv.scan( REFERENCE )
+ return rv if matches.size == 0
+ rv.gsub!( NUMERICENTITY ) {|m|
+ m=$1
+ m = "0#{m}" if m[0] == ?x
+ [Integer(m)].pack('U*')
+ }
+ matches.collect!{|x|x[0]}.compact!
+ if matches.size > 0
+ if doctype
+ matches.each do |entity_reference|
+ unless filter and filter.include?(entity_reference)
+ entity_value = doctype.entity( entity_reference )
+ re = /&#{entity_reference};/
+ rv.gsub!( re, entity_value ) if entity_value
+ end
end
- elsif ref == '&amp;'
- '&'
- elsif filter and filter.include?( ref[1...-1] )
- ref
- elsif doctype
- doctype.entity( ref[1...-1] ) or ref
else
- entity_value = DocType::DEFAULT_ENTITIES[ ref[1...-1] ]
- entity_value ? entity_value.value : ref
+ matches.each do |entity_reference|
+ unless filter and filter.include?(entity_reference)
+ entity_value = DocType::DEFAULT_ENTITIES[ entity_reference ]
+ re = /&#{entity_reference};/
+ rv.gsub!( re, entity_value.value ) if entity_value
+ end
+ end
end
- }
+ rv.gsub!( /&amp;/, '&' )
+ end
+ rv
end
end
end
diff --git a/lib/rexml/validation/relaxng.rb b/lib/rexml/validation/relaxng.rb
index 2441901d7b..969f51bc95 100644
--- a/lib/rexml/validation/relaxng.rb
+++ b/lib/rexml/validation/relaxng.rb
@@ -79,7 +79,7 @@ module REXML
when "mixed"
states << Interleave.new( self )
states[-2] << states[-1]
- states[-1] << TEXT
+ states[-1] << TEXT
when "define"
states << [ event[2]["name"] ]
when "ref"
@@ -102,7 +102,7 @@ module REXML
case event[1]
when "element", "attribute"
states[-1] << event
- when "zeroOrMore", "oneOrMore", "choice", "optional",
+ when "zeroOrMore", "oneOrMore", "choice", "optional",
"interleave", "group", "mixed"
states.pop
when "define"
@@ -139,7 +139,7 @@ module REXML
@events.each {|s| s.reset if s.kind_of? State }
end
- def previous=( previous )
+ def previous=( previous )
@previous << previous
end
@@ -183,7 +183,7 @@ module REXML
end
def inspect
- "< #{to_s} #{@events.collect{|e|
+ "< #{to_s} #{@events.collect{|e|
pre = e == @events[@current] ? '#' : ''
pre + e.inspect unless self == e
}.join(', ')} >"
@@ -201,15 +201,15 @@ module REXML
protected
def expand_ref_in( arry, ind )
new_events = []
- @references[ arry[ind].to_s ].each{ |evt|
+ @references[ arry[ind].to_s ].each{ |evt|
add_event_to_arry(new_events,evt)
}
arry[ind,1] = new_events
end
- def add_event_to_arry( arry, evt )
+ def add_event_to_arry( arry, evt )
evt = generate_event( evt )
- if evt.kind_of? String
+ if evt.kind_of? String
arry[-1].event_arg = evt if arry[-1].kind_of? Event and @value
@value = false
else
@@ -272,7 +272,7 @@ module REXML
end
def matches?(event)
- @events[@current].matches?(event) ||
+ @events[@current].matches?(event) ||
(@current == 0 and @previous[-1].matches?(event))
end
@@ -319,7 +319,7 @@ module REXML
end
def reset
- super
+ super
@ord = 0
end
@@ -345,7 +345,7 @@ module REXML
end
def matches?( event )
- @events[@current].matches?(event) ||
+ @events[@current].matches?(event) ||
(@current == 0 and @ord > 0 and @previous[-1].matches?(event))
end
@@ -412,7 +412,7 @@ module REXML
#puts "IN CHOICE EXPECTED"
#puts "EVENTS = #{@events.inspect}"
return [@events[@current]] if @events.size > 0
- return @choices.collect do |x|
+ return @choices.collect do |x|
if x[0].kind_of? State
x[0].expected
else
@@ -426,17 +426,17 @@ module REXML
end
protected
- def add_event_to_arry( arry, evt )
+ def add_event_to_arry( arry, evt )
if evt.kind_of? State or evt.class == Ref
arry << [evt]
- elsif evt[0] == :text
+ elsif evt[0] == :text
if arry[-1] and
- arry[-1][-1].kind_of?( Event ) and
+ arry[-1][-1].kind_of?( Event ) and
arry[-1][-1].event_type == :text and @value
arry[-1][-1].event_arg = evt[1]
@value = false
- end
+ end
else
arry << [] if evt[0] == :start_element
arry[-1] << generate_event( evt )
@@ -478,7 +478,7 @@ module REXML
@choices[idx] = old
@choice += 1
end
-
+
#puts "In next with #{event.inspect}."
#puts "events is #{@events.inspect}"
@events = [] unless @events
@@ -490,7 +490,7 @@ module REXML
next_current(event) unless @events[@current]
return nil unless @events[@current]
- expand_ref_in( @events, @current ) if @events[@current].class == Ref
+ expand_ref_in( @events, @current ) if @events[@current].class == Ref
#puts "In next with #{event.inspect}."
#puts "Next (#@current) is #{@events[@current]}"
if ( @events[@current].kind_of? State )
@@ -530,7 +530,7 @@ module REXML
#puts "IN CHOICE EXPECTED"
#puts "EVENTS = #{@events.inspect}"
return [@events[@current]] if @events[@current]
- return @choices[@choice..-1].collect do |x|
+ return @choices[@choice..-1].collect do |x|
if x[0].kind_of? State
x[0].expected
else
diff --git a/lib/rexml/validation/validation.rb b/lib/rexml/validation/validation.rb
index f0ffa78912..160ea96b31 100644
--- a/lib/rexml/validation/validation.rb
+++ b/lib/rexml/validation/validation.rb
@@ -14,7 +14,7 @@ module REXML
def dump
puts @root.inspect
end
- def validate( event )
+ def validate( event )
#puts "Current: #@current"
#puts "Event: #{event.inspect}"
@attr_stack = [] unless defined? @attr_stack
@@ -33,12 +33,12 @@ module REXML
sattr = [:start_attribute, nil]
eattr = [:end_attribute]
text = [:text, nil]
- k,v = event[2].find { |key,value|
- sattr[1] = key
+ k,v = event[2].find { |k,v|
+ sattr[1] = k
#puts "Looking for #{sattr.inspect}"
m = @current.next( sattr )
#puts "Got #{m.inspect}"
- if m
+ if m
# If the state has text children...
#puts "Looking for #{eattr.inspect}"
#puts "Expect #{m.expected}"
@@ -47,7 +47,7 @@ module REXML
@current = m
else
#puts "Didn't get end"
- text[1] = value
+ text[1] = v
#puts "Looking for #{text.inspect}"
m = m.next( text )
#puts "Got #{m.inspect}"
diff --git a/lib/rexml/xmldecl.rb b/lib/rexml/xmldecl.rb
index 361e4b7106..427eb78cf8 100644
--- a/lib/rexml/xmldecl.rb
+++ b/lib/rexml/xmldecl.rb
@@ -2,40 +2,40 @@ require 'rexml/encoding'
require 'rexml/source'
module REXML
- # NEEDS DOCUMENTATION
- class XMLDecl < Child
- include Encoding
+ # NEEDS DOCUMENTATION
+ class XMLDecl < Child
+ include Encoding
- DEFAULT_VERSION = "1.0";
- DEFAULT_ENCODING = "UTF-8";
- DEFAULT_STANDALONE = "no";
- START = '<\?xml';
- STOP = '\?>';
+ DEFAULT_VERSION = "1.0";
+ DEFAULT_ENCODING = "UTF-8";
+ DEFAULT_STANDALONE = "no";
+ START = '<\?xml';
+ STOP = '\?>';
- attr_accessor :version, :standalone
+ attr_accessor :version, :standalone
attr_reader :writeencoding, :writethis
- def initialize(version=DEFAULT_VERSION, encoding=nil, standalone=nil)
+ def initialize(version=DEFAULT_VERSION, encoding=nil, standalone=nil)
@writethis = true
@writeencoding = !encoding.nil?
- if version.kind_of? XMLDecl
- super()
- @version = version.version
- self.encoding = version.encoding
+ if version.kind_of? XMLDecl
+ super()
+ @version = version.version
+ self.encoding = version.encoding
@writeencoding = version.writeencoding
- @standalone = version.standalone
- else
- super()
- @version = version
- self.encoding = encoding
- @standalone = standalone
- end
- @version = DEFAULT_VERSION if @version.nil?
- end
-
- def clone
- XMLDecl.new(self)
- end
+ @standalone = version.standalone
+ else
+ super()
+ @version = version
+ self.encoding = encoding
+ @standalone = standalone
+ end
+ @version = DEFAULT_VERSION if @version.nil?
+ end
+
+ def clone
+ XMLDecl.new(self)
+ end
# indent::
# Ignored. There must be no whitespace before an XML declaration
@@ -43,35 +43,35 @@ module REXML
# Ignored
# ie_hack::
# Ignored
- def write(writer, indent=-1, transitive=false, ie_hack=false)
+ def write(writer, indent=-1, transitive=false, ie_hack=false)
return nil unless @writethis or writer.kind_of? Output
- writer << START.sub(/\\/u, '')
+ writer << START.sub(/\\/u, '')
if writer.kind_of? Output
writer << " #{content writer.encoding}"
else
writer << " #{content encoding}"
end
- writer << STOP.sub(/\\/u, '')
- end
-
- def ==( other )
- other.kind_of?(XMLDecl) and
- other.version == @version and
- other.encoding == self.encoding and
- other.standalone == @standalone
- end
-
- def xmldecl version, encoding, standalone
- @version = version
- self.encoding = encoding
- @standalone = standalone
- end
-
- def node_type
- :xmldecl
- end
-
- alias :stand_alone? :standalone
+ writer << STOP.sub(/\\/u, '')
+ end
+
+ def ==( other )
+ other.kind_of?(XMLDecl) and
+ other.version == @version and
+ other.encoding == self.encoding and
+ other.standalone == @standalone
+ end
+
+ def xmldecl version, encoding, standalone
+ @version = version
+ self.encoding = encoding
+ @standalone = standalone
+ end
+
+ def node_type
+ :xmldecl
+ end
+
+ alias :stand_alone? :standalone
alias :old_enc= :encoding=
def encoding=( enc )
@@ -108,12 +108,12 @@ module REXML
START.sub(/\\/u, '') + " ... " + STOP.sub(/\\/u, '')
end
- private
- def content(enc)
- rv = "version='#@version'"
- rv << " encoding='#{enc}'" if @writeencoding || enc !~ /utf-8/i
- rv << " standalone='#@standalone'" if @standalone
- rv
- end
- end
+ private
+ def content(enc)
+ rv = "version='#@version'"
+ rv << " encoding='#{enc}'" if @writeencoding || enc !~ /utf-8/i
+ rv << " standalone='#@standalone'" if @standalone
+ rv
+ end
+ end
end
diff --git a/lib/rexml/xmltokens.rb b/lib/rexml/xmltokens.rb
index 83efeb0e44..6bbe5b07d5 100644
--- a/lib/rexml/xmltokens.rb
+++ b/lib/rexml/xmltokens.rb
@@ -1,18 +1,18 @@
module REXML
- # Defines a number of tokens used for parsing XML. Not for general
- # consumption.
- module XMLTokens
- NCNAME_STR= '[\w:][\-\w\d.]*'
- NAME_STR= "(?:#{NCNAME_STR}:)?#{NCNAME_STR}"
+ # Defines a number of tokens used for parsing XML. Not for general
+ # consumption.
+ module XMLTokens
+ NCNAME_STR= '[\w:][\-\w\d.]*'
+ NAME_STR= "(?:#{NCNAME_STR}:)?#{NCNAME_STR}"
- NAMECHAR = '[\-\w\d\.:]'
- NAME = "([\\w:]#{NAMECHAR}*)"
- NMTOKEN = "(?:#{NAMECHAR})+"
- NMTOKENS = "#{NMTOKEN}(\\s+#{NMTOKEN})*"
- REFERENCE = "(?:&#{NAME};|&#\\d+;|&#x[0-9a-fA-F]+;)"
+ NAMECHAR = '[\-\w\d\.:]'
+ NAME = "([\\w:]#{NAMECHAR}*)"
+ NMTOKEN = "(?:#{NAMECHAR})+"
+ NMTOKENS = "#{NMTOKEN}(\\s+#{NMTOKEN})*"
+ REFERENCE = "(?:&#{NAME};|&#\\d+;|&#x[0-9a-fA-F]+;)"
- #REFERENCE = "(?:#{ENTITYREF}|#{CHARREF})"
- #ENTITYREF = "&#{NAME};"
- #CHARREF = "&#\\d+;|&#x[0-9a-fA-F]+;"
- end
+ #REFERENCE = "(?:#{ENTITYREF}|#{CHARREF})"
+ #ENTITYREF = "&#{NAME};"
+ #CHARREF = "&#\\d+;|&#x[0-9a-fA-F]+;"
+ end
end
diff --git a/lib/rexml/xpath.rb b/lib/rexml/xpath.rb
index 5f7ecefe29..e8813efd3e 100644
--- a/lib/rexml/xpath.rb
+++ b/lib/rexml/xpath.rb
@@ -2,76 +2,65 @@ require 'rexml/functions'
require 'rexml/xpath_parser'
module REXML
- # Wrapper class. Use this class to access the XPath functions.
- class XPath
- include Functions
- EMPTY_HASH = {}
+ # Wrapper class. Use this class to access the XPath functions.
+ class XPath
+ include Functions
+ EMPTY_HASH = {}
- # Finds and returns the first node that matches the supplied xpath.
- # element::
- # The context element
- # path::
- # The xpath to search for. If not supplied or nil, returns the first
- # node matching '*'.
- # namespaces::
- # If supplied, a Hash which defines a namespace mapping.
- # variables::
- # If supplied, a Hash which maps $variables in the query
- # to values. This can be used to avoid XPath injection attacks
- # or to automatically handle escaping string values.
- #
- # XPath.first( node )
- # XPath.first( doc, "//b"} )
- # XPath.first( node, "a/x:b", { "x"=>"http://doofus" } )
- # XPath.first( node, '/book/publisher/text()=$publisher', {}, {"publisher"=>"O'Reilly"})
+ # Finds and returns the first node that matches the supplied xpath.
+ # element::
+ # The context element
+ # path::
+ # The xpath to search for. If not supplied or nil, returns the first
+ # node matching '*'.
+ # namespaces::
+ # If supplied, a Hash which defines a namespace mapping.
+ #
+ # XPath.first( node )
+ # XPath.first( doc, "//b"} )
+ # XPath.first( node, "a/x:b", { "x"=>"http://doofus" } )
def XPath::first element, path=nil, namespaces=nil, variables={}
raise "The namespaces argument, if supplied, must be a hash object." unless namespaces.nil? or namespaces.kind_of?(Hash)
raise "The variables argument, if supplied, must be a hash object." unless variables.kind_of?(Hash)
- parser = XPathParser.new
- parser.namespaces = namespaces
- parser.variables = variables
- path = "*" unless path
- element = [element] unless element.kind_of? Array
- parser.parse(path, element).flatten[0]
- end
+ parser = XPathParser.new
+ parser.namespaces = namespaces
+ parser.variables = variables
+ path = "*" unless path
+ element = [element] unless element.kind_of? Array
+ parser.parse(path, element).flatten[0]
+ end
- # Iterates over nodes that match the given path, calling the supplied
- # block with the match.
- # element::
- # The context element
- # path::
- # The xpath to search for. If not supplied or nil, defaults to '*'
- # namespaces::
- # If supplied, a Hash which defines a namespace mapping
- # variables::
- # If supplied, a Hash which maps $variables in the query
- # to values. This can be used to avoid XPath injection attacks
- # or to automatically handle escaping string values.
- #
- # XPath.each( node ) { |el| ... }
- # XPath.each( node, '/*[@attr='v']' ) { |el| ... }
- # XPath.each( node, 'ancestor::x' ) { |el| ... }
- # XPath.each( node, '/book/publisher/text()=$publisher', {}, {"publisher"=>"O'Reilly"}) \
- # {|el| ... }
- def XPath::each element, path=nil, namespaces=nil, variables={}, &block
+ # Iterates over nodes that match the given path, calling the supplied
+ # block with the match.
+ # element::
+ # The context element
+ # path::
+ # The xpath to search for. If not supplied or nil, defaults to '*'
+ # namespaces::
+ # If supplied, a Hash which defines a namespace mapping
+ #
+ # XPath.each( node ) { |el| ... }
+ # XPath.each( node, '/*[@attr='v']' ) { |el| ... }
+ # XPath.each( node, 'ancestor::x' ) { |el| ... }
+ def XPath::each element, path=nil, namespaces=nil, variables={}, &block
raise "The namespaces argument, if supplied, must be a hash object." unless namespaces.nil? or namespaces.kind_of?(Hash)
raise "The variables argument, if supplied, must be a hash object." unless variables.kind_of?(Hash)
- parser = XPathParser.new
- parser.namespaces = namespaces
- parser.variables = variables
- path = "*" unless path
- element = [element] unless element.kind_of? Array
- parser.parse(path, element).each( &block )
- end
+ parser = XPathParser.new
+ parser.namespaces = namespaces
+ parser.variables = variables
+ path = "*" unless path
+ element = [element] unless element.kind_of? Array
+ parser.parse(path, element).each( &block )
+ end
- # Returns an array of nodes matching a given XPath.
- def XPath::match element, path=nil, namespaces=nil, variables={}
- parser = XPathParser.new
- parser.namespaces = namespaces
- parser.variables = variables
- path = "*" unless path
- element = [element] unless element.kind_of? Array
- parser.parse(path,element)
- end
- end
+ # Returns an array of nodes matching a given XPath.
+ def XPath::match element, path=nil, namespaces=nil, variables={}
+ parser = XPathParser.new
+ parser.namespaces = namespaces
+ parser.variables = variables
+ path = "*" unless path
+ element = [element] unless element.kind_of? Array
+ parser.parse(path,element)
+ end
+ end
end
diff --git a/lib/rexml/xpath_parser.rb b/lib/rexml/xpath_parser.rb
index 11950ecd93..eb608fdb34 100644
--- a/lib/rexml/xpath_parser.rb
+++ b/lib/rexml/xpath_parser.rb
@@ -88,7 +88,7 @@ module REXML
case path[0]
when :document
- # do nothing
+ # do nothing
return first( path[1..-1], node )
when :child
for c in node.children
@@ -123,7 +123,7 @@ module REXML
end
- def match( path_stack, nodeset )
+ def match( path_stack, nodeset )
#puts "MATCH: path_stack = #{path_stack.inspect}"
#puts "MATCH: nodeset = #{nodeset.inspect}"
r = expr( path_stack, nodeset )
@@ -136,7 +136,7 @@ module REXML
# Returns a String namespace for a node, given a prefix
# The rules are:
- #
+ #
# 1. Use the supplied namespace mapping first.
# 2. If no mapping was supplied, use the context node to look up the namespace
def get_namespace( node, prefix )
@@ -187,8 +187,8 @@ module REXML
#puts "node.namespace == #{ns.inspect} => #{node.namespace == ns}"
end
end
- !(node.node_type == :element and
- node.name == name and
+ !(node.node_type == :element and
+ node.name == name and
node.namespace == ns )
end
node_types = ELEMENTS
@@ -205,7 +205,7 @@ module REXML
when :processing_instruction
target = path_stack.shift
nodeset.delete_if do |node|
- (node.node_type != :processing_instruction) or
+ (node.node_type != :processing_instruction) or
( target!='' and ( node.target != target ) )
end
@@ -222,7 +222,7 @@ module REXML
when :child
new_nodeset = []
nt = nil
- nodeset.each do |node|
+ for node in nodeset
nt = node.node_type
new_nodeset += node.children if nt == :element or nt == :document
end
@@ -231,7 +231,7 @@ module REXML
when :literal
return path_stack.shift
-
+
when :attribute
new_nodeset = []
case path_stack.shift
@@ -266,7 +266,7 @@ module REXML
when :ancestor
new_nodeset = []
- nodeset.each do |node|
+ for node in nodeset
while node.parent
node = node.parent
new_nodeset << node unless new_nodeset.include? node
@@ -277,7 +277,7 @@ module REXML
when :ancestor_or_self
new_nodeset = []
- nodeset.each do |node|
+ for node in nodeset
if node.node_type == :element
new_nodeset << node
while ( node.parent )
@@ -341,7 +341,7 @@ module REXML
when :descendant
results = []
nt = nil
- nodeset.each do |node|
+ for node in nodeset
nt = node.node_type
results += expr( path_stack.dclone.unshift( :descendant_or_self ),
node.children ) if nt == :element or nt == :document
@@ -376,7 +376,7 @@ module REXML
when :preceding
new_nodeset = []
- nodeset.each do |node|
+ for node in nodeset
new_nodeset += preceding( node )
end
#puts "NEW NODESET => #{new_nodeset.inspect}"
@@ -385,7 +385,7 @@ module REXML
when :following
new_nodeset = []
- nodeset.each do |node|
+ for node in nodeset
new_nodeset += following( node )
end
nodeset = new_nodeset
@@ -395,7 +395,7 @@ module REXML
#puts "In :namespace"
new_nodeset = []
prefix = path_stack.shift
- nodeset.each do |node|
+ for node in nodeset
if (node.node_type == :element or node.node_type == :attribute)
if @namespaces
namespaces = @namespaces
@@ -419,10 +419,10 @@ module REXML
return @variables[ var_name ]
# :and, :or, :eq, :neq, :lt, :lteq, :gt, :gteq
- # TODO: Special case for :or and :and -- not evaluate the right
- # operand if the left alone determines result (i.e. is true for
- # :or and false for :and).
- when :eq, :neq, :lt, :lteq, :gt, :gteq, :or
+ # TODO: Special case for :or and :and -- not evaluate the right
+ # operand if the left alone determines result (i.e. is true for
+ # :or and false for :and).
+ when :eq, :neq, :lt, :lteq, :gt, :gteq, :and, :or
left = expr( path_stack.shift, nodeset.dup, context )
#puts "LEFT => #{left.inspect} (#{left.class.name})"
right = expr( path_stack.shift, nodeset.dup, context )
@@ -481,23 +481,23 @@ module REXML
when :function
func_name = path_stack.shift.tr('-','_')
arguments = path_stack.shift
- #puts "FUNCTION 0: #{func_name}(#{arguments.collect{|a|a.inspect}.join(', ')})"
+ #puts "FUNCTION 0: #{func_name}(#{arguments.collect{|a|a.inspect}.join(', ')})"
subcontext = context ? nil : { :size => nodeset.size }
res = []
cont = context
- nodeset.each_with_index { |n, i|
+ nodeset.each_with_index { |n, i|
if subcontext
subcontext[:node] = n
subcontext[:index] = i
cont = subcontext
end
arg_clone = arguments.dclone
- args = arg_clone.collect { |arg|
+ args = arg_clone.collect { |arg|
#puts "FUNCTION 1: Calling expr( #{arg.inspect}, [#{n.inspect}] )"
- expr( arg, [n], cont )
+ expr( arg, [n], cont )
}
- #puts "FUNCTION 2: #{func_name}(#{args.collect{|a|a.inspect}.join(', ')})"
+ #puts "FUNCTION 2: #{func_name}(#{args.collect{|a|a.inspect}.join(', ')})"
Functions.context = cont
res << Functions.send( func_name, *args )
#puts "FUNCTION 3: #{res[-1].inspect}"
@@ -515,10 +515,10 @@ module REXML
# FIXME
# The next two methods are BAD MOJO!
# This is my achilles heel. If anybody thinks of a better
- # way of doing this, be my guest. This really sucks, but
+ # way of doing this, be my guest. This really sucks, but
# it is a wonder it works at all.
# ########################################################
-
+
def descendant_or_self( path_stack, nodeset )
rs = []
#puts "#"*80
@@ -547,7 +547,7 @@ module REXML
# Reorders an array of nodes so that they are in document order
# It tries to do this efficiently.
#
- # FIXME: I need to get rid of this, but the issue is that most of the XPath
+ # FIXME: I need to get rid of this, but the issue is that most of the XPath
# interpreter functions as a filter, which means that we lose context going
# in and out of function calls. If I knew what the index of the nodes was,
# I wouldn't have to do this. Maybe add a document IDX for each node?
@@ -555,7 +555,7 @@ module REXML
def document_order( array_of_nodes )
new_arry = []
array_of_nodes.each { |node|
- node_idx = []
+ node_idx = []
np = node.node_type == :attribute ? node.element : node
while np.parent and np.parent.node_type == :element
node_idx << np.parent.index( np )
@@ -579,7 +579,7 @@ module REXML
# Builds a nodeset of all of the preceding nodes of the supplied node,
# in reverse document order
- # preceding:: includes every element in the document that precedes this node,
+ # preceding:: includes every element in the document that precedes this node,
# except for ancestors
def preceding( node )
#puts "IN PRECEDING"
@@ -609,9 +609,9 @@ module REXML
#puts "NODE: #{node.inspect}"
#puts "PREVIOUS NODE: #{node.previous_sibling_node.inspect}"
#puts "PARENT NODE: #{node.parent}"
- psn = node.previous_sibling_node
+ psn = node.previous_sibling_node
if psn.nil?
- if node.parent.nil? or node.parent.class == Document
+ if node.parent.nil? or node.parent.class == Document
return nil
end
return node.parent
@@ -647,9 +647,9 @@ module REXML
end
def next_sibling_node(node)
- psn = node.next_sibling_node
+ psn = node.next_sibling_node
while psn.nil?
- if node.parent.nil? or node.parent.class == Document
+ if node.parent.nil? or node.parent.class == Document
return nil
end
node = node.parent
@@ -675,7 +675,7 @@ module REXML
def equality_relational_compare( set1, op, set2 )
#puts "EQ_REL_COMP(#{set1.inspect} #{op.inspect} #{set2.inspect})"
if set1.kind_of? Array and set2.kind_of? Array
- #puts "#{set1.size} & #{set2.size}"
+ #puts "#{set1.size} & #{set2.size}"
if set1.size == 1 and set2.size == 1
set1 = set1[0]
set2 = set2[0]
@@ -696,7 +696,7 @@ module REXML
return res
end
end
- #puts "EQ_REL_COMP: #{set1.inspect} (#{set1.class.name}), #{op}, #{set2.inspect} (#{set2.class.name})"
+ #puts "EQ_REL_COMP: #{set1.inspect} (#{set1.class.name}), #{op}, #{set2.inspect} (#{set2.class.name})"
#puts "COMPARING VALUES"
# If one is nodeset and other is number, compare number to each item
# in nodeset s.t. number op number(string(item))
@@ -705,7 +705,7 @@ module REXML
# If one is nodeset and other is boolean, compare boolean to each item
# in nodeset s.t. boolean op boolean(item)
if set1.kind_of? Array or set2.kind_of? Array
- #puts "ISA ARRAY"
+ #puts "ISA ARRAY"
if set1.kind_of? Array
a = set1
b = set2
@@ -724,7 +724,7 @@ module REXML
#puts "B = #{b.inspect}"
return a.collect {|v| compare( Functions::number(v), op, b )}
else
- #puts "Functions::string( #{b}(#{b.class.name}) ) = #{Functions::string(b)}"
+ #puts "Functions::string( #{b}(#{b.class.name}) ) = #{Functions::string(b)}"
b = Functions::string( b )
return a.collect { |v| compare( Functions::string(v), op, b ) }
end
diff --git a/lib/rinda/.document b/lib/rinda/.document
deleted file mode 100644
index 598977af68..0000000000
--- a/lib/rinda/.document
+++ /dev/null
@@ -1,3 +0,0 @@
-rinda.rb
-ring.rb
-tuplespace.rb
diff --git a/lib/rinda/rinda.rb b/lib/rinda/rinda.rb
index 18e284a544..6c59e68654 100644
--- a/lib/rinda/rinda.rb
+++ b/lib/rinda/rinda.rb
@@ -58,7 +58,7 @@ module Rinda
##
# The number of elements in the tuple.
-
+
def size
@tuple.size
end
@@ -162,7 +162,7 @@ module Rinda
end
return true
end
-
+
##
# Alias for #match.
@@ -171,7 +171,7 @@ module Rinda
end
end
-
+
##
# <i>Documentation?</i>
@@ -184,7 +184,7 @@ module Rinda
@drb_uri = uri
@drb_ref = ref
end
-
+
##
# This DRbObjectTemplate matches +ro+ if the remote object's drburi and
# drbref are the same. +nil+ is used as a wildcard.
@@ -213,14 +213,14 @@ module Rinda
def initialize(ts)
@ts = ts
end
-
+
##
# Adds +tuple+ to the proxied TupleSpace. See TupleSpace#write.
def write(tuple, sec=nil)
@ts.write(tuple, sec)
end
-
+
##
# Takes +tuple+ from the proxied TupleSpace. See TupleSpace#take.
@@ -229,14 +229,14 @@ module Rinda
@ts.move(DRbObject.new(port), tuple, sec, &block)
port[0]
end
-
+
##
# Reads +tuple+ from the proxied TupleSpace. See TupleSpace#read.
def read(tuple, sec=nil, &block)
@ts.read(tuple, sec, &block)
end
-
+
##
# Reads all tuples matching +tuple+ from the proxied TupleSpace. See
# TupleSpace#read_all.
@@ -244,7 +244,7 @@ module Rinda
def read_all(tuple)
@ts.read_all(tuple)
end
-
+
##
# Registers for notifications of event +ev+ on the proxied TupleSpace.
# See TupleSpace#notify
diff --git a/lib/rinda/ring.rb b/lib/rinda/ring.rb
index b25fd99856..1fad92dbc7 100644
--- a/lib/rinda/ring.rb
+++ b/lib/rinda/ring.rb
@@ -49,7 +49,7 @@ module Rinda
end
end
end
-
+
##
# Extracts the response URI from +msg+ and adds it to TupleSpace where it
# will be picked up by +reply_service+ for notification.
@@ -74,13 +74,13 @@ module Rinda
end
end
end
-
+
##
# Pulls lookup tuples out of the TupleSpace and sends their DRb object the
# address of the local TupleSpace.
def do_reply
- tuple = @ts.take([:lookup_ring, DRbObject])
+ tuple = @ts.take([:lookup_ring, nil])
Thread.new { tuple[1].call(@ts) rescue nil}
rescue
end
@@ -104,7 +104,7 @@ module Rinda
# created RingFinger.
def self.finger
- unless @@finger
+ unless @@finger
@@finger = self.new
@@finger.lookup_ring_any
end
@@ -207,7 +207,7 @@ module Rinda
@rings.push(it)
end
end
-
+
@primary = queue.pop
raise('RingNotFound') if @primary.nil?
@primary
@@ -256,15 +256,15 @@ if __FILE__ == $0
$stdin.gets
when 'w'
finger = Rinda::RingFinger.new(nil)
- finger.lookup_ring do |ts2|
- p ts2
- ts2.write([:hello, :world])
+ finger.lookup_ring do |ts|
+ p ts
+ ts.write([:hello, :world])
end
when 'r'
finger = Rinda::RingFinger.new(nil)
- finger.lookup_ring do |ts2|
- p ts2
- p ts2.take([nil, nil])
+ finger.lookup_ring do |ts|
+ p ts
+ p ts.take([nil, nil])
end
end
end
diff --git a/lib/rinda/tuplespace.rb b/lib/rinda/tuplespace.rb
index 113aa0de15..b0409dde3b 100644
--- a/lib/rinda/tuplespace.rb
+++ b/lib/rinda/tuplespace.rb
@@ -73,14 +73,14 @@ module Rinda
end
##
- # Reset the expiry time according to +sec_or_renewer+.
+ # Reset the expiry time according to +sec_or_renewer+.
#
# +nil+:: it is set to expire in the far future.
# +false+:: it has expired.
# Numeric:: it will expire in that many seconds.
#
# Otherwise the argument refers to some kind of renewer object
- # which will reset its expiry time.
+ # which will reset its expiry time.
def renew(sec_or_renewer)
sec, @renewer = get_renewer(sec_or_renewer)
@@ -168,7 +168,7 @@ module Rinda
def match(tuple)
@tuple.match(tuple)
end
-
+
alias === match
def make_tuple(ary) # :nodoc:
@@ -224,11 +224,11 @@ module Rinda
#
# ts = Rinda::TupleSpace.new
# observer = ts.notify 'write', [nil]
- #
+ #
# Thread.start do
# observer.each { |t| p t }
# end
- #
+ #
# 3.times { |i| ts.write [i] }
#
# Outputs:
@@ -276,7 +276,7 @@ module Rinda
it = pop
yield(it)
end
- rescue
+ rescue
ensure
cancel
end
@@ -295,16 +295,16 @@ module Rinda
def initialize
@bin = []
end
-
+
def add(tuple)
@bin.push(tuple)
end
-
+
def delete(tuple)
idx = @bin.rindex(tuple)
@bin.delete_at(idx) if idx
end
-
+
def find(&blk)
@bin.reverse_each do |x|
return x if yield(x)
@@ -315,7 +315,7 @@ module Rinda
def initialize # :nodoc:
@hash = {}
- @enum = enum_for(:each_entry)
+ @enum = Enumerable::Enumerator.new(self, :each_entry)
end
##
diff --git a/lib/rss/0.9.rb b/lib/rss/0.9.rb
index 28ef768274..7b24e7596d 100644
--- a/lib/rss/0.9.rb
+++ b/lib/rss/0.9.rb
@@ -8,7 +8,7 @@ module RSS
def self.append_features(klass)
super
-
+
klass.install_must_call_validator('', "")
end
end
@@ -123,7 +123,7 @@ module RSS
def not_need_to_call_setup_maker_variables
%w(image textInput)
end
-
+
class SkipDays < Element
include RSS09
@@ -146,11 +146,11 @@ module RSS
self.content = args[0]
end
end
-
+
end
-
+
end
-
+
class SkipHours < Element
include RSS09
@@ -174,13 +174,13 @@ module RSS
end
end
end
-
+
end
-
+
class Image < Element
include RSS09
-
+
%w(url title link).each do |name|
install_text_element(name, "", nil)
end
@@ -239,9 +239,9 @@ module RSS
end
end
end
-
+
class Item < Element
-
+
include RSS09
[
@@ -269,7 +269,7 @@ module RSS
@enclosure.setup_maker(item) if @enclosure
@source.setup_maker(item) if @source
end
-
+
class Source < Element
include RSS09
@@ -279,7 +279,7 @@ module RSS
].each do |name, uri, required|
install_get_attribute(name, uri, required)
end
-
+
content_setup
def initialize(*args)
@@ -341,7 +341,7 @@ module RSS
class Category < Element
include RSS09
-
+
[
["domain", "", false]
].each do |name, uri, required|
@@ -369,11 +369,11 @@ module RSS
category.domain = domain
category.content = content
end
-
+
end
end
-
+
class TextInput < Element
include RSS09
@@ -399,9 +399,9 @@ module RSS
maker.textinput
end
end
-
+
end
-
+
end
RSS09::ELEMENTS.each do |name|
@@ -411,8 +411,8 @@ module RSS
module ListenerMixin
private
def initial_start_rss(tag_name, prefix, attrs, ns)
- check_ns(tag_name, prefix, ns, "", false)
-
+ check_ns(tag_name, prefix, ns, "")
+
@rss = Rss.new(attrs['version'], @version, @encoding, @standalone)
@rss.do_validate = @do_validate
@rss.xml_stylesheets = @xml_stylesheets
@@ -422,7 +422,7 @@ module RSS
end
@proc_stack.push(pr)
end
-
+
end
end
diff --git a/lib/rss/1.0.rb b/lib/rss/1.0.rb
index 2ff53b4723..f04e61c5eb 100644
--- a/lib/rss/1.0.rb
+++ b/lib/rss/1.0.rb
@@ -8,7 +8,7 @@ module RSS
def self.append_features(klass)
super
-
+
klass.install_must_call_validator('', ::RSS::URI)
end
@@ -64,13 +64,13 @@ module RSS
URI
end
end
-
+
[
["resource", [URI, ""], true]
].each do |name, uri, required|
install_get_attribute(name, uri, required)
end
-
+
def initialize(*args)
if Utils.element_initialize_arguments?(args)
super
@@ -98,10 +98,10 @@ module RSS
end
@tag_name = 'Seq'
-
+
install_have_children_element("li", URI, "*")
install_must_call_validator('rdf', ::RSS::RDF::URI)
-
+
def initialize(*args)
if Utils.element_initialize_arguments?(args)
super
@@ -114,7 +114,7 @@ module RSS
def full_name
tag_name_with_prefix(PREFIX)
end
-
+
def setup_maker(target)
lis.each do |li|
target << li.resource
@@ -135,10 +135,10 @@ module RSS
end
@tag_name = 'Bag'
-
+
install_have_children_element("li", URI, "*")
install_must_call_validator('rdf', URI)
-
+
def initialize(*args)
if Utils.element_initialize_arguments?(args)
super
@@ -151,7 +151,7 @@ module RSS
def full_name
tag_name_with_prefix(PREFIX)
end
-
+
def setup_maker(target)
lis.each do |li|
target << li.resource
@@ -162,7 +162,7 @@ module RSS
class Channel < Element
include RSS10
-
+
class << self
def required_uri
@@ -202,17 +202,17 @@ module RSS
def maker_target(maker)
maker.channel
end
-
+
def setup_maker_attributes(channel)
channel.about = about
end
class Image < Element
-
+
include RSS10
class << self
-
+
def required_uri
::RSS::URI
end
@@ -225,7 +225,7 @@ module RSS
install_get_attribute(name, uri, required, nil, nil,
"#{PREFIX}:#{name}")
end
-
+
def initialize(*args)
if Utils.element_initialize_arguments?(args)
super
@@ -237,11 +237,11 @@ module RSS
end
class Textinput < Element
-
+
include RSS10
class << self
-
+
def required_uri
::RSS::URI
end
@@ -254,7 +254,7 @@ module RSS
install_get_attribute(name, uri, required, nil, nil,
"#{PREFIX}:#{name}")
end
-
+
def initialize(*args)
if Utils.element_initialize_arguments?(args)
super
@@ -264,7 +264,7 @@ module RSS
end
end
end
-
+
class Items < Element
include RSS10
@@ -272,16 +272,16 @@ module RSS
Seq = ::RSS::RDF::Seq
class << self
-
+
def required_uri
::RSS::URI
end
-
+
end
install_have_child_element("Seq", URI, nil)
install_must_call_validator('rdf', URI)
-
+
def initialize(*args)
if Utils.element_initialize_arguments?(args)
super
@@ -309,7 +309,7 @@ module RSS
include RSS10
class << self
-
+
def required_uri
::RSS::URI
end
@@ -351,7 +351,7 @@ module RSS
def required_uri
::RSS::URI
end
-
+
end
@@ -436,7 +436,7 @@ module RSS
module ListenerMixin
private
def initial_start_RDF(tag_name, prefix, attrs, ns)
- check_ns(tag_name, prefix, ns, RDF::URI, false)
+ check_ns(tag_name, prefix, ns, RDF::URI)
@rss = RDF.new(@version, @encoding, @standalone)
@rss.do_validate = @do_validate
diff --git a/lib/rss/2.0.rb b/lib/rss/2.0.rb
index 9622c598d9..3798da4eb7 100644
--- a/lib/rss/2.0.rb
+++ b/lib/rss/2.0.rb
@@ -29,7 +29,7 @@ module RSS
Category = Item::Category
class Item
-
+
[
["comments", "?"],
["author", "?"],
@@ -57,9 +57,9 @@ module RSS
_setup_maker_element(item)
@guid.setup_maker(item) if @guid
end
-
+
class Guid < Element
-
+
include RSS09
[
diff --git a/lib/rss/atom.rb b/lib/rss/atom.rb
index ff8ff2249a..7cba934feb 100644
--- a/lib/rss/atom.rb
+++ b/lib/rss/atom.rb
@@ -1,3 +1,4 @@
+require 'base64'
require 'rss/parser'
module RSS
@@ -716,7 +717,7 @@ module RSS
module ListenerMixin
private
def initial_start_feed(tag_name, prefix, attrs, ns)
- check_ns(tag_name, prefix, ns, Atom::URI, false)
+ check_ns(tag_name, prefix, ns, Atom::URI)
@rss = Atom::Feed.new(@version, @encoding, @standalone)
@rss.do_validate = @do_validate
@@ -731,7 +732,7 @@ module RSS
end
def initial_start_entry(tag_name, prefix, attrs, ns)
- check_ns(tag_name, prefix, ns, Atom::URI, false)
+ check_ns(tag_name, prefix, ns, Atom::URI)
@rss = Atom::Entry.new(@version, @encoding, @standalone)
@rss.do_validate = @do_validate
diff --git a/lib/rss/content/1.0.rb b/lib/rss/content/1.0.rb
index e5dc857930..e7c0c19685 100644
--- a/lib/rss/content/1.0.rb
+++ b/lib/rss/content/1.0.rb
@@ -1,4 +1,5 @@
require 'rss/1.0'
+require 'rss/content'
module RSS
RDF.install_ns(CONTENT_PREFIX, CONTENT_URI)
diff --git a/lib/rss/content/2.0.rb b/lib/rss/content/2.0.rb
index 8491a99937..8671b5b1a6 100644
--- a/lib/rss/content/2.0.rb
+++ b/lib/rss/content/2.0.rb
@@ -1,4 +1,5 @@
require "rss/2.0"
+require "rss/content"
module RSS
Rss.install_ns(CONTENT_PREFIX, CONTENT_URI)
diff --git a/lib/rss/converter.rb b/lib/rss/converter.rb
index 3e79eba4fb..415a319188 100644
--- a/lib/rss/converter.rb
+++ b/lib/rss/converter.rb
@@ -3,14 +3,10 @@ require "rss/utils"
module RSS
class Converter
-
+
include Utils
def initialize(to_enc, from_enc=nil)
- if "".respond_to?(:encode)
- @to_encoding = to_enc
- return
- end
normalized_to_enc = to_enc.downcase.gsub(/-/, '_')
from_enc ||= 'utf-8'
normalized_from_enc = from_enc.downcase.gsub(/-/, '_')
@@ -27,11 +23,7 @@ module RSS
end
def convert(value)
- if value.is_a?(String) and value.respond_to?(:encode)
- value.encode(@to_encoding)
- else
- value
- end
+ value
end
def def_convert(depth=0)
@@ -63,11 +55,11 @@ module RSS
raise UnknownConversionMethodError.new(to_enc, from_enc)
end
end
-
+
def def_else_enc(to_enc, from_enc)
def_iconv_convert(to_enc, from_enc, 0)
end
-
+
def def_same_enc()
def_convert do |value|
value
@@ -101,40 +93,40 @@ module RSS
def def_to_euc_jp_from_utf_8
def_uconv_convert_if_can('u8toeuc', 'EUC-JP', 'UTF-8', '-We')
end
-
+
def def_to_utf_8_from_euc_jp
def_uconv_convert_if_can('euctou8', 'UTF-8', 'EUC-JP', '-Ew')
end
-
+
def def_to_shift_jis_from_utf_8
def_uconv_convert_if_can('u8tosjis', 'Shift_JIS', 'UTF-8', '-Ws')
end
-
+
def def_to_utf_8_from_shift_jis
def_uconv_convert_if_can('sjistou8', 'UTF-8', 'Shift_JIS', '-Sw')
end
-
+
def def_to_euc_jp_from_shift_jis
require "nkf"
def_convert do |value|
"NKF.nkf('-Se', #{value})"
end
end
-
+
def def_to_shift_jis_from_euc_jp
require "nkf"
def_convert do |value|
"NKF.nkf('-Es', #{value})"
end
end
-
+
def def_to_euc_jp_from_iso_2022_jp
require "nkf"
def_convert do |value|
"NKF.nkf('-Je', #{value})"
end
end
-
+
def def_to_iso_2022_jp_from_euc_jp
require "nkf"
def_convert do |value|
@@ -147,7 +139,7 @@ module RSS
"#{value}.unpack('C*').pack('U*')"
end
end
-
+
def def_to_iso_8859_1_from_utf_8
def_convert do |value|
<<-EOC
@@ -164,7 +156,7 @@ module RSS
EOC
end
end
-
+
end
-
+
end
diff --git a/lib/rss/dublincore.rb b/lib/rss/dublincore.rb
index 53a4ca70d6..7ba239f8f1 100644
--- a/lib/rss/dublincore.rb
+++ b/lib/rss/dublincore.rb
@@ -25,7 +25,7 @@ module RSS
def #{full_name}
@#{full_name}.first and @#{full_name}.first.value
end
-
+
def #{full_name}=(new_value)
@#{full_name}[0] = Utils.new_with_value_if_need(#{klass_name}, new_value)
end
@@ -50,7 +50,7 @@ module RSS
EOC
end
end
-
+
module DublinCoreModel
extend BaseModel
@@ -76,26 +76,26 @@ module RSS
DATE_ELEMENTS = {
"date" => "w3cdtf",
}
-
+
ELEMENT_NAME_INFOS = DublinCoreModel::TEXT_ELEMENTS.to_a
DublinCoreModel::DATE_ELEMENTS.each do |name, |
ELEMENT_NAME_INFOS << [name, nil]
end
-
+
ELEMENTS = TEXT_ELEMENTS.keys + DATE_ELEMENTS.keys
ELEMENTS.each do |name, plural_name|
module_eval(<<-EOC, *get_file_and_line_from_caller(0))
class DublinCore#{Utils.to_class_name(name)} < Element
include RSS10
-
+
content_setup
class << self
def required_prefix
DC_PREFIX
end
-
+
def required_uri
DC_URI
end
@@ -105,7 +105,7 @@ module RSS
alias_method(:value, :content)
alias_method(:value=, :content=)
-
+
def initialize(*args)
if Utils.element_initialize_arguments?(args)
super
@@ -114,7 +114,7 @@ module RSS
self.content = args[0]
end
end
-
+
def full_name
tag_name_with_prefix(DC_PREFIX)
end
diff --git a/lib/rss/dublincore/1.0.rb b/lib/rss/dublincore/1.0.rb
index efe2f5dad4..e193c6d2c2 100644
--- a/lib/rss/dublincore/1.0.rb
+++ b/lib/rss/dublincore/1.0.rb
@@ -1,4 +1,5 @@
require "rss/1.0"
+require "rss/dublincore"
module RSS
RDF.install_ns(DC_PREFIX, DC_URI)
diff --git a/lib/rss/dublincore/2.0.rb b/lib/rss/dublincore/2.0.rb
index a79c1e84a4..82ed1888c5 100644
--- a/lib/rss/dublincore/2.0.rb
+++ b/lib/rss/dublincore/2.0.rb
@@ -1,4 +1,5 @@
require "rss/2.0"
+require "rss/dublincore"
module RSS
Rss.install_ns(DC_PREFIX, DC_URI)
diff --git a/lib/rss/dublincore/atom.rb b/lib/rss/dublincore/atom.rb
index 8db9066bb8..e78df4821b 100644
--- a/lib/rss/dublincore/atom.rb
+++ b/lib/rss/dublincore/atom.rb
@@ -1,4 +1,5 @@
require "rss/atom"
+require "rss/dublincore"
module RSS
module Atom
diff --git a/lib/rss/image.rb b/lib/rss/image.rb
index e79e9f5e65..c4714aea12 100644
--- a/lib/rss/image.rb
+++ b/lib/rss/image.rb
@@ -15,7 +15,7 @@ module RSS
BaseListener.install_class_name(IMAGE_URI, name, "Image#{class_name}")
IMAGE_ELEMENTS << "#{IMAGE_PREFIX}_#{name}"
end
-
+
module ImageModelUtils
def validate_one_tag_name(ignore_unknown_element, name, tags)
if !ignore_unknown_element
@@ -25,7 +25,7 @@ module RSS
raise TooMuchTagError.new(name, tag_name) if tags.size > 1
end
end
-
+
module ImageItemModel
include ImageModelUtils
extend BaseModel
@@ -43,12 +43,12 @@ module RSS
include DublinCoreModel
@tag_name = "item"
-
+
class << self
def required_prefix
IMAGE_PREFIX
end
-
+
def required_uri
IMAGE_URI
end
@@ -102,11 +102,11 @@ module RSS
end
end
end
-
+
module ImageFaviconModel
include ImageModelUtils
extend BaseModel
-
+
def self.append_features(klass)
super
@@ -122,12 +122,12 @@ module RSS
include DublinCoreModel
@tag_name = "favicon"
-
+
class << self
def required_prefix
IMAGE_PREFIX
end
-
+
def required_uri
IMAGE_URI
end
@@ -154,7 +154,7 @@ module RSS
end
set_size(new_value)
end
-
+
alias image_size= size=
alias image_size size
diff --git a/lib/rss/maker.rb b/lib/rss/maker.rb
index a7ee200b32..bcba1aaff3 100644
--- a/lib/rss/maker.rb
+++ b/lib/rss/maker.rb
@@ -6,13 +6,13 @@ module RSS
class << self
def make(version, &block)
- self[version].make(&block)
+ m = maker(version)
+ raise UnsupportedMakerVersionError.new(version) if m.nil?
+ m[:maker].make(m[:version], &block)
end
- def [](version)
- maker_info = maker(version)
- raise UnsupportedMakerVersionError.new(version) if maker_info.nil?
- maker_info[:maker]
+ def maker(version)
+ MAKERS[version]
end
def add_maker(version, normalized_version, maker)
@@ -26,16 +26,6 @@ module RSS
def makers
MAKERS.values.collect {|info| info[:maker]}.uniq
end
-
- def supported?(version)
- versions.include?(version)
- end
-
- private
- # Can I remove this method?
- def maker(version)
- MAKERS[version]
- end
end
end
end
diff --git a/lib/rss/maker/0.9.rb b/lib/rss/maker/0.9.rb
index aede4d7c20..72b14dc977 100644
--- a/lib/rss/maker/0.9.rb
+++ b/lib/rss/maker/0.9.rb
@@ -4,14 +4,14 @@ require "rss/maker/base"
module RSS
module Maker
-
+
class RSS09 < RSSBase
-
- def initialize(feed_version)
+
+ def initialize(feed_version="0.92")
super
@feed_type = "rss"
end
-
+
private
def make_feed
Rss.new(@feed_version, @version, @encoding, @standalone)
@@ -38,20 +38,20 @@ module RSS
raise NotSetError.new("maker.channel", _not_set_required_variables)
end
end
-
+
private
def setup_items(rss)
@maker.items.to_feed(rss)
end
-
+
def setup_image(rss)
@maker.image.to_feed(rss)
end
-
+
def setup_textinput(rss)
@maker.textinput.to_feed(rss)
end
-
+
def variables
super + ["pubDate"]
end
@@ -78,7 +78,7 @@ module RSS
end
end
end
-
+
class Day < DayBase
def to_feed(rss, days)
day = Rss::Channel::SkipDays::Day.new
@@ -96,7 +96,7 @@ module RSS
end
end
end
-
+
class SkipHours < SkipHoursBase
def to_feed(rss, channel)
unless @hours.empty?
@@ -108,7 +108,7 @@ module RSS
end
end
end
-
+
class Hour < HourBase
def to_feed(rss, hours)
hour = Rss::Channel::SkipHours::Hour.new
@@ -126,7 +126,7 @@ module RSS
end
end
end
-
+
class Cloud < CloudBase
def to_feed(*args)
end
@@ -243,7 +243,7 @@ module RSS
true
end
end
-
+
class Items < ItemsBase
def to_feed(rss)
if rss.channel
@@ -253,7 +253,7 @@ module RSS
setup_other_elements(rss, rss.items)
end
end
-
+
class Item < ItemBase
def to_feed(rss)
item = Rss::Channel::Item.new
@@ -439,7 +439,7 @@ module RSS
end
end
end
-
+
class Textinput < TextinputBase
def to_feed(rss)
textInput = Rss::Channel::TextInput.new
@@ -457,52 +457,11 @@ module RSS
end
end
end
-
- class RSS091 < RSS09
- def initialize(feed_version="0.91")
- super
- end
-
- class Channel < RSS09::Channel
- end
-
- class Items < RSS09::Items
- class Item < RSS09::Items::Item
- end
- end
-
- class Image < RSS09::Image
- end
-
- class Textinput < RSS09::Textinput
- end
- end
-
- class RSS092 < RSS09
- def initialize(feed_version="0.92")
- super
- end
-
- class Channel < RSS09::Channel
- end
-
- class Items < RSS09::Items
- class Item < RSS09::Items::Item
- end
- end
-
- class Image < RSS09::Image
- end
-
- class Textinput < RSS09::Textinput
- end
- end
-
- add_maker("0.9", "0.92", RSS092)
- add_maker("0.91", "0.91", RSS091)
- add_maker("0.92", "0.92", RSS092)
- add_maker("rss0.9", "0.92", RSS092)
- add_maker("rss0.91", "0.91", RSS091)
- add_maker("rss0.92", "0.92", RSS092)
+
+ add_maker("0.9", "0.92", RSS09)
+ add_maker("0.91", "0.91", RSS09)
+ add_maker("0.92", "0.92", RSS09)
+ add_maker("rss0.91", "0.91", RSS09)
+ add_maker("rss0.92", "0.92", RSS09)
end
end
diff --git a/lib/rss/maker/1.0.rb b/lib/rss/maker/1.0.rb
index 0d8075f836..a1e2594f70 100644
--- a/lib/rss/maker/1.0.rb
+++ b/lib/rss/maker/1.0.rb
@@ -25,7 +25,6 @@ module RSS
end
class Channel < ChannelBase
- include SetupDefaultLanguage
def to_feed(rss)
set_default_values do
@@ -61,7 +60,7 @@ module RSS
rss.channel.items = items
set_parent(rss.channel, items)
end
-
+
def setup_image(rss)
if @maker.image.have_required_values?
image = RDF::Channel::Image.new(@maker.image.url)
@@ -92,11 +91,11 @@ module RSS
class SkipDays < SkipDaysBase
def to_feed(*args)
end
-
+
class Day < DayBase
end
end
-
+
class SkipHours < SkipHoursBase
def to_feed(*args)
end
@@ -104,7 +103,7 @@ module RSS
class Hour < HourBase
end
end
-
+
class Cloud < CloudBase
def to_feed(*args)
end
@@ -404,7 +403,7 @@ module RSS
end
end
end
-
+
class Textinput < TextinputBase
def to_feed(rss)
if @link
diff --git a/lib/rss/maker/2.0.rb b/lib/rss/maker/2.0.rb
index 15b1349c2a..67d68126ac 100644
--- a/lib/rss/maker/2.0.rb
+++ b/lib/rss/maker/2.0.rb
@@ -4,9 +4,9 @@ require "rss/maker/0.9"
module RSS
module Maker
-
+
class RSS20 < RSS09
-
+
def initialize(feed_version="2.0")
super
end
@@ -17,17 +17,17 @@ module RSS
def required_variable_names
%w(link)
end
-
+
class SkipDays < RSS09::Channel::SkipDays
class Day < RSS09::Channel::SkipDays::Day
end
end
-
+
class SkipHours < RSS09::Channel::SkipHours
class Hour < RSS09::Channel::SkipHours::Hour
end
end
-
+
class Cloud < RSS09::Channel::Cloud
def to_feed(rss, channel)
cloud = Rss::Channel::Cloud.new
@@ -51,7 +51,7 @@ module RSS
category.to_feed(rss, channel)
end
end
-
+
class Category < RSS09::Channel::Categories::Category
def to_feed(rss, channel)
category = Rss::Channel::Category.new
@@ -81,14 +81,14 @@ module RSS
end
end
end
-
+
class Image < RSS09::Image
private
def required_element?
false
end
end
-
+
class Items < RSS09::Items
class Item < RSS09::Items::Item
private
@@ -179,7 +179,7 @@ module RSS
category.to_feed(rss, item)
end
end
-
+
class Category < RSS09::Items::Item::Categories::Category
def to_feed(rss, item)
category = Rss::Channel::Item::Category.new
@@ -212,11 +212,11 @@ module RSS
end
end
end
-
+
class Textinput < RSS09::Textinput
end
end
-
+
add_maker("2.0", "2.0", RSS20)
add_maker("rss2.0", "2.0", RSS20)
end
diff --git a/lib/rss/maker/base.rb b/lib/rss/maker/base.rb
index 5d795443a4..56bf04657e 100644
--- a/lib/rss/maker/base.rb
+++ b/lib/rss/maker/base.rb
@@ -31,9 +31,7 @@ module RSS
self::OTHER_ELEMENTS << variable_name
end
- def add_need_initialize_variable(variable_name, init_value=nil,
- &init_block)
- init_value ||= init_block
+ def add_need_initialize_variable(variable_name, init_value="nil")
self::NEED_INITIALIZE_VARIABLES << [variable_name, init_value]
end
@@ -47,7 +45,7 @@ module RSS
def_delegators("@#{plural}", :push, :pop, :shift, :unshift)
def_delegators("@#{plural}", :each, :size, :empty?, :clear)
- add_need_initialize_variable(plural) {[]}
+ add_need_initialize_variable(plural, "[]")
module_eval(<<-EOC, __FILE__, __LINE__ + 1)
def new_#{name}
@@ -76,9 +74,7 @@ module RSS
def def_classed_element_without_accessor(name, class_name=nil)
class_name ||= Utils.to_class_name(name)
add_other_element(name)
- add_need_initialize_variable(name) do |object|
- object.send("make_#{name}")
- end
+ add_need_initialize_variable(name, "make_#{name}")
module_eval(<<-EOC, __FILE__, __LINE__ + 1)
private
def setup_#{name}(feed, current)
@@ -189,19 +185,7 @@ module RSS
private
def initialize_variables
self.class.need_initialize_variables.each do |variable_name, init_value|
- if init_value.nil?
- value = nil
- else
- if init_value.respond_to?(:call)
- value = init_value.call(self)
- elsif init_value.is_a?(String)
- # just for backward compatibility
- value = instance_eval(init_value, __FILE__, __LINE__)
- else
- value = init_value
- end
- end
- instance_variable_set("@#{variable_name}", value)
+ instance_eval("@#{variable_name} = #{init_value}", __FILE__, __LINE__)
end
end
@@ -238,7 +222,7 @@ module RSS
setter = "#{var}="
if target.respond_to?(setter)
value = __send__(var)
- unless value.nil?
+ if value
target.__send__(setter, value)
set = true
end
@@ -254,8 +238,7 @@ module RSS
def variables
self.class.need_initialize_variables.find_all do |name, init|
- # init == "nil" is just for backward compatibility
- init.nil? or init == "nil"
+ "nil" == init
end.collect do |name, init|
name
end
@@ -372,38 +355,17 @@ module RSS
end
end
- module SetupDefaultLanguage
- private
- def _set_default_values(&block)
- keep = {
- :dc_languages => dc_languages.to_a.dup,
- }
- _language = language
- if _language and
- !dc_languages.any? {|dc_language| dc_language.value == _language}
- dc_language = self.class::DublinCoreLanguages::DublinCoreLanguage.new(self)
- dc_language.value = _language.dup
- dc_languages.unshift(dc_language)
- end
- super(&block)
- ensure
- dc_languages.replace(keep[:dc_languages])
- end
- end
-
class RSSBase < Base
class << self
- def make(*args, &block)
- new(*args).make(&block)
+ def make(version, &block)
+ new(version).make(&block)
end
end
%w(xml_stylesheets channel image items textinput).each do |element|
attr_reader element
- add_need_initialize_variable(element) do |object|
- object.send("make_#{element}")
- end
- module_eval(<<-EOC, __FILE__, __LINE__ + 1)
+ add_need_initialize_variable(element, "make_#{element}")
+ module_eval(<<-EOC, __FILE__, __LINE__)
private
def setup_#{element}(feed)
@#{element}.to_feed(feed)
@@ -414,7 +376,7 @@ module RSS
end
EOC
end
-
+
attr_reader :feed_version
alias_method(:rss_version, :feed_version)
attr_accessor :version, :encoding, :standalone
@@ -428,10 +390,14 @@ module RSS
@encoding = "UTF-8"
@standalone = nil
end
-
+
def make
- yield(self)
- to_feed
+ if block_given?
+ yield(self)
+ to_feed
+ else
+ nil
+ end
end
def to_feed
@@ -439,10 +405,13 @@ module RSS
setup_xml_stylesheets(feed)
setup_elements(feed)
setup_other_elements(feed)
- feed.validate
- feed
+ if feed.valid?
+ feed
+ else
+ nil
+ end
end
-
+
private
remove_method :make_xml_stylesheets
def make_xml_stylesheets
@@ -459,7 +428,7 @@ module RSS
attr_accessor attribute
add_need_initialize_variable(attribute)
end
-
+
def to_feed(feed)
xss = ::RSS::XMLStyleSheet.new
guess_type_if_need(xss)
@@ -482,7 +451,7 @@ module RSS
end
end
end
-
+
class ChannelBase < Base
include SetupDefaultDate
@@ -557,7 +526,7 @@ module RSS
end
end
end
-
+
class SkipHoursBase < Base
def_array_element("hour")
@@ -568,7 +537,7 @@ module RSS
end
end
end
-
+
class CloudBase < Base
%w(domain port path registerProcedure protocol).each do |element|
attr_accessor element
@@ -638,7 +607,7 @@ module RSS
include AtomTextConstructBase
end
end
-
+
class ImageBase < Base
%w(title url width height description).each do |element|
attr_accessor element
@@ -649,18 +618,18 @@ module RSS
@maker.channel.link
end
end
-
+
class ItemsBase < Base
def_array_element("item")
attr_accessor :do_sort, :max_size
-
+
def initialize(maker)
super
@do_sort = false
@max_size = -1
end
-
+
def normalize
if @max_size >= 0
sort_if_need[0...@max_size]
@@ -746,14 +715,6 @@ module RSS
attr_accessor element
add_need_initialize_variable(element)
end
-
- def permanent_link?
- isPermaLink
- end
-
- def permanent_link=(bool)
- self.isPermaLink = bool
- end
end
class EnclosureBase < Base
diff --git a/lib/rss/maker/dublincore.rb b/lib/rss/maker/dublincore.rb
index 9069c27d06..ff4813fe19 100644
--- a/lib/rss/maker/dublincore.rb
+++ b/lib/rss/maker/dublincore.rb
@@ -90,7 +90,7 @@ EOC
class ChannelBase
include DublinCoreModel
end
-
+
class ImageBase; include DublinCoreModel; end
class ItemsBase
class ItemBase
diff --git a/lib/rss/maker/entry.rb b/lib/rss/maker/entry.rb
index b35936b208..edaa31ec06 100644
--- a/lib/rss/maker/entry.rb
+++ b/lib/rss/maker/entry.rb
@@ -135,7 +135,7 @@ module RSS
self.id = keep[:id]
@rights = keep[:rights]
@title = keep[:title]
- self.updated = keep[:updated]
+ self.updated = keep[:prev_updated]
end
Guid = Feed::Items::Item::Guid
diff --git a/lib/rss/maker/feed.rb b/lib/rss/maker/feed.rb
index 0129218b0c..3a30ad4287 100644
--- a/lib/rss/maker/feed.rb
+++ b/lib/rss/maker/feed.rb
@@ -22,8 +22,6 @@ module RSS
end
class Channel < ChannelBase
- include SetupDefaultLanguage
-
def to_feed(feed)
set_default_values do
setup_values(feed)
@@ -73,11 +71,14 @@ module RSS
def _set_default_values(&block)
keep = {
:id => id,
+ :updated => updated,
}
self.id ||= about
+ self.updated ||= dc_date
super(&block)
ensure
self.id = keep[:id]
+ self.updated = keep[:updated]
end
class SkipDays < SkipDaysBase
@@ -181,7 +182,6 @@ module RSS
set_default_values do
entry = feed.class::Entry.new
set = setup_values(entry)
- entry.dc_dates.clear
setup_other_elements(feed, entry)
if set
feed.entries << entry
@@ -216,11 +216,14 @@ module RSS
def _set_default_values(&block)
keep = {
:id => id,
+ :updated => updated,
}
self.id ||= link
+ self.updated ||= dc_date
super(&block)
ensure
self.id = keep[:id]
+ self.updated = keep[:updated]
end
class Guid < GuidBase
diff --git a/lib/rss/maker/image.rb b/lib/rss/maker/image.rb
index e2b36e0a08..b95cf4c714 100644
--- a/lib/rss/maker/image.rb
+++ b/lib/rss/maker/image.rb
@@ -89,7 +89,7 @@ EOC
end
class ChannelBase; include Maker::ImageFaviconModel; end
-
+
class ItemsBase
class ItemBase; include Maker::ImageItemModel; end
end
diff --git a/lib/rss/maker/itunes.rb b/lib/rss/maker/itunes.rb
index 8b7420da3c..7c5049129d 100644
--- a/lib/rss/maker/itunes.rb
+++ b/lib/rss/maker/itunes.rb
@@ -176,7 +176,7 @@ module RSS
%w(hour minute second).each do |name|
attr_reader(name)
- add_need_initialize_variable(name, 0)
+ add_need_initialize_variable(name, '0')
end
def content=(content)
diff --git a/lib/rss/maker/taxonomy.rb b/lib/rss/maker/taxonomy.rb
index 13ae9aa805..211603840f 100644
--- a/lib/rss/maker/taxonomy.rb
+++ b/lib/rss/maker/taxonomy.rb
@@ -72,12 +72,12 @@ EOC
class TaxonomyTopicBase < Base
include DublinCoreModel
include TaxonomyTopicsModel
-
+
attr_accessor :value
add_need_initialize_variable("value")
alias_method(:taxo_link, :value)
alias_method(:taxo_link=, :value=)
-
+
def have_required_values?
@value
end
@@ -88,11 +88,11 @@ EOC
class RSSBase
include TaxonomyTopicModel
end
-
+
class ChannelBase
include TaxonomyTopicsModel
end
-
+
class ItemsBase
class ItemBase
include TaxonomyTopicsModel
diff --git a/lib/rss/maker/trackback.rb b/lib/rss/maker/trackback.rb
index 00f001cb85..278fe53ebe 100644
--- a/lib/rss/maker/trackback.rb
+++ b/lib/rss/maker/trackback.rb
@@ -19,7 +19,7 @@ module RSS
class TrackBackAboutBase < Base
attr_accessor :value
add_need_initialize_variable("value")
-
+
alias_method(:resource, :value)
alias_method(:resource=, :value=)
alias_method(:content, :value)
diff --git a/lib/rss/parser.rb b/lib/rss/parser.rb
index 1a9e71ea57..9e4919223c 100644
--- a/lib/rss/parser.rb
+++ b/lib/rss/parser.rb
@@ -34,8 +34,8 @@ module RSS
class NotValidXMLParser < Error
def initialize(parser)
super("#{parser} is not an available XML parser. " <<
- "Available XML parser" <<
- (AVAILABLE_PARSERS.size > 1 ? "s are " : " is ") <<
+ "Available XML parser"<<
+ (AVAILABLE_PARSERS.size > 1 ? "s are ": " is ") <<
"#{AVAILABLE_PARSERS.inspect}.")
end
end
@@ -98,7 +98,7 @@ module RSS
return rss if maybe_xml?(rss)
uri = to_uri(rss)
-
+
if uri.respond_to?(:read)
uri.read
elsif !rss.tainted? and File.readable?(rss)
@@ -113,7 +113,7 @@ module RSS
source.is_a?(String) and /</ =~ source
end
- # Attempt to convert rss to a URI, but just return it if
+ # Attempt to convert rss to a URI, but just return it if
# there's a ::URI::Error
def to_uri(rss)
return rss if rss.is_a?(::URI::Generic)
@@ -133,7 +133,7 @@ module RSS
listener.raise_for_undefined_entity?
end
end
-
+
def initialize(rss)
@listener = self.class.listener.new
@rss = rss
@@ -196,13 +196,13 @@ module RSS
def available_tags(uri)
(@@accessor_bases[uri] || {}).keys
end
-
+
# register uri against this name.
def register_uri(uri, name)
@@registered_uris[name] ||= {}
@@registered_uris[name][uri] = nil
end
-
+
# test if this uri is registered against this name
def uri_registered?(uri, name)
@@registered_uris[name].has_key?(uri)
@@ -220,7 +220,9 @@ module RSS
name = (@@class_names[uri] || {})[tag_name]
return name if name
- tag_name = tag_name.gsub(/[_\-]([a-z]?)/) {$1.upcase}
+ tag_name = tag_name.gsub(/[_\-]([a-z]?)/) do
+ $1.upcase
+ end
tag_name[0, 1].upcase + tag_name[1..-1]
end
@@ -228,11 +230,11 @@ module RSS
install_accessor_base(uri, name, accessor_base)
def_get_text_element(uri, name, *get_file_and_line_from_caller(1))
end
-
+
def raise_for_undefined_entity?
true
end
-
+
private
# set the accessor for the uri, tag_name pair
def install_accessor_base(uri, tag_name, accessor_base)
@@ -279,7 +281,7 @@ module RSS
@xml_element = nil
@last_xml_element = nil
end
-
+
# set instance vars for version, encoding, standalone
def xmldecl(version, encoding, standalone)
@version, @encoding, @standalone = version, encoding, standalone
@@ -387,12 +389,14 @@ module RSS
def start_else_element(local, prefix, attrs, ns)
class_name = self.class.class_name(_ns(ns, prefix), local)
current_class = @last_element.class
- if known_class?(current_class, class_name)
+ if class_name and
+ (current_class.const_defined?(class_name) or
+ current_class.constants.include?(class_name))
next_class = current_class.const_get(class_name)
start_have_something_element(local, prefix, attrs, ns, next_class)
else
if !@do_validate or @ignore_unknown_element
- @proc_stack.push(setup_next_element_in_unknown_element)
+ @proc_stack.push(nil)
else
parent = "ROOT ELEMENT???"
if current_class.tag_name
@@ -403,42 +407,19 @@ module RSS
end
end
- if Module.method(:const_defined?).arity == -1
- def known_class?(target_class, class_name)
- class_name and
- (target_class.const_defined?(class_name, false) or
- target_class.constants.include?(class_name.to_sym))
- end
- else
- def known_class?(target_class, class_name)
- class_name and
- (target_class.const_defined?(class_name) or
- target_class.constants.include?(class_name))
- end
- end
-
NAMESPLIT = /^(?:([\w:][-\w\d.]*):)?([\w:][-\w\d.]*)/
def split_name(name)
name =~ NAMESPLIT
[$1 || '', $2]
end
- def check_ns(tag_name, prefix, ns, require_uri, ignore_unknown_element=nil)
- if _ns(ns, prefix) == require_uri
- true
- else
- if ignore_unknown_element.nil?
- ignore_unknown_element = @ignore_unknown_element
- end
-
- if ignore_unknown_element
- false
- elsif @do_validate
+ def check_ns(tag_name, prefix, ns, require_uri)
+ unless _ns(ns, prefix) == require_uri
+ if @do_validate
raise NSError.new(tag_name, prefix, require_uri)
else
# Force bind required URI with prefix
@ns_stack.last[prefix] = require_uri
- true
end
end
end
@@ -446,7 +427,7 @@ module RSS
def start_get_text_element(tag_name, prefix, ns, required_uri)
pr = Proc.new do |text, tags|
setter = self.class.setter(required_uri, tag_name)
- if setter and @last_element.respond_to?(setter)
+ if @last_element.respond_to?(setter)
if @do_validate
getter = self.class.getter(required_uri, tag_name)
if @last_element.__send__(getter)
@@ -465,12 +446,9 @@ module RSS
end
def start_have_something_element(tag_name, prefix, attrs, ns, klass)
- if check_ns(tag_name, prefix, ns, klass.required_uri)
- attributes = collect_attributes(tag_name, prefix, attrs, ns, klass)
- @proc_stack.push(setup_next_element(tag_name, klass, attributes))
- else
- @proc_stack.push(setup_next_element_in_unknown_element)
- end
+ check_ns(tag_name, prefix, ns, klass.required_uri)
+ attributes = collect_attributes(tag_name, prefix, attrs, ns, klass)
+ @proc_stack.push(setup_next_element(tag_name, klass, attributes))
end
def collect_attributes(tag_name, prefix, attrs, ns, klass)
@@ -526,7 +504,7 @@ module RSS
else
if klass.have_content?
if @last_element.need_base64_encode?
- text = text.lstrip.unpack("m").first
+ text = Base64.decode64(text.lstrip)
end
@last_element.content = text
end
@@ -537,11 +515,6 @@ module RSS
@last_element = previous
end
end
-
- def setup_next_element_in_unknown_element
- current_element, @last_element = @last_element, nil
- Proc.new {@last_element = current_element}
- end
end
unless const_defined? :AVAILABLE_PARSER_LIBRARIES
diff --git a/lib/rss/rexmlparser.rb b/lib/rss/rexmlparser.rb
index 7112ac3669..4dabf59199 100644
--- a/lib/rss/rexmlparser.rb
+++ b/lib/rss/rexmlparser.rb
@@ -7,7 +7,7 @@ if ([$1.to_i, $2.to_i] <=> [2, 5]) < 0
end
module RSS
-
+
class REXMLParser < BaseParser
class << self
@@ -15,7 +15,7 @@ module RSS
REXMLListener
end
end
-
+
private
def _parse
begin
@@ -28,9 +28,9 @@ module RSS
raise NotWellFormedError.new(line){e.message}
end
end
-
+
end
-
+
class REXMLListener < BaseListener
include REXML::StreamListener
@@ -41,7 +41,7 @@ module RSS
false
end
end
-
+
def xmldecl(version, encoding, standalone)
super(version, encoding, standalone == "yes")
# Encoding is converted to UTF-8 when REXML parse XML.
diff --git a/lib/rss/rss.rb b/lib/rss/rss.rb
index 6f008049ca..5aa4a2cedd 100644
--- a/lib/rss/rss.rb
+++ b/lib/rss/rss.rb
@@ -45,7 +45,6 @@ class Time
end
end
-
require "English"
require "rss/utils"
require "rss/converter"
@@ -53,7 +52,7 @@ require "rss/xml-stylesheet"
module RSS
- VERSION = "0.2.7"
+ VERSION = "0.2.4"
URI = "http://purl.org/rss/1.0/"
@@ -249,7 +248,7 @@ EOC
# accessor
convert_attr_reader name
date_writer(name, type, disp_name)
-
+
install_element(name) do |n, elem_name|
<<-EOC
if @#{n}
@@ -634,7 +633,7 @@ EOC
include SetupMaker
INDENT = " "
-
+
MUST_CALL_VALIDATORS = {}
MODELS = []
GET_ATTRIBUTES = []
@@ -830,7 +829,7 @@ EOC
def full_name
tag_name
end
-
+
def converter=(converter)
@converter = converter
targets = children.dup
@@ -865,7 +864,7 @@ EOC
ensure
@do_validate = do_validate
end
-
+
def validate_for_stream(tags, ignore_unknown_element=true)
validate_attribute
__validate(ignore_unknown_element, tags, false)
@@ -985,7 +984,7 @@ EOC
end_tag = "\n#{indent}</#{full_name}>"
end
end
-
+
start_tag + content.join("\n") + end_tag
end
@@ -1010,7 +1009,7 @@ EOC
end
attrs
end
-
+
def tag_name_with_prefix(prefix)
"#{prefix}:#{tag_name}"
end
@@ -1201,7 +1200,7 @@ EOC
__send__(self.class.xml_getter).to_s
else
_content = content
- _content = [_content].pack("m").delete("\n") if need_base64_encode?
+ _content = Base64.encode64(_content) if need_base64_encode?
h(_content)
end
end
@@ -1210,7 +1209,7 @@ EOC
module RootElementMixin
include XMLStyleSheetMixin
-
+
attr_reader :output_encoding
attr_reader :feed_type, :feed_subtype, :feed_version
attr_accessor :version, :encoding, :standalone
@@ -1296,7 +1295,7 @@ EOC
rv << "?>\n"
rv
end
-
+
def ns_declarations
decls = {}
self.class::NSPOOL.collect do |prefix, uri|
diff --git a/lib/rss/syndication.rb b/lib/rss/syndication.rb
index c375645dd6..3eb15429f6 100644
--- a/lib/rss/syndication.rb
+++ b/lib/rss/syndication.rb
@@ -8,11 +8,11 @@ module RSS
RDF.install_ns(SY_PREFIX, SY_URI)
module SyndicationModel
-
+
extend BaseModel
-
+
ELEMENTS = []
-
+
def self.append_features(klass)
super
diff --git a/lib/rss/taxonomy.rb b/lib/rss/taxonomy.rb
index b82e55dacc..276f63b05d 100644
--- a/lib/rss/taxonomy.rb
+++ b/lib/rss/taxonomy.rb
@@ -24,7 +24,7 @@ module RSS
module TaxonomyTopicsModel
extend BaseModel
-
+
def self.append_features(klass)
super
@@ -37,21 +37,21 @@ module RSS
class TaxonomyTopics < Element
include RSS10
-
+
Bag = ::RSS::RDF::Bag
class << self
def required_prefix
TAXO_PREFIX
end
-
+
def required_uri
TAXO_URI
end
end
@tag_name = "topics"
-
+
install_have_child_element("Bag", RDF::URI, nil)
install_must_call_validator('rdf', RDF::URI)
@@ -84,10 +84,10 @@ module RSS
end
end
end
-
+
module TaxonomyTopicModel
extend BaseModel
-
+
def self.append_features(klass)
super
var_name = "#{TAXO_PREFIX}_topic"
@@ -99,12 +99,12 @@ module RSS
include DublinCoreModel
include TaxonomyTopicsModel
-
+
class << self
def required_prefix
TAXO_PREFIX
end
-
+
def required_uri
TAXO_URI
end
@@ -115,7 +115,7 @@ module RSS
install_get_attribute("about", ::RSS::RDF::URI, true, nil, nil,
"#{RDF::PREFIX}:about")
install_text_element("link", TAXO_URI, "?", "#{TAXO_PREFIX}_link")
-
+
def initialize(*args)
if Utils.element_initialize_arguments?(args)
super
diff --git a/lib/rss/trackback.rb b/lib/rss/trackback.rb
index 59fedb5f3e..ee2491f332 100644
--- a/lib/rss/trackback.rb
+++ b/lib/rss/trackback.rb
@@ -23,7 +23,7 @@ module RSS
module BaseTrackBackModel
ELEMENTS = %w(ping about)
-
+
def append_features(klass)
super
@@ -47,7 +47,7 @@ module RSS
end
EOC
end
-
+
[%w(about s)].each do |name, postfix|
var_name = "#{TRACKBACK_PREFIX}_#{name}"
klass_name = "TrackBack#{Utils.to_class_name(name)}"
@@ -105,7 +105,7 @@ module RSS
def required_prefix
TRACKBACK_PREFIX
end
-
+
def required_uri
TRACKBACK_URI
end
@@ -141,17 +141,17 @@ module RSS
include RSS10
class << self
-
+
def required_prefix
TRACKBACK_PREFIX
end
-
+
def required_uri
TRACKBACK_URI
end
end
-
+
@tag_name = "about"
[
@@ -163,7 +163,7 @@ module RSS
alias_method(:value, :resource)
alias_method(:value=, :resource=)
-
+
def initialize(*args)
if Utils.element_initialize_arguments?(args)
super
@@ -185,7 +185,7 @@ module RSS
def setup_maker_attributes(about)
about.resource = self.resource
end
-
+
end
end
@@ -197,7 +197,7 @@ module RSS
include RSS09
@tag_name = "ping"
-
+
content_setup
class << self
@@ -205,13 +205,13 @@ module RSS
def required_prefix
TRACKBACK_PREFIX
end
-
+
def required_uri
TRACKBACK_URI
end
end
-
+
alias_method(:value, :content)
alias_method(:value=, :content=)
@@ -223,26 +223,26 @@ module RSS
self.content = args[0]
end
end
-
+
def full_name
tag_name_with_prefix(TRACKBACK_PREFIX)
end
-
+
end
class TrackBackAbout < Element
include RSS09
@tag_name = "about"
-
+
content_setup
class << self
-
+
def required_prefix
TRACKBACK_PREFIX
end
-
+
def required_uri
TRACKBACK_URI
end
@@ -260,11 +260,11 @@ module RSS
self.content = args[0]
end
end
-
+
def full_name
tag_name_with_prefix(TRACKBACK_PREFIX)
end
-
+
end
end
diff --git a/lib/rss/utils.rb b/lib/rss/utils.rb
index 75b05d45c7..0e4001e1f3 100644
--- a/lib/rss/utils.rb
+++ b/lib/rss/utils.rb
@@ -8,7 +8,7 @@ module RSS
"#{part[0, 1].upcase}#{part[1..-1]}"
end.join("")
end
-
+
def get_file_and_line_from_caller(i=0)
file, line, = caller[i].split(':')
line = line.to_i
@@ -21,7 +21,7 @@ module RSS
s.to_s.gsub(/&/, "&amp;").gsub(/\"/, "&quot;").gsub(/>/, "&gt;").gsub(/</, "&lt;")
end
alias h html_escape
-
+
# If +value+ is an instance of class +klass+, return it, else
# create a new instance of +klass+ with value +value+.
def new_with_value_if_need(klass, value)
diff --git a/lib/rss/xml-stylesheet.rb b/lib/rss/xml-stylesheet.rb
index 96ee95050e..559d6bcd56 100644
--- a/lib/rss/xml-stylesheet.rb
+++ b/lib/rss/xml-stylesheet.rb
@@ -8,7 +8,7 @@ module RSS
super
@xml_stylesheets = []
end
-
+
private
def xml_stylesheet_pi
xsss = @xml_stylesheets.collect do |xss|
@@ -94,7 +94,7 @@ module RSS
xss.__send__("#{attr}=", __send__(attr))
end
end
-
+
private
def guess_type(filename)
/\.([^.]+)$/ =~ filename
diff --git a/lib/rss/xmlparser.rb b/lib/rss/xmlparser.rb
index aa902be396..3dfe7d461a 100644
--- a/lib/rss/xmlparser.rb
+++ b/lib/rss/xmlparser.rb
@@ -26,9 +26,9 @@ module XML
end
module RSS
-
+
class REXMLLikeXMLParser < ::XML::Parser
-
+
include ::XML::Encoding_ja
def listener=(listener)
@@ -38,7 +38,7 @@ module RSS
def startElement(name, attrs)
@listener.tag_start(name, attrs)
end
-
+
def endElement(name)
@listener.tag_end(name)
end
@@ -64,7 +64,7 @@ module RSS
XMLParserListener
end
end
-
+
private
def _parse
begin
@@ -75,13 +75,13 @@ module RSS
raise NotWellFormedError.new(parser.line){e.message}
end
end
-
+
end
-
+
class XMLParserListener < BaseListener
include ListenerMixin
-
+
def xmldecl(version, encoding, standalone)
super
# Encoding is converted to UTF-8 when XMLParser parses XML.
diff --git a/lib/rss/xmlscanner.rb b/lib/rss/xmlscanner.rb
index 1cdf81c0c3..61b9fa6bf4 100644
--- a/lib/rss/xmlscanner.rb
+++ b/lib/rss/xmlscanner.rb
@@ -2,15 +2,15 @@ require 'xmlscan/scanner'
require 'stringio'
module RSS
-
+
class XMLScanParser < BaseParser
-
+
class << self
def listener
XMLScanListener
end
end
-
+
private
def _parse
begin
@@ -26,11 +26,11 @@ module RSS
raise NotWellFormedError.new(lineno){e.message}
end
end
-
+
end
class XMLScanListener < BaseListener
-
+
include XMLScan::Visitor
include ListenerMixin
diff --git a/lib/rubygems.rb b/lib/rubygems.rb
deleted file mode 100644
index 8e6d8c9636..0000000000
--- a/lib/rubygems.rb
+++ /dev/null
@@ -1,1121 +0,0 @@
-# -*- ruby -*-
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-require 'rubygems/rubygems_version'
-require 'rubygems/defaults'
-require 'thread'
-require 'etc'
-
-module Gem
-
- ##
- # Raised when RubyGems is unable to load or activate a gem. Contains the
- # name and version requirements of the gem that either conflicts with
- # already activated gems or that RubyGems is otherwise unable to activate.
-
- class LoadError < ::LoadError
-
- ##
- # Name of gem
-
- attr_accessor :name
-
- ##
- # Version requirement of gem
-
- attr_accessor :version_requirement
-
- end
-
-end
-
-module Kernel
-
- ##
- # Use Kernel#gem to activate a specific version of +gem_name+.
- #
- # +version_requirements+ is a list of version requirements that the
- # specified gem must match, most commonly "= example.version.number". See
- # Gem::Requirement for how to specify a version requirement.
- #
- # If you will be activating the latest version of a gem, there is no need to
- # call Kernel#gem, Kernel#require will do the right thing for you.
- #
- # Kernel#gem returns true if the gem was activated, otherwise false. If the
- # gem could not be found, didn't match the version requirements, or a
- # different version was already activated, an exception will be raised.
- #
- # Kernel#gem should be called *before* any require statements (otherwise
- # RubyGems may load a conflicting library version).
- #
- # In older RubyGems versions, the environment variable GEM_SKIP could be
- # used to skip activation of specified gems, for example to test out changes
- # that haven't been installed yet. Now RubyGems defers to -I and the
- # RUBYLIB environment variable to skip activation of a gem.
- #
- # Example:
- #
- # GEM_SKIP=libA:libB ruby -I../libA -I../libB ./mycode.rb
-
- def gem(gem_name, *version_requirements) # :doc:
- skip_list = (ENV['GEM_SKIP'] || "").split(/:/)
- raise Gem::LoadError, "skipping #{gem_name}" if skip_list.include? gem_name
- Gem.activate(gem_name, *version_requirements)
- end
-
- private :gem
-
-end
-
-##
-# RubyGems is the Ruby standard for publishing and managing third party
-# libraries.
-#
-# For user documentation, see:
-#
-# * <tt>gem help</tt> and <tt>gem help [command]</tt>
-# * {RubyGems User Guide}[http://docs.rubygems.org/read/book/1]
-# * {Frequently Asked Questions}[http://docs.rubygems.org/read/book/3]
-#
-# For gem developer documentation see:
-#
-# * {Creating Gems}[http://docs.rubygems.org/read/chapter/5]
-# * Gem::Specification
-#
-# Further RubyGems documentation can be found at:
-#
-# * {RubyGems API}[http://rubygems.rubyforge.org/rdoc] (also available from
-# <tt>gem server</tt>)
-# * {RubyGems Bookshelf}[http://rubygem.org]
-#
-# == RubyGems Plugins
-#
-# As of RubyGems 1.3.2, RubyGems will load plugins installed in gems or
-# $LOAD_PATH. Plugins must be named 'rubygems_plugin' are discovered via
-# Gem::find_files then loaded. Take care when implementing a plugin as your
-# plugin file may be loaded multiple times if multiple versions of your gem
-# are installed.
-#
-# For an example plugin, see the graph gem which adds a `gem graph` command.
-#
-# == RubyGems Defaults, Packaging
-#
-# RubyGems defaults are stored in rubygems/defaults.rb. If you're packaging
-# RubyGems or implementing Ruby you can change RubyGems' defaults.
-#
-# For RubyGems packagers, provide lib/rubygems/operating_system.rb and
-# override any defaults from lib/rubygems/defaults.rb.
-#
-# For Ruby implementers, provide lib/rubygems/#{RUBY_ENGINE}.rb and override
-# any defaults from lib/rubygems/defaults.rb.
-#
-# If you need RubyGems to perform extra work on install or uninstall, your
-# defaults override file can set pre and post install and uninstall hooks.
-# See Gem::pre_install, Gem::pre_uninstall, Gem::post_install,
-# Gem::post_uninstall.
-#
-# == Bugs
-#
-# You can submit bugs to the
-# {RubyGems bug tracker}[http://rubyforge.org/tracker/?atid=575&group_id=126&func=browse]
-# on RubyForge
-#
-# == Credits
-#
-# RubyGems is currently maintained by Eric Hodel.
-#
-# RubyGems was originally developed at RubyConf 2003 by:
-#
-# * Rich Kilmer -- rich(at)infoether.com
-# * Chad Fowler -- chad(at)chadfowler.com
-# * David Black -- dblack(at)wobblini.net
-# * Paul Brannan -- paul(at)atdesk.com
-# * Jim Weirch -- {jim(at)weirichhouse.org}[mailto:jim@weirichhouse.org]
-#
-# Contributors:
-#
-# * Gavin Sinclair -- gsinclair(at)soyabean.com.au
-# * George Marrows -- george.marrows(at)ntlworld.com
-# * Dick Davies -- rasputnik(at)hellooperator.net
-# * Mauricio Fernandez -- batsman.geo(at)yahoo.com
-# * Simon Strandgaard -- neoneye(at)adslhome.dk
-# * Dave Glasser -- glasser(at)mit.edu
-# * Paul Duncan -- pabs(at)pablotron.org
-# * Ville Aine -- vaine(at)cs.helsinki.fi
-# * Eric Hodel -- drbrain(at)segment7.net
-# * Daniel Berger -- djberg96(at)gmail.com
-# * Phil Hagelberg -- technomancy(at)gmail.com
-# * Ryan Davis
-#
-# (If your name is missing, PLEASE let us know!)
-#
-# Thanks!
-#
-# -The RubyGems Team
-
-module Gem
-
- ##
- # Configuration settings from ::RbConfig
-
- ConfigMap = {} unless defined?(ConfigMap)
-
- require 'rbconfig'
-
- ConfigMap.merge!(
- :EXEEXT => RbConfig::CONFIG["EXEEXT"],
- :RUBY_SO_NAME => RbConfig::CONFIG["RUBY_SO_NAME"],
- :arch => RbConfig::CONFIG["arch"],
- :bindir => RbConfig::CONFIG["bindir"],
- :datadir => RbConfig::CONFIG["datadir"],
- :libdir => RbConfig::CONFIG["libdir"],
- :rubylibprefix => RbConfig::CONFIG["rubylibprefix"],
- :ruby_install_name => RbConfig::CONFIG["ruby_install_name"],
- :ruby_version => RbConfig::CONFIG["ruby_version"],
- :sitedir => RbConfig::CONFIG["sitedir"],
- :sitelibdir => RbConfig::CONFIG["sitelibdir"],
- :vendordir => RbConfig::CONFIG["vendordir"] ,
- :vendorlibdir => RbConfig::CONFIG["vendorlibdir"]
- )
-
- ##
- # Default directories in a gem repository
-
- DIRECTORIES = %w[cache doc gems specifications] unless defined?(DIRECTORIES)
-
- # :stopdoc:
- MUTEX = Mutex.new
-
- RubyGemsPackageVersion = RubyGemsVersion
- # :startdoc:
-
- ##
- # An Array of Regexps that match windows ruby platforms.
-
- WIN_PATTERNS = [
- /bccwin/i,
- /cygwin/i,
- /djgpp/i,
- /mingw/i,
- /mswin/i,
- /wince/i,
- ]
-
- @@source_index = nil
- @@win_platform = nil
-
- @configuration = nil
- @loaded_specs = {}
- @loaded_stacks = {}
- @platforms = []
- @ruby = nil
- @sources = []
-
- @post_install_hooks ||= []
- @post_uninstall_hooks ||= []
- @pre_uninstall_hooks ||= []
- @pre_install_hooks ||= []
-
- ##
- # Activates an installed gem matching +gem+. The gem must satisfy
- # +version_requirements+.
- #
- # Returns true if the gem is activated, false if it is already
- # loaded, or an exception otherwise.
- #
- # Gem#activate adds the library paths in +gem+ to $LOAD_PATH. Before a Gem
- # is activated its required Gems are activated. If the version information
- # is omitted, the highest version Gem of the supplied name is loaded. If a
- # Gem is not found that meets the version requirements or a required Gem is
- # not found, a Gem::LoadError is raised.
- #
- # More information on version requirements can be found in the
- # Gem::Requirement and Gem::Version documentation.
-
- def self.activate(gem, *version_requirements)
- if version_requirements.last.is_a?(Hash)
- options = version_requirements.pop
- else
- options = {}
- end
-
- sources = options[:sources] || []
-
- if version_requirements.empty? then
- version_requirements = Gem::Requirement.default
- end
-
- unless gem.respond_to?(:name) and
- gem.respond_to?(:version_requirements) then
- gem = Gem::Dependency.new(gem, version_requirements)
- end
-
- matches = Gem.source_index.find_name(gem.name, gem.version_requirements)
- report_activate_error(gem) if matches.empty?
-
- if @loaded_specs[gem.name] then
- # This gem is already loaded. If the currently loaded gem is not in the
- # list of candidate gems, then we have a version conflict.
- existing_spec = @loaded_specs[gem.name]
-
- unless matches.any? { |spec| spec.version == existing_spec.version } then
- sources_message = sources.map { |spec| spec.full_name }
- stack_message = @loaded_stacks[gem.name].map { |spec| spec.full_name }
-
- msg = "can't activate #{gem} for #{sources_message.inspect}, "
- msg << "already activated #{existing_spec.full_name} for "
- msg << "#{stack_message.inspect}"
-
- e = Gem::LoadError.new msg
- e.name = gem.name
- e.version_requirement = gem.version_requirements
-
- raise e
- end
-
- return false
- end
-
- # new load
- spec = matches.last
- return false if spec.loaded?
-
- spec.loaded = true
- @loaded_specs[spec.name] = spec
- @loaded_stacks[spec.name] = sources.dup
-
- # Load dependent gems first
- spec.runtime_dependencies.each do |dep_gem|
- activate dep_gem, :sources => [spec, *sources]
- end
-
- # bin directory must come before library directories
- spec.require_paths.unshift spec.bindir if spec.bindir
-
- require_paths = spec.require_paths.map do |path|
- File.join spec.full_gem_path, path
- end
-
- sitelibdir = ConfigMap[:sitelibdir]
-
- # gem directories must come after -I and ENV['RUBYLIB']
- insert_index = load_path_insert_index
-
- if insert_index then
- # gem directories must come after -I and ENV['RUBYLIB']
- $LOAD_PATH.insert(insert_index, *require_paths)
- else
- # we are probably testing in core, -I and RUBYLIB don't apply
- $LOAD_PATH.unshift(*require_paths)
- end
-
- return true
- end
-
- ##
- # An Array of all possible load paths for all versions of all gems in the
- # Gem installation.
-
- def self.all_load_paths
- result = []
-
- Gem.path.each do |gemdir|
- each_load_path all_partials(gemdir) do |load_path|
- result << load_path
- end
- end
-
- result
- end
-
- ##
- # Return all the partial paths in +gemdir+.
-
- def self.all_partials(gemdir)
- Dir[File.join(gemdir, 'gems/*')]
- end
-
- private_class_method :all_partials
-
- ##
- # See if a given gem is available.
-
- def self.available?(gem, *requirements)
- requirements = Gem::Requirement.default if requirements.empty?
-
- unless gem.respond_to?(:name) and
- gem.respond_to?(:version_requirements) then
- gem = Gem::Dependency.new gem, requirements
- end
-
- !Gem.source_index.search(gem).empty?
- end
-
- ##
- # Find the full path to the executable for gem +name+. If the +exec_name+
- # is not given, the gem's default_executable is chosen, otherwise the
- # specifed executable's path is returned. +version_requirements+ allows you
- # to specify specific gem versions.
-
- def self.bin_path(name, exec_name = nil, *version_requirements)
- version_requirements = Gem::Requirement.default if
- version_requirements.empty?
- spec = Gem.source_index.find_name(name, version_requirements).last
-
- raise Gem::GemNotFoundException,
- "can't find gem #{name} (#{version_requirements})" unless spec
-
- exec_name ||= spec.default_executable
-
- unless exec_name
- msg = "no default executable for #{spec.full_name}"
- raise Gem::Exception, msg
- end
-
- unless spec.executables.include? exec_name
- msg = "can't find executable #{exec_name} for #{spec.full_name}"
- raise Gem::Exception, msg
- end
-
- File.join(spec.full_gem_path, spec.bindir, exec_name).sub(/.*\s.*/m, '"\&"')
- end
-
- ##
- # The mode needed to read a file as straight binary.
-
- def self.binary_mode
- @binary_mode ||= RUBY_VERSION > '1.9' ? 'rb:ascii-8bit' : 'rb'
- end
-
- ##
- # The path where gem executables are to be installed.
-
- def self.bindir(install_dir=Gem.dir)
- return File.join(install_dir, 'bin') unless
- install_dir.to_s == Gem.default_dir
- Gem.default_bindir
- end
-
- ##
- # Reset the +dir+ and +path+ values. The next time +dir+ or +path+
- # is requested, the values will be calculated from scratch. This is
- # mainly used by the unit tests to provide test isolation.
-
- def self.clear_paths
- @gem_home = nil
- @gem_path = nil
- @user_home = nil
-
- @@source_index = nil
-
- MUTEX.synchronize do
- @searcher = nil
- end
- end
-
- ##
- # The path to standard location of the user's .gemrc file.
-
- def self.config_file
- File.join Gem.user_home, '.gemrc'
- end
-
- ##
- # The standard configuration object for gems.
-
- def self.configuration
- @configuration ||= Gem::ConfigFile.new []
- end
-
- ##
- # Use the given configuration object (which implements the ConfigFile
- # protocol) as the standard configuration object.
-
- def self.configuration=(config)
- @configuration = config
- end
-
- ##
- # The path the the data directory specified by the gem name. If the
- # package is not available as a gem, return nil.
-
- def self.datadir(gem_name)
- spec = @loaded_specs[gem_name]
- return nil if spec.nil?
- File.join(spec.full_gem_path, 'data', gem_name)
- end
-
- ##
- # A Zlib::Deflate.deflate wrapper
-
- def self.deflate(data)
- require 'zlib'
- Zlib::Deflate.deflate data
- end
-
- ##
- # The path where gems are to be installed.
-
- def self.dir
- @gem_home ||= nil
- set_home(ENV['GEM_HOME'] || Gem.configuration.home || default_dir) unless @gem_home
- @gem_home
- end
-
- ##
- # Expand each partial gem path with each of the required paths specified
- # in the Gem spec. Each expanded path is yielded.
-
- def self.each_load_path(partials)
- partials.each do |gp|
- base = File.basename(gp)
- specfn = File.join(dir, "specifications", base + ".gemspec")
- if File.exist?(specfn)
- spec = eval(File.read(specfn))
- spec.require_paths.each do |rp|
- yield(File.join(gp, rp))
- end
- else
- filename = File.join(gp, 'lib')
- yield(filename) if File.exist?(filename)
- end
- end
- end
-
- private_class_method :each_load_path
-
- ##
- # Quietly ensure the named Gem directory contains all the proper
- # subdirectories. If we can't create a directory due to a permission
- # problem, then we will silently continue.
-
- def self.ensure_gem_subdirectories(gemdir)
- require 'fileutils'
-
- Gem::DIRECTORIES.each do |filename|
- fn = File.join gemdir, filename
- FileUtils.mkdir_p fn rescue nil unless File.exist? fn
- end
- end
-
- ##
- # Returns a list of paths matching +file+ that can be used by a gem to pick
- # up features from other gems. For example:
- #
- # Gem.find_files('rdoc/discover').each do |path| load path end
- #
- # find_files search $LOAD_PATH for files as well as gems.
- #
- # Note that find_files will return all files even if they are from different
- # versions of the same gem.
-
- def self.find_files(path)
- load_path_files = $LOAD_PATH.map do |load_path|
- files = Dir["#{File.expand_path path, load_path}#{Gem.suffix_pattern}"]
-
- files.select do |load_path_file|
- File.file? load_path_file.untaint
- end
- end.flatten
-
- specs = searcher.find_all path
-
- specs_files = specs.map do |spec|
- searcher.matching_files spec, path
- end.flatten
-
- (load_path_files + specs_files).flatten.uniq
- end
-
- ##
- # Finds the user's home directory.
- #--
- # Some comments from the ruby-talk list regarding finding the home
- # directory:
- #
- # I have HOME, USERPROFILE and HOMEDRIVE + HOMEPATH. Ruby seems
- # to be depending on HOME in those code samples. I propose that
- # it should fallback to USERPROFILE and HOMEDRIVE + HOMEPATH (at
- # least on Win32).
-
- def self.find_home
- unless RUBY_VERSION > '1.9' then
- ['HOME', 'USERPROFILE'].each do |homekey|
- return ENV[homekey] if ENV[homekey]
- end
-
- if ENV['HOMEDRIVE'] && ENV['HOMEPATH'] then
- return "#{ENV['HOMEDRIVE']}#{ENV['HOMEPATH']}"
- end
- end
-
- File.expand_path "~"
- rescue
- if File::ALT_SEPARATOR then
- "C:/"
- else
- "/"
- end
- end
-
- private_class_method :find_home
-
- ##
- # Zlib::GzipReader wrapper that unzips +data+.
-
- def self.gunzip(data)
- require 'stringio'
- require 'zlib'
- data = StringIO.new data
-
- Zlib::GzipReader.new(data).read
- end
-
- ##
- # Zlib::GzipWriter wrapper that zips +data+.
-
- def self.gzip(data)
- require 'stringio'
- require 'zlib'
- zipped = StringIO.new
-
- Zlib::GzipWriter.wrap zipped do |io| io.write data end
-
- zipped.string
- end
-
- ##
- # A Zlib::Inflate#inflate wrapper
-
- def self.inflate(data)
- require 'zlib'
- Zlib::Inflate.inflate data
- end
-
- ##
- # Return a list of all possible load paths for the latest version for all
- # gems in the Gem installation.
-
- def self.latest_load_paths
- result = []
-
- Gem.path.each do |gemdir|
- each_load_path(latest_partials(gemdir)) do |load_path|
- result << load_path
- end
- end
-
- result
- end
-
- ##
- # Return only the latest partial paths in the given +gemdir+.
-
- def self.latest_partials(gemdir)
- latest = {}
- all_partials(gemdir).each do |gp|
- base = File.basename(gp)
- if base =~ /(.*)-((\d+\.)*\d+)/ then
- name, version = $1, $2
- ver = Gem::Version.new(version)
- if latest[name].nil? || ver > latest[name][0]
- latest[name] = [ver, gp]
- end
- end
- end
- latest.collect { |k,v| v[1] }
- end
-
- private_class_method :latest_partials
-
- ##
- # The index to insert activated gem paths into the $LOAD_PATH.
- #
- # Defaults to the site lib directory unless gem_prelude.rb has loaded paths,
- # then it inserts the activated gem's paths before the gem_prelude.rb paths
- # so you can override the gem_prelude.rb default $LOAD_PATH paths.
-
- def self.load_path_insert_index
- index = $LOAD_PATH.index ConfigMap[:sitelibdir]
-
- $LOAD_PATH.each_with_index do |path, i|
- if path.instance_variables.include?(:@gem_prelude_index) or
- path.instance_variables.include?('@gem_prelude_index') then
- index = i
- break
- end
- end
-
- index
- end
-
- ##
- # The file name and line number of the caller of the caller of this method.
-
- def self.location_of_caller
- caller[1] =~ /(.*?):(\d+).*?$/i
- file = $1
- lineno = $2.to_i
-
- [file, lineno]
- end
-
- ##
- # The version of the Marshal format for your Ruby.
-
- def self.marshal_version
- "#{Marshal::MAJOR_VERSION}.#{Marshal::MINOR_VERSION}"
- end
-
- ##
- # Array of paths to search for Gems.
-
- def self.path
- @gem_path ||= nil
-
- unless @gem_path then
- paths = [ENV['GEM_PATH'] || Gem.configuration.path || default_path]
-
- if defined?(APPLE_GEM_HOME) and not ENV['GEM_PATH'] then
- paths << APPLE_GEM_HOME
- end
-
- set_paths paths.compact.join(File::PATH_SEPARATOR)
- end
-
- @gem_path
- end
-
- ##
- # Set array of platforms this RubyGems supports (primarily for testing).
-
- def self.platforms=(platforms)
- @platforms = platforms
- end
-
- ##
- # Array of platforms this RubyGems supports.
-
- def self.platforms
- @platforms ||= []
- if @platforms.empty?
- @platforms = [Gem::Platform::RUBY, Gem::Platform.local]
- end
- @platforms
- end
-
- ##
- # Adds a post-install hook that will be passed an Gem::Installer instance
- # when Gem::Installer#install is called
-
- def self.post_install(&hook)
- @post_install_hooks << hook
- end
-
- ##
- # Adds a post-uninstall hook that will be passed a Gem::Uninstaller instance
- # and the spec that was uninstalled when Gem::Uninstaller#uninstall is
- # called
-
- def self.post_uninstall(&hook)
- @post_uninstall_hooks << hook
- end
-
- ##
- # Adds a pre-install hook that will be passed an Gem::Installer instance
- # when Gem::Installer#install is called
-
- def self.pre_install(&hook)
- @pre_install_hooks << hook
- end
-
- ##
- # Adds a pre-uninstall hook that will be passed an Gem::Uninstaller instance
- # and the spec that will be uninstalled when Gem::Uninstaller#uninstall is
- # called
-
- def self.pre_uninstall(&hook)
- @pre_uninstall_hooks << hook
- end
-
- ##
- # The directory prefix this RubyGems was installed at.
-
- def self.prefix
- prefix = File.dirname File.expand_path(__FILE__)
-
- if File.dirname(prefix) == File.expand_path(ConfigMap[:sitelibdir]) or
- File.dirname(prefix) == File.expand_path(ConfigMap[:libdir]) or
- 'lib' != File.basename(prefix) then
- nil
- else
- File.dirname prefix
- end
- end
-
- ##
- # Promotes the load paths of the +gem_name+ over the load paths of
- # +over_name+. Useful for allowing one gem to override features in another
- # using #find_files.
-
- def self.promote_load_path(gem_name, over_name)
- gem = Gem.loaded_specs[gem_name]
- over = Gem.loaded_specs[over_name]
-
- raise ArgumentError, "gem #{gem_name} is not activated" if gem.nil?
- raise ArgumentError, "gem #{over_name} is not activated" if over.nil?
-
- last_gem_path = File.join gem.full_gem_path, gem.require_paths.last
-
- over_paths = over.require_paths.map do |path|
- File.join over.full_gem_path, path
- end
-
- over_paths.each do |path|
- $LOAD_PATH.delete path
- end
-
- gem = $LOAD_PATH.index(last_gem_path) + 1
-
- $LOAD_PATH.insert(gem, *over_paths)
- end
-
- ##
- # Refresh source_index from disk and clear searcher.
-
- def self.refresh
- source_index.refresh!
-
- MUTEX.synchronize do
- @searcher = nil
- end
- end
-
- ##
- # Safely read a file in binary mode on all platforms.
-
- def self.read_binary(path)
- File.open path, binary_mode do |f| f.read end
- end
-
- ##
- # Report a load error during activation. The message of load error
- # depends on whether it was a version mismatch or if there are not gems of
- # any version by the requested name.
-
- def self.report_activate_error(gem)
- matches = Gem.source_index.find_name(gem.name)
-
- if matches.empty? then
- error = Gem::LoadError.new(
- "Could not find RubyGem #{gem.name} (#{gem.version_requirements})\n")
- else
- error = Gem::LoadError.new(
- "RubyGem version error: " +
- "#{gem.name}(#{matches.first.version} not #{gem.version_requirements})\n")
- end
-
- error.name = gem.name
- error.version_requirement = gem.version_requirements
- raise error
- end
-
- private_class_method :report_activate_error
-
- ##
- # Full path to +libfile+ in +gemname+. Searches for the latest gem unless
- # +requirements+ is given.
-
- def self.required_location(gemname, libfile, *requirements)
- requirements = Gem::Requirement.default if requirements.empty?
-
- matches = Gem.source_index.find_name gemname, requirements
-
- return nil if matches.empty?
-
- spec = matches.last
- spec.require_paths.each do |path|
- result = File.join spec.full_gem_path, path, libfile
- return result if File.exist? result
- end
-
- nil
- end
-
- ##
- # The path to the running Ruby interpreter.
-
- def self.ruby
- if @ruby.nil? then
- @ruby = File.join(ConfigMap[:bindir],
- ConfigMap[:ruby_install_name])
- @ruby << ConfigMap[:EXEEXT]
-
- # escape string in case path to ruby executable contain spaces.
- @ruby.sub!(/.*\s.*/m, '"\&"')
- end
-
- @ruby
- end
-
- ##
- # A Gem::Version for the currently running ruby.
-
- def self.ruby_version
- return @ruby_version if defined? @ruby_version
- version = RUBY_VERSION.dup
-
- if defined?(RUBY_PATCHLEVEL) && RUBY_PATCHLEVEL != -1 then
- version << ".#{RUBY_PATCHLEVEL}"
- elsif defined?(RUBY_REVISION) then
- version << ".dev.#{RUBY_REVISION}"
- end
-
- @ruby_version = Gem::Version.new version
- end
-
- ##
- # The GemPathSearcher object used to search for matching installed gems.
-
- def self.searcher
- MUTEX.synchronize do
- @searcher ||= Gem::GemPathSearcher.new
- end
- end
-
- ##
- # Set the Gem home directory (as reported by Gem.dir).
-
- def self.set_home(home)
- home = home.gsub File::ALT_SEPARATOR, File::SEPARATOR if File::ALT_SEPARATOR
- @gem_home = home
- end
-
- private_class_method :set_home
-
- ##
- # Set the Gem search path (as reported by Gem.path).
-
- def self.set_paths(gpaths)
- if gpaths
- @gem_path = gpaths.split(File::PATH_SEPARATOR)
-
- if File::ALT_SEPARATOR then
- @gem_path.map! do |path|
- path.gsub File::ALT_SEPARATOR, File::SEPARATOR
- end
- end
-
- @gem_path << Gem.dir
- else
- # TODO: should this be Gem.default_path instead?
- @gem_path = [Gem.dir]
- end
-
- @gem_path.uniq!
- end
-
- private_class_method :set_paths
-
- ##
- # Returns the Gem::SourceIndex of specifications that are in the Gem.path
-
- def self.source_index
- @@source_index ||= SourceIndex.from_installed_gems
- end
-
- ##
- # Returns an Array of sources to fetch remote gems from. If the sources
- # list is empty, attempts to load the "sources" gem, then uses
- # default_sources if it is not installed.
-
- def self.sources
- if @sources.empty? then
- begin
- gem 'sources', '> 0.0.1'
- require 'sources'
- rescue LoadError
- @sources = default_sources
- end
- end
-
- @sources
- end
-
- ##
- # Need to be able to set the sources without calling
- # Gem.sources.replace since that would cause an infinite loop.
-
- def self.sources=(new_sources)
- @sources = new_sources
- end
-
- ##
- # Glob pattern for require-able path suffixes.
-
- def self.suffix_pattern
- @suffix_pattern ||= "{#{suffixes.join(',')}}"
- end
-
- ##
- # Suffixes for require-able paths.
-
- def self.suffixes
- ['', '.rb', '.rbw', '.so', '.bundle', '.dll', '.sl', '.jar']
- end
-
- ##
- # Prints the amount of time the supplied block takes to run using the debug
- # UI output.
-
- def self.time(msg, width = 0, display = Gem.configuration.verbose)
- now = Time.now
-
- value = yield
-
- elapsed = Time.now - now
-
- ui.say "%2$*1$s: %3$3.3fs" % [-width, msg, elapsed] if display
-
- value
- end
-
- ##
- # Lazily loads DefaultUserInteraction and returns the default UI.
-
- def self.ui
- require 'rubygems/user_interaction'
-
- Gem::DefaultUserInteraction.ui
- end
-
- ##
- # Use the +home+ and +paths+ values for Gem.dir and Gem.path. Used mainly
- # by the unit tests to provide environment isolation.
-
- def self.use_paths(home, paths=[])
- clear_paths
- set_home(home) if home
- set_paths(paths.join(File::PATH_SEPARATOR)) if paths
- end
-
- ##
- # The home directory for the user.
-
- def self.user_home
- @user_home ||= find_home
- end
-
- ##
- # Is this a windows platform?
-
- def self.win_platform?
- if @@win_platform.nil? then
- @@win_platform = !!WIN_PATTERNS.find { |r| RUBY_PLATFORM =~ r }
- end
-
- @@win_platform
- end
-
- class << self
-
- ##
- # Hash of loaded Gem::Specification keyed by name
-
- attr_reader :loaded_specs
-
- ##
- # The list of hooks to be run before Gem::Install#install does any work
-
- attr_reader :post_install_hooks
-
- ##
- # The list of hooks to be run before Gem::Uninstall#uninstall does any
- # work
-
- attr_reader :post_uninstall_hooks
-
- ##
- # The list of hooks to be run after Gem::Install#install is finished
-
- attr_reader :pre_install_hooks
-
- ##
- # The list of hooks to be run after Gem::Uninstall#uninstall is finished
-
- attr_reader :pre_uninstall_hooks
-
- # :stopdoc:
-
- alias cache source_index # an alias for the old name
-
- # :startdoc:
-
- end
-
- ##
- # Location of Marshal quick gemspecs on remote repositories
-
- MARSHAL_SPEC_DIR = "quick/Marshal.#{Gem.marshal_version}/"
-
- ##
- # Location of legacy YAML quick gemspecs on remote repositories
-
- YAML_SPEC_DIR = 'quick/'
-
-end
-
-##
-# Return the path to the data directory associated with the named package. If
-# the package is loaded as a gem, return the gem specific data directory.
-# Otherwise return a path to the share area as define by
-# "#{ConfigMap[:datadir]}/#{package_name}".
-
-def RbConfig.datadir(package_name)
- Gem.datadir(package_name) ||
- File.join(Gem::ConfigMap[:datadir], package_name)
-end
-
-require 'rubygems/exceptions'
-require 'rubygems/version'
-require 'rubygems/requirement'
-require 'rubygems/dependency'
-require 'rubygems/gem_path_searcher' # Needed for Kernel#gem
-require 'rubygems/source_index' # Needed for Kernel#gem
-require 'rubygems/platform'
-require 'rubygems/builder' # HACK: Needed for rake's package task.
-
-begin
- require 'rubygems/defaults/operating_system'
-rescue LoadError
-end
-
-if defined?(RUBY_ENGINE) then
- begin
- require "rubygems/defaults/#{RUBY_ENGINE}"
- rescue LoadError
- end
-end
-
-require 'rubygems/config_file'
-
-if RUBY_VERSION < '1.9' then
- require 'rubygems/custom_require'
-end
-
-Gem.clear_paths
-
-plugins = Gem.find_files 'rubygems_plugin'
-
-plugins.each do |plugin|
- begin
- load plugin
- rescue => e
- warn "error loading #{plugin.inspect}: #{e.message} (#{e.class})"
- end
-end
-
diff --git a/lib/rubygems/builder.rb b/lib/rubygems/builder.rb
deleted file mode 100644
index 3061b752ce..0000000000
--- a/lib/rubygems/builder.rb
+++ /dev/null
@@ -1,90 +0,0 @@
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-##
-# The Builder class processes RubyGem specification files
-# to produce a .gem file.
-
-class Gem::Builder
-
- include Gem::UserInteraction
- ##
- # Constructs a builder instance for the provided specification
- #
- # spec:: [Gem::Specification] The specification instance
-
- def initialize(spec)
- require "yaml"
- require "rubygems/package"
- require "rubygems/security"
-
- @spec = spec
- end
-
- ##
- # Builds the gem from the specification. Returns the name of the file
- # written.
-
- def build
- @spec.mark_version
- @spec.validate
- @signer = sign
- write_package
- say success
- @spec.file_name
- end
-
- def success
- <<-EOM
- Successfully built RubyGem
- Name: #{@spec.name}
- Version: #{@spec.version}
- File: #{@spec.full_name+'.gem'}
-EOM
- end
-
- private
-
- ##
- # If the signing key was specified, then load the file, and swap to the
- # public key (TODO: we should probably just omit the signing key in favor of
- # the signing certificate, but that's for the future, also the signature
- # algorithm should be configurable)
-
- def sign
- signer = nil
-
- if @spec.respond_to?(:signing_key) and @spec.signing_key then
- signer = Gem::Security::Signer.new @spec.signing_key, @spec.cert_chain
- @spec.signing_key = nil
- @spec.cert_chain = signer.cert_chain.map { |cert| cert.to_s }
- end
-
- signer
- end
-
- def write_package
- open @spec.file_name, 'wb' do |gem_io|
- Gem::Package.open gem_io, 'w', @signer do |pkg|
- pkg.metadata = @spec.to_yaml
-
- @spec.files.each do |file|
- next if File.directory? file
- next if file == @spec.file_name # Don't add gem onto itself
-
- stat = File.stat file
- mode = stat.mode & 0777
- size = stat.size
-
- pkg.add_file_simple file, mode, size do |tar_io|
- tar_io.write open(file, "rb") { |f| f.read }
- end
- end
- end
- end
- end
-end
-
diff --git a/lib/rubygems/command.rb b/lib/rubygems/command.rb
deleted file mode 100644
index 3a1e2ac872..0000000000
--- a/lib/rubygems/command.rb
+++ /dev/null
@@ -1,511 +0,0 @@
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-require 'optparse'
-require 'rubygems/user_interaction'
-
-##
-# Base class for all Gem commands. When creating a new gem command, define
-# #new, #execute, #arguments, #defaults_str, #description and #usage
-# (as appropriate). See the above mentioned methods for details.
-#
-# A very good example to look at is Gem::Commands::ContentsCommand
-
-class Gem::Command
-
- include Gem::UserInteraction
-
- ##
- # The name of the command.
-
- attr_reader :command
-
- ##
- # The options for the command.
-
- attr_reader :options
-
- ##
- # The default options for the command.
-
- attr_accessor :defaults
-
- ##
- # The name of the command for command-line invocation.
-
- attr_accessor :program_name
-
- ##
- # A short description of the command.
-
- attr_accessor :summary
-
- ##
- # Arguments used when building gems
-
- def self.build_args
- @build_args ||= []
- end
-
- def self.build_args=(value)
- @build_args = value
- end
-
- def self.common_options
- @common_options ||= []
- end
-
- def self.add_common_option(*args, &handler)
- Gem::Command.common_options << [args, handler]
- end
-
- def self.extra_args
- @extra_args ||= []
- end
-
- def self.extra_args=(value)
- case value
- when Array
- @extra_args = value
- when String
- @extra_args = value.split
- end
- end
-
- ##
- # Return an array of extra arguments for the command. The extra arguments
- # come from the gem configuration file read at program startup.
-
- def self.specific_extra_args(cmd)
- specific_extra_args_hash[cmd]
- end
-
- ##
- # Add a list of extra arguments for the given command. +args+ may be an
- # array or a string to be split on white space.
-
- def self.add_specific_extra_args(cmd,args)
- args = args.split(/\s+/) if args.kind_of? String
- specific_extra_args_hash[cmd] = args
- end
-
- ##
- # Accessor for the specific extra args hash (self initializing).
-
- def self.specific_extra_args_hash
- @specific_extra_args_hash ||= Hash.new do |h,k|
- h[k] = Array.new
- end
- end
-
- ##
- # Initializes a generic gem command named +command+. +summary+ is a short
- # description displayed in `gem help commands`. +defaults+ are the default
- # options. Defaults should be mirrored in #defaults_str, unless there are
- # none.
- #
- # When defining a new command subclass, use add_option to add command-line
- # switches.
- #
- # Unhandled arguments (gem names, files, etc.) are left in
- # <tt>options[:args]</tt>.
-
- def initialize(command, summary=nil, defaults={})
- @command = command
- @summary = summary
- @program_name = "gem #{command}"
- @defaults = defaults
- @options = defaults.dup
- @option_groups = Hash.new { |h,k| h[k] = [] }
- @parser = nil
- @when_invoked = nil
- end
-
- ##
- # True if +long+ begins with the characters from +short+.
-
- def begins?(long, short)
- return false if short.nil?
- long[0, short.length] == short
- end
-
- ##
- # Override to provide command handling.
- #
- # #options will be filled in with your parsed options, unparsed options will
- # be left in <tt>options[:args]</tt>.
- #
- # See also: #get_all_gem_names, #get_one_gem_name,
- # #get_one_optional_argument
-
- def execute
- raise Gem::Exception, "generic command has no actions"
- end
-
- ##
- # Get all gem names from the command line.
-
- def get_all_gem_names
- args = options[:args]
-
- if args.nil? or args.empty? then
- raise Gem::CommandLineError,
- "Please specify at least one gem name (e.g. gem build GEMNAME)"
- end
-
- gem_names = args.select { |arg| arg !~ /^-/ }
- end
-
- ##
- # Get the single gem name from the command line. Fail if there is no gem
- # name or if there is more than one gem name given.
-
- def get_one_gem_name
- args = options[:args]
-
- if args.nil? or args.empty? then
- raise Gem::CommandLineError,
- "Please specify a gem name on the command line (e.g. gem build GEMNAME)"
- end
-
- if args.size > 1 then
- raise Gem::CommandLineError,
- "Too many gem names (#{args.join(', ')}); please specify only one"
- end
-
- args.first
- end
-
- ##
- # Get a single optional argument from the command line. If more than one
- # argument is given, return only the first. Return nil if none are given.
-
- def get_one_optional_argument
- args = options[:args] || []
- args.first
- end
-
- ##
- # Override to provide details of the arguments a command takes. It should
- # return a left-justified string, one argument per line.
- #
- # For example:
- #
- # def usage
- # "#{program_name} FILE [FILE ...]"
- # end
- #
- # def arguments
- # "FILE name of file to find"
- # end
-
- def arguments
- ""
- end
-
- ##
- # Override to display the default values of the command options. (similar to
- # +arguments+, but displays the default values).
- #
- # For example:
- #
- # def defaults_str
- # --no-gems-first --no-all
- # end
-
- def defaults_str
- ""
- end
-
- ##
- # Override to display a longer description of what this command does.
-
- def description
- nil
- end
-
- ##
- # Override to display the usage for an individual gem command.
- #
- # The text "[options]" is automatically appended to the usage text.
-
- def usage
- program_name
- end
-
- ##
- # Display the help message for the command.
-
- def show_help
- parser.program_name = usage
- say parser
- end
-
- ##
- # Invoke the command with the given list of arguments.
-
- def invoke(*args)
- handle_options(args)
- if options[:help]
- show_help
- elsif @when_invoked
- @when_invoked.call(options)
- else
- execute
- end
- end
-
- ##
- # Call the given block when invoked.
- #
- # Normal command invocations just executes the +execute+ method of the
- # command. Specifying an invocation block allows the test methods to
- # override the normal action of a command to determine that it has been
- # invoked correctly.
-
- def when_invoked(&block)
- @when_invoked = block
- end
-
- ##
- # Add a command-line option and handler to the command.
- #
- # See OptionParser#make_switch for an explanation of +opts+.
- #
- # +handler+ will be called with two values, the value of the argument and
- # the options hash.
- #
- # If the first argument of add_option is a Symbol, it's used to group
- # options in output. See `gem help list` for an example.
-
- def add_option(*opts, &handler) # :yields: value, options
- group_name = Symbol === opts.first ? opts.shift : :options
-
- @option_groups[group_name] << [opts, handler]
- end
-
- ##
- # Remove previously defined command-line argument +name+.
-
- def remove_option(name)
- @option_groups.each do |_, option_list|
- option_list.reject! { |args, _| args.any? { |x| x =~ /^#{name}/ } }
- end
- end
-
- ##
- # Merge a set of command options with the set of default options (without
- # modifying the default option hash).
-
- def merge_options(new_options)
- @options = @defaults.clone
- new_options.each do |k,v| @options[k] = v end
- end
-
- ##
- # True if the command handles the given argument list.
-
- def handles?(args)
- begin
- parser.parse!(args.dup)
- return true
- rescue
- return false
- end
- end
-
- ##
- # Handle the given list of arguments by parsing them and recording the
- # results.
-
- def handle_options(args)
- args = add_extra_args(args)
- @options = @defaults.clone
- parser.parse!(args)
- @options[:args] = args
- end
-
- ##
- # Adds extra args from ~/.gemrc
-
- def add_extra_args(args)
- result = []
-
- s_extra = Gem::Command.specific_extra_args(@command)
- extra = Gem::Command.extra_args + s_extra
-
- until extra.empty? do
- ex = []
- ex << extra.shift
- ex << extra.shift if extra.first.to_s =~ /^[^-]/
- result << ex if handles?(ex)
- end
-
- result.flatten!
- result.concat(args)
- result
- end
-
- private
-
- ##
- # Create on demand parser.
-
- def parser
- create_option_parser if @parser.nil?
- @parser
- end
-
- def create_option_parser
- @parser = OptionParser.new
-
- @parser.separator("")
- regular_options = @option_groups.delete :options
-
- configure_options "", regular_options
-
- @option_groups.sort_by { |n,_| n.to_s }.each do |group_name, option_list|
- configure_options group_name, option_list
- end
-
- configure_options "Common", Gem::Command.common_options
-
- @parser.separator("")
- unless arguments.empty?
- @parser.separator(" Arguments:")
- arguments.split(/\n/).each do |arg_desc|
- @parser.separator(" #{arg_desc}")
- end
- @parser.separator("")
- end
-
- @parser.separator(" Summary:")
- wrap(@summary, 80 - 4).split("\n").each do |line|
- @parser.separator(" #{line.strip}")
- end
-
- if description then
- formatted = description.split("\n\n").map do |chunk|
- wrap(chunk, 80 - 4)
- end.join("\n")
-
- @parser.separator ""
- @parser.separator " Description:"
- formatted.split("\n").each do |line|
- @parser.separator " #{line.rstrip}"
- end
- end
-
- unless defaults_str.empty?
- @parser.separator("")
- @parser.separator(" Defaults:")
- defaults_str.split(/\n/).each do |line|
- @parser.separator(" #{line}")
- end
- end
- end
-
- def configure_options(header, option_list)
- return if option_list.nil? or option_list.empty?
-
- header = header.to_s.empty? ? '' : "#{header} "
- @parser.separator " #{header}Options:"
-
- option_list.each do |args, handler|
- dashes = args.select { |arg| arg =~ /^-/ }
- @parser.on(*args) do |value|
- handler.call(value, @options)
- end
- end
-
- @parser.separator ''
- end
-
- ##
- # Wraps +text+ to +width+
-
- def wrap(text, width) # :doc:
- text.gsub(/(.{1,#{width}})( +|$\n?)|(.{1,#{width}})/, "\\1\\3\n")
- end
-
- # ----------------------------------------------------------------
- # Add the options common to all commands.
-
- add_common_option('-h', '--help',
- 'Get help on this command') do |value, options|
- options[:help] = true
- end
-
- add_common_option('-V', '--[no-]verbose',
- 'Set the verbose level of output') do |value, options|
- # Set us to "really verbose" so the progress meter works
- if Gem.configuration.verbose and value then
- Gem.configuration.verbose = 1
- else
- Gem.configuration.verbose = value
- end
- end
-
- add_common_option('-q', '--quiet', 'Silence commands') do |value, options|
- Gem.configuration.verbose = false
- end
-
- # Backtrace and config-file are added so they show up in the help
- # commands. Both options are actually handled before the other
- # options get parsed.
-
- add_common_option('--config-file FILE',
- 'Use this config file instead of default') do
- end
-
- add_common_option('--backtrace',
- 'Show stack backtrace on errors') do
- end
-
- add_common_option('--debug',
- 'Turn on Ruby debugging') do
- end
-
- # :stopdoc:
-
- HELP = %{
- RubyGems is a sophisticated package manager for Ruby. This is a
- basic help message containing pointers to more information.
-
- Usage:
- gem -h/--help
- gem -v/--version
- gem command [arguments...] [options...]
-
- Examples:
- gem install rake
- gem list --local
- gem build package.gemspec
- gem help install
-
- Further help:
- gem help commands list all 'gem' commands
- gem help examples show some examples of usage
- gem help platforms show information about platforms
- gem help <COMMAND> show help on COMMAND
- (e.g. 'gem help install')
- gem server present a web page at
- http://localhost:8808/
- with info about installed gems
- Further information:
- http://rubygems.rubyforge.org
- }.gsub(/^ /, '')
-
- # :startdoc:
-
-end
-
-##
-# This is where Commands will be placed in the namespace
-
-module Gem::Commands
-end
-
diff --git a/lib/rubygems/command_manager.rb b/lib/rubygems/command_manager.rb
deleted file mode 100644
index 0a190161ca..0000000000
--- a/lib/rubygems/command_manager.rb
+++ /dev/null
@@ -1,174 +0,0 @@
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-require 'timeout'
-require 'rubygems/command'
-require 'rubygems/user_interaction'
-
-##
-# The command manager registers and installs all the individual sub-commands
-# supported by the gem command.
-#
-# Extra commands can be provided by writing a rubygems_plugin.rb
-# file in an installed gem. You should register your command against the
-# Gem::CommandManager instance, like this:
-#
-# # file rubygems_plugin.rb
-# require 'rubygems/command_manager'
-#
-# class Gem::Commands::EditCommand < Gem::Command
-# # ...
-# end
-#
-# Gem::CommandManager.instance.register_command :edit
-#
-# See Gem::Command for instructions on writing gem commands.
-
-class Gem::CommandManager
-
- include Gem::UserInteraction
-
- ##
- # Return the authoritative instance of the command manager.
-
- def self.instance
- @command_manager ||= new
- end
-
- ##
- # Register all the subcommands supported by the gem command.
-
- def initialize
- @commands = {}
- register_command :build
- register_command :cert
- register_command :check
- register_command :cleanup
- register_command :contents
- register_command :dependency
- register_command :environment
- register_command :fetch
- register_command :generate_index
- register_command :help
- register_command :install
- register_command :list
- register_command :lock
- register_command :mirror
- register_command :outdated
- register_command :pristine
- register_command :query
- register_command :rdoc
- register_command :search
- register_command :server
- register_command :sources
- register_command :specification
- register_command :stale
- register_command :uninstall
- register_command :unpack
- register_command :update
- register_command :which
- end
-
- ##
- # Register the command object.
-
- def register_command(command_obj)
- @commands[command_obj] = false
- end
-
- ##
- # Return the registered command from the command name.
-
- def [](command_name)
- command_name = command_name.intern
- return nil if @commands[command_name].nil?
- @commands[command_name] ||= load_and_instantiate(command_name)
- end
-
- ##
- # Return a sorted list of all command names (as strings).
-
- def command_names
- @commands.keys.collect {|key| key.to_s}.sort
- end
-
- ##
- # Run the config specified by +args+.
-
- def run(args)
- process_args(args)
- rescue StandardError, Timeout::Error => ex
- alert_error "While executing gem ... (#{ex.class})\n #{ex.to_s}"
- ui.errs.puts "\t#{ex.backtrace.join "\n\t"}" if
- Gem.configuration.backtrace
- terminate_interaction(1)
- rescue Interrupt
- alert_error "Interrupted"
- terminate_interaction(1)
- end
-
- def process_args(args)
- args = args.to_str.split(/\s+/) if args.respond_to?(:to_str)
- if args.size == 0
- say Gem::Command::HELP
- terminate_interaction(1)
- end
- case args[0]
- when '-h', '--help'
- say Gem::Command::HELP
- terminate_interaction(0)
- when '-v', '--version'
- say Gem::RubyGemsVersion
- terminate_interaction(0)
- when /^-/
- alert_error "Invalid option: #{args[0]}. See 'gem --help'."
- terminate_interaction(1)
- else
- cmd_name = args.shift.downcase
- cmd = find_command(cmd_name)
- cmd.invoke(*args)
- end
- end
-
- def find_command(cmd_name)
- possibilities = find_command_possibilities cmd_name
- if possibilities.size > 1 then
- raise "Ambiguous command #{cmd_name} matches [#{possibilities.join(', ')}]"
- elsif possibilities.size < 1 then
- raise "Unknown command #{cmd_name}"
- end
-
- self[possibilities.first]
- end
-
- def find_command_possibilities(cmd_name)
- len = cmd_name.length
-
- command_names.select { |n| cmd_name == n[0, len] }
- end
-
- private
-
- def load_and_instantiate(command_name)
- command_name = command_name.to_s
- retried = false
-
- begin
- const_name = command_name.capitalize.gsub(/_(.)/) { $1.upcase }
- Gem::Commands.const_get("#{const_name}Command").new
- rescue NameError
- if retried then
- raise
- else
- retried = true
- require "rubygems/commands/#{command_name}_command"
- retry
- end
- end
- end
-
-end
-
diff --git a/lib/rubygems/commands/build_command.rb b/lib/rubygems/commands/build_command.rb
deleted file mode 100644
index e1f0122c6c..0000000000
--- a/lib/rubygems/commands/build_command.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-require 'rubygems/command'
-require 'rubygems/builder'
-
-class Gem::Commands::BuildCommand < Gem::Command
-
- def initialize
- super('build', 'Build a gem from a gemspec')
- end
-
- def arguments # :nodoc:
- "GEMSPEC_FILE gemspec file name to build a gem for"
- end
-
- def usage # :nodoc:
- "#{program_name} GEMSPEC_FILE"
- end
-
- def execute
- gemspec = get_one_gem_name
- if File.exist?(gemspec)
- specs = load_gemspecs(gemspec)
- specs.each do |spec|
- Gem::Builder.new(spec).build
- end
- else
- alert_error "Gemspec file not found: #{gemspec}"
- end
- end
-
- def load_gemspecs(filename)
- if yaml?(filename)
- result = []
- open(filename) do |f|
- begin
- while not f.eof? and spec = Gem::Specification.from_yaml(f)
- result << spec
- end
- rescue Gem::EndOfYAMLException => e
- # OK
- end
- end
- else
- result = [Gem::Specification.load(filename)]
- end
- result
- end
-
- def yaml?(filename)
- line = open(filename) { |f| line = f.gets }
- result = line =~ %r{!ruby/object:Gem::Specification}
- result
- end
-end
diff --git a/lib/rubygems/commands/cert_command.rb b/lib/rubygems/commands/cert_command.rb
deleted file mode 100644
index f5b698855b..0000000000
--- a/lib/rubygems/commands/cert_command.rb
+++ /dev/null
@@ -1,86 +0,0 @@
-require 'rubygems/command'
-require 'rubygems/security'
-
-class Gem::Commands::CertCommand < Gem::Command
-
- def initialize
- super 'cert', 'Manage RubyGems certificates and signing settings'
-
- add_option('-a', '--add CERT',
- 'Add a trusted certificate.') do |value, options|
- cert = OpenSSL::X509::Certificate.new(File.read(value))
- Gem::Security.add_trusted_cert(cert)
- say "Added '#{cert.subject.to_s}'"
- end
-
- add_option('-l', '--list',
- 'List trusted certificates.') do |value, options|
- glob_str = File::join(Gem::Security::OPT[:trust_dir], '*.pem')
- Dir::glob(glob_str) do |path|
- begin
- cert = OpenSSL::X509::Certificate.new(File.read(path))
- # this could probably be formatted more gracefully
- say cert.subject.to_s
- rescue OpenSSL::X509::CertificateError
- next
- end
- end
- end
-
- add_option('-r', '--remove STRING',
- 'Remove trusted certificates containing',
- 'STRING.') do |value, options|
- trust_dir = Gem::Security::OPT[:trust_dir]
- glob_str = File::join(trust_dir, '*.pem')
-
- Dir::glob(glob_str) do |path|
- begin
- cert = OpenSSL::X509::Certificate.new(File.read(path))
- if cert.subject.to_s.downcase.index(value)
- say "Removed '#{cert.subject.to_s}'"
- File.unlink(path)
- end
- rescue OpenSSL::X509::CertificateError
- next
- end
- end
- end
-
- add_option('-b', '--build EMAIL_ADDR',
- 'Build private key and self-signed',
- 'certificate for EMAIL_ADDR.') do |value, options|
- vals = Gem::Security.build_self_signed_cert(value)
- File.chmod 0600, vals[:key_path]
- say "Public Cert: #{vals[:cert_path]}"
- say "Private Key: #{vals[:key_path]}"
- say "Don't forget to move the key file to somewhere private..."
- end
-
- add_option('-C', '--certificate CERT',
- 'Certificate for --sign command.') do |value, options|
- cert = OpenSSL::X509::Certificate.new(File.read(value))
- Gem::Security::OPT[:issuer_cert] = cert
- end
-
- add_option('-K', '--private-key KEY',
- 'Private key for --sign command.') do |value, options|
- key = OpenSSL::PKey::RSA.new(File.read(value))
- Gem::Security::OPT[:issuer_key] = key
- end
-
- add_option('-s', '--sign NEWCERT',
- 'Sign a certificate with my key and',
- 'certificate.') do |value, options|
- cert = OpenSSL::X509::Certificate.new(File.read(value))
- my_cert = Gem::Security::OPT[:issuer_cert]
- my_key = Gem::Security::OPT[:issuer_key]
- cert = Gem::Security.sign_cert(cert, my_key, my_cert)
- File.open(value, 'wb') { |file| file.write(cert.to_pem) }
- end
- end
-
- def execute
- end
-
-end
-
diff --git a/lib/rubygems/commands/check_command.rb b/lib/rubygems/commands/check_command.rb
deleted file mode 100644
index 475aeb3795..0000000000
--- a/lib/rubygems/commands/check_command.rb
+++ /dev/null
@@ -1,80 +0,0 @@
-require 'rubygems/command'
-require 'rubygems/version_option'
-require 'rubygems/validator'
-
-class Gem::Commands::CheckCommand < Gem::Command
-
- include Gem::VersionOption
-
- def initialize
- super 'check', 'Check installed gems',
- :verify => false, :alien => false
-
- add_option( '--verify FILE',
- 'Verify gem file against its internal',
- 'checksum') do |value, options|
- options[:verify] = value
- end
-
- add_option('-a', '--alien', "Report 'unmanaged' or rogue files in the",
- "gem repository") do |value, options|
- options[:alien] = true
- end
-
- add_option('-v', '--verbose', "Spew more words") do |value, options|
- options[:verbose] = true
- end
-
- add_option('-t', '--test', "Run unit tests for gem") do |value, options|
- options[:test] = true
- end
-
- add_version_option 'run tests for'
- end
-
- def execute
- if options[:test]
- version = options[:version] || Gem::Requirement.default
- dep = Gem::Dependency.new get_one_gem_name, version
- gem_spec = Gem::SourceIndex.from_installed_gems.search(dep).first
- Gem::Validator.new.unit_test(gem_spec)
- end
-
- if options[:alien]
- say "Performing the 'alien' operation"
- say
- gems = get_all_gem_names rescue []
- Gem::Validator.new.alien(gems).sort.each do |key, val|
- unless val.empty? then
- say "#{key} has #{val.size} problems"
- val.each do |error_entry|
- say " #{error_entry.path}:"
- say " #{error_entry.problem}"
- end
- else
- say "#{key} is error-free" if options[:verbose]
- end
- say
- end
- end
-
- if options[:verify]
- gem_name = options[:verify]
- unless gem_name
- alert_error "Must specify a .gem file with --verify NAME"
- return
- end
- unless File.exist?(gem_name)
- alert_error "Unknown file: #{gem_name}."
- return
- end
- say "Verifying gem: '#{gem_name}'"
- begin
- Gem::Validator.new.verify_gem_file(gem_name)
- rescue Exception => e
- alert_error "#{gem_name} is invalid."
- end
- end
- end
-
-end
diff --git a/lib/rubygems/commands/cleanup_command.rb b/lib/rubygems/commands/cleanup_command.rb
deleted file mode 100644
index 1b6e405782..0000000000
--- a/lib/rubygems/commands/cleanup_command.rb
+++ /dev/null
@@ -1,106 +0,0 @@
-require 'rubygems/command'
-require 'rubygems/source_index'
-require 'rubygems/dependency_list'
-require 'rubygems/uninstaller'
-
-class Gem::Commands::CleanupCommand < Gem::Command
-
- def initialize
- super 'cleanup',
- 'Clean up old versions of installed gems in the local repository',
- :force => false, :test => false, :install_dir => Gem.dir
-
- add_option('-d', '--dryrun', "") do |value, options|
- options[:dryrun] = true
- end
- end
-
- def arguments # :nodoc:
- "GEMNAME name of gem to cleanup"
- end
-
- def defaults_str # :nodoc:
- "--no-dryrun"
- end
-
- def description # :nodoc:
- <<-EOF
-The cleanup command removes old gems from GEM_HOME. If an older version is
-installed elsewhere in GEM_PATH the cleanup command won't touch it.
- EOF
- end
-
- def usage # :nodoc:
- "#{program_name} [GEMNAME ...]"
- end
-
- def execute
- say "Cleaning up installed gems..."
- primary_gems = {}
-
- Gem.source_index.each do |name, spec|
- if primary_gems[spec.name].nil? or
- primary_gems[spec.name].version < spec.version then
- primary_gems[spec.name] = spec
- end
- end
-
- gems_to_cleanup = []
-
- unless options[:args].empty? then
- options[:args].each do |gem_name|
- dep = Gem::Dependency.new gem_name, Gem::Requirement.default
- specs = Gem.source_index.search dep
- specs.each do |spec|
- gems_to_cleanup << spec
- end
- end
- else
- Gem.source_index.each do |name, spec|
- gems_to_cleanup << spec
- end
- end
-
- gems_to_cleanup = gems_to_cleanup.select { |spec|
- primary_gems[spec.name].version != spec.version
- }
-
- deplist = Gem::DependencyList.new
- gems_to_cleanup.uniq.each do |spec| deplist.add spec end
-
- deps = deplist.strongly_connected_components.flatten.reverse
-
- deps.each do |spec|
- if options[:dryrun] then
- say "Dry Run Mode: Would uninstall #{spec.full_name}"
- else
- say "Attempting to uninstall #{spec.full_name}"
-
- options[:args] = [spec.name]
-
- uninstall_options = {
- :executables => false,
- :version => "= #{spec.version}",
- }
-
- if Gem.user_dir == spec.installation_path then
- uninstall_options[:install_dir] = spec.installation_path
- end
-
- uninstaller = Gem::Uninstaller.new spec.name, uninstall_options
-
- begin
- uninstaller.uninstall
- rescue Gem::DependencyRemovalException, Gem::InstallError,
- Gem::GemNotInHomeException => e
- say "Unable to uninstall #{spec.full_name}:"
- say "\t#{e.class}: #{e.message}"
- end
- end
- end
-
- say "Clean Up Complete"
- end
-
-end
-
diff --git a/lib/rubygems/commands/contents_command.rb b/lib/rubygems/commands/contents_command.rb
deleted file mode 100644
index ce2c655240..0000000000
--- a/lib/rubygems/commands/contents_command.rb
+++ /dev/null
@@ -1,98 +0,0 @@
-require 'rubygems/command'
-require 'rubygems/version_option'
-
-class Gem::Commands::ContentsCommand < Gem::Command
-
- include Gem::VersionOption
-
- def initialize
- super 'contents', 'Display the contents of the installed gems',
- :specdirs => [], :lib_only => false
-
- add_version_option
-
- add_option( '--all',
- "Contents for all gems") do |all, options|
- options[:all] = all
- end
-
- add_option('-s', '--spec-dir a,b,c', Array,
- "Search for gems under specific paths") do |spec_dirs, options|
- options[:specdirs] = spec_dirs
- end
-
- add_option('-l', '--[no-]lib-only',
- "Only return files in the Gem's lib_dirs") do |lib_only, options|
- options[:lib_only] = lib_only
- end
-
- add_option( '--[no-]prefix',
- "Don't include installed path prefix") do |prefix, options|
- options[:prefix] = prefix
- end
- end
-
- def arguments # :nodoc:
- "GEMNAME name of gem to list contents for"
- end
-
- def defaults_str # :nodoc:
- "--no-lib-only --prefix"
- end
-
- def usage # :nodoc:
- "#{program_name} GEMNAME [GEMNAME ...]"
- end
-
- def execute
- version = options[:version] || Gem::Requirement.default
-
- spec_dirs = options[:specdirs].map do |i|
- [i, File.join(i, "specifications")]
- end.flatten
-
- path_kind = if spec_dirs.empty? then
- spec_dirs = Gem::SourceIndex.installed_spec_directories
- "default gem paths"
- else
- "specified path"
- end
-
- si = Gem::SourceIndex.from_gems_in(*spec_dirs)
-
- gem_names = if options[:all] then
- si.map { |_, spec| spec.name }
- else
- get_all_gem_names
- end
-
- gem_names.each do |name|
- gem_spec = si.find_name(name, version).last
-
- unless gem_spec then
- say "Unable to find gem '#{name}' in #{path_kind}"
-
- if Gem.configuration.verbose then
- say "\nDirectories searched:"
- spec_dirs.each { |dir| say dir }
- end
-
- terminate_interaction 1 if gem_names.length == 1
- end
-
- files = options[:lib_only] ? gem_spec.lib_files : gem_spec.files
-
- files.each do |f|
- path = if options[:prefix] then
- File.join gem_spec.full_gem_path, f
- else
- f
- end
-
- say path
- end
- end
- end
-
-end
-
diff --git a/lib/rubygems/commands/dependency_command.rb b/lib/rubygems/commands/dependency_command.rb
deleted file mode 100644
index 44b269bb11..0000000000
--- a/lib/rubygems/commands/dependency_command.rb
+++ /dev/null
@@ -1,188 +0,0 @@
-require 'rubygems/command'
-require 'rubygems/local_remote_options'
-require 'rubygems/version_option'
-require 'rubygems/source_info_cache'
-
-class Gem::Commands::DependencyCommand < Gem::Command
-
- include Gem::LocalRemoteOptions
- include Gem::VersionOption
-
- def initialize
- super 'dependency',
- 'Show the dependencies of an installed gem',
- :version => Gem::Requirement.default, :domain => :local
-
- add_version_option
- add_platform_option
-
- add_option('-R', '--[no-]reverse-dependencies',
- 'Include reverse dependencies in the output') do
- |value, options|
- options[:reverse_dependencies] = value
- end
-
- add_option('-p', '--pipe',
- "Pipe Format (name --version ver)") do |value, options|
- options[:pipe_format] = value
- end
-
- add_local_remote_options
- end
-
- def arguments # :nodoc:
- "GEMNAME name of gem to show dependencies for"
- end
-
- def defaults_str # :nodoc:
- "--local --version '#{Gem::Requirement.default}' --no-reverse-dependencies"
- end
-
- def usage # :nodoc:
- "#{program_name} GEMNAME"
- end
-
- def execute
- options[:args] << '' if options[:args].empty?
- specs = {}
-
- source_indexes = Hash.new do |h, source_uri|
- h[source_uri] = Gem::SourceIndex.new
- end
-
- pattern = if options[:args].length == 1 and
- options[:args].first =~ /\A\/(.*)\/(i)?\z/m then
- flags = $2 ? Regexp::IGNORECASE : nil
- Regexp.new $1, flags
- else
- /\A#{Regexp.union(*options[:args])}/
- end
-
- dependency = Gem::Dependency.new pattern, options[:version]
-
- if options[:reverse_dependencies] and remote? and not local? then
- alert_error 'Only reverse dependencies for local gems are supported.'
- terminate_interaction 1
- end
-
- if local? then
- Gem.source_index.search(dependency).each do |spec|
- source_indexes[:local].add_spec spec
- end
- end
-
- if remote? and not options[:reverse_dependencies] then
- fetcher = Gem::SpecFetcher.fetcher
-
- begin
- fetcher.find_matching(dependency).each do |spec_tuple, source_uri|
- spec = fetcher.fetch_spec spec_tuple, URI.parse(source_uri)
-
- source_indexes[source_uri].add_spec spec
- end
- rescue Gem::RemoteFetcher::FetchError => e
- raise unless fetcher.warn_legacy e do
- require 'rubygems/source_info_cache'
-
- specs = Gem::SourceInfoCache.search_with_source dependency, false
-
- specs.each do |spec, source_uri|
- source_indexes[source_uri].add_spec spec
- end
- end
- end
- end
-
- if source_indexes.empty? then
- patterns = options[:args].join ','
- say "No gems found matching #{patterns} (#{options[:version]})" if
- Gem.configuration.verbose
-
- terminate_interaction 1
- end
-
- specs = {}
-
- source_indexes.values.each do |source_index|
- source_index.gems.each do |name, spec|
- specs[spec.full_name] = [source_index, spec]
- end
- end
-
- reverse = Hash.new { |h, k| h[k] = [] }
-
- if options[:reverse_dependencies] then
- specs.values.each do |_, spec|
- reverse[spec.full_name] = find_reverse_dependencies spec
- end
- end
-
- if options[:pipe_format] then
- specs.values.sort_by { |_, spec| spec }.each do |_, spec|
- unless spec.dependencies.empty?
- spec.dependencies.each do |dep|
- say "#{dep.name} --version '#{dep.version_requirements}'"
- end
- end
- end
- else
- response = ''
-
- specs.values.sort_by { |_, spec| spec }.each do |_, spec|
- response << print_dependencies(spec)
- unless reverse[spec.full_name].empty? then
- response << " Used by\n"
- reverse[spec.full_name].each do |sp, dep|
- response << " #{sp} (#{dep})\n"
- end
- end
- response << "\n"
- end
-
- say response
- end
- end
-
- def print_dependencies(spec, level = 0)
- response = ''
- response << ' ' * level + "Gem #{spec.full_name}\n"
- unless spec.dependencies.empty? then
- spec.dependencies.each do |dep|
- response << ' ' * level + " #{dep}\n"
- end
- end
- response
- end
-
- # Retuns list of [specification, dep] that are satisfied by spec.
- def find_reverse_dependencies(spec)
- result = []
-
- Gem.source_index.each do |name, sp|
- sp.dependencies.each do |dep|
- dep = Gem::Dependency.new(*dep) unless Gem::Dependency === dep
-
- if spec.name == dep.name and
- dep.version_requirements.satisfied_by?(spec.version) then
- result << [sp.full_name, dep]
- end
- end
- end
-
- result
- end
-
- def find_gems(name, source_index)
- specs = {}
-
- spec_list = source_index.search name, options[:version]
-
- spec_list.each do |spec|
- specs[spec.full_name] = [source_index, spec]
- end
-
- specs
- end
-
-end
-
diff --git a/lib/rubygems/commands/environment_command.rb b/lib/rubygems/commands/environment_command.rb
deleted file mode 100644
index e672da54f0..0000000000
--- a/lib/rubygems/commands/environment_command.rb
+++ /dev/null
@@ -1,128 +0,0 @@
-require 'rubygems/command'
-
-class Gem::Commands::EnvironmentCommand < Gem::Command
-
- def initialize
- super 'environment', 'Display information about the RubyGems environment'
- end
-
- def arguments # :nodoc:
- args = <<-EOF
- packageversion display the package version
- gemdir display the path where gems are installed
- gempath display path used to search for gems
- version display the gem format version
- remotesources display the remote gem servers
- <omitted> display everything
- EOF
- return args.gsub(/^\s+/, '')
- end
-
- def description # :nodoc:
- <<-EOF
-The RubyGems environment can be controlled through command line arguments,
-gemrc files, environment variables and built-in defaults.
-
-Command line argument defaults and some RubyGems defaults can be set in
-~/.gemrc file for individual users and a /etc/gemrc for all users. A gemrc
-is a YAML file with the following YAML keys:
-
- :sources: A YAML array of remote gem repositories to install gems from
- :verbose: Verbosity of the gem command. false, true, and :really are the
- levels
- :update_sources: Enable/disable automatic updating of repository metadata
- :backtrace: Print backtrace when RubyGems encounters an error
- :bulk_threshold: Switch to a bulk update when this many sources are out of
- date (legacy setting)
- :gempath: The paths in which to look for gems
- gem_command: A string containing arguments for the specified gem command
-
-Example:
-
- :verbose: false
- install: --no-wrappers
- update: --no-wrappers
-
-RubyGems' default local repository can be overriden with the GEM_PATH and
-GEM_HOME environment variables. GEM_HOME sets the default repository to
-install into. GEM_PATH allows multiple local repositories to be searched for
-gems.
-
-If you are behind a proxy server, RubyGems uses the HTTP_PROXY,
-HTTP_PROXY_USER and HTTP_PROXY_PASS environment variables to discover the
-proxy server.
-
-If you are packaging RubyGems all of RubyGems' defaults are in
-lib/rubygems/defaults.rb. You may override these in
-lib/rubygems/defaults/operating_system.rb
- EOF
- end
-
- def usage # :nodoc:
- "#{program_name} [arg]"
- end
-
- def execute
- out = ''
- arg = options[:args][0]
- case arg
- when /^packageversion/ then
- out << Gem::RubyGemsPackageVersion
- when /^version/ then
- out << Gem::RubyGemsVersion
- when /^gemdir/, /^gemhome/, /^home/, /^GEM_HOME/ then
- out << Gem.dir
- when /^gempath/, /^path/, /^GEM_PATH/ then
- out << Gem.path.join(File::PATH_SEPARATOR)
- when /^remotesources/ then
- out << Gem.sources.join("\n")
- when nil then
- out = "RubyGems Environment:\n"
-
- out << " - RUBYGEMS VERSION: #{Gem::RubyGemsVersion}\n"
-
- out << " - RUBY VERSION: #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}"
- out << " patchlevel #{RUBY_PATCHLEVEL}" if defined? RUBY_PATCHLEVEL
- out << ") [#{RUBY_PLATFORM}]\n"
-
- out << " - INSTALLATION DIRECTORY: #{Gem.dir}\n"
-
- out << " - RUBYGEMS PREFIX: #{Gem.prefix}\n" unless Gem.prefix.nil?
-
- out << " - RUBY EXECUTABLE: #{Gem.ruby}\n"
-
- out << " - EXECUTABLE DIRECTORY: #{Gem.bindir}\n"
-
- out << " - RUBYGEMS PLATFORMS:\n"
- Gem.platforms.each do |platform|
- out << " - #{platform}\n"
- end
-
- out << " - GEM PATHS:\n"
- out << " - #{Gem.dir}\n"
-
- path = Gem.path.dup
- path.delete Gem.dir
- path.each do |p|
- out << " - #{p}\n"
- end
-
- out << " - GEM CONFIGURATION:\n"
- Gem.configuration.each do |name, value|
- out << " - #{name.inspect} => #{value.inspect}\n"
- end
-
- out << " - REMOTE SOURCES:\n"
- Gem.sources.each do |s|
- out << " - #{s}\n"
- end
-
- else
- fail Gem::CommandLineError, "Unknown enviroment option [#{arg}]"
- end
- say out
- true
- end
-
-end
-
diff --git a/lib/rubygems/commands/fetch_command.rb b/lib/rubygems/commands/fetch_command.rb
deleted file mode 100644
index 76c9924e6b..0000000000
--- a/lib/rubygems/commands/fetch_command.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-require 'rubygems/command'
-require 'rubygems/local_remote_options'
-require 'rubygems/version_option'
-require 'rubygems/source_info_cache'
-
-class Gem::Commands::FetchCommand < Gem::Command
-
- include Gem::LocalRemoteOptions
- include Gem::VersionOption
-
- def initialize
- super 'fetch', 'Download a gem and place it in the current directory'
-
- add_bulk_threshold_option
- add_proxy_option
- add_source_option
-
- add_version_option
- add_platform_option
- end
-
- def arguments # :nodoc:
- 'GEMNAME name of gem to download'
- end
-
- def defaults_str # :nodoc:
- "--version '#{Gem::Requirement.default}'"
- end
-
- def usage # :nodoc:
- "#{program_name} GEMNAME [GEMNAME ...]"
- end
-
- def execute
- version = options[:version] || Gem::Requirement.default
- all = Gem::Requirement.default
-
- gem_names = get_all_gem_names
-
- gem_names.each do |gem_name|
- dep = Gem::Dependency.new gem_name, version
-
- specs_and_sources = Gem::SpecFetcher.fetcher.fetch dep, all
-
- specs_and_sources.sort_by { |spec,| spec.version }
-
- spec, source_uri = specs_and_sources.last
-
- if spec.nil? then
- alert_error "Could not find #{gem_name} in any repository"
- next
- end
-
- path = Gem::RemoteFetcher.fetcher.download spec, source_uri
- FileUtils.mv path, "#{spec.full_name}.gem"
-
- say "Downloaded #{spec.full_name}"
- end
- end
-
-end
-
diff --git a/lib/rubygems/commands/generate_index_command.rb b/lib/rubygems/commands/generate_index_command.rb
deleted file mode 100644
index 945d32383c..0000000000
--- a/lib/rubygems/commands/generate_index_command.rb
+++ /dev/null
@@ -1,133 +0,0 @@
-require 'rubygems/command'
-require 'rubygems/indexer'
-
-##
-# Generates a index files for use as a gem server.
-#
-# See `gem help generate_index`
-
-class Gem::Commands::GenerateIndexCommand < Gem::Command
-
- def initialize
- super 'generate_index',
- 'Generates the index files for a gem server directory',
- :directory => '.', :build_legacy => true, :build_modern => true
-
- add_option '-d', '--directory=DIRNAME',
- 'repository base dir containing gems subdir' do |dir, options|
- options[:directory] = File.expand_path dir
- end
-
- add_option '--[no-]legacy',
- 'Generate indexes for RubyGems older than',
- '1.2.0' do |value, options|
- unless options[:build_modern] or value then
- raise OptionParser::InvalidOption, 'no indicies will be built'
- end
-
- options[:build_legacy] = value
- end
-
- add_option '--[no-]modern',
- 'Generate indexes for RubyGems newer',
- 'than 1.2.0' do |value, options|
- unless options[:build_legacy] or value then
- raise OptionParser::InvalidOption, 'no indicies will be built'
- end
-
- options[:build_modern] = value
- end
-
- add_option '--update',
- 'Update modern indexes with gems added',
- 'since the last update' do |value, options|
- options[:update] = value
- end
-
- add_option :RSS, '--rss-gems-host=GEM_HOST',
- 'Host name where gems are served from,',
- 'used for GUID and enclosure values' do |value, options|
- options[:rss_gems_host] = value
- end
-
- add_option :RSS, '--rss-host=HOST',
- 'Host name for more gems information,',
- 'used for RSS feed link' do |value, options|
- options[:rss_host] = value
- end
-
- add_option :RSS, '--rss-title=TITLE',
- 'Set title for RSS feed' do |value, options|
- options[:rss_title] = value
- end
- end
-
- def defaults_str # :nodoc:
- "--directory . --legacy --modern"
- end
-
- def description # :nodoc:
- <<-EOF
-The generate_index command creates a set of indexes for serving gems
-statically. The command expects a 'gems' directory under the path given to
-the --directory option. The given directory will be the directory you serve
-as the gem repository.
-
-For `gem generate_index --directory /path/to/repo`, expose /path/to/repo via
-your HTTP server configuration (not /path/to/repo/gems).
-
-When done, it will generate a set of files like this:
-
- gems/*.gem # .gem files you want to
- # index
-
- specs.<version>.gz # specs index
- latest_specs.<version>.gz # latest specs index
- prerelease_specs.<version>.gz # prerelease specs index
- quick/Marshal.<version>/<gemname>.gemspec.rz # Marshal quick index file
-
- # these files support legacy RubyGems
- quick/index
- quick/index.rz # quick index manifest
- quick/<gemname>.gemspec.rz # legacy YAML quick index
- # file
- Marshal.<version>
- Marshal.<version>.Z # Marshal full index
- yaml
- yaml.Z # legacy YAML full index
-
-The .Z and .rz extension files are compressed with the inflate algorithm.
-The Marshal version number comes from ruby's Marshal::MAJOR_VERSION and
-Marshal::MINOR_VERSION constants. It is used to ensure compatibility.
-The yaml indexes exist for legacy RubyGems clients and fallback in case of
-Marshal version changes.
-
-If --rss-host and --rss-gem-host are given an RSS feed will be generated at
-index.rss containing gems released in the last two days.
- EOF
- end
-
- def execute
- if options[:update] and
- (options[:rss_host] or options[:rss_gems_host]) then
- alert_error '--update not compatible with RSS generation'
- terminate_interaction 1
- end
-
- if not File.exist?(options[:directory]) or
- not File.directory?(options[:directory]) then
- alert_error "unknown directory name #{directory}."
- terminate_interaction 1
- else
- indexer = Gem::Indexer.new options.delete(:directory), options
-
- if options[:update] then
- indexer.update_index
- else
- indexer.generate_index
- end
- end
- end
-
-end
-
diff --git a/lib/rubygems/commands/help_command.rb b/lib/rubygems/commands/help_command.rb
deleted file mode 100644
index 0c4a4ec16f..0000000000
--- a/lib/rubygems/commands/help_command.rb
+++ /dev/null
@@ -1,172 +0,0 @@
-require 'rubygems/command'
-
-class Gem::Commands::HelpCommand < Gem::Command
-
- # :stopdoc:
- EXAMPLES = <<-EOF
-Some examples of 'gem' usage.
-
-* Install 'rake', either from local directory or remote server:
-
- gem install rake
-
-* Install 'rake', only from remote server:
-
- gem install rake --remote
-
-* Install 'rake' from remote server, and run unit tests,
- and generate RDocs:
-
- gem install --remote rake --test --rdoc --ri
-
-* Install 'rake', but only version 0.3.1, even if dependencies
- are not met, and into a user-specific directory:
-
- gem install rake --version 0.3.1 --force --user-install
-
-* List local gems whose name begins with 'D':
-
- gem list D
-
-* List local and remote gems whose name contains 'log':
-
- gem search log --both
-
-* List only remote gems whose name contains 'log':
-
- gem search log --remote
-
-* Uninstall 'rake':
-
- gem uninstall rake
-
-* Create a gem:
-
- See http://rubygems.rubyforge.org/wiki/wiki.pl?CreateAGemInTenMinutes
-
-* See information about RubyGems:
-
- gem environment
-
-* Update all gems on your system:
-
- gem update
- EOF
-
- PLATFORMS = <<-'EOF'
-RubyGems platforms are composed of three parts, a CPU, an OS, and a
-version. These values are taken from values in rbconfig.rb. You can view
-your current platform by running `gem environment`.
-
-RubyGems matches platforms as follows:
-
- * The CPU must match exactly, unless one of the platforms has
- "universal" as the CPU.
- * The OS must match exactly.
- * The versions must match exactly unless one of the versions is nil.
-
-For commands that install, uninstall and list gems, you can override what
-RubyGems thinks your platform is with the --platform option. The platform
-you pass must match "#{cpu}-#{os}" or "#{cpu}-#{os}-#{version}". On mswin
-platforms, the version is the compiler version, not the OS version. (Ruby
-compiled with VC6 uses "60" as the compiler version, VC8 uses "80".)
-
-Example platforms:
-
- x86-freebsd # Any FreeBSD version on an x86 CPU
- universal-darwin-8 # Darwin 8 only gems that run on any CPU
- x86-mswin32-80 # Windows gems compiled with VC8
-
-When building platform gems, set the platform in the gem specification to
-Gem::Platform::CURRENT. This will correctly mark the gem with your ruby's
-platform.
- EOF
- # :startdoc:
-
- def initialize
- super 'help', "Provide help on the 'gem' command"
- end
-
- def arguments # :nodoc:
- args = <<-EOF
- commands List all 'gem' commands
- examples Show examples of 'gem' usage
- <command> Show specific help for <command>
- EOF
- return args.gsub(/^\s+/, '')
- end
-
- def usage # :nodoc:
- "#{program_name} ARGUMENT"
- end
-
- def execute
- command_manager = Gem::CommandManager.instance
- arg = options[:args][0]
-
- if begins? "commands", arg then
- out = []
- out << "GEM commands are:"
- out << nil
-
- margin_width = 4
-
- desc_width = command_manager.command_names.map { |n| n.size }.max + 4
-
- summary_width = 80 - margin_width - desc_width
- wrap_indent = ' ' * (margin_width + desc_width)
- format = "#{' ' * margin_width}%-#{desc_width}s%s"
-
- command_manager.command_names.each do |cmd_name|
- summary = command_manager[cmd_name].summary
- summary = wrap(summary, summary_width).split "\n"
- out << sprintf(format, cmd_name, summary.shift)
- until summary.empty? do
- out << "#{wrap_indent}#{summary.shift}"
- end
- end
-
- out << nil
- out << "For help on a particular command, use 'gem help COMMAND'."
- out << nil
- out << "Commands may be abbreviated, so long as they are unambiguous."
- out << "e.g. 'gem i rake' is short for 'gem install rake'."
-
- say out.join("\n")
-
- elsif begins? "options", arg then
- say Gem::Command::HELP
-
- elsif begins? "examples", arg then
- say EXAMPLES
-
- elsif begins? "platforms", arg then
- say PLATFORMS
-
- elsif options[:help] then
- command = command_manager[options[:help]]
- if command
- # help with provided command
- command.invoke("--help")
- else
- alert_error "Unknown command #{options[:help]}. Try 'gem help commands'"
- end
-
- elsif arg then
- possibilities = command_manager.find_command_possibilities(arg.downcase)
- if possibilities.size == 1
- command = command_manager[possibilities.first]
- command.invoke("--help")
- elsif possibilities.size > 1
- alert_warning "Ambiguous command #{arg} (#{possibilities.join(', ')})"
- else
- alert_warning "Unknown command #{arg}. Try gem help commands"
- end
-
- else
- say Gem::Command::HELP
- end
- end
-
-end
-
diff --git a/lib/rubygems/commands/install_command.rb b/lib/rubygems/commands/install_command.rb
deleted file mode 100644
index af2d8bd739..0000000000
--- a/lib/rubygems/commands/install_command.rb
+++ /dev/null
@@ -1,174 +0,0 @@
-require 'rubygems/command'
-require 'rubygems/doc_manager'
-require 'rubygems/install_update_options'
-require 'rubygems/dependency_installer'
-require 'rubygems/local_remote_options'
-require 'rubygems/validator'
-require 'rubygems/version_option'
-
-##
-# Gem installer command line tool
-#
-# See `gem help install`
-
-class Gem::Commands::InstallCommand < Gem::Command
-
- include Gem::VersionOption
- include Gem::LocalRemoteOptions
- include Gem::InstallUpdateOptions
-
- def initialize
- defaults = Gem::DependencyInstaller::DEFAULT_OPTIONS.merge({
- :generate_rdoc => true,
- :generate_ri => true,
- :format_executable => false,
- :test => false,
- :version => Gem::Requirement.default,
- })
-
- super 'install', 'Install a gem into the local repository', defaults
-
- add_install_update_options
- add_local_remote_options
- add_platform_option
- add_version_option
- end
-
- def arguments # :nodoc:
- "GEMNAME name of gem to install"
- end
-
- def defaults_str # :nodoc:
- "--both --version '#{Gem::Requirement.default}' --rdoc --ri --no-force\n" \
- "--no-test --install-dir #{Gem.dir}"
- end
-
- def description # :nodoc:
- <<-EOF
-The install command installs local or remote gem into a gem repository.
-
-For gems with executables ruby installs a wrapper file into the executable
-directory by default. This can be overridden with the --no-wrappers option.
-The wrapper allows you to choose among alternate gem versions using _version_.
-
-For example `rake _0.7.3_ --version` will run rake version 0.7.3 if a newer
-version is also installed.
-
-If an extension fails to compile during gem installation the gem
-specification is not written out, but the gem remains unpacked in the
-repository. You may need to specify the path to the library's headers and
-libraries to continue. You can do this by adding a -- between RubyGems'
-options and the extension's build options:
-
- $ gem install some_extension_gem
- [build fails]
- Gem files will remain installed in \\
- /path/to/gems/some_extension_gem-1.0 for inspection.
- Results logged to /path/to/gems/some_extension_gem-1.0/gem_make.out
- $ gem install some_extension_gem -- --with-extension-lib=/path/to/lib
- [build succeeds]
- $ gem list some_extension_gem
-
- *** LOCAL GEMS ***
-
- some_extension_gem (1.0)
- $
-
-If you correct the compilation errors by editing the gem files you will need
-to write the specification by hand. For example:
-
- $ gem install some_extension_gem
- [build fails]
- Gem files will remain installed in \\
- /path/to/gems/some_extension_gem-1.0 for inspection.
- Results logged to /path/to/gems/some_extension_gem-1.0/gem_make.out
- $ [cd /path/to/gems/some_extension_gem-1.0]
- $ [edit files or what-have-you and run make]
- $ gem spec ../../cache/some_extension_gem-1.0.gem --ruby > \\
- ../../specifications/some_extension_gem-1.0.gemspec
- $ gem list some_extension_gem
-
- *** LOCAL GEMS ***
-
- some_extension_gem (1.0)
- $
-
- EOF
- end
-
- def usage # :nodoc:
- "#{program_name} GEMNAME [GEMNAME ...] [options] -- --build-flags"
- end
-
- def execute
- if options[:include_dependencies] then
- alert "`gem install -y` is now default and will be removed"
- alert "use --ignore-dependencies to install only the gems you list"
- end
-
- installed_gems = []
-
- ENV.delete 'GEM_PATH' if options[:install_dir].nil? and RUBY_VERSION > '1.9'
-
- exit_code = 0
-
- get_all_gem_names.each do |gem_name|
- begin
- inst = Gem::DependencyInstaller.new options
- inst.install gem_name, options[:version]
-
- inst.installed_gems.each do |spec|
- say "Successfully installed #{spec.full_name}"
- end
-
- installed_gems.push(*inst.installed_gems)
- rescue Gem::InstallError => e
- alert_error "Error installing #{gem_name}:\n\t#{e.message}"
- exit_code |= 1
- rescue Gem::GemNotFoundException => e
- alert_error e.message
- exit_code |= 2
- end
- end
-
- unless installed_gems.empty? then
- gems = installed_gems.length == 1 ? 'gem' : 'gems'
- say "#{installed_gems.length} #{gems} installed"
-
- # NOTE: *All* of the RI documents must be generated first. For some
- # reason, RI docs cannot be generated after any RDoc documents are
- # generated.
-
- if options[:generate_ri] then
- installed_gems.each do |gem|
- Gem::DocManager.new(gem, options[:rdoc_args]).generate_ri
- end
-
- Gem::DocManager.update_ri_cache
- end
-
- if options[:generate_rdoc] then
- installed_gems.each do |gem|
- Gem::DocManager.new(gem, options[:rdoc_args]).generate_rdoc
- end
- end
-
- if options[:test] then
- installed_gems.each do |spec|
- gem_spec = Gem::SourceIndex.from_installed_gems.find_name(spec.name, spec.version.version).first
- result = Gem::Validator.new.unit_test(gem_spec)
- if result and not result.passed?
- unless ask_yes_no("...keep Gem?", true)
- require 'rubygems/uninstaller'
- Gem::Uninstaller.new(spec.name, :version => spec.version.version).uninstall
- end
- end
- end
- end
- end
-
- raise Gem::SystemExitException, exit_code
- end
-
-end
-
diff --git a/lib/rubygems/commands/list_command.rb b/lib/rubygems/commands/list_command.rb
deleted file mode 100644
index f3e5da9551..0000000000
--- a/lib/rubygems/commands/list_command.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-require 'rubygems/command'
-require 'rubygems/commands/query_command'
-
-##
-# An alternate to Gem::Commands::QueryCommand that searches for gems starting
-# with the the supplied argument.
-
-class Gem::Commands::ListCommand < Gem::Commands::QueryCommand
-
- def initialize
- super 'list', 'Display gems whose name starts with STRING'
-
- remove_option('--name-matches')
- end
-
- def arguments # :nodoc:
- "STRING start of gem name to look for"
- end
-
- def defaults_str # :nodoc:
- "--local --no-details"
- end
-
- def usage # :nodoc:
- "#{program_name} [STRING]"
- end
-
- def execute
- string = get_one_optional_argument || ''
- options[:name] = /^#{string}/i
- super
- end
-
-end
-
diff --git a/lib/rubygems/commands/lock_command.rb b/lib/rubygems/commands/lock_command.rb
deleted file mode 100644
index 5a43978dd9..0000000000
--- a/lib/rubygems/commands/lock_command.rb
+++ /dev/null
@@ -1,110 +0,0 @@
-require 'rubygems/command'
-
-class Gem::Commands::LockCommand < Gem::Command
-
- def initialize
- super 'lock', 'Generate a lockdown list of gems',
- :strict => false
-
- add_option '-s', '--[no-]strict',
- 'fail if unable to satisfy a dependency' do |strict, options|
- options[:strict] = strict
- end
- end
-
- def arguments # :nodoc:
- "GEMNAME name of gem to lock\nVERSION version of gem to lock"
- end
-
- def defaults_str # :nodoc:
- "--no-strict"
- end
-
- def description # :nodoc:
- <<-EOF
-The lock command will generate a list of +gem+ statements that will lock down
-the versions for the gem given in the command line. It will specify exact
-versions in the requirements list to ensure that the gems loaded will always
-be consistent. A full recursive search of all effected gems will be
-generated.
-
-Example:
-
- gemlock rails-1.0.0 > lockdown.rb
-
-will produce in lockdown.rb:
-
- require "rubygems"
- gem 'rails', '= 1.0.0'
- gem 'rake', '= 0.7.0.1'
- gem 'activesupport', '= 1.2.5'
- gem 'activerecord', '= 1.13.2'
- gem 'actionpack', '= 1.11.2'
- gem 'actionmailer', '= 1.1.5'
- gem 'actionwebservice', '= 1.0.0'
-
-Just load lockdown.rb from your application to ensure that the current
-versions are loaded. Make sure that lockdown.rb is loaded *before* any
-other require statements.
-
-Notice that rails 1.0.0 only requires that rake 0.6.2 or better be used.
-Rake-0.7.0.1 is the most recent version installed that satisfies that, so we
-lock it down to the exact version.
- EOF
- end
-
- def usage # :nodoc:
- "#{program_name} GEMNAME-VERSION [GEMNAME-VERSION ...]"
- end
-
- def complain(message)
- if options[:strict] then
- raise Gem::Exception, message
- else
- say "# #{message}"
- end
- end
-
- def execute
- say "require 'rubygems'"
-
- locked = {}
-
- pending = options[:args]
-
- until pending.empty? do
- full_name = pending.shift
-
- spec = Gem::SourceIndex.load_specification spec_path(full_name)
-
- if spec.nil? then
- complain "Could not find gem #{full_name}, try using the full name"
- next
- end
-
- say "gem '#{spec.name}', '= #{spec.version}'" unless locked[spec.name]
- locked[spec.name] = true
-
- spec.runtime_dependencies.each do |dep|
- next if locked[dep.name]
- candidates = Gem.source_index.search dep
-
- if candidates.empty? then
- complain "Unable to satisfy '#{dep}' from currently installed gems"
- else
- pending << candidates.last.full_name
- end
- end
- end
- end
-
- def spec_path(gem_full_name)
- gemspecs = Gem.path.map do |path|
- File.join path, "specifications", "#{gem_full_name}.gemspec"
- end
-
- gemspecs.find { |gemspec| File.exist? gemspec }
- end
-
-end
-
diff --git a/lib/rubygems/commands/mirror_command.rb b/lib/rubygems/commands/mirror_command.rb
deleted file mode 100644
index 959b8eaec3..0000000000
--- a/lib/rubygems/commands/mirror_command.rb
+++ /dev/null
@@ -1,111 +0,0 @@
-require 'yaml'
-require 'zlib'
-
-require 'rubygems/command'
-require 'open-uri'
-
-class Gem::Commands::MirrorCommand < Gem::Command
-
- def initialize
- super 'mirror', 'Mirror a gem repository'
- end
-
- def description # :nodoc:
- <<-EOF
-The mirror command uses the ~/.gemmirrorrc config file to mirror remote gem
-repositories to a local path. The config file is a YAML document that looks
-like this:
-
- ---
- - from: http://gems.example.com # source repository URI
- to: /path/to/mirror # destination directory
-
-Multiple sources and destinations may be specified.
- EOF
- end
-
- def execute
- config_file = File.join Gem.user_home, '.gemmirrorrc'
-
- raise "Config file #{config_file} not found" unless File.exist? config_file
-
- mirrors = YAML.load_file config_file
-
- raise "Invalid config file #{config_file}" unless mirrors.respond_to? :each
-
- mirrors.each do |mir|
- raise "mirror missing 'from' field" unless mir.has_key? 'from'
- raise "mirror missing 'to' field" unless mir.has_key? 'to'
-
- get_from = mir['from']
- save_to = File.expand_path mir['to']
-
- raise "Directory not found: #{save_to}" unless File.exist? save_to
- raise "Not a directory: #{save_to}" unless File.directory? save_to
-
- gems_dir = File.join save_to, "gems"
-
- if File.exist? gems_dir then
- raise "Not a directory: #{gems_dir}" unless File.directory? gems_dir
- else
- Dir.mkdir gems_dir
- end
-
- sourceindex_data = ''
-
- say "fetching: #{get_from}/Marshal.#{Gem.marshal_version}.Z"
-
- get_from = URI.parse get_from
-
- if get_from.scheme.nil? then
- get_from = get_from.to_s
- elsif get_from.scheme == 'file' then
- # check if specified URI contains a drive letter (file:/D:/Temp)
- get_from = get_from.to_s
- get_from = if get_from =~ /^file:.*[a-z]:/i then
- get_from[6..-1]
- else
- get_from[5..-1]
- end
- end
-
- open File.join(get_from.to_s, "Marshal.#{Gem.marshal_version}.Z"), "rb" do |y|
- sourceindex_data = Zlib::Inflate.inflate y.read
- open File.join(save_to, "Marshal.#{Gem.marshal_version}"), "wb" do |out|
- out.write sourceindex_data
- end
- end
-
- sourceindex = Marshal.load(sourceindex_data)
-
- progress = ui.progress_reporter sourceindex.size,
- "Fetching #{sourceindex.size} gems"
- sourceindex.each do |fullname, gem|
- gem_file = "#{fullname}.gem"
- gem_dest = File.join gems_dir, gem_file
-
- unless File.exist? gem_dest then
- begin
- open "#{get_from}/gems/#{gem_file}", "rb" do |g|
- contents = g.read
- open gem_dest, "wb" do |out|
- out.write contents
- end
- end
- rescue
- old_gf = gem_file
- gem_file = gem_file.downcase
- retry if old_gf != gem_file
- alert_error $!
- end
- end
-
- progress.updated gem_file
- end
-
- progress.done
- end
- end
-
-end
-
diff --git a/lib/rubygems/commands/outdated_command.rb b/lib/rubygems/commands/outdated_command.rb
deleted file mode 100644
index 9e054f988c..0000000000
--- a/lib/rubygems/commands/outdated_command.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-require 'rubygems/command'
-require 'rubygems/local_remote_options'
-require 'rubygems/spec_fetcher'
-require 'rubygems/version_option'
-
-class Gem::Commands::OutdatedCommand < Gem::Command
-
- include Gem::LocalRemoteOptions
- include Gem::VersionOption
-
- def initialize
- super 'outdated', 'Display all gems that need updates'
-
- add_local_remote_options
- add_platform_option
- end
-
- def execute
- locals = Gem::SourceIndex.from_installed_gems
-
- locals.outdated.sort.each do |name|
- local = locals.find_name(name).last
-
- dep = Gem::Dependency.new local.name, ">= #{local.version}"
- remotes = Gem::SpecFetcher.fetcher.fetch dep
- remote = remotes.last.first
-
- say "#{local.name} (#{local.version} < #{remote.version})"
- end
- end
-
-end
-
diff --git a/lib/rubygems/commands/pristine_command.rb b/lib/rubygems/commands/pristine_command.rb
deleted file mode 100644
index d47fe54edd..0000000000
--- a/lib/rubygems/commands/pristine_command.rb
+++ /dev/null
@@ -1,93 +0,0 @@
-require 'fileutils'
-require 'rubygems/command'
-require 'rubygems/format'
-require 'rubygems/installer'
-require 'rubygems/version_option'
-
-class Gem::Commands::PristineCommand < Gem::Command
-
- include Gem::VersionOption
-
- def initialize
- super 'pristine',
- 'Restores installed gems to pristine condition from files located in the gem cache',
- :version => Gem::Requirement.default
-
- add_option('--all',
- 'Restore all installed gems to pristine',
- 'condition') do |value, options|
- options[:all] = value
- end
-
- add_version_option('restore to', 'pristine condition')
- end
-
- def arguments # :nodoc:
- "GEMNAME gem to restore to pristine condition (unless --all)"
- end
-
- def defaults_str # :nodoc:
- "--all"
- end
-
- def description # :nodoc:
- <<-EOF
-The pristine command compares the installed gems with the contents of the
-cached gem and restores any files that don't match the cached gem's copy.
-
-If you have made modifications to your installed gems, the pristine command
-will revert them. After all the gem's files have been checked all bin stubs
-for the gem are regenerated.
-
-If the cached gem cannot be found, you will need to use `gem install` to
-revert the gem.
- EOF
- end
-
- def usage # :nodoc:
- "#{program_name} [args]"
- end
-
- def execute
- gem_name = nil
-
- specs = if options[:all] then
- Gem::SourceIndex.from_installed_gems.map do |name, spec|
- spec
- end
- else
- gem_name = get_one_gem_name
- Gem::SourceIndex.from_installed_gems.find_name(gem_name,
- options[:version])
- end
-
- if specs.empty? then
- raise Gem::Exception,
- "Failed to find gem #{gem_name} #{options[:version]}"
- end
-
- install_dir = Gem.dir # TODO use installer option
-
- raise Gem::FilePermissionError.new(install_dir) unless
- File.writable?(install_dir)
-
- say "Restoring gem(s) to pristine condition..."
-
- specs.each do |spec|
- gem = Dir[File.join(Gem.dir, 'cache', "#{spec.full_name}.gem")].first
-
- if gem.nil? then
- alert_error "Cached gem for #{spec.full_name} not found, use `gem install` to restore"
- next
- end
-
- # TODO use installer options
- installer = Gem::Installer.new gem, :wrappers => true, :force => true
- installer.install
-
- say "Restored #{spec.full_name}"
- end
- end
-
-end
-
diff --git a/lib/rubygems/commands/query_command.rb b/lib/rubygems/commands/query_command.rb
deleted file mode 100644
index 88f7f0b54e..0000000000
--- a/lib/rubygems/commands/query_command.rb
+++ /dev/null
@@ -1,264 +0,0 @@
-require 'rubygems/command'
-require 'rubygems/local_remote_options'
-require 'rubygems/spec_fetcher'
-require 'rubygems/version_option'
-require 'rubygems/text'
-
-class Gem::Commands::QueryCommand < Gem::Command
-
- include Gem::Text
- include Gem::LocalRemoteOptions
- include Gem::VersionOption
-
- def initialize(name = 'query',
- summary = 'Query gem information in local or remote repositories')
- super name, summary,
- :name => //, :domain => :local, :details => false, :versions => true,
- :installed => false, :version => Gem::Requirement.default
-
- add_option('-i', '--[no-]installed',
- 'Check for installed gem') do |value, options|
- options[:installed] = value
- end
-
- add_version_option
-
- add_option('-n', '--name-matches REGEXP',
- 'Name of gem(s) to query on matches the',
- 'provided REGEXP') do |value, options|
- options[:name] = /#{value}/i
- end
-
- add_option('-d', '--[no-]details',
- 'Display detailed information of gem(s)') do |value, options|
- options[:details] = value
- end
-
- add_option( '--[no-]versions',
- 'Display only gem names') do |value, options|
- options[:versions] = value
- options[:details] = false unless value
- end
-
- add_option('-a', '--all',
- 'Display all gem versions') do |value, options|
- options[:all] = value
- end
-
- add_option( '--prerelease',
- 'Display prerelease versions') do |value, options|
- options[:prerelease] = value
- end
-
- add_local_remote_options
- end
-
- def defaults_str # :nodoc:
- "--local --name-matches // --no-details --versions --no-installed"
- end
-
- def execute
- exit_code = 0
-
- name = options[:name]
- prerelease = options[:prerelease]
-
- if options[:installed] then
- if name.source.empty? then
- alert_error "You must specify a gem name"
- exit_code |= 4
- elsif installed? name, options[:version] then
- say "true"
- else
- say "false"
- exit_code |= 1
- end
-
- raise Gem::SystemExitException, exit_code
- end
-
- dep = Gem::Dependency.new name, Gem::Requirement.default
-
- if local? then
- if prerelease and not both? then
- alert_warning "prereleases are always shown locally"
- end
-
- if ui.outs.tty? or both? then
- say
- say "*** LOCAL GEMS ***"
- say
- end
-
- specs = Gem.source_index.search dep
-
- spec_tuples = specs.map do |spec|
- [[spec.name, spec.version, spec.original_platform, spec], :local]
- end
-
- output_query_results spec_tuples
- end
-
- if remote? then
- if ui.outs.tty? or both? then
- say
- say "*** REMOTE GEMS ***"
- say
- end
-
- all = options[:all]
-
- begin
- fetcher = Gem::SpecFetcher.fetcher
- spec_tuples = fetcher.find_matching dep, all, false, prerelease
- rescue Gem::RemoteFetcher::FetchError => e
- if prerelease then
- raise Gem::OperationNotSupportedError,
- "Prereleases not supported on legacy repositories"
- end
-
- raise unless fetcher.warn_legacy e do
- require 'rubygems/source_info_cache'
-
- dep.name = '' if dep.name == //
-
- specs = Gem::SourceInfoCache.search_with_source dep, false, all
-
- spec_tuples = specs.map do |spec, source_uri|
- [[spec.name, spec.version, spec.original_platform, spec],
- source_uri]
- end
- end
- end
-
- output_query_results spec_tuples
- end
- end
-
- private
-
- ##
- # Check if gem +name+ version +version+ is installed.
-
- def installed?(name, version = Gem::Requirement.default)
- dep = Gem::Dependency.new name, version
- !Gem.source_index.search(dep).empty?
- end
-
- def output_query_results(spec_tuples)
- output = []
- versions = Hash.new { |h,name| h[name] = [] }
-
- spec_tuples.each do |spec_tuple, source_uri|
- versions[spec_tuple.first] << [spec_tuple, source_uri]
- end
-
- versions = versions.sort_by do |(name,_),_|
- name.downcase
- end
-
- versions.each do |gem_name, matching_tuples|
- matching_tuples = matching_tuples.sort_by do |(name, version,_),_|
- version
- end.reverse
-
- platforms = Hash.new { |h,version| h[version] = [] }
-
- matching_tuples.map do |(name, version, platform,_),_|
- platforms[version] << platform if platform
- end
-
- seen = {}
-
- matching_tuples.delete_if do |(name, version,_),_|
- if seen[version] then
- true
- else
- seen[version] = true
- false
- end
- end
-
- entry = gem_name.dup
-
- if options[:versions] then
- versions = matching_tuples.map { |(name, version,_),_| version }.uniq
- entry << " (#{versions.join ', '})"
- end
-
- if options[:details] then
- detail_tuple = matching_tuples.first
-
- spec = if detail_tuple.first.length == 4 then
- detail_tuple.first.last
- else
- uri = URI.parse detail_tuple.last
- Gem::SpecFetcher.fetcher.fetch_spec detail_tuple.first, uri
- end
-
- entry << "\n"
-
- non_ruby = platforms.any? do |_, pls|
- pls.any? { |pl| pl != Gem::Platform::RUBY }
- end
-
- if non_ruby then
- if platforms.length == 1 then
- title = platforms.values.length == 1 ? 'Platform' : 'Platforms'
- entry << " #{title}: #{platforms.values.sort.join ', '}\n"
- else
- entry << " Platforms:\n"
- platforms.sort_by do |version,|
- version
- end.each do |version, pls|
- label = " #{version}: "
- data = format_text pls.sort.join(', '), 68, label.length
- data[0, label.length] = label
- entry << data << "\n"
- end
- end
- end
-
- authors = "Author#{spec.authors.length > 1 ? 's' : ''}: "
- authors << spec.authors.join(', ')
- entry << format_text(authors, 68, 4)
-
- if spec.rubyforge_project and not spec.rubyforge_project.empty? then
- rubyforge = "Rubyforge: http://rubyforge.org/projects/#{spec.rubyforge_project}"
- entry << "\n" << format_text(rubyforge, 68, 4)
- end
-
- if spec.homepage and not spec.homepage.empty? then
- entry << "\n" << format_text("Homepage: #{spec.homepage}", 68, 4)
- end
-
- if spec.license and not spec.license.empty? then
- licenses = "License#{spec.licenses.length > 1 ? 's' : ''}: "
- licenses << spec.licenses.join(', ')
- entry << "\n" << format_text(licenses, 68, 4)
- end
-
- if spec.loaded_from then
- if matching_tuples.length == 1 then
- loaded_from = File.dirname File.dirname(spec.loaded_from)
- entry << "\n" << " Installed at: #{loaded_from}"
- else
- label = 'Installed at'
- matching_tuples.each do |(_,version,_,s),|
- loaded_from = File.dirname File.dirname(s.loaded_from)
- entry << "\n" << " #{label} (#{version}): #{loaded_from}"
- label = ' ' * label.length
- end
- end
- end
-
- entry << "\n\n" << format_text(spec.summary, 68, 4)
- end
- output << entry
- end
-
- say output.join(options[:details] ? "\n\n" : "\n")
- end
-
-end
-
diff --git a/lib/rubygems/commands/rdoc_command.rb b/lib/rubygems/commands/rdoc_command.rb
deleted file mode 100644
index 92f215705a..0000000000
--- a/lib/rubygems/commands/rdoc_command.rb
+++ /dev/null
@@ -1,76 +0,0 @@
-require 'rubygems/command'
-require 'rubygems/version_option'
-require 'rubygems/doc_manager'
-
-class Gem::Commands::RdocCommand < Gem::Command
- include Gem::VersionOption
-
- def initialize
- super 'rdoc', 'Generates RDoc for pre-installed gems',
- :version => Gem::Requirement.default,
- :include_rdoc => true, :include_ri => true
-
- add_option('--all',
- 'Generate RDoc/RI documentation for all',
- 'installed gems') do |value, options|
- options[:all] = value
- end
-
- add_option('--[no-]rdoc',
- 'Include RDoc generated documents') do |value, options|
- options[:include_rdoc] = value
- end
-
- add_option('--[no-]ri',
- 'Include RI generated documents') do |value, options|
- options[:include_ri] = value
- end
-
- add_version_option
- end
-
- def arguments # :nodoc:
- "GEMNAME gem to generate documentation for (unless --all)"
- end
-
- def defaults_str # :nodoc:
- "--version '#{Gem::Requirement.default}' --rdoc --ri"
- end
-
- def usage # :nodoc:
- "#{program_name} [args]"
- end
-
- def execute
- if options[:all] then
- specs = Gem::SourceIndex.from_installed_gems.collect { |name, spec|
- spec
- }
- else
- gem_name = get_one_gem_name
- dep = Gem::Dependency.new gem_name, options[:version]
- specs = Gem::SourceIndex.from_installed_gems.search dep
- end
-
- if specs.empty?
- fail "Failed to find gem #{gem_name} to generate RDoc for #{options[:version]}"
- end
-
- if options[:include_ri]
- specs.each do |spec|
- Gem::DocManager.new(spec).generate_ri
- end
-
- Gem::DocManager.update_ri_cache
- end
-
- if options[:include_rdoc]
- specs.each do |spec|
- Gem::DocManager.new(spec).generate_rdoc
- end
- end
-
- true
- end
-end
-
diff --git a/lib/rubygems/commands/search_command.rb b/lib/rubygems/commands/search_command.rb
deleted file mode 100644
index 52e96fd1ef..0000000000
--- a/lib/rubygems/commands/search_command.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-require 'rubygems/command'
-require 'rubygems/commands/query_command'
-
-class Gem::Commands::SearchCommand < Gem::Commands::QueryCommand
-
- def initialize
- super 'search', 'Display all gems whose name contains STRING'
-
- remove_option '--name-matches'
- end
-
- def arguments # :nodoc:
- "STRING fragment of gem name to search for"
- end
-
- def defaults_str # :nodoc:
- "--local --no-details"
- end
-
- def usage # :nodoc:
- "#{program_name} [STRING]"
- end
-
- def execute
- string = get_one_optional_argument
- options[:name] = /#{string}/i
- super
- end
-
-end
-
diff --git a/lib/rubygems/commands/server_command.rb b/lib/rubygems/commands/server_command.rb
deleted file mode 100644
index f8b990d304..0000000000
--- a/lib/rubygems/commands/server_command.rb
+++ /dev/null
@@ -1,70 +0,0 @@
-require 'rubygems/command'
-require 'rubygems/server'
-
-class Gem::Commands::ServerCommand < Gem::Command
-
- def initialize
- super 'server', 'Documentation and gem repository HTTP server',
- :port => 8808, :gemdir => Gem.dir, :daemon => false
-
- OptionParser.accept :Port do |port|
- if port =~ /\A\d+\z/ then
- port = Integer port
- raise OptionParser::InvalidArgument, "#{port}: not a port number" if
- port > 65535
-
- port
- else
- begin
- Socket.getservbyname port
- rescue SocketError => e
- raise OptionParser::InvalidArgument, "#{port}: no such named service"
- end
- end
- end
-
- add_option '-p', '--port=PORT', :Port,
- 'port to listen on' do |port, options|
- options[:port] = port
- end
-
- add_option '-d', '--dir=GEMDIR',
- 'directory from which to serve gems' do |gemdir, options|
- options[:gemdir] = File.expand_path gemdir
- end
-
- add_option '--[no-]daemon', 'run as a daemon' do |daemon, options|
- options[:daemon] = daemon
- end
- end
-
- def defaults_str # :nodoc:
- "--port 8808 --dir #{Gem.dir} --no-daemon"
- end
-
- def description # :nodoc:
- <<-EOF
-The server command starts up a web server that hosts the RDoc for your
-installed gems and can operate as a server for installation of gems on other
-machines.
-
-The cache files for installed gems must exist to use the server as a source
-for gem installation.
-
-To install gems from a running server, use `gem install GEMNAME --source
-http://gem_server_host:8808`
-
-You can set up a shortcut to gem server documentation using the URL:
-
- http://localhost:8808/rdoc?q=%s - Firefox
- http://localhost:8808/rdoc?q=* - LaunchBar
-
- EOF
- end
-
- def execute
- Gem::Server.run options
- end
-
-end
-
diff --git a/lib/rubygems/commands/setup_command.rb b/lib/rubygems/commands/setup_command.rb
deleted file mode 100644
index 3220a7497c..0000000000
--- a/lib/rubygems/commands/setup_command.rb
+++ /dev/null
@@ -1,353 +0,0 @@
-require 'rubygems/command'
-require 'fileutils'
-require 'rbconfig'
-require 'tmpdir'
-require 'pathname'
-
-##
-# Installs RubyGems itself. This command is ordinarily only available from a
-# RubyGems checkout or tarball.
-
-class Gem::Commands::SetupCommand < Gem::Command
-
- def initialize
- super 'setup', 'Install RubyGems',
- :format_executable => true, :rdoc => true, :ri => true,
- :site_or_vendor => :sitelibdir,
- :destdir => '', :prefix => ''
-
- add_option '--prefix=PREFIX',
- 'Prefix path for installing RubyGems',
- 'Will not affect gem repository location' do |prefix, options|
- options[:prefix] = File.expand_path prefix
- end
-
- add_option '--destdir=DESTDIR',
- 'Root directory to install RubyGems into',
- 'Mainly used for packaging RubyGems' do |destdir, options|
- options[:destdir] = File.expand_path destdir
- end
-
- add_option '--[no-]vendor',
- 'Install into vendorlibdir not sitelibdir',
- '(Requires Ruby 1.8.7)' do |vendor, options|
- if vendor and Gem.ruby_version < Gem::Version.new('1.8.7') then
- raise OptionParser::InvalidOption,
- "requires ruby 1.8.7+ (you have #{Gem.ruby_version})"
- end
-
- options[:site_or_vendor] = vendor ? :vendorlibdir : :sitelibdir
- end
-
- add_option '--[no-]format-executable',
- 'Makes `gem` match ruby',
- 'If ruby is ruby18, gem will be gem18' do |value, options|
- options[:format_executable] = value
- end
-
- add_option '--[no-]rdoc',
- 'Generate RDoc documentation for RubyGems' do |value, options|
- options[:rdoc] = value
- end
-
- add_option '--[no-]ri',
- 'Generate RI documentation for RubyGems' do |value, options|
- options[:ri] = value
- end
- end
-
- def check_ruby_version
- required_version = Gem::Requirement.new '>= 1.8.6'
-
- unless required_version.satisfied_by? Gem.ruby_version then
- alert_error "Expected Ruby version #{required_version}, is #{Gem.ruby_version}"
- terminate_interaction 1
- end
- end
-
- def defaults_str # :nodoc:
- "--format-executable --rdoc --ri"
- end
-
- def description # :nodoc:
- <<-EOF
-Installs RubyGems itself.
-
-RubyGems installs RDoc for itself in GEM_HOME. By default this is:
- #{Gem.dir}
-
-If you prefer a different directory, set the GEM_HOME environment variable.
-
-RubyGems will install the gem command with a name matching ruby's
-prefix and suffix. If ruby was installed as `ruby18`, gem will be
-installed as `gem18`.
-
-By default, this RubyGems will install gem as:
- #{Gem.default_exec_format % 'gem'}
- EOF
- end
-
- def execute
- install_destdir = options[:destdir]
-
- unless install_destdir.empty? then
- ENV['GEM_HOME'] ||= File.join(install_destdir,
- Gem.default_dir.gsub(/^[a-zA-Z]:/, ''))
- end
-
- check_ruby_version
-
- if Gem.configuration.really_verbose then
- extend FileUtils::Verbose
- else
- extend FileUtils
- end
-
- lib_dir, bin_dir = make_destination_dirs install_destdir
-
- install_lib lib_dir
-
- install_executables bin_dir
-
- remove_old_bin_files bin_dir
-
- remove_source_caches install_destdir
-
- install_rdoc
-
- say
- say "-" * 78
- say
-
- release_notes = File.join Dir.pwd, 'doc', 'release_notes',
- "rel_#{Gem::RubyGemsVersion.gsub '.', '_'}.rdoc"
-
- if File.exist? release_notes then
- say File.read(release_notes)
- else
- say "Oh-no! Unable to find release notes!"
- say "Looked in: #{release_notes}" if Gem.configuration.really_verbose
- end
-
- say
- say "-" * 78
- say
-
- say "RubyGems installed the following executables:"
- say @bin_file_names.map { |name| "\t#{name}\n" }
- say
-
- unless @bin_file_names.grep(/#{File::SEPARATOR}gem$/) then
- say "If `gem` was installed by a previous RubyGems installation, you may need"
- say "to remove it by hand."
- say
- end
- end
-
- def install_executables(bin_dir)
- say "Installing gem executable"
-
- @bin_file_names = []
-
- Dir.chdir 'bin' do
- bin_files = Dir['*']
-
- bin_files.delete 'update_rubygems'
-
- bin_files.each do |bin_file|
- bin_file_formatted = if options[:format_executable] then
- Gem.default_exec_format % bin_file
- else
- bin_file
- end
-
- dest_file = File.join bin_dir, bin_file_formatted
- bin_tmp_file = File.join Dir.tmpdir, bin_file
-
- begin
- bin = File.readlines bin_file
- bin[0] = "#!#{Gem.ruby}\n"
-
- File.open bin_tmp_file, 'w' do |fp|
- fp.puts bin.join
- end
-
- install bin_tmp_file, dest_file, :mode => 0755
- @bin_file_names << dest_file
- ensure
- rm bin_tmp_file
- end
-
- next unless Gem.win_platform?
-
- begin
- bin_cmd_file = File.join Dir.tmpdir, "#{bin_file}.bat"
-
- File.open bin_cmd_file, 'w' do |file|
- file.puts <<-TEXT
-@ECHO OFF
-IF NOT "%~f0" == "~f0" GOTO :WinNT
-@"#{File.basename(Gem.ruby).chomp('"')}" "#{dest_file}" %1 %2 %3 %4 %5 %6 %7 %8 %9
-GOTO :EOF
-:WinNT
-@"#{File.basename(Gem.ruby).chomp('"')}" "%~dpn0" %*
-TEXT
- end
-
- install bin_cmd_file, "#{dest_file}.bat", :mode => 0755
- ensure
- rm bin_cmd_file
- end
- end
- end
- end
-
- def install_lib(lib_dir)
- say "Installing RubyGems"
-
- Dir.chdir 'lib' do
- lib_files = Dir[File.join('**', '*rb')]
-
- lib_files.each do |lib_file|
- dest_file = File.join lib_dir, lib_file
- dest_dir = File.dirname dest_file
- mkdir_p dest_dir unless File.directory? dest_dir
-
- install lib_file, dest_file, :mode => 0644
- end
- end
- end
-
- def install_rdoc
- gem_doc_dir = File.join Gem.dir, 'doc'
- rubygems_name = "rubygems-#{Gem::RubyGemsVersion}"
- rubygems_doc_dir = File.join gem_doc_dir, rubygems_name
-
- if File.writable? gem_doc_dir and
- (not File.exist? rubygems_doc_dir or
- File.writable? rubygems_doc_dir) then
- say "Removing old RubyGems RDoc and ri"
- Dir[File.join(Gem.dir, 'doc', 'rubygems-[0-9]*')].each do |dir|
- rm_rf dir
- end
-
- if options[:ri] then
- ri_dir = File.join rubygems_doc_dir, 'ri'
- say "Installing #{rubygems_name} ri into #{ri_dir}"
- run_rdoc '--ri', '--op', ri_dir
- end
-
- if options[:rdoc] then
- rdoc_dir = File.join rubygems_doc_dir, 'rdoc'
- say "Installing #{rubygems_name} rdoc into #{rdoc_dir}"
- run_rdoc '--op', rdoc_dir
- end
- else
- say "Skipping RDoc generation, #{gem_doc_dir} not writable"
- say "Set the GEM_HOME environment variable if you want RDoc generated"
- end
- end
-
- def make_destination_dirs(install_destdir)
- lib_dir = nil
- bin_dir = nil
-
- prefix = options[:prefix]
- site_or_vendor = options[:site_or_vendor]
-
- if prefix.empty? then
- lib_dir = Gem::ConfigMap[site_or_vendor]
- bin_dir = Gem::ConfigMap[:bindir]
- else
- # Apple installed RubyGems into libdir, and RubyGems <= 1.1.0 gets
- # confused about installation location, so switch back to
- # sitelibdir/vendorlibdir.
- if defined?(APPLE_GEM_HOME) and
- # just in case Apple and RubyGems don't get this patched up proper.
- (prefix == Gem::ConfigMap[:libdir] or
- # this one is important
- prefix == File.join(Gem::ConfigMap[:libdir], 'ruby')) then
- lib_dir = Gem::ConfigMap[site_or_vendor]
- bin_dir = Gem::ConfigMap[:bindir]
- else
- lib_dir = File.join prefix, 'lib'
- bin_dir = File.join prefix, 'bin'
- end
- end
-
- unless install_destdir.empty? then
- lib_dir = File.join install_destdir, lib_dir.gsub(/^[a-zA-Z]:/, '')
- bin_dir = File.join install_destdir, bin_dir.gsub(/^[a-zA-Z]:/, '')
- end
-
- mkdir_p lib_dir
- mkdir_p bin_dir
-
- return lib_dir, bin_dir
- end
-
- def remove_old_bin_files(bin_dir)
- old_bin_files = {
- 'gem_mirror' => 'gem mirror',
- 'gem_server' => 'gem server',
- 'gemlock' => 'gem lock',
- 'gemri' => 'ri',
- 'gemwhich' => 'gem which',
- 'index_gem_repository.rb' => 'gem generate_index',
- }
-
- old_bin_files.each do |old_bin_file, new_name|
- old_bin_path = File.join bin_dir, old_bin_file
- next unless File.exist? old_bin_path
-
- deprecation_message = "`#{old_bin_file}` has been deprecated. Use `#{new_name}` instead."
-
- File.open old_bin_path, 'w' do |fp|
- fp.write <<-EOF
-#!#{Gem.ruby}
-
-abort "#{deprecation_message}"
- EOF
- end
-
- next unless Gem.win_platform?
-
- File.open "#{old_bin_path}.bat", 'w' do |fp|
- fp.puts %{@ECHO.#{deprecation_message}}
- end
- end
- end
-
- def remove_source_caches(install_destdir)
- if install_destdir.empty?
- require 'rubygems/source_info_cache'
-
- user_cache_file = File.join(install_destdir,
- Gem::SourceInfoCache.user_cache_file)
- system_cache_file = File.join(install_destdir,
- Gem::SourceInfoCache.system_cache_file)
-
- say "Removing old source_cache files"
- rm_f user_cache_file if File.writable? File.dirname(user_cache_file)
- rm_f system_cache_file if File.writable? File.dirname(system_cache_file)
- end
- end
-
- def run_rdoc(*args)
- begin
- gem 'rdoc'
- rescue Gem::LoadError
- end
-
- require 'rdoc/rdoc'
-
- args << '--quiet'
- args << '--main' << 'README'
- args << '.' << 'README' << 'LICENSE.txt' << 'GPL.txt'
-
- r = RDoc::RDoc.new
- r.document args
- end
-
-end
-
diff --git a/lib/rubygems/commands/sources_command.rb b/lib/rubygems/commands/sources_command.rb
deleted file mode 100644
index 245ab91c9f..0000000000
--- a/lib/rubygems/commands/sources_command.rb
+++ /dev/null
@@ -1,157 +0,0 @@
-require 'fileutils'
-require 'rubygems/command'
-require 'rubygems/remote_fetcher'
-require 'rubygems/source_info_cache'
-require 'rubygems/spec_fetcher'
-require 'rubygems/local_remote_options'
-
-class Gem::Commands::SourcesCommand < Gem::Command
-
- include Gem::LocalRemoteOptions
-
- def initialize
- super 'sources',
- 'Manage the sources and cache file RubyGems uses to search for gems'
-
- add_option '-a', '--add SOURCE_URI', 'Add source' do |value, options|
- options[:add] = value
- end
-
- add_option '-l', '--list', 'List sources' do |value, options|
- options[:list] = value
- end
-
- add_option '-r', '--remove SOURCE_URI', 'Remove source' do |value, options|
- options[:remove] = value
- end
-
- add_option '-c', '--clear-all',
- 'Remove all sources (clear the cache)' do |value, options|
- options[:clear_all] = value
- end
-
- add_option '-u', '--update', 'Update source cache' do |value, options|
- options[:update] = value
- end
-
- add_proxy_option
- end
-
- def defaults_str
- '--list'
- end
-
- def execute
- options[:list] = !(options[:add] ||
- options[:clear_all] ||
- options[:remove] ||
- options[:update])
-
- if options[:clear_all] then
- path = Gem::SpecFetcher.fetcher.dir
- FileUtils.rm_rf path
-
- if not File.exist?(path) then
- say "*** Removed specs cache ***"
- elsif not File.writable?(path) then
- say "*** Unable to remove source cache (write protected) ***"
- else
- say "*** Unable to remove source cache ***"
- end
-
- sic = Gem::SourceInfoCache
- remove_cache_file 'user', sic.user_cache_file
- remove_cache_file 'latest user', sic.latest_user_cache_file
- remove_cache_file 'system', sic.system_cache_file
- remove_cache_file 'latest system', sic.latest_system_cache_file
- end
-
- if options[:add] then
- source_uri = options[:add]
- uri = URI.parse source_uri
-
- begin
- Gem::SpecFetcher.fetcher.load_specs uri, 'specs'
- Gem.sources << source_uri
- Gem.configuration.write
-
- say "#{source_uri} added to sources"
- rescue URI::Error, ArgumentError
- say "#{source_uri} is not a URI"
- rescue Gem::RemoteFetcher::FetchError => e
- yaml_uri = uri + 'yaml'
- gem_repo = Gem::RemoteFetcher.fetcher.fetch_size yaml_uri rescue false
-
- if e.uri =~ /specs\.#{Regexp.escape Gem.marshal_version}\.gz$/ and
- gem_repo then
-
- alert_warning <<-EOF
-RubyGems 1.2+ index not found for:
-\t#{source_uri}
-
-Will cause RubyGems to revert to legacy indexes, degrading performance.
- EOF
-
- say "#{source_uri} added to sources"
- else
- say "Error fetching #{source_uri}:\n\t#{e.message}"
- end
- end
- end
-
- if options[:remove] then
- source_uri = options[:remove]
-
- unless Gem.sources.include? source_uri then
- say "source #{source_uri} not present in cache"
- else
- Gem.sources.delete source_uri
- Gem.configuration.write
-
- say "#{source_uri} removed from sources"
- end
- end
-
- if options[:update] then
- fetcher = Gem::SpecFetcher.fetcher
-
- if fetcher.legacy_repos.empty? then
- Gem.sources.each do |update_uri|
- update_uri = URI.parse update_uri
- fetcher.load_specs update_uri, 'specs'
- fetcher.load_specs update_uri, 'latest_specs'
- end
- else
- Gem::SourceInfoCache.cache true
- Gem::SourceInfoCache.cache.flush
- end
-
- say "source cache successfully updated"
- end
-
- if options[:list] then
- say "*** CURRENT SOURCES ***"
- say
-
- Gem.sources.each do |source|
- say source
- end
- end
- end
-
- private
-
- def remove_cache_file(desc, path)
- FileUtils.rm_rf path
-
- if not File.exist?(path) then
- say "*** Removed #{desc} source cache ***"
- elsif not File.writable?(path) then
- say "*** Unable to remove #{desc} source cache (write protected) ***"
- else
- say "*** Unable to remove #{desc} source cache ***"
- end
- end
-
-end
-
diff --git a/lib/rubygems/commands/specification_command.rb b/lib/rubygems/commands/specification_command.rb
deleted file mode 100644
index 07d2c2cf0d..0000000000
--- a/lib/rubygems/commands/specification_command.rb
+++ /dev/null
@@ -1,124 +0,0 @@
-require 'yaml'
-require 'rubygems/command'
-require 'rubygems/local_remote_options'
-require 'rubygems/version_option'
-require 'rubygems/source_info_cache'
-require 'rubygems/format'
-
-class Gem::Commands::SpecificationCommand < Gem::Command
-
- include Gem::LocalRemoteOptions
- include Gem::VersionOption
-
- def initialize
- super 'specification', 'Display gem specification (in yaml)',
- :domain => :local, :version => Gem::Requirement.default,
- :format => :yaml
-
- add_version_option('examine')
- add_platform_option
-
- add_option('--all', 'Output specifications for all versions of',
- 'the gem') do |value, options|
- options[:all] = true
- end
-
- add_option('--ruby', 'Output ruby format') do |value, options|
- options[:format] = :ruby
- end
-
- add_option('--yaml', 'Output RUBY format') do |value, options|
- options[:format] = :yaml
- end
-
- add_option('--marshal', 'Output Marshal format') do |value, options|
- options[:format] = :marshal
- end
-
- add_local_remote_options
- end
-
- def arguments # :nodoc:
- <<-ARGS
-GEMFILE name of gem to show the gemspec for
-FIELD name of gemspec field to show
- ARGS
- end
-
- def defaults_str # :nodoc:
- "--local --version '#{Gem::Requirement.default}' --yaml"
- end
-
- def usage # :nodoc:
- "#{program_name} [GEMFILE] [FIELD]"
- end
-
- def execute
- specs = []
- gem = options[:args].shift
-
- unless gem then
- raise Gem::CommandLineError,
- "Please specify a gem name or file on the command line"
- end
-
- dep = Gem::Dependency.new gem, options[:version]
-
- field = get_one_optional_argument
-
- if field then
- field = field.intern
-
- if options[:format] == :ruby then
- raise Gem::CommandLineError, "--ruby and FIELD are mutually exclusive"
- end
-
- unless Gem::Specification.attribute_names.include? field then
- raise Gem::CommandLineError,
- "no field %p on Gem::Specification" % field.to_s
- end
- end
-
- if local? then
- if File.exist? gem then
- specs << Gem::Format.from_file_by_path(gem).spec rescue nil
- end
-
- if specs.empty? then
- specs.push(*Gem.source_index.search(dep))
- end
- end
-
- if remote? then
- found = Gem::SpecFetcher.fetcher.fetch dep
-
- specs.push(*found.map { |spec,| spec })
- end
-
- if specs.empty? then
- alert_error "Unknown gem '#{gem}'"
- terminate_interaction 1
- end
-
- output = lambda do |s|
- s = s.send field if field
-
- say case options[:format]
- when :ruby then s.to_ruby
- when :marshal then Marshal.dump s
- else s.to_yaml
- end
-
- say "\n"
- end
-
- if options[:all] then
- specs.each(&output)
- else
- spec = specs.sort_by { |s| s.version }.last
- output[spec]
- end
- end
-
-end
-
diff --git a/lib/rubygems/commands/stale_command.rb b/lib/rubygems/commands/stale_command.rb
deleted file mode 100644
index 78cbdcc00a..0000000000
--- a/lib/rubygems/commands/stale_command.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-require 'rubygems/command'
-
-class Gem::Commands::StaleCommand < Gem::Command
- def initialize
- super('stale', 'List gems along with access times')
- end
-
- def usage # :nodoc:
- "#{program_name}"
- end
-
- def execute
- gem_to_atime = {}
- Gem.source_index.each do |name, spec|
- Dir["#{spec.full_gem_path}/**/*.*"].each do |file|
- next if File.directory?(file)
- stat = File.stat(file)
- gem_to_atime[name] ||= stat.atime
- gem_to_atime[name] = stat.atime if gem_to_atime[name] < stat.atime
- end
- end
-
- gem_to_atime.sort_by { |_, atime| atime }.each do |name, atime|
- say "#{name} at #{atime.strftime '%c'}"
- end
- end
-end
diff --git a/lib/rubygems/commands/uninstall_command.rb b/lib/rubygems/commands/uninstall_command.rb
deleted file mode 100644
index db6aeed022..0000000000
--- a/lib/rubygems/commands/uninstall_command.rb
+++ /dev/null
@@ -1,83 +0,0 @@
-require 'rubygems/command'
-require 'rubygems/version_option'
-require 'rubygems/uninstaller'
-
-##
-# Gem uninstaller command line tool
-#
-# See `gem help uninstall`
-
-class Gem::Commands::UninstallCommand < Gem::Command
-
- include Gem::VersionOption
-
- def initialize
- super 'uninstall', 'Uninstall gems from the local repository',
- :version => Gem::Requirement.default, :user_install => true
-
- add_option('-a', '--[no-]all',
- 'Uninstall all matching versions'
- ) do |value, options|
- options[:all] = value
- end
-
- add_option('-I', '--[no-]ignore-dependencies',
- 'Ignore dependency requirements while',
- 'uninstalling') do |value, options|
- options[:ignore] = value
- end
-
- add_option('-x', '--[no-]executables',
- 'Uninstall applicable executables without',
- 'confirmation') do |value, options|
- options[:executables] = value
- end
-
- add_option('-i', '--install-dir DIR',
- 'Directory to uninstall gem from') do |value, options|
- options[:install_dir] = File.expand_path(value)
- end
-
- add_option('-n', '--bindir DIR',
- 'Directory to remove binaries from') do |value, options|
- options[:bin_dir] = File.expand_path(value)
- end
-
- add_option('--[no-]user-install',
- 'Uninstall from user\'s home directory',
- 'in addition to GEM_HOME.') do |value, options|
- options[:user_install] = value
- end
-
- add_version_option
- add_platform_option
- end
-
- def arguments # :nodoc:
- "GEMNAME name of gem to uninstall"
- end
-
- def defaults_str # :nodoc:
- "--version '#{Gem::Requirement.default}' --no-force " \
- "--install-dir #{Gem.dir}\n" \
- "--user-install"
- end
-
- def usage # :nodoc:
- "#{program_name} GEMNAME [GEMNAME ...]"
- end
-
- def execute
- get_all_gem_names.each do |gem_name|
- begin
- Gem::Uninstaller.new(gem_name, options).uninstall
- rescue Gem::GemNotInHomeException => e
- spec = e.spec
- alert("In order to remove #{spec.name}, please execute:\n" \
- "\tgem uninstall #{spec.name} --install-dir=#{spec.installation_path}")
- end
- end
- end
-
-end
-
diff --git a/lib/rubygems/commands/unpack_command.rb b/lib/rubygems/commands/unpack_command.rb
deleted file mode 100644
index 075dc04203..0000000000
--- a/lib/rubygems/commands/unpack_command.rb
+++ /dev/null
@@ -1,97 +0,0 @@
-require 'fileutils'
-require 'rubygems/command'
-require 'rubygems/installer'
-require 'rubygems/version_option'
-
-class Gem::Commands::UnpackCommand < Gem::Command
-
- include Gem::VersionOption
-
- def initialize
- super 'unpack', 'Unpack an installed gem to the current directory',
- :version => Gem::Requirement.default,
- :target => Dir.pwd
-
- add_option('--target=DIR', 'target directory for unpacking') do |value, options|
- options[:target] = value
- end
-
- add_version_option
- end
-
- def arguments # :nodoc:
- "GEMNAME name of gem to unpack"
- end
-
- def defaults_str # :nodoc:
- "--version '#{Gem::Requirement.default}'"
- end
-
- def usage # :nodoc:
- "#{program_name} GEMNAME"
- end
-
- #--
- # TODO: allow, e.g., 'gem unpack rake-0.3.1'. Find a general solution for
- # this, so that it works for uninstall as well. (And check other commands
- # at the same time.)
-
- def execute
- get_all_gem_names.each do |name|
- path = get_path name, options[:version]
-
- if path then
- basename = File.basename(path).sub(/\.gem$/, '')
- target_dir = File.expand_path File.join(options[:target], basename)
- FileUtils.mkdir_p target_dir
- Gem::Installer.new(path, :unpack => true).unpack target_dir
- say "Unpacked gem: '#{target_dir}'"
- else
- alert_error "Gem '#{name}' not installed."
- end
- end
- end
-
- # Return the full path to the cached gem file matching the given
- # name and version requirement. Returns 'nil' if no match.
- #
- # Example:
- #
- # get_path('rake', '> 0.4') # -> '/usr/lib/ruby/gems/1.8/cache/rake-0.4.2.gem'
- # get_path('rake', '< 0.1') # -> nil
- # get_path('rak') # -> nil (exact name required)
- #--
- # TODO: This should be refactored so that it's a general service. I don't
- # think any of our existing classes are the right place though. Just maybe
- # 'Cache'?
- #
- # TODO: It just uses Gem.dir for now. What's an easy way to get the list of
- # source directories?
- def get_path(gemname, version_req)
- return gemname if gemname =~ /\.gem$/i
-
- specs = Gem::source_index.find_name gemname, version_req
-
- selected = specs.sort_by { |s| s.version }.last
-
- return nil if selected.nil?
-
- # We expect to find (basename).gem in the 'cache' directory.
- # Furthermore, the name match must be exact (ignoring case).
- if gemname =~ /^#{selected.name}$/i
- filename = selected.full_name + '.gem'
- path = nil
-
- Gem.path.find do |gem_dir|
- path = File.join gem_dir, 'cache', filename
- File.exist? path
- end
-
- path
- else
- nil
- end
- end
-
-end
-
diff --git a/lib/rubygems/commands/update_command.rb b/lib/rubygems/commands/update_command.rb
deleted file mode 100644
index 9974b2b54b..0000000000
--- a/lib/rubygems/commands/update_command.rb
+++ /dev/null
@@ -1,202 +0,0 @@
-require 'rubygems/command'
-require 'rubygems/command_manager'
-require 'rubygems/install_update_options'
-require 'rubygems/local_remote_options'
-require 'rubygems/spec_fetcher'
-require 'rubygems/version_option'
-require 'rubygems/commands/install_command'
-
-class Gem::Commands::UpdateCommand < Gem::Command
-
- include Gem::InstallUpdateOptions
- include Gem::LocalRemoteOptions
- include Gem::VersionOption
-
- def initialize
- super 'update',
- 'Update the named gems (or all installed gems) in the local repository',
- :generate_rdoc => true,
- :generate_ri => true,
- :force => false,
- :test => false
-
- add_install_update_options
-
- add_option('--system',
- 'Update the RubyGems system software') do |value, options|
- options[:system] = value
- end
-
- add_local_remote_options
-
- add_platform_option
- end
-
- def arguments # :nodoc:
- "GEMNAME name of gem to update"
- end
-
- def defaults_str # :nodoc:
- "--rdoc --ri --no-force --no-test --install-dir #{Gem.dir}"
- end
-
- def usage # :nodoc:
- "#{program_name} GEMNAME [GEMNAME ...]"
- end
-
- def execute
- hig = {}
-
- if options[:system] then
- say "Updating RubyGems"
-
- unless options[:args].empty? then
- fail "No gem names are allowed with the --system option"
- end
-
- rubygems_update = Gem::Specification.new
- rubygems_update.name = 'rubygems-update'
- rubygems_update.version = Gem::Version.new Gem::RubyGemsVersion
- hig['rubygems-update'] = rubygems_update
-
- options[:user_install] = false
- else
- say "Updating installed gems"
-
- hig = {} # highest installed gems
-
- Gem.source_index.each do |name, spec|
- if hig[spec.name].nil? or hig[spec.name].version < spec.version then
- hig[spec.name] = spec
- end
- end
- end
-
- gems_to_update = which_to_update hig, options[:args]
-
- updated = []
-
- installer = Gem::DependencyInstaller.new options
-
- gems_to_update.uniq.sort.each do |name|
- next if updated.any? { |spec| spec.name == name }
- success = false
-
- say "Updating #{name}"
- begin
- installer.install name
- success = true
- rescue Gem::InstallError => e
- alert_error "Error installing #{name}:\n\t#{e.message}"
- success = false
- end
-
- installer.installed_gems.each do |spec|
- updated << spec
- say "Successfully installed #{spec.full_name}" if success
- end
- end
-
- if gems_to_update.include? "rubygems-update" then
- Gem.source_index.refresh!
-
- update_gems = Gem.source_index.find_name 'rubygems-update'
-
- latest_update_gem = update_gems.sort_by { |s| s.version }.last
-
- say "Updating RubyGems to #{latest_update_gem.version}"
- installed = do_rubygems_update latest_update_gem.version
-
- say "RubyGems system software updated" if installed
- else
- if updated.empty? then
- say "Nothing to update"
- else
- say "Gems updated: #{updated.map { |spec| spec.name }.join ', '}"
-
- if options[:generate_ri] then
- updated.each do |gem|
- Gem::DocManager.new(gem, options[:rdoc_args]).generate_ri
- end
-
- Gem::DocManager.update_ri_cache
- end
-
- if options[:generate_rdoc] then
- updated.each do |gem|
- Gem::DocManager.new(gem, options[:rdoc_args]).generate_rdoc
- end
- end
- end
- end
- end
-
- ##
- # Update the RubyGems software to +version+.
-
- def do_rubygems_update(version)
- args = []
- args.push '--prefix', Gem.prefix unless Gem.prefix.nil?
- args << '--no-rdoc' unless options[:generate_rdoc]
- args << '--no-ri' unless options[:generate_ri]
- args << '--no-format-executable' if options[:no_format_executable]
-
- update_dir = File.join Gem.dir, 'gems', "rubygems-update-#{version}"
-
- Dir.chdir update_dir do
- say "Installing RubyGems #{version}"
- setup_cmd = "#{Gem.ruby} setup.rb #{args.join ' '}"
-
- # Make sure old rubygems isn't loaded
- old = ENV["RUBYOPT"]
- ENV.delete("RUBYOPT")
- system setup_cmd
- ENV["RUBYOPT"] = old if old
- end
- end
-
- def which_to_update(highest_installed_gems, gem_names)
- result = []
-
- highest_installed_gems.each do |l_name, l_spec|
- next if not gem_names.empty? and
- gem_names.all? { |name| /#{name}/ !~ l_spec.name }
-
- dependency = Gem::Dependency.new l_spec.name, "> #{l_spec.version}"
-
- begin
- fetcher = Gem::SpecFetcher.fetcher
- spec_tuples = fetcher.find_matching dependency
- rescue Gem::RemoteFetcher::FetchError => e
- raise unless fetcher.warn_legacy e do
- require 'rubygems/source_info_cache'
-
- dependency.name = '' if dependency.name == //
-
- specs = Gem::SourceInfoCache.search_with_source dependency
-
- spec_tuples = specs.map do |spec, source_uri|
- [[spec.name, spec.version, spec.original_platform], source_uri]
- end
- end
- end
-
- matching_gems = spec_tuples.select do |(name, version, platform),|
- name == l_name and Gem::Platform.match platform
- end
-
- highest_remote_gem = matching_gems.sort_by do |(name, version),|
- version
- end.last
-
- if highest_remote_gem and
- l_spec.version < highest_remote_gem.first[1] then
- result << l_name
- end
- end
-
- result
- end
-
-end
-
diff --git a/lib/rubygems/commands/which_command.rb b/lib/rubygems/commands/which_command.rb
deleted file mode 100644
index 7c2d188324..0000000000
--- a/lib/rubygems/commands/which_command.rb
+++ /dev/null
@@ -1,87 +0,0 @@
-require 'rubygems/command'
-require 'rubygems/gem_path_searcher'
-
-class Gem::Commands::WhichCommand < Gem::Command
-
- EXT = %w[.rb .rbw .so .dll .bundle] # HACK
-
- def initialize
- super 'which', 'Find the location of a library file you can require',
- :search_gems_first => false, :show_all => false
-
- add_option '-a', '--[no-]all', 'show all matching files' do |show_all, options|
- options[:show_all] = show_all
- end
-
- add_option '-g', '--[no-]gems-first',
- 'search gems before non-gems' do |gems_first, options|
- options[:search_gems_first] = gems_first
- end
- end
-
- def arguments # :nodoc:
- "FILE name of file to find"
- end
-
- def defaults_str # :nodoc:
- "--no-gems-first --no-all"
- end
-
- def usage # :nodoc:
- "#{program_name} FILE [FILE ...]"
- end
-
- def execute
- searcher = Gem::GemPathSearcher.new
-
- options[:args].each do |arg|
- dirs = $LOAD_PATH
- spec = searcher.find arg
-
- if spec then
- if options[:search_gems_first] then
- dirs = gem_paths(spec) + $LOAD_PATH
- else
- dirs = $LOAD_PATH + gem_paths(spec)
- end
-
- say "(checking gem #{spec.full_name} for #{arg})" if
- Gem.configuration.verbose and $stdout.tty?
- end
-
- paths = find_paths arg, dirs
-
- if paths.empty? then
- say "Can't find ruby library file or shared library #{arg}"
- else
- say paths
- end
- end
- end
-
- def find_paths(package_name, dirs)
- result = []
-
- dirs.each do |dir|
- EXT.each do |ext|
- full_path = File.join dir, "#{package_name}#{ext}"
- if File.exist? full_path then
- result << full_path
- return result unless options[:show_all]
- end
- end
- end
-
- result
- end
-
- def gem_paths(spec)
- spec.require_paths.collect { |d| File.join spec.full_gem_path, d }
- end
-
- def usage # :nodoc:
- "#{program_name} FILE [...]"
- end
-
-end
-
diff --git a/lib/rubygems/config_file.rb b/lib/rubygems/config_file.rb
deleted file mode 100644
index 3562805c62..0000000000
--- a/lib/rubygems/config_file.rb
+++ /dev/null
@@ -1,266 +0,0 @@
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-require 'yaml'
-
-# Store the gem command options specified in the configuration file. The
-# config file object acts much like a hash.
-
-class Gem::ConfigFile
-
- DEFAULT_BACKTRACE = false
- DEFAULT_BENCHMARK = false
- DEFAULT_BULK_THRESHOLD = 1000
- DEFAULT_VERBOSITY = true
- DEFAULT_UPDATE_SOURCES = true
-
- ##
- # For Ruby packagers to set configuration defaults. Set in
- # rubygems/defaults/operating_system.rb
-
- OPERATING_SYSTEM_DEFAULTS = {}
-
- ##
- # For Ruby implementers to set configuration defaults. Set in
- # rubygems/defaults/#{RUBY_ENGINE}.rb
-
- PLATFORM_DEFAULTS = {}
-
- system_config_path =
- begin
- require 'Win32API'
-
- CSIDL_COMMON_APPDATA = 0x0023
- path = 0.chr * 260
- SHGetFolderPath = Win32API.new 'shell32', 'SHGetFolderPath', 'PLPLP', 'L',
- :stdcall
- SHGetFolderPath.call nil, CSIDL_COMMON_APPDATA, nil, 1, path
-
- path.strip
- rescue LoadError
- '/etc'
- end
-
- SYSTEM_WIDE_CONFIG_FILE = File.join system_config_path, 'gemrc'
-
- # List of arguments supplied to the config file object.
- attr_reader :args
-
- # Where to look for gems
- attr_accessor :path
-
- attr_accessor :home
-
- # True if we print backtraces on errors.
- attr_writer :backtrace
-
- # True if we are benchmarking this run.
- attr_accessor :benchmark
-
- # Bulk threshold value. If the number of missing gems are above
- # this threshold value, then a bulk download technique is used.
- attr_accessor :bulk_threshold
-
- # Verbose level of output:
- # * false -- No output
- # * true -- Normal output
- # * :loud -- Extra output
- attr_accessor :verbose
-
- # True if we want to update the SourceInfoCache every time, false otherwise
- attr_accessor :update_sources
-
- # Create the config file object. +args+ is the list of arguments
- # from the command line.
- #
- # The following command line options are handled early here rather
- # than later at the time most command options are processed.
- #
- # * --config-file and --config-file==NAME -- Obviously these need
- # to be handled by the ConfigFile object to ensure we get the
- # right config file.
- #
- # * --backtrace -- Backtrace needs to be turned on early so that
- # errors before normal option parsing can be properly handled.
- #
- # * --debug -- Enable Ruby level debug messages. Handled early
- # for the same reason as --backtrace.
- #
- def initialize(arg_list)
- @config_file_name = nil
- need_config_file_name = false
-
- arg_list = arg_list.map do |arg|
- if need_config_file_name then
- @config_file_name = arg
- need_config_file_name = false
- nil
- elsif arg =~ /^--config-file=(.*)/ then
- @config_file_name = $1
- nil
- elsif arg =~ /^--config-file$/ then
- need_config_file_name = true
- nil
- else
- arg
- end
- end.compact
-
- @backtrace = DEFAULT_BACKTRACE
- @benchmark = DEFAULT_BENCHMARK
- @bulk_threshold = DEFAULT_BULK_THRESHOLD
- @verbose = DEFAULT_VERBOSITY
- @update_sources = DEFAULT_UPDATE_SOURCES
-
- operating_system_config = Marshal.load Marshal.dump(OPERATING_SYSTEM_DEFAULTS)
- platform_config = Marshal.load Marshal.dump(PLATFORM_DEFAULTS)
- system_config = load_file SYSTEM_WIDE_CONFIG_FILE
- user_config = load_file config_file_name.dup.untaint
-
- @hash = operating_system_config.merge platform_config
- @hash = @hash.merge system_config
- @hash = @hash.merge user_config
-
- # HACK these override command-line args, which is bad
- @backtrace = @hash[:backtrace] if @hash.key? :backtrace
- @benchmark = @hash[:benchmark] if @hash.key? :benchmark
- @bulk_threshold = @hash[:bulk_threshold] if @hash.key? :bulk_threshold
- Gem.sources = @hash[:sources] if @hash.key? :sources
- @verbose = @hash[:verbose] if @hash.key? :verbose
- @update_sources = @hash[:update_sources] if @hash.key? :update_sources
- @path = @hash[:gempath] if @hash.key? :gempath
- @home = @hash[:gemhome] if @hash.key? :gemhome
-
- handle_arguments arg_list
- end
-
- def load_file(filename)
- begin
- YAML.load(File.read(filename)) if filename and File.exist?(filename)
- rescue ArgumentError
- warn "Failed to load #{config_file_name}"
- rescue Errno::EACCES
- warn "Failed to load #{config_file_name} due to permissions problem."
- end or {}
- end
-
- # True if the backtrace option has been specified, or debug is on.
- def backtrace
- @backtrace or $DEBUG
- end
-
- # The name of the configuration file.
- def config_file_name
- @config_file_name || Gem.config_file
- end
-
- # Delegates to @hash
- def each(&block)
- hash = @hash.dup
- hash.delete :update_sources
- hash.delete :verbose
- hash.delete :benchmark
- hash.delete :backtrace
- hash.delete :bulk_threshold
-
- yield :update_sources, @update_sources
- yield :verbose, @verbose
- yield :benchmark, @benchmark
- yield :backtrace, @backtrace
- yield :bulk_threshold, @bulk_threshold
-
- yield 'config_file_name', @config_file_name if @config_file_name
-
- hash.each(&block)
- end
-
- # Handle the command arguments.
- def handle_arguments(arg_list)
- @args = []
-
- arg_list.each do |arg|
- case arg
- when /^--(backtrace|traceback)$/ then
- @backtrace = true
- when /^--bench(mark)?$/ then
- @benchmark = true
- when /^--debug$/ then
- $DEBUG = true
- else
- @args << arg
- end
- end
- end
-
- # Really verbose mode gives you extra output.
- def really_verbose
- case verbose
- when true, false, nil then false
- else true
- end
- end
-
- # to_yaml only overwrites things you can't override on the command line.
- def to_yaml # :nodoc:
- yaml_hash = {}
- yaml_hash[:backtrace] = @hash.key?(:backtrace) ? @hash[:backtrace] :
- DEFAULT_BACKTRACE
- yaml_hash[:benchmark] = @hash.key?(:benchmark) ? @hash[:benchmark] :
- DEFAULT_BENCHMARK
- yaml_hash[:bulk_threshold] = @hash.key?(:bulk_threshold) ?
- @hash[:bulk_threshold] : DEFAULT_BULK_THRESHOLD
- yaml_hash[:sources] = Gem.sources
- yaml_hash[:update_sources] = @hash.key?(:update_sources) ?
- @hash[:update_sources] : DEFAULT_UPDATE_SOURCES
- yaml_hash[:verbose] = @hash.key?(:verbose) ? @hash[:verbose] :
- DEFAULT_VERBOSITY
-
- keys = yaml_hash.keys.map { |key| key.to_s }
- keys << 'debug'
- re = Regexp.union(*keys)
-
- @hash.each do |key, value|
- key = key.to_s
- next if key =~ re
- yaml_hash[key.to_s] = value
- end
-
- yaml_hash.to_yaml
- end
-
- # Writes out this config file, replacing its source.
- def write
- File.open config_file_name, 'w' do |fp|
- fp.write self.to_yaml
- end
- end
-
- # Return the configuration information for +key+.
- def [](key)
- @hash[key.to_s]
- end
-
- # Set configuration option +key+ to +value+.
- def []=(key, value)
- @hash[key.to_s] = value
- end
-
- def ==(other) # :nodoc:
- self.class === other and
- @backtrace == other.backtrace and
- @benchmark == other.benchmark and
- @bulk_threshold == other.bulk_threshold and
- @verbose == other.verbose and
- @update_sources == other.update_sources and
- @hash == other.hash
- end
-
- protected
-
- attr_reader :hash
-
-end
-
diff --git a/lib/rubygems/custom_require.rb b/lib/rubygems/custom_require.rb
deleted file mode 100644
index 78c7872b6f..0000000000
--- a/lib/rubygems/custom_require.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-require 'rubygems'
-
-module Kernel
-
- ##
- # The Kernel#require from before RubyGems was loaded.
-
- alias gem_original_require require
-
- ##
- # When RubyGems is required, Kernel#require is replaced with our own which
- # is capable of loading gems on demand.
- #
- # When you call <tt>require 'x'</tt>, this is what happens:
- # * If the file can be loaded from the existing Ruby loadpath, it
- # is.
- # * Otherwise, installed gems are searched for a file that matches.
- # If it's found in gem 'y', that gem is activated (added to the
- # loadpath).
- #
- # The normal <tt>require</tt> functionality of returning false if
- # that file has already been loaded is preserved.
-
- def require(path) # :doc:
- gem_original_require path
- rescue LoadError => load_error
- if load_error.message =~ /#{Regexp.escape path}\z/ and
- spec = Gem.searcher.find(path) then
- Gem.activate(spec.name, "= #{spec.version}")
- gem_original_require path
- else
- raise load_error
- end
- end
-
- private :require
- private :gem_original_require
-
-end
-
diff --git a/lib/rubygems/defaults.rb b/lib/rubygems/defaults.rb
deleted file mode 100644
index 24314d8bf1..0000000000
--- a/lib/rubygems/defaults.rb
+++ /dev/null
@@ -1,106 +0,0 @@
-module Gem
-
- @post_install_hooks ||= []
- @post_uninstall_hooks ||= []
- @pre_uninstall_hooks ||= []
- @pre_install_hooks ||= []
-
- ##
- # An Array of the default sources that come with RubyGems
-
- def self.default_sources
- %w[http://gems.rubyforge.org/]
- end
-
- ##
- # Default home directory path to be used if an alternate value is not
- # specified in the environment
-
- def self.default_dir
- if defined? RUBY_FRAMEWORK_VERSION then
- File.join File.dirname(ConfigMap[:sitedir]), 'Gems',
- ConfigMap[:ruby_version]
- elsif RUBY_VERSION >= '1.9.2' then
- File.join(ConfigMap[:rubylibprefix], 'gems',
- ConfigMap[:ruby_version])
- # only Ruby 1.9.1 has a peculiar feature
- elsif RUBY_VERSION > '1.9' and
- File.join(ConfigMap[:libdir], ConfigMap[:ruby_install_name], 'gems',
- ConfigMap[:ruby_version])
- else
- File.join(ConfigMap[:libdir], ruby_engine, 'gems',
- ConfigMap[:ruby_version])
- end
- end
-
- ##
- # Path for gems in the user's home directory
-
- def self.user_dir
- File.join(Gem.user_home, '.gem', ruby_engine,
- ConfigMap[:ruby_version])
- end
-
- ##
- # Default gem load path
-
- def self.default_path
- if File.exist?(Gem.user_home)
- [user_dir, default_dir]
- else
- [default_dir]
- end
- end
-
- ##
- # Deduce Ruby's --program-prefix and --program-suffix from its install name
-
- def self.default_exec_format
- exec_format = ConfigMap[:ruby_install_name].sub('ruby', '%s') rescue '%s'
-
- unless exec_format =~ /%s/ then
- raise Gem::Exception,
- "[BUG] invalid exec_format #{exec_format.inspect}, no %s"
- end
-
- exec_format
- end
-
- ##
- # The default directory for binaries
-
- def self.default_bindir
- if defined? RUBY_FRAMEWORK_VERSION then # mac framework support
- '/usr/bin'
- else # generic install
- ConfigMap[:bindir]
- end
- end
-
- ##
- # The default system-wide source info cache directory
-
- def self.default_system_source_cache_dir
- File.join Gem.dir, 'source_cache'
- end
-
- ##
- # The default user-specific source info cache directory
-
- def self.default_user_source_cache_dir
- File.join Gem.user_home, '.gem', 'source_cache'
- end
-
- ##
- # A wrapper around RUBY_ENGINE const that may not be defined
-
- def self.ruby_engine
- if defined? RUBY_ENGINE then
- RUBY_ENGINE
- else
- 'ruby'
- end
- end
-
-end
-
diff --git a/lib/rubygems/dependency.rb b/lib/rubygems/dependency.rb
deleted file mode 100644
index d142265c5d..0000000000
--- a/lib/rubygems/dependency.rb
+++ /dev/null
@@ -1,148 +0,0 @@
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-##
-# The Dependency class holds a Gem name and a Gem::Requirement
-
-class Gem::Dependency
-
- ##
- # Valid dependency types.
- #--
- # When this list is updated, be sure to change
- # Gem::Specification::CURRENT_SPECIFICATION_VERSION as well.
-
- TYPES = [
- :development,
- :runtime,
- ]
-
- ##
- # Dependency name or regular expression.
-
- attr_accessor :name
-
- ##
- # Dependency type.
-
- attr_reader :type
-
- ##
- # Dependent versions.
-
- attr_writer :version_requirements
-
- ##
- # Orders dependencies by name only.
-
- def <=>(other)
- [@name] <=> [other.name]
- end
-
- ##
- # Constructs a dependency with +name+ and +requirements+.
-
- def initialize(name, version_requirements, type=:runtime)
- @name = name
-
- unless TYPES.include? type
- raise ArgumentError, "Valid types are #{TYPES.inspect}, not #{@type.inspect}"
- end
-
- @type = type
-
- @version_requirements = Gem::Requirement.create version_requirements
- @version_requirement = nil # Avoid warnings.
- end
-
- def version_requirements
- normalize if defined? @version_requirement and @version_requirement
- @version_requirements
- end
-
- def requirement_list
- version_requirements.as_list
- end
-
- alias requirements_list requirement_list
-
- def normalize
- ver = @version_requirement.instance_variable_get :@version
- @version_requirements = Gem::Requirement.new([ver])
- @version_requirement = nil
- end
-
- def to_s # :nodoc:
- "#{name} (#{version_requirements}, #{@type || :runtime})"
- end
-
- def pretty_print(q) # :nodoc:
- q.group 1, 'Gem::Dependency.new(', ')' do
- q.pp @name
- q.text ','
- q.breakable
-
- q.pp @version_requirements
-
- q.text ','
- q.breakable
-
- q.pp @type
- end
- end
-
- def ==(other) # :nodoc:
- self.class === other &&
- self.name == other.name &&
- self.type == other.type &&
- self.version_requirements == other.version_requirements
- end
-
- ##
- # Uses this dependency as a pattern to compare to +other+. This dependency
- # will match if the name matches the other's name, and other has only an
- # equal version requirement that satisfies this dependency.
-
- def =~(other)
- other = if self.class === other then
- other
- else
- return false unless other.respond_to? :name and
- other.respond_to? :version
-
- Gem::Dependency.new other.name, other.version
- end
-
- pattern = @name
- pattern = /\A#{Regexp.escape @name}\Z/ unless Regexp === pattern
-
- return false unless pattern =~ other.name
-
- reqs = other.version_requirements.requirements
-
- return false unless reqs.length == 1
- return false unless reqs.first.first == '='
-
- version = reqs.first.last
-
- version_requirements.satisfied_by? version
- end
-
- ##
- # A dependency's hash is the sum of the hash of the #name, #type and
- # #version_requirements
-
- def hash
- name.hash + type.hash + version_requirements.hash
- end
-
- def inspect # :nodoc:
- "<%s type=%p name=%p requirements=%p>" % [self.class, @type, @name,
- version_requirements.to_s]
- end
-
-end
-
diff --git a/lib/rubygems/dependency_installer.rb b/lib/rubygems/dependency_installer.rb
deleted file mode 100644
index beea212818..0000000000
--- a/lib/rubygems/dependency_installer.rb
+++ /dev/null
@@ -1,261 +0,0 @@
-require 'rubygems'
-require 'rubygems/dependency_list'
-require 'rubygems/installer'
-require 'rubygems/spec_fetcher'
-require 'rubygems/user_interaction'
-
-##
-# Installs a gem along with all its dependencies from local and remote gems.
-
-class Gem::DependencyInstaller
-
- include Gem::UserInteraction
-
- attr_reader :gems_to_install
- attr_reader :installed_gems
-
- DEFAULT_OPTIONS = {
- :env_shebang => false,
- :domain => :both, # HACK dup
- :force => false,
- :format_executable => false, # HACK dup
- :ignore_dependencies => false,
- :prerelease => false,
- :security_policy => nil, # HACK NoSecurity requires OpenSSL. AlmostNo? Low?
- :wrappers => true,
- }
-
- ##
- # Creates a new installer instance.
- #
- # Options are:
- # :cache_dir:: Alternate repository path to store .gem files in.
- # :domain:: :local, :remote, or :both. :local only searches gems in the
- # current directory. :remote searches only gems in Gem::sources.
- # :both searches both.
- # :env_shebang:: See Gem::Installer::new.
- # :force:: See Gem::Installer#install.
- # :format_executable:: See Gem::Installer#initialize.
- # :ignore_dependencies:: Don't install any dependencies.
- # :install_dir:: See Gem::Installer#install.
- # :prerelease:: Allow prerelease versions
- # :security_policy:: See Gem::Installer::new and Gem::Security.
- # :user_install:: See Gem::Installer.new
- # :wrappers:: See Gem::Installer::new
-
- def initialize(options = {})
- if options[:install_dir] then
- spec_dir = options[:install_dir], 'specifications'
- @source_index = Gem::SourceIndex.from_gems_in spec_dir
- else
- @source_index = Gem.source_index
- end
-
- options = DEFAULT_OPTIONS.merge options
-
- @bin_dir = options[:bin_dir]
- @development = options[:development]
- @domain = options[:domain]
- @env_shebang = options[:env_shebang]
- @force = options[:force]
- @format_executable = options[:format_executable]
- @ignore_dependencies = options[:ignore_dependencies]
- @prerelease = options[:prerelease]
- @security_policy = options[:security_policy]
- @user_install = options[:user_install]
- @wrappers = options[:wrappers]
-
- @installed_gems = []
-
- @install_dir = options[:install_dir] || Gem.dir
- @cache_dir = options[:cache_dir] || @install_dir
- end
-
- ##
- # Returns a list of pairs of gemspecs and source_uris that match
- # Gem::Dependency +dep+ from both local (Dir.pwd) and remote (Gem.sources)
- # sources. Gems are sorted with newer gems prefered over older gems, and
- # local gems preferred over remote gems.
-
- def find_gems_with_sources(dep)
- gems_and_sources = []
-
- if @domain == :both or @domain == :local then
- Dir[File.join(Dir.pwd, "#{dep.name}-[0-9]*.gem")].each do |gem_file|
- spec = Gem::Format.from_file_by_path(gem_file).spec
- gems_and_sources << [spec, gem_file] if spec.name == dep.name
- end
- end
-
- if @domain == :both or @domain == :remote then
- begin
- requirements = dep.version_requirements.requirements.map do |req, ver|
- req
- end
-
- all = !@prerelease && (requirements.length > 1 ||
- (requirements.first != ">=" and requirements.first != ">"))
-
- found = Gem::SpecFetcher.fetcher.fetch dep, all, true, @prerelease
- gems_and_sources.push(*found)
-
- rescue Gem::RemoteFetcher::FetchError => e
- if Gem.configuration.really_verbose then
- say "Error fetching remote data:\t\t#{e.message}"
- say "Falling back to local-only install"
- end
- @domain = :local
- end
- end
-
- gems_and_sources.sort_by do |gem, source|
- [gem, source =~ /^http:\/\// ? 0 : 1] # local gems win
- end
- end
-
- ##
- # Gathers all dependencies necessary for the installation from local and
- # remote sources unless the ignore_dependencies was given.
-
- def gather_dependencies
- specs = @specs_and_sources.map { |spec,_| spec }
-
- dependency_list = Gem::DependencyList.new
- dependency_list.add(*specs)
-
- unless @ignore_dependencies then
- to_do = specs.dup
- seen = {}
-
- until to_do.empty? do
- spec = to_do.shift
- next if spec.nil? or seen[spec.name]
- seen[spec.name] = true
-
- deps = spec.runtime_dependencies
- deps |= spec.development_dependencies if @development
-
- deps.each do |dep|
- results = find_gems_with_sources(dep).reverse
-
- results.reject! do |dep_spec,|
- to_do.push dep_spec
-
- @source_index.any? do |_, installed_spec|
- dep.name == installed_spec.name and
- dep.version_requirements.satisfied_by? installed_spec.version
- end
- end
-
- results.each do |dep_spec, source_uri|
- next if seen[dep_spec.name]
- @specs_and_sources << [dep_spec, source_uri]
- dependency_list.add dep_spec
- end
- end
- end
- end
-
- @gems_to_install = dependency_list.dependency_order.reverse
- end
-
- ##
- # Finds a spec and the source_uri it came from for gem +gem_name+ and
- # +version+. Returns an Array of specs and sources required for
- # installation of the gem.
-
- def find_spec_by_name_and_version gem_name, version = Gem::Requirement.default
- spec_and_source = nil
-
- glob = if File::ALT_SEPARATOR then
- gem_name.gsub File::ALT_SEPARATOR, File::SEPARATOR
- else
- gem_name
- end
-
- local_gems = Dir["#{glob}*"].sort.reverse
-
- unless local_gems.empty? then
- local_gems.each do |gem_file|
- next unless gem_file =~ /gem$/
- begin
- spec = Gem::Format.from_file_by_path(gem_file).spec
- spec_and_source = [spec, gem_file]
- break
- rescue SystemCallError, Gem::Package::FormatError
- end
- end
- end
-
- if spec_and_source.nil? then
- dep = Gem::Dependency.new gem_name, version
- spec_and_sources = find_gems_with_sources(dep).reverse
-
- spec_and_source = spec_and_sources.find { |spec, source|
- Gem::Platform.match spec.platform
- }
- end
-
- if spec_and_source.nil? then
- raise Gem::GemNotFoundException,
- "could not find gem #{gem_name} locally or in a repository"
- end
-
- @specs_and_sources = [spec_and_source]
- end
-
- ##
- # Installs the gem and all its dependencies. Returns an Array of installed
- # gems specifications.
-
- def install dep_or_name, version = Gem::Requirement.default
- if String === dep_or_name then
- find_spec_by_name_and_version dep_or_name, version
- else
- @specs_and_sources = [find_gems_with_sources(dep_or_name).last]
- end
-
- @installed_gems = []
-
- gather_dependencies
-
- @gems_to_install.each do |spec|
- last = spec == @gems_to_install.last
- # HACK is this test for full_name acceptable?
- next if @source_index.any? { |n,_| n == spec.full_name } and not last
-
- # TODO: make this sorta_verbose so other users can benefit from it
- say "Installing gem #{spec.full_name}" if Gem.configuration.really_verbose
-
- _, source_uri = @specs_and_sources.assoc spec
- begin
- local_gem_path = Gem::RemoteFetcher.fetcher.download spec, source_uri,
- @cache_dir
- rescue Gem::RemoteFetcher::FetchError
- next if @force
- raise
- end
-
- inst = Gem::Installer.new local_gem_path,
- :bin_dir => @bin_dir,
- :development => @development,
- :env_shebang => @env_shebang,
- :force => @force,
- :format_executable => @format_executable,
- :ignore_dependencies => @ignore_dependencies,
- :install_dir => @install_dir,
- :security_policy => @security_policy,
- :source_index => @source_index,
- :user_install => @user_install,
- :wrappers => @wrappers
-
- spec = inst.install
-
- @installed_gems << spec
- end
-
- @installed_gems
- end
-
-end
-
diff --git a/lib/rubygems/dependency_list.rb b/lib/rubygems/dependency_list.rb
deleted file mode 100644
index a73a32d545..0000000000
--- a/lib/rubygems/dependency_list.rb
+++ /dev/null
@@ -1,185 +0,0 @@
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-require 'tsort'
-
-class Gem::DependencyList
-
- include Enumerable
- include TSort
-
- def self.from_source_index(src_index)
- deps = new
-
- src_index.each do |full_name, spec|
- deps.add spec
- end
-
- deps
- end
-
- def initialize
- @specs = []
- end
-
- ##
- # Adds +gemspecs+ to the dependency list.
-
- def add(*gemspecs)
- @specs.push(*gemspecs)
- end
-
- ##
- # Return a list of the specifications in the dependency list, sorted in
- # order so that no spec in the list depends on a gem earlier in the list.
- #
- # This is useful when removing gems from a set of installed gems. By
- # removing them in the returned order, you don't get into as many dependency
- # issues.
- #
- # If there are circular dependencies (yuck!), then gems will be returned in
- # order until only the circular dependents and anything they reference are
- # left. Then arbitrary gemspecs will be returned until the circular
- # dependency is broken, after which gems will be returned in dependency
- # order again.
-
- def dependency_order
- sorted = strongly_connected_components.flatten
-
- result = []
- seen = {}
-
- sorted.each do |spec|
- if index = seen[spec.name] then
- if result[index].version < spec.version then
- result[index] = spec
- end
- else
- seen[spec.name] = result.length
- result << spec
- end
- end
-
- result.reverse
- end
-
- ##
- # Iterator over dependency_order
-
- def each(&block)
- dependency_order.each(&block)
- end
-
- def find_name(full_name)
- @specs.find { |spec| spec.full_name == full_name }
- end
-
- ##
- # Are all the dependencies in the list satisfied?
-
- def ok?
- @specs.all? do |spec|
- spec.runtime_dependencies.all? do |dep|
- @specs.find { |s| s.satisfies_requirement? dep }
- end
- end
- end
-
- ##
- # Is is ok to remove a gem from the dependency list?
- #
- # If removing the gemspec creates breaks a currently ok dependency, then it
- # is NOT ok to remove the gem.
-
- def ok_to_remove?(full_name)
- gem_to_remove = find_name full_name
-
- siblings = @specs.find_all { |s|
- s.name == gem_to_remove.name &&
- s.full_name != gem_to_remove.full_name
- }
-
- deps = []
-
- @specs.each do |spec|
- spec.dependencies.each do |dep|
- deps << dep if gem_to_remove.satisfies_requirement?(dep)
- end
- end
-
- deps.all? { |dep|
- siblings.any? { |s|
- s.satisfies_requirement? dep
- }
- }
- end
-
- def remove_by_name(full_name)
- @specs.delete_if { |spec| spec.full_name == full_name }
- end
-
- ##
- # Return a hash of predecessors. <tt>result[spec]</tt> is an Array of
- # gemspecs that have a dependency satisfied by the named spec.
-
- def spec_predecessors
- result = Hash.new { |h,k| h[k] = [] }
-
- specs = @specs.sort.reverse
-
- specs.each do |spec|
- specs.each do |other|
- next if spec == other
-
- other.dependencies.each do |dep|
- if spec.satisfies_requirement? dep then
- result[spec] << other
- end
- end
- end
- end
-
- result
- end
-
- def tsort_each_node(&block)
- @specs.each(&block)
- end
-
- def tsort_each_child(node, &block)
- specs = @specs.sort.reverse
-
- node.dependencies.each do |dep|
- specs.each do |spec|
- if spec.satisfies_requirement? dep then
- begin
- yield spec
- rescue TSort::Cyclic
- end
- break
- end
- end
- end
- end
-
- private
-
- ##
- # Count the number of gemspecs in the list +specs+ that are not in
- # +ignored+.
-
- def active_count(specs, ignored)
- result = 0
-
- specs.each do |spec|
- result += 1 unless ignored[spec.full_name]
- end
-
- result
- end
-
-end
-
diff --git a/lib/rubygems/digest/md5.rb b/lib/rubygems/digest/md5.rb
deleted file mode 100644
index 2bc8f9c138..0000000000
--- a/lib/rubygems/digest/md5.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-require 'digest/md5'
-
-# :stopdoc:
-module Gem
- MD5 = Digest::MD5
-end
-# :startdoc:
diff --git a/lib/rubygems/digest/sha1.rb b/lib/rubygems/digest/sha1.rb
deleted file mode 100644
index 2d91c0f45a..0000000000
--- a/lib/rubygems/digest/sha1.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-require 'digest/sha1'
-
-module Gem
- SHA1 = Digest::SHA1
-end
diff --git a/lib/rubygems/digest/sha2.rb b/lib/rubygems/digest/sha2.rb
deleted file mode 100644
index 91cb236165..0000000000
--- a/lib/rubygems/digest/sha2.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-require 'digest/sha2'
-
-module Gem
- SHA256 = Digest::SHA256
-end
diff --git a/lib/rubygems/doc_manager.rb b/lib/rubygems/doc_manager.rb
deleted file mode 100644
index e1c8e03b91..0000000000
--- a/lib/rubygems/doc_manager.rb
+++ /dev/null
@@ -1,230 +0,0 @@
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-require 'fileutils'
-require 'rubygems'
-
-##
-# The documentation manager generates RDoc and RI for RubyGems.
-
-class Gem::DocManager
-
- include Gem::UserInteraction
-
- @configured_args = []
-
- def self.configured_args
- @configured_args ||= []
- end
-
- def self.configured_args=(args)
- case args
- when Array
- @configured_args = args
- when String
- @configured_args = args.split
- end
- end
-
- ##
- # Load RDoc from a gem if it is available, otherwise from Ruby's stdlib
-
- def self.load_rdoc
- begin
- gem 'rdoc'
- rescue Gem::LoadError
- # use built-in RDoc
- end
-
- begin
- require 'rdoc/rdoc'
-
- @rdoc_version = if defined? RDoc::VERSION then
- Gem::Version.new RDoc::VERSION
- else
- Gem::Version.new '1.0.1' # HACK parsing is hard
- end
-
- rescue LoadError => e
- raise Gem::DocumentError,
- "ERROR: RDoc documentation generator not installed: #{e}"
- end
- end
-
- def self.rdoc_version
- @rdoc_version
- end
-
- ##
- # Updates the RI cache for RDoc 2 if it is installed
-
- def self.update_ri_cache
- load_rdoc rescue return
-
- return unless defined? RDoc::VERSION # RDoc 1 does not have VERSION
-
- require 'rdoc/ri/driver'
-
- options = {
- :use_cache => true,
- :use_system => true,
- :use_site => true,
- :use_home => true,
- :use_gems => true,
- :formatter => RDoc::RI::Formatter,
- }
-
- driver = RDoc::RI::Driver.new(options).class_cache
- end
-
- ##
- # Create a document manager for +spec+. +rdoc_args+ contains arguments for
- # RDoc (template etc.) as a String.
-
- def initialize(spec, rdoc_args="")
- @spec = spec
- @doc_dir = File.join(spec.installation_path, "doc", spec.full_name)
- @rdoc_args = rdoc_args.nil? ? [] : rdoc_args.split
- end
-
- ##
- # Is the RDoc documentation installed?
-
- def rdoc_installed?
- File.exist?(File.join(@doc_dir, "rdoc"))
- end
-
- ##
- # Generate the RI documents for this gem spec.
- #
- # Note that if both RI and RDoc documents are generated from the same
- # process, the RI docs should be done first (a likely bug in RDoc will cause
- # RI docs generation to fail if run after RDoc).
-
- def generate_ri
- setup_rdoc
- install_ri # RDoc bug, ri goes first
-
- FileUtils.mkdir_p @doc_dir unless File.exist?(@doc_dir)
- end
-
- ##
- # Generate the RDoc documents for this gem spec.
- #
- # Note that if both RI and RDoc documents are generated from the same
- # process, the RI docs should be done first (a likely bug in RDoc will cause
- # RI docs generation to fail if run after RDoc).
-
- def generate_rdoc
- setup_rdoc
- install_rdoc
-
- FileUtils.mkdir_p @doc_dir unless File.exist?(@doc_dir)
- end
-
- ##
- # Generate and install RDoc into the documentation directory
-
- def install_rdoc
- rdoc_dir = File.join @doc_dir, 'rdoc'
-
- FileUtils.rm_rf rdoc_dir
-
- say "Installing RDoc documentation for #{@spec.full_name}..."
- run_rdoc '--op', rdoc_dir
- end
-
- ##
- # Generate and install RI into the documentation directory
-
- def install_ri
- ri_dir = File.join @doc_dir, 'ri'
-
- FileUtils.rm_rf ri_dir
-
- say "Installing ri documentation for #{@spec.full_name}..."
- run_rdoc '--ri', '--op', ri_dir
- end
-
- ##
- # Run RDoc with +args+, which is an ARGV style argument list
-
- def run_rdoc(*args)
- args << @spec.rdoc_options
- args << self.class.configured_args
- args << '--quiet'
- args << @spec.require_paths.clone
- args << @spec.extra_rdoc_files
- args << '--title' << "#{@spec.full_name} Documentation"
- args = args.flatten.map do |arg| arg.to_s end
-
- if self.class.rdoc_version >= Gem::Version.new('2.4.0') then
- args.delete '--inline-source'
- args.delete '--promiscuous'
- args.delete '-p'
- args.delete '--one-file'
- # HACK more
- end
-
- r = RDoc::RDoc.new
-
- old_pwd = Dir.pwd
- Dir.chdir(@spec.full_gem_path)
- begin
- r.document args
- rescue Errno::EACCES => e
- dirname = File.dirname e.message.split("-")[1].strip
- raise Gem::FilePermissionError.new(dirname)
- rescue RuntimeError => ex
- alert_error "While generating documentation for #{@spec.full_name}"
- ui.errs.puts "... MESSAGE: #{ex}"
- ui.errs.puts "... RDOC args: #{args.join(' ')}"
- ui.errs.puts "\t#{ex.backtrace.join "\n\t"}" if
- Gem.configuration.backtrace
- ui.errs.puts "(continuing with the rest of the installation)"
- ensure
- Dir.chdir(old_pwd)
- end
- end
-
- def setup_rdoc
- if File.exist?(@doc_dir) && !File.writable?(@doc_dir) then
- raise Gem::FilePermissionError.new(@doc_dir)
- end
-
- FileUtils.mkdir_p @doc_dir unless File.exist?(@doc_dir)
-
- self.class.load_rdoc
- end
-
- ##
- # Remove RDoc and RI documentation
-
- def uninstall_doc
- raise Gem::FilePermissionError.new(@spec.installation_path) unless
- File.writable? @spec.installation_path
-
- original_name = [
- @spec.name, @spec.version, @spec.original_platform].join '-'
-
- doc_dir = File.join @spec.installation_path, 'doc', @spec.full_name
- unless File.directory? doc_dir then
- doc_dir = File.join @spec.installation_path, 'doc', original_name
- end
-
- FileUtils.rm_rf doc_dir
-
- ri_dir = File.join @spec.installation_path, 'ri', @spec.full_name
-
- unless File.directory? ri_dir then
- ri_dir = File.join @spec.installation_path, 'ri', original_name
- end
-
- FileUtils.rm_rf ri_dir
- end
-
-end
-
diff --git a/lib/rubygems/exceptions.rb b/lib/rubygems/exceptions.rb
deleted file mode 100644
index d6c60c7a02..0000000000
--- a/lib/rubygems/exceptions.rb
+++ /dev/null
@@ -1,82 +0,0 @@
-##
-# Base exception class for RubyGems. All exception raised by RubyGems are a
-# subclass of this one.
-class Gem::Exception < RuntimeError; end
-
-class Gem::CommandLineError < Gem::Exception; end
-
-class Gem::DependencyError < Gem::Exception; end
-
-class Gem::DependencyRemovalException < Gem::Exception; end
-
-##
-# Raised when attempting to uninstall a gem that isn't in GEM_HOME.
-
-class Gem::GemNotInHomeException < Gem::Exception
- attr_accessor :spec
-end
-
-class Gem::DocumentError < Gem::Exception; end
-
-##
-# Potentially raised when a specification is validated.
-class Gem::EndOfYAMLException < Gem::Exception; end
-
-##
-# Signals that a file permission error is preventing the user from
-# installing in the requested directories.
-class Gem::FilePermissionError < Gem::Exception
- def initialize(path)
- super("You don't have write permissions into the #{path} directory.")
- end
-end
-
-##
-# Used to raise parsing and loading errors
-class Gem::FormatException < Gem::Exception
- attr_accessor :file_path
-end
-
-class Gem::GemNotFoundException < Gem::Exception; end
-
-class Gem::InstallError < Gem::Exception; end
-
-##
-# Potentially raised when a specification is validated.
-class Gem::InvalidSpecificationException < Gem::Exception; end
-
-class Gem::OperationNotSupportedError < Gem::Exception; end
-
-##
-# Signals that a remote operation cannot be conducted, probably due to not
-# being connected (or just not finding host).
-#--
-# TODO: create a method that tests connection to the preferred gems server.
-# All code dealing with remote operations will want this. Failure in that
-# method should raise this error.
-class Gem::RemoteError < Gem::Exception; end
-
-class Gem::RemoteInstallationCancelled < Gem::Exception; end
-
-class Gem::RemoteInstallationSkipped < Gem::Exception; end
-
-##
-# Represents an error communicating via HTTP.
-class Gem::RemoteSourceException < Gem::Exception; end
-
-class Gem::VerificationError < Gem::Exception; end
-
-##
-# Raised to indicate that a system exit should occur with the specified
-# exit_code
-
-class Gem::SystemExitException < SystemExit
- attr_accessor :exit_code
-
- def initialize(exit_code)
- @exit_code = exit_code
-
- super "Exiting RubyGems with exit_code #{exit_code}"
- end
-
-end
diff --git a/lib/rubygems/ext.rb b/lib/rubygems/ext.rb
deleted file mode 100644
index 97ee762a4a..0000000000
--- a/lib/rubygems/ext.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-require 'rubygems'
-
-##
-# Classes for building C extensions live here.
-
-module Gem::Ext; end
-
-require 'rubygems/ext/builder'
-require 'rubygems/ext/configure_builder'
-require 'rubygems/ext/ext_conf_builder'
-require 'rubygems/ext/rake_builder'
-
diff --git a/lib/rubygems/ext/builder.rb b/lib/rubygems/ext/builder.rb
deleted file mode 100644
index c029bbe1e9..0000000000
--- a/lib/rubygems/ext/builder.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-class Gem::Ext::Builder
-
- def self.class_name
- name =~ /Ext::(.*)Builder/
- $1.downcase
- end
-
- def self.make(dest_path, results)
- unless File.exist? 'Makefile' then
- raise Gem::InstallError, "Makefile not found:\n\n#{results.join "\n"}"
- end
-
- mf = File.read('Makefile')
- mf = mf.gsub(/^RUBYARCHDIR\s*=\s*\$[^$]*/, "RUBYARCHDIR = #{dest_path}")
- mf = mf.gsub(/^RUBYLIBDIR\s*=\s*\$[^$]*/, "RUBYLIBDIR = #{dest_path}")
-
- File.open('Makefile', 'wb') {|f| f.print mf}
-
- make_program = ENV['make']
- unless make_program then
- make_program = (/mswin/ =~ RUBY_PLATFORM) ? 'nmake' : 'make'
- end
-
- ['', ' install'].each do |target|
- cmd = "#{make_program}#{target}"
- results << cmd
- results << `#{cmd} #{redirector}`
-
- raise Gem::InstallError, "make#{target} failed:\n\n#{results}" unless
- $?.success?
- end
- end
-
- def self.redirector
- '2>&1'
- end
-
- def self.run(command, results)
- results << command
- results << `#{command} #{redirector}`
-
- unless $?.success? then
- raise Gem::InstallError, "#{class_name} failed:\n\n#{results.join "\n"}"
- end
- end
-
-end
-
diff --git a/lib/rubygems/ext/configure_builder.rb b/lib/rubygems/ext/configure_builder.rb
deleted file mode 100644
index c2087eb5ad..0000000000
--- a/lib/rubygems/ext/configure_builder.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-require 'rubygems/ext/builder'
-
-class Gem::Ext::ConfigureBuilder < Gem::Ext::Builder
-
- def self.build(extension, directory, dest_path, results)
- unless File.exist?('Makefile') then
- cmd = "sh ./configure --prefix=#{dest_path}"
- cmd << " #{Gem::Command.build_args.join ' '}" unless Gem::Command.build_args.empty?
-
- run cmd, results
- end
-
- make dest_path, results
-
- results
- end
-
-end
-
diff --git a/lib/rubygems/ext/ext_conf_builder.rb b/lib/rubygems/ext/ext_conf_builder.rb
deleted file mode 100644
index b3d588dc9c..0000000000
--- a/lib/rubygems/ext/ext_conf_builder.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-require 'rubygems/ext/builder'
-require 'rubygems/command'
-
-class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
-
- def self.build(extension, directory, dest_path, results)
- cmd = "#{Gem.ruby} #{File.basename extension}"
- cmd << " #{Gem::Command.build_args.join ' '}" unless Gem::Command.build_args.empty?
-
- run cmd, results
-
- make dest_path, results
-
- results
- end
-
-end
-
diff --git a/lib/rubygems/ext/rake_builder.rb b/lib/rubygems/ext/rake_builder.rb
deleted file mode 100644
index 3b45ef4369..0000000000
--- a/lib/rubygems/ext/rake_builder.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-require 'rubygems/ext/builder'
-require 'rubygems/command'
-
-class Gem::Ext::RakeBuilder < Gem::Ext::Builder
-
- def self.build(extension, directory, dest_path, results)
- if File.basename(extension) =~ /mkrf_conf/i then
- cmd = "#{Gem.ruby} #{File.basename extension}"
- cmd << " #{Gem::Command.build_args.join " "}" unless Gem::Command.build_args.empty?
- run cmd, results
- end
-
- # Deal with possible spaces in the path, e.g. C:/Program Files
- dest_path = '"' + dest_path + '"' if dest_path.include?(' ')
-
- cmd = ENV['rake'] || "#{Gem.ruby} -rubygems #{Gem.bin_path('rake')}" rescue Gem.default_exec_format % 'rake'
- cmd += " RUBYARCHDIR=#{dest_path} RUBYLIBDIR=#{dest_path}" # ENV is frozen
-
- run cmd, results
-
- results
- end
-
-end
-
diff --git a/lib/rubygems/format.rb b/lib/rubygems/format.rb
deleted file mode 100644
index b2e7897339..0000000000
--- a/lib/rubygems/format.rb
+++ /dev/null
@@ -1,87 +0,0 @@
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-require 'fileutils'
-
-require 'rubygems/package'
-
-##
-# Gem::Format knows the guts of the RubyGem .gem file format and provides the
-# capability to read gem files
-
-class Gem::Format
-
- attr_accessor :spec, :file_entries, :gem_path
-
- extend Gem::UserInteraction
-
- ##
- # Constructs an instance of a Format object, representing the gem's
- # data structure.
- #
- # gem:: [String] The file name of the gem
- #
- def initialize(gem_path)
- @gem_path = gem_path
- end
-
- ##
- # Reads the named gem file and returns a Format object, representing
- # the data from the gem file
- #
- # file_path:: [String] Path to the gem file
-
- def self.from_file_by_path(file_path, security_policy = nil)
- format = nil
-
- unless File.exist?(file_path)
- raise Gem::Exception, "Cannot load gem at [#{file_path}] in #{Dir.pwd}"
- end
-
- # check for old version gem
- if File.read(file_path, 20).include?("MD5SUM =")
- require 'rubygems/old_format'
-
- format = Gem::OldFormat.from_file_by_path(file_path)
- else
- open file_path, Gem.binary_mode do |io|
- format = from_io io, file_path, security_policy
- end
- end
-
- return format
- end
-
- ##
- # Reads a gem from an io stream and returns a Format object, representing
- # the data from the gem file
- #
- # io:: [IO] Stream from which to read the gem
-
- def self.from_io(io, gem_path="(io)", security_policy = nil)
- format = new gem_path
-
- Gem::Package.open io, 'r', security_policy do |pkg|
- format.spec = pkg.metadata
- format.file_entries = []
-
- pkg.each do |entry|
- size = entry.header.size
- mode = entry.header.mode
-
- format.file_entries << [{
- "size" => size, "mode" => mode, "path" => entry.full_name,
- },
- entry.read
- ]
- end
- end
-
- format
- end
-
-end
-
diff --git a/lib/rubygems/gem_openssl.rb b/lib/rubygems/gem_openssl.rb
deleted file mode 100644
index bdaad8050a..0000000000
--- a/lib/rubygems/gem_openssl.rb
+++ /dev/null
@@ -1,94 +0,0 @@
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-#--
-# Some system might not have OpenSSL installed, therefore the core
-# library file openssl might not be available. We localize testing
-# for the presence of OpenSSL in this file.
-#++
-
-module Gem
- class << self
- ##
- # Is SSL (used by the signing commands) available on this
- # platform?
-
- def ssl_available?
- @ssl_available
- end
-
- ##
- # Is SSL available?
-
- attr_writer :ssl_available
-
- ##
- # Ensure that SSL is available. Throw an exception if it is not.
-
- def ensure_ssl_available
- unless ssl_available?
- fail Gem::Exception, "SSL is not installed on this system"
- end
- end
- end
-end
-
-begin
- require 'openssl'
-
- # Reference a constant defined in the .rb portion of ssl (just to
- # make sure that part is loaded too).
-
- dummy = OpenSSL::Digest::SHA1
-
- Gem.ssl_available = true
-
- class OpenSSL::X509::Certificate # :nodoc:
- # Check the validity of this certificate.
- def check_validity(issuer_cert = nil, time = Time.now)
- ret = if @not_before && @not_before > time
- [false, :expired, "not valid before '#@not_before'"]
- elsif @not_after && @not_after < time
- [false, :expired, "not valid after '#@not_after'"]
- elsif issuer_cert && !verify(issuer_cert.public_key)
- [false, :issuer, "#{issuer_cert.subject} is not issuer"]
- else
- [true, :ok, 'Valid certificate']
- end
-
- # return hash
- { :is_valid => ret[0], :error => ret[1], :desc => ret[2] }
- end
- end
-
-rescue LoadError, StandardError
- Gem.ssl_available = false
-end
-
-# :stopdoc:
-
-module Gem::SSL
-
- # We make our own versions of the constants here. This allows us
- # to reference the constants, even though some systems might not
- # have SSL installed in the Ruby core package.
- #
- # These constants are only used during load time. At runtime, any
- # method that makes a direct reference to SSL software must be
- # protected with a Gem.ensure_ssl_available call.
-
- if Gem.ssl_available? then
- PKEY_RSA = OpenSSL::PKey::RSA
- DIGEST_SHA1 = OpenSSL::Digest::SHA1
- else
- PKEY_RSA = :rsa
- DIGEST_SHA1 = :sha1
- end
-
-end
-
-# :startdoc:
-
diff --git a/lib/rubygems/gem_path_searcher.rb b/lib/rubygems/gem_path_searcher.rb
deleted file mode 100644
index 2232a574e3..0000000000
--- a/lib/rubygems/gem_path_searcher.rb
+++ /dev/null
@@ -1,102 +0,0 @@
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-##
-# GemPathSearcher has the capability to find loadable files inside
-# gems. It generates data up front to speed up searches later.
-
-class Gem::GemPathSearcher
-
- ##
- # Initialise the data we need to make searches later.
-
- def initialize
- # We want a record of all the installed gemspecs, in the order
- # we wish to examine them.
- @gemspecs = init_gemspecs
- # Map gem spec to glob of full require_path directories.
- # Preparing this information may speed up searches later.
- @lib_dirs = {}
- @gemspecs.each do |spec|
- @lib_dirs[spec.object_id] = lib_dirs_for(spec)
- end
- end
-
- ##
- # Look in all the installed gems until a matching _path_ is found.
- # Return the _gemspec_ of the gem where it was found. If no match
- # is found, return nil.
- #
- # The gems are searched in alphabetical order, and in reverse
- # version order.
- #
- # For example:
- #
- # find('log4r') # -> (log4r-1.1 spec)
- # find('log4r.rb') # -> (log4r-1.1 spec)
- # find('rake/rdoctask') # -> (rake-0.4.12 spec)
- # find('foobarbaz') # -> nil
- #
- # Matching paths can have various suffixes ('.rb', '.so', and
- # others), which may or may not already be attached to _file_.
- # This method doesn't care about the full filename that matches;
- # only that there is a match.
-
- def find(path)
- @gemspecs.find do |spec| matching_file? spec, path end
- end
-
- ##
- # Works like #find, but finds all gemspecs matching +path+.
-
- def find_all(path)
- @gemspecs.select do |spec|
- matching_file? spec, path
- end
- end
-
- ##
- # Attempts to find a matching path using the require_paths of the given
- # +spec+.
-
- def matching_file?(spec, path)
- !matching_files(spec, path).empty?
- end
-
- ##
- # Returns files matching +path+ in +spec+.
- #--
- # Some of the intermediate results are cached in @lib_dirs for speed.
-
- def matching_files(spec, path)
- glob = File.join @lib_dirs[spec.object_id], "#{path}#{Gem.suffix_pattern}"
- Dir[glob].select { |f| File.file? f.untaint }
- end
-
- ##
- # Return a list of all installed gemspecs, sorted by alphabetical order and
- # in reverse version order. (bar-2, bar-1, foo-2)
-
- def init_gemspecs
- specs = Gem.source_index.map { |_, spec| spec }
-
- specs.sort { |a, b|
- names = a.name <=> b.name
- next names if names.nonzero?
- b.version <=> a.version
- }
- end
-
- ##
- # Returns library directories glob for a gemspec. For example,
- # '/usr/local/lib/ruby/gems/1.8/gems/foobar-1.0/{lib,ext}'
-
- def lib_dirs_for(spec)
- "#{spec.full_gem_path}/{#{spec.require_paths.join(',')}}"
- end
-
-end
-
diff --git a/lib/rubygems/gem_runner.rb b/lib/rubygems/gem_runner.rb
deleted file mode 100644
index 07a792dd9b..0000000000
--- a/lib/rubygems/gem_runner.rb
+++ /dev/null
@@ -1,78 +0,0 @@
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-require 'rubygems/command_manager'
-require 'rubygems/config_file'
-require 'rubygems/doc_manager'
-
-##
-# Run an instance of the gem program.
-#
-# Gem::GemRunner is only intended for internal use by RubyGems itself. It
-# does not form any public API and may change at any time for any reason.
-#
-# If you would like to duplicate functionality of `gem` commands, use the
-# classes they call directly.
-
-class Gem::GemRunner
-
- def initialize(options={})
- @command_manager_class = options[:command_manager] || Gem::CommandManager
- @config_file_class = options[:config_file] || Gem::ConfigFile
- @doc_manager_class = options[:doc_manager] || Gem::DocManager
- end
-
- ##
- # Run the gem command with the following arguments.
-
- def run(args)
- start_time = Time.now
-
- if args.include?('--')
- # We need to preserve the original ARGV to use for passing gem options
- # to source gems. If there is a -- in the line, strip all options after
- # it...its for the source building process.
- build_args = args[args.index("--") + 1...args.length]
- args = args[0...args.index("--")]
- end
-
- Gem::Command.build_args = build_args if build_args
-
- do_configuration args
- cmd = @command_manager_class.instance
-
- cmd.command_names.each do |command_name|
- config_args = Gem.configuration[command_name]
- config_args = case config_args
- when String
- config_args.split ' '
- else
- Array(config_args)
- end
- Gem::Command.add_specific_extra_args command_name, config_args
- end
-
- cmd.run Gem.configuration.args
- end_time = Time.now
-
- if Gem.configuration.benchmark then
- printf "\nExecution time: %0.2f seconds.\n", end_time - start_time
- puts "Press Enter to finish"
- STDIN.gets
- end
- end
-
- private
-
- def do_configuration(args)
- Gem.configuration = @config_file_class.new(args)
- Gem.use_paths(Gem.configuration[:gemhome], Gem.configuration[:gempath])
- Gem::Command.extra_args = Gem.configuration[:gem]
- @doc_manager_class.configured_args = Gem.configuration[:rdoc]
- end
-
-end
-
diff --git a/lib/rubygems/indexer.rb b/lib/rubygems/indexer.rb
deleted file mode 100644
index 5ebde1b31c..0000000000
--- a/lib/rubygems/indexer.rb
+++ /dev/null
@@ -1,712 +0,0 @@
-require 'fileutils'
-require 'tmpdir'
-require 'zlib'
-
-require 'rubygems'
-require 'rubygems/format'
-
-begin
- gem 'builder'
- require 'builder/xchar'
-rescue LoadError
-end
-
-##
-# Top level class for building the gem repository index.
-
-class Gem::Indexer
-
- include Gem::UserInteraction
-
- ##
- # Build indexes for RubyGems older than 1.2.0 when true
-
- attr_accessor :build_legacy
-
- ##
- # Build indexes for RubyGems 1.2.0 and newer when true
-
- attr_accessor :build_modern
-
- ##
- # Index install location
-
- attr_reader :dest_directory
-
- ##
- # Specs index install location
-
- attr_reader :dest_specs_index
-
- ##
- # Latest specs index install location
-
- attr_reader :dest_latest_specs_index
-
- ##
- # Prerelease specs index install location
-
- attr_reader :dest_prerelease_specs_index
-
- ##
- # Index build directory
-
- attr_reader :directory
-
- ##
- # Create an indexer that will index the gems in +directory+.
-
- def initialize(directory, options = {})
- unless ''.respond_to? :to_xs then
- fail "Gem::Indexer requires that the XML Builder library be installed:" \
- "\n\tgem install builder"
- end
-
- options = { :build_legacy => true, :build_modern => true }.merge options
-
- @build_legacy = options[:build_legacy]
- @build_modern = options[:build_modern]
-
- @rss_title = options[:rss_title]
- @rss_host = options[:rss_host]
- @rss_gems_host = options[:rss_gems_host]
-
- @dest_directory = directory
- @directory = File.join Dir.tmpdir, "gem_generate_index_#{$$}"
-
- marshal_name = "Marshal.#{Gem.marshal_version}"
-
- @master_index = File.join @directory, 'yaml'
- @marshal_index = File.join @directory, marshal_name
-
- @quick_dir = File.join @directory, 'quick'
-
- @quick_marshal_dir = File.join @quick_dir, marshal_name
-
- @quick_index = File.join @quick_dir, 'index'
- @latest_index = File.join @quick_dir, 'latest_index'
-
- @specs_index = File.join @directory, "specs.#{Gem.marshal_version}"
- @latest_specs_index = File.join @directory,
- "latest_specs.#{Gem.marshal_version}"
- @prerelease_specs_index = File.join(@directory,
- "prerelease_specs.#{Gem.marshal_version}")
-
- @dest_specs_index = File.join @dest_directory,
- "specs.#{Gem.marshal_version}"
- @dest_latest_specs_index = File.join @dest_directory,
- "latest_specs.#{Gem.marshal_version}"
- @dest_prerelease_specs_index = File.join @dest_directory,
- "prerelease_specs.#{Gem.marshal_version}"
-
- @rss_index = File.join @directory, 'index.rss'
-
- @files = []
- end
-
- ##
- # Abbreviate the spec for downloading. Abbreviated specs are only used for
- # searching, downloading and related activities and do not need deployment
- # specific information (e.g. list of files). So we abbreviate the spec,
- # making it much smaller for quicker downloads.
-
- def abbreviate(spec)
- spec.files = []
- spec.test_files = []
- spec.rdoc_options = []
- spec.extra_rdoc_files = []
- spec.cert_chain = []
- spec
- end
-
- ##
- # Build various indicies
-
- def build_indicies(index)
- # Marshal gemspecs are used by both modern and legacy RubyGems
- build_marshal_gemspecs index
- build_legacy_indicies index if @build_legacy
- build_modern_indicies index if @build_modern
- build_rss index
-
- compress_indicies
- end
-
- ##
- # Builds indicies for RubyGems older than 1.2.x
-
- def build_legacy_indicies(index)
- progress = ui.progress_reporter index.size,
- "Generating YAML quick index gemspecs for #{index.size} gems",
- "Complete"
-
- Gem.time 'Generated YAML quick index gemspecs' do
- index.each do |original_name, spec|
- spec_file_name = "#{original_name}.gemspec.rz"
- yaml_name = File.join @quick_dir, spec_file_name
-
- yaml_zipped = Gem.deflate spec.to_yaml
- open yaml_name, 'wb' do |io| io.write yaml_zipped end
-
- progress.updated original_name
- end
-
- progress.done
- end
-
- say "Generating quick index"
-
- Gem.time 'Generated quick index' do
- open @quick_index, 'wb' do |io|
- io.puts index.sort.map { |_, spec| spec.original_name }
- end
- end
-
- say "Generating latest index"
-
- Gem.time 'Generated latest index' do
- open @latest_index, 'wb' do |io|
- io.puts index.latest_specs.sort.map { |spec| spec.original_name }
- end
- end
-
- # Don't need prerelease legacy index
-
- say "Generating Marshal master index"
-
- Gem.time 'Generated Marshal master index' do
- open @marshal_index, 'wb' do |io|
- io.write index.dump
- end
- end
-
- progress = ui.progress_reporter index.size,
- "Generating YAML master index for #{index.size} gems (this may take a while)",
- "Complete"
-
- Gem.time 'Generated YAML master index' do
- open @master_index, 'wb' do |io|
- io.puts "--- !ruby/object:#{index.class}"
- io.puts "gems:"
-
- gems = index.sort_by { |name, gemspec| gemspec.sort_obj }
- gems.each do |original_name, gemspec|
- yaml = gemspec.to_yaml.gsub(/^/, ' ')
- yaml = yaml.sub(/\A ---/, '') # there's a needed extra ' ' here
- io.print " #{original_name}:"
- io.puts yaml
-
- progress.updated original_name
- end
- end
-
- progress.done
- end
-
- @files << @quick_dir
- @files << @master_index
- @files << "#{@master_index}.Z"
- @files << @marshal_index
- @files << "#{@marshal_index}.Z"
- end
-
- ##
- # Builds Marshal quick index gemspecs.
-
- def build_marshal_gemspecs(index)
- progress = ui.progress_reporter index.size,
- "Generating Marshal quick index gemspecs for #{index.size} gems",
- "Complete"
-
- files = []
-
- Gem.time 'Generated Marshal quick index gemspecs' do
- (index.gems.merge(index.prerelease_gems)).each do |original_name, spec|
- spec_file_name = "#{original_name}.gemspec.rz"
- marshal_name = File.join @quick_marshal_dir, spec_file_name
-
- marshal_zipped = Gem.deflate Marshal.dump(spec)
- open marshal_name, 'wb' do |io| io.write marshal_zipped end
-
- files << marshal_name
-
- progress.updated original_name
- end
-
- progress.done
- end
-
- @files << @quick_marshal_dir
-
- files
- end
-
- ##
- # Build a single index for RubyGems 1.2 and newer
-
- def build_modern_index(index, file, name)
- say "Generating #{name} index"
-
- Gem.time "Generated #{name} index" do
- open(file, 'wb') do |io|
- specs = index.map do |*spec|
- # We have to splat here because latest_specs is an array,
- # while the others are hashes. See the TODO in source_index.rb
- spec = spec.flatten.last
- platform = spec.original_platform
-
- # win32-api-1.0.4-x86-mswin32-60
- unless String === platform then
- alert_warning "Skipping invalid platform in gem: #{spec.full_name}"
- next
- end
-
- platform = Gem::Platform::RUBY if platform.nil? or platform.empty?
- [spec.name, spec.version, platform]
- end
-
- specs = compact_specs(specs)
- Marshal.dump(specs, io)
- end
- end
- end
-
- ##
- # Builds indicies for RubyGems 1.2 and newer. Handles full, latest, prerelease
-
- def build_modern_indicies(index)
- build_modern_index(index.sort, @specs_index, 'specs')
- build_modern_index(index.latest_specs.sort,
- @latest_specs_index,
- 'latest specs')
- build_modern_index(index.prerelease_specs.sort,
- @prerelease_specs_index,
- 'prerelease specs')
-
- @files += [@specs_index,
- "#{@specs_index}.gz",
- @latest_specs_index,
- "#{@latest_specs_index}.gz",
- @prerelease_specs_index,
- "#{@prerelease_specs_index}.gz"]
- end
-
- ##
- # Builds an RSS feed for past two days gem releases according to the gem's
- # date.
-
- def build_rss(index)
- if @rss_host.nil? or @rss_gems_host.nil? then
- if Gem.configuration.really_verbose then
- alert_warning "no --rss-host or --rss-gems-host, RSS generation disabled"
- end
- return
- end
-
- require 'cgi'
- require 'rubygems/text'
-
- extend Gem::Text
-
- Gem.time 'Generated rss' do
- open @rss_index, 'wb' do |io|
- rss_host = CGI.escapeHTML @rss_host
- rss_title = CGI.escapeHTML(@rss_title || 'gems')
-
- io.puts <<-HEADER
-<?xml version="1.0"?>
-<rss version="2.0">
- <channel>
- <title>#{rss_title}</title>
- <link>http://#{rss_host}</link>
- <description>Recently released gems from http://#{rss_host}</description>
- <generator>RubyGems v#{Gem::RubyGemsVersion}</generator>
- <docs>http://cyber.law.harvard.edu/rss/rss.html</docs>
- HEADER
-
- today = Gem::Specification::TODAY
- yesterday = today - 86400
-
- index = index.select do |_, spec|
- spec_date = spec.date
-
- case spec_date
- when Date
- Time.parse(spec_date.to_s) >= yesterday
- when Time
- spec_date >= yesterday
- end
- end
-
- index = index.select do |_, spec|
- spec_date = spec.date
-
- case spec_date
- when Date
- Time.parse(spec_date.to_s) <= today
- when Time
- spec_date <= today
- end
- end
-
- index.sort_by { |_, spec| [-spec.date.to_i, spec] }.each do |_, spec|
- gem_path = CGI.escapeHTML "http://#{@rss_gems_host}/gems/#{spec.full_name}.gem"
- size = File.stat(spec.loaded_from).size rescue next
-
- description = spec.description || spec.summary || ''
- authors = Array spec.authors
- emails = Array spec.email
- authors = emails.zip(authors).map do |email, author|
- email += " (#{author})" if author and not author.empty?
- end.join ', '
-
- description = description.split(/\n\n+/).map do |chunk|
- format_text chunk, 78
- end
-
- description = description.join "\n\n"
-
- item = ''
-
- item << <<-ITEM
- <item>
- <title>#{CGI.escapeHTML spec.full_name}</title>
- <description>
-&lt;pre&gt;#{CGI.escapeHTML description.chomp}&lt;/pre&gt;
- </description>
- <author>#{CGI.escapeHTML authors}</author>
- <guid>#{CGI.escapeHTML spec.full_name}</guid>
- <enclosure url=\"#{gem_path}\"
- length=\"#{size}\" type=\"application/octet-stream\" />
- <pubDate>#{spec.date.rfc2822}</pubDate>
- ITEM
-
- item << <<-ITEM if spec.homepage
- <link>#{CGI.escapeHTML spec.homepage}</link>
- ITEM
-
- item << <<-ITEM
- </item>
- ITEM
-
- io.puts item
- end
-
- io.puts <<-FOOTER
- </channel>
-</rss>
- FOOTER
- end
- end
-
- @files << @rss_index
- end
-
- ##
- # Collect specifications from .gem files from the gem directory.
-
- def collect_specs(gems = gem_file_list)
- index = Gem::SourceIndex.new
-
- progress = ui.progress_reporter gems.size,
- "Loading #{gems.size} gems from #{@dest_directory}",
- "Loaded all gems"
-
- Gem.time 'loaded' do
- gems.each do |gemfile|
- if File.size(gemfile.to_s) == 0 then
- alert_warning "Skipping zero-length gem: #{gemfile}"
- next
- end
-
- begin
- spec = Gem::Format.from_file_by_path(gemfile).spec
- spec.loaded_from = gemfile
-
- unless gemfile =~ /\/#{Regexp.escape spec.original_name}.*\.gem\z/i then
- expected_name = spec.full_name
- expected_name << " (#{spec.original_name})" if
- spec.original_name != spec.full_name
- alert_warning "Skipping misnamed gem: #{gemfile} should be named #{expected_name}"
- next
- end
-
- abbreviate spec
- sanitize spec
-
- index.add_spec spec, spec.original_name
-
- progress.updated spec.original_name
-
- rescue SignalException => e
- alert_error "Received signal, exiting"
- raise
- rescue Exception => e
- alert_error "Unable to process #{gemfile}\n#{e.message} (#{e.class})\n\t#{e.backtrace.join "\n\t"}"
- end
- end
-
- progress.done
- end
-
- index
- end
-
- ##
- # Compresses indicies on disk
- #--
- # All future files should be compressed using gzip, not deflate
-
- def compress_indicies
- say "Compressing indicies"
-
- Gem.time 'Compressed indicies' do
- if @build_legacy then
- compress @quick_index, 'rz'
- paranoid @quick_index, 'rz'
-
- compress @latest_index, 'rz'
- paranoid @latest_index, 'rz'
-
- compress @marshal_index, 'Z'
- paranoid @marshal_index, 'Z'
-
- compress @master_index, 'Z'
- paranoid @master_index, 'Z'
- end
-
- if @build_modern then
- gzip @specs_index
- gzip @latest_specs_index
- gzip @prerelease_specs_index
- end
- end
- end
-
- ##
- # Compacts Marshal output for the specs index data source by using identical
- # objects as much as possible.
-
- def compact_specs(specs)
- names = {}
- versions = {}
- platforms = {}
-
- specs.map do |(name, version, platform)|
- names[name] = name unless names.include? name
- versions[version] = version unless versions.include? version
- platforms[platform] = platform unless platforms.include? platform
-
- [names[name], versions[version], platforms[platform]]
- end
- end
-
- ##
- # Compress +filename+ with +extension+.
-
- def compress(filename, extension)
- data = Gem.read_binary filename
-
- zipped = Gem.deflate data
-
- open "#{filename}.#{extension}", 'wb' do |io|
- io.write zipped
- end
- end
-
- ##
- # List of gem file names to index.
-
- def gem_file_list
- Dir.glob(File.join(@dest_directory, "gems", "*.gem"))
- end
-
- ##
- # Builds and installs indicies.
-
- def generate_index
- make_temp_directories
- index = collect_specs
- build_indicies index
- install_indicies
- rescue SignalException
- ensure
- FileUtils.rm_rf @directory
- end
-
- ##
- # Zlib::GzipWriter wrapper that gzips +filename+ on disk.
-
- def gzip(filename)
- Zlib::GzipWriter.open "#{filename}.gz" do |io|
- io.write Gem.read_binary(filename)
- end
- end
-
- ##
- # Install generated indicies into the destination directory.
-
- def install_indicies
- verbose = Gem.configuration.really_verbose
-
- say "Moving index into production dir #{@dest_directory}" if verbose
-
- files = @files.dup
- files.delete @quick_marshal_dir if files.include? @quick_dir
-
- if files.include? @quick_marshal_dir and
- not files.include? @quick_dir then
- files.delete @quick_marshal_dir
- quick_marshal_dir = @quick_marshal_dir.sub @directory, ''
-
- dst_name = File.join @dest_directory, quick_marshal_dir
-
- FileUtils.mkdir_p File.dirname(dst_name), :verbose => verbose
- FileUtils.rm_rf dst_name, :verbose => verbose
- FileUtils.mv @quick_marshal_dir, dst_name, :verbose => verbose,
- :force => true
- end
-
- files = files.map do |path|
- path.sub @directory, ''
- end
-
- files.each do |file|
- src_name = File.join @directory, file
- dst_name = File.join @dest_directory, file
-
- FileUtils.rm_rf dst_name, :verbose => verbose
- FileUtils.mv src_name, @dest_directory, :verbose => verbose,
- :force => true
- end
- end
-
- ##
- # Make directories for index generation
-
- def make_temp_directories
- FileUtils.rm_rf @directory
- FileUtils.mkdir_p @directory, :mode => 0700
- FileUtils.mkdir_p @quick_marshal_dir
- end
-
- ##
- # Ensure +path+ and path with +extension+ are identical.
-
- def paranoid(path, extension)
- data = Gem.read_binary path
- compressed_data = Gem.read_binary "#{path}.#{extension}"
-
- unless data == Gem.inflate(compressed_data) then
- raise "Compressed file #{compressed_path} does not match uncompressed file #{path}"
- end
- end
-
- ##
- # Sanitize the descriptive fields in the spec. Sometimes non-ASCII
- # characters will garble the site index. Non-ASCII characters will
- # be replaced by their XML entity equivalent.
-
- def sanitize(spec)
- spec.summary = sanitize_string(spec.summary)
- spec.description = sanitize_string(spec.description)
- spec.post_install_message = sanitize_string(spec.post_install_message)
- spec.authors = spec.authors.collect { |a| sanitize_string(a) }
-
- spec
- end
-
- ##
- # Sanitize a single string.
-
- def sanitize_string(string)
- # HACK the #to_s is in here because RSpec has an Array of Arrays of
- # Strings for authors. Need a way to disallow bad values on gempsec
- # generation. (Probably won't happen.)
- string ? string.to_s.to_xs : string
- end
-
- ##
- # Perform an in-place update of the repository from newly added gems. Only
- # works for modern indicies, and sets #build_legacy to false when run.
-
- def update_index
- @build_legacy = false
-
- make_temp_directories
-
- specs_mtime = File.stat(@dest_specs_index).mtime
- newest_mtime = Time.at 0
-
- updated_gems = gem_file_list.select do |gem|
- gem_mtime = File.stat(gem).mtime
- newest_mtime = gem_mtime if gem_mtime > newest_mtime
- gem_mtime >= specs_mtime
- end
-
- if updated_gems.empty? then
- say 'No new gems'
- terminate_interaction 0
- end
-
- index = collect_specs updated_gems
-
- files = build_marshal_gemspecs index
-
- Gem.time 'Updated indexes' do
- update_specs_index index, @dest_specs_index, @specs_index
- update_specs_index index, @dest_latest_specs_index, @latest_specs_index
- update_specs_index(index.prerelease_gems, @dest_prerelease_specs_index,
- @prerelease_specs_index)
- end
-
- compress_indicies
-
- verbose = Gem.configuration.really_verbose
-
- say "Updating production dir #{@dest_directory}" if verbose
-
- files << @specs_index
- files << "#{@specs_index}.gz"
- files << @latest_specs_index
- files << "#{@latest_specs_index}.gz"
- files << @prerelease_specs_index
- files << "#{@prerelease_specs_index}.gz"
-
- files = files.map do |path|
- path.sub @directory, ''
- end
-
- files.each do |file|
- src_name = File.join @directory, file
- dst_name = File.join @dest_directory, File.dirname(file)
-
- FileUtils.mv src_name, dst_name, :verbose => verbose,
- :force => true
-
- File.utime newest_mtime, newest_mtime, dst_name
- end
- end
-
- ##
- # Combines specs in +index+ and +source+ then writes out a new copy to
- # +dest+. For a latest index, does not ensure the new file is minimal.
-
- def update_specs_index(index, source, dest)
- specs_index = Marshal.load Gem.read_binary(source)
-
- index.each do |_, spec|
- platform = spec.original_platform
- platform = Gem::Platform::RUBY if platform.nil? or platform.empty?
- specs_index << [spec.name, spec.version, platform]
- end
-
- specs_index = compact_specs specs_index.uniq.sort
-
- open dest, 'wb' do |io|
- Marshal.dump specs_index, io
- end
- end
-
-end
-
diff --git a/lib/rubygems/indexer/abstract_index_builder.rb b/lib/rubygems/indexer/abstract_index_builder.rb
deleted file mode 100644
index 5815dcda87..0000000000
--- a/lib/rubygems/indexer/abstract_index_builder.rb
+++ /dev/null
@@ -1,88 +0,0 @@
-require 'zlib'
-
-require 'rubygems/indexer'
-
-# Abstract base class for building gem indicies. Uses the template pattern
-# with subclass specialization in the +begin_index+, +end_index+ and +cleanup+
-# methods.
-class Gem::Indexer::AbstractIndexBuilder
-
- # Directory to put index files in
- attr_reader :directory
-
- # File name of the generated index
- attr_reader :filename
-
- # List of written files/directories to move into production
- attr_reader :files
-
- def initialize(filename, directory)
- @filename = filename
- @directory = directory
- @files = []
- end
-
- ##
- # Build a Gem index. Yields to block to handle the details of the
- # actual building. Calls +begin_index+, +end_index+ and +cleanup+ at
- # appropriate times to customize basic operations.
-
- def build
- FileUtils.mkdir_p @directory unless File.exist? @directory
- raise "not a directory: #{@directory}" unless File.directory? @directory
-
- file_path = File.join @directory, @filename
-
- @files << @filename
-
- File.open file_path, "wb" do |file|
- @file = file
- start_index
- yield
- end_index
- end
-
- cleanup
- ensure
- @file = nil
- end
-
- ##
- # Compress the given file.
-
- def compress(filename, ext="rz")
- data = open filename, 'rb' do |fp| fp.read end
-
- zipped = zip data
-
- File.open "#{filename}.#{ext}", "wb" do |file|
- file.write zipped
- end
- end
-
- # Called immediately before the yield in build. The index file is open and
- # available as @file.
- def start_index
- end
-
- # Called immediately after the yield in build. The index file is still open
- # and available as @file.
- def end_index
- end
-
- # Called from within builder after the index file has been closed.
- def cleanup
- end
-
- # Return an uncompressed version of a compressed string.
- def unzip(string)
- Zlib::Inflate.inflate(string)
- end
-
- # Return a compressed version of the given string.
- def zip(string)
- Zlib::Deflate.deflate(string)
- end
-
-end
-
diff --git a/lib/rubygems/indexer/latest_index_builder.rb b/lib/rubygems/indexer/latest_index_builder.rb
deleted file mode 100644
index a5798580a6..0000000000
--- a/lib/rubygems/indexer/latest_index_builder.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-require 'rubygems/indexer'
-
-##
-# Construct the latest Gem index file.
-
-class Gem::Indexer::LatestIndexBuilder < Gem::Indexer::AbstractIndexBuilder
-
- def start_index
- super
-
- @index = Gem::SourceIndex.new
- end
-
- def end_index
- super
-
- latest = @index.latest_specs.sort.map { |spec| spec.original_name }
-
- @file.write latest.join("\n")
- end
-
- def cleanup
- super
-
- compress @file.path
-
- @files.delete 'latest_index' # HACK installed via QuickIndexBuilder :/
- end
-
- def add(spec)
- @index.add_spec(spec)
- end
-
-end
-
diff --git a/lib/rubygems/indexer/marshal_index_builder.rb b/lib/rubygems/indexer/marshal_index_builder.rb
deleted file mode 100644
index e1a4d9f9b8..0000000000
--- a/lib/rubygems/indexer/marshal_index_builder.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-require 'rubygems/indexer'
-
-# Construct the master Gem index file.
-class Gem::Indexer::MarshalIndexBuilder < Gem::Indexer::MasterIndexBuilder
- def end_index
- gems = {}
- index = Gem::SourceIndex.new
-
- @index.each do |name, gemspec|
- gems[gemspec.original_name] = gemspec
- end
-
- index.instance_variable_get(:@gems).replace gems
-
- @file.write index.dump
- end
-end
diff --git a/lib/rubygems/indexer/master_index_builder.rb b/lib/rubygems/indexer/master_index_builder.rb
deleted file mode 100644
index 669ea5a1df..0000000000
--- a/lib/rubygems/indexer/master_index_builder.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-require 'rubygems/indexer'
-
-##
-# Construct the master Gem index file.
-
-class Gem::Indexer::MasterIndexBuilder < Gem::Indexer::AbstractIndexBuilder
-
- def start_index
- super
- @index = Gem::SourceIndex.new
- end
-
- def end_index
- super
-
- @file.puts "--- !ruby/object:#{@index.class}"
- @file.puts "gems:"
-
- gems = @index.sort_by { |name, gemspec| gemspec.sort_obj }
- gems.each do |name, gemspec|
- yaml = gemspec.to_yaml.gsub(/^/, ' ')
- yaml = yaml.sub(/\A ---/, '') # there's a needed extra ' ' here
- @file.print " #{gemspec.original_name}:"
- @file.puts yaml
- end
- end
-
- def cleanup
- super
-
- index_file_name = File.join @directory, @filename
-
- compress index_file_name, "Z"
- paranoid index_file_name, "#{index_file_name}.Z"
-
- @files << "#{@filename}.Z"
- end
-
- def add(spec)
- @index.add_spec(spec)
- end
-
- private
-
- def paranoid(path, compressed_path)
- data = Gem.read_binary path
- compressed_data = Gem.read_binary compressed_path
-
- if data != unzip(compressed_data) then
- raise "Compressed file #{compressed_path} does not match uncompressed file #{path}"
- end
- end
-
-end
diff --git a/lib/rubygems/indexer/quick_index_builder.rb b/lib/rubygems/indexer/quick_index_builder.rb
deleted file mode 100644
index dc36179dc5..0000000000
--- a/lib/rubygems/indexer/quick_index_builder.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-require 'rubygems/indexer'
-
-##
-# Construct a quick index file and all of the individual specs to support
-# incremental loading.
-
-class Gem::Indexer::QuickIndexBuilder < Gem::Indexer::AbstractIndexBuilder
-
- def initialize(filename, directory)
- directory = File.join directory, 'quick'
-
- super filename, directory
- end
-
- def cleanup
- super
-
- quick_index_file = File.join @directory, @filename
- compress quick_index_file
-
- # the complete quick index is in a directory, so move it as a whole
- @files.delete 'index'
- @files << 'quick'
- end
-
- def add(spec)
- @file.puts spec.original_name
- add_yaml(spec)
- add_marshal(spec)
- end
-
- def add_yaml(spec)
- fn = File.join @directory, "#{spec.original_name}.gemspec.rz"
- zipped = zip spec.to_yaml
- File.open fn, "wb" do |gsfile| gsfile.write zipped end
- end
-
- def add_marshal(spec)
- # HACK why does this not work in #initialize?
- FileUtils.mkdir_p File.join(@directory, "Marshal.#{Gem.marshal_version}")
-
- fn = File.join @directory, "Marshal.#{Gem.marshal_version}",
- "#{spec.original_name}.gemspec.rz"
-
- zipped = zip Marshal.dump(spec)
- File.open fn, "wb" do |gsfile| gsfile.write zipped end
- end
-
-end
-
diff --git a/lib/rubygems/install_update_options.rb b/lib/rubygems/install_update_options.rb
deleted file mode 100644
index a43a2a171c..0000000000
--- a/lib/rubygems/install_update_options.rb
+++ /dev/null
@@ -1,125 +0,0 @@
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-require 'rubygems'
-require 'rubygems/security'
-
-##
-# Mixin methods for install and update options for Gem::Commands
-
-module Gem::InstallUpdateOptions
-
- ##
- # Add the install/update options to the option parser.
-
- def add_install_update_options
- OptionParser.accept Gem::Security::Policy do |value|
- value = Gem::Security::Policies[value]
- raise OptionParser::InvalidArgument, value if value.nil?
- value
- end
-
- add_option(:"Install/Update", '-i', '--install-dir DIR',
- 'Gem repository directory to get installed',
- 'gems') do |value, options|
- options[:install_dir] = File.expand_path(value)
- end
-
- add_option(:"Install/Update", '-n', '--bindir DIR',
- 'Directory where binary files are',
- 'located') do |value, options|
- options[:bin_dir] = File.expand_path(value)
- end
-
- add_option(:"Install/Update", '-d', '--[no-]rdoc',
- 'Generate RDoc documentation for the gem on',
- 'install') do |value, options|
- options[:generate_rdoc] = value
- end
-
- add_option(:"Install/Update", '--[no-]ri',
- 'Generate RI documentation for the gem on',
- 'install') do |value, options|
- options[:generate_ri] = value
- end
-
- add_option(:"Install/Update", '-E', '--[no-]env-shebang',
- "Rewrite the shebang line on installed",
- "scripts to use /usr/bin/env") do |value, options|
- options[:env_shebang] = value
- end
-
- add_option(:"Install/Update", '-f', '--[no-]force',
- 'Force gem to install, bypassing dependency',
- 'checks') do |value, options|
- options[:force] = value
- end
-
- add_option(:"Install/Update", '-t', '--[no-]test',
- 'Run unit tests prior to installation') do |value, options|
- options[:test] = value
- end
-
- add_option(:"Install/Update", '-w', '--[no-]wrappers',
- 'Use bin wrappers for executables',
- 'Not available on dosish platforms') do |value, options|
- options[:wrappers] = value
- end
-
- add_option(:"Install/Update", '-P', '--trust-policy POLICY',
- Gem::Security::Policy,
- 'Specify gem trust policy') do |value, options|
- options[:security_policy] = value
- end
-
- add_option(:"Install/Update", '--ignore-dependencies',
- 'Do not install any required dependent gems') do |value, options|
- options[:ignore_dependencies] = value
- end
-
- add_option(:"Install/Update", '-y', '--include-dependencies',
- 'Unconditionally install the required',
- 'dependent gems') do |value, options|
- options[:include_dependencies] = value
- end
-
- add_option(:"Install/Update", '--[no-]format-executable',
- 'Make installed executable names match ruby.',
- 'If ruby is ruby18, foo_exec will be',
- 'foo_exec18') do |value, options|
- options[:format_executable] = value
- end
-
- add_option(:"Install/Update", '--[no-]user-install',
- 'Install in user\'s home directory instead',
- 'of GEM_HOME. Defaults to using home',
- 'only if GEM_HOME is not writable.') do |value, options|
- options[:user_install] = value
- end
-
- add_option(:"Install/Update", "--development",
- "Install any additional development",
- "dependencies") do |value, options|
- options[:development] = true
- end
-
- add_option(:"Install/Update", "--prerelease",
- "Install prerelease versions of a gem if",
- "available. Defaults to skipping",
- "prereleases.") do |value, options|
- options[:prerelease] = true
- end
- end
-
- ##
- # Default options for the gem install command.
-
- def install_update_defaults_str
- '--rdoc --no-force --no-test --wrappers'
- end
-
-end
-
diff --git a/lib/rubygems/installer.rb b/lib/rubygems/installer.rb
deleted file mode 100644
index e9910876f3..0000000000
--- a/lib/rubygems/installer.rb
+++ /dev/null
@@ -1,589 +0,0 @@
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-require 'fileutils'
-require 'pathname'
-require 'rbconfig'
-
-require 'rubygems/format'
-require 'rubygems/ext'
-require 'rubygems/require_paths_builder'
-
-##
-# The installer class processes RubyGem .gem files and installs the files
-# contained in the .gem into the Gem.path.
-#
-# Gem::Installer does the work of putting files in all the right places on the
-# filesystem including unpacking the gem into its gem dir, installing the
-# gemspec in the specifications dir, storing the cached gem in the cache dir,
-# and installing either wrappers or symlinks for executables.
-#
-# The installer fires pre and post install hooks. Hooks can be added either
-# through a rubygems_plugin.rb file in an installed gem or via a
-# rubygems/defaults/#{RUBY_ENGINE}.rb or rubygems/defaults/operating_system.rb
-# file. See Gem.pre_install and Gem.post_install for details.
-
-class Gem::Installer
-
- ##
- # Paths where env(1) might live. Some systems are broken and have it in
- # /bin
-
- ENV_PATHS = %w[/usr/bin/env /bin/env]
-
- ##
- # Raised when there is an error while building extensions.
- #
- class ExtensionBuildError < Gem::InstallError; end
-
- include Gem::UserInteraction
-
- include Gem::RequirePathsBuilder
-
- ##
- # The directory a gem's executables will be installed into
-
- attr_reader :bin_dir
-
- ##
- # The gem repository the gem will be installed into
-
- attr_reader :gem_home
-
- ##
- # The Gem::Specification for the gem being installed
-
- attr_reader :spec
-
- @home_install_warning = false
- @path_warning = false
-
- class << self
-
- ##
- # True if we've warned about ~/.gems install
-
- attr_accessor :home_install_warning
-
- ##
- # True if we've warned about PATH not including Gem.bindir
-
- attr_accessor :path_warning
-
- attr_writer :exec_format
-
- # Defaults to use Ruby's program prefix and suffix.
- def exec_format
- @exec_format ||= Gem.default_exec_format
- end
-
- end
-
- ##
- # Constructs an Installer instance that will install the gem located at
- # +gem+. +options+ is a Hash with the following keys:
- #
- # :env_shebang:: Use /usr/bin/env in bin wrappers.
- # :force:: Overrides all version checks and security policy checks, except
- # for a signed-gems-only policy.
- # :ignore_dependencies:: Don't raise if a dependency is missing.
- # :install_dir:: The directory to install the gem into.
- # :format_executable:: Format the executable the same as the ruby executable.
- # If your ruby is ruby18, foo_exec will be installed as
- # foo_exec18.
- # :security_policy:: Use the specified security policy. See Gem::Security
- # :wrappers:: Install wrappers if true, symlinks if false.
-
- def initialize(gem, options={})
- @gem = gem
-
- options = {
- :bin_dir => nil,
- :env_shebang => false,
- :exec_format => false,
- :force => false,
- :install_dir => Gem.dir,
- :source_index => Gem.source_index,
- }.merge options
-
- @env_shebang = options[:env_shebang]
- @force = options[:force]
- gem_home = options[:install_dir]
- @gem_home = Pathname.new(gem_home).expand_path
- @ignore_dependencies = options[:ignore_dependencies]
- @format_executable = options[:format_executable]
- @security_policy = options[:security_policy]
- @wrappers = options[:wrappers]
- @bin_dir = options[:bin_dir]
- @development = options[:development]
- @source_index = options[:source_index]
-
- begin
- @format = Gem::Format.from_file_by_path @gem, @security_policy
- rescue Gem::Package::FormatError
- raise Gem::InstallError, "invalid gem format for #{@gem}"
- end
-
- begin
- FileUtils.mkdir_p @gem_home
- rescue Errno::EACCES, Errno::ENOTDIR
- # We'll divert to ~/.gems below
- end
-
- if not File.writable? @gem_home or
- # TODO: Shouldn't have to test for existence of bindir; tests need it.
- (@gem_home.to_s == Gem.dir and File.exist? Gem.bindir and
- not File.writable? Gem.bindir) then
- if options[:user_install] == false then # You don't want to use ~
- raise Gem::FilePermissionError, @gem_home
- elsif options[:user_install].nil? then
- unless self.class.home_install_warning or options[:unpack] then
- alert_warning "Installing to ~/.gem since #{@gem_home} and\n\t #{Gem.bindir} aren't both writable."
- self.class.home_install_warning = true
- end
- end
- options[:user_install] = true
- end
-
- if options[:user_install] and not options[:unpack] then
- @gem_home = Gem.user_dir
-
- user_bin_dir = File.join(@gem_home, 'bin')
- unless ENV['PATH'].split(File::PATH_SEPARATOR).include? user_bin_dir then
- unless self.class.path_warning then
- alert_warning "You don't have #{user_bin_dir} in your PATH,\n\t gem executables will not run."
- self.class.path_warning = true
- end
- end
-
- FileUtils.mkdir_p @gem_home unless File.directory? @gem_home
- # If it's still not writable, you've got issues.
- raise Gem::FilePermissionError, @gem_home unless File.writable? @gem_home
- end
-
- @spec = @format.spec
-
- @gem_dir = File.join(@gem_home, "gems", @spec.full_name).untaint
- end
-
- ##
- # Installs the gem and returns a loaded Gem::Specification for the installed
- # gem.
- #
- # The gem will be installed with the following structure:
- #
- # @gem_home/
- # cache/<gem-version>.gem #=> a cached copy of the installed gem
- # gems/<gem-version>/... #=> extracted files
- # specifications/<gem-version>.gemspec #=> the Gem::Specification
-
- def install
- # If we're forcing the install then disable security unless the security
- # policy says that we only install singed gems.
- @security_policy = nil if @force and @security_policy and
- not @security_policy.only_signed
-
- unless @force then
- if rrv = @spec.required_ruby_version then
- unless rrv.satisfied_by? Gem.ruby_version then
- raise Gem::InstallError, "#{@spec.name} requires Ruby version #{rrv}"
- end
- end
-
- if rrgv = @spec.required_rubygems_version then
- unless rrgv.satisfied_by? Gem::Version.new(Gem::RubyGemsVersion) then
- raise Gem::InstallError,
- "#{@spec.name} requires RubyGems version #{rrgv}"
- end
- end
-
- unless @ignore_dependencies then
- deps = @spec.runtime_dependencies
- deps |= @spec.development_dependencies if @development
-
- deps.each do |dep_gem|
- ensure_dependency @spec, dep_gem
- end
- end
- end
-
- Gem.pre_install_hooks.each do |hook|
- hook.call self
- end
-
- FileUtils.mkdir_p @gem_home unless File.directory? @gem_home
-
- Gem.ensure_gem_subdirectories @gem_home
-
- FileUtils.mkdir_p @gem_dir
-
- extract_files
- generate_bin
- build_extensions
- write_spec
-
- write_require_paths_file_if_needed
-
- # HACK remove? Isn't this done in multiple places?
- cached_gem = File.join @gem_home, "cache", @gem.split(/\//).pop
- unless File.exist? cached_gem then
- FileUtils.cp @gem, File.join(@gem_home, "cache")
- end
-
- say @spec.post_install_message unless @spec.post_install_message.nil?
-
- @spec.loaded_from = File.join(@gem_home, 'specifications',
- "#{@spec.full_name}.gemspec")
-
- @source_index.add_spec @spec
-
- Gem.post_install_hooks.each do |hook|
- hook.call self
- end
-
- return @spec
- rescue Zlib::GzipFile::Error
- raise Gem::InstallError, "gzip error installing #{@gem}"
- end
-
- ##
- # Ensure that the dependency is satisfied by the current installation of
- # gem. If it is not an exception is raised.
- #
- # spec :: Gem::Specification
- # dependency :: Gem::Dependency
-
- def ensure_dependency(spec, dependency)
- unless installation_satisfies_dependency? dependency then
- raise Gem::InstallError, "#{spec.name} requires #{dependency}"
- end
-
- true
- end
-
- ##
- # True if the gems in the source_index satisfy +dependency+.
-
- def installation_satisfies_dependency?(dependency)
- @source_index.find_name(dependency.name, dependency.version_requirements).size > 0
- end
-
- ##
- # Unpacks the gem into the given directory.
-
- def unpack(directory)
- @gem_dir = directory
- @format = Gem::Format.from_file_by_path @gem, @security_policy
- extract_files
- end
-
- ##
- # Writes the .gemspec specification (in Ruby) to the gem home's
- # specifications directory.
-
- def write_spec
- rubycode = @spec.to_ruby
-
- file_name = File.join @gem_home, 'specifications',
- "#{@spec.full_name}.gemspec"
-
- file_name.untaint
-
- File.open(file_name, "w") do |file|
- file.puts rubycode
- end
- end
-
- ##
- # Creates windows .bat files for easy running of commands
-
- def generate_windows_script(bindir, filename)
- if Gem.win_platform? then
- script_name = filename + ".bat"
- script_path = File.join bindir, File.basename(script_name)
- File.open script_path, 'w' do |file|
- file.puts windows_stub_script(bindir, filename)
- end
-
- say script_path if Gem.configuration.really_verbose
- end
- end
-
- def generate_bin
- return if @spec.executables.nil? or @spec.executables.empty?
-
- # If the user has asked for the gem to be installed in a directory that is
- # the system gem directory, then use the system bin directory, else create
- # (or use) a new bin dir under the gem_home.
- bindir = @bin_dir ? @bin_dir : Gem.bindir(@gem_home)
-
- Dir.mkdir bindir unless File.exist? bindir
- raise Gem::FilePermissionError.new(bindir) unless File.writable? bindir
-
- @spec.executables.each do |filename|
- filename.untaint
- bin_path = File.expand_path File.join(@gem_dir, @spec.bindir, filename)
- mode = File.stat(bin_path).mode | 0111
- File.chmod mode, bin_path
-
- if @wrappers then
- generate_bin_script filename, bindir
- else
- generate_bin_symlink filename, bindir
- end
- end
- end
-
- ##
- # Creates the scripts to run the applications in the gem.
- #--
- # The Windows script is generated in addition to the regular one due to a
- # bug or misfeature in the Windows shell's pipe. See
- # http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-talk/193379
-
- def generate_bin_script(filename, bindir)
- bin_script_path = File.join bindir, formatted_program_filename(filename)
-
- exec_path = File.join @gem_dir, @spec.bindir, filename
-
- # HACK some gems don't have #! in their executables, restore 2008/06
- #if File.read(exec_path, 2) == '#!' then
- FileUtils.rm_f bin_script_path # prior install may have been --no-wrappers
-
- File.open bin_script_path, 'w', 0755 do |file|
- file.print app_script_text(filename)
- end
-
- say bin_script_path if Gem.configuration.really_verbose
-
- generate_windows_script bindir, filename
- #else
- # FileUtils.rm_f bin_script_path
- # FileUtils.cp exec_path, bin_script_path,
- # :verbose => Gem.configuration.really_verbose
- #end
- end
-
- ##
- # Creates the symlinks to run the applications in the gem. Moves
- # the symlink if the gem being installed has a newer version.
-
- def generate_bin_symlink(filename, bindir)
- if Gem.win_platform? then
- alert_warning "Unable to use symlinks on Windows, installing wrapper"
- generate_bin_script filename, bindir
- return
- end
-
- src = File.join @gem_dir, 'bin', filename
- dst = File.join bindir, formatted_program_filename(filename)
-
- if File.exist? dst then
- if File.symlink? dst then
- link = File.readlink(dst).split File::SEPARATOR
- cur_version = Gem::Version.create(link[-3].sub(/^.*-/, ''))
- return if @spec.version < cur_version
- end
- File.unlink dst
- end
-
- FileUtils.symlink src, dst, :verbose => Gem.configuration.really_verbose
- end
-
- ##
- # Generates a #! line for +bin_file_name+'s wrapper copying arguments if
- # necessary.
-
- def shebang(bin_file_name)
- ruby_name = Gem::ConfigMap[:ruby_install_name] if @env_shebang
- path = File.join @gem_dir, @spec.bindir, bin_file_name
- first_line = File.open(path, "rb") {|file| file.gets}
-
- if /\A#!/ =~ first_line then
- # Preserve extra words on shebang line, like "-w". Thanks RPA.
- shebang = first_line.sub(/\A\#!.*?ruby\S*(?=(\s+\S+))/, "#!#{Gem.ruby}")
- opts = $1
- shebang.strip! # Avoid nasty ^M issues.
- end
-
- if not ruby_name then
- "#!#{Gem.ruby}#{opts}"
- elsif opts then
- "#!/bin/sh\n'exec' #{ruby_name.dump} '-x' \"$0\" \"$@\"\n#{shebang}"
- else
- # Create a plain shebang line.
- @env_path ||= ENV_PATHS.find {|env_path| File.executable? env_path }
- "#!#{@env_path} #{ruby_name}"
- end
- end
-
- ##
- # Return the text for an application file.
-
- def app_script_text(bin_file_name)
- <<-TEXT
-#{shebang bin_file_name}
-#
-# This file was generated by RubyGems.
-#
-# The application '#{@spec.name}' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'rubygems'
-
-version = "#{Gem::Requirement.default}"
-
-if ARGV.first =~ /^_(.*)_$/ and Gem::Version.correct? $1 then
- version = $1
- ARGV.shift
-end
-
-gem '#{@spec.name}', version
-load Gem.bin_path('#{@spec.name}', '#{bin_file_name}', version)
-TEXT
- end
-
- ##
- # return the stub script text used to launch the true ruby script
-
- def windows_stub_script(bindir, bin_file_name)
- <<-TEXT
-@ECHO OFF
-IF NOT "%~f0" == "~f0" GOTO :WinNT
-@"#{File.basename(Gem.ruby).chomp('"')}" "#{File.join(bindir, bin_file_name)}" %1 %2 %3 %4 %5 %6 %7 %8 %9
-GOTO :EOF
-:WinNT
-@"#{File.basename(Gem.ruby).chomp('"')}" "%~dpn0" %*
-TEXT
- end
-
- ##
- # Builds extensions. Valid types of extensions are extconf.rb files,
- # configure scripts and rakefiles or mkrf_conf files.
-
- def build_extensions
- return if @spec.extensions.empty?
- say "Building native extensions. This could take a while..."
- start_dir = Dir.pwd
- dest_path = File.join @gem_dir, @spec.require_paths.first
- ran_rake = false # only run rake once
-
- @spec.extensions.each do |extension|
- break if ran_rake
- results = []
-
- builder = case extension
- when /extconf/ then
- Gem::Ext::ExtConfBuilder
- when /configure/ then
- Gem::Ext::ConfigureBuilder
- when /rakefile/i, /mkrf_conf/i then
- ran_rake = true
- Gem::Ext::RakeBuilder
- else
- results = ["No builder for extension '#{extension}'"]
- nil
- end
-
- begin
- Dir.chdir File.join(@gem_dir, File.dirname(extension))
- results = builder.build(extension, @gem_dir, dest_path, results)
-
- say results.join("\n") if Gem.configuration.really_verbose
-
- rescue => ex
- results = results.join "\n"
-
- File.open('gem_make.out', 'wb') { |f| f.puts results }
-
- message = <<-EOF
-ERROR: Failed to build gem native extension.
-
-#{results}
-
-Gem files will remain installed in #{@gem_dir} for inspection.
-Results logged to #{File.join(Dir.pwd, 'gem_make.out')}
- EOF
-
- raise ExtensionBuildError, message
- ensure
- Dir.chdir start_dir
- end
- end
- end
-
- ##
- # Reads the file index and extracts each file into the gem directory.
- #
- # Ensures that files can't be installed outside the gem directory.
-
- def extract_files
- expand_and_validate_gem_dir
-
- raise ArgumentError, "format required to extract from" if @format.nil?
-
- @format.file_entries.each do |entry, file_data|
- path = entry['path'].untaint
-
- if path =~ /\A\// then # for extra sanity
- raise Gem::InstallError,
- "attempt to install file into #{entry['path'].inspect}"
- end
-
- path = File.expand_path File.join(@gem_dir, path)
-
- if path !~ /\A#{Regexp.escape @gem_dir}/ then
- msg = "attempt to install file into %p under %p" %
- [entry['path'], @gem_dir]
- raise Gem::InstallError, msg
- end
-
- FileUtils.rm_rf(path) if File.exists?(path)
- FileUtils.mkdir_p File.dirname(path)
-
- File.open(path, "wb") do |out|
- out.write file_data
- end
-
- FileUtils.chmod entry['mode'], path
-
- say path if Gem.configuration.really_verbose
- end
- end
-
- ##
- # Prefix and suffix the program filename the same as ruby.
-
- def formatted_program_filename(filename)
- if @format_executable then
- self.class.exec_format % File.basename(filename)
- else
- filename
- end
- end
-
- private
-
- ##
- # HACK Pathname is broken on windows.
-
- def absolute_path? pathname
- pathname.absolute? or (Gem.win_platform? and pathname.to_s =~ /\A[a-z]:/i)
- end
-
- def expand_and_validate_gem_dir
- @gem_dir = Pathname.new(@gem_dir).expand_path
-
- unless absolute_path?(@gem_dir) then # HACK is this possible after #expand_path?
- raise ArgumentError, "install directory %p not absolute" % @gem_dir
- end
-
- @gem_dir = @gem_dir.to_s
- end
-
-end
-
diff --git a/lib/rubygems/local_remote_options.rb b/lib/rubygems/local_remote_options.rb
deleted file mode 100644
index e238c7292c..0000000000
--- a/lib/rubygems/local_remote_options.rb
+++ /dev/null
@@ -1,135 +0,0 @@
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-require 'uri'
-require 'rubygems'
-
-##
-# Mixin methods for local and remote Gem::Command options.
-
-module Gem::LocalRemoteOptions
-
- ##
- # Allows OptionParser to handle HTTP URIs.
-
- def accept_uri_http
- OptionParser.accept URI::HTTP do |value|
- begin
- uri = URI.parse value
- rescue URI::InvalidURIError
- raise OptionParser::InvalidArgument, value
- end
-
- unless ['http', 'https', 'file'].include?(uri.scheme)
- raise OptionParser::InvalidArgument, value
- end
-
- value
- end
- end
-
- ##
- # Add local/remote options to the command line parser.
-
- def add_local_remote_options
- add_option(:"Local/Remote", '-l', '--local',
- 'Restrict operations to the LOCAL domain') do |value, options|
- options[:domain] = :local
- end
-
- add_option(:"Local/Remote", '-r', '--remote',
- 'Restrict operations to the REMOTE domain') do |value, options|
- options[:domain] = :remote
- end
-
- add_option(:"Local/Remote", '-b', '--both',
- 'Allow LOCAL and REMOTE operations') do |value, options|
- options[:domain] = :both
- end
-
- add_bulk_threshold_option
- add_source_option
- add_proxy_option
- add_update_sources_option
- end
-
- ##
- # Add the --bulk-threshold option
-
- def add_bulk_threshold_option
- add_option(:"Local/Remote", '-B', '--bulk-threshold COUNT',
- "Threshold for switching to bulk",
- "synchronization (default #{Gem.configuration.bulk_threshold})") do
- |value, options|
- Gem.configuration.bulk_threshold = value.to_i
- end
- end
-
- ##
- # Add the --http-proxy option
-
- def add_proxy_option
- accept_uri_http
-
- add_option(:"Local/Remote", '-p', '--[no-]http-proxy [URL]', URI::HTTP,
- 'Use HTTP proxy for remote operations') do |value, options|
- options[:http_proxy] = (value == false) ? :no_proxy : value
- Gem.configuration[:http_proxy] = options[:http_proxy]
- end
- end
-
- ##
- # Add the --source option
-
- def add_source_option
- accept_uri_http
-
- add_option(:"Local/Remote", '--source URL', URI::HTTP,
- 'Use URL as the remote source for gems') do |source, options|
- source << '/' if source !~ /\/\z/
-
- if options[:added_source] then
- Gem.sources << source unless Gem.sources.include?(source)
- else
- options[:added_source] = true
- Gem.sources.replace [source]
- end
- end
- end
-
- ##
- # Add the --update-sources option
-
- def add_update_sources_option
- add_option(:"Local/Remote", '-u', '--[no-]update-sources',
- 'Update local source cache') do |value, options|
- Gem.configuration.update_sources = value
- end
- end
-
- ##
- # Is fetching of local and remote information enabled?
-
- def both?
- options[:domain] == :both
- end
-
- ##
- # Is local fetching enabled?
-
- def local?
- options[:domain] == :local || options[:domain] == :both
- end
-
- ##
- # Is remote fetching enabled?
-
- def remote?
- options[:domain] == :remote || options[:domain] == :both
- end
-
-end
-
diff --git a/lib/rubygems/old_format.rb b/lib/rubygems/old_format.rb
deleted file mode 100644
index 43967db412..0000000000
--- a/lib/rubygems/old_format.rb
+++ /dev/null
@@ -1,152 +0,0 @@
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-require 'rubygems'
-require 'fileutils'
-require 'yaml'
-require 'zlib'
-
-##
-# The format class knows the guts of the RubyGem .gem file format and provides
-# the capability to read gem files
-
-class Gem::OldFormat
-
- attr_accessor :spec, :file_entries, :gem_path
-
- ##
- # Constructs an instance of a Format object, representing the gem's data
- # structure.
- #
- # gem:: [String] The file name of the gem
-
- def initialize(gem_path)
- @gem_path = gem_path
- end
-
- ##
- # Reads the named gem file and returns a Format object, representing the
- # data from the gem file
- #
- # file_path:: [String] Path to the gem file
-
- def self.from_file_by_path(file_path)
- unless File.exist?(file_path)
- raise Gem::Exception, "Cannot load gem file [#{file_path}]"
- end
-
- File.open(file_path, 'rb') do |file|
- from_io(file, file_path)
- end
- end
-
- ##
- # Reads a gem from an io stream and returns a Format object, representing
- # the data from the gem file
- #
- # io:: [IO] Stream from which to read the gem
-
- def self.from_io(io, gem_path="(io)")
- format = self.new(gem_path)
- skip_ruby(io)
- format.spec = read_spec(io)
- format.file_entries = []
- read_files_from_gem(io) do |entry, file_data|
- format.file_entries << [entry, file_data]
- end
- format
- end
-
- private
-
- ##
- # Skips the Ruby self-install header. After calling this method, the
- # IO index will be set after the Ruby code.
- #
- # file:: [IO] The IO to process (skip the Ruby code)
-
- def self.skip_ruby(file)
- end_seen = false
- loop {
- line = file.gets
- if(line == nil || line.chomp == "__END__") then
- end_seen = true
- break
- end
- }
-
- if end_seen == false then
- raise Gem::Exception.new("Failed to find end of ruby script while reading gem")
- end
- end
-
- ##
- # Reads the specification YAML from the supplied IO and constructs
- # a Gem::Specification from it. After calling this method, the
- # IO index will be set after the specification header.
- #
- # file:: [IO] The IO to process
-
- def self.read_spec(file)
- yaml = ''
-
- read_until_dashes file do |line|
- yaml << line
- end
-
- Gem::Specification.from_yaml yaml
- rescue YAML::Error => e
- raise Gem::Exception, "Failed to parse gem specification out of gem file"
- rescue ArgumentError => e
- raise Gem::Exception, "Failed to parse gem specification out of gem file"
- end
-
- ##
- # Reads lines from the supplied IO until a end-of-yaml (---) is
- # reached
- #
- # file:: [IO] The IO to process
- # block:: [String] The read line
-
- def self.read_until_dashes(file)
- while((line = file.gets) && line.chomp.strip != "---") do
- yield line
- end
- end
-
- ##
- # Reads the embedded file data from a gem file, yielding an entry
- # containing metadata about the file and the file contents themselves
- # for each file that's archived in the gem.
- # NOTE: Many of these methods should be extracted into some kind of
- # Gem file read/writer
- #
- # gem_file:: [IO] The IO to process
-
- def self.read_files_from_gem(gem_file)
- errstr = "Error reading files from gem"
- header_yaml = ''
- begin
- self.read_until_dashes(gem_file) do |line|
- header_yaml << line
- end
- header = YAML.load(header_yaml)
- raise Gem::Exception, errstr unless header
-
- header.each do |entry|
- file_data = ''
- self.read_until_dashes(gem_file) do |line|
- file_data << line
- end
- yield [entry, Zlib::Inflate.inflate(file_data.strip.unpack("m")[0])]
- end
- rescue Zlib::DataError => e
- raise Gem::Exception, errstr
- end
- end
-
-end
-
diff --git a/lib/rubygems/package.rb b/lib/rubygems/package.rb
deleted file mode 100644
index 9cb393b0c7..0000000000
--- a/lib/rubygems/package.rb
+++ /dev/null
@@ -1,95 +0,0 @@
-#++
-# Copyright (C) 2004 Mauricio Julio Fernández Pradier
-# See LICENSE.txt for additional licensing information.
-#--
-
-require 'fileutils'
-require 'find'
-require 'stringio'
-require 'yaml'
-require 'zlib'
-
-require 'rubygems/digest/md5'
-require 'rubygems/security'
-require 'rubygems/specification'
-
-# Wrapper for FileUtils meant to provide logging and additional operations if
-# needed.
-class Gem::FileOperations
-
- def initialize(logger = nil)
- @logger = logger
- end
-
- def method_missing(meth, *args, &block)
- case
- when FileUtils.respond_to?(meth)
- @logger.log "#{meth}: #{args}" if @logger
- FileUtils.send meth, *args, &block
- when Gem::FileOperations.respond_to?(meth)
- @logger.log "#{meth}: #{args}" if @logger
- Gem::FileOperations.send meth, *args, &block
- else
- super
- end
- end
-
-end
-
-module Gem::Package
-
- class Error < StandardError; end
- class NonSeekableIO < Error; end
- class ClosedIO < Error; end
- class BadCheckSum < Error; end
- class TooLongFileName < Error; end
- class FormatError < Error; end
-
- def self.open(io, mode = "r", signer = nil, &block)
- tar_type = case mode
- when 'r' then TarInput
- when 'w' then TarOutput
- else
- raise "Unknown Package open mode"
- end
-
- tar_type.open(io, signer, &block)
- end
-
- def self.pack(src, destname, signer = nil)
- TarOutput.open(destname, signer) do |outp|
- dir_class.chdir(src) do
- outp.metadata = (file_class.read("RPA/metadata") rescue nil)
- find_class.find('.') do |entry|
- case
- when file_class.file?(entry)
- entry.sub!(%r{\./}, "")
- next if entry =~ /\ARPA\//
- stat = File.stat(entry)
- outp.add_file_simple(entry, stat.mode, stat.size) do |os|
- file_class.open(entry, "rb") do |f|
- os.write(f.read(4096)) until f.eof?
- end
- end
- when file_class.dir?(entry)
- entry.sub!(%r{\./}, "")
- next if entry == "RPA"
- outp.mkdir(entry, file_class.stat(entry).mode)
- else
- raise "Don't know how to pack this yet!"
- end
- end
- end
- end
- end
-
-end
-
-require 'rubygems/package/f_sync_dir'
-require 'rubygems/package/tar_header'
-require 'rubygems/package/tar_input'
-require 'rubygems/package/tar_output'
-require 'rubygems/package/tar_reader'
-require 'rubygems/package/tar_reader/entry'
-require 'rubygems/package/tar_writer'
-
diff --git a/lib/rubygems/package/f_sync_dir.rb b/lib/rubygems/package/f_sync_dir.rb
deleted file mode 100644
index 1915ab3ecb..0000000000
--- a/lib/rubygems/package/f_sync_dir.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-#++
-# Copyright (C) 2004 Mauricio Julio Fernández Pradier
-# See LICENSE.txt for additional licensing information.
-#--
-
-module Gem::Package::FSyncDir
-
- private
-
- ##
- # make sure this hits the disc
-
- def fsync_dir(dirname)
- dir = open dirname, 'r'
- dir.fsync
- rescue # ignore IOError if it's an unpatched (old) Ruby
- ensure
- dir.close if dir rescue nil
- end
-
-end
-
diff --git a/lib/rubygems/package/tar_header.rb b/lib/rubygems/package/tar_header.rb
deleted file mode 100644
index 44c6695cf9..0000000000
--- a/lib/rubygems/package/tar_header.rb
+++ /dev/null
@@ -1,265 +0,0 @@
-#++
-# Copyright (C) 2004 Mauricio Julio Fernández Pradier
-# See LICENSE.txt for additional licensing information.
-#--
-
-##
-#--
-# struct tarfile_entry_posix {
-# char name[100]; # ASCII + (Z unless filled)
-# char mode[8]; # 0 padded, octal, null
-# char uid[8]; # ditto
-# char gid[8]; # ditto
-# char size[12]; # 0 padded, octal, null
-# char mtime[12]; # 0 padded, octal, null
-# char checksum[8]; # 0 padded, octal, null, space
-# char typeflag[1]; # file: "0" dir: "5"
-# char linkname[100]; # ASCII + (Z unless filled)
-# char magic[6]; # "ustar\0"
-# char version[2]; # "00"
-# char uname[32]; # ASCIIZ
-# char gname[32]; # ASCIIZ
-# char devmajor[8]; # 0 padded, octal, null
-# char devminor[8]; # o padded, octal, null
-# char prefix[155]; # ASCII + (Z unless filled)
-# };
-#++
-# A header for a tar file
-
-class Gem::Package::TarHeader
-
- ##
- # Fields in the tar header
-
- FIELDS = [
- :checksum,
- :devmajor,
- :devminor,
- :gid,
- :gname,
- :linkname,
- :magic,
- :mode,
- :mtime,
- :name,
- :prefix,
- :size,
- :typeflag,
- :uid,
- :uname,
- :version,
- ]
-
- ##
- # Pack format for a tar header
-
- PACK_FORMAT = 'a100' + # name
- 'a8' + # mode
- 'a8' + # uid
- 'a8' + # gid
- 'a12' + # size
- 'a12' + # mtime
- 'a7a' + # chksum
- 'a' + # typeflag
- 'a100' + # linkname
- 'a6' + # magic
- 'a2' + # version
- 'a32' + # uname
- 'a32' + # gname
- 'a8' + # devmajor
- 'a8' + # devminor
- 'a155' # prefix
-
- ##
- # Unpack format for a tar header
-
- UNPACK_FORMAT = 'A100' + # name
- 'A8' + # mode
- 'A8' + # uid
- 'A8' + # gid
- 'A12' + # size
- 'A12' + # mtime
- 'A8' + # checksum
- 'A' + # typeflag
- 'A100' + # linkname
- 'A6' + # magic
- 'A2' + # version
- 'A32' + # uname
- 'A32' + # gname
- 'A8' + # devmajor
- 'A8' + # devminor
- 'A155' # prefix
-
- attr_reader(*FIELDS)
-
- ##
- # Creates a tar header from IO +stream+
-
- def self.from(stream)
- header = stream.read 512
- empty = (header == "\0" * 512)
-
- fields = header.unpack UNPACK_FORMAT
-
- name = fields.shift
- mode = fields.shift.oct
- uid = fields.shift.oct
- gid = fields.shift.oct
- size = fields.shift.oct
- mtime = fields.shift.oct
- checksum = fields.shift.oct
- typeflag = fields.shift
- linkname = fields.shift
- magic = fields.shift
- version = fields.shift.oct
- uname = fields.shift
- gname = fields.shift
- devmajor = fields.shift.oct
- devminor = fields.shift.oct
- prefix = fields.shift
-
- new :name => name,
- :mode => mode,
- :uid => uid,
- :gid => gid,
- :size => size,
- :mtime => mtime,
- :checksum => checksum,
- :typeflag => typeflag,
- :linkname => linkname,
- :magic => magic,
- :version => version,
- :uname => uname,
- :gname => gname,
- :devmajor => devmajor,
- :devminor => devminor,
- :prefix => prefix,
-
- :empty => empty
-
- # HACK unfactor for Rubinius
- #new :name => fields.shift,
- # :mode => fields.shift.oct,
- # :uid => fields.shift.oct,
- # :gid => fields.shift.oct,
- # :size => fields.shift.oct,
- # :mtime => fields.shift.oct,
- # :checksum => fields.shift.oct,
- # :typeflag => fields.shift,
- # :linkname => fields.shift,
- # :magic => fields.shift,
- # :version => fields.shift.oct,
- # :uname => fields.shift,
- # :gname => fields.shift,
- # :devmajor => fields.shift.oct,
- # :devminor => fields.shift.oct,
- # :prefix => fields.shift,
-
- # :empty => empty
- end
-
- ##
- # Creates a new TarHeader using +vals+
-
- def initialize(vals)
- unless vals[:name] && vals[:size] && vals[:prefix] && vals[:mode] then
- raise ArgumentError, ":name, :size, :prefix and :mode required"
- end
-
- vals[:uid] ||= 0
- vals[:gid] ||= 0
- vals[:mtime] ||= 0
- vals[:checksum] ||= ""
- vals[:typeflag] ||= "0"
- vals[:magic] ||= "ustar"
- vals[:version] ||= "00"
- vals[:uname] ||= "wheel"
- vals[:gname] ||= "wheel"
- vals[:devmajor] ||= 0
- vals[:devminor] ||= 0
-
- FIELDS.each do |name|
- instance_variable_set "@#{name}", vals[name]
- end
-
- @empty = vals[:empty]
- end
-
- ##
- # Is the tar entry empty?
-
- def empty?
- @empty
- end
-
- def ==(other) # :nodoc:
- self.class === other and
- @checksum == other.checksum and
- @devmajor == other.devmajor and
- @devminor == other.devminor and
- @gid == other.gid and
- @gname == other.gname and
- @linkname == other.linkname and
- @magic == other.magic and
- @mode == other.mode and
- @mtime == other.mtime and
- @name == other.name and
- @prefix == other.prefix and
- @size == other.size and
- @typeflag == other.typeflag and
- @uid == other.uid and
- @uname == other.uname and
- @version == other.version
- end
-
- def to_s # :nodoc:
- update_checksum
- header
- end
-
- ##
- # Updates the TarHeader's checksum
-
- def update_checksum
- header = header " " * 8
- @checksum = oct calculate_checksum(header), 6
- end
-
- private
-
- def calculate_checksum(header)
- header.unpack("C*").inject { |a, b| a + b }
- end
-
- def header(checksum = @checksum)
- header = [
- name,
- oct(mode, 7),
- oct(uid, 7),
- oct(gid, 7),
- oct(size, 11),
- oct(mtime, 11),
- checksum,
- " ",
- typeflag,
- linkname,
- magic,
- oct(version, 2),
- uname,
- gname,
- oct(devmajor, 7),
- oct(devminor, 7),
- prefix
- ]
-
- header = header.pack PACK_FORMAT
-
- header << ("\0" * ((512 - header.size) % 512))
- end
-
- def oct(num, len)
- "%0#{len}o" % num
- end
-
-end
-
diff --git a/lib/rubygems/package/tar_input.rb b/lib/rubygems/package/tar_input.rb
deleted file mode 100644
index 9f901023b8..0000000000
--- a/lib/rubygems/package/tar_input.rb
+++ /dev/null
@@ -1,217 +0,0 @@
-#++
-# Copyright (C) 2004 Mauricio Julio Fernández Pradier
-# See LICENSE.txt for additional licensing information.
-#--
-
-class Gem::Package::TarInput
-
- include Gem::Package::FSyncDir
- include Enumerable
-
- attr_reader :metadata
-
- private_class_method :new
-
- def self.open(io, security_policy = nil, &block)
- is = new io, security_policy
-
- yield is
- ensure
- is.close if is
- end
-
- def initialize(io, security_policy = nil)
- @io = io
- @tarreader = Gem::Package::TarReader.new @io
- has_meta = false
-
- data_sig, meta_sig, data_dgst, meta_dgst = nil, nil, nil, nil
- dgst_algo = security_policy ? Gem::Security::OPT[:dgst_algo] : nil
-
- @tarreader.each do |entry|
- case entry.full_name
- when "metadata"
- @metadata = load_gemspec entry.read
- has_meta = true
- when "metadata.gz"
- begin
- # if we have a security_policy, then pre-read the metadata file
- # and calculate it's digest
- sio = nil
- if security_policy
- Gem.ensure_ssl_available
- sio = StringIO.new(entry.read)
- meta_dgst = dgst_algo.digest(sio.string)
- sio.rewind
- end
-
- gzis = Zlib::GzipReader.new(sio || entry)
- # YAML wants an instance of IO
- @metadata = load_gemspec(gzis)
- has_meta = true
- ensure
- gzis.close unless gzis.nil?
- end
- when 'metadata.gz.sig'
- meta_sig = entry.read
- when 'data.tar.gz.sig'
- data_sig = entry.read
- when 'data.tar.gz'
- if security_policy
- Gem.ensure_ssl_available
- data_dgst = dgst_algo.digest(entry.read)
- end
- end
- end
-
- if security_policy then
- Gem.ensure_ssl_available
-
- # map trust policy from string to actual class (or a serialized YAML
- # file, if that exists)
- if String === security_policy then
- if Gem::Security::Policies.key? security_policy then
- # load one of the pre-defined security policies
- security_policy = Gem::Security::Policies[security_policy]
- elsif File.exist? security_policy then
- # FIXME: this doesn't work yet
- security_policy = YAML.load File.read(security_policy)
- else
- raise Gem::Exception, "Unknown trust policy '#{security_policy}'"
- end
- end
-
- if data_sig && data_dgst && meta_sig && meta_dgst then
- # the user has a trust policy, and we have a signed gem
- # file, so use the trust policy to verify the gem signature
-
- begin
- security_policy.verify_gem(data_sig, data_dgst, @metadata.cert_chain)
- rescue Exception => e
- raise "Couldn't verify data signature: #{e}"
- end
-
- begin
- security_policy.verify_gem(meta_sig, meta_dgst, @metadata.cert_chain)
- rescue Exception => e
- raise "Couldn't verify metadata signature: #{e}"
- end
- elsif security_policy.only_signed
- raise Gem::Exception, "Unsigned gem"
- else
- # FIXME: should display warning here (trust policy, but
- # either unsigned or badly signed gem file)
- end
- end
-
- @tarreader.rewind
- @fileops = Gem::FileOperations.new
-
- raise Gem::Package::FormatError, "No metadata found!" unless has_meta
- end
-
- def close
- @io.close
- @tarreader.close
- end
-
- def each(&block)
- @tarreader.each do |entry|
- next unless entry.full_name == "data.tar.gz"
- is = zipped_stream entry
-
- begin
- Gem::Package::TarReader.new is do |inner|
- inner.each(&block)
- end
- ensure
- is.close if is
- end
- end
-
- @tarreader.rewind
- end
-
- def extract_entry(destdir, entry, expected_md5sum = nil)
- if entry.directory? then
- dest = File.join destdir, entry.full_name
-
- if File.directory? dest then
- @fileops.chmod entry.header.mode, dest, :verbose => false
- else
- @fileops.mkdir_p dest, :mode => entry.header.mode, :verbose => false
- end
-
- fsync_dir dest
- fsync_dir File.join(dest, "..")
-
- return
- end
-
- # it's a file
- md5 = Digest::MD5.new if expected_md5sum
- destdir = File.join destdir, File.dirname(entry.full_name)
- @fileops.mkdir_p destdir, :mode => 0755, :verbose => false
- destfile = File.join destdir, File.basename(entry.full_name)
- @fileops.chmod 0600, destfile, :verbose => false rescue nil # Errno::ENOENT
-
- open destfile, "wb", entry.header.mode do |os|
- loop do
- data = entry.read 4096
- break unless data
- # HACK shouldn't we check the MD5 before writing to disk?
- md5 << data if expected_md5sum
- os.write(data)
- end
-
- os.fsync
- end
-
- @fileops.chmod entry.header.mode, destfile, :verbose => false
- fsync_dir File.dirname(destfile)
- fsync_dir File.join(File.dirname(destfile), "..")
-
- if expected_md5sum && expected_md5sum != md5.hexdigest then
- raise Gem::Package::BadCheckSum
- end
- end
-
- # Attempt to YAML-load a gemspec from the given _io_ parameter. Return
- # nil if it fails.
- def load_gemspec(io)
- Gem::Specification.from_yaml io
- rescue Gem::Exception
- nil
- end
-
- ##
- # Return an IO stream for the zipped entry.
- #
- # NOTE: Originally this method used two approaches, Return a GZipReader
- # directly, or read the GZipReader into a string and return a StringIO on
- # the string. The string IO approach was used for versions of ZLib before
- # 1.2.1 to avoid buffer errors on windows machines. Then we found that
- # errors happened with 1.2.1 as well, so we changed the condition. Then
- # we discovered errors occurred with versions as late as 1.2.3. At this
- # point (after some benchmarking to show we weren't seriously crippling
- # the unpacking speed) we threw our hands in the air and declared that
- # this method would use the String IO approach on all platforms at all
- # times. And that's the way it is.
-
- def zipped_stream(entry)
- if defined? Rubinius then
- zis = Zlib::GzipReader.new entry
- dis = zis.read
- is = StringIO.new(dis)
- else
- # This is Jamis Buck's Zlib workaround for some unknown issue
- entry.read(10) # skip the gzip header
- zis = Zlib::Inflate.new(-Zlib::MAX_WBITS)
- is = StringIO.new(zis.inflate(entry.read))
- end
- ensure
- zis.finish if zis
- end
-
-end
-
diff --git a/lib/rubygems/package/tar_output.rb b/lib/rubygems/package/tar_output.rb
deleted file mode 100644
index dfb74af9fc..0000000000
--- a/lib/rubygems/package/tar_output.rb
+++ /dev/null
@@ -1,143 +0,0 @@
-#++
-# Copyright (C) 2004 Mauricio Julio Fernández Pradier
-# See LICENSE.txt for additional licensing information.
-#--
-
-##
-# TarOutput is a wrapper to TarWriter that builds gem-format tar file.
-#
-# Gem-format tar files contain the following files:
-# [data.tar.gz] A gzipped tar file containing the files that compose the gem
-# which will be extracted into the gem/ dir on installation.
-# [metadata.gz] A YAML format Gem::Specification.
-# [data.tar.gz.sig] A signature for the gem's data.tar.gz.
-# [metadata.gz.sig] A signature for the gem's metadata.gz.
-#
-# See TarOutput::open for usage details.
-
-class Gem::Package::TarOutput
-
- ##
- # Creates a new TarOutput which will yield a TarWriter object for the
- # data.tar.gz portion of a gem-format tar file.
- #
- # See #initialize for details on +io+ and +signer+.
- #
- # See #add_gem_contents for details on adding metadata to the tar file.
-
- def self.open(io, signer = nil, &block) # :yield: data_tar_writer
- tar_outputter = new io, signer
- tar_outputter.add_gem_contents(&block)
- tar_outputter.add_metadata
- tar_outputter.add_signatures
-
- ensure
- tar_outputter.close
- end
-
- ##
- # Creates a new TarOutput that will write a gem-format tar file to +io+. If
- # +signer+ is given, the data.tar.gz and metadata.gz will be signed and
- # the signatures will be added to the tar file.
-
- def initialize(io, signer)
- @io = io
- @signer = signer
-
- @tar_writer = Gem::Package::TarWriter.new @io
-
- @metadata = nil
-
- @data_signature = nil
- @meta_signature = nil
- end
-
- ##
- # Yields a TarWriter for the data.tar.gz inside a gem-format tar file.
- # The yielded TarWriter has been extended with a #metadata= method for
- # attaching a YAML format Gem::Specification which will be written by
- # add_metadata.
-
- def add_gem_contents
- @tar_writer.add_file "data.tar.gz", 0644 do |inner|
- sio = @signer ? StringIO.new : nil
- Zlib::GzipWriter.wrap(sio || inner) do |os|
-
- Gem::Package::TarWriter.new os do |data_tar_writer|
- # :stopdoc:
- def data_tar_writer.metadata() @metadata end
- def data_tar_writer.metadata=(metadata) @metadata = metadata end
- # :startdoc:
-
- yield data_tar_writer
-
- @metadata = data_tar_writer.metadata
- end
- end
-
- # if we have a signing key, then sign the data
- # digest and return the signature
- if @signer then
- digest = Gem::Security::OPT[:dgst_algo].digest sio.string
- @data_signature = @signer.sign digest
- inner.write sio.string
- end
- end
-
- self
- end
-
- ##
- # Adds metadata.gz to the gem-format tar file which was saved from a
- # previous #add_gem_contents call.
-
- def add_metadata
- return if @metadata.nil?
-
- @tar_writer.add_file "metadata.gz", 0644 do |io|
- begin
- sio = @signer ? StringIO.new : nil
- gzos = Zlib::GzipWriter.new(sio || io)
- gzos.write @metadata
- ensure
- gzos.flush
- gzos.finish
-
- # if we have a signing key, then sign the metadata digest and return
- # the signature
- if @signer then
- digest = Gem::Security::OPT[:dgst_algo].digest sio.string
- @meta_signature = @signer.sign digest
- io.write sio.string
- end
- end
- end
- end
-
- ##
- # Adds data.tar.gz.sig and metadata.gz.sig to the gem-format tar files if
- # a Gem::Security::Signer was sent to initialize.
-
- def add_signatures
- if @data_signature then
- @tar_writer.add_file 'data.tar.gz.sig', 0644 do |io|
- io.write @data_signature
- end
- end
-
- if @meta_signature then
- @tar_writer.add_file 'metadata.gz.sig', 0644 do |io|
- io.write @meta_signature
- end
- end
- end
-
- ##
- # Closes the TarOutput.
-
- def close
- @tar_writer.close
- end
-
-end
-
diff --git a/lib/rubygems/package/tar_reader.rb b/lib/rubygems/package/tar_reader.rb
deleted file mode 100644
index 1a2fbaf678..0000000000
--- a/lib/rubygems/package/tar_reader.rb
+++ /dev/null
@@ -1,105 +0,0 @@
-#++
-# Copyright (C) 2004 Mauricio Julio Fernández Pradier
-# See LICENSE.txt for additional licensing information.
-#--
-
-##
-# TarReader reads tar files and allows iteration over their items
-
-class Gem::Package::TarReader
-
- include Gem::Package
-
- ##
- # Raised if the tar IO is not seekable
-
- class UnexpectedEOF < StandardError; end
-
- ##
- # Creates a new TarReader on +io+ and yields it to the block, if given.
-
- def self.new(io)
- reader = super
-
- return reader unless block_given?
-
- begin
- yield reader
- ensure
- reader.close
- end
-
- nil
- end
-
- ##
- # Creates a new tar file reader on +io+ which needs to respond to #pos,
- # #eof?, #read, #getc and #pos=
-
- def initialize(io)
- @io = io
- @init_pos = io.pos
- end
-
- ##
- # Close the tar file
-
- def close
- end
-
- ##
- # Iterates over files in the tarball yielding each entry
-
- def each
- loop do
- return if @io.eof?
-
- header = Gem::Package::TarHeader.from @io
- return if header.empty?
-
- entry = Gem::Package::TarReader::Entry.new header, @io
- size = entry.header.size
-
- yield entry
-
- skip = (512 - (size % 512)) % 512
- pending = size - entry.bytes_read
-
- begin
- # avoid reading...
- @io.seek pending, IO::SEEK_CUR
- pending = 0
- rescue Errno::EINVAL, NameError
- while pending > 0 do
- bytes_read = @io.read([pending, 4096].min).size
- raise UnexpectedEOF if @io.eof?
- pending -= bytes_read
- end
- end
-
- @io.read skip # discard trailing zeros
-
- # make sure nobody can use #read, #getc or #rewind anymore
- entry.close
- end
- end
-
- alias each_entry each
-
- ##
- # NOTE: Do not call #rewind during #each
-
- def rewind
- if @init_pos == 0 then
- raise Gem::Package::NonSeekableIO unless @io.respond_to? :rewind
- @io.rewind
- else
- raise Gem::Package::NonSeekableIO unless @io.respond_to? :pos=
- @io.pos = @init_pos
- end
- end
-
-end
-
-require 'rubygems/package/tar_reader/entry'
-
diff --git a/lib/rubygems/package/tar_reader/entry.rb b/lib/rubygems/package/tar_reader/entry.rb
deleted file mode 100644
index eeb70bf000..0000000000
--- a/lib/rubygems/package/tar_reader/entry.rb
+++ /dev/null
@@ -1,140 +0,0 @@
-#++
-# Copyright (C) 2004 Mauricio Julio Fernández Pradier
-# See LICENSE.txt for additional licensing information.
-#--
-
-##
-# Class for reading entries out of a tar file
-
-class Gem::Package::TarReader::Entry
-
- ##
- # Header for this tar entry
-
- attr_reader :header
-
- ##
- # Creates a new tar entry for +header+ that will be read from +io+
-
- def initialize(header, io)
- @closed = false
- @header = header
- @io = io
- @orig_pos = @io.pos
- @read = 0
- end
-
- def check_closed # :nodoc:
- raise IOError, "closed #{self.class}" if closed?
- end
-
- ##
- # Number of bytes read out of the tar entry
-
- def bytes_read
- @read
- end
-
- ##
- # Closes the tar entry
-
- def close
- @closed = true
- end
-
- ##
- # Is the tar entry closed?
-
- def closed?
- @closed
- end
-
- ##
- # Are we at the end of the tar entry?
-
- def eof?
- check_closed
-
- @read >= @header.size
- end
-
- ##
- # Full name of the tar entry
-
- def full_name
- if @header.prefix != "" then
- File.join @header.prefix, @header.name
- else
- @header.name
- end
- end
-
- ##
- # Read one byte from the tar entry
-
- def getc
- check_closed
-
- return nil if @read >= @header.size
-
- ret = @io.getc
- @read += 1 if ret
-
- ret
- end
-
- ##
- # Is this tar entry a directory?
-
- def directory?
- @header.typeflag == "5"
- end
-
- ##
- # Is this tar entry a file?
-
- def file?
- @header.typeflag == "0"
- end
-
- ##
- # The position in the tar entry
-
- def pos
- check_closed
-
- bytes_read
- end
-
- ##
- # Reads +len+ bytes from the tar file entry, or the rest of the entry if
- # nil
-
- def read(len = nil)
- check_closed
-
- return nil if @read >= @header.size
-
- len ||= @header.size - @read
- max_read = [len, @header.size - @read].min
-
- ret = @io.read max_read
- @read += ret.size
-
- ret
- end
-
- ##
- # Rewinds to the beginning of the tar file entry
-
- def rewind
- check_closed
-
- raise Gem::Package::NonSeekableIO unless @io.respond_to? :pos=
-
- @io.pos = @orig_pos
- @read = 0
- end
-
-end
-
diff --git a/lib/rubygems/package/tar_writer.rb b/lib/rubygems/package/tar_writer.rb
deleted file mode 100644
index 6f11529302..0000000000
--- a/lib/rubygems/package/tar_writer.rb
+++ /dev/null
@@ -1,240 +0,0 @@
-#++
-# Copyright (C) 2004 Mauricio Julio Fernández Pradier
-# See LICENSE.txt for additional licensing information.
-#--
-
-##
-# Allows writing of tar files
-
-class Gem::Package::TarWriter
-
- class FileOverflow < StandardError; end
-
- ##
- # IO wrapper that allows writing a limited amount of data
-
- class BoundedStream
-
- ##
- # Maximum number of bytes that can be written
-
- attr_reader :limit
-
- ##
- # Number of bytes written
-
- attr_reader :written
-
- ##
- # Wraps +io+ and allows up to +limit+ bytes to be written
-
- def initialize(io, limit)
- @io = io
- @limit = limit
- @written = 0
- end
-
- ##
- # Writes +data+ onto the IO, raising a FileOverflow exception if the
- # number of bytes will be more than #limit
-
- def write(data)
- if data.size + @written > @limit
- raise FileOverflow, "You tried to feed more data than fits in the file."
- end
- @io.write data
- @written += data.size
- data.size
- end
-
- end
-
- ##
- # IO wrapper that provides only #write
-
- class RestrictedStream
-
- ##
- # Creates a new RestrictedStream wrapping +io+
-
- def initialize(io)
- @io = io
- end
-
- ##
- # Writes +data+ onto the IO
-
- def write(data)
- @io.write data
- end
-
- end
-
- ##
- # Creates a new TarWriter, yielding it if a block is given
-
- def self.new(io)
- writer = super
-
- return writer unless block_given?
-
- begin
- yield writer
- ensure
- writer.close
- end
-
- nil
- end
-
- ##
- # Creates a new TarWriter that will write to +io+
-
- def initialize(io)
- @io = io
- @closed = false
- end
-
- ##
- # Adds file +name+ with permissions +mode+, and yields an IO for writing the
- # file to
-
- def add_file(name, mode) # :yields: io
- check_closed
-
- raise Gem::Package::NonSeekableIO unless @io.respond_to? :pos=
-
- name, prefix = split_name name
-
- init_pos = @io.pos
- @io.write "\0" * 512 # placeholder for the header
-
- yield RestrictedStream.new(@io) if block_given?
-
- size = @io.pos - init_pos - 512
-
- remainder = (512 - (size % 512)) % 512
- @io.write "\0" * remainder
-
- final_pos = @io.pos
- @io.pos = init_pos
-
- header = Gem::Package::TarHeader.new :name => name, :mode => mode,
- :size => size, :prefix => prefix
-
- @io.write header
- @io.pos = final_pos
-
- self
- end
-
- ##
- # Add file +name+ with permissions +mode+ +size+ bytes long. Yields an IO
- # to write the file to.
-
- def add_file_simple(name, mode, size) # :yields: io
- check_closed
-
- name, prefix = split_name name
-
- header = Gem::Package::TarHeader.new(:name => name, :mode => mode,
- :size => size, :prefix => prefix).to_s
-
- @io.write header
- os = BoundedStream.new @io, size
-
- yield os if block_given?
-
- min_padding = size - os.written
- @io.write("\0" * min_padding)
-
- remainder = (512 - (size % 512)) % 512
- @io.write("\0" * remainder)
-
- self
- end
-
- ##
- # Raises IOError if the TarWriter is closed
-
- def check_closed
- raise IOError, "closed #{self.class}" if closed?
- end
-
- ##
- # Closes the TarWriter
-
- def close
- check_closed
-
- @io.write "\0" * 1024
- flush
-
- @closed = true
- end
-
- ##
- # Is the TarWriter closed?
-
- def closed?
- @closed
- end
-
- ##
- # Flushes the TarWriter's IO
-
- def flush
- check_closed
-
- @io.flush if @io.respond_to? :flush
- end
-
- ##
- # Creates a new directory in the tar file +name+ with +mode+
-
- def mkdir(name, mode)
- check_closed
-
- name, prefix = split_name(name)
-
- header = Gem::Package::TarHeader.new :name => name, :mode => mode,
- :typeflag => "5", :size => 0,
- :prefix => prefix
-
- @io.write header
-
- self
- end
-
- ##
- # Splits +name+ into a name and prefix that can fit in the TarHeader
-
- def split_name(name) # :nodoc:
- raise Gem::Package::TooLongFileName if name.size > 256
-
- if name.size <= 100 then
- prefix = ""
- else
- parts = name.split(/\//)
- newname = parts.pop
- nxt = ""
-
- loop do
- nxt = parts.pop
- break if newname.size + 1 + nxt.size > 100
- newname = nxt + "/" + newname
- end
-
- prefix = (parts + [nxt]).join "/"
- name = newname
-
- if name.size > 100 or prefix.size > 155 then
- raise Gem::Package::TooLongFileName
- end
- end
-
- return name, prefix
- end
-
-end
-
diff --git a/lib/rubygems/package_task.rb b/lib/rubygems/package_task.rb
deleted file mode 100644
index d7f83276f8..0000000000
--- a/lib/rubygems/package_task.rb
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright (c) 2003, 2004 Jim Weirich, 2009 Eric Hodel
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-require 'rubygems'
-begin
- gem 'rake'
-rescue Gem::LoadError
-end
-
-require 'rake/packagetask'
-
-##
-# Create a package based upon a Gem::Specification. Gem packages, as well as
-# zip files and tar/gzipped packages can be produced by this task.
-#
-# In addition to the Rake targets generated by Rake::PackageTask, a
-# Gem::PackageTask will also generate the following tasks:
-#
-# [<b>"<em>package_dir</em>/<em>name</em>-<em>version</em>.gem"</b>]
-# Create a RubyGems package with the given name and version.
-#
-# Example using a Gem::Specification:
-#
-# require 'rubygems'
-# require 'rubygems/package_task'
-#
-# spec = Gem::Specification.new do |s|
-# s.platform = Gem::Platform::RUBY
-# s.summary = "Ruby based make-like utility."
-# s.name = 'rake'
-# s.version = PKG_VERSION
-# s.requirements << 'none'
-# s.require_path = 'lib'
-# s.autorequire = 'rake'
-# s.files = PKG_FILES
-# s.description = <<-EOF
-# Rake is a Make-like program implemented in Ruby. Tasks
-# and dependencies are specified in standard Ruby syntax.
-# EOF
-# end
-#
-# Gem::PackageTask.new(spec) do |pkg|
-# pkg.need_zip = true
-# pkg.need_tar = true
-# end
-
-class Gem::PackageTask < Rake::PackageTask
-
- ##
- # Ruby Gem::Specification containing the metadata for this package. The
- # name, version and package_files are automatically determined from the
- # gemspec and don't need to be explicitly provided.
-
- attr_accessor :gem_spec
-
- ##
- # Create a Gem Package task library. Automatically define the gem if a
- # block is given. If no block is supplied, then #define needs to be called
- # to define the task.
-
- def initialize(gem_spec)
- init gem_spec
- yield self if block_given?
- define if block_given?
- end
-
- ##
- # Initialization tasks without the "yield self" or define operations.
-
- def init(gem)
- super gem.name, gem.version
- @gem_spec = gem
- @package_files += gem_spec.files if gem_spec.files
- end
-
- ##
- # Create the Rake tasks and actions specified by this Gem::PackageTask.
- # (+define+ is automatically called if a block is given to +new+).
-
- def define
- super
- task :package => [:gem]
- desc "Build the gem file #{gem_file}"
- task :gem => ["#{package_dir}/#{gem_file}"]
- file "#{package_dir}/#{gem_file}" => [package_dir] + @gem_spec.files do
- when_writing("Creating #{gem_spec.full_name}.gem") {
- Gem::Builder.new(gem_spec).build
- verbose(true) {
- mv gem_file, "#{package_dir}/#{gem_file}"
- }
- }
- end
- end
-
- def gem_file
- "#{@gem_spec.full_name}.gem"
- end
-
-end
-
diff --git a/lib/rubygems/platform.rb b/lib/rubygems/platform.rb
deleted file mode 100644
index bfa8fca0ff..0000000000
--- a/lib/rubygems/platform.rb
+++ /dev/null
@@ -1,180 +0,0 @@
-##
-# Available list of platforms for targeting Gem installations.
-
-class Gem::Platform
-
- @local = nil
-
- attr_accessor :cpu
-
- attr_accessor :os
-
- attr_accessor :version
-
- def self.local
- arch = Gem::ConfigMap[:arch]
- arch = "#{arch}_60" if arch =~ /mswin32$/
- @local ||= new(arch)
- end
-
- def self.match(platform)
- Gem.platforms.any? do |local_platform|
- platform.nil? or local_platform == platform or
- (local_platform != Gem::Platform::RUBY and local_platform =~ platform)
- end
- end
-
- def self.new(arch) # :nodoc:
- case arch
- when Gem::Platform::CURRENT then
- Gem::Platform.local
- when Gem::Platform::RUBY, nil, '' then
- Gem::Platform::RUBY
- else
- super
- end
- end
-
- def initialize(arch)
- case arch
- when Array then
- @cpu, @os, @version = arch
- when String then
- arch = arch.split '-'
-
- if arch.length > 2 and arch.last !~ /\d/ then # reassemble x86-linux-gnu
- extra = arch.pop
- arch.last << "-#{extra}"
- end
-
- cpu = arch.shift
-
- @cpu = case cpu
- when /i\d86/ then 'x86'
- else cpu
- end
-
- if arch.length == 2 and arch.last =~ /^\d+(\.\d+)?$/ then # for command-line
- @os, @version = arch
- return
- end
-
- os, = arch
- @cpu, os = nil, cpu if os.nil? # legacy jruby
-
- @os, @version = case os
- when /aix(\d+)/ then [ 'aix', $1 ]
- when /cygwin/ then [ 'cygwin', nil ]
- when /darwin(\d+)?/ then [ 'darwin', $1 ]
- when /freebsd(\d+)/ then [ 'freebsd', $1 ]
- when /hpux(\d+)/ then [ 'hpux', $1 ]
- when /^java$/, /^jruby$/ then [ 'java', nil ]
- when /^java([\d.]*)/ then [ 'java', $1 ]
- when /linux/ then [ 'linux', $1 ]
- when /mingw32/ then [ 'mingw32', nil ]
- when /(mswin\d+)(\_(\d+))?/ then
- os, version = $1, $3
- @cpu = 'x86' if @cpu.nil? and os =~ /32$/
- [os, version]
- when /netbsdelf/ then [ 'netbsdelf', nil ]
- when /openbsd(\d+\.\d+)/ then [ 'openbsd', $1 ]
- when /solaris(\d+\.\d+)/ then [ 'solaris', $1 ]
- # test
- when /^(\w+_platform)(\d+)/ then [ $1, $2 ]
- else [ 'unknown', nil ]
- end
- when Gem::Platform then
- @cpu = arch.cpu
- @os = arch.os
- @version = arch.version
- else
- raise ArgumentError, "invalid argument #{arch.inspect}"
- end
- end
-
- def inspect
- "#<%s:0x%x @cpu=%p, @os=%p, @version=%p>" % [self.class, object_id, *to_a]
- end
-
- def to_a
- [@cpu, @os, @version]
- end
-
- def to_s
- to_a.compact.join '-'
- end
-
- def empty?
- to_s.empty?
- end
-
- ##
- # Is +other+ equal to this platform? Two platforms are equal if they have
- # the same CPU, OS and version.
-
- def ==(other)
- self.class === other and
- @cpu == other.cpu and @os == other.os and @version == other.version
- end
-
- ##
- # Does +other+ match this platform? Two platforms match if they have the
- # same CPU, or either has a CPU of 'universal', they have the same OS, and
- # they have the same version, or either has no version.
-
- def ===(other)
- return nil unless Gem::Platform === other
-
- # cpu
- (@cpu == 'universal' or other.cpu == 'universal' or @cpu == other.cpu) and
-
- # os
- @os == other.os and
-
- # version
- (@version.nil? or other.version.nil? or @version == other.version)
- end
-
- ##
- # Does +other+ match this platform? If +other+ is a String it will be
- # converted to a Gem::Platform first. See #=== for matching rules.
-
- def =~(other)
- case other
- when Gem::Platform then # nop
- when String then
- # This data is from http://gems.rubyforge.org/gems/yaml on 19 Aug 2007
- other = case other
- when /^i686-darwin(\d)/ then ['x86', 'darwin', $1 ]
- when /^i\d86-linux/ then ['x86', 'linux', nil ]
- when 'java', 'jruby' then [nil, 'java', nil ]
- when /mswin32(\_(\d+))?/ then ['x86', 'mswin32', $2 ]
- when 'powerpc-darwin' then ['powerpc', 'darwin', nil ]
- when /powerpc-darwin(\d)/ then ['powerpc', 'darwin', $1 ]
- when /sparc-solaris2.8/ then ['sparc', 'solaris', '2.8' ]
- when /universal-darwin(\d)/ then ['universal', 'darwin', $1 ]
- else other
- end
-
- other = Gem::Platform.new other
- else
- return nil
- end
-
- self === other
- end
-
- ##
- # A pure-ruby gem that may use Gem::Specification#extensions to build
- # binary files.
-
- RUBY = 'ruby'
-
- ##
- # A platform-specific gem that is built for the packaging ruby's platform.
- # This will be replaced with Gem::Platform::local.
-
- CURRENT = 'current'
-
-end
-
diff --git a/lib/rubygems/remote_fetcher.rb b/lib/rubygems/remote_fetcher.rb
deleted file mode 100644
index 945523e5b0..0000000000
--- a/lib/rubygems/remote_fetcher.rb
+++ /dev/null
@@ -1,367 +0,0 @@
-require 'net/http'
-require 'stringio'
-require 'time'
-require 'uri'
-
-require 'rubygems'
-
-##
-# RemoteFetcher handles the details of fetching gems and gem information from
-# a remote source.
-
-class Gem::RemoteFetcher
-
- include Gem::UserInteraction
-
- ##
- # A FetchError exception wraps up the various possible IO and HTTP failures
- # that could happen while downloading from the internet.
-
- class FetchError < Gem::Exception
-
- ##
- # The URI which was being accessed when the exception happened.
-
- attr_accessor :uri
-
- def initialize(message, uri)
- super message
- @uri = uri
- end
-
- def to_s # :nodoc:
- "#{super} (#{uri})"
- end
-
- end
-
- @fetcher = nil
-
- ##
- # Cached RemoteFetcher instance.
-
- def self.fetcher
- @fetcher ||= self.new Gem.configuration[:http_proxy]
- end
-
- ##
- # Initialize a remote fetcher using the source URI and possible proxy
- # information.
- #
- # +proxy+
- # * [String]: explicit specification of proxy; overrides any environment
- # variable setting
- # * nil: respect environment variables (HTTP_PROXY, HTTP_PROXY_USER,
- # HTTP_PROXY_PASS)
- # * <tt>:no_proxy</tt>: ignore environment variables and _don't_ use a proxy
-
- def initialize(proxy = nil)
- Socket.do_not_reverse_lookup = true
-
- @connections = {}
- @requests = Hash.new 0
- @proxy_uri =
- case proxy
- when :no_proxy then nil
- when nil then get_proxy_from_env
- when URI::HTTP then proxy
- else URI.parse(proxy)
- end
- end
-
- ##
- # Moves the gem +spec+ from +source_uri+ to the cache dir unless it is
- # already there. If the source_uri is local the gem cache dir copy is
- # always replaced.
-
- def download(spec, source_uri, install_dir = Gem.dir)
- if File.writable?(install_dir)
- cache_dir = File.join install_dir, 'cache'
- else
- cache_dir = File.join(Gem.user_dir, 'cache')
- end
-
- gem_file_name = "#{spec.full_name}.gem"
- local_gem_path = File.join cache_dir, gem_file_name
-
- FileUtils.mkdir_p cache_dir rescue nil unless File.exist? cache_dir
-
- # Always escape URI's to deal with potential spaces and such
- unless URI::Generic === source_uri
- source_uri = URI.parse(URI.escape(source_uri))
- end
-
- scheme = source_uri.scheme
-
- # URI.parse gets confused by MS Windows paths with forward slashes.
- scheme = nil if scheme =~ /^[a-z]$/i
-
- case scheme
- when 'http', 'https' then
- unless File.exist? local_gem_path then
- begin
- say "Downloading gem #{gem_file_name}" if
- Gem.configuration.really_verbose
-
- remote_gem_path = source_uri + "gems/#{gem_file_name}"
-
- gem = self.fetch_path remote_gem_path
- rescue Gem::RemoteFetcher::FetchError
- raise if spec.original_platform == spec.platform
-
- alternate_name = "#{spec.original_name}.gem"
-
- say "Failed, downloading gem #{alternate_name}" if
- Gem.configuration.really_verbose
-
- remote_gem_path = source_uri + "gems/#{alternate_name}"
-
- gem = self.fetch_path remote_gem_path
- end
-
- File.open local_gem_path, 'wb' do |fp|
- fp.write gem
- end
- end
- when 'file' then
- begin
- path = source_uri.path
- path = File.dirname(path) if File.extname(path) == '.gem'
-
- remote_gem_path = File.join(path, 'gems', gem_file_name)
-
- FileUtils.cp(remote_gem_path, local_gem_path)
- rescue Errno::EACCES
- local_gem_path = source_uri.to_s
- end
-
- say "Using local gem #{local_gem_path}" if
- Gem.configuration.really_verbose
- when nil then # TODO test for local overriding cache
- begin
- if Gem.win_platform? && source_uri.scheme && !source_uri.path.include?(':')
- FileUtils.cp URI.unescape(source_uri.scheme + ':' + source_uri.path), local_gem_path
- else
- FileUtils.cp URI.unescape(source_uri.path), local_gem_path
- end
- rescue Errno::EACCES
- local_gem_path = source_uri.to_s
- end
-
- say "Using local gem #{local_gem_path}" if
- Gem.configuration.really_verbose
- else
- raise Gem::InstallError, "unsupported URI scheme #{source_uri.scheme}"
- end
-
- local_gem_path
- end
-
- ##
- # Downloads +uri+ and returns it as a String.
-
- def fetch_path(uri, mtime = nil, head = false)
- data = open_uri_or_path uri, mtime, head
- data = Gem.gunzip data if data and not head and uri.to_s =~ /gz$/
- data
- rescue FetchError
- raise
- rescue Timeout::Error
- raise FetchError.new('timed out', uri)
- rescue IOError, SocketError, SystemCallError => e
- raise FetchError.new("#{e.class}: #{e}", uri)
- end
-
- ##
- # Returns the size of +uri+ in bytes.
-
- def fetch_size(uri) # TODO: phase this out
- response = fetch_path(uri, nil, true)
-
- response['content-length'].to_i
- end
-
- def escape(str)
- return unless str
- URI.escape(str)
- end
-
- def unescape(str)
- return unless str
- URI.unescape(str)
- end
-
- ##
- # Returns an HTTP proxy URI if one is set in the environment variables.
-
- def get_proxy_from_env
- env_proxy = ENV['http_proxy'] || ENV['HTTP_PROXY']
-
- return nil if env_proxy.nil? or env_proxy.empty?
-
- uri = URI.parse(normalize_uri(env_proxy))
-
- if uri and uri.user.nil? and uri.password.nil? then
- # Probably we have http_proxy_* variables?
- uri.user = escape(ENV['http_proxy_user'] || ENV['HTTP_PROXY_USER'])
- uri.password = escape(ENV['http_proxy_pass'] || ENV['HTTP_PROXY_PASS'])
- end
-
- uri
- end
-
- ##
- # Normalize the URI by adding "http://" if it is missing.
-
- def normalize_uri(uri)
- (uri =~ /^(https?|ftp|file):/) ? uri : "http://#{uri}"
- end
-
- ##
- # Creates or an HTTP connection based on +uri+, or retrieves an existing
- # connection, using a proxy if needed.
-
- def connection_for(uri)
- net_http_args = [uri.host, uri.port]
-
- if @proxy_uri then
- net_http_args += [
- @proxy_uri.host,
- @proxy_uri.port,
- @proxy_uri.user,
- @proxy_uri.password
- ]
- end
-
- connection_id = net_http_args.join ':'
- @connections[connection_id] ||= Net::HTTP.new(*net_http_args)
- connection = @connections[connection_id]
-
- if uri.scheme == 'https' and not connection.started? then
- require 'net/https'
- connection.use_ssl = true
- connection.verify_mode = OpenSSL::SSL::VERIFY_NONE
- end
-
- connection.start unless connection.started?
-
- connection
- end
-
- ##
- # Read the data from the (source based) URI, but if it is a file:// URI,
- # read from the filesystem instead.
-
- def open_uri_or_path(uri, last_modified = nil, head = false, depth = 0)
- raise "block is dead" if block_given?
-
- uri = URI.parse uri unless URI::Generic === uri
-
- # This check is redundant unless Gem::RemoteFetcher is likely
- # to be used directly, since the scheme is checked elsewhere.
- # - Daniel Berger
- unless ['http', 'https', 'file'].include?(uri.scheme)
- raise ArgumentError, 'uri scheme is invalid'
- end
-
- if uri.scheme == 'file'
- path = uri.path
-
- # Deal with leading slash on Windows paths
- if path[0].chr == '/' && path[1].chr =~ /[a-zA-Z]/ && path[2].chr == ':'
- path = path[1..-1]
- end
-
- return Gem.read_binary(path)
- end
-
- fetch_type = head ? Net::HTTP::Head : Net::HTTP::Get
- response = request uri, fetch_type, last_modified
-
- case response
- when Net::HTTPOK, Net::HTTPNotModified then
- head ? response : response.body
- when Net::HTTPMovedPermanently, Net::HTTPFound, Net::HTTPSeeOther,
- Net::HTTPTemporaryRedirect then
- raise FetchError.new('too many redirects', uri) if depth > 10
-
- open_uri_or_path(response['Location'], last_modified, head, depth + 1)
- else
- raise FetchError.new("bad response #{response.message} #{response.code}", uri)
- end
- end
-
- ##
- # Performs a Net::HTTP request of type +request_class+ on +uri+ returning
- # a Net::HTTP response object. request maintains a table of persistent
- # connections to reduce connect overhead.
-
- def request(uri, request_class, last_modified = nil)
- request = request_class.new uri.request_uri
-
- unless uri.nil? || uri.user.nil? || uri.user.empty? then
- request.basic_auth uri.user, uri.password
- end
-
- ua = "RubyGems/#{Gem::RubyGemsVersion} #{Gem::Platform.local}"
- ua << " Ruby/#{RUBY_VERSION} (#{RUBY_RELEASE_DATE}"
- ua << " patchlevel #{RUBY_PATCHLEVEL}" if defined? RUBY_PATCHLEVEL
- ua << ")"
-
- request.add_field 'User-Agent', ua
- request.add_field 'Connection', 'keep-alive'
- request.add_field 'Keep-Alive', '30'
-
- if last_modified then
- last_modified = last_modified.utc
- request.add_field 'If-Modified-Since', last_modified.rfc2822
- end
-
- connection = connection_for uri
-
- retried = false
- bad_response = false
-
- begin
- @requests[connection.object_id] += 1
- response = connection.request request
- say "#{request.method} #{response.code} #{response.message}: #{uri}" if
- Gem.configuration.really_verbose
- rescue Net::HTTPBadResponse
- reset connection
-
- raise FetchError.new('too many bad responses', uri) if bad_response
-
- bad_response = true
- retry
- # HACK work around EOFError bug in Net::HTTP
- # NOTE Errno::ECONNABORTED raised a lot on Windows, and make impossible
- # to install gems.
- rescue EOFError, Errno::ECONNABORTED, Errno::ECONNRESET
- requests = @requests[connection.object_id]
- say "connection reset after #{requests} requests, retrying" if
- Gem.configuration.really_verbose
-
- raise FetchError.new('too many connection resets', uri) if retried
-
- reset connection
-
- retried = true
- retry
- end
-
- response
- end
-
- ##
- # Resets HTTP connection +connection+.
-
- def reset(connection)
- @requests.delete connection.object_id
-
- connection.finish
- connection.start
- end
-
-end
-
diff --git a/lib/rubygems/require_paths_builder.rb b/lib/rubygems/require_paths_builder.rb
deleted file mode 100644
index a77818603b..0000000000
--- a/lib/rubygems/require_paths_builder.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-require 'rubygems'
-
-module Gem::RequirePathsBuilder
- def write_require_paths_file_if_needed(spec = @spec, gem_home = @gem_home)
- return if spec.require_paths == ["lib"] &&
- (spec.bindir.nil? || spec.bindir == "bin")
- file_name = File.join(gem_home, 'gems', "#{@spec.full_name}", ".require_paths")
- file_name.untaint
- File.open(file_name, "w") do |file|
- spec.require_paths.each do |path|
- file.puts path
- end
- file.puts spec.bindir if spec.bindir
- end
- end
-end
-
diff --git a/lib/rubygems/requirement.rb b/lib/rubygems/requirement.rb
deleted file mode 100644
index 471d84eb61..0000000000
--- a/lib/rubygems/requirement.rb
+++ /dev/null
@@ -1,170 +0,0 @@
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-##
-# Requirement version includes a prefaced comparator in addition
-# to a version number.
-#
-# A Requirement object can actually contain multiple, er,
-# requirements, as in (> 1.2, < 2.0).
-
-class Gem::Requirement
-
- include Comparable
-
- attr_reader :requirements
-
- OPS = {
- "=" => lambda { |v, r| v == r },
- "!=" => lambda { |v, r| v != r },
- ">" => lambda { |v, r| v > r },
- "<" => lambda { |v, r| v < r },
- ">=" => lambda { |v, r| v >= r },
- "<=" => lambda { |v, r| v <= r },
- "~>" => lambda { |v, r| v = v.release; v >= r && v < r.bump }
- }
-
- OP_RE = OPS.keys.map{ |k| Regexp.quote k }.join '|'
-
- ##
- # Factory method to create a Gem::Requirement object. Input may be a
- # Version, a String, or nil. Intended to simplify client code.
- #
- # If the input is "weird", the default version requirement is returned.
-
- def self.create(input)
- case input
- when Gem::Requirement then
- input
- when Gem::Version, Array then
- new input
- else
- if input.respond_to? :to_str then
- self.new [input.to_str]
- else
- self.default
- end
- end
- end
-
- ##
- # A default "version requirement" can surely _only_ be '>= 0'.
- #--
- # This comment once said:
- #
- # "A default "version requirement" can surely _only_ be '> 0'."
-
- def self.default
- self.new ['>= 0']
- end
-
- ##
- # Constructs a Requirement from +requirements+ which can be a String, a
- # Gem::Version, or an Array of those. See #parse for details on the
- # formatting of requirement strings.
-
- def initialize(requirements)
- @requirements = case requirements
- when Array then
- requirements.map do |requirement|
- parse(requirement)
- end
- else
- [parse(requirements)]
- end
- @version = nil # Avoid warnings.
- end
-
- ##
- # Marshal raw requirements, rather than the full object
-
- def marshal_dump # :nodoc:
- [@requirements]
- end
-
- ##
- # Load custom marshal format
-
- def marshal_load(array) # :nodoc:
- @requirements = array[0]
- @version = nil
- end
-
- def to_s # :nodoc:
- as_list.join(", ")
- end
-
- def pretty_print(q) # :nodoc:
- q.group 1, 'Gem::Requirement.new(', ')' do
- q.pp as_list
- end
- end
-
- def as_list
- normalize
- @requirements.map do |op, version| "#{op} #{version}" end
- end
-
- def normalize
- return if not defined? @version or @version.nil?
- @requirements = [parse(@version)]
- @nums = nil
- @version = nil
- @op = nil
- end
-
- ##
- # True if this requirement satisfied by the Gem::Version +version+.
-
- def satisfied_by?(version)
- normalize
- @requirements.all? { |op, rv| satisfy?(op, version, rv) }
- end
-
- ##
- # Is "+version+ +op+ +required_version+" satisfied?
-
- def satisfy?(op, version, required_version)
- OPS[op].call(version, required_version)
- end
-
- def prerelease?
- # TODO: why is @requirements a nested array?
- @requirements.any?{ |r| r[1].prerelease? }
- end
-
- ##
- # Parse the version requirement obj returning the operator and version.
- #
- # The requirement can be a String or a Gem::Version. A String can be an
- # operator (<, <=, =, >=, >, !=, ~>), a version number, or both, operator
- # first.
-
- def parse(obj)
- case obj
- when /^\s*(#{OP_RE})\s*(#{Gem::Version::VERSION_PATTERN})\s*$/o then
- [$1, Gem::Version.new($2)]
- when /^\s*(#{Gem::Version::VERSION_PATTERN})\s*$/o then
- ['=', Gem::Version.new($1)]
- when /^\s*(#{OP_RE})\s*$/o then
- [$1, Gem::Version.new('0')]
- when Gem::Version then
- ['=', obj]
- else
- fail ArgumentError, "Illformed requirement [#{obj.inspect}]"
- end
- end
-
- def <=>(other) # :nodoc:
- to_s <=> other.to_s
- end
-
- def hash # :nodoc:
- to_s.hash
- end
-
-end
-
diff --git a/lib/rubygems/rubygems_version.rb b/lib/rubygems/rubygems_version.rb
deleted file mode 100644
index eda0a0e906..0000000000
--- a/lib/rubygems/rubygems_version.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-#--
-# DO NOT EDIT
-# This file is auto-generated by build scripts.
-# See: rake update_version
-#++
-
-module Gem
-
- ##
- # The version of RubyGems you are using
-
- RubyGemsVersion = '1.3.4'
-
- ##
- # The version of RubyGems you are using (duplicated for familiarity)
-
- VERSION = RubyGemsVersion
-
-end
diff --git a/lib/rubygems/security.rb b/lib/rubygems/security.rb
deleted file mode 100644
index abf3cf4a6a..0000000000
--- a/lib/rubygems/security.rb
+++ /dev/null
@@ -1,786 +0,0 @@
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-require 'rubygems'
-require 'rubygems/gem_openssl'
-
-# = Signed Gems README
-#
-# == Table of Contents
-# * Overview
-# * Walkthrough
-# * Command-Line Options
-# * OpenSSL Reference
-# * Bugs/TODO
-# * About the Author
-#
-# == Overview
-#
-# Gem::Security implements cryptographic signatures in RubyGems. The section
-# below is a step-by-step guide to using signed gems and generating your own.
-#
-# == Walkthrough
-#
-# In order to start signing your gems, you'll need to build a private key and
-# a self-signed certificate. Here's how:
-#
-# # build a private key and certificate for gemmaster@example.com
-# $ gem cert --build gemmaster@example.com
-#
-# This could take anywhere from 5 seconds to 10 minutes, depending on the
-# speed of your computer (public key algorithms aren't exactly the speediest
-# crypto algorithms in the world). When it's finished, you'll see the files
-# "gem-private_key.pem" and "gem-public_cert.pem" in the current directory.
-#
-# First things first: take the "gem-private_key.pem" file and move it
-# somewhere private, preferably a directory only you have access to, a floppy
-# (yuck!), a CD-ROM, or something comparably secure. Keep your private key
-# hidden; if it's compromised, someone can sign packages as you (note: PKI has
-# ways of mitigating the risk of stolen keys; more on that later).
-#
-# Now, let's sign an existing gem. I'll be using my Imlib2-Ruby bindings, but
-# you can use whatever gem you'd like. Open up your existing gemspec file and
-# add the following lines:
-#
-# # signing key and certificate chain
-# s.signing_key = '/mnt/floppy/gem-private_key.pem'
-# s.cert_chain = ['gem-public_cert.pem']
-#
-# (Be sure to replace "/mnt/floppy" with the ultra-secret path to your private
-# key).
-#
-# After that, go ahead and build your gem as usual. Congratulations, you've
-# just built your first signed gem! If you peek inside your gem file, you'll
-# see a couple of new files have been added:
-#
-# $ tar tf tar tf Imlib2-Ruby-0.5.0.gem
-# data.tar.gz
-# data.tar.gz.sig
-# metadata.gz
-# metadata.gz.sig
-#
-# Now let's verify the signature. Go ahead and install the gem, but add the
-# following options: "-P HighSecurity", like this:
-#
-# # install the gem with using the security policy "HighSecurity"
-# $ sudo gem install Imlib2-Ruby-0.5.0.gem -P HighSecurity
-#
-# The -P option sets your security policy -- we'll talk about that in just a
-# minute. Eh, what's this?
-#
-# Attempting local installation of 'Imlib2-Ruby-0.5.0.gem'
-# ERROR: Error installing gem Imlib2-Ruby-0.5.0.gem[.gem]: Couldn't
-# verify data signature: Untrusted Signing Chain Root: cert =
-# '/CN=gemmaster/DC=example/DC=com', error = 'path
-# "/root/.rubygems/trust/cert-15dbb43a6edf6a70a85d4e784e2e45312cff7030.pem"
-# does not exist'
-#
-# The culprit here is the security policy. RubyGems has several different
-# security policies. Let's take a short break and go over the security
-# policies. Here's a list of the available security policies, and a brief
-# description of each one:
-#
-# * NoSecurity - Well, no security at all. Signed packages are treated like
-# unsigned packages.
-# * LowSecurity - Pretty much no security. If a package is signed then
-# RubyGems will make sure the signature matches the signing
-# certificate, and that the signing certificate hasn't expired, but
-# that's it. A malicious user could easily circumvent this kind of
-# security.
-# * MediumSecurity - Better than LowSecurity and NoSecurity, but still
-# fallible. Package contents are verified against the signing
-# certificate, and the signing certificate is checked for validity,
-# and checked against the rest of the certificate chain (if you don't
-# know what a certificate chain is, stay tuned, we'll get to that).
-# The biggest improvement over LowSecurity is that MediumSecurity
-# won't install packages that are signed by untrusted sources.
-# Unfortunately, MediumSecurity still isn't totally secure -- a
-# malicious user can still unpack the gem, strip the signatures, and
-# distribute the gem unsigned.
-# * HighSecurity - Here's the bugger that got us into this mess.
-# The HighSecurity policy is identical to the MediumSecurity policy,
-# except that it does not allow unsigned gems. A malicious user
-# doesn't have a whole lot of options here; he can't modify the
-# package contents without invalidating the signature, and he can't
-# modify or remove signature or the signing certificate chain, or
-# RubyGems will simply refuse to install the package. Oh well, maybe
-# he'll have better luck causing problems for CPAN users instead :).
-#
-# So, the reason RubyGems refused to install our shiny new signed gem was
-# because it was from an untrusted source. Well, my code is infallible
-# (hah!), so I'm going to add myself as a trusted source.
-#
-# Here's how:
-#
-# # add trusted certificate
-# gem cert --add gem-public_cert.pem
-#
-# I've added my public certificate as a trusted source. Now I can install
-# packages signed my private key without any hassle. Let's try the install
-# command above again:
-#
-# # install the gem with using the HighSecurity policy (and this time
-# # without any shenanigans)
-# $ sudo gem install Imlib2-Ruby-0.5.0.gem -P HighSecurity
-#
-# This time RubyGems should accept your signed package and begin installing.
-# While you're waiting for RubyGems to work it's magic, have a look at some of
-# the other security commands:
-#
-# Usage: gem cert [options]
-#
-# Options:
-# -a, --add CERT Add a trusted certificate.
-# -l, --list List trusted certificates.
-# -r, --remove STRING Remove trusted certificates containing STRING.
-# -b, --build EMAIL_ADDR Build private key and self-signed certificate
-# for EMAIL_ADDR.
-# -C, --certificate CERT Certificate for --sign command.
-# -K, --private-key KEY Private key for --sign command.
-# -s, --sign NEWCERT Sign a certificate with my key and certificate.
-#
-# (By the way, you can pull up this list any time you'd like by typing "gem
-# cert --help")
-#
-# Hmm. We've already covered the "--build" option, and the "--add", "--list",
-# and "--remove" commands seem fairly straightforward; they allow you to add,
-# list, and remove the certificates in your trusted certificate list. But
-# what's with this "--sign" option?
-#
-# To answer that question, let's take a look at "certificate chains", a
-# concept I mentioned earlier. There are a couple of problems with
-# self-signed certificates: first of all, self-signed certificates don't offer
-# a whole lot of security. Sure, the certificate says Yukihiro Matsumoto, but
-# how do I know it was actually generated and signed by matz himself unless he
-# gave me the certificate in person?
-#
-# The second problem is scalability. Sure, if there are 50 gem authors, then
-# I have 50 trusted certificates, no problem. What if there are 500 gem
-# authors? 1000? Having to constantly add new trusted certificates is a
-# pain, and it actually makes the trust system less secure by encouraging
-# RubyGems users to blindly trust new certificates.
-#
-# Here's where certificate chains come in. A certificate chain establishes an
-# arbitrarily long chain of trust between an issuing certificate and a child
-# certificate. So instead of trusting certificates on a per-developer basis,
-# we use the PKI concept of certificate chains to build a logical hierarchy of
-# trust. Here's a hypothetical example of a trust hierarchy based (roughly)
-# on geography:
-#
-#
-# --------------------------
-# | rubygems@rubyforge.org |
-# --------------------------
-# |
-# -----------------------------------
-# | |
-# ---------------------------- -----------------------------
-# | seattle.rb@zenspider.com | | dcrubyists@richkilmer.com |
-# ---------------------------- -----------------------------
-# | | | |
-# --------------- ---------------- ----------- --------------
-# | alf@seattle | | bob@portland | | pabs@dc | | tomcope@dc |
-# --------------- ---------------- ----------- --------------
-#
-#
-# Now, rather than having 4 trusted certificates (one for alf@seattle,
-# bob@portland, pabs@dc, and tomecope@dc), a user could actually get by with 1
-# certificate: the "rubygems@rubyforge.org" certificate. Here's how it works:
-#
-# I install "Alf2000-Ruby-0.1.0.gem", a package signed by "alf@seattle". I've
-# never heard of "alf@seattle", but his certificate has a valid signature from
-# the "seattle.rb@zenspider.com" certificate, which in turn has a valid
-# signature from the "rubygems@rubyforge.org" certificate. Voila! At this
-# point, it's much more reasonable for me to trust a package signed by
-# "alf@seattle", because I can establish a chain to "rubygems@rubyforge.org",
-# which I do trust.
-#
-# And the "--sign" option allows all this to happen. A developer creates
-# their build certificate with the "--build" option, then has their
-# certificate signed by taking it with them to their next regional Ruby meetup
-# (in our hypothetical example), and it's signed there by the person holding
-# the regional RubyGems signing certificate, which is signed at the next
-# RubyConf by the holder of the top-level RubyGems certificate. At each point
-# the issuer runs the same command:
-#
-# # sign a certificate with the specified key and certificate
-# # (note that this modifies client_cert.pem!)
-# $ gem cert -K /mnt/floppy/issuer-priv_key.pem -C issuer-pub_cert.pem
-# --sign client_cert.pem
-#
-# Then the holder of issued certificate (in this case, our buddy
-# "alf@seattle"), can start using this signed certificate to sign RubyGems.
-# By the way, in order to let everyone else know about his new fancy signed
-# certificate, "alf@seattle" would change his gemspec file to look like this:
-#
-# # signing key (still kept in an undisclosed location!)
-# s.signing_key = '/mnt/floppy/alf-private_key.pem'
-#
-# # certificate chain (includes the issuer certificate now too)
-# s.cert_chain = ['/home/alf/doc/seattlerb-public_cert.pem',
-# '/home/alf/doc/alf_at_seattle-public_cert.pem']
-#
-# Obviously, this RubyGems trust infrastructure doesn't exist yet. Also, in
-# the "real world" issuers actually generate the child certificate from a
-# certificate request, rather than sign an existing certificate. And our
-# hypothetical infrastructure is missing a certificate revocation system.
-# These are that can be fixed in the future...
-#
-# I'm sure your new signed gem has finished installing by now (unless you're
-# installing rails and all it's dependencies, that is ;D). At this point you
-# should know how to do all of these new and interesting things:
-#
-# * build a gem signing key and certificate
-# * modify your existing gems to support signing
-# * adjust your security policy
-# * modify your trusted certificate list
-# * sign a certificate
-#
-# If you've got any questions, feel free to contact me at the email address
-# below. The next couple of sections
-#
-#
-# == Command-Line Options
-#
-# Here's a brief summary of the certificate-related command line options:
-#
-# gem install
-# -P, --trust-policy POLICY Specify gem trust policy.
-#
-# gem cert
-# -a, --add CERT Add a trusted certificate.
-# -l, --list List trusted certificates.
-# -r, --remove STRING Remove trusted certificates containing
-# STRING.
-# -b, --build EMAIL_ADDR Build private key and self-signed
-# certificate for EMAIL_ADDR.
-# -C, --certificate CERT Certificate for --sign command.
-# -K, --private-key KEY Private key for --sign command.
-# -s, --sign NEWCERT Sign a certificate with my key and
-# certificate.
-#
-# A more detailed description of each options is available in the walkthrough
-# above.
-#
-#
-# == OpenSSL Reference
-#
-# The .pem files generated by --build and --sign are just basic OpenSSL PEM
-# files. Here's a couple of useful commands for manipulating them:
-#
-# # convert a PEM format X509 certificate into DER format:
-# # (note: Windows .cer files are X509 certificates in DER format)
-# $ openssl x509 -in input.pem -outform der -out output.der
-#
-# # print out the certificate in a human-readable format:
-# $ openssl x509 -in input.pem -noout -text
-#
-# And you can do the same thing with the private key file as well:
-#
-# # convert a PEM format RSA key into DER format:
-# $ openssl rsa -in input_key.pem -outform der -out output_key.der
-#
-# # print out the key in a human readable format:
-# $ openssl rsa -in input_key.pem -noout -text
-#
-# == Bugs/TODO
-#
-# * There's no way to define a system-wide trust list.
-# * custom security policies (from a YAML file, etc)
-# * Simple method to generate a signed certificate request
-# * Support for OCSP, SCVP, CRLs, or some other form of cert
-# status check (list is in order of preference)
-# * Support for encrypted private keys
-# * Some sort of semi-formal trust hierarchy (see long-winded explanation
-# above)
-# * Path discovery (for gem certificate chains that don't have a self-signed
-# root) -- by the way, since we don't have this, THE ROOT OF THE CERTIFICATE
-# CHAIN MUST BE SELF SIGNED if Policy#verify_root is true (and it is for the
-# MediumSecurity and HighSecurity policies)
-# * Better explanation of X509 naming (ie, we don't have to use email
-# addresses)
-# * Possible alternate signing mechanisms (eg, via PGP). this could be done
-# pretty easily by adding a :signing_type attribute to the gemspec, then add
-# the necessary support in other places
-# * Honor AIA field (see note about OCSP above)
-# * Maybe honor restriction extensions?
-# * Might be better to store the certificate chain as a PKCS#7 or PKCS#12
-# file, instead of an array embedded in the metadata. ideas?
-# * Possibly embed signature and key algorithms into metadata (right now
-# they're assumed to be the same as what's set in Gem::Security::OPT)
-#
-# == About the Author
-#
-# Paul Duncan <pabs@pablotron.org>
-# http://pablotron.org/
-
-module Gem::Security
-
- class Exception < Gem::Exception; end
-
- #
- # default options for most of the methods below
- #
- OPT = {
- # private key options
- :key_algo => Gem::SSL::PKEY_RSA,
- :key_size => 2048,
-
- # public cert options
- :cert_age => 365 * 24 * 3600, # 1 year
- :dgst_algo => Gem::SSL::DIGEST_SHA1,
-
- # x509 certificate extensions
- :cert_exts => {
- 'basicConstraints' => 'CA:FALSE',
- 'subjectKeyIdentifier' => 'hash',
- 'keyUsage' => 'keyEncipherment,dataEncipherment,digitalSignature',
- },
-
- # save the key and cert to a file in build_self_signed_cert()?
- :save_key => true,
- :save_cert => true,
-
- # if you define either of these, then they'll be used instead of
- # the output_fmt macro below
- :save_key_path => nil,
- :save_cert_path => nil,
-
- # output name format for self-signed certs
- :output_fmt => 'gem-%s.pem',
- :munge_re => Regexp.new(/[^a-z0-9_.-]+/),
-
- # output directory for trusted certificate checksums
- :trust_dir => File::join(Gem.user_home, '.gem', 'trust'),
-
- # default permissions for trust directory and certs
- :perms => {
- :trust_dir => 0700,
- :trusted_cert => 0600,
- :signing_cert => 0600,
- :signing_key => 0600,
- },
- }
-
- #
- # A Gem::Security::Policy object encapsulates the settings for verifying
- # signed gem files. This is the base class. You can either declare an
- # instance of this or use one of the preset security policies below.
- #
- class Policy
- attr_accessor :verify_data, :verify_signer, :verify_chain,
- :verify_root, :only_trusted, :only_signed
-
- #
- # Create a new Gem::Security::Policy object with the given mode and
- # options.
- #
- def initialize(policy = {}, opt = {})
- # set options
- @opt = Gem::Security::OPT.merge(opt)
-
- # build policy
- policy.each_pair do |key, val|
- case key
- when :verify_data then @verify_data = val
- when :verify_signer then @verify_signer = val
- when :verify_chain then @verify_chain = val
- when :verify_root then @verify_root = val
- when :only_trusted then @only_trusted = val
- when :only_signed then @only_signed = val
- end
- end
- end
-
- #
- # Get the path to the file for this cert.
- #
- def self.trusted_cert_path(cert, opt = {})
- opt = Gem::Security::OPT.merge(opt)
-
- # get digest algorithm, calculate checksum of root.subject
- algo = opt[:dgst_algo]
- dgst = algo.hexdigest(cert.subject.to_s)
-
- # build path to trusted cert file
- name = "cert-#{dgst}.pem"
-
- # join and return path components
- File::join(opt[:trust_dir], name)
- end
-
- #
- # Verify that the gem data with the given signature and signing chain
- # matched this security policy at the specified time.
- #
- def verify_gem(signature, data, chain, time = Time.now)
- Gem.ensure_ssl_available
- cert_class = OpenSSL::X509::Certificate
- exc = Gem::Security::Exception
- chain ||= []
-
- chain = chain.map{ |str| cert_class.new(str) }
- signer, ch_len = chain[-1], chain.size
-
- # make sure signature is valid
- if @verify_data
- # get digest algorithm (TODO: this should be configurable)
- dgst = @opt[:dgst_algo]
-
- # verify the data signature (this is the most important part, so don't
- # screw it up :D)
- v = signer.public_key.verify(dgst.new, signature, data)
- raise exc, "Invalid Gem Signature" unless v
-
- # make sure the signer is valid
- if @verify_signer
- # make sure the signing cert is valid right now
- v = signer.check_validity(nil, time)
- raise exc, "Invalid Signature: #{v[:desc]}" unless v[:is_valid]
- end
- end
-
- # make sure the certificate chain is valid
- if @verify_chain
- # iterate down over the chain and verify each certificate against it's
- # issuer
- (ch_len - 1).downto(1) do |i|
- issuer, cert = chain[i - 1, 2]
- v = cert.check_validity(issuer, time)
- raise exc, "%s: cert = '%s', error = '%s'" % [
- 'Invalid Signing Chain', cert.subject, v[:desc]
- ] unless v[:is_valid]
- end
-
- # verify root of chain
- if @verify_root
- # make sure root is self-signed
- root = chain[0]
- raise exc, "%s: %s (subject = '%s', issuer = '%s')" % [
- 'Invalid Signing Chain Root',
- 'Subject does not match Issuer for Gem Signing Chain',
- root.subject.to_s,
- root.issuer.to_s,
- ] unless root.issuer.to_s == root.subject.to_s
-
- # make sure root is valid
- v = root.check_validity(root, time)
- raise exc, "%s: cert = '%s', error = '%s'" % [
- 'Invalid Signing Chain Root', root.subject, v[:desc]
- ] unless v[:is_valid]
-
- # verify that the chain root is trusted
- if @only_trusted
- # get digest algorithm, calculate checksum of root.subject
- algo = @opt[:dgst_algo]
- path = Gem::Security::Policy.trusted_cert_path(root, @opt)
-
- # check to make sure trusted path exists
- raise exc, "%s: cert = '%s', error = '%s'" % [
- 'Untrusted Signing Chain Root',
- root.subject.to_s,
- "path \"#{path}\" does not exist",
- ] unless File.exist?(path)
-
- # load calculate digest from saved cert file
- save_cert = OpenSSL::X509::Certificate.new(File.read(path))
- save_dgst = algo.digest(save_cert.public_key.to_s)
-
- # create digest of public key
- pkey_str = root.public_key.to_s
- cert_dgst = algo.digest(pkey_str)
-
- # now compare the two digests, raise exception
- # if they don't match
- raise exc, "%s: %s (saved = '%s', root = '%s')" % [
- 'Invalid Signing Chain Root',
- "Saved checksum doesn't match root checksum",
- save_dgst, cert_dgst,
- ] unless save_dgst == cert_dgst
- end
- end
-
- # return the signing chain
- chain.map { |cert| cert.subject }
- end
- end
- end
-
- #
- # No security policy: all package signature checks are disabled.
- #
- NoSecurity = Policy.new(
- :verify_data => false,
- :verify_signer => false,
- :verify_chain => false,
- :verify_root => false,
- :only_trusted => false,
- :only_signed => false
- )
-
- #
- # AlmostNo security policy: only verify that the signing certificate is the
- # one that actually signed the data. Make no attempt to verify the signing
- # certificate chain.
- #
- # This policy is basically useless. better than nothing, but can still be
- # easily spoofed, and is not recommended.
- #
- AlmostNoSecurity = Policy.new(
- :verify_data => true,
- :verify_signer => false,
- :verify_chain => false,
- :verify_root => false,
- :only_trusted => false,
- :only_signed => false
- )
-
- #
- # Low security policy: only verify that the signing certificate is actually
- # the gem signer, and that the signing certificate is valid.
- #
- # This policy is better than nothing, but can still be easily spoofed, and
- # is not recommended.
- #
- LowSecurity = Policy.new(
- :verify_data => true,
- :verify_signer => true,
- :verify_chain => false,
- :verify_root => false,
- :only_trusted => false,
- :only_signed => false
- )
-
- #
- # Medium security policy: verify the signing certificate, verify the signing
- # certificate chain all the way to the root certificate, and only trust root
- # certificates that we have explicitly allowed trust for.
- #
- # This security policy is reasonable, but it allows unsigned packages, so a
- # malicious person could simply delete the package signature and pass the
- # gem off as unsigned.
- #
- MediumSecurity = Policy.new(
- :verify_data => true,
- :verify_signer => true,
- :verify_chain => true,
- :verify_root => true,
- :only_trusted => true,
- :only_signed => false
- )
-
- #
- # High security policy: only allow signed gems to be installed, verify the
- # signing certificate, verify the signing certificate chain all the way to
- # the root certificate, and only trust root certificates that we have
- # explicitly allowed trust for.
- #
- # This security policy is significantly more difficult to bypass, and offers
- # a reasonable guarantee that the contents of the gem have not been altered.
- #
- HighSecurity = Policy.new(
- :verify_data => true,
- :verify_signer => true,
- :verify_chain => true,
- :verify_root => true,
- :only_trusted => true,
- :only_signed => true
- )
-
- #
- # Hash of configured security policies
- #
- Policies = {
- 'NoSecurity' => NoSecurity,
- 'AlmostNoSecurity' => AlmostNoSecurity,
- 'LowSecurity' => LowSecurity,
- 'MediumSecurity' => MediumSecurity,
- 'HighSecurity' => HighSecurity,
- }
-
- #
- # Sign the cert cert with @signing_key and @signing_cert, using the digest
- # algorithm opt[:dgst_algo]. Returns the newly signed certificate.
- #
- def self.sign_cert(cert, signing_key, signing_cert, opt = {})
- opt = OPT.merge(opt)
-
- # set up issuer information
- cert.issuer = signing_cert.subject
- cert.sign(signing_key, opt[:dgst_algo].new)
-
- cert
- end
-
- #
- # Make sure the trust directory exists. If it does exist, make sure it's
- # actually a directory. If not, then create it with the appropriate
- # permissions.
- #
- def self.verify_trust_dir(path, perms)
- # if the directory exists, then make sure it is in fact a directory. if
- # it doesn't exist, then create it with the appropriate permissions
- if File.exist?(path)
- # verify that the trust directory is actually a directory
- unless File.directory?(path)
- err = "trust directory #{path} isn't a directory"
- raise Gem::Security::Exception, err
- end
- else
- # trust directory doesn't exist, so create it with permissions
- FileUtils.mkdir_p(path)
- FileUtils.chmod(perms, path)
- end
- end
-
- #
- # Build a certificate from the given DN and private key.
- #
- def self.build_cert(name, key, opt = {})
- Gem.ensure_ssl_available
- opt = OPT.merge(opt)
-
- # create new cert
- ret = OpenSSL::X509::Certificate.new
-
- # populate cert attributes
- ret.version = 2
- ret.serial = 0
- ret.public_key = key.public_key
- ret.not_before = Time.now
- ret.not_after = Time.now + opt[:cert_age]
- ret.subject = name
-
- # add certificate extensions
- ef = OpenSSL::X509::ExtensionFactory.new(nil, ret)
- ret.extensions = opt[:cert_exts].map { |k, v| ef.create_extension(k, v) }
-
- # sign cert
- i_key, i_cert = opt[:issuer_key] || key, opt[:issuer_cert] || ret
- ret = sign_cert(ret, i_key, i_cert, opt)
-
- # return cert
- ret
- end
-
- #
- # Build a self-signed certificate for the given email address.
- #
- def self.build_self_signed_cert(email_addr, opt = {})
- Gem.ensure_ssl_available
- opt = OPT.merge(opt)
- path = { :key => nil, :cert => nil }
-
- # split email address up
- cn, dcs = email_addr.split('@')
- dcs = dcs.split('.')
-
- # munge email CN and DCs
- cn = cn.gsub(opt[:munge_re], '_')
- dcs = dcs.map { |dc| dc.gsub(opt[:munge_re], '_') }
-
- # create DN
- name = "CN=#{cn}/" << dcs.map { |dc| "DC=#{dc}" }.join('/')
- name = OpenSSL::X509::Name::parse(name)
-
- # build private key
- key = opt[:key_algo].new(opt[:key_size])
-
- # method name pretty much says it all :)
- verify_trust_dir(opt[:trust_dir], opt[:perms][:trust_dir])
-
- # if we're saving the key, then write it out
- if opt[:save_key]
- path[:key] = opt[:save_key_path] || (opt[:output_fmt] % 'private_key')
- File.open(path[:key], 'wb') do |file|
- file.chmod(opt[:perms][:signing_key])
- file.write(key.to_pem)
- end
- end
-
- # build self-signed public cert from key
- cert = build_cert(name, key, opt)
-
- # if we're saving the cert, then write it out
- if opt[:save_cert]
- path[:cert] = opt[:save_cert_path] || (opt[:output_fmt] % 'public_cert')
- File.open(path[:cert], 'wb') do |file|
- file.chmod(opt[:perms][:signing_cert])
- file.write(cert.to_pem)
- end
- end
-
- # return key, cert, and paths (if applicable)
- { :key => key, :cert => cert,
- :key_path => path[:key], :cert_path => path[:cert] }
- end
-
- #
- # Add certificate to trusted cert list.
- #
- # Note: At the moment these are stored in OPT[:trust_dir], although that
- # directory may change in the future.
- #
- def self.add_trusted_cert(cert, opt = {})
- opt = OPT.merge(opt)
-
- # get destination path
- path = Gem::Security::Policy.trusted_cert_path(cert, opt)
-
- # verify trust directory (can't write to nowhere, you know)
- verify_trust_dir(opt[:trust_dir], opt[:perms][:trust_dir])
-
- # write cert to output file
- File.open(path, 'wb') do |file|
- file.chmod(opt[:perms][:trusted_cert])
- file.write(cert.to_pem)
- end
-
- # return nil
- nil
- end
-
- #
- # Basic OpenSSL-based package signing class.
- #
- class Signer
- attr_accessor :key, :cert_chain
-
- def initialize(key, cert_chain)
- Gem.ensure_ssl_available
- @algo = Gem::Security::OPT[:dgst_algo]
- @key, @cert_chain = key, cert_chain
-
- # check key, if it's a file, and if it's key, leave it alone
- if @key && !@key.kind_of?(OpenSSL::PKey::PKey)
- @key = OpenSSL::PKey::RSA.new(File.read(@key))
- end
-
- # check cert chain, if it's a file, load it, if it's cert data, convert
- # it into a cert object, and if it's a cert object, leave it alone
- if @cert_chain
- @cert_chain = @cert_chain.map do |cert|
- # check cert, if it's a file, load it, if it's cert data, convert it
- # into a cert object, and if it's a cert object, leave it alone
- if cert && !cert.kind_of?(OpenSSL::X509::Certificate)
- cert = File.read(cert) if File::exist?(cert)
- cert = OpenSSL::X509::Certificate.new(cert)
- end
- cert
- end
- end
- end
-
- #
- # Sign data with given digest algorithm
- #
- def sign(data)
- @key.sign(@algo.new, data)
- end
-
- end
-end
-
diff --git a/lib/rubygems/server.rb b/lib/rubygems/server.rb
deleted file mode 100644
index 44bee74abf..0000000000
--- a/lib/rubygems/server.rb
+++ /dev/null
@@ -1,813 +0,0 @@
-require 'webrick'
-require 'yaml'
-require 'zlib'
-require 'erb'
-
-require 'rubygems'
-require 'rubygems/doc_manager'
-
-##
-# Gem::Server and allows users to serve gems for consumption by
-# `gem --remote-install`.
-#
-# gem_server starts an HTTP server on the given port and serves the following:
-# * "/" - Browsing of gem spec files for installed gems
-# * "/specs.#{Gem.marshal_version}.gz" - specs name/version/platform index
-# * "/latest_specs.#{Gem.marshal_version}.gz" - latest specs
-# name/version/platform index
-# * "/quick/" - Individual gemspecs
-# * "/gems" - Direct access to download the installable gems
-# * "/rdoc?q=" - Search for installed rdoc documentation
-# * legacy indexes:
-# * "/Marshal.#{Gem.marshal_version}" - Full SourceIndex dump of metadata
-# for installed gems
-# * "/yaml" - YAML dump of metadata for installed gems - deprecated
-#
-# == Usage
-#
-# gem_server = Gem::Server.new Gem.dir, 8089, false
-# gem_server.run
-#
-#--
-# TODO Refactor into a real WEBrick servlet to remove code duplication.
-
-class Gem::Server
-
- include ERB::Util
- include Gem::UserInteraction
-
- SEARCH = <<-SEARCH
- <form class="headerSearch" name="headerSearchForm" method="get" action="/rdoc">
- <div id="search" style="float:right">
- <span>Filter/Search</span>
- <input id="q" type="text" style="width:10em" name="q"/>
- <button type="submit" style="display:none" />
- </div>
- </form>
- SEARCH
-
- DOC_TEMPLATE = <<-'DOC_TEMPLATE'
- <?xml version="1.0" encoding="iso-8859-1"?>
- <!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
- <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <title>RubyGems Documentation Index</title>
- <link rel="stylesheet" href="gem-server-rdoc-style.css" type="text/css" media="screen" />
- </head>
- <body>
- <div id="fileHeader">
-<%= SEARCH %>
- <h1>RubyGems Documentation Index</h1>
- </div>
- <!-- banner header -->
-
- <div id="bodyContent">
- <div id="contextContent">
- <div id="description">
- <h1>Summary</h1>
- <p>There are <%=values["gem_count"]%> gems installed:</p>
- <p>
- <%= values["specs"].map { |v| "<a href=\"##{v["name"]}\">#{v["name"]}</a>" }.join ', ' %>.
- <h1>Gems</h1>
-
- <dl>
- <% values["specs"].each do |spec| %>
- <dt>
- <% if spec["first_name_entry"] then %>
- <a name="<%=spec["name"]%>"></a>
- <% end %>
-
- <b><%=spec["name"]%> <%=spec["version"]%></b>
-
- <% if spec["rdoc_installed"] then %>
- <a href="<%=spec["doc_path"]%>">[rdoc]</a>
- <% else %>
- <span title="rdoc not installed">[rdoc]</span>
- <% end %>
-
- <% if spec["homepage"] then %>
- <a href="<%=spec["homepage"]%>" title="<%=spec["homepage"]%>">[www]</a>
- <% else %>
- <span title="no homepage available">[www]</span>
- <% end %>
-
- <% if spec["has_deps"] then %>
- - depends on
- <%= spec["dependencies"].map { |v| "<a href=\"##{v["name"]}\">#{v["name"]}</a>" }.join ', ' %>.
- <% end %>
- </dt>
- <dd>
- <%=spec["summary"]%>
- <% if spec["executables"] then %>
- <br/>
-
- <% if spec["only_one_executable"] then %>
- Executable is
- <% else %>
- Executables are
- <%end%>
-
- <%= spec["executables"].map { |v| "<span class=\"context-item-name\">#{v["executable"]}</span>"}.join ', ' %>.
-
- <%end%>
- <br/>
- <br/>
- </dd>
- <% end %>
- </dl>
-
- </div>
- </div>
- </div>
- <div id="validator-badges">
- <p><small><a href="http://validator.w3.org/check/referer">[Validate]</a></small></p>
- </div>
- </body>
- </html>
- DOC_TEMPLATE
-
- # CSS is copy & paste from rdoc-style.css, RDoc V1.0.1 - 20041108
- RDOC_CSS = <<-RDOC_CSS
-body {
- font-family: Verdana,Arial,Helvetica,sans-serif;
- font-size: 90%;
- margin: 0;
- margin-left: 40px;
- padding: 0;
- background: white;
-}
-
-h1,h2,h3,h4 { margin: 0; color: #efefef; background: transparent; }
-h1 { font-size: 150%; }
-h2,h3,h4 { margin-top: 1em; }
-
-a { background: #eef; color: #039; text-decoration: none; }
-a:hover { background: #039; color: #eef; }
-
-/* Override the base stylesheets Anchor inside a table cell */
-td > a {
- background: transparent;
- color: #039;
- text-decoration: none;
-}
-
-/* and inside a section title */
-.section-title > a {
- background: transparent;
- color: #eee;
- text-decoration: none;
-}
-
-/* === Structural elements =================================== */
-
-div#index {
- margin: 0;
- margin-left: -40px;
- padding: 0;
- font-size: 90%;
-}
-
-
-div#index a {
- margin-left: 0.7em;
-}
-
-div#index .section-bar {
- margin-left: 0px;
- padding-left: 0.7em;
- background: #ccc;
- font-size: small;
-}
-
-
-div#classHeader, div#fileHeader {
- width: auto;
- color: white;
- padding: 0.5em 1.5em 0.5em 1.5em;
- margin: 0;
- margin-left: -40px;
- border-bottom: 3px solid #006;
-}
-
-div#classHeader a, div#fileHeader a {
- background: inherit;
- color: white;
-}
-
-div#classHeader td, div#fileHeader td {
- background: inherit;
- color: white;
-}
-
-
-div#fileHeader {
- background: #057;
-}
-
-div#classHeader {
- background: #048;
-}
-
-
-.class-name-in-header {
- font-size: 180%;
- font-weight: bold;
-}
-
-
-div#bodyContent {
- padding: 0 1.5em 0 1.5em;
-}
-
-div#description {
- padding: 0.5em 1.5em;
- background: #efefef;
- border: 1px dotted #999;
-}
-
-div#description h1,h2,h3,h4,h5,h6 {
- color: #125;;
- background: transparent;
-}
-
-div#validator-badges {
- text-align: center;
-}
-div#validator-badges img { border: 0; }
-
-div#copyright {
- color: #333;
- background: #efefef;
- font: 0.75em sans-serif;
- margin-top: 5em;
- margin-bottom: 0;
- padding: 0.5em 2em;
-}
-
-
-/* === Classes =================================== */
-
-table.header-table {
- color: white;
- font-size: small;
-}
-
-.type-note {
- font-size: small;
- color: #DEDEDE;
-}
-
-.xxsection-bar {
- background: #eee;
- color: #333;
- padding: 3px;
-}
-
-.section-bar {
- color: #333;
- border-bottom: 1px solid #999;
- margin-left: -20px;
-}
-
-
-.section-title {
- background: #79a;
- color: #eee;
- padding: 3px;
- margin-top: 2em;
- margin-left: -30px;
- border: 1px solid #999;
-}
-
-.top-aligned-row { vertical-align: top }
-.bottom-aligned-row { vertical-align: bottom }
-
-/* --- Context section classes ----------------------- */
-
-.context-row { }
-.context-item-name { font-family: monospace; font-weight: bold; color: black; }
-.context-item-value { font-size: small; color: #448; }
-.context-item-desc { color: #333; padding-left: 2em; }
-
-/* --- Method classes -------------------------- */
-.method-detail {
- background: #efefef;
- padding: 0;
- margin-top: 0.5em;
- margin-bottom: 1em;
- border: 1px dotted #ccc;
-}
-.method-heading {
- color: black;
- background: #ccc;
- border-bottom: 1px solid #666;
- padding: 0.2em 0.5em 0 0.5em;
-}
-.method-signature { color: black; background: inherit; }
-.method-name { font-weight: bold; }
-.method-args { font-style: italic; }
-.method-description { padding: 0 0.5em 0 0.5em; }
-
-/* --- Source code sections -------------------- */
-
-a.source-toggle { font-size: 90%; }
-div.method-source-code {
- background: #262626;
- color: #ffdead;
- margin: 1em;
- padding: 0.5em;
- border: 1px dashed #999;
- overflow: hidden;
-}
-
-div.method-source-code pre { color: #ffdead; overflow: hidden; }
-
-/* --- Ruby keyword styles --------------------- */
-
-.standalone-code { background: #221111; color: #ffdead; overflow: hidden; }
-
-.ruby-constant { color: #7fffd4; background: transparent; }
-.ruby-keyword { color: #00ffff; background: transparent; }
-.ruby-ivar { color: #eedd82; background: transparent; }
-.ruby-operator { color: #00ffee; background: transparent; }
-.ruby-identifier { color: #ffdead; background: transparent; }
-.ruby-node { color: #ffa07a; background: transparent; }
-.ruby-comment { color: #b22222; font-weight: bold; background: transparent; }
-.ruby-regexp { color: #ffa07a; background: transparent; }
-.ruby-value { color: #7fffd4; background: transparent; }
- RDOC_CSS
-
- RDOC_NO_DOCUMENTATION = <<-'NO_DOC'
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <title>Found documentation</title>
- <link rel="stylesheet" href="gem-server-rdoc-style.css" type="text/css" media="screen" />
- </head>
- <body>
- <div id="fileHeader">
-<%= SEARCH %>
- <h1>No documentation found</h1>
- </div>
-
- <div id="bodyContent">
- <div id="contextContent">
- <div id="description">
- <p>No gems matched <%= h query.inspect %></p>
-
- <p>
- Back to <a href="/">complete gem index</a>
- </p>
-
- </div>
- </div>
- </div>
- <div id="validator-badges">
- <p><small><a href="http://validator.w3.org/check/referer">[Validate]</a></small></p>
- </div>
- </body>
-</html>
- NO_DOC
-
- RDOC_SEARCH_TEMPLATE = <<-'RDOC_SEARCH'
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <title>Found documentation</title>
- <link rel="stylesheet" href="gem-server-rdoc-style.css" type="text/css" media="screen" />
- </head>
- <body>
- <div id="fileHeader">
-<%= SEARCH %>
- <h1>Found documentation</h1>
- </div>
- <!-- banner header -->
-
- <div id="bodyContent">
- <div id="contextContent">
- <div id="description">
- <h1>Summary</h1>
- <p><%=doc_items.length%> documentation topics found.</p>
- <h1>Topics</h1>
-
- <dl>
- <% doc_items.each do |doc_item| %>
- <dt>
- <b><%=doc_item[:name]%></b>
- <a href="<%=doc_item[:url]%>">[rdoc]</a>
- </dt>
- <dd>
- <%=doc_item[:summary]%>
- <br/>
- <br/>
- </dd>
- <% end %>
- </dl>
-
- <p>
- Back to <a href="/">complete gem index</a>
- </p>
-
- </div>
- </div>
- </div>
- <div id="validator-badges">
- <p><small><a href="http://validator.w3.org/check/referer">[Validate]</a></small></p>
- </div>
- </body>
-</html>
- RDOC_SEARCH
-
- def self.run(options)
- new(options[:gemdir], options[:port], options[:daemon]).run
- end
-
- def initialize(gem_dir, port, daemon)
- Socket.do_not_reverse_lookup = true
-
- @gem_dir = gem_dir
- @port = port
- @daemon = daemon
- logger = WEBrick::Log.new nil, WEBrick::BasicLog::FATAL
- @server = WEBrick::HTTPServer.new :DoNotListen => true, :Logger => logger
-
- @spec_dir = File.join @gem_dir, 'specifications'
-
- unless File.directory? @spec_dir then
- raise ArgumentError, "#{@gem_dir} does not appear to be a gem repository"
- end
-
- @source_index = Gem::SourceIndex.from_gems_in @spec_dir
- end
-
- def Marshal(req, res)
- @source_index.refresh!
-
- res['date'] = File.stat(@spec_dir).mtime
-
- index = Marshal.dump @source_index
-
- if req.request_method == 'HEAD' then
- res['content-length'] = index.length
- return
- end
-
- if req.path =~ /Z$/ then
- res['content-type'] = 'application/x-deflate'
- index = Gem.deflate index
- else
- res['content-type'] = 'application/octet-stream'
- end
-
- res.body << index
- end
-
- def latest_specs(req, res)
- @source_index.refresh!
-
- res['content-type'] = 'application/x-gzip'
-
- res['date'] = File.stat(@spec_dir).mtime
-
- specs = @source_index.latest_specs.sort.map do |spec|
- platform = spec.original_platform
- platform = Gem::Platform::RUBY if platform.nil?
- [spec.name, spec.version, platform]
- end
-
- specs = Marshal.dump specs
-
- if req.path =~ /\.gz$/ then
- specs = Gem.gzip specs
- res['content-type'] = 'application/x-gzip'
- else
- res['content-type'] = 'application/octet-stream'
- end
-
- if req.request_method == 'HEAD' then
- res['content-length'] = specs.length
- else
- res.body << specs
- end
- end
-
- def quick(req, res)
- @source_index.refresh!
-
- res['content-type'] = 'text/plain'
- res['date'] = File.stat(@spec_dir).mtime
-
- case req.request_uri.path
- when '/quick/index' then
- res.body << @source_index.map { |name,| name }.sort.join("\n")
- when '/quick/index.rz' then
- index = @source_index.map { |name,| name }.sort.join("\n")
- res['content-type'] = 'application/x-deflate'
- res.body << Gem.deflate(index)
- when '/quick/latest_index' then
- index = @source_index.latest_specs.map { |spec| spec.full_name }
- res.body << index.sort.join("\n")
- when '/quick/latest_index.rz' then
- index = @source_index.latest_specs.map { |spec| spec.full_name }
- res['content-type'] = 'application/x-deflate'
- res.body << Gem.deflate(index.sort.join("\n"))
- when %r|^/quick/(Marshal.#{Regexp.escape Gem.marshal_version}/)?(.*?)-([0-9.]+)(-.*?)?\.gemspec\.rz$| then
- dep = Gem::Dependency.new $2, $3
- specs = @source_index.search dep
- marshal_format = $1
-
- selector = [$2, $3, $4].map { |s| s.inspect }.join ' '
-
- platform = if $4 then
- Gem::Platform.new $4.sub(/^-/, '')
- else
- Gem::Platform::RUBY
- end
-
- specs = specs.select { |s| s.platform == platform }
-
- if specs.empty? then
- res.status = 404
- res.body = "No gems found matching #{selector}"
- elsif specs.length > 1 then
- res.status = 500
- res.body = "Multiple gems found matching #{selector}"
- elsif marshal_format then
- res['content-type'] = 'application/x-deflate'
- res.body << Gem.deflate(Marshal.dump(specs.first))
- else # deprecated YAML format
- res['content-type'] = 'application/x-deflate'
- res.body << Gem.deflate(specs.first.to_yaml)
- end
- else
- raise WEBrick::HTTPStatus::NotFound, "`#{req.path}' not found."
- end
- end
-
- def root(req, res)
- @source_index.refresh!
- res['date'] = File.stat(@spec_dir).mtime
-
- raise WEBrick::HTTPStatus::NotFound, "`#{req.path}' not found." unless
- req.path == '/'
-
- specs = []
- total_file_count = 0
-
- @source_index.each do |path, spec|
- total_file_count += spec.files.size
- deps = spec.dependencies.map do |dep|
- { "name" => dep.name,
- "type" => dep.type,
- "version" => dep.version_requirements.to_s, }
- end
-
- deps = deps.sort_by { |dep| [dep["name"].downcase, dep["version"]] }
- deps.last["is_last"] = true unless deps.empty?
-
- # executables
- executables = spec.executables.sort.collect { |exec| {"executable" => exec} }
- executables = nil if executables.empty?
- executables.last["is_last"] = true if executables
-
- specs << {
- "authors" => spec.authors.sort.join(", "),
- "date" => spec.date.to_s,
- "dependencies" => deps,
- "doc_path" => "/doc_root/#{spec.full_name}/rdoc/index.html",
- "executables" => executables,
- "only_one_executable" => (executables && executables.size == 1),
- "full_name" => spec.full_name,
- "has_deps" => !deps.empty?,
- "homepage" => spec.homepage,
- "name" => spec.name,
- "rdoc_installed" => Gem::DocManager.new(spec).rdoc_installed?,
- "summary" => spec.summary,
- "version" => spec.version.to_s,
- }
- end
-
- specs << {
- "authors" => "Chad Fowler, Rich Kilmer, Jim Weirich, Eric Hodel and others",
- "dependencies" => [],
- "doc_path" => "/doc_root/rubygems-#{Gem::RubyGemsVersion}/rdoc/index.html",
- "executables" => [{"executable" => 'gem', "is_last" => true}],
- "only_one_executable" => true,
- "full_name" => "rubygems-#{Gem::RubyGemsVersion}",
- "has_deps" => false,
- "homepage" => "http://rubygems.org/",
- "name" => 'rubygems',
- "rdoc_installed" => true,
- "summary" => "RubyGems itself",
- "version" => Gem::RubyGemsVersion,
- }
-
- specs = specs.sort_by { |spec| [spec["name"].downcase, spec["version"]] }
- specs.last["is_last"] = true
-
- # tag all specs with first_name_entry
- last_spec = nil
- specs.each do |spec|
- is_first = last_spec.nil? || (last_spec["name"].downcase != spec["name"].downcase)
- spec["first_name_entry"] = is_first
- last_spec = spec
- end
-
- # create page from template
- template = ERB.new(DOC_TEMPLATE)
- res['content-type'] = 'text/html'
-
- values = { "gem_count" => specs.size.to_s, "specs" => specs,
- "total_file_count" => total_file_count.to_s }
-
- result = template.result binding
- res.body = result
- end
-
- ##
- # Can be used for quick navigation to the rdoc documentation. You can then
- # define a search shortcut for your browser. E.g. in Firefox connect
- # 'shortcut:rdoc' to http://localhost:8808/rdoc?q=%s template. Then you can
- # directly open the ActionPack documentation by typing 'rdoc actionp'. If
- # there are multiple hits for the search term, they are presented as a list
- # with links.
- #
- # Search algorithm aims for an intuitive search:
- # 1. first try to find the gems and documentation folders which name
- # starts with the search term
- # 2. search for entries, that *contain* the search term
- # 3. show all the gems
- #
- # If there is only one search hit, user is immediately redirected to the
- # documentation for the particular gem, otherwise a list with results is
- # shown.
- #
- # === Additional trick - install documentation for ruby core
- #
- # Note: please adjust paths accordingly use for example 'locate yaml.rb' and
- # 'gem environment' to identify directories, that are specific for your
- # local installation
- #
- # 1. install ruby sources
- # cd /usr/src
- # sudo apt-get source ruby
- #
- # 2. generate documentation
- # rdoc -o /usr/lib/ruby/gems/1.8/doc/core/rdoc \
- # /usr/lib/ruby/1.8 ruby1.8-1.8.7.72
- #
- # By typing 'rdoc core' you can now access the core documentation
-
- def rdoc(req, res)
- query = req.query['q']
- show_rdoc_for_pattern("#{query}*", res) && return
- show_rdoc_for_pattern("*#{query}*", res) && return
-
- template = ERB.new RDOC_NO_DOCUMENTATION
-
- res['content-type'] = 'text/html'
- res.body = template.result binding
- end
-
- ##
- # Returns true and prepares http response, if rdoc for the requested gem
- # name pattern was found.
- #
- # The search is based on the file system content, not on the gems metadata.
- # This allows additional documentation folders like 'core' for the ruby core
- # documentation - just put it underneath the main doc folder.
-
- def show_rdoc_for_pattern(pattern, res)
- found_gems = Dir.glob("#{@gem_dir}/doc/#{pattern}").select {|path|
- File.exist? File.join(path, 'rdoc/index.html')
- }
- case found_gems.length
- when 0
- return false
- when 1
- new_path = File.basename(found_gems[0])
- res.status = 302
- res['Location'] = "/doc_root/#{new_path}/rdoc/index.html"
- return true
- else
- doc_items = []
- found_gems.each do |file_name|
- base_name = File.basename(file_name)
- doc_items << {
- :name => base_name,
- :url => "/doc_root/#{base_name}/rdoc/index.html",
- :summary => ''
- }
- end
-
- template = ERB.new(RDOC_SEARCH_TEMPLATE)
- res['content-type'] = 'text/html'
- result = template.result binding
- res.body = result
- return true
- end
- end
-
- def run
- @server.listen nil, @port
-
- say "Starting gem server on http://localhost:#{@port}/"
-
- WEBrick::Daemon.start if @daemon
-
- @server.mount_proc "/yaml", method(:yaml)
- @server.mount_proc "/yaml.Z", method(:yaml)
-
- @server.mount_proc "/Marshal.#{Gem.marshal_version}", method(:Marshal)
- @server.mount_proc "/Marshal.#{Gem.marshal_version}.Z", method(:Marshal)
-
- @server.mount_proc "/specs.#{Gem.marshal_version}", method(:specs)
- @server.mount_proc "/specs.#{Gem.marshal_version}.gz", method(:specs)
-
- @server.mount_proc "/latest_specs.#{Gem.marshal_version}",
- method(:latest_specs)
- @server.mount_proc "/latest_specs.#{Gem.marshal_version}.gz",
- method(:latest_specs)
-
- @server.mount_proc "/quick/", method(:quick)
-
- @server.mount_proc("/gem-server-rdoc-style.css") do |req, res|
- res['content-type'] = 'text/css'
- res['date'] = File.stat(@spec_dir).mtime
- res.body << RDOC_CSS
- end
-
- @server.mount_proc "/", method(:root)
-
- @server.mount_proc "/rdoc", method(:rdoc)
-
- paths = { "/gems" => "/cache/", "/doc_root" => "/doc/" }
- paths.each do |mount_point, mount_dir|
- @server.mount(mount_point, WEBrick::HTTPServlet::FileHandler,
- File.join(@gem_dir, mount_dir), true)
- end
-
- trap("INT") { @server.shutdown; exit! }
- trap("TERM") { @server.shutdown; exit! }
-
- @server.start
- end
-
- def specs(req, res)
- @source_index.refresh!
-
- res['date'] = File.stat(@spec_dir).mtime
-
- specs = @source_index.sort.map do |_, spec|
- platform = spec.original_platform
- platform = Gem::Platform::RUBY if platform.nil?
- [spec.name, spec.version, platform]
- end
-
- specs = Marshal.dump specs
-
- if req.path =~ /\.gz$/ then
- specs = Gem.gzip specs
- res['content-type'] = 'application/x-gzip'
- else
- res['content-type'] = 'application/octet-stream'
- end
-
- if req.request_method == 'HEAD' then
- res['content-length'] = specs.length
- else
- res.body << specs
- end
- end
-
- def yaml(req, res)
- @source_index.refresh!
-
- res['date'] = File.stat(@spec_dir).mtime
-
- index = @source_index.to_yaml
-
- if req.path =~ /Z$/ then
- res['content-type'] = 'application/x-deflate'
- index = Gem.deflate index
- else
- res['content-type'] = 'text/plain'
- end
-
- if req.request_method == 'HEAD' then
- res['content-length'] = index.length
- return
- end
-
- res.body << index
- end
-
-end
-
diff --git a/lib/rubygems/source_index.rb b/lib/rubygems/source_index.rb
deleted file mode 100644
index c616aefcc0..0000000000
--- a/lib/rubygems/source_index.rb
+++ /dev/null
@@ -1,591 +0,0 @@
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-require 'rubygems/user_interaction'
-require 'rubygems/specification'
-
-# :stopdoc:
-module Gem
- autoload :SpecFetcher, 'rubygems/spec_fetcher'
-end
-# :startdoc:
-
-##
-# The SourceIndex object indexes all the gems available from a
-# particular source (e.g. a list of gem directories, or a remote
-# source). A SourceIndex maps a gem full name to a gem
-# specification.
-#
-# NOTE:: The class used to be named Cache, but that became
-# confusing when cached source fetchers where introduced. The
-# constant Gem::Cache is an alias for this class to allow old
-# YAMLized source index objects to load properly.
-
-class Gem::SourceIndex
-
- include Enumerable
-
- include Gem::UserInteraction
-
- attr_reader :gems, :prerelease_gems # :nodoc:
-
- ##
- # Directories to use to refresh this SourceIndex when calling refresh!
-
- attr_accessor :spec_dirs
-
- class << self
- include Gem::UserInteraction
-
- ##
- # Factory method to construct a source index instance for a given
- # path.
- #
- # deprecated::
- # If supplied, from_installed_gems will act just like
- # +from_gems_in+. This argument is deprecated and is provided
- # just for backwards compatibility, and should not generally
- # be used.
- #
- # return::
- # SourceIndex instance
-
- def from_installed_gems(*deprecated)
- if deprecated.empty?
- from_gems_in(*installed_spec_directories)
- else
- from_gems_in(*deprecated) # HACK warn
- end
- end
-
- ##
- # Returns a list of directories from Gem.path that contain specifications.
-
- def installed_spec_directories
- Gem.path.collect { |dir| File.join(dir, "specifications") }
- end
-
- ##
- # Creates a new SourceIndex from the ruby format gem specifications in
- # +spec_dirs+.
-
- def from_gems_in(*spec_dirs)
- source_index = new
- source_index.spec_dirs = spec_dirs
- source_index.refresh!
- end
-
- ##
- # Loads a ruby-format specification from +file_name+ and returns the
- # loaded spec.
-
- def load_specification(file_name)
- return nil unless file_name and File.exist? file_name
-
- spec_code = if RUBY_VERSION < '1.9' then
- File.read file_name
- else
- File.read file_name, :encoding => 'UTF-8'
- end.untaint
-
- begin
- gemspec = eval spec_code, binding, file_name
-
- if gemspec.is_a?(Gem::Specification)
- gemspec.loaded_from = file_name
- return gemspec
- end
- alert_warning "File '#{file_name}' does not evaluate to a gem specification"
- rescue SignalException, SystemExit
- raise
- rescue SyntaxError => e
- alert_warning e
- alert_warning spec_code
- rescue Exception => e
- alert_warning "#{e.inspect}\n#{spec_code}"
- alert_warning "Invalid .gemspec format in '#{file_name}'"
- end
-
- return nil
- end
-
- end
-
- ##
- # Constructs a source index instance from the provided specifications, which
- # is a Hash of gem full names and Gem::Specifications.
- #--
- # TODO merge @gems and @prerelease_gems and provide a separate method
- # #prerelease_gems
-
- def initialize(specifications={})
- @gems, @prerelease_gems = [{}, {}]
- specifications.each{ |full_name, spec| add_spec spec }
- @spec_dirs = nil
- end
-
- ##
- # Both regular and prerelease gems
-
- def all_gems
- @gems.merge @prerelease_gems
- end
-
- ##
- # Reconstruct the source index from the specifications in +spec_dirs+.
-
- def load_gems_in(*spec_dirs)
- @gems.clear
-
- spec_dirs.reverse_each do |spec_dir|
- spec_files = Dir.glob File.join(spec_dir, '*.gemspec')
-
- spec_files.each do |spec_file|
- gemspec = self.class.load_specification spec_file.untaint
- add_spec gemspec if gemspec
- end
- end
-
- self
- end
-
- ##
- # Returns an Array specifications for the latest versions of each gem in
- # this index.
-
- def latest_specs
- result = Hash.new { |h,k| h[k] = [] }
- latest = {}
-
- sort.each do |_, spec|
- name = spec.name
- curr_ver = spec.version
- prev_ver = latest.key?(name) ? latest[name].version : nil
-
- next unless prev_ver.nil? or curr_ver >= prev_ver or
- latest[name].platform != Gem::Platform::RUBY
-
- if prev_ver.nil? or
- (curr_ver > prev_ver and spec.platform == Gem::Platform::RUBY) then
- result[name].clear
- latest[name] = spec
- end
-
- if spec.platform != Gem::Platform::RUBY then
- result[name].delete_if do |result_spec|
- result_spec.platform == spec.platform
- end
- end
-
- result[name] << spec
- end
-
- # TODO: why is this a hash while @gems is an array? Seems like
- # structural similarity would be good.
- result.values.flatten
- end
-
- ##
- # An array including only the prerelease gemspecs
-
- def prerelease_specs
- @prerelease_gems.values
- end
-
- ##
- # Add a gem specification to the source index.
-
- def add_spec(gem_spec, name = gem_spec.full_name)
- # No idea why, but the Indexer wants to insert them using original_name
- # instead of full_name. So we make it an optional arg.
- if gem_spec.version.prerelease?
- @prerelease_gems[name] = gem_spec
- else
- @gems[name] = gem_spec
- end
- end
-
- ##
- # Add gem specifications to the source index.
-
- def add_specs(*gem_specs)
- gem_specs.each do |spec|
- add_spec spec
- end
- end
-
- ##
- # Remove a gem specification named +full_name+.
-
- def remove_spec(full_name)
- if @gems.key? full_name then
- @gems.delete full_name
- else
- @prerelease_gems.delete full_name
- end
- end
-
- ##
- # Iterate over the specifications in the source index.
-
- def each(&block) # :yields: gem.full_name, gem
- @gems.each(&block)
- end
-
- ##
- # The gem specification given a full gem spec name.
-
- def specification(full_name)
- @gems[full_name]
- end
-
- ##
- # The signature for the source index. Changes in the signature indicate a
- # change in the index.
-
- def index_signature
- require 'digest'
-
- Digest::SHA256.new.hexdigest(@gems.keys.sort.join(',')).to_s
- end
-
- ##
- # The signature for the given gem specification.
-
- def gem_signature(gem_full_name)
- require 'digest'
-
- Digest::SHA256.new.hexdigest(@gems[gem_full_name].to_yaml).to_s
- end
-
- def size
- @gems.size
- end
- alias length size
-
- ##
- # Find a gem by an exact match on the short name.
-
- def find_name(gem_name, version_requirement = Gem::Requirement.default)
- dep = Gem::Dependency.new gem_name, version_requirement
- search dep
- end
-
- ##
- # Search for a gem by Gem::Dependency +gem_pattern+. If +only_platform+
- # is true, only gems matching Gem::Platform.local will be returned. An
- # Array of matching Gem::Specification objects is returned.
- #
- # For backwards compatibility, a String or Regexp pattern may be passed as
- # +gem_pattern+, and a Gem::Requirement for +platform_only+. This
- # behavior is deprecated and will be removed.
-
- def search(gem_pattern, platform_only = false)
- version_requirement = nil
- only_platform = false
-
- # TODO - Remove support and warning for legacy arguments after 2008/11
- unless Gem::Dependency === gem_pattern
- warn "#{Gem.location_of_caller.join ':'}:Warning: Gem::SourceIndex#search support for #{gem_pattern.class} patterns is deprecated, use #find_name"
- end
-
- case gem_pattern
- when Regexp then
- version_requirement = platform_only || Gem::Requirement.default
- when Gem::Dependency then
- only_platform = platform_only
- version_requirement = gem_pattern.version_requirements
- gem_pattern = if Regexp === gem_pattern.name then
- gem_pattern.name
- elsif gem_pattern.name.empty? then
- //
- else
- /^#{Regexp.escape gem_pattern.name}$/
- end
- else
- version_requirement = platform_only || Gem::Requirement.default
- gem_pattern = /#{gem_pattern}/i
- end
-
- unless Gem::Requirement === version_requirement then
- version_requirement = Gem::Requirement.create version_requirement
- end
-
- specs = all_gems.values.select do |spec|
- spec.name =~ gem_pattern and
- version_requirement.satisfied_by? spec.version
- end
-
- if only_platform then
- specs = specs.select do |spec|
- Gem::Platform.match spec.platform
- end
- end
-
- specs.sort_by { |s| s.sort_obj }
- end
-
- ##
- # Replaces the gems in the source index from specifications in the
- # directories this source index was created from. Raises an exception if
- # this source index wasn't created from a directory (via from_gems_in or
- # from_installed_gems, or having spec_dirs set).
-
- def refresh!
- raise 'source index not created from disk' if @spec_dirs.nil?
- load_gems_in(*@spec_dirs)
- end
-
- ##
- # Returns an Array of Gem::Specifications that are not up to date.
-
- def outdated
- outdateds = []
-
- latest_specs.each do |local|
- dependency = Gem::Dependency.new local.name, ">= #{local.version}"
-
- begin
- fetcher = Gem::SpecFetcher.fetcher
- remotes = fetcher.find_matching dependency
- remotes = remotes.map { |(name, version,_),_| version }
- rescue Gem::RemoteFetcher::FetchError => e
- raise unless fetcher.warn_legacy e do
- require 'rubygems/source_info_cache'
-
- specs = Gem::SourceInfoCache.search_with_source dependency, true
-
- remotes = specs.map { |spec,| spec.version }
- end
- end
-
- latest = remotes.sort.last
-
- outdateds << local.name if latest and local.version < latest
- end
-
- outdateds
- end
-
- ##
- # Updates this SourceIndex from +source_uri+. If +all+ is false, only the
- # latest gems are fetched.
-
- def update(source_uri, all)
- source_uri = URI.parse source_uri unless URI::Generic === source_uri
- source_uri.path += '/' unless source_uri.path =~ /\/$/
-
- use_incremental = false
-
- begin
- gem_names = fetch_quick_index source_uri, all
- remove_extra gem_names
- missing_gems = find_missing gem_names
-
- return false if missing_gems.size.zero?
-
- say "Missing metadata for #{missing_gems.size} gems" if
- missing_gems.size > 0 and Gem.configuration.really_verbose
-
- use_incremental = missing_gems.size <= Gem.configuration.bulk_threshold
- rescue Gem::OperationNotSupportedError => ex
- alert_error "Falling back to bulk fetch: #{ex.message}" if
- Gem.configuration.really_verbose
- use_incremental = false
- end
-
- if use_incremental then
- update_with_missing(source_uri, missing_gems)
- else
- new_index = fetch_bulk_index(source_uri)
- @gems.replace(new_index.gems)
- end
-
- true
- end
-
- def ==(other) # :nodoc:
- self.class === other and @gems == other.gems
- end
-
- def dump
- Marshal.dump(self)
- end
-
- private
-
- def fetcher
- require 'rubygems/remote_fetcher'
-
- Gem::RemoteFetcher.fetcher
- end
-
- def fetch_index_from(source_uri)
- @fetch_error = nil
-
- indexes = %W[
- Marshal.#{Gem.marshal_version}.Z
- Marshal.#{Gem.marshal_version}
- yaml.Z
- yaml
- ]
-
- indexes.each do |name|
- spec_data = nil
- index = source_uri + name
- begin
- spec_data = fetcher.fetch_path index
- spec_data = unzip(spec_data) if name =~ /\.Z$/
-
- if name =~ /Marshal/ then
- return Marshal.load(spec_data)
- else
- return YAML.load(spec_data)
- end
- rescue => e
- if Gem.configuration.really_verbose then
- alert_error "Unable to fetch #{name}: #{e.message}"
- end
-
- @fetch_error = e
- end
- end
-
- nil
- end
-
- def fetch_bulk_index(source_uri)
- say "Bulk updating Gem source index for: #{source_uri}" if
- Gem.configuration.verbose
-
- index = fetch_index_from(source_uri)
- if index.nil? then
- raise Gem::RemoteSourceException,
- "Error fetching remote gem cache: #{@fetch_error}"
- end
- @fetch_error = nil
- index
- end
-
- ##
- # Get the quick index needed for incremental updates.
-
- def fetch_quick_index(source_uri, all)
- index = all ? 'index' : 'latest_index'
-
- zipped_index = fetcher.fetch_path source_uri + "quick/#{index}.rz"
-
- unzip(zipped_index).split("\n")
- rescue ::Exception => e
- unless all then
- say "Latest index not found, using quick index" if
- Gem.configuration.really_verbose
-
- fetch_quick_index source_uri, true
- else
- raise Gem::OperationNotSupportedError,
- "No quick index found: #{e.message}"
- end
- end
-
- ##
- # Make a list of full names for all the missing gemspecs.
-
- def find_missing(spec_names)
- unless defined? @originals then
- @originals = {}
- each do |full_name, spec|
- @originals[spec.original_name] = spec
- end
- end
-
- spec_names.find_all { |full_name|
- @originals[full_name].nil?
- }
- end
-
- def remove_extra(spec_names)
- dictionary = spec_names.inject({}) { |h, k| h[k] = true; h }
- each do |name, spec|
- remove_spec name unless dictionary.include? spec.original_name
- end
- end
-
- ##
- # Unzip the given string.
-
- def unzip(string)
- require 'zlib'
- Gem.inflate string
- end
-
- ##
- # Tries to fetch Marshal representation first, then YAML
-
- def fetch_single_spec(source_uri, spec_name)
- @fetch_error = nil
-
- begin
- marshal_uri = source_uri + "quick/Marshal.#{Gem.marshal_version}/#{spec_name}.gemspec.rz"
- zipped = fetcher.fetch_path marshal_uri
- return Marshal.load(unzip(zipped))
- rescue => ex
- @fetch_error = ex
-
- if Gem.configuration.really_verbose then
- say "unable to fetch marshal gemspec #{marshal_uri}: #{ex.class} - #{ex}"
- end
- end
-
- begin
- yaml_uri = source_uri + "quick/#{spec_name}.gemspec.rz"
- zipped = fetcher.fetch_path yaml_uri
- return YAML.load(unzip(zipped))
- rescue => ex
- @fetch_error = ex
- if Gem.configuration.really_verbose then
- say "unable to fetch YAML gemspec #{yaml_uri}: #{ex.class} - #{ex}"
- end
- end
-
- nil
- end
-
- ##
- # Update the cached source index with the missing names.
-
- def update_with_missing(source_uri, missing_names)
- progress = ui.progress_reporter(missing_names.size,
- "Updating metadata for #{missing_names.size} gems from #{source_uri}")
- missing_names.each do |spec_name|
- gemspec = fetch_single_spec(source_uri, spec_name)
- if gemspec.nil? then
- ui.say "Failed to download spec #{spec_name} from #{source_uri}:\n" \
- "\t#{@fetch_error.message}"
- else
- add_spec gemspec
- progress.updated spec_name
- end
- @fetch_error = nil
- end
- progress.done
- progress.count
- end
-
-end
-
-# :stopdoc:
-module Gem
-
- ##
- # Cache is an alias for SourceIndex to allow older YAMLized source index
- # objects to load properly.
-
- Cache = SourceIndex
-
-end
-# :startdoc:
-
diff --git a/lib/rubygems/source_info_cache.rb b/lib/rubygems/source_info_cache.rb
deleted file mode 100644
index fdb30ad8d3..0000000000
--- a/lib/rubygems/source_info_cache.rb
+++ /dev/null
@@ -1,393 +0,0 @@
-require 'fileutils'
-
-require 'rubygems'
-require 'rubygems/source_info_cache_entry'
-require 'rubygems/user_interaction'
-
-##
-# SourceInfoCache stores a copy of the gem index for each gem source.
-#
-# There are two possible cache locations, the system cache and the user cache:
-# * The system cache is preferred if it is writable or can be created.
-# * The user cache is used otherwise
-#
-# Once a cache is selected, it will be used for all operations.
-# SourceInfoCache will not switch between cache files dynamically.
-#
-# Cache data is a Hash mapping a source URI to a SourceInfoCacheEntry.
-#
-#--
-# To keep things straight, this is how the cache objects all fit together:
-#
-# Gem::SourceInfoCache
-# @cache_data = {
-# source_uri => Gem::SourceInfoCacheEntry
-# @size = source index size
-# @source_index = Gem::SourceIndex
-# ...
-# }
-
-class Gem::SourceInfoCache
-
- include Gem::UserInteraction
-
- ##
- # The singleton Gem::SourceInfoCache. If +all+ is true, a full refresh will
- # be performed if the singleton instance is being initialized.
-
- def self.cache(all = false)
- return @cache if @cache
- @cache = new
- @cache.refresh all if Gem.configuration.update_sources
- @cache
- end
-
- def self.cache_data
- cache.cache_data
- end
-
- ##
- # The name of the system cache file.
-
- def self.latest_system_cache_file
- File.join File.dirname(system_cache_file),
- "latest_#{File.basename system_cache_file}"
- end
-
- ##
- # The name of the latest user cache file.
-
- def self.latest_user_cache_file
- File.join File.dirname(user_cache_file),
- "latest_#{File.basename user_cache_file}"
- end
-
- ##
- # Reset all singletons, discarding any changes.
-
- def self.reset
- @cache = nil
- @system_cache_file = nil
- @user_cache_file = nil
- end
-
- ##
- # Search all source indexes. See Gem::SourceInfoCache#search.
-
- def self.search(*args)
- cache.search(*args)
- end
-
- ##
- # Search all source indexes returning the source_uri. See
- # Gem::SourceInfoCache#search_with_source.
-
- def self.search_with_source(*args)
- cache.search_with_source(*args)
- end
-
- ##
- # The name of the system cache file. (class method)
-
- def self.system_cache_file
- @system_cache_file ||= Gem.default_system_source_cache_dir
- end
-
- ##
- # The name of the user cache file.
-
- def self.user_cache_file
- @user_cache_file ||=
- ENV['GEMCACHE'] || Gem.default_user_source_cache_dir
- end
-
- def initialize # :nodoc:
- @cache_data = nil
- @cache_file = nil
- @dirty = false
- @only_latest = true
- end
-
- ##
- # The most recent cache data.
-
- def cache_data
- return @cache_data if @cache_data
- cache_file # HACK writable check
-
- @only_latest = true
-
- @cache_data = read_cache_data latest_cache_file
-
- @cache_data
- end
-
- ##
- # The name of the cache file.
-
- def cache_file
- return @cache_file if @cache_file
- @cache_file = (try_file(system_cache_file) or
- try_file(user_cache_file) or
- raise "unable to locate a writable cache file")
- end
-
- ##
- # Write the cache to a local file (if it is dirty).
-
- def flush
- write_cache if @dirty
- @dirty = false
- end
-
- def latest_cache_data
- latest_cache_data = {}
-
- cache_data.each do |repo, sice|
- latest = sice.source_index.latest_specs
-
- new_si = Gem::SourceIndex.new
- new_si.add_specs(*latest)
-
- latest_sice = Gem::SourceInfoCacheEntry.new new_si, sice.size
- latest_cache_data[repo] = latest_sice
- end
-
- latest_cache_data
- end
-
- ##
- # The name of the latest cache file.
-
- def latest_cache_file
- File.join File.dirname(cache_file), "latest_#{File.basename cache_file}"
- end
-
- ##
- # The name of the latest system cache file.
-
- def latest_system_cache_file
- self.class.latest_system_cache_file
- end
-
- ##
- # The name of the latest user cache file.
-
- def latest_user_cache_file
- self.class.latest_user_cache_file
- end
-
- ##
- # Merges the complete cache file into this Gem::SourceInfoCache.
-
- def read_all_cache_data
- if @only_latest then
- @only_latest = false
- all_data = read_cache_data cache_file
-
- cache_data.update all_data do |source_uri, latest_sice, all_sice|
- all_sice.source_index.gems.update latest_sice.source_index.gems
-
- Gem::SourceInfoCacheEntry.new all_sice.source_index, latest_sice.size
- end
-
- begin
- refresh true
- rescue Gem::RemoteFetcher::FetchError
- end
- end
- end
-
- ##
- # Reads cached data from +file+.
-
- def read_cache_data(file)
- # Marshal loads 30-40% faster from a String, and 2MB on 20061116 is small
- data = open file, 'rb' do |fp| fp.read end
- cache_data = Marshal.load data
-
- cache_data.each do |url, sice|
- next unless sice.is_a?(Hash)
- update
-
- cache = sice['cache']
- size = sice['size']
-
- if cache.is_a?(Gem::SourceIndex) and size.is_a?(Numeric) then
- new_sice = Gem::SourceInfoCacheEntry.new cache, size
- cache_data[url] = new_sice
- else # irreperable, force refetch.
- reset_cache_for url, cache_data
- end
- end
-
- cache_data
- rescue Errno::ENOENT
- {}
- rescue => e
- if Gem.configuration.really_verbose then
- say "Exception during cache_data handling: #{e.class} - #{e}"
- say "Cache file was: #{file}"
- say "\t#{e.backtrace.join "\n\t"}"
- end
-
- {}
- end
-
- ##
- # Refreshes each source in the cache from its repository. If +all+ is
- # false, only latest gems are updated.
-
- def refresh(all)
- Gem.sources.each do |source_uri|
- cache_entry = cache_data[source_uri]
- if cache_entry.nil? then
- cache_entry = Gem::SourceInfoCacheEntry.new nil, 0
- cache_data[source_uri] = cache_entry
- end
-
- update if cache_entry.refresh source_uri, all
- end
-
- flush
- end
-
- def reset_cache_for(url, cache_data)
- say "Reseting cache for #{url}" if Gem.configuration.really_verbose
-
- sice = Gem::SourceInfoCacheEntry.new Gem::SourceIndex.new, 0
- sice.refresh url, false # HACK may be unnecessary, see ::cache and #refresh
-
- cache_data[url] = sice
- cache_data
- end
-
- def reset_cache_data
- @cache_data = nil
- @only_latest = true
- end
-
- ##
- # Force cache file to be reset, useful for integration testing of rubygems
-
- def reset_cache_file
- @cache_file = nil
- end
-
- ##
- # Searches all source indexes. See Gem::SourceIndex#search for details on
- # +pattern+ and +platform_only+. If +all+ is set to true, the full index
- # will be loaded before searching.
-
- def search(pattern, platform_only = false, all = false)
- read_all_cache_data if all
-
- cache_data.map do |source_uri, sic_entry|
- next unless Gem.sources.include? source_uri
- # TODO - Remove this gunk after 2008/11
- unless pattern.kind_of?(Gem::Dependency)
- pattern = Gem::Dependency.new(pattern, Gem::Requirement.default)
- end
- sic_entry.source_index.search pattern, platform_only
- end.flatten.compact
- end
-
- # Searches all source indexes for +pattern+. If +only_platform+ is true,
- # only gems matching Gem.platforms will be selected. Returns an Array of
- # pairs containing the Gem::Specification found and the source_uri it was
- # found at.
- def search_with_source(pattern, only_platform = false, all = false)
- read_all_cache_data if all
-
- results = []
-
- cache_data.map do |source_uri, sic_entry|
- next unless Gem.sources.include? source_uri
-
- # TODO - Remove this gunk after 2008/11
- unless pattern.kind_of?(Gem::Dependency)
- pattern = Gem::Dependency.new(pattern, Gem::Requirement.default)
- end
-
- sic_entry.source_index.search(pattern, only_platform).each do |spec|
- results << [spec, source_uri]
- end
- end
-
- results
- end
-
- ##
- # Set the source info cache data directly. This is mainly used for unit
- # testing when we don't want to read a file system to grab the cached source
- # index information. The +hash+ should map a source URL into a
- # SourceInfoCacheEntry.
-
- def set_cache_data(hash)
- @cache_data = hash
- update
- end
-
- ##
- # The name of the system cache file.
-
- def system_cache_file
- self.class.system_cache_file
- end
-
- ##
- # Determine if +path+ is a candidate for a cache file. Returns +path+ if
- # it is, nil if not.
-
- def try_file(path)
- return path if File.writable? path
- return nil if File.exist? path
-
- dir = File.dirname path
-
- unless File.exist? dir then
- begin
- FileUtils.mkdir_p dir
- rescue RuntimeError, SystemCallError
- return nil
- end
- end
-
- return path if File.writable? dir
-
- nil
- end
-
- ##
- # Mark the cache as updated (i.e. dirty).
-
- def update
- @dirty = true
- end
-
- ##
- # The name of the user cache file.
-
- def user_cache_file
- self.class.user_cache_file
- end
-
- ##
- # Write data to the proper cache files.
-
- def write_cache
- if not File.exist?(cache_file) or not @only_latest then
- open cache_file, 'wb' do |io|
- io.write Marshal.dump(cache_data)
- end
- end
-
- open latest_cache_file, 'wb' do |io|
- io.write Marshal.dump(latest_cache_data)
- end
- end
-
- reset
-
-end
-
diff --git a/lib/rubygems/source_info_cache_entry.rb b/lib/rubygems/source_info_cache_entry.rb
deleted file mode 100644
index d8106b2806..0000000000
--- a/lib/rubygems/source_info_cache_entry.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-require 'rubygems'
-require 'rubygems/source_index'
-require 'rubygems/remote_fetcher'
-
-##
-# Entries held by a SourceInfoCache.
-
-class Gem::SourceInfoCacheEntry
-
- ##
- # The source index for this cache entry.
-
- attr_reader :source_index
-
- ##
- # The size of the source entry. Used to determine if the source index has
- # changed.
-
- attr_reader :size
-
- ##
- # Create a cache entry.
-
- def initialize(si, size)
- @source_index = si || Gem::SourceIndex.new({})
- @size = size
- @all = false
- end
-
- def refresh(source_uri, all)
- begin
- marshal_uri = URI.join source_uri.to_s, "Marshal.#{Gem.marshal_version}"
- remote_size = Gem::RemoteFetcher.fetcher.fetch_size marshal_uri
- rescue Gem::RemoteSourceException
- yaml_uri = URI.join source_uri.to_s, 'yaml'
- remote_size = Gem::RemoteFetcher.fetcher.fetch_size yaml_uri
- end
-
- # TODO Use index_signature instead of size?
- return false if @size == remote_size and @all
-
- updated = @source_index.update source_uri, all
- @size = remote_size
- @all = all
-
- updated
- end
-
- def ==(other) # :nodoc:
- self.class === other and
- @size == other.size and
- @source_index == other.source_index
- end
-
-end
-
diff --git a/lib/rubygems/spec_fetcher.rb b/lib/rubygems/spec_fetcher.rb
deleted file mode 100644
index f46c355413..0000000000
--- a/lib/rubygems/spec_fetcher.rb
+++ /dev/null
@@ -1,271 +0,0 @@
-require 'zlib'
-require 'fileutils'
-
-require 'rubygems/remote_fetcher'
-require 'rubygems/user_interaction'
-
-##
-# SpecFetcher handles metadata updates from remote gem repositories.
-
-class Gem::SpecFetcher
-
- include Gem::UserInteraction
-
- ##
- # The SpecFetcher cache dir.
-
- attr_reader :dir # :nodoc:
-
- ##
- # Cache of latest specs
-
- attr_reader :latest_specs # :nodoc:
-
- ##
- # Cache of all spces
-
- attr_reader :specs # :nodoc:
-
- ##
- # Cache of prerelease specs
-
- attr_reader :prerelease_specs # :nodoc:
-
- @fetcher = nil
-
- def self.fetcher
- @fetcher ||= new
- end
-
- def self.fetcher=(fetcher) # :nodoc:
- @fetcher = fetcher
- end
-
- def initialize
- @dir = File.join Gem.user_home, '.gem', 'specs'
- @update_cache = File.stat(Gem.user_home).uid == Process.uid
-
- @specs = {}
- @latest_specs = {}
- @prerelease_specs = {}
-
- @fetcher = Gem::RemoteFetcher.fetcher
- end
-
- ##
- # Retuns the local directory to write +uri+ to.
-
- def cache_dir(uri)
- File.join @dir, "#{uri.host}%#{uri.port}", File.dirname(uri.path)
- end
-
- ##
- # Fetch specs matching +dependency+. If +all+ is true, all matching
- # versions are returned. If +matching_platform+ is false, all platforms are
- # returned. If +prerelease+ is true, prerelease versions are included.
-
- def fetch(dependency, all = false, matching_platform = true, prerelease = false)
- specs_and_sources = find_matching dependency, all, matching_platform, prerelease
-
- specs_and_sources.map do |spec_tuple, source_uri|
- [fetch_spec(spec_tuple, URI.parse(source_uri)), source_uri]
- end
-
- rescue Gem::RemoteFetcher::FetchError => e
- raise unless warn_legacy e do
- require 'rubygems/source_info_cache'
-
- return Gem::SourceInfoCache.search_with_source(dependency,
- matching_platform, all)
- end
- end
-
- def fetch_spec(spec, source_uri)
- spec = spec - [nil, 'ruby', '']
- spec_file_name = "#{spec.join '-'}.gemspec"
-
- uri = source_uri + "#{Gem::MARSHAL_SPEC_DIR}#{spec_file_name}"
-
- cache_dir = cache_dir uri
-
- local_spec = File.join cache_dir, spec_file_name
-
- if File.exist? local_spec then
- spec = Gem.read_binary local_spec
- else
- uri.path << '.rz'
-
- spec = @fetcher.fetch_path uri
- spec = Gem.inflate spec
-
- if @update_cache then
- FileUtils.mkdir_p cache_dir
-
- open local_spec, 'wb' do |io|
- io.write spec
- end
- end
- end
-
- # TODO: Investigate setting Gem::Specification#loaded_from to a URI
- Marshal.load spec
- end
-
- ##
- # Find spec names that match +dependency+. If +all+ is true, all matching
- # versions are returned. If +matching_platform+ is false, gems for all
- # platforms are returned.
-
- def find_matching(dependency, all = false, matching_platform = true, prerelease = false)
- found = {}
-
- list(all, prerelease).each do |source_uri, specs|
- found[source_uri] = specs.select do |spec_name, version, spec_platform|
- dependency =~ Gem::Dependency.new(spec_name, version) and
- (not matching_platform or Gem::Platform.match(spec_platform))
- end
- end
-
- specs_and_sources = []
-
- found.each do |source_uri, specs|
- uri_str = source_uri.to_s
- specs_and_sources.push(*specs.map { |spec| [spec, uri_str] })
- end
-
- specs_and_sources
- end
-
- ##
- # Returns Array of gem repositories that were generated with RubyGems less
- # than 1.2.
-
- def legacy_repos
- Gem.sources.reject do |source_uri|
- source_uri = URI.parse source_uri
- spec_path = source_uri + "specs.#{Gem.marshal_version}.gz"
-
- begin
- @fetcher.fetch_size spec_path
- rescue Gem::RemoteFetcher::FetchError
- begin
- @fetcher.fetch_size(source_uri + 'yaml') # re-raise if non-repo
- rescue Gem::RemoteFetcher::FetchError
- alert_error "#{source_uri} does not appear to be a repository"
- raise
- end
- false
- end
- end
- end
-
- ##
- # Returns a list of gems available for each source in Gem::sources. If
- # +all+ is true, all versions are returned instead of only latest
- # versions. If +prerelease+ is true, include prerelease versions.
-
- def list(all = false, prerelease = false)
- # TODO: make type the only argument
- type = if all
- :all
- elsif prerelease
- :prerelease
- else
- :latest
- end
-
- list = {}
-
- file = { :latest => 'latest_specs',
- :prerelease => 'prerelease_specs',
- :all => 'specs' }[type]
-
- cache = { :latest => @latest_specs,
- :prerelease => @prerelease_specs,
- :all => @specs }[type]
-
- Gem.sources.each do |source_uri|
- source_uri = URI.parse source_uri
-
- unless cache.include? source_uri
- cache[source_uri] = load_specs source_uri, file
- end
-
- list[source_uri] = cache[source_uri]
- end
-
- list
- end
-
- ##
- # Loads specs in +file+, fetching from +source_uri+ if the on-disk cache is
- # out of date.
-
- def load_specs(source_uri, file)
- file_name = "#{file}.#{Gem.marshal_version}"
- spec_path = source_uri + "#{file_name}.gz"
- cache_dir = cache_dir spec_path
- local_file = File.join(cache_dir, file_name)
- loaded = false
-
- if File.exist? local_file then
- spec_dump = @fetcher.fetch_path spec_path, File.mtime(local_file)
-
- if spec_dump.nil? then
- spec_dump = Gem.read_binary local_file
- else
- loaded = true
- end
- else
- spec_dump = @fetcher.fetch_path spec_path
- loaded = true
- end
-
- specs = begin
- Marshal.load spec_dump
- rescue ArgumentError
- spec_dump = @fetcher.fetch_path spec_path
- loaded = true
-
- Marshal.load spec_dump
- end
-
- if loaded and @update_cache then
- begin
- FileUtils.mkdir_p cache_dir
-
- open local_file, 'wb' do |io|
- Marshal.dump specs, io
- end
- rescue
- end
- end
-
- specs
- end
-
- ##
- # Warn about legacy repositories if +exception+ indicates only legacy
- # repositories are available, and yield to the block. Returns false if the
- # exception indicates some other FetchError.
-
- def warn_legacy(exception)
- uri = exception.uri.to_s
- if uri =~ /specs\.#{Regexp.escape Gem.marshal_version}\.gz$/ then
- alert_warning <<-EOF
-RubyGems 1.2+ index not found for:
-\t#{legacy_repos.join "\n\t"}
-
-RubyGems will revert to legacy indexes degrading performance.
- EOF
-
- yield
-
- return true
- end
-
- false
- end
-
-end
-
diff --git a/lib/rubygems/specification.rb b/lib/rubygems/specification.rb
deleted file mode 100644
index 3630b4adf5..0000000000
--- a/lib/rubygems/specification.rb
+++ /dev/null
@@ -1,1444 +0,0 @@
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-require 'rubygems/version'
-require 'rubygems/requirement'
-require 'rubygems/platform'
-
-# :stopdoc:
-class Date; end # for ruby_code if date.rb wasn't required
-# :startdoc:
-
-##
-# The Specification class contains the metadata for a Gem. Typically
-# defined in a .gemspec file or a Rakefile, and looks like this:
-#
-# spec = Gem::Specification.new do |s|
-# s.name = 'rfoo'
-# s.version = '1.0'
-# s.summary = 'Example gem specification'
-# ...
-# end
-#
-# For a great way to package gems, use Hoe.
-
-class Gem::Specification
-
- ##
- # Allows deinstallation of gems with legacy platforms.
-
- attr_accessor :original_platform # :nodoc:
-
- ##
- # The the version number of a specification that does not specify one
- # (i.e. RubyGems 0.7 or earlier).
-
- NONEXISTENT_SPECIFICATION_VERSION = -1
-
- ##
- # The specification version applied to any new Specification instances
- # created. This should be bumped whenever something in the spec format
- # changes.
- #--
- # When updating this number, be sure to also update #to_ruby.
- #
- # NOTE RubyGems < 1.2 cannot load specification versions > 2.
-
- CURRENT_SPECIFICATION_VERSION = 3
-
- ##
- # An informal list of changes to the specification. The highest-valued
- # key should be equal to the CURRENT_SPECIFICATION_VERSION.
-
- SPECIFICATION_VERSION_HISTORY = {
- -1 => ['(RubyGems versions up to and including 0.7 did not have versioned specifications)'],
- 1 => [
- 'Deprecated "test_suite_file" in favor of the new, but equivalent, "test_files"',
- '"test_file=x" is a shortcut for "test_files=[x]"'
- ],
- 2 => [
- 'Added "required_rubygems_version"',
- 'Now forward-compatible with future versions',
- ],
- 3 => [
- 'Added Fixnum validation to the specification_version'
- ]
- }
-
- # :stopdoc:
- MARSHAL_FIELDS = { -1 => 16, 1 => 16, 2 => 16, 3 => 17 }
-
- now = Time.at(Time.now.to_i)
- TODAY = now - ((now.to_i + now.gmt_offset) % 86400)
- # :startdoc:
-
- ##
- # Optional block used to gather newly defined instances.
-
- @@gather = nil
-
- ##
- # List of attribute names: [:name, :version, ...]
-
- @@required_attributes = []
-
- ##
- # List of _all_ attributes and default values:
- #
- # [[:name, nil],
- # [:bindir, 'bin'],
- # ...]
-
- @@attributes = []
-
- @@nil_attributes = []
- @@non_nil_attributes = [:@original_platform]
-
- ##
- # List of array attributes
-
- @@array_attributes = []
-
- ##
- # Map of attribute names to default values.
-
- @@default_value = {}
-
- ##
- # Names of all specification attributes
-
- def self.attribute_names
- @@attributes.map { |name, default| name }
- end
-
- ##
- # Default values for specification attributes
-
- def self.attribute_defaults
- @@attributes.dup
- end
-
- ##
- # The default value for specification attribute +name+
-
- def self.default_value(name)
- @@default_value[name]
- end
-
- ##
- # Required specification attributes
-
- def self.required_attributes
- @@required_attributes.dup
- end
-
- ##
- # Is +name+ a required attribute?
-
- def self.required_attribute?(name)
- @@required_attributes.include? name.to_sym
- end
-
- ##
- # Specification attributes that are arrays (appendable and so-forth)
-
- def self.array_attributes
- @@array_attributes.dup
- end
-
- ##
- # Specifies the +name+ and +default+ for a specification attribute, and
- # creates a reader and writer method like Module#attr_accessor.
- #
- # The reader method returns the default if the value hasn't been set.
-
- def self.attribute(name, default=nil)
- ivar_name = "@#{name}".intern
- if default.nil? then
- @@nil_attributes << ivar_name
- else
- @@non_nil_attributes << [ivar_name, default]
- end
-
- @@attributes << [name, default]
- @@default_value[name] = default
- attr_accessor(name)
- end
-
- ##
- # Same as :attribute, but ensures that values assigned to the attribute
- # are array values by applying :to_a to the value.
-
- def self.array_attribute(name)
- @@non_nil_attributes << ["@#{name}".intern, []]
-
- @@array_attributes << name
- @@attributes << [name, []]
- @@default_value[name] = []
- code = %{
- def #{name}
- @#{name} ||= []
- end
- def #{name}=(value)
- @#{name} = Array(value)
- end
- }
-
- module_eval code, __FILE__, __LINE__ - 9
- end
-
- ##
- # Same as attribute above, but also records this attribute as mandatory.
-
- def self.required_attribute(*args)
- @@required_attributes << args.first
- attribute(*args)
- end
-
- ##
- # Sometimes we don't want the world to use a setter method for a
- # particular attribute.
- #
- # +read_only+ makes it private so we can still use it internally.
-
- def self.read_only(*names)
- names.each do |name|
- private "#{name}="
- end
- end
-
- # Shortcut for creating several attributes at once (each with a default
- # value of +nil+).
-
- def self.attributes(*args)
- args.each do |arg|
- attribute(arg, nil)
- end
- end
-
- ##
- # Some attributes require special behaviour when they are accessed. This
- # allows for that.
-
- def self.overwrite_accessor(name, &block)
- remove_method name
- define_method(name, &block)
- end
-
- ##
- # Defines a _singular_ version of an existing _plural_ attribute (i.e. one
- # whose value is expected to be an array). This means just creating a
- # helper method that takes a single value and appends it to the array.
- # These are created for convenience, so that in a spec, one can write
- #
- # s.require_path = 'mylib'
- #
- # instead of:
- #
- # s.require_paths = ['mylib']
- #
- # That above convenience is available courtesy of:
- #
- # attribute_alias_singular :require_path, :require_paths
-
- def self.attribute_alias_singular(singular, plural)
- define_method("#{singular}=") { |val|
- send("#{plural}=", [val])
- }
- define_method("#{singular}") {
- val = send("#{plural}")
- val.nil? ? nil : val.first
- }
- end
-
- ##
- # Dump only crucial instance variables.
- #--
- # MAINTAIN ORDER!
-
- def _dump(limit)
- Marshal.dump [
- @rubygems_version,
- @specification_version,
- @name,
- @version,
- (Time === @date ? @date : (require 'time'; Time.parse(@date.to_s))),
- @summary,
- @required_ruby_version,
- @required_rubygems_version,
- @original_platform,
- @dependencies,
- @rubyforge_project,
- @email,
- @authors,
- @description,
- @homepage,
- @has_rdoc,
- @new_platform,
- @licenses
- ]
- end
-
- ##
- # Load custom marshal format, re-initializing defaults as needed
-
- def self._load(str)
- array = Marshal.load str
-
- spec = Gem::Specification.new
- spec.instance_variable_set :@specification_version, array[1]
-
- current_version = CURRENT_SPECIFICATION_VERSION
-
- field_count = if spec.specification_version > current_version then
- spec.instance_variable_set :@specification_version,
- current_version
- MARSHAL_FIELDS[current_version]
- else
- MARSHAL_FIELDS[spec.specification_version]
- end
-
- if array.size < field_count then
- raise TypeError, "invalid Gem::Specification format #{array.inspect}"
- end
-
- spec.instance_variable_set :@rubygems_version, array[0]
- # spec version
- spec.instance_variable_set :@name, array[2]
- spec.instance_variable_set :@version, array[3]
- spec.instance_variable_set :@date, array[4]
- spec.instance_variable_set :@summary, array[5]
- spec.instance_variable_set :@required_ruby_version, array[6]
- spec.instance_variable_set :@required_rubygems_version, array[7]
- spec.instance_variable_set :@original_platform, array[8]
- spec.instance_variable_set :@dependencies, array[9]
- spec.instance_variable_set :@rubyforge_project, array[10]
- spec.instance_variable_set :@email, array[11]
- spec.instance_variable_set :@authors, array[12]
- spec.instance_variable_set :@description, array[13]
- spec.instance_variable_set :@homepage, array[14]
- spec.instance_variable_set :@has_rdoc, array[15]
- spec.instance_variable_set :@new_platform, array[16]
- spec.instance_variable_set :@platform, array[16].to_s
- spec.instance_variable_set :@license, array[17]
- spec.instance_variable_set :@loaded, false
-
- spec
- end
-
- ##
- # List of depedencies that will automatically be activated at runtime.
-
- def runtime_dependencies
- dependencies.select { |d| d.type == :runtime || d.type == nil }
- end
-
- ##
- # List of dependencies that are used for development
-
- def development_dependencies
- dependencies.select { |d| d.type == :development }
- end
-
- def test_suite_file # :nodoc:
- warn 'test_suite_file deprecated, use test_files'
- test_files.first
- end
-
- def test_suite_file=(val) # :nodoc:
- warn 'test_suite_file= deprecated, use test_files='
- @test_files = [] unless defined? @test_files
- @test_files << val
- end
-
- ##
- # true when this gemspec has been loaded from a specifications directory.
- # This attribute is not persisted.
-
- attr_accessor :loaded
-
- ##
- # Path this gemspec was loaded from. This attribute is not persisted.
-
- attr_accessor :loaded_from
-
- ##
- # Returns an array with bindir attached to each executable in the
- # executables list
-
- def add_bindir(executables)
- return nil if executables.nil?
-
- if @bindir then
- Array(executables).map { |e| File.join(@bindir, e) }
- else
- executables
- end
- rescue
- return nil
- end
-
- ##
- # Files in the Gem under one of the require_paths
-
- def lib_files
- @files.select do |file|
- require_paths.any? do |path|
- file.index(path) == 0
- end
- end
- end
-
- ##
- # True if this gem was loaded from disk
-
- alias :loaded? :loaded
-
- ##
- # True if this gem has files in test_files
-
- def has_unit_tests?
- not test_files.empty?
- end
-
- # :stopdoc:
- alias has_test_suite? has_unit_tests?
- # :startdoc:
-
- ##
- # Specification constructor. Assigns the default values to the attributes
- # and yields itself for further initialization.
-
- def initialize
- @new_platform = nil
- assign_defaults
- @loaded = false
- @loaded_from = nil
-
- yield self if block_given?
-
- @@gather.call(self) if @@gather
- end
-
- ##
- # Duplicates array_attributes from +other_spec+ so state isn't shared.
-
- def initialize_copy(other_spec)
- other_ivars = other_spec.instance_variables
- other_ivars = other_ivars.map { |ivar| ivar.intern } if # for 1.9
- other_ivars.any? { |ivar| String === ivar }
-
- self.class.array_attributes.each do |name|
- name = :"@#{name}"
- next unless other_ivars.include? name
- instance_variable_set name, other_spec.instance_variable_get(name).dup
- end
- end
-
- ##
- # Each attribute has a default value (possibly nil). Here, we initialize
- # all attributes to their default value. This is done through the
- # accessor methods, so special behaviours will be honored. Furthermore,
- # we take a _copy_ of the default so each specification instance has its
- # own empty arrays, etc.
-
- def assign_defaults
- @@nil_attributes.each do |name|
- instance_variable_set name, nil
- end
-
- @@non_nil_attributes.each do |name, default|
- value = case default
- when Time, Numeric, Symbol, true, false, nil then default
- else default.dup
- end
-
- instance_variable_set name, value
- end
-
- # HACK
- instance_variable_set :@new_platform, Gem::Platform::RUBY
- end
-
- ##
- # Special loader for YAML files. When a Specification object is loaded
- # from a YAML file, it bypasses the normal Ruby object initialization
- # routine (#initialize). This method makes up for that and deals with
- # gems of different ages.
- #
- # 'input' can be anything that YAML.load() accepts: String or IO.
-
- def self.from_yaml(input)
- input = normalize_yaml_input input
- spec = YAML.load input
-
- if spec && spec.class == FalseClass then
- raise Gem::EndOfYAMLException
- end
-
- unless Gem::Specification === spec then
- raise Gem::Exception, "YAML data doesn't evaluate to gem specification"
- end
-
- unless (spec.instance_variables.include? '@specification_version' or
- spec.instance_variables.include? :@specification_version) and
- spec.instance_variable_get :@specification_version
- spec.instance_variable_set :@specification_version,
- NONEXISTENT_SPECIFICATION_VERSION
- end
-
- spec
- end
-
- ##
- # Loads ruby format gemspec from +filename+
-
- def self.load(filename)
- gemspec = nil
- fail "NESTED Specification.load calls not allowed!" if @@gather
- @@gather = proc { |gs| gemspec = gs }
- data = File.read(filename)
- eval(data)
- gemspec
- ensure
- @@gather = nil
- end
-
- ##
- # Make sure the YAML specification is properly formatted with dashes
-
- def self.normalize_yaml_input(input)
- result = input.respond_to?(:read) ? input.read : input
- result = "--- " + result unless result =~ /^--- /
- result
- end
-
- ##
- # Sets the rubygems_version to the current RubyGems version
-
- def mark_version
- @rubygems_version = Gem::RubyGemsVersion
- end
-
- ##
- # Ignore unknown attributes while loading
-
- def method_missing(sym, *a, &b) # :nodoc:
- if @specification_version > CURRENT_SPECIFICATION_VERSION and
- sym.to_s =~ /=$/ then
- warn "ignoring #{sym} loading #{full_name}" if $DEBUG
- else
- super
- end
- end
-
- ##
- # Adds a development dependency named +gem+ with +requirements+ to this
- # Gem. For example:
- #
- # spec.add_development_dependency 'jabber4r', '> 0.1', '<= 0.5'
- #
- # Development dependencies aren't installed by default and aren't
- # activated when a gem is required.
-
- def add_development_dependency(gem, *requirements)
- add_dependency_with_type(gem, :development, *requirements)
- end
-
- ##
- # Adds a runtime dependency named +gem+ with +requirements+ to this Gem.
- # For example:
- #
- # spec.add_runtime_dependency 'jabber4r', '> 0.1', '<= 0.5'
-
- def add_runtime_dependency(gem, *requirements)
- add_dependency_with_type(gem, :runtime, *requirements)
- end
-
- ##
- # Adds a runtime dependency
-
- alias add_dependency add_runtime_dependency
-
- ##
- # Returns the full name (name-version) of this Gem. Platform information
- # is included (name-version-platform) if it is specified and not the
- # default Ruby platform.
-
- def full_name
- if platform == Gem::Platform::RUBY or platform.nil? then
- "#{@name}-#{@version}"
- else
- "#{@name}-#{@version}-#{platform}"
- end
- end
-
- ##
- # Returns the full name (name-version) of this gemspec using the original
- # platform. For use with legacy gems.
-
- def original_name # :nodoc:
- if platform == Gem::Platform::RUBY or platform.nil? then
- "#{@name}-#{@version}"
- else
- "#{@name}-#{@version}-#{@original_platform}"
- end
- end
-
- ##
- # The full path to the gem (install path + full name).
-
- def full_gem_path
- path = File.join installation_path, 'gems', full_name
- return path if File.directory? path
- File.join installation_path, 'gems', original_name
- end
-
- ##
- # The default (generated) file name of the gem.
-
- def file_name
- full_name + ".gem"
- end
-
- ##
- # The directory that this gem was installed into.
-
- def installation_path
- unless @loaded_from then
- raise Gem::Exception, "spec #{full_name} is not from an installed gem"
- end
-
- File.expand_path File.dirname(File.dirname(@loaded_from))
- end
-
- ##
- # Checks if this specification meets the requirement of +dependency+.
-
- def satisfies_requirement?(dependency)
- return @name == dependency.name &&
- dependency.version_requirements.satisfied_by?(@version)
- end
-
- ##
- # Returns an object you can use to sort specifications in #sort_by.
-
- def sort_obj
- [@name, @version, @new_platform == Gem::Platform::RUBY ? -1 : 1]
- end
-
- def <=>(other) # :nodoc:
- sort_obj <=> other.sort_obj
- end
-
- ##
- # Tests specs for equality (across all attributes).
-
- def ==(other) # :nodoc:
- self.class === other && same_attributes?(other)
- end
-
- alias eql? == # :nodoc:
-
- ##
- # True if this gem has the same attributes as +other+.
-
- def same_attributes?(other)
- @@attributes.each do |name, default|
- return false unless self.send(name) == other.send(name)
- end
- true
- end
-
- private :same_attributes?
-
- def hash # :nodoc:
- @@attributes.inject(0) { |hash_code, (name, default_value)|
- n = self.send(name).hash
- hash_code + n
- }
- end
-
- def to_yaml(opts = {}) # :nodoc:
- mark_version
-
- attributes = @@attributes.map { |name,| name.to_s }.sort
- attributes = attributes - %w[name version platform]
-
- yaml = YAML.quick_emit object_id, opts do |out|
- out.map taguri, to_yaml_style do |map|
- map.add 'name', @name
- map.add 'version', @version
- platform = case @original_platform
- when nil, '' then
- 'ruby'
- when String then
- @original_platform
- else
- @original_platform.to_s
- end
- map.add 'platform', platform
-
- attributes.each do |name|
- map.add name, instance_variable_get("@#{name}")
- end
- end
- end
- end
-
- def yaml_initialize(tag, vals) # :nodoc:
- vals.each do |ivar, val|
- instance_variable_set "@#{ivar}", val
- end
-
- @original_platform = @platform # for backwards compatibility
- self.platform = Gem::Platform.new @platform
- end
-
- ##
- # Returns a Ruby code representation of this specification, such that it
- # can be eval'ed and reconstruct the same specification later. Attributes
- # that still have their default values are omitted.
-
- def to_ruby
- mark_version
- result = []
- result << "# -*- encoding: utf-8 -*-"
- result << nil
- result << "Gem::Specification.new do |s|"
-
- result << " s.name = #{ruby_code name}"
- result << " s.version = #{ruby_code version}"
- unless platform.nil? or platform == Gem::Platform::RUBY then
- result << " s.platform = #{ruby_code original_platform}"
- end
- result << ""
- result << " s.required_rubygems_version = #{ruby_code required_rubygems_version} if s.respond_to? :required_rubygems_version="
-
- handled = [
- :dependencies,
- :name,
- :platform,
- :required_rubygems_version,
- :specification_version,
- :version,
- ]
-
- attributes = @@attributes.sort_by { |attr_name,| attr_name.to_s }
-
- attributes.each do |attr_name, default|
- next if handled.include? attr_name
- current_value = self.send(attr_name)
- if current_value != default or
- self.class.required_attribute? attr_name then
- result << " s.#{attr_name} = #{ruby_code current_value}"
- end
- end
-
- result << nil
- result << " if s.respond_to? :specification_version then"
- result << " current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION"
- result << " s.specification_version = #{specification_version}"
- result << nil
-
- result << " if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then"
-
- unless dependencies.empty? then
- dependencies.each do |dep|
- version_reqs_param = dep.requirements_list.inspect
- dep.instance_variable_set :@type, :runtime if dep.type.nil? # HACK
- result << " s.add_#{dep.type}_dependency(%q<#{dep.name}>, #{version_reqs_param})"
- end
- end
-
- result << " else"
-
- unless dependencies.empty? then
- dependencies.each do |dep|
- version_reqs_param = dep.requirements_list.inspect
- result << " s.add_dependency(%q<#{dep.name}>, #{version_reqs_param})"
- end
- end
-
- result << ' end'
-
- result << " else"
- dependencies.each do |dep|
- version_reqs_param = dep.requirements_list.inspect
- result << " s.add_dependency(%q<#{dep.name}>, #{version_reqs_param})"
- end
- result << " end"
-
- result << "end"
- result << nil
-
- result.join "\n"
- end
-
- ##
- # Checks that the specification contains all required fields, and does a
- # very basic sanity check.
- #
- # Raises InvalidSpecificationException if the spec does not pass the
- # checks..
-
- def validate
- extend Gem::UserInteraction
- normalize
-
- if rubygems_version != Gem::RubyGemsVersion then
- raise Gem::InvalidSpecificationException,
- "expected RubyGems version #{Gem::RubyGemsVersion}, was #{rubygems_version}"
- end
-
- @@required_attributes.each do |symbol|
- unless self.send symbol then
- raise Gem::InvalidSpecificationException,
- "missing value for attribute #{symbol}"
- end
- end
-
- unless String === name then
- raise Gem::InvalidSpecificationException,
- "invalid value for attribute name: \"#{name.inspect}\""
- end
-
- if require_paths.empty? then
- raise Gem::InvalidSpecificationException,
- 'specification must have at least one require_path'
- end
-
- @files.delete_if do |file| File.directory? file end
- @test_files.delete_if do |file| File.directory? file end
- @executables.delete_if do |file|
- File.directory? File.join(bindir, file)
- end
- @extra_rdoc_files.delete_if do |file| File.directory? file end
- @extensions.delete_if do |file| File.directory? file end
-
- non_files = files.select do |file|
- !File.file? file
- end
-
- unless non_files.empty? then
- non_files = non_files.map { |file| file.inspect }
- raise Gem::InvalidSpecificationException,
- "[#{non_files.join ", "}] are not files"
- end
-
- unless specification_version.is_a?(Fixnum)
- raise Gem::InvalidSpecificationException,
- 'specification_version must be a Fixnum (did you mean version?)'
- end
-
- case platform
- when Gem::Platform, Gem::Platform::RUBY then # ok
- else
- raise Gem::InvalidSpecificationException,
- "invalid platform #{platform.inspect}, see Gem::Platform"
- end
-
- unless Array === authors and
- authors.all? { |author| String === author } then
- raise Gem::InvalidSpecificationException,
- 'authors must be Array of Strings'
- end
-
- licenses.each { |license|
- if license.length > 64
- raise Gem::InvalidSpecificationException,
- "each license must be 64 characters or less"
- end
- }
-
- # reject FIXME and TODO
-
- unless authors.grep(/FIXME|TODO/).empty? then
- raise Gem::InvalidSpecificationException,
- '"FIXME" or "TODO" is not an author'
- end
-
- unless Array(email).grep(/FIXME|TODO/).empty? then
- raise Gem::InvalidSpecificationException,
- '"FIXME" or "TODO" is not an email address'
- end
-
- if description =~ /FIXME|TODO/ then
- raise Gem::InvalidSpecificationException,
- '"FIXME" or "TODO" is not a description'
- end
-
- if summary =~ /FIXME|TODO/ then
- raise Gem::InvalidSpecificationException,
- '"FIXME" or "TODO" is not a summary'
- end
-
- if homepage and not homepage.empty? and
- homepage !~ /\A[a-z][a-z\d+.-]*:/i then
- raise Gem::InvalidSpecificationException,
- "\"#{homepage}\" is not a URI"
- end
-
- # Warnings
-
- %w[author description email homepage rubyforge_project summary].each do |attribute|
- value = self.send attribute
- alert_warning "no #{attribute} specified" if value.nil? or value.empty?
- end
-
- if summary and not summary.empty? and description == summary then
- alert_warning 'description and summary are identical'
- end
-
- alert_warning "deprecated autorequire specified" if autorequire
-
- executables.each do |executable|
- executable_path = File.join bindir, executable
- shebang = File.read(executable_path, 2) == '#!'
-
- alert_warning "#{executable_path} is missing #! line" unless shebang
- end
-
- true
- end
-
- ##
- # Normalize the list of files so that:
- # * All file lists have redundancies removed.
- # * Files referenced in the extra_rdoc_files are included in the package
- # file list.
-
- def normalize
- if defined?(@extra_rdoc_files) and @extra_rdoc_files then
- @extra_rdoc_files.uniq!
- @files ||= []
- @files.concat(@extra_rdoc_files)
- end
- @files.uniq! if @files
- end
-
- ##
- # Return a list of all gems that have a dependency on this gemspec. The
- # list is structured with entries that conform to:
- #
- # [depending_gem, dependency, [list_of_gems_that_satisfy_dependency]]
-
- def dependent_gems
- out = []
- Gem.source_index.each do |name,gem|
- gem.dependencies.each do |dep|
- if self.satisfies_requirement?(dep) then
- sats = []
- find_all_satisfiers(dep) do |sat|
- sats << sat
- end
- out << [gem, dep, sats]
- end
- end
- end
- out
- end
-
- def to_s # :nodoc:
- "#<Gem::Specification name=#{@name} version=#{@version}>"
- end
-
- def pretty_print(q) # :nodoc:
- q.group 2, 'Gem::Specification.new do |s|', 'end' do
- q.breakable
-
- attributes = @@attributes.sort_by { |attr_name,| attr_name.to_s }
-
- attributes.each do |attr_name, default|
- current_value = self.send attr_name
- if current_value != default or
- self.class.required_attribute? attr_name then
-
- q.text "s.#{attr_name} = "
-
- if attr_name == :date then
- current_value = current_value.utc
-
- q.text "Time.utc(#{current_value.year}, #{current_value.month}, #{current_value.day})"
- else
- q.pp current_value
- end
-
- q.breakable
- end
- end
- end
- end
-
- ##
- # Adds a dependency on gem +dependency+ with type +type+ that requires
- # +requirements+. Valid types are currently <tt>:runtime</tt> and
- # <tt>:development</tt>.
-
- def add_dependency_with_type(dependency, type, *requirements)
- requirements = if requirements.empty? then
- Gem::Requirement.default
- else
- requirements.flatten
- end
-
- unless dependency.respond_to?(:name) &&
- dependency.respond_to?(:version_requirements)
-
- dependency = Gem::Dependency.new(dependency, requirements, type)
- end
-
- dependencies << dependency
- end
-
- private :add_dependency_with_type
-
- ##
- # Finds all gems that satisfy +dep+
-
- def find_all_satisfiers(dep)
- Gem.source_index.each do |_, gem|
- yield gem if gem.satisfies_requirement? dep
- end
- end
-
- private :find_all_satisfiers
-
- ##
- # Return a string containing a Ruby code representation of the given
- # object.
-
- def ruby_code(obj)
- case obj
- when String then '%q{' + obj + '}'
- when Array then obj.inspect
- when Gem::Version then obj.to_s.inspect
- when Date then '%q{' + obj.strftime('%Y-%m-%d') + '}'
- when Time then '%q{' + obj.strftime('%Y-%m-%d') + '}'
- when Numeric then obj.inspect
- when true, false, nil then obj.inspect
- when Gem::Platform then "Gem::Platform.new(#{obj.to_a.inspect})"
- when Gem::Requirement then "Gem::Requirement.new(#{obj.to_s.inspect})"
- else raise Gem::Exception, "ruby_code case not handled: #{obj.class}"
- end
- end
-
- private :ruby_code
-
- # :section: Required gemspec attributes
-
- ##
- # :attr_accessor: rubygems_version
- #
- # The version of RubyGems used to create this gem
-
- required_attribute :rubygems_version, Gem::RubyGemsVersion
-
- ##
- # :attr_accessor: specification_version
- #
- # The Gem::Specification version of this gemspec
-
- required_attribute :specification_version, CURRENT_SPECIFICATION_VERSION
-
- ##
- # :attr_accessor: name
- #
- # This gem's name
-
- required_attribute :name
-
- ##
- # :attr_accessor: version
- #
- # This gem's version
-
- required_attribute :version
-
- ##
- # :attr_accessor: date
- #
- # The date this gem was created
-
- required_attribute :date, TODAY
-
- ##
- # :attr_accessor: summary
- #
- # A short summary of this gem's description. Displayed in `gem list -d`.
-
- required_attribute :summary
-
- ##
- # :attr_accessor: require_paths
- #
- # Paths in the gem to add to $LOAD_PATH when this gem is activated
-
- required_attribute :require_paths, ['lib']
-
- # :section: Optional gemspec attributes
-
- ##
- # :attr_accessor: email
- #
- # A contact email for this gem
-
- attribute :email
-
- ##
- # :attr_accessor: homepage
- #
- # The URL of this gem's home page
-
- attribute :homepage
-
- ##
- # :attr_accessor: rubyforge_project
- #
- # The rubyforge project this gem lives under. i.e. RubyGems'
- # rubyforge_project is "rubygems".
-
- attribute :rubyforge_project
-
- ##
- # :attr_accessor: description
- #
- # A long description of this gem
-
- attribute :description
-
- ##
- # :attr_accessor: autorequire
- #
- # Autorequire was used by old RubyGems to automatically require a file.
- # It no longer is supported.
-
- attribute :autorequire
-
- ##
- # :attr_accessor: default_executable
- #
- # The default executable for this gem.
-
- attribute :default_executable
-
- ##
- # :attr_accessor: bindir
- #
- # The path in the gem for executable scripts
-
- attribute :bindir, 'bin'
-
- ##
- # :attr_accessor: has_rdoc
- #
- # Deprecated and ignored, defaults to true.
- #
- # Formerly used to indicate this gem was RDoc-capable.
-
- attribute :has_rdoc, true
-
- ##
- # True if this gem supports RDoc
-
- alias :has_rdoc? :has_rdoc
-
- ##
- # :attr_accessor: required_ruby_version
- #
- # The ruby of version required by this gem
-
- attribute :required_ruby_version, Gem::Requirement.default
-
- ##
- # :attr_accessor: required_rubygems_version
- #
- # The RubyGems version required by this gem
-
- attribute :required_rubygems_version, Gem::Requirement.default
-
- ##
- # :attr_accessor: platform
- #
- # The platform this gem runs on. See Gem::Platform for details.
-
- attribute :platform, Gem::Platform::RUBY
-
- ##
- # :attr_accessor: signing_key
- #
- # The key used to sign this gem. See Gem::Security for details.
-
- attribute :signing_key, nil
-
- ##
- # :attr_accessor: cert_chain
- #
- # The certificate chain used to sign this gem. See Gem::Security for
- # details.
-
- attribute :cert_chain, []
-
- ##
- # :attr_accessor: post_install_message
- #
- # A message that gets displayed after the gem is installed
-
- attribute :post_install_message, nil
-
- ##
- # :attr_accessor: authors
- #
- # The list of authors who wrote this gem
-
- array_attribute :authors
-
- ##
- # :attr_accessor: licenses
- #
- # The license(s) for the library. Each license must be a short name, no
- # more than 64 characters.
-
- array_attribute :licenses
-
- ##
- # :attr_accessor: files
- #
- # Files included in this gem. You cannot append to this accessor, you must
- # assign to it.
- #
- # Only add files you can require to this list, not directories, etc.
- #
- # Directories are automatically stripped from this list when building a gem,
- # other non-files cause an error.
-
- array_attribute :files
-
- ##
- # :attr_accessor: test_files
- #
- # Test files included in this gem. You cannot append to this accessor, you
- # must assign to it.
-
- array_attribute :test_files
-
- ##
- # :attr_accessor: rdoc_options
- #
- # An ARGV-style array of options to RDoc
-
- array_attribute :rdoc_options
-
- ##
- # :attr_accessor: extra_rdoc_files
- #
- # Extra files to add to RDoc
-
- array_attribute :extra_rdoc_files
-
- ##
- # :attr_accessor: executables
- #
- # Executables included in the gem
-
- array_attribute :executables
-
- ##
- # :attr_accessor: extensions
- #
- # Extensions to build when installing the gem. See
- # Gem::Installer#build_extensions for valid values.
-
- array_attribute :extensions
-
- ##
- # :attr_accessor: requirements
- #
- # An array or things required by this gem. Not used by anything
- # presently.
-
- array_attribute :requirements
-
- ##
- # :attr_reader: dependencies
- #
- # A list of Gem::Dependency objects this gem depends on.
-
- array_attribute :dependencies
-
- read_only :dependencies
-
- # :section: Aliased gemspec attributes
-
- ##
- # Singular accessor for #executables
-
- attribute_alias_singular :executable, :executables
-
- ##
- # Singular accessor for #authors
-
- attribute_alias_singular :author, :authors
-
- ##
- # Singular accessor for #licenses
-
- attribute_alias_singular :license, :licenses
-
- ##
- # Singular accessor for #require_paths
-
- attribute_alias_singular :require_path, :require_paths
-
- ##
- # Singular accessor for #test_files
-
- attribute_alias_singular :test_file, :test_files
-
- ##
- # has_rdoc is now ignored
-
- overwrite_accessor :has_rdoc do
- true
- end
-
- ##
- # has_rdoc is now ignored
-
- overwrite_accessor :has_rdoc= do |value|
- @has_rdoc = true
- end
-
- overwrite_accessor :version= do |version|
- @version = Gem::Version.create(version)
- self.required_rubygems_version = '> 1.3.1' if @version.prerelease?
- return @version
- end
-
- overwrite_accessor :platform do
- @new_platform
- end
-
- overwrite_accessor :platform= do |platform|
- if @original_platform.nil? or
- @original_platform == Gem::Platform::RUBY then
- @original_platform = platform
- end
-
- case platform
- when Gem::Platform::CURRENT then
- @new_platform = Gem::Platform.local
- @original_platform = @new_platform.to_s
-
- when Gem::Platform then
- @new_platform = platform
-
- # legacy constants
- when nil, Gem::Platform::RUBY then
- @new_platform = Gem::Platform::RUBY
- when 'mswin32' then # was Gem::Platform::WIN32
- @new_platform = Gem::Platform.new 'x86-mswin32'
- when 'i586-linux' then # was Gem::Platform::LINUX_586
- @new_platform = Gem::Platform.new 'x86-linux'
- when 'powerpc-darwin' then # was Gem::Platform::DARWIN
- @new_platform = Gem::Platform.new 'ppc-darwin'
- else
- @new_platform = Gem::Platform.new platform
- end
-
- @platform = @new_platform.to_s
-
- @new_platform
- end
-
- overwrite_accessor :required_ruby_version= do |value|
- @required_ruby_version = Gem::Requirement.create(value)
- end
-
- overwrite_accessor :required_rubygems_version= do |value|
- @required_rubygems_version = Gem::Requirement.create(value)
- end
-
- overwrite_accessor :date= do |date|
- # We want to end up with a Time object with one-day resolution.
- # This is the cleanest, most-readable, faster-than-using-Date
- # way to do it.
- case date
- when String then
- @date = if /\A(\d{4})-(\d{2})-(\d{2})\Z/ =~ date then
- Time.local($1.to_i, $2.to_i, $3.to_i)
- else
- require 'time'
- Time.parse date
- end
- when Time then
- @date = Time.local(date.year, date.month, date.day)
- when Date then
- @date = Time.local(date.year, date.month, date.day)
- else
- @date = TODAY
- end
- end
-
- overwrite_accessor :date do
- self.date = nil if @date.nil? # HACK Sets the default value for date
- @date
- end
-
- overwrite_accessor :summary= do |str|
- @summary = if str then
- str.strip.
- gsub(/(\w-)\n[ \t]*(\w)/, '\1\2').
- gsub(/\n[ \t]*/, " ")
- end
- end
-
- overwrite_accessor :description= do |str|
- @description = str.to_s
- end
-
- overwrite_accessor :default_executable do
- begin
- if defined?(@default_executable) and @default_executable
- result = @default_executable
- elsif @executables and @executables.size == 1
- result = Array(@executables).first
- else
- result = nil
- end
- result
- rescue
- nil
- end
- end
-
- overwrite_accessor :test_files do
- # Handle the possibility that we have @test_suite_file but not
- # @test_files. This will happen when an old gem is loaded via
- # YAML.
- if defined? @test_suite_file then
- @test_files = [@test_suite_file].flatten
- @test_suite_file = nil
- end
- if defined?(@test_files) and @test_files then
- @test_files
- else
- @test_files = []
- end
- end
-
- overwrite_accessor :files do
- result = []
- result.push(*@files) if defined?(@files)
- result.push(*@test_files) if defined?(@test_files)
- result.push(*(add_bindir(@executables)))
- result.push(*@extra_rdoc_files) if defined?(@extra_rdoc_files)
- result.push(*@extensions) if defined?(@extensions)
- result.uniq.compact
- end
-
-end
-
diff --git a/lib/rubygems/test_utilities.rb b/lib/rubygems/test_utilities.rb
deleted file mode 100644
index 8b23d3236e..0000000000
--- a/lib/rubygems/test_utilities.rb
+++ /dev/null
@@ -1,131 +0,0 @@
-require 'tempfile'
-require 'rubygems'
-require 'rubygems/remote_fetcher'
-
-##
-# A fake Gem::RemoteFetcher for use in tests or to avoid real live HTTP
-# requests when testing code that uses RubyGems.
-#
-# Example:
-#
-# @fetcher = Gem::FakeFetcher.new
-# @fetcher.data['http://gems.example.com/yaml'] = source_index.to_yaml
-# Gem::RemoteFetcher.fetcher = @fetcher
-#
-# # invoke RubyGems code
-#
-# paths = @fetcher.paths
-# assert_equal 'http://gems.example.com/yaml', paths.shift
-# assert paths.empty?, paths.join(', ')
-#
-# See RubyGems' tests for more examples of FakeFetcher.
-
-class Gem::FakeFetcher
-
- attr_reader :data
- attr_accessor :paths
-
- def initialize
- @data = {}
- @paths = []
- end
-
- def fetch_path path, mtime = nil
- path = path.to_s
- @paths << path
- raise ArgumentError, 'need full URI' unless path =~ %r'^http://'
-
- unless @data.key? path then
- raise Gem::RemoteFetcher::FetchError.new("no data for #{path}", path)
- end
-
- data = @data[path]
-
- if data.respond_to?(:call) then
- data.call
- else
- if path.to_s =~ /gz$/ and not data.nil? and not data.empty? then
- data = Gem.gunzip data
- end
-
- data
- end
- end
-
- def fetch_size(path)
- path = path.to_s
- @paths << path
-
- raise ArgumentError, 'need full URI' unless path =~ %r'^http://'
-
- unless @data.key? path then
- raise Gem::RemoteFetcher::FetchError.new("no data for #{path}", path)
- end
-
- data = @data[path]
-
- data.respond_to?(:call) ? data.call : data.length
- end
-
- def download spec, source_uri, install_dir = Gem.dir
- name = "#{spec.full_name}.gem"
- path = File.join(install_dir, 'cache', name)
-
- Gem.ensure_gem_subdirectories install_dir
-
- if source_uri =~ /^http/ then
- File.open(path, "wb") do |f|
- f.write fetch_path(File.join(source_uri, "gems", name))
- end
- else
- FileUtils.cp source_uri, path
- end
-
- path
- end
-
-end
-
-# :stopdoc:
-class Gem::RemoteFetcher
-
- def self.fetcher=(fetcher)
- @fetcher = fetcher
- end
-
-end
-# :startdoc:
-
-##
-# A StringIO duck-typed class that uses Tempfile instead of String as the
-# backing store.
-#--
-# This class was added to flush out problems in Rubinius' IO implementation.
-
-class TempIO
-
- @@count = 0
-
- def initialize(string = '')
- @tempfile = Tempfile.new "TempIO-#{@@count += 1}"
- @tempfile.binmode
- @tempfile.write string
- @tempfile.rewind
- end
-
- def method_missing(meth, *args, &block)
- @tempfile.send(meth, *args, &block)
- end
-
- def respond_to?(meth)
- @tempfile.respond_to? meth
- end
-
- def string
- @tempfile.flush
-
- Gem.read_binary @tempfile.path
- end
-
-end
-
diff --git a/lib/rubygems/text.rb b/lib/rubygems/text.rb
deleted file mode 100644
index c694e8a9c0..0000000000
--- a/lib/rubygems/text.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-require 'rubygems'
-
-##
-# A collection of text-wrangling methods
-
-module Gem::Text
-
- ##
- # Wraps +text+ to +wrap+ characters and optionally indents by +indent+
- # characters
-
- def format_text(text, wrap, indent=0)
- result = []
- work = text.dup
-
- while work.length > wrap do
- if work =~ /^(.{0,#{wrap}})[ \n]/ then
- result << $1
- work.slice!(0, $&.length)
- else
- result << work.slice!(0, wrap)
- end
- end
-
- result << work if work.length.nonzero?
- result.join("\n").gsub(/^/, " " * indent)
- end
-
-end
-
diff --git a/lib/rubygems/timer.rb b/lib/rubygems/timer.rb
deleted file mode 100644
index 028e640230..0000000000
--- a/lib/rubygems/timer.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# This file defines a $log variable for logging, and a time() method for
-# recording timing information.
-#
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-require 'rubygems'
-
-file, lineno = Gem.location_of_caller
-
-warn "#{file}:#{lineno}:Warning: RubyGems' lib/rubygems/timer.rb deprecated and will be removed on or after June 2009."
-
-$log = Object.new
-
-# :stopdoc:
-def $log.debug(message)
- Gem.debug message
-end
-
-def time(msg, width=25, &block)
- Gem.time(msg, width, &block)
-end
-# :startdoc:
-
diff --git a/lib/rubygems/uninstaller.rb b/lib/rubygems/uninstaller.rb
deleted file mode 100644
index 4bb777a2a2..0000000000
--- a/lib/rubygems/uninstaller.rb
+++ /dev/null
@@ -1,262 +0,0 @@
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-require 'fileutils'
-require 'rubygems'
-require 'rubygems/dependency_list'
-require 'rubygems/doc_manager'
-require 'rubygems/user_interaction'
-
-##
-# An Uninstaller.
-#
-# The uninstaller fires pre and post uninstall hooks. Hooks can be added
-# either through a rubygems_plugin.rb file in an installed gem or via a
-# rubygems/defaults/#{RUBY_ENGINE}.rb or rubygems/defaults/operating_system.rb
-# file. See Gem.pre_uninstall and Gem.post_uninstall for details.
-
-class Gem::Uninstaller
-
- include Gem::UserInteraction
-
- ##
- # The directory a gem's executables will be installed into
-
- attr_reader :bin_dir
-
- ##
- # The gem repository the gem will be installed into
-
- attr_reader :gem_home
-
- ##
- # The Gem::Specification for the gem being uninstalled, only set during
- # #uninstall_gem
-
- attr_reader :spec
-
- ##
- # Constructs an uninstaller that will uninstall +gem+
-
- def initialize(gem, options = {})
- @gem = gem
- @version = options[:version] || Gem::Requirement.default
- gem_home = options[:install_dir] || Gem.dir
- @gem_home = File.expand_path gem_home
- @force_executables = options[:executables]
- @force_all = options[:all]
- @force_ignore = options[:ignore]
- @bin_dir = options[:bin_dir]
-
- # only add user directory if install_dir is not set
- @user_install = false
- @user_install = options[:user_install] unless options[:install_dir]
-
- spec_dir = File.join @gem_home, 'specifications'
- @source_index = Gem::SourceIndex.from_gems_in spec_dir
-
- if @user_install then
- user_dir = File.join Gem.user_dir, 'specifications'
- @user_index = Gem::SourceIndex.from_gems_in user_dir
- end
- end
-
- ##
- # Performs the uninstall of the gem. This removes the spec, the Gem
- # directory, and the cached .gem file.
-
- def uninstall
- list = @source_index.find_name @gem, @version
- list += @user_index.find_name @gem, @version if @user_install
-
- if list.empty? then
- raise Gem::InstallError, "cannot uninstall, check `gem list -d #{@gem}`"
-
- elsif list.size > 1 and @force_all then
- remove_all list.dup
-
- elsif list.size > 1 then
- gem_names = list.collect {|gem| gem.full_name} + ["All versions"]
-
- say
- gem_name, index = choose_from_list "Select gem to uninstall:", gem_names
-
- if index == list.size then
- remove_all list.dup
- elsif index >= 0 && index < list.size then
- uninstall_gem list[index], list.dup
- else
- say "Error: must enter a number [1-#{list.size+1}]"
- end
- else
- uninstall_gem list.first, list.dup
- end
- end
-
- ##
- # Uninstalls gem +spec+
-
- def uninstall_gem(spec, specs)
- @spec = spec
-
- Gem.pre_uninstall_hooks.each do |hook|
- hook.call self
- end
-
- remove_executables @spec
- remove @spec, specs
-
- Gem.post_uninstall_hooks.each do |hook|
- hook.call self
- end
-
- @spec = nil
- end
-
- ##
- # Removes installed executables and batch files (windows only) for
- # +gemspec+.
-
- def remove_executables(spec)
- return if spec.nil?
-
- unless spec.executables.empty? then
- bindir = @bin_dir ? @bin_dir : Gem.bindir(spec.installation_path)
-
- list = @source_index.find_name(spec.name).delete_if { |s|
- s.version == spec.version
- }
-
- executables = spec.executables.clone
-
- list.each do |s|
- s.executables.each do |exe_name|
- executables.delete exe_name
- end
- end
-
- return if executables.empty?
-
- answer = if @force_executables.nil? then
- ask_yes_no("Remove executables:\n" \
- "\t#{spec.executables.join(", ")}\n\nin addition to the gem?",
- true) # " # appease ruby-mode - don't ask
- else
- @force_executables
- end
-
- unless answer then
- say "Executables and scripts will remain installed."
- else
- raise Gem::FilePermissionError, bindir unless File.writable? bindir
-
- spec.executables.each do |exe_name|
- say "Removing #{exe_name}"
- FileUtils.rm_f File.join(bindir, exe_name)
- FileUtils.rm_f File.join(bindir, "#{exe_name}.bat")
- end
- end
- end
- end
-
- ##
- # Removes all gems in +list+.
- #
- # NOTE: removes uninstalled gems from +list+.
-
- def remove_all(list)
- list.dup.each { |spec| uninstall_gem spec, list }
- end
-
- ##
- # spec:: the spec of the gem to be uninstalled
- # list:: the list of all such gems
- #
- # Warning: this method modifies the +list+ parameter. Once it has
- # uninstalled a gem, it is removed from that list.
-
- def remove(spec, list)
- unless dependencies_ok? spec then
- raise Gem::DependencyRemovalException,
- "Uninstallation aborted due to dependent gem(s)"
- end
-
- unless path_ok?(@gem_home, spec) or
- (@user_install and path_ok?(Gem.user_dir, spec)) then
- e = Gem::GemNotInHomeException.new \
- "Gem is not installed in directory #{@gem_home}"
- e.spec = spec
-
- raise e
- end
-
- raise Gem::FilePermissionError, spec.installation_path unless
- File.writable?(spec.installation_path)
-
- FileUtils.rm_rf spec.full_gem_path
-
- original_platform_name = [
- spec.name, spec.version, spec.original_platform].join '-'
-
- spec_dir = File.join spec.installation_path, 'specifications'
- gemspec = File.join spec_dir, "#{spec.full_name}.gemspec"
-
- unless File.exist? gemspec then
- gemspec = File.join spec_dir, "#{original_platform_name}.gemspec"
- end
-
- FileUtils.rm_rf gemspec
-
- cache_dir = File.join spec.installation_path, 'cache'
- gem = File.join cache_dir, "#{spec.full_name}.gem"
-
- unless File.exist? gem then
- gem = File.join cache_dir, "#{original_platform_name}.gem"
- end
-
- FileUtils.rm_rf gem
-
- Gem::DocManager.new(spec).uninstall_doc
-
- say "Successfully uninstalled #{spec.full_name}"
-
- list.delete spec
- end
-
- ##
- # Is +spec+ in +gem_dir+?
-
- def path_ok?(gem_dir, spec)
- full_path = File.join gem_dir, 'gems', spec.full_name
- original_path = File.join gem_dir, 'gems', spec.original_name
-
- full_path == spec.full_gem_path || original_path == spec.full_gem_path
- end
-
- def dependencies_ok?(spec)
- return true if @force_ignore
-
- deplist = Gem::DependencyList.from_source_index @source_index
- deplist.add(*@user_index.gems.values) if @user_install
- deplist.ok_to_remove?(spec.full_name) || ask_if_ok(spec)
- end
-
- def ask_if_ok(spec)
- msg = ['']
- msg << 'You have requested to uninstall the gem:'
- msg << "\t#{spec.full_name}"
- spec.dependent_gems.each do |gem,dep,satlist|
- msg <<
- ("#{gem.name}-#{gem.version} depends on " +
- "[#{dep.name} (#{dep.version_requirements})]")
- end
- msg << 'If you remove this gems, one or more dependencies will not be met.'
- msg << 'Continue with Uninstall?'
- return ask_yes_no(msg.join("\n"), true)
- end
-
-end
-
diff --git a/lib/rubygems/user_interaction.rb b/lib/rubygems/user_interaction.rb
deleted file mode 100644
index 6a80c7c0bc..0000000000
--- a/lib/rubygems/user_interaction.rb
+++ /dev/null
@@ -1,390 +0,0 @@
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-##
-# Module that defines the default UserInteraction. Any class including this
-# module will have access to the +ui+ method that returns the default UI.
-
-module Gem::DefaultUserInteraction
-
- ##
- # The default UI is a class variable of the singleton class for this
- # module.
-
- @ui = nil
-
- ##
- # Return the default UI.
-
- def self.ui
- @ui ||= Gem::ConsoleUI.new
- end
-
- ##
- # Set the default UI. If the default UI is never explicitly set, a simple
- # console based UserInteraction will be used automatically.
-
- def self.ui=(new_ui)
- @ui = new_ui
- end
-
- ##
- # Use +new_ui+ for the duration of +block+.
-
- def self.use_ui(new_ui)
- old_ui = @ui
- @ui = new_ui
- yield
- ensure
- @ui = old_ui
- end
-
- ##
- # See DefaultUserInteraction::ui
-
- def ui
- Gem::DefaultUserInteraction.ui
- end
-
- ##
- # See DefaultUserInteraction::ui=
-
- def ui=(new_ui)
- Gem::DefaultUserInteraction.ui = new_ui
- end
-
- ##
- # See DefaultUserInteraction::use_ui
-
- def use_ui(new_ui, &block)
- Gem::DefaultUserInteraction.use_ui(new_ui, &block)
- end
-
-end
-
-##
-# Make the default UI accessable without the "ui." prefix. Classes
-# including this module may use the interaction methods on the default UI
-# directly. Classes may also reference the ui and ui= methods.
-#
-# Example:
-#
-# class X
-# include Gem::UserInteraction
-#
-# def get_answer
-# n = ask("What is the meaning of life?")
-# end
-# end
-
-module Gem::UserInteraction
-
- include Gem::DefaultUserInteraction
-
- ##
- # :method: alert
-
- ##
- # :method: alert_error
-
- ##
- # :method: alert_warning
-
- ##
- # :method: ask
-
- ##
- # :method: ask_yes_no
-
- ##
- # :method: choose_from_list
-
- ##
- # :method: say
-
- ##
- # :method: terminate_interaction
-
- [:alert,
- :alert_error,
- :alert_warning,
- :ask,
- :ask_yes_no,
- :choose_from_list,
- :say,
- :terminate_interaction ].each do |methname|
- class_eval %{
- def #{methname}(*args)
- ui.#{methname}(*args)
- end
- }, __FILE__, __LINE__
- end
-end
-
-##
-# Gem::StreamUI implements a simple stream based user interface.
-
-class Gem::StreamUI
-
- attr_reader :ins, :outs, :errs
-
- def initialize(in_stream, out_stream, err_stream=STDERR)
- @ins = in_stream
- @outs = out_stream
- @errs = err_stream
- end
-
- ##
- # Choose from a list of options. +question+ is a prompt displayed above
- # the list. +list+ is a list of option strings. Returns the pair
- # [option_name, option_index].
-
- def choose_from_list(question, list)
- @outs.puts question
-
- list.each_with_index do |item, index|
- @outs.puts " #{index+1}. #{item}"
- end
-
- @outs.print "> "
- @outs.flush
-
- result = @ins.gets
-
- return nil, nil unless result
-
- result = result.strip.to_i - 1
- return list[result], result
- end
-
- ##
- # Ask a question. Returns a true for yes, false for no. If not connected
- # to a tty, raises an exception if default is nil, otherwise returns
- # default.
-
- def ask_yes_no(question, default=nil)
- unless @ins.tty? then
- if default.nil? then
- raise Gem::OperationNotSupportedError,
- "Not connected to a tty and no default specified"
- else
- return default
- end
- end
-
- qstr = case default
- when nil
- 'yn'
- when true
- 'Yn'
- else
- 'yN'
- end
-
- result = nil
-
- while result.nil?
- result = ask("#{question} [#{qstr}]")
- result = case result
- when /^[Yy].*/
- true
- when /^[Nn].*/
- false
- when /^$/
- default
- else
- nil
- end
- end
-
- return result
- end
-
- ##
- # Ask a question. Returns an answer if connected to a tty, nil otherwise.
-
- def ask(question)
- return nil if not @ins.tty?
-
- @outs.print(question + " ")
- @outs.flush
-
- result = @ins.gets
- result.chomp! if result
- result
- end
-
- ##
- # Display a statement.
-
- def say(statement="")
- @outs.puts statement
- end
-
- ##
- # Display an informational alert. Will ask +question+ if it is not nil.
-
- def alert(statement, question=nil)
- @outs.puts "INFO: #{statement}"
- ask(question) if question
- end
-
- ##
- # Display a warning in a location expected to get error messages. Will
- # ask +question+ if it is not nil.
-
- def alert_warning(statement, question=nil)
- @errs.puts "WARNING: #{statement}"
- ask(question) if question
- end
-
- ##
- # Display an error message in a location expected to get error messages.
- # Will ask +question+ if it is not nil.
-
- def alert_error(statement, question=nil)
- @errs.puts "ERROR: #{statement}"
- ask(question) if question
- end
-
- ##
- # Display a debug message on the same location as error messages.
-
- def debug(statement)
- @errs.puts statement
- end
-
- ##
- # Terminate the application with exit code +status+, running any exit
- # handlers that might have been defined.
-
- def terminate_interaction(status = 0)
- raise Gem::SystemExitException, status
- end
-
- ##
- # Return a progress reporter object chosen from the current verbosity.
-
- def progress_reporter(*args)
- case Gem.configuration.verbose
- when nil, false
- SilentProgressReporter.new(@outs, *args)
- when true
- SimpleProgressReporter.new(@outs, *args)
- else
- VerboseProgressReporter.new(@outs, *args)
- end
- end
-
- ##
- # An absolutely silent progress reporter.
-
- class SilentProgressReporter
- attr_reader :count
-
- def initialize(out_stream, size, initial_message, terminal_message = nil)
- end
-
- def updated(message)
- end
-
- def done
- end
- end
-
- ##
- # A basic dotted progress reporter.
-
- class SimpleProgressReporter
-
- include Gem::DefaultUserInteraction
-
- attr_reader :count
-
- def initialize(out_stream, size, initial_message,
- terminal_message = "complete")
- @out = out_stream
- @total = size
- @count = 0
- @terminal_message = terminal_message
-
- @out.puts initial_message
- end
-
- ##
- # Prints out a dot and ignores +message+.
-
- def updated(message)
- @count += 1
- @out.print "."
- @out.flush
- end
-
- ##
- # Prints out the terminal message.
-
- def done
- @out.puts "\n#{@terminal_message}"
- end
-
- end
-
- ##
- # A progress reporter that prints out messages about the current progress.
-
- class VerboseProgressReporter
-
- include Gem::DefaultUserInteraction
-
- attr_reader :count
-
- def initialize(out_stream, size, initial_message,
- terminal_message = 'complete')
- @out = out_stream
- @total = size
- @count = 0
- @terminal_message = terminal_message
-
- @out.puts initial_message
- end
-
- ##
- # Prints out the position relative to the total and the +message+.
-
- def updated(message)
- @count += 1
- @out.puts "#{@count}/#{@total}: #{message}"
- end
-
- ##
- # Prints out the terminal message.
-
- def done
- @out.puts @terminal_message
- end
- end
-
-end
-
-##
-# Subclass of StreamUI that instantiates the user interaction using STDIN,
-# STDOUT, and STDERR.
-
-class Gem::ConsoleUI < Gem::StreamUI
- def initialize
- super STDIN, STDOUT, STDERR
- end
-end
-
-##
-# SilentUI is a UI choice that is absolutely silent.
-
-class Gem::SilentUI
- def method_missing(sym, *args, &block)
- self
- end
-end
-
diff --git a/lib/rubygems/validator.rb b/lib/rubygems/validator.rb
deleted file mode 100644
index 9bccc605b5..0000000000
--- a/lib/rubygems/validator.rb
+++ /dev/null
@@ -1,242 +0,0 @@
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-require 'find'
-
-require 'digest'
-require 'rubygems/format'
-require 'rubygems/installer'
-
-# Load test-unit 2.x if it's a gem
-begin
- Gem.activate('test-unit')
-rescue Gem::LoadError
- # Ignore - use the test-unit library that's part of the standard library
-end
-
-##
-# Validator performs various gem file and gem database validation
-
-class Gem::Validator
-
- include Gem::UserInteraction
-
- ##
- # Given a gem file's contents, validates against its own MD5 checksum
- # gem_data:: [String] Contents of the gem file
-
- def verify_gem(gem_data)
- raise Gem::VerificationError, 'empty gem file' if gem_data.size == 0
-
- unless gem_data =~ /MD5SUM/ then
- return # Don't worry about it...this sucks. Need to fix MD5 stuff for
- # new format
- # FIXME
- end
-
- sum_data = gem_data.gsub(/MD5SUM = "([a-z0-9]+)"/,
- "MD5SUM = \"#{"F" * 32}\"")
-
- unless Digest::MD5.hexdigest(sum_data) == $1.to_s then
- raise Gem::VerificationError, 'invalid checksum for gem file'
- end
- end
-
- ##
- # Given the path to a gem file, validates against its own MD5 checksum
- #
- # gem_path:: [String] Path to gem file
-
- def verify_gem_file(gem_path)
- open gem_path, Gem.binary_mode do |file|
- gem_data = file.read
- verify_gem gem_data
- end
- rescue Errno::ENOENT, Errno::EINVAL
- raise Gem::VerificationError, "missing gem file #{gem_path}"
- end
-
- private
-
- def find_files_for_gem(gem_directory)
- installed_files = []
- Find.find gem_directory do |file_name|
- fn = file_name[gem_directory.size..file_name.size-1].sub(/^\//, "")
- installed_files << fn unless
- fn =~ /CVS/ || fn.empty? || File.directory?(file_name)
- end
- installed_files
- end
-
- public
-
- ErrorData = Struct.new :path, :problem
-
- ##
- # Checks the gem directory for the following potential
- # inconsistencies/problems:
- #
- # * Checksum gem itself
- # * For each file in each gem, check consistency of installed versions
- # * Check for files that aren't part of the gem but are in the gems directory
- # * 1 cache - 1 spec - 1 directory.
- #
- # returns a hash of ErrorData objects, keyed on the problem gem's name.
-
- def alien(gems=[])
- errors = Hash.new { |h,k| h[k] = {} }
-
- Gem::SourceIndex.from_installed_gems.each do |gem_name, gem_spec|
- next unless gems.include? gem_spec.name unless gems.empty?
-
- install_dir = gem_spec.installation_path
- gem_path = File.join(install_dir, "cache", gem_spec.full_name) + ".gem"
- spec_path = File.join(install_dir, "specifications",
- gem_spec.full_name) + ".gemspec"
- gem_directory = gem_spec.full_gem_path
-
- unless File.directory? gem_directory then
- errors[gem_name][gem_spec.full_name] =
- "Gem registered but doesn't exist at #{gem_directory}"
- next
- end
-
- unless File.exist? spec_path then
- errors[gem_name][spec_path] = "Spec file missing for installed gem"
- end
-
- begin
- verify_gem_file(gem_path)
-
- good, gone, unreadable = nil, nil, nil, nil
-
- open gem_path, Gem.binary_mode do |file|
- format = Gem::Format.from_file_by_path(gem_path)
-
- good, gone = format.file_entries.partition { |entry, _|
- File.exist? File.join(gem_directory, entry['path'])
- }
-
- gone.map! { |entry, _| entry['path'] }
- gone.sort.each do |path|
- errors[gem_name][path] = "Missing file"
- end
-
- good, unreadable = good.partition { |entry, _|
- File.readable? File.join(gem_directory, entry['path'])
- }
-
- unreadable.map! { |entry, _| entry['path'] }
- unreadable.sort.each do |path|
- errors[gem_name][path] = "Unreadable file"
- end
-
- good.each do |entry, data|
- begin
- next unless data # HACK `gem check -a mkrf`
-
- open File.join(gem_directory, entry['path']), Gem.binary_mode do |f|
- unless Digest::MD5.hexdigest(f.read).to_s ==
- Digest::MD5.hexdigest(data).to_s then
- errors[gem_name][entry['path']] = "Modified from original"
- end
- end
- end
- end
- end
-
- installed_files = find_files_for_gem(gem_directory)
- good.map! { |entry, _| entry['path'] }
- extras = installed_files - good - unreadable
-
- extras.each do |extra|
- errors[gem_name][extra] = "Extra file"
- end
- rescue Gem::VerificationError => e
- errors[gem_name][gem_path] = e.message
- end
- end
-
- errors.each do |name, subhash|
- errors[name] = subhash.map { |path, msg| ErrorData.new(path, msg) }
- end
-
- errors
- end
-
- if RUBY_VERSION < '1.9' then
- class TestRunner
- def initialize(suite, ui)
- @suite = suite
- @ui = ui
- end
-
- def self.run(suite, ui)
- require 'test/unit/ui/testrunnermediator'
- return new(suite, ui).start
- end
-
- def start
- @mediator = Test::Unit::UI::TestRunnerMediator.new(@suite)
- @mediator.add_listener(Test::Unit::TestResult::FAULT, &method(:add_fault))
- return @mediator.run_suite
- end
-
- def add_fault(fault)
- if Gem.configuration.verbose then
- @ui.say fault.long_display
- end
- end
- end
-
- autoload :TestRunner, 'test/unit/ui/testrunnerutilities'
- end
-
- ##
- # Runs unit tests for a given gem specification
-
- def unit_test(gem_spec)
- start_dir = Dir.pwd
- Dir.chdir(gem_spec.full_gem_path)
- $: << gem_spec.full_gem_path
- # XXX: why do we need this gem_spec when we've already got 'spec'?
- test_files = gem_spec.test_files
-
- if test_files.empty? then
- say "There are no unit tests to run for #{gem_spec.full_name}"
- return nil
- end
-
- gem gem_spec.name, "= #{gem_spec.version.version}"
-
- test_files.each do |f| require f end
-
- if RUBY_VERSION < '1.9' then
- suite = Test::Unit::TestSuite.new("#{gem_spec.name}-#{gem_spec.version}")
-
- ObjectSpace.each_object(Class) do |klass|
- suite << klass.suite if (klass < Test::Unit::TestCase)
- end
-
- result = TestRunner.run suite, ui
-
- alert_error result.to_s unless result.passed?
- else
- result = MiniTest::Unit.new
- result.run
- end
-
- result
- ensure
- Dir.chdir(start_dir)
- end
-
- def remove_leading_dot_dir(path)
- path.sub(/^\.\//, "")
- end
-
-end
-
diff --git a/lib/rubygems/version.rb b/lib/rubygems/version.rb
deleted file mode 100644
index 7c49a34a73..0000000000
--- a/lib/rubygems/version.rb
+++ /dev/null
@@ -1,251 +0,0 @@
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-##
-# The Version class processes string versions into comparable
-# values. A version string should normally be a series of numbers
-# separated by periods. Each part (digits separated by periods) is
-# considered its own number, and these are used for sorting. So for
-# instance, 3.10 sorts higher than 3.2 because ten is greater than
-# two.
-#
-# If any part contains letters (currently only a-z are supported) then
-# that version is considered prerelease. Versions with a prerelease
-# part in the Nth part sort less than versions with N-1 parts. Prerelease
-# parts are sorted alphabetically using the normal Ruby string sorting
-# rules.
-#
-# Prereleases sort between real releases (newest to oldest):
-#
-# 1. 1.0
-# 2. 1.0.b
-# 3. 1.0.a
-# 4. 0.9
-
-class Gem::Version
-
- class Part
- include Comparable
-
- attr_reader :value
-
- def initialize(value)
- @value = (value =~ /\A\d+\z/) ? value.to_i : value
- end
-
- def to_s
- self.value.to_s
- end
-
- def inspect
- @value
- end
-
- def alpha?
- String === value
- end
-
- def numeric?
- Fixnum === value
- end
-
- def <=>(other)
- if self.numeric? && other.alpha? then
- 1
- elsif self.alpha? && other.numeric? then
- -1
- else
- self.value <=> other.value
- end
- end
-
- def succ
- self.class.new(self.value.succ)
- end
- end
-
- include Comparable
-
- VERSION_PATTERN = '[0-9]+(\.[0-9a-z]+)*'
-
- attr_reader :version
-
- def self.correct?(version)
- pattern = /\A\s*(#{VERSION_PATTERN})*\s*\z/
-
- version.is_a? Integer or
- version =~ pattern or
- version.to_s =~ pattern
- end
-
- ##
- # Factory method to create a Version object. Input may be a Version or a
- # String. Intended to simplify client code.
- #
- # ver1 = Version.create('1.3.17') # -> (Version object)
- # ver2 = Version.create(ver1) # -> (ver1)
- # ver3 = Version.create(nil) # -> nil
-
- def self.create(input)
- if input.respond_to? :version then
- input
- elsif input.nil? then
- nil
- else
- new input
- end
- end
-
- ##
- # Constructs a Version from the +version+ string. A version string is a
- # series of digits or ASCII letters separated by dots.
-
- def initialize(version)
- raise ArgumentError, "Malformed version number string #{version}" unless
- self.class.correct?(version)
-
- self.version = version
- end
-
- def inspect # :nodoc:
- "#<#{self.class} #{@version.inspect}>"
- end
-
- ##
- # Dump only the raw version string, not the complete object
-
- def marshal_dump
- [@version]
- end
-
- ##
- # Load custom marshal format
-
- def marshal_load(array)
- self.version = array[0]
- end
-
- def parts
- @parts ||= normalize
- end
-
- ##
- # Strip ignored trailing zeros.
-
- def normalize
- parts_arr = parse_parts_from_version_string
- if parts_arr.length != 1
- parts_arr.pop while parts_arr.last && parts_arr.last.value == 0
- parts_arr = [Part.new(0)] if parts_arr.empty?
- end
- parts_arr
- end
-
- ##
- # Returns the text representation of the version
-
- def to_s
- @version
- end
-
- def to_yaml_properties
- ['@version']
- end
-
- def version=(version)
- @version = version.to_s.strip
- normalize
- end
-
- ##
- # A version is considered a prerelease if any part contains a letter.
-
- def prerelease?
- parts.any? { |part| part.alpha? }
- end
-
- ##
- # The release for this version (e.g. 1.2.0.a -> 1.2.0)
- # Non-prerelease versions return themselves
- def release
- return self unless prerelease?
- rel_parts = parts.dup
- rel_parts.pop while rel_parts.any? { |part| part.alpha? }
- self.class.new(rel_parts.join('.'))
- end
-
- def yaml_initialize(tag, values)
- self.version = values['version']
- end
-
- ##
- # Compares this version with +other+ returning -1, 0, or 1 if the other
- # version is larger, the same, or smaller than this one.
-
- def <=>(other)
- return nil unless self.class === other
- return 1 unless other
- mine, theirs = balance(self.parts.dup, other.parts.dup)
- mine <=> theirs
- end
-
- def balance(a, b)
- a << Part.new(0) while a.size < b.size
- b << Part.new(0) while b.size < a.size
- [a, b]
- end
-
- ##
- # A Version is only eql? to another version if it has the same version
- # string. "1.0" is not the same version as "1".
-
- def eql?(other)
- self.class === other and @version == other.version
- end
-
- def hash # :nodoc:
- @version.hash
- end
-
- ##
- # Return a new version object where the next to the last revision number is
- # one greater. (e.g. 5.3.1 => 5.4)
- #
- # Pre-release (alpha) parts are ignored. (e.g 5.3.1.b2 => 5.4)
-
- def bump
- parts = parse_parts_from_version_string
- parts.pop while parts.any? { |part| part.alpha? }
- parts.pop if parts.size > 1
- parts[-1] = parts[-1].succ
- self.class.new(parts.join("."))
- end
-
- def parse_parts_from_version_string # :nodoc:
- @version.to_s.scan(/[0-9a-z]+/i).map { |s| Part.new(s) }
- end
-
- def pretty_print(q) # :nodoc:
- q.text "Gem::Version.new(#{@version.inspect})"
- end
-
- #:stopdoc:
-
- require 'rubygems/requirement'
-
- ##
- # Gem::Requirement's original definition is nested in Version.
- # Although an inappropriate place, current gems specs reference the nested
- # class name explicitly. To remain compatible with old software loading
- # gemspecs, we leave a copy of original definition in Version, but define an
- # alias Gem::Requirement for use everywhere else.
-
- Requirement = ::Gem::Requirement
-
- # :startdoc:
-
-end
-
diff --git a/lib/rubygems/version_option.rb b/lib/rubygems/version_option.rb
deleted file mode 100644
index a69b732f78..0000000000
--- a/lib/rubygems/version_option.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-require 'rubygems'
-
-# Mixin methods for --version and --platform Gem::Command options.
-module Gem::VersionOption
-
- # Add the --platform option to the option parser.
- def add_platform_option(task = command, *wrap)
- OptionParser.accept Gem::Platform do |value|
- if value == Gem::Platform::RUBY then
- value
- else
- Gem::Platform.new value
- end
- end
-
- add_option('--platform PLATFORM', Gem::Platform,
- "Specify the platform of gem to #{task}", *wrap) do
- |value, options|
- unless options[:added_platform] then
- Gem.platforms = [Gem::Platform::RUBY]
- options[:added_platform] = true
- end
-
- Gem.platforms << value unless Gem.platforms.include? value
- end
- end
-
- # Add the --version option to the option parser.
- def add_version_option(task = command, *wrap)
- OptionParser.accept Gem::Requirement do |value|
- Gem::Requirement.new value
- end
-
- add_option('-v', '--version VERSION', Gem::Requirement,
- "Specify version of gem to #{task}", *wrap) do
- |value, options|
- options[:version] = value
- options[:prerelease] = true if value.prerelease?
- end
- end
-
-end
-
diff --git a/lib/rubyunit.rb b/lib/rubyunit.rb
new file mode 100644
index 0000000000..1aca37864f
--- /dev/null
+++ b/lib/rubyunit.rb
@@ -0,0 +1,6 @@
+# Author:: Nathaniel Talbott.
+# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+require 'runit/testcase'
+require 'test/unit'
diff --git a/lib/runit/assert.rb b/lib/runit/assert.rb
new file mode 100644
index 0000000000..c752b19a25
--- /dev/null
+++ b/lib/runit/assert.rb
@@ -0,0 +1,73 @@
+# Author:: Nathaniel Talbott.
+# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+require 'test/unit/assertions'
+require 'runit/error'
+
+module RUNIT
+ module Assert
+ include Test::Unit::Assertions
+
+ def setup_assert
+ end
+
+ def assert_no_exception(*args, &block)
+ assert_nothing_raised(*args, &block)
+ end
+
+ # To deal with the fact that RubyUnit does not check that the
+ # regular expression is, indeed, a regular expression, if it is
+ # not, we do our own assertion using the same semantics as
+ # RubyUnit
+ def assert_match(actual_string, expected_re, message="")
+ _wrap_assertion {
+ full_message = build_message(message, "Expected <?> to match <?>", actual_string, expected_re)
+ assert_block(full_message) {
+ expected_re =~ actual_string
+ }
+ Regexp.last_match
+ }
+ end
+
+ def assert_not_nil(actual, message="")
+ assert(!actual.nil?, message)
+ end
+
+ def assert_not_match(actual_string, expected_re, message="")
+ assert_no_match(expected_re, actual_string, message)
+ end
+
+ def assert_matches(*args)
+ assert_match(*args)
+ end
+
+ def assert_fail(message="")
+ flunk(message)
+ end
+
+ def assert_equal_float(expected, actual, delta, message="")
+ assert_in_delta(expected, actual, delta, message)
+ end
+
+ def assert_send(object, method, *args)
+ super([object, method, *args])
+ end
+
+ def assert_exception(exception, message="", &block)
+ assert_raises(exception, message, &block)
+ end
+
+ def assert_respond_to(method, object, message="")
+ if (called_internally?)
+ super
+ else
+ super(object, method, message)
+ end
+ end
+
+ def called_internally?
+ /assertions\.rb/.match(caller[1])
+ end
+ end
+end
diff --git a/lib/runit/cui/testrunner.rb b/lib/runit/cui/testrunner.rb
new file mode 100644
index 0000000000..d521ec16ad
--- /dev/null
+++ b/lib/runit/cui/testrunner.rb
@@ -0,0 +1,51 @@
+# Author:: Nathaniel Talbott.
+# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+require 'test/unit/ui/console/testrunner'
+require 'runit/testresult'
+
+module RUNIT
+ module CUI
+ class TestRunner < Test::Unit::UI::Console::TestRunner
+ @@quiet_mode = false
+
+ def self.run(suite)
+ self.new().run(suite)
+ end
+
+ def initialize
+ super nil
+ end
+
+ def run(suite, quiet_mode=@@quiet_mode)
+ @suite = suite
+ def @suite.suite
+ self
+ end
+ @output_level = (quiet_mode ? Test::Unit::UI::PROGRESS_ONLY : Test::Unit::UI::VERBOSE)
+ start
+ end
+
+ def create_mediator(suite)
+ mediator = Test::Unit::UI::TestRunnerMediator.new(suite)
+ class << mediator
+ attr_writer :result_delegate
+ def create_result
+ return @result_delegate.create_result
+ end
+ end
+ mediator.result_delegate = self
+ return mediator
+ end
+
+ def create_result
+ return RUNIT::TestResult.new
+ end
+
+ def self.quiet_mode=(boolean)
+ @@quiet_mode = boolean
+ end
+ end
+ end
+end
diff --git a/lib/runit/error.rb b/lib/runit/error.rb
new file mode 100644
index 0000000000..4a727fb02b
--- /dev/null
+++ b/lib/runit/error.rb
@@ -0,0 +1,9 @@
+# Author:: Nathaniel Talbott.
+# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+require 'test/unit/assertionfailederror.rb'
+
+module RUNIT
+ AssertionFailedError = Test::Unit::AssertionFailedError
+end
diff --git a/lib/runit/testcase.rb b/lib/runit/testcase.rb
new file mode 100644
index 0000000000..4576cb8644
--- /dev/null
+++ b/lib/runit/testcase.rb
@@ -0,0 +1,45 @@
+# Author:: Nathaniel Talbott.
+# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+require 'runit/testresult'
+require 'runit/testsuite'
+require 'runit/assert'
+require 'runit/error'
+require 'test/unit/testcase'
+
+module RUNIT
+ class TestCase < Test::Unit::TestCase
+ include RUNIT::Assert
+
+ def self.suite
+ method_names = instance_methods(true)
+ tests = method_names.delete_if { |method_name| method_name !~ /^test/ }
+ suite = TestSuite.new(name)
+ tests.each {
+ |test|
+ catch(:invalid_test) {
+ suite << new(test, name)
+ }
+ }
+ return suite
+ end
+
+ def initialize(test_name, suite_name=self.class.name)
+ super(test_name)
+ end
+
+ def assert_equals(*args)
+ assert_equal(*args)
+ end
+
+ def name
+ super.sub(/^(.*?)\((.*)\)$/, '\2#\1')
+ end
+
+ def run(result, &progress_block)
+ progress_block = proc {} unless (block_given?)
+ super(result, &progress_block)
+ end
+ end
+end
diff --git a/lib/runit/testresult.rb b/lib/runit/testresult.rb
new file mode 100644
index 0000000000..7f70778171
--- /dev/null
+++ b/lib/runit/testresult.rb
@@ -0,0 +1,44 @@
+# Author:: Nathaniel Talbott.
+# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+require 'test/unit/testresult'
+
+module RUNIT
+ class TestResult < Test::Unit::TestResult
+ attr_reader(:errors, :failures)
+ def succeed?
+ return passed?
+ end
+ def failure_size
+ return failure_count
+ end
+ def run_asserts
+ return assertion_count
+ end
+ def error_size
+ return error_count
+ end
+ def run_tests
+ return run_count
+ end
+ def add_failure(failure)
+ def failure.at
+ return location
+ end
+ def failure.err
+ return message
+ end
+ super(failure)
+ end
+ def add_error(error)
+ def error.at
+ return location
+ end
+ def error.err
+ return exception
+ end
+ super(error)
+ end
+ end
+end
diff --git a/lib/runit/testsuite.rb b/lib/runit/testsuite.rb
new file mode 100644
index 0000000000..63baf65707
--- /dev/null
+++ b/lib/runit/testsuite.rb
@@ -0,0 +1,26 @@
+# Author:: Nathaniel Talbott.
+# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+require 'test/unit/testsuite'
+
+module RUNIT
+ class TestSuite < Test::Unit::TestSuite
+ def add_test(*args)
+ add(*args)
+ end
+
+ def add(*args)
+ self.<<(*args)
+ end
+
+ def count_test_cases
+ return size
+ end
+
+ def run(result, &progress_block)
+ progress_block = proc {} unless (block_given?)
+ super(result, &progress_block)
+ end
+ end
+end
diff --git a/lib/runit/topublic.rb b/lib/runit/topublic.rb
new file mode 100644
index 0000000000..566f0dd35c
--- /dev/null
+++ b/lib/runit/topublic.rb
@@ -0,0 +1,8 @@
+# Author:: Nathaniel Talbott.
+# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+module RUNIT
+ module ToPublic
+ end
+end
diff --git a/lib/scanf.rb b/lib/scanf.rb
index 386270b924..2972bf9d60 100644
--- a/lib/scanf.rb
+++ b/lib/scanf.rb
@@ -1,9 +1,9 @@
# scanf for Ruby
#
-# $Release Version: 1.1.2 $
# $Revision$
# $Id$
# $Author$
+# $Date$
#
# A product of the Austin Ruby Codefest (Austin, Texas, August 2002)
@@ -63,7 +63,7 @@ to the beginning of the format string, and yields a new array of
conversions to the block every time the format string is matched
(including partial matches, but not including complete failures). The
actual return value of scanf when called with a block is an array
-containing the results of all the executions of the block.
+containing the results of all the executions of the block.
str = "123 abc 456 def 789 ghi"
str.scanf("%d%s") { |num,str| [ num * 2, str.upcase ] }
@@ -100,7 +100,7 @@ and <tt>tests/scanftests.rb</tt> for examples.)
[u]
Same as d.
-[i]
+[i]
Matches an optionally signed integer. The integer is read in base
16 if it begins with `0x' or `0X', in base 8 if it begins with `0',
and in base 10 other- wise. Only characters that correspond to the
@@ -280,7 +280,7 @@ Project contributors:: Nolan Darilek, Jason Johnston
Thanks to Hal Fulton for hosting the Codefest.
-Thanks to Matz for suggestions about the class design.
+Thanks to Matz for suggestions about the class design.
Thanks to Gavin Sinclair for some feedback on the documentation.
@@ -325,14 +325,14 @@ module Scanf
end
def count_space?
- /(?:\A|\S)%\*?\d*c|%\d*\[/.match(@spec_string)
+ /(?:\A|\S)%\*?\d*c|\[/.match(@spec_string)
end
def initialize(str)
@spec_string = str
h = '[A-Fa-f0-9]'
- @re_string, @handler =
+ @re_string, @handler =
case @spec_string
# %[[:...:]]
@@ -357,7 +357,7 @@ module Scanf
# %i
when /%\*?i/
- [ "([-+]?(?:(?:0[0-7]+)|(?:0[Xx]#{h}+)|(?:[1-9]\\d*)))", :extract_integer ]
+ [ "([-+]?(?:(?:0[0-7]+)|(?:0[Xx]#{h}+)|(?:[1-9]\\d+)))", :extract_integer ]
# %5i
when /%\*?(\d+)i/
@@ -466,11 +466,11 @@ module Scanf
end
def letter
- @spec_string[/%\*?\d*([a-z\[])/, 1]
+ /%\*?\d*([a-z\[])/.match(@spec_string).to_a[1]
end
def width
- w = @spec_string[/%\*?(\d+)/, 1]
+ w = /%\*?(\d+)/.match(@spec_string).to_a[1]
w && w.to_i
end
@@ -482,7 +482,7 @@ module Scanf
return width_left || cc_no_width
end
-
+
end
class FormatString
@@ -541,8 +541,7 @@ module Scanf
@string_left = str
@matched_count = 0
- @specs.each_with_index do |spec,i|
- @i=i
+ @specs.each_with_index do |spec,@i|
@last_spec_tried = spec
@last_match_tried = spec.match(@string_left)
break unless @last_match_tried
@@ -672,10 +671,10 @@ class String
if b
block_scanf(fstr,&b)
else
- fs =
+ fs =
if fstr.is_a? Scanf::FormatString
- fstr
- else
+ fstr
+ else
Scanf::FormatString.new(fstr)
end
fs.match(self)
diff --git a/lib/securerandom.rb b/lib/securerandom.rb
index fe0e005554..3fd63e535f 100644
--- a/lib/securerandom.rb
+++ b/lib/securerandom.rb
@@ -7,7 +7,6 @@
#
# * openssl
# * /dev/urandom
-# * Win32
#
# == Example
#
@@ -46,21 +45,15 @@ module SecureRandom
# If n is not specified, 16 is assumed.
# It may be larger in future.
#
- # The result may contain any byte: "\x00" - "\xff".
- #
- # p SecureRandom.random_bytes #=> "\xD8\\\xE0\xF4\r\xB2\xFC*WM\xFF\x83\x18\xF45\xB6"
- # p SecureRandom.random_bytes #=> "m\xDC\xFC/\a\x00Uf\xB2\xB2P\xBD\xFF6S\x97"
- #
# If secure random number generator is not available,
# NotImplementedError is raised.
def self.random_bytes(n=nil)
n ||= 16
-
if defined? OpenSSL::Random
return OpenSSL::Random.random_bytes(n)
end
-
if !defined?(@has_urandom) || @has_urandom
+ @has_urandom = false
flags = File::RDONLY
flags |= File::NONBLOCK if defined? File::NONBLOCK
flags |= File::NOCTTY if defined? File::NOCTTY
@@ -78,39 +71,9 @@ module SecureRandom
return ret
}
rescue Errno::ENOENT
- @has_urandom = false
- end
- end
-
- if !defined?(@has_win32)
- begin
- require 'Win32API'
-
- crypt_acquire_context = Win32API.new("advapi32", "CryptAcquireContext", 'PPPII', 'L')
- @crypt_gen_random = Win32API.new("advapi32", "CryptGenRandom", 'LIP', 'L')
-
- hProvStr = " " * 4
- prov_rsa_full = 1
- crypt_verifycontext = 0xF0000000
-
- if crypt_acquire_context.call(hProvStr, nil, nil, prov_rsa_full, crypt_verifycontext) == 0
- raise SystemCallError, "CryptAcquireContext failed: #{lastWin32ErrorMessage}"
- end
- @hProv, = hProvStr.unpack('L')
-
- @has_win32 = true
- rescue LoadError
- @has_win32 = false
+ raise NotImplementedError, "No random device"
end
end
- if @has_win32
- bytes = " ".force_encoding("ASCII-8BIT") * n
- if @crypt_gen_random.call(@hProv, bytes.size, bytes) == 0
- raise SystemCallError, "CryptGenRandom failed: #{lastWin32ErrorMessage}"
- end
- return bytes
- end
-
raise NotImplementedError, "No random device"
end
@@ -122,11 +85,6 @@ module SecureRandom
# If n is not specified, 16 is assumed.
# It may be larger in future.
#
- # The result may contain 0-9 and a-f.
- #
- # p SecureRandom.hex #=> "eb693ec8252cd630102fd0d0fb7c3485"
- # p SecureRandom.hex #=> "91dc3bfb4de5b11d029d376634589b61"
- #
# If secure random number generator is not available,
# NotImplementedError is raised.
def self.hex(n=nil)
@@ -141,81 +99,33 @@ module SecureRandom
# If n is not specified, 16 is assumed.
# It may be larger in future.
#
- # The result may contain A-Z, a-z, 0-9, "+", "/" and "=".
- #
- # p SecureRandom.base64 #=> "/2BuBuLf3+WfSKyQbRcc/A=="
- # p SecureRandom.base64 #=> "6BbW0pxO0YENxn38HMUbcQ=="
- #
# If secure random number generator is not available,
# NotImplementedError is raised.
- #
- # See RFC 3548 for base64.
def self.base64(n=nil)
[random_bytes(n)].pack("m*").delete("\n")
end
- # SecureRandom.urlsafe_base64 generates a random URL-safe base64 string.
- #
- # The argument _n_ specifies the length of the random length.
- # The length of the result string is about 4/3 of _n_.
- #
- # If _n_ is not specified, 16 is assumed.
- # It may be larger in future.
- #
- # The boolean argument _padding_ specifies the padding.
- # If it is false or nil, padding is not generated.
- # Otherwise padding is generated.
- # By default, padding is not generated because "=" may be used as a URL delimiter.
- #
- # The result may contain A-Z, a-z, 0-9, "-" and "_".
- # "=" is also used if _padding_ is true.
- #
- # p SecureRandom.urlsafe_base64 #=> "b4GOKm4pOYU_-BOXcrUGDg"
- # p SecureRandom.urlsafe_base64 #=> "UZLdOkzop70Ddx-IJR0ABg"
- #
- # p SecureRandom.urlsafe_base64(nil, true) #=> "i0XQ-7gglIsHGV2_BNPrdQ=="
- # p SecureRandom.urlsafe_base64(nil, true) #=> "-M8rLhr7JEpJlqFGUMmOxg=="
- #
- # If secure random number generator is not available,
- # NotImplementedError is raised.
- #
- # See RFC 3548 for URL-safe base64.
- def self.urlsafe_base64(n=nil, padding=false)
- s = [random_bytes(n)].pack("m*")
- s.delete!("\n")
- s.tr!("+/", "-_")
- s.delete!("=") if !padding
- s
- end
-
# SecureRandom.random_number generates a random number.
#
# If an positive integer is given as n,
# SecureRandom.random_number returns an integer:
# 0 <= SecureRandom.random_number(n) < n.
#
- # p SecureRandom.random_number(100) #=> 15
- # p SecureRandom.random_number(100) #=> 88
- #
# If 0 is given or an argument is not given,
# SecureRandom.random_number returns an float:
# 0.0 <= SecureRandom.random_number() < 1.0.
- #
- # p SecureRandom.random_number #=> 0.596506046187744
- # p SecureRandom.random_number #=> 0.350621695741409
- #
def self.random_number(n=0)
if 0 < n
hex = n.to_s(16)
hex = '0' + hex if (hex.length & 1) == 1
bin = [hex].pack("H*")
- mask = bin[0].ord
+ mask = bin[0]
mask |= mask >> 1
mask |= mask >> 2
mask |= mask >> 4
begin
rnd = SecureRandom.random_bytes(bin.length)
- rnd[0] = (rnd[0].ord & mask).chr
+ rnd[0] = (rnd[0] & mask).chr
end until rnd < bin
rnd.unpack("H*")[0].hex
else
@@ -224,35 +134,4 @@ module SecureRandom
Math.ldexp(i64 >> (64-Float::MANT_DIG), -Float::MANT_DIG)
end
end
-
- # SecureRandom.uuid generates a v4 random UUID (Universally Unique IDentifier).
- #
- # p SecureRandom.uuid #=> "2d931510-d99f-494a-8c67-87feb05e1594"
- # p SecureRandom.uuid #=> "bad85eb9-0713-4da7-8d36-07a8e4b00eab"
- # p SecureRandom.uuid #=> "62936e70-1815-439b-bf89-8492855a7e6b"
- #
- # The version 4 UUID is purely random (except the version).
- # It doesn't contain meaningful information such as MAC address, time, etc.
- #
- # See RFC 4122 for details of UUID.
- #
- def self.uuid
- ary = self.random_bytes(16).unpack("NnnnnN")
- ary[2] = (ary[2] & 0x0fff) | 0x4000
- ary[3] = (ary[3] & 0x3fff) | 0x8000
- "%08x-%04x-%04x-%04x-%04x%08x" % ary
- end
-
- # Following code is based on David Garamond's GUID library for Ruby.
- def self.lastWin32ErrorMessage # :nodoc:
- get_last_error = Win32API.new("kernel32", "GetLastError", '', 'L')
- format_message = Win32API.new("kernel32", "FormatMessageA", 'LPLLPLPPPPPPPP', 'L')
- format_message_ignore_inserts = 0x00000200
- format_message_from_system = 0x00001000
-
- code = get_last_error.call
- msg = "\0" * 1024
- len = format_message.call(format_message_ignore_inserts + format_message_from_system, 0, code, 0, msg, 1024, nil, nil, nil, nil, nil, nil, nil, nil)
- msg[0, len].tr("\r", '').chomp
- end
end
diff --git a/lib/set.rb b/lib/set.rb
index 8f2bef91ba..164aa429d9 100644
--- a/lib/set.rb
+++ b/lib/set.rb
@@ -4,15 +4,15 @@
#++
# Copyright (c) 2002-2008 Akinori MUSHA <knu@iDaemons.org>
#
-# Documentation by Akinori MUSHA and Gavin Sinclair.
+# Documentation by Akinori MUSHA and Gavin Sinclair.
#
# All rights reserved. You can redistribute and/or modify it under the same
# terms as Ruby.
#
# $Id$
#
-# == Overview
-#
+# == Overview
+#
# This library provides the Set class, which deals with a collection
# of unordered values with no duplicates. It is a hybrid of Array's
# intuitive inter-operation facilities and Hash's fast lookup. If you
@@ -20,7 +20,7 @@
#
# The method +to_set+ is added to Enumerable for convenience.
#
-# See the Set and SortedSet documentation for examples of usage.
+# See the Set class for an example of usage.
#
@@ -28,13 +28,14 @@
# This is a hybrid of Array's intuitive inter-operation facilities and
# Hash's fast lookup.
#
+# Several methods accept any Enumerable object (implementing +each+)
+# for greater flexibility: new, replace, merge, subtract, |, &, -, ^.
+#
# The equality of each couple of elements is determined according to
# Object#eql? and Object#hash, since Set uses Hash as storage.
#
-# Set is easy to use with Enumerable objects (implementing +each+).
-# Most of the initializer methods and binary operators accept generic
-# Enumerable objects besides sets and arrays. An Enumerable object
-# can be converted to Set using the +to_set+ method.
+# Finally, if you are using class Set, you can also use Enumerable#to_set
+# for convenience.
#
# == Example
#
@@ -81,24 +82,6 @@ class Set
@hash = orig.instance_eval{@hash}.dup
end
- def freeze # :nodoc:
- super
- @hash.freeze
- self
- end
-
- def taint # :nodoc:
- super
- @hash.taint
- self
- end
-
- def untaint # :nodoc:
- super
- @hash.untaint
- self
- end
-
# Returns the number of elements.
def size
@hash.size
@@ -122,6 +105,7 @@ class Set
if enum.class == self.class
@hash.replace(enum.instance_eval { @hash })
else
+ enum.is_a?(Enumerable) or raise ArgumentError, "value must be enumerable"
clear
enum.each { |o| add(o) }
end
@@ -213,7 +197,7 @@ class Set
end
# Adds the given object to the set and returns self. Use +merge+ to
- # add many elements at once.
+ # add several elements at once.
def add(o)
@hash[o] = true
self
@@ -231,7 +215,7 @@ class Set
end
# Deletes the given object from the set and returns self. Use +subtract+ to
- # delete many items at once.
+ # delete several items at once.
def delete(o)
@hash.delete(o)
self
@@ -250,14 +234,12 @@ class Set
# Deletes every element of the set for which block evaluates to
# true, and returns self.
def delete_if
- block_given? or return enum_for(__method__)
to_a.each { |o| @hash.delete(o) if yield(o) }
self
end
- # Replaces the elements with ones returned by collect().
+ # Do collect() destructively.
def collect!
- block_given? or return enum_for(__method__)
set = self.class.new
each { |o| set << yield(o) }
replace(set)
@@ -267,7 +249,6 @@ class Set
# Equivalent to Set#delete_if, but returns nil if no changes were
# made.
def reject!
- block_given? or return enum_for(__method__)
n = size
delete_if { |o| yield(o) }
size == n ? nil : self
@@ -276,9 +257,10 @@ class Set
# Merges the elements of the given enumerable object to the set and
# returns self.
def merge(enum)
- if enum.instance_of?(self.class)
- @hash.update(enum.instance_variable_get(:@hash))
+ if enum.is_a?(Set)
+ @hash.update(enum.instance_eval { @hash })
else
+ enum.is_a?(Enumerable) or raise ArgumentError, "value must be enumerable"
enum.each { |o| add(o) }
end
@@ -288,6 +270,7 @@ class Set
# Deletes every element that appears in the given enumerable object
# and returns self.
def subtract(enum)
+ enum.is_a?(Enumerable) or raise ArgumentError, "value must be enumerable"
enum.each { |o| delete(o) }
self
end
@@ -295,6 +278,7 @@ class Set
# Returns a new set built by merging the set and the elements of the
# given enumerable object.
def |(enum)
+ enum.is_a?(Enumerable) or raise ArgumentError, "value must be enumerable"
dup.merge(enum)
end
alias + | ##
@@ -303,6 +287,7 @@ class Set
# Returns a new set built by duplicating the set, removing every
# element that appears in the given enumerable object.
def -(enum)
+ enum.is_a?(Enumerable) or raise ArgumentError, "value must be enumerable"
dup.subtract(enum)
end
alias difference - ##
@@ -310,6 +295,7 @@ class Set
# Returns a new set containing elements common to the set and the
# given enumerable object.
def &(enum)
+ enum.is_a?(Enumerable) or raise ArgumentError, "value must be enumerable"
n = self.class.new
enum.each { |o| n.add(o) if include?(o) }
n
@@ -320,6 +306,7 @@ class Set
# and the given enumerable object. (set ^ enum) is equivalent to
# ((set | enum) - (set & enum)).
def ^(enum)
+ enum.is_a?(Enumerable) or raise ArgumentError, "value must be enumerable"
n = Set.new(enum)
each { |o| if n.include?(o) then n.delete(o) else n.add(o) end }
n
@@ -359,8 +346,6 @@ class Set
# # 2001=>#<Set: {"c.rb", "d.rb", "e.rb"}>,
# # 2002=>#<Set: {"f.rb"}>}
def classify # :yields: o
- block_given? or return enum_for(__method__)
-
h = {}
each { |i|
@@ -388,8 +373,6 @@ class Set
# # #<Set: {3, 4}>,
# # #<Set: {6}>}>
def divide(&func)
- func or return enum_for(__method__)
-
if func.arity == 2
require 'tsort'
@@ -451,35 +434,7 @@ class Set
end
end
-#
-# SortedSet implements a Set that guarantees that it's element are
-# yielded in sorted order (according to the return values of their
-# #<=> methods) when iterating over them.
-#
-# All elements that are added to a SortedSet must respond to the <=>
-# method for comparison.
-#
-# Also, all elements must be <em>mutually comparable</em>: <tt>el1 <=>
-# el2</tt> must not return <tt>nil</tt> for any elements <tt>el1</tt>
-# and <tt>el2</tt>, else an ArgumentError will be raised when
-# iterating over the SortedSet.
-#
-# == Example
-#
-# require "set"
-#
-# set = SortedSet.new([2, 1, 5, 6, 4, 5, 3, 3, 3])
-# ary = []
-#
-# set.each do |obj|
-# ary << obj
-# end
-#
-# p ary # => [1, 2, 3, 4, 5, 6]
-#
-# set2 = SortedSet.new([1, 2, "3"])
-# set2.each { |obj| } # => raises ArgumentError: comparison of Fixnum with String failed
-#
+# SortedSet implements a set which elements are sorted in order. See Set.
class SortedSet < Set
@@setup = false
@@ -504,12 +459,6 @@ class SortedSet < Set
@hash = RBTree.new
super
end
-
- def add(o)
- o.respond_to?(:<=>) or raise ArgumentError, "value must repond to <=>"
- super
- end
- alias << add
}
rescue LoadError
module_eval %{
@@ -529,9 +478,9 @@ class SortedSet < Set
end
def add(o)
- o.respond_to?(:<=>) or raise ArgumentError, "value must respond to <=>"
@keys = nil
- super
+ @hash[o] = true
+ self
end
alias << add
@@ -542,7 +491,6 @@ class SortedSet < Set
end
def delete_if
- block_given? or return enum_for(__method__)
n = @hash.size
super
@keys = nil if @hash.size != n
@@ -589,33 +537,33 @@ end
# == RestricedSet class
# RestricedSet implements a set with restrictions defined by a given
# block.
-#
+#
# === Super class
# Set
-#
+#
# === Class Methods
# --- RestricedSet::new(enum = nil) { |o| ... }
# --- RestricedSet::new(enum = nil) { |rset, o| ... }
# Creates a new restricted set containing the elements of the given
# enumerable object. Restrictions are defined by the given block.
-#
+#
# If the block's arity is 2, it is called with the RestrictedSet
# itself and an object to see if the object is allowed to be put in
# the set.
-#
+#
# Otherwise, the block is called with an object to see if the object
# is allowed to be put in the set.
-#
+#
# === Instance Methods
# --- restriction_proc
# Returns the restriction procedure of the set.
-#
+#
# =end
-#
+#
# class RestricedSet < Set
# def initialize(*args, &block)
# @proc = block or raise ArgumentError, "missing a block"
-#
+#
# if @proc.arity == 2
# instance_eval %{
# def add(o)
@@ -623,7 +571,7 @@ end
# self
# end
# alias << add
-#
+#
# def add?(o)
# if include?(o) || !@proc.call(self, o)
# nil
@@ -632,17 +580,19 @@ end
# self
# end
# end
-#
+#
# def replace(enum)
+# enum.is_a?(Enumerable) or raise ArgumentError, "value must be enumerable"
# clear
# enum.each { |o| add(o) }
-#
+#
# self
# end
-#
+#
# def merge(enum)
+# enum.is_a?(Enumerable) or raise ArgumentError, "value must be enumerable"
# enum.each { |o| add(o) }
-#
+#
# self
# end
# }
@@ -650,12 +600,12 @@ end
# instance_eval %{
# def add(o)
# if @proc.call(o)
-# @hash[o] = true
+# @hash[o] = true
# end
# self
# end
# alias << add
-#
+#
# def add?(o)
# if include?(o) || !@proc.call(o)
# nil
@@ -666,10 +616,10 @@ end
# end
# }
# end
-#
+#
# super(*args)
# end
-#
+#
# def restriction_proc
# @proc
# end
@@ -707,11 +657,12 @@ class TC_Set < Test::Unit::TestCase
Set.new([])
Set.new([1,2])
Set.new('a'..'c')
+ Set.new('XYZ')
}
- assert_raises(NoMethodError) {
+ assert_raises(ArgumentError) {
Set.new(false)
}
- assert_raises(NoMethodError) {
+ assert_raises(ArgumentError) {
Set.new(1)
}
assert_raises(ArgumentError) {
@@ -975,7 +926,7 @@ class TC_Set < Test::Unit::TestCase
assert_same(set, ret)
e = set.each
- assert_instance_of(Enumerator, e)
+ assert_instance_of(Enumerable::Enumerator, e)
assert_nothing_raised {
set.each { |o|
@@ -1275,33 +1226,33 @@ end
# class TC_RestricedSet < Test::Unit::TestCase
# def test_s_new
# assert_raises(ArgumentError) { RestricedSet.new }
-#
+#
# s = RestricedSet.new([-1,2,3]) { |o| o > 0 }
# assert_equal([2,3], s.sort)
# end
-#
+#
# def test_restriction_proc
# s = RestricedSet.new([-1,2,3]) { |o| o > 0 }
-#
+#
# f = s.restriction_proc
# assert_instance_of(Proc, f)
# assert(f[1])
# assert(!f[0])
# end
-#
+#
# def test_replace
# s = RestricedSet.new(-3..3) { |o| o > 0 }
# assert_equal([1,2,3], s.sort)
-#
+#
# s.replace([-2,0,3,4,5])
# assert_equal([3,4,5], s.sort)
# end
-#
+#
# def test_merge
# s = RestricedSet.new { |o| o > 0 }
# s.merge(-5..5)
# assert_equal([1,2,3,4,5], s.sort)
-#
+#
# s.merge([10,-10,-8,8])
# assert_equal([1,2,3,4,5,8,10], s.sort)
# end
diff --git a/lib/shell.rb b/lib/shell.rb
index d2ce26d3b3..039f849ef5 100644
--- a/lib/shell.rb
+++ b/lib/shell.rb
@@ -1,26 +1,24 @@
#
-# shell.rb -
-# $Release Version: 0.7 $
-# $Revision: 1.9 $
-# by Keiju ISHITSUKA(keiju@ruby-lang.org)
+# shell.rb -
+# $Release Version: 0.6.0 $
+# $Revision: 1.8 $
+# $Date: 2001/03/19 09:01:11 $
+# by Keiju ISHITSUKA(Nippon Rational Inc.)
#
# --
#
-#
+#
#
require "e2mmap"
-
-require "thread" unless defined?(Mutex)
-
-require "forwardable"
+require "thread"
require "shell/error"
require "shell/command-processor"
require "shell/process-controller"
class Shell
- @RCS_ID='-$Id: shell.rb,v 1.9 2002/03/04 12:01:10 keiju Exp keiju $-'
+ @RCS_ID='-$Id: shell.rb,v 1.8 2001/03/19 09:01:11 keiju Exp keiju $-'
include Error
extend Exception2MessageMapper
@@ -32,14 +30,10 @@ class Shell
@debug = false
@verbose = true
- @debug_display_process_id = false
- @debug_display_thread_id = true
- @debug_output_mutex = Mutex.new
-
class << Shell
- extend Forwardable
-
- attr_accessor :cascade, :debug, :verbose
+ attr :cascade, true
+ attr :debug, true
+ attr :verbose, true
# alias cascade? cascade
alias debug? debug
@@ -52,7 +46,9 @@ class Shell
end
def cd(path)
- new(path)
+ sh = new
+ sh.cd path
+ sh
end
def default_system_path
@@ -78,19 +74,12 @@ class Shell
def default_record_separator=(rs)
@default_record_separator = rs
end
-
- # os resource mutex
- mutex_methods = ["unlock", "lock", "locked?", "synchronize", "try_lock", "exclusive_unlock"]
- for m in mutex_methods
- def_delegator("@debug_output_mutex", m, "debug_output_"+m.to_s)
- end
-
end
- def initialize(pwd = Dir.pwd, umask = nil)
- @cwd = File.expand_path(pwd)
+ def initialize
+ @cwd = Dir.pwd
@dir_stack = []
- @umask = umask
+ @umask = nil
@system_path = Shell.default_system_path
@record_separator = Shell.default_record_separator
@@ -109,8 +98,11 @@ class Shell
rehash
end
- attr_accessor :umask, :record_separator
- attr_accessor :verbose, :debug
+ attr :umask, true
+ attr :record_separator, true
+
+ attr :verbose, true
+ attr :debug, true
def debug=(val)
@debug = val
@@ -139,58 +131,49 @@ class Shell
# Shell#mkdir
# Shell#rmdir
- attr_reader :cwd
+ attr :cwd
alias dir cwd
alias getwd cwd
alias pwd cwd
- attr_reader :dir_stack
+ attr :dir_stack
alias dirs dir_stack
# If called as iterator, it restores the current directory when the
# block ends.
- def chdir(path = nil, verbose = @verbose)
- check_point
-
+ def chdir(path = nil)
if iterator?
- notify("chdir(with block) #{path}") if verbose
cwd_old = @cwd
begin
- chdir(path, nil)
+ chdir(path)
yield
ensure
- chdir(cwd_old, nil)
+ chdir(cwd_old)
end
else
- notify("chdir #{path}") if verbose
path = "~" unless path
@cwd = expand_path(path)
notify "current dir: #{@cwd}"
rehash
- Void.new(self)
+ self
end
end
alias cd chdir
- def pushdir(path = nil, verbose = @verbose)
- check_point
-
+ def pushdir(path = nil)
if iterator?
- notify("pushdir(with block) #{path}") if verbose
- pushdir(path, nil)
+ pushdir(path)
begin
yield
ensure
popdir
end
elsif path
- notify("pushdir #{path}") if verbose
@dir_stack.push @cwd
- chdir(path, nil)
+ chdir path
notify "dir stack: [#{@dir_stack.join ', '}]"
self
else
- notify("pushdir") if verbose
if pop = @dir_stack.pop
@dir_stack.push @cwd
chdir pop
@@ -200,14 +183,10 @@ class Shell
Shell.Fail DirStackEmpty
end
end
- Void.new(self)
end
alias pushd pushdir
def popdir
- check_point
-
- notify("popdir")
if pop = @dir_stack.pop
chdir pop
notify "dir stack: [#{@dir_stack.join ', '}]"
@@ -215,10 +194,10 @@ class Shell
else
Shell.Fail DirStackEmpty
end
- Void.new(self)
end
alias popd popdir
+
#
# process management
#
@@ -263,35 +242,25 @@ class Shell
end
def self.notify(*opts, &block)
- Shell::debug_output_synchronize do
- if opts[-1].kind_of?(String)
- yorn = verbose?
- else
- yorn = opts.pop
- end
- return unless yorn
-
- if @debug_display_thread_id
- if @debug_display_process_id
- prefix = "shell(##{Process.pid}:#{Thread.current.to_s.sub("Thread", "Th")}): "
- else
- prefix = "shell(#{Thread.current.to_s.sub("Thread", "Th")}): "
- end
+ Thread.exclusive do
+ if opts[-1].kind_of?(String)
+ yorn = verbose?
+ else
+ yorn = opts.pop
+ end
+ return unless yorn
+
+ _head = true
+ print opts.collect{|mes|
+ mes = mes.dup
+ yield mes if iterator?
+ if _head
+ _head = false
+ "shell: " + mes
else
- prefix = "shell: "
+ " " + mes
end
- _head = true
- STDERR.print opts.collect{|mes|
- mes = mes.dup
- yield mes if iterator?
- if _head
- _head = false
-# "shell" " + mes
- prefix + mes
- else
- " "* prefix.size + mes
- end
- }.join("\n")+"\n"
+ }.join("\n")+"\n"
end
end
diff --git a/lib/shell/builtin-command.rb b/lib/shell/builtin-command.rb
index e489da4eca..db1adfa48b 100644
--- a/lib/shell/builtin-command.rb
+++ b/lib/shell/builtin-command.rb
@@ -1,12 +1,13 @@
#
-# shell/builtin-command.rb -
-# $Release Version: 0.7 $
+# shell/builtin-command.rb -
+# $Release Version: 0.6.0 $
# $Revision$
-# by Keiju ISHITSUKA(keiju@ruby-lang.org)
+# $Date$
+# by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd)
#
# --
#
-#
+#
#
require "shell/filter"
@@ -21,22 +22,12 @@ class Shell
end
end
- class Void < BuiltInCommand
- def initialize(sh, *opts)
- super sh
- end
-
- def each(rs = nil)
- # do nothing
- end
- end
-
class Echo < BuiltInCommand
def initialize(sh, *strings)
super sh
@strings = strings
end
-
+
def each(rs = nil)
rs = @shell.record_separator unless rs
for str in @strings
@@ -67,17 +58,20 @@ class Shell
super sh
@pattern = pattern
+ Thread.critical = true
+ back = Dir.pwd
+ begin
+ Dir.chdir @shell.cwd
+ @files = Dir[pattern]
+ ensure
+ Dir.chdir back
+ Thread.critical = false
+ end
end
def each(rs = nil)
- if @pattern[0] == ?/
- @files = Dir[@pattern]
- else
- prefix = @shell.pwd+"/"
- @files = Dir[prefix+@pattern].collect{|p| p.sub(prefix, "")}
- end
rs = @shell.record_separator unless rs
- for f in @files
+ for f in @files
yield f+rs
end
end
diff --git a/lib/shell/command-processor.rb b/lib/shell/command-processor.rb
index e224d91368..ecf6c7d5eb 100644
--- a/lib/shell/command-processor.rb
+++ b/lib/shell/command-processor.rb
@@ -1,15 +1,17 @@
#
-# shell/command-controller.rb -
-# $Release Version: 0.7 $
+# shell/command-controller.rb -
+# $Release Version: 0.6.0 $
# $Revision$
-# by Keiju ISHITSUKA(keiju@ruby-lang.org)
+# $Date$
+# by Keiju ISHITSUKA(Nippon Rational Inc.)
#
# --
#
-#
+#
#
require "e2mmap"
+require "ftools"
require "thread"
require "shell/error"
@@ -24,13 +26,7 @@ class Shell
#
# initialize of Shell and related classes.
#
- m = [:initialize, :expand_path]
- if Object.methods.first.kind_of?(String)
- NoDelegateMethods = m.collect{|x| x.id2name}
- else
- NoDelegateMethods = m
- end
-
+ NoDelegateMethods = ["initialize", "expand_path"]
def self.initialize
install_builtin_commands
@@ -39,7 +35,7 @@ class Shell
for m in CommandProcessor.instance_methods(false) - NoDelegateMethods
add_delegate_command_to_shell(m)
end
-
+
def self.method_added(id)
add_delegate_command_to_shell(id)
end
@@ -84,7 +80,7 @@ class Shell
# Shell#test
#
# -
- #
+ #
# CommandProcessor#foreach(path, rs)
# path: String
# rs: String - record separator
@@ -115,20 +111,13 @@ class Shell
# Dir#open (when path is directory)
# mode has an effect only when path is a file
#
- def open(path, mode = nil, perm = 0666, &b)
+ def open(path, mode)
path = expand_path(path)
if File.directory?(path)
- Dir.open(path, &b)
+ Dir.open(path)
else
- if @shell.umask
- f = File.open(path, mode, perm)
- File.chmod(perm & ~@shell.umask, path)
- if block_given?
- f.each(&b)
- end
- f
- else
- f = File.open(path, mode, perm, &b)
+ effect_umask do
+ File.open(path, mode)
end
end
end
@@ -141,15 +130,12 @@ class Shell
# File#unlink (when path is file)
#
def unlink(path)
- @shell.check_point
-
path = expand_path(path)
if File.directory?(path)
Dir.unlink(path)
else
IO.unlink(path)
end
- Void.new(@shell)
end
#
@@ -168,8 +154,7 @@ class Shell
# sh["e", "foo"]
# sh[:exists?, "foo"]
# sh["exists?", "foo"]
- #
- alias top_level_test test
+ #
def test(command, file1, file2=nil)
file1 = expand_path(file1)
file2 = expand_path(file2) if file2
@@ -177,11 +162,7 @@ class Shell
case command
when Integer
- if file2
- top_level_test(command, file1, file2)
- else
- top_level_test(command, file1)
- end
+ top_level_test(command, file1, file2)
when String
if command.size == 1
if file2
@@ -211,40 +192,22 @@ class Shell
# CommandProcessor#mkdir(*path)
# path: String
# same as Dir.mkdir()
- #
+ #
def mkdir(*path)
- @shell.check_point
- notify("mkdir #{path.join(' ')}")
-
- perm = nil
- if path.last.kind_of?(Integer)
- perm = path.pop
- end
for dir in path
- d = expand_path(dir)
- if perm
- Dir.mkdir(d, perm)
- else
- Dir.mkdir(d)
- end
- File.chmod(d, 0666 & ~@shell.umask) if @shell.umask
+ Dir.mkdir(expand_path(dir))
end
- Void.new(@shell)
end
#
# CommandProcessor#rmdir(*path)
# path: String
# same as Dir.rmdir()
- #
+ #
def rmdir(*path)
- @shell.check_point
- notify("rmdir #{path.join(' ')}")
-
for dir in path
Dir.rmdir(expand_path(dir))
end
- Void.new(@shell)
end
#
@@ -256,7 +219,7 @@ class Shell
# example:
# print sh.system("ls", "-l")
# sh.system("ls", "-l") | sh.head > STDOUT
- #
+ #
def system(command, *opts)
if opts.empty?
if command =~ /\*|\?|\{|\}|\[|\]|<|>|\(|\)|~|&|\||\\|\$|;|'|`|"|\n/
@@ -336,17 +299,35 @@ class Shell
# %pwd, %cwd -> @pwd
def notify(*opts, &block)
- Shell.notify(*opts) {|mes|
- yield mes if iterator?
-
- mes.gsub!("%pwd", "#{@cwd}")
- mes.gsub!("%cwd", "#{@cwd}")
- }
+ Thread.exclusive do
+ Shell.notify(*opts) {|mes|
+ yield mes if iterator?
+
+ mes.gsub!("%pwd", "#{@cwd}")
+ mes.gsub!("%cwd", "#{@cwd}")
+ }
+ end
end
#
# private functions
#
+ def effect_umask
+ if @shell.umask
+ Thread.critical = true
+ save = File.umask
+ begin
+ yield
+ ensure
+ File.umask save
+ Thread.critical = false
+ end
+ else
+ yield
+ end
+ end
+ private :effect_umask
+
def find_system_command(command)
return command if /^\// =~ command
case path = @system_commands[command]
@@ -362,7 +343,7 @@ class Shell
for p in @shell.system_path
path = join(p, command)
- if FileTest.exist?(path)
+ if FileTest.exists?(path)
@system_commands[command] = path
return path
end
@@ -383,10 +364,10 @@ class Shell
SystemCommand.new(@shell, '#{path}', *opts)
end]), nil, __FILE__, __LINE__ - 1)
rescue SyntaxError
- Shell.notify "warn: Can't define #{command} path: #{path}."
+ Shell.notify "warn: Can't define #{command} path: #{path}."
end
Shell.notify "Define #{command} path: #{path}.", Shell.debug?
- Shell.notify("Definition of #{command}: ", d,
+ Shell.notify("Definition of #{command}: ", d,
Shell.debug.kind_of?(Integer) && Shell.debug > 1)
end
@@ -418,7 +399,7 @@ class Shell
@shell.__send__(:#{command},
*(CommandProcessor.alias_map[:#{ali}].call *opts))
end]), nil, __FILE__, __LINE__ - 1)
-
+
else
args = opts.collect{|opt| '"' + opt + '"'}.join(",")
eval((d = %Q[def #{ali}(*opts)
@@ -426,22 +407,22 @@ class Shell
end]), nil, __FILE__, __LINE__ - 1)
end
rescue SyntaxError
- Shell.notify "warn: Can't alias #{ali} command: #{command}."
+ Shell.notify "warn: Can't alias #{ali} command: #{command}."
Shell.notify("Definition of #{ali}: ", d)
raise
end
Shell.notify "Define #{ali} command: #{command}.", Shell.debug?
- Shell.notify("Definition of #{ali}: ", d,
+ Shell.notify("Definition of #{ali}: ", d,
Shell.debug.kind_of?(Integer) && Shell.debug > 1)
self
end
-
+
def self.unalias_command(ali)
ali = ali.id2name if ali.kind_of?(Symbol)
@alias_map.delete ali.intern
undef_system_command(ali)
end
-
+
#
# CommandProcessor.def_builtin_commands(delegation_class, command_specs)
# delegation_class: Class or Module
@@ -472,8 +453,8 @@ class Shell
#{delegation_class}.#{meth}(#{call_arg_str})
end]
Shell.notify "Define #{meth}(#{arg_str})", Shell.debug?
- Shell.notify("Definition of #{meth}: ", d,
- Shell.debug.kind_of?(Integer) && Shell.debug > 1)
+ Shell.notify("Definition of #{meth}: ", d,
+ Shell.debug.kind_of?(Integer) && Shell.debug > 1)
eval d
end
end
@@ -513,7 +494,7 @@ class Shell
#----------------------------------------------------------------------
#
- # class initializing methods -
+ # class initializing methods -
#
#----------------------------------------------------------------------
def self.add_delegate_command_to_shell(id)
@@ -561,7 +542,7 @@ class Shell
normal_delegation_file_methods = [
["atime", ["FILENAME"]],
["basename", ["fn", "*opts"]],
- ["chmod", ["mode", "*FILENAMES"]],
+ ["chmod", ["mode", "*FILENAMES"]],
["chown", ["owner", "group", "*FILENAME"]],
["ctime", ["FILENAMES"]],
["delete", ["*FILENAMES"]],
@@ -584,9 +565,27 @@ class Shell
alias_method :rm, :delete
# method related FileTest
- def_builtin_commands(FileTest,
+ def_builtin_commands(FileTest,
FileTest.singleton_methods(false).collect{|m| [m, ["FILENAME"]]})
+ # method related ftools
+ normal_delegation_ftools_methods = [
+ ["syscopy", ["FILENAME_FROM", "FILENAME_TO"]],
+ ["copy", ["FILENAME_FROM", "FILENAME_TO"]],
+ ["move", ["FILENAME_FROM", "FILENAME_TO"]],
+ ["compare", ["FILENAME_FROM", "FILENAME_TO"]],
+ ["safe_unlink", ["*FILENAMES"]],
+ ["makedirs", ["*FILENAMES"]],
+ # ["chmod", ["mode", "*FILENAMES"]],
+ ["install", ["FILENAME_FROM", "FILENAME_TO", "mode"]],
+ ]
+ def_builtin_commands(File,
+ normal_delegation_ftools_methods)
+ alias_method :cmp, :compare
+ alias_method :mv, :move
+ alias_method :cp, :copy
+ alias_method :rm_f, :safe_unlink
+ alias_method :mkpath, :makedirs
end
end
diff --git a/lib/shell/error.rb b/lib/shell/error.rb
index dbb788a6fc..d338b1c5d1 100644
--- a/lib/shell/error.rb
+++ b/lib/shell/error.rb
@@ -1,12 +1,13 @@
#
-# shell/error.rb -
-# $Release Version: 0.7 $
+# shell/error.rb -
+# $Release Version: 0.6.0 $
# $Revision$
-# by Keiju ISHITSUKA(keiju@ruby-lang.org)
+# $Date$
+# by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd)
#
# --
#
-#
+#
#
require "e2mmap"
diff --git a/lib/shell/filter.rb b/lib/shell/filter.rb
index 3f88d0f5d2..27c5534695 100644
--- a/lib/shell/filter.rb
+++ b/lib/shell/filter.rb
@@ -1,12 +1,13 @@
#
-# shell/filter.rb -
-# $Release Version: 0.7 $
+# shell/filter.rb -
+# $Release Version: 0.6.0 $
# $Revision$
-# by Keiju ISHITSUKA(keiju@ruby-lang.org)
+# $Date$
+# by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd)
#
# --
#
-#
+#
#
class Shell
@@ -28,7 +29,7 @@ class Shell
def input=(filter)
@input = filter
end
-
+
def each(rs = nil)
rs = @shell.record_separator unless rs
if @input
diff --git a/lib/shell/process-controller.rb b/lib/shell/process-controller.rb
index 829ff7900a..8929805506 100644
--- a/lib/shell/process-controller.rb
+++ b/lib/shell/process-controller.rb
@@ -1,37 +1,33 @@
#
-# shell/process-controller.rb -
-# $Release Version: 0.7 $
+# shell/process-controller.rb -
+# $Release Version: 0.6.0 $
# $Revision$
-# by Keiju ISHITSUKA(keiju@ruby-lang.org)
+# $Date$
+# by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd)
#
# --
#
+#
#
-#
-require "forwardable"
-require "thread"
+require "mutex_m"
+require "monitor"
require "sync"
class Shell
class ProcessController
@ProcessControllers = {}
- @ProcessControllersMonitor = Mutex.new
- @ProcessControllersCV = ConditionVariable.new
-
- @BlockOutputMonitor = Mutex.new
- @BlockOutputCV = ConditionVariable.new
+ @ProcessControllers.extend Mutex_m
class<<self
- extend Forwardable
-
- def_delegator("@ProcessControllersMonitor",
- "synchronize", "process_controllers_exclusive")
- def active_process_controllers
- process_controllers_exclusive do
- @ProcessControllers.dup
+ def process_controllers_exclusive
+ begin
+ @ProcessControllers.lock unless Thread.critical
+ yield
+ ensure
+ @ProcessControllers.unlock unless Thread.critical
end
end
@@ -47,7 +43,6 @@ class Shell
if @ProcessControllers[pc]
if (@ProcessControllers[pc] -= 1) == 0
@ProcessControllers.delete(pc)
- @ProcessControllersCV.signal
end
end
end
@@ -60,34 +55,6 @@ class Shell
end
end
end
-
- def block_output_synchronize(&b)
- @BlockOutputMonitor.synchronize(&b)
- end
-
- def wait_to_finish_all_process_controllers
- process_controllers_exclusive do
- while !@ProcessControllers.empty?
- Shell::notify("Process finishing, but active shell exists",
- "You can use Shell#transact or Shell#check_point for more safe execution.")
- if Shell.debug?
- for pc in @ProcessControllers.keys
- Shell::notify(" Not finished jobs in "+pc.shell.to_s)
- for com in pc.jobs
- com.notify(" Jobs: %id")
- end
- end
- end
- @ProcessControllersCV.wait(@ProcessControllersMonitor)
- end
- end
- end
- end
-
- # for shell-command complete finish at this process exit.
- USING_AT_EXIT_WHEN_PROCESS_EXIT = true
- at_exit do
- wait_to_finish_all_process_controllers unless $@
end
def initialize(shell)
@@ -100,8 +67,6 @@ class Shell
@job_condition = ConditionVariable.new
end
- attr_reader :shell
-
def jobs
jobs = []
@jobs_sync.synchronize(:SH) do
@@ -118,7 +83,7 @@ class Shell
def waiting_jobs
@waiting_jobs
end
-
+
def jobs_exist?
@jobs_sync.synchronize(:SH) do
@active_jobs.empty? or @waiting_jobs.empty?
@@ -157,19 +122,15 @@ class Shell
@waiting_jobs.delete command
else
command = @waiting_jobs.shift
-# command.notify "job(%id) pre-start.", @shell.debug?
-
return unless command
end
@active_jobs.push command
command.start
-# command.notify "job(%id) post-start.", @shell.debug?
# start all jobs that input from the job
- for job in @waiting_jobs.dup
+ for job in @waiting_jobs
start_job(job) if job.input == command
end
-# command.notify "job(%id) post2-start.", @shell.debug?
end
end
@@ -191,7 +152,6 @@ class Shell
@active_jobs.delete command
ProcessController.inactivate(self)
if @active_jobs.empty?
- command.notify("start_jon in ierminate_jon(%id)", Shell::debug?)
start_job
end
end
@@ -199,7 +159,7 @@ class Shell
# kill a job
def kill_job(sig, command)
- @jobs_sync.synchronize(:EX) do
+ @jobs_sync.synchronize(:SH) do
if @waiting_jobs.delete command
ProcessController.inactivate(self)
return
@@ -223,9 +183,6 @@ class Shell
begin
while !jobs.empty?
@job_condition.wait(@job_monitor)
- for job in jobs
- job.notify("waiting job(%id)", Shell::debug?)
- end
end
ensure
redo unless jobs.empty?
@@ -237,82 +194,66 @@ class Shell
def sfork(command, &block)
pipe_me_in, pipe_peer_out = IO.pipe
pipe_peer_in, pipe_me_out = IO.pipe
+ Thread.critical = true
+ STDOUT.flush
+ ProcessController.each_active_object do |pc|
+ for jobs in pc.active_jobs
+ jobs.flush
+ end
+ end
+
+ pid = fork {
+ Thread.critical = true
- pid = nil
- pid_mutex = Mutex.new
- pid_cv = ConditionVariable.new
-
- Thread.start do
- ProcessController.block_output_synchronize do
- STDOUT.flush
- ProcessController.each_active_object do |pc|
- for jobs in pc.active_jobs
- jobs.flush
- end
- end
-
- pid = fork {
- Thread.list.each do |th|
-# th.kill unless [Thread.main, Thread.current].include?(th)
- th.kill unless Thread.current == th
- end
-
- STDIN.reopen(pipe_peer_in)
- STDOUT.reopen(pipe_peer_out)
+ Thread.list.each do |th|
+ th.kill unless [Thread.main, Thread.current].include?(th)
+ end
- ObjectSpace.each_object(IO) do |io|
- if ![STDIN, STDOUT, STDERR].include?(io)
- io.close unless io.closed?
- end
- end
+ STDIN.reopen(pipe_peer_in)
+ STDOUT.reopen(pipe_peer_out)
- yield
- }
+ ObjectSpace.each_object(IO) do |io|
+ if ![STDIN, STDOUT, STDERR].include?(io)
+ io.close unless io.closed?
+ end
end
- pid_cv.signal
+ yield
+ }
- pipe_peer_in.close
- pipe_peer_out.close
- command.notify "job(%name:##{pid}) start", @shell.debug?
+ pipe_peer_in.close
+ pipe_peer_out.close
+ command.notify "job(%name:##{pid}) start", @shell.debug?
+ Thread.critical = false
+ th = Thread.start {
+ Thread.critical = true
begin
_pid = nil
command.notify("job(%id) start to waiting finish.", @shell.debug?)
+ Thread.critical = false
_pid = Process.waitpid(pid, nil)
rescue Errno::ECHILD
command.notify "warn: job(%id) was done already waitipd."
_pid = true
- # rescue
- # STDERR.puts $!
ensure
- command.notify("Job(%id): Wait to finish when Process finished.", @shell.debug?)
# when the process ends, wait until the command termintes
- if USING_AT_EXIT_WHEN_PROCESS_EXIT or _pid
+ if _pid
else
command.notify("notice: Process finishing...",
"wait for Job[%id] to finish.",
"You can use Shell#transact or Shell#check_point for more safe execution.")
redo
end
-
-# command.notify "job(%id) pre-pre-finish.", @shell.debug?
- @job_monitor.synchronize do
-# command.notify "job(%id) pre-finish.", @shell.debug?
- terminate_job(command)
-# command.notify "job(%id) pre-finish2.", @shell.debug?
- @job_condition.signal
- command.notify "job(%id) finish.", @shell.debug?
+ Thread.exclusive do
+ @job_monitor.synchronize do
+ terminate_job(command)
+ @job_condition.signal
+ command.notify "job(%id) finish.", @shell.debug?
+ end
end
end
- end
-
- pid_mutex.synchronize do
- while !pid
- pid_cv.wait(pid_mutex)
- end
- end
-
+ }
return pid, pipe_me_in, pipe_me_out
end
end
diff --git a/lib/shell/system-command.rb b/lib/shell/system-command.rb
index af9b0a8e37..f87ba890ea 100644
--- a/lib/shell/system-command.rb
+++ b/lib/shell/system-command.rb
@@ -1,12 +1,13 @@
#
-# shell/system-command.rb -
-# $Release Version: 0.7 $
+# shell/system-command.rb -
+# $Release Version: 0.6.0 $
# $Revision$
-# by Keiju ISHITSUKA(keiju@ruby-lang.org)
+# $Date$
+# by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd)
#
# --
#
-#
+#
#
require "shell/filter"
@@ -20,7 +21,7 @@ class Shell
super(sh)
@command = command
@opts = opts
-
+
@input_queue = Queue.new
@pid = nil
@@ -46,15 +47,12 @@ class Shell
end
def start
- notify([@command, *@opts].join(" "))
-
@pid, @pipe_in, @pipe_out = @shell.process_controller.sfork(self) {
Dir.chdir @shell.pwd
- $0 = @command
exec(@command, *@opts)
}
if @input
- start_export
+ start_export
end
start_import
end
@@ -80,12 +78,17 @@ class Shell
end
end
+
def start_import
+# Thread.critical = true
notify "Job(%id) start imp-pipe.", @shell.debug?
rs = @shell.record_separator unless rs
_eop = true
+# Thread.critical = false
th = Thread.start {
+ Thread.critical = true
begin
+ Thread.critical = false
while l = @pipe_in.gets
@input_queue.push l
end
@@ -93,15 +96,19 @@ class Shell
rescue Errno::EPIPE
_eop = false
ensure
- if !ProcessController::USING_AT_EXIT_WHEN_PROCESS_EXIT and _eop
+ if _eop
notify("warn: Process finishing...",
"wait for Job[%id] to finish pipe importing.",
"You can use Shell#transact or Shell#check_point for more safe execution.")
+# Tracer.on
+ Thread.current.run
redo
end
- notify "job(%id}) close imp-pipe.", @shell.debug?
- @input_queue.push :EOF
- @pipe_in.close
+ Thread.exclusive do
+ notify "job(%id}) close imp-pipe.", @shell.debug?
+ @input_queue.push :EOF
+ @pipe_in.close
+ end
end
}
end
@@ -110,24 +117,25 @@ class Shell
notify "job(%id) start exp-pipe.", @shell.debug?
_eop = true
th = Thread.start{
+ Thread.critical = true
begin
- @input.each do |l|
- ProcessController::block_output_synchronize do
- @pipe_out.print l
- end
- end
+ Thread.critical = false
+ @input.each{|l| @pipe_out.print l}
_eop = false
- rescue Errno::EPIPE, Errno::EIO
+ rescue Errno::EPIPE
_eop = false
ensure
- if !ProcessController::USING_AT_EXIT_WHEN_PROCESS_EXIT and _eop
+ if _eop
notify("shell: warn: Process finishing...",
"wait for Job(%id) to finish pipe exporting.",
"You can use Shell#transact or Shell#check_point for more safe execution.")
+# Tracer.on
redo
end
- notify "job(%id) close exp-pipe.", @shell.debug?
- @pipe_out.close
+ Thread.exclusive do
+ notify "job(%id) close exp-pipe.", @shell.debug?
+ @pipe_out.close
+ end
end
}
end
@@ -140,19 +148,20 @@ class Shell
end
# ex)
- # if you wish to output:
+ # if you wish to output:
# "shell: job(#{@command}:#{@pid}) close pipe-out."
- # then
+ # then
# mes: "job(%id) close pipe-out."
# yorn: Boolean(@shell.debug? or @shell.verbose?)
def notify(*opts, &block)
- @shell.notify(*opts) do |mes|
- yield mes if iterator?
-
- mes.gsub!("%id", "#{@command}:##{@pid}")
- mes.gsub!("%name", "#{@command}")
- mes.gsub!("%pid", "#{@pid}")
- mes
+ Thread.exclusive do
+ @shell.notify(*opts) {|mes|
+ yield mes if iterator?
+
+ mes.gsub!("%id", "#{@command}:##{@pid}")
+ mes.gsub!("%name", "#{@command}")
+ mes.gsub!("%pid", "#{@pid}")
+ }
end
end
end
diff --git a/lib/shell/version.rb b/lib/shell/version.rb
index 6e4c170351..6694c804d8 100644
--- a/lib/shell/version.rb
+++ b/lib/shell/version.rb
@@ -1,15 +1,16 @@
#
# version.rb - shell version definition file
-# $Release Version: 0.7$
+# $Release Version: 0.6.0$
# $Revision$
-# by Keiju ISHITSUKA(keiju@ruby-lang.org)
+# $Date$
+# by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd)
#
# --
#
-#
+#
#
class Shell
- @RELEASE_VERSION = "0.7"
- @LAST_UPDATE_DATE = "07/03/20"
+ @RELEASE_VERSION = "0.6.0"
+ @LAST_UPDATE_DATE = "01/03/19"
end
diff --git a/lib/shellwords.rb b/lib/shellwords.rb
index f1300612bb..a4ec552a7e 100644
--- a/lib/shellwords.rb
+++ b/lib/shellwords.rb
@@ -30,16 +30,32 @@ module Shellwords
# argv #=> ["here", "are", "two words"]
#
def shellsplit(line)
+ line = String.new(line) rescue
+ raise(ArgumentError, "Argument must be a string")
+ line.lstrip!
words = []
- field = ''
- line.scan(/\G\s*(?>([^\s\\\'\"]+)|'([^\']*)'|"((?:[^\"\\]|\\.)*)"|(\\.?)|(\S))(\s|\z)?/m) do
- |word, sq, dq, esc, garbage, sep|
- raise ArgumentError, "Unmatched double quote: #{line.inspect}" if garbage
- field << (word || sq || (dq || esc).gsub(/\\(?=.)/, ''))
- if sep
- words << field
- field = ''
+ until line.empty?
+ field = ''
+ loop do
+ if line.sub!(/\A"(([^"\\]|\\.)*)"/, '') then
+ snippet = $1.gsub(/\\(.)/, '\1')
+ elsif line =~ /\A"/ then
+ raise ArgumentError, "Unmatched double quote: #{line}"
+ elsif line.sub!(/\A'([^']*)'/, '') then
+ snippet = $1
+ elsif line =~ /\A'/ then
+ raise ArgumentError, "Unmatched single quote: #{line}"
+ elsif line.sub!(/\A\\(.)?/, '') then
+ snippet = $1 || '\\'
+ elsif line.sub!(/\A([^\s\\'"]+)/, '') then
+ snippet = $1
+ else
+ line.lstrip!
+ break
+ end
+ field.concat(snippet)
end
+ words.push(field)
end
words
end
diff --git a/lib/singleton.rb b/lib/singleton.rb
index 3c81b2d3cb..943f7ca57b 100644
--- a/lib/singleton.rb
+++ b/lib/singleton.rb
@@ -9,9 +9,9 @@
# * this ensures that only one instance of Klass lets call it
# ``the instance'' can be created.
#
-# a,b = Klass.instance, Klass.instance
-# a == b # => true
-# Klass.new # NoMethodError - new is private ...
+# a,b = Klass.instance, Klass.instance
+# a == b # => true
+# a.new # NoMethodError - new is private ...
#
# * ``The instance'' is created at instantiation time, in other
# words the first call of Klass.instance(), thus
@@ -39,7 +39,7 @@
# method body is a simple:
#
# def Klass.instance()
-# return @singleton__instance__
+# return @__instance__
# end
#
# * Klass._load(str) - calling Klass.instance()
@@ -60,7 +60,7 @@
# and _dump(depth) hooks allows the (partially) resurrections of
# a previous state of ``the instance''.
-require 'thread'
+
module Singleton
# disable build-in copying methods
@@ -71,10 +71,58 @@ module Singleton
raise TypeError, "can't dup instance of singleton #{self.class}"
end
+ private
# default marshalling strategy
- def _dump(depth = -1)
+ def _dump(depth=-1)
''
end
+end
+
+
+class << Singleton
+ # Method body of first instance call.
+ FirstInstanceCall = proc do
+ # @__instance__ takes on one of the following values
+ # * nil - before and after a failed creation
+ # * false - during creation
+ # * sub_class instance - after a successful creation
+ # the form makes up for the lack of returns in progs
+ Thread.critical = true
+ if @__instance__.nil?
+ @__instance__ = false
+ Thread.critical = false
+ begin
+ @__instance__ = new
+ ensure
+ if @__instance__
+ class <<self
+ remove_method :instance
+ def instance; @__instance__ end
+ end
+ else
+ @__instance__ = nil # failed instance creation
+ end
+ end
+ elsif _instantiate?()
+ Thread.critical = false
+ else
+ @__instance__ = false
+ Thread.critical = false
+ begin
+ @__instance__ = new
+ ensure
+ if @__instance__
+ class <<self
+ remove_method :instance
+ def instance; @__instance__ end
+ end
+ else
+ @__instance__ = nil
+ end
+ end
+ end
+ @__instance__
+ end
module SingletonClassMethods
# properly clone the Singleton pattern - did you know
@@ -94,49 +142,48 @@ module Singleton
super
Singleton.__init__(sub_klass)
end
- end
- class << Singleton
- def __init__(klass)
- klass.instance_eval {
- @singleton__instance__ = nil
- @singleton__mutex__ = Mutex.new
- }
- def klass.instance
- return @singleton__instance__ if @singleton__instance__
- @singleton__mutex__.synchronize {
- return @singleton__instance__ if @singleton__instance__
- @singleton__instance__ = new()
- }
- @singleton__instance__
+ # waiting-loop hook
+ def _instantiate?()
+ while false.equal?(@__instance__)
+ Thread.critical = false
+ sleep(0.08) # timeout
+ Thread.critical = true
end
- klass
+ @__instance__
end
+ end
- private
-
- # extending an object with Singleton is a bad idea
- undef_method :extend_object
-
- def append_features(mod)
- # help out people counting on transitive mixins
- unless mod.instance_of?(Class)
- raise TypeError, "Inclusion of the OO-Singleton module in module #{mod}"
- end
- super
+ def __init__(klass)
+ klass.instance_eval { @__instance__ = nil }
+ class << klass
+ define_method(:instance,FirstInstanceCall)
end
+ klass
+ end
- def included(klass)
- super
- klass.private_class_method :new, :allocate
- klass.extend SingletonClassMethods
- Singleton.__init__(klass)
+ private
+ # extending an object with Singleton is a bad idea
+ undef_method :extend_object
+
+ def append_features(mod)
+ # help out people counting on transitive mixins
+ unless mod.instance_of?(Class)
+ raise TypeError, "Inclusion of the OO-Singleton module in module #{mod}"
end
+ super
end
+ def included(klass)
+ super
+ klass.private_class_method :new, :allocate
+ klass.extend SingletonClassMethods
+ Singleton.__init__(klass)
+ end
end
+
if __FILE__ == $0
def num_of_instances(klass)
@@ -175,13 +222,13 @@ end
class << Ups
def _instantiate?
@enter.push Thread.current[:i]
- while false.equal?(@singleton__instance__)
- @singleton__mutex__.unlock
+ while false.equal?(@__instance__)
+ Thread.critical = false
sleep 0.08
- @singleton__mutex__.lock
+ Thread.critical = true
end
@leave.push Thread.current[:i]
- @singleton__instance__
+ @__instance__
end
def __sleep
diff --git a/lib/soap/attachment.rb b/lib/soap/attachment.rb
new file mode 100644
index 0000000000..1a59b14018
--- /dev/null
+++ b/lib/soap/attachment.rb
@@ -0,0 +1,107 @@
+# soap/attachment.rb: SOAP4R - SwA implementation.
+# Copyright (C) 2002, 2003 Jamie Herre and NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'soap/baseData'
+require 'soap/mapping'
+
+
+module SOAP
+
+
+class SOAPAttachment < SOAPExternalReference
+ attr_reader :data
+
+ def initialize(value)
+ super()
+ @data = value
+ end
+
+private
+
+ def external_contentid
+ @data.contentid
+ end
+end
+
+
+class Attachment
+ attr_reader :io
+ attr_accessor :contenttype
+
+ def initialize(string_or_readable = nil)
+ @string_or_readable = string_or_readable
+ @contenttype = "application/octet-stream"
+ @contentid = nil
+ end
+
+ def contentid
+ @contentid ||= Attachment.contentid(self)
+ end
+
+ def contentid=(contentid)
+ @contentid = contentid
+ end
+
+ def mime_contentid
+ '<' + contentid + '>'
+ end
+
+ def content
+ if @content == nil and @string_or_readable != nil
+ @content = @string_or_readable.respond_to?(:read) ?
+ @string_or_readable.read : @string_or_readable
+ end
+ @content
+ end
+
+ def to_s
+ content
+ end
+
+ def write(out)
+ out.write(content)
+ end
+
+ def save(filename)
+ File.open(filename, "wb") do |f|
+ write(f)
+ end
+ end
+
+ def self.contentid(obj)
+ # this needs to be fixed
+ [obj.__id__.to_s, Process.pid.to_s].join('.')
+ end
+
+ def self.mime_contentid(obj)
+ '<' + contentid(obj) + '>'
+ end
+end
+
+
+module Mapping
+ class AttachmentFactory < SOAP::Mapping::Factory
+ def obj2soap(soap_class, obj, info, map)
+ soap_obj = soap_class.new(obj)
+ mark_marshalled_obj(obj, soap_obj)
+ soap_obj
+ end
+
+ def soap2obj(obj_class, node, info, map)
+ obj = node.data
+ mark_unmarshalled_obj(node, obj)
+ return true, obj
+ end
+ end
+
+ DefaultRegistry.add(::SOAP::Attachment, ::SOAP::SOAPAttachment,
+ AttachmentFactory.new, nil)
+end
+
+
+end
diff --git a/lib/soap/baseData.rb b/lib/soap/baseData.rb
new file mode 100644
index 0000000000..0e8b00d450
--- /dev/null
+++ b/lib/soap/baseData.rb
@@ -0,0 +1,942 @@
+# soap/baseData.rb: SOAP4R - Base type library
+# Copyright (C) 2000, 2001, 2003-2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'xsd/datatypes'
+require 'soap/soap'
+
+
+module SOAP
+
+
+###
+## Mix-in module for SOAP base type classes.
+#
+module SOAPModuleUtils
+ include SOAP
+
+public
+
+ def decode(elename)
+ d = self.new
+ d.elename = elename
+ d
+ end
+end
+
+
+###
+## for SOAP type(base and compound)
+#
+module SOAPType
+ attr_accessor :encodingstyle
+ attr_accessor :elename
+ attr_accessor :id
+ attr_reader :precedents
+ attr_accessor :root
+ attr_accessor :parent
+ attr_accessor :position
+ attr_reader :extraattr
+ attr_accessor :definedtype
+
+ def initialize(*arg)
+ super
+ @encodingstyle = nil
+ @elename = XSD::QName::EMPTY
+ @id = nil
+ @precedents = []
+ @root = false
+ @parent = nil
+ @position = nil
+ @definedtype = nil
+ @extraattr = {}
+ end
+
+ def inspect
+ if self.is_a?(XSD::NSDBase)
+ sprintf("#<%s:0x%x %s %s>", self.class.name, __id__, self.elename, self.type)
+ else
+ sprintf("#<%s:0x%x %s>", self.class.name, __id__, self.elename)
+ end
+ end
+
+ def rootnode
+ node = self
+ while node = node.parent
+ break if SOAPEnvelope === node
+ end
+ node
+ end
+end
+
+
+###
+## for SOAP base type
+#
+module SOAPBasetype
+ include SOAPType
+ include SOAP
+
+ def initialize(*arg)
+ super
+ end
+end
+
+
+###
+## for SOAP compound type
+#
+module SOAPCompoundtype
+ include SOAPType
+ include SOAP
+
+ def initialize(*arg)
+ super
+ end
+end
+
+
+###
+## Convenience datatypes.
+#
+class SOAPReference < XSD::NSDBase
+ include SOAPBasetype
+ extend SOAPModuleUtils
+
+public
+
+ attr_accessor :refid
+
+ # Override the definition in SOAPBasetype.
+ def initialize(obj = nil)
+ super()
+ @type = XSD::QName::EMPTY
+ @refid = nil
+ @obj = nil
+ __setobj__(obj) if obj
+ end
+
+ def __getobj__
+ @obj
+ end
+
+ def __setobj__(obj)
+ @obj = obj
+ @refid = @obj.id || SOAPReference.create_refid(@obj)
+ @obj.id = @refid unless @obj.id
+ @obj.precedents << self
+ # Copies NSDBase information
+ @obj.type = @type unless @obj.type
+ end
+
+ # Why don't I use delegate.rb?
+ # -> delegate requires target object type at initialize time.
+ # Why don't I use forwardable.rb?
+ # -> forwardable requires a list of forwarding methods.
+ #
+ # ToDo: Maybe I should use forwardable.rb and give it a methods list like
+ # delegate.rb...
+ #
+ def method_missing(msg_id, *params)
+ if @obj
+ @obj.send(msg_id, *params)
+ else
+ nil
+ end
+ end
+
+ def refidstr
+ '#' + @refid
+ end
+
+ def self.create_refid(obj)
+ 'id' + obj.__id__.to_s
+ end
+
+ def self.decode(elename, refidstr)
+ if /\A#(.*)\z/ =~ refidstr
+ refid = $1
+ elsif /\Acid:(.*)\z/ =~ refidstr
+ refid = $1
+ else
+ raise ArgumentError.new("illegal refid #{refidstr}")
+ end
+ d = super(elename)
+ d.refid = refid
+ d
+ end
+end
+
+
+class SOAPExternalReference < XSD::NSDBase
+ include SOAPBasetype
+ extend SOAPModuleUtils
+
+ def initialize
+ super()
+ @type = XSD::QName::EMPTY
+ end
+
+ def referred
+ rootnode.external_content[external_contentid] = self
+ end
+
+ def refidstr
+ 'cid:' + external_contentid
+ end
+
+private
+
+ def external_contentid
+ raise NotImplementedError.new
+ end
+end
+
+
+class SOAPNil < XSD::XSDNil
+ include SOAPBasetype
+ extend SOAPModuleUtils
+end
+
+# SOAPRawString is for sending raw string. In contrast to SOAPString,
+# SOAP4R does not do XML encoding and does not convert its CES. The string it
+# holds is embedded to XML instance directly as a 'xsd:string'.
+class SOAPRawString < XSD::XSDString
+ include SOAPBasetype
+ extend SOAPModuleUtils
+end
+
+
+###
+## Basic datatypes.
+#
+class SOAPAnySimpleType < XSD::XSDAnySimpleType
+ include SOAPBasetype
+ extend SOAPModuleUtils
+end
+
+class SOAPString < XSD::XSDString
+ include SOAPBasetype
+ extend SOAPModuleUtils
+end
+
+class SOAPBoolean < XSD::XSDBoolean
+ include SOAPBasetype
+ extend SOAPModuleUtils
+end
+
+class SOAPDecimal < XSD::XSDDecimal
+ include SOAPBasetype
+ extend SOAPModuleUtils
+end
+
+class SOAPFloat < XSD::XSDFloat
+ include SOAPBasetype
+ extend SOAPModuleUtils
+end
+
+class SOAPDouble < XSD::XSDDouble
+ include SOAPBasetype
+ extend SOAPModuleUtils
+end
+
+class SOAPDuration < XSD::XSDDuration
+ include SOAPBasetype
+ extend SOAPModuleUtils
+end
+
+class SOAPDateTime < XSD::XSDDateTime
+ include SOAPBasetype
+ extend SOAPModuleUtils
+end
+
+class SOAPTime < XSD::XSDTime
+ include SOAPBasetype
+ extend SOAPModuleUtils
+end
+
+class SOAPDate < XSD::XSDDate
+ include SOAPBasetype
+ extend SOAPModuleUtils
+end
+
+class SOAPGYearMonth < XSD::XSDGYearMonth
+ include SOAPBasetype
+ extend SOAPModuleUtils
+end
+
+class SOAPGYear < XSD::XSDGYear
+ include SOAPBasetype
+ extend SOAPModuleUtils
+end
+
+class SOAPGMonthDay < XSD::XSDGMonthDay
+ include SOAPBasetype
+ extend SOAPModuleUtils
+end
+
+class SOAPGDay < XSD::XSDGDay
+ include SOAPBasetype
+ extend SOAPModuleUtils
+end
+
+class SOAPGMonth < XSD::XSDGMonth
+ include SOAPBasetype
+ extend SOAPModuleUtils
+end
+
+class SOAPHexBinary < XSD::XSDHexBinary
+ include SOAPBasetype
+ extend SOAPModuleUtils
+end
+
+class SOAPBase64 < XSD::XSDBase64Binary
+ include SOAPBasetype
+ extend SOAPModuleUtils
+ Type = QName.new(EncodingNamespace, Base64Literal)
+
+public
+ # Override the definition in SOAPBasetype.
+ def initialize(value = nil)
+ super(value)
+ @type = Type
+ end
+
+ def as_xsd
+ @type = XSD::XSDBase64Binary::Type
+ end
+end
+
+class SOAPAnyURI < XSD::XSDAnyURI
+ include SOAPBasetype
+ extend SOAPModuleUtils
+end
+
+class SOAPQName < XSD::XSDQName
+ include SOAPBasetype
+ extend SOAPModuleUtils
+end
+
+
+class SOAPInteger < XSD::XSDInteger
+ include SOAPBasetype
+ extend SOAPModuleUtils
+end
+
+class SOAPNonPositiveInteger < XSD::XSDNonPositiveInteger
+ include SOAPBasetype
+ extend SOAPModuleUtils
+end
+
+class SOAPNegativeInteger < XSD::XSDNegativeInteger
+ include SOAPBasetype
+ extend SOAPModuleUtils
+end
+
+class SOAPLong < XSD::XSDLong
+ include SOAPBasetype
+ extend SOAPModuleUtils
+end
+
+class SOAPInt < XSD::XSDInt
+ include SOAPBasetype
+ extend SOAPModuleUtils
+end
+
+class SOAPShort < XSD::XSDShort
+ include SOAPBasetype
+ extend SOAPModuleUtils
+end
+
+class SOAPByte < XSD::XSDByte
+ include SOAPBasetype
+ extend SOAPModuleUtils
+end
+
+class SOAPNonNegativeInteger < XSD::XSDNonNegativeInteger
+ include SOAPBasetype
+ extend SOAPModuleUtils
+end
+
+class SOAPUnsignedLong < XSD::XSDUnsignedLong
+ include SOAPBasetype
+ extend SOAPModuleUtils
+end
+
+class SOAPUnsignedInt < XSD::XSDUnsignedInt
+ include SOAPBasetype
+ extend SOAPModuleUtils
+end
+
+class SOAPUnsignedShort < XSD::XSDUnsignedShort
+ include SOAPBasetype
+ extend SOAPModuleUtils
+end
+
+class SOAPUnsignedByte < XSD::XSDUnsignedByte
+ include SOAPBasetype
+ extend SOAPModuleUtils
+end
+
+class SOAPPositiveInteger < XSD::XSDPositiveInteger
+ include SOAPBasetype
+ extend SOAPModuleUtils
+end
+
+
+###
+## Compound datatypes.
+#
+class SOAPStruct < XSD::NSDBase
+ include SOAPCompoundtype
+ include Enumerable
+
+public
+
+ def initialize(type = nil)
+ super()
+ @type = type || XSD::QName::EMPTY
+ @array = []
+ @data = []
+ end
+
+ def to_s()
+ str = ''
+ self.each do |key, data|
+ str << "#{key}: #{data}\n"
+ end
+ str
+ end
+
+ def add(name, value)
+ add_member(name, value)
+ end
+
+ def [](idx)
+ if idx.is_a?(Range)
+ @data[idx]
+ elsif idx.is_a?(Integer)
+ if (idx > @array.size)
+ raise ArrayIndexOutOfBoundsError.new('In ' << @type.name)
+ end
+ @data[idx]
+ else
+ if @array.include?(idx)
+ @data[@array.index(idx)]
+ else
+ nil
+ end
+ end
+ end
+
+ def []=(idx, data)
+ if @array.include?(idx)
+ data.parent = self if data.respond_to?(:parent=)
+ @data[@array.index(idx)] = data
+ else
+ add(idx, data)
+ end
+ end
+
+ def key?(name)
+ @array.include?(name)
+ end
+
+ def members
+ @array
+ end
+
+ def to_obj
+ hash = {}
+ proptype = {}
+ each do |k, v|
+ value = v.respond_to?(:to_obj) ? v.to_obj : v.to_s
+ case proptype[k]
+ when :single
+ hash[k] = [hash[k], value]
+ proptype[k] = :multi
+ when :multi
+ hash[k] << value
+ else
+ hash[k] = value
+ proptype[k] = :single
+ end
+ end
+ hash
+ end
+
+ def each
+ idx = 0
+ while idx < @array.length
+ yield(@array[idx], @data[idx])
+ idx += 1
+ end
+ end
+
+ def replace
+ members.each do |member|
+ self[member] = yield(self[member])
+ end
+ end
+
+ def self.decode(elename, type)
+ s = SOAPStruct.new(type)
+ s.elename = elename
+ s
+ end
+
+private
+
+ def add_member(name, value = nil)
+ value = SOAPNil.new() if value.nil?
+ @array.push(name)
+ value.elename = value.elename.dup_name(name)
+ @data.push(value)
+ value.parent = self if value.respond_to?(:parent=)
+ value
+ end
+end
+
+
+# SOAPElement is not typed so it is not derived from NSDBase.
+class SOAPElement
+ include Enumerable
+
+ attr_accessor :encodingstyle
+
+ attr_accessor :elename
+ attr_accessor :id
+ attr_reader :precedents
+ attr_accessor :root
+ attr_accessor :parent
+ attr_accessor :position
+ attr_accessor :extraattr
+
+ attr_accessor :qualified
+
+ def initialize(elename, text = nil)
+ if !elename.is_a?(XSD::QName)
+ elename = XSD::QName.new(nil, elename)
+ end
+ @encodingstyle = LiteralNamespace
+ @elename = elename
+ @id = nil
+ @precedents = []
+ @root = false
+ @parent = nil
+ @position = nil
+ @extraattr = {}
+
+ @qualified = nil
+
+ @array = []
+ @data = []
+ @text = text
+ end
+
+ def inspect
+ sprintf("#<%s:0x%x %s>", self.class.name, __id__, self.elename)
+ end
+
+ # Text interface.
+ attr_accessor :text
+ alias data text
+
+ # Element interfaces.
+ def add(value)
+ add_member(value.elename.name, value)
+ end
+
+ def [](idx)
+ if @array.include?(idx)
+ @data[@array.index(idx)]
+ else
+ nil
+ end
+ end
+
+ def []=(idx, data)
+ if @array.include?(idx)
+ data.parent = self if data.respond_to?(:parent=)
+ @data[@array.index(idx)] = data
+ else
+ add(data)
+ end
+ end
+
+ def key?(name)
+ @array.include?(name)
+ end
+
+ def members
+ @array
+ end
+
+ def to_obj
+ if members.empty?
+ @text
+ else
+ hash = {}
+ proptype = {}
+ each do |k, v|
+ value = v.respond_to?(:to_obj) ? v.to_obj : v.to_s
+ case proptype[k]
+ when :single
+ hash[k] = [hash[k], value]
+ proptype[k] = :multi
+ when :multi
+ hash[k] << value
+ else
+ hash[k] = value
+ proptype[k] = :single
+ end
+ end
+ hash
+ end
+ end
+
+ def each
+ idx = 0
+ while idx < @array.length
+ yield(@array[idx], @data[idx])
+ idx += 1
+ end
+ end
+
+ def self.decode(elename)
+ o = SOAPElement.new(elename)
+ o
+ end
+
+ def self.from_obj(obj, namespace = nil)
+ o = SOAPElement.new(nil)
+ case obj
+ when nil
+ o.text = nil
+ when Hash
+ obj.each do |elename, value|
+ if value.is_a?(Array)
+ value.each do |subvalue|
+ child = from_obj(subvalue, namespace)
+ child.elename = to_elename(elename, namespace)
+ o.add(child)
+ end
+ else
+ child = from_obj(value, namespace)
+ child.elename = to_elename(elename, namespace)
+ o.add(child)
+ end
+ end
+ else
+ o.text = obj.to_s
+ end
+ o
+ end
+
+ def self.to_elename(obj, namespace = nil)
+ if obj.is_a?(XSD::QName)
+ obj
+ elsif /\A(.+):([^:]+)\z/ =~ obj.to_s
+ XSD::QName.new($1, $2)
+ else
+ XSD::QName.new(namespace, obj.to_s)
+ end
+ end
+
+private
+
+ def add_member(name, value)
+ add_accessor(name)
+ @array.push(name)
+ @data.push(value)
+ value.parent = self if value.respond_to?(:parent=)
+ value
+ end
+
+ if RUBY_VERSION > "1.7.0"
+ def add_accessor(name)
+ methodname = name
+ if self.respond_to?(methodname)
+ methodname = safe_accessor_name(methodname)
+ end
+ Mapping.define_singleton_method(self, methodname) do
+ @data[@array.index(name)]
+ end
+ Mapping.define_singleton_method(self, methodname + '=') do |value|
+ @data[@array.index(name)] = value
+ end
+ end
+ else
+ def add_accessor(name)
+ methodname = safe_accessor_name(name)
+ instance_eval <<-EOS
+ def #{methodname}
+ @data[@array.index(#{name.dump})]
+ end
+
+ def #{methodname}=(value)
+ @data[@array.index(#{name.dump})] = value
+ end
+ EOS
+ end
+ end
+
+ def safe_accessor_name(name)
+ "var_" << name.gsub(/[^a-zA-Z0-9_]/, '')
+ end
+end
+
+
+class SOAPArray < XSD::NSDBase
+ include SOAPCompoundtype
+ include Enumerable
+
+public
+
+ attr_accessor :sparse
+
+ attr_reader :offset, :rank
+ attr_accessor :size, :size_fixed
+ attr_reader :arytype
+
+ def initialize(type = nil, rank = 1, arytype = nil)
+ super()
+ @type = type || ValueArrayName
+ @rank = rank
+ @data = Array.new
+ @sparse = false
+ @offset = Array.new(rank, 0)
+ @size = Array.new(rank, 0)
+ @size_fixed = false
+ @position = nil
+ @arytype = arytype
+ end
+
+ def offset=(var)
+ @offset = var
+ @sparse = true
+ end
+
+ def add(value)
+ self[*(@offset)] = value
+ end
+
+ def [](*idxary)
+ if idxary.size != @rank
+ raise ArgumentError.new("given #{idxary.size} params does not match rank: #{@rank}")
+ end
+
+ retrieve(idxary)
+ end
+
+ def []=(*idxary)
+ value = idxary.slice!(-1)
+
+ if idxary.size != @rank
+ raise ArgumentError.new("given #{idxary.size} params(#{idxary})" +
+ " does not match rank: #{@rank}")
+ end
+
+ idx = 0
+ while idx < idxary.size
+ if idxary[idx] + 1 > @size[idx]
+ @size[idx] = idxary[idx] + 1
+ end
+ idx += 1
+ end
+
+ data = retrieve(idxary[0, idxary.size - 1])
+ data[idxary.last] = value
+
+ if value.is_a?(SOAPType)
+ value.elename = ITEM_NAME
+ # Sync type
+ unless @type.name
+ @type = XSD::QName.new(value.type.namespace,
+ SOAPArray.create_arytype(value.type.name, @rank))
+ end
+ value.type ||= @type
+ end
+
+ @offset = idxary
+ value.parent = self if value.respond_to?(:parent=)
+ offsetnext
+ end
+
+ def each
+ @data.each do |data|
+ yield(data)
+ end
+ end
+
+ def to_a
+ @data.dup
+ end
+
+ def replace
+ @data = deep_map(@data) do |ele|
+ yield(ele)
+ end
+ end
+
+ def deep_map(ary, &block)
+ ary.collect do |ele|
+ if ele.is_a?(Array)
+ deep_map(ele, &block)
+ else
+ new_obj = block.call(ele)
+ new_obj.elename = ITEM_NAME
+ new_obj
+ end
+ end
+ end
+
+ def include?(var)
+ traverse_data(@data) do |v, *rank|
+ if v.is_a?(SOAPBasetype) && v.data == var
+ return true
+ end
+ end
+ false
+ end
+
+ def traverse
+ traverse_data(@data) do |v, *rank|
+ unless @sparse
+ yield(v)
+ else
+ yield(v, *rank) if v && !v.is_a?(SOAPNil)
+ end
+ end
+ end
+
+ def soap2array(ary)
+ traverse_data(@data) do |v, *position|
+ iteary = ary
+ rank = 1
+ while rank < position.size
+ idx = position[rank - 1]
+ if iteary[idx].nil?
+ iteary = iteary[idx] = Array.new
+ else
+ iteary = iteary[idx]
+ end
+ rank += 1
+ end
+ if block_given?
+ iteary[position.last] = yield(v)
+ else
+ iteary[position.last] = v
+ end
+ end
+ end
+
+ def position
+ @position
+ end
+
+private
+
+ ITEM_NAME = XSD::QName.new(nil, 'item')
+
+ def retrieve(idxary)
+ data = @data
+ rank = 1
+ while rank <= idxary.size
+ idx = idxary[rank - 1]
+ if data[idx].nil?
+ data = data[idx] = Array.new
+ else
+ data = data[idx]
+ end
+ rank += 1
+ end
+ data
+ end
+
+ def traverse_data(data, rank = 1)
+ idx = 0
+ while idx < ranksize(rank)
+ if rank < @rank
+ traverse_data(data[idx], rank + 1) do |*v|
+ v[1, 0] = idx
+ yield(*v)
+ end
+ else
+ yield(data[idx], idx)
+ end
+ idx += 1
+ end
+ end
+
+ def ranksize(rank)
+ @size[rank - 1]
+ end
+
+ def offsetnext
+ move = false
+ idx = @offset.size - 1
+ while !move && idx >= 0
+ @offset[idx] += 1
+ if @size_fixed
+ if @offset[idx] < @size[idx]
+ move = true
+ else
+ @offset[idx] = 0
+ idx -= 1
+ end
+ else
+ move = true
+ end
+ end
+ end
+
+ # Module function
+
+public
+
+ def self.decode(elename, type, arytype)
+ typestr, nofary = parse_type(arytype.name)
+ rank = nofary.count(',') + 1
+ plain_arytype = XSD::QName.new(arytype.namespace, typestr)
+ o = SOAPArray.new(type, rank, plain_arytype)
+ size = []
+ nofary.split(',').each do |s|
+ if s.empty?
+ size.clear
+ break
+ else
+ size << s.to_i
+ end
+ end
+ unless size.empty?
+ o.size = size
+ o.size_fixed = true
+ end
+ o.elename = elename
+ o
+ end
+
+private
+
+ def self.create_arytype(typename, rank)
+ "#{typename}[" << ',' * (rank - 1) << ']'
+ end
+
+ TypeParseRegexp = Regexp.new('^(.+)\[([\d,]*)\]$')
+
+ def self.parse_type(string)
+ TypeParseRegexp =~ string
+ return $1, $2
+ end
+end
+
+
+require 'soap/mapping/typeMap'
+
+
+end
diff --git a/lib/soap/element.rb b/lib/soap/element.rb
new file mode 100644
index 0000000000..cc58b5d341
--- /dev/null
+++ b/lib/soap/element.rb
@@ -0,0 +1,258 @@
+# SOAP4R - SOAP elements library
+# Copyright (C) 2000, 2001, 2003-2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'xsd/qname'
+require 'soap/baseData'
+
+
+module SOAP
+
+
+###
+## SOAP elements
+#
+module SOAPEnvelopeElement; end
+
+class SOAPFault < SOAPStruct
+ include SOAPEnvelopeElement
+ include SOAPCompoundtype
+
+public
+
+ def faultcode
+ self['faultcode']
+ end
+
+ def faultstring
+ self['faultstring']
+ end
+
+ def faultactor
+ self['faultactor']
+ end
+
+ def detail
+ self['detail']
+ end
+
+ def faultcode=(rhs)
+ self['faultcode'] = rhs
+ end
+
+ def faultstring=(rhs)
+ self['faultstring'] = rhs
+ end
+
+ def faultactor=(rhs)
+ self['faultactor'] = rhs
+ end
+
+ def detail=(rhs)
+ self['detail'] = rhs
+ end
+
+ def initialize(faultcode = nil, faultstring = nil, faultactor = nil, detail = nil)
+ super(EleFaultName)
+ @elename = EleFaultName
+ @encodingstyle = EncodingNamespace
+
+ if faultcode
+ self.faultcode = faultcode
+ self.faultstring = faultstring
+ self.faultactor = faultactor
+ self.detail = detail
+ self.faultcode.elename = EleFaultCodeName if self.faultcode
+ self.faultstring.elename = EleFaultStringName if self.faultstring
+ self.faultactor.elename = EleFaultActorName if self.faultactor
+ self.detail.elename = EleFaultDetailName if self.detail
+ end
+ faultcode.parent = self if faultcode
+ faultstring.parent = self if faultstring
+ faultactor.parent = self if faultactor
+ detail.parent = self if detail
+ end
+
+ def encode(generator, ns, attrs = {})
+ SOAPGenerator.assign_ns(attrs, ns, EnvelopeNamespace)
+ SOAPGenerator.assign_ns(attrs, ns, EncodingNamespace)
+ attrs[ns.name(AttrEncodingStyleName)] = EncodingNamespace
+ name = ns.name(@elename)
+ generator.encode_tag(name, attrs)
+ yield(self.faultcode)
+ yield(self.faultstring)
+ yield(self.faultactor)
+ yield(self.detail) if self.detail
+ generator.encode_tag_end(name, true)
+ end
+end
+
+
+class SOAPBody < SOAPStruct
+ include SOAPEnvelopeElement
+
+ def initialize(data = nil, is_fault = false)
+ super(nil)
+ @elename = EleBodyName
+ @encodingstyle = nil
+ if data
+ if data.respond_to?(:elename)
+ add(data.elename.name, data)
+ else
+ data.to_a.each do |datum|
+ add(datum.elename.name, datum)
+ end
+ end
+ end
+ @is_fault = is_fault
+ end
+
+ def encode(generator, ns, attrs = {})
+ name = ns.name(@elename)
+ generator.encode_tag(name, attrs)
+ if @is_fault
+ yield(@data)
+ else
+ @data.each do |data|
+ yield(data)
+ end
+ end
+ generator.encode_tag_end(name, true)
+ end
+
+ def root_node
+ @data.each do |node|
+ if node.root == 1
+ return node
+ end
+ end
+ # No specified root...
+ @data.each do |node|
+ if node.root != 0
+ return node
+ end
+ end
+
+ raise Parser::FormatDecodeError.new('no root element')
+ end
+end
+
+
+class SOAPHeaderItem < XSD::NSDBase
+ include SOAPEnvelopeElement
+ include SOAPCompoundtype
+
+public
+
+ attr_accessor :element
+ attr_accessor :mustunderstand
+ attr_accessor :encodingstyle
+
+ def initialize(element, mustunderstand = true, encodingstyle = nil)
+ super()
+ @type = nil
+ @element = element
+ @mustunderstand = mustunderstand
+ @encodingstyle = encodingstyle
+ element.parent = self if element
+ end
+
+ def encode(generator, ns, attrs = {})
+ attrs.each do |key, value|
+ @element.extraattr[key] = value
+ end
+ @element.extraattr[ns.name(AttrMustUnderstandName)] =
+ (@mustunderstand ? '1' : '0')
+ if @encodingstyle
+ @element.extraattr[ns.name(AttrEncodingStyleName)] = @encodingstyle
+ end
+ @element.encodingstyle = @encodingstyle if !@element.encodingstyle
+ yield(@element)
+ end
+end
+
+
+class SOAPHeader < SOAPStruct
+ include SOAPEnvelopeElement
+
+ def initialize
+ super(nil)
+ @elename = EleHeaderName
+ @encodingstyle = nil
+ end
+
+ def encode(generator, ns, attrs = {})
+ name = ns.name(@elename)
+ generator.encode_tag(name, attrs)
+ @data.each do |data|
+ yield(data)
+ end
+ generator.encode_tag_end(name, true)
+ end
+
+ def add(name, value)
+ mu = (value.extraattr[AttrMustUnderstandName] == '1')
+ encstyle = value.extraattr[AttrEncodingStyleName]
+ item = SOAPHeaderItem.new(value, mu, encstyle)
+ super(name, item)
+ end
+
+ def length
+ @data.length
+ end
+ alias size length
+end
+
+
+class SOAPEnvelope < XSD::NSDBase
+ include SOAPEnvelopeElement
+ include SOAPCompoundtype
+
+ attr_reader :header
+ attr_reader :body
+ attr_reader :external_content
+
+ def initialize(header = nil, body = nil)
+ super()
+ @type = nil
+ @elename = EleEnvelopeName
+ @encodingstyle = nil
+ @header = header
+ @body = body
+ @external_content = {}
+ header.parent = self if header
+ body.parent = self if body
+ end
+
+ def header=(header)
+ header.parent = self
+ @header = header
+ end
+
+ def body=(body)
+ body.parent = self
+ @body = body
+ end
+
+ def encode(generator, ns, attrs = {})
+ SOAPGenerator.assign_ns(attrs, ns, elename.namespace, SOAPNamespaceTag)
+ name = ns.name(@elename)
+ generator.encode_tag(name, attrs)
+
+ yield(@header) if @header and @header.length > 0
+ yield(@body)
+
+ generator.encode_tag_end(name, true)
+ end
+
+ def to_ary
+ [header, body]
+ end
+end
+
+
+end
diff --git a/lib/soap/encodingstyle/aspDotNetHandler.rb b/lib/soap/encodingstyle/aspDotNetHandler.rb
new file mode 100644
index 0000000000..fd7e0fa217
--- /dev/null
+++ b/lib/soap/encodingstyle/aspDotNetHandler.rb
@@ -0,0 +1,213 @@
+# SOAP4R - ASP.NET EncodingStyle handler library
+# Copyright (C) 2001, 2003, 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'soap/encodingstyle/handler'
+
+
+module SOAP
+module EncodingStyle
+
+
+class ASPDotNetHandler < Handler
+ Namespace = 'http://tempuri.org/ASP.NET'
+ add_handler
+
+ def initialize(charset = nil)
+ super(charset)
+ @textbuf = ''
+ @decode_typemap = nil
+ end
+
+
+ ###
+ ## encode interface.
+ #
+ def encode_data(generator, ns, data, parent)
+ attrs = {}
+ # ASPDotNetHandler is intended to be used for accessing an ASP.NET doc/lit
+ # service as an rpc/encoded service. in the situation, local elements
+ # should be qualified. propagate parent's namespace to children.
+ if data.elename.namespace.nil?
+ data.elename.namespace = parent.elename.namespace
+ end
+ name = generator.encode_name(ns, data, attrs)
+ case data
+ when SOAPRawString
+ generator.encode_tag(name, attrs)
+ generator.encode_rawstring(data.to_s)
+ when XSD::XSDString
+ generator.encode_tag(name, attrs)
+ generator.encode_string(@charset ?
+ XSD::Charset.encoding_to_xml(data.to_s, @charset) : data.to_s)
+ when XSD::XSDAnySimpleType
+ generator.encode_tag(name, attrs)
+ generator.encode_string(data.to_s)
+ when SOAPStruct
+ generator.encode_tag(name, attrs)
+ data.each do |key, value|
+ generator.encode_child(ns, value, data)
+ end
+ when SOAPArray
+ generator.encode_tag(name, attrs)
+ data.traverse do |child, *rank|
+ data.position = nil
+ generator.encode_child(ns, child, data)
+ end
+ else
+ raise EncodingStyleError.new(
+ "unknown object:#{data} in this encodingStyle")
+ end
+ end
+
+ def encode_data_end(generator, ns, data, parent)
+ name = generator.encode_name_end(ns, data)
+ cr = data.is_a?(SOAPCompoundtype)
+ generator.encode_tag_end(name, cr)
+ end
+
+
+ ###
+ ## decode interface.
+ #
+ class SOAPTemporalObject
+ attr_accessor :parent
+
+ def initialize
+ @parent = nil
+ end
+ end
+
+ class SOAPUnknown < SOAPTemporalObject
+ def initialize(handler, elename)
+ super()
+ @handler = handler
+ @elename = elename
+ end
+
+ def as_struct
+ o = SOAPStruct.decode(@elename, XSD::AnyTypeName)
+ o.parent = @parent
+ o.type.name = @name
+ @handler.decode_parent(@parent, o)
+ o
+ end
+
+ def as_string
+ o = SOAPString.decode(@elename)
+ o.parent = @parent
+ @handler.decode_parent(@parent, o)
+ o
+ end
+
+ def as_nil
+ o = SOAPNil.decode(@elename)
+ o.parent = @parent
+ @handler.decode_parent(@parent, o)
+ o
+ end
+ end
+
+ def decode_tag(ns, elename, attrs, parent)
+ @textbuf = ''
+ o = SOAPUnknown.new(self, elename)
+ o.parent = parent
+ o
+ end
+
+ def decode_tag_end(ns, node)
+ o = node.node
+ if o.is_a?(SOAPUnknown)
+ newnode = o.as_string
+# if /\A\s*\z/ =~ @textbuf
+# o.as_struct
+# else
+# o.as_string
+# end
+ node.replace_node(newnode)
+ o = node.node
+ end
+
+ decode_textbuf(o)
+ @textbuf = ''
+ end
+
+ def decode_text(ns, text)
+ # @textbuf is set at decode_tag_end.
+ @textbuf << text
+ end
+
+ def decode_prologue
+ end
+
+ def decode_epilogue
+ end
+
+ def decode_parent(parent, node)
+ case parent.node
+ when SOAPUnknown
+ newparent = parent.node.as_struct
+ node.parent = newparent
+ parent.replace_node(newparent)
+ decode_parent(parent, node)
+
+ when SOAPStruct
+ data = parent.node[node.elename.name]
+ case data
+ when nil
+ parent.node.add(node.elename.name, node)
+ when SOAPArray
+ name, type_ns = node.elename.name, node.type.namespace
+ data.add(node)
+ node.elename, node.type.namespace = name, type_ns
+ else
+ parent.node[node.elename.name] = SOAPArray.new
+ name, type_ns = data.elename.name, data.type.namespace
+ parent.node[node.elename.name].add(data)
+ data.elename.name, data.type.namespace = name, type_ns
+ name, type_ns = node.elename.name, node.type.namespace
+ parent.node[node.elename.name].add(node)
+ node.elename.name, node.type.namespace = name, type_ns
+ end
+
+ when SOAPArray
+ if node.position
+ parent.node[*(decode_arypos(node.position))] = node
+ parent.node.sparse = true
+ else
+ parent.node.add(node)
+ end
+
+ when SOAPBasetype
+ raise EncodingStyleError.new("SOAP base type must not have a child")
+
+ else
+ # SOAPUnknown does not have parent.
+ # raise EncodingStyleError.new("illegal parent: #{parent}")
+ end
+ end
+
+private
+
+ def decode_textbuf(node)
+ if node.is_a?(XSD::XSDString)
+ if @charset
+ node.set(XSD::Charset.encoding_from_xml(@textbuf, @charset))
+ else
+ node.set(@textbuf)
+ end
+ else
+ # Nothing to do...
+ end
+ end
+end
+
+ASPDotNetHandler.new
+
+
+end
+end
diff --git a/lib/soap/encodingstyle/handler.rb b/lib/soap/encodingstyle/handler.rb
new file mode 100644
index 0000000000..c015417435
--- /dev/null
+++ b/lib/soap/encodingstyle/handler.rb
@@ -0,0 +1,100 @@
+# SOAP4R - EncodingStyle handler library
+# Copyright (C) 2001, 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'soap/soap'
+require 'soap/baseData'
+require 'soap/element'
+
+
+module SOAP
+module EncodingStyle
+
+
+class Handler
+ @@handlers = {}
+
+ class EncodingStyleError < Error; end
+
+ class << self
+ def uri
+ self::Namespace
+ end
+
+ def handler(uri)
+ @@handlers[uri]
+ end
+
+ def each
+ @@handlers.each do |key, value|
+ yield(value)
+ end
+ end
+
+ private
+
+ def add_handler
+ @@handlers[self.uri] = self
+ end
+ end
+
+ attr_reader :charset
+ attr_accessor :generate_explicit_type
+ def decode_typemap=(definedtypes)
+ @decode_typemap = definedtypes
+ end
+
+ def initialize(charset)
+ @charset = charset
+ @generate_explicit_type = true
+ @decode_typemap = nil
+ end
+
+ ###
+ ## encode interface.
+ #
+ # Returns a XML instance as a string.
+ def encode_data(generator, ns, data, parent)
+ raise NotImplementError
+ end
+
+ def encode_data_end(generator, ns, data, parent)
+ raise NotImplementError
+ end
+
+ def encode_prologue
+ end
+
+ def encode_epilogue
+ end
+
+ ###
+ ## decode interface.
+ #
+ # Returns SOAP/OM data.
+ def decode_tag(ns, name, attrs, parent)
+ raise NotImplementError.new('Method decode_tag must be defined in derived class.')
+ end
+
+ def decode_tag_end(ns, name)
+ raise NotImplementError.new('Method decode_tag_end must be defined in derived class.')
+ end
+
+ def decode_text(ns, text)
+ raise NotImplementError.new('Method decode_text must be defined in derived class.')
+ end
+
+ def decode_prologue
+ end
+
+ def decode_epilogue
+ end
+end
+
+
+end
+end
diff --git a/lib/soap/encodingstyle/literalHandler.rb b/lib/soap/encodingstyle/literalHandler.rb
new file mode 100644
index 0000000000..59c7205366
--- /dev/null
+++ b/lib/soap/encodingstyle/literalHandler.rb
@@ -0,0 +1,226 @@
+# SOAP4R - XML Literal EncodingStyle handler library
+# Copyright (C) 2001, 2003-2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'soap/encodingstyle/handler'
+
+
+module SOAP
+module EncodingStyle
+
+
+class LiteralHandler < Handler
+ Namespace = SOAP::LiteralNamespace
+ add_handler
+
+ def initialize(charset = nil)
+ super(charset)
+ @textbuf = ''
+ end
+
+
+ ###
+ ## encode interface.
+ #
+ def encode_data(generator, ns, data, parent)
+ attrs = {}
+ name = generator.encode_name(ns, data, attrs)
+ data.extraattr.each do |k, v|
+ # ToDo: check generator.attributeformdefault here
+ if k.is_a?(XSD::QName)
+ if k.namespace
+ SOAPGenerator.assign_ns(attrs, ns, k.namespace)
+ k = ns.name(k)
+ else
+ k = k.name
+ end
+ end
+ attrs[k] = v
+ end
+ case data
+ when SOAPRawString
+ generator.encode_tag(name, attrs)
+ generator.encode_rawstring(data.to_s)
+ when XSD::XSDString
+ generator.encode_tag(name, attrs)
+ str = data.to_s
+ str = XSD::Charset.encoding_to_xml(str, @charset) if @charset
+ generator.encode_string(str)
+ when XSD::XSDAnySimpleType
+ generator.encode_tag(name, attrs)
+ generator.encode_string(data.to_s)
+ when SOAPStruct
+ generator.encode_tag(name, attrs)
+ data.each do |key, value|
+ generator.encode_child(ns, value, data)
+ end
+ when SOAPArray
+ generator.encode_tag(name, attrs)
+ data.traverse do |child, *rank|
+ data.position = nil
+ generator.encode_child(ns, child, data)
+ end
+ when SOAPElement
+ # passes 2 times for simplifying namespace definition
+ data.each do |key, value|
+ if value.elename.namespace
+ SOAPGenerator.assign_ns(attrs, ns, value.elename.namespace)
+ end
+ end
+ generator.encode_tag(name, attrs)
+ generator.encode_rawstring(data.text) if data.text
+ data.each do |key, value|
+ generator.encode_child(ns, value, data)
+ end
+ else
+ raise EncodingStyleError.new(
+ "unknown object:#{data} in this encodingStyle")
+ end
+ end
+
+ def encode_data_end(generator, ns, data, parent)
+ name = generator.encode_name_end(ns, data)
+ cr = (data.is_a?(SOAPCompoundtype) or
+ (data.is_a?(SOAPElement) and !data.text))
+ generator.encode_tag_end(name, cr)
+ end
+
+
+ ###
+ ## decode interface.
+ #
+ class SOAPTemporalObject
+ attr_accessor :parent
+
+ def initialize
+ @parent = nil
+ end
+ end
+
+ class SOAPUnknown < SOAPTemporalObject
+ def initialize(handler, elename, extraattr)
+ super()
+ @handler = handler
+ @elename = elename
+ @extraattr = extraattr
+ end
+
+ def as_element
+ o = SOAPElement.decode(@elename)
+ o.parent = @parent
+ o.extraattr.update(@extraattr)
+ @handler.decode_parent(@parent, o)
+ o
+ end
+
+ def as_string
+ o = SOAPString.decode(@elename)
+ o.parent = @parent
+ o.extraattr.update(@extraattr)
+ @handler.decode_parent(@parent, o)
+ o
+ end
+
+ def as_nil
+ o = SOAPNil.decode(@elename)
+ o.parent = @parent
+ o.extraattr.update(@extraattr)
+ @handler.decode_parent(@parent, o)
+ o
+ end
+ end
+
+ def decode_tag(ns, elename, attrs, parent)
+ @textbuf = ''
+ o = SOAPUnknown.new(self, elename, decode_attrs(ns, attrs))
+ o.parent = parent
+ o
+ end
+
+ def decode_tag_end(ns, node)
+ o = node.node
+ if o.is_a?(SOAPUnknown)
+ newnode = if /\A\s*\z/ =~ @textbuf
+ o.as_element
+ else
+ o.as_string
+ end
+ node.replace_node(newnode)
+ o = node.node
+ end
+
+ decode_textbuf(o)
+ @textbuf = ''
+ end
+
+ def decode_text(ns, text)
+ # @textbuf is set at decode_tag_end.
+ @textbuf << text
+ end
+
+ def decode_attrs(ns, attrs)
+ extraattr = {}
+ attrs.each do |key, value|
+ qname = ns.parse_local(key)
+ extraattr[qname] = value
+ end
+ extraattr
+ end
+
+ def decode_prologue
+ end
+
+ def decode_epilogue
+ end
+
+ def decode_parent(parent, node)
+ return unless parent.node
+ case parent.node
+ when SOAPUnknown
+ newparent = parent.node.as_element
+ node.parent = newparent
+ parent.replace_node(newparent)
+ decode_parent(parent, node)
+ when SOAPElement
+ parent.node.add(node)
+ node.parent = parent.node
+ when SOAPStruct
+ parent.node.add(node.elename.name, node)
+ node.parent = parent.node
+ when SOAPArray
+ if node.position
+ parent.node[*(decode_arypos(node.position))] = node
+ parent.node.sparse = true
+ else
+ parent.node.add(node)
+ end
+ node.parent = parent.node
+ else
+ raise EncodingStyleError.new("illegal parent: #{parent.node}")
+ end
+ end
+
+private
+
+ def decode_textbuf(node)
+ if node.is_a?(XSD::XSDString)
+ if @charset
+ node.set(XSD::Charset.encoding_from_xml(@textbuf, @charset))
+ else
+ node.set(@textbuf)
+ end
+ else
+ # Nothing to do...
+ end
+ end
+end
+
+LiteralHandler.new
+
+
+end
+end
diff --git a/lib/soap/encodingstyle/soapHandler.rb b/lib/soap/encodingstyle/soapHandler.rb
new file mode 100644
index 0000000000..a522392625
--- /dev/null
+++ b/lib/soap/encodingstyle/soapHandler.rb
@@ -0,0 +1,582 @@
+# SOAP4R - SOAP EncodingStyle handler library
+# Copyright (C) 2001, 2003, 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'soap/encodingstyle/handler'
+
+
+module SOAP
+module EncodingStyle
+
+
+class SOAPHandler < Handler
+ Namespace = SOAP::EncodingNamespace
+ add_handler
+
+ def initialize(charset = nil)
+ super(charset)
+ @refpool = []
+ @idpool = []
+ @textbuf = ''
+ @is_first_top_ele = true
+ end
+
+
+ ###
+ ## encode interface.
+ #
+ def encode_data(generator, ns, data, parent)
+ attrs = encode_attrs(generator, ns, data, parent)
+ if parent && parent.is_a?(SOAPArray) && parent.position
+ attrs[ns.name(AttrPositionName)] = "[#{parent.position.join(',')}]"
+ end
+ name = generator.encode_name(ns, data, attrs)
+ case data
+ when SOAPReference
+ attrs['href'] = data.refidstr
+ generator.encode_tag(name, attrs)
+ when SOAPExternalReference
+ data.referred
+ attrs['href'] = data.refidstr
+ generator.encode_tag(name, attrs)
+ when SOAPRawString
+ generator.encode_tag(name, attrs)
+ generator.encode_rawstring(data.to_s)
+ when XSD::XSDString
+ generator.encode_tag(name, attrs)
+ generator.encode_string(@charset ?
+ XSD::Charset.encoding_to_xml(data.to_s, @charset) : data.to_s)
+ when XSD::XSDAnySimpleType
+ generator.encode_tag(name, attrs)
+ generator.encode_string(data.to_s)
+ when SOAPStruct
+ generator.encode_tag(name, attrs)
+ data.each do |key, value|
+ generator.encode_child(ns, value, data)
+ end
+ when SOAPArray
+ generator.encode_tag(name, attrs)
+ data.traverse do |child, *rank|
+ data.position = data.sparse ? rank : nil
+ generator.encode_child(ns, child, data)
+ end
+ else
+ raise EncodingStyleError.new(
+ "unknown object:#{data} in this encodingStyle")
+ end
+ end
+
+ def encode_data_end(generator, ns, data, parent)
+ name = generator.encode_name_end(ns, data)
+ cr = data.is_a?(SOAPCompoundtype)
+ generator.encode_tag_end(name, cr)
+ end
+
+
+ ###
+ ## decode interface.
+ #
+ class SOAPTemporalObject
+ attr_accessor :parent
+ attr_accessor :position
+ attr_accessor :id
+ attr_accessor :root
+
+ def initialize
+ @parent = nil
+ @position = nil
+ @id = nil
+ @root = nil
+ end
+ end
+
+ class SOAPUnknown < SOAPTemporalObject
+ attr_reader :type
+ attr_accessor :definedtype
+ attr_reader :extraattr
+
+ def initialize(handler, elename, type, extraattr)
+ super()
+ @handler = handler
+ @elename = elename
+ @type = type
+ @extraattr = extraattr
+ @definedtype = nil
+ end
+
+ def as_struct
+ o = SOAPStruct.decode(@elename, @type)
+ o.id = @id
+ o.root = @root
+ o.parent = @parent
+ o.position = @position
+ o.extraattr.update(@extraattr)
+ @handler.decode_parent(@parent, o)
+ o
+ end
+
+ def as_string
+ o = SOAPString.decode(@elename)
+ o.id = @id
+ o.root = @root
+ o.parent = @parent
+ o.position = @position
+ o.extraattr.update(@extraattr)
+ @handler.decode_parent(@parent, o)
+ o
+ end
+
+ def as_nil
+ o = SOAPNil.decode(@elename)
+ o.id = @id
+ o.root = @root
+ o.parent = @parent
+ o.position = @position
+ o.extraattr.update(@extraattr)
+ @handler.decode_parent(@parent, o)
+ o
+ end
+ end
+
+ def decode_tag(ns, elename, attrs, parent)
+ @textbuf = ''
+ is_nil, type, arytype, root, offset, position, href, id, extraattr =
+ decode_attrs(ns, attrs)
+ o = nil
+ if is_nil
+ o = SOAPNil.decode(elename)
+ elsif href
+ o = SOAPReference.decode(elename, href)
+ @refpool << o
+ elsif @decode_typemap
+ o = decode_tag_by_wsdl(ns, elename, type, parent.node, arytype, extraattr)
+ else
+ o = decode_tag_by_type(ns, elename, type, parent.node, arytype, extraattr)
+ end
+
+ if o.is_a?(SOAPArray)
+ if offset
+ o.offset = decode_arypos(offset)
+ o.sparse = true
+ else
+ o.sparse = false
+ end
+ end
+
+ o.parent = parent
+ o.id = id
+ o.root = root
+ o.position = position
+
+ unless o.is_a?(SOAPTemporalObject)
+ @idpool << o if o.id
+ decode_parent(parent, o)
+ end
+ o
+ end
+
+ def decode_tag_end(ns, node)
+ o = node.node
+ if o.is_a?(SOAPUnknown)
+ newnode = if /\A\s*\z/ =~ @textbuf
+ o.as_struct
+ else
+ o.as_string
+ end
+ if newnode.id
+ @idpool << newnode
+ end
+ node.replace_node(newnode)
+ o = node.node
+ end
+ decode_textbuf(o)
+ # unlink definedtype
+ o.definedtype = nil
+ end
+
+ def decode_text(ns, text)
+ @textbuf << text
+ end
+
+ def decode_prologue
+ @refpool.clear
+ @idpool.clear
+ @is_first_top_ele = true
+ end
+
+ def decode_epilogue
+ decode_resolve_id
+ end
+
+ def decode_parent(parent, node)
+ return unless parent.node
+ case parent.node
+ when SOAPUnknown
+ newparent = parent.node.as_struct
+ node.parent = newparent
+ if newparent.id
+ @idpool << newparent
+ end
+ parent.replace_node(newparent)
+ decode_parent(parent, node)
+ when SOAPStruct
+ parent.node.add(node.elename.name, node)
+ node.parent = parent.node
+ when SOAPArray
+ if node.position
+ parent.node[*(decode_arypos(node.position))] = node
+ parent.node.sparse = true
+ else
+ parent.node.add(node)
+ end
+ node.parent = parent.node
+ else
+ raise EncodingStyleError.new("illegal parent: #{parent.node}")
+ end
+ end
+
+private
+
+ def content_ranksize(typename)
+ typename.scan(/\[[\d,]*\]$/)[0]
+ end
+
+ def content_typename(typename)
+ typename.sub(/\[,*\]$/, '')
+ end
+
+ def create_arytype(ns, data)
+ XSD::QName.new(data.arytype.namespace,
+ content_typename(data.arytype.name) + "[#{data.size.join(',')}]")
+ end
+
+ def encode_attrs(generator, ns, data, parent)
+ attrs = {}
+ return attrs if data.is_a?(SOAPReference)
+
+ if !parent || parent.encodingstyle != EncodingNamespace
+ if @generate_explicit_type
+ SOAPGenerator.assign_ns(attrs, ns, EnvelopeNamespace)
+ attrs[ns.name(AttrEncodingStyleName)] = EncodingNamespace
+ end
+ data.encodingstyle = EncodingNamespace
+ end
+
+ if data.is_a?(SOAPNil)
+ attrs[ns.name(XSD::AttrNilName)] = XSD::NilValue
+ elsif @generate_explicit_type
+ if data.type.namespace
+ SOAPGenerator.assign_ns(attrs, ns, data.type.namespace)
+ end
+ if data.is_a?(SOAPArray)
+ if data.arytype.namespace
+ SOAPGenerator.assign_ns(attrs, ns, data.arytype.namespace)
+ end
+ SOAPGenerator.assign_ns(attrs, ns, EncodingNamespace)
+ attrs[ns.name(AttrArrayTypeName)] = ns.name(create_arytype(ns, data))
+ if data.type.name
+ attrs[ns.name(XSD::AttrTypeName)] = ns.name(data.type)
+ end
+ elsif parent && parent.is_a?(SOAPArray) && (parent.arytype == data.type)
+ # No need to add.
+ elsif !data.type.namespace
+ # No need to add.
+ else
+ attrs[ns.name(XSD::AttrTypeName)] = ns.name(data.type)
+ end
+ end
+
+ data.extraattr.each do |key, value|
+ SOAPGenerator.assign_ns(attrs, ns, key.namespace)
+ attrs[ns.name(key)] = encode_attr_value(generator, ns, key, value)
+ end
+ if data.id
+ attrs['id'] = data.id
+ end
+ attrs
+ end
+
+ def encode_attr_value(generator, ns, qname, value)
+ if value.is_a?(SOAPType)
+ ref = SOAPReference.new(value)
+ generator.add_reftarget(qname.name, value)
+ ref.refidstr
+ else
+ value.to_s
+ end
+ end
+
+ def decode_tag_by_wsdl(ns, elename, typestr, parent, arytypestr, extraattr)
+ o = nil
+ if parent.class == SOAPBody
+ # root element: should branch by root attribute?
+ if @is_first_top_ele
+ # Unqualified name is allowed here.
+ @is_first_top_ele = false
+ type = @decode_typemap[elename] ||
+ @decode_typemap.find_name(elename.name)
+ if type
+ o = SOAPStruct.new(elename)
+ o.definedtype = type
+ return o
+ end
+ end
+ # multi-ref element.
+ if typestr
+ typename = ns.parse(typestr)
+ typedef = @decode_typemap[typename]
+ if typedef
+ return decode_definedtype(elename, typename, typedef, arytypestr)
+ end
+ end
+ return decode_tag_by_type(ns, elename, typestr, parent, arytypestr,
+ extraattr)
+ end
+
+ if parent.type == XSD::AnyTypeName
+ return decode_tag_by_type(ns, elename, typestr, parent, arytypestr,
+ extraattr)
+ end
+
+ # parent.definedtype == nil means the parent is SOAPUnknown. SOAPUnknown
+ # is generated by decode_tag_by_type when its type is anyType.
+ parenttype = parent.definedtype || @decode_typemap[parent.type]
+ unless parenttype
+ return decode_tag_by_type(ns, elename, typestr, parent, arytypestr,
+ extraattr)
+ end
+
+ definedtype_name = parenttype.child_type(elename)
+ if definedtype_name and (klass = TypeMap[definedtype_name])
+ return decode_basetype(klass, elename)
+ elsif definedtype_name == XSD::AnyTypeName
+ return decode_tag_by_type(ns, elename, typestr, parent, arytypestr,
+ extraattr)
+ end
+
+ if definedtype_name
+ typedef = @decode_typemap[definedtype_name]
+ else
+ typedef = parenttype.child_defined_complextype(elename)
+ end
+ decode_definedtype(elename, definedtype_name, typedef, arytypestr)
+ end
+
+ def decode_definedtype(elename, typename, typedef, arytypestr)
+ unless typedef
+ raise EncodingStyleError.new("unknown type '#{typename}'")
+ end
+ if typedef.is_a?(::WSDL::XMLSchema::SimpleType)
+ decode_defined_simpletype(elename, typename, typedef, arytypestr)
+ else
+ decode_defined_complextype(elename, typename, typedef, arytypestr)
+ end
+ end
+
+ def decode_basetype(klass, elename)
+ klass.decode(elename)
+ end
+
+ def decode_defined_simpletype(elename, typename, typedef, arytypestr)
+ o = decode_basetype(TypeMap[typedef.base], elename)
+ o.definedtype = typedef
+ o
+ end
+
+ def decode_defined_complextype(elename, typename, typedef, arytypestr)
+ case typedef.compoundtype
+ when :TYPE_STRUCT, :TYPE_MAP
+ o = SOAPStruct.decode(elename, typename)
+ o.definedtype = typedef
+ return o
+ when :TYPE_ARRAY
+ expected_arytype = typedef.find_arytype
+ if arytypestr
+ actual_arytype = XSD::QName.new(expected_arytype.namespace,
+ content_typename(expected_arytype.name) <<
+ content_ranksize(arytypestr))
+ o = SOAPArray.decode(elename, typename, actual_arytype)
+ else
+ o = SOAPArray.new(typename, 1, expected_arytype)
+ o.elename = elename
+ end
+ o.definedtype = typedef
+ return o
+ when :TYPE_EMPTY
+ o = SOAPNil.decode(elename)
+ o.definedtype = typedef
+ return o
+ else
+ raise RuntimeError.new(
+ "Unknown kind of complexType: #{typedef.compoundtype}")
+ end
+ nil
+ end
+
+ def decode_tag_by_type(ns, elename, typestr, parent, arytypestr, extraattr)
+ if arytypestr
+ type = typestr ? ns.parse(typestr) : ValueArrayName
+ node = SOAPArray.decode(elename, type, ns.parse(arytypestr))
+ node.extraattr.update(extraattr)
+ return node
+ end
+
+ type = nil
+ if typestr
+ type = ns.parse(typestr)
+ elsif parent.is_a?(SOAPArray)
+ type = parent.arytype
+ else
+ # Since it's in dynamic(without any type) encoding process,
+ # assumes entity as its type itself.
+ # <SOAP-ENC:Array ...> => type Array in SOAP-ENC.
+ # <Country xmlns="foo"> => type Country in foo.
+ type = elename
+ end
+
+ if (klass = TypeMap[type])
+ node = decode_basetype(klass, elename)
+ node.extraattr.update(extraattr)
+ return node
+ end
+
+ # Unknown type... Struct or String
+ SOAPUnknown.new(self, elename, type, extraattr)
+ end
+
+ def decode_textbuf(node)
+ case node
+ when XSD::XSDHexBinary, XSD::XSDBase64Binary
+ node.set_encoded(@textbuf)
+ when XSD::XSDString
+ if @charset
+ @textbuf = XSD::Charset.encoding_from_xml(@textbuf, @charset)
+ end
+ if node.definedtype
+ node.definedtype.check_lexical_format(@textbuf)
+ end
+ node.set(@textbuf)
+ when SOAPNil
+ # Nothing to do.
+ when SOAPBasetype
+ node.set(@textbuf)
+ else
+ # Nothing to do...
+ end
+ @textbuf = ''
+ end
+
+ NilLiteralMap = {
+ 'true' => true,
+ '1' => true,
+ 'false' => false,
+ '0' => false
+ }
+ RootLiteralMap = {
+ '1' => 1,
+ '0' => 0
+ }
+ def decode_attrs(ns, attrs)
+ is_nil = false
+ type = nil
+ arytype = nil
+ root = nil
+ offset = nil
+ position = nil
+ href = nil
+ id = nil
+ extraattr = {}
+
+ attrs.each do |key, value|
+ qname = ns.parse(key)
+ case qname.namespace
+ when XSD::InstanceNamespace
+ case qname.name
+ when XSD::NilLiteral
+ is_nil = NilLiteralMap[value] or
+ raise EncodingStyleError.new("cannot accept attribute value: #{value} as the value of xsi:#{XSD::NilLiteral} (expected 'true', 'false', '1', or '0')")
+ next
+ when XSD::AttrType
+ type = value
+ next
+ end
+ when EncodingNamespace
+ case qname.name
+ when AttrArrayType
+ arytype = value
+ next
+ when AttrRoot
+ root = RootLiteralMap[value] or
+ raise EncodingStyleError.new(
+ "illegal root attribute value: #{value}")
+ next
+ when AttrOffset
+ offset = value
+ next
+ when AttrPosition
+ position = value
+ next
+ end
+ end
+ if key == 'href'
+ href = value
+ next
+ elsif key == 'id'
+ id = value
+ next
+ end
+ qname = ns.parse_local(key)
+ extraattr[qname] = decode_attr_value(ns, qname, value)
+ end
+
+ return is_nil, type, arytype, root, offset, position, href, id, extraattr
+ end
+
+ def decode_attr_value(ns, qname, value)
+ if /\A#/ =~ value
+ o = SOAPReference.decode(nil, value)
+ @refpool << o
+ o
+ else
+ value
+ end
+ end
+
+ def decode_arypos(position)
+ /^\[(.+)\]$/ =~ position
+ $1.split(',').collect { |s| s.to_i }
+ end
+
+ def decode_resolve_id
+ count = @refpool.length # To avoid infinite loop
+ while !@refpool.empty? && count > 0
+ @refpool = @refpool.find_all { |ref|
+ o = @idpool.find { |item|
+ item.id == ref.refid
+ }
+ if o.is_a?(SOAPReference)
+ true # link of link.
+ elsif o
+ ref.__setobj__(o)
+ false
+ elsif o = ref.rootnode.external_content[ref.refid]
+ ref.__setobj__(o)
+ false
+ else
+ raise EncodingStyleError.new("unresolved reference: #{ref.refid}")
+ end
+ }
+ count -= 1
+ end
+ end
+end
+
+SOAPHandler.new
+
+
+end
+end
diff --git a/lib/soap/generator.rb b/lib/soap/generator.rb
new file mode 100644
index 0000000000..f179555e1d
--- /dev/null
+++ b/lib/soap/generator.rb
@@ -0,0 +1,268 @@
+# SOAP4R - SOAP XML Instance Generator library.
+# Copyright (C) 2001, 2003, 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'xsd/ns'
+require 'soap/soap'
+require 'soap/baseData'
+require 'soap/encodingstyle/handler'
+
+
+module SOAP
+
+
+###
+## CAUTION: MT-unsafe
+#
+class SOAPGenerator
+ include SOAP
+
+ class FormatEncodeError < Error; end
+
+public
+
+ attr_accessor :charset
+ attr_accessor :default_encodingstyle
+ attr_accessor :generate_explicit_type
+ attr_accessor :use_numeric_character_reference
+
+ def initialize(opt = {})
+ @reftarget = nil
+ @handlers = {}
+ @charset = opt[:charset] || XSD::Charset.xml_encoding_label
+ @default_encodingstyle = opt[:default_encodingstyle] || EncodingNamespace
+ @generate_explicit_type =
+ opt.key?(:generate_explicit_type) ? opt[:generate_explicit_type] : true
+ @elementformdefault = opt[:elementformdefault]
+ @attributeformdefault = opt[:attributeformdefault]
+ @use_numeric_character_reference = opt[:use_numeric_character_reference]
+ @indentstr = opt[:no_indent] ? '' : ' '
+ @buf = @indent = @curr = nil
+ end
+
+ def generate(obj, io = nil)
+ @buf = io || ''
+ @indent = ''
+
+ prologue
+ @handlers.each do |uri, handler|
+ handler.encode_prologue
+ end
+
+ ns = XSD::NS.new
+ @buf << xmldecl
+ encode_data(ns, obj, nil)
+
+ @handlers.each do |uri, handler|
+ handler.encode_epilogue
+ end
+ epilogue
+
+ @buf
+ end
+
+ def encode_data(ns, obj, parent)
+ if obj.is_a?(SOAPEnvelopeElement)
+ encode_element(ns, obj, parent)
+ return
+ end
+ if @reftarget && !obj.precedents.empty?
+ add_reftarget(obj.elename.name, obj)
+ ref = SOAPReference.new(obj)
+ ref.elename = ref.elename.dup_name(obj.elename.name)
+ obj.precedents.clear # Avoid cyclic delay.
+ obj.encodingstyle = parent.encodingstyle
+ # SOAPReference is encoded here.
+ obj = ref
+ end
+ encodingstyle = obj.encodingstyle
+ # Children's encodingstyle is derived from its parent.
+ encodingstyle ||= parent.encodingstyle if parent
+ obj.encodingstyle = encodingstyle
+ handler = find_handler(encodingstyle || @default_encodingstyle)
+ unless handler
+ raise FormatEncodeError.new("Unknown encodingStyle: #{ encodingstyle }.")
+ end
+ if !obj.elename.name
+ raise FormatEncodeError.new("Element name not defined: #{ obj }.")
+ end
+ handler.encode_data(self, ns, obj, parent)
+ handler.encode_data_end(self, ns, obj, parent)
+ end
+
+ def add_reftarget(name, node)
+ unless @reftarget
+ raise FormatEncodeError.new("Reftarget is not defined.")
+ end
+ @reftarget.add(name, node)
+ end
+
+ def encode_child(ns, child, parent)
+ indent_backup, @indent = @indent, @indent + @indentstr
+ encode_data(ns.clone_ns, child, parent)
+ @indent = indent_backup
+ end
+
+ def encode_element(ns, obj, parent)
+ attrs = {}
+ if obj.is_a?(SOAPBody)
+ @reftarget = obj
+ obj.encode(self, ns, attrs) do |child|
+ indent_backup, @indent = @indent, @indent + @indentstr
+ encode_data(ns.clone_ns, child, obj)
+ @indent = indent_backup
+ end
+ @reftarget = nil
+ else
+ if obj.is_a?(SOAPEnvelope)
+ # xsi:nil="true" can appear even if dumping without explicit type.
+ SOAPGenerator.assign_ns(attrs, ns,
+ XSD::InstanceNamespace, XSINamespaceTag)
+ if @generate_explicit_type
+ SOAPGenerator.assign_ns(attrs, ns, XSD::Namespace, XSDNamespaceTag)
+ end
+ end
+ obj.encode(self, ns, attrs) do |child|
+ indent_backup, @indent = @indent, @indent + @indentstr
+ encode_data(ns.clone_ns, child, obj)
+ @indent = indent_backup
+ end
+ end
+ end
+
+ def encode_name(ns, data, attrs)
+ if element_local?(data)
+ data.elename.name
+ else
+ if element_qualified?(data)
+ SOAPGenerator.assign_ns(attrs, ns, data.elename.namespace, '')
+ else
+ SOAPGenerator.assign_ns(attrs, ns, data.elename.namespace)
+ end
+ ns.name(data.elename)
+ end
+ end
+
+ def encode_name_end(ns, data)
+ if element_local?(data)
+ data.elename.name
+ else
+ ns.name(data.elename)
+ end
+ end
+
+ def encode_tag(elename, attrs = nil)
+ if !attrs or attrs.empty?
+ @buf << "\n#{ @indent }<#{ elename }>"
+ elsif attrs.size == 1
+ key, value = attrs.shift
+ @buf << %Q[\n#{ @indent }<#{ elename } #{ key }="#{ value }">]
+ else
+ @buf << "\n#{ @indent }<#{ elename } " <<
+ attrs.collect { |key, value|
+ %Q[#{ key }="#{ value }"]
+ }.join("\n#{ @indent }#{ @indentstr * 2 }") <<
+ '>'
+ end
+ end
+
+ def encode_tag_end(elename, cr = nil)
+ if cr
+ @buf << "\n#{ @indent }</#{ elename }>"
+ else
+ @buf << "</#{ elename }>"
+ end
+ end
+
+ def encode_rawstring(str)
+ @buf << str
+ end
+
+ EncodeMap = {
+ '&' => '&amp;',
+ '<' => '&lt;',
+ '>' => '&gt;',
+ '"' => '&quot;',
+ '\'' => '&apos;',
+ "\r" => '&#xd;'
+ }
+ EncodeCharRegexp = Regexp.new("[#{EncodeMap.keys.join}]")
+ def encode_string(str)
+ if @use_numeric_character_reference and !XSD::Charset.is_us_ascii(str)
+ str.gsub!(EncodeCharRegexp) { |c| EncodeMap[c] }
+ @buf << str.unpack("U*").collect { |c|
+ if c == 0x9 or c == 0xa or c == 0xd or (c >= 0x20 and c <= 0x7f)
+ c.chr
+ else
+ sprintf("&#x%x;", c)
+ end
+ }.join
+ else
+ @buf << str.gsub(EncodeCharRegexp) { |c| EncodeMap[c] }
+ end
+ end
+
+ def element_local?(element)
+ element.elename.namespace.nil?
+ end
+
+ def element_qualified?(element)
+ if element.respond_to?(:qualified)
+ if element.qualified.nil?
+ @elementformdefault
+ else
+ element.qualified
+ end
+ else
+ @elementformdefault
+ end
+ end
+
+ def self.assign_ns(attrs, ns, namespace, tag = nil)
+ if namespace.nil?
+ raise FormatEncodeError.new("empty namespace")
+ end
+ unless ns.assigned?(namespace)
+ tag = ns.assign(namespace, tag)
+ if tag == ''
+ attr = 'xmlns'
+ else
+ attr = "xmlns:#{tag}"
+ end
+ attrs[attr] = namespace
+ end
+ end
+
+private
+
+ def prologue
+ end
+
+ def epilogue
+ end
+
+ def find_handler(encodingstyle)
+ unless @handlers.key?(encodingstyle)
+ handler = SOAP::EncodingStyle::Handler.handler(encodingstyle).new(@charset)
+ handler.generate_explicit_type = @generate_explicit_type
+ handler.encode_prologue
+ @handlers[encodingstyle] = handler
+ end
+ @handlers[encodingstyle]
+ end
+
+ def xmldecl
+ if @charset
+ %Q[<?xml version="1.0" encoding="#{ @charset }" ?>]
+ else
+ %Q[<?xml version="1.0" ?>]
+ end
+ end
+end
+
+
+end
diff --git a/lib/soap/header/handler.rb b/lib/soap/header/handler.rb
new file mode 100644
index 0000000000..7da2836e24
--- /dev/null
+++ b/lib/soap/header/handler.rb
@@ -0,0 +1,57 @@
+# SOAP4R - SOAP Header handler item
+# Copyright (C) 2003, 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'soap/element'
+
+
+module SOAP
+module Header
+
+
+class Handler
+ attr_reader :elename
+ attr_reader :mustunderstand
+ attr_reader :encodingstyle
+
+ def initialize(elename)
+ @elename = elename
+ @mustunderstand = false
+ @encodingstyle = nil
+ end
+
+ # Should return a SOAP/OM, a SOAPHeaderItem or nil.
+ def on_outbound
+ nil
+ end
+
+ # Given header is a SOAPHeaderItem or nil.
+ def on_inbound(header, mustunderstand = false)
+ # do something.
+ end
+
+ def on_outbound_headeritem
+ item = on_outbound
+ if item.nil?
+ nil
+ elsif item.is_a?(::SOAP::SOAPHeaderItem)
+ item.elename = @elename
+ item
+ else
+ item.elename = @elename
+ ::SOAP::SOAPHeaderItem.new(item, @mustunderstand, @encodingstyle)
+ end
+ end
+
+ def on_inbound_headeritem(header)
+ on_inbound(header.element, header.mustunderstand)
+ end
+end
+
+
+end
+end
diff --git a/lib/soap/header/handlerset.rb b/lib/soap/header/handlerset.rb
new file mode 100644
index 0000000000..a8eee03023
--- /dev/null
+++ b/lib/soap/header/handlerset.rb
@@ -0,0 +1,70 @@
+# SOAP4R - SOAP Header handler set
+# Copyright (C) 2003, 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'xsd/namedelements'
+
+
+module SOAP
+module Header
+
+
+class HandlerSet
+ def initialize
+ @store = XSD::NamedElements.new
+ end
+
+ def dup
+ obj = HandlerSet.new
+ obj.store = @store.dup
+ obj
+ end
+
+ def add(handler)
+ @store << handler
+ end
+ alias << add
+
+ def delete(handler)
+ @store.delete(handler)
+ end
+
+ def include?(handler)
+ @store.include?(handler)
+ end
+
+ # returns: Array of SOAPHeaderItem
+ def on_outbound
+ @store.collect { |handler|
+ handler.on_outbound_headeritem
+ }.compact
+ end
+
+ # headers: SOAPHeaderItem enumerable object
+ def on_inbound(headers)
+ headers.each do |name, item|
+ handler = @store.find { |handler|
+ handler.elename == item.element.elename
+ }
+ if handler
+ handler.on_inbound_headeritem(item)
+ elsif item.mustunderstand
+ raise UnhandledMustUnderstandHeaderError.new(item.element.elename.to_s)
+ end
+ end
+ end
+
+protected
+
+ def store=(store)
+ @store = store
+ end
+end
+
+
+end
+end
diff --git a/lib/soap/header/simplehandler.rb b/lib/soap/header/simplehandler.rb
new file mode 100644
index 0000000000..7b206f77db
--- /dev/null
+++ b/lib/soap/header/simplehandler.rb
@@ -0,0 +1,44 @@
+# SOAP4R - SOAP Simple header item handler
+# Copyright (C) 2003-2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'soap/header/handler'
+require 'soap/baseData'
+
+
+module SOAP
+module Header
+
+
+class SimpleHandler < SOAP::Header::Handler
+ def initialize(elename)
+ super(elename)
+ end
+
+ # Should return a Hash, String or nil.
+ def on_simple_outbound
+ nil
+ end
+
+ # Given header is a Hash, String or nil.
+ def on_simple_inbound(header, mustunderstand)
+ end
+
+ def on_outbound
+ h = on_simple_outbound
+ h ? SOAPElement.from_obj(h, elename.namespace) : nil
+ end
+
+ def on_inbound(header, mustunderstand)
+ h = header.respond_to?(:to_obj) ? header.to_obj : header.data
+ on_simple_inbound(h, mustunderstand)
+ end
+end
+
+
+end
+end
diff --git a/lib/soap/httpconfigloader.rb b/lib/soap/httpconfigloader.rb
new file mode 100644
index 0000000000..cd7bca8a65
--- /dev/null
+++ b/lib/soap/httpconfigloader.rb
@@ -0,0 +1,119 @@
+# SOAP4R - HTTP config loader.
+# Copyright (C) 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'soap/property'
+
+
+module SOAP
+
+
+module HTTPConfigLoader
+module_function
+
+ def set_options(client, options)
+ client.proxy = options["proxy"]
+ options.add_hook("proxy") do |key, value|
+ client.proxy = value
+ end
+ client.no_proxy = options["no_proxy"]
+ options.add_hook("no_proxy") do |key, value|
+ client.no_proxy = value
+ end
+ if client.respond_to?(:protocol_version=)
+ client.protocol_version = options["protocol_version"]
+ options.add_hook("protocol_version") do |key, value|
+ client.protocol_version = value
+ end
+ end
+ ssl_config = options["ssl_config"] ||= ::SOAP::Property.new
+ set_ssl_config(client, ssl_config)
+ ssl_config.add_hook(true) do |key, value|
+ set_ssl_config(client, ssl_config)
+ end
+ basic_auth = options["basic_auth"] ||= ::SOAP::Property.new
+ set_basic_auth(client, basic_auth)
+ basic_auth.add_hook do |key, value|
+ set_basic_auth(client, basic_auth)
+ end
+ options.add_hook("connect_timeout") do |key, value|
+ client.connect_timeout = value
+ end
+ options.add_hook("send_timeout") do |key, value|
+ client.send_timeout = value
+ end
+ options.add_hook("receive_timeout") do |key, value|
+ client.receive_timeout = value
+ end
+ end
+
+ def set_basic_auth(client, basic_auth)
+ basic_auth.values.each do |url, userid, passwd|
+ client.set_basic_auth(url, userid, passwd)
+ end
+ end
+
+ def set_ssl_config(client, ssl_config)
+ ssl_config.each do |key, value|
+ cfg = client.ssl_config
+ if cfg.nil?
+ raise NotImplementedError.new("SSL not supported")
+ end
+ case key
+ when 'client_cert'
+ cfg.client_cert = cert_from_file(value)
+ when 'client_key'
+ cfg.client_key = key_from_file(value)
+ when 'client_ca'
+ cfg.client_ca = value
+ when 'ca_path'
+ cfg.set_trust_ca(value)
+ when 'ca_file'
+ cfg.set_trust_ca(value)
+ when 'crl'
+ cfg.set_crl(value)
+ when 'verify_mode'
+ cfg.verify_mode = ssl_config_int(value)
+ when 'verify_depth'
+ cfg.verify_depth = ssl_config_int(value)
+ when 'options'
+ cfg.options = value
+ when 'ciphers'
+ cfg.ciphers = value
+ when 'verify_callback'
+ cfg.verify_callback = value
+ when 'cert_store'
+ cfg.cert_store = value
+ else
+ raise ArgumentError.new("unknown ssl_config property #{key}")
+ end
+ end
+ end
+
+ def ssl_config_int(value)
+ if value.nil? or value.to_s.empty?
+ nil
+ else
+ begin
+ Integer(value)
+ rescue ArgumentError
+ ::SOAP::Property::Util.const_from_name(value.to_s)
+ end
+ end
+ end
+
+ def cert_from_file(filename)
+ OpenSSL::X509::Certificate.new(File.open(filename) { |f| f.read })
+ end
+
+ def key_from_file(filename)
+ OpenSSL::PKey::RSA.new(File.open(filename) { |f| f.read })
+ end
+end
+
+
+end
diff --git a/lib/soap/mapping.rb b/lib/soap/mapping.rb
new file mode 100644
index 0000000000..b83f8b484a
--- /dev/null
+++ b/lib/soap/mapping.rb
@@ -0,0 +1,10 @@
+# SOAP4R - Ruby type mapping utility.
+# Copyright (C) 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'soap/mapping/mapping'
+require 'soap/mapping/registry'
diff --git a/lib/soap/mapping/factory.rb b/lib/soap/mapping/factory.rb
new file mode 100644
index 0000000000..978b303b3d
--- /dev/null
+++ b/lib/soap/mapping/factory.rb
@@ -0,0 +1,355 @@
+# SOAP4R - Mapping factory.
+# Copyright (C) 2000, 2001, 2002, 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+module SOAP
+module Mapping
+
+
+class Factory
+ include TraverseSupport
+
+ def initialize
+ # nothing to do
+ end
+
+ def obj2soap(soap_class, obj, info, map)
+ raise NotImplementError.new
+ # return soap_obj
+ end
+
+ def soap2obj(obj_class, node, info, map)
+ raise NotImplementError.new
+ # return convert_succeeded_or_not, obj
+ end
+
+ def setiv2obj(obj, node, map)
+ return if node.nil?
+ if obj.is_a?(Array)
+ setiv2ary(obj, node, map)
+ else
+ setiv2struct(obj, node, map)
+ end
+ end
+
+ def setiv2soap(node, obj, map)
+ if obj.class.class_variables.include?('@@schema_element')
+ obj.class.class_eval('@@schema_element').each do |name, info|
+ type, qname = info
+ if qname
+ elename = qname.name
+ else
+ elename = Mapping.name2elename(name)
+ end
+ node.add(elename,
+ Mapping._obj2soap(obj.instance_variable_get('@' + name), map))
+ end
+ else
+ # should we sort instance_variables?
+ obj.instance_variables.each do |var|
+ name = var.sub(/^@/, '')
+ elename = Mapping.name2elename(name)
+ node.add(elename,
+ Mapping._obj2soap(obj.instance_variable_get(var), map))
+ end
+ end
+ end
+
+private
+
+ def setiv2ary(obj, node, map)
+ node.each do |name, value|
+ Array.instance_method(:<<).bind(obj).call(Mapping._soap2obj(value, map))
+ end
+ end
+
+ def setiv2struct(obj, node, map)
+ vars = {}
+ node.each do |name, value|
+ vars[Mapping.elename2name(name)] = Mapping._soap2obj(value, map)
+ end
+ Mapping.set_attributes(obj, vars)
+ end
+end
+
+class StringFactory_ < Factory
+ def initialize(allow_original_mapping = false)
+ super()
+ @allow_original_mapping = allow_original_mapping
+ end
+
+ def obj2soap(soap_class, obj, info, map)
+ if !@allow_original_mapping and !obj.instance_variables.empty?
+ return nil
+ end
+ begin
+ unless XSD::Charset.is_ces(obj, Thread.current[:SOAPExternalCES])
+ return nil
+ end
+ encoded = XSD::Charset.encoding_conv(obj,
+ Thread.current[:SOAPExternalCES], XSD::Charset.encoding)
+ soap_obj = soap_class.new(encoded)
+ rescue XSD::ValueSpaceError
+ return nil
+ end
+ mark_marshalled_obj(obj, soap_obj)
+ soap_obj
+ end
+
+ def soap2obj(obj_class, node, info, map)
+ obj = Mapping.create_empty_object(obj_class)
+ decoded = XSD::Charset.encoding_conv(node.data, XSD::Charset.encoding,
+ Thread.current[:SOAPExternalCES])
+ obj.replace(decoded)
+ mark_unmarshalled_obj(node, obj)
+ return true, obj
+ end
+end
+
+class BasetypeFactory_ < Factory
+ def initialize(allow_original_mapping = false)
+ super()
+ @allow_original_mapping = allow_original_mapping
+ end
+
+ def obj2soap(soap_class, obj, info, map)
+ if !@allow_original_mapping and !obj.instance_variables.empty?
+ return nil
+ end
+ soap_obj = nil
+ begin
+ soap_obj = soap_class.new(obj)
+ rescue XSD::ValueSpaceError
+ return nil
+ end
+ if @allow_original_mapping
+ # Basetype except String should not be multiref-ed in SOAP/1.1.
+ mark_marshalled_obj(obj, soap_obj)
+ end
+ soap_obj
+ end
+
+ def soap2obj(obj_class, node, info, map)
+ obj = node.data
+ mark_unmarshalled_obj(node, obj)
+ return true, obj
+ end
+end
+
+class DateTimeFactory_ < Factory
+ def initialize(allow_original_mapping = false)
+ super()
+ @allow_original_mapping = allow_original_mapping
+ end
+
+ def obj2soap(soap_class, obj, info, map)
+ if !@allow_original_mapping and
+ Time === obj and !obj.instance_variables.empty?
+ return nil
+ end
+ soap_obj = nil
+ begin
+ soap_obj = soap_class.new(obj)
+ rescue XSD::ValueSpaceError
+ return nil
+ end
+ mark_marshalled_obj(obj, soap_obj)
+ soap_obj
+ end
+
+ def soap2obj(obj_class, node, info, map)
+ if node.respond_to?(:to_obj)
+ obj = node.to_obj(obj_class)
+ return false if obj.nil?
+ mark_unmarshalled_obj(node, obj)
+ return true, obj
+ else
+ return false
+ end
+ end
+end
+
+class Base64Factory_ < Factory
+ def obj2soap(soap_class, obj, info, map)
+ return nil unless obj.instance_variables.empty?
+ soap_obj = soap_class.new(obj)
+ mark_marshalled_obj(obj, soap_obj) if soap_obj
+ soap_obj
+ end
+
+ def soap2obj(obj_class, node, info, map)
+ obj = node.string
+ mark_unmarshalled_obj(node, obj)
+ return true, obj
+ end
+end
+
+class URIFactory_ < Factory
+ def obj2soap(soap_class, obj, info, map)
+ soap_obj = soap_class.new(obj)
+ mark_marshalled_obj(obj, soap_obj) if soap_obj
+ soap_obj
+ end
+
+ def soap2obj(obj_class, node, info, map)
+ obj = node.data
+ mark_unmarshalled_obj(node, obj)
+ return true, obj
+ end
+end
+
+class ArrayFactory_ < Factory
+ def initialize(allow_original_mapping = false)
+ super()
+ @allow_original_mapping = allow_original_mapping
+ end
+
+ # [[1], [2]] is converted to Array of Array, not 2-D Array.
+ # To create M-D Array, you must call Mapping.ary2md.
+ def obj2soap(soap_class, obj, info, map)
+ if !@allow_original_mapping and !obj.instance_variables.empty?
+ return nil
+ end
+ arytype = Mapping.obj2element(obj)
+ if arytype.name
+ arytype.namespace ||= RubyTypeNamespace
+ else
+ arytype = XSD::AnyTypeName
+ end
+ soap_obj = SOAPArray.new(ValueArrayName, 1, arytype)
+ mark_marshalled_obj(obj, soap_obj)
+ obj.each do |item|
+ soap_obj.add(Mapping._obj2soap(item, map))
+ end
+ soap_obj
+ end
+
+ def soap2obj(obj_class, node, info, map)
+ obj = Mapping.create_empty_object(obj_class)
+ mark_unmarshalled_obj(node, obj)
+ node.soap2array(obj) do |elem|
+ elem ? Mapping._soap2obj(elem, map) : nil
+ end
+ return true, obj
+ end
+end
+
+class TypedArrayFactory_ < Factory
+ def initialize(allow_original_mapping = false)
+ super()
+ @allow_original_mapping = allow_original_mapping
+ end
+
+ def obj2soap(soap_class, obj, info, map)
+ if !@allow_original_mapping and !obj.instance_variables.empty?
+ return nil
+ end
+ arytype = info[:type] || info[0]
+ soap_obj = SOAPArray.new(ValueArrayName, 1, arytype)
+ mark_marshalled_obj(obj, soap_obj)
+ obj.each do |var|
+ soap_obj.add(Mapping._obj2soap(var, map))
+ end
+ soap_obj
+ end
+
+ def soap2obj(obj_class, node, info, map)
+ if node.rank > 1
+ return false
+ end
+ arytype = info[:type] || info[0]
+ unless node.arytype == arytype
+ return false
+ end
+ obj = Mapping.create_empty_object(obj_class)
+ mark_unmarshalled_obj(node, obj)
+ node.soap2array(obj) do |elem|
+ elem ? Mapping._soap2obj(elem, map) : nil
+ end
+ return true, obj
+ end
+end
+
+class TypedStructFactory_ < Factory
+ def obj2soap(soap_class, obj, info, map)
+ type = info[:type] || info[0]
+ soap_obj = soap_class.new(type)
+ mark_marshalled_obj(obj, soap_obj)
+ if obj.class <= SOAP::Marshallable
+ setiv2soap(soap_obj, obj, map)
+ else
+ setiv2soap(soap_obj, obj, map)
+ end
+ soap_obj
+ end
+
+ def soap2obj(obj_class, node, info, map)
+ type = info[:type] || info[0]
+ unless node.type == type
+ return false
+ end
+ obj = Mapping.create_empty_object(obj_class)
+ mark_unmarshalled_obj(node, obj)
+ setiv2obj(obj, node, map)
+ return true, obj
+ end
+end
+
+MapQName = XSD::QName.new(ApacheSOAPTypeNamespace, 'Map')
+class HashFactory_ < Factory
+ def initialize(allow_original_mapping = false)
+ super()
+ @allow_original_mapping = allow_original_mapping
+ end
+
+ def obj2soap(soap_class, obj, info, map)
+ if !@allow_original_mapping and !obj.instance_variables.empty?
+ return nil
+ end
+ if !obj.default.nil? or
+ (obj.respond_to?(:default_proc) and obj.default_proc)
+ return nil
+ end
+ soap_obj = SOAPStruct.new(MapQName)
+ mark_marshalled_obj(obj, soap_obj)
+ obj.each do |key, value|
+ elem = SOAPStruct.new
+ elem.add("key", Mapping._obj2soap(key, map))
+ elem.add("value", Mapping._obj2soap(value, map))
+ # ApacheAxis allows only 'item' here.
+ soap_obj.add("item", elem)
+ end
+ soap_obj
+ end
+
+ def soap2obj(obj_class, node, info, map)
+ unless node.type == MapQName
+ return false
+ end
+ if node.class == SOAPStruct and node.key?('default')
+ return false
+ end
+ obj = Mapping.create_empty_object(obj_class)
+ mark_unmarshalled_obj(node, obj)
+ if node.class == SOAPStruct
+ node.each do |key, value|
+ obj[Mapping._soap2obj(value['key'], map)] =
+ Mapping._soap2obj(value['value'], map)
+ end
+ else
+ node.each do |value|
+ obj[Mapping._soap2obj(value['key'], map)] =
+ Mapping._soap2obj(value['value'], map)
+ end
+ end
+ return true, obj
+ end
+end
+
+
+end
+end
diff --git a/lib/soap/mapping/mapping.rb b/lib/soap/mapping/mapping.rb
new file mode 100644
index 0000000000..65d6bb4d5b
--- /dev/null
+++ b/lib/soap/mapping/mapping.rb
@@ -0,0 +1,381 @@
+# SOAP4R - Ruby type mapping utility.
+# Copyright (C) 2000, 2001, 2003-2005 NAKAMURA Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'xsd/codegen/gensupport'
+
+
+module SOAP
+
+
+module Mapping
+ RubyTypeNamespace = 'http://www.ruby-lang.org/xmlns/ruby/type/1.6'
+ RubyTypeInstanceNamespace =
+ 'http://www.ruby-lang.org/xmlns/ruby/type-instance'
+ RubyCustomTypeNamespace = 'http://www.ruby-lang.org/xmlns/ruby/type/custom'
+ ApacheSOAPTypeNamespace = 'http://xml.apache.org/xml-soap'
+
+
+ # TraverseSupport breaks following thread variables.
+ # Thread.current[:SOAPMarshalDataKey]
+ module TraverseSupport
+ def mark_marshalled_obj(obj, soap_obj)
+ raise if obj.nil?
+ Thread.current[:SOAPMarshalDataKey][obj.__id__] = soap_obj
+ end
+
+ def mark_unmarshalled_obj(node, obj)
+ return if obj.nil?
+ # node.id is not Object#id but SOAPReference#id
+ Thread.current[:SOAPMarshalDataKey][node.id] = obj
+ end
+ end
+
+
+ EMPTY_OPT = {}
+ def self.obj2soap(obj, registry = nil, type = nil, opt = EMPTY_OPT)
+ registry ||= Mapping::DefaultRegistry
+ soap_obj = nil
+ protect_threadvars(:SOAPMarshalDataKey, :SOAPExternalCES, :SOAPMarshalNoReference) do
+ Thread.current[:SOAPMarshalDataKey] = {}
+ Thread.current[:SOAPExternalCES] = opt[:external_ces] || $KCODE
+ Thread.current[:SOAPMarshalNoReference] = opt[:no_reference]
+ soap_obj = _obj2soap(obj, registry, type)
+ end
+ soap_obj
+ end
+
+ def self.soap2obj(node, registry = nil, klass = nil, opt = EMPTY_OPT)
+ registry ||= Mapping::DefaultRegistry
+ obj = nil
+ protect_threadvars(:SOAPMarshalDataKey, :SOAPExternalCES, :SOAPMarshalNoReference) do
+ Thread.current[:SOAPMarshalDataKey] = {}
+ Thread.current[:SOAPExternalCES] = opt[:external_ces] || $KCODE
+ Thread.current[:SOAPMarshalNoReference] = opt[:no_reference]
+ obj = _soap2obj(node, registry, klass)
+ end
+ obj
+ end
+
+ def self.ary2soap(ary, type_ns = XSD::Namespace, typename = XSD::AnyTypeLiteral, registry = nil, opt = EMPTY_OPT)
+ registry ||= Mapping::DefaultRegistry
+ type = XSD::QName.new(type_ns, typename)
+ soap_ary = SOAPArray.new(ValueArrayName, 1, type)
+ protect_threadvars(:SOAPMarshalDataKey, :SOAPExternalCES, :SOAPMarshalNoReference) do
+ Thread.current[:SOAPMarshalDataKey] = {}
+ Thread.current[:SOAPExternalCES] = opt[:external_ces] || $KCODE
+ Thread.current[:SOAPMarshalNoReference] = opt[:no_reference]
+ ary.each do |ele|
+ soap_ary.add(_obj2soap(ele, registry, type))
+ end
+ end
+ soap_ary
+ end
+
+ def self.ary2md(ary, rank, type_ns = XSD::Namespace, typename = XSD::AnyTypeLiteral, registry = nil, opt = EMPTY_OPT)
+ registry ||= Mapping::DefaultRegistry
+ type = XSD::QName.new(type_ns, typename)
+ md_ary = SOAPArray.new(ValueArrayName, rank, type)
+ protect_threadvars(:SOAPMarshalDataKey, :SOAPExternalCES, :SOAPMarshalNoReference) do
+ Thread.current[:SOAPMarshalDataKey] = {}
+ Thread.current[:SOAPExternalCES] = opt[:external_ces] || $KCODE
+ Thread.current[:SOAPMarshalNoReference] = opt[:no_reference]
+ add_md_ary(md_ary, ary, [], registry)
+ end
+ md_ary
+ end
+
+ def self.fault2exception(fault, registry = nil)
+ registry ||= Mapping::DefaultRegistry
+ detail = if fault.detail
+ soap2obj(fault.detail, registry) || ""
+ else
+ ""
+ end
+ if detail.is_a?(Mapping::SOAPException)
+ begin
+ e = detail.to_e
+ remote_backtrace = e.backtrace
+ e.set_backtrace(nil)
+ raise e # ruby sets current caller as local backtrace of e => e2.
+ rescue Exception => e
+ e.set_backtrace(remote_backtrace + e.backtrace[1..-1])
+ raise
+ end
+ else
+ fault.detail = detail
+ fault.set_backtrace(
+ if detail.is_a?(Array)
+ detail
+ else
+ [detail.to_s]
+ end
+ )
+ raise
+ end
+ end
+
+ def self._obj2soap(obj, registry, type = nil)
+ if referent = Thread.current[:SOAPMarshalDataKey][obj.__id__] and
+ !Thread.current[:SOAPMarshalNoReference]
+ SOAPReference.new(referent)
+ elsif registry
+ registry.obj2soap(obj, type)
+ else
+ raise MappingError.new("no mapping registry given")
+ end
+ end
+
+ def self._soap2obj(node, registry, klass = nil)
+ if node.nil?
+ return nil
+ elsif node.is_a?(SOAPReference)
+ target = node.__getobj__
+ # target.id is not Object#id but SOAPReference#id
+ if referent = Thread.current[:SOAPMarshalDataKey][target.id] and
+ !Thread.current[:SOAPMarshalNoReference]
+ return referent
+ else
+ return _soap2obj(target, registry, klass)
+ end
+ end
+ return registry.soap2obj(node, klass)
+ end
+
+ if Object.respond_to?(:allocate)
+ # ruby/1.7 or later.
+ def self.create_empty_object(klass)
+ klass.allocate
+ end
+ else
+ MARSHAL_TAG = {
+ String => ['"', 1],
+ Regexp => ['/', 2],
+ Array => ['[', 1],
+ Hash => ['{', 1]
+ }
+ def self.create_empty_object(klass)
+ if klass <= Struct
+ name = klass.name
+ return ::Marshal.load(sprintf("\004\006S:%c%s\000", name.length + 5, name))
+ end
+ if MARSHAL_TAG.has_key?(klass)
+ tag, terminate = MARSHAL_TAG[klass]
+ return ::Marshal.load(sprintf("\004\006%s%s", tag, "\000" * terminate))
+ end
+ MARSHAL_TAG.each do |k, v|
+ if klass < k
+ name = klass.name
+ tag, terminate = v
+ return ::Marshal.load(sprintf("\004\006C:%c%s%s%s", name.length + 5, name, tag, "\000" * terminate))
+ end
+ end
+ name = klass.name
+ ::Marshal.load(sprintf("\004\006o:%c%s\000", name.length + 5, name))
+ end
+ end
+
+ # Allow only (Letter | '_') (Letter | Digit | '-' | '_')* here.
+ # Caution: '.' is not allowed here.
+ # To follow XML spec., it should be NCName.
+ # (denied chars) => .[0-F][0-F]
+ # ex. a.b => a.2eb
+ #
+ def self.name2elename(name)
+ name.gsub(/([^a-zA-Z0-9:_\-]+)/n) {
+ '.' << $1.unpack('H2' * $1.size).join('.')
+ }.gsub(/::/n, '..')
+ end
+
+ def self.elename2name(name)
+ name.gsub(/\.\./n, '::').gsub(/((?:\.[0-9a-fA-F]{2})+)/n) {
+ [$1.delete('.')].pack('H*')
+ }
+ end
+
+ def self.const_from_name(name, lenient = false)
+ const = ::Object
+ name.sub(/\A::/, '').split('::').each do |const_str|
+ if XSD::CodeGen::GenSupport.safeconstname?(const_str)
+ if const.const_defined?(const_str)
+ const = const.const_get(const_str)
+ next
+ end
+ elsif lenient
+ const_str = XSD::CodeGen::GenSupport.safeconstname(const_str)
+ if const.const_defined?(const_str)
+ const = const.const_get(const_str)
+ next
+ end
+ end
+ return nil
+ end
+ const
+ end
+
+ def self.class_from_name(name, lenient = false)
+ const = const_from_name(name, lenient)
+ if const.is_a?(::Class)
+ const
+ else
+ nil
+ end
+ end
+
+ def self.module_from_name(name, lenient = false)
+ const = const_from_name(name, lenient)
+ if const.is_a?(::Module)
+ const
+ else
+ nil
+ end
+ end
+
+ def self.class2qname(klass)
+ name = schema_type_definition(klass)
+ namespace = schema_ns_definition(klass)
+ XSD::QName.new(namespace, name)
+ end
+
+ def self.class2element(klass)
+ type = Mapping.class2qname(klass)
+ type.name ||= Mapping.name2elename(klass.name)
+ type.namespace ||= RubyCustomTypeNamespace
+ type
+ end
+
+ def self.obj2element(obj)
+ name = namespace = nil
+ ivars = obj.instance_variables
+ if ivars.include?('@schema_type')
+ name = obj.instance_variable_get('@schema_type')
+ end
+ if ivars.include?('@schema_ns')
+ namespace = obj.instance_variable_get('@schema_ns')
+ end
+ if !name or !namespace
+ class2qname(obj.class)
+ else
+ XSD::QName.new(namespace, name)
+ end
+ end
+
+ def self.define_singleton_method(obj, name, &block)
+ sclass = (class << obj; self; end)
+ sclass.class_eval {
+ define_method(name, &block)
+ }
+ end
+
+ def self.get_attribute(obj, attr_name)
+ if obj.is_a?(::Hash)
+ obj[attr_name] || obj[attr_name.intern]
+ else
+ name = XSD::CodeGen::GenSupport.safevarname(attr_name)
+ if obj.instance_variables.include?('@' + name)
+ obj.instance_variable_get('@' + name)
+ elsif ((obj.is_a?(::Struct) or obj.is_a?(Marshallable)) and
+ obj.respond_to?(name))
+ obj.__send__(name)
+ end
+ end
+ end
+
+ def self.set_attributes(obj, values)
+ if obj.is_a?(::SOAP::Mapping::Object)
+ values.each do |attr_name, value|
+ obj.__add_xmlele_value(attr_name, value)
+ end
+ else
+ values.each do |attr_name, value|
+ name = XSD::CodeGen::GenSupport.safevarname(attr_name)
+ setter = name + "="
+ if obj.respond_to?(setter)
+ obj.__send__(setter, value)
+ else
+ obj.instance_variable_set('@' + name, value)
+ begin
+ define_attr_accessor(obj, name,
+ proc { instance_variable_get('@' + name) },
+ proc { |value| instance_variable_set('@' + name, value) })
+ rescue TypeError
+ # singleton class may not exist (e.g. Float)
+ end
+ end
+ end
+ end
+ end
+
+ def self.define_attr_accessor(obj, name, getterproc, setterproc = nil)
+ define_singleton_method(obj, name, &getterproc)
+ define_singleton_method(obj, name + '=', &setterproc) if setterproc
+ end
+
+ def self.schema_type_definition(klass)
+ class_schema_variable(:schema_type, klass)
+ end
+
+ def self.schema_ns_definition(klass)
+ class_schema_variable(:schema_ns, klass)
+ end
+
+ def self.schema_element_definition(klass)
+ schema_element = class_schema_variable(:schema_element, klass) or return nil
+ schema_ns = schema_ns_definition(klass)
+ elements = []
+ as_array = []
+ schema_element.each do |varname, definition|
+ class_name, name = definition
+ if /\[\]$/ =~ class_name
+ class_name = class_name.sub(/\[\]$/, '')
+ as_array << (name ? name.name : varname)
+ end
+ elements << [name || XSD::QName.new(schema_ns, varname), class_name]
+ end
+ [elements, as_array]
+ end
+
+ def self.schema_attribute_definition(klass)
+ class_schema_variable(:schema_attribute, klass)
+ end
+
+ class << Mapping
+ private
+
+ def class_schema_variable(sym, klass)
+ var = "@@#{sym}"
+ klass.class_variables.include?(var) ? klass.class_eval(var) : nil
+ end
+
+ def protect_threadvars(*symbols)
+ backup = {}
+ begin
+ symbols.each do |sym|
+ backup[sym] = Thread.current[sym]
+ end
+ yield
+ ensure
+ symbols.each do |sym|
+ Thread.current[sym] = backup[sym]
+ end
+ end
+ end
+
+ def add_md_ary(md_ary, ary, indices, registry)
+ for idx in 0..(ary.size - 1)
+ if ary[idx].is_a?(Array)
+ add_md_ary(md_ary, ary[idx], indices + [idx], registry)
+ else
+ md_ary[*(indices + [idx])] = _obj2soap(ary[idx], registry)
+ end
+ end
+ end
+ end
+end
+
+
+end
diff --git a/lib/soap/mapping/registry.rb b/lib/soap/mapping/registry.rb
new file mode 100644
index 0000000000..823e80666d
--- /dev/null
+++ b/lib/soap/mapping/registry.rb
@@ -0,0 +1,541 @@
+# SOAP4R - Mapping registry.
+# Copyright (C) 2000, 2001, 2002, 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'soap/baseData'
+require 'soap/mapping/mapping'
+require 'soap/mapping/typeMap'
+require 'soap/mapping/factory'
+require 'soap/mapping/rubytypeFactory'
+
+
+module SOAP
+
+
+module Marshallable
+ # @@type_ns = Mapping::RubyCustomTypeNamespace
+end
+
+
+module Mapping
+
+
+module MappedException; end
+
+
+RubyTypeName = XSD::QName.new(RubyTypeInstanceNamespace, 'rubyType')
+RubyExtendName = XSD::QName.new(RubyTypeInstanceNamespace, 'extends')
+RubyIVarName = XSD::QName.new(RubyTypeInstanceNamespace, 'ivars')
+
+
+# Inner class to pass an exception.
+class SOAPException; include Marshallable
+ attr_reader :excn_type_name, :cause
+ def initialize(e)
+ @excn_type_name = Mapping.name2elename(e.class.to_s)
+ @cause = e
+ end
+
+ def to_e
+ if @cause.is_a?(::Exception)
+ @cause.extend(::SOAP::Mapping::MappedException)
+ return @cause
+ elsif @cause.respond_to?(:message) and @cause.respond_to?(:backtrace)
+ e = RuntimeError.new(@cause.message)
+ e.set_backtrace(@cause.backtrace)
+ return e
+ end
+ klass = Mapping.class_from_name(Mapping.elename2name(@excn_type_name.to_s))
+ if klass.nil? or not klass <= ::Exception
+ return RuntimeError.new(@cause.inspect)
+ end
+ obj = klass.new(@cause.message)
+ obj.extend(::SOAP::Mapping::MappedException)
+ obj
+ end
+end
+
+
+# For anyType object: SOAP::Mapping::Object not ::Object
+class Object; include Marshallable
+ def initialize
+ @__xmlele_type = {}
+ @__xmlele = []
+ @__xmlattr = {}
+ end
+
+ def inspect
+ sprintf("#<%s:0x%x%s>", self.class.name, __id__,
+ @__xmlele.collect { |name, value| " #{name}=#{value.inspect}" }.join)
+ end
+
+ def __xmlattr
+ @__xmlattr
+ end
+
+ def __xmlele
+ @__xmlele
+ end
+
+ def [](qname)
+ unless qname.is_a?(XSD::QName)
+ qname = XSD::QName.new(nil, qname)
+ end
+ @__xmlele.each do |k, v|
+ return v if k == qname
+ end
+ # fallback
+ @__xmlele.each do |k, v|
+ return v if k.name == qname.name
+ end
+ nil
+ end
+
+ def []=(qname, value)
+ unless qname.is_a?(XSD::QName)
+ qname = XSD::QName.new(nil, qname)
+ end
+ found = false
+ @__xmlele.each do |pair|
+ if pair[0] == qname
+ found = true
+ pair[1] = value
+ end
+ end
+ unless found
+ __define_attr_accessor(qname)
+ @__xmlele << [qname, value]
+ end
+ @__xmlele_type[qname] = :single
+ end
+
+ def __add_xmlele_value(qname, value)
+ found = false
+ @__xmlele.map! do |k, v|
+ if k == qname
+ found = true
+ [k, __set_xmlele_value(k, v, value)]
+ else
+ [k, v]
+ end
+ end
+ unless found
+ __define_attr_accessor(qname)
+ @__xmlele << [qname, value]
+ @__xmlele_type[qname] = :single
+ end
+ value
+ end
+
+private
+
+ if RUBY_VERSION > "1.7.0"
+ def __define_attr_accessor(qname)
+ name = XSD::CodeGen::GenSupport.safemethodname(qname.name)
+ Mapping.define_attr_accessor(self, name,
+ proc { self[qname] },
+ proc { |value| self[qname] = value })
+ end
+ else
+ def __define_attr_accessor(qname)
+ name = XSD::CodeGen::GenSupport.safemethodname(qname.name)
+ instance_eval <<-EOS
+ def #{name}
+ self[#{qname.dump}]
+ end
+
+ def #{name}=(value)
+ self[#{qname.dump}] = value
+ end
+ EOS
+ end
+ end
+
+ def __set_xmlele_value(key, org, value)
+ case @__xmlele_type[key]
+ when :multi
+ org << value
+ org
+ when :single
+ @__xmlele_type[key] = :multi
+ [org, value]
+ else
+ raise RuntimeError.new("unknown type")
+ end
+ end
+end
+
+
+class MappingError < Error; end
+
+
+class Registry
+ class Map
+ def initialize(registry)
+ @obj2soap = {}
+ @soap2obj = {}
+ @registry = registry
+ end
+
+ def obj2soap(obj)
+ klass = obj.class
+ if map = @obj2soap[klass]
+ map.each do |soap_class, factory, info|
+ ret = factory.obj2soap(soap_class, obj, info, @registry)
+ return ret if ret
+ end
+ end
+ ancestors = klass.ancestors
+ ancestors.delete(klass)
+ ancestors.delete(::Object)
+ ancestors.delete(::Kernel)
+ ancestors.each do |klass|
+ if map = @obj2soap[klass]
+ map.each do |soap_class, factory, info|
+ if info[:derived_class]
+ ret = factory.obj2soap(soap_class, obj, info, @registry)
+ return ret if ret
+ end
+ end
+ end
+ end
+ nil
+ end
+
+ def soap2obj(node, klass = nil)
+ if map = @soap2obj[node.class]
+ map.each do |obj_class, factory, info|
+ next if klass and obj_class != klass
+ conv, obj = factory.soap2obj(obj_class, node, info, @registry)
+ return true, obj if conv
+ end
+ end
+ return false, nil
+ end
+
+ # Give priority to former entry.
+ def init(init_map = [])
+ clear
+ init_map.reverse_each do |obj_class, soap_class, factory, info|
+ add(obj_class, soap_class, factory, info)
+ end
+ end
+
+ # Give priority to latter entry.
+ def add(obj_class, soap_class, factory, info)
+ info ||= {}
+ (@obj2soap[obj_class] ||= []).unshift([soap_class, factory, info])
+ (@soap2obj[soap_class] ||= []).unshift([obj_class, factory, info])
+ end
+
+ def clear
+ @obj2soap.clear
+ @soap2obj.clear
+ end
+
+ def find_mapped_soap_class(target_obj_class)
+ map = @obj2soap[target_obj_class]
+ map.empty? ? nil : map[0][1]
+ end
+
+ def find_mapped_obj_class(target_soap_class)
+ map = @soap2obj[target_soap_class]
+ map.empty? ? nil : map[0][0]
+ end
+ end
+
+ StringFactory = StringFactory_.new
+ BasetypeFactory = BasetypeFactory_.new
+ DateTimeFactory = DateTimeFactory_.new
+ ArrayFactory = ArrayFactory_.new
+ Base64Factory = Base64Factory_.new
+ URIFactory = URIFactory_.new
+ TypedArrayFactory = TypedArrayFactory_.new
+ TypedStructFactory = TypedStructFactory_.new
+
+ HashFactory = HashFactory_.new
+
+ SOAPBaseMap = [
+ [::NilClass, ::SOAP::SOAPNil, BasetypeFactory],
+ [::TrueClass, ::SOAP::SOAPBoolean, BasetypeFactory],
+ [::FalseClass, ::SOAP::SOAPBoolean, BasetypeFactory],
+ [::String, ::SOAP::SOAPString, StringFactory],
+ [::DateTime, ::SOAP::SOAPDateTime, DateTimeFactory],
+ [::Date, ::SOAP::SOAPDate, DateTimeFactory],
+ [::Time, ::SOAP::SOAPDateTime, DateTimeFactory],
+ [::Time, ::SOAP::SOAPTime, DateTimeFactory],
+ [::Float, ::SOAP::SOAPDouble, BasetypeFactory,
+ {:derived_class => true}],
+ [::Float, ::SOAP::SOAPFloat, BasetypeFactory,
+ {:derived_class => true}],
+ [::Integer, ::SOAP::SOAPInt, BasetypeFactory,
+ {:derived_class => true}],
+ [::Integer, ::SOAP::SOAPLong, BasetypeFactory,
+ {:derived_class => true}],
+ [::Integer, ::SOAP::SOAPInteger, BasetypeFactory,
+ {:derived_class => true}],
+ [::Integer, ::SOAP::SOAPShort, BasetypeFactory,
+ {:derived_class => true}],
+ [::Integer, ::SOAP::SOAPByte, BasetypeFactory,
+ {:derived_class => true}],
+ [::Integer, ::SOAP::SOAPNonPositiveInteger, BasetypeFactory,
+ {:derived_class => true}],
+ [::Integer, ::SOAP::SOAPNegativeInteger, BasetypeFactory,
+ {:derived_class => true}],
+ [::Integer, ::SOAP::SOAPNonNegativeInteger, BasetypeFactory,
+ {:derived_class => true}],
+ [::Integer, ::SOAP::SOAPPositiveInteger, BasetypeFactory,
+ {:derived_class => true}],
+ [::Integer, ::SOAP::SOAPUnsignedLong, BasetypeFactory,
+ {:derived_class => true}],
+ [::Integer, ::SOAP::SOAPUnsignedInt, BasetypeFactory,
+ {:derived_class => true}],
+ [::Integer, ::SOAP::SOAPUnsignedShort, BasetypeFactory,
+ {:derived_class => true}],
+ [::Integer, ::SOAP::SOAPUnsignedByte, BasetypeFactory,
+ {:derived_class => true}],
+ [::URI::Generic, ::SOAP::SOAPAnyURI, URIFactory,
+ {:derived_class => true}],
+ [::String, ::SOAP::SOAPBase64, Base64Factory],
+ [::String, ::SOAP::SOAPHexBinary, Base64Factory],
+ [::String, ::SOAP::SOAPDecimal, BasetypeFactory],
+ [::String, ::SOAP::SOAPDuration, BasetypeFactory],
+ [::String, ::SOAP::SOAPGYearMonth, BasetypeFactory],
+ [::String, ::SOAP::SOAPGYear, BasetypeFactory],
+ [::String, ::SOAP::SOAPGMonthDay, BasetypeFactory],
+ [::String, ::SOAP::SOAPGDay, BasetypeFactory],
+ [::String, ::SOAP::SOAPGMonth, BasetypeFactory],
+ [::String, ::SOAP::SOAPQName, BasetypeFactory],
+
+ [::Hash, ::SOAP::SOAPArray, HashFactory],
+ [::Hash, ::SOAP::SOAPStruct, HashFactory],
+
+ [::Array, ::SOAP::SOAPArray, ArrayFactory,
+ {:derived_class => true}],
+
+ [::SOAP::Mapping::SOAPException,
+ ::SOAP::SOAPStruct, TypedStructFactory,
+ {:type => XSD::QName.new(RubyCustomTypeNamespace, "SOAPException")}],
+ ]
+
+ RubyOriginalMap = [
+ [::NilClass, ::SOAP::SOAPNil, BasetypeFactory],
+ [::TrueClass, ::SOAP::SOAPBoolean, BasetypeFactory],
+ [::FalseClass, ::SOAP::SOAPBoolean, BasetypeFactory],
+ [::String, ::SOAP::SOAPString, StringFactory],
+ [::DateTime, ::SOAP::SOAPDateTime, DateTimeFactory],
+ [::Date, ::SOAP::SOAPDate, DateTimeFactory],
+ [::Time, ::SOAP::SOAPDateTime, DateTimeFactory],
+ [::Time, ::SOAP::SOAPTime, DateTimeFactory],
+ [::Float, ::SOAP::SOAPDouble, BasetypeFactory,
+ {:derived_class => true}],
+ [::Float, ::SOAP::SOAPFloat, BasetypeFactory,
+ {:derived_class => true}],
+ [::Integer, ::SOAP::SOAPInt, BasetypeFactory,
+ {:derived_class => true}],
+ [::Integer, ::SOAP::SOAPLong, BasetypeFactory,
+ {:derived_class => true}],
+ [::Integer, ::SOAP::SOAPInteger, BasetypeFactory,
+ {:derived_class => true}],
+ [::Integer, ::SOAP::SOAPShort, BasetypeFactory,
+ {:derived_class => true}],
+ [::Integer, ::SOAP::SOAPByte, BasetypeFactory,
+ {:derived_class => true}],
+ [::Integer, ::SOAP::SOAPNonPositiveInteger, BasetypeFactory,
+ {:derived_class => true}],
+ [::Integer, ::SOAP::SOAPNegativeInteger, BasetypeFactory,
+ {:derived_class => true}],
+ [::Integer, ::SOAP::SOAPNonNegativeInteger, BasetypeFactory,
+ {:derived_class => true}],
+ [::Integer, ::SOAP::SOAPPositiveInteger, BasetypeFactory,
+ {:derived_class => true}],
+ [::Integer, ::SOAP::SOAPUnsignedLong, BasetypeFactory,
+ {:derived_class => true}],
+ [::Integer, ::SOAP::SOAPUnsignedInt, BasetypeFactory,
+ {:derived_class => true}],
+ [::Integer, ::SOAP::SOAPUnsignedShort, BasetypeFactory,
+ {:derived_class => true}],
+ [::Integer, ::SOAP::SOAPUnsignedByte, BasetypeFactory,
+ {:derived_class => true}],
+ [::URI::Generic, ::SOAP::SOAPAnyURI, URIFactory,
+ {:derived_class => true}],
+ [::String, ::SOAP::SOAPBase64, Base64Factory],
+ [::String, ::SOAP::SOAPHexBinary, Base64Factory],
+ [::String, ::SOAP::SOAPDecimal, BasetypeFactory],
+ [::String, ::SOAP::SOAPDuration, BasetypeFactory],
+ [::String, ::SOAP::SOAPGYearMonth, BasetypeFactory],
+ [::String, ::SOAP::SOAPGYear, BasetypeFactory],
+ [::String, ::SOAP::SOAPGMonthDay, BasetypeFactory],
+ [::String, ::SOAP::SOAPGDay, BasetypeFactory],
+ [::String, ::SOAP::SOAPGMonth, BasetypeFactory],
+ [::String, ::SOAP::SOAPQName, BasetypeFactory],
+
+ [::Hash, ::SOAP::SOAPArray, HashFactory],
+ [::Hash, ::SOAP::SOAPStruct, HashFactory],
+
+ # Does not allow Array's subclass here.
+ [::Array, ::SOAP::SOAPArray, ArrayFactory],
+
+ [::SOAP::Mapping::SOAPException,
+ ::SOAP::SOAPStruct, TypedStructFactory,
+ {:type => XSD::QName.new(RubyCustomTypeNamespace, "SOAPException")}],
+ ]
+
+ attr_accessor :default_factory
+ attr_accessor :excn_handler_obj2soap
+ attr_accessor :excn_handler_soap2obj
+
+ def initialize(config = {})
+ @config = config
+ @map = Map.new(self)
+ if @config[:allow_original_mapping]
+ @allow_original_mapping = true
+ @map.init(RubyOriginalMap)
+ else
+ @allow_original_mapping = false
+ @map.init(SOAPBaseMap)
+ end
+ @allow_untyped_struct = @config.key?(:allow_untyped_struct) ?
+ @config[:allow_untyped_struct] : true
+ @rubytype_factory = RubytypeFactory.new(
+ :allow_untyped_struct => @allow_untyped_struct,
+ :allow_original_mapping => @allow_original_mapping
+ )
+ @default_factory = @rubytype_factory
+ @excn_handler_obj2soap = nil
+ @excn_handler_soap2obj = nil
+ end
+
+ def add(obj_class, soap_class, factory, info = nil)
+ @map.add(obj_class, soap_class, factory, info)
+ end
+ alias set add
+
+ # general Registry ignores type_qname
+ def obj2soap(obj, type_qname = nil)
+ soap = _obj2soap(obj)
+ if @allow_original_mapping
+ addextend2soap(soap, obj)
+ end
+ soap
+ end
+
+ def soap2obj(node, klass = nil)
+ obj = _soap2obj(node, klass)
+ if @allow_original_mapping
+ addextend2obj(obj, node.extraattr[RubyExtendName])
+ addiv2obj(obj, node.extraattr[RubyIVarName])
+ end
+ obj
+ end
+
+ def find_mapped_soap_class(obj_class)
+ @map.find_mapped_soap_class(obj_class)
+ end
+
+ def find_mapped_obj_class(soap_class)
+ @map.find_mapped_obj_class(soap_class)
+ end
+
+private
+
+ def _obj2soap(obj)
+ ret = nil
+ if obj.is_a?(SOAPStruct) or obj.is_a?(SOAPArray)
+ obj.replace do |ele|
+ Mapping._obj2soap(ele, self)
+ end
+ return obj
+ elsif obj.is_a?(SOAPBasetype)
+ return obj
+ end
+ begin
+ ret = @map.obj2soap(obj) ||
+ @default_factory.obj2soap(nil, obj, nil, self)
+ return ret if ret
+ rescue MappingError
+ end
+ if @excn_handler_obj2soap
+ ret = @excn_handler_obj2soap.call(obj) { |yield_obj|
+ Mapping._obj2soap(yield_obj, self)
+ }
+ return ret if ret
+ end
+ raise MappingError.new("Cannot map #{ obj.class.name } to SOAP/OM.")
+ end
+
+ # Might return nil as a mapping result.
+ def _soap2obj(node, klass = nil)
+ if node.extraattr.key?(RubyTypeName)
+ conv, obj = @rubytype_factory.soap2obj(nil, node, nil, self)
+ return obj if conv
+ else
+ conv, obj = @map.soap2obj(node, klass)
+ return obj if conv
+ conv, obj = @default_factory.soap2obj(nil, node, nil, self)
+ return obj if conv
+ end
+ if @excn_handler_soap2obj
+ begin
+ return @excn_handler_soap2obj.call(node) { |yield_node|
+ Mapping._soap2obj(yield_node, self)
+ }
+ rescue Exception
+ end
+ end
+ raise MappingError.new("Cannot map #{ node.type.name } to Ruby object.")
+ end
+
+ def addiv2obj(obj, attr)
+ return unless attr
+ vars = {}
+ attr.__getobj__.each do |name, value|
+ vars[name] = Mapping._soap2obj(value, self)
+ end
+ Mapping.set_attributes(obj, vars)
+ end
+
+ if RUBY_VERSION >= '1.8.0'
+ def addextend2obj(obj, attr)
+ return unless attr
+ attr.split(/ /).reverse_each do |mstr|
+ obj.extend(Mapping.module_from_name(mstr))
+ end
+ end
+ else
+ # (class < false; self; end).ancestors includes "TrueClass" under 1.6...
+ def addextend2obj(obj, attr)
+ return unless attr
+ attr.split(/ /).reverse_each do |mstr|
+ m = Mapping.module_from_name(mstr)
+ obj.extend(m)
+ end
+ end
+ end
+
+ def addextend2soap(node, obj)
+ return if obj.is_a?(Symbol) or obj.is_a?(Fixnum)
+ list = (class << obj; self; end).ancestors - obj.class.ancestors
+ unless list.empty?
+ node.extraattr[RubyExtendName] = list.collect { |c|
+ if c.name.empty?
+ raise TypeError.new("singleton can't be dumped #{ obj }")
+ end
+ c.name
+ }.join(" ")
+ end
+ end
+
+end
+
+
+DefaultRegistry = Registry.new
+RubyOriginalRegistry = Registry.new(:allow_original_mapping => true)
+
+
+end
+end
diff --git a/lib/soap/mapping/rubytypeFactory.rb b/lib/soap/mapping/rubytypeFactory.rb
new file mode 100644
index 0000000000..61c21d8b20
--- /dev/null
+++ b/lib/soap/mapping/rubytypeFactory.rb
@@ -0,0 +1,475 @@
+# SOAP4R - Ruby type mapping factory.
+# Copyright (C) 2000-2003, 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+module SOAP
+module Mapping
+
+
+class RubytypeFactory < Factory
+ TYPE_STRING = XSD::QName.new(RubyTypeNamespace, 'String')
+ TYPE_TIME = XSD::QName.new(RubyTypeNamespace, 'Time')
+ TYPE_ARRAY = XSD::QName.new(RubyTypeNamespace, 'Array')
+ TYPE_REGEXP = XSD::QName.new(RubyTypeNamespace, 'Regexp')
+ TYPE_RANGE = XSD::QName.new(RubyTypeNamespace, 'Range')
+ TYPE_CLASS = XSD::QName.new(RubyTypeNamespace, 'Class')
+ TYPE_MODULE = XSD::QName.new(RubyTypeNamespace, 'Module')
+ TYPE_SYMBOL = XSD::QName.new(RubyTypeNamespace, 'Symbol')
+ TYPE_STRUCT = XSD::QName.new(RubyTypeNamespace, 'Struct')
+ TYPE_HASH = XSD::QName.new(RubyTypeNamespace, 'Map')
+
+ def initialize(config = {})
+ @config = config
+ @allow_untyped_struct = @config.key?(:allow_untyped_struct) ?
+ @config[:allow_untyped_struct] : true
+ @allow_original_mapping = @config.key?(:allow_original_mapping) ?
+ @config[:allow_original_mapping] : false
+ @string_factory = StringFactory_.new(true)
+ @basetype_factory = BasetypeFactory_.new(true)
+ @datetime_factory = DateTimeFactory_.new(true)
+ @array_factory = ArrayFactory_.new(true)
+ @hash_factory = HashFactory_.new(true)
+ end
+
+ def obj2soap(soap_class, obj, info, map)
+ param = nil
+ case obj
+ when ::String
+ unless @allow_original_mapping
+ return nil
+ end
+ param = @string_factory.obj2soap(SOAPString, obj, info, map)
+ if obj.class != String
+ param.extraattr[RubyTypeName] = obj.class.name
+ end
+ addiv2soapattr(param, obj, map)
+ when ::Time
+ unless @allow_original_mapping
+ return nil
+ end
+ param = @datetime_factory.obj2soap(SOAPDateTime, obj, info, map)
+ if obj.class != Time
+ param.extraattr[RubyTypeName] = obj.class.name
+ end
+ addiv2soapattr(param, obj, map)
+ when ::Array
+ unless @allow_original_mapping
+ return nil
+ end
+ param = @array_factory.obj2soap(nil, obj, info, map)
+ if obj.class != Array
+ param.extraattr[RubyTypeName] = obj.class.name
+ end
+ addiv2soapattr(param, obj, map)
+ when ::NilClass
+ unless @allow_original_mapping
+ return nil
+ end
+ param = @basetype_factory.obj2soap(SOAPNil, obj, info, map)
+ addiv2soapattr(param, obj, map)
+ when ::FalseClass, ::TrueClass
+ unless @allow_original_mapping
+ return nil
+ end
+ param = @basetype_factory.obj2soap(SOAPBoolean, obj, info, map)
+ addiv2soapattr(param, obj, map)
+ when ::Integer
+ unless @allow_original_mapping
+ return nil
+ end
+ param = @basetype_factory.obj2soap(SOAPInt, obj, info, map)
+ param ||= @basetype_factory.obj2soap(SOAPInteger, obj, info, map)
+ param ||= @basetype_factory.obj2soap(SOAPDecimal, obj, info, map)
+ addiv2soapattr(param, obj, map)
+ when ::Float
+ unless @allow_original_mapping
+ return nil
+ end
+ param = @basetype_factory.obj2soap(SOAPDouble, obj, info, map)
+ if obj.class != Float
+ param.extraattr[RubyTypeName] = obj.class.name
+ end
+ addiv2soapattr(param, obj, map)
+ when ::Hash
+ unless @allow_original_mapping
+ return nil
+ end
+ if obj.respond_to?(:default_proc) && obj.default_proc
+ raise TypeError.new("cannot dump hash with default proc")
+ end
+ param = SOAPStruct.new(TYPE_HASH)
+ mark_marshalled_obj(obj, param)
+ if obj.class != Hash
+ param.extraattr[RubyTypeName] = obj.class.name
+ end
+ obj.each do |key, value|
+ elem = SOAPStruct.new # Undefined type.
+ elem.add("key", Mapping._obj2soap(key, map))
+ elem.add("value", Mapping._obj2soap(value, map))
+ param.add("item", elem)
+ end
+ param.add('default', Mapping._obj2soap(obj.default, map))
+ addiv2soapattr(param, obj, map)
+ when ::Regexp
+ unless @allow_original_mapping
+ return nil
+ end
+ param = SOAPStruct.new(TYPE_REGEXP)
+ mark_marshalled_obj(obj, param)
+ if obj.class != Regexp
+ param.extraattr[RubyTypeName] = obj.class.name
+ end
+ param.add('source', SOAPBase64.new(obj.source))
+ if obj.respond_to?('options')
+ # Regexp#options is from Ruby/1.7
+ options = obj.options
+ else
+ options = 0
+ obj.inspect.sub(/^.*\//, '').each_byte do |c|
+ options += case c
+ when ?i
+ 1
+ when ?x
+ 2
+ when ?m
+ 4
+ when ?n
+ 16
+ when ?e
+ 32
+ when ?s
+ 48
+ when ?u
+ 64
+ end
+ end
+ end
+ param.add('options', SOAPInt.new(options))
+ addiv2soapattr(param, obj, map)
+ when ::Range
+ unless @allow_original_mapping
+ return nil
+ end
+ param = SOAPStruct.new(TYPE_RANGE)
+ mark_marshalled_obj(obj, param)
+ if obj.class != Range
+ param.extraattr[RubyTypeName] = obj.class.name
+ end
+ param.add('begin', Mapping._obj2soap(obj.begin, map))
+ param.add('end', Mapping._obj2soap(obj.end, map))
+ param.add('exclude_end', SOAP::SOAPBoolean.new(obj.exclude_end?))
+ addiv2soapattr(param, obj, map)
+ when ::Class
+ unless @allow_original_mapping
+ return nil
+ end
+ if obj.to_s[0] == ?#
+ raise TypeError.new("can't dump anonymous class #{obj}")
+ end
+ param = SOAPStruct.new(TYPE_CLASS)
+ mark_marshalled_obj(obj, param)
+ param.add('name', SOAPString.new(obj.name))
+ addiv2soapattr(param, obj, map)
+ when ::Module
+ unless @allow_original_mapping
+ return nil
+ end
+ if obj.to_s[0] == ?#
+ raise TypeError.new("can't dump anonymous module #{obj}")
+ end
+ param = SOAPStruct.new(TYPE_MODULE)
+ mark_marshalled_obj(obj, param)
+ param.add('name', SOAPString.new(obj.name))
+ addiv2soapattr(param, obj, map)
+ when ::Symbol
+ unless @allow_original_mapping
+ return nil
+ end
+ param = SOAPStruct.new(TYPE_SYMBOL)
+ mark_marshalled_obj(obj, param)
+ param.add('id', SOAPString.new(obj.id2name))
+ addiv2soapattr(param, obj, map)
+ when ::Struct
+ unless @allow_original_mapping
+ # treat it as an user defined class. [ruby-talk:104980]
+ #param = unknownobj2soap(soap_class, obj, info, map)
+ param = SOAPStruct.new(XSD::AnyTypeName)
+ mark_marshalled_obj(obj, param)
+ obj.members.each do |member|
+ param.add(Mapping.name2elename(member),
+ Mapping._obj2soap(obj[member], map))
+ end
+ else
+ param = SOAPStruct.new(TYPE_STRUCT)
+ mark_marshalled_obj(obj, param)
+ param.add('type', ele_type = SOAPString.new(obj.class.to_s))
+ ele_member = SOAPStruct.new
+ obj.members.each do |member|
+ ele_member.add(Mapping.name2elename(member),
+ Mapping._obj2soap(obj[member], map))
+ end
+ param.add('member', ele_member)
+ addiv2soapattr(param, obj, map)
+ end
+ when ::IO, ::Binding, ::Continuation, ::Data, ::Dir, ::File::Stat,
+ ::MatchData, Method, ::Proc, ::Thread, ::ThreadGroup
+ # from 1.8: Process::Status, UnboundMethod
+ return nil
+ when ::SOAP::Mapping::Object
+ param = SOAPStruct.new(XSD::AnyTypeName)
+ mark_marshalled_obj(obj, param)
+ obj.__xmlele.each do |key, value|
+ param.add(key.name, Mapping._obj2soap(value, map))
+ end
+ obj.__xmlattr.each do |key, value|
+ param.extraattr[key] = value
+ end
+ when ::Exception
+ typestr = Mapping.name2elename(obj.class.to_s)
+ param = SOAPStruct.new(XSD::QName.new(RubyTypeNamespace, typestr))
+ mark_marshalled_obj(obj, param)
+ param.add('message', Mapping._obj2soap(obj.message, map))
+ param.add('backtrace', Mapping._obj2soap(obj.backtrace, map))
+ addiv2soapattr(param, obj, map)
+ else
+ param = unknownobj2soap(soap_class, obj, info, map)
+ end
+ param
+ end
+
+ def soap2obj(obj_class, node, info, map)
+ rubytype = node.extraattr[RubyTypeName]
+ if rubytype or node.type.namespace == RubyTypeNamespace
+ rubytype2obj(node, info, map, rubytype)
+ elsif node.type == XSD::AnyTypeName or node.type == XSD::AnySimpleTypeName
+ anytype2obj(node, info, map)
+ else
+ unknowntype2obj(node, info, map)
+ end
+ end
+
+private
+
+ def addiv2soapattr(node, obj, map)
+ return if obj.instance_variables.empty?
+ ivars = SOAPStruct.new # Undefined type.
+ setiv2soap(ivars, obj, map)
+ node.extraattr[RubyIVarName] = ivars
+ end
+
+ def unknownobj2soap(soap_class, obj, info, map)
+ if obj.class.name.empty?
+ raise TypeError.new("can't dump anonymous class #{obj}")
+ end
+ singleton_class = class << obj; self; end
+ if !singleton_methods_true(obj).empty? or
+ !singleton_class.instance_variables.empty?
+ raise TypeError.new("singleton can't be dumped #{obj}")
+ end
+ if !(singleton_class.ancestors - obj.class.ancestors).empty?
+ typestr = Mapping.name2elename(obj.class.to_s)
+ type = XSD::QName.new(RubyTypeNamespace, typestr)
+ else
+ type = Mapping.class2element(obj.class)
+ end
+ param = SOAPStruct.new(type)
+ mark_marshalled_obj(obj, param)
+ setiv2soap(param, obj, map)
+ param
+ end
+
+ if RUBY_VERSION >= '1.8.0'
+ def singleton_methods_true(obj)
+ obj.singleton_methods(true)
+ end
+ else
+ def singleton_methods_true(obj)
+ obj.singleton_methods
+ end
+ end
+
+ def rubytype2obj(node, info, map, rubytype)
+ klass = rubytype ? Mapping.class_from_name(rubytype) : nil
+ obj = nil
+ case node
+ when SOAPString
+ return @string_factory.soap2obj(klass || String, node, info, map)
+ when SOAPDateTime
+ #return @datetime_factory.soap2obj(klass || Time, node, info, map)
+ klass ||= Time
+ t = node.to_time
+ arg = [t.year, t.month, t.mday, t.hour, t.min, t.sec, t.usec]
+ obj = t.gmt? ? klass.gm(*arg) : klass.local(*arg)
+ mark_unmarshalled_obj(node, obj)
+ return true, obj
+ when SOAPArray
+ return @array_factory.soap2obj(klass || Array, node, info, map)
+ when SOAPNil, SOAPBoolean, SOAPInt, SOAPInteger, SOAPDecimal, SOAPDouble
+ return @basetype_factory.soap2obj(nil, node, info, map)
+ when SOAPStruct
+ return rubytypestruct2obj(node, info, map, rubytype)
+ else
+ raise
+ end
+ end
+
+ def rubytypestruct2obj(node, info, map, rubytype)
+ klass = rubytype ? Mapping.class_from_name(rubytype) : nil
+ obj = nil
+ case node.type
+ when TYPE_HASH
+ klass = rubytype ? Mapping.class_from_name(rubytype) : Hash
+ obj = Mapping.create_empty_object(klass)
+ mark_unmarshalled_obj(node, obj)
+ node.each do |key, value|
+ next unless key == 'item'
+ obj[Mapping._soap2obj(value['key'], map)] =
+ Mapping._soap2obj(value['value'], map)
+ end
+ if node.key?('default')
+ obj.default = Mapping._soap2obj(node['default'], map)
+ end
+ when TYPE_REGEXP
+ klass = rubytype ? Mapping.class_from_name(rubytype) : Regexp
+ obj = Mapping.create_empty_object(klass)
+ mark_unmarshalled_obj(node, obj)
+ source = node['source'].string
+ options = node['options'].data || 0
+ Regexp.instance_method(:initialize).bind(obj).call(source, options)
+ when TYPE_RANGE
+ klass = rubytype ? Mapping.class_from_name(rubytype) : Range
+ obj = Mapping.create_empty_object(klass)
+ mark_unmarshalled_obj(node, obj)
+ first = Mapping._soap2obj(node['begin'], map)
+ last = Mapping._soap2obj(node['end'], map)
+ exclude_end = node['exclude_end'].data
+ Range.instance_method(:initialize).bind(obj).call(first, last, exclude_end)
+ when TYPE_CLASS
+ obj = Mapping.class_from_name(node['name'].data)
+ when TYPE_MODULE
+ obj = Mapping.class_from_name(node['name'].data)
+ when TYPE_SYMBOL
+ obj = node['id'].data.intern
+ when TYPE_STRUCT
+ typestr = Mapping.elename2name(node['type'].data)
+ klass = Mapping.class_from_name(typestr)
+ if klass.nil?
+ return false
+ end
+ unless klass <= ::Struct
+ return false
+ end
+ obj = Mapping.create_empty_object(klass)
+ mark_unmarshalled_obj(node, obj)
+ node['member'].each do |name, value|
+ obj[Mapping.elename2name(name)] = Mapping._soap2obj(value, map)
+ end
+ else
+ return unknowntype2obj(node, info, map)
+ end
+ return true, obj
+ end
+
+ def anytype2obj(node, info, map)
+ case node
+ when SOAPBasetype
+ return true, node.data
+ when SOAPStruct
+ klass = ::SOAP::Mapping::Object
+ obj = klass.new
+ mark_unmarshalled_obj(node, obj)
+ node.each do |name, value|
+ obj.__add_xmlele_value(XSD::QName.new(nil, name),
+ Mapping._soap2obj(value, map))
+ end
+ unless node.extraattr.empty?
+ obj.instance_variable_set('@__xmlattr', node.extraattr)
+ end
+ return true, obj
+ else
+ return false
+ end
+ end
+
+ def unknowntype2obj(node, info, map)
+ case node
+ when SOAPBasetype
+ return true, node.data
+ when SOAPArray
+ return @array_factory.soap2obj(Array, node, info, map)
+ when SOAPStruct
+ obj = unknownstruct2obj(node, info, map)
+ return true, obj if obj
+ if !@allow_untyped_struct
+ return false
+ end
+ return anytype2obj(node, info, map)
+ else
+ # Basetype which is not defined...
+ return false
+ end
+ end
+
+ def unknownstruct2obj(node, info, map)
+ unless node.type.name
+ return nil
+ end
+ typestr = Mapping.elename2name(node.type.name)
+ klass = Mapping.class_from_name(typestr)
+ if klass.nil? and @allow_untyped_struct
+ klass = Mapping.class_from_name(typestr, true) # lenient
+ end
+ if klass.nil?
+ return nil
+ end
+ if klass <= ::Exception
+ return exception2obj(klass, node, map)
+ end
+ klass_type = Mapping.class2qname(klass)
+ return nil unless node.type.match(klass_type)
+ obj = nil
+ begin
+ obj = Mapping.create_empty_object(klass)
+ rescue
+ # type name "data" tries Data.new which raises TypeError
+ nil
+ end
+ mark_unmarshalled_obj(node, obj)
+ setiv2obj(obj, node, map)
+ obj
+ end
+
+ def exception2obj(klass, node, map)
+ message = Mapping._soap2obj(node['message'], map)
+ backtrace = Mapping._soap2obj(node['backtrace'], map)
+ obj = Mapping.create_empty_object(klass)
+ obj = obj.exception(message)
+ mark_unmarshalled_obj(node, obj)
+ obj.set_backtrace(backtrace)
+ obj
+ end
+
+ # Only creates empty array. Do String#replace it with real string.
+ def array2obj(node, map, rubytype)
+ klass = rubytype ? Mapping.class_from_name(rubytype) : Array
+ obj = Mapping.create_empty_object(klass)
+ mark_unmarshalled_obj(node, obj)
+ obj
+ end
+
+ # Only creates empty string. Do String#replace it with real string.
+ def string2obj(node, map, rubytype)
+ klass = rubytype ? Mapping.class_from_name(rubytype) : String
+ obj = Mapping.create_empty_object(klass)
+ mark_unmarshalled_obj(node, obj)
+ obj
+ end
+end
+
+
+end
+end
diff --git a/lib/soap/mapping/typeMap.rb b/lib/soap/mapping/typeMap.rb
new file mode 100644
index 0000000000..34db19a5b6
--- /dev/null
+++ b/lib/soap/mapping/typeMap.rb
@@ -0,0 +1,50 @@
+# SOAP4R - Base type mapping definition
+# Copyright (C) 2000, 2001, 2002, 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+module SOAP
+
+
+TypeMap = {
+ XSD::XSDAnySimpleType::Type => SOAPAnySimpleType,
+ XSD::XSDString::Type => SOAPString,
+ XSD::XSDBoolean::Type => SOAPBoolean,
+ XSD::XSDDecimal::Type => SOAPDecimal,
+ XSD::XSDFloat::Type => SOAPFloat,
+ XSD::XSDDouble::Type => SOAPDouble,
+ XSD::XSDDuration::Type => SOAPDuration,
+ XSD::XSDDateTime::Type => SOAPDateTime,
+ XSD::XSDTime::Type => SOAPTime,
+ XSD::XSDDate::Type => SOAPDate,
+ XSD::XSDGYearMonth::Type => SOAPGYearMonth,
+ XSD::XSDGYear::Type => SOAPGYear,
+ XSD::XSDGMonthDay::Type => SOAPGMonthDay,
+ XSD::XSDGDay::Type => SOAPGDay,
+ XSD::XSDGMonth::Type => SOAPGMonth,
+ XSD::XSDHexBinary::Type => SOAPHexBinary,
+ XSD::XSDBase64Binary::Type => SOAPBase64,
+ XSD::XSDAnyURI::Type => SOAPAnyURI,
+ XSD::XSDQName::Type => SOAPQName,
+ XSD::XSDInteger::Type => SOAPInteger,
+ XSD::XSDNonPositiveInteger::Type => SOAPNonPositiveInteger,
+ XSD::XSDNegativeInteger::Type => SOAPNegativeInteger,
+ XSD::XSDLong::Type => SOAPLong,
+ XSD::XSDInt::Type => SOAPInt,
+ XSD::XSDShort::Type => SOAPShort,
+ XSD::XSDByte::Type => SOAPByte,
+ XSD::XSDNonNegativeInteger::Type => SOAPNonNegativeInteger,
+ XSD::XSDUnsignedLong::Type => SOAPUnsignedLong,
+ XSD::XSDUnsignedInt::Type => SOAPUnsignedInt,
+ XSD::XSDUnsignedShort::Type => SOAPUnsignedShort,
+ XSD::XSDUnsignedByte::Type => SOAPUnsignedByte,
+ XSD::XSDPositiveInteger::Type => SOAPPositiveInteger,
+
+ SOAP::SOAPBase64::Type => SOAPBase64,
+}
+
+
+end
diff --git a/lib/soap/mapping/wsdlencodedregistry.rb b/lib/soap/mapping/wsdlencodedregistry.rb
new file mode 100644
index 0000000000..4efb60188f
--- /dev/null
+++ b/lib/soap/mapping/wsdlencodedregistry.rb
@@ -0,0 +1,280 @@
+# SOAP4R - WSDL encoded mapping registry.
+# Copyright (C) 2000-2003, 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'xsd/qname'
+require 'xsd/namedelements'
+require 'soap/baseData'
+require 'soap/mapping/mapping'
+require 'soap/mapping/typeMap'
+
+
+module SOAP
+module Mapping
+
+
+class WSDLEncodedRegistry < Registry
+ include TraverseSupport
+
+ attr_reader :definedelements
+ attr_reader :definedtypes
+ attr_accessor :excn_handler_obj2soap
+ attr_accessor :excn_handler_soap2obj
+
+ def initialize(definedtypes = XSD::NamedElements::Empty)
+ @definedtypes = definedtypes
+ # @definedelements = definedelements needed?
+ @excn_handler_obj2soap = nil
+ @excn_handler_soap2obj = nil
+ # For mapping AnyType element.
+ @rubytype_factory = RubytypeFactory.new(
+ :allow_untyped_struct => true,
+ :allow_original_mapping => true
+ )
+ @schema_element_cache = {}
+ end
+
+ def obj2soap(obj, qname = nil)
+ soap_obj = nil
+ if type = @definedtypes[qname]
+ soap_obj = obj2typesoap(obj, type)
+ else
+ soap_obj = any2soap(obj, qname)
+ end
+ return soap_obj if soap_obj
+ if @excn_handler_obj2soap
+ soap_obj = @excn_handler_obj2soap.call(obj) { |yield_obj|
+ Mapping._obj2soap(yield_obj, self)
+ }
+ return soap_obj if soap_obj
+ end
+ if qname
+ raise MappingError.new("cannot map #{obj.class.name} as #{qname}")
+ else
+ raise MappingError.new("cannot map #{obj.class.name} to SOAP/OM")
+ end
+ end
+
+ # map anything for now: must refer WSDL while mapping. [ToDo]
+ def soap2obj(node, obj_class = nil)
+ begin
+ return any2obj(node, obj_class)
+ rescue MappingError
+ end
+ if @excn_handler_soap2obj
+ begin
+ return @excn_handler_soap2obj.call(node) { |yield_node|
+ Mapping._soap2obj(yield_node, self)
+ }
+ rescue Exception
+ end
+ end
+ raise MappingError.new("cannot map #{node.type.name} to Ruby object")
+ end
+
+private
+
+ def any2soap(obj, qname)
+ if obj.nil?
+ SOAPNil.new
+ elsif qname.nil? or qname == XSD::AnyTypeName
+ @rubytype_factory.obj2soap(nil, obj, nil, self)
+ elsif obj.is_a?(XSD::NSDBase)
+ soap2soap(obj, qname)
+ elsif (type = TypeMap[qname])
+ base2soap(obj, type)
+ else
+ nil
+ end
+ end
+
+ def soap2soap(obj, type_qname)
+ if obj.is_a?(SOAPBasetype)
+ obj
+ elsif obj.is_a?(SOAPStruct) && (type = @definedtypes[type_qname])
+ soap_obj = obj
+ mark_marshalled_obj(obj, soap_obj)
+ elements2soap(obj, soap_obj, type.content.elements)
+ soap_obj
+ elsif obj.is_a?(SOAPArray) && (type = @definedtypes[type_qname])
+ soap_obj = obj
+ contenttype = type.child_type
+ mark_marshalled_obj(obj, soap_obj)
+ obj.replace do |ele|
+ Mapping._obj2soap(ele, self, contenttype)
+ end
+ soap_obj
+ else
+ nil
+ end
+ end
+
+ def obj2typesoap(obj, type)
+ if type.is_a?(::WSDL::XMLSchema::SimpleType)
+ simpleobj2soap(obj, type)
+ else
+ complexobj2soap(obj, type)
+ end
+ end
+
+ def simpleobj2soap(obj, type)
+ type.check_lexical_format(obj)
+ return SOAPNil.new if obj.nil? # ToDo: check nillable.
+ o = base2soap(obj, TypeMap[type.base])
+ o
+ end
+
+ def complexobj2soap(obj, type)
+ case type.compoundtype
+ when :TYPE_STRUCT
+ struct2soap(obj, type.name, type)
+ when :TYPE_ARRAY
+ array2soap(obj, type.name, type)
+ when :TYPE_MAP
+ map2soap(obj, type.name, type)
+ when :TYPE_SIMPLE
+ simpleobj2soap(obj, type.simplecontent)
+ when :TYPE_EMPTY
+ raise MappingError.new("should be empty") unless obj.nil?
+ SOAPNil.new
+ else
+ raise MappingError.new("unknown compound type: #{type.compoundtype}")
+ end
+ end
+
+ def base2soap(obj, type)
+ soap_obj = nil
+ if type <= XSD::XSDString
+ str = XSD::Charset.encoding_conv(obj.to_s,
+ Thread.current[:SOAPExternalCES], XSD::Charset.encoding)
+ soap_obj = type.new(str)
+ mark_marshalled_obj(obj, soap_obj)
+ else
+ soap_obj = type.new(obj)
+ end
+ soap_obj
+ end
+
+ def struct2soap(obj, type_qname, type)
+ return SOAPNil.new if obj.nil? # ToDo: check nillable.
+ soap_obj = SOAPStruct.new(type_qname)
+ unless obj.nil?
+ mark_marshalled_obj(obj, soap_obj)
+ elements2soap(obj, soap_obj, type.content.elements)
+ end
+ soap_obj
+ end
+
+ def array2soap(obj, type_qname, type)
+ return SOAPNil.new if obj.nil? # ToDo: check nillable.
+ arytype = type.child_type
+ soap_obj = SOAPArray.new(ValueArrayName, 1, arytype)
+ unless obj.nil?
+ mark_marshalled_obj(obj, soap_obj)
+ obj.each do |item|
+ soap_obj.add(Mapping._obj2soap(item, self, arytype))
+ end
+ end
+ soap_obj
+ end
+
+ MapKeyName = XSD::QName.new(nil, "key")
+ MapValueName = XSD::QName.new(nil, "value")
+ def map2soap(obj, type_qname, type)
+ return SOAPNil.new if obj.nil? # ToDo: check nillable.
+ keytype = type.child_type(MapKeyName) || XSD::AnyTypeName
+ valuetype = type.child_type(MapValueName) || XSD::AnyTypeName
+ soap_obj = SOAPStruct.new(MapQName)
+ unless obj.nil?
+ mark_marshalled_obj(obj, soap_obj)
+ obj.each do |key, value|
+ elem = SOAPStruct.new
+ elem.add("key", Mapping._obj2soap(key, self, keytype))
+ elem.add("value", Mapping._obj2soap(value, self, valuetype))
+ # ApacheAxis allows only 'item' here.
+ soap_obj.add("item", elem)
+ end
+ end
+ soap_obj
+ end
+
+ def elements2soap(obj, soap_obj, elements)
+ elements.each do |element|
+ name = element.name.name
+ child_obj = Mapping.get_attribute(obj, name)
+ soap_obj.add(name,
+ Mapping._obj2soap(child_obj, self, element.type || element.name))
+ end
+ end
+
+ def any2obj(node, obj_class)
+ unless obj_class
+ typestr = XSD::CodeGen::GenSupport.safeconstname(node.elename.name)
+ obj_class = Mapping.class_from_name(typestr)
+ end
+ if obj_class and obj_class.class_variables.include?('@@schema_element')
+ soap2stubobj(node, obj_class)
+ else
+ Mapping._soap2obj(node, Mapping::DefaultRegistry, obj_class)
+ end
+ end
+
+ def soap2stubobj(node, obj_class)
+ obj = Mapping.create_empty_object(obj_class)
+ unless node.is_a?(SOAPNil)
+ add_elements2stubobj(node, obj)
+ end
+ obj
+ end
+
+ def add_elements2stubobj(node, obj)
+ elements, as_array = schema_element_definition(obj.class)
+ vars = {}
+ node.each do |name, value|
+ item = elements.find { |k, v| k.name == name }
+ if item
+ elename, class_name = item
+ if klass = Mapping.class_from_name(class_name)
+ # klass must be a SOAPBasetype or a class
+ if klass.ancestors.include?(::SOAP::SOAPBasetype)
+ if value.respond_to?(:data)
+ child = klass.new(value.data).data
+ else
+ child = klass.new(nil).data
+ end
+ else
+ child = Mapping._soap2obj(value, self, klass)
+ end
+ elsif klass = Mapping.module_from_name(class_name)
+ # simpletype
+ if value.respond_to?(:data)
+ child = value.data
+ else
+ raise MappingError.new(
+ "cannot map to a module value: #{class_name}")
+ end
+ else
+ raise MappingError.new("unknown class: #{class_name}")
+ end
+ else # untyped element is treated as anyType.
+ child = Mapping._soap2obj(value, self)
+ end
+ vars[name] = child
+ end
+ Mapping.set_attributes(obj, vars)
+ end
+
+ # it caches @@schema_element. this means that @@schema_element must not be
+ # changed while a lifetime of a WSDLLiteralRegistry.
+ def schema_element_definition(klass)
+ @schema_element_cache[klass] ||= Mapping.schema_element_definition(klass)
+ end
+end
+
+
+end
+end
diff --git a/lib/soap/mapping/wsdlliteralregistry.rb b/lib/soap/mapping/wsdlliteralregistry.rb
new file mode 100644
index 0000000000..7bb8e12203
--- /dev/null
+++ b/lib/soap/mapping/wsdlliteralregistry.rb
@@ -0,0 +1,418 @@
+# SOAP4R - WSDL literal mapping registry.
+# Copyright (C) 2004, 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'soap/baseData'
+require 'soap/mapping/mapping'
+require 'soap/mapping/typeMap'
+require 'xsd/codegen/gensupport'
+require 'xsd/namedelements'
+
+
+module SOAP
+module Mapping
+
+
+class WSDLLiteralRegistry < Registry
+ attr_reader :definedelements
+ attr_reader :definedtypes
+ attr_accessor :excn_handler_obj2soap
+ attr_accessor :excn_handler_soap2obj
+
+ def initialize(definedtypes = XSD::NamedElements::Empty,
+ definedelements = XSD::NamedElements::Empty)
+ @definedtypes = definedtypes
+ @definedelements = definedelements
+ @excn_handler_obj2soap = nil
+ @excn_handler_soap2obj = nil
+ @schema_element_cache = {}
+ @schema_attribute_cache = {}
+ end
+
+ def obj2soap(obj, qname)
+ soap_obj = nil
+ if ele = @definedelements[qname]
+ soap_obj = obj2elesoap(obj, ele)
+ elsif type = @definedtypes[qname]
+ soap_obj = obj2typesoap(obj, type, true)
+ else
+ soap_obj = any2soap(obj, qname)
+ end
+ return soap_obj if soap_obj
+ if @excn_handler_obj2soap
+ soap_obj = @excn_handler_obj2soap.call(obj) { |yield_obj|
+ Mapping.obj2soap(yield_obj, nil, nil, MAPPING_OPT)
+ }
+ return soap_obj if soap_obj
+ end
+ raise MappingError.new("cannot map #{obj.class.name} as #{qname}")
+ end
+
+ # node should be a SOAPElement
+ def soap2obj(node, obj_class = nil)
+ # obj_class is given when rpc/literal service. but ignored for now.
+ begin
+ return any2obj(node)
+ rescue MappingError
+ end
+ if @excn_handler_soap2obj
+ begin
+ return @excn_handler_soap2obj.call(node) { |yield_node|
+ Mapping.soap2obj(yield_node, nil, nil, MAPPING_OPT)
+ }
+ rescue Exception
+ end
+ end
+ if node.respond_to?(:type)
+ raise MappingError.new("cannot map #{node.type.name} to Ruby object")
+ else
+ raise MappingError.new("cannot map #{node.elename.name} to Ruby object")
+ end
+ end
+
+private
+
+ MAPPING_OPT = { :no_reference => true }
+
+ def obj2elesoap(obj, ele)
+ o = nil
+ qualified = (ele.elementform == 'qualified')
+ if ele.type
+ if type = @definedtypes[ele.type]
+ o = obj2typesoap(obj, type, qualified)
+ elsif type = TypeMap[ele.type]
+ o = base2soap(obj, type)
+ else
+ raise MappingError.new("cannot find type #{ele.type}")
+ end
+ elsif ele.local_complextype
+ o = obj2typesoap(obj, ele.local_complextype, qualified)
+ add_attributes2soap(obj, o)
+ elsif ele.local_simpletype
+ o = obj2typesoap(obj, ele.local_simpletype, qualified)
+ else
+ raise MappingError.new('illegal schema?')
+ end
+ o.elename = ele.name
+ o
+ end
+
+ def obj2typesoap(obj, type, qualified)
+ if type.is_a?(::WSDL::XMLSchema::SimpleType)
+ simpleobj2soap(obj, type)
+ else
+ complexobj2soap(obj, type, qualified)
+ end
+ end
+
+ def simpleobj2soap(obj, type)
+ type.check_lexical_format(obj)
+ return SOAPNil.new if obj.nil? # ToDo: check nillable.
+ o = base2soap(obj, TypeMap[type.base])
+ o
+ end
+
+ def complexobj2soap(obj, type, qualified)
+ o = SOAPElement.new(type.name)
+ o.qualified = qualified
+ type.each_element do |child_ele|
+ child = Mapping.get_attribute(obj, child_ele.name.name)
+ if child.nil?
+ if child_ele.nillable
+ # ToDo: test
+ # add empty element
+ child_soap = obj2elesoap(nil, child_ele)
+ o.add(child_soap)
+ elsif Integer(child_ele.minoccurs) == 0
+ # nothing to do
+ else
+ raise MappingError.new("nil not allowed: #{child_ele.name.name}")
+ end
+ elsif child_ele.map_as_array?
+ child.each do |item|
+ child_soap = obj2elesoap(item, child_ele)
+ o.add(child_soap)
+ end
+ else
+ child_soap = obj2elesoap(child, child_ele)
+ o.add(child_soap)
+ end
+ end
+ o
+ end
+
+ def any2soap(obj, qname)
+ if obj.is_a?(SOAPElement)
+ obj
+ elsif obj.class.class_variables.include?('@@schema_element')
+ stubobj2soap(obj, qname)
+ elsif obj.is_a?(SOAP::Mapping::Object)
+ mappingobj2soap(obj, qname)
+ elsif obj.is_a?(Hash)
+ ele = SOAPElement.from_obj(obj)
+ ele.elename = qname
+ ele
+ else
+ # expected to be a basetype or an anyType.
+ # SOAPStruct, etc. is used instead of SOAPElement.
+ begin
+ ele = Mapping.obj2soap(obj, nil, nil, MAPPING_OPT)
+ ele.elename = qname
+ ele
+ rescue MappingError
+ ele = SOAPElement.new(qname, obj.to_s)
+ end
+ if obj.respond_to?(:__xmlattr)
+ obj.__xmlattr.each do |key, value|
+ ele.extraattr[key] = value
+ end
+ end
+ ele
+ end
+ end
+
+ def stubobj2soap(obj, qname)
+ ele = SOAPElement.new(qname)
+ ele.qualified =
+ (obj.class.class_variables.include?('@@schema_qualified') and
+ obj.class.class_eval('@@schema_qualified'))
+ add_elements2soap(obj, ele)
+ add_attributes2soap(obj, ele)
+ ele
+ end
+
+ def mappingobj2soap(obj, qname)
+ ele = SOAPElement.new(qname)
+ obj.__xmlele.each do |key, value|
+ if value.is_a?(::Array)
+ value.each do |item|
+ ele.add(obj2soap(item, key))
+ end
+ else
+ ele.add(obj2soap(value, key))
+ end
+ end
+ obj.__xmlattr.each do |key, value|
+ ele.extraattr[key] = value
+ end
+ ele
+ end
+
+ def add_elements2soap(obj, ele)
+ elements, as_array = schema_element_definition(obj.class)
+ if elements
+ elements.each do |elename, type|
+ if child = Mapping.get_attribute(obj, elename.name)
+ if as_array.include?(elename.name)
+ child.each do |item|
+ ele.add(obj2soap(item, elename))
+ end
+ else
+ ele.add(obj2soap(child, elename))
+ end
+ elsif obj.is_a?(::Array) and as_array.include?(elename.name)
+ obj.each do |item|
+ ele.add(obj2soap(item, elename))
+ end
+ end
+ end
+ end
+ end
+
+ def add_attributes2soap(obj, ele)
+ attributes = schema_attribute_definition(obj.class)
+ if attributes
+ attributes.each do |qname, param|
+ attr = obj.__send__('xmlattr_' +
+ XSD::CodeGen::GenSupport.safevarname(qname.name))
+ ele.extraattr[qname] = attr
+ end
+ end
+ end
+
+ def base2soap(obj, type)
+ soap_obj = nil
+ if type <= XSD::XSDString
+ str = XSD::Charset.encoding_conv(obj.to_s,
+ Thread.current[:SOAPExternalCES], XSD::Charset.encoding)
+ soap_obj = type.new(str)
+ else
+ soap_obj = type.new(obj)
+ end
+ soap_obj
+ end
+
+ def anytype2obj(node)
+ if node.is_a?(::SOAP::SOAPBasetype)
+ return node.data
+ end
+ klass = ::SOAP::Mapping::Object
+ obj = klass.new
+ obj
+ end
+
+ def any2obj(node, obj_class = nil)
+ unless obj_class
+ typestr = XSD::CodeGen::GenSupport.safeconstname(node.elename.name)
+ obj_class = Mapping.class_from_name(typestr)
+ end
+ if obj_class and obj_class.class_variables.include?('@@schema_element')
+ soapele2stubobj(node, obj_class)
+ elsif node.is_a?(SOAPElement) or node.is_a?(SOAPStruct)
+ # SOAPArray for literal?
+ soapele2plainobj(node)
+ else
+ obj = Mapping.soap2obj(node, nil, obj_class, MAPPING_OPT)
+ add_attributes2plainobj(node, obj)
+ obj
+ end
+ end
+
+ def soapele2stubobj(node, obj_class)
+ obj = Mapping.create_empty_object(obj_class)
+ add_elements2stubobj(node, obj)
+ add_attributes2stubobj(node, obj)
+ obj
+ end
+
+ def soapele2plainobj(node)
+ obj = anytype2obj(node)
+ add_elements2plainobj(node, obj)
+ add_attributes2plainobj(node, obj)
+ obj
+ end
+
+ def add_elements2stubobj(node, obj)
+ elements, as_array = schema_element_definition(obj.class)
+ vars = {}
+ node.each do |name, value|
+ item = elements.find { |k, v| k.name == name }
+ if item
+ elename, class_name = item
+ if klass = Mapping.class_from_name(class_name)
+ # klass must be a SOAPBasetype or a class
+ if klass.ancestors.include?(::SOAP::SOAPBasetype)
+ if value.respond_to?(:data)
+ child = klass.new(value.data).data
+ else
+ child = klass.new(nil).data
+ end
+ else
+ child = any2obj(value, klass)
+ end
+ elsif klass = Mapping.module_from_name(class_name)
+ # simpletype
+ if value.respond_to?(:data)
+ child = value.data
+ else
+ raise MappingError.new(
+ "cannot map to a module value: #{class_name}")
+ end
+ else
+ raise MappingError.new("unknown class/module: #{class_name}")
+ end
+ else # untyped element is treated as anyType.
+ child = any2obj(value)
+ end
+ if as_array.include?(elename.name)
+ (vars[name] ||= []) << child
+ else
+ vars[name] = child
+ end
+ end
+ Mapping.set_attributes(obj, vars)
+ end
+
+ def add_attributes2stubobj(node, obj)
+ if attributes = schema_attribute_definition(obj.class)
+ define_xmlattr(obj)
+ attributes.each do |qname, class_name|
+ attr = node.extraattr[qname]
+ next if attr.nil? or attr.empty?
+ klass = Mapping.class_from_name(class_name)
+ if klass.ancestors.include?(::SOAP::SOAPBasetype)
+ child = klass.new(attr).data
+ else
+ child = attr
+ end
+ obj.__xmlattr[qname] = child
+ define_xmlattr_accessor(obj, qname)
+ end
+ end
+ end
+
+ def add_elements2plainobj(node, obj)
+ node.each do |name, value|
+ obj.__add_xmlele_value(value.elename, any2obj(value))
+ end
+ end
+
+ def add_attributes2plainobj(node, obj)
+ return if node.extraattr.empty?
+ define_xmlattr(obj)
+ node.extraattr.each do |qname, value|
+ obj.__xmlattr[qname] = value
+ define_xmlattr_accessor(obj, qname)
+ end
+ end
+
+ if RUBY_VERSION > "1.7.0"
+ def define_xmlattr_accessor(obj, qname)
+ name = XSD::CodeGen::GenSupport.safemethodname(qname.name)
+ Mapping.define_attr_accessor(obj, 'xmlattr_' + name,
+ proc { @__xmlattr[qname] },
+ proc { |value| @__xmlattr[qname] = value })
+ end
+ else
+ def define_xmlattr_accessor(obj, qname)
+ name = XSD::CodeGen::GenSupport.safemethodname(qname.name)
+ obj.instance_eval <<-EOS
+ def #{name}
+ @__xmlattr[#{qname.dump}]
+ end
+
+ def #{name}=(value)
+ @__xmlattr[#{qname.dump}] = value
+ end
+ EOS
+ end
+ end
+
+ if RUBY_VERSION > "1.7.0"
+ def define_xmlattr(obj)
+ obj.instance_variable_set('@__xmlattr', {})
+ unless obj.respond_to?(:__xmlattr)
+ Mapping.define_attr_accessor(obj, :__xmlattr, proc { @__xmlattr })
+ end
+ end
+ else
+ def define_xmlattr(obj)
+ obj.instance_variable_set('@__xmlattr', {})
+ unless obj.respond_to?(:__xmlattr)
+ obj.instance_eval <<-EOS
+ def __xmlattr
+ @__xmlattr
+ end
+ EOS
+ end
+ end
+ end
+
+ # it caches @@schema_element. this means that @@schema_element must not be
+ # changed while a lifetime of a WSDLLiteralRegistry.
+ def schema_element_definition(klass)
+ @schema_element_cache[klass] ||= Mapping.schema_element_definition(klass)
+ end
+
+ def schema_attribute_definition(klass)
+ @schema_attribute_cache[klass] ||= Mapping.schema_attribute_definition(klass)
+ end
+end
+
+
+end
+end
diff --git a/lib/soap/marshal.rb b/lib/soap/marshal.rb
new file mode 100644
index 0000000000..1c3d5b01db
--- /dev/null
+++ b/lib/soap/marshal.rb
@@ -0,0 +1,59 @@
+# SOAP4R - Marshalling/Unmarshalling Ruby's object using SOAP Encoding.
+# Copyright (C) 2001, 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require "soap/mapping"
+require "soap/processor"
+
+
+module SOAP
+
+
+module Marshal
+ # Trying xsd:dateTime data to be recovered as aTime.
+ MarshalMappingRegistry = Mapping::Registry.new(
+ :allow_original_mapping => true)
+ MarshalMappingRegistry.add(
+ Time,
+ ::SOAP::SOAPDateTime,
+ ::SOAP::Mapping::Registry::DateTimeFactory
+ )
+
+ class << self
+ public
+ def dump(obj, io = nil)
+ marshal(obj, MarshalMappingRegistry, io)
+ end
+
+ def load(stream)
+ unmarshal(stream, MarshalMappingRegistry)
+ end
+
+ def marshal(obj, mapping_registry = MarshalMappingRegistry, io = nil)
+ elename = Mapping.name2elename(obj.class.to_s)
+ soap_obj = Mapping.obj2soap(obj, mapping_registry)
+ body = SOAPBody.new
+ body.add(elename, soap_obj)
+ env = SOAPEnvelope.new(nil, body)
+ SOAP::Processor.marshal(env, {}, io)
+ end
+
+ def unmarshal(stream, mapping_registry = MarshalMappingRegistry)
+ env = SOAP::Processor.unmarshal(stream)
+ if env.nil?
+ raise ArgumentError.new("Illegal SOAP marshal format.")
+ end
+ Mapping.soap2obj(env.body.root_node, mapping_registry)
+ end
+ end
+end
+
+
+end
+
+
+SOAPMarshal = SOAP::Marshal
diff --git a/lib/soap/mimemessage.rb b/lib/soap/mimemessage.rb
new file mode 100644
index 0000000000..acb4322e11
--- /dev/null
+++ b/lib/soap/mimemessage.rb
@@ -0,0 +1,240 @@
+# SOAP4R - MIME Message implementation.
+# Copyright (C) 2002 Jamie Herre.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'soap/attachment'
+
+
+module SOAP
+
+
+# Classes for MIME message handling. Should be put somewhere else!
+# Tried using the 'tmail' module but found that I needed something
+# lighter in weight.
+
+
+class MIMEMessage
+ class MIMEMessageError < StandardError; end
+
+ MultipartContentType = 'multipart/\w+'
+
+ class Header
+ attr_accessor :str, :key, :root
+
+ def initialize
+ @attrs = {}
+ end
+
+ def [](key)
+ @attrs[key]
+ end
+
+ def []=(key, value)
+ @attrs[key] = value
+ end
+
+ def to_s
+ @key + ": " + @str
+ end
+ end
+
+ class Headers < Hash
+ def self.parse(str)
+ new.parse(str)
+ end
+
+ def parse(str)
+ header_cache = nil
+ str.each do |line|
+ case line
+ when /^\A[^\: \t]+:\s*.+$/
+ parse_line(header_cache) if header_cache
+ header_cache = line.sub(/\r?\n\z/, '')
+ when /^\A\s+(.*)$/
+ # a continuous line at the beginning line crashes here.
+ header_cache << line
+ else
+ raise RuntimeError.new("unexpected header: #{line.inspect}")
+ end
+ end
+ parse_line(header_cache) if header_cache
+ self
+ end
+
+ def parse_line(line)
+ if /^\A([^\: \t]+):\s*(.+)\z/ =~ line
+ header = parse_rhs($2.strip)
+ header.key = $1.strip
+ self[header.key.downcase] = header
+ else
+ raise RuntimeError.new("unexpected header line: #{line.inspect}")
+ end
+ end
+
+ def parse_rhs(str)
+ a = str.split(/;+\s+/)
+ header = Header.new
+ header.str = str
+ header.root = a.shift
+ a.each do |pair|
+ if pair =~ /(\w+)\s*=\s*"?([^"]+)"?/
+ header[$1.downcase] = $2
+ else
+ raise RuntimeError.new("unexpected header component: #{pair.inspect}")
+ end
+ end
+ header
+ end
+
+ def add(key, value)
+ if key != nil and value != nil
+ header = parse_rhs(value)
+ header.key = key
+ self[key.downcase] = header
+ end
+ end
+
+ def to_s
+ self.values.collect { |hdr|
+ hdr.to_s
+ }.join("\r\n")
+ end
+ end
+
+ class Part
+ attr_accessor :headers, :body
+
+ def initialize
+ @headers = Headers.new
+ @headers.add("Content-Transfer-Encoding", "8bit")
+ @body = nil
+ @contentid = nil
+ end
+
+ def self.parse(str)
+ new.parse(str)
+ end
+
+ def parse(str)
+ headers, body = str.split(/\r\n\r\n/s)
+ if headers != nil and body != nil
+ @headers = Headers.parse(headers)
+ @body = body.sub(/\r\n\z/, '')
+ else
+ raise RuntimeError.new("unexpected part: #{str.inspect}")
+ end
+ self
+ end
+
+ def contentid
+ if @contentid == nil and @headers.key?('content-id')
+ @contentid = @headers['content-id'].str
+ @contentid = $1 if @contentid =~ /^<(.+)>$/
+ end
+ @contentid
+ end
+
+ alias content body
+
+ def to_s
+ @headers.to_s + "\r\n\r\n" + @body
+ end
+ end
+
+ def initialize
+ @parts = []
+ @headers = Headers.new
+ @root = nil
+ end
+
+ def self.parse(head, str)
+ new.parse(head, str)
+ end
+
+ attr_reader :parts, :headers
+
+ def close
+ @headers.add(
+ "Content-Type",
+ "multipart/related; type=\"text/xml\"; boundary=\"#{boundary}\"; start=\"#{@parts[0].contentid}\""
+ )
+ end
+
+ def parse(head, str)
+ @headers = Headers.parse(head + "\r\n" + "From: jfh\r\n")
+ boundary = @headers['content-type']['boundary']
+ if boundary != nil
+ parts = str.split(/--#{Regexp.quote(boundary)}\s*(?:\r\n|--\r\n)/)
+ part = parts.shift # preamble must be ignored.
+ @parts = parts.collect { |part| Part.parse(part) }
+ else
+ @parts = [Part.parse(str)]
+ end
+ if @parts.length < 1
+ raise MIMEMessageError.new("This message contains no valid parts!")
+ end
+ self
+ end
+
+ def root
+ if @root == nil
+ start = @headers['content-type']['start']
+ @root = (start && @parts.find { |prt| prt.contentid == start }) ||
+ @parts[0]
+ end
+ @root
+ end
+
+ def boundary
+ if @boundary == nil
+ @boundary = "----=Part_" + __id__.to_s + rand.to_s
+ end
+ @boundary
+ end
+
+ def add_part(content)
+ part = Part.new
+ part.headers.add("Content-Type",
+ "text/xml; charset=" + XSD::Charset.xml_encoding_label)
+ part.headers.add("Content-ID", Attachment.contentid(part))
+ part.body = content
+ @parts.unshift(part)
+ end
+
+ def add_attachment(attach)
+ part = Part.new
+ part.headers.add("Content-Type", attach.contenttype)
+ part.headers.add("Content-ID", attach.mime_contentid)
+ part.body = attach.content
+ @parts.unshift(part)
+ end
+
+ def has_parts?
+ (@parts.length > 0)
+ end
+
+ def headers_str
+ @headers.to_s
+ end
+
+ def content_str
+ str = ''
+ @parts.each do |prt|
+ str << "--" + boundary + "\r\n"
+ str << prt.to_s + "\r\n"
+ end
+ str << '--' + boundary + "--\r\n"
+ str
+ end
+
+ def to_s
+ str = headers_str + "\r\n\r\n" + conent_str
+ end
+end
+
+
+end
diff --git a/lib/soap/netHttpClient.rb b/lib/soap/netHttpClient.rb
new file mode 100644
index 0000000000..10d68e2a4c
--- /dev/null
+++ b/lib/soap/netHttpClient.rb
@@ -0,0 +1,190 @@
+# SOAP4R - net/http wrapper
+# Copyright (C) 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'net/http'
+
+
+module SOAP
+
+
+class NetHttpClient
+
+ SSLEnabled = begin
+ require 'net/https'
+ true
+ rescue LoadError
+ false
+ end
+
+ attr_reader :proxy
+ attr_accessor :no_proxy
+ attr_accessor :debug_dev
+ attr_accessor :ssl_config # ignored for now.
+ attr_accessor :protocol_version # ignored for now.
+ attr_accessor :connect_timeout
+ attr_accessor :send_timeout # ignored for now.
+ attr_accessor :receive_timeout
+
+ def initialize(proxy = nil, agent = nil)
+ @proxy = proxy ? URI.parse(proxy) : nil
+ @agent = agent
+ @debug_dev = nil
+ @session_manager = SessionManager.new
+ @no_proxy = @ssl_config = @protocol_version = nil
+ @connect_timeout = @send_timeout = @receive_timeout = nil
+ end
+
+ def test_loopback_response
+ raise NotImplementedError.new("not supported for now")
+ end
+
+ def proxy=(proxy)
+ if proxy.nil?
+ @proxy = nil
+ else
+ if proxy.is_a?(URI)
+ @proxy = proxy
+ else
+ @proxy = URI.parse(proxy)
+ end
+ if @proxy.scheme == nil or @proxy.scheme.downcase != 'http' or
+ @proxy.host == nil or @proxy.port == nil
+ raise ArgumentError.new("unsupported proxy `#{proxy}'")
+ end
+ end
+ reset_all
+ @proxy
+ end
+
+ def set_basic_auth(uri, user_id, passwd)
+ # net/http does not handle url.
+ @basic_auth = [user_id, passwd]
+ raise NotImplementedError.new("basic_auth is not supported under soap4r + net/http.")
+ end
+
+ def set_cookie_store(filename)
+ raise NotImplementedError.new
+ end
+
+ def save_cookie_store(filename)
+ raise NotImplementedError.new
+ end
+
+ def reset(url)
+ # no persistent connection. ignored.
+ end
+
+ def reset_all
+ # no persistent connection. ignored.
+ end
+
+ def post(url, req_body, header = {})
+ unless url.is_a?(URI)
+ url = URI.parse(url)
+ end
+ extra = header.dup
+ extra['User-Agent'] = @agent if @agent
+ res = start(url) { |http|
+ http.post(url.request_uri, req_body, extra)
+ }
+ Response.new(res)
+ end
+
+ def get_content(url, header = {})
+ unless url.is_a?(URI)
+ url = URI.parse(url)
+ end
+ extra = header.dup
+ extra['User-Agent'] = @agent if @agent
+ res = start(url) { |http|
+ http.get(url.request_uri, extra)
+ }
+ res.body
+ end
+
+private
+
+ def start(url)
+ http = create_connection(url)
+ response = nil
+ http.start { |worker|
+ response = yield(worker)
+ worker.finish
+ }
+ @debug_dev << response.body if @debug_dev
+ response
+ end
+
+ def create_connection(url)
+ proxy_host = proxy_port = nil
+ unless no_proxy?(url)
+ proxy_host = @proxy.host
+ proxy_port = @proxy.port
+ end
+ http = Net::HTTP::Proxy(proxy_host, proxy_port).new(url.host, url.port)
+ if http.respond_to?(:set_debug_output)
+ http.set_debug_output(@debug_dev)
+ end
+ http.open_timeout = @connect_timeout if @connect_timeout
+ http.read_timeout = @receive_timeout if @receive_timeout
+ case url
+ when URI::HTTPS
+ if SSLEnabled
+ http.use_ssl = true
+ else
+ raise RuntimeError.new("Cannot connect to #{url} (OpenSSL is not installed.)")
+ end
+ when URI::HTTP
+ # OK
+ else
+ raise RuntimeError.new("Cannot connect to #{url} (Not HTTP.)")
+ end
+ http
+ end
+
+ NO_PROXY_HOSTS = ['localhost']
+
+ def no_proxy?(uri)
+ if !@proxy or NO_PROXY_HOSTS.include?(uri.host)
+ return true
+ end
+ if @no_proxy
+ @no_proxy.scan(/([^:,]*)(?::(\d+))?/) do |host, port|
+ if /(\A|\.)#{Regexp.quote(host)}\z/i =~ uri.host &&
+ (!port || uri.port == port.to_i)
+ return true
+ end
+ end
+ else
+ false
+ end
+ end
+
+ class SessionManager
+ attr_accessor :connect_timeout
+ attr_accessor :send_timeout
+ attr_accessor :receive_timeout
+ end
+
+ class Response
+ attr_reader :content
+ attr_reader :status
+ attr_reader :reason
+ attr_reader :contenttype
+
+ def initialize(res)
+ @status = res.code.to_i
+ @reason = res.message
+ @contenttype = res['content-type']
+ @content = res.body
+ end
+ end
+end
+
+
+end
diff --git a/lib/soap/parser.rb b/lib/soap/parser.rb
new file mode 100644
index 0000000000..412fd4855a
--- /dev/null
+++ b/lib/soap/parser.rb
@@ -0,0 +1,251 @@
+# SOAP4R - SOAP XML Instance Parser library.
+# Copyright (C) 2001, 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'xsd/ns'
+require 'xsd/xmlparser'
+require 'soap/soap'
+require 'soap/baseData'
+require 'soap/encodingstyle/handler'
+
+
+module SOAP
+
+
+class Parser
+ include SOAP
+
+ class ParseError < Error; end
+ class FormatDecodeError < ParseError; end
+ class UnexpectedElementError < ParseError; end
+
+private
+
+ class ParseFrame
+ attr_reader :node
+ attr_reader :name
+ attr_reader :ns, :encodingstyle
+
+ class NodeContainer
+ def initialize(node)
+ @node = node
+ end
+
+ def node
+ @node
+ end
+
+ def replace_node(node)
+ @node = node
+ end
+ end
+
+ public
+
+ def initialize(ns, name, node, encodingstyle)
+ @ns = ns
+ @name = name
+ self.node = node
+ @encodingstyle = encodingstyle
+ end
+
+ def node=(node)
+ @node = NodeContainer.new(node)
+ end
+ end
+
+public
+
+ attr_accessor :envelopenamespace
+ attr_accessor :default_encodingstyle
+ attr_accessor :decode_typemap
+ attr_accessor :allow_unqualified_element
+
+ def initialize(opt = {})
+ @opt = opt
+ @parser = XSD::XMLParser.create_parser(self, opt)
+ @parsestack = nil
+ @lastnode = nil
+ @handlers = {}
+ @envelopenamespace = opt[:envelopenamespace] || EnvelopeNamespace
+ @default_encodingstyle = opt[:default_encodingstyle] || EncodingNamespace
+ @decode_typemap = opt[:decode_typemap] || nil
+ @allow_unqualified_element = opt[:allow_unqualified_element] || false
+ end
+
+ def charset
+ @parser.charset
+ end
+
+ def parse(string_or_readable)
+ @parsestack = []
+ @lastnode = nil
+
+ @handlers.each do |uri, handler|
+ handler.decode_prologue
+ end
+
+ @parser.do_parse(string_or_readable)
+
+ unless @parsestack.empty?
+ raise FormatDecodeError.new("Unbalanced tag in XML.")
+ end
+
+ @handlers.each do |uri, handler|
+ handler.decode_epilogue
+ end
+
+ @lastnode
+ end
+
+ def start_element(name, attrs)
+ lastframe = @parsestack.last
+ ns = parent = parent_encodingstyle = nil
+ if lastframe
+ ns = lastframe.ns.clone_ns
+ parent = lastframe.node
+ parent_encodingstyle = lastframe.encodingstyle
+ else
+ ns = XSD::NS.new
+ parent = ParseFrame::NodeContainer.new(nil)
+ parent_encodingstyle = nil
+ end
+
+ attrs = XSD::XMLParser.filter_ns(ns, attrs)
+ encodingstyle = find_encodingstyle(ns, attrs)
+
+ # Children's encodingstyle is derived from its parent.
+ if encodingstyle.nil?
+ if parent.node.is_a?(SOAPHeader)
+ encodingstyle = LiteralNamespace
+ else
+ encodingstyle = parent_encodingstyle || @default_encodingstyle
+ end
+ end
+
+ node = decode_tag(ns, name, attrs, parent, encodingstyle)
+
+ @parsestack << ParseFrame.new(ns, name, node, encodingstyle)
+ end
+
+ def characters(text)
+ lastframe = @parsestack.last
+ if lastframe
+ # Need not to be cloned because character does not have attr.
+ decode_text(lastframe.ns, text, lastframe.encodingstyle)
+ else
+ # Ignore Text outside of SOAP Envelope.
+ p text if $DEBUG
+ end
+ end
+
+ def end_element(name)
+ lastframe = @parsestack.pop
+ unless name == lastframe.name
+ raise UnexpectedElementError.new("Closing element name '#{ name }' does not match with opening element '#{ lastframe.name }'.")
+ end
+ decode_tag_end(lastframe.ns, lastframe.node, lastframe.encodingstyle)
+ @lastnode = lastframe.node.node
+ end
+
+private
+
+ def find_encodingstyle(ns, attrs)
+ attrs.each do |key, value|
+ if (ns.compare(@envelopenamespace, AttrEncodingStyle, key))
+ return value
+ end
+ end
+ nil
+ end
+
+ def decode_tag(ns, name, attrs, parent, encodingstyle)
+ ele = ns.parse(name)
+
+ # Envelope based parsing.
+ if ((ele.namespace == @envelopenamespace) ||
+ (@allow_unqualified_element && ele.namespace.nil?))
+ o = decode_soap_envelope(ns, ele, attrs, parent)
+ return o if o
+ end
+
+ # Encoding based parsing.
+ handler = find_handler(encodingstyle)
+ if handler
+ return handler.decode_tag(ns, ele, attrs, parent)
+ else
+ raise FormatDecodeError.new("Unknown encodingStyle: #{ encodingstyle }.")
+ end
+ end
+
+ def decode_tag_end(ns, node, encodingstyle)
+ return unless encodingstyle
+
+ handler = find_handler(encodingstyle)
+ if handler
+ return handler.decode_tag_end(ns, node)
+ else
+ raise FormatDecodeError.new("Unknown encodingStyle: #{ encodingstyle }.")
+ end
+ end
+
+ def decode_text(ns, text, encodingstyle)
+ handler = find_handler(encodingstyle)
+
+ if handler
+ handler.decode_text(ns, text)
+ else
+ # How should I do?
+ end
+ end
+
+ def decode_soap_envelope(ns, ele, attrs, parent)
+ o = nil
+ if ele.name == EleEnvelope
+ o = SOAPEnvelope.new
+ if ext = @opt[:external_content]
+ ext.each do |k, v|
+ o.external_content[k] = v
+ end
+ end
+ elsif ele.name == EleHeader
+ unless parent.node.is_a?(SOAPEnvelope)
+ raise FormatDecodeError.new("Header should be a child of Envelope.")
+ end
+ o = SOAPHeader.new
+ parent.node.header = o
+ elsif ele.name == EleBody
+ unless parent.node.is_a?(SOAPEnvelope)
+ raise FormatDecodeError.new("Body should be a child of Envelope.")
+ end
+ o = SOAPBody.new
+ parent.node.body = o
+ elsif ele.name == EleFault
+ unless parent.node.is_a?(SOAPBody)
+ raise FormatDecodeError.new("Fault should be a child of Body.")
+ end
+ o = SOAPFault.new
+ parent.node.fault = o
+ end
+ o
+ end
+
+ def find_handler(encodingstyle)
+ unless @handlers.key?(encodingstyle)
+ handler_factory = SOAP::EncodingStyle::Handler.handler(encodingstyle) ||
+ SOAP::EncodingStyle::Handler.handler(EncodingNamespace)
+ handler = handler_factory.new(@parser.charset)
+ handler.decode_typemap = @decode_typemap
+ handler.decode_prologue
+ @handlers[encodingstyle] = handler
+ end
+ @handlers[encodingstyle]
+ end
+end
+
+
+end
diff --git a/lib/soap/processor.rb b/lib/soap/processor.rb
new file mode 100644
index 0000000000..3c6dbedf2f
--- /dev/null
+++ b/lib/soap/processor.rb
@@ -0,0 +1,66 @@
+# SOAP4R - marshal/unmarshal interface.
+# Copyright (C) 2000, 2001, 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'xsd/datatypes'
+require 'soap/soap'
+require 'soap/element'
+require 'soap/parser'
+require 'soap/generator'
+require 'soap/encodingstyle/soapHandler'
+require 'soap/encodingstyle/literalHandler'
+require 'soap/encodingstyle/aspDotNetHandler'
+
+
+module SOAP
+
+
+module Processor
+ @@default_parser_option = {}
+
+ class << self
+ public
+
+ def marshal(env, opt = {}, io = nil)
+ generator = create_generator(opt)
+ marshalled_str = generator.generate(env, io)
+ unless env.external_content.empty?
+ opt[:external_content] = env.external_content
+ end
+ marshalled_str
+ end
+
+ def unmarshal(stream, opt = {})
+ parser = create_parser(opt)
+ parser.parse(stream)
+ end
+
+ def default_parser_option=(rhs)
+ @@default_parser_option = rhs
+ end
+
+ def default_parser_option
+ @@default_parser_option
+ end
+
+ private
+
+ def create_generator(opt)
+ SOAPGenerator.new(opt)
+ end
+
+ def create_parser(opt)
+ if opt.empty?
+ opt = @@default_parser_option
+ end
+ ::SOAP::Parser.new(opt)
+ end
+ end
+end
+
+
+end
diff --git a/lib/soap/property.rb b/lib/soap/property.rb
new file mode 100644
index 0000000000..882dcc6e28
--- /dev/null
+++ b/lib/soap/property.rb
@@ -0,0 +1,333 @@
+# soap/property.rb: SOAP4R - Property implementation.
+# Copyright (C) 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+module SOAP
+
+
+# Property stream format:
+#
+# line separator is \r?\n. 1 line per a property.
+# line which begins with '#' is a comment line. empty line is ignored, too.
+# key/value separator is ':' or '='.
+# '\' as escape character. but line separator cannot be escaped.
+# \s at the head/tail of key/value are trimmed.
+#
+# '[' + key + ']' indicates property section. for example,
+#
+# [aaa.bbb]
+# ccc = ddd
+# eee.fff = ggg
+# []
+# aaa.hhh = iii
+#
+# is the same as;
+#
+# aaa.bbb.ccc = ddd
+# aaa.bbb.eee.fff = ggg
+# aaa.hhh = iii
+#
+class Property
+ FrozenError = (RUBY_VERSION >= "1.9.0") ? RuntimeError : TypeError
+
+ include Enumerable
+
+ module Util
+ def const_from_name(fqname)
+ fqname.split("::").inject(Kernel) { |klass, name| klass.const_get(name) }
+ end
+ module_function :const_from_name
+
+ def require_from_name(fqname)
+ require File.join(fqname.split("::").collect { |ele| ele.downcase })
+ end
+ module_function :require_from_name
+ end
+
+ def self.load(stream)
+ new.load(stream)
+ end
+
+ def self.loadproperty(propname)
+ new.loadproperty(propname)
+ end
+
+ def initialize
+ @store = Hash.new
+ @hook = Hash.new
+ @self_hook = Array.new
+ @locked = false
+ end
+
+ KEY_REGSRC = '([^=:\\\\]*(?:\\\\.[^=:\\\\]*)*)'
+ DEF_REGSRC = '\\s*' + KEY_REGSRC + '\\s*[=:]\\s*(.*)'
+ COMMENT_REGEXP = Regexp.new('^(?:#.*|)$')
+ CATDEF_REGEXP = Regexp.new("^\\[\\s*#{KEY_REGSRC}\\s*\\]$")
+ LINE_REGEXP = Regexp.new("^#{DEF_REGSRC}$")
+ def load(stream)
+ key_prefix = ""
+ stream.each_with_index do |line, lineno|
+ line.sub!(/\r?\n\z/, '')
+ case line
+ when COMMENT_REGEXP
+ next
+ when CATDEF_REGEXP
+ key_prefix = $1.strip
+ when LINE_REGEXP
+ key, value = $1.strip, $2.strip
+ key = "#{key_prefix}.#{key}" unless key_prefix.empty?
+ key, value = loadstr(key), loadstr(value)
+ self[key] = value
+ else
+ raise TypeError.new(
+ "property format error at line #{lineno + 1}: `#{line}'")
+ end
+ end
+ self
+ end
+
+ # find property from $:.
+ def loadproperty(propname)
+ return loadpropertyfile(propname) if File.file?(propname)
+ $:.each do |path|
+ if File.file?(file = File.join(path, propname))
+ return loadpropertyfile(file)
+ end
+ end
+ nil
+ end
+
+ # name: a Symbol, String or an Array
+ def [](name)
+ referent(name_to_a(name))
+ end
+
+ # name: a Symbol, String or an Array
+ # value: an Object
+ def []=(name, value)
+ name_pair = name_to_a(name).freeze
+ hooks = assign(name_pair, value)
+ hooks.each do |hook|
+ hook.call(name_pair, value)
+ end
+ value
+ end
+
+ # value: an Object
+ # key is generated by property
+ def <<(value)
+ self[generate_new_key] = value
+ end
+
+ # name: a Symbol, String or an Array; nil means hook to the root
+ # cascade: true/false; for cascading hook of sub key
+ # hook: block which will be called with 2 args, name and value
+ def add_hook(name = nil, cascade = false, &hook)
+ if name == nil or name == true or name == false
+ cascade = name
+ assign_self_hook(cascade, &hook)
+ else
+ assign_hook(name_to_a(name), cascade, &hook)
+ end
+ end
+
+ def each
+ @store.each do |key, value|
+ yield(key, value)
+ end
+ end
+
+ def empty?
+ @store.empty?
+ end
+
+ def keys
+ @store.keys
+ end
+
+ def values
+ @store.values
+ end
+
+ def lock(cascade = false)
+ if cascade
+ each_key do |key|
+ key.lock(cascade)
+ end
+ end
+ @locked = true
+ self
+ end
+
+ def unlock(cascade = false)
+ @locked = false
+ if cascade
+ each_key do |key|
+ key.unlock(cascade)
+ end
+ end
+ self
+ end
+
+ def locked?
+ @locked
+ end
+
+protected
+
+ def deref_key(key)
+ check_lock(key)
+ ref = @store[key] ||= self.class.new
+ unless propkey?(ref)
+ raise ArgumentError.new("key `#{key}' already defined as a value")
+ end
+ ref
+ end
+
+ def local_referent(key)
+ check_lock(key)
+ if propkey?(@store[key]) and @store[key].locked?
+ raise FrozenError.new("cannot split any key from locked property")
+ end
+ @store[key]
+ end
+
+ def local_assign(key, value)
+ check_lock(key)
+ if @locked
+ if propkey?(value)
+ raise FrozenError.new("cannot add any key to locked property")
+ elsif propkey?(@store[key])
+ raise FrozenError.new("cannot override any key in locked property")
+ end
+ end
+ @store[key] = value
+ end
+
+ def local_hook(key, direct)
+ hooks = []
+ (@self_hook + (@hook[key] || NO_HOOK)).each do |hook, cascade|
+ hooks << hook if direct or cascade
+ end
+ hooks
+ end
+
+ def local_assign_hook(key, cascade, &hook)
+ check_lock(key)
+ @store[key] ||= nil
+ (@hook[key] ||= []) << [hook, cascade]
+ end
+
+private
+
+ NO_HOOK = [].freeze
+
+ def referent(ary)
+ ary[0..-2].inject(self) { |ref, name|
+ ref.deref_key(to_key(name))
+ }.local_referent(to_key(ary.last))
+ end
+
+ def assign(ary, value)
+ ref = self
+ hook = NO_HOOK
+ ary[0..-2].each do |name|
+ key = to_key(name)
+ hook += ref.local_hook(key, false)
+ ref = ref.deref_key(key)
+ end
+ last_key = to_key(ary.last)
+ ref.local_assign(last_key, value)
+ hook + ref.local_hook(last_key, true)
+ end
+
+ def assign_hook(ary, cascade, &hook)
+ ary[0..-2].inject(self) { |ref, name|
+ ref.deref_key(to_key(name))
+ }.local_assign_hook(to_key(ary.last), cascade, &hook)
+ end
+
+ def assign_self_hook(cascade, &hook)
+ check_lock(nil)
+ @self_hook << [hook, cascade]
+ end
+
+ def each_key
+ self.each do |key, value|
+ if propkey?(value)
+ yield(value)
+ end
+ end
+ end
+
+ def check_lock(key)
+ if @locked and (key.nil? or !@store.key?(key))
+ raise FrozenError.new("cannot add any key to locked property")
+ end
+ end
+
+ def propkey?(value)
+ value.is_a?(::SOAP::Property)
+ end
+
+ def name_to_a(name)
+ case name
+ when Symbol
+ [name]
+ when String
+ name.scan(/[^.\\]+(?:\\.[^.\\])*/) # split with unescaped '.'
+ when Array
+ name
+ else
+ raise ArgumentError.new("Unknown name #{name}(#{name.class})")
+ end
+ end
+
+ def to_key(name)
+ name.to_s.downcase
+ end
+
+ def generate_new_key
+ if @store.empty?
+ "0"
+ else
+ (key_max + 1).to_s
+ end
+ end
+
+ def key_max
+ (@store.keys.max { |l, r| l.to_s.to_i <=> r.to_s.to_i }).to_s.to_i
+ end
+
+ def loadpropertyfile(file)
+ puts "find property at #{file}" if $DEBUG
+ File.open(file) do |f|
+ load(f)
+ end
+ end
+
+ def loadstr(str)
+ str.gsub(/\\./) { |c| eval("\"#{c}\"") }
+ end
+end
+
+
+end
+
+
+# for ruby/1.6.
+unless Enumerable.instance_methods.include?('inject')
+ module Enumerable
+ def inject(init)
+ result = init
+ each do |item|
+ result = yield(result, item)
+ end
+ result
+ end
+ end
+end
diff --git a/lib/soap/rpc/cgistub.rb b/lib/soap/rpc/cgistub.rb
new file mode 100644
index 0000000000..487f05a9bf
--- /dev/null
+++ b/lib/soap/rpc/cgistub.rb
@@ -0,0 +1,206 @@
+# SOAP4R - CGI/mod_ruby stub library
+# Copyright (C) 2001, 2003-2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'soap/streamHandler'
+require 'webrick/httpresponse'
+require 'webrick/httpstatus'
+require 'logger'
+require 'soap/rpc/soaplet'
+
+
+module SOAP
+module RPC
+
+
+###
+# SYNOPSIS
+# CGIStub.new
+#
+# DESCRIPTION
+# To be written...
+#
+class CGIStub < Logger::Application
+ include SOAP
+ include WEBrick
+
+ class SOAPRequest
+ attr_reader :body
+
+ def [](var); end
+
+ def meta_vars; end
+ end
+
+ class SOAPStdinRequest < SOAPRequest
+ attr_reader :body
+
+ def initialize(stream)
+ size = ENV['CONTENT_LENGTH'].to_i || 0
+ @body = stream.read(size)
+ end
+
+ def [](var)
+ ENV[var.gsub(/-/, '_').upcase]
+ end
+
+ def meta_vars
+ {
+ 'HTTP_SOAPACTION' => ENV['HTTP_SOAPAction']
+ }
+ end
+ end
+
+ class SOAPFCGIRequest < SOAPRequest
+ attr_reader :body
+
+ def initialize(request)
+ @request = request
+ @body = @request.in.read
+ end
+
+ def [](var)
+ @request.env[var.gsub(/-/, '_').upcase]
+ end
+
+ def meta_vars
+ {
+ 'HTTP_SOAPACTION' => @request.env['HTTP_SOAPAction']
+ }
+ end
+ end
+
+ def initialize(appname, default_namespace)
+ super(appname)
+ set_log(STDERR)
+ self.level = ERROR
+ @default_namespace = default_namespace
+ @remote_host = ENV['REMOTE_HOST'] || ENV['REMOTE_ADDR'] || 'unknown'
+ @router = ::SOAP::RPC::Router.new(self.class.name)
+ @soaplet = ::SOAP::RPC::SOAPlet.new(@router)
+ on_init
+ end
+
+ def on_init
+ # do extra initialization in a derived class if needed.
+ end
+
+ def mapping_registry
+ @router.mapping_registry
+ end
+
+ def mapping_registry=(value)
+ @router.mapping_registry = value
+ end
+
+ def generate_explicit_type
+ @router.generate_explicit_type
+ end
+
+ def generate_explicit_type=(generate_explicit_type)
+ @router.generate_explicit_type = generate_explicit_type
+ end
+
+ # servant entry interface
+
+ def add_rpc_servant(obj, namespace = @default_namespace)
+ @router.add_rpc_servant(obj, namespace)
+ end
+ alias add_servant add_rpc_servant
+
+ def add_headerhandler(obj)
+ @router.add_headerhandler(obj)
+ end
+ alias add_rpc_headerhandler add_headerhandler
+
+ # method entry interface
+
+ def add_rpc_method(obj, name, *param)
+ add_rpc_method_with_namespace_as(@default_namespace, obj, name, name, *param)
+ end
+ alias add_method add_rpc_method
+
+ def add_rpc_method_as(obj, name, name_as, *param)
+ add_rpc_method_with_namespace_as(@default_namespace, obj, name, name_as, *param)
+ end
+ alias add_method_as add_rpc_method_as
+
+ def add_rpc_method_with_namespace(namespace, obj, name, *param)
+ add_rpc_method_with_namespace_as(namespace, obj, name, name, *param)
+ end
+ alias add_method_with_namespace add_rpc_method_with_namespace
+
+ def add_rpc_method_with_namespace_as(namespace, obj, name, name_as, *param)
+ qname = XSD::QName.new(namespace, name_as)
+ soapaction = nil
+ param_def = SOAPMethod.derive_rpc_param_def(obj, name, *param)
+ @router.add_rpc_operation(obj, qname, soapaction, name, param_def)
+ end
+ alias add_method_with_namespace_as add_rpc_method_with_namespace_as
+
+ def add_rpc_operation(receiver, qname, soapaction, name, param_def, opt = {})
+ @router.add_rpc_operation(receiver, qname, soapaction, name, param_def, opt)
+ end
+
+ def add_document_operation(receiver, soapaction, name, param_def, opt = {})
+ @router.add_document_operation(receiver, soapaction, name, param_def, opt)
+ end
+
+ def set_fcgi_request(request)
+ @fcgi = request
+ end
+
+private
+
+ HTTPVersion = WEBrick::HTTPVersion.new('1.0') # dummy; ignored
+
+ def run
+ res = WEBrick::HTTPResponse.new({:HTTPVersion => HTTPVersion})
+ begin
+ @log.info { "received a request from '#{ @remote_host }'" }
+ if @fcgi
+ req = SOAPFCGIRequest.new(@fcgi)
+ else
+ req = SOAPStdinRequest.new($stdin)
+ end
+ @soaplet.do_POST(req, res)
+ rescue HTTPStatus::EOFError, HTTPStatus::RequestTimeout => ex
+ res.set_error(ex)
+ rescue HTTPStatus::Error => ex
+ res.set_error(ex)
+ rescue HTTPStatus::Status => ex
+ res.status = ex.code
+ rescue StandardError, NameError => ex # for Ruby 1.6
+ res.set_error(ex, true)
+ ensure
+ if defined?(MOD_RUBY)
+ r = Apache.request
+ r.status = res.status
+ r.content_type = res.content_type
+ r.send_http_header
+ buf = res.body
+ else
+ buf = ''
+ res.send_response(buf)
+ buf.sub!(/^[^\r]+\r\n/, '') # Trim status line.
+ end
+ @log.debug { "SOAP CGI Response:\n#{ buf }" }
+ if @fcgi
+ @fcgi.out.print buf
+ @fcgi.finish
+ @fcgi = nil
+ else
+ print buf
+ end
+ end
+ 0
+ end
+end
+
+
+end
+end
diff --git a/lib/soap/rpc/driver.rb b/lib/soap/rpc/driver.rb
new file mode 100644
index 0000000000..0fb4e82488
--- /dev/null
+++ b/lib/soap/rpc/driver.rb
@@ -0,0 +1,254 @@
+# SOAP4R - SOAP RPC driver
+# Copyright (C) 2000, 2001, 2003-2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'soap/soap'
+require 'soap/mapping'
+require 'soap/mapping/wsdlliteralregistry'
+require 'soap/rpc/rpc'
+require 'soap/rpc/proxy'
+require 'soap/rpc/element'
+require 'soap/streamHandler'
+require 'soap/property'
+require 'soap/header/handlerset'
+
+
+module SOAP
+module RPC
+
+
+class Driver
+ class << self
+ if RUBY_VERSION >= "1.7.0"
+ def __attr_proxy(symbol, assignable = false)
+ name = symbol.to_s
+ define_method(name) {
+ @proxy.__send__(name)
+ }
+ if assignable
+ aname = name + '='
+ define_method(aname) { |rhs|
+ @proxy.__send__(aname, rhs)
+ }
+ end
+ end
+ else
+ def __attr_proxy(symbol, assignable = false)
+ name = symbol.to_s
+ module_eval <<-EOS
+ def #{name}
+ @proxy.#{name}
+ end
+ EOS
+ if assignable
+ module_eval <<-EOS
+ def #{name}=(value)
+ @proxy.#{name} = value
+ end
+ EOS
+ end
+ end
+ end
+ end
+
+ __attr_proxy :endpoint_url, true
+ __attr_proxy :mapping_registry, true
+ __attr_proxy :default_encodingstyle, true
+ __attr_proxy :generate_explicit_type, true
+ __attr_proxy :allow_unqualified_element, true
+ __attr_proxy :headerhandler
+ __attr_proxy :streamhandler
+ __attr_proxy :test_loopback_response
+ __attr_proxy :reset_stream
+
+ attr_reader :proxy
+ attr_reader :options
+ attr_accessor :soapaction
+
+ def inspect
+ "#<#{self.class}:#{@proxy.inspect}>"
+ end
+
+ def httpproxy
+ options["protocol.http.proxy"]
+ end
+
+ def httpproxy=(httpproxy)
+ options["protocol.http.proxy"] = httpproxy
+ end
+
+ def wiredump_dev
+ options["protocol.http.wiredump_dev"]
+ end
+
+ def wiredump_dev=(wiredump_dev)
+ options["protocol.http.wiredump_dev"] = wiredump_dev
+ end
+
+ def mandatorycharset
+ options["protocol.mandatorycharset"]
+ end
+
+ def mandatorycharset=(mandatorycharset)
+ options["protocol.mandatorycharset"] = mandatorycharset
+ end
+
+ def wiredump_file_base
+ options["protocol.wiredump_file_base"]
+ end
+
+ def wiredump_file_base=(wiredump_file_base)
+ options["protocol.wiredump_file_base"] = wiredump_file_base
+ end
+
+ def initialize(endpoint_url, namespace = nil, soapaction = nil)
+ @namespace = namespace
+ @soapaction = soapaction
+ @options = setup_options
+ @wiredump_file_base = nil
+ @proxy = Proxy.new(endpoint_url, @soapaction, @options)
+ end
+
+ def loadproperty(propertyname)
+ unless options.loadproperty(propertyname)
+ raise LoadError.new("No such property to load -- #{propertyname}")
+ end
+ end
+
+ def add_rpc_method(name, *params)
+ add_rpc_method_with_soapaction_as(name, name, @soapaction, *params)
+ end
+
+ def add_rpc_method_as(name, name_as, *params)
+ add_rpc_method_with_soapaction_as(name, name_as, @soapaction, *params)
+ end
+
+ def add_rpc_method_with_soapaction(name, soapaction, *params)
+ add_rpc_method_with_soapaction_as(name, name, soapaction, *params)
+ end
+
+ def add_rpc_method_with_soapaction_as(name, name_as, soapaction, *params)
+ param_def = SOAPMethod.create_rpc_param_def(params)
+ qname = XSD::QName.new(@namespace, name_as)
+ @proxy.add_rpc_method(qname, soapaction, name, param_def)
+ add_rpc_method_interface(name, param_def)
+ end
+
+ # add_method is for shortcut of typical rpc/encoded method definition.
+ alias add_method add_rpc_method
+ alias add_method_as add_rpc_method_as
+ alias add_method_with_soapaction add_rpc_method_with_soapaction
+ alias add_method_with_soapaction_as add_rpc_method_with_soapaction_as
+
+ def add_document_method(name, soapaction, req_qname, res_qname)
+ param_def = SOAPMethod.create_doc_param_def(req_qname, res_qname)
+ @proxy.add_document_method(soapaction, name, param_def)
+ add_document_method_interface(name, param_def)
+ end
+
+ def add_rpc_operation(qname, soapaction, name, param_def, opt = {})
+ @proxy.add_rpc_operation(qname, soapaction, name, param_def, opt)
+ add_rpc_method_interface(name, param_def)
+ end
+
+ def add_document_operation(soapaction, name, param_def, opt = {})
+ @proxy.add_document_operation(soapaction, name, param_def, opt)
+ add_document_method_interface(name, param_def)
+ end
+
+ def invoke(headers, body)
+ if headers and !headers.is_a?(SOAPHeader)
+ headers = create_header(headers)
+ end
+ set_wiredump_file_base(body.elename.name)
+ env = @proxy.invoke(headers, body)
+ if env.nil?
+ return nil, nil
+ else
+ return env.header, env.body
+ end
+ end
+
+ def call(name, *params)
+ set_wiredump_file_base(name)
+ @proxy.call(name, *params)
+ end
+
+private
+
+ def set_wiredump_file_base(name)
+ if @wiredump_file_base
+ @proxy.set_wiredump_file_base("#{@wiredump_file_base}_#{name}")
+ end
+ end
+
+ def create_header(headers)
+ header = SOAPHeader.new()
+ headers.each do |content, mustunderstand, encodingstyle|
+ header.add(SOAPHeaderItem.new(content, mustunderstand, encodingstyle))
+ end
+ header
+ end
+
+ def setup_options
+ if opt = Property.loadproperty(::SOAP::PropertyName)
+ opt = opt["client"]
+ end
+ opt ||= Property.new
+ opt.add_hook("protocol.mandatorycharset") do |key, value|
+ @proxy.mandatorycharset = value
+ end
+ opt.add_hook("protocol.wiredump_file_base") do |key, value|
+ @wiredump_file_base = value
+ end
+ opt["protocol.http.charset"] ||= XSD::Charset.xml_encoding_label
+ opt["protocol.http.proxy"] ||= Env::HTTP_PROXY
+ opt["protocol.http.no_proxy"] ||= Env::NO_PROXY
+ opt
+ end
+
+ def add_rpc_method_interface(name, param_def)
+ param_count = RPC::SOAPMethod.param_count(param_def,
+ RPC::SOAPMethod::IN, RPC::SOAPMethod::INOUT)
+ add_method_interface(name, param_count)
+ end
+
+ def add_document_method_interface(name, param_def)
+ param_count = RPC::SOAPMethod.param_count(param_def, RPC::SOAPMethod::IN)
+ add_method_interface(name, param_count)
+ end
+
+ if RUBY_VERSION > "1.7.0"
+ def add_method_interface(name, param_count)
+ ::SOAP::Mapping.define_singleton_method(self, name) do |*arg|
+ unless arg.size == param_count
+ raise ArgumentError.new(
+ "wrong number of arguments (#{arg.size} for #{param_count})")
+ end
+ call(name, *arg)
+ end
+ self.method(name)
+ end
+ else
+ def add_method_interface(name, param_count)
+ instance_eval <<-EOS
+ def #{name}(*arg)
+ unless arg.size == #{param_count}
+ raise ArgumentError.new(
+ "wrong number of arguments (\#{arg.size} for #{param_count})")
+ end
+ call(#{name.dump}, *arg)
+ end
+ EOS
+ self.method(name)
+ end
+ end
+end
+
+
+end
+end
diff --git a/lib/soap/rpc/element.rb b/lib/soap/rpc/element.rb
new file mode 100644
index 0000000000..c224b03d0d
--- /dev/null
+++ b/lib/soap/rpc/element.rb
@@ -0,0 +1,325 @@
+# SOAP4R - RPC element definition.
+# Copyright (C) 2000, 2001, 2003, 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'soap/baseData'
+
+
+module SOAP
+
+# Add method definitions for RPC to common definition in element.rb
+class SOAPBody < SOAPStruct
+ public
+
+ def request
+ root_node
+ end
+
+ def response
+ root = root_node
+ if !@is_fault
+ if root.nil?
+ nil
+ elsif root.is_a?(SOAPBasetype)
+ root
+ else
+ # Initial element is [retval].
+ root[0]
+ end
+ else
+ root
+ end
+ end
+
+ def outparams
+ root = root_node
+ if !@is_fault and !root.nil? and !root.is_a?(SOAPBasetype)
+ op = root[1..-1]
+ op = nil if op && op.empty?
+ op
+ else
+ nil
+ end
+ end
+
+ def fault
+ if @is_fault
+ self['fault']
+ else
+ nil
+ end
+ end
+
+ def fault=(fault)
+ @is_fault = true
+ add_member('fault', fault)
+ end
+end
+
+
+module RPC
+
+
+class RPCError < Error; end
+class MethodDefinitionError < RPCError; end
+class ParameterError < RPCError; end
+
+class SOAPMethod < SOAPStruct
+ RETVAL = 'retval'
+ IN = 'in'
+ OUT = 'out'
+ INOUT = 'inout'
+
+ attr_reader :param_def
+ attr_reader :inparam
+ attr_reader :outparam
+ attr_reader :retval_name
+ attr_reader :retval_class_name
+
+ def initialize(qname, param_def = nil)
+ super(nil)
+ @elename = qname
+ @encodingstyle = nil
+
+ @param_def = param_def
+
+ @signature = []
+ @inparam_names = []
+ @inoutparam_names = []
+ @outparam_names = []
+
+ @inparam = {}
+ @outparam = {}
+ @retval_name = nil
+ @retval_class_name = nil
+
+ init_param(@param_def) if @param_def
+ end
+
+ def have_outparam?
+ @outparam_names.size > 0
+ end
+
+ def input_params
+ collect_params(IN, INOUT)
+ end
+
+ def output_params
+ collect_params(OUT, INOUT)
+ end
+
+ def set_param(params)
+ params.each do |param, data|
+ @inparam[param] = data
+ data.elename.name = param
+ data.parent = self
+ end
+ end
+
+ def set_outparam(params)
+ params.each do |param, data|
+ @outparam[param] = data
+ data.elename.name = param
+ end
+ end
+
+ def SOAPMethod.param_count(param_def, *type)
+ count = 0
+ param_def.each do |io_type, name, param_type|
+ if type.include?(io_type)
+ count += 1
+ end
+ end
+ count
+ end
+
+ def SOAPMethod.derive_rpc_param_def(obj, name, *param)
+ if param.size == 1 and param[0].is_a?(Array)
+ return param[0]
+ end
+ if param.empty?
+ method = obj.method(name)
+ param_names = (1..method.arity.abs).collect { |i| "p#{i}" }
+ else
+ param_names = param
+ end
+ create_rpc_param_def(param_names)
+ end
+
+ def SOAPMethod.create_rpc_param_def(param_names)
+ param_def = []
+ param_names.each do |param_name|
+ param_def.push([IN, param_name, nil])
+ end
+ param_def.push([RETVAL, 'return', nil])
+ param_def
+ end
+
+ def SOAPMethod.create_doc_param_def(req_qnames, res_qnames)
+ req_qnames = [req_qnames] if req_qnames.is_a?(XSD::QName)
+ res_qnames = [res_qnames] if res_qnames.is_a?(XSD::QName)
+ param_def = []
+ req_qnames.each do |qname|
+ param_def << [IN, qname.name, [nil, qname.namespace, qname.name]]
+ end
+ res_qnames.each do |qname|
+ param_def << [OUT, qname.name, [nil, qname.namespace, qname.name]]
+ end
+ param_def
+ end
+
+private
+
+ def collect_params(*type)
+ names = []
+ @signature.each do |io_type, name, param_type|
+ names << name if type.include?(io_type)
+ end
+ names
+ end
+
+ def init_param(param_def)
+ param_def.each do |io_type, name, param_type|
+ case io_type
+ when IN
+ @signature.push([IN, name, param_type])
+ @inparam_names.push(name)
+ when OUT
+ @signature.push([OUT, name, param_type])
+ @outparam_names.push(name)
+ when INOUT
+ @signature.push([INOUT, name, param_type])
+ @inoutparam_names.push(name)
+ when RETVAL
+ if @retval_name
+ raise MethodDefinitionError.new('duplicated retval')
+ end
+ @retval_name = name
+ @retval_class_name = nil
+ if param_type
+ if param_type[0].is_a?(String)
+ @retval_class_name = Mapping.class_from_name(param_type[0])
+ else
+ @retval_class_name = param_type[0]
+ end
+ end
+ else
+ raise MethodDefinitionError.new("unknown type: #{io_type}")
+ end
+ end
+ end
+end
+
+
+class SOAPMethodRequest < SOAPMethod
+ attr_accessor :soapaction
+
+ def SOAPMethodRequest.create_request(qname, *params)
+ param_def = []
+ param_value = []
+ i = 0
+ params.each do |param|
+ param_name = "p#{i}"
+ i += 1
+ param_def << [IN, param_name, nil]
+ param_value << [param_name, param]
+ end
+ param_def << [RETVAL, 'return', nil]
+ o = new(qname, param_def)
+ o.set_param(param_value)
+ o
+ end
+
+ def initialize(qname, param_def = nil, soapaction = nil)
+ check_elename(qname)
+ super(qname, param_def)
+ @soapaction = soapaction
+ end
+
+ def each
+ input_params.each do |name|
+ unless @inparam[name]
+ raise ParameterError.new("parameter: #{name} was not given")
+ end
+ yield(name, @inparam[name])
+ end
+ end
+
+ def dup
+ req = self.class.new(@elename.dup, @param_def, @soapaction)
+ req.encodingstyle = @encodingstyle
+ req
+ end
+
+ def create_method_response(response_name = nil)
+ response_name ||=
+ XSD::QName.new(@elename.namespace, @elename.name + 'Response')
+ SOAPMethodResponse.new(response_name, @param_def)
+ end
+
+private
+
+ def check_elename(qname)
+ # NCName & ruby's method name
+ unless /\A[\w_][\w\d_\-]*\z/ =~ qname.name
+ raise MethodDefinitionError.new("element name '#{qname.name}' not allowed")
+ end
+ end
+end
+
+
+class SOAPMethodResponse < SOAPMethod
+
+ def initialize(qname, param_def = nil)
+ super(qname, param_def)
+ @retval = nil
+ end
+
+ def retval=(retval)
+ @retval = retval
+ @retval.elename = @retval.elename.dup_name(@retval_name || 'return')
+ retval.parent = self
+ retval
+ end
+
+ def each
+ if @retval_name and !@retval.is_a?(SOAPVoid)
+ yield(@retval_name, @retval)
+ end
+
+ output_params.each do |name|
+ unless @outparam[name]
+ raise ParameterError.new("parameter: #{name} was not given")
+ end
+ yield(name, @outparam[name])
+ end
+ end
+end
+
+
+# To return(?) void explicitly.
+# def foo(input_var)
+# ...
+# return SOAP::RPC::SOAPVoid.new
+# end
+class SOAPVoid < XSD::XSDAnySimpleType
+ include SOAPBasetype
+ extend SOAPModuleUtils
+ Name = XSD::QName.new(Mapping::RubyCustomTypeNamespace, nil)
+
+public
+ def initialize()
+ @elename = Name
+ @id = nil
+ @precedents = []
+ @parent = nil
+ end
+end
+
+
+end
+end
diff --git a/lib/soap/rpc/httpserver.rb b/lib/soap/rpc/httpserver.rb
new file mode 100644
index 0000000000..6d2a72ebe3
--- /dev/null
+++ b/lib/soap/rpc/httpserver.rb
@@ -0,0 +1,129 @@
+# SOAP4R - WEBrick HTTP Server
+# Copyright (C) 2003, 2004 by NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'logger'
+require 'soap/rpc/soaplet'
+require 'soap/streamHandler'
+require 'webrick'
+
+
+module SOAP
+module RPC
+
+
+class HTTPServer < Logger::Application
+ attr_reader :server
+ attr_accessor :default_namespace
+
+ def initialize(config)
+ super(config[:SOAPHTTPServerApplicationName] || self.class.name)
+ @default_namespace = config[:SOAPDefaultNamespace]
+ @webrick_config = config.dup
+ self.level = Logger::Severity::ERROR # keep silent by default
+ @webrick_config[:Logger] ||= @log
+ @log = @webrick_config[:Logger] # sync logger of App and HTTPServer
+ @router = ::SOAP::RPC::Router.new(self.class.name)
+ @soaplet = ::SOAP::RPC::SOAPlet.new(@router)
+ on_init
+ @server = WEBrick::HTTPServer.new(@webrick_config)
+ @server.mount('/', @soaplet)
+ end
+
+ def on_init
+ # do extra initialization in a derived class if needed.
+ end
+
+ def status
+ @server.status if @server
+ end
+
+ def shutdown
+ @server.shutdown if @server
+ end
+
+ def mapping_registry
+ @router.mapping_registry
+ end
+
+ def mapping_registry=(mapping_registry)
+ @router.mapping_registry = mapping_registry
+ end
+
+ def generate_explicit_type
+ @router.generate_explicit_type
+ end
+
+ def generate_explicit_type=(generate_explicit_type)
+ @router.generate_explicit_type = generate_explicit_type
+ end
+
+ # servant entry interface
+
+ def add_rpc_request_servant(factory, namespace = @default_namespace)
+ @router.add_rpc_request_servant(factory, namespace)
+ end
+
+ def add_rpc_servant(obj, namespace = @default_namespace)
+ @router.add_rpc_servant(obj, namespace)
+ end
+
+ def add_request_headerhandler(factory)
+ @router.add_request_headerhandler(factory)
+ end
+
+ def add_headerhandler(obj)
+ @router.add_headerhandler(obj)
+ end
+ alias add_rpc_headerhandler add_headerhandler
+
+ # method entry interface
+
+ def add_rpc_method(obj, name, *param)
+ add_rpc_method_as(obj, name, name, *param)
+ end
+ alias add_method add_rpc_method
+
+ def add_rpc_method_as(obj, name, name_as, *param)
+ qname = XSD::QName.new(@default_namespace, name_as)
+ soapaction = nil
+ param_def = SOAPMethod.derive_rpc_param_def(obj, name, *param)
+ @router.add_rpc_operation(obj, qname, soapaction, name, param_def)
+ end
+ alias add_method_as add_rpc_method_as
+
+ def add_document_method(obj, soapaction, name, req_qnames, res_qnames)
+ param_def = SOAPMethod.create_doc_param_def(req_qnames, res_qnames)
+ @router.add_document_operation(obj, soapaction, name, param_def)
+ end
+
+ def add_rpc_operation(receiver, qname, soapaction, name, param_def, opt = {})
+ @router.add_rpc_operation(receiver, qname, soapaction, name, param_def, opt)
+ end
+
+ def add_rpc_request_operation(factory, qname, soapaction, name, param_def, opt = {})
+ @router.add_rpc_request_operation(factory, qname, soapaction, name, param_def, opt)
+ end
+
+ def add_document_operation(receiver, soapaction, name, param_def, opt = {})
+ @router.add_document_operation(receiver, soapaction, name, param_def, opt)
+ end
+
+ def add_document_request_operation(factory, soapaction, name, param_def, opt = {})
+ @router.add_document_request_operation(factory, soapaction, name, param_def, opt)
+ end
+
+private
+
+ def run
+ @server.start
+ end
+end
+
+
+end
+end
diff --git a/lib/soap/rpc/proxy.rb b/lib/soap/rpc/proxy.rb
new file mode 100644
index 0000000000..7dfda62006
--- /dev/null
+++ b/lib/soap/rpc/proxy.rb
@@ -0,0 +1,497 @@
+# SOAP4R - RPC Proxy library.
+# Copyright (C) 2000, 2003-2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'soap/soap'
+require 'soap/processor'
+require 'soap/mapping'
+require 'soap/rpc/rpc'
+require 'soap/rpc/element'
+require 'soap/streamHandler'
+require 'soap/mimemessage'
+
+
+module SOAP
+module RPC
+
+
+class Proxy
+ include SOAP
+
+public
+
+ attr_accessor :soapaction
+ attr_accessor :mandatorycharset
+ attr_accessor :allow_unqualified_element
+ attr_accessor :default_encodingstyle
+ attr_accessor :generate_explicit_type
+ attr_reader :headerhandler
+ attr_reader :streamhandler
+
+ attr_accessor :mapping_registry
+ attr_accessor :literal_mapping_registry
+
+ attr_reader :operation
+
+ def initialize(endpoint_url, soapaction, options)
+ @endpoint_url = endpoint_url
+ @soapaction = soapaction
+ @options = options
+ @streamhandler = HTTPStreamHandler.new(
+ @options["protocol.http"] ||= ::SOAP::Property.new)
+ @operation = {}
+ @mandatorycharset = nil
+ @allow_unqualified_element = true
+ @default_encodingstyle = nil
+ @generate_explicit_type = true
+ @headerhandler = Header::HandlerSet.new
+ @mapping_registry = nil
+ @literal_mapping_registry = ::SOAP::Mapping::WSDLLiteralRegistry.new
+ end
+
+ def inspect
+ "#<#{self.class}:#{@endpoint_url}>"
+ end
+
+ def endpoint_url
+ @endpoint_url
+ end
+
+ def endpoint_url=(endpoint_url)
+ @endpoint_url = endpoint_url
+ reset_stream
+ end
+
+ def reset_stream
+ @streamhandler.reset(@endpoint_url)
+ end
+
+ def set_wiredump_file_base(wiredump_file_base)
+ @streamhandler.wiredump_file_base = wiredump_file_base
+ end
+
+ def test_loopback_response
+ @streamhandler.test_loopback_response
+ end
+
+ def add_rpc_operation(qname, soapaction, name, param_def, opt = {})
+ opt[:request_qname] = qname
+ opt[:request_style] ||= :rpc
+ opt[:response_style] ||= :rpc
+ opt[:request_use] ||= :encoded
+ opt[:response_use] ||= :encoded
+ @operation[name] = Operation.new(soapaction, param_def, opt)
+ end
+
+ def add_document_operation(soapaction, name, param_def, opt = {})
+ opt[:request_style] ||= :document
+ opt[:response_style] ||= :document
+ opt[:request_use] ||= :literal
+ opt[:response_use] ||= :literal
+ # default values of these values are unqualified in XML Schema.
+ # set true for backward compatibility.
+ unless opt.key?(:elementformdefault)
+ opt[:elementformdefault] = true
+ end
+ unless opt.key?(:attributeformdefault)
+ opt[:attributeformdefault] = true
+ end
+ @operation[name] = Operation.new(soapaction, param_def, opt)
+ end
+
+ # add_method is for shortcut of typical rpc/encoded method definition.
+ alias add_method add_rpc_operation
+ alias add_rpc_method add_rpc_operation
+ alias add_document_method add_document_operation
+
+ def invoke(req_header, req_body, opt = nil)
+ opt ||= create_encoding_opt
+ route(req_header, req_body, opt, opt)
+ end
+
+ def call(name, *params)
+ unless op_info = @operation[name]
+ raise MethodDefinitionError, "method: #{name} not defined"
+ end
+ mapping_opt = create_mapping_opt
+ req_header = create_request_header
+ req_body = SOAPBody.new(
+ op_info.request_body(params, @mapping_registry,
+ @literal_mapping_registry, mapping_opt)
+ )
+ reqopt = create_encoding_opt(
+ :soapaction => op_info.soapaction || @soapaction,
+ :envelopenamespace => @options["soap.envelope.requestnamespace"],
+ :default_encodingstyle =>
+ @default_encodingstyle || op_info.request_default_encodingstyle,
+ :elementformdefault => op_info.elementformdefault,
+ :attributeformdefault => op_info.attributeformdefault
+ )
+ resopt = create_encoding_opt(
+ :envelopenamespace => @options["soap.envelope.responsenamespace"],
+ :default_encodingstyle =>
+ @default_encodingstyle || op_info.response_default_encodingstyle,
+ :elementformdefault => op_info.elementformdefault,
+ :attributeformdefault => op_info.attributeformdefault
+ )
+ env = route(req_header, req_body, reqopt, resopt)
+ raise EmptyResponseError unless env
+ receive_headers(env.header)
+ begin
+ check_fault(env.body)
+ rescue ::SOAP::FaultError => e
+ op_info.raise_fault(e, @mapping_registry, @literal_mapping_registry)
+ end
+ op_info.response_obj(env.body, @mapping_registry,
+ @literal_mapping_registry, mapping_opt)
+ end
+
+ def route(req_header, req_body, reqopt, resopt)
+ req_env = ::SOAP::SOAPEnvelope.new(req_header, req_body)
+ unless reqopt[:envelopenamespace].nil?
+ set_envelopenamespace(req_env, reqopt[:envelopenamespace])
+ end
+ reqopt[:external_content] = nil
+ conn_data = marshal(req_env, reqopt)
+ if ext = reqopt[:external_content]
+ mime = MIMEMessage.new
+ ext.each do |k, v|
+ mime.add_attachment(v.data)
+ end
+ mime.add_part(conn_data.send_string + "\r\n")
+ mime.close
+ conn_data.send_string = mime.content_str
+ conn_data.send_contenttype = mime.headers['content-type'].str
+ end
+ conn_data = @streamhandler.send(@endpoint_url, conn_data,
+ reqopt[:soapaction])
+ if conn_data.receive_string.empty?
+ return nil
+ end
+ unmarshal(conn_data, resopt)
+ end
+
+ def check_fault(body)
+ if body.fault
+ raise SOAP::FaultError.new(body.fault)
+ end
+ end
+
+private
+
+ def set_envelopenamespace(env, namespace)
+ env.elename = XSD::QName.new(namespace, env.elename.name)
+ if env.header
+ env.header.elename = XSD::QName.new(namespace, env.header.elename.name)
+ end
+ if env.body
+ env.body.elename = XSD::QName.new(namespace, env.body.elename.name)
+ end
+ end
+
+ def create_request_header
+ headers = @headerhandler.on_outbound
+ if headers.empty?
+ nil
+ else
+ h = ::SOAP::SOAPHeader.new
+ headers.each do |header|
+ h.add(header.elename.name, header)
+ end
+ h
+ end
+ end
+
+ def receive_headers(headers)
+ @headerhandler.on_inbound(headers) if headers
+ end
+
+ def marshal(env, opt)
+ send_string = Processor.marshal(env, opt)
+ StreamHandler::ConnectionData.new(send_string)
+ end
+
+ def unmarshal(conn_data, opt)
+ contenttype = conn_data.receive_contenttype
+ if /#{MIMEMessage::MultipartContentType}/i =~ contenttype
+ opt[:external_content] = {}
+ mime = MIMEMessage.parse("Content-Type: " + contenttype,
+ conn_data.receive_string)
+ mime.parts.each do |part|
+ value = Attachment.new(part.content)
+ value.contentid = part.contentid
+ obj = SOAPAttachment.new(value)
+ opt[:external_content][value.contentid] = obj if value.contentid
+ end
+ opt[:charset] = @mandatorycharset ||
+ StreamHandler.parse_media_type(mime.root.headers['content-type'].str)
+ env = Processor.unmarshal(mime.root.content, opt)
+ else
+ opt[:charset] = @mandatorycharset ||
+ ::SOAP::StreamHandler.parse_media_type(contenttype)
+ env = Processor.unmarshal(conn_data.receive_string, opt)
+ end
+ unless env.is_a?(::SOAP::SOAPEnvelope)
+ raise ResponseFormatError.new(
+ "response is not a SOAP envelope: #{conn_data.receive_string}")
+ end
+ env
+ end
+
+ def create_header(headers)
+ header = SOAPHeader.new()
+ headers.each do |content, mustunderstand, encodingstyle|
+ header.add(SOAPHeaderItem.new(content, mustunderstand, encodingstyle))
+ end
+ header
+ end
+
+ def create_encoding_opt(hash = nil)
+ opt = {}
+ opt[:default_encodingstyle] = @default_encodingstyle
+ opt[:allow_unqualified_element] = @allow_unqualified_element
+ opt[:generate_explicit_type] = @generate_explicit_type
+ opt[:no_indent] = @options["soap.envelope.no_indent"]
+ opt[:use_numeric_character_reference] =
+ @options["soap.envelope.use_numeric_character_reference"]
+ opt.update(hash) if hash
+ opt
+ end
+
+ def create_mapping_opt(hash = nil)
+ opt = {
+ :external_ces => @options["soap.mapping.external_ces"]
+ }
+ opt.update(hash) if hash
+ opt
+ end
+
+ class Operation
+ attr_reader :soapaction
+ attr_reader :request_style
+ attr_reader :response_style
+ attr_reader :request_use
+ attr_reader :response_use
+ attr_reader :elementformdefault
+ attr_reader :attributeformdefault
+
+ def initialize(soapaction, param_def, opt)
+ @soapaction = soapaction
+ @request_style = opt[:request_style]
+ @response_style = opt[:response_style]
+ @request_use = opt[:request_use]
+ @response_use = opt[:response_use]
+ # set nil(unqualified) by default
+ @elementformdefault = opt[:elementformdefault]
+ @attributeformdefault = opt[:attributeformdefault]
+ check_style(@request_style)
+ check_style(@response_style)
+ check_use(@request_use)
+ check_use(@response_use)
+ if @request_style == :rpc
+ @rpc_request_qname = opt[:request_qname]
+ if @rpc_request_qname.nil?
+ raise MethodDefinitionError.new("rpc_request_qname must be given")
+ end
+ @rpc_method_factory =
+ RPC::SOAPMethodRequest.new(@rpc_request_qname, param_def, @soapaction)
+ else
+ @doc_request_qnames = []
+ @doc_request_qualified = []
+ @doc_response_qnames = []
+ @doc_response_qualified = []
+ param_def.each do |inout, paramname, typeinfo, eleinfo|
+ klass_not_used, nsdef, namedef = typeinfo
+ qualified = eleinfo
+ if namedef.nil?
+ raise MethodDefinitionError.new("qname must be given")
+ end
+ case inout
+ when SOAPMethod::IN
+ @doc_request_qnames << XSD::QName.new(nsdef, namedef)
+ @doc_request_qualified << qualified
+ when SOAPMethod::OUT
+ @doc_response_qnames << XSD::QName.new(nsdef, namedef)
+ @doc_response_qualified << qualified
+ else
+ raise MethodDefinitionError.new(
+ "illegal inout definition for document style: #{inout}")
+ end
+ end
+ end
+ end
+
+ def request_default_encodingstyle
+ (@request_use == :encoded) ? EncodingNamespace : LiteralNamespace
+ end
+
+ def response_default_encodingstyle
+ (@response_use == :encoded) ? EncodingNamespace : LiteralNamespace
+ end
+
+ def request_body(values, mapping_registry, literal_mapping_registry, opt)
+ if @request_style == :rpc
+ request_rpc(values, mapping_registry, literal_mapping_registry, opt)
+ else
+ request_doc(values, mapping_registry, literal_mapping_registry, opt)
+ end
+ end
+
+ def response_obj(body, mapping_registry, literal_mapping_registry, opt)
+ if @response_style == :rpc
+ response_rpc(body, mapping_registry, literal_mapping_registry, opt)
+ else
+ response_doc(body, mapping_registry, literal_mapping_registry, opt)
+ end
+ end
+
+ def raise_fault(e, mapping_registry, literal_mapping_registry)
+ if @response_style == :rpc
+ Mapping.fault2exception(e, mapping_registry)
+ else
+ Mapping.fault2exception(e, literal_mapping_registry)
+ end
+ end
+
+ private
+
+ def check_style(style)
+ unless [:rpc, :document].include?(style)
+ raise MethodDefinitionError.new("unknown style: #{style}")
+ end
+ end
+
+ def check_use(use)
+ unless [:encoded, :literal].include?(use)
+ raise MethodDefinitionError.new("unknown use: #{use}")
+ end
+ end
+
+ def request_rpc(values, mapping_registry, literal_mapping_registry, opt)
+ if @request_use == :encoded
+ request_rpc_enc(values, mapping_registry, opt)
+ else
+ request_rpc_lit(values, literal_mapping_registry, opt)
+ end
+ end
+
+ def request_doc(values, mapping_registry, literal_mapping_registry, opt)
+ if @request_use == :encoded
+ request_doc_enc(values, mapping_registry, opt)
+ else
+ request_doc_lit(values, literal_mapping_registry, opt)
+ end
+ end
+
+ def request_rpc_enc(values, mapping_registry, opt)
+ method = @rpc_method_factory.dup
+ names = method.input_params
+ obj = create_request_obj(names, values)
+ soap = Mapping.obj2soap(obj, mapping_registry, @rpc_request_qname, opt)
+ method.set_param(soap)
+ method
+ end
+
+ def request_rpc_lit(values, mapping_registry, opt)
+ method = @rpc_method_factory.dup
+ params = {}
+ idx = 0
+ method.input_params.each do |name|
+ params[name] = Mapping.obj2soap(values[idx], mapping_registry,
+ XSD::QName.new(nil, name), opt)
+ idx += 1
+ end
+ method.set_param(params)
+ method
+ end
+
+ def request_doc_enc(values, mapping_registry, opt)
+ (0...values.size).collect { |idx|
+ ele = Mapping.obj2soap(values[idx], mapping_registry, nil, opt)
+ ele.elename = @doc_request_qnames[idx]
+ ele
+ }
+ end
+
+ def request_doc_lit(values, mapping_registry, opt)
+ (0...values.size).collect { |idx|
+ ele = Mapping.obj2soap(values[idx], mapping_registry,
+ @doc_request_qnames[idx], opt)
+ ele.encodingstyle = LiteralNamespace
+ if ele.respond_to?(:qualified)
+ ele.qualified = @doc_request_qualified[idx]
+ end
+ ele
+ }
+ end
+
+ def response_rpc(body, mapping_registry, literal_mapping_registry, opt)
+ if @response_use == :encoded
+ response_rpc_enc(body, mapping_registry, opt)
+ else
+ response_rpc_lit(body, literal_mapping_registry, opt)
+ end
+ end
+
+ def response_doc(body, mapping_registry, literal_mapping_registry, opt)
+ if @response_use == :encoded
+ return *response_doc_enc(body, mapping_registry, opt)
+ else
+ return *response_doc_lit(body, literal_mapping_registry, opt)
+ end
+ end
+
+ def response_rpc_enc(body, mapping_registry, opt)
+ ret = nil
+ if body.response
+ ret = Mapping.soap2obj(body.response, mapping_registry,
+ @rpc_method_factory.retval_class_name, opt)
+ end
+ if body.outparams
+ outparams = body.outparams.collect { |outparam|
+ Mapping.soap2obj(outparam, mapping_registry, nil, opt)
+ }
+ [ret].concat(outparams)
+ else
+ ret
+ end
+ end
+
+ def response_rpc_lit(body, mapping_registry, opt)
+ body.root_node.collect { |key, value|
+ Mapping.soap2obj(value, mapping_registry,
+ @rpc_method_factory.retval_class_name, opt)
+ }
+ end
+
+ def response_doc_enc(body, mapping_registry, opt)
+ body.collect { |key, value|
+ Mapping.soap2obj(value, mapping_registry, nil, opt)
+ }
+ end
+
+ def response_doc_lit(body, mapping_registry, opt)
+ body.collect { |key, value|
+ Mapping.soap2obj(value, mapping_registry)
+ }
+ end
+
+ def create_request_obj(names, params)
+ o = Object.new
+ idx = 0
+ while idx < params.length
+ o.instance_variable_set('@' + names[idx], params[idx])
+ idx += 1
+ end
+ o
+ end
+ end
+end
+
+
+end
+end
diff --git a/lib/soap/rpc/router.rb b/lib/soap/rpc/router.rb
new file mode 100644
index 0000000000..71c6eb625b
--- /dev/null
+++ b/lib/soap/rpc/router.rb
@@ -0,0 +1,594 @@
+# SOAP4R - RPC Routing library
+# Copyright (C) 2001, 2002, 2004, 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'soap/soap'
+require 'soap/processor'
+require 'soap/mapping'
+require 'soap/mapping/wsdlliteralregistry'
+require 'soap/rpc/rpc'
+require 'soap/rpc/element'
+require 'soap/streamHandler'
+require 'soap/mimemessage'
+require 'soap/header/handlerset'
+
+
+module SOAP
+module RPC
+
+
+class Router
+ include SOAP
+
+ attr_reader :actor
+ attr_accessor :mapping_registry
+ attr_accessor :literal_mapping_registry
+ attr_accessor :generate_explicit_type
+ attr_accessor :external_ces
+
+ def initialize(actor)
+ @actor = actor
+ @mapping_registry = nil
+ @headerhandler = Header::HandlerSet.new
+ @literal_mapping_registry = ::SOAP::Mapping::WSDLLiteralRegistry.new
+ @generate_explicit_type = true
+ @external_ces = nil
+ @operation_by_soapaction = {}
+ @operation_by_qname = {}
+ @headerhandlerfactory = []
+ end
+
+ ###
+ ## header handler interface
+ #
+ def add_request_headerhandler(factory)
+ unless factory.respond_to?(:create)
+ raise TypeError.new("factory must respond to 'create'")
+ end
+ @headerhandlerfactory << factory
+ end
+
+ def add_headerhandler(handler)
+ @headerhandler.add(handler)
+ end
+
+ ###
+ ## servant definition interface
+ #
+ def add_rpc_request_servant(factory, namespace)
+ unless factory.respond_to?(:create)
+ raise TypeError.new("factory must respond to 'create'")
+ end
+ obj = factory.create # a dummy instance for introspection
+ ::SOAP::RPC.defined_methods(obj).each do |name|
+ begin
+ qname = XSD::QName.new(namespace, name)
+ param_def = ::SOAP::RPC::SOAPMethod.derive_rpc_param_def(obj, name)
+ opt = create_styleuse_option(:rpc, :encoded)
+ add_rpc_request_operation(factory, qname, nil, name, param_def, opt)
+ rescue SOAP::RPC::MethodDefinitionError => e
+ p e if $DEBUG
+ end
+ end
+ end
+
+ def add_rpc_servant(obj, namespace)
+ ::SOAP::RPC.defined_methods(obj).each do |name|
+ begin
+ qname = XSD::QName.new(namespace, name)
+ param_def = ::SOAP::RPC::SOAPMethod.derive_rpc_param_def(obj, name)
+ opt = create_styleuse_option(:rpc, :encoded)
+ add_rpc_operation(obj, qname, nil, name, param_def, opt)
+ rescue SOAP::RPC::MethodDefinitionError => e
+ p e if $DEBUG
+ end
+ end
+ end
+ alias add_servant add_rpc_servant
+
+ ###
+ ## operation definition interface
+ #
+ def add_rpc_operation(receiver, qname, soapaction, name, param_def, opt = {})
+ ensure_styleuse_option(opt, :rpc, :encoded)
+ opt[:request_qname] = qname
+ op = ApplicationScopeOperation.new(soapaction, receiver, name, param_def,
+ opt)
+ if opt[:request_style] != :rpc
+ raise RPCRoutingError.new("illegal request_style given")
+ end
+ assign_operation(soapaction, qname, op)
+ end
+ alias add_method add_rpc_operation
+ alias add_rpc_method add_rpc_operation
+
+ def add_rpc_request_operation(factory, qname, soapaction, name, param_def, opt = {})
+ ensure_styleuse_option(opt, :rpc, :encoded)
+ opt[:request_qname] = qname
+ op = RequestScopeOperation.new(soapaction, factory, name, param_def, opt)
+ if opt[:request_style] != :rpc
+ raise RPCRoutingError.new("illegal request_style given")
+ end
+ assign_operation(soapaction, qname, op)
+ end
+
+ def add_document_operation(receiver, soapaction, name, param_def, opt = {})
+ #
+ # adopt workaround for doc/lit wrapper method
+ # (you should consider to simply use rpc/lit service)
+ #
+ #unless soapaction
+ # raise RPCRoutingError.new("soapaction is a must for document method")
+ #end
+ ensure_styleuse_option(opt, :document, :literal)
+ op = ApplicationScopeOperation.new(soapaction, receiver, name, param_def,
+ opt)
+ if opt[:request_style] != :document
+ raise RPCRoutingError.new("illegal request_style given")
+ end
+ assign_operation(soapaction, first_input_part_qname(param_def), op)
+ end
+ alias add_document_method add_document_operation
+
+ def add_document_request_operation(factory, soapaction, name, param_def, opt = {})
+ #
+ # adopt workaround for doc/lit wrapper method
+ # (you should consider to simply use rpc/lit service)
+ #
+ #unless soapaction
+ # raise RPCRoutingError.new("soapaction is a must for document method")
+ #end
+ ensure_styleuse_option(opt, :document, :literal)
+ op = RequestScopeOperation.new(soapaction, receiver, name, param_def, opt)
+ if opt[:request_style] != :document
+ raise RPCRoutingError.new("illegal request_style given")
+ end
+ assign_operation(soapaction, first_input_part_qname(param_def), op)
+ end
+
+ def route(conn_data)
+ # we cannot set request_default_encodingsyle before parsing the content.
+ env = unmarshal(conn_data)
+ if env.nil?
+ raise ArgumentError.new("illegal SOAP marshal format")
+ end
+ op = lookup_operation(conn_data.soapaction, env.body)
+ headerhandler = @headerhandler.dup
+ @headerhandlerfactory.each do |f|
+ headerhandler.add(f.create)
+ end
+ receive_headers(headerhandler, env.header)
+ soap_response = default_encodingstyle = nil
+ begin
+ soap_response =
+ op.call(env.body, @mapping_registry, @literal_mapping_registry,
+ create_mapping_opt)
+ default_encodingstyle = op.response_default_encodingstyle
+ rescue Exception
+ soap_response = fault($!)
+ default_encodingstyle = nil
+ end
+ conn_data.is_fault = true if soap_response.is_a?(SOAPFault)
+ header = call_headers(headerhandler)
+ body = SOAPBody.new(soap_response)
+ env = SOAPEnvelope.new(header, body)
+ marshal(conn_data, env, default_encodingstyle)
+ end
+
+ # Create fault response string.
+ def create_fault_response(e)
+ env = SOAPEnvelope.new(SOAPHeader.new, SOAPBody.new(fault(e)))
+ opt = {}
+ opt[:external_content] = nil
+ response_string = Processor.marshal(env, opt)
+ conn_data = StreamHandler::ConnectionData.new(response_string)
+ conn_data.is_fault = true
+ if ext = opt[:external_content]
+ mimeize(conn_data, ext)
+ end
+ conn_data
+ end
+
+private
+
+ def first_input_part_qname(param_def)
+ param_def.each do |inout, paramname, typeinfo|
+ if inout == SOAPMethod::IN
+ klass, nsdef, namedef = typeinfo
+ return XSD::QName.new(nsdef, namedef)
+ end
+ end
+ nil
+ end
+
+ def create_styleuse_option(style, use)
+ opt = {}
+ opt[:request_style] = opt[:response_style] = style
+ opt[:request_use] = opt[:response_use] = use
+ opt
+ end
+
+ def ensure_styleuse_option(opt, style, use)
+ opt[:request_style] ||= style
+ opt[:response_style] ||= style
+ opt[:request_use] ||= use
+ opt[:response_use] ||= use
+ end
+
+ def assign_operation(soapaction, qname, op)
+ assigned = false
+ if soapaction and !soapaction.empty?
+ @operation_by_soapaction[soapaction] = op
+ assigned = true
+ end
+ if qname
+ @operation_by_qname[qname] = op
+ assigned = true
+ end
+ unless assigned
+ raise RPCRoutingError.new("cannot assign operation")
+ end
+ end
+
+ def lookup_operation(soapaction, body)
+ if op = @operation_by_soapaction[soapaction]
+ return op
+ end
+ qname = body.root_node.elename
+ if op = @operation_by_qname[qname]
+ return op
+ end
+ if soapaction
+ raise RPCRoutingError.new(
+ "operation: #{soapaction} #{qname} not supported")
+ else
+ raise RPCRoutingError.new("operation: #{qname} not supported")
+ end
+ end
+
+ def call_headers(headerhandler)
+ headers = headerhandler.on_outbound
+ if headers.empty?
+ nil
+ else
+ h = ::SOAP::SOAPHeader.new
+ headers.each do |header|
+ h.add(header.elename.name, header)
+ end
+ h
+ end
+ end
+
+ def receive_headers(headerhandler, headers)
+ headerhandler.on_inbound(headers) if headers
+ end
+
+ def unmarshal(conn_data)
+ opt = {}
+ contenttype = conn_data.receive_contenttype
+ if /#{MIMEMessage::MultipartContentType}/i =~ contenttype
+ opt[:external_content] = {}
+ mime = MIMEMessage.parse("Content-Type: " + contenttype,
+ conn_data.receive_string)
+ mime.parts.each do |part|
+ value = Attachment.new(part.content)
+ value.contentid = part.contentid
+ obj = SOAPAttachment.new(value)
+ opt[:external_content][value.contentid] = obj if value.contentid
+ end
+ opt[:charset] =
+ StreamHandler.parse_media_type(mime.root.headers['content-type'].str)
+ env = Processor.unmarshal(mime.root.content, opt)
+ else
+ opt[:charset] = ::SOAP::StreamHandler.parse_media_type(contenttype)
+ env = Processor.unmarshal(conn_data.receive_string, opt)
+ end
+ charset = opt[:charset]
+ conn_data.send_contenttype = "text/xml; charset=\"#{charset}\""
+ env
+ end
+
+ def marshal(conn_data, env, default_encodingstyle = nil)
+ opt = {}
+ opt[:external_content] = nil
+ opt[:default_encodingstyle] = default_encodingstyle
+ opt[:generate_explicit_type] = @generate_explicit_type
+ response_string = Processor.marshal(env, opt)
+ conn_data.send_string = response_string
+ if ext = opt[:external_content]
+ mimeize(conn_data, ext)
+ end
+ conn_data
+ end
+
+ def mimeize(conn_data, ext)
+ mime = MIMEMessage.new
+ ext.each do |k, v|
+ mime.add_attachment(v.data)
+ end
+ mime.add_part(conn_data.send_string + "\r\n")
+ mime.close
+ conn_data.send_string = mime.content_str
+ conn_data.send_contenttype = mime.headers['content-type'].str
+ conn_data
+ end
+
+ # Create fault response.
+ def fault(e)
+ detail = Mapping::SOAPException.new(e)
+ SOAPFault.new(
+ SOAPString.new('Server'),
+ SOAPString.new(e.to_s),
+ SOAPString.new(@actor),
+ Mapping.obj2soap(detail, @mapping_registry))
+ end
+
+ def create_mapping_opt
+ { :external_ces => @external_ces }
+ end
+
+ class Operation
+ attr_reader :name
+ attr_reader :soapaction
+ attr_reader :request_style
+ attr_reader :response_style
+ attr_reader :request_use
+ attr_reader :response_use
+
+ def initialize(soapaction, name, param_def, opt)
+ @soapaction = soapaction
+ @name = name
+ @request_style = opt[:request_style]
+ @response_style = opt[:response_style]
+ @request_use = opt[:request_use]
+ @response_use = opt[:response_use]
+ check_style(@request_style)
+ check_style(@response_style)
+ check_use(@request_use)
+ check_use(@response_use)
+ if @response_style == :rpc
+ request_qname = opt[:request_qname] or raise
+ @rpc_method_factory =
+ RPC::SOAPMethodRequest.new(request_qname, param_def, @soapaction)
+ @rpc_response_qname = opt[:response_qname]
+ else
+ @doc_request_qnames = []
+ @doc_request_qualified = []
+ @doc_response_qnames = []
+ @doc_response_qualified = []
+ param_def.each do |inout, paramname, typeinfo, eleinfo|
+ klass, nsdef, namedef = typeinfo
+ qualified = eleinfo
+ case inout
+ when SOAPMethod::IN
+ @doc_request_qnames << XSD::QName.new(nsdef, namedef)
+ @doc_request_qualified << qualified
+ when SOAPMethod::OUT
+ @doc_response_qnames << XSD::QName.new(nsdef, namedef)
+ @doc_response_qualified << qualified
+ else
+ raise ArgumentError.new(
+ "illegal inout definition for document style: #{inout}")
+ end
+ end
+ end
+ end
+
+ def request_default_encodingstyle
+ (@request_use == :encoded) ? EncodingNamespace : LiteralNamespace
+ end
+
+ def response_default_encodingstyle
+ (@response_use == :encoded) ? EncodingNamespace : LiteralNamespace
+ end
+
+ def call(body, mapping_registry, literal_mapping_registry, opt)
+ if @request_style == :rpc
+ values = request_rpc(body, mapping_registry, literal_mapping_registry,
+ opt)
+ else
+ values = request_document(body, mapping_registry,
+ literal_mapping_registry, opt)
+ end
+ result = receiver.method(@name.intern).call(*values)
+ return result if result.is_a?(SOAPFault)
+ if @response_style == :rpc
+ response_rpc(result, mapping_registry, literal_mapping_registry, opt)
+ else
+ response_doc(result, mapping_registry, literal_mapping_registry, opt)
+ end
+ end
+
+ private
+
+ def receiver
+ raise NotImplementedError.new('must be defined in derived class')
+ end
+
+ def request_rpc(body, mapping_registry, literal_mapping_registry, opt)
+ request = body.request
+ unless request.is_a?(SOAPStruct)
+ raise RPCRoutingError.new("not an RPC style")
+ end
+ if @request_use == :encoded
+ request_rpc_enc(request, mapping_registry, opt)
+ else
+ request_rpc_lit(request, literal_mapping_registry, opt)
+ end
+ end
+
+ def request_document(body, mapping_registry, literal_mapping_registry, opt)
+ # ToDo: compare names with @doc_request_qnames
+ if @request_use == :encoded
+ request_doc_enc(body, mapping_registry, opt)
+ else
+ request_doc_lit(body, literal_mapping_registry, opt)
+ end
+ end
+
+ def request_rpc_enc(request, mapping_registry, opt)
+ param = Mapping.soap2obj(request, mapping_registry, nil, opt)
+ request.collect { |key, value|
+ param[key]
+ }
+ end
+
+ def request_rpc_lit(request, mapping_registry, opt)
+ request.collect { |key, value|
+ Mapping.soap2obj(value, mapping_registry, nil, opt)
+ }
+ end
+
+ def request_doc_enc(body, mapping_registry, opt)
+ body.collect { |key, value|
+ Mapping.soap2obj(value, mapping_registry, nil, opt)
+ }
+ end
+
+ def request_doc_lit(body, mapping_registry, opt)
+ body.collect { |key, value|
+ Mapping.soap2obj(value, mapping_registry, nil, opt)
+ }
+ end
+
+ def response_rpc(result, mapping_registry, literal_mapping_registry, opt)
+ if @response_use == :encoded
+ response_rpc_enc(result, mapping_registry, opt)
+ else
+ response_rpc_lit(result, literal_mapping_registry, opt)
+ end
+ end
+
+ def response_doc(result, mapping_registry, literal_mapping_registry, opt)
+ if @doc_response_qnames.size == 1 and !result.is_a?(Array)
+ result = [result]
+ end
+ if result.size != @doc_response_qnames.size
+ raise "required #{@doc_response_qnames.size} responses " +
+ "but #{result.size} given"
+ end
+ if @response_use == :encoded
+ response_doc_enc(result, mapping_registry, opt)
+ else
+ response_doc_lit(result, literal_mapping_registry, opt)
+ end
+ end
+
+ def response_rpc_enc(result, mapping_registry, opt)
+ soap_response =
+ @rpc_method_factory.create_method_response(@rpc_response_qname)
+ if soap_response.have_outparam?
+ unless result.is_a?(Array)
+ raise RPCRoutingError.new("out parameter was not returned")
+ end
+ outparams = {}
+ i = 1
+ soap_response.output_params.each do |outparam|
+ outparams[outparam] = Mapping.obj2soap(result[i], mapping_registry,
+ nil, opt)
+ i += 1
+ end
+ soap_response.set_outparam(outparams)
+ soap_response.retval = Mapping.obj2soap(result[0], mapping_registry,
+ nil, opt)
+ else
+ soap_response.retval = Mapping.obj2soap(result, mapping_registry, nil,
+ opt)
+ end
+ soap_response
+ end
+
+ def response_rpc_lit(result, mapping_registry, opt)
+ soap_response =
+ @rpc_method_factory.create_method_response(@rpc_response_qname)
+ if soap_response.have_outparam?
+ unless result.is_a?(Array)
+ raise RPCRoutingError.new("out parameter was not returned")
+ end
+ outparams = {}
+ i = 1
+ soap_response.output_params.each do |outparam|
+ outparams[outparam] = Mapping.obj2soap(result[i], mapping_registry,
+ XSD::QName.new(nil, outparam), opt)
+ i += 1
+ end
+ soap_response.set_outparam(outparams)
+ soap_response.retval = Mapping.obj2soap(result[0], mapping_registry,
+ XSD::QName.new(nil, soap_response.elename), opt)
+ else
+ soap_response.retval = Mapping.obj2soap(result, mapping_registry,
+ XSD::QName.new(nil, soap_response.elename), opt)
+ end
+ soap_response
+ end
+
+ def response_doc_enc(result, mapping_registry, opt)
+ (0...result.size).collect { |idx|
+ ele = Mapping.obj2soap(result[idx], mapping_registry, nil, opt)
+ ele.elename = @doc_response_qnames[idx]
+ ele
+ }
+ end
+
+ def response_doc_lit(result, mapping_registry, opt)
+ (0...result.size).collect { |idx|
+ ele = Mapping.obj2soap(result[idx], mapping_registry,
+ @doc_response_qnames[idx])
+ ele.encodingstyle = LiteralNamespace
+ if ele.respond_to?(:qualified)
+ ele.qualified = @doc_response_qualified[idx]
+ end
+ ele
+ }
+ end
+
+ def check_style(style)
+ unless [:rpc, :document].include?(style)
+ raise ArgumentError.new("unknown style: #{style}")
+ end
+ end
+
+ def check_use(use)
+ unless [:encoded, :literal].include?(use)
+ raise ArgumentError.new("unknown use: #{use}")
+ end
+ end
+ end
+
+ class ApplicationScopeOperation < Operation
+ def initialize(soapaction, receiver, name, param_def, opt)
+ super(soapaction, name, param_def, opt)
+ @receiver = receiver
+ end
+
+ private
+
+ def receiver
+ @receiver
+ end
+ end
+
+ class RequestScopeOperation < Operation
+ def initialize(soapaction, receiver_factory, name, param_def, opt)
+ super(soapaction, name, param_def, opt)
+ unless receiver_factory.respond_to?(:create)
+ raise TypeError.new("factory must respond to 'create'")
+ end
+ @receiver_factory = receiver_factory
+ end
+
+ private
+
+ def receiver
+ @receiver_factory.create
+ end
+ end
+end
+
+
+end
+end
diff --git a/lib/soap/rpc/rpc.rb b/lib/soap/rpc/rpc.rb
new file mode 100644
index 0000000000..a48b525dbb
--- /dev/null
+++ b/lib/soap/rpc/rpc.rb
@@ -0,0 +1,25 @@
+# SOAP4R - RPC utility.
+# Copyright (C) 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+module SOAP
+
+
+module RPC
+ ServerException = Mapping::MappedException
+
+ def self.defined_methods(obj)
+ if obj.is_a?(Module)
+ obj.methods - Module.methods
+ else
+ obj.methods - Object.instance_methods(true)
+ end
+ end
+end
+
+
+end
diff --git a/lib/soap/rpc/soaplet.rb b/lib/soap/rpc/soaplet.rb
new file mode 100644
index 0000000000..7cccdd3e31
--- /dev/null
+++ b/lib/soap/rpc/soaplet.rb
@@ -0,0 +1,162 @@
+# SOAP4R - SOAP handler servlet for WEBrick
+# Copyright (C) 2001-2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'webrick/httpservlet/abstract'
+require 'webrick/httpstatus'
+require 'soap/rpc/router'
+require 'soap/streamHandler'
+begin
+ require 'stringio'
+ require 'zlib'
+rescue LoadError
+ warn("Loading stringio or zlib failed. No gzipped response supported.") if $DEBUG
+end
+
+
+warn("Overriding WEBrick::Log#debug") if $DEBUG
+require 'webrick/log'
+module WEBrick
+ class Log < BasicLog
+ alias __debug debug
+ def debug(msg = nil)
+ if block_given? and msg.nil?
+ __debug(yield)
+ else
+ __debug(msg)
+ end
+ end
+ end
+end
+
+
+module SOAP
+module RPC
+
+
+class SOAPlet < WEBrick::HTTPServlet::AbstractServlet
+public
+ attr_reader :options
+
+ def initialize(router = nil)
+ @router = router || ::SOAP::RPC::Router.new(self.class.name)
+ @options = {}
+ @config = {}
+ end
+
+ # for backward compatibility
+ def app_scope_router
+ @router
+ end
+
+ # for backward compatibility
+ def add_servant(obj, namespace)
+ @router.add_rpc_servant(obj, namespace)
+ end
+
+ def allow_content_encoding_gzip=(allow)
+ @options[:allow_content_encoding_gzip] = allow
+ end
+
+ ###
+ ## Servlet interfaces for WEBrick.
+ #
+ def get_instance(config, *options)
+ @config = config
+ self
+ end
+
+ def require_path_info?
+ false
+ end
+
+ def do_GET(req, res)
+ res.header['Allow'] = 'POST'
+ raise WEBrick::HTTPStatus::MethodNotAllowed, "GET request not allowed"
+ end
+
+ def do_POST(req, res)
+ logger.debug { "SOAP request: " + req.body } if logger
+ begin
+ conn_data = ::SOAP::StreamHandler::ConnectionData.new
+ setup_req(conn_data, req)
+ @router.external_ces = @options[:external_ces]
+ conn_data = @router.route(conn_data)
+ setup_res(conn_data, req, res)
+ rescue Exception => e
+ conn_data = @router.create_fault_response(e)
+ res.status = WEBrick::HTTPStatus::RC_INTERNAL_SERVER_ERROR
+ res.body = conn_data.send_string
+ res['content-type'] = conn_data.send_contenttype || "text/xml"
+ end
+ if res.body.is_a?(IO)
+ res.chunked = true
+ logger.debug { "SOAP response: (chunked response not logged)" } if logger
+ else
+ logger.debug { "SOAP response: " + res.body } if logger
+ end
+ end
+
+private
+
+ def logger
+ @config[:Logger]
+ end
+
+ def setup_req(conn_data, req)
+ conn_data.receive_string = req.body
+ conn_data.receive_contenttype = req['content-type']
+ conn_data.soapaction = parse_soapaction(req.meta_vars['HTTP_SOAPACTION'])
+ end
+
+ def setup_res(conn_data, req, res)
+ res['content-type'] = conn_data.send_contenttype
+ if conn_data.is_fault
+ res.status = WEBrick::HTTPStatus::RC_INTERNAL_SERVER_ERROR
+ end
+ if outstring = encode_gzip(req, conn_data.send_string)
+ res['content-encoding'] = 'gzip'
+ res['content-length'] = outstring.size
+ res.body = outstring
+ else
+ res.body = conn_data.send_string
+ end
+ end
+
+ def parse_soapaction(soapaction)
+ if !soapaction.nil? and !soapaction.empty?
+ if /^"(.+)"$/ =~ soapaction
+ return $1
+ end
+ end
+ nil
+ end
+
+ def encode_gzip(req, outstring)
+ unless encode_gzip?(req)
+ return nil
+ end
+ begin
+ ostream = StringIO.new
+ gz = Zlib::GzipWriter.new(ostream)
+ gz.write(outstring)
+ ostream.string
+ ensure
+ gz.close
+ end
+ end
+
+ def encode_gzip?(req)
+ @options[:allow_content_encoding_gzip] and defined?(::Zlib) and
+ req['accept-encoding'] and
+ req['accept-encoding'].split(/,\s*/).include?('gzip')
+ end
+end
+
+
+end
+end
diff --git a/lib/soap/rpc/standaloneServer.rb b/lib/soap/rpc/standaloneServer.rb
new file mode 100644
index 0000000000..080343ba33
--- /dev/null
+++ b/lib/soap/rpc/standaloneServer.rb
@@ -0,0 +1,43 @@
+# SOAP4R - WEBrick Server
+# Copyright (C) 2003 by NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'soap/rpc/httpserver'
+
+
+module SOAP
+module RPC
+
+
+class StandaloneServer < HTTPServer
+ def initialize(appname, default_namespace, host = "0.0.0.0", port = 8080)
+ @appname = appname
+ @default_namespace = default_namespace
+ @host = host
+ @port = port
+ super(create_config)
+ end
+
+ alias add_servant add_rpc_servant
+ alias add_headerhandler add_rpc_headerhandler
+
+private
+
+ def create_config
+ {
+ :BindAddress => @host,
+ :Port => @port,
+ :AccessLog => [],
+ :SOAPDefaultNamespace => @default_namespace,
+ :SOAPHTTPServerApplicationName => @appname,
+ }
+ end
+end
+
+
+end
+end
diff --git a/lib/soap/soap.rb b/lib/soap/soap.rb
new file mode 100644
index 0000000000..12e09eccfe
--- /dev/null
+++ b/lib/soap/soap.rb
@@ -0,0 +1,140 @@
+# soap/soap.rb: SOAP4R - Base definitions.
+# Copyright (C) 2000-2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'xsd/qname'
+require 'xsd/charset'
+
+
+module SOAP
+
+
+VERSION = Version = '1.5.5'
+PropertyName = 'soap/property'
+
+EnvelopeNamespace = 'http://schemas.xmlsoap.org/soap/envelope/'
+EncodingNamespace = 'http://schemas.xmlsoap.org/soap/encoding/'
+LiteralNamespace = 'http://xml.apache.org/xml-soap/literalxml'
+
+NextActor = 'http://schemas.xmlsoap.org/soap/actor/next'
+
+EleEnvelope = 'Envelope'
+EleHeader = 'Header'
+EleBody = 'Body'
+EleFault = 'Fault'
+EleFaultString = 'faultstring'
+EleFaultActor = 'faultactor'
+EleFaultCode = 'faultcode'
+EleFaultDetail = 'detail'
+
+AttrMustUnderstand = 'mustUnderstand'
+AttrEncodingStyle = 'encodingStyle'
+AttrActor = 'actor'
+AttrRoot = 'root'
+AttrArrayType = 'arrayType'
+AttrOffset = 'offset'
+AttrPosition = 'position'
+ValueArray = 'Array'
+
+EleEnvelopeName = XSD::QName.new(EnvelopeNamespace, EleEnvelope).freeze
+EleHeaderName = XSD::QName.new(EnvelopeNamespace, EleHeader).freeze
+EleBodyName = XSD::QName.new(EnvelopeNamespace, EleBody).freeze
+EleFaultName = XSD::QName.new(EnvelopeNamespace, EleFault).freeze
+EleFaultStringName = XSD::QName.new(nil, EleFaultString).freeze
+EleFaultActorName = XSD::QName.new(nil, EleFaultActor).freeze
+EleFaultCodeName = XSD::QName.new(nil, EleFaultCode).freeze
+EleFaultDetailName = XSD::QName.new(nil, EleFaultDetail).freeze
+AttrMustUnderstandName = XSD::QName.new(EnvelopeNamespace, AttrMustUnderstand).freeze
+AttrEncodingStyleName = XSD::QName.new(EnvelopeNamespace, AttrEncodingStyle).freeze
+AttrRootName = XSD::QName.new(EncodingNamespace, AttrRoot).freeze
+AttrArrayTypeName = XSD::QName.new(EncodingNamespace, AttrArrayType).freeze
+AttrOffsetName = XSD::QName.new(EncodingNamespace, AttrOffset).freeze
+AttrPositionName = XSD::QName.new(EncodingNamespace, AttrPosition).freeze
+ValueArrayName = XSD::QName.new(EncodingNamespace, ValueArray).freeze
+
+Base64Literal = 'base64'
+
+SOAPNamespaceTag = 'env'
+XSDNamespaceTag = 'xsd'
+XSINamespaceTag = 'xsi'
+
+MediaType = 'text/xml'
+
+class Error < StandardError; end
+
+class StreamError < Error; end
+class HTTPStreamError < StreamError; end
+class PostUnavailableError < HTTPStreamError; end
+class MPostUnavailableError < HTTPStreamError; end
+
+class ArrayIndexOutOfBoundsError < Error; end
+class ArrayStoreError < Error; end
+
+class RPCRoutingError < Error; end
+class EmptyResponseError < Error; end
+class ResponseFormatError < Error; end
+
+class UnhandledMustUnderstandHeaderError < Error; end
+
+class FaultError < Error
+ attr_reader :faultcode
+ attr_reader :faultstring
+ attr_reader :faultactor
+ attr_accessor :detail
+
+ def initialize(fault)
+ @faultcode = fault.faultcode
+ @faultstring = fault.faultstring
+ @faultactor = fault.faultactor
+ @detail = fault.detail
+ super(self.to_s)
+ end
+
+ def to_s
+ str = nil
+ if @faultstring and @faultstring.respond_to?('data')
+ str = @faultstring.data
+ end
+ str || '(No faultstring)'
+ end
+end
+
+
+module Env
+ def self.getenv(name)
+ ENV[name.downcase] || ENV[name.upcase]
+ end
+
+ use_proxy = getenv('soap_use_proxy') == 'on'
+ HTTP_PROXY = use_proxy ? getenv('http_proxy') : nil
+ NO_PROXY = use_proxy ? getenv('no_proxy') : nil
+end
+
+
+end
+
+
+unless Object.respond_to?(:instance_variable_get)
+ class Object
+ def instance_variable_get(ivarname)
+ instance_eval(ivarname)
+ end
+
+ def instance_variable_set(ivarname, value)
+ instance_eval("#{ivarname} = value")
+ end
+ end
+end
+
+
+unless Kernel.respond_to?(:warn)
+ module Kernel
+ def warn(msg)
+ STDERR.puts(msg + "\n") unless $VERBOSE.nil?
+ end
+ end
+end
diff --git a/lib/soap/streamHandler.rb b/lib/soap/streamHandler.rb
new file mode 100644
index 0000000000..672396ecce
--- /dev/null
+++ b/lib/soap/streamHandler.rb
@@ -0,0 +1,229 @@
+# SOAP4R - Stream handler.
+# Copyright (C) 2000, 2001, 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'soap/soap'
+require 'soap/httpconfigloader'
+begin
+ require 'stringio'
+ require 'zlib'
+rescue LoadError
+ warn("Loading stringio or zlib failed. No gzipped response support.") if $DEBUG
+end
+
+
+module SOAP
+
+
+class StreamHandler
+ RUBY_VERSION_STRING = "ruby #{ RUBY_VERSION } (#{ RUBY_RELEASE_DATE }) [#{ RUBY_PLATFORM }]"
+
+ class ConnectionData
+ attr_accessor :send_string
+ attr_accessor :send_contenttype
+ attr_accessor :receive_string
+ attr_accessor :receive_contenttype
+ attr_accessor :is_fault
+ attr_accessor :soapaction
+
+ def initialize(send_string = nil)
+ @send_string = send_string
+ @send_contenttype = nil
+ @receive_string = nil
+ @receive_contenttype = nil
+ @is_fault = false
+ @soapaction = nil
+ end
+ end
+
+ def self.parse_media_type(str)
+ if /^#{ MediaType }(?:\s*;\s*charset=([^"]+|"[^"]+"))?$/i !~ str
+ return nil
+ end
+ charset = $1
+ charset.gsub!(/"/, '') if charset
+ charset || 'us-ascii'
+ end
+
+ def self.create_media_type(charset)
+ "#{ MediaType }; charset=#{ charset }"
+ end
+end
+
+
+class HTTPStreamHandler < StreamHandler
+ include SOAP
+
+ begin
+ require 'http-access2'
+ if HTTPAccess2::VERSION < "2.0"
+ raise LoadError.new("http-access/2.0 or later is required.")
+ end
+ Client = HTTPAccess2::Client
+ RETRYABLE = true
+ rescue LoadError
+ warn("Loading http-access2 failed. Net/http is used.") if $DEBUG
+ require 'soap/netHttpClient'
+ Client = SOAP::NetHttpClient
+ RETRYABLE = false
+ end
+
+
+public
+
+ attr_reader :client
+ attr_accessor :wiredump_file_base
+
+ MAX_RETRY_COUNT = 10 # [times]
+
+ def initialize(options)
+ super()
+ @client = Client.new(nil, "SOAP4R/#{ Version }")
+ @wiredump_file_base = nil
+ @charset = @wiredump_dev = nil
+ @options = options
+ set_options
+ @client.debug_dev = @wiredump_dev
+ @cookie_store = nil
+ @accept_encoding_gzip = false
+ end
+
+ def test_loopback_response
+ @client.test_loopback_response
+ end
+
+ def accept_encoding_gzip=(allow)
+ @accept_encoding_gzip = allow
+ end
+
+ def inspect
+ "#<#{self.class}>"
+ end
+
+ def send(endpoint_url, conn_data, soapaction = nil, charset = @charset)
+ conn_data.soapaction ||= soapaction # for backward conpatibility
+ send_post(endpoint_url, conn_data, charset)
+ end
+
+ def reset(endpoint_url = nil)
+ if endpoint_url.nil?
+ @client.reset_all
+ else
+ @client.reset(endpoint_url)
+ end
+ @client.save_cookie_store if @cookie_store
+ end
+
+private
+
+ def set_options
+ HTTPConfigLoader.set_options(@client, @options)
+ @charset = @options["charset"] || XSD::Charset.xml_encoding_label
+ @options.add_hook("charset") do |key, value|
+ @charset = value
+ end
+ @wiredump_dev = @options["wiredump_dev"]
+ @options.add_hook("wiredump_dev") do |key, value|
+ @wiredump_dev = value
+ @client.debug_dev = @wiredump_dev
+ end
+ set_cookie_store_file(@options["cookie_store_file"])
+ @options.add_hook("cookie_store_file") do |key, value|
+ set_cookie_store_file(value)
+ end
+ ssl_config = @options["ssl_config"]
+ basic_auth = @options["basic_auth"]
+ @options.lock(true)
+ ssl_config.unlock
+ basic_auth.unlock
+ end
+
+ def set_cookie_store_file(value)
+ value = nil if value and value.empty?
+ @cookie_store = value
+ @client.set_cookie_store(@cookie_store) if @cookie_store
+ end
+
+ def send_post(endpoint_url, conn_data, charset)
+ conn_data.send_contenttype ||= StreamHandler.create_media_type(charset)
+
+ if @wiredump_file_base
+ filename = @wiredump_file_base + '_request.xml'
+ f = File.open(filename, "w")
+ f << conn_data.send_string
+ f.close
+ end
+
+ extra = {}
+ extra['Content-Type'] = conn_data.send_contenttype
+ extra['SOAPAction'] = "\"#{ conn_data.soapaction }\""
+ extra['Accept-Encoding'] = 'gzip' if send_accept_encoding_gzip?
+ send_string = conn_data.send_string
+ @wiredump_dev << "Wire dump:\n\n" if @wiredump_dev
+ begin
+ retry_count = 0
+ while true
+ res = @client.post(endpoint_url, send_string, extra)
+ if RETRYABLE and HTTP::Status.redirect?(res.status)
+ retry_count += 1
+ if retry_count >= MAX_RETRY_COUNT
+ raise HTTPStreamError.new("redirect count exceeded")
+ end
+ endpoint_url = res.header["location"][0]
+ puts "redirected to #{endpoint_url}" if $DEBUG
+ else
+ break
+ end
+ end
+ rescue
+ @client.reset(endpoint_url)
+ raise
+ end
+ @wiredump_dev << "\n\n" if @wiredump_dev
+ receive_string = res.content
+ if @wiredump_file_base
+ filename = @wiredump_file_base + '_response.xml'
+ f = File.open(filename, "w")
+ f << receive_string
+ f.close
+ end
+ case res.status
+ when 405
+ raise PostUnavailableError.new("#{ res.status }: #{ res.reason }")
+ when 200, 500
+ # Nothing to do.
+ else
+ raise HTTPStreamError.new("#{ res.status }: #{ res.reason }")
+ end
+ if res.respond_to?(:header) and !res.header['content-encoding'].empty? and
+ res.header['content-encoding'][0].downcase == 'gzip'
+ receive_string = decode_gzip(receive_string)
+ end
+ conn_data.receive_string = receive_string
+ conn_data.receive_contenttype = res.contenttype
+ conn_data
+ end
+
+ def send_accept_encoding_gzip?
+ @accept_encoding_gzip and defined?(::Zlib)
+ end
+
+ def decode_gzip(instring)
+ unless send_accept_encoding_gzip?
+ raise HTTPStreamError.new("Gzipped response content.")
+ end
+ begin
+ gz = Zlib::GzipReader.new(StringIO.new(instring))
+ gz.read
+ ensure
+ gz.close
+ end
+ end
+end
+
+
+end
diff --git a/lib/soap/wsdlDriver.rb b/lib/soap/wsdlDriver.rb
new file mode 100644
index 0000000000..eba9608df5
--- /dev/null
+++ b/lib/soap/wsdlDriver.rb
@@ -0,0 +1,575 @@
+# SOAP4R - SOAP WSDL driver
+# Copyright (C) 2002, 2003, 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/parser'
+require 'wsdl/importer'
+require 'xsd/qname'
+require 'xsd/codegen/gensupport'
+require 'soap/mapping/wsdlencodedregistry'
+require 'soap/mapping/wsdlliteralregistry'
+require 'soap/rpc/driver'
+require 'wsdl/soap/methodDefCreator'
+
+
+module SOAP
+
+
+class WSDLDriverFactory
+ class FactoryError < StandardError; end
+
+ attr_reader :wsdl
+
+ def initialize(wsdl)
+ @wsdl = import(wsdl)
+ @methoddefcreator = WSDL::SOAP::MethodDefCreator.new(@wsdl)
+ end
+
+ def inspect
+ "#<#{self.class}:#{@wsdl.name}>"
+ end
+
+ def create_rpc_driver(servicename = nil, portname = nil)
+ port = find_port(servicename, portname)
+ drv = SOAP::RPC::Driver.new(port.soap_address.location)
+ init_driver(drv, port)
+ add_operation(drv, port)
+ drv
+ end
+
+ # depricated old interface
+ def create_driver(servicename = nil, portname = nil)
+ warn("WSDLDriverFactory#create_driver is depricated. Use create_rpc_driver instead.")
+ port = find_port(servicename, portname)
+ WSDLDriver.new(@wsdl, port, nil)
+ end
+
+ # Backward compatibility.
+ alias createDriver create_driver
+
+private
+
+ def find_port(servicename = nil, portname = nil)
+ service = port = nil
+ if servicename
+ service = @wsdl.service(
+ XSD::QName.new(@wsdl.targetnamespace, servicename))
+ else
+ service = @wsdl.services[0]
+ end
+ if service.nil?
+ raise FactoryError.new("service #{servicename} not found in WSDL")
+ end
+ if portname
+ port = service.ports[XSD::QName.new(@wsdl.targetnamespace, portname)]
+ if port.nil?
+ raise FactoryError.new("port #{portname} not found in WSDL")
+ end
+ else
+ port = service.ports.find { |port| !port.soap_address.nil? }
+ if port.nil?
+ raise FactoryError.new("no ports have soap:address")
+ end
+ end
+ if port.soap_address.nil?
+ raise FactoryError.new("soap:address element not found in WSDL")
+ end
+ port
+ end
+
+ def init_driver(drv, port)
+ wsdl_elements = @wsdl.collect_elements
+ wsdl_types = @wsdl.collect_complextypes + @wsdl.collect_simpletypes
+ rpc_decode_typemap = wsdl_types +
+ @wsdl.soap_rpc_complextypes(port.find_binding)
+ drv.proxy.mapping_registry =
+ Mapping::WSDLEncodedRegistry.new(rpc_decode_typemap)
+ drv.proxy.literal_mapping_registry =
+ Mapping::WSDLLiteralRegistry.new(wsdl_types, wsdl_elements)
+ end
+
+ def add_operation(drv, port)
+ port.find_binding.operations.each do |op_bind|
+ op_name = op_bind.soapoperation_name
+ soapaction = op_bind.soapaction || ''
+ orgname = op_name.name
+ name = XSD::CodeGen::GenSupport.safemethodname(orgname)
+ param_def = create_param_def(op_bind)
+ opt = {
+ :request_style => op_bind.soapoperation_style,
+ :response_style => op_bind.soapoperation_style,
+ :request_use => op_bind.input.soapbody_use,
+ :response_use => op_bind.output.soapbody_use,
+ :elementformdefault => false,
+ :attributeformdefault => false
+ }
+ if op_bind.soapoperation_style == :rpc
+ drv.add_rpc_operation(op_name, soapaction, name, param_def, opt)
+ else
+ drv.add_document_operation(soapaction, name, param_def, opt)
+ end
+ if orgname != name and orgname.capitalize == name.capitalize
+ ::SOAP::Mapping.define_singleton_method(drv, orgname) do |*arg|
+ __send__(name, *arg)
+ end
+ end
+ end
+ end
+
+ def import(location)
+ WSDL::Importer.import(location)
+ end
+
+ def create_param_def(op_bind)
+ op = op_bind.find_operation
+ if op_bind.soapoperation_style == :rpc
+ param_def = @methoddefcreator.collect_rpcparameter(op)
+ else
+ param_def = @methoddefcreator.collect_documentparameter(op)
+ end
+ # the first element of typedef in param_def is a String like
+ # "::SOAP::SOAPStruct". turn this String to a class.
+ param_def.collect { |io, name, typedef|
+ typedef[0] = Mapping.class_from_name(typedef[0])
+ [io, name, typedef]
+ }
+ end
+
+ def partqname(part)
+ if part.type
+ part.type
+ else
+ part.element
+ end
+ end
+
+ def param_def(type, name, klass, partqname)
+ [type, name, [klass, partqname.namespace, partqname.name]]
+ end
+
+ def filter_parts(partsdef, partssource)
+ parts = partsdef.split(/\s+/)
+ partssource.find_all { |part| parts.include?(part.name) }
+ end
+end
+
+
+class WSDLDriver
+ class << self
+ if RUBY_VERSION >= "1.7.0"
+ def __attr_proxy(symbol, assignable = false)
+ name = symbol.to_s
+ define_method(name) {
+ @servant.__send__(name)
+ }
+ if assignable
+ aname = name + '='
+ define_method(aname) { |rhs|
+ @servant.__send__(aname, rhs)
+ }
+ end
+ end
+ else
+ def __attr_proxy(symbol, assignable = false)
+ name = symbol.to_s
+ module_eval <<-EOS
+ def #{name}
+ @servant.#{name}
+ end
+ EOS
+ if assignable
+ module_eval <<-EOS
+ def #{name}=(value)
+ @servant.#{name} = value
+ end
+ EOS
+ end
+ end
+ end
+ end
+
+ __attr_proxy :options
+ __attr_proxy :headerhandler
+ __attr_proxy :streamhandler
+ __attr_proxy :test_loopback_response
+ __attr_proxy :endpoint_url, true
+ __attr_proxy :mapping_registry, true # for RPC unmarshal
+ __attr_proxy :wsdl_mapping_registry, true # for RPC marshal
+ __attr_proxy :default_encodingstyle, true
+ __attr_proxy :generate_explicit_type, true
+ __attr_proxy :allow_unqualified_element, true
+
+ def httpproxy
+ @servant.options["protocol.http.proxy"]
+ end
+
+ def httpproxy=(httpproxy)
+ @servant.options["protocol.http.proxy"] = httpproxy
+ end
+
+ def wiredump_dev
+ @servant.options["protocol.http.wiredump_dev"]
+ end
+
+ def wiredump_dev=(wiredump_dev)
+ @servant.options["protocol.http.wiredump_dev"] = wiredump_dev
+ end
+
+ def mandatorycharset
+ @servant.options["protocol.mandatorycharset"]
+ end
+
+ def mandatorycharset=(mandatorycharset)
+ @servant.options["protocol.mandatorycharset"] = mandatorycharset
+ end
+
+ def wiredump_file_base
+ @servant.options["protocol.wiredump_file_base"]
+ end
+
+ def wiredump_file_base=(wiredump_file_base)
+ @servant.options["protocol.wiredump_file_base"] = wiredump_file_base
+ end
+
+ def initialize(wsdl, port, logdev)
+ @servant = Servant__.new(self, wsdl, port, logdev)
+ end
+
+ def inspect
+ "#<#{self.class}:#{@servant.port.name}>"
+ end
+
+ def reset_stream
+ @servant.reset_stream
+ end
+
+ # Backward compatibility.
+ alias generateEncodeType= generate_explicit_type=
+
+ class Servant__
+ include SOAP
+
+ attr_reader :options
+ attr_reader :port
+
+ attr_accessor :soapaction
+ attr_accessor :default_encodingstyle
+ attr_accessor :allow_unqualified_element
+ attr_accessor :generate_explicit_type
+ attr_accessor :mapping_registry
+ attr_accessor :wsdl_mapping_registry
+
+ def initialize(host, wsdl, port, logdev)
+ @host = host
+ @wsdl = wsdl
+ @port = port
+ @logdev = logdev
+ @soapaction = nil
+ @options = setup_options
+ @default_encodingstyle = nil
+ @allow_unqualified_element = nil
+ @generate_explicit_type = false
+ @mapping_registry = nil # for rpc unmarshal
+ @wsdl_mapping_registry = nil # for rpc marshal
+ @wiredump_file_base = nil
+ @mandatorycharset = nil
+ @wsdl_elements = @wsdl.collect_elements
+ @wsdl_types = @wsdl.collect_complextypes + @wsdl.collect_simpletypes
+ @rpc_decode_typemap = @wsdl_types +
+ @wsdl.soap_rpc_complextypes(port.find_binding)
+ @wsdl_mapping_registry = Mapping::WSDLEncodedRegistry.new(
+ @rpc_decode_typemap)
+ @doc_mapper = Mapping::WSDLLiteralRegistry.new(
+ @wsdl_types, @wsdl_elements)
+ endpoint_url = @port.soap_address.location
+ # Convert a map which key is QName, to a Hash which key is String.
+ @operation = {}
+ @port.inputoperation_map.each do |op_name, op_info|
+ orgname = op_name.name
+ name = XSD::CodeGen::GenSupport.safemethodname(orgname)
+ @operation[name] = @operation[orgname] = op_info
+ add_method_interface(op_info)
+ end
+ @proxy = ::SOAP::RPC::Proxy.new(endpoint_url, @soapaction, @options)
+ end
+
+ def inspect
+ "#<#{self.class}:#{@proxy.inspect}>"
+ end
+
+ def endpoint_url
+ @proxy.endpoint_url
+ end
+
+ def endpoint_url=(endpoint_url)
+ @proxy.endpoint_url = endpoint_url
+ end
+
+ def headerhandler
+ @proxy.headerhandler
+ end
+
+ def streamhandler
+ @proxy.streamhandler
+ end
+
+ def test_loopback_response
+ @proxy.test_loopback_response
+ end
+
+ def reset_stream
+ @proxy.reset_stream
+ end
+
+ def rpc_call(name, *values)
+ set_wiredump_file_base(name)
+ unless op_info = @operation[name]
+ raise RuntimeError, "method: #{name} not defined"
+ end
+ req_header = create_request_header
+ req_body = create_request_body(op_info, *values)
+ reqopt = create_options({
+ :soapaction => op_info.soapaction || @soapaction})
+ resopt = create_options({
+ :decode_typemap => @rpc_decode_typemap})
+ env = @proxy.route(req_header, req_body, reqopt, resopt)
+ raise EmptyResponseError unless env
+ receive_headers(env.header)
+ begin
+ @proxy.check_fault(env.body)
+ rescue ::SOAP::FaultError => e
+ Mapping.fault2exception(e)
+ end
+ ret = env.body.response ?
+ Mapping.soap2obj(env.body.response, @mapping_registry) : nil
+ if env.body.outparams
+ outparams = env.body.outparams.collect { |outparam|
+ Mapping.soap2obj(outparam)
+ }
+ return [ret].concat(outparams)
+ else
+ return ret
+ end
+ end
+
+ # req_header: [[element, mustunderstand, encodingstyle(QName/String)], ...]
+ # req_body: SOAPBasetype/SOAPCompoundtype
+ def document_send(name, header_obj, body_obj)
+ set_wiredump_file_base(name)
+ unless op_info = @operation[name]
+ raise RuntimeError, "method: #{name} not defined"
+ end
+ req_header = header_obj ? header_from_obj(header_obj, op_info) : nil
+ req_body = body_from_obj(body_obj, op_info)
+ opt = create_options({
+ :soapaction => op_info.soapaction || @soapaction,
+ :decode_typemap => @wsdl_types})
+ env = @proxy.invoke(req_header, req_body, opt)
+ raise EmptyResponseError unless env
+ if env.body.fault
+ raise ::SOAP::FaultError.new(env.body.fault)
+ end
+ res_body_obj = env.body.response ?
+ Mapping.soap2obj(env.body.response, @mapping_registry) : nil
+ return env.header, res_body_obj
+ end
+
+ private
+
+ def create_options(hash = nil)
+ opt = {}
+ opt[:default_encodingstyle] = @default_encodingstyle
+ opt[:allow_unqualified_element] = @allow_unqualified_element
+ opt[:generate_explicit_type] = @generate_explicit_type
+ opt.update(hash) if hash
+ opt
+ end
+
+ def set_wiredump_file_base(name)
+ if @wiredump_file_base
+ @proxy.set_wiredump_file_base(@wiredump_file_base + "_#{name}")
+ end
+ end
+
+ def create_request_header
+ headers = @proxy.headerhandler.on_outbound
+ if headers.empty?
+ nil
+ else
+ h = SOAPHeader.new
+ headers.each do |header|
+ h.add(header.elename.name, header)
+ end
+ h
+ end
+ end
+
+ def receive_headers(headers)
+ @proxy.headerhandler.on_inbound(headers) if headers
+ end
+
+ def create_request_body(op_info, *values)
+ method = create_method_struct(op_info, *values)
+ SOAPBody.new(method)
+ end
+
+ def create_method_struct(op_info, *params)
+ parts_names = op_info.bodyparts.collect { |part| part.name }
+ obj = create_method_obj(parts_names, params)
+ method = Mapping.obj2soap(obj, @wsdl_mapping_registry, op_info.op_name)
+ if method.members.size != parts_names.size
+ new_method = SOAPStruct.new
+ method.each do |key, value|
+ if parts_names.include?(key)
+ new_method.add(key, value)
+ end
+ end
+ method = new_method
+ end
+ method.elename = op_info.op_name
+ method.type = XSD::QName.new # Request should not be typed.
+ method
+ end
+
+ def create_method_obj(names, params)
+ o = Object.new
+ idx = 0
+ while idx < params.length
+ o.instance_variable_set('@' + names[idx], params[idx])
+ idx += 1
+ end
+ o
+ end
+
+ def header_from_obj(obj, op_info)
+ if obj.is_a?(SOAPHeader)
+ obj
+ elsif op_info.headerparts.empty?
+ if obj.nil?
+ nil
+ else
+ raise RuntimeError.new("no header definition in schema: #{obj}")
+ end
+ elsif op_info.headerparts.size == 1
+ part = op_info.headerparts[0]
+ header = SOAPHeader.new()
+ header.add(headeritem_from_obj(obj, part.element || part.eletype))
+ header
+ else
+ header = SOAPHeader.new()
+ op_info.headerparts.each do |part|
+ child = Mapping.get_attribute(obj, part.name)
+ ele = headeritem_from_obj(child, part.element || part.eletype)
+ header.add(part.name, ele)
+ end
+ header
+ end
+ end
+
+ def headeritem_from_obj(obj, name)
+ if obj.nil?
+ SOAPElement.new(name)
+ elsif obj.is_a?(SOAPHeaderItem)
+ obj
+ else
+ Mapping.obj2soap(obj, @doc_mapper, name)
+ end
+ end
+
+ def body_from_obj(obj, op_info)
+ if obj.is_a?(SOAPBody)
+ obj
+ elsif op_info.bodyparts.empty?
+ if obj.nil?
+ nil
+ else
+ raise RuntimeError.new("no body found in schema")
+ end
+ elsif op_info.bodyparts.size == 1
+ part = op_info.bodyparts[0]
+ ele = bodyitem_from_obj(obj, part.element || part.type)
+ SOAPBody.new(ele)
+ else
+ body = SOAPBody.new
+ op_info.bodyparts.each do |part|
+ child = Mapping.get_attribute(obj, part.name)
+ ele = bodyitem_from_obj(child, part.element || part.type)
+ body.add(ele.elename.name, ele)
+ end
+ body
+ end
+ end
+
+ def bodyitem_from_obj(obj, name)
+ if obj.nil?
+ SOAPElement.new(name)
+ elsif obj.is_a?(SOAPElement)
+ obj
+ else
+ Mapping.obj2soap(obj, @doc_mapper, name)
+ end
+ end
+
+ def add_method_interface(op_info)
+ name = XSD::CodeGen::GenSupport.safemethodname(op_info.op_name.name)
+ orgname = op_info.op_name.name
+ parts_names = op_info.bodyparts.collect { |part| part.name }
+ case op_info.style
+ when :document
+ if orgname != name and orgname.capitalize == name.capitalize
+ add_document_method_interface(orgname, parts_names)
+ end
+ add_document_method_interface(name, parts_names)
+ when :rpc
+ if orgname != name and orgname.capitalize == name.capitalize
+ add_rpc_method_interface(orgname, parts_names)
+ end
+ add_rpc_method_interface(name, parts_names)
+ else
+ raise RuntimeError.new("unknown style: #{op_info.style}")
+ end
+ end
+
+ def add_rpc_method_interface(name, parts_names)
+ ::SOAP::Mapping.define_singleton_method(@host, name) do |*arg|
+ unless arg.size == parts_names.size
+ raise ArgumentError.new(
+ "wrong number of arguments (#{arg.size} for #{parts_names.size})")
+ end
+ @servant.rpc_call(name, *arg)
+ end
+ @host.method(name)
+ end
+
+ def add_document_method_interface(name, parts_names)
+ ::SOAP::Mapping.define_singleton_method(@host, name) do |h, b|
+ @servant.document_send(name, h, b)
+ end
+ @host.method(name)
+ end
+
+ def setup_options
+ if opt = Property.loadproperty(::SOAP::PropertyName)
+ opt = opt["client"]
+ end
+ opt ||= Property.new
+ opt.add_hook("protocol.mandatorycharset") do |key, value|
+ @mandatorycharset = value
+ end
+ opt.add_hook("protocol.wiredump_file_base") do |key, value|
+ @wiredump_file_base = value
+ end
+ opt["protocol.http.charset"] ||= XSD::Charset.xml_encoding_label
+ opt["protocol.http.proxy"] ||= Env::HTTP_PROXY
+ opt["protocol.http.no_proxy"] ||= Env::NO_PROXY
+ opt
+ end
+ end
+end
+
+
+end
diff --git a/lib/sync.rb b/lib/sync.rb
index 36c4c08d45..79522ed885 100644
--- a/lib/sync.rb
+++ b/lib/sync.rb
@@ -2,6 +2,7 @@
# sync.rb - 2 phase lock with counter
# $Release Version: 1.0$
# $Revision$
+# $Date$
# by Keiju ISHITSUKA(keiju@ishitsuka.com)
#
# --
@@ -22,8 +23,9 @@
# Sync_m#sync_lock, lock
# Sync_m#sync_unlock, unlock
#
-# Sync, Synchronizer:
-# Usage:
+# Sync, Synchronicer:
+# include Sync_m
+# Usage:
# sync = Sync.new
#
# Sync#mode
@@ -34,34 +36,34 @@
# Sync#lock(mode) -- mode = :EX, :SH, :UN
# Sync#unlock
# Sync#synchronize(mode) {...}
-#
+#
#
unless defined? Thread
- raise "Thread not available for this ruby interpreter"
+ fail "Thread not available for this ruby interpreter"
end
module Sync_m
RCS_ID='-$Header$-'
-
+
# lock mode
UN = :UN
SH = :SH
EX = :EX
-
+
# exceptions
class Err < StandardError
def Err.Fail(*opt)
fail self, sprintf(self::Message, *opt)
end
-
+
class UnknownLocker < Err
Message = "Thread(%s) not locked."
def UnknownLocker.Fail(th)
super(th.inspect)
end
end
-
+
class LockModeFailer < Err
Message = "Unknown lock mode(%s)"
def LockModeFailer.Fail(mode)
@@ -72,7 +74,7 @@ module Sync_m
end
end
end
-
+
def Sync_m.define_aliases(cl)
cl.module_eval %q{
alias locked? sync_locked?
@@ -84,21 +86,22 @@ module Sync_m
alias synchronize sync_synchronize
}
end
-
+
def Sync_m.append_features(cl)
super
- # do nothing for Modules
- # make aliases for Classes.
- define_aliases(cl) unless cl.instance_of?(Module)
- self
+ unless cl.instance_of?(Module)
+ # do nothing for Modules
+ # make aliases and include the proper module.
+ define_aliases(cl)
+ end
end
-
+
def Sync_m.extend_object(obj)
super
- obj.sync_extend
+ obj.sync_extended
end
- def sync_extend
+ def sync_extended
unless (defined? locked? and
defined? shared? and
defined? exclusive? and
@@ -115,132 +118,128 @@ module Sync_m
def sync_locked?
sync_mode != UN
end
-
+
def sync_shared?
sync_mode == SH
end
-
+
def sync_exclusive?
sync_mode == EX
end
-
+
# locking methods.
def sync_try_lock(mode = EX)
- return unlock if mode == UN
- @sync_mutex.synchronize do
- ret = sync_try_lock_sub(mode)
- end
+ return unlock if sync_mode == UN
+
+ Thread.critical = true
+ ret = sync_try_lock_sub(sync_mode)
+ Thread.critical = false
ret
end
-
+
def sync_lock(m = EX)
return unlock if m == UN
- while true
- @sync_mutex.synchronize do
- if sync_try_lock_sub(m)
- return self
- else
- if sync_sh_locker[Thread.current]
- sync_upgrade_waiting.push [Thread.current, sync_sh_locker[Thread.current]]
- sync_sh_locker.delete(Thread.current)
- else
- sync_waiting.push Thread.current
- end
- @sync_mutex.sleep
- end
+ until (Thread.critical = true; sync_try_lock_sub(m))
+ if sync_sh_locker[Thread.current]
+ sync_upgrade_waiting.push [Thread.current, sync_sh_locker[Thread.current]]
+ sync_sh_locker.delete(Thread.current)
+ else
+ sync_waiting.push Thread.current
end
+ Thread.stop
end
+ Thread.critical = false
self
end
-
+
def sync_unlock(m = EX)
- wakeup_threads = []
- @sync_mutex.synchronize do
- if sync_mode == UN
+ Thread.critical = true
+ if sync_mode == UN
+ Thread.critical = false
+ Err::UnknownLocker.Fail(Thread.current)
+ end
+
+ m = sync_mode if m == EX and sync_mode == SH
+
+ runnable = false
+ case m
+ when UN
+ Thread.critical = false
+ Err::UnknownLocker.Fail(Thread.current)
+
+ when EX
+ if sync_ex_locker == Thread.current
+ if (self.sync_ex_count = sync_ex_count - 1) == 0
+ self.sync_ex_locker = nil
+ if sync_sh_locker.include?(Thread.current)
+ self.sync_mode = SH
+ else
+ self.sync_mode = UN
+ end
+ runnable = true
+ end
+ else
Err::UnknownLocker.Fail(Thread.current)
end
-
- m = sync_mode if m == EX and sync_mode == SH
-
- runnable = false
- case m
- when UN
+
+ when SH
+ if (count = sync_sh_locker[Thread.current]).nil?
Err::UnknownLocker.Fail(Thread.current)
-
- when EX
- if sync_ex_locker == Thread.current
- if (self.sync_ex_count = sync_ex_count - 1) == 0
- self.sync_ex_locker = nil
- if sync_sh_locker.include?(Thread.current)
- self.sync_mode = SH
- else
- self.sync_mode = UN
- end
+ else
+ if (sync_sh_locker[Thread.current] = count - 1) == 0
+ sync_sh_locker.delete(Thread.current)
+ if sync_sh_locker.empty? and sync_ex_count == 0
+ self.sync_mode = UN
runnable = true
end
- else
- Err::UnknownLocker.Fail(Thread.current)
- end
-
- when SH
- if (count = sync_sh_locker[Thread.current]).nil?
- Err::UnknownLocker.Fail(Thread.current)
- else
- if (sync_sh_locker[Thread.current] = count - 1) == 0
- sync_sh_locker.delete(Thread.current)
- if sync_sh_locker.empty? and sync_ex_count == 0
- self.sync_mode = UN
- runnable = true
- end
- end
end
end
-
- if runnable
- if sync_upgrade_waiting.size > 0
- th, count = sync_upgrade_waiting.shift
- sync_sh_locker[th] = count
- th.wakeup
- wakeup_threads.push th
- else
- wait = sync_waiting
- self.sync_waiting = []
- for th in wait
- th.wakeup
- wakeup_threads.push th
- end
+ end
+
+ if runnable
+ if sync_upgrade_waiting.size > 0
+ for k, v in sync_upgrade_waiting
+ sync_sh_locker[k] = v
+ end
+ wait = sync_upgrade_waiting
+ self.sync_upgrade_waiting = []
+ Thread.critical = false
+
+ for w, v in wait
+ w.run
+ end
+ else
+ wait = sync_waiting
+ self.sync_waiting = []
+ Thread.critical = false
+ for w in wait
+ w.run
end
end
end
- for th in wakeup_threads
- th.run
- end
+
+ Thread.critical = false
self
end
-
+
def sync_synchronize(mode = EX)
- sync_lock(mode)
begin
+ sync_lock(mode)
yield
ensure
sync_unlock
end
end
- attr_accessor :sync_mode
-
- attr_accessor :sync_waiting
- attr_accessor :sync_upgrade_waiting
- attr_accessor :sync_sh_locker
- attr_accessor :sync_ex_locker
- attr_accessor :sync_ex_count
-
- def sync_inspect
- sync_iv = instance_variables.select{|iv| /^@sync_/ =~ iv.id2name}.collect{|iv| iv.id2name + '=' + instance_eval(iv.id2name).inspect}.join(",")
- print "<#{self.class}.extend Sync_m: #{inspect}, <Sync_m: #{sync_iv}>"
- end
-
+ attr :sync_mode, true
+
+ attr :sync_waiting, true
+ attr :sync_upgrade_waiting, true
+ attr :sync_sh_locker, true
+ attr :sync_ex_locker, true
+ attr :sync_ex_count, true
+
private
def sync_initialize
@@ -250,15 +249,13 @@ module Sync_m
@sync_sh_locker = Hash.new
@sync_ex_locker = nil
@sync_ex_count = 0
-
- @sync_mutex = Mutex.new
end
def initialize(*args)
- super
sync_initialize
+ super
end
-
+
def sync_try_lock_sub(m)
case m
when SH
@@ -282,7 +279,7 @@ module Sync_m
end
when EX
if sync_mode == UN or
- sync_mode == SH && sync_sh_locker.size == 1 && sync_sh_locker.include?(Thread.current)
+ sync_mode == SH && sync_sh_locker.size == 1 && sync_sh_locker.include?(Thread.current)
self.sync_mode = m
self.sync_ex_locker = Thread.current
self.sync_ex_count = 1
@@ -294,6 +291,7 @@ module Sync_m
ret = false
end
else
+ Thread.critical = false
Err::LockModeFailer.Fail mode
end
return ret
@@ -302,6 +300,12 @@ end
Synchronizer_m = Sync_m
class Sync
+ #Sync_m.extend_class self
include Sync_m
+
+ def initialize
+ super
+ end
+
end
Synchronizer = Sync
diff --git a/lib/tempfile.rb b/lib/tempfile.rb
index 46164e8b99..c984cd3393 100755..100644
--- a/lib/tempfile.rb
+++ b/lib/tempfile.rb
@@ -6,165 +6,59 @@
require 'delegate'
require 'tmpdir'
-require 'thread'
-# A utility class for managing temporary files. When you create a Tempfile
-# object, it will create a temporary file with a unique filename. A Tempfile
-# objects behaves just like a File object, and you can perform all the usual
-# file operations on it: reading data, writing data, changing its permissions,
-# etc. So although this class does not explicitly document all instance methods
-# supported by File, you can in fact call any File instance method on a
-# Tempfile object.
-#
-# == Synopsis
-#
-# require 'tempfile'
-#
-# file = Tempfile.new('foo')
-# file.path # => A unique filename in the OS's temp directory,
-# # e.g.: "/tmp/foo.24722.0"
-# # This filename contains 'foo' in its basename.
-# file.write("hello world")
-# file.rewind
-# file.read # => "hello world"
-# file.close
-# file.unlink # deletes the temp file
-#
-# == Good practices
-#
-# === Explicit close
-#
-# When a Tempfile object is garbage collected, or when the Ruby interpreter
-# exits, its associated temporary file is automatically deleted. This means
-# that's it's unnecessary to explicitly delete a Tempfile after use, though
-# it's good practice to do so: not explicitly deleting unused Tempfiles can
-# potentially leave behind large amounts of tempfiles on the filesystem
-# until they're garbage collected. The existance of these temp files can make
-# it harder to determine a new Tempfile filename.
-#
-# Therefore, one should always call #unlink or close in an ensure block, like
-# this:
-#
-# file = Tempfile.new('foo')
-# begin
-# ...do something with file...
-# ensure
-# file.close
-# file.unlink # deletes the temp file
-# end
-#
-# === Unlink after creation
-#
-# On POSIX systems, it's possible to unlink a file right after creating it,
-# and before closing it. This removes the filesystem entry without closing
-# the file handle, so it ensures that only the processes that already had
-# the file handle open can access the file's contents. It's strongly
-# recommended that you do this if you do not want any other processes to
-# be able to read from or write to the Tempfile, and you do not need to
-# know the Tempfile's filename either.
-#
-# For example, a practical use case for unlink-after-creation would be this:
-# you need a large byte buffer that's too large to comfortably fit in RAM,
-# e.g. when you're writing a web server and you want to buffer the client's
-# file upload data.
-#
-# Please refer to #unlink for more information and a code example.
-#
-# == Minor notes
-#
-# Tempfile's filename picking method is both thread-safe and inter-process-safe:
-# it guarantees that no other threads or processes will pick the same filename.
-#
-# Tempfile itself however may not be entirely thread-safe. If you access the
-# same Tempfile object from multiple threads then you should protect it with a
-# mutex.
+# A class for managing temporary files. This library is written to be
+# thread safe.
class Tempfile < DelegateClass(File)
- MAX_TRY = 10 # :nodoc:
+ MAX_TRY = 10
@@cleanlist = []
- @@lock = Mutex.new
- # call-seq:
- # new(basename, [tmpdir = Dir.tmpdir], [options])
- #
- # Creates a temporary file with permissions 0600 (= only readable and
- # writable by the owner) and opens it with mode "w+".
- #
- # The +basename+ parameter is used to determine the name of the
- # temporary file. You can either pass a String or an Array with
- # 2 String elements. In the former form, the temporary file's base
- # name will begin with the given string. In the latter form,
- # the temporary file's base name will begin with the array's first
- # element, and end with the second element. For example:
- #
- # file = Tempfile.new('hello')
- # file.path # => something like: "/tmp/foo2843-8392-92849382--0"
- #
- # # Use the Array form to enforce an extension in the filename:
- # file = Tempfile.new(['hello', '.jpg'])
- # file.path # => something like: "/tmp/foo2843-8392-92849382--0.jpg"
- #
- # The temporary file will be placed in the directory as specified
- # by the +tmpdir+ parameter. By default, this is +Dir.tmpdir+.
- # When $SAFE > 0 and the given +tmpdir+ is tainted, it uses
- # '/tmp' as the temporary directory. Please note that ENV values
- # are tainted by default, and +Dir.tmpdir+'s return value might
- # come from environment variables (e.g. <tt>$TMPDIR</tt>).
- #
- # file = Tempfile.new('hello', '/home/aisaka')
- # file.path # => something like: "/home/aisaka/foo2843-8392-92849382--0"
- #
- # You can also pass an options hash. Under the hood, Tempfile creates
- # the temporary file using +File.open+. These options will be passed to
- # +File.open+. This is mostly useful for specifying encoding
- # options, e.g.:
- #
- # Tempfile.new('hello', '/home/aisaka', :encoding => 'ascii-8bit')
- #
- # # You can also omit the 'tmpdir' parameter:
- # Tempfile.new('hello', :encoding => 'ascii-8bit')
- #
- # === Exceptions
- #
- # If Tempfile.new cannot find a unique filename within a limited
- # number of tries, then it will raise an exception.
- def initialize(basename, *rest)
- # I wish keyword argument settled soon.
- if opts = Hash.try_convert(rest[-1])
- rest.pop
- end
- tmpdir = rest[0] || Dir::tmpdir
+ # Creates a temporary file of mode 0600 in the temporary directory,
+ # opens it with mode "w+", and returns a Tempfile object which
+ # represents the created temporary file. A Tempfile object can be
+ # treated just like a normal File object.
+ #
+ # The basename parameter is used to determine the name of a
+ # temporary file. If an Array is given, the first element is used
+ # as prefix string and the second as suffix string, respectively.
+ # Otherwise it is treated as prefix string.
+ #
+ # If tmpdir is omitted, the temporary directory is determined by
+ # Dir::tmpdir provided by 'tmpdir.rb'.
+ # When $SAFE > 0 and the given tmpdir is tainted, it uses
+ # /tmp. (Note that ENV values are tainted by default)
+ def initialize(basename, tmpdir=Dir::tmpdir)
if $SAFE > 0 and tmpdir.tainted?
tmpdir = '/tmp'
end
- lock = tmpname = nil
+ lock = nil
n = failure = 0
- @@lock.synchronize {
+
+ begin
+ Thread.critical = true
+
begin
- begin
- tmpname = File.join(tmpdir, make_tmpname(basename, n))
- lock = tmpname + '.lock'
- n += 1
- end while @@cleanlist.include?(tmpname) or
- File.exist?(lock) or File.exist?(tmpname)
- Dir.mkdir(lock)
- rescue
- failure += 1
- retry if failure < MAX_TRY
- raise "cannot generate tempfile `#{tmpname}'"
- end
- }
+ tmpname = File.join(tmpdir, make_tmpname(basename, n))
+ lock = tmpname + '.lock'
+ n += 1
+ end while @@cleanlist.include?(tmpname) or
+ File.exist?(lock) or File.exist?(tmpname)
+
+ Dir.mkdir(lock)
+ rescue
+ failure += 1
+ retry if failure < MAX_TRY
+ raise "cannot generate tempfile `%s'" % tmpname
+ ensure
+ Thread.critical = false
+ end
@data = [tmpname]
@clean_proc = Tempfile.callback(@data)
ObjectSpace.define_finalizer(self, @clean_proc)
- if opts.nil?
- opts = []
- else
- opts = [opts]
- end
- @tmpfile = File.open(tmpname, File::RDWR|File::CREAT|File::EXCL, 0600, *opts)
+ @tmpfile = File.open(tmpname, File::RDWR|File::CREAT|File::EXCL, 0600)
@tmpname = tmpname
@@cleanlist << @tmpname
@data[1] = @tmpfile
@@ -185,10 +79,9 @@ class Tempfile < DelegateClass(File)
else
prefix, suffix = basename, ''
end
-
+
t = Time.now.strftime("%Y%m%d")
- th = Thread.current.object_id
- path = "#{prefix}#{t}-#{$$}-#{th.to_s(36)}-#{rand(0x100000000).to_s(36)}-#{n}#{suffix}"
+ path = "#{prefix}#{t}-#{$$}-#{rand(0x100000000).to_s(36)}-#{n}#{suffix}"
end
private :make_tmpname
@@ -204,12 +97,11 @@ class Tempfile < DelegateClass(File)
@tmpfile.close if @tmpfile
@tmpfile = nil
@data[1] = nil if @data
- end
+ end
protected :_close
- # Closes the file. If +unlink_now+ is true, then the file will be unlinked
- # (deleted) after closing. Of course, you can choose to later call #unlink
- # if you do not unlink it now.
+ # Closes the file. If the optional flag is true, unlinks the file
+ # after closing.
#
# If you don't explicitly unlink the temporary file, the removal
# will be delayed until the object is finalized.
@@ -221,58 +113,25 @@ class Tempfile < DelegateClass(File)
end
end
- # Closes and unlinks (deletes) the file. Has the same effect as called
- # <tt>close(true)</tt>.
+ # Closes and unlinks the file.
def close!
_close
- unlink
+ @clean_proc.call
ObjectSpace.undefine_finalizer(self)
+ @data = @tmpname = nil
end
- # Unlinks (deletes) the file from the filesystem. One should always unlink
- # the file after using it, as is explained in the "Explicit close" good
- # practice section in the Tempfile overview:
- #
- # file = Tempfile.new('foo')
- # begin
- # ...do something with file...
- # ensure
- # file.close
- # file.unlink # deletes the temp file
- # end
- #
- # === Unlink-before-close
- #
- # On POSIX systems it's possible to unlink a file before closing it. This
- # practice is explained in detail in the Tempfile overview (section
- # "Unlink after creation"); please refer there for more information.
- #
- # However, unlink-before-close may not be supported on non-POSIX operating
- # systems. Microsoft Windows is the most notable case: unlinking a non-closed
- # file will result in an error, which this method will silently ignore. If
- # you want to practice unlink-before-close whenever possible, then you should
- # write code like this:
- #
- # file = Tempfile.new('foo')
- # file.unlink # On Windows this silently fails.
- # begin
- # ... do something with file ...
- # ensure
- # file.close! # Closes the file handle. If the file wasn't unlinked
- # # because #unlink failed, then this method will attempt
- # # to do so again.
- # end
+ # Unlinks the file. On UNIX-like systems, it is often a good idea
+ # to unlink a temporary file immediately after creating and opening
+ # it, because it leaves other programs zero chance to access the
+ # file.
def unlink
# keep this order for thread safeness
- return unless @tmpname
begin
- if File.exist?(@tmpname)
- File.unlink(@tmpname)
- end
+ File.unlink(@tmpname) if File.exist?(@tmpname)
@@cleanlist.delete(@tmpname)
- # remove tmpname and cleanlist from callback
- @data[0] = @data[2] = nil
@data = @tmpname = nil
+ ObjectSpace.undefine_finalizer(self)
rescue Errno::EACCES
# may not be able to unlink on Windows; just ignore
end
@@ -280,7 +139,6 @@ class Tempfile < DelegateClass(File)
alias delete unlink
# Returns the full path name of the temporary file.
- # This will be nil if #unlink has been called.
def path
@tmpname
end
@@ -300,47 +158,28 @@ class Tempfile < DelegateClass(File)
class << self
def callback(data) # :nodoc:
pid = $$
- Proc.new {
- if pid == $$
+ lambda{
+ if pid == $$
path, tmpfile, cleanlist = *data
- STDERR.print "removing ", path, "..." if $DEBUG
+ print "removing ", path, "..." if $DEBUG
tmpfile.close if tmpfile
# keep this order for thread safeness
- if path
- File.unlink(path) if File.exist?(path)
- cleanlist.delete(path) if cleanlist
- end
+ File.unlink(path) if File.exist?(path)
+ cleanlist.delete(path) if cleanlist
- STDERR.print "done\n" if $DEBUG
+ print "done\n" if $DEBUG
end
}
end
- # Creates a new Tempfile.
+ # If no block is given, this is a synonym for new().
#
- # If no block is given, this is a synonym for Tempfile.new.
- #
- # If a block is given, then a Tempfile object will be constructed,
- # and the block is run with said object as argument. The Tempfile
- # oject will be automatically closed after the block terminates.
- # The call returns the value of the block.
- #
- # In any case, all arguments (+*args+) will be passed to Tempfile.new.
- #
- # Tempfile.open('foo', '/home/temp') do |f|
- # ... do something with f ...
- # end
- #
- # # Equivalent:
- # f = Tempfile.open('foo', '/home/temp')
- # begin
- # ... do something with f ...
- # ensure
- # f.close
- # end
+ # If a block is given, it will be passed tempfile as an argument,
+ # and the tempfile will automatically be closed when the block
+ # terminates. In this case, open() returns nil.
def open(*args)
tempfile = new(*args)
@@ -350,6 +189,8 @@ class Tempfile < DelegateClass(File)
ensure
tempfile.close
end
+
+ nil
else
tempfile
end
diff --git a/lib/test/unit.rb b/lib/test/unit.rb
index fd7fe06f43..b71f644566 100644
--- a/lib/test/unit.rb
+++ b/lib/test/unit.rb
@@ -1,66 +1,280 @@
-# test/unit compatibility layer using minitest.
-
-require 'minitest/unit'
-require 'test/unit/assertions'
require 'test/unit/testcase'
+require 'test/unit/autorunner'
-module Test
- module Unit
- TEST_UNIT_IMPLEMENTATION = 'test/unit compatibility layer using minitest'
-
- def self.setup_argv(original_argv=ARGV)
- minitest_argv = []
- files = []
- reject = []
- original_argv = original_argv.dup
- while arg = original_argv.shift
- case arg
- when '-v'
- minitest_argv << arg
- when /\A(-n)(.+)?/, /\A(--name)=?\b(.+)?/
- minitest_argv << $1
- minitest_argv << ($2 || original_argv.shift)
- when /\A-x(.+)?/
- reject << ($1 || original_argv.shift)
- else
- files << arg
- end
- end
-
- if block_given?
- files = yield files
- end
-
- files.map! {|f|
- f = f.tr(File::ALT_SEPARATOR, File::SEPARATOR) if File::ALT_SEPARATOR
- if File.directory? f
- Dir["#{f}/**/test_*.rb"]
- elsif File.file? f
- f
- else
- raise ArgumentError, "file not found: #{f}"
- end
- }
- files.flatten!
+module Test # :nodoc:
+ #
+ # = Test::Unit - Ruby Unit Testing Framework
+ #
+ # == Introduction
+ #
+ # Unit testing is making waves all over the place, largely due to the
+ # fact that it is a core practice of XP. While XP is great, unit testing
+ # has been around for a long time and has always been a good idea. One
+ # of the keys to good unit testing, though, is not just writing tests,
+ # but having tests. What's the difference? Well, if you just _write_ a
+ # test and throw it away, you have no guarantee that something won't
+ # change later which breaks your code. If, on the other hand, you _have_
+ # tests (obviously you have to write them first), and run them as often
+ # as possible, you slowly build up a wall of things that cannot break
+ # without you immediately knowing about it. This is when unit testing
+ # hits its peak usefulness.
+ #
+ # Enter Test::Unit, a framework for unit testing in Ruby, helping you to
+ # design, debug and evaluate your code by making it easy to write and
+ # have tests for it.
+ #
+ #
+ # == Notes
+ #
+ # Test::Unit has grown out of and superceded Lapidary.
+ #
+ #
+ # == Feedback
+ #
+ # I like (and do my best to practice) XP, so I value early releases,
+ # user feedback, and clean, simple, expressive code. There is always
+ # room for improvement in everything I do, and Test::Unit is no
+ # exception. Please, let me know what you think of Test::Unit as it
+ # stands, and what you'd like to see expanded/changed/improved/etc. If
+ # you find a bug, let me know ASAP; one good way to let me know what the
+ # bug is is to submit a new test that catches it :-) Also, I'd love to
+ # hear about any successes you have with Test::Unit, and any
+ # documentation you might add will be greatly appreciated. My contact
+ # info is below.
+ #
+ #
+ # == Contact Information
+ #
+ # A lot of discussion happens about Ruby in general on the ruby-talk
+ # mailing list (http://www.ruby-lang.org/en/ml.html), and you can ask
+ # any questions you might have there. I monitor the list, as do many
+ # other helpful Rubyists, and you're sure to get a quick answer. Of
+ # course, you're also welcome to email me (Nathaniel Talbott) directly
+ # at mailto:testunit@talbott.ws, and I'll do my best to help you out.
+ #
+ #
+ # == Credits
+ #
+ # I'd like to thank...
+ #
+ # Matz, for a great language!
+ #
+ # Masaki Suketa, for his work on RubyUnit, which filled a vital need in
+ # the Ruby world for a very long time. I'm also grateful for his help in
+ # polishing Test::Unit and getting the RubyUnit compatibility layer
+ # right. His graciousness in allowing Test::Unit to supercede RubyUnit
+ # continues to be a challenge to me to be more willing to defer my own
+ # rights.
+ #
+ # Ken McKinlay, for his interest and work on unit testing, and for his
+ # willingness to dialog about it. He was also a great help in pointing
+ # out some of the holes in the RubyUnit compatibility layer.
+ #
+ # Dave Thomas, for the original idea that led to the extremely simple
+ # "require 'test/unit'", plus his code to improve it even more by
+ # allowing the selection of tests from the command-line. Also, without
+ # RDoc, the documentation for Test::Unit would stink a lot more than it
+ # does now.
+ #
+ # Everyone who's helped out with bug reports, feature ideas,
+ # encouragement to continue, etc. It's a real privilege to be a part of
+ # the Ruby community.
+ #
+ # The guys at RoleModel Software, for putting up with me repeating, "But
+ # this would be so much easier in Ruby!" whenever we're coding in Java.
+ #
+ # My Creator, for giving me life, and giving it more abundantly.
+ #
+ #
+ # == License
+ #
+ # Test::Unit is copyright (c) 2000-2003 Nathaniel Talbott. It is free
+ # software, and is distributed under the Ruby license. See the COPYING
+ # file in the standard Ruby distribution for details.
+ #
+ #
+ # == Warranty
+ #
+ # This software is provided "as is" and without any express or
+ # implied warranties, including, without limitation, the implied
+ # warranties of merchantibility and fitness for a particular
+ # purpose.
+ #
+ #
+ # == Author
+ #
+ # Nathaniel Talbott.
+ # Copyright (c) 2000-2003, Nathaniel Talbott
+ #
+ # ----
+ #
+ # = Usage
+ #
+ # The general idea behind unit testing is that you write a _test_
+ # _method_ that makes certain _assertions_ about your code, working
+ # against a _test_ _fixture_. A bunch of these _test_ _methods_ are
+ # bundled up into a _test_ _suite_ and can be run any time the
+ # developer wants. The results of a run are gathered in a _test_
+ # _result_ and displayed to the user through some UI. So, lets break
+ # this down and see how Test::Unit provides each of these necessary
+ # pieces.
+ #
+ #
+ # == Assertions
+ #
+ # These are the heart of the framework. Think of an assertion as a
+ # statement of expected outcome, i.e. "I assert that x should be equal
+ # to y". If, when the assertion is executed, it turns out to be
+ # correct, nothing happens, and life is good. If, on the other hand,
+ # your assertion turns out to be false, an error is propagated with
+ # pertinent information so that you can go back and make your
+ # assertion succeed, and, once again, life is good. For an explanation
+ # of the current assertions, see Test::Unit::Assertions.
+ #
+ #
+ # == Test Method & Test Fixture
+ #
+ # Obviously, these assertions have to be called within a context that
+ # knows about them and can do something meaningful with their
+ # pass/fail value. Also, it's handy to collect a bunch of related
+ # tests, each test represented by a method, into a common test class
+ # that knows how to run them. The tests will be in a separate class
+ # from the code they're testing for a couple of reasons. First of all,
+ # it allows your code to stay uncluttered with test code, making it
+ # easier to maintain. Second, it allows the tests to be stripped out
+ # for deployment, since they're really there for you, the developer,
+ # and your users don't need them. Third, and most importantly, it
+ # allows you to set up a common test fixture for your tests to run
+ # against.
+ #
+ # What's a test fixture? Well, tests do not live in a vacuum; rather,
+ # they're run against the code they are testing. Often, a collection
+ # of tests will run against a common set of data, also called a
+ # fixture. If they're all bundled into the same test class, they can
+ # all share the setting up and tearing down of that data, eliminating
+ # unnecessary duplication and making it much easier to add related
+ # tests.
+ #
+ # Test::Unit::TestCase wraps up a collection of test methods together
+ # and allows you to easily set up and tear down the same test fixture
+ # for each test. This is done by overriding #setup and/or #teardown,
+ # which will be called before and after each test method that is
+ # run. The TestCase also knows how to collect the results of your
+ # assertions into a Test::Unit::TestResult, which can then be reported
+ # back to you... but I'm getting ahead of myself. To write a test,
+ # follow these steps:
+ #
+ # * Make sure Test::Unit is in your library path.
+ # * require 'test/unit' in your test script.
+ # * Create a class that subclasses Test::Unit::TestCase.
+ # * Add a method that begins with "test" to your class.
+ # * Make assertions in your test method.
+ # * Optionally define #setup and/or #teardown to set up and/or tear
+ # down your common test fixture.
+ # * You can now run your test as you would any other Ruby
+ # script... try it and see!
+ #
+ # A really simple test might look like this (#setup and #teardown are
+ # commented out to indicate that they are completely optional):
+ #
+ # require 'test/unit'
+ #
+ # class TC_MyTest < Test::Unit::TestCase
+ # # def setup
+ # # end
+ #
+ # # def teardown
+ # # end
+ #
+ # def test_fail
+ # assert(false, 'Assertion was false.')
+ # end
+ # end
+ #
+ #
+ # == Test Runners
+ #
+ # So, now you have this great test class, but you still need a way to
+ # run it and view any failures that occur during the run. This is
+ # where Test::Unit::UI::Console::TestRunner (and others, such as
+ # Test::Unit::UI::GTK::TestRunner) comes into play. The console test
+ # runner is automatically invoked for you if you require 'test/unit'
+ # and simply run the file. To use another runner, or to manually
+ # invoke a runner, simply call its run class method and pass in an
+ # object that responds to the suite message with a
+ # Test::Unit::TestSuite. This can be as simple as passing in your
+ # TestCase class (which has a class suite method). It might look
+ # something like this:
+ #
+ # require 'test/unit/ui/console/testrunner'
+ # Test::Unit::UI::Console::TestRunner.run(TC_MyTest)
+ #
+ #
+ # == Test Suite
+ #
+ # As more and more unit tests accumulate for a given project, it
+ # becomes a real drag running them one at a time, and it also
+ # introduces the potential to overlook a failing test because you
+ # forget to run it. Suddenly it becomes very handy that the
+ # TestRunners can take any object that returns a Test::Unit::TestSuite
+ # in response to a suite method. The TestSuite can, in turn, contain
+ # other TestSuites or individual tests (typically created by a
+ # TestCase). In other words, you can easily wrap up a group of
+ # TestCases and TestSuites like this:
+ #
+ # require 'test/unit/testsuite'
+ # require 'tc_myfirsttests'
+ # require 'tc_moretestsbyme'
+ # require 'ts_anothersetoftests'
+ #
+ # class TS_MyTests
+ # def self.suite
+ # suite = Test::Unit::TestSuite.new
+ # suite << TC_MyFirstTests.suite
+ # suite << TC_MoreTestsByMe.suite
+ # suite << TS_AnotherSetOfTests.suite
+ # return suite
+ # end
+ # end
+ # Test::Unit::UI::Console::TestRunner.run(TS_MyTests)
+ #
+ # Now, this is a bit cumbersome, so Test::Unit does a little bit more
+ # for you, by wrapping these up automatically when you require
+ # 'test/unit'. What does this mean? It means you could write the above
+ # test case like this instead:
+ #
+ # require 'test/unit'
+ # require 'tc_myfirsttests'
+ # require 'tc_moretestsbyme'
+ # require 'ts_anothersetoftests'
+ #
+ # Test::Unit is smart enough to find all the test cases existing in
+ # the ObjectSpace and wrap them up into a suite for you. It then runs
+ # the dynamic suite using the console TestRunner.
+ #
+ #
+ # == Questions?
+ #
+ # I'd really like to get feedback from all levels of Ruby
+ # practitioners about typos, grammatical errors, unclear statements,
+ # missing points, etc., in this document (or any other).
+ #
- reject_pat = Regexp.union(reject.map {|r| /#{r}/ })
- files.reject! {|f| reject_pat =~ f }
-
- files.each {|f|
- d = File.dirname(path = File.expand_path(f))
- unless $:.include? d
- $: << d
- end
- begin
- require path
- rescue LoadError
- puts "#{f}: #{$!}"
- end
- }
+ module Unit
+ # If set to false Test::Unit will not automatically run at exit.
+ def self.run=(flag)
+ @run = flag
+ end
- ARGV.replace minitest_argv
+ # Automatically run tests at exit?
+ def self.run?
+ @run ||= false
end
end
end
-MiniTest::Unit.autorun
+at_exit do
+ unless $! || Test::Unit.run?
+ exit Test::Unit::AutoRunner.run
+ end
+end
diff --git a/lib/test/unit/assertionfailederror.rb b/lib/test/unit/assertionfailederror.rb
new file mode 100644
index 0000000000..a21e4b5870
--- /dev/null
+++ b/lib/test/unit/assertionfailederror.rb
@@ -0,0 +1,14 @@
+#--
+#
+# Author:: Nathaniel Talbott.
+# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+module Test
+ module Unit
+
+ # Thrown by Test::Unit::Assertions when an assertion fails.
+ class AssertionFailedError < StandardError
+ end
+ end
+end
diff --git a/lib/test/unit/assertions.rb b/lib/test/unit/assertions.rb
index 35348d87be..aa97799de8 100644
--- a/lib/test/unit/assertions.rb
+++ b/lib/test/unit/assertions.rb
@@ -1,137 +1,622 @@
-require 'minitest/unit'
-require 'pp'
+# Author:: Nathaniel Talbott.
+# Copyright:: Copyright (c) 2000-2003 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+require 'test/unit/assertionfailederror'
+require 'test/unit/util/backtracefilter'
module Test
module Unit
+
+ ##
+ # Test::Unit::Assertions contains the standard Test::Unit assertions.
+ # Assertions is included in Test::Unit::TestCase.
+ #
+ # To include it in your own code and use its functionality, you simply
+ # need to rescue Test::Unit::AssertionFailedError. Additionally you may
+ # override add_assertion to get notified whenever an assertion is made.
+ #
+ # Notes:
+ # * The message to each assertion, if given, will be propagated with the
+ # failure.
+ # * It is easy to add your own assertions based on assert_block().
+ #
+ # = Example Custom Assertion
+ #
+ # def deny(boolean, message = nil)
+ # message = build_message message, '<?> is not false or nil.', boolean
+ # assert_block message do
+ # not boolean
+ # end
+ # end
+
module Assertions
- include MiniTest::Assertions
- def mu_pp(obj)
- obj.pretty_inspect.chomp
+ ##
+ # The assertion upon which all other assertions are based. Passes if the
+ # block yields true.
+ #
+ # Example:
+ # assert_block "Couldn't do the thing" do
+ # do_the_thing
+ # end
+
+ public
+ def assert_block(message="assert_block failed.") # :yields:
+ _wrap_assertion do
+ if (! yield)
+ raise AssertionFailedError.new(message.to_s)
+ end
+ end
end
- def assert_raise(*args, &b)
- assert_raises(*args, &b)
+ ##
+ # Asserts that +boolean+ is not false or nil.
+ #
+ # Example:
+ # assert [1, 2].include?(5)
+
+ public
+ def assert(boolean, message=nil)
+ _wrap_assertion do
+ assert_block("assert should not be called with a block.") { !block_given? }
+ assert_block(build_message(message, "<?> is not true.", boolean)) { boolean }
+ end
end
- def assert_nothing_raised(*args)
- self._assertions += 1
- if Module === args.last
- msg = nil
- else
- msg = args.pop
- end
- begin
- line = __LINE__; yield
- rescue Exception => e
- bt = e.backtrace
- as = e.instance_of?(MiniTest::Assertion)
- if as
- ans = /\A#{Regexp.quote(__FILE__)}:#{line}:in /o
- bt.reject! {|ln| ans =~ ln}
- end
- if ((args.empty? && !as) ||
- args.any? {|a| a.instance_of?(Module) ? e.is_a?(a) : e.class == a })
- msg = message(msg) { "Exception raised:\n<#{mu_pp(e)}>" }
- raise MiniTest::Assertion, msg.call, bt
+ ##
+ # Passes if +expected+ == +actual.
+ #
+ # Note that the ordering of arguments is important, since a helpful
+ # error message is generated when this one fails that tells you the
+ # values of expected and actual.
+ #
+ # Example:
+ # assert_equal 'MY STRING', 'my string'.upcase
+
+ public
+ def assert_equal(expected, actual, message=nil)
+ full_message = build_message(message, <<EOT, expected, actual)
+<?> expected but was
+<?>.
+EOT
+ assert_block(full_message) { expected == actual }
+ end
+
+ private
+ def _check_exception_class(args) # :nodoc:
+ args.partition do |klass|
+ next if klass.instance_of?(Module)
+ assert(Exception >= klass, "Should expect a class of exception, #{klass}")
+ true
+ end
+ end
+
+ private
+ def _expected_exception?(actual_exception, exceptions, modules) # :nodoc:
+ exceptions.include?(actual_exception.class) or
+ modules.any? {|mod| actual_exception.is_a?(mod)}
+ end
+
+ ##
+ # Passes if the block raises one of the given exceptions.
+ #
+ # Example:
+ # assert_raise RuntimeError, LoadError do
+ # raise 'Boom!!!'
+ # end
+
+ public
+ def assert_raise(*args)
+ _wrap_assertion do
+ if Module === args.last
+ message = ""
else
- raise
- end
- end
- nil
- end
-
- def assert_nothing_thrown(msg=nil)
- begin
- yield
- rescue ArgumentError => error
- raise error if /\Auncaught throw (.+)\z/m !~ error.message
- msg = message(msg) { "<#{$1}> was thrown when nothing was expected" }
- flunk(msg)
- end
- assert(true, "Expected nothing to be thrown")
- end
-
- def assert_equal(exp, act, msg = nil)
- msg = message(msg) {
- exp_str = mu_pp(exp)
- act_str = mu_pp(act)
- exp_comment = ''
- act_comment = ''
- if exp_str == act_str
- if (exp.is_a?(String) && act.is_a?(String)) ||
- (exp.is_a?(Regexp) && act.is_a?(Regexp))
- exp_comment = " (#{exp.encoding})"
- act_comment = " (#{act.encoding})"
- elsif exp.is_a?(Float) && act.is_a?(Float)
- exp_str = "%\#.#{Float::DIG+2}g" % exp
- act_str = "%\#.#{Float::DIG+2}g" % act
- elsif exp.is_a?(Time) && act.is_a?(Time)
- exp_comment = " (nsec=#{exp.nsec})"
- act_comment = " (nsec=#{act.nsec})"
- elsif exp.class != act.class
- # a subclass of Range, for example.
- exp_comment = " (#{exp.class})"
- act_comment = " (#{act.class})"
+ message = args.pop
+ end
+ exceptions, modules = _check_exception_class(args)
+ expected = args.size == 1 ? args.first : args
+ actual_exception = nil
+ full_message = build_message(message, "<?> exception expected but none was thrown.", expected)
+ assert_block(full_message) do
+ begin
+ yield
+ rescue Exception => actual_exception
+ break
end
- elsif !Encoding.compatible?(exp_str, act_str)
- if exp.is_a?(String) && act.is_a?(String)
- exp_str = exp.dump
- act_str = act.dump
- exp_comment = " (#{exp.encoding})"
- act_comment = " (#{act.encoding})"
+ false
+ end
+ full_message = build_message(message, "<?> exception expected but was\n?", expected, actual_exception)
+ assert_block(full_message) {_expected_exception?(actual_exception, exceptions, modules)}
+ actual_exception
+ end
+ end
+
+ ##
+ # Alias of assert_raise.
+ #
+ # Will be deprecated in 1.9, and removed in 2.0.
+
+ public
+ def assert_raises(*args, &block)
+ assert_raise(*args, &block)
+ end
+
+ ##
+ # Passes if +object+ .instance_of? +klass+
+ #
+ # Example:
+ # assert_instance_of String, 'foo'
+
+ public
+ def assert_instance_of(klass, object, message="")
+ _wrap_assertion do
+ assert_equal(Class, klass.class, "assert_instance_of takes a Class as its first argument")
+ full_message = build_message(message, <<EOT, object, klass, object.class)
+<?> expected to be an instance of
+<?> but was
+<?>.
+EOT
+ assert_block(full_message){object.instance_of?(klass)}
+ end
+ end
+
+ ##
+ # Passes if +object+ is nil.
+ #
+ # Example:
+ # assert_nil [1, 2].uniq!
+
+ public
+ def assert_nil(object, message="")
+ assert_equal(nil, object, message)
+ end
+
+ ##
+ # Passes if +object+ .kind_of? +klass+
+ #
+ # Example:
+ # assert_kind_of Object, 'foo'
+
+ public
+ def assert_kind_of(klass, object, message="")
+ _wrap_assertion do
+ assert(klass.kind_of?(Module), "The first parameter to assert_kind_of should be a kind_of Module.")
+ full_message = build_message(message, "<?>\nexpected to be kind_of\\?\n<?> but was\n<?>.", object, klass, object.class)
+ assert_block(full_message){object.kind_of?(klass)}
+ end
+ end
+
+ ##
+ # Passes if +object+ .respond_to? +method+
+ #
+ # Example:
+ # assert_respond_to 'bugbear', :slice
+
+ public
+ def assert_respond_to(object, method, message="")
+ _wrap_assertion do
+ full_message = build_message(nil, "<?>\ngiven as the method name argument to #assert_respond_to must be a Symbol or #respond_to\\?(:to_str).", method)
+
+ assert_block(full_message) do
+ method.kind_of?(Symbol) || method.respond_to?(:to_str)
+ end
+ full_message = build_message(message, <<EOT, object, object.class, method)
+<?>
+of type <?>
+expected to respond_to\\?<?>.
+EOT
+ assert_block(full_message) { object.respond_to?(method) }
+ end
+ end
+
+ ##
+ # Passes if +string+ =~ +pattern+.
+ #
+ # Example:
+ # assert_match(/\d+/, 'five, 6, seven')
+
+ public
+ def assert_match(pattern, string, message="")
+ _wrap_assertion do
+ pattern = case(pattern)
+ when String
+ Regexp.new(Regexp.escape(pattern))
else
- exp_str = exp_str.dump
- act_str = act_str.dump
- end
+ pattern
end
- "<#{exp_str}>#{exp_comment} expected but was\n<#{act_str}>#{act_comment}"
- }
- assert(exp == act, msg)
+ full_message = build_message(message, "<?> expected to be =~\n<?>.", string, pattern)
+ assert_block(full_message) { string =~ pattern }
+ end
end
- def assert_not_nil(exp, msg=nil)
- msg = message(msg) { "<#{mu_pp(exp)}> expected to not be nil" }
- assert(!exp.nil?, msg)
+ ##
+ # Passes if +actual+ .equal? +expected+ (i.e. they are the same
+ # instance).
+ #
+ # Example:
+ # o = Object.new
+ # assert_same o, o
+
+ public
+ def assert_same(expected, actual, message="")
+ full_message = build_message(message, <<EOT, expected, expected.__id__, actual, actual.__id__)
+<?>
+with id <?> expected to be equal\\? to
+<?>
+with id <?>.
+EOT
+ assert_block(full_message) { actual.equal?(expected) }
end
- def assert_not_equal(exp, act, msg=nil)
- msg = message(msg) { "<#{mu_pp(exp)}> expected to be != to\n<#{mu_pp(act)}>" }
- assert(exp != act, msg)
+ ##
+ # Compares the +object1+ with +object2+ using +operator+.
+ #
+ # Passes if object1.__send__(operator, object2) is true.
+ #
+ # Example:
+ # assert_operator 5, :>=, 4
+
+ public
+ def assert_operator(object1, operator, object2, message="")
+ _wrap_assertion do
+ full_message = build_message(nil, "<?>\ngiven as the operator for #assert_operator must be a Symbol or #respond_to\\?(:to_str).", operator)
+ assert_block(full_message){operator.kind_of?(Symbol) || operator.respond_to?(:to_str)}
+ full_message = build_message(message, <<EOT, object1, AssertionMessage.literal(operator), object2)
+<?> expected to be
+?
+<?>.
+EOT
+ assert_block(full_message) { object1.__send__(operator, object2) }
+ end
+ end
+
+ ##
+ # Passes if block does not raise an exception.
+ #
+ # Example:
+ # assert_nothing_raised do
+ # [1, 2].uniq
+ # end
+
+ public
+ def assert_nothing_raised(*args)
+ _wrap_assertion do
+ if Module === args.last
+ message = ""
+ else
+ message = args.pop
+ end
+ exceptions, modules = _check_exception_class(args)
+ begin
+ yield
+ rescue Exception => e
+ if ((args.empty? && !e.instance_of?(AssertionFailedError)) ||
+ _expected_exception?(e, exceptions, modules))
+ assert_block(build_message(message, "Exception raised:\n?", e)){false}
+ else
+ raise
+ end
+ end
+ nil
+ end
end
- def assert_no_match(regexp, string, msg=nil)
- assert_instance_of(Regexp, regexp, "The first argument to assert_no_match should be a Regexp.")
- self._assertions -= 1
- msg = message(msg) { "<#{mu_pp(regexp)}> expected to not match\n<#{mu_pp(string)}>" }
- assert(regexp !~ string, msg)
+ ##
+ # Flunk always fails.
+ #
+ # Example:
+ # flunk 'Not done testing yet.'
+
+ public
+ def flunk(message="Flunked")
+ assert_block(build_message(message)){false}
end
+ ##
+ # Passes if ! +actual+ .equal? +expected+
+ #
+ # Example:
+ # assert_not_same Object.new, Object.new
+
+ public
def assert_not_same(expected, actual, message="")
- msg = message(msg) { build_message(message, <<EOT, expected, expected.__id__, actual, actual.__id__) }
+ full_message = build_message(message, <<EOT, expected, expected.__id__, actual, actual.__id__)
<?>
with id <?> expected to not be equal\\? to
<?>
with id <?>.
EOT
- assert(!actual.equal?(expected), msg)
+ assert_block(full_message) { !actual.equal?(expected) }
end
- # get rid of overcounting
- def assert_respond_to obj, meth, msg = nil
- super if !caller[0].rindex(MiniTest::MINI_DIR, 0) || !obj.respond_to?(meth)
+ ##
+ # Passes if +expected+ != +actual+
+ #
+ # Example:
+ # assert_not_equal 'some string', 5
+
+ public
+ def assert_not_equal(expected, actual, message="")
+ full_message = build_message(message, "<?> expected to be != to\n<?>.", expected, actual)
+ assert_block(full_message) { expected != actual }
end
- ms = instance_methods(true).map {|sym| sym.to_s }
- ms.grep(/\Arefute_/) do |m|
- mname = ('assert_not_' << m.to_s[/.*?_(.*)/, 1])
- alias_method(mname, m) unless ms.include? mname
+ ##
+ # Passes if ! +object+ .nil?
+ #
+ # Example:
+ # assert_not_nil '1 two 3'.sub!(/two/, '2')
+
+ public
+ def assert_not_nil(object, message="")
+ full_message = build_message(message, "<?> expected to not be nil.", object)
+ assert_block(full_message){!object.nil?}
end
+ ##
+ # Passes if +regexp+ !~ +string+
+ #
+ # Example:
+ # assert_no_match(/two/, 'one 2 three')
+
+ public
+ def assert_no_match(regexp, string, message="")
+ _wrap_assertion do
+ assert_instance_of(Regexp, regexp, "The first argument to assert_no_match should be a Regexp.")
+ full_message = build_message(message, "<?> expected to not match\n<?>.", regexp, string)
+ assert_block(full_message) { regexp !~ string }
+ end
+ end
+
+ UncaughtThrow = {NameError => /^uncaught throw \`(.+)\'$/,
+ ThreadError => /^uncaught throw \`(.+)\' in thread /} #`
+
+ ##
+ # Passes if the block throws +expected_symbol+
+ #
+ # Example:
+ # assert_throws :done do
+ # throw :done
+ # end
+
+ public
+ def assert_throws(expected_symbol, message="", &proc)
+ _wrap_assertion do
+ assert_instance_of(Symbol, expected_symbol, "assert_throws expects the symbol that should be thrown for its first argument")
+ assert_block("Should have passed a block to assert_throws."){block_given?}
+ caught = true
+ begin
+ catch(expected_symbol) do
+ proc.call
+ caught = false
+ end
+ full_message = build_message(message, "<?> should have been thrown.", expected_symbol)
+ assert_block(full_message){caught}
+ rescue NameError, ThreadError => error
+ if UncaughtThrow[error.class] !~ error.message
+ raise error
+ end
+ full_message = build_message(message, "<?> expected to be thrown but\n<?> was thrown.", expected_symbol, $1.intern)
+ flunk(full_message)
+ end
+ end
+ end
+
+ ##
+ # Passes if block does not throw anything.
+ #
+ # Example:
+ # assert_nothing_thrown do
+ # [1, 2].uniq
+ # end
+
+ public
+ def assert_nothing_thrown(message="", &proc)
+ _wrap_assertion do
+ assert(block_given?, "Should have passed a block to assert_nothing_thrown")
+ begin
+ proc.call
+ rescue NameError, ThreadError => error
+ if UncaughtThrow[error.class] !~ error.message
+ raise error
+ end
+ full_message = build_message(message, "<?> was thrown when nothing was expected", $1.intern)
+ flunk(full_message)
+ end
+ assert(true, "Expected nothing to be thrown")
+ end
+ end
+
+ ##
+ # Passes if +expected_float+ and +actual_float+ are equal
+ # within +delta+ tolerance.
+ #
+ # Example:
+ # assert_in_delta 0.05, (50000.0 / 10**6), 0.00001
+
+ public
+ def assert_in_delta(expected_float, actual_float, delta, message="")
+ _wrap_assertion do
+ {expected_float => "first float", actual_float => "second float", delta => "delta"}.each do |float, name|
+ assert_respond_to(float, :to_f, "The arguments must respond to to_f; the #{name} did not")
+ end
+ assert_operator(delta, :>=, 0.0, "The delta should not be negative")
+ full_message = build_message(message, <<EOT, expected_float, actual_float, delta)
+<?> and
+<?> expected to be within
+<?> of each other.
+EOT
+ assert_block(full_message) { (expected_float.to_f - actual_float.to_f).abs <= delta.to_f }
+ end
+ end
+
+ ##
+ # Passes if the method send returns a true value.
+ #
+ # +send_array+ is composed of:
+ # * A receiver
+ # * A method
+ # * Arguments to the method
+ #
+ # Example:
+ # assert_send [[1, 2], :include?, 4]
+
+ public
+ def assert_send(send_array, message="")
+ _wrap_assertion do
+ assert_instance_of(Array, send_array, "assert_send requires an array of send information")
+ assert(send_array.size >= 2, "assert_send requires at least a receiver and a message name")
+ full_message = build_message(message, <<EOT, send_array[0], AssertionMessage.literal(send_array[1].to_s), send_array[2..-1])
+<?> expected to respond to
+<?(?)> with a true value.
+EOT
+ assert_block(full_message) { send_array[0].__send__(send_array[1], *send_array[2..-1]) }
+ end
+ end
+
+ ##
+ # Builds a failure message. +head+ is added before the +template+ and
+ # +arguments+ replaces the '?'s positionally in the template.
+
+ public
def build_message(head, template=nil, *arguments)
template &&= template.chomp
- template.gsub(/\?/) { mu_pp(arguments.shift) }
+ return AssertionMessage.new(head, template, arguments)
end
+
+ private
+ def _wrap_assertion
+ @_assertion_wrapped ||= false
+ unless (@_assertion_wrapped)
+ @_assertion_wrapped = true
+ begin
+ add_assertion
+ return yield
+ ensure
+ @_assertion_wrapped = false
+ end
+ else
+ return yield
+ end
+ end
+
+ ##
+ # Called whenever an assertion is made. Define this in classes that
+ # include Test::Unit::Assertions to record assertion counts.
+
+ private
+ def add_assertion
+ end
+
+ ##
+ # Select whether or not to use the pretty-printer. If this option is set
+ # to false before any assertions are made, pp.rb will not be required.
+
+ public
+ def self.use_pp=(value)
+ AssertionMessage.use_pp = value
+ end
+
+ # :stopdoc:
+
+ class AssertionMessage
+ @use_pp = true
+ class << self
+ attr_accessor :use_pp
+ end
+
+ class Literal
+ def initialize(value)
+ @value = value
+ end
+
+ def inspect
+ @value.to_s
+ end
+ end
+
+ class Template
+ def self.create(string)
+ parts = (string ? string.scan(/(?=[^\\])\?|(?:\\\?|[^\?])+/m) : [])
+ self.new(parts)
+ end
+
+ attr_reader :count
+
+ def initialize(parts)
+ @parts = parts
+ @count = parts.find_all{|e| e == '?'}.size
+ end
+
+ def result(parameters)
+ raise "The number of parameters does not match the number of substitutions." if(parameters.size != count)
+ params = parameters.dup
+ @parts.collect{|e| e == '?' ? params.shift : e.gsub(/\\\?/m, '?')}.join('')
+ end
+ end
+
+ def self.literal(value)
+ Literal.new(value)
+ end
+
+ include Util::BacktraceFilter
+
+ def initialize(head, template_string, parameters)
+ @head = head
+ @template_string = template_string
+ @parameters = parameters
+ end
+
+ def convert(object)
+ case object
+ when Exception
+ <<EOM.chop
+Class: <#{convert(object.class)}>
+Message: <#{convert(object.message)}>
+---Backtrace---
+#{filter_backtrace(object.backtrace).join("\n")}
+---------------
+EOM
+ else
+ if(self.class.use_pp)
+ begin
+ require 'pp'
+ rescue LoadError
+ self.class.use_pp = false
+ return object.inspect
+ end unless(defined?(PP))
+ PP.pp(object, '').chomp
+ else
+ object.inspect
+ end
+ end
+ end
+
+ def template
+ @template ||= Template.create(@template_string)
+ end
+
+ def add_period(string)
+ (string =~ /\.\Z/ ? string : string + '.')
+ end
+
+ def to_s
+ message_parts = []
+ if (@head)
+ head = @head.to_s
+ unless(head.empty?)
+ message_parts << add_period(head)
+ end
+ end
+ tail = template.result(@parameters.collect{|e| convert(e)})
+ message_parts << tail unless(tail.empty?)
+ message_parts.join("\n")
+ end
+ end
+
+ # :startdoc:
+
end
end
end
diff --git a/lib/test/unit/autorunner.rb b/lib/test/unit/autorunner.rb
new file mode 100644
index 0000000000..86c9b12940
--- /dev/null
+++ b/lib/test/unit/autorunner.rb
@@ -0,0 +1,220 @@
+require 'test/unit'
+require 'test/unit/ui/testrunnerutilities'
+require 'optparse'
+
+module Test
+ module Unit
+ class AutoRunner
+ def self.run(force_standalone=false, default_dir=nil, argv=ARGV, &block)
+ r = new(force_standalone || standalone?, &block)
+ r.base = default_dir
+ r.process_args(argv)
+ r.run
+ end
+
+ def self.standalone?
+ return false unless("-e" == $0)
+ ObjectSpace.each_object(Class) do |klass|
+ return false if(klass < TestCase)
+ end
+ true
+ end
+
+ RUNNERS = {
+ :console => proc do |r|
+ require 'test/unit/ui/console/testrunner'
+ Test::Unit::UI::Console::TestRunner
+ end,
+ :gtk => proc do |r|
+ require 'test/unit/ui/gtk/testrunner'
+ Test::Unit::UI::GTK::TestRunner
+ end,
+ :gtk2 => proc do |r|
+ require 'test/unit/ui/gtk2/testrunner'
+ Test::Unit::UI::GTK2::TestRunner
+ end,
+ :fox => proc do |r|
+ require 'test/unit/ui/fox/testrunner'
+ Test::Unit::UI::Fox::TestRunner
+ end,
+ :tk => proc do |r|
+ require 'test/unit/ui/tk/testrunner'
+ Test::Unit::UI::Tk::TestRunner
+ end,
+ }
+
+ OUTPUT_LEVELS = [
+ [:silent, UI::SILENT],
+ [:progress, UI::PROGRESS_ONLY],
+ [:normal, UI::NORMAL],
+ [:verbose, UI::VERBOSE],
+ ]
+
+ COLLECTORS = {
+ :objectspace => proc do |r|
+ require 'test/unit/collector/objectspace'
+ c = Collector::ObjectSpace.new
+ c.filter = r.filters
+ c.collect($0.sub(/\.rb\Z/, ''))
+ end,
+ :dir => proc do |r|
+ require 'test/unit/collector/dir'
+ c = Collector::Dir.new
+ c.filter = r.filters
+ c.pattern.concat(r.pattern) if(r.pattern)
+ c.exclude.concat(r.exclude) if(r.exclude)
+ c.base = r.base
+ $:.push(r.base) if r.base
+ c.collect(*(r.to_run.empty? ? ['.'] : r.to_run))
+ end,
+ }
+
+ attr_reader :suite
+ attr_accessor :output_level, :filters, :to_run, :pattern, :exclude, :base, :workdir
+ attr_writer :runner, :collector
+
+ def initialize(standalone)
+ Unit.run = true
+ @standalone = standalone
+ @runner = RUNNERS[:console]
+ @collector = COLLECTORS[(standalone ? :dir : :objectspace)]
+ @filters = []
+ @to_run = []
+ @output_level = UI::NORMAL
+ @workdir = nil
+ yield(self) if(block_given?)
+ end
+
+ def process_args(args = ARGV)
+ begin
+ options.order!(args) {|arg| @to_run << arg}
+ rescue OptionParser::ParseError => e
+ puts e
+ puts options
+ $! = nil
+ abort
+ else
+ @filters << proc{false} unless(@filters.empty?)
+ end
+ not @to_run.empty?
+ end
+
+ def options
+ @options ||= OptionParser.new do |o|
+ o.banner = "Test::Unit automatic runner."
+ o.banner << "\nUsage: #{$0} [options] [-- untouched arguments]"
+
+ o.on
+ o.on('-r', '--runner=RUNNER', RUNNERS,
+ "Use the given RUNNER.",
+ "(" + keyword_display(RUNNERS) + ")") do |r|
+ @runner = r
+ end
+
+ if(@standalone)
+ o.on('-b', '--basedir=DIR', "Base directory of test suites.") do |b|
+ @base = b
+ end
+
+ o.on('-w', '--workdir=DIR', "Working directory to run tests.") do |w|
+ @workdir = w
+ end
+
+ o.on('-a', '--add=TORUN', Array,
+ "Add TORUN to the list of things to run;",
+ "can be a file or a directory.") do |a|
+ @to_run.concat(a)
+ end
+
+ @pattern = []
+ o.on('-p', '--pattern=PATTERN', Regexp,
+ "Match files to collect against PATTERN.") do |e|
+ @pattern << e
+ end
+
+ @exclude = []
+ o.on('-x', '--exclude=PATTERN', Regexp,
+ "Ignore files to collect against PATTERN.") do |e|
+ @exclude << e
+ end
+ end
+
+ o.on('-n', '--name=NAME', String,
+ "Runs tests matching NAME.",
+ "(patterns may be used).") do |n|
+ n = (%r{\A/(.*)/\Z} =~ n ? Regexp.new($1) : n)
+ case n
+ when Regexp
+ @filters << proc{|t| n =~ t.method_name ? true : nil}
+ else
+ @filters << proc{|t| n == t.method_name ? true : nil}
+ end
+ end
+
+ o.on('-t', '--testcase=TESTCASE', String,
+ "Runs tests in TestCases matching TESTCASE.",
+ "(patterns may be used).") do |n|
+ n = (%r{\A/(.*)/\Z} =~ n ? Regexp.new($1) : n)
+ case n
+ when Regexp
+ @filters << proc{|t| n =~ t.class.name ? true : nil}
+ else
+ @filters << proc{|t| n == t.class.name ? true : nil}
+ end
+ end
+
+ o.on('-I', "--load-path=DIR[#{File::PATH_SEPARATOR}DIR...]",
+ "Appends directory list to $LOAD_PATH.") do |dirs|
+ $LOAD_PATH.concat(dirs.split(File::PATH_SEPARATOR))
+ end
+
+ o.on('-v', '--verbose=[LEVEL]', OUTPUT_LEVELS,
+ "Set the output level (default is verbose).",
+ "(" + keyword_display(OUTPUT_LEVELS) + ")") do |l|
+ @output_level = l || UI::VERBOSE
+ end
+
+ o.on('--',
+ "Stop processing options so that the",
+ "remaining options will be passed to the",
+ "test."){o.terminate}
+
+ o.on('-h', '--help', 'Display this help.'){puts o; exit}
+
+ o.on_tail
+ o.on_tail('Deprecated options:')
+
+ o.on_tail('--console', 'Console runner (use --runner).') do
+ warn("Deprecated option (--console).")
+ @runner = RUNNERS[:console]
+ end
+
+ o.on_tail('--gtk', 'GTK runner (use --runner).') do
+ warn("Deprecated option (--gtk).")
+ @runner = RUNNERS[:gtk]
+ end
+
+ o.on_tail('--fox', 'Fox runner (use --runner).') do
+ warn("Deprecated option (--fox).")
+ @runner = RUNNERS[:fox]
+ end
+
+ o.on_tail
+ end
+ end
+
+ def keyword_display(array)
+ list = array.collect {|e, *| e.to_s}
+ Array === array or list.sort!
+ list.collect {|e| e.sub(/^(.)([A-Za-z]+)(?=\w*$)/, '\\1[\\2]')}.join(", ")
+ end
+
+ def run
+ @suite = @collector[self]
+ result = @runner[self] or return false
+ Dir.chdir(@workdir) if @workdir
+ result.run(@suite, @output_level).passed?
+ end
+ end
+ end
+end
diff --git a/lib/test/unit/collector.rb b/lib/test/unit/collector.rb
new file mode 100644
index 0000000000..9e9e654147
--- /dev/null
+++ b/lib/test/unit/collector.rb
@@ -0,0 +1,43 @@
+module Test
+ module Unit
+ module Collector
+ def initialize
+ @filters = []
+ end
+
+ def filter=(filters)
+ @filters = case(filters)
+ when Proc
+ [filters]
+ when Array
+ filters
+ end
+ end
+
+ def add_suite(destination, suite)
+ to_delete = suite.tests.find_all{|t| !include?(t)}
+ to_delete.each{|t| suite.delete(t)}
+ destination << suite unless(suite.size == 0)
+ end
+
+ def include?(test)
+ return true if(@filters.empty?)
+ @filters.each do |filter|
+ result = filter[test]
+ if(result.nil?)
+ next
+ elsif(!result)
+ return false
+ else
+ return true
+ end
+ end
+ true
+ end
+
+ def sort(suites)
+ suites.sort_by{|s| s.name}
+ end
+ end
+ end
+end
diff --git a/lib/test/unit/collector/dir.rb b/lib/test/unit/collector/dir.rb
new file mode 100644
index 0000000000..97c8d28481
--- /dev/null
+++ b/lib/test/unit/collector/dir.rb
@@ -0,0 +1,107 @@
+require 'test/unit/testsuite'
+require 'test/unit/collector'
+
+module Test
+ module Unit
+ module Collector
+ class Dir
+ include Collector
+
+ attr_reader :pattern, :exclude
+ attr_accessor :base
+
+ def initialize(dir=::Dir, file=::File, object_space=::ObjectSpace, req=nil)
+ super()
+ @dir = dir
+ @file = file
+ @object_space = object_space
+ @req = req
+ @pattern = [/\btest_.*\.rb\Z/m]
+ @exclude = []
+ end
+
+ def collect(*from)
+ basedir = @base
+ $:.push(basedir) if basedir
+ if(from.empty?)
+ recursive_collect('.', find_test_cases)
+ elsif(from.size == 1)
+ recursive_collect(from.first, find_test_cases)
+ else
+ suites = []
+ from.each do |f|
+ suite = recursive_collect(f, find_test_cases)
+ suites << suite unless(suite.tests.empty?)
+ end
+ suite = TestSuite.new("[#{from.join(', ')}]")
+ sort(suites).each{|s| suite << s}
+ suite
+ end
+ ensure
+ $:.delete_at($:.rindex(basedir)) if basedir
+ end
+
+ def find_test_cases(ignore=[])
+ cases = []
+ @object_space.each_object(Class) do |c|
+ cases << c if(c < TestCase && !ignore.include?(c))
+ end
+ ignore.concat(cases)
+ cases
+ end
+
+ def recursive_collect(name, already_gathered)
+ sub_suites = []
+ path = realdir(name)
+ if @file.directory?(path)
+ dir_name = name unless name == '.'
+ @dir.entries(path).each do |e|
+ next if(e == '.' || e == '..')
+ e_name = dir_name ? @file.join(dir_name, e) : e
+ if @file.directory?(realdir(e_name))
+ next if /\ACVS\z/ =~ e
+ sub_suite = recursive_collect(e_name, already_gathered)
+ sub_suites << sub_suite unless(sub_suite.empty?)
+ else
+ next if /~\z/ =~ e_name or /\A\.\#/ =~ e
+ if @pattern and !@pattern.empty?
+ next unless @pattern.any? {|pat| pat =~ e_name}
+ end
+ if @exclude and !@exclude.empty?
+ next if @exclude.any? {|pat| pat =~ e_name}
+ end
+ collect_file(e_name, sub_suites, already_gathered)
+ end
+ end
+ else
+ collect_file(name, sub_suites, already_gathered)
+ end
+ suite = TestSuite.new(@file.basename(name))
+ sort(sub_suites).each{|s| suite << s}
+ suite
+ end
+
+ def collect_file(name, suites, already_gathered)
+ dir = @file.dirname(@file.expand_path(name, @base))
+ $:.unshift(dir)
+ if(@req)
+ @req.require(name)
+ else
+ require(name)
+ end
+ find_test_cases(already_gathered).each{|t| add_suite(suites, t.suite)}
+ ensure
+ $:.delete_at($:.rindex(dir)) if(dir)
+ end
+
+ def realdir(path)
+ if @base
+ @file.join(@base, path)
+ else
+ path
+ end
+ end
+ end
+ end
+ end
+end
diff --git a/lib/test/unit/collector/objectspace.rb b/lib/test/unit/collector/objectspace.rb
new file mode 100644
index 0000000000..d1127a981f
--- /dev/null
+++ b/lib/test/unit/collector/objectspace.rb
@@ -0,0 +1,34 @@
+# Author:: Nathaniel Talbott.
+# Copyright:: Copyright (c) 2000-2003 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+require 'test/unit/collector'
+
+module Test
+ module Unit
+ module Collector
+ class ObjectSpace
+ include Collector
+
+ NAME = 'collected from the ObjectSpace'
+
+ def initialize(source=::ObjectSpace)
+ super()
+ @source = source
+ end
+
+ def collect(name=NAME)
+ suite = TestSuite.new(name)
+ sub_suites = []
+ @source.each_object(Class) do |klass|
+ if(Test::Unit::TestCase > klass)
+ add_suite(sub_suites, klass.suite)
+ end
+ end
+ sort(sub_suites).each{|s| suite << s}
+ suite
+ end
+ end
+ end
+ end
+end
diff --git a/lib/test/unit/error.rb b/lib/test/unit/error.rb
new file mode 100644
index 0000000000..43a813f7d1
--- /dev/null
+++ b/lib/test/unit/error.rb
@@ -0,0 +1,56 @@
+#--
+#
+# Author:: Nathaniel Talbott.
+# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+require 'test/unit/util/backtracefilter'
+
+module Test
+ module Unit
+
+ # Encapsulates an error in a test. Created by
+ # Test::Unit::TestCase when it rescues an exception thrown
+ # during the processing of a test.
+ class Error
+ include Util::BacktraceFilter
+
+ attr_reader(:test_name, :exception)
+
+ SINGLE_CHARACTER = 'E'
+
+ # Creates a new Error with the given test_name and
+ # exception.
+ def initialize(test_name, exception)
+ @test_name = test_name
+ @exception = exception
+ end
+
+ # Returns a single character representation of an error.
+ def single_character_display
+ SINGLE_CHARACTER
+ end
+
+ # Returns the message associated with the error.
+ def message
+ "#{@exception.class.name}: #{@exception.message}"
+ end
+
+ # Returns a brief version of the error description.
+ def short_display
+ "#@test_name: #{message.split("\n")[0]}"
+ end
+
+ # Returns a verbose version of the error description.
+ def long_display
+ backtrace = filter_backtrace(@exception.backtrace).join("\n ")
+ "Error:\n#@test_name:\n#{message}\n #{backtrace}"
+ end
+
+ # Overridden to return long_display.
+ def to_s
+ long_display
+ end
+ end
+ end
+end
diff --git a/lib/test/unit/failure.rb b/lib/test/unit/failure.rb
new file mode 100644
index 0000000000..832c99857c
--- /dev/null
+++ b/lib/test/unit/failure.rb
@@ -0,0 +1,51 @@
+#--
+#
+# Author:: Nathaniel Talbott.
+# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+module Test
+ module Unit
+
+ # Encapsulates a test failure. Created by Test::Unit::TestCase
+ # when an assertion fails.
+ class Failure
+ attr_reader :test_name, :location, :message
+
+ SINGLE_CHARACTER = 'F'
+
+ # Creates a new Failure with the given location and
+ # message.
+ def initialize(test_name, location, message)
+ @test_name = test_name
+ @location = location
+ @message = message
+ end
+
+ # Returns a single character representation of a failure.
+ def single_character_display
+ SINGLE_CHARACTER
+ end
+
+ # Returns a brief version of the error description.
+ def short_display
+ "#@test_name: #{@message.split("\n")[0]}"
+ end
+
+ # Returns a verbose version of the error description.
+ def long_display
+ location_display = if(location.size == 1)
+ location[0].sub(/\A(.+:\d+).*/, ' [\\1]')
+ else
+ "\n [#{location.join("\n ")}]"
+ end
+ "Failure:\n#@test_name#{location_display}:\n#@message"
+ end
+
+ # Overridden to return long_display.
+ def to_s
+ long_display
+ end
+ end
+ end
+end
diff --git a/lib/test/unit/testcase.rb b/lib/test/unit/testcase.rb
index ec3d362c21..f53b460c5d 100644
--- a/lib/test/unit/testcase.rb
+++ b/lib/test/unit/testcase.rb
@@ -1,14 +1,159 @@
+#--
+#
+# Author:: Nathaniel Talbott.
+# Copyright:: Copyright (c) 2000-2003 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
require 'test/unit/assertions'
+require 'test/unit/failure'
+require 'test/unit/error'
+require 'test/unit/testsuite'
+require 'test/unit/assertionfailederror'
+require 'test/unit/util/backtracefilter'
module Test
module Unit
- # remove silly TestCase class
- remove_const(:TestCase) if defined?(self::TestCase)
- class TestCase < MiniTest::Unit::TestCase
+ # Ties everything together. If you subclass and add your own
+ # test methods, it takes care of making them into tests and
+ # wrapping those tests into a suite. It also does the
+ # nitty-gritty of actually running an individual test and
+ # collecting its results into a Test::Unit::TestResult object.
+ class TestCase
include Assertions
- def self.test_order
- :sorted
+ include Util::BacktraceFilter
+
+ attr_reader :method_name
+
+ STARTED = name + "::STARTED"
+ FINISHED = name + "::FINISHED"
+
+ ##
+ # These exceptions are not caught by #run.
+
+ PASSTHROUGH_EXCEPTIONS = [NoMemoryError, SignalException, Interrupt,
+ SystemExit]
+
+ # Creates a new instance of the fixture for running the
+ # test represented by test_method_name.
+ def initialize(test_method_name)
+ unless(respond_to?(test_method_name) and
+ (method(test_method_name).arity == 0 ||
+ method(test_method_name).arity == -1))
+ throw :invalid_test
+ end
+ @method_name = test_method_name
+ @test_passed = true
+ end
+
+ # Rolls up all of the test* methods in the fixture into
+ # one suite, creating a new instance of the fixture for
+ # each method.
+ def self.suite
+ method_names = public_instance_methods(true)
+ tests = method_names.delete_if {|method_name| method_name !~ /^test./}
+ suite = TestSuite.new(name)
+ tests.sort.each do
+ |test|
+ catch(:invalid_test) do
+ suite << new(test)
+ end
+ end
+ if (suite.empty?)
+ catch(:invalid_test) do
+ suite << new("default_test")
+ end
+ end
+ return suite
+ end
+
+ # Runs the individual test method represented by this
+ # instance of the fixture, collecting statistics, failures
+ # and errors in result.
+ def run(result)
+ yield(STARTED, name)
+ @_result = result
+ begin
+ setup
+ __send__(@method_name)
+ rescue AssertionFailedError => e
+ add_failure(e.message, e.backtrace)
+ rescue Exception
+ raise if PASSTHROUGH_EXCEPTIONS.include? $!.class
+ add_error($!)
+ ensure
+ begin
+ teardown
+ rescue AssertionFailedError => e
+ add_failure(e.message, e.backtrace)
+ rescue Exception
+ raise if PASSTHROUGH_EXCEPTIONS.include? $!.class
+ add_error($!)
+ end
+ end
+ result.add_run
+ yield(FINISHED, name)
+ end
+
+ # Called before every test method runs. Can be used
+ # to set up fixture information.
+ def setup
+ end
+
+ # Called after every test method runs. Can be used to tear
+ # down fixture information.
+ def teardown
+ end
+
+ def default_test
+ flunk("No tests were specified")
+ end
+
+ # Returns whether this individual test passed or
+ # not. Primarily for use in teardown so that artifacts
+ # can be left behind if the test fails.
+ def passed?
+ return @test_passed
+ end
+ private :passed?
+
+ def size
+ 1
+ end
+
+ def add_assertion
+ @_result.add_assertion
+ end
+ private :add_assertion
+
+ def add_failure(message, all_locations=caller())
+ @test_passed = false
+ @_result.add_failure(Failure.new(name, filter_backtrace(all_locations), message))
+ end
+ private :add_failure
+
+ def add_error(exception)
+ @test_passed = false
+ @_result.add_error(Error.new(name, exception))
+ end
+ private :add_error
+
+ # Returns a human-readable name for the specific test that
+ # this instance of TestCase represents.
+ def name
+ "#{@method_name}(#{self.class.name})"
+ end
+
+ # Overridden to return #name.
+ def to_s
+ name
+ end
+
+ # It's handy to be able to compare TestCase instances.
+ def ==(other)
+ return false unless(other.kind_of?(self.class))
+ return false unless(@method_name == other.method_name)
+ self.class == other.class
end
end
end
diff --git a/lib/test/unit/testresult.rb b/lib/test/unit/testresult.rb
new file mode 100644
index 0000000000..e3a472ef7f
--- /dev/null
+++ b/lib/test/unit/testresult.rb
@@ -0,0 +1,80 @@
+#--
+# Author:: Nathaniel Talbott.
+# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+require 'test/unit/util/observable'
+
+module Test
+ module Unit
+
+ # Collects Test::Unit::Failure and Test::Unit::Error so that
+ # they can be displayed to the user. To this end, observers
+ # can be added to it, allowing the dynamic updating of, say, a
+ # UI.
+ class TestResult
+ include Util::Observable
+
+ CHANGED = "CHANGED"
+ FAULT = "FAULT"
+
+ attr_reader(:run_count, :assertion_count)
+
+ # Constructs a new, empty TestResult.
+ def initialize
+ @run_count, @assertion_count = 0, 0
+ @failures, @errors = Array.new, Array.new
+ end
+
+ # Records a test run.
+ def add_run
+ @run_count += 1
+ notify_listeners(CHANGED, self)
+ end
+
+ # Records a Test::Unit::Failure.
+ def add_failure(failure)
+ @failures << failure
+ notify_listeners(FAULT, failure)
+ notify_listeners(CHANGED, self)
+ end
+
+ # Records a Test::Unit::Error.
+ def add_error(error)
+ @errors << error
+ notify_listeners(FAULT, error)
+ notify_listeners(CHANGED, self)
+ end
+
+ # Records an individual assertion.
+ def add_assertion
+ @assertion_count += 1
+ notify_listeners(CHANGED, self)
+ end
+
+ # Returns a string contain the recorded runs, assertions,
+ # failures and errors in this TestResult.
+ def to_s
+ "#{run_count} tests, #{assertion_count} assertions, #{failure_count} failures, #{error_count} errors"
+ end
+
+ # Returns whether or not this TestResult represents
+ # successful completion.
+ def passed?
+ return @failures.empty? && @errors.empty?
+ end
+
+ # Returns the number of failures this TestResult has
+ # recorded.
+ def failure_count
+ return @failures.size
+ end
+
+ # Returns the number of errors this TestResult has
+ # recorded.
+ def error_count
+ return @errors.size
+ end
+ end
+ end
+end
diff --git a/lib/test/unit/testsuite.rb b/lib/test/unit/testsuite.rb
new file mode 100644
index 0000000000..6fea976c50
--- /dev/null
+++ b/lib/test/unit/testsuite.rb
@@ -0,0 +1,76 @@
+#--
+#
+# Author:: Nathaniel Talbott.
+# Copyright:: Copyright (c) 2000-2003 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+module Test
+ module Unit
+
+ # A collection of tests which can be #run.
+ #
+ # Note: It is easy to confuse a TestSuite instance with
+ # something that has a static suite method; I know because _I_
+ # have trouble keeping them straight. Think of something that
+ # has a suite method as simply providing a way to get a
+ # meaningful TestSuite instance.
+ class TestSuite
+ attr_reader :name, :tests
+
+ STARTED = name + "::STARTED"
+ FINISHED = name + "::FINISHED"
+
+ # Creates a new TestSuite with the given name.
+ def initialize(name="Unnamed TestSuite")
+ @name = name
+ @tests = []
+ end
+
+ # Runs the tests and/or suites contained in this
+ # TestSuite.
+ def run(result, &progress_block)
+ yield(STARTED, name)
+ @tests.each do |test|
+ test.run(result, &progress_block)
+ end
+ yield(FINISHED, name)
+ end
+
+ # Adds the test to the suite.
+ def <<(test)
+ @tests << test
+ self
+ end
+
+ def delete(test)
+ @tests.delete(test)
+ end
+
+ # Retuns the rolled up number of tests in this suite;
+ # i.e. if the suite contains other suites, it counts the
+ # tests within those suites, not the suites themselves.
+ def size
+ total_size = 0
+ @tests.each { |test| total_size += test.size }
+ total_size
+ end
+
+ def empty?
+ tests.empty?
+ end
+
+ # Overridden to return the name given the suite at
+ # creation.
+ def to_s
+ @name
+ end
+
+ # It's handy to be able to compare TestSuite instances.
+ def ==(other)
+ return false unless(other.kind_of?(self.class))
+ return false unless(@name == other.name)
+ @tests == other.tests
+ end
+ end
+ end
+end
diff --git a/lib/test/unit/ui/console/testrunner.rb b/lib/test/unit/ui/console/testrunner.rb
new file mode 100644
index 0000000000..6b600e319a
--- /dev/null
+++ b/lib/test/unit/ui/console/testrunner.rb
@@ -0,0 +1,127 @@
+#--
+#
+# Author:: Nathaniel Talbott.
+# Copyright:: Copyright (c) 2000-2003 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+require 'test/unit/ui/testrunnermediator'
+require 'test/unit/ui/testrunnerutilities'
+
+module Test
+ module Unit
+ module UI
+ module Console
+
+ # Runs a Test::Unit::TestSuite on the console.
+ class TestRunner
+ extend TestRunnerUtilities
+
+ # Creates a new TestRunner for running the passed
+ # suite. If quiet_mode is true, the output while
+ # running is limited to progress dots, errors and
+ # failures, and the final result. io specifies
+ # where runner output should go to; defaults to
+ # STDOUT.
+ def initialize(suite, output_level=NORMAL, io=STDOUT)
+ if (suite.respond_to?(:suite))
+ @suite = suite.suite
+ else
+ @suite = suite
+ end
+ @output_level = output_level
+ @io = io
+ @already_outputted = false
+ @faults = []
+ end
+
+ # Begins the test run.
+ def start
+ setup_mediator
+ attach_to_mediator
+ return start_mediator
+ end
+
+ private
+ def setup_mediator
+ @mediator = create_mediator(@suite)
+ suite_name = @suite.to_s
+ if ( @suite.kind_of?(Module) )
+ suite_name = @suite.name
+ end
+ output("Loaded suite #{suite_name}")
+ end
+
+ def create_mediator(suite)
+ return TestRunnerMediator.new(suite)
+ end
+
+ def attach_to_mediator
+ @mediator.add_listener(TestResult::FAULT, &method(:add_fault))
+ @mediator.add_listener(TestRunnerMediator::STARTED, &method(:started))
+ @mediator.add_listener(TestRunnerMediator::FINISHED, &method(:finished))
+ @mediator.add_listener(TestCase::STARTED, &method(:test_started))
+ @mediator.add_listener(TestCase::FINISHED, &method(:test_finished))
+ end
+
+ def start_mediator
+ return @mediator.run_suite
+ end
+
+ def add_fault(fault)
+ @faults << fault
+ output_single(fault.single_character_display, PROGRESS_ONLY)
+ @already_outputted = true
+ end
+
+ def started(result)
+ @result = result
+ output("Started")
+ end
+
+ def finished(elapsed_time)
+ nl
+ output("Finished in #{elapsed_time} seconds.")
+ @faults.each_with_index do |fault, index|
+ nl
+ output("%3d) %s" % [index + 1, fault.long_display])
+ end
+ nl
+ output(@result)
+ end
+
+ def test_started(name)
+ output_single(name + ": ", VERBOSE)
+ end
+
+ def test_finished(name)
+ output_single(".", PROGRESS_ONLY) unless (@already_outputted)
+ nl(VERBOSE)
+ @already_outputted = false
+ end
+
+ def nl(level=NORMAL)
+ output("", level)
+ end
+
+ def output(something, level=NORMAL)
+ @io.puts(something) if (output?(level))
+ @io.flush
+ end
+
+ def output_single(something, level=NORMAL)
+ @io.write(something) if (output?(level))
+ @io.flush
+ end
+
+ def output?(level)
+ level <= @output_level
+ end
+ end
+ end
+ end
+ end
+end
+
+if __FILE__ == $0
+ Test::Unit::UI::Console::TestRunner.start_command_line_test
+end
diff --git a/lib/test/unit/ui/fox/testrunner.rb b/lib/test/unit/ui/fox/testrunner.rb
new file mode 100644
index 0000000000..a23a450567
--- /dev/null
+++ b/lib/test/unit/ui/fox/testrunner.rb
@@ -0,0 +1,268 @@
+#--
+#
+# Author:: Nathaniel Talbott.
+# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+require 'fox'
+require 'test/unit/ui/testrunnermediator'
+require 'test/unit/ui/testrunnerutilities'
+
+include Fox
+
+module Test
+ module Unit
+ module UI
+ module Fox
+
+ # Runs a Test::Unit::TestSuite in a Fox UI. Obviously,
+ # this one requires you to have Fox
+ # (http://www.fox-toolkit.org/fox.html) and the Ruby
+ # Fox extension (http://fxruby.sourceforge.net/)
+ # installed.
+ class TestRunner
+
+ extend TestRunnerUtilities
+
+ RED_STYLE = FXRGBA(0xFF,0,0,0xFF) #0xFF000000
+ GREEN_STYLE = FXRGBA(0,0xFF,0,0xFF) #0x00FF0000
+
+ # Creates a new TestRunner for running the passed
+ # suite.
+ def initialize(suite, output_level = NORMAL)
+ if (suite.respond_to?(:suite))
+ @suite = suite.suite
+ else
+ @suite = suite
+ end
+
+ @result = nil
+ @red = false
+ end
+
+ # Begins the test run.
+ def start
+ setup_ui
+ setup_mediator
+ attach_to_mediator
+ start_ui
+ @result
+ end
+
+ def setup_mediator
+ @mediator = TestRunnerMediator.new(@suite)
+ suite_name = @suite.to_s
+ if ( @suite.kind_of?(Module) )
+ suite_name = @suite.name
+ end
+ @suite_name_entry.text = suite_name
+ end
+
+ def attach_to_mediator
+ @mediator.add_listener(TestRunnerMediator::RESET, &method(:reset_ui))
+ @mediator.add_listener(TestResult::FAULT, &method(:add_fault))
+ @mediator.add_listener(TestResult::CHANGED, &method(:result_changed))
+ @mediator.add_listener(TestRunnerMediator::STARTED, &method(:started))
+ @mediator.add_listener(TestCase::STARTED, &method(:test_started))
+ @mediator.add_listener(TestRunnerMediator::FINISHED, &method(:finished))
+ end
+
+ def start_ui
+ @application.create
+ @window.show(PLACEMENT_SCREEN)
+ @application.addTimeout(1) do
+ @mediator.run_suite
+ end
+ @application.run
+ end
+
+ def stop
+ @application.exit(0)
+ end
+
+ def reset_ui(count)
+ @test_progress_bar.barColor = GREEN_STYLE
+ @test_progress_bar.total = count
+ @test_progress_bar.progress = 0
+ @red = false
+
+ @test_count_label.text = "0"
+ @assertion_count_label.text = "0"
+ @failure_count_label.text = "0"
+ @error_count_label.text = "0"
+
+ @fault_list.clearItems
+ end
+
+ def add_fault(fault)
+ if ( ! @red )
+ @test_progress_bar.barColor = RED_STYLE
+ @red = true
+ end
+ item = FaultListItem.new(fault)
+ @fault_list.appendItem(item)
+ end
+
+ def show_fault(fault)
+ raw_show_fault(fault.long_display)
+ end
+
+ def raw_show_fault(string)
+ @detail_text.setText(string)
+ end
+
+ def clear_fault
+ raw_show_fault("")
+ end
+
+ def result_changed(result)
+ @test_progress_bar.progress = result.run_count
+
+ @test_count_label.text = result.run_count.to_s
+ @assertion_count_label.text = result.assertion_count.to_s
+ @failure_count_label.text = result.failure_count.to_s
+ @error_count_label.text = result.error_count.to_s
+
+ # repaint now!
+ @info_panel.repaint
+ @application.flush
+ end
+
+ def started(result)
+ @result = result
+ output_status("Started...")
+ end
+
+ def test_started(test_name)
+ output_status("Running #{test_name}...")
+ end
+
+ def finished(elapsed_time)
+ output_status("Finished in #{elapsed_time} seconds")
+ end
+
+ def output_status(string)
+ @status_entry.text = string
+ @status_entry.repaint
+ end
+
+ def setup_ui
+ @application = create_application
+ create_tooltip(@application)
+
+ @window = create_window(@application)
+
+ @status_entry = create_entry(@window)
+
+ main_panel = create_main_panel(@window)
+
+ suite_panel = create_suite_panel(main_panel)
+ create_label(suite_panel, "Suite:")
+ @suite_name_entry = create_entry(suite_panel)
+ create_button(suite_panel, "&Run\tRun the current suite", proc { @mediator.run_suite })
+
+ @test_progress_bar = create_progress_bar(main_panel)
+
+ @info_panel = create_info_panel(main_panel)
+ create_label(@info_panel, "Tests:")
+ @test_count_label = create_label(@info_panel, "0")
+ create_label(@info_panel, "Assertions:")
+ @assertion_count_label = create_label(@info_panel, "0")
+ create_label(@info_panel, "Failures:")
+ @failure_count_label = create_label(@info_panel, "0")
+ create_label(@info_panel, "Errors:")
+ @error_count_label = create_label(@info_panel, "0")
+
+ list_panel = create_list_panel(main_panel)
+ @fault_list = create_fault_list(list_panel)
+
+ detail_panel = create_detail_panel(main_panel)
+ @detail_text = create_text(detail_panel)
+ end
+
+ def create_application
+ app = FXApp.new("TestRunner", "Test::Unit")
+ app.init([])
+ app
+ end
+
+ def create_window(app)
+ FXMainWindow.new(app, "Test::Unit TestRunner", nil, nil, DECOR_ALL, 0, 0, 450)
+ end
+
+ def create_tooltip(app)
+ FXTooltip.new(app)
+ end
+
+ def create_main_panel(parent)
+ panel = FXVerticalFrame.new(parent, LAYOUT_FILL_X | LAYOUT_FILL_Y)
+ panel.vSpacing = 10
+ panel
+ end
+
+ def create_suite_panel(parent)
+ FXHorizontalFrame.new(parent, LAYOUT_SIDE_LEFT | LAYOUT_FILL_X)
+ end
+
+ def create_button(parent, text, action)
+ FXButton.new(parent, text).connect(SEL_COMMAND, &action)
+ end
+
+ def create_progress_bar(parent)
+ FXProgressBar.new(parent, nil, 0, PROGRESSBAR_NORMAL | LAYOUT_FILL_X)
+ end
+
+ def create_info_panel(parent)
+ FXMatrix.new(parent, 1, MATRIX_BY_ROWS | LAYOUT_FILL_X)
+ end
+
+ def create_label(parent, text)
+ FXLabel.new(parent, text, nil, JUSTIFY_CENTER_X | LAYOUT_FILL_COLUMN)
+ end
+
+ def create_list_panel(parent)
+ FXHorizontalFrame.new(parent, LAYOUT_FILL_X | FRAME_SUNKEN | FRAME_THICK)
+ end
+
+ def create_fault_list(parent)
+ list = FXList.new(parent, 10, nil, 0, LIST_SINGLESELECT | LAYOUT_FILL_X) #, 0, 0, 0, 150)
+ list.connect(SEL_COMMAND) do |sender, sel, ptr|
+ if sender.retrieveItem(sender.currentItem).selected?
+ show_fault(sender.retrieveItem(sender.currentItem).fault)
+ else
+ clear_fault
+ end
+ end
+ list
+ end
+
+ def create_detail_panel(parent)
+ FXHorizontalFrame.new(parent, LAYOUT_FILL_X | LAYOUT_FILL_Y | FRAME_SUNKEN | FRAME_THICK)
+ end
+
+ def create_text(parent)
+ FXText.new(parent, nil, 0, TEXT_READONLY | LAYOUT_FILL_X | LAYOUT_FILL_Y)
+ end
+
+ def create_entry(parent)
+ entry = FXTextField.new(parent, 30, nil, 0, TEXTFIELD_NORMAL | LAYOUT_SIDE_BOTTOM | LAYOUT_FILL_X)
+ entry.disable
+ entry
+ end
+ end
+
+ class FaultListItem < FXListItem
+ attr_reader(:fault)
+ def initialize(fault)
+ super(fault.short_display)
+ @fault = fault
+ end
+ end
+ end
+ end
+ end
+end
+
+if __FILE__ == $0
+ Test::Unit::UI::Fox::TestRunner.start_command_line_test
+end
diff --git a/lib/test/unit/ui/gtk/testrunner.rb b/lib/test/unit/ui/gtk/testrunner.rb
new file mode 100644
index 0000000000..994328dc9b
--- /dev/null
+++ b/lib/test/unit/ui/gtk/testrunner.rb
@@ -0,0 +1,416 @@
+#--
+#
+# Author:: Nathaniel Talbott.
+# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+require 'gtk'
+require 'test/unit/ui/testrunnermediator'
+require 'test/unit/ui/testrunnerutilities'
+
+module Test
+ module Unit
+ module UI
+ module GTK
+
+ # Runs a Test::Unit::TestSuite in a Gtk UI. Obviously,
+ # this one requires you to have Gtk
+ # (http://www.gtk.org/) and the Ruby Gtk extension
+ # (http://ruby-gnome.sourceforge.net/) installed.
+ class TestRunner
+ extend TestRunnerUtilities
+
+ # Creates a new TestRunner for running the passed
+ # suite.
+ def initialize(suite, output_level = NORMAL)
+ if (suite.respond_to?(:suite))
+ @suite = suite.suite
+ else
+ @suite = suite
+ end
+ @result = nil
+
+ @runner = Thread.current
+ @restart_signal = Class.new(Exception)
+ @viewer = Thread.start do
+ @runner.join rescue @runner.run
+ Gtk.main
+ end
+ @viewer.join rescue nil # wait deadlock to handshake
+ end
+
+ # Begins the test run.
+ def start
+ setup_mediator
+ setup_ui
+ attach_to_mediator
+ start_ui
+ @result
+ end
+
+ private
+ def setup_mediator
+ @mediator = TestRunnerMediator.new(@suite)
+ suite_name = @suite.to_s
+ if ( @suite.kind_of?(Module) )
+ suite_name = @suite.name
+ end
+ suite_name_entry.set_text(suite_name)
+ end
+
+ def attach_to_mediator
+ run_button.signal_connect("clicked", nil, &method(:run_test))
+ @mediator.add_listener(TestRunnerMediator::RESET, &method(:reset_ui))
+ @mediator.add_listener(TestResult::FAULT, &method(:add_fault))
+ @mediator.add_listener(TestResult::CHANGED, &method(:result_changed))
+ @mediator.add_listener(TestRunnerMediator::STARTED, &method(:started))
+ @mediator.add_listener(TestCase::STARTED, &method(:test_started))
+ @mediator.add_listener(TestCase::FINISHED, &method(:test_finished))
+ @mediator.add_listener(TestRunnerMediator::FINISHED, &method(:finished))
+ end
+
+ def run_test(*)
+ @runner.raise(@restart_signal)
+ end
+
+ def start_ui
+ @viewer.run
+ running = false
+ begin
+ loop do
+ if (running ^= true)
+ run_button.child.text = "Stop"
+ @mediator.run_suite
+ else
+ run_button.child.text = "Run"
+ @viewer.join
+ break
+ end
+ end
+ rescue @restart_signal
+ retry
+ rescue
+ end
+ end
+
+ def stop(*)
+ Gtk.main_quit
+ end
+
+ def reset_ui(count)
+ test_progress_bar.set_style(green_style)
+ test_progress_bar.configure(0, 0, count)
+ @red = false
+
+ run_count_label.set_text("0")
+ assertion_count_label.set_text("0")
+ failure_count_label.set_text("0")
+ error_count_label.set_text("0")
+
+ fault_list.remove_items(fault_list.children)
+ end
+
+ def add_fault(fault)
+ if ( ! @red )
+ test_progress_bar.set_style(red_style)
+ @red = true
+ end
+ item = FaultListItem.new(fault)
+ item.show
+ fault_list.append_items([item])
+ end
+
+ def show_fault(fault)
+ raw_show_fault(fault.long_display)
+ end
+
+ def raw_show_fault(string)
+ fault_detail_label.set_text(string)
+ outer_detail_sub_panel.queue_resize
+ end
+
+ def clear_fault
+ raw_show_fault("")
+ end
+
+ def result_changed(result)
+ run_count_label.set_text(result.run_count.to_s)
+ assertion_count_label.set_text(result.assertion_count.to_s)
+ failure_count_label.set_text(result.failure_count.to_s)
+ error_count_label.set_text(result.error_count.to_s)
+ end
+
+ def started(result)
+ @result = result
+ output_status("Started...")
+ end
+
+ def test_started(test_name)
+ output_status("Running #{test_name}...")
+ end
+
+ def test_finished(test_name)
+ test_progress_bar.set_value(test_progress_bar.get_value + 1)
+ end
+
+ def finished(elapsed_time)
+ output_status("Finished in #{elapsed_time} seconds")
+ end
+
+ def output_status(string)
+ status_entry.set_text(string)
+ end
+
+ def setup_ui
+ main_window.signal_connect("destroy", nil, &method(:stop))
+ main_window.show_all
+ fault_list.signal_connect("select-child", nil) {
+ | list, item, data |
+ show_fault(item.fault)
+ }
+ fault_list.signal_connect("unselect-child", nil) {
+ clear_fault
+ }
+ @red = false
+ end
+
+ def main_window
+ lazy_initialize(:main_window) {
+ @main_window = Gtk::Window.new(Gtk::WINDOW_TOPLEVEL)
+ @main_window.set_title("Test::Unit TestRunner")
+ @main_window.set_usize(800, 600)
+ @main_window.set_uposition(20, 20)
+ @main_window.set_policy(true, true, false)
+ @main_window.add(main_panel)
+ }
+ end
+
+ def main_panel
+ lazy_initialize(:main_panel) {
+ @main_panel = Gtk::VBox.new(false, 0)
+ @main_panel.pack_start(suite_panel, false, false, 0)
+ @main_panel.pack_start(progress_panel, false, false, 0)
+ @main_panel.pack_start(info_panel, false, false, 0)
+ @main_panel.pack_start(list_panel, false, false, 0)
+ @main_panel.pack_start(detail_panel, true, true, 0)
+ @main_panel.pack_start(status_panel, false, false, 0)
+ }
+ end
+
+ def suite_panel
+ lazy_initialize(:suite_panel) {
+ @suite_panel = Gtk::HBox.new(false, 10)
+ @suite_panel.border_width(10)
+ @suite_panel.pack_start(Gtk::Label.new("Suite:"), false, false, 0)
+ @suite_panel.pack_start(suite_name_entry, true, true, 0)
+ @suite_panel.pack_start(run_button, false, false, 0)
+ }
+ end
+
+ def suite_name_entry
+ lazy_initialize(:suite_name_entry) {
+ @suite_name_entry = Gtk::Entry.new
+ @suite_name_entry.set_editable(false)
+ }
+ end
+
+ def run_button
+ lazy_initialize(:run_button) {
+ @run_button = Gtk::Button.new("Run")
+ }
+ end
+
+ def progress_panel
+ lazy_initialize(:progress_panel) {
+ @progress_panel = Gtk::HBox.new(false, 10)
+ @progress_panel.border_width(10)
+ @progress_panel.pack_start(test_progress_bar, true, true, 0)
+ }
+ end
+
+ def test_progress_bar
+ lazy_initialize(:test_progress_bar) {
+ @test_progress_bar = EnhancedProgressBar.new
+ @test_progress_bar.set_usize(@test_progress_bar.allocation.width,
+ info_panel.size_request.height)
+ @test_progress_bar.set_style(green_style)
+ }
+ end
+
+ def green_style
+ lazy_initialize(:green_style) {
+ @green_style = Gtk::Style.new
+ @green_style.set_bg(Gtk::STATE_PRELIGHT, 0x0000, 0xFFFF, 0x0000)
+ }
+ end
+
+ def red_style
+ lazy_initialize(:red_style) {
+ @red_style = Gtk::Style.new
+ @red_style.set_bg(Gtk::STATE_PRELIGHT, 0xFFFF, 0x0000, 0x0000)
+ }
+ end
+
+ def info_panel
+ lazy_initialize(:info_panel) {
+ @info_panel = Gtk::HBox.new(false, 0)
+ @info_panel.border_width(10)
+ @info_panel.pack_start(Gtk::Label.new("Runs:"), false, false, 0)
+ @info_panel.pack_start(run_count_label, true, false, 0)
+ @info_panel.pack_start(Gtk::Label.new("Assertions:"), false, false, 0)
+ @info_panel.pack_start(assertion_count_label, true, false, 0)
+ @info_panel.pack_start(Gtk::Label.new("Failures:"), false, false, 0)
+ @info_panel.pack_start(failure_count_label, true, false, 0)
+ @info_panel.pack_start(Gtk::Label.new("Errors:"), false, false, 0)
+ @info_panel.pack_start(error_count_label, true, false, 0)
+ }
+ end
+
+ def run_count_label
+ lazy_initialize(:run_count_label) {
+ @run_count_label = Gtk::Label.new("0")
+ @run_count_label.set_justify(Gtk::JUSTIFY_LEFT)
+ }
+ end
+
+ def assertion_count_label
+ lazy_initialize(:assertion_count_label) {
+ @assertion_count_label = Gtk::Label.new("0")
+ @assertion_count_label.set_justify(Gtk::JUSTIFY_LEFT)
+ }
+ end
+
+ def failure_count_label
+ lazy_initialize(:failure_count_label) {
+ @failure_count_label = Gtk::Label.new("0")
+ @failure_count_label.set_justify(Gtk::JUSTIFY_LEFT)
+ }
+ end
+
+ def error_count_label
+ lazy_initialize(:error_count_label) {
+ @error_count_label = Gtk::Label.new("0")
+ @error_count_label.set_justify(Gtk::JUSTIFY_LEFT)
+ }
+ end
+
+ def list_panel
+ lazy_initialize(:list_panel) {
+ @list_panel = Gtk::HBox.new
+ @list_panel.border_width(10)
+ @list_panel.pack_start(list_scrolled_window, true, true, 0)
+ }
+ end
+
+ def list_scrolled_window
+ lazy_initialize(:list_scrolled_window) {
+ @list_scrolled_window = Gtk::ScrolledWindow.new
+ @list_scrolled_window.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC)
+ @list_scrolled_window.set_usize(@list_scrolled_window.allocation.width, 150)
+ @list_scrolled_window.add_with_viewport(fault_list)
+ }
+ end
+
+ def fault_list
+ lazy_initialize(:fault_list) {
+ @fault_list = Gtk::List.new
+ }
+ end
+
+ def detail_panel
+ lazy_initialize(:detail_panel) {
+ @detail_panel = Gtk::HBox.new
+ @detail_panel.border_width(10)
+ @detail_panel.pack_start(detail_scrolled_window, true, true, 0)
+ }
+ end
+
+ def detail_scrolled_window
+ lazy_initialize(:detail_scrolled_window) {
+ @detail_scrolled_window = Gtk::ScrolledWindow.new
+ @detail_scrolled_window.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC)
+ @detail_scrolled_window.set_usize(400, @detail_scrolled_window.allocation.height)
+ @detail_scrolled_window.add_with_viewport(outer_detail_sub_panel)
+ }
+ end
+
+ def outer_detail_sub_panel
+ lazy_initialize(:outer_detail_sub_panel) {
+ @outer_detail_sub_panel = Gtk::VBox.new
+ @outer_detail_sub_panel.pack_start(inner_detail_sub_panel, false, false, 0)
+ }
+ end
+
+ def inner_detail_sub_panel
+ lazy_initialize(:inner_detail_sub_panel) {
+ @inner_detail_sub_panel = Gtk::HBox.new
+ @inner_detail_sub_panel.pack_start(fault_detail_label, false, false, 0)
+ }
+ end
+
+ def fault_detail_label
+ lazy_initialize(:fault_detail_label) {
+ @fault_detail_label = EnhancedLabel.new("")
+ style = Gtk::Style.new
+ font = Gdk::Font.font_load("-*-Courier New-medium-r-normal--*-120-*-*-*-*-*-*")
+ begin
+ style.set_font(font)
+ rescue ArgumentError; end
+ @fault_detail_label.set_style(style)
+ @fault_detail_label.set_justify(Gtk::JUSTIFY_LEFT)
+ @fault_detail_label.set_line_wrap(false)
+ }
+ end
+
+ def status_panel
+ lazy_initialize(:status_panel) {
+ @status_panel = Gtk::HBox.new
+ @status_panel.border_width(10)
+ @status_panel.pack_start(status_entry, true, true, 0)
+ }
+ end
+
+ def status_entry
+ lazy_initialize(:status_entry) {
+ @status_entry = Gtk::Entry.new
+ @status_entry.set_editable(false)
+ }
+ end
+
+ def lazy_initialize(symbol)
+ if (!instance_eval("defined?(@#{symbol.to_s})"))
+ yield
+ end
+ return instance_eval("@" + symbol.to_s)
+ end
+ end
+
+ class EnhancedProgressBar < Gtk::ProgressBar
+ def set_style(style)
+ super
+ hide
+ show
+ end
+ end
+
+ class EnhancedLabel < Gtk::Label
+ def set_text(text)
+ super(text.gsub(/\n\t/, "\n" + (" " * 4)))
+ end
+ end
+
+ class FaultListItem < Gtk::ListItem
+ attr_reader(:fault)
+ def initialize(fault)
+ super(fault.short_display)
+ @fault = fault
+ end
+ end
+ end
+ end
+ end
+end
+
+if __FILE__ == $0
+ Test::Unit::UI::GTK::TestRunner.start_command_line_test
+end
diff --git a/lib/test/unit/ui/gtk2/testrunner.rb b/lib/test/unit/ui/gtk2/testrunner.rb
new file mode 100644
index 0000000000..b05549c0e8
--- /dev/null
+++ b/lib/test/unit/ui/gtk2/testrunner.rb
@@ -0,0 +1,465 @@
+#--
+#
+# Author:: Kenta MURATA.
+# Copyright:: Copyright (c) 2000-2002 Kenta MURATA. All rights reserved.
+# License:: Ruby license.
+
+require "gtk2"
+require "test/unit/ui/testrunnermediator"
+require "test/unit/ui/testrunnerutilities"
+
+module Test
+ module Unit
+ module UI
+ module GTK2
+
+ Gtk.init
+
+ class EnhancedLabel < Gtk::Label
+ def set_text(text)
+ super(text.gsub(/\n\t/, "\n "))
+ end
+ end
+
+ class FaultList < Gtk::TreeView
+ def initialize
+ @faults = []
+ @model = Gtk::ListStore.new(String, String)
+ super(@model)
+ column = Gtk::TreeViewColumn.new
+ column.visible = false
+ append_column(column)
+ renderer = Gtk::CellRendererText.new
+ column = Gtk::TreeViewColumn.new("Failures", renderer, {:text => 1})
+ append_column(column)
+ selection.mode = Gtk::SELECTION_SINGLE
+ set_rules_hint(true)
+ set_headers_visible(false)
+ end # def initialize
+
+ def add_fault(fault)
+ @faults.push(fault)
+ iter = @model.append
+ iter.set_value(0, (@faults.length - 1).to_s)
+ iter.set_value(1, fault.short_display)
+ end # def add_fault(fault)
+
+ def get_fault(iter)
+ @faults[iter.get_value(0).to_i]
+ end # def get_fault
+
+ def clear
+ model.clear
+ end # def clear
+ end
+
+ class TestRunner
+ extend TestRunnerUtilities
+
+ def lazy_initialize(symbol)
+ if !instance_eval("defined?(@#{symbol})") then
+ yield
+ end
+ return instance_eval("@#{symbol}")
+ end
+ private :lazy_initialize
+
+ def status_entry
+ lazy_initialize(:status_entry) do
+ @status_entry = Gtk::Entry.new
+ @status_entry.editable = false
+ end
+ end
+ private :status_entry
+
+ def status_panel
+ lazy_initialize(:status_panel) do
+ @status_panel = Gtk::HBox.new
+ @status_panel.border_width = 10
+ @status_panel.pack_start(status_entry, true, true, 0)
+ end
+ end
+ private :status_panel
+
+ def fault_detail_label
+ lazy_initialize(:fault_detail_label) do
+ @fault_detail_label = EnhancedLabel.new("")
+# style = Gtk::Style.new
+# font = Gdk::Font.
+# font_load("-*-Courier 10 Pitch-medium-r-normal--*-120-*-*-*-*-*-*")
+# style.set_font(font)
+# @fault_detail_label.style = style
+ @fault_detail_label.justify = Gtk::JUSTIFY_LEFT
+ @fault_detail_label.wrap = false
+ end
+ end
+ private :fault_detail_label
+
+ def inner_detail_sub_panel
+ lazy_initialize(:inner_detail_sub_panel) do
+ @inner_detail_sub_panel = Gtk::HBox.new
+ @inner_detail_sub_panel.pack_start(fault_detail_label, false, false, 0)
+ end
+ end
+ private :inner_detail_sub_panel
+
+ def outer_detail_sub_panel
+ lazy_initialize(:outer_detail_sub_panel) do
+ @outer_detail_sub_panel = Gtk::VBox.new
+ @outer_detail_sub_panel.pack_start(inner_detail_sub_panel, false, false, 0)
+ end
+ end
+ private :outer_detail_sub_panel
+
+ def detail_scrolled_window
+ lazy_initialize(:detail_scrolled_window) do
+ @detail_scrolled_window = Gtk::ScrolledWindow.new
+ @detail_scrolled_window.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC)
+ @detail_scrolled_window.
+ set_size_request(400, @detail_scrolled_window.allocation.height)
+ @detail_scrolled_window.add_with_viewport(outer_detail_sub_panel)
+ end
+ end
+ private :detail_scrolled_window
+
+ def detail_panel
+ lazy_initialize(:detail_panel) do
+ @detail_panel = Gtk::HBox.new
+ @detail_panel.border_width = 10
+ @detail_panel.pack_start(detail_scrolled_window, true, true, 0)
+ end
+ end
+ private :detail_panel
+
+ def fault_list
+ lazy_initialize(:fault_list) do
+ @fault_list = FaultList.new
+ end
+ end
+ private :fault_list
+
+ def list_scrolled_window
+ lazy_initialize(:list_scrolled_window) do
+ @list_scrolled_window = Gtk::ScrolledWindow.new
+ @list_scrolled_window.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC)
+ @list_scrolled_window.
+ set_size_request(@list_scrolled_window.allocation.width, 150)
+ @list_scrolled_window.add_with_viewport(fault_list)
+ end
+ end
+ private :list_scrolled_window
+
+ def list_panel
+ lazy_initialize(:list_panel) do
+ @list_panel = Gtk::HBox.new
+ @list_panel.border_width = 10
+ @list_panel.pack_start(list_scrolled_window, true, true, 0)
+ end
+ end
+ private :list_panel
+
+ def error_count_label
+ lazy_initialize(:error_count_label) do
+ @error_count_label = Gtk::Label.new("0")
+ @error_count_label.justify = Gtk::JUSTIFY_LEFT
+ end
+ end
+ private :error_count_label
+
+ def failure_count_label
+ lazy_initialize(:failure_count_label) do
+ @failure_count_label = Gtk::Label.new("0")
+ @failure_count_label.justify = Gtk::JUSTIFY_LEFT
+ end
+ end
+ private :failure_count_label
+
+ def assertion_count_label
+ lazy_initialize(:assertion_count_label) do
+ @assertion_count_label = Gtk::Label.new("0")
+ @assertion_count_label.justify = Gtk::JUSTIFY_LEFT
+ end
+ end
+ private :assertion_count_label
+
+ def run_count_label
+ lazy_initialize(:run_count_label) do
+ @run_count_label = Gtk::Label.new("0")
+ @run_count_label.justify = Gtk::JUSTIFY_LEFT
+ end
+ end
+ private :run_count_label
+
+ def info_panel
+ lazy_initialize(:info_panel) do
+ @info_panel = Gtk::HBox.new(false, 0)
+ @info_panel.border_width = 10
+ @info_panel.pack_start(Gtk::Label.new("Runs:"), false, false, 0)
+ @info_panel.pack_start(run_count_label, true, false, 0)
+ @info_panel.pack_start(Gtk::Label.new("Assertions:"), false, false, 0)
+ @info_panel.pack_start(assertion_count_label, true, false, 0)
+ @info_panel.pack_start(Gtk::Label.new("Failures:"), false, false, 0)
+ @info_panel.pack_start(failure_count_label, true, false, 0)
+ @info_panel.pack_start(Gtk::Label.new("Errors:"), false, false, 0)
+ @info_panel.pack_start(error_count_label, true, false, 0)
+ end
+ end # def info_panel
+ private :info_panel
+
+ def green_style
+ lazy_initialize(:green_style) do
+ @green_style = Gtk::Style.new
+ @green_style.set_bg(Gtk::STATE_PRELIGHT, 0x0000, 0xFFFF, 0x0000)
+ end
+ end # def green_style
+ private :green_style
+
+ def red_style
+ lazy_initialize(:red_style) do
+ @red_style = Gtk::Style.new
+ @red_style.set_bg(Gtk::STATE_PRELIGHT, 0xFFFF, 0x0000, 0x0000)
+ end
+ end # def red_style
+ private :red_style
+
+ def test_progress_bar
+ lazy_initialize(:test_progress_bar) {
+ @test_progress_bar = Gtk::ProgressBar.new
+ @test_progress_bar.fraction = 0.0
+ @test_progress_bar.
+ set_size_request(@test_progress_bar.allocation.width,
+ info_panel.size_request[1])
+ @test_progress_bar.style = green_style
+ }
+ end # def test_progress_bar
+ private :test_progress_bar
+
+ def progress_panel
+ lazy_initialize(:progress_panel) do
+ @progress_panel = Gtk::HBox.new(false, 10)
+ @progress_panel.border_width = 10
+ @progress_panel.pack_start(test_progress_bar, true, true, 0)
+ end
+ end # def progress_panel
+
+ def run_button
+ lazy_initialize(:run_button) do
+ @run_button = Gtk::Button.new("Run")
+ end
+ end # def run_button
+
+ def suite_name_entry
+ lazy_initialize(:suite_name_entry) do
+ @suite_name_entry = Gtk::Entry.new
+ @suite_name_entry.editable = false
+ end
+ end # def suite_name_entry
+ private :suite_name_entry
+
+ def suite_panel
+ lazy_initialize(:suite_panel) do
+ @suite_panel = Gtk::HBox.new(false, 10)
+ @suite_panel.border_width = 10
+ @suite_panel.pack_start(Gtk::Label.new("Suite:"), false, false, 0)
+ @suite_panel.pack_start(suite_name_entry, true, true, 0)
+ @suite_panel.pack_start(run_button, false, false, 0)
+ end
+ end # def suite_panel
+ private :suite_panel
+
+ def main_panel
+ lazy_initialize(:main_panel) do
+ @main_panel = Gtk::VBox.new(false, 0)
+ @main_panel.pack_start(suite_panel, false, false, 0)
+ @main_panel.pack_start(progress_panel, false, false, 0)
+ @main_panel.pack_start(info_panel, false, false, 0)
+ @main_panel.pack_start(list_panel, false, false, 0)
+ @main_panel.pack_start(detail_panel, true, true, 0)
+ @main_panel.pack_start(status_panel, false, false, 0)
+ end
+ end # def main_panel
+ private :main_panel
+
+ def main_window
+ lazy_initialize(:main_window) do
+ @main_window = Gtk::Window.new(Gtk::Window::TOPLEVEL)
+ @main_window.set_title("Test::Unit TestRunner")
+ @main_window.set_default_size(800, 600)
+ @main_window.set_resizable(true)
+ @main_window.add(main_panel)
+ end
+ end # def main_window
+ private :main_window
+
+ def setup_ui
+ main_window.signal_connect("destroy", nil) { stop }
+ main_window.show_all
+ fault_list.selection.signal_connect("changed", nil) do
+ |selection, data|
+ if selection.selected then
+ show_fault(fault_list.get_fault(selection.selected))
+ else
+ clear_fault
+ end
+ end
+ end # def setup_ui
+ private :setup_ui
+
+ def output_status(string)
+ status_entry.set_text(string)
+ end # def output_status(string)
+ private :output_status
+
+ def finished(elapsed_time)
+ test_progress_bar.fraction = 1.0
+ output_status("Finished in #{elapsed_time} seconds")
+ end # def finished(elapsed_time)
+ private :finished
+
+ def test_started(test_name)
+ output_status("Running #{test_name}...")
+ end # def test_started(test_name)
+ private :test_started
+
+ def started(result)
+ @result = result
+ output_status("Started...")
+ end # def started(result)
+ private :started
+
+ def test_finished(result)
+ test_progress_bar.fraction += 1.0 / @count
+ end # def test_finished(result)
+
+ def result_changed(result)
+ run_count_label.label = result.run_count.to_s
+ assertion_count_label.label = result.assertion_count.to_s
+ failure_count_label.label = result.failure_count.to_s
+ error_count_label.label = result.error_count.to_s
+ end # def result_changed(result)
+ private :result_changed
+
+ def clear_fault
+ raw_show_fault("")
+ end # def clear_fault
+ private :clear_fault
+
+ def raw_show_fault(string)
+ fault_detail_label.set_text(string)
+ outer_detail_sub_panel.queue_resize
+ end # def raw_show_fault(string)
+ private :raw_show_fault
+
+ def show_fault(fault)
+ raw_show_fault(fault.long_display)
+ end # def show_fault(fault)
+ private :show_fault
+
+ def add_fault(fault)
+ if not @red then
+ test_progress_bar.style = red_style
+ @red = true
+ end
+ fault_list.add_fault(fault)
+ end # def add_fault(fault)
+ private :add_fault
+
+ def reset_ui(count)
+ test_progress_bar.style = green_style
+ test_progress_bar.fraction = 0.0
+ @count = count + 1
+ @red = false
+
+ run_count_label.set_text("0")
+ assertion_count_label.set_text("0")
+ failure_count_label.set_text("0")
+ error_count_label.set_text("0")
+
+ fault_list.clear
+ end # def reset_ui(count)
+ private :reset_ui
+
+ def stop
+ Gtk.main_quit
+ end # def stop
+ private :stop
+
+ def run_test
+ @runner.raise(@restart_signal)
+ end
+ private :run_test
+
+ def start_ui
+ @viewer.run
+ running = false
+ begin
+ loop do
+ if (running ^= true)
+ run_button.child.text = "Stop"
+ @mediator.run_suite
+ else
+ run_button.child.text = "Run"
+ @viewer.join
+ break
+ end
+ end
+ rescue @restart_signal
+ retry
+ rescue
+ end
+ end # def start_ui
+ private :start_ui
+
+ def attach_to_mediator
+ run_button.signal_connect("clicked", nil) { run_test }
+ @mediator.add_listener(TestRunnerMediator::RESET, &method(:reset_ui))
+ @mediator.add_listener(TestRunnerMediator::STARTED, &method(:started))
+ @mediator.add_listener(TestRunnerMediator::FINISHED, &method(:finished))
+ @mediator.add_listener(TestResult::FAULT, &method(:add_fault))
+ @mediator.add_listener(TestResult::CHANGED, &method(:result_changed))
+ @mediator.add_listener(TestCase::STARTED, &method(:test_started))
+ @mediator.add_listener(TestCase::FINISHED, &method(:test_finished))
+ end # def attach_to_mediator
+ private :attach_to_mediator
+
+ def setup_mediator
+ @mediator = TestRunnerMediator.new(@suite)
+ suite_name = @suite.to_s
+ if @suite.kind_of?(Module) then
+ suite_name = @suite.name
+ end
+ suite_name_entry.set_text(suite_name)
+ end # def setup_mediator
+ private :setup_mediator
+
+ def start
+ setup_mediator
+ setup_ui
+ attach_to_mediator
+ start_ui
+ @result
+ end # def start
+
+ def initialize(suite, output_level = NORMAL)
+ if suite.respond_to?(:suite) then
+ @suite = suite.suite
+ else
+ @suite = suite
+ end
+ @result = nil
+
+ @runner = Thread.current
+ @restart_signal = Class.new(Exception)
+ @viewer = Thread.start do
+ @runner.join rescue @runner.run
+ Gtk.main
+ end
+ @viewer.join rescue nil # wait deadlock to handshake
+ end # def initialize(suite)
+
+ end # class TestRunner
+
+ end # module GTK2
+ end # module UI
+ end # module Unit
+end # module Test
diff --git a/lib/test/unit/ui/testrunnermediator.rb b/lib/test/unit/ui/testrunnermediator.rb
new file mode 100644
index 0000000000..d34510d1c6
--- /dev/null
+++ b/lib/test/unit/ui/testrunnermediator.rb
@@ -0,0 +1,68 @@
+#--
+#
+# Author:: Nathaniel Talbott.
+# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+require 'test/unit'
+require 'test/unit/util/observable'
+require 'test/unit/testresult'
+
+module Test
+ module Unit
+ module UI
+
+ # Provides an interface to write any given UI against,
+ # hopefully making it easy to write new UIs.
+ class TestRunnerMediator
+ RESET = name + "::RESET"
+ STARTED = name + "::STARTED"
+ FINISHED = name + "::FINISHED"
+
+ include Util::Observable
+
+ # Creates a new TestRunnerMediator initialized to run
+ # the passed suite.
+ def initialize(suite)
+ @suite = suite
+ end
+
+ # Runs the suite the TestRunnerMediator was created
+ # with.
+ def run_suite
+ Unit.run = true
+ begin_time = Time.now
+ notify_listeners(RESET, @suite.size)
+ result = create_result
+ notify_listeners(STARTED, result)
+ result_listener = result.add_listener(TestResult::CHANGED) do |updated_result|
+ notify_listeners(TestResult::CHANGED, updated_result)
+ end
+
+ fault_listener = result.add_listener(TestResult::FAULT) do |fault|
+ notify_listeners(TestResult::FAULT, fault)
+ end
+
+ @suite.run(result) do |channel, value|
+ notify_listeners(channel, value)
+ end
+
+ result.remove_listener(TestResult::FAULT, fault_listener)
+ result.remove_listener(TestResult::CHANGED, result_listener)
+ end_time = Time.now
+ elapsed_time = end_time - begin_time
+ notify_listeners(FINISHED, elapsed_time) #"Finished in #{elapsed_time} seconds.")
+ return result
+ end
+
+ private
+ # A factory method to create the result the mediator
+ # should run with. Can be overridden by subclasses if
+ # one wants to use a different result.
+ def create_result
+ return TestResult.new
+ end
+ end
+ end
+ end
+end
diff --git a/lib/test/unit/ui/testrunnerutilities.rb b/lib/test/unit/ui/testrunnerutilities.rb
new file mode 100644
index 0000000000..70b885bd6c
--- /dev/null
+++ b/lib/test/unit/ui/testrunnerutilities.rb
@@ -0,0 +1,46 @@
+#--
+#
+# Author:: Nathaniel Talbott.
+# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+module Test
+ module Unit
+ module UI
+
+ SILENT = 0
+ PROGRESS_ONLY = 1
+ NORMAL = 2
+ VERBOSE = 3
+
+ # Provides some utilities common to most, if not all,
+ # TestRunners.
+ #
+ #--
+ #
+ # Perhaps there ought to be a TestRunner superclass? There
+ # seems to be a decent amount of shared code between test
+ # runners.
+
+ module TestRunnerUtilities
+
+ # Creates a new TestRunner and runs the suite.
+ def run(suite, output_level=NORMAL)
+ return new(suite, output_level).start
+ end
+
+ # Takes care of the ARGV parsing and suite
+ # determination necessary for running one of the
+ # TestRunners from the command line.
+ def start_command_line_test
+ if ARGV.empty?
+ puts "You should supply the name of a test suite file to the runner"
+ exit
+ end
+ require ARGV[0].gsub(/.+::/, '')
+ new(eval(ARGV[0])).start
+ end
+ end
+ end
+ end
+end
diff --git a/lib/test/unit/ui/tk/testrunner.rb b/lib/test/unit/ui/tk/testrunner.rb
new file mode 100644
index 0000000000..4d05f2fb22
--- /dev/null
+++ b/lib/test/unit/ui/tk/testrunner.rb
@@ -0,0 +1,260 @@
+#--
+#
+# Original Author:: Nathaniel Talbott.
+# Author:: Kazuhiro NISHIYAMA.
+# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
+# Copyright:: Copyright (c) 2003 Kazuhiro NISHIYAMA. All rights reserved.
+# License:: Ruby license.
+
+require 'tk'
+require 'test/unit/ui/testrunnermediator'
+require 'test/unit/ui/testrunnerutilities'
+
+module Test
+ module Unit
+ module UI
+ module Tk
+
+ # Runs a Test::Unit::TestSuite in a Tk UI. Obviously,
+ # this one requires you to have Tk
+ # and the Ruby Tk extension installed.
+ class TestRunner
+ extend TestRunnerUtilities
+
+ # Creates a new TestRunner for running the passed
+ # suite.
+ def initialize(suite, output_level = NORMAL)
+ if (suite.respond_to?(:suite))
+ @suite = suite.suite
+ else
+ @suite = suite
+ end
+ @result = nil
+
+ @red = false
+ @fault_detail_list = []
+ @runner = Thread.current
+ @restart_signal = Class.new(Exception)
+ @viewer = Thread.start do
+ @runner.join rescue @runner.run
+ ::Tk.mainloop
+ end
+ @viewer.join rescue nil # wait deadlock to handshake
+ end
+
+ # Begins the test run.
+ def start
+ setup_ui
+ setup_mediator
+ attach_to_mediator
+ start_ui
+ @result
+ end
+
+ private
+ def setup_mediator
+ @mediator = TestRunnerMediator.new(@suite)
+ suite_name = @suite.to_s
+ if ( @suite.kind_of?(Module) )
+ suite_name = @suite.name
+ end
+ @suite_name_entry.value = suite_name
+ end
+
+ def attach_to_mediator
+ @run_button.command(method(:run_test))
+ @fault_list.bind('ButtonPress-1', proc{|y|
+ fault = @fault_detail_list[@fault_list.nearest(y)]
+ if fault
+ show_fault(fault)
+ end
+ }, '%y')
+ @mediator.add_listener(TestRunnerMediator::RESET, &method(:reset_ui))
+ @mediator.add_listener(TestResult::FAULT, &method(:add_fault))
+ @mediator.add_listener(TestResult::CHANGED, &method(:result_changed))
+ @mediator.add_listener(TestRunnerMediator::STARTED, &method(:started))
+ @mediator.add_listener(TestCase::STARTED, &method(:test_started))
+ @mediator.add_listener(TestRunnerMediator::FINISHED, &method(:finished))
+ end
+
+ def run_test
+ @runner.raise(@restart_signal)
+ end
+
+ def start_ui
+ @viewer.run
+ running = false
+ begin
+ loop do
+ if (running ^= true)
+ @run_button.configure('text'=>'Stop')
+ @mediator.run_suite
+ else
+ @run_button.configure('text'=>'Run')
+ @viewer.join
+ break
+ end
+ end
+ rescue @restart_signal
+ retry
+ rescue
+ end
+ end
+
+ def stop
+ ::Tk.exit
+ end
+
+ def reset_ui(count)
+ @test_total_count = count.to_f
+ @test_progress_bar.configure('background'=>'green')
+ @test_progress_bar.place('relwidth'=>(count.zero? ? 0 : 0/count))
+ @red = false
+
+ @test_count_label.value = 0
+ @assertion_count_label.value = 0
+ @failure_count_label.value = 0
+ @error_count_label.value = 0
+
+ @fault_list.delete(0, 'end')
+ @fault_detail_list = []
+ clear_fault
+ end
+
+ def add_fault(fault)
+ if ( ! @red )
+ @test_progress_bar.configure('background'=>'red')
+ @red = true
+ end
+ @fault_detail_list.push fault
+ @fault_list.insert('end', fault.short_display)
+ end
+
+ def show_fault(fault)
+ raw_show_fault(fault.long_display)
+ end
+
+ def raw_show_fault(string)
+ @detail_text.value = string
+ end
+
+ def clear_fault
+ raw_show_fault("")
+ end
+
+ def result_changed(result)
+ @test_count_label.value = result.run_count
+ @test_progress_bar.place('relwidth'=>result.run_count/@test_total_count)
+ @assertion_count_label.value = result.assertion_count
+ @failure_count_label.value = result.failure_count
+ @error_count_label.value = result.error_count
+ end
+
+ def started(result)
+ @result = result
+ output_status("Started...")
+ end
+
+ def test_started(test_name)
+ output_status("Running #{test_name}...")
+ end
+
+ def finished(elapsed_time)
+ output_status("Finished in #{elapsed_time} seconds")
+ end
+
+ def output_status(string)
+ @status_entry.value = string
+ end
+
+ def setup_ui
+ @status_entry = TkVariable.new
+ l = TkLabel.new(nil, 'textvariable'=>@status_entry, 'relief'=>'sunken')
+ l.pack('side'=>'bottom', 'fill'=>'x')
+
+ suite_frame = TkFrame.new.pack('fill'=>'x')
+
+ @run_button = TkButton.new(suite_frame, 'text'=>'Run')
+ @run_button.pack('side'=>'right')
+
+ TkLabel.new(suite_frame, 'text'=>'Suite:').pack('side'=>'left')
+ @suite_name_entry = TkVariable.new
+ l = TkLabel.new(suite_frame, 'textvariable'=>@suite_name_entry, 'relief'=>'sunken')
+ l.pack('side'=>'left', 'fill'=>'x', 'expand'=>true)
+
+ f = TkFrame.new(nil, 'relief'=>'sunken', 'borderwidth'=>3, 'height'=>20).pack('fill'=>'x', 'padx'=>1)
+ @test_progress_bar = TkFrame.new(f, 'background'=>'green').place('anchor'=>'nw', 'relwidth'=>0.0, 'relheight'=>1.0)
+
+ info_frame = TkFrame.new.pack('fill'=>'x')
+ @test_count_label = create_count_label(info_frame, 'Tests:')
+ @assertion_count_label = create_count_label(info_frame, 'Assertions:')
+ @failure_count_label = create_count_label(info_frame, 'Failures:')
+ @error_count_label = create_count_label(info_frame, 'Errors:')
+
+ if (::Tk.info('command', TkPanedWindow::TkCommandNames[0]) != "")
+ # use panedwindow
+ paned_frame = TkPanedWindow.new("orient"=>"vertical").pack('fill'=>'both', 'expand'=>true)
+
+ fault_list_frame = TkFrame.new(paned_frame)
+ detail_frame = TkFrame.new(paned_frame)
+
+ paned_frame.add(fault_list_frame, detail_frame)
+ else
+ # no panedwindow
+ paned_frame = nil
+ fault_list_frame = TkFrame.new.pack('fill'=>'both', 'expand'=>true)
+ detail_frame = TkFrame.new.pack('fill'=>'both', 'expand'=>true)
+ end
+
+ TkGrid.rowconfigure(fault_list_frame, 0, 'weight'=>1, 'minsize'=>0)
+ TkGrid.columnconfigure(fault_list_frame, 0, 'weight'=>1, 'minsize'=>0)
+
+ fault_scrollbar_y = TkScrollbar.new(fault_list_frame)
+ fault_scrollbar_x = TkScrollbar.new(fault_list_frame)
+ @fault_list = TkListbox.new(fault_list_frame)
+ @fault_list.yscrollbar(fault_scrollbar_y)
+ @fault_list.xscrollbar(fault_scrollbar_x)
+
+ TkGrid.rowconfigure(detail_frame, 0, 'weight'=>1, 'minsize'=>0)
+ TkGrid.columnconfigure(detail_frame, 0, 'weight'=>1, 'minsize'=>0)
+
+ ::Tk.grid(@fault_list, fault_scrollbar_y, 'sticky'=>'news')
+ ::Tk.grid(fault_scrollbar_x, 'sticky'=>'news')
+
+ detail_scrollbar_y = TkScrollbar.new(detail_frame)
+ detail_scrollbar_x = TkScrollbar.new(detail_frame)
+ @detail_text = TkText.new(detail_frame, 'height'=>10, 'wrap'=>'none') {
+ bindtags(bindtags - [TkText])
+ }
+ @detail_text.yscrollbar(detail_scrollbar_y)
+ @detail_text.xscrollbar(detail_scrollbar_x)
+
+ ::Tk.grid(@detail_text, detail_scrollbar_y, 'sticky'=>'news')
+ ::Tk.grid(detail_scrollbar_x, 'sticky'=>'news')
+
+ # rubber-style pane
+ if paned_frame
+ ::Tk.update
+ @height = paned_frame.winfo_height
+ paned_frame.bind('Configure', proc{|h|
+ paned_frame.sash_place(0, 0, paned_frame.sash_coord(0)[1] * h / @height)
+ @height = h
+ }, '%h')
+ end
+ end
+
+ def create_count_label(parent, label)
+ TkLabel.new(parent, 'text'=>label).pack('side'=>'left', 'expand'=>true)
+ v = TkVariable.new(0)
+ TkLabel.new(parent, 'textvariable'=>v).pack('side'=>'left', 'expand'=>true)
+ v
+ end
+ end
+ end
+ end
+ end
+end
+
+if __FILE__ == $0
+ Test::Unit::UI::Tk::TestRunner.start_command_line_test
+end
diff --git a/lib/test/unit/util/backtracefilter.rb b/lib/test/unit/util/backtracefilter.rb
new file mode 100644
index 0000000000..7ebec2dfef
--- /dev/null
+++ b/lib/test/unit/util/backtracefilter.rb
@@ -0,0 +1,40 @@
+module Test
+ module Unit
+ module Util
+ module BacktraceFilter
+ TESTUNIT_FILE_SEPARATORS = %r{[\\/:]}
+ TESTUNIT_PREFIX = __FILE__.split(TESTUNIT_FILE_SEPARATORS)[0..-3]
+ TESTUNIT_RB_FILE = /\.rb\Z/
+
+ def filter_backtrace(backtrace, prefix=nil)
+ return ["No backtrace"] unless(backtrace)
+ split_p = if(prefix)
+ prefix.split(TESTUNIT_FILE_SEPARATORS)
+ else
+ TESTUNIT_PREFIX
+ end
+ match = proc do |e|
+ split_e = e.split(TESTUNIT_FILE_SEPARATORS)[0, split_p.size]
+ next false unless(split_e[0..-2] == split_p[0..-2])
+ split_e[-1].sub(TESTUNIT_RB_FILE, '') == split_p[-1]
+ end
+ return backtrace unless(backtrace.detect(&match))
+ found_prefix = false
+ new_backtrace = backtrace.reverse.reject do |e|
+ if(match[e])
+ found_prefix = true
+ true
+ elsif(found_prefix)
+ false
+ else
+ true
+ end
+ end.reverse
+ new_backtrace = (new_backtrace.empty? ? backtrace : new_backtrace)
+ new_backtrace = new_backtrace.reject(&match)
+ new_backtrace.empty? ? backtrace : new_backtrace
+ end
+ end
+ end
+ end
+end
diff --git a/lib/test/unit/util/observable.rb b/lib/test/unit/util/observable.rb
new file mode 100644
index 0000000000..3567d34271
--- /dev/null
+++ b/lib/test/unit/util/observable.rb
@@ -0,0 +1,90 @@
+#--
+#
+# Author:: Nathaniel Talbott.
+# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+require 'test/unit/util/procwrapper'
+
+module Test
+ module Unit
+ module Util
+
+ # This is a utility class that allows anything mixing
+ # it in to notify a set of listeners about interesting
+ # events.
+ module Observable
+ # We use this for defaults since nil might mean something
+ NOTHING = "NOTHING/#{__id__}"
+
+ # Adds the passed proc as a listener on the
+ # channel indicated by channel_name. listener_key
+ # is used to remove the listener later; if none is
+ # specified, the proc itself is used.
+ #
+ # Whatever is used as the listener_key is
+ # returned, making it very easy to use the proc
+ # itself as the listener_key:
+ #
+ # listener = add_listener("Channel") { ... }
+ # remove_listener("Channel", listener)
+ def add_listener(channel_name, listener_key=NOTHING, &listener) # :yields: value
+ unless(block_given?)
+ raise ArgumentError.new("No callback was passed as a listener")
+ end
+
+ key = listener_key
+ if (listener_key == NOTHING)
+ listener_key = listener
+ key = ProcWrapper.new(listener)
+ end
+
+ channels[channel_name] ||= {}
+ channels[channel_name][key] = listener
+ return listener_key
+ end
+
+ # Removes the listener indicated by listener_key
+ # from the channel indicated by
+ # channel_name. Returns the registered proc, or
+ # nil if none was found.
+ def remove_listener(channel_name, listener_key)
+ channel = channels[channel_name]
+ return nil unless (channel)
+ key = listener_key
+ if (listener_key.instance_of?(Proc))
+ key = ProcWrapper.new(listener_key)
+ end
+ if (channel.has_key?(key))
+ return channel.delete(key)
+ end
+ return nil
+ end
+
+ # Calls all the procs registered on the channel
+ # indicated by channel_name. If value is
+ # specified, it is passed in to the procs,
+ # otherwise they are called with no arguments.
+ #
+ #--
+ #
+ # Perhaps this should be private? Would it ever
+ # make sense for an external class to call this
+ # method directly?
+ def notify_listeners(channel_name, *arguments)
+ channel = channels[channel_name]
+ return 0 unless (channel)
+ listeners = channel.values
+ listeners.each { |listener| listener.call(*arguments) }
+ return listeners.size
+ end
+
+ private
+ def channels
+ @channels ||= {}
+ return @channels
+ end
+ end
+ end
+ end
+end
diff --git a/lib/test/unit/util/procwrapper.rb b/lib/test/unit/util/procwrapper.rb
new file mode 100644
index 0000000000..ad7252186d
--- /dev/null
+++ b/lib/test/unit/util/procwrapper.rb
@@ -0,0 +1,48 @@
+#--
+#
+# Author:: Nathaniel Talbott.
+# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+module Test
+ module Unit
+ module Util
+
+ # Allows the storage of a Proc passed through '&' in a
+ # hash.
+ #
+ # Note: this may be inefficient, since the hash being
+ # used is not necessarily very good. In Observable,
+ # efficiency is not too important, since the hash is
+ # only accessed when adding and removing listeners,
+ # not when notifying.
+
+ class ProcWrapper
+
+ # Creates a new wrapper for a_proc.
+ def initialize(a_proc)
+ @a_proc = a_proc
+ @hash = a_proc.inspect.sub(/^(#<#{a_proc.class}:)/){''}.sub(/(>)$/){''}.hex
+ end
+
+ def hash
+ return @hash
+ end
+
+ def ==(other)
+ case(other)
+ when ProcWrapper
+ return @a_proc == other.to_proc
+ else
+ return super
+ end
+ end
+ alias :eql? :==
+
+ def to_proc
+ return @a_proc
+ end
+ end
+ end
+ end
+end
diff --git a/lib/thread.rb b/lib/thread.rb
index cb6d8c62fc..7df6a140f5 100644
--- a/lib/thread.rb
+++ b/lib/thread.rb
@@ -1,5 +1,10 @@
#
+# NOTE:
+# This file is overwritten by ext/thread/lib/thread.rb unless ruby
+# is configured with --disable-fastthread.
+#
# thread.rb - thread support classes
+# $Date$
# by Yukihiro Matsumoto <matz@netlab.co.jp>
#
# Copyright (C) 2001 Yukihiro Matsumoto
@@ -8,19 +13,147 @@
#
unless defined? Thread
- raise "Thread not available for this ruby interpreter"
+ fail "Thread not available for this ruby interpreter"
end
-unless defined? ThreadError
- class ThreadError < StandardError
+class Thread
+ #
+ # Wraps a block in Thread.critical, restoring the original value upon exit
+ # from the critical section.
+ #
+ def Thread.exclusive
+ _old = Thread.critical
+ begin
+ Thread.critical = true
+ return yield
+ ensure
+ Thread.critical = _old
+ end
end
end
-if $DEBUG
- Thread.abort_on_exception = true
+#
+# Mutex implements a simple semaphore that can be used to coordinate access to
+# shared data from multiple concurrent threads.
+#
+# Example:
+#
+# require 'thread'
+# semaphore = Mutex.new
+#
+# a = Thread.new {
+# semaphore.synchronize {
+# # access shared resource
+# }
+# }
+#
+# b = Thread.new {
+# semaphore.synchronize {
+# # access shared resource
+# }
+# }
+#
+class Mutex
+ #
+ # Creates a new Mutex
+ #
+ def initialize
+ @waiting = []
+ @locked = false;
+ @waiting.taint # enable tainted comunication
+ self.taint
+ end
+
+ #
+ # Returns +true+ if this lock is currently held by some thread.
+ #
+ def locked?
+ @locked
+ end
+
+ #
+ # Attempts to obtain the lock and returns immediately. Returns +true+ if the
+ # lock was granted.
+ #
+ def try_lock
+ result = false
+ Thread.critical = true
+ unless @locked
+ @locked = true
+ result = true
+ end
+ Thread.critical = false
+ result
+ end
+
+ #
+ # Attempts to grab the lock and waits if it isn't available.
+ #
+ def lock
+ while (Thread.critical = true; @locked)
+ @waiting.push Thread.current
+ Thread.stop
+ end
+ @locked = true
+ Thread.critical = false
+ self
+ end
+
+ #
+ # Releases the lock. Returns +nil+ if ref wasn't locked.
+ #
+ def unlock
+ return unless @locked
+ Thread.critical = true
+ @locked = false
+ begin
+ t = @waiting.shift
+ t.wakeup if t
+ rescue ThreadError
+ retry
+ end
+ Thread.critical = false
+ begin
+ t.run if t
+ rescue ThreadError
+ end
+ self
+ end
+
+ #
+ # Obtains a lock, runs the block, and releases the lock when the block
+ # completes. See the example under Mutex.
+ #
+ def synchronize
+ lock
+ begin
+ yield
+ ensure
+ unlock
+ end
+ end
+
+ #
+ # If the mutex is locked, unlocks the mutex, wakes one waiting thread, and
+ # yields in a critical section.
+ #
+ def exclusive_unlock
+ return unless @locked
+ Thread.exclusive do
+ @locked = false
+ begin
+ t = @waiting.shift
+ t.wakeup if t
+ rescue ThreadError
+ retry
+ end
+ yield
+ end
+ self
+ end
end
-#
+#
# ConditionVariable objects augment class Mutex. Using condition variables,
# it is possible to suspend while in the middle of a critical section until a
# resource becomes available.
@@ -31,7 +164,7 @@ end
#
# mutex = Mutex.new
# resource = ConditionVariable.new
-#
+#
# a = Thread.new {
# mutex.synchronize {
# # Thread 'a' now needs the resource
@@ -39,7 +172,7 @@ end
# # 'a' can now have the resource
# }
# }
-#
+#
# b = Thread.new {
# mutex.synchronize {
# # Thread 'b' has finished using the resource
@@ -53,41 +186,40 @@ class ConditionVariable
#
def initialize
@waiters = []
- @waiters_mutex = Mutex.new
end
-
+
#
# Releases the lock held in +mutex+ and waits; reacquires the lock on wakeup.
#
def wait(mutex)
begin
- # TODO: mutex should not be used
- @waiters_mutex.synchronize do
+ mutex.exclusive_unlock do
@waiters.push(Thread.current)
+ Thread.stop
end
- mutex.sleep
+ ensure
+ mutex.lock
end
end
-
+
#
# Wakes up the first thread in line waiting for this lock.
#
def signal
begin
- t = @waiters_mutex.synchronize { @waiters.shift }
+ t = @waiters.shift
t.run if t
rescue ThreadError
retry
end
end
-
+
#
# Wakes up all threads waiting for this lock.
#
def broadcast
- # TODO: imcomplete
waiters0 = nil
- @waiters_mutex.synchronize do
+ Thread.exclusive do
waiters0 = @waiters.dup
@waiters.clear
end
@@ -106,9 +238,9 @@ end
# Example:
#
# require 'thread'
-#
+#
# queue = Queue.new
-#
+#
# producer = Thread.new do
# 5.times do |i|
# sleep rand(i) # simulate expense
@@ -116,7 +248,7 @@ end
# puts "#{i} produced"
# end
# end
-#
+#
# consumer = Thread.new do
# 5.times do |i|
# value = queue.pop
@@ -124,7 +256,7 @@ end
# puts "consumed #{value}"
# end
# end
-#
+#
# consumer.join
#
class Queue
@@ -137,23 +269,22 @@ class Queue
@que.taint # enable tainted comunication
@waiting.taint
self.taint
- @mutex = Mutex.new
end
#
# Pushes +obj+ to the queue.
#
def push(obj)
- t = nil
- @mutex.synchronize{
- @que.push obj
- begin
- t = @waiting.shift
- t.wakeup if t
- rescue ThreadError
- retry
- end
- }
+ Thread.critical = true
+ @que.push obj
+ begin
+ t = @waiting.shift
+ t.wakeup if t
+ rescue ThreadError
+ retry
+ ensure
+ Thread.critical = false
+ end
begin
t.run if t
rescue ThreadError
@@ -176,17 +307,14 @@ class Queue
# thread isn't suspended, and an exception is raised.
#
def pop(non_block=false)
- while true
- @mutex.synchronize{
- if @que.empty?
- raise ThreadError, "queue empty" if non_block
- @waiting.push Thread.current
- @mutex.sleep
- else
- return @que.shift
- end
- }
+ while (Thread.critical = true; @que.empty?)
+ raise ThreadError, "queue empty" if non_block
+ @waiting.push Thread.current
+ Thread.stop
end
+ @que.shift
+ ensure
+ Thread.critical = false
end
#
@@ -200,7 +328,7 @@ class Queue
alias deq pop
#
- # Returns +true+ if the queue is empty.
+ # Returns +true+ is the queue is empty.
#
def empty?
@que.empty?
@@ -239,7 +367,7 @@ end
#
# See Queue for an example of how a SizedQueue works.
#
-class SizedQueue < Queue
+class SizedQueue<Queue
#
# Creates a fixed-length queue with a maximum size of +max+.
#
@@ -262,16 +390,14 @@ class SizedQueue < Queue
# Sets the maximum size of the queue.
#
def max=(max)
- diff = nil
- @mutex.synchronize {
- if max <= @max
- @max = max
- else
- diff = max - @max
- @max = max
- end
- }
- if diff
+ Thread.critical = true
+ if max <= @max
+ @max = max
+ Thread.critical = false
+ else
+ diff = max - @max
+ @max = max
+ Thread.critical = false
diff.times do
begin
t = @queue_wait.shift
@@ -289,27 +415,13 @@ class SizedQueue < Queue
# until space becomes available.
#
def push(obj)
- t = nil
- @mutex.synchronize{
- while true
- break if @que.length < @max
- @queue_wait.push Thread.current
- @mutex.sleep
- end
-
- @que.push obj
- begin
- t = @waiting.shift
- t.wakeup if t
- rescue ThreadError
- retry
- end
- }
-
- begin
- t.run if t
- rescue ThreadError
+ Thread.critical = true
+ while @que.length >= @max
+ @queue_wait.push Thread.current
+ Thread.stop
+ Thread.critical = true
end
+ super
end
#
@@ -327,20 +439,20 @@ class SizedQueue < Queue
#
def pop(*args)
retval = super
- t = nil
- @mutex.synchronize {
- if @que.length < @max
- begin
- t = @queue_wait.shift
- t.wakeup if t
- rescue ThreadError
- retry
- end
+ Thread.critical = true
+ if @que.length < @max
+ begin
+ t = @queue_wait.shift
+ t.wakeup if t
+ rescue ThreadError
+ retry
+ ensure
+ Thread.critical = false
+ end
+ begin
+ t.run if t
+ rescue ThreadError
end
- }
- begin
- t.run if t
- rescue ThreadError
end
retval
end
diff --git a/lib/thwait.rb b/lib/thwait.rb
index 09d99a6c5b..95d294a85d 100644
--- a/lib/thwait.rb
+++ b/lib/thwait.rb
@@ -2,6 +2,7 @@
# thwait.rb - thread synchronization class
# $Release Version: 0.9 $
# $Revision: 1.3 $
+# $Date: 1998/06/26 03:19:34 $
# by Keiju ISHITSUKA(Nihpon Rational Software Co.,Ltd.)
#
# --
@@ -15,7 +16,7 @@
# each thread termination.
# * th = ThreadsWait.new(thread1,...)
# creates synchronization object, specifying thread(s) to wait.
-#
+#
# methods:
# * th.threads
# list threads to be synchronized
@@ -23,7 +24,7 @@
# is there any thread to be synchronized.
# * th.finished?
# is there already terminated thread.
-# * th.join(thread1,...)
+# * th.join(thread1,...)
# wait for specified thread(s).
# * th.join_nowait(threa1,...)
# specifies thread(s) to wait. non-blocking.
@@ -52,11 +53,11 @@ require "e2mmap.rb"
#
class ThreadsWait
RCS_ID='-$Id: thwait.rb,v 1.3 1998/06/26 03:19:34 keiju Exp keiju $-'
-
- extend Exception2MessageMapper
+
+ Exception2MessageMapper.extend_to(binding)
def_exception("ErrNoWaitingThread", "No threads for waiting.")
def_exception("ErrNoFinishedThread", "No finished threads.")
-
+
#
# Waits until all specified threads have terminated. If a block is provided,
# it is executed for each thread termination.
@@ -71,7 +72,7 @@ class ThreadsWait
tw.all_waits
end
end
-
+
#
# Creates a ThreadsWait object, specifying the threads to wait on.
# Non-blocking.
@@ -81,24 +82,24 @@ class ThreadsWait
@wait_queue = Queue.new
join_nowait(*threads) unless threads.empty?
end
-
+
# Returns the array of threads in the wait queue.
attr :threads
-
+
#
# Returns +true+ if there are no threads to be synchronized.
#
def empty?
@threads.empty?
end
-
+
#
# Returns +true+ if any thread has terminated.
#
def finished?
!@wait_queue.empty?
end
-
+
#
# Waits for specified threads to terminate.
#
@@ -106,7 +107,7 @@ class ThreadsWait
join_nowait(*threads)
next_wait
end
-
+
#
# Specifies the threads that this object will wait for, but does not actually
# wait.
@@ -124,7 +125,7 @@ class ThreadsWait
end
end
end
-
+
#
# Waits until any of the specified threads has terminated, and returns the one
# that does.
@@ -141,7 +142,7 @@ class ThreadsWait
ThreadsWait.fail ErrNoFinishedThread
end
end
-
+
#
# Waits until all of the specified threads are terminated. If a block is
# supplied for the method, it is executed for each thread termination.
diff --git a/lib/time.rb b/lib/time.rb
index 2e6ed324e3..a37a067390 100644
--- a/lib/time.rb
+++ b/lib/time.rb
@@ -1,42 +1,46 @@
#
# == Introduction
-#
+#
# This library extends the Time class:
# * conversion between date string and time object.
# * date-time defined by RFC 2822
# * HTTP-date defined by RFC 2616
# * dateTime defined by XML Schema Part 2: Datatypes (ISO 8601)
# * various formats handled by Date._parse (string to time only)
-#
+#
# == Design Issues
-#
+#
# === Specialized interface
-#
+#
# This library provides methods dedicated to special purposes:
# * RFC 2822, RFC 2616 and XML Schema.
# * They makes usual life easier.
-#
+#
# === Doesn't depend on strftime
-#
+#
# This library doesn't use +strftime+. Especially #rfc2822 doesn't depend
# on +strftime+ because:
-#
+#
# * %a and %b are locale sensitive
-#
+#
# Since they are locale sensitive, they may be replaced to
# invalid weekday/month name in some locales.
# Since ruby-1.6 doesn't invoke setlocale by default,
# the problem doesn't arise until some external library invokes setlocale.
# Ruby/GTK is the example of such library.
-#
+#
# * %z is not portable
-#
+#
# %z is required to generate zone in date-time of RFC 2822
# but it is not portable.
#
+# == Revision Information
+#
+# $Id$
+#
-require 'date/format'
+require 'parsedate'
#
# Implements the extensions to the Time class that are described in the
@@ -57,9 +61,9 @@ class Time
'PST' => -8, 'PDT' => -7,
# Following definition of military zones is original one.
# See RFC 1123 and RFC 2822 for the error in RFC 822.
- 'A' => +1, 'B' => +2, 'C' => +3, 'D' => +4, 'E' => +5, 'F' => +6,
+ 'A' => +1, 'B' => +2, 'C' => +3, 'D' => +4, 'E' => +5, 'F' => +6,
'G' => +7, 'H' => +8, 'I' => +9, 'K' => +10, 'L' => +11, 'M' => +12,
- 'N' => -1, 'O' => -2, 'P' => -3, 'Q' => -4, 'R' => -5, 'S' => -6,
+ 'N' => -1, 'O' => -2, 'P' => -3, 'Q' => -4, 'R' => -5, 'S' => -6,
'T' => -7, 'U' => -8, 'V' => -9, 'W' => -10, 'X' => -11, 'Y' => -12,
}
def zone_offset(zone, year=self.now.year)
@@ -80,26 +84,8 @@ class Time
end
def zone_utc?(zone)
- # * +0000
- # In RFC 2822, +0000 indicate a time zone at Universal Time.
- # Europe/London is "a time zone at Universal Time" in Winter.
- # Europe/Lisbon is "a time zone at Universal Time" in Winter.
- # Atlantic/Reykjavik is "a time zone at Universal Time".
- # Africa/Dakar is "a time zone at Universal Time".
- # So +0000 is a local time such as Europe/London, etc.
- # * GMT
- # GMT is used as a time zone abbreviation in Europe/London,
- # Africa/Dakar, etc.
- # So it is a local time.
- #
- # * -0000, -00:00
- # In RFC 2822, -0000 the date-time contains no information about the
- # local time zone.
- # In RFC 3339, -00:00 is used for the time in UTC is known,
- # but the offset to local time is unknown.
- # They are not appropriate for specific time zone such as
- # Europe/London because time zone neutral,
- # So -00:00 and -0000 are treated as UTC.
+ # * +0000 means localtime. [RFC 2822]
+ # * GMT is a localtime abbreviation in Europe/London, etc.
if /\A(?:-00:00|-0000|-00|UTC|Z|UT)\z/i =~ zone
true
else
@@ -164,7 +150,7 @@ class Time
def make_time(year, mon, day, hour, min, sec, sec_fraction, zone, now)
usec = nil
- usec = sec_fraction * 1000000 if sec_fraction
+ usec = (sec_fraction * 1000000).to_i if sec_fraction
if now
begin
break if year; year = now.year
@@ -206,7 +192,7 @@ class Time
# If a block is given, the year described in +date+ is converted by the
# block. For example:
#
- # Time.parse(...) {|y| 0 <= y && y < 100 ? (y >= 69 ? y + 1900 : y + 2000) : y}
+ # Time.parse(...) {|y| y < 100 ? (y >= 69 ? y + 1900 : y + 2000) : y}
#
# If the upper components of the given time are broken or missing, they are
# supplied with those of +now+. For the lower components, the minimum
@@ -214,11 +200,9 @@ class Time
#
# # Suppose it is "Thu Nov 29 14:33:20 GMT 2001" now and
# # your timezone is GMT:
- # now = Time.parse("Thu Nov 29 14:33:20 GMT 2001")
- # Time.parse("16:30", now) #=> 2001-11-29 16:30:00 +0900
- # Time.parse("7/23", now) #=> 2001-07-23 00:00:00 +0900
- # Time.parse("Aug 31", now) #=> 2001-08-31 00:00:00 +0900
- # Time.parse("Aug 2000", now) #=> 2000-08-01 00:00:00 +0900
+ # Time.parse("16:30") #=> Thu Nov 29 16:30:00 GMT 2001
+ # Time.parse("7/23") #=> Mon Jul 23 00:00:00 GMT 2001
+ # Time.parse("Aug 31") #=> Fri Aug 31 00:00:00 GMT 2001
#
# Since there are numerous conflicts among locally defined timezone
# abbreviations all over the world, this method is not made to
@@ -253,26 +237,7 @@ class Time
# A failure for Time.parse should be checked, though.
#
def parse(date, now=self.now)
- comp = !block_given?
- d = Date._parse(date, comp)
- if !d[:year] && !d[:mon] && !d[:mday] && !d[:hour] && !d[:min] && !d[:sec] && !d[:sec_fraction]
- raise ArgumentError, "no time information in #{date.inspect}"
- end
- year = d[:year]
- year = yield(year) if year && !comp
- make_time(year, d[:mon], d[:mday], d[:hour], d[:min], d[:sec], d[:sec_fraction], d[:zone], now)
- end
-
- #
- # Parses +date+ using Date._strptime and converts it to a Time object.
- #
- # If a block is given, the year described in +date+ is converted by the
- # block. For example:
- #
- # Time.strptime(...) {|y| y < 100 ? (y >= 69 ? y + 1900 : y + 2000) : y}
- def strptime(date, format, now=self.now)
- d = Date._strptime(date, format)
- raise ArgumentError, "invalid strptime format - `#{format}'" unless d
+ d = Date._parse(date, false)
year = d[:year]
year = yield(year) if year && block_given?
make_time(year, d[:mon], d[:mday], d[:hour], d[:min], d[:sec], d[:sec_fraction], d[:zone], now)
@@ -358,13 +323,7 @@ class Time
(\d\d):(\d\d):(\d\d)\x20
GMT
\s*\z/ix =~ date
- year = $3.to_i
- if year < 50
- year += 2000
- else
- year += 1900
- end
- self.utc(year, $2, $1.to_i, $4.to_i, $5.to_i, $6.to_i)
+ self.parse(date)
elsif /\A\s*
(?:Mon|Tue|Wed|Thu|Fri|Sat|Sun)\x20
(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\x20
@@ -394,7 +353,7 @@ class Time
(-?\d+)-(\d\d)-(\d\d)
T
(\d\d):(\d\d):(\d\d)
- (\.\d+)?
+ (\.\d*)?
(Z|[+-]\d\d:\d\d)?
\s*\z/ix =~ date
year = $1.to_i
@@ -404,9 +363,7 @@ class Time
min = $5.to_i
sec = $6.to_i
usec = 0
- if $7
- usec = Rational($7) * 1000000
- end
+ usec = ($7[1..-1] + '000000')[0,6].to_i if $7
if $8
zone = $8
year, mon, day, hour, min, sec =
@@ -432,7 +389,7 @@ class Time
# If +self+ is a UTC time, -0000 is used as zone.
#
def rfc2822
- sprintf('%s, %02d %s %04d %02d:%02d:%02d ',
+ sprintf('%s, %02d %s %d %02d:%02d:%02d ',
RFC2822_DAY_NAME[wday],
day, RFC2822_MONTH_NAME[mon-1], year,
hour, min, sec) +
@@ -456,15 +413,15 @@ class Time
#
# Returns a string which represents the time as rfc1123-date of HTTP-date
- # defined by RFC 2616:
- #
+ # defined by RFC 2616:
+ #
# day-of-week, DD month-name CCYY hh:mm:ss GMT
#
# Note that the result is always UTC (GMT).
#
def httpdate
t = dup.utc
- sprintf('%s, %02d %s %04d %02d:%02d:%02d GMT',
+ sprintf('%s, %02d %s %d %02d:%02d:%02d GMT',
RFC2822_DAY_NAME[t.wday],
t.day, RFC2822_MONTH_NAME[t.mon-1], t.year,
t.hour, t.min, t.sec)
@@ -485,12 +442,14 @@ class Time
# Its default value is 0.
#
def xmlschema(fraction_digits=0)
- sprintf('%04d-%02d-%02dT%02d:%02d:%02d',
+ sprintf('%d-%02d-%02dT%02d:%02d:%02d',
year, mon, day, hour, min, sec) +
if fraction_digits == 0
''
+ elsif fraction_digits <= 6
+ '.' + sprintf('%06d', usec)[0, fraction_digits]
else
- '.' + sprintf('%0*d', fraction_digits, (subsec * 10**fraction_digits).floor)
+ '.' + sprintf('%06d', usec) + '0' * (fraction_digits - 6)
end +
if utc?
'Z'
@@ -503,3 +462,338 @@ class Time
alias iso8601 xmlschema
end
+if __FILE__ == $0
+ require 'test/unit'
+
+ class TimeExtentionTest < Test::Unit::TestCase # :nodoc:
+ def test_rfc822
+ assert_equal(Time.utc(1976, 8, 26, 14, 30) + 4 * 3600,
+ Time.rfc2822("26 Aug 76 14:30 EDT"))
+ assert_equal(Time.utc(1976, 8, 27, 9, 32) + 7 * 3600,
+ Time.rfc2822("27 Aug 76 09:32 PDT"))
+ end
+
+ def test_rfc2822
+ assert_equal(Time.utc(1997, 11, 21, 9, 55, 6) + 6 * 3600,
+ Time.rfc2822("Fri, 21 Nov 1997 09:55:06 -0600"))
+ assert_equal(Time.utc(2003, 7, 1, 10, 52, 37) - 2 * 3600,
+ Time.rfc2822("Tue, 1 Jul 2003 10:52:37 +0200"))
+ assert_equal(Time.utc(1997, 11, 21, 10, 1, 10) + 6 * 3600,
+ Time.rfc2822("Fri, 21 Nov 1997 10:01:10 -0600"))
+ assert_equal(Time.utc(1997, 11, 21, 11, 0, 0) + 6 * 3600,
+ Time.rfc2822("Fri, 21 Nov 1997 11:00:00 -0600"))
+ assert_equal(Time.utc(1997, 11, 24, 14, 22, 1) + 8 * 3600,
+ Time.rfc2822("Mon, 24 Nov 1997 14:22:01 -0800"))
+ begin
+ Time.at(-1)
+ rescue ArgumentError
+ # ignore
+ else
+ assert_equal(Time.utc(1969, 2, 13, 23, 32, 54) + 3 * 3600 + 30 * 60,
+ Time.rfc2822("Thu, 13 Feb 1969 23:32:54 -0330"))
+ assert_equal(Time.utc(1969, 2, 13, 23, 32, 0) + 3 * 3600 + 30 * 60,
+ Time.rfc2822(" Thu,
+ 13
+ Feb
+ 1969
+ 23:32
+ -0330 (Newfoundland Time)"))
+ end
+ assert_equal(Time.utc(1997, 11, 21, 9, 55, 6),
+ Time.rfc2822("21 Nov 97 09:55:06 GMT"))
+ assert_equal(Time.utc(1997, 11, 21, 9, 55, 6) + 6 * 3600,
+ Time.rfc2822("Fri, 21 Nov 1997 09 : 55 : 06 -0600"))
+ assert_raise(ArgumentError) {
+ # inner comment is not supported.
+ Time.rfc2822("Fri, 21 Nov 1997 09(comment): 55 : 06 -0600")
+ }
+ end
+
+ def test_rfc2616
+ t = Time.utc(1994, 11, 6, 8, 49, 37)
+ assert_equal(t, Time.httpdate("Sun, 06 Nov 1994 08:49:37 GMT"))
+ assert_equal(t, Time.httpdate("Sunday, 06-Nov-94 08:49:37 GMT"))
+ assert_equal(t, Time.httpdate("Sun Nov 6 08:49:37 1994"))
+ assert_equal(Time.utc(1995, 11, 15, 6, 25, 24),
+ Time.httpdate("Wed, 15 Nov 1995 06:25:24 GMT"))
+ assert_equal(Time.utc(1995, 11, 15, 4, 58, 8),
+ Time.httpdate("Wed, 15 Nov 1995 04:58:08 GMT"))
+ assert_equal(Time.utc(1994, 11, 15, 8, 12, 31),
+ Time.httpdate("Tue, 15 Nov 1994 08:12:31 GMT"))
+ assert_equal(Time.utc(1994, 12, 1, 16, 0, 0),
+ Time.httpdate("Thu, 01 Dec 1994 16:00:00 GMT"))
+ assert_equal(Time.utc(1994, 10, 29, 19, 43, 31),
+ Time.httpdate("Sat, 29 Oct 1994 19:43:31 GMT"))
+ assert_equal(Time.utc(1994, 11, 15, 12, 45, 26),
+ Time.httpdate("Tue, 15 Nov 1994 12:45:26 GMT"))
+ assert_equal(Time.utc(1999, 12, 31, 23, 59, 59),
+ Time.httpdate("Fri, 31 Dec 1999 23:59:59 GMT"))
+ end
+
+ def test_rfc3339
+ t = Time.utc(1985, 4, 12, 23, 20, 50, 520000)
+ s = "1985-04-12T23:20:50.52Z"
+ assert_equal(t, Time.iso8601(s))
+ assert_equal(s, t.iso8601(2))
+
+ t = Time.utc(1996, 12, 20, 0, 39, 57)
+ s = "1996-12-19T16:39:57-08:00"
+ assert_equal(t, Time.iso8601(s))
+ # There is no way to generate time string with arbitrary timezone.
+ s = "1996-12-20T00:39:57Z"
+ assert_equal(t, Time.iso8601(s))
+ assert_equal(s, t.iso8601)
+
+ t = Time.utc(1990, 12, 31, 23, 59, 60)
+ s = "1990-12-31T23:59:60Z"
+ assert_equal(t, Time.iso8601(s))
+ # leap second is representable only if timezone file has it.
+ s = "1990-12-31T15:59:60-08:00"
+ assert_equal(t, Time.iso8601(s))
+
+ begin
+ Time.at(-1)
+ rescue ArgumentError
+ # ignore
+ else
+ t = Time.utc(1937, 1, 1, 11, 40, 27, 870000)
+ s = "1937-01-01T12:00:27.87+00:20"
+ assert_equal(t, Time.iso8601(s))
+ end
+ end
+
+ # http://www.w3.org/TR/xmlschema-2/
+ def test_xmlschema
+ assert_equal(Time.utc(1999, 5, 31, 13, 20, 0) + 5 * 3600,
+ Time.xmlschema("1999-05-31T13:20:00-05:00"))
+ assert_equal(Time.local(2000, 1, 20, 12, 0, 0),
+ Time.xmlschema("2000-01-20T12:00:00"))
+ assert_equal(Time.utc(2000, 1, 20, 12, 0, 0),
+ Time.xmlschema("2000-01-20T12:00:00Z"))
+ assert_equal(Time.utc(2000, 1, 20, 12, 0, 0) - 12 * 3600,
+ Time.xmlschema("2000-01-20T12:00:00+12:00"))
+ assert_equal(Time.utc(2000, 1, 20, 12, 0, 0) + 13 * 3600,
+ Time.xmlschema("2000-01-20T12:00:00-13:00"))
+ assert_equal(Time.utc(2000, 3, 4, 23, 0, 0) - 3 * 3600,
+ Time.xmlschema("2000-03-04T23:00:00+03:00"))
+ assert_equal(Time.utc(2000, 3, 4, 20, 0, 0),
+ Time.xmlschema("2000-03-04T20:00:00Z"))
+ assert_equal(Time.local(2000, 1, 15, 0, 0, 0),
+ Time.xmlschema("2000-01-15T00:00:00"))
+ assert_equal(Time.local(2000, 2, 15, 0, 0, 0),
+ Time.xmlschema("2000-02-15T00:00:00"))
+ assert_equal(Time.local(2000, 1, 15, 12, 0, 0),
+ Time.xmlschema("2000-01-15T12:00:00"))
+ assert_equal(Time.utc(2000, 1, 16, 12, 0, 0),
+ Time.xmlschema("2000-01-16T12:00:00Z"))
+ assert_equal(Time.local(2000, 1, 1, 12, 0, 0),
+ Time.xmlschema("2000-01-01T12:00:00"))
+ assert_equal(Time.utc(1999, 12, 31, 23, 0, 0),
+ Time.xmlschema("1999-12-31T23:00:00Z"))
+ assert_equal(Time.local(2000, 1, 16, 12, 0, 0),
+ Time.xmlschema("2000-01-16T12:00:00"))
+ assert_equal(Time.local(2000, 1, 16, 0, 0, 0),
+ Time.xmlschema("2000-01-16T00:00:00"))
+ assert_equal(Time.utc(2000, 1, 12, 12, 13, 14),
+ Time.xmlschema("2000-01-12T12:13:14Z"))
+ assert_equal(Time.utc(2001, 4, 17, 19, 23, 17, 300000),
+ Time.xmlschema("2001-04-17T19:23:17.3Z"))
+ end
+
+ def test_encode_xmlschema
+ t = Time.utc(2001, 4, 17, 19, 23, 17, 300000)
+ assert_equal("2001-04-17T19:23:17Z", t.xmlschema)
+ assert_equal("2001-04-17T19:23:17.3Z", t.xmlschema(1))
+ assert_equal("2001-04-17T19:23:17.300000Z", t.xmlschema(6))
+ assert_equal("2001-04-17T19:23:17.3000000Z", t.xmlschema(7))
+
+ t = Time.utc(2001, 4, 17, 19, 23, 17, 123456)
+ assert_equal("2001-04-17T19:23:17.1234560Z", t.xmlschema(7))
+ assert_equal("2001-04-17T19:23:17.123456Z", t.xmlschema(6))
+ assert_equal("2001-04-17T19:23:17.12345Z", t.xmlschema(5))
+ assert_equal("2001-04-17T19:23:17.1Z", t.xmlschema(1))
+
+ begin
+ Time.at(-1)
+ rescue ArgumentError
+ # ignore
+ else
+ t = Time.utc(1960, 12, 31, 23, 0, 0, 123456)
+ assert_equal("1960-12-31T23:00:00.123456Z", t.xmlschema(6))
+ end
+
+ assert_equal(249, Time.xmlschema("2008-06-05T23:49:23.000249+09:00").usec)
+ end
+
+ def test_completion
+ now = Time.local(2001,11,29,21,26,35)
+ assert_equal(Time.local( 2001,11,29,21,12),
+ Time.parse("2001/11/29 21:12", now))
+ assert_equal(Time.local( 2001,11,29),
+ Time.parse("2001/11/29", now))
+ assert_equal(Time.local( 2001,11,29),
+ Time.parse( "11/29", now))
+ #assert_equal(Time.local(2001,11,1), Time.parse("Nov", now))
+ assert_equal(Time.local( 2001,11,29,10,22),
+ Time.parse( "10:22", now))
+ end
+
+ def test_invalid
+ # They were actually used in some web sites.
+ assert_raise(ArgumentError) { Time.httpdate("1 Dec 2001 10:23:57 GMT") }
+ assert_raise(ArgumentError) { Time.httpdate("Sat, 1 Dec 2001 10:25:42 GMT") }
+ assert_raise(ArgumentError) { Time.httpdate("Sat, 1-Dec-2001 10:53:55 GMT") }
+ assert_raise(ArgumentError) { Time.httpdate("Saturday, 01-Dec-2001 10:15:34 GMT") }
+ assert_raise(ArgumentError) { Time.httpdate("Saturday, 01-Dec-101 11:10:07 GMT") }
+ assert_raise(ArgumentError) { Time.httpdate("Fri, 30 Nov 2001 21:30:00 JST") }
+
+ # They were actually used in some mails.
+ assert_raise(ArgumentError) { Time.rfc2822("01-5-20") }
+ assert_raise(ArgumentError) { Time.rfc2822("7/21/00") }
+ assert_raise(ArgumentError) { Time.rfc2822("2001-8-28") }
+ assert_raise(ArgumentError) { Time.rfc2822("00-5-6 1:13:06") }
+ assert_raise(ArgumentError) { Time.rfc2822("2001-9-27 9:36:49") }
+ assert_raise(ArgumentError) { Time.rfc2822("2000-12-13 11:01:11") }
+ assert_raise(ArgumentError) { Time.rfc2822("2001/10/17 04:29:55") }
+ assert_raise(ArgumentError) { Time.rfc2822("9/4/2001 9:23:19 PM") }
+ assert_raise(ArgumentError) { Time.rfc2822("01 Nov 2001 09:04:31") }
+ assert_raise(ArgumentError) { Time.rfc2822("13 Feb 2001 16:4 GMT") }
+ assert_raise(ArgumentError) { Time.rfc2822("01 Oct 00 5:41:19 PM") }
+ assert_raise(ArgumentError) { Time.rfc2822("2 Jul 00 00:51:37 JST") }
+ assert_raise(ArgumentError) { Time.rfc2822("01 11 2001 06:55:57 -0500") }
+ assert_raise(ArgumentError) { Time.rfc2822("18 \343\366\356\341\370 2000") }
+ assert_raise(ArgumentError) { Time.rfc2822("Fri, Oct 2001 18:53:32") }
+ assert_raise(ArgumentError) { Time.rfc2822("Fri, 2 Nov 2001 03:47:54") }
+ assert_raise(ArgumentError) { Time.rfc2822("Fri, 27 Jul 2001 11.14.14 +0200") }
+ assert_raise(ArgumentError) { Time.rfc2822("Thu, 2 Nov 2000 04:13:53 -600") }
+ assert_raise(ArgumentError) { Time.rfc2822("Wed, 5 Apr 2000 22:57:09 JST") }
+ assert_raise(ArgumentError) { Time.rfc2822("Mon, 11 Sep 2000 19:47:33 00000") }
+ assert_raise(ArgumentError) { Time.rfc2822("Fri, 28 Apr 2000 20:40:47 +-900") }
+ assert_raise(ArgumentError) { Time.rfc2822("Fri, 19 Jan 2001 8:15:36 AM -0500") }
+ assert_raise(ArgumentError) { Time.rfc2822("Thursday, Sep 27 2001 7:42:35 AM EST") }
+ assert_raise(ArgumentError) { Time.rfc2822("3/11/2001 1:31:57 PM Pacific Daylight Time") }
+ assert_raise(ArgumentError) { Time.rfc2822("Mi, 28 Mrz 2001 11:51:36") }
+ assert_raise(ArgumentError) { Time.rfc2822("P, 30 sept 2001 23:03:14") }
+ assert_raise(ArgumentError) { Time.rfc2822("fr, 11 aug 2000 18:39:22") }
+ assert_raise(ArgumentError) { Time.rfc2822("Fr, 21 Sep 2001 17:44:03 -1000") }
+ assert_raise(ArgumentError) { Time.rfc2822("Mo, 18 Jun 2001 19:21:40 -1000") }
+ assert_raise(ArgumentError) { Time.rfc2822("l\366, 12 aug 2000 18:53:20") }
+ assert_raise(ArgumentError) { Time.rfc2822("l\366, 26 maj 2001 00:15:58") }
+ assert_raise(ArgumentError) { Time.rfc2822("Dom, 30 Sep 2001 17:36:30") }
+ assert_raise(ArgumentError) { Time.rfc2822("%&, 31 %2/ 2000 15:44:47 -0500") }
+ assert_raise(ArgumentError) { Time.rfc2822("dom, 26 ago 2001 03:57:07 -0300") }
+ assert_raise(ArgumentError) { Time.rfc2822("ter, 04 set 2001 16:27:58 -0300") }
+ assert_raise(ArgumentError) { Time.rfc2822("Wen, 3 oct 2001 23:17:49 -0400") }
+ assert_raise(ArgumentError) { Time.rfc2822("Wen, 3 oct 2001 23:17:49 -0400") }
+ assert_raise(ArgumentError) { Time.rfc2822("ele, 11 h: 2000 12:42:15 -0500") }
+ assert_raise(ArgumentError) { Time.rfc2822("Tue, 14 Aug 2001 3:55:3 +0200") }
+ assert_raise(ArgumentError) { Time.rfc2822("Fri, 25 Aug 2000 9:3:48 +0800") }
+ assert_raise(ArgumentError) { Time.rfc2822("Fri, 1 Dec 2000 0:57:50 EST") }
+ assert_raise(ArgumentError) { Time.rfc2822("Mon, 7 May 2001 9:39:51 +0200") }
+ assert_raise(ArgumentError) { Time.rfc2822("Wed, 1 Aug 2001 16:9:15 +0200") }
+ assert_raise(ArgumentError) { Time.rfc2822("Wed, 23 Aug 2000 9:17:36 +0800") }
+ assert_raise(ArgumentError) { Time.rfc2822("Fri, 11 Aug 2000 10:4:42 +0800") }
+ assert_raise(ArgumentError) { Time.rfc2822("Sat, 15 Sep 2001 13:22:2 +0300") }
+ assert_raise(ArgumentError) { Time.rfc2822("Wed,16 \276\305\324\302 2001 20:06:25 +0800") }
+ assert_raise(ArgumentError) { Time.rfc2822("Wed,7 \312\256\322\273\324\302 2001 23:47:22 +0800") }
+ assert_raise(ArgumentError) { Time.rfc2822("=?iso-8859-1?Q?(=C5=DA),?= 10 2 2001 23:32:26 +0900 (JST)") }
+ assert_raise(ArgumentError) { Time.rfc2822("\307\341\314\343\332\311, 30 \344\346\335\343\310\321 2001 10:01:06") }
+ assert_raise(ArgumentError) { Time.rfc2822("=?iso-8859-1?Q?(=BF=E5),?= 12 =?iso-8859-1?Q?9=B7=EE?= 2001 14:52:41\n+0900 (JST)") }
+ end
+
+ def test_zone_0000
+ assert_equal(true, Time.parse("2000-01-01T00:00:00Z").utc?)
+ assert_equal(true, Time.parse("2000-01-01T00:00:00-00:00").utc?)
+ assert_equal(false, Time.parse("2000-01-01T00:00:00+00:00").utc?)
+ assert_equal(false, Time.parse("Sat, 01 Jan 2000 00:00:00 GMT").utc?)
+ assert_equal(true, Time.parse("Sat, 01 Jan 2000 00:00:00 -0000").utc?)
+ assert_equal(false, Time.parse("Sat, 01 Jan 2000 00:00:00 +0000").utc?)
+ assert_equal(false, Time.rfc2822("Sat, 01 Jan 2000 00:00:00 GMT").utc?)
+ assert_equal(true, Time.rfc2822("Sat, 01 Jan 2000 00:00:00 -0000").utc?)
+ assert_equal(false, Time.rfc2822("Sat, 01 Jan 2000 00:00:00 +0000").utc?)
+ assert_equal(true, Time.rfc2822("Sat, 01 Jan 2000 00:00:00 UTC").utc?)
+ end
+
+ def test_parse_leap_second
+ t = Time.utc(1998,12,31,23,59,59)
+ assert_equal(t, Time.parse("Thu Dec 31 23:59:59 UTC 1998"))
+ assert_equal(t, Time.parse("Fri Dec 31 23:59:59 -0000 1998"));t.localtime
+ assert_equal(t, Time.parse("Fri Jan 1 08:59:59 +0900 1999"))
+ assert_equal(t, Time.parse("Fri Jan 1 00:59:59 +0100 1999"))
+ assert_equal(t, Time.parse("Fri Dec 31 23:59:59 +0000 1998"))
+ assert_equal(t, Time.parse("Fri Dec 31 22:59:59 -0100 1998"));t.utc
+ t += 1
+ assert_equal(t, Time.parse("Thu Dec 31 23:59:60 UTC 1998"))
+ assert_equal(t, Time.parse("Fri Dec 31 23:59:60 -0000 1998"));t.localtime
+ assert_equal(t, Time.parse("Fri Jan 1 08:59:60 +0900 1999"))
+ assert_equal(t, Time.parse("Fri Jan 1 00:59:60 +0100 1999"))
+ assert_equal(t, Time.parse("Fri Dec 31 23:59:60 +0000 1998"))
+ assert_equal(t, Time.parse("Fri Dec 31 22:59:60 -0100 1998"));t.utc
+ t += 1 if t.sec == 60
+ assert_equal(t, Time.parse("Thu Jan 1 00:00:00 UTC 1999"))
+ assert_equal(t, Time.parse("Fri Jan 1 00:00:00 -0000 1999"));t.localtime
+ assert_equal(t, Time.parse("Fri Jan 1 09:00:00 +0900 1999"))
+ assert_equal(t, Time.parse("Fri Jan 1 01:00:00 +0100 1999"))
+ assert_equal(t, Time.parse("Fri Jan 1 00:00:00 +0000 1999"))
+ assert_equal(t, Time.parse("Fri Dec 31 23:00:00 -0100 1998"))
+ end
+
+ def test_rfc2822_leap_second
+ t = Time.utc(1998,12,31,23,59,59)
+ assert_equal(t, Time.rfc2822("Thu, 31 Dec 1998 23:59:59 UTC"))
+ assert_equal(t, Time.rfc2822("Fri, 31 Dec 1998 23:59:59 -0000"));t.localtime
+ assert_equal(t, Time.rfc2822("Fri, 1 Jan 1999 08:59:59 +0900"))
+ assert_equal(t, Time.rfc2822("Fri, 1 Jan 1999 00:59:59 +0100"))
+ assert_equal(t, Time.rfc2822("Fri, 31 Dec 1998 23:59:59 +0000"))
+ assert_equal(t, Time.rfc2822("Fri, 31 Dec 1998 22:59:59 -0100"));t.utc
+ t += 1
+ assert_equal(t, Time.rfc2822("Thu, 31 Dec 1998 23:59:60 UTC"))
+ assert_equal(t, Time.rfc2822("Fri, 31 Dec 1998 23:59:60 -0000"));t.localtime
+ assert_equal(t, Time.rfc2822("Fri, 1 Jan 1999 08:59:60 +0900"))
+ assert_equal(t, Time.rfc2822("Fri, 1 Jan 1999 00:59:60 +0100"))
+ assert_equal(t, Time.rfc2822("Fri, 31 Dec 1998 23:59:60 +0000"))
+ assert_equal(t, Time.rfc2822("Fri, 31 Dec 1998 22:59:60 -0100"));t.utc
+ t += 1 if t.sec == 60
+ assert_equal(t, Time.rfc2822("Thu, 1 Jan 1999 00:00:00 UTC"))
+ assert_equal(t, Time.rfc2822("Fri, 1 Jan 1999 00:00:00 -0000"));t.localtime
+ assert_equal(t, Time.rfc2822("Fri, 1 Jan 1999 09:00:00 +0900"))
+ assert_equal(t, Time.rfc2822("Fri, 1 Jan 1999 01:00:00 +0100"))
+ assert_equal(t, Time.rfc2822("Fri, 1 Jan 1999 00:00:00 +0000"))
+ assert_equal(t, Time.rfc2822("Fri, 31 Dec 1998 23:00:00 -0100"))
+ end
+
+ def test_xmlschema_leap_second
+ t = Time.utc(1998,12,31,23,59,59)
+ assert_equal(t, Time.xmlschema("1998-12-31T23:59:59Z"))
+ assert_equal(t, Time.xmlschema("1998-12-31T23:59:59-00:00"));t.localtime
+ assert_equal(t, Time.xmlschema("1999-01-01T08:59:59+09:00"))
+ assert_equal(t, Time.xmlschema("1999-01-01T00:59:59+01:00"))
+ assert_equal(t, Time.xmlschema("1998-12-31T23:59:59+00:00"))
+ assert_equal(t, Time.xmlschema("1998-12-31T22:59:59-01:00"));t.utc
+ t += 1
+ assert_equal(t, Time.xmlschema("1998-12-31T23:59:60Z"))
+ assert_equal(t, Time.xmlschema("1998-12-31T23:59:60-00:00"));t.localtime
+ assert_equal(t, Time.xmlschema("1999-01-01T08:59:60+09:00"))
+ assert_equal(t, Time.xmlschema("1999-01-01T00:59:60+01:00"))
+ assert_equal(t, Time.xmlschema("1998-12-31T23:59:60+00:00"))
+ assert_equal(t, Time.xmlschema("1998-12-31T22:59:60-01:00"));t.utc
+ t += 1 if t.sec == 60
+ assert_equal(t, Time.xmlschema("1999-01-01T00:00:00Z"))
+ assert_equal(t, Time.xmlschema("1999-01-01T00:00:00-00:00"));t.localtime
+ assert_equal(t, Time.xmlschema("1999-01-01T09:00:00+09:00"))
+ assert_equal(t, Time.xmlschema("1999-01-01T01:00:00+01:00"))
+ assert_equal(t, Time.xmlschema("1999-01-01T00:00:00+00:00"))
+ assert_equal(t, Time.xmlschema("1998-12-31T23:00:00-01:00"))
+ end
+
+ def test_ruby_talk_152866
+ t = Time::xmlschema('2005-08-30T22:48:00-07:00')
+ assert_equal(31, t.day)
+ assert_equal(8, t.mon)
+ end
+
+ def test_parse_fraction
+ assert_equal(500000, Time.parse("2000-01-01T00:00:00.5+00:00").tv_usec)
+ end
+ end
+end
diff --git a/lib/timeout.rb b/lib/timeout.rb
index 893b5f8f58..5a99c28092 100644
--- a/lib/timeout.rb
+++ b/lib/timeout.rb
@@ -1,30 +1,38 @@
+#--
# = timeout.rb
#
# execution timeout
#
-# = Synopsis
+# = Copyright
#
-# require 'timeout'
-# status = Timeout::timeout(5) {
-# # Something that should be interrupted if it takes too much time...
-# }
+# Copyright:: (C) 2000 Network Applied Communication Laboratory, Inc.
+# Copyright:: (C) 2000 Information-technology Promotion Agency, Japan
+#
+#++
#
# = Description
#
-# A way of performing a potentially long-running operation in a thread, and terminating
-# it's execution if it hasn't finished by a fixed amount of time.
+# A way of performing a potentially long-running operation in a thread, and
+# terminating it's execution if it hasn't finished within fixed amount of
+# time.
#
-# Previous versions of timeout didn't provide use a module for namespace. This version
+# Previous versions of timeout didn't use a module for namespace. This version
# provides both Timeout.timeout, and a backwards-compatible #timeout.
#
-# = Copyright
+# = Synopsis
+#
+# require 'timeout'
+# status = Timeout::timeout(5) {
+# # Something that should be interrupted if it takes too much time...
+# }
#
-# Copyright:: (C) 2000 Network Applied Communication Laboratory, Inc.
-# Copyright:: (C) 2000 Information-technology Promotion Agency, Japan
module Timeout
+
+ ##
# Raised by Timeout#timeout when the block times out.
- class Error < RuntimeError
+
+ class Error < Interrupt
end
class ExitException < ::Exception # :nodoc:
end
@@ -32,16 +40,18 @@ module Timeout
THIS_FILE = /\A#{Regexp.quote(__FILE__)}:/o
CALLER_OFFSET = ((c = caller[0]) && THIS_FILE =~ c) ? 1 : 0
- # Executes the method's block. If the block execution terminates before
- # +sec+ seconds has passed, it returns the result value of the block.
- # If not, it terminates the execution and raises +exception+ (which defaults
- # to Timeout::Error).
+ ##
+ # Executes the method's block. If the block execution terminates before +sec+
+ # seconds has passed, it returns true. If not, it terminates the execution
+ # and raises +exception+ (which defaults to Timeout::Error).
#
- # Note that this is both a method of module Timeout, so you can 'include Timeout'
- # into your classes so they have a #timeout method, as well as a module method,
- # so you can call it directly as Timeout.timeout().
- def timeout(sec, klass = nil) #:yield: +sec+
- return yield(sec) if sec == nil or sec.zero?
+ # Note that this is both a method of module Timeout, so you can 'include
+ # Timeout' into your classes so they have a #timeout method, as well as a
+ # module method, so you can call it directly as Timeout.timeout().
+
+ def timeout(sec, klass = nil)
+ return yield if sec == nil or sec.zero?
+ raise ThreadError, "timeout within critical session" if Thread.critical
exception = klass || Class.new(ExitException)
begin
x = Thread.current
@@ -49,7 +59,8 @@ module Timeout
sleep sec
x.raise exception, "execution expired" if x.alive?
}
- return yield(sec)
+ yield sec
+ # return true
rescue exception => e
rej = /\A#{Regexp.quote(__FILE__)}:#{__LINE__-4}\z/o
(bt = e.backtrace).reject! {|m| rej =~ m}
@@ -62,29 +73,31 @@ module Timeout
# would be expected outside.
raise Error, e.message, e.backtrace
ensure
- if y and y.alive?
- y.kill
- y.join # make sure y is dead.
- end
+ y.kill if y and y.alive?
end
end
module_function :timeout
+
end
+##
# Identical to:
#
# Timeout::timeout(n, e, &block).
#
# Defined for backwards compatibility with earlier versions of timeout.rb, see
# Timeout#timeout.
-def timeout(n, e = nil, &block)
+
+def timeout(n, e = nil, &block) # :nodoc:
Timeout::timeout(n, e, &block)
end
+##
# Another name for Timeout::Error, defined for backwards compatibility with
# earlier versions of timeout.rb.
-TimeoutError = Timeout::Error
+
+TimeoutError = Timeout::Error # :nodoc:
if __FILE__ == $0
p timeout(5) {
@@ -106,3 +119,4 @@ if __FILE__ == $0
}
}
end
+
diff --git a/lib/tmpdir.rb b/lib/tmpdir.rb
index 0d247bdd54..95ef08cfd6 100644
--- a/lib/tmpdir.rb
+++ b/lib/tmpdir.rb
@@ -12,23 +12,16 @@ class Dir
begin
require 'Win32API'
- CSIDL_LOCAL_APPDATA = 0x001c
max_pathlen = 260
- windir = "\0"*(max_pathlen+1)
+ windir = ' '*(max_pathlen+1)
begin
- getdir = Win32API.new('shell32', 'SHGetFolderPath', 'LLLLP', 'L')
- raise RuntimeError if getdir.call(0, CSIDL_LOCAL_APPDATA, 0, 0, windir) != 0
- windir.rstrip!
+ getdir = Win32API.new('kernel32', 'GetSystemWindowsDirectory', 'PL', 'L')
rescue RuntimeError
- begin
- getdir = Win32API.new('kernel32', 'GetSystemWindowsDirectory', 'PL', 'L')
- rescue RuntimeError
- getdir = Win32API.new('kernel32', 'GetWindowsDirectory', 'PL', 'L')
- end
- windir[getdir.call(windir, windir.size)..-1] = ""
+ getdir = Win32API.new('kernel32', 'GetWindowsDirectory', 'PL', 'L')
end
- windir.force_encoding(Dir.pwd.encoding)
- temp = File.expand_path('temp', windir.untaint)
+ len = getdir.call(windir, windir.size)
+ windir = File.expand_path(windir[0, len])
+ temp = File.join(windir, 'temp')
@@systmpdir = temp if File.directory?(temp) and File.writable?(temp)
rescue LoadError
end
@@ -41,14 +34,15 @@ class Dir
if $SAFE > 0
tmp = @@systmpdir
else
- for dir in [ENV['TMPDIR'], ENV['TMP'], ENV['TEMP'], @@systmpdir, '/tmp']
- if dir and stat = File.stat(dir) and stat.directory? and stat.writable?
+ for dir in [ENV['TMPDIR'], ENV['TMP'], ENV['TEMP'],
+ ENV['USERPROFILE'], @@systmpdir, '/tmp']
+ if dir and File.directory?(dir) and File.writable?(dir)
tmp = dir
break
- end rescue nil
+ end
end
- File.expand_path(tmp)
end
+ File.expand_path(tmp)
end
# Dir.mktmpdir creates a temporary directory.
diff --git a/lib/tracer.rb b/lib/tracer.rb
index a0b4fdf133..71aa49c306 100644
--- a/lib/tracer.rb
+++ b/lib/tracer.rb
@@ -1,57 +1,39 @@
+#
# tracer.rb -
-# $Release Version: 0.3$
-# $Revision: 1.12 $
-# by Keiju ISHITSUKA(keiju@ishitsuka.com)
+# $Release Version: 0.2$
+# $Revision: 1.8 $
+# $Date: 1998/05/19 03:42:49 $
+# by Keiju ISHITSUKA(Nippon Rational Inc.)
#
# --
#
#
#
-require "thread"
#
# tracer main class
#
class Tracer
+ @RCS_ID='-$Id: tracer.rb,v 1.8 1998/05/19 03:42:49 keiju Exp keiju $-'
+
+ @stdout = STDOUT
+ @verbose = false
class << self
- attr_accessor :verbose
+ attr :verbose, true
alias verbose? verbose
-
- attr_accessor :stdout
- attr_reader :stdout_mutex
-
- # display process id?
- attr_accessor :display_process_id
- alias display_process_id? display_process_id
-
- # display thread id?
- attr_accessor :display_thread_id
- alias display_thread_id? display_thread_id
-
- # display builtin method call?
- attr_accessor :display_c_call
- alias display_c_call? display_c_call
+ attr :stdout, true
end
- Tracer::stdout = STDOUT
- Tracer::verbose = false
- Tracer::display_process_id = false
- Tracer::display_thread_id = true
- Tracer::display_c_call = false
-
- @stdout_mutex = Mutex.new
-
+
EVENT_SYMBOL = {
"line" => "-",
"call" => ">",
"return" => "<",
"class" => "C",
"end" => "E",
- "raise" => "^",
- "c-call" => "}",
- "c-return" => "{",
- "unknown" => "?"
+ "c-call" => ">",
+ "c-return" => "<",
}
-
+
def initialize
@threads = Hash.new
if defined? Thread.main
@@ -64,7 +46,7 @@ class Tracer
@filters = []
end
-
+
def stdout
Tracer.stdout
end
@@ -82,7 +64,7 @@ class Tracer
stdout.print "Trace on\n" if Tracer.verbose?
end
end
-
+
def off
set_trace_func nil
stdout.print "Trace off\n" if Tracer.verbose?
@@ -95,7 +77,7 @@ class Tracer
def set_get_line_procs(file, p = proc)
@get_line_procs[file] = p
end
-
+
def get_line(file, line)
if p = @get_line_procs[file]
return p.call(line)
@@ -103,8 +85,8 @@ class Tracer
unless list = SCRIPT_LINES__[file]
begin
- f = File::open(file)
- begin
+ f = open(file)
+ begin
SCRIPT_LINES__[file] = list = f.readlines
ensure
f.close
@@ -120,7 +102,7 @@ class Tracer
"-\n"
end
end
-
+
def get_thread_no
if no = @threads[Thread.current.object_id]
no
@@ -128,35 +110,24 @@ class Tracer
@threads[Thread.current.object_id] = @threads.size
end
end
-
+
def trace_func(event, file, line, id, binding, klass, *)
return if file == __FILE__
-
+
for p in @filters
return unless p.call event, file, line, id, binding, klass
end
-
- return unless Tracer::display_c_call? or
- event != "c-call" && event != "c-return"
-
- Tracer::stdout_mutex.synchronize do
- if EVENT_SYMBOL[event]
- stdout.printf("<%d>", $$) if Tracer::display_process_id?
- stdout.printf("#%d:", get_thread_no) if Tracer::display_thread_id?
- if line == 0
- source = "?\n"
- else
- source = get_line(file, line)
- end
- printf("%s:%d:%s:%s: %s",
- file,
- line,
- klass || '',
- EVENT_SYMBOL[event],
- source)
- end
- end
-
+
+ saved_crit = Thread.critical
+ Thread.critical = true
+ stdout.printf("#%d:%s:%d:%s:%s: %s",
+ get_thread_no,
+ file,
+ line,
+ klass || '',
+ EVENT_SYMBOL[event],
+ get_line(file, line))
+ Thread.critical = saved_crit
end
Single = new
@@ -167,11 +138,11 @@ class Tracer
Single.on
end
end
-
+
def Tracer.off
Single.off
end
-
+
def Tracer.set_get_line_procs(file_name, p = proc)
Single.set_get_line_procs(file_name, p)
end
@@ -179,17 +150,18 @@ class Tracer
def Tracer.add_filter(p = proc)
Single.add_filter(p)
end
+
end
SCRIPT_LINES__ = {} unless defined? SCRIPT_LINES__
if $0 == __FILE__
# direct call
-
+
$0 = ARGV[0]
ARGV.shift
Tracer.on
require $0
-elsif caller.size <= 1
+elsif caller(0).size == 1
Tracer.on
end
diff --git a/lib/tsort.rb b/lib/tsort.rb
index d0f3cd4caa..a014e7f6c2 100644
--- a/lib/tsort.rb
+++ b/lib/tsort.rb
@@ -1,3 +1,4 @@
+#!/usr/bin/env ruby
#--
# tsort.rb - provides a module for topological sorting and strongly connected components.
#++
@@ -31,7 +32,7 @@
# array using the user-supplied block.
#
# require 'tsort'
-#
+#
# class Hash
# include TSort
# alias tsort_each_node each_key
@@ -39,10 +40,10 @@
# fetch(node).each(&block)
# end
# end
-#
+#
# {1=>[2, 3], 2=>[3], 3=>[], 4=>[]}.tsort
# #=> [3, 2, 1, 4]
-#
+#
# {1=>[2], 2=>[3, 4], 3=>[2], 4=>[]}.strongly_connected_components
# #=> [[4], [2, 3], [1]]
#
@@ -51,19 +52,19 @@
# A very simple `make' like tool can be implemented as follows:
#
# require 'tsort'
-#
+#
# class Make
# def initialize
# @dep = {}
# @dep.default = []
# end
-#
+#
# def rule(outputs, inputs=[], &block)
# triple = [outputs, inputs, block]
# outputs.each {|f| @dep[f] = [triple]}
# @dep[triple] = inputs
# end
-#
+#
# def build(target)
# each_strongly_connected_component_from(target) {|ns|
# if ns.length != 1
@@ -87,18 +88,18 @@
# end
# }
# end
-#
+#
# def tsort_each_child(node, &block)
# @dep[node].each(&block)
# end
# include TSort
# end
-#
+#
# def command(arg)
# print arg, "\n"
# system arg
# end
-#
+#
# m = Make.new
# m.rule(%w[t1]) { command 'date > t1' }
# m.rule(%w[t2]) { command 'date > t2' }
@@ -188,7 +189,7 @@ module TSort
end
#
- # Iterates over strongly connected component in the subgraph reachable from
+ # Iterates over strongly connected component in the subgraph reachable from
# _node_.
#
# Return value is unspecified.
@@ -240,3 +241,50 @@ module TSort
raise NotImplementedError.new
end
end
+
+if __FILE__ == $0
+ require 'test/unit'
+
+ class TSortHash < Hash # :nodoc:
+ include TSort
+ alias tsort_each_node each_key
+ def tsort_each_child(node, &block)
+ fetch(node).each(&block)
+ end
+ end
+
+ class TSortArray < Array # :nodoc:
+ include TSort
+ alias tsort_each_node each_index
+ def tsort_each_child(node, &block)
+ fetch(node).each(&block)
+ end
+ end
+
+ class TSortTest < Test::Unit::TestCase # :nodoc:
+ def test_dag
+ h = TSortHash[{1=>[2, 3], 2=>[3], 3=>[]}]
+ assert_equal([3, 2, 1], h.tsort)
+ assert_equal([[3], [2], [1]], h.strongly_connected_components)
+ end
+
+ def test_cycle
+ h = TSortHash[{1=>[2], 2=>[3, 4], 3=>[2], 4=>[]}]
+ assert_equal([[4], [2, 3], [1]],
+ h.strongly_connected_components.map {|nodes| nodes.sort})
+ assert_raise(TSort::Cyclic) { h.tsort }
+ end
+
+ def test_array
+ a = TSortArray[[1], [0], [0], [2]]
+ assert_equal([[0, 1], [2], [3]],
+ a.strongly_connected_components.map {|nodes| nodes.sort})
+
+ a = TSortArray[[], [0]]
+ assert_equal([[0], [1]],
+ a.strongly_connected_components.map {|nodes| nodes.sort})
+ end
+ end
+
+end
+
diff --git a/lib/ubygems.rb b/lib/ubygems.rb
deleted file mode 100644
index fec880f73b..0000000000
--- a/lib/ubygems.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-# This file allows for the running of rubygems with a nice
-# command line look-and-feel: ruby -rubygems foo.rb
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-
-require 'rubygems'
diff --git a/lib/un.rb b/lib/un.rb
index 0ce88a5c37..9bf6c13146 100644
--- a/lib/un.rb
+++ b/lib/un.rb
@@ -1,11 +1,11 @@
-#
+#
# = un.rb
-#
+#
# Copyright (c) 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-#
+#
# This program is free software.
# You can distribute/modify this program under the same terms of Ruby.
-#
+#
# == Utilities to replace common UNIX commands in Makefiles etc
#
# == SYNOPSIS
@@ -19,8 +19,6 @@
# ruby -run -e install -- [OPTION] SOURCE DEST
# ruby -run -e chmod -- [OPTION] OCTAL-MODE FILE
# ruby -run -e touch -- [OPTION] FILE
-# ruby -run -e wait_writable -- [OPTION] FILE
-# ruby -run -e mkmf -- [OPTION] EXTNAME [OPTION]
# ruby -run -e help [COMMAND]
require "fileutils"
@@ -31,32 +29,30 @@ module FileUtils
@fileutils_output = $stdout
end
-def setup(options = "", *long_options)
+def setup(options = "")
+ ARGV.map! do |x|
+ case x
+ when /^-/
+ x.delete "^-#{options}v"
+ when /[*?\[{]/
+ Dir[x]
+ else
+ x
+ end
+ end
+ ARGV.flatten!
+ ARGV.delete_if{|x| x == "-"}
opt_hash = {}
- argv = []
OptionParser.new do |o|
options.scan(/.:?/) do |s|
- opt_name = s.delete(":").intern
o.on("-" + s.tr(":", " ")) do |val|
- opt_hash[opt_name] = val
- end
- end
- long_options.each do |s|
- opt_name = s[/\A(?:--)?([^\s=]+)/, 1].intern
- o.on(s.sub(/\A(?!--)/, '--')) do |val|
- opt_hash[opt_name] = val
+ opt_hash[s.delete(":").intern] = val
end
end
o.on("-v") do opt_hash[:verbose] = true end
- o.order!(ARGV) do |x|
- if /[*?\[{]/ =~ x
- argv.concat(Dir[x])
- else
- argv << x
- end
- end
+ o.parse!
end
- yield argv, opt_hash
+ yield ARGV, opt_hash
end
##
@@ -158,13 +154,11 @@ end
#
# ruby -run -e rmdir -- [OPTION] DIR
#
-# -p remove DIRECTORY and its ancestors.
# -v verbose
#
def rmdir
- setup("p") do |argv, options|
- options[:parents] = true if options.delete :p
+ setup do |argv, options|
FileUtils.rmdir argv, options
end
end
@@ -220,69 +214,6 @@ def touch
end
##
-# Wait until the file becomes writable.
-#
-# ruby -run -e wait_writable -- [OPTION] FILE
-#
-# -n RETRY count to retry
-# -w SEC each wait time in seconds
-# -v verbose
-#
-
-def wait_writable
- setup("n:w:v") do |argv, options|
- verbose = options[:verbose]
- n = options[:n] and n = Integer(n)
- wait = (wait = options[:w]) ? Float(wait) : 0.2
- argv.each do |file|
- begin
- open(file, "r+b")
- rescue Errno::ENOENT
- break
- rescue Errno::EACCES => e
- raise if n and (n -= 1) <= 0
- puts e
- STDOUT.flush
- sleep wait
- retry
- end
- end
- end
-end
-
-##
-# Create makefile using mkmf.
-#
-# ruby -run -e mkmf -- [OPTION] EXTNAME [OPTION]
-#
-# -d ARGS run dir_config
-# -h ARGS run have_header
-# -l ARGS run have_library
-# -f ARGS run have_func
-# -v ARGS run have_var
-# -t ARGS run have_type
-# -m ARGS run have_macro
-# -c ARGS run have_const
-# --vendor install to vendor_ruby
-#
-
-def mkmf
- setup("d:h:l:f:v:t:m:c:", "vendor") do |argv, options|
- require 'mkmf'
- opt = options[:d] and opt.split(/:/).each {|n| dir_config(*n.split(/,/))}
- opt = options[:h] and opt.split(/:/).each {|n| have_header(*n.split(/,/))}
- opt = options[:l] and opt.split(/:/).each {|n| have_library(*n.split(/,/))}
- opt = options[:f] and opt.split(/:/).each {|n| have_func(*n.split(/,/))}
- opt = options[:v] and opt.split(/:/).each {|n| have_var(*n.split(/,/))}
- opt = options[:t] and opt.split(/:/).each {|n| have_type(*n.split(/,/))}
- opt = options[:m] and opt.split(/:/).each {|n| have_macro(*n.split(/,/))}
- opt = options[:c] and opt.split(/:/).each {|n| have_const(*n.split(/,/))}
- $configure_args["--vendor"] = true if options[:vendor]
- create_makefile(*argv)
- end
-end
-
-##
# Display help message.
#
# ruby -run -e help [COMMAND]
diff --git a/lib/uri.rb b/lib/uri.rb
index 41bb09b467..f7110f18fd 100644
--- a/lib/uri.rb
+++ b/lib/uri.rb
@@ -3,11 +3,11 @@
#
# Author:: Akira Yamada <akira@ruby-lang.org>
# Documentation:: Akira Yamada <akira@ruby-lang.org>, Dmitry V. Sabanin <sdmitry@lrn.ru>
-# License::
+# License::
# Copyright (c) 2001 akira yamada <akira@ruby-lang.org>
# You can redistribute it and/or modify it under the same term as Ruby.
# Revision:: $Id$
-#
+#
# See URI for documentation
#
diff --git a/lib/uri/.document b/lib/uri/.document
deleted file mode 100644
index 214dd2e48f..0000000000
--- a/lib/uri/.document
+++ /dev/null
@@ -1,7 +0,0 @@
-common.rb
-ftp.rb
-generic.rb
-http.rb
-https.rb
-ldap.rb
-mailto.rb
diff --git a/lib/uri/common.rb b/lib/uri/common.rb
index 9f849c03a4..af6aaf26fb 100644
--- a/lib/uri/common.rb
+++ b/lib/uri/common.rb
@@ -2,7 +2,7 @@
#
# Author:: Akira Yamada <akira@ruby-lang.org>
# Revision:: $Id$
-# License::
+# License::
# You can redistribute it and/or modify it under the same term as Ruby.
#
@@ -34,236 +34,26 @@ module URI
UNRESERVED = "-_.!~*'()#{ALNUM}"
# reserved = ";" | "/" | "?" | ":" | "@" | "&" | "=" | "+" |
# "$" | ","
- # reserved = ";" | "/" | "?" | ":" | "@" | "&" | "=" | "+" |
+ # reserved = ";" | "/" | "?" | ":" | "@" | "&" | "=" | "+" |
# "$" | "," | "[" | "]" (RFC 2732)
RESERVED = ";/?:@&=+$,\\[\\]"
- # domainlabel = alphanum | alphanum *( alphanum | "-" ) alphanum
- DOMLABEL = "(?:[#{ALNUM}](?:[-#{ALNUM}]*[#{ALNUM}])?)"
- # toplabel = alpha | alpha *( alphanum | "-" ) alphanum
- TOPLABEL = "(?:[#{ALPHA}](?:[-#{ALNUM}]*[#{ALNUM}])?)"
- # hostname = *( domainlabel "." ) toplabel [ "." ]
- HOSTNAME = "(?:#{DOMLABEL}\\.)*#{TOPLABEL}\\.?"
-
- # :startdoc:
- end # PATTERN
-
- # :startdoc:
- end # REGEXP
-
- class Parser
- include REGEXP
-
- #
- # == Synopsis
- #
- # URI::Parser.new([opts])
- #
- # == Args
- #
- # The constructor accepts a hash as options for parser.
- # Keys of options are pattern names of URI components
- # and values of options are pattern strings.
- # The constructor generetes set of regexps for parsing URIs.
- #
- # You can use the following keys:
- #
- # * <tt>:ESCAPED</tt> (URI::PATTERN::ESCAPED in default)
- # * <tt>:UNRESERVED</tt> (URI::PATTERN::UNRESERVED in default)
- # * <tt>:DOMLABEL</tt> (URI::PATTERN::DOMLABEL in default)
- # * <tt>:TOPLABEL</tt> (URI::PATTERN::TOPLABEL in default)
- # * <tt>:HOSTNAME</tt> (URI::PATTERN::HOSTNAME in default)
- #
- # == Examples
- #
- # p = URI::Parser.new(:ESCPAED => "(?:%[a-fA-F0-9]{2}|%u[a-fA-F0-9]{4})"
- # u = p.parse("http://example.jp/%uABCD") #=> #<URI::HTTP:0xb78cf4f8 URL:http://example.jp/%uABCD>
- # URI.parse(u.to_s) #=> raises URI::InvalidURIError
- #
- # s = "http://examle.com/ABCD"
- # u1 = p.parse(s) #=> #<URI::HTTP:0xb78c3220 URL:http://example.com/ABCD>
- # u2 = URI.parse(s) #=> #<URI::HTTP:0xb78b6d54 URL:http://example.com/ABCD>
- # u1 == u2 #=> true
- # u1.eql?(u2) #=> false
- #
- def initialize(opts = {})
- @pattern = initialize_pattern(opts)
- @pattern.each_value {|v| v.freeze}
- @pattern.freeze
-
- @regexp = initialize_regexp(@pattern)
- @regexp.each_value {|v| v.freeze}
- @regexp.freeze
- end
- attr_reader :pattern, :regexp
-
- def split(uri)
- case uri
- when ''
- # null uri
-
- when @regexp[:ABS_URI]
- scheme, opaque, userinfo, host, port,
- registry, path, query, fragment = $~[1..-1]
-
- # URI-reference = [ absoluteURI | relativeURI ] [ "#" fragment ]
-
- # absoluteURI = scheme ":" ( hier_part | opaque_part )
- # hier_part = ( net_path | abs_path ) [ "?" query ]
- # opaque_part = uric_no_slash *uric
-
- # abs_path = "/" path_segments
- # net_path = "//" authority [ abs_path ]
-
- # authority = server | reg_name
- # server = [ [ userinfo "@" ] hostport ]
-
- if !scheme
- raise InvalidURIError,
- "bad URI(absolute but no scheme): #{uri}"
- end
- if !opaque && (!path && (!host && !registry))
- raise InvalidURIError,
- "bad URI(absolute but no path): #{uri}"
- end
-
- when @regexp[:REL_URI]
- scheme = nil
- opaque = nil
-
- userinfo, host, port, registry,
- rel_segment, abs_path, query, fragment = $~[1..-1]
- if rel_segment && abs_path
- path = rel_segment + abs_path
- elsif rel_segment
- path = rel_segment
- elsif abs_path
- path = abs_path
- end
-
- # URI-reference = [ absoluteURI | relativeURI ] [ "#" fragment ]
-
- # relativeURI = ( net_path | abs_path | rel_path ) [ "?" query ]
-
- # net_path = "//" authority [ abs_path ]
- # abs_path = "/" path_segments
- # rel_path = rel_segment [ abs_path ]
-
- # authority = server | reg_name
- # server = [ [ userinfo "@" ] hostport ]
-
- else
- raise InvalidURIError, "bad URI(is not URI?): #{uri}"
- end
-
- path = '' if !path && !opaque # (see RFC2396 Section 5.2)
- ret = [
- scheme,
- userinfo, host, port, # X
- registry, # X
- path, # Y
- opaque, # Y
- query,
- fragment
- ]
- return ret
- end
-
- def parse(uri)
- scheme, userinfo, host, port,
- registry, path, opaque, query, fragment = self.split(uri)
-
- if scheme && URI.scheme_list.include?(scheme.upcase)
- URI.scheme_list[scheme.upcase].new(scheme, userinfo, host, port,
- registry, path, opaque, query,
- fragment, self)
- else
- Generic.new(scheme, userinfo, host, port,
- registry, path, opaque, query,
- fragment, self)
- end
- end
-
- def join(*str)
- u = self.parse(str[0])
- str[1 .. -1].each do |x|
- u = u.merge(x)
- end
- u
- end
-
- def extract(str, schemes = nil, &block)
- if block_given?
- str.scan(make_regexp(schemes)) { yield $& }
- nil
- else
- result = []
- str.scan(make_regexp(schemes)) { result.push $& }
- result
- end
- end
-
- def make_regexp(schemes = nil)
- unless schemes
- @regexp[:ABS_URI_REF]
- else
- /(?=#{Regexp.union(*schemes)}:)#{@pattern[:X_ABS_URI]}/x
- end
- end
-
- def escape(str, unsafe = @regexp[:UNSAFE])
- unless unsafe.kind_of?(Regexp)
- # perhaps unsafe is String object
- unsafe = Regexp.new("[#{Regexp.quote(unsafe)}]", false)
- end
- str.gsub(unsafe) do
- us = $&
- tmp = ''
- us.each_byte do |uc|
- tmp << sprintf('%%%02X', uc)
- end
- tmp
- end.force_encoding(Encoding::US_ASCII)
- end
-
- def unescape(str, escaped = @regexp[:ESCAPED])
- str.gsub(escaped) { [$&[1, 2].hex].pack('C') }.force_encoding(str.encoding)
- end
-
- @@to_s = Kernel.instance_method(:to_s)
- def inspect
- @@to_s.bind(self).call
- end
-
- private
-
- def initialize_pattern(opts = {})
- ret = {}
- ret[:ESCAPED] = escaped = (opts.delete(:ESCAPED) || PATTERN::ESCAPED)
- ret[:UNRESERVED] = unreserved = opts.delete(:UNRESERVED) || PATTERN::UNRESERVED
- ret[:RESERVED] = reserved = opts.delete(:RESERVED) || PATTERN::RESERVED
- ret[:DOMLABEL] = domlabel = opts.delete(:DOMLABEL) || PATTERN::DOMLABEL
- ret[:TOPLABEL] = toplabel = opts.delete(:TOPLABEL) || PATTERN::TOPLABEL
- ret[:HOSTNAME] = hostname = opts.delete(:HOSTNAME)
-
- # RFC 2396 (URI Generic Syntax)
- # RFC 2732 (IPv6 Literal Addresses in URL's)
- # RFC 2373 (IPv6 Addressing Architecture)
-
# uric = reserved | unreserved | escaped
- ret[:URIC] = uric = "(?:[#{unreserved}#{reserved}]|#{escaped})"
+ URIC = "(?:[#{UNRESERVED}#{RESERVED}]|#{ESCAPED})"
# uric_no_slash = unreserved | escaped | ";" | "?" | ":" | "@" |
# "&" | "=" | "+" | "$" | ","
- ret[:URIC_NO_SLASH] = uric_no_slash = "(?:[#{unreserved};?:@&=+$,]|#{escaped})"
+ URIC_NO_SLASH = "(?:[#{UNRESERVED};?:@&=+$,]|#{ESCAPED})"
# query = *uric
- ret[:QUERY] = query = "#{uric}*"
+ QUERY = "#{URIC}*"
# fragment = *uric
- ret[:FRAGMENT] = fragment = "#{uric}*"
+ FRAGMENT = "#{URIC}*"
+ # domainlabel = alphanum | alphanum *( alphanum | "-" ) alphanum
+ DOMLABEL = "(?:[#{ALNUM}](?:[-#{ALNUM}]*[#{ALNUM}])?)"
+ # toplabel = alpha | alpha *( alphanum | "-" ) alphanum
+ TOPLABEL = "(?:[#{ALPHA}](?:[-#{ALNUM}]*[#{ALNUM}])?)"
# hostname = *( domainlabel "." ) toplabel [ "." ]
- unless hostname
- ret[:HOSTNAME] = hostname = "(?:#{domlabel}\\.)*#{toplabel}\\.?"
- end
+ HOSTNAME = "(?:#{DOMLABEL}\\.)*#{TOPLABEL}\\.?"
# RFC 2373, APPENDIX B:
# IPv6address = hexpart [ ":" IPv4address ]
@@ -276,164 +66,153 @@ module URI
# allowed too. Here is a replacement.
#
# IPv4address = 1*3DIGIT "." 1*3DIGIT "." 1*3DIGIT "." 1*3DIGIT
- ret[:IPV4ADDR] = ipv4addr = "\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}"
+ IPV4ADDR = "\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}"
# hex4 = 1*4HEXDIG
- hex4 = "[#{PATTERN::HEX}]{1,4}"
+ HEX4 = "[#{HEX}]{1,4}"
# lastpart = hex4 | IPv4address
- lastpart = "(?:#{hex4}|#{ipv4addr})"
+ LASTPART = "(?:#{HEX4}|#{IPV4ADDR})"
# hexseq1 = *( hex4 ":" ) hex4
- hexseq1 = "(?:#{hex4}:)*#{hex4}"
+ HEXSEQ1 = "(?:#{HEX4}:)*#{HEX4}"
# hexseq2 = *( hex4 ":" ) lastpart
- hexseq2 = "(?:#{hex4}:)*#{lastpart}"
+ HEXSEQ2 = "(?:#{HEX4}:)*#{LASTPART}"
# IPv6address = hexseq2 | [ hexseq1 ] "::" [ hexseq2 ]
- ret[:IPV6ADDR] = ipv6addr = "(?:#{hexseq2}|(?:#{hexseq1})?::(?:#{hexseq2})?)"
+ IPV6ADDR = "(?:#{HEXSEQ2}|(?:#{HEXSEQ1})?::(?:#{HEXSEQ2})?)"
# IPv6prefix = ( hexseq1 | [ hexseq1 ] "::" [ hexseq1 ] ) "/" 1*2DIGIT
# unused
# ipv6reference = "[" IPv6address "]" (RFC 2732)
- ret[:IPV6REF] = ipv6ref = "\\[#{ipv6addr}\\]"
+ IPV6REF = "\\[#{IPV6ADDR}\\]"
# host = hostname | IPv4address
# host = hostname | IPv4address | IPv6reference (RFC 2732)
- ret[:HOST] = host = "(?:#{hostname}|#{ipv4addr}|#{ipv6ref})"
+ HOST = "(?:#{HOSTNAME}|#{IPV4ADDR}|#{IPV6REF})"
# port = *digit
- port = '\d*'
+ PORT = '\d*'
# hostport = host [ ":" port ]
- ret[:HOSTPORT] = hostport = "#{host}(?::#{port})?"
+ HOSTPORT = "#{HOST}(?::#{PORT})?"
# userinfo = *( unreserved | escaped |
# ";" | ":" | "&" | "=" | "+" | "$" | "," )
- ret[:USERINFO] = userinfo = "(?:[#{unreserved};:&=+$,]|#{escaped})*"
+ USERINFO = "(?:[#{UNRESERVED};:&=+$,]|#{ESCAPED})*"
# pchar = unreserved | escaped |
# ":" | "@" | "&" | "=" | "+" | "$" | ","
- pchar = "(?:[#{unreserved}:@&=+$,]|#{escaped})"
+ PCHAR = "(?:[#{UNRESERVED}:@&=+$,]|#{ESCAPED})"
# param = *pchar
- param = "#{pchar}*"
+ PARAM = "#{PCHAR}*"
# segment = *pchar *( ";" param )
- segment = "#{pchar}*(?:;#{param})*"
+ SEGMENT = "#{PCHAR}*(?:;#{PARAM})*"
# path_segments = segment *( "/" segment )
- ret[:PATH_SEGMENTS] = path_segments = "#{segment}(?:/#{segment})*"
+ PATH_SEGMENTS = "#{SEGMENT}(?:/#{SEGMENT})*"
# server = [ [ userinfo "@" ] hostport ]
- server = "(?:#{userinfo}@)?#{hostport}"
+ SERVER = "(?:#{USERINFO}@)?#{HOSTPORT}"
# reg_name = 1*( unreserved | escaped | "$" | "," |
# ";" | ":" | "@" | "&" | "=" | "+" )
- ret[:REG_NAME] = reg_name = "(?:[#{unreserved}$,;:@&=+]|#{escaped})+"
+ REG_NAME = "(?:[#{UNRESERVED}$,;:@&=+]|#{ESCAPED})+"
# authority = server | reg_name
- authority = "(?:#{server}|#{reg_name})"
+ AUTHORITY = "(?:#{SERVER}|#{REG_NAME})"
# rel_segment = 1*( unreserved | escaped |
# ";" | "@" | "&" | "=" | "+" | "$" | "," )
- ret[:REL_SEGMENT] = rel_segment = "(?:[#{unreserved};@&=+$,]|#{escaped})+"
+ REL_SEGMENT = "(?:[#{UNRESERVED};@&=+$,]|#{ESCAPED})+"
# scheme = alpha *( alpha | digit | "+" | "-" | "." )
- ret[:SCHEME] = scheme = "[#{PATTERN::ALPHA}][-+.#{PATTERN::ALPHA}\\d]*"
+ SCHEME = "[#{ALPHA}][-+.#{ALPHA}\\d]*"
# abs_path = "/" path_segments
- ret[:ABS_PATH] = abs_path = "/#{path_segments}"
+ ABS_PATH = "/#{PATH_SEGMENTS}"
# rel_path = rel_segment [ abs_path ]
- ret[:REL_PATH] = rel_path = "#{rel_segment}(?:#{abs_path})?"
+ REL_PATH = "#{REL_SEGMENT}(?:#{ABS_PATH})?"
# net_path = "//" authority [ abs_path ]
- ret[:NET_PATH] = net_path = "//#{authority}(?:#{abs_path})?"
+ NET_PATH = "//#{AUTHORITY}(?:#{ABS_PATH})?"
# hier_part = ( net_path | abs_path ) [ "?" query ]
- ret[:HIER_PART] = hier_part = "(?:#{net_path}|#{abs_path})(?:\\?(?:#{query}))?"
+ HIER_PART = "(?:#{NET_PATH}|#{ABS_PATH})(?:\\?(?:#{QUERY}))?"
# opaque_part = uric_no_slash *uric
- ret[:OPAQUE_PART] = opaque_part = "#{uric_no_slash}#{uric}*"
+ OPAQUE_PART = "#{URIC_NO_SLASH}#{URIC}*"
# absoluteURI = scheme ":" ( hier_part | opaque_part )
- ret[:ABS_URI] = abs_uri = "#{scheme}:(?:#{hier_part}|#{opaque_part})"
+ ABS_URI = "#{SCHEME}:(?:#{HIER_PART}|#{OPAQUE_PART})"
# relativeURI = ( net_path | abs_path | rel_path ) [ "?" query ]
- ret[:REL_URI] = rel_uri = "(?:#{net_path}|#{abs_path}|#{rel_path})(?:\\?#{query})?"
+ REL_URI = "(?:#{NET_PATH}|#{ABS_PATH}|#{REL_PATH})(?:\\?#{QUERY})?"
# URI-reference = [ absoluteURI | relativeURI ] [ "#" fragment ]
- ret[:URI_REF] = uri_ref = "(?:#{abs_uri}|#{rel_uri})?(?:##{fragment})?"
+ URI_REF = "(?:#{ABS_URI}|#{REL_URI})?(?:##{FRAGMENT})?"
- ret[:X_ABS_URI] = "
- (#{scheme}): (?# 1: scheme)
+ # XXX:
+ X_ABS_URI = "
+ (#{PATTERN::SCHEME}): (?# 1: scheme)
(?:
- (#{opaque_part}) (?# 2: opaque)
+ (#{PATTERN::OPAQUE_PART}) (?# 2: opaque)
|
(?:(?:
//(?:
- (?:(?:(#{userinfo})@)? (?# 3: userinfo)
- (?:(#{host})(?::(\\d*))?))? (?# 4: host, 5: port)
+ (?:(?:(#{PATTERN::USERINFO})@)? (?# 3: userinfo)
+ (?:(#{PATTERN::HOST})(?::(\\d*))?))?(?# 4: host, 5: port)
|
- (#{reg_name}) (?# 6: registry)
+ (#{PATTERN::REG_NAME}) (?# 6: registry)
)
|
- (?!//)) (?# XXX: '//' is the mark for hostport)
- (#{abs_path})? (?# 7: path)
- )(?:\\?(#{query}))? (?# 8: query)
+ (?!//)) (?# XXX: '//' is the mark for hostport)
+ (#{PATTERN::ABS_PATH})? (?# 7: path)
+ )(?:\\?(#{PATTERN::QUERY}))? (?# 8: query)
)
- (?:\\#(#{fragment}))? (?# 9: fragment)
+ (?:\\#(#{PATTERN::FRAGMENT}))? (?# 9: fragment)
"
-
- ret[:X_REL_URI] = "
+ X_REL_URI = "
(?:
(?:
//
(?:
- (?:(#{userinfo})@)? (?# 1: userinfo)
- (#{host})?(?::(\\d*))? (?# 2: host, 3: port)
+ (?:(#{PATTERN::USERINFO})@)? (?# 1: userinfo)
+ (#{PATTERN::HOST})?(?::(\\d*))? (?# 2: host, 3: port)
|
- (#{reg_name}) (?# 4: registry)
+ (#{PATTERN::REG_NAME}) (?# 4: registry)
)
)
|
- (#{rel_segment}) (?# 5: rel_segment)
+ (#{PATTERN::REL_SEGMENT}) (?# 5: rel_segment)
)?
- (#{abs_path})? (?# 6: abs_path)
- (?:\\?(#{query}))? (?# 7: query)
- (?:\\#(#{fragment}))? (?# 8: fragment)
+ (#{PATTERN::ABS_PATH})? (?# 6: abs_path)
+ (?:\\?(#{PATTERN::QUERY}))? (?# 7: query)
+ (?:\\#(#{PATTERN::FRAGMENT}))? (?# 8: fragment)
"
+ # :startdoc:
+ end # PATTERN
- ret
- end
-
- def initialize_regexp(pattern)
- ret = {}
-
- # for URI::split
- ret[:ABS_URI] = Regexp.new('^' + pattern[:X_ABS_URI] + '$', Regexp::EXTENDED)
- ret[:REL_URI] = Regexp.new('^' + pattern[:X_REL_URI] + '$', Regexp::EXTENDED)
-
- # for URI::extract
- ret[:URI_REF] = Regexp.new(pattern[:URI_REF])
- ret[:ABS_URI_REF] = Regexp.new(pattern[:X_ABS_URI], Regexp::EXTENDED)
- ret[:REL_URI_REF] = Regexp.new(pattern[:X_REL_URI], Regexp::EXTENDED)
-
- # for URI::escape/unescape
- ret[:ESCAPED] = Regexp.new(pattern[:ESCAPED])
- ret[:UNSAFE] = Regexp.new("[^#{pattern[:UNRESERVED]}#{pattern[:RESERVED]}]")
-
- # for Generic#initialize
- ret[:SCHEME] = Regexp.new("^#{pattern[:SCHEME]}$")
- ret[:USERINFO] = Regexp.new("^#{pattern[:USERINFO]}$")
- ret[:HOST] = Regexp.new("^#{pattern[:HOST]}$")
- ret[:PORT] = Regexp.new("^#{pattern[:PORT]}$")
- ret[:OPAQUE] = Regexp.new("^#{pattern[:OPAQUE_PART]}$")
- ret[:REGISTRY] = Regexp.new("^#{pattern[:REG_NAME]}$")
- ret[:ABS_PATH] = Regexp.new("^#{pattern[:ABS_PATH]}$")
- ret[:REL_PATH] = Regexp.new("^#{pattern[:REL_PATH]}$")
- ret[:QUERY] = Regexp.new("^#{pattern[:QUERY]}$")
- ret[:FRAGMENT] = Regexp.new("^#{pattern[:FRAGMENT]}$")
-
- ret
- end
- end # class Parser
-
- DEFAULT_PARSER = Parser.new
- DEFAULT_PARSER.pattern.each_pair do |sym, str|
- unless REGEXP::PATTERN.const_defined?(sym)
- REGEXP::PATTERN.const_set(sym, str)
- end
- end
- DEFAULT_PARSER.regexp.each_pair do |sym, str|
- const_set(sym, str)
- end
+ # :stopdoc:
+
+ # for URI::split
+ ABS_URI = Regexp.new('^' + PATTERN::X_ABS_URI + '$', #'
+ Regexp::EXTENDED, 'N').freeze
+ REL_URI = Regexp.new('^' + PATTERN::X_REL_URI + '$', #'
+ Regexp::EXTENDED, 'N').freeze
+
+ # for URI::extract
+ URI_REF = Regexp.new(PATTERN::URI_REF, false, 'N').freeze
+ ABS_URI_REF = Regexp.new(PATTERN::X_ABS_URI, Regexp::EXTENDED, 'N').freeze
+ REL_URI_REF = Regexp.new(PATTERN::X_REL_URI, Regexp::EXTENDED, 'N').freeze
+
+ # for URI::escape/unescape
+ ESCAPED = Regexp.new(PATTERN::ESCAPED, false, 'N').freeze
+ UNSAFE = Regexp.new("[^#{PATTERN::UNRESERVED}#{PATTERN::RESERVED}]",
+ false, 'N').freeze
+
+ # for Generic#initialize
+ SCHEME = Regexp.new("^#{PATTERN::SCHEME}$", false, 'N').freeze #"
+ USERINFO = Regexp.new("^#{PATTERN::USERINFO}$", false, 'N').freeze #"
+ HOST = Regexp.new("^#{PATTERN::HOST}$", false, 'N').freeze #"
+ PORT = Regexp.new("^#{PATTERN::PORT}$", false, 'N').freeze #"
+ OPAQUE = Regexp.new("^#{PATTERN::OPAQUE_PART}$", false, 'N').freeze #"
+ REGISTRY = Regexp.new("^#{PATTERN::REG_NAME}$", false, 'N').freeze #"
+ ABS_PATH = Regexp.new("^#{PATTERN::ABS_PATH}$", false, 'N').freeze #"
+ REL_PATH = Regexp.new("^#{PATTERN::REL_PATH}$", false, 'N').freeze #"
+ QUERY = Regexp.new("^#{PATTERN::QUERY}$", false, 'N').freeze #"
+ FRAGMENT = Regexp.new("^#{PATTERN::FRAGMENT}$", false, 'N').freeze #"
+ # :startdoc:
+ end # REGEXP
module Util # :nodoc:
def make_components_hash(klass, array_hash)
@@ -457,7 +236,7 @@ module URI
end
end
else
- raise ArgumentError,
+ raise ArgumentError,
"expected Array of or Hash of components of #{klass.to_s} (#{klass.component[1..-1].join(', ')})"
end
tmp[:scheme] = klass.to_s.sub(/\A.*::/, '').downcase
@@ -468,6 +247,8 @@ module URI
end
module Escape
+ include REGEXP
+
#
# == Synopsis
#
@@ -500,9 +281,18 @@ module URI
# p URI.escape("@?@!", "!?")
# # => "@%3F@%21"
#
- def escape(*arg)
- warn "#{caller(1)[0]}: warning: URI.escape is obsolete" if $VERBOSE
- DEFAULT_PARSER.escape(*arg)
+ def escape(str, unsafe = UNSAFE)
+ unless unsafe.kind_of?(Regexp)
+ # perhaps unsafe is String object
+ unsafe = Regexp.new("[#{Regexp.quote(unsafe)}]", false, 'N')
+ end
+ str.gsub(unsafe) do |us|
+ tmp = ''
+ us.each_byte do |uc|
+ tmp << sprintf('%%%02X', uc)
+ end
+ tmp
+ end
end
alias encode escape
#
@@ -526,21 +316,19 @@ module URI
# p URI.unescape(enc_uri)
# # => "http://example.com/?a=\t\r"
#
- def unescape(*arg)
- warn "#{caller(1)[0]}: warning: URI.unescape is obsolete" if $VERBOSE
- DEFAULT_PARSER.unescape(*arg)
+ def unescape(str)
+ str.gsub(ESCAPED) do
+ $&[1,2].hex.chr
+ end
end
alias decode unescape
end
- extend Escape
include REGEXP
+ extend Escape
@@schemes = {}
- def self.scheme_list
- @@schemes
- end
-
+
#
# Base class for all URI exceptions.
#
@@ -581,7 +369,7 @@ module URI
# * Opaque
# * Query
# * Fragment
- #
+ #
# == Usage
#
# require 'uri'
@@ -590,7 +378,75 @@ module URI
# # => ["http", nil, "www.ruby-lang.org", nil, nil, "/", nil, nil, nil]
#
def self.split(uri)
- DEFAULT_PARSER.split(uri)
+ case uri
+ when ''
+ # null uri
+
+ when ABS_URI
+ scheme, opaque, userinfo, host, port,
+ registry, path, query, fragment = $~[1..-1]
+
+ # URI-reference = [ absoluteURI | relativeURI ] [ "#" fragment ]
+
+ # absoluteURI = scheme ":" ( hier_part | opaque_part )
+ # hier_part = ( net_path | abs_path ) [ "?" query ]
+ # opaque_part = uric_no_slash *uric
+
+ # abs_path = "/" path_segments
+ # net_path = "//" authority [ abs_path ]
+
+ # authority = server | reg_name
+ # server = [ [ userinfo "@" ] hostport ]
+
+ if !scheme
+ raise InvalidURIError,
+ "bad URI(absolute but no scheme): #{uri}"
+ end
+ if !opaque && (!path && (!host && !registry))
+ raise InvalidURIError,
+ "bad URI(absolute but no path): #{uri}"
+ end
+
+ when REL_URI
+ scheme = nil
+ opaque = nil
+
+ userinfo, host, port, registry,
+ rel_segment, abs_path, query, fragment = $~[1..-1]
+ if rel_segment && abs_path
+ path = rel_segment + abs_path
+ elsif rel_segment
+ path = rel_segment
+ elsif abs_path
+ path = abs_path
+ end
+
+ # URI-reference = [ absoluteURI | relativeURI ] [ "#" fragment ]
+
+ # relativeURI = ( net_path | abs_path | rel_path ) [ "?" query ]
+
+ # net_path = "//" authority [ abs_path ]
+ # abs_path = "/" path_segments
+ # rel_path = rel_segment [ abs_path ]
+
+ # authority = server | reg_name
+ # server = [ [ userinfo "@" ] hostport ]
+
+ else
+ raise InvalidURIError, "bad URI(is not URI?): #{uri}"
+ end
+
+ path = '' if !path && !opaque # (see RFC2396 Section 5.2)
+ ret = [
+ scheme,
+ userinfo, host, port, # X
+ registry, # X
+ path, # Y
+ opaque, # Y
+ query,
+ fragment
+ ]
+ return ret
end
#
@@ -606,7 +462,7 @@ module URI
# == Description
#
# Creates one of the URI's subclasses instance from the string.
- #
+ #
# == Raises
#
# URI::InvalidURIError
@@ -619,13 +475,24 @@ module URI
# uri = URI.parse("http://www.ruby-lang.org/")
# p uri
# # => #<URI::HTTP:0x202281be URL:http://www.ruby-lang.org/>
- # p uri.scheme
- # # => "http"
- # p uri.host
- # # => "www.ruby-lang.org"
- #
+ # p uri.scheme
+ # # => "http"
+ # p uri.host
+ # # => "www.ruby-lang.org"
+ #
def self.parse(uri)
- DEFAULT_PARSER.parse(uri)
+ scheme, userinfo, host, port,
+ registry, path, opaque, query, fragment = self.split(uri)
+
+ if scheme && @@schemes.include?(scheme.upcase)
+ @@schemes[scheme.upcase].new(scheme, userinfo, host, port,
+ registry, path, opaque, query,
+ fragment)
+ else
+ Generic.new(scheme, userinfo, host, port,
+ registry, path, opaque, query,
+ fragment)
+ end
end
#
@@ -650,7 +517,11 @@ module URI
# # => #<URI::HTTP:0x2022ac02 URL:http://localhost/main.rbx>
#
def self.join(*str)
- DEFAULT_PARSER.join(*str)
+ u = self.parse(str[0])
+ str[1 .. -1].each do |x|
+ u = u.merge(x)
+ end
+ u
end
#
@@ -660,7 +531,7 @@ module URI
#
# == Args
#
- # +str+::
+ # +str+::
# String to extract URIs from.
# +schemes+::
# Limit URI matching to a specific schemes.
@@ -678,7 +549,14 @@ module URI
# # => ["http://foo.example.com/bla", "mailto:test@example.com"]
#
def self.extract(str, schemes = nil, &block)
- DEFAULT_PARSER.extract(str, schemes, &block)
+ if block_given?
+ str.scan(regexp(schemes)) { yield $& }
+ nil
+ else
+ result = []
+ str.scan(regexp(schemes)) { result.push $& }
+ result
+ end
end
#
@@ -688,32 +566,36 @@ module URI
#
# == Args
#
- # +match_schemes+::
+ # +match_schemes+::
# Array of schemes. If given, resulting regexp matches to URIs
# whose scheme is one of the match_schemes.
- #
+ #
# == Description
# Returns a Regexp object which matches to URI-like strings.
# The Regexp object returned by this method includes arbitrary
# number of capture group (parentheses). Never rely on it's number.
- #
+ #
# == Usage
#
# require 'uri'
#
# # extract first URI from html_string
# html_string.slice(URI.regexp)
- #
+ #
# # remove ftp URIs
# html_string.sub(URI.regexp(['ftp'])
- #
+ #
# # You should not rely on the number of parentheses
# html_string.scan(URI.regexp) do |*matches|
# p $&
# end
#
def self.regexp(schemes = nil)
- DEFAULT_PARSER.make_regexp(schemes)
+ unless schemes
+ ABS_URI_REF
+ else
+ /(?=#{Regexp.union(*schemes)}:)#{PATTERN::X_ABS_URI}/xn
+ end
end
end
diff --git a/lib/uri/ftp.rb b/lib/uri/ftp.rb
index a40b958497..1a18e9cae7 100644
--- a/lib/uri/ftp.rb
+++ b/lib/uri/ftp.rb
@@ -17,12 +17,12 @@ module URI
DEFAULT_PORT = 21
COMPONENT = [
- :scheme,
+ :scheme,
:userinfo, :host, :port,
:path, :typecode
].freeze
#
- # Typecode is "a", "i" or "d".
+ # Typecode is "a", "i" or "d".
#
# * "a" indicates a text file (the FTP command was ASCII)
# * "i" indicates a binary file (FTP command IMAGE)
@@ -31,7 +31,7 @@ module URI
TYPECODE = ['a', 'i', 'd'].freeze
TYPECODE_PREFIX = ';type='.freeze
- def self.new2(user, password, host, port, path,
+ def self.new2(user, password, host, port, path,
typecode = nil, arg_check = true)
typecode = nil if typecode.size == 0
if typecode && !TYPECODE.include?(typecode)
@@ -42,22 +42,22 @@ module URI
# do escape
self.new('ftp',
- [user, password],
- host, port, nil,
- typecode ? path + TYPECODE_PREFIX + typecode : path,
+ [user, password],
+ host, port, nil,
+ typecode ? path + TYPECODE_PREFIX + typecode : path,
nil, nil, nil, arg_check)
end
#
# == Description
#
- # Creates a new URI::FTP object from components, with syntax checking.
+ # Creates a new URI::FTP object from components, with syntax checking.
#
- # The components accepted are +userinfo+, +host+, +port+, +path+ and
+ # The components accepted are +userinfo+, +host+, +port+, +path+ and
# +typecode+.
#
- # The components should be provided either as an Array, or as a Hash
- # with keys formed by preceding the component names with a colon.
+ # The components should be provided either as an Array, or as a Hash
+ # with keys formed by preceding the component names with a colon.
#
# If an Array is used, the components must be passed in the order
# [userinfo, host, port, path, typecode]
@@ -67,11 +67,11 @@ module URI
#
# require 'uri'
#
- # uri = URI::FTP.build(['user:password', 'ftp.example.com', nil,
+ # uri = URI::FTP.build(['user:password', 'ftp.example.com', nil,
# '/path/file.> zip', 'i'])
# puts uri.to_s -> ftp://user:password@ftp.example.com/%2Fpath/file.zip;type=a
#
- # uri2 = URI::FTP.build({:host => 'ftp.example.com',
+ # uri2 = URI::FTP.build({:host => 'ftp.example.com',
# :path => 'ruby/src'})
# puts uri2.to_s -> ftp://ftp.example.com/ruby/src
#
@@ -92,7 +92,7 @@ module URI
if tmp[:typecode]
if tmp[:typecode].size == 1
- tmp[:typecode] = TYPECODE_PREFIX + tmp[:typecode]
+ tmp[:typecode] = TYPECODE_PREFIX + tmp[:typecode]
end
tmp[:path] << tmp[:typecode]
end
@@ -109,7 +109,7 @@ module URI
# Unlike build(), this method does not escape the path component as
# required by RFC1738; instead it is treated as per RFC2396.
#
- # Arguments are +scheme+, +userinfo+, +host+, +port+, +registry+, +path+,
+ # Arguments are +scheme+, +userinfo+, +host+, +port+, +registry+, +path+,
# +opaque+, +query+ and +fragment+, in that order.
#
def initialize(*arg)
@@ -119,7 +119,7 @@ module URI
if tmp
typecode = @path[tmp + TYPECODE_PREFIX.size..-1]
self.set_path(@path[0..tmp - 1])
-
+
if arg[-1]
self.typecode = typecode
else
@@ -164,9 +164,9 @@ module URI
# RFC 1738 specifically states that the path for an FTP URI does not
# include the / which separates the URI path from the URI host. Example:
#
- # ftp://ftp.example.com/pub/ruby
+ # ftp://ftp.example.com/pub/ruby
#
- # The above URI indicates that the client should connect to
+ # The above URI indicates that the client should connect to
# ftp.example.com then cd pub/ruby from the initial login directory.
#
# If you want to cd to an absolute directory, you must include an
@@ -177,7 +177,7 @@ module URI
# This method will then return "/pub/ruby"
#
def path
- return @path.sub(/^\//,'').sub(/^%2F/,'/')
+ return @path.sub(/^\//,'').sub(/^%2F/i,'/')
end
def to_s
diff --git a/lib/uri/generic.rb b/lib/uri/generic.rb
index fd01f89797..d907e0b4b2 100644
--- a/lib/uri/generic.rb
+++ b/lib/uri/generic.rb
@@ -9,13 +9,14 @@
require 'uri/common'
module URI
-
+
#
# Base class for all URI classes.
# Implements generic URI syntax as per RFC 2396.
#
class Generic
include URI
+ include REGEXP
DEFAULT_PORT = nil
@@ -31,10 +32,10 @@ module URI
end
COMPONENT = [
- :scheme,
- :userinfo, :host, :port, :registry,
- :path, :opaque,
- :query,
+ :scheme,
+ :userinfo, :host, :port, :registry,
+ :path, :opaque,
+ :query,
:fragment
].freeze
@@ -62,7 +63,7 @@ module URI
# == Description
#
# At first, tries to create a new URI::Generic instance using
- # URI::Generic::build. But, if exception URI::InvalidComponentError is raised,
+ # URI::Generic::build. But, if exception URI::InvalidComponentError is raised,
# then it URI::Escape.escape all URI components and tries again.
#
#
@@ -71,9 +72,9 @@ module URI
return self.build(args)
rescue InvalidComponentError
if args.kind_of?(Array)
- return self.build(args.collect{|x|
+ return self.build(args.collect{|x|
if x
- parser.escape(x)
+ URI.escape(x)
else
x
end
@@ -82,7 +83,7 @@ module URI
tmp = {}
args.each do |key, value|
tmp[key] = if value
- parser.escape(value)
+ URI.escape(value)
else
value
end
@@ -117,11 +118,10 @@ module URI
end
end
else
- raise ArgumentError,
+ raise ArgumentError,
"expected Array of or Hash of components of #{self.class} (#{self.class.component.join(', ')})"
end
- tmp << nil
tmp << true
return self.new(*tmp)
end
@@ -146,8 +146,6 @@ module URI
# Query data
# +fragment+::
# A part of URI after '#' sign
- # +parser+::
- # Parser for internal use [URI::DEFAULT_PARSER by default]
# +arg_check+::
# Check arguments [false by default]
#
@@ -155,12 +153,11 @@ module URI
#
# Creates a new URI::Generic instance from ``generic'' components without check.
#
- def initialize(scheme,
- userinfo, host, port, registry,
- path, opaque,
- query,
+ def initialize(scheme,
+ userinfo, host, port, registry,
+ path, opaque,
+ query,
fragment,
- parser = DEFAULT_PARSER,
arg_check = false)
@scheme = nil
@user = nil
@@ -172,7 +169,6 @@ module URI
@opaque = nil
@registry = nil
@fragment = nil
- @parser = parser == DEFAULT_PARSER ? nil : parser
if arg_check
self.scheme = scheme
@@ -196,10 +192,10 @@ module URI
self.set_fragment(fragment)
end
if @registry && !self.class.use_registry
- raise InvalidURIError,
+ raise InvalidURIError,
"the scheme #{@scheme} does not accept registry part: #{@registry} (or bad hostname?)"
end
-
+
@scheme.freeze if @scheme
self.set_path('') if !@path && !@opaque # (see RFC2396 Section 5.2)
self.set_port(self.default_port) if self.default_port && !@port
@@ -213,14 +209,6 @@ module URI
attr_reader :opaque
attr_reader :fragment
- def parser
- if !defined?(@parser) || !@parser
- DEFAULT_PARSER
- else
- @parser || DEFAULT_PARSER
- end
- end
-
# replace self by other URI object
def replace!(oth)
if self.class != oth.class
@@ -238,7 +226,7 @@ module URI
end
def check_scheme(v)
- if v && parser.regexp[:SCHEME] !~ v
+ if v && SCHEME !~ v
raise InvalidComponentError,
"bad component(expected scheme component): #{v}"
end
@@ -271,13 +259,13 @@ module URI
def check_user(v)
if @registry || @opaque
- raise InvalidURIError,
+ raise InvalidURIError,
"can not set user with registry or opaque"
end
return v unless v
- if parser.regexp[:USERINFO] !~ v
+ if USERINFO !~ v
raise InvalidComponentError,
"bad component(expected userinfo component or user component): #{v}"
end
@@ -288,7 +276,7 @@ module URI
def check_password(v, user = @user)
if @registry || @opaque
- raise InvalidURIError,
+ raise InvalidURIError,
"can not set password with registry or opaque"
end
return v unless v
@@ -298,7 +286,7 @@ module URI
"password component depends user component"
end
- if parser.regexp[:USERINFO] !~ v
+ if USERINFO !~ v
raise InvalidComponentError,
"bad component(expected user component): #{v}"
end
@@ -324,7 +312,7 @@ module URI
set_user(user)
# returns user
end
-
+
def password=(password)
check_password(password)
set_password(password)
@@ -332,7 +320,7 @@ module URI
end
def set_userinfo(user, password = nil)
- unless password
+ unless password
user, password = split_userinfo(user)
end
@user = user
@@ -363,7 +351,7 @@ module URI
private :split_userinfo
def escape_userpass(v)
- v = parser.escape(v, /[@:\/]/o) # RFC 1738 section 3.1 #/
+ v = URI.escape(v, /[@:\/]/o) # RFC 1738 section 3.1 #/
end
private :escape_userpass
@@ -389,9 +377,9 @@ module URI
return v unless v
if @registry || @opaque
- raise InvalidURIError,
+ raise InvalidURIError,
"can not set host with registry or opaque"
- elsif parser.regexp[:HOST] !~ v
+ elsif HOST !~ v
raise InvalidComponentError,
"bad component(expected host component): #{v}"
end
@@ -415,9 +403,9 @@ module URI
return v unless v
if @registry || @opaque
- raise InvalidURIError,
+ raise InvalidURIError,
"can not set port with registry or opaque"
- elsif !v.kind_of?(Fixnum) && parser.regexp[:PORT] !~ v
+ elsif !v.kind_of?(Fixnum) && PORT !~ v
raise InvalidComponentError,
"bad component(expected port component): #{v}"
end
@@ -451,9 +439,9 @@ module URI
# authority = server | reg_name
# server = [ [ userinfo "@" ] hostport ]
if @host || @port || @user # userinfo = @user + ':' + @password
- raise InvalidURIError,
+ raise InvalidURIError,
"can not set registry with host, port, or userinfo"
- elsif v && parser.regexp[:REGISTRY] !~ v
+ elsif v && REGISTRY !~ v
raise InvalidComponentError,
"bad component(expected registry component): #{v}"
end
@@ -478,18 +466,18 @@ module URI
# absoluteURI = scheme ":" ( hier_part | opaque_part )
# hier_part = ( net_path | abs_path ) [ "?" query ]
if v && @opaque
- raise InvalidURIError,
+ raise InvalidURIError,
"path conflicts with opaque"
end
if @scheme
- if v && v != '' && parser.regexp[:ABS_PATH] !~ v
- raise InvalidComponentError,
+ if v && v != '' && ABS_PATH !~ v
+ raise InvalidComponentError,
"bad component(expected absolute path component): #{v}"
end
else
- if v && v != '' && parser.regexp[:ABS_PATH] !~ v && parser.regexp[:REL_PATH] !~ v
- raise InvalidComponentError,
+ if v && v != '' && ABS_PATH !~ v && REL_PATH !~ v
+ raise InvalidComponentError,
"bad component(expected relative path component): #{v}"
end
end
@@ -516,14 +504,14 @@ module URI
# absoluteURI = scheme ":" ( hier_part | opaque_part )
# hier_part = ( net_path | abs_path ) [ "?" query ]
if @opaque
- raise InvalidURIError,
+ raise InvalidURIError,
"query conflicts with opaque"
end
- if v && v != '' && parser.regexp[:QUERY] !~ v
- raise InvalidComponentError,
+ if v && v != '' && QUERY !~ v
+ raise InvalidComponentError,
"bad component(expected query component): #{v}"
- end
+ end
return true
end
@@ -547,9 +535,9 @@ module URI
# absoluteURI = scheme ":" ( hier_part | opaque_part )
# hier_part = ( net_path | abs_path ) [ "?" query ]
if @host || @port || @user || @path # userinfo = @user + ':' + @password
- raise InvalidURIError,
+ raise InvalidURIError,
"can not set opaque with host, port, userinfo or path"
- elsif v && parser.regexp[:OPAQUE] !~ v
+ elsif v && OPAQUE !~ v
raise InvalidComponentError,
"bad component(expected opaque component): #{v}"
end
@@ -572,8 +560,8 @@ module URI
def check_fragment(v)
return v unless v
- if v && v != '' && parser.regexp[:FRAGMENT] !~ v
- raise InvalidComponentError,
+ if v && v != '' && FRAGMENT !~ v
+ raise InvalidComponentError,
"bad component(expected fragment component): #{v}"
end
@@ -784,19 +772,19 @@ module URI
case oth
when Generic
when String
- oth = parser.parse(oth)
+ oth = URI.parse(oth)
else
raise ArgumentError,
"bad argument(expected URI object or URI string)"
end
if self.relative? && oth.relative?
- raise BadURIError,
+ raise BadURIError,
"both URI are relative"
end
if self.absolute? && oth.absolute?
- #raise BadURIError,
+ #raise BadURIError,
# "both URI are absolute"
# hmm... should return oth for usability?
return oth, oth
@@ -817,7 +805,7 @@ module URI
src_path = split_path(src)
dst_path = split_path(dst)
- # hmm... dst has abnormal absolute path,
+ # hmm... dst has abnormal absolute path,
# like "/./", "/../", "/x/../", ...
if dst_path.include?('..') ||
dst_path.include?('.')
@@ -855,18 +843,18 @@ module URI
case oth
when Generic
when String
- oth = parser.parse(oth)
+ oth = URI.parse(oth)
else
raise ArgumentError,
"bad argument(expected URI object or URI string)"
end
if self.relative?
- raise BadURIError,
+ raise BadURIError,
"relative URI: #{self}"
end
if oth.relative?
- raise BadURIError,
+ raise BadURIError,
"relative URI: #{oth}"
end
@@ -874,9 +862,9 @@ module URI
return self, self.dup
end
rel = URI::Generic.new(nil, # it is relative URI
- self.userinfo, self.host, self.port,
+ self.userinfo, self.host, self.port,
self.registry, self.path, self.opaque,
- self.query, self.fragment, parser)
+ self.query, self.fragment)
if rel.userinfo != oth.userinfo ||
rel.host.to_s.downcase != oth.host.to_s.downcase ||
@@ -962,12 +950,12 @@ module URI
# uri = URI.parse('http://my.example.com')
# p uri.route_to('http://my.example.com/main.rbx?page=1')
# #=> #<URI::Generic:0x2020c2f6 URL:/main.rbx?page=1>
- #
+ #
def route_to(oth)
case oth
when Generic
when String
- oth = parser.parse(oth)
+ oth = URI.parse(oth)
else
raise ArgumentError,
"bad argument(expected URI object or URI string)"
@@ -978,7 +966,7 @@ module URI
#
# Returns normalized URI
- #
+ #
def normalize
uri = dup
uri.normalize!
@@ -994,7 +982,7 @@ module URI
end
if host && host != host.downcase
set_host(self.host.downcase)
- end
+ end
end
def path_query
@@ -1008,7 +996,7 @@ module URI
#
# Constructs String from URI
- #
+ #
def to_s
str = ''
if @scheme
@@ -1066,7 +1054,6 @@ module URI
end
def eql?(oth)
- parser == oth.parser &&
self.component_ary.eql?(oth.component_ary)
end
@@ -1110,7 +1097,7 @@ module URI
if component.include?(c)
self.send(c)
else
- raise ArgumentError,
+ raise ArgumentError,
"expected of components of #{self.class} (#{self.class.component.join(', ')})"
end
end
@@ -1124,7 +1111,7 @@ module URI
def coerce(oth)
case oth
when String
- oth = parser.parse(oth)
+ oth = URI.parse(oth)
else
super
end
diff --git a/lib/uri/http.rb b/lib/uri/http.rb
index 69a7658918..87eb8893f2 100644
--- a/lib/uri/http.rb
+++ b/lib/uri/http.rb
@@ -14,18 +14,18 @@ module URI
# The syntax of HTTP URIs is defined in RFC1738 section 3.3.
#
# Note that the Ruby URI library allows HTTP URLs containing usernames and
- # passwords. This is not legal as per the RFC, but used to be
- # supported in Internet Explorer 5 and 6, before the MS04-004 security
+ # passwords. This is not legal as per the RFC, but used to be
+ # supported in Internet Explorer 5 and 6, before the MS04-004 security
# update. See <URL:http://support.microsoft.com/kb/834489>.
#
class HTTP < Generic
DEFAULT_PORT = 80
COMPONENT = [
- :scheme,
- :userinfo, :host, :port,
- :path,
- :query,
+ :scheme,
+ :userinfo, :host, :port,
+ :path,
+ :query,
:fragment
].freeze
@@ -37,21 +37,21 @@ module URI
# The components accepted are userinfo, host, port, path, query and
# fragment.
#
- # The components should be provided either as an Array, or as a Hash
- # with keys formed by preceding the component names with a colon.
+ # The components should be provided either as an Array, or as a Hash
+ # with keys formed by preceding the component names with a colon.
#
# If an Array is used, the components must be passed in the order
# [userinfo, host, port, path, query, fragment].
#
# Example:
#
- # newuri = URI::HTTP.build({:host => 'www.example.com',
+ # newuri = URI::HTTP.build({:host => 'www.example.com',
# :path> => '/foo/bar'})
#
- # newuri = URI::HTTP.build([nil, "www.example.com", nil, "/path",
+ # newuri = URI::HTTP.build([nil, "www.example.com", nil, "/path",
# "query", 'fragment'])
#
- # Currently, if passed userinfo components this method generates
+ # Currently, if passed userinfo components this method generates
# invalid HTTP URIs as per RFC 1738.
#
def self.build(args)
@@ -63,10 +63,10 @@ module URI
# == Description
#
# Create a new URI::HTTP object from generic URI components as per
- # RFC 2396. No HTTP-specific syntax checking (as per RFC 1738) is
+ # RFC 2396. No HTTP-specific syntax checking (as per RFC 1738) is
# performed.
#
- # Arguments are +scheme+, +userinfo+, +host+, +port+, +registry+, +path+,
+ # Arguments are +scheme+, +userinfo+, +host+, +port+, +registry+, +path+,
# +opaque+, +query+ and +fragment+, in that order.
#
# Example:
diff --git a/lib/uri/ldap.rb b/lib/uri/ldap.rb
index 6739a018af..163d2cda24 100644
--- a/lib/uri/ldap.rb
+++ b/lib/uri/ldap.rb
@@ -1,10 +1,10 @@
#
# = uri/ldap.rb
#
-# Author::
+# Author::
# Takaaki Tateishi <ttate@jaist.ac.jp>
# Akira Yamada <akira@ruby-lang.org>
-# License::
+# License::
# URI::LDAP is copyrighted free software by Takaaki Tateishi and Akira Yamada.
# You can redistribute it and/or modify it under the same term as Ruby.
# Revision:: $Id$
@@ -21,7 +21,7 @@ module URI
class LDAP < Generic
DEFAULT_PORT = 389
-
+
COMPONENT = [
:scheme,
:host, :port,
diff --git a/lib/uri/mailto.rb b/lib/uri/mailto.rb
index 240c849e9a..44f04f2dd5 100644
--- a/lib/uri/mailto.rb
+++ b/lib/uri/mailto.rb
@@ -55,7 +55,7 @@ module URI
(#{PATTERN::FRAGMENT}) (?# 3: fragment)
)?
\\z
- ", Regexp::EXTENDED).freeze
+ ", Regexp::EXTENDED, 'N').freeze
# :startdoc:
#
@@ -68,20 +68,20 @@ module URI
#
# If a Hash is used, the keys are the component names preceded by colons.
#
- # The headers can be supplied as a pre-encoded string, such as
+ # The headers can be supplied as a pre-encoded string, such as
# "subject=subscribe&cc=address", or as an Array of Arrays like
# [['subject', 'subscribe'], ['cc', 'address']]
#
# Examples:
- #
+ #
# require 'uri'
- #
+ #
# m1 = URI::MailTo.build(['joe@example.com', 'subject=Ruby'])
# puts m1.to_s -> mailto:joe@example.com?subject=Ruby
- #
+ #
# m2 = URI::MailTo.build(['john@example.com', [['Subject', 'Ruby'], ['Cc', 'jack@example.com']]])
# puts m2.to_s -> mailto:john@example.com?Subject=Ruby&Cc=jack@example.com
- #
+ #
# m3 = URI::MailTo.build({:to => 'listman@example.com', :headers => [['subject', 'subscribe']]})
# puts m3.to_s -> mailto:listman@example.com?subject=subscribe
#
@@ -135,7 +135,7 @@ module URI
@headers = []
if MAILTO_REGEXP =~ @opaque
- if arg[-1]
+ if arg[-1]
self.to = $1
self.headers = $2
else
@@ -159,7 +159,7 @@ module URI
return true unless v
return true if v.size == 0
- if parser.regexp[:OPAQUE] !~ v || /\A#{MAILBOX_PATTERN}*\z/o !~ v
+ if OPAQUE !~ v || /\A#{MAILBOX_PATTERN}*\z/o !~ v
raise InvalidComponentError,
"bad component(expected opaque component): #{v}"
end
@@ -183,7 +183,7 @@ module URI
return true unless v
return true if v.size == 0
- if parser.regexp[:OPAQUE] !~ v ||
+ if OPAQUE !~ v ||
/\A(#{HEADER_PATTERN}(?:\&#{HEADER_PATTERN})*)\z/o !~ v
raise InvalidComponentError,
"bad component(expected opaque component): #{v}"
@@ -210,12 +210,12 @@ module URI
end
def to_s
- @scheme + ':' +
- if @to
+ @scheme + ':' +
+ if @to
@to
else
''
- end +
+ end +
if @headers.size > 0
'?' + @headers.collect{|x| x.join('=')}.join('&')
else
@@ -227,7 +227,7 @@ module URI
''
end
end
-
+
# Returns the RFC822 e-mail text equivalent of the URL, as a String.
#
# Example:
@@ -239,18 +239,18 @@ module URI
# # => "To: ruby-list@ruby-lang.org\nSubject: subscribe\nCc: myaddr\n\n\n"
#
def to_mailtext
- to = parser.unescape(@to)
+ to = URI::unescape(@to)
head = ''
body = ''
@headers.each do |x|
case x[0]
when 'body'
- body = parser.unescape(x[1])
+ body = URI::unescape(x[1])
when 'to'
- to << ', ' + parser.unescape(x[1])
+ to << ', ' + URI::unescape(x[1])
else
- head << parser.unescape(x[0]).capitalize + ': ' +
- parser.unescape(x[1]) + "\n"
+ head << URI::unescape(x[0]).capitalize + ': ' +
+ URI::unescape(x[1]) + "\n"
end
end
diff --git a/lib/weakref.rb b/lib/weakref.rb
index ba39242445..591819c948 100644
--- a/lib/weakref.rb
+++ b/lib/weakref.rb
@@ -1,6 +1,13 @@
-# Weak Reference class that does not bother GCing.
+require "delegate"
+
+# WeakRef is a class to represent a reference to an object that is not seen by
+# the tracing phase of the garbage collector. This allows the referenced
+# object to be garbage collected as if nothing is referring to it. Because
+# WeakRef delegates method calls to the referenced object, it may be used in
+# place of that object, i.e. it is of the same duck type.
#
# Usage:
+#
# foo = Object.new
# foo = Object.new
# p foo.to_s # original's class
@@ -8,20 +15,18 @@
# p foo.to_s # should be same class
# ObjectSpace.garbage_collect
# p foo.to_s # should raise exception (recycled)
+class WeakRef<Delegator
-require "delegate"
-require 'thread'
-
-class WeakRef < Delegator
-
- class RefError < StandardError
+ # RefError is raised if an object cannot be referenced by a WeakRef.
+ class RefError<StandardError
end
@@id_map = {} # obj -> [ref,...]
@@id_rev_map = {} # ref -> obj
- @@mutex = Mutex.new
- @@final = lambda {|id|
- @@mutex.synchronize {
+ @@final = lambda{|id|
+ __old_status = Thread.critical
+ Thread.critical = true
+ begin
rids = @@id_map[id]
if rids
for rid in rids
@@ -35,46 +40,61 @@ class WeakRef < Delegator
@@id_map[rid].delete(id)
@@id_map.delete(rid) if @@id_map[rid].empty?
end
- }
+ ensure
+ Thread.critical = __old_status
+ end
}
+ # Create a new WeakRef from +orig+.
def initialize(orig)
- @__id = orig.object_id
- ObjectSpace.define_finalizer orig, @@final
- ObjectSpace.define_finalizer self, @@final
- @@mutex.synchronize {
- @@id_map[@__id] = [] unless @@id_map[@__id]
- }
- @@id_map[@__id].push self.object_id
- @@id_rev_map[self.object_id] = @__id
super
+ __setobj__(orig)
end
+ # Return the object this WeakRef references. Raises RefError if the object
+ # has been garbage collected. The object returned is the object to which
+ # method calls are delegated (see Delegator).
def __getobj__
- unless @@id_rev_map[self.object_id] == @__id
- Kernel::raise RefError, "Invalid Reference - probably recycled", Kernel::caller(2)
+ unless @@id_rev_map[self.__id__] == @__id
+ raise RefError, "Illegal Reference - probably recycled", caller(2)
end
begin
ObjectSpace._id2ref(@__id)
rescue RangeError
- Kernel::raise RefError, "Invalid Reference - probably recycled", Kernel::caller(2)
+ raise RefError, "Illegal Reference - probably recycled", caller(2)
end
end
+
def __setobj__(obj)
+ @__id = obj.__id__
+ __old_status = Thread.critical
+ begin
+ Thread.critical = true
+ unless @@id_rev_map.key?(self)
+ ObjectSpace.define_finalizer obj, @@final
+ ObjectSpace.define_finalizer self, @@final
+ end
+ @@id_map[@__id] = [] unless @@id_map[@__id]
+ ensure
+ Thread.critical = __old_status
+ end
+ @@id_map[@__id].push self.__id__
+ @@id_rev_map[self.__id__] = @__id
end
+ # Returns true if the referenced object still exists, and false if it has
+ # been garbage collected.
def weakref_alive?
- @@id_rev_map[self.object_id] == @__id
+ @@id_rev_map[self.__id__] == @__id
end
end
if __FILE__ == $0
-# require 'thread'
+ require 'thread'
foo = Object.new
p foo.to_s # original's class
foo = WeakRef.new(foo)
p foo.to_s # should be same class
ObjectSpace.garbage_collect
- ObjectSpace.garbage_collect
p foo.to_s # should raise exception (recycled)
end
diff --git a/lib/webrick/cgi.rb b/lib/webrick/cgi.rb
index 7099d14689..ff5f7a6102 100644
--- a/lib/webrick/cgi.rb
+++ b/lib/webrick/cgi.rb
@@ -77,7 +77,7 @@ module WEBrick
res.set_error(ex)
rescue HTTPStatus::Status => ex
res.status = ex.code
- rescue Exception => ex
+ rescue Exception => ex
@logger.error(ex)
res.set_error(ex, true)
ensure
@@ -122,7 +122,7 @@ module WEBrick
include Enumerable
private
-
+
def initialize(config, env, stdin, stdout)
@config = config
@env = env
@@ -130,7 +130,7 @@ module WEBrick
@body_part = stdin
@out_port = stdout
@out_port.binmode
-
+
@server_addr = @env["SERVER_ADDR"] || "0.0.0.0"
@server_name = @env["SERVER_NAME"]
@server_port = @env["SERVER_PORT"]
@@ -164,42 +164,43 @@ module WEBrick
httpv = @config[:HTTPVersion]
return "#{meth} #{url} HTTP/#{httpv}"
end
-
+
def setup_header
- @env.each{|key, value|
- case key
- when "CONTENT_TYPE", "CONTENT_LENGTH"
- add_header(key.gsub(/_/, "-"), value)
- when /^HTTP_(.*)/
- add_header($1.gsub(/_/, "-"), value)
+ add_header("CONTENT_TYPE", "Content-Type")
+ add_header("CONTENT_LENGTH", "Content-length")
+ @env.each_key{|name|
+ if /^HTTP_(.*)/ =~ name
+ add_header(name, $1.gsub(/_/, "-"))
end
}
end
-
- def add_header(hdrname, value)
- unless value.empty?
- @header_part << hdrname << ": " << value << CRLF
+
+ def add_header(envname, hdrname)
+ if value = @env[envname]
+ unless value.empty?
+ @header_part << hdrname << ": " << value << CRLF
+ end
end
end
def input
@header_part.eof? ? @body_part : @header_part
end
-
+
public
-
+
def peeraddr
[nil, @remote_port, @remote_host, @remote_addr]
end
-
+
def addr
[nil, @server_port, @server_name, @server_addr]
end
-
- def gets(eol=LF, size=nil)
- input.gets(eol, size)
+
+ def gets(eol=LF)
+ input.gets(eol)
end
-
+
def read(size=nil)
input.read(size)
end
@@ -207,11 +208,7 @@ module WEBrick
def each
input.each{|line| yield(line) }
end
-
- def eof?
- input.eof?
- end
-
+
def <<(data)
@out_port << data
end
@@ -256,5 +253,5 @@ module WEBrick
end
end
end
- end
-end
+ end
+end
diff --git a/lib/webrick/config.rb b/lib/webrick/config.rb
index 946312e915..5897b977d8 100644
--- a/lib/webrick/config.rb
+++ b/lib/webrick/config.rb
@@ -33,8 +33,6 @@ module WEBrick
:StartCallback => nil,
:StopCallback => nil,
:AcceptCallback => nil,
- :DoNotReverseLookup => nil,
- :ShutdownSocketWithoutClose => false,
}
# for HTTPServer, HTTPRequest, HTTPResponse ...
@@ -47,10 +45,9 @@ module WEBrick
:DirectoryIndex => ["index.html","index.htm","index.cgi","index.rhtml"],
:DocumentRoot => nil,
:DocumentRootOptions => { :FancyIndexing => true },
- :RequestCallback => nil,
+ :RequestHandler => nil,
+ :RequestCallback => nil, # alias of :RequestHandler
:ServerAlias => nil,
- :InputBufferSize => 65536, # input buffer size in reading request body
- :OutputBufferSize => 65536, # output buffer size in sending File or IO
# for HTTPProxyServer
:ProxyAuthProc => nil,
@@ -83,7 +80,7 @@ module WEBrick
}
DigestAuth = {
- :Algorithm => 'MD5-sess', # or 'MD5'
+ :Algorithm => 'MD5-sess', # or 'MD5'
:Domain => nil, # an array includes domain names.
:Qop => [ 'auth' ], # 'auth' or 'auth-int' or both.
:UseOpaque => true,
diff --git a/lib/webrick/httpauth/authenticator.rb b/lib/webrick/httpauth/authenticator.rb
index d93f12a97a..fe2dbf4e0c 100644
--- a/lib/webrick/httpauth/authenticator.rb
+++ b/lib/webrick/httpauth/authenticator.rb
@@ -25,7 +25,7 @@ module WEBrick
unless config[sym]
raise ArgumentError, "Argument #{sym.inspect} missing."
end
- }
+ }
@realm = config[:Realm]
@userdb = config[:UserDB]
@logger = config[:Logger] || Log::new($stderr)
@@ -40,9 +40,9 @@ module WEBrick
def check_scheme(req)
unless credentials = req[@request_field]
error("no credentials in the request.")
- return nil
- end
- unless match = /^#{@auth_scheme}\s+/i.match(credentials)
+ return nil
+ end
+ unless match = /^#{@auth_scheme}\s+/.match(credentials)
error("invalid scheme in %s.", credentials)
info("%s: %s", @request_field, credentials) if $DEBUG
return nil
@@ -60,7 +60,7 @@ module WEBrick
if @logger.error?
log(:error, fmt, *args)
end
- end
+ end
def info(fmt, *args)
if @logger.info?
diff --git a/lib/webrick/httpauth/basicauth.rb b/lib/webrick/httpauth/basicauth.rb
index 210fb00bbe..e835361dc2 100644
--- a/lib/webrick/httpauth/basicauth.rb
+++ b/lib/webrick/httpauth/basicauth.rb
@@ -34,7 +34,7 @@ module WEBrick
unless basic_credentials = check_scheme(req)
challenge(req, res)
end
- userid, password = basic_credentials.unpack("m*")[0].split(":", 2)
+ userid, password = basic_credentials.unpack("m*")[0].split(":", 2)
password ||= ""
if userid.empty?
error("user id was not given.")
diff --git a/lib/webrick/httpauth/digestauth.rb b/lib/webrick/httpauth/digestauth.rb
index aac87a06df..318e0bf17f 100644
--- a/lib/webrick/httpauth/digestauth.rb
+++ b/lib/webrick/httpauth/digestauth.rb
@@ -52,7 +52,7 @@ module WEBrick
when 'SHA1','SHA1-sess' # it is a bonus feature :-)
@h = Digest::SHA1
else
- msg = format('Algorithm "%s" is not supported.', @algorithm)
+ msg = format('Alogrithm "%s" is not supported.', @algorithm)
raise ArgumentError.new(msg)
end
@@ -118,16 +118,16 @@ module WEBrick
}
if !check_uri(req, auth_req)
- raise HTTPStatus::BadRequest
+ raise HTTPStatus::BadRequest
end
- if auth_req['realm'] != @realm
+ if auth_req['realm'] != @realm
error('%s: realm unmatch. "%s" for "%s"',
auth_req['username'], auth_req['realm'], @realm)
return false
end
- auth_req['algorithm'] ||= 'MD5'
+ auth_req['algorithm'] ||= 'MD5'
if auth_req['algorithm'] != @algorithm &&
(@opera_hack && auth_req['algorithm'] != @algorithm.upcase)
error('%s: algorithm unmatch. "%s" for "%s"',
@@ -229,8 +229,8 @@ module WEBrick
def split_param_value(string)
ret = {}
- while string.bytesize != 0
- case string
+ while string.size != 0
+ case string
when /^\s*([\w\-\.\*\%\!]+)=\s*\"((\\.|[^\"])*)\"\s*,?/
key = $1
matched = $2
@@ -320,7 +320,7 @@ module WEBrick
uri = auth_req['uri']
if uri != req.request_uri.to_s && uri != req.unparsed_uri &&
(@internet_explorer_hack && uri != req.path)
- error('%s: uri unmatch. "%s" for "%s"', auth_req['username'],
+ error('%s: uri unmatch. "%s" for "%s"', auth_req['username'],
auth_req['uri'], req.request_uri.to_s)
return false
end
@@ -330,7 +330,6 @@ module WEBrick
def hexdigest(*args)
@h.hexdigest(args.join(":"))
end
-
end
class ProxyDigestAuth < DigestAuth
diff --git a/lib/webrick/httpauth/htpasswd.rb b/lib/webrick/httpauth/htpasswd.rb
index 8a058861d3..40f9297b05 100644
--- a/lib/webrick/httpauth/htpasswd.rb
+++ b/lib/webrick/httpauth/htpasswd.rb
@@ -35,7 +35,7 @@ module WEBrick
case line
when %r!\A[^:]+:[a-zA-Z0-9./]{13}\z!
user, pass = line.split(":")
- when /:\$/, /:{SHA}/
+ when /:\$/, /:\{SHA\}/
raise NotImplementedError,
'MD5, SHA1 .htpasswd file not supported'
else
diff --git a/lib/webrick/httpauth/userdb.rb b/lib/webrick/httpauth/userdb.rb
index 0285f89352..33e01405f4 100644
--- a/lib/webrick/httpauth/userdb.rb
+++ b/lib/webrick/httpauth/userdb.rb
@@ -18,7 +18,7 @@ module WEBrick
def set_passwd(realm, user, pass)
self[user] = pass
- end
+ end
def get_passwd(realm, user, reload_db=false)
# reload_db is dummy
diff --git a/lib/webrick/httpproxy.rb b/lib/webrick/httpproxy.rb
index ce99c55d8f..9295259085 100644
--- a/lib/webrick/httpproxy.rb
+++ b/lib/webrick/httpproxy.rb
@@ -23,26 +23,16 @@ module WEBrick
alias gets read
end
- FakeProxyURI = Object.new
- class << FakeProxyURI
- def method_missing(meth, *args)
- if %w(scheme host port path query userinfo).member?(meth.to_s)
- return nil
- end
- super
- end
- end
-
class HTTPProxyServer < HTTPServer
- def initialize(config={}, default=Config::HTTP)
- super(config, default)
+ def initialize(config)
+ super
c = @config
@via = "#{c[:HTTPVersion]} #{c[:ServerName]}:#{c[:Port]}"
end
def service(req, res)
if req.request_method == "CONNECT"
- do_CONNECT(req, res)
+ proxy_connect(req, res)
elsif req.unparsed_uri =~ %r!^http://!
proxy_service(req, res)
else
@@ -57,24 +47,118 @@ module WEBrick
req.header.delete("proxy-authorization")
end
+ # Some header fields should not be transferred.
+ HopByHop = %w( connection keep-alive proxy-authenticate upgrade
+ proxy-authorization te trailers transfer-encoding )
+ ShouldNotTransfer = %w( set-cookie proxy-connection )
+ def split_field(f) f ? f.split(/,\s+/).collect{|i| i.downcase } : [] end
+
+ def choose_header(src, dst)
+ connections = split_field(src['connection'])
+ src.each{|key, value|
+ key = key.downcase
+ if HopByHop.member?(key) || # RFC2616: 13.5.1
+ connections.member?(key) || # RFC2616: 14.10
+ ShouldNotTransfer.member?(key) # pragmatics
+ @logger.debug("choose_header: `#{key}: #{value}'")
+ next
+ end
+ dst[key] = value
+ }
+ end
+
+ # Net::HTTP is stupid about the multiple header fields.
+ # Here is workaround:
+ def set_cookie(src, dst)
+ if str = src['set-cookie']
+ cookies = []
+ str.split(/,\s*/).each{|token|
+ if /^[^=]+;/o =~ token
+ cookies[-1] << ", " << token
+ elsif /=/o =~ token
+ cookies << token
+ else
+ cookies[-1] << ", " << token
+ end
+ }
+ dst.cookies.replace(cookies)
+ end
+ end
+
+ def set_via(h)
+ if @config[:ProxyVia]
+ if h['via']
+ h['via'] << ", " << @via
+ else
+ h['via'] = @via
+ end
+ end
+ end
+
def proxy_uri(req, res)
- # should return upstream proxy server's URI
- return @config[:ProxyURI]
+ @config[:ProxyURI]
end
def proxy_service(req, res)
# Proxy Authentication
- proxy_auth(req, res)
+ proxy_auth(req, res)
+
+ # Create Request-URI to send to the origin server
+ uri = req.request_uri
+ path = uri.path.dup
+ path << "?" << uri.query if uri.query
+
+ # Choose header fields to transfer
+ header = Hash.new
+ choose_header(req, header)
+ set_via(header)
+ # select upstream proxy server
+ if proxy = proxy_uri(req, res)
+ proxy_host = proxy.host
+ proxy_port = proxy.port
+ if proxy.userinfo
+ credentials = "Basic " + [proxy.userinfo].pack("m*")
+ credentials.chomp!
+ header['proxy-authorization'] = credentials
+ end
+ end
+
+ response = nil
begin
- self.send("do_#{req.request_method}", req, res)
- rescue NoMethodError
- raise HTTPStatus::MethodNotAllowed,
- "unsupported method `#{req.request_method}'."
+ http = Net::HTTP.new(uri.host, uri.port, proxy_host, proxy_port)
+ http.start{
+ if @config[:ProxyTimeout]
+ ################################## these issues are
+ http.open_timeout = 30 # secs # necessary (maybe bacause
+ http.read_timeout = 60 # secs # Ruby's bug, but why?)
+ ##################################
+ end
+ case req.request_method
+ when "GET" then response = http.get(path, header)
+ when "POST" then response = http.post(path, req.body || "", header)
+ when "HEAD" then response = http.head(path, header)
+ else
+ raise HTTPStatus::MethodNotAllowed,
+ "unsupported method `#{req.request_method}'."
+ end
+ }
rescue => err
logger.debug("#{err.class}: #{err.message}")
raise HTTPStatus::ServiceUnavailable, err.message
end
+
+ # Persistent connction requirements are mysterious for me.
+ # So I will close the connection in every response.
+ res['proxy-connection'] = "close"
+ res['connection'] = "close"
+
+ # Convert Net::HTTP::HTTPResponse to WEBrick::HTTPProxy
+ res.status = response.code.to_i
+ choose_header(response, res)
+ set_cookie(response, res)
+ set_via(res)
+ res.body = response.body
# Process contents
if handler = @config[:ProxyContentHandler]
@@ -82,7 +166,7 @@ module WEBrick
end
end
- def do_CONNECT(req, res)
+ def proxy_connect(req, res)
# Proxy Authentication
proxy_auth(req, res)
@@ -95,7 +179,8 @@ module WEBrick
if proxy = proxy_uri(req, res)
proxy_request_line = "CONNECT #{host}:#{port} HTTP/1.0"
if proxy.userinfo
- credentials = "Basic " + [proxy.userinfo].pack("m").delete("\n")
+ credentials = "Basic " + [proxy.userinfo].pack("m*")
+ credentials.chomp!
end
host, port = proxy.host, proxy.port
end
@@ -146,11 +231,11 @@ module WEBrick
while fds = IO::select([ua, os])
if fds[0].member?(ua)
buf = ua.sysread(1024);
- @logger.debug("CONNECT: #{buf.bytesize} byte from User-Agent")
+ @logger.debug("CONNECT: #{buf.size} byte from User-Agent")
os.syswrite(buf)
elsif fds[0].member?(os)
buf = os.sysread(1024);
- @logger.debug("CONNECT: #{buf.bytesize} byte from #{host}:#{port}")
+ @logger.debug("CONNECT: #{buf.size} byte from #{host}:#{port}")
ua.syswrite(buf)
end
end
@@ -162,127 +247,8 @@ module WEBrick
raise HTTPStatus::EOFError
end
- def do_GET(req, res)
- perform_proxy_request(req, res) do |http, path, header|
- http.get(path, header)
- end
- end
-
- def do_HEAD(req, res)
- perform_proxy_request(req, res) do |http, path, header|
- http.head(path, header)
- end
- end
-
- def do_POST(req, res)
- perform_proxy_request(req, res) do |http, path, header|
- http.post(path, req.body || "", header)
- end
- end
-
def do_OPTIONS(req, res)
res['allow'] = "GET,HEAD,POST,OPTIONS,CONNECT"
end
-
- private
-
- # Some header fields should not be transferred.
- HopByHop = %w( connection keep-alive proxy-authenticate upgrade
- proxy-authorization te trailers transfer-encoding )
- ShouldNotTransfer = %w( set-cookie proxy-connection )
- def split_field(f) f ? f.split(/,\s+/).collect{|i| i.downcase } : [] end
-
- def choose_header(src, dst)
- connections = split_field(src['connection'])
- src.each{|key, value|
- key = key.downcase
- if HopByHop.member?(key) || # RFC2616: 13.5.1
- connections.member?(key) || # RFC2616: 14.10
- ShouldNotTransfer.member?(key) # pragmatics
- @logger.debug("choose_header: `#{key}: #{value}'")
- next
- end
- dst[key] = value
- }
- end
-
- # Net::HTTP is stupid about the multiple header fields.
- # Here is workaround:
- def set_cookie(src, dst)
- if str = src['set-cookie']
- cookies = []
- str.split(/,\s*/).each{|token|
- if /^[^=]+;/o =~ token
- cookies[-1] << ", " << token
- elsif /=/o =~ token
- cookies << token
- else
- cookies[-1] << ", " << token
- end
- }
- dst.cookies.replace(cookies)
- end
- end
-
- def set_via(h)
- if @config[:ProxyVia]
- if h['via']
- h['via'] << ", " << @via
- else
- h['via'] = @via
- end
- end
- end
-
- def setup_proxy_header(req, res)
- # Choose header fields to transfer
- header = Hash.new
- choose_header(req, header)
- set_via(header)
- return header
- end
-
- def setup_upstream_proxy_authentication(req, res, header)
- if upstream = proxy_uri(req, res)
- if upstream.userinfo
- header['proxy-authorization'] =
- "Basic " + [upstream.userinfo].pack("m").delete("\n")
- end
- return upstream
- end
- return FakeProxyURI
- end
-
- def perform_proxy_request(req, res)
- uri = req.request_uri
- path = uri.path.dup
- path << "?" << uri.query if uri.query
- header = setup_proxy_header(req, res)
- upstream = setup_upstream_proxy_authentication(req, res, header)
- response = nil
-
- http = Net::HTTP.new(uri.host, uri.port, upstream.host, upstream.port)
- http.start do
- if @config[:ProxyTimeout]
- ################################## these issues are
- http.open_timeout = 30 # secs # necessary (maybe bacause
- http.read_timeout = 60 # secs # Ruby's bug, but why?)
- ##################################
- end
- response = yield(http, path, header)
- end
-
- # Persistent connection requirements are mysterious for me.
- # So I will close the connection in every response.
- res['proxy-connection'] = "close"
- res['connection'] = "close"
-
- # Convert Net::HTTP::HTTPResponse to WEBrick::HTTPResponse
- res.status = response.code.to_i
- choose_header(response, res)
- set_cookie(response, res)
- set_via(res)
- res.body = response.body
- end
end
end
diff --git a/lib/webrick/httprequest.rb b/lib/webrick/httprequest.rb
index ff9b6d7849..1d32293a27 100644
--- a/lib/webrick/httprequest.rb
+++ b/lib/webrick/httprequest.rb
@@ -8,22 +8,26 @@
#
# $IPR: httprequest.rb,v 1.64 2003/07/13 17:18:22 gotoyuzo Exp $
+require 'timeout'
require 'uri'
+
require 'webrick/httpversion'
require 'webrick/httpstatus'
require 'webrick/httputils'
require 'webrick/cookie'
module WEBrick
+
class HTTPRequest
BODY_CONTAINABLE_METHODS = [ "POST", "PUT" ]
+ BUFSIZE = 1024*4
# Request line
attr_reader :request_line
attr_reader :request_method, :unparsed_uri, :http_version
# Request-URI
- attr_reader :request_uri, :path
+ attr_reader :request_uri, :host, :port, :path
attr_accessor :script_name, :path_info, :query_string
# Header and entity body
@@ -40,7 +44,6 @@ module WEBrick
def initialize(config)
@config = config
- @buffer_size = @config[:InputBufferSize]
@logger = config[:Logger]
@request_line = @request_method =
@@ -69,9 +72,6 @@ module WEBrick
@remaining_size = nil
@socket = nil
-
- @forwarded_proto = @forwarded_host = @forwarded_port =
- @forwarded_server = @forwarded_for = nil
end
def parse(socket=nil)
@@ -98,7 +98,6 @@ module WEBrick
return if @unparsed_uri == "*"
begin
- setup_forwarded_info
@request_uri = parse_uri(@unparsed_uri)
@path = HTTPUtils::unescape(@request_uri.path)
@path = HTTPUtils::normalize_path(@path)
@@ -157,26 +156,6 @@ module WEBrick
}
end
- def host
- return @forwarded_host || @host
- end
-
- def port
- return @forwarded_port || @port
- end
-
- def server_name
- return @forwarded_server || @config[:ServerName]
- end
-
- def remote_ip
- return self["client-ip"] || @forwarded_for || @peeraddr[3]
- end
-
- def ssl?
- return @request_uri.scheme == "https"
- end
-
def keep_alive?
@keep_alive
end
@@ -243,13 +222,10 @@ module WEBrick
private
def read_request_line(socket)
- @request_line = read_line(socket, 1024) if socket
- if @request_line.bytesize >= 1024 and @request_line[-1, 1] != LF
- raise HTTPStatus::RequestURITooLarge
- end
+ @request_line = read_line(socket) if socket
@request_time = Time.now
raise HTTPStatus::EOFError unless @request_line
- if /^(\S+)\s+(\S++)(?:\s+HTTP\/(\d+\.\d+))?\r?\n/mo =~ @request_line
+ if /^(\S+)\s+(\S+)(?:\s+HTTP\/(\d+\.\d+))?\r?\n/mo =~ @request_line
@request_method = $1
@unparsed_uri = $2
@http_version = HTTPVersion.new($3 ? $3 : "0.9")
@@ -267,7 +243,7 @@ module WEBrick
end
end
begin
- @header = HTTPUtils::parse_header(@raw_header.join)
+ @header = HTTPUtils::parse_header(@raw_header)
rescue => ex
raise HTTPStatus::BadRequest, ex.message
end
@@ -279,9 +255,7 @@ module WEBrick
end
uri = URI::parse(str)
return uri if uri.absolute?
- if @forwarded_host
- host, port = @forwarded_host, @forwarded_port
- elsif self["host"]
+ if self["host"]
pattern = /\A(#{URI::REGEXP::PATTERN::HOST})(?::(\d+))?\z/n
host, port = *self['host'].scan(pattern)[0]
elsif @addr.size > 0
@@ -289,7 +263,7 @@ module WEBrick
else
host, port = @config[:ServerName], @config[:Port]
end
- uri.scheme = @forwarded_proto || scheme
+ uri.scheme = scheme
uri.host = host
uri.port = port ? port.to_i : nil
return URI::parse(uri.to_s)
@@ -304,10 +278,10 @@ module WEBrick
end
elsif self['content-length'] || @remaining_size
@remaining_size ||= self['content-length'].to_i
- while @remaining_size > 0
- sz = [@buffer_size, @remaining_size].min
+ while @remaining_size > 0
+ sz = BUFSIZE < @remaining_size ? BUFSIZE : @remaining_size
break unless buf = read_data(socket, sz)
- @remaining_size -= buf.bytesize
+ @remaining_size -= buf.size
block.call(buf)
end
if @remaining_size > 0 && @socket.eof?
@@ -333,8 +307,13 @@ module WEBrick
def read_chunked(socket, block)
chunk_size, = read_chunk_size(socket)
while chunk_size > 0
- data = read_data(socket, chunk_size) # read chunk-data
- if data.nil? || data.bytesize != chunk_size
+ data = ""
+ while data.size < chunk_size
+ tmp = read_data(socket, chunk_size-data.size) # read chunk-data
+ break unless tmp
+ data << tmp
+ end
+ if data.nil? || data.size != chunk_size
raise BadRequest, "bad chunk data size."
end
read_line(socket) # skip CRLF
@@ -346,10 +325,10 @@ module WEBrick
@remaining_size = 0
end
- def _read_data(io, method, *arg)
+ def _read_data(io, method, arg)
begin
- WEBrick::Utils.timeout(@config[:RequestTimeout]){
- return io.__send__(method, *arg)
+ timeout(@config[:RequestTimeout]){
+ return io.__send__(method, arg)
}
rescue Errno::ECONNRESET
return nil
@@ -358,8 +337,8 @@ module WEBrick
end
end
- def read_line(io, size=4096)
- _read_data(io, :gets, LF, size)
+ def read_line(io)
+ _read_data(io, :gets, LF)
end
def read_data(io, size)
@@ -382,25 +361,5 @@ module WEBrick
raise HTTPStatus::BadRequest, ex.message
end
end
-
- PrivateNetworkRegexp = /
- ^unknown$|
- ^((::ffff:)?127.0.0.1|::1)$|
- ^(::ffff:)?(10|172\.(1[6-9]|2[0-9]|3[01])|192\.168)\.
- /ixo
-
- def setup_forwarded_info
- @forwarded_server = self["x-forwarded-server"]
- @forwarded_proto = self["x-forwarded-proto"]
- if host_port = self["x-forwarded-host"]
- @forwarded_host, tmp = host_port.split(":", 2)
- @forwarded_port = (tmp || (@forwarded_proto == "https" ? 443 : 80)).to_i
- end
- if addrs = self["x-forwarded-for"]
- addrs = addrs.split(",").collect(&:strip)
- addrs.reject!{|ip| PrivateNetworkRegexp =~ ip }
- @forwarded_for = addrs.first
- end
- end
end
end
diff --git a/lib/webrick/httpresponse.rb b/lib/webrick/httpresponse.rb
index 98c4a357fa..62156b1abd 100644
--- a/lib/webrick/httpresponse.rb
+++ b/lib/webrick/httpresponse.rb
@@ -16,6 +16,8 @@ require 'webrick/httpstatus'
module WEBrick
class HTTPResponse
+ BUFSIZE = 1024*4
+
attr_reader :http_version, :status, :header
attr_reader :cookies
attr_accessor :reason_phrase
@@ -28,7 +30,6 @@ module WEBrick
def initialize(config)
@config = config
- @buffer_size = config[:OutputBufferSize]
@logger = config[:Logger]
@header = Hash.new
@status = HTTPStatus::RC_OK
@@ -142,7 +143,7 @@ module WEBrick
@header.delete('content-length')
elsif @header['content-length'].nil?
unless @body.is_a?(IO)
- @header['content-length'] = @body ? @body.bytesize : 0
+ @header['content-length'] = @body ? @body.size : 0
end
end
@@ -169,7 +170,7 @@ module WEBrick
if @http_version.major > 0
data = status_line()
@header.each{|key, value|
- tmp = key.gsub(/\bwww|^te$|\b\w/){ $&.upcase }
+ tmp = key.gsub(/\bwww|^te$|\b\w/){|s| s.upcase }
data << "#{tmp}: #{value}" << CRLF
}
@cookies.each{|cookie|
@@ -201,10 +202,10 @@ module WEBrick
def set_error(ex, backtrace=false)
case ex
- when HTTPStatus::Status
+ when HTTPStatus::Status
@keep_alive = false if HTTPStatus::error?(ex.code)
self.status = ex.code
- else
+ else
@keep_alive = false
self.status = HTTPStatus::RC_INTERNAL_SERVER_ERROR
end
@@ -257,13 +258,13 @@ module WEBrick
if @request_method == "HEAD"
# do nothing
elsif chunked?
- while buf = @body.read(@buffer_size)
+ while buf = @body.read(BUFSIZE)
next if buf.empty?
data = ""
- data << format("%x", buf.bytesize) << CRLF
+ data << format("%x", buf.size) << CRLF
data << buf << CRLF
_write_data(socket, data)
- @sent_size += buf.bytesize
+ @sent_size += buf.size
end
_write_data(socket, "0#{CRLF}#{CRLF}")
else
@@ -280,41 +281,41 @@ module WEBrick
if @request_method == "HEAD"
# do nothing
elsif chunked?
- remain = body ? @body.bytesize : 0
- while buf = @body[@sent_size, @buffer_size]
+ remain = body ? @body.size : 0
+ while buf = @body[@sent_size, BUFSIZE]
break if buf.empty?
data = ""
- data << format("%x", buf.bytesize) << CRLF
+ data << format("%x", buf.size) << CRLF
data << buf << CRLF
_write_data(socket, data)
- @sent_size += buf.bytesize
+ @sent_size += buf.size
end
_write_data(socket, "0#{CRLF}#{CRLF}")
else
- if @body && @body.bytesize > 0
+ if @body && @body.size > 0
_write_data(socket, @body)
- @sent_size = @body.bytesize
+ @sent_size = @body.size
end
end
end
def _send_file(output, input, offset, size)
while offset > 0
- sz = @buffer_size < size ? @buffer_size : size
+ sz = BUFSIZE < offset ? BUFSIZE : offset
buf = input.read(sz)
- offset -= buf.bytesize
+ offset -= buf.size
end
if size == 0
- while buf = input.read(@buffer_size)
+ while buf = input.read(BUFSIZE)
_write_data(output, buf)
end
else
while size > 0
- sz = @buffer_size < size ? @buffer_size : size
+ sz = BUFSIZE < size ? BUFSIZE : size
buf = input.read(sz)
_write_data(output, buf)
- size -= buf.bytesize
+ size -= buf.size
end
end
end
diff --git a/lib/webrick/httpserver.rb b/lib/webrick/httpserver.rb
index 929d856a4a..9edb0018f8 100644
--- a/lib/webrick/httpserver.rb
+++ b/lib/webrick/httpserver.rb
@@ -21,7 +21,7 @@ module WEBrick
class HTTPServer < ::WEBrick::GenericServer
def initialize(config={}, default=Config::HTTP)
- super(config, default)
+ super
@http_version = HTTPVersion::convert(@config[:HTTPVersion])
@mount_tab = MountTable.new
@@ -36,12 +36,12 @@ module WEBrick
[ $stderr, AccessLog::REFERER_LOG_FORMAT ]
]
end
-
+
@virtual_hosts = Array.new
end
def run(sock)
- while true
+ while true
res = HTTPResponse.new(@config)
req = HTTPRequest.new(@config)
server = self
@@ -52,19 +52,14 @@ module WEBrick
timeout = 0 if @status != :Running
timeout -= 0.5
end
- raise HTTPStatus::EOFError if timeout <= 0
- raise HTTPStatus::EOFError if sock.eof?
+ raise HTTPStatus::EOFError if timeout <= 0 || sock.eof?
req.parse(sock)
res.request_method = req.request_method
res.request_uri = req.request_uri
res.request_http_version = req.http_version
res.keep_alive = req.keep_alive?
server = lookup_server(req) || self
- if callback = server[:RequestCallback]
- callback.call(req, res)
- elsif callback = server[:RequestHandler]
- msg = ":RequestHandler is deprecated, please use :RequestCallback"
- @logger.warn(msg)
+ if callback = server[:RequestCallback] || server[:RequestHandler]
callback.call(req, res)
end
server.service(req, res)
@@ -80,9 +75,7 @@ module WEBrick
res.set_error(ex, true)
ensure
if req.request_line
- if req.keep_alive? && res.keep_alive?
- req.fixup()
- end
+ req.fixup()
res.send_response(sock)
server.access_log(@config, req, res)
end
diff --git a/lib/webrick/httpservlet/abstract.rb b/lib/webrick/httpservlet/abstract.rb
index f8bf14a330..5375c4622d 100644
--- a/lib/webrick/httpservlet/abstract.rb
+++ b/lib/webrick/httpservlet/abstract.rb
@@ -48,7 +48,8 @@ module WEBrick
end
def do_OPTIONS(req, res)
- m = self.methods.grep(/\Ado_([A-Z]+)\z/) {$1}
+ m = self.methods.grep(/^do_[A-Z]+$/)
+ m.collect!{|i| i.sub(/do_/, "") }
m.sort!
res["allow"] = m.join(",")
end
@@ -58,7 +59,7 @@ module WEBrick
def redirect_to_directory_uri(req, res)
if req.path[-1] != ?/
location = WEBrick::HTTPUtils.escape_path(req.path + "/")
- if req.query_string && req.query_string.bytesize > 0
+ if req.query_string && req.query_string.size > 0
location << "?" << req.query_string
end
res.set_redirect(HTTPStatus::MovedPermanently, location)
diff --git a/lib/webrick/httpservlet/cgi_runner.rb b/lib/webrick/httpservlet/cgi_runner.rb
index dd7325d25c..006abd458e 100644
--- a/lib/webrick/httpservlet/cgi_runner.rb
+++ b/lib/webrick/httpservlet/cgi_runner.rb
@@ -13,7 +13,7 @@ def sysread(io, size)
while size > 0
tmp = io.sysread(size)
buf << tmp
- size -= tmp.bytesize
+ size -= tmp.size
end
return buf
end
diff --git a/lib/webrick/httpservlet/cgihandler.rb b/lib/webrick/httpservlet/cgihandler.rb
index ab36b906f1..d5895e5285 100644
--- a/lib/webrick/httpservlet/cgihandler.rb
+++ b/lib/webrick/httpservlet/cgihandler.rb
@@ -1,11 +1,11 @@
-#
+#
# cgihandler.rb -- CGIHandler Class
-#
+#
# Author: IPR -- Internet Programming with Ruby -- writers
# Copyright (c) 2001 TAKAHASHI Masayoshi, GOTOU Yuuzou
# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
# reserved.
-#
+#
# $IPR: cgihandler.rb,v 1.27 2003/03/21 19:56:01 gotoyuzo Exp $
require 'rbconfig'
@@ -17,13 +17,13 @@ module WEBrick
module HTTPServlet
class CGIHandler < AbstractServlet
- Ruby = File::join(RbConfig::CONFIG['bindir'],
- RbConfig::CONFIG['ruby_install_name'])
- Ruby << RbConfig::CONFIG['EXEEXT']
- CGIRunner = "\"#{Ruby}\" \"#{WEBrick::Config::LIBDIR}/httpservlet/cgi_runner.rb\""
+ Ruby = File::join(::Config::CONFIG['bindir'],
+ ::Config::CONFIG['ruby_install_name'])
+ Ruby << ::Config::CONFIG['EXEEXT']
+ CGIRunner = "\"#{Ruby}\" \"#{Config::LIBDIR}/httpservlet/cgi_runner.rb\""
def initialize(server, name)
- super(server, name)
+ super
@script_filename = name
@tempdir = server[:TempDir]
@cgicmd = "#{CGIRunner} #{server[:CGIInterpreter]}"
@@ -35,9 +35,7 @@ module WEBrick
cgi_in = IO::popen(@cgicmd, "wb")
cgi_out = Tempfile.new("webrick.cgiout.", @tempdir)
- cgi_out.set_encoding("ASCII-8BIT")
cgi_err = Tempfile.new("webrick.cgierr.", @tempdir)
- cgi_err.set_encoding("ASCII-8BIT")
begin
cgi_in.sync = true
meta = req.meta_vars
@@ -48,14 +46,14 @@ module WEBrick
end
dump = Marshal.dump(meta)
- cgi_in.write("%8d" % cgi_out.path.bytesize)
+ cgi_in.write("%8d" % cgi_out.path.size)
cgi_in.write(cgi_out.path)
- cgi_in.write("%8d" % cgi_err.path.bytesize)
+ cgi_in.write("%8d" % cgi_err.path.size)
cgi_in.write(cgi_err.path)
- cgi_in.write("%8d" % dump.bytesize)
+ cgi_in.write("%8d" % dump.size)
cgi_in.write(dump)
- if req.body and req.body.bytesize > 0
+ if req.body and req.body.size > 0
cgi_in.write(req.body)
end
ensure
@@ -65,19 +63,19 @@ module WEBrick
data = cgi_out.read
cgi_out.close(true)
if errmsg = cgi_err.read
- if errmsg.bytesize > 0
+ if errmsg.size > 0
@logger.error("CGIHandler: #{@script_filename}:\n" + errmsg)
end
- end
+ end
cgi_err.close(true)
end
-
+
if status != 0
@logger.error("CGIHandler: #{@script_filename} exit with #{status}")
end
data = "" unless data
- raw_header, body = data.split(/^[\xd\xa]+/, 2)
+ raw_header, body = data.split(/^[\xd\xa]+/on, 2)
raise HTTPStatus::InternalServerError,
"Premature end of script headers: #{@script_filename}" if body.nil?
diff --git a/lib/webrick/httpservlet/erbhandler.rb b/lib/webrick/httpservlet/erbhandler.rb
index 845db07169..b9d5e65b65 100644
--- a/lib/webrick/httpservlet/erbhandler.rb
+++ b/lib/webrick/httpservlet/erbhandler.rb
@@ -1,11 +1,11 @@
-#
+#
# erbhandler.rb -- ERBHandler Class
-#
+#
# Author: IPR -- Internet Programming with Ruby -- writers
# Copyright (c) 2001 TAKAHASHI Masayoshi, GOTOU Yuuzou
# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
# reserved.
-#
+#
# $IPR: erbhandler.rb,v 1.25 2003/02/24 19:25:31 gotoyuzo Exp $
require 'webrick/httpservlet/abstract.rb'
@@ -17,7 +17,7 @@ module WEBrick
class ERBHandler < AbstractServlet
def initialize(server, name)
- super(server, name)
+ super
@script_filename = name
end
diff --git a/lib/webrick/httpservlet/filehandler.rb b/lib/webrick/httpservlet/filehandler.rb
index 1cac0cabe3..24f59d7142 100644
--- a/lib/webrick/httpservlet/filehandler.rb
+++ b/lib/webrick/httpservlet/filehandler.rb
@@ -20,7 +20,7 @@ module WEBrick
class DefaultFileHandler < AbstractServlet
def initialize(server, local_path)
- super(server, local_path)
+ super
@local_path = local_path
end
@@ -32,7 +32,7 @@ module WEBrick
if not_modified?(req, res, mtime, res['etag'])
res.body = ''
raise HTTPStatus::NotModified
- elsif req['range']
+ elsif req['range']
make_partial_content(req, res, @local_path, st.size)
raise HTTPStatus::PartialContent
else
@@ -402,25 +402,25 @@ module WEBrick
res.body << "<A HREF=\"?M=#{d1}\">Last modified</A> "
res.body << "<A HREF=\"?S=#{d1}\">Size</A>\n"
res.body << "<HR>\n"
-
+
list.unshift [ "..", File::mtime(local_path+"/.."), -1 ]
list.each{ |name, time, size|
if name == ".."
dname = "Parent Directory"
- elsif name.bytesize > 25
- dname = name.sub(/^(.{23})(?:.*)/, '\1..')
+ elsif name.size > 25
+ dname = name.sub(/^(.{23})(.*)/){ $1 + ".." }
else
dname = name
end
s = " <A HREF=\"#{HTTPUtils::escape(name)}\">#{dname}</A>"
- s << " " * (30 - dname.bytesize)
+ s << " " * (30 - dname.size)
s << (time ? time.strftime("%Y/%m/%d %H:%M ") : " " * 22)
s << (size >= 0 ? size.to_s : "-") << "\n"
res.body << s
}
res.body << "</PRE><HR>"
- res.body << <<-_end_of_html_
+ res.body << <<-_end_of_html_
<ADDRESS>
#{HTMLUtils::escape(@config[:ServerSoftware])}<BR>
at #{req.host}:#{req.port}
diff --git a/lib/webrick/httpservlet/prochandler.rb b/lib/webrick/httpservlet/prochandler.rb
index 2be3c854c1..783cb27896 100644
--- a/lib/webrick/httpservlet/prochandler.rb
+++ b/lib/webrick/httpservlet/prochandler.rb
@@ -1,11 +1,11 @@
-#
+#
# prochandler.rb -- ProcHandler Class
-#
+#
# Author: IPR -- Internet Programming with Ruby -- writers
# Copyright (c) 2001 TAKAHASHI Masayoshi, GOTOU Yuuzou
# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
# reserved.
-#
+#
# $IPR: prochandler.rb,v 1.7 2002/09/21 12:23:42 gotoyuzo Exp $
require 'webrick/httpservlet/abstract.rb'
@@ -16,7 +16,7 @@ module WEBrick
class ProcHandler < AbstractServlet
def get_instance(server, *options)
self
- end
+ end
def initialize(proc)
@proc = proc
diff --git a/lib/webrick/httpstatus.rb b/lib/webrick/httpstatus.rb
index d022ddb446..0b22c992b3 100644
--- a/lib/webrick/httpstatus.rb
+++ b/lib/webrick/httpstatus.rb
@@ -19,50 +19,50 @@ module WEBrick
class Error < Status; end
class ClientError < Error; end
class ServerError < Error; end
-
+
class EOFError < StandardError; end
StatusMessage = {
- 100 => 'Continue',
- 101 => 'Switching Protocols',
- 200 => 'OK',
- 201 => 'Created',
- 202 => 'Accepted',
- 203 => 'Non-Authoritative Information',
- 204 => 'No Content',
- 205 => 'Reset Content',
- 206 => 'Partial Content',
- 300 => 'Multiple Choices',
- 301 => 'Moved Permanently',
- 302 => 'Found',
- 303 => 'See Other',
- 304 => 'Not Modified',
- 305 => 'Use Proxy',
- 307 => 'Temporary Redirect',
- 400 => 'Bad Request',
- 401 => 'Unauthorized',
- 402 => 'Payment Required',
- 403 => 'Forbidden',
- 404 => 'Not Found',
- 405 => 'Method Not Allowed',
- 406 => 'Not Acceptable',
- 407 => 'Proxy Authentication Required',
- 408 => 'Request Timeout',
- 409 => 'Conflict',
- 410 => 'Gone',
- 411 => 'Length Required',
- 412 => 'Precondition Failed',
- 413 => 'Request Entity Too Large',
- 414 => 'Request-URI Too Large',
- 415 => 'Unsupported Media Type',
- 416 => 'Request Range Not Satisfiable',
- 417 => 'Expectation Failed',
- 500 => 'Internal Server Error',
- 501 => 'Not Implemented',
- 502 => 'Bad Gateway',
- 503 => 'Service Unavailable',
- 504 => 'Gateway Timeout',
- 505 => 'HTTP Version Not Supported'
+ 100, 'Continue',
+ 101, 'Switching Protocols',
+ 200, 'OK',
+ 201, 'Created',
+ 202, 'Accepted',
+ 203, 'Non-Authoritative Information',
+ 204, 'No Content',
+ 205, 'Reset Content',
+ 206, 'Partial Content',
+ 300, 'Multiple Choices',
+ 301, 'Moved Permanently',
+ 302, 'Found',
+ 303, 'See Other',
+ 304, 'Not Modified',
+ 305, 'Use Proxy',
+ 307, 'Temporary Redirect',
+ 400, 'Bad Request',
+ 401, 'Unauthorized',
+ 402, 'Payment Required',
+ 403, 'Forbidden',
+ 404, 'Not Found',
+ 405, 'Method Not Allowed',
+ 406, 'Not Acceptable',
+ 407, 'Proxy Authentication Required',
+ 408, 'Request Timeout',
+ 409, 'Conflict',
+ 410, 'Gone',
+ 411, 'Length Required',
+ 412, 'Precondition Failed',
+ 413, 'Request Entity Too Large',
+ 414, 'Request-URI Too Large',
+ 415, 'Unsupported Media Type',
+ 416, 'Request Range Not Satisfiable',
+ 417, 'Expectation Failed',
+ 500, 'Internal Server Error',
+ 501, 'Not Implemented',
+ 502, 'Bad Gateway',
+ 503, 'Service Unavailable',
+ 504, 'Gateway Timeout',
+ 505, 'HTTP Version Not Supported'
}
CodeToError = {}
@@ -84,7 +84,7 @@ module WEBrick
class #{err_name} < #{parent}
def self.code() RC_#{var_name} end
def self.reason_phrase() StatusMessage[code] end
- def code() self::class::code end
+ def code() self::class::code end
def reason_phrase() self::class::reason_phrase end
alias to_i code
end
diff --git a/lib/webrick/httputils.rb b/lib/webrick/httputils.rb
index 6f6f05a199..c57af2c860 100644
--- a/lib/webrick/httputils.rb
+++ b/lib/webrick/httputils.rb
@@ -23,8 +23,16 @@ module WEBrick
ret = path.dup
ret.gsub!(%r{/+}o, '/') # // => /
- while ret.sub!(%r'/\.(?:/|\Z)', '/'); end # /. => /
- while ret.sub!(%r'/(?!\.\./)[^/]+/\.\.(?:/|\Z)', '/'); end # /foo/.. => /foo
+ while ret.sub!(%r{/\.(/|\Z)}o, '/'); end # /. => /
+ begin # /foo/.. => /foo
+ match = ret.sub!(%r{/([^/]+)/\.\.(/|\Z)}o){
+ if $1 == ".."
+ raise "abnormal path `#{path}'"
+ else
+ "/"
+ end
+ }
+ end while match
raise "abnormal path `#{path}'" if %r{/\.\.(/|\Z)} =~ ret
ret
@@ -82,7 +90,6 @@ module WEBrick
"tiff" => "image/tiff",
"txt" => "text/plain",
"xbm" => "image/x-xbitmap",
- "xhtml" => "text/html",
"xls" => "application/vnd.ms-excel",
"xml" => "text/xml",
"xpm" => "image/x-xpixmap",
@@ -98,7 +105,7 @@ module WEBrick
next if /^#/ =~ line
line.chomp!
mimetype, ext0 = line.split(/\s+/, 2)
- next unless ext0
+ next unless ext0
next if ext0.empty?
ext0.split(/\s+/).each{ |ext| hash[ext] = mimetype }
}
@@ -119,7 +126,7 @@ module WEBrick
def parse_header(raw)
header = Hash.new([].freeze)
field = nil
- raw.each_line{|line|
+ raw.each{|line|
case line
when /^([A-Za-z0-9!\#$%&'*+\-.^_`|~]+):\s*(.*?)\s*\z/om
field, value = $1, $2
@@ -147,8 +154,8 @@ module WEBrick
module_function :parse_header
def split_header_value(str)
- str.scan(%r'\G((?:"(?:\\.|[^"])+?"|[^",]+)+)
- (?:,\s*|\Z)'xn).flatten
+ str.scan(/((?:"(?:\\.|[^"])+?"|[^",]+)+)
+ (?:,\s*|\Z)/xn).collect{|v| v[0] }
end
module_function :split_header_value
@@ -216,7 +223,7 @@ module WEBrick
super("")
else
@raw_header = EmptyRawHeader
- @header = EmptyHeader
+ @header = EmptyHeader
super(args.shift)
unless args.empty?
@next_data = self.class.new(*args)
@@ -236,7 +243,7 @@ module WEBrick
if @header
super
elsif str == CRLF
- @header = HTTPUtils::parse_header(@raw_header.join)
+ @header = HTTPUtils::parse_header(@raw_header)
if cd = self['content-disposition']
if /\s+name="(.*?)"/ =~ cd then @name = $1 end
if /\s+filename="(.*?)"/ =~ cd then @filename = $1 end
@@ -250,7 +257,7 @@ module WEBrick
def append_data(data)
tmp = self
while tmp
- unless tmp.next_data
+ unless tmp.next_data
tmp.next_data = data
break
end
@@ -287,7 +294,7 @@ module WEBrick
query = Hash.new
if str
str.split(/[&;]/).each{|x|
- next if x.empty?
+ next if x.empty?
key, val = x.split(/=/,2)
key = unescape_form(key)
val = unescape_form(val.to_s)
@@ -305,11 +312,11 @@ module WEBrick
module_function :parse_query
def parse_form_data(io, boundary)
- boundary_regexp = /\A--#{Regexp.quote(boundary)}(--)?#{CRLF}\z/
+ boundary_regexp = /\A--#{boundary}(--)?#{CRLF}\z/
form_data = Hash.new
return form_data unless io
data = nil
- io.each_line{|line|
+ io.each{|line|
if boundary_regexp =~ line
if data
data.chop!
@@ -317,7 +324,7 @@ module WEBrick
if form_data.has_key?(key)
form_data[key].append_data(data)
else
- form_data[key] = data
+ form_data[key] = data
end
end
data = FormData.new
@@ -350,7 +357,7 @@ module WEBrick
def _make_regex(str) /([#{Regexp.escape(str)}])/n end
def _make_regex!(str) /([^#{Regexp.escape(str)}])/n end
- def _escape(str, regex) str.gsub(regex){ "%%%02X" % $1.ord } end
+ def _escape(str, regex) str.gsub(regex){ "%%%02X" % $1[0] } end
def _unescape(str, regex) str.gsub(regex){ $1.hex.chr } end
UNESCAPED = _make_regex(control+space+delims+unwise+nonascii)
diff --git a/lib/webrick/log.rb b/lib/webrick/log.rb
index 0ffa12dd96..5d4fd0a174 100644
--- a/lib/webrick/log.rb
+++ b/lib/webrick/log.rb
@@ -72,7 +72,7 @@ module WEBrick
end
class Log < BasicLog
- attr_accessor :time_format
+ attr_accessor :time_format
def initialize(log_file=nil, level=nil)
super(log_file, level)
diff --git a/lib/webrick/server.rb b/lib/webrick/server.rb
index c4d23bd67b..16dbd46f98 100644
--- a/lib/webrick/server.rb
+++ b/lib/webrick/server.rb
@@ -10,6 +10,7 @@
require 'thread'
require 'socket'
+require 'timeout'
require 'webrick/config'
require 'webrick/log'
@@ -91,7 +92,6 @@ module WEBrick
svrs[0].each{|svr|
@tokens.pop # blocks while no token is there.
if sock = accept_client(svr)
- sock.do_not_reverse_lookup = config[:DoNotReverseLookup]
th = start_thread(sock, &block)
th[:WEBrickThread] = true
thgroup.add(th)
@@ -130,18 +130,7 @@ module WEBrick
addr = s.addr
@logger.debug("close TCPSocket(#{addr[2]}, #{addr[1]})")
end
- begin
- s.shutdown
- rescue Errno::ENOTCONN
- # when `Errno::ENOTCONN: Socket is not connected' on some platforms,
- # call #close instead of #shutdown.
- # (ignore @config[:ShutdownSocketWithoutClose])
- s.close
- else
- unless @config[:ShutdownSocketWithoutClose]
- s.close
- end
- end
+ s.close
}
@listeners.clear
end
@@ -159,8 +148,9 @@ module WEBrick
sock.sync = true
Utils::set_non_blocking(sock)
Utils::set_close_on_exec(sock)
- rescue Errno::ECONNRESET, Errno::ECONNABORTED,
- Errno::EPROTO, Errno::EINVAL => ex
+ rescue Errno::ECONNRESET, Errno::ECONNABORTED, Errno::EPROTO => ex
+ # TCP connection was established but RST segment was sent
+ # from peer before calling TCPServer#accept.
rescue Exception => ex
msg = "#{ex.class}: #{ex.message}\n\t#{ex.backtrace[0]}"
@logger.error msg
diff --git a/lib/webrick/ssl.rb b/lib/webrick/ssl.rb
index 896206b483..03bfdf4aa0 100644
--- a/lib/webrick/ssl.rb
+++ b/lib/webrick/ssl.rb
@@ -2,7 +2,7 @@
# ssl.rb -- SSL/TLS enhancement for GenericServer
#
# Copyright (c) 2003 GOTOU Yuuzou All rights reserved.
-#
+#
# $Id$
require 'webrick'
@@ -41,7 +41,7 @@ module WEBrick
case p
when 0; $stderr.putc "." # BN_generate_prime
when 1; $stderr.putc "+" # BN_generate_prime
- when 2; $stderr.putc "*" # searching good prime,
+ when 2; $stderr.putc "*" # searching good prime,
# n = #of try,
# but also data from BN_generate_prime
when 3; $stderr.putc "\n" # found good prime, n==0 - p, n==1 - q,
@@ -88,7 +88,7 @@ module WEBrick
if @config[:SSLEnable]
unless ssl_context
@ssl_context = setup_ssl_context(@config)
- @logger.info("\n" + @config[:SSLCertificate].to_text)
+ @logger.info("\n" + @config[:SSLCertificate].to_text)
end
listeners.collect!{|svr|
ssvr = ::OpenSSL::SSL::SSLServer.new(svr, ssl_context)
diff --git a/lib/webrick/utils.rb b/lib/webrick/utils.rb
index dee9363441..cf9da6f2ce 100644
--- a/lib/webrick/utils.rb
+++ b/lib/webrick/utils.rb
@@ -86,90 +86,15 @@ module WEBrick
RAND_CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" +
"0123456789" +
- "abcdefghijklmnopqrstuvwxyz"
+ "abcdefghijklmnopqrstuvwxyz"
def random_string(len)
- rand_max = RAND_CHARS.bytesize
- ret = ""
+ rand_max = RAND_CHARS.size
+ ret = ""
len.times{ ret << RAND_CHARS[rand(rand_max)] }
- ret
+ ret
end
module_function :random_string
- ###########
-
- require "thread"
- require "timeout"
- require "singleton"
-
- class TimeoutHandler
- include Singleton
- TimeoutMutex = Mutex.new
-
- def TimeoutHandler.register(seconds, exception)
- TimeoutMutex.synchronize{
- instance.register(Thread.current, Time.now + seconds, exception)
- }
- end
-
- def TimeoutHandler.cancel(id)
- TimeoutMutex.synchronize{
- instance.cancel(Thread.current, id)
- }
- end
-
- def initialize
- @timeout_info = Hash.new
- Thread.start{
- while true
- now = Time.now
- @timeout_info.each{|thread, ary|
- ary.dup.each{|info|
- time, exception = *info
- interrupt(thread, info.object_id, exception) if time < now
- }
- }
- sleep 0.5
- end
- }
- end
-
- def interrupt(thread, id, exception)
- TimeoutMutex.synchronize{
- if cancel(thread, id) && thread.alive?
- thread.raise(exception, "execution timeout")
- end
- }
- end
-
- def register(thread, time, exception)
- @timeout_info[thread] ||= Array.new
- @timeout_info[thread] << [time, exception]
- return @timeout_info[thread].last.object_id
- end
-
- def cancel(thread, id)
- if ary = @timeout_info[thread]
- ary.delete_if{|info| info.object_id == id }
- if ary.empty?
- @timeout_info.delete(thread)
- end
- return true
- end
- return false
- end
- end
-
- def timeout(seconds, exception=Timeout::Error)
- return yield if seconds.nil? or seconds.zero?
- # raise ThreadError, "timeout within critical session" if Thread.critical
- id = TimeoutHandler.register(seconds, exception)
- begin
- yield(seconds)
- ensure
- TimeoutHandler.cancel(id)
- end
- end
- module_function :timeout
end
end
diff --git a/lib/wsdl/binding.rb b/lib/wsdl/binding.rb
new file mode 100644
index 0000000000..58a21d820d
--- /dev/null
+++ b/lib/wsdl/binding.rb
@@ -0,0 +1,65 @@
+# WSDL4R - WSDL binding definition.
+# Copyright (C) 2002, 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+require 'xsd/namedelements'
+
+
+module WSDL
+
+
+class Binding < Info
+ attr_reader :name # required
+ attr_reader :type # required
+ attr_reader :operations
+ attr_reader :soapbinding
+
+ def initialize
+ super
+ @name = nil
+ @type = nil
+ @operations = XSD::NamedElements.new
+ @soapbinding = nil
+ end
+
+ def targetnamespace
+ parent.targetnamespace
+ end
+
+ def parse_element(element)
+ case element
+ when OperationName
+ o = OperationBinding.new
+ @operations << o
+ o
+ when SOAPBindingName
+ o = WSDL::SOAP::Binding.new
+ @soapbinding = o
+ o
+ when DocumentationName
+ o = Documentation.new
+ o
+ else
+ nil
+ end
+ end
+
+ def parse_attr(attr, value)
+ case attr
+ when NameAttrName
+ @name = XSD::QName.new(targetnamespace, value.source)
+ when TypeAttrName
+ @type = value
+ else
+ nil
+ end
+ end
+end
+
+
+end
diff --git a/lib/wsdl/data.rb b/lib/wsdl/data.rb
new file mode 100644
index 0000000000..45eaad8526
--- /dev/null
+++ b/lib/wsdl/data.rb
@@ -0,0 +1,64 @@
+# WSDL4R - WSDL data definitions.
+# Copyright (C) 2002, 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'xsd/qname'
+require 'wsdl/documentation'
+require 'wsdl/definitions'
+require 'wsdl/types'
+require 'wsdl/message'
+require 'wsdl/part'
+require 'wsdl/portType'
+require 'wsdl/operation'
+require 'wsdl/param'
+require 'wsdl/binding'
+require 'wsdl/operationBinding'
+require 'wsdl/service'
+require 'wsdl/port'
+require 'wsdl/import'
+
+
+module WSDL
+
+
+ArrayTypeAttrName = XSD::QName.new(Namespace, 'arrayType')
+BindingName = XSD::QName.new(Namespace, 'binding')
+DefinitionsName = XSD::QName.new(Namespace, 'definitions')
+DocumentationName = XSD::QName.new(Namespace, 'documentation')
+FaultName = XSD::QName.new(Namespace, 'fault')
+ImportName = XSD::QName.new(Namespace, 'import')
+InputName = XSD::QName.new(Namespace, 'input')
+MessageName = XSD::QName.new(Namespace, 'message')
+OperationName = XSD::QName.new(Namespace, 'operation')
+OutputName = XSD::QName.new(Namespace, 'output')
+PartName = XSD::QName.new(Namespace, 'part')
+PortName = XSD::QName.new(Namespace, 'port')
+PortTypeName = XSD::QName.new(Namespace, 'portType')
+ServiceName = XSD::QName.new(Namespace, 'service')
+TypesName = XSD::QName.new(Namespace, 'types')
+
+SchemaName = XSD::QName.new(XSD::Namespace, 'schema')
+
+SOAPAddressName = XSD::QName.new(SOAPBindingNamespace, 'address')
+SOAPBindingName = XSD::QName.new(SOAPBindingNamespace, 'binding')
+SOAPHeaderName = XSD::QName.new(SOAPBindingNamespace, 'header')
+SOAPBodyName = XSD::QName.new(SOAPBindingNamespace, 'body')
+SOAPFaultName = XSD::QName.new(SOAPBindingNamespace, 'fault')
+SOAPOperationName = XSD::QName.new(SOAPBindingNamespace, 'operation')
+
+BindingAttrName = XSD::QName.new(nil, 'binding')
+ElementAttrName = XSD::QName.new(nil, 'element')
+LocationAttrName = XSD::QName.new(nil, 'location')
+MessageAttrName = XSD::QName.new(nil, 'message')
+NameAttrName = XSD::QName.new(nil, 'name')
+NamespaceAttrName = XSD::QName.new(nil, 'namespace')
+ParameterOrderAttrName = XSD::QName.new(nil, 'parameterOrder')
+TargetNamespaceAttrName = XSD::QName.new(nil, 'targetNamespace')
+TypeAttrName = XSD::QName.new(nil, 'type')
+
+
+end
diff --git a/lib/wsdl/definitions.rb b/lib/wsdl/definitions.rb
new file mode 100644
index 0000000000..5235037cfe
--- /dev/null
+++ b/lib/wsdl/definitions.rb
@@ -0,0 +1,250 @@
+# WSDL4R - WSDL definitions.
+# Copyright (C) 2002, 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+require 'xsd/namedelements'
+
+
+module WSDL
+
+
+class Definitions < Info
+ attr_reader :name
+ attr_reader :targetnamespace
+ attr_reader :imports
+
+ attr_accessor :location
+ attr_reader :importedschema
+
+ def initialize
+ super
+ @name = nil
+ @targetnamespace = nil
+ @location = nil
+ @importedschema = {}
+
+ @types = nil
+ @imports = []
+ @messages = XSD::NamedElements.new
+ @porttypes = XSD::NamedElements.new
+ @bindings = XSD::NamedElements.new
+ @services = XSD::NamedElements.new
+
+ @anontypes = XSD::NamedElements.new
+ @root = self
+ end
+
+ def inspect
+ sprintf("#<%s:0x%x %s>", self.class.name, __id__, @name || '(unnamed)')
+ end
+
+ def targetnamespace=(targetnamespace)
+ @targetnamespace = targetnamespace
+ if @name
+ @name = XSD::QName.new(@targetnamespace, @name.name)
+ end
+ end
+
+ def collect_attributes
+ result = XSD::NamedElements.new
+ if @types
+ @types.schemas.each do |schema|
+ result.concat(schema.collect_attributes)
+ end
+ end
+ @imports.each do |import|
+ result.concat(import.content.collect_attributes)
+ end
+ result
+ end
+
+ def collect_elements
+ result = XSD::NamedElements.new
+ if @types
+ @types.schemas.each do |schema|
+ result.concat(schema.collect_elements)
+ end
+ end
+ @imports.each do |import|
+ result.concat(import.content.collect_elements)
+ end
+ result
+ end
+
+ def collect_complextypes
+ result = @anontypes.dup
+ if @types
+ @types.schemas.each do |schema|
+ result.concat(schema.collect_complextypes)
+ end
+ end
+ @imports.each do |import|
+ result.concat(import.content.collect_complextypes)
+ end
+ result
+ end
+
+ def collect_simpletypes
+ result = XSD::NamedElements.new
+ if @types
+ @types.schemas.each do |schema|
+ result.concat(schema.collect_simpletypes)
+ end
+ end
+ @imports.each do |import|
+ result.concat(import.content.collect_simpletypes)
+ end
+ result
+ end
+
+ # ToDo: simpletype must be accepted...
+ def add_type(complextype)
+ @anontypes << complextype
+ end
+
+ def messages
+ result = @messages.dup
+ @imports.each do |import|
+ result.concat(import.content.messages) if self.class === import.content
+ end
+ result
+ end
+
+ def porttypes
+ result = @porttypes.dup
+ @imports.each do |import|
+ result.concat(import.content.porttypes) if self.class === import.content
+ end
+ result
+ end
+
+ def bindings
+ result = @bindings.dup
+ @imports.each do |import|
+ result.concat(import.content.bindings) if self.class === import.content
+ end
+ result
+ end
+
+ def services
+ result = @services.dup
+ @imports.each do |import|
+ result.concat(import.content.services) if self.class === import.content
+ end
+ result
+ end
+
+ def message(name)
+ message = @messages[name]
+ return message if message
+ @imports.each do |import|
+ message = import.content.message(name) if self.class === import.content
+ return message if message
+ end
+ nil
+ end
+
+ def porttype(name)
+ porttype = @porttypes[name]
+ return porttype if porttype
+ @imports.each do |import|
+ porttype = import.content.porttype(name) if self.class === import.content
+ return porttype if porttype
+ end
+ nil
+ end
+
+ def binding(name)
+ binding = @bindings[name]
+ return binding if binding
+ @imports.each do |import|
+ binding = import.content.binding(name) if self.class === import.content
+ return binding if binding
+ end
+ nil
+ end
+
+ def service(name)
+ service = @services[name]
+ return service if service
+ @imports.each do |import|
+ service = import.content.service(name) if self.class === import.content
+ return service if service
+ end
+ nil
+ end
+
+ def porttype_binding(name)
+ binding = @bindings.find { |item| item.type == name }
+ return binding if binding
+ @imports.each do |import|
+ binding = import.content.porttype_binding(name) if self.class === import.content
+ return binding if binding
+ end
+ nil
+ end
+
+ def parse_element(element)
+ case element
+ when ImportName
+ o = Import.new
+ @imports << o
+ o
+ when TypesName
+ o = Types.new
+ @types = o
+ o
+ when MessageName
+ o = Message.new
+ @messages << o
+ o
+ when PortTypeName
+ o = PortType.new
+ @porttypes << o
+ o
+ when BindingName
+ o = Binding.new
+ @bindings << o
+ o
+ when ServiceName
+ o = Service.new
+ @services << o
+ o
+ when DocumentationName
+ o = Documentation.new
+ o
+ else
+ nil
+ end
+ end
+
+ def parse_attr(attr, value)
+ case attr
+ when NameAttrName
+ @name = XSD::QName.new(targetnamespace, value.source)
+ when TargetNamespaceAttrName
+ self.targetnamespace = value.source
+ else
+ nil
+ end
+ end
+
+ def self.parse_element(element)
+ if element == DefinitionsName
+ Definitions.new
+ else
+ nil
+ end
+ end
+
+private
+
+end
+
+
+end
diff --git a/lib/wsdl/documentation.rb b/lib/wsdl/documentation.rb
new file mode 100644
index 0000000000..3a7fd7d23e
--- /dev/null
+++ b/lib/wsdl/documentation.rb
@@ -0,0 +1,32 @@
+# WSDL4R - WSDL SOAP documentation element.
+# Copyright (C) 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+
+
+module WSDL
+
+
+class Documentation < Info
+ def initialize
+ super
+ end
+
+ def parse_element(element)
+ # Accepts any element.
+ self
+ end
+
+ def parse_attr(attr, value)
+ # Accepts any attribute.
+ true
+ end
+end
+
+
+end
diff --git a/lib/wsdl/import.rb b/lib/wsdl/import.rb
new file mode 100644
index 0000000000..faf60871a5
--- /dev/null
+++ b/lib/wsdl/import.rb
@@ -0,0 +1,80 @@
+# WSDL4R - WSDL import definition.
+# Copyright (C) 2002, 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+require 'wsdl/importer'
+
+
+module WSDL
+
+
+class Import < Info
+ attr_reader :namespace
+ attr_reader :location
+ attr_reader :content
+
+ def initialize
+ super
+ @namespace = nil
+ @location = nil
+ @content = nil
+ @web_client = nil
+ end
+
+ def parse_element(element)
+ case element
+ when DocumentationName
+ o = Documentation.new
+ o
+ else
+ nil
+ end
+ end
+
+ def parse_attr(attr, value)
+ case attr
+ when NamespaceAttrName
+ @namespace = value.source
+ if @content
+ @content.targetnamespace = @namespace
+ end
+ @namespace
+ when LocationAttrName
+ @location = URI.parse(value.source)
+ if @location.relative? and !parent.location.nil? and
+ !parent.location.relative?
+ @location = parent.location + @location
+ end
+ if root.importedschema.key?(@location)
+ @content = root.importedschema[@location]
+ else
+ root.importedschema[@location] = nil # placeholder
+ @content = import(@location)
+ if @content.is_a?(Definitions)
+ @content.root = root
+ if @namespace
+ @content.targetnamespace = @namespace
+ end
+ end
+ root.importedschema[@location] = @content
+ end
+ @location
+ else
+ nil
+ end
+ end
+
+private
+
+ def import(location)
+ Importer.import(location, root)
+ end
+end
+
+
+end
diff --git a/lib/wsdl/importer.rb b/lib/wsdl/importer.rb
new file mode 100644
index 0000000000..481bd81b25
--- /dev/null
+++ b/lib/wsdl/importer.rb
@@ -0,0 +1,38 @@
+# WSDL4R - WSDL importer library.
+# Copyright (C) 2003, 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/xmlSchema/importer'
+require 'wsdl/parser'
+
+
+module WSDL
+
+
+class Importer < WSDL::XMLSchema::Importer
+ def self.import(location, originalroot = nil)
+ new.import(location, originalroot)
+ end
+
+private
+
+ def parse(content, location, originalroot)
+ opt = {
+ :location => location,
+ :originalroot => originalroot
+ }
+ begin
+ WSDL::Parser.new(opt).parse(content)
+ rescue WSDL::Parser::ParseError
+ super(content, location, originalroot)
+ end
+ end
+
+end
+
+
+end
diff --git a/lib/wsdl/info.rb b/lib/wsdl/info.rb
new file mode 100644
index 0000000000..ffd90390a4
--- /dev/null
+++ b/lib/wsdl/info.rb
@@ -0,0 +1,39 @@
+# WSDL4R - WSDL information base.
+# Copyright (C) 2002, 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+module WSDL
+
+
+class Info
+ attr_accessor :root
+ attr_accessor :parent
+ attr_accessor :id
+
+ def initialize
+ @root = nil
+ @parent = nil
+ @id = nil
+ end
+
+ def inspect
+ if self.respond_to?(:name)
+ sprintf("#<%s:0x%x %s>", self.class.name, __id__, self.name)
+ else
+ sprintf("#<%s:0x%x>", self.class.name, __id__)
+ end
+ end
+
+ def parse_element(element); end # abstract
+
+ def parse_attr(attr, value); end # abstract
+
+ def parse_epilogue; end # abstract
+end
+
+
+end
diff --git a/lib/wsdl/message.rb b/lib/wsdl/message.rb
new file mode 100644
index 0000000000..cecc602da3
--- /dev/null
+++ b/lib/wsdl/message.rb
@@ -0,0 +1,54 @@
+# WSDL4R - WSDL message definition.
+# Copyright (C) 2002, 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+
+
+module WSDL
+
+
+class Message < Info
+ attr_reader :name # required
+ attr_reader :parts
+
+ def initialize
+ super
+ @name = nil
+ @parts = []
+ end
+
+ def targetnamespace
+ parent.targetnamespace
+ end
+
+ def parse_element(element)
+ case element
+ when PartName
+ o = Part.new
+ @parts << o
+ o
+ when DocumentationName
+ o = Documentation.new
+ o
+ else
+ nil
+ end
+ end
+
+ def parse_attr(attr, value)
+ case attr
+ when NameAttrName
+ @name = XSD::QName.new(parent.targetnamespace, value.source)
+ else
+ nil
+ end
+ end
+end
+
+
+end
diff --git a/lib/wsdl/operation.rb b/lib/wsdl/operation.rb
new file mode 100644
index 0000000000..fb7f4a80f4
--- /dev/null
+++ b/lib/wsdl/operation.rb
@@ -0,0 +1,130 @@
+# WSDL4R - WSDL operation definition.
+# Copyright (C) 2002, 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+
+
+module WSDL
+
+
+class Operation < Info
+ class NameInfo
+ attr_reader :op_name
+ attr_reader :optype_name
+ attr_reader :parts
+ def initialize(op_name, optype_name, parts)
+ @op_name = op_name
+ @optype_name = optype_name
+ @parts = parts
+ end
+ end
+
+ attr_reader :name # required
+ attr_reader :parameter_order # optional
+ attr_reader :input
+ attr_reader :output
+ attr_reader :fault
+ attr_reader :type # required
+
+ def initialize
+ super
+ @name = nil
+ @type = nil
+ @parameter_order = nil
+ @input = nil
+ @output = nil
+ @fault = []
+ end
+
+ def targetnamespace
+ parent.targetnamespace
+ end
+
+ def input_info
+ typename = input.find_message.name
+ NameInfo.new(@name, typename, inputparts)
+ end
+
+ def output_info
+ typename = output.find_message.name
+ NameInfo.new(@name, typename, outputparts)
+ end
+
+ def inputparts
+ sort_parts(input.find_message.parts)
+ end
+
+ def inputname
+ XSD::QName.new(targetnamespace, input.name ? input.name.name : @name.name)
+ end
+
+ def outputparts
+ sort_parts(output.find_message.parts)
+ end
+
+ def outputname
+ XSD::QName.new(targetnamespace,
+ output.name ? output.name.name : @name.name + 'Response')
+ end
+
+ def parse_element(element)
+ case element
+ when InputName
+ o = Param.new
+ @input = o
+ o
+ when OutputName
+ o = Param.new
+ @output = o
+ o
+ when FaultName
+ o = Param.new
+ @fault << o
+ o
+ when DocumentationName
+ o = Documentation.new
+ o
+ else
+ nil
+ end
+ end
+
+ def parse_attr(attr, value)
+ case attr
+ when NameAttrName
+ @name = XSD::QName.new(targetnamespace, value.source)
+ when TypeAttrName
+ @type = value
+ when ParameterOrderAttrName
+ @parameter_order = value.source.split(/\s+/)
+ else
+ nil
+ end
+ end
+
+private
+
+ def sort_parts(parts)
+ return parts.dup unless parameter_order
+ result = []
+ parameter_order.each do |orderitem|
+ if (ele = parts.find { |part| part.name == orderitem })
+ result << ele
+ end
+ end
+ if result.length == 0
+ return parts.dup
+ end
+ # result length can be shorter than parts's.
+ # return part must not be a part of the parameterOrder.
+ result
+ end
+end
+
+
+end
diff --git a/lib/wsdl/operationBinding.rb b/lib/wsdl/operationBinding.rb
new file mode 100644
index 0000000000..c2b8cd6591
--- /dev/null
+++ b/lib/wsdl/operationBinding.rb
@@ -0,0 +1,108 @@
+# WSDL4R - WSDL bound operation definition.
+# Copyright (C) 2002, 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+
+
+module WSDL
+
+
+class OperationBinding < Info
+ attr_reader :name # required
+ attr_reader :input
+ attr_reader :output
+ attr_reader :fault
+ attr_reader :soapoperation
+
+ def initialize
+ super
+ @name = nil
+ @input = nil
+ @output = nil
+ @fault = []
+ @soapoperation = nil
+ end
+
+ def targetnamespace
+ parent.targetnamespace
+ end
+
+ def porttype
+ root.porttype(parent.type)
+ end
+
+ def find_operation
+ porttype.operations[@name] or raise RuntimeError.new("#{@name} not found")
+ end
+
+ def soapoperation_name
+ if @soapoperation
+ @soapoperation.input_info.op_name
+ else
+ find_operation.name
+ end
+ end
+
+ def soapoperation_style
+ style = nil
+ if @soapoperation
+ style = @soapoperation.operation_style
+ elsif parent.soapbinding
+ style = parent.soapbinding.style
+ else
+ raise TypeError.new("operation style definition not found")
+ end
+ style || :document
+ end
+
+ def soapaction
+ if @soapoperation
+ @soapoperation.soapaction
+ else
+ nil
+ end
+ end
+
+ def parse_element(element)
+ case element
+ when InputName
+ o = Param.new
+ @input = o
+ o
+ when OutputName
+ o = Param.new
+ @output = o
+ o
+ when FaultName
+ o = Param.new
+ @fault << o
+ o
+ when SOAPOperationName
+ o = WSDL::SOAP::Operation.new
+ @soapoperation = o
+ o
+ when DocumentationName
+ o = Documentation.new
+ o
+ else
+ nil
+ end
+ end
+
+ def parse_attr(attr, value)
+ case attr
+ when NameAttrName
+ @name = XSD::QName.new(targetnamespace, value.source)
+ else
+ nil
+ end
+ end
+end
+
+
+end
diff --git a/lib/wsdl/param.rb b/lib/wsdl/param.rb
new file mode 100644
index 0000000000..b6836b7def
--- /dev/null
+++ b/lib/wsdl/param.rb
@@ -0,0 +1,85 @@
+# WSDL4R - WSDL param definition.
+# Copyright (C) 2002, 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+
+
+module WSDL
+
+
+class Param < Info
+ attr_reader :message # required
+ attr_reader :name # optional but required for fault.
+ attr_reader :soapbody
+ attr_reader :soapheader
+ attr_reader :soapfault
+
+ def initialize
+ super
+ @message = nil
+ @name = nil
+ @soapbody = nil
+ @soapheader = []
+ @soapfault = nil
+ end
+
+ def targetnamespace
+ parent.targetnamespace
+ end
+
+ def find_message
+ root.message(@message) or raise RuntimeError.new("#{@message} not found")
+ end
+
+ def soapbody_use
+ if @soapbody
+ @soapbody.use || :literal
+ else
+ raise RuntimeError.new("soap:body not found")
+ end
+ end
+
+ def parse_element(element)
+ case element
+ when SOAPBodyName
+ o = WSDL::SOAP::Body.new
+ @soapbody = o
+ o
+ when SOAPHeaderName
+ o = WSDL::SOAP::Header.new
+ @soapheader << o
+ o
+ when SOAPFaultName
+ o = WSDL::SOAP::Fault.new
+ @soap_fault = o
+ o
+ when DocumentationName
+ o = Documentation.new
+ o
+ else
+ nil
+ end
+ end
+
+ def parse_attr(attr, value)
+ case attr
+ when MessageAttrName
+ if value.namespace.nil?
+ value = XSD::QName.new(targetnamespace, value.source)
+ end
+ @message = value
+ when NameAttrName
+ @name = XSD::QName.new(targetnamespace, value.source)
+ else
+ nil
+ end
+ end
+end
+
+
+end
diff --git a/lib/wsdl/parser.rb b/lib/wsdl/parser.rb
new file mode 100644
index 0000000000..f96e96ee2a
--- /dev/null
+++ b/lib/wsdl/parser.rb
@@ -0,0 +1,163 @@
+# WSDL4R - WSDL XML Instance parser library.
+# Copyright (C) 2002, 2003, 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'xsd/qname'
+require 'xsd/ns'
+require 'xsd/charset'
+require 'xsd/datatypes'
+require 'xsd/xmlparser'
+require 'wsdl/wsdl'
+require 'wsdl/data'
+require 'wsdl/xmlSchema/data'
+require 'wsdl/soap/data'
+
+
+module WSDL
+
+
+class Parser
+ include WSDL
+
+ class ParseError < Error; end
+ class FormatDecodeError < ParseError; end
+ class UnknownElementError < FormatDecodeError; end
+ class UnknownAttributeError < FormatDecodeError; end
+ class UnexpectedElementError < FormatDecodeError; end
+ class ElementConstraintError < FormatDecodeError; end
+ class AttributeConstraintError < FormatDecodeError; end
+
+private
+
+ class ParseFrame
+ attr_reader :ns
+ attr_reader :name
+ attr_accessor :node
+
+ private
+
+ def initialize(ns, name, node)
+ @ns = ns
+ @name = name
+ @node = node
+ end
+ end
+
+public
+
+ def initialize(opt = {})
+ @parser = XSD::XMLParser.create_parser(self, opt)
+ @parsestack = nil
+ @lastnode = nil
+ @ignored = {}
+ @location = opt[:location]
+ @originalroot = opt[:originalroot]
+ end
+
+ def parse(string_or_readable)
+ @parsestack = []
+ @lastnode = nil
+ @textbuf = ''
+ @parser.do_parse(string_or_readable)
+ @lastnode
+ end
+
+ def charset
+ @parser.charset
+ end
+
+ def start_element(name, attrs)
+ lastframe = @parsestack.last
+ ns = parent = nil
+ if lastframe
+ ns = lastframe.ns.clone_ns
+ parent = lastframe.node
+ else
+ ns = XSD::NS.new
+ parent = nil
+ end
+ attrs = XSD::XMLParser.filter_ns(ns, attrs)
+ node = decode_tag(ns, name, attrs, parent)
+ @parsestack << ParseFrame.new(ns, name, node)
+ end
+
+ def characters(text)
+ lastframe = @parsestack.last
+ if lastframe
+ # Need not to be cloned because character does not have attr.
+ ns = lastframe.ns
+ decode_text(ns, text)
+ else
+ p text if $DEBUG
+ end
+ end
+
+ def end_element(name)
+ lastframe = @parsestack.pop
+ unless name == lastframe.name
+ raise UnexpectedElementError.new("closing element name '#{name}' does not match with opening element '#{lastframe.name}'")
+ end
+ decode_tag_end(lastframe.ns, lastframe.node)
+ @lastnode = lastframe.node
+ end
+
+private
+
+ def decode_tag(ns, name, attrs, parent)
+ o = nil
+ elename = ns.parse(name)
+ if !parent
+ if elename == DefinitionsName
+ o = Definitions.parse_element(elename)
+ o.location = @location
+ else
+ raise UnknownElementError.new("unknown element: #{elename}")
+ end
+ o.root = @originalroot if @originalroot # o.root = o otherwise
+ else
+ if elename == XMLSchema::AnnotationName
+ # only the first annotation element is allowed for each xsd element.
+ o = XMLSchema::Annotation.new
+ else
+ o = parent.parse_element(elename)
+ end
+ unless o
+ unless @ignored.key?(elename)
+ warn("ignored element: #{elename}")
+ @ignored[elename] = elename
+ end
+ o = Documentation.new # which accepts any element.
+ end
+ # node could be a pseudo element. pseudo element has its own parent.
+ o.root = parent.root
+ o.parent = parent if o.parent.nil?
+ end
+ attrs.each do |key, value|
+ attr_ele = ns.parse(key, true)
+ value_ele = ns.parse(value, true)
+ value_ele.source = value # for recovery; value may not be a QName
+ unless o.parse_attr(attr_ele, value_ele)
+ unless @ignored.key?(attr_ele)
+ warn("ignored attr: #{attr_ele}")
+ @ignored[attr_ele] = attr_ele
+ end
+ end
+ end
+ o
+ end
+
+ def decode_tag_end(ns, node)
+ node.parse_epilogue
+ end
+
+ def decode_text(ns, text)
+ @textbuf << text
+ end
+end
+
+
+end
diff --git a/lib/wsdl/part.rb b/lib/wsdl/part.rb
new file mode 100644
index 0000000000..5dafd4ee73
--- /dev/null
+++ b/lib/wsdl/part.rb
@@ -0,0 +1,52 @@
+# WSDL4R - WSDL part definition.
+# Copyright (C) 2002, 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+
+
+module WSDL
+
+
+class Part < Info
+ attr_reader :name # required
+ attr_reader :element # optional
+ attr_reader :type # optional
+
+ def initialize
+ super
+ @name = nil
+ @element = nil
+ @type = nil
+ end
+
+ def parse_element(element)
+ case element
+ when DocumentationName
+ o = Documentation.new
+ o
+ else
+ nil
+ end
+ end
+
+ def parse_attr(attr, value)
+ case attr
+ when NameAttrName
+ @name = value.source
+ when ElementAttrName
+ @element = value
+ when TypeAttrName
+ @type = value
+ else
+ nil
+ end
+ end
+end
+
+
+end
diff --git a/lib/wsdl/port.rb b/lib/wsdl/port.rb
new file mode 100644
index 0000000000..883cc3232d
--- /dev/null
+++ b/lib/wsdl/port.rb
@@ -0,0 +1,84 @@
+# WSDL4R - WSDL port definition.
+# Copyright (C) 2002, 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+
+
+module WSDL
+
+
+class Port < Info
+ attr_reader :name # required
+ attr_reader :binding # required
+ attr_reader :soap_address
+
+ def initialize
+ super
+ @name = nil
+ @binding = nil
+ @soap_address = nil
+ end
+
+ def targetnamespace
+ parent.targetnamespace
+ end
+
+ def porttype
+ root.porttype(find_binding.type)
+ end
+
+ def find_binding
+ root.binding(@binding) or raise RuntimeError.new("#{@binding} not found")
+ end
+
+ def inputoperation_map
+ result = {}
+ find_binding.operations.each do |op_bind|
+ op_info = op_bind.soapoperation.input_info
+ result[op_info.op_name] = op_info
+ end
+ result
+ end
+
+ def outputoperation_map
+ result = {}
+ find_binding.operations.each do |op_bind|
+ op_info = op_bind.soapoperation.output_info
+ result[op_info.op_name] = op_info
+ end
+ result
+ end
+
+ def parse_element(element)
+ case element
+ when SOAPAddressName
+ o = WSDL::SOAP::Address.new
+ @soap_address = o
+ o
+ when DocumentationName
+ o = Documentation.new
+ o
+ else
+ nil
+ end
+ end
+
+ def parse_attr(attr, value)
+ case attr
+ when NameAttrName
+ @name = XSD::QName.new(targetnamespace, value.source)
+ when BindingAttrName
+ @binding = value
+ else
+ nil
+ end
+ end
+end
+
+
+end
diff --git a/lib/wsdl/portType.rb b/lib/wsdl/portType.rb
new file mode 100644
index 0000000000..03e37690a8
--- /dev/null
+++ b/lib/wsdl/portType.rb
@@ -0,0 +1,73 @@
+# WSDL4R - WSDL portType definition.
+# Copyright (C) 2002, 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+require 'xsd/namedelements'
+
+
+module WSDL
+
+
+class PortType < Info
+ attr_reader :name # required
+ attr_reader :operations
+
+ def targetnamespace
+ parent.targetnamespace
+ end
+
+ def initialize
+ super
+ @name = nil
+ @operations = XSD::NamedElements.new
+ end
+
+ def find_binding
+ root.bindings.find { |item| item.type == @name } or
+ raise RuntimeError.new("#{@name} not found")
+ end
+
+ def locations
+ bind_name = find_binding.name
+ result = []
+ root.services.each do |service|
+ service.ports.each do |port|
+ if port.binding == bind_name
+ result << port.soap_address.location if port.soap_address
+ end
+ end
+ end
+ result
+ end
+
+ def parse_element(element)
+ case element
+ when OperationName
+ o = Operation.new
+ @operations << o
+ o
+ when DocumentationName
+ o = Documentation.new
+ o
+ else
+ nil
+ end
+ end
+
+ def parse_attr(attr, value)
+ case attr
+ when NameAttrName
+ @name = XSD::QName.new(targetnamespace, value.source)
+ else
+ nil
+ end
+ end
+end
+
+
+end
diff --git a/lib/wsdl/service.rb b/lib/wsdl/service.rb
new file mode 100644
index 0000000000..652b127331
--- /dev/null
+++ b/lib/wsdl/service.rb
@@ -0,0 +1,61 @@
+# WSDL4R - WSDL service definition.
+# Copyright (C) 2002, 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+require 'xsd/namedelements'
+
+
+module WSDL
+
+
+class Service < Info
+ attr_reader :name # required
+ attr_reader :ports
+ attr_reader :soap_address
+
+ def initialize
+ super
+ @name = nil
+ @ports = XSD::NamedElements.new
+ @soap_address = nil
+ end
+
+ def targetnamespace
+ parent.targetnamespace
+ end
+
+ def parse_element(element)
+ case element
+ when PortName
+ o = Port.new
+ @ports << o
+ o
+ when SOAPAddressName
+ o = WSDL::SOAP::Address.new
+ @soap_address = o
+ o
+ when DocumentationName
+ o = Documentation.new
+ o
+ else
+ nil
+ end
+ end
+
+ def parse_attr(attr, value)
+ case attr
+ when NameAttrName
+ @name = XSD::QName.new(targetnamespace, value.source)
+ else
+ nil
+ end
+ end
+end
+
+
+end
diff --git a/lib/wsdl/soap/address.rb b/lib/wsdl/soap/address.rb
new file mode 100644
index 0000000000..0b2b59caf0
--- /dev/null
+++ b/lib/wsdl/soap/address.rb
@@ -0,0 +1,40 @@
+# WSDL4R - WSDL SOAP address definition.
+# Copyright (C) 2002, 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+
+
+module WSDL
+module SOAP
+
+
+class Address < Info
+ attr_reader :location
+
+ def initialize
+ super
+ @location = nil
+ end
+
+ def parse_element(element)
+ nil
+ end
+
+ def parse_attr(attr, value)
+ case attr
+ when LocationAttrName
+ @location = value.source
+ else
+ nil
+ end
+ end
+end
+
+
+end
+end
diff --git a/lib/wsdl/soap/binding.rb b/lib/wsdl/soap/binding.rb
new file mode 100644
index 0000000000..7e15a99701
--- /dev/null
+++ b/lib/wsdl/soap/binding.rb
@@ -0,0 +1,49 @@
+# WSDL4R - WSDL SOAP binding definition.
+# Copyright (C) 2002, 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+
+
+module WSDL
+module SOAP
+
+
+class Binding < Info
+ attr_reader :style
+ attr_reader :transport
+
+ def initialize
+ super
+ @style = nil
+ @transport = nil
+ end
+
+ def parse_element(element)
+ nil
+ end
+
+ def parse_attr(attr, value)
+ case attr
+ when StyleAttrName
+ if ["document", "rpc"].include?(value.source)
+ @style = value.source.intern
+ else
+ raise Parser::AttributeConstraintError.new(
+ "Unexpected value #{ value }.")
+ end
+ when TransportAttrName
+ @transport = value.source
+ else
+ nil
+ end
+ end
+end
+
+
+end
+end
diff --git a/lib/wsdl/soap/body.rb b/lib/wsdl/soap/body.rb
new file mode 100644
index 0000000000..824f8121a2
--- /dev/null
+++ b/lib/wsdl/soap/body.rb
@@ -0,0 +1,56 @@
+# WSDL4R - WSDL SOAP body definition.
+# Copyright (C) 2002, 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+
+
+module WSDL
+module SOAP
+
+
+class Body < Info
+ attr_reader :parts
+ attr_reader :use # required
+ attr_reader :encodingstyle
+ attr_reader :namespace
+
+ def initialize
+ super
+ @parts = nil
+ @use = nil
+ @encodingstyle = nil
+ @namespace = nil
+ end
+
+ def parse_element(element)
+ nil
+ end
+
+ def parse_attr(attr, value)
+ case attr
+ when PartsAttrName
+ @parts = value.source
+ when UseAttrName
+ if ['literal', 'encoded'].include?(value.source)
+ @use = value.source.intern
+ else
+ raise RuntimeError.new("unknown use of soap:body: #{value.source}")
+ end
+ when EncodingStyleAttrName
+ @encodingstyle = value.source
+ when NamespaceAttrName
+ @namespace = value.source
+ else
+ nil
+ end
+ end
+end
+
+
+end
+end
diff --git a/lib/wsdl/soap/cgiStubCreator.rb b/lib/wsdl/soap/cgiStubCreator.rb
new file mode 100644
index 0000000000..2c4dff2f62
--- /dev/null
+++ b/lib/wsdl/soap/cgiStubCreator.rb
@@ -0,0 +1,76 @@
+# WSDL4R - Creating CGI stub code from WSDL.
+# Copyright (C) 2002, 2003, 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+require 'wsdl/soap/mappingRegistryCreator'
+require 'wsdl/soap/methodDefCreator'
+require 'wsdl/soap/classDefCreatorSupport'
+
+
+module WSDL
+module SOAP
+
+
+class CGIStubCreator
+ include ClassDefCreatorSupport
+
+ attr_reader :definitions
+
+ def initialize(definitions)
+ @definitions = definitions
+ end
+
+ def dump(service_name)
+ warn("CGI stub can have only 1 port. Creating stub for the first port... Rests are ignored.")
+ port = @definitions.service(service_name).ports[0]
+ dump_porttype(port.porttype.name)
+ end
+
+private
+
+ def dump_porttype(name)
+ class_name = create_class_name(name)
+ methoddef, types = MethodDefCreator.new(@definitions).dump(name)
+ mr_creator = MappingRegistryCreator.new(@definitions)
+ c1 = XSD::CodeGen::ClassDef.new(class_name)
+ c1.def_require("soap/rpc/cgistub")
+ c1.def_require("soap/mapping/registry")
+ c1.def_const("MappingRegistry", "::SOAP::Mapping::Registry.new")
+ c1.def_code(mr_creator.dump(types))
+ c1.def_code <<-EOD
+Methods = [
+#{methoddef.gsub(/^/, " ")}
+]
+ EOD
+ c2 = XSD::CodeGen::ClassDef.new(class_name + "App",
+ "::SOAP::RPC::CGIStub")
+ c2.def_method("initialize", "*arg") do
+ <<-EOD
+ super(*arg)
+ servant = #{class_name}.new
+ #{class_name}::Methods.each do |definitions|
+ opt = definitions.last
+ if opt[:request_style] == :document
+ @router.add_document_operation(servant, *definitions)
+ else
+ @router.add_rpc_operation(servant, *definitions)
+ end
+ end
+ self.mapping_registry = #{class_name}::MappingRegistry
+ self.level = Logger::Severity::ERROR
+ EOD
+ end
+ c1.dump + "\n" + c2.dump + format(<<-EOD)
+ #{class_name}App.new('app', nil).start
+ EOD
+ end
+end
+
+
+end
+end
diff --git a/lib/wsdl/soap/classDefCreator.rb b/lib/wsdl/soap/classDefCreator.rb
new file mode 100644
index 0000000000..aeb67c0613
--- /dev/null
+++ b/lib/wsdl/soap/classDefCreator.rb
@@ -0,0 +1,314 @@
+# WSDL4R - Creating class definition from WSDL
+# Copyright (C) 2002, 2003, 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/data'
+require 'wsdl/soap/classDefCreatorSupport'
+require 'xsd/codegen'
+
+
+module WSDL
+module SOAP
+
+
+class ClassDefCreator
+ include ClassDefCreatorSupport
+
+ def initialize(definitions)
+ @elements = definitions.collect_elements
+ @simpletypes = definitions.collect_simpletypes
+ @complextypes = definitions.collect_complextypes
+ @faulttypes = nil
+ if definitions.respond_to?(:collect_faulttypes)
+ @faulttypes = definitions.collect_faulttypes
+ end
+ end
+
+ def dump(type = nil)
+ result = "require 'xsd/qname'\n"
+ if type
+ result = dump_classdef(type.name, type)
+ else
+ str = dump_element
+ unless str.empty?
+ result << "\n" unless result.empty?
+ result << str
+ end
+ str = dump_complextype
+ unless str.empty?
+ result << "\n" unless result.empty?
+ result << str
+ end
+ str = dump_simpletype
+ unless str.empty?
+ result << "\n" unless result.empty?
+ result << str
+ end
+ end
+ result
+ end
+
+private
+
+ def dump_element
+ @elements.collect { |ele|
+ if ele.local_complextype
+ dump_classdef(ele.name, ele.local_complextype,
+ ele.elementform == 'qualified')
+ elsif ele.local_simpletype
+ dump_simpletypedef(ele.name, ele.local_simpletype)
+ else
+ nil
+ end
+ }.compact.join("\n")
+ end
+
+ def dump_simpletype
+ @simpletypes.collect { |type|
+ dump_simpletypedef(type.name, type)
+ }.compact.join("\n")
+ end
+
+ def dump_complextype
+ @complextypes.collect { |type|
+ case type.compoundtype
+ when :TYPE_STRUCT, :TYPE_EMPTY
+ dump_classdef(type.name, type)
+ when :TYPE_ARRAY
+ dump_arraydef(type)
+ when :TYPE_SIMPLE
+ dump_simpleclassdef(type)
+ when :TYPE_MAP
+ # mapped as a general Hash
+ nil
+ else
+ raise RuntimeError.new(
+ "unknown kind of complexContent: #{type.compoundtype}")
+ end
+ }.compact.join("\n")
+ end
+
+ def dump_simpletypedef(qname, simpletype)
+ if !simpletype.restriction or simpletype.restriction.enumeration.empty?
+ return nil
+ end
+ c = XSD::CodeGen::ModuleDef.new(create_class_name(qname))
+ c.comment = "#{qname}"
+ const = {}
+ simpletype.restriction.enumeration.each do |value|
+ constname = safeconstname(value)
+ const[constname] ||= 0
+ if (const[constname] += 1) > 1
+ constname += "_#{const[constname]}"
+ end
+ c.def_const(constname, ndq(value))
+ end
+ c.dump
+ end
+
+ def dump_simpleclassdef(type_or_element)
+ qname = type_or_element.name
+ base = create_class_name(type_or_element.simplecontent.base)
+ c = XSD::CodeGen::ClassDef.new(create_class_name(qname), base)
+ c.comment = "#{qname}"
+ c.dump
+ end
+
+ def dump_classdef(qname, typedef, qualified = false)
+ if @faulttypes and @faulttypes.index(qname)
+ c = XSD::CodeGen::ClassDef.new(create_class_name(qname),
+ '::StandardError')
+ else
+ c = XSD::CodeGen::ClassDef.new(create_class_name(qname))
+ end
+ c.comment = "#{qname}"
+ c.def_classvar('schema_type', ndq(qname.name))
+ c.def_classvar('schema_ns', ndq(qname.namespace))
+ c.def_classvar('schema_qualified', dq('true')) if qualified
+ schema_element = []
+ init_lines = ''
+ params = []
+ typedef.each_element do |element|
+ if element.type == XSD::AnyTypeName
+ type = nil
+ elsif klass = element_basetype(element)
+ type = klass.name
+ elsif element.type
+ type = create_class_name(element.type)
+ else
+ type = nil # means anyType.
+ # do we define a class for local complexType from it's name?
+ # type = create_class_name(element.name)
+ # <element>
+ # <complexType>
+ # <seq...>
+ # </complexType>
+ # </element>
+ end
+ name = name_element(element).name
+ attrname = safemethodname?(name) ? name : safemethodname(name)
+ varname = safevarname(name)
+ c.def_attr(attrname, true, varname)
+ init_lines << "@#{varname} = #{varname}\n"
+ if element.map_as_array?
+ params << "#{varname} = []"
+ type << '[]' if type
+ else
+ params << "#{varname} = nil"
+ end
+ # nil means @@schema_ns + varname
+ eleqname =
+ (varname == name && element.name.namespace == qname.namespace) ?
+ nil : element.name
+ schema_element << [varname, eleqname, type]
+ end
+ unless typedef.attributes.empty?
+ define_attribute(c, typedef.attributes)
+ init_lines << "@__xmlattr = {}\n"
+ end
+ c.def_classvar('schema_element',
+ '[' +
+ schema_element.collect { |varname, name, type|
+ '[' +
+ (
+ if name
+ varname.dump + ', [' + ndq(type) + ', ' + dqname(name) + ']'
+ else
+ varname.dump + ', ' + ndq(type)
+ end
+ ) +
+ ']'
+ }.join(', ') +
+ ']'
+ )
+ c.def_method('initialize', *params) do
+ init_lines
+ end
+ c.dump
+ end
+
+ def element_basetype(ele)
+ if klass = basetype_class(ele.type)
+ klass
+ elsif ele.local_simpletype
+ basetype_class(ele.local_simpletype.base)
+ else
+ nil
+ end
+ end
+
+ def attribute_basetype(attr)
+ if klass = basetype_class(attr.type)
+ klass
+ elsif attr.local_simpletype
+ basetype_class(attr.local_simpletype.base)
+ else
+ nil
+ end
+ end
+
+ def basetype_class(type)
+ return nil if type.nil?
+ if simpletype = @simpletypes[type]
+ basetype_mapped_class(simpletype.base)
+ else
+ basetype_mapped_class(type)
+ end
+ end
+
+ def define_attribute(c, attributes)
+ schema_attribute = []
+ attributes.each do |attribute|
+ name = name_attribute(attribute)
+ if klass = attribute_basetype(attribute)
+ type = klass.name
+ else
+ type = nil
+ end
+ methodname = safemethodname('xmlattr_' + name.name)
+ c.def_method(methodname) do <<-__EOD__
+ (@__xmlattr ||= {})[#{dqname(name)}]
+ __EOD__
+ end
+ c.def_method(methodname + '=', 'value') do <<-__EOD__
+ (@__xmlattr ||= {})[#{dqname(name)}] = value
+ __EOD__
+ end
+ schema_attribute << [name, type]
+ end
+ c.def_classvar('schema_attribute',
+ '{' +
+ schema_attribute.collect { |name, type|
+ dqname(name) + ' => ' + ndq(type)
+ }.join(', ') +
+ '}'
+ )
+ end
+
+ def name_element(element)
+ return element.name if element.name
+ return element.ref if element.ref
+ raise RuntimeError.new("cannot define name of #{element}")
+ end
+
+ def name_attribute(attribute)
+ return attribute.name if attribute.name
+ return attribute.ref if attribute.ref
+ raise RuntimeError.new("cannot define name of #{attribute}")
+ end
+
+ DEFAULT_ITEM_NAME = XSD::QName.new(nil, 'item')
+
+ def dump_arraydef(complextype)
+ qname = complextype.name
+ c = XSD::CodeGen::ClassDef.new(create_class_name(qname), '::Array')
+ c.comment = "#{qname}"
+ child_type = complextype.child_type
+ c.def_classvar('schema_type', ndq(child_type.name))
+ c.def_classvar('schema_ns', ndq(child_type.namespace))
+ child_element = complextype.find_aryelement
+ schema_element = []
+ if child_type == XSD::AnyTypeName
+ type = nil
+ elsif child_element and (klass = element_basetype(child_element))
+ type = klass.name
+ elsif child_type
+ type = create_class_name(child_type)
+ else
+ type = nil
+ end
+ if child_element
+ if child_element.map_as_array?
+ type << '[]' if type
+ end
+ child_element_name = child_element.name
+ else
+ child_element_name = DEFAULT_ITEM_NAME
+ end
+ schema_element << [child_element_name.name, child_element_name, type]
+ c.def_classvar('schema_element',
+ '[' +
+ schema_element.collect { |varname, name, type|
+ '[' +
+ (
+ if name
+ varname.dump + ', [' + ndq(type) + ', ' + dqname(name) + ']'
+ else
+ varname.dump + ', ' + ndq(type)
+ end
+ ) +
+ ']'
+ }.join(', ') +
+ ']'
+ )
+ c.dump
+ end
+end
+
+
+end
+end
diff --git a/lib/wsdl/soap/classDefCreatorSupport.rb b/lib/wsdl/soap/classDefCreatorSupport.rb
new file mode 100644
index 0000000000..8f335653c8
--- /dev/null
+++ b/lib/wsdl/soap/classDefCreatorSupport.rb
@@ -0,0 +1,126 @@
+# WSDL4R - Creating class code support from WSDL.
+# Copyright (C) 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+require 'soap/mapping'
+require 'soap/mapping/typeMap'
+require 'xsd/codegen/gensupport'
+
+
+module WSDL
+module SOAP
+
+
+module ClassDefCreatorSupport
+ include XSD::CodeGen::GenSupport
+
+ def create_class_name(qname)
+ if klass = basetype_mapped_class(qname)
+ ::SOAP::Mapping::DefaultRegistry.find_mapped_obj_class(klass).name
+ else
+ safeconstname(qname.name)
+ end
+ end
+
+ def basetype_mapped_class(name)
+ ::SOAP::TypeMap[name]
+ end
+
+ def dump_method_signature(operation)
+ name = operation.name.name
+ input = operation.input
+ output = operation.output
+ fault = operation.fault
+ signature = "#{ name }#{ dump_inputparam(input) }"
+ str = <<__EOD__
+# SYNOPSIS
+# #{name}#{dump_inputparam(input)}
+#
+# ARGS
+#{dump_inout_type(input).chomp}
+#
+# RETURNS
+#{dump_inout_type(output).chomp}
+#
+__EOD__
+ unless fault.empty?
+ faultstr = (fault.collect { |f| dump_inout_type(f).chomp }).join(', ')
+ str <<<<__EOD__
+# RAISES
+# #{faultstr}
+#
+__EOD__
+ end
+ str
+ end
+
+ def dq(ele)
+ ele.dump
+ end
+
+ def ndq(ele)
+ ele.nil? ? 'nil' : dq(ele)
+ end
+
+ def sym(ele)
+ ':' + ele
+ end
+
+ def dqname(qname)
+ qname.dump
+ end
+
+private
+
+ def dump_inout_type(param)
+ if param
+ message = param.find_message
+ params = ""
+ message.parts.each do |part|
+ name = safevarname(part.name)
+ if part.type
+ typename = safeconstname(part.type.name)
+ params << add_at("# #{name}", "#{typename} - #{part.type}\n", 20)
+ elsif part.element
+ typename = safeconstname(part.element.name)
+ params << add_at("# #{name}", "#{typename} - #{part.element}\n", 20)
+ end
+ end
+ unless params.empty?
+ return params
+ end
+ end
+ "# N/A\n"
+ end
+
+ def dump_inputparam(input)
+ message = input.find_message
+ params = ""
+ message.parts.each do |part|
+ params << ", " unless params.empty?
+ params << safevarname(part.name)
+ end
+ if params.empty?
+ ""
+ else
+ "(#{ params })"
+ end
+ end
+
+ def add_at(base, str, pos)
+ if base.size >= pos
+ base + ' ' + str
+ else
+ base + ' ' * (pos - base.size) + str
+ end
+ end
+end
+
+
+end
+end
diff --git a/lib/wsdl/soap/clientSkeltonCreator.rb b/lib/wsdl/soap/clientSkeltonCreator.rb
new file mode 100644
index 0000000000..916f0d4dc0
--- /dev/null
+++ b/lib/wsdl/soap/clientSkeltonCreator.rb
@@ -0,0 +1,78 @@
+# WSDL4R - Creating client skelton code from WSDL.
+# Copyright (C) 2002, 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+require 'wsdl/soap/classDefCreatorSupport'
+
+
+module WSDL
+module SOAP
+
+
+class ClientSkeltonCreator
+ include ClassDefCreatorSupport
+
+ attr_reader :definitions
+
+ def initialize(definitions)
+ @definitions = definitions
+ end
+
+ def dump(service_name)
+ result = ""
+ @definitions.service(service_name).ports.each do |port|
+ result << dump_porttype(port.porttype.name)
+ result << "\n"
+ end
+ result
+ end
+
+private
+
+ def dump_porttype(name)
+ drv_name = create_class_name(name)
+
+ result = ""
+ result << <<__EOD__
+endpoint_url = ARGV.shift
+obj = #{ drv_name }.new(endpoint_url)
+
+# run ruby with -d to see SOAP wiredumps.
+obj.wiredump_dev = STDERR if $DEBUG
+
+__EOD__
+ @definitions.porttype(name).operations.each do |operation|
+ result << dump_method_signature(operation)
+ result << dump_input_init(operation.input) << "\n"
+ result << dump_operation(operation) << "\n\n"
+ end
+ result
+ end
+
+ def dump_operation(operation)
+ name = operation.name
+ input = operation.input
+ "puts obj.#{ safemethodname(name.name) }#{ dump_inputparam(input) }"
+ end
+
+ def dump_input_init(input)
+ result = input.find_message.parts.collect { |part|
+ safevarname(part.name)
+ }.join(" = ")
+ if result.empty?
+ ""
+ else
+ result << " = nil"
+ end
+ result
+ end
+end
+
+
+end
+end
diff --git a/lib/wsdl/soap/complexType.rb b/lib/wsdl/soap/complexType.rb
new file mode 100644
index 0000000000..b2e13d0564
--- /dev/null
+++ b/lib/wsdl/soap/complexType.rb
@@ -0,0 +1,161 @@
+# WSDL4R - SOAP complexType definition for WSDL.
+# Copyright (C) 2002, 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/xmlSchema/complexType'
+require 'soap/mapping'
+
+
+module WSDL
+module XMLSchema
+
+
+class ComplexType < Info
+ def compoundtype
+ @compoundtype ||= check_type
+ end
+
+ def check_type
+ if content
+ if attributes.empty? and
+ content.elements.size == 1 and content.elements[0].maxoccurs != '1'
+ if name == ::SOAP::Mapping::MapQName
+ :TYPE_MAP
+ else
+ :TYPE_ARRAY
+ end
+ else
+ :TYPE_STRUCT
+ end
+ elsif complexcontent
+ if complexcontent.base == ::SOAP::ValueArrayName
+ :TYPE_ARRAY
+ else
+ complexcontent.basetype.check_type
+ end
+ elsif simplecontent
+ :TYPE_SIMPLE
+ elsif !attributes.empty?
+ :TYPE_STRUCT
+ else # empty complexType definition (seen in partner.wsdl of salesforce)
+ :TYPE_EMPTY
+ end
+ end
+
+ def child_type(name = nil)
+ case compoundtype
+ when :TYPE_STRUCT
+ if ele = find_element(name)
+ ele.type
+ elsif ele = find_element_by_name(name.name)
+ ele.type
+ end
+ when :TYPE_ARRAY
+ @contenttype ||= content_arytype
+ when :TYPE_MAP
+ item_ele = find_element_by_name("item") or
+ raise RuntimeError.new("'item' element not found in Map definition.")
+ content = item_ele.local_complextype or
+ raise RuntimeError.new("No complexType definition for 'item'.")
+ if ele = content.find_element(name)
+ ele.type
+ elsif ele = content.find_element_by_name(name.name)
+ ele.type
+ end
+ else
+ raise NotImplementedError.new("Unknown kind of complexType.")
+ end
+ end
+
+ def child_defined_complextype(name)
+ ele = nil
+ case compoundtype
+ when :TYPE_STRUCT, :TYPE_MAP
+ unless ele = find_element(name)
+ if name.namespace.nil?
+ ele = find_element_by_name(name.name)
+ end
+ end
+ when :TYPE_ARRAY
+ if content.elements.size == 1
+ ele = content.elements[0]
+ else
+ raise RuntimeError.new("Assert: must not reach.")
+ end
+ else
+ raise RuntimeError.new("Assert: Not implemented.")
+ end
+ unless ele
+ raise RuntimeError.new("Cannot find #{name} as a children of #{@name}.")
+ end
+ ele.local_complextype
+ end
+
+ def find_arytype
+ unless compoundtype == :TYPE_ARRAY
+ raise RuntimeError.new("Assert: not for array")
+ end
+ if complexcontent
+ complexcontent.attributes.each do |attribute|
+ if attribute.ref == ::SOAP::AttrArrayTypeName
+ return attribute.arytype
+ end
+ end
+ if check_array_content(complexcontent.content)
+ return element_simpletype(complexcontent.content.elements[0])
+ end
+ elsif check_array_content(content)
+ return element_simpletype(content.elements[0])
+ end
+ raise RuntimeError.new("Assert: Unknown array definition.")
+ end
+
+ def find_aryelement
+ unless compoundtype == :TYPE_ARRAY
+ raise RuntimeError.new("Assert: not for array")
+ end
+ if complexcontent
+ if check_array_content(complexcontent.content)
+ return complexcontent.content.elements[0]
+ end
+ elsif check_array_content(content)
+ return content.elements[0]
+ end
+ nil # use default item name
+ end
+
+private
+
+ def element_simpletype(element)
+ if element.type
+ element.type
+ elsif element.local_simpletype
+ element.local_simpletype.base
+ else
+ nil
+ end
+ end
+
+ def check_array_content(content)
+ content and content.elements.size == 1 and
+ content.elements[0].maxoccurs != '1'
+ end
+
+ def content_arytype
+ if arytype = find_arytype
+ ns = arytype.namespace
+ name = arytype.name.sub(/\[(?:,)*\]$/, '')
+ XSD::QName.new(ns, name)
+ else
+ nil
+ end
+ end
+end
+
+
+end
+end
diff --git a/lib/wsdl/soap/data.rb b/lib/wsdl/soap/data.rb
new file mode 100644
index 0000000000..48512d3751
--- /dev/null
+++ b/lib/wsdl/soap/data.rb
@@ -0,0 +1,42 @@
+# WSDL4R - WSDL SOAP binding data definitions.
+# Copyright (C) 2002, 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'xsd/qname'
+require 'wsdl/soap/definitions'
+require 'wsdl/soap/binding'
+require 'wsdl/soap/operation'
+require 'wsdl/soap/body'
+require 'wsdl/soap/element'
+require 'wsdl/soap/header'
+require 'wsdl/soap/headerfault'
+require 'wsdl/soap/fault'
+require 'wsdl/soap/address'
+require 'wsdl/soap/complexType'
+
+
+module WSDL
+module SOAP
+
+
+HeaderFaultName = XSD::QName.new(SOAPBindingNamespace, 'headerfault')
+
+LocationAttrName = XSD::QName.new(nil, 'location')
+StyleAttrName = XSD::QName.new(nil, 'style')
+TransportAttrName = XSD::QName.new(nil, 'transport')
+UseAttrName = XSD::QName.new(nil, 'use')
+PartsAttrName = XSD::QName.new(nil, 'parts')
+PartAttrName = XSD::QName.new(nil, 'part')
+NameAttrName = XSD::QName.new(nil, 'name')
+MessageAttrName = XSD::QName.new(nil, 'message')
+EncodingStyleAttrName = XSD::QName.new(nil, 'encodingStyle')
+NamespaceAttrName = XSD::QName.new(nil, 'namespace')
+SOAPActionAttrName = XSD::QName.new(nil, 'soapAction')
+
+
+end
+end
diff --git a/lib/wsdl/soap/definitions.rb b/lib/wsdl/soap/definitions.rb
new file mode 100644
index 0000000000..b014d5af6b
--- /dev/null
+++ b/lib/wsdl/soap/definitions.rb
@@ -0,0 +1,149 @@
+# WSDL4R - WSDL additional definitions for SOAP.
+# Copyright (C) 2002-2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+require 'xsd/namedelements'
+require 'soap/mapping'
+
+
+module WSDL
+
+
+class Definitions < Info
+ def self.soap_rpc_complextypes
+ types = XSD::NamedElements.new
+ types << array_complextype
+ types << fault_complextype
+ types << exception_complextype
+ types
+ end
+
+ def self.array_complextype
+ type = XMLSchema::ComplexType.new(::SOAP::ValueArrayName)
+ type.complexcontent = XMLSchema::ComplexContent.new
+ type.complexcontent.base = ::SOAP::ValueArrayName
+ attr = XMLSchema::Attribute.new
+ attr.ref = ::SOAP::AttrArrayTypeName
+ anytype = XSD::AnyTypeName.dup
+ anytype.name += '[]'
+ attr.arytype = anytype
+ type.complexcontent.attributes << attr
+ type
+ end
+
+=begin
+<xs:complexType name="Fault" final="extension">
+ <xs:sequence>
+ <xs:element name="faultcode" type="xs:QName" />
+ <xs:element name="faultstring" type="xs:string" />
+ <xs:element name="faultactor" type="xs:anyURI" minOccurs="0" />
+ <xs:element name="detail" type="tns:detail" minOccurs="0" />
+ </xs:sequence>
+</xs:complexType>
+=end
+ def self.fault_complextype
+ type = XMLSchema::ComplexType.new(::SOAP::EleFaultName)
+ faultcode = XMLSchema::Element.new(::SOAP::EleFaultCodeName, XSD::XSDQName::Type)
+ faultstring = XMLSchema::Element.new(::SOAP::EleFaultStringName, XSD::XSDString::Type)
+ faultactor = XMLSchema::Element.new(::SOAP::EleFaultActorName, XSD::XSDAnyURI::Type)
+ faultactor.minoccurs = 0
+ detail = XMLSchema::Element.new(::SOAP::EleFaultDetailName, XSD::AnyTypeName)
+ detail.minoccurs = 0
+ type.all_elements = [faultcode, faultstring, faultactor, detail]
+ type.final = 'extension'
+ type
+ end
+
+ def self.exception_complextype
+ type = XMLSchema::ComplexType.new(XSD::QName.new(
+ ::SOAP::Mapping::RubyCustomTypeNamespace, 'SOAPException'))
+ excn_name = XMLSchema::Element.new(XSD::QName.new(nil, 'excn_type_name'), XSD::XSDString::Type)
+ cause = XMLSchema::Element.new(XSD::QName.new(nil, 'cause'), XSD::AnyTypeName)
+ backtrace = XMLSchema::Element.new(XSD::QName.new(nil, 'backtrace'), ::SOAP::ValueArrayName)
+ message = XMLSchema::Element.new(XSD::QName.new(nil, 'message'), XSD::XSDString::Type)
+ type.all_elements = [excn_name, cause, backtrace, message]
+ type
+ end
+
+ def soap_rpc_complextypes(binding)
+ types = rpc_operation_complextypes(binding)
+ types + self.class.soap_rpc_complextypes
+ end
+
+ def collect_faulttypes
+ result = []
+ collect_fault_messages.each do |name|
+ faultparts = message(name).parts
+ if faultparts.size != 1
+ raise RuntimeError.new("expecting fault message to have only 1 part")
+ end
+ if result.index(faultparts[0].type).nil?
+ result << faultparts[0].type
+ end
+ end
+ result
+ end
+
+private
+
+ def collect_fault_messages
+ result = []
+ porttypes.each do |porttype|
+ porttype.operations.each do |operation|
+ operation.fault.each do |fault|
+ if result.index(fault.message).nil?
+ result << fault.message
+ end
+ end
+ end
+ end
+ result
+ end
+
+ def rpc_operation_complextypes(binding)
+ types = XSD::NamedElements.new
+ binding.operations.each do |op_bind|
+ if op_bind_rpc?(op_bind)
+ operation = op_bind.find_operation
+ if op_bind.input
+ type = XMLSchema::ComplexType.new(op_bind.soapoperation_name)
+ message = messages[operation.input.message]
+ type.sequence_elements = elements_from_message(message)
+ types << type
+ end
+ if op_bind.output
+ type = XMLSchema::ComplexType.new(operation.outputname)
+ message = messages[operation.output.message]
+ type.sequence_elements = elements_from_message(message)
+ types << type
+ end
+ end
+ end
+ types
+ end
+
+ def op_bind_rpc?(op_bind)
+ op_bind.soapoperation_style == :rpc
+ end
+
+ def elements_from_message(message)
+ message.parts.collect { |part|
+ if part.element
+ collect_elements[part.element]
+ elsif part.name.nil? or part.type.nil?
+ raise RuntimeError.new("part of a message must be an element or typed")
+ else
+ qname = XSD::QName.new(nil, part.name)
+ XMLSchema::Element.new(qname, part.type)
+ end
+ }
+ end
+end
+
+
+end
diff --git a/lib/wsdl/soap/driverCreator.rb b/lib/wsdl/soap/driverCreator.rb
new file mode 100644
index 0000000000..eba7c158a2
--- /dev/null
+++ b/lib/wsdl/soap/driverCreator.rb
@@ -0,0 +1,95 @@
+# WSDL4R - Creating driver code from WSDL.
+# Copyright (C) 2002, 2003, 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+require 'wsdl/soap/mappingRegistryCreator'
+require 'wsdl/soap/methodDefCreator'
+require 'wsdl/soap/classDefCreatorSupport'
+require 'xsd/codegen'
+
+
+module WSDL
+module SOAP
+
+
+class DriverCreator
+ include ClassDefCreatorSupport
+
+ attr_reader :definitions
+
+ def initialize(definitions)
+ @definitions = definitions
+ end
+
+ def dump(porttype = nil)
+ if porttype.nil?
+ result = ""
+ @definitions.porttypes.each do |type|
+ result << dump_porttype(type.name)
+ result << "\n"
+ end
+ else
+ result = dump_porttype(porttype)
+ end
+ result
+ end
+
+private
+
+ def dump_porttype(name)
+ class_name = create_class_name(name)
+ methoddef, types = MethodDefCreator.new(@definitions).dump(name)
+ mr_creator = MappingRegistryCreator.new(@definitions)
+ binding = @definitions.bindings.find { |item| item.type == name }
+ return '' unless binding.soapbinding # not a SOAP binding
+ address = @definitions.porttype(name).locations[0]
+
+ c = XSD::CodeGen::ClassDef.new(class_name, "::SOAP::RPC::Driver")
+ c.def_require("soap/rpc/driver")
+ c.def_const("MappingRegistry", "::SOAP::Mapping::Registry.new")
+ c.def_const("DefaultEndpointUrl", ndq(address))
+ c.def_code(mr_creator.dump(types))
+ c.def_code <<-EOD
+Methods = [
+#{methoddef.gsub(/^/, " ")}
+]
+ EOD
+ c.def_method("initialize", "endpoint_url = nil") do
+ <<-EOD
+ endpoint_url ||= DefaultEndpointUrl
+ super(endpoint_url, nil)
+ self.mapping_registry = MappingRegistry
+ init_methods
+ EOD
+ end
+ c.def_privatemethod("init_methods") do
+ <<-EOD
+ Methods.each do |definitions|
+ opt = definitions.last
+ if opt[:request_style] == :document
+ add_document_operation(*definitions)
+ else
+ add_rpc_operation(*definitions)
+ qname = definitions[0]
+ name = definitions[2]
+ if qname.name != name and qname.name.capitalize == name.capitalize
+ ::SOAP::Mapping.define_singleton_method(self, qname.name) do |*arg|
+ __send__(name, *arg)
+ end
+ end
+ end
+ end
+ EOD
+ end
+ c.dump
+ end
+end
+
+
+end
+end
diff --git a/lib/wsdl/soap/element.rb b/lib/wsdl/soap/element.rb
new file mode 100644
index 0000000000..0fa6017c5b
--- /dev/null
+++ b/lib/wsdl/soap/element.rb
@@ -0,0 +1,28 @@
+# WSDL4R - XMLSchema element definition for WSDL.
+# Copyright (C) 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/xmlSchema/element'
+
+
+module WSDL
+module XMLSchema
+
+
+class Element < Info
+ def map_as_array?
+ maxoccurs != '1'
+ end
+
+ def attributes
+ @local_complextype.attributes
+ end
+end
+
+
+end
+end
diff --git a/lib/wsdl/soap/fault.rb b/lib/wsdl/soap/fault.rb
new file mode 100644
index 0000000000..2862b659ab
--- /dev/null
+++ b/lib/wsdl/soap/fault.rb
@@ -0,0 +1,56 @@
+# WSDL4R - WSDL SOAP body definition.
+# Copyright (C) 2002, 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+
+
+module WSDL
+module SOAP
+
+
+class Fault < Info
+ attr_reader :name # required
+ attr_reader :use # required
+ attr_reader :encodingstyle
+ attr_reader :namespace
+
+ def initialize
+ super
+ @name = nil
+ @use = nil
+ @encodingstyle = nil
+ @namespace = nil
+ end
+
+ def targetnamespace
+ parent.targetnamespace
+ end
+
+ def parse_element(element)
+ nil
+ end
+
+ def parse_attr(attr, value)
+ case attr
+ when NameAttrName
+ @name = XSD::QName.new(targetnamespace, value.source)
+ when UseAttrName
+ @use = value.source
+ when EncodingStyleAttrName
+ @encodingstyle = value.source
+ when NamespaceAttrName
+ @namespace = value.source
+ else
+ nil
+ end
+ end
+end
+
+
+end
+end
diff --git a/lib/wsdl/soap/header.rb b/lib/wsdl/soap/header.rb
new file mode 100644
index 0000000000..8d7c4e9d70
--- /dev/null
+++ b/lib/wsdl/soap/header.rb
@@ -0,0 +1,86 @@
+# WSDL4R - WSDL SOAP body definition.
+# Copyright (C) 2002, 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+
+
+module WSDL
+module SOAP
+
+
+class Header < Info
+ attr_reader :headerfault
+
+ attr_reader :message # required
+ attr_reader :part # required
+ attr_reader :use # required
+ attr_reader :encodingstyle
+ attr_reader :namespace
+
+ def initialize
+ super
+ @message = nil
+ @part = nil
+ @use = nil
+ @encodingstyle = nil
+ @namespace = nil
+ @headerfault = nil
+ end
+
+ def targetnamespace
+ parent.targetnamespace
+ end
+
+ def find_message
+ root.message(@message) or raise RuntimeError.new("#{@message} not found")
+ end
+
+ def find_part
+ find_message.parts.each do |part|
+ if part.name == @part
+ return part
+ end
+ end
+ raise RuntimeError.new("#{@part} not found")
+ end
+
+ def parse_element(element)
+ case element
+ when HeaderFaultName
+ o = WSDL::SOAP::HeaderFault.new
+ @headerfault = o
+ o
+ else
+ nil
+ end
+ end
+
+ def parse_attr(attr, value)
+ case attr
+ when MessageAttrName
+ if value.namespace.nil?
+ value = XSD::QName.new(targetnamespace, value.source)
+ end
+ @message = value
+ when PartAttrName
+ @part = value.source
+ when UseAttrName
+ @use = value.source
+ when EncodingStyleAttrName
+ @encodingstyle = value.source
+ when NamespaceAttrName
+ @namespace = value.source
+ else
+ nil
+ end
+ end
+end
+
+
+end
+end
diff --git a/lib/wsdl/soap/headerfault.rb b/lib/wsdl/soap/headerfault.rb
new file mode 100644
index 0000000000..d6b14f2646
--- /dev/null
+++ b/lib/wsdl/soap/headerfault.rb
@@ -0,0 +1,56 @@
+# WSDL4R - WSDL SOAP body definition.
+# Copyright (C) 2002, 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+
+
+module WSDL
+module SOAP
+
+
+class HeaderFault < Info
+ attr_reader :message # required
+ attr_reader :part # required
+ attr_reader :use # required
+ attr_reader :encodingstyle
+ attr_reader :namespace
+
+ def initialize
+ super
+ @message = nil
+ @part = nil
+ @use = nil
+ @encodingstyle = nil
+ @namespace = nil
+ end
+
+ def parse_element(element)
+ nil
+ end
+
+ def parse_attr(attr, value)
+ case attr
+ when MessageAttrName
+ @message = value
+ when PartAttrName
+ @part = value.source
+ when UseAttrName
+ @use = value.source
+ when EncodingStyleAttrName
+ @encodingstyle = value.source
+ when NamespaceAttrName
+ @namespace = value.source
+ else
+ nil
+ end
+ end
+end
+
+
+end
+end
diff --git a/lib/wsdl/soap/mappingRegistryCreator.rb b/lib/wsdl/soap/mappingRegistryCreator.rb
new file mode 100644
index 0000000000..8669339ce4
--- /dev/null
+++ b/lib/wsdl/soap/mappingRegistryCreator.rb
@@ -0,0 +1,92 @@
+# WSDL4R - Creating MappingRegistry code from WSDL.
+# Copyright (C) 2002, 2003, 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+require 'wsdl/soap/classDefCreatorSupport'
+
+
+module WSDL
+module SOAP
+
+
+class MappingRegistryCreator
+ include ClassDefCreatorSupport
+
+ attr_reader :definitions
+
+ def initialize(definitions)
+ @definitions = definitions
+ @complextypes = @definitions.collect_complextypes
+ @types = nil
+ end
+
+ def dump(types)
+ @types = types
+ map_cache = []
+ map = ""
+ @types.each do |type|
+ if map_cache.index(type).nil?
+ map_cache << type
+ if type.namespace != XSD::Namespace
+ if typemap = dump_typemap(type)
+ map << typemap
+ end
+ end
+ end
+ end
+ return map
+ end
+
+private
+
+ def dump_typemap(type)
+ if definedtype = @complextypes[type]
+ case definedtype.compoundtype
+ when :TYPE_STRUCT
+ dump_struct_typemap(definedtype)
+ when :TYPE_ARRAY
+ dump_array_typemap(definedtype)
+ when :TYPE_MAP, :TYPE_EMPTY
+ nil
+ else
+ raise NotImplementedError.new("must not reach here")
+ end
+ end
+ end
+
+ def dump_struct_typemap(definedtype)
+ ele = definedtype.name
+ return <<__EOD__
+MappingRegistry.set(
+ #{create_class_name(ele)},
+ ::SOAP::SOAPStruct,
+ ::SOAP::Mapping::Registry::TypedStructFactory,
+ { :type => #{dqname(ele)} }
+)
+__EOD__
+ end
+
+ def dump_array_typemap(definedtype)
+ ele = definedtype.name
+ arytype = definedtype.find_arytype || XSD::AnyTypeName
+ type = XSD::QName.new(arytype.namespace, arytype.name.sub(/\[(?:,)*\]$/, ''))
+ @types << type
+ return <<__EOD__
+MappingRegistry.set(
+ #{create_class_name(ele)},
+ ::SOAP::SOAPArray,
+ ::SOAP::Mapping::Registry::TypedArrayFactory,
+ { :type => #{dqname(type)} }
+)
+__EOD__
+ end
+end
+
+
+end
+end
diff --git a/lib/wsdl/soap/methodDefCreator.rb b/lib/wsdl/soap/methodDefCreator.rb
new file mode 100644
index 0000000000..f3ffadbe69
--- /dev/null
+++ b/lib/wsdl/soap/methodDefCreator.rb
@@ -0,0 +1,228 @@
+# WSDL4R - Creating driver code from WSDL.
+# Copyright (C) 2002, 2003, 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+require 'wsdl/soap/classDefCreatorSupport'
+require 'soap/rpc/element'
+
+
+module WSDL
+module SOAP
+
+
+class MethodDefCreator
+ include ClassDefCreatorSupport
+
+ attr_reader :definitions
+
+ def initialize(definitions)
+ @definitions = definitions
+ @simpletypes = @definitions.collect_simpletypes
+ @complextypes = @definitions.collect_complextypes
+ @elements = @definitions.collect_elements
+ @types = []
+ end
+
+ def dump(porttype)
+ @types.clear
+ result = ""
+ operations = @definitions.porttype(porttype).operations
+ binding = @definitions.porttype_binding(porttype)
+ operations.each do |operation|
+ op_bind = binding.operations[operation.name]
+ next unless op_bind # no binding is defined
+ next unless op_bind.soapoperation # not a SOAP operation binding
+ result << ",\n" unless result.empty?
+ result << dump_method(operation, op_bind).chomp
+ end
+ return result, @types
+ end
+
+ def collect_rpcparameter(operation)
+ result = operation.inputparts.collect { |part|
+ collect_type(part.type)
+ param_set(::SOAP::RPC::SOAPMethod::IN, part.name, rpcdefinedtype(part))
+ }
+ outparts = operation.outputparts
+ if outparts.size > 0
+ retval = outparts[0]
+ collect_type(retval.type)
+ result << param_set(::SOAP::RPC::SOAPMethod::RETVAL, retval.name,
+ rpcdefinedtype(retval))
+ cdr(outparts).each { |part|
+ collect_type(part.type)
+ result << param_set(::SOAP::RPC::SOAPMethod::OUT, part.name,
+ rpcdefinedtype(part))
+ }
+ end
+ result
+ end
+
+ def collect_documentparameter(operation)
+ param = []
+ operation.inputparts.each do |input|
+ param << param_set(::SOAP::RPC::SOAPMethod::IN, input.name,
+ documentdefinedtype(input), elementqualified(input))
+ end
+ operation.outputparts.each do |output|
+ param << param_set(::SOAP::RPC::SOAPMethod::OUT, output.name,
+ documentdefinedtype(output), elementqualified(output))
+ end
+ param
+ end
+
+private
+
+ def dump_method(operation, binding)
+ name = safemethodname(operation.name.name)
+ name_as = operation.name.name
+ style = binding.soapoperation_style
+ inputuse = binding.input.soapbody_use
+ outputuse = binding.output.soapbody_use
+ namespace = binding.input.soapbody.namespace
+ if style == :rpc
+ qname = XSD::QName.new(namespace, name_as)
+ paramstr = param2str(collect_rpcparameter(operation))
+ else
+ qname = nil
+ paramstr = param2str(collect_documentparameter(operation))
+ end
+ if paramstr.empty?
+ paramstr = '[]'
+ else
+ paramstr = "[ " << paramstr.split(/\r?\n/).join("\n ") << " ]"
+ end
+ definitions = <<__EOD__
+#{ndq(binding.soapaction)},
+ #{dq(name)},
+ #{paramstr},
+ { :request_style => #{sym(style.id2name)}, :request_use => #{sym(inputuse.id2name)},
+ :response_style => #{sym(style.id2name)}, :response_use => #{sym(outputuse.id2name)} }
+__EOD__
+ if style == :rpc
+ return <<__EOD__
+[ #{qname.dump},
+ #{definitions}]
+__EOD__
+ else
+ return <<__EOD__
+[ #{definitions}]
+__EOD__
+ end
+ end
+
+ def rpcdefinedtype(part)
+ if mapped = basetype_mapped_class(part.type)
+ ['::' + mapped.name]
+ elsif definedtype = @simpletypes[part.type]
+ ['::' + basetype_mapped_class(definedtype.base).name]
+ elsif definedtype = @elements[part.element]
+ #['::SOAP::SOAPStruct', part.element.namespace, part.element.name]
+ ['nil', part.element.namespace, part.element.name]
+ elsif definedtype = @complextypes[part.type]
+ case definedtype.compoundtype
+ when :TYPE_STRUCT, :TYPE_EMPTY # ToDo: empty should be treated as void.
+ type = create_class_name(part.type)
+ [type, part.type.namespace, part.type.name]
+ when :TYPE_MAP
+ [Hash.name, part.type.namespace, part.type.name]
+ when :TYPE_ARRAY
+ arytype = definedtype.find_arytype || XSD::AnyTypeName
+ ns = arytype.namespace
+ name = arytype.name.sub(/\[(?:,)*\]$/, '')
+ type = create_class_name(XSD::QName.new(ns, name))
+ [type + '[]', ns, name]
+ else
+ raise NotImplementedError.new("must not reach here")
+ end
+ else
+ raise RuntimeError.new("part: #{part.name} cannot be resolved")
+ end
+ end
+
+ def documentdefinedtype(part)
+ if mapped = basetype_mapped_class(part.type)
+ ['::' + mapped.name, nil, part.name]
+ elsif definedtype = @simpletypes[part.type]
+ ['::' + basetype_mapped_class(definedtype.base).name, nil, part.name]
+ elsif definedtype = @elements[part.element]
+ ['::SOAP::SOAPElement', part.element.namespace, part.element.name]
+ elsif definedtype = @complextypes[part.type]
+ ['::SOAP::SOAPElement', part.type.namespace, part.type.name]
+ else
+ raise RuntimeError.new("part: #{part.name} cannot be resolved")
+ end
+ end
+
+ def elementqualified(part)
+ if mapped = basetype_mapped_class(part.type)
+ false
+ elsif definedtype = @simpletypes[part.type]
+ false
+ elsif definedtype = @elements[part.element]
+ definedtype.elementform == 'qualified'
+ elsif definedtype = @complextypes[part.type]
+ false
+ else
+ raise RuntimeError.new("part: #{part.name} cannot be resolved")
+ end
+ end
+
+ def param_set(io_type, name, type, ele = nil)
+ [io_type, name, type, ele]
+ end
+
+ def collect_type(type)
+ # ignore inline type definition.
+ return if type.nil?
+ return if @types.include?(type)
+ @types << type
+ return unless @complextypes[type]
+ @complextypes[type].each_element do |element|
+ collect_type(element.type)
+ end
+ end
+
+ def param2str(params)
+ params.collect { |param|
+ io, name, type, ele = param
+ unless ele.nil?
+ "[#{dq(io)}, #{dq(name)}, #{type2str(type)}, #{ele2str(ele)}]"
+ else
+ "[#{dq(io)}, #{dq(name)}, #{type2str(type)}]"
+ end
+ }.join(",\n")
+ end
+
+ def type2str(type)
+ if type.size == 1
+ "[#{dq(type[0])}]"
+ else
+ "[#{dq(type[0])}, #{ndq(type[1])}, #{dq(type[2])}]"
+ end
+ end
+
+ def ele2str(ele)
+ qualified = ele
+ if qualified
+ "true"
+ else
+ "false"
+ end
+ end
+
+ def cdr(ary)
+ result = ary.dup
+ result.shift
+ result
+ end
+end
+
+